diff --git a/#jpgraph/VERSION b/#jpgraph/VERSION
deleted file mode 100644
index 4f1f823c..00000000
--- a/#jpgraph/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-Version: v4.0.2
diff --git a/#jpgraph/src/Examples/accbarex1.php b/#jpgraph/src/Examples/accbarex1.php
deleted file mode 100644
index 01796295..00000000
--- a/#jpgraph/src/Examples/accbarex1.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-$data1y=array(-8,8,9,3,5,6);
-$data2y=array(18,2,1,7,5,4);
-
-// Create the graph. These two calls are always required
-$graph = new Graph(500,400); 
-$graph->SetScale("textlin");
-
-$graph->SetShadow();
-$graph->img->SetMargin(40,30,20,40);
-
-// Create the bar plots
-$b1plot = new BarPlot($data1y);
-$b1plot->SetFillColor("orange");
-$b1plot->value->Show();
-$b2plot = new BarPlot($data2y);
-$b2plot->SetFillColor("blue");
-$b2plot->value->Show();
-
-// Create the grouped bar plot
-$gbplot = new AccBarPlot(array($b1plot,$b2plot));
-
-// ...and add it to the graPH
-$graph->Add($gbplot);
-
-$graph->title->Set("Accumulated bar plots");
-$graph->xaxis->title->Set("X-title");
-$graph->yaxis->title->Set("Y-title");
-
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD);
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/accbarframeex01.php b/#jpgraph/src/Examples/accbarframeex01.php
deleted file mode 100644
index 8b56876c..00000000
--- a/#jpgraph/src/Examples/accbarframeex01.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-$datay1=array(13,8,19,7,17,6);
-$datay2=array(4,5,2,7,5,25);
-
-// Create the graph.
-$graph = new Graph(350,250);
-$graph->SetScale('textlin');
-$graph->SetMarginColor('white');
-
-// Setup title
-$graph->title->Set('Acc bar with gradient');
-
-// Create the first bar
-$bplot = new BarPlot($datay1);
-$bplot->SetFillGradient('AntiqueWhite2','AntiqueWhite4:0.8',GRAD_VERT);
-$bplot->SetColor('darkred');
-
-// Create the second bar
-$bplot2 = new BarPlot($datay2);
-$bplot2->SetFillGradient('olivedrab1','olivedrab4',GRAD_VERT);
-$bplot2->SetColor('darkgreen');
-
-// And join them in an accumulated bar
-$accbplot = new AccBarPlot(array($bplot,$bplot2));
-$graph->Add($accbplot);
-
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/accbarframeex02.php b/#jpgraph/src/Examples/accbarframeex02.php
deleted file mode 100644
index aa150dec..00000000
--- a/#jpgraph/src/Examples/accbarframeex02.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-$datay1=array(13,8,19,7,17,6);
-$datay2=array(4,5,2,7,5,25);
-
-// Create the graph.
-$graph = new Graph(350,250);
-$graph->SetScale('textlin');
-$graph->SetMarginColor('white');
-
-// Setup title
-$graph->title->Set('Acc bar with gradient');
-
-// Create the first bar
-$bplot = new BarPlot($datay1);
-$bplot->SetFillGradient('AntiqueWhite2','AntiqueWhite4:0.8',GRAD_VERT);
-$bplot->SetColor('darkred');
-
-// Create the second bar
-$bplot2 = new BarPlot($datay2);
-$bplot2->SetFillGradient('olivedrab1','olivedrab4',GRAD_VERT);
-$bplot2->SetColor('darkgreen');
-
-// And join them in an accumulated bar
-$accbplot = new AccBarPlot(array($bplot,$bplot2));
-$accbplot->SetColor('red');
-$accbplot->SetWeight(1);
-$graph->Add($accbplot);
-
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/accbarframeex03.php b/#jpgraph/src/Examples/accbarframeex03.php
deleted file mode 100644
index 37f3157b..00000000
--- a/#jpgraph/src/Examples/accbarframeex03.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-$datay1=array(13,8,19,7,17,6);
-$datay2=array(4,5,2,7,5,25);
-
-// Create the graph.
-$graph = new Graph(350,250);
-$graph->SetScale('textlin');
-$graph->SetMarginColor('white');
-
-// Setup title
-$graph->title->Set('Acc bar with gradient');
-
-// Create the first bar
-$bplot = new BarPlot($datay1);
-$bplot->SetFillGradient('AntiqueWhite2','AntiqueWhite4:0.8',GRAD_VERT);
-$bplot->SetColor('darkred');
-$bplot->SetWeight(0);
-
-// Create the second bar
-$bplot2 = new BarPlot($datay2);
-$bplot2->SetFillGradient('olivedrab1','olivedrab4',GRAD_VERT);
-$bplot2->SetColor('darkgreen');
-$bplot2->SetWeight(0);
-
-// And join them in an accumulated bar
-$accbplot = new AccBarPlot(array($bplot,$bplot2));
-$accbplot->SetColor('darkgray');
-$accbplot->SetWeight(1);
-$graph->Add($accbplot);
-
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/alphabarex1.php b/#jpgraph/src/Examples/alphabarex1.php
deleted file mode 100644
index 81c821cc..00000000
--- a/#jpgraph/src/Examples/alphabarex1.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-// Some data
-$datay1=array(140,110,50,60);
-$datay2=array(35,90,190,190);
-$datay3=array(20,60,70,140);
-
-// Create the basic graph
-$graph = new Graph(450,250,'auto');	
-$graph->SetScale("textlin");
-$graph->img->SetMargin(40,80,30,40);
-
-// Adjust the position of the legend box
-$graph->legend->Pos(0.02,0.15);
-
-// Adjust the color for theshadow of the legend
-$graph->legend->SetShadow('darkgray@0.5');
-$graph->legend->SetFillColor('lightblue@0.3');
-
-// Get localised version of the month names
-$graph->xaxis->SetTickLabels($gDateLocale->GetShortMonth());
-
-// Set a nice summer (in Stockholm) image
-$graph->SetBackgroundImage('stship.jpg',BGIMG_COPY);
-
-// Set axis titles and fonts
-$graph->xaxis->title->Set('Year 2002');
-$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->title->SetColor('white');
-
-$graph->xaxis->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->SetColor('white');
-
-$graph->yaxis->SetFont(FF_FONT1,FS_BOLD);
-$graph->yaxis->SetColor('white');
-
-//$graph->ygrid->Show(false);
-$graph->ygrid->SetColor('white@0.5');
-
-// Setup graph title
-$graph->title->Set('Using alpha blending with a background');
-// Some extra margin (from the top)
-$graph->title->SetMargin(3);
-$graph->title->SetFont(FF_ARIAL,FS_NORMAL,12);
-
-// Create the three var series we will combine
-$bplot1 = new BarPlot($datay1);
-$bplot2 = new BarPlot($datay2);
-$bplot3 = new BarPlot($datay3);
-
-// Setup the colors with 40% transparency (alpha channel)
-$bplot1->SetFillColor('orange@0.4');
-$bplot2->SetFillColor('brown@0.4');
-$bplot3->SetFillColor('darkgreen@0.4');
-
-// Setup legends
-$bplot1->SetLegend('Label 1');
-$bplot2->SetLegend('Label 2');
-$bplot3->SetLegend('Label 3');
-
-// Setup each bar with a shadow of 50% transparency
-$bplot1->SetShadow('black@0.4');
-$bplot2->SetShadow('black@0.4');
-$bplot3->SetShadow('black@0.4');
-
-$gbarplot = new GroupBarPlot(array($bplot1,$bplot2,$bplot3));
-$gbarplot->SetWidth(0.6);
-$graph->Add($gbarplot);
-
-$graph->Stroke();
-?>
-
diff --git a/#jpgraph/src/Examples/antispamex01.php b/#jpgraph/src/Examples/antispamex01.php
deleted file mode 100644
index 57fe6099..00000000
--- a/#jpgraph/src/Examples/antispamex01.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// Antispam example using a random string
-require_once "jpgraph/jpgraph_antispam.php";
-
-// Create new anti-spam challenge creator
-// Note: Neither '0' (digit) or 'O' (letter) can be used to avoid confusion
-$spam = new AntiSpam();
-
-// Create a random 5 char challenge and return the string generated
-$chars = $spam->Rand(5);
-
-// Stroke random cahllenge
-if( $spam->Stroke() === false ) {
-    die('Illegal or no data to plot');
-}
-
-?>
-
diff --git a/#jpgraph/src/Examples/aqua_example.php b/#jpgraph/src/Examples/aqua_example.php
deleted file mode 100644
index 9c5a650b..00000000
--- a/#jpgraph/src/Examples/aqua_example.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$theme = isset($_GET['theme']) ? $_GET['theme'] : null;
-
-$data = array (
-  0 => array (0 => 79, 1 => -25, 2 => -7, 3 => 85, 4 => -26, 5 => -32, ),
-  1 => array (0 => 76, 1 => 51, 2 => 86, 3 => 12, 4 => -7, 5 => 94, ),
-  2 => array (0 => 49, 1 => 38, 2 => 7, 3 => -40, 4 => 9, 5 => -7, ),
-  3 => array ( 0 => 69, 1 => 96, 2 => 49, 3 => 7, 4 => 92, 5 => -38, ),
-  4 => array ( 0 => 68, 1 => 16, 2 => 82, 3 => -49, 4 => 50, 5 => 7, ),
-  5 => array ( 0 => -37, 1 => 28, 2 => 32, 3 => 6, 4 => 13, 5 => 57, ),
-  6 => array ( 0 => 24, 1 => -11, 2 => 7, 3 => 10, 4 => 51, 5 => 51, ),
-  7 => array ( 0 => 3, 1 => -1, 2 => -12, 3 => 61, 4 => 10, 5 => 47, ),
-  8 => array ( 0 => -47, 1 => -21, 2 => 43, 3 => 53, 4 => 36, 5 => 34, ),
-);
-
-
-// Create the graph. These two calls are always required
-$graph = new Graph(400,300);    
-
-$graph->SetScale("textlin");
-if ($theme) {
-  $graph->SetTheme(new $theme());
-}
-$theme_class = new AquaTheme;
-$graph->SetTheme($theme_class);
-
-$plot = array();
-// Create the bar plots
-for ($i = 0; $i < 4; $i++) {
-  $plot[$i] = new BarPlot($data[$i]);
-  $plot[$i]->SetLegend('plot'.($i+1));
-}
-//$acc1 = new AccBarPlot(array($plot[0], $plot[1]));
-//$acc1->value->Show();
-$gbplot = new GroupBarPlot(array($plot[2], $plot[1] ));
-
-for ($i = 4; $i < 8; $i++) {
-  $plot[$i] = new LinePlot($data[$i]);
-  $plot[$i]->SetLegend('plot'.$i);
-  $plot[$i]->value->Show();
-}
-
-$graph->Add($gbplot);
-$graph->Add($plot[4]);
-
-$title = "AquaTheme Example";
-$title = mb_convert_encoding($title,'UTF-8');
-$graph->title->Set($title);
-$graph->xaxis->title->Set("X-title");
-$graph->yaxis->title->Set("Y-title");
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/axislabelbkgex01.php b/#jpgraph/src/Examples/axislabelbkgex01.php
deleted file mode 100644
index 99c098c2..00000000
--- a/#jpgraph/src/Examples/axislabelbkgex01.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$ydata = array(12,19,3,9,15,10);
-
-// The code to setup a very basic graph
-$graph = new Graph(200,150);
-$graph->SetScale('intlin');
-$graph->SetMargin(30,15,40,30);
-$graph->SetMarginColor('white');
-$graph->SetFrame(true,'blue',3);
-
-$graph->title->Set('Label background');
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,12);
-
-$graph->subtitle->SetFont(FF_ARIAL,FS_NORMAL,10);
-$graph->subtitle->SetColor('darkred');
-$graph->subtitle->Set('"LABELBKG_NONE"');
-
-$graph->SetAxisLabelBackground(LABELBKG_NONE,'orange','red','lightblue','red');
-
-// Use Ariel font
-$graph->xaxis->SetFont(FF_ARIAL,FS_NORMAL,9);
-$graph->yaxis->SetFont(FF_ARIAL,FS_NORMAL,9);
-$graph->xgrid->Show();
-
-// Create the plot line
-$p1 = new LinePlot($ydata);
-$graph->Add($p1);
-
-// Output graph
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/axislabelbkgex02.php b/#jpgraph/src/Examples/axislabelbkgex02.php
deleted file mode 100644
index 2b1740fd..00000000
--- a/#jpgraph/src/Examples/axislabelbkgex02.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$ydata = array(12,19,3,9,15,10);
-
-// The code to setup a very basic graph
-$graph = new Graph(200,150);
-$graph->SetScale('intlin');
-$graph->SetMargin(30,15,40,30);
-$graph->SetMarginColor('white');
-$graph->SetFrame(true,'blue',3);
-
-$graph->title->Set('Label background');
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,12);
-
-$graph->subtitle->SetFont(FF_ARIAL,FS_NORMAL,10);
-$graph->subtitle->SetColor('darkred');
-$graph->subtitle->Set('"LABELBKG_XAXIS"');
-
-$graph->SetAxisLabelBackground(LABELBKG_XAXIS,'orange','red','lightblue','red');
-
-// Use Ariel font
-$graph->xaxis->SetFont(FF_ARIAL,FS_NORMAL,9);
-$graph->yaxis->SetFont(FF_ARIAL,FS_NORMAL,9);
-$graph->xgrid->Show();
-
-// Create the plot line
-$p1 = new LinePlot($ydata);
-$graph->Add($p1);
-
-// Output graph
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/axislabelbkgex03.php b/#jpgraph/src/Examples/axislabelbkgex03.php
deleted file mode 100644
index 9e557112..00000000
--- a/#jpgraph/src/Examples/axislabelbkgex03.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$ydata = array(12,19,3,9,15,10);
-
-// The code to setup a very basic graph
-$graph = new Graph(200,150);
-$graph->SetScale('intlin');
-$graph->SetMargin(30,15,40,30);
-$graph->SetMarginColor('white');
-$graph->SetFrame(true,'blue',3);
-
-$graph->title->Set('Label background');
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,12);
-
-$graph->subtitle->SetFont(FF_ARIAL,FS_NORMAL,10);
-$graph->subtitle->SetColor('darkred');
-$graph->subtitle->Set('"LABELBKG_YAXIS"');
-
-$graph->SetAxisLabelBackground(LABELBKG_YAXIS,'orange','red','lightblue','red');
-
-// Use Ariel font
-$graph->xaxis->SetFont(FF_ARIAL,FS_NORMAL,9);
-$graph->yaxis->SetFont(FF_ARIAL,FS_NORMAL,9);
-$graph->xgrid->Show();
-
-// Create the plot line
-$p1 = new LinePlot($ydata);
-$graph->Add($p1);
-
-// Output graph
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/axislabelbkgex04.php b/#jpgraph/src/Examples/axislabelbkgex04.php
deleted file mode 100644
index eb55a5ff..00000000
--- a/#jpgraph/src/Examples/axislabelbkgex04.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$ydata = array(12,19,3,9,15,10);
-
-// The code to setup a very basic graph
-$graph = new Graph(200,150);
-$graph->SetScale('intlin');
-$graph->SetMargin(30,15,40,30);
-$graph->SetMarginColor('white');
-$graph->SetFrame(true,'blue',3);
-
-$graph->title->Set('Label background');
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,12);
-
-$graph->subtitle->SetFont(FF_ARIAL,FS_NORMAL,10);
-$graph->subtitle->SetColor('darkred');
-$graph->subtitle->Set('"LABELBKG_YAXISFULL"');
-
-$graph->SetAxisLabelBackground(LABELBKG_YAXISFULL,'orange','red','lightblue','red');
-
-// Use Ariel font
-$graph->xaxis->SetFont(FF_ARIAL,FS_NORMAL,9);
-$graph->yaxis->SetFont(FF_ARIAL,FS_NORMAL,9);
-$graph->xgrid->Show();
-
-// Create the plot line
-$p1 = new LinePlot($ydata);
-$graph->Add($p1);
-
-// Output graph
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/axislabelbkgex05.php b/#jpgraph/src/Examples/axislabelbkgex05.php
deleted file mode 100644
index 29a04f07..00000000
--- a/#jpgraph/src/Examples/axislabelbkgex05.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$ydata = array(12,19,3,9,15,10);
-
-// The code to setup a very basic graph
-$graph = new Graph(200,150);
-$graph->SetScale('intlin');
-$graph->SetMargin(30,15,40,30);
-$graph->SetMarginColor('white');
-$graph->SetFrame(true,'blue',3);
-
-$graph->title->Set('Label background');
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,12);
-
-$graph->subtitle->SetFont(FF_ARIAL,FS_NORMAL,10);
-$graph->subtitle->SetColor('darkred');
-$graph->subtitle->Set('"LABELBKG_XAXISFULL"');
-
-$graph->SetAxisLabelBackground(LABELBKG_XAXISFULL,'orange','red','lightblue','red');
-
-// Use Ariel font
-$graph->xaxis->SetFont(FF_ARIAL,FS_NORMAL,9);
-$graph->yaxis->SetFont(FF_ARIAL,FS_NORMAL,9);
-$graph->xgrid->Show();
-
-// Create the plot line
-$p1 = new LinePlot($ydata);
-$graph->Add($p1);
-
-// Output graph
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/axislabelbkgex06.php b/#jpgraph/src/Examples/axislabelbkgex06.php
deleted file mode 100644
index 8ad0d812..00000000
--- a/#jpgraph/src/Examples/axislabelbkgex06.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$ydata = array(12,19,3,9,15,10);
-
-// The code to setup a very basic graph
-$graph = new Graph(200,150);
-$graph->SetScale('intlin');
-$graph->SetMargin(30,15,40,30);
-$graph->SetMarginColor('white');
-$graph->SetFrame(true,'blue',3);
-
-$graph->title->Set('Label background');
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,12);
-
-$graph->subtitle->SetFont(FF_ARIAL,FS_NORMAL,10);
-$graph->subtitle->SetColor('darkred');
-$graph->subtitle->Set('"LABELBKG_XYFULL"');
-
-$graph->SetAxisLabelBackground(LABELBKG_XYFULL,'orange','red','lightblue','red');
-
-// Use Ariel font
-$graph->xaxis->SetFont(FF_ARIAL,FS_NORMAL,9);
-$graph->yaxis->SetFont(FF_ARIAL,FS_NORMAL,9);
-$graph->xgrid->Show();
-
-// Create the plot line
-$p1 = new LinePlot($ydata);
-$graph->Add($p1);
-
-// Output graph
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/axislabelbkgex07.php b/#jpgraph/src/Examples/axislabelbkgex07.php
deleted file mode 100644
index c23d07fc..00000000
--- a/#jpgraph/src/Examples/axislabelbkgex07.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$ydata = array(12,19,3,9,15,10);
-
-// The code to setup a very basic graph
-$graph = new Graph(200,150);
-$graph->SetScale('intlin');
-$graph->SetMargin(30,15,40,30);
-$graph->SetMarginColor('white');
-$graph->SetFrame(true,'blue',3);
-
-$graph->title->Set('Label background');
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,12);
-
-$graph->subtitle->SetFont(FF_ARIAL,FS_NORMAL,10);
-$graph->subtitle->SetColor('darkred');
-$graph->subtitle->Set('"LABELBKG_XY"');
-
-$graph->SetAxisLabelBackground(LABELBKG_XY,'orange','red','lightblue','red');
-
-// Use Ariel font
-$graph->xaxis->SetFont(FF_ARIAL,FS_NORMAL,9);
-$graph->yaxis->SetFont(FF_ARIAL,FS_NORMAL,9);
-$graph->xgrid->Show();
-
-// Create the plot line
-$p1 = new LinePlot($ydata);
-$graph->Add($p1);
-
-// Output graph
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/background_type_ex0.php b/#jpgraph/src/Examples/background_type_ex0.php
deleted file mode 100644
index 1c4e7456..00000000
--- a/#jpgraph/src/Examples/background_type_ex0.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-// Some data
-$ydata = array(11,3,8,12,5,1,9,13,5,7);
-
-// Create the graph. These two calls are always required
-$graph = new Graph(350,250);
-$graph->SetScale("textlin");
-$graph->SetMargin(40,40,50,50);
-
-// Setup the grid and plotarea box
-$graph->ygrid->SetLineStyle('dashed');
-$graph->ygrid->setColor('darkgray');
-$graph->SetBox(true);
-
-// Steup graph titles
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,12);
-$graph->title->Set('Using background image');
-$graph->subtitle->SetFont(FF_COURIER,FS_BOLD,11);
-$graph->subtitle->Set('"BGIMG_COPY"');
-$graph->subtitle->SetColor('darkred');
-
-// Add background with 25% mix
-$graph->SetBackgroundImage('heat1.jpg',BGIMG_COPY);
-$graph->SetBackgroundImageMix(25);
-
-// Create the linear plot
-$lineplot=new LinePlot($ydata);
-$lineplot->SetColor("blue");
-
-// Add the plot to the graph
-$graph->Add($lineplot);
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/background_type_ex1.php b/#jpgraph/src/Examples/background_type_ex1.php
deleted file mode 100644
index cdd3cced..00000000
--- a/#jpgraph/src/Examples/background_type_ex1.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-// Some data
-$ydata = array(11,3,8,12,5,1,9,13,5,7);
-
-// Create the graph. These two calls are always required
-$graph = new Graph(350,250);
-$graph->SetScale("textlin");
-$graph->SetMargin(40,40,50,50);
-
-// Setup the grid and plotarea box
-$graph->ygrid->SetLineStyle('dashed');
-$graph->ygrid->setColor('darkgray');
-$graph->SetBox(true);
-
-// Steup graph titles
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,12);
-$graph->title->Set('Using background image');
-$graph->subtitle->SetFont(FF_COURIER,FS_BOLD,11);
-$graph->subtitle->Set('"BGIMG_CENTER"');
-$graph->subtitle->SetColor('darkred');
-
-// Add background with 25% mix
-$graph->SetBackgroundImage('heat1.jpg',BGIMG_CENTER);
-$graph->SetBackgroundImageMix(25);
-
-// Create the linear plot
-$lineplot=new LinePlot($ydata);
-$lineplot->SetColor("blue");
-
-// Add the plot to the graph
-$graph->Add($lineplot);
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/background_type_ex2.php b/#jpgraph/src/Examples/background_type_ex2.php
deleted file mode 100644
index 932f7a52..00000000
--- a/#jpgraph/src/Examples/background_type_ex2.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-// Some data
-$ydata = array(11,3,8,12,5,1,9,13,5,7);
-
-// Create the graph. These two calls are always required
-$graph = new Graph(350,250);
-$graph->SetScale("textlin");
-$graph->SetMargin(40,40,50,50);
-
-// Setup the grid and plotarea box
-$graph->ygrid->SetLineStyle('dashed');
-$graph->ygrid->setColor('darkgray');
-$graph->SetBox(true);
-
-// Steup graph titles
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,12);
-$graph->title->Set('Using background image');
-$graph->subtitle->SetFont(FF_COURIER,FS_BOLD,11);
-$graph->subtitle->Set('"BGIMG_FREE"');
-$graph->subtitle->SetColor('darkred');
-
-// Add background with 25% mix
-$graph->SetBackgroundImage('heat1.jpg',BGIMG_FREE);
-$graph->SetBackgroundImageMix(25);
-
-// Create the linear plot
-$lineplot=new LinePlot($ydata);
-$lineplot->SetColor("blue");
-
-// Add the plot to the graph
-$graph->Add($lineplot);
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/background_type_ex3.php b/#jpgraph/src/Examples/background_type_ex3.php
deleted file mode 100644
index 8b265c85..00000000
--- a/#jpgraph/src/Examples/background_type_ex3.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-// Some data
-$ydata = array(11,3,8,12,5,1,9,13,5,7);
-
-// Create the graph. These two calls are always required
-$graph = new Graph(350,250);
-$graph->SetScale("textlin");
-$graph->SetMargin(40,40,50,50);
-
-// Setup the grid and plotarea box
-$graph->ygrid->SetLineStyle('dashed');
-$graph->ygrid->setColor('darkgray');
-$graph->SetBox(true);
-
-// Steup graph titles
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,12);
-$graph->title->Set('Using background image');
-$graph->subtitle->SetFont(FF_COURIER,FS_BOLD,11);
-$graph->subtitle->Set('"BGIMG_FILLPLOT"');
-$graph->subtitle->SetColor('darkred');
-
-// Add background with 25% mix
-$graph->SetBackgroundImage('heat1.jpg',BGIMG_FILLPLOT);
-$graph->SetBackgroundImageMix(25);
-
-// Create the linear plot
-$lineplot=new LinePlot($ydata);
-$lineplot->SetColor("blue");
-
-// Add the plot to the graph
-$graph->Add($lineplot);
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/background_type_ex4.php b/#jpgraph/src/Examples/background_type_ex4.php
deleted file mode 100644
index 3ff1ceba..00000000
--- a/#jpgraph/src/Examples/background_type_ex4.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-// Some data
-$ydata = array(11,3,8,12,5,1,9,13,5,7);
-
-// Create the graph. These two calls are always required
-$graph = new Graph(350,250);
-$graph->SetScale("textlin");
-$graph->SetMargin(40,40,50,50);
-
-// Setup the grid and plotarea box
-$graph->ygrid->SetLineStyle('dashed');
-$graph->ygrid->setColor('darkgray');
-$graph->SetBox(true);
-
-// Steup graph titles
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,12);
-$graph->title->Set('Using background image');
-$graph->subtitle->SetFont(FF_COURIER,FS_BOLD,11);
-$graph->subtitle->Set('"BGIMG_FILLFRAME"');
-$graph->subtitle->SetColor('darkred');
-
-// Add background with 25% mix
-$graph->SetBackgroundImage('heat1.jpg',BGIMG_FILLFRAME);
-$graph->SetBackgroundImageMix(25);
-
-// Create the linear plot
-$lineplot=new LinePlot($ydata);
-$lineplot->SetColor("blue");
-
-// Add the plot to the graph
-$graph->Add($lineplot);
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/backgroundex01.php b/#jpgraph/src/Examples/backgroundex01.php
deleted file mode 100644
index fac8e937..00000000
--- a/#jpgraph/src/Examples/backgroundex01.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-// Some data
-$datay = array(28,19,18,23,12,11);
-$data2y = array(14,18,33,29,39,55);
-
-// A nice graph with anti-aliasing
-$graph = new Graph(400,200);
-$graph->img->SetMargin(40,180,40,40);	
-$graph->SetBackgroundImage("tiger_bkg.png",BGIMG_FILLPLOT);
-
-$graph->img->SetAntiAliasing("white");
-$graph->SetScale("textlin");
-$graph->SetShadow();
-$graph->title->Set("Background image");
-
-// Use built in font
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-
-// Slightly adjust the legend from it's default position in the
-// top right corner. 
-$graph->legend->Pos(0.05,0.5,"right","center");
-
-// Create the first line
-$p1 = new LinePlot($datay);
-$p1->mark->SetType(MARK_FILLEDCIRCLE);
-$p1->mark->SetFillColor("red");
-$p1->mark->SetWidth(4);
-$p1->SetColor("blue");
-$p1->SetCenter();
-$p1->SetLegend("Triumph Tiger -98");
-$graph->Add($p1);
-
-// ... and the second
-$p2 = new LinePlot($data2y);
-$p2->mark->SetType(MARK_STAR);
-$p2->mark->SetFillColor("red");
-$p2->mark->SetWidth(4);
-$p2->SetColor("red");
-$p2->SetCenter();
-$p2->SetLegend("New tiger -99");
-$graph->Add($p2);
-
-// Output line
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/backgroundex02.php b/#jpgraph/src/Examples/backgroundex02.php
deleted file mode 100644
index 542be5d1..00000000
--- a/#jpgraph/src/Examples/backgroundex02.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-// Some data
-$datay = array(28,19,18,23,12,11);
-$data2y = array(14,18,33,29,39,55);
-
-// A nice graph with anti-aliasing
-$graph = new Graph(400,200);
-$graph->img->SetMargin(40,180,40,40);	
-$graph->SetBackgroundImage("tiger_bkg.png",BGIMG_FILLFRAME);
-
-$graph->img->SetAntiAliasing();
-$graph->SetScale("textlin");
-$graph->SetShadow();
-$graph->title->Set("Background image");
-
-// Use built in font
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-
-// Slightly adjust the legend from it's default position in the
-// top right corner. 
-$graph->legend->Pos(0.05,0.5,"right","center");
-
-// Create the first line
-$p1 = new LinePlot($datay);
-$p1->mark->SetType(MARK_FILLEDCIRCLE);
-$p1->mark->SetFillColor("red");
-$p1->mark->SetWidth(4);
-$p1->SetColor("blue");
-$p1->SetCenter();
-$p1->SetLegend("Triumph Tiger -98");
-$graph->Add($p1);
-
-// ... and the second
-$p2 = new LinePlot($data2y);
-$p2->mark->SetType(MARK_STAR);
-$p2->mark->SetFillColor("red");
-$p2->mark->SetWidth(4);
-$p2->SetColor("red");
-$p2->SetCenter();
-$p2->SetLegend("New tiger -99");
-$graph->Add($p2);
-
-// Output line
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/backgroundex03.php b/#jpgraph/src/Examples/backgroundex03.php
deleted file mode 100644
index a1c1337d..00000000
--- a/#jpgraph/src/Examples/backgroundex03.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-// Some data
-$datay = array(28,19,18,23,12,11);
-$data2y = array(14,18,33,29,39,55);
-
-// A nice graph with anti-aliasing
-$graph = new Graph(400,200);
-$graph->img->SetMargin(40,180,40,40);	
-$graph->SetBackgroundImage("tiger_bkg.png",BGIMG_COPY);
-
-$graph->img->SetAntiAliasing("white");
-$graph->SetScale("textlin");
-$graph->SetShadow();
-$graph->title->Set("Background image");
-
-// Use built in font
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-
-// Slightly adjust the legend from it's default position in the
-// top right corner. 
-$graph->legend->Pos(0.05,0.5,"right","center");
-
-// Create the first line
-$p1 = new LinePlot($datay);
-$p1->mark->SetType(MARK_FILLEDCIRCLE);
-$p1->mark->SetFillColor("red");
-$p1->mark->SetWidth(4);
-$p1->SetColor("blue");
-$p1->SetCenter();
-$p1->SetLegend("Triumph Tiger -98");
-$graph->Add($p1);
-
-// ... and the second
-$p2 = new LinePlot($data2y);
-$p2->mark->SetType(MARK_STAR);
-$p2->mark->SetFillColor("red");
-$p2->mark->SetWidth(4);
-$p2->SetColor("red");
-$p2->SetCenter();
-$p2->SetLegend("New tiger -99");
-$graph->Add($p2);
-
-// Output line
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/balloonex1.php b/#jpgraph/src/Examples/balloonex1.php
deleted file mode 100644
index c963d76c..00000000
--- a/#jpgraph/src/Examples/balloonex1.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// $Id: balloonex1.php,v 1.5 2002/12/15 16:08:51 aditus Exp $
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_scatter.php');
-
-// Some data
-$datax = array(1,2,3,4,5,6,7,8);
-$datay = array(12,23,95,18,65,28,86,44);
-// Callback for markers
-// Must return array(width,color,fill_color)
-// If any of the returned values are "" then the
-// default value for that parameter will be used.
-function FCallback($aVal) {
-    // This callback will adjust the fill color and size of
-    // the datapoint according to the data value according to
-    if( $aVal < 30 ) $c = "blue";
-    elseif( $aVal < 70 ) $c = "green";
-    else $c="red";
-    return array(floor($aVal/3),"",$c);
-}
-
-// Setup a basic graph
-$graph = new Graph(400,300,'auto');
-$graph->SetScale("linlin");
-$graph->img->SetMargin(40,100,40,40);		
-$graph->SetShadow();
-$graph->title->Set("Example of ballon scatter plot");
-// Use a lot of grace to get large scales
-$graph->yaxis->scale->SetGrace(50,10);
-
-// Make sure X-axis as at the bottom of the graph
-$graph->xaxis->SetPos('min');
-
-// Create the scatter plot
-$sp1 = new ScatterPlot($datay,$datax);
-$sp1->mark->SetType(MARK_FILLEDCIRCLE);
-
-// Uncomment the following two lines to display the values
-$sp1->value->Show();
-$sp1->value->SetFont(FF_FONT1,FS_BOLD);
-
-// Specify the callback
-$sp1->mark->SetCallback("FCallback");
-
-// Setup the legend for plot
-$sp1->SetLegend('Year 2002');
-
-// Add the scatter plot to the graph
-$graph->Add($sp1);
-
-// ... and send to browser
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/balloonex2.php b/#jpgraph/src/Examples/balloonex2.php
deleted file mode 100644
index 257a6648..00000000
--- a/#jpgraph/src/Examples/balloonex2.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_scatter.php');
-
-// Each ballon is specificed by four values. 
-// (X,Y,Size,Color)
-$data = array(
-    array(1,12,10,'orange'),
-    array(3,41,15,'red'),
-    array(4,5,19,'lightblue'),
-    array(5,70,22,'yellow')
-);
-
-
-
-// We need to create X,Y data vectors suitable for the
-// library from the above raw data.
-$n = count($data);
-for( $i=0; $i < $n; ++$i ) {
-    
-    $datax[$i] = $data[$i][0];
-    $datay[$i] = $data[$i][1];
-
-    // Create a faster lookup array so we don't have to search
-    // for the correct values in the callback function
-    $format[strval($datax[$i])][strval($datay[$i])] = array($data[$i][2],$data[$i][3]);
-    
-}
-
-
-// Callback for markers
-// Must return array(width,border_color,fill_color,filename,imgscale)
-// If any of the returned values are '' then the
-// default value for that parameter will be used (possible empty)
-function FCallback($aYVal,$aXVal) {
-    global $format;
-    return array($format[strval($aXVal)][strval($aYVal)][0],'',
-		 $format[strval($aXVal)][strval($aYVal)][1],'','');
-}
-
-// Setup a basic graph
-$graph = new Graph(450,300,'auto');
-$graph->SetScale("intlin");
-$graph->SetMargin(40,40,40,40);		
-$graph->SetMarginColor('wheat');
-
-$graph->title->Set("Example of ballon scatter plot with X,Y callback");
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,12);
-$graph->title->SetMargin(10);
-
-// Use a lot of grace to get large scales since the ballon have
-// size and we don't want them to collide with the X-axis
-$graph->yaxis->scale->SetGrace(50,10);
-$graph->xaxis->scale->SetGrace(50,10);
-
-// Make sure X-axis as at the bottom of the graph and not at the default Y=0
-$graph->xaxis->SetPos('min');
-
-// Set X-scale to start at 0
-$graph->xscale->SetAutoMin(0);
-
-// Create the scatter plot
-$sp1 = new ScatterPlot($datay,$datax);
-$sp1->mark->SetType(MARK_FILLEDCIRCLE);
-
-// Uncomment the following two lines to display the values
-$sp1->value->Show();
-$sp1->value->SetFont(FF_FONT1,FS_BOLD);
-
-// Specify the callback
-$sp1->mark->SetCallbackYX("FCallback");
-
-// Add the scatter plot to the graph
-$graph->Add($sp1);
-
-// ... and send to browser
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/bar2scalesex1.php b/#jpgraph/src/Examples/bar2scalesex1.php
deleted file mode 100644
index 9248e7c1..00000000
--- a/#jpgraph/src/Examples/bar2scalesex1.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-$datay=array(20,30,50,80);
-$datay2=array(430,645,223,690);
-$datazero=array(0,0,0,0);
-
-// Create the graph. 
-$graph = new Graph(450,200);
-$graph->title->Set('Example with 2 scale bars');
-
-// Setup Y and Y2 scales with some "grace"	
-$graph->SetScale("textlin");
-$graph->SetY2Scale("lin");
-$graph->yaxis->scale->SetGrace(30);
-$graph->y2axis->scale->SetGrace(30);
-
-//$graph->ygrid->Show(true,true);
-$graph->ygrid->SetColor('gray','lightgray@0.5');
-
-// Setup graph colors
-$graph->SetMarginColor('white');
-$graph->y2axis->SetColor('darkred');
-
-
-// Create the "dummy" 0 bplot
-$bplotzero = new BarPlot($datazero);
-
-// Create the "Y" axis group
-$ybplot1 = new BarPlot($datay);
-$ybplot1->value->Show();
-$ybplot = new GroupBarPlot(array($ybplot1,$bplotzero));
-
-// Create the "Y2" axis group
-$ybplot2 = new BarPlot($datay2);
-$ybplot2->value->Show();
-$ybplot2->value->SetColor('darkred');
-$ybplot2->SetFillColor('darkred');
-$y2bplot = new GroupBarPlot(array($bplotzero,$ybplot2));
-
-// Add the grouped bar plots to the graph
-$graph->Add($ybplot);
-$graph->AddY2($y2bplot);
-
-// .. and finally stroke the image back to browser
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/bar_csimex1.php b/#jpgraph/src/Examples/bar_csimex1.php
deleted file mode 100644
index 6ae7dbfe..00000000
--- a/#jpgraph/src/Examples/bar_csimex1.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-$datay=array(12,26,9,17,31);
-
-// Create the graph. 
-// One minute timeout for the cached image
-// INLINE_NO means don't stream it back to the browser.
-$graph = new Graph(310,250,'auto');
-$graph->SetScale("textlin");
-$graph->img->SetMargin(60,30,20,40);
-$graph->yaxis->SetTitleMargin(45);
-$graph->yaxis->scale->SetGrace(30);
-$graph->SetShadow();
-
-// Turn the tickmarks
-$graph->xaxis->SetTickSide(SIDE_DOWN);
-$graph->yaxis->SetTickSide(SIDE_LEFT);
-
-// Create a bar pot
-$bplot = new BarPlot($datay);
-
-// Create targets for the image maps. One for each column
-$targ=array("bar_clsmex1.php#1","bar_clsmex1.php#2","bar_clsmex1.php#3","bar_clsmex1.php#4","bar_clsmex1.php#5","bar_clsmex1.php#6");
-$alts=array("val=%d","val=%d","val=%d","val=%d","val=%d","val=%d");
-$bplot->SetCSIMTargets($targ,$alts);
-$bplot->SetFillColor("orange");
-
-// Use a shadow on the bar graphs (just use the default settings)
-$bplot->SetShadow();
-$bplot->value->SetFormat(" $ %2.1f",70);
-$bplot->value->SetFont(FF_ARIAL,FS_NORMAL,9);
-$bplot->value->SetColor("blue");
-$bplot->value->Show();
-
-$graph->Add($bplot);
-
-$graph->title->Set("Image maps barex1");
-$graph->xaxis->title->Set("X-title");
-$graph->yaxis->title->Set("Y-title");
-
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD);
-
-// Send back the HTML page which will call this script again
-// to retrieve the image.
-$graph->StrokeCSIM();
-
-
-?>
diff --git a/#jpgraph/src/Examples/bar_csimex2.php b/#jpgraph/src/Examples/bar_csimex2.php
deleted file mode 100644
index 5a0cbce8..00000000
--- a/#jpgraph/src/Examples/bar_csimex2.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-$data1y=array(12,8,19,3,10,5);
-$data2y=array(8,2,12,7,14,4);
-
-// Create the graph. These two calls are always required
-$graph = new Graph(310,200,'auto');
-$graph->SetScale("textlin");
-$graph->img->SetMargin(40,30,20,40);
-$graph->SetShadow();
-
-// Create the bar plots
-$b1plot = new BarPlot($data1y);
-$b1plot->SetFillColor("orange");
-$targ=array("bar_clsmex2.php#1","bar_clsmex2.php#2","bar_clsmex2.php#3",
-"bar_clsmex2.php#4","bar_clsmex2.php#5","bar_clsmex2.php#6");
-$alts=array("val=%d","val=%d","val=%d","val=%d","val=%d","val=%d");
-$b1plot->SetCSIMTargets($targ,$alts);
-
-$b2plot = new BarPlot($data2y);
-$b2plot->SetFillColor("blue");
-$targ=array("bar_clsmex2.php#7","bar_clsmex2.php#8","bar_clsmex2.php#9",
-"bar_clsmex2.php#10","bar_clsmex2.php#11","bar_clsmex2.php#12");
-$alts=array("val=%d","val=%d","val=%d","val=%d","val=%d","val=%d");
-$b2plot->SetCSIMTargets($targ,$alts);
-
-// Create the grouped bar plot
-$abplot = new AccBarPlot(array($b1plot,$b2plot));
-
-$abplot->SetShadow();
-$abplot->value->Show();
-
-// ...and add it to the graPH
-$graph->Add($abplot);
-
-$graph->title->Set("Image map barex2");
-$graph->xaxis->title->Set("X-title");
-$graph->yaxis->title->Set("Y-title");
-
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD);
-
-
-// Send back the HTML page which will call this script again
-// to retrieve the image.
-$graph->StrokeCSIM();
-
-?>
diff --git a/#jpgraph/src/Examples/bar_csimex3.php b/#jpgraph/src/Examples/bar_csimex3.php
deleted file mode 100644
index 6640319d..00000000
--- a/#jpgraph/src/Examples/bar_csimex3.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// $Id: bar_csimex3.php,v 1.3 2002/08/31 20:03:46 aditus Exp $
-// Horiontal bar graph with image maps
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-$data1y=array(5,8,19,3,10,5);
-$data2y=array(12,2,12,7,14,4);
-
-// Setup the basic parameters for the graph
-$graph = new Graph(400,700);
-$graph->SetAngle(90);
-$graph->SetScale("textlin");
-
-// The negative margins are necessary since we
-// have rotated the image 90 degress and shifted the 
-// meaning of width, and height. This means that the 
-// left and right margins now becomes top and bottom
-// calculated with the image width and not the height.
-$graph->img->SetMargin(-80,-80,210,210);
-
-$graph->SetMarginColor('white');
-
-// Setup title for graph
-$graph->title->Set('Horizontal bar graph');
-$graph->title->SetFont(FF_FONT2,FS_BOLD);
-$graph->subtitle->Set("With image map\nNote: The URL just points back to this image");
-
-// Setup X-axis.
-$graph->xaxis->SetTitle("X-title",'center');
-$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->title->SetAngle(90);
-$graph->xaxis->SetTitleMargin(30);
-$graph->xaxis->SetLabelMargin(15);
-$graph->xaxis->SetLabelAlign('right','center');
-
-// Setup Y-axis
-
-// First we want it at the bottom, i.e. the 'max' value of the
-// x-axis
-$graph->yaxis->SetPos('max');
-
-// Arrange the title
-$graph->yaxis->SetTitle("Turnaround (mkr)",'center');
-$graph->yaxis->SetTitleSide(SIDE_RIGHT);
-$graph->yaxis->title->SetFont(FF_FONT2,FS_BOLD);
-$graph->yaxis->title->SetAngle(0);
-$graph->yaxis->title->Align('center','top');
-$graph->yaxis->SetTitleMargin(30);
-
-// Arrange the labels
-$graph->yaxis->SetLabelSide(SIDE_RIGHT);
-$graph->yaxis->SetLabelAlign('center','top');
-
-// Create the bar plots with image maps
-$b1plot = new BarPlot($data1y);
-$b1plot->SetFillColor("orange");
-$targ=array("bar_clsmex2.php#1","bar_clsmex2.php#2","bar_clsmex2.php#3",
-            "bar_clsmex2.php#4","bar_clsmex2.php#5","bar_clsmex2.php#6");
-$alts=array("val=%d","val=%d","val=%d","val=%d","val=%d","val=%d");
-$b1plot->SetCSIMTargets($targ,$alts);
-
-$b2plot = new BarPlot($data2y);
-$b2plot->SetFillColor("blue");
-$targ=array("bar_clsmex2.php#7","bar_clsmex2.php#8","bar_clsmex2.php#9",
-            "bar_clsmex2.php#10","bar_clsmex2.php#11","bar_clsmex2.php#12");
-$alts=array("val=%d","val=%d","val=%d","val=%d","val=%d","val=%d");
-$b2plot->SetCSIMTargets($targ,$alts);
-
-// Create the accumulated bar plot
-$abplot = new AccBarPlot(array($b1plot,$b2plot));
-$abplot->SetShadow();
-
-// We want to display the value of each bar at the top
-$abplot->value->Show();
-$abplot->value->SetFont(FF_FONT1,FS_NORMAL);
-$abplot->value->SetAlign('left','center');
-$abplot->value->SetColor("black","darkred");
-$abplot->value->SetFormat('%.1f mkr');
-
-// ...and add it to the graph
-$graph->Add($abplot);
-
-// Send back the HTML page which will call this script again
-// to retrieve the image.
-$graph->StrokeCSIM();
-
-?>
diff --git a/#jpgraph/src/Examples/barcode_errhandling_ex0.php b/#jpgraph/src/Examples/barcode_errhandling_ex0.php
deleted file mode 100644
index 4f5b5393..00000000
--- a/#jpgraph/src/Examples/barcode_errhandling_ex0.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-// ==============================================
-// Output Image using Code 39 using only default values
-// ==============================================
-require_once ('jpgraph/jpgraph_barcode.php');
-
-try {
-$encoder = BarcodeFactory::Create(ENCODING_CODE39);
-$e = BackendFactory::Create(BACKEND_IMAGE,$encoder);
-$e->Stroke('abc123');
-} catch( JpGraphException $e ) {
-	//echo 'Error: ' . $e->getMessage()."\n";
-	JpGraphError::Raise($e->getMessage());
-}
-
-?>
diff --git a/#jpgraph/src/Examples/barcode_ex0.php b/#jpgraph/src/Examples/barcode_ex0.php
deleted file mode 100644
index 021b5c7c..00000000
--- a/#jpgraph/src/Examples/barcode_ex0.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-// ==============================================
-// Output Image using Code 39 using only default values
-// ==============================================
-require_once ('jpgraph/jpgraph_barcode.php');
-
-$encoder = BarcodeFactory::Create(ENCODING_CODE39);
-$e = BackendFactory::Create(BACKEND_IMAGE,$encoder);
-$e->Stroke('ABC123');
-
-?>
diff --git a/#jpgraph/src/Examples/barcode_ex1.php b/#jpgraph/src/Examples/barcode_ex1.php
deleted file mode 100644
index df7653b5..00000000
--- a/#jpgraph/src/Examples/barcode_ex1.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-// ==============================================
-// Output Image using Code 128
-// ==============================================
-require_once ('jpgraph/jpgraph_barcode.php');
-
-$encoder = BarcodeFactory::Create(ENCODING_CODE128);
-$e = BackendFactory::Create(BACKEND_PS,$encoder);
-$e->SetModuleWidth(2);
-$e->SetHeight(20);
-echo nl2br($e->Stroke('3125134772'));
-
-
-?>
diff --git a/#jpgraph/src/Examples/barcode_ex2.php b/#jpgraph/src/Examples/barcode_ex2.php
deleted file mode 100644
index 8fce58e6..00000000
--- a/#jpgraph/src/Examples/barcode_ex2.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-// ==============================================
-// Output Postscript of nterleaved 2 of 5
-// ==============================================
-require_once ('jpgraph/jpgraph_barcode.php');
-
-$encoder = BarcodeFactory::Create(ENCODING_CODEI25);
-$e = BackendFactory::Create(BACKEND_PS,$encoder);
-$e->SetModuleWidth(2);
-$e->SetHeight(70);
-$ps = $e->Stroke('3125134772');
-echo nl2br(htmlspecialchars($ps));
-
-?>
diff --git a/#jpgraph/src/Examples/barcode_ex3.php b/#jpgraph/src/Examples/barcode_ex3.php
deleted file mode 100644
index a63f4ad4..00000000
--- a/#jpgraph/src/Examples/barcode_ex3.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-// ==============================================
-// Output Encapsulated Postscript of interleaved 2 of 5
-// ==============================================
-require_once ('jpgraph/jpgraph_barcode.php');
-
-echo "Start ...<br>";
-$encoder = BarcodeFactory::Create(ENCODING_CODEI25);
-$e = BackendFactory::Create(BACKEND_PS,$encoder);
-$e->SetModuleWidth(2);
-$e->SetHeight(70);
-$e->SetEPS();
-$ps = $e->Stroke('3125134772');
-echo nl2br(htmlspecialchars($ps));
-
-
-?>
diff --git a/#jpgraph/src/Examples/barcode_ex4.php b/#jpgraph/src/Examples/barcode_ex4.php
deleted file mode 100644
index 721b56ba..00000000
--- a/#jpgraph/src/Examples/barcode_ex4.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-// ==============================================
-// Output Image using Code Interleaved 2 of 5
-// ==============================================
-require_once ('jpgraph/jpgraph_barcode.php');
-
-$encoder = BarcodeFactory::Create(ENCODING_CODEI25);
-$e = BackendFactory::Create(BACKEND_IMAGE,$encoder);
-$e->SetModuleWidth(2);
-$e->Stroke('1234');
-
-?>
diff --git a/#jpgraph/src/Examples/barcode_usps_example.php b/#jpgraph/src/Examples/barcode_usps_example.php
deleted file mode 100644
index 80469bea..00000000
--- a/#jpgraph/src/Examples/barcode_usps_example.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-// =======================================================
-// Example of how to format US Postal shipping information
-// =======================================================
-require_once ('jpgraph/jpgraph_barcode.php');
-
-// The Full barcode standard is described in
-// http://www.usps.com/cpim/ftp/pubs/pub91/91c4.html#508hdr1
-//
-// The data start with AI=420 which means
-// "Ship to/Deliver To Postal Code (within single authority)
-//
-class USPS_Confirmation {
-    function USPS_Confirmation() {
-    }
-
-    // Private utility function
-    function _USPS_chkd($aData) {
-	$n = strlen($aData);
-
-	// Add all even numbers starting from position 1 from the end
-	$et = 0 ;
-	for( $i=1; $i <= $n; $i+=2 ) {
-	    $d = intval(substr($aData,-$i,1));
-	    $et += $d;
-	}
-
-	// Add all odd numbers starting from position 2 from the end
-	$ot = 0 ;
-	for( $i=2; $i <= $n; $i+=2 ) {
-	    $d = intval(substr($aData,-$i,1));
-	    $ot += $d;
-	}
-	$tot = 3*$et + $ot;
-	$chkdigit = (10 - ($tot % 10))%10;;
-	return $chkdigit;
-    }
-
-    // Get type 1 of confirmation code (with ZIP)
-    function GetPICwithZIP($aZIP,$aServiceType,$aDUNS,$aSeqNbr) {
-	// Convert to USPS format with AI=420 and extension starting with AI=91
-	$data = '420'. $aZIP . '91' . $aServiceType . $aDUNS . $aSeqNbr;
-	// Only calculate the checkdigit from the AI=91 and forward
-	// and do not include the ~1 (FUNC1) in the calculation
-	$cd = $this->_USPS_chkd(substr($data,8));
-	$data = '420'. $aZIP . '~191' . $aServiceType . $aDUNS . $aSeqNbr;
-	return $data . $cd;
-    }
-
-    // Get type 2 of confirmation code (without ZIP)
-    function GetPIC($aServiceType,$aDUNS,$aSeqNbr) {
-	// Convert to USPS format with AI=91
-	$data = '91' . $aServiceType . $aDUNS . $aSeqNbr;
-	$cd = $this->_USPS_chkd($data);
-	return $data . $cd;
-    }
-
-}
-
-$usps = new USPS_Confirmation();
-$zip     = '92663';
-$service = '21';
-$DUNS    = '805213907';
-$seqnr   = '04508735';
-$data = $usps->GetPICwithZIP($zip,$service,$DUNS,$seqnr);
-//$data = $usps->GetPIC('01','123456789','00000001');
-
-$encoder = BarcodeFactory::Create(ENCODING_EAN128);
-$e = BackendFactory::Create(BACKEND_IMAGE,$encoder);
-$e->SetModuleWidth(2);
-$e->SetFont(FF_ARIAL,FS_NORMAL,14);
-$e->Stroke($data);
-
-?>
\ No newline at end of file
diff --git a/#jpgraph/src/Examples/barcsim_details.php b/#jpgraph/src/Examples/barcsim_details.php
deleted file mode 100644
index 68fb2166..00000000
--- a/#jpgraph/src/Examples/barcsim_details.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-
-if( empty($_GET['id']) ) {
-    echo 'Incorrect argument(s) to script <b>'.basename(__FILE__).'</b>.'; 
-}
-else {
-    echo 'Some details on bar with id='.$_GET['id'];
-}
-
-?>
diff --git a/#jpgraph/src/Examples/barcsim_popup.php b/#jpgraph/src/Examples/barcsim_popup.php
deleted file mode 100644
index 57864584..00000000
--- a/#jpgraph/src/Examples/barcsim_popup.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-// Some random data to plot
-$datay=array(12,26,9,17,31);
-
-// Create the graph. 
-$graph = new Graph(400,250);
-$graph->SetScale("textlin");
-
-// Create a bar pot
-$bplot = new BarPlot($datay);
-
-// Create targets for the image maps so that the details are opened in a separate window
-$fmtStr = "javascript:window.open('barcsim_details.php?id=%d','_new','width=500,height=300');void(0)";
-$n = count($datay);
-$targ=array();
-$alts=array();
-for($i=0; $i < $n; ++$i) {
-    $targ[$i] = sprintf($fmtStr,$i+1);
-    $alts[$i] = 'val=%d'; 
-    // Note: The format placeholder val=%d will be replaced by the actual value in the ouput HTML by the 
-    // library so that when the user hoovers the mouse over the bar the actual numerical value of the bar 
-    // will be dísplayed
-}
-$bplot->SetCSIMTargets($targ,$alts);
-
-// Add plot to graph
-$graph->Add($bplot);
-
-// Setup the title, also wih a CSIM area
-$graph->title->Set("CSIM with popup windows");
-$graph->title->SetFont(FF_FONT2,FS_BOLD);
-// Assume we can give more details on the graph
-$graph->title->SetCSIMTarget(sprintf($fmtStr,-1),'Title for Bar'); 
-
-// Send back the HTML page which will call this script again to retrieve the image.
-$graph->StrokeCSIM();
-
-?>
diff --git a/#jpgraph/src/Examples/barformatcallbackex1.php b/#jpgraph/src/Examples/barformatcallbackex1.php
deleted file mode 100644
index f49a9e28..00000000
--- a/#jpgraph/src/Examples/barformatcallbackex1.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-$data = array(0.1235,0.4567,0.67,0.45,0.832);
-
-// Callback function
-// Get called with the actual value and should return the
-// value to be displayed as a string
-function cbFmtPercentage($aVal) {
-    return sprintf("%.1f%%",100*$aVal); // Convert to string
-}
-
-// Create the graph. 
-$graph = new Graph(400,300);	
-$graph->SetScale("textlin");
-
-// Create a bar plots
-$bar1 = new BarPlot($data);
-
-// Setup the callback function
-$bar1->value->SetFormatCallback("cbFmtPercentage");
-$bar1->value->Show();
-
-// Add the plot to the graph
-$graph->Add($bar1);
-
-// .. and send the graph back to the browser
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/bargradex1.php b/#jpgraph/src/Examples/bargradex1.php
deleted file mode 100644
index e325223f..00000000
--- a/#jpgraph/src/Examples/bargradex1.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// Example for use of JpGraph,
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-// We need some data
-$datay=array(0.13,0.25,0.21,0.35,0.31,0.06);
-$datax=array("January","February","March","April","May","June");
-
-// Setup the graph.
-$graph = new Graph(400,240);
-$graph->img->SetMargin(60,20,35,75);
-$graph->SetScale("textlin");
-$graph->SetMarginColor("lightblue:1.1");
-$graph->SetShadow();
-
-// Set up the title for the graph
-$graph->title->Set("Bar gradient with left reflection");
-$graph->title->SetMargin(8);
-$graph->title->SetFont(FF_VERDANA,FS_BOLD,12);
-$graph->title->SetColor("darkred");
-
-// Setup font for axis
-$graph->xaxis->SetFont(FF_VERDANA,FS_NORMAL,10);
-$graph->yaxis->SetFont(FF_VERDANA,FS_NORMAL,10);
-
-// Show 0 label on Y-axis (default is not to show)
-$graph->yscale->ticks->SupressZeroLabel(false);
-
-// Setup X-axis labels
-$graph->xaxis->SetTickLabels($datax);
-$graph->xaxis->SetLabelAngle(50);
-
-// Create the bar pot
-$bplot = new BarPlot($datay);
-$bplot->SetWidth(0.6);
-
-// Setup color for gradient fill style
-$bplot->SetFillGradient("navy:0.9","navy:1.85",GRAD_LEFT_REFLECTION);
-
-// Set color for the frame of each bar
-$bplot->SetColor("white");
-$graph->Add($bplot);
-
-// Finally send the graph to the browser
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/bargradex2.php b/#jpgraph/src/Examples/bargradex2.php
deleted file mode 100644
index 02da925d..00000000
--- a/#jpgraph/src/Examples/bargradex2.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// Example for use of JpGraph, 
-// ljp, 01/03/01 20:32
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-// We need some data
-$datay=array(-0.13,0.25,-0.21,0.35,0.31,0.04);
-$datax=array("Jan","Feb","Mar","Apr","May","June");
-
-// Setup the graph. 
-$graph = new Graph(400,200);	
-$graph->img->SetMargin(60,20,30,50);
-$graph->SetScale("textlin");
-$graph->SetMarginColor("silver");
-$graph->SetShadow();
-
-// Set up the title for the graph
-$graph->title->Set("Example negative bars");
-$graph->title->SetFont(FF_VERDANA,FS_NORMAL,18);
-$graph->title->SetColor("darkred");
-
-// Setup font for axis
-$graph->xaxis->SetFont(FF_VERDANA,FS_NORMAL,12);
-$graph->xaxis->SetColor("black","red");
-$graph->yaxis->SetFont(FF_VERDANA,FS_NORMAL,11);
-
-// Show 0 label on Y-axis (default is not to show)
-$graph->yscale->ticks->SupressZeroLabel(false);
-
-// Setup X-axis labels
-$graph->xaxis->SetTickLabels($datax);
-$graph->xaxis->SetLabelAngle(50);
-
-// Create the bar pot
-$bplot = new BarPlot($datay);
-$bplot->SetWidth(0.6);
-
-// Setup color for gradient fill style 
-$bplot->SetFillGradient("navy","steelblue",GRAD_MIDVER);
-
-// Set color for the frame of each bar
-$bplot->SetColor("navy");
-$graph->Add($bplot);
-
-// Finally send the graph to the browser
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/bargradex3.php b/#jpgraph/src/Examples/bargradex3.php
deleted file mode 100644
index 8a3f99d5..00000000
--- a/#jpgraph/src/Examples/bargradex3.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// Example for use of JpGraph, 
-// ljp, 01/03/01 20:32
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-// We need some data
-$datay=array(-0.13,0.25,-0.21,0.35,0.31,0.04);
-$datax=array("Jan","Feb","Mar","Apr","May","June");
-
-// Setup the graph. 
-$graph = new Graph(400,200);	
-$graph->img->SetMargin(60,20,30,50);
-$graph->SetScale("textlin");
-$graph->SetMarginColor("silver");
-$graph->SetShadow();
-
-// Set up the title for the graph
-$graph->title->Set("Example negative bars");
-$graph->title->SetFont(FF_VERDANA,FS_NORMAL,16);
-$graph->title->SetColor("darkred");
-
-// Setup font for axis
-$graph->xaxis->SetFont(FF_VERDANA,FS_NORMAL,10);
-$graph->yaxis->SetFont(FF_VERDANA,FS_NORMAL,10);
-
-// Show 0 label on Y-axis (default is not to show)
-$graph->yscale->ticks->SupressZeroLabel(false);
-
-// Setup X-axis labels
-$graph->xaxis->SetTickLabels($datax);
-$graph->xaxis->SetLabelAngle(50);
-
-// Set X-axis at the minimum value of Y-axis (default will be at 0)
-$graph->xaxis->SetPos("min");	// "min" will position the x-axis at the minimum value of the Y-axis
-
-// Create the bar pot
-$bplot = new BarPlot($datay);
-$bplot->SetWidth(0.6);
-
-// Setup color for gradient fill style 
-$bplot->SetFillGradient("navy","steelblue",GRAD_MIDVER);
-
-// Set color for the frame of each bar
-$bplot->SetColor("navy");
-$graph->Add($bplot);
-
-// Finally send the graph to the browser
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/bargradex4.php b/#jpgraph/src/Examples/bargradex4.php
deleted file mode 100644
index 7de203ab..00000000
--- a/#jpgraph/src/Examples/bargradex4.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// Example for use of JpGraph, 
-// ljp, 01/03/01 19:44
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-// We need some data
-$datay=array(0.3031,0.3044,0.3049,0.3040,0.3024,0.3047);
-
-// Setup the graph. 
-$graph = new Graph(400,200);	
-$graph->img->SetMargin(60,30,30,40);
-$graph->SetScale("textlin");
-$graph->SetMarginColor("teal");
-$graph->SetShadow();
-
-// Set up the title for the graph
-$graph->title->Set("Bargraph with small variations");
-$graph->title->SetColor("white");
-$graph->title->SetFont(FF_VERDANA,FS_BOLD,12);
-
-// Setup color for axis and labels
-$graph->xaxis->SetColor("black","white");
-$graph->yaxis->SetColor("black","white");
-
-// Setup font for axis
-$graph->xaxis->SetFont(FF_VERDANA,FS_NORMAL,10);
-$graph->yaxis->SetFont(FF_VERDANA,FS_NORMAL,10);
-
-// Setup X-axis title (color & font)
-$graph->xaxis->title->Set("X-axis");
-$graph->xaxis->title->SetColor("white");
-$graph->xaxis->title->SetFont(FF_VERDANA,FS_BOLD,10);
-
-// Create the bar pot
-$bplot = new BarPlot($datay);
-$bplot->SetWidth(0.6);
-
-// Setup color for gradient fill style 
-$tcol=array(100,100,255);
-$fcol=array(255,100,100);
-$bplot->SetFillGradient($fcol,$tcol,GRAD_HOR);
-$graph->Add($bplot);
-
-// Finally send the graph to the browser
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/bargradex5.php b/#jpgraph/src/Examples/bargradex5.php
deleted file mode 100644
index e0122925..00000000
--- a/#jpgraph/src/Examples/bargradex5.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// Example for use of JpGraph, 
-// ljp, 01/03/01 19:44
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-// We need some data
-$datay=array(0.3031,0.3044,0.3049,0.3040,0.3024,0.3047);
-
-// Setup the graph. 
-$graph = new Graph(400,200);	
-$graph->img->SetMargin(60,30,30,40);
-$graph->SetScale("textlin");
-$graph->SetMarginColor("teal");
-$graph->SetShadow();
-
-// Create the bar pot
-$bplot = new BarPlot($datay);
-$bplot->SetWidth(0.6);
-
-// This is how you make the bar graph start from something other than 0
-$bplot->SetYMin(0.302);
-
-// Setup color for gradient fill style 
-$tcol=array(100,100,255);
-$fcol=array(255,100,100);
-$bplot->SetFillGradient($fcol,$tcol,GRAD_HOR);
-$bplot->SetFillColor("orange");
-$graph->Add($bplot);
-
-// Set up the title for the graph
-$graph->title->Set("Bargraph which doesn't start from y=0");
-$graph->title->SetColor("yellow");
-$graph->title->SetFont(FF_VERDANA,FS_BOLD,12);
-
-// Setup color for axis and labels
-$graph->xaxis->SetColor("black","white");
-$graph->yaxis->SetColor("black","white");
-
-// Setup font for axis
-$graph->xaxis->SetFont(FF_VERDANA,FS_NORMAL,10);
-$graph->yaxis->SetFont(FF_VERDANA,FS_NORMAL,10);
-
-// Setup X-axis title (color & font)
-$graph->xaxis->title->Set("X-axis");
-$graph->xaxis->title->SetColor("white");
-$graph->xaxis->title->SetFont(FF_VERDANA,FS_BOLD,10);
-
-// Finally send the graph to the browser
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/bargradex6.php b/#jpgraph/src/Examples/bargradex6.php
deleted file mode 100644
index 43bf9664..00000000
--- a/#jpgraph/src/Examples/bargradex6.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// Example for use of JpGraph, 
-// ljp, 01/03/01 20:32
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-// We need some data
-$datay=array(-0.13,0.25,-0.21,0.35,0.31,0.04);
-$datax=array("Jan","Feb","Mar","Apr","May","June");
-
-// Setup the graph. 
-$graph = new Graph(500,200);	
-$graph->img->SetMargin(60,150,30,50);
-$graph->SetScale("textlin");
-$graph->SetMarginColor("silver");
-$graph->SetShadow();
-
-// Set up the title for the graph
-$graph->title->Set("Example negative bars");
-$graph->title->SetFont(FF_VERDANA,FS_NORMAL,16);
-$graph->title->SetColor("darkred");
-
-// Setup font for axis
-$graph->xaxis->SetFont(FF_VERDANA,FS_NORMAL,10);
-$graph->yaxis->SetFont(FF_VERDANA,FS_NORMAL,10);
-
-// Show 0 label on Y-axis (default is not to show)
-$graph->yscale->ticks->SupressZeroLabel(false);
-
-// Setup X-axis labels
-$graph->xaxis->SetTickLabels($datax);
-$graph->xaxis->SetLabelAngle(50);
-
-// Set X-axis at the minimum value of Y-axis (default will be at 0)
-$graph->xaxis->SetPos("min");	// "min" will position the x-axis at the minimum value of the Y-axis
-
-// Create the bar pot
-$bplot = new BarPlot($datay);
-$bplot->SetWidth(0.6);
-$bplot->SetLegend("Result 1999","blue");
-
-// Setup color for gradient fill style 
-$bplot->SetFillGradient("navy","steelblue",GRAD_MIDVER);
-
-// Set color for the frame of each bar
-$bplot->SetColor("navy");
-$graph->Add($bplot);
-
-// Finally send the graph to the browser
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/bargradsmallex1.php b/#jpgraph/src/Examples/bargradsmallex1.php
deleted file mode 100644
index 83908a97..00000000
--- a/#jpgraph/src/Examples/bargradsmallex1.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-// We need some data
-$datay=array(4,8,6);
-
-// Setup the graph. 
-$graph = new Graph(200,150);	
-$graph->SetScale("textlin");
-$graph->img->SetMargin(25,15,25,25);
-
-$graph->title->Set('"GRAD_MIDVER"');
-$graph->title->SetColor('darkred');
-
-// Setup font for axis
-$graph->xaxis->SetFont(FF_FONT1);
-$graph->yaxis->SetFont(FF_FONT1);
-
-// Create the bar pot
-$bplot = new BarPlot($datay);
-$bplot->SetWidth(0.6);
-
-// Setup color for gradient fill style 
-$bplot->SetFillGradient("navy","lightsteelblue",GRAD_MIDVER);
-
-// Set color for the frame of each bar
-$bplot->SetColor("navy");
-$graph->Add($bplot);
-
-// Finally send the graph to the browser
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/bargradsmallex2.php b/#jpgraph/src/Examples/bargradsmallex2.php
deleted file mode 100644
index 1aa1037a..00000000
--- a/#jpgraph/src/Examples/bargradsmallex2.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-// We need some data
-$datay=array(4,8,6);
-
-// Setup the graph. 
-$graph = new Graph(200,150);	
-$graph->SetScale("textlin");
-$graph->img->SetMargin(25,15,25,25);
-
-$graph->title->Set('"GRAD_MIDHOR"');
-$graph->title->SetColor('darkred');
-
-// Setup font for axis
-$graph->xaxis->SetFont(FF_FONT1);
-$graph->yaxis->SetFont(FF_FONT1);
-
-// Create the bar pot
-$bplot = new BarPlot($datay);
-$bplot->SetWidth(0.6);
-
-// Setup color for gradient fill style 
-$bplot->SetFillGradient("navy","lightsteelblue",GRAD_MIDHOR);
-
-// Set color for the frame of each bar
-$bplot->SetColor("navy");
-$graph->Add($bplot);
-
-// Finally send the graph to the browser
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/bargradsmallex3.php b/#jpgraph/src/Examples/bargradsmallex3.php
deleted file mode 100644
index c5d31c13..00000000
--- a/#jpgraph/src/Examples/bargradsmallex3.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-// We need some data
-$datay=array(4,8,6);
-
-// Setup the graph. 
-$graph = new Graph(200,150);	
-$graph->SetScale("textlin");
-$graph->img->SetMargin(25,15,25,25);
-
-$graph->title->Set('"GRAD_HOR"');
-$graph->title->SetColor('darkred');
-
-// Setup font for axis
-$graph->xaxis->SetFont(FF_FONT1);
-$graph->yaxis->SetFont(FF_FONT1);
-
-// Create the bar pot
-$bplot = new BarPlot($datay);
-$bplot->SetWidth(0.6);
-
-// Setup color for gradient fill style 
-$bplot->SetFillGradient("navy","lightsteelblue",GRAD_HOR);
-
-// Set color for the frame of each bar
-$bplot->SetColor("navy");
-$graph->Add($bplot);
-
-// Finally send the graph to the browser
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/bargradsmallex4.php b/#jpgraph/src/Examples/bargradsmallex4.php
deleted file mode 100644
index 030942d5..00000000
--- a/#jpgraph/src/Examples/bargradsmallex4.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-// We need some data
-$datay=array(4,8,6);
-
-// Setup the graph. 
-$graph = new Graph(200,150);	
-$graph->SetScale("textlin");
-$graph->img->SetMargin(25,15,25,25);
-
-$graph->title->Set('"GRAD_VER"');
-$graph->title->SetColor('darkred');
-
-// Setup font for axis
-$graph->xaxis->SetFont(FF_FONT1);
-$graph->yaxis->SetFont(FF_FONT1);
-
-// Create the bar pot
-$bplot = new BarPlot($datay);
-$bplot->SetWidth(0.6);
-
-// Setup color for gradient fill style 
-$bplot->SetFillGradient("navy","lightsteelblue",GRAD_VER);
-
-// Set color for the frame of each bar
-$bplot->SetColor("navy");
-$graph->Add($bplot);
-
-// Finally send the graph to the browser
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/bargradsmallex5.php b/#jpgraph/src/Examples/bargradsmallex5.php
deleted file mode 100644
index 8028269f..00000000
--- a/#jpgraph/src/Examples/bargradsmallex5.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-// We need some data
-$datay=array(4,8,6);
-
-// Setup the graph. 
-$graph = new Graph(200,150);	
-$graph->SetScale("textlin");
-$graph->img->SetMargin(25,15,25,25);
-
-$graph->title->Set('"GRAD_WIDE_MIDVER"');
-$graph->title->SetColor('darkred');
-
-// Setup font for axis
-$graph->xaxis->SetFont(FF_FONT1);
-$graph->yaxis->SetFont(FF_FONT1);
-
-// Create the bar pot
-$bplot = new BarPlot($datay);
-$bplot->SetWidth(0.6);
-
-// Setup color for gradient fill style 
-$bplot->SetFillGradient("navy","lightsteelblue",GRAD_WIDE_MIDVER);
-
-// Set color for the frame of each bar
-$bplot->SetColor("navy");
-$graph->Add($bplot);
-
-// Finally send the graph to the browser
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/bargradsmallex6.php b/#jpgraph/src/Examples/bargradsmallex6.php
deleted file mode 100644
index 9b1e45b8..00000000
--- a/#jpgraph/src/Examples/bargradsmallex6.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-// We need some data
-$datay=array(4,8,6);
-
-// Setup the graph. 
-$graph = new Graph(200,150);	
-$graph->SetScale("textlin");
-$graph->img->SetMargin(25,15,25,25);
-
-$graph->title->Set('"GRAD_WIDE_MIDHOR"');
-$graph->title->SetColor('darkred');
-
-// Setup font for axis
-$graph->xaxis->SetFont(FF_FONT1);
-$graph->yaxis->SetFont(FF_FONT1);
-
-// Create the bar pot
-$bplot = new BarPlot($datay);
-$bplot->SetWidth(0.6);
-
-// Setup color for gradient fill style 
-$bplot->SetFillGradient("navy","lightsteelblue",GRAD_WIDE_MIDHOR);
-
-// Set color for the frame of each bar
-$bplot->SetColor("navy");
-$graph->Add($bplot);
-
-// Finally send the graph to the browser
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/bargradsmallex7.php b/#jpgraph/src/Examples/bargradsmallex7.php
deleted file mode 100644
index 5f011aa9..00000000
--- a/#jpgraph/src/Examples/bargradsmallex7.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-// We need some data
-$datay=array(4,8,6);
-
-// Setup the graph. 
-$graph = new Graph(200,150);	
-$graph->SetScale("textlin");
-$graph->img->SetMargin(25,15,25,25);
-
-$graph->title->Set('"GRAD_CENTER"');
-$graph->title->SetColor('darkred');
-
-// Setup font for axis
-$graph->xaxis->SetFont(FF_FONT1);
-$graph->yaxis->SetFont(FF_FONT1);
-
-// Create the bar pot
-$bplot = new BarPlot($datay);
-$bplot->SetWidth(0.6);
-
-// Setup color for gradient fill style 
-$bplot->SetFillGradient("navy","lightsteelblue",GRAD_CENTER);
-
-// Set color for the frame of each bar
-$bplot->SetColor("navy");
-$graph->Add($bplot);
-
-// Finally send the graph to the browser
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/bargradsmallex8.php b/#jpgraph/src/Examples/bargradsmallex8.php
deleted file mode 100644
index f95cb49a..00000000
--- a/#jpgraph/src/Examples/bargradsmallex8.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-// We need some data
-$datay=array(4,8,6);
-
-// Setup the graph. 
-$graph = new Graph(200,150);	
-$graph->SetScale("textlin");
-$graph->img->SetMargin(25,15,25,25);
-
-$graph->title->Set('"GRAD_RAISED_PANEL"');
-$graph->title->SetColor('darkred');
-
-// Setup font for axis
-$graph->xaxis->SetFont(FF_FONT1);
-$graph->yaxis->SetFont(FF_FONT1);
-
-// Create the bar pot
-$bplot = new BarPlot($datay);
-$bplot->SetWidth(0.6);
-
-// Setup color for gradient fill style 
-$bplot->SetFillGradient('navy','orange',GRAD_RAISED_PANEL);
-
-// Set color for the frame of each bar
-$bplot->SetColor("navy");
-$graph->Add($bplot);
-
-// Finally send the graph to the browser
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/barimgex1.php b/#jpgraph/src/Examples/barimgex1.php
deleted file mode 100644
index 76aee8f9..00000000
--- a/#jpgraph/src/Examples/barimgex1.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$datay=array(5,3,11,6,3);
-
-$graph = new Graph(400,300,'auto');	
-$graph->SetScale("textlin");
-
-$graph->title->Set('Images on top of bars');
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,13);
-
-$graph->SetTitleBackground('lightblue:1.1',TITLEBKG_STYLE1,TITLEBKG_FRAME_BEVEL);
-
-$bplot = new BarPlot($datay);
-$bplot->SetFillColor("orange");
-$bplot->SetWidth(0.5);
-
-$lplot = new LinePlot($datay);
-$lplot->SetColor('white@1');
-$lplot->SetBarCenter();
-$lplot->mark->SetType(MARK_IMG_LBALL,'red');
-
-$graph->Add($bplot);
-$graph->Add($lplot);
-
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/barintex1.php b/#jpgraph/src/Examples/barintex1.php
deleted file mode 100644
index 9ba063d5..00000000
--- a/#jpgraph/src/Examples/barintex1.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// $Id: barintex1.php,v 1.3 2002/07/11 23:27:28 aditus Exp $
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-// Some data
-$datay=array(1,1,0.5);
-
-// Create the graph and setup the basic parameters 
-$graph = new Graph(460,200,'auto');	
-$graph->img->SetMargin(40,30,30,40);
-$graph->SetScale("textint");
-$graph->SetShadow();
-$graph->SetFrame(false); // No border around the graph
-
-// Add some grace to the top so that the scale doesn't
-// end exactly at the max value. 
-$graph->yaxis->scale->SetGrace(100);
-
-// Setup X-axis labels
-$a = $gDateLocale->GetShortMonth();
-$graph->xaxis->SetTickLabels($a);
-$graph->xaxis->SetFont(FF_FONT2);
-
-// Setup graph title ands fonts
-$graph->title->Set("Example of integer Y-scale");
-$graph->title->SetFont(FF_FONT2,FS_BOLD);
-$graph->xaxis->title->Set("Year 2002");
-$graph->xaxis->title->SetFont(FF_FONT2,FS_BOLD);
-                              
-// Create a bar pot
-$bplot = new BarPlot($datay);
-$bplot->SetFillColor("orange");
-$bplot->SetWidth(0.5);
-$bplot->SetShadow();
-
-// Setup the values that are displayed on top of each bar
-$bplot->value->Show();
-// Must use TTF fonts if we want text at an arbitrary angle
-$bplot->value->SetFont(FF_ARIAL,FS_BOLD);
-$bplot->value->SetAngle(45);
-// Black color for positive values and darkred for negative values
-$bplot->value->SetColor("black","darkred");
-$graph->Add($bplot);
-
-// Finally stroke the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/barintex2.php b/#jpgraph/src/Examples/barintex2.php
deleted file mode 100644
index 59f3b73b..00000000
--- a/#jpgraph/src/Examples/barintex2.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-// Some data
-$datay=array(3,7,19,11,4,20);
-
-// Create the graph and setup the basic parameters 
-$graph = new Graph(350,200,'auto');	
-$graph->img->SetMargin(40,30,40,40);
-$graph->SetScale("textint");
-$graph->SetFrame(true,'blue',1); 
-$graph->SetColor('lightblue');
-$graph->SetMarginColor('lightblue');
-
-// Add some grace to the top so that the scale doesn't
-// end exactly at the max value. 
-//$graph->yaxis->scale->SetGrace(20);
-
-// Setup X-axis labels
-$a = $gDateLocale->GetShortMonth();
-$graph->xaxis->SetTickLabels($a);
-$graph->xaxis->SetFont(FF_FONT1);
-$graph->xaxis->SetColor('darkblue','black');
-
-// Stup "hidden" y-axis by given it the same color
-// as the background
-$graph->yaxis->SetColor('lightblue','darkblue');
-$graph->ygrid->SetColor('white');
-
-// Setup graph title ands fonts
-$graph->title->Set('Example of integer Y-scale');
-$graph->subtitle->Set('(With "hidden" y-axis)');
-
-$graph->title->SetFont(FF_FONT2,FS_BOLD);
-$graph->xaxis->title->Set("Year 2002");
-$graph->xaxis->title->SetFont(FF_FONT2,FS_BOLD);
-                              
-// Create a bar pot
-$bplot = new BarPlot($datay);
-$bplot->SetFillColor('darkblue');
-$bplot->SetColor('darkblue');
-$bplot->SetWidth(0.5);
-$bplot->SetShadow('darkgray');
-
-// Setup the values that are displayed on top of each bar
-$bplot->value->Show();
-// Must use TTF fonts if we want text at an arbitrary angle
-$bplot->value->SetFont(FF_ARIAL,FS_NORMAL,8);
-$bplot->value->SetFormat('$%d');
-// Black color for positive values and darkred for negative values
-$bplot->value->SetColor("black","darkred");
-$graph->Add($bplot);
-
-// Finally stroke the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/barline_csimex1.php b/#jpgraph/src/Examples/barline_csimex1.php
deleted file mode 100644
index 1ab37ec5..00000000
--- a/#jpgraph/src/Examples/barline_csimex1.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php // content="text/plain; charset=utf-8" 
-require_once ('jpgraph/jpgraph.php'); 
-require_once ('jpgraph/jpgraph_line.php'); 
-require_once ('jpgraph/jpgraph_bar.php'); 
-
-$ydata = array(2,3,4,5,6,7,8,9,10,11); 
-$ydata2 = array(1,2,3,4,5,6,7,8,9,10); 
-$targ = array("#1","#2","#3","#4","#5","#6","#7","#8","#9","#10");
-$alt = array(1,2,3,4,5,6,7,8,9,10); 
-
-// Create the graph. 
-$graph = new Graph(300,200);     
-$graph->SetScale("textlin"); 
-$graph->img->SetMargin(40,20,30,40); 
-$graph->title->Set("CSIM example with bar and line"); 
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-
-// Setup axis titles
-$graph->xaxis->title->Set("X-title"); 
-$graph->yaxis->title->Set("Y-title"); 
-
-// Create the linear plot 
-$lineplot=new LinePlot($ydata); 
-$lineplot->mark->SetType(MARK_FILLEDCIRCLE);
-$lineplot->mark->SetWidth(5);
-$lineplot->mark->SetColor('black');
-$lineplot->mark->SetFillColor('red');
-$lineplot->SetCSIMTargets($targ,$alt);
-
-// Create line plot
-$barplot=new barPlot($ydata2); 
-$barplot->SetCSIMTargets($targ,$alt);
-
-// Add the plots to the graph 
-$graph->Add($lineplot); 
-$graph->Add($barplot); 
-
-$graph->StrokeCSIM();
-
-?> 
-
-
diff --git a/#jpgraph/src/Examples/barlinealphaex1.php b/#jpgraph/src/Examples/barlinealphaex1.php
deleted file mode 100644
index 95c8b98e..00000000
--- a/#jpgraph/src/Examples/barlinealphaex1.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-// Some "random" data
-$ydata  = array(10,120,80,190,260,170,60,40,20,230);
-$ydata2 = array(10,70,40,120,200,60,80,40,20,5);
-
-// Get a list of month using the current locale
-$months = $gDateLocale->GetShortMonth();
-
-// Create the graph. 
-$graph = new Graph(300,200);	
-$graph->SetScale("textlin");
-$graph->SetMarginColor('white');
-
-// Adjust the margin slightly so that we use the 
-// entire area (since we don't use a frame)
-$graph->SetMargin(30,1,20,5);
-
-// Box around plotarea
-$graph->SetBox(); 
-
-// No frame around the image
-$graph->SetFrame(false);
-
-// Setup the tab title
-$graph->tabtitle->Set('Year 2003');
-$graph->tabtitle->SetFont(FF_ARIAL,FS_BOLD,10);
-
-// Setup the X and Y grid
-$graph->ygrid->SetFill(true,'#DDDDDD@0.5','#BBBBBB@0.5');
-$graph->ygrid->SetLineStyle('dashed');
-$graph->ygrid->SetColor('gray');
-$graph->xgrid->Show();
-$graph->xgrid->SetLineStyle('dashed');
-$graph->xgrid->SetColor('gray');
-
-// Setup month as labels on the X-axis
-$graph->xaxis->SetTickLabels($months);
-$graph->xaxis->SetFont(FF_ARIAL,FS_NORMAL,8);
-$graph->xaxis->SetLabelAngle(45);
-
-// Create a bar pot
-$bplot = new BarPlot($ydata);
-$bplot->SetWidth(0.6);
-$fcol='#440000';
-$tcol='#FF9090';
-
-$bplot->SetFillGradient($fcol,$tcol,GRAD_LEFT_REFLECTION);
-
-// Set line weigth to 0 so that there are no border
-// around each bar
-$bplot->SetWeight(0);
-
-$graph->Add($bplot);
-
-// Create filled line plot
-$lplot = new LinePlot($ydata2);
-$lplot->SetFillColor('skyblue@0.5');
-$lplot->SetColor('navy@0.7');
-$lplot->SetBarCenter();
-
-$lplot->mark->SetType(MARK_SQUARE);
-$lplot->mark->SetColor('blue@0.5');
-$lplot->mark->SetFillColor('lightblue');
-$lplot->mark->SetSize(6);
-
-$graph->Add($lplot);
-
-// .. and finally send it back to the browser
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/barlinefreq_csimex1.php b/#jpgraph/src/Examples/barlinefreq_csimex1.php
deleted file mode 100644
index 00c5977d..00000000
--- a/#jpgraph/src/Examples/barlinefreq_csimex1.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-//
-// Example of CSIM frequence bar that uses the cache
-//
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-
-// Utility function to calculate the accumulated frequence
-// for a set of values and ocurrences
-function accfreq($data) {
-    rsort($data);
-    $s = array_sum($data);
-    $as = array($data[0]);
-    $asp = array(100*$as[0]/$s);
-    $n = count($data);
-    for( $i=1; $i < $n; ++$i ) {
-	$as[$i] = $as[$i-1]+$data[$i];
-	$asp[$i] = 100.0*$as[$i]/$s;
-    }
-    return $asp;
-}
-
-// some data
-$data_freq = array(22,20,12,10,5,4,2);
-$data_accfreq = accfreq($data_freq);
-
-// Create the graph. 
-$graph = new Graph(350,250);
-
-// We need to make this extra call for CSIM scripts
-// that make use of the cache. If the cache contains this
-// graph the HTML wrapper will be returned and then the
-// method will call exit() and hence NO LINES AFTER THIS 
-// CALL WILL BE EXECUTED.
-// $graph->CheckCSIMCache('auto');
-
-// Setup some basic graph parameters
-$graph->SetScale("textlin");
-$graph->SetY2Scale('lin',0,100);
-$graph->img->SetMargin(50,70,30,40);
-$graph->yaxis->SetTitleMargin(30);
-$graph->SetMarginColor('#EEEEEE');
-
-// Setup titles and fonts
-$graph->title->Set("Frequence plot");
-$graph->xaxis->title->Set("X-title");
-$graph->yaxis->title->Set("Y-title");
-
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD);
-
-// Turn the tickmarks
-$graph->xaxis->SetTickSide(SIDE_DOWN);
-$graph->yaxis->SetTickSide(SIDE_LEFT);
-
-$graph->y2axis->SetTickSide(SIDE_RIGHT);
-$graph->y2axis->SetColor('black','blue');
-$graph->y2axis->SetLabelFormat('%3d.0%%');
-
-// Create a bar pot
-$bplot = new BarPlot($data_freq);
-
-// Create targets and alt texts for the image maps. One for each bar
-// (In this example this is just "dummy" targets)
-$targ=array("#1","#2","#3","#4","#5","#6","#7");
-$alts=array("val=%d","val=%d","val=%d","val=%d","val=%d","val=%d","val=%d");
-$bplot->SetCSIMTargets($targ,$alts);
-
-
-// Create accumulative graph
-$lplot = new LinePlot($data_accfreq);
-
-// We want the line plot data point in the middle of the bars
-$lplot->SetBarCenter();
-
-// Use transperancy
-$lplot->SetFillColor('lightblue@0.6');
-$lplot->SetColor('blue@0.6');
-//$lplot->SetColor('blue');
-$graph->AddY2($lplot);
-
-
-// Setup the bars
-$bplot->SetFillColor("orange@0.2");
-$bplot->SetValuePos('center');
-$bplot->value->SetFormat("%d");
-$bplot->value->SetFont(FF_ARIAL,FS_NORMAL,9);
-$bplot->value->Show();
-
-// Add it to the graph
-$graph->Add($bplot);
-
-// Send back the HTML page which will call this script again
-// to retrieve the image.
-$graph->StrokeCSIM();
-
-?>
diff --git a/#jpgraph/src/Examples/barlinefreqex1.php b/#jpgraph/src/Examples/barlinefreqex1.php
deleted file mode 100644
index c5966bba..00000000
--- a/#jpgraph/src/Examples/barlinefreqex1.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-//
-// Example of frequence bar 
-//
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-// Utility function to calculate the accumulated frequence
-// for a set of values and ocurrences
-function accfreq($data) {
-    rsort($data);
-    $s = array_sum($data);
-    $as = array($data[0]);
-    $asp = array(100*$as[0]/$s);
-    $n = count($data);
-    for( $i=1; $i < $n; ++$i ) {
-	$as[$i] = $as[$i-1]+$data[$i];
-	$asp[$i] = 100.0*$as[$i]/$s;
-    }
-    return $asp;
-}
-
-// some data
-$data_freq = array(22,20,12,10,5,4,2);
-$data_accfreq = accfreq($data_freq);
-
-// Create the graph. 
-$graph = new Graph(350,250);
-
-// Setup some basic graph parameters
-$graph->SetScale("textlin");
-$graph->SetY2Scale('lin',0,100);
-$graph->img->SetMargin(50,70,30,40);
-$graph->yaxis->SetTitleMargin(30);
-$graph->SetMarginColor('#EEEEEE');
-
-// Setup titles and fonts
-$graph->title->Set("Frequence plot");
-$graph->xaxis->title->Set("X-title");
-$graph->yaxis->title->Set("Y-title");
-
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD);
-
-// Turn the tickmarks
-$graph->xaxis->SetTickSide(SIDE_DOWN);
-$graph->yaxis->SetTickSide(SIDE_LEFT);
-
-$graph->y2axis->SetTickSide(SIDE_RIGHT);
-$graph->y2axis->SetColor('black','blue');
-$graph->y2axis->SetLabelFormat('%3d.0%%');
-
-// Create a bar pot
-$bplot = new BarPlot($data_freq);
-
-// Create accumulative graph
-$lplot = new LinePlot($data_accfreq);
-
-// We want the line plot data point in the middle of the bars
-$lplot->SetBarCenter();
-
-// Use transperancy
-$lplot->SetFillColor('lightblue@0.6');
-$lplot->SetColor('blue@0.6');
-$graph->AddY2($lplot);
-
-// Setup the bars
-$bplot->SetFillColor("orange@0.2");
-$bplot->SetValuePos('center');
-$bplot->value->SetFormat("%d");
-$bplot->value->SetFont(FF_ARIAL,FS_NORMAL,9);
-$bplot->value->Show();
-
-// Add it to the graph
-$graph->Add($bplot);
-
-// Send back the HTML page which will call this script again
-// to retrieve the image.
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/barpatternex1.php b/#jpgraph/src/Examples/barpatternex1.php
deleted file mode 100644
index f0be38e1..00000000
--- a/#jpgraph/src/Examples/barpatternex1.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$datay=array(2,3,5,8.5,11.5,6,3);
-
-// Create the graph. 
-$graph = new Graph(350,300);	
-
-$graph->SetScale("textlin");
-
-$graph->SetMarginColor('navy:1.9');
-$graph->SetBox();
-
-$graph->title->Set('Bar Pattern');
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,20);
-
-$graph->SetTitleBackground('lightblue:1.3',TITLEBKG_STYLE2,TITLEBKG_FRAME_BEVEL);
-$graph->SetTitleBackgroundFillStyle(TITLEBKG_FILLSTYLE_HSTRIPED,'lightblue','blue');
-
-// Create a bar pot
-$bplot = new BarPlot($datay);
-$bplot->SetFillColor('darkorange');
-$bplot->SetWidth(0.6);
-
-$bplot->SetPattern(PATTERN_CROSS1,'navy');
-
-$graph->Add($bplot);
-
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/barscalecallbackex1.php b/#jpgraph/src/Examples/barscalecallbackex1.php
deleted file mode 100644
index 7e73f201..00000000
--- a/#jpgraph/src/Examples/barscalecallbackex1.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-// Callback function for Y-scale to get 1000 separator on labels
-function separator1000($aVal) {
-    return number_format($aVal);
-}
-
-function separator1000_usd($aVal) {
-    return '$'.number_format($aVal);
-}
-
-// Some data
-$datay=array(120567,134013,192000,87000);
-
-// Create the graph and setup the basic parameters
-$graph = new Graph(500,300,'auto');
-$graph->img->SetMargin(80,30,30,40);
-$graph->SetScale('textint');
-$graph->SetShadow();
-$graph->SetFrame(false); // No border around the graph
-
-// Add some grace to the top so that the scale doesn't
-// end exactly at the max value.
-// The grace value is the percetage of additional scale
-// value we add. Specifying 50 means that we add 50% of the
-// max value
-$graph->yaxis->scale->SetGrace(50);
-$graph->yaxis->SetLabelFormatCallback('separator1000');
-
-// Setup X-axis labels
-$a = $gDateLocale->GetShortMonth();
-$graph->xaxis->SetTickLabels($a);
-$graph->xaxis->SetFont(FF_FONT2);
-
-// Setup graph title ands fonts
-$graph->title->Set('Example of Y-scale callback formatting');
-$graph->title->SetFont(FF_FONT2,FS_BOLD);
-$graph->xaxis->title->Set('Year 2002');
-$graph->xaxis->title->SetFont(FF_FONT2,FS_BOLD);
-
-// Create a bar pot
-$bplot = new BarPlot($datay);
-$bplot->SetFillColor('orange');
-$bplot->SetWidth(0.5);
-$bplot->SetShadow();
-
-// Setup the values that are displayed on top of each bar
-$bplot->value->Show();
-
-// Must use TTF fonts if we want text at an arbitrary angle
-$bplot->value->SetFont(FF_ARIAL,FS_BOLD);
-$bplot->value->SetAngle(45);
-$bplot->value->SetFormatCallback('separator1000_usd');
-
-// Black color for positive values and darkred for negative values
-$bplot->value->SetColor('black','darkred');
-$graph->Add($bplot);
-
-// Finally stroke the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/bartutex1.php b/#jpgraph/src/Examples/bartutex1.php
deleted file mode 100644
index 0c0f9c51..00000000
--- a/#jpgraph/src/Examples/bartutex1.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-// Some data
-$databary=array(12,7,16,5,7,14,9,3);
-
-// New graph with a drop shadow
-$graph = new Graph(300,200);
-$graph->SetShadow();
-
-// Use a "text" X-scale
-$graph->SetScale("textlin");
-
-// Set title and subtitle
-$graph->title->Set("Elementary barplot with a text scale");
-
-// Use built in font
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-
-// Create the bar plot
-$b1 = new BarPlot($databary);
-$b1->SetLegend("Temperature");
-//$b1->SetAbsWidth(6);
-//$b1->SetShadow();
-
-// The order the plots are added determines who's ontop
-$graph->Add($b1);
-
-// Finally output the  image
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/bartutex12.php b/#jpgraph/src/Examples/bartutex12.php
deleted file mode 100644
index 6f97c5c6..00000000
--- a/#jpgraph/src/Examples/bartutex12.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// A medium complex example of JpGraph
-// Note: You can create a graph in far fewwr lines of code if you are
-// willing to go with the defaults. This is an illustrative example of
-// some of the capabilities of JpGraph.
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-$month=array(
-"Jan","Feb","Mar","Apr","Maj","Jun","Jul","Aug","Sep","Okt","Nov","Dec");
-
-// Create some datapoints 
-$steps=100;
-for($i=0; $i<$steps; ++$i) {
-	$databarx[]=sprintf("198%d %s",floor($i/12),$month[$i%12]);
-	$datay[$i]=log(pow($i,$i/10)+1)*sin($i/15)+35;
-	if( $i % 6 == 0 && $i<$steps-6) {
-		$databary[]=abs(25*sin($i)+5);
-	}
-	else {
-		$databary[]=0;
-	}
-}
-
-// New graph with a background image and drop shadow
-$graph = new Graph(450,300);
-$graph->SetBackgroundImage("tiger_bkg.png",BGIMG_FILLFRAME);
-$graph->SetShadow();
-
-// Use text X-scale so we can text labels on the X-axis
-$graph->SetScale("textlin");
-
-// Y2-axis is linear
-$graph->SetY2Scale("lin");
-
-// Color the two Y-axis to make them easier to associate
-// to the corresponding plot (we keep the axis black though)
-$graph->yaxis->SetColor("black","red");
-$graph->y2axis->SetColor("black","orange");
-
-// Set title and subtitle
-$graph->title->Set("Combined bar and line plot");
-$graph->subtitle->Set("100 data points, X-Scale: 'text'");
-
-// Use built in font (don't need TTF support)
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-
-// Make the margin around the plot a little bit bigger then default
-$graph->img->SetMargin(40,140,40,80);	
-
-// Slightly adjust the legend from it's default position in the
-// top right corner to middle right side
-$graph->legend->Pos(0.03,0.5,"right","center");
-
-// Display every 6:th tickmark
-$graph->xaxis->SetTextTickInterval(6);
-
-// Label every 2:nd tick mark
-$graph->xaxis->SetTextLabelInterval(2);
-
-// Setup the labels
-$graph->xaxis->SetTickLabels($databarx);
-$graph->xaxis->SetLabelAngle(90);
-
-// Create a red line plot
-$p1 = new LinePlot($datay);
-$p1->SetColor("red");
-$p1->SetLegend("Pressure");
-
-// Create the bar plot
-$b1 = new BarPlot($databary);
-$b1->SetLegend("Temperature");
-$b1->SetFillColor("orange");
-$b1->SetAbsWidth(8);
-
-// Drop shadow on bars adjust the default values a little bit
-$b1->SetShadow("steelblue",2,2);
-
-// The order the plots are added determines who's ontop
-$graph->Add($p1);
-$graph->AddY2($b1);
-
-// Finally output the  image
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/bartutex2.php b/#jpgraph/src/Examples/bartutex2.php
deleted file mode 100644
index a911c337..00000000
--- a/#jpgraph/src/Examples/bartutex2.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-// Some data
-$databary=array(12,7,16,6,7,14,9,3);
-$months=$gDateLocale->GetShortMonth();
-
-// New graph with a drop shadow
-$graph = new Graph(300,200,'auto');
-$graph->SetShadow();
-
-// Use a "text" X-scale
-$graph->SetScale("textlin");
-
-// Specify X-labels
-$graph->xaxis->SetTickLabels($months);
-
-// Set title and subtitle
-$graph->title->Set("Textscale with specified labels");
-
-// Use built in font
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-
-// Create the bar plot
-$b1 = new BarPlot($databary);
-$b1->SetLegend("Temperature");
-
-//$b1->SetAbsWidth(6);
-//$b1->SetShadow();
-
-// The order the plots are added determines who's ontop
-$graph->Add($b1);
-
-// Finally output the  image
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/bartutex3.php b/#jpgraph/src/Examples/bartutex3.php
deleted file mode 100644
index addb91c4..00000000
--- a/#jpgraph/src/Examples/bartutex3.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-// Some data
-$months=$gDateLocale->GetShortMonth();
-
-srand ((double) microtime() * 1000000);
-for( $i=0; $i<25; ++$i) {
-	$databary[]=rand(1,50);
-	$databarx[]=$months[$i%12];
-}
-	
-// New graph with a drop shadow
-$graph = new Graph(300,200,'auto');
-$graph->SetShadow();
-
-// Use a "text" X-scale
-$graph->SetScale("textlin");
-
-// Specify X-labels
-$graph->xaxis->SetTickLabels($databarx);
-
-// Set title and subtitle
-$graph->title->Set("Bar tutorial example 3");
-
-// Use built in font
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-
-// Create the bar plot
-$b1 = new BarPlot($databary);
-$b1->SetLegend("Temperature");
-//$b1->SetAbsWidth(6);
-//$b1->SetShadow();
-
-// The order the plots are added determines who's ontop
-$graph->Add($b1);
-
-// Finally output the  image
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/bartutex4.php b/#jpgraph/src/Examples/bartutex4.php
deleted file mode 100644
index dffe16ab..00000000
--- a/#jpgraph/src/Examples/bartutex4.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-// Some data
-$months=$gDateLocale->GetShortMonth();
-
-srand ((double) microtime() * 1000000);
-for( $i=0; $i<25; ++$i) {
-	$databary[]=rand(1,50);
-	$databarx[]=$months[$i%12];
-}
-	
-// New graph with a drop shadow
-$graph = new Graph(300,200,'auto');
-$graph->SetShadow();
-
-// Use a "text" X-scale
-$graph->SetScale("textlin");
-
-// Specify X-labels
-//$databarx = array('tXi','','','xxx','','','iXii','','','OOO','','','tOO');
-$graph->xaxis->SetFont(FF_FONT1,FS_NORMAL);
-$graph->xaxis->SetTickLabels($databarx);
-$graph->xaxis->SetTextLabelInterval(3);
-
-// Set title and subtitle
-$graph->title->Set("Displaying only every third label");
-
-// Use built in font
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-
-// Create the bar plot
-$b1 = new BarPlot($databary);
-$b1->SetLegend("Temperature");
-//$b1->SetAbsWidth(6);
-//$b1->SetShadow();
-
-// The order the plots are added determines who's ontop
-$graph->Add($b1);
-
-// Finally output the  image
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/bartutex5.php b/#jpgraph/src/Examples/bartutex5.php
deleted file mode 100644
index e41a47b5..00000000
--- a/#jpgraph/src/Examples/bartutex5.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-// Some data
-$months=$gDateLocale->GetShortMonth();
-
-srand ((double) microtime() * 1000000);
-for( $i=0; $i<25; ++$i) {
-	$databary[]=rand(1,50);
-	$databarx[]=$months[$i%12];
-}
-	
-// New graph with a drop shadow
-$graph = new Graph(300,200,'auto');
-$graph->SetShadow();
-
-// Use a "text" X-scale
-$graph->SetScale("textlin");
-
-// Specify X-labels
-$graph->xaxis->SetTickLabels($databarx);
-$graph->xaxis->SetTextLabelInterval(1);
-$graph->xaxis->SetTextTickInterval(3);
-
-// Set title and subtitle
-$graph->title->Set("Bar tutorial example 5");
-
-// Use built in font
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-
-// Create the bar plot
-$b1 = new BarPlot($databary);
-$b1->SetLegend("Temperature");
-$b1->SetWidth(0.4);
-
-// The order the plots are added determines who's ontop
-$graph->Add($b1);
-
-// Finally output the  image
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/bartutex6.php b/#jpgraph/src/Examples/bartutex6.php
deleted file mode 100644
index 13b0557f..00000000
--- a/#jpgraph/src/Examples/bartutex6.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-// Some data
-$months=$gDateLocale->GetShortMonth();
-srand ((double) microtime() * 1000000);
-for( $i=0; $i<25; ++$i) {
-	$databary[]=rand(1,50);
-	$databarx[]=$months[$i%12];
-}
-	
-// New graph with a drop shadow
-$graph = new Graph(300,200,'auto');
-$graph->SetShadow();
-
-// Use a "text" X-scale
-$graph->SetScale("textlin");
-
-// Specify X-labels
-$graph->xaxis->SetTickLabels($databarx);
-$graph->xaxis->SetTextLabelInterval(3);
-
-// Hide the tick marks
-$graph->xaxis->HideTicks();
-
-// Set title and subtitle
-$graph->title->Set("Bar tutorial example 6");
-
-// Use built in font
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-
-// Create the bar plot
-$b1 = new BarPlot($databary);
-$b1->SetLegend("Temperature");
-$b1->SetWidth(0.4);
-
-
-// The order the plots are added determines who's ontop
-$graph->Add($b1);
-
-// Finally output the  image
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/basic_contourex01.php b/#jpgraph/src/Examples/basic_contourex01.php
deleted file mode 100644
index 75d765a9..00000000
--- a/#jpgraph/src/Examples/basic_contourex01.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// Basic contour plot example
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_contour.php');
-
-$data = array(
-            array (0.5,1.1,1.5,1,2.0,3,3,2,1,0.1),
-            array (1.0,1.5,3.0,5,6.0,2,1,1.2,1,4),
-            array (0.9,2.0,2.1,3,6.0,7,3,2,1,1.4),
-            array (1.0,1.5,3.0,4,6.0,5,2,1.5,1,2),
-            array (0.8,2.0,3.0,3,4.0,4,3,2.4,2,3),
-            array (0.6,1.1,1.5,1,4.0,3.5,3,2,3,4),
-            array (1.0,1.5,3.0,5,6.0,2,1,1.2,2.7,4),
-            array (0.8,2.0,3.0,3,5.5,6,3,2,1,1.4),
-            array (1.0,1.5,3.0,4,6.0,5,2,1,0.5,0.2));
-
-// Basic contour graph
-$graph = new Graph(350,250);
-$graph->SetScale('intint');
-
-// Adjust the margins to fit the margin
-$graph->SetMargin(30,100,40,30);
-
-// Setup
-$graph->title->Set('Basic contour plot');
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,12);
-
-// A simple contour plot with default arguments (e.g. 10 isobar lines)
-$cp = new ContourPlot($data);
-
-// Display the legend
-$cp->ShowLegend();
-
-$graph->Add($cp);
-
-// ... and send the graph back to the browser
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/basic_contourex02.php b/#jpgraph/src/Examples/basic_contourex02.php
deleted file mode 100644
index f63a650d..00000000
--- a/#jpgraph/src/Examples/basic_contourex02.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// Basic contour plot example
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_contour.php');
-
-$data = array(
-            array (0.5,1.1,1.5,1,2.0,3,3,2,1,0.1),
-            array (1.0,1.5,3.0,5,6.0,2,1,1.2,1,4),
-            array (0.9,2.0,2.1,3,6.0,7,3,2,1,1.4),
-            array (1.0,1.5,3.0,4,6.0,5,2,1.5,1,2),
-            array (0.8,2.0,3.0,3,4.0,4,3,2.4,2,3),
-            array (0.6,1.1,1.5,1,4.0,3.5,3,2,3,4),
-            array (1.0,1.5,3.0,5,6.0,2,1,1.2,2.7,4),
-            array (0.8,2.0,3.0,3,5.5,6,3,2,1,1.4),
-            array (1.0,1.5,3.0,4,6.0,5,2,1,0.5,0.2));
-
-// Basic contour graph
-$graph = new Graph(350,250);
-$graph->SetScale('intint');
-
-// Show axis on all sides
-$graph->SetAxisStyle(AXSTYLE_BOXOUT);
-
-// Adjust the margins to fit the margin
-$graph->SetMargin(30,100,40,30);
-
-// Setup
-$graph->title->Set('Basic contour plot with multiple axis');
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,12);
-
-// A simple contour plot with default arguments (e.g. 10 isobar lines)
-$cp = new ContourPlot($data);
-
-// Display the legend
-$cp->ShowLegend();
-
-$graph->Add($cp);
-
-// ... and send the graph back to the browser
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/basic_contourex03-1.php b/#jpgraph/src/Examples/basic_contourex03-1.php
deleted file mode 100644
index 26a01de6..00000000
--- a/#jpgraph/src/Examples/basic_contourex03-1.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// Basic contour plot example
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_contour.php');
-
-$data = array(
-            array ( 12,7,3,15 ),
-            array ( 18,5,1, 9 ),
-            array ( 13,9,5,12),
-            array (  5,3,8, 9 ),
-            array (  1,8,5, 7 ));
-
-
-// Basic contour graph
-$graph = new Graph(350,250);
-$graph->SetScale('intint');
-
-// Show axis on all sides
-$graph->SetAxisStyle(AXSTYLE_BOXOUT);
-
-// Adjust the margins to fit the margin
-$graph->SetMargin(30,100,40,30);
-
-// Setup
-$graph->title->Set('Basic contour plot with multiple axis');
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,12);
-
-// A simple contour plot with default arguments (e.g. 10 isobar lines)
-$cp = new ContourPlot($data,10,1);
-
-// Display the legend
-$cp->ShowLegend();
-
-$graph->Add($cp);
-
-// ... and send the graph back to the browser
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/basic_contourex03-2.php b/#jpgraph/src/Examples/basic_contourex03-2.php
deleted file mode 100644
index 02b9376c..00000000
--- a/#jpgraph/src/Examples/basic_contourex03-2.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// Basic contour plot example
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_contour.php');
-
-$data = array(
-            array ( 12,7,3,15 ),
-            array ( 18,5,1, 9 ),
-            array ( 13,9,5,12),
-            array (  5,3,8, 9 ),
-            array (  1,8,5, 7 ));
-
-
-// Basic contour graph
-$graph = new Graph(350,250);
-$graph->SetScale('intint');
-
-// Show axis on all sides
-$graph->SetAxisStyle(AXSTYLE_BOXOUT);
-
-// Adjust the margins to fit the margin
-$graph->SetMargin(30,100,40,30);
-
-// Setup
-$graph->title->Set('Basic contour plot with multiple axis');
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,12);
-
-// A simple contour plot with default arguments (e.g. 10 isobar lines)
-$cp = new ContourPlot($data,10,2);
-
-// Display the legend
-$cp->ShowLegend();
-
-$graph->Add($cp);
-
-// ... and send the graph back to the browser
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/basic_contourex03-3.php b/#jpgraph/src/Examples/basic_contourex03-3.php
deleted file mode 100644
index 1de30b70..00000000
--- a/#jpgraph/src/Examples/basic_contourex03-3.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// Basic contour plot example
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_contour.php');
-
-$data = array(
-            array ( 12,7,3,15 ),
-            array ( 18,5,1, 9 ),
-            array ( 13,9,5,12),
-            array (  5,3,8, 9 ),
-            array (  1,8,5, 7 ));
-
-
-// Basic contour graph
-$graph = new Graph(350,250);
-$graph->SetScale('intint');
-
-// Show axis on all sides
-$graph->SetAxisStyle(AXSTYLE_BOXOUT);
-
-// Adjust the margins to fit the margin
-$graph->SetMargin(30,100,40,30);
-
-// Setup
-$graph->title->Set('Basic contour plot with multiple axis');
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,12);
-
-// A simple contour plot with default arguments (e.g. 10 isobar lines)
-$cp = new ContourPlot($data,10,3);
-
-// Display the legend
-$cp->ShowLegend();
-
-$graph->Add($cp);
-
-// ... and send the graph back to the browser
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/basic_contourex04.php b/#jpgraph/src/Examples/basic_contourex04.php
deleted file mode 100644
index c32e8384..00000000
--- a/#jpgraph/src/Examples/basic_contourex04.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// Basic contour plot example
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_contour.php');
-
-$data = array(
-            array (0.5,1.1,1.5,1,2.0,3,3,2,1,0.1),
-            array (1.0,1.5,3.0,5,6.0,2,1,1.2,1,4),
-            array (0.9,2.0,2.1,3,6.0,7,3,2,1,1.4),
-            array (1.0,1.5,3.0,4,6.0,5,2,1.5,1,2),
-            array (0.8,2.0,3.0,3,4.0,4,3,2.4,2,3),
-            array (0.6,1.1,1.5,1,4.0,3.5,3,2,3,4),
-            array (1.0,1.5,3.0,5,6.0,2,1,1.2,2.7,4),
-            array (0.8,2.0,3.0,3,5.5,6,3,2,1,1.4),
-            array (1.0,1.5,3.0,4,6.0,5,2,1,0.5,0.2));
-
-// Basic contour graph
-$graph = new Graph(350,250);
-$graph->SetScale('intint');
-
-// Show axis on all sides
-$graph->SetAxisStyle(AXSTYLE_BOXOUT);
-
-// Adjust the margins to fit the margin
-$graph->SetMargin(30,100,40,30);
-
-// Setup
-$graph->title->Set('Basic contour plot with multiple axis');
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,12);
-
-// A simple contour plot with default arguments (e.g. 10 isobar lines)
-$cp = new ContourPlot($data,5);
-
-// Display the legend
-$cp->ShowLegend();
-
-$graph->Add($cp);
-
-// ... and send the graph back to the browser
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/basic_contourex05.php b/#jpgraph/src/Examples/basic_contourex05.php
deleted file mode 100644
index 61936fce..00000000
--- a/#jpgraph/src/Examples/basic_contourex05.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// Basic contour plot example
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_contour.php');
-
-$data = array(
-            array (0.5,1.1,1.5,1,2.0,3,3,2,1,0.1),
-            array (1.0,1.5,3.0,5,6.0,2,1,1.2,1,4),
-            array (0.9,2.0,2.1,3,6.0,7,3,2,1,1.4),
-            array (1.0,1.5,3.0,4,6.0,5,2,1.5,1,2),
-            array (0.8,2.0,3.0,3,4.0,4,3,2.4,2,3),
-            array (0.6,1.1,1.5,1,4.0,3.5,3,2,3,4),
-            array (1.0,1.5,3.0,5,6.0,2,1,1.2,2.7,4),
-            array (0.8,2.0,3.0,3,5.5,6,3,2,1,1.4),
-            array (1.0,1.5,3.0,4,6.0,5,2,1,0.5,0.2));
-
-// Basic contour graph
-$graph = new Graph(350,250);
-$graph->SetScale('intint');
-
-// Show axis on all sides
-$graph->SetAxisStyle(AXSTYLE_BOXOUT);
-
-// Adjust the margins to fit the margin
-$graph->SetMargin(30,100,40,30);
-
-// Setup
-$graph->title->Set('Basic contour plot with multiple axis');
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,12);
-
-// A simple contour plot with default arguments (e.g. 10 isobar lines)
-$cp = new ContourPlot($data);
-
-// Flip the data around its center line
-$cp->SetInvert();
-
-// Display the legend
-$cp->ShowLegend();
-
-$graph->Add($cp);
-
-// ... and send the graph back to the browser
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/bezierex1.php b/#jpgraph/src/Examples/bezierex1.php
deleted file mode 100644
index 50fad510..00000000
--- a/#jpgraph/src/Examples/bezierex1.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-require_once ('jpgraph/jpgraph_scatter.php');
-require_once ('jpgraph/jpgraph_regstat.php');
-
-// Original data points
-$xdata = array(1,3,12,15);
-$ydata = array(5,15,2,19);
-
-// Get the interpolated values by creating
-// a new Spline object.
-$bez = new Bezier($xdata,$ydata);
-
-// For the new data set we want 40 points to
-// get a smooth curve.
-list($newx,$newy) = $bez->Get(50);
-
-// Create the graph
-$g = new Graph(300,200);
-$g->SetMargin(30,20,40,30);
-$g->title->Set("Bezier interpolation");
-$g->title->SetFont(FF_ARIAL,FS_NORMAL,12);
-$g->subtitle->Set('(Control points shown in red)');
-$g->subtitle->SetColor('darkred');
-$g->SetMarginColor('lightblue');
-
-//$g->img->SetAntiAliasing();
-
-// We need a linlin scale since we provide both
-// x and y coordinates for the data points.
-$g->SetScale('linlin');
-
-// We want 1 decimal for the X-label
-$g->xaxis->SetLabelFormat('%1.1f');
-
-// We use a scatterplot to illustrate the original
-// contro points.
-$bplot = new ScatterPlot($ydata,$xdata);
-$bplot->mark->SetFillColor('red@0.3');
-$bplot->mark->SetColor('red@0.5');
-
-// And a line plot to stroke the smooth curve we got
-// from the original control points
-$lplot = new LinePlot($newy,$newx);
-$lplot->SetColor('navy');
-
-// Add the plots to the graph and stroke
-$g->Add($lplot);
-$g->Add($bplot);
-$g->Stroke();
-
-?>
-
diff --git a/#jpgraph/src/Examples/bkgimgflagex1.php b/#jpgraph/src/Examples/bkgimgflagex1.php
deleted file mode 100644
index 1e479383..00000000
--- a/#jpgraph/src/Examples/bkgimgflagex1.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-require_once ('jpgraph/jpgraph_flags.php');
-
-// Some data
-$datay1=array(140,110,50);
-$datay2=array(35,90,190);
-$datay3=array(20,60,70);
-
-// Create the basic graph
-$graph = new Graph(300,200);	
-$graph->SetScale('textlin');
-$graph->SetMargin(40,20,20,40);
-$graph->SetMarginColor('white:0.9');
-$graph->SetColor('white');
-$graph->SetShadow();
-
-// Adjust the position of the legend box
-$graph->legend->Pos(0.03,0.10);
-
-// Adjust the color for theshadow of the legend
-$graph->legend->SetShadow('darkgray@0.5');
-$graph->legend->SetFillColor('lightblue@0.1');
-$graph->legend->Hide();
-
-// Get localised version of the month names
-$graph->xaxis->SetTickLabels($gDateLocale->GetShortMonth());
-$graph->SetBackgroundCountryFlag('mais',BGIMG_COPY,50);
-
-// Set axis titles and fonts
-$graph->xaxis->title->Set('Year 2002');
-$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->title->SetColor('white');
-
-$graph->xaxis->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->SetColor('navy');
-
-$graph->yaxis->SetFont(FF_FONT1,FS_BOLD);
-$graph->yaxis->SetColor('navy');
-
-//$graph->ygrid->Show(false);
-$graph->ygrid->SetColor('white@0.5');
-
-// Setup graph title
-$graph->title->Set('Using a country flag background');
-
-// Some extra margin (from the top)
-$graph->title->SetMargin(3);
-$graph->title->SetFont(FF_ARIAL,FS_NORMAL,12);
-
-// Create the three var series we will combine
-$bplot1 = new BarPlot($datay1);
-$bplot2 = new BarPlot($datay2);
-$bplot3 = new BarPlot($datay3);
-
-// Setup the colors with 40% transparency (alpha channel)
-$bplot1->SetFillColor('yellow@0.4');
-$bplot2->SetFillColor('red@0.4');
-$bplot3->SetFillColor('darkgreen@0.4');
-
-// Setup legends
-$bplot1->SetLegend('Label 1');
-$bplot2->SetLegend('Label 2');
-$bplot3->SetLegend('Label 3');
-
-// Setup each bar with a shadow of 50% transparency
-$bplot1->SetShadow('black@0.4');
-$bplot2->SetShadow('black@0.4');
-$bplot3->SetShadow('black@0.4');
-
-$gbarplot = new GroupBarPlot(array($bplot1,$bplot2,$bplot3));
-$gbarplot->SetWidth(0.6);
-$graph->Add($gbarplot);
-
-$graph->Stroke();
-?>
-
diff --git a/#jpgraph/src/Examples/bkgimgflagex2.php b/#jpgraph/src/Examples/bkgimgflagex2.php
deleted file mode 100644
index c6a27b3d..00000000
--- a/#jpgraph/src/Examples/bkgimgflagex2.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-require_once ('jpgraph/jpgraph_flags.php');
-
-// Some data
-$datay1=array(140,110,50);
-$datay2=array(35,90,190);
-$datay3=array(20,60,70);
-
-// Create the basic graph
-$graph = new Graph(300,200);	
-$graph->SetScale("textlin");
-$graph->SetMargin(40,20,20,40);
-$graph->SetMarginColor('white:0.9');
-$graph->SetColor('white');
-$graph->SetShadow();
-
-// Apply a perspective transformation at the end 
-$graph->Set3DPerspective(SKEW3D_UP,100,180);
-
-// Adjust the position of the legend box
-$graph->legend->Pos(0.03,0.10);
-
-// Adjust the color for theshadow of the legend
-$graph->legend->SetShadow('darkgray@0.5');
-$graph->legend->SetFillColor('lightblue@0.1');
-$graph->legend->Hide();
-
-// Get localised version of the month names
-$graph->xaxis->SetTickLabels($gDateLocale->GetShortMonth());
-
-$graph->SetBackgroundCountryFlag('mais',BGIMG_COPY,50);
-
-// Set axis titles and fonts
-$graph->xaxis->title->Set('Year 2002');
-$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->title->SetColor('white');
-
-$graph->xaxis->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->SetColor('navy');
-
-$graph->yaxis->SetFont(FF_FONT1,FS_BOLD);
-$graph->yaxis->SetColor('navy');
-
-//$graph->ygrid->Show(false);
-$graph->ygrid->SetColor('white@0.5');
-
-// Setup graph title
-$graph->title->Set('Using a country flag background');
-
-// Some extra margin (from the top)
-$graph->title->SetMargin(3);
-$graph->title->SetFont(FF_ARIAL,FS_NORMAL,12);
-
-// Create the three var series we will combine
-$bplot1 = new BarPlot($datay1);
-$bplot2 = new BarPlot($datay2);
-$bplot3 = new BarPlot($datay3);
-
-// Setup the colors with 40% transparency (alpha channel)
-$bplot1->SetFillColor('yellow@0.4');
-$bplot2->SetFillColor('red@0.4');
-$bplot3->SetFillColor('darkgreen@0.4');
-
-// Setup legends
-$bplot1->SetLegend('Label 1');
-$bplot2->SetLegend('Label 2');
-$bplot3->SetLegend('Label 3');
-
-// Setup each bar with a shadow of 50% transparency
-$bplot1->SetShadow('black@0.4');
-$bplot2->SetShadow('black@0.4');
-$bplot3->SetShadow('black@0.4');
-
-$gbarplot = new GroupBarPlot(array($bplot1,$bplot2,$bplot3));
-$gbarplot->SetWidth(0.6);
-$graph->Add($gbarplot);
-
-$graph->Stroke();
-?>
-
diff --git a/#jpgraph/src/Examples/bkgimgflagex3.php b/#jpgraph/src/Examples/bkgimgflagex3.php
deleted file mode 100644
index be9afb73..00000000
--- a/#jpgraph/src/Examples/bkgimgflagex3.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-require_once ('jpgraph/jpgraph_flags.php');
-
-// Some data
-$datay1=array(140,110,50);
-$datay2=array(35,90,190);
-$datay3=array(20,60,70);
-
-// Create the basic graph
-$graph = new Graph(300,200);	
-$graph->SetScale("textlin");
-$graph->SetMargin(40,20,20,40);
-$graph->SetMarginColor('white:0.9');
-$graph->SetColor('white');
-$graph->SetShadow();
-
-// Apply a perspective transformation at the end 
-$graph->Set3DPerspective(SKEW3D_DOWN,100,180);
-
-// Adjust the position of the legend box
-$graph->legend->Pos(0.03,0.10);
-
-// Adjust the color for theshadow of the legend
-$graph->legend->SetShadow('darkgray@0.5');
-$graph->legend->SetFillColor('lightblue@0.1');
-$graph->legend->Hide();
-
-// Get localised version of the month names
-$graph->xaxis->SetTickLabels($gDateLocale->GetShortMonth());
-
-$graph->SetBackgroundCountryFlag('mais',BGIMG_COPY,50);
-
-// Set axis titles and fonts
-$graph->xaxis->title->Set('Year 2002');
-$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->title->SetColor('white');
-
-$graph->xaxis->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->SetColor('navy');
-
-$graph->yaxis->SetFont(FF_FONT1,FS_BOLD);
-$graph->yaxis->SetColor('navy');
-
-//$graph->ygrid->Show(false);
-$graph->ygrid->SetColor('white@0.5');
-
-// Setup graph title
-$graph->title->Set('Using a country flag background');
-
-// Some extra margin (from the top)
-$graph->title->SetMargin(3);
-$graph->title->SetFont(FF_ARIAL,FS_NORMAL,12);
-
-// Create the three var series we will combine
-$bplot1 = new BarPlot($datay1);
-$bplot2 = new BarPlot($datay2);
-$bplot3 = new BarPlot($datay3);
-
-// Setup the colors with 40% transparency (alpha channel)
-$bplot1->SetFillColor('yellow@0.4');
-$bplot2->SetFillColor('red@0.4');
-$bplot3->SetFillColor('darkgreen@0.4');
-
-// Setup legends
-$bplot1->SetLegend('Label 1');
-$bplot2->SetLegend('Label 2');
-$bplot3->SetLegend('Label 3');
-
-// Setup each bar with a shadow of 50% transparency
-$bplot1->SetShadow('black@0.4');
-$bplot2->SetShadow('black@0.4');
-$bplot3->SetShadow('black@0.4');
-
-$gbarplot = new GroupBarPlot(array($bplot1,$bplot2,$bplot3));
-$gbarplot->SetWidth(0.6);
-$graph->Add($gbarplot);
-
-$graph->Stroke();
-?>
-
diff --git a/#jpgraph/src/Examples/bkgimgflagex4.php b/#jpgraph/src/Examples/bkgimgflagex4.php
deleted file mode 100644
index d7db486a..00000000
--- a/#jpgraph/src/Examples/bkgimgflagex4.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-require_once ('jpgraph/jpgraph_flags.php');
-
-// Some data
-$datay1=array(140,110,50);
-$datay2=array(35,90,190);
-$datay3=array(20,60,70);
-
-// Create the basic graph
-$graph = new Graph(300,200);	
-$graph->SetScale("textlin");
-$graph->SetMargin(40,20,20,40);
-$graph->SetMarginColor('white:0.9');
-$graph->SetColor('white');
-$graph->SetShadow();
-
-// Apply a perspective transformation at the end 
-$graph->Set3DPerspective(SKEW3D_LEFT,350,320,true);
-
-// Adjust the position of the legend box
-$graph->legend->Pos(0.03,0.10);
-
-// Adjust the color for theshadow of the legend
-$graph->legend->SetShadow('darkgray@0.5');
-$graph->legend->SetFillColor('lightblue@0.1');
-$graph->legend->Hide();
-
-// Get localised version of the month names
-$graph->xaxis->SetTickLabels($gDateLocale->GetShortMonth());
-
-$graph->SetBackgroundCountryFlag('mais',BGIMG_COPY,50);
-
-// Set axis titles and fonts
-$graph->xaxis->title->Set('Year 2002');
-$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->title->SetColor('white');
-
-$graph->xaxis->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->SetColor('navy');
-
-$graph->yaxis->SetFont(FF_FONT1,FS_BOLD);
-$graph->yaxis->SetColor('navy');
-
-//$graph->ygrid->Show(false);
-$graph->ygrid->SetColor('white@0.5');
-
-// Setup graph title
-$graph->title->Set('Using a country flag background');
-
-// Some extra margin (from the top)
-$graph->title->SetMargin(3);
-$graph->title->SetFont(FF_ARIAL,FS_NORMAL,12);
-
-// Create the three var series we will combine
-$bplot1 = new BarPlot($datay1);
-$bplot2 = new BarPlot($datay2);
-$bplot3 = new BarPlot($datay3);
-
-// Setup the colors with 40% transparency (alpha channel)
-$bplot1->SetFillColor('yellow@0.4');
-$bplot2->SetFillColor('red@0.4');
-$bplot3->SetFillColor('darkgreen@0.4');
-
-// Setup legends
-$bplot1->SetLegend('Label 1');
-$bplot2->SetLegend('Label 2');
-$bplot3->SetLegend('Label 3');
-
-// Setup each bar with a shadow of 50% transparency
-$bplot1->SetShadow('black@0.4');
-$bplot2->SetShadow('black@0.4');
-$bplot3->SetShadow('black@0.4');
-
-$gbarplot = new GroupBarPlot(array($bplot1,$bplot2,$bplot3));
-$gbarplot->SetWidth(0.6);
-$graph->Add($gbarplot);
-
-$graph->Stroke();
-?>
-
diff --git a/#jpgraph/src/Examples/bkgimgflagex5.php b/#jpgraph/src/Examples/bkgimgflagex5.php
deleted file mode 100644
index f45a85a0..00000000
--- a/#jpgraph/src/Examples/bkgimgflagex5.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-require_once ('jpgraph/jpgraph_flags.php');
-
-// Some data
-$datay1=array(140,110,50);
-$datay2=array(35,90,190);
-$datay3=array(20,60,70);
-
-// Create the basic graph
-$graph = new Graph(300,200);	
-$graph->SetScale("textlin");
-$graph->SetMargin(40,20,20,40);
-$graph->SetMarginColor('white:0.9');
-$graph->SetColor('white');
-$graph->SetShadow();
-
-// Apply a perspective transformation at the end 
-$graph->Set3DPerspective(SKEW3D_RIGHT,350,320,true);
-
-// Adjust the position of the legend box
-$graph->legend->Pos(0.03,0.10);
-
-// Adjust the color for theshadow of the legend
-$graph->legend->SetShadow('darkgray@0.5');
-$graph->legend->SetFillColor('lightblue@0.1');
-$graph->legend->Hide();
-
-// Get localised version of the month names
-$graph->xaxis->SetTickLabels($gDateLocale->GetShortMonth());
-
-$graph->SetBackgroundCountryFlag('mais',BGIMG_COPY,50);
-
-// Set axis titles and fonts
-$graph->xaxis->title->Set('Year 2002');
-$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->title->SetColor('white');
-
-$graph->xaxis->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->SetColor('navy');
-
-$graph->yaxis->SetFont(FF_FONT1,FS_BOLD);
-$graph->yaxis->SetColor('navy');
-
-//$graph->ygrid->Show(false);
-$graph->ygrid->SetColor('white@0.5');
-
-// Setup graph title
-$graph->title->Set('Using a country flag background');
-
-// Some extra margin (from the top)
-$graph->title->SetMargin(3);
-$graph->title->SetFont(FF_ARIAL,FS_NORMAL,12);
-
-// Create the three var series we will combine
-$bplot1 = new BarPlot($datay1);
-$bplot2 = new BarPlot($datay2);
-$bplot3 = new BarPlot($datay3);
-
-// Setup the colors with 40% transparency (alpha channel)
-$bplot1->SetFillColor('yellow@0.4');
-$bplot2->SetFillColor('red@0.4');
-$bplot3->SetFillColor('darkgreen@0.4');
-
-// Setup legends
-$bplot1->SetLegend('Label 1');
-$bplot2->SetLegend('Label 2');
-$bplot3->SetLegend('Label 3');
-
-// Setup each bar with a shadow of 50% transparency
-$bplot1->SetShadow('black@0.4');
-$bplot2->SetShadow('black@0.4');
-$bplot3->SetShadow('black@0.4');
-
-$gbarplot = new GroupBarPlot(array($bplot1,$bplot2,$bplot3));
-$gbarplot->SetWidth(0.6);
-$graph->Add($gbarplot);
-
-$graph->Stroke();
-?>
-
diff --git a/#jpgraph/src/Examples/blueblack400x300grad.png b/#jpgraph/src/Examples/blueblack400x300grad.png
deleted file mode 100644
index 8852862a..00000000
Binary files a/#jpgraph/src/Examples/blueblack400x300grad.png and /dev/null differ
diff --git a/#jpgraph/src/Examples/boxstockcsimex1.php b/#jpgraph/src/Examples/boxstockcsimex1.php
deleted file mode 100644
index 1cb765d3..00000000
--- a/#jpgraph/src/Examples/boxstockcsimex1.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// Example of a stock chart
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_stock.php');
-
-// Data must be in the format : open,close,min,max,median
-$datay = array(
-    34,42,27,45,36,
-    55,25,14,59,40,
-    15,40,12,47,23,
-    62,38,25,65,57,
-    38,49,32,64,45);
-
-// Setup a simple graph
-$graph = new Graph(300,200);
-$graph->SetScale("textlin");
-$graph->SetMarginColor('lightblue');
-$graph->title->Set('Box Stock chart example');
-
-// Create a new stock plot
-$p1 = new BoxPlot($datay);
-
-// Setup URL target for image map
-$p1->SetCSIMTargets(array('#1','#2','#3','#4','#5'));
-
-// Width of the bars (in pixels)
-$p1->SetWidth(9);
-
-//$p1->SetCenter();
-// Uncomment the following line to hide the horizontal end lines
-//$p1->HideEndLines();
-
-// Add the plot to the graph and send it back to the browser
-$graph->Add($p1);
-$graph->StrokeCSIM();
-
-?>
diff --git a/#jpgraph/src/Examples/boxstockex1.php b/#jpgraph/src/Examples/boxstockex1.php
deleted file mode 100644
index 4e09833e..00000000
--- a/#jpgraph/src/Examples/boxstockex1.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// Example of a stock chart
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_stock.php');
-
-// Data must be in the format : open,close,min,max,median
-$datay = array(
-    34,42,27,45,36,
-    55,25,14,59,40,
-    15,40,12,47,23,
-    62,38,25,65,57,
-    38,49,32,64,45);
-
-// Setup a simple graph
-$graph = new Graph(300,200);
-$graph->SetScale('textlin');
-$graph->SetMarginColor('lightblue');
-$graph->title->Set('Box Stock chart example');
-
-// Create a new stock plot
-$p1 = new BoxPlot($datay);
-
-// Width of the bars (in pixels)
-$p1->SetWidth(9);
-
-// Uncomment the following line to hide the horizontal end lines
-//$p1->HideEndLines();
-
-// Add the plot to the graph and send it back to the browser
-$graph->Add($p1);
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/boxstockex2.php b/#jpgraph/src/Examples/boxstockex2.php
deleted file mode 100644
index d3531f48..00000000
--- a/#jpgraph/src/Examples/boxstockex2.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// Example of a stock chart
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_stock.php');
-
-// Data must be in the format : open,close,min,max,median
-$datay = array(
-    34,42,27,45,36,
-    55,25,14,59,40,
-    15,40,12,47,23,
-    62,38,25,65,57,
-    38,49,32,64,45);
-
-// Setup a simple graph
-$graph = new Graph(300,200);
-$graph->SetScale("textlin");
-$graph->SetMarginColor('lightblue');
-$graph->title->Set('Box Stock chart example');
-$graph->subtitle->Set('(Indented X-axis)');
-
-// Create a new stock plot
-$p1 = new BoxPlot($datay);
-
-// Width of the bars (in pixels)
-$p1->SetWidth(9);
-
-// Indent bars so they dont start and end at the edge of the
-// plot area
-$p1->SetCenter();
-
-// Uncomment the following line to hide the horizontal end lines
-//$p1->HideEndLines();
-
-// Add the plot to the graph and send it back to the browser
-$graph->Add($p1);
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/builtinplotmarksex1.php b/#jpgraph/src/Examples/builtinplotmarksex1.php
deleted file mode 100644
index 5d265fac..00000000
--- a/#jpgraph/src/Examples/builtinplotmarksex1.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-require_once ('jpgraph/jpgraph_plotline.php');
-
-$datay1 = array(2,6,7,12,13,18);
-$datay2 = array(5,12,12,19,25,20);
-
-// Setup the graph
-$graph = new Graph(350,200);
-$graph->SetMargin(30,20,60,20);
-$graph->SetMarginColor('white');
-$graph->SetScale("linlin");
-
-// Hide the frame around the graph
-$graph->SetFrame(false);
-
-// Setup title
-$graph->title->Set("Using Builtin PlotMarks");
-$graph->title->SetFont(FF_VERDANA,FS_BOLD,14);
-
-// Note: requires jpgraph 1.12p or higher
-// $graph->SetBackgroundGradient('blue','navy:0.5',GRAD_HOR,BGRAD_PLOT);
-$graph->tabtitle->Set('Region 1' );
-$graph->tabtitle->SetWidth(TABTITLE_WIDTHFULL);
-
-// Enable X and Y Grid
-$graph->xgrid->Show();
-$graph->xgrid->SetColor('gray@0.5');
-$graph->ygrid->SetColor('gray@0.5');
-
-// Format the legend box
-$graph->legend->SetColor('navy');
-$graph->legend->SetFillColor('lightgreen');
-$graph->legend->SetLineWeight(1);
-$graph->legend->SetFont(FF_ARIAL,FS_BOLD,8);
-$graph->legend->SetShadow('gray@0.4',3);
-$graph->legend->SetAbsPos(15,120,'right','bottom');
-
-// Create the line plots
-
-$p1 = new LinePlot($datay1);
-$p1->SetColor("red");
-$p1->SetFillColor("yellow@0.5");
-$p1->SetWeight(2);
-$p1->mark->SetType(MARK_IMG_DIAMOND,5,0.6);
-$p1->SetLegend('2006');
-$graph->Add($p1);
-
-$p2 = new LinePlot($datay2);
-$p2->SetColor("darkgreen");
-$p2->SetWeight(2);
-$p2->SetLegend('2001');
-$p2->mark->SetType(MARK_IMG_MBALL,'red');
-$graph->Add($p2);
-
-// Add a vertical line at the end scale position '7'
-$l1 = new PlotLine(VERTICAL,7);
-$graph->Add($l1);
-
-// Output the graph
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/canvas_jpgarchex.php b/#jpgraph/src/Examples/canvas_jpgarchex.php
deleted file mode 100644
index a67c0cbe..00000000
--- a/#jpgraph/src/Examples/canvas_jpgarchex.php
+++ /dev/null
@@ -1,143 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// $Id: canvas_jpgarchex.php,v 1.3 2002/08/29 10:14:19 aditus Exp $
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_canvas.php');
-require_once ('jpgraph/jpgraph_canvtools.php');
-
-// Scale we are using
-$ymax=24;
-$xmax=20;
-
-// Setup the basic canvas
-$g = new CanvasGraph(700,650,'auto');
-$g->SetMargin(2,3,2,3);
-$g->SetMarginColor("teal");
-$g->InitFrame();
-
-// ... and a scale
-$scale = new CanvasScale($g);
-$scale->Set(0,$xmax,0,$ymax);
-
-// ... we need shape since we want the indented rectangle
-$shape = new Shape($g,$scale);
-$shape->SetColor('black');
-
-// ... basic parameters for the overall image
-$l = 2;		// Left margin
-$r = 18;	// Row number to start the lowest line on
-$width = 16;	// Total width
-
-// Setup the two basic rectangle text object we  will use
-$tt = new CanvasRectangleText();
-$tt->SetFont(FF_ARIAL,FS_NORMAL,14);
-$tt->SetFillColor('');
-$tt->SetColor('');
-$tt->SetFontColor('navy');
-
-$t = new CanvasRectangleText();
-$t->SetFont(FF_ARIAL,FS_NORMAL,14);
-$t->SetFillColor('goldenrod1');
-$t->SetFontColor('navy');
-
-
-// Now start drawing the arch overview from the bottom and up
-// This is all pretty manual and one day I will write a proper
-// framework to make it easy to construct these types of architecture
-// overviews. But for now, just plain old coordinates..
-
-// Line: GD Library and image libraries
-$h=3;
-$s  = 3; $d=$l + $width-9;
-$t->SetFillColor('cadetblue3');
-$t->Set("TTF",$d,$r+2,$s,1);
-$t->Stroke($g->img,$scale);
-$t->Set("PNG",$d+$s,$r+2,$s,1);
-$t->Stroke($g->img,$scale);
-$t->Set("JPEG",$d+2*$s,$r+2,$s,1);
-$t->Stroke($g->img,$scale);
-$shape->IndentedRectangle($l,$r,$width,$h,$s*3,1,2,'lightgreen');
-$tt->Set("GD Basic library\n(1.8.x or 2.x)",$l,$r,$width,$h-1); 
-$tt->Stroke($g->img,$scale);
-
-
-// Area: Basic internal JpGraph architecture
-$t->SetFillColor('goldenrod1');
-$h = 2;
-$r -= $h; $d=8;
-$t->Set("Image primitives\n(RGB, Anti-aliasing,\nGD Abstraction)",$l,$r-0.5,$width*0.5,$h+0.5);
-$t->Stroke($g->img,$scale);
-$t->Set("Image Cache &\nStreaming",$l+0.5*$width,$r,$width*0.4,$h);
-$t->Stroke($g->img,$scale);
-
-$r -= $h; $d=8;
-$t->Set("2D Rot & Transformation",$l,$r,$width*0.5,$h-0.5); $t->Stroke($g->img,$scale);
-
-
-$r -= 2; $h = 4;
-$shape->IndentedRectangle($l,$r,$width*0.9,$h,$d,2,3,'goldenrod1');
-$tt->Set("Axis, Labelling, (Auto)-Scaling",$l,$r,$width*0.9,$h-2); $tt->Stroke($g->img,$scale);
-
-$r -= 1;
-$shape->IndentedRectangle($l,$r,$width,7,$width*0.9,6,3,'goldenrod1');
-$tt->Set("Error handling & Utility classes",$l,$r,$width,1); $tt->Stroke($g->img,$scale);
-
-
-// Area: Top area with graph components
-$t->SetFillColor('gold1');
-$r -= 3;
-$w = $width*0.55/4; $h = 2;
-$t->Set("Gantt\nGraph",$l,$r,$w,$h);
-$t->Stroke($g->img,$scale);
-
-$t->Set("Pie\nGraph",$l+$w,$r,$w,$h);
-$t->Stroke($g->img,$scale);
-$t->Set("Radar\nGraph",$l+$w*2,$r,$w,$h);
-$t->Stroke($g->img,$scale);
-
-$shape->IndentedRectangle($l,$r,$width,3,4*$w,2,0,'gold1');
-$tt->Set("Base Graph\n(Orthogonal\ncoordinate system)",$l+4*$w,$r,$width-$w*4,3); 
-$tt->Stroke($g->img,$scale);
-
-$r -= 2;
-$d = 0.7;
-$shape->IndentedRectangle($l+3*$w,$r,$w,4, $w*$d,2,0,'gold1');
-$t->Set("Canv\nUtil",$l+3*$w,$r,$w*$d,$h);     $t->Stroke($g->img,$scale);
-$tt->Set("Canvas\nGraph",$l+3*$w,$r+2,$w,2); $tt->Stroke($g->img,$scale);
-
-// Top line of plotting plugins
-$t->SetFillColor('cyan');
-$t->Set("Gantt\nPlot",$l,$r,$w,$h); $t->Stroke($g->img,$scale);
-$t->Set("2D\nPlot",$l+$w,$r,$w/2,$h);     $t->Stroke($g->img,$scale);
-$t->Set("3D\nPlot",$l+$w+$w/2,$r,$w/2,$h);$t->Stroke($g->img,$scale);
-$t->Set("Radar\nPlot",$l+2*$w,$r,$w,$h); $t->Stroke($g->img,$scale);
-
-$wp = ($width - 4*$w)/4; 
-$t->Set("Error\nPlot",$l+4*$w,$r,$wp,$h); $t->Stroke($g->img,$scale);
-$t->Set("Line\nPlot",$l+4*$w+$wp,$r,$wp,$h); $t->Stroke($g->img,$scale);
-$t->Set("Bar\nPlot",$l+4*$w+2*$wp,$r,$wp,$h); $t->Stroke($g->img,$scale);
-$t->Set("Scatter\nPlot",$l+4*$w+3*$wp,$r,$wp,$h); $t->Stroke($g->img,$scale);
-
-// Show application top
-$r -= 2.5; $h=2; 
-$t->SetFillColor('blue');
-$t->SetFontColor('white');
-$t->SetFont(FF_ARIAL,FS_BOLD,20);
-$t->Set("PHP Application",$l,$r,$width,$h); $t->Stroke($g->img,$scale);
-
-// Stroke title
-$r = 0.5;
-$tt->SetFontColor('black');
-$tt->SetFont(FF_TIMES,FS_BOLD,28);
-$tt->Set("JpGraph Architecture Overview",$l,$r,$width,1); 
-$tt->Stroke($g->img,$scale);
-
-// Stroke footer
-$tt->SetFont(FF_VERDANA,FS_NORMAL,10);
-$tt->Set("Generated: ".date("ymd H:m",time()),0.1,$ymax*0.95); 
-$tt->Stroke($g->img,$scale);
-
-// .. and stream it all back
-$g->Stroke();
-
-?>
-
diff --git a/#jpgraph/src/Examples/canvasbezierex1.php b/#jpgraph/src/Examples/canvasbezierex1.php
deleted file mode 100644
index 36febdf5..00000000
--- a/#jpgraph/src/Examples/canvasbezierex1.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// $Id: canvasbezierex1.php,v 1.1 2002/10/05 21:04:28 aditus Exp $
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_canvas.php');
-require_once ('jpgraph/jpgraph_canvtools.php');
-
-// Setup canvas graph
-$g = new CanvasGraph(400,300);
-$scale = new CanvasScale($g);
-$shape = new Shape($g,$scale);
-
-$g->title->Set('Bezier line with control points');
-
-// Setup control point for bezier
-$p = array(3,6,
-	   6,9,
-	   5,3,
-	   7,4);
-
-// Visualize control points
-$shape->SetColor('blue');
-$shape->Line($p[0],$p[1],$p[2],$p[3]);
-$shape->FilledCircle($p[2],$p[3],-6);
-
-$shape->SetColor('red');
-$shape->Line($p[4],$p[5],$p[6],$p[7]);
-$shape->FilledCircle($p[4],$p[5],-6);
-
-// Draw bezier
-$shape->SetColor('black');
-$shape->Bezier($p);
-
-// Frame it with a square
-$shape->SetColor('navy');
-$shape->Rectangle(0.5,2,9.5,9.5);
-
-// ... and stroke it
-$g->Stroke();
-?>
-
diff --git a/#jpgraph/src/Examples/canvasex01.php b/#jpgraph/src/Examples/canvasex01.php
deleted file mode 100644
index 68839155..00000000
--- a/#jpgraph/src/Examples/canvasex01.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// $Id: canvasex01.php,v 1.3 2002/10/23 08:17:23 aditus Exp $
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_canvas.php');
-
-// Setup a basic canvas we can work 
-$g = new CanvasGraph(400,300,'auto');
-$g->SetMargin(5,11,6,11);
-$g->SetShadow();
-$g->SetMarginColor("teal");
-
-// We need to stroke the plotarea and margin before we add the
-// text since we otherwise would overwrite the text.
-$g->InitFrame();
-
-// Draw a text box in the middle
-$txt="This\nis\na TEXT!!!";
-$t = new Text($txt,200,10);
-$t->SetFont(FF_ARIAL,FS_BOLD,40);
-
-// How should the text box interpret the coordinates?
-$t->Align('center','top');
-
-// How should the paragraph be aligned?
-$t->ParagraphAlign('center');
-
-// Add a box around the text, white fill, black border and gray shadow
-$t->SetBox("white","black","gray");
-
-// Stroke the text
-$t->Stroke($g->img);
-
-// Stroke the graph
-$g->Stroke();
-
-?>
-
diff --git a/#jpgraph/src/Examples/canvasex02.php b/#jpgraph/src/Examples/canvasex02.php
deleted file mode 100644
index 20807622..00000000
--- a/#jpgraph/src/Examples/canvasex02.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// $Id: canvasex02.php,v 1.1 2002/08/27 20:08:57 aditus Exp $
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_canvas.php');
-
-// Setup a basic canvas we can work 
-$g = new CanvasGraph(400,200,'auto');
-$g->SetMargin(5,11,6,11);
-$g->SetShadow();
-$g->SetMarginColor("teal");
-
-// We need to stroke the plotarea and margin before we add the
-// text since we otherwise would overwrite the text.
-$g->InitFrame();
-
-// Add a black line
-$g->img->SetColor('black');
-$g->img->Line(0,0,100,100);
-
-// .. and a circle (x,y,diameter)
-$g->img->Circle(100,100,50);
-
-// .. and a filled circle (x,y,diameter)
-$g->img->SetColor('red');
-$g->img->FilledCircle(200,100,50);
-
-// .. add a rectangle
-$g->img->SetColor('green');
-$g->img->FilledRectangle(10,10,50,50);
-
-// .. add a filled rounded rectangle
-$g->img->SetColor('green');
-$g->img->FilledRoundedRectangle(300,30,350,80,10);
-// .. with a darker border
-$g->img->SetColor('darkgreen');
-$g->img->RoundedRectangle(300,30,350,80,10);
-
-// Stroke the graph
-$g->Stroke();
-
-?>
-
diff --git a/#jpgraph/src/Examples/canvasex03.php b/#jpgraph/src/Examples/canvasex03.php
deleted file mode 100644
index dad3c55b..00000000
--- a/#jpgraph/src/Examples/canvasex03.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// $Id: canvasex03.php,v 1.1 2002/08/27 20:08:57 aditus Exp $
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_canvas.php');
-require_once ('jpgraph/jpgraph_canvtools.php');
-
-// Define work space
-$xmax=20;
-$ymax=20;
-
-// Setup a basic canvas we can work 
-$g = new CanvasGraph(400,200,'auto');
-$g->SetMargin(5,11,6,11);
-$g->SetShadow();
-$g->SetMarginColor("teal");
-
-// We need to stroke the plotarea and margin before we add the
-// text since we otherwise would overwrite the text.
-$g->InitFrame();
-
-// Create a new scale
-$scale = new CanvasScale($g);
-$scale->Set(0,$xmax,0,$ymax);
-
-// The shape class is wrapper around the Imgae class which translates
-// the coordinates for us
-$shape = new Shape($g,$scale);
-$shape->SetColor('black');
-
-
-// Add a black line
-$shape->SetColor('black');
-$shape->Line(0,0,20,20);
-
-// .. and a circle (x,y,diameter)
-$shape->Circle(5,14,2);
-
-// .. and a filled circle (x,y,diameter)
-$shape->SetColor('red');
-$shape->FilledCircle(11,8,3);
-
-// .. add a rectangle
-$shape->SetColor('green');
-$shape->FilledRectangle(15,8,19,14);
-
-// .. add a filled rounded rectangle
-$shape->SetColor('green');
-$shape->FilledRoundedRectangle(2,3,8,6);
-// .. with a darker border
-$shape->SetColor('darkgreen');
-$shape->RoundedRectangle(2,3,8,6);
-
-
-// Stroke the graph
-$g->Stroke();
-
-?>
-
diff --git a/#jpgraph/src/Examples/canvasex04.php b/#jpgraph/src/Examples/canvasex04.php
deleted file mode 100644
index 3e6ac9f9..00000000
--- a/#jpgraph/src/Examples/canvasex04.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// $Id: canvasex04.php,v 1.1 2002/08/27 20:08:57 aditus Exp $
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_canvas.php');
-require_once ('jpgraph/jpgraph_canvtools.php');
-
-// Define work space
-$xmax=20;
-$ymax=20;
-
-// Setup a basic canvas we can work 
-$g = new CanvasGraph(200,100,'auto');
-$g->SetMargin(5,11,6,11);
-$g->SetShadow();
-$g->SetMarginColor("teal");
-
-// We need to stroke the plotarea and margin before we add the
-// text since we otherwise would overwrite the text.
-$g->InitFrame();
-
-// Create a new scale
-$scale = new CanvasScale($g);
-$scale->Set(0,$xmax,0,$ymax);
-
-// The shape class is wrapper around the Imgae class which translates
-// the coordinates for us
-$shape = new Shape($g,$scale);
-$shape->SetColor('black');
-
-
-// Add a black line
-$shape->SetColor('black');
-$shape->Line(0,0,20,20);
-
-// .. and a circle (x,y,diameter)
-$shape->Circle(5,14,2);
-
-// .. and a filled circle (x,y,diameter)
-$shape->SetColor('red');
-$shape->FilledCircle(11,8,3);
-
-// .. add a rectangle
-$shape->SetColor('green');
-$shape->FilledRectangle(15,8,19,14);
-
-// .. add a filled rounded rectangle
-$shape->SetColor('green');
-$shape->FilledRoundedRectangle(2,3,8,6);
-// .. with a darker border
-$shape->SetColor('darkgreen');
-$shape->RoundedRectangle(2,3,8,6);
-
-
-// Stroke the graph
-$g->Stroke();
-
-?>
-
diff --git a/#jpgraph/src/Examples/canvasex05.php b/#jpgraph/src/Examples/canvasex05.php
deleted file mode 100644
index 46139842..00000000
--- a/#jpgraph/src/Examples/canvasex05.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// $Id: canvasex05.php,v 1.1 2002/08/27 20:08:57 aditus Exp $
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_canvas.php');
-require_once ('jpgraph/jpgraph_canvtools.php');
-
-// Define work space
-$xmax=40;
-$ymax=40;
-
-// Setup a basic canvas we can work 
-$g = new CanvasGraph(400,200,'auto');
-$g->SetMargin(5,11,6,11);
-$g->SetShadow();
-$g->SetMarginColor("teal");
-
-// We need to stroke the plotarea and margin before we add the
-// text since we otherwise would overwrite the text.
-$g->InitFrame();
-
-// Create a new scale
-$scale = new CanvasScale($g);
-$scale->Set(0,$xmax,0,$ymax);
-
-// The shape class is wrapper around the Imgae class which translates
-// the coordinates for us
-$shape = new Shape($g,$scale);
-$shape->SetColor('black');
-
-
-// Add a black line
-$shape->SetColor('black');
-$shape->Line(0,0,20,20);
-
-// .. and a circle (x,y,diameter)
-$shape->Circle(5,14,2);
-
-// .. and a filled circle (x,y,diameter)
-$shape->SetColor('red');
-$shape->FilledCircle(11,8,3);
-
-// .. add a rectangle
-$shape->SetColor('green');
-$shape->FilledRectangle(15,8,19,14);
-
-// .. add a filled rounded rectangle
-$shape->SetColor('green');
-$shape->FilledRoundedRectangle(2,3,8,6);
-// .. with a darker border
-$shape->SetColor('darkgreen');
-$shape->RoundedRectangle(2,3,8,6);
-
-
-// Stroke the graph
-$g->Stroke();
-
-?>
-
diff --git a/#jpgraph/src/Examples/canvasex06.php b/#jpgraph/src/Examples/canvasex06.php
deleted file mode 100644
index b475c68d..00000000
--- a/#jpgraph/src/Examples/canvasex06.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// $Id: canvasex06.php,v 1.1 2002/08/27 20:08:57 aditus Exp $
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_canvas.php');
-require_once ('jpgraph/jpgraph_canvtools.php');
-
-// Define work space
-$xmax=40;
-$ymax=40;
-
-// Setup a basic canvas we can work 
-$g = new CanvasGraph(400,200,'auto');
-$g->SetMargin(5,11,6,11);
-$g->SetShadow();
-$g->SetMarginColor("teal");
-
-// We need to stroke the plotarea and margin before we add the
-// text since we otherwise would overwrite the text.
-$g->InitFrame();
-
-// Create a new scale
-$scale = new CanvasScale($g);
-$scale->Set(0,$xmax,0,$ymax);
-
-// The shape class is wrapper around the Imgae class which translates
-// the coordinates for us
-$shape = new Shape($g,$scale);
-$shape->SetColor('black');
-
-$shape->IndentedRectangle(1,2,15,15,8,8,CORNER_TOPLEFT,'khaki');
-
-$shape->IndentedRectangle(1,20,15,15,8,8,CORNER_BOTTOMLEFT,'khaki');
-
-$shape->IndentedRectangle(20,2,15,15,8,8,CORNER_TOPRIGHT,'khaki');
-
-$shape->IndentedRectangle(20,20,15,15,8,8,CORNER_BOTTOMRIGHT,'khaki');
-
-// Stroke the graph
-$g->Stroke();
-
-?>
-
diff --git a/#jpgraph/src/Examples/canvaspiralex1.php b/#jpgraph/src/Examples/canvaspiralex1.php
deleted file mode 100644
index 5d72b920..00000000
--- a/#jpgraph/src/Examples/canvaspiralex1.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// $Id: canvaspiralex1.php,v 1.1 2002/10/26 11:35:42 aditus Exp $
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_canvas.php');
-
-
-if( empty($_GET['r']) ) 
-    $r = 0.44;
-else
-    $r = $_GET['r'];
-
-if( empty($_GET['w']) ) 
-    $w=150;
-else
-    $w = $_GET['w'];
-
-if( empty($_GET['h']) ) 
-    $h=240;
-else
-    $h = $_GET['h'];
-
-if( $w < 60 ) $w=60;
-if( $h < 60 ) $h=60;
-
-
-function SeaShell($img,$x,$y,$w,$h,$r,$n=12,$color1='navy',$color2='red') {
-
-    $x += $w;
-    $w = (1-$r)/$r*$w;
-
-    $sa = 0;
-    $ea = 90;
-
-    $s1 = 1;
-    $s2 = -1;
-    $x_old=$x; $y_old=$y;
-    for($i=1; $i < $n; ++$i) {
-	$sa += 90;
-	$ea += 90;
-	if( $i % 2 == 1 ) {
-	    $y = $y + $s1*$h*$r;
-	    $h = (1-$r)*$h;
-	    $w = $w / (1-$r) * $r ;
-	    $s1 *= -1;
-	    $img->SetColor($color1);
-	    $img->Line($x,$y,$x+$s1*$w,$y);
-	}
-	else {
-	    $x = $x + $s2*$w*$r;
-	    $w = (1-$r)*$w;
-	    $h = $h / (1-$r) * $r;
-	    $s2 *= -1;
-	    $img->SetColor($color1);
-	    $img->Line($x,$y,$x,$y-$s2*$h);
-	}
-	$img->SetColor($color2);
-	$img->FilledRectangle($x-1,$y-1,$x+1,$y+1);
-	$img->Arc($x,$y,2*$w+1,2*$h+1,$sa,$ea);
-	$img->Arc($x,$y,2*$w,2*$h,$sa,$ea);
-	$img->Arc($x,$y,2*$w-1,2*$h-1,$sa,$ea);
-	$img->Line($x_old,$y_old,$x,$y);
-	$x_old=$x; $y_old=$y;
-    }
-}
-
-$g = new CanvasGraph($w,$h);
-//$gr = 1.61803398874989484820;
-
-$p = SeaShell($g->img,0,20,$w-1,$h-21,$r,19);
-$g->img->SetColor('black');
-$g->img->Rectangle(0,20,$w-1,$h-1);
-$g->img->SetFont(FF_FONT2,FS_BOLD);
-$g->img->SetTextAlign('center','top');
-$g->img->StrokeText($w/2,0,"Canvas Spiral");
-
-$g->Stroke();
-?>
-
diff --git a/#jpgraph/src/Examples/ccbp_ex1.php b/#jpgraph/src/Examples/ccbp_ex1.php
deleted file mode 100644
index 5071fd34..00000000
--- a/#jpgraph/src/Examples/ccbp_ex1.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php // content="text/plain; charset=utf-8" 
-require_once 'jpgraph/jpgraph.php';
-require_once 'jpgraph/jpgraph_line.php';
-require_once 'jpgraph/jpgraph_plotmark.inc.php';
-require_once 'jpgraph/jpgraph_scatter.php';
-require_once 'ccbpgraph.class.php';
-
-$graph = new CCBPGraph(600,400);
-$graph->SetTitle('Buffer penetration','(history added)');
-$graph->SetColorMap(0); 
- 
- // Two "fake tasks with hostory
-$datax=array(75,83); $datay=array(110,64);
-$datax1 = array(33,50,67,83); $datay1 = array(86,76,80,64);
-$datax2 = array(18,47,58,75); $datay2 = array(80,97,105,110);
-
-$sp = new ScatterPlot($datay,$datax);
-$sp->mark->SetType(MARK_DIAMOND);
-$sp->mark->SetFillColor('white');
-$sp->mark->SetSize(12);
-
-$sp_hist = array();
-$sp_hist[0] = new LinePlot($datay1,$datax1);
-$sp_hist[0]->SetWeight(1);
-$sp_hist[0]->SetColor('white');
-
-$sp_hist[1] = new LinePlot($datay2,$datax2);
-$sp_hist[1]->SetWeight(1);
-$sp_hist[1]->SetColor('white');
-
-$graph->Add($sp_hist);
-$graph->Add($sp);
-
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/ccbp_ex2.php b/#jpgraph/src/Examples/ccbp_ex2.php
deleted file mode 100644
index c5decd30..00000000
--- a/#jpgraph/src/Examples/ccbp_ex2.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php // content="text/plain; charset=utf-8" 
-require_once 'jpgraph/jpgraph.php';
-require_once 'jpgraph/jpgraph_line.php';
-require_once 'jpgraph/jpgraph_plotmark.inc.php';
-require_once 'jpgraph/jpgraph_scatter.php';
-require_once 'ccbpgraph.class.php';
-
-$graph = new CCBPGraph(600,400);
-$graph->SetTitle('Buffer penetration','(history added)');
-$graph->SetColorMap(1); 
- 
- // Two "fake tasks with hostory
-$datax=array(75,83); $datay=array(110,64);
-$datax1 = array(33,50,67,83); $datay1 = array(86,76,80,64);
-$datax2 = array(18,47,58,75); $datay2 = array(80,97,105,110);
-
-$sp = new ScatterPlot($datay,$datax);
-$sp->mark->SetType(MARK_DIAMOND);
-$sp->mark->SetFillColor('white');
-$sp->mark->SetSize(12);
-
-$sp_hist = array();
-$sp_hist[0] = new LinePlot($datay1,$datax1);
-$sp_hist[0]->SetWeight(1);
-$sp_hist[0]->SetColor('white');
-
-$sp_hist[1] = new LinePlot($datay2,$datax2);
-$sp_hist[1]->SetWeight(1);
-$sp_hist[1]->SetColor('white');
-
-$graph->Add($sp_hist);
-$graph->Add($sp);
-
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/ccbpgraph.class.php b/#jpgraph/src/Examples/ccbpgraph.class.php
deleted file mode 100644
index 91954e1e..00000000
--- a/#jpgraph/src/Examples/ccbpgraph.class.php
+++ /dev/null
@@ -1,257 +0,0 @@
-<?php // content="text/plain; charset=utf-8" 
-/**
-* Class CCBPGraph
-* Utility class to create Critical Chain Buffer penetration charts
-*/
-class CCBPGraph {
-    const TickStep = 25;
-    const YTitle = '% Buffer used';
-    const XTitle = '% CC Completed';
-    const NColorMaps = 2;
-	private $graph=null;
-	private $iWidth,$iHeight;
-	private $iPlots=array();
-	private $iXMin=-50, $iXMax = 100;
-	private $iYMin=-50, $iYMax = 150;
-	private $iColorInd = array( 
-		array(5,75),   /* Green */
-		array(25,85),  /* Yellow */
-		array(50,100));/* Red */ 
-	private $iColorMap = 0;
-    private $iColorSpec = array(
-                array('darkgreen:1.0','yellow:1.4','red:0.8','darkred:0.85'),
-                array('#c6e9af','#ffeeaa','#ffaaaa','#de8787'));
-    private $iMarginColor = array('darkgreen@0.7','darkgreen@0.9');                
-	private $iSubTitle='',$iTitle = 'CC Buffer penetration';
-    /**
-    * Construct a new instance of CCBPGraph 
-    * 
-    * @param int $aWidth
-    * @param int $aHeight
-    * @return CCBPGraph
-    */
-	public function __construct($aWidth, $aHeight) {
-		$this->iWidth = $aWidth;
-		$this->iHeight = $aHeight;
-	}
-	/**
-    * Set the title and subtitle for the graph
-    * 
-    * @param string $aTitle
-    * @param string $aSubTitle
-    */
-	public function SetTitle($aTitle, $aSubTitle) {
-		$this->iTitle = $aTitle;
-		$this->iSubTitle = $aSubTitle;
-	}
-	/**
-    * Set the x-axis min and max values
-    * 
-    * @param int $aMin
-    * @param int $aMax
-    */
-	public function SetXMinMax($aMin, $aMax) {
-		$this->iXMin = floor($aMin/CCBPGraph::TickStep)*CCBPGraph::TickStep;
-		$this->iXMax = ceil($aMax/CCBPGraph::TickStep)*CCBPGraph::TickStep;
-	}
-    /**
-    * Specify what color map to use
-    * 
-    * @param int $aMap
-    */
-    public function SetColorMap($aMap) {
-        $this->iColorMap = $aMap % CCBPGraph::NColorMaps;
-    }
-	/**
-    * Set the y-axis min and max values
-    * 
-    * @param int $aMin
-    * @param int $aMax
-    */
-	public function SetYMinMax($aMin,$aMax) {
-		$this->iYMin = floor($aMin/CCBPGraph::TickStep)*CCBPGraph::TickStep;
-		$this->iYMax = ceil($aMax/CCBPGraph::TickStep)*CCBPGraph::TickStep;
-	}
-	/**
-    * Set the specification of the color backgrounds and also the
-    * optional exact colors to be used
-    * 
-    * @param mixed $aSpec  An array of 3 1x2 arrays. Each array specify the 
-    * color indication value at x=0 and x=max x in order to determine the slope
-    * @param mixed $aColors  An array with four elements specifying the colors
-    * of each color indicator
-    */
-	public function SetColorIndication(array $aSpec,array $aColors=null) {
-		if( count($aSpec) !== 3 ) {
-			JpgraphError::Raise('Specification of scale values for background indicators must be an array with three elements.');
-		}
-		$this->iColorInd = $aSpec;	
-		if( $aColors !== null ) {
-            if( is_array($aColors) && count($aColors) == 4 ) {
-			    $this->iColorSpec = $aColors;
-            }
-            else {
-                JpGraphError::Raise('Color specification for background indication must have four colors.');
-            }
-		}		
-	}
-	/**
-    * Construct the graph
-    * 
-    */
-	private function Init() {
-
-		// Setup limits for color indications
-		$lowx = $this->iXMin; $highx= $this->iXMax;
-		$lowy = $this->iYMin; $highy = $this->iYMax;
- 		$width=$this->iWidth; $height=$this->iHeight;
-
-		// Margins
-		$lm=50; $rm=40;
-		$tm=60; $bm=40;
-        
-        if( $width <= 300 || $height <= 250 ) {
-            $labelsize = 8;
-            $lm=25; $rm=25;
-            $tm=45; $bm=25;
-        }				
-		elseif( $width <= 450 || $height <= 300 ) {
-			$labelsize = 8;
-			$lm=30; $rm=30;
-			$tm=50; $bm=30;
-		}
-		elseif( $width <= 600 || $height <= 400 ) {
-			$labelsize = 9;		
-		}
-		else {
-			$labelsize = 11;
-		}	
-        
-        if( $this->iSubTitle == '' ) {
-            $tm -= $labelsize+4;
-        } 	
-
-		$graph = new Graph($width,$height);
-		$graph->SetScale('intint',$lowy,$highy,$lowx,$highx);
-		$graph->SetMargin($lm,$rm,$tm,$bm);
-		$graph->SetMarginColor($this->iMarginColor[$this->iColorMap]);
-		$graph->SetClipping();
-		
-		$graph->title->Set($this->iTitle);
-		$graph->subtitle->Set($this->iSubTitle);
-		
-		$graph->title->SetFont(FF_ARIAL,FS_BOLD,$labelsize+4);
-		$graph->subtitle->SetFont(FF_ARIAL,FS_BOLD,$labelsize+1);
-		
-		$graph->SetBox(true,'black@0.3');
-
-		$graph->xaxis->SetFont(FF_ARIAL,FS_BOLD,$labelsize);
-		$graph->yaxis->SetFont(FF_ARIAL,FS_BOLD,$labelsize);
-		
-		$graph->xaxis->scale->ticks->Set(CCBPGraph::TickStep,CCBPGraph::TickStep);
-		$graph->yaxis->scale->ticks->Set(CCBPGraph::TickStep,CCBPGraph::TickStep);
-		
-		$graph->xaxis->HideZeroLabel();
-		$graph->yaxis->HideZeroLabel();
-		        
-        $graph->xaxis->SetLabelFormatString('%d%%');
-        $graph->yaxis->SetLabelFormatString('%d%%');
-        
-		// For the x-axis we adjust the color so labels on the left of the Y-axis are in black
-		$n1 = floor(abs($this->iXMin/25))+1;
-		$n2 = floor($this->iXMax/25);
-        if( $this->iColorMap == 0 ) {
-		    $xlcolors=array();
-		    for( $i = 0; $i < $n1; ++$i ) {
-			    $xlcolors[$i] = 'black';
-		    }
-		    for( $i = 0; $i < $n2; ++$i ) {
-			    $xlcolors[$n1+$i] = 'lightgray:1.5';
-		    }
-		    $graph->xaxis->SetColor('gray',$xlcolors);
-		    $graph->yaxis->SetColor('gray','lightgray:1.5');
-        }
-        else {
-            $graph->xaxis->SetColor('darkgray','darkgray:0.8');
-            $graph->yaxis->SetColor('darkgray','darkgray:0.8');            
-        }
-		$graph->SetGridDepth(DEPTH_FRONT);
-		$graph->ygrid->SetColor('gray@0.6');
-		$graph->ygrid->SetLineStyle('dotted');
-		
-		$graph->ygrid->Show();
-		
-		$graph->xaxis->SetWeight(1);
-		$graph->yaxis->SetWeight(1);
-		
-		$ytitle = new Text(CCBPGraph::YTitle,floor($lm*.75),($height-$tm-$bm)/2+$tm);
-		#$ytitle->SetFont(FF_VERA,FS_BOLD,$labelsize+1);
-		$ytitle->SetAlign('right','center');
-		$ytitle->SetAngle(90);
-		$graph->Add($ytitle);
-		
-		$xtitle = new Text(CCBPGraph::XTitle,($width-$lm-$rm)/2+$lm,$height - 10);
-		#$xtitle->SetFont(FF_VERA,FS_BOLD,$labelsize);
-		$xtitle->SetAlign('center','bottom');
-		$graph->Add($xtitle);
-		
-		$df = 'D j:S M, Y'; 
-		if( $width < 400 ) {
-			$df = 'D j:S M';
-		}
-		
-		$time = new Text(date($df),$width-10,$height-10);
-		$time->SetAlign('right','bottom');
-		#$time->SetFont(FF_VERA,FS_NORMAL,$labelsize-1);
-		$time->SetColor('darkgray');
-		$graph->Add($time);
-
-		// Use an accumulated fille line graph to create the colored bands
-       
-        $n = 3;
-        for( $i=0; $i < $n; ++$i ) {
-            $b = $this->iColorInd[$i][0];
-            $k = ($this->iColorInd[$i][1] - $this->iColorInd[$i][0])/$this->iXMax;
-            $colarea[$i] = array( array($lowx,$lowx*$k+$b), array($highx,$highx*$k+$b) );
-        }
-        $colarea[3] = array( array($lowx,$highy), array($highx,$highy) );
-        
-        
-		$cb = array();
-		for( $i=0; $i < 4; ++$i ) {
-			$cb[$i] = new LinePlot(array($colarea[$i][0][1],$colarea[$i][1][1]),
-								   array($colarea[$i][0][0],$colarea[$i][1][0]));
-			$cb[$i]->SetFillColor($this->iColorSpec[$this->iColorMap][$i]);
-			$cb[$i]->SetFillFromYMin();								   
-		}
-
-		$graph->Add(array_slice(array_reverse($cb),0,4));	
-		$this->graph = $graph;
-	}
-    /**
-    * Add a line or scatter plot to the graph
-    * 
-    * @param mixed $aPlots
-    */
-    public function Add($aPlots) {
-        if( is_array($aPlots) ) {
-            $this->iPlots = array_merge($this->iPlots,$aPlots);                
-        }
-        else {
-            $this->iPlots[] = $aPlots;
-        }
-    }
-    /**
-    * Stroke the graph back to the client or to a file
-    * 
-    * @param mixed $aFile
-    */
-	public function Stroke($aFile='') {
-		$this->Init();
-        if( count($this->iPlots) > 0 )  {
-		    $this->graph->Add($this->iPlots);
-        }
-		$this->graph->Stroke($aFile);
-	}
-}
-?>
diff --git a/#jpgraph/src/Examples/centeredlineex01.php b/#jpgraph/src/Examples/centeredlineex01.php
deleted file mode 100644
index 3642f3a4..00000000
--- a/#jpgraph/src/Examples/centeredlineex01.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-require_once ('jpgraph/jpgraph_error.php');
-
-
-//$datax = array(3.5,3.7,3,4,6.2,6,3.5,8,14,8,11.1,13.7);
-$datay = array(1.23,1.9,1.6,3.1,3.4,2.8,2.1,1.9);
-$graph = new Graph(300,200);
-$graph->img->SetMargin(40,40,40,40);	
-$graph->img->SetAntiAliasing();
-$graph->SetScale("textlin");
-$graph->SetShadow();
-$graph->title->Set("Example of line centered plot");
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-
-
-// Use 20% "grace" to get slightly larger scale then min/max of
-// data
-$graph->yscale->SetGrace(20);
-
-
-$p1 = new LinePlot($datay);
-$p1->mark->SetType(MARK_FILLEDCIRCLE);
-$p1->mark->SetFillColor("red");
-$p1->mark->SetWidth(4);
-$p1->SetColor("blue");
-$p1->SetCenter();
-$graph->Add($p1);
-
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/centeredlineex02.php b/#jpgraph/src/Examples/centeredlineex02.php
deleted file mode 100644
index 2b742290..00000000
--- a/#jpgraph/src/Examples/centeredlineex02.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-require_once ('jpgraph/jpgraph_error.php');
-
-
-//$datax = array(3.5,3.7,3,4,6.2,6,3.5,8,14,8,11.1,13.7);
-$datay = array(1.23,1.9,1.6,3.1,3.4,2.8,2.1,1.9);
-$graph = new Graph(300,200);
-$graph->img->SetMargin(40,40,40,40);	
-$graph->img->SetAntiAliasing();
-$graph->SetScale("textlin");
-$graph->SetShadow();
-$graph->title->Set("Example of filled line centered plot");
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-
-$p1 = new LinePlot($datay);
-$p1->SetFillColor("green");
-$p1->mark->SetType(MARK_FILLEDCIRCLE);
-$p1->mark->SetFillColor("red");
-$p1->mark->SetWidth(4);
-$p1->SetColor("blue");
-$p1->SetCenter();
-$graph->Add($p1);
-
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/centeredlineex03.php b/#jpgraph/src/Examples/centeredlineex03.php
deleted file mode 100644
index 9c182a74..00000000
--- a/#jpgraph/src/Examples/centeredlineex03.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$labels = array("Oct 2000","Nov 2000","Dec 2000","Jan 2001","Feb 2001","Mar 2001","Apr 2001","May 2001");
-$datay = array(1.23,1.9,1.6,3.1,3.4,2.8,2.1,1.9);
-$graph = new Graph(300,250);
-$graph->img->SetMargin(40,40,40,80);	
-$graph->img->SetAntiAliasing();
-$graph->SetScale("textlin");
-$graph->SetShadow();
-$graph->title->Set("Example slanted X-labels");
-$graph->title->SetFont(FF_VERDANA,FS_NORMAL,14);
-
-$graph->xaxis->SetFont(FF_ARIAL,FS_NORMAL,11);
-$graph->xaxis->SetTickLabels($labels);
-$graph->xaxis->SetLabelAngle(45);
-
-$p1 = new LinePlot($datay);
-$p1->mark->SetType(MARK_FILLEDCIRCLE);
-$p1->mark->SetFillColor("red");
-$p1->mark->SetWidth(4);
-$p1->SetColor("blue");
-$p1->SetCenter();
-$graph->Add($p1);
-
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/centerlinebarex1.php b/#jpgraph/src/Examples/centerlinebarex1.php
deleted file mode 100644
index d686bc6b..00000000
--- a/#jpgraph/src/Examples/centerlinebarex1.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-
-$ydata = array(12,15,22,19,5);
-
-$graph = new Graph(400,200);
-$graph->img->SetMargin(40,80,40,40);	
-$graph->SetScale("textlin");
-$graph->SetShadow();
-
-$graph->title->Set('Center the line points in bars');
-
-$line = new LinePlot($ydata);
-$line->SetBarCenter();
-$line->SetWeight(2);
-
-$bar = new BarPlot($ydata);
-$bar2 = new BarPlot($ydata);
-$bar2->SetFillColor("red");
-
-$gbar = new GroupbarPlot(array($bar,$bar2));
-
-$graph->Add($gbar);
-$graph->Add($line);
-
-// Output line
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/checkgd.php b/#jpgraph/src/Examples/checkgd.php
deleted file mode 100644
index ad252bd2..00000000
--- a/#jpgraph/src/Examples/checkgd.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-$im = @imagecreate (200, 100) or die ( "cannot create a new gd image.");
-$background_color = imagecolorallocate ($im, 240, 240, 240);
-$border_color = imagecolorallocate ($im, 50, 50, 50);
-$text_color = imagecolorallocate ($im, 233, 14, 91);
-
-imagerectangle($im,0,0,199,99,$border_color);
-imagestring ($im, 5, 10, 40, "a simple text string", $text_color );
-header ("content-type: image/png");
-imagepng ($im);
-?>
diff --git a/#jpgraph/src/Examples/checkgd2.php b/#jpgraph/src/Examples/checkgd2.php
deleted file mode 100644
index e5e7b3c5..00000000
--- a/#jpgraph/src/Examples/checkgd2.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-$im =  imagecreatetruecolor ( 300, 200);
-$black = imagecolorallocate ($im,  0, 0, 0);
-$lightgray = imagecolorallocate ($im,  230, 230, 230);
-$darkgreen = imagecolorallocate ($im,  80, 140, 80);
-$white = imagecolorallocate ($im,  255, 255, 255);
-
-imagefilledrectangle ($im,0,0,299,199 ,$lightgray);
-imagerectangle ($im,0,0,299,199,$black);
-imagefilledellipse ($im,150,100,210,110,$white);
-imagefilledellipse ($im,150,100,200,100,$darkgreen);
-header ("Content-type: image/png");
-imagepng ($im);
-?>
diff --git a/#jpgraph/src/Examples/checkttf.php b/#jpgraph/src/Examples/checkttf.php
deleted file mode 100644
index 5efe737f..00000000
--- a/#jpgraph/src/Examples/checkttf.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// Change this defines to where Your fonts are stored
-DEFINE("TTF_DIR","/usr/share/fonts/truetype/");
-
-// Change this define to a font file that You know that You have
-DEFINE("TTF_FONTFILE","arial.ttf");
-
-// Text to display
-DEFINE("TTF_TEXT","Hello World!");
-
-$im = imagecreatetruecolor (400, 100);
-$white = imagecolorallocate ($im, 255, 255, 255);
-$black = imagecolorallocate ($im, 0, 0, 0);
-$border_color = imagecolorallocate ($im, 50, 50, 50);
-
-imagefilledrectangle($im,0,0,399,99,$white);
-imagerectangle($im,0,0,399,99,$border_color);
-imagettftext ($im, 30, 0, 90, 60, $black, TTF_DIR.TTF_FONTFILE,TTF_TEXT);
-
-header ("Content-type: image/png");
-imagepng ($im);
-?>
diff --git a/#jpgraph/src/Examples/classroom.jpg b/#jpgraph/src/Examples/classroom.jpg
deleted file mode 100644
index f4cc06c4..00000000
Binary files a/#jpgraph/src/Examples/classroom.jpg and /dev/null differ
diff --git a/#jpgraph/src/Examples/clipping_ex1.php b/#jpgraph/src/Examples/clipping_ex1.php
deleted file mode 100644
index 8629fce4..00000000
--- a/#jpgraph/src/Examples/clipping_ex1.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$ydata = array(11,3,8,12,5,1,9,13,5,7);
-
-// Create the graph. These two calls are always required
-$graph = new Graph(300,250);	
-$graph->SetScale('intlin',0,10);
-$graph->SetMargin(30,20,70,40);
-$graph->SetMarginColor(array(177,191,174));
-
-$graph->SetClipping(false);
-
-$graph->xaxis->SetFont(FF_FONT1,FS_BOLD);
-
-$graph->ygrid->SetLineStyle('dashed');
-
-$graph->title->Set("Manual scale");
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,14);
-$graph->title->SetColor('white');
-$graph->subtitle->Set("(No clipping)");
-$graph->subtitle->SetColor('white');
-$graph->subtitle->SetFont(FF_ARIAL,FS_BOLD,10);
-
-// Create the linear plot
-$lineplot=new LinePlot($ydata);
-$lineplot->SetColor("red");
-$lineplot->SetWeight(2);
-
-// Add the plot to the graph
-$graph->Add($lineplot);
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/clipping_ex2.php b/#jpgraph/src/Examples/clipping_ex2.php
deleted file mode 100644
index aba939f9..00000000
--- a/#jpgraph/src/Examples/clipping_ex2.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$ydata = array(11,3,8,12,5,1,9,13,5,7);
-
-// Create the graph. These two calls are always required
-$graph = new Graph(300,250);	
-$graph->SetScale('intlin',0,10);
-$graph->SetMargin(30,20,70,40);
-$graph->SetMarginColor(array(177,191,174));
-
-$graph->SetClipping(true);
-
-$graph->xaxis->SetFont(FF_FONT1,FS_BOLD);
-
-$graph->ygrid->SetLineStyle('dashed');
-
-$graph->title->Set("Manual scale");
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,14);
-$graph->title->SetColor('white');
-$graph->subtitle->Set("(With clipping)");
-$graph->subtitle->SetColor('white');
-$graph->subtitle->SetFont(FF_ARIAL,FS_BOLD,10);
-
-// Create the linear plot
-$lineplot=new LinePlot($ydata);
-$lineplot->SetColor("red");
-$lineplot->SetWeight(2);
-
-// Add the plot to the graph
-$graph->Add($lineplot);
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/colormaps.php b/#jpgraph/src/Examples/colormaps.php
deleted file mode 100644
index 2f9470f0..00000000
--- a/#jpgraph/src/Examples/colormaps.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('../jpgraph.php');
-require_once ('../jpgraph_canvas.php');
-require_once ('../jpgraph_colormap.inc.php');
-
-class ColorMapDriver {
-	const WIDTH = 600; // Image width
-	const LMARG = 90;  // Left margin
-	const RMARG = 25;  // Right margin
-	const MAPMARG = 35;  // Map margin between each map
-	const MODHEIGHT = 30; // Module height (=Map height)
-	const YSTART = 60; // Start coordinate for map list
-
-    public function Draw($aTitle, $aStart, $aEnd, $n=64, $aReverse=false, $addColorNames = false ) {
-
-	    // Setup to draw colormap with names platoe colors
-	    $lmarg = ColorMapDriver::LMARG; // left margin
-	    $rmarg = ColorMapDriver::RMARG; // right margin
-	    $width = ColorMapDriver::WIDTH; // Overall image width
-
-	    // Module height
-	    $mh = ColorMapDriver::MODHEIGHT;
-
-	    // Step between each map
-	    $ymarg = $mh + ColorMapDriver::MAPMARG;
-
-	    if( $addColorNames ) {
-	    	$ymarg += 50;
-	    }
-
-        // Start position
-        $xs=$lmarg; $ys=ColorMapDriver::YSTART;
-
-    	// Setup a basic canvas graph
-        $height = ($aEnd-$aStart+1)*$ymarg+50;
-        $graph = new CanvasGraph($width,$height);
-        $graph->img->SetColor('darkgray');
-        $graph->img->Rectangle(0,0,$width-1,$height-1);
-
-	    $t = new Text($aTitle, $width/2,5);
-	    $t->SetAlign('center','top');
-	    $t->SetFont(FF_ARIAL,FS_BOLD,14);
-	    $t->Stroke($graph->img);
-
-	    // Instantiate a colormap
-		$cm = new ColorMap();
-		$cm->InitRGB($graph->img->rgb);
-
-        for( $mapidx=$aStart; $mapidx <= $aEnd; ++$mapidx, $ys += $ymarg ) {
-
-	        $cm->SetMap($mapidx,$aReverse);
-	        $n = $cm->SetNumColors($n);
-	        list( $mapidx, $maparray ) = $cm->GetCurrMap();
-	        $ncols = count($maparray);
-	        $colbuckets = $cm->GetBuckets();
-
-	        // The module width will depend on the actual number of colors
-	    	$mw = round(($width-$lmarg-$rmarg)/$n);
-
-	        // Draw color map title (name)
-	        $t->Set('Basic colors: '.$ncols.',   Total colors: '.$n);
-	        $t->SetAlign('center','bottom');
-	        $t->SetAngle(0);
-	        $t->SetFont(FF_TIMES,FS_NORMAL,14);
-	        $t->Stroke($graph->img,$width/2,$ys-3);
-
-	        // Add the name/number of the map to the left
-	        $t->SetAlign('right','center');
-	        $t->Set('Map: '.$mapidx);
-	        $t->SetFont(FF_ARIAL,FS_NORMAL,14);
-	        $t->Stroke($graph->img,$xs-20,round($ys+$mh/2));
-
-	        // Setup text properties for the color names
-	        if( $addColorNames ) {
-	        	$t->SetAngle(30);
-	        	$t->SetFont(FF_ARIAL,FS_NORMAL,12);
-	        	$t->SetAlign('right','top');
-	        }
-
-	        // Loop through all colors in the map
-	        $x = $xs; $y = $ys; $k=0;
-	        for($i=0; $i < $n; ++$i){
-	            $graph->img->SetColor($colbuckets[$i]);
-	            $graph->img->FilledRectangle($x,$y,$x+$mw,$y+$mh);
-
-	            // Mark all basic colors in the map with a bar and name
-	            if( $i % (($n-$ncols)/($ncols-1)+1) == 0 ) {
-	            	$graph->img->SetColor('black');
-	            	$graph->img->FilledRectangle($x,$y+$mh+4,$x+$mw-1,$y+$mh+6);
-	            	if( $addColorNames ) {
-	            		$t->Set($maparray[$k++]);
-	            		$t->Stroke($graph->img,$x+$mw/2,$y+$mh+10);
-	            	}
-	            }
-	            $x += $mw;
-	        }
-
-	        // Draw a border around the map
-	        $graph->img->SetColor('black');
-	        $graph->img->Rectangle($xs,$ys,$xs+$mw*$n,$ys+$mh);
-
-	    }
-
-        // Send back to client
-        $graph->Stroke();
-    }
-
-}
-
-$driver = new ColorMapDriver();
-
-$title = "Standard maps";
-$reverse = false;
-$n = 64; $s=0; $e=9;
-$showNames = false;
-
-
-/*
-$title = "Center maps";
-$reverse = false;
-$n = 64; $s=10; $e=14;
-$showNames = false;
-*/
-
-/*
-$title = "Continues maps";
-$reverse = false;
-$n = 64; $s=15; $e=21;
-$showNames = false;
-*/
-$driver->Draw($title,$s,$e,$n,$reverse,$showNames);
-
-?>
diff --git a/#jpgraph/src/Examples/comb90dategraphex01.php b/#jpgraph/src/Examples/comb90dategraphex01.php
deleted file mode 100644
index 32948225..00000000
--- a/#jpgraph/src/Examples/comb90dategraphex01.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-require_once ('jpgraph/jpgraph_date.php');
-require_once ('jpgraph/jpgraph_mgraph.php');
-
-// Setup some fake data to simulate some wind speed and direction
-
-DEFINE('NDATAPOINTS',420);
-DEFINE('SAMPLERATE',300);
-$start = time();
-$end = $start+NDATAPOINTS*SAMPLERATE;
-$data = array();
-$xdata = array();
-$data_winddirection[0] = rand(100,200);
-$data_windspeed[0] = rand(7,10);
-for( $i=0; $i < NDATAPOINTS-1; ++$i ) {
-    $data_winddirection[$i+1] = $data_winddirection[$i] + rand(-4,4);
-    if($data_winddirection[$i+1] < 0 || $data_winddirection[$i+1] > 359)
-        $data_winddirection[$i+1] = 0;
-
-    $data_windspeed[$i+1] = $data_windspeed[$i] + rand(-2,2);
-    if($data_windspeed[$i+1] < 0 )
-        $data_windspeed[$i+1] = 0;
-
-    $xdata[$i] = $start + $i * SAMPLERATE;
-}
-$xdata[$i] = $start + $i * SAMPLERATE;
-
-
-// Setup the Wind direction graph
-$graph = new Graph(300,800);
-$graph->SetMarginColor('lightgray:1.7');
-$graph->SetScale('datlin',0,360);
-$graph->Set90AndMargin(50,30,60,30);
-$graph->SetFrame(true,'white',0);
-$graph->SetBox();
-
-$graph->title->Set('Wind direction');
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,14);
-$graph->title->SetMargin(10);
-
-$graph->xaxis->SetFont(FF_ARIAL,FS_NORMAL,9);
-$graph->xaxis->scale->SetDateFormat('h:i');
-$graph->xgrid->Show();
-
-$graph->yaxis->SetLabelAngle(45);
-$graph->yaxis->SetFont(FF_ARIAL,FS_NORMAL,9);
-$graph->yaxis->SetLabelMargin(0);
-$graph->yaxis->scale->SetAutoMin(0);
-
-$line = new LinePlot($data_winddirection,$xdata);
-$line->SetStepStyle();
-$line->SetColor('blue');
-
-$graph->Add($line);
-
-// Setup the wind speed graph
-$graph2 = new Graph(300,800);
-$graph2->SetScale('datlin');
-$graph2->Set90AndMargin(50,30,60,30);
-$graph2->SetMarginColor('lightgray:1.7');
-$graph2->SetFrame(true,'white',0);
-$graph2->SetBox();
-
-$graph2->title->Set('Windspeed');
-$graph2->title->SetFont(FF_ARIAL,FS_BOLD,14);
-$graph2->title->SetMargin(10);
-
-$graph2->xaxis->SetFont(FF_ARIAL,FS_NORMAL,9);
-$graph2->xaxis->scale->SetDateFormat('h:i');
-$graph2->xgrid->Show();
-
-$graph2->yaxis->SetLabelAngle(45);
-$graph2->yaxis->SetFont(FF_ARIAL,FS_NORMAL,9);
-$graph2->yaxis->SetLabelMargin(0);
-$graph2->yaxis->scale->SetAutoMin(0);
-
-$line2 = new LinePlot($data_windspeed,$xdata);
-$line2->SetStepStyle();
-$line2->SetColor('red');
-
-$graph2->Add($line2);
-
-//-----------------------
-// Create a multigraph
-//----------------------
-$mgraph = new MGraph();
-$mgraph->SetMargin(2,2,2,2);
-$mgraph->SetFrame(true,'darkgray',2);
-$mgraph->SetFillColor('lightgray');
-$mgraph->Add($graph);
-$mgraph->Add($graph2,300,0);
-$mgraph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/comb90dategraphex02.php b/#jpgraph/src/Examples/comb90dategraphex02.php
deleted file mode 100644
index b6671811..00000000
--- a/#jpgraph/src/Examples/comb90dategraphex02.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-require_once ('jpgraph/jpgraph_date.php');
-require_once ('jpgraph/jpgraph_mgraph.php');
-
-// Setup some fake data to simulate some wind speed and direction
-
-DEFINE('NDATAPOINTS',420);
-DEFINE('SAMPLERATE',300);
-$start = time();
-$end = $start+NDATAPOINTS*SAMPLERATE;
-$data = array();
-$xdata = array();
-$data_winddirection[0] = rand(100,200);
-$data_windspeed[0] = rand(7,10);
-for( $i=0; $i < NDATAPOINTS-1; ++$i ) {
-    $data_winddirection[$i+1] = $data_winddirection[$i] + rand(-4,4);
-    if($data_winddirection[$i+1] < 0 || $data_winddirection[$i+1] > 359)
-        $data_winddirection[$i+1] = 0;
-
-    $data_windspeed[$i+1] = $data_windspeed[$i] + rand(-2,2);
-    if($data_windspeed[$i+1] < 0 )
-        $data_windspeed[$i+1] = 0;
-
-    $xdata[$i] = $start + $i * SAMPLERATE;
-}
-$xdata[$i] = $start + $i * SAMPLERATE;
-
-
-DEFINE('BKG_COLOR','lightgray:1.7');
-DEFINE('WIND_HEIGHT',800);
-DEFINE('WIND_WIDTH',280);
-
-// Setup the Wind direction graph
-$graph = new Graph(WIND_WIDTH,WIND_HEIGHT);
-$graph->SetMarginColor(BKG_COLOR);
-$graph->SetScale('datlin',0,360);
-$graph->Set90AndMargin(50,10,60,30);
-$graph->SetFrame(true,'white',0);
-$graph->SetBox();
-
-$graph->title->Set('Wind direction');
-$graph->title->SetColor('blue');
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,14);
-$graph->title->SetMargin(5);
-
-$graph->xaxis->SetFont(FF_ARIAL,FS_NORMAL,9);
-$graph->xaxis->scale->SetDateFormat('h:i');
-$graph->xgrid->Show();
-
-$graph->yaxis->SetLabelAngle(90);
-$graph->yaxis->SetColor('blue');
-$graph->yaxis->SetFont(FF_ARIAL,FS_NORMAL,9);
-$graph->yaxis->SetLabelMargin(0);
-$graph->yaxis->scale->SetAutoMin(0);
-
-$line = new LinePlot($data_winddirection,$xdata);
-$line->SetStepStyle();
-$line->SetColor('blue');
-
-$graph->Add($line);
-
-// Setup the wind speed graph
-$graph2 = new Graph(WIND_WIDTH-30,WIND_HEIGHT);
-$graph2->SetScale('datlin');
-$graph2->Set90AndMargin(5,20,60,30);
-$graph2->SetMarginColor(BKG_COLOR);
-$graph2->SetFrame(true,'white',0);
-$graph2->SetBox();
-
-$graph2->title->Set('Windspeed');
-$graph2->title->SetColor('red');
-$graph2->title->SetFont(FF_ARIAL,FS_BOLD,14);
-$graph2->title->SetMargin(5);
-
-$graph2->xaxis->HideLabels();
-$graph2->xgrid->Show();
-
-$graph2->yaxis->SetLabelAngle(90);
-$graph2->yaxis->SetColor('red');
-$graph2->yaxis->SetFont(FF_ARIAL,FS_NORMAL,9);
-$graph2->yaxis->SetLabelMargin(0);
-$graph2->yaxis->scale->SetAutoMin(0);
-
-$line2 = new LinePlot($data_windspeed,$xdata);
-$line2->SetStepStyle();
-$line2->SetColor('red');
-
-$graph2->Add($line2);
-
-//-----------------------
-// Create a multigraph
-//----------------------
-$mgraph = new MGraph();
-$mgraph->SetMargin(2,2,2,2);
-$mgraph->SetFrame(true,'darkgray',2);
-$mgraph->SetFillColor(BKG_COLOR);
-$mgraph->Add($graph);
-$mgraph->Add($graph2,280,0);
-$mgraph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/comb90dategraphex03.php b/#jpgraph/src/Examples/comb90dategraphex03.php
deleted file mode 100644
index 2911f8b7..00000000
--- a/#jpgraph/src/Examples/comb90dategraphex03.php
+++ /dev/null
@@ -1,147 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-require_once ('jpgraph/jpgraph_date.php');
-require_once ('jpgraph/jpgraph_mgraph.php');
-
-// Setup some fake data to simulate some wind speed and direction
-
-DEFINE('NDATAPOINTS',280);
-DEFINE('SAMPLERATE',300);
-
-$start = time();
-$end = $start+NDATAPOINTS*SAMPLERATE;
-$xdata = array();
-
-$data_winddirection[0] = rand(100,200);
-$data_windspeed[0] = rand(7,10);
-$data_windtemp[0] = rand(5,20);
-
-for( $i=0; $i < NDATAPOINTS-1; ++$i ) {
-    $data_winddirection[$i+1] = $data_winddirection[$i] + rand(-4,4);
-    if($data_winddirection[$i+1] < 0 || $data_winddirection[$i+1] > 359)
-        $data_winddirection[$i+1] = 0;
-
-    $data_windspeed[$i+1] = $data_windspeed[$i] + rand(-2,2);
-    if($data_windspeed[$i+1] < 0 )
-        $data_windspeed[$i+1] = 0;
-
-    $data_windtemp[$i+1] = $data_windtemp[$i] + rand(-1.5,1.5);
-
-    $xdata[$i] = $start + $i * SAMPLERATE;
-}
-$xdata[$i] = $start + $i * SAMPLERATE;
-
-
-//DEFINE('BKG_COLOR','lightgray:1.7');
-DEFINE('BKG_COLOR','green:1.98');
-DEFINE('WIND_HEIGHT',800);
-DEFINE('WIND_WIDTH',250);
-
-//------------------------------------------------------------------
-// Setup the Wind direction graph
-//------------------------------------------------------------------
-$graph = new Graph(WIND_WIDTH,WIND_HEIGHT);
-$graph->SetMarginColor(BKG_COLOR);
-$graph->SetScale('datlin',0,360);
-$graph->Set90AndMargin(50,10,70,30);
-$graph->SetFrame(true,'white',0);
-$graph->SetBox();
-
-$graph->title->Set('Wind direction');
-$graph->title->SetColor('blue');
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,14);
-$graph->title->SetMargin(5);
-
-$graph->xaxis->SetFont(FF_ARIAL,FS_NORMAL,9);
-$graph->xaxis->scale->SetDateFormat('H:i');
-$graph->xgrid->Show();
-
-$graph->yaxis->SetLabelAngle(90);
-$graph->yaxis->SetColor('blue');
-$graph->yaxis->SetFont(FF_ARIAL,FS_NORMAL,9);
-$graph->yaxis->SetLabelMargin(0);
-$graph->yaxis->scale->SetAutoMin(0);
-
-$line = new LinePlot($data_winddirection,$xdata);
-$line->SetStepStyle();
-$line->SetColor('blue');
-
-$graph->Add($line);
-
-//------------------------------------------------------------------
-// Setup the wind speed graph
-//------------------------------------------------------------------
-$graph2 = new Graph(WIND_WIDTH-30,WIND_HEIGHT);
-$graph2->SetScale('datlin');
-$graph2->Set90AndMargin(5,20,70,30);
-$graph2->SetMarginColor(BKG_COLOR);
-$graph2->SetFrame(true,'white',0);
-$graph2->SetBox();
-
-$graph2->title->Set('Windspeed');
-$graph2->title->SetColor('red');
-$graph2->title->SetFont(FF_ARIAL,FS_BOLD,14);
-$graph2->title->SetMargin(5);
-
-$graph2->xaxis->HideLabels();
-$graph2->xgrid->Show();
-
-$graph2->yaxis->SetLabelAngle(90);
-$graph2->yaxis->SetColor('red');
-$graph2->yaxis->SetFont(FF_ARIAL,FS_NORMAL,9);
-$graph2->yaxis->SetLabelMargin(0);
-$graph2->yaxis->scale->SetAutoMin(0);
-
-$line2 = new LinePlot($data_windspeed,$xdata);
-$line2->SetStepStyle();
-$line2->SetColor('red');
-
-$graph2->Add($line2);
-
-//------------------------------------------------------------------
-// Setup the wind temp graph
-//------------------------------------------------------------------
-$graph3 = new Graph(WIND_WIDTH-30,WIND_HEIGHT);
-$graph3->SetScale('datlin');
-$graph3->Set90AndMargin(5,20,70,30);
-$graph3->SetMarginColor(BKG_COLOR);
-$graph3->SetFrame(true,'white',0);
-$graph3->SetBox();
-
-$graph3->title->Set('Temperature');
-$graph3->title->SetColor('black');
-$graph3->title->SetFont(FF_ARIAL,FS_BOLD,14);
-$graph3->title->SetMargin(5);
-
-$graph3->xaxis->HideLabels();
-$graph3->xgrid->Show();
-
-$graph3->yaxis->SetLabelAngle(90);
-$graph3->yaxis->SetColor('black');
-$graph3->yaxis->SetFont(FF_ARIAL,FS_NORMAL,9);
-$graph3->yaxis->SetLabelMargin(0);
-$graph3->yaxis->scale->SetAutoMin(-10);
-
-$line3 = new LinePlot($data_windtemp,$xdata);
-$line3->SetStepStyle();
-$line3->SetColor('black');
-
-$graph3->Add($line3);
-
-//-----------------------
-// Create a multigraph
-//----------------------
-$mgraph = new MGraph();
-$mgraph->SetMargin(2,2,2,2);
-$mgraph->SetFrame(true,'darkgray',2);
-$mgraph->SetFillColor(BKG_COLOR);
-$mgraph->Add($graph,0,50);
-$mgraph->Add($graph2,250,50);
-$mgraph->Add($graph3,460,50);
-$mgraph->title->Set('Climate diagram 12 March 2009');
-$mgraph->title->SetFont(FF_ARIAL,FS_BOLD,20);
-$mgraph->title->SetMargin(8);
-$mgraph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/combgraphex1.php b/#jpgraph/src/Examples/combgraphex1.php
deleted file mode 100644
index b03b14bb..00000000
--- a/#jpgraph/src/Examples/combgraphex1.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-require_once ('jpgraph/jpgraph_bar.php');
-require_once ('jpgraph/jpgraph_utils.inc.php');
-require_once ('jpgraph/jpgraph_mgraph.php');
-
-//------------------------------------------------------------------
-// Create some random data for the plot. We use the current time for the
-// first X-position
-//------------------------------------------------------------------
-$datay = array();
-$datax = array();
-$ts = time();
-$n=70; // Number of data points
-for($i=0; $i < $n; ++$i ) {
-    $datax[$i] = $ts+$i*150000; 
-    $datay[$i] = rand(5,60);
-    $datay2[$i] = rand(1,8);
-}
-
-// Now get labels at the start of each month
-$dateUtils = new DateScaleUtils();
-list($tickPositions,$minTickPositions) = $dateUtils->getTicks($datax,DSUTILS_MONTH1);
-
-// Now create the real graph
-// Combine a line and a bar graph
-
-// We add some grace to the end of the X-axis scale so that the first and last
-// data point isn't exactly at the very end or beginning of the scale
-$grace = 400000;
-$xmin = $datax[0]-$grace;
-$xmax = $datax[$n-1]+$grace;;
-
-// Overall width of graphs
-$w = 450;
-// Left and right margin for each graph
-$lm=25; $rm=15; 
-
-//----------------------
-// Setup the line graph
-//----------------------
-$graph = new Graph($w,250);
-$graph->SetScale('linlin',0,0,$xmin,$xmax);
-$graph->SetMargin($lm,$rm,10,30);
-$graph->SetMarginColor('white');
-$graph->SetFrame(false);
-$graph->SetBox(true);
-$graph->title->Set('Example of combined graph');
-$graph->title->SetFont(FF_ARIAL,FS_NORMAL,14);
-$graph->xaxis->SetTickPositions($tickPositions,$minTickPositions);
-$graph->xaxis->SetLabelFormatString('My',true);
-$graph->xgrid->Show();
-$p1 = new LinePlot($datay,$datax);
-$graph->Add($p1);
-
-//----------------------
-// Setup the bar graph
-//----------------------
-$graph2 = new Graph($w,110);
-$graph2->SetScale('linlin',0,0,$xmin,$xmax);
-$graph2->SetMargin($lm,$rm,5,10);
-$graph2->SetMarginColor('white');
-$graph2->SetFrame(false);
-$graph2->SetBox(true);
-$graph2->xgrid->Show();
-$graph2->xaxis->SetTickPositions($tickPositions,$minTickPositions);
-$graph2->xaxis->SetLabelFormatString('My',true);
-$graph2->xaxis->SetPos('max');
-$graph2->xaxis->HideLabels();
-$graph2->xaxis->SetTickSide(SIDE_DOWN);
-$b1 = new BarPlot($datay2,$datax);
-$b1->SetFillColor('teal');
-$b1->SetColor('teal:1.2');
-$graph2->Add($b1);
-
-//-----------------------
-// Create a multigraph
-//----------------------
-$mgraph = new MGraph();
-$mgraph->SetMargin(2,2,2,2);
-$mgraph->SetFrame(true,'darkgray',2);
-$mgraph->Add($graph);
-$mgraph->Add($graph2,0,240);
-$mgraph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/combgraphex2.php b/#jpgraph/src/Examples/combgraphex2.php
deleted file mode 100644
index 27afa832..00000000
--- a/#jpgraph/src/Examples/combgraphex2.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('../jpgraph.php');
-require_once ('../jpgraph_mgraph.php');
-require_once ('../jpgraph_line.php');
-require_once ('../jpgraph_bar.php');
-require_once ('../jpgraph_utils.inc.php');
-
-//------------------------------------------------------------------
-// Create some random data for the plot. We use the current time for the
-// first X-position
-//------------------------------------------------------------------
-$datay = array();
-$datax = array();
-$ts = time();
-$n=70; // Number of data points
-for($i=0; $i < $n; ++$i ) {
-    $datax[$i] = $ts+$i*150000; 
-    $datay[$i] = rand(5,60);
-    $datay2[$i] = rand(1,8);
-}
-
-// Now get labels at the start of each month
-list($tickPositions,$minTickPositions) = DateScaleUtils::getTicks($datax,DSUTILS_MONTH1);
-
-// Now create the real graph
-// Combine a line and a bar graph
-
-// We add some grace to the end of the X-axis scale so that the first and last
-// data point isn't exactly at the very end or beginning of the scale
-$grace = 400000;
-$xmin = $datax[0]-$grace;
-$xmax = $datax[$n-1]+$grace;;
-
-// Overall width of graphs
-$w = 450;
-// Left and right margin for each graph
-$lm=25; $rm=15; 
-
-//----------------------
-// Setup the line graph
-//----------------------
-$graph = new Graph($w,250);
-$graph->SetScale('linlin',0,0,$xmin,$xmax);
-$graph->SetMargin($lm,$rm,10,30);
-$graph->SetMarginColor('white');
-$graph->SetFrame(false);
-$graph->SetBox(true);
-$graph->title->Set('Example of combined graph with background');
-$graph->title->SetFont(FF_ARIAL,FS_NORMAL,14);
-$graph->xaxis->SetTickPositions($tickPositions,$minTickPositions);
-$graph->xaxis->SetLabelFormatString('My',true);
-$graph->xgrid->Show();
-$p1 = new LinePlot($datay,$datax);
-$graph->Add($p1);
-
-//----------------------
-// Setup the bar graph
-//----------------------
-$graph2 = new Graph($w,110);
-$graph2->SetScale('linlin',0,0,$xmin,$xmax);
-$graph2->SetMargin($lm,$rm,5,10);
-$graph2->SetMarginColor('white');
-$graph2->SetFrame(false);
-$graph2->SetBox(true);
-$graph2->xgrid->Show();
-$graph2->xaxis->SetTickPositions($tickPositions,$minTickPositions);
-$graph2->xaxis->SetLabelFormatString('My',true);
-$graph2->xaxis->SetPos('max');
-$graph2->xaxis->HideLabels();
-$graph2->xaxis->SetTickSide(SIDE_DOWN);
-$b1 = new BarPlot($datay2,$datax);
-$b1->SetFillColor('teal');
-$b1->SetColor('teal:1.2');
-$graph2->Add($b1);
-
-//-----------------------
-// Create a multigraph
-//----------------------
-$mgraph = new MGraph();
-$mgraph->SetImgFormat('jpeg',60);
-$mgraph->SetMargin(2,2,2,2);
-$mgraph->SetFrame(true,'darkgray',2);
-$mgraph->SetBackgroundImage('tiger1.jpg');
-$mgraph->AddMix($graph,0,0,85);
-$mgraph->AddMix($graph2,0,250,85);
-$mgraph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/contour2_ex1.php b/#jpgraph/src/Examples/contour2_ex1.php
deleted file mode 100644
index 764a8f29..00000000
--- a/#jpgraph/src/Examples/contour2_ex1.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_contourf.php');
-
-// Setup some data to use for the contour
-$data = array(
-    array (12,12,10,10),
-    array (10,10,8,14),
-    array (7,7,13,17),
-    array (4,5,8,12),
-    array (10,8,7,8));
-
-// create a basic graph as a container
-$graph = new Graph(300,300);
-$graph->SetMargin(30, 30, 40, 30);
-$graph->SetScale('intint');
-$graph->SetMarginColor('white');
-
-// Setup title of graph
-$graph->title->Set('Filled contour plot');
-$graph->title->SetFont(FF_VERDANA,FS_BOLD,12);
-
-$graph->subtitle->Set('(With lines and labels)');
-$graph->subtitle->SetFont(FF_VERDANA,FS_ITALIC,10);
-
-// Create a new contour plot
-$cp = new FilledContourPlot($data);
-
-// Use only blue/red color schema
-$cp->UseHighContrastColor(true);
-
-// Flip visually 
-$cp->SetInvert();
-
-// Fill the contours
-$cp->SetFilled(true);
-
-// Display the labels
-$cp->ShowLabels(true,true);
-$cp->SetFont(FF_ARIAL,FS_BOLD,9);
-$cp->SetFontColor('white');
-
-// And add the plot to the graph
-$graph->Add($cp);
-
-// Send it back to the client
-$graph->stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/contour2_ex2.php b/#jpgraph/src/Examples/contour2_ex2.php
deleted file mode 100644
index b702626b..00000000
--- a/#jpgraph/src/Examples/contour2_ex2.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_contourf.php');
-
-// Setup some data to use for the contour
-$data = array(
-    array (12,12,10,10),
-    array (10,10,8,14),
-    array (7,7,13,17),
-    array (4,5,8,12),
-    array (10,8,7,8));
-
-// create a basic graph as a container
-$graph = new Graph(300,300);
-$graph->SetMargin(30, 30, 40, 30);
-$graph->SetScale('intint');
-$graph->SetMarginColor('white');
-
-// Setup title of graph
-$graph->title->Set('Filled contour plot');
-$graph->title->SetFont(FF_VERDANA,FS_BOLD,12);
-
-$graph->subtitle->Set('(No lines, no labels)');
-$graph->subtitle->SetFont(FF_VERDANA,FS_ITALIC,10);
-
-// Create a new contour plot
-$cp = new FilledContourPlot($data);
-
-// Use only blue/red color schema
-$cp->UseHighContrastColor(true);
-
-// Flip visually 
-$cp->SetInvert();
-
-// Fill the contours
-$cp->SetFilled(true);
-
-// No labels
-$cp->ShowLabels(false);
-
-// No lines
-$cp->ShowLines(false);
-
-// And add the plot to the graph
-$graph->Add($cp);
-
-// Send it back to the client
-$graph->stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/contour2_ex3.php b/#jpgraph/src/Examples/contour2_ex3.php
deleted file mode 100644
index 93f7611d..00000000
--- a/#jpgraph/src/Examples/contour2_ex3.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_contourf.php');
-
-// Setup some data to use for the contour
-$data = array(
-    array (12,12,10,10),
-    array (10,10,8,14),
-    array (7,7,13,17),
-    array (4,5,8,12),
-    array (10,8,7,8));
-
-// create a basic graph as a container
-$graph = new Graph(300,300);
-$graph->SetMargin(30, 30, 40, 30);
-$graph->SetScale('intint');
-$graph->SetMarginColor('white');
-
-// Setup title of graph
-$graph->title->Set('Filled contour plot');
-$graph->title->SetFont(FF_VERDANA,FS_BOLD,12);
-
-$graph->subtitle->Set('(Manual colors)');
-$graph->subtitle->SetFont(FF_VERDANA,FS_ITALIC,10);
-
-// Create a new contour plot with only 3 isobars
-$cp = new FilledContourPlot($data,3);
-
-// Specify the colors manually
-$isobar_colors = array('lightgray','teal:1.3','orange','red');
-$cp->SetIsobarColors($isobar_colors);
-
-// Use only blue/red color schema
-$cp->UseHighContrastColor(true);
-
-// Flip visually 
-$cp->SetInvert();
-
-// Fill the contours
-$cp->SetFilled(true);
-
-// Display labels
-$cp->ShowLabels(true);
-
-// No lines
-$cp->ShowLines(false);
-
-// And add the plot to the graph
-$graph->Add($cp);
-
-// Send it back to the client
-$graph->stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/contour2_ex4.php b/#jpgraph/src/Examples/contour2_ex4.php
deleted file mode 100644
index 79e43e89..00000000
--- a/#jpgraph/src/Examples/contour2_ex4.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_contourf.php');
-
-// Setup some data to use for the contour
-$data = array(
-    array (12,12,10,10),
-    array (10,10,8,14),
-    array (7,7,13,17),
-    array (4,5,8,12),
-    array (10,8,7,8));
-
-// create a basic graph as a container
-$graph = new Graph(300,300);
-$graph->SetMargin(30, 30, 40, 30);
-$graph->SetScale('intint');
-$graph->SetMarginColor('white');
-
-// Setup title of graph
-$graph->title->Set('Filled contour plot');
-$graph->title->SetFont(FF_VERDANA,FS_BOLD,12);
-
-$graph->subtitle->Set('(labels follows gradients)');
-$graph->subtitle->SetFont(FF_VERDANA,FS_ITALIC,10);
-
-// Create a new contour plot
-$cp = new FilledContourPlot($data,8);
-
-// Flip visually 
-$cp->SetInvert();
-
-// Fill the contours
-$cp->SetFilled(true);
-
-// Display the labels
-$cp->ShowLabels(true,true);
-$cp->SetFont(FF_ARIAL,FS_BOLD,9);
-$cp->SetFontColor('black');
-
-// And add the plot to the graph
-$graph->Add($cp);
-
-// Send it back to the client
-$graph->stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/contour2_ex5.php b/#jpgraph/src/Examples/contour2_ex5.php
deleted file mode 100644
index 1d3ac433..00000000
--- a/#jpgraph/src/Examples/contour2_ex5.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_contourf.php');
-
-// Setup some data to use for the contour
-$data = array(
-    array (12,12,10,10),
-    array (10,10,8,14),
-    array (7,7,13,17),
-    array (4,5,8,12),
-    array (10,8,7,8));
-
-// create a basic graph as a container
-$graph = new Graph(300,300);
-$graph->SetMargin(30, 30, 40, 30);
-$graph->SetScale('intint');
-$graph->SetMarginColor('white');
-
-// Setup title of graph
-$graph->title->Set('Filled contour plot');
-$graph->title->SetFont(FF_VERDANA,FS_BOLD,12);
-
-$graph->subtitle->Set('(horizontal labels)');
-$graph->subtitle->SetFont(FF_VERDANA,FS_ITALIC,10);
-
-// Create a new contour plot
-$cp = new FilledContourPlot($data,8);
-
-// Use only black/and white schema
-$cp->UseHighContrastColor(true,true);
-
-// Flip visually 
-$cp->SetInvert();
-
-// Fill the contours
-$cp->SetFilled(true);
-// Show lines in red
-$cp->ShowLines(true,'red');
-
-// Display the labels
-$cp->ShowLabels(true,false);
-$cp->SetFont(FF_ARIAL,FS_BOLD,9);
-$cp->SetFontColor('white');
-
-// And add the plot to the graph
-$graph->Add($cp);
-
-// Send it back to the client
-$graph->stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/contour2_ex6.php b/#jpgraph/src/Examples/contour2_ex6.php
deleted file mode 100644
index 49755bee..00000000
--- a/#jpgraph/src/Examples/contour2_ex6.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_contourf.php');
-
-// Setup some data to use for the contour
-$data = array(
-    array (12,12,10,10),
-    array (10,10,8,14),
-    array (7,7,13,17),
-    array (4,5,8,12),
-    array (10,8,7,8));
-
-// create a basic graph as a container
-$graph = new Graph(300,300);
-$graph->SetMargin(30, 30, 40, 30);
-$graph->SetScale('intint');
-$graph->SetMarginColor('white');
-
-// Setup title of graph
-$graph->title->Set('Filled contour plot');
-$graph->title->SetFont(FF_VERDANA,FS_BOLD,12);
-
-$graph->subtitle->Set('(With lines and labels)');
-$graph->subtitle->SetFont(FF_VERDANA,FS_ITALIC,10);
-
-// Create a new contour plot
-$cp = new FilledContourPlot($data,7);
-
-// Use only blue/red color schema
-$cp->UseHighContrastColor(true);
-
-// Flip visually 
-$cp->SetInvert();
-
-// Fill the contours
-$cp->SetFilled(true);
-
-// Specify method to use
-$cp->SetMethod('rect');
-
-// Display the labels
-$cp->ShowLabels(true,true);
-$cp->SetFont(FF_ARIAL,FS_BOLD,9);
-$cp->SetFontColor('white');
-
-// And add the plot to the graph
-$graph->Add($cp);
-
-// Send it back to the client
-$graph->stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/contour2_ex7.php b/#jpgraph/src/Examples/contour2_ex7.php
deleted file mode 100644
index b83d3dd9..00000000
--- a/#jpgraph/src/Examples/contour2_ex7.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_contourf.php');
-
-// Setup some data to use for the contour
-$data = array(
-    array (12,12,10,10),
-    array (10,10,8,14),
-    array (7,7,13,17),
-    array (4,5,8,12),
-    array (10,8,7,8));
-
-// create a basic graph as a container
-$graph = new Graph(300,300);
-$graph->SetMargin(30, 30, 40, 30);
-$graph->SetScale('intint');
-$graph->SetMarginColor('white');
-
-// Setup title of graph
-$graph->title->Set('Filled contour plot');
-$graph->title->SetFont(FF_VERDANA,FS_BOLD,12);
-
-$graph->subtitle->Set('(With lines and labels)');
-$graph->subtitle->SetFont(FF_VERDANA,FS_ITALIC,10);
-
-// Create a new contour plot
-$cp = new FilledContourPlot($data,7);
-
-// Use only blue/red color schema
-$cp->UseHighContrastColor(true);
-
-// Flip visually 
-$cp->SetInvert();
-
-// Fill the contours
-$cp->SetFilled(true);
-
-// Specify method to use
-$cp->SetMethod('tri');
-
-// Display the labels
-$cp->ShowLabels(true,true);
-$cp->SetFont(FF_ARIAL,FS_BOLD,9);
-$cp->SetFontColor('white');
-
-// And add the plot to the graph
-$graph->Add($cp);
-
-// Send it back to the client
-$graph->stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/contourex01.php b/#jpgraph/src/Examples/contourex01.php
deleted file mode 100644
index eb2cb99c..00000000
--- a/#jpgraph/src/Examples/contourex01.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// Contour plot example 
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_contour.php');
-
-$data = array( 
-            array (0.5,1.1,1.5,1,2.0,3,3,2,1,0.1),
-            array (1.0,1.5,3.0,5,6.0,2,1,1.2,1,4),
-            array (0.9,2.0,2.1,3,6.0,7,3,2,1,1.4),
-            array (1.0,1.5,3.0,4,6.0,5,2,1.5,1,2),
-            array (0.8,2.0,3.0,3,4.0,4,3,2.4,2,3),
-            array (0.6,1.1,1.5,1,4.0,3.5,3,2,3,4),
-            array (1.0,1.5,3.0,5,6.0,2,1,1.2,2.7,4),
-            array (0.8,2.0,3.0,3,5.5,6,3,2,1,1.4),
-            array (1.0,1.5,3.0,4,6.0,5,2,1,0.5,0.2));
-
-
-// Setup a basic graph context with some generous margins to be able
-// to fit the legend            
-$graph = new Graph(500,380);
-$graph->SetMargin(40,140,60,40);	
-
-$graph->title->Set('Example of contour plot');
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,14);
-
-// For contour plots it is custom to use a box style ofr the axis
-$graph->legend->SetPos(0.05,0.5,'right','center');
-$graph->SetScale('intint');
-$graph->SetAxisStyle(AXSTYLE_BOXOUT);
-$graph->xgrid->Show();
-$graph->ygrid->Show();
-
-
-// A simple contour plot with default arguments (e.g. 10 isobar lines)
-$cp = new ContourPlot($data);
-
-// Display the legend
-$cp->ShowLegend();
-
-// Make the isobar lines slightly thicker
-$cp->SetLineWeight(2);
-$graph->Add($cp);
-
-// ... and send the graph back to the browser
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/contourex02.php b/#jpgraph/src/Examples/contourex02.php
deleted file mode 100644
index 73dee150..00000000
--- a/#jpgraph/src/Examples/contourex02.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// Contour plot example 02
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_contour.php');
-
-$data = array(
-    array (12,12,10,10,8,4),
-    array (10,10,8,14,10,3),
-    array (7,7,13,17,12,8),
-    array (4,5,8,12,7,6),
-    array (10,8,7,8,10,4));
-
-// Setup a basic graph context with some generous margins to be able
-// to fit the legend
-$graph = new Graph(500,380);
-$graph->SetMargin(40,140,60,40);
-
-$graph->title->Set("Example of contour plot");
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,14);
-
-// For contour plots it is custom to use a box style ofr the axis
-$graph->legend->SetPos(0.05,0.5,'right','center');
-$graph->SetScale('intint');
-$graph->SetAxisStyle(AXSTYLE_BOXOUT);
-$graph->xgrid->Show();
-$graph->ygrid->Show();
-
-
-// A simple contour plot with 12 isobar lines and flipped Y-coordinates
-$cp = new ContourPlot($data,12,true);
-
-// Display the legend
-$cp->ShowLegend();
-
-// Make the isobar lines slightly thicker
-$graph->Add($cp);
-
-// ... and send the graph back to the browser
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/contourex03.php b/#jpgraph/src/Examples/contourex03.php
deleted file mode 100644
index ea430812..00000000
--- a/#jpgraph/src/Examples/contourex03.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// Contour plot example 
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_contour.php');
-
-$data = array( 
-            array (0.5,1.1,1.5,1,2.0,3,3,2,1,0.1),
-            array (1.0,1.5,3.0,5,6.0,2,1,1.2,1,4),
-            array (0.9,2.0,2.1,3,6.0,7,3,2,1,1.4),
-            array (1.0,1.5,3.0,4,6.0,5,2,1.5,1,2),
-            array (0.8,2.0,3.0,3,4.0,4,3,2.4,2,3),
-            array (0.6,1.1,1.5,1,4.0,3.5,3,2,3,4),
-            array (1.0,1.5,3.0,5,6.0,2,1,1.2,2.7,4),
-            array (0.8,2.0,3.0,3,5.5,6,3,2,1,1.4),
-            array (1.0,1.5,3.0,4,6.0,5,2,1,0.5,0.2));
-
-
-// Setup a basic graph context with some generous margins to be able
-// to fit the legend            
-$graph = new Graph(500,380);
-$graph->SetMargin(40,140,60,40);	
-
-// Enable antialias. Note with antiaaliasing only line weight=1 is supported.
-$graph->img->SetAntiAliasing();
-
-$graph->title->Set("Example of contour plot");
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,14);
-
-// For contour plots it is custom to use a box style ofr the axis
-$graph->legend->SetPos(0.05,0.5,'right','center');
-$graph->SetScale('intint');
-$graph->SetAxisStyle(AXSTYLE_BOXOUT);
-$graph->xgrid->Show();
-$graph->ygrid->Show();
-
-
-// A simple contour plot with 19 isobars and flipped vertical range
-$cp = new ContourPlot($data,10,true);
-
-// Display the legend
-$cp->ShowLegend();
-
-// Invert the legend to th lowest isobar is on top
-$cp->Invertlegend();
-$graph->Add($cp);
-
-// ... and send the graph back to the browser
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/contourex04.php b/#jpgraph/src/Examples/contourex04.php
deleted file mode 100644
index d37f13b5..00000000
--- a/#jpgraph/src/Examples/contourex04.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// Contour plot example 04
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_contour.php');
-
-$data = array(
-    array (12,12,10,10,8,4),
-    array (10,10,8,14,10,3),
-    array (7,7,13,17,12,8),
-    array (4,5,8,12,7,6),
-    array (10,8,7,8,10,4));
-
-// Setup a basic graph context with some generous margins to be able
-// to fit the legend
-$graph = new Graph(500,380);
-$graph->SetMargin(40,140,60,40);
-
-$graph->title->Set("Example of interpolated contour plot");
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,14);
-$graph->title->SetMargin(10);
-
-// For contour plots it is custom to use a box style ofr the axis
-$graph->legend->SetPos(0.05,0.5,'right','center');
-$graph->SetScale('intint');
-
-// Setup axis and grids
-$graph->SetAxisStyle(AXSTYLE_BOXOUT);
-$graph->xgrid->SetLineStyle('dashed');
-$graph->xgrid->Show(true);
-$graph->ygrid->SetLineStyle('dashed');
-$graph->ygrid->Show(true);
-
-// A simple contour plot with 10 isobar lines and flipped Y-coordinates
-// Make the data smoother by interpolate the original matrice by a factor of two
-// which will make each grid cell half the original size
-$cp = new ContourPlot($data,10, 2);
-
-$cp->UseHighContrastColor(true);
-
-// Display the legend
-$cp->ShowLegend();
-
-// Make the isobar lines slightly thicker
-$graph->Add($cp);
-
-// ... and send the graph back to the browser
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/contourex05.php b/#jpgraph/src/Examples/contourex05.php
deleted file mode 100644
index 4af9ca8b..00000000
--- a/#jpgraph/src/Examples/contourex05.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// Contour example 05
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_contour.php');
-
-$data = array(
-    array(0.000,0.001,0.002,0.005,-0.003,-0.053,-0.156,-0.245,-0.235,-0.143,-0.056,-0.014,-0.002,0.000,0.000),
-    array(0.000,0.002,0.009,0.015,-0.040,-0.308,-0.826,-1.257,-1.188,-0.719,-0.280,-0.070,-0.011,-0.001,0.000),
-    array(0.001,0.005,0.024,0.047,-0.103,-0.878,-2.432,-3.767,-3.591,-2.166,-0.828,-0.195,-0.026,-0.001,0.000),
-    array(0.001,0.007,0.046,0.145,0.096,-0.913,-3.472,-6.042,-6.038,-3.625,-1.283,-0.235,-0.005,0.007,0.002),
-    array(-0.003,-0.009,0.009,0.208,0.734,0.864,-0.937,-3.985,-4.866,-2.781,-0.560,0.194,0.151,0.043,0.007),
-    array(-0.013,-0.072,-0.229,-0.259,0.652,2.587,3.058,0.661,-1.097,0.014,1.336,1.154,0.474,0.113,0.017),
-    array(-0.028,-0.171,-0.653,-1.397,-1.091,1.421,3.424,1.942,0.403,1.784,2.986,2.120,0.821,0.191,0.028),
-    array(-0.037,-0.231,-0.934,-2.255,-2.780,-0.699,1.692,0.981,0.198,2.199,3.592,2.515,0.968,0.225,0.033),
-    array(-0.031,-0.201,-0.829,-2.076,-2.820,-1.399,0.610,0.408,0.122,1.882,3.004,2.085,0.800,0.186,0.027),
-    array(-0.018,-0.115,-0.469,-1.133,-1.343,0.011,1.921,2.256,1.824,2.115,2.141,1.312,0.481,0.110,0.016),
-    array(-0.007,-0.039,-0.130,-0.152,0.560,2.770,5.591,6.719,5.583,3.646,1.973,0.832,0.251,0.052,0.007),
-    array(-0.001,-0.003,0.024,0.273,1.297,3.628,6.515,7.832,6.517,3.875,1.690,0.546,0.130,0.022,0.003),
-    array(0.000,0.004,0.036,0.215,0.837,2.171,3.809,4.578,3.810,2.218,0.913,0.268,0.056,0.008,0.001),
-    array(0.000,0.002,0.014,0.076,0.284,0.721,1.257,1.511,1.257,0.728,0.294,0.083,0.017,0.002,0.000),                                        
-    array(0.000,0.000,0.003,0.016,0.057,0.144,0.250,0.300,0.250,0.144,0.058,0.016,0.003,0.000,0.000),        
-);
-    
-
-// Setup a basic graph context with some generous margins to be able
-// to fit the legend
-$graph = new Graph(480,390);
-$graph->SetMargin(40,120,60,50);
-
-$graph->title->Set("Contour plot, high contrast color");
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,12);
-$graph->title->SetMargin(10);
-
-// For contour plots it is custom to use a box style ofr the axis
-$graph->SetScale('intint',0,56,0,56);
-
-// Setup axis and grids
-$graph->SetAxisStyle(AXSTYLE_BOXOUT);
-$graph->xgrid->Show(true);
-$graph->ygrid->Show(true);
-
-// A simple contour plot with 10 isobar lines and flipped Y-coordinates
-// Make the data smoother by interpolate the original matrice by a factor of two
-// which will make each grid cell half the original size
-$cp = new ContourPlot($data,10, 3);
-
-$cp->UseHighContrastColor(true);
-
-// Display the legend
-$cp->ShowLegend();
-
-// Make the isobar lines slightly thicker
-$graph->Add($cp);
-
-// ... and send the graph back to the browser
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/csim_in_html_ex1.php b/#jpgraph/src/Examples/csim_in_html_ex1.php
deleted file mode 100644
index 2c08e095..00000000
--- a/#jpgraph/src/Examples/csim_in_html_ex1.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<html>
-<body>
-
-<?php
-$_graphfilename = 'csim_in_html_graph_ex1.php';
-// This is the filename of this HTML file
-global $_wrapperfilename;
-$_wrapperfilename = basename (__FILE__);
-
-// Create a random mapname used to connect the image map with the image
-$_mapname = '__mapname'.rand(0,1000000).'__';
-
-// This is the first graph script
-require_once ($_graphfilename);
-
-// This line gets the image map and inserts it on the page
-$imgmap = $graph->GetHTMLImageMap($_mapname);
-echo $imgmap;
-
-?>
-
-<h2>This is an example page with CSIM graphs with arbitrary HTML text</h2>
-
-<?php
-if( empty($_GET['clickedon']) ) {
-   echo '<b style="color:darkred;">Clicked on bar: &lt;none></b>';
-}
-else {
-   echo '<b style="color:darkred;">Clicked on bar: '.$_GET['clickedon'].'</b>';
-}
-echo '<p />';
-?>
-
-<p>First we need to get hold of the image map and include it in the HTML
-  page.</p>
-<p>For this graph it is:</p>
-<?php
-
-// The we display the image map as well
-echo '<pre><b>'.htmlentities($imgmap).'</b></pre>';?>
-
-<?php
-// Construct the <img> tag and rebuild the
-$imgtag = $graph->GetCSIMImgHTML($_mapname,$_graphfilename);
-?>
-<p>The graph is then be displayed as shown in figure 1. With the following
-  created &lt;img> tag:</p>
-<pre><b>
-<?php echo htmlentities($imgtag); ?>
-</b></pre>
-
-
-<p>
-<?php
-echo $imgtag;
-?>
-<br><b>Figure 1. </b>The included CSIM graph.
-</p>
-
-</body>
-</html>
diff --git a/#jpgraph/src/Examples/csim_in_html_ex2.php b/#jpgraph/src/Examples/csim_in_html_ex2.php
deleted file mode 100644
index c94bda3c..00000000
--- a/#jpgraph/src/Examples/csim_in_html_ex2.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<html>
-<body>
-
-<?php
-// The names of the graph scripts
-$_graphfilename1 = 'csim_in_html_graph_ex1.php';
-$_graphfilename2 = 'csim_in_html_graph_ex2.php';
-
-// This is the filename of this HTML file
-global $_wrapperfilename;
-$_wrapperfilename = basename (__FILE__);
-
-// Create a random mapname used to connect the image map with the image
-$_mapname1 = '__mapname'.rand(0,1000000).'__';
-$_mapname2 = '__mapname'.rand(0,1000000).'__';
-
-// Get the graph scripts
-require_once ($_graphfilename1);
-require_once ($_graphfilename2);
-
-// This line gets the image map and inserts it on the page
-$imgmap1 = $graph->GetHTMLImageMap($_mapname1);
-$imgmap2 = $piegraph->GetHTMLImageMap($_mapname2);
-echo $imgmap1;
-echo $imgmap2;
-
-?>
-
-<h2>This is an example page with CSIM graphs with arbitrary HTML text</h2>
-
-<?php
-if( empty($_GET['clickedon']) ) {
-   echo '<b style="color:darkred;">Clicked on bar: &lt;none></b>';
-}
-else {
-   echo '<b style="color:darkred;">Clicked on bar: '.$_GET['clickedon'].'</b>';
-}
-echo '<p />';
-if( empty($_GET['pie_clickedon']) ) {
-   echo '<b style="color:darkred;">Clicked on pie slice: &lt;none></b>';
-}
-else {
-   echo '<b style="color:darkred;">Clicked on pie slice: '.$_GET['pie_clickedon'].'</b>';
-}
-echo '<p />';
-?>
-
-<p>First we need to get hold of the image maps and include them in the HTML
-  page.</p>
-<p>For these graphs the maps are:</p>
-<?php
-// The we display the image map as well
-echo '<small><pre>'.htmlentities($imgmap1).'</pre></small>';
-?>
-<p>
-and
-</p>
-<?php
-// The we display the image map as well
-echo '<small><pre>'.htmlentities($imgmap2).'</pre></small>';
-?>
-
-<?php
-// Construct the <img> tags for Figure 1 &amp; 2 and rebuild the URL arguments
-$imgtag1 = $graph->GetCSIMImgHTML($_mapname1,$_graphfilename1);
-$imgtag2 = $piegraph->GetCSIMImgHTML($_mapname2,$_graphfilename2);
-?>
-<p>The graphs are then displayed as shown in figure 1 &amp; 2. With the following
-  created &lt;img> tags:</p>
-<small><pre>
-<?php 
-echo htmlentities($imgtag1); 
-echo htmlentities($imgtag2); 
-?>
-</pre></small>
-
-<p>
-Note: For the Pie the center is counted as the first slice.
-</p>
-
-<p>
-<table border=0>
-<tr><td valign="bottom">
-<?php
-echo $imgtag1;
-?>
-<br><b>Figure 1. </b>The included Bar CSIM graph.
-</p>
-</td>
-<td valign="bottom">
-<?php
-echo $imgtag2;
-?>
-<br><b>Figure 2. </b>The included Pie CSIM graph.
-</p>
-</td>
-</tr>
-</table>
-</body>
-</html>
diff --git a/#jpgraph/src/Examples/csim_in_html_graph_ex1.php b/#jpgraph/src/Examples/csim_in_html_graph_ex1.php
deleted file mode 100644
index b734c860..00000000
--- a/#jpgraph/src/Examples/csim_in_html_graph_ex1.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('../jpgraph.php');
-require_once ('../jpgraph_bar.php');
-
-$datay=array(12,26,9,17,31);
-
-// Create the graph.
-$graph = new Graph(400,250);
-$graph->SetScale('textlin');
-$graph->SetMargin(50,80,20,40);
-
-// Create a bar pot
-$bplot = new BarPlot($datay);
-
-$n = count($datay) ; // Number of bars
-
-global $_wrapperfilename;
-
-// Create targets for the image maps. One for each column
-$targ = array(); $alt = array(); $wtarg = array();
-for( $i=0; $i < $n; ++$i ) {
-    $urlarg = 'clickedon='.($i+1);
-    $targ[] = $_wrapperfilename.'?'.$urlarg;
-    $alt[] = 'val=%d';
-    $wtarg[] = '';
-}
-$bplot->SetCSIMTargets($targ,$alt,$wtarg);
-
-$graph->Add($bplot);
-
-$graph->title->Set('Multiple Image maps');
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->title->SetCSIMTarget('#45','Title for Bar','_blank');
-
-$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->yaxis->title->SetCSIMTarget('#55','Y-axis title');
-$graph->yaxis->title->Set("Y-title");
-
-$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->title->SetCSIMTarget('#55','X-axis title');
-$graph->xaxis->title->Set("X-title");
-
-// Send back the image when we are called from within the <img> tag
-$graph->StrokeCSIMImage();
-
-?>
diff --git a/#jpgraph/src/Examples/csim_in_html_graph_ex2.php b/#jpgraph/src/Examples/csim_in_html_graph_ex2.php
deleted file mode 100644
index 8c59c0c3..00000000
--- a/#jpgraph/src/Examples/csim_in_html_graph_ex2.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// Example of pie with center circle
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_pie.php');
-
-// Some data
-$data = array(50,28,25,27,31,20);
-
-// A new pie graph
-$piegraph = new PieGraph(400,320);
-
-$n = count($data) ; // Number of slices
-
-// No border around graph
-$piegraph->SetFrame(false);
-
-// Setup title
-$piegraph->title->Set("CSIM Center Pie plot");
-$piegraph->title->SetFont(FF_ARIAL,FS_BOLD,18);
-$piegraph->title->SetMargin(8); // Add a little bit more margin from the top
-
-// Create the pie plot
-$p1 = new PiePlotC($data);
-
-// Set the radius of pie (as fraction of image size)
-$p1->SetSize(0.32);
-
-// Label font and color setup
-$p1->value->SetFont(FF_ARIAL,FS_BOLD,11);
-$p1->value->SetColor('white');
-
-// Setup the title on the center circle
-$p1->midtitle->Set("Distribution\n2008 H1");
-$p1->midtitle->SetFont(FF_ARIAL,FS_NORMAL,12);
-
-// Set color for mid circle
-$p1->SetMidColor('yellow');
-
-// Use percentage values in the legends values (This is also the default)
-$p1->SetLabelType(PIE_VALUE_PER);
-
-// The label array values may have printf() formatting in them. The argument to the
-// form,at string will be the value of the slice (either the percetage or absolute
-// depending on what was specified in the SetLabelType() above.
-$lbl = array("Jan\n%.1f%%","Feb\n%.1f%%","March\n%.1f%%",
-             "Apr\n%.1f%%","May\n%.1f%%","Jun\n%.1f%%");
-$p1->SetLabels($lbl);
-
-// Add drop shadow to slices
-$p1->SetShadow();
-
-// Explode all slices 15 pixels
-$p1->ExplodeAll(15);
-
-// Setup the CSIM targets
-global $_wrapperfilename;
-$targ = array(); $alt = array(); $wtarg = array();
-for( $i=0; $i <= $n; ++$i ) {
-    $urlarg = 'pie_clickedon='.($i+1);
-    $targ[] = $_wrapperfilename.'?'.$urlarg;
-    $alt[] = 'val=%d';
-    $wtarg[] = '';
-}
-$p1->SetCSIMTargets($targ,$alt,$wtarg);
-$p1->SetMidCSIM($targ[0],$alt[0],$wtarg[0]);
-
-// Add plot to pie graph
-$piegraph->Add($p1);
-
-// Send back the image when we are called from within the <img> tag
-$piegraph->StrokeCSIMImage();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/datamatrix_ex0.php b/#jpgraph/src/Examples/datamatrix_ex0.php
deleted file mode 100644
index 8de25222..00000000
--- a/#jpgraph/src/Examples/datamatrix_ex0.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-require_once('jpgraph/datamatrix/datamatrix.inc.php');
-
-$data = 'The first datamatrix';
-$encoder = DatamatrixFactory::Create();
-$encoder->SetEncoding(ENCODING_ASCII);
-$backend = DatamatrixBackendFactory::Create($encoder);
-
-// We increase the module width to 3 pixels
-$backend->SetModuleWidth(3);
-
-try {
-    $backend->Stroke($data);
-} catch (Exception $e) {
-    echo 'Datamatrix error: '.$e->GetMessage()."\n";
-    exit(1);
-}
-?>
diff --git a/#jpgraph/src/Examples/datamatrix_ex00.php b/#jpgraph/src/Examples/datamatrix_ex00.php
deleted file mode 100644
index 1aec89f3..00000000
--- a/#jpgraph/src/Examples/datamatrix_ex00.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-require_once('jpgraph/datamatrix/datamatrix.inc.php');
-
-$data = 'The first datamatrix';
-
-$encoder = DatamatrixFactory::Create();
-$backend = DatamatrixBackendFactory::Create($encoder);
-$backend->Stroke($data);
-?>
diff --git a/#jpgraph/src/Examples/datamatrix_ex1.php b/#jpgraph/src/Examples/datamatrix_ex1.php
deleted file mode 100644
index a2e73583..00000000
--- a/#jpgraph/src/Examples/datamatrix_ex1.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-require_once('jpgraph/datamatrix/datamatrix.inc.php');
-
-$data = '123456';
-
-$encoder = DatamatrixFactory::Create();
-$backend = DatamatrixBackendFactory::Create($encoder);
-$backend->SetModuleWidth(3);
-
-// Create the barcode from the given data string and write to output file
-try {
-    $backend->Stroke($data);
-} catch (Exception $e) {
-    $errstr = $e->GetMessage();
-    echo "Datamatrix error message: $errstr\n";
-}
-
-?>
diff --git a/#jpgraph/src/Examples/datamatrix_ex2.php b/#jpgraph/src/Examples/datamatrix_ex2.php
deleted file mode 100644
index e7c9462b..00000000
--- a/#jpgraph/src/Examples/datamatrix_ex2.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-require_once('jpgraph/datamatrix/datamatrix.inc.php');
-
-$data = '123456';
-
-// Create and set parameters for the encoder
-$encoder = DatamatrixFactory::Create();
-$encoder->SetEncoding(ENCODING_BASE256);
-
-// Create the image backend (default)
-$backend = DatamatrixBackendFactory::Create($encoder);
-$backend->SetModuleWidth(3);
-
-try {
-    $backend->Stroke($data);
-} catch (Exception $e) {
-    $errstr = $e->GetMessage();
-    echo "Datamatrix error message: $errstr\n";
-}
-
-?>
diff --git a/#jpgraph/src/Examples/datamatrix_ex3.php b/#jpgraph/src/Examples/datamatrix_ex3.php
deleted file mode 100644
index 6b6b8279..00000000
--- a/#jpgraph/src/Examples/datamatrix_ex3.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-require_once('jpgraph/datamatrix/datamatrix.inc.php');
-
-$data = '123456';
-
-// Create and set parameters for the encoder
-$encoder = DatamatrixFactory::Create(DMAT_44x44);
-$encoder->SetEncoding(ENCODING_BASE256);
-
-// Create the image backend (default)
-$backend = DatamatrixBackendFactory::Create($encoder);
-$backend->SetModuleWidth(3);
-
-try {
-    $backend->Stroke($data);
-} catch (Exception $e) {
-    $errstr = $e->GetMessage();
-    echo "Datamatrix error message: $errstr\n";
-}
-
-?>
diff --git a/#jpgraph/src/Examples/datamatrix_ex4.php b/#jpgraph/src/Examples/datamatrix_ex4.php
deleted file mode 100644
index 77b36674..00000000
--- a/#jpgraph/src/Examples/datamatrix_ex4.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-require_once('jpgraph/datamatrix/datamatrix.inc.php');
-
-$data = 'This is a 64x64 datamatrix symbol';
-
-// Create and set parameters for the encoder
-$encoder = DatamatrixFactory::Create(DMAT_64x64);
-$encoder->SetEncoding(ENCODING_TEXT);
-
-// Create the image backend (default)
-$backend = DatamatrixBackendFactory::Create($encoder);
-$backend->SetModuleWidth(3);
-
-// Adjust the Quiet zone
-$backend->SetQuietZone(10);
-
-// Create the barcode from the given data string and write to output file
-try {
-    $backend->Stroke($data);
-} catch (Exception $e) {
-    $errstr = $e->GetMessage();
-    echo "Datamatrix error message: $errstr\n";
-}
-
-?>
diff --git a/#jpgraph/src/Examples/datamatrix_ex5.php b/#jpgraph/src/Examples/datamatrix_ex5.php
deleted file mode 100644
index 9242252e..00000000
--- a/#jpgraph/src/Examples/datamatrix_ex5.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-require_once('jpgraph/datamatrix/datamatrix.inc.php');
-
-$data = 'This is a 20x20 symbol';
-
-// Create and set parameters for the encoder
-$encoder = DatamatrixFactory::Create(DMAT_20x20);
-$encoder->SetEncoding(ENCODING_TEXT);
-
-// Create the image backend (default)
-$backend = DatamatrixBackendFactory::Create($encoder);
-
-// By default the module width is 2 pixel so we increase it a bit
-$backend->SetModuleWidth(4);
-
-// Set Quiet zone
-$backend->SetQuietZone(10);
-
-// Set other than default colors (one, zero, quiet zone/background)
-$backend->SetColor('navy','white','lightgray');
-
-// Create the barcode from the given data string and write to output file
-try {
-    $backend->Stroke($data);
-} catch (Exception $e) {
-    $errstr = $e->GetMessage();
-    echo "Datamatrix error message: $errstr\n";
-}
-
-?>
diff --git a/#jpgraph/src/Examples/datamatrix_ex6.php b/#jpgraph/src/Examples/datamatrix_ex6.php
deleted file mode 100644
index 918bc4b1..00000000
--- a/#jpgraph/src/Examples/datamatrix_ex6.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-require_once('jpgraph/datamatrix/datamatrix.inc.php');
-
-$data = 'This is a datamatrix symbol';
-
-$outputfile = 'dm_ex6.png';
-
-// Create and set parameters for the encoder
-$encoder = DatamatrixFactory::Create();
-$encoder->SetEncoding(ENCODING_TEXT);
-
-// Create the image backend (default)
-$backend = DatamatrixBackendFactory::Create($encoder);
-$backend->SetModuleWidth(5);
-$backend->SetQuietZone(10);
-
-// Set other than default colors (one, zero, background)
-$backend->SetColor('navy','white');
-
-// Create the barcode from the given data string and write to output file
-$dir = dirname(__FILE__);
-$file = '<span style="font-weight:bold;">"'.$dir.'/'.$outputfile.'"</span>';
-try {
-    $backend->Stroke($data,$outputfile);
-    echo 'Barcode sucessfully written to file: '.$file;
-} catch (Exception $e) {
-    $errstr = $e->GetMessage();
-    $errcode = $e->GetCode();
-    echo "Failed writing file: ".$file.'<br>';
-    echo "Datamatrix error ($errcode). Message: $errstr\n";
-}
-
-?>
diff --git a/#jpgraph/src/Examples/datamatrix_ex7.php b/#jpgraph/src/Examples/datamatrix_ex7.php
deleted file mode 100644
index a27d42cf..00000000
--- a/#jpgraph/src/Examples/datamatrix_ex7.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-require_once('jpgraph/datamatrix/datamatrix.inc.php');
-
-$data = 'A Datamatrix barcode';
-
-// Create and set parameters for the encoder
-$encoder = DatamatrixFactory::Create();
-$encoder->SetEncoding(ENCODING_BASE256);
-
-// Create the image backend (default)
-$backend = DatamatrixBackendFactory::Create($encoder, BACKEND_ASCII);
-$backend->SetModuleWidth(3);
-
-try {
-    $ps_txt = $backend->Stroke($data);
-    echo '<pre>'.$ps_txt.'</pre>';
-} catch (Exception $e) {
-    $errstr = $e->GetMessage();
-    echo "Datamatrix error message: $errstr\n";
-}
-
-?>
diff --git a/#jpgraph/src/Examples/dataset01.inc.php b/#jpgraph/src/Examples/dataset01.inc.php
deleted file mode 100644
index 6ac7f2b0..00000000
--- a/#jpgraph/src/Examples/dataset01.inc.php
+++ /dev/null
@@ -1,275 +0,0 @@
-<?php
-
-// Dataset to be used by some date scale utils examples
-
-$ydata = array(
-    0 => 1.0885908919277, 1 =>
-    0.99034385297982, 2 => 0.97005467188578, 3 =>
-    0.99901201350824, 4 => 1.1263167971152, 5 =>
-    1.0582808133448, 6 => 1.0216740689064, 7 =>
-    0.96626236356644, 8 => 1.0125912828768, 9 =>
-    0.99047473992496, 10 => 0.99102472104561, 11 =>
-    0.98500781573283, 12 => 0.91933668914198, 13 =>
-    0.92234602792711, 14 => 0.88933863410054, 15 =>
-    0.94236150975178, 16 => 0.98924287679116, 17 =>
-    1.0342765545566, 18 => 1.0538510278089, 19 =>
-    0.93496076181191, 20 => 0.90944479677235, 21 =>
-    0.80831866316983, 22 => 0.81912434615535, 23 =>
-    0.83143770042109, 24 => 0.86972168159496, 25 =>
-    0.92645774571577, 26 => 0.81169120061422, 27 =>
-    0.84409853057606, 28 => 0.89065856249272, 29 =>
-    0.83551478929348, 30 => 0.87015680306726, 31 =>
-    0.76063327042172, 32 => 0.82720958380697, 33 =>
-    0.86565279505723, 34 => 0.77858966246836, 35 =>
-    0.81009606378237, 36 => 0.80485136798149, 37 =>
-    0.82641461943804, 38 => 0.87442020676513, 39 =>
-    0.89589150146825, 40 => 0.92082995956816, 41 =>
-    0.92614241931726, 42 => 0.96915564652581, 43 =>
-    1.003753706293, 44 => 0.97438809368023, 45 =>
-    1.011556766867, 46 => 1.0785692014115, 47 =>
-    1.0586915420364, 48 => 1.284210059027, 49 =>
-    1.3424512661794, 50 => 1.1743365450983, 51 =>
-    1.2387345559532, 52 => 1.2485728609648, 53 =>
-    1.2330096418558, 54 => 1.1857882621709, 55 =>
-    1.2344956522411, 56 => 1.2047675730648, 57 =>
-    1.292419000136, 58 => 1.3405480219013, 59 =>
-    1.3971752198648, 60 => 1.4359555309649, 61 =>
-    1.3243735045701, 62 => 1.2359389187087, 63 =>
-    1.2201320423161, 64 => 1.3602246705197, 65 =>
-    1.360886940568, 66 => 1.3493553211075, 67 =>
-    1.4401769929405, 68 => 1.3979767849951, 69 =>
-    1.4545882591647, 70 => 1.337801210539, 71 =>
-    1.3793601365977, 72 => 1.4586769476223, 73 =>
-    1.5230946076475, 74 => 1.4124735946125, 75 =>
-    1.4030318592551, 76 => 1.349158816711, 77 =>
-    1.3994840622105, 78 => 1.4239672612346, 79 =>
-    1.40812256221, 80 => 1.4583856197192, 81 =>
-    1.4613314581567, 82 => 1.6756755916668, 83 =>
-    1.8580313939158, 84 => 1.8342360959805, 85 =>
-    1.9216082598086, 86 => 1.9478846253628, 87 =>
-    2.0244872112436, 88 => 1.9560660777181, 89 =>
-    1.8415152640121, 90 => 1.8471764273372, 91 =>
-    1.8889886695023, 92 => 1.8195007209252, 93 =>
-    1.8960270595999, 94 => 1.8644490575386, 95 =>
-    1.971196340772, 96 => 2.015583152659, 97 =>
-    1.9959882430428, 98 => 2.1063668082622, 99 =>
-    2.1719175769191, 100 => 2.1875938345039, 101 =>
-    2.1587594039981, 102 => 2.1278241823627, 103 =>
-    2.298793912594, 104 => 2.3723774302753, 105 =>
-    2.4413392788904, 106 => 2.4834594954125, 107 =>
-    2.5164271989421, 108 => 2.48274719503, 109 =>
-    2.4492997581034, 110 => 2.1412357263019, 111 =>
-    2.0314268112566, 112 => 1.9596098764628, 113 =>
-    2.0250983127109, 114 => 1.924959829851, 115 =>
-    1.9603612943993, 116 => 2.0540576271866, 117 =>
-    2.0568349960689, 118 => 2.0811524692325, 119 =>
-    2.0581964759165, 120 => 2.020162840272, 121 =>
-    2.0626517638667, 122 => 1.9286563823225, 123 =>
-    2.0127912437563, 124 => 1.9491858277931, 125 =>
-    1.8692310150316, 126 => 1.6993275416762, 127 =>
-    1.5849680675709, 128 => 1.5422481968304, 129 =>
-    1.603188853916, 130 => 1.6449504349551, 131 =>
-    1.6570332084417, 132 => 1.7563884552262, 133 =>
-    1.7346008663135, 134 => 1.741307942998, 135 =>
-    1.7415848536123, 136 => 1.7014366147405, 137 =>
-    1.6719646364256, 138 => 1.7092888030342, 139 =>
-    1.7371529028402, 140 => 1.7019154041991, 141 =>
-    1.7662473702497, 142 => 1.8480766044197, 143 =>
-    1.8355114169662, 144 => 1.7819817315586, 145 =>
-    1.7148079481036, 146 => 1.6241989833489, 147 =>
-    1.4624626548138, 148 => 1.5040542012939, 149 =>
-    1.442295346913, 150 => 1.4187087000604, 151 =>
-    1.4225097958511, 152 => 1.5001324671865, 153 =>
-    1.4584802723727, 154 => 1.5342572961469, 155 =>
-    1.514133174734, 156 => 1.5443934302345, 157 =>
-    1.5476883863698, 158 => 1.6080128685721, 159 =>
-    1.5816649899396, 160 => 1.5310436755918, 161 =>
-    1.518280754595, 162 => 1.5216184249044, 163 =>
-    1.4393414811719, 164 => 1.409379582707, 165 =>
-    1.436861898056, 166 => 1.4739894373751, 167 =>
-    1.4512785421546, 168 => 1.496057581316, 169 =>
-    1.3817455776456, 170 => 1.2990312802211, 171 =>
-    1.3073949130374, 172 => 1.2473214566896, 173 =>
-    1.1105915111374, 174 => 1.0420360580822, 175 =>
-    1.1744654786356, 176 => 1.0602876800127, 177 =>
-    1.074408841208, 178 => 1.18387615056, 179 =>
-    1.1890999077101, 180 => 1.0549293038746, 181 =>
-    1.0570601708416, 182 => 1.0800216692849, 183 =>
-    0.96274117702549, 184 => 0.9501673977047, 185 =>
-    0.97710108451711, 186 => 0.89886322996001, 187 =>
-    0.9239453369566, 188 => 0.96299807255386, 189 =>
-    1.0105532418267, 190 => 1.0164009465948, 191 =>
-    1.0413107606824, 192 => 1.0475248122459, 193 =>
-    1.0266007451985, 194 => 1.0159556206533, 195 =>
-    1.0943852922517, 196 => 1.0750418553654, 197 =>
-    0.97774129938915, 198 => 0.98590717162284, 199 =>
-    0.87713795242119, 200 => 0.90770624057599, 201 =>
-    0.87557547650302, 202 => 0.95754187545856, 203 =>
-    1.0111465867283, 204 => 0.93224663470275, 205 =>
-    0.93886113881632, 206 => 0.94128877256653, 207 =>
-    0.9559086414866, 208 => 0.97782683000598, 209 =>
-    1.0648991708916, 210 => 1.1759619281479, 211 =>
-    1.1323001889786, 212 => 1.2173222321276, 213 =>
-    1.192219780365, 214 => 1.1507367671992, 215 =>
-    1.0062415877475, 216 => 1.0017043563084, 217 =>
-    0.94468309902865, 218 => 0.99384124056529, 219 =>
-    1.0514822705943, 220 => 1.0451723914426, 221 =>
-    1.0776122119814, 222 => 1.2013601009631, 223 =>
-    1.1765086398423, 224 => 1.2387735028784, 225 =>
-    1.2441365026242, 226 => 1.2694500268723, 227 =>
-    1.2789962941485, 228 => 1.2442094256309, 229 =>
-    1.2352688438234, 230 => 1.2571277155372, 231 =>
-    1.3291795377077, 232 => 1.2703480599183, 233 =>
-    1.30729508393, 234 => 1.3233030218068, 235 =>
-    1.2861232143244, 236 => 1.3168684998023, 237 =>
-    1.2499001566772, 238 => 1.2622769692485, 239 =>
-    1.2160789893735, 240 => 1.2288877111321, 241 =>
-    1.222967255453, 242 => 1.2998243638567, 243 =>
-    1.3443008723449, 244 => 1.339680674028, 245 =>
-    1.3779965791538, 246 => 1.3560080691721, 247 =>
-    1.3470544172094, 248 => 1.3166882067851, 249 =>
-    1.4452459865932, 250 => 1.4514278120119, 251 =>
-    1.413690283372, 252 => 1.4178934332405, 253 =>
-    1.4237414657565, 254 => 1.3777636409301, 255 =>
-    1.4041849448389, 256 => 1.4049533546771, 257 =>
-    1.4277375831259, 258 => 1.4224090113077, 259 =>
-    1.4647907974628, 260 => 1.4243190632657, 261 =>
-    1.4286580133998, 262 => 1.4348828641501, 263 =>
-    1.415409243977, 264 => 1.4476028555859, 265 =>
-    1.4538821661641, 266 => 1.4883184435336, 267 =>
-    1.4205032194634, 268 => 1.3856543933372, 269 =>
-    1.2716906168086, 270 => 1.3462117624752, 271 =>
-    1.3003015423298, 272 => 1.2148491725878, 273 =>
-    1.2605381058318, 274 => 1.2690047369619, 275 =>
-    1.3327723638582, 276 => 1.3118643588249, 277 =>
-    1.293007944258, 278 => 1.2548761810876, 279 =>
-    1.3335015938603, 280 => 1.3152744239077, 281 =>
-    1.2564376463182, 282 => 1.2478417859372, 283 =>
-    1.2518821298414, 284 => 1.2036453589032, 285 =>
-    1.1798564480155, 286 => 1.2062515260098, 287 =>
-    1.2129817801455, 288 => 1.1405762096618, 289 =>
-    1.0161049810033, 290 => 1.0030124197677, 291 =>
-    1.0111565082559, 292 => 1.0084286839061, 293 =>
-    0.95068297130577, 294 => 1.0450005357207, 295 =>
-    1.211596899292, 296 => 1.3762615912002, 297 =>
-    1.530127116787, 298 => 1.5167370832585, 299 =>
-    1.6259521507076, 300 => 1.6518467383405, 301 =>
-    1.7713043850286, 302 => 1.6396708687084, 303 =>
-    1.6116177484122, 304 => 1.5225729470695, 305 =>
-    1.6101471149808);
-
-
-$xdata = array(
-
-    0 => 444348000, 1 => 446853600, 2 =>
-    449532000, 3 => 452124000, 4 => 454802400, 5 =>
-    457394400, 6 => 460072800, 7 => 462751200, 8 =>
-    465343200, 9 => 468021600, 10 => 470613600, 11 =>
-    473292000, 12 => 475970400, 13 => 478389600, 14 =>
-    481068000, 15 => 483660000, 16 => 486338400, 17 =>
-    488930400, 18 => 491608800, 19 => 494287200, 20 =>
-    496879200, 21 => 499557600, 22 => 502149600, 23 =>
-    504828000, 24 => 507506400, 25 => 509925600, 26 =>
-    512604000, 27 => 515196000, 28 => 517874400, 29 =>
-    520466400, 30 => 523144800, 31 => 525823200, 32 =>
-    528415200, 33 => 531093600, 34 => 533685600, 35 =>
-    536364000, 36 => 539042400, 37 => 541461600, 38 =>
-    544140000, 39 => 546732000, 40 => 549410400, 41 =>
-    552002400, 42 => 554680800, 43 => 557359200, 44 =>
-    559951200, 45 => 562629600, 46 => 565221600, 47 =>
-    567900000, 48 => 570578400, 49 => 573084000, 50 =>
-    575762400, 51 => 578354400, 52 => 581032800, 53 =>
-    583624800, 54 => 586303200, 55 => 588981600, 56 =>
-    591573600, 57 => 594252000, 58 => 596844000, 59 =>
-    599522400, 60 => 602200800, 61 => 604620000, 62 =>
-    607298400, 63 => 609890400, 64 => 612568800, 65 =>
-    615160800, 66 => 617839200, 67 => 620517600, 68 =>
-    623109600, 69 => 625788000, 70 => 628380000, 71 =>
-    631058400, 72 => 633736800, 73 => 636156000, 74 =>
-    638834400, 75 => 641426400, 76 => 644104800, 77 =>
-    646696800, 78 => 649375200, 79 => 652053600, 80 =>
-    654645600, 81 => 657324000, 82 => 659916000, 83 =>
-    662594400, 84 => 665272800, 85 => 667692000, 86 =>
-    670370400, 87 => 672962400, 88 => 675640800, 89 =>
-    678232800, 90 => 680911200, 91 => 683589600, 92 =>
-    686181600, 93 => 688860000, 94 => 691452000, 95 =>
-    694130400, 96 => 696808800, 97 => 699314400, 98 =>
-    701992800, 99 => 704584800, 100 => 707263200, 101 =>
-    709855200, 102 => 712533600, 103 => 715212000, 104 =>
-    717804000, 105 => 720482400, 106 => 723074400, 107 =>
-    725752800, 108 => 728431200, 109 => 730850400, 110 =>
-    733528800, 111 => 736120800, 112 => 738799200, 113 =>
-    741391200, 114 => 744069600, 115 => 746748000, 116 =>
-    749340000, 117 => 752018400, 118 => 754610400, 119 =>
-    757288800, 120 => 759967200, 121 => 762386400, 122 =>
-    765064800, 123 => 767656800, 124 => 770335200, 125 =>
-    772927200, 126 => 775605600, 127 => 778284000, 128 =>
-    780876000, 129 => 783554400, 130 => 786146400, 131 =>
-    788824800, 132 => 791503200, 133 => 793922400, 134 =>
-    796600800, 135 => 799192800, 136 => 801871200, 137 =>
-    804463200, 138 => 807141600, 139 => 809820000, 140 =>
-    812412000, 141 => 815090400, 142 => 817682400, 143 =>
-    820360800, 144 => 823039200, 145 => 825544800, 146 =>
-    828223200, 147 => 830815200, 148 => 833493600, 149 =>
-    836085600, 150 => 838764000, 151 => 841442400, 152 =>
-    844034400, 153 => 846712800, 154 => 849304800, 155 =>
-    851983200, 156 => 854661600, 157 => 857080800, 158 =>
-    859759200, 159 => 862351200, 160 => 865029600, 161 =>
-    867621600, 162 => 870300000, 163 => 872978400, 164 =>
-    875570400, 165 => 878248800, 166 => 880840800, 167 =>
-    883519200, 168 => 886197600, 169 => 888616800, 170 =>
-    891295200, 171 => 893887200, 172 => 896565600, 173 =>
-    899157600, 174 => 901836000, 175 => 904514400, 176 =>
-    907106400, 177 => 909784800, 178 => 912376800, 179 =>
-    915055200, 180 => 917733600, 181 => 920152800, 182 =>
-    922831200, 183 => 925423200, 184 => 928101600, 185 =>
-    930693600, 186 => 933372000, 187 => 936050400, 188 =>
-    938642400, 189 => 941320800, 190 => 943912800, 191 =>
-    946591200, 192 => 949269600, 193 => 951775200, 194 =>
-    954453600, 195 => 957045600, 196 => 959724000, 197 =>
-    962316000, 198 => 964994400, 199 => 967672800, 200 =>
-    970264800, 201 => 972943200, 202 => 975535200, 203 =>
-    978213600, 204 => 980892000, 205 => 983311200, 206 =>
-    985989600, 207 => 988581600, 208 => 991260000, 209 =>
-    993852000, 210 => 996530400, 211 => 999208800, 212 =>
-    1001800800, 213 => 1004479200, 214 => 1007071200,
-    215 => 1009749600, 216 => 1012428000, 217 =>
-    1014847200, 218 => 1017525600, 219 => 1020117600,
-    220 => 1022796000, 221 => 1025388000, 222 =>
-    1028066400, 223 => 1030744800, 224 => 1033336800,
-    225 => 1036015200, 226 => 1038607200, 227 =>
-    1041285600, 228 => 1043964000, 229 => 1046383200,
-    230 => 1049061600, 231 => 1051653600, 232 =>
-    1054332000, 233 => 1056924000, 234 => 1059602400,
-    235 => 1062280800, 236 => 1064872800, 237 =>
-    1067551200, 238 => 1070143200, 239 => 1072821600,
-    240 => 1075500000, 241 => 1078005600, 242 =>
-    1080684000, 243 => 1083276000, 244 => 1085954400,
-    245 => 1088546400, 246 => 1091224800, 247 =>
-    1093903200, 248 => 1096495200, 249 => 1099173600,
-    250 => 1101765600, 251 => 1104444000, 252 =>
-    1107122400, 253 => 1109541600, 254 => 1112220000,
-    255 => 1114812000, 256 => 1117490400, 257 =>
-    1120082400, 258 => 1122760800, 259 => 1125439200,
-    260 => 1128031200, 261 => 1130709600, 262 =>
-    1133301600, 263 => 1135980000, 264 => 1138658400,
-    265 => 1141077600, 266 => 1143756000, 267 =>
-    1146348000, 268 => 1149026400, 269 => 1151618400,
-    270 => 1154296800, 271 => 1156975200, 272 =>
-    1159567200, 273 => 1162245600, 274 => 1164837600,
-    275 => 1167516000, 276 => 1170194400, 277 =>
-    1172613600, 278 => 1175292000, 279 => 1177884000,
-    280 => 1180562400, 281 => 1183154400, 282 =>
-    1185832800, 283 => 1188511200, 284 => 1191103200,
-    285 => 1193781600, 286 => 1196373600, 287 =>
-    1199052000, 288 => 1201730400, 289 => 1204236000,
-    290 => 1206914400, 291 => 1209506400, 292 =>
-    1212184800, 293 => 1214776800, 294 => 1217455200,
-    295 => 1220133600, 296 => 1222725600, 297 =>
-    1225404000, 298 => 1227996000, 299 => 1230674400,
-    300 => 1233352800, 301 => 1235772000, 302 =>
-    1238450400, 303 => 1241042400, 304 => 1243720800,
-    305 => 1246312800,
-    );
-
-?>
\ No newline at end of file
diff --git a/#jpgraph/src/Examples/dateaxisex1.php b/#jpgraph/src/Examples/dateaxisex1.php
deleted file mode 100644
index 58e4348f..00000000
--- a/#jpgraph/src/Examples/dateaxisex1.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-// The callback that converts timestamp to minutes and seconds
-function TimeCallback($aVal) {
-    return Date('H:i:s',$aVal);
-}
-
-// Fake some suitable random data
-$now = time();
-$datax = array($now);
-for( $i=0; $i < 360; $i += 10 ) {
-    $datax[] = $now + $i;
-}
-$n = count($datax);
-$datay=array();
-for( $i=0; $i < $n; ++$i ) {
-    $datay[] = rand(30,150);
-}
-
-// Setup the basic graph
-$graph = new Graph(324,250);
-$graph->SetMargin(40,40,30,70);	
-$graph->title->Set('Date: '.date('Y-m-d',$now));
-$graph->SetAlphaBlending();
-
-// Setup a manual x-scale (We leave the sentinels for the
-// Y-axis at 0 which will then autoscale the Y-axis.)
-// We could also use autoscaling for the x-axis but then it
-// probably will start a little bit earlier than the first value
-// to make the first value an even number as it sees the timestamp
-// as an normal integer value.
-$graph->SetScale("intlin",0,200,$now,$datax[$n-1]);
-
-// Setup the x-axis with a format callback to convert the timestamp
-// to a user readable time
-$graph->xaxis->SetLabelFormatCallback('TimeCallback');
-$graph->xaxis->SetLabelAngle(90);
-
-// Create the line
-$p1 = new LinePlot($datay,$datax);
-$p1->SetColor("blue");
-
-// Set the fill color partly transparent
-$p1->SetFillColor("blue@0.4");
-
-// Add lineplot to the graph
-$graph->Add($p1);
-
-// Output line
-$graph->Stroke();
-?>
-
-
diff --git a/#jpgraph/src/Examples/dateaxisex2.php b/#jpgraph/src/Examples/dateaxisex2.php
deleted file mode 100644
index c0a306c1..00000000
--- a/#jpgraph/src/Examples/dateaxisex2.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-require_once ('jpgraph/jpgraph_date.php');
-
-// Create a data set in range (50,70) and X-positions
-DEFINE('NDATAPOINTS',360);
-DEFINE('SAMPLERATE',240); 
-$start = time();
-$end = $start+NDATAPOINTS*SAMPLERATE;
-$data = array();
-$xdata = array();
-for( $i=0; $i < NDATAPOINTS; ++$i ) {
-    $data[$i] = rand(50,70);
-    $xdata[$i] = $start + $i * SAMPLERATE;
-}
-
-
-// Create the new graph
-$graph = new Graph(540,300);
-
-// Slightly larger than normal margins at the bottom to have room for
-// the x-axis labels
-$graph->SetMargin(40,40,30,130);
-
-// Fix the Y-scale to go between [0,100] and use date for the x-axis
-$graph->SetScale('datlin',0,100);
-$graph->title->Set("Example on Date scale");
-
-// Set the angle for the labels to 90 degrees
-$graph->xaxis->SetLabelAngle(90);
-
-$line = new LinePlot($data,$xdata);
-$line->SetLegend('Year 2005');
-$line->SetFillColor('lightblue@0.5');
-$graph->Add($line);
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/dateaxisex3.php b/#jpgraph/src/Examples/dateaxisex3.php
deleted file mode 100644
index 02db7cc5..00000000
--- a/#jpgraph/src/Examples/dateaxisex3.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-require_once ('jpgraph/jpgraph_date.php');
-
-// Create a data set in range (50,70) and X-positions
-DEFINE('NDATAPOINTS',360);
-DEFINE('SAMPLERATE',240); 
-$start = time();
-$end = $start+NDATAPOINTS*SAMPLERATE;
-$data = array();
-$xdata = array();
-for( $i=0; $i < NDATAPOINTS; ++$i ) {
-    $data[$i] = rand(50,70);
-    $xdata[$i] = $start + $i * SAMPLERATE;
-}
-
-
-// Create the new graph
-$graph = new Graph(540,300);
-
-// Slightly larger than normal margins at the bottom to have room for
-// the x-axis labels
-$graph->SetMargin(40,40,30,130);
-
-// Fix the Y-scale to go between [0,100] and use date for the x-axis
-$graph->SetScale('datlin',0,100);
-$graph->title->Set("Example on Date scale");
-
-// Set the angle for the labels to 90 degrees
-$graph->xaxis->SetLabelAngle(90);
-
-// It is possible to adjust the density for the X-axis as well
-// The following call makes the dates a little more sparse
-// $graph->SetTickDensity(TICKD_NORMAL,TICKD_SPARSE);
-
-// The automatic format string for dates can be overridden
-// $graph->xaxis->scale->SetDateFormat('h:i');
-
-// Adjust the start/end to a specific alignment
-$graph->xaxis->scale->SetTimeAlign(MINADJ_15);
-
-$line = new LinePlot($data,$xdata);
-$line->SetLegend('Year 2005');
-$line->SetFillColor('lightblue@0.5');
-$graph->Add($line);
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/dateaxisex4.php b/#jpgraph/src/Examples/dateaxisex4.php
deleted file mode 100644
index dab6cd6f..00000000
--- a/#jpgraph/src/Examples/dateaxisex4.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-require_once ('jpgraph/jpgraph_date.php');
-
-// Create a data set in range (50,70) and X-positions
-DEFINE('NDATAPOINTS',360);
-DEFINE('SAMPLERATE',240); 
-$start = time();
-$end = $start+NDATAPOINTS*SAMPLERATE;
-$data = array();
-$xdata = array();
-for( $i=0; $i < NDATAPOINTS; ++$i ) {
-    $data[$i] = rand(50,70);
-    $xdata[$i] = $start + $i * SAMPLERATE;
-}
-
-
-// Create the new graph
-$graph = new Graph(540,300);
-
-// Slightly larger than normal margins at the bottom to have room for
-// the x-axis labels
-$graph->SetMargin(40,40,30,130);
-
-// Fix the Y-scale to go between [0,100] and use date for the x-axis
-$graph->SetScale('datlin',0,100);
-$graph->title->Set("Example on Date scale");
-
-// Set the angle for the labels to 90 degrees
-$graph->xaxis->SetLabelAngle(90);
-
-// The automatic format string for dates can be overridden
-$graph->xaxis->scale->SetDateFormat('H:i');
-
-// Adjust the start/end to a specific alignment
-$graph->xaxis->scale->SetTimeAlign(MINADJ_10);
-
-$line = new LinePlot($data,$xdata);
-$line->SetLegend('Year 2005');
-$line->SetFillColor('lightblue@0.5');
-$graph->Add($line);
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/datescaleticksex01.php b/#jpgraph/src/Examples/datescaleticksex01.php
deleted file mode 100644
index 5bdcbe54..00000000
--- a/#jpgraph/src/Examples/datescaleticksex01.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('../jpgraph.php');
-require_once ('../jpgraph_line.php');
-require_once ('../jpgraph_date.php');
-
-DEFINE('INTERVAL', 5*60);
-
-// First create some "dummy" data
-$m = 5; // Number of data sets
-$n = 4; // Number of bids to show
-$startbid = 8000;
-
-for( $i=0; $i < $m; ++$i ) {
-    $bids[$i] = array($startbid + rand(100,500)*10 );
-    for( $j=1; $j < $n; ++$j ) {
-        $bids[$i][$j] = $bids[$i][$j-1] + rand(20,500)*10;
-    }
-}
-
-$start = floor(time()/INTERVAL)*INTERVAL;
-$times = array($start);
-for( $i=1; $i < $n; ++$i ) {
-    // Create a timestamp for every 5 minutes
-    $times[$i] = $times[$i-1]+INTERVAL;
-}
-
-// Setup the bid graph
-$graph = new Graph(600,250);
-$graph->SetMargin(80,30,50,40);
-$graph->SetMarginColor('white');
-$graph->SetScale('dateint');
-$graph->title->Set('Current Bids');
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,12);
-$graph->subtitle->Set('(Updated every 5 minutes)');
-$graph->subtitle->SetFont(FF_ARIAL,FS_ITALIC,10);
-
-// Enable antialias
-$graph->img->SetAntiAliasing();
-
-// Setup the y-axis to show currency values
-$graph->yaxis->SetLabelFormatCallback('number_format');
-$graph->yaxis->SetLabelFormat('$%s');
-
-//Use hour:minute format for the labels
-$graph->xaxis->scale->SetDateFormat('H:i');
-
-// Force labels to only be displayed every 5 minutes
-$graph->xaxis->scale->ticks->Set(INTERVAL);
-
-// Adjust the start time for an "even" 5 minute, i.e. 5,10,15,20,25, ...
-$graph->xaxis->scale->SetTimeAlign(MINADJ_5);
-
-// Create the plots using the dummy data created at the beginning
-$line = array();
-for( $i=0; $i < $m; ++$i ) {
-    $line[$i] = new LinePlot($bids[$i],$times);
-    $line[$i]->mark->SetType(MARK_SQUARE);
-}
-$graph->Add($line);
-
-// Send the graph back to the client
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/dateutilex01.php b/#jpgraph/src/Examples/dateutilex01.php
deleted file mode 100644
index 75f0d331..00000000
--- a/#jpgraph/src/Examples/dateutilex01.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-require_once ('jpgraph/jpgraph_utils.inc.php');
-
-// Get a dataset stored in $xdata and $ydata
-require_once ('dataset01.inc.php');
-
-$dateUtils = new DateScaleUtils();
-
-// Setup a basic graph
-$width=500; $height=300;
-$graph = new Graph($width, $height);
-
-// We set the x-scale min/max values to avoid empty space
-// on the side of the plot
-$graph->SetScale('intlin',0,0,min($xdata),max($xdata));
-$graph->SetMargin(60,20,40,60);
-
-// Setup the titles
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,12);
-$graph->title->Set('Development since 1984');
-$graph->subtitle->SetFont(FF_ARIAL,FS_ITALIC,10);
-$graph->subtitle->Set('(Example using DateScaleUtils class)');
-
-// Setup the labels to be correctly format on the X-axis
-$graph->xaxis->SetFont(FF_ARIAL,FS_NORMAL,8);
-$graph->xaxis->SetLabelAngle(30);
-
-// The second paramter set to 'true' will make the library interpret the
-// format string as a date format. We use a Month + Year format
-$graph->xaxis->SetLabelFormatString('M, Y',true);
-
-// Get manual tick every second year
-list($tickPos,$minTickPos) = $dateUtils->getTicks($xdata,DSUTILS_YEAR2);
-$graph->xaxis->SetTickPositions($tickPos,$minTickPos);
-
-// First add an area plot
-$lp1 = new LinePlot($ydata,$xdata);
-$lp1->SetWeight(0);
-$lp1->SetFillColor('orange@0.85');
-$graph->Add($lp1);
-
-// And then add line. We use two plots in order to get a
-// more distinct border on the graph
-$lp2 = new LinePlot($ydata,$xdata);
-$lp2->SetColor('orange');
-$graph->Add($lp2);
-
-// And send back to the client
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/dateutilex02.php b/#jpgraph/src/Examples/dateutilex02.php
deleted file mode 100644
index f95db471..00000000
--- a/#jpgraph/src/Examples/dateutilex02.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-require_once ('jpgraph/jpgraph_date.php');
-require_once ('jpgraph/jpgraph_utils.inc.php');
-
-// Get a dataset stored in $xdata and $ydata
-require_once ('dataset01.inc.php');
-
-$dateUtils = new DateScaleUtils();
-
-// Setup a basic graph
-$width=500; $height=300;
-$graph = new Graph($width, $height);
-$graph->SetScale('datlin');
-$graph->SetMargin(60,20,40,60);
-
-// Setup the titles
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,12);
-$graph->title->Set('Development since 1984');
-$graph->subtitle->SetFont(FF_ARIAL,FS_ITALIC,10);
-$graph->subtitle->Set('(Example using the builtin date scale)');
-
-// Setup the labels to be correctly format on the X-axis
-$graph->xaxis->SetFont(FF_ARIAL,FS_NORMAL,8);
-$graph->xaxis->SetLabelAngle(30);
-
-// The second paramter set to 'true' will make the library interpret the
-// format string as a date format. We use a Month + Year format
-// $graph->xaxis->SetLabelFormatString('M, Y',true);
-
-// First add an area plot
-$lp1 = new LinePlot($ydata,$xdata);
-$lp1->SetWeight(0);
-$lp1->SetFillColor('orange@0.85');
-$graph->Add($lp1);
-
-// And then add line. We use two plots in order to get a
-// more distinct border on the graph
-$lp2 = new LinePlot($ydata,$xdata);
-$lp2->SetColor('orange');
-$graph->Add($lp2);
-
-// And send back to the client
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/dm_ex6.png b/#jpgraph/src/Examples/dm_ex6.png
deleted file mode 100644
index b389990b..00000000
Binary files a/#jpgraph/src/Examples/dm_ex6.png and /dev/null differ
diff --git a/#jpgraph/src/Examples/dupyaxisex1.php b/#jpgraph/src/Examples/dupyaxisex1.php
deleted file mode 100644
index b4b63fe7..00000000
--- a/#jpgraph/src/Examples/dupyaxisex1.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-require_once ('jpgraph/jpgraph_utils.inc.php');
-
-$f = new FuncGenerator('cos($i)','$i*$i*$i');
-list($xdata,$ydata) = $f->E(-M_PI,M_PI,25);
-
-$graph = new Graph(300,200);
-$graph->SetScale("linlin");
-$graph->SetMargin(50,50,20,30);	
-$graph->SetFrame(false);
-$graph->SetBox(true,'black',2);	
-$graph->SetMarginColor('white');
-$graph->SetColor('lightyellow');
-
-$graph->title->Set('Duplicating Y-axis');
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-
-$graph->SetAxisStyle(AXSTYLE_YBOXIN);
-$graph->xgrid->Show();
-
-$lp1 = new LinePlot($ydata,$xdata);
-$lp1->SetColor("blue");
-$lp1->SetWeight(2);
-$graph->Add($lp1);
-
-$graph->Stroke();
-?>
-
-
diff --git a/#jpgraph/src/Examples/example0-0.php b/#jpgraph/src/Examples/example0-0.php
deleted file mode 100644
index d281824a..00000000
--- a/#jpgraph/src/Examples/example0-0.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-// Some (random) data
-$ydata = array(11,3,8,12,5,1,9,13,5,7);
-
-// Size of the overall graph
-$width=350;
-$height=250;
-
-// Create the graph and set a scale.
-// These two calls are always required
-$graph = new Graph($width,$height);
-$graph->SetScale('intlin');
-
-// Create the linear plot
-$lineplot=new LinePlot($ydata);
-
-// Add the plot to the graph
-$graph->Add($lineplot);
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/example0.php b/#jpgraph/src/Examples/example0.php
deleted file mode 100644
index 2667e9f8..00000000
--- a/#jpgraph/src/Examples/example0.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-// Some data
-$ydata = array(11,3,8,12,5,1,9,13,5,7);
-
-// Create the graph. These two calls are always required
-$graph = new Graph(350,250);
-$graph->SetScale('textlin');
-
-// Create the linear plot
-$lineplot=new LinePlot($ydata);
-$lineplot->SetColor('blue');
-
-// Add the plot to the graph
-$graph->Add($lineplot);
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/example1.1.php b/#jpgraph/src/Examples/example1.1.php
deleted file mode 100644
index e171e3ba..00000000
--- a/#jpgraph/src/Examples/example1.1.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
- 
-$ydata = array(11,11,11);
-
-// Create the graph. 
-$graph = new Graph(350,250);	
-$graph->SetScale("textlin");
-$graph->img->SetMargin(30,90,40,50);
-$graph->xaxis->SetFont(FF_FONT1,FS_BOLD);
-$graph->title->Set("Example 1.1 same y-values");
-
-// Create the linear plot
-$lineplot=new LinePlot($ydata);
-$lineplot->SetLegend("Test 1");
-$lineplot->SetColor("blue");
-$lineplot->SetWeight(5);
-
-// Add the plot to the graph
-$graph->Add($lineplot);
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/example1.2.php b/#jpgraph/src/Examples/example1.2.php
deleted file mode 100644
index bbac21f1..00000000
--- a/#jpgraph/src/Examples/example1.2.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$ydata = array(11,3,8,12,5,1,9,13,5,7);
-
-// Create the graph. These two calls are always required
-$graph = new Graph(350,250);	
-$graph->SetScale("textlin");
-$graph->img->SetMargin(30,90,40,50);
-$graph->xaxis->SetFont(FF_FONT1,FS_BOLD);
-$graph->title->Set("Dashed lineplot");
-
-// Create the linear plot
-$lineplot=new LinePlot($ydata);
-$lineplot->SetLegend("Test 1");
-$lineplot->SetColor("blue");
-
-// Style can also be specified as SetStyle([1|2|3|4]) or
-// SetStyle("solid"|"dotted"|"dashed"|"lobgdashed")
-$lineplot->SetStyle("dashed");
-
-
-// Add the plot to the graph
-$graph->Add($lineplot);
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/example1.php b/#jpgraph/src/Examples/example1.php
deleted file mode 100644
index 31437f2d..00000000
--- a/#jpgraph/src/Examples/example1.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$ydata = array(11,3,8,12,5,1,9,13,5,7);
-
-// Create the graph. These two calls are always required
-$graph = new Graph(300,200);	
-$graph->SetScale("textlin");
-$graph->img->SetMargin(50,90,40,50);
-$graph->xaxis->SetFont(FF_FONT1,FS_BOLD);
-$graph->title->Set("Examples for graph");
-
-// Create the linear plot
-$lineplot=new LinePlot($ydata);
-$lineplot->SetLegend("Test 1");
-$lineplot->SetColor("blue");
-
-
-// Add the plot to the graph
-$graph->Add($lineplot);
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/example10.php b/#jpgraph/src/Examples/example10.php
deleted file mode 100644
index 8b9d4c6e..00000000
--- a/#jpgraph/src/Examples/example10.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_log.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$ydata = array(11,3,8,12,5,1,9,13,5,7);
-$y2data = array(354,200,265,99,111,91,198,225,293,251);
-$datax=array("Jan","Feb","Mar","Apr","Maj","Jun","Jul","Aug","Sep");
-
-// Create the graph. These two calls are always required
-$graph = new Graph(350,200);	
-$graph->img->SetMargin(40,110,20,40);
-$graph->SetScale("textlog");
-$graph->SetY2Scale("log");
-$graph->SetShadow();
-
-$graph->ygrid->Show(true,true);
-$graph->xgrid->Show(true,false);
-
-// Create the linear plot
-$lineplot=new LinePlot($ydata);
-$lineplot2=new LinePlot($y2data);
-
-$graph->yaxis->scale->ticks->SupressFirst();
-$graph->y2axis->scale->ticks->SupressFirst();
-// Add the plot to the graph
-$graph->Add($lineplot);
-$graph->AddY2($lineplot2);
-$lineplot2->SetColor("orange");
-$lineplot2->SetWeight(2);
-$graph->y2axis->SetColor("orange");
-
-$graph->title->Set("Example 10");
-$graph->xaxis->title->Set("X-title");
-$graph->yaxis->title->Set("Y-title");
-
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD);
-
-$lineplot->SetColor("blue");
-$lineplot->SetWeight(2);
-
-$lineplot2->SetColor("orange");
-$lineplot2->SetWeight(2);
-
-$graph->yaxis->SetColor("blue");
-
-$lineplot->SetLegend("Plot 1");
-$lineplot2->SetLegend("Plot 2");
-
-$graph->legend->Pos(0.05,0.5,"right","center");
-
-$graph->xaxis->SetTickLabels($datax);
-$graph->xaxis->SetTextTickInterval(2);
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/example11.php b/#jpgraph/src/Examples/example11.php
deleted file mode 100644
index 898447a2..00000000
--- a/#jpgraph/src/Examples/example11.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$ydata = array(11,3,8,12,5,1,9,13,5,7);
-$ydata2 = array(1,19,15,7,22,14,5,9,21,13);
-
-$timer = new JpgTimer();
-$timer->Push();
-
-// Create the graph. These two calls are always required
-$graph = new Graph(300,200);
-$graph->SetScale("textlin");
-
-$graph->SetMargin(40,20,20,60);
-
-$graph->title->Set("Timing a graph");
-$graph->footer->right->Set('Timer (ms): ');
-$graph->footer->right->SetFont(FF_COURIER,FS_ITALIC);
-$graph->footer->SetTimer($timer);
-
-// Create the linear plot
-$lineplot=new LinePlot($ydata);
-
-$lineplot2=new LinePlot($ydata2);
-
-// Add the plot to the graph
-$graph->Add($lineplot);
-$graph->Add($lineplot2);
-
-$graph->xaxis->title->Set("X-title");
-$graph->yaxis->title->Set("Y-title");
-
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD);
-
-$lineplot->SetColor("blue");
-$lineplot->SetWeight(2);
-
-$lineplot2->SetColor("orange");
-$lineplot2->SetWeight(2);
-
-$graph->yaxis->SetColor("red");
-$graph->yaxis->SetWeight(2);
-$graph->SetShadow();
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/example13.php b/#jpgraph/src/Examples/example13.php
deleted file mode 100644
index ae0eb952..00000000
--- a/#jpgraph/src/Examples/example13.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_error.php');
-
-$errdatay = array(11,9,2,4,19,26,13,19,7,12);
-
-
-// Create the graph. These two calls are always required
-$graph = new Graph(300,200);	
-$graph->SetScale("textlin");
-
-$graph->img->SetMargin(40,30,20,40);
-$graph->SetShadow();
-
-// Create the error plot
-$errplot=new ErrorPlot($errdatay);
-$errplot->SetColor("red");
-$errplot->SetWeight(2);
-
-// Add the plot to the graph
-$graph->Add($errplot);
-
-$graph->title->Set("Simple error plot");
-$graph->xaxis->title->Set("X-title");
-$graph->yaxis->title->Set("Y-title");
-
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD);
-
-$datax = $gDateLocale->GetShortMonth();
-$graph->xaxis->SetTickLabels($datax);
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/example14.php b/#jpgraph/src/Examples/example14.php
deleted file mode 100644
index cc591cbf..00000000
--- a/#jpgraph/src/Examples/example14.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_error.php');
-
-$errdatay = array(11,9,2,4,19,26,13,19,7,12);
-
-
-// Create the graph. These two calls are always required
-$graph = new Graph(300,200);	
-$graph->SetScale("textlin");
-
-$graph->img->SetMargin(40,30,20,40);
-$graph->SetShadow();
-
-// Create the error plot
-$errplot=new ErrorPlot($errdatay);
-$errplot->SetColor("red");
-$errplot->SetWeight(2);
-$errplot->SetCenter();
-
-// Add the plot to the graph
-$graph->Add($errplot);
-
-$graph->title->Set("Simple error plot");
-$graph->xaxis->title->Set("X-title");
-$graph->yaxis->title->Set("Y-title");
-
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD);
-
-$datax = $gDateLocale->GetShortMonth();
-$graph->xaxis->SetTickLabels($datax);
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/example15.php b/#jpgraph/src/Examples/example15.php
deleted file mode 100644
index 79ebb9ea..00000000
--- a/#jpgraph/src/Examples/example15.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-require_once ('jpgraph/jpgraph_error.php');
-
-$errdatay = array(11,9,2,4,19,26,13,19,7,12);
-
-// Create the graph. These two calls are always required
-$graph = new Graph(300,200);	
-$graph->SetScale("textlin");
-
-$graph->img->SetMargin(40,30,20,40);
-$graph->SetShadow();
-
-// Create the linear plot
-$errplot=new ErrorLinePlot($errdatay);
-$errplot->SetColor("red");
-$errplot->SetWeight(2);
-$errplot->SetCenter();
-$errplot->line->SetWeight(2);
-$errplot->line->SetColor("blue");
-
-// Add the plot to the graph
-$graph->Add($errplot);
-
-$graph->title->Set("Linear error plot");
-$graph->xaxis->title->Set("X-title");
-$graph->yaxis->title->Set("Y-title");
-
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD);
-
-$datax = $gDateLocale->GetShortMonth();
-$graph->xaxis->SetTickLabels($datax);
-
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/example16.1.php b/#jpgraph/src/Examples/example16.1.php
deleted file mode 100644
index edbb010f..00000000
--- a/#jpgraph/src/Examples/example16.1.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$l1datay = array(11,9,2,4,3,13,17);
-$l2datay = array(23,12,5,19,17,10,15);
-$datax=array('Jan','Feb','Mar','Apr','May');
-
-// Create the graph. 
-$graph = new Graph(400,200);	
-$graph->SetScale('textlin');
-
-$graph->img->SetMargin(40,130,20,40);
-$graph->SetShadow();
-
-// Create the linear error plot
-$l1plot=new LinePlot($l1datay);
-$l1plot->SetColor('red');
-$l1plot->SetWeight(2);
-$l1plot->SetLegend('Prediction');
-
-// Create the bar plot
-$l2plot = new LinePlot($l2datay);
-$l2plot->SetFillColor('orange');
-$l2plot->SetLegend('Result');
-
-// Add the plots to the graph
-$graph->Add($l2plot);
-$graph->Add($l1plot);
-
-$graph->title->Set('Mixing line and filled line');
-$graph->xaxis->title->Set('X-title');
-$graph->yaxis->title->Set('Y-title');
-
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD);
-
-//$graph->xaxis->SetTickLabels($datax);
-//$graph->xaxis->SetTextTickInterval(2);
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/example16.2.php b/#jpgraph/src/Examples/example16.2.php
deleted file mode 100644
index 649a7a94..00000000
--- a/#jpgraph/src/Examples/example16.2.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-$l1datay = array(11,9,2,4,3,13,17);
-$l2datay = array(23,12,5,19,17,10,15);
-$datax=array("Jan","Feb","Mar","Apr","May");
-
-// Create the graph. 
-$graph = new Graph(400,200);	
-$graph->SetScale("textlin");
-
-$graph->img->SetMargin(40,130,20,40);
-$graph->SetShadow();
-
-// Create the linear error plot
-$l1plot=new LinePlot($l1datay);
-$l1plot->SetColor("red");
-$l1plot->SetWeight(2);
-$l1plot->SetLegend("Prediction");
-
-// Create the bar plot
-$bplot = new BarPlot($l2datay);
-$bplot->SetFillColor("orange");
-$bplot->SetLegend("Result");
-
-// Add the plots to t'he graph
-$graph->Add($l1plot);
-$graph->Add($bplot);
-
-
-$graph->title->Set("Adding a line plot to a bar graph v1");
-$graph->xaxis->title->Set("X-title");
-$graph->yaxis->title->Set("Y-title");
-
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD);
-
-//$graph->xaxis->SetTickLabels($datax);
-//$graph->xaxis->SetTextTickInterval(2);
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/example16.3.php b/#jpgraph/src/Examples/example16.3.php
deleted file mode 100644
index f184fa2c..00000000
--- a/#jpgraph/src/Examples/example16.3.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-$l1datay = array(11,9,2,4,3,13,17);
-$l2datay = array(23,12,5,19,17,10,15);
-$datax=array('Jan','Feb','Mar','Apr','May','Jun','Jul','Aug');
-
-// Create the graph. 
-$graph = new Graph(400,200);	
-$graph->SetScale('textlin');
-
-$graph->img->SetMargin(40,130,20,40);
-$graph->SetShadow();
-
-// Create the linear error plot
-$l1plot=new LinePlot($l1datay);
-$l1plot->SetColor('red');
-$l1plot->SetWeight(2);
-$l1plot->SetLegend('Prediction');
-
-// Create the bar plot
-$bplot = new BarPlot($l2datay);
-$bplot->SetFillColor('orange');
-$bplot->SetLegend('Result');
-
-// Add the plots to t'he graph
-$graph->Add($bplot);
-$graph->Add($l1plot);
-
-$graph->title->Set('Adding a line plot to a bar graph v1');
-$graph->xaxis->title->Set('X-title');
-$graph->yaxis->title->Set('Y-title');
-
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD);
-
-$graph->xaxis->SetTickLabels($datax);
-//$graph->xaxis->SetTextTickInterval(2);
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/example16.4.php b/#jpgraph/src/Examples/example16.4.php
deleted file mode 100644
index a23c2a54..00000000
--- a/#jpgraph/src/Examples/example16.4.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-$l1datay = array(11,9,2,4,3,13,17);
-$l2datay = array(23,12,5,19,17,10,15);
-JpgraphError::SetImageFlag(false);
-JpGraphError::SetLogFile('syslog');
-
-// Create the graph. 
-$graph = new Graph(400,200);	
-$graph->SetScale('intlin');
-
-$graph->img->SetMargin(40,130,20,40);
-$graph->SetShadow();
-
-// Create the linear error plot
-$l1plot=new LinePlot($l1datay);
-$l1plot->SetColor('red');
-$l1plot->SetWeight(2);
-$l1plot->SetLegend('Prediction');
-
-// Create the bar plot
-$bplot = new BarPlot($l2datay);
-$bplot->SetFillColor('orange');
-$bplot->SetLegend('Result');
-
-// Add the plots to t'he graph
-$graph->Add($bplot);
-$graph->Add($l1plot);
-
-$graph->title->Set('Adding a line plot to a bar graph v3');
-$graph->xaxis->title->Set('X-title');
-$graph->yaxis->title->Set('Y-title');
-
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD);
-
-$datax = $gDateLocale->GetShortMonth();
-$graph->xaxis->SetTickLabels($datax);
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/example16.5.php b/#jpgraph/src/Examples/example16.5.php
deleted file mode 100644
index bfad3ce8..00000000
--- a/#jpgraph/src/Examples/example16.5.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-require_once ('jpgraph/jpgraph_error.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-$l1datay = array(11,9,2,4,3,13,17);
-$l2datay = array(23,12,5,19,17,10,15);
-$datax=array("Jan","Feb","Mar","Apr","May","Jun","Jul");
-
-// Create the graph. 
-$graph = new Graph(350,200);	
-$graph->img->SetMargin(40,70,20,40);
-$graph->SetScale("textlin");
-$graph->SetShadow();
-$graph->SetColor(array(250,250,250));
-
-$graph->img->SetTransparent("white");
-
-$t1 = new Text("This is a text");
-$t1->SetPos(0.5,0.5);
-$t1->SetOrientation("h");
-$t1->SetFont(FF_FONT1,FS_BOLD);
-$t1->SetBox("white","black","gray");
-$t1->SetColor("black");
-$graph->AddText($t1);
-
-// Create the linear error plot
-$l1plot=new LinePlot($l1datay);
-$l1plot->SetColor("blue");
-$l1plot->SetWeight(2);
-$l1plot->SetLegend("Prediction");
-
-// Create the bar plot
-$l2plot = new BarPlot($l2datay);
-$l2plot->SetFillColor("orange");
-$l2plot->SetLegend("Result");
-
-// Add the plots to the graph
-$graph->Add($l1plot);
-$graph->Add($l2plot);
-
-
-$graph->title->Set("Example 16.3");
-$graph->xaxis->title->Set("Month");
-$graph->yaxis->title->Set("x10,000 US$");
-
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD);
-
-$graph->xaxis->SetTickLabels($datax);
-//$graph->xaxis->SetTextTickInterval(2);
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/example16.6.php b/#jpgraph/src/Examples/example16.6.php
deleted file mode 100644
index 8dac3128..00000000
--- a/#jpgraph/src/Examples/example16.6.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_scatter.php');
-require_once ('jpgraph/jpgraph_line.php');
-require_once ('jpgraph/jpgraph_utils.inc.php');
-
-// Create some "fake" regression data
-$datay = array();
-$datax = array();
-$a= 3.2;
-$b= 2.5;
-for($x=0; $x < 20; ++$x) {
-    $datax[$x] = $x;
-    $datay[$x] = $a + $b*$x + rand(-20,20);
-}
-
-$lr = new LinearRegression($datax, $datay);
-list( $stderr, $corr ) = $lr->GetStat();
-list( $xd, $yd ) = $lr->GetY(0,19);
-
-// Create the graph
-$graph = new Graph(300,250);
-$graph->SetScale('linlin');
-
-// Setup title
-$graph->title->Set("Linear regression");
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,14);
-
-$graph->subtitle->Set('(stderr='.sprintf('%.2f',$stderr).', corr='.sprintf('%.2f',$corr).')');
-$graph->subtitle->SetFont(FF_ARIAL,FS_NORMAL,12);
-
-// make sure that the X-axis is always at the
-// bottom at the plot and not just at Y=0 which is
-// the default position
-$graph->xaxis->SetPos('min');
-
-// Create the scatter plot with some nice colors
-$sp1 = new ScatterPlot($datay,$datax);
-$sp1->mark->SetType(MARK_FILLEDCIRCLE);
-$sp1->mark->SetFillColor("red");
-$sp1->SetColor("blue");
-$sp1->SetWeight(3);
-$sp1->mark->SetWidth(4);
-
-// Create the regression line
-$lplot = new LinePlot($yd);
-$lplot->SetWeight(2);
-$lplot->SetColor('navy');
-
-// Add the pltos to the line
-$graph->Add($sp1);
-$graph->Add($lplot);
-
-// ... and stroke
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/example16.php b/#jpgraph/src/Examples/example16.php
deleted file mode 100644
index 04c24272..00000000
--- a/#jpgraph/src/Examples/example16.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-require_once ('jpgraph/jpgraph_error.php');
-
-$errdatay = array(11,9,2,4,19,26,13,19,7,12);
-
-// Create the graph. These two calls are always required
-$graph = new Graph(300,200);	
-$graph->SetScale("textlin");
-
-$graph->img->SetMargin(40,30,20,40);
-$graph->SetShadow();
-
-// Create the linear plot
-$errplot=new ErrorLinePlot($errdatay);
-$errplot->SetColor("red");
-$errplot->SetWeight(2);
-$errplot->SetCenter();
-$errplot->line->SetWeight(2);
-$errplot->line->SetColor("blue");
-
-// Setup the legends
-$errplot->SetLegend("Min/Max");
-$errplot->line->SetLegend("Average");
-
-// Add the plot to the graph
-$graph->Add($errplot);
-
-$graph->title->Set("Linear error plot");
-$graph->xaxis->title->Set("X-title");
-$graph->yaxis->title->Set("Y-title");
-
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD);
-
-$datax = $gDateLocale->GetShortMonth();
-$graph->xaxis->SetTickLabels($datax);
-
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/example17.php b/#jpgraph/src/Examples/example17.php
deleted file mode 100644
index a394ddf7..00000000
--- a/#jpgraph/src/Examples/example17.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$datay1 = 	array(11,7,5,8,3,5,5,4,8,6,5,5,3,2,5,1,2,0);
-$datay2 = 	array( 4,5,4,5,6,5,7,4,7,4,4,3,2,4,1,2,2,1);
-$datay3 = 	array(4,5,7,10,13,15,15,22,26,26,30,34,40,43,47,55,60,62);
-
-// Create the graph. These two calls are always required
-$graph = new Graph(300,200);
-$graph->SetScale("textlin");
-$graph->SetShadow();
-$graph->img->SetMargin(40,30,20,40);
-
-// Create the linear plots for each category
-$dplot[] = new LinePLot($datay1);
-$dplot[] = new LinePLot($datay2);
-$dplot[] = new LinePLot($datay3);
-
-$dplot[0]->SetFillColor("red");
-$dplot[1]->SetFillColor("blue");
-$dplot[2]->SetFillColor("green");
-
-// Create the accumulated graph
-$accplot = new AccLinePlot($dplot);
-
-// Add the plot to the graph
-$graph->Add($accplot);
-
-$graph->xaxis->SetTextTickInterval(2);
-$graph->title->Set("Example 17");
-$graph->xaxis->title->Set("X-title");
-$graph->yaxis->title->Set("Y-title");
-
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD);
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/example18.php b/#jpgraph/src/Examples/example18.php
deleted file mode 100644
index 458219c8..00000000
--- a/#jpgraph/src/Examples/example18.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-$datay=array(12,8,19,3,10,5);
-
-// Create the graph. These two calls are always required
-$graph = new Graph(300,200);	
-$graph->SetScale("textlin");
-
-// Add a drop shadow
-$graph->SetShadow();
-
-// Adjust the margin a bit to make more room for titles
-$graph->img->SetMargin(40,30,20,40);
-
-// Create a bar pot
-$bplot = new BarPlot($datay);
-$graph->Add($bplot);
-
-// Setup the titles
-$graph->title->Set("A simple bar graph");
-$graph->xaxis->title->Set("X-title");
-$graph->yaxis->title->Set("Y-title");
-
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD);
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/example19.1.php b/#jpgraph/src/Examples/example19.1.php
deleted file mode 100644
index feddf707..00000000
--- a/#jpgraph/src/Examples/example19.1.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-$datay=array(12,8,19,3,10,5);
-
-// Create the graph. These two calls are always required
-$graph = new Graph(300,200);
-$graph->SetScale('intlin');
-
-// Add a drop shadow
-$graph->SetShadow();
-
-// Adjust the margin a bit to make more room for titles
-$graph->SetMargin(40,30,20,40);
-
-// Create a bar pot
-$bplot = new BarPlot($datay);
-
-// Adjust fill color
-$bplot->SetFillColor('orange');
-$graph->Add($bplot);
-
-// Setup the titles
-$graph->title->Set('A basic bar graph');
-$graph->xaxis->title->Set('X-title');
-$graph->yaxis->title->Set('Y-title');
-
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD);
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/example19.php b/#jpgraph/src/Examples/example19.php
deleted file mode 100644
index 13af5c01..00000000
--- a/#jpgraph/src/Examples/example19.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-$datay=array(12,8,19,3,10,5);
-
-// Create the graph. These two calls are always required
-$graph = new Graph(300,200);
-$graph->SetScale('textlin');
-
-// Add a drop shadow
-$graph->SetShadow();
-
-// Adjust the margin a bit to make more room for titles
-$graph->SetMargin(40,30,20,40);
-
-// Create a bar pot
-$bplot = new BarPlot($datay);
-
-// Adjust fill color
-$bplot->SetFillColor('orange');
-$graph->Add($bplot);
-
-// Setup the titles
-$graph->title->Set('A basic bar graph');
-$graph->xaxis->title->Set('X-title');
-$graph->yaxis->title->Set('Y-title');
-
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD);
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/example2.1.php b/#jpgraph/src/Examples/example2.1.php
deleted file mode 100644
index 1114b1a0..00000000
--- a/#jpgraph/src/Examples/example2.1.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$ydata = array(11,-3,-8,7,5,-1,9,13,5,-7);
-
-// Create the graph. These two calls are always required
-$graph = new Graph(300,200);	
-$graph->SetScale("textlin");
-
-// Create the linear plot
-$lineplot=new LinePlot($ydata);
-
-$lineplot->value->Show();
-$lineplot->value->SetColor("red");
-$lineplot->value->SetFont(FF_FONT1,FS_BOLD);
-
-
-// Add the plot to the graph
-$graph->Add($lineplot);
-
-$graph->img->SetMargin(40,20,20,40);
-$graph->title->Set("Example 2.1");
-$graph->xaxis->title->Set("X-title");
-$graph->yaxis->title->Set("Y-title");
-
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/example2.5.php b/#jpgraph/src/Examples/example2.5.php
deleted file mode 100644
index a6e5535c..00000000
--- a/#jpgraph/src/Examples/example2.5.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$ydata = array(11,-3,-8,7,5,-1,9,13,5,-7);
-
-// Create the graph. These two calls are always required
-$graph = new Graph(300,200);	
-$graph->SetScale("textlin");
-
-// Create the linear plot
-$lineplot=new LinePlot($ydata);
-
-// Add the plot to the graph
-$graph->Add($lineplot);
-
-$graph->img->SetMargin(40,20,20,40);
-$graph->title->Set("Example 2.5");
-$graph->xaxis->title->Set("X-title");
-$graph->xaxis->SetPos("min");
-$graph->yaxis->title->Set("Y-title");
-
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/example2.6.php b/#jpgraph/src/Examples/example2.6.php
deleted file mode 100644
index 215eb4a5..00000000
--- a/#jpgraph/src/Examples/example2.6.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$ydata = array(11,-3,-8,7,5,-1,9,13,5,-7,-7);
-
-// Create the graph. These two calls are always required
-$graph = new Graph(300,200);	
-$graph->SetScale("textlin");
-
-// Create the linear plot
-$lineplot=new LinePlot($ydata);
-$lineplot->SetStepStyle();
-
-// Add the plot to the graph
-$graph->Add($lineplot);
-
-$graph->img->SetMargin(40,20,20,40);
-$graph->title->Set("Example 2.6 (Line with stepstyle)");
-$graph->xaxis->title->Set("X-title");
-$graph->xaxis->SetPos("min");
-$graph->yaxis->title->Set("Y-title");
-
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/example2.php b/#jpgraph/src/Examples/example2.php
deleted file mode 100644
index ef3731e7..00000000
--- a/#jpgraph/src/Examples/example2.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-// Some (random) data
-$ydata = array(11,3,8,12,5,1,9,13,5,7);
-
-// Size of the overall graph
-$width=350;
-$height=250;
-
-// Create the graph and set a scale.
-// These two calls are always required
-$graph = new Graph($width,$height);
-$graph->SetScale('intlin');
-
-// Setup margin and titles
-$graph->SetMargin(40,20,20,40);
-$graph->title->Set('Calls per operator');
-$graph->subtitle->Set('(March 12, 2008)');
-$graph->xaxis->title->Set('Operator');
-$graph->yaxis->title->Set('# of calls');
-
-
-// Create the linear plot
-$lineplot=new LinePlot($ydata);
-
-// Add the plot to the graph
-$graph->Add($lineplot);
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/example20.1.php b/#jpgraph/src/Examples/example20.1.php
deleted file mode 100644
index 0b251449..00000000
--- a/#jpgraph/src/Examples/example20.1.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-$datay=array(12,8,19,3,10,5);
-
-// Create the graph. These two calls are always required
-$graph = new Graph(300,200);	
-$graph->SetScale("textlin");
-
-// Add a drop shadow
-$graph->SetShadow();
-
-// Adjust the margin a bit to make more room for titles
-$graph->img->SetMargin(40,30,20,40);
-
-// Create a bar pot
-$bplot = new BarPlot($datay);
-
-// Adjust fill color
-$bplot->SetFillColor('orange');
-$bplot->value->Show();
-$graph->Add($bplot);
-
-// Setup the titles
-$graph->title->Set("Bar graph");
-$graph->xaxis->title->Set("X-title");
-$graph->yaxis->title->Set("Y-title");
-
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD);
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/example20.2.php b/#jpgraph/src/Examples/example20.2.php
deleted file mode 100644
index b623219f..00000000
--- a/#jpgraph/src/Examples/example20.2.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-$datay=array(12,8,19,3,10,5);
-
-// Create the graph. These two calls are always required
-$graph = new Graph(300,200);	
-$graph->SetScale("textlin");
-$graph->yaxis->scale->SetGrace(20);
-
-// Add a drop shadow
-$graph->SetShadow();
-
-// Adjust the margin a bit to make more room for titles
-$graph->img->SetMargin(40,30,20,40);
-
-// Create a bar pot
-$bplot = new BarPlot($datay);
-
-// Adjust fill color
-$bplot->SetFillColor('orange');
-$bplot->value->Show();
-$graph->Add($bplot);
-
-// Setup the titles
-$graph->title->Set("Bar graph with Y-scale grace");
-$graph->xaxis->title->Set("X-title");
-$graph->yaxis->title->Set("Y-title");
-
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD);
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/example20.3.php b/#jpgraph/src/Examples/example20.3.php
deleted file mode 100644
index ac2df483..00000000
--- a/#jpgraph/src/Examples/example20.3.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-$datay=array(12,8,19,3,10,5);
-
-// Create the graph. These two calls are always required
-$graph = new Graph(300,200);	
-$graph->SetScale("textlin");
-$graph->yaxis->scale->SetGrace(20);
-
-// Add a drop shadow
-$graph->SetShadow();
-
-// Adjust the margin a bit to make more room for titles
-$graph->img->SetMargin(40,30,20,40);
-
-// Create a bar pot
-$bplot = new BarPlot($datay);
-
-// Adjust fill color
-$bplot->SetFillColor('orange');
-$bplot->value->Show();
-$bplot->value->SetFont(FF_ARIAL,FS_BOLD,10);
-$bplot->value->SetAngle(45);
-$bplot->value->SetFormat('%0.1f');
-$graph->Add($bplot);
-
-// Setup the titles
-$graph->title->Set("Bar graph with Y-scale grace");
-$graph->xaxis->title->Set("X-title");
-$graph->yaxis->title->Set("Y-title");
-
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD);
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/example20.4.php b/#jpgraph/src/Examples/example20.4.php
deleted file mode 100644
index 6786efbf..00000000
--- a/#jpgraph/src/Examples/example20.4.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-$datay=array(12,8,19,3,10,5);
-
-// Create the graph. These two calls are always required
-$graph = new Graph(300,200);	
-$graph->SetScale("textlin");
-$graph->yaxis->scale->SetGrace(20);
-
-// Add a drop shadow
-$graph->SetShadow();
-
-// Adjust the margin a bit to make more room for titles
-$graph->img->SetMargin(40,30,20,40);
-
-// Create a bar pot
-$bplot = new BarPlot($datay);
-
-// Adjust fill color
-$bplot->SetFillColor('orange');
-$bplot->SetShadow();
-$bplot->value->Show();
-$bplot->value->SetFont(FF_ARIAL,FS_BOLD,10);
-$bplot->value->SetAngle(45);
-$bplot->value->SetFormat('%0.1f');
-$graph->Add($bplot);
-
-// Setup the titles
-$graph->title->Set("Bar graph with drop shadow");
-$graph->xaxis->title->Set("X-title");
-$graph->yaxis->title->Set("Y-title");
-
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD);
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/example20.5.php b/#jpgraph/src/Examples/example20.5.php
deleted file mode 100644
index a191e5a3..00000000
--- a/#jpgraph/src/Examples/example20.5.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-$datay=array(12,8,19,3,10,5);
-
-// Create the graph. These two calls are always required
-$graph = new Graph(300,200);	
-$graph->SetScale("textlin");
-
-// Add a drop shadow
-$graph->SetShadow();
-
-// Adjust the margin a bit to make more room for titles
-$graph->img->SetMargin(40,30,20,40);
-
-// Create a bar pot
-$bplot = new BarPlot($datay);
-
-// Adjust fill color
-$bplot->SetFillColor('orange');
-
-// Setup values
-$bplot->value->Show();
-$bplot->value->SetFormat('%d');
-$bplot->value->SetFont(FF_FONT1,FS_BOLD);
-
-// Center the values in the bar
-$bplot->SetValuePos('center');
-
-// Make the bar a little bit wider
-$bplot->SetWidth(0.7);
-
-$graph->Add($bplot);
-
-// Setup the titles
-$graph->title->Set("Centered values for bars");
-$graph->xaxis->title->Set("X-title");
-$graph->yaxis->title->Set("Y-title");
-
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD);
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/example20.php b/#jpgraph/src/Examples/example20.php
deleted file mode 100644
index 434860f1..00000000
--- a/#jpgraph/src/Examples/example20.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-$datay=array(12,8,19,3,10,5);
-
-// Create the graph. These two calls are always required
-$graph = new Graph(300,200);	
-$graph->SetScale("textlin");
-
-// Add a drop shadow
-$graph->SetShadow();
-
-// Adjust the margin a bit to make more room for titles
-$graph->img->SetMargin(40,30,20,40);
-
-// Create a bar pot
-$bplot = new BarPlot($datay);
-
-// Adjust fill color
-$bplot->SetFillColor('orange');
-$bplot->SetWidth(1.0);
-$graph->Add($bplot);
-
-// Setup the titles
-$graph->title->Set("Bar graph");
-$graph->xaxis->title->Set("X-title");
-$graph->yaxis->title->Set("Y-title");
-
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD);
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/example21.php b/#jpgraph/src/Examples/example21.php
deleted file mode 100644
index 81debb2d..00000000
--- a/#jpgraph/src/Examples/example21.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-$data1y=array(12,8,19,3,10,5);
-$data2y=array(8,2,11,7,14,4);
-
-// Create the graph. These two calls are always required
-$graph = new Graph(310,200);	
-$graph->SetScale("textlin");
-
-$graph->SetShadow();
-$graph->img->SetMargin(40,30,20,40);
-
-// Create the bar plots
-$b1plot = new BarPlot($data1y);
-$b1plot->SetFillColor("orange");
-$b2plot = new BarPlot($data2y);
-$b2plot->SetFillColor("blue");
-
-// Create the grouped bar plot
-$gbplot = new GroupBarPlot(array($b1plot,$b2plot));
-
-// ...and add it to the graPH
-$graph->Add($gbplot);
-
-$graph->title->Set("Example 21");
-$graph->xaxis->title->Set("X-title");
-$graph->yaxis->title->Set("Y-title");
-
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD);
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/example22.php b/#jpgraph/src/Examples/example22.php
deleted file mode 100644
index f5223d08..00000000
--- a/#jpgraph/src/Examples/example22.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-$data1y=array(12,8,19,3,10,5);
-$data2y=array(8,2,11,7,14,4);
-
-// Create the graph. These two calls are always required
-$graph = new Graph(310,200);	
-$graph->SetScale("textlin");
-$graph->SetShadow();
-
-$graph->img->SetMargin(40,30,20,40);
-
-// Create the bar plots
-$b1plot = new BarPlot($data1y);
-$b1plot->SetFillColor("orange");
-$b2plot = new BarPlot($data2y);
-$b2plot->SetFillColor("blue");
-
-// Create the grouped bar plot
-$gbplot = new GroupBarPlot(array($b1plot,$b2plot));
-$gbplot->SetWidth(0.9);
-
-// ...and add it to the graPH
-$graph->Add($gbplot);
-
-$graph->title->Set("Adjusting the width");
-$graph->xaxis->title->Set("X-title");
-$graph->yaxis->title->Set("Y-title");
-
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD);
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/example23.php b/#jpgraph/src/Examples/example23.php
deleted file mode 100644
index fcec9de0..00000000
--- a/#jpgraph/src/Examples/example23.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-setlocale (LC_ALL, 'et_EE.ISO-8859-1');
-
-$data1y=array(12,8,19,3,10,5);
-$data2y=array(8,2,11,7,14,4);
-
-// Create the graph. These two calls are always required
-$graph = new Graph(310,200);	
-$graph->SetScale("textlin");
-
-$graph->SetShadow();
-$graph->img->SetMargin(40,30,20,40);
-
-// Create the bar plots
-$b1plot = new BarPlot($data1y);
-$b1plot->SetFillColor("orange");
-$b2plot = new BarPlot($data2y);
-$b2plot->SetFillColor("blue");
-
-// Create the grouped bar plot
-$gbplot = new AccBarPlot(array($b1plot,$b2plot));
-
-// ...and add it to the graPH
-$graph->Add($gbplot);
-
-$graph->title->Set("Accumulated bar plots");
-$graph->xaxis->title->Set("X-title");
-$graph->yaxis->title->Set("Y-title");
-
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD);
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/example24.php b/#jpgraph/src/Examples/example24.php
deleted file mode 100644
index 48d48da5..00000000
--- a/#jpgraph/src/Examples/example24.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-$data1y=array(12,8,19,3,10,5);
-$data2y=array(8,2,11,7,14,4);
-$data3y=array(3,9,2,7,5,8);
-$data4y=array(1,5,11,2,14,4);
-
-// Create the graph. These two calls are always required
-$graph = new Graph(310,200);	
-$graph->SetScale("textlin");
-
-$graph->SetShadow();
-$graph->img->SetMargin(40,30,20,40);
-
-$b1plot = new BarPlot($data1y);
-$b1plot->SetFillColor("orange");
-$b2plot = new BarPlot($data2y);
-$b2plot->SetFillColor("blue");
-$b3plot = new BarPlot($data3y);
-$b3plot->SetFillColor("green");
-$b4plot = new BarPlot($data4y);
-$b4plot->SetFillColor("brown");
-
-// Create the accumulated bar plots
-$ab1plot = new AccBarPlot(array($b1plot,$b2plot));
-$ab2plot = new AccBarPlot(array($b3plot,$b4plot));
-
-// Create the grouped bar plot
-$gbplot = new GroupBarPlot(array($ab1plot,$ab2plot));
-
-// ...and add it to the graph
-$graph->Add($gbplot);
-
-$graph->title->Set("Grouped Accumulated bar plots");
-$graph->xaxis->title->Set("X-title");
-$graph->yaxis->title->Set("Y-title");
-
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD);
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/example25.1.php b/#jpgraph/src/Examples/example25.1.php
deleted file mode 100644
index a3afb03a..00000000
--- a/#jpgraph/src/Examples/example25.1.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-$datay=array(12,8,19,3,10,5);
-
-// Create the graph. These two calls are always required
-$graph = new Graph(300,200);
-$graph->SetScale('textlin');
-
-// Add a drop shadow
-$graph->SetShadow();
-
-// Adjust the margin a bit to make more room for titles
-$graph->img->SetMargin(40,30,40,40);
-
-// Create a bar pot
-$bplot = new BarPlot($datay);
-$graph->Add($bplot);
-
-// Create and add a new text
-$txt=new Text('This is a text');
-$txt->SetPos(10,20);
-$txt->SetColor('darkred');
-$txt->SetFont(FF_FONT2,FS_BOLD);
-$txt->SetBox('yellow','navy','gray@0.5');
-$graph->AddText($txt);
-
-// Setup the titles
-$graph->title->Set("A simple bar graph");
-$graph->xaxis->title->Set("X-title");
-$graph->yaxis->title->Set("Y-title");
-
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD);
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/example25.2.php b/#jpgraph/src/Examples/example25.2.php
deleted file mode 100644
index 53f8479e..00000000
--- a/#jpgraph/src/Examples/example25.2.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-$datay=array(12,8,19,3,10,5);
-
-// Create the graph. These two calls are always required
-$graph = new Graph(300,200);
-$graph->SetScale('textlin');
-
-// Add a drop shadow
-$graph->SetShadow();
-
-// Adjust the margin a bit to make more room for titles
-$graph->img->SetMargin(40,30,20,40);
-
-// Create a bar pot
-$bplot = new BarPlot($datay);
-$graph->Add($bplot);
-
-// Create and add a new text
-$txt=new Text("This is a text\nwith many\nand even\nmore\nlines of text");
-$txt->SetPos(0.5,0.5,'center','center');
-$txt->SetFont(FF_FONT2,FS_BOLD);
-$txt->ParagraphAlign('center');
-$txt->SetBox('yellow','navy','gray');
-$txt->SetColor('red');
-$graph->AddText($txt);
-
-// Setup the titles
-$graph->title->Set("A simple bar graph");
-$graph->xaxis->title->Set("X-title");
-$graph->yaxis->title->Set("Y-title");
-
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD);
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/example25.php b/#jpgraph/src/Examples/example25.php
deleted file mode 100644
index 35802aed..00000000
--- a/#jpgraph/src/Examples/example25.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-$datay=array(12,8,19,3,10,5);
-
-// Create the graph. These two calls are always required
-$graph = new Graph(300,200);
-$graph->SetScale('textlin');
-
-// Add a drop shadow
-$graph->SetShadow();
-
-// Adjust the margin a bit to make more room for titles
-$graph->img->SetMargin(40,30,40,40);
-
-// Create a bar pot
-$bplot = new BarPlot($datay);
-$graph->Add($bplot);
-
-// Create and add a new text
-$txt=new Text('This is a text');
-$txt->SetPos(0,20);
-$txt->SetColor('darkred');
-$txt->SetFont(FF_FONT2,FS_BOLD);
-$graph->AddText($txt);
-
-// Setup the titles
-$graph->title->Set("A simple bar graph");
-$graph->xaxis->title->Set("X-title");
-$graph->yaxis->title->Set("Y-title");
-
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD);
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/example26.1.php b/#jpgraph/src/Examples/example26.1.php
deleted file mode 100644
index 63a9d267..00000000
--- a/#jpgraph/src/Examples/example26.1.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_pie.php');
-
-$data = array(40,60,21,33);
-
-$graph = new PieGraph(300,200);
-$graph->SetShadow();
-
-$graph->title->Set("A simple Pie plot");
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-
-$p1 = new PiePlot($data);
-$p1->SetLegends($gDateLocale->GetShortMonth());
-$p1->SetCenter(0.4);
-
-$graph->Add($p1);
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/example26.php b/#jpgraph/src/Examples/example26.php
deleted file mode 100644
index 9cb57ebe..00000000
--- a/#jpgraph/src/Examples/example26.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_pie.php');
-
-$data = array(40,60,21,33);
-
-$graph = new PieGraph(300,200);
-$graph->SetShadow();
-
-$graph->title->Set("A simple Pie plot");
-
-$p1 = new PiePlot($data);
-$graph->Add($p1);
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/example27.1.php b/#jpgraph/src/Examples/example27.1.php
deleted file mode 100644
index 51d52e3a..00000000
--- a/#jpgraph/src/Examples/example27.1.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_pie.php');
-require_once ('jpgraph/jpgraph_pie3d.php');
-
-$data = array(40,60,21,33);
-
-$graph = new PieGraph(300,200);
-$graph->SetShadow();
-
-$graph->title->Set("A simple Pie plot");
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-
-$p1 = new PiePlot3D($data);
-$p1->SetAngle(20);
-$p1->SetSize(0.5);
-$p1->SetCenter(0.45);
-$p1->SetLegends($gDateLocale->GetShortMonth());
-
-$graph->Add($p1);
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/example27.2.php b/#jpgraph/src/Examples/example27.2.php
deleted file mode 100644
index aad23a38..00000000
--- a/#jpgraph/src/Examples/example27.2.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_pie.php');
-require_once ('jpgraph/jpgraph_pie3d.php');
-
-$data = array(40,60,21,33);
-
-$graph = new PieGraph(300,200);
-$graph->SetShadow();
-
-$graph->title->Set("A simple Pie plot");
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-
-$p1 = new PiePlot($data);
-$p1->ExplodeSlice(1);
-$p1->SetCenter(0.45);
-$p1->SetLegends($gDateLocale->GetShortMonth());
-
-$graph->Add($p1);
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/example27.3.php b/#jpgraph/src/Examples/example27.3.php
deleted file mode 100644
index fb2a56ec..00000000
--- a/#jpgraph/src/Examples/example27.3.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_pie.php');
-require_once ('jpgraph/jpgraph_pie3d.php');
-
-$data = array(40,60,21,33);
-
-$graph = new PieGraph(330,200);
-$graph->SetShadow();
-
-$graph->title->Set("A simple 3D Pie plot");
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-
-$p1 = new PiePlot3D($data);
-$p1->ExplodeSlice(1);
-$p1->SetCenter(0.45);
-$p1->SetLegends($gDateLocale->GetShortMonth());
-
-$graph->Add($p1);
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/example27.php b/#jpgraph/src/Examples/example27.php
deleted file mode 100644
index 3feee435..00000000
--- a/#jpgraph/src/Examples/example27.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_pie.php');
-require_once ('jpgraph/jpgraph_pie3d.php');
-
-$data = array(40,60,21,33);
-
-$graph = new PieGraph(300,200);
-$graph->SetShadow();
-
-$graph->title->Set("A simple Pie plot");
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-
-$p1 = new PiePlot3D($data);
-$p1->SetSize(0.5);
-$p1->SetCenter(0.45);
-$p1->SetLegends($gDateLocale->GetShortMonth());
-
-$graph->Add($p1);
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/example28.1.php b/#jpgraph/src/Examples/example28.1.php
deleted file mode 100644
index 7dce5d8a..00000000
--- a/#jpgraph/src/Examples/example28.1.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_pie.php');
-
-$data = array(40,60,21,33,12,33);
-
-$graph = new PieGraph(150,150);
-$graph->SetShadow();
-
-$graph->title->Set("'earth' Theme");
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-
-$p1 = new PiePlot($data);
-$p1->SetTheme("earth");
-$p1->SetCenter(0.5,0.55);
-$p1->value->Show(false);
-$graph->Add($p1);
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/example28.2.php b/#jpgraph/src/Examples/example28.2.php
deleted file mode 100644
index 905be8da..00000000
--- a/#jpgraph/src/Examples/example28.2.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_pie.php');
-
-$data = array(40,60,21,33,12,33);
-
-$graph = new PieGraph(150,150);
-$graph->SetShadow();
-
-$graph->title->Set("'pastel' Theme");
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-
-$p1 = new PiePlot($data);
-$p1->SetTheme("pastel");
-$p1->SetCenter(0.5,0.55);
-$p1->value->Show(false);
-$graph->Add($p1);
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/example28.3.php b/#jpgraph/src/Examples/example28.3.php
deleted file mode 100644
index bc4fdbd1..00000000
--- a/#jpgraph/src/Examples/example28.3.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_pie.php');
-
-$data = array(40,60,21,33,12,33);
-
-$graph = new PieGraph(150,150);
-$graph->SetShadow();
-
-$graph->title->Set("'water' Theme");
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-
-$p1 = new PiePlot($data);
-$p1->SetTheme("water");
-$p1->SetCenter(0.5,0.55);
-$p1->value->Show(false);
-$graph->Add($p1);
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/example28.php b/#jpgraph/src/Examples/example28.php
deleted file mode 100644
index 08d28bdc..00000000
--- a/#jpgraph/src/Examples/example28.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_pie.php');
-
-$data = array(40,60,21,33,12,33);
-
-$graph = new PieGraph(150,150);
-$graph->SetShadow();
-
-$graph->title->Set("'sand' Theme");
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-
-$p1 = new PiePlot($data);
-$p1->SetTheme("sand");
-$p1->SetCenter(0.5,0.55);
-$p1->value->Show(false);
-$graph->Add($p1);
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/example3.0.1.php b/#jpgraph/src/Examples/example3.0.1.php
deleted file mode 100644
index dd10c9e9..00000000
--- a/#jpgraph/src/Examples/example3.0.1.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-// Some (random) data
-$ydata = array(11,3,8,12,5,1,9,13,5,7);
-
-// Size of the overall graph
-$width=350;
-$height=250;
-
-// Create the graph and set a scale.
-// These two calls are always required
-$graph = new Graph($width,$height);
-$graph->SetScale('intlin');
-$graph->SetShadow();
-
-// Setup margin and titles
-$graph->SetMargin(40,20,20,40);
-$graph->title->Set('Calls per operator');
-$graph->subtitle->Set('(March 12, 2008)');
-$graph->xaxis->title->Set('Operator');
-$graph->yaxis->title->Set('# of calls');
-
-$graph->yaxis->title->SetFont( FF_FONT1 , FS_BOLD );
-$graph->xaxis->title->SetFont( FF_FONT1 , FS_BOLD );
-
-$graph->yaxis->SetColor('blue');
-
-// Create the linear plot
-$lineplot=new LinePlot($ydata);
-$lineplot->SetColor( 'blue' );
-$lineplot->SetWeight( 2 );   // Two pixel wide
-
-
-// Add the plot to the graph
-$graph->Add($lineplot);
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/example3.0.2.php b/#jpgraph/src/Examples/example3.0.2.php
deleted file mode 100644
index 3c8b1e62..00000000
--- a/#jpgraph/src/Examples/example3.0.2.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-// Some (random) data
-$ydata = array(17,3,'-',10,7,'-',3,19,9,7);
-
-// Size of the overall graph
-$width=350;
-$height=250;
-
-// Create the graph and set a scale.
-// These two calls are always required
-$graph = new Graph($width,$height);
-$graph->SetScale('intlin');
-$graph->SetShadow();
-
-// Setup margin and titles
-$graph->SetMargin(40,20,20,40);
-$graph->title->Set('Interpolated values');
-$graph->xaxis->title->Set('x-title');
-$graph->yaxis->title->Set('y-title');
-
-$graph->yaxis->title->SetFont( FF_ARIAL , FS_BOLD, 9 );
-$graph->xaxis->title->SetFont( FF_ARIAL , FS_BOLD, 9 );
-
-$graph->yaxis->SetColor('blue');
-
-// Create the linear plot
-$lineplot=new LinePlot($ydata);
-$lineplot->SetColor( 'blue' );
-$lineplot->SetWeight( 2 );   // Two pixel wide
-
-
-// Add the plot to the graph
-$graph->Add($lineplot);
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/example3.0.3.php b/#jpgraph/src/Examples/example3.0.3.php
deleted file mode 100644
index cc39f638..00000000
--- a/#jpgraph/src/Examples/example3.0.3.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-// Some (random) data
-$ydata = array(17,3,'',10,7,'',3,19,9,7);
-
-// Size of the overall graph
-$width=350;
-$height=250;
-
-// Create the graph and set a scale.
-// These two calls are always required
-$graph = new Graph($width,$height);
-$graph->SetScale('intlin');
-$graph->SetShadow();
-
-// Setup margin and titles
-$graph->SetMargin(40,20,20,40);
-$graph->title->Set('NULL values');
-$graph->xaxis->title->Set('x-title');
-$graph->yaxis->title->Set('y-title');
-
-$graph->yaxis->title->SetFont( FF_ARIAL , FS_BOLD, 9 );
-$graph->xaxis->title->SetFont( FF_ARIAL , FS_BOLD, 9 );
-
-$graph->yaxis->SetColor('blue');
-
-// Create the linear plot
-$lineplot=new LinePlot($ydata);
-$lineplot->SetColor( 'blue' );
-$lineplot->SetWeight( 2 );   // Two pixel wide
-
-
-// Add the plot to the graph
-$graph->Add($lineplot);
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/example3.1.1.php b/#jpgraph/src/Examples/example3.1.1.php
deleted file mode 100644
index 32e2cef8..00000000
--- a/#jpgraph/src/Examples/example3.1.1.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-// Some (random) data
-$ydata = array(11,3,8,12,5,1,9,13,5,7);
-
-// Size of the overall graph
-$width=350;
-$height=250;
-
-// Create the graph and set a scale.
-// These two calls are always required
-$graph = new Graph($width,$height);
-$graph->SetScale('intlin');
-$graph->SetShadow();
-
-// Setup margin and titles
-$graph->SetMargin(40,20,20,40);
-$graph->title->Set('Calls per operator');
-$graph->subtitle->Set('(March 12, 2008)');
-$graph->xaxis->title->Set('Operator');
-$graph->yaxis->title->Set('# of calls');
-
-$graph->yaxis->title->SetFont( FF_FONT1 , FS_BOLD );
-$graph->xaxis->title->SetFont( FF_FONT1 , FS_BOLD );
-
-$graph->yaxis->SetColor('blue');
-
-// Create the linear plot
-$lineplot=new LinePlot($ydata);
-$lineplot->SetColor( 'blue' );
-$lineplot->SetWeight( 2 );   // Two pixel wide
-
-// Add an image mark scaled to 50%
-$lineplot->mark->SetType(MARK_IMG_DIAMOND,'red',0.5);
-
-// Add the plot to the graph
-$graph->Add($lineplot);
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/example3.1.php b/#jpgraph/src/Examples/example3.1.php
deleted file mode 100644
index 1c4e0adc..00000000
--- a/#jpgraph/src/Examples/example3.1.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-// Some (random) data
-$ydata = array(11,3,8,12,5,1,9,13,5,7);
-
-// Size of the overall graph
-$width=350;
-$height=250;
-
-// Create the graph and set a scale.
-// These two calls are always required
-$graph = new Graph($width,$height);
-$graph->SetScale('intlin');
-$graph->SetShadow();
-
-// Setup margin and titles
-$graph->SetMargin(40,20,20,40);
-$graph->title->Set('Calls per operator');
-$graph->subtitle->Set('(March 12, 2008)');
-$graph->xaxis->title->Set('Operator');
-$graph->yaxis->title->Set('# of calls');
-
-$graph->yaxis->title->SetFont( FF_FONT1 , FS_BOLD );
-$graph->xaxis->title->SetFont( FF_FONT1 , FS_BOLD );
-
-$graph->yaxis->SetColor('blue');
-
-// Create the linear plot
-$lineplot=new LinePlot($ydata);
-$lineplot->SetColor( 'blue' );
-$lineplot->SetWeight( 2 );   // Two pixel wide
-$lineplot->mark->SetType(MARK_UTRIANGLE);
-$lineplot->mark->SetColor('blue');
-$lineplot->mark->SetFillColor('red');
-
-// Add the plot to the graph
-$graph->Add($lineplot);
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/example3.2.1.php b/#jpgraph/src/Examples/example3.2.1.php
deleted file mode 100644
index c739ce80..00000000
--- a/#jpgraph/src/Examples/example3.2.1.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$ydata = array(11,3,8,12,5,1,9,15,5,7);
-
-// Create the graph. These two calls are always required
-$graph = new Graph(300,200);	
-$graph->SetScale("textlin");
-$graph->yaxis->scale->SetGrace(10,10);
-
-// Create the linear plot
-$lineplot=new LinePlot($ydata);
-$lineplot->mark->SetType(MARK_CIRCLE);
-
-// Add the plot to the graph
-$graph->Add($lineplot);
-
-$graph->img->SetMargin(40,20,20,40);
-$graph->title->Set("Grace value, version 1");
-$graph->xaxis->title->Set("X-title");
-$graph->yaxis->title->Set("Y-title");
-
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD);
-
-$lineplot->SetColor("blue");
-$lineplot->SetWeight(2);
-$graph->yaxis->SetWeight(2);
-$graph->SetShadow();
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/example3.2.2.php b/#jpgraph/src/Examples/example3.2.2.php
deleted file mode 100644
index 03d22c8c..00000000
--- a/#jpgraph/src/Examples/example3.2.2.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$ydata = array(11,3,8,12,5,1,9,15,5,7);
-
-// Create the graph. These two calls are always required
-$graph = new Graph(300,200);	
-$graph->SetScale("textlin");
-$graph->yaxis->scale->SetGrace(10,10);
-
-// Create the linear plot
-$lineplot=new LinePlot($ydata);
-$lineplot->mark->SetType(MARK_CIRCLE);
-
-// Add the plot to the graph
-$graph->Add($lineplot);
-
-$graph->img->SetMargin(40,20,20,40);
-$graph->title->Set("Grace value version 2");
-$graph->xaxis->title->Set("X-title");
-$graph->yaxis->title->Set("Y-title");
-
-$graph->xaxis->SetPos('min');
-
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD);
-
-$lineplot->SetColor("blue");
-$lineplot->SetWeight(2);
-$graph->yaxis->SetWeight(2);
-$graph->SetShadow();
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/example3.2.php b/#jpgraph/src/Examples/example3.2.php
deleted file mode 100644
index f7c05c5c..00000000
--- a/#jpgraph/src/Examples/example3.2.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$ydata = array(11,3,8,12,5,1,9,15,5,7);
-
-// Create the graph. These two calls are always required
-$graph = new Graph(300,200);	
-$graph->SetScale("textlin");
-
-// Create the linear plot
-$lineplot=new LinePlot($ydata);
-$lineplot->mark->SetType(MARK_CIRCLE);
-
-// Add the plot to the graph
-$graph->Add($lineplot);
-
-$graph->img->SetMargin(40,20,20,40);
-$graph->title->Set("Example 3.2");
-$graph->xaxis->title->Set("X-title");
-$graph->yaxis->title->Set("Y-title");
-
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD);
-
-$lineplot->SetColor("blue");
-$lineplot->SetWeight(2);
-$graph->yaxis->SetWeight(2);
-$graph->SetShadow();
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/example3.3.php b/#jpgraph/src/Examples/example3.3.php
deleted file mode 100644
index c20cd98c..00000000
--- a/#jpgraph/src/Examples/example3.3.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-// Some (random) data
-$ydata = array(11,3,8,12,5,1,9,13,5,7);
-
-// Size of the overall graph
-$width=350;
-$height=250;
-
-// Create the graph and set a scale.
-// These two calls are always required
-$graph = new Graph($width,$height);
-$graph->SetScale('intlin');
-$graph->SetShadow();
-
-// Setup margin and titles
-$graph->SetMargin(40,20,20,40);
-$graph->title->Set('Calls per operator');
-$graph->subtitle->Set('(March 12, 2008)');
-$graph->xaxis->title->Set('Operator');
-$graph->yaxis->title->Set('# of calls');
-
-$graph->yaxis->title->SetFont( FF_FONT1 , FS_BOLD );
-$graph->xaxis->title->SetFont( FF_FONT1 , FS_BOLD );
-
-$graph->yaxis->SetColor('blue');
-
-// Create the linear plot
-$lineplot=new LinePlot($ydata);
-$lineplot->SetColor( 'blue' );
-$lineplot->SetWeight( 2 );   // Two pixel wide
-$lineplot->mark->SetType(MARK_UTRIANGLE);
-$lineplot->mark->SetColor('blue');
-$lineplot->mark->SetFillColor('red');
-
-$lineplot->value->Show();
-
-// Add the plot to the graph
-$graph->Add($lineplot);
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/example3.4.1.php b/#jpgraph/src/Examples/example3.4.1.php
deleted file mode 100644
index 77c0b24b..00000000
--- a/#jpgraph/src/Examples/example3.4.1.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-// A function to return the Roman Numeral, given an integer
- function numberToRoman($aNum)
- {
-     // Make sure that we only use the integer portion of the value
-     $n = intval($aNum);
-     $result = '';
-
-     // Declare a lookup array that we will use to traverse the number:
-     $lookup = array('M' => 1000, 'CM' => 900, 'D' => 500, 'CD' => 400,
-     'C' => 100, 'XC' => 90, 'L' => 50, 'XL' => 40,
-     'X' => 10, 'IX' => 9, 'V' => 5, 'IV' => 4, 'I' => 1);
-
-     foreach ($lookup as $roman => $value)
-     {
-         // Determine the number of matches
-         $matches = intval($n / $value);
-
-         // Store that many characters
-         $result .= str_repeat($roman, $matches);
-
-         // Substract that from the number
-         $n = $n % $value;
-     }
-
-     // The Roman numeral should be built, return it
-     return $result;
-}
-
-function formatCallback($aVal) {
-	return '('.numberToRoman($aVal).')';
-}
-
-
- // Some (random) data
-$ydata = array(11,3,8,12,5,1,9,13,5,7);
-
-// Size of the overall graph
-$width=350;
-$height=250;
-
-// Create the graph and set a scale.
-// These two calls are always required
-$graph = new Graph($width,$height);
-$graph->SetScale('intlin');
-$graph->SetShadow();
-
-// Setup margin and titles
-$graph->SetMargin(40,20,20,40);
-$graph->title->Set('Calls per operator');
-$graph->subtitle->Set('(March 12, 2008)');
-$graph->xaxis->title->Set('Operator');
-$graph->yaxis->title->Set('# of calls');
-
-$graph->yaxis->title->SetFont( FF_FONT1 , FS_BOLD );
-$graph->xaxis->title->SetFont( FF_FONT1 , FS_BOLD );
-
-$graph->yaxis->SetColor('blue');
-
-// Create the linear plot
-$lineplot=new LinePlot($ydata);
-$lineplot->SetColor( 'blue' );
-$lineplot->SetWeight( 2 );   // Two pixel wide
-$lineplot->mark->SetType(MARK_UTRIANGLE);
-$lineplot->mark->SetColor('blue');
-$lineplot->mark->SetFillColor('red');
-
-$lineplot->value->Show();
-$lineplot->value->SetFont(FF_ARIAL,FS_BOLD,10);
-$lineplot->value->SetColor('darkred');
-$lineplot->value->SetFormatCallback('formatCallback');
-
-// Add the plot to the graph
-$graph->Add($lineplot);
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/example3.4.php b/#jpgraph/src/Examples/example3.4.php
deleted file mode 100644
index 0d223c17..00000000
--- a/#jpgraph/src/Examples/example3.4.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-// Some (random) data
-$ydata = array(11,3,8,12,5,1,9,13,5,7);
-
-// Size of the overall graph
-$width=350;
-$height=250;
-
-// Create the graph and set a scale.
-// These two calls are always required
-$graph = new Graph($width,$height);
-$graph->SetScale('intlin');
-$graph->SetShadow();
-
-// Setup margin and titles
-$graph->SetMargin(40,20,20,40);
-$graph->title->Set('Calls per operator');
-$graph->subtitle->Set('(March 12, 2008)');
-$graph->xaxis->title->Set('Operator');
-$graph->yaxis->title->Set('# of calls');
-
-$graph->yaxis->title->SetFont( FF_FONT1 , FS_BOLD );
-$graph->xaxis->title->SetFont( FF_FONT1 , FS_BOLD );
-
-$graph->yaxis->SetColor('blue');
-
-// Create the linear plot
-$lineplot=new LinePlot($ydata);
-$lineplot->SetColor( 'blue' );
-$lineplot->SetWeight( 2 );   // Two pixel wide
-$lineplot->mark->SetType(MARK_UTRIANGLE);
-$lineplot->mark->SetColor('blue');
-$lineplot->mark->SetFillColor('red');
-
-$lineplot->value->Show();
-$lineplot->value->SetFont(FF_ARIAL,FS_BOLD,10);
-$lineplot->value->SetColor('darkred');
-$lineplot->value->SetFormat('(%d)');
-
-// Add the plot to the graph
-$graph->Add($lineplot);
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/example3.php b/#jpgraph/src/Examples/example3.php
deleted file mode 100644
index 4c79c1d4..00000000
--- a/#jpgraph/src/Examples/example3.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-// Some (random) data
-$ydata = array(11,3,8,12,5,1,9,13,5,7);
-
-// Size of the overall graph
-$width=350;
-$height=250;
-
-// Create the graph and set a scale.
-// These two calls are always required
-$graph = new Graph($width,$height);
-$graph->SetScale('intlin');
-
-// Setup margin and titles
-$graph->SetMargin(40,20,20,40);
-$graph->title->Set('Calls per operator');
-$graph->subtitle->Set('(March 12, 2008)');
-$graph->xaxis->title->Set('Operator');
-$graph->yaxis->title->Set('# of calls');
-
-$graph->yaxis->title->SetFont( FF_FONT1 , FS_BOLD );
-$graph->xaxis->title->SetFont( FF_FONT1 , FS_BOLD );
-
-// Create the linear plot
-$lineplot=new LinePlot($ydata);
-$lineplot->SetColor( 'blue' );
-$lineplot->SetWeight( 2 );   // Two pixel wide
-
-
-// Add the plot to the graph
-$graph->Add($lineplot);
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/example4.php b/#jpgraph/src/Examples/example4.php
deleted file mode 100644
index 42549d88..00000000
--- a/#jpgraph/src/Examples/example4.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
- // Some (random) data
-$ydata   = array(11, 3, 8, 12, 5, 1, 9, 13, 5, 7);
-$ydata2  = array(1, 19, 15, 7, 22, 14, 5, 9, 21, 13 );
-
-// Size of the overall graph
-$width=350;
-$height=250;
-
-// Create the graph and set a scale.
-// These two calls are always required
-$graph = new Graph($width,$height);
-$graph->SetScale('intlin');
-$graph->SetShadow();
-
-// Setup margin and titles
-$graph->SetMargin(40,20,20,40);
-$graph->title->Set('Calls per operator (June,July)');
-$graph->subtitle->Set('(March 12, 2008)');
-$graph->xaxis->title->Set('Operator');
-$graph->yaxis->title->Set('# of calls');
-
-$graph->yaxis->title->SetFont( FF_FONT1 , FS_BOLD );
-$graph->xaxis->title->SetFont( FF_FONT1 , FS_BOLD );
-
-// Create the first data series
-$lineplot=new LinePlot($ydata);
-$lineplot->SetWeight( 2 );   // Two pixel wide
-
-// Add the plot to the graph
-$graph->Add($lineplot);
-
-// Create the second data series
-$lineplot2=new LinePlot($ydata2);
-$lineplot2->SetWeight( 2 );   // Two pixel wide
-
-// Add the second plot to the graph
-$graph->Add($lineplot2);
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/example5.1.php b/#jpgraph/src/Examples/example5.1.php
deleted file mode 100644
index 38345584..00000000
--- a/#jpgraph/src/Examples/example5.1.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$ydata = array(11,3,8,12,5,1,9,13,5,7);
-$y2data = array(354,200,265,99,111,91,198,225,293,251);
-
-// Create the graph. These two calls are always required
-$graph = new Graph(300,200);	
-$graph->img->SetMargin(40,40,20,40);
-$graph->SetScale("textlin");
-$graph->SetY2Scale("lin");
-$graph->SetShadow();
-
-// Create the linear plot
-$lineplot=new LinePlot($ydata);
-$lineplot2=new LinePlot($y2data);
-
-// Add the plot to the graph
-$graph->Add($lineplot);
-$graph->AddY2($lineplot2);
-$lineplot2->SetColor("orange");
-$lineplot2->SetWeight(2);
-$graph->y2axis->SetColor("orange");
-
-$graph->title->Set("Example 5");
-$graph->xaxis->title->Set("X-title");
-$graph->yaxis->title->Set("Y-title");
-
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD);
-
-$lineplot->SetColor("blue");
-$lineplot->SetWeight(2);
-
-$lineplot2->SetColor("orange");
-$lineplot2->SetWeight(2);
-
-$graph->yaxis->SetColor("blue");
-
-$lineplot->SetLegend("Plot 1");
-$lineplot2->SetLegend("Plot 2");
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/example5.php b/#jpgraph/src/Examples/example5.php
deleted file mode 100644
index d4b6838b..00000000
--- a/#jpgraph/src/Examples/example5.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$ydata = array(11,3,8,12,5,1,9,13,5,7);
-$y2data = array(354,200,265,99,111,91,198,225,293,251);
-
-// Create the graph. These two calls are always required
-$graph = new Graph(300,200);	
-$graph->img->SetMargin(40,40,20,40);
-$graph->SetScale("textlin");
-$graph->SetY2Scale("lin");
-$graph->SetShadow();
-
-// Create the linear plot
-$lineplot=new LinePlot($ydata);
-$lineplot2=new LinePlot($y2data);
-
-// Add the plot to the graph
-$graph->Add($lineplot);
-$graph->AddY2($lineplot2);
-$lineplot2->SetColor("orange");
-$lineplot2->SetWeight(2);
-$graph->y2axis->SetColor("orange");
-
-$graph->title->Set("Example 5");
-$graph->xaxis->title->Set("X-title");
-$graph->yaxis->title->Set("Y-title");
-
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD);
-
-$lineplot->SetColor("blue");
-$lineplot->SetWeight(2);
-
-$lineplot2->SetColor("orange");
-$lineplot2->SetWeight(2);
-
-$graph->yaxis->SetColor("blue");
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/example6.1.php b/#jpgraph/src/Examples/example6.1.php
deleted file mode 100644
index 50007592..00000000
--- a/#jpgraph/src/Examples/example6.1.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$ydata = array(11,3,8,12,5,1,9,13,5,7);
-$y2data = array(354,200,265,99,111,91,198,225,293,251);
-
-// Create the graph and specify the scale for both Y-axis
-$graph = new Graph(300,240);	
-$graph->SetScale("textlin");
-$graph->SetY2Scale("lin");
-$graph->SetShadow();
-
-// Adjust the margin
-$graph->img->SetMargin(40,40,20,70);
-
-// Create the two linear plot
-$lineplot=new LinePlot($ydata);
-$lineplot2=new LinePlot($y2data);
-
-// Add the plot to the graph
-$graph->Add($lineplot);
-$graph->AddY2($lineplot2);
-$lineplot2->SetColor("orange");
-$lineplot2->SetWeight(2);
-
-// Adjust the axis color
-$graph->y2axis->SetColor("orange");
-$graph->yaxis->SetColor("blue");
-
-$graph->title->Set("Example 6.1");
-$graph->xaxis->title->Set("X-title");
-$graph->yaxis->title->Set("Y-title");
-
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD);
-
-// Set the colors for the plots 
-$lineplot->SetColor("blue");
-$lineplot->SetWeight(2);
-$lineplot2->SetColor("orange");
-$lineplot2->SetWeight(2);
-
-// Set the legends for the plots
-$lineplot->SetLegend("Plot 1");
-$lineplot2->SetLegend("Plot 2");
-
-// Adjust the legend position
-$graph->legend->SetLayout(LEGEND_HOR);
-$graph->legend->Pos(0.4,0.95,"center","bottom");
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/example6.2.php b/#jpgraph/src/Examples/example6.2.php
deleted file mode 100644
index 7d0a7556..00000000
--- a/#jpgraph/src/Examples/example6.2.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$ydata = array(11,3,8,12,5,1,9,13,5,7);
-$y2data = array(354,200,265,99,111,91,198,225,293,251);
-
-// Create the graph and specify the scale for both Y-axis
-$graph = new Graph(300,240);	
-$graph->SetScale("textlin");
-$graph->SetShadow();
-
-// Adjust the margin
-$graph->img->SetMargin(40,40,20,70);
-
-// Create the two linear plot
-$lineplot=new LinePlot($ydata);
-$lineplot->SetStepStyle();
-
-// Adjust the axis color
-$graph->yaxis->SetColor("blue");
-
-$graph->title->Set("Example 6.2");
-$graph->xaxis->title->Set("X-title");
-$graph->yaxis->title->Set("Y-title");
-
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD);
-
-// Set the colors for the plots 
-$lineplot->SetColor("blue");
-$lineplot->SetWeight(2);
-
-// Set the legends for the plots
-$lineplot->SetLegend("Plot 1");
-
-// Add the plot to the graph
-$graph->Add($lineplot);
-
-// Adjust the legend position
-$graph->legend->SetLayout(LEGEND_HOR);
-$graph->legend->Pos(0.4,0.95,"center","bottom");
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/example6.php b/#jpgraph/src/Examples/example6.php
deleted file mode 100644
index 6cdc6303..00000000
--- a/#jpgraph/src/Examples/example6.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$ydata = array(11,3,8,12,5,1,9,13,5,7);
-$y2data = array(354,200,265,99,111,91,198,225,293,251);
-
-// Create the graph and specify the scale for both Y-axis
-$graph = new Graph(400,200);
-$graph->SetScale('textlin');
-$graph->SetY2Scale('lin');
-$graph->SetShadow();
-
-// Adjust the margin
-$graph->img->SetMargin(40,140,20,40);
-
-// Create the two linear plot
-$lineplot=new LinePlot($ydata);
-$lineplot2=new LinePlot($y2data);
-
-// Add the plot to the graph
-$graph->Add($lineplot);
-$graph->AddY2($lineplot2);
-$lineplot2->SetColor('orange');
-$lineplot2->SetWeight(2);
-
-// Adjust the axis color
-$graph->y2axis->SetColor('orange');
-$graph->yaxis->SetColor('blue');
-
-$graph->title->Set('Example 6');
-$graph->xaxis->title->Set('X-title');
-$graph->yaxis->title->Set('Y-title');
-
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD);
-
-// Set the colors for the plots
-$lineplot->SetColor('blue');
-$lineplot->SetWeight(2);
-$lineplot2->SetColor('orange');
-$lineplot2->SetWeight(2);
-
-// Set the legends for the plots
-$lineplot->SetLegend('Plot 1');
-$lineplot2->SetLegend('Plot 2');
-
-// Adjust the legend position
-$graph->legend->Pos(0.05,0.5,'right','center');
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/example7.php b/#jpgraph/src/Examples/example7.php
deleted file mode 100644
index e8f75c4c..00000000
--- a/#jpgraph/src/Examples/example7.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_log.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$ydata = array(11,3,8,12,5,1,9,13,5,7);
-$y2data = array(354,70,265,29,111,91,198,225,593,251);
-
-// Create the graph.
-$graph = new Graph(350,200);	
-$graph->SetScale("textlin");
-$graph->SetY2Scale("log");
-$graph->SetShadow();
-$graph->img->SetMargin(40,110,20,40);
-
-// Create the linear plot
-$lineplot=new LinePlot($ydata);
-$lineplot2=new LinePlot($y2data);
-
-// Add the plot to the graph
-$graph->Add($lineplot);
-$graph->AddY2($lineplot2);
-$graph->yaxis->SetColor('blue');
-
-$graph->title->Set("Example 7");
-$graph->xaxis->title->Set("X-title");
-$graph->yaxis->title->Set("Y-title");
-
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD);
-
-$lineplot->SetColor("blue");
-$lineplot->SetWeight(2);
-$lineplot2->SetWeight(2);
-
-$lineplot->SetLegend("Plot 1");
-$lineplot2->SetLegend("Plot 2");
-
-$graph->legend->Pos(0.05,0.5,"right","center");
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/example8.1.php b/#jpgraph/src/Examples/example8.1.php
deleted file mode 100644
index 8cab7e42..00000000
--- a/#jpgraph/src/Examples/example8.1.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_log.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$ydata = array(11,3,8,12,5,1,9,13,5,7);
-$y2data = array(354,200,265,99,111,91,198,225,293,251);
-
-// Create the graph. These two calls are always required
-$graph = new Graph(350,200);	
-$graph->SetScale("textlog");
-$graph->SetY2Scale("log");
-
-$graph->SetShadow();
-$graph->SetMargin(40,110,20,40);
-
-$graph->ygrid->Show(true,true);
-$graph->xgrid->Show(true,false);
-
-// Create the linear plot
-$lineplot=new LinePlot($ydata);
-
-$lineplot2=new LinePlot($y2data);
-$lineplot2->SetColor("orange");
-$lineplot2->SetWeight(2);
-
-$graph->yaxis->scale->ticks->SupressFirst();
-
-// Add the plot to the graph
-$graph->Add($lineplot);
-$graph->AddY2($lineplot2);
-
-$graph->title->Set("Example 8");
-$graph->xaxis->title->Set("X-title");
-$graph->yaxis->title->Set("Y-title");
-
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD);
-
-$lineplot->SetColor("blue");
-$lineplot->SetWeight(2);
-
-$lineplot2->SetColor("orange");
-$lineplot2->SetWeight(2);
-
-$graph->yaxis->SetColor("blue");
-$graph->y2axis->SetColor("orange");
-
-$lineplot->SetLegend("Plot 1");
-$lineplot2->SetLegend("Plot 2");
-
-$graph->legend->Pos(0.05,0.5,"right","center");
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/example8.php b/#jpgraph/src/Examples/example8.php
deleted file mode 100644
index 773265bd..00000000
--- a/#jpgraph/src/Examples/example8.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_log.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$ydata = array(11,3,8,12,5,1,9,13,5,7);
-$y2data = array(354,200,265,99,111,91,198,225,293,251);
-
-// Create the graph. These two calls are always required
-$graph = new Graph(350,200);	
-$graph->SetScale("textlog");
-$graph->SetShadow();
-$graph->img->SetMargin(40,110,20,40);
-
-// Show the gridlines
-$graph->ygrid->Show(true,true);
-$graph->xgrid->Show(true,false);
-
-// Create the linear plot
-$lineplot=new LinePlot($ydata);
-$lineplot2=new LinePlot($y2data);
-
-// Add the plot to the graph
-$graph->Add($lineplot);
-
-$graph->title->Set("Example 8");
-$graph->xaxis->title->Set("X-title");
-$graph->yaxis->title->Set("Y-title");
-
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD);
-
-$lineplot->SetColor("blue");
-$lineplot->SetWeight(2);
-
-// Adjust the color of the Y axis
-$graph->yaxis->SetColor("blue");
-
-// Specifya a legend
-$lineplot->SetLegend("Plot 1");
-
-// Adjust the position of the grid box
-$graph->legend->Pos(0.05,0.5,"right","center");
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/example9.1.php b/#jpgraph/src/Examples/example9.1.php
deleted file mode 100644
index addcb5f4..00000000
--- a/#jpgraph/src/Examples/example9.1.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_log.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-
-$ydata = array(11,3,8,42,5,1,9,13,5,7);
-$datax = array("Jan","Feb","Mar","Apr","Maj","Jun","Jul","aug","Sep","Oct");
-
-// Create the graph. These two calls are always required
-$graph = new Graph(350,200);
-$graph->SetScale("textlog");
-
-$graph->img->SetMargin(40,110,20,40);
-$graph->SetShadow();
-
-$graph->ygrid->Show(true,true);
-$graph->xgrid->Show(true,false);
-
-// Specify the tick labels
-$a = $gDateLocale->GetShortMonth();
-$graph->xaxis->SetTickLabels($a);
-$graph->xaxis->SetTextLabelInterval(2);
-
-// Create the linear plot
-$lineplot=new LinePlot($ydata);
-
-// Add the plot to the graph
-$graph->Add($lineplot);
-
-$graph->title->Set("Examples 9");
-$graph->xaxis->title->Set("X-title");
-$graph->yaxis->title->Set("Y-title");
-
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD);
-
-$lineplot->SetColor("blue");
-$lineplot->SetWeight(2);
-
-$graph->yaxis->SetColor("blue");
-
-$lineplot->SetLegend("Plot 1");
-
-$graph->legend->Pos(0.05,0.5,"right","center");
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/example9.2.php b/#jpgraph/src/Examples/example9.2.php
deleted file mode 100644
index c765981e..00000000
--- a/#jpgraph/src/Examples/example9.2.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_log.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-
-$ydata = array(11,3,8,42,5,1,9,13,5,7);
-$datax = array("Jan","Feb","Mar","Apr","Maj","Jun","Jul","aug","Sep","Oct");
-
-// Create the graph. These two calls are always required
-$graph = new Graph(350,200);
-$graph->SetScale("textlog");
-
-$graph->img->SetMargin(40,110,20,50);
-$graph->SetShadow();
-
-$graph->ygrid->Show(true,true);
-$graph->xgrid->Show(true,false);
-
-// Specify the tick labels
-$a = $gDateLocale->GetShortMonth();
-$graph->xaxis->SetTickLabels($a);
-//$graph->xaxis->SetTextLabelInterval(2);
-$graph->xaxis->SetLabelAngle(90);
-
-
-// Create the linear plot
-$lineplot=new LinePlot($ydata);
-
-// Add the plot to the graph
-$graph->Add($lineplot);
-
-$graph->title->Set("Examples 9");
-$graph->xaxis->title->Set("X-title");
-$graph->yaxis->title->Set("Y-title");
-
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD);
-
-$lineplot->SetColor("blue");
-$lineplot->SetWeight(2);
-
-$graph->yaxis->SetColor("blue");
-
-$lineplot->SetLegend("Plot 1");
-
-$graph->legend->Pos(0.05,0.5,"right","center");
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/example9.php b/#jpgraph/src/Examples/example9.php
deleted file mode 100644
index 03c54790..00000000
--- a/#jpgraph/src/Examples/example9.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_log.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-
-$ydata = array(11,3,8,42,5,1,9,13,5,7);
-$datax = array("Jan","Feb","Mar","Apr","Maj","Jun","Jul","aug","Sep","Oct");
-
-// Create the graph. These two calls are always required
-$graph = new Graph(350,200);
-$graph->SetScale("textlog");
-
-$graph->img->SetMargin(40,110,20,40);
-$graph->SetShadow();
-
-$graph->ygrid->Show(true,true);
-$graph->xgrid->Show(true,false);
-
-// Specify the tick labels
-$a = $gDateLocale->GetShortMonth();
-$graph->xaxis->SetTickLabels($a);
-
-// Create the linear plot
-$lineplot=new LinePlot($ydata);
-
-// Add the plot to the graph
-$graph->Add($lineplot);
-
-$graph->title->Set("Examples 9");
-$graph->xaxis->title->Set("X-title");
-$graph->yaxis->title->Set("Y-title");
-
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD);
-
-$lineplot->SetColor("blue");
-$lineplot->SetWeight(2);
-
-$graph->yaxis->SetColor("blue");
-
-$lineplot->SetLegend("Plot 1");
-
-$graph->legend->Pos(0.05,0.5,"right","center");
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/exampleex9.php b/#jpgraph/src/Examples/exampleex9.php
deleted file mode 100644
index 9d87985f..00000000
--- a/#jpgraph/src/Examples/exampleex9.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_log.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-
-$ydata = array(11,3,8,12,5,1,9,13,5,7);
-$y2data = array(354,200,265,99,111,91,198,225,293,251);
-$datax = array("Jan","Feb","Mar","Apr","Maj","Jun","Jul","aug","Sep","Oct");
-
-// Create the graph. These two calls are always required
-// We also specify a 2 min timeout for the cached image
-$graph = new Graph(350,200);
-$graph->SetScale("textlog");
-
-$graph->img->SetMargin(40,110,20,40);
-
-$graph->SetY2Scale("log");
-$graph->SetShadow();
-
-$graph->ygrid->Show(true,true);
-$graph->xgrid->Show(true,false);
-
-// Create the linear plot
-$lineplot=new LinePlot($ydata);
-$lineplot2=new LinePlot($y2data);
-
-$graph->yaxis->scale->ticks->SupressFirst();
-$graph->y2axis->scale->ticks->SupressFirst();
-// Add the plot to the graph
-$graph->Add($lineplot);
-$graph->AddY2($lineplot2);
-$lineplot2->SetColor("orange");
-$lineplot2->SetWeight(2);
-$graph->y2axis->SetColor("orange");
-
-$graph->title->Set("Examples 9");
-$graph->xaxis->title->Set("X-title");
-$graph->yaxis->title->Set("Y-title");
-
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD);
-
-$lineplot->SetColor("blue");
-$lineplot->SetWeight(2);
-
-$lineplot2->SetColor("orange");
-$lineplot2->SetWeight(2);
-
-$graph->yaxis->SetColor("blue");
-
-$lineplot->SetLegend("Plot 1");
-$lineplot2->SetLegend("Plot 2");
-
-$graph->legend->Pos(0.05,0.5,"right","center");
-
-$graph->xaxis->SetTickLabels($datax);
-$graph->xaxis->SetTextTickInterval(2);
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/fieldscatterex1.php b/#jpgraph/src/Examples/fieldscatterex1.php
deleted file mode 100644
index 94b47fb6..00000000
--- a/#jpgraph/src/Examples/fieldscatterex1.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_scatter.php');
-
-$polex = 6;
-$poley = 40;
-
-function FldCallback($x,$y,$a) {
-    GLOBAL $polex, $poley;
-    $maxr = 3000;
-
-    // Size and arrow size is constant
-    $size="";
-    $arrowsize="";
-
-    // Since we have different scales we need the data points
-    // to be of the same magnitude to give it a distance
-    // interpretation.
-    $x *= 10; 
-
-    // Colors gets colder the further out we go from the center
-    $r = ($x-$polex*10)*($x-$polex*10)+($y-$poley)*($y-$poley);
-    $f = $r/$maxr;
-    if( $f > 1 ) $f=1;
-    $red = floor((1-$f)*255);
-    $blue = floor($f*255);
-    $color = array($red,0,$blue);
-    //echo "x=$x, y=$y, blue=$blue, red=$red<br>";
-    return array($color,$size,$arrowsize);
-}
-
-// Create data for a simulated pseudo-magnetic radient field
-$datax = array();
-$datay = array();
-$angle = array();
-for($x=1; $x < 10; ++$x ) {
-    for($y=10; $y<100; $y += 10) {
-	$a = -1;
-	if( $x==$polex && $y==$poley ) continue;
-	if( $x==$polex ) {
-	    if( $y > $poley ) $a=90;
-	    else $a = 270;
-	}
-	if( $y==$poley ) {
-	    if( $x  > $polex ) $a=0;
-	    else  $a=180;	    
-	}
-	if( $a == -1 ) {
-	    $d1 = $y-$poley;
-	    $d2 = ($polex-$x)*20;
-	    if( $y < $poley ) $d2 *= -1;
-	    $h = sqrt($d1*$d1+$d2*$d2);
-	    $t = -$d2/$h;
-	    $ac = acos($t);
-	    if( $y < $poley ) $ac += M_PI;
-	    $a = $ac * 180/M_PI;
-	}
-	$datax[] = $x;
-	$datay[] = $y;
-	$angle[] = $a;
-    }
-}
-
-// Setup the graph
-$graph = new Graph(300,200);
-$graph->SetScale("intlin",0,100,0,10);
-$graph->SetMarginColor('lightblue');
-
-
-// ..and titles
-$graph->title->Set("Field plot");
-
-// Setup the field plot
-$fp = new FieldPlot($datay,$datax,$angle);
-
-// Setup formatting callback
-$fp->SetCallback('FldCallback');
-
-// First size argument is length (in pixels of arrow) 
-// Second size argument is roughly size of arrow. Arrow size is specified as
-// an integer in the range [0,9]
-$fp->arrow->SetSize(20,2);
-$fp->arrow->SetColor('navy');
-
-$graph->Add($fp);
-
-// .. and output
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/filledgridex1.php b/#jpgraph/src/Examples/filledgridex1.php
deleted file mode 100644
index 8e863792..00000000
--- a/#jpgraph/src/Examples/filledgridex1.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$datay1 = array(20,15,23,15);
-$datay2 = array(12,9,42,8);
-$datay3 = array(5,17,32,24);
-
-// Setup the graph
-$graph = new Graph(300,200);
-$graph->SetMarginColor('white');
-$graph->SetScale("textlin");
-$graph->SetFrame(false);
-$graph->SetMargin(30,50,30,30);
-
-$graph->title->Set('Filled Y-grid');
-
-
-$graph->yaxis->HideZeroLabel();
-$graph->ygrid->SetFill(true,'#EFEFEF@0.5','#BBCCFF@0.5');
-$graph->xgrid->Show();
-
-$graph->xaxis->SetTickLabels($gDateLocale->GetShortMonth());
-
-// Create the first line
-$p1 = new LinePlot($datay1);
-$p1->SetColor("navy");
-$p1->SetLegend('Line 1');
-$graph->Add($p1);
-
-// Create the second line
-$p2 = new LinePlot($datay2);
-$p2->SetColor("red");
-$p2->SetLegend('Line 2');
-$graph->Add($p2);
-
-// Create the third line
-$p3 = new LinePlot($datay3);
-$p3->SetColor("orange");
-$p3->SetLegend('Line 3');
-$graph->Add($p3);
-
-$graph->legend->SetShadow('gray@0.4',5);
-$graph->legend->SetPos(0.1,0.1,'right','top');
-// Output line
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/filledline01.php b/#jpgraph/src/Examples/filledline01.php
deleted file mode 100644
index 4140b299..00000000
--- a/#jpgraph/src/Examples/filledline01.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$datay = array(1.23,1.9,1.6,3.1,3.4,2.8,2.1,1.9);
-$graph = new Graph(300,200,'auto');
-$graph->img->SetMargin(40,40,40,40);	
-$graph->SetScale("textlin");
-$graph->SetShadow();
-$graph->title->Set("Example of filled line plot");
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-
-$p1 = new LinePlot($datay);
-$p1->SetFillColor("orange");
-$p1->mark->SetType(MARK_FILLEDCIRCLE);
-$p1->mark->SetFillColor("red");
-$p1->mark->SetWidth(4);
-$graph->Add($p1);
-
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/filledlineex01.1.php b/#jpgraph/src/Examples/filledlineex01.1.php
deleted file mode 100644
index 547d207e..00000000
--- a/#jpgraph/src/Examples/filledlineex01.1.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$datay = array(1.23,1.9,1.6,3.1,3.4,2.8,2.1,1.9);
-$graph = new Graph(300,200);
-$graph->SetScale("textlin");
-
-$graph->img->SetMargin(40,40,40,40);	
-$graph->SetShadow();
-$graph->SetGridDepth(DEPTH_FRONT);
-
-$graph->title->Set("Example of filled line plot");
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-
-$p1 = new LinePlot($datay);
-$p1->SetFillColor("orange");
-$p1->mark->SetType(MARK_FILLEDCIRCLE);
-$p1->mark->SetFillColor("red");
-$p1->mark->SetWidth(4);
-$graph->Add($p1);
-
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/filledlineex01.php b/#jpgraph/src/Examples/filledlineex01.php
deleted file mode 100644
index 6ea2c88d..00000000
--- a/#jpgraph/src/Examples/filledlineex01.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$datay = array(1.23, 1.9, 1.6, 3.1, 3.4, 2.8, 2.1, 1.9);
-$graph = new Graph(300,200);
-$graph->SetScale('textlin');
-
-$graph->img->SetMargin(40,40,40,40);
-$graph->SetShadow();
-
-$graph->title->Set("Example of filled line plot");
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-
-$p1 = new LinePlot($datay);
-$p1->SetFillColor("orange");
-$p1->mark->SetType(MARK_FILLEDCIRCLE);
-$p1->mark->SetFillColor("red");
-$p1->mark->SetWidth(4);
-$graph->Add($p1);
-
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/filledlineex02.php b/#jpgraph/src/Examples/filledlineex02.php
deleted file mode 100644
index 1b4db02f..00000000
--- a/#jpgraph/src/Examples/filledlineex02.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$datay = array(1.23,1.9,1.6,3.1,3.4,2.8,2.1,1.9);
-$graph = new Graph(300,200);
-$graph->img->SetMargin(40,40,40,40);	
-$graph->SetScale("textlin");
-$graph->SetShadow();
-$graph->title->Set("Example of filled line plot");
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->subtitle->Set("(Starting from Y=0)");
-
-$graph->yaxis->scale->SetAutoMin(0);
-
-$p1 = new LinePlot($datay);
-$p1->SetFillColor("orange");
-$p1->mark->SetType(MARK_FILLEDCIRCLE);
-$p1->mark->SetFillColor("red");
-$p1->mark->SetWidth(4);
-$graph->Add($p1);
-
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/filledlineex03.php b/#jpgraph/src/Examples/filledlineex03.php
deleted file mode 100644
index 084e655d..00000000
--- a/#jpgraph/src/Examples/filledlineex03.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$datay = array(11,30,20,13,10,'x',16,12,'x',15,4,9);
-
-// Setup the graph
-$graph = new Graph(400,250);
-$graph->SetScale('intlin');
-$graph->title->Set('Filled line with NULL values');
-//Make sure data starts from Zero whatever data we have
-$graph->yscale->SetAutoMin(0);
-
-$p1 = new LinePlot($datay);
-$p1->SetFillColor('lightblue');
-$graph->Add($p1);
-
-// Output line
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/filledstepstyleex1.php b/#jpgraph/src/Examples/filledstepstyleex1.php
deleted file mode 100644
index 75688b5f..00000000
--- a/#jpgraph/src/Examples/filledstepstyleex1.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-// create the graph
-$graph= new Graph(400,250);
-
-$ydata = array(5,10,15,20,15,10);
-
-$graph->SetScale("textlin");
-$graph->SetShadow(true);
-$graph->SetMarginColor("antiquewhite");
-$graph->img->SetMargin(60,40,40,50);
-$graph->img->setTransparent("white");
-$graph->xaxis->SetFont(FF_FONT1);
-$graph->xaxis->setTextTickInterval(1);
-$graph->xaxis->SetTextLabelInterval(1);
-$graph->legend->SetFillColor("antiquewhite");
-$graph->legend->SetShadow(true);
-$graph->legend->SetLayout(LEGEND_VERT);
-$graph->legend->Pos(0.02,0.01);
-$graph->title->Set("Step Styled Example");
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-
-$lineplot = new LinePlot($ydata);
-$lineplot->SetColor("black");
-$lineplot->setFillColor("gray7");
-$lineplot->SetStepStyle();
-$lineplot->SetLegend(" 2002 ");
-
-// add plot to the graph
-$graph->Add($lineplot);
-$graph->ygrid->show(false,false);
-
-// display graph
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/fireplace.jpg b/#jpgraph/src/Examples/fireplace.jpg
deleted file mode 100644
index 8006e3d0..00000000
Binary files a/#jpgraph/src/Examples/fireplace.jpg and /dev/null differ
diff --git a/#jpgraph/src/Examples/fixscale_radarex1.php b/#jpgraph/src/Examples/fixscale_radarex1.php
deleted file mode 100644
index d663d908..00000000
--- a/#jpgraph/src/Examples/fixscale_radarex1.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_radar.php');
-
-$graph = new RadarGraph(300,300);
-$graph->SetScale('lin',0,50);
-$graph->yscale->ticks->Set(25,5);
-$graph->SetColor('white');
-$graph->SetShadow();
-
-$graph->SetCenter(0.5,0.55);
-
-$graph->axis->SetFont(FF_FONT1,FS_BOLD);
-$graph->axis->SetWeight(2);
-
-// Uncomment the following lines to also show grid lines.
-$graph->grid->SetLineStyle('dashed');
-$graph->grid->SetColor('navy@0.5');
-$graph->grid->Show();
-
-$graph->ShowMinorTickMarks();
-
-$graph->title->Set('Quality result');
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->SetTitles(array('One','Two','Three','Four','Five','Sex','Seven','Eight','Nine','Ten'));
-
-$plot = new RadarPlot(array(12,35,20,30,33,15,37));
-$plot->SetLegend('Goal');
-$plot->SetColor('red','lightred');
-$plot->SetFillColor('lightblue');
-$plot->SetLineWeight(2);
-
-$graph->Add($plot);
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/footerex1.php b/#jpgraph/src/Examples/footerex1.php
deleted file mode 100644
index a3d113dc..00000000
--- a/#jpgraph/src/Examples/footerex1.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-require_once ('jpgraph/jpgraph_scatter.php');
-
-$datay1 = array(4,26,15,44);
-
-// Setup the graph
-$graph = new Graph(300,250);
-$graph->SetMarginColor('white');
-$graph->SetScale("textlin");
-$graph->SetFrame(false);
-$graph->SetMargin(30,5,25,50);
-
-// Setup the tab
-$graph->tabtitle->Set(' Year 2003 ' );
-$graph->tabtitle->SetFont(FF_ARIAL,FS_BOLD,13);
-$graph->tabtitle->SetColor('darkred','#E1E1FF');
-
-// Enable X-grid as well
-$graph->xgrid->Show();
-
-// Use months as X-labels
-$graph->xaxis->SetTickLabels($gDateLocale->GetShortMonth());
-
-$graph->footer->left->Set('L. footer');
-$graph->footer->left->SetFont(FF_ARIAL,FS_NORMAL,12); 
-$graph->footer->left->SetColor('darkred');
-$graph->footer->center->Set('C. footer');
-$graph->footer->center->SetFont(FF_ARIAL,FS_BOLD,12);
-$graph->footer->center->SetColor('darkred');
-$graph->footer->right->Set('R. footer');
-$graph->footer->right->SetFont(FF_ARIAL,FS_NORMAL,12); 
-$graph->footer->right->SetColor('darkred');
-
-// Create the plot
-$p1 = new LinePlot($datay1);
-$p1->SetColor("navy");
-
-// Use an image of favourite car as marker
-$p1->mark->SetType(MARK_IMG,'saab_95.jpg',0.5);
-
-// Displayes value on top of marker image
-$p1->value->SetFormat('%d mil');
-$p1->value->Show();
-$p1->value->SetColor('darkred');
-$p1->value->SetFont(FF_ARIAL,FS_BOLD,10);
-// Increase the margin so that the value is printed avove tje
-// img marker
-$p1->value->SetMargin(14);
-
-// Incent the X-scale so the first and last point doesn't
-// fall on the edges
-$p1->SetCenter();
-
-$graph->Add($p1);
-
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/funcex1.php b/#jpgraph/src/Examples/funcex1.php
deleted file mode 100644
index de12e616..00000000
--- a/#jpgraph/src/Examples/funcex1.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-require_once ('jpgraph/jpgraph_utils.inc.php');
-
-$f = new FuncGenerator('cos($x)*$x');
-list($xdata,$ydata) = $f->E(-1.2*M_PI,1.2*M_PI);
-
-$f = new FuncGenerator('$x*$x');
-list($x2data,$y2data) = $f->E(-2,2);
-
-// Setup the basic graph
-$graph = new Graph(450,350);
-$graph->SetScale("linlin");
-$graph->SetShadow();
-$graph->img->SetMargin(50,50,60,40);	
-$graph->SetBox(true,'black',2);	
-$graph->SetMarginColor('white');
-$graph->SetColor('lightyellow');
-
-// ... and titles
-$graph->title->Set('Example of Function plot');
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->subtitle->Set("(With some more advanced axis formatting\nHiding first and last label)");
-$graph->subtitle->SetFont(FF_FONT1,FS_NORMAL);
-$graph->xgrid->Show();
-
-$graph->yaxis->SetPos(0);
-$graph->yaxis->SetWeight(2);
-$graph->yaxis->HideZeroLabel();
-$graph->yaxis->SetFont(FF_FONT1,FS_BOLD);
-$graph->yaxis->SetColor('black','darkblue');
-$graph->yaxis->HideTicks(true,false);
-$graph->yaxis->HideFirstLastLabel();
-
-$graph->xaxis->SetWeight(2);
-$graph->xaxis->HideZeroLabel();
-$graph->xaxis->HideFirstLastLabel();
-$graph->xaxis->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->SetColor('black','darkblue');
-
-$lp1 = new LinePlot($ydata,$xdata);
-$lp1->SetColor('blue');
-$lp1->SetWeight(2);
-
-$lp2 = new LinePlot($y2data,$x2data);
-list($xm,$ym)=$lp2->Max();
-$lp2->SetColor('red');
-$lp2->SetWeight(2);
-
-
-$graph->Add($lp1);
-$graph->Add($lp2);
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/funcex2.php b/#jpgraph/src/Examples/funcex2.php
deleted file mode 100644
index 5715f36a..00000000
--- a/#jpgraph/src/Examples/funcex2.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-require_once ('jpgraph/jpgraph_utils.inc.php');
-
-$f = new FuncGenerator('cos($i)','$i*$i*$i');
-list($xdata,$ydata) = $f->E(-M_PI,M_PI,25);
-
-$graph = new Graph(380,450);
-$graph->SetScale("linlin");
-$graph->SetShadow();
-$graph->img->SetMargin(50,50,60,40);	
-$graph->SetBox(true,'black',2);	
-$graph->SetMarginColor('white');
-$graph->SetColor('lightyellow');
-$graph->SetAxisStyle(AXSTYLE_SIMPLE);
-
-//$graph->xaxis->SetLabelFormat('%.1f');
-
-$graph->title->Set("Function plot with marker");
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->subtitle->Set("(BOXOUT Axis style)");
-$graph->subtitle->SetFont(FF_FONT1,FS_NORMAL);
-
-$lp1 = new LinePlot($ydata,$xdata);
-$lp1->mark->SetType(MARK_FILLEDCIRCLE);
-$lp1->mark->SetFillColor("red");
-$lp1->SetColor("blue");
-
-$graph->Add($lp1);
-$graph->Stroke();
-?>
-
-
diff --git a/#jpgraph/src/Examples/funcex3.php b/#jpgraph/src/Examples/funcex3.php
deleted file mode 100644
index a63456ea..00000000
--- a/#jpgraph/src/Examples/funcex3.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-require_once ('jpgraph/jpgraph_utils.inc.php');
-
-$f = new FuncGenerator('cos($i)','$i*$i*$i');
-list($xdata,$ydata) = $f->E(-M_PI,M_PI,25);
-
-$graph = new Graph(350,430);
-$graph->SetScale("linlin");
-$graph->SetShadow();
-$graph->img->SetMargin(50,50,60,40);	
-$graph->SetBox(true,'black',2);	
-$graph->SetMarginColor('white');
-$graph->SetColor('lightyellow');
-$graph->SetAxisStyle(AXSTYLE_BOXIN);
-$graph->xgrid->Show();
-
-
-//$graph->xaxis->SetLabelFormat('%.0f');
-
-$graph->img->SetMargin(50,50,60,40);		
-
-$graph->title->Set("Function plot");
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->subtitle->Set("(BOXIN Axis style)");
-$graph->subtitle->SetFont(FF_FONT1,FS_NORMAL);
-
-$lp1 = new LinePlot($ydata,$xdata);
-$lp1->SetColor("blue");
-$lp1->SetWeight(2);
-
-$graph->Add($lp1);
-$graph->Stroke();
-?>
-
-
diff --git a/#jpgraph/src/Examples/funcex4.php b/#jpgraph/src/Examples/funcex4.php
deleted file mode 100644
index bcd8b4dc..00000000
--- a/#jpgraph/src/Examples/funcex4.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-require_once ('jpgraph/jpgraph_utils.inc.php');
-
-$f = new FuncGenerator('cos($x)*$x');
-list($xdata,$ydata) = $f->E(-1.2*M_PI,1.2*M_PI);
-
-$f = new FuncGenerator('$x*$x');
-list($x2data,$y2data) = $f->E(-2,2);
-
-// Setup the basic graph
-$graph = new Graph(450,350);
-$graph->SetScale("linlin");
-//$graph->SetShadow();
-$graph->img->SetMargin(5,10,60,9);	
-$graph->SetBox(true,'green',2);	
-$graph->SetMarginColor('black');
-$graph->SetColor('black');
-
-// ... and titles
-$graph->title->Set('Example of Function plot');
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->title->SetColor('lightgreen');
-$graph->subtitle->Set("(With some more advanced axis formatting\nHiding first and last label)");
-$graph->subtitle->SetFont(FF_FONT1,FS_NORMAL);
-$graph->subtitle->SetColor('lightgreen');
-
-$graph->xgrid->Show();
-$graph->xgrid->SetColor('darkgreen');
-$graph->ygrid->SetColor('darkgreen');
-
-$graph->yaxis->SetPos(0);
-$graph->yaxis->SetWeight(2);
-$graph->yaxis->HideZeroLabel();
-$graph->yaxis->SetFont(FF_FONT1,FS_BOLD);
-$graph->yaxis->SetColor('green','green');
-$graph->yaxis->HideTicks(true,true);
-$graph->yaxis->HideFirstLastLabel();
-
-$graph->xaxis->SetWeight(2);
-$graph->xaxis->HideZeroLabel();
-$graph->xaxis->HideFirstLastLabel();
-$graph->xaxis->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->SetColor('green','green');
-
-$lp1 = new LinePlot($ydata,$xdata);
-$lp1->SetColor('yellow');
-$lp1->SetWeight(2);
-
-$lp2 = new LinePlot($y2data,$x2data);
-list($xm,$ym)=$lp2->Max();
-$lp2->SetColor('blue');
-$lp2->SetWeight(2);
-
-
-$graph->Add($lp1);
-$graph->Add($lp2);
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/fusion_example.php b/#jpgraph/src/Examples/fusion_example.php
deleted file mode 100644
index 4e4ae00f..00000000
--- a/#jpgraph/src/Examples/fusion_example.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$theme = isset($_GET['theme']) ? $_GET['theme'] : null;
-$data = array (
-  0 => array (0 => 79, 1 => -25, 2 => -7, 3 => 85, 4 => -26, 5 => -32, ),
-  1 => array (0 => 76, 1 => 51, 2 => 86, 3 => 12, 4 => -7, 5 => 94, ),
-  2 => array (0 => 49, 1 => 38, 2 => 7, 3 => -40, 4 => 9, 5 => -7, ),
-  3 => array ( 0 => 69, 1 => 96, 2 => 49, 3 => 7, 4 => 92, 5 => -38, ),
-  4 => array ( 0 => 68, 1 => 16, 2 => 82, 3 => -49, 4 => 50, 5 => 7, ),
-  5 => array ( 0 => -37, 1 => 28, 2 => 32, 3 => 6, 4 => 13, 5 => 57, ),
-  6 => array ( 0 => 24, 1 => -11, 2 => 7, 3 => 10, 4 => 51, 5 => 51, ),
-  7 => array ( 0 => 3, 1 => -1, 2 => -12, 3 => 61, 4 => 10, 5 => 47, ),
-  8 => array ( 0 => -47, 1 => -21, 2 => 43, 3 => 53, 4 => 36, 5 => 34, ),
-);
-
-
-// Create the graph. These two calls are always required
-$graph = new Graph(400,300);    
-
-$graph->SetScale("textlin");
-if ($theme) {
-  $graph->SetTheme(new $theme());
-}
-$theme_class = new FusionTheme;
-$graph->SetTheme($theme_class);
-
-$plot = array();
-// Create the bar plots
-for ($i = 0; $i < 4; $i++) {
-  $plot[$i] = new BarPlot($data[$i]);
-  $plot[$i]->SetLegend('plot'.($i+1));
-}
-//$acc1 = new AccBarPlot(array($plot[0], $plot[1]));
-//$acc1->value->Show();
-$gbplot = new GroupBarPlot(array($plot[2], $plot[1] ));
-
-for ($i = 4; $i < 8; $i++) {
-  $plot[$i] = new LinePlot($data[$i]);
-  $plot[$i]->SetLegend('plot'.$i);
-  $plot[$i]->value->Show();
-}
-
-$graph->Add($gbplot);
-$graph->Add($plot[4]);
-
-$title = "FusionTheme Example";
-$title = mb_convert_encoding($title,'UTF-8');
-$graph->title->Set($title);
-$graph->xaxis->title->Set("X-title");
-$graph->yaxis->title->Set("Y-title");
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/gantt_samerowex1.php b/#jpgraph/src/Examples/gantt_samerowex1.php
deleted file mode 100644
index 6c59cebd..00000000
--- a/#jpgraph/src/Examples/gantt_samerowex1.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_gantt.php');
-
-$graph = new GanttGraph();
-$graph->SetShadow();
-
-// Add title and subtitle
-$graph->title->Set("Activities on same row");
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,12);
-
-// Show day, week and month scale
-$graph->ShowHeaders(GANTT_HDAY | GANTT_HWEEK | GANTT_HMONTH);
-
-// Instead of week number show the date for the first day in the week
-// on the week scale
-$graph->scale->week->SetStyle(WEEKSTYLE_FIRSTDAY);
-
-// Make the week scale font smaller than the default
-$graph->scale->week->SetFont(FF_FONT0);
-
-// Use the short name of the month together with a 2 digit year
-// on the month scale
-$graph->scale->month->SetStyle(MONTHSTYLE_SHORTNAMEYEAR4);
-$graph->scale->month->SetFontColor("white");
-$graph->scale->month->SetBackgroundColor("blue");
-
-// 0 % vertical label margin
-$graph->SetLabelVMarginFactor(1); // 1=default value
-
-// Format the bar for the first activity
-// ($row,$title,$startdate,$enddate)
-$activity1 = new GanttBar(0,"Activity 1","2001-12-21","2001-12-26","");
-
-// Yellow diagonal line pattern on a red background
-$activity1->SetPattern(BAND_RDIAG,"yellow");
-$activity1->SetFillColor("red");
-
-// Set absolute height of activity
-$activity1->SetHeight(16);
-
-// Format the bar for the second activity
-// ($row,$title,$startdate,$enddate)
-$activity2 = new GanttBar(0,"","2001-12-31","2002-01-2","[BO]");
-
-// ADjust font for caption
-$activity2->caption->SetFont(FF_ARIAL,FS_BOLD);
-$activity2->caption->SetColor("darkred");
-
-// Yellow diagonal line pattern on a red background
-$activity2->SetPattern(BAND_RDIAG,"yellow");
-$activity2->SetFillColor("red");
-
-// Set absolute height of activity
-$activity2->SetHeight(16);
-
-// Finally add the bar to the graph
-$graph->Add($activity1);
-$graph->Add($activity2);
-
-// ... and display it
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/gantt_samerowex2.php b/#jpgraph/src/Examples/gantt_samerowex2.php
deleted file mode 100644
index b3e2702a..00000000
--- a/#jpgraph/src/Examples/gantt_samerowex2.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_gantt.php');
-
-$graph = new GanttGraph();
-$graph->SetShadow();
-
-// Add title and subtitle
-$graph->title->Set("Activities on same row");
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,12);
-$graph->subtitle->Set('Using break style');
-
-// Show day, week and month scale
-$graph->ShowHeaders(GANTT_HDAY | GANTT_HWEEK | GANTT_HMONTH);
-
-// Instead of week number show the date for the first day in the week
-// on the week scale
-$graph->scale->week->SetStyle(WEEKSTYLE_FIRSTDAY);
-
-// Make the week scale font smaller than the default
-$graph->scale->week->SetFont(FF_FONT0);
-
-// Use the short name of the month together with a 2 digit year
-// on the month scale
-$graph->scale->month->SetStyle(MONTHSTYLE_SHORTNAMEYEAR4);
-$graph->scale->month->SetFontColor("white");
-$graph->scale->month->SetBackgroundColor("blue");
-
-// 0 % vertical label margin
-$graph->SetLabelVMarginFactor(1); // 1=default value
-
-// Format the bar for the first activity
-// ($row,$title,$startdate,$enddate)
-$activity1 = new GanttBar(0,"Activity 1","2001-12-21","2001-12-26","");
-
-// Yellow diagonal line pattern on a red background
-$activity1->SetPattern(BAND_RDIAG,"yellow");
-$activity1->SetFillColor("red");
-
-// Format the bar for the first activity
-// ($row,$title,$startdate,$enddate)
-$break1 = new GanttBar(0,'',"2001-12-27","2001-12-30","");
-$break1->SetBreakStyle(true,'dotted',2);
-$break1->SetColor('red');
-$graph->Add($break1);
-
-// Format the bar for the second activity
-// ($row,$title,$startdate,$enddate)
-$activity2 = new GanttBar(0,"","2001-12-31","2002-01-2","[BO]");
-
-// ADjust font for caption
-$activity2->caption->SetFont(FF_ARIAL,FS_BOLD);
-$activity2->caption->SetColor("darkred");
-
-// Yellow diagonal line pattern on a red background
-$activity2->SetPattern(BAND_RDIAG,"yellow");
-$activity2->SetFillColor("red");
-
-// Finally add the bar to the graph
-$graph->Add($activity1);
-$graph->Add($activity2);
-
-// ... and display it
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/gantt_textex1.php b/#jpgraph/src/Examples/gantt_textex1.php
deleted file mode 100644
index dae1d56e..00000000
--- a/#jpgraph/src/Examples/gantt_textex1.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_gantt.php');
-require_once ('jpgraph/jpgraph_flags.php');
-
-$graph = new GanttGraph(0,0);
-$graph->SetBox();
-$graph->SetShadow();
-
-// Add title and subtitle
-$graph->title->Set("Example with added texts");
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,12);
-
-// Show day, week and month scale
-$graph->ShowHeaders(GANTT_HDAY | GANTT_HWEEK | GANTT_HMONTH);
-
-// Set table title
-$graph->scale->tableTitle->Set("(Rev: 1.22)");
-$graph->scale->tableTitle->SetFont(FF_FONT1,FS_BOLD);
-$graph->scale->SetTableTitleBackground("silver");
-
-// Modify the appearance of the dividing lines
-$graph->scale->divider->SetWeight(3);
-$graph->scale->divider->SetColor("navy");
-$graph->scale->dividerh->SetWeight(3);
-$graph->scale->dividerh->SetColor("navy");
-
-// Use the short name of the month together with a 2 digit year
-// on the month scale
-$graph->scale->month->SetStyle(MONTHSTYLE_SHORTNAMEYEAR2);
-$graph->scale->month->SetFontColor("white");
-$graph->scale->month->SetBackgroundColor("blue");
-
-// 0 % vertical label margin
-$graph->SetLabelVMarginFactor(1);
-
-// Format the bar for the first activity
-// ($row,$title,$startdate,$enddate)
-$activity = new GanttBar(0,"Project","2001-12-21","2002-01-07","[50%]");
-
-// Yellow diagonal line pattern on a red background
-$activity->SetPattern(BAND_RDIAG,"yellow");
-$activity->SetFillColor("red");
-
-// Set absolute height
-$activity->SetHeight(10);
-
-// Specify progress to 60%
-$activity->progress->Set(0.6);
-$activity->progress->SetPattern(BAND_HVCROSS,"blue");
-
-// Format the bar for the second activity
-// ($row,$title,$startdate,$enddate)
-$activity2 = new GanttBar(1,"Project","2001-12-21","2001-12-27","[30%]");
-
-// Yellow diagonal line pattern on a red background
-$activity2->SetPattern(BAND_RDIAG,"yellow");
-$activity2->SetFillColor("red");
-
-// Set absolute height
-$activity2->SetHeight(10);
-
-// Specify progress to 30%
-$activity2->progress->Set(0.3);
-$activity2->progress->SetPattern(BAND_HVCROSS,"blue");
-
-// Finally add the bar to the graph
-$graph->Add($activity);
-$graph->Add($activity2);
-
-// Add text to top left corner of graph
-$txt1 = new Text();
-$txt1->SetPos(5,2);
-$txt1->Set("Note:\nEstimate done w148");
-$txt1->SetFont(FF_ARIAL,FS_BOLD,12);
-$txt1->SetColor('darkred');
-$graph->Add($txt1);
-
-// Add text to the top bar
-$txt2 = new Text();
-$txt2->SetScalePos("2002-01-01",1);
-$txt2->SetFont(FF_ARIAL,FS_BOLD,12);
-$txt2->SetAlign('left','center');
-$txt2->Set("Remember this!");
-$txt2->SetBox('yellow');
-$graph->Add($txt2);
-
-
-// Add a vertical line
-$vline = new GanttVLine("2001-12-24","Phase 1");
-$vline->SetDayOffset(0.5);
-//$graph->Add($vline);
-
-// ... and display it
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/ganttcolumnfontsex01.php b/#jpgraph/src/Examples/ganttcolumnfontsex01.php
deleted file mode 100644
index a371f875..00000000
--- a/#jpgraph/src/Examples/ganttcolumnfontsex01.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-
-// Gantt column font array example
-
-require_once ('../jpgraph.php');
-require_once ('../jpgraph_gantt.php');
-
-// Setup a basic Gantt graph
-$graph = new GanttGraph();
-$graph->SetMarginColor('gray:1.7');
-$graph->SetColor('white');
-
-// Setup the graph title and title font
-$graph->title->Set("Example of column fonts");
-$graph->title->SetFont(FF_VERDANA,FS_BOLD,14);
-
-// Show three headers
-$graph->ShowHeaders(GANTT_HDAY | GANTT_HMONTH| GANTT_HYEAR);
-
-// Set the column headers and font
-$graph->scale->actinfo->SetColTitles( array('Name','Start','End'),array(100));
-$graph->scale->actinfo->SetFont(FF_ARIAL,FS_BOLD,11);
-
-// Some "dummy" data to be dsiplayed
-$data = array(
-    array(0,'Group 1', '2001-11-27','2001-12-05'),
-    array(1,'  Activity 1', '2001-11-27','2001-11-29'),
-    array(2,'  Activity 2', '2001-11-28','2001-12-05'),
-    array(3,'Group 2', '2001-11-29','2001-12-10'),
-    array(4,'  Activity 1', '2001-11-29','2001-12-03'),
-    array(5,'  Activity 2', '2001-12-01','2001-12-10'),
-
-);
-
-// Format and add the Gantt bars to the chart
-$n = count($data);
-for($i=0; $i < $n; ++$i) {
-    if( $i === 0 || $i === 3 ) {
-        // Format the group bars
-        $bar = new GanttBar($data[$i][0],array($data[$i][1],$data[$i][2],$data[$i][3]),$data[$i][2],$data[$i][3],'',0.35);
-
-        // For each group make the name bold but keep the dates as the default font
-        $bar->title->SetColumnFonts(array(array(FF_ARIAL,FS_BOLD,11)));
-
-        // Add group markers
-        $bar->leftMark->SetType( MARK_LEFTTRIANGLE );
-        $bar->leftMark->Show();
-        $bar->rightMark->SetType( MARK_RIGHTTRIANGLE );
-        $bar->rightMark->Show();
-        $bar->SetFillColor('black');
-        $bar->SetPattern(BAND_SOLID,'black');
-    }
-    else {
-        // Format the activity bars
-        $bar = new GanttBar($data[$i][0],array($data[$i][1],$data[$i][2],$data[$i][3]),$data[$i][2],$data[$i][3],'',0.45);
-        $bar->SetPattern(BAND_RDIAG,'black');
-        $bar->SetFillColor('orange');
-    }
-    // Default font
-    $bar->title->SetFont(FF_ARIAL,FS_NORMAL,10);
-	$graph->Add($bar);
-}
-
-// Send back the graph to the client
-$graph->Stroke();
-?>
-
-
diff --git a/#jpgraph/src/Examples/ganttconstrainex0.php b/#jpgraph/src/Examples/ganttconstrainex0.php
deleted file mode 100644
index 8f5b72a1..00000000
--- a/#jpgraph/src/Examples/ganttconstrainex0.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// Gantt example
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_gantt.php');
-
-// 
-// The data for the graphs
-//
-$data = array(
-  array(0,ACTYPE_GROUP,    "Phase 1",        "2001-10-26","2001-11-23",''),
-  array(1,ACTYPE_NORMAL,   "  Label 2",      "2001-10-26","2001-11-16",''),
-  array(2,ACTYPE_NORMAL,   "  Label 3",      "2001-11-20","2001-11-22",''),
-  array(3,ACTYPE_MILESTONE,"  Phase 1 Done", "2001-11-23",'M2') );
-
-// The constrains between the activities
-//$constrains = array(array(1,2,CONSTRAIN_ENDSTART),
-//		    array(2,3,CONSTRAIN_STARTSTART));
-$constrains = array();
-
-$progress = array(array(1,0.4));
-
-// Create the basic graph
-$graph = new GanttGraph();
-$graph->title->Set("Example with grouping and constrains");
-
-// Setup scale
-$graph->ShowHeaders(GANTT_HYEAR | GANTT_HMONTH | GANTT_HDAY | GANTT_HWEEK);
-$graph->scale->week->SetStyle(WEEKSTYLE_FIRSTDAYWNBR);
-
-// Add the specified activities
-$graph->CreateSimple($data,$constrains,$progress);
-
-// .. and stroke the graph
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/ganttconstrainex1.php b/#jpgraph/src/Examples/ganttconstrainex1.php
deleted file mode 100644
index 7e9a3c1f..00000000
--- a/#jpgraph/src/Examples/ganttconstrainex1.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// Gantt example
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_gantt.php');
-
-//
-// The data for the graphs
-//
-$data = array(
-  array(0,ACTYPE_GROUP,    "Phase 1",        "2001-10-26","2001-11-23",''),
-  array(1,ACTYPE_NORMAL,   "  Label 2",      "2001-10-26","2001-11-16",''),
-  array(2,ACTYPE_NORMAL,   "  Label 3",      "2001-11-20","2001-11-22",''),
-  array(3,ACTYPE_NORMAL,   "  Label 4",      "2001-11-20","2001-11-22",''),
-  array(4,ACTYPE_MILESTONE,"  Phase 1 Done", "2001-11-23",'M2') );
-
-// The constrains between the activities
-$constrains = array(array(1,2,CONSTRAIN_ENDEND),
-		    array(2,3,CONSTRAIN_STARTEND),
-		    array(3,4,CONSTRAIN_ENDSTART),
-		    );
-
-$progress = array(array(1,0.4));
-
-// Create the basic graph
-$graph = new GanttGraph();
-$graph->title->Set("Example with grouping and constrains");
-
-// Setup scale
-$graph->ShowHeaders(GANTT_HYEAR | GANTT_HMONTH | GANTT_HDAY | GANTT_HWEEK);
-$graph->scale->week->SetStyle(WEEKSTYLE_FIRSTDAYWNBR);
-
-// Add the specified activities
-$graph->CreateSimple($data,$constrains,$progress);
-
-// .. and stroke the graph
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/ganttconstrainex2.php b/#jpgraph/src/Examples/ganttconstrainex2.php
deleted file mode 100644
index 1e6bbbab..00000000
--- a/#jpgraph/src/Examples/ganttconstrainex2.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// Gantt example
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_gantt.php');
-
-
-// 
-// The data for the graphs
-//
-$data = array(
-    array(0,ACTYPE_GROUP,    "Phase 1",        "2001-10-26","2001-11-23",''),
-    array(1,ACTYPE_NORMAL,   "  Label 2",      "2001-11-01","2001-11-20",''),
-    array(2,ACTYPE_NORMAL,   "  Label 3",      "2001-10-26","2001-11-03",''),
-    array(3,ACTYPE_MILESTONE,"  Phase 1 Done", "2001-11-23",'M2') );
-
-// The constrains between the activities
-$constrains = array(array(2,1,CONSTRAIN_ENDSTART),
-		    array(1,3,CONSTRAIN_STARTSTART));
-
-$progress = array(array(1,0.4));
-
-// Create the basic graph
-$graph = new GanttGraph();
-$graph->title->Set("Example with grouping and constrains");
-//$graph->SetFrame(false);
-
-// Setup scale
-$graph->ShowHeaders(GANTT_HYEAR | GANTT_HMONTH | GANTT_HDAY | GANTT_HWEEK);
-$graph->scale->week->SetStyle(WEEKSTYLE_FIRSTDAYWNBR);
-
-// Add the specified activities
-$graph->CreateSimple($data,$constrains,$progress);
-
-// .. and stroke the graph
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/ganttcsimex01.php b/#jpgraph/src/Examples/ganttcsimex01.php
deleted file mode 100644
index 997d3473..00000000
--- a/#jpgraph/src/Examples/ganttcsimex01.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// Gantt example to create CSIM
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_gantt.php');
-
-$bar1 = new GanttBar(0,"Activity 1","2001-12-21","2002-01-20");
-$bar1->SetCSIMTarget('#','Go back 1');
-$bar1->title->SetCSIMTarget('#','Go back 1 (title)');
-$bar2 = new GanttBar(1,"Activity 2","2002-01-03","2002-01-25");
-$bar2->SetCSIMTarget('#','Go back 2');
-$bar2->title->SetCSIMTarget('#','Go back 2 (title)');
-
-$graph = new GanttGraph(500);
-$graph->title->Set("Example with image map");
-$graph->ShowHeaders(GANTT_HYEAR | GANTT_HMONTH | GANTT_HDAY | GANTT_HWEEK);
-$graph->scale->week->SetStyle(WEEKSTYLE_FIRSTDAY);
-$graph->scale->week->SetFont(FF_FONT1);
-
-$graph->Add(array($bar1,$bar2));
-
-// And stroke
-$graph->StrokeCSIM();
-
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/ganttcsimex02.php b/#jpgraph/src/Examples/ganttcsimex02.php
deleted file mode 100644
index b9dd4c66..00000000
--- a/#jpgraph/src/Examples/ganttcsimex02.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// Gantt example to create CSIM using CreateSimple()
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_gantt.php');
-
-$data = array(
-  array(0,ACTYPE_GROUP,    "Phase 1",        "2001-10-26","2001-11-23",'',
-	'#1','Go home'),
-  array(1,ACTYPE_NORMAL,   "  Label 2",      "2001-10-26","2001-11-16",'ab,cd',
-	'#2','Go home'),
-  array(2,ACTYPE_NORMAL,   "  Label 3",      "2001-11-20","2001-11-22",'ek',
-	'#3','Go home'),
-  array(3,ACTYPE_MILESTONE,"  Phase 1 Done", "2001-11-23",'M2',
-	'#4','Go home') );
-
-// The constrains between the activities
-$constrains = array(array(1,2,CONSTRAIN_ENDSTART),
-		    array(2,3,CONSTRAIN_STARTSTART));
-
-$progress = array(array(1,0.4));
-
-$graph = new GanttGraph(500);
-$graph->title->Set("Example with image map");
-$graph->ShowHeaders(GANTT_HYEAR | GANTT_HMONTH | GANTT_HDAY | GANTT_HWEEK);
-$graph->scale->week->SetStyle(WEEKSTYLE_FIRSTDAY);
-$graph->scale->week->SetFont(FF_FONT1);
-
-$graph->CreateSimple($data,$constrains,$progress);
-
-// Add the specified activities
-//SetupSimpleGantt($graph,$data,$constrains,$progress);
-
-// And stroke
-$graph->StrokeCSIM();
-
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/ganttex00.php b/#jpgraph/src/Examples/ganttex00.php
deleted file mode 100644
index 618b7f9d..00000000
--- a/#jpgraph/src/Examples/ganttex00.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_gantt.php');
-
-// A new graph with automatic size
-$graph = new GanttGraph();
-
-//  A new activity on row '0'
-$activity = new GanttBar(0,"Activity 1","2001-12-21","2002-01-19");
-$graph->Add($activity);
-
-// Display the Gantt chart
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/ganttex01.php b/#jpgraph/src/Examples/ganttex01.php
deleted file mode 100644
index b3b9d535..00000000
--- a/#jpgraph/src/Examples/ganttex01.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_gantt.php');
-
-$graph = new GanttGraph();
-$graph->SetShadow();
-
-// Add title and subtitle
-$graph->title->Set('A main title');
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,12);
-$graph->subtitle->Set('(Draft version)');
-
-// Show day, week and month scale
-$graph->ShowHeaders(GANTT_HDAY | GANTT_HWEEK | GANTT_HMONTH);
-
-// Instead of week number show the date for the first day in the week
-// on the week scale
-$graph->scale->week->SetStyle(WEEKSTYLE_FIRSTDAY);
-
-// Make the week scale font smaller than the default
-$graph->scale->week->SetFont(FF_FONT0);
-
-// Use the short name of the month together with a 2 digit year
-// on the month scale
-$graph->scale->month->SetStyle(MONTHSTYLE_SHORTNAMEYEAR2);
-
-// Format the bar for the first activity
-// ($row,$title,$startdate,$enddate)
-$activity = new GanttBar(0,'Activity 1','2001-12-21','2002-01-18');
-
-// Yellow diagonal line pattern on a red background
-$activity->SetPattern(BAND_LDIAG,'yellow');
-$activity->SetFillColor('red');
-
-// Finally add the bar to the graph
-$graph->Add($activity);
-
-// ... and display it
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/ganttex02.php b/#jpgraph/src/Examples/ganttex02.php
deleted file mode 100644
index 2ac42ed7..00000000
--- a/#jpgraph/src/Examples/ganttex02.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_gantt.php');
-
-$graph = new GanttGraph(0,0);
-$graph->SetShadow();
-
-// Add title and subtitle
-$graph->title->Set("Main title");
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,12);
-
-// Show day, week and month scale
-//$graph->ShowHeaders(GANTT_HDAY | GANTT_HWEEK | GANTT_HMONTH);
-$graph->ShowHeaders(GANTT_HWEEK );
-
-// Instead of week number show the date for the first day in the week
-// on the week scale
-$graph->scale->week->SetStyle(WEEKSTYLE_WNBR);
-
-// Make the week scale font smaller than the default
-$graph->scale->week->SetFont(FF_FONT0);
-
-// Use the short name of the month together with a 2 digit year
-// on the month scale
-$graph->scale->month->SetStyle(MONTHSTYLE_SHORTNAMEYEAR4);
-$graph->scale->month->SetFontColor("white");
-$graph->scale->month->SetBackgroundColor("blue");
-
-// Format the bar for the first activity
-// ($row,$title,$startdate,$enddate)
-$activity = new GanttBar(0,"Project","2001-12-21","2002-02-20");
-
-// Yellow diagonal line pattern on a red background
-$activity->SetPattern(BAND_RDIAG,"yellow");
-$activity->SetFillColor("red");
-
-// Finally add the bar to the graph
-$graph->Add($activity);
-
-// ... and display it
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/ganttex03.php b/#jpgraph/src/Examples/ganttex03.php
deleted file mode 100644
index de528a53..00000000
--- a/#jpgraph/src/Examples/ganttex03.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_gantt.php');
-
-$graph = new GanttGraph(0,0);
-$graph->SetShadow();
-
-// Add title and subtitle
-$graph->title->Set("A nice main title");
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,12);
-$graph->subtitle->Set("(Draft version)");
-
-// Show day, week and month scale
-$graph->ShowHeaders(GANTT_HDAY | GANTT_HWEEK | GANTT_HMONTH);
-
-// Instead of week number show the date for the first day in the week
-// on the week scale
-$graph->scale->week->SetStyle(WEEKSTYLE_FIRSTDAY);
-
-// Make the week scale font smaller than the default
-$graph->scale->week->SetFont(FF_FONT0);
-
-// Use the short name of the month together with a 2 digit year
-// on the month scale
-$graph->scale->month->SetStyle(MONTHSTYLE_SHORTNAMEYEAR4);
-$graph->scale->month->SetFontColor("white");
-$graph->scale->month->SetBackgroundColor("blue");
-
-// Format the bar for the first activity
-// ($row,$title,$startdate,$enddate)
-$activity = new GanttBar(7,"Project","2001-12-21","2002-02-20");
-
-// Yellow diagonal line pattern on a red background
-$activity->SetPattern(BAND_RDIAG,"yellow");
-$activity->SetFillColor("red");
-
-// Finally add the bar to the graph
-$graph->Add($activity);
-
-// ... and display it
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/ganttex04.php b/#jpgraph/src/Examples/ganttex04.php
deleted file mode 100644
index c9ea4cb9..00000000
--- a/#jpgraph/src/Examples/ganttex04.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_gantt.php');
-
-$graph = new GanttGraph();
-$graph->SetShadow();
-
-// Add title and subtitle
-$graph->title->Set("A nice main title");
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,12);
-$graph->subtitle->Set("(Draft version)");
-
-// Show day, week and month scale
-$graph->ShowHeaders(GANTT_HDAY | GANTT_HWEEK | GANTT_HMONTH);
-
-// Instead of week number show the date for the first day in the week
-// on the week scale
-$graph->scale->week->SetStyle(WEEKSTYLE_FIRSTDAY);
-
-// Make the week scale font smaller than the default
-$graph->scale->week->SetFont(FF_FONT0);
-
-// Use the short name of the month together with a 2 digit year
-// on the month scale
-$graph->scale->month->SetStyle(MONTHSTYLE_SHORTNAMEYEAR4);
-$graph->scale->month->SetFontColor("white");
-$graph->scale->month->SetBackgroundColor("blue");
-
-// Format the bar for the first activity
-// ($row,$title,$startdate,$enddate)
-$activity = new GanttBar(0,"Project","2001-12-21","2002-01-20");
-
-// Yellow diagonal line pattern on a red background
-$activity->SetPattern(BAND_RDIAG,"yellow");
-$activity->SetFillColor("red");
-
-// Finally add the bar to the graph
-$graph->Add($activity);
-
-// Create a miletone
-$milestone = new MileStone(2,"Milestone",'2002-01-09','MS5');
-$milestone->caption->SetFont(FF_ARIAL,FS_BOLD,12);
-$graph->Add($milestone);
-
-// ... and display it
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/ganttex05.php b/#jpgraph/src/Examples/ganttex05.php
deleted file mode 100644
index 6c0ef36c..00000000
--- a/#jpgraph/src/Examples/ganttex05.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_gantt.php');
-
-$graph = new GanttGraph();
-$graph->SetShadow();
-
-// Add title and subtitle
-$graph->title->Set("A nice main title");
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,12);
-$graph->subtitle->Set("(Draft version)");
-
-// Show day, week and month scale
-$graph->ShowHeaders(GANTT_HDAY | GANTT_HWEEK | GANTT_HMONTH);
-
-// Instead of week number show the date for the first day in the week
-// on the week scale
-$graph->scale->week->SetStyle(WEEKSTYLE_FIRSTDAY);
-
-// Make the week scale font smaller than the default
-$graph->scale->week->SetFont(FF_FONT0);
-
-// Use the short name of the month together with a 2 digit year
-// on the month scale
-$graph->scale->month->SetStyle(MONTHSTYLE_SHORTNAMEYEAR4);
-$graph->scale->month->SetFontColor("white");
-$graph->scale->month->SetBackgroundColor("blue");
-
-// Format the bar for the first activity
-// ($row,$title,$startdate,$enddate)
-$activity = new GanttBar(0,"Project","2001-12-21","2002-02-20");
-
-// Yellow diagonal line pattern on a red background
-$activity->SetPattern(BAND_RDIAG,"yellow");
-$activity->SetFillColor("red");
-
-// Finally add the bar to the graph
-$graph->Add($activity);
-
-// Create a miletone
-$milestone = new MileStone(2,"Milestone","2002-01-15","2002-01-15");
-$milestone->title->SetColor("black");
-$milestone->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->Add($milestone);
-
-// ... and display it
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/ganttex06.php b/#jpgraph/src/Examples/ganttex06.php
deleted file mode 100644
index 8cf4dbb3..00000000
--- a/#jpgraph/src/Examples/ganttex06.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_gantt.php');
-
-$graph = new GanttGraph();
-$graph->SetShadow();
-
-// Add title and subtitle
-$graph->title->Set("A nice main title");
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,12);
-$graph->subtitle->Set("(Draft version)");
-
-// Show day, week and month scale
-$graph->ShowHeaders(GANTT_HDAY | GANTT_HWEEK | GANTT_HMONTH);
-
-// Instead of week number show the date for the first day in the week
-// on the week scale
-$graph->scale->week->SetStyle(WEEKSTYLE_FIRSTDAY);
-
-// Make the week scale font smaller than the default
-$graph->scale->week->SetFont(FF_FONT0);
-
-// Use the short name of the month together with a 2 digit year
-// on the month scale
-$graph->scale->month->SetStyle(MONTHSTYLE_SHORTNAMEYEAR4);
-$graph->scale->month->SetFontColor("white");
-$graph->scale->month->SetBackgroundColor("blue");
-
-// Format the bar for the first activity
-// ($row,$title,$startdate,$enddate)
-$activity = new GanttBar(0,"Project","2001-12-21","2002-02-20");
-
-// Yellow diagonal line pattern on a red background
-$activity->SetPattern(BAND_RDIAG,"yellow");
-$activity->SetFillColor("red");
-
-// Finally add the bar to the graph
-$graph->Add($activity);
-
-// Create a miletone
-$milestone = new MileStone(2,"Milestone","2002-01-15","2002-01-15");
-$milestone->title->SetColor("black");
-$milestone->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->Add($milestone);
-
-// Add a vertical line
-$vline = new GanttVLine("2001-12-24","Phase 1");
-$graph->Add($vline);
-
-// ... and display it
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/ganttex07.php b/#jpgraph/src/Examples/ganttex07.php
deleted file mode 100644
index b1eb27aa..00000000
--- a/#jpgraph/src/Examples/ganttex07.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_gantt.php');
-
-$graph = new GanttGraph();
-$graph->SetShadow();
-
-// Add title and subtitle
-$graph->title->Set("A nice main title");
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,12);
-$graph->subtitle->Set("(Draft version)");
-
-// Show day, week and month scale
-$graph->ShowHeaders(GANTT_HDAY | GANTT_HWEEK | GANTT_HMONTH);
-
-// Instead of week number show the date for the first day in the week
-// on the week scale
-$graph->scale->week->SetStyle(WEEKSTYLE_FIRSTDAY);
-
-// Make the week scale font smaller than the default
-$graph->scale->week->SetFont(FF_FONT0);
-
-// Use the short name of the month together with a 2 digit year
-// on the month scale
-$graph->scale->month->SetStyle(MONTHSTYLE_SHORTNAMEYEAR4);
-$graph->scale->month->SetFontColor("white");
-$graph->scale->month->SetBackgroundColor("blue");
-
-// Format the bar for the first activity
-// ($row,$title,$startdate,$enddate)
-$activity = new GanttBar(0,"Project","2001-12-21","2002-02-20");
-
-// Yellow diagonal line pattern on a red background
-$activity->SetPattern(BAND_RDIAG,"yellow");
-$activity->SetFillColor("red");
-
-// Finally add the bar to the graph
-$graph->Add($activity);
-
-// Create a miletone
-$milestone = new MileStone(2,"Milestone","2002-01-15","2002-01-15");
-$milestone->title->SetColor("black");
-$milestone->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->Add($milestone);
-
-// Add a vertical line
-$vline = new GanttVLine("2001-12-24","Phase 1");
-$vline->SetDayOffset(0.5);
-$graph->Add($vline);
-
-// ... and display it
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/ganttex08.php b/#jpgraph/src/Examples/ganttex08.php
deleted file mode 100644
index 62d8947c..00000000
--- a/#jpgraph/src/Examples/ganttex08.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_gantt.php');
-
-$graph = new GanttGraph();
-$graph->SetShadow();
-
-// Add title and subtitle
-$graph->title->Set("A nice main title");
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,12);
-$graph->subtitle->Set("(Draft version)");
-
-// Show day, week and month scale
-$graph->ShowHeaders(GANTT_HDAY | GANTT_HWEEK | GANTT_HMONTH);
-
-// Instead of week number show the date for the first day in the week
-// on the week scale
-$graph->scale->week->SetStyle(WEEKSTYLE_FIRSTDAY);
-
-// Make the week scale font smaller than the default
-$graph->scale->week->SetFont(FF_FONT0);
-
-// Use the short name of the month together with a 2 digit year
-// on the month scale
-$graph->scale->month->SetStyle(MONTHSTYLE_SHORTNAMEYEAR4);
-$graph->scale->month->SetFontColor("white");
-$graph->scale->month->SetBackgroundColor("blue");
-
-// Format the bar for the first activity
-// ($row,$title,$startdate,$enddate)
-$activity = new GanttBar(0,"Project","2001-12-21","2002-01-15");
-
-// Yellow diagonal line pattern on a red background
-$activity->SetPattern(BAND_RDIAG,"yellow");
-$activity->SetFillColor("red");
-
-// Add a right marker
-$activity->rightMark->Show();
-$activity->rightMark->SetType(MARK_FILLEDCIRCLE);
-$activity->rightMark->SetWidth(13);
-$activity->rightMark->SetColor("red");
-$activity->rightMark->SetFillColor("red");
-$activity->rightMark->title->Set("M5");
-$activity->rightMark->title->SetFont(FF_ARIAL,FS_BOLD,12);
-$activity->rightMark->title->SetColor("white");
-
-// Finally add the bar to the graph
-$graph->Add($activity);
-
-// Create a miletone
-$milestone = new MileStone(2,"Milestone","2002-01-10","2002-01-10");
-$milestone->title->SetColor("black");
-$milestone->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->Add($milestone);
-
-// Add a vertical line
-$vline = new GanttVLine("2001-12-24","Phase 1");
-$vline->SetDayOffset(0.5);
-$graph->Add($vline);
-
-// ... and display it
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/ganttex09.php b/#jpgraph/src/Examples/ganttex09.php
deleted file mode 100644
index f5fff1a1..00000000
--- a/#jpgraph/src/Examples/ganttex09.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_gantt.php');
-
-$graph = new GanttGraph();
-$graph->SetShadow();
-
-// Add title and subtitle
-$graph->title->Set("A nice main title");
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,12);
-$graph->subtitle->Set("(Draft version)");
-
-// Show day, week and month scale
-$graph->ShowHeaders(GANTT_HDAY | GANTT_HWEEK | GANTT_HMONTH);
-
-// Instead of week number show the date for the first day in the week
-// on the week scale
-$graph->scale->week->SetStyle(WEEKSTYLE_FIRSTDAY);
-
-// Make the week scale font smaller than the default
-$graph->scale->week->SetFont(FF_FONT0);
-
-// Use the short name of the month together with a 2 digit year
-// on the month scale
-$graph->scale->month->SetStyle(MONTHSTYLE_SHORTNAMEYEAR4);
-$graph->scale->month->SetFontColor("white");
-$graph->scale->month->SetBackgroundColor("blue");
-
-// Format the bar for the first activity
-// ($row,$title,$startdate,$enddate)
-$activity = new GanttBar(0,"Project","2001-12-21","2002-02-20");
-
-// Yellow diagonal line pattern on a red background
-$activity->SetPattern(BAND_RDIAG,"yellow");
-$activity->SetFillColor("red");
-
-// Add a right marker
-$activity->rightMark->Show();
-$activity->rightMark->SetType(MARK_FILLEDCIRCLE);
-$activity->rightMark->SetWidth(13);
-$activity->rightMark->SetColor("red");
-$activity->rightMark->SetFillColor("red");
-$activity->rightMark->title->Set("M5");
-$activity->rightMark->title->SetFont(FF_ARIAL,FS_BOLD,12);
-$activity->rightMark->title->SetColor("white");
-
-// Set absolute height
-$activity->SetHeight(8);
-
-// Finally add the bar to the graph
-$graph->Add($activity);
-
-// Create a miletone
-$milestone = new MileStone(2,"Milestone","2002-01-15","2002-01-15");
-$milestone->title->SetColor("black");
-$milestone->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->Add($milestone);
-
-// Add a vertical line
-$vline = new GanttVLine("2001-12-24","Phase 1");
-$vline->SetDayOffset(0.5);
-$graph->Add($vline);
-
-// ... and display it
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/ganttex10.php b/#jpgraph/src/Examples/ganttex10.php
deleted file mode 100644
index 459920cf..00000000
--- a/#jpgraph/src/Examples/ganttex10.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_gantt.php');
-
-$graph = new GanttGraph();
-$graph->SetShadow();
-
-// Add title and subtitle
-$graph->title->Set("A nice main title");
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,12);
-$graph->subtitle->Set("(Draft version)");
-
-// Show day, week and month scale
-$graph->ShowHeaders(GANTT_HDAY | GANTT_HWEEK | GANTT_HMONTH);
-
-// Instead of week number show the date for the first day in the week
-// on the week scale
-$graph->scale->week->SetStyle(WEEKSTYLE_FIRSTDAY);
-
-// Make the week scale font smaller than the default
-$graph->scale->week->SetFont(FF_FONT0);
-
-// Use the short name of the month together with a 2 digit year
-// on the month scale
-$graph->scale->month->SetStyle(MONTHSTYLE_SHORTNAMEYEAR4);
-$graph->scale->month->SetFontColor("white");
-$graph->scale->month->SetBackgroundColor("blue");
-
-// Format the bar for the first activity
-// ($row,$title,$startdate,$enddate)
-$activity = new GanttBar(0,"Project","2001-12-21","2002-02-20");
-
-// Yellow diagonal line pattern on a red background
-$activity->SetPattern(BAND_RDIAG,"yellow");
-$activity->SetFillColor("red");
-
-// Add a right marker
-$activity->rightMark->Show();
-$activity->rightMark->SetType(MARK_FILLEDCIRCLE);
-$activity->rightMark->SetWidth(13);
-$activity->rightMark->SetColor("red");
-$activity->rightMark->SetFillColor("red");
-$activity->rightMark->title->Set("M5");
-$activity->rightMark->title->SetFont(FF_ARIAL,FS_BOLD,12);
-$activity->rightMark->title->SetColor("white");
-
-// Set absolute height
-$activity->SetHeight(1);
-
-
-// Format the bar for the second activity
-// ($row,$title,$startdate,$enddate)
-$activity2 = new GanttBar(1,"Project","2001-12-21","2002-02-20");
-
-// Yellow diagonal line pattern on a red background
-$activity2->SetPattern(BAND_RDIAG,"yellow");
-$activity2->SetFillColor("red");
-
-// Add a right marker
-$activity2->rightMark->Show();
-$activity2->rightMark->SetType(MARK_FILLEDCIRCLE);
-$activity2->rightMark->SetWidth(13);
-$activity2->rightMark->SetColor("red");
-$activity2->rightMark->SetFillColor("red");
-$activity2->rightMark->title->Set("M5");
-$activity2->rightMark->title->SetFont(FF_ARIAL,FS_BOLD,12);
-$activity2->rightMark->title->SetColor("white");
-
-// Set absolute height
-$activity2->SetHeight(1);
-
-
-// Finally add the bar to the graph
-$graph->Add($activity);
-$graph->Add($activity2);
-
-// Create a miletone
-$milestone = new MileStone(2,"Milestone","2002-01-15","2002-01-15");
-$milestone->title->SetColor("black");
-$milestone->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->Add($milestone);
-
-// Add a vertical line
-$vline = new GanttVLine("2001-12-24","Phase 1");
-$vline->SetDayOffset(0.5);
-//$graph->Add($vline);
-
-// ... and display it
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/ganttex11.php b/#jpgraph/src/Examples/ganttex11.php
deleted file mode 100644
index 2fec58bb..00000000
--- a/#jpgraph/src/Examples/ganttex11.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_gantt.php');
-
-$graph = new GanttGraph();
-$graph->SetShadow();
-
-// Add title and subtitle
-$graph->title->Set("A nice main title");
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,12);
-$graph->subtitle->Set("(Draft version)");
-
-// Show day, week and month scale
-$graph->ShowHeaders(GANTT_HDAY | GANTT_HWEEK | GANTT_HMONTH);
-
-// Instead of week number show the date for the first day in the week
-// on the week scale
-$graph->scale->week->SetStyle(WEEKSTYLE_FIRSTDAY);
-
-// Make the week scale font smaller than the default
-$graph->scale->week->SetFont(FF_FONT0);
-
-// Use the short name of the month together with a 2 digit year
-// on the month scale
-$graph->scale->month->SetStyle(MONTHSTYLE_SHORTNAMEYEAR4);
-$graph->scale->month->SetFontColor("white");
-$graph->scale->month->SetBackgroundColor("blue");
-
-// Format the bar for the first activity
-// ($row,$title,$startdate,$enddate)
-$activity = new GanttBar(0,"Project","2001-12-21","2002-02-20");
-
-// Yellow diagonal line pattern on a red background
-$activity->SetPattern(BAND_RDIAG,"yellow");
-$activity->SetFillColor("red");
-
-// Add a right marker
-$activity->rightMark->Show();
-$activity->rightMark->SetType(MARK_FILLEDCIRCLE);
-$activity->rightMark->SetWidth(13);
-$activity->rightMark->SetColor("red");
-$activity->rightMark->SetFillColor("red");
-$activity->rightMark->title->Set("M5");
-$activity->rightMark->title->SetFont(FF_ARIAL,FS_BOLD,12);
-$activity->rightMark->title->SetColor("white");
-
-// Set absolute height
-$activity->SetHeight(10);
-
-
-// Format the bar for the second activity
-// ($row,$title,$startdate,$enddate)
-$activity2 = new GanttBar(1,"Project","2001-12-21","2002-02-20");
-
-// Yellow diagonal line pattern on a red background
-$activity2->SetPattern(BAND_RDIAG,"yellow");
-$activity2->SetFillColor("red");
-
-// Add a right marker
-$activity2->rightMark->Show();
-$activity2->rightMark->SetType(MARK_FILLEDCIRCLE);
-$activity2->rightMark->SetWidth(13);
-$activity2->rightMark->SetColor("red");
-$activity2->rightMark->SetFillColor("red");
-$activity2->rightMark->title->Set("M5");
-$activity2->rightMark->title->SetFont(FF_ARIAL,FS_BOLD,12);
-$activity2->rightMark->title->SetColor("white");
-
-// Set absolute height
-$activity2->SetHeight(10);
-
-// Finally add the bar to the graph
-$graph->Add($activity);
-$graph->Add($activity2);
-
-// Create a miletone
-$milestone = new MileStone(2,"Milestone","2002-01-15","2002-01-15");
-$milestone->title->SetColor("black");
-$milestone->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->Add($milestone);
-
-// Add a vertical line
-$vline = new GanttVLine("2001-12-24","Phase 1");
-$vline->SetDayOffset(0.5);
-//$graph->Add($vline);
-
-// ... and display it
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/ganttex12.php b/#jpgraph/src/Examples/ganttex12.php
deleted file mode 100644
index e7adc7a9..00000000
--- a/#jpgraph/src/Examples/ganttex12.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_gantt.php');
-
-$graph = new GanttGraph();
-$graph->SetBox();
-$graph->SetShadow();
-
-// Add title and subtitle
-$graph->title->Set("A nice main title");
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,12);
-$graph->subtitle->Set("(Draft version)");
-
-// Show day, week and month scale
-$graph->ShowHeaders(GANTT_HDAY | GANTT_HWEEK | GANTT_HMONTH);
-
-// Instead of week number show the date for the first day in the week
-// on the week scale
-$graph->scale->week->SetStyle(WEEKSTYLE_FIRSTDAY);
-
-// Make the week scale font smaller than the default
-$graph->scale->week->SetFont(FF_FONT0);
-
-// Use the short name of the month together with a 2 digit year
-// on the month scale
-$graph->scale->month->SetStyle(MONTHSTYLE_SHORTNAMEYEAR4);
-$graph->scale->month->SetFontColor("white");
-$graph->scale->month->SetBackgroundColor("blue");
-
-// 0 % vertical label margin
-$graph->SetLabelVMarginFactor(0);
-
-// Format the bar for the first activity
-// ($row,$title,$startdate,$enddate)
-$activity = new GanttBar(0,"Project","2001-12-21","2002-02-20");
-
-// Yellow diagonal line pattern on a red background
-$activity->SetPattern(BAND_RDIAG,"yellow");
-$activity->SetFillColor("red");
-
-// Add a right marker
-$activity->rightMark->Show();
-$activity->rightMark->SetType(MARK_FILLEDCIRCLE);
-$activity->rightMark->SetWidth(13);
-$activity->rightMark->SetColor("red");
-$activity->rightMark->SetFillColor("red");
-$activity->rightMark->title->Set("M5");
-$activity->rightMark->title->SetFont(FF_ARIAL,FS_BOLD,12);
-$activity->rightMark->title->SetColor("white");
-
-// Set absolute height
-$activity->SetHeight(10);
-
-
-// Format the bar for the second activity
-// ($row,$title,$startdate,$enddate)
-$activity2 = new GanttBar(1,"Project","2001-12-21","2002-02-20");
-
-// Yellow diagonal line pattern on a red background
-$activity2->SetPattern(BAND_RDIAG,"yellow");
-$activity2->SetFillColor("red");
-
-// Add a right marker
-$activity2->rightMark->Show();
-$activity2->rightMark->SetType(MARK_FILLEDCIRCLE);
-$activity2->rightMark->SetWidth(13);
-$activity2->rightMark->SetColor("red");
-$activity2->rightMark->SetFillColor("red");
-$activity2->rightMark->title->Set("M5");
-$activity2->rightMark->title->SetFont(FF_ARIAL,FS_BOLD,12);
-$activity2->rightMark->title->SetColor("white");
-
-// Set absolute height
-$activity2->SetHeight(10);
-
-// Finally add the bar to the graph
-$graph->Add($activity);
-$graph->Add($activity2);
-
-// Create a miletone
-$milestone = new MileStone(2,"Milestone","2002-01-15","2002-01-15");
-$milestone->title->SetColor("black");
-$milestone->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->Add($milestone);
-
-// Add a vertical line
-$vline = new GanttVLine("2001-12-24","Phase 1");
-$vline->SetDayOffset(0.5);
-//$graph->Add($vline);
-
-// ... and display it
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/ganttex13-zoom1.php b/#jpgraph/src/Examples/ganttex13-zoom1.php
deleted file mode 100644
index 9a8457e6..00000000
--- a/#jpgraph/src/Examples/ganttex13-zoom1.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_gantt.php');
-
-$graph = new GanttGraph();
-$graph->SetShadow();
-
-// Add title and subtitle
-$graph->title->Set("Zooming a graph");
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,12);
-$graph->subtitle->Set("(zoom=0.7)");
-
-// Show day, week and month scale
-$graph->ShowHeaders(GANTT_HDAY | GANTT_HWEEK | GANTT_HMONTH);
-
-// Instead of week number show the date for the first day in the week
-// on the week scale
-$graph->scale->week->SetStyle(WEEKSTYLE_FIRSTDAY);
-
-// Make the week scale font smaller than the default
-$graph->scale->week->SetFont(FF_FONT0);
-
-// Use the short name of the month together with a 2 digit year
-// on the month scale
-$graph->scale->month->SetStyle(MONTHSTYLE_SHORTNAMEYEAR4);
-$graph->scale->month->SetFontColor("white");
-$graph->scale->month->SetBackgroundColor("blue");
-
-// 0 % vertical label margin
-$graph->SetLabelVMarginFactor(1.0); // 1=default value
-
-// Set zoom factor
-$graph->SetZoomFactor(0.7);
-
-// Format the bar for the first activity
-// ($row,$title,$startdate,$enddate)
-$activity1 = new GanttBar(0,"Activity 1","2001-12-21","2002-01-07","[ER,TR]");
-
-// Yellow diagonal line pattern on a red background
-$activity1->SetPattern(BAND_RDIAG,"yellow");
-$activity1->SetFillColor("red");
-
-// Set absolute height of activity
-$activity1->SetHeight(16);
-
-// Format the bar for the second activity
-// ($row,$title,$startdate,$enddate)
-$activity2 = new GanttBar(1,"Activity 2","2001-12-21","2002-01-01","[BO,SW,JC]");
-
-// ADjust font for caption
-$activity2->caption->SetFont(FF_ARIAL,FS_BOLD);
-$activity2->caption->SetColor("darkred");
-
-// Yellow diagonal line pattern on a red background
-$activity2->SetPattern(BAND_RDIAG,"yellow");
-$activity2->SetFillColor("red");
-
-// Set absolute height of activity
-$activity2->SetHeight(16);
-
-// Finally add the bar to the graph
-$graph->Add($activity1);
-$graph->Add($activity2);
-
-// ... and display it
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/ganttex13-zoom2.php b/#jpgraph/src/Examples/ganttex13-zoom2.php
deleted file mode 100644
index 882fb7bc..00000000
--- a/#jpgraph/src/Examples/ganttex13-zoom2.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_gantt.php');
-
-$graph = new GanttGraph();
-$graph->SetShadow();
-
-// Add title and subtitle
-$graph->title->Set("Zooming a graph");
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,12);
-$graph->subtitle->Set("(zoom=1.5)");
-
-// Show day, week and month scale
-$graph->ShowHeaders(GANTT_HDAY | GANTT_HWEEK | GANTT_HMONTH);
-
-// Instead of week number show the date for the first day in the week
-// on the week scale
-$graph->scale->week->SetStyle(WEEKSTYLE_FIRSTDAY);
-
-// Make the week scale font smaller than the default
-$graph->scale->week->SetFont(FF_FONT0);
-
-// Use the short name of the month together with a 2 digit year
-// on the month scale
-$graph->scale->month->SetStyle(MONTHSTYLE_SHORTNAMEYEAR4);
-$graph->scale->month->SetFontColor("white");
-$graph->scale->month->SetBackgroundColor("blue");
-
-// 0 % vertical label margin
-$graph->SetLabelVMarginFactor(1.0); // 1=default value
-
-// Set zoom factor
-$graph->SetZoomFactor(1.5);
-
-// Format the bar for the first activity
-// ($row,$title,$startdate,$enddate)
-$activity1 = new GanttBar(0,"Activity 1","2001-12-21","2002-01-07","[ER,TR]");
-
-// Yellow diagonal line pattern on a red background
-$activity1->SetPattern(BAND_RDIAG,"yellow");
-$activity1->SetFillColor("red");
-
-// Set absolute height of activity
-$activity1->SetHeight(16);
-
-// Format the bar for the second activity
-// ($row,$title,$startdate,$enddate)
-$activity2 = new GanttBar(1,"Activity 2","2001-12-21","2002-01-01","[BO,SW,JC]");
-
-// ADjust font for caption
-$activity2->caption->SetFont(FF_ARIAL,FS_BOLD);
-$activity2->caption->SetColor("darkred");
-
-// Yellow diagonal line pattern on a red background
-$activity2->SetPattern(BAND_RDIAG,"yellow");
-$activity2->SetFillColor("red");
-
-// Set absolute height of activity
-$activity2->SetHeight(16);
-
-// Finally add the bar to the graph
-$graph->Add($activity1);
-$graph->Add($activity2);
-
-// ... and display it
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/ganttex13.php b/#jpgraph/src/Examples/ganttex13.php
deleted file mode 100644
index 865a4db0..00000000
--- a/#jpgraph/src/Examples/ganttex13.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_gantt.php');
-
-$graph = new GanttGraph();
-$graph->SetShadow();
-
-// Add title and subtitle
-$graph->title->Set("Example of captions");
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,12);
-$graph->subtitle->Set("(ganttex13.php)");
-
-// Show day, week and month scale
-$graph->ShowHeaders(GANTT_HDAY | GANTT_HWEEK | GANTT_HMONTH);
-
-// Instead of week number show the date for the first day in the week
-// on the week scale
-$graph->scale->week->SetStyle(WEEKSTYLE_FIRSTDAY);
-
-// Make the week scale font smaller than the default
-$graph->scale->week->SetFont(FF_FONT0);
-
-// Use the short name of the month together with a 2 digit year
-// on the month scale
-$graph->scale->month->SetStyle(MONTHSTYLE_SHORTNAMEYEAR4);
-$graph->scale->month->SetFontColor("white");
-$graph->scale->month->SetBackgroundColor("blue");
-
-// 0 % vertical label margin
-$graph->SetLabelVMarginFactor(1); // 1=default value
-
-// Format the bar for the first activity
-// ($row,$title,$startdate,$enddate)
-$activity1 = new GanttBar(0,"Activity 1","2001-12-21","2002-01-07","[ER,TR]");
-
-// Yellow diagonal line pattern on a red background
-$activity1->SetPattern(BAND_RDIAG,"yellow");
-$activity1->SetFillColor("red");
-
-// Set absolute height of activity
-$activity1->SetHeight(16);
-
-// Format the bar for the second activity
-// ($row,$title,$startdate,$enddate)
-$activity2 = new GanttBar(1,"Activity 2","2001-12-21","2002-01-01","[BO,SW,JC]");
-
-// ADjust font for caption
-$activity2->caption->SetFont(FF_ARIAL,FS_BOLD);
-$activity2->caption->SetColor("darkred");
-
-// Yellow diagonal line pattern on a red background
-$activity2->SetPattern(BAND_RDIAG,"yellow");
-$activity2->SetFillColor("red");
-
-// Set absolute height of activity
-$activity2->SetHeight(16);
-
-// Finally add the bar to the graph
-$graph->Add($activity1);
-$graph->Add($activity2);
-
-// ... and display it
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/ganttex14.php b/#jpgraph/src/Examples/ganttex14.php
deleted file mode 100644
index a53942ba..00000000
--- a/#jpgraph/src/Examples/ganttex14.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_gantt.php');
-
-$graph = new GanttGraph();
-$graph->SetBox();
-$graph->SetShadow();
-
-// Add title and subtitle
-$graph->title->Set("Example of captions");
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,12);
-$graph->subtitle->Set("(ganttex14.php)");
-
-// Show day, week and month scale
-$graph->ShowHeaders(GANTT_HDAY | GANTT_HWEEK | GANTT_HMONTH);
-
-
-// Use the short name of the month together with a 2 digit year
-// on the month scale
-$graph->scale->month->SetStyle(MONTHSTYLE_SHORTNAMEYEAR2);
-$graph->scale->month->SetFontColor("white");
-$graph->scale->month->SetBackgroundColor("blue");
-
-// 0 % vertical label margin
-$graph->SetLabelVMarginFactor(1);
-
-// Format the bar for the first activity
-// ($row,$title,$startdate,$enddate)
-$activity = new GanttBar(0,"Project","2001-12-21","2002-01-07","[50%]");
-
-// Yellow diagonal line pattern on a red background
-$activity->SetPattern(BAND_RDIAG,"yellow");
-$activity->SetFillColor("red");
-
-// Set absolute height
-$activity->SetHeight(10);
-
-// Specify progress to 60%
-$activity->progress->Set(0.6);
-
-// Format the bar for the second activity
-// ($row,$title,$startdate,$enddate)
-$activity2 = new GanttBar(1,"Project","2001-12-21","2002-01-02","[30%]");
-
-// Yellow diagonal line pattern on a red background
-$activity2->SetPattern(BAND_RDIAG,"yellow");
-$activity2->SetFillColor("red");
-
-// Set absolute height
-$activity2->SetHeight(10);
-
-// Specify progress to 30%
-$activity2->progress->Set(0.3);
-
-
-// Finally add the bar to the graph
-$graph->Add($activity);
-$graph->Add($activity2);
-
-// Add a vertical line
-$vline = new GanttVLine("2001-12-24","Phase 1");
-$vline->SetDayOffset(0.5);
-//$graph->Add($vline);
-
-// ... and display it
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/ganttex15.php b/#jpgraph/src/Examples/ganttex15.php
deleted file mode 100644
index ae759839..00000000
--- a/#jpgraph/src/Examples/ganttex15.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_gantt.php');
-
-$graph = new GanttGraph();
-$graph->SetBox();
-$graph->SetShadow();
-
-// Add title and subtitle
-$graph->title->Set("Example of captions");
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,12);
-$graph->subtitle->Set("(ganttex15.php)");
-
-// Show day, week and month scale
-$graph->ShowHeaders(GANTT_HDAY | GANTT_HWEEK | GANTT_HMONTH);
-
-
-// Use the short name of the month together with a 2 digit year
-// on the month scale
-$graph->scale->month->SetStyle(MONTHSTYLE_SHORTNAMEYEAR2);
-$graph->scale->month->SetFontColor("white");
-$graph->scale->month->SetBackgroundColor("blue");
-
-// 0 % vertical label margin
-$graph->SetLabelVMarginFactor(1);
-
-// Format the bar for the first activity
-// ($row,$title,$startdate,$enddate)
-$activity = new GanttBar(0,"Project","2001-12-21","2002-01-07","[50%]");
-
-// Yellow diagonal line pattern on a red background
-$activity->SetPattern(BAND_RDIAG,"yellow");
-$activity->SetFillColor("red");
-
-// Set absolute height
-$activity->SetHeight(10);
-
-// Specify progress to 60%
-$activity->progress->Set(0.6);
-$activity->progress->SetPattern(BAND_HVCROSS,"blue");
-
-// Format the bar for the second activity
-// ($row,$title,$startdate,$enddate)
-$activity2 = new GanttBar(1,"Project","2001-12-21","2002-01-02","[30%]");
-
-// Yellow diagonal line pattern on a red background
-$activity2->SetPattern(BAND_RDIAG,"yellow");
-$activity2->SetFillColor("red");
-
-// Set absolute height
-$activity2->SetHeight(10);
-
-// Specify progress to 30%
-$activity2->progress->Set(0.3);
-$activity2->progress->SetPattern(BAND_HVCROSS,"blue");
-
-// Finally add the bar to the graph
-$graph->Add($activity);
-$graph->Add($activity2);
-
-// Add a vertical line
-$vline = new GanttVLine("2001-12-24","Phase 1");
-$vline->SetDayOffset(0.5);
-//$graph->Add($vline);
-
-// ... and display it
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/ganttex16.php b/#jpgraph/src/Examples/ganttex16.php
deleted file mode 100644
index bf3e06fa..00000000
--- a/#jpgraph/src/Examples/ganttex16.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_gantt.php');
-
-$graph = new GanttGraph();
-$graph->SetBox();
-$graph->SetShadow();
-
-// Add title and subtitle
-$graph->title->Set("Example of captions");
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,12);
-$graph->subtitle->Set("(ganttex16.php)");
-
-// Show day, week and month scale
-$graph->ShowHeaders(GANTT_HDAY | GANTT_HWEEK | GANTT_HMONTH);
-
-// Set table title
-$graph->scale->tableTitle->Set("(Rev: 1.22)");
-$graph->scale->tableTitle->SetFont(FF_FONT1,FS_BOLD);
-$graph->scale->SetTableTitleBackground("silver");
-$graph->scale->tableTitle->Show();
-
-// Use the short name of the month together with a 2 digit year
-// on the month scale
-$graph->scale->month->SetStyle(MONTHSTYLE_SHORTNAMEYEAR2);
-$graph->scale->month->SetFontColor("white");
-$graph->scale->month->SetBackgroundColor("blue");
-
-// 0 % vertical label margin
-$graph->SetLabelVMarginFactor(1);
-
-// Format the bar for the first activity
-// ($row,$title,$startdate,$enddate)
-$activity = new GanttBar(0,"Project","2001-12-21","2002-01-07","[50%]");
-
-// Yellow diagonal line pattern on a red background
-$activity->SetPattern(BAND_RDIAG,"yellow");
-$activity->SetFillColor("red");
-
-// Set absolute height
-$activity->SetHeight(10);
-
-// Specify progress to 60%
-$activity->progress->Set(0.6);
-$activity->progress->SetPattern(BAND_HVCROSS,"blue");
-
-// Format the bar for the second activity
-// ($row,$title,$startdate,$enddate)
-$activity2 = new GanttBar(1,"Project","2001-12-21","2002-01-02","[30%]");
-
-// Yellow diagonal line pattern on a red background
-$activity2->SetPattern(BAND_RDIAG,"yellow");
-$activity2->SetFillColor("red");
-
-// Set absolute height
-$activity2->SetHeight(10);
-
-// Specify progress to 30%
-$activity2->progress->Set(0.3);
-$activity2->progress->SetPattern(BAND_HVCROSS,"blue");
-
-// Finally add the bar to the graph
-$graph->Add($activity);
-$graph->Add($activity2);
-
-// Add a vertical line
-$vline = new GanttVLine("2001-12-24","Phase 1");
-$vline->SetDayOffset(0.5);
-//$graph->Add($vline);
-
-// ... and display it
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/ganttex17-flag.php b/#jpgraph/src/Examples/ganttex17-flag.php
deleted file mode 100644
index 17eaca49..00000000
--- a/#jpgraph/src/Examples/ganttex17-flag.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_gantt.php');
-require_once ('jpgraph/jpgraph_flags.php');
-
-$graph = new GanttGraph();
-$graph->SetBox();
-$graph->SetShadow();
-
-// Add title and subtitle
-$graph->title->Set("Example of captions");
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,12);
-$graph->subtitle->Set("(ganttex17.php)");
-
-// Show day, week and month scale
-$graph->ShowHeaders(GANTT_HDAY | GANTT_HWEEK | GANTT_HMONTH);
-
-// Set table title
-$graph->scale->tableTitle->Set("(Rev: 1.22)");
-$graph->scale->tableTitle->SetFont(FF_FONT1,FS_BOLD);
-$graph->scale->SetTableTitleBackground("silver");
-
-// Modify the appearance of the dividing lines
-$graph->scale->divider->SetWeight(3);
-$graph->scale->divider->SetColor("navy");
-$graph->scale->dividerh->SetWeight(3);
-$graph->scale->dividerh->SetColor("navy");
-
-// Use the short name of the month together with a 2 digit year
-// on the month scale
-$graph->scale->month->SetStyle(MONTHSTYLE_SHORTNAMEYEAR2);
-$graph->scale->month->SetFontColor("white");
-$graph->scale->month->SetBackgroundColor("blue");
-
-// 0 % vertical label margin
-$graph->SetLabelVMarginFactor(1);
-
-// Format the bar for the first activity
-// ($row,$title,$startdate,$enddate)
-$activity = new GanttBar(0,"Project","2001-12-21","2002-01-07","[50%]");
-
-// Yellow diagonal line pattern on a red background
-$activity->SetPattern(BAND_RDIAG,"yellow");
-$activity->SetFillColor("red");
-
-// Set absolute height
-$activity->SetHeight(10);
-
-// Specify progress to 60%
-$activity->progress->Set(0.6);
-$activity->progress->SetPattern(BAND_HVCROSS,"blue");
-
-// Format the bar for the second activity
-// ($row,$title,$startdate,$enddate)
-$activity2 = new GanttBar(1,"Project","2001-12-21","2002-01-02","[30%]");
-
-// Yellow diagonal line pattern on a red background
-$activity2->SetPattern(BAND_RDIAG,"yellow");
-$activity2->SetFillColor("red");
-
-// Set absolute height
-$activity2->SetHeight(10);
-
-// Specify progress to 30%
-$activity2->progress->Set(0.3);
-$activity2->progress->SetPattern(BAND_HVCROSS,"blue");
-
-// Finally add the bar to the graph
-$graph->Add($activity);
-$graph->Add($activity2);
-
-// Add a coutnry flag
-$icon = new IconPlot();
-$icon->SetAnchor('left','top');
-$icon->SetCountryFlag('norway');
-$icon->SetMix(50);
-$icon->SetPos(5,5);
-$graph->Add($icon);
-
-
-// Add a vertical line
-$vline = new GanttVLine("2001-12-24","Phase 1");
-$vline->SetDayOffset(0.5);
-//$graph->Add($vline);
-
-// ... and display it
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/ganttex17.php b/#jpgraph/src/Examples/ganttex17.php
deleted file mode 100644
index cc2e7e89..00000000
--- a/#jpgraph/src/Examples/ganttex17.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_gantt.php');
-
-$graph = new GanttGraph(0,0);
-$graph->SetBox();
-$graph->SetShadow();
-
-// Add title and subtitle
-$graph->title->Set("Example of captions");
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,12);
-$graph->subtitle->Set("(ganttex17.php)");
-
-// Show day, week and month scale
-$graph->ShowHeaders(GANTT_HDAY | GANTT_HWEEK | GANTT_HMONTH);
-
-// Set table title
-$graph->scale->tableTitle->Set("(Rev: 1.22)");
-$graph->scale->tableTitle->SetFont(FF_FONT1,FS_BOLD);
-$graph->scale->SetTableTitleBackground("silver");
-
-// Modify the appearance of the dividing lines
-$graph->scale->divider->SetWeight(3);
-$graph->scale->divider->SetColor("navy");
-$graph->scale->dividerh->SetWeight(3);
-$graph->scale->dividerh->SetColor("navy");
-
-// Use the short name of the month together with a 2 digit year
-// on the month scale
-$graph->scale->month->SetStyle(MONTHSTYLE_SHORTNAMEYEAR2);
-$graph->scale->month->SetFontColor("white");
-$graph->scale->month->SetBackgroundColor("blue");
-
-// 0 % vertical label margin
-$graph->SetLabelVMarginFactor(1);
-
-// Format the bar for the first activity
-// ($row,$title,$startdate,$enddate)
-$activity = new GanttBar(0,"Project","2001-12-21","2002-01-07","[50%]");
-
-// Yellow diagonal line pattern on a red background
-$activity->SetPattern(BAND_RDIAG,"yellow");
-$activity->SetFillColor("red");
-
-// Set absolute height
-$activity->SetHeight(10);
-
-// Specify progress to 60%
-$activity->progress->Set(0.6);
-$activity->progress->SetPattern(BAND_HVCROSS,"blue");
-
-// Format the bar for the second activity
-// ($row,$title,$startdate,$enddate)
-$activity2 = new GanttBar(1,"Project","2001-12-21","2002-01-02","[30%]");
-
-// Yellow diagonal line pattern on a red background
-$activity2->SetPattern(BAND_RDIAG,"yellow");
-$activity2->SetFillColor("red");
-
-// Set absolute height
-$activity2->SetHeight(10);
-
-// Specify progress to 30%
-$activity2->progress->Set(0.3);
-$activity2->progress->SetPattern(BAND_HVCROSS,"blue");
-
-// Finally add the bar to the graph
-$graph->Add($activity);
-$graph->Add($activity2);
-
-// Add a vertical line
-$vline = new GanttVLine("2001-12-24","Phase 1");
-$vline->SetDayOffset(0.5);
-//$graph->Add($vline);
-
-// ... and display it
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/ganttex18.php b/#jpgraph/src/Examples/ganttex18.php
deleted file mode 100644
index 4c4b5d91..00000000
--- a/#jpgraph/src/Examples/ganttex18.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_gantt.php');
-
-$graph = new GanttGraph();
-$graph->SetBox();
-$graph->SetShadow();
-
-// Add title and subtitle
-$graph->title->Set("Example of captions");
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,12);
-$graph->subtitle->Set("(ganttex18.php)");
-
-// Show day, week and month scale
-$graph->ShowHeaders(GANTT_HDAY | GANTT_HWEEK | GANTT_HMONTH);
-
-// Set table title
-$graph->scale->tableTitle->Set("(Rev: 1.22)");
-$graph->scale->tableTitle->SetFont(FF_FONT1,FS_BOLD);
-$graph->scale->SetTableTitleBackground("silver");
-
-// Modify the appearance of the dividing lines
-$graph->scale->divider->SetWeight(3);
-$graph->scale->divider->SetColor("navy");
-
-$graph->scale->dividerh->SetWeight(3);
-$graph->scale->dividerh->SetColor("navy");
-
-$graph->SetBox(true,"navy",3);
-
-
-// Use the short name of the month together with a 2 digit year
-// on the month scale
-$graph->scale->month->SetStyle(MONTHSTYLE_SHORTNAMEYEAR2);
-$graph->scale->month->SetFontColor("white");
-$graph->scale->month->SetBackgroundColor("blue");
-
-// 0 % vertical label margin
-$graph->SetLabelVMarginFactor(1);
-
-// Format the bar for the first activity
-// ($row,$title,$startdate,$enddate)
-$activity = new GanttBar(0,"Project","2001-12-21","2002-01-07","[50%]");
-
-// Yellow diagonal line pattern on a red background
-$activity->SetPattern(BAND_RDIAG,"yellow");
-$activity->SetFillColor("red");
-
-// Set absolute height
-$activity->SetHeight(10);
-
-// Specify progress to 60%
-$activity->progress->Set(0.6);
-$activity->progress->SetPattern(BAND_HVCROSS,"blue");
-
-// Format the bar for the second activity
-// ($row,$title,$startdate,$enddate)
-$activity2 = new GanttBar(1,"Project","2001-12-21","2002-01-02","[30%]");
-
-// Yellow diagonal line pattern on a red background
-$activity2->SetPattern(BAND_RDIAG,"yellow");
-$activity2->SetFillColor("red");
-
-// Set absolute height
-$activity2->SetHeight(10);
-
-// Specify progress to 30%
-$activity2->progress->Set(0.3);
-$activity2->progress->SetPattern(BAND_HVCROSS,"blue");
-
-// Finally add the bar to the graph
-$graph->Add($activity);
-$graph->Add($activity2);
-
-// Add a vertical line
-$vline = new GanttVLine("2001-12-24","Phase 1");
-$vline->SetDayOffset(0.5);
-//$graph->Add($vline);
-
-// ... and display it
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/ganttex19.php b/#jpgraph/src/Examples/ganttex19.php
deleted file mode 100644
index 7528412e..00000000
--- a/#jpgraph/src/Examples/ganttex19.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_gantt.php');
-
-$graph = new GanttGraph();
-$graph->SetBox();
-$graph->SetShadow();
-
-// Use default locale
-$graph->scale->SetDateLocale('sv_SE');
-
-// Add title and subtitle
-$graph->title->Set('Example of captions');
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,12);
-$graph->subtitle->Set('(ganttex19.php)');
-
-// Show day, week and month scale
-$graph->ShowHeaders(GANTT_HDAY | GANTT_HWEEK | GANTT_HMONTH);
-
-// Set table title
-$graph->scale->tableTitle->Set('(Rev: 1.22)');
-$graph->scale->tableTitle->SetFont(FF_FONT1,FS_BOLD);
-$graph->scale->SetTableTitleBackground('silver');
-$graph->scale->tableTitle->Show();
-
-$graph->scale->divider->SetStyle('solid');
-$graph->scale->divider->SetWeight(2);
-$graph->scale->divider->SetColor('black');
-
-
-$graph->SetBox(true,'navy',2);
-
-
-// Use the short name of the month together with a 2 digit year
-// on the month scale
-$graph->scale->month->SetStyle(MONTHSTYLE_SHORTNAMEYEAR2);
-$graph->scale->month->SetFontColor('white');
-$graph->scale->month->SetBackgroundColor('blue');
-
-// 0 % vertical label margin
-$graph->SetLabelVMarginFactor(1);
-
-// Format the bar for the first activity
-// ($row,$title,$startdate,$enddate)
-$activity = new GanttBar(0,'Project','2001-12-21','2002-01-07','[50%]');
-
-// Yellow diagonal line pattern on a red background
-$activity->SetPattern(BAND_RDIAG,'yellow');
-$activity->SetFillColor('red');
-
-// Set absolute height
-$activity->SetHeight(10);
-
-// Specify progress to 60%
-$activity->progress->Set(0.6);
-$activity->progress->SetPattern(BAND_HVCROSS,'blue');
-
-// Format the bar for the second activity
-// ($row,$title,$startdate,$enddate)
-$activity2 = new GanttBar(1,'Project','2001-12-21','2002-01-02','[30%]');
-
-// Yellow diagonal line pattern on a red background
-$activity2->SetPattern(BAND_RDIAG,'yellow');
-$activity2->SetFillColor('red');
-
-// Set absolute height
-$activity2->SetHeight(10);
-
-// Specify progress to 30%
-$activity2->progress->Set(0.3);
-$activity2->progress->SetPattern(BAND_HVCROSS,'blue');
-
-// Finally add the bar to the graph
-$graph->Add($activity);
-$graph->Add($activity2);
-
-// Add a vertical line
-$vline = new GanttVLine('2001-12-24','Phase 1');
-$vline->SetDayOffset(0.5);
-//$graph->Add($vline);
-
-// ... and display it
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/ganttex30.php b/#jpgraph/src/Examples/ganttex30.php
deleted file mode 100644
index 45cc80b6..00000000
--- a/#jpgraph/src/Examples/ganttex30.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// Gantt example 30
-// $Id: ganttex30.php,v 1.4 2003/05/30 20:12:43 aditus Exp $
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_gantt.php');
-
-// Standard calls to create a new graph
-$graph = new GanttGraph();
-$graph->SetShadow();
-$graph->SetBox();
-
-// Titles for chart
-$graph->title->Set("General conversion plan");
-$graph->subtitle->Set("(Revision: 2001-11-18)");
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,12);
-
-// For illustration we enable all headers.
-$graph->ShowHeaders(GANTT_HYEAR | GANTT_HMONTH | GANTT_HDAY | GANTT_HWEEK);
-
-// For the week we choose to show the start date of the week
-// the default is to show week number (according to ISO 8601)
-$graph->scale->week->SetStyle(WEEKSTYLE_FIRSTDAY);
-
-// Change the scale font
-$graph->scale->week->SetFont(FF_FONT0);
-$graph->scale->year->SetFont(FF_ARIAL,FS_BOLD,12);
-
-
-// Setup some data for the gantt bars
-$data = array(
-        array(0,"Group 1", "2001-10-29","2001-11-27",FF_FONT1,FS_BOLD,8),
-        array(1,"  Label 2", "2001-11-8","2001-12-14"),
-        array(2,"  Label 3", "2001-11-01","2001-11-8"),
-        array(4,"Group 2", "2001-11-07","2001-12-19",FF_FONT1,FS_BOLD,8),
-        array(5,"  Label 4", "2001-11-8","2001-12-19"),
-        array(6,"  Label 5", "2001-11-01","2001-11-8")
-        );
-
-for($i=0; $i<count($data); ++$i) {
-        $bar = new GanttBar($data[$i][0],$data[$i][1],$data[$i][2],$data[$i][3],"[50%]",0.5);
-        if( count($data[$i])>4 )
-                $bar->title->SetFont($data[$i][4],$data[$i][5],$data[$i][6]);
-
-        // If you like each bar can have a shadow
-        // $bar->SetShadow(true,"darkgray");
-
-        // For illustration lets make each bar be red with yellow diagonal stripes
-        $bar->SetPattern(BAND_RDIAG,"yellow");
-        $bar->SetFillColor("red");
-
-        // To indicate progress each bar can have a smaller bar within
-        // For illustrative purpose just set the progress to 50% for each bar
-        $bar->progress->Set(0.5);
-
-        // Each bar may also have optional left and right plot marks
-        // As illustration lets put a filled circle with a number at the end
-        // of each bar
-        $bar->rightMark->SetType(MARK_FILLEDCIRCLE);
-        $bar->rightMark->SetFillColor("red");
-        $bar->rightMark->SetColor("red");
-        $bar->rightMark->SetWidth(10);
-
-        // Title for the mark
-        $bar->rightMark->title->Set("".$i+1);
-        $bar->rightMark->title->SetColor("white");
-        $bar->rightMark->title->SetFont(FF_ARIAL,FS_BOLD,10);
-        $bar->rightMark->Show();
-
-        // ... and add the bar to the gantt chart
-        $graph->Add($bar);
-}
-
-// Create a milestone mark
-$ms = new MileStone(7,"M5","2001-12-10","10/12");
-$ms->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->Add($ms);
-
-// Create a vertical line to emphasize the milestone
-$vl = new GanttVLine("2001-12-10 13:00","Phase 1","darkred");
-$vl->SetDayOffset(0.5); // Center the line in the day
-$graph->Add($vl);
-
-// Output the graph
-$graph->Stroke();
-
-// EOF
-?>
diff --git a/#jpgraph/src/Examples/ganttex_slice.php b/#jpgraph/src/Examples/ganttex_slice.php
deleted file mode 100644
index 5ec95bc9..00000000
--- a/#jpgraph/src/Examples/ganttex_slice.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// $Id: ganttex_slice.php,v 1.2 2002/07/11 23:27:28 aditus Exp $
-// Gantt example with sunday week start and only shows a partial graph
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_gantt.php');
-
-// Setup Gantt graph
-$graph = new GanttGraph(0,0,'auto');
-$graph->SetShadow();
-$graph->SetBox();
-
-// Only show part of the Gantt
-$graph->SetDateRange('2001-11-22','2002-1-24');
-
-// Weeks start on Sunday
-$graph->scale->SetWeekStart(0);
-
-$graph->title->Set("General conversion plan");
-$graph->subtitle->Set("(Slice between 2001-11-22 to 2002-01-24)");
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,20);
-
-$graph->ShowHeaders(GANTT_HYEAR | GANTT_HMONTH | GANTT_HDAY | GANTT_HWEEK);
-$graph->scale->week->SetStyle(WEEKSTYLE_FIRSTDAY);
-$graph->scale->week->SetFont(FF_FONT1);
-
-
-$data = array(
-	array(0,"Group 1\tJohan", "2002-1-23","2002-01-28",FF_FONT1,FS_BOLD,8),
-	array(1,"  Label 2", "2001-10-26","2001-11-16"),
-	array(2,"  Label 3", "2001-11-30","2001-12-01"),
-	array(4,"Group 2", "2001-11-30","2001-12-22",FF_FONT1,FS_BOLD,8),
-	array(5,"  Label 4", "2001-11-30","2001-12-1"),
-	array(6,"  Label 5", "2001-12-6","2001-12-8"),
-	array(8,"    Label 8", "2001-11-30","2002-01-02")			
-	);
-
-
-// make up some fictionary activity bars
-for($i=0; $i<count($data); ++$i) {
-	$bar = new GanttBar($data[$i][0],$data[$i][1],$data[$i][2],$data[$i][3],"[5%]",10);
-	if( count($data[$i])>4 )
-		$bar->title->SetFont($data[$i][4],$data[$i][5],$data[$i][6]);
-		
-	$bar->rightMark->Show();
-	$bar->rightMark->SetType(MARK_FILLEDCIRCLE);
-	$bar->rightMark->SetWidth(8);
-	$bar->rightMark->SetColor("red");
-	$bar->rightMark->SetFillColor("red");
-	$bar->rightMark->title->Set($i+1);
-	$bar->rightMark->title->SetFont(FF_ARIAL,FS_BOLD,12);
-	$bar->rightMark->title->SetColor("white");
-
-	$bar->SetPattern(BAND_RDIAG,"yellow");
-	$bar->SetFillColor("red");
-	$bar->progress->Set($i/10);
-	$bar->progress->SetPattern(GANTT_SOLID,"darkgreen");
-	
-	$graph->Add($bar);
-}
-
-
-// The line will NOT be shown since it is outside the specified slice
-$vline = new GanttVLine("2002-02-28");
-$vline->title->Set("2002-02-28");
-$vline->title->SetFont(FF_FONT1,FS_BOLD,10);
-$graph->Add($vline);
-
-// The milestone will NOT be shown since it is outside the specified slice
-$ms = new MileStone(7,"M5","2002-01-28","28/1");
-$ms->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->Add($ms);
-
-$graph->Stroke();
-
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/gantthgridex1.php b/#jpgraph/src/Examples/gantthgridex1.php
deleted file mode 100644
index 70a94813..00000000
--- a/#jpgraph/src/Examples/gantthgridex1.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// Gantt horizontal grid example
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_gantt.php');
-
-
-// Some dummy data for some activities
-$data = array(
-	array(0,"Group 1  Johan", "2001-10-23","2001-11-06",FF_FONT1,FS_BOLD,8),
-	array(1,"  Label 2", "2001-10-26","2001-11-04"),
-	array(3,"Group 2", "2001-11-20","2001-11-28",FF_FONT1,FS_BOLD,8),
-	array(4,"  Label 1", "2001-11-20","2001-12-1"));
-
-// New Gantt Graph
-$graph = new GanttGraph(500);
-
-// Setup a title
-$graph->title->Set("Grid example");
-$graph->subtitle->Set("(Horizontal grid)");
-$graph->title->SetFont(FF_VERDANA,FS_NORMAL,14);
-
-// Specify what headers to show
-$graph->ShowHeaders(GANTT_HMONTH|GANTT_HDAY );
-$graph->scale->week->SetStyle(WEEKSTYLE_FIRSTDAY);
-$graph->scale->week->SetFont(FF_FONT0);
-
-// Setup a horizontal grid
-$graph->hgrid->Show();
-$graph->hgrid->SetRowFillColor('darkblue@0.9');
-
-
-for($i=0; $i<count($data); ++$i) {
-    $bar = new GanttBar($data[$i][0],$data[$i][1],$data[$i][2],$data[$i][3],"[5%]",10);
-    if( count($data[$i]) > 4 )
-	$bar->title->SetFont($data[$i][4],$data[$i][5],$data[$i][6]);
-    $bar->SetPattern(BAND_RDIAG,"yellow");
-    $bar->SetFillColor("red");
-    $graph->Add($bar);
-}
-
-// Setup a vertical marker line 
-$vline = new GanttVLine("2001-11-01");
-$vline->SetDayOffset(0.5);
-$vline->title->Set("2001-11-01");
-$vline->title->SetFont(FF_FONT1,FS_BOLD,10);
-$graph->Add($vline);
-
-// Setup a milestone
-$ms = new MileStone(6,"M5","2001-11-28","28/12");
-$ms->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->Add($ms);
-
-// And to show that you can also add an icon we add "Tux"
-$icon = new IconPlot('penguin.png',0.05,0.95,1,15);
-$icon->SetAnchor('left','bottom');
-$graph->Add($icon);
-
-// .. and finally send it back to the browser
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/gantthourex1.php b/#jpgraph/src/Examples/gantthourex1.php
deleted file mode 100644
index bfe55324..00000000
--- a/#jpgraph/src/Examples/gantthourex1.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// Gantt hour example
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_gantt.php');
-
-$graph = new GanttGraph();
-$graph->SetMarginColor('blue:1.7');
-$graph->SetColor('white');
-
-$graph->SetBackgroundGradient('navy','white',GRAD_HOR,BGRAD_MARGIN);
-$graph->scale->hour->SetBackgroundColor('lightyellow:1.5');
-$graph->scale->hour->SetFont(FF_FONT1);
-$graph->scale->day->SetBackgroundColor('lightyellow:1.5');
-$graph->scale->day->SetFont(FF_FONT1,FS_BOLD);
-
-$graph->title->Set("Example of hours in scale");
-$graph->title->SetColor('white');
-$graph->title->SetFont(FF_VERDANA,FS_BOLD,14);
-
-$graph->ShowHeaders(GANTT_HDAY | GANTT_HHOUR);
-
-$graph->scale->week->SetStyle(WEEKSTYLE_FIRSTDAY);
-$graph->scale->week->SetFont(FF_FONT1);
-$graph->scale->hour->SetIntervall(4);
-
-$graph->scale->hour->SetStyle(HOURSTYLE_HM24);
-$graph->scale->day->SetStyle(DAYSTYLE_SHORTDAYDATE3);
-
-$data = array(
-    array(0,"  Label 1", "2001-01-26 04:00","2001-01-26 14:00"),
-    array(1,"  Label 2", "2001-01-26 10:00","2001-01-26 18:00"),
-    array(2,"  Label 3", "2001-01-26","2001-01-27 10:00")
-);
-
-
-for($i=0; $i<count($data); ++$i) {
-	$bar = new GanttBar($data[$i][0],$data[$i][1],$data[$i][2],$data[$i][3],"[5%]",10);
-	if( count($data[$i])>4 )
-		$bar->title->SetFont($data[$i][4],$data[$i][5],$data[$i][6]);
-	$bar->SetPattern(BAND_RDIAG,"yellow");
-	$bar->SetFillColor("red");
-	$graph->Add($bar);
-}
-
-$graph->Stroke();
-
-
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/gantthourminex1.php b/#jpgraph/src/Examples/gantthourminex1.php
deleted file mode 100644
index 8a76bf12..00000000
--- a/#jpgraph/src/Examples/gantthourminex1.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// Gantt hour + minute example
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_gantt.php');
-
-// Some sample Gantt data
-$data = array(
-    array(0,array("Group 1","345 days","2004-03-01","2004-05-05"), "2001-11-27 10:00","2001-11-27 14:00",FF_FONT2,FS_NORMAL,0),
-    array(1,array("  Label one",' 122,5 days',' 2004-03-01',' 2003-05-05','MJ'), "2001-11-27 16:00","2001-11-27 18:00"),
-    array(2,"  Label two", "2001-11-27","2001-11-27 10:00"),
-    array(3,"  Label three", "2001-11-27","2001-11-27 08:00")
-);
-
-
-// Basic graph parameters
-$graph = new GanttGraph();
-$graph->SetMarginColor('darkgreen@0.8');
-$graph->SetColor('white');
-
-// We want to display day, hour and minute scales
-$graph->ShowHeaders(GANTT_HDAY | GANTT_HHOUR | GANTT_HMIN);
-
-// We want to have the following titles in our columns
-// describing each activity
-$graph->scale->actinfo->SetColTitles(
-    array('Act','Duration','Start','Finish','Resp'));//,array(100,70,70,70));
-
-// Uncomment the following line if you don't want the 3D look
-// in the columns headers
-//$graph->scale->actinfo->SetStyle(ACTINFO_2D);
-
-$graph->scale->actinfo->SetFont(FF_ARIAL,FS_NORMAL,10);
-
-//These are the default values for use in the columns
-//$graph->scale->actinfo->SetFontColor('black');
-//$graph->scale->actinfo->SetBackgroundColor('lightgray');
-//$graph->scale->actinfo->vgrid->SetStyle('solid');
-
-$graph->scale->actinfo->vgrid->SetColor('gray');
-$graph->scale->actinfo->SetColor('darkgray');
-
-// Setup day format
-$graph->scale->day->SetBackgroundColor('lightyellow:1.5');
-$graph->scale->day->SetFont(FF_ARIAL);
-$graph->scale->day->SetStyle(DAYSTYLE_SHORTDAYDATE1);
-
-// Setup hour format
-$graph->scale->hour->SetIntervall(1);
-$graph->scale->hour->SetBackgroundColor('lightyellow:1.5');
-$graph->scale->hour->SetFont(FF_FONT0);
-$graph->scale->hour->SetStyle(HOURSTYLE_H24);
-$graph->scale->hour->grid->SetColor('gray:0.8');
-
-// Setup minute format
-$graph->scale->minute->SetIntervall(30);
-$graph->scale->minute->SetBackgroundColor('lightyellow:1.5');
-$graph->scale->minute->SetFont(FF_FONT0);
-$graph->scale->minute->SetStyle(MINUTESTYLE_MM);
-$graph->scale->minute->grid->SetColor('lightgray');
-
-$graph->scale->tableTitle->Set('Phase 1');
-$graph->scale->tableTitle->SetFont(FF_ARIAL,FS_NORMAL,12);
-$graph->scale->SetTableTitleBackground('darkgreen@0.6');
-$graph->scale->tableTitle->Show(true);
-
-$graph->title->Set("Example of hours & mins scale");
-$graph->title->SetColor('darkgray');
-$graph->title->SetFont(FF_VERDANA,FS_BOLD,14);
-
-
-for($i=0; $i<count($data); ++$i) {
-    $bar = new GanttBar($data[$i][0],$data[$i][1],$data[$i][2],$data[$i][3]);
-    if( count($data[$i])>4 )
-        $bar->title->SetFont($data[$i][4],$data[$i][5],$data[$i][6]);
-    $bar->SetPattern(BAND_RDIAG,"yellow");
-    $bar->SetFillColor("gray");
-    $graph->Add($bar);
-}
-
-
-//$vline = new GanttVLine("2001-11-27");//d=1006858800,
-$vline = new GanttVLine("2001-11-27 9:00");//d=1006858800,
-$vline->SetWeight(5);
-$vline->SetDayOffset(0);
-$vline->title->Set("27/11 9:00");
-$vline->title->SetFont(FF_FONT1,FS_BOLD,10);
-$graph->Add($vline);
-
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/gantticonex1.php b/#jpgraph/src/Examples/gantticonex1.php
deleted file mode 100644
index b5a31976..00000000
--- a/#jpgraph/src/Examples/gantticonex1.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// Gantt example
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_gantt.php');
-
-// Basic Gantt graph
-$graph = new GanttGraph();
-$graph->title->Set("Gantt chart with title columns and icons");
-$graph->title->SetFont(FF_ARIAL, FS_BOLD,12);
-$graph->title->SetMargin(10);
-
-// Explicitely set the date range
-// (Autoscaling will of course also work)
-$graph->SetDateRange('2001-10-06','2002-4-10');
-
-// 1.5 line spacing to make more room
-$graph->SetVMarginFactor(1.5);
-
-// Setup some nonstandard colors
-$graph->SetMarginColor('darkgreen@0.95');
-$graph->SetBox(true,'yellow:0.6',2);
-$graph->SetFrame(true,'darkgreen',4);
-$graph->scale->divider->SetColor('yellow:0.6');
-$graph->scale->dividerh->SetColor('yellow:0.6');
-
-// Display month and year scale with the gridlines
-$graph->ShowHeaders(GANTT_HMONTH | GANTT_HYEAR);
-$graph->scale->month->grid->SetColor('gray');
-$graph->scale->month->grid->Show(true);
-$graph->scale->year->grid->SetColor('gray');
-$graph->scale->year->grid->Show(true);
-
-// For the titles we also add a minimum width of 100 pixels for the Task name column
-$graph->scale->actinfo->SetColTitles(
-    array('Note','Task','Duration','Start','Finish'),array(30,100));
-$graph->scale->actinfo->SetBackgroundColor('green:0.5@0.5');
-$graph->scale->actinfo->SetFont(FF_ARIAL,FS_NORMAL,10);
-$graph->scale->actinfo->vgrid->SetStyle('solid');
-$graph->scale->actinfo->vgrid->SetColor('gray');
-
-// Uncomment this to keep the columns but show no headers
-//$graph->scale->actinfo->Show(false);
-
-// Setup the icons we want to use
-$erricon = new IconImage(GICON_FOLDER,0.6);
-$startconicon = new IconImage(GICON_FOLDEROPEN,0.6);
-$endconicon = new IconImage(GICON_TEXTIMPORTANT,0.5);
-
-// Store the icons in the first column and use plain text in the others
-$data = array(
-	array(0,array($erricon,"Pre-study","102 days","23 Nov '01","1 Mar '02")
-	      , "2001-11-23","2002-03-1",FF_ARIAL,FS_NORMAL,8),
-	array(1,array($startconicon,"Prototype","21 days","26 Oct '01","16 Nov '01"),
-	      "2001-10-26","2001-11-16",FF_ARIAL,FS_NORMAL,8),
-	array(2,array($endconicon,"Report","12 days","1 Mar '02","13 Mar '02"),
-	      "2002-03-01","2002-03-13",FF_ARIAL,FS_NORMAL,8)
-);
-
-// Create the bars and add them to the gantt chart
-for($i=0; $i<count($data); ++$i) {
-	$bar = new GanttBar($data[$i][0],$data[$i][1],$data[$i][2],$data[$i][3],"[50%]",10);
-	if( count($data[$i])>4 )
-		$bar->title->SetFont($data[$i][4],$data[$i][5],$data[$i][6]);
-	$bar->SetPattern(BAND_RDIAG,"yellow");
-	$bar->SetFillColor("gray");
-	$bar->progress->Set(0.5);
-	$bar->progress->SetPattern(GANTT_SOLID,"darkgreen");
-	$bar->title->SetCSIMTarget(array('#1'.$i,'#2'.$i,'#3'.$i,'#4'.$i,'#5'.$i),array('11'.$i,'22'.$i,'33'.$i));
-	$graph->Add($bar);
-}
-
-// Output the chart
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/ganttmonthyearex1.php b/#jpgraph/src/Examples/ganttmonthyearex1.php
deleted file mode 100644
index 6bc7809c..00000000
--- a/#jpgraph/src/Examples/ganttmonthyearex1.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// Gantt example
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_gantt.php');
-
-$graph = new GanttGraph();
-
-$graph->title->Set("Only month & year scale");
-
-// Setup some "very" nonstandard colors
-$graph->SetMarginColor('lightgreen@0.8');
-$graph->SetBox(true,'yellow:0.6',2);
-$graph->SetFrame(true,'darkgreen',4);
-$graph->scale->divider->SetColor('yellow:0.6');
-$graph->scale->dividerh->SetColor('yellow:0.6');
-
-// Explicitely set the date range 
-// (Autoscaling will of course also work)
-$graph->SetDateRange('2001-10-06','2002-4-01');
-
-// Display month and year scale with the gridlines
-$graph->ShowHeaders(GANTT_HMONTH | GANTT_HYEAR);
-$graph->scale->month->grid->SetColor('gray');
-$graph->scale->month->grid->Show(true);
-$graph->scale->year->grid->SetColor('gray');
-$graph->scale->year->grid->Show(true);
-
-// Data for our example activities
-$data = array(
-	array(0,"Group 1  Johan", "2001-11-23","2002-03-1",FF_FONT1,FS_BOLD,8),
-	array(1,"  Label 2", "2001-10-26","2001-11-16"));
-	
-// Create the bars and add them to the gantt chart
-for($i=0; $i<count($data); ++$i) {
-	$bar = new GanttBar($data[$i][0],$data[$i][1],$data[$i][2],$data[$i][3],"[50%]",10);
-	if( count($data[$i])>4 )
-		$bar->title->SetFont($data[$i][4],$data[$i][5],$data[$i][6]);
-	$bar->SetPattern(BAND_RDIAG,"yellow");
-	$bar->SetFillColor("red");
-	$bar->progress->Set(0.5);
-	$bar->progress->SetPattern(GANTT_SOLID,"darkgreen");
-	$graph->Add($bar);
-}
-
-// Output the chart
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/ganttmonthyearex2.php b/#jpgraph/src/Examples/ganttmonthyearex2.php
deleted file mode 100644
index 4ed50925..00000000
--- a/#jpgraph/src/Examples/ganttmonthyearex2.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// Gantt example
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_gantt.php');
-
-$graph = new GanttGraph();
-
-$graph->title->Set("Only month & year scale");
-
-// Setup some "very" nonstandard colors
-$graph->SetMarginColor('lightgreen@0.8');
-$graph->SetBox(true,'yellow:0.6',2);
-$graph->SetFrame(true,'darkgreen',4);
-$graph->scale->divider->SetColor('yellow:0.6');
-$graph->scale->dividerh->SetColor('yellow:0.6');
-
-// Explicitely set the date range 
-// (Autoscaling will of course also work)
-$graph->SetDateRange('2001-10-06','2002-4-10');
-
-// Display month and year scale with the gridlines
-$graph->ShowHeaders(GANTT_HMONTH | GANTT_HYEAR);
-$graph->scale->month->grid->SetColor('gray');
-$graph->scale->month->grid->Show(true);
-$graph->scale->year->grid->SetColor('gray');
-$graph->scale->year->grid->Show(true);
-
-
-// Setup activity info
-
-// For the titles we also add a minimum width of 100 pixels for the Task name column
-$graph->scale->actinfo->SetColTitles(
-    array('Name','Duration','Start','Finish'),array(100));
-$graph->scale->actinfo->SetBackgroundColor('green:0.5@0.5');
-$graph->scale->actinfo->SetFont(FF_ARIAL,FS_NORMAL,10);
-$graph->scale->actinfo->vgrid->SetStyle('solid');
-$graph->scale->actinfo->vgrid->SetColor('gray');
-
-// Data for our example activities
-$data = array(
-	array(0,array("Pre-study","102 days","23 Nov '01","1 Mar '02")
-	      , "2001-11-23","2002-03-1",FF_ARIAL,FS_NORMAL,8),
-	array(1,array("Prototype","21 days","26 Oct '01","16 Nov '01"),
-	      "2001-10-26","2001-11-16",FF_ARIAL,FS_NORMAL,8),
-	array(2,array("Report","12 days","1 Mar '02","13 Mar '02"),
-	      "2002-03-01","2002-03-13",FF_ARIAL,FS_NORMAL,8)
-);
-	
-// Create the bars and add them to the gantt chart
-for($i=0; $i<count($data); ++$i) {
-	$bar = new GanttBar($data[$i][0],$data[$i][1],$data[$i][2],$data[$i][3],"[50%]",10);
-	if( count($data[$i])>4 )
-		$bar->title->SetFont($data[$i][4],$data[$i][5],$data[$i][6]);
-	$bar->SetPattern(BAND_RDIAG,"yellow");
-	$bar->SetFillColor("gray");
-	$bar->progress->Set(0.5);
-	$bar->progress->SetPattern(GANTT_SOLID,"darkgreen");
-	$graph->Add($bar);
-}
-
-// Output the chart
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/ganttmonthyearex3.php b/#jpgraph/src/Examples/ganttmonthyearex3.php
deleted file mode 100644
index fa0c3f67..00000000
--- a/#jpgraph/src/Examples/ganttmonthyearex3.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// Gantt example
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_gantt.php');
-
-$graph = new GanttGraph();
-
-$graph->title->Set("Only month & year scale");
-
-// Setup some "very" nonstandard colors
-$graph->SetMarginColor('lightgreen@0.8');
-$graph->SetBox(true,'yellow:0.6',2);
-$graph->SetFrame(true,'darkgreen',4);
-$graph->scale->divider->SetColor('yellow:0.6');
-$graph->scale->dividerh->SetColor('yellow:0.6');
-
-// Explicitely set the date range 
-// (Autoscaling will of course also work)
-$graph->SetDateRange('2001-10-06','2002-4-10');
-
-// Display month and year scale with the gridlines
-$graph->ShowHeaders(GANTT_HMONTH | GANTT_HYEAR);
-$graph->scale->month->grid->SetColor('gray');
-$graph->scale->month->grid->Show(true);
-$graph->scale->year->grid->SetColor('gray');
-$graph->scale->year->grid->Show(true);
-
-
-// Setup activity info
-
-// For the titles we also add a minimum width of 100 pixels for the Task name column
-$graph->scale->actinfo->SetColTitles(
-    array('Type','Name','Duration','Start','Finish'),array(40,100));
-$graph->scale->actinfo->SetBackgroundColor('green:0.5@0.5');
-$graph->scale->actinfo->SetFont(FF_ARIAL,FS_NORMAL,10);
-$graph->scale->actinfo->vgrid->SetStyle('solid');
-$graph->scale->actinfo->vgrid->SetColor('gray');
-
-// Data for our example activities
-$data = array(
-	array(0,array("","Pre-study","102 days","23 Nov '01","1 Mar '02")
-	      , "2001-11-23","2002-03-1",FF_ARIAL,FS_NORMAL,8),
-	array(1,array("","Prototype","21 days","26 Oct '01","16 Nov '01"),
-	      "2001-10-26","2001-11-16",FF_ARIAL,FS_NORMAL,8),
-	array(2,array("","Report","12 days","1 Mar '02","13 Mar '02"),
-	      "2002-03-01","2002-03-13",FF_ARIAL,FS_NORMAL,8)
-);
-	
-// Create the bars and add them to the gantt chart
-for($i=0; $i<count($data); ++$i) {
-	$bar = new GanttBar($data[$i][0],$data[$i][1],$data[$i][2],$data[$i][3],"[50%]",10);
-	if( count($data[$i])>4 )
-		$bar->title->SetFont($data[$i][4],$data[$i][5],$data[$i][6]);
-	$bar->SetPattern(BAND_RDIAG,"yellow");
-	$bar->SetFillColor("gray");
-	$bar->progress->Set(0.5);
-	$bar->progress->SetPattern(GANTT_SOLID,"darkgreen");
-	$graph->Add($bar);
-}
-
-// Output the chart
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/ganttmonthyearex4.php b/#jpgraph/src/Examples/ganttmonthyearex4.php
deleted file mode 100644
index defa2e73..00000000
--- a/#jpgraph/src/Examples/ganttmonthyearex4.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// Gantt example
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_gantt.php');
-
-$graph = new GanttGraph();
-
-$graph->title->Set("Adding a spaning title");
-
-// Setup some "very" nonstandard colors
-$graph->SetMarginColor('lightgreen@0.8');
-$graph->SetBox(true,'yellow:0.6',2);
-$graph->SetFrame(true,'darkgreen',4);
-$graph->scale->divider->SetColor('yellow:0.6');
-$graph->scale->dividerh->SetColor('yellow:0.6');
-
-// Explicitely set the date range
-// (Autoscaling will of course also work)
-$graph->SetDateRange('2001-11-06','2002-1-10');
-
-// Display month and year scale with the gridlines
-$graph->ShowHeaders(GANTT_HMONTH | GANTT_HYEAR | GANTT_HWEEK );
-$graph->scale->month->grid->SetColor('gray');
-$graph->scale->month->grid->Show(true);
-$graph->scale->year->grid->SetColor('gray');
-$graph->scale->year->grid->Show(true);
-
-
-//Setup spanning title
-$graph->scale->tableTitle->Set( 'Phase 1' );
-$graph->scale->tableTitle->SetFont( FF_ARIAL , FS_NORMAL , 16 );
-$graph->scale->SetTableTitleBackground( 'darkgreen@0.6' );
-$graph->scale->tableTitle->Show( true );
-
-// Setup activity info
-
-// For the titles we also add a minimum width of 100 pixels for the Task name column
-$graph->scale->actinfo->SetColTitles(array('Name','Duration','Start','Finish'),array(100));
-$graph->scale->actinfo->SetBackgroundColor('green:0.5@0.5');
-$graph->scale->actinfo->SetFont(FF_ARIAL,FS_NORMAL,10);
-$graph->scale->actinfo->vgrid->SetStyle('solid');
-$graph->scale->actinfo->vgrid->SetColor('gray');
-
-// Data for our example activities
-$data = array(
-	array(0,array("Pre-study","102 days","23 Nov '01","1 Mar '02")
-	      , "2001-11-23","2002-03-1",FF_ARIAL,FS_NORMAL,8),
-	array(1,array("Prototype","21 days","26 Oct '01","16 Nov '01"),
-	      "2001-10-26","2001-11-16",FF_ARIAL,FS_NORMAL,8),
-	array(2,array("Report","12 days","1 Mar '02","13 Mar '02"),
-	      "2002-03-01","2002-03-13",FF_ARIAL,FS_NORMAL,8)
-);
-
-// Create the bars and add them to the gantt chart
-for($i=0; $i<count($data); ++$i) {
-	$bar = new GanttBar($data[$i][0],$data[$i][1],$data[$i][2],$data[$i][3],"[50%]",10);
-	if( count($data[$i])>4 )
-		$bar->title->SetFont($data[$i][4],$data[$i][5],$data[$i][6]);
-	$bar->SetPattern(BAND_RDIAG,"yellow");
-	$bar->SetFillColor("gray");
-	$bar->progress->Set(0.5);
-	$bar->progress->SetPattern(GANTT_SOLID,"darkgreen");
-	$graph->Add($bar);
-}
-
-// Output the chart
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/ganttsimpleex1.php b/#jpgraph/src/Examples/ganttsimpleex1.php
deleted file mode 100644
index 63e4efb6..00000000
--- a/#jpgraph/src/Examples/ganttsimpleex1.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// Gantt example
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_gantt.php');
-
-// 
-// The data for the graphs
-//
-$data = array(
-  array(0,ACTYPE_GROUP,    "Phase 1",        "2001-10-26","2001-11-23",''),
-  array(1,ACTYPE_NORMAL,   "  Label 2",      "2001-10-26","2001-11-13",'[KJ]'),
-  array(2,ACTYPE_NORMAL,   "  Label 3",      "2001-11-20","2001-11-22",'[EP]'),
-  array(3,ACTYPE_MILESTONE,"  Phase 1 Done", "2001-11-23",'M2') );
-
-// Create the basic graph
-$graph = new GanttGraph();
-$graph->title->Set("Gantt Graph using CreateSimple()");
-
-// Setup scale
-$graph->ShowHeaders(GANTT_HYEAR | GANTT_HMONTH | GANTT_HDAY | GANTT_HWEEK);
-$graph->scale->week->SetStyle(WEEKSTYLE_FIRSTDAY);
-
-// Add the specified activities
-$graph->CreateSimple($data);
-
-// .. and stroke the graph
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/grace_ex0.php b/#jpgraph/src/Examples/grace_ex0.php
deleted file mode 100644
index 5358ae51..00000000
--- a/#jpgraph/src/Examples/grace_ex0.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-// Some data
-$datay=array(7,19,11,4,20);
-
-// Create the graph and setup the basic parameters 
-$graph = new Graph(300,200,'auto');	
-$graph->img->SetMargin(40,30,40,50);
-$graph->SetScale("textint");
-$graph->SetFrame(true,'blue',1); 
-$graph->SetColor('lightblue');
-$graph->SetMarginColor('lightblue');
-
-// Setup X-axis labels
-$a = $gDateLocale->GetShortMonth();
-$graph->xaxis->SetTickLabels($a);
-$graph->xaxis->SetFont(FF_FONT1);
-$graph->xaxis->SetColor('darkblue','black');
-
-// Setup "hidden" y-axis by given it the same color
-// as the background (this could also be done by setting the weight
-// to zero)
-$graph->yaxis->SetColor('lightblue','darkblue');
-$graph->ygrid->SetColor('white');
-
-// Setup graph title ands fonts
-$graph->title->Set('Using grace = 0');
-$graph->title->SetFont(FF_FONT2,FS_BOLD);
-$graph->xaxis->SetTitle('Year 2002','center');
-$graph->xaxis->SetTitleMargin(10);
-$graph->xaxis->title->SetFont(FF_FONT2,FS_BOLD);
-
-// Add some grace to the top so that the scale doesn't
-// end exactly at the max value. 
-$graph->yaxis->scale->SetGrace(0);
-
-                              
-// Create a bar pot
-$bplot = new BarPlot($datay);
-$bplot->SetFillColor('darkblue');
-$bplot->SetColor('darkblue');
-$bplot->SetWidth(0.5);
-$bplot->SetShadow('darkgray');
-
-// Setup the values that are displayed on top of each bar
-// Must use TTF fonts if we want text at an arbitrary angle
-$bplot->value->Show();
-$bplot->value->SetFont(FF_ARIAL,FS_NORMAL,8);
-$bplot->value->SetFormat('$%d');
-$bplot->value->SetColor('darkred');
-$bplot->value->SetAngle(45);
-$graph->Add($bplot);
-
-// Finally stroke the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/grace_ex1.php b/#jpgraph/src/Examples/grace_ex1.php
deleted file mode 100644
index 7544b445..00000000
--- a/#jpgraph/src/Examples/grace_ex1.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-// Some data
-$datay=array(7,19,11,4,20);
-
-// Create the graph and setup the basic parameters 
-$graph = new Graph(300,200,'auto');	
-$graph->img->SetMargin(40,30,40,50);
-$graph->SetScale("textint");
-$graph->SetFrame(true,'blue',1); 
-$graph->SetColor('lightblue');
-$graph->SetMarginColor('lightblue');
-
-// Setup X-axis labels
-$a = $gDateLocale->GetShortMonth();
-$graph->xaxis->SetTickLabels($a);
-$graph->xaxis->SetFont(FF_FONT1);
-$graph->xaxis->SetColor('darkblue','black');
-
-// Setup "hidden" y-axis by given it the same color
-// as the background (this could also be done by setting the weight
-// to zero)
-$graph->yaxis->SetColor('lightblue','darkblue');
-$graph->ygrid->SetColor('white');
-
-// Setup graph title ands fonts
-$graph->title->Set('Using grace = 10%');
-$graph->title->SetFont(FF_FONT2,FS_BOLD);
-$graph->xaxis->SetTitle('Year 2002','center');
-$graph->xaxis->SetTitleMargin(10);
-$graph->xaxis->title->SetFont(FF_FONT2,FS_BOLD);
-
-// Add some grace to the top so that the scale doesn't
-// end exactly at the max value. 
-$graph->yaxis->scale->SetGrace(10);
-
-                              
-// Create a bar pot
-$bplot = new BarPlot($datay);
-$bplot->SetFillColor('darkblue');
-$bplot->SetColor('darkblue');
-$bplot->SetWidth(0.5);
-$bplot->SetShadow('darkgray');
-
-// Setup the values that are displayed on top of each bar
-// Must use TTF fonts if we want text at an arbitrary angle
-$bplot->value->Show();
-$bplot->value->SetFont(FF_ARIAL,FS_NORMAL,8);
-$bplot->value->SetFormat('$%d');
-$bplot->value->SetColor('darkred');
-$bplot->value->SetAngle(45);
-$graph->Add($bplot);
-
-// Finally stroke the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/grace_ex2.php b/#jpgraph/src/Examples/grace_ex2.php
deleted file mode 100644
index eff8b8da..00000000
--- a/#jpgraph/src/Examples/grace_ex2.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-// Some data
-$datay=array(7,19,11,4,20);
-
-// Create the graph and setup the basic parameters 
-$graph = new Graph(300,200,'auto');	
-$graph->img->SetMargin(40,30,40,50);
-$graph->SetScale("textint");
-$graph->SetFrame(true,'blue',1); 
-$graph->SetColor('lightblue');
-$graph->SetMarginColor('lightblue');
-
-// Setup X-axis labels
-$a = $gDateLocale->GetShortMonth();
-$graph->xaxis->SetTickLabels($a);
-$graph->xaxis->SetFont(FF_FONT1);
-$graph->xaxis->SetColor('darkblue','black');
-
-// Setup "hidden" y-axis by given it the same color
-// as the background (this could also be done by setting the weight
-// to zero)
-$graph->yaxis->SetColor('lightblue','darkblue');
-$graph->ygrid->SetColor('white');
-
-// Setup graph title ands fonts
-$graph->title->Set('Using grace = 50%');
-$graph->title->SetFont(FF_FONT2,FS_BOLD);
-$graph->xaxis->SetTitle('Year 2002','center');
-$graph->xaxis->SetTitleMargin(10);
-$graph->xaxis->title->SetFont(FF_FONT2,FS_BOLD);
-
-// Add some grace to the top so that the scale doesn't
-// end exactly at the max value. 
-$graph->yaxis->scale->SetGrace(50);
-
-                              
-// Create a bar pot
-$bplot = new BarPlot($datay);
-$bplot->SetFillColor('darkblue');
-$bplot->SetColor('darkblue');
-$bplot->SetWidth(0.5);
-$bplot->SetShadow('darkgray');
-
-// Setup the values that are displayed on top of each bar
-// Must use TTF fonts if we want text at an arbitrary angle
-$bplot->value->Show();
-$bplot->value->SetFont(FF_ARIAL,FS_NORMAL,8);
-$bplot->value->SetFormat('$%d');
-$bplot->value->SetColor('darkred');
-$bplot->value->SetAngle(45);
-$graph->Add($bplot);
-
-// Finally stroke the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/grace_ex3.php b/#jpgraph/src/Examples/grace_ex3.php
deleted file mode 100644
index 40f7daf6..00000000
--- a/#jpgraph/src/Examples/grace_ex3.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-// Some data
-$datay=array(7,19,11,4,20);
-
-// Create the graph and setup the basic parameters 
-$graph = new Graph(300,200,'auto');	
-$graph->img->SetMargin(40,30,40,50);
-$graph->SetScale("textint");
-$graph->SetFrame(true,'blue',1); 
-$graph->SetColor('lightblue');
-$graph->SetMarginColor('lightblue');
-
-// Setup X-axis labels
-$a = $gDateLocale->GetShortMonth();
-$graph->xaxis->SetTickLabels($a);
-$graph->xaxis->SetFont(FF_FONT1);
-$graph->xaxis->SetColor('darkblue','black');
-
-// Setup "hidden" y-axis by given it the same color
-// as the background (this could also be done by setting the weight
-// to zero)
-$graph->yaxis->SetColor('lightblue','darkblue');
-$graph->ygrid->SetColor('white');
-
-// Setup graph title ands fonts
-$graph->title->Set('Using grace = 100%');
-$graph->title->SetFont(FF_FONT2,FS_BOLD);
-$graph->xaxis->SetTitle('Year 2002','center');
-$graph->xaxis->SetTitleMargin(10);
-$graph->xaxis->title->SetFont(FF_FONT2,FS_BOLD);
-
-// Add some grace to the top so that the scale doesn't
-// end exactly at the max value. 
-$graph->yaxis->scale->SetGrace(100);
-
-                              
-// Create a bar pot
-$bplot = new BarPlot($datay);
-$bplot->SetFillColor('darkblue');
-$bplot->SetColor('darkblue');
-$bplot->SetWidth(0.5);
-$bplot->SetShadow('darkgray');
-
-// Setup the values that are displayed on top of each bar
-// Must use TTF fonts if we want text at an arbitrary angle
-$bplot->value->Show();
-$bplot->value->SetFont(FF_ARIAL,FS_NORMAL,8);
-$bplot->value->SetFormat('$%d');
-$bplot->value->SetColor('darkred');
-$bplot->value->SetAngle(45);
-$graph->Add($bplot);
-
-// Finally stroke the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/gradbkgex1.php b/#jpgraph/src/Examples/gradbkgex1.php
deleted file mode 100644
index 0509e41e..00000000
--- a/#jpgraph/src/Examples/gradbkgex1.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$datay1 = array(4,26,12,18,8,22);
-$datay2 = array(12,9,42,8,20,19);
-
-// Setup the graph
-$graph = new Graph(300,200);
-$graph->SetMarginColor('white');
-$graph->SetScale("textlin",0,50);
-$graph->SetMargin(30,50,30,30);
-
-// We must have the frame enabled to get the gradient
-// However, we don't want the frame line so we set it to
-// white color which makes it invisible.
-$graph->SetFrame(true,'white');
-
-// Setup a background gradient image
-$graph->SetBackgroundGradient('blue','navy:0.5',GRAD_HOR,BGRAD_PLOT);
-
-// Setup the tab title
-$graph->tabtitle->Set(' 3rd Division ' );
-$graph->tabtitle->SetFont(FF_ARIAL,FS_BOLD,13);
-
-// Setup x,Y grid
-$graph->xgrid->Show();
-$graph->xgrid->SetColor('gray@0.5');
-$graph->xaxis->SetTickLabels($gDateLocale->GetShortMonth());
-$graph->ygrid->SetColor('gray@0.5');
-
-// Setup color for axis and labels on axis
-$graph->xaxis->SetColor('orange','black');
-$graph->yaxis->SetColor('orange','black');
-
-// Ticks on the outsid
-$graph->xaxis->SetTickSide(SIDE_DOWN);
-$graph->yaxis->SetTickSide(SIDE_LEFT);
-
-// Setup the legend box colors and font
-$graph->legend->SetColor('white','navy');
-$graph->legend->SetFillColor('navy@0.25');
-$graph->legend->SetFont(FF_ARIAL,FS_BOLD,8);
-$graph->legend->SetShadow('darkgray@0.4',3);
-$graph->legend->SetPos(0.05,0.05,'right','top');
-
-// Create the first line
-$p1 = new LinePlot($datay1);
-$p1->SetColor("red");
-$p1->SetWeight(2);
-$p1->SetLegend('2002');
-$graph->Add($p1);
-
-// Create the second line
-$p2 = new LinePlot($datay2);
-$p2->SetColor("lightyellow");
-$p2->SetLegend('2001');
-$p2->SetWeight(2);
-$graph->Add($p2);
-
-// Output line
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/gradlinefillex1.php b/#jpgraph/src/Examples/gradlinefillex1.php
deleted file mode 100644
index 06520e2e..00000000
--- a/#jpgraph/src/Examples/gradlinefillex1.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$datay = array(20,15,33,5,17,35,22);
-
-// Setup the graph
-$graph = new Graph(400,200);
-$graph->SetMargin(40,40,20,30);	
-$graph->SetScale("intlin");
-$graph->SetMarginColor('darkgreen@0.8');
-
-$graph->title->Set('Gradient filled line plot');
-$graph->yscale->SetAutoMin(0);
-
-// Create the line
-$p1 = new LinePlot($datay);
-$p1->SetColor("blue");
-$p1->SetWeight(0);
-$p1->SetFillGradient('red','yellow');
-
-$graph->Add($p1);
-
-// Output line
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/gradlinefillex2.php b/#jpgraph/src/Examples/gradlinefillex2.php
deleted file mode 100644
index 97887445..00000000
--- a/#jpgraph/src/Examples/gradlinefillex2.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$datay = array(20,10,35,5,17,35,22);
-
-// Setup the graph
-$graph = new Graph(400,200);
-$graph->SetMargin(40,40,20,30);	
-$graph->SetScale("intlin");
-$graph->SetBox();
-$graph->SetMarginColor('darkgreen@0.8');
-
-// Setup a background gradient image
-$graph->SetBackgroundGradient('darkred','yellow',GRAD_HOR,BGRAD_PLOT);
-
-$graph->title->Set('Gradient filled line plot ex2');
-$graph->yscale->SetAutoMin(0);
-
-// Create the line
-$p1 = new LinePlot($datay);
-$p1->SetFillGradient('white','darkgreen');
-$graph->Add($p1);
-
-// Output line
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/gradlinefillex3.php b/#jpgraph/src/Examples/gradlinefillex3.php
deleted file mode 100644
index 17b6e515..00000000
--- a/#jpgraph/src/Examples/gradlinefillex3.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$datay = array(20,10,35,5,17,35,22);
-
-// Setup the graph
-$graph = new Graph(400,200);
-$graph->SetMargin(40,40,20,30);	
-$graph->SetScale("intlin");
-$graph->SetBox();
-$graph->SetMarginColor('darkgreen@0.8');
-
-// Setup a background gradient image
-$graph->SetBackgroundGradient('darkred','yellow',GRAD_HOR,BGRAD_PLOT);
-
-$graph->title->Set('Gradient filled line plot ex3');
-$graph->yscale->SetAutoMin(0);
-
-// Create the line
-$p1 = new LinePlot($datay);
-$p1->SetFillGradient('white','darkgreen',4);
-$graph->Add($p1);
-
-// Output line
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/gradlinefillex4.php b/#jpgraph/src/Examples/gradlinefillex4.php
deleted file mode 100644
index f921560e..00000000
--- a/#jpgraph/src/Examples/gradlinefillex4.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$datay = array(20,10,35,5,17,35,22);
-
-// Setup the graph
-$graph = new Graph(400,200);
-$graph->SetMargin(40,40,20,30);	
-$graph->SetScale("intlin");
-$graph->SetBox();
-$graph->SetMarginColor('darkgreen@0.8');
-
-// Setup a background gradient image
-$graph->SetBackgroundGradient('darkred','yellow',GRAD_HOR,BGRAD_PLOT);
-
-$graph->title->Set('Gradient filled line plot ex2');
-$graph->yscale->SetAutoMin(0);
-
-// Create the line
-$p1 = new LinePlot($datay);
-$p1->SetFillGradient('white','darkgreen');
-$p1->SetStepStyle();
-$graph->Add($p1);
-
-// Output line
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/green_example.php b/#jpgraph/src/Examples/green_example.php
deleted file mode 100644
index 4c939d2d..00000000
--- a/#jpgraph/src/Examples/green_example.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$theme = isset($_GET['theme']) ? $_GET['theme'] : null;
-
-$data = array (
-  0 => array (0 => 79, 1 => -25, 2 => -7, 3 => 85, 4 => -26, 5 => -32, ),
-  1 => array (0 => 76, 1 => 51, 2 => 86, 3 => 12, 4 => -7, 5 => 94, ),
-  2 => array (0 => 49, 1 => 38, 2 => 7, 3 => -40, 4 => 9, 5 => -7, ),
-  3 => array ( 0 => 69, 1 => 96, 2 => 49, 3 => 7, 4 => 92, 5 => -38, ),
-  4 => array ( 0 => 68, 1 => 16, 2 => 82, 3 => -49, 4 => 50, 5 => 7, ),
-  5 => array ( 0 => -37, 1 => 28, 2 => 32, 3 => 6, 4 => 13, 5 => 57, ),
-  6 => array ( 0 => 24, 1 => -11, 2 => 7, 3 => 10, 4 => 51, 5 => 51, ),
-  7 => array ( 0 => 3, 1 => -1, 2 => -12, 3 => 61, 4 => 10, 5 => 47, ),
-  8 => array ( 0 => -47, 1 => -21, 2 => 43, 3 => 53, 4 => 36, 5 => 34, ),
-);
-
-
-// Create the graph. These two calls are always required
-$graph = new Graph(400,300);    
-
-$graph->SetScale("textlin");
-if ($theme) {
-  $graph->SetTheme(new $theme());
-}
-$theme_class = new GreenTheme;
-$graph->SetTheme($theme_class);
-
-$plot = array();
-// Create the bar plots
-for ($i = 0; $i < 4; $i++) {
-  $plot[$i] = new BarPlot($data[$i]);
-  $plot[$i]->SetLegend('plot'.($i+1));
-}
-//$acc1 = new AccBarPlot(array($plot[0], $plot[1]));
-//$acc1->value->Show();
-$gbplot = new GroupBarPlot(array($plot[2], $plot[1] ));
-
-for ($i = 4; $i < 8; $i++) {
-  $plot[$i] = new LinePlot($data[$i]);
-  $plot[$i]->SetLegend('plot'.$i);
-  $plot[$i]->value->Show();
-}
-
-$graph->Add($gbplot);
-$graph->Add($plot[4]);
-
-$title = "GreenTheme Example";
-$title = mb_convert_encoding($title,'UTF-8');
-$graph->title->Set($title);
-$graph->xaxis->title->Set("X-title");
-$graph->yaxis->title->Set("Y-title");
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/groupbarex1.php b/#jpgraph/src/Examples/groupbarex1.php
deleted file mode 100644
index 40f28ee3..00000000
--- a/#jpgraph/src/Examples/groupbarex1.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// $Id: groupbarex1.php,v 1.2 2002/07/11 23:27:28 aditus Exp $
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-$datay1=array(35,160,0,0,0,0);
-$datay2=array(35,190,190,190,190,190);
-$datay3=array(20,70,70,140,230,260);
-
-$graph = new Graph(450,200,'auto');	
-$graph->SetScale("textlin");
-$graph->SetShadow();
-$graph->img->SetMargin(40,30,40,40);
-$graph->xaxis->SetTickLabels($gDateLocale->GetShortMonth());
-
-$graph->xaxis->title->Set('Year 2002');
-$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD);
-
-$graph->title->Set('Group bar plot');
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-
-$bplot1 = new BarPlot($datay1);
-$bplot2 = new BarPlot($datay2);
-$bplot3 = new BarPlot($datay3);
-
-$bplot1->SetFillColor("orange");
-$bplot2->SetFillColor("brown");
-$bplot3->SetFillColor("darkgreen");
-
-$bplot1->SetShadow();
-$bplot2->SetShadow();
-$bplot3->SetShadow();
-
-$bplot1->SetShadow();
-$bplot2->SetShadow();
-$bplot3->SetShadow();
-
-$gbarplot = new GroupBarPlot(array($bplot1,$bplot2,$bplot3));
-$gbarplot->SetWidth(0.6);
-$graph->Add($gbarplot);
-
-$graph->Stroke();
-?>
-
diff --git a/#jpgraph/src/Examples/heat1.jpg b/#jpgraph/src/Examples/heat1.jpg
deleted file mode 100644
index 07f04d76..00000000
Binary files a/#jpgraph/src/Examples/heat1.jpg and /dev/null differ
diff --git a/#jpgraph/src/Examples/horizbarex1.php b/#jpgraph/src/Examples/horizbarex1.php
deleted file mode 100644
index bc5055fc..00000000
--- a/#jpgraph/src/Examples/horizbarex1.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-$datay=array(2,3,5,8,12,6,3);
-$datax=array('Jan','Feb','Mar','Apr','May','Jun','Jul');
-
-// Size of graph
-$width=400;
-$height=500;
-
-// Set the basic parameters of the graph
-$graph = new Graph($width,$height,'auto');
-$graph->SetScale('textlin');
-
-// Rotate graph 90 degrees and set margin
-$graph->Set90AndMargin(50,20,50,30);
-
-// Nice shadow
-$graph->SetShadow();
-
-// Setup title
-$graph->title->Set('Horizontal bar graph ex 1');
-$graph->title->SetFont(FF_VERDANA,FS_BOLD,14);
-
-// Setup X-axis
-$graph->xaxis->SetTickLabels($datax);
-$graph->xaxis->SetFont(FF_VERDANA,FS_NORMAL,12);
-
-// Some extra margin looks nicer
-$graph->xaxis->SetLabelMargin(10);
-
-// Label align for X-axis
-$graph->xaxis->SetLabelAlign('right','center');
-
-// Add some grace to y-axis so the bars doesn't go
-// all the way to the end of the plot area
-$graph->yaxis->scale->SetGrace(20);
-
-// We don't want to display Y-axis
-$graph->yaxis->Hide();
-
-// Now create a bar pot
-$bplot = new BarPlot($datay);
-$bplot->SetFillColor('orange');
-$bplot->SetShadow();
-
-//You can change the width of the bars if you like
-//$bplot->SetWidth(0.5);
-
-// We want to display the value of each bar at the top
-$bplot->value->Show();
-$bplot->value->SetFont(FF_ARIAL,FS_BOLD,12);
-$bplot->value->SetAlign('left','center');
-$bplot->value->SetColor('black','darkred');
-$bplot->value->SetFormat('%.1f mkr');
-
-// Add the bar to the graph
-$graph->Add($bplot);
-
-// .. and stroke the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/horizbarex2.php b/#jpgraph/src/Examples/horizbarex2.php
deleted file mode 100644
index d50bb7d4..00000000
--- a/#jpgraph/src/Examples/horizbarex2.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-$datay=array(2,3,5,8,12,6,3);
-$datax=array("Jan","Feb","Mar","Apr","May","Jun","Jul");
-
-$width=400; 
-$height=500;
-
-// Set the basic parameters of the graph 
-$graph = new Graph($width,$height,'auto');
-$graph->SetScale("textlin");
-
-$top = 80;
-$bottom = 30;
-$left = 50;
-$right = 30;
-$graph->Set90AndMargin($left,$right,$top,$bottom);
-
-// Nice shadow
-$graph->SetShadow();
-
-// Setup title
-$graph->title->Set("Horizontal bar graph ex 2");
-$graph->title->SetFont(FF_VERDANA,FS_BOLD,14);
-$graph->subtitle->Set("(Axis at top)");
-
-// Setup X-axis
-$graph->xaxis->SetTickLabels($datax);
-$graph->xaxis->SetFont(FF_VERDANA,FS_NORMAL,12);
-
-// Some extra margin looks nicer
-$graph->xaxis->SetLabelMargin(5);
-
-// Label align for X-axis
-$graph->xaxis->SetLabelAlign('right','center');
-
-// Add some grace to y-axis so the bars doesn't go
-// all the way to the end of the plot area
-$graph->yaxis->scale->SetGrace(20);
-$graph->yaxis->SetLabelAlign('center','bottom');
-$graph->yaxis->SetLabelAngle(45);
-$graph->yaxis->SetLabelFormat('%d');
-$graph->yaxis->SetFont(FF_VERDANA,FS_NORMAL,12);
-
-// We don't want to display Y-axis
-//$graph->yaxis->Hide();
-
-// Now create a bar pot
-$bplot = new BarPlot($datay);
-$bplot->SetFillColor("orange");
-$bplot->SetShadow();
-
-//You can change the width of the bars if you like
-//$bplot->SetWidth(0.5);
-
-// We want to display the value of each bar at the top
-$bplot->value->Show();
-$bplot->value->SetFont(FF_ARIAL,FS_BOLD,12);
-$bplot->value->SetAlign('left','center');
-$bplot->value->SetColor("black","darkred");
-$bplot->value->SetFormat('%.1f mkr');
-
-// Add the bar to the graph
-$graph->Add($bplot);
-
-
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/horizbarex3.php b/#jpgraph/src/Examples/horizbarex3.php
deleted file mode 100644
index c0d5a49f..00000000
--- a/#jpgraph/src/Examples/horizbarex3.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-$datay=array(2,3,-5,8,12,6,3);
-$datax=array("Jan","Feb","Mar","Apr","May","Jun","Jul");
-
-// Size of graph
-$width=400; 
-$height=500;
-
-// Set the basic parameters of the graph 
-$graph = new Graph($width,$height,'auto');
-$graph->SetScale("textlin");
-
-$top = 50;
-$bottom = 80;
-$left = 50;
-$right = 20;
-$graph->Set90AndMargin($left,$right,$top,$bottom);
-
-$graph->xaxis->SetPos('min');
-
-// Nice shadow
-$graph->SetShadow();
-
-// Setup title
-$graph->title->Set("Horizontal bar graph ex 3");
-$graph->title->SetFont(FF_VERDANA,FS_BOLD,14);
-$graph->subtitle->Set("(Axis at bottom)");
-
-// Setup X-axis
-$graph->xaxis->SetTickLabels($datax);
-$graph->xaxis->SetFont(FF_FONT2,FS_BOLD,12);
-
-// Some extra margin looks nicer
-$graph->xaxis->SetLabelMargin(5);
-
-// Label align for X-axis
-$graph->xaxis->SetLabelAlign('right','center');
-
-// Add some grace to y-axis so the bars doesn't go
-// all the way to the end of the plot area
-$graph->yaxis->scale->SetGrace(20);
-
-// Setup the Y-axis to be displayed in the bottom of the 
-// graph. We also finetune the exact layout of the title,
-// ticks and labels to make them look nice.
-$graph->yaxis->SetPos('max');
-
-// First make the labels look right
-$graph->yaxis->SetLabelAlign('center','top');
-$graph->yaxis->SetLabelFormat('%d');
-$graph->yaxis->SetLabelSide(SIDE_RIGHT);
-
-// The fix the tick marks
-$graph->yaxis->SetTickSide(SIDE_LEFT);
-
-// Finally setup the title
-$graph->yaxis->SetTitleSide(SIDE_RIGHT);
-$graph->yaxis->SetTitleMargin(35);
-
-// To align the title to the right use :
-$graph->yaxis->SetTitle('Turnaround 2002','high');
-$graph->yaxis->title->Align('right');
-
-// To center the title use :
-//$graph->yaxis->SetTitle('Turnaround 2002','center');
-//$graph->yaxis->title->Align('center');
-
-$graph->yaxis->title->SetFont(FF_ARIAL,FS_BOLD,12);
-$graph->yaxis->title->SetAngle(0);
-
-$graph->yaxis->SetFont(FF_FONT2,FS_NORMAL);
-// If you want the labels at an angle other than 0 or 90
-// you need to use TTF fonts
-//$graph->yaxis->SetLabelAngle(0);
-
-// Now create a bar pot
-$bplot = new BarPlot($datay);
-$bplot->SetFillColor("orange");
-$bplot->SetShadow();
-
-//You can change the width of the bars if you like
-//$bplot->SetWidth(0.5);
-
-// We want to display the value of each bar at the top
-$bplot->value->Show();
-$bplot->value->SetFont(FF_ARIAL,FS_BOLD,12);
-$bplot->value->SetAlign('left','center');
-$bplot->value->SetColor("black","darkred");
-$bplot->value->SetFormat('%.1f mkr');
-
-// Add the bar to the graph
-$graph->Add($bplot);
-
-
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/horizbarex4.php b/#jpgraph/src/Examples/horizbarex4.php
deleted file mode 100644
index 5f51be48..00000000
--- a/#jpgraph/src/Examples/horizbarex4.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// $Id: horizbarex4.php,v 1.4 2002/11/17 23:59:27 aditus Exp $
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-$datay=array(1992,1993,1995,1996,1997,1998,2001);
-
-// Size of graph
-$width=400;
-$height=500;
-
-// Set the basic parameters of the graph
-$graph = new Graph($width,$height);
-$graph->SetScale('textlin');
-
-$top = 60;
-$bottom = 30;
-$left = 80;
-$right = 30;
-$graph->Set90AndMargin($left,$right,$top,$bottom);
-
-// Nice shadow
-$graph->SetShadow();
-
-// Setup labels
-$lbl = array("Andrew\nTait","Thomas\nAnderssen","Kevin\nSpacey","Nick\nDavidsson",
-"David\nLindquist","Jason\nTait","Lorin\nPersson");
-$graph->xaxis->SetTickLabels($lbl);
-
-// Label align for X-axis
-$graph->xaxis->SetLabelAlign('right','center','right');
-
-// Label align for Y-axis
-$graph->yaxis->SetLabelAlign('center','bottom');
-
-// Titles
-$graph->title->Set('Number of incidents');
-
-// Create a bar pot
-$bplot = new BarPlot($datay);
-$bplot->SetFillColor('orange');
-$bplot->SetWidth(0.5);
-$bplot->SetYMin(1990);
-
-$graph->Add($bplot);
-
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/horizbarex6.php b/#jpgraph/src/Examples/horizbarex6.php
deleted file mode 100644
index 8ab4cbc6..00000000
--- a/#jpgraph/src/Examples/horizbarex6.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-$datay=array(2,3,5,8,12,6,3);
-$datax=array("320x240","640x480","600x800","1024x768","1280x1024(16)","1280x1024(32)",
-	     "1600x1200(32)");
-
-// Size of graph
-$width=300; 
-$height=400;
-
-// Set the basic parameters of the graph 
-$graph = new Graph($width,$height,'auto');
-$graph->SetScale("textlin");
-
-// No frame around the image
-$graph->SetFrame(false);
-
-// Rotate graph 90 degrees and set margin
-$graph->Set90AndMargin(100,20,50,30);
-
-// Set white margin color
-$graph->SetMarginColor('white');
-
-// Use a box around the plot area
-$graph->SetBox();
-
-// Use a gradient to fill the plot area
-$graph->SetBackgroundGradient('white','lightblue',GRAD_HOR,BGRAD_PLOT);
-
-// Setup title
-$graph->title->Set("Graphic card performance");
-$graph->title->SetFont(FF_VERDANA,FS_BOLD,11);
-$graph->subtitle->Set("(Non optimized)");
-
-// Setup X-axis
-$graph->xaxis->SetTickLabels($datax);
-$graph->xaxis->SetFont(FF_VERDANA,FS_NORMAL,8);
-
-// Some extra margin looks nicer
-$graph->xaxis->SetLabelMargin(10);
-
-// Label align for X-axis
-$graph->xaxis->SetLabelAlign('right','center');
-
-// Add some grace to y-axis so the bars doesn't go
-// all the way to the end of the plot area
-$graph->yaxis->scale->SetGrace(20);
-
-// We don't want to display Y-axis
-$graph->yaxis->Hide();
-
-// Now create a bar pot
-$bplot = new BarPlot($datay);
-$bplot->SetShadow();
-
-//You can change the width of the bars if you like
-//$bplot->SetWidth(0.5);
-
-// Set gradient fill for bars
-$bplot->SetFillGradient('darkred','yellow',GRAD_HOR);
-
-// We want to display the value of each bar at the top
-$bplot->value->Show();
-$bplot->value->SetFont(FF_ARIAL,FS_BOLD,10);
-//$bplot->value->SetAlign('left','center');
-$bplot->value->SetColor("white");
-$bplot->value->SetFormat('%.1f');
-$bplot->SetValuePos('max');
-
-// Add the bar to the graph
-$graph->Add($bplot);
-
-// Add some explanation text
-$txt = new Text('Note: Higher value is better.');
-$txt->SetPos(190,399,'center','bottom');
-$txt->SetFont(FF_ARIAL,FS_NORMAL,8);
-$graph->Add($txt);
-
-// .. and stroke the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/icon.jpg b/#jpgraph/src/Examples/icon.jpg
deleted file mode 100644
index dc3b3029..00000000
Binary files a/#jpgraph/src/Examples/icon.jpg and /dev/null differ
diff --git a/#jpgraph/src/Examples/imgmarkercsimex1.php b/#jpgraph/src/Examples/imgmarkercsimex1.php
deleted file mode 100644
index 2c91a0dd..00000000
--- a/#jpgraph/src/Examples/imgmarkercsimex1.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-require_once ('jpgraph/jpgraph_scatter.php');
-
-$datay1 = array(4,26,15,44);
-
-// Setup the graph
-$graph = new Graph(300,200);
-$graph->SetMarginColor('white');
-$graph->SetScale("textlin");
-$graph->SetFrame(false);
-$graph->SetMargin(30,5,25,20);
-
-// Setup the tab
-$graph->tabtitle->Set(' Year 2003 ' );
-$graph->tabtitle->SetFont(FF_ARIAL,FS_BOLD,13);
-$graph->tabtitle->SetColor('darkred','#E1E1FF');
-
-// Enable X-grid as well
-$graph->xgrid->Show();
-
-// Use months as X-labels
-$graph->xaxis->SetTickLabels($gDateLocale->GetShortMonth());
-
-// Create the plot
-$p1 = new LinePlot($datay1);
-$p1->SetColor("navy");
-
-$p1->SetCSIMTargets(array('#1','#2','#3','#4','#5'));
-
-// Use an image of favourite car as 
-$p1->mark->SetType(MARK_IMG,'saab_95.jpg',0.5);
-//$p1->mark->SetType(MARK_SQUARE);
-
-// Displayes value on top of marker image
-$p1->value->SetFormat('%d mil');
-$p1->value->Show();
-$p1->value->SetColor('darkred');
-$p1->value->SetFont(FF_ARIAL,FS_BOLD,10);
-// Increase the margin so that the value is printed avove tje
-// img marker
-$p1->value->SetMargin(14);
-
-// Incent the X-scale so the first and last point doesn't
-// fall on the edges
-$p1->SetCenter();
-
-$graph->Add($p1);
-
-$graph->StrokeCSIM();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/imgmarkerex1.php b/#jpgraph/src/Examples/imgmarkerex1.php
deleted file mode 100644
index 9f5e8ce6..00000000
--- a/#jpgraph/src/Examples/imgmarkerex1.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-require_once ('jpgraph/jpgraph_scatter.php');
-
-$datay1 = array(4,26,15,44);
-
-// Setup the graph
-$graph = new Graph(300,200);
-$graph->SetMarginColor('white');
-$graph->SetScale("textlin");
-$graph->SetFrame(false);
-$graph->SetMargin(30,5,25,20);
-
-// Setup the tab
-$graph->tabtitle->Set(' Year 2003 ' );
-$graph->tabtitle->SetFont(FF_ARIAL,FS_BOLD,13);
-$graph->tabtitle->SetColor('darkred','#E1E1FF');
-
-// Enable X-grid as well
-$graph->xgrid->Show();
-
-// Use months as X-labels
-$graph->xaxis->SetTickLabels($gDateLocale->GetShortMonth());
-
-// Create the plot
-$p1 = new LinePlot($datay1);
-$p1->SetColor("navy");
-
-// Use an image of favourite car as marker
-$p1->mark->SetType(MARK_IMG,'saab_95.jpg',0.5);
-
-// Displayes value on top of marker image
-$p1->value->SetFormat('%d mil');
-$p1->value->Show();
-$p1->value->SetColor('darkred');
-$p1->value->SetFont(FF_ARIAL,FS_BOLD,10);
-// Increase the margin so that the value is printed avove tje
-// img marker
-$p1->value->SetMargin(14);
-
-// Incent the X-scale so the first and last point doesn't
-// fall on the edges
-$p1->SetCenter();
-
-$graph->Add($p1);
-
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/impulsex1.php b/#jpgraph/src/Examples/impulsex1.php
deleted file mode 100644
index ff893833..00000000
--- a/#jpgraph/src/Examples/impulsex1.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_scatter.php');
-
-$datay = array(20,22,12,13,17,20,16,19,30,31,40,43);
-
-$graph = new Graph(300,200);
-$graph->SetScale("textlin");
-
-$graph->SetShadow();
-$graph->img->SetMargin(40,40,40,40);		
-
-$graph->title->Set("Simple mpuls plot");
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-
-$sp1 = new ScatterPlot($datay);
-$sp1->mark->SetType(MARK_SQUARE);
-$sp1->SetImpuls();
-
-$graph->Add($sp1);
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/impulsex2.php b/#jpgraph/src/Examples/impulsex2.php
deleted file mode 100644
index 8ea45973..00000000
--- a/#jpgraph/src/Examples/impulsex2.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_scatter.php');
-
-$datay = array(20,22,12,13,17,20,16,19,30,31,40,43);
-
-$graph = new Graph(300,200);
-$graph->SetScale("textlin");
-
-$graph->SetShadow();
-$graph->img->SetMargin(40,40,40,40);		
-
-$graph->title->Set("Impuls plot, variant 2");
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->title->Set("Impuls respons");
-$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD);
-
-$sp1 = new ScatterPlot($datay);//,$datax);
-$sp1->mark->SetType(MARK_FILLEDCIRCLE);
-$sp1->mark->SetFillColor("red");
-$sp1->mark->SetWidth(4);
-$sp1->SetImpuls();
-$sp1->SetColor("blue");
-$sp1->SetWeight(3);
-
-$graph->Add($sp1);
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/impulsex3.php b/#jpgraph/src/Examples/impulsex3.php
deleted file mode 100644
index f7b5182e..00000000
--- a/#jpgraph/src/Examples/impulsex3.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_scatter.php');
-
-$numpoints=50;
-$k=0.05;
-
-// Create some data points
-for($i=0; $i<$numpoints; ++$i) {
-	$datay[$i]=exp(-$k*$i)*cos(2*M_PI/10*$i);
-}
-
-// A format callbakc function
-function mycallback($l) {
-	return sprintf("%02.2f",$l);
-}
-
-// Setup the basic parameters for the graph
-$graph = new Graph(400,200);
-$graph->SetScale("intlin");
-$graph->SetShadow();
-$graph->SetBox();
-
-$graph->title->Set("Impuls Example 3");
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-
-// Set format callback for labels
-$graph->yaxis->SetLabelFormatCallback("mycallback");
-
-// Set X-axis at the minimum value of Y-axis (default will be at 0)
-$graph->xaxis->SetPos("min");	// "min" will position the x-axis at the minimum value of the Y-axis
-
-// Extend the margin for the labels on the Y-axis and reverse the direction
-// of the ticks on the Y-axis
-$graph->yaxis->SetLabelMargin(12);
-$graph->xaxis->SetLabelMargin(6);
-$graph->yaxis->SetTickSide(SIDE_LEFT);
-$graph->xaxis->SetTickSide(SIDE_DOWN);
-
-// Create a new impuls type scatter plot
-$sp1 = new ScatterPlot($datay);
-$sp1->mark->SetType(MARK_SQUARE);
-$sp1->mark->SetFillColor("red");
-$sp1->SetImpuls();
-$sp1->SetColor("blue");
-$sp1->SetWeight(1);
-$sp1->mark->SetWidth(3);
-
-$graph->Add($sp1);
-
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/impulsex4.php b/#jpgraph/src/Examples/impulsex4.php
deleted file mode 100644
index ac497ade..00000000
--- a/#jpgraph/src/Examples/impulsex4.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_scatter.php');
-require_once ('jpgraph/jpgraph_line.php');
-require_once ('jpgraph/jpgraph_plotline.php');
-
-$numpoints=50;
-$k=0.05;
-
-// Create some data points
-for($i=-$numpoints+1; $i<0; ++$i) {
-	$datay[$i+$numpoints-1]=exp($k*$i)*cos(2*M_PI/10*$i)*14;
-	$datayenv[$i+$numpoints-1]=exp($k*$i)*14;
-	$datax[$i+$numpoints-1]=$i;
-}
-
-for($i=0; $i<$numpoints; ++$i) {
-	$datay[$i+$numpoints-1]=exp(-$k*$i)*cos(2*M_PI/10*$i)*14;
-	$datayenv[$i+$numpoints-1]=exp(-$k*$i)*14;
-	$datax[$i+$numpoints-1]=$i;
-}
-
-// Setup the basic parameters for the graph
-$graph = new Graph(500,250);
-$graph->SetScale("intlin");
-
-$graph->SetShadow();
-$graph->SetBox();
-$graph->title->Set("Impuls Example 4");
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-
-// Set some other color then the boring default
-$graph->SetColor("lightyellow");
-$graph->SetMarginColor("khaki");
-
-// Set legend box specification
-$graph->legend->SetFillColor("white");
-$graph->legend->SetLineWeight(2);
-
-// Set X-axis at the minimum value of Y-axis (default will be at 0)
-$graph->xaxis->SetPos("min");	// "min" will position the x-axis at the minimum value of the Y-axis
-
-// Extend the margin for the labels on the Y-axis and reverse the direction
-// of the ticks on the Y-axis
-$graph->yaxis->SetLabelMargin(12);
-$graph->xaxis->SetLabelMargin(6);
-$graph->yaxis->SetTickSide(SIDE_LEFT);
-$graph->xaxis->SetTickSide(SIDE_DOWN);
-
-// Add mark graph with static lines
-$line = new PlotLine(HORIZONTAL,0,"black",2);
-$graph->AddLine($line);
-
-// Create a new impuls type scatter plot
-$sp1 = new ScatterPlot($datay,$datax);
-$sp1->mark->SetType(MARK_SQUARE);
-$sp1->mark->SetFillColor("red");
-$sp1->mark->SetWidth(3);
-
-$sp1->SetImpuls();
-$sp1->SetColor("blue");
-$sp1->SetWeight(1);
-$sp1->SetLegend("Non-causal signal");
-
-$graph->Add($sp1);
-
-// Create the envelope plot
-$ep1 = new LinePlot($datayenv,$datax);
-$ep1->SetStyle("dotted");
-$ep1->SetLegend("Positive envelope");
-
-$graph->Add($ep1);
-
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/index.html b/#jpgraph/src/Examples/index.html
deleted file mode 100644
index 6731a850..00000000
--- a/#jpgraph/src/Examples/index.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<h2>Examples of odometers</h2>
-
-<table>
-<tr>
-<td><img src="odoex00.php"></td>
-<td><img src="odoex01.php"></td>
-</tr>
-<tr>
-<td><img src="odoex02.php"></td>
-<td><img src="odoex03.php"></td>
-</tr>
-<tr>
-<td><img src="odoex04.php"></td>
-<td><img src="odoex05.php"></td>
-</tr>
-<tr>
-<td><img src="odoex06.php"></td>
-<td><img src="odoex07.php"></td>
-</tr>
-<tr>
-<td><img src="odoex08.php"></td>
-<td><img src="odoex09.php"></td>
-</tr>
-<tr>
-<td><img src="odoex010.php"></td>
-<td><img src="odoex011.php"></td>
-</tr>
-<tr>
-<td><img src="odoex012.php"></td>
-</tr>
-</table>
-
-
-
-
-
diff --git a/#jpgraph/src/Examples/interpolation-growth-log.php b/#jpgraph/src/Examples/interpolation-growth-log.php
deleted file mode 100644
index c9ecd007..00000000
--- a/#jpgraph/src/Examples/interpolation-growth-log.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-require_once ('jpgraph/jpgraph_log.php');
-
-// Matrix size rxr
-$r = 10;
-
-// Max Interpolation factor
-$f = 5;
-
-for( $i=1; $i <= $f; ++$i ) {
-	$xdata[] = $i;
-	$ydata[] =  pow( $r*pow(2,($i-1)) - ( pow(2,$i) - 1 ),2);
-}
-
-$graph = new Graph(400,240);
-$graph->SetScale('intlog');
-$graph->SetMargin(50,50,20,30);
-$graph->SetFrame(false);
-$graph->SetBox(true,'black',2);
-$graph->SetMarginColor('white');
-$graph->SetColor('lightyellow@0.7');
-
-$graph->title->Set('Interpolation growth for size 10x10');
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-
-$graph->xaxis->SetTitle('Interpolation factor','center');
-$graph->xaxis->SetTitleMargin(10);
-
-$graph->SetAxisStyle(AXSTYLE_YBOXIN);
-$graph->xgrid->Show();
-
-$lp1 = new LinePlot($ydata,$xdata);
-$lp1->SetColor('darkred');
-$lp1->SetWeight(3);
-$graph->Add($lp1);
-
-$graph->Stroke();
-?>
-
-
diff --git a/#jpgraph/src/Examples/interpolation-growth.php b/#jpgraph/src/Examples/interpolation-growth.php
deleted file mode 100644
index e1fec180..00000000
--- a/#jpgraph/src/Examples/interpolation-growth.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-require_once ('jpgraph/jpgraph_log.php');
-
-// Matrix size rxr
-$r = 10;
-
-// Max Interpolation factor
-$f = 5;
-
-for( $i=1; $i <= $f; ++$i ) {
-	$xdata[] = $i;
-	$ydata[] =  pow( $r*pow(2,($i-1)) - ( pow(2,$i) - 1 ),2);
-}
-
-$graph = new Graph(400,240);
-$graph->SetScale('intint');
-$graph->SetMargin(50,50,20,30);
-$graph->SetFrame(false);
-$graph->SetBox(true,'black',2);
-$graph->SetMarginColor('white');
-$graph->SetColor('lightyellow@0.7');
-
-$graph->title->Set('Interpolation growth for size 10x10');
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-
-$graph->xaxis->SetTitle('Interpolation factor','center');
-$graph->xaxis->SetTitleMargin(10);
-
-$graph->SetAxisStyle(AXSTYLE_YBOXIN);
-$graph->xgrid->Show();
-
-$lp1 = new LinePlot($ydata,$xdata);
-$lp1->SetColor('darkred');
-$lp1->SetWeight(3);
-$graph->Add($lp1);
-
-$graph->Stroke();
-?>
-
-
diff --git a/#jpgraph/src/Examples/inyaxisex1.php b/#jpgraph/src/Examples/inyaxisex1.php
deleted file mode 100644
index d6e3d416..00000000
--- a/#jpgraph/src/Examples/inyaxisex1.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-// Callback to negate the argument
-function _cb_negate($aVal) {
-    return round(-$aVal);
-}
-
-// A fake depth curve
-$ydata = array(0,1,4,5,8,9,10,14,16,16,16,18,20,20,20,22,22.5,22,19,19,15,15,15,15,10,10,10,6,5,5,5,4,4,2,1,0);
-
-// Negate all data
-$n = count($ydata);
-for($i=0; $i<$n; ++$i) {
-    $ydata[$i] = round(-$ydata[$i]);
-}
-
-// Basic graph setup
-$graph = new Graph(400,300);
-$graph->SetScale("linlin");
-$graph->img->SetMargin(50,50,60,40);	
-$graph->SetMarginColor('darkblue');
-$graph->SetColor('darkblue');
-$graph->SetAxisStyle(AXSTYLE_BOXOUT);
-
-$graph->title->Set("Depth curve. Dive #2");
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->title->SetColor("white");
-
-$graph->subtitle->Set("(Negated Y-axis)");
-$graph->subtitle->SetFont(FF_FONT1,FS_NORMAL);
-$graph->subtitle->SetColor("white");
-
-// Setup axis
-$graph->yaxis->SetLabelFormatCallback("_cb_negate");
-$graph->xaxis->SetColor("lightblue","white");
-$graph->yaxis->SetColor("lightblue","white");
-$graph->ygrid->SetColor("blue");
-
-
-$lp1 = new LinePlot($ydata);
-$lp1->SetColor("yellow");
-$lp1->SetWeight(2);
-
-
-$graph->Add($lp1);
-$graph->Stroke();
-?>
-
-
diff --git a/#jpgraph/src/Examples/inyaxisex2.php b/#jpgraph/src/Examples/inyaxisex2.php
deleted file mode 100644
index 5e19d4aa..00000000
--- a/#jpgraph/src/Examples/inyaxisex2.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-// Callback to negate the argument
-function _cb_negate($aVal) {
-    return round(-$aVal);
-}
-
-// A fake depth curve
-$ydata = array(0,1,4,5,8,9,10,14,16,16,16,18,20,20,20,22,22.5,22,19,19,15,15,15,15,10,10,10,6,5,5,5,4,4,2,1,0);
-
-// Negate all data
-$n = count($ydata);
-for($i=0; $i<$n; ++$i) {
-    $ydata[$i] = round(-$ydata[$i]);
-}
-
-// Basic graph setup
-$graph = new Graph(400,300);
-$graph->SetScale("linlin");
-$graph->img->SetMargin(50,50,60,40);	
-$graph->SetMarginColor('darkblue');
-$graph->SetColor('darkblue');
-$graph->SetAxisStyle(AXSTYLE_BOXOUT);
-$graph->SetBackgroundImage("blueblack400x300grad.png",1);
-//$graph->SetBackgroundImage("lightbluedarkblue400x300grad.png",1);
-
-$graph->title->Set("Depth curve. Dive #2");
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->title->SetColor("white");
-
-$graph->subtitle->Set("(Negated Y-axis)");
-$graph->subtitle->SetFont(FF_FONT1,FS_NORMAL);
-$graph->subtitle->SetColor("white");
-
-// Setup axis
-$graph->yaxis->SetLabelFormatCallback("_cb_negate");
-$graph->xaxis->SetColor("lightblue","white");
-$graph->yaxis->SetColor("lightblue","white");
-$graph->ygrid->SetColor("blue");
-
-
-$lp1 = new LinePlot($ydata);
-$lp1->SetColor("yellow");
-$lp1->SetWeight(2);
-
-
-$graph->Add($lp1);
-$graph->Stroke();
-?>
-
-
diff --git a/#jpgraph/src/Examples/inyaxisex3.php b/#jpgraph/src/Examples/inyaxisex3.php
deleted file mode 100644
index e09567ef..00000000
--- a/#jpgraph/src/Examples/inyaxisex3.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-// Callback to negate the argument
-function _cb_negate($aVal) {
-    return round(-$aVal);
-}
-
-// A fake depth curve
-$ydata = array(0,1,4,5,8,9,10,14,16,16,16,18,20,20,20,22,22.5,22,19,19,15,15,15,15,10,10,10,6,5,5,5,4,4,2,1,0);
-
-$n = count($ydata);
-$y2data = array();
-for( $i=0; $i< $n; ++$i ) {
-    $y2data[] = $ydata[$i]+10;
-}
-
-// Negate all data
-$n = count($ydata);
-for($i=0; $i<$n; ++$i) {
-    $ydata[$i] = round(-$ydata[$i]);
-    $y2data[$i] = round(-$y2data[$i]);
-}
-
-// Basic graph setup
-$graph = new Graph(400,300);
-$graph->SetScale("linlin");
-$graph->SetY2Scale("lin");
-$graph->SetMargin(50,50,60,40);	
-$graph->SetMarginColor('darkblue');
-$graph->SetColor('darkblue');
-
-// Setup titles
-$graph->title->Set("Inverting both Y-axis");
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->title->SetColor("white");
-
-$graph->subtitle->Set("(Negated Y & Y2 axis)");
-$graph->subtitle->SetFont(FF_FONT1,FS_NORMAL);
-$graph->subtitle->SetColor("white");
-
-// Setup axis
-$graph->yaxis->SetLabelFormatCallback("_cb_negate");
-$graph->xaxis->SetColor("lightblue","white");
-$graph->yaxis->SetColor("lightblue","white");
-$graph->ygrid->SetColor("blue");
-
-// Setup Y2 axis
-$graph->y2axis->SetLabelFormatCallback("_cb_negate");
-$graph->y2axis->SetColor("darkred","white");
-$graph->y2scale->SetAutoMax(0); // To make sure it starts with 0
-
-// Setup plot 1
-$lp1 = new LinePlot($ydata);
-$lp1->SetColor("yellow");
-$lp1->SetWeight(2);
-$graph->Add($lp1);
-
-// Setup plot 2
-$lp2 = new LinePlot($y2data);
-$lp2->SetColor("darkred");
-$lp2->SetWeight(2);
-$graph->AddY2($lp2);
-
-$graph->Stroke();
-?>
-
-
diff --git a/#jpgraph/src/Examples/ironrod.jpg b/#jpgraph/src/Examples/ironrod.jpg
deleted file mode 100644
index 0b9e8d40..00000000
Binary files a/#jpgraph/src/Examples/ironrod.jpg and /dev/null differ
diff --git a/#jpgraph/src/Examples/jpglogo.jpg b/#jpgraph/src/Examples/jpglogo.jpg
deleted file mode 100644
index a7f71211..00000000
Binary files a/#jpgraph/src/Examples/jpglogo.jpg and /dev/null differ
diff --git a/#jpgraph/src/Examples/ledex1.php b/#jpgraph/src/Examples/ledex1.php
deleted file mode 100644
index 8d61f937..00000000
--- a/#jpgraph/src/Examples/ledex1.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_led.php');
-
-// By default each "LED" circle has a radius of 3 pixels
-$led = new DigitalLED74();
-$led->StrokeNumber('0123456789. ABCDEFGHIJKL',LEDC_GREEN); 
-
-
-
-?>
diff --git a/#jpgraph/src/Examples/ledex10.php b/#jpgraph/src/Examples/ledex10.php
deleted file mode 100644
index 3aa375f9..00000000
--- a/#jpgraph/src/Examples/ledex10.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_led.php');
-
-// By default each "LED" circle has a radius of 3 pixels
-$led = new DigitalLED74();
-$led->StrokeNumber('0123456789. ABCDEFGHIJKL',LEDC_KHAKI);
-
-
-
-?>
diff --git a/#jpgraph/src/Examples/ledex11.php b/#jpgraph/src/Examples/ledex11.php
deleted file mode 100644
index 857faa07..00000000
--- a/#jpgraph/src/Examples/ledex11.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_led.php');
-
-// By default each "LED" circle has a radius of 3 pixels
-$led = new DigitalLED74();
-$led->StrokeNumber('0123456789. ABCDEFGHIJKL',LEDC_OLIVE);
-
-
-
-?>
diff --git a/#jpgraph/src/Examples/ledex12.php b/#jpgraph/src/Examples/ledex12.php
deleted file mode 100644
index 7756ea13..00000000
--- a/#jpgraph/src/Examples/ledex12.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_led.php');
-
-// By default each "LED" circle has a radius of 3 pixels
-$led = new DigitalLED74();
-$led->StrokeNumber('0123456789. ABCDEFGHIJKL',LEDC_LIMEGREEN);
-
-
-
-?>
diff --git a/#jpgraph/src/Examples/ledex13.php b/#jpgraph/src/Examples/ledex13.php
deleted file mode 100644
index add394d3..00000000
--- a/#jpgraph/src/Examples/ledex13.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_led.php');
-
-// By default each "LED" circle has a radius of 3 pixels
-$led = new DigitalLED74();
-$led->StrokeNumber('0123456789. ABCDEFGHIJKL',LEDC_FORESTGREEN);
-
-
-
-?>
diff --git a/#jpgraph/src/Examples/ledex14.php b/#jpgraph/src/Examples/ledex14.php
deleted file mode 100644
index 7a505999..00000000
--- a/#jpgraph/src/Examples/ledex14.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_led.php');
-
-// By default each "LED" circle has a radius of 3 pixels
-$led = new DigitalLED74();
-$led->StrokeNumber('0123456789. ABCDEFGHIJKL',LEDC_TEAL);
-
-
-
-?>
diff --git a/#jpgraph/src/Examples/ledex15.php b/#jpgraph/src/Examples/ledex15.php
deleted file mode 100644
index 6a5bb1f6..00000000
--- a/#jpgraph/src/Examples/ledex15.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_led.php');
-
-// By default each "LED" circle has a radius of 3 pixels
-$led = new DigitalLED74();
-$led->StrokeNumber('0123456789. ABCDEFGHIJKL',LEDC_STEELBLUE);
-
-
-
-?>
diff --git a/#jpgraph/src/Examples/ledex16.php b/#jpgraph/src/Examples/ledex16.php
deleted file mode 100644
index 08ab7312..00000000
--- a/#jpgraph/src/Examples/ledex16.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_led.php');
-
-// By default each "LED" circle has a radius of 3 pixels
-$led = new DigitalLED74();
-$led->StrokeNumber('0123456789. ABCDEFGHIJKL',LEDC_NAVY);
-
-
-
-?>
diff --git a/#jpgraph/src/Examples/ledex17.php b/#jpgraph/src/Examples/ledex17.php
deleted file mode 100644
index 34f18cd1..00000000
--- a/#jpgraph/src/Examples/ledex17.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_led.php');
-
-// By default each "LED" circle has a radius of 3 pixels
-$led = new DigitalLED74();
-$led->StrokeNumber('0123456789. ABCDEFGHIJKL',LEDC_INVERTGRAY);
-
-
-
-?>
diff --git a/#jpgraph/src/Examples/ledex2.php b/#jpgraph/src/Examples/ledex2.php
deleted file mode 100644
index bd196d38..00000000
--- a/#jpgraph/src/Examples/ledex2.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_led.php');
-
-// By default each "LED" circle has a radius of 3 pixels
-$led = new DigitalLED74();
-$led->StrokeNumber('0123456789. ABCDEFGHIJKL',LEDC_RED); 
-
-
-
-?>
diff --git a/#jpgraph/src/Examples/ledex3.php b/#jpgraph/src/Examples/ledex3.php
deleted file mode 100644
index 0d81b3d5..00000000
--- a/#jpgraph/src/Examples/ledex3.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_led.php');
-
-// By default each "LED" circle has a radius of 3 pixels
-$led = new DigitalLED74();
-$led->StrokeNumber('0123456789. ABCDEFGHIJKL',LEDC_YELLOW); 
-
-
-
-?>
diff --git a/#jpgraph/src/Examples/ledex4.1.php b/#jpgraph/src/Examples/ledex4.1.php
deleted file mode 100644
index 81a9d1ff..00000000
--- a/#jpgraph/src/Examples/ledex4.1.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_led.php');
-
-// By default each "LED" circle has a radius of 3 pixels. Change to 5 and slghtly smaller margin
-$led = new DigitalLED74(6);
-$led->SetSupersampling(2);
-$led->StrokeNumber('123.',LEDC_RED);
-
-
-
-?>
diff --git a/#jpgraph/src/Examples/ledex4.2.php b/#jpgraph/src/Examples/ledex4.2.php
deleted file mode 100644
index 0a25bc02..00000000
--- a/#jpgraph/src/Examples/ledex4.2.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_led.php');
-
-// By default each "LED" circle has a radius of 3 pixels. Change to 5 and slghtly smaller margin
-$led = new DigitalLED74(6);
-$led->SetSupersampling(4);
-$led->StrokeNumber('123.',LEDC_RED);
-
-
-
-?>
diff --git a/#jpgraph/src/Examples/ledex4.php b/#jpgraph/src/Examples/ledex4.php
deleted file mode 100644
index d8782e25..00000000
--- a/#jpgraph/src/Examples/ledex4.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_led.php');
-
-// By default each "LED" circle has a radius of 3 pixels. Change to 5 and slghtly smaller margin
-$led = new DigitalLED74(6);
-$led->SetSupersampling(1);
-$led->StrokeNumber('123.',LEDC_RED);
-
-
-
-?>
diff --git a/#jpgraph/src/Examples/ledex5.php b/#jpgraph/src/Examples/ledex5.php
deleted file mode 100644
index 5526063c..00000000
--- a/#jpgraph/src/Examples/ledex5.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_led.php');
-
-// By default each "LED" circle has a radius of 3 pixels
-$led = new DigitalLED74();
-$led->StrokeNumber('0123456789. ABCDEFGHIJKL',LEDC_BLUE);
-
-
-
-?>
diff --git a/#jpgraph/src/Examples/ledex6.php b/#jpgraph/src/Examples/ledex6.php
deleted file mode 100644
index eb8c03ba..00000000
--- a/#jpgraph/src/Examples/ledex6.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_led.php');
-
-// By default each "LED" circle has a radius of 3 pixels
-$led = new DigitalLED74();
-$led->StrokeNumber('0123456789. ABCDEFGHIJKL',LEDC_GRAY);
-
-
-
-?>
diff --git a/#jpgraph/src/Examples/ledex7.php b/#jpgraph/src/Examples/ledex7.php
deleted file mode 100644
index da6c656b..00000000
--- a/#jpgraph/src/Examples/ledex7.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_led.php');
-
-// By default each "LED" circle has a radius of 3 pixels
-$led = new DigitalLED74();
-$led->StrokeNumber('0123456789. ABCDEFGHIJKL',LEDC_CHOCOLATE);
-
-
-
-?>
diff --git a/#jpgraph/src/Examples/ledex8.php b/#jpgraph/src/Examples/ledex8.php
deleted file mode 100644
index 2075e261..00000000
--- a/#jpgraph/src/Examples/ledex8.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_led.php');
-
-// By default each "LED" circle has a radius of 3 pixels
-$led = new DigitalLED74();
-$led->StrokeNumber('0123456789. ABCDEFGHIJKL',LEDC_PERU);
-
-
-
-?>
diff --git a/#jpgraph/src/Examples/ledex9.php b/#jpgraph/src/Examples/ledex9.php
deleted file mode 100644
index 82837d1d..00000000
--- a/#jpgraph/src/Examples/ledex9.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_led.php');
-
-// By default each "LED" circle has a radius of 3 pixels
-$led = new DigitalLED74();
-$led->StrokeNumber('0123456789. ABCDEFGHIJKL',LEDC_GOLDENROD);
-
-
-
-?>
diff --git a/#jpgraph/src/Examples/ledex_cyrillic.php b/#jpgraph/src/Examples/ledex_cyrillic.php
deleted file mode 100644
index b85f9d31..00000000
--- a/#jpgraph/src/Examples/ledex_cyrillic.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_led.php');
-
-// By default each "LED" circle has a radius of 3 pixels. Change to 5 and slghtly smaller margin
-$led = new DigitalLED74(3);
-$led->SetSupersampling(2);
-$text =     'А'.
-            'Б'.
-            'В'.
-            'Г'.
-            'Д'.
-            'Е'.
-            'Ё'.
-            'З'.
-            'И'.
-            'Й'.
-            'К'.
-            'Л'.
-            'М'.
-            'Н'.
-            'О'.
-			'П';
-$led->StrokeNumber($text, LEDC_RED);
-
-?>
diff --git a/#jpgraph/src/Examples/ledex_cyrillic2.php b/#jpgraph/src/Examples/ledex_cyrillic2.php
deleted file mode 100644
index fb007144..00000000
--- a/#jpgraph/src/Examples/ledex_cyrillic2.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_led.php');
-
-// By default each "LED" circle has a radius of 3 pixels. Change to 5 and slghtly smaller margin
-$led = new DigitalLED74(3);
-$led->SetSupersampling(2);
-$text =     'Р'.
-            'С'.
-            'Т'.
-            'У'.
-            'Ф'.
-            'Х'.
-            'Ц'.
-            'Ч'.
-            'Ш'.
-            'Щ'.
-            'Ъ'.
-            'Ы'.
-            'Ь'.
-            'Э'.
-            'Ю'.
-            'Я';
-$led->StrokeNumber($text, LEDC_RED);
-
-?>
diff --git a/#jpgraph/src/Examples/lightbluedarkblue400x300grad.png b/#jpgraph/src/Examples/lightbluedarkblue400x300grad.png
deleted file mode 100644
index 86092ecf..00000000
Binary files a/#jpgraph/src/Examples/lightbluedarkblue400x300grad.png and /dev/null differ
diff --git a/#jpgraph/src/Examples/linebarcentex1.php b/#jpgraph/src/Examples/linebarcentex1.php
deleted file mode 100644
index 1b5e1888..00000000
--- a/#jpgraph/src/Examples/linebarcentex1.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-$l1datay = array(11,9,2,4,3,13,17);
-$l2datay = array(23,12,5,19,17,10,15);
-
-$datax=$gDateLocale->GetShortMonth();
-
-// Create the graph. 
-$graph = new Graph(400,200);	
-$graph->SetScale("textlin");
-$graph->SetMargin(40,130,20,40);
-$graph->SetShadow();
-$graph->xaxis->SetTickLabels($datax);
-
-// Create the linear error plot
-$l1plot=new LinePlot($l1datay);
-$l1plot->SetColor("red");
-$l1plot->SetWeight(2);
-$l1plot->SetLegend("Prediction");
-
-//Center the line plot in the center of the bars
-$l1plot->SetBarCenter();
-
-
-// Create the bar plot
-$bplot = new BarPlot($l2datay);
-$bplot->SetFillColor("orange");
-$bplot->SetLegend("Result");
-
-// Add the plots to t'he graph
-$graph->Add($bplot);
-$graph->Add($l1plot);
-
-
-$graph->title->Set("Adding a line plot to a bar graph v1");
-$graph->xaxis->title->Set("X-title");
-$graph->yaxis->title->Set("Y-title");
-
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD);
-
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/linebarex1.php b/#jpgraph/src/Examples/linebarex1.php
deleted file mode 100644
index 202491d9..00000000
--- a/#jpgraph/src/Examples/linebarex1.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('../jpgraph.php');
-require_once ('../jpgraph_line.php');
-require_once ('../jpgraph_bar.php');
-
-$month=array(
-"Jan","Feb","Mar","Apr","Maj","Jun","Jul","Aug","Sep","Okt","Nov","Dec");
-
-// Create datapoints where every point
-$steps=100;
-for($i=0; $i<$steps; ++$i) {
-	$datay[$i]=log(pow($i,$i/10)+1)*sin($i/15)+35;
-	$databarx[]=sprintf("198%d %s",floor($i/12),$month[$i%12]);
-	
-	// Simulate an accumulated value for every 5:th data point
-	if( $i % 6 == 0 ) {
-		$databary[]=abs(25*sin($i)+5);
-	}
-	else {
-		$databary[]=0;
-	}
-	
-}
-
-
-// New graph with a background image and drop shadow
-$graph = new Graph(450,300);
-$graph->SetBackgroundImage("tiger_bkg.png",BGIMG_FILLFRAME);
-$graph->SetShadow();
-
-// Use an integer X-scale
-$graph->SetScale("textlin");
-
-// Set title and subtitle
-$graph->title->Set("Combined bar and line plot");
-$graph->subtitle->Set("100 data points, X-Scale: 'text'");
-
-// Use built in font
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-
-// Make the margin around the plot a little bit bigger
-// then default
-$graph->img->SetMargin(40,140,40,80);	
-
-// Slightly adjust the legend from it's default position in the
-// top right corner to middle right side
-$graph->legend->Pos(0.05,0.5,"right","center");
-
-// Display every 10:th datalabel
-$graph->xaxis->SetTextTickInterval(6);
-$graph->xaxis->SetTextLabelInterval(2);
-$graph->xaxis->SetTickLabels($databarx);
-$graph->xaxis->SetLabelAngle(90);
-
-// Create a red line plot
-$p1 = new LinePlot($datay);
-$p1->SetColor("red");
-$p1->SetLegend("Pressure");
-
-// Create the bar plot
-$b1 = new BarPlot($databary);
-$b1->SetLegend("Temperature");
-$b1->SetAbsWidth(6);
-$b1->SetShadow();
-
-// The order the plots are added determines who's ontop
-$graph->Add($p1);
-$graph->Add($b1);
-
-// Finally output the  image
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/linebarex2.php b/#jpgraph/src/Examples/linebarex2.php
deleted file mode 100644
index efae8e2d..00000000
--- a/#jpgraph/src/Examples/linebarex2.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-// Some data
-
-$steps=100;
-for($i=0; $i<$steps; ++$i) {
-	$datay[$i]=log(pow($i,$i/10)+1)*sin($i/15)+35;
-	$datax[]=$i;
-	if( $i % 10 == 0 ) {
-		$databarx[]=$i;
-		$databary[]=$datay[$i]/2;
-	}
-}
-
-// New graph with a background image and drop shadow
-$graph = new Graph(450,300);
-$graph->SetBackgroundImage("tiger_bkg.png",BGIMG_FILLFRAME);
-$graph->SetShadow();
-
-// Use an integer X-scale
-$graph->SetScale("intlin");
-
-// Set title and subtitle
-$graph->title->Set("Combined bar and line plot");
-$graph->subtitle->Set("(\"left\" aligned bars)");
-
-// Use built in font
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-
-// Make the margin around the plot a little bit bigger
-// then default
-$graph->img->SetMargin(40,120,40,40);	
-
-// Slightly adjust the legend from it's default position in the
-// top right corner to middle right side
-$graph->legend->Pos(0.05,0.5,"right","center");
-
-// Create a red line plot
-$p1 = new LinePlot($datay,$datax);
-$p1->SetColor("red");
-$p1->SetLegend("Status one");
-$graph->Add($p1);
-
-// Create the bar plot
-$b1 = new BarPlot($databary,$databarx);
-$b1->SetLegend("Status two");
-$b1->SetAlign("left");
-$b1->SetShadow();
-$graph->Add($b1);
-
-// Finally output the  image
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/linebarex3.php b/#jpgraph/src/Examples/linebarex3.php
deleted file mode 100644
index faff220d..00000000
--- a/#jpgraph/src/Examples/linebarex3.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-// Some data
-
-$steps=100;for($i=0; $i<$steps; ++$i) {	
-    $datay[$i]=log(pow($i,$i/10)+1)*sin($i/15)+35;	
-    $datax[]=$i;	
-    if( $i % 10 == 0 ) {		
-	$databarx[]=$i;		
-	$databary[]=$datay[$i]/2;	
-    }
-}
-
-// New graph with a background image and drop shadow
-$graph = new Graph(450,300);
-$graph->img->SetMargin(40,180,40,40);	
-$graph->SetBackgroundImage("tiger_bkg.png",BGIMG_FILLFRAME);
-
-//$graph->img->SetAntiAliasing();
-
-$graph->SetScale("intlin");
-$graph->SetShadow();
-$graph->title->Set("Combined bar and line plot");
-$graph->subtitle->Set("(\"center\" aligned bars)");
-
-// Use built in font
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-
-// Slightly adjust the legend from it's default position in the
-// top right corner. 
-$graph->legend->Pos(0.05,0.5,"right","center");
-
-// Create the first line
-
-$p1 = new LinePlot($datay,$datax);
-$p1->SetWeight(1);
-$p1->SetColor("red");
-$p1->SetLegend("Triumph Tiger -98");
-$graph->Add($p1);
-
-$b1 = new BarPlot($databary,$databarx);
-$b1->SetAbsWidth(10);
-$b1->SetAlign("center");
-$b1->SetShadow();
-$graph->Add($b1);
-
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/linegraceex.php b/#jpgraph/src/Examples/linegraceex.php
deleted file mode 100644
index e64cdc4f..00000000
--- a/#jpgraph/src/Examples/linegraceex.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$datay = array(0.2980,0.3039,0.3020,0.3027,0.3015);
-
-$graph = new Graph(300,200);
-$graph->img->SetMargin(40,40,40,40);	
-
-$graph->img->SetAntiAliasing();
-$graph->SetScale("textlin");
-$graph->SetShadow();
-$graph->title->Set("Example of 10% top/bottom grace");
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-
-// Add 10% grace to top and bottom of plot
-$graph->yscale->SetGrace(10,10);
-
-$p1 = new LinePlot($datay);
-$p1->mark->SetType(MARK_FILLEDCIRCLE);
-$p1->mark->SetFillColor("red");
-$p1->mark->SetWidth(4);
-$p1->SetColor("blue");
-$p1->SetCenter();
-$graph->Add($p1);
-
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/lineiconex1.php b/#jpgraph/src/Examples/lineiconex1.php
deleted file mode 100644
index 53f2b00f..00000000
--- a/#jpgraph/src/Examples/lineiconex1.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-require_once ('jpgraph/jpgraph_iconplot.php');
-
-
-//$datay = array(20,15,23,15,17,35,22);
-$datay = array(30,25,33,25,27,45,32);
-$datay2 = array(3,25,10,15,50,5,18);
-$datay3 = array(10,5,10,15,5,2,1);
-
-// Setup the graph
-$graph = new Graph(400,250);
-$graph->SetMargin(40,40,20,30);	
-$graph->SetScale("textlin");
-
-$graph->title->Set('Adding an icon ("tux") in the background');
-$graph->title->SetFont(FF_ARIAL,FS_NORMAL,12);
-
-//$graph->SetBackgroundGradient('red','blue');
-
-$graph->xaxis->SetPos('min');
-
-$p1 = new LinePlot($datay);
-$p1->SetColor("blue");
-$p1->SetFillGradient('yellow@0.4','red@0.4');
-
-$p2 = new LinePlot($datay2);
-$p2->SetColor("black");
-$p2->SetFillGradient('green@0.4','white');
-
-$p3 = new LinePlot($datay3);
-$p3->SetColor("blue");
-$p3->SetFillGradient('navy@0.4','white@0.4');
-
-$graph->Add($p1);
-$graph->Add($p2);
-$graph->Add($p3);
-
-$icon = new IconPlot('penguin.png',0.2,0.3,1,30);
-$icon->SetAnchor('center','center');
-$graph->Add($icon);
-
-// Output line
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/lineiconex2.php b/#jpgraph/src/Examples/lineiconex2.php
deleted file mode 100644
index d16ab8b7..00000000
--- a/#jpgraph/src/Examples/lineiconex2.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-require_once ('jpgraph/jpgraph_flags.php');
-require_once ('jpgraph/jpgraph_iconplot.php');
-
-$datay = array(30,25,33,25,27,45,32);
-
-// Setup the graph
-$graph = new Graph(400,250);
-$graph->SetMargin(40,40,20,30);	
-$graph->SetScale("textlin");
-
-$graph->title->Set('Adding a country flag as a an icon');
-
-$p1 = new LinePlot($datay);
-$p1->SetColor("blue");
-$p1->SetFillGradient('yellow@0.4','red@0.4');
-
-$graph->Add($p1);
-
-$icon = new IconPlot();
-$icon->SetCountryFlag('iceland',50,30,1.5,40,3);
-$icon->SetAnchor('left','top');
-$graph->Add($icon);
-
-// Output line
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/lineimagefillex1.php b/#jpgraph/src/Examples/lineimagefillex1.php
deleted file mode 100644
index d2fb60ae..00000000
--- a/#jpgraph/src/Examples/lineimagefillex1.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-require_once ('../jpgraph.php');
-require_once ('../jpgraph_line.php');
-
-$datay = array(0,3,5,12,15,18,22,36,37,41);
-
-// Setup the graph
-$graph = new Graph(320,200);
-$graph->title->Set('Education growth');
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,14);
-$graph->SetScale('intlin');
-$graph->SetMarginColor('white');
-$graph->SetBox();
-//$graph->img->SetAntialiasing();
-
-$graph->SetGridDepth(DEPTH_FRONT);
-$graph->ygrid->SetColor('gray@0.7');
-$graph->SetBackgroundImage('classroom.jpg',BGIMG_FILLPLOT);
-
-// Masking graph
-$p1 = new LinePlot($datay);
-$p1->SetFillColor('white');
-$p1->SetFillFromYMax();
-$p1->SetWeight(0);
-$graph->Add($p1);
-
-// Line plot
-$p2 = new LinePlot($datay);
-$p2->SetColor('black@0.4');
-$p2->SetWeight(3);
-$p2->mark->SetType(MARK_SQUARE);
-$p2->mark->SetColor('orange@0.5');
-$p2->mark->SetFillColor('orange@0.3');
-$graph->Add($p2);
-
-// Output line
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/linlogex1.php b/#jpgraph/src/Examples/linlogex1.php
deleted file mode 100644
index 4c2be9de..00000000
--- a/#jpgraph/src/Examples/linlogex1.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_log.php');
-require_once ('jpgraph/jpgraph_error.php');
-
-$xdata = array( 2.0,  2.5,  3.0,  4.0,  5.0,  6.0,  8.0, 10.0,
-               12.0, 15.0, 20.0, 25.0, 30.0, 40.0, 50.0, 60.0,
-               75.0, 100., 125., 150., 175., 200., 250., 300.,
-               400., 500., 600., 800., 950.,
-              1200., 1500., 2000., 2500.);
-$ydata = array(270.,  280., // 2 m
-               330.,  340., // 2.5
-               410.,  420., // 3
-               550.,  560., // 4
-               670.,  680., // 5
-               770.,  780., // 6
-               930.,  940., // 8
-              1010., 1020., // 10
-              1040., 1050., // 12
-               980.,  990., // 15
-               860.,  870., // 20
-               720.,  730., // 25
-               590.,  600., // 30
-               370.,  380., // 40
-               330.,  340., // 50
-               320.,  330., // 60
-               320.,  330., // 75
-               300.,  310., // 100
-               305.,  315., // 125
-               310.,  320., // 150
-               315.,  325., // 175
-               300.,  310., // 200
-               270.,  280., // 250
-               240.,  250., // 300
-               200.,  210., // 400
-               150.,  160., // 500
-               120.,  130., // 600
-                50.,   60., // 800
-                30.,   40., // 950
-                15.,   20., // 1200
-                 8.,   10., // 1500
-                 7.,    9., // 2000
-                 8.,   10.  // 2500 m
-               );
-
-$graph = new Graph(500,300);
-$graph->SetScale("linlog");
-$graph->img->SetMargin(40,20,20,40);
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->title->Set("ab/2");
-$graph->yaxis->title->Set("rho_s");
-$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->ygrid->Show(true,true);
-$graph->xgrid->Show(true,true);
-
-$errorplot=new ErrorPlot($ydata, $xdata);
-
-$graph->Add($errorplot);
-
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/listallflags.php b/#jpgraph/src/Examples/listallflags.php
deleted file mode 100644
index 0f7a7966..00000000
--- a/#jpgraph/src/Examples/listallflags.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// List all current supported flags.
-// $Id: listallflags.php,v 1.1.2.1 2003/06/29 15:28:12 aditus Exp $
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_flags.php');
-
-// Flag size to use in table 
-$s = FLAGSIZE2 ;
-$w = 60;
-$flags = new FlagImages($s) ;
-
-// Create a nice table wil all flags and their full name (and index)
-echo "<table width=100%><tr>\n";
-$cols=0;
-while( list($key,$val) = each($flags->iCountryNameMap) ) {
-
-    echo '<td width=20%><a href="javascript:window.open(\'listallflags_helper.php?size=4&idx='.$val.'\',\'_new\',\'width=500,height=350\');void(0)"><img src="listallflags_helper.php?size='.$s.'&idx='.$val.'"></a><br>';
-    echo "<small>$key</small><br><small><font color=blue><i>idx=$val</i></font></small></td>\n";
-    
-    if( ++$cols == 5 ) {
-	echo "</tr>\n<tr>";
-	$cols=0;
-    }
-}
-
-echo "</tr></table>";
-
-?>
-
diff --git a/#jpgraph/src/Examples/listallflags_helper.php b/#jpgraph/src/Examples/listallflags_helper.php
deleted file mode 100644
index 52ad9f9b..00000000
--- a/#jpgraph/src/Examples/listallflags_helper.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once 'jpgraph/jpgraph.php';
-require_once 'jpgraph/jpgraph_flags.php';
-
-if( empty($_GET['size']) ) {
-    $size = FLAGSIZE2;
-}
-else {
-    $size = $_GET['size'];
-}
-
-if( empty($_GET['idx']) ) {
-    $idx = 'ecua';
-}
-else {
-    $idx = $_GET['idx'];
-}
-
-
-$flags = new FlagImages($size) ;
-$img = $flags->GetImgByIdx($idx);
-header ("Content-type: image/png");
-ImagePng ($img);
-
-?>
diff --git a/#jpgraph/src/Examples/listfontsex1.php b/#jpgraph/src/Examples/listfontsex1.php
deleted file mode 100644
index 15ee50d1..00000000
--- a/#jpgraph/src/Examples/listfontsex1.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_canvas.php');
-require_once ('jpgraph/jpgraph_canvtools.php');
-
-$width = 700;
-$height = 800;
-$g = new CanvasGraph($width,$height);
-$scale = new CanvasScale($g);
-$scale->Set(0,27,0,85);
-$g->SetMargin(5,6,5,6);
-$g->SetColor('white');
-$g->SetMarginColor("teal");
-$g->InitFrame();
-
-
-$t = new CanvasRectangleText();
-$t->SetFont(FF_ARIAL,FS_NORMAL,16);
-$t->SetFillColor('lemonchiffon2');
-$t->SetFontColor('black');
-$t->Set("\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\nTTF Fonts (11pt)",0.5,19.5,26,64.5);
-$t->Stroke($g->img,$scale);
-
-$t->SetFillColor('lemonchiffon3');
-$t->Set("\n\n\n\nBitmap Fonts",0.5,5,26,13.5);
-$t->Stroke($g->img,$scale);
-
-
-$t = new CanvasRectangleText();
-$t->SetFillColor('');
-$t->SetFontColor('black');
-$t->SetColor('');
-$t->SetShadow('');
-
-$t->SetFont(FF_ARIAL,FS_BOLD,18);
-$t->Set('Normal',1,1,8);
-$t->Stroke($g->img,$scale);
-
-$t->Set('Italic style',9,1,8);
-$t->Stroke($g->img,$scale);
-
-$t->Set('Bold style',17.5,1,8);
-$t->Stroke($g->img,$scale);
-
-
-$t->SetFillColor('yellow');
-$t->SetFontColor('black');
-$t->SetColor('black');
-$t->SetShadow('gray');
-
-$r=6;$c=1;$w=7.5;$h=3.5;
-
-$fonts=array(
-    array("Font 0",FF_FONT0,FS_NORMAL),
-    array("",FF_FONT0,FS_ITALIC),
-    array("",FF_FONT0,FS_BOLD),
-
-    array("Font 1",FF_FONT1,FS_NORMAL),
-    array("",FF_FONT1,FS_ITALIC),
-    array("Font 1 bold",FF_FONT1,FS_BOLD),
-
-    array("Font 2",FF_FONT2,FS_NORMAL),
-    array("",FF_FONT2,FS_ITALIC),
-    array("Font 2 bold",FF_FONT2,FS_BOLD),
-
-    array("Arial",FF_ARIAL,FS_NORMAL),
-    array("Arial italic",FF_ARIAL,FS_ITALIC),
-    array("Arial bold",FF_ARIAL,FS_BOLD),
-
-    array("Verdana",FF_VERDANA,FS_NORMAL),
-    array("Verdana italic",FF_VERDANA,FS_ITALIC),
-    array("Verdana bold",FF_VERDANA,FS_BOLD),
-
-
-    array("Trebuche",FF_TREBUCHE,FS_NORMAL),
-    array("Trebuche italic",FF_TREBUCHE,FS_ITALIC),
-    array("Trebuche bold",FF_TREBUCHE,FS_BOLD),
-
-    array("Georgia",FF_GEORGIA,FS_NORMAL),
-    array("Georgia italic",FF_GEORGIA,FS_ITALIC),
-    array("Georgia bold",FF_GEORGIA,FS_BOLD),
-
-    array("Comic",FF_COMIC,FS_NORMAL),
-    array("",FF_COMIC,FS_ITALIC),
-    array("Comic bold",FF_COMIC,FS_BOLD),
-
-    array("Courier",FF_COURIER,FS_NORMAL),
-    array("Courier italic",FF_COURIER,FS_ITALIC),
-    array("Courier bold",FF_COURIER,FS_BOLD),
-
-    array("Times normal",FF_TIMES,FS_NORMAL),
-    array("Times italic",FF_TIMES,FS_ITALIC),
-    array("Times bold",FF_TIMES,FS_BOLD),
-
-    array("Vera normal",FF_VERA,FS_NORMAL),
-    array("Vera italic",FF_VERA,FS_ITALIC),
-    array("Vera bold",FF_VERA,FS_BOLD),    
-    
-    array("Vera mono normal",FF_VERAMONO,FS_NORMAL),
-    array("Vera mono italic",FF_VERAMONO,FS_ITALIC),
-    array("Vera mono bold",FF_VERAMONO,FS_BOLD),    
-
-    array("Vera serif normal",FF_VERASERIF,FS_NORMAL),
-    array("",FF_VERASERIF,FS_ITALIC),
-    array("Vera serif bold",FF_VERASERIF,FS_BOLD),    
-            
-    array("DejaVu sans serif",FF_DV_SANSSERIF,FS_NORMAL),
-    array("DejaVu sans serif",FF_DV_SANSSERIF,FS_ITALIC),
-    array("DejaVu sans serif",FF_DV_SANSSERIF,FS_BOLD),
-
-    array("DejaVu serif",FF_DV_SERIF,FS_NORMAL),
-    array("DejaVu serif",FF_DV_SERIF,FS_ITALIC),
-    array("DejaVu serif",FF_DV_SERIF,FS_BOLD),
-
-    array("DejaVuMono sans serif",FF_DV_SANSSERIFMONO,FS_NORMAL),
-    array("DejaVuMono sans serif",FF_DV_SANSSERIFMONO,FS_ITALIC),
-    array("DejaVuMono sans serif",FF_DV_SANSSERIFMONO,FS_BOLD),
-
-    array("DejaVuCond serif",FF_DV_SERIFCOND,FS_NORMAL),
-    array("DejaVuCond serif",FF_DV_SERIFCOND,FS_ITALIC),
-    array("DejaVuCond serif",FF_DV_SERIFCOND,FS_BOLD),
-
-    array("DejaVuCond sans serif",FF_DV_SANSSERIFCOND,FS_NORMAL),
-    array("DejaVuCond sans serif",FF_DV_SANSSERIFCOND,FS_ITALIC),
-    array("DejaVuCond sans serif",FF_DV_SANSSERIFCOND,FS_BOLD),
-    
-    );
-
-
-$n=count($fonts);
-
-for( $i=0; $i < $n; ++$i ) {
-    
-    if( $i==9 ) $r += 3;
-
-    if( $fonts[$i][0] ) {
-    $t->SetTxt($fonts[$i][0]);
-    $t->SetPos($c,$r,$w,$h);
-    $t->SetFont($fonts[$i][1],$fonts[$i][2],11);
-    $t->Stroke($g->img,$scale);
-    }
-
-    $c += $w+1;
-    if( $c > 30-$w-2 ) {
-    $c = 1;
-    $r += 4;
-    }
-
-}
-
-$g->Stroke();
-?>
-
diff --git a/#jpgraph/src/Examples/logbarex1.php b/#jpgraph/src/Examples/logbarex1.php
deleted file mode 100644
index a3a8a901..00000000
--- a/#jpgraph/src/Examples/logbarex1.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// $Id: logbarex1.php,v 1.4 2003/05/30 20:12:43 aditus Exp $
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_log.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-$datay=array(4,13,30,28,12,45,30,12,55,3,0.5);
-$datax=array("Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov");
-
-// Create the graph. 
-$graph = new Graph(400,220,'auto');	
-//$graph->img->SetMargin(50,30,50,50);
-$graph->SetScale("textlog");
-//$graph->SetShadow();
-
-// Setup titles for graph and axis
-$graph->title->Set("Bar with logarithmic Y-scale");
-$graph->title->SetFont(FF_VERDANA,FS_NORMAL,18);
-
-$graph->xaxis->SetTitle("2002");
-$graph->xaxis->title->SetFont(FF_ARIAL,FS_NORMAL,16);
-
-$graph->yaxis->title->SetFont(FF_ARIAL,FS_NORMAL,16);
-$graph->yaxis->SetTitle("Y-title",'center');
-$graph->yaxis->SetTitleMargin(30);
-
-// Setup month on X-scale
-//$graph->xaxis->SetTickLabels($datax);
-
-// Create a bar pot
-$bplot = new BarPlot($datay);
-$bplot->SetFillColor("orange");
-
-//You can also set a manual base of the bars
-//$bplot->SetYBase(0.001);
-
-/*
-$bplot->SetShadow();
-$bplot->value->Show();
-$bplot->value->SetFont(FF_ARIAL,FS_BOLD);
-$bplot->value->SetAngle(45);
-$bplot->value->SetColor("black","darkred");
-*/
-
-$graph->Add($bplot);
-
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/loglogex1.php b/#jpgraph/src/Examples/loglogex1.php
deleted file mode 100644
index 31a4a52c..00000000
--- a/#jpgraph/src/Examples/loglogex1.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_log.php');
-require_once ('jpgraph/jpgraph_line.php');
-require_once ('jpgraph/jpgraph_scatter.php');
-
-
-$ab2  = array( 1.5,  2.0,  2.5,  3.0,  4.0,  5.0,  6.0,  8.0, 10.0,
-              12.0, 15.0, 20.0, 25.0, 30.0, 40.0, 50.0, 60.0 ,75.0,
-              100., 125., 150.);
-$mn2  = array( 0.5,  0.5,  0.5,  0.5,  0.8,  0.8,  0.8,  0.8,  1.0,
-               1.0,  1.0,  1.0,  1.0,  2.0,  2.0,  2.0,  2.0,  2.0,
-               5.0,  5.0,  5.0);
-$rhos = array(30.0, 31.0, 32.0, 34.0, 35.5, 37.5, 38.0, 39.5, 41.5,
-              43.0, 41.0, 42.0, 42.5, 45.0, 49.0, 53.5, 58.0, 66.5,
-              75.0, 81.0, 89.0);
-
-// Create the graph.
-$graph = new Graph(500,300);     
-$graph->SetScale("loglog");              
-$graph->SetY2Scale("lin");               
-$graph->y2axis->SetColor("blue","blue"); 
-
-$graph->img->SetMargin(50,70,40,50);     
-$graph->title->Set("Geoelektrik");       
-$graph->xaxis->title->Set("Auslage ab/2 [m]");  
-$graph->yaxis->title->Set("rho_s [Ohm m]");     
-$graph->y2axis->title->Set("mn/2 [m]");         
-$graph->y2axis->title->SetColor("blue");
-$graph->y2axis->SetTitleMargin(35);
-$graph->title->SetFont(FF_FONT1,FS_BOLD);       
-$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD); 
-$graph->xgrid->Show(true,true);                  
-$graph->ygrid->Show(true,true);                  
-
-// Create the linear plot
-
-$lineplot=new LinePlot($rhos,$ab2);       
-$lineplot->SetWeight(1);
-$lineplot->mark->SetType(MARK_FILLEDCIRCLE);
-$lineplot->mark->SetWidth(2);
-
-// Create scatter plot 
-
-$scplot=new ScatterPlot($mn2,$ab2);
-$scplot->mark->SetType(MARK_FILLEDCIRCLE);
-$scplot->mark->SetColor("blue");
-$scplot->mark->SetWidth(2);
-
-// Add plots to the graph
-
-$graph->AddY2($scplot);
-$graph->Add($lineplot);
-
-// Display the graph
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/manscaleex1.php b/#jpgraph/src/Examples/manscaleex1.php
deleted file mode 100644
index 9a7962aa..00000000
--- a/#jpgraph/src/Examples/manscaleex1.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$ydata = array(12,17,22,19,5,15);
-
-$graph = new Graph(220,170);
-$graph->SetScale("textlin",3,35);
-$graph->yscale->ticks->Set(8,2);
-
-$graph->title->Set('Manual scale, manual ticks');
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-
-$line = new LinePlot($ydata);
-$graph->Add($line);
-
-// Output graph
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/manscaleex2.php b/#jpgraph/src/Examples/manscaleex2.php
deleted file mode 100644
index d192ed8f..00000000
--- a/#jpgraph/src/Examples/manscaleex2.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$ydata = array(12,17,22,19,5,15);
-
-$graph = new Graph(220,170);
-$graph->SetScale("textlin",3,35);
-
-$graph->title->Set('Manual scale, exact limits');
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-
-$line = new LinePlot($ydata);
-$graph->Add($line);
-
-// Output graph
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/manscaleex3.php b/#jpgraph/src/Examples/manscaleex3.php
deleted file mode 100644
index 2fdcfa28..00000000
--- a/#jpgraph/src/Examples/manscaleex3.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$ydata = array(12,17,22,19,5,15);
-
-$graph = new Graph(250,170);
-$graph->SetScale("textlin",3,35);
-$graph->SetTickDensity(TICKD_DENSE);
-$graph->yscale->SetAutoTicks();
-
-$graph->title->Set('Manual scale, auto ticks');
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-
-$line = new LinePlot($ydata);
-$graph->Add($line);
-
-// Output graph
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/manscaleex4.php b/#jpgraph/src/Examples/manscaleex4.php
deleted file mode 100644
index 4653ede6..00000000
--- a/#jpgraph/src/Examples/manscaleex4.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$ydata = array(12,17,22,19,5,15);
-
-$graph = new Graph(220,200);
-$graph->SetScale("textlin",3,35);
-$graph->yscale->SetAutoTicks();
-
-$graph->title->Set('Manual scale, allow adjustment');
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-
-$line = new LinePlot($ydata);
-$graph->Add($line);
-
-// Output graph
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/manual_textscale_ex1.php b/#jpgraph/src/Examples/manual_textscale_ex1.php
deleted file mode 100644
index a911c337..00000000
--- a/#jpgraph/src/Examples/manual_textscale_ex1.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-// Some data
-$databary=array(12,7,16,6,7,14,9,3);
-$months=$gDateLocale->GetShortMonth();
-
-// New graph with a drop shadow
-$graph = new Graph(300,200,'auto');
-$graph->SetShadow();
-
-// Use a "text" X-scale
-$graph->SetScale("textlin");
-
-// Specify X-labels
-$graph->xaxis->SetTickLabels($months);
-
-// Set title and subtitle
-$graph->title->Set("Textscale with specified labels");
-
-// Use built in font
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-
-// Create the bar plot
-$b1 = new BarPlot($databary);
-$b1->SetLegend("Temperature");
-
-//$b1->SetAbsWidth(6);
-//$b1->SetShadow();
-
-// The order the plots are added determines who's ontop
-$graph->Add($b1);
-
-// Finally output the  image
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/manual_textscale_ex2.php b/#jpgraph/src/Examples/manual_textscale_ex2.php
deleted file mode 100644
index 968d9dd2..00000000
--- a/#jpgraph/src/Examples/manual_textscale_ex2.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-// Some data
-for($i=0; $i < 12; ++$i) {
-    $databary[$i] = rand(1,20);
-}
-$months=$gDateLocale->GetShortMonth();
-
-// New graph with a drop shadow
-$graph = new Graph(300,200);
-$graph->SetShadow();
-
-// Use a "text" X-scale
-$graph->SetScale('textlin');
-
-// Specify X-labels
-$graph->xaxis->SetTickLabels($months);
-$graph->xaxis->SetTextTickInterval(2,0);
-
-// Set title and subtitle
-$graph->title->Set('Textscale with tickinterval=2');
-
-// Use built in font
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-
-// Create the bar plot
-$b1 = new BarPlot($databary);
-$b1->SetLegend('Temperature');
-
-// The order the plots are added determines who's ontop
-$graph->Add($b1);
-
-// Finally output the  image
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/manual_textscale_ex3.php b/#jpgraph/src/Examples/manual_textscale_ex3.php
deleted file mode 100644
index 18d718cf..00000000
--- a/#jpgraph/src/Examples/manual_textscale_ex3.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-// Some data
-for($i=0; $i < 12; ++$i) {
-    $databary[$i] = rand(1,20);
-}
-$months=$gDateLocale->GetShortMonth();
-
-// New graph with a drop shadow
-$graph = new Graph(300,200);
-$graph->SetShadow();
-
-// Use a "text" X-scale
-$graph->SetScale('textlin');
-
-// Specify X-labels
-$graph->xaxis->SetTickLabels($months);
-$graph->xaxis->SetTextLabelInterval(2);
-
-// Set title and subtitle
-$graph->title->Set('Textscale with tickinterval=2');
-
-// Use built in font
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-
-// Create the bar plot
-$b1 = new BarPlot($databary);
-$b1->SetLegend('Temperature');
-
-// The order the plots are added determines who's ontop
-$graph->Add($b1);
-
-// Finally output the  image
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/manual_textscale_ex4.php b/#jpgraph/src/Examples/manual_textscale_ex4.php
deleted file mode 100644
index 99146faf..00000000
--- a/#jpgraph/src/Examples/manual_textscale_ex4.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-define('DATAPERMONTH',40);
-
-// Some data
-$m=$gDateLocale->GetShortMonth();
-$k=0;
-for($i=0; $i < 480; ++$i) {
-    $datay[$i] = rand(1,40);
-    if( $i % DATAPERMONTH === 0 )
-        $months[$i] = $m[(int)($i/DATAPERMONTH)];
-    else
-        $months[$i] = 'xx';
-}
-
-
-// New graph with a drop shadow
-$graph = new Graph(400,200);
-//$graph->SetShadow();
-
-// Use a "text" X-scale
-$graph->SetScale('textlin');
-
-// Specify X-labels
-$graph->xaxis->SetTickLabels($months);
-$graph->xaxis->SetTextTickInterval(DATAPERMONTH,0);
-$graph->xaxis->SetTextLabelInterval(2);
-
-// Set title and subtitle
-$graph->title->Set('Textscale with tickinterval=2');
-
-// Use built in font
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-
-$graph->SetBox(true,'red');
-
-// Create the bar plot
-$lp1 = new LinePlot($datay);
-$lp1->SetLegend('Temperature');
-
-// The order the plots are added determines who's ontop
-$graph->Add($lp1);
-
-// Finally output the  image
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/manualtickex1.php b/#jpgraph/src/Examples/manualtickex1.php
deleted file mode 100644
index 47d0b8d2..00000000
--- a/#jpgraph/src/Examples/manualtickex1.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-//
-// Basic example on how to use custom tickmark feature to have a label
-// at the start of each month.
-//
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-require_once ('jpgraph/jpgraph_utils.inc.php');
-
-// 
-// Create some random data for the plot. We use the current time for the
-// first X-position
-//
-$datay = array();
-$datax = array();
-$ts = time();
-$n=15; // Number of data points
-for($i=0; $i < $n; ++$i ) {
-    $datax[$i] = $ts+$i*700000; 
-    $datay[$i] = rand(5,60);
-}
-
-// Now get labels at the start of each month
-$dateUtils = new DateScaleUtils();
-list($tickPositions,$minTickPositions) = $dateUtils->GetTicks($datax);
-
-// We add some grace to the end of the X-axis scale so that the first and last
-// data point isn't exactly at the very end or beginning of the scale
-$grace = 400000;
-$xmin = $datax[0]-$grace;
-$xmax = $datax[$n-1]+$grace;
-
-//
-// The code to setup a very basic graph
-//
-$graph = new Graph(400,200);
-
-//
-// We use an integer scale on the X-axis since the positions on the X axis
-// are assumed to be UNI timestamps
-$graph->SetScale('intlin',0,0,$xmin,$xmax);
-$graph->title->Set('Basic example with manual ticks');
-$graph->title->SetFont(FF_ARIAL,FS_NORMAL,12);
-
-//
-// Make sure that the X-axis is always at the bottom of the scale
-// (By default the X-axis is alwys positioned at Y=0 so if the scale
-// doesn't happen to include 0 the axis will not be shown)
-$graph->xaxis->SetPos('min');
-
-// Now set the tic positions
-$graph->xaxis->SetTickPositions($tickPositions,$minTickPositions);
-
-// The labels should be formatted at dates with "Year-month"
-$graph->xaxis->SetLabelFormatString('My',true);
-
-// Use Ariel font
-$graph->xaxis->SetFont(FF_ARIAL,FS_NORMAL,9);
-
-// Add a X-grid
-$graph->xgrid->Show();
-
-// Create the plot line
-$p1 = new LinePlot($datay,$datax);
-$p1->SetColor('teal');
-$graph->Add($p1);
-
-// Output graph
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/manualtickex1a.php b/#jpgraph/src/Examples/manualtickex1a.php
deleted file mode 100644
index 47d0b8d2..00000000
--- a/#jpgraph/src/Examples/manualtickex1a.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-//
-// Basic example on how to use custom tickmark feature to have a label
-// at the start of each month.
-//
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-require_once ('jpgraph/jpgraph_utils.inc.php');
-
-// 
-// Create some random data for the plot. We use the current time for the
-// first X-position
-//
-$datay = array();
-$datax = array();
-$ts = time();
-$n=15; // Number of data points
-for($i=0; $i < $n; ++$i ) {
-    $datax[$i] = $ts+$i*700000; 
-    $datay[$i] = rand(5,60);
-}
-
-// Now get labels at the start of each month
-$dateUtils = new DateScaleUtils();
-list($tickPositions,$minTickPositions) = $dateUtils->GetTicks($datax);
-
-// We add some grace to the end of the X-axis scale so that the first and last
-// data point isn't exactly at the very end or beginning of the scale
-$grace = 400000;
-$xmin = $datax[0]-$grace;
-$xmax = $datax[$n-1]+$grace;
-
-//
-// The code to setup a very basic graph
-//
-$graph = new Graph(400,200);
-
-//
-// We use an integer scale on the X-axis since the positions on the X axis
-// are assumed to be UNI timestamps
-$graph->SetScale('intlin',0,0,$xmin,$xmax);
-$graph->title->Set('Basic example with manual ticks');
-$graph->title->SetFont(FF_ARIAL,FS_NORMAL,12);
-
-//
-// Make sure that the X-axis is always at the bottom of the scale
-// (By default the X-axis is alwys positioned at Y=0 so if the scale
-// doesn't happen to include 0 the axis will not be shown)
-$graph->xaxis->SetPos('min');
-
-// Now set the tic positions
-$graph->xaxis->SetTickPositions($tickPositions,$minTickPositions);
-
-// The labels should be formatted at dates with "Year-month"
-$graph->xaxis->SetLabelFormatString('My',true);
-
-// Use Ariel font
-$graph->xaxis->SetFont(FF_ARIAL,FS_NORMAL,9);
-
-// Add a X-grid
-$graph->xgrid->Show();
-
-// Create the plot line
-$p1 = new LinePlot($datay,$datax);
-$p1->SetColor('teal');
-$graph->Add($p1);
-
-// Output graph
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/manualtickex2.php b/#jpgraph/src/Examples/manualtickex2.php
deleted file mode 100644
index abd7e101..00000000
--- a/#jpgraph/src/Examples/manualtickex2.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-//
-// Basic example on how to use custom tickmark feature to have a label
-// at the start of each month.
-//
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-require_once ('jpgraph/jpgraph_utils.inc.php');
-
-// 
-// Create some random data for the plot. We use the current time for the
-// first X-position
-//
-$f = new FuncGenerator('cos($x)+1.5*cos(2*$x)');
-list($datax,$datay) = $f->E(0,10);
-
-// Now get labels at 1/2 PI intervall
-$tickPositions = array();
-$tickLabels = array();
-$tickPositions[0] = 0;
-$tickLabels[0] = '0';
-for($i=1; $i/2*M_PI < 11 ; ++$i ) {
-    $tickPositions[$i] = $i/2*M_PI;
-    if( $i % 2 )
-	$tickLabels[$i] = $i.'/2'.SymChar::Get('pi');
-    else
-	$tickLabels[$i] = ($i/2).SymChar::Get('pi');
-}
-
-$n = count($datax);
-$xmin = $datax[0];
-$xmax = $datax[$n-1];
-
-//
-// The code to setup a very basic graph
-//
-$graph = new Graph(400,200);
-
-//
-// We use an integer scale on the X-axis since the positions on the X axis
-// are assumed to be UNI timestamps
-$graph->SetScale('linlin',0,0,$xmin,$xmax);
-$graph->title->Set('Example with manual tick labels');
-$graph->title->SetFont(FF_ARIAL,FS_NORMAL,12);
-
-//
-// Make sure that the X-axis is always at the bottom of the scale
-// (By default the X-axis is alwys positioned at Y=0 so if the scale
-// doesn't happen to include 0 the axis will not be shown)
-$graph->xaxis->SetPos('min');
-
-// Now set the tic positions
-$graph->xaxis->SetMajTickPositions($tickPositions,$tickLabels);
-
-// Use Times font
-$graph->xaxis->SetFont(FF_TIMES,FS_NORMAL,10);
-$graph->yaxis->SetFont(FF_TIMES,FS_NORMAL,10);
-
-// Add a X-grid
-$graph->xgrid->Show();
-
-// Create the plot line
-$p1 = new LinePlot($datay,$datax);
-$p1->SetColor('teal');
-$graph->Add($p1);
-
-// Output graph
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/manualtickex3.php b/#jpgraph/src/Examples/manualtickex3.php
deleted file mode 100644
index 0bd03cea..00000000
--- a/#jpgraph/src/Examples/manualtickex3.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-//
-// Basic example on how to use custom tickmark feature to have a label
-// at the start of each month.
-//
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-require_once ('jpgraph/jpgraph_utils.inc.php');
-
-// 
-// Create some random data for the plot. We use the current time for the
-// first X-position
-//
-$f = new FuncGenerator('cos($x)+1.5*cos(2*$x)');
-list($datax,$datay) = $f->E(0,10);
-
-// Now get labels at 1/2 PI intervall
-$tickPositions = array();
-$tickLabels = array();
-$tickPositions[0] = 0;
-$tickLabels[0] = '0';
-for($i=1; $i/2*M_PI < 11 ; ++$i ) {
-    $tickPositions[$i] = $i/2*M_PI;
-    if( $i % 2 )
-	$tickLabels[$i] = $i.'/2'.SymChar::Get('pi');
-    else
-	$tickLabels[$i] = ($i/2).SymChar::Get('pi');
-}
-
-$n = count($datax);
-$xmin = $datax[0];
-$xmax = $datax[$n-1];
-
-//
-// The code to setup a very basic graph
-//
-$graph = new Graph(400,200);
-
-// We use an integer scale on the X-axis since the positions on the X axis
-// are assumed to be UNI timestamps
-$graph->SetScale('linlin',0,0,$xmin,$xmax);
-$graph->title->Set('Example with manual tick labels');
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,12);
-$graph->title->SetColor('white');
-
-// Setup a abackground gradient
-$graph->SetBackgroundGradient('darkred:0.7', 'black', 2, BGRAD_MARGIN);
-$graph->SetPlotGradient('black','darkred:0.8', 2);
-
-// Make sure that the X-axis is always at the bottom of the scale
-// (By default the X-axis is alwys positioned at Y=0 so if the scale
-// doesn't happen to include 0 the axis will not be shown)
-$graph->xaxis->SetPos('min');
-
-// Now set the tic positions
-$graph->xaxis->SetMajTickPositions($tickPositions,$tickLabels);
-
-// Use Times font
-$graph->xaxis->SetFont(FF_TIMES,FS_NORMAL,11);
-$graph->yaxis->SetFont(FF_TIMES,FS_NORMAL,9);
-
-// Set colors for axis
-$graph->xaxis->SetColor('lightgray');
-$graph->yaxis->SetColor('lightgray');
-
-// Add a X-grid
-$graph->xgrid->Show();
-
-// Show ticks outwards
-$graph->xaxis->SetTickSide(SIDE_DOWN);
-$graph->xaxis->SetLabelMargin(8);
-$graph->yaxis->SetTickSide(SIDE_LEFT);
-
-// Setup a filled y-grid
-//$graph->ygrid->SetFill(true,'darkgray:1.55@0.7','darkgray:1.6@0.7');
-$graph->ygrid->SetStyle('dotted');
-$graph->xgrid->SetStyle('dashed');
-
-// Create the plot line
-$p1 = new LinePlot($datay,$datax);
-$p1->SetWeight(2);
-$p1->SetColor('orange:0.9');
-$p1->SetFillColor('white@0.7');
-$graph->Add($p1);
-
-// Output graph
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/manualtickex4.php b/#jpgraph/src/Examples/manualtickex4.php
deleted file mode 100644
index f4a80e67..00000000
--- a/#jpgraph/src/Examples/manualtickex4.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-//
-// Basic example on how to use custom tickmark feature to have a label
-// at the start of each month.
-//
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-require_once ('jpgraph/jpgraph_utils.inc.php');
-
-// 
-// Create some random data for the plot. We use the current time for the
-// first X-position
-//
-$f = new FuncGenerator('cos($x)+1.5*cos(2*$x)');
-list($datax,$datay) = $f->E(0,10);
-
-// Now get labels at 1/2 PI intervall
-$tickPositions = array();
-$tickLabels = array();
-$tickPositions[0] = 0;
-$tickLabels[0] = '0';
-for($i=1; $i/2*M_PI < 11 ; ++$i ) {
-    $tickPositions[$i] = $i/2*M_PI;
-    if( $i % 2 )
-	$tickLabels[$i] = $i.'/2'.SymChar::Get('pi');
-    else
-	$tickLabels[$i] = ($i/2).SymChar::Get('pi');
-}
-
-$n = count($datax);
-$xmin = $datax[0];
-$xmax = $datax[$n-1];
-
-//
-// The code to setup a very basic graph
-//
-$graph = new Graph(400,200);
-
-// We use an integer scale on the X-axis since the positions on the X axis
-// are assumed to be UNI timestamps
-$graph->SetScale('linlin',0,0,$xmin,$xmax);
-$graph->title->Set('Example with manual tick labels');
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,12);
-$graph->title->SetColor('white');
-
-// Setup a abackground gradient
-$graph->SetBackgroundGradient('darkred:0.7', 'black', 2, BGRAD_MARGIN);
-$graph->SetPlotGradient('black','darkred:0.8', 2);
-
-// Make sure that the X-axis is always at the bottom of the scale
-// (By default the X-axis is alwys positioned at Y=0 so if the scale
-// doesn't happen to include 0 the axis will not be shown)
-$graph->xaxis->SetPos('min');
-
-// Now set the tic positions
-$graph->xaxis->SetMajTickPositions($tickPositions,$tickLabels);
-
-// Use Times font
-$graph->xaxis->SetFont(FF_TIMES,FS_NORMAL,11);
-$graph->yaxis->SetFont(FF_TIMES,FS_NORMAL,9);
-
-// Set colors for axis
-$graph->xaxis->SetColor('lightgray');
-$graph->yaxis->SetColor('lightgray');
-
-// Add a X-grid
-$graph->xgrid->Show();
-
-// Show ticks outwards
-$graph->xaxis->SetTickSide(SIDE_DOWN);
-$graph->xaxis->SetLabelMargin(8);
-$graph->yaxis->SetTickSide(SIDE_LEFT);
-
-// Setup a filled y-grid
-//$graph->ygrid->SetFill(true,'darkgray:1.55@0.7','darkgray:1.6@0.7');
-$graph->ygrid->SetStyle('dotted');
-$graph->xgrid->SetStyle('dashed');
-
-// Create the plot line
-$p1 = new LinePlot($datay,$datax);
-$p1->SetWeight(2);
-$p1->SetColor('orange:0.9');
-$p1->SetFillColor('white@0.7');
-$p1->SetFillFromYMin();
-$graph->Add($p1);
-
-// Output graph
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/markflagex1.php b/#jpgraph/src/Examples/markflagex1.php
deleted file mode 100644
index 576134e2..00000000
--- a/#jpgraph/src/Examples/markflagex1.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-require_once ('jpgraph/jpgraph_scatter.php');
-
-$datay = array(
-    array(4,26,15,44),
-    array(20,51,32,20));
-
-// Setup the graph
-$graph = new Graph(300,200);
-$graph->SetMarginColor('white');
-$graph->SetScale("textlin");
-$graph->SetFrame(false);
-$graph->SetMargin(30,5,25,20);
-
-// Enable X-grid as well
-$graph->xgrid->Show();
-
-// Use months as X-labels
-$graph->xaxis->SetTickLabels($gDateLocale->GetShortMonth());
-
-//------------------------
-// Create the plots
-//------------------------
-$p1 = new LinePlot($datay[0]);
-$p1->SetColor("navy");
-
-// Use a flag
-$p1->mark->SetType(MARK_FLAG1,197);
-
-// Displayes value on top of marker image
-$p1->value->SetFormat('%d mil');
-$p1->value->Show();
-$p1->value->SetColor('darkred');
-$p1->value->SetFont(FF_ARIAL,FS_BOLD,10);
-// Increase the margin so that the value is printed avove tje
-// img marker
-$p1->value->SetMargin(14);
-
-// Incent the X-scale so the first and last point doesn't
-// fall on the edges
-$p1->SetCenter();
-
-$graph->Add($p1);
-
-//------------
-// 2:nd plot
-//------------
-$p2 = new LinePlot($datay[1]);
-$p2->SetColor("navy");
-
-// Use a flag
-$p2->mark->SetType(MARK_FLAG1,'united states');
-
-// Displayes value on top of marker image
-$p2->value->SetFormat('%d mil');
-$p2->value->Show();
-$p2->value->SetColor('darkred');
-$p2->value->SetFont(FF_ARIAL,FS_BOLD,10);
-// Increase the margin so that the value is printed avove tje
-// img marker
-$p2->value->SetMargin(14);
-
-// Incent the X-scale so the first and last point doesn't
-// fall on the edges
-$p2->SetCenter();
-$graph->Add($p2);
-
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/matrix_csimex01.php b/#jpgraph/src/Examples/matrix_csimex01.php
deleted file mode 100644
index 76bb0a1e..00000000
--- a/#jpgraph/src/Examples/matrix_csimex01.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once('jpgraph/jpgraph.php');
-require_once('jpgraph/jpgraph_matrix.php');
-
-
-$data = array(
-	array(0,null,2,3,4,5,6,7,8,9,10,8,6,4,2),
-	array(10,9,8,7,6,5,4,3,2,1,0,8,5,9,2),
-	array(0,1,2,3,4,5,6,7,8,9,10,2,4,5,7),
-	array(10,9,8,17,6,5,4,3,2,1,0,8,6,4,2),
-	array(0,1,2,3,4,4,9,7,8,9,10,3,2,7,2),
-	array(8,1,2,3,4,8,3,7,8,9,10,5,3,9,1),
-	array(10,3,5,7,6,5,4,3,12,1,0,6,5,10,2),
-	array(10,9,8,7,6,5,4,3,2,1,NULL,8,6,4,2),
-);
-
-$nx = count($data[0]);
-$ny = count($data);
-
-for( $i=0; $i < $ny; ++$i ) {
-    for( $j=0; $j < $nx; ++$j ) {
-        $csimtargets[$i][$j] = '#'.sprintf('%02sd',$i)."-".sprintf('%02sd',$j);
-    }
-}
-
-
-for($i=0; $i < $nx; ++$i ) {
-    $collabels[$i] = sprintf('column label: %02d',$i);
-    $collabeltargets[$i] = '#'.sprintf('collabel: %02d',$i);
-
-}
-for($i=0; $i < $ny; ++$i ) {
-    $rowlabels[$i] = sprintf('row label: %02d',$i);
-    $rowlabeltargets[$i] = '#'.sprintf('rowlabel: %02d',$i);
-}
-
-// Setup a nasic matrix graph
-$graph = new MatrixGraph(400,350);
-
-$graph->SetBackgroundGradient('lightsteelblue:0.8','lightsteelblue:0.3');
-$graph->title->Set('CSIM with matrix');
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,16);
-$graph->title->SetColor('white');
-
-// Create one matrix plot
-$mp = new MatrixPlot($data,1);
-$mp->SetModuleSize(13,15);
-$mp->SetCenterPos(0.35,0.6);
-$mp->colormap->SetNullColor('gray');
-
-// Setup column lablels
-$mp->collabel->Set($collabels);
-$mp->collabel->SetSide('top');
-$mp->collabel->SetFont(FF_ARIAL,FS_NORMAL,8);
-$mp->collabel->SetFontColor('lightgray');
-
-// Setup row lablels
-$mp->rowlabel->Set($rowlabels);
-$mp->rowlabel->SetSide('right');
-$mp->rowlabel->SetFont(FF_ARIAL,FS_NORMAL,8);
-$mp->rowlabel->SetFontColor('lightgray');
-
-$mp->rowlabel->SetCSIMTargets($rowlabeltargets);
-$mp->collabel->SetCSIMTargets($collabeltargets);
-
-// Move the legend more to the right
-$mp->legend->SetMargin(90);
-$mp->legend->SetColor('white');
-$mp->legend->SetFont(FF_VERDANA,FS_BOLD,10);
-
-$mp->SetCSIMTargets($csimtargets);
-
-$graph->Add($mp);
-$graph->StrokeCSIM();
-
-?>
diff --git a/#jpgraph/src/Examples/matrix_edgeex01.php b/#jpgraph/src/Examples/matrix_edgeex01.php
deleted file mode 100644
index e66fd77a..00000000
--- a/#jpgraph/src/Examples/matrix_edgeex01.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once('jpgraph/jpgraph.php');
-require_once('jpgraph/jpgraph_matrix.php');
-
-$data = array(
-	array(0,null,2,3,4,5,6,7,8,9,10,8,6,4,2),
-	array(10,9,8,7,6,5,4,3,2,1,0,8,5,9,2),
-	array(0,1,2,3,4,5,6,7,8,9,10,2,4,5,7),
-	array(10,9,8,17,6,5,4,3,2,1,0,8,6,4,2),
-	array(0,1,2,3,4,4,9,7,8,9,10,3,2,7,2),
-	array(8,1,2,3,4,8,3,7,8,9,10,5,3,9,1),
-	array(10,3,5,7,6,5,4,3,12,1,0,6,5,10,2),
-	array(10,9,8,7,6,5,4,3,2,1,NULL,8,6,4,2),
-);
-
-for($i=0; $i < count($data[0]); ++$i ) {
-    $xlabels[$i] = sprintf('xlabel: %02d',$i);
-}
-for($i=0; $i < count($data); ++$i ) {
-    $ylabels[$i] = sprintf('ylabel: %02d',$i);
-}
-
-// Setup a nasic matrix graph
-$graph = new MatrixGraph(400,250);
-$graph->SetMarginColor('white');
-$graph->title->Set('Adding labels on the edges');
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,14);
-
-// Create one matrix plot
-$mp = new MatrixPlot($data,1);
-$mp->SetModuleSize(13,15);
-$mp->SetCenterPos(0.35,0.45);
-$mp->colormap->SetNullColor('gray');
-
-// Setup column lablels
-$mp->collabel->Set($xlabels);
-$mp->collabel->SetSide('bottom');
-$mp->collabel->SetFont(FF_ARIAL,FS_NORMAL,8);
-$mp->collabel->SetFontColor('darkgray');
-
-// Setup row lablels
-$mp->rowlabel->Set($ylabels);
-$mp->rowlabel->SetSide('right');
-$mp->rowlabel->SetFont(FF_ARIAL,FS_NORMAL,8);
-$mp->rowlabel->SetFontColor('darkgray');
-
-// Move the legend more to the right
-$mp->legend->SetMargin(90);
-
-$graph->Add($mp);
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/matrix_edgeex02.php b/#jpgraph/src/Examples/matrix_edgeex02.php
deleted file mode 100644
index c07ba6a1..00000000
--- a/#jpgraph/src/Examples/matrix_edgeex02.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_matrix.php');
-require_once ('jpgraph/jpgraph_iconplot.php');
-
-$data = array(
-	array(0,1,2,3,4,5,6,7,8,9,10),
-	array(10,9,8,7,6,5,4,3,2,1,0),
-	array(0,1,2,3,4,5,6,7,8,9,10),
-	array(10,9,8,17,6,5,4,3,2,1,0),
-	array(0,1,2,3,4,4,9,7,8,9,10),
-	array(8,1,2,3,4,8,3,7,8,9,10),
-	array(10,3,5,7,6,5,4,3,12,1,0),
-	array(10,9,8,7,6,5,4,3,2,1,0),
-);
-
-$nrow = count($data); $ncol = count($data[0]);
-
-$width=350; $height=300;
-$graph = new MatrixGraph($width,$height);
-$graph->title->Set('Add ine row/col labels');
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,14);
-
-$mp = new MatrixPlot($data,1);
-$mp->SetSize(0.55);
-$mp->SetCenterPos(0.45, 0.45);
-
-$rowtitles = array();
-for( $i=0; $i < $nrow; ++$i ) {
-    $rowtitles[$i] = sprintf('Row: %02d',$i);
-}
-$coltitles = array();
-for( $i=0; $i < $ncol; ++$i ) {
-    $coltitles[$i] = sprintf('Col: %02d',$i);
-}
-
-$mp->rowlabel->Set($rowtitles);
-$mp->rowlabel->SetFont(FF_ARIAL,FS_NORMAL,10);
-$mp->rowlabel->SetFontColor('blue');
-$mp->rowlabel->SetSide('left');
-
-$mp->collabel->Set($coltitles);
-$mp->collabel->SetFont(FF_ARIAL,FS_NORMAL,10);
-$mp->collabel->SetFontColor('darkred');
-$mp->collabel->SetAngle(70); // 90 is default for col titles
-$mp->collabel->SetSide('bottom');
-
-$graph->Add($mp);
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/matrix_ex0.php b/#jpgraph/src/Examples/matrix_ex0.php
deleted file mode 100644
index 43777cf8..00000000
--- a/#jpgraph/src/Examples/matrix_ex0.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-require_once('jpgraph/jpgraph.php');
-require_once('jpgraph/jpgraph_matrix.php');
-
-// Some (random) matrix
-$data = array(
-	array(0,1,2,3,4,5,6,7,8,9,10),
-	array(10,9,8,7,6,5,4,3,2,1,0),
-	array(0,1,2,3,4,5,6,7,8,9,10),
-	array(10,9,8,17,6,5,4,3,2,1,0),
-	array(0,1,2,3,4,4,9,7,8,9,10),
-	array(8,1,2,3,4,8,3,7,8,9,10),
-	array(10,3,5,7,6,5,4,3,12,1,0),
-	array(10,9,8,7,6,5,4,3,2,1,0),
-);
-
-// Setup a bsic matrix graph and title
-$graph = new MatrixGraph(400,300);
-$graph->title->Set('Basic matrix example');
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,14);
-
-// Create a ,atrix plot using all default values
-$mp = new MatrixPlot($data);
-$graph->Add($mp);
-
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/matrix_ex01.php b/#jpgraph/src/Examples/matrix_ex01.php
deleted file mode 100644
index d0387dd1..00000000
--- a/#jpgraph/src/Examples/matrix_ex01.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_matrix.php');
-
-$data = array(
-	array(0,1,2,3,4,5,6,7,8,9,10),
-	array(10,9,8,7,6,5,4,3,2,1,0),
-	array(0,1,2,3,4,5,6,7,8,9,10),
-	array(10,9,8,17,6,5,4,3,2,1,0),
-	array(0,1,2,3,4,4,9,7,8,9,10),
-	array(8,1,2,3,4,8,3,7,8,9,10),
-	array(10,3,5,7,6,5,4,3,12,1,0),
-	array(10,9,8,7,6,5,4,3,2,1,0),
-);
-
-// Do the meshinterpolation once for the data
-doMeshInterpolate($data,3);
-
-$graph = new MatrixGraph(550,500);
-$graph->title->Set('Possible legend positions');
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,14);
-
-$mp = array();
-$n = 4;
-$pos = array(0.3,0.33, 0.8,0.68, 
-			 0.3,0.68, 0.8,0.33);
-for($i=0; $i < $n; ++$i){
-    $mp[$i] = new MatrixPlot($data);
-    $mp[$i]->colormap->SetMap($i);
-	$mp[$i]->SetModuleSize(4,5);
-	$mp[$i]->SetLegendLayout($i);
-	$mp[$i]->SetCenterPos($pos[$i*2],$pos[$i*2+1]);
-}
-
-$graph->Add($mp);
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/matrix_ex02.php b/#jpgraph/src/Examples/matrix_ex02.php
deleted file mode 100644
index f81e59cd..00000000
--- a/#jpgraph/src/Examples/matrix_ex02.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_matrix.php');
-
-$data = array(
-	array(0,1,2,3,4,5,6,7,8,9,10),
-	array(10,9,8,7,6,5,4,3,2,1,0),
-	array(0,1,2,3,4,5,6,7,8,9,10),
-	array(10,9,8,17,6,5,4,3,2,1,0),
-	array(0,1,2,3,4,4,9,7,8,9,10),
-	array(8,1,2,3,4,8,3,7,8,9,10),
-	array(10,3,5,7,6,5,4,3,12,1,0),
-	array(10,9,8,7,6,5,4,3,2,1,0),
-);
-
-// Do the meshinterpolation once for the data
-doMeshInterpolate($data,3);
-$r=count($data);$c=count($data[0]);
-
-$graph = new MatrixGraph(250,220);
-$graph->title->Set('Meshinterpolation=3');
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,14);
-
-$mp = new MatrixPlot($data,1);
-$mp->colormap->SetMap(0);
-$mp->SetSize(200,160);
-$mp->SetCenterPos(0.5,0.55);
-$mp->legend->Show(false);
-$graph->Add($mp);
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/matrix_ex03.php b/#jpgraph/src/Examples/matrix_ex03.php
deleted file mode 100644
index a943acd0..00000000
--- a/#jpgraph/src/Examples/matrix_ex03.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_matrix.php');
-require_once ('jpgraph/jpgraph_iconplot.php');
-
-$data = array(
-	array(0,1,2,3,4,5,6,7,8,9,10),
-	array(10,9,8,7,6,5,4,3,2,1,0),
-	array(0,1,2,3,4,5,6,7,8,9,10),
-	array(10,9,8,17,6,5,4,3,2,1,0),
-	array(0,1,2,3,4,4,9,7,8,9,10),
-	array(8,1,2,3,4,8,3,7,8,9,10),
-	array(10,3,5,7,6,5,4,3,12,1,0),
-	array(10,9,8,7,6,5,4,3,2,1,0),
-);
-
-// Do the meshinterpolation once for the data
-doMeshInterpolate($data,3);
-$r=count($data);$c=count($data[0]);
-
-$width=400; $height=400;
-$graph = new MatrixGraph($width,$height);
-$graph->title->Set('Adding an icon to the background');
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,14);
-
-$mp = new MatrixPlot($data,1);
-$mp->SetSize(0.6);
-
-$icon = new IconPlot('icon.jpg',$width-1,$height-1,0.8,50);
-$icon->SetAnchor('right','bottom');
-$graph->Add($icon);
-
-$graph->Add($mp);
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/matrix_ex04.1.php b/#jpgraph/src/Examples/matrix_ex04.1.php
deleted file mode 100644
index 419a437a..00000000
--- a/#jpgraph/src/Examples/matrix_ex04.1.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_matrix.php');
-require_once ('jpgraph/jpgraph_iconplot.php');
-
-$data = array(
-	array(0,1,2,3,4,5,6,7,8,9,10),
-	array(10,9,8,7,6,5,4,3,2,1,0),
-	array(0,1,2,3,4,5,6,7,8,9,10),
-	array(10,9,8,17,6,5,4,3,2,1,0),
-	array(0,1,2,3,4,4,9,7,8,9,10),
-	array(8,1,2,3,4,8,3,7,8,9,10),
-	array(10,3,5,7,6,5,4,3,12,1,0),
-	array(10,9,8,7,6,5,4,3,2,1,0),
-);
-
-// Do the meshinterpolation once for the data
-doMeshInterpolate($data,4);
-$r=count($data);$c=count($data[0]);
-
-$width=300; $height=300;
-$graph = new MatrixGraph($width,$height);
-$graph->title->Set('Adding a background image');
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,14);
-$graph->subtitle->Set('Alphablending = 0.2');
-
-// Add a stretched background image
-$graph->SetBackgroundImage('ironrod.jpg',BGIMG_FILLFRAME);
-$graph->SetBackgroundImageMix(50);
-
-$mp = new MatrixPlot($data,1);
-$mp->SetSize(0.65);
-$mp->SetCenterPos(0.5,0.5);
-$mp->SetLegendLayout(1);
-$mp->SetAlpha(0.2);
-
-$graph->Add($mp);
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/matrix_ex04.2.php b/#jpgraph/src/Examples/matrix_ex04.2.php
deleted file mode 100644
index 6650444c..00000000
--- a/#jpgraph/src/Examples/matrix_ex04.2.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_matrix.php');
-require_once ('jpgraph/jpgraph_iconplot.php');
-
-$data = array(
-	array(0,1,2,3,4,5,6,7,8,9,10),
-	array(10,9,8,7,6,5,4,3,2,1,0),
-	array(0,1,2,3,4,5,6,7,8,9,10),
-	array(10,9,8,17,6,5,4,3,2,1,0),
-	array(0,1,2,3,4,4,9,7,8,9,10),
-	array(8,1,2,3,4,8,3,7,8,9,10),
-	array(10,3,5,7,6,5,4,3,12,1,0),
-	array(10,9,8,7,6,5,4,3,2,1,0),
-);
-
-// Do the meshinterpolation once for the data
-doMeshInterpolate($data,4);
-$r=count($data);$c=count($data[0]);
-
-$width=300; $height=300;
-$graph = new MatrixGraph($width,$height);
-$graph->title->Set('Adding a background image');
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,14);
-$graph->subtitle->Set('Alphablending = 0.7');
-
-// Add a stretched background image
-$graph->SetBackgroundImage('ironrod.jpg',BGIMG_FILLFRAME);
-$graph->SetBackgroundImageMix(50);
-
-$mp = new MatrixPlot($data,1);
-$mp->SetSize(0.65);
-$mp->SetCenterPos(0.5,0.5);
-$mp->SetLegendLayout(1);
-$mp->SetAlpha(0.7);
-
-$graph->Add($mp);
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/matrix_ex04.php b/#jpgraph/src/Examples/matrix_ex04.php
deleted file mode 100644
index 2917f15c..00000000
--- a/#jpgraph/src/Examples/matrix_ex04.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_matrix.php');
-require_once ('jpgraph/jpgraph_iconplot.php');
-
-$data = array(
-	array(0,1,2,3,4,5,6,7,8,9,10),
-	array(10,9,8,7,6,5,4,3,2,1,0),
-	array(0,1,2,3,4,5,6,7,8,9,10),
-	array(10,9,8,17,6,5,4,3,2,1,0),
-	array(0,1,2,3,4,4,9,7,8,9,10),
-	array(8,1,2,3,4,8,3,7,8,9,10),
-	array(10,3,5,7,6,5,4,3,12,1,0),
-	array(10,9,8,7,6,5,4,3,2,1,0),
-);
-
-// Do the meshinterpolation once for the data
-doMeshInterpolate($data,4);
-$r=count($data);$c=count($data[0]);
-
-$width=400; $height=400;
-$graph = new MatrixGraph($width,$height);
-$graph->title->Set('Adding a background image');
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,14);
-
-// Add a stretched background image
-$graph->SetBackgroundImage('ironrod.jpg',BGIMG_FILLFRAME);
-$graph->SetBackgroundImageMix(50);
-
-$mp = new MatrixPlot($data,1);
-$mp->SetSize(0.6);
-$mp->SetCenterPos(0.5,0.5);
-$mp->SetLegendLayout(1);
-
-$graph->Add($mp);
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/matrix_ex05.php b/#jpgraph/src/Examples/matrix_ex05.php
deleted file mode 100644
index d3f989ea..00000000
--- a/#jpgraph/src/Examples/matrix_ex05.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_matrix.php');
-
-$data = array(
-	array(0,1,2,3,4,5,6,7,8,9,10),
-	array(10,9,8,7,6,5,4,3,2,1,0),
-	array(0,1,2,3,4,5,6,7,8,9,10),
-	array(10,9,8,17,6,5,4,3,2,1,0),
-	array(0,1,2,3,4,4,9,7,8,9,10),
-	array(8,1,2,3,4,8,3,7,8,9,10),
-	array(10,3,5,7,6,5,4,3,12,1,0),
-	array(10,9,8,7,6,5,4,3,2,1,0),
-);
-
-$width=400; $height=350;
-$graph = new MatrixGraph($width,$height);
-$graph->title->Set('Using a circular module type');
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,14);
-
-$mp = new MatrixPlot($data,2);
-$mp->SetSize(0.85);
-$mp->SetModuleType(1);
-$mp->SetBackgroundColor('teal:1.8');
-$mp->SetCenterPos(0.5,0.45);
-$mp->SetLegendLayout(1);
-
-$graph->Add($mp);
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/matrix_ex06.php b/#jpgraph/src/Examples/matrix_ex06.php
deleted file mode 100644
index 7c3d4727..00000000
--- a/#jpgraph/src/Examples/matrix_ex06.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once('jpgraph/jpgraph.php');
-require_once('jpgraph/jpgraph_matrix.php');
-require_once('jpgraph/jpgraph_plotline.php');
-
-
-$data = array(
-        array(0,null,2,3,4,5,6,7,8,9,10,8,6,4,2),
-        array(10,9,8,7,6,5,4,3,2,1,0,8,5,9,2),
-        array(0,1,2,3,4,5,6,7,8,9,10,2,4,5,7),
-        array(10,9,8,17,6,5,4,3,2,1,0,8,6,4,2),
-        array(0,1,2,3,4,4,9,7,8,9,10,3,2,7,2),
-        array(8,1,2,3,4,8,3,7,8,9,10,5,3,9,1),
-        array(10,3,5,7,6,5,4,3,12,1,0,6,5,10,2),
-        array(10,9,8,7,6,5,4,3,2,1,NULL,8,6,4,2),
-);
-
-$nx = count($data[0]);
-$ny = count($data);
-
-
-
-for($i=0; $i < $nx; ++$i ) {
-    $collabels[$i] = sprintf('column label: %02d',$i);
-
-}
-for($i=0; $i < $ny; ++$i ) {
-    $rowlabels[$i] = sprintf('row label: %02d',$i);
- }
-
-// Setup a nasic matrix graph
-$graph = new MatrixGraph(400,350);
-
-$graph->SetBackgroundGradient('lightsteelblue:0.8','lightsteelblue:0.3');
-$graph->title->Set('Matrix with lines');
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,18);
-$graph->title->SetColor('white');
-
-// Create two lines to add as markers
-$l1 = new PlotLine(VERTICAL, 5, 'lightgray:1.5', 4);
-$l2 = new PlotLine(HORIZONTAL, 3, 'lightgray:1.5', 4);
-
-// Create one matrix plot
-$mp = new MatrixPlot($data,1);
-$mp->SetModuleSize(13,15);
-$mp->SetCenterPos(0.35,0.6);
-$mp->colormap->SetNullColor('gray');
-
-// Add lines
-$mp->AddLine($l1);
-$mp->AddLine($l2);
-// this could also be done as
-// $mp->AddLine(array($l1,$l2));
-
-// Setup column lablels
-$mp->collabel->Set($collabels);
-$mp->collabel->SetSide('top');
-$mp->collabel->SetFont(FF_ARIAL,FS_NORMAL,8);
-$mp->collabel->SetFontColor('lightgray');
-
-// Setup row lablels
-$mp->rowlabel->Set($rowlabels);
-$mp->rowlabel->SetSide('right');
-$mp->rowlabel->SetFont(FF_ARIAL,FS_NORMAL,8);
-$mp->rowlabel->SetFontColor('lightgray');
-
-// Move the legend more to the right
-$mp->legend->SetMargin(90);
-$mp->legend->SetColor('white');
-$mp->legend->SetFont(FF_VERDANA,FS_BOLD,10);
-
-$graph->Add($mp);
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/matrix_introex.php b/#jpgraph/src/Examples/matrix_introex.php
deleted file mode 100644
index fcecc40c..00000000
--- a/#jpgraph/src/Examples/matrix_introex.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_matrix.php');
-require_once ('jpgraph/jpgraph_iconplot.php');
-
-$data = array(
-    array(0,1,2,3,4,5,6,7,8,9,10),
-    array(10,9,8,7,6,5,4,3,2,1,0),
-    array(0,1,2,3,4,5,6,7,8,9,10),
-    array(10,9,8,17,6,5,4,3,2,1,0),
-    array(0,1,2,3,4,4,9,7,8,9,10),
-    array(8,1,2,3,4,8,3,7,8,9,10),
-    array(10,3,5,7,6,5,4,3,12,1,0),
-    array(10,9,8,7,6,5,4,3,2,1,0),
-);
-// Interpolate the data a factor of 4 to get some mroe 
-// data points
-doMeshInterpolate($data,4);
-
-// Setup a timer
-$timer = new JpgTimer();
-$timer->Push();
-
-//--------------------------------------------------------------
-// Setup a basic matrix graph
-//--------------------------------------------------------------
-$width = 740; $height = 500;
-$graph = new MatrixGraph($width,$height);
-$graph->SetMargin(1,2,70,1);
-$graph->SetColor('white');
-$graph->SetMarginColor('#fafafa');
-$graph->title->Set('Intro matrix graph');
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,14);
-
-// Setup the background image
-$graph->SetBackgroundImage('fireplace.jpg',BGIMG_FILLPLOT);
-$graph->SetBackgroundImageMix(50);
-
-// Setup the timer in the right footer
-$graph->footer->SetTimer($timer);
-$graph->footer->right->SetColor('white');
-
-//--------------------------------------------------------------
-// Create the 2 matrix plots
-//--------------------------------------------------------------
-$mp = array(); $n = 2;
-for($i=0; $i < $n; ++$i){
-    $mp[$i] = new MatrixPlot($data);
-    $mp[$i]->colormap->SetMap($i);
-    $mp[$i]->SetSize(300,250);    
-    $mp[$i]->SetLegendLayout(1);
-    $mp[$i]->SetAlpha(0.2);
-    
-    // Make the legend slightly longer than default
-    $mp[$i]->legend->SetSize(20,280);
-}
-$mp[1]->colormap->SetMap(3);
-
-$hor1 = new LayoutHor(array($mp[0],$mp[1]));
-$hor1->SetCenterPos(0.5,0.5);
-
-$graph->Add($hor1);
-
-//--------------------------------------------------------------
-// Add texts to the graph
-//--------------------------------------------------------------
-$txts = array( 
-    array('Temperature gradient',$width/2,80),
-    array('Heat color map',200,110),
-    array('High contrast map',560,110));
-
-$n=count($txts);
-$t=array();
-for($i=0; $i < $n; ++$i){
-    $t[$i] = new Text($txts[$i][0],$txts[$i][1],$txts[$i][2]);
-    $t[$i]->SetFont(FF_ARIAL,FS_BOLD,14);
-    $t[$i]->SetColor('white');
-    $t[$i]->SetAlign('center','top');
-}
-$graph->Add($t);
-
-//--------------------------------------------------------------
-// Add Jpgraph logo to top left corner
-//--------------------------------------------------------------
-$icon = new IconPlot('jpglogo.jpg',2,2,0.9,50);
-$graph->Add($icon);
-
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/matrix_layout_ex1.php b/#jpgraph/src/Examples/matrix_layout_ex1.php
deleted file mode 100644
index 1fefb1a8..00000000
--- a/#jpgraph/src/Examples/matrix_layout_ex1.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_matrix.php');
-
-$data = array(
-array(0,1,2,3,4,5,6,7,8,9,10),
-array(10,9,8,7,6,5,4,3,2,1,0),
-array(0,1,2,3,4,5,6,7,8,9,10),
-array(10,9,8,17,6,5,4,3,2,1,0),
-array(0,1,2,3,4,4,9,7,8,9,10),
-array(8,1,2,3,4,8,3,7,8,9,10),
-array(10,3,5,7,6,5,4,3,12,1,0),
-array(10,9,8,7,6,5,4,3,2,1,0),
-);
-
-doMeshInterpolate($data,4);
-
-$graph = new MatrixGraph(850,580);
-$graph->title->Set('Matrix layout example');
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,14);
-
-$mp = array();
-$n = 5;
-for($i=0; $i < $n; ++$i){
-    $mp[$i] = new MatrixPlot($data);
-    $mp[$i]->colormap->SetMap($i);
-    if( $i < 2 )
-        $mp[$i]->SetSize(0.35);
-    else
-        $mp[$i]->SetSize(0.21);    
-    // We need to make the legend a bit smaller since by 
-    // defalt has a  ~45% height 
-    $mp[$i]->legend->SetModuleSize(15,2);
-}
-
-$hor1 = new LayoutHor(array($mp[0],$mp[1]));
-$hor2 = new LayoutHor(array($mp[2],$mp[3],$mp[4]));
-$vert = new LayoutVert(array($hor1,$hor2));
-$vert->SetCenterPos(0.45,0.5);
-
-$graph->Add($vert);
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/matrixex00.php b/#jpgraph/src/Examples/matrixex00.php
deleted file mode 100644
index 2ba5114a..00000000
--- a/#jpgraph/src/Examples/matrixex00.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_matrix.php');
-
-$data = array(
-array(0,1,2,3,4,5,6,7,8,9,10),
-array(10,9,8,7,6,5,4,3,2,1,0),
-array(0,1,2,3,4,5,6,7,8,9,10),
-array(10,9,8,17,6,5,4,3,2,1,0),
-array(0,1,2,3,4,4,9,7,8,9,10),
-array(8,1,2,3,4,8,3,7,8,9,10),
-array(10,3,5,7,6,5,4,3,12,1,0),
-array(10,9,8,7,6,5,4,3,2,1,0),
-);
-
-doMeshInterpolate($data,4);
-
-$graph = new MatrixGraph(850,580);
-$graph->title->Set('Matrix example 00');
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,14);
-
-//$graph->SetColor('darkgreen@0.8');
-
-$mp = array();
-$n = 5;
-for($i=0; $i < $n; ++$i){
-    $mp[$i] = new MatrixPlot($data);
-    $mp[$i]->colormap->SetMap($i);
-    if( $i < 2 )
-        $mp[$i]->SetSize(0.35);
-    else
-        $mp[$i]->SetSize(0.21);    
-}
-
-$hor1 = new LayoutHor(array($mp[0],$mp[1]));
-$hor2 = new LayoutHor(array($mp[2],$mp[3],$mp[4]));
-$vert = new LayoutVert(array($hor1,$hor2));
-$vert->SetCenterPos(0.45,0.5);
-
-//$mp = new MatrixPlot($data);
-//$mp->colormap->SetMap(2);
-//$mp->SetCenterPos(0.5, 0.45);
-//$mp->SetLegendLayout(0);
-//$mp->SetSize(0.6);
-//$mp->legend->Show(false);
-//$mp->SetModuleSize(5,5);
-
-//$mp->legend->SetModuleSize(20,4);
-//$mp->legend->SetSize(20,0.5);
-
-//$t = new Text('A text string',10,10);
-//$graph->Add($t);
-
-//$graph->Add($mp);
-
-$graph->Add($vert);
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/mkgrad.php b/#jpgraph/src/Examples/mkgrad.php
deleted file mode 100644
index 3f36b44a..00000000
--- a/#jpgraph/src/Examples/mkgrad.php
+++ /dev/null
@@ -1,171 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-//=======================================================================
-// File:	    MKGRAD.PHP
-// Description:	Simple tool to create a gradient background
-// Ver: 	    $Id$
-//=======================================================================
-
-// Basic library classes
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-require_once ('jpgraph/jpgraph_canvas.php');
-  
-
-// Must have a global comparison method for usort()
-function _cmp($a,$b) {
-    return strcmp($a,$b);
-}
-
-// Generate the input form
-class Form {
-    var $iColors;
-    var $iGradstyles;
-    function Form() {
-
-	$rgb = new RGB();
-	$this->iColors = array_keys($rgb->rgb_table);
-	usort($this->iColors,'_cmp');
-
-	$this->iGradstyles = array(
-	    "Vertical",2,
-	    "Horizontal",1,
-	    "Vertical from middle",3,
-	    "Horizontal from middle",4,
-	    "Horizontal wider middle",6,
-	    "Vertical wider middle",7,
-	    "Rectangle",5 );
-    }
-
-    function Run() {
-
-	echo '<h3>Generate gradient background</h3>';
-	echo '<form METHOD=POST action=""><table style="border:blue solid 1;">';
-	echo '<tr><td>Width:<br>'.$this->GenHTMLInput('w',8,4,300).'</td>';
-	echo "\n";
-	echo '<td>Height:<br>'.$this->GenHTMLInput('h',8,4,300).'</td></tr>';
-	echo "\n";
-	echo '<tr><td>From Color:<br>';
-	echo $this->GenHTMLSelect('fc',$this->iColors);
-	echo '</td><td>To Color:<br>';
-	echo $this->GenHTMLSelect('tc',$this->iColors);
-	echo '</td></tr>';
-	echo '<tr><td colspan=2>Gradient style:<br>';
-	echo $this->GenHTMLSelectCode('s',$this->iGradstyles);
-	echo '</td></tr>';
-	echo '<tr><td colspan=2>Filename: (empty to stream)<br>';
-	echo $this->GenHTMLInput('fn',55,100);
-	echo '</td></tr>';
-	echo '<tr><td colspan=2 align=right>'.$this->GenHTMLSubmit('submit').'</td></tr>';
-	echo '</table>';
-	echo '</form>';
-
-    }
-
-    function GenHTMLSubmit($name) {
-	return '<INPUT TYPE=submit name="ok"  value=" Ok " >';
-    }
-
-
-    function GenHTMLInput($name,$len,$maxlen=100,$val='') {
-	return '<INPUT TYPE=TEXT NAME='.$name.' VALUE="'.$val.'" SIZE='.$len.' MAXLENGTH='.$maxlen.'>';
-    }
-
-    function GenHTMLSelect($name,$option,$selected="",$size=0) {
-	$txt="<select name=$name";
-	if( $size > 0 )
-	    $txt .= " size=$size >";
-	else 
-	    $txt .= ">";
-	for($i=0; $i<count($option); $i++) {
-	    if( $selected==$option[$i] )
-		$txt=$txt."<option selected value=\"$option[$i]\">$option[$i]</option>\n";		
-	    else
-		$txt=$txt."<option value=\"".$option[$i]."\">$option[$i]</option>\n";
-	}
-	return $txt."</select>\n";
-    }
-    
-    function GenHTMLSelectCode($name,$option,$selected="",$size=0) {
-	$txt="<select name=$name";
-	if( $size > 0 )
-	    $txt .= " size=$size >";
-	else 
-	    $txt .= ">";
-	for($i=0; $i<count($option); $i += 2) {
-	    if( $selected==$option[($i+1)] )
-		$txt=$txt."<option selected value=".$option[($i+1)].">$option[$i]</option>\n";		
-	    else
-		$txt=$txt."<option value=\"".$option[($i+1)]."\">$option[$i]</option>\n";
-	}
-	return $txt."</select>\n";
-    }
-
-}
-
-// Basic application driver
-
-class Driver {
-    var $iGraph, $iGrad;
-    var $iWidth,$iHeight;
-    var $iFromColor, $iToColor;
-    var $iStyle;
-    var $iForm;
-
-    function Driver() {
-	$this->iForm = new Form();
-    }
-
-    function GenGradImage() {
-	
-	$aWidth	 = (int)@$_POST['w'];
-	$aHeight = (int)@$_POST['h'];
-	$aFrom   = @$_POST['fc'];
-	$aTo     = @$_POST['tc'];
-	$aStyle  = @$_POST['s'];
-	$aFileName  = @$_POST['fn'];
-
-	$this->iWidth     = $aWidth;
-	$this->iHeight    = $aHeight;
-	$this->iFromColor = $aFrom;
-	$this->iToColor   = $aTo;
-	$this->iStyle     = $aStyle;
-
-	$this->graph = new CanvasGraph($aWidth,$aHeight);
-	$this->grad  = new Gradient($this->graph->img);
-	$this->grad->FilledRectangle(0,0,
-				     $this->iWidth,$this->iHeight,
-				     $this->iFromColor,
-				     $this->iToColor,
-				     $this->iStyle);
-
-	if( $aFileName != "" ) {
-	    $this->graph->Stroke($aFileName);
-	    echo "Image file '$aFileName' created.";
-	}
-	else
-	    $this->graph->Stroke();
-    }
-
-
-    function Run() {
-	
-	global $HTTP_POST_VARS;
-
-	// Two modes:
-	// 1) If the script is called with no posted arguments
-	// we show the input form.
-	// 2) If we have posted arguments we naivly assume that
-	// we are called to do the image.
-
-	if( @$_POST['ok']===' Ok ' ) { 
-	    $this->GenGradImage();
-	}
-	else
-	    $this->iForm->Run();
-    }
-}
-
-$driver = new Driver();				
-$driver->Run();
-
-?>
diff --git a/#jpgraph/src/Examples/multconstganttex01.php b/#jpgraph/src/Examples/multconstganttex01.php
deleted file mode 100644
index fce986e2..00000000
--- a/#jpgraph/src/Examples/multconstganttex01.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php // content="text/plain; charset=utf-8" 
-// Gantt example 
-require_once ('jpgraph/jpgraph.php'); 
-require_once ('jpgraph/jpgraph_gantt.php'); 
-
-// Create the basic graph 
-$graph = new GanttGraph(); 
-$graph->title->Set("Example with multiple constrains"); 
-
-$bar1 = new GanttBar(0, "Label 1", "2003-06-08", "2003-06-12"); 
-$bar2 = new GanttBar(1, "Label 2", "2003-06-16", "2003-06-19"); 
-$bar3 = new GanttBar(2, "Label 3", "2003-06-15", "2003-06-21"); 
-
-//create constraints 
-$bar1->SetConstrain(1, CONSTRAIN_ENDSTART); 
-$bar1->SetConstrain(2, CONSTRAIN_ENDSTART); 
-
-// Setup scale 
-$graph->ShowHeaders(/*GANTT_HYEAR | GANTT_HMONTH |*/ GANTT_HDAY | GANTT_HWEEK); 
-$graph->scale->week->SetStyle(WEEKSTYLE_FIRSTDAYWNBR); 
-
-// Add the specified activities 
-$graph->Add($bar1); 
-$graph->Add($bar2); 
-$graph->Add($bar3); 
-
-// .. and stroke the graph 
-$graph->Stroke(); 
-
-?>
diff --git a/#jpgraph/src/Examples/mulyaxiscsimex1.php b/#jpgraph/src/Examples/mulyaxiscsimex1.php
deleted file mode 100644
index 516aea34..00000000
--- a/#jpgraph/src/Examples/mulyaxiscsimex1.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-
-// Setup some dummy targets for the CSIM
-$n = 5;
-for($i=0; $i < $n; ++$i ) {
-    $targ1[$i] = "#$i";
-    $targ2[$i] = "#$i";
-    $targ3[$i] = "#$i";
-    $alts1[$i] = "val=%d";
-    $alts2[$i] = "val=%d";
-    $alts3[$i] = "val=%d";
-}
-
-// Some data for the points
-$datay1 = array(3,10,4,1,6);
-$datay2 = array(25,22,18,24,20);
-$datay3 = array(89,70,92,77,96);
-
-// Create a basic graph with some suitable margins
-$graph = new Graph(500,250);
-$graph->SetMargin(60,180,50,40);
-$graph->SetMarginColor('white');
-$graph->title->Set("Multi Y-axes with Image Map");
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-
-// Setup the scales for all axes
-$graph->SetScale("intlin");
-$graph->SetYScale(0,'int');
-$graph->SetYScale(1,'int');
-
-// Standard Y-axis plot
-$lp1 = new LinePlot($datay1);
-$lp1->SetLegend('2001');
-$lp1->mark->SetType(MARK_DIAMOND);
-$lp1->mark->SetWidth(15);
-$lp1->mark->SetFillColor('orange');
-$lp1->SetCSIMTargets($targ1,$alts1);
-$graph->yaxis->title->Set('Basic Rate');
-$graph->yaxis->title->SetFont(FF_ARIAL,FS_BOLD,10);
-$graph->yaxis->title->SetColor('black');
-$graph->Add($lp1);
-
-// First multi Y-axis plot
-$lp2 = new LinePlot($datay2);
-$lp2->SetLegend('2002');
-$lp2->mark->SetType(MARK_DIAMOND);
-$lp2->mark->SetWidth(15);
-$lp2->mark->SetFillColor('darkred');
-$lp2->SetCSIMTargets($targ2,$alts2);
-$graph->ynaxis[0]->SetColor('darkred');
-$graph->ynaxis[0]->title->Set('Rate A');
-$graph->ynaxis[0]->title->SetFont(FF_ARIAL,FS_BOLD,10);
-$graph->ynaxis[0]->title->SetColor('darkred');
-$graph->AddY(0,$lp2);
-
-// Second multi Y-axis plot
-$lp3 = new LinePlot($datay3);
-$lp3->SetLegend('2003');
-$lp3->mark->SetType(MARK_DIAMOND);
-$lp3->mark->SetWidth(15);
-$lp3->mark->SetFillColor('darkgreen');
-$lp3->SetCSIMTargets($targ3,$alts3);
-$graph->ynaxis[1]->SetColor('darkgreen');
-$graph->ynaxis[1]->title->Set('Rate B');
-$graph->ynaxis[1]->title->SetFont(FF_ARIAL,FS_BOLD,10);
-$graph->ynaxis[1]->title->SetColor('darkgreen');
-$graph->AddY(1,$lp3);
-
-// Send back the HTML page which will call this script again
-// to retrieve the image.
-$graph->StrokeCSIM();
-?>
diff --git a/#jpgraph/src/Examples/mulyaxisex1.php b/#jpgraph/src/Examples/mulyaxisex1.php
deleted file mode 100644
index 57304eba..00000000
--- a/#jpgraph/src/Examples/mulyaxisex1.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$n = 8;
-for($i=0; $i < $n; ++$i ) {
-    $datay[$i] = rand(1,10);
-    $datay2[$i] = rand(10,55);
-    $datay3[$i] = rand(200,600);
-    $datay4[$i] = rand(500,800);
-}
-
-// Setup the graph
-$graph = new Graph(450,250);
-$graph->SetMargin(40,150,40,30);
-$graph->SetMarginColor('white');
-
-$graph->SetScale('intlin');
-$graph->title->Set('Using multiple Y-axis');
-$graph->title->SetFont(FF_ARIAL,FS_NORMAL,14);
-
-$graph->SetYScale(0,'lin');
-$graph->SetYScale(1,'lin');
-$graph->SetYScale(2,'lin');
-
-$p1 = new LinePlot($datay);
-$graph->Add($p1);
-
-$p2 = new LinePlot($datay2);
-$p2->SetColor('teal');
-$graph->AddY(0,$p2);
-$graph->ynaxis[0]->SetColor('teal');
-
-$p3 = new LinePlot($datay3);
-$p3->SetColor('red');
-$graph->AddY(1,$p3);
-$graph->ynaxis[1]->SetColor('red');
-
-$p4 = new LinePlot($datay4);
-$p4->SetColor('blue');
-$graph->AddY(2,$p4);
-$graph->ynaxis[2]->SetColor('blue');
-
-// Output line
-$graph->Stroke();
-?>
-
-
diff --git a/#jpgraph/src/Examples/negbarvalueex01.php b/#jpgraph/src/Examples/negbarvalueex01.php
deleted file mode 100644
index f825a59c..00000000
--- a/#jpgraph/src/Examples/negbarvalueex01.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-$datay=array(12,0,-19,-7,17,-6);
-
-// Create the graph. 
-$graph = new Graph(400,300);	
-$graph->img->SetMargin(60,30,40,40);
-$graph->SetScale("textlin");
-$graph->SetShadow();
-
-// Create a bar pot
-$bplot = new BarPlot($datay);
-$bplot->SetFillColor("orange");
-
-// DIsplay value at top of each bar
-$bplot->value->Show();
-$bplot->SetShadow();
-
-$graph->Add($bplot);
-
-// Position the scale at the min of the other axis
-$graph->xaxis->SetPos("min");
-
-// Add 10% more space at top and bottom of graph
-$graph->yscale->SetGrace(10,10);
-
-$graph->xaxis->title->Set("X-title");
-$graph->yaxis->title->Set("Y-title");
-
-$graph->title->SetFont(FF_VERDANA,FS_NORMAL,12);
-$graph->title->Set("Example of bar plot with absolute labels");
-
-$graph->yaxis->title->SetFont(FF_ARIAL,FS_NORMAL,16);
-
-
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/new1.gif b/#jpgraph/src/Examples/new1.gif
deleted file mode 100644
index 7c8a2962..00000000
Binary files a/#jpgraph/src/Examples/new1.gif and /dev/null differ
diff --git a/#jpgraph/src/Examples/new2.gif b/#jpgraph/src/Examples/new2.gif
deleted file mode 100644
index b9620d74..00000000
Binary files a/#jpgraph/src/Examples/new2.gif and /dev/null differ
diff --git a/#jpgraph/src/Examples/new_bar1.php b/#jpgraph/src/Examples/new_bar1.php
deleted file mode 100644
index 589b4c38..00000000
--- a/#jpgraph/src/Examples/new_bar1.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-$data1y=array(47,80,40,116);
-$data2y=array(61,30,82,105);
-$data3y=array(115,50,70,93);
-
-
-// Create the graph. These two calls are always required
-$graph = new Graph(350,200,'auto');
-$graph->SetScale("textlin");
-
-$theme_class=new UniversalTheme;
-$graph->SetTheme($theme_class);
-
-$graph->yaxis->SetTickPositions(array(0,30,60,90,120,150), array(15,45,75,105,135));
-$graph->SetBox(false);
-
-$graph->ygrid->SetFill(false);
-$graph->xaxis->SetTickLabels(array('A','B','C','D'));
-$graph->yaxis->HideLine(false);
-$graph->yaxis->HideTicks(false,false);
-
-// Create the bar plots
-$b1plot = new BarPlot($data1y);
-$b2plot = new BarPlot($data2y);
-$b3plot = new BarPlot($data3y);
-
-// Create the grouped bar plot
-$gbplot = new GroupBarPlot(array($b1plot,$b2plot,$b3plot));
-// ...and add it to the graPH
-$graph->Add($gbplot);
-
-
-$b1plot->SetColor("white");
-$b1plot->SetFillColor("#cc1111");
-
-$b2plot->SetColor("white");
-$b2plot->SetFillColor("#11cccc");
-
-$b3plot->SetColor("white");
-$b3plot->SetFillColor("#1111cc");
-
-$graph->title->Set("Bar Plots");
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/new_bar3.php b/#jpgraph/src/Examples/new_bar3.php
deleted file mode 100644
index 2d8b9e65..00000000
--- a/#jpgraph/src/Examples/new_bar3.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-$datay=array(62,105,85,50);
-
-
-// Create the graph. These two calls are always required
-$graph = new Graph(350,220,'auto');
-$graph->SetScale("textlin");
-
-//$theme_class="DefaultTheme";
-//$graph->SetTheme(new $theme_class());
-
-// set major and minor tick positions manually
-$graph->yaxis->SetTickPositions(array(0,30,60,90,120,150), array(15,45,75,105,135));
-$graph->SetBox(false);
-
-//$graph->ygrid->SetColor('gray');
-$graph->ygrid->SetFill(false);
-$graph->xaxis->SetTickLabels(array('A','B','C','D'));
-$graph->yaxis->HideLine(false);
-$graph->yaxis->HideTicks(false,false);
-
-// Create the bar plots
-$b1plot = new BarPlot($datay);
-
-// ...and add it to the graPH
-$graph->Add($b1plot);
-
-
-$b1plot->SetColor("white");
-$b1plot->SetFillGradient("#4B0082","white",GRAD_LEFT_REFLECTION);
-$b1plot->SetWidth(45);
-$graph->title->Set("Bar Gradient(Left reflection)");
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/new_bar4.php b/#jpgraph/src/Examples/new_bar4.php
deleted file mode 100644
index 8415c09f..00000000
--- a/#jpgraph/src/Examples/new_bar4.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-$datay=array(17,22,33,48,24,20);
-
-
-// Create the graph. These two calls are always required
-$graph = new Graph(220,300,'auto');
-$graph->SetScale("textlin");
-
-$theme_class=new UniversalTheme;
-$graph->SetTheme($theme_class);
-
-$graph->Set90AndMargin(50,40,40,40);
-$graph->img->SetAngle(90); 
-
-// set major and minor tick positions manually
-$graph->SetBox(false);
-
-//$graph->ygrid->SetColor('gray');
-$graph->ygrid->Show(false);
-$graph->ygrid->SetFill(false);
-$graph->xaxis->SetTickLabels(array('A','B','C','D','E','F'));
-$graph->yaxis->HideLine(false);
-$graph->yaxis->HideTicks(false,false);
-
-// For background to be gradient, setfill is needed first.
-$graph->SetBackgroundGradient('#00CED1', '#FFFFFF', GRAD_HOR, BGRAD_PLOT);
-
-// Create the bar plots
-$b1plot = new BarPlot($datay);
-
-// ...and add it to the graPH
-$graph->Add($b1plot);
-
-$b1plot->SetWeight(0);
-$b1plot->SetFillGradient("#808000","#90EE90",GRAD_HOR);
-$b1plot->SetWidth(17);
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/new_bar6.php b/#jpgraph/src/Examples/new_bar6.php
deleted file mode 100644
index a439ec76..00000000
--- a/#jpgraph/src/Examples/new_bar6.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-//bar1
-$data1y=array(115,130,135,130,110,130,130,150,130,130,150,120);
-//bar2
-$data2y=array(180,200,220,190,170,195,190,210,200,205,195,150);
-//bar3
-$data3y=array(220,230,210,175,185,195,200,230,200,195,180,130);
-$data4y=array(40,45,70,80,50,75,70,70,80,75,80,50);
-$data5y=array(20,20,25,22,30,25,35,30,27,25,25,45);
-//line1
-$data6y=array(50,58,60,58,53,58,57,60,58,58,57,50);
-foreach ($data6y as &$y) { $y -=10; }
-
-// Create the graph. These two calls are always required
-$graph = new Graph(750,320,'auto');
-$graph->SetScale("textlin");
-$graph->SetY2Scale("lin",0,90);
-$graph->SetY2OrderBack(false);
-
-$graph->SetMargin(35,50,20,5);
-
-$theme_class = new UniversalTheme;
-$graph->SetTheme($theme_class);
-
-$graph->yaxis->SetTickPositions(array(0,50,100,150,200,250,300,350), array(25,75,125,175,275,325));
-$graph->y2axis->SetTickPositions(array(30,40,50,60,70,80,90));
-
-$months = $gDateLocale->GetShortMonth();
-$months = array_merge(array_slice($months,3,9), array_slice($months,0,3));
-$graph->SetBox(false);
-
-$graph->ygrid->SetFill(false);
-$graph->xaxis->SetTickLabels(array('A','B','C','D'));
-$graph->yaxis->HideLine(false);
-$graph->yaxis->HideTicks(false,false);
-// Setup month as labels on the X-axis
-$graph->xaxis->SetTickLabels($months);
-
-// Create the bar plots
-$b1plot = new BarPlot($data1y);
-$b2plot = new BarPlot($data2y);
-
-$b3plot = new BarPlot($data3y);
-$b4plot = new BarPlot($data4y);
-$b5plot = new BarPlot($data5y);
-
-$lplot = new LinePlot($data6y);
-
-// Create the grouped bar plot
-$gbbplot = new AccBarPlot(array($b3plot,$b4plot,$b5plot));
-$gbplot = new GroupBarPlot(array($b1plot,$b2plot,$gbbplot));
-
-// ...and add it to the graPH
-$graph->Add($gbplot);
-$graph->AddY2($lplot);
-
-$b1plot->SetColor("#0000CD");
-$b1plot->SetFillColor("#0000CD");
-$b1plot->SetLegend("Cliants");
-
-$b2plot->SetColor("#B0C4DE");
-$b2plot->SetFillColor("#B0C4DE");
-$b2plot->SetLegend("Machines");
-
-$b3plot->SetColor("#8B008B");
-$b3plot->SetFillColor("#8B008B");
-$b3plot->SetLegend("First Track");
-
-$b4plot->SetColor("#DA70D6");
-$b4plot->SetFillColor("#DA70D6");
-$b4plot->SetLegend("All");
-
-$b5plot->SetColor("#9370DB");
-$b5plot->SetFillColor("#9370DB");
-$b5plot->SetLegend("Single Only");
-
-$lplot->SetBarCenter();
-$lplot->SetColor("yellow");
-$lplot->SetLegend("Houses");
-$lplot->mark->SetType(MARK_X,'',1.0);
-$lplot->mark->SetWeight(2);
-$lplot->mark->SetWidth(8);
-$lplot->mark->setColor("yellow");
-$lplot->mark->setFillColor("yellow");
-
-$graph->legend->SetFrameWeight(1);
-$graph->legend->SetColumns(6);
-$graph->legend->SetColor('#4E4E4E','#00A78A');
-
-$band = new PlotBand(VERTICAL,BAND_RDIAG,11,"max",'khaki4');
-$band->ShowFrame(true);
-$band->SetOrder(DEPTH_BACK);
-$graph->Add($band);
-
-$graph->title->Set("Combineed Line and Bar plots");
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/new_line1.php b/#jpgraph/src/Examples/new_line1.php
deleted file mode 100644
index 7a8ae660..00000000
--- a/#jpgraph/src/Examples/new_line1.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$datay1 = array(20,15,23,15);
-$datay2 = array(12,9,42,8);
-$datay3 = array(5,17,32,24);
-
-// Setup the graph
-$graph = new Graph(300,250);
-$graph->SetScale("textlin");
-
-$theme_class=new UniversalTheme;
-
-$graph->SetTheme($theme_class);
-$graph->img->SetAntiAliasing(false);
-$graph->title->Set('Filled Y-grid');
-$graph->SetBox(false);
-
-$graph->img->SetAntiAliasing();
-
-$graph->yaxis->HideZeroLabel();
-$graph->yaxis->HideLine(false);
-$graph->yaxis->HideTicks(false,false);
-
-$graph->xgrid->Show();
-$graph->xgrid->SetLineStyle("solid");
-$graph->xaxis->SetTickLabels(array('A','B','C','D'));
-$graph->xgrid->SetColor('#E3E3E3');
-/* $graph->SetBackgroundImage("tiger_bkg.png",BGIMG_FILLPLOT); */
-
-// Create the first line
-$p1 = new LinePlot($datay1);
-$graph->Add($p1);
-$p1->SetColor("#6495ED");
-$p1->SetLegend('Line 1');
-
-// Create the second line
-$p2 = new LinePlot($datay2);
-$graph->Add($p2);
-$p2->SetColor("#B22222");
-$p2->SetLegend('Line 2');
-
-// Create the third line
-$p3 = new LinePlot($datay3);
-$graph->Add($p3);
-$p3->SetColor("#FF1493");
-$p3->SetLegend('Line 3');
-
-$graph->legend->SetFrameWeight(1);
-
-// Output line
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/new_line2.php b/#jpgraph/src/Examples/new_line2.php
deleted file mode 100644
index 8ccd2710..00000000
--- a/#jpgraph/src/Examples/new_line2.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$datay1 = array(20,7,16,46);
-$datay2 = array(6,20,10,22);
-
-// Setup the graph
-$graph = new Graph(350,230);
-$graph->SetScale("textlin");
-
-$theme_class= new UniversalTheme;
-$graph->SetTheme($theme_class);
-
-$graph->title->Set('Background Image');
-$graph->SetBox(false);
-
-$graph->yaxis->HideZeroLabel();
-$graph->yaxis->HideLine(false);
-$graph->yaxis->HideTicks(false,false);
-
-$graph->xaxis->SetTickLabels(array('A','B','C','D'));
-$graph->ygrid->SetFill(false);
-$graph->SetBackgroundImage("tiger_bkg.png",BGIMG_FILLFRAME);
-
-$p1 = new LinePlot($datay1);
-$graph->Add($p1);
-
-$p2 = new LinePlot($datay2);
-$graph->Add($p2);
-
-$p1->SetColor("#55bbdd");
-$p1->SetLegend('Line 1');
-$p1->mark->SetType(MARK_FILLEDCIRCLE,'',1.0);
-$p1->mark->SetColor('#55bbdd');
-$p1->mark->SetFillColor('#55bbdd');
-$p1->SetCenter();
-
-$p2->SetColor("#aaaaaa");
-$p2->SetLegend('Line 2');
-$p2->mark->SetType(MARK_UTRIANGLE,'',1.0);
-$p2->mark->SetColor('#aaaaaa');
-$p2->mark->SetFillColor('#aaaaaa');
-$p2->value->SetMargin(14);
-$p2->SetCenter();
-
-$graph->legend->SetFrameWeight(1);
-$graph->legend->SetColor('#4E4E4E','#00A78A');
-$graph->legend->SetMarkAbsSize(8);
-
-
-// Output line
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/new_line3.php b/#jpgraph/src/Examples/new_line3.php
deleted file mode 100644
index cc0ab3e5..00000000
--- a/#jpgraph/src/Examples/new_line3.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-require_once ('jpgraph/jpgraph_scatter.php');
-
-$datay1 = array(15,21,24,10,37,29,47);
-$datay2 = array(8,6,11,26,10,4,2);
-
-// Setup the graph
-$graph = new Graph(300,250);
-
-$graph->SetScale("textlin",0,50);
-
-//$theme_class=new DefaultTheme;
-//$graph->SetTheme($theme_class);
-
-$graph->title->Set("Filled Area");
-
-$graph->SetBox(false);
-$graph->yaxis->HideLine(false);
-$graph->yaxis->HideTicks(false,false);
-$graph->yaxis->HideZeroLabel();
-
-$graph->xaxis->SetTickLabels(array('A','B','C','D','E','F','G'));
-
-// Create the plot
-$p1 = new LinePlot($datay1);
-$graph->Add($p1);
-
-$p2 = new LinePlot($datay2);
-$graph->Add($p2);
-
-// Use an image of favourite car as marker
-$p1->mark->SetType(MARK_IMG,'rose.gif',1.0);
-$p1->SetLegend('rose');
-$p1->SetColor('#CD5C5C');
-
-$p2->mark->SetType(MARK_IMG,'sunflower.gif',1.0);
-$p2->SetLegend('sunflower');
-$p2->SetColor('#CD5C5C');
-
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/new_line4.php b/#jpgraph/src/Examples/new_line4.php
deleted file mode 100644
index f50921ea..00000000
--- a/#jpgraph/src/Examples/new_line4.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-require_once ('jpgraph/jpgraph_scatter.php');
-
-$datay1 = array(33,20,24,5,38,24,22);
-$datay2 = array(9,7,10,25,10,8,4);
-
-// Setup the graph
-$graph = new Graph(300,250);
-
-$graph->SetScale("textlin",0,50);
-
-$theme_class= new UniversalTheme;
-$graph->SetTheme($theme_class);
-
-$graph->title->Set("Line Plots with Markers");
-
-$graph->SetBox(false);
-$graph->ygrid->SetFill(false);
-$graph->yaxis->HideLine(false);
-$graph->yaxis->HideTicks(false,false);
-$graph->yaxis->HideZeroLabel();
-
-$graph->xaxis->SetTickLabels(array('A','B','C','D','E','F','G'));
-// Create the plot
-$p1 = new LinePlot($datay1);
-$graph->Add($p1);
-
-$p2 = new LinePlot($datay2);
-$graph->Add($p2);
-
-// Use an image of favourite car as marker
-$p1->mark->SetType(MARK_IMG,'new1.gif',0.8);
-$p1->SetColor('#aadddd');
-$p1->value->SetFormat('%d');
-$p1->value->Show();
-$p1->value->SetColor('#55bbdd');
-
-$p2->mark->SetType(MARK_IMG,'new2.gif',0.8);
-$p2->SetColor('#ddaa99');
-$p2->value->SetFormat('%d');
-$p2->value->Show();
-$p2->value->SetColor('#55bbdd');
-
-
-$graph->Stroke();
-
-?>
\ No newline at end of file
diff --git a/#jpgraph/src/Examples/new_line5.php b/#jpgraph/src/Examples/new_line5.php
deleted file mode 100644
index 7a234a8c..00000000
--- a/#jpgraph/src/Examples/new_line5.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$datay = array(0,25,12,47,27,27,0);
-
-// Setup the graph
-$graph = new Graph(350,250);
-$graph->SetScale("intlin",0,$aYMax=50);
-
-$theme_class= new UniversalTheme;
-$graph->SetTheme($theme_class);
-
-$graph->SetMargin(40,40,50,40);
-
-$graph->title->Set('Inverted Y-axis');
-$graph->SetBox(false);
-$graph->yaxis->HideLine(false);
-$graph->yaxis->HideTicks(false,false);
-
-// For background to be gradient, setfill is needed first.
-$graph->ygrid->SetFill(true,'#FFFFFF@0.5','#FFFFFF@0.5');
-$graph->SetBackgroundGradient('#FFFFFF', '#00FF7F', GRAD_HOR, BGRAD_PLOT);
-
-$graph->xaxis->SetTickLabels(array('G','F','E','D','C','B','A'));
-$graph->xaxis->SetLabelMargin(20);
-$graph->yaxis->SetLabelMargin(20);
-
-$graph->SetAxisStyle(AXSTYLE_BOXOUT);
-$graph->img->SetAngle(180); 
-
-// Create the line
-$p1 = new LinePlot($datay);
-$graph->Add($p1);
-
-$p1->SetFillGradient('#FFFFFF','#F0F8FF');
-$p1->SetColor('#aadddd');
-
-// Output line
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/new_pie1.php b/#jpgraph/src/Examples/new_pie1.php
deleted file mode 100644
index 3c395e88..00000000
--- a/#jpgraph/src/Examples/new_pie1.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_pie.php');
-// Some data
-$data = array(40,21,17,14,23);
-
-// Create the Pie Graph. 
-$graph = new PieGraph(350,250);
-
-$theme_class="DefaultTheme";
-//$graph->SetTheme(new $theme_class());
-
-// Set A title for the plot
-$graph->title->Set("A Simple Pie Plot");
-$graph->SetBox(true);
-
-// Create
-$p1 = new PiePlot($data);
-$graph->Add($p1);
-
-$p1->ShowBorder();
-$p1->SetColor('black');
-$p1->SetSliceColors(array('#1E90FF','#2E8B57','#ADFF2F','#DC143C','#BA55D3'));
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/new_pie2.php b/#jpgraph/src/Examples/new_pie2.php
deleted file mode 100644
index 6e94cbff..00000000
--- a/#jpgraph/src/Examples/new_pie2.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_pie.php');
-
-// Some data
-$data = array(40,21,17,14,23);
-
-// Create the Pie Graph.
-$graph = new PieGraph(500,300);
-$graph->SetShadow();
-
-$theme_class= new UniversalTheme;
-//$graph->SetTheme($theme_class);
-
-// Set A title for the plot
-$graph->title->Set("Multiple - Pie plot");
-
-// Create plots
-$size=0.13;
-$p1 = new PiePlot($data);
-$graph->Add($p1);
-
-$p1->SetSize($size);
-$p1->SetCenter(0.25,0.32);
-$p1->SetSliceColors(array('#1E90FF','#2E8B57','#ADFF2F','#DC143C','#BA55D3'));
-$p1->title->Set("2005");
-
-$p2 = new PiePlot($data);
-$graph->Add($p2);
-
-$p2->SetSize($size);
-$p2->SetCenter(0.65,0.32);
-$p2->SetSliceColors(array('#1E90FF','#2E8B57','#ADFF2F','#DC143C','#BA55D3'));
-$p2->title->Set("2006");
-
-$p3 = new PiePlot($data);
-$graph->Add($p3);
-
-$p3->SetSize($size);
-$p3->SetCenter(0.25,0.75);
-$p3->SetSliceColors(array('#6495ED','#2E8B57','#ADFF2F','#DC143C','#BA55D3'));
-$p3->title->Set("2007");
-
-$p4 = new PiePlot($data);
-$graph->Add($p4);
-
-$p4->SetSize($size);
-$p4->SetCenter(0.65,0.75);
-$p4->SetSliceColors(array('#6495ED','#2E8B57','#ADFF2F','#DC143C','#BA55D3'));
-$p4->title->Set("2008");
-
-
-$graph->Stroke();
-
-?>
\ No newline at end of file
diff --git a/#jpgraph/src/Examples/new_pie3.php b/#jpgraph/src/Examples/new_pie3.php
deleted file mode 100644
index 81bc0f2a..00000000
--- a/#jpgraph/src/Examples/new_pie3.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_pie.php');
-require_once ('jpgraph/jpgraph_pie3d.php');
-
-// Some data
-$data = array(40,60,21,33);
-
-// Create the Pie Graph. 
-$graph = new PieGraph(350,250);
-
-$theme_class= new UniversalTheme;
-$graph->SetTheme($theme_class);
-
-// Set A title for the plot
-$graph->title->Set("A Simple 3D Pie Plot");
-
-// Create
-$p1 = new PiePlot3D($data);
-$graph->Add($p1);
-
-$p1->ShowBorder();
-$p1->SetColor('black');
-$p1->SetSliceColors(array('#1E90FF','#2E8B57','#ADFF2F','#BA55D3'));
-$p1->ExplodeSlice(1);
-$graph->Stroke();
-
-?>
\ No newline at end of file
diff --git a/#jpgraph/src/Examples/new_pie4.php b/#jpgraph/src/Examples/new_pie4.php
deleted file mode 100644
index 571f5ae6..00000000
--- a/#jpgraph/src/Examples/new_pie4.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_pie.php');
-require_once ('jpgraph/jpgraph_pie3d.php');
-
-// Some data
-$data = array(40,60,21,33);
-
-$piepos = array(0.2,0.35,0.5,0.25,0.3,0.7,0.85,0.7);
-$titles = array('USA','Sweden','South America','Australia');
-
-$n = count($piepos)/2;
- 
-// A new graph
-$graph = new PieGraph(450,300,'auto');
-
-$theme_class="PastelTheme";
-$graph->SetTheme(new $theme_class());
-
-// Setup background
-$graph->SetBackgroundImage('worldmap1.jpg',BGIMG_FILLFRAME);
-
-// Setup title
-$graph->title->Set("Pie plots with background image");
-$graph->title->SetColor('white');
-$graph->SetTitleBackground('#4169E1',TITLEBKG_STYLE2,TITLEBKG_FRAME_FULL,'#4169E1',10,10,true);
-
-$p = array();
-// Create the plots
-for( $i=0; $i < $n; ++$i ) {
-    $p[] = new PiePlot3D($data);
-}
-for( $i=0; $i < $n; ++$i ) {
-    $graph->Add($p[$i]);
-}
-
-// Position the four pies and change color
-for( $i=0; $i < $n; ++$i ) {
-    $p[$i]->SetCenter($piepos[2*$i],$piepos[2*$i+1]);
-    $p[$i]->SetSliceColors(array('#1E90FF','#2E8B57','#ADFF2F','#DC143C','#BA55D3'));
-}
-
-// Set the titles
-for( $i=0; $i < $n; ++$i ) {
-    $p[$i]->title->Set($titles[$i]);
-    #$p[$i]->title->SetFont(FF_ARIAL,FS_NORMAL,8);
-} 
-
-for( $i=0; $i < $n; ++$i ) {
-  $p[$i]->value->Show(false);
-}
-
-// Size of pie in fraction of the width of the graph
-for( $i=0; $i < $n; ++$i ) {
-    $p[$i]->SetSize(0.13);
-}
-
-for( $i=0; $i < $n; ++$i ) {
-    $p[$i]->SetEdge(false);
-    $p[$i]->ExplodeSlice(1,7);
-}
-
-
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/new_step1.php b/#jpgraph/src/Examples/new_step1.php
deleted file mode 100644
index 7bd0ce50..00000000
--- a/#jpgraph/src/Examples/new_step1.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$datay = array(20,10,35,5,17,35,22);
-
-// Setup the graph
-$graph = new Graph(400,250);
-$graph->SetScale("intlin",0,$aYMax=50);
-$theme_class=new UniversalTheme;
-$graph->SetTheme($theme_class);
-
-$graph->SetBox(false);
-
-$graph->title->Set('Step Line');
-$graph->ygrid->Show(true);
-$graph->xgrid->Show(false);
-$graph->yaxis->HideZeroLabel();
-$graph->ygrid->SetFill(true,'#FFFFFF@0.5','#FFFFFF@0.5');
-$graph->SetBackgroundGradient('blue', '#55eeff', GRAD_HOR, BGRAD_PLOT);
-$graph->xaxis->SetTickLabels(array('A','B','C','D','E','F','G'));
-
-// Create the line
-$p1 = new LinePlot($datay);
-$graph->Add($p1);
-
-$p1->SetFillGradient('yellow','red');
-$p1->SetStepStyle();
-$p1->SetColor('#808000');
-
-// Output line
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/nullvalueex01.php b/#jpgraph/src/Examples/nullvalueex01.php
deleted file mode 100644
index 33088117..00000000
--- a/#jpgraph/src/Examples/nullvalueex01.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-// Some data
-$datax = array("2001-04-01","2001-04-02","2001-04-03","2001-04-04","2001-04-05","2001-04-06");
-$datay = array(28,13,24,"",90,11);
-$data2y = array(11,41,"-",33,"-",63);
-
-// Setup graph
-$graph = new Graph(400,250);
-$graph->img->SetMargin(40,150,40,80);	
-$graph->SetScale("textlin");
-$graph->SetShadow();
-
-//Setup title
-$graph->title->Set("Line plot with null values");
-
-// Use built in font
-$graph->title->SetFont(FF_ARIAL,FS_NORMAL,14);
-
-// Slightly adjust the legend from it's default position
-$graph->legend->Pos(0.03,0.5,"right","center");
-$graph->legend->SetFont(FF_FONT1,FS_BOLD);
-
-// Setup X-scale
-$graph->xaxis->SetTickLabels($datax);
-$graph->xaxis->SetFont(FF_ARIAL,FS_NORMAL,8);
-$graph->xaxis->SetLabelAngle(45);
-
-// Create the first line
-$p1 = new LinePlot($datay);
-$p1->mark->SetType(MARK_FILLEDCIRCLE);
-$p1->mark->SetFillColor("red");
-$p1->mark->SetWidth(4);
-$p1->SetColor("blue");
-$p1->SetCenter();
-$p1->SetLegend("Undefined\nvariant 1");
-$graph->Add($p1);
-
-// ... and the second
-$p2 = new LinePlot($data2y);
-$p2->mark->SetType(MARK_STAR);
-$p2->mark->SetFillColor("red");
-$p2->mark->SetWidth(4);
-$p2->SetColor("red");
-$p2->SetCenter();
-$p2->SetLegend("Undefined\nvariant 2");
-$graph->Add($p2);
-
-// Output line
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/ocean_example.php b/#jpgraph/src/Examples/ocean_example.php
deleted file mode 100644
index 8a09d59c..00000000
--- a/#jpgraph/src/Examples/ocean_example.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$theme = isset($_GET['theme']) ? $_GET['theme'] : null;
-
-$data = array (
-  0 => array (0 => 79, 1 => -25, 2 => -7, 3 => 85, 4 => -26, 5 => -32, ),
-  1 => array (0 => 76, 1 => 51, 2 => 86, 3 => 12, 4 => -7, 5 => 94, ),
-  2 => array (0 => 49, 1 => 38, 2 => 7, 3 => -40, 4 => 9, 5 => -7, ),
-  3 => array ( 0 => 69, 1 => 96, 2 => 49, 3 => 7, 4 => 92, 5 => -38, ),
-  4 => array ( 0 => 68, 1 => 16, 2 => 82, 3 => -49, 4 => 50, 5 => 7, ),
-  5 => array ( 0 => -37, 1 => 28, 2 => 32, 3 => 6, 4 => 13, 5 => 57, ),
-  6 => array ( 0 => 24, 1 => -11, 2 => 7, 3 => 10, 4 => 51, 5 => 51, ),
-  7 => array ( 0 => 3, 1 => -1, 2 => -12, 3 => 61, 4 => 10, 5 => 47, ),
-  8 => array ( 0 => -47, 1 => -21, 2 => 43, 3 => 53, 4 => 36, 5 => 34, ),
-);
-
-
-// Create the graph. These two calls are always required
-$graph = new Graph(400,300);    
-
-$graph->SetScale("textlin");
-if ($theme) {
-  $graph->SetTheme(new $theme());
-}
-$theme_class = new OceanTheme;
-$graph->SetTheme($theme_class);
-
-$plot = array();
-// Create the bar plots
-for ($i = 0; $i < 4; $i++) {
-  $plot[$i] = new BarPlot($data[$i]);
-  $plot[$i]->SetLegend('plot'.($i+1));
-}
-//$acc1 = new AccBarPlot(array($plot[0], $plot[1]));
-//$acc1->value->Show();
-$gbplot = new GroupBarPlot(array($plot[2], $plot[1] ));
-
-for ($i = 4; $i < 8; $i++) {
-  $plot[$i] = new LinePlot($data[$i]);
-  $plot[$i]->SetLegend('plot'.$i);
-  $plot[$i]->value->Show();
-}
-
-$graph->Add($gbplot);
-$graph->Add($plot[4]);
-
-$title = "OceanTheme Example";
-$title = mb_convert_encoding($title,'UTF-8');
-$graph->title->Set($title);
-$graph->xaxis->title->Set("X-title");
-$graph->yaxis->title->Set("Y-title");
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/odoex00.php b/#jpgraph/src/Examples/odoex00.php
deleted file mode 100644
index e8cef552..00000000
--- a/#jpgraph/src/Examples/odoex00.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-//=============================================================================
-// File:	ODOEX00.PHP
-// Description: Example 0 for odometer graphs
-// Created:	2002-02-22
-// Version:	$Id$
-// 
-// Comment:
-// Example file for odometer graph. This examples demonstrates the simplest
-// possible graph using all default values for colors, sizes etc.
-//
-// Copyright (C) 2002 Johan Persson. All rights reserved.
-//=============================================================================
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_odo.php');
-
-//---------------------------------------------------------------------
-// Create a new odometer graph (width=250, height=200 pixels)
-//---------------------------------------------------------------------
-$graph = new OdoGraph(250,130);
-$graph->SetColor('white');
-$graph->SetMarginColor('white');
-$graph->SetFrame(false);
-
-//---------------------------------------------------------------------
-// Now we need to create an odometer to add to the graph.
-// By default the scale will be 0 to 100
-//---------------------------------------------------------------------
-$odo = new Odometer(); 
-
-//---------------------------------------------------------------------
-// Set display value for the odometer
-//---------------------------------------------------------------------
-$odo->needle->Set(40);
-
-//---------------------------------------------------------------------
-// Add the odometer to the graph
-//---------------------------------------------------------------------
-$graph->Add($odo);
-
-//---------------------------------------------------------------------
-// ... and finally stroke and stream the image back to the browser
-//---------------------------------------------------------------------
-$graph->Stroke();
-
-// EOF
-?>
\ No newline at end of file
diff --git a/#jpgraph/src/Examples/odoex01.php b/#jpgraph/src/Examples/odoex01.php
deleted file mode 100644
index 3d29aa02..00000000
--- a/#jpgraph/src/Examples/odoex01.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-//=============================================================================
-// File:	ODOEX01.PHP
-// Description: Example 1 for odometer graphs
-// Created:	2002-02-22
-// Version:	$Id$
-// 
-// Comment:
-// Example file for odometer graph. This examples extends odoex00
-// by adding titles, captions and indicator band to the fascia.
-//
-// Copyright (C) 2002 Johan Persson. All rights reserved.
-//=============================================================================
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_odo.php');
-
-//---------------------------------------------------------------------
-// Create a new odometer graph (width=250, height=200 pixels)
-//---------------------------------------------------------------------
-$graph = new OdoGraph(250,200);
-
-//---------------------------------------------------------------------
-// Specify title and subtitle using default fonts
-// * Note each title may be multilines by using a '\n' as a line
-// divider.
-//---------------------------------------------------------------------
-$graph->title->Set("Odometer title");
-$graph->title->SetColor("white");
-$graph->subtitle->Set("2002-02-13");
-$graph->subtitle->SetColor("white");
-
-//---------------------------------------------------------------------
-// Specify caption.
-// * (This is the text at the bottom of the graph.) The margins will
-// automatically adjust to fit the height of the text. A caption
-// may have multiple lines by including a '\n' character in the 
-// string.
-//---------------------------------------------------------------------
-$graph->caption->Set("First caption row\n... second row");
-$graph->caption->SetColor("white");
-
-//---------------------------------------------------------------------
-// Now we need to create an odometer to add to the graph.
-// By default the scale will be 0 to 100
-//---------------------------------------------------------------------
-$odo = new Odometer(); 
-
-//---------------------------------------------------------------------
-// Set color indication between values 80 and 100 as red
-//---------------------------------------------------------------------
-$odo->AddIndication(80,100,"red");
-
-//---------------------------------------------------------------------
-// Set display value for the odometer
-//---------------------------------------------------------------------
-$odo->needle->Set(30);
-
-//---------------------------------------------------------------------
-// Add the odometer to the graph
-//---------------------------------------------------------------------
-$graph->Add($odo);
-
-//---------------------------------------------------------------------
-// ... and finally stroke and stream the image back to the browser
-//---------------------------------------------------------------------
-$graph->Stroke();
-
-// EOF
-?>
\ No newline at end of file
diff --git a/#jpgraph/src/Examples/odoex010.php b/#jpgraph/src/Examples/odoex010.php
deleted file mode 100644
index 3c70ad2f..00000000
--- a/#jpgraph/src/Examples/odoex010.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-//=============================================================================
-// File:	ODOEX010.PHP
-// Description: Example 0 for odometer graphs
-// Created:	2002-02-22
-// Version:	$Id$
-// 
-// Comment:
-// Example file for odometer graph. Extends odoex09.php to show how multiple
-// odometers can have different properties
-//
-// Copyright (C) 2002 Johan Persson. All rights reserved.
-//=============================================================================
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_odo.php');
-
-//---------------------------------------------------------------------
-// Create a new odometer graph (width=250, height=200 pixels)
-//---------------------------------------------------------------------
-$graph = new OdoGraph(200,300);
-
-//---------------------------------------------------------------------
-// We will display three odometers stacked vertically
-// The first thing to do is to create them
-//---------------------------------------------------------------------
-$odo1 = new Odometer(); 
-$odo2 = new Odometer(); 
-$odo3 = new Odometer(); 
-
-//---------------------------------------------------------------------
-// Set Indicator bands for the odometers
-//---------------------------------------------------------------------
-$odo1->AddIndication(80,100,"red");
-$odo2->AddIndication(20,30,"green");
-$odo2->AddIndication(65,100,"red");
-$odo3->AddIndication(60,90,"yellow");
-$odo3->AddIndication(90,100,"red");
-
-//---------------------------------------------------------------------
-// Set display values for the odometers
-//---------------------------------------------------------------------
-$odo1->needle->Set(17);
-$odo2->needle->Set(47);
-$odo3->needle->Set(86);
-
-$odo1->needle->SetFillColor("blue");
-$odo2->needle->SetFillColor("yellow:0.7");
-$odo3->needle->SetFillColor("black");
-$odo3->needle->SetColor("black");
-
-
-//---------------------------------------------------------------------
-// Set scale label properties
-//---------------------------------------------------------------------
-$odo1->scale->label->SetColor("navy");
-$odo2->scale->label->SetColor("blue");
-$odo3->scale->label->SetColor("darkred");
-
-$odo1->scale->label->SetFont(FF_FONT1);
-$odo2->scale->label->SetFont(FF_FONT2,FS_BOLD);
-$odo3->scale->label->SetFont(FF_ARIAL,FS_BOLD,11);
-
-//---------------------------------------------------------------------
-// Add the odometers to the graph using a vertical layout
-//---------------------------------------------------------------------
-$l1 = new LayoutVert( array($odo1,$odo2,$odo3) ) ;
-$graph->Add( $l1 );
-
-//---------------------------------------------------------------------
-// ... and finally stroke and stream the image back to the browser
-//---------------------------------------------------------------------
-$graph->Stroke();
-
-// EOF
-?>
\ No newline at end of file
diff --git a/#jpgraph/src/Examples/odoex011.php b/#jpgraph/src/Examples/odoex011.php
deleted file mode 100644
index cc74f4f7..00000000
--- a/#jpgraph/src/Examples/odoex011.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-//=============================================================================
-// File:	ODOEX011.PHP
-// Description: Example 0 for odometer graphs
-// Created:	2002-02-22
-// Version:	$Id$
-// 
-// Comment:
-// Example file for odometer graph. Extends odoex10.php with graph titles
-// and captions and also adds individual captions for each odometer.
-
-//
-// Copyright (C) 2002 Johan Persson. All rights reserved.
-//=============================================================================
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_odo.php');
-
-//---------------------------------------------------------------------
-// Create a new odometer graph (width=200, height=400 pixels)
-//---------------------------------------------------------------------
-$graph = new OdoGraph(200,370);
-$graph->SetShadow();
-
-//---------------------------------------------------------------------
-// Specify title and subtitle using default fonts
-// * Note each title may be multilines by using a '\n' as a line
-// divider.
-//---------------------------------------------------------------------
-$graph->title->Set("Result from 2002");
-$graph->title->SetColor("white");
-$graph->subtitle->Set("O1 - W-Site");
-$graph->subtitle->SetColor("white");
-
-//---------------------------------------------------------------------
-// Specify caption.
-// * (This is the text at the bottom of the graph.) The margins will
-// automatically adjust to fit the height of the text. A caption
-// may have multiple lines by including a '\n' character in the 
-// string.
-//---------------------------------------------------------------------
-$graph->caption->Set("Fig1. Values within 85%\nconfidence intervall");
-$graph->caption->SetColor("white");
-
-//---------------------------------------------------------------------
-// We will display three odometers stacked vertically
-// The first thing to do is to create them
-//---------------------------------------------------------------------
-$odo1 = new Odometer(); 
-$odo2 = new Odometer(); 
-$odo3 = new Odometer(); 
-
-
-//---------------------------------------------------------------------
-// Set caption for each odometer
-//---------------------------------------------------------------------
-$odo1->caption->Set("April");
-$odo1->caption->SetFont(FF_FONT2,FS_BOLD);
-$odo2->caption->Set("May");
-$odo2->caption->SetFont(FF_FONT2,FS_BOLD);
-$odo3->caption->Set("June");
-$odo3->caption->SetFont(FF_FONT2,FS_BOLD);
-
-//---------------------------------------------------------------------
-// Set Indicator bands for the odometers
-//---------------------------------------------------------------------
-$odo1->AddIndication(80,100,"red");
-$odo2->AddIndication(20,30,"green");
-$odo2->AddIndication(65,100,"red");
-$odo3->AddIndication(60,90,"yellow");
-$odo3->AddIndication(90,100,"red");
-
-//---------------------------------------------------------------------
-// Set display values for the odometers
-//---------------------------------------------------------------------
-$odo1->needle->Set(17);
-$odo2->needle->Set(47);
-$odo3->needle->Set(86);
-
-$odo1->needle->SetFillColor("blue");
-$odo2->needle->SetFillColor("yellow:0.7");
-$odo3->needle->SetFillColor("black");
-$odo3->needle->SetColor("black");
-
-
-//---------------------------------------------------------------------
-// Set scale label properties
-//---------------------------------------------------------------------
-$odo1->scale->label->SetColor("navy");
-$odo2->scale->label->SetColor("blue");
-$odo3->scale->label->SetColor("darkred");
-
-$odo1->scale->label->SetFont(FF_FONT1);
-$odo2->scale->label->SetFont(FF_FONT2,FS_BOLD);
-$odo3->scale->label->SetFont(FF_ARIAL,FS_BOLD,10);
-
-//---------------------------------------------------------------------
-// Add the odometers to the graph using a vertical layout
-//---------------------------------------------------------------------
-$l1 = new LayoutVert( array($odo1,$odo2,$odo3) ) ;
-$graph->Add( $l1 );
-
-//---------------------------------------------------------------------
-// ... and finally stroke and stream the image back to the browser
-//---------------------------------------------------------------------
-$graph->Stroke();
-
-// EOF
-?>
\ No newline at end of file
diff --git a/#jpgraph/src/Examples/odoex012.php b/#jpgraph/src/Examples/odoex012.php
deleted file mode 100644
index b54f773d..00000000
--- a/#jpgraph/src/Examples/odoex012.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-//=============================================================================
-// File:	ODOEX012.PHP
-// Description: Example 0 for odometer graphs
-// Created:	2002-02-22
-// Version:	$Id$
-// 
-// Comment:
-// Example file for odometer graph. Extends odoex11.php to add two more
-// odometers to the image and showing more layout possibilities 
-//
-// Copyright (C) 2002 Johan Persson. All rights reserved.
-//=============================================================================
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_odo.php');
-
-//---------------------------------------------------------------------
-// Create a new odometer graph (width=400, height=400 pixels)
-//---------------------------------------------------------------------
-$graph = new OdoGraph(400,370);
-$graph->SetShadow();
-
-//---------------------------------------------------------------------
-// Specify title and subtitle using default fonts
-// * Note each title may be multilines by using a '\n' as a line
-// divider.
-//---------------------------------------------------------------------
-$graph->title->Set("Result from 2002");
-$graph->title->SetColor("white");
-$graph->subtitle->Set("O1 - W-Site");
-$graph->subtitle->SetColor("white");
-
-//---------------------------------------------------------------------
-// Specify caption.
-// * (This is the text at the bottom of the graph.) The margins will
-// automatically adjust to fit the height of the text. A caption
-// may have multiple lines by including a '\n' character in the 
-// string.
-//---------------------------------------------------------------------
-$graph->caption->Set("Fig1. Values within 85%\nconfidence intervall");
-$graph->caption->SetColor("white");
-
-//---------------------------------------------------------------------
-// We will display two columns where the first column has
-// three odometers (same as in example 11) and the second column
-// has two odoemters
-// The first thing to do is to create them
-//---------------------------------------------------------------------
-$odo1 = new Odometer(); 
-$odo2 = new Odometer(); 
-$odo3 = new Odometer(); 
-$odo4 = new Odometer(); 
-$odo5 = new Odometer(); 
-
-
-//---------------------------------------------------------------------
-// Set caption for each odometer
-//---------------------------------------------------------------------
-$odo1->caption->Set("April");
-$odo1->caption->SetFont(FF_ARIAL,FS_BOLD);
-$odo2->caption->Set("May");
-$odo2->caption->SetFont(FF_FONT2,FS_BOLD);
-$odo3->caption->Set("June");
-$odo3->caption->SetFont(FF_FONT2,FS_BOLD);
-$odo4->caption->Set("Daily low average");
-$odo4->caption->SetFont(FF_FONT1,FS_BOLD);
-$odo5->caption->Set("Daily high average");
-$odo5->caption->SetFont(FF_FONT1,FS_BOLD);
-
-//---------------------------------------------------------------------
-// Set Indicator bands for the odometers
-//---------------------------------------------------------------------
-$odo1->AddIndication(80,100,"red");
-$odo2->AddIndication(20,30,"green");
-$odo2->AddIndication(65,100,"red");
-$odo3->AddIndication(60,90,"yellow");
-$odo3->AddIndication(90,100,"red");
-
-//---------------------------------------------------------------------
-// Set display values for the odometers
-//---------------------------------------------------------------------
-$odo1->needle->Set(17);
-$odo2->needle->Set(47);
-$odo3->needle->Set(86);
-$odo4->needle->Set(22);
-$odo5->needle->Set(77);
-
-$odo1->needle->SetFillColor("blue");
-$odo2->needle->SetFillColor("yellow:0.7");
-$odo3->needle->SetFillColor("black");
-$odo3->needle->SetColor("black");
-
-
-//---------------------------------------------------------------------
-// Set scale label properties
-//---------------------------------------------------------------------
-$odo1->scale->label->SetColor("navy");
-$odo2->scale->label->SetColor("blue");
-$odo3->scale->label->SetColor("darkred");
-
-$odo1->scale->label->SetFont(FF_FONT1);
-$odo2->scale->label->SetFont(FF_FONT2,FS_BOLD);
-$odo3->scale->label->SetFont(FF_ARIAL,FS_BOLD,10);
-
-//---------------------------------------------------------------------
-// Add the odometers to the graph using a vertical layout
-//---------------------------------------------------------------------
-$l1 = new LayoutVert( array($odo1,$odo2,$odo3) ) ;
-$l2 = new LayoutVert( array($odo4,$odo5) ) ;
-$l3 = new LayoutHor( array($l1,$l2) );
-$graph->Add( $l3 );
-
-//---------------------------------------------------------------------
-// ... and finally stroke and stream the image back to the browser
-//---------------------------------------------------------------------
-$graph->Stroke();
-
-// EOF
-?>
\ No newline at end of file
diff --git a/#jpgraph/src/Examples/odoex02.php b/#jpgraph/src/Examples/odoex02.php
deleted file mode 100644
index 47ccc6ba..00000000
--- a/#jpgraph/src/Examples/odoex02.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-//=============================================================================
-// File:	ODOEX02.PHP
-// Description: Example 1 for odometer graphs
-// Created:	2002-02-22
-// Version:	$Id$
-// 
-// Comment:
-// Example file for odometer graph. This examples extends odoex01
-// by adding several indicator bands to the fascia.
-//
-// Copyright (C) 2002 Johan Persson. All rights reserved.
-//=============================================================================
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_odo.php');
-
-//---------------------------------------------------------------------
-// Create a new odometer graph (width=250, height=200 pixels)
-//---------------------------------------------------------------------
-$graph = new OdoGraph(300,200);
-
-//---------------------------------------------------------------------
-// Specify title and subtitle using default fonts
-// * Note each title may be multilines by using a '\n' as a line
-// divider.
-//---------------------------------------------------------------------
-$graph->title->Set("Odometer title");
-$graph->title->SetColor("white");
-$graph->subtitle->Set("2002-02-13");
-$graph->subtitle->SetColor("white");
-
-//---------------------------------------------------------------------
-// Specify caption.
-// * (This is the text at the bottom of the graph.) The margins will
-// automatically adjust to fit the height of the text. A caption
-// may have multiple lines by including a '\n' character in the 
-// string.
-//---------------------------------------------------------------------
-$graph->caption->Set("First caption row\n... second row");
-$graph->caption->SetColor("white");
-
-//---------------------------------------------------------------------
-// Now we need to create an odometer to add to the graph.
-// By default the scale will be 0 to 100
-//---------------------------------------------------------------------
-$odo = new Odometer(); 
-
-//---------------------------------------------------------------------
-// Set color indication 
-//---------------------------------------------------------------------
-$odo->AddIndication(0,50,"green");
-$odo->AddIndication(50,80,"yellow");
-$odo->AddIndication(80,100,"red");
-
-//---------------------------------------------------------------------
-// Set display value for the odometer
-//---------------------------------------------------------------------
-$odo->needle->Set(30);
-
-//---------------------------------------------------------------------
-// Add the odometer to the graph
-//---------------------------------------------------------------------
-$graph->Add($odo);
-
-//---------------------------------------------------------------------
-// ... and finally stroke and stream the image back to the browser
-//---------------------------------------------------------------------
-$graph->Stroke();
-
-// EOF
-?>
\ No newline at end of file
diff --git a/#jpgraph/src/Examples/odoex03.php b/#jpgraph/src/Examples/odoex03.php
deleted file mode 100644
index 91ca401c..00000000
--- a/#jpgraph/src/Examples/odoex03.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-//=============================================================================
-// File:	ODOEX03.PHP
-// Description: Example 1 for odometer graphs
-// Created:	2002-02-22
-// Version:	$Id$
-// 
-// Comment:
-// Example file for odometer graph. This examples extends odoex02
-// by changing scale tick interval and scale fonts.
-//
-// Copyright (C) 2002 Johan Persson. All rights reserved.
-//=============================================================================
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_odo.php');
-
-//---------------------------------------------------------------------
-// Create a new odometer graph (width=250, height=200 pixels)
-//---------------------------------------------------------------------
-$graph = new OdoGraph(250,200);
-$graph->SetShadow();
-
-//---------------------------------------------------------------------
-// Specify title and subtitle using default fonts
-// * Note each title may be multilines by using a '\n' as a line
-// divider.
-//---------------------------------------------------------------------
-$graph->title->Set("Odometer title");
-$graph->title->SetColor("white");
-$graph->subtitle->Set("2002-02-13");
-$graph->subtitle->SetColor("white");
-
-//---------------------------------------------------------------------
-// Specify caption.
-// * (This is the text at the bottom of the graph.) The margins will
-// automatically adjust to fit the height of the text. A caption
-// may have multiple lines by including a '\n' character in the 
-// string.
-//---------------------------------------------------------------------
-$graph->caption->Set("First caption row\n... second row");
-$graph->caption->SetColor("white");
-
-//---------------------------------------------------------------------
-// Now we need to create an odometer to add to the graph.
-// By default the scale will be 0 to 100
-//---------------------------------------------------------------------
-$odo = new Odometer(); 
-
-//---------------------------------------------------------------------
-// Set color indication 
-//---------------------------------------------------------------------
-$odo->AddIndication(0,50,"green");
-$odo->AddIndication(50,80,"yellow");
-$odo->AddIndication(80,100,"red");
-
-//---------------------------------------------------------------------
-// Adjust scale ticks to be shown at 10 steps interval and scale
-// labels at every second tick
-//---------------------------------------------------------------------
-$odo->scale->SetTicks(10,2);
-
-//---------------------------------------------------------------------
-// Use a bold font for tick labels
-//---------------------------------------------------------------------
-$odo->scale->label->SetFont(FF_FONT1, FS_BOLD);
-
-//---------------------------------------------------------------------
-// Set display value for the odometer
-//---------------------------------------------------------------------
-$odo->needle->Set(30);
-
-//---------------------------------------------------------------------
-// Add the odometer to the graph
-//---------------------------------------------------------------------
-$graph->Add($odo);
-
-//---------------------------------------------------------------------
-// ... and finally stroke and stream the image back to the browser
-//---------------------------------------------------------------------
-$graph->Stroke();
-
-// EOF
-?>
\ No newline at end of file
diff --git a/#jpgraph/src/Examples/odoex04.php b/#jpgraph/src/Examples/odoex04.php
deleted file mode 100644
index 9955b7db..00000000
--- a/#jpgraph/src/Examples/odoex04.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-//=============================================================================
-// File:	ODOEX04.PHP
-// Description: Example 1 for odometer graphs
-// Created:	2002-02-22
-// Version:	$Id$
-// 
-// Comment:
-// Example file for odometer graph. This examples extends odoex03
-// by 1) changing the indicator needle style and color 2) Introducing
-// a half circle in the middle that is not affetced by the indicator bands.
-//
-// Copyright (C) 2002 Johan Persson. All rights reserved.
-//=============================================================================
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_odo.php');
-
-//---------------------------------------------------------------------
-// Create a new odometer graph (width=250, height=200 pixels)
-//---------------------------------------------------------------------
-$graph = new OdoGraph(250,200);
-
-//---------------------------------------------------------------------
-// Specify title and subtitle using default fonts
-// * Note each title may be multilines by using a '\n' as a line
-// divider.
-//---------------------------------------------------------------------
-$graph->title->Set("Odometer title");
-$graph->title->SetColor("white");
-$graph->subtitle->Set("2002-02-13");
-$graph->subtitle->SetColor("white");
-
-//---------------------------------------------------------------------
-// Specify caption.
-// * (This is the text at the bottom of the graph.) The margins will
-// automatically adjust to fit the height of the text. A caption
-// may have multiple lines by including a '\n' character in the 
-// string.
-//---------------------------------------------------------------------
-$graph->caption->Set("First caption row\n... second row");
-$graph->caption->SetColor("white");
-
-//---------------------------------------------------------------------
-// Now we need to create an odometer to add to the graph.
-// By default the scale will be 0 to 100
-//---------------------------------------------------------------------
-$odo = new Odometer(); 
-
-//---------------------------------------------------------------------
-// Set color indication 
-//---------------------------------------------------------------------
-$odo->AddIndication(0,50,"green");
-$odo->AddIndication(50,80,"yellow");
-$odo->AddIndication(80,100,"red");
-
-//---------------------------------------------------------------------
-// Set the center area that will not be affected by the color bands
-//---------------------------------------------------------------------
-$odo->SetCenterAreaWidth(0.4);  // Fraction of radius
-
-//---------------------------------------------------------------------
-// Adjust scale ticks to be shown at 10 steps interval and scale
-// labels at every second tick
-//---------------------------------------------------------------------
-$odo->scale->SetTicks(10,2);
-
-//---------------------------------------------------------------------
-// Use a bold font for tick labels
-//---------------------------------------------------------------------
-$odo->scale->label->SetFont(FF_FONT1, FS_BOLD);
-
-//---------------------------------------------------------------------
-// Set display value for the odometer
-//---------------------------------------------------------------------
-$odo->needle->Set(30);
-
-//---------------------------------------------------------------------
-// Set a new style for the needle
-//---------------------------------------------------------------------
-$odo->needle->SetStyle(NEEDLE_STYLE_MEDIUM_TRIANGLE);
-$odo->needle->SetLength(0.7);  // Length as 70% of the radius
-$odo->needle->SetFillColor("orange");
-
-
-//---------------------------------------------------------------------
-// Add the odometer to the graph
-//---------------------------------------------------------------------
-$graph->Add($odo);
-
-//---------------------------------------------------------------------
-// ... and finally stroke and stream the image back to the browser
-//---------------------------------------------------------------------
-$graph->Stroke();
-
-// EOF
-?>
\ No newline at end of file
diff --git a/#jpgraph/src/Examples/odoex05.php b/#jpgraph/src/Examples/odoex05.php
deleted file mode 100644
index 379a06e9..00000000
--- a/#jpgraph/src/Examples/odoex05.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-//=============================================================================
-// File:	ODOEX05.PHP
-// Description: Example 1 for odometer graphs
-// Created:	2002-02-22
-// Version:	$Id$
-// 
-// Comment:
-// Example file for odometer graph. This examples extends odoex04
-// by 1) changing color of odometer canvas 2) Adding a second indicator
-// needle 3) making the tick marks thicker 4) and finally adding a short
-// scale text in the middle of the odometer.
-//
-// Copyright (C) 2002 Johan Persson. All rights reserved.
-//=============================================================================
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_odo.php');
-
-//---------------------------------------------------------------------
-// Create a new odometer graph (width=250, height=200 pixels)
-//---------------------------------------------------------------------
-$graph = new OdoGraph(250,200);
-
-//---------------------------------------------------------------------
-// Change the color of the odometer plotcanvas. NOT the odometer
-// fill color itself.
-//---------------------------------------------------------------------
-$graph->SetColor("lightyellow");
-
-//---------------------------------------------------------------------
-// Specify title and subtitle using default fonts
-// * Note each title may be multilines by using a '\n' as a line
-// divider.
-//---------------------------------------------------------------------
-$graph->title->Set("Odometer title");
-$graph->title->SetColor("white");
-$graph->subtitle->Set("2002-02-13");
-$graph->subtitle->SetColor("white");
-
-//---------------------------------------------------------------------
-// Specify caption.
-// * (This is the text at the bottom of the graph.) The margins will
-// automatically adjust to fit the height of the text. A caption
-// may have multiple lines by including a '\n' character in the 
-// string.
-//---------------------------------------------------------------------
-$graph->caption->Set("First caption row\n... second row");
-$graph->caption->SetColor("white");
-
-//---------------------------------------------------------------------
-// Now we need to create an odometer to add to the graph.
-// By default the scale will be 0 to 100
-//---------------------------------------------------------------------
-$odo = new Odometer(); 
-
-//---------------------------------------------------------------------
-// Set color indication 
-//---------------------------------------------------------------------
-$odo->AddIndication(0,50,"green");
-$odo->AddIndication(50,80,"yellow");
-$odo->AddIndication(80,100,"red");
-
-//---------------------------------------------------------------------
-// Set the center area that will not be affected by the color bands
-//---------------------------------------------------------------------
-$odo->SetCenterAreaWidth(0.4);  // Fraction of radius
-
-//---------------------------------------------------------------------
-// Adjust scale ticks to be shown at 10 steps interval and scale
-// labels at every second tick
-//---------------------------------------------------------------------
-$odo->scale->SetTicks(10,2);
-
-//---------------------------------------------------------------------
-// Make the tick marks 2 pixel wide
-//---------------------------------------------------------------------
-$odo->scale->SetTickWeight(2);
-
-//---------------------------------------------------------------------
-// Use a bold font for tick labels
-//---------------------------------------------------------------------
-$odo->scale->label->SetFont(FF_FONT1, FS_BOLD);
-
-//---------------------------------------------------------------------
-// Set display value for the odometer
-//---------------------------------------------------------------------
-$odo->needle->Set(78);
-
-//---------------------------------------------------------------------
-// Specify scale caption. Note that depending on the position of the
-// indicator needle this label might be partially hidden. 
-//---------------------------------------------------------------------
-$odo->label->Set("% Passed");
-
-//---------------------------------------------------------------------
-// Set a new style for the needle
-//---------------------------------------------------------------------
-$odo->needle->SetStyle(NEEDLE_STYLE_MEDIUM_TRIANGLE);
-$odo->needle->SetLength(0.7);  // Length as 70% of the radius
-$odo->needle->SetFillColor("orange");
-
-//---------------------------------------------------------------------
-// Setup the second indicator needle
-//---------------------------------------------------------------------
-$odo->needle2->Set(24);
-$odo->needle2->SetStyle(NEEDLE_STYLE_SMALL_TRIANGLE);
-$odo->needle2->SetLength(0.55);  // Length as 70% of the radius
-$odo->needle2->SetFillColor("lightgray");
-$odo->needle2->Show();  
-
-
-//---------------------------------------------------------------------
-// Add the odometer to the graph
-//---------------------------------------------------------------------
-$graph->Add($odo);
-
-//---------------------------------------------------------------------
-// ... and finally stroke and stream the image back to the browser
-//---------------------------------------------------------------------
-$graph->Stroke();
-
-// EOF
-?>
\ No newline at end of file
diff --git a/#jpgraph/src/Examples/odoex06.php b/#jpgraph/src/Examples/odoex06.php
deleted file mode 100644
index 305a5eea..00000000
--- a/#jpgraph/src/Examples/odoex06.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-//=============================================================================
-// File:	ODOEX06.PHP
-// Description: Example 1 for odometer graphs
-// Created:	2002-02-22
-// Version:	$Id$
-// 
-// Comment:
-// Example file for odometer graph. This examples extends odoex05
-// by changing the type of odometer to a full circle. This is as simple
-// as changing (less than) one line of code.
-//
-// Copyright (C) 2002 Johan Persson. All rights reserved.
-//=============================================================================
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_odo.php');
-
-//---------------------------------------------------------------------
-// Create a new odometer graph (width=250, height=200 pixels)
-//---------------------------------------------------------------------
-$graph = new OdoGraph(250,250);
-
-//---------------------------------------------------------------------
-// Change the color of the odometer plotcanvas. NOT the odometer
-// fill color itself.
-//---------------------------------------------------------------------
-$graph->SetColor("lightyellow");
-
-//---------------------------------------------------------------------
-// Specify title and subtitle using default fonts
-// * Note each title may be multilines by using a '\n' as a line
-// divider.
-//---------------------------------------------------------------------
-$graph->title->Set("Odometer title");
-$graph->title->SetColor("white");
-$graph->subtitle->Set("2002-02-13");
-$graph->subtitle->SetColor("white");
-
-//---------------------------------------------------------------------
-// Specify caption.
-// * (This is the text at the bottom of the graph.) The margins will
-// automatically adjust to fit the height of the text. A caption
-// may have multiple lines by including a '\n' character in the 
-// string.
-//---------------------------------------------------------------------
-$graph->caption->Set("First caption row\n... second row");
-$graph->caption->SetColor("white");
-
-//---------------------------------------------------------------------
-// Now we need to create an odometer to add to the graph.
-// By default the scale will be 0 to 100
-//---------------------------------------------------------------------
-$odo = new Odometer(ODO_FULL); 
-
-//---------------------------------------------------------------------
-// Set color indication 
-//---------------------------------------------------------------------
-$odo->AddIndication(0,50,"green");
-$odo->AddIndication(50,80,"yellow");
-$odo->AddIndication(80,100,"red");
-
-//---------------------------------------------------------------------
-// Set the center area that will not be affected by the color bands
-//---------------------------------------------------------------------
-$odo->SetCenterAreaWidth(0.4);  // Fraction of radius
-
-//---------------------------------------------------------------------
-// Adjust scale ticks to be shown at 10 steps interval and scale
-// labels at every second tick
-//---------------------------------------------------------------------
-$odo->scale->SetTicks(10,2);
-
-//---------------------------------------------------------------------
-// Make the tick marks 2 pixel wide
-//---------------------------------------------------------------------
-$odo->scale->SetTickWeight(2);
-
-//---------------------------------------------------------------------
-// Use a bold font for tick labels
-//---------------------------------------------------------------------
-$odo->scale->label->SetFont(FF_FONT1, FS_BOLD);
-
-//---------------------------------------------------------------------
-// Set display value for the odometer
-//---------------------------------------------------------------------
-$odo->needle->Set(78);
-
-//---------------------------------------------------------------------
-// Specify scale caption. Note that depending on the position of the
-// indicator needle this label might be partially hidden. 
-//---------------------------------------------------------------------
-$odo->label->Set("% Passed");
-
-//---------------------------------------------------------------------
-// Set a new style for the needle
-//---------------------------------------------------------------------
-$odo->needle->SetStyle(NEEDLE_STYLE_MEDIUM_TRIANGLE);
-$odo->needle->SetLength(0.7);  // Length as 70% of the radius
-$odo->needle->SetFillColor("orange");
-
-//---------------------------------------------------------------------
-// Setup the second indicator needle
-//---------------------------------------------------------------------
-$odo->needle2->Set(24);
-$odo->needle2->SetStyle(NEEDLE_STYLE_SMALL_TRIANGLE);
-$odo->needle2->SetLength(0.55);  // Length as 70% of the radius
-$odo->needle2->SetFillColor("lightgray");
-$odo->needle2->Show();  
-
-
-//---------------------------------------------------------------------
-// Add the odometer to the graph
-//---------------------------------------------------------------------
-$graph->Add($odo);
-
-//---------------------------------------------------------------------
-// ... and finally stroke and stream the image back to the browser
-//---------------------------------------------------------------------
-$graph->Stroke();
-
-// EOF
-?>
\ No newline at end of file
diff --git a/#jpgraph/src/Examples/odoex07.php b/#jpgraph/src/Examples/odoex07.php
deleted file mode 100644
index eb86ba3c..00000000
--- a/#jpgraph/src/Examples/odoex07.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-//=============================================================================
-// File:	ODOEX07.PHP
-// Description: Example 1 for odometer graphs
-// Created:	2002-02-22
-// Version:	$Id$
-// 
-// Comment:
-// Example file for odometer graph. This examples extends odoex06
-// by changing the start and end angles for the scale.
-//
-// Copyright (C) 2002 Johan Persson. All rights reserved.
-//=============================================================================
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_odo.php');
-
-//---------------------------------------------------------------------
-// Create a new odometer graph (width=250, height=200 pixels)
-//---------------------------------------------------------------------
-$graph = new OdoGraph(250,250);
-
-//---------------------------------------------------------------------
-// Change the color of the odometer plotcanvas. NOT the odometer
-// fill color itself.
-//---------------------------------------------------------------------
-$graph->SetColor("lightyellow");
-
-//---------------------------------------------------------------------
-// Specify title and subtitle using default fonts
-// * Note each title may be multilines by using a '\n' as a line
-// divider.
-//---------------------------------------------------------------------
-$graph->title->Set("Odometer title");
-$graph->title->SetColor("white");
-$graph->subtitle->Set("2002-02-13");
-$graph->subtitle->SetColor("white");
-
-//---------------------------------------------------------------------
-// Specify caption.
-// * (This is the text at the bottom of the graph.) The margins will
-// automatically adjust to fit the height of the text. A caption
-// may have multiple lines by including a '\n' character in the 
-// string.
-//---------------------------------------------------------------------
-$graph->caption->Set("First caption row\n... second row");
-$graph->caption->SetColor("white");
-
-//---------------------------------------------------------------------
-// Now we need to create an odometer to add to the graph.
-// By default the scale will be 0 to 100
-//---------------------------------------------------------------------
-$odo = new Odometer(ODO_FULL); 
-
-//---------------------------------------------------------------------
-// Set color indication 
-//---------------------------------------------------------------------
-$odo->AddIndication(0,50,"green");
-$odo->AddIndication(50,80,"yellow");
-$odo->AddIndication(80,100,"red");
-
-//---------------------------------------------------------------------
-// Set the center area that will not be affected by the color bands
-//---------------------------------------------------------------------
-$odo->SetCenterAreaWidth(0.4);  // Fraction of radius
-
-//---------------------------------------------------------------------
-// Adjust scale ticks to be shown at 10 steps interval and scale
-// labels at every second tick
-//---------------------------------------------------------------------
-$odo->scale->SetTicks(10,2);
-
-//---------------------------------------------------------------------
-// Make the tick marks 2 pixel wide
-//---------------------------------------------------------------------
-$odo->scale->SetTickWeight(2);
-
-//---------------------------------------------------------------------
-// Use a bold font for tick labels
-//---------------------------------------------------------------------
-$odo->scale->label->SetFont(FF_FONT1, FS_BOLD);
-
-//---------------------------------------------------------------------
-// Change the start and end angle for the scale
-//---------------------------------------------------------------------
-$odo->scale->SetAngle(20,340);
-
-//---------------------------------------------------------------------
-// Set display value for the odometer
-//---------------------------------------------------------------------
-$odo->needle->Set(64);
-
-//---------------------------------------------------------------------
-// Specify scale caption. Note that depending on the position of the
-// indicator needle this label might be partially hidden. 
-//---------------------------------------------------------------------
-$odo->label->Set("% Passed");
-
-//---------------------------------------------------------------------
-// Set a new style for the needle
-//---------------------------------------------------------------------
-$odo->needle->SetStyle(NEEDLE_STYLE_MEDIUM_TRIANGLE);
-$odo->needle->SetLength(0.7);  // Length as 70% of the radius
-$odo->needle->SetFillColor("orange");
-
-//---------------------------------------------------------------------
-// Setup the second indicator needle
-//---------------------------------------------------------------------
-$odo->needle2->Set(15);
-$odo->needle2->SetStyle(NEEDLE_STYLE_SMALL_TRIANGLE);
-$odo->needle2->SetLength(0.55);  // Length as 70% of the radius
-$odo->needle2->SetFillColor("lightgray");
-$odo->needle2->Show();  
-
-
-//---------------------------------------------------------------------
-// Add the odometer to the graph
-//---------------------------------------------------------------------
-$graph->Add($odo);
-
-//---------------------------------------------------------------------
-// ... and finally stroke and stream the image back to the browser
-//---------------------------------------------------------------------
-$graph->Stroke();
-
-// EOF
-?>
\ No newline at end of file
diff --git a/#jpgraph/src/Examples/odoex08.php b/#jpgraph/src/Examples/odoex08.php
deleted file mode 100644
index 39f12e7a..00000000
--- a/#jpgraph/src/Examples/odoex08.php
+++ /dev/null
@@ -1,150 +0,0 @@
-<?php
-//=============================================================================
-// File:	ODOEX08.PHP
-// Description: Example 1 for odometer graphs
-// Created:	2002-02-22
-// Version:	$Id$
-// 
-// Comment:
-// Example file for odometer graph. This examples extends odoex07
-// by showing how 1) a drop shadow may be added to the frame
-// 2) Change the margin color 3) Change the fill color of the odometer
-// 4) adding a drop shadow to the indicator needles
-//
-// Copyright (C) 2002 Johan Persson. All rights reserved.
-//=============================================================================
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_odo.php');
-
-//---------------------------------------------------------------------
-// Create a new odometer graph (width=250, height=200 pixels)
-//---------------------------------------------------------------------
-$graph = new OdoGraph(250,250);
-
-//---------------------------------------------------------------------
-// Add a drop shadow to the fram
-//---------------------------------------------------------------------
-$graph->SetShadow();
-
-//---------------------------------------------------------------------
-// Change the color of the odometer plotcanvas. NOT the odometer
-// fill color itself.
-//---------------------------------------------------------------------
-$graph->SetColor("lightyellow");
-
-//---------------------------------------------------------------------
-// Change the color of the margin in the graph
-//---------------------------------------------------------------------
-$graph->SetMarginColor("khaki:0.6");
-
-//---------------------------------------------------------------------
-// Specify title and subtitle using default fonts
-// * Note each title may be multilines by using a '\n' as a line
-// divider.
-//---------------------------------------------------------------------
-$graph->title->Set("Odometer title");
-$graph->title->SetColor("white");
-$graph->subtitle->Set("2002-02-13");
-$graph->subtitle->SetColor("white");
-
-//---------------------------------------------------------------------
-// Specify caption.
-// * (This is the text at the bottom of the graph.) The margins will
-// automatically adjust to fit the height of the text. A caption
-// may have multiple lines by including a '\n' character in the 
-// string.
-//---------------------------------------------------------------------
-$graph->caption->Set("First caption row\n... second row");
-$graph->caption->SetColor("white");
-
-//---------------------------------------------------------------------
-// Now we need to create an odometer to add to the graph.
-// By default the scale will be 0 to 100
-//---------------------------------------------------------------------
-$odo = new Odometer(ODO_FULL); 
-
-//---------------------------------------------------------------------
-// Set fill color for odometer
-//---------------------------------------------------------------------
-$odo->SetColor("lightblue");
-
-//---------------------------------------------------------------------
-// Set color indication 
-//---------------------------------------------------------------------
-$odo->AddIndication(0,50,"green");
-$odo->AddIndication(50,80,"yellow");
-$odo->AddIndication(80,100,"red");
-
-//---------------------------------------------------------------------
-// Set the center area that will not be affected by the color bands
-//---------------------------------------------------------------------
-$odo->SetCenterAreaWidth(0.4);  // Fraction of radius
-
-//---------------------------------------------------------------------
-// Adjust scale ticks to be shown at 10 steps interval and scale
-// labels at every second tick
-//---------------------------------------------------------------------
-$odo->scale->SetTicks(10,2);
-
-//---------------------------------------------------------------------
-// Make the tick marks 2 pixel wide
-//---------------------------------------------------------------------
-$odo->scale->SetTickWeight(2);
-
-//---------------------------------------------------------------------
-// Use a bold font for tick labels
-//---------------------------------------------------------------------
-$odo->scale->label->SetFont(FF_FONT1, FS_BOLD);
-
-//---------------------------------------------------------------------
-// Change the start and end angle for the scale
-//---------------------------------------------------------------------
-$odo->scale->SetAngle(20,340);
-
-//---------------------------------------------------------------------
-// Set display value for the odometer
-//---------------------------------------------------------------------
-$odo->needle->Set(64);
-
-//---------------------------------------------------------------------
-// Specify scale caption. Note that depending on the position of the
-// indicator needle this label might be partially hidden. 
-//---------------------------------------------------------------------
-$odo->label->Set("% Passed");
-
-//---------------------------------------------------------------------
-// Set a new style for the needle
-//---------------------------------------------------------------------
-$odo->needle->SetStyle(NEEDLE_STYLE_MEDIUM_TRIANGLE);
-$odo->needle->SetLength(0.7);  // Length as 70% of the radius
-$odo->needle->SetFillColor("orange");
-
-//---------------------------------------------------------------------
-// Setup the second indicator needle
-//---------------------------------------------------------------------
-$odo->needle2->Set(15);
-$odo->needle2->SetStyle(NEEDLE_STYLE_SMALL_TRIANGLE);
-$odo->needle2->SetLength(0.55);  // Length as 70% of the radius
-$odo->needle2->SetFillColor("lightgray");
-
-// Only the first needle is shown by default 
-$odo->needle2->Show();  
-
-//---------------------------------------------------------------------
-// Add a drop shadow to the indicator needles
-//---------------------------------------------------------------------
-$odo->needle->SetShadow();  
-$odo->needle2->SetShadow();  
-
-//---------------------------------------------------------------------
-// Add the odometer to the graph
-//---------------------------------------------------------------------
-$graph->Add($odo);
-
-//---------------------------------------------------------------------
-// ... and finally stroke and stream the image back to the browser
-//---------------------------------------------------------------------
-$graph->Stroke();
-
-// EOF
-?>
\ No newline at end of file
diff --git a/#jpgraph/src/Examples/odoex09.php b/#jpgraph/src/Examples/odoex09.php
deleted file mode 100644
index 9fc9affe..00000000
--- a/#jpgraph/src/Examples/odoex09.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-//=============================================================================
-// File:	ODOEX09.PHP
-// Description: Example 0 for odometer graphs
-// Created:	2002-02-22
-// Version:	$Id$
-// 
-// Comment:
-// Example file for odometer graph. Extends odoex00.php to show how multiple
-// odometers may be combined in the same graph.
-//
-// Copyright (C) 2002 Johan Persson. All rights reserved.
-//=============================================================================
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_odo.php');
-
-//---------------------------------------------------------------------
-// Create a new odometer graph (width=250, height=200 pixels)
-//---------------------------------------------------------------------
-$graph = new OdoGraph(200,300);
-
-//---------------------------------------------------------------------
-// We will display three odometers stacked vertically
-// The first thing to do is to create them
-//---------------------------------------------------------------------
-$odo1 = new Odometer(); 
-$odo2 = new Odometer(); 
-$odo3 = new Odometer(); 
-
-//---------------------------------------------------------------------
-// Set display value for the odometers
-//---------------------------------------------------------------------
-$odo1->needle->Set(17);
-$odo2->needle->Set(47);
-$odo3->needle->Set(86);
-
-//---------------------------------------------------------------------
-// Add the odometers to the graph using a vertical layout
-//---------------------------------------------------------------------
-$l1 = new LayoutVert( array($odo1,$odo2,$odo3) ) ;
-$graph->Add( $l1 );
-
-//---------------------------------------------------------------------
-// ... and finally stroke and stream the image back to the browser
-//---------------------------------------------------------------------
-$graph->Stroke();
-
-// EOF
-?>
\ No newline at end of file
diff --git a/#jpgraph/src/Examples/odotutex00.php b/#jpgraph/src/Examples/odotutex00.php
deleted file mode 100644
index 4344292d..00000000
--- a/#jpgraph/src/Examples/odotutex00.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_odo.php');
-
-// Create a new odometer graph (width=250, height=200 pixels)
-$graph = new OdoGraph(250,140);
-
-// Now we need to create an odometer to add to the graph.
-// By default the scale will be 0 to 100
-$odo = new Odometer();
-
-// Set display value for the odometer
-$odo->needle->Set(30);
-
-// Add the odometer to the graph
-$graph->Add($odo);
-
-// ... and finally stroke and stream the image back to the client
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/odotutex01.php b/#jpgraph/src/Examples/odotutex01.php
deleted file mode 100644
index ec970cd4..00000000
--- a/#jpgraph/src/Examples/odotutex01.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_odo.php');
-
-// Create a new odometer graph (width=250, height=200 pixels)
-$graph = new OdoGraph(250,140);
-
-// Now we need to create an odometer to add to the graph.
-// By default the scale will be 0 to 100
-$odo = new Odometer(ODO_FULL);
-
-// Set display value for the odometer
-$odo->needle->Set(30);
-
-// Add the odometer to the graph
-$graph->Add($odo);
-
-// ... and finally stroke and stream the image back to the client
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/odotutex02.php b/#jpgraph/src/Examples/odotutex02.php
deleted file mode 100644
index a007c1b1..00000000
--- a/#jpgraph/src/Examples/odotutex02.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_odo.php');
-
-// Create a new odometer graph (width=250, height=200 pixels)
-$graph = new OdoGraph(250,180);
-
-// Setup titles
-$graph->title->Set("Result for 2002");
-$graph->title->SetColor("white");
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,14);
-$graph->subtitle->Set("New York Office");
-$graph->subtitle->SetColor("white");
-$graph->caption->Set("Figure 1. Branch results.");
-$graph->caption->SetColor("white");
-
-// Now we need to create an odometer to add to the graph.
-// By default the scale will be 0 to 100
-$odo = new Odometer();
-
-// Set display value for the odometer
-$odo->needle->Set(30);
-
-// Add the odometer to the graph
-$graph->Add($odo);
-
-// ... and finally stroke and stream the image back to the client
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/odotutex03.php b/#jpgraph/src/Examples/odotutex03.php
deleted file mode 100644
index 3c0e907c..00000000
--- a/#jpgraph/src/Examples/odotutex03.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_odo.php');
-
-// Create a new odometer graph (width=250, height=200 pixels)
-$graph = new OdoGraph(250,200);
-
-// Setup titles
-$graph->title->Set("Result for 2002");
-$graph->title->SetColor("white");
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,14);
-$graph->subtitle->Set("New York Office");
-$graph->subtitle->SetColor("white");
-$graph->caption->Set("Figure 1.This is a very, very\nlong text with multiples lines\nthat are added as a caption.");
-$graph->caption->SetColor("white");
-
-// Now we need to create an odometer to add to the graph.
-// By default the scale will be 0 to 100
-$odo = new Odometer();
-
-// Set display value for the odometer
-$odo->needle->Set(30);
-
-// Add the odometer to the graph
-$graph->Add($odo);
-
-// ... and finally stroke and stream the image back to the client
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/odotutex04.php b/#jpgraph/src/Examples/odotutex04.php
deleted file mode 100644
index 60c57fc7..00000000
--- a/#jpgraph/src/Examples/odotutex04.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_odo.php');
-
-// Create a new odometer graph (width=250, height=200 pixels)
-$graph = new OdoGraph(250,200);
-
-// Setup titles
-$graph->title->Set("Result for 2002");
-$graph->title->SetColor("white");
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,14);
-$graph->subtitle->Set("New York Office");
-$graph->subtitle->SetColor("white");
-$graph->caption->Set("Figure 1.This is a very, very\nlong text with multiples lines\nthat are added as a caption.");
-$graph->caption->SetColor("white");
-
-// Setup colors
-// Make the border 40% darker than normal "khaki"
-$graph->SetMarginColor("khaki:0.6");
-$graph->SetColor("khaki");
-
-// Now we need to create an odometer to add to the graph.
-// By default the scale will be 0 to 100
-$odo = new Odometer();
-
-// Setup colors for odometyer plot
-$odo->SetColor('white');
-$odo->scale->label->SetColor("darkred");
-$odo->needle->SetFillColor("yellow");
-
-// Set display value for the odometer
-$odo->needle->Set(30);
-
-// Add the odometer to the graph
-$graph->Add($odo);
-
-// ... and finally stroke and stream the image back to the client
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/odotutex06.php b/#jpgraph/src/Examples/odotutex06.php
deleted file mode 100644
index 4161e5fa..00000000
--- a/#jpgraph/src/Examples/odotutex06.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_odo.php');
-
-// Create a new odometer graph (width=250, height=200 pixels)
-$graph = new OdoGraph(570,220);
-
-$nstyle = array(
-	NEEDLE_STYLE_SIMPLE, NEEDLE_STYLE_STRAIGHT, NEEDLE_STYLE_ENDARROW,
-	NEEDLE_STYLE_SMALL_TRIANGLE,NEEDLE_STYLE_MEDIUM_TRIANGLE,
-	NEEDLE_STYLE_LARGE_TRIANGLE
-);
-
-$captions = array(
-	"NEEDLE_STYLE_SIMPLE","NEEDLE_STYLE_STRAIGHT","NEEDLE_STYLE_ENDARROW",
-	"NEEDLE_STYLE_SMALL_TRIANGLE","NEEDLE_STYLE_MEDIUM_TRIANGLE",
-	"NEEDLE_STYLE_LARGE_TRIANGLE"
-);
-
-$odo = array();
-
-for( $i=0; $i < 6; ++$i ) {
-	$odo[$i] = new Odometer();
-	$odo[$i]->SetColor("lightyellow");
-	$odo[$i]->needle->Set(80);
-	$odo[$i]->needle->SetStyle($nstyle[$i]);
-	$odo[$i]->caption->Set($captions[$i]);
-	$odo[$i]->caption->SetFont(FF_FONT1);
-	$odo[$i]->caption->SetMargin(3);
-}
-
-// Use the automatic layout engine to positon the plots on the graph
-$row1 = new LayoutHor( array($odo[0],$odo[1],$odo[2]) );
-$row2 = new LayoutHor( array($odo[3],$odo[4],$odo[5]) );
-$col1 = new LayoutVert( array($row1,$row2) );
-
-// Add the odometer to the graph
-$graph->Add($col1);
-
-// ... and finally stroke and stream the image back to the browser
-$graph->Stroke();
-
-?>
\ No newline at end of file
diff --git a/#jpgraph/src/Examples/odotutex07.php b/#jpgraph/src/Examples/odotutex07.php
deleted file mode 100644
index a1ba22bb..00000000
--- a/#jpgraph/src/Examples/odotutex07.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_odo.php');
-
-// Create a new odometer graph (width=250, height=200 pixels)
-$graph = new OdoGraph(570,250);
-
-$odo = array();
-$astyles = array(
-	NEEDLE_ARROW_SS,NEEDLE_ARROW_SM,NEEDLE_ARROW_SL,
-	NEEDLE_ARROW_MS,NEEDLE_ARROW_MM, NEEDLE_ARROW_ML,
-	NEEDLE_ARROW_LS, NEEDLE_ARROW_LM, NEEDLE_ARROW_LL
-	);
-$acaptions = array(
-	'SS','SM','SL','MS','MM','ML','LS','LM','LL'
-);
-
-for($i = 0; $i < 9; ++$i ) {
-	$odo[$i] = 	new Odometer();
-	$odo[$i]->SetColor("lightyellow");
-	$odo[$i]->needle->Set(75);
-	$odo[$i]->needle->SetStyle(NEEDLE_STYLE_ENDARROW, $astyles[$i]);
-	$odo[$i]->caption->SetFont(FF_FONT1,FS_BOLD);
-	$odo[$i]->caption->Set('Arrow: '.$acaptions[$i]);
-}
-
-$row1 = new LayoutHor( array($odo[0],$odo[1],$odo[2]) );
-$row2 = new LayoutHor( array($odo[3],$odo[4],$odo[5]) );
-$row3 = new LayoutHor( array($odo[6],$odo[7],$odo[8]) );
-$col1 = new LayoutVert( array($row1,$row2,$row3) );
-
-// Add the odometer to the graph
-$graph->Add($col1);
-
-// ... and finally stroke and stream the image back to the browser
-$graph->Stroke();
-?>
\ No newline at end of file
diff --git a/#jpgraph/src/Examples/odotutex08.1.php b/#jpgraph/src/Examples/odotutex08.1.php
deleted file mode 100644
index 676ac4c8..00000000
--- a/#jpgraph/src/Examples/odotutex08.1.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_odo.php');
-
-// Create a new odometer graph (width=250, height=200 pixels)
-$graph = new OdoGraph(250,140);
-
-// Setup a title
-$graph->title->Set('An example with thick border');
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,11);
-
-// Add drop shadow for graph
-$graph->SetShadow();
-
-// Set some nonstandard colors
-$color = array(205,220,205);
-$graph->SetMarginColor($color);
-$graph->SetColor($color);
-
-// Now we need to create an odometer to add to the graph.
-// By default the scale will be 0 to 100
-$odo = new Odometer();
-$odo->SetColor('white');
-$odo->SetBorder('darkgreen:0.8',5);
-
-$odo->scale->label->SetFont(FF_ARIAL,FS_BOLD,10);
-$odo->scale->label->SetColor('brown:0.6');
-
-// Set display value for the odometer
-$odo->needle->Set(70);
-
-// Add drop shadow for needle
-$odo->needle->SetShadow();
-
-// Add the odometer to the graph
-$graph->Add($odo);
-
-// ... and finally stroke and stream the image back to the browser
-$graph->Stroke();
-
-?>
\ No newline at end of file
diff --git a/#jpgraph/src/Examples/odotutex08.php b/#jpgraph/src/Examples/odotutex08.php
deleted file mode 100644
index 8132e732..00000000
--- a/#jpgraph/src/Examples/odotutex08.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_odo.php');
-
-// Create a new odometer graph (width=250, height=200 pixels)
-$graph = new OdoGraph(250,140);
-
-// Setup a title
-$graph->title->Set('An example with drop shadows');
-
-// Add drop shadow for graph
-$graph->SetShadow();
-
-// Set some nonstandard colors
-$color = array(205,220,205);
-$graph->SetMarginColor($color);
-$graph->SetColor($color);
-
-// Now we need to create an odometer to add to the graph.
-// By default the scale will be 0 to 100
-$odo = new Odometer();
-$odo->SetColor('white');
-
-// Set display value for the odometer
-$odo->needle->Set(70);
-
-// Add drop shadow for needle
-$odo->needle->SetShadow();
-
-// Add the odometer to the graph
-$graph->Add($odo);
-
-// ... and finally stroke and stream the image back to the browser
-$graph->Stroke();
-
-?>
\ No newline at end of file
diff --git a/#jpgraph/src/Examples/odotutex09.php b/#jpgraph/src/Examples/odotutex09.php
deleted file mode 100644
index 82a2c4b3..00000000
--- a/#jpgraph/src/Examples/odotutex09.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_odo.php');
-
-// Create a new odometer graph (width=250, height=200 pixels)
-$graph = new OdoGraph(600,300);
-
-$odo = array();
-$astyles = array(
-	NEEDLE_ARROW_SS,NEEDLE_ARROW_SM,NEEDLE_ARROW_SL,
-	NEEDLE_ARROW_MS,NEEDLE_ARROW_MM, NEEDLE_ARROW_ML,
-	NEEDLE_ARROW_LS, NEEDLE_ARROW_LM, NEEDLE_ARROW_LL
-	);
-$acaptions = array(
-	'SS','SM','SL','MS','MM','ML','LS','LM','LL'
-);
-
-for($i = 0; $i < 9; ++$i ) {
-	$odo[$i] = 	new Odometer();
-	$odo[$i]->SetColor("lightyellow");
-	$odo[$i]->needle->Set(75);
-	$odo[$i]->needle->SetStyle(NEEDLE_STYLE_ENDARROW, $astyles[$i]);
-	$odo[$i]->caption->SetFont(FF_FONT1);
-	$odo[$i]->caption->Set($acaptions[$i]);
-	$odo[$i]->SetMargin(15);
-}
-
-$row1 = new LayoutHor( array($odo[0],$odo[1],$odo[2]) );
-$row2 = new LayoutHor( array($odo[3],$odo[4],$odo[5]) );
-$row3 = new LayoutHor( array($odo[6],$odo[7],$odo[8]) );
-$col1 = new LayoutVert( array($row1,$row2,$row3) );
-
-// Add the odometer to the graph
-$graph->Add($col1);
-
-// ... and finally stroke and stream the image back to the browser
-$graph->Stroke();
-?>
\ No newline at end of file
diff --git a/#jpgraph/src/Examples/odotutex10.php b/#jpgraph/src/Examples/odotutex10.php
deleted file mode 100644
index f44fc5e0..00000000
--- a/#jpgraph/src/Examples/odotutex10.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_odo.php');
-
-// Create a new odometer graph (width=250, height=200 pixels)
-$graph = new OdoGraph(250,150);
-
-$graph->title->Set('Example with scale indicators');
-
-// Add drop shadow for graph
-$graph->SetShadow();
-
-// Now we need to create an odometer to add to the graph.
-// By default the scale will be 0 to 100
-$odo = new Odometer(ODO_HALF);
-
-// Add color indications
-$odo->AddIndication(0,20,"green:0.7");
-$odo->AddIndication(20,30,"green:0.9");
-$odo->AddIndication(30,60,"yellow");
-$odo->AddIndication(60,80,"orange");
-$odo->AddIndication(80,100,"red");
-
-// Set display value for the odometer
-$odo->needle->Set(90);
-
-//---------------------------------------------------------------------
-// Add drop shadow for needle
-//---------------------------------------------------------------------
-$odo->needle->SetShadow();
-
-//---------------------------------------------------------------------
-// Add the odometer to the graph
-//---------------------------------------------------------------------
-$graph->Add($odo);
-
-//---------------------------------------------------------------------
-// ... and finally stroke and stream the image back to the browser
-//---------------------------------------------------------------------
-$graph->Stroke();
-
-// EOF
-?>
\ No newline at end of file
diff --git a/#jpgraph/src/Examples/odotutex11.php b/#jpgraph/src/Examples/odotutex11.php
deleted file mode 100644
index f1290f7d..00000000
--- a/#jpgraph/src/Examples/odotutex11.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_odo.php');
-
-// Create a new odometer graph (width=250, height=200 pixels)
-$graph = new OdoGraph(250,150);
-
-$graph->title->Set('Example with scale indicators');
-
-// Add drop shadow for graph
-$graph->SetShadow();
-
-// Now we need to create an odometer to add to the graph.
-// By default the scale will be 0 to 100
-$odo = new Odometer(ODO_HALF);
-
-// Add color indications
-$odo->AddIndication(0,20,"green:0.7");
-$odo->AddIndication(20,30,"green:0.9");
-$odo->AddIndication(30,60,"yellow");
-$odo->AddIndication(60,80,"orange");
-$odo->AddIndication(80,100,"red");
-
-// Set display value for the odometer
-$odo->needle->Set(90);
-
-// Set the size of the non-colored base area to 40% of the radius
-$odo->SetCenterAreaWidth(0.45);
-
-// Add drop shadow for needle
-$odo->needle->SetShadow();
-
-// Add the odometer to the graph
-$graph->Add($odo);
-
-// ... and finally stroke and stream the image back to the browser
-$graph->Stroke();
-
-// EOF
-?>
\ No newline at end of file
diff --git a/#jpgraph/src/Examples/odotutex12.php b/#jpgraph/src/Examples/odotutex12.php
deleted file mode 100644
index 5d030a8e..00000000
--- a/#jpgraph/src/Examples/odotutex12.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_odo.php');
-
-// Create a new odometer graph (width=250, height=200 pixels)
-$graph = new OdoGraph(250,150);
-
-$graph->title->Set('Example with scale indicators');
-
-// Add drop shadow for graph
-$graph->SetShadow();
-
-// Now we need to create an odometer to add to the graph.
-// By default the scale will be 0 to 100
-$odo = new Odometer(ODO_HALF);
-
-// Add color indications
-$odo->AddIndication(0,20,"green:0.7");
-$odo->AddIndication(20,30,"green:0.9");
-$odo->AddIndication(30,60,"yellow");
-$odo->AddIndication(60,80,"orange");
-$odo->AddIndication(80,100,"red");
-
-// Set display value for the odometer
-$odo->needle->Set(90);
-
-// Set the size of the non-colored base area to 40% of the radius
-$odo->SetCenterAreaWidth(0.45);
-
-// Add drop shadow for needle
-$odo->needle->SetShadow();
-
-// Setup the second needle
-$odo->needle2->Set(44);
-$odo->needle2->Show();
-$odo->needle2->SetLength(0.4);
-$odo->needle2->SetFillColor("navy");
-$odo->needle2->SetShadow();
-
-// Add the odometer to the graph
-$graph->Add($odo);
-
-// ... and finally stroke and stream the image back to the browser
-$graph->Stroke();
-
-// EOF
-?>
\ No newline at end of file
diff --git a/#jpgraph/src/Examples/odotutex13.php b/#jpgraph/src/Examples/odotutex13.php
deleted file mode 100644
index 5c49a117..00000000
--- a/#jpgraph/src/Examples/odotutex13.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_odo.php');
-
-// Create a new odometer graph (width=250, height=200 pixels)
-$graph = new OdoGraph(250,150);
-
-$graph->title->Set('Example with scale indicators');
-
-// Add drop shadow for graph
-$graph->SetShadow();
-
-// Now we need to create an odometer to add to the graph.
-// By default the scale will be 0 to 100
-$odo = new Odometer(ODO_HALF);
-
-// Add color indications
-$odo->AddIndication(0,20,"green:0.7");
-$odo->AddIndication(20,30,"green:0.9");
-$odo->AddIndication(30,60,"yellow");
-$odo->AddIndication(60,80,"orange");
-$odo->AddIndication(80,100,"red");
-
-$odo->SetCenterAreaWidth(0.45);
-
-// Set display value for the odometer
-$odo->needle->Set(90);
-
-// Add scale labels
-$odo->label->Set("mBar");
-$odo->label->SetFont(FF_FONT2,FS_BOLD);
-
-// Add drop shadow for needle
-$odo->needle->SetShadow();
-
-// Add the odometer to the graph
-$graph->Add($odo);
-
-// ... and finally stroke and stream the image back to the browser
-$graph->Stroke();
-?>
\ No newline at end of file
diff --git a/#jpgraph/src/Examples/odotutex14.php b/#jpgraph/src/Examples/odotutex14.php
deleted file mode 100644
index 19e8f71b..00000000
--- a/#jpgraph/src/Examples/odotutex14.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_odo.php');
-
-// Create a new odometer graph (width=250, height=200 pixels)
-$graph = new OdoGraph(250,160);
-$graph->title->Set('Custom scale');
-$graph->title->SetColor('white');
-$graph->title->SetFont(FF_ARIAL,FS_BOLD);
-
-// Add drop shadow for graph
-$graph->SetShadow();
-
-// Now we need to create an odometer to add to the graph.
-// By default the scale will be 0 to 100
-$odo = new Odometer();
-$odo->SetColor('lightyellow');
-
-// Setup the scale
-$odo->scale->Set(100,600);
-$odo->scale->SetTicks(50,2);
-
-// Set display value for the odometer
-$odo->needle->Set(280);
-
-// Add drop shadow for needle
-$odo->needle->SetShadow();
-
-// Add the odometer to the graph
-$graph->Add($odo);
-
-// ... and finally stroke and stream the image back to the browser
-$graph->Stroke();
-
-?>
\ No newline at end of file
diff --git a/#jpgraph/src/Examples/odotutex15.php b/#jpgraph/src/Examples/odotutex15.php
deleted file mode 100644
index fece535e..00000000
--- a/#jpgraph/src/Examples/odotutex15.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_odo.php');
-
-// Create a new odometer graph (width=250, height=200 pixels)
-$graph = new OdoGraph(250,170);
-
-// Setup graph titles
-$graph->title->Set('Custom formatting');
-$graph->title->SetColor('white');
-$graph->title->SetFont(FF_ARIAL,FS_BOLD);
-
-// Add drop shadow for graph
-$graph->SetShadow();
-
-// Now we need to create an odometer to add to the graph.
-$odo = new Odometer();
-$odo->SetColor("lightgray:1.9");
-
-// Setup the scale
-$odo->scale->Set(100,600);
-$odo->scale->SetTicks(50,2);
-$odo->scale->SetTickColor('brown');
-$odo->scale->SetTickLength(0.05);
-$odo->scale->SetTickWeight(2);
-
-$odo->scale->SetLabelPos(0.75);
-$odo->scale->label->SetFont(FF_FONT1, FS_BOLD);
-$odo->scale->label->SetColor('brown');
-$odo->scale->label->SetFont(FF_ARIAL,FS_NORMAL,10);
-
-// Setup a label with a degree mark
-$odo->scale->SetLabelFormat('%dC'.SymChar::Get('degree'));
-
-// Set display value for the odometer
-$odo->needle->Set(280);
-
-// Add drop shadow for needle
-$odo->needle->SetShadow();
-
-// Add the odometer to the graph
-$graph->Add($odo);
-
-// ... and finally stroke and stream the image back to the browser
-$graph->Stroke();
-?>
\ No newline at end of file
diff --git a/#jpgraph/src/Examples/odotutex16.1.php b/#jpgraph/src/Examples/odotutex16.1.php
deleted file mode 100644
index c370618f..00000000
--- a/#jpgraph/src/Examples/odotutex16.1.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_odo.php');
-
-// Create a new odometer graph (width=250, height=200 pixels)
-$graph = new OdoGraph(350,100);
-
-// Add drop shadow for graph
-$graph->SetShadow();
-
-// Now we need to create an odometer to add to the graph.
-// By default the scale will be 0 to 100
-$odo1 = new Odometer();
-$odo2 = new Odometer();
-$odo1->SetColor("lightgray:1.9");
-$odo2->SetColor("lightgray:1.9");
-
-// Adjust start and end angle for the scale
-$odo2->scale->SetAngle(110,250);
-
-$odo1->scale->label->SetFont(FF_ARIAL,FS_BOLD,10);
-$odo2->scale->label->SetFont(FF_ARIAL,FS_BOLD,10);
-$odo2->AddIndication(-15,0,'lightgray');
-$odo2->AddIndication(100,115,'lightgray');
-
-// Set display value for the odometer
-$odo1->needle->Set(70);
-$odo2->needle->Set(70);
-
-// Add drop shadow for needle
-$odo1->needle->SetShadow();
-$odo2->needle->SetShadow();
-
-// Specify the layout for the two odometers
-$row = new LayoutHor( array($odo1,$odo2) );
-
-// Add the odometer to the graph
-$graph->Add($row);
-
-// ... and finally stroke and stream the image back to the browser
-$graph->Stroke();
-?>
\ No newline at end of file
diff --git a/#jpgraph/src/Examples/odotutex16.php b/#jpgraph/src/Examples/odotutex16.php
deleted file mode 100644
index 16619f3c..00000000
--- a/#jpgraph/src/Examples/odotutex16.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_odo.php');
-
-// Create a new odometer graph (width=250, height=200 pixels)
-$graph = new OdoGraph(350,100);
-
-// Add drop shadow for graph
-$graph->SetShadow();
-
-// Now we need to create an odometer to add to the graph.
-// By default the scale will be 0 to 100
-$odo1 = new Odometer();
-$odo2 = new Odometer();
-$odo1->SetColor("lightgray:1.9");
-$odo2->SetColor("lightgray:1.9");
-
-// Adjust start and end angle for the scale
-$odo2->scale->SetAngle(110,250);
-
-$odo1->scale->label->SetFont(FF_ARIAL,FS_BOLD,10);
-$odo2->scale->label->SetFont(FF_ARIAL,FS_BOLD,10);
-
-// Set display value for the odometer
-$odo1->needle->Set(70);
-$odo2->needle->Set(70);
-
-// Add drop shadow for needle
-$odo1->needle->SetShadow();
-$odo2->needle->SetShadow();
-
-// Specify the layout for the two odometers
-$row = new LayoutHor( array($odo1,$odo2) );
-
-// Add the odometer to the graph
-$graph->Add($row);
-
-// ... and finally stroke and stream the image back to the browser
-$graph->Stroke();
-?>
\ No newline at end of file
diff --git a/#jpgraph/src/Examples/odotutex17.php b/#jpgraph/src/Examples/odotutex17.php
deleted file mode 100644
index 6a9abf8d..00000000
--- a/#jpgraph/src/Examples/odotutex17.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_odo.php');
-
-// Create a new odometer graph
-$graph = new OdoGraph(300,320);
-
-// Setup graph titles
-$graph->title->Set('Manual positioning');
-$graph->title->SetColor('white');
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,14);
-
-// Add drop shadow for graph
-$graph->SetShadow();
-
-// Now we need to create an odometer to add to the graph.
-$odo1 = new Odometer();
-$odo2 = new Odometer();
-$odo1->SetColor('lightgray:1.9');
-$odo2->SetColor('lightgray:1.9');
-
-// Set display value for the odometer
-$odo1->needle->Set(37);
-$odo2->needle->Set(73);
-
-// Add drop shadow for needle
-$odo1->needle->SetShadow();
-$odo2->needle->SetShadow();
-
-// Specify the position for the two odometers
-$odo1->SetPos(180,110);
-$odo1->SetSize(100);
-$odo2->SetPos(110,250);
-$odo2->SetSize(100);
-
-// Set captions for the odometers
-$odo1->caption->Set("(x,y) = (180,120)\nradius=100");
-$odo2->caption->Set("(x,y) = (110,270)\nradius=100");
-
-// Add the odometer to the graph
-$graph->Add($odo1);
-$graph->Add($odo2);
-
-// ... and finally stroke and stream the image back to the browser
-$graph->Stroke();
-?>
\ No newline at end of file
diff --git a/#jpgraph/src/Examples/odotutex18.php b/#jpgraph/src/Examples/odotutex18.php
deleted file mode 100644
index 44bd4913..00000000
--- a/#jpgraph/src/Examples/odotutex18.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_odo.php');
-
-// Create a new odometer graph
-$graph = new OdoGraph(500,180);
-
-$odo = array();
-
-// Now we need to create an odometer to add to the graph.
-for( $i=0; $i < 5; ++$i ) {
-	$odo[$i] = new Odometer();
-	$odo[$i]->SetColor('lightgray:1.9');
-	$odo[$i]->needle->Set(10+$i*17);
-	$odo[$i]->needle->SetShadow();
-	if( $i < 2 )
-		$fsize = 10;
-	else
-		$fsize = 8;
-	$odo[$i]->scale->label->SetFont(FF_ARIAL,FS_NORMAL,$fsize);
-	$odo[$i]->AddIndication(92,100,'red');
-	$odo[$i]->AddIndication(80,92,'orange');
-	$odo[$i]->AddIndication(60,80,'yellow');
-}
-
-// Create the layout
-$row1 = new LayoutHor( array($odo[0],$odo[1]) );
-$row2 = new LayoutHor( array($odo[2],$odo[3],$odo[4]) );
-$col1 = new LayoutVert( array($row1,$row2) );
-
-// Add the odometer to the graph
-$graph->Add($col1);
-
-// ... and finally stroke and stream the image back to the browser
-$graph->Stroke();
-
-?>
\ No newline at end of file
diff --git a/#jpgraph/src/Examples/odotutex19.php b/#jpgraph/src/Examples/odotutex19.php
deleted file mode 100644
index 02324b06..00000000
--- a/#jpgraph/src/Examples/odotutex19.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_odo.php');
-require_once ('jpgraph/jpgraph_iconplot.php');
-
-// Create a new odometer graph
-$graph = new OdoGraph(500,180);
-
-$odo = array();
-
-// Now we need to create an odometer to add to the graph.
-for( $i=0; $i < 5; ++$i ) {
-	$odo[$i] = new Odometer();
-	$odo[$i]->SetColor('lightgray:1.9');
-	$odo[$i]->needle->Set(10+$i*17);
-	$odo[$i]->needle->SetShadow();
-	if( $i < 2 )
-		$fsize = 10;
-	else
-		$fsize = 8;
-	$odo[$i]->scale->label->SetFont(FF_ARIAL,FS_NORMAL,$fsize);
-	$odo[$i]->AddIndication(92,100,'red');
-	$odo[$i]->AddIndication(80,92,'orange');
-	$odo[$i]->AddIndication(60,80,'yellow');
-}
-
-// Create the layout
-$row1 = new LayoutHor( array($odo[0],$odo[1]) );
-$row2 = new LayoutHor( array($odo[2],$odo[3],$odo[4]) );
-$col1 = new LayoutVert( array($row1,$row2) );
-
-// Add the odometer to the graph
-$graph->Add($col1);
-
-// Add an icon and text
-$icon = new IconPlot('jpglogo.jpg',250,10,0.85,30);
-$icon->SetAnchor('center','top');
-$graph->Add($icon);
-
-$t = new Text('JpGraph',250,70);
-$t->SetAlign('center','top');
-#$t->SetFont(FF_VERA,FS_BOLD,11);
-$t->SetColor('darkgray');
-$graph->Add($t);
-
-// ... and finally stroke and stream the image back to the browser
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/orange_example.php b/#jpgraph/src/Examples/orange_example.php
deleted file mode 100644
index adab98dc..00000000
--- a/#jpgraph/src/Examples/orange_example.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$theme = isset($_GET['theme']) ? $_GET['theme'] : null;
-
-$data = array (
-  0 => array (0 => 79, 1 => -25, 2 => -7, 3 => 85, 4 => -26, 5 => -32, ),
-  1 => array (0 => 76, 1 => 51, 2 => 86, 3 => 12, 4 => -7, 5 => 94, ),
-  2 => array (0 => 49, 1 => 38, 2 => 7, 3 => -40, 4 => 9, 5 => -7, ),
-  3 => array ( 0 => 69, 1 => 96, 2 => 49, 3 => 7, 4 => 92, 5 => -38, ),
-  4 => array ( 0 => 68, 1 => 16, 2 => 82, 3 => -49, 4 => 50, 5 => 7, ),
-  5 => array ( 0 => -37, 1 => 28, 2 => 32, 3 => 6, 4 => 13, 5 => 57, ),
-  6 => array ( 0 => 24, 1 => -11, 2 => 7, 3 => 10, 4 => 51, 5 => 51, ),
-  7 => array ( 0 => 3, 1 => -1, 2 => -12, 3 => 61, 4 => 10, 5 => 47, ),
-  8 => array ( 0 => -47, 1 => -21, 2 => 43, 3 => 53, 4 => 36, 5 => 34, ),
-);
-
-
-// Create the graph. These two calls are always required
-$graph = new Graph(400,300);    
-
-$graph->SetScale("textlin");
-if ($theme) {
-  $graph->SetTheme(new $theme());
-}
-$theme_class = new OrangeTheme;
-$graph->SetTheme($theme_class);
-
-$plot = array();
-// Create the bar plots
-for ($i = 0; $i < 4; $i++) {
-  $plot[$i] = new BarPlot($data[$i]);
-  $plot[$i]->SetLegend('plot'.($i+1));
-}
-//$acc1 = new AccBarPlot(array($plot[0], $plot[1]));
-//$acc1->value->Show();
-$gbplot = new GroupBarPlot(array($plot[2], $plot[1] ));
-
-for ($i = 4; $i < 8; $i++) {
-  $plot[$i] = new LinePlot($data[$i]);
-  $plot[$i]->SetLegend('plot'.$i);
-  $plot[$i]->value->Show();
-}
-
-$graph->Add($gbplot);
-$graph->Add($plot[4]);
-
-$title = "OrangeTheme Example";
-$title = mb_convert_encoding($title,'UTF-8');
-$graph->title->Set($title);
-$graph->xaxis->title->Set("X-title");
-$graph->yaxis->title->Set("Y-title");
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/partiallyfilledlineex1.php b/#jpgraph/src/Examples/partiallyfilledlineex1.php
deleted file mode 100644
index 7ad37eca..00000000
--- a/#jpgraph/src/Examples/partiallyfilledlineex1.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-// Some data
-$ydata = array(5,10,15,20,15,10,8,7,4,10,5);
-
-// Create the graph
-$graph= new Graph(400,300);
-$graph->SetScale("textlin");
-$graph->SetShadow(true);
-$graph->SetMarginColor("lightblue");
-
-// Setup format for legend
-$graph->legend->SetFillColor("antiquewhite");
-$graph->legend->SetShadow(true);
-
-// Setup title
-$graph->title->Set("Filled Area Example");
-$graph->title->SetFont(FF_FONT2,FS_BOLD);
-
-// Setup semi-filled line plot
-$lineplot = new LinePlot($ydata);
-$lineplot->SetLegend("Semi-filled\nLineplot");
-
-// Set line color
-$lineplot->SetColor("black");
-
-// Setup the two areas to be filled
-$lineplot->AddArea(2,5,LP_AREA_FILLED,"red");
-$lineplot->AddArea(6,8,LP_AREA_FILLED,"green");
-
-// Display the marks on the lines
-$lineplot->mark->SetType(MARK_DIAMOND);
-$lineplot->mark->SetSize(8);
-$lineplot->mark->Show();
-
-// add plot to the graph
-$graph->Add($lineplot);
-
-// display graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/pastel_example.php b/#jpgraph/src/Examples/pastel_example.php
deleted file mode 100644
index 82aeeb4c..00000000
--- a/#jpgraph/src/Examples/pastel_example.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$theme = isset($_GET['theme']) ? $_GET['theme'] : null;
-$data = array (
-  0 => array (0 => 79, 1 => -25, 2 => -7, 3 => 85, 4 => -26, 5 => -32, ),
-  1 => array (0 => 76, 1 => 51, 2 => 86, 3 => 12, 4 => -7, 5 => 94, ),
-  2 => array (0 => 49, 1 => 38, 2 => 7, 3 => -40, 4 => 9, 5 => -7, ),
-  3 => array ( 0 => 69, 1 => 96, 2 => 49, 3 => 7, 4 => 92, 5 => -38, ),
-  4 => array ( 0 => 68, 1 => 16, 2 => 82, 3 => -49, 4 => 50, 5 => 7, ),
-  5 => array ( 0 => -37, 1 => 28, 2 => 32, 3 => 6, 4 => 13, 5 => 57, ),
-  6 => array ( 0 => 24, 1 => -11, 2 => 7, 3 => 10, 4 => 51, 5 => 51, ),
-  7 => array ( 0 => 3, 1 => -1, 2 => -12, 3 => 61, 4 => 10, 5 => 47, ),
-  8 => array ( 0 => -47, 1 => -21, 2 => 43, 3 => 53, 4 => 36, 5 => 34, ),
-);
-
-
-// Create the graph. These two calls are always required
-$graph = new Graph(400,300);    
-
-$graph->SetScale("textlin");
-if ($theme) {
-  $graph->SetTheme(new $theme());
-}
-$theme_class = new PastelTheme;
-$graph->SetTheme($theme_class);
-
-$plot = array();
-// Create the bar plots
-for ($i = 0; $i < 4; $i++) {
-  $plot[$i] = new BarPlot($data[$i]);
-  $plot[$i]->SetLegend('plot'.($i+1));
-}
-//$acc1 = new AccBarPlot(array($plot[0], $plot[1]));
-//$acc1->value->Show();
-$gbplot = new GroupBarPlot(array($plot[2], $plot[1] ));
-
-for ($i = 4; $i < 8; $i++) {
-  $plot[$i] = new LinePlot($data[$i]);
-  $plot[$i]->SetLegend('plot'.$i);
-  $plot[$i]->value->Show();
-}
-
-$graph->Add($gbplot);
-$graph->Add($plot[4]);
-
-$title = "PastelTheme Example";
-$title = mb_convert_encoding($title,'UTF-8');
-$graph->title->Set($title);
-$graph->xaxis->title->Set("X-title");
-$graph->yaxis->title->Set("Y-title");
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/pdf417_ex0.php b/#jpgraph/src/Examples/pdf417_ex0.php
deleted file mode 100644
index fb197f5b..00000000
--- a/#jpgraph/src/Examples/pdf417_ex0.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/pdf417/jpgraph_pdf417.php');
-
-$data = 'PDF-417';
-// Create a new encoder and backend to generate PNG images
-$backend = PDF417BackendFactory::Create(BACKEND_IMAGE,new PDF417Barcode());
-$backend->Stroke($data);
-?>
diff --git a/#jpgraph/src/Examples/pdf417_ex1.php b/#jpgraph/src/Examples/pdf417_ex1.php
deleted file mode 100644
index 84dd2726..00000000
--- a/#jpgraph/src/Examples/pdf417_ex1.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/pdf417/jpgraph_pdf417.php');
-
-$data = 'PDF-417';
-try {
-	// Create a new encoder and backend to generate PNG images
-	$backend = PDF417BackendFactory::Create(BACKEND_IMAGE,new PDF417Barcode());
-	$backend->Stroke($data);
-}
-catch(JpGraphException $e) {
-	echo 'PDF417 Error: '.$e->GetMessage();
-}
-?>
diff --git a/#jpgraph/src/Examples/pdf417_ex1b.php b/#jpgraph/src/Examples/pdf417_ex1b.php
deleted file mode 100644
index fad0a9e0..00000000
--- a/#jpgraph/src/Examples/pdf417_ex1b.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/pdf417/jpgraph_pdf417.php');
-
-$data = 'PDF-417';
-
-// Setup some symbolic names for barcode specification
-
-$columns = 8;   // Use 8 data (payload) columns
-$errlevel = 2;  // Use error level 2 (minimum recommended)
-
-// Create a new encoder and backend to generate PNG images
-try {
-	$encoder = new PDF417Barcode($columns,$errlevel);
-	$backend = PDF417BackendFactory::Create(BACKEND_IMAGE,$encoder);
-	$backend->Stroke($data);
-}
-catch(JpGraphException $e) {
-	echo 'PDF417 Error: '.$e->GetMessage();
-}
-?>
diff --git a/#jpgraph/src/Examples/pdf417_ex1c.php b/#jpgraph/src/Examples/pdf417_ex1c.php
deleted file mode 100644
index 96a74870..00000000
--- a/#jpgraph/src/Examples/pdf417_ex1c.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/pdf417/jpgraph_pdf417.php');
-
-$data = 'PDF-417';
-
-// Setup some symbolic names for barcode specification
-
-$columns = 8;   // Use 8 data (payload) columns
-$errlevel = 2;  // Use error level 2 (minimum recommended)
-$modwidth = 2;  // Setup module width (in pixels)
-
-// Create a new encoder and backend to generate PNG images
-try {
-	$encoder = new PDF417Barcode($columns,$errlevel);
-	$backend = PDF417BackendFactory::Create(BACKEND_IMAGE,$encoder);
-	$backend->ShowText(true);
-	$backend->SetModuleWidth($modwidth);
-	$backend->Stroke($data);
-}
-catch(JpGraphException $e) {
-	echo 'PDF417 Error: '.$e->GetMessage();
-}
-?>
diff --git a/#jpgraph/src/Examples/pdf417_ex2.php b/#jpgraph/src/Examples/pdf417_ex2.php
deleted file mode 100644
index 685b0c29..00000000
--- a/#jpgraph/src/Examples/pdf417_ex2.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/pdf417/jpgraph_pdf417.php');
-
-$data = 'PDF-417';
-
-// Setup some symbolic names for barcode specification
-
-$columns = 8;   // Use 8 data (payload) columns
-$errlevel = 2;  // Use error level 2 (minimum recommended)
-$modwidth = 2;  // Setup module width (in pixels)
-$height = 3;    // Height factor
-
-// Create a new encoder and backend to generate PNG images
-try {
-	$encoder = new PDF417Barcode($columns,$errlevel);
-	$backend = PDF417BackendFactory::Create(BACKEND_IMAGE,$encoder);
-	$backend->SetModuleWidth($modwidth);
-	$backend->SetHeight($height);
-	$backend->Stroke($data);
-}
-catch(JpGraphException $e) {
-	echo 'PDF417 Error: '.$e->GetMessage();
-}
-?>
diff --git a/#jpgraph/src/Examples/pdf417_ex3.php b/#jpgraph/src/Examples/pdf417_ex3.php
deleted file mode 100644
index ec2c7b6f..00000000
--- a/#jpgraph/src/Examples/pdf417_ex3.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/pdf417/jpgraph_pdf417.php');
-
-$data = 'PDF-417';
-
-// Setup some symbolic names for barcode specification
-
-$columns = 8;   // Use 8 data (payload) columns
-$errlevel = 4;  // Use error level 4
-$modwidth = 2;  // Setup module width (in pixels)
-$height = 2;    // Height factor (=2)
-$showtext = false;  // Show human readable string
-
-// Create a new encoder and backend to generate PNG images
-try {
-	$encoder = new PDF417Barcode($columns,$errlevel);
-	$backend = PDF417BackendFactory::Create(BACKEND_IMAGE,$encoder);
-    $backend->SetModuleWidth($modwidth);
-    $backend->SetHeight($height);
-    $backend->NoText(!$showtext);
-    $backend->Stroke($data);
-}
-catch(JpGraphException $e) {
-	echo 'PDF417 Error: '.$e->GetMessage();
-}
-?>
diff --git a/#jpgraph/src/Examples/pdf417_ex4.php b/#jpgraph/src/Examples/pdf417_ex4.php
deleted file mode 100644
index 5fb8e6e7..00000000
--- a/#jpgraph/src/Examples/pdf417_ex4.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/pdf417/jpgraph_pdf417.php');
-
-$data = 'PDF-417';
-
-// Setup some symbolic names for barcode specification
-
-$columns = 8;   // Use 8 data (payload) columns
-$errlevel = 4;  // Use error level 4
-$modwidth = 2;  // Setup module width (in pixels)
-$height = 2;    // Height factor (=2)
-$showtext = true;  // Show human readable string
-
-try {
-	// Create a new encoder and backend to generate PNG images
-	$encoder = new PDF417Barcode($columns,$errlevel);
-	$backend = PDF417BackendFactory::Create(BACKEND_IMAGE,$encoder);
-
-	$backend->SetModuleWidth($modwidth);
-    $backend->SetHeight($height);
-    $backend->NoText(!$showtext);
-    $backend->SetColor('black','yellow');
-    $backend->Stroke($data);
-}
-catch(JpGraphException $e) {
-	echo 'PDF417 Error: '.$e->GetMessage();
-}
-?>
diff --git a/#jpgraph/src/Examples/pdf417_ex5.php b/#jpgraph/src/Examples/pdf417_ex5.php
deleted file mode 100644
index fc525bfe..00000000
--- a/#jpgraph/src/Examples/pdf417_ex5.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/pdf417/jpgraph_pdf417.php');
-
-$data = 'PDF-417';
-
-// Setup some symbolic names for barcode specification
-
-$columns = 8;   // Use 8 data (payload) columns
-$errlevel = 4;  // Use error level 4
-$modwidth = 0.8;// Setup module width (in PS points)
-$height = 3;    // Height factor (=2)
-$showtext = true;  // Show human readable string
-
-try {
-	// Create a new encoder and backend to generate PNG images
-	$encoder = new PDF417Barcode($columns,$errlevel);
-	$backend = PDF417BackendFactory::Create(BACKEND_PS,$encoder);
-
-	$backend->SetModuleWidth($modwidth);
-    $backend->SetHeight($height);
-    $backend->NoText(!$showtext);
-    $backend->SetColor('black','yellow');
-    $output = $backend->Stroke($data);
-    echo nl2br(htmlspecialchars($output));
-}
-catch(JpGraphException $e) {
-	echo 'PDF417 Error: '.$e->GetMessage();
-}
-?>
diff --git a/#jpgraph/src/Examples/pdf417_ex6.php b/#jpgraph/src/Examples/pdf417_ex6.php
deleted file mode 100644
index 9b2e14d6..00000000
--- a/#jpgraph/src/Examples/pdf417_ex6.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/pdf417/jpgraph_pdf417.php');
-
-$data1 = '12345';
-$data2 = 'Abcdef';
-$data3 = '6789';
-
-// Manually specify several encodation schema
-$data = array(
-    array(USE_NC,$data1),
-    array(USE_TC,$data2),
-    array(USE_NC,$data3));
-
-//$data = "12345Abcdef6789";
-
-// Setup some symbolic names for barcode specification
-
-$columns = 8;   // Use 8 data (payload) columns
-$modwidth = 2;  // Use 2 pixel module width
-$errlevel = 2;  // Use error level 2
-$showtext = true;  // Show human readable string
-
-try {
-	// Create a new encoder and backend to generate PNG images
-	$encoder = new PDF417Barcode($columns,$errlevel);
-	$backend = PDF417BackendFactory::Create(BACKEND_IMAGE,$encoder);
-
-	$backend->SetModuleWidth($modwidth);
-    $backend->NoText(!$showtext);
-    $backend->Stroke($data);
-}
-catch(JpGraphException $e) {
-	echo 'PDF417 Error: '.$e->GetMessage();
-}
-?>
diff --git a/#jpgraph/src/Examples/penguin.png b/#jpgraph/src/Examples/penguin.png
deleted file mode 100644
index 2ae426ae..00000000
Binary files a/#jpgraph/src/Examples/penguin.png and /dev/null differ
diff --git a/#jpgraph/src/Examples/pie3d_csimex1.php b/#jpgraph/src/Examples/pie3d_csimex1.php
deleted file mode 100644
index 564c51f6..00000000
--- a/#jpgraph/src/Examples/pie3d_csimex1.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_pie.php');
-require_once ('jpgraph/jpgraph_pie3d.php');
-
-//$gJpgBrandTiming=true;
-
-// Some data
-$data = array(40,21,17,27,23);
-
-// Create the Pie Graph. 
-$graph = new PieGraph(400,200,'auto');
-$graph->SetShadow();
-
-// Set A title for the plot
-$graph->title->Set("3D Pie Client side image map");
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-
-// Create
-$p1 = new PiePlot3D($data);
-$p1->SetLegends(array("Jan (%d)","Feb","Mar","Apr","May","Jun","Jul"));
-$targ=array("pie3d_csimex1.php?v=1","pie3d_csimex1.php?v=2","pie3d_csimex1.php?v=3",
-			"pie3d_csimex1.php?v=4","pie3d_csimex1.php?v=5","pie3d_csimex1.php?v=6");
-$alts=array("val=%d","val=%d","val=%d","val=%d","val=%d","val=%d");
-$p1->SetCSIMTargets($targ,$alts);
-
-// Use absolute labels
-$p1->SetLabelType(1);
-$p1->value->SetFormat("%d kr");
-
-// Move the pie slightly to the left
-$p1->SetCenter(0.4,0.5);
-
-$graph->Add($p1);
-
-
-// Send back the HTML page which will call this script again
-// to retrieve the image.
-$graph->StrokeCSIM();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/pie3dex1.php b/#jpgraph/src/Examples/pie3dex1.php
deleted file mode 100644
index 10e2100f..00000000
--- a/#jpgraph/src/Examples/pie3dex1.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_pie.php');
-require_once ('jpgraph/jpgraph_pie3d.php');
-
-// Some data
-$data = array(20,27,45,75,90);
-
-// Create the Pie Graph.
-$graph = new PieGraph(350,200);
-$graph->SetShadow();
-
-// Set A title for the plot
-$graph->title->Set("Example 1 3D Pie plot");
-$graph->title->SetFont(FF_VERDANA,FS_BOLD,18); 
-$graph->title->SetColor("darkblue");
-$graph->legend->Pos(0.1,0.2);
-
-// Create pie plot
-$p1 = new PiePlot3d($data);
-$p1->SetTheme("sand");
-$p1->SetCenter(0.4);
-$p1->SetAngle(30);
-$p1->value->SetFont(FF_ARIAL,FS_NORMAL,12);
-$p1->SetLegends(array("Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct"));
-
-$graph->Add($p1);
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/pie3dex2.php b/#jpgraph/src/Examples/pie3dex2.php
deleted file mode 100644
index bd2a099b..00000000
--- a/#jpgraph/src/Examples/pie3dex2.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_pie.php');
-require_once ('jpgraph/jpgraph_pie3d.php');
-
-// Some data
-$data = array(20,27,45,75,90);
-
-// Create the Pie Graph.
-$graph = new PieGraph(350,200);
-$graph->SetShadow();
-
-
-// Set A title for the plot
-$graph->title->Set("Example 2 3D Pie plot");
-$graph->title->SetFont(FF_VERDANA,FS_BOLD,18); 
-$graph->title->SetColor("darkblue");
-$graph->legend->Pos(0.1,0.2);
-
-// Create 3D pie plot
-$p1 = new PiePlot3d($data);
-$p1->SetTheme("sand");
-$p1->SetCenter(0.4);
-$p1->SetSize(0.4);
-$p1->SetHeight(5);
-
-// Adjust projection angle
-$p1->SetAngle(45);
-
-// You can explode several slices by specifying the explode
-// distance for some slices in an array
-$p1->Explode(array(0,40,0,30));
-
-// As a shortcut you can easily explode one numbered slice with
-// $p1->ExplodeSlice(3);
-
-$p1->value->SetFont(FF_ARIAL,FS_NORMAL,10);
-$p1->SetLegends(array("Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct"));
-
-$graph->Add($p1);
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/pie3dex3.php b/#jpgraph/src/Examples/pie3dex3.php
deleted file mode 100644
index b45a2f22..00000000
--- a/#jpgraph/src/Examples/pie3dex3.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_pie.php');
-require_once ('jpgraph/jpgraph_pie3d.php');
-
-// Some data
-$data = array(20,27,45,75,90);
-
-// Create the Pie Graph.
-$graph = new PieGraph(350,200);
-$graph->SetShadow();
-
-// Set A title for the plot
-$graph->title->Set("Example 3 3D Pie plot");
-$graph->title->SetFont(FF_VERDANA,FS_BOLD,18); 
-$graph->title->SetColor("darkblue");
-$graph->legend->Pos(0.1,0.2);
-
-// Create 3D pie plot
-$p1 = new PiePlot3d($data);
-$p1->SetTheme("sand");
-$p1->SetCenter(0.4);
-$p1->SetSize(80);
-
-// Adjust projection angle
-$p1->SetAngle(45);
-
-// As a shortcut you can easily explode one numbered slice with
-$p1->ExplodeSlice(3);
-
-// Setup the slice values
-$p1->value->SetFont(FF_ARIAL,FS_BOLD,11);
-$p1->value->SetColor("navy");
-
-$p1->SetLegends(array("Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct"));
-
-$graph->Add($p1);
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/pie3dex4.php b/#jpgraph/src/Examples/pie3dex4.php
deleted file mode 100644
index 0ce86e4e..00000000
--- a/#jpgraph/src/Examples/pie3dex4.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_pie.php');
-require_once ('jpgraph/jpgraph_pie3d.php');
-
-// Some data
-$data = array(20,27,45,75,90);
-
-// Create the Pie Graph.
-$graph = new PieGraph(350,200);
-$graph->SetShadow();
-
-// Set A title for the plot
-$graph->title->Set("Example 4 3D Pie plot");
-$graph->title->SetFont(FF_VERDANA,FS_BOLD,18); 
-$graph->title->SetColor("darkblue");
-$graph->legend->Pos(0.1,0.2);
-
-// Create 3D pie plot
-$p1 = new PiePlot3d($data);
-$p1->SetTheme("sand");
-$p1->SetCenter(0.4);
-$p1->SetSize(80);
-
-// Adjust projection angle
-$p1->SetAngle(45);
-
-// Adjsut angle for first slice
-$p1->SetStartAngle(45);
-
-// As a shortcut you can easily explode one numbered slice with
-$p1->ExplodeSlice(3);
-
-// Setup slice values
-$p1->value->SetFont(FF_ARIAL,FS_BOLD,11);
-$p1->value->SetColor("navy");
-
-
-$p1->SetLegends(array("Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct"));
-
-$graph->Add($p1);
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/pie3dex5.php b/#jpgraph/src/Examples/pie3dex5.php
deleted file mode 100644
index 6efe470f..00000000
--- a/#jpgraph/src/Examples/pie3dex5.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_pie.php');
-require_once ('jpgraph/jpgraph_pie3d.php');
-
-// Some data
-$data = array(20,27,45,75,90);
-
-// Create the Pie Graph.
-$graph = new PieGraph(350,200);
-$graph->SetShadow();
-
-// Set A title for the plot
-$graph->title->Set("Example 5 3D Pie plot");
-$graph->title->SetFont(FF_VERDANA,FS_BOLD,18); 
-$graph->title->SetColor("darkblue");
-$graph->legend->Pos(0.1,0.2);
-
-// Create 3D pie plot
-$p1 = new PiePlot3d($data);
-$p1->SetTheme("sand");
-$p1->SetCenter(0.4);
-$p1->SetSize(80);
-
-// Adjust projection angle
-$p1->SetAngle(45);
-
-// Adjsut angle for first slice
-$p1->SetStartAngle(45);
-
-// Display the slice values
-$p1->value->SetFont(FF_ARIAL,FS_BOLD,11);
-$p1->value->SetColor("navy");
-
-// Add colored edges to the 3D pie
-// NOTE: You can't have exploded slices with edges!
-$p1->SetEdge("navy");
-
-$p1->SetLegends(array("Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct"));
-
-$graph->Add($p1);
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/pie_csimex1.php b/#jpgraph/src/Examples/pie_csimex1.php
deleted file mode 100644
index 50c3f700..00000000
--- a/#jpgraph/src/Examples/pie_csimex1.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_pie.php');
-
-// Some data
-$data = array(40,21,17,14,23);
-
-// Create the Pie Graph. 
-$graph = new PieGraph(300,200,'auto');
-$graph->SetShadow();
-
-// Set A title for the plot
-$graph->title->Set("Client side image map");
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-
-// Create
-$p1 = new PiePlot($data);
-$p1->SetCenter(0.4,0.5);
-
-$p1->SetLegends(array("Jan","Feb","Mar","Apr","May","Jun","Jul"));
-$targ=array("pie_csimex1.php#1","pie_csimex1.php#2","pie_csimex1.php#3",
-"pie_csimex1.php#4","pie_csimex1.php#5","pie_csimex1.php#6");
-$alts=array("val=%d","val=%d","val=%d","val=%d","val=%d","val=%d");
-$p1->SetCSIMTargets($targ,$alts);
-
-$graph->Add($p1);
-
-
-// Send back the HTML page which will call this script again
-// to retrieve the image.
-$graph->StrokeCSIM();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/piebkgex1.php b/#jpgraph/src/Examples/piebkgex1.php
deleted file mode 100644
index d2371c01..00000000
--- a/#jpgraph/src/Examples/piebkgex1.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_pie.php');
-require_once ('jpgraph/jpgraph_pie3d.php');
-
-// Some data
-$data = array(
-    array(80,18,15,17),
-    array(35,28,6,34),
-    array(10,28,10,5),
-    array(22,22,10,17));
-
-$piepos = array(0.2,0.4,0.65,0.28,0.25,0.75,0.8,0.75);
-$titles = array('USA','Sweden','South America','Australia');
-
-$n = count($piepos)/2;
- 
-// A new graph
-$graph = new PieGraph(550,400,'auto');
-
-// Specify margins since we put the image in the plot area
-$graph->SetMargin(1,1,40,1);
-$graph->SetMarginColor('navy');
-$graph->SetShadow(false);
-
-// Setup background
-$graph->SetBackgroundImage('worldmap1.jpg',BGIMG_FILLPLOT);
-
-// Setup title
-$graph->title->Set("Pie plots with background image");
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,20);
-$graph->title->SetColor('white');
-
-$p = array();
-// Create the plots
-for( $i=0; $i < $n; ++$i ) {
-    $d = "data$i";
-    $p[] = new PiePlot3D($data[$i]);
-}
-
-// Position the four pies
-for( $i=0; $i < $n; ++$i ) {
-    $p[$i]->SetCenter($piepos[2*$i],$piepos[2*$i+1]);
-}
-
-// Set the titles
-for( $i=0; $i < $n; ++$i ) {
-    $p[$i]->title->Set($titles[$i]);
-    $p[$i]->title->SetColor('white');
-    $p[$i]->title->SetFont(FF_ARIAL,FS_BOLD,12);
-}
-
-// Label font and color setup
-for( $i=0; $i < $n; ++$i ) {
-    $p[$i]->value->SetFont(FF_ARIAL,FS_BOLD);
-    $p[$i]->value->SetColor('white');
-}
-
-// Show the percetages for each slice
-for( $i=0; $i < $n; ++$i ) {
-    $p[$i]->value->Show();
-}
-
-// Label format
-for( $i=0; $i < $n; ++$i ) {
-    $p[$i]->value->SetFormat("%01.1f%%");
-}
-
-// Size of pie in fraction of the width of the graph
-for( $i=0; $i < $n; ++$i ) {
-    $p[$i]->SetSize(0.15);
-}
-
-// Format the border around each slice
-
-
-for( $i=0; $i < $n; ++$i ) {
-    $p[$i]->SetEdge(false);
-    $p[$i]->ExplodeSlice(1);
-}
-
-// Use one legend for the whole graph
-$p[0]->SetLegends(array("May","June","July","Aug"));
-$graph->legend->Pos(0.05,0.35);
-$graph->legend->SetShadow(false);
-
-for( $i=0; $i < $n; ++$i ) {
-    $graph->Add($p[$i]);
-}
-
-$graph->Stroke();
-?>
-
-
diff --git a/#jpgraph/src/Examples/piec_csimex1.php b/#jpgraph/src/Examples/piec_csimex1.php
deleted file mode 100644
index bffcb026..00000000
--- a/#jpgraph/src/Examples/piec_csimex1.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// $Id: piec_csimex1.php,v 1.1.2.1 2003/10/09 21:05:39 aditus Exp $
-// Example of pie with center circle
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_pie.php');
-
-// Some data
-$data = array(50,28,25,27,31,20);
-
-// A new pie graph
-$graph = new PieGraph(400,400);
-
-// If you don't want any  border just uncomment this line
-// $graph->SetFrame(false);
-
-// Uncomment this line to add a drop shadow to the border
-// $graph->SetShadow();
-
-// Setup title
-$graph->title->Set("CSIM Center Pie plot ex 1");
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,18);
-$graph->title->SetMargin(8); // Add a little bit more margin from the top
-
-// Create the pie plot
-$p1 = new PiePlotC($data);
-
-// Set the radius of pie (as fraction of image size)
-$p1->SetSize(0.32);
-
-// Move the center of the pie slightly to the top of the image
-$p1->SetCenter(0.5,0.45);
-
-// Label font and color setup
-$p1->value->SetFont(FF_ARIAL,FS_BOLD,12);
-$p1->value->SetColor('white');
-
-// Setup the title on the center circle
-$p1->midtitle->Set("Test mid\nRow 1\nRow 2");
-$p1->midtitle->SetFont(FF_ARIAL,FS_NORMAL,14);
-
-// Set color for mid circle
-$p1->SetMidColor('yellow');
-
-// Use percentage values in the legends values (This is also the default)
-$p1->SetLabelType(PIE_VALUE_PER);
-
-// The label array values may have printf() formatting in them. The argument to the
-// form,at string will be the value of the slice (either the percetage or absolute
-// depending on what was specified in the SetLabelType() above.
-$lbl = array("adam\n%.1f%%","bertil\n%.1f%%","johan\n%.1f%%",
-	     "peter\n%.1f%%","daniel\n%.1f%%","erik\n%.1f%%");
-$p1->SetLabels($lbl);
-
-// Uncomment this line to remove the borders around the slices
-// $p1->ShowBorder(false);
-
-// Add drop shadow to slices
-$p1->SetShadow();
-
-// Explode all slices 15 pixels
-$p1->ExplodeAll(15);
-
-// Setup the CSIM targets
-$targ=array("piec_csimex1.php#1","piec_csimex1.php#2","piec_csimex1.php#3",
-	    "piec_csimex1.php#4","piec_csimex1.php#5","piec_csimex1.php#6");
-$alts=array("val=%d","val=%d","val=%d","val=%d","val=%d","val=%d");
-$p1->SetCSIMTargets($targ,$alts);
-$p1->SetMidCSIM("piec_csimex1.php#7","Center");
-
-
-// Setup a small help text in the image
-$txt = new Text("Note: This is an example of image map. Hold\nyour mouse over the slices to see the values.\nThe URL just points back to this page");
-$txt->SetFont(FF_FONT1,FS_BOLD);
-$txt->SetPos(0.5,0.97,'center','bottom');
-$txt->SetBox('yellow','black');
-$txt->SetShadow();
-$graph->AddText($txt);
-
-// Add plot to pie graph
-$graph->Add($p1);
-
-// .. and send the image on it's marry way to the browser
-$graph->StrokeCSIM();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/piecex1.php b/#jpgraph/src/Examples/piecex1.php
deleted file mode 100644
index af1f2419..00000000
--- a/#jpgraph/src/Examples/piecex1.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// $Id
-// Example of pie with center circle
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_pie.php');
-
-// Some data
-$data = array(50,28,25,27,31,20);
-
-// A new pie graph
-$graph = new PieGraph(300,300,'auto');
-
-// Setup title
-$graph->title->Set("Pie plot with center circle");
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,14);
-$graph->title->SetMargin(8); // Add a little bit more margin from the top
-
-// Create the pie plot
-$p1 = new PiePlotC($data);
-
-// Set size of pie
-$p1->SetSize(0.32);
-
-// Label font and color setup
-$p1->value->SetFont(FF_ARIAL,FS_BOLD,10);
-$p1->value->SetColor('black');
-
-// Setup the title on the center circle
-$p1->midtitle->Set("Test mid\nRow 1\nRow 2");
-$p1->midtitle->SetFont(FF_ARIAL,FS_NORMAL,10);
-
-// Set color for mid circle
-$p1->SetMidColor('yellow');
-
-// Use percentage values in the legends values (This is also the default)
-$p1->SetLabelType(PIE_VALUE_PER);
-
-// Add plot to pie graph
-$graph->Add($p1);
-
-// .. and send the image on it's marry way to the browser
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/piecex2.php b/#jpgraph/src/Examples/piecex2.php
deleted file mode 100644
index 9dbe5f11..00000000
--- a/#jpgraph/src/Examples/piecex2.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// $Id: piecex2.php,v 1.3.2.1 2003/08/19 20:40:12 aditus Exp $
-// Example of pie with center circle
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_pie.php');
-
-// Some data
-$data = array(50,28,25,27,31,20);
-
-// A new pie graph
-$graph = new PieGraph(400,400,'auto');
-
-// Don't display the border
-$graph->SetFrame(false);
-
-// Uncomment this line to add a drop shadow to the border
-// $graph->SetShadow();
-
-// Setup title
-$graph->title->Set("PiePlotC");
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,18);
-$graph->title->SetMargin(8); // Add a little bit more margin from the top
-
-// Create the pie plot
-$p1 = new PiePlotC($data);
-
-// Set size of pie
-$p1->SetSize(0.35);
-
-// Label font and color setup
-$p1->value->SetFont(FF_ARIAL,FS_BOLD,12);
-$p1->value->SetColor('white');
-
-$p1->value->Show();
-
-// Setup the title on the center circle
-$p1->midtitle->Set("Test mid\nRow 1\nRow 2");
-$p1->midtitle->SetFont(FF_ARIAL,FS_NORMAL,14);
-
-// Set color for mid circle
-$p1->SetMidColor('yellow');
-
-// Use percentage values in the legends values (This is also the default)
-$p1->SetLabelType(PIE_VALUE_PER);
-
-// The label array values may have printf() formatting in them. The argument to the
-// form,at string will be the value of the slice (either the percetage or absolute
-// depending on what was specified in the SetLabelType() above.
-$lbl = array("adam\n%.1f%%","bertil\n%.1f%%","johan\n%.1f%%",
-	     "peter\n%.1f%%","daniel\n%.1f%%","erik\n%.1f%%");
-$p1->SetLabels($lbl);
-
-// Uncomment this line to remove the borders around the slices
-// $p1->ShowBorder(false);
-
-// Add drop shadow to slices
-$p1->SetShadow();
-
-// Explode all slices 15 pixels
-$p1->ExplodeAll(15);
-
-// Add plot to pie graph
-$graph->Add($p1);
-
-// .. and send the image on it's marry way to the browser
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/pieex1.php b/#jpgraph/src/Examples/pieex1.php
deleted file mode 100644
index 156d6e2e..00000000
--- a/#jpgraph/src/Examples/pieex1.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_pie.php');
-
-// Some data
-$data = array(113,5,160,3,15,10,1);
-
-// Create the Pie Graph.
-$graph = new PieGraph(300,200);
-$graph->SetShadow();
-
-// Set A title for the plot
-$graph->title->Set("Example 1 Pie plot");
-$graph->title->SetFont(FF_VERDANA,FS_BOLD,14); 
-$graph->title->SetColor("brown");
-
-// Create pie plot
-$p1 = new PiePlot($data);
-//$p1->SetSliceColors(array("red","blue","yellow","green"));
-$p1->SetTheme("earth");
-
-$p1->value->SetFont(FF_ARIAL,FS_NORMAL,10);
-// Set how many pixels each slice should explode
-$p1->Explode(array(0,15,15,25,15));
-
-
-$graph->Add($p1);
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/pieex2.php b/#jpgraph/src/Examples/pieex2.php
deleted file mode 100644
index 195d9755..00000000
--- a/#jpgraph/src/Examples/pieex2.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_pie.php');
-
-// Some data
-$data = array(40,21,17,14,23);
-
-// Create the Pie Graph. 
-$graph = new PieGraph(300,200);
-$graph->SetShadow();
-
-// Set A title for the plot
-$graph->title->Set("Example 2 Pie plot");
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-
-// Create
-$p1 = new PiePlot($data);
-$p1->SetLegends(array("Jan","Feb","Mar","Apr","May","Jun","Jul"));
-$graph->Add($p1);
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/pieex3.php b/#jpgraph/src/Examples/pieex3.php
deleted file mode 100644
index a7795c3a..00000000
--- a/#jpgraph/src/Examples/pieex3.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_pie.php');
-
-// Some data
-$data = array(40,21,17,14,23);
-
-// Create the Pie Graph.
-$graph = new PieGraph(350,300);
-$graph->SetShadow();
-
-// Set A title for the plot
-$graph->title->Set("Multiple - Pie plot");
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-
-// Create plots
-$size=0.13;
-$p1 = new PiePlot($data);
-$p1->SetLegends(array("Jan","Feb","Mar","Apr","May"));
-$p1->SetSize($size);
-$p1->SetCenter(0.25,0.32);
-$p1->value->SetFont(FF_FONT0);
-$p1->title->Set("2001");
-
-$p2 = new PiePlot($data);
-$p2->SetSize($size);
-$p2->SetCenter(0.65,0.32);
-$p2->value->SetFont(FF_FONT0);
-$p2->title->Set("2002");
-
-$p3 = new PiePlot($data);
-$p3->SetSize($size);
-$p3->SetCenter(0.25,0.75);
-$p3->value->SetFont(FF_FONT0);
-$p3->title->Set("2003");
-
-$p4 = new PiePlot($data);
-$p4->SetSize($size);
-$p4->SetCenter(0.65,0.75);
-$p4->value->SetFont(FF_FONT0);
-$p4->title->Set("2004");
-
-$graph->Add($p1);
-$graph->Add($p2);
-$graph->Add($p3);
-$graph->Add($p4);
-
-$graph->Stroke();
-
-?>
-
-
-
diff --git a/#jpgraph/src/Examples/pieex4.php b/#jpgraph/src/Examples/pieex4.php
deleted file mode 100644
index 58544267..00000000
--- a/#jpgraph/src/Examples/pieex4.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_pie.php');
-
-$data = array(40,60,21,33);
-
-$graph = new PieGraph(300,200);
-$graph->SetShadow();
-
-$graph->title->Set("Example 4 of pie plot");
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-
-$p1 = new PiePlot($data);
-$p1->value->SetFont(FF_FONT1,FS_BOLD);
-$p1->value->SetColor("darkred");
-$p1->SetSize(0.3);
-$p1->SetCenter(0.4);
-$p1->SetLegends(array("Jan","Feb","Mar","Apr","May"));
-$graph->Add($p1);
-
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/pieex5.php b/#jpgraph/src/Examples/pieex5.php
deleted file mode 100644
index 808ab3e9..00000000
--- a/#jpgraph/src/Examples/pieex5.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_pie.php');
-
-$data = array(40,60,21,33);
-
-// Setup graph
-$graph = new PieGraph(300,200);
-$graph->SetShadow();
-
-// Setup graph title
-$graph->title->Set("Example 5 of pie plot");
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-
-// Create pie plot
-$p1 = new PiePlot($data);
-$p1->value->SetFont(FF_VERDANA,FS_BOLD);
-$p1->value->SetColor("darkred");
-$p1->SetSize(0.3);
-$p1->SetCenter(0.4);
-$p1->SetLegends(array("Jan","Feb","Mar","Apr","May"));
-//$p1->SetStartAngle(M_PI/8);
-$p1->ExplodeSlice(3);
-
-$graph->Add($p1);
-
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/pieex6.php b/#jpgraph/src/Examples/pieex6.php
deleted file mode 100644
index 46621e70..00000000
--- a/#jpgraph/src/Examples/pieex6.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_pie.php');
-
-// Some data
-$data = array(27,23,47,17);
-
-// A new graph
-$graph = new PieGraph(350,200);
-$graph->SetShadow();
-
-// Setup title
-$graph->title->Set("Example of pie plot with absolute labels");
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-
-// The pie plot
-$p1 = new PiePlot($data);
-
-// Move center of pie to the left to make better room
-// for the legend
-$p1->SetCenter(0.35,0.5);
-
-// No border
-$p1->ShowBorder(false);
-
-// Label font and color setup
-$p1->value->SetFont(FF_FONT1,FS_BOLD);
-$p1->value->SetColor("darkred");
-
-// Use absolute values (type==1)
-$p1->SetLabelType(PIE_VALUE_ABS);
-
-// Label format
-$p1->value->SetFormat("$%d");
-$p1->value->Show();
-
-// Size of pie in fraction of the width of the graph
-$p1->SetSize(0.3);
-
-// Legends
-$p1->SetLegends(array("May ($%d)","June ($%d)","July ($%d)","Aug ($%d)"));
-$graph->legend->Pos(0.05,0.15);
-
-$graph->Add($p1);
-$graph->Stroke();
-?>
-
-
diff --git a/#jpgraph/src/Examples/pieex7.php b/#jpgraph/src/Examples/pieex7.php
deleted file mode 100644
index 77f46102..00000000
--- a/#jpgraph/src/Examples/pieex7.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-//$Id: pieex7.php,v 1.1 2002/06/17 13:53:43 aditus Exp $
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_pie.php');
-
-// Some data
-$data = array(27,23,0,17);
-
-// A new graph
-$graph = new PieGraph(350,200);
-$graph->SetShadow();
-
-// Setup title
-$graph->title->Set("Pie plot with absolute labels");
-$graph->subtitle->Set('(With hidden 0 labels)');
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-
-// The pie plot
-$p1 = new PiePlot($data);
-
-
-// Move center of pie to the left to make better room
-// for the legend
-$p1->SetCenter(0.35,0.5);
-
-// No border
-$p1->ShowBorder(false);
-
-// Label font and color setup
-$p1->value->SetFont(FF_FONT1,FS_BOLD);
-$p1->value->SetColor("darkred");
-
-// Use absolute values (type==1)
-$p1->SetLabelType(PIE_VALUE_ABS);
-
-// Label format
-$p1->value->SetFormat("$%d");
-$p1->value->HideZero();
-$p1->value->Show();
-
-// Size of pie in fraction of the width of the graph
-$p1->SetSize(0.3);
-
-// Legends
-$p1->SetLegends(array("May ($%d)","June ($%d)","July ($%d)","Aug ($%d)"));
-$graph->legend->Pos(0.05,0.2);
-
-$graph->Add($p1);
-$graph->Stroke();
-?>
-
-
diff --git a/#jpgraph/src/Examples/pieex8.php b/#jpgraph/src/Examples/pieex8.php
deleted file mode 100644
index 0ca17859..00000000
--- a/#jpgraph/src/Examples/pieex8.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_pie.php');
-
-$data = array(40,60,31,35);
-
-// A new pie graph
-$graph = new PieGraph(250,200);
-$graph->SetShadow();
-
-// Title setup
-$graph->title->Set("Adjusting the label pos");
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-
-// Setup the pie plot
-$p1 = new PiePlot($data);
-
-// Adjust size and position of plot
-$p1->SetSize(0.4);
-$p1->SetCenter(0.5,0.52);
-
-// Setup slice labels and move them into the plot
-$p1->value->SetFont(FF_FONT1,FS_BOLD);
-$p1->value->SetColor("darkred");
-$p1->SetLabelPos(0.6);
-
-// Finally add the plot
-$graph->Add($p1);
-
-// ... and stroke it
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/pieex9.php b/#jpgraph/src/Examples/pieex9.php
deleted file mode 100644
index 2354d06d..00000000
--- a/#jpgraph/src/Examples/pieex9.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_pie.php');
-
-$data = array(40,60,31,35);
-
-// A new pie graph
-$graph = new PieGraph(250,200);
-$graph->SetShadow();
-
-// Title setup
-$graph->title->Set("Exploding all slices");
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-
-// Setup the pie plot
-$p1 = new PiePlot($data);
-
-// Adjust size and position of plot
-$p1->SetSize(0.35);
-$p1->SetCenter(0.5,0.52);
-
-// Setup slice labels and move them into the plot
-$p1->value->SetFont(FF_FONT1,FS_BOLD);
-$p1->value->SetColor("darkred");
-$p1->SetLabelPos(0.65);
-
-// Explode all slices
-$p1->ExplodeAll(10);
-
-// Add drop shadow
-$p1->SetShadow();
-
-// Finally add the plot
-$graph->Add($p1);
-
-// ... and stroke it
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/pielabelsex1.php b/#jpgraph/src/Examples/pielabelsex1.php
deleted file mode 100644
index d2cf93a0..00000000
--- a/#jpgraph/src/Examples/pielabelsex1.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_pie.php');
-
-$data = array(19,12,4,3,3,12,3,3,5,6,7,8,8,1,7,2,2,4,6,8,21,23,2,2,12);
-
-// Create the Pie Graph.
-$graph = new PieGraph(300,350);
-
-// Set A title for the plot
-$graph->title->Set("Label guide lines");
-$graph->title->SetFont(FF_VERDANA,FS_BOLD,12); 
-$graph->title->SetColor("darkblue");
-$graph->legend->Pos(0.1,0.2);
-
-
-// Create pie plot
-$p1 = new PiePlot($data);
-$p1->SetCenter(0.5,0.55);
-$p1->SetSize(0.3);
-
-// Enable and set policy for guide-lines
-$p1->SetGuideLines();
-$p1->SetGuideLinesAdjust(1.4);
-
-// Setup the labels
-$p1->SetLabelType(PIE_VALUE_PER);	
-$p1->value->Show();			
-$p1->value->SetFont(FF_ARIAL,FS_NORMAL,9);	
-$p1->value->SetFormat('%2.1f%%');		
-
-// Add and stroke
-$graph->Add($p1);
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/pielabelsex2.php b/#jpgraph/src/Examples/pielabelsex2.php
deleted file mode 100644
index bb3cc2ab..00000000
--- a/#jpgraph/src/Examples/pielabelsex2.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_pie.php');
-
-$data = array(19,12,4,3,3,12,3,3,5,6,7,8,8,1,7,2,2,4,6,8,21,23,2,2,12);
-
-// Create the Pie Graph.
-$graph = new PieGraph(300,350);
-
-// Set A title for the plot
-$graph->title->Set("Label guide lines");
-$graph->title->SetFont(FF_VERDANA,FS_BOLD,12); 
-$graph->title->SetColor("darkblue");
-$graph->legend->Pos(0.1,0.2);
-
-
-// Create pie plot
-$p1 = new PiePlot($data);
-$p1->SetCenter(0.5,0.55);
-$p1->SetSize(0.3);
-
-// Enable and set policy for guide-lines. Make labels line up vertically
-$p1->SetGuideLines(true,false);
-$p1->SetGuideLinesAdjust(1.5);
-
-// Setup the labels
-$p1->SetLabelType(PIE_VALUE_PER);	
-$p1->value->Show();			
-$p1->value->SetFont(FF_ARIAL,FS_NORMAL,9);	
-$p1->value->SetFormat('%2.1f%%');		
-
-// Add and stroke
-$graph->Add($p1);
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/pielabelsex3.php b/#jpgraph/src/Examples/pielabelsex3.php
deleted file mode 100644
index cff6d40f..00000000
--- a/#jpgraph/src/Examples/pielabelsex3.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_pie.php');
-
-$data = array(19,12,4,3,3,12,3,3,5,6,7,8,8,1,7,2,2,4,6,8,21,23,2,2,12);
-
-// Create the Pie Graph.
-$graph = new PieGraph(300,350);
-
-// Set A title for the plot
-$graph->title->Set("Label guide lines");
-$graph->title->SetFont(FF_VERDANA,FS_BOLD,12); 
-$graph->title->SetColor("darkblue");
-$graph->legend->Pos(0.1,0.2);
-
-
-// Create pie plot
-$p1 = new PiePlot($data);
-$p1->SetCenter(0.5,0.55);
-$p1->SetSize(0.3);
-
-// Enable and set policy for guide-lines. Make labels line up vertically
-// and force guide lines to always beeing used
-$p1->SetGuideLines(true,false,true);
-$p1->SetGuideLinesAdjust(1.5);
-
-// Setup the labels
-$p1->SetLabelType(PIE_VALUE_PER);	
-$p1->value->Show();			
-$p1->value->SetFont(FF_ARIAL,FS_NORMAL,9);	
-$p1->value->SetFormat('%2.1f%%');		
-
-// Add and stroke
-$graph->Add($p1);
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/pielabelsex4.php b/#jpgraph/src/Examples/pielabelsex4.php
deleted file mode 100644
index 5187b3c5..00000000
--- a/#jpgraph/src/Examples/pielabelsex4.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_pie.php');
-
-$data = array(19,12,4,3,3,12,3,3,5,6,7,8,8,1,7,2,2,4,6,8,21,23,2,2,12);
-
-// Create the Pie Graph.
-$graph = new PieGraph(300,350);
-
-// Set A title for the plot
-$graph->title->Set("Label guide lines");
-$graph->title->SetFont(FF_VERDANA,FS_BOLD,12); 
-$graph->title->SetColor("darkblue");
-$graph->legend->Pos(0.1,0.2);
-
-
-// Create pie plot
-$p1 = new PiePlot($data);
-$p1->SetCenter(0.5,0.55);
-$p1->SetSize(0.3);
-
-// Enable and set policy for guide-lines. Make labels line up vertically
-$p1->SetGuideLines(true,false);
-$p1->SetGuideLinesAdjust(1.1);
-
-// Setup the labels
-$p1->SetLabelType(PIE_VALUE_PER);	
-$p1->value->Show();			
-$p1->value->SetFont(FF_ARIAL,FS_NORMAL,9);	
-$p1->value->SetFormat('%2.1f%%');		
-
-// Add and stroke
-$graph->Add($p1);
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/pielabelsex5.php b/#jpgraph/src/Examples/pielabelsex5.php
deleted file mode 100644
index 22e697d3..00000000
--- a/#jpgraph/src/Examples/pielabelsex5.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-include ("../jpgraph.php");
-include ("../jpgraph_pie.php");
-
-// Some data and the labels
-$data   = array(19,12,4,7,3,12,3);
-$labels = array("First\n(%.1f%%)",
-                "Second\n(%.1f%%)","Third\n(%.1f%%)",
-                "Fourth\n(%.1f%%)","Fifth\n(%.1f%%)",
-                "Sixth\n(%.1f%%)","Seventh\n(%.1f%%)");
-
-// Create the Pie Graph.
-$graph = new PieGraph(300,300);
-$graph->SetShadow();
-
-// Set A title for the plot
-$graph->title->Set('String labels with values');
-$graph->title->SetFont(FF_VERDANA,FS_BOLD,12);
-$graph->title->SetColor('black');
-
-// Create pie plot
-$p1 = new PiePlot($data);
-$p1->SetCenter(0.5,0.5);
-$p1->SetSize(0.3);
-
-// Setup the labels to be displayed
-$p1->SetLabels($labels);
-
-// This method adjust the position of the labels. This is given as fractions
-// of the radius of the Pie. A value < 1 will put the center of the label
-// inside the Pie and a value >= 1 will pout the center of the label outside the
-// Pie. By default the label is positioned at 0.5, in the middle of each slice.
-$p1->SetLabelPos(1);
-
-// Setup the label formats and what value we want to be shown (The absolute)
-// or the percentage.
-$p1->SetLabelType(PIE_VALUE_PER);
-$p1->value->Show();
-$p1->value->SetFont(FF_ARIAL,FS_NORMAL,9);
-$p1->value->SetColor('darkgray');
-
-// Add and stroke
-$graph->Add($p1);
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/plotbanddensity_ex0.php b/#jpgraph/src/Examples/plotbanddensity_ex0.php
deleted file mode 100644
index 3615a957..00000000
--- a/#jpgraph/src/Examples/plotbanddensity_ex0.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-$datay=array(10,29,3,6);
-
-// Create the graph. 
-$graph = new Graph(200,200);	
-$graph->SetScale('textlin');
-$graph->SetMargin(25,10,20,25);
-$graph->SetBox(true);
-
-// Add 10% grace ("space") at top and botton of Y-scale. 
-$graph->yscale->SetGrace(10);
-
-// Create a bar pot
-$bplot = new BarPlot($datay);
-$bplot->SetFillColor("lightblue");
-
-$graph->ygrid->Show(false);
-
-// .. and add the plot to the graph
-$graph->Add($bplot);
-
-// Add band
-$band = new PlotBand(HORIZONTAL,BAND_3DPLANE,15,35,'khaki4');
-$band->SetDensity(10);
-$band->ShowFrame(true);
-$graph->AddBand($band);
-
-// Set title
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,10);
-$graph->title->SetColor('darkred');
-$graph->title->Set('BAND_3DPLANE, Density=10');
-
-
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/plotbanddensity_ex1.php b/#jpgraph/src/Examples/plotbanddensity_ex1.php
deleted file mode 100644
index ed07487e..00000000
--- a/#jpgraph/src/Examples/plotbanddensity_ex1.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-$datay=array(10,29,3,6);
-
-// Create the graph. 
-$graph = new Graph(200,200);	
-$graph->SetScale('textlin');
-$graph->SetMargin(25,10,20,25);
-$graph->SetBox(true);
-
-// Add 10% grace ("space") at top and botton of Y-scale. 
-$graph->yscale->SetGrace(10);
-
-// Create a bar pot
-$bplot = new BarPlot($datay);
-$bplot->SetFillColor("lightblue");
-
-$graph->ygrid->Show(false);
-
-// .. and add the plot to the graph
-$graph->Add($bplot);
-
-// Add band
-$band = new PlotBand(HORIZONTAL,BAND_3DPLANE,15,35,'khaki4');
-$band->SetDensity(40);
-$band->ShowFrame(true);
-$graph->AddBand($band);
-
-// Set title
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,10);
-$graph->title->SetColor('darkred');
-$graph->title->Set('BAND_3DPLANE, Density=40');
-
-
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/plotbanddensity_ex2.php b/#jpgraph/src/Examples/plotbanddensity_ex2.php
deleted file mode 100644
index 908efdf5..00000000
--- a/#jpgraph/src/Examples/plotbanddensity_ex2.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-$datay=array(10,29,3,6);
-
-// Create the graph. 
-$graph = new Graph(200,200);	
-$graph->SetScale('textlin');
-$graph->SetMargin(25,10,20,25);
-$graph->SetBox(true);
-
-// Add 10% grace ("space") at top and botton of Y-scale. 
-$graph->yscale->SetGrace(10);
-$graph->ygrid->Show(false);
-
-// Create a bar pot
-$bplot = new BarPlot($datay);
-$bplot->SetFillColor("lightblue");
-
-
-// .. and add the plot to the graph
-$graph->Add($bplot);
-
-// Add band
-$band = new PlotBand(HORIZONTAL,BAND_3DPLANE,15,35,'khaki4');
-$band->SetDensity(80);
-$band->ShowFrame(true);
-$graph->AddBand($band);
-
-// Set title
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,10);
-$graph->title->SetColor('darkred');
-$graph->title->Set('BAND_3DPLANE, Density=80');
-
-
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/plotlineex1.php b/#jpgraph/src/Examples/plotlineex1.php
deleted file mode 100644
index 43a8016e..00000000
--- a/#jpgraph/src/Examples/plotlineex1.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-require_once ('jpgraph/jpgraph_line.php');
-require_once ('jpgraph/jpgraph_plotline.php');
-
-$datay=array(2,3,5,8.5,11.5,6,3);
-
-// Create the graph.
-$graph = new Graph(460,400,'auto');
-$graph->SetScale("textlin");
-$graph->SetMargin(40,20,50,70);
-
-$graph->legend->SetPos(0.5,0.97,'center','bottom');
-
-$graph->title->Set('Plot line legend');
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,14);
-
-$graph->SetTitleBackground('lightblue:1.3',TITLEBKG_STYLE2,TITLEBKG_FRAME_BEVEL);
-$graph->SetTitleBackgroundFillStyle(TITLEBKG_FILLSTYLE_HSTRIPED,'lightblue','navy');
-
-// Create a bar pot
-$bplot = new BarPlot($datay);
-$bplot->value->Show();
-$bplot->value->SetFont(FF_VERDANA,FS_BOLD,8);
-$bplot->SetValuePos('top');
-$bplot->SetLegend('Bar Legend');
-$graph->Add($bplot);
-
-$pline = new PlotLine(HORIZONTAL,8,'red',2);
-$pline->SetLegend('Line Legend');
-$graph->legend->SetColumns(10);
-$graph->Add($pline);
-
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/polar_csimex1.php b/#jpgraph/src/Examples/polar_csimex1.php
deleted file mode 100644
index ffaac176..00000000
--- a/#jpgraph/src/Examples/polar_csimex1.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_polar.php');
-
-$data = array(0,1,10,2,30,25,40,60,
-	      50,110,60,160,70,210,75,230,80,260,85,370,
-	      90,480,
-	      95,370,100,260,105,230,
-	      110,210,120,160,130,110,140,60,
-	      150,25,170,2,180,1);
-
-$n = count($data);
-for( $i=0; $i < $n; ++$i ) {
-	$targets[$i] = "#$i";
-}
-
-$graph = new PolarGraph(350,320);
-$graph->SetScale('log',100);
-$graph->SetType(POLAR_180);
-
-// Hide frame around graph (by setting width=0)
-$graph->SetFrame(true,'white',1);
-
-// Show both major and minor grid lines
-$graph->axis->ShowGrid(true,true);
-
-// Set color for gradient lines
-$graph->axis->SetGridColor('lightblue:0.9','lightblue:0.9','lightblue:0.9');
-
-// Set label and axis colors
-$graph->axis->SetColor('black','navy','darkred');
-
-// Draw the ticks on the bottom side of the radius axis
-$graph->axis->SetTickSide(SIDE_DOWN);
-
-// Increase the margin for the labels since we changed the
-// side of the ticks.
-$graph->axis->SetLabelMargin(6);
-
-// Change fonts
-$graph->axis->SetFont(FF_ARIAL,FS_NORMAL,8);
-$graph->axis->SetAngleFont(FF_ARIAL,FS_NORMAL,8);
-
-// Setup axis title
-$graph->axis->SetTitle('Coverage (in meter)','middle');
-$graph->axis->title->SetFont(FF_FONT1,FS_BOLD);
-
-// Setup graph title
-$graph->title->Set('Polar plot #9');
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,16);
-$graph->title->SetColor('navy');
-
-// Setup tab title
-$graph->tabtitle->Set('Microphone #1');
-$graph->tabtitle->SetColor('brown:0.5','lightyellow');
-
-// Setup the polar plot with CSIM targets for the marks
-$p = new PolarPlot($data);
-$p->SetFillColor('lightblue@0.5');
-$p->mark->SetType(MARK_SQUARE);
-$p->mark->SetWidth(10);
-$p->SetCSIMTargets( $targets );
-
-$graph->Add($p);
-
-$graph->StrokeCSIM();
-
-?>
diff --git a/#jpgraph/src/Examples/polarclockex1.php b/#jpgraph/src/Examples/polarclockex1.php
deleted file mode 100644
index bdf9008e..00000000
--- a/#jpgraph/src/Examples/polarclockex1.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_polar.php');
-
-//$data = array(22,12,27,40,80,48,120,40,142,27,170,12);
-
-$data = array(
-0,0,10,2,30,25,40,60,
-50,110,60,140,70,170,80,190,
-85,195,90,200,95,195,100,190,
-110,170,120,140,130,110,140,60,
-150,25,170,2,180,0);
-
-//$data2 = array(0,0,50,2,60,30,65,90,60,120,50,150,20,170,0,180);
-
-$data2 = array(0,0,34,56,90,90,170,65,220,90,270,120,300,60,355,10);
-
-$graph = new PolarGraph(350,350);
-$graph->SetScale('lin',150);
-
-$graph->SetMarginColor('#FFE6C0');
-$graph->SetType(POLAR_360);
-$graph->SetMargin(40,40,50,40);
-$graph->SetClockwise(true);
-
-//$graph->Set90AndMargin(60,50,70,120);
-
-$graph->SetBox(true);
-$graph->SetFrame(false);
-$graph->axis->ShowGrid(true,false,true);
-$graph->axis->SetGridColor('gray','gray','gray');
-
-$graph->axis->SetFont(FF_ARIAL,FS_NORMAL,8);
-$graph->axis->SetTitle('X-Axis','center');
-
-$graph->axis->SetColor('black','black','darkred');
-$graph->axis->SetAngleFont(FF_ARIAL,FS_NORMAL,8);
-
-$graph->title->Set('Clockwise polar plot');
-$graph->title->SetFont(FF_COMIC,FS_NORMAL,16);
-$graph->title->SetColor('navy');
-
-
-
-$p = new PolarPlot($data);
-$p->SetFillColor('lightblue@0.5');
-$graph->Add($p);
-
-//$p2 = new PolarPlot($data2);
-//$p2->SetFillColor('red@0.5');
-//$graph->Add($p2);
-
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/polarclockex2.php b/#jpgraph/src/Examples/polarclockex2.php
deleted file mode 100644
index 11cdeca6..00000000
--- a/#jpgraph/src/Examples/polarclockex2.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_polar.php');
-
-//$data = array(22,12,27,40,80,48,120,40,142,27,170,12);
-
-$data = array(
-0,0,10,2,30,25,40,60,
-50,110,60,140,70,170,80,190,
-85,195,90,200,95,195,100,190,
-110,170,120,140,130,110,140,60,
-150,25,170,2,180,0);
-
-//$data2 = array(0,0,50,2,60,30,65,90,60,120,50,150,20,170,0,180);
-
-$data2 = array(0,0,34,56,90,90,170,65,220,90,270,120,300,60,355,10);
-
-$graph = new PolarGraph(350,350);
-$graph->SetScale('lin',150);
-
-$graph->SetMarginColor('#FFE6C0');
-$graph->SetType(POLAR_360);
-$graph->SetClockwise(true);
-$graph->Set90AndMargin(40,40,50,40);
-
-$graph->SetBox(true);
-$graph->SetFrame(false);
-$graph->axis->ShowGrid(true,false,true);
-$graph->axis->SetGridColor('gray','gray','gray');
-
-$graph->axis->SetFont(FF_ARIAL,FS_NORMAL,8);
-$graph->axis->SetTitle('X-Axis','center');
-
-$graph->axis->SetColor('black','black','darkred');
-$graph->axis->SetAngleFont(FF_ARIAL,FS_NORMAL,8);
-
-$graph->title->Set('Clockwise polar plot (rotated)');
-$graph->title->SetFont(FF_COMIC,FS_NORMAL,16);
-$graph->title->SetColor('navy');
-
-
-
-$p = new PolarPlot($data);
-$p->SetFillColor('lightblue@0.5');
-$graph->Add($p);
-
-//$p2 = new PolarPlot($data2);
-//$p2->SetFillColor('red@0.5');
-//$graph->Add($p2);
-
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/polarex0-180.php b/#jpgraph/src/Examples/polarex0-180.php
deleted file mode 100644
index 4fa344fa..00000000
--- a/#jpgraph/src/Examples/polarex0-180.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// A simple Polar graph, example 0
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_polar.php');
-
-
-$data = array(0,1,10,2,30,25,40,60,
-	      50,110,60,160,70,210,75,230,80,260,
-	      85,270,90,280,
-	      95,270,100,260,105,230,
-	      110,210,120,160,130,110,140,60,
-	      150,25,170,2,180,1);
-
-
-$graph = new PolarGraph(250,250);
-$graph->SetScale('lin');
-$graph->SetMargin(35,35,25,25);
-$graph->SetType(POLAR_180);
-
-$p = new PolarPlot($data);
-$p->SetFillColor('lightblue@0.5');
-$graph->Add($p);
-
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/polarex0.php b/#jpgraph/src/Examples/polarex0.php
deleted file mode 100644
index b11aa6e1..00000000
--- a/#jpgraph/src/Examples/polarex0.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// A simple Polar graph, example 0
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_polar.php');
-
-
-$data = array(0,1,10,2,30,25,40,60,
-	      50,110,60,160,70,210,75,230,80,260,
-	      85,270,90,280,
-	      95,270,100,260,105,230,
-	      110,210,120,160,130,110,140,60,
-	      150,25,170,2,180,1);
-
-
-$graph = new PolarGraph(250,250);
-$graph->SetScale('lin');
-$graph->SetMargin(35,35,25,25);
-
-$p = new PolarPlot($data);
-$p->SetFillColor('lightblue@0.5');
-$graph->Add($p);
-
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/polarex1.php b/#jpgraph/src/Examples/polarex1.php
deleted file mode 100644
index b0c7f8af..00000000
--- a/#jpgraph/src/Examples/polarex1.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// A simple Polar graph, example 1
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_polar.php');
-
-
-$data = array(0,1,10,2,30,25,40,60,
-	      50,110,60,160,70,210,75,230,80,260,
-	      85,270,90,280,
-	      95,270,100,260,105,230,
-	      110,210,120,160,130,110,140,60,
-	      150,25,170,2,180,1);
-
-
-$graph = new PolarGraph(600,500);
-$graph->SetScale('lin');
-$graph->SetType(POLAR_180);
-//$graph->SetAngle(90);
-//$graph->SetMargin(30-150,30-150,30+150,30+150);
-$graph->Set90AndMargin(40,40,40,40);
-//$graph->axis->SetLabelAlign('right','center');
-
-$p = new PolarPlot($data);
-$p->SetLegend("Test");
-$graph->Add($p);
-
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/polarex10.php b/#jpgraph/src/Examples/polarex10.php
deleted file mode 100644
index d864a23d..00000000
--- a/#jpgraph/src/Examples/polarex10.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// A simple Polar graph,
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_polar.php');
-
-$data = array(5,1,20,5,30,25,40,60,
-	      50,110,60,160,70,210,75,230,80,260,85,370,
-	      90,480,
-	      95,370,100,260,105,230,
-	      110,210,120,160,130,110,140,60,
-	      150,25,160,5,175,1);
-$n = count($data);
-/*
-for($i=0; $i < $n; $i+=2 ) {
-    $data[$n+$i] = 360-$data[$i];
-    $data[$n+$i+1] = $data[$i+1];
-}
-*/
-$graph = new PolarGraph(350,480);
-$graph->SetScale('log',100);
-$graph->SetType(POLAR_360);
-
-// Hide frame around graph (by setting width=0)
-$graph->SetFrame(true,'white',1);
-
-// Show both major and minor grid lines
-$graph->axis->ShowGrid(true,true);
-
-// Set color for gradient lines
-$graph->axis->SetGridColor('lightblue:0.9','lightblue:0.9','lightblue:0.9');
-
-// Set label and axis colors
-$graph->axis->SetColor('black','navy','darkred');
-
-// Draw the ticks on the bottom side of the radius axis
-$graph->axis->SetTickSide(SIDE_DOWN);
-
-// Increase the margin for the labels since we changed the
-// side of the ticks.
-$graph->axis->SetLabelMargin(6);
-
-// Change fonts
-$graph->axis->SetFont(FF_ARIAL,FS_NORMAL,8);
-$graph->axis->SetAngleFont(FF_ARIAL,FS_NORMAL,8);
-
-
-// Setup graph title
-$graph->title->Set('Polar plot #10');
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,16);
-$graph->title->SetColor('navy');
-
-// Setup tab title
-$graph->tabtitle->Set('Microphone #1');
-$graph->tabtitle->SetColor('brown:0.5','lightyellow');
-
-
-$p = new PolarPlot($data);
-$p->SetFillColor('lightblue@0.5');
-$p->mark->SetType(MARK_SQUARE);
-
-$graph->Add($p);
-
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/polarex2.php b/#jpgraph/src/Examples/polarex2.php
deleted file mode 100644
index d4a9779a..00000000
--- a/#jpgraph/src/Examples/polarex2.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// A simple Polar graph, example 2
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_polar.php');
-
-
-$data = array(0,1,10,2,30,25,40,60,
-	      50,110,60,160,70,210,75,230,80,260,
-	      85,270,90,280,
-	      95,270,100,260,105,230,
-	      110,210,120,160,130,110,140,60,
-	      150,25,170,2,180,1);
-
-
-$graph = new PolarGraph(300,350);
-$graph->SetScale('lin');
-
-$graph->title->Set('Polar plot #2');
-$graph->title->SetFont(FF_FONT2,FS_BOLD);
-$graph->title->SetColor('navy');
-
-// Hide last labels on the Radius axis
-// They intersect with the box otherwise
-$graph->axis->HideLastTickLabel();
-
-$p = new PolarPlot($data);
-$p->SetFillColor('lightred@0.5');
-
-$graph->Add($p);
-
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/polarex3-lin.php b/#jpgraph/src/Examples/polarex3-lin.php
deleted file mode 100644
index 430438c9..00000000
--- a/#jpgraph/src/Examples/polarex3-lin.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// A simple Polar graph, example 2
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_polar.php');
-
-
-$data = array(0,1,10,2,30,25,40,60,
-	      50,110,60,160,70,210,75,230,80,260,
-	      85,270,90,280,
-	      95,270,100,260,105,230,
-	      110,210,120,160,130,110,140,60,
-	      150,25,170,2,180,1);
-
-
-$graph = new PolarGraph(300,300);
-$graph->SetScale('lin',200);
-$graph->SetType(POLAR_180);
-
-$graph->title->Set('Polar plot #3');
-$graph->title->SetFont(FF_FONT2,FS_BOLD);
-$graph->title->SetColor('navy');
-
-$graph->axis->ShowGrid(true,false);
-
-$p = new PolarPlot($data);
-$p->SetFillColor('lightred@0.5');
-
-$graph->Add($p);
-
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/polarex3.php b/#jpgraph/src/Examples/polarex3.php
deleted file mode 100644
index 82bf18a2..00000000
--- a/#jpgraph/src/Examples/polarex3.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// A simple Polar graph, example 2
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_polar.php');
-
-
-$data = array(0,1,10,2,30,25,40,60,
-	      50,110,60,160,70,210,75,230,80,260,
-	      85,270,90,280,
-	      95,270,100,260,105,230,
-	      110,210,120,160,130,110,140,60,
-	      150,25,170,2,180,1);
-
-
-$graph = new PolarGraph(300,300);
-$graph->SetScale('log',100);
-$graph->SetType(POLAR_180);
-
-$graph->title->Set('Polar plot #3');
-$graph->title->SetFont(FF_FONT2,FS_BOLD);
-$graph->title->SetColor('navy');
-
-$graph->axis->ShowGrid(true,false);
-
-$p = new PolarPlot($data);
-$p->SetFillColor('lightred@0.5');
-
-$graph->Add($p);
-
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/polarex4.php b/#jpgraph/src/Examples/polarex4.php
deleted file mode 100644
index a4fb1d08..00000000
--- a/#jpgraph/src/Examples/polarex4.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// A simple Polar graph, example 2
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_polar.php');
-
-
-$data = array(0,1,10,2,30,25,40,60,
-	      50,110,60,160,70,210,75,230,80,260,
-	      85,270,90,280,
-	      95,270,100,260,105,230,
-	      110,210,120,160,130,110,140,60,
-	      150,25,170,2,180,1);
-
-
-$graph = new PolarGraph(300,350);
-$graph->SetScale('log');
-
-$graph->title->Set('Polar plot #4');
-$graph->title->SetFont(FF_FONT2,FS_BOLD);
-$graph->title->SetColor('navy');
-
-// Hide last labels on the Radius axis
-// They intersect with the box otherwise
-$graph->axis->HideLastTickLabel();
-
-$p = new PolarPlot($data);
-$p->SetFillColor('lightred@0.5');
-
-$graph->Add($p);
-
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/polarex5.php b/#jpgraph/src/Examples/polarex5.php
deleted file mode 100644
index 7da58020..00000000
--- a/#jpgraph/src/Examples/polarex5.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// A simple Polar graph, example 2
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_polar.php');
-
-
-$data = array(0,1,10,2,30,25,40,60,
-	      50,110,60,160,70,210,75,230,80,260,
-	      85,270,90,280,
-	      95,270,100,260,105,230,
-	      110,210,120,160,130,110,140,60,
-	      150,25,170,2,180,1);
-
-
-$graph = new PolarGraph(300,350);
-$graph->SetScale('log');
-
-// Show both major and minor grid lines
-$graph->axis->ShowGrid(true,true);
-
-$graph->title->Set('Polar plot #5');
-$graph->title->SetFont(FF_FONT2,FS_BOLD);
-$graph->title->SetColor('navy');
-
-// Hide last labels on the Radius axis
-// They intersect with the box otherwise
-$graph->axis->HideLastTickLabel();
-
-$p = new PolarPlot($data);
-$p->SetFillColor('lightred@0.5');
-
-$graph->Add($p);
-
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/polarex6.php b/#jpgraph/src/Examples/polarex6.php
deleted file mode 100644
index 21ae6a27..00000000
--- a/#jpgraph/src/Examples/polarex6.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// A simple Polar graph,
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_polar.php');
-
-
-$data = array(0,1,10,2,30,25,40,60,
-	      50,110,60,160,70,210,75,230,80,260,85,270,
-	      90,480,
-	      95,270,100,260,105,230,
-	      110,210,120,160,130,110,140,60,
-	      150,25,170,2,180,1);
-
-
-$graph = new PolarGraph(300,350);
-$graph->SetScale('log');
-$graph->SetType(POLAR_180);
-
-// Show both major and minor grid lines
-$graph->axis->ShowGrid(true,true);
-
-$graph->title->Set('Polar plot #6');
-$graph->title->SetFont(FF_FONT2,FS_BOLD);
-$graph->title->SetColor('navy');
-
-
-$p = new PolarPlot($data);
-$p->SetFillColor('lightred@0.5');
-
-$graph->Add($p);
-
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/polarex7-1.php b/#jpgraph/src/Examples/polarex7-1.php
deleted file mode 100644
index 5b593a19..00000000
--- a/#jpgraph/src/Examples/polarex7-1.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// A simple Polar graph,
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_polar.php');
-
-
-$data = array(0,1,30,2,30,25,40,60,
-	      50,110,60,160,70,210,75,230,80,260,85,370,
-	      90,480,
-	      95,370,100,260,105,230,
-	      110,210,120,160,130,110,140,60,
-	      150,25,150,2,180,1);
-
-$graph = new PolarGraph(300,350);
-$graph->SetScale('log',100);
-$graph->SetType(POLAR_180);
-$graph->SetPlotSize(220,250);
-
-// Hide frame around graph (by setting width=0)
-$graph->SetFrame(true,'white',1);
-
-$graph->SetBackgroundGradient('blue:1.3','brown:1.4',GRAD_HOR,BGRAD_PLOT);
-
-// Set color for gradient lines
-$graph->axis->SetGridColor('gray','gray','gray');
-
-// Setup axis title
-$graph->axis->SetTitle('Coverage (in meter)','middle');
-$graph->axis->title->SetFont(FF_FONT1,FS_BOLD);
-
-$graph->title->Set('Polar plot #7');
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,16);
-$graph->title->SetColor('navy');
-
-// Adjust legen box position and color
-$graph->legend->SetColor('navy','darkgray');
-$graph->legend->SetFillColor('white');
-$graph->legend->SetShadow('darkgray@0.5',5);
-
-$p = new PolarPlot($data);
-$p->SetFillColor('lightblue@0.5');
-$p->mark->SetType(MARK_SQUARE);
-$p->SetLegend("Mirophone #1\n(No amps)");
-
-$graph->Add($p);
-
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/polarex7-2.php b/#jpgraph/src/Examples/polarex7-2.php
deleted file mode 100644
index 959749d2..00000000
--- a/#jpgraph/src/Examples/polarex7-2.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// A simple Polar graph,
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_polar.php');
-
-
-$data = array(0,1,30,2,30,25,40,60,
-	      50,110,60,160,70,210,75,230,80,260,85,370,
-	      90,480,
-	      95,370,100,260,105,230,
-	      110,210,120,160,130,110,140,60,
-	      150,25,150,2,180,1);
-
-$n = count($data);
-for($i=0; $i < $n; $i+=2 ) {
-    $data[$n+$i] = 360-$data[$i];
-    $data[$n+$i+1] = $data[$i+1];
-}
-
-
-$graph = new PolarGraph(300,400);
-$graph->SetScale('log',100);
-$graph->SetType(POLAR_360);
-$graph->SetPlotSize(220,300);
-
-// Hide frame around graph (by setting width=0)
-$graph->SetFrame(true,'white',1);
-
-$graph->SetBackgroundGradient('blue:1.3','brown:1.4',GRAD_MIDHOR,BGRAD_PLOT);
-
-// Set color for gradient lines
-$graph->axis->SetGridColor('gray','gray','gray');
-
-$graph->title->Set('Polar plot #7-2');
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,16);
-$graph->title->SetColor('navy');
-
-// Adjust legen box position and color
-$graph->legend->SetColor('navy','darkgray');
-$graph->legend->SetFillColor('white');
-$graph->legend->SetShadow('darkgray@0.5',5);
-
-$p = new PolarPlot($data);
-$p->SetFillColor('yellow@0.6');
-$p->mark->SetType(MARK_SQUARE);
-$p->SetLegend("Mirophone #1\n(No amps)");
-
-$graph->Add($p);
-
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/polarex7.php b/#jpgraph/src/Examples/polarex7.php
deleted file mode 100644
index d7079a0a..00000000
--- a/#jpgraph/src/Examples/polarex7.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// A simple Polar graph,
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_polar.php');
-
-
-$data = array(0,1,10,2,30,25,40,60,
-	      50,110,60,160,70,210,75,230,80,260,85,370,
-	      90,480,
-	      95,370,100,260,105,230,
-	      110,210,120,160,130,110,140,60,
-	      150,25,170,2,180,1);
-
-$graph = new PolarGraph(300,350);
-$graph->SetScale('lin',300);
-$graph->SetType(POLAR_180);
-$graph->SetPlotSize(220,250);
-
-// Hide frame around graph (by setting width=0)
-$graph->SetFrame(true,'white',1);
-
-$graph->SetBackgroundGradient('blue:1.3','brown:1.4',GRAD_HOR,BGRAD_PLOT);
-
-// Show both major and minor grid lines
-$graph->axis->ShowGrid(true,true);
-
-// Set color for gradient lines
-$graph->axis->SetGridColor('gray','gray','gray');
-
-// Setup axis title
-$graph->axis->SetTitle('Coverage (in meter)','middle');
-$graph->axis->title->SetFont(FF_FONT1,FS_BOLD);
-
-$graph->title->Set('Polar plot #7');
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,16);
-$graph->title->SetColor('navy');
-
-// Adjust legen box position and color
-$graph->legend->SetColor('navy','darkgray');
-$graph->legend->SetFillColor('white');
-$graph->legend->SetShadow('darkgray@0.5',5);
-
-$p = new PolarPlot($data);
-$p->SetFillColor('lightblue@0.5');
-$p->mark->SetType(MARK_SQUARE);
-$p->SetLegend("Mirophone #1\n(No amps)");
-
-$graph->Add($p);
-
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/polarex8.php b/#jpgraph/src/Examples/polarex8.php
deleted file mode 100644
index 8322ebcd..00000000
--- a/#jpgraph/src/Examples/polarex8.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// A simple Polar graph,
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_polar.php');
-
-
-$data = array(0,1,10,2,30,25,40,60,
-	      50,110,60,160,70,210,75,230,80,260,85,370,
-	      90,480,
-	      95,370,100,260,105,230,
-	      110,210,120,160,130,110,140,60,
-	      150,25,170,2,180,1);
-
-$graph = new PolarGraph(350,400);
-$graph->SetScale('log',100);
-$graph->SetType(POLAR_180);
-//$graph->SetPlotSize(250,250);
-
-// Hide frame around graph (by setting width=0)
-$graph->SetFrame(true,'white',1);
-
-// Set plotarea color
-$graph->SetColor('lightblue');
-
-// Show both major and minor grid lines
-$graph->axis->ShowGrid(true,true);
-
-// Set color for gradient lines
-$graph->axis->SetGridColor('lightblue:0.8','lightblue:0.8','lightblue:0.8');
-
-// Setup axis title
-$graph->axis->SetTitle('Coverage (in meter)','middle');
-$graph->axis->title->SetFont(FF_FONT1,FS_BOLD);
-
-$graph->title->Set('Polar plot #8');
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,16);
-$graph->title->SetColor('navy');
-
-// Adjust legen box position and color
-$graph->legend->SetColor('navy','darkgray');
-$graph->legend->SetFillColor('white');
-$graph->legend->SetShadow('darkgray@0.5',5);
-
-$p = new PolarPlot($data);
-$p->SetFillColor('white@0.5');
-$p->mark->SetType(MARK_SQUARE);
-$p->SetLegend("Mirophone #1\n(No amps)");
-
-$graph->Add($p);
-
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/polarex9.php b/#jpgraph/src/Examples/polarex9.php
deleted file mode 100644
index ee239ec0..00000000
--- a/#jpgraph/src/Examples/polarex9.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// A simple Polar graph,
-
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_polar.php');
-
-$data = array(0,1,10,2,30,25,40,60,
-	      50,110,60,160,70,210,75,230,80,260,85,370,
-	      90,480,
-	      95,370,100,260,105,230,
-	      110,210,120,160,130,110,140,60,
-	      150,25,170,2,180,1);
-
-$graph = new PolarGraph(350,320);
-$graph->SetScale('log',100);
-$graph->SetType(POLAR_180);
-
-// Hide frame around graph (by setting width=0)
-$graph->SetFrame(true,'white',1);
-
-// Show both major and minor grid lines
-$graph->axis->ShowGrid(true,true);
-
-// Set color for gradient lines
-$graph->axis->SetGridColor('lightblue:0.9','lightblue:0.9','lightblue:0.9');
-
-// Set label and axis colors
-$graph->axis->SetColor('black','navy','darkred');
-
-// Draw the ticks on the bottom side of the radius axis
-$graph->axis->SetTickSide(SIDE_DOWN);
-
-// Increase the margin for the labels since we changed the
-// side of the ticks.
-$graph->axis->SetLabelMargin(6);
-
-// Change fonts
-$graph->axis->SetFont(FF_ARIAL,FS_NORMAL,8);
-$graph->axis->SetAngleFont(FF_ARIAL,FS_NORMAL,8);
-
-// Setup axis title
-$graph->axis->SetTitle('Coverage (in meter)','middle');
-$graph->axis->title->SetFont(FF_FONT1,FS_BOLD);
-
-// Setup graph title
-$graph->title->Set('Polar plot #9');
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,16);
-$graph->title->SetColor('navy');
-
-// Setup tab title
-$graph->tabtitle->Set('Microphone #1');
-$graph->tabtitle->SetColor('brown:0.5','lightyellow');
-
-
-$p = new PolarPlot($data);
-$p->SetFillColor('lightblue@0.5');
-$p->mark->SetType(MARK_SQUARE);
-
-$graph->Add($p);
-
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/prepaccdata_example.php b/#jpgraph/src/Examples/prepaccdata_example.php
deleted file mode 100644
index 1f1fca31..00000000
--- a/#jpgraph/src/Examples/prepaccdata_example.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('../jpgraph.php');
-require_once ('../jpgraph_line.php');
-require_once ('../jpgraph_date.php');
-
-//Create some test data
-$xdata = array();
-$ydata = array();
-
-// Timestamps - 2h (=7200s) apart starting 
-$sampling = 7200;
-$n = 50; // data points
-for($i=0; $i < $n; ++$i ) {
-    $xdata[$i] = time() + $i * $sampling;
-    $ydata[0][$i] = rand(12,15);
-    $ydata[1][$i] = rand(100,155);
-    $ydata[2][$i] = rand(20,30);
-}
-
-function formatDate(&$aVal) {
-    $aVal = date('Y-m-d H:i',$aVal);
-}
-
-// Apply this format to all time values in the data to prepare it to be display
-array_walk($xdata,'formatDate');
-
-// Create the graph. 
-$graph  = new Graph(600, 350);
-$graph->title->Set('Accumulated values with specified X-axis scale');
-$graph->SetScale('textlin');
-
-// Setup margin color
-$graph->SetMarginColor('green@0.95');
-
-// Adjust the margin to make room for the X-labels
-$graph->SetMargin(40,30,40,120);
-
-// Turn the tick marks out from the plot area
-$graph->xaxis->SetTickSide(SIDE_BOTTOM);
-$graph->yaxis->SetTickSide(SIDE_LEFT);
-
-$p0 =new LinePlot($ydata[0]);
-$p0->SetFillColor('sandybrown');
-$p1 =new LinePlot($ydata[1]);
-$p1->SetFillColor('lightblue');
-$p2 =new LinePlot($ydata[2]);
-$p2->SetFillColor('red');
-$ap = new AccLinePlot(array($p0,$p1,$p2));
-
-$graph->xaxis->SetTickLabels($xdata);
-$graph->xaxis->SetTextLabelInterval(4);
-
-// Add the plot to the graph
-$graph->Add($ap);
-
-// Set the angle for the labels to 90 degrees
-$graph->xaxis->SetLabelAngle(90);
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/pushpinex1.php b/#jpgraph/src/Examples/pushpinex1.php
deleted file mode 100644
index 4b100988..00000000
--- a/#jpgraph/src/Examples/pushpinex1.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_scatter.php');
-
-DEFINE('WORLDMAP','worldmap1.jpg');
-
-function markCallback($y,$x) {
-    // Return array width
-    // width,color,fill color, marker filename, imgscale
-    // any value can be false, in that case the default value will
-    // be used.
-    // We only make one pushpin another color
-    if( $x == 54 ) 
-	return array(false,false,false,'red',0.8);
-    else
-	return array(false,false,false,'green',0.8);
-}
-
-// Data arrays
-$datax = array(10,20,30,40,54,60,70,80);
-$datay = array(12,23,65,18,84,28,86,44);
-
-// Setup the graph
-$graph = new Graph(400,270);
-
-// We add a small 1pixel left,right,bottom margin so the plot area
-// doesn't cover the frame around the graph.
-$graph->img->SetMargin(1,1,1,1);
-$graph->SetScale('linlin',0,100,0,100);
-
-// We don't want any axis to be shown
-$graph->xaxis->Hide();
-$graph->yaxis->Hide();
-
-// Use a worldmap as the background and let it fill the plot area
-$graph->SetBackgroundImage(WORLDMAP,BGIMG_FILLPLOT);
-
-// Setup a nice title with a striped bevel background
-$graph->title->Set("Pushpin graph");
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,16);
-$graph->title->SetColor('white');
-$graph->SetTitleBackground('darkgreen',TITLEBKG_STYLE1,TITLEBKG_FRAME_BEVEL);
-$graph->SetTitleBackgroundFillStyle(TITLEBKG_FILLSTYLE_HSTRIPED,'blue','darkgreen');
-
-// Finally create the scatterplot
-$sp = new ScatterPlot($datay,$datax);
-
-// We want the markers to be an image
-$sp->mark->SetType(MARK_IMG_PUSHPIN,'blue',0.6);
-
-// Install the Y-X callback for the markers
-$sp->mark->SetCallbackYX('markCallback');
-
-// ...  and add it to the graph
-$graph->Add($sp);    
-
-// .. and output to browser
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/pushpinex2.php b/#jpgraph/src/Examples/pushpinex2.php
deleted file mode 100644
index 000d1cc2..00000000
--- a/#jpgraph/src/Examples/pushpinex2.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-DEFINE('WORLDMAP','worldmap1.jpg');
-
-function markCallback($y,$x) {
-    // Return array width
-    // width,color,fill color, marker filename, imgscale
-    // any value can be false, in that case the default value will
-    // be used.
-    // We only make one pushpin another color
-    if( $x == 54 ) 
-	return array(false,false,false,'red',0.8);
-    else
-	return array(false,false,false,'green',0.8);
-}
-
-// Data arrays
-$datax = array(10,20,30,40,54,60,70,80);
-$datay = array(12,23,65,18,84,28,86,44);
-
-// Setup the graph
-$graph = new Graph(400,270);
-
-// We add a small 1pixel left,right,bottom margin so the plot area
-// doesn't cover the frame around the graph.
-$graph->img->SetMargin(1,1,1,1);
-$graph->SetScale('linlin',0,100,0,100);
-
-// We don't want any axis to be shown
-$graph->xaxis->Hide();
-$graph->yaxis->Hide();
-
-// Use a worldmap as the background and let it fill the plot area
-$graph->SetBackgroundImage(WORLDMAP,BGIMG_FILLPLOT);
-
-// Setup a nice title with a striped bevel background
-$graph->title->Set("Pushpin graph");
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,16);
-$graph->title->SetColor('white');
-$graph->SetTitleBackground('darkgreen',TITLEBKG_STYLE1,TITLEBKG_FRAME_BEVEL);
-$graph->SetTitleBackgroundFillStyle(TITLEBKG_FILLSTYLE_HSTRIPED,'blue','darkgreen');
-
-// Finally create the lineplot
-$lp = new LinePlot($datay,$datax);
-$lp->SetColor('lightgray');
-
-// We want the markers to be an image
-$lp->mark->SetType(MARK_IMG_PUSHPIN,'blue',0.6);
-
-// Install the Y-X callback for the markers
-$lp->mark->SetCallbackYX('markCallback');
-
-// ...  and add it to the graph
-$graph->Add($lp);    
-
-// .. and output to browser
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/qr-input.txt b/#jpgraph/src/Examples/qr-input.txt
deleted file mode 100644
index 1b3c2bcd..00000000
--- a/#jpgraph/src/Examples/qr-input.txt
+++ /dev/null
@@ -1 +0,0 @@
-01234567890
\ No newline at end of file
diff --git a/#jpgraph/src/Examples/qr_template.php b/#jpgraph/src/Examples/qr_template.php
deleted file mode 100644
index e54ea782..00000000
--- a/#jpgraph/src/Examples/qr_template.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-require_once ('jpgraph/QR/qrencoder.inc.php');
-
-// Data to be encoded
-$data         = 'ABCDEFGH01234567';
-
-// QR Code specification
-$version      = -1;  				// -1 = Let the library decide version (same as default)
-$corrlevel    = QRCapacity::ErrM;   // Medium erro correction
-$modulewidth  = 2;					// Module width
-$back         = BACKEND_IMAGE;		// Default backend
-$quiet		  = 4; 					// Same as default value
-
-// Create encoder and backend
-$encoder = new QREncoder($version, $corrlevel);
-$backend = QRCodeBackendFactory::Create($encoder, $back);
-
-// Set the module size
-$backend->SetModuleWidth($modulewidth);
-
-// Set Quiet zone (this should rarely need changing from the default)
-$backend->SetQuietZone($quiet);
-
-if( $back == BACKEND_IMAGE ) {
-
-	$backend->Stroke($data);
-}
-else {
-	$str = $backend->Stroke($data);
-	echo '<pre>'.$str.'</pre>';
-}
-?>
diff --git a/#jpgraph/src/Examples/qrexample0.php b/#jpgraph/src/Examples/qrexample0.php
deleted file mode 100644
index 46126fe7..00000000
--- a/#jpgraph/src/Examples/qrexample0.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-require_once ('jpgraph/QR/qrencoder.inc.php');
-
-// Data to be encoded
-$data = '01234567';
-
-// Create a new instance of the encoder and let the library
-// decide a suitable QR version and error level
-$encoder = new QREncoder(1);
-
-// Use the image backend (this is also the default)
-$backend = QRCodeBackendFactory::Create($encoder);
-
-try {
-	// 	. send the QR Code back to the browser
-    $backend->Stroke($data);
-} catch (Exception $e) {
-    $errstr = $e->GetMessage();
-    echo 'QR Code error: '.$e->GetMessage()."\n";
-    exit(1);
-}
-
-?>
\ No newline at end of file
diff --git a/#jpgraph/src/Examples/qrexample00.php b/#jpgraph/src/Examples/qrexample00.php
deleted file mode 100644
index f09fcd5d..00000000
--- a/#jpgraph/src/Examples/qrexample00.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-require_once ('jpgraph/QR/qrencoder.inc.php');
-
-// Data to be encoded
-$data = '01234567';
-
-// Create a new instance of the encoder and let the library
-// decide a suitable QR version and error level
-$e=new QREncoder();
-
-// Use the image backend (this is also the default)
-$b=QRCodeBackendFactory::Create($e);
-
-// .. send the barcode back to the browser for the data
-$b->Stroke($data);
-?>
\ No newline at end of file
diff --git a/#jpgraph/src/Examples/qrexample01.php b/#jpgraph/src/Examples/qrexample01.php
deleted file mode 100644
index af99deaf..00000000
--- a/#jpgraph/src/Examples/qrexample01.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-require_once ('jpgraph/QR/qrencoder.inc.php');
-
-// Data to be encoded
-$data = '01234567';
-
-// Create a new instance of the encoder and let the library
-// decide a suitable QR version and error level
-$encoder = new QREncoder();
-
-// Use the image backend
-$backend = QRCodeBackendFactory::Create($encoder, BACKEND_IMAGE);
-
-// Set the module size (quite big)
-$backend->SetModuleWidth(5);
-
-// .. send the barcode back to the browser for the data
-$backend->Stroke($data);
-?>
diff --git a/#jpgraph/src/Examples/qrexample02.php b/#jpgraph/src/Examples/qrexample02.php
deleted file mode 100644
index 890d616c..00000000
--- a/#jpgraph/src/Examples/qrexample02.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-    // Example 2 : QR Barcode with specified version
-
-    // Include the library
-    require_once ('jpgraph/QR/qrencoder.inc.php');
-
-    // Data to be encoded
-    $data = '01234567';
-    $version = 4;  // Use QR version 4
-
-    // Create a new instance of the encoder and let the library
-    // decide a suitable error level
-    $encoder = new QREncoder($version);
-
-    // Use the image backend
-    $backend = QRCodeBackendFactory::Create($encoder, BACKEND_IMAGE);
-
-    // Set the module size (quite big)
-    $backend->SetModuleWidth(5);
-
-    // .. send the barcode back to the browser for the data
-    $backend->Stroke($data);
-?>
diff --git a/#jpgraph/src/Examples/qrexample03.php b/#jpgraph/src/Examples/qrexample03.php
deleted file mode 100644
index 858eede3..00000000
--- a/#jpgraph/src/Examples/qrexample03.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-    // Example 3 : QR Barcode with specified version and stored to a file
-
-    // Include the library
-    require_once ('jpgraph/QR/qrencoder.inc.php');
-
-    // Data to be encoded
-    $data = '01234567';
-    $version = 3;  // Use QR version 3
-    $fileName = 'qrexample03.png';
-
-    // Create a new instance of the encoder and let the library
-    // decide a suitable error level
-    $encoder = new QREncoder($version);
-
-    // Use the image backend
-    $backend = QRCodeBackendFactory::Create($encoder, BACKEND_IMAGE);
-
-    // Set the module size (quite big)
-    $backend->SetModuleWidth(5);
-
-    // Store the barcode in the specifed file
-    $backend->Stroke($data,$fileName);
-    list($version,$errorcorrection) = $backend->GetQRInfo();
-
-    echo "QR Barcode, (<b>Version: $version-$errorcorrection</b>), image stored in file $fileName";
-?>
diff --git a/#jpgraph/src/Examples/qrexample03.png b/#jpgraph/src/Examples/qrexample03.png
deleted file mode 100644
index 091a1cc2..00000000
Binary files a/#jpgraph/src/Examples/qrexample03.png and /dev/null differ
diff --git a/#jpgraph/src/Examples/qrexample04.php b/#jpgraph/src/Examples/qrexample04.php
deleted file mode 100644
index c86447ae..00000000
--- a/#jpgraph/src/Examples/qrexample04.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-    // Example 4 : QR Barcode with specified version and error correction level
-
-    // Include the library
-    require_once ('jpgraph/QR/qrencoder.inc.php');
-
-    // Data to be encoded
-    $data = '01234567';
-    $version = 12;  // Use QR version 4
-    $corrlevel = QRCapacity::ErrH ; // Level H error correction (the highest possible)
-
-    // Create a new instance of the encoder using the specified
-    // QR version and error correction
-    $encoder = new QREncoder($version,$corrlevel);
-
-    // Use the image backend
-    $backend = QRCodeBackendFactory::Create($encoder, BACKEND_IMAGE);
-
-    // Set the module size
-    $backend->SetModuleWidth(3);
-
-    // Store the barcode in the specifed file
-    $backend->Stroke($data);
-?>
diff --git a/#jpgraph/src/Examples/qrexample05.php b/#jpgraph/src/Examples/qrexample05.php
deleted file mode 100644
index 96f5f47a..00000000
--- a/#jpgraph/src/Examples/qrexample05.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-    // Example 5 : QR Barcode with manually specified encodation
-
-    // Include the library
-    require_once ('jpgraph/QR/qrencoder.inc.php');
-
-    // Data to be encoded
-    // We want the data to be encoded using alphanumeric encoding even though
-    // it is only numbers
-    $data = array(
-        array(QREncoder::MODE_ALPHANUM,'01234567')
-    );
-
-    $version = 3;  // Use QR version 3
-    $corrlevel = QRCapacity::ErrH ; // Level H error correction (the highest possible)
-
-    // Create a new instance of the encoder using the specified
-    // QR version and error correction
-    $encoder = new QREncoder($version,$corrlevel);
-
-    // Use the image backend
-    $backend = QRCodeBackendFactory::Create($encoder, BACKEND_IMAGE);
-
-    // Set the module size
-    $backend->SetModuleWidth(4);
-
-    // Store the barcode in the specifed file
-    $backend->Stroke($data);
-?>
diff --git a/#jpgraph/src/Examples/qrexample06.php b/#jpgraph/src/Examples/qrexample06.php
deleted file mode 100644
index 046627f2..00000000
--- a/#jpgraph/src/Examples/qrexample06.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-    // Example 6 : QR Barcode with image in JPG format
-
-    // Include the library
-    require_once ('jpgraph/QR/qrencoder.inc.php');
-
-    $data      = 'ABCDEFGH01234567'; // Data to be encoded
-    $version   = -1;  // -1 = Let the library decide version (same as default)
-    $corrlevel = -1; // -1 = Let the library decide error correction level (same as default)
-
-    // Create a new instance of the encoder using the specified
-    // QR version and error correction
-    $encoder = new QREncoder($version,$corrlevel);
-
-    // Use the image backend
-    $backend=QRCodeBackendFactory::Create($encoder, BACKEND_IMAGE);
-
-    // Use JPEG format with 80% quality level
-    $backend->SetImgFormat('jpeg',80);
-
-    // Set the module size
-    $backend->SetModuleWidth(4);
-
-    // Store the barcode in the specifed file
-    $backend->Stroke($data);
-?>
diff --git a/#jpgraph/src/Examples/qrexample07.php b/#jpgraph/src/Examples/qrexample07.php
deleted file mode 100644
index 68dde156..00000000
--- a/#jpgraph/src/Examples/qrexample07.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-    // Example 7 : QR Barcode with multiple manually specified encodation schemas
-    // (Note: Normally there would be no need to ever use manually specified encodation)
-
-    // Include the library
-    require_once ('jpgraph/QR/qrencoder.inc.php');
-
-    // Data to be encoded
-    $data = array(
-        array(QREncoder::MODE_ALPHANUM,'01234567'),
-        array(QREncoder::MODE_NUMERIC,'89012345')
-    );
-
-    // Create a new instance of the encoder (automatically determined QR version and
-    // error correction level)
-    $encoder = new QREncoder();
-
-    // Use the image backend
-    $backend = QRCodeBackendFactory::Create($encoder, BACKEND_IMAGE);
-
-    // Set the module size
-    $backend->SetModuleWidth(4);
-
-    // Store the barcode in the specifed file
-    $backend->Stroke($data);
-?>
diff --git a/#jpgraph/src/Examples/qrexample08.php b/#jpgraph/src/Examples/qrexample08.php
deleted file mode 100644
index 08eb947b..00000000
--- a/#jpgraph/src/Examples/qrexample08.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-    // Example 8 : QR Barcode with data read from file
-
-    // Include the library
-    require_once ('jpgraph/jpgraph.php');
-    require_once ('jpgraph/QR/qrencoder.inc.php');
-
-    $readFromFilename = 'qr-input.txt';
-
-    // Create a new instance of the encoder and let the library
-    // decide a suitable QR version and error level
-    $encoder=new QREncoder();
-
-    // Use the image backend
-    $backend=QRCodeBackendFactory::Create($encoder, BACKEND_IMAGE);
-
-    // Set the module size (quite big)
-    $backend->SetModuleWidth(5);
-
-    // .. send the barcode back to the browser for the data in the file
-    $backend->StrokeFromFile($readFromFilename);
-?>
diff --git a/#jpgraph/src/Examples/qrexample09.php b/#jpgraph/src/Examples/qrexample09.php
deleted file mode 100644
index faa2a5de..00000000
--- a/#jpgraph/src/Examples/qrexample09.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-    // Example 9 : QR Barcode with data read from file and different colors
-
-    // Include the library
-    require_once ('jpgraph/jpgraph.php');
-    require_once ('jpgraph/QR/qrencoder.inc.php');
-
-    $readFromFilename = 'qr-input.txt';
-
-    // Create a new instance of the encoder and let the library
-    // decide a suitable QR version and error level
-    $encoder = new QREncoder();
-
-    // Use the image backend
-    $backend = QRCodeBackendFactory::Create($encoder, BACKEND_IMAGE);
-
-    // Set the module size (quite big)
-    $backend->SetModuleWidth(5);
-
-    // Use blue and white colors instead
-    $backend->SetColor('navy','white');
-
-    // .. send the barcode back to the browser for the data in the file
-    $backend->StrokeFromFile($readFromFilename);
-?>
diff --git a/#jpgraph/src/Examples/qrexample10.php b/#jpgraph/src/Examples/qrexample10.php
deleted file mode 100644
index 1232754a..00000000
--- a/#jpgraph/src/Examples/qrexample10.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-    // Example 10 : Specified error correction level
-
-    // Include the library
-    require_once ('jpgraph/QR/qrencoder.inc.php');
-
-    $data      = 'ABCDEFGH01234567'; // Data to be encoded
-    $version   = -1;  // -1 = Let the library decide version (same as default)
-    $corrlevel = QRCapacity::ErrH; // Error correction level H (Highest possible)
-
-    // Create a new instance of the encoder using the specified
-    // QR version and error correction
-    $encoder = new QREncoder($version,$corrlevel);
-
-    // Use the image backend
-    $backend = QRCodeBackendFactory::Create($encoder, BACKEND_IMAGE);
-
-    // Set the module size
-    $backend->SetModuleWidth(3);
-
-    // Set color
-    $backend->SetColor('brown','white');
-
-    // Store the barcode in the specifed file
-    $backend->Stroke($data);
-?>
diff --git a/#jpgraph/src/Examples/qrexample11.php b/#jpgraph/src/Examples/qrexample11.php
deleted file mode 100644
index 2f3e503e..00000000
--- a/#jpgraph/src/Examples/qrexample11.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-// Include the library
-require_once ('jpgraph/QR/qrencoder.inc.php');
-
-// Example 11 : Generate postscript output
-
-$data         = 'ABCDEFGH01234567'; // Data to be encoded
-$version      = -1;  // -1 = Let the library decide version (same as default)
-$corrlevel    = QRCapacity::ErrH; // Error correction level H (Highest possible)
-$modulewidth  = 3;
-
-// Create a new instance of the encoder using the specified
-// QR version and error correction
-$encoder = new QREncoder($version,$corrlevel);
-
-// Use the image backend
-$backend = QRCodeBackendFactory::Create($encoder, BACKEND_PS);
-
-// Set the module size
-$backend->SetModuleWidth($modulewidth);
-
-// Store the barcode in the specifed file
-$ps_str = $backend->Stroke($data);
-
-echo '<pre>'.$ps_str.'</pre>';
-?>
diff --git a/#jpgraph/src/Examples/qrexample12.php b/#jpgraph/src/Examples/qrexample12.php
deleted file mode 100644
index d1e09046..00000000
--- a/#jpgraph/src/Examples/qrexample12.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-// Include the library
-require_once ('jpgraph/QR/qrencoder.inc.php');
-
-// Example 11 : Generate postscript output
-
-$data         = 'ABCDEFGH01234567'; // Data to be encoded
-$version      = -1;  // -1 = Let the library decide version (same as default)
-$corrlevel    = QRCapacity::ErrH; // Error correction level H (Highest possible)
-$modulewidth  = 1;
-
-// Create a new instance of the encoder using the specified
-// QR version and error correction
-$encoder = new QREncoder($version,$corrlevel);
-
-// Use the image backend
-$backend = QRCodeBackendFactory::Create($encoder, BACKEND_ASCII);
-
-// Set the module size
-$backend->SetModuleWidth($modulewidth);
-
-// Store the barcode in the specifed file
-$ps_str = $backend->Stroke($data);
-
-echo '<pre>'.$ps_str.'</pre>';
-?>
diff --git a/#jpgraph/src/Examples/radar_csimex1.php b/#jpgraph/src/Examples/radar_csimex1.php
deleted file mode 100644
index 1f0454d8..00000000
--- a/#jpgraph/src/Examples/radar_csimex1.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_radar.php');
-
-$titles=array('Planning','Quality','Time','RR','CR','DR');
-$data=array(18, 40, 70, 90, 42, 66);
-
-$n = count($data);
-for( $i=0; $i < $n; ++$i ) {
-	$targets[$i] = "#$i";
-	$alts[$i] = "Data point #$i";
-}
-
-$graph = new RadarGraph (300,280);
-
-$graph->title->Set('Radar with marks');
-$graph->title->SetFont(FF_VERDANA,FS_BOLD,12);
-$graph->title->SetMargin(10);
-
-$graph->SetTitles($titles);
-$graph->SetCenter(0.5,0.55);
-$graph->HideTickMarks();
-$graph->SetColor('lightgreen@0.7');
-$graph->axis->SetColor('darkgray');
-$graph->grid->SetColor('darkgray');
-$graph->grid->Show();
-
-$graph->axis->title->SetFont(FF_ARIAL,FS_NORMAL,12);
-$graph->axis->title->SetMargin(5);
-$graph->SetGridDepth(DEPTH_BACK);
-$graph->SetSize(0.6);
-
-$plot = new RadarPlot($data);
-$plot->SetColor('red@0.2');
-$plot->SetLineWeight(2);
-$plot->SetFillColor('red@0.7');
-$plot->mark->SetType(MARK_IMG_DIAMOND,'red',0.6);
-$plot->mark->SetFillColor('darkred');
-$plot->SetCSIMTargets( $targets , $alts );
-
-$graph->Add($plot);
-$graph->StrokeCSIM();
-?>
diff --git a/#jpgraph/src/Examples/radarex1.php b/#jpgraph/src/Examples/radarex1.php
deleted file mode 100644
index a2103757..00000000
--- a/#jpgraph/src/Examples/radarex1.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_radar.php');
-require_once ('jpgraph/jpgraph_iconplot.php');
-
-// Some data to plot
-$data = array(55,80,46,71,95);
-
-// Create the graph and the plot
-$graph = new RadarGraph(250,200);
-$plot = new RadarPlot($data);
-
-// Add the plot and display the graph
-$graph->Add($plot);
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/radarex2.php b/#jpgraph/src/Examples/radarex2.php
deleted file mode 100644
index a1400a3f..00000000
--- a/#jpgraph/src/Examples/radarex2.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_radar.php');
-	
-// Some data to plot
-$data = array(55,80,46,71,95);
-	
-// Create the graph and the plot
-$graph = new RadarGraph(300,200);
-
-$graph->title->Set('Weekly goals');
-$graph->subtitle->Set('Year 2003');
-
-$plot = new RadarPlot($data);
-$plot->SetFillColor('lightred');
-$graph->SetSize(0.6);
-$graph->SetPos(0.5,0.6);
-// Add the plot and display the graph
-$graph->Add($plot);
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/radarex3.php b/#jpgraph/src/Examples/radarex3.php
deleted file mode 100644
index 18fdd902..00000000
--- a/#jpgraph/src/Examples/radarex3.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_radar.php');
-	
-// Some data to plot
-$data = array(55,80,46,71,95);
-	
-// Create the graph and the plot
-$graph = new RadarGraph(250,200);
-
-// Create the titles for the axis
-$titles = $gDateLocale->GetShortMonth();
-$graph->SetTitles($titles);
-
-$plot = new RadarPlot($data);
-$plot->SetFillColor('lightblue');
-
-// Add the plot and display the graph
-$graph->Add($plot);
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/radarex4.php b/#jpgraph/src/Examples/radarex4.php
deleted file mode 100644
index f64f6148..00000000
--- a/#jpgraph/src/Examples/radarex4.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_radar.php');
-
-// Some data to plot
-$data = array(55,80,26,31,95);
-
-// Create the graph and the plot
-$graph = new RadarGraph(250,200);
-
-// Add a drop shadow to the graph
-$graph->SetShadow();
-
-// Create the titles for the axis
-$titles = $gDateLocale->GetShortMonth();
-$graph->SetTitles($titles);
-
-// Add grid lines
-$graph->grid->Show();
-$graph->grid->SetLineStyle('dashed');
-
-$plot = new RadarPlot($data);
-$plot->SetFillColor('lightblue');
-
-// Add the plot and display the graph
-$graph->Add($plot);
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/radarex5.php b/#jpgraph/src/Examples/radarex5.php
deleted file mode 100644
index 6ee42aef..00000000
--- a/#jpgraph/src/Examples/radarex5.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_radar.php');
-	
-// Some data to plot
-$data = array(55,80,26,31,95);
-	
-// Create the graph and the plot
-$graph = new RadarGraph(250,200);
-
-// Create the titles for the axis
-$titles = $gDateLocale->GetShortMonth();
-$graph->SetTitles($titles);
-
-// Add grid lines
-$graph->grid->Show();
-$graph->grid->SetColor('darkred');
-$graph->grid->SetLineStyle('dotted');
-
-$plot = new RadarPlot($data);
-$plot->SetFillColor('lightblue');
-
-// Add the plot and display the graph
-$graph->Add($plot);
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/radarex6.1.php b/#jpgraph/src/Examples/radarex6.1.php
deleted file mode 100644
index e6f9a50e..00000000
--- a/#jpgraph/src/Examples/radarex6.1.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_radar.php');
-	
-// Some data to plot
-$data = array(55,80,26,31,95);
-$data2 = array(15,50,46,39,25);
-	
-// Create the graph and the plot
-$graph = new RadarGraph(250,200);
-
-// Add a drop shadow to the graph
-$graph->SetShadow();
-
-// Create the titles for the axis
-$titles = $gDateLocale->GetShortMonth();
-$graph->SetTitles($titles);
-$graph->SetColor('lightyellow');
-
-// ADjust the position to make more room
-// for the legend
-$graph->SetCenter(0.4,0.55);
-$graph->SetSize(0.6);
-
-// Add grid lines
-$graph->grid->Show();
-$graph->grid->SetColor('darkred');
-$graph->grid->SetLineStyle('dotted');
-
-$plot = new RadarPlot($data);
-$plot->SetFillColor('lightblue');
-$plot->SetLegend("QA results");
-
-$plot2 = new RadarPlot($data2);
-$plot2->SetLegend("Target");
-$plot2->SetColor('red');
-$plot2->SetFill(false);
-$plot2->SetLineWeight(2);
-
-
-// Add the plot and display the graph
-$graph->Add($plot);
-$graph->Add($plot2);
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/radarex6.php b/#jpgraph/src/Examples/radarex6.php
deleted file mode 100644
index d702f294..00000000
--- a/#jpgraph/src/Examples/radarex6.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_radar.php');
-
-// Some data to plot
-$data = array(55,80,26,31,95);
-
-// Create the graph and the plot
-$graph = new RadarGraph(250,200);
-
-// Add a drop shadow to the graph
-$graph->SetShadow();
-
-// Create the titles for the axis
-$titles = $gDateLocale->GetShortMonth();
-$graph->SetTitles($titles);
-$graph->SetColor('lightyellow');
-
-// ADjust the position to make more room
-// for the legend
-$graph->SetCenter(0.45,0.5);
-
-// Add grid lines
-$graph->grid->Show();
-$graph->grid->SetColor('darkred');
-$graph->grid->SetLineStyle('dashed');
-
-$plot = new RadarPlot($data);
-$plot->SetFillColor('lightblue');
-$plot->SetLegend("QA results");
-
-// Add the plot and display the graph
-$graph->Add($plot);
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/radarex7.php b/#jpgraph/src/Examples/radarex7.php
deleted file mode 100644
index cb44c208..00000000
--- a/#jpgraph/src/Examples/radarex7.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_radar.php');
-
-// Create the basic rtadar graph
-$graph = new RadarGraph(300,200);
-
-// Set background color and shadow
-$graph->SetColor("white");
-$graph->SetShadow();
-
-// Position the graph
-$graph->SetCenter(0.4,0.55);
-
-// Setup the axis formatting 	
-$graph->axis->SetFont(FF_FONT1,FS_BOLD);
-$graph->axis->SetWeight(2);
-
-// Setup the grid lines
-$graph->grid->SetLineStyle("longdashed");
-$graph->grid->SetColor("navy");
-$graph->grid->Show();
-$graph->HideTickMarks();
-		
-// Setup graph titles
-$graph->title->Set("Quality result");
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->SetTitles(array("One","Two","Three","Four","Five","Sex","Seven","Eight","Nine","Ten"));
-// Create the first radar plot		
-$plot = new RadarPlot(array(30,80,60,40,71,81,47));
-$plot->SetLegend("Goal");
-$plot->SetColor("red","lightred");
-$plot->SetFill(false);
-$plot->SetLineWeight(2);
-
-// Create the second radar plot
-$plot2 = new RadarPlot(array(70,40,30,80,31,51,14));
-$plot2->SetLegend("Actual");
-$plot2->SetColor("blue","lightred");
-
-// Add the plots to the graph
-$graph->Add($plot2);
-$graph->Add($plot);
-
-// And output the graph
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/radarex8.1.php b/#jpgraph/src/Examples/radarex8.1.php
deleted file mode 100644
index e1f1336b..00000000
--- a/#jpgraph/src/Examples/radarex8.1.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_radar.php');
-
-// Create the basic radar graph
-$graph = new RadarGraph(300,200);
-$graph->img->SetAntiAliasing();
-
-// Set background color and shadow
-$graph->SetColor("white");
-$graph->SetShadow();
-
-// Position the graph
-$graph->SetCenter(0.4,0.55);
-
-// Setup the axis formatting 	
-$graph->axis->SetFont(FF_FONT1,FS_BOLD);
-
-// Setup the grid lines
-$graph->grid->SetLineStyle("solid");
-$graph->grid->SetColor("navy");
-$graph->grid->Show();
-$graph->HideTickMarks();
-		
-// Setup graph titles
-$graph->title->Set("Quality result");
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-
-$graph->SetTitles($gDateLocale->GetShortMonth());
-
-// Create the first radar plot		
-$plot = new RadarPlot(array(70,80,60,90,71,81,47));
-$plot->SetLegend("Goal");
-$plot->SetColor("red","lightred");
-$plot->SetFill(false);
-$plot->SetLineWeight(2);
-
-// Create the second radar plot
-$plot2 = new RadarPlot(array(70,40,30,80,31,51,14));
-$plot2->SetLegend("Actual");
-$plot2->SetLineWeight(2);
-$plot2->SetColor("blue");
-$plot2->SetFill(false);
-
-// Add the plots to the graph
-$graph->Add($plot2);
-$graph->Add($plot);
-
-// And output the graph
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/radarex8.php b/#jpgraph/src/Examples/radarex8.php
deleted file mode 100644
index 0d6b0f87..00000000
--- a/#jpgraph/src/Examples/radarex8.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_radar.php');
-
-// Create the basic radar graph
-$graph = new RadarGraph(300,200);
-//$graph->img->SetAntiAliasing();
-
-// Set background color and shadow
-$graph->SetColor("white");
-$graph->SetShadow();
-
-// Position the graph
-$graph->SetCenter(0.4,0.55);
-
-// Setup the axis formatting 	
-$graph->axis->SetFont(FF_FONT1,FS_BOLD);
-
-// Setup the grid lines
-$graph->grid->SetLineStyle("solid");
-$graph->grid->SetColor("navy");
-$graph->grid->Show();
-$graph->HideTickMarks();
-		
-// Setup graph titles
-$graph->title->Set("Quality result");
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->SetTitles($gDateLocale->GetShortMonth());
-
-// Create the first radar plot		
-$plot = new RadarPlot(array(70,80,60,90,71,81,47));
-$plot->SetLegend("Goal");
-$plot->SetColor("red","lightred");
-$plot->SetFill(false);
-$plot->SetLineWeight(2);
-
-// Create the second radar plot
-$plot2 = new RadarPlot(array(70,40,30,80,31,51,14));
-$plot2->SetLegend("Actual");
-$plot2->SetLineWeight(2);
-$plot2->SetColor("blue");
-$plot2->SetFill(false);
-
-// Add the plots to the graph
-$graph->Add($plot2);
-$graph->Add($plot);
-
-// And output the graph
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/radarex9.php b/#jpgraph/src/Examples/radarex9.php
deleted file mode 100644
index 465ca262..00000000
--- a/#jpgraph/src/Examples/radarex9.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php'); 
-require_once ('jpgraph/jpgraph_radar.php');
-
-$titles=array("N", '', "NW", '', "W", '', "SW", '', 'S', '', "SE", '', "E", '', "NE", '');
-$data=array(0, 0, 8, 10, 70, 90, 42, 0, 70, 60, 50, 40, 30, 40, 37.8, 72);
-
-$graph = new RadarGraph (250,270); 
-
-$graph->title->Set("Accumulated PPM");
-$graph->title->SetFont(FF_VERDANA,FS_NORMAL,12);
-
-$graph->subtitle->Set("(according to direction)");
-$graph->subtitle->SetFont(FF_VERDANA,FS_ITALIC,10);
-
-
-$graph->SetTitles($titles);
-$graph->SetCenter(0.5,0.55);
-$graph->HideTickMarks(); 
-$graph->SetColor('lightyellow');
-$graph->axis->SetColor('darkgray@0.3'); 
-$graph->grid->SetColor('darkgray@0.3');
-$graph->grid->Show();
-
-$graph->SetGridDepth(DEPTH_BACK);
-
-$plot = new RadarPlot($data);
-$plot->SetColor('red@0.2');
-$plot->SetLineWeight(1);
-$plot->SetFillColor('red@0.7');
-$graph->Add($plot);
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/radarlogex1-aa.php b/#jpgraph/src/Examples/radarlogex1-aa.php
deleted file mode 100644
index 8417fb76..00000000
--- a/#jpgraph/src/Examples/radarlogex1-aa.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_log.php');
-require_once ('jpgraph/jpgraph_radar.php');
-
-// Some data to plot
-$data = array(242,58,1500,12,1397,810,373);
-$data2 = array(447,176,1472,191,1616,42,46);
-
-// Create the graph
-$graph = new RadarGraph(300,350);
-
-// Use logarithmic scale (If you don't use any SetScale()
-// the radar graph will default to linear scale
-$graph->SetScale('log');
-
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,16);
-$graph->title->Set('Logarithmic scale');
-$graph->title->SetMargin(10);
-
-// Make the radar graph fill out it's bounding box
-$graph->SetPlotSize(0.8);
-$graph->SetCenter(0.5,0.55);
-
-// Note: Enabling this results in a very noticable slow
-// down of the image generation! And more load on your
-// server.
-$graph->img->SetAntiAliasing();
-
-// Uncomment the following line if you want to supress
-// minor tick marks
-//$graph->yscale->ticks->SupressMinorTickMarks();
-
-// We want the major tick marks to be black and minor
-// slightly less noticable
-$graph->yscale->ticks->SetMarkColor('black','darkgray');
-
-// Set the axis title font
-$graph->axis->title->SetFont(FF_ARIAL,FS_BOLD,14);
-$graph->axis->title->SetColor('darkred:0.8');
-
-// Use blue axis
-$graph->axis->SetColor('blue');
-
-$plot = new RadarPlot($data);
-$plot->SetLineWeight(1);
-$plot->SetColor('forestgreen');
-$plot->SetFillColor('forestgreen@0.9');
-
-$plot2 = new RadarPlot($data2);
-$plot2->SetLineWeight(2);
-$plot2->SetColor('red');
-$plot2->SetFillColor('red@0.9');
-
-// Add the plot and display the graph
-$graph->Add($plot);
-$graph->Add($plot2);
-$graph->Stroke();
-?>
-
diff --git a/#jpgraph/src/Examples/radarlogex1.php b/#jpgraph/src/Examples/radarlogex1.php
deleted file mode 100644
index 2d08310e..00000000
--- a/#jpgraph/src/Examples/radarlogex1.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_log.php');
-require_once ('jpgraph/jpgraph_radar.php');
-
-// Some data to plot
-$data = array(242,58,1500,12,1397,810,373);
-$data2 = array(447,176,1472,191,1616,42,46);
-
-// Create the graph
-$graph = new RadarGraph(300,350);
-
-// Use logarithmic scale (If you don't use any SetScale()
-// the radar graph will default to linear scale
-$graph->SetScale('log');
-
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,16);
-$graph->title->Set('Logarithmic scale');
-$graph->title->SetMargin(10);
-
-// Make the radar graph fill out it's bounding box
-$graph->SetPlotSize(0.8);
-$graph->SetCenter(0.5,0.55);
-
-// Uncomment the following line if you want to supress
-// minor tick marks
-//$graph->yscale->ticks->SupressMinorTickMarks();
-
-// We want the major tick marks to be black and minor
-// slightly less noticable
-$graph->yscale->ticks->SetMarkColor('black','darkgray');
-
-// Set the axis title font
-$graph->axis->title->SetFont(FF_ARIAL,FS_BOLD,14);
-$graph->axis->title->SetColor('darkred:0.8');
-
-// Use blue axis
-$graph->axis->SetColor('blue');
-
-$plot = new RadarPlot($data);
-$plot->SetLineWeight(1);
-$plot->SetColor('forestgreen');
-$plot->SetFillColor('forestgreen@0.9');
-
-$plot2 = new RadarPlot($data2);
-$plot2->SetLineWeight(2);
-$plot2->SetColor('red');
-$plot2->SetFillColor('red@0.9');
-
-// Add the plot and display the graph
-$graph->Add($plot);
-$graph->Add($plot2);
-$graph->Stroke();
-?>
-
diff --git a/#jpgraph/src/Examples/radarlogex2.php b/#jpgraph/src/Examples/radarlogex2.php
deleted file mode 100644
index f347141c..00000000
--- a/#jpgraph/src/Examples/radarlogex2.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_log.php');
-require_once ('jpgraph/jpgraph_radar.php');
-
-// Some data to plot
-$data = array(242,58,500,12,397,810,373);
-
-// Create the graph
-$graph = new RadarGraph(200,200);
-
-// Uncomment the following line to use anti-aliasing 
-// Note: Enabling this results in a very noticable slow
-// down of the image generation! And more load on your
-// server. Use it wisly!!
-$graph->img->SetAntiAliasing();
-
-// Make the spider graph fill out it's bounding box
-$graph->SetPlotSize(0.85);
-
-// Use logarithmic scale (If you don't use any SetScale()
-// the spider graph will default to linear scale
-$graph->SetScale("log");
-
-// Uncomment the following line if you want to supress
-// minor tick marks
-// $graph->yscale->ticks->SupressMinorTickMarks();
-
-// We want the major tick marks to be black and minor
-// slightly less noticable
-$graph->yscale->ticks->SetMarkColor("black","darkgray");
-
-// Set the axis title font 
-$graph->axis->title->SetFont(FF_ARIAL,FS_BOLD,12);
-
-// Use blue axis
-$graph->axis->SetColor("blue");
-
-$plot = new RadarPlot($data);
-$plot->SetLineWeight(2);
-$plot->SetColor('forestgreen');
-
-// Add the plot and display the graph
-$graph->Add($plot);
-$graph->Stroke();
-?>
-
diff --git a/#jpgraph/src/Examples/radarmarkex1.php b/#jpgraph/src/Examples/radarmarkex1.php
deleted file mode 100644
index f5595e8a..00000000
--- a/#jpgraph/src/Examples/radarmarkex1.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_radar.php');
-
-$titles=array('Planning','Quality','Time','RR','CR','DR');
-$data=array(18, 40, 70, 90, 42,66);
-
-$graph = new RadarGraph (300,280);
-
-$graph->title->Set('Radar with marks');
-$graph->title->SetFont(FF_VERDANA,FS_NORMAL,12);
-
-$graph->SetTitles($titles);
-$graph->SetCenter(0.5,0.55);
-$graph->HideTickMarks();
-$graph->SetColor('lightgreen@0.7');
-$graph->axis->SetColor('darkgray');
-$graph->grid->SetColor('darkgray');
-$graph->grid->Show();
-
-$graph->axis->title->SetFont(FF_ARIAL,FS_NORMAL,12);
-$graph->axis->title->SetMargin(5);
-$graph->SetGridDepth(DEPTH_BACK);
-$graph->SetSize(0.6);
-
-$plot = new RadarPlot($data);
-$plot->SetColor('red@0.2');
-$plot->SetLineWeight(1);
-$plot->SetFillColor('red@0.7');
-
-$plot->mark->SetType(MARK_IMG_SBALL,'red');
-
-$graph->Add($plot);
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/rose.gif b/#jpgraph/src/Examples/rose.gif
deleted file mode 100644
index 59fe6319..00000000
Binary files a/#jpgraph/src/Examples/rose.gif and /dev/null differ
diff --git a/#jpgraph/src/Examples/rose_example.php b/#jpgraph/src/Examples/rose_example.php
deleted file mode 100644
index 7d3d7c57..00000000
--- a/#jpgraph/src/Examples/rose_example.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$theme = isset($_GET['theme']) ? $_GET['theme'] : null;
-
-$data = array (
-  0 => array (0 => 79, 1 => -25, 2 => -7, 3 => 85, 4 => -26, 5 => -32, ),
-  1 => array (0 => 76, 1 => 51, 2 => 86, 3 => 12, 4 => -7, 5 => 94, ),
-  2 => array (0 => 49, 1 => 38, 2 => 7, 3 => -40, 4 => 9, 5 => -7, ),
-  3 => array ( 0 => 69, 1 => 96, 2 => 49, 3 => 7, 4 => 92, 5 => -38, ),
-  4 => array ( 0 => 68, 1 => 16, 2 => 82, 3 => -49, 4 => 50, 5 => 7, ),
-  5 => array ( 0 => -37, 1 => 28, 2 => 32, 3 => 6, 4 => 13, 5 => 57, ),
-  6 => array ( 0 => 24, 1 => -11, 2 => 7, 3 => 10, 4 => 51, 5 => 51, ),
-  7 => array ( 0 => 3, 1 => -1, 2 => -12, 3 => 61, 4 => 10, 5 => 47, ),
-  8 => array ( 0 => -47, 1 => -21, 2 => 43, 3 => 53, 4 => 36, 5 => 34, ),
-);
-
-// Create the graph. These two calls are always required
-$graph = new Graph(400,300);    
-
-$graph->SetScale("textlin");
-if ($theme) {
-  $graph->SetTheme(new $theme());
-}
-$theme_class = new RoseTheme;
-$graph->SetTheme($theme_class);
-
-$plot = array();
-// Create the bar plots
-for ($i = 0; $i < 4; $i++) {
-  $plot[$i] = new BarPlot($data[$i]);
-  $plot[$i]->SetLegend('plot'.($i+1));
-}
-//$acc1 = new AccBarPlot(array($plot[0], $plot[1]));
-//$acc1->value->Show();
-$gbplot = new GroupBarPlot(array($plot[2], $plot[1] ));
-
-for ($i = 4; $i < 8; $i++) {
-  $plot[$i] = new LinePlot($data[$i]);
-  $plot[$i]->SetLegend('plot'.$i);
-  $plot[$i]->value->Show();
-}
-
-$graph->Add($gbplot);
-$graph->Add($plot[4]);
-
-$title = "RoseTheme Example";
-$title = mb_convert_encoding($title,'UTF-8');
-$graph->title->Set($title);
-$graph->xaxis->title->Set("X-title");
-$graph->yaxis->title->Set("Y-title");
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/rotateex1.php b/#jpgraph/src/Examples/rotateex1.php
deleted file mode 100644
index a90a6003..00000000
--- a/#jpgraph/src/Examples/rotateex1.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$ydata = array(11,3,8,12,5,1,9,13,5,7);
-$y2data = array(354,200,265,99,111,91,198,225,293,251);
-
-$graph = new Graph(350,300);	
-$graph->SetAngle(40);
-$graph->img->SetMargin(80,80,80,80);
-$graph->SetScale("textlin");
-$graph->SetY2Scale("lin");
-$graph->SetShadow();
-
-// Create the linear plot
-$lineplot=new LinePlot($ydata);
-$lineplot2=new LinePlot($y2data);
-
-// Add the plot to the graph
-$graph->Add($lineplot);
-$graph->AddY2($lineplot2);
-$lineplot2->SetColor("orange");
-$lineplot2->SetWeight(2);
-$graph->y2axis->SetColor("orange");
-
-$graph->title->Set("Example 1 rotated graph (40 degree)");
-$graph->legend->Pos(0.05,0.1,"right","top");
-
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD);
-
-$lineplot->SetColor("blue");
-$lineplot->SetWeight(2);
-
-$lineplot2->SetColor("orange");
-$lineplot2->SetWeight(2);
-
-$graph->yaxis->SetColor("blue");
-
-$lineplot->SetLegend("Plot 1");
-$lineplot2->SetLegend("Plot 2");
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/rotex0.php b/#jpgraph/src/Examples/rotex0.php
deleted file mode 100644
index 83d26bb8..00000000
--- a/#jpgraph/src/Examples/rotex0.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$ydata = array(12,17,22,19,5,15);
-
-$graph = new Graph(270,170);
-$graph->SetMargin(30,90,30,30);
-$graph->SetScale("textlin");
-
-$line = new LinePlot($ydata);
-$line->SetLegend('2002');
-$line->SetColor('darkred');
-$line->SetWeight(2);
-$graph->Add($line);
-
-// Output graph
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/rotex1.php b/#jpgraph/src/Examples/rotex1.php
deleted file mode 100644
index f087b98e..00000000
--- a/#jpgraph/src/Examples/rotex1.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$ydata = array(12,17,22,19,5,15);
-
-$graph = new Graph(270,170);
-$graph->SetMargin(30,90,30,30);
-$graph->SetScale("textlin");
-
-$graph->img->SetAngle(45);
-
-$line = new LinePlot($ydata);
-$line->SetLegend('2002');
-$line->SetColor('darkred');
-$line->SetWeight(2);
-$graph->Add($line);
-
-// Output graph
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/rotex2.php b/#jpgraph/src/Examples/rotex2.php
deleted file mode 100644
index bfdea5a7..00000000
--- a/#jpgraph/src/Examples/rotex2.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$ydata = array(12,17,22,19,5,15);
-
-$graph = new Graph(270,170);
-$graph->SetMargin(30,90,30,30);
-$graph->SetScale("textlin");
-
-$graph->img->SetAngle(90);
-
-$line = new LinePlot($ydata);
-$line->SetLegend('2002');
-$line->SetColor('darkred');
-$line->SetWeight(2);
-$graph->Add($line);
-
-// Output graph
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/rotex3.php b/#jpgraph/src/Examples/rotex3.php
deleted file mode 100644
index 3a0a03d4..00000000
--- a/#jpgraph/src/Examples/rotex3.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$ydata = array(12,17,22,19,5,15);
-
-$graph = new Graph(270,170);
-$graph->SetMargin(30,90,30,30);
-$graph->SetScale("textlin");
-
-$graph->img->SetAngle(45);
-$graph->img->SetCenter(floor(270/2),floor(170/2));
-
-$line = new LinePlot($ydata);
-$line->SetLegend('2002');
-$line->SetColor('darkred');
-$line->SetWeight(2);
-$graph->Add($line);
-
-// Output graph
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/rotex4.php b/#jpgraph/src/Examples/rotex4.php
deleted file mode 100644
index 9c01a7b2..00000000
--- a/#jpgraph/src/Examples/rotex4.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$ydata = array(12,17,22,19,5,15);
-
-$graph = new Graph(270,170);
-$graph->SetMargin(30,90,30,30);
-$graph->SetScale("textlin");
-
-$graph->img->SetAngle(90);
-$graph->img->SetCenter(floor(270/2),floor(170/2));
-
-$line = new LinePlot($ydata);
-$line->SetLegend('2002');
-$line->SetColor('darkred');
-$line->SetWeight(2);
-$graph->Add($line);
-
-// Output graph
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/rotex5.php b/#jpgraph/src/Examples/rotex5.php
deleted file mode 100644
index bdf0d93f..00000000
--- a/#jpgraph/src/Examples/rotex5.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$ydata = array(12,17,22,19,5,15);
-
-$graph = new Graph(270,170);
-$graph->SetMargin(30,90,30,30);
-$graph->SetScale("textlin");
-
-$graph->img->SetAngle(-30);
-$graph->img->SetCenter(30,170-30);
-
-$line = new LinePlot($ydata);
-$line->SetLegend('2002');
-$line->SetColor('darkred');
-$line->SetWeight(2);
-$graph->Add($line);
-
-// Output graph
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/saab_95.jpg b/#jpgraph/src/Examples/saab_95.jpg
deleted file mode 100644
index 189b0d48..00000000
Binary files a/#jpgraph/src/Examples/saab_95.jpg and /dev/null differ
diff --git a/#jpgraph/src/Examples/scatter_csimex1.php b/#jpgraph/src/Examples/scatter_csimex1.php
deleted file mode 100644
index 2ab4306d..00000000
--- a/#jpgraph/src/Examples/scatter_csimex1.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_scatter.php');
-
-// Some data for the points
-$datax = array(3.5,13.7,3,4,6.2,6,3.5,8,14,8,11.1,13.7);
-$datay = array(10,22,12,13,17,20,16,19,30,31,40,43);
-
-// A new scatter graph
-$graph = new Graph(300,200,'auto');
-$graph->SetShadow();
-$graph->SetScale("linlin");
-
-//$graph->img->SetMargin(40,40,40,40);		
-
-$graph->title->Set("Scatter plot with Image Map");
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-
-// Client side image map targets
-$targ=array("pie_csimex1.php#1","pie_csimex1.php#2","pie_csimex1.php#3",
-"pie_csimex1.php#4","pie_csimex1.php#5","pie_csimex1.php#6",
-"pie_csimex1.php#7","pie_csimex1.php#8","pie_csimex1.php#9" );
-
-// Strings to put as "alts" (and "title" value)
-$alts=array("val=%d","val=%d","val=%d","val=%d","val=%d","val=%d","val=%d","val=%d","val=%d");
-
-// Create a new scatter plot
-$sp1 = new ScatterPlot($datay,$datax);
-
-// Use diamonds as markerss
-$sp1->mark->SetType(MARK_DIAMOND);
-$sp1->mark->SetWidth(10);
-
-// Set the scatter plot image map targets
-$sp1->SetCSIMTargets($targ,$alts);
-
-// Add the plot
-$graph->Add($sp1);
-
-// Send back the HTML page which will call this script again
-// to retrieve the image.
-$graph->StrokeCSIM();
-
-?>
diff --git a/#jpgraph/src/Examples/scatterex1.php b/#jpgraph/src/Examples/scatterex1.php
deleted file mode 100644
index 83d830b8..00000000
--- a/#jpgraph/src/Examples/scatterex1.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_scatter.php');
-
-$datax = array(3.5,3.7,3,4,6.2,6,3.5,8,14,8,11.1,13.7);
-$datay = array(20,22,12,13,17,20,16,19,30,31,40,43);
-
-$graph = new Graph(300,200);
-$graph->SetScale("linlin");
-
-$graph->img->SetMargin(40,40,40,40);		
-$graph->SetShadow();
-
-$graph->title->Set("A simple scatter plot");
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-
-$sp1 = new ScatterPlot($datay,$datax);
-
-$graph->Add($sp1);
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/scatterex2.php b/#jpgraph/src/Examples/scatterex2.php
deleted file mode 100644
index ff2b847d..00000000
--- a/#jpgraph/src/Examples/scatterex2.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_scatter.php');
-
-$datax = array(3.5,3.7,3,4,6.2,6,3.5,8,14,8,11.1,13.7);
-$datay = array(20,22,12,13,17,20,16,19,30,31,40,43);
-
-$graph = new Graph(300,200);
-$graph->SetScale("linlin");
-
-$graph->img->SetMargin(40,40,40,40);		
-$graph->SetShadow();
-
-$graph->title->Set("A simple scatter plot");
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-
-$sp1 = new ScatterPlot($datay,$datax);
-$sp1->mark->SetType(MARK_FILLEDCIRCLE);
-$sp1->mark->SetFillColor("red");
-$sp1->mark->SetWidth(8);
-
-$graph->Add($sp1);
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/scatterlinkex1.php b/#jpgraph/src/Examples/scatterlinkex1.php
deleted file mode 100644
index 2f2d1bdd..00000000
--- a/#jpgraph/src/Examples/scatterlinkex1.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_scatter.php');
-
-$datax = array(3.5,3.7,3,4,6.2,6,3.5,8,14,8,11.1,13.7);
-$datay = array(20,22,12,13,17,20,16,19,30,31,40,43);
-$graph = new Graph(300,200);
-$graph->img->SetMargin(40,40,40,40);	
-$graph->img->SetAntiAliasing();
-$graph->SetScale("linlin");
-$graph->SetShadow();
-$graph->title->Set("Linked Scatter plot ex1");
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-
-$sp1 = new ScatterPlot($datay,$datax);
-$sp1->SetLinkPoints(true,"red",2);
-$sp1->mark->SetType(MARK_FILLEDCIRCLE);
-$sp1->mark->SetFillColor("navy");
-$sp1->mark->SetWidth(3);
-
-$graph->Add($sp1);
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/scatterlinkex2.php b/#jpgraph/src/Examples/scatterlinkex2.php
deleted file mode 100644
index f45f1ec3..00000000
--- a/#jpgraph/src/Examples/scatterlinkex2.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_scatter.php');
-
-
-// Make a circle with a scatterplot
-$steps=16;
-for($i=0; $i<$steps; ++$i) {
-	$a=2*M_PI/$steps*$i;
-	$datax[$i]=cos($a);
-	$datay[$i]=sin($a);
-}
-
-
-$graph = new Graph(300,200);
-$graph->SetScale("linlin");
-
-$graph->img->SetMargin(40,40,40,40);		
-
-$graph->SetShadow();
-$graph->title->Set("Linked scatter plot");
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-
-// 10% top and bottom grace
-$graph->yscale->SetGrace(5,5);
-$graph->xscale->SetGrace(1,1);
-
-$sp1 = new ScatterPlot($datay,$datax);
-$sp1->mark->SetType(MARK_FILLEDCIRCLE);
-$sp1->mark->SetFillColor("red");
-$sp1->SetColor("blue");
-
-//$sp1->SetWeight(3);
-$sp1->mark->SetWidth(4);
-$sp1->SetLinkPoints();
-
-$graph->Add($sp1);
-
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/scatterlinkex3.php b/#jpgraph/src/Examples/scatterlinkex3.php
deleted file mode 100644
index aef51508..00000000
--- a/#jpgraph/src/Examples/scatterlinkex3.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_scatter.php');
-
-
-// Make a circle with a scatterplot
-$steps=16;
-for($i=0; $i<$steps; ++$i) {
-	$a=2*M_PI/$steps*$i;
-	$datax[$i]=cos($a);
-	$datay[$i]=sin($a);
-}
-
-$graph = new Graph(350,230);
-$graph->SetScale('linlin');
-$graph->SetShadow();
-$graph->SetAxisStyle(AXSTYLE_BOXOUT);
-
-$graph->img->SetMargin(50,50,60,40);
-
-$graph->title->Set('Linked scatter plot');
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->subtitle->Set('(BOXOUT Axis style)');
-$graph->subtitle->SetFont(FF_FONT1,FS_NORMAL);
-
-
-// 10% top and bottom grace
-$graph->yscale->SetGrace(5,5);
-$graph->xscale->SetGrace(1,1);
-
-$sp1 = new ScatterPlot($datay,$datax);
-$sp1->mark->SetType(MARK_FILLEDCIRCLE);
-$sp1->mark->SetFillColor('red');
-$sp1->SetColor('blue');
-
-$sp1->mark->SetWidth(4);
-$sp1->link->Show();
-$sp1->link->SetStyle('dotted');
-
-$graph->Add($sp1);
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/scatterlinkex4.php b/#jpgraph/src/Examples/scatterlinkex4.php
deleted file mode 100644
index 63659e0e..00000000
--- a/#jpgraph/src/Examples/scatterlinkex4.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_scatter.php');
-
-// Make a circle with a scatterplot
-$steps=16;
-for($i=0; $i<$steps; ++$i) {
-	$a=2*M_PI/$steps*$i;
-	$datax[$i]=cos($a);
-	$datay[$i]=sin($a);
-}
-
-$graph = new Graph(350,230);
-$graph->SetScale('linlin');
-$graph->SetShadow();
-$graph->SetAxisStyle(AXSTYLE_BOXIN);
-
-$graph->img->SetMargin(50,50,60,40);
-
-$graph->title->Set('Linked scatter plot');
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->subtitle->Set('(BOXIN Axis style)');
-$graph->subtitle->SetFont(FF_FONT1,FS_NORMAL);
-
-// 10% top and bottom grace
-$graph->yscale->SetGrace(5,5);
-$graph->xscale->SetGrace(1,1);
-
-$sp1 = new ScatterPlot($datay,$datax);
-$sp1->mark->SetType(MARK_FILLEDCIRCLE);
-$sp1->mark->SetFillColor('red');
-$sp1->SetColor('blue');
-
-$sp1->mark->SetWidth(4);
-$sp1->link->Show();
-$sp1->link->SetWeight(2);
-$sp1->link->SetColor('red@0.7');
-
-
-$graph->Add($sp1);
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/scatterrotex1.php b/#jpgraph/src/Examples/scatterrotex1.php
deleted file mode 100644
index 6d67e5b1..00000000
--- a/#jpgraph/src/Examples/scatterrotex1.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_scatter.php');
-
-$datax = array(3.5,3.7,3,4,6.2,6,3.5,8,14,8,11.1,13.7);
-$datay = array(20,22,12,13,17,20,16,19,30,31,40,43);
-
-$graph = new Graph(300,200);
-$graph->SetScale("linlin");
-
-$graph->Set90AndMargin(40,40,40,40);		
-$graph->SetShadow();
-
-$graph->title->Set("A 90 degrees rotated scatter plot");
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-
-// Adjust the label align for X-axis so they look good rotated
-$graph->xaxis->SetLabelAlign('right','center','right');
-
-// Adjust the label align for Y-axis so they look good rotated
-$graph->yaxis->SetLabelAlign('center','bottom');
-
-$graph->xaxis->SetTitle('X-Axis title','low');
-$graph->xaxis->title->SetAngle(90);
-$graph->xaxis->title->SetMargin(15);
-
-$sp1 = new ScatterPlot($datay,$datax);
-$sp1->mark->SetType(MARK_FILLEDCIRCLE);
-$sp1->mark->SetFillColor("red");
-$sp1->mark->SetWidth(5);
-
-$graph->Add($sp1);
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/show-example.php b/#jpgraph/src/Examples/show-example.php
deleted file mode 100644
index b95ac274..00000000
--- a/#jpgraph/src/Examples/show-example.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php $target = urldecode($_GET['target']); ?>
-<!doctype html public "-//W3C//DTD HTML 4.0 Frameset//EN">
-<html>
-<head>
-<title> Test suite for JpGraph - <?php echo $target; ?></title>
-<script type="text/javascript" language="javascript">
-<!--
-function resize()
-{
-	return true;
-}
-//-->
-</script>
-</head>
-<frameset rows="*,*" onLoad="resize()">
-	<?php 
-	if( !strstr($target,"csim") )
-		echo "<frame src=\"show-image.php?target=".basename($target)."\" name=\"image\">";
-	else
-		echo	"<frame src=\"".basename($target)."\" name=\"image\">";
-	?>
-	<frame src="show-source.php?target=<?php echo basename($target); ?>" name="source">
-</frameset>
-</html>
diff --git a/#jpgraph/src/Examples/show-image.php b/#jpgraph/src/Examples/show-image.php
deleted file mode 100644
index 85a987cd..00000000
--- a/#jpgraph/src/Examples/show-image.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php $target =  urldecode($_GET['target']); ?>
-<!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<title> Image <?php echo basename($target); ?></title>
-</head>
-<body>
-<img src="<?php echo basename($target); ?>" border=0 alt="<?php echo basename($target); ?>" align="left">
-</body>
-</html>
diff --git a/#jpgraph/src/Examples/show-source.php b/#jpgraph/src/Examples/show-source.php
deleted file mode 100644
index 248f2dee..00000000
--- a/#jpgraph/src/Examples/show-source.php
+++ /dev/null
@@ -1 +0,0 @@
-<?php highlight_file(basename(urldecode($_GET['target']))); ?>
diff --git a/#jpgraph/src/Examples/smallstaticbandsex1.php b/#jpgraph/src/Examples/smallstaticbandsex1.php
deleted file mode 100644
index c78fc8bc..00000000
--- a/#jpgraph/src/Examples/smallstaticbandsex1.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// Illustration of the different patterns for bands
-// $Id: smallstaticbandsex1.php,v 1.1 2002/09/01 21:51:08 aditus Exp $
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-$datay=array(10,29,3,6);
-
-// Create the graph. 
-$graph = new Graph(200,150);	
-$graph->SetScale("textlin");
-$graph->SetMargin(25,10,20,20);
-
-// Add 10% grace ("space") at top and botton of Y-scale. 
-$graph->yscale->SetGrace(10);
-
-// Create a bar pot
-$bplot = new BarPlot($datay);
-$bplot->SetFillColor("lightblue");
-
-// Position the X-axis at the bottom of the plotare
-$graph->xaxis->SetPos("min");
-
-$graph->ygrid->Show(false);
-
-// .. and add the plot to the graph
-$graph->Add($bplot);
-
-// Add band
-$band = new PlotBand(HORIZONTAL,BAND_RDIAG,15,35,'khaki4');
-$band->ShowFrame(false);
-$graph->Add($band);
-
-// Set title
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,10);
-$graph->title->SetColor('darkred');
-$graph->title->Set('BAND_RDIAG');
-
-
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/smallstaticbandsex10.php b/#jpgraph/src/Examples/smallstaticbandsex10.php
deleted file mode 100644
index 88a091ca..00000000
--- a/#jpgraph/src/Examples/smallstaticbandsex10.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// Illustration of the different patterns for bands
-// $Id: smallstaticbandsex10.php,v 1.1 2002/09/01 21:51:08 aditus Exp $
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-$datay=array(10,29,3,6);
-
-// Create the graph. 
-$graph = new Graph(200,150);	
-$graph->SetScale("textlin");
-$graph->SetMargin(25,10,20,20);
-
-// Add 10% grace ("space") at top and botton of Y-scale. 
-$graph->yscale->SetGrace(10);
-
-// Create a bar pot
-$bplot = new BarPlot($datay);
-$bplot->SetFillColor("lightblue");
-
-// Position the X-axis at the bottom of the plotare
-$graph->xaxis->SetPos("min");
-
-$graph->ygrid->Show(false);
-
-// .. and add the plot to the graph
-$graph->Add($bplot);
-
-// Add band
-$band = new PlotBand(HORIZONTAL,BAND_DIAGCROSS,15,35,'khaki4');
-$band->ShowFrame(false);
-$graph->Add($band);
-
-// Set title
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,10);
-$graph->title->SetColor('darkred');
-$graph->title->Set('BAND_DIAGCROSS');
-
-
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/smallstaticbandsex11.php b/#jpgraph/src/Examples/smallstaticbandsex11.php
deleted file mode 100644
index 88a091ca..00000000
--- a/#jpgraph/src/Examples/smallstaticbandsex11.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// Illustration of the different patterns for bands
-// $Id: smallstaticbandsex10.php,v 1.1 2002/09/01 21:51:08 aditus Exp $
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-$datay=array(10,29,3,6);
-
-// Create the graph. 
-$graph = new Graph(200,150);	
-$graph->SetScale("textlin");
-$graph->SetMargin(25,10,20,20);
-
-// Add 10% grace ("space") at top and botton of Y-scale. 
-$graph->yscale->SetGrace(10);
-
-// Create a bar pot
-$bplot = new BarPlot($datay);
-$bplot->SetFillColor("lightblue");
-
-// Position the X-axis at the bottom of the plotare
-$graph->xaxis->SetPos("min");
-
-$graph->ygrid->Show(false);
-
-// .. and add the plot to the graph
-$graph->Add($bplot);
-
-// Add band
-$band = new PlotBand(HORIZONTAL,BAND_DIAGCROSS,15,35,'khaki4');
-$band->ShowFrame(false);
-$graph->Add($band);
-
-// Set title
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,10);
-$graph->title->SetColor('darkred');
-$graph->title->Set('BAND_DIAGCROSS');
-
-
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/smallstaticbandsex2.php b/#jpgraph/src/Examples/smallstaticbandsex2.php
deleted file mode 100644
index d9add7af..00000000
--- a/#jpgraph/src/Examples/smallstaticbandsex2.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// Illustration of the different patterns for bands
-// $Id: smallstaticbandsex2.php,v 1.1 2002/09/01 21:51:08 aditus Exp $
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-$datay=array(10,29,3,6);
-
-// Create the graph. 
-$graph = new Graph(200,150);	
-$graph->SetScale("textlin");
-$graph->SetMargin(25,10,20,20);
-
-// Add 10% grace ("space") at top and botton of Y-scale. 
-$graph->yscale->SetGrace(10);
-
-// Create a bar pot
-$bplot = new BarPlot($datay);
-$bplot->SetFillColor("lightblue");
-
-// Position the X-axis at the bottom of the plotare
-$graph->xaxis->SetPos("min");
-
-$graph->ygrid->Show(false);
-
-// .. and add the plot to the graph
-$graph->Add($bplot);
-
-// Add band
-$band = new PlotBand(HORIZONTAL,BAND_LDIAG,15,35,'khaki4');
-$band->ShowFrame(false);
-$graph->Add($band);
-
-// Set title
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,10);
-$graph->title->SetColor('darkred');
-$graph->title->Set('BAND_LDIAG');
-
-
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/smallstaticbandsex3.php b/#jpgraph/src/Examples/smallstaticbandsex3.php
deleted file mode 100644
index aa2a94d7..00000000
--- a/#jpgraph/src/Examples/smallstaticbandsex3.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// Illustration of the different patterns for bands
-// $Id: smallstaticbandsex3.php,v 1.1 2002/09/01 21:51:08 aditus Exp $
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-$datay=array(10,29,3,6);
-
-// Create the graph. 
-$graph = new Graph(200,150);	
-$graph->SetScale("textlin");
-$graph->SetMargin(25,10,20,20);
-
-// Add 10% grace ("space") at top and botton of Y-scale. 
-$graph->yscale->SetGrace(10);
-
-// Create a bar pot
-$bplot = new BarPlot($datay);
-$bplot->SetFillColor("lightblue");
-
-// Position the X-axis at the bottom of the plotare
-$graph->xaxis->SetPos("min");
-
-$graph->ygrid->Show(false);
-
-// .. and add the plot to the graph
-$graph->Add($bplot);
-
-// Add band
-$band = new PlotBand(HORIZONTAL,BAND_SOLID,15,35,'khaki4');
-$band->ShowFrame(false);
-$graph->Add($band);
-
-// Set title
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,10);
-$graph->title->SetColor('darkred');
-$graph->title->Set('BAND_SOLID');
-
-
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/smallstaticbandsex4.php b/#jpgraph/src/Examples/smallstaticbandsex4.php
deleted file mode 100644
index e4bd999c..00000000
--- a/#jpgraph/src/Examples/smallstaticbandsex4.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// Illustration of the different patterns for bands
-// $Id: smallstaticbandsex4.php,v 1.1 2002/09/01 21:51:08 aditus Exp $
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-$datay=array(10,29,3,6);
-
-// Create the graph. 
-$graph = new Graph(200,150);	
-$graph->SetScale("textlin");
-$graph->SetMargin(25,10,20,20);
-
-// Add 10% grace ("space") at top and botton of Y-scale. 
-$graph->yscale->SetGrace(10);
-
-// Create a bar pot
-$bplot = new BarPlot($datay);
-$bplot->SetFillColor("lightblue");
-
-// Position the X-axis at the bottom of the plotare
-$graph->xaxis->SetPos("min");
-
-$graph->ygrid->Show(false);
-
-// .. and add the plot to the graph
-$graph->Add($bplot);
-
-// Add band
-$band = new PlotBand(HORIZONTAL,BAND_3DPLANE,15,35,'khaki4');
-$band->SetDensity(80);
-$band->ShowFrame(true);
-$graph->Add($band);
-
-// Set title
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,10);
-$graph->title->SetColor('darkred');
-$graph->title->Set('BAND_3DPLANE, Density=60');
-
-
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/smallstaticbandsex5.php b/#jpgraph/src/Examples/smallstaticbandsex5.php
deleted file mode 100644
index d7f9ebb2..00000000
--- a/#jpgraph/src/Examples/smallstaticbandsex5.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// Illustration of the different patterns for bands
-// $Id: smallstaticbandsex5.php,v 1.1 2002/09/01 21:51:08 aditus Exp $
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-$datay=array(10,29,3,6);
-
-// Create the graph. 
-$graph = new Graph(200,150);	
-$graph->SetScale("textlin");
-$graph->SetMargin(25,10,20,20);
-
-// Add 10% grace ("space") at top and botton of Y-scale. 
-$graph->yscale->SetGrace(10);
-
-// Create a bar pot
-$bplot = new BarPlot($datay);
-$bplot->SetFillColor("lightblue");
-
-// Position the X-axis at the bottom of the plotare
-$graph->xaxis->SetPos("min");
-
-$graph->ygrid->Show(false);
-
-// .. and add the plot to the graph
-$graph->Add($bplot);
-
-// Add band
-$band = new PlotBand(HORIZONTAL,BAND_HVCROSS,15,35,'khaki4');
-$band->ShowFrame(true);
-$band->SetOrder(DEPTH_FRONT);
-$graph->Add($band);
-
-// Set title
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,10);
-$graph->title->SetColor('darkred');
-$graph->title->Set('BAND_HVCROSS, In front');
-
-
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/smallstaticbandsex6.php b/#jpgraph/src/Examples/smallstaticbandsex6.php
deleted file mode 100644
index 506e1a80..00000000
--- a/#jpgraph/src/Examples/smallstaticbandsex6.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// Illustration of the different patterns for bands
-// $Id: smallstaticbandsex6.php,v 1.1 2002/09/01 21:51:08 aditus Exp $
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-$datay=array(10,29,3,6);
-
-// Create the graph. 
-$graph = new Graph(200,150);	
-$graph->SetScale("textlin");
-$graph->SetMargin(25,10,20,20);
-
-// Add 10% grace ("space") at top and botton of Y-scale. 
-$graph->yscale->SetGrace(10);
-
-// Create a bar pot
-$bplot = new BarPlot($datay);
-$bplot->SetFillColor("lightblue");
-
-// Position the X-axis at the bottom of the plotare
-$graph->xaxis->SetPos("min");
-
-$graph->ygrid->Show(false);
-
-// .. and add the plot to the graph
-$graph->Add($bplot);
-
-// Add band
-$band = new PlotBand(HORIZONTAL,BAND_VLINE,15,35,'khaki4');
-$band->ShowFrame(false);
-$graph->Add($band);
-
-// Set title
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,10);
-$graph->title->SetColor('darkred');
-$graph->title->Set('BAND_VLINE');
-
-
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/smallstaticbandsex7.php b/#jpgraph/src/Examples/smallstaticbandsex7.php
deleted file mode 100644
index e07dc6a9..00000000
--- a/#jpgraph/src/Examples/smallstaticbandsex7.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// Illustration of the different patterns for bands
-// $Id: smallstaticbandsex7.php,v 1.1 2002/09/01 21:51:08 aditus Exp $
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-$datay=array(10,29,3,6);
-
-// Create the graph. 
-$graph = new Graph(200,150);	
-$graph->SetScale("textlin");
-$graph->SetMargin(25,10,20,20);
-
-// Add 10% grace ("space") at top and botton of Y-scale. 
-$graph->yscale->SetGrace(10);
-
-// Create a bar pot
-$bplot = new BarPlot($datay);
-$bplot->SetFillColor("lightblue");
-
-// Position the X-axis at the bottom of the plotare
-$graph->xaxis->SetPos("min");
-
-$graph->ygrid->Show(false);
-
-// .. and add the plot to the graph
-$graph->Add($bplot);
-
-// Add band
-$band = new PlotBand(HORIZONTAL,BAND_HLINE,15,35,'khaki4');
-$band->ShowFrame(false);
-$graph->Add($band);
-
-// Set title
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,10);
-$graph->title->SetColor('darkred');
-$graph->title->Set('BAND_HLINE');
-
-
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/smallstaticbandsex8.php b/#jpgraph/src/Examples/smallstaticbandsex8.php
deleted file mode 100644
index 6fbe40fb..00000000
--- a/#jpgraph/src/Examples/smallstaticbandsex8.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// Illustration of the different patterns for bands
-// $Id: smallstaticbandsex8.php,v 1.1 2002/09/01 21:51:08 aditus Exp $
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-$datay=array(10,29,3,6);
-
-// Create the graph. 
-$graph = new Graph(200,150);	
-$graph->SetScale("textlin");
-$graph->SetMargin(25,10,20,20);
-
-// Add 10% grace ("space") at top and botton of Y-scale. 
-$graph->yscale->SetGrace(10);
-
-// Create a bar pot
-$bplot = new BarPlot($datay);
-$bplot->SetFillColor("lightblue");
-
-// Position the X-axis at the bottom of the plotare
-$graph->xaxis->SetPos("min");
-
-$graph->ygrid->Show(false);
-
-// .. and add the plot to the graph
-$graph->Add($bplot);
-
-// Add band
-$band = new PlotBand(HORIZONTAL,BAND_3DPLANE,15,35,'khaki4');
-$band->ShowFrame(false);
-$graph->Add($band);
-
-// Set title
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,10);
-$graph->title->SetColor('darkred');
-$graph->title->Set('BAND_3DPLANE');
-
-
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/smallstaticbandsex9.php b/#jpgraph/src/Examples/smallstaticbandsex9.php
deleted file mode 100644
index b6126d80..00000000
--- a/#jpgraph/src/Examples/smallstaticbandsex9.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// Illustration of the different patterns for bands
-// $Id: smallstaticbandsex9.php,v 1.1 2002/09/01 21:51:08 aditus Exp $
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-$datay=array(10,29,3,6);
-
-// Create the graph. 
-$graph = new Graph(200,150);	
-$graph->SetScale("textlin");
-$graph->SetMargin(25,10,20,20);
-
-// Add 10% grace ("space") at top and botton of Y-scale. 
-$graph->yscale->SetGrace(10);
-
-// Create a bar pot
-$bplot = new BarPlot($datay);
-$bplot->SetFillColor("lightblue");
-
-// Position the X-axis at the bottom of the plotare
-$graph->xaxis->SetPos("min");
-
-$graph->ygrid->Show(false);
-
-// .. and add the plot to the graph
-$graph->Add($bplot);
-
-// Add band
-$band = new PlotBand(HORIZONTAL,BAND_HVCROSS,15,35,'khaki4');
-$band->ShowFrame(false);
-$graph->Add($band);
-
-// Set title
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,10);
-$graph->title->SetColor('darkred');
-$graph->title->Set('BAND_HVCROSS');
-
-
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/softy_example.php b/#jpgraph/src/Examples/softy_example.php
deleted file mode 100644
index 4d21fc98..00000000
--- a/#jpgraph/src/Examples/softy_example.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$theme = isset($_GET['theme']) ? $_GET['theme'] : null;
-
-$data = array (
-  0 => array (0 => 79, 1 => -25, 2 => -7, 3 => 85, 4 => -26, 5 => -32, ),
-  1 => array (0 => 76, 1 => 51, 2 => 86, 3 => 12, 4 => -7, 5 => 94, ),
-  2 => array (0 => 49, 1 => 38, 2 => 7, 3 => -40, 4 => 9, 5 => -7, ),
-  3 => array ( 0 => 69, 1 => 96, 2 => 49, 3 => 7, 4 => 92, 5 => -38, ),
-  4 => array ( 0 => 68, 1 => 16, 2 => 82, 3 => -49, 4 => 50, 5 => 7, ),
-  5 => array ( 0 => -37, 1 => 28, 2 => 32, 3 => 6, 4 => 13, 5 => 57, ),
-  6 => array ( 0 => 24, 1 => -11, 2 => 7, 3 => 10, 4 => 51, 5 => 51, ),
-  7 => array ( 0 => 3, 1 => -1, 2 => -12, 3 => 61, 4 => 10, 5 => 47, ),
-  8 => array ( 0 => -47, 1 => -21, 2 => 43, 3 => 53, 4 => 36, 5 => 34, ),
-);
-
-
-// Create the graph. These two calls are always required
-$graph = new Graph(400,300);    
-
-$graph->SetScale("textlin");
-if ($theme) {
-  $graph->SetTheme(new $theme());
-}
-$theme_class = new SoftyTheme;
-$graph->SetTheme($theme_class);
-
-$plot = array();
-// Create the bar plots
-for ($i = 0; $i < 4; $i++) {
-  $plot[$i] = new BarPlot($data[$i]);
-  $plot[$i]->SetLegend('plot'.($i+1));
-}
-//$acc1 = new AccBarPlot(array($plot[0], $plot[1]));
-//$acc1->value->Show();
-$gbplot = new GroupBarPlot(array($plot[2], $plot[1] ));
-
-for ($i = 4; $i < 8; $i++) {
-  $plot[$i] = new LinePlot($data[$i]);
-  $plot[$i]->SetLegend('plot'.$i);
-  $plot[$i]->value->Show();
-}
-
-$graph->Add($gbplot);
-$graph->Add($plot[4]);
-
-$title = "SoftyTheme Example";
-$title = mb_convert_encoding($title,'UTF-8');
-$graph->title->Set($title);
-$graph->xaxis->title->Set("X-title");
-$graph->yaxis->title->Set("Y-title");
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/splineex1.php b/#jpgraph/src/Examples/splineex1.php
deleted file mode 100644
index 61f60323..00000000
--- a/#jpgraph/src/Examples/splineex1.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-require_once ('jpgraph/jpgraph_scatter.php');
-require_once ('jpgraph/jpgraph_regstat.php');
-
-// Original data points
-$xdata = array(1,3,5,7,9,12,15,17.1);
-$ydata = array(5,1,9,6,4,3,19,12);
-
-// Get the interpolated values by creating
-// a new Spline object.
-$spline = new Spline($xdata,$ydata);
-
-// For the new data set we want 40 points to
-// get a smooth curve.
-list($newx,$newy) = $spline->Get(50);
-
-// Create the graph
-$g = new Graph(300,200);
-$g->SetMargin(30,20,40,30);
-$g->title->Set("Natural cubic splines");
-$g->title->SetFont(FF_ARIAL,FS_NORMAL,12);
-$g->subtitle->Set('(Control points shown in red)');
-$g->subtitle->SetColor('darkred');
-$g->SetMarginColor('lightblue');
-
-//$g->img->SetAntiAliasing();
-
-// We need a linlin scale since we provide both
-// x and y coordinates for the data points.
-$g->SetScale('linlin');
-
-// We want 1 decimal for the X-label
-$g->xaxis->SetLabelFormat('%1.1f');
-
-// We use a scatterplot to illustrate the original
-// contro points.
-$splot = new ScatterPlot($ydata,$xdata);
-
-// 
-$splot->mark->SetFillColor('red@0.3');
-$splot->mark->SetColor('red@0.5');
-
-// And a line plot to stroke the smooth curve we got
-// from the original control points
-$lplot = new LinePlot($newy,$newx);
-$lplot->SetColor('navy');
-
-// Add the plots to the graph and stroke
-$g->Add($lplot);
-$g->Add($splot);
-$g->Stroke();
-
-?>
-
diff --git a/#jpgraph/src/Examples/staticbandbarex1.php b/#jpgraph/src/Examples/staticbandbarex1.php
deleted file mode 100644
index 5d59b26a..00000000
--- a/#jpgraph/src/Examples/staticbandbarex1.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-$datay=array(12,0,-19,-7,17,-6);
-
-// Create the graph. 
-$graph = new Graph(400,300);	
-$graph->img->SetMargin(60,30,50,40);
-$graph->SetScale("textlin");
-$graph->SetShadow();
-
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,15);
-$graph->title->Set("Cash flow ");
-$graph->subtitle->Set("(Department X)");
-
-// Show both X and Y grid
-$graph->xgrid->Show(true,false);
-
-// Add 10% grace ("space") at top and botton of Y-scale. 
-$graph->yscale->SetGrace(10,10);
-
-// Turn the tick mark out from the plot area
-$graph->xaxis->SetTickSide(SIDE_DOWN);
-$graph->yaxis->SetTickSide(SIDE_LEFT);
-
-// Create a bar pot
-$bplot = new BarPlot($datay);
-$bplot->SetFillColor("orange");
-
-// Show the actual value for each bar on top/bottom
-$bplot->value->Show(true);
-$bplot->value->SetFormat("%02d kr");
-
-// Position the X-axis at the bottom of the plotare
-$graph->xaxis->SetPos("min");
-
-// .. and add the plot to the graph
-$graph->Add($bplot);
-
-// Add band
-$graph->Add(new PlotBand(HORIZONTAL,BAND_HLINE,0,10));
-
-//$graph->title->Set("Test of bar gradient fill");
-$graph->xaxis->title->Set("X-title");
-$graph->yaxis->title->Set("Y-title");
-
-$graph->yaxis->title->SetFont(FF_ARIAL,FS_BOLD,11);
-$graph->xaxis->title->SetFont(FF_ARIAL,FS_BOLD,11);
-
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/staticbandbarex2.php b/#jpgraph/src/Examples/staticbandbarex2.php
deleted file mode 100644
index 24d3bbcb..00000000
--- a/#jpgraph/src/Examples/staticbandbarex2.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-$datay=array(12,0,-19,-7,17,-6);
-
-// Create the graph. 
-$graph = new Graph(400,300);	
-$graph->img->SetMargin(60,30,50,40);
-$graph->SetScale("textlin");
-$graph->SetShadow();
-
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,15);
-$graph->title->Set("Cash flow ");
-$graph->subtitle->Set("(Department X)");
-
-// Show both X and Y grid
-$graph->xgrid->Show(true,false);
-
-// Add 10% grace ("space") at top and botton of Y-scale. 
-$graph->yscale->SetGrace(10,10);
-
-// Turn the tick mark out from the plot area
-$graph->xaxis->SetTickSide(SIDE_DOWN);
-$graph->yaxis->SetTickSide(SIDE_LEFT);
-
-// Create a bar pot
-$bplot = new BarPlot($datay);
-$bplot->SetFillColor("orange");
-
-// Show the actual value for each bar on top/bottom
-$bplot->value->Show(true);
-$bplot->value->SetFormat("%02d kr");
-
-// Position the X-axis at the bottom of the plotare
-$graph->xaxis->SetPos("min");
-
-// .. and add the plot to the graph
-$graph->Add($bplot);
-
-// Add band
-$graph->Add(new PlotBand(HORIZONTAL,BAND_RDIAG,0,"max","red",2));
-
-//$graph->title->Set("Test of bar gradient fill");
-$graph->xaxis->title->Set("X-title");
-$graph->yaxis->title->Set("Y-title");
-
-$graph->yaxis->title->SetFont(FF_ARIAL,FS_BOLD,11);
-$graph->xaxis->title->SetFont(FF_ARIAL,FS_BOLD,11);
-
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/staticbandbarex3.php b/#jpgraph/src/Examples/staticbandbarex3.php
deleted file mode 100644
index fa38cca1..00000000
--- a/#jpgraph/src/Examples/staticbandbarex3.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-$datay=array(12,0,-19,-7,17,-6);
-
-// Create the graph. 
-$graph = new Graph(400,300);	
-$graph->img->SetMargin(60,30,50,40);
-$graph->SetScale("textlin");
-$graph->SetShadow();
-
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,15);
-$graph->title->Set("Cash flow ");
-$graph->subtitle->Set("(Department X)");
-
-// Show both X and Y grid
-$graph->xgrid->Show(true,false);
-
-// Add 10% grace ("space") at top and botton of Y-scale. 
-$graph->yscale->SetGrace(10,10);
-
-// Turn the tick mark out from the plot area
-$graph->xaxis->SetTickSide(SIDE_DOWN);
-$graph->yaxis->SetTickSide(SIDE_LEFT);
-
-// Create a bar pot
-$bplot = new BarPlot($datay);
-$bplot->SetFillColor("orange");
-
-// Show the actual value for each bar on top/bottom
-$bplot->value->Show(true);
-$bplot->value->SetFormat("%02d kr");
-
-// Position the X-axis at the bottom of the plotare
-$graph->xaxis->SetPos("min");
-
-// .. and add the plot to the graph
-$graph->Add($bplot);
-
-// Add upper and lower band and use no frames
-$uband=new PlotBand(HORIZONTAL,BAND_RDIAG,0,"max","green");
-$uband->ShowFrame(false);
-$lband=new PlotBand(HORIZONTAL,BAND_LDIAG,"min",0,"red");
-$lband->ShowFrame(false);
-
-$graph->Add($uband);
-$graph->Add($lband);
-
-//$graph->title->Set("Test of bar gradient fill");
-$graph->xaxis->title->Set("X-title");
-$graph->yaxis->title->Set("Y-title");
-
-$graph->yaxis->title->SetFont(FF_ARIAL,FS_BOLD,11);
-$graph->xaxis->title->SetFont(FF_ARIAL,FS_BOLD,11);
-
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/staticbandbarex4.php b/#jpgraph/src/Examples/staticbandbarex4.php
deleted file mode 100644
index 57ca6dbb..00000000
--- a/#jpgraph/src/Examples/staticbandbarex4.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-$datay=array(12,0,-19,-7,17,-6);
-
-// Create the graph. 
-$graph = new Graph(400,300);	
-$graph->img->SetMargin(60,30,50,40);
-$graph->SetScale("textlin");
-$graph->SetShadow();
-
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,15);
-$graph->title->Set("Cash flow ");
-$graph->subtitle->Set("(Department X)");
-
-// Show both X and Y grid
-$graph->xgrid->Show(true,false);
-
-// Add 10% grace ("space") at top and botton of Y-scale. 
-$graph->yscale->SetGrace(10,10);
-
-// Turn the tick mark out from the plot area
-$graph->xaxis->SetTickSide(SIDE_DOWN);
-$graph->yaxis->SetTickSide(SIDE_LEFT);
-
-// Create a bar pot
-$bplot = new BarPlot($datay);
-$bplot->SetFillColor("orange");
-
-// Show the actual value for each bar on top/bottom
-$bplot->value->Show(true);
-$bplot->value->SetFormat("%02d kr");
-
-// Position the X-axis at the bottom of the plotare
-$graph->xaxis->SetPos("min");
-
-// .. and add the plot to the graph
-$graph->Add($bplot);
-
-// Add upper and lower band and use no frames
-$uband=new PlotBand(HORIZONTAL,BAND_RDIAG,0,"max","green");
-$uband->ShowFrame(false);
-$uband->SetDensity(50); // 50% line density
-$lband=new PlotBand(HORIZONTAL,BAND_LDIAG,"min",0,"red");
-$lband->ShowFrame(false);
-$lband->SetDensity(20); // 20% line density
-
-$graph->Add($uband);
-$graph->Add($lband);
-
-//$graph->title->Set("Test of bar gradient fill");
-$graph->xaxis->title->Set("X-title");
-$graph->yaxis->title->Set("Y-title");
-
-$graph->yaxis->title->SetFont(FF_ARIAL,FS_BOLD,11);
-$graph->xaxis->title->SetFont(FF_ARIAL,FS_BOLD,11);
-
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/staticbandbarex5.php b/#jpgraph/src/Examples/staticbandbarex5.php
deleted file mode 100644
index 8d80855f..00000000
--- a/#jpgraph/src/Examples/staticbandbarex5.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-$datay=array(12,0,-19,-7,17,-6);
-
-// Create the graph. 
-$graph = new Graph(400,300);	
-$graph->img->SetMargin(60,30,50,40);
-$graph->SetScale("textlin");
-$graph->SetShadow();
-
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,15);
-$graph->title->Set("Cash flow ");
-$graph->subtitle->Set("(Department X)");
-
-// Show both X and Y grid
-$graph->xgrid->Show(true,false);
-
-// Add 10% grace ("space") at top and botton of Y-scale. 
-$graph->yscale->SetGrace(10,10);
-
-// Turn the tick mark out from the plot area
-$graph->xaxis->SetTickSide(SIDE_DOWN);
-$graph->yaxis->SetTickSide(SIDE_LEFT);
-
-// Create a bar pot
-$bplot = new BarPlot($datay);
-$bplot->SetFillColor("orange");
-
-// Show the actual value for each bar on top/bottom
-$bplot->value->Show(true);
-$bplot->value->SetFormat("%02d kr");
-
-// Position the X-axis at the bottom of the plotare
-$graph->xaxis->SetPos("min");
-
-// .. and add the plot to the graph
-$graph->Add($bplot);
-
-// Add upper and lower band and use no frames
-$band[0]=new PlotBand(HORIZONTAL,BAND_RDIAG,10,20,"green");
-$band[0]->ShowFrame(false);
-$band[0]->SetDensity(30);
-$band[1]=new PlotBand(HORIZONTAL,BAND_LDIAG,-20,-10,"red");
-$band[1]->ShowFrame(false);
-$band[1]->SetDensity(40);
-$band[2]=new PlotBand(HORIZONTAL,BAND_LDIAG,"min",-20,"red");
-$band[2]->ShowFrame(false);
-$band[2]->SetDensity(80);
-
-// We can also add band in an array
-$graph->Add($band);
-
-//$graph->title->Set("Test of bar gradient fill");
-$graph->xaxis->title->Set("X-title");
-$graph->yaxis->title->Set("Y-title");
-
-$graph->yaxis->title->SetFont(FF_ARIAL,FS_BOLD,11);
-$graph->xaxis->title->SetFont(FF_ARIAL,FS_BOLD,11);
-
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/staticbandbarex6.php b/#jpgraph/src/Examples/staticbandbarex6.php
deleted file mode 100644
index df352ea9..00000000
--- a/#jpgraph/src/Examples/staticbandbarex6.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-require_once ('jpgraph/jpgraph_plotline.php');
-
-$datay=array(12,0,-19,-7,17,-6);
-
-// Create the graph. 
-$graph = new Graph(400,300);	
-$graph->img->SetMargin(60,30,50,40);
-$graph->SetScale("textlin");
-$graph->SetShadow();
-
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,15);
-$graph->title->Set("Cash flow ");
-$graph->subtitle->Set("Shows some possible patterns for bands");
-
-// Show both X and Y grid
-$graph->xgrid->Show(true,false);
-
-// Add 10% grace ("space") at top and botton of Y-scale. 
-$graph->yscale->SetGrace(10,10);
-
-// Turn the tick mark out from the plot area
-$graph->xaxis->SetTickSide(SIDE_DOWN);
-$graph->yaxis->SetTickSide(SIDE_LEFT);
-
-// Create a bar pot
-$bplot = new BarPlot($datay);
-$bplot->SetFillColor("orange");
-$bplot->SetShadow();
-
-// Show the actual value for each bar on top/bottom
-$bplot->value->Show(true);
-$bplot->value->SetFormat("%02d kr");
-
-// Position the X-axis at the bottom of the plotare
-$graph->xaxis->SetPos("min");
-
-// .. and add the plot to the graph
-$graph->Add($bplot);
-
-// Add upper and lower band and use no frames
-$band[0]=new PlotBand(HORIZONTAL,BAND_RDIAG,10,20,"green");
-$band[0]->ShowFrame(false);
-$band[1]=new PlotBand(HORIZONTAL,BAND_LDIAG,-20,-10,"red");
-$band[1]->ShowFrame(false);
-$band[1]->SetDensity(20);
-$band[2]=new PlotBand(HORIZONTAL,BAND_DIAGCROSS,"min",-20,"red");
-$band[2]->ShowFrame(false);
-$band[2]->SetDensity(40);
-$band[3]=new PlotBand(VERTICAL,BAND_HLINE,0,1,"darkgray");
-$band[3]->ShowFrame(false);
-$band[3]->SetOrder(DEPTH_FRONT);
-$band[4]=new PlotBand(VERTICAL,BAND_HVCROSS,5,"max","darkgray");
-$band[4]->ShowFrame(false);
-$band[4]->SetOrder(DEPTH_FRONT);
-$band[5]=new PlotBand(HORIZONTAL,BAND_SOLID,20,"max","lightgreen");
-$band[6]=new PlotBand(HORIZONTAL,BAND_3DPLANE,-10,0,"blue");
-$band[6]->SetDensity(70);
-$graph->Add($band);
-
-$graph->AddLine(new PlotLine(HORIZONTAL,0,"black",2));
-
-//$graph->title->Set("Test of bar gradient fill");
-$graph->xaxis->title->Set("X-title");
-$graph->yaxis->title->Set("Y-title");
-
-$graph->yaxis->title->SetFont(FF_ARIAL,FS_BOLD,11);
-$graph->xaxis->title->SetFont(FF_ARIAL,FS_BOLD,11);
-
-$graph->Stroke();
-?>
-
diff --git a/#jpgraph/src/Examples/staticbandbarex7.php b/#jpgraph/src/Examples/staticbandbarex7.php
deleted file mode 100644
index 399a172b..00000000
--- a/#jpgraph/src/Examples/staticbandbarex7.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-require_once ('jpgraph/jpgraph_plotline.php');
-
-$datay=array(12,5,19,22,17,6);
-
-// Create the graph. 
-$graph = new Graph(400,300);	
-$graph->img->SetMargin(60,30,50,40);
-$graph->SetScale("textlin");
-$graph->SetShadow();
-
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,15);
-$graph->title->Set("Cash flow ");
-$graph->subtitle->Set("Use of static line, 3D and solid band");
-
-// Turn off Y-grid (it's on by default)
-$graph->ygrid->Show(false);
-
-// Add 10% grace ("space") at top of Y-scale. 
-$graph->yscale->SetGrace(10);
-$graph->yscale->SetAutoMin(-20);
-
-// Turn the tick mark out from the plot area
-$graph->xaxis->SetTickSide(SIDE_DOWN);
-$graph->yaxis->SetTickSide(SIDE_LEFT);
-
-// Create a bar pot
-$bplot = new BarPlot($datay);
-$bplot->SetFillColor("orange");
-$bplot->SetShadow("darkblue");
-
-// Show the actual value for each bar on top/bottom
-$bplot->value->Show(true);
-$bplot->value->SetFormat("%02d kr");
-
-// Position the X-axis at the bottom of the plotare
-$graph->xaxis->SetPos("min");
-
-// .. and add the plot to the graph
-$graph->Add($bplot);
-
-// Add upper and lower band and use no frames
-$band[0]=new PlotBand(HORIZONTAL,BAND_3DPLANE,"min",0,"blue");
-$band[0]->ShowFrame(false);
-$band[0]->SetDensity(20);
-$band[1]=new PlotBand(HORIZONTAL,BAND_SOLID,0,"max","steelblue");
-$band[1]->ShowFrame(false);
-$graph->Add($band);
-
-$graph->Add(new PlotLine(HORIZONTAL,0,"black",2));
-
-//$graph->title->Set("Test of bar gradient fill");
-$graph->xaxis->title->Set("X-title");
-$graph->yaxis->title->Set("Y-title");
-
-$graph->yaxis->title->SetFont(FF_ARIAL,FS_BOLD,11);
-$graph->xaxis->title->SetFont(FF_ARIAL,FS_BOLD,11);
-
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/staticlinebarex1.php b/#jpgraph/src/Examples/staticlinebarex1.php
deleted file mode 100644
index 9c63442b..00000000
--- a/#jpgraph/src/Examples/staticlinebarex1.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-require_once ('jpgraph/jpgraph_plotline.php');
-
-$datay=array(12,0,-19,-7,17,-6);
-
-// Create the graph. 
-$graph = new Graph(400,300);	
-$graph->img->SetMargin(60,30,50,40);
-$graph->SetScale("textlin");
-$graph->SetShadow();
-
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,15);
-$graph->title->Set("Cash flow ");
-$graph->subtitle->Set("(Department X)");
-
-// Show both X and Y grid
-$graph->xgrid->Show(true,false);
-
-// Add 10% grace ("space") at top and botton of Y-scale. 
-$graph->yscale->SetGrace(10,10);
-
-// Turn the tick mark out from the plot area
-$graph->xaxis->SetTickSide(SIDE_DOWN);
-$graph->yaxis->SetTickSide(SIDE_LEFT);
-
-// Create a bar pot
-$bplot = new BarPlot($datay);
-$bplot->SetFillColor("orange");
-$bplot->SetShadow();
-
-// Show the actual value for each bar on top/bottom
-$bplot->value->Show();
-$bplot->value->SetFormat("%02d kr");
-
-// Position the X-axis at the bottom of the plotare
-$graph->xaxis->SetPos("min");
-
-// .. and add the plot to the graph
-$graph->Add($bplot);
-
-// Add mark graph with static lines
-$graph->AddLine(new PlotLine(HORIZONTAL,0,"black",2));
-$graph->AddLine(new PlotLine(VERTICAL,3,"black",2));
-
-//$graph->title->Set("Test of bar gradient fill");
-$graph->xaxis->title->Set("X-title");
-$graph->yaxis->title->Set("Y-title");
-
-$graph->yaxis->title->SetFont(FF_ARIAL,FS_BOLD,11);
-$graph->xaxis->title->SetFont(FF_ARIAL,FS_BOLD,11);
-
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/stockex1.php b/#jpgraph/src/Examples/stockex1.php
deleted file mode 100644
index d77145c7..00000000
--- a/#jpgraph/src/Examples/stockex1.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// Example of a stock chart
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_stock.php');
-
-// Data must be in the format : open,close,min,max
-$datay = array(
-    34,42,27,45,
-    55,25,14,59,
-    15,40,12,47,
-    62,38,25,65,
-    38,49,32,64);
-
-// Setup a simple graph
-$graph = new Graph(300,200);
-$graph->SetScale("textlin");
-$graph->SetMarginColor('lightblue');
-$graph->title->Set('Stockchart example');
-
-// Create a new stock plot
-$p1 = new StockPlot($datay);
-
-// Width of the bars (in pixels)
-$p1->SetWidth(9);
-
-// Uncomment the following line to hide the horizontal end lines
-//$p1->HideEndLines();
-
-// Add the plot to the graph and send it back to the browser
-$graph->Add($p1);
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/stockex2.php b/#jpgraph/src/Examples/stockex2.php
deleted file mode 100644
index e038cca0..00000000
--- a/#jpgraph/src/Examples/stockex2.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// $Id: stockex2.php,v 1.1 2003/01/31 17:41:29 aditus Exp $
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_stock.php');
-
-
-$datay = array(
-    34,42,27,45,
-    55,25,12,59,
-    38,49,32,64,
-    34,40,29,42,
-    40,29,22,45 );
-
-// Setup basic graph
-$graph = new Graph(300,200);
-$graph->SetScale("textlin");
-$graph->SetMarginColor('white');
-$graph->SetFrame(false);
-$graph->ygrid->SetFill(true,'#EFEFEF@0.5','#BBCCFF@0.5');
-$graph->SetBox();
-
-$graph->tabtitle->Set(' Week 34 ');
-$graph->tabtitle->SetFont(FF_ARIAL,FS_NORMAL,12);
-
-// Get week days in curent locale
-$days = $gDateLocale->GetShortDay();
-array_shift($days); // Start on monday
-$graph->xaxis->SetTickLabels($days);
-
-// Create stock plot
-$p1 = new StockPlot($datay);
-
-// Indent plot so first and last bar isn't on the edges
-$p1->SetCenter();
-
-// Add and stroke
-$graph->Add($p1);
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/stship.jpg b/#jpgraph/src/Examples/stship.jpg
deleted file mode 100644
index 7f3bae62..00000000
Binary files a/#jpgraph/src/Examples/stship.jpg and /dev/null differ
diff --git a/#jpgraph/src/Examples/sunflower.gif b/#jpgraph/src/Examples/sunflower.gif
deleted file mode 100644
index b83709f8..00000000
Binary files a/#jpgraph/src/Examples/sunflower.gif and /dev/null differ
diff --git a/#jpgraph/src/Examples/sunspotsex1.php b/#jpgraph/src/Examples/sunspotsex1.php
deleted file mode 100644
index d5edb83e..00000000
--- a/#jpgraph/src/Examples/sunspotsex1.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-function readsunspotdata($aFile, &$aYears, &$aSunspots) {
-    $lines = @file($aFile,FILE_IGNORE_NEW_LINES|FILE_SKIP_EMPTY_LINES);
-    if( $lines === false ) {
-        throw new JpGraphException('Can not read sunspot data file.');
-    }
-    foreach( $lines as $line => $datarow ) {
-        $split = preg_split('/[\s]+/',$datarow);
-        $aYears[] = substr(trim($split[0]),0,4);
-        $aSunspots[] = trim($split[1]);
-    }
-}
-
-$year = array();
-$ydata = array();
-readsunspotdata('yearssn.txt',$year,$ydata);
-
- // Width and height of the graph
-$width = 600; $height = 200;
-
-// Create a graph instance
-$graph = new Graph($width,$height);
-
-// Specify what scale we want to use,
-// int = integer scale for the X-axis
-// int = integer scale for the Y-axis
-$graph->SetScale('intint');
-
-// Setup a title for the graph
-$graph->title->Set('Sunspot example');
-
-// Setup titles and X-axis labels
-$graph->xaxis->title->Set('(year from 1701)');
-
-// Setup Y-axis title
-$graph->yaxis->title->Set('(# sunspots)');
-
-// Create the linear plot
-$lineplot=new LinePlot($ydata);
-
-// Add the plot to the graph
-$graph->Add($lineplot);
-
-// Display the graph
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/sunspotsex2.php b/#jpgraph/src/Examples/sunspotsex2.php
deleted file mode 100644
index 817db158..00000000
--- a/#jpgraph/src/Examples/sunspotsex2.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-function readsunspotdata($aFile, &$aYears, &$aSunspots) {
-    $lines = @file($aFile,FILE_IGNORE_NEW_LINES|FILE_SKIP_EMPTY_LINES);
-    if( $lines === false ) {
-        throw new JpGraphException('Can not read sunspot data file.');
-    }
-    foreach( $lines as $line => $datarow ) {
-        $split = preg_split('/[\s]+/',$datarow);
-        $aYears[] = substr(trim($split[0]),0,4);
-        $aSunspots[] = trim($split[1]);
-    }
-}
-
-$year = array();
-$ydata = array();
-readsunspotdata('yearssn.txt',$year,$ydata);
-
- // Width and height of the graph
-$width = 600; $height = 200;
-
-// Create a graph instance
-$graph = new Graph($width,$height);
-
-// Specify what scale we want to use,
-// int = integer scale for the X-axis
-// int = integer scale for the Y-axis
-$graph->SetScale('intint');
-
-// Setup a title for the graph
-$graph->title->Set('Sunspot example');
-
-// Setup titles and X-axis labels
-$graph->xaxis->title->Set('(year from 1701)');
-
-// Setup Y-axis title
-$graph->yaxis->title->Set('(# sunspots)');
-
-// Create the linear plot
-$lineplot=new LinePlot($ydata);
-$lineplot->SetFillColor('orange@0.5');
-
-// Add the plot to the graph
-$graph->Add($lineplot);
-
-// Display the graph
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/sunspotsex3.php b/#jpgraph/src/Examples/sunspotsex3.php
deleted file mode 100644
index cf54cb44..00000000
--- a/#jpgraph/src/Examples/sunspotsex3.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-function readsunspotdata($aFile, &$aYears, &$aSunspots) {
-    $lines = @file($aFile,FILE_IGNORE_NEW_LINES|FILE_SKIP_EMPTY_LINES);
-    if( $lines === false ) {
-        throw new JpGraphException('Can not read sunspot data file.');
-    }
-    foreach( $lines as $line => $datarow ) {
-        $split = preg_split('/[\s]+/',$datarow);
-        $aYears[] = substr(trim($split[0]),0,4);
-        $aSunspots[] = trim($split[1]);
-    }
-}
-
-$year = array();
-$ydata = array();
-readsunspotdata('yearssn.txt',$year,$ydata);
-
- // Width and height of the graph
-$width = 600; $height = 200;
-
-// Create a graph instance
-$graph = new Graph($width,$height);
-
-// Specify what scale we want to use,
-// int = integer scale for the X-axis
-// int = integer scale for the Y-axis
-$graph->SetScale('intint');
-
-// Setup a title for the graph
-$graph->title->Set('Sunspot example');
-
-// Setup titles and X-axis labels
-$graph->xaxis->title->Set('(year from 1701)');
-$graph->xaxis->SetTickLabels($year);
-
-// Setup Y-axis title
-$graph->yaxis->title->Set('(# sunspots)');
-
-// Create the linear plot
-$lineplot=new LinePlot($ydata);
-$lineplot->SetFillColor('orange@0.5');
-
-// Add the plot to the graph
-$graph->Add($lineplot);
-
-// Display the graph
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/sunspotsex4.php b/#jpgraph/src/Examples/sunspotsex4.php
deleted file mode 100644
index e0877e03..00000000
--- a/#jpgraph/src/Examples/sunspotsex4.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-function readsunspotdata($aFile, &$aYears, &$aSunspots) {
-    $lines = @file($aFile,FILE_IGNORE_NEW_LINES|FILE_SKIP_EMPTY_LINES);
-    if( $lines === false ) {
-        throw new JpGraphException('Can not read sunspot data file.');
-    }
-    foreach( $lines as $line => $datarow ) {
-        $split = preg_split('/[\s]+/',$datarow);
-        $aYears[] = substr(trim($split[0]),0,4);
-        $aSunspots[] = trim($split[1]);
-    }
-}
-
-$year = array();
-$ydata = array();
-readsunspotdata('yearssn.txt',$year,$ydata);
-
- // Width and height of the graph
-$width = 600; $height = 200;
-
-// Create a graph instance
-$graph = new Graph($width,$height);
-
-// Specify what scale we want to use,
-// int = integer scale for the X-axis
-// int = integer scale for the Y-axis
-$graph->SetScale('intint',0,0,0,max($year)-min($year)+1);
-
-// Setup a title for the graph
-$graph->title->Set('Sunspot example');
-
-// Setup titles and X-axis labels
-$graph->xaxis->title->Set('(year from 1701)');
-$graph->xaxis->SetTickLabels($year);
-
-// Setup Y-axis title
-$graph->yaxis->title->Set('(# sunspots)');
-
-// Create the linear plot
-$lineplot=new LinePlot($ydata);
-$lineplot->SetFillColor('orange@0.5');
-
-// Add the plot to the graph
-$graph->Add($lineplot);
-
-// Display the graph
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/sunspotsex5.php b/#jpgraph/src/Examples/sunspotsex5.php
deleted file mode 100644
index 3d7322a2..00000000
--- a/#jpgraph/src/Examples/sunspotsex5.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-function readsunspotdata($aFile, &$aYears, &$aSunspots) {
-    $lines = @file($aFile,FILE_IGNORE_NEW_LINES|FILE_SKIP_EMPTY_LINES);
-    if( $lines === false ) {
-        throw new JpGraphException('Can not read sunspot data file.');
-    }
-    foreach( $lines as $line => $datarow ) {
-        $split = preg_split('/[\s]+/',$datarow);
-        $aYears[] = substr(trim($split[0]),0,4);
-        $aSunspots[] = trim($split[1]);
-    }
-}
-
-$year = array();
-$ydata = array();
-readsunspotdata('yearssn.txt',$year,$ydata);
-
-function year_callback($aLabel) {
-    return 1700+(int)$aLabel;
-}
-
- // Width and height of the graph
-$width = 600; $height = 200;
-
-// Create a graph instance
-$graph = new Graph($width,$height);
-
-// Specify what scale we want to use,
-// int = integer scale for the X-axis
-// int = integer scale for the Y-axis
-$graph->SetScale('intint');
-
-// Setup a title for the graph
-$graph->title->Set('Sunspot example');
-
-// Setup titles and X-axis labels
-$graph->xaxis->title->Set('(year from 1701)');
-$graph->xaxis->SetLabelFormatCallback('year_callback');
-
-// Setup Y-axis title
-$graph->yaxis->title->Set('(# sunspots)');
-
-// Create the linear plot
-$lineplot=new LinePlot($ydata);
-$lineplot->SetFillColor('orange@0.5');
-
-// Add the plot to the graph
-$graph->Add($lineplot);
-
-// Display the graph
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/sunspotsex6.php b/#jpgraph/src/Examples/sunspotsex6.php
deleted file mode 100644
index 2efe6448..00000000
--- a/#jpgraph/src/Examples/sunspotsex6.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-function readsunspotdata($aFile, &$aYears, &$aSunspots) {
-
-    $lines = @file($aFile,FILE_IGNORE_NEW_LINES|FILE_SKIP_EMPTY_LINES);
-    if( $lines === false ) {
-        throw new JpGraphException('Can not read sunspot data file.');
-    }
-    foreach( $lines as $line => $datarow ) {
-        $split = preg_split('/[\s]+/',$datarow);
-        $aYears[] = substr(trim($split[0]),0,4);
-        $aSunspots[] = trim($split[1]);
-    }
-}
-
-$year = array();
-$ydata = array();
-readsunspotdata('yearssn.txt',$year,$ydata);
-
- // Width and height of the graph
-$width = 600; $height = 200;
-
-// Create a graph instance
-$graph = new Graph($width,$height);
-
-// Specify what scale we want to use,
-// int = integer scale for the X-axis
-// int = integer scale for the Y-axis
-$graph->SetScale('intint');
-
-// Setup a title for the graph
-$graph->title->Set('Sunspot example');
-
-// Setup titles and X-axis labels
-$graph->xaxis->title->Set('(year from 1701)');
-
-// Setup Y-axis title
-$graph->yaxis->title->Set('(# sunspots)');
-
-// Create the bar plot
-$barplot=new BarPlot($ydata);
-
-// Add the plot to the graph
-$graph->Add($barplot);
-
-// Display the graph
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/sunspotsex7.php b/#jpgraph/src/Examples/sunspotsex7.php
deleted file mode 100644
index b104f9fe..00000000
--- a/#jpgraph/src/Examples/sunspotsex7.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-function readsunspotdata($aFile, &$aYears, &$aSunspots) {
-    $lines = @file($aFile,FILE_IGNORE_NEW_LINES|FILE_SKIP_EMPTY_LINES);
-    if( $lines === false ) {
-        throw new JpGraphException('Can not read sunspot data file.');
-    }
-    foreach( $lines as $line => $datarow ) {
-        $split = preg_split('/[\s]+/',$datarow);
-        $aYears[] = substr(trim($split[0]),0,4);
-        $aSunspots[] = trim($split[1]);
-    }
-}
-
-$year = array();
-$ydata = array();
-readsunspotdata('yearssn.txt',$year,$ydata);
-
-// Just keep the last 20 values in the arrays
-$year = array_slice($year, -20);
-$ydata = array_slice($ydata, -20);
-
- // Width and height of the graph
-$width = 600; $height = 200;
-
-// Create a graph instance
-$graph = new Graph($width,$height);
-
-// Specify what scale we want to use,
-// text = txt scale for the X-axis
-// int = integer scale for the Y-axis
-$graph->SetScale('textint');
-
-// Setup a title for the graph
-$graph->title->Set('Sunspot example');
-
-// Setup titles and X-axis labels
-$graph->xaxis->title->Set('(year)');
-$graph->xaxis->SetTickLabels($year);
-
-// Setup Y-axis title
-$graph->yaxis->title->Set('(# sunspots)');
-
-// Create the bar plot
-$barplot=new BarPlot($ydata);
-
-// Add the plot to the graph
-$graph->Add($barplot);
-
-// Display the graph
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/table_flagex1.php b/#jpgraph/src/Examples/table_flagex1.php
deleted file mode 100644
index 8729561d..00000000
--- a/#jpgraph/src/Examples/table_flagex1.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-include '../jpgraph.php';
-include '../jpgraph_canvas.php';
-include '../jpgraph_table.php';
-include '../jpgraph_iconplot.php';
-include '../jpgraph_flags.php';
-
-// Setup a basic canvas to use as graph to add the table
-$graph = new CanvasGraph(500,200);
-
-// Setup the basic table
-$data = array(
-    array('Areas'),
-    array(''),
-    array('','USA','UK','France','Denmark','Iceland','Canada'),
-    array('Feb',13,17,15,8,3,9),
-    array('Mar',34,35,26,20,22,16),
-    array('Apr',41,43,49,45,51,47),
-    array('Sum:',88,95,90,73,76,72));
-
-$countries = array('united states','united kingdom','french republic','denmark','iceland','canada');
-
-// Create a basic table and default fonr
-$table = new GTextTable();
-$table->Set($data);
-$table->SetFont(FF_TIMES,FS_NORMAL,11);
-
-// Adjust the font for row 0 and 6
-$table->SetColFont(0,FF_ARIAL,FS_BOLD,11);
-$table->SetRowFont(6,FF_TIMES,FS_BOLD,12);
-
-// Set the minimum heigth/width
-$table->SetMinRowHeight(2,10);
-$table->SetMinColWidth(70);
-
-// Add some padding (in pixels)
-$table->SetRowPadding(2,0);
-$table->SetRowGrid(6,1,'darkgray',TGRID_DOUBLE2);
-
-// Setup the grid
-$table->SetGrid(0);
-$table->SetRowGrid(6,1,'black',TGRID_DOUBLE2);
-
-// Merge all cells in row 0
-$table->MergeRow(0);
-
-// Set aligns
-$table->SetAlign(3,0,6,6,'right');
-$table->SetRowAlign(1,'center');
-$table->SetRowAlign(2,'center');
-
-// Set background colors
-$table->SetRowFillColor(0,'lightgray@0.5');
-$table->SetColFillColor(0,'lightgray@0.5');
-
-// Add the country flags in row 1
-$n = count($countries);
-for($i=0; $i < $n; ++$i ) {
-    $table->SetCellCountryFlag(1,$i+1,$countries[$i],0.5);
-    $table->SetCellImageConstrain(1,$i+1,TIMG_HEIGHT,20);
-}
-
-// Add the table to the graph
-$graph->Add($table);
-
-// Send back the table graph to the client
-$graph->Stroke();
-
-?>
-
diff --git a/#jpgraph/src/Examples/table_howto1.php b/#jpgraph/src/Examples/table_howto1.php
deleted file mode 100644
index bb50fa03..00000000
--- a/#jpgraph/src/Examples/table_howto1.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_canvas.php');
-require_once ('jpgraph/jpgraph_table.php');
-
-// Create a canvas graph where the table can be added
-$graph = new CanvasGraph(70,50);
-
-// Setup the basic table
-$data = array( array(1,2,3,4),array(5,6,7,8));
-$table = new GTextTable();
-$table->Set($data);
-
-// Add the table to the graph
-$graph->Add($table);
-
-// ... and send back the table to the client
-$graph->Stroke();
-
-?>
-
diff --git a/#jpgraph/src/Examples/table_howto2.php b/#jpgraph/src/Examples/table_howto2.php
deleted file mode 100644
index 69d25e6b..00000000
--- a/#jpgraph/src/Examples/table_howto2.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_canvas.php');
-require_once ('jpgraph/jpgraph_table.php');
-
-// Create a canvas graph where the table can be added
-$graph = new CanvasGraph(70,50);
-
-// Setup the basic table
-$data = array( array(1,2,3,4),array(5,6,7,8));
-$table = new GTextTable();
-$table->Set($data);
-
-// Merge all cellsn in the rectangle with
-// top left corner = (0,2) and bottom right = (1,3)
-$table->MergeCells(0,2,1,3);
-
-// Add the table to the graph
-$graph->Add($table);
-
-// ... and send back the table to the client
-$graph->Stroke();
-
-?>
-
diff --git a/#jpgraph/src/Examples/table_howto3.php b/#jpgraph/src/Examples/table_howto3.php
deleted file mode 100644
index 26417b4a..00000000
--- a/#jpgraph/src/Examples/table_howto3.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_canvas.php');
-require_once ('jpgraph/jpgraph_table.php');
-
-// Create a canvas graph where the table can be added
-$graph = new CanvasGraph(70,50);
-
-// Setup the basic table
-$data = array( array(1,2,3,4),array(5,6,7,8));
-$table = new GTextTable();
-$table->Set($data);
-
-// Merge all cells in row 0
-$table->MergeRow(0);
-
-// Add table to graph
-$graph->Add($table);
-
-// ... and send back the table to the client
-$graph->Stroke();
-
-?>
-
diff --git a/#jpgraph/src/Examples/table_howto4.php b/#jpgraph/src/Examples/table_howto4.php
deleted file mode 100644
index d093fcb3..00000000
--- a/#jpgraph/src/Examples/table_howto4.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_canvas.php');
-require_once ('jpgraph/jpgraph_table.php');
-
-// Create a canvas graph where the table can be added
-$graph = new CanvasGraph(70,50);
-
-// Setup the basic table
-$data = array( array(1,2,3,4),array(5,6,7,8));
-$table = new GTextTable();
-$table->Set($data);
-
-// Merge all cells in row 0
-$table->MergeRow(0);
-
-// Set foreground and background color
-$table->SetCellFillColor(0,0,'orange@0.7');
-$table->SetCellColor(0,0,'darkred');
-
-// Add the table to the graph
-$graph->Add($table);
-
-// and send it back to the client
-$graph->Stroke();
-
-?>
-
diff --git a/#jpgraph/src/Examples/table_howto5.php b/#jpgraph/src/Examples/table_howto5.php
deleted file mode 100644
index 252318af..00000000
--- a/#jpgraph/src/Examples/table_howto5.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_canvas.php');
-require_once ('jpgraph/jpgraph_table.php');
-
-// Create a canvas graph where the table can be added
-$graph = new CanvasGraph(70,60);
-
-// Setup the basic table
-$data = array( array(1,2,3,4),array(5,6,7,8));
-$table = new GTextTable();
-$table->Set($data);
-
-// Merge all cells in row 0
-$table->MergeRow(0);
-
-// Adjust font in cell (0,0)
-$table->SetCellFont(0,0,FF_ARIAL,FS_BOLD,14);
-
-// Set left align for all cells in rectangle (0,0) - (0,3)
-$table->SetAlign(0,0,0,3,'Left');
-
-// Add table to graph
-$graph->Add($table);
-
-// ... send it back to the client
-$graph->Stroke();
-
-?>
-
diff --git a/#jpgraph/src/Examples/table_howto6.php b/#jpgraph/src/Examples/table_howto6.php
deleted file mode 100644
index c776494e..00000000
--- a/#jpgraph/src/Examples/table_howto6.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_canvas.php');
-require_once ('jpgraph/jpgraph_table.php');
-
-// Create a canvas graph where the table can be added
-$graph = new CanvasGraph(150,60);
-
-// Setup the basic table
-$data = array( array(1,2,3,4),array(5,6,7,8));
-$table = new GTextTable();
-$table->Set($data);
-
-// Merge all cells in row 0
-$table->MergeRow(0);
-
-// Setup font and color
-$table->SetCellFont(0,0,FF_ARIAL,FS_BOLD,14);
-$table->SetRowFillColor(0,'orange@0.5');
-$table->SetRowColor(0,'darkred');
-
-// Setup the minimum width of all columns
-$table->SetMinColWidth(35);
-
-// Add table to the graph
-$graph->Add($table);
-
-// ... send it back to the client
-$graph->Stroke();
-
-?>
-
diff --git a/#jpgraph/src/Examples/table_howto7.1.php b/#jpgraph/src/Examples/table_howto7.1.php
deleted file mode 100644
index 4dbe52d7..00000000
--- a/#jpgraph/src/Examples/table_howto7.1.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_canvas.php');
-require_once ('jpgraph/jpgraph_table.php');
-
-// Create a canvas graph where the table can be added
-$graph = new CanvasGraph(150,90);
-
-// Setup the basic table
-$data = array( array(1,2,3,4),array(5,6,7,8), array(6,8,10,12));
-$table = new GTextTable();
-$table->Set($data);
-
-// Set default font in entire table
-$table->SetFont(FF_ARIAL,FS_NORMAL,11);
-
-// Setup font and color for row = 2
-$table->SetRowFont(2,FF_ARIAL,FS_BOLD,11);
-$table->SetRowFillColor(2,'orange@0.5');
-
-// Setup minimum color width
-$table->SetMinColWidth(35);
-
-// Setup grid on row 2
-$table->SetRowGrid(2,1,'black',TGRID_DOUBLE);
-
-// Add table to the graph
-$graph->Add($table);
-
-// and send it back to the client
-$graph->Stroke();
-
-?>
-
diff --git a/#jpgraph/src/Examples/table_howto7.2.php b/#jpgraph/src/Examples/table_howto7.2.php
deleted file mode 100644
index 8a159f8a..00000000
--- a/#jpgraph/src/Examples/table_howto7.2.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_canvas.php');
-require_once ('jpgraph/jpgraph_table.php');
-
-// Create a canvas graph where the table can be added
-$graph = new CanvasGraph(150,90);
-
-// Setup the basic table
-$data = array( array(1,2,3,4),array(5,6,7,8), array(6,8,10,12));
-$table = new GTextTable();
-$table->Set($data);
-
-// Set default font in entire table
-$table->SetFont(FF_ARIAL,FS_NORMAL,11);
-
-// Setup font and color for row = 2
-$table->SetRowFont(2,FF_ARIAL,FS_BOLD,11);
-$table->SetRowFillColor(2,'orange@0.5');
-
-// Setup minimum color width
-$table->SetMinColWidth(35);
-
-// Setup grid on row 2
-$table->SetRowGrid(2,1,'black',TGRID_DOUBLE2);
-
-// Add table to the graph
-$graph->Add($table);
-
-// and send it back to the client
-$graph->Stroke();
-
-?>
-
diff --git a/#jpgraph/src/Examples/table_howto7.php b/#jpgraph/src/Examples/table_howto7.php
deleted file mode 100644
index 8a159f8a..00000000
--- a/#jpgraph/src/Examples/table_howto7.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_canvas.php');
-require_once ('jpgraph/jpgraph_table.php');
-
-// Create a canvas graph where the table can be added
-$graph = new CanvasGraph(150,90);
-
-// Setup the basic table
-$data = array( array(1,2,3,4),array(5,6,7,8), array(6,8,10,12));
-$table = new GTextTable();
-$table->Set($data);
-
-// Set default font in entire table
-$table->SetFont(FF_ARIAL,FS_NORMAL,11);
-
-// Setup font and color for row = 2
-$table->SetRowFont(2,FF_ARIAL,FS_BOLD,11);
-$table->SetRowFillColor(2,'orange@0.5');
-
-// Setup minimum color width
-$table->SetMinColWidth(35);
-
-// Setup grid on row 2
-$table->SetRowGrid(2,1,'black',TGRID_DOUBLE2);
-
-// Add table to the graph
-$graph->Add($table);
-
-// and send it back to the client
-$graph->Stroke();
-
-?>
-
diff --git a/#jpgraph/src/Examples/table_howto8.php b/#jpgraph/src/Examples/table_howto8.php
deleted file mode 100644
index a89785b3..00000000
--- a/#jpgraph/src/Examples/table_howto8.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_canvas.php');
-require_once ('jpgraph/jpgraph_table.php');
-
-// Create a canvas graph where the table can be added
-$graph = new CanvasGraph(150,90);
-
-// Setup the basic table
-$data = array( array(1,2,3,4),array(5,6,7,8), array(6,8,10,12));
-$table = new GTextTable();
-$table->Set($data);
-
-// Setup overall table font
-$table->SetFont(FF_ARIAL,FS_NORMAL,11);
-
-// Setup font and color for row = 2
-$table->SetRowFont(2,FF_ARIAL,FS_BOLD,11);
-$table->SetRowFillColor(2,'orange@0.5');
-
-// Setup minimum color width
-$table->SetMinColWidth(35);
-
-// Setup overall cell alignment for the table
-$table->SetAlign('right');
-
-// Setup overall table border
-$table->SetBorder(0,'black');
-
-// Setup overall table grid
-$table->setGrid(0,'black');
-
-// Set specific frid for row = 2
-$table->SetRowGrid(2,1,'black',TGRID_DOUBLE2);
-
-// Add the table to the graph
-$graph->Add($table);
-
-// and send it back to the browser
-$graph->Stroke();
-
-?>
-
diff --git a/#jpgraph/src/Examples/table_howto9.php b/#jpgraph/src/Examples/table_howto9.php
deleted file mode 100644
index cf6f65f4..00000000
--- a/#jpgraph/src/Examples/table_howto9.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_canvas.php');
-require_once ('jpgraph/jpgraph_table.php');
-
-// Setup graph context
-$graph = new CanvasGraph(165,90);
-
-// Setup the basic table
-$data = array( array(1,2,3,4),array(5,6,7,8), array(6,8,10,12));
-$table = new GTextTable();
-$table->Set($data);
-
-// Setup overall table font
-$table->SetFont(FF_ARIAL,FS_NORMAL,11);
-
-// Setup font and color for row = 2
-$table->SetRowFont(2,FF_ARIAL,FS_BOLD,11);
-$table->SetRowFillColor(2,'orange@0.5');
-
-// Setup minimum color width
-$table->SetMinColWidth(40);
-
-// Setup overall cell alignment for the table
-$table->SetAlign('right');
-
-// Setup overall table border
-$table->SetBorder(0,'black');
-
-// Setup overall table grid
-$table->setGrid(0,'black');
-
-// Set specific frid for row = 2
-$table->SetRowGrid(2,1,'black',TGRID_DOUBLE2);
-
-// Setup overall number format in all cells
-$table->SetNumberFormat("%0.1f");
-
-// Add table to the graph
-$graph->Add($table);
-
-// and send it back to the browser
-$graph->Stroke();
-
-?>
-
diff --git a/#jpgraph/src/Examples/table_mex0.php b/#jpgraph/src/Examples/table_mex0.php
deleted file mode 100644
index 9568874e..00000000
--- a/#jpgraph/src/Examples/table_mex0.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_canvas.php');
-require_once ('jpgraph/jpgraph_table.php');
-
-// Setup graph context
-$graph = new CanvasGraph(430,150);
-
-// Setup the basic table
-$data = array(
-    array('',        'w631','w632','w633','w634','w635','w636'),
-    array('Critical (sum)',13,17,15,8,3,9),
-    array('High (sum)',34,35,26,20,22,16),
-    array('Low (sum)',41,43,49,45,51,47),
-    array('Sum:',88,95,90,73,76,72)
-    );
-
-// Setup a basic table
-$table = new GTextTable();
-$table->Set($data);
-
-// Setup fonts
-$table->SetFont(FF_TIMES,FS_NORMAL,11);
-$table->SetColFont(0,FF_ARIAL,FS_NORMAL,11);
-$table->SetRowFont(0,FF_ARIAL,FS_NORMAL,11);
-$table->SetRowFont(4,FF_TIMES,FS_BOLD,14);
-
-// Turn off the grid
-$table->SetGrid(0);
-
-// Setup color
-$table->SetRowFillColor(0,'lightgray@0.5');
-$table->SetRowFillColor(4,'lightgray@0.5');
-$table->SetColFillColor(0,'lightgray@0.5');
-$table->SetFillColor(0,0,4,0,'lightgray@0.5');
-
-// Set default minimum column width
-$table->SetMinColWidth(45);
-
-// Set default table alignment
-$table->SetAlign('right');
-
-// Add table to the graph
-$graph->Add($table);
-
-// and send it back to the client
-$graph->Stroke();
-
-?>
-
diff --git a/#jpgraph/src/Examples/table_mex00.php b/#jpgraph/src/Examples/table_mex00.php
deleted file mode 100644
index ecd7410d..00000000
--- a/#jpgraph/src/Examples/table_mex00.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_canvas.php');
-require_once ('jpgraph/jpgraph_table.php');
-
-// Setup graph context
-$graph = new CanvasGraph(430,150);
-
-// Setup the basic table
-$data = array(
-    array('',        'w631','w632','w633','w634','w635','w636'),
-    array('Critical (sum)',13,17,15,8,3,9),
-    array('High (sum)',34,35,26,20,22,16),
-    array('Low (sum)',41,43,49,45,51,47),
-    array('Sum:',88,95,90,73,76,72)
-    );
-
-// Setup the basic table and font
-$table = new GTextTable();
-$table->Set($data);
-$table->SetFont(FF_TIMES,FS_NORMAL,11);
-
-// Set default table alignment
-$table->SetAlign('right');
-
-// Add table to graph
-$graph->Add($table);
-
-// and send it back to the client
-$graph->Stroke();
-
-?>
-
diff --git a/#jpgraph/src/Examples/table_mex1.php b/#jpgraph/src/Examples/table_mex1.php
deleted file mode 100644
index ce40d0e7..00000000
--- a/#jpgraph/src/Examples/table_mex1.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_canvas.php');
-require_once ('jpgraph/jpgraph_table.php');
-
-// Setup graph context
-$graph = new CanvasGraph(430,150);
-
-// Setup the basic table
-$data = array(
-    array('', 'w631', 'w632', 'w633', 'w634', 'w635', 'w636'),
-    array('Critical (sum)',13,17,15,8,3,9),
-    array('High (sum)',34,35,26,20,22,16),
-    array('Low (sum)',41,43,49,45,51,47),
-    array('Sum',88,95,90,73,76,72)
-    );
-
-// Setup the basic table and font
-$table = new GTextTable();
-$table->Set($data);
-$table->SetFont(FF_ARIAL,FS_NORMAL,11);
-
-// Setup default column width
-$table->SetMinColWidth(40);
-
-// Setup defalt table alignment
-$table->SetAlign('right');
-
-// Turn off border
-$table->SetBorder(0);
-
-// Turn off grid
-$table->setGrid(0);
-
-// Setup font for row 4 and 0
-$table->SetRowFont(4,FF_ARIAL,FS_BOLD,11);
-$table->SetRowFont(0,FF_ARIAL,FS_BOLD,11);
-
-// Setup color
-$table->SetRowFillColor(4,'orange@0.5');
-$table->SetFillColor(0,1,0,6,'teal@0.8');
-
-
-// Setup grids
-$table->SetRowGrid(4,1,'black',TGRID_DOUBLE2);
-$table->SetColGrid(1,1,'black',TGRID_SINGLE);
-$table->SetRowGrid(1,1,'black',TGRID_SINGLE);
-
-// Add table to the graph
-$graph->Add($table);
-
-// Send it back to the client
-$graph->Stroke();
-
-?>
-
diff --git a/#jpgraph/src/Examples/table_mex2.php b/#jpgraph/src/Examples/table_mex2.php
deleted file mode 100644
index a4acc9d8..00000000
--- a/#jpgraph/src/Examples/table_mex2.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_canvas.php');
-require_once ('jpgraph/jpgraph_table.php');
-
-// Setup graph context
-$graph = new CanvasGraph(430,150);
-
-// Setup the basic table
-$data = array(
-    array('',        'w631','w632','w633','w634','w635','w636'),
-    array('Critical (sum)',13,17,15,8,3,9),
-    array('High (sum)',34,35,26,20,22,16),
-    array('Low (sum)',41,43,49,45,51,47),
-    array('Sum:',88,95,90,73,76,72)
-    );
-
-// Setup the basic table and font
-$table = new GTextTable();
-$table->Set($data);
-$table->SetFont(FF_ARIAL,FS_NORMAL,11);
-
-// Set default minimum color width
-$table->SetMinColWidth(40);
-
-// Set default table alignment
-$table->SetAlign('right');
-
-// Set table border
-$table->SetBorder(0);
-
-// Turn off grid
-$table->setGrid(0);
-
-// Setup font
-$table->SetRowFont(4,FF_ARIAL,FS_BOLD,11);
-$table->SetRowFont(0,FF_ARIAL,FS_BOLD,11);
-
-// Setup various grid lines
-$table->SetRowGrid(4,2,'black',TGRID_SINGLE);
-$table->SetColGrid(1,3,'black',TGRID_SINGLE);
-$table->SetRowGrid(1,1,'black',TGRID_SINGLE);
-
-// Setup various colors
-$table->SetFillColor(0,1,0,6,'black');
-$table->SetRowColor(0,'white');
-$table->SetRowFillColor(4,'lightyellow');
-$table->SetFillColor(2,0,2,6,'lightgray');
-
-// Add table to the graph
-$graph->Add($table);
-
-
-// Send back to client
-$graph->Stroke();
-
-?>
-
diff --git a/#jpgraph/src/Examples/table_mex3.php b/#jpgraph/src/Examples/table_mex3.php
deleted file mode 100644
index 981181c4..00000000
--- a/#jpgraph/src/Examples/table_mex3.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_canvas.php');
-require_once ('jpgraph/jpgraph_table.php');
-
-// Setup graph context
-$graph = new CanvasGraph(430,150);
-
-// Setup the basic table
-$data = array(
-    array('',        'w631','w632','w633','w634','w635','w636'),
-    array('Critical (sum)',13,17,15,8,3,9),
-    array('High (sum)',34,35,26,20,22,16),
-    array('Low (sum)',41,43,49,45,51,47),
-    array('Sum:',88,95,90,73,76,72),
-    );
-
-// Setup the basic table and font
-$table = new GTextTable();
-$table->Set($data);
-$table->SetFont(FF_ARIAL,FS_NORMAL,11);
-
-// Set default minimum color width
-$table->SetMinColWidth(40);
-
-// Set default table alignment
-$table->SetAlign('right');
-
-// Turn off grid
-$table->setGrid(0);
-
-// Set table border
-$table->SetBorder(2);
-
-// Setup font
-$table->SetRowFont(4,FF_ARIAL,FS_BOLD,11);
-$table->SetRowFont(0,FF_ARIAL,FS_BOLD,11);
-$table->SetFont(1,2,1,3,FF_ARIAL,FS_BOLD,11);
-
-// Setup grids
-$table->SetRowGrid(4,2,'black',TGRID_SINGLE);
-$table->SetColGrid(1,1,'black',TGRID_SINGLE);
-$table->SetRowGrid(1,1,'black',TGRID_SINGLE);
-
-// Setup colors
-$table->SetFillColor(0,1,0,6,'black');
-$table->SetRowColor(0,'white');
-$table->SetRowFillColor(4,'lightgray@0.3');
-$table->SetFillColor(2,0,2,6,'lightgray@0.6');
-$table->SetFillColor(1,2,1,3,'lightred');
-
-// Add table to graph
-$graph->Add($table);
-
-// Send back to the client
-$graph->Stroke();
-
-?>
-
diff --git a/#jpgraph/src/Examples/table_vtext.php b/#jpgraph/src/Examples/table_vtext.php
deleted file mode 100644
index 1b2b349a..00000000
--- a/#jpgraph/src/Examples/table_vtext.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_canvas.php');
-require_once ('jpgraph/jpgraph_table.php');
-
-// Setup a basic canvas graph context
-$graph = new CanvasGraph(630,600);
-
-// Setup the basic table
-$data = array(
-    array('GROUP 1O',        'w631','w632','w633','w634','w635','w636'),
-    array('Critical (sum)',13,17,15,8,3,9),
-    array('High (sum)',34,35,26,20,22,16),
-    array('Low (sum)',41,43,49,45,51,47),
-    array('Sum:',88,95,90,73,76,72)
-    );
-
-// Setup a basic table
-$table = new GTextTable();
-$table->Set($data);
-$table->SetAlign('right');
-$table->SetFont(FF_TIMES,FS_NORMAL,12);
-$table->SetCellFont(0,0,FF_ARIAL,FS_BOLD,16);
-
-// Rotate the entire table 90 degrees
-$table->SetTextOrientation(90);
-//$table->SetCellTextOrientation(0,0,0);
-
-// Setup background color for header column
-$table->SetColFillColor(0,'lightgray');
-
-// Set the imnimum row height
-$table->SetMinRowHeight(0,150);
-
-// Add table to graph
-$graph->Add($table);
-
-// and send it back to the client
-$graph->Stroke();
-
-?>
-
diff --git a/#jpgraph/src/Examples/table_vtext_ex1.php b/#jpgraph/src/Examples/table_vtext_ex1.php
deleted file mode 100644
index 9581884b..00000000
--- a/#jpgraph/src/Examples/table_vtext_ex1.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_canvas.php');
-require_once ('jpgraph/jpgraph_table.php');
-
-// Setup a basic canvas graph context
-$graph = new CanvasGraph(430,600);
-
-// Setup the basic table
-$data = array(
-    array('GROUP 1O',        'w631','w632','w633','w634','w635','w636'),
-    array('Critical (sum)',13,17,15,8,3,9),
-    array('High (sum)',34,35,26,20,22,16),
-    array('Low (sum)',41,43,49,45,51,47),
-    array('Sum:',88,95,90,73,76,72)
-    );
-
-// Setup the basic table and default font
-$table = new GTextTable();
-$table->Set($data);
-$table->SetFont(FF_TIMES,FS_NORMAL,11);
-
-// Default table alignment
-$table->SetAlign('right');
-
-// Adjust font in (0,0)
-$table->SetCellFont(0,0,FF_TIMES,FS_BOLD,14);
-
-// Rotate all textxs in row  0
-$table->SetRowTextOrientation(0,90);
-
-// Adjust alignment in cell (0,0)
-$table->SetCellAlign(0,0,'center','center');
-
-// Add table to graph
-$graph->Add($table);
-
-// Send back table to client
-$graph->Stroke();
-
-?>
-
diff --git a/#jpgraph/src/Examples/tablebarex1.php b/#jpgraph/src/Examples/tablebarex1.php
deleted file mode 100644
index 79567164..00000000
--- a/#jpgraph/src/Examples/tablebarex1.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-include ("../jpgraph.php");
-include ("../jpgraph_bar.php");
-include ("../jpgraph_table.php");
-
-$datay = array(
-    array('Jan','Feb','Mar','Apr','May','Jun'),
-    array(12,18,19,7,17,6),
-    array(3,5,2,7,5,25),
-    array(6,1.5,2.4,2.1,6.9,12.3))
-;
-
-// Some basic defines to specify the shape of the bar+table
-$nbrbar = 6;
-$cellwidth = 50;
-$tableypos = 200;
-$tablexpos = 60;
-$tablewidth = $nbrbar*$cellwidth;
-$rightmargin = 30;
-
-// Overall graph size
-$height = 320;
-$width = $tablexpos+$tablewidth+$rightmargin;
-
-// Create the basic graph. 
-$graph = new Graph($width,$height);	
-$graph->img->SetMargin($tablexpos,$rightmargin,30,$height-$tableypos);
-$graph->SetScale("textlin");
-$graph->SetMarginColor('white');
-
-// Setup titles and fonts
-$graph->title->Set('Bar and table');
-$graph->title->SetFont(FF_VERDANA,FS_NORMAL,14);
-$graph->yaxis->title->Set("Flow");
-$graph->yaxis->title->SetFont(FF_ARIAL,FS_NORMAL,12);
-$graph->yaxis->title->SetMargin(10);
-
-// Create the bars and the accbar plot
-$bplot = new BarPlot($datay[3]);
-$bplot->SetFillColor("orange");
-$bplot2 = new BarPlot($datay[2]);
-$bplot2->SetFillColor("red");
-$bplot3 = new BarPlot($datay[1]);
-$bplot3->SetFillColor("darkgreen");
-$accbplot = new AccBarPlot(array($bplot,$bplot2,$bplot3));
-$accbplot->value->Show();
-$graph->Add($accbplot);
-
-//Setup the table
-$table = new GTextTable();
-$table->Set($datay);
-$table->SetPos($tablexpos,$tableypos+1);
-
-// Basic table formatting
-$table->SetFont(FF_ARIAL,FS_NORMAL,10);
-$table->SetAlign('right');
-$table->SetMinColWidth($cellwidth);
-$table->SetNumberFormat('%0.1f');
-
-// Format table header row
-$table->SetRowFillColor(0,'teal@0.7');
-$table->SetRowFont(0,FF_ARIAL,FS_BOLD,11);
-$table->SetRowAlign(0,'center');
-
-// .. and add it to the graph
-$graph->Add($table);
-
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/tablebarex1_csim.php b/#jpgraph/src/Examples/tablebarex1_csim.php
deleted file mode 100644
index 96061493..00000000
--- a/#jpgraph/src/Examples/tablebarex1_csim.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-include ("../jpgraph.php");
-include ("../jpgraph_bar.php");
-include ("../jpgraph_table.php");
-
-$datay = array(
-    array('Jan','Feb','Mar','Apr','May','Jun'),
-    array(12,18,19,7,17,6),
-    array(3,5,2,7,5,25),
-    array(6,1.5,2.4,2.1,6.9,12.3))
-;
-
-// Some basic defines to specify the shape of the bar+table
-$nbrbar = 6;
-$cellwidth = 50;
-$tableypos = 200;
-$tablexpos = 60;
-$tablewidth = $nbrbar*$cellwidth;
-$rightmargin = 30;
-
-// Overall graph size
-$height = 320;
-$width = $tablexpos+$tablewidth+$rightmargin;
-
-// Create the basic graph. 
-$graph = new Graph($width,$height);	
-$graph->img->SetMargin($tablexpos,$rightmargin,30,$height-$tableypos);
-$graph->SetScale("textlin");
-$graph->SetMarginColor('white');
-
-// Setup titles and fonts
-$graph->title->Set('Bar and table');
-$graph->title->SetFont(FF_VERDANA,FS_NORMAL,14);
-$graph->yaxis->title->Set("Flow");
-$graph->yaxis->title->SetFont(FF_ARIAL,FS_NORMAL,12);
-$graph->yaxis->title->SetMargin(10);
-
-// Create the bars and the accbar plot
-$bplot = new BarPlot($datay[3]);
-$bplot->SetFillColor("orange");
-$bplot2 = new BarPlot($datay[2]);
-$bplot2->SetFillColor("red");
-$bplot3 = new BarPlot($datay[1]);
-$bplot3->SetFillColor("darkgreen");
-$accbplot = new AccBarPlot(array($bplot,$bplot2,$bplot3));
-$accbplot->value->Show();
-$graph->Add($accbplot);
-
-//Setup the table
-$table = new GTextTable();
-$table->Set($datay);
-$table->SetPos($tablexpos,$tableypos+1);
-
-$table->SetCellCSIMTarget(1,1,'tableex02.php','View details');
-
-// Basic table formatting
-$table->SetFont(FF_ARIAL,FS_NORMAL,10);
-$table->SetAlign('right');
-$table->SetMinColWidth($cellwidth);
-$table->SetNumberFormat('%0.1f');
-
-// Format table header row
-$table->SetRowFillColor(0,'teal@0.7');
-$table->SetRowFont(0,FF_ARIAL,FS_BOLD,11);
-$table->SetRowAlign(0,'center');
-
-// .. and add it to the graph
-$graph->Add($table);
-
-$graph->StrokeCSIM();
-
-?>
diff --git a/#jpgraph/src/Examples/tableex00.php b/#jpgraph/src/Examples/tableex00.php
deleted file mode 100644
index 0acabaed..00000000
--- a/#jpgraph/src/Examples/tableex00.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_canvas.php');
-require_once ('jpgraph/jpgraph_table.php');
-
-$cols = 4;
-$rows = 3;
-$data = array( array('','Jan','Feb','Mar','Apr'),
-	       array('Min','15.2', '12.5', '9.9', '70.0'),
-	       array('Max','23.9', '14.2', '18.6', '71.3'));
-
-// Create a basic graph context
-$graph = new CanvasGraph(300,200);
-
-// Create a basic table
-$table = new GTextTable($cols,$rows);
-$table->Set($data);
-
-//Add table to the graph
-$graph->Add($table);
-
-// Send back table to the client
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/tableex01.php b/#jpgraph/src/Examples/tableex01.php
deleted file mode 100644
index 8efe9f9f..00000000
--- a/#jpgraph/src/Examples/tableex01.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_canvas.php');
-require_once ('jpgraph/jpgraph_table.php');
-
-$cols = 4;
-$rows = 3;
-$data = array( array('','Jan','Feb','Mar','Apr'),
-	       array('Min','15.2', '12.5', '9.9', '70.0'),
-	       array('Max','23.9', '14.2', '18.6', '71.3'));
-
-$graph = new CanvasGraph(300,200);
-
-$table = new GTextTable($cols,$rows);
-$table->Init();
-$table->Set($data);
-
-$table->SetRowFont(0,FF_FONT1,FS_BOLD);
-$table->SetRowColor(0,'navy');
-$table->SetRowFillColor(0,'lightgray');
-
-$table->SetColFont(0,FF_FONT1,FS_BOLD);
-$table->SetColColor(0,'navy');
-$table->SetColFillColor(0,'lightgray');
-
-$graph->Add($table);
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/tableex01_csim.php b/#jpgraph/src/Examples/tableex01_csim.php
deleted file mode 100644
index ff11a70b..00000000
--- a/#jpgraph/src/Examples/tableex01_csim.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_canvas.php');
-require_once ('jpgraph/jpgraph_table.php');
-
-$cols = 4;
-$rows = 3;
-$data = array( array('','Jan','Feb','Mar','Apr'),
-	       array('Min','15.2', '12.5', '9.9', '70.0'),
-	       array('Max','23.9', '14.2', '18.6', '71.3'));
-
-// Setup basic graph canvas
-$graph = new CanvasGraph(300,200);
-
-// Create a basic table
-$table = new GTextTable($cols,$rows);
-$table->Set($data);
-
-$table->SetCellCSIMTarget(1,1,'tableex02.php','View details');
-
-$table->SetRowFont(0,FF_FONT1,FS_BOLD);
-$table->SetRowColor(0,'navy');
-$table->SetRowFillColor(0,'lightgray');
-
-$table->SetColFont(0,FF_FONT1,FS_BOLD);
-$table->SetColColor(0,'navy');
-$table->SetColFillColor(0,'lightgray');
-
-$graph->Add($table);
-
-$graph->StrokeCSIM();
-
-?>
diff --git a/#jpgraph/src/Examples/tableex02.php b/#jpgraph/src/Examples/tableex02.php
deleted file mode 100644
index 193f49f1..00000000
--- a/#jpgraph/src/Examples/tableex02.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_canvas.php');
-require_once ('jpgraph/jpgraph_table.php');
-
-$cols = 4;
-$rows = 3;
-$data = array( array('','Jan','Feb','Mar','Apr'),
-	       array('Min','15.2', '12.5', '9.9', '70.0'),
-	       array('Max','23.9', '14.2', '18.6', '71.3'));
-
-$graph = new CanvasGraph(300,200);
-
-$table = new GTextTable($cols,$rows);
-$table->Init();
-$table->Set($data);
-
-// Setup row and column headers
-$table->SetRowFont(0,FF_TIMES,FS_BOLD,11);
-$table->SetRowAlign(0,'left','bottom');
-$table->SetRowColor(0,'navy');
-$table->SetRowFillColor(0,'lightgray');
-$table->SetColFont(0,FF_ARIAL,FS_BOLD,11);
-$table->SetColColor(0,'navy');
-$table->SetColFillColor(0,'lightgray');
-
-// Highlight cell 2,3
-$table->SetCellFillColor(2,3,'yellow');
-
-$graph->Add($table);
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/tableex03.php b/#jpgraph/src/Examples/tableex03.php
deleted file mode 100644
index 5ac72151..00000000
--- a/#jpgraph/src/Examples/tableex03.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_canvas.php');
-require_once ('jpgraph/jpgraph_table.php');
-
-$cols = 4;
-$rows = 3;
-$data = array( array('2007'),
-               array('','Q1','','','Q2'),
-	       array('','Jan','Feb','Mar','Apr','May','Jun'),
-	       array('Min','15.2', '12.5', '9.9', '70.0', '22.4','21.5'),
-	       array('Max','23.9', '14.2', '18.6', '71.3','66.8','42.6'));
-
-$q=1;
-
-$graph = new CanvasGraph(350,200);
-
-$table = new GTextTable($cols,$rows);
-$table->Init();
-$table->Set($data);
-$table->SetBorder(2,'black');
-
-// Setup top row with the year title
-$table->MergeCells(0,0,0,6);
-$table->SetRowFont(0,FF_ARIAL,FS_BOLD,16);
-$table->SetRowColor(0,'navy');
-$table->SetRowAlign(0,'center');
-
-// Setup quarter header
-$table->MergeCells(1,1,1,3);
-$table->MergeCells(1,4,1,6);
-$table->SetRowAlign(1,'center');
-$table->SetRowFont(1,FF_ARIAL,FS_BOLD,10);
-$table->SetRowColor(1,'navy');
-$table->SetRowFillColor(1,'lightgray');
-$table->SetRowGrid(2,'',0); // Turn off the gridline just under the top row
-
-// Setup row and column headers
-$table->SetRowFont(2,FF_ARIAL,FS_NORMAL,11);
-$table->SetRowColor(2,'navy');
-$table->SetRowFillColor(2,'lightgray');
-
-$table->SetColFont(0,FF_ARIAL,FS_NORMAL,11);
-$table->SetColColor(0,'navy');
-$table->SetColFillColor(0,'lightgray');
-
-$table->SetCellFillColor(0,0,'lightgreen');
-$table->SetCellFillColor(1,0,'lightgreen');
-$table->SetCellFillColor(2,0,'lightgreen');
-
-// Highlight cell 2,3
-$table->SetCellFillColor(4,3,'yellow');
-
-$graph->Add($table);
-$graph->Stroke();
-
-?>
-
diff --git a/#jpgraph/src/Examples/tableex04.php b/#jpgraph/src/Examples/tableex04.php
deleted file mode 100644
index 21f540d3..00000000
--- a/#jpgraph/src/Examples/tableex04.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_canvas.php');
-require_once ('jpgraph/jpgraph_table.php');
-
-$data = array( array('','Jan','Feb','Mar','Apr','May','Jun'),
-	       array('Team 1','15.2', '12.5', '9.9', '70.0', '22.4','21.5'),
-	       array('Team 2','23.9', '14.2', '18.6', '71.3','66.8','42.6'),
-	       array('Sum:')
-);
-
-$r = count($data);
-$c = 7;
-
-for( $i=1; $i < $c; ++$i ) {
-    $tmp=0;
-    for($j=1; $j < $r-1; ++$j) {
-	$tmp += $data[$j][$i];
-    }
-    $data[3][$i] = sprintf('%2.1f',$tmp);;
-}
-
-
-$graph = new CanvasGraph(350,200);
-
-$table = new GTextTable();
-$table->Init();
-$table->Set($data);
-$table->SetBorder(2,'black');
-
-// Highlight summation row
-$table->SetRowFillColor($r-1,'yellow');
-$table->SetCellAlign($r-1,0,'right');
-
-// Setup row and column headers
-$table->SetRowFont(0,FF_ARIAL,FS_NORMAL,10);
-$table->SetRowColor(0,'navy');
-$table->SetRowFillColor(0,'lightgray');
-
-$table->SetColFont(0,FF_ARIAL,FS_NORMAL,10);
-$table->SetColColor(0,'navy');
-$table->SetColFillColor(0,'lightgray');
-
-$table->SetRowGrid($r-1,1,'black',TGRID_DOUBLE);
-
-$graph->Add($table);
-$graph->Stroke();
-
-?>
-
diff --git a/#jpgraph/src/Examples/tableex05.php b/#jpgraph/src/Examples/tableex05.php
deleted file mode 100644
index aad9e00d..00000000
--- a/#jpgraph/src/Examples/tableex05.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_canvas.php');
-require_once ('jpgraph/jpgraph_table.php');
-
-$data = array( array('','Jan','Feb','Mar','Apr','May','Jun'),
-	       array('Team 1','15.2', '12.5', '9.9', '70.0', '22.4','21.5'),
-	       array('Team 2','23.9', '14.2', '18.6', '71.3','66.8','42.6'),
-	       array('Sum:')
-);
-
-$r = count($data);
-$c = 7;
-
-for( $i=1; $i < $c; ++$i ) {
-    $tmp=0;
-    for($j=1; $j < $r-1; ++$j) {
-	$tmp += $data[$j][$i];
-    }
-    $data[3][$i] = sprintf('%2.1f',$tmp);;
-}
-
-$graph = new CanvasGraph(350,200);
-
-$table = new GTextTable();
-$table->Init();
-$table->Set($data);
-$table->SetBorder(2,'black');
-
-// Highlight summation row
-$table->SetRowFillColor($r-1,'yellow');
-$table->SetCellAlign($r-1,0,'right');
-
-// Setup row and column headers
-$table->SetRowFont(0,FF_ARIAL,FS_NORMAL,10);
-$table->SetRowColor(0,'navy');
-$table->SetRowFillColor(0,'lightgray');
-
-$table->SetColFont(0,FF_ARIAL,FS_NORMAL,10);
-$table->SetColColor(0,'navy');
-$table->SetColFillColor(0,'lightgray');
-
-$table->SetRowGrid($r-1,1,'black',TGRID_DOUBLE);
-
-$table->SetFont(1,4,2,6,FF_TIMES,FS_NORMAL,18);
-$table->SetFillColor(1,1,2,3,'red');
-
-$table->MergeCol(1);
-$graph->Add($table);
-$graph->Stroke();
-
-?>
-
diff --git a/#jpgraph/src/Examples/tabtitleex1.php b/#jpgraph/src/Examples/tabtitleex1.php
deleted file mode 100644
index 55d87ea1..00000000
--- a/#jpgraph/src/Examples/tabtitleex1.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$datay1 = array(20,15,23,15);
-$datay2 = array(12,9,42,8);
-$datay3 = array(5,17,32,24);
-
-// Setup the graph
-$graph = new Graph(300,200);
-$graph->SetMarginColor('white');
-$graph->SetScale("textlin");
-$graph->SetFrame(false);
-$graph->SetMargin(30,50,30,30);
-
-$graph->tabtitle->Set(' Year 2003 ' );
-$graph->tabtitle->SetFont(FF_ARIAL,FS_BOLD,13);
-
-
-$graph->yaxis->HideZeroLabel();
-$graph->ygrid->SetFill(true,'#EFEFEF@0.5','#BBCCFF@0.5');
-$graph->xgrid->Show();
-
-$graph->xaxis->SetTickLabels($gDateLocale->GetShortMonth());
-
-// Create the first line
-$p1 = new LinePlot($datay1);
-$p1->SetColor("navy");
-$p1->SetLegend('Line 1');
-$graph->Add($p1);
-
-// Create the second line
-$p2 = new LinePlot($datay2);
-$p2->SetColor("red");
-$p2->SetLegend('Line 2');
-$graph->Add($p2);
-
-// Create the third line
-$p3 = new LinePlot($datay3);
-$p3->SetColor("orange");
-$p3->SetLegend('Line 3');
-$graph->Add($p3);
-
-$graph->legend->SetShadow('gray@0.4',5);
-$graph->legend->SetPos(0.1,0.1,'right','top');
-// Output line
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/testsuit.php b/#jpgraph/src/Examples/testsuit.php
deleted file mode 100644
index 4ffb2892..00000000
--- a/#jpgraph/src/Examples/testsuit.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-//=======================================================================
-// File:	TESTSUIT.PHP
-// Description:	Run all the example script in current directory
-// Created: 	2002-07-11
-// Ver:		$Id: testsuit.php,v 1.1.2.1 2004/03/27 12:43:07 aditus Exp $
-//
-// License:	This code is released under QPL 1.0 
-// Copyright (C) 2001,2002 Johan Persson 
-//========================================================================
-
-//-------------------------------------------------------------------------
-//
-// Usage: testsuit.php[?type=1]    Generates all non image map scripts
-//        testsuit.php?type=2      Generates client side image map scripts 
-//       
-//-------------------------------------------------------------------------
-class TestDriver {
-    
-    private $iType;
-    private $iDir;
-
-    function TestDriver($aType=1,$aDir='') {
-	$this->iType = $aType;
-	if( $aDir == '' ) {
-	    $aDir = getcwd();
-	}
-	if( !chdir($aDir) ) {
-	    die("PANIC: Can't access directory : $aDir");
-	}
-	$this->iDir = $aDir;
-    }
-
-    function GetFiles() {
-	$d = @dir($this->iDir);
-	$a = array();
-	while( $entry=$d->Read() ) {
-	    if( strstr($entry,".php") && strstr($entry,"x") && !strstr($entry,"show") && !strstr($entry,"csim") ) {
-		$a[] = $entry;
-	    }
-	}
-	$d->Close();
-	if( count($a) == 0 ) {
-	    die("PANIC: Apache/PHP does not have enough permission to read the scripts in directory: $this->iDir");	    
-	}
-	sort($a);
-	return $a;
-    }
-
-    function GetCSIMFiles() {
-	$d = @dir($this->iDir);
-	$a = array();
-	while( $entry=$d->Read() ) {
-	    if( strstr($entry,".php") && strstr($entry,"csim") ) {
-		$a[] = $entry;
-	    }
-	}
-	$d->Close();
-	if( count($a) == 0 ) {
-	    die("PANIC: Apache/PHP does not have enough permission to read the CSIM scripts in directory: $this->iDir");	    
-	}
-	sort($a);
-	return $a;
-    }
-
-    
-    function Run() {
-	switch( $this->iType ) {
-	    case 1:
-		$files = $this->GetFiles();
-		break;
-	    case 2:
-		$files = $this->GetCSIMFiles();
-		break;
-	    default:
-		die('Panic: Unknown type of test');
-		break;
-	}
-	$n = count($files);
-	echo "<h2>Visual test suit for JpGraph</h2>";
-	echo "Testtype: " . ($this->iType==1 ? ' Standard images ':' Image map tests ');
-	echo "<br>Number of tests: $n<p>";
-	echo "<ol>";
-	
-	for( $i=0; $i<$n; ++$i ) {
-	    if( $this->iType ==1 ) {
-	    echo '<li><a href="show-example.php?target='.urlencode($files[$i]).'"><img src="'.$files[$i].'" border=0 align=top></a><br><strong>Filename:</strong> <i>'.basename($files[$i])."</i>\n";
-	    }
-	    else {
-		echo '<li><a href="show-example.php?target='.urlencode($files[$i]).'">'.$files[$i]."</a>\n";
-	    }
-	}
-	echo "</ol>";
-
-	echo "<p>Done.</p>";
-    }
-}
-
-$type=@$_GET['type'];
-if( empty($type) ) {
-    $type=1;
-}
-
-$driver = new TestDriver($type);
-$driver->Run();
-
-?>
diff --git a/#jpgraph/src/Examples/text-example1.php b/#jpgraph/src/Examples/text-example1.php
deleted file mode 100644
index 99de8ffe..00000000
--- a/#jpgraph/src/Examples/text-example1.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_canvas.php');
-
-// Create the graph. 
-$graph = new CanvasGraph(350,200);	
-
-$t1 = new Text("This is a text with more text");
-$t1->SetPos(0.05,0.5);
-$t1->SetOrientation("h");
-$t1->SetFont(FF_FONT1,FS_NORMAL);
-$t1->SetBox("white","black",'gray');
-$t1->SetColor("black");
-$graph->AddText($t1);
-
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/text-example2.php b/#jpgraph/src/Examples/text-example2.php
deleted file mode 100644
index b20cfa8e..00000000
--- a/#jpgraph/src/Examples/text-example2.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_canvas.php');
-
-// Create the graph. 
-$graph = new CanvasGraph(350,200);	
-
-$t1 = new Text("a good\nas you can see right now per see\nThis is a text with\nseveral lines\n");
-$t1->SetPos(0.05,100);
-$t1->SetFont(FF_FONT1,FS_NORMAL);
-$t1->SetBox("white","black",true);
-$t1->ParagraphAlign("right");
-$t1->SetColor("black");
-$graph->AddText($t1);
-
-$graph->Stroke();
-
-?>
diff --git a/#jpgraph/src/Examples/textalignex1.php b/#jpgraph/src/Examples/textalignex1.php
deleted file mode 100644
index a7b33c57..00000000
--- a/#jpgraph/src/Examples/textalignex1.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once "jpgraph/jpgraph.php";
-require_once "jpgraph/jpgraph_canvas.php";
-
-// We accept a URI argument to adjust the angle at what we display the text
-if( empty($_GET['a']) ) {
-    $angle=40;
-}
-else {
-    $angle=$_GET['a'];
-}
-
-// Caption below the image
-$caption = "Demonstration of different anchor points for texts as specified with\n".
-    "TextAlign(). The red cross marks the coordinate that was given to\n".
-    "stroke each instance of the string.\n(The green box is the bounding rectangle for the text.)";
-
-$txt="TextAlign()";
-
-
-// Initial width and height since we need a "dummy" canvas to
-// calculate the height of the text strings
-$w=480;$h=50;
-$xm=90;$ym=80;
-
-$g = new CanvasGraph($w,$h);
-
-// Make the image easier to access
-$img = $g->img;
-
-// Get the bounding box for text
-$img->SetFont(FF_ARIAL,FS_NORMAL,16);
-$tw=$img->GetBBoxWidth($txt,$angle);
-$th=$img->GetBBoxHeight($txt,$angle);
-
-$img->SetFont(FF_ARIAL,FS_NORMAL,11);
-$ch=$img->GetBBoxHeight($caption);
-
-// Calculate needed height for the image
-$h = 3*$th+2*$ym + $ch;
-$g = new CanvasGraph($w,$h);
-$img = $g->img;
-
-// Alignment for anchor points to use
-$anchors = array('left','top',
-              'center','top',
-              'right','top',
-              'left','center',
-              'center','center',
-              'right','center',
-              'left','bottom',
-              'center','bottom',
-              'right','bottom');
-
-$n = count($anchors)/2;
-
-for( $i=0,$r=0,$c=0; $i < $n; ++$i ) {
-
-    $x = $c*($tw+$xm)+$xm/2;
-    $y = $r*($th+$ym)+$ym/2-10;
-
-    $img->SetColor('blue');
-    $img->SetTextAlign($anchors[$i*2],$anchors[$i*2+1]);
-    $img->SetFont(FF_ARIAL,FS_NORMAL,16);
-    $img->StrokeText($x,$y,$txt,$angle,"left",true);
-
-    $img->SetColor('black');
-    $img->SetFont(FF_FONT1,FS_BOLD);
-    $img->SetTextAlign('center','top');
-    $align = sprintf('("%s","%s")',$anchors[$i*2],$anchors[$i*2+1]);
-    $img->StrokeText($c*($tw/2+$xm)+$xm/2+$tw/2,$r*($th/2+$ym)+$th+$ym/2-4,$align);
-
-    $c++;
-    if( $c==3 ) {
-        $c=0;$r++;
-    }
-}
-
-// Draw the caption text
-$img->SetTextAlign('center','bottom');
-$img->SetFont(FF_ARIAL,FS_ITALIC,11);
-$img->StrokeText($w/2,$h-10,$caption,0,'left');
-
-$img->SetColor('navy');
-$img->Rectangle(0,0,$w-1,$h-1);
-
-// .. and send back to browser
-$g->Stroke();
-
-?>
-
diff --git a/#jpgraph/src/Examples/textpalignex1.php b/#jpgraph/src/Examples/textpalignex1.php
deleted file mode 100644
index b4dfb36f..00000000
--- a/#jpgraph/src/Examples/textpalignex1.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once "jpgraph/jpgraph.php";
-require_once "jpgraph/jpgraph_canvas.php";
-
-// Caption below the image
-$txt="The day was rapidly becoming more and\nmore strange.\n\nNot only had he managed to\nget by the first pass without so much as\na hint of questions but now when he\ncould feel that the second pass wouldn't\nlong be noone had yet seen him.";
-
-$w=950;$h=250;
-$xm=20;$ym=20;
-$tw=300;
-
-$g = new CanvasGraph($w,$h);
-$img = $g->img;
-
-// Alignment for anchor points to use
-$palign = array('left','center','right');
-
-$n = count($palign);
-$t = new Text($txt);
-
-$y = $ym;
-for( $i=0; $i < $n; ++$i ) {
-
-    $x = $xm + $i*$tw;
-
-    $t->SetColor('black');
-    $t->SetAlign('left','top');
-    $t->SetFont(FF_ARIAL,FS_NORMAL,11);
-    $t->SetBox();
-    $t->SetParagraphAlign($palign[$i]);
-    $t->Stroke($img, $x,$y);
-
-    $img->SetColor('black');
-    $img->SetFont(FF_FONT1,FS_BOLD);
-    $img->SetTextAlign('center','top');
-    $img->StrokeText($x+140,$y+160,'"'.$palign[$i].'"'.' pargraph align');
-
-}
-
-// .. and send back to browser
-$g->Stroke();
-
-?>
-
diff --git a/#jpgraph/src/Examples/theme_example.php b/#jpgraph/src/Examples/theme_example.php
deleted file mode 100644
index 6d02e472..00000000
--- a/#jpgraph/src/Examples/theme_example.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-$data1y=array(47,80,40,116);
-$graph = new Graph(400, 300, 'auto');
-$graph->SetScale('textlin');
-
-$theme_class = new AquaTheme;
-$graph->SetTheme($theme_class);
-
-// after setting theme, you can change details as you want
-$graph->SetFrame(true, 'lightgray');                        // set frame visible
-
-$graph->xaxis->SetTickLabels(array('A','B','C','D')); // change xaxis lagels
-$graph->title->Set("Theme Example");                    // add title
-
-// add barplot
-$bplot = new BarPlot($data1y);
-$graph->Add($bplot);
-$graph->SetColor('#cc1111');    // you can change color only after calling Add()
-
-$graph->Stroke();
diff --git a/#jpgraph/src/Examples/tiger1.jpg b/#jpgraph/src/Examples/tiger1.jpg
deleted file mode 100644
index 99596101..00000000
Binary files a/#jpgraph/src/Examples/tiger1.jpg and /dev/null differ
diff --git a/#jpgraph/src/Examples/tiger_bkg.gif b/#jpgraph/src/Examples/tiger_bkg.gif
deleted file mode 100644
index 3faaa174..00000000
Binary files a/#jpgraph/src/Examples/tiger_bkg.gif and /dev/null differ
diff --git a/#jpgraph/src/Examples/tiger_bkg.jpg b/#jpgraph/src/Examples/tiger_bkg.jpg
deleted file mode 100644
index 43d45f30..00000000
Binary files a/#jpgraph/src/Examples/tiger_bkg.jpg and /dev/null differ
diff --git a/#jpgraph/src/Examples/tiger_bkg.png b/#jpgraph/src/Examples/tiger_bkg.png
deleted file mode 100644
index 78d8e25b..00000000
Binary files a/#jpgraph/src/Examples/tiger_bkg.png and /dev/null differ
diff --git a/#jpgraph/src/Examples/timestampex01.php b/#jpgraph/src/Examples/timestampex01.php
deleted file mode 100644
index b2ee12e9..00000000
--- a/#jpgraph/src/Examples/timestampex01.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-// Example on how to treat and format timestamp as human readable labels
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-// Number of "fake" data points
-DEFINE('NDATAPOINTS',500);
-
-// Assume data points are sample every 10th second
-DEFINE('SAMPLERATE',10); 
-
-// Callback formatting function for the X-scale to convert timestamps
-// to hour and minutes.
-function TimeCallback($aVal) {
-    return Date('H:i', $aVal);
-}
-
-// Get start time
-$start = time();
-// Set the start time to be on the closest minute just before the "start" timestamp
-$adjstart = floor($start / 60);
-
-// Create a data set in range (20,100) and X-positions
-// We also apply a simple low pass filter on the data to make it less
-// random and a little smoother
-$data = array();
-$xdata = array();
-$data[0] = rand(20,100);
-$xdata[0] = $adjstart;
-for( $i=1; $i < NDATAPOINTS; ++$i ) {
-    $data[$i] = rand(20,100)*0.2 + $data[$i-1]*0.8;
-    $xdata[$i] = $adjstart + $i * SAMPLERATE;
-}
-
-// Assume that the data points represents data that is sampled every 10s
-// when determing the end value on the scale. We also add some extra
-// length to end on an even label tick.
-$adjend = $adjstart  + (NDATAPOINTS+10)*10;
-
-$graph = new Graph(500,250);
-$graph->SetMargin(40,20,30,50);
-
-// Now specify the X-scale explicit but let the Y-scale be auto-scaled
-$graph->SetScale("intlin",0,0,$adjstart,$adjend);
-$graph->title->Set("Example on TimeStamp Callback");
-
-// Setup the callback and adjust the angle of the labels
-$graph->xaxis->SetLabelFormatCallback('TimeCallback');
-$graph->xaxis->SetLabelAngle(90);
-
-// Set the labels every 5min (i.e. 300seconds) and minor ticks every minute
-$graph->xaxis->scale->ticks->Set(300,60);
-
-$line = new LinePlot($data,$xdata);
-$line->SetColor('lightblue');
-$graph->Add($line);
-
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/titlecsimex01.php b/#jpgraph/src/Examples/titlecsimex01.php
deleted file mode 100644
index a44290e5..00000000
--- a/#jpgraph/src/Examples/titlecsimex01.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-$datay=array(12,26,9,17,31);
-
-// Create the graph. 
-$graph = new Graph(400,250);
-$graph->SetScale("textlin");
-$graph->SetMargin(50,80,20,40);
-$graph->yaxis->SetTitleMargin(30);
-$graph->yaxis->scale->SetGrace(30);
-$graph->SetShadow();
-
-
-// Create a bar pot
-$bplot = new BarPlot($datay);
-
-// Create targets for the bars image maps. One for each column
-$targ=array("bar_clsmex1.php#1","bar_clsmex1.php#2","bar_clsmex1.php#3","bar_clsmex1.php#4","bar_clsmex1.php#5","bar_clsmex1.php#6");
-$alts=array("val=%d","val=%d","val=%d","val=%d","val=%d","val=%d");
-$bplot->SetCSIMTargets($targ,$alts);
-$bplot->SetFillColor("orange");
-$bplot->SetLegend('Year 2001 %%','#kalle ','%s');
-
-// Display the values on top of each bar
-$bplot->SetShadow();
-$bplot->value->SetFormat(" $ %2.1f",70);
-$bplot->value->SetFont(FF_ARIAL,FS_NORMAL,9);
-$bplot->value->SetColor("blue");
-$bplot->value->Show();
-
-$graph->Add($bplot);
-
-// Create a big "button" that has an image map action
-$txt1 = new Text("A simple text with\ntwo rows");
-$txt1->SetFont(FF_ARIAL);
-$txt1->SetBox('lightblue','black','white@1',5);
-$txt1->SetParagraphAlign('center');
-$txt1->SetPos(40,50);
-$txt1->SetCSIMTarget('#88','Text element');
-$graph->Add($txt1);
-
-// Add image map to the graph title as well (you can do this to the 
-// sub- and subsub-title as well)
-$graph->title->Set("Image maps barex1");
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph->title->SetCSIMTarget('#45','Title for Bar');
-$graph->xaxis->title->Set("X-title");
-$graph->yaxis->title->Set("Y-title");
-
-// Setup the axis title image map and font style
-$graph->yaxis->title->SetFont(FF_FONT2,FS_BOLD);
-$graph->yaxis->title->SetCSIMTarget('#55','Y-axis title');
-$graph->xaxis->title->SetFont(FF_FONT2,FS_BOLD);
-$graph->xaxis->title->SetCSIMTarget('#55','X-axis title');
-
-// Send back the HTML page which will call this script again
-// to retrieve the image.
-$graph->StrokeCSIM();
-
-?>
diff --git a/#jpgraph/src/Examples/titleex1.php b/#jpgraph/src/Examples/titleex1.php
deleted file mode 100644
index 77baa00b..00000000
--- a/#jpgraph/src/Examples/titleex1.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-// Some data
-$ydata = array(11,3,8,12,5,1,9,13,5,7);
-
-// Create the graph. These two calls are always required
-$graph = new Graph(200,150);
-$graph->SetScale("textlin");
-$graph->SetMargin(25,10,30,30);
-
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,12);
-$graph->title->Set('The Title');
-$graph->subtitle->SetFont(FF_ARIAL,FS_BOLD,10);
-$graph->subtitle->Set('The Subtitle');
-$graph->subsubtitle->SetFont(FF_ARIAL,FS_ITALIC,9);
-$graph->subsubtitle->Set('The Subsubitle');
-
-// Create the linear plot
-$lineplot=new LinePlot($ydata);
-$lineplot->SetColor("blue");
-
-// Add the plot to the graph
-$graph->Add($lineplot);
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/topxaxisex1.php b/#jpgraph/src/Examples/topxaxisex1.php
deleted file mode 100644
index 6143875e..00000000
--- a/#jpgraph/src/Examples/topxaxisex1.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-// Some data
-$datay = array(25,29,29,39,55);
-
-$graph = new Graph(400,200,'auto');
-$graph->img->SetMargin(40,40,40,20);
-
-$graph->SetScale("linlin");
-$graph->SetShadow();
-$graph->title->Set("Top X-axis");
-
-// Start at 0
-$graph->yscale->SetAutoMin(0);
-
-// Add some air around the Y-scale
-$graph->yscale->SetGrace(100);
-
-// Use built in font
-$graph->title->SetFont(FF_FONT1,FS_BOLD);
-
-// Adjust the X-axis
-$graph->xaxis->SetPos("max");
-$graph->xaxis->SetLabelSide(SIDE_UP);
-$graph->xaxis->SetTickSide(SIDE_DOWN);
-
-// Create the line plot
-$p1 = new LinePlot($datay);
-$p1->SetColor("blue");
-
-// Specify marks for the line plots
-$p1->mark->SetType(MARK_FILLEDCIRCLE);
-$p1->mark->SetFillColor("red");
-$p1->mark->SetWidth(4);
-
-// Show values
-$p1->value->Show();
-
-// Add lineplot to graph
-$graph->Add($p1);
-
-// Output line
-$graph->Stroke();
-
-?>
-
-
diff --git a/#jpgraph/src/Examples/tornado.jpg b/#jpgraph/src/Examples/tornado.jpg
deleted file mode 100644
index 24c1ea1b..00000000
Binary files a/#jpgraph/src/Examples/tornado.jpg and /dev/null differ
diff --git a/#jpgraph/src/Examples/tr1.jpg b/#jpgraph/src/Examples/tr1.jpg
deleted file mode 100644
index f855e31e..00000000
Binary files a/#jpgraph/src/Examples/tr1.jpg and /dev/null differ
diff --git a/#jpgraph/src/Examples/tr2.jpg b/#jpgraph/src/Examples/tr2.jpg
deleted file mode 100644
index 6a75e474..00000000
Binary files a/#jpgraph/src/Examples/tr2.jpg and /dev/null differ
diff --git a/#jpgraph/src/Examples/tr3.jpg b/#jpgraph/src/Examples/tr3.jpg
deleted file mode 100644
index 799e097d..00000000
Binary files a/#jpgraph/src/Examples/tr3.jpg and /dev/null differ
diff --git a/#jpgraph/src/Examples/tr4.jpg b/#jpgraph/src/Examples/tr4.jpg
deleted file mode 100644
index fe411c1c..00000000
Binary files a/#jpgraph/src/Examples/tr4.jpg and /dev/null differ
diff --git a/#jpgraph/src/Examples/tr5.jpg b/#jpgraph/src/Examples/tr5.jpg
deleted file mode 100644
index 33c97488..00000000
Binary files a/#jpgraph/src/Examples/tr5.jpg and /dev/null differ
diff --git a/#jpgraph/src/Examples/tr6.jpg b/#jpgraph/src/Examples/tr6.jpg
deleted file mode 100644
index 81321b7d..00000000
Binary files a/#jpgraph/src/Examples/tr6.jpg and /dev/null differ
diff --git a/#jpgraph/src/Examples/universal_example.php b/#jpgraph/src/Examples/universal_example.php
deleted file mode 100644
index eae0c190..00000000
--- a/#jpgraph/src/Examples/universal_example.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$theme = isset($_GET['theme']) ? $_GET['theme'] : null;
-
-$data = array (
-  0 => array (0 => 79, 1 => -25, 2 => -7, 3 => 85, 4 => -26, 5 => -32, ),
-  1 => array (0 => 76, 1 => 51, 2 => 86, 3 => 12, 4 => -7, 5 => 94, ),
-  2 => array (0 => 49, 1 => 38, 2 => 7, 3 => -40, 4 => 9, 5 => -7, ),
-  3 => array ( 0 => 69, 1 => 96, 2 => 49, 3 => 7, 4 => 92, 5 => -38, ),
-  4 => array ( 0 => 68, 1 => 16, 2 => 82, 3 => -49, 4 => 50, 5 => 7, ),
-  5 => array ( 0 => -37, 1 => 28, 2 => 32, 3 => 6, 4 => 13, 5 => 57, ),
-  6 => array ( 0 => 24, 1 => -11, 2 => 7, 3 => 10, 4 => 51, 5 => 51, ),
-  7 => array ( 0 => 3, 1 => -1, 2 => -12, 3 => 61, 4 => 10, 5 => 47, ),
-  8 => array ( 0 => -47, 1 => -21, 2 => 43, 3 => 53, 4 => 36, 5 => 34, ),
-);
-
-
-// Create the graph. These two calls are always required
-$graph = new Graph(400,300);    
-
-$graph->SetScale("textlin");
-if ($theme) {
-  $graph->SetTheme(new $theme());
-}
-$theme_class = new UniversalTheme;
-$graph->SetTheme($theme_class);
-
-$plot = array();
-// Create the bar plots
-for ($i = 0; $i < 4; $i++) {
-  $plot[$i] = new BarPlot($data[$i]);
-  $plot[$i]->SetLegend('plot'.($i+1));
-}
-//$acc1 = new AccBarPlot(array($plot[0], $plot[1]));
-//$acc1->value->Show();
-$gbplot = new GroupBarPlot(array($plot[2], $plot[1] ));
-
-for ($i = 4; $i < 8; $i++) {
-  $plot[$i] = new LinePlot($data[$i]);
-  $plot[$i]->SetLegend('plot'.$i);
-  $plot[$i]->value->Show();
-}
-
-$graph->Add($gbplot);
-$graph->Add($plot[4]);
-
-$title = "UniversalTheme Example";
-$title = mb_convert_encoding($title,'UTF-8');
-$graph->title->Set($title);
-$graph->xaxis->title->Set("X-title");
-$graph->yaxis->title->Set("Y-title");
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/vivid_example.php b/#jpgraph/src/Examples/vivid_example.php
deleted file mode 100644
index 1d227481..00000000
--- a/#jpgraph/src/Examples/vivid_example.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_bar.php');
-require_once ('jpgraph/jpgraph_line.php');
-
-$theme = isset($_GET['theme']) ? $_GET['theme'] : null;
-
-$data = array (
-  0 => array (0 => 79, 1 => -25, 2 => -7, 3 => 85, 4 => -26, 5 => -32, ),
-  1 => array (0 => 76, 1 => 51, 2 => 86, 3 => 12, 4 => -7, 5 => 94, ),
-  2 => array (0 => 49, 1 => 38, 2 => 7, 3 => -40, 4 => 9, 5 => -7, ),
-  3 => array ( 0 => 69, 1 => 96, 2 => 49, 3 => 7, 4 => 92, 5 => -38, ),
-  4 => array ( 0 => 68, 1 => 16, 2 => 82, 3 => -49, 4 => 50, 5 => 7, ),
-  5 => array ( 0 => -37, 1 => 28, 2 => 32, 3 => 6, 4 => 13, 5 => 57, ),
-  6 => array ( 0 => 24, 1 => -11, 2 => 7, 3 => 10, 4 => 51, 5 => 51, ),
-  7 => array ( 0 => 3, 1 => -1, 2 => -12, 3 => 61, 4 => 10, 5 => 47, ),
-  8 => array ( 0 => -47, 1 => -21, 2 => 43, 3 => 53, 4 => 36, 5 => 34, ),
-);
-
-// Create the graph. These two calls are always required
-$graph = new Graph(400,300);    
-
-$graph->SetScale("textlin");
-if ($theme) {
-  $graph->SetTheme(new $theme());
-}
-$theme_class = new VividTheme;
-$graph->SetTheme($theme_class);
-
-$plot = array();
-// Create the bar plots
-for ($i = 0; $i < 4; $i++) {
-  $plot[$i] = new BarPlot($data[$i]);
-  $plot[$i]->SetLegend('plot'.($i+1));
-}
-//$acc1 = new AccBarPlot(array($plot[0], $plot[1]));
-//$acc1->value->Show();
-$gbplot = new GroupBarPlot(array($plot[2], $plot[1] ));
-
-for ($i = 4; $i < 8; $i++) {
-  $plot[$i] = new LinePlot($data[$i]);
-  $plot[$i]->SetLegend('plot'.$i);
-  $plot[$i]->value->Show();
-}
-
-$graph->Add($gbplot);
-$graph->Add($plot[4]);
-
-$title = "VividTheme Example";
-$title = mb_convert_encoding($title,'UTF-8');
-$graph->title->Set($title);
-$graph->xaxis->title->Set("X-title");
-$graph->yaxis->title->Set("Y-title");
-
-// Display the graph
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/windrose_2plots_ex1.php b/#jpgraph/src/Examples/windrose_2plots_ex1.php
deleted file mode 100644
index 7aee3154..00000000
--- a/#jpgraph/src/Examples/windrose_2plots_ex1.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_windrose.php');
-
-// Data can be specified using both ordinal idex of axis as well
-// as the direction label
-$data = array(
-    1 => array(10,10,13,7),
-	2 => array(2,8,10),
-	4 => array(1,12,22),
-    );
-
-$data2 = array(
-    4 => array(12,8,2,3),
-    2 => array(5,4,4,5,2),
-    );
-
-// Create a new small windrose graph
-$graph = new WindroseGraph(660,400);
-$graph->SetShadow();
-
-$graph->title->Set('Two windrose plots in one graph');
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,14);
-$graph->subtitle->Set('(Using Box() for each plot)');
-
-$wp = new WindrosePlot($data);
-$wp->SetType(WINDROSE_TYPE8);
-$wp->SetSize(0.42);
-$wp->SetPos(0.25,0.55);
-$wp->SetBox();
-
-$wp2 = new WindrosePlot($data2);
-$wp2->SetType(WINDROSE_TYPE16);
-$wp2->SetSize(0.42);
-$wp2->SetPos(0.74,0.55);
-$wp2->SetBox();
-$wp2->SetRangeColors(array('green','yellow','red','brown'));
-
-$graph->Add($wp);
-$graph->Add($wp2);
-
-$graph->Stroke();
-?>
-
diff --git a/#jpgraph/src/Examples/windrose_bgimg_ex1.php b/#jpgraph/src/Examples/windrose_bgimg_ex1.php
deleted file mode 100644
index e51372d8..00000000
--- a/#jpgraph/src/Examples/windrose_bgimg_ex1.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_windrose.php');
-require_once ('jpgraph/jpgraph_flags.php');
-
-// Data can be specified using both ordinal idex of axis as well
-// as the direction label
-$data2 = array(
-    'vsv' => array(12,8,2,3),
-    6 => array(5,4,4,5,4),
-    );
-
-$se_CompassLbl = array('O','ONO','NO','NNO','N','NNV','NV','VNV','V','VSV','SV','SSV','S','SSO','SO','OSO');
-
-// Create a new small windrose graph
-$graph = new WindroseGraph(400,400);
-$graph->SetMargin(25,25,25,25);
-$graph->SetFrame();
-
-$graph->title->Set('Example with background flag');
-#$graph->title->SetFont(FF_VERA,FS_BOLD,14);
-
-
-//$graph->SetBackgroundImage('bkgimg.jpg',BGIMG_FILLFRAME);
-//$graph->SetBackgroundImageMix(90);
-$graph->SetBackgroundCFlag(28,BGIMG_FILLFRAME,15);
-
-
-$wp2 = new WindrosePlot($data2);
-$wp2->SetType(WINDROSE_TYPE16);
-$wp2->SetSize(0.55);
-$wp2->SetPos(0.5,0.5);
-$wp2->SetAntiAlias(false);
-
-$wp2->SetFont(FF_ARIAL,FS_BOLD,10);
-$wp2->SetFontColor('black');
-
-$wp2->SetCompassLabels($se_CompassLbl);
-$wp2->legend->SetMargin(20,5);
-
-$wp2->scale->SetZFont(FF_ARIAL,FS_NORMAL,8);
-$wp2->scale->SetFont(FF_ARIAL,FS_NORMAL,9);
-$wp2->scale->SetLabelFillColor('white','white');
-
-$wp2->SetRangeColors(array('green','yellow','red','brown'));
-
-$graph->Add($wp2);
-$graph->Stroke();
-?>
-
diff --git a/#jpgraph/src/Examples/windrose_ex0.php b/#jpgraph/src/Examples/windrose_ex0.php
deleted file mode 100644
index 897d4283..00000000
--- a/#jpgraph/src/Examples/windrose_ex0.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_windrose.php');
-
-// Data can be specified using both ordinal index of the axis
-// as well as the direction label
-$data = array(
-    0 => array(5,5,5,8),
-    1 => array(3,4,1,4),
-    'WSW' => array(1,5,5,3),
-    'N' => array(2,3,8,1,1),
-    15 => array(2,3,5));
-
-// First create a new windrose graph with a title
-$graph = new WindroseGraph(400,400);
-$graph->title->Set('A basic Windrose graph');
-
-// Create the windrose plot.
-$wp = new WindrosePlot($data);
-
-// Add and send back to browser
-$graph->Add($wp);
-$graph->Stroke();
-?>
-
diff --git a/#jpgraph/src/Examples/windrose_ex1.php b/#jpgraph/src/Examples/windrose_ex1.php
deleted file mode 100644
index e892a21e..00000000
--- a/#jpgraph/src/Examples/windrose_ex1.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_windrose.php');
-
-$data = array(
-    0 => array(1,1,2.5,4),
-    1 => array(3,4,1,4),
-    'wsw' => array(1,5,5,3),
-    'N' => array(2,7,5,4,2),
-    15 => array(2,7,12));
-
-// First create a new windrose graph with a title
-$graph = new WindroseGraph(400,400);
-
-// Setup title
-$graph->title->Set('Windrose basic example');
-$graph->title->SetFont(FF_VERDANA,FS_BOLD,12);
-$graph->title->SetColor('navy');
-
-// Create the windrose plot.
-$wp = new WindrosePlot($data);
-$wp->SetRadialGridStyle('solid');
-$graph->Add($wp);
-
-// Send the graph to the browser
-$graph->Stroke();
-?>
-
diff --git a/#jpgraph/src/Examples/windrose_ex1b.php b/#jpgraph/src/Examples/windrose_ex1b.php
deleted file mode 100644
index c24a98c8..00000000
--- a/#jpgraph/src/Examples/windrose_ex1b.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_windrose.php');
-
-// Data can be specified using both ordinal index of the axis
-// as well as the direction label
-$data = array(
-    0 => array(1,1,2.5,4),
-    1 => array(3,4,1,4),
-    'wsw' => array(1,5,5,3),
-    'N' => array(2,7,5,4,2),
-    15 => array(2,7,12));
-
-// First create a new windrose graph with a title
-$graph = new WindroseGraph(400,400);
-$graph->title->Set('Windrose example 1b');
-$graph->title->SetFont(FF_VERDANA,FS_BOLD,12);
-$graph->title->SetColor('navy');
-
-// Create the windrose plot.
-// The default plot will have 16 compass axis.
-$wp = new WindrosePlot($data);
-$wp->SetRadialGridStyle('solid');
-$graph->Add($wp);
-
-// Setup the range so that the values do not touch eachother
-$wp->SetRanges(array(0,1,2,3,4,5,6,7,8,10));
-$wp->SetRangeStyle(RANGE_DISCRETE); // Cmp with RANGE_OVERLAPPING as default
-
-// Send the graph to the browser
-$graph->Stroke();
-?>
-
diff --git a/#jpgraph/src/Examples/windrose_ex2.1.php b/#jpgraph/src/Examples/windrose_ex2.1.php
deleted file mode 100644
index 48781acc..00000000
--- a/#jpgraph/src/Examples/windrose_ex2.1.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_windrose.php');
-
-// Data can be specified using both ordinal index of the axis
-// as well as the direction label
-$data = array(
-    0 => array(1,1,6,4),
-    1 => array(3,8,1,4),
-    2 => array(2,7,4,4,3),
-    3 => array(2,7,1,2));
-
-// First create a new windrose graph with a title
-$graph = new WindroseGraph(400,400);
-
-// Setup title
-$graph->title->Set('Windrose example 2');
-$graph->title->SetFont(FF_VERDANA,FS_BOLD,12);
-$graph->title->SetColor('navy');
-
-// Create the windrose plot.
-$wp = new WindrosePlot($data);
-
-// Make it have 8 compass direction
-$wp->SetType(WINDROSE_TYPE4);
-
-// Setup the weight of the laegs for the different ranges
-$weights = array_fill(0,8,10);
-$wp->SetRangeWeights($weights);
-
-// Adjust the font and font color for scale labels
-$wp->scale->SetFont(FF_TIMES,FS_NORMAL,11);
-$wp->scale->SetFontColor('navy');
-
-// Set the diametr for the plot to 160 pixels
-$wp->SetSize(160);
-
-// Set the size of the innermost center circle to 30% of the plot size
-$wp->SetZCircleSize(0.2);
-
-// Adjust the font and font color for compass directions
-$wp->SetFont(FF_ARIAL,FS_NORMAL,12);
-$wp->SetFontColor('darkgreen');
-
-// Add and send back to browser
-$graph->Add($wp);
-$graph->Stroke();
-?>
-
diff --git a/#jpgraph/src/Examples/windrose_ex2.php b/#jpgraph/src/Examples/windrose_ex2.php
deleted file mode 100644
index 23822cca..00000000
--- a/#jpgraph/src/Examples/windrose_ex2.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_windrose.php');
-
-// Data can be specified using both ordinal index of the axis
-// as well as the direction label
-$data = array(
-    0 => array(1,1,2.5,4),
-    1 => array(3,4,1,4),
-    3 => array(2,7,4,4,3),
-    5 => array(2,7,1,2));
-
-// First create a new windrose graph with a title
-$graph = new WindroseGraph(400,400);
-
-// Setup title
-$graph->title->Set('Windrose example 2');
-$graph->title->SetFont(FF_VERDANA,FS_BOLD,12);
-$graph->title->SetColor('navy');
-
-// Create the windrose plot.
-$wp = new WindrosePlot($data);
-
-// Make it have 8 compass direction
-$wp->SetType(WINDROSE_TYPE8);
-
-// Setup the weight of the laegs for the different ranges
-$weights = array_fill(0,8,10);
-$wp->SetRangeWeights($weights);
-
-// Adjust the font and font color for scale labels
-$wp->scale->SetFont(FF_TIMES,FS_NORMAL,11);
-$wp->scale->SetFontColor('navy');
-
-// Set the diametr for the plot to 160 pixels
-$wp->SetSize(200);
-
-// Set the size of the innermost center circle to 30% of the plot size
-$wp->SetZCircleSize(0.2);
-
-// Adjust the font and font color for compass directions
-$wp->SetFont(FF_ARIAL,FS_NORMAL,12);
-$wp->SetFontColor('darkgreen');
-
-// Add and send back the graph to the client
-$graph->Add($wp);
-$graph->Stroke();
-?>
-
diff --git a/#jpgraph/src/Examples/windrose_ex3.php b/#jpgraph/src/Examples/windrose_ex3.php
deleted file mode 100644
index 39c12cea..00000000
--- a/#jpgraph/src/Examples/windrose_ex3.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_windrose.php');
-
-// Data can be specified using both ordinal index of the axis
-// as well as the direction label
-$data[0] = array(
-    0 => array(1,1,2.5,4),
-    1 => array(3,4,1,4),
-    3 => array(2,7,4,4,3),
-    5 => array(2,7,1,2));
-
-$data[1] = array(
-    "n" => array(1,1,2.5,4),
-    "ssw" => array(3,4,1,4),
-    "se" => array(2,7,4,4,3));
-
-// Store the position and size data for each plot in an
-// array to make it easier to create multiple plots.
-// The format choosen for the layout data is
-// (type,x-pos,y-pos,size, z-circle size)
-$layout = array(
-    array(WINDROSE_TYPE8,0.25,0.55,0.4,0.25),
-    array(WINDROSE_TYPE16,0.75,0.55,0.4,0.25));
-
-$legendtxt = array('(m/s) Station 7','(m/s) Station 12');
-
-// First create a new windrose graph with a dropshadow
-$graph = new WindroseGraph(600,350);
-$graph->SetShadow('darkgray');
-
-// Setup titles
-$graph->title->Set('Windrose example 3');
-$graph->title->SetFont(FF_VERDANA,FS_BOLD,12);
-$graph->title->SetColor('navy');
-$graph->subtitle->Set('(Multiple plots in the same graph)');
-$graph->subtitle->SetFont(FF_VERDANA,FS_NORMAL,9);
-$graph->subtitle->SetColor('navy');
-
-// Create the two windrose plots.
-for( $i=0; $i < count($data); ++$i ) {
-    $wp[$i] = new WindrosePlot($data[$i]);
-
-    // Make it have 8 compass direction
-    $wp[$i]->SetType($layout[$i][0]);
-
-    // Adjust the font and font color for scale labels
-    $wp[$i]->scale->SetFont(FF_TIMES,FS_NORMAL,10);
-    $wp[$i]->scale->SetFontColor('navy');
-
-    // Set the position of the plot
-    $wp[$i]->SetPos($layout[$i][1],$layout[$i][2]);
-
-    // Set the diameter for the plot to 30% of the width of the graph pixels
-    $wp[$i]->SetSize($layout[$i][3]);
-
-    // Set the size of the innermost center circle to 30% of the plot size
-    $wp[$i]->SetZCircleSize($layout[$i][4]);
-
-    // Adjust the font and font color for compass directions
-    $wp[$i]->SetFont(FF_ARIAL,FS_NORMAL,10);
-    $wp[$i]->SetFontColor('darkgreen');
-
-    // Add legend text
-    $wp[$i]->legend->SetText($legendtxt[$i]);
-
-    $graph->Add($wp[$i]);
-}
-
-// Send the graph to the browser
-$graph->Stroke();
-?>
-
diff --git a/#jpgraph/src/Examples/windrose_ex4.php b/#jpgraph/src/Examples/windrose_ex4.php
deleted file mode 100644
index 04652041..00000000
--- a/#jpgraph/src/Examples/windrose_ex4.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_windrose.php');
-
-// Data can be specified using both ordinal index of the axis
-// as well as the direction label
-$data = array(
-    0 => array(1,1,2.5,4),
-    1 => array(3,4,1,4),
-    3 => array(2,7,4,4,3),
-    5 => array(2,7,1,2));
-
-// First create a new windrose graph with a title
-$graph = new WindroseGraph(400,400);
-
-// Setup title
-$graph->title->Set('Windrose example 4');
-$graph->title->SetFont(FF_VERDANA,FS_BOLD,12);
-$graph->title->SetColor('navy');
-
-// Create the windrose plot.
-$wp = new WindrosePlot($data);
-
-// Adjust the font and font color for scale labels
-$wp->scale->SetFont(FF_TIMES,FS_NORMAL,11);
-$wp->scale->SetFontColor('navy');
-
-// Set the diameter and position for plot
-$wp->SetSize(190);
-
-// Set the size of the innermost center circle to 40% of the plot size
-// Note that we can have the automatic "Zero" sum appear in our custom text
-$wp->SetZCircleSize(0.38);
-$wp->scale->SetZeroLabel("Station 12\n(Calm %d%%)");
-
-// Adjust color and font for center circle text
-$wp->scale->SetZFont(FF_ARIAL,FS_NORMAL,9);
-$wp->scale->SetZFontColor('darkgreen');
-
-// Adjust the font and font color for compass directions
-$wp->SetFont(FF_ARIAL,FS_NORMAL,10);
-$wp->SetFontColor('darkgreen');
-
-// Adjust the margin to the compass directions
-$wp->SetLabelMargin(50);
-
-// Adjust grid colors
-$wp->SetGridColor('silver','blue');
-
-// Add (m/s) text to legend
-$wp->legend->SetText('(m/s)');
-$wp->legend->SetMargin(20,5);
-
-// Add and send back to client
-$graph->Add($wp);
-$graph->Stroke();
-?>
-
diff --git a/#jpgraph/src/Examples/windrose_ex5.php b/#jpgraph/src/Examples/windrose_ex5.php
deleted file mode 100644
index f013c3bf..00000000
--- a/#jpgraph/src/Examples/windrose_ex5.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_windrose.php');
-
-// Data
-$data = array(
-    0 => array(1,1,2.5,4),
-    1 => array(3,4,1,4),
-    3 => array(2,7,4,4,3),
-    5 => array(2,7,1,2));
-
-// Text to be added.
-$txt=array();
-$txt[0] = "It is possible to add arbitrary,multi line, text to a graph. ";
-$txt[0] .= "Such a paragraph can have it's text be left, right or center ";
-$txt[0] .= "aligned.";
-$txt[1] = "This is an example of a right aligned paragraph.";
-$txt[2] = "Finally we can show a center aligned paragraph without box.";
-
-// We store the layout for each of the text boxes in an array
-// to keep the code clean
-$txtlayout = array(
-    array(0.97,0.15,25,'left','black','lightblue'),
-    array(0.97,0.4,20,'right','black','lightblue'),
-    array(0.97,0.7,20,'center','darkred',false,FF_COMIC,FS_NORMAL,12),
-);
-
-// Range colors to be used
-$rangeColors = array('silver','khaki','orange','brown','blue','navy','maroon','red');
-
-// First create a new windrose graph with a title
-$graph = new WindroseGraph(570,430);
-$graph->title->Set('Windrose example 5');
-$graph->title->SetFont(FF_VERDANA,FS_BOLD,12);
-$graph->title->SetColor('navy');
-
-// Setup graph background color
-$graph->SetColor('darkgreen@0.7');
-
-// Setup all the defined text boxes
-$n = count($txt);
-for( $i=0; $i < $n; ++$i ) {
-    $txtbox[$i] = new Text($txt[$i]);
-    $txtbox[$i]->SetPos($txtlayout[$i][0],$txtlayout[$i][1],'right');
-    $txtbox[$i]->SetWordwrap($txtlayout[$i][2]);
-    $txtbox[$i]->SetParagraphAlign($txtlayout[$i][3]);
-    $txtbox[$i]->SetColor($txtlayout[$i][4]);
-    $txtbox[$i]->SetBox($txtlayout[$i][5]);
-    if( count($txtlayout[$i]) > 6 )
-	$txtbox[$i]->SetFont($txtlayout[$i][6],$txtlayout[$i][7],$txtlayout[$i][8]);
-}
-$graph->Add($txtbox);
-
-// Create the windrose plot.
-$wp = new WindrosePlot($data);
-
-// Set background color for plot area
-$wp->SetColor('lightyellow');
-
-// Add a box around the plot
-$wp->SetBox();
-
-// Setup the colors for the ranges
-$wp->SetRangeColors($rangeColors);
-
-// Adjust the font and font color for scale labels
-$wp->scale->SetFont(FF_ARIAL,FS_NORMAL,9);
-$wp->scale->SetFontColor('navy');
-
-// Set the diameter and position for plot
-$wp->SetSize(190);
-$wp->SetPos(0.35,0.53);
-
-$wp->SetZCircleSize(0.2);
-
-// Adjust the font and font color for compass directions
-$wp->SetFont(FF_ARIAL,FS_NORMAL,10);
-$wp->SetFontColor('darkgreen');
-
-// Adjust the margin to the compass directions
-$wp->SetLabelMargin(50);
-
-// Adjust grid colors
-$wp->SetGridColor('silver','blue');
-
-// Add (m/s) text to legend
-$wp->legend->SetText('(m/s)');
-$wp->legend->SetMargin(20,5);
-
-// Add plot and send back to client
-$graph->Add($wp);
-$graph->Stroke();
-?>
-
diff --git a/#jpgraph/src/Examples/windrose_ex6.1.php b/#jpgraph/src/Examples/windrose_ex6.1.php
deleted file mode 100644
index 61504c86..00000000
--- a/#jpgraph/src/Examples/windrose_ex6.1.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_windrose.php');
-
-$data = array(
-    '10'  => array(1,1,2.5,4),
-    '32.0' => array(3,4,1,4),
-    '120.5' => array(2,3,4,4,3,2,1),
-    '223.2' => array(2,4,1,2,2),
-    '285.7' => array(2,2,1,2,4,2,1,1)
-);
-
-// This file is encode din utf-8. The two Kanji characters roughly means
-// 中 = Chinese
-// 文 = Sentences
-$ctxt = '中文';
-
-// Specify text for direction labels
-$labels = array(
-	'120.5' => $ctxt,
-	'232.2' => "Reference\n#13 Ver:2");
-
-// Range colors to be used
-$rangeColors = array('khaki','yellow','orange','orange:0.7','brown','darkred','black');
-
-// First create a new windrose graph with a title
-$graph = new WindroseGraph(400,450);
-
-// Setup title
-$graph->title->Set('Using chinese charecters');
-#$graph->title->SetFont(FF_VERDANA,FS_BOLD,12);
-$graph->title->SetColor('navy');
-$graph->subtitle->Set('(Free type plot)');
-#$graph->subtitle->SetFont(FF_VERDANA,FS_ITALIC,10);
-$graph->subtitle->SetColor('navy');
-
-// Create the windrose plot.
-$wp = new WindrosePlot($data);
-
-// Setup a free plot
-$wp->SetType(WINDROSE_TYPEFREE);
-
-// Setup labels
-$wp->SetLabels($labels);
-$wp->SetLabelPosition(LBLPOSITION_CENTER);
-$wp->SetLabelMargin(30);
-
-// Setup the colors for the ranges
-$wp->SetRangeColors($rangeColors);
-
-// Adjust the font and font color for scale labels
-#$wp->scale->SetFont(FF_ARIAL,FS_NORMAL,9);
-
-// Set the diameter and position for plot
-#$wp->SetSize(240);
-$wp->SetSize(200);
-$wp->SetZCircleSize(30);
-$wp->SetPos(0.5,0.5);
-
-// Adjust the font and font color for compass directions
-#$wp->SetFont(FF_CHINESE,FS_NORMAL,12);
-$wp->SetFontColor('darkgreen');
-
-// Adjust grid colors
-$wp->SetGridColor('darkgreen@0.7','blue');
-
-// Add (m/s) text to legend
-$wp->legend->SetText('(m/s)');
-$wp->legend->SetTFontColor('blue');
-
-// Set legend label font color
-$wp->legend->SetLFontColor('orange:0.7');
-#$wp->legend->SetLFont(FF_ARIAL,FS_ITALIC,8);
-
-// Display legend values with no decimals
-$wp->legend->SetFormat('%d');
-
-// Set the circle font to use chinse character set
-// Note: When FF_CHINESE is used the input charectr data are
-// assumed to already be in utf-8 encoding
-#$wp->legend->SetCFont(FF_CHINESE,FS_NORMAL,14);
-$wp->legend->SetCircleText($ctxt);
-$wp->legend->SetCFontColor('red');
-
-// Add plot to graph and send back to client
-$graph->Add($wp);
-$graph->Stroke();
-?>
-
diff --git a/#jpgraph/src/Examples/windrose_ex6.php b/#jpgraph/src/Examples/windrose_ex6.php
deleted file mode 100644
index 557f005a..00000000
--- a/#jpgraph/src/Examples/windrose_ex6.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_windrose.php');
-
-// Data can be specified using both ordinal index of the axis
-// as well as the direction label
-$data = array(
-    '10'  => array(1,1,2.5,4),
-    '32.0' => array(3,4,1,4),
-    '120.5' => array(2,3,4,4,3,2,1),
-    '223.2' => array(2,4,1,2,2),
-    '285.7' => array(2,2,1,2,4,2,1,1)
-);
-
-// Specify text for direction labels
-$labels = array( '120.5' => "Plant\n#1275",
-		 '285.7' => "Reference\n#13 Ver:2");
-
-// Range colors to be used
-$rangeColors = array('khaki','yellow','orange','orange:0.7','brown','darkred','black');
-
-// First create a new windrose graph with a title
-$graph = new WindroseGraph(400,450);
-
-// Setup titles
-$graph->title->Set('Windrose example 6');
-$graph->title->SetFont(FF_VERDANA,FS_BOLD,12);
-$graph->title->SetColor('navy');
-
-$graph->subtitle->Set('(Free type plot)');
-$graph->subtitle->SetFont(FF_VERDANA,FS_ITALIC,10);
-$graph->subtitle->SetColor('navy');
-
-// Create the windrose plot.
-$wp = new WindrosePlot($data);
-
-// Setup a free plot
-$wp->SetType(WINDROSE_TYPEFREE);
-
-// Setup labels
-$wp->SetLabels($labels);
-$wp->SetLabelPosition(LBLPOSITION_CENTER);
-$wp->SetLabelMargin(30);
-
-// Setup the colors for the ranges
-$wp->SetRangeColors($rangeColors);
-
-// Adjust the font and font color for scale labels
-$wp->scale->SetFont(FF_ARIAL,FS_NORMAL,9);
-
-// Set the diameter and position for plot
-$wp->SetSize(230);
-$wp->SetZCircleSize(30);
-
-// Adjust the font and font color for compass directions
-$wp->SetFont(FF_ARIAL,FS_NORMAL,10);
-$wp->SetFontColor('darkgreen');
-
-// Adjust grid colors
-$wp->SetGridColor('darkgreen@0.7','blue');
-
-// Add (m/s) text to legend
-$wp->legend->SetText('(m/s)');
-
-// Display legend values with no decimals
-$wp->legend->SetFormat('%d');
-
-// Add plot to graph and send back to the client
-$graph->Add($wp);
-$graph->Stroke();
-?>
-
diff --git a/#jpgraph/src/Examples/windrose_ex7.1.php b/#jpgraph/src/Examples/windrose_ex7.1.php
deleted file mode 100644
index 44987168..00000000
--- a/#jpgraph/src/Examples/windrose_ex7.1.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_windrose.php');
-
-
-
-// Data can be specified using both ordinal index of the axis
-// as well as the direction label.
-$data = array(
-    2 => array(1,15,7.5,2),
-    5 => array(1,1,1.5,2),
-    7 => array(1,2,10,3,2),
-    8 => array(2,3,1,3,1,2),
-    );
-
-// First create a new windrose graph with a title
-$graph = new WindroseGraph(590,580);
-$graph->title->Set('Japanese locale');
-#$graph->title->SetFont(FF_VERDANA,FS_BOLD,14);
-$graph->title->SetColor('navy');
-
-// Create the free windrose plot.
-$wp = new WindrosePlot($data);
-$wp->SetType(WINDROSE_TYPE8);
-
-// Add some "arbitrary" text to the center
-$wp->scale->SetZeroLabel("SOx\n8%%");
-
-// Localize the compass direction labels into Japanese
-// Note: The labels for data must now also match the exact
-// string for the compass directions.
-//
-// Ｅ　　　東
-// NＥ　　北東
-// Ｎ　　　北
-// NＷ　　北西
-// Ｗ　　　西
-// SＷ　　南西
-// Ｓ　　　南
-// SＥ　　南東
-$jp_CompassLbl = array('東','','北東','','北','','北西','',
- 					   '西','','南西','','南','','南東','');
-$wp->SetCompassLabels($jp_CompassLbl);
-#$wp->SetFont(FF_MINCHO,FS_NORMAL,15);
-
-// Localize the "Calm" text into Swedish and make the circle
-// slightly bigger than default
-$jp_calmtext = '平穏';
-$wp->legend->SetCircleText($jp_calmtext);
-$wp->legend->SetCircleRadius(20);
-#$wp->legend->SetCFont(FF_MINCHO,FS_NORMAL,10);
-$wp->legend->SetMargin(5,0);
-$wp->SetPos(0.5, 0.5);
-
-// Adjust the displayed ranges
-$ranges = array(1,3,5,8,12,19,29);
-$wp->SetRanges($ranges);
-
-// Set the scale to always have max value of 30
-$wp->scale->Set(30,10);
-#$wp->scale->SetFont(FF_VERA,FS_NORMAL,12);
-
-// Finally add it to the graph and send back to client
-$graph->Add($wp);
-$graph->Stroke();
-?>
-
diff --git a/#jpgraph/src/Examples/windrose_ex7.php b/#jpgraph/src/Examples/windrose_ex7.php
deleted file mode 100644
index b7a9b83e..00000000
--- a/#jpgraph/src/Examples/windrose_ex7.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_windrose.php');
-
-$data = array(
-    2 => array(1,15,7.5,2),
-    5 => array(1,1,1.5,2),
-    7 => array(1,2,10,3,2),
-    9 => array(2,3,1,3,1,2),
-    );
-
-// First create a new windrose graph with a title
-$graph = new WindroseGraph(400,450);
-$graph->title->Set('Windrose example 7');
-$graph->title->SetFont(FF_VERDANA,FS_BOLD,14);
-$graph->title->SetColor('navy');
-
-// Create the free windrose plot.
-$wp = new WindrosePlot($data);
-$wp->SetType(WINDROSE_TYPE16);
-
-// Add some "arbitrary" text to the center
-$wp->scale->SetZeroLabel("SOx\n8%%");
-
-// Localize the compass direction labels into Swedish
-// Note: The labels for data must now also match the exact
-// string for the compass directions.
-$se_CompassLbl = array('O','ONO','NO','NNO','N','NNV','NV','VNV',
-		       		   'V','VSV','SV','SSV','S','SSO','SO','OSO');
-$wp->SetCompassLabels($se_CompassLbl);
-
-// Localize the "Calm" text into Swedish and make the circle
-// slightly bigger than default
-$se_calmtext = 'Lugnt';
-$wp->legend->SetCircleText($se_calmtext);
-$wp->legend->SetCircleRadius(20);
-
-// Adjust the displayed ranges
-$ranges = array(1,3,5,8,12,19,29);
-$wp->SetRanges($ranges);
-//$wp->SetAntiAlias(true);
-
-// Set the scale to always have max value of 30 with a step
-// size of 12.
-$wp->scale->Set(30,12);
-
-// Finally add it to the graph and send back to client
-$graph->Add($wp);
-$graph->Stroke();
-?>
-
diff --git a/#jpgraph/src/Examples/windrose_ex8.1.php b/#jpgraph/src/Examples/windrose_ex8.1.php
deleted file mode 100644
index caaff637..00000000
--- a/#jpgraph/src/Examples/windrose_ex8.1.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_windrose.php');
-
-// Data can be specified using both ordinal index of the axis
-// as well as the direction label.
-$data = array(
-    '45.9' => array(3,2,1,2,2),
-    355 => array(1,1,1.5,2),
-    180 => array(1,1,1.5,2),
-    150 => array(1,2,1,3),
-    'S' => array(2,3,5,1),
-    );
-
-// Add some labels for  afew of the directions
-$labels = array(355=>"At\nHome base",180=>"Probe\n123",150=>"Power\nplant");
-
-// Define the color,weight and style of some individual radial grid lines.
-$axiscolors = array(355=>"red");
-$axisweights = array(355=>8);
-$axisstyles = array(355=>'solid',150=>'solid');
-
-// First create a new windrose graph with a title
-$graph = new WindroseGraph(400,460);
-$graph->title->Set('Adding label backgrounds');
-$graph->title->SetFont(FF_VERDANA,FS_BOLD,14);
-$graph->title->SetColor('navy');
-
-// Create the free windrose plot.
-$wp = new WindrosePlot($data);
-$wp->SetType(WINDROSE_TYPEFREE);
-$wp->scale->SetLabelFillColor('lightblue','black');
-
-// Specify colors weights and style for the radial gridlines
-$wp->SetRadialColors($axiscolors);
-$wp->SetRadialWeights($axisweights);
-$wp->SetRadialStyles($axisstyles);
-
-// Add a few labels
-$wp->SetLabels($labels);
-
-// Add some "arbitrary" text to the center
-$wp->scale->SetZeroLabel("SOx\n8%%");
-
-// Finally add it to the graph and send back to client
-$graph->Add($wp);
-$graph->Stroke();
-?>
-
diff --git a/#jpgraph/src/Examples/windrose_ex8.php b/#jpgraph/src/Examples/windrose_ex8.php
deleted file mode 100644
index b81c874d..00000000
--- a/#jpgraph/src/Examples/windrose_ex8.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_windrose.php');
-
-// Data can be specified using both ordinal index of the axis
-// as well as the direction label.
-$data = array(
-    '45.9' => array(3,2,1,2,2),
-    355 => array(1,1,1.5,2),
-    180 => array(1,1,1.5,2),
-    150 => array(1,2,1,3),
-    'S' => array(2,3,5,1),
-    );
-
-// Add some labels for  afew of the directions
-$labels = array(355=>"At\nHome base",180=>"Probe\n123",150=>"Power\nplant");
-
-// Define the color,weight and style of some individual radial grid lines.
-$axiscolors = array(355=>"red");
-$axisweights = array(355=>8);
-$axisstyles = array(355=>'solid',150=>'solid');
-
-// First create a new windrose graph with a title
-$graph = new WindroseGraph(400,500);
-$graph->title->Set('Windrose example 8');
-$graph->title->SetFont(FF_VERDANA,FS_BOLD,14);
-$graph->title->SetColor('navy');
-
-// Create the free windrose plot.
-$wp = new WindrosePlot($data);
-$wp->SetType(WINDROSE_TYPEFREE);
-
-// Specify colors weights and style for the radial gridlines
-$wp->SetRadialColors($axiscolors);
-$wp->SetRadialWeights($axisweights);
-$wp->SetRadialStyles($axisstyles);
-
-// Add a few labels
-$wp->SetLabels($labels);
-
-// Add some "arbitrary" text to the center
-$wp->scale->SetZeroLabel("SOx\n8%%");
-
-// Finally add it to the graph and send back to client
-$graph->Add($wp);
-$graph->Stroke();
-?>
-
diff --git a/#jpgraph/src/Examples/windrose_ex9.1.php b/#jpgraph/src/Examples/windrose_ex9.1.php
deleted file mode 100644
index dbdebed4..00000000
--- a/#jpgraph/src/Examples/windrose_ex9.1.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_windrose.php');
-
-// Data can be specified using both ordinal index of the axis
-// as well as the direction label.
-$data = array(
-    0 => array(3,2,1,2,2),
-    4 => array(1,1,1.5,2),
-    6 => array(1,1,1.5,2),
-    12 => array(2,3,5,1),
-);
-
-$xpos1 = 0.26;
-$xpos2 = 0.74;
-$ypos1 = 0.5;
-$ypos2 = 0.9;
-
-// First create a new windrose graph with a title
-$graph = new WindroseGraph(650,350);
-$graph->title->Set('Interpretation of ordinal keys');
-$graph->title->SetFont(FF_VERDANA,FS_BOLD,14);
-$graph->title->SetColor('navy');
-
-// Create the first plot
-$wp1 = new WindrosePlot($data);
-$wp1->SetType(WINDROSE_TYPE16);
-
-// This is the default encoding
-$wp1->SetDataKeyEncoding(KEYENCODING_ANTICLOCKWISE);
-$wp1->legend->Hide();
-$wp1->SetPos($xpos1,$ypos1);
-$wp1->SetSize(0.5);
-
-// Create the second plot
-$wp2 = new WindrosePlot($data);
-$wp2->SetType(WINDROSE_TYPE16);
-$wp2->SetDataKeyEncoding(KEYENCODING_CLOCKWISE);
-$wp2->legend->Hide();
-$wp2->SetPos($xpos2,$ypos1);
-$wp2->SetSize(0.5);
-
-$txt1 = new Text('KEYENCODING_ANTICLOCKWISE');
-$txt1->SetFont(FF_COURIER,FS_BOLD,12);
-$txt1->SetPos($xpos1,$ypos2);
-$txt1->SetAlign('center','top');
-
-$txt2 = new Text('KEYENCODING_CLOCKWISE');
-$txt2->SetFont(FF_COURIER,FS_BOLD,12);
-$txt2->SetPos($xpos2,$ypos2);
-$txt2->SetAlign('center','top');
-
-// Finally add it to the graph and send back to the client
-$graph->Add($wp1);
-$graph->Add($txt1);
-
-$graph->Add($wp2);
-$graph->Add($txt2);
-
-$graph->Stroke();
-?>
-
diff --git a/#jpgraph/src/Examples/windrose_ex9.php b/#jpgraph/src/Examples/windrose_ex9.php
deleted file mode 100644
index 53f3dda7..00000000
--- a/#jpgraph/src/Examples/windrose_ex9.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_windrose.php');
-
-// Data can be specified using both ordinal index of the axis
-// as well as the direction label.
-$data = array(
-    'E' => array(3,2,1,2,2),
-    'N' => array(1,1,1.5,2),
-    'nw' => array(1,1,1.5,2),
-    'S' => array(2,3,5,1),
-    );
-
-// Define the color,weight and style of some individual radial
-// grid lines. Axis can be specified either by their (localized)
-// label or by their index.
-// Note; Depending on how many axis you have in the plot the
-// index will vary between 0..n where n is the number of
-// compass directions.
-$axiscolors = array('nw'=>'brown');
-$axisweights = array('nw'=>8);  // Could also be specified as 6 => 8
-$axisstyles = array('nw'=>'solid');
-
-// First create a new windrose graph with a title
-$graph = new WindroseGraph(400,500);
-$graph->title->Set('Windrose example 9');
-$graph->title->SetFont(FF_VERDANA,FS_BOLD,14);
-$graph->title->SetColor('navy');
-
-// Create the free windrose plot.
-$wp = new WindrosePlot($data);
-$wp->SetType(WINDROSE_TYPE16);
-
-// Specify colors weights and style for the radial gridlines
-$wp->SetRadialColors($axiscolors);
-$wp->SetRadialWeights($axisweights);
-$wp->SetRadialStyles($axisstyles);
-
-// Add some "arbitrary" text to the center
-$wp->scale->SetZeroLabel("SOx\n8%%");
-
-// Finally add it to the graph and send back to the client
-$graph->Add($wp);
-$graph->Stroke();
-?>
-
diff --git a/#jpgraph/src/Examples/windrose_icon_ex1.php b/#jpgraph/src/Examples/windrose_icon_ex1.php
deleted file mode 100644
index 44811747..00000000
--- a/#jpgraph/src/Examples/windrose_icon_ex1.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_windrose.php');
-require_once ('jpgraph/jpgraph_iconplot.php');
-
-$data = array(
-    0 => array(1,1,2.5,4),
-    1 => array(3,4,1,4),
-    'wsw' => array(1,5,5,3),
-    'N' => array(2,7,5,4,2),
-    15 => array(2,7,12));
-
-// First create a new windrose graph with a title
-$graph = new WindroseGraph(400,400);
-
-// Creta an icon to be added to the graph
-$icon = new IconPlot('tornado.jpg',10,10,1.3,50);
-$icon->SetAnchor('left','top');
-$graph->Add($icon);
-
-// Setup title
-$graph->title->Set('Windrose icon example');
-$graph->title->SetFont(FF_VERDANA,FS_BOLD,12);
-$graph->title->SetColor('navy');
-
-// Create the windrose plot.
-$wp = new WindrosePlot($data);
-
-// Add to graph and send back to client
-$graph->Add($wp);
-$graph->Stroke();
-?>
-
diff --git a/#jpgraph/src/Examples/windrose_layout_ex0.php b/#jpgraph/src/Examples/windrose_layout_ex0.php
deleted file mode 100644
index cd6f43cb..00000000
--- a/#jpgraph/src/Examples/windrose_layout_ex0.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_windrose.php');
-
-// Some data for the five windrose plots
-$data = array(
-	array(
-    	1 => array(10,10,13,7),
-		2 => array(2,8,10),
-		4 => array(1,12,22)),
-	array(
-    	4 => array(12,8,2,3),
-    	2 => array(5,4,4,5,2)),
-	array(
-    	1 => array(12,8,2,3),
-    	3 => array(5,4,4,5,2)),
-	array(
-    	2 => array(12,8,2,3),
-    	3 => array(5,4,4,5,2)),
-);
-
-// Create a windrose graph with titles
-$graph = new WindroseGraph(600,650);
-$graph->SetShadow();
-
-$graph->title->Set('Multiple plots with automatic layout');
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,14);
-
-// Setup the individual windrose plots
-$wp = array();
-for( $i=0; $i < 4; ++$i ) {
-	$wp[$i] = new WindrosePlot($data[$i]);
-	$wp[$i]->SetSize(0.22);
-	$wp[$i]->SetCenterSize(0.25);
-}
-
-// Position with two rows. Two plots in top row and three plots in
-// bottom row.
-$hl1 = new LayoutHor( array( $wp[0], $wp[1] ) );
-$hl2 = new LayoutHor( array( $wp[2], $wp[3] ) );
-$vl = new LayoutVert( array( $hl1, $hl2) );
-
-$graph->Add($vl);
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/windrose_layout_ex1.php b/#jpgraph/src/Examples/windrose_layout_ex1.php
deleted file mode 100644
index d44a61c2..00000000
--- a/#jpgraph/src/Examples/windrose_layout_ex1.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_windrose.php');
-
-// Some data for the five windrose plots
-$data = array(
-	array(
-    	1 => array(10,10,13,7),
-		2 => array(2,8,10),
-		4 => array(1,12,22)),
-	array(
-    	4 => array(12,8,2,3),
-    	2 => array(5,4,4,5,2)),
-	array(
-    	1 => array(12,8,2,3),
-    	3 => array(5,4,4,5,2)),
-	array(
-    	2 => array(12,8,2,3),
-    	3 => array(5,4,4,5,2)),
-	array(
-    	4 => array(12,8,2,3),
-    	6 => array(5,4,4,5,2))
-);
-
-// Legend range colors
-$rangecolors = array('green','yellow','red','brown');
-
-// Create a windrose graph with titles
-$graph = new WindroseGraph(750,700);
-
-$graph->title->Set('Multiple plots with automatic layout');
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,14);
-
-// Setup the individual windrose plots
-$wp = array();
-for( $i=0; $i < 5; ++$i ) {
-	$wp[$i] = new WindrosePlot($data[$i]);
-	$wp[$i]->SetType(WINDROSE_TYPE8);
-	if( $i < 2) {
-		$wp[$i]->SetSize(0.28);
-	}
-	else {
-		$wp[$i]->legend->Hide();
-		$wp[$i]->SetSize(0.16);
-		$wp[$i]->SetCenterSize(0.25);
-	}
-	$wp[$i]->SetRangeColors($rangecolors);
-}
-
-// Position with two rows. Two plots in top row and three plots in
-// bottom row.
-$hl1 = new LayoutHor( array( $wp[0], $wp[1] ) );
-$hl2 = new LayoutHor( array( $wp[2], $wp[3], $wp[4] ) );
-$vl = new LayoutVert( array( $hl1, $hl2) );
-
-$graph->Add($vl);
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/worldmap1.jpg b/#jpgraph/src/Examples/worldmap1.jpg
deleted file mode 100644
index caa7c140..00000000
Binary files a/#jpgraph/src/Examples/worldmap1.jpg and /dev/null differ
diff --git a/#jpgraph/src/Examples/y2synch.php b/#jpgraph/src/Examples/y2synch.php
deleted file mode 100644
index f00ad73e..00000000
--- a/#jpgraph/src/Examples/y2synch.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-
-function toFahrenheit($aVal) {
-    return round(($aVal*9/5)+32,2);
-}
-
-function toCelcius($aVal) {
-    return round(($aVal-32)*5/9,2);
-}
-
-
-$datay =array(2,3,8,19,7,17,6,22);
-
-// Create the graph. 
-$graph = new Graph(400,280);
-
-// Slightly bigger margins than default to make room for titles
-$graph->SetMargin(50,60,40,45);
-$graph->SetMarginColor('white');
-
-
-// Setup the scales for X,Y and Y2 axis
-$graph->SetScale("intlin"); // X and Y axis
-$graph->SetY2Scale("lin"); // Y2 axis
-
-// Overall graph title
-$graph->title->Set('Synchronized Y & Y2 scales');
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,12);
-
-// Title for X-axis
-$graph->xaxis->title->Set('Measurement');
-$graph->xaxis->title->SetMargin(5);
-$graph->xaxis->title->SetFont(FF_ARIAL,FS_NORMAL,11);
-
-// Create Y data set 
-$lplot = new LinePlot($datay);
-$graph->yaxis->title->Set('Celcius (C)');
-$graph->yaxis->title->SetMargin(5);
-$graph->yaxis->title->SetFont(FF_ARIAL,FS_NORMAL,11);
-// ... and add the plot to the Y-axis
-$graph->Add($lplot);
-
-// Create Y2 scale data set 
-$l2plot = new LinePlot($datay);
-$l2plot->SetWeight(0);
-$graph->y2axis->title->Set('Fahrenheit (F)');
-$graph->y2axis->title->SetMargin(5); // Some extra margin to clear labels
-$graph->y2axis->title->SetFont(FF_ARIAL,FS_NORMAL,11);
-$graph->y2axis->SetLabelFormatCallback('toFahrenheit');
-$graph->y2axis->SetColor('navy');
-
-// ... and add the plot to the Y2-axis
-$graph->AddY2($l2plot);
-
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/y2synch2.php b/#jpgraph/src/Examples/y2synch2.php
deleted file mode 100644
index 5d6a88f4..00000000
--- a/#jpgraph/src/Examples/y2synch2.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php // content="text/plain; charset=utf-8"
-require_once ('jpgraph/jpgraph.php');
-require_once ('jpgraph/jpgraph_line.php');
-require_once ('jpgraph/jpgraph_bar.php');
-
-
-function toFahrenheit($aVal) {
-    return round(($aVal*9/5)+32,2);
-}
-
-function toCelcius($aVal) {
-    return round(($aVal-32)*5/9,2);
-}
-
-
-$datay =array(2,3,8,19,7,17,6,22);
-
-// Create the graph. 
-$graph = new Graph(400,280);
-
-// Slightly bigger margins than default to make room for titles
-$graph->SetMargin(50,60,40,45);
-$graph->SetMarginColor('white');
-
-
-// Setup the scales for X,Y and Y2 axis
-$graph->SetScale("textlin"); // X and Y axis
-$graph->SetY2Scale("lin"); // Y2 axis
-
-// Overall graph title
-$graph->title->Set('Synchronized Y & Y2 scales');
-$graph->title->SetFont(FF_ARIAL,FS_BOLD,12);
-
-// Title for X-axis
-$graph->xaxis->title->Set('Measurement');
-$graph->xaxis->title->SetMargin(5);
-$graph->xaxis->title->SetFont(FF_ARIAL,FS_NORMAL,11);
-
-// Create Y data set 
-$lplot = new BarPlot($datay);
-$graph->yaxis->title->Set('Celcius (C)');
-$graph->yaxis->title->SetMargin(5);
-$graph->yaxis->title->SetFont(FF_ARIAL,FS_NORMAL,11);
-// ... and add the plot to the Y-axis
-$graph->Add($lplot);
-
-// Create Y2 scale data set 
-$l2plot = new LinePlot($datay);
-$l2plot->SetWeight(0);
-$graph->y2axis->title->Set('Fahrenheit (F)');
-$graph->y2axis->title->SetMargin(5); // Some extra margin to clear labels
-$graph->y2axis->title->SetFont(FF_ARIAL,FS_NORMAL,11);
-$graph->y2axis->SetLabelFormatCallback('toFahrenheit');
-$graph->y2axis->SetColor('navy');
-
-// ... and add the plot to the Y2-axis
-$graph->AddY2($l2plot);
-
-$graph->Stroke();
-?>
diff --git a/#jpgraph/src/Examples/yearssn.txt b/#jpgraph/src/Examples/yearssn.txt
deleted file mode 100644
index bafcd7b3..00000000
--- a/#jpgraph/src/Examples/yearssn.txt
+++ /dev/null
@@ -1,309 +0,0 @@
-1700.5   5.0  
-1701.5  11.0  
-1702.5  16.0  
-1703.5  23.0  
-1704.5  36.0  
-1705.5  58.0  
-1706.5  29.0  
-1707.5  20.0  
-1708.5  10.0  
-1709.5   8.0  
-1710.5   3.0  
-1711.5   0.0  
-1712.5   0.0  
-1713.5   2.0  
-1714.5  11.0  
-1715.5  27.0  
-1716.5  47.0  
-1717.5  63.0  
-1718.5  60.0  
-1719.5  39.0  
-1720.5  28.0  
-1721.5  26.0  
-1722.5  22.0  
-1723.5  11.0  
-1724.5  21.0  
-1725.5  40.0  
-1726.5  78.0  
-1727.5 122.0  
-1728.5 103.0  
-1729.5  73.0  
-1730.5  47.0  
-1731.5  35.0  
-1732.5  11.0  
-1733.5   5.0  
-1734.5  16.0  
-1735.5  34.0  
-1736.5  70.0  
-1737.5  81.0  
-1738.5 111.0  
-1739.5 101.0  
-1740.5  73.0  
-1741.5  40.0  
-1742.5  20.0  
-1743.5  16.0  
-1744.5   5.0  
-1745.5  11.0  
-1746.5  22.0  
-1747.5  40.0  
-1748.5  60.0  
-1749.5  80.9  
-1750.5  83.4  
-1751.5  47.7  
-1752.5  47.8  
-1753.5  30.7  
-1754.5  12.2  
-1755.5   9.6  
-1756.5  10.2  
-1757.5  32.4  
-1758.5  47.6  
-1759.5  54.0  
-1760.5  62.9  
-1761.5  85.9  
-1762.5  61.2  
-1763.5  45.1  
-1764.5  36.4  
-1765.5  20.9  
-1766.5  11.4  
-1767.5  37.8  
-1768.5  69.8  
-1769.5 106.1  
-1770.5 100.8  
-1771.5  81.6  
-1772.5  66.5  
-1773.5  34.8  
-1774.5  30.6  
-1775.5   7.0  
-1776.5  19.8  
-1777.5  92.5  
-1778.5 154.4  
-1779.5 125.9  
-1780.5  84.8  
-1781.5  68.1  
-1782.5  38.5  
-1783.5  22.8  
-1784.5  10.2  
-1785.5  24.1  
-1786.5  82.9  
-1787.5 132.0  
-1788.5 130.9  
-1789.5 118.1  
-1790.5  89.9  
-1791.5  66.6  
-1792.5  60.0  
-1793.5  46.9  
-1794.5  41.0  
-1795.5  21.3  
-1796.5  16.0  
-1797.5   6.4  
-1798.5   4.1  
-1799.5   6.8  
-1800.5  14.5  
-1801.5  34.0  
-1802.5  45.0  
-1803.5  43.1  
-1804.5  47.5  
-1805.5  42.2  
-1806.5  28.1  
-1807.5  10.1  
-1808.5   8.1  
-1809.5   2.5  
-1810.5   0.0  
-1811.5   1.4  
-1812.5   5.0  
-1813.5  12.2  
-1814.5  13.9  
-1815.5  35.4  
-1816.5  45.8  
-1817.5  41.0  
-1818.5  30.1  
-1819.5  23.9  
-1820.5  15.6  
-1821.5   6.6  
-1822.5   4.0  
-1823.5   1.8  
-1824.5   8.5  
-1825.5  16.6  
-1826.5  36.3  
-1827.5  49.6  
-1828.5  64.2  
-1829.5  67.0  
-1830.5  70.9  
-1831.5  47.8  
-1832.5  27.5  
-1833.5   8.5  
-1834.5  13.2  
-1835.5  56.9  
-1836.5 121.5  
-1837.5 138.3  
-1838.5 103.2  
-1839.5  85.7  
-1840.5  64.6  
-1841.5  36.7  
-1842.5  24.2  
-1843.5  10.7  
-1844.5  15.0  
-1845.5  40.1  
-1846.5  61.5  
-1847.5  98.5  
-1848.5 124.7  
-1849.5  96.3  
-1850.5  66.6  
-1851.5  64.5  
-1852.5  54.1  
-1853.5  39.0  
-1854.5  20.6  
-1855.5   6.7  
-1856.5   4.3  
-1857.5  22.7  
-1858.5  54.8  
-1859.5  93.8  
-1860.5  95.8  
-1861.5  77.2  
-1862.5  59.1  
-1863.5  44.0  
-1864.5  47.0  
-1865.5  30.5  
-1866.5  16.3  
-1867.5   7.3  
-1868.5  37.6  
-1869.5  74.0  
-1870.5 139.0  
-1871.5 111.2  
-1872.5 101.6  
-1873.5  66.2  
-1874.5  44.7  
-1875.5  17.0  
-1876.5  11.3  
-1877.5  12.4  
-1878.5   3.4  
-1879.5   6.0  
-1880.5  32.3  
-1881.5  54.3  
-1882.5  59.7  
-1883.5  63.7  
-1884.5  63.5  
-1885.5  52.2  
-1886.5  25.4  
-1887.5  13.1  
-1888.5   6.8  
-1889.5   6.3  
-1890.5   7.1  
-1891.5  35.6  
-1892.5  73.0  
-1893.5  85.1  
-1894.5  78.0  
-1895.5  64.0  
-1896.5  41.8  
-1897.5  26.2  
-1898.5  26.7  
-1899.5  12.1  
-1900.5   9.5  
-1901.5   2.7  
-1902.5   5.0  
-1903.5  24.4  
-1904.5  42.0  
-1905.5  63.5  
-1906.5  53.8  
-1907.5  62.0  
-1908.5  48.5  
-1909.5  43.9  
-1910.5  18.6  
-1911.5   5.7  
-1912.5   3.6  
-1913.5   1.4  
-1914.5   9.6  
-1915.5  47.4  
-1916.5  57.1  
-1917.5 103.9  
-1918.5  80.6  
-1919.5  63.6  
-1920.5  37.6  
-1921.5  26.1  
-1922.5  14.2  
-1923.5   5.8  
-1924.5  16.7  
-1925.5  44.3  
-1926.5  63.9  
-1927.5  69.0  
-1928.5  77.8  
-1929.5  64.9  
-1930.5  35.7  
-1931.5  21.2  
-1932.5  11.1  
-1933.5   5.7  
-1934.5   8.7  
-1935.5  36.1  
-1936.5  79.7  
-1937.5 114.4  
-1938.5 109.6  
-1939.5  88.8  
-1940.5  67.8  
-1941.5  47.5  
-1942.5  30.6  
-1943.5  16.3  
-1944.5   9.6  
-1945.5  33.2  
-1946.5  92.6  
-1947.5 151.6  
-1948.5 136.3  
-1949.5 134.7  
-1950.5  83.9  
-1951.5  69.4  
-1952.5  31.5  
-1953.5  13.9  
-1954.5   4.4  
-1955.5  38.0  
-1956.5 141.7  
-1957.5 190.2  
-1958.5 184.8  
-1959.5 159.0  
-1960.5 112.3  
-1961.5  53.9  
-1962.5  37.6  
-1963.5  27.9  
-1964.5  10.2  
-1965.5  15.1  
-1966.5  47.0  
-1967.5  93.7  
-1968.5 105.9  
-1969.5 105.5  
-1970.5 104.5  
-1971.5  66.6  
-1972.5  68.9  
-1973.5  38.0  
-1974.5  34.5  
-1975.5  15.5  
-1976.5  12.6  
-1977.5  27.5  
-1978.5  92.5  
-1979.5 155.4  
-1980.5 154.6  
-1981.5 140.5  
-1982.5 115.9  
-1983.5  66.6  
-1984.5  45.9  
-1985.5  17.9  
-1986.5  13.4  
-1987.5  29.2  
-1988.5 100.2  
-1989.5 157.6  
-1990.5 142.6  
-1991.5 145.7  
-1992.5  94.3  
-1993.5  54.6  
-1994.5  29.9  
-1995.5  17.5  
-1996.5   8.6  
-1997.5  21.5  
-1998.5  64.3  
-1999.5  93.3  
-2000.5 119.6  
-2001.5 111.0  
-2002.5 104.0  
-2003.5  63.7  
-2004.5  40.4  
-2005.5  29.8  
-2006.5  15.2  
-2007.5   7.5  
-2008.5   2.9  
diff --git a/#jpgraph/src/README b/#jpgraph/src/README
deleted file mode 100644
index d384ea88..00000000
--- a/#jpgraph/src/README
+++ /dev/null
@@ -1,63 +0,0 @@
-README FOR JPGRAPH 4.0.2
-=========================
-
-This package contains the JpGraph PHP library version 4.0.2
-
-The library is Copyright (C) 2000-2010 Asial Corporatoin and
-released under dual license QPL 1.0 for open source and educational
-use and JpGraph Professional License for commercial use. 
-
-Please see full license details at 
-http://jpgraph.net/pro/
-http://jpgraph.net/download/
-
-
-Requirements:
--------------
-Miminum:
-* PHP 5.1.0 or higher 
-* GD 2.0.28 or higher
-Note: Earlier versions might work but is unsupported.
-
-Recommended:
-* >= PHP 5.2.0
-* PHP Builtin GD library
-
-Installation
-------------
-1. Make sure that the PHP version is compatible with the stated 
-   requirements and that the PHP installation has support for 
-   the GD library. Please run phpinfo() to check if GD library 
-   is supported in the installation. 
-   If the GD library doesn't seem to be installed 
-   please consult the PHP manual under section "Image" for
-   instructions on where to find this library. Please refer to
-   the manual section "Verifying your PHP installation"
-   
-2. Unzip and copy the files to a directory of your choice where Your
-   httpd sever can access them. 
-   For a global site installation you should copy the files to 
-   somewhere in the PHP search path. 
-
-3. Check that the default directory paths in jpg-config.inc.php
-   for cache directory and TTF directory suits your installation. 
-   Note1: The default directories are different depending on if
-   the library is running on Windows or UNIX.
-   Note2: Apache/PHP must have write permission to your cache 
-   directory if you enable the cache feature. By default the cache
-   is disabled.
-   
-
-Documentation
--------------
-The installation includes HTML documentation and reference guide for the
-library. The portal page for all documentation is
-<YOUR-INSTALLATION-DIRECTORY>/docs/index.html
-
-
-Bug reports and suggestions
----------------------------
-Should be reported using the contact form at
-
-http://jpgraph.net/contact/
-
diff --git a/#jpgraph/src/barcode/demoapp/barcode_image.php b/#jpgraph/src/barcode/demoapp/barcode_image.php
deleted file mode 100644
index 2ad88fd6..00000000
--- a/#jpgraph/src/barcode/demoapp/barcode_image.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-require_once "jpgraph/jpgraph.php";
-require_once "jpgraph/jpgraph_canvas.php";
-require_once "jpgraph/jpgraph_barcode.php";
-
-$params = array(
-    array('code',1),array('data',''),array('modwidth',1),array('info',false),
-    array('notext',false),array('checksum',false),array('showframe',false),
-    array('vertical',false) , array('backend','IMAGE'), array('file',''),
-    array('scale',1), array('height',70), array('pswidth','') );
-
-$n=count($params);
-for($i=0; $i < $n; ++$i ) {
-    $v  = $params[$i][0];
-    if( empty($_GET[$params[$i][0]]) ) {
-	$$v = $params[$i][1];
-    }
-    else
-	$$v = $_GET[$params[$i][0]];
-}
-
-if( $modwidth < 1 || $modwidth > 5 ) {
-    echo "<h4>Module width must be between 1 and 5 pixels</h4>";
-}
-elseif( $data==="" ) {
-    echo "<h3>Please enter data to be encoded, select symbology and press 'Ok'.</h3>";
-    echo "<i>Note: Data must be valid for the choosen encoding.</i>";
-}
-elseif( $code==-1 ) {
-    echo "<h4>No code symbology selected.</h4>";
-}
-elseif( $height < 10 || $height > 500 ) {
-    echo "<h4> Height must be in range [10, 500]</h4>";
-}
-elseif( $scale < 0.1 || $scale > 15 ) {
-    echo "<h4> Scale must be in range [0.1, 15]</h4>";
-}
-else {
-    if( $code==20 ) {
-	$encoder = BarcodeFactory::Create(6);
-	$encoder->UseExtended();
-    }
-    else {
-	$encoder = BarcodeFactory::Create($code);
-    }
-    $b =  $backend=='EPS' ? 'PS' : $backend;
-    $b = substr($backend,0,5) == 'IMAGE' ? 'IMAGE' : $b;
-    $e = BackendFactory::Create($b,$encoder);
-    if( substr($backend,0,5) == 'IMAGE' ) {
-	if( substr($backend,5,1) == 'J' ) 
-	    $e->SetImgFormat('JPEG');
-    }
-    if( $e ) {
-	if( $backend == 'EPS' )
-	    $e->SetEPS();
-	if( $pswidth!='' )
-	    $modwidth = $pswidth;
-	$e->SetModuleWidth($modwidth);
-	$e->AddChecksum($checksum);
-	$e->NoText($notext);
-	$e->SetScale($scale);
-	$e->SetVertical($vertical);
-	$e->ShowFrame($showframe);
-	$e->SetHeight($height);
-	$r = $e->Stroke($data,$file,$info,$info);
-	if( $r )
-	    echo nl2br(htmlspecialchars($r));
-	if( $file != '' )
-	    echo "<p>Wrote file $file.";
-    }
-    else
-	echo "<h3>Can't create choosen backend: $backend.</h3>";
-}
-
-?>
\ No newline at end of file
diff --git a/#jpgraph/src/barcode/demoapp/barcode_menu.php b/#jpgraph/src/barcode/demoapp/barcode_menu.php
deleted file mode 100644
index ea503066..00000000
--- a/#jpgraph/src/barcode/demoapp/barcode_menu.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<H2>JpGraph Barcode 1.0</h2>
-<hr>
-</font>
-<form name="barcodespec" action="barcode_image.php" target=barcode
-method post>
-<table cellspacing=4 cellpadding=0>
-<tr>
-<td colspan=2>
-Data:<br>
-<input type=text name=data size=25 maxlength=30>
-</td>
-<tr><td>
-Encoding:<br>
-<select name=code>
-<option selected value=-1> Choose encoding </option>
-<option   value=4> UPC A </option>
-<option   value=5> UPC E </option>
-<option   value=3> EAN 8 </option>
-<option   value=2> EAN 13 </option>
-<option   value=1> EAN 128 </option>
-<option   value=11> Industrial 2 of 5 </option>
-<option   value=12> Interleaved 2 of 5 </option>
-<option   value=14> CODE 11 </option>
-<option   value=6> CODE 39 </option>
-<option   value=20> CODE 39 Extended </option>
-<option   value=8> CODE 128 </option>
-<option   value=13> CODABAR </option>
-<option   value=10> BOOKLAND (ISBN) </option>
-</select>
-</td>
-<td>
-Module width:<br>
-<select name=modwidth>
-<option value=1> One </option>
-<option value=2> Two </option>
-<option value=3> Three </option>
-<option value=4> Four </option>
-<option value=5> Five </option>
-</select>
-</td>
-</tr>
-
-<tr>
-<td>
-Add checksum:<br>
-<input type=checkbox value=1 name=checksum>
-</td>
-
-<td>
-Hide text:<br>
-<input type=checkbox value=1 name=notext>
-</td>
-</tr>
-<tr>
-<td>
-Show frame:<br>
-<input type=checkbox value=1 name=showframe>
-</td>
-<td>
-Vertical layout:<br>
-<input type=checkbox value=1 name=vertical>
-</td>
-</tr>
-
-<tr>
-<td>
-Height:<br>
-<input type=text name=height value="70" size=3 maxlength=3>
-</td>
-<td>
-Scale:<br>
-<input type=text name=scale value="1.0" size=4 maxlength=4>
-</td>
-</tr>
-
-
-
-<tr>
-<td>
-Write to file:<br>
-<input type=text name=file size=15 maxlength=80>
-</td>
-<td>
-Format:<br>
-<select name=backend>
-<option selected value="IMAGEPNG">Image (PNG)</option>
-<option value="IMAGEJPG">Image (JPEG)</option>
-<option value="PS">Postscript</option>
-<option value="EPS">EPS</option>
-</select>
-</td>
-
-<tr>
-<td>
-PS module width:
-</td>
-<td>
-<input type=text name=pswidth size=4 maxlength=4><br>
-</td>
-</tr>
-
-<tr>
-<td colspan=2>
-<small><i>(If specified will override Module width above)</i></small><br>
-</td>
-</tr>
-
-
-<tr>
-<td>
-Debug info:<br>
-<input type=checkbox value=1 name=info>
-</td>
-<td align=right valign=bottom>
-<br>
-<input type=submit name=submit value="&nbsp; Create &nbsp;" style="font-weight:bold;">
-</td>
-</tr></table>
-</form>
-
-<p>
-<hr>
-
-
-
diff --git a/#jpgraph/src/barcode/demoapp/index.html b/#jpgraph/src/barcode/demoapp/index.html
deleted file mode 100644
index e65107cb..00000000
--- a/#jpgraph/src/barcode/demoapp/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.0 Frameset//EN">
-<HTML><HEAD>
-<LINK REL=STYLESHEET TYPE="text/css" HREF="de_normal.css">
-<title>Barcode SYSTEMTEST</title>
-</head>
-<frameset cols="280,*">
-<frame src=barcode_menu.php name=menu>;
-<frame  src=barcode_image.php name=barcode>
-</frameset>
-</html>
diff --git a/#jpgraph/src/barcode/examples/barcode_errhandling_ex0.php b/#jpgraph/src/barcode/examples/barcode_errhandling_ex0.php
deleted file mode 100644
index 4f5b5393..00000000
--- a/#jpgraph/src/barcode/examples/barcode_errhandling_ex0.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-// ==============================================
-// Output Image using Code 39 using only default values
-// ==============================================
-require_once ('jpgraph/jpgraph_barcode.php');
-
-try {
-$encoder = BarcodeFactory::Create(ENCODING_CODE39);
-$e = BackendFactory::Create(BACKEND_IMAGE,$encoder);
-$e->Stroke('abc123');
-} catch( JpGraphException $e ) {
-	//echo 'Error: ' . $e->getMessage()."\n";
-	JpGraphError::Raise($e->getMessage());
-}
-
-?>
diff --git a/#jpgraph/src/barcode/examples/barcode_ex0.php b/#jpgraph/src/barcode/examples/barcode_ex0.php
deleted file mode 100644
index 021b5c7c..00000000
--- a/#jpgraph/src/barcode/examples/barcode_ex0.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-// ==============================================
-// Output Image using Code 39 using only default values
-// ==============================================
-require_once ('jpgraph/jpgraph_barcode.php');
-
-$encoder = BarcodeFactory::Create(ENCODING_CODE39);
-$e = BackendFactory::Create(BACKEND_IMAGE,$encoder);
-$e->Stroke('ABC123');
-
-?>
diff --git a/#jpgraph/src/barcode/examples/barcode_ex1.php b/#jpgraph/src/barcode/examples/barcode_ex1.php
deleted file mode 100644
index df7653b5..00000000
--- a/#jpgraph/src/barcode/examples/barcode_ex1.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-// ==============================================
-// Output Image using Code 128
-// ==============================================
-require_once ('jpgraph/jpgraph_barcode.php');
-
-$encoder = BarcodeFactory::Create(ENCODING_CODE128);
-$e = BackendFactory::Create(BACKEND_PS,$encoder);
-$e->SetModuleWidth(2);
-$e->SetHeight(20);
-echo nl2br($e->Stroke('3125134772'));
-
-
-?>
diff --git a/#jpgraph/src/barcode/examples/barcode_ex2.php b/#jpgraph/src/barcode/examples/barcode_ex2.php
deleted file mode 100644
index 8fce58e6..00000000
--- a/#jpgraph/src/barcode/examples/barcode_ex2.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-// ==============================================
-// Output Postscript of nterleaved 2 of 5
-// ==============================================
-require_once ('jpgraph/jpgraph_barcode.php');
-
-$encoder = BarcodeFactory::Create(ENCODING_CODEI25);
-$e = BackendFactory::Create(BACKEND_PS,$encoder);
-$e->SetModuleWidth(2);
-$e->SetHeight(70);
-$ps = $e->Stroke('3125134772');
-echo nl2br(htmlspecialchars($ps));
-
-?>
diff --git a/#jpgraph/src/barcode/examples/barcode_ex3.php b/#jpgraph/src/barcode/examples/barcode_ex3.php
deleted file mode 100644
index a63f4ad4..00000000
--- a/#jpgraph/src/barcode/examples/barcode_ex3.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-// ==============================================
-// Output Encapsulated Postscript of interleaved 2 of 5
-// ==============================================
-require_once ('jpgraph/jpgraph_barcode.php');
-
-echo "Start ...<br>";
-$encoder = BarcodeFactory::Create(ENCODING_CODEI25);
-$e = BackendFactory::Create(BACKEND_PS,$encoder);
-$e->SetModuleWidth(2);
-$e->SetHeight(70);
-$e->SetEPS();
-$ps = $e->Stroke('3125134772');
-echo nl2br(htmlspecialchars($ps));
-
-
-?>
diff --git a/#jpgraph/src/barcode/examples/barcode_ex4.php b/#jpgraph/src/barcode/examples/barcode_ex4.php
deleted file mode 100644
index 721b56ba..00000000
--- a/#jpgraph/src/barcode/examples/barcode_ex4.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-// ==============================================
-// Output Image using Code Interleaved 2 of 5
-// ==============================================
-require_once ('jpgraph/jpgraph_barcode.php');
-
-$encoder = BarcodeFactory::Create(ENCODING_CODEI25);
-$e = BackendFactory::Create(BACKEND_IMAGE,$encoder);
-$e->SetModuleWidth(2);
-$e->Stroke('1234');
-
-?>
diff --git a/#jpgraph/src/barcode/examples/barcode_usps_example.php b/#jpgraph/src/barcode/examples/barcode_usps_example.php
deleted file mode 100644
index 80469bea..00000000
--- a/#jpgraph/src/barcode/examples/barcode_usps_example.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-// =======================================================
-// Example of how to format US Postal shipping information
-// =======================================================
-require_once ('jpgraph/jpgraph_barcode.php');
-
-// The Full barcode standard is described in
-// http://www.usps.com/cpim/ftp/pubs/pub91/91c4.html#508hdr1
-//
-// The data start with AI=420 which means
-// "Ship to/Deliver To Postal Code (within single authority)
-//
-class USPS_Confirmation {
-    function USPS_Confirmation() {
-    }
-
-    // Private utility function
-    function _USPS_chkd($aData) {
-	$n = strlen($aData);
-
-	// Add all even numbers starting from position 1 from the end
-	$et = 0 ;
-	for( $i=1; $i <= $n; $i+=2 ) {
-	    $d = intval(substr($aData,-$i,1));
-	    $et += $d;
-	}
-
-	// Add all odd numbers starting from position 2 from the end
-	$ot = 0 ;
-	for( $i=2; $i <= $n; $i+=2 ) {
-	    $d = intval(substr($aData,-$i,1));
-	    $ot += $d;
-	}
-	$tot = 3*$et + $ot;
-	$chkdigit = (10 - ($tot % 10))%10;;
-	return $chkdigit;
-    }
-
-    // Get type 1 of confirmation code (with ZIP)
-    function GetPICwithZIP($aZIP,$aServiceType,$aDUNS,$aSeqNbr) {
-	// Convert to USPS format with AI=420 and extension starting with AI=91
-	$data = '420'. $aZIP . '91' . $aServiceType . $aDUNS . $aSeqNbr;
-	// Only calculate the checkdigit from the AI=91 and forward
-	// and do not include the ~1 (FUNC1) in the calculation
-	$cd = $this->_USPS_chkd(substr($data,8));
-	$data = '420'. $aZIP . '~191' . $aServiceType . $aDUNS . $aSeqNbr;
-	return $data . $cd;
-    }
-
-    // Get type 2 of confirmation code (without ZIP)
-    function GetPIC($aServiceType,$aDUNS,$aSeqNbr) {
-	// Convert to USPS format with AI=91
-	$data = '91' . $aServiceType . $aDUNS . $aSeqNbr;
-	$cd = $this->_USPS_chkd($data);
-	return $data . $cd;
-    }
-
-}
-
-$usps = new USPS_Confirmation();
-$zip     = '92663';
-$service = '21';
-$DUNS    = '805213907';
-$seqnr   = '04508735';
-$data = $usps->GetPICwithZIP($zip,$service,$DUNS,$seqnr);
-//$data = $usps->GetPIC('01','123456789','00000001');
-
-$encoder = BarcodeFactory::Create(ENCODING_EAN128);
-$e = BackendFactory::Create(BACKEND_IMAGE,$encoder);
-$e->SetModuleWidth(2);
-$e->SetFont(FF_ARIAL,FS_NORMAL,14);
-$e->Stroke($data);
-
-?>
\ No newline at end of file
diff --git a/#jpgraph/src/barcode/mkbarcode.php b/#jpgraph/src/barcode/mkbarcode.php
deleted file mode 100644
index 57ef6ec0..00000000
--- a/#jpgraph/src/barcode/mkbarcode.php
+++ /dev/null
@@ -1,281 +0,0 @@
-<?php
-require_once('jpgraph/jpgraph_barcode.php');
-
-/*=======================================================================
- // File:        MKBARCODE.PHP
- // Description: Comman line tool to generate linear barcodes
- // Created:     2009-06-20
- // Ver:         $Id: mkbarcode.php 1455 2009-07-03 18:52:25Z ljp $
- //
- // Copyright (c) Asial Corporation. All rights reserved.
- //=======================================================================
- */
-
-//----------------------------------------------------------------------
-// CLASS ParseArgs
-// Parse command line arguments and make sanity checks
-//----------------------------------------------------------------------
-class ParseArgs {
-    var $argc,$argv;
-
-    function ParseArgs() {
-        // Get command line argument
-        $this->argv = ($_SERVER['argv']);
-        $this->argc = ($_SERVER['argc']);
-    }
-
-    function PrintUsage() {
-    	$n = $this->argv[0];
-        echo "$n -b <symbology> [-r -h -c -o <output format> -m <width> -s <scale> -y <height> -f <filename> ] datastring \n".
-            "Create the specified barcode\n".
-            "-b           What symbology to use, one of the following strings (case insensitive)\n".
-            "             UPCA \n".
-            "             UPCE \n".
-            "             EAN128 \n".
-            "             EAN13 \n".
-            "             EAN8 \n".
-            "             CODE11 \n".
-            "             CODE39 \n".
-            "             CODE128 \n".
-            "             CODE25 \n".
-            "             CODEI25 \n".
-            "             CODABAR \n".
-            "             BOOKLAND \n".
-            "-c           Add checkdigit for symbologies where this is optional\n".
-            "-o           Output format. 0=Image, 1=PS, 2=EPS\n".
-            "-m           Module width\n".
-            "-s           Scale factor\n".
-            "-h           Show this help\n".
-			"-f           Filename to write to\n".
-        	"-r           Rotate barcode 90 degrees\n".
-        	"-y height    Set height in pixels\n".
-            "-x           Hide the human readable text\n".
-        	"--silent     Silent. Don't give any error mesages\n";
-        exit(1);
-    }
-
-    function Get() {
-        $barcode='code39';
-        $hide=false;
-        $checkdigit=false;
-        $modulewidth=2;
-        $scale=1;
-        $output=0;
-        $filename='';
-        $data = '';
-        $rotate = false;
-        $silent=false;
-        $height = 70;
-        if( ($n=$this->GetNum()) > 0 ) {
-            $i=1;
-            while( $i <= $n ) {
-                switch( $this->argv[$i] ) {
-                    case '-h':
-                        $this->PrintUsage();
-                        exit(0);
-                        break;
-                    case '-b':
-                        $barcode = $this->argv[++$i];
-                        break;
-                    case '-o':
-                        $output = (int)$this->argv[++$i];
-                        break;
-                    case '-y':
-                        $height = (int)$this->argv[++$i];
-                        break;
-					case '-x':
-                        $hide=true;
-                        break;
-                    case '-r':
-                        $rotate=true;
-                        break;
-                    case '-c':
-                        $checkdigit=true;
-                        break;
-                    case '--silent':
-                        $silent=true;
-                        break;
-                    case '-s':
-                        $scale = (float)$this->argv[++$i];
-                        break;
-                    case '-m':
-                        $modulewidth = (float)$this->argv[++$i];
-                        break;
-                    case '-f':
-                        $filename = $this->argv[++$i];
-                        break;
-                    default:
-                    	if( $data == '' ) {
-                        	$data = $this->argv[$i];
-                    	}
-                    	else {
-  							$this->PrintUsage();
-  							die("Illegal specified parameters");
-                    	}
-                        break;
-                }
-                ++$i;
-            }
-
-        }
-
-        if( $output < 0 || $output > 2 ) {
-        	fwrite(STDERR,"Unkown output format ($output)\n");
-        	exit(1);
-        }
-
-        if( $output === 0  ) {
-        	$modulewidth = floor($modulewidth);
-        }
-
-        // Sanity check
-        if( $modulewidth > 15 ) {
-        	fwrite(STDERR,"Too large modulewidth\n");
-        	exit(1);
-        }
-
-        // Sanity check
-        if( $height > 1000 ) {
-        	fwrite(STDERR,"Too large height\n");
-        	exit(1);
-        }
-
-		// Sanity check
-        if( $scale > 15 ) {
-        	fwrite(STDERR,"Too large scale factor\n");
-        	exit(1);
-        }
-
-        if( strlen($filename) > 256 ) {
-        	fwrite(STDERR,"Too long filename\n");
-        	exit(1);
-        }
-
-        if( trim($data) == '' ) {
-			fwrite(STDERR,"No input data specified\n");
-			exit(1);
-        }
-
-        $barcodes = array(
-            'UPCA' => ENCODING_UPCA,
-            'UPCE' => ENCODING_UPCE,
-            'EAN128' => ENCODING_EAN128,
-            'EAN13' => ENCODING_EAN13,
-            'EAN8' => ENCODING_EAN8,
-            'CODE11' => ENCODING_CODE11,
-            'CODE39' => ENCODING_CODE39,
-            'CODE128' => ENCODING_CODE128,
-            'CODE25' => ENCODING_CODE25,
-            'CODEI25' => ENCODING_CODEI25,
-            'CODABAR' => ENCODING_CODABAR,
-            'BOOKLAND' => ENCODING_BOOKLAND,
-        );
-        $barcode = strtoupper($barcode);
-        if( key_exists($barcode,$barcodes) ) {
-        	$barcode = $barcodes[$barcode];
-        }
-        else {
-        	fwrite(STDERR,'Specified barcode symbology ('.$barcode.") is not supported\n");
-        	exit(1);
-        }
-
-		$ret = array(
-				'barcode'     => $barcode,
-		        'hide' 	      => $hide,
-		        'modulewidth' => $modulewidth,
-		        'scale'       => $scale,
-		        'output'      => $output,
-		        'data'        => $data,
-		        'silent'      => $silent,
-		        'rotate'      => $rotate,
-		        'height'      => $height,
-				'checkdigit'  => $checkdigit,
-		        'filename'    => $filename
-			);
-
-		return $ret;
-    }
-
-    function _Dump() {
-        var_dump($this->argv);
-    }
-
-    function GetNum() {
-        return $this->argc-1;
-    }
-}
-
-//----------------------------------------------------------------------
-// CLASS Driver
-// Main driver class to create barcodes with the parmeters specified on
-// the command line.
-//----------------------------------------------------------------------
-class Driver {
-
-	private $iParams;
-	static public $silent=false;
-
-	static public function ErrHandlerPS(Exception $e) {
-		if( !Driver::$silent )
-			fwrite(STDERR,$e->getMessage()."\n");
-        exit(1);
-	}
-
-	static public function ErrHandlerImg(Exception $e) {
-		if( !Driver::$silent )
-			fwrite(STDERR,$e->getMessage()."\n");
-        $errobj = new JpGraphErrObjectImg();
-        $errobj->Raise($e->getMessage());
-        exit(1);
-	}
-
-	function Run($aParams) {
-
-		$this->iParams = $aParams;
-
-		Driver::$silent = $aParams['silent'];
-
-		$encoder = BarcodeFactory::Create($aParams['barcode']);
-		$encoder->AddChecksum($aParams['checkdigit']);
-		switch( $aParams['output'] ) {
-			case 0:
-				$e = BackendFactory::Create(BACKEND_IMAGE,$encoder);
-				set_exception_handler(array('Driver','ErrHandlerImg'));
-				break;
-			case 1:
-				$e = BackendFactory::Create(BACKEND_PS,$encoder);
-				set_exception_handler(array('Driver','ErrHandlerPS'));
-				break;
-			case 2:
-				$e = BackendFactory::Create(BACKEND_PS,$encoder);
-				$e->SetEPS();
-				set_exception_handler(array('Driver','ErrHandlerPS'));
-				break;
-		}
-		$e->SetHeight($aParams['height']);
-		$e->SetVertical($aParams['rotate']);
-		$e->SetModuleWidth($aParams['modulewidth']);
-		$e->SetScale($aParams['scale']);
-		$e->HideText($aParams['hide']);
-		if( $aParams['output'] === 0 ) {
-			$err = $e->Stroke($aParams['data'], $aParams['filename']);
-		}
-		else {
-			$s = $e->Stroke($aParams['data'], $aParams['filename']);
-			if( $aParams['filename'] == '' ) {
-				// If no filename specified then return the generated postscript
-				echo $s;
-			}
-		}
-	}
-}
-
-$pa = new ParseArgs();
-$params = $pa->Get();
-$driver = new Driver();
-$driver->Run($params);
-
-// Successfull termination
-exit(0);
-
-?>
diff --git a/#jpgraph/src/flag_mapping b/#jpgraph/src/flag_mapping
deleted file mode 100644
index 7f9c3c5f..00000000
--- a/#jpgraph/src/flag_mapping
+++ /dev/null
@@ -1,237 +0,0 @@
-class JpCountryFlags {
-
-$iCountryFlags = array(
-    'Afghanistan' => 'afgh.gif',
-    'Republic of Angola' => 'agla.gif',
-    'Republic of Albania' => 'alba.gif',
-    'Alderney' => 'alde.gif',
-    'Democratic and Popular Republic of Algeria' => 'alge.gif',
-    'Territory of American Samoa' => 'amsa.gif',
-    'Principality of Andorra' => 'andr.gif',
-    'British Overseas Territory of Anguilla' => 'angu.gif',
-    'Antarctica' => 'anta.gif',
-    'Argentine Republic' => 'arge.gif',
-    'League of Arab States' => 'arle.gif',
-    'Republic of Armenia' => 'arme.gif',
-    'Aruba' => 'arub.gif',
-    'Commonwealth of Australia' => 'astl.gif',
-    'Republic of Austria' => 'aust.gif',
-    'Azerbaijani Republic' => 'azer.gif',
-    'British Antarctic Territory' => 'bant.gif',
-    'Kingdom of Belgium' => 'belg.gif',
-    'British Overseas Territory of Bermuda' => 'berm.gif',
-    'Commonwealth of the Bahamas' => 'bhms.gif',
-    'Kingdom of Bahrain' => 'bhrn.gif',
-    'Republic of Belarus' => 'blru.gif',
-    'Republic of Bolivia' => 'blva.gif',
-    'Belize' => 'blze.gif',
-    'Republic of Benin' => 'bnin.gif',
-    'Republic of Botswana' => 'bots.gif',
-    'Federative Republic of Brazil' => 'braz.gif',
-    'Barbados' => 'brbd.gif',
-    'British Indian Ocean Territory' => 'brin.gif',
-    'Brunei Darussalam' => 'brun.gif',
-    'Republic of Burkina' => 'bufa.gif',
-    'Republic of Bulgaria' => 'bulg.gif',
-    'Republic of Burundi' => 'buru.gif',
-    'Overseas Territory of the British Virgin Islands' => 'bvis.gif',
-    'Central African Republic' => 'cafr.gif',
-    'Kingdom of Cambodia' => 'camb.gif',
-    'Republic of Cameroon' => 'came.gif',
-    'Dominion of Canada' => 'cana.gif',
-    'Caribbean Community' => 'cari.gif',
-    'Republic of Cape Verde' => 'cave.gif',
-    'Republic of Chad' => 'chad.gif',
-    'Republic of Chile' => 'chil.gif',
-    'Territory of Christmas Island' => 'chms.gif',
-    'Commonwealth of Independent States' => 'cins.gif',
-    'Cook Islands' => 'ckis.gif',
-    'Republic of Colombia' => 'clmb.gif',
-    'Territory of Cocos Islands' => 'cois.gif',
-    'Commonwealth' => 'comn.gif',
-    'Union of the Comoros' => 'como.gif',
-    'Republic of the Congo' => 'cong.gif',
-    'Republic of Costa Rica' => 'corc.gif',
-    'Republic of Croatia' => 'croa.gif',
-    'Republic of Cuba' => 'cuba.gif',
-    'British Overseas Territory of the Cayman Islands' => 'cyis.gif',
-    'Republic of Cyprus' => 'cypr.gif',
-    'The Czech Republic' => 'czec.gif',
-    'Kingdom of Denmark' => 'denm.gif',
-    'Republic of Djibouti' => 'djib.gif',
-    'Commonwealth of Dominica' => 'domn.gif',
-    'Dominican Republic' => 'dore.gif',
-    'Republic of Ecuador' => 'ecua.gif',
-    'Arab Republic of Egypt' => 'egyp.gif',
-    'Republic of El Salvador' => 'elsa.gif',
-    'England' => 'engl.gif',
-    'Republic of Equatorial Guinea' => 'eqgu.gif',
-    'State of Eritrea' => 'erit.gif',
-    'Republic of Estonia' => 'estn.gif',
-    'Ethiopia' => 'ethp.gif',
-    'European Union' => 'euun.gif',
-    'British Overseas Territory of the Falkland Islands' => 'fais.gif',
-    'International Federation of Vexillological Associations' => 'fiav.gif',
-    'Republic of Fiji' => 'fiji.gif',
-    'Republic of Finland' => 'finl.gif',
-    'Territory of French Polynesia' => 'fpol.gif',
-    'French Republic' => 'fran.gif',
-    'Overseas Department of French Guiana' => 'frgu.gif',
-    'Gabonese Republic' => 'gabn.gif',
-    'Republic of the Gambia' => 'gamb.gif',
-    'Republic of Georgia' => 'geor.gif',
-    'Federal Republic of Germany' => 'germ.gif',
-    'Republic of Ghana' => 'ghan.gif',
-    'Gibraltar' => 'gibr.gif',
-    'Hellenic Republic' => 'grec.gif',
-    'State of Grenada' => 'gren.gif',
-    'Overseas Department of Guadeloupe' => 'guad.gif',
-    'Territory of Guam' => 'guam.gif',
-    'Republic of Guatemala' => 'guat.gif',
-    'The Bailiwick of Guernsey' => 'guer.gif',
-    'Republic of Guinea' => 'guin.gif',
-    'Republic of Haiti' => 'hait.gif',
-    'Hong Kong Special Administrative Region' => 'hokn.gif',
-    'Republic of Honduras' => 'hond.gif',
-    'Republic of Hungary' => 'hung.gif',
-    'Republic of Iceland' => 'icel.gif',
-    'International Committee of the Red Cross' => 'icrc.gif',
-    'Republic of India' => 'inda.gif',
-    'Republic of Indonesia' => 'indn.gif',
-    'Republic of Iraq' => 'iraq.gif',
-    'Republic of Ireland' => 'irel.gif',
-    'Organization of the Islamic Conference' => 'isco.gif',
-    'Isle of Man' => 'isma.gif',
-    'State of Israel' => 'isra.gif',
-    'Italian Republic' => 'ital.gif',
-    'Jamaica' => 'jama.gif',
-    'Japan' => 'japa.gif',
-    'The Bailiwick of Jersey' => 'jers.gif',
-    'Hashemite Kingdom of Jordan' => 'jord.gif',
-    'Republic of Kazakhstan' => 'kazk.gif',
-    'Republic of Kenya' => 'keny.gif',
-    'Republic of Kiribati' => 'kirb.gif',
-    'State of Kuwait' => 'kuwa.gif',
-    'Kyrgyz Republic' => 'kyrg.gif',
-    'Republic of Latvia' => 'latv.gif',
-    'Lebanese Republic' => 'leba.gif',
-    'Kingdom of Lesotho' => 'lest.gif',
-    'Republic of Liberia' => 'libe.gif',
-    'Principality of Liechtenstein' => 'liec.gif',
-    'Republic of Lithuania' => 'lith.gif',
-    'Grand Duchy of Luxembourg' => 'luxe.gif',
-    'Macao Special Administrative Region' => 'maca.gif',
-    'Republic of Macedonia' => 'mace.gif',
-    'Republic of Madagascar' => 'mada.gif',
-    'Republic of the Marshall Islands' => 'mais.gif',
-    'Republic of Maldives' => 'mald.gif',
-    'Republic of Mali' => 'mali.gif',
-    'Federation of Malaysia' => 'mals018.gif',
-    'Republic of Malta' => 'malt.gif',
-    'Republic of Malawi' => 'malw.gif',
-    'Overseas Department of Martinique' => 'mart.gif',
-    'Islamic Republic of Mauritania' => 'maur.gif',
-    'Territorial Collectivity of Mayotte' => 'mayt.gif',
-    'United Mexican States' => 'mexc.gif',
-    'Federated States of Micronesia' => 'micr.gif',
-    'Midway Islands' => 'miis.gif',
-    'Republic of Moldova' => 'mold.gif',
-    'Principality of Monaco' => 'mona.gif',
-    'Republic of Mongolia' => 'mong.gif',
-    'British Overseas Territory of Montserrat' => 'mont.gif',
-    'Kingdom of Morocco' => 'morc.gif',
-    'Republic of Mozambique' => 'moza.gif',
-    'Republic of Mauritius' => 'mrts.gif',
-    'Union of Myanmar' => 'myan.gif',
-    'Republic of Namibia' => 'namb.gif',
-    'North Atlantic Treaty Organization' => 'nato.gif',
-    'Republic of Nauru' => 'naur.gif',
-    'Turkish Republic of Northern Cyprus' => 'ncyp.gif',
-    'Netherlands Antilles' => 'nean.gif',
-    'Kingdom of Nepal' => 'nepa.gif',
-    'Kingdom of the Netherlands' => 'neth.gif',
-    'Territory of Norfolk Island' => 'nfis.gif',
-    'Federal Republic of Nigeria' => 'ngra.gif',
-    'Republic of Nicaragua' => 'nica.gif',
-    'Republic of Niger' => 'nigr.gif',
-    'Niue' => 'niue.gif',
-    'Commonwealth of the Northern Mariana Islands' => 'nmar.gif',
-    'Province of Northern Ireland' => 'noir.gif',
-    'Nordic Council' => 'nord.gif',
-    'Kingdom of Norway' => 'norw.gif',
-    'Territory of New Caledonia and Dependencies' => 'nwca.gif',
-    'New Zealand' => 'nwze.gif',
-    'Organization of American States' => 'oast.gif',
-    'Organization of African Unity' => 'oaun.gif',
-    'International Olympic Committee' => 'olym.gif',
-    'Sultanate of Oman' => 'oman.gif',
-    'Organization of Petroleum Exporting Countries' => 'opec.gif',
-    'Islamic Republic of Pakistan' => 'paks.gif',
-    'Republic of Palau' => 'pala.gif',
-    'Independent State of Papua New Guinea' => 'pang.gif',
-    'Republic of Paraguay' => 'para.gif',
-    'Republic of the Philippines' => 'phil.gif',
-    'British Overseas Territory of the Pitcairn Islands' => 'piis.gif',
-    'Republic of Poland' => 'pola.gif',
-    'Republic of Portugal' => 'port.gif',
-    'Commonwealth of Puerto Rico' => 'purc.gif',
-    'State of Qatar' => 'qata.gif',
-    'Russian Federation' => 'russ.gif',
-    'Republic of Rwanda' => 'rwan.gif',
-    'Kingdom of Saudi Arabia' => 'saar.gif',
-    'Republic of San Marino' => 'sama.gif',
-    'Nordic Sami Conference' => 'sami.gif',
-    'Sark' => 'sark.gif',
-    'Scotland' => 'scot.gif',
-    'Principality of Seborga' => 'sebo.gif',
-    'Republic of Sierra Leone' => 'sile.gif',
-    'Republic of Singapore' => 'sing.gif',
-    'Republic of Korea' => 'skor.gif',
-    'Republic of Slovenia' => 'slva.gif',
-    'Somali Republic' => 'smla.gif',
-    'Republic of Somaliland' => 'smld.gif',
-    'Republic of South Africa' => 'soaf.gif',
-    'Solomon Islands' => 'sois.gif',
-    'Kingdom of Spain' => 'span.gif',
-    'Secretariat of the Pacific Community' => 'spco.gif',
-    'Democratic Socialist Republic of Sri Lanka' => 'srla.gif',
-    'Saint Lucia' => 'stlu.gif',
-    'Republic of the Sudan' => 'suda.gif',
-    'Republic of Suriname' => 'surn.gif',
-    'Slovak Republic' => 'svka.gif',
-    'Kingdom of Sweden' => 'swdn.gif',
-    'Swiss Confederation' => 'swit.gif',
-    'Syrian Arab Republic' => 'syra.gif',
-    'Kingdom of Swaziland' => 'szld.gif',
-    'Republic of China' => 'taiw.gif',
-    'Republic of Tajikistan' => 'tajk.gif',
-    'United Republic of Tanzania' => 'tanz.gif',
-    'Kingdom of Thailand' => 'thal.gif',
-    'Autonomous Region of Tibet' => 'tibe.gif',
-    'Turkmenistan' => 'tkst.gif',
-    'Togolese Republic' => 'togo.gif',
-    'Tokelau' => 'toke.gif',
-    'Kingdom of Tonga' => 'tong.gif',
-    'Tristan da Cunha' => 'trdc.gif',
-    'Tromelin' => 'tris.gif',
-    'Republic of Tunisia' => 'tuns.gif',
-    'Republic of Turkey' => 'turk.gif',
-    'Tuvalu' => 'tuva.gif',
-    'United Arab Emirates' => 'uaem.gif',
-    'Republic of Uganda' => 'ugan.gif',
-    'Ukraine' => 'ukrn.gif',
-    'United Kingdom of Great Britain' => 'unkg.gif',
-    'United Nations' => 'unna.gif',
-    'United States of America' => 'unst.gif',
-    'Oriental Republic of Uruguay' => 'urgy.gif',
-    'Virgin Islands of the United States' => 'usvs.gif',
-    'Republic of Uzbekistan' => 'uzbk.gif',
-    'State of the Vatican City' => 'vacy.gif',
-    'Republic of Vanuatu' => 'vant.gif',
-    'Bolivarian Republic of Venezuela' => 'venz.gif',
-    'Republic of Yemen' => 'yemn.gif',
-    'Democratic Republic of Congo' => 'zare.gif',
-    'Republic of Zimbabwe' => 'zbwe.gif' 
-) ;
-
-
diff --git a/#jpgraph/src/flags.dat b/#jpgraph/src/flags.dat
deleted file mode 100644
index 1cd2e723..00000000
Binary files a/#jpgraph/src/flags.dat and /dev/null differ
diff --git a/#jpgraph/src/flags_thumb100x100.dat b/#jpgraph/src/flags_thumb100x100.dat
deleted file mode 100644
index 545e7ade..00000000
Binary files a/#jpgraph/src/flags_thumb100x100.dat and /dev/null differ
diff --git a/#jpgraph/src/flags_thumb35x35.dat b/#jpgraph/src/flags_thumb35x35.dat
deleted file mode 100644
index 7335011e..00000000
Binary files a/#jpgraph/src/flags_thumb35x35.dat and /dev/null differ
diff --git a/#jpgraph/src/flags_thumb60x60.dat b/#jpgraph/src/flags_thumb60x60.dat
deleted file mode 100644
index 6107d084..00000000
Binary files a/#jpgraph/src/flags_thumb60x60.dat and /dev/null differ
diff --git a/#jpgraph/src/fonts/ARIALN.TTF b/#jpgraph/src/fonts/ARIALN.TTF
deleted file mode 100644
index 49bb6960..00000000
Binary files a/#jpgraph/src/fonts/ARIALN.TTF and /dev/null differ
diff --git a/#jpgraph/src/fonts/ARIALNB.TTF b/#jpgraph/src/fonts/ARIALNB.TTF
deleted file mode 100644
index 631931e5..00000000
Binary files a/#jpgraph/src/fonts/ARIALNB.TTF and /dev/null differ
diff --git a/#jpgraph/src/fonts/ARIALNBI.TTF b/#jpgraph/src/fonts/ARIALNBI.TTF
deleted file mode 100644
index 4704de20..00000000
Binary files a/#jpgraph/src/fonts/ARIALNBI.TTF and /dev/null differ
diff --git a/#jpgraph/src/fonts/ARIALNI.TTF b/#jpgraph/src/fonts/ARIALNI.TTF
deleted file mode 100644
index 1c42b10a..00000000
Binary files a/#jpgraph/src/fonts/ARIALNI.TTF and /dev/null differ
diff --git a/#jpgraph/src/fonts/ARIALUNI.TTF b/#jpgraph/src/fonts/ARIALUNI.TTF
deleted file mode 100644
index 3c593f07..00000000
Binary files a/#jpgraph/src/fonts/ARIALUNI.TTF and /dev/null differ
diff --git a/#jpgraph/src/fonts/DejaVuSans-Bold.ttf b/#jpgraph/src/fonts/DejaVuSans-Bold.ttf
deleted file mode 100644
index ac313d26..00000000
Binary files a/#jpgraph/src/fonts/DejaVuSans-Bold.ttf and /dev/null differ
diff --git a/#jpgraph/src/fonts/DejaVuSans-BoldOblique.ttf b/#jpgraph/src/fonts/DejaVuSans-BoldOblique.ttf
deleted file mode 100644
index c818ae6e..00000000
Binary files a/#jpgraph/src/fonts/DejaVuSans-BoldOblique.ttf and /dev/null differ
diff --git a/#jpgraph/src/fonts/DejaVuSans-Oblique.ttf b/#jpgraph/src/fonts/DejaVuSans-Oblique.ttf
deleted file mode 100644
index d5ac60d6..00000000
Binary files a/#jpgraph/src/fonts/DejaVuSans-Oblique.ttf and /dev/null differ
diff --git a/#jpgraph/src/fonts/DejaVuSans.ttf b/#jpgraph/src/fonts/DejaVuSans.ttf
deleted file mode 100644
index a99969e1..00000000
Binary files a/#jpgraph/src/fonts/DejaVuSans.ttf and /dev/null differ
diff --git a/#jpgraph/src/fonts/FF_FONT0-Bold.gdf b/#jpgraph/src/fonts/FF_FONT0-Bold.gdf
deleted file mode 100644
index 3b371f8a..00000000
Binary files a/#jpgraph/src/fonts/FF_FONT0-Bold.gdf and /dev/null differ
diff --git a/#jpgraph/src/fonts/FF_FONT0.gdf b/#jpgraph/src/fonts/FF_FONT0.gdf
deleted file mode 100644
index e231b713..00000000
Binary files a/#jpgraph/src/fonts/FF_FONT0.gdf and /dev/null differ
diff --git a/#jpgraph/src/fonts/FF_FONT1-Bold.gdf b/#jpgraph/src/fonts/FF_FONT1-Bold.gdf
deleted file mode 100644
index d62f0b3b..00000000
Binary files a/#jpgraph/src/fonts/FF_FONT1-Bold.gdf and /dev/null differ
diff --git a/#jpgraph/src/fonts/FF_FONT1.gdf b/#jpgraph/src/fonts/FF_FONT1.gdf
deleted file mode 100644
index 7b5b0f62..00000000
Binary files a/#jpgraph/src/fonts/FF_FONT1.gdf and /dev/null differ
diff --git a/#jpgraph/src/fonts/FF_FONT2-Bold.gdf b/#jpgraph/src/fonts/FF_FONT2-Bold.gdf
deleted file mode 100644
index 6e402847..00000000
Binary files a/#jpgraph/src/fonts/FF_FONT2-Bold.gdf and /dev/null differ
diff --git a/#jpgraph/src/fonts/FF_FONT2.gdf b/#jpgraph/src/fonts/FF_FONT2.gdf
deleted file mode 100644
index 50bca09e..00000000
Binary files a/#jpgraph/src/fonts/FF_FONT2.gdf and /dev/null differ
diff --git a/#jpgraph/src/fonts/arial.ttf b/#jpgraph/src/fonts/arial.ttf
deleted file mode 100644
index 886789b8..00000000
Binary files a/#jpgraph/src/fonts/arial.ttf and /dev/null differ
diff --git a/#jpgraph/src/fonts/arialbd.ttf b/#jpgraph/src/fonts/arialbd.ttf
deleted file mode 100644
index b7e58f53..00000000
Binary files a/#jpgraph/src/fonts/arialbd.ttf and /dev/null differ
diff --git a/#jpgraph/src/fonts/arialbi.ttf b/#jpgraph/src/fonts/arialbi.ttf
deleted file mode 100644
index 813fae3f..00000000
Binary files a/#jpgraph/src/fonts/arialbi.ttf and /dev/null differ
diff --git a/#jpgraph/src/fonts/ariali.ttf b/#jpgraph/src/fonts/ariali.ttf
deleted file mode 100644
index 50e38506..00000000
Binary files a/#jpgraph/src/fonts/ariali.ttf and /dev/null differ
diff --git a/#jpgraph/src/fonts/ariblk.ttf b/#jpgraph/src/fonts/ariblk.ttf
deleted file mode 100644
index 251093f0..00000000
Binary files a/#jpgraph/src/fonts/ariblk.ttf and /dev/null differ
diff --git a/#jpgraph/src/gd_image.inc.php b/#jpgraph/src/gd_image.inc.php
deleted file mode 100644
index a14ca15e..00000000
--- a/#jpgraph/src/gd_image.inc.php
+++ /dev/null
@@ -1,2313 +0,0 @@
-<?php
-//=======================================================================
-// File:        GD_IMAGE.INC.PHP
-// Description: PHP Graph Plotting library. Low level image drawing routines
-// Created:     2001-01-08, refactored 2008-03-29
-// Ver:         $Id: gd_image.inc.php 1922 2010-01-11 11:42:50Z ljp $
-//
-// Copyright (c) Asial Corporation. All rights reserved.
-//========================================================================
-
-require_once 'jpgraph_rgb.inc.php';
-require_once 'jpgraph_ttf.inc.php';
-require_once 'imageSmoothArc.php';
-
-// Line styles
-define('LINESTYLE_SOLID',1);
-define('LINESTYLE_DOTTED',2);
-define('LINESTYLE_DASHED',3);
-define('LINESTYLE_LONGDASH',4);
-
-// The DEFAULT_GFORMAT sets the default graphic encoding format, i.e.
-// PNG, JPG or GIF depending on what is installed on the target system
-// in that order.
-if( !DEFINED("DEFAULT_GFORMAT") ) {
-    define("DEFAULT_GFORMAT","auto");
-}
-
-//========================================================================
-// CLASS Image
-// Description: The very coor image drawing class that encapsulates all
-//              calls to the GD library
-//              Note: The class used by the library is the decendant
-//              class RotImage which extends the Image class with transparent
-//              rotation.
-//=========================================================================
-class Image {
-    public $img=null;
-    public $rgb=null;
-    public $img_format;
-    public $ttf=null;
-    public $line_style=LINESTYLE_SOLID;
-    public $current_color,$current_color_name;
-    public $original_width=0, $original_height=0;
-    public $plotwidth=0,$plotheight=0;
-
-    // for __get, __set
-    private $_left_margin=30,$_right_margin=30,$_top_margin=20,$_bottom_margin=30;
-    //private $_plotwidth=0,$_plotheight=0;
-    private $_width=0, $_height=0;
-    private $_line_weight=1;
-
-    protected $expired=true;
-    protected $lastx=0, $lasty=0;
-    protected $obs_list=array();
-    protected $font_size=12,$font_family=FF_DEFAULT, $font_style=FS_NORMAL;
-    protected $font_file='';
-    protected $text_halign="left",$text_valign="bottom";
-    protected $use_anti_aliasing=false;
-    protected $quality=null;
-    protected $colorstack=array(),$colorstackidx=0;
-    protected $canvascolor = 'white' ;
-    protected $langconv = null ;
-    protected $iInterlace=false;
-    protected $bbox_cache = array(); // STore the last found tetx bounding box
-    protected $ff_font0;
-    protected $ff_font0_bold;
-    protected $ff_font1;
-    protected $ff_font1_bold;
-    protected $ff_font2;
-    protected $ff_font2_bold;
-
-
-    //---------------
-    // CONSTRUCTOR
-    function __construct($aWidth=0,$aHeight=0,$aFormat=DEFAULT_GFORMAT,$aSetAutoMargin=true) {
-
-        $this->original_width  = $aWidth;
-        $this->original_height = $aHeight;
-        $this->CreateImgCanvas($aWidth, $aHeight);
-
-        if( $aSetAutoMargin ) {
-            $this->SetAutoMargin();
-        }
-
-        if( !$this->SetImgFormat($aFormat) ) {
-            JpGraphError::RaiseL(25081,$aFormat);//("JpGraph: Selected graphic format is either not supported or unknown [$aFormat]");
-        }
-        $this->ttf = new TTF();
-        $this->langconv = new LanguageConv();
-
-        $this->ff_font0 =  imageloadfont(dirname(__FILE__) . "/fonts/FF_FONT0.gdf");
-        $this->ff_font1 =  imageloadfont(dirname(__FILE__) . "/fonts/FF_FONT1.gdf");
-        $this->ff_font2 =  imageloadfont(dirname(__FILE__) . "/fonts/FF_FONT2.gdf");
-        $this->ff_font1_bold =  imageloadfont(dirname(__FILE__) . "/fonts/FF_FONT1-Bold.gdf");
-        $this->ff_font2_bold =  imageloadfont(dirname(__FILE__) . "/fonts/FF_FONT2-Bold.gdf");
-    }
-
-    // Enable interlacing in images
-    function SetInterlace($aFlg=true) {
-        $this->iInterlace=$aFlg;
-    }
-
-    // Should we use anti-aliasing. Note: This really slows down graphics!
-    function SetAntiAliasing($aFlg=true) {
-        $this->use_anti_aliasing = $aFlg;
-        if( function_exists('imageantialias') ) {
-            imageantialias($this->img,$aFlg);
-        }
-        else {
-          //  JpGraphError::RaiseL(25128);//('The function imageantialias() is not available in your PHP installation. Use the GD version that comes with PHP and not the standalone version.')
-        }
-    }
-
-    function GetAntiAliasing() {
-        return $this->use_anti_aliasing ;
-    }
-
-    function CreateRawCanvas($aWidth=0,$aHeight=0) {
-
-        $aWidth  *= SUPERSAMPLING_SCALE;
-        $aHeight *= SUPERSAMPLING_SCALE;
-
-        if( $aWidth <= 1 || $aHeight <= 1 ) {
-            JpGraphError::RaiseL(25082,$aWidth,$aHeight);//("Illegal sizes specified for width or height when creating an image, (width=$aWidth, height=$aHeight)");
-        }
-
-        $this->img = @imagecreatetruecolor($aWidth, $aHeight);
-        if( $this->img < 1 ) {
-            JpGraphError::RaiseL(25126);
-            //die("Can't create truecolor image. Check that you really have GD2 library installed.");
-        }
-        $this->SetAlphaBlending();
-
-        if( $this->iInterlace ) {
-            imageinterlace($this->img,1);
-        }
-        if( $this->rgb != null ) {
-            $this->rgb->img = $this->img ;
-        }
-        else {
-            $this->rgb = new RGB($this->img);
-        }
-    }
-
-    function CloneCanvasH() {
-        $oldimage = $this->img;
-        $this->CreateRawCanvas($this->width,$this->height);
-        imagecopy($this->img,$oldimage,0,0,0,0,$this->width,$this->height);
-        return $oldimage;
-    }
-
-    function CreateImgCanvas($aWidth=0,$aHeight=0) {
-
-        $old = array($this->img,$this->width,$this->height);
-
-        $aWidth = round($aWidth);
-        $aHeight = round($aHeight);
-
-        $this->width=$aWidth;
-        $this->height=$aHeight;
-
-
-        if( $aWidth==0 || $aHeight==0 ) {
-            // We will set the final size later.
-            // Note: The size must be specified before any other
-            // img routines that stroke anything are called.
-            $this->img = null;
-            $this->rgb = null;
-            return $old;
-        }
-
-        $this->CreateRawCanvas($aWidth,$aHeight);
-        // Set canvas color (will also be the background color for a
-        // a pallett image
-        $this->SetColor($this->canvascolor);
-        $this->FilledRectangle(0,0,$this->width-1,$this->height-1);
-
-        return $old ;
-    }
-
-    function CopyCanvasH($aToHdl,$aFromHdl,$aToX,$aToY,$aFromX,$aFromY,$aWidth,$aHeight,$aw=-1,$ah=-1) {
-        if( $aw === -1 ) {
-            $aw = $aWidth;
-            $ah = $aHeight;
-            $f = 'imagecopyresized';
-        }
-        else {
-            $f = 'imagecopyresampled';
-        }
-        $f($aToHdl,$aFromHdl,$aToX,$aToY,$aFromX,$aFromY, $aWidth,$aHeight,$aw,$ah);
-    }
-
-    function Copy($fromImg,$toX,$toY,$fromX,$fromY,$toWidth,$toHeight,$fromWidth=-1,$fromHeight=-1) {
-        $this->CopyCanvasH($this->img,$fromImg,$toX,$toY,$fromX,$fromY,$toWidth,$toHeight,$fromWidth,$fromHeight);
-    }
-
-    function CopyMerge($fromImg,$toX,$toY,$fromX,$fromY,$toWidth,$toHeight,$fromWidth=-1,$fromHeight=-1,$aMix=100) {
-        if( $aMix == 100 ) {
-            $this->CopyCanvasH($this->img,$fromImg,
-            $toX,$toY,$fromX,$fromY,$toWidth,$toHeight,$fromWidth,$fromHeight);
-        }
-        else {
-            if( ($fromWidth  != -1 && ($fromWidth != $toWidth)) || ($fromHeight != -1 && ($fromHeight != $fromHeight)) ) {
-                // Create a new canvas that will hold the re-scaled original from image
-                if( $toWidth <= 1 || $toHeight <= 1 ) {
-                    JpGraphError::RaiseL(25083);//('Illegal image size when copying image. Size for copied to image is 1 pixel or less.');
-                }
-
-                $tmpimg = @imagecreatetruecolor($toWidth, $toHeight);
-
-                if( $tmpimg < 1 ) {
-                    JpGraphError::RaiseL(25084);//('Failed to create temporary GD canvas. Out of memory ?');
-                }
-                $this->CopyCanvasH($tmpimg,$fromImg,0,0,0,0,
-                $toWidth,$toHeight,$fromWidth,$fromHeight);
-                $fromImg = $tmpimg;
-            }
-            imagecopymerge($this->img,$fromImg,$toX,$toY,$fromX,$fromY,$toWidth,$toHeight,$aMix);
-        }
-    }
-
-    static function GetWidth($aImg=null) {
-        if( $aImg === null ) {
-            $aImg = $this->img;
-        }
-        return imagesx($aImg);
-    }
-
-    static function GetHeight($aImg=null) {
-        if( $aImg === null ) {
-            $aImg = $this->img;
-        }
-        return imagesy($aImg);
-    }
-
-    static function CreateFromString($aStr) {
-        $img = imagecreatefromstring($aStr);
-        if( $img === false ) {
-            JpGraphError::RaiseL(25085);
-            //('An image can not be created from the supplied string. It is either in a format not supported or the string is representing an corrupt image.');
-        }
-        return $img;
-    }
-
-    function SetCanvasH($aHdl) {
-        $this->img = $aHdl;
-        $this->rgb->img = $aHdl;
-    }
-
-    function SetCanvasColor($aColor) {
-        $this->canvascolor = $aColor ;
-    }
-
-    function SetAlphaBlending($aFlg=true) {
-        ImageAlphaBlending($this->img,$aFlg);
-    }
-
-    function SetAutoMargin() {
-        $min_bm=5;
-        $lm = min(40,$this->width/7);
-        $rm = min(20,$this->width/10);
-        $tm = max(5,$this->height/7);
-        $bm = max($min_bm,$this->height/6);
-        $this->SetMargin($lm,$rm,$tm,$bm);
-    }
-
-    //---------------
-    // PUBLIC METHODS
-
-    function SetFont($family,$style=FS_NORMAL,$size=10) {
-        $this->font_family=$family;
-        $this->font_style=$style;
-        $this->font_size=$size*SUPERSAMPLING_SCALE;
-        $this->font_file='';
-        if( ($this->font_family==FF_FONT1 || $this->font_family==FF_FONT2) && $this->font_style==FS_BOLD ){
-            ++$this->font_family;
-        }
-        if( $this->font_family > FF_FONT2+1 ) { // A TTF font so get the font file
-
-            // Check that this PHP has support for TTF fonts
-            if( !function_exists('imagettfbbox') ) {
-                // use internal font when php is configured without '--with-ttf'
-                $this->font_family = FF_FONT1;
-//                JpGraphError::RaiseL(25087);//('This PHP build has not been configured with TTF support. You need to recompile your PHP installation with FreeType support.');
-            } else {
-                $this->font_file = $this->ttf->File($this->font_family,$this->font_style);
-            }
-        }
-    }
-
-    // Get the specific height for a text string
-    function GetTextHeight($txt="",$angle=0) {
-        $tmp = preg_split('/\n/',$txt);
-        $n = count($tmp);
-        $m=0;
-        for($i=0; $i< $n; ++$i) {
-            $m = max($m,strlen($tmp[$i]));
-        }
-
-        if( $this->font_family <= FF_FONT2+1 ) {
-            if( $angle==0 ) {
-                $h = imagefontheight($this->font_family);
-                if( $h === false ) {
-                    JpGraphError::RaiseL(25088);//('You have a misconfigured GD font support. The call to imagefontwidth() fails.');
-                }
-
-                return $n*$h;
-            }
-            else {
-                $w = @imagefontwidth($this->font_family);
-                if( $w === false ) {
-                    JpGraphError::RaiseL(25088);//('You have a misconfigured GD font support. The call to imagefontwidth() fails.');
-                }
-
-                return $m*$w;
-            }
-        }
-        else {
-            $bbox = $this->GetTTFBBox($txt,$angle);
-            return $bbox[1]-$bbox[5]+1;
-        }
-    }
-
-    // Estimate font height
-    function GetFontHeight($angle=0) {
-        $txt = "XOMg";
-        return $this->GetTextHeight($txt,$angle);
-    }
-
-    // Approximate font width with width of letter "O"
-    function GetFontWidth($angle=0) {
-        $txt = 'O';
-        return $this->GetTextWidth($txt,$angle);
-    }
-
-    // Get actual width of text in absolute pixels. Note that the width is the
-    // texts projected with onto the x-axis. Call with angle=0 to get the true
-    // etxt width.
-    function GetTextWidth($txt,$angle=0) {
-
-        $tmp = preg_split('/\n/',$txt);
-        $n = count($tmp);
-        if( $this->font_family <= FF_FONT2+1 ) {
-
-            $m=0;
-            for($i=0; $i < $n; ++$i) {
-                $l=strlen($tmp[$i]);
-                if( $l > $m ) {
-                    $m = $l;
-                }
-            }
-
-            if( $angle==0 ) {
-                $w = @imagefontwidth($this->font_family);
-                if( $w === false ) {
-                    JpGraphError::RaiseL(25088);//('You have a misconfigured GD font support. The call to imagefontwidth() fails.');
-                }
-                return $m*$w;
-            }
-            else {
-                // 90 degrees internal so height becomes width
-                $h = @imagefontheight($this->font_family);
-                if( $h === false ) {
-                    JpGraphError::RaiseL(25089);//('You have a misconfigured GD font support. The call to imagefontheight() fails.');
-                }
-                return $n*$h;
-            }
-        }
-        else {
-            // For TTF fonts we must walk through a lines and find the
-            // widest one which we use as the width of the multi-line
-            // paragraph
-            $m=0;
-            for( $i=0; $i < $n; ++$i ) {
-                $bbox = $this->GetTTFBBox($tmp[$i],$angle);
-                $mm =  $bbox[2] - $bbox[0];
-                if( $mm > $m )
-                    $m = $mm;
-            }
-            return $m;
-        }
-    }
-
-
-    // Draw text with a box around it
-    function StrokeBoxedText($x,$y,$txt,$dir=0,$fcolor="white",$bcolor="black",
-                             $shadowcolor=false,$paragraph_align="left",
-                             $xmarg=6,$ymarg=4,$cornerradius=0,$dropwidth=3) {
-
-		$oldx = $this->lastx;
-		$oldy = $this->lasty;
-
-        if( !is_numeric($dir) ) {
-            if( $dir=="h" ) $dir=0;
-            elseif( $dir=="v" ) $dir=90;
-            else JpGraphError::RaiseL(25090,$dir);//(" Unknown direction specified in call to StrokeBoxedText() [$dir]");
-        }
-
-        if( $this->font_family >= FF_FONT0 && $this->font_family <= FF_FONT2+1) {
-            $width=$this->GetTextWidth($txt,$dir) ;
-            $height=$this->GetTextHeight($txt,$dir) ;
-        }
-        else {
-            $width=$this->GetBBoxWidth($txt,$dir) ;
-            $height=$this->GetBBoxHeight($txt,$dir) ;
-        }
-
-        $height += 2*$ymarg;
-        $width  += 2*$xmarg;
-
-        if( $this->text_halign=="right" )      $x -= $width;
-        elseif( $this->text_halign=="center" ) $x -= $width/2;
-
-        if( $this->text_valign=="bottom" )     $y -= $height;
-        elseif( $this->text_valign=="center" ) $y -= $height/2;
-
-        $olda = $this->SetAngle(0);
-
-        if( $shadowcolor ) {
-            $this->PushColor($shadowcolor);
-            $this->FilledRoundedRectangle($x-$xmarg+$dropwidth,$y-$ymarg+$dropwidth,
-                                          $x+$width+$dropwidth,$y+$height-$ymarg+$dropwidth,
-                                          $cornerradius);
-            $this->PopColor();
-            $this->PushColor($fcolor);
-            $this->FilledRoundedRectangle($x-$xmarg,$y-$ymarg,
-                                          $x+$width,$y+$height-$ymarg,
-                                          $cornerradius);
-            $this->PopColor();
-            $this->PushColor($bcolor);
-            $this->RoundedRectangle($x-$xmarg,$y-$ymarg,
-                                    $x+$width,$y+$height-$ymarg,$cornerradius);
-            $this->PopColor();
-        }
-        else {
-            if( $fcolor ) {
-                $oc=$this->current_color;
-                $this->SetColor($fcolor);
-                $this->FilledRoundedRectangle($x-$xmarg,$y-$ymarg,$x+$width,$y+$height-$ymarg,$cornerradius);
-                $this->current_color=$oc;
-            }
-            if( $bcolor ) {
-                $oc=$this->current_color;
-                $this->SetColor($bcolor);
-                $this->RoundedRectangle($x-$xmarg,$y-$ymarg,$x+$width,$y+$height-$ymarg,$cornerradius);
-                $this->current_color=$oc;
-            }
-        }
-
-        $h=$this->text_halign;
-        $v=$this->text_valign;
-        $this->SetTextAlign("left","top");
-
-        $debug=false;
-        $this->StrokeText($x, $y, $txt, $dir, $paragraph_align,$debug);
-
-        $bb = array($x-$xmarg,$y+$height-$ymarg,$x+$width,$y+$height-$ymarg,
-                    $x+$width,$y-$ymarg,$x-$xmarg,$y-$ymarg);
-        $this->SetTextAlign($h,$v);
-
-        $this->SetAngle($olda);
-		$this->lastx = $oldx;
-		$this->lasty = $oldy;
-
-        return $bb;
-    }
-
-    // Draw text with a box around it. This time the box will be rotated
-    // with the text. The previous method will just make a larger enough non-rotated
-    // box to hold the text inside.
-    function StrokeBoxedText2($x,$y,$txt,$dir=0,$fcolor="white",$bcolor="black",
-                             $shadowcolor=false,$paragraph_align="left",
-                             $xmarg=6,$ymarg=4,$cornerradius=0,$dropwidth=3) {
-
-       // This version of boxed text will stroke a rotated box round the text
-       // thta will follow the angle of the text.
-       // This has two implications:
-       // 1) This methos will only support TTF fonts
-       // 2) The only two alignment that makes sense are centered or baselined
-
-       if( $this->font_family <= FF_FONT2+1 ) {
-           JpGraphError::RaiseL(25131);//StrokeBoxedText2() Only support TTF fonts and not built in bitmap fonts
-       }
-
-		$oldx = $this->lastx;
-		$oldy = $this->lasty;
-        $dir = $this->NormAngle($dir);
-
-        if( !is_numeric($dir) ) {
-            if( $dir=="h" ) $dir=0;
-            elseif( $dir=="v" ) $dir=90;
-            else JpGraphError::RaiseL(25090,$dir);//(" Unknown direction specified in call to StrokeBoxedText() [$dir]");
-        }
-
-        $width=$this->GetTextWidth($txt,0) + 2*$xmarg;
-        $height=$this->GetTextHeight($txt,0) + 2*$ymarg ;
-        $rect_width=$this->GetBBoxWidth($txt,$dir) ;
-        $rect_height=$this->GetBBoxHeight($txt,$dir) ;
-
-        $baseline_offset = $this->bbox_cache[1]-1;
-
-        if( $this->text_halign=="center" ) {
-            if( $dir >= 0 && $dir <= 90 ) {
-
-                $x -= $rect_width/2;
-                $x += sin($dir*M_PI/180)*$height;
-                $y += $rect_height/2;                
-
-            } elseif( $dir >= 270 && $dir <= 360 ) {
-
-                $x -= $rect_width/2;
-                $y -= $rect_height/2;
-                $y += cos($dir*M_PI/180)*$height;
-
-            } elseif( $dir >= 90 && $dir <= 180 ) {
-
-                $x += $rect_width/2;
-                $y += $rect_height/2;
-                $y += cos($dir*M_PI/180)*$height;
-
-            }
-            else {
-                // $dir > 180 &&  $dir < 270
-                $x += $rect_width/2;
-                $x += sin($dir*M_PI/180)*$height;
-                $y -= $rect_height/2;
-            }
-        }
-
-        // Rotate the box around this point
-        $this->SetCenter($x,$y);
-        $olda = $this->SetAngle(-$dir);
-
-        // We need to use adjusted coordinats for the box to be able
-        // to draw the box below the baseline. This cannot be done before since
-        // the rotating point must be the original x,y since that is arounbf the
-        // point where the text will rotate and we cannot change this since
-        // that is where the GD/GreeType will rotate the text
-
-
-        // For smaller <14pt font we need to do some additional
-        // adjustments to make it look good
-        if( $this->font_size < 14 ) {
-            $x -= 2;
-            $y += 2;
-        }
-        else {
-          //  $y += $baseline_offset;
-        }
-
-        if( $shadowcolor ) {
-            $this->PushColor($shadowcolor);
-            $this->FilledRectangle($x-$xmarg+$dropwidth,$y+$ymarg+$dropwidth-$height,
-                                          $x+$width+$dropwidth,$y+$ymarg+$dropwidth);
-                                          //$cornerradius);
-            $this->PopColor();
-            $this->PushColor($fcolor);
-            $this->FilledRectangle($x-$xmarg, $y+$ymarg-$height,
-                                          $x+$width, $y+$ymarg);
-                                          //$cornerradius);
-            $this->PopColor();
-            $this->PushColor($bcolor);
-            $this->Rectangle($x-$xmarg,$y+$ymarg-$height,
-                                    $x+$width,$y+$ymarg);
-                                    //$cornerradius);
-            $this->PopColor();
-        }
-        else {
-            if( $fcolor ) {
-                $oc=$this->current_color;
-                $this->SetColor($fcolor);
-                $this->FilledRectangle($x-$xmarg,$y+$ymarg-$height,$x+$width,$y+$ymarg);//,$cornerradius);
-                $this->current_color=$oc;
-            }
-            if( $bcolor ) {
-                $oc=$this->current_color;
-                $this->SetColor($bcolor);
-                $this->Rectangle($x-$xmarg,$y+$ymarg-$height,$x+$width,$y+$ymarg);//,$cornerradius);
-                $this->current_color=$oc;
-            }
-        }
-
-        if( $this->font_size < 14 ) {
-            $x += 2;
-            $y -= 2;
-        }
-        else {
-
-            // Restore the original y before we stroke the text
-           // $y -= $baseline_offset;
-
-        }
-
-        $this->SetCenter(0,0);
-        $this->SetAngle($olda);
-
-        $h=$this->text_halign;
-        $v=$this->text_valign;
-        if( $this->text_halign == 'center') {
-            $this->SetTextAlign('center','basepoint');
-        }
-        else {
-            $this->SetTextAlign('basepoint','basepoint');
-        }
-
-        $debug=false;
-        $this->StrokeText($x, $y, $txt, $dir, $paragraph_align,$debug);
-
-        $bb = array($x-$xmarg, $y+$height-$ymarg,
-                    $x+$width, $y+$height-$ymarg,
-                    $x+$width, $y-$ymarg,
-                    $x-$xmarg, $y-$ymarg);
-
-        $this->SetTextAlign($h,$v);
-        $this->SetAngle($olda);
-
-		$this->lastx = $oldx;
-		$this->lasty = $oldy;
-
-        return $bb;
-    }
-
-    // Set text alignment
-    function SetTextAlign($halign,$valign="bottom") {
-        $this->text_halign=$halign;
-        $this->text_valign=$valign;
-    }
-
-    function _StrokeBuiltinFont($x,$y,$txt,$dir,$paragraph_align,&$aBoundingBox,$aDebug=false) {
-
-        if( is_numeric($dir) && $dir!=90 && $dir!=0)
-        JpGraphError::RaiseL(25091);//(" Internal font does not support drawing text at arbitrary angle. Use TTF fonts instead.");
-
-        $h=$this->GetTextHeight($txt);
-        $fh=$this->GetFontHeight();
-        $w=$this->GetTextWidth($txt);
-
-        if( $this->text_halign=="right") {
-            $x -= $dir==0 ? $w : $h;
-        }
-        elseif( $this->text_halign=="center" ) {
-            // For center we subtract 1 pixel since this makes the middle
-            // be prefectly in the middle
-            $x -= $dir==0 ? $w/2-1 : $h/2;
-        }
-        if( $this->text_valign=="top" ) {
-            $y += $dir==0 ? $h : $w;
-        }
-        elseif( $this->text_valign=="center" ) {
-            $y += $dir==0 ? $h/2 : $w/2;
-        }
-
-        $use_font = $this->font_family;
-
-        if( $dir==90 ) {
-            imagestringup($this->img,$use_font,$x,$y,$txt,$this->current_color);
-            $aBoundingBox = array(round($x),round($y),round($x),round($y-$w),round($x+$h),round($y-$w),round($x+$h),round($y));
-            if( $aDebug ) {
-                // Draw bounding box
-                $this->PushColor('green');
-                $this->Polygon($aBoundingBox,true);
-                $this->PopColor();
-            }
-        }
-        else {
-            if( preg_match('/\n/',$txt) ) {
-                $tmp = preg_split('/\n/',$txt);
-                for($i=0; $i < count($tmp); ++$i) {
-                    $w1 = $this->GetTextWidth($tmp[$i]);
-                    if( $paragraph_align=="left" ) {
-                        imagestring($this->img,$use_font,$x,$y-$h+1+$i*$fh,$tmp[$i],$this->current_color);
-                    }
-                    elseif( $paragraph_align=="right" ) {
-                        imagestring($this->img,$use_font,$x+($w-$w1),$y-$h+1+$i*$fh,$tmp[$i],$this->current_color);
-                    }
-                    else {
-                        imagestring($this->img,$use_font,$x+$w/2-$w1/2,$y-$h+1+$i*$fh,$tmp[$i],$this->current_color);
-                    }
-                }
-            }
-            else {
-                //Put the text
-                imagestring($this->img,$use_font,$x,$y-$h+1,$txt,$this->current_color);
-            }
-            if( $aDebug ) {
-                // Draw the bounding rectangle and the bounding box
-                $p1 = array(round($x),round($y),round($x),round($y-$h),round($x+$w),round($y-$h),round($x+$w),round($y));
-
-                // Draw bounding box
-                $this->PushColor('green');
-                $this->Polygon($p1,true);
-                $this->PopColor();
-
-            }
-            $aBoundingBox=array(round($x),round($y),round($x),round($y-$h),round($x+$w),round($y-$h),round($x+$w),round($y));
-        }
-    }
-
-    function AddTxtCR($aTxt) {
-        // If the user has just specified a '\n'
-        // instead of '\n\t' we have to add '\r' since
-        // the width will be too muchy otherwise since when
-        // we print we stroke the individually lines by hand.
-        $e = explode("\n",$aTxt);
-        $n = count($e);
-        for($i=0; $i<$n; ++$i) {
-            $e[$i]=str_replace("\r","",$e[$i]);
-        }
-        return implode("\n\r",$e);
-    }
-
-    function NormAngle($a) {
-        // Normalize angle in degrees
-        // Normalize angle to be between 0-360
-        while( $a > 360 )
-            $a -= 360;
-        while( $a < -360 )
-            $a += 360;
-        if( $a < 0 )
-            $a = 360 + $a;
-        return $a;
-    }
-
-    function imagettfbbox_fixed($size, $angle, $fontfile, $text) {
-
-
-        if( ! USE_LIBRARY_IMAGETTFBBOX ) {
-
-            $bbox = @imagettfbbox($size, $angle, $fontfile, $text);
-            if( $bbox === false ) {
-                JpGraphError::RaiseL(25092,$this->font_file);
-                //("There is either a configuration problem with TrueType or a problem reading font file (".$this->font_file."). Make sure file exists and is in a readable place for the HTTP process. (If 'basedir' restriction is enabled in PHP then the font file must be located in the document root.). It might also be a wrongly installed FreeType library. Try uppgrading to at least FreeType 2.1.13 and recompile GD with the correct setup so it can find the new FT library.");
-            }
-            $this->bbox_cache = $bbox;
-            return $bbox;
-        }
-
-        // The built in imagettfbbox is buggy for angles != 0 so
-        // we calculate this manually by getting the bounding box at
-        // angle = 0 and then rotate the bounding box manually
-        $bbox = @imagettfbbox($size, 0, $fontfile, $text);
-        if( $bbox === false ) {
-            JpGraphError::RaiseL(25092,$this->font_file);
-            //("There is either a configuration problem with TrueType or a problem reading font file (".$this->font_file."). Make sure file exists and is in a readable place for the HTTP process. (If 'basedir' restriction is enabled in PHP then the font file must be located in the document root.). It might also be a wrongly installed FreeType library. Try uppgrading to at least FreeType 2.1.13 and recompile GD with the correct setup so it can find the new FT library.");
-        }
-
-        $angle = $this->NormAngle($angle);
-
-        $a = $angle*M_PI/180;
-        $ca = cos($a);
-        $sa = sin($a);
-        $ret = array();
-
-        // We always add 1 pixel to the left since the left edge of the bounding
-        // box is sometimes coinciding with the first pixel of the text
-        //$bbox[0] -= 1;
-        //$bbox[6] -= 1;
-        
-        // For roatated text we need to add extra width for rotated
-        // text since the kerning and stroking of the TTF is not the same as for
-        // text at a 0 degree angle
-
-        if( $angle > 0.001 && abs($angle-360) > 0.001 ) {
-            $h = abs($bbox[7]-$bbox[1]);
-            $w = abs($bbox[2]-$bbox[0]);
-
-            $bbox[0] -= 2;
-            $bbox[6] -= 2;
-            // The width is underestimated so compensate for that
-            $bbox[2] += round($w*0.06);
-            $bbox[4] += round($w*0.06);
-
-            // and we also need to compensate with increased height
-            $bbox[5] -= round($h*0.1);
-            $bbox[7] -= round($h*0.1);
-
-            if( $angle > 90 ) {
-                // For angles > 90 we also need to extend the height further down
-                // by the baseline since that is also one more problem
-                $bbox[1] += round($h*0.15);
-                $bbox[3] += round($h*0.15);
-
-                // and also make it slighty less height
-                $bbox[7] += round($h*0.05);
-                $bbox[5] += round($h*0.05);
-
-                // And we need to move the box slightly top the rright (from a tetx perspective)
-                $bbox[0] += round($w*0.02);
-                $bbox[6] += round($w*0.02);
-
-                if( $angle > 180 ) {
-                    // And we need to move the box slightly to the left (from a text perspective)
-                    $bbox[0] -= round($w*0.02);
-                    $bbox[6] -= round($w*0.02);
-                    $bbox[2] -= round($w*0.02);
-                    $bbox[4] -= round($w*0.02);
-
-                }
-
-            }
-            for($i = 0; $i < 7; $i += 2) {
-                $ret[$i] = round($bbox[$i] * $ca + $bbox[$i+1] * $sa);
-                $ret[$i+1] = round($bbox[$i+1] * $ca - $bbox[$i] * $sa);
-            }
-            $this->bbox_cache = $ret;
-            return $ret;
-        }
-        else {
-            $this->bbox_cache = $bbox;
-            return $bbox;
-        }
-    }
-
-    // Deprecated
-    function GetTTFBBox($aTxt,$aAngle=0) {
-        $bbox = $this->imagettfbbox_fixed($this->font_size,$aAngle,$this->font_file,$aTxt);
-         return $bbox;
-    }
-
-    function GetBBoxTTF($aTxt,$aAngle=0) {
-        // Normalize the bounding box to become a minimum
-        // enscribing rectangle
-
-        $aTxt = $this->AddTxtCR($aTxt);
-
-        if( !is_readable($this->font_file) ) {
-            JpGraphError::RaiseL(25093,$this->font_file);
-            //('Can not read font file ('.$this->font_file.') in call to Image::GetBBoxTTF. Please make sure that you have set a font before calling this method and that the font is installed in the TTF directory.');
-        }
-        $bbox = $this->imagettfbbox_fixed($this->font_size,$aAngle,$this->font_file,$aTxt);
-
-        if( $aAngle==0 ) return $bbox;
-
-        if( $aAngle >= 0 ) {
-            if(  $aAngle <= 90 ) { //<=0
-                $bbox = array($bbox[6],$bbox[1],$bbox[2],$bbox[1],
-                              $bbox[2],$bbox[5],$bbox[6],$bbox[5]);
-            }
-            elseif(  $aAngle <= 180 ) { //<= 2
-                $bbox = array($bbox[4],$bbox[7],$bbox[0],$bbox[7],
-                              $bbox[0],$bbox[3],$bbox[4],$bbox[3]);
-            }
-            elseif(  $aAngle <= 270 )  { //<= 3
-                $bbox = array($bbox[2],$bbox[5],$bbox[6],$bbox[5],
-                              $bbox[6],$bbox[1],$bbox[2],$bbox[1]);
-            }
-            else {
-                $bbox = array($bbox[0],$bbox[3],$bbox[4],$bbox[3],
-                              $bbox[4],$bbox[7],$bbox[0],$bbox[7]);
-            }
-        }
-        elseif(  $aAngle < 0 ) {
-            if( $aAngle <= -270 ) { // <= -3
-                $bbox = array($bbox[6],$bbox[1],$bbox[2],$bbox[1],
-                              $bbox[2],$bbox[5],$bbox[6],$bbox[5]);
-            }
-            elseif( $aAngle <= -180 ) { // <= -2
-                $bbox = array($bbox[0],$bbox[3],$bbox[4],$bbox[3],
-                              $bbox[4],$bbox[7],$bbox[0],$bbox[7]);
-            }
-            elseif( $aAngle <= -90 ) { // <= -1
-                $bbox = array($bbox[2],$bbox[5],$bbox[6],$bbox[5],
-                              $bbox[6],$bbox[1],$bbox[2],$bbox[1]);
-            }
-            else {
-                $bbox = array($bbox[0],$bbox[3],$bbox[4],$bbox[3],
-                              $bbox[4],$bbox[7],$bbox[0],$bbox[7]);
-            }
-        }
-        return $bbox;
-    }
-
-    function GetBBoxHeight($aTxt,$aAngle=0) {
-        $box = $this->GetBBoxTTF($aTxt,$aAngle);
-        return abs($box[7]-$box[1]);
-    }
-
-    function GetBBoxWidth($aTxt,$aAngle=0) {
-        $box = $this->GetBBoxTTF($aTxt,$aAngle);
-        return $box[2]-$box[0]+1;
-    }
-
-
-    function _StrokeTTF($x,$y,$txt,$dir,$paragraph_align,&$aBoundingBox,$debug=false) {
-
-        // Setup default inter line margin for paragraphs to be
-        // 3% of the font height.
-        $ConstLineSpacing = 0.03 ;
-
-        // Remember the anchor point before adjustment
-        if( $debug ) {
-            $ox=$x;
-            $oy=$y;
-        }
-
-        if( !preg_match('/\n/',$txt) || ($dir>0 && preg_match('/\n/',$txt)) ) {
-            // Format a single line
-
-            $txt = $this->AddTxtCR($txt);
-            $bbox=$this->GetBBoxTTF($txt,$dir);
-            $width  = $this->GetBBoxWidth($txt,$dir);
-            $height = $this->GetBBoxHeight($txt,$dir);
-
-            // The special alignment "basepoint" is mostly used internally
-            // in the library. This will put the anchor position at the left
-            // basepoint of the tetx. This is the default anchor point for
-            // TTF text.
-
-            if( $this->text_valign != 'basepoint' ) {
-                // Align x,y ot lower left corner of bbox
-                
-
-                if( $this->text_halign=='right' ) {
-                    $x -= $width;
-                    $x -= $bbox[0];
-                }
-                elseif( $this->text_halign=='center' ) {
-                    $x -= $width/2;
-                    $x -= $bbox[0];
-                }
-                elseif( $this->text_halign=='baseline' ) {
-                    // This is only support for text at 90 degree !!
-                    // Do nothing the text is drawn at baseline by default
-                }
-
-                if( $this->text_valign=='top' ) {
-                    $y -= $bbox[1]; // Adjust to bottom of text
-                    $y += $height;
-                }
-                elseif( $this->text_valign=='center' ) {
-                    $y -= $bbox[1]; // Adjust to bottom of text
-                    $y += $height/2;
-                }
-                elseif( $this->text_valign=='baseline' ) {
-                    // This is only support for text at 0 degree !!
-                    // Do nothing the text is drawn at baseline by default
-                }
-            } 
-            ImageTTFText ($this->img, $this->font_size, $dir, $x, $y,
-                          $this->current_color,$this->font_file,$txt);
-
-            // Calculate and return the co-ordinates for the bounding box
-            $box = $this->imagettfbbox_fixed($this->font_size,$dir,$this->font_file,$txt);
-            $p1 = array();
-
-            for($i=0; $i < 4; ++$i) {
-                $p1[] = round($box[$i*2]+$x);
-                $p1[] = round($box[$i*2+1]+$y);
-            }
-            $aBoundingBox = $p1;
-
-            // Debugging code to highlight the bonding box and bounding rectangle
-            // For text at 0 degrees the bounding box and bounding rectangle are the
-            // same
-            if( $debug ) {
-            // Draw the bounding rectangle and the bounding box
-
-                $p = array();
-                $p1 = array();
-
-                for($i=0; $i < 4; ++$i) {
-                    $p[] =  $bbox[$i*2]+$x ;
-                    $p[] =  $bbox[$i*2+1]+$y;
-                    $p1[] = $box[$i*2]+$x ;
-                    $p1[] = $box[$i*2+1]+$y ;
-                }
-
-                // Draw bounding box
-                $this->PushColor('green');
-                $this->Polygon($p1,true);
-                $this->PopColor();
-
-                // Draw bounding rectangle
-                $this->PushColor('darkgreen');
-                $this->Polygon($p,true);
-                $this->PopColor();
-
-                // Draw a cross at the anchor point
-                $this->PushColor('red');
-                $this->Line($ox-15,$oy,$ox+15,$oy);
-                $this->Line($ox,$oy-15,$ox,$oy+15);
-                $this->PopColor();
-            }
-        }
-        else {
-            // Format a text paragraph
-            $fh=$this->GetFontHeight();
-
-            // Line margin is 25% of font height
-            $linemargin=round($fh*$ConstLineSpacing);
-            $fh += $linemargin;
-            $w=$this->GetTextWidth($txt);
-
-            $y -= $linemargin/2;
-            $tmp = preg_split('/\n/',$txt);
-            $nl = count($tmp);
-            $h = $nl * $fh;
-
-            if( $this->text_halign=='right') {
-                $x -= $dir==0 ? $w : $h;
-            }
-            elseif( $this->text_halign=='center' ) {
-                $x -= $dir==0 ? $w/2 : $h/2;
-            }
-
-            if( $this->text_valign=='top' ) {
-                $y += $dir==0 ? $h : $w;
-            }
-            elseif( $this->text_valign=='center' ) {
-                $y += $dir==0 ? $h/2 : $w/2;
-            }
-
-            // Here comes a tricky bit.
-            // Since we have to give the position for the string at the
-            // baseline this means thaht text will move slightly up
-            // and down depending on any of it's character descend below
-            // the baseline, for example a 'g'. To adjust the Y-position
-            // we therefore adjust the text with the baseline Y-offset
-            // as used for the current font and size. This will keep the
-            // baseline at a fixed positoned disregarding the actual
-            // characters in the string.
-            $standardbox = $this->GetTTFBBox('Gg',$dir);
-            $yadj = $standardbox[1];
-            $xadj = $standardbox[0];
-            $aBoundingBox = array();
-            for($i=0; $i < $nl; ++$i) {
-                $wl = $this->GetTextWidth($tmp[$i]);
-                $bbox = $this->GetTTFBBox($tmp[$i],$dir);
-                if( $paragraph_align=='left' ) {
-                    $xl = $x;
-                }
-                elseif( $paragraph_align=='right' ) {
-                    $xl = $x + ($w-$wl);
-                }
-                else {
-                    // Center
-                    $xl = $x + $w/2 - $wl/2 ;
-                }
-
-                // In theory we should adjust with full pre-lead to get the lines
-                // lined up but this doesn't look good so therfore we only adjust with
-                // half th pre-lead
-                $xl -= $bbox[0]/2;
-                $yl = $y - $yadj;
-                //$xl = $xl- $xadj;
-                ImageTTFText($this->img, $this->font_size, $dir, $xl, $yl-($h-$fh)+$fh*$i,
-                             $this->current_color,$this->font_file,$tmp[$i]);
-
-               // echo "xl=$xl,".$tmp[$i]." <br>";
-                if( $debug  ) {
-                    // Draw the bounding rectangle around each line
-                    $box=@ImageTTFBBox($this->font_size,$dir,$this->font_file,$tmp[$i]);
-                    $p = array();
-                    for($j=0; $j < 4; ++$j) {
-                        $p[] = $bbox[$j*2]+$xl;
-                        $p[] = $bbox[$j*2+1]+$yl-($h-$fh)+$fh*$i;
-                    }
-
-                    // Draw bounding rectangle
-                    $this->PushColor('darkgreen');
-                    $this->Polygon($p,true);
-                    $this->PopColor();
-                }
-            }
-
-            // Get the bounding box
-            $bbox = $this->GetBBoxTTF($txt,$dir);
-            for($j=0; $j < 4; ++$j) {
-                $bbox[$j*2]+= round($x);
-                $bbox[$j*2+1]+= round($y - ($h-$fh) - $yadj);
-            }
-            $aBoundingBox = $bbox;
-
-            if( $debug ) {
-                // Draw a cross at the anchor point
-                $this->PushColor('red');
-                $this->Line($ox-25,$oy,$ox+25,$oy);
-                $this->Line($ox,$oy-25,$ox,$oy+25);
-                $this->PopColor();
-            }
-
-        }
-    }
-
-    function StrokeText($x,$y,$txt,$dir=0,$paragraph_align="left",$debug=false) {
-
-        $x = round($x);
-        $y = round($y);
-
-        // Do special language encoding
-        $txt = $this->langconv->Convert($txt,$this->font_family);
-
-        if( !is_numeric($dir) ) {
-            JpGraphError::RaiseL(25094);//(" Direction for text most be given as an angle between 0 and 90.");
-        }
-
-        if( $this->font_family >= FF_FONT0 && $this->font_family <= FF_FONT2+1) {
-            $this->_StrokeBuiltinFont($x,$y,$txt,$dir,$paragraph_align,$boundingbox,$debug);
-        }
-        elseif( $this->font_family >= _FIRST_FONT && $this->font_family <= _LAST_FONT)  {
-            $this->_StrokeTTF($x,$y,$txt,$dir,$paragraph_align,$boundingbox,$debug);
-        }
-        else {
-            JpGraphError::RaiseL(25095);//(" Unknown font font family specification. ");
-        }
-        return $boundingbox;
-    }
-
-    function SetMargin($lm,$rm,$tm,$bm) {
-
-        $this->left_margin=$lm;
-        $this->right_margin=$rm;
-        $this->top_margin=$tm;
-        $this->bottom_margin=$bm;
-
-        $this->plotwidth  = $this->width  - $this->left_margin - $this->right_margin;
-        $this->plotheight = $this->height - $this->top_margin  - $this->bottom_margin;
-
-        if( $this->width  > 0 && $this->height > 0 ) {
-            if( $this->plotwidth < 0  || $this->plotheight < 0 ) {
-            	JpGraphError::RaiseL(25130, $this->plotwidth, $this->plotheight);
-                //JpGraphError::raise("To small plot area. ($lm,$rm,$tm,$bm : $this->plotwidth x $this->plotheight). With the given image size and margins there is to little space left for the plot. Increase the plot size or reduce the margins.");
-            }
-        }
-    }
-
-    function SetTransparent($color) {
-        imagecolortransparent ($this->img,$this->rgb->allocate($color));
-    }
-
-    function SetColor($color,$aAlpha=0) {
-        $this->current_color_name = $color;
-        $this->current_color=$this->rgb->allocate($color,$aAlpha);
-        if( $this->current_color == -1 ) {
-            $tc=imagecolorstotal($this->img);
-            JpGraphError::RaiseL(25096);
-            //("Can't allocate any more colors. Image has already allocated maximum of <b>$tc colors</b>. This might happen if you have anti-aliasing turned on together with a background image or perhaps gradient fill since this requires many, many colors. Try to turn off anti-aliasing. If there is still a problem try downgrading the quality of the background image to use a smaller pallete to leave some entries for your graphs. You should try to limit the number of colors in your background image to 64. If there is still problem set the constant DEFINE(\"USE_APPROX_COLORS\",true); in jpgraph.php This will use approximative colors when the palette is full. Unfortunately there is not much JpGraph can do about this since the palette size is a limitation of current graphic format and what the underlying GD library suppports.");
-        }
-        return $this->current_color;
-    }
-
-    function PushColor($color) {
-        if( $color != "" ) {
-            $this->colorstack[$this->colorstackidx]=$this->current_color_name;
-            $this->colorstack[$this->colorstackidx+1]=$this->current_color;
-            $this->colorstackidx+=2;
-            $this->SetColor($color);
-        }
-        else {
-            JpGraphError::RaiseL(25097);//("Color specified as empty string in PushColor().");
-        }
-    }
-
-    function PopColor() {
-        if( $this->colorstackidx < 1 ) {
-            JpGraphError::RaiseL(25098);//(" Negative Color stack index. Unmatched call to PopColor()");
-        }
-        $this->current_color=$this->colorstack[--$this->colorstackidx];
-        $this->current_color_name=$this->colorstack[--$this->colorstackidx];
-    }
-
-
-    function SetLineWeight($weight) {
-        $old = $this->line_weight;
-        imagesetthickness($this->img,$weight);
-        $this->line_weight = $weight;
-        return $old;
-    }
-
-    function SetStartPoint($x,$y) {
-        $this->lastx=round($x);
-        $this->lasty=round($y);
-    }
-
-    function Arc($cx,$cy,$w,$h,$s,$e) {
-        // GD Arc doesn't like negative angles
-        while( $s < 0) $s += 360;
-        while( $e < 0) $e += 360;
-        imagearc($this->img,round($cx),round($cy),round($w),round($h),$s,$e,$this->current_color);
-    }
-
-    function FilledArc($xc,$yc,$w,$h,$s,$e,$style='') {
-        $s = round($s);
-        $e = round($e);
-        while( $s < 0 ) $s += 360;
-        while( $e < 0 ) $e += 360;
-        if( $style=='' )
-        $style=IMG_ARC_PIE;
-        if( abs($s-$e) > 0 ) {
-            imagefilledarc($this->img,round($xc),round($yc),round($w),round($h),$s,$e,$this->current_color,$style);
-//            $this->DrawImageSmoothArc($this->img,round($xc),round($yc),round($w),round($h),$s,$e,$this->current_color,$style);
-        }
-    }
-
-    function FilledCakeSlice($cx,$cy,$w,$h,$s,$e) {
-        $this->CakeSlice($cx,$cy,$w,$h,$s,$e,$this->current_color_name);
-    }
-
-    function CakeSlice($xc,$yc,$w,$h,$s,$e,$fillcolor="",$arccolor="") {
-        $s = round($s); $e = round($e);
-        $w = round($w); $h = round($h);
-        $xc = round($xc); $yc = round($yc);
-        if( $s == $e ) {
-            // A full circle. We draw this a plain circle
-            $this->PushColor($fillcolor);
-            imagefilledellipse($this->img,$xc,$yc,2*$w,2*$h,$this->current_color);
-
-            // If antialiasing is used then we often don't have any color no the surrounding
-            // arc. So, we need to check for this special case so we don't send an empty
-            // color to the push function. In this case we use the fill color for the arc as well
-            if( $arccolor != '' ) {
-                $this->PopColor();
-                $this->PushColor($arccolor);
-            }
-            imageellipse($this->img,$xc,$yc,2*$w,2*$h,$this->current_color);
-            $this->Line($xc,$yc,cos($s*M_PI/180)*$w+$xc,$yc+sin($s*M_PI/180)*$h);
-            $this->PopColor();
-        }
-        else {
-            $this->PushColor($fillcolor);
-            $this->FilledArc($xc,$yc,2*$w,2*$h,$s,$e);
-            $this->PopColor();
-            if( $arccolor != "" ) {
-                $this->PushColor($arccolor);
-                // We add 2 pixels to make the Arc() better aligned with
-                // the filled arc.
-                imagefilledarc($this->img,$xc,$yc,2*$w,2*$h,$s,$e,$this->current_color,IMG_ARC_NOFILL | IMG_ARC_EDGED ) ;
-                $this->PopColor();
-            }
-        }
-    }
-
-    function Ellipse($xc,$yc,$w,$h) {
-        $this->Arc($xc,$yc,$w,$h,0,360);
-    }
-
-    function Circle($xc,$yc,$r) {
-        imageellipse($this->img,round($xc),round($yc),$r*2,$r*2,$this->current_color);
-//        $this->DrawImageSmoothArc($this->img,round($xc),round($yc),$r*2+1,$r*2+1,0,360,$this->current_color);
-//        $this->imageSmoothCircle($this->img, round($xc),round($yc), $r*2+1, $this->current_color);
-    }
-
-    function FilledCircle($xc,$yc,$r) {
-        imagefilledellipse($this->img,round($xc),round($yc),2*$r,2*$r,$this->current_color);
-//        $this->DrawImageSmoothArc($this->img, round($xc), round($yc), 2*$r, 2*$r, 0, 360, $this->current_color);
-    }
-
-    // Linear Color InterPolation
-    function lip($f,$t,$p) {
-        $p = round($p,1);
-        $r = $f[0] + ($t[0]-$f[0])*$p;
-        $g = $f[1] + ($t[1]-$f[1])*$p;
-        $b = $f[2] + ($t[2]-$f[2])*$p;
-        return array($r,$g,$b);
-    }
-
-    // Set line style dashed, dotted etc
-    function SetLineStyle($s) {
-        if( is_numeric($s) ) {
-            if( $s<1 || $s>4 ) {
-                JpGraphError::RaiseL(25101,$s);//(" Illegal numeric argument to SetLineStyle(): ($s)");
-            }
-        }
-        elseif( is_string($s) ) {
-            if( $s == "solid" ) $s=1;
-            elseif( $s == "dotted" ) $s=2;
-            elseif( $s == "dashed" ) $s=3;
-            elseif( $s == "longdashed" ) $s=4;
-            else {
-                JpGraphError::RaiseL(25102,$s);//(" Illegal string argument to SetLineStyle(): $s");
-            }
-        }
-        else {
-            JpGraphError::RaiseL(25103,$s);//(" Illegal argument to SetLineStyle $s");
-        }
-        $old = $this->line_style;
-        $this->line_style=$s;
-        return $old;
-    }
-
-    // Same as Line but take the line_style into account
-    function StyleLine($x1,$y1,$x2,$y2,$aStyle='', $from_grid_class = false) {
-        if( $this->line_weight <= 0 ) return;
-
-        if( $aStyle === '' ) {
-            $aStyle = $this->line_style;
-        }
-
-        $dashed_line_method = 'DashedLine';
-        if ($from_grid_class) {
-            $dashed_line_method = 'DashedLineForGrid';
-        }
-
-        // Add error check since dashed line will only work if anti-alias is disabled
-        // this is a limitation in GD
-
-        if( $aStyle == 1 ) {
-            // Solid style. We can handle anti-aliasing for this
-            $this->Line($x1,$y1,$x2,$y2);
-        }
-        else {
-            // Since the GD routines doesn't handle AA for styled line
-            // we have no option than to turn it off to get any lines at
-            // all if the weight > 1
-            $oldaa = $this->GetAntiAliasing();
-            if( $oldaa && $this->line_weight > 1 ) {
-                 $this->SetAntiAliasing(false);
-            }
-
-            switch( $aStyle ) {
-                case 2: // Dotted
-                    $this->$dashed_line_method($x1,$y1,$x2,$y2,2,6);
-                    break;
-                case 3: // Dashed
-                    $this->$dashed_line_method($x1,$y1,$x2,$y2,5,9);
-                    break;
-                case 4: // Longdashes
-                    $this->$dashed_line_method($x1,$y1,$x2,$y2,9,13);
-                    break;
-                default:
-                    JpGraphError::RaiseL(25104,$this->line_style);//(" Unknown line style: $this->line_style ");
-                    break;
-            }
-            if( $oldaa ) {
-                $this->SetAntiAliasing(true);
-            }
-        }
-    }
-
-    function DashedLine($x1,$y1,$x2,$y2,$dash_length=1,$dash_space=4) {
-
-        if( $this->line_weight <= 0 ) return;
-
-        // Add error check to make sure anti-alias is not enabled.
-        // Dashed line does not work with anti-alias enabled. This
-        // is a limitation in GD.
-        if( $this->use_anti_aliasing ) {
-//            JpGraphError::RaiseL(25129); // Anti-alias can not be used with dashed lines. Please disable anti-alias or use solid lines.
-        }
-        
-        $x1 = round($x1);
-        $x2 = round($x2);
-        $y1 = round($y1);
-        $y2 = round($y2);
-
-        $dash_length *= SUPERSAMPLING_SCALE;
-        $dash_space  *= SUPERSAMPLING_SCALE;
-
-        $style = array_fill(0,$dash_length,$this->current_color);
-        $style = array_pad($style,$dash_space,IMG_COLOR_TRANSPARENT);
-        imagesetstyle($this->img, $style);
-        imageline($this->img, $x1, $y1, $x2, $y2, IMG_COLOR_STYLED);
-
-        $this->lastx = $x2;
-        $this->lasty = $y2;
-    }
-
-    function DashedLineForGrid($x1,$y1,$x2,$y2,$dash_length=1,$dash_space=4) {
-
-        if( $this->line_weight <= 0 ) return;
-
-        // Add error check to make sure anti-alias is not enabled.
-        // Dashed line does not work with anti-alias enabled. This
-        // is a limitation in GD.
-        if( $this->use_anti_aliasing ) {
-//            JpGraphError::RaiseL(25129); // Anti-alias can not be used with dashed lines. Please disable anti-alias or use solid lines.
-        }
-        
-        $x1 = round($x1);
-        $x2 = round($x2);
-        $y1 = round($y1);
-        $y2 = round($y2);
-        
-        /*
-        $dash_length *= $this->scale;
-        $dash_space  *= $this->scale;
-        */
-
-        $dash_length = 2;
-        $dash_length = 4;
-        imagesetthickness($this->img, 1);
-        $style = array_fill(0,$dash_length, $this->current_color); //hexdec('CCCCCC'));
-        $style = array_pad($style,$dash_space,IMG_COLOR_TRANSPARENT);
-        imagesetstyle($this->img, $style);
-        imageline($this->img, $x1, $y1, $x2, $y2, IMG_COLOR_STYLED);
-
-        $this->lastx = $x2;
-        $this->lasty = $y2;
-    }
-
-    function Line($x1,$y1,$x2,$y2) {
-
-        if( $this->line_weight <= 0 ) return;
-
-        $x1 = round($x1);
-        $x2 = round($x2);
-        $y1 = round($y1);
-        $y2 = round($y2);
-
-        imageline($this->img,$x1,$y1,$x2,$y2,$this->current_color);
-//        $this->DrawLine($this->img, $x1, $y1, $x2, $y2, $this->line_weight, $this->current_color);
-        $this->lastx=$x2;
-        $this->lasty=$y2;
-    }
-
-    function Polygon($p,$closed=FALSE,$fast=FALSE) {
-
-        if( $this->line_weight <= 0 ) return;
-
-        $n=count($p);
-        $oldx = $p[0];
-        $oldy = $p[1];
-        if( $fast ) {
-            for( $i=2; $i < $n; $i+=2 ) {
-                imageline($this->img,$oldx,$oldy,$p[$i],$p[$i+1],$this->current_color);
-                $oldx = $p[$i];
-                $oldy = $p[$i+1];
-            }
-            if( $closed ) {
-                imageline($this->img,$p[$n*2-2],$p[$n*2-1],$p[0],$p[1],$this->current_color);
-            }
-        }
-        else {
-            for( $i=2; $i < $n; $i+=2 ) {
-                $this->StyleLine($oldx,$oldy,$p[$i],$p[$i+1]);
-                $oldx = $p[$i];
-                $oldy = $p[$i+1];
-            }
-            if( $closed ) {
-                $this->StyleLine($oldx,$oldy,$p[0],$p[1]);
-            }
-        }
-    }
-
-    function FilledPolygon($pts) {
-        $n=count($pts);
-        if( $n == 0 ) {
-            JpGraphError::RaiseL(25105);//('NULL data specified for a filled polygon. Check that your data is not NULL.');
-        }
-        for($i=0; $i < $n; ++$i) {
-            $pts[$i] = round($pts[$i]);
-        }
-        $old = $this->line_weight;
-        imagesetthickness($this->img,1);
-        imagefilledpolygon($this->img,$pts,count($pts)/2,$this->current_color);
-        $this->line_weight = $old;
-        imagesetthickness($this->img,$old);
-    }
-
-    function Rectangle($xl,$yu,$xr,$yl) {
-        $this->Polygon(array($xl,$yu,$xr,$yu,$xr,$yl,$xl,$yl,$xl,$yu));
-    }
-
-    function FilledRectangle($xl,$yu,$xr,$yl) {
-        $this->FilledPolygon(array($xl,$yu,$xr,$yu,$xr,$yl,$xl,$yl));
-    }
-
-    function FilledRectangle2($xl,$yu,$xr,$yl,$color1,$color2,$style=1) {
-        // Fill a rectangle with lines of two colors
-        if( $style===1 ) {
-            // Horizontal stripe
-            if( $yl < $yu ) {
-                $t = $yl; $yl=$yu; $yu=$t;
-            }
-            for( $y=$yu; $y <= $yl; ++$y) {
-                $this->SetColor($color1);
-                $this->Line($xl,$y,$xr,$y);
-                ++$y;
-                $this->SetColor($color2);
-                $this->Line($xl,$y,$xr,$y);
-            }
-        }
-        else {
-            if( $xl < $xl ) {
-                $t = $xl; $xl=$xr; $xr=$t;
-            }
-            for( $x=$xl; $x <= $xr; ++$x) {
-                $this->SetColor($color1);
-                $this->Line($x,$yu,$x,$yl);
-                ++$x;
-                $this->SetColor($color2);
-                $this->Line($x,$yu,$x,$yl);
-            }
-        }
-    }
-
-    function ShadowRectangle($xl,$yu,$xr,$yl,$fcolor=false,$shadow_width=4,$shadow_color='darkgray',$useAlpha=true) {
-        // This is complicated by the fact that we must also handle the case where
-        // the reactangle has no fill color
-        $xl = floor($xl);
-        $yu = floor($yu);
-        $xr = floor($xr);
-        $yl = floor($yl);
-        $this->PushColor($shadow_color);
-        $shadowAlpha=0;
-        $this->SetLineWeight(1);
-        $this->SetLineStyle('solid');
-        $basecolor = $this->rgb->Color($shadow_color);
-        $shadow_color = array($basecolor[0],$basecolor[1],$basecolor[2],);
-        for( $i=0; $i < $shadow_width; ++$i ) {
-            $this->SetColor($shadow_color,$shadowAlpha);
-            $this->Line($xr-$shadow_width+$i,   $yu+$shadow_width,
-                        $xr-$shadow_width+$i,   $yl-$shadow_width-1+$i);
-            $this->Line($xl+$shadow_width,   $yl-$shadow_width+$i,
-                        $xr-$shadow_width+$i,   $yl-$shadow_width+$i);
-            if( $useAlpha ) $shadowAlpha += 1.0/$shadow_width;
-        }
-
-        $this->PopColor();
-        if( $fcolor==false ) {
-            $this->Rectangle($xl,$yu,$xr-$shadow_width-1,$yl-$shadow_width-1);
-        }
-        else {
-            $this->PushColor($fcolor);
-            $this->FilledRectangle($xl,$yu,$xr-$shadow_width-1,$yl-$shadow_width-1);
-            $this->PopColor();
-            $this->Rectangle($xl,$yu,$xr-$shadow_width-1,$yl-$shadow_width-1);
-        }
-    }
-
-    function FilledRoundedRectangle($xt,$yt,$xr,$yl,$r=5) {
-        if( $r==0 ) {
-            $this->FilledRectangle($xt,$yt,$xr,$yl);
-            return;
-        }
-
-        // To avoid overlapping fillings (which will look strange
-        // when alphablending is enabled) we have no choice but
-        // to fill the five distinct areas one by one.
-
-        // Center square
-        $this->FilledRectangle($xt+$r,$yt+$r,$xr-$r,$yl-$r);
-        // Top band
-        $this->FilledRectangle($xt+$r,$yt,$xr-$r,$yt+$r);
-        // Bottom band
-        $this->FilledRectangle($xt+$r,$yl-$r,$xr-$r,$yl);
-        // Left band
-        $this->FilledRectangle($xt,$yt+$r,$xt+$r,$yl-$r);
-        // Right band
-        $this->FilledRectangle($xr-$r,$yt+$r,$xr,$yl-$r);
-
-        // Topleft & Topright arc
-        $this->FilledArc($xt+$r,$yt+$r,$r*2,$r*2,180,270);
-        $this->FilledArc($xr-$r,$yt+$r,$r*2,$r*2,270,360);
-
-        // Bottomleft & Bottom right arc
-        $this->FilledArc($xt+$r,$yl-$r,$r*2,$r*2,90,180);
-        $this->FilledArc($xr-$r,$yl-$r,$r*2,$r*2,0,90);
-
-    }
-
-    function RoundedRectangle($xt,$yt,$xr,$yl,$r=5) {
-
-        if( $r==0 ) {
-            $this->Rectangle($xt,$yt,$xr,$yl);
-            return;
-        }
-
-        // Top & Bottom line
-        $this->Line($xt+$r,$yt,$xr-$r,$yt);
-        $this->Line($xt+$r,$yl,$xr-$r,$yl);
-
-        // Left & Right line
-        $this->Line($xt,$yt+$r,$xt,$yl-$r);
-        $this->Line($xr,$yt+$r,$xr,$yl-$r);
-
-        // Topleft & Topright arc
-        $this->Arc($xt+$r,$yt+$r,$r*2,$r*2,180,270);
-        $this->Arc($xr-$r,$yt+$r,$r*2,$r*2,270,360);
-
-        // Bottomleft & Bottomright arc
-        $this->Arc($xt+$r,$yl-$r,$r*2,$r*2,90,180);
-        $this->Arc($xr-$r,$yl-$r,$r*2,$r*2,0,90);
-    }
-
-    function FilledBevel($x1,$y1,$x2,$y2,$depth=2,$color1='white@0.4',$color2='darkgray@0.4') {
-        $this->FilledRectangle($x1,$y1,$x2,$y2);
-        $this->Bevel($x1,$y1,$x2,$y2,$depth,$color1,$color2);
-    }
-
-    function Bevel($x1,$y1,$x2,$y2,$depth=2,$color1='white@0.4',$color2='black@0.5') {
-        $this->PushColor($color1);
-        for( $i=0; $i < $depth; ++$i ) {
-            $this->Line($x1+$i,$y1+$i,$x1+$i,$y2-$i);
-            $this->Line($x1+$i,$y1+$i,$x2-$i,$y1+$i);
-        }
-        $this->PopColor();
-
-        $this->PushColor($color2);
-        for( $i=0; $i < $depth; ++$i ) {
-            $this->Line($x1+$i,$y2-$i,$x2-$i,$y2-$i);
-            $this->Line($x2-$i,$y1+$i,$x2-$i,$y2-$i-1);
-        }
-        $this->PopColor();
-    }
-
-    function StyleLineTo($x,$y) {
-        $this->StyleLine($this->lastx,$this->lasty,$x,$y);
-        $this->lastx=$x;
-        $this->lasty=$y;
-    }
-
-    function LineTo($x,$y) {
-        $this->Line($this->lastx,$this->lasty,$x,$y);
-        $this->lastx=$x;
-        $this->lasty=$y;
-    }
-
-    function Point($x,$y) {
-        imagesetpixel($this->img,round($x),round($y),$this->current_color);
-    }
-
-    function Fill($x,$y) {
-        imagefill($this->img,round($x),round($y),$this->current_color);
-    }
-
-    function FillToBorder($x,$y,$aBordColor) {
-        $bc = $this->rgb->allocate($aBordColor);
-        if( $bc == -1 ) {
-            JpGraphError::RaiseL(25106);//('Image::FillToBorder : Can not allocate more colors');
-        }
-        imagefilltoborder($this->img,round($x),round($y),$bc,$this->current_color);
-    }
-
-    function SetExpired($aFlg=true) {
-        $this->expired = $aFlg;
-    }
-
-    // Generate image header
-    function Headers() {
-
-        // In case we are running from the command line with the client version of
-        // PHP we can't send any headers.
-        $sapi = php_sapi_name();
-        if( $sapi == 'cli' ) return;
-
-        // These parameters are set by headers_sent() but they might cause
-        // an undefined variable error unless they are initilized
-        $file='';
-        $lineno='';
-        if( headers_sent($file,$lineno) ) {
-            $file=basename($file);
-            $t = new ErrMsgText();
-            $msg = $t->Get(10,$file,$lineno);
-            die($msg);
-        }
-
-        if ($this->expired) {
-            header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-            header("Last-Modified: " . gmdate("D, d M Y H:i:s") . "GMT");
-            header("Cache-Control: no-cache, must-revalidate");
-            header("Pragma: no-cache");
-        }
-        header("Content-type: image/$this->img_format");
-    }
-
-    // Adjust image quality for formats that allow this
-    function SetQuality($q) {
-        $this->quality = $q;
-    }
-
-    // Stream image to browser or to file
-    function Stream($aFile=NULL) {
-        $this->DoSupersampling();
-
-        $func="image".$this->img_format;
-        if( $this->img_format=="jpeg" && $this->quality != null ) {
-            $res = @$func($this->img,$aFile,$this->quality);
-			
-			if(!$res){
-				if($aFile != NULL){	
-                    JpGraphError::RaiseL(25107,$aFile);//("Can't write to file '$aFile'. Check that the process running PHP has enough permission.");
-				}else{
-                    JpGraphError::RaiseL(25108);//("Can't stream image. This is most likely due to a faulty PHP/GD setup. Try to recompile PHP and use the built-in GD library that comes with PHP.");
-				}
-		
-			}
-		}
-        else {
-            if( $aFile != NULL ) {
-                $res = @$func($this->img,$aFile);
-                if( !$res ) {
-                    JpGraphError::RaiseL(25107,$aFile);//("Can't write to file '$aFile'. Check that the process running PHP has enough permission.");
-                }
-            }
-            else {
-                $res = @$func($this->img);
-                if( !$res ) {
-                    JpGraphError::RaiseL(25108);//("Can't stream image. This is most likely due to a faulty PHP/GD setup. Try to recompile PHP and use the built-in GD library that comes with PHP.");
-                }
-
-            }
-        }
-    }
-
-    // Do SuperSampling using $scale
-    function DoSupersampling() {
-        if (SUPERSAMPLING_SCALE <= 1) {
-            return $this->img;
-        }
-
-        $dst_img = @imagecreatetruecolor($this->original_width, $this->original_height);
-        imagecopyresampled($dst_img, $this->img, 0, 0, 0, 0, $this->original_width, $this->original_height, $this->width, $this->height);
-        $this->Destroy();
-        return $this->img = $dst_img;
-    }
-
-    // Clear resources used by image (this is normally not used since all resources are/should be
-    // returned when the script terminates
-    function Destroy() {
-        imagedestroy($this->img);
-    }
-
-    // Specify image format. Note depending on your installation
-    // of PHP not all formats may be supported.
-    function SetImgFormat($aFormat,$aQuality=75) {
-        $this->quality = $aQuality;
-        $aFormat = strtolower($aFormat);
-        $tst = true;
-        $supported = imagetypes();
-        if( $aFormat=="auto" ) {
-            if( $supported & IMG_PNG )      $this->img_format="png";
-            elseif( $supported & IMG_JPG )  $this->img_format="jpeg";
-            elseif( $supported & IMG_GIF )  $this->img_format="gif";
-            elseif( $supported & IMG_WBMP ) $this->img_format="wbmp";
-            elseif( $supported & IMG_XPM )  $this->img_format="xpm";
-            else {
-                JpGraphError::RaiseL(25109);//("Your PHP (and GD-lib) installation does not appear to support any known graphic formats. You need to first make sure GD is compiled as a module to PHP. If you also want to use JPEG images you must get the JPEG library. Please see the PHP docs for details.");
-            }
-            return true;
-        }
-        else {
-            if( $aFormat=="jpeg" || $aFormat=="png" || $aFormat=="gif" ) {
-                if( $aFormat=="jpeg" && !($supported & IMG_JPG) )       $tst=false;
-                elseif( $aFormat=="png" && !($supported & IMG_PNG) )    $tst=false;
-                elseif( $aFormat=="gif" && !($supported & IMG_GIF) )    $tst=false;
-                elseif( $aFormat=="wbmp" && !($supported & IMG_WBMP) )  $tst=false;
-                elseif( $aFormat=="xpm" && !($supported & IMG_XPM) )    $tst=false;
-                else {
-                    $this->img_format=$aFormat;
-                    return true;
-                }
-            }
-            else {
-                $tst=false;
-            }
-            if( !$tst ) {
-                JpGraphError::RaiseL(25110,$aFormat);//(" Your PHP installation does not support the chosen graphic format: $aFormat");
-            }
-        }
-    }
-
-    /**
-    * Draw Line
-    */
-    function DrawLine($im, $x1, $y1, $x2, $y2, $weight, $color) {
-        if ($weight == 1) {
-            return imageline($im,$x1,$y1,$x2,$y2,$color);
-        }
-
-        $angle=(atan2(($y1 - $y2), ($x2 - $x1))); 
-
-        $dist_x = $weight * (sin($angle)) / 2;
-        $dist_y = $weight * (cos($angle)) / 2;
-        
-        $p1x=ceil(($x1 + $dist_x));
-        $p1y=ceil(($y1 + $dist_y));
-        $p2x=ceil(($x2 + $dist_x));
-        $p2y=ceil(($y2 + $dist_y));
-        $p3x=ceil(($x2 - $dist_x));
-        $p3y=ceil(($y2 - $dist_y));
-        $p4x=ceil(($x1 - $dist_x));
-        $p4y=ceil(($y1 - $dist_y));
-
-        $array=array($p1x,$p1y,$p2x,$p2y,$p3x,$p3y,$p4x,$p4y);
-        imagefilledpolygon ( $im, $array, (count($array)/2), $color );
-
-        // for antialias
-        imageline($im, $p1x, $p1y, $p2x, $p2y, $color);
-        imageline($im, $p3x, $p3y, $p4x, $p4y, $color);
-        return;
-
-
-
-          return imageline($this->img,$x1,$y1,$x2,$y2,$this->current_color);
-      $weight = 8;
-        if ($weight <= 1) {
-          return imageline($this->img,$x1,$y1,$x2,$y2,$this->current_color);
-        }
-
-        $pts = array();
-
-        $weight /= 2;
-
-        if ($y2 - $y1 == 0) {
-            // x line
-            $pts = array();
-            $pts[] = $x1; $pts[] = $y1 - $weight;
-            $pts[] = $x1; $pts[] = $y1 + $weight;
-            $pts[] = $x2; $pts[] = $y2 + $weight;
-            $pts[] = $x2; $pts[] = $y2 - $weight;
-
-        } elseif ($x2 - $x1 == 0) {
-            // y line
-            $pts = array();
-            $pts[] = $x1 - $weight; $pts[] = $y1;
-            $pts[] = $x1 + $weight; $pts[] = $y1;
-            $pts[] = $x2 + $weight; $pts[] = $y2;
-            $pts[] = $x2 - $weight; $pts[] = $y2;
-
-        } else {
-            
-            var_dump($x1, $x2, $y1, $y2);
-            $length = sqrt(pow($x2 - $x1, 2) + pow($y2 - $y1, 2));
-            var_dump($length);exit;
-            exit;
-  
-/*
-            $lean = ($y2 - $y1) / ($x2 - $x1);
-            $lean2 = -1 / $lean;
-            $sin = $lean / ($y2 - $y1);
-            $cos = $lean / ($x2 - $x1);
-
-            $pts[] = $x1 + (-$weight * $sin); $pts[] = $y1 + (-$weight * $cos);
-            $pts[] = $x1 + (+$weight * $sin); $pts[] = $y1 + (+$weight * $cos);
-            $pts[] = $x2 + (+$weight * $sin); $pts[] = $y2 + (+$weight * $cos);
-            $pts[] = $x2 + (-$weight * $sin); $pts[] = $y2 + (-$weight * $cos);
-*/
-        }
-
-//print_r($pts);exit;
-        if (count($pts)/2 < 3) {
-            return;
-        } 
-
-        imagesetthickness($im, 1);
-        imagefilledpolygon($im, $pts,count($pts)/2, $color);
-
-
-        $weight *= 2;
-
-//        $this->DrawImageSmoothArc($im, $x1, $y1, $weight, $weight, 0, 360, $color);
-//        $this->DrawImageSmoothArc($im, $x2, $y2, $weight, $weight, 0, 360, $color);
-    }
-
-
-    function DrawImageSmoothArc($im, $xc, $yc, $w, $h, $s, $e, $color, $style = null) {
-        $tmp = $s;
-        $s = (360 - $e) / 180 * M_PI;
-        $e = (360 - $tmp) / 180 * M_PI;
-        return imageSmoothArc($im, round($xc), round($yc), round($w), round($h), $this->CreateColorForImageSmoothArc($color), $s, $e);
-    }
-
-    function CreateColorForImageSmoothArc($color) {
-        $alpha = $color >> 24 & 0xFF; 
-        $red   = $color >> 16 & 0xFF;
-        $green = $color >> 8 & 0xFF;
-        $blue  = $color & 0xFF;
-
-//var_dump($alpha, $red, $green, $blue);exit;
-
-        return array($red, $green, $blue, $alpha);
-    }
-
-    function imageSmoothCircle( &$img, $cx, $cy, $cr, $color ) {
-        $ir = $cr;
-        $ix = 0;
-        $iy = $ir;
-        $ig = 2 * $ir - 3;
-        $idgr = -6;
-        $idgd = 4 * $ir - 10;
-        $fill = imageColorExactAlpha( $img, $color[ 'R' ], $color[ 'G' ], $color[ 'B' ], 0 );
-        imageLine( $img, $cx + $cr - 1, $cy, $cx, $cy, $fill );
-        imageLine( $img, $cx - $cr + 1, $cy, $cx - 1, $cy, $fill );
-        imageLine( $img, $cx, $cy + $cr - 1, $cx, $cy + 1, $fill );
-        imageLine( $img, $cx, $cy - $cr + 1, $cx, $cy - 1, $fill );
-        $draw = imageColorExactAlpha( $img, $color[ 'R' ], $color[ 'G' ], $color[ 'B' ], 42 );
-        imageSetPixel( $img, $cx + $cr, $cy, $draw );
-        imageSetPixel( $img, $cx - $cr, $cy, $draw );
-        imageSetPixel( $img, $cx, $cy + $cr, $draw );
-        imageSetPixel( $img, $cx, $cy - $cr, $draw );
-        while ( $ix <= $iy - 2 ) {
-            if ( $ig < 0 ) {
-                $ig += $idgd;
-                $idgd -= 8;
-                $iy--;
-            } else {
-                $ig += $idgr;
-                $idgd -= 4;
-            }
-            $idgr -= 4;
-            $ix++;
-            imageLine( $img, $cx + $ix, $cy + $iy - 1, $cx + $ix, $cy + $ix, $fill );
-            imageLine( $img, $cx + $ix, $cy - $iy + 1, $cx + $ix, $cy - $ix, $fill );
-            imageLine( $img, $cx - $ix, $cy + $iy - 1, $cx - $ix, $cy + $ix, $fill );
-            imageLine( $img, $cx - $ix, $cy - $iy + 1, $cx - $ix, $cy - $ix, $fill );
-            imageLine( $img, $cx + $iy - 1, $cy + $ix, $cx + $ix, $cy + $ix, $fill );
-            imageLine( $img, $cx + $iy - 1, $cy - $ix, $cx + $ix, $cy - $ix, $fill );
-            imageLine( $img, $cx - $iy + 1, $cy + $ix, $cx - $ix, $cy + $ix, $fill );
-            imageLine( $img, $cx - $iy + 1, $cy - $ix, $cx - $ix, $cy - $ix, $fill );
-            $filled = 0;
-            for ( $xx = $ix - 0.45; $xx < $ix + 0.5; $xx += 0.2 ) {
-                for ( $yy = $iy - 0.45; $yy < $iy + 0.5; $yy += 0.2 ) {
-                    if ( sqrt( pow( $xx, 2 ) + pow( $yy, 2 ) ) < $cr ) $filled += 4;
-                }
-            }
-            $draw = imageColorExactAlpha( $img, $color[ 'R' ], $color[ 'G' ], $color[ 'B' ], ( 100 - $filled ) );
-            imageSetPixel( $img, $cx + $ix, $cy + $iy, $draw );
-            imageSetPixel( $img, $cx + $ix, $cy - $iy, $draw );
-            imageSetPixel( $img, $cx - $ix, $cy + $iy, $draw );
-            imageSetPixel( $img, $cx - $ix, $cy - $iy, $draw );
-            imageSetPixel( $img, $cx + $iy, $cy + $ix, $draw );
-            imageSetPixel( $img, $cx + $iy, $cy - $ix, $draw );
-            imageSetPixel( $img, $cx - $iy, $cy + $ix, $draw );
-            imageSetPixel( $img, $cx - $iy, $cy - $ix, $draw );
-        }
-    }
-
-    function __get($name) {
-
-        if (strpos($name, 'raw_') !== false) {
-            // if $name == 'raw_left_margin' , return $this->_left_margin;
-            $variable_name = '_' . str_replace('raw_', '', $name);
-            return $this->$variable_name;
-        }
-
-        $variable_name = '_' . $name; 
-
-        if (isset($this->$variable_name)) {
-            return $this->$variable_name * SUPERSAMPLING_SCALE;
-        } else {
-            JpGraphError::RaiseL('25132', $name);
-        } 
-    }
-
-    function __set($name, $value) {
-        $this->{'_'.$name} = $value;
-    }
-
-} // CLASS
-
-//===================================================
-// CLASS RotImage
-// Description: Exactly as Image but draws the image at
-// a specified angle around a specified rotation point.
-//===================================================
-class RotImage extends Image {
-    public $a=0;
-    public $dx=0,$dy=0,$transx=0,$transy=0;
-    private $m=array();
-
-    function __construct($aWidth,$aHeight,$a=0,$aFormat=DEFAULT_GFORMAT,$aSetAutoMargin=true) {
-        parent::__construct($aWidth,$aHeight,$aFormat,$aSetAutoMargin);
-        $this->dx=$this->left_margin+$this->plotwidth/2;
-        $this->dy=$this->top_margin+$this->plotheight/2;
-        $this->SetAngle($a);
-    }
-
-    function SetCenter($dx,$dy) {
-        $old_dx = $this->dx;
-        $old_dy = $this->dy;
-        $this->dx=$dx;
-        $this->dy=$dy;
-        $this->SetAngle($this->a);
-        return array($old_dx,$old_dy);
-    }
-
-    function SetTranslation($dx,$dy) {
-        $old = array($this->transx,$this->transy);
-        $this->transx = $dx;
-        $this->transy = $dy;
-        return $old;
-    }
-
-    function UpdateRotMatrice()  {
-        $a = $this->a;
-        $a *= M_PI/180;
-        $sa=sin($a); $ca=cos($a);
-        // Create the rotation matrix
-        $this->m[0][0] = $ca;
-        $this->m[0][1] = -$sa;
-        $this->m[0][2] = $this->dx*(1-$ca) + $sa*$this->dy ;
-        $this->m[1][0] = $sa;
-        $this->m[1][1] = $ca;
-        $this->m[1][2] = $this->dy*(1-$ca) - $sa*$this->dx ;
-    }
-
-    function SetAngle($a) {
-        $tmp = $this->a;
-        $this->a = $a;
-        $this->UpdateRotMatrice();
-        return $tmp;
-    }
-
-    function Circle($xc,$yc,$r) {
-        list($xc,$yc) = $this->Rotate($xc,$yc);
-        parent::Circle($xc,$yc,$r);
-    }
-
-    function FilledCircle($xc,$yc,$r) {
-        list($xc,$yc) = $this->Rotate($xc,$yc);
-        parent::FilledCircle($xc,$yc,$r);
-    }
-
-
-    function Arc($xc,$yc,$w,$h,$s,$e) {
-        list($xc,$yc) = $this->Rotate($xc,$yc);
-        $s += $this->a;
-        $e += $this->a;
-        parent::Arc($xc,$yc,$w,$h,$s,$e);
-    }
-
-    function FilledArc($xc,$yc,$w,$h,$s,$e,$style='') {
-        list($xc,$yc) = $this->Rotate($xc,$yc);
-        $s += $this->a;
-        $e += $this->a;
-        parent::FilledArc($xc,$yc,$w,$h,$s,$e);
-    }
-
-    function SetMargin($lm,$rm,$tm,$bm) {
-        parent::SetMargin($lm,$rm,$tm,$bm);
-        $this->dx=$this->left_margin+$this->plotwidth/2;
-        $this->dy=$this->top_margin+$this->plotheight/2;
-        $this->UpdateRotMatrice();
-    }
-
-    function Rotate($x,$y) {
-        // Optimization. Ignore rotation if Angle==0 || Angle==360
-        if( $this->a == 0 || $this->a == 360 ) {
-            return array($x + $this->transx, $y + $this->transy );
-        }
-        else {
-            $x1=round($this->m[0][0]*$x + $this->m[0][1]*$y,1) + $this->m[0][2] + $this->transx;
-            $y1=round($this->m[1][0]*$x + $this->m[1][1]*$y,1) + $this->m[1][2] + $this->transy;
-            return array($x1,$y1);
-        }
-    }
-
-    function CopyMerge($fromImg,$toX,$toY,$fromX,$fromY,$toWidth,$toHeight,$fromWidth=-1,$fromHeight=-1,$aMix=100) {
-        list($toX,$toY) = $this->Rotate($toX,$toY);
-        parent::CopyMerge($fromImg,$toX,$toY,$fromX,$fromY,$toWidth,$toHeight,$fromWidth,$fromHeight,$aMix);
-
-    }
-
-    function ArrRotate($pnts) {
-        $n = count($pnts)-1;
-        for($i=0; $i < $n; $i+=2) {
-            list ($x,$y) = $this->Rotate($pnts[$i],$pnts[$i+1]);
-            $pnts[$i] = $x; $pnts[$i+1] = $y;
-        }
-        return $pnts;
-    }
-
-    function DashedLine($x1,$y1,$x2,$y2,$dash_length=1,$dash_space=4) {
-        list($x1,$y1) = $this->Rotate($x1,$y1);
-        list($x2,$y2) = $this->Rotate($x2,$y2);
-        parent::DashedLine($x1,$y1,$x2,$y2,$dash_length,$dash_space);
-    }
-
-    function Line($x1,$y1,$x2,$y2) {
-        list($x1,$y1) = $this->Rotate($x1,$y1);
-        list($x2,$y2) = $this->Rotate($x2,$y2);
-        parent::Line($x1,$y1,$x2,$y2);
-    }
-
-    function Rectangle($x1,$y1,$x2,$y2) {
-        // Rectangle uses Line() so it will be rotated through that call
-        parent::Rectangle($x1,$y1,$x2,$y2);
-    }
-
-    function FilledRectangle($x1,$y1,$x2,$y2) {
-        if( $y1==$y2 || $x1==$x2 )
-        $this->Line($x1,$y1,$x2,$y2);
-        else
-        $this->FilledPolygon(array($x1,$y1,$x2,$y1,$x2,$y2,$x1,$y2));
-    }
-
-    function Polygon($pnts,$closed=FALSE,$fast=FALSE) {
-        // Polygon uses Line() so it will be rotated through that call unless
-        // fast drawing routines are used in which case a rotate is needed
-        if( $fast ) {
-            parent::Polygon($this->ArrRotate($pnts));
-        }
-        else {
-            parent::Polygon($pnts,$closed,$fast);
-        }
-    }
-
-    function FilledPolygon($pnts) {
-        parent::FilledPolygon($this->ArrRotate($pnts));
-    }
-
-    function Point($x,$y) {
-        list($xp,$yp) = $this->Rotate($x,$y);
-        parent::Point($xp,$yp);
-    }
-
-    function StrokeText($x,$y,$txt,$dir=0,$paragraph_align="left",$debug=false) {
-        list($xp,$yp) = $this->Rotate($x,$y);
-        return parent::StrokeText($xp,$yp,$txt,$dir,$paragraph_align,$debug);
-    }
-}
-
-//=======================================================================
-// CLASS ImgStreamCache
-// Description: Handle caching of graphs to files. All image output goes
-//              through this class
-//=======================================================================
-class ImgStreamCache {
-    private $cache_dir, $timeout=0;  // Infinite timeout
-    //---------------
-    // CONSTRUCTOR
-    function __construct($aCacheDir=CACHE_DIR) {
-        $this->cache_dir = $aCacheDir;
-    }
-
-    //---------------
-    // PUBLIC METHODS
-
-    // Specify a timeout (in minutes) for the file. If the file is older then the
-    // timeout value it will be overwritten with a newer version.
-    // If timeout is set to 0 this is the same as infinite large timeout and if
-    // timeout is set to -1 this is the same as infinite small timeout
-    function SetTimeout($aTimeout) {
-        $this->timeout=$aTimeout;
-    }
-
-    // Output image to browser and also write it to the cache
-    function PutAndStream($aImage,$aCacheFileName,$aInline,$aStrokeFileName) {
-
-        // Check if we should always stroke the image to a file
-        if( _FORCE_IMGTOFILE ) {
-            $aStrokeFileName = _FORCE_IMGDIR.GenImgName();
-        }
-
-        if( $aStrokeFileName != '' ) {
-
-            if( $aStrokeFileName == 'auto' ) {
-                $aStrokeFileName = GenImgName();
-            }
-
-            if( file_exists($aStrokeFileName) ) {
-
-                // Wait for lock (to make sure no readers are trying to access the image)
-                $fd = fopen($aStrokeFileName,'w');
-                $lock = flock($fd, LOCK_EX);
-
-                // Since the image write routines only accepts a filename which must not
-                // exist we need to delete the old file first
-                if( !@unlink($aStrokeFileName) ) {
-                    $lock = flock($fd, LOCK_UN);
-                    JpGraphError::RaiseL(25111,$aStrokeFileName);
-                    //(" Can't delete cached image $aStrokeFileName. Permission problem?");
-                }
-                $aImage->Stream($aStrokeFileName);
-                $lock = flock($fd, LOCK_UN);
-                fclose($fd);
-
-            }
-            else {
-                $aImage->Stream($aStrokeFileName);
-            }
-
-            return;
-        }
-
-        if( $aCacheFileName != '' && USE_CACHE) {
-
-            $aCacheFileName = $this->cache_dir . $aCacheFileName;
-            if( file_exists($aCacheFileName) ) {
-                if( !$aInline ) {
-                    // If we are generating image off-line (just writing to the cache)
-                    // and the file exists and is still valid (no timeout)
-                    // then do nothing, just return.
-                    $diff=time()-filemtime($aCacheFileName);
-                    if( $diff < 0 ) {
-                        JpGraphError::RaiseL(25112,$aCacheFileName);
-                        //(" Cached imagefile ($aCacheFileName) has file date in the future!!");
-                    }
-                    if( $this->timeout>0 && ($diff <= $this->timeout*60) ) return;
-                }
-
-                // Wait for lock (to make sure no readers are trying to access the image)
-                $fd = fopen($aCacheFileName,'w');
-                $lock = flock($fd, LOCK_EX);
-
-                if( !@unlink($aCacheFileName) ) {
-                    $lock = flock($fd, LOCK_UN);
-                    JpGraphError::RaiseL(25113,$aStrokeFileName);
-                    //(" Can't delete cached image $aStrokeFileName. Permission problem?");
-                }
-                $aImage->Stream($aCacheFileName);
-                $lock = flock($fd, LOCK_UN);
-                fclose($fd);
-
-            }
-            else {
-                $this->MakeDirs(dirname($aCacheFileName));
-                if( !is_writeable(dirname($aCacheFileName)) ) {
-                    JpGraphError::RaiseL(25114,$aCacheFileName);
-                    //('PHP has not enough permissions to write to the cache file '.$aCacheFileName.'. Please make sure that the user running PHP has write permission for this file if you wan to use the cache system with JpGraph.');
-                }
-                $aImage->Stream($aCacheFileName);
-            }
-
-            $res=true;
-            // Set group to specified
-            if( CACHE_FILE_GROUP != '' ) {
-                $res = @chgrp($aCacheFileName,CACHE_FILE_GROUP);
-            }
-            if( CACHE_FILE_MOD != '' ) {
-                $res = @chmod($aCacheFileName,CACHE_FILE_MOD);
-            }
-            if( !$res ) {
-                JpGraphError::RaiseL(25115,$aStrokeFileName);
-                //(" Can't set permission for cached image $aStrokeFileName. Permission problem?");
-            }
-
-            $aImage->Destroy();
-            if( $aInline ) {
-                if ($fh = @fopen($aCacheFileName, "rb") ) {
-                    $aImage->Headers();
-                    fpassthru($fh);
-                    return;
-                }
-                else {
-                    JpGraphError::RaiseL(25116,$aFile);//(" Cant open file from cache [$aFile]");
-                }
-            }
-        }
-        elseif( $aInline ) {
-            $aImage->Headers();
-            $aImage->Stream();
-            return;
-        }
-    }
-
-    function IsValid($aCacheFileName) {
-        $aCacheFileName = $this->cache_dir.$aCacheFileName;
-        if ( USE_CACHE && file_exists($aCacheFileName) ) {
-            $diff=time()-filemtime($aCacheFileName);
-            if( $this->timeout>0 && ($diff > $this->timeout*60) ) {
-                return false;
-            }
-            else {
-                return true;
-            }
-        }
-        else {
-            return false;
-        }
-    }
-
-    function StreamImgFile($aImage,$aCacheFileName) {
-        $aCacheFileName = $this->cache_dir.$aCacheFileName;
-        if ( $fh = @fopen($aCacheFileName, 'rb') ) {
-            $lock = flock($fh, LOCK_SH);
-            $aImage->Headers();
-            fpassthru($fh);
-            $lock = flock($fh, LOCK_UN);
-            fclose($fh);
-            return true;
-        }
-        else {
-            JpGraphError::RaiseL(25117,$aCacheFileName);//(" Can't open cached image \"$aCacheFileName\" for reading.");
-        }
-    }
-
-    // Check if a given image is in cache and in that case
-    // pass it directly on to web browser. Return false if the
-    // image file doesn't exist or exists but is to old
-    function GetAndStream($aImage,$aCacheFileName) {
-        if( $this->Isvalid($aCacheFileName) ) {
-            $this->StreamImgFile($aImage,$aCacheFileName);
-        }
-        else {
-            return false;
-        }
-    }
-
-    //---------------
-    // PRIVATE METHODS
-    // Create all necessary directories in a path
-    function MakeDirs($aFile) {
-        $dirs = array();
-        // In order to better work when open_basedir is enabled
-        // we do not create directories in the root path
-        while ( $aFile != '/' && !(file_exists($aFile)) ) {
-            $dirs[] = $aFile.'/';
-            $aFile = dirname($aFile);
-        }
-        for ($i = sizeof($dirs)-1; $i>=0; $i--) {
-            if(! @mkdir($dirs[$i],0777) ) {
-                JpGraphError::RaiseL(25118,$aFile);//(" Can't create directory $aFile. Make sure PHP has write permission to this directory.");
-            }
-            // We also specify mode here after we have changed group.
-            // This is necessary if Apache user doesn't belong the
-            // default group and hence can't specify group permission
-            // in the previous mkdir() call
-            if( CACHE_FILE_GROUP != "" ) {
-                $res=true;
-                $res =@chgrp($dirs[$i],CACHE_FILE_GROUP);
-                $res = @chmod($dirs[$i],0777);
-                if( !$res ) {
-                    JpGraphError::RaiseL(25119,$aFile);//(" Can't set permissions for $aFile. Permission problems?");
-                }
-            }
-        }
-        return true;
-    }
-} // CLASS Cache
-
-?>
diff --git a/#jpgraph/src/imageSmoothArc.php b/#jpgraph/src/imageSmoothArc.php
deleted file mode 100644
index a1d581ff..00000000
--- a/#jpgraph/src/imageSmoothArc.php
+++ /dev/null
@@ -1,344 +0,0 @@
-<?php
-
-/*
-    
-    Copyright (c) 2006-2008 Ulrich Mierendorff
-
-    Permission is hereby granted, free of charge, to any person obtaining a
-    copy of this software and associated documentation files (the "Software"),
-    to deal in the Software without restriction, including without limitation
-    the rights to use, copy, modify, merge, publish, distribute, sublicense,
-    and/or sell copies of the Software, and to permit persons to whom the
-    Software is furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in
-    all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-    DEALINGS IN THE SOFTWARE.
-    
-    Changelog:
-    version 1.1
-        - improved the rendering speed by ~20%
-        
-        - Thanks to Matthias Mächler for fixing some small errors:
-            * uninitialized variables
-            * deprecated passing of $img reference in imageSmoothArc ()
-    
-    version 1.0
-        Release of rewritten script
-
-*/
-
-function imageSmoothArcDrawSegment (&$img, $cx, $cy, $a, $b, $aaAngleX, $aaAngleY, $color, $start, $stop, $seg)
-{
-    // Originally written from scratch by Ulrich Mierendorff, 06/2006
-    // Rewritten and improved, 04/2007, 07/2007
-    
-    // Please do not use THIS function directly. Scroll down to imageSmoothArc(...).
-    
-    $fillColor = imageColorExactAlpha( $img, $color[0], $color[1], $color[2], $color[3] );
-    
-    $xStart = abs($a * cos($start));
-    $yStart = abs($b * sin($start));
-    $xStop  = abs($a * cos($stop));
-    $yStop  = abs($b * sin($stop));
-    $dxStart = 0;
-    $dyStart = 0;
-    $dxStop = 0;
-    $dyStop = 0;
-    if ($xStart != 0)
-        $dyStart = $yStart/$xStart;
-    if ($xStop != 0)
-        $dyStop = $yStop/$xStop;
-    if ($yStart != 0)
-        $dxStart = $xStart/$yStart;
-    if ($yStop != 0)
-        $dxStop = $xStop/$yStop;
-    if (abs($xStart) >= abs($yStart)) {
-        $aaStartX = true;
-    } else {
-        $aaStartX = false;
-    }
-    if ($xStop >= $yStop) {
-        $aaStopX = true;
-    } else {
-        $aaStopX = false;
-    }
-    //$xp = +1; $yp = -1; $xa = +1; $ya = 0;
-    for ( $x = 0; $x < $a; $x += 1 ) {
-        /*$y = $b * sqrt( 1 - ($x*$x)/($a*$a) );
-        
-        $error = $y - (int)($y);
-        $y = (int)($y);
-        
-        $diffColor = imageColorExactAlpha( $img, $color[0], $color[1], $color[2], 127-(127-$color[3])*$error );*/
-        
-        $_y1 = $dyStop*$x;
-        $_y2 = $dyStart*$x;
-        if ($xStart > $xStop)
-        {
-            $error1 = $_y1 - (int)($_y1);
-            $error2 = 1 - $_y2 + (int)$_y2;
-            $_y1 = $_y1-$error1;
-            $_y2 = $_y2+$error2;
-        }
-        else
-        {
-            $error1 = 1 - $_y1 + (int)$_y1;
-            $error2 = $_y2 - (int)($_y2);
-            $_y1 = $_y1+$error1;
-            $_y2 = $_y2-$error2;
-        }
-        /*
-        if ($aaStopX)
-            $diffColor1 = imageColorExactAlpha( $img, $color[0], $color[1], $color[2], 127-(127-$color[3])*$error1 );
-        if ($aaStartX)
-            $diffColor2 = imageColorExactAlpha( $img, $color[0], $color[1], $color[2], 127-(127-$color[3])*$error2 );
-        */
-        
-        if ($seg == 0 || $seg == 2)
-        {
-            $i = $seg;
-            if (!($start > $i*M_PI/2 && $x > $xStart)) {
-                if ($i == 0) {
-                    $xp = +1; $yp = -1; $xa = +1; $ya = 0;
-                } else {
-                    $xp = -1; $yp = +1; $xa = 0; $ya = +1;
-                }
-                if ( $stop < ($i+1)*(M_PI/2) && $x <= $xStop ) {
-                    $diffColor1 = imageColorExactAlpha( $img, $color[0], $color[1], $color[2], 127-(127-$color[3])*$error1 );
-                    $y1 = $_y1; if ($aaStopX) imageSetPixel($img, $cx+$xp*($x)+$xa, $cy+$yp*($y1+1)+$ya, $diffColor1);
-                    
-                } else {
-                    $y = $b * sqrt( 1 - ($x*$x)/($a*$a) );
-                    $error = $y - (int)($y);
-                    $y = (int)($y);
-                    $diffColor = imageColorExactAlpha( $img, $color[0], $color[1], $color[2], 127-(127-$color[3])*$error );
-                    $y1 = $y; if ($x < $aaAngleX ) imageSetPixel($img, $cx+$xp*$x+$xa, $cy+$yp*($y1+1)+$ya, $diffColor);
-                }
-                if ($start > $i*M_PI/2 && $x <= $xStart) {
-                    $diffColor2 = imageColorExactAlpha( $img, $color[0], $color[1], $color[2], 127-(127-$color[3])*$error2 );
-                    $y2 = $_y2; if ($aaStartX) imageSetPixel($img, $cx+$xp*$x+$xa, $cy+$yp*($y2-1)+$ya, $diffColor2);
-                } else {
-                    $y2 = 0;
-                }
-                if ($y2 <= $y1) imageLine($img, $cx+$xp*$x+$xa, $cy+$yp*$y1+$ya , $cx+$xp*$x+$xa, $cy+$yp*$y2+$ya, $fillColor);
-            }
-        }
-        
-        if ($seg == 1 || $seg == 3)
-        {
-            $i = $seg;
-            if (!($stop < ($i+1)*M_PI/2 && $x > $xStop)) {
-                if ($i == 1) {
-                    $xp = -1; $yp = -1; $xa = 0; $ya = 0;
-                } else {
-                    $xp = +1; $yp = +1; $xa = 1; $ya = 1;
-                }
-                if ( $start > $i*M_PI/2 && $x < $xStart ) {
-                    $diffColor2 = imageColorExactAlpha( $img, $color[0], $color[1], $color[2], 127-(127-$color[3])*$error2 );
-                    $y1 = $_y2; if ($aaStartX) imageSetPixel($img, $cx+$xp*$x+$xa, $cy+$yp*($y1+1)+$ya, $diffColor2);
-                    
-                } else {
-                    $y = $b * sqrt( 1 - ($x*$x)/($a*$a) );
-                    $error = $y - (int)($y);
-                    $y = (int) $y;
-                    $diffColor = imageColorExactAlpha( $img, $color[0], $color[1], $color[2], 127-(127-$color[3])*$error );
-                    $y1 = $y; if ($x < $aaAngleX ) imageSetPixel($img, $cx+$xp*$x+$xa, $cy+$yp*($y1+1)+$ya, $diffColor);
-                }
-                if ($stop < ($i+1)*M_PI/2 && $x <= $xStop) {
-                    $diffColor1 = imageColorExactAlpha( $img, $color[0], $color[1], $color[2], 127-(127-$color[3])*$error1 );
-                    $y2 = $_y1; if ($aaStopX)  imageSetPixel($img, $cx+$xp*$x+$xa, $cy+$yp*($y2-1)+$ya, $diffColor1);
-                } else {
-                    $y2 = 0;
-                }
-                if ($y2 <= $y1) imageLine($img, $cx+$xp*$x+$xa, $cy+$yp*$y1+$ya, $cx+$xp*$x+$xa, $cy+$yp*$y2+$ya, $fillColor);
-            }
-        }
-    }
-    
-    ///YYYYY
-    
-    for ( $y = 0; $y < $b; $y += 1 ) {
-        /*$x = $a * sqrt( 1 - ($y*$y)/($b*$b) );
-        
-        $error = $x - (int)($x);
-        $x = (int)($x);
-        
-        $diffColor = imageColorExactAlpha( $img, $color[0], $color[1], $color[2], 127-(127-$color[3])*$error );
-        */
-        $_x1 = $dxStop*$y;
-        $_x2 = $dxStart*$y;
-        if ($yStart > $yStop)
-        {
-            $error1 = $_x1 - (int)($_x1);
-            $error2 = 1 - $_x2 + (int)$_x2;
-            $_x1 = $_x1-$error1;
-            $_x2 = $_x2+$error2;
-        }
-        else
-        {
-            $error1 = 1 - $_x1 + (int)$_x1;
-            $error2 = $_x2 - (int)($_x2);
-            $_x1 = $_x1+$error1;
-            $_x2 = $_x2-$error2;
-        }
-/*
-        if (!$aaStopX)
-            $diffColor1 = imageColorExactAlpha( $img, $color[0], $color[1], $color[2], 127-(127-$color[3])*$error1 );
-        if (!$aaStartX)
-            $diffColor2 = imageColorExactAlpha( $img, $color[0], $color[1], $color[2], 127-(127-$color[3])*$error2 );
-*/
-        
-        if ($seg == 0 || $seg == 2)
-        {
-            $i = $seg;
-            if (!($start > $i*M_PI/2 && $y > $yStop)) {
-                if ($i == 0) {
-                    $xp = +1; $yp = -1; $xa = 1; $ya = 0;
-                } else {
-                    $xp = -1; $yp = +1; $xa = 0; $ya = 1;
-                }
-                if ( $stop < ($i+1)*(M_PI/2) && $y <= $yStop ) {
-                    $diffColor1 = imageColorExactAlpha( $img, $color[0], $color[1], $color[2], 127-(127-$color[3])*$error1 );
-                    $x1 = $_x1; if (!$aaStopX) imageSetPixel($img, $cx+$xp*($x1-1)+$xa, $cy+$yp*($y)+$ya, $diffColor1);
-                } 
-                if ($start > $i*M_PI/2 && $y < $yStart) {
-                    $diffColor2 = imageColorExactAlpha( $img, $color[0], $color[1], $color[2], 127-(127-$color[3])*$error2 );
-                    $x2 = $_x2; if (!$aaStartX) imageSetPixel($img, $cx+$xp*($x2+1)+$xa, $cy+$yp*($y)+$ya, $diffColor2);
-                } else {
-                    $x = $a * sqrt( 1 - ($y*$y)/($b*$b) );
-                    $error = $x - (int)($x);
-                    $x = (int)($x);
-                    $diffColor = imageColorExactAlpha( $img, $color[0], $color[1], $color[2], 127-(127-$color[3])*$error );
-                    $x1 = $x; if ($y < $aaAngleY && $y <= $yStop ) imageSetPixel($img, $cx+$xp*($x1+1)+$xa, $cy+$yp*$y+$ya, $diffColor);
-                }
-            }
-        }
-        
-        if ($seg == 1 || $seg == 3)
-        {
-            $i = $seg;
-            if (!($stop < ($i+1)*M_PI/2 && $y > $yStart)) {
-                if ($i == 1) {
-                    $xp = -1; $yp = -1; $xa = 0; $ya = 0;
-                } else {
-                    $xp = +1; $yp = +1; $xa = 1; $ya = 1;
-                }
-                if ( $start > $i*M_PI/2 && $y < $yStart ) {
-                    $diffColor2 = imageColorExactAlpha( $img, $color[0], $color[1], $color[2], 127-(127-$color[3])*$error2 );
-                    $x1 = $_x2; if (!$aaStartX) imageSetPixel($img, $cx+$xp*($x1-1)+$xa, $cy+$yp*$y+$ya,  $diffColor2);
-                } 
-                if ($stop < ($i+1)*M_PI/2 && $y <= $yStop) {
-                    $diffColor1 = imageColorExactAlpha( $img, $color[0], $color[1], $color[2], 127-(127-$color[3])*$error1 );
-                    $x2 = $_x1; if (!$aaStopX)  imageSetPixel($img, $cx+$xp*($x2+1)+$xa, $cy+$yp*$y+$ya, $diffColor1);
-                } else {
-                    $x = $a * sqrt( 1 - ($y*$y)/($b*$b) );
-                    $error = $x - (int)($x);
-                    $x = (int)($x);
-                    $diffColor = imageColorExactAlpha( $img, $color[0], $color[1], $color[2], 127-(127-$color[3])*$error );
-                    $x1 = $x; if ($y < $aaAngleY  && $y < $yStart) imageSetPixel($img,$cx+$xp*($x1+1)+$xa,  $cy+$yp*$y+$ya, $diffColor);
-                }
-            }
-        }
-    }
-}
-
-
-function imageSmoothArc ( &$img, $cx, $cy, $w, $h, $color, $start, $stop)
-{
-    // Originally written from scratch by Ulrich Mierendorff, 06/2006
-    // Rewritten and improved, 04/2007, 07/2007
-    // compared to old version:
-    // + Support for transparency added
-    // + Improved quality of edges & antialiasing
-    
-    // note: This function does not represent the fastest way to draw elliptical
-    // arcs. It was written without reading any papers on that subject. Better
-    // algorithms may be twice as fast or even more.
-    
-    // what it cannot do: It does not support outlined arcs, only filled
-    
-    // Parameters:
-    // $cx      - Center of ellipse, X-coord
-    // $cy      - Center of ellipse, Y-coord
-    // $w       - Width of ellipse ($w >= 2)
-    // $h       - Height of ellipse ($h >= 2 )
-    // $color   - Color of ellipse as a four component array with RGBA
-    // $start   - Starting angle of the arc, no limited range!
-    // $stop    - Stop     angle of the arc, no limited range!
-    // $start _can_ be greater than $stop!
-    // If any value is not in the given range, results are undefined!
-    
-    // This script does not use any special algorithms, everything is completely
-    // written from scratch; see http://de.wikipedia.org/wiki/Ellipse for formulas.
-    
-    while ($start < 0)
-        $start += 2*M_PI;
-    while ($stop < 0)
-        $stop += 2*M_PI;
-    
-    while ($start > 2*M_PI)
-        $start -= 2*M_PI;
-    
-    while ($stop > 2*M_PI)
-        $stop -= 2*M_PI;
-    
-    
-    if ($start > $stop)
-    {
-        imageSmoothArc ( $img, $cx, $cy, $w, $h, $color, $start, 2*M_PI);
-        imageSmoothArc ( $img, $cx, $cy, $w, $h, $color, 0, $stop);
-        return;
-    }
-    
-    $a = 1.0*round ($w/2);
-    $b = 1.0*round ($h/2);
-    $cx = 1.0*round ($cx);
-    $cy = 1.0*round ($cy);
-    
-    $aaAngle = atan(($b*$b)/($a*$a)*tan(0.25*M_PI));
-    $aaAngleX = $a*cos($aaAngle);
-    $aaAngleY = $b*sin($aaAngle);
-    
-    $a -= 0.5; // looks better...
-    $b -= 0.5;
-    
-    for ($i=0; $i<4;$i++)
-    {
-        if ($start < ($i+1)*M_PI/2)
-        {
-            if ($start > $i*M_PI/2)
-            {
-                if ($stop > ($i+1)*M_PI/2)
-                {
-                    imageSmoothArcDrawSegment($img, $cx, $cy, $a, $b, $aaAngleX, $aaAngleY , $color, $start, ($i+1)*M_PI/2, $i);
-                }
-                else
-                {
-                    imageSmoothArcDrawSegment($img, $cx, $cy, $a, $b, $aaAngleX, $aaAngleY, $color, $start, $stop, $i);
-                    break;
-                }
-            }
-            else
-            {
-                if ($stop > ($i+1)*M_PI/2)
-                {
-                    imageSmoothArcDrawSegment($img, $cx, $cy, $a, $b, $aaAngleX, $aaAngleY, $color, $i*M_PI/2, ($i+1)*M_PI/2, $i);
-                }
-                else
-                {
-                    imageSmoothArcDrawSegment($img, $cx, $cy, $a, $b, $aaAngleX, $aaAngleY, $color, $i*M_PI/2, $stop, $i);
-                    break;
-                }
-            }
-        }
-    }
-}
-?>
diff --git a/#jpgraph/src/imgdata_balls.inc.php b/#jpgraph/src/imgdata_balls.inc.php
deleted file mode 100644
index ee5db492..00000000
--- a/#jpgraph/src/imgdata_balls.inc.php
+++ /dev/null
@@ -1,1061 +0,0 @@
-<?php
-//=======================================================================
-// File:        IMGDATA_ROUNDBALLS.INC
-// Description: Base64 encoded images for small round markers
-// Created:     2003-03-20
-// Ver:         $Id: imgdata_balls.inc.php 1106 2009-02-22 20:16:35Z ljp $
-//
-// Copyright (c) Asial Corporation. All rights reserved.
-//========================================================================
-
-class ImgData_Balls extends ImgData {
-    protected $name = 'Round Balls';
-    protected $an = array(MARK_IMG_LBALL => 'imgdata_large',
-    MARK_IMG_MBALL => 'imgdata_small',
-    MARK_IMG_SBALL => 'imgdata_xsmall',
-    MARK_IMG_BALL => 'imgdata_xsmall');
-    protected $colors,$index,$maxidx;
-    private $colors_1 = array('blue','lightblue','brown','darkgreen',
-         'green','purple','red','gray','yellow','silver','gray');
-    private $index_1  = array('blue'=>9,'lightblue'=>1,'brown'=>6,'darkgreen'=>7,
-         'green'=>8,'purple'=>4,'red'=>0,'gray'=>5,'silver'=>3,'yellow'=>2);
-    private $maxidx_1 = 9 ;
-
-    private $colors_2 = array('blue','bluegreen','brown','cyan',
-     'darkgray','greengray','gray','green',
-     'greenblue','lightblue','lightred',
-     'purple','red','white','yellow');
-     
-
-    private $index_2 =  array('blue'=>9,'bluegreen'=>13,'brown'=>8,'cyan'=>12,
-     'darkgray'=>5,'greengray'=>6,'gray'=>2,'green'=>10,
-     'greenblue'=>3,'lightblue'=>1,'lightred'=>14,
-     'purple'=>7,'red'=>0,'white'=>11,'yellow'=>4);
-     
-    private $maxidx_2 = 14 ;
-
-
-    private $colors_3 = array('bluegreen','cyan','darkgray','greengray',
-     'gray','graypurple','green','greenblue','lightblue',
-     'lightred','navy','orange','purple','red','yellow');
-
-    private $index_3 = array('bluegreen'=>1,'cyan'=>11,'darkgray'=>14,'greengray'=>10,
-    'gray'=>3,'graypurple'=>4,'green'=>9,'greenblue'=>7,
-    'lightblue'=>13,'lightred'=>0,'navy'=>2,'orange'=>12,
-    'purple'=>8,'red'=>5,'yellow'=>6);
-    private $maxidx_3 = 14 ;
-
-    protected $imgdata_large, $imgdata_small, $imgdata_xsmall ;
-
-
-    function GetImg($aMark,$aIdx) {
-        switch( $aMark ) {
-            case MARK_IMG_SBALL:
-            case MARK_IMG_BALL:
-                $this->colors = $this->colors_3;
-                $this->index = $this->index_3 ;
-                $this->maxidx = $this->maxidx_3 ;
-                break;
-            case MARK_IMG_MBALL:
-                $this->colors = $this->colors_2;
-                $this->index = $this->index_2 ;
-                $this->maxidx = $this->maxidx_2 ;
-                break;
-            default:
-                $this->colors = $this->colors_1;
-                $this->index = $this->index_1 ;
-                $this->maxidx = $this->maxidx_1 ;
-                break;
-        }
-        return parent::GetImg($aMark,$aIdx);
-    }
-
-    function __construct() {
-
-        //==========================================================
-        // File: bl_red.png
-        //==========================================================
-        $this->imgdata_large[0][0]= 1072 ;
-        $this->imgdata_large[0][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAMAAACelLz8AAAByF'.
-     'BMVEX/////////xsb/vb3/lIz/hIT/e3v/c3P/c2v/a2v/Y2P/'.
-     'UlL/Skr/SkL/Qjn/MTH/MSn/KSn/ISH/IRj/GBj/GBD/EBD/EA'.
-     'j/CAj/CAD/AAD3QkL3MTH3KSn3KSH3GBj3EBD3CAj3AAD1zMzv'.
-     'QkLvISHvIRjvGBjvEBDvEAjvAADnUlLnSkrnMTnnKSnnIRjnGB'.
-     'DnEBDnCAjnAADec3PeSkreISHeGBjeGBDeEAjWhITWa2vWUlLW'.
-     'SkrWISnWGBjWEBDWEAjWCAjWAADOnp7Oa2vOGCHOGBjOGBDOEB'.
-     'DOCAjOAADJrq7Gt7fGGBjGEBDGCAjGAADEpKS/v7+9QkK9GBC9'.
-     'EBC9CAi9AAC1e3u1a2u1Skq1KSm1EBC1CAi1AACtEBCtCBCtCA'.
-     'itAACngYGlCAilAACghIScOTmcCAicAACYgYGUGAiUCAiUAAiU'.
-     'AACMKSmMEACMAACEa2uEGAiEAAB7GBh7CAB7AABzOTlzGBBzCA'.
-     'BzAABrSkprOTlrGBhrAABjOTljAABaQkJaOTlaCABaAABSKSlS'.
-     'GBhSAABKKSlKGBhKAABCGBhCCABCAAA5CAA5AAAxCAAxAAApCA'.
-     'ApAAAhAAAYAACc9eRyAAAAAXRSTlMAQObYZgAAAAFiS0dEAIgF'.
-     'HUgAAAAJcEhZcwAACxIAAAsSAdLdfvwAAAAHdElNRQfTAwkRFD'.
-     'UHLytKAAAB4UlEQVR4nGNgIAK4mGjrmNq6BmFIWMmISUpKSmk5'.
-     'B8ZEokj4qoiLiQCBgqald3xaBpKMj6y4sLCQkJCIvIaFV0RaUR'.
-     'lCSk5cWEiAn19ASN7QwisuraihHiajKyEixM/NwckjoKrvEACU'.
-     'qumpg7pAUlREiJdNmZmLT9/cMzwps7Smc3I2WEpGUkxYkJuFiY'.
-     'lTxszePzY1v7Shc2oX2D+K4iLCgjzsrOw8embuYUmZeTVtPVOn'.
-     'gqSslYAOF+Ln4ZHWtXMPTcjMrWno7J82rRgoZWOsqaCgrqaqqm'.
-     'fn5peQmlsK1DR52vRaoFSIs5GRoYG5ub27n19CYm5pdVPnxKnT'.
-     'pjWDpLydnZwcHTz8QxMSEnJLgDL9U6dNnQ6Sio4PDAgICA+PTU'.
-     'zNzSkph8hADIxKS46Pj0tKTc3MLSksqWrtmQySAjuDIT8rKy0r'.
-     'Kz+vtLSmur6jb9JUIJgGdjxDQUVRUVFpaUVNQ1NrZ9+kKVOmTZ'.
-     'k6vR0sldJUAwQNTU2dnX0TgOJTQLrSIYFY2dPW1NbW2TNxwtQp'.
-     'U6ZMmjJt2rRGWNB3TO7vnzh5MsgSoB6gy7sREdY7bRrQEDAGOb'.
-     'wXOQW0TJsOEpwClmxBTTbZ7UDVIPkp7dkYaYqhuLa5trYYUxwL'.
-     'AADzm6uekAAcXAAAAABJRU5ErkJggg==' ; 
-
-        //==========================================================
-        // File: bl_bluegreen.png
-        //==========================================================
-        $this->imgdata_large[1][0]= 1368 ;
-        $this->imgdata_large[1][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABm'.
-     'JLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsRAAALEQF/ZF+RAAAA'.
-     'B3RJTUUH0wMMFi8hE9b2uAAABOVJREFUeNq9lk2sJFUVx3+3qv'.
-     'tW95t57zFvhiFxmCFRUJRoNCQiJARMhiFx/Igxii5goTG6ZDAu'.
-     '/EhcSCIrTAgLEiKsJ8ywABNZEMJXEDYCukAmjgjzBkK/j35V1d'.
-     '333FtV97io97pfzwxfG86qcu/N+Z3zP+fcW/Apmfk4hx57+R/6'.
-     'Rqmc9ykhsWjlsUngAA1fXIQ7b73pI/186IGHnn9dH/8frC8v4I'.
-     'PiG53uaerR4GmKkv31mB8cyfjd946ZTwR66qVX9OTWIi8UKUv9'.
-     'BOrZXpYZvFeiBvzI0fgSUSFKwbVG+Pl1V3HH0VvNR4KeeukV/f'.
-     'PmMmdHhst76aXD64AbeVQ9bjNHaiGOC2o3wLrAb2/4LL/84ffn'.
-     'fCdzkOdayKpLppBemrBsU5Y1Zdmm9LJdGU6E/t4M24Q26jRDRL'.
-     'j3mdc49cSTekFsMzs5XuTsyLDUNSDQ25NwKOly9YIl22MYhJr/'.
-     'uoDtBBoT0CxBRGYOAhibIaOCe//2MpfM6KHnX9cXipSlbkKWmS'.
-     'nk9iv38J0jixw7vJfrTMYBOvhSoQHJBS09ANELloAGDxW8tfoW'.
-     'J+5/UC8CPS0LU7r3SpYarr7M8rmFjMPLXT6/33L4si7Z2GCrQC'.
-     '+0ctlOaNs9DReV8vSLr85ndPLpZ/WNvHW+01kAVFBOGvJx0wYg'.
-     'Sp47RIQ4Emwa8FGJXlDxSCFo5YlVgAo2hwPue/hRndboTV3EW2'.
-     'Wp3k6wBp8q56QiWzecW6vwQfnPRkAWhFgILnq08jQ+R2nlUzzN'.
-     'uES9Q7Vd+9fba7NmWJW61db2247qACmcjxXr45psYphsFGSLBu'.
-     'kIajxqtjNwHkvAjQt0sg3crhPA2+fPz0CuyNFOghsGsr19mnFg'.
-     'DGwrRm8UoAtNmQPQtRXDgdC4HImCFEKcCE0oieUWUYq2LtbiGp'.
-     'mBQmppfIkjw45DK0QNNkvQ0jMBtPL0UnDRM1rN+cxKwzvOo2NP'.
-     'tykR9a1kfpZNDLMG6QDYJqCTBvUe1+uxs+YKyPoGrTwY2HhvC4'.
-     'CDWQd5d4xNApNQEEMgjgLdUCLBQ5cprL/trwNwKG2IUmDqDFd5'.
-     'sr5BWrlxuSdLDFEFlqAzXGc4zFjupqh6uqYihpxJcEgp026l2w'.
-     '7wFUv7Z6AvrfRo/n0OYzPwIKE3HUKAJg2otMBiElnsF7wngis9'.
-     '3ZDjNnLi7huCWUZfueZKTu/M0V3HvmkOFDVxVKDG04ScejSgW5'.
-     'V0q5JYFEghuDLHlTmToqDeGOCKIVtrW9hsdmXufEcNLPSXuPHa'.
-     'a+bvuh9df5AH/v5PDFmbWQC3Mx+TVvfGVTRB2CodNgT2JBX003'.
-     'aANZAYS/BxCv32TV/l2C03G7jgmfjGiT/qmeEmibEYm7XzAO2k'.
-     'A+pbgHhBgydqu54YO5eRiLCy7yDvPP6Xqf+5Z+Lu277OYuOpiw'.
-     'H15oBmlNOMcmK5RbP+PrEscGU+DSAxdg4CICIkxnLP8aNz63Og'.
-     'H3/rdvOb795GVhuaYo0oBc3GGrEsUPVTwO6a7LYd+X51x3Hu/t'.
-     'lP5tS65FN+6okn9U+n/sqb596dTvhOF+02myXTmkQNrOw7yD3H'.
-     'j14E+UDQjp24/0E9/eKrbA4HH3aMK1b2ccvXvswjv//1J/s5ud'.
-     'Due/hRPfP+OmfOrk7vrn7a48ihA3zh8CH+8Iuffiw/n4r9H1ZZ'.
-     '0zz7G56hAAAAAElFTkSuQmCC' ; 
-
-        //==========================================================
-        // File: bl_yellow.png
-        //==========================================================
-        $this->imgdata_large[2][0]= 1101 ;
-        $this->imgdata_large[2][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAMAAACelLz8AAAB2l'.
-     'BMVEX//////////+///+f//9b//8b//73//7X//63//6X//5T/'.
-     '/4z//4T//3P//2v//1r//0r//0L//zH//yn//yH//xj//xD//w'.
-     'j//wD/90L/9zn/9zH/9xj/9xD/9wj/9wD39yn37zn37zH37yH3'.
-     '7xD37wj37wDv70Lv50rv50Lv5znv5yHv5xjv5wjv5wDn51Ln5x'.
-     'Dn3jHn3iHn3hjn3hDn3gje3oze3nPe3lLe1oze1nPe1lLe1ine'.
-     '1iHe1hje1hDe1gje1gDW1qXW1mvWzqXWzkLWzhjWzhDWzgjWzg'.
-     'DOzrXOzq3OzpzOzgDOxkrOxinOxhjOxhDOxgjOxgDGxqXGxnvG'.
-     'xmvGvRjGvRDGvQjGvQDFxbnAvr6/v7+9vaW9vZS9vQi9vQC9tR'.
-     'C9tQi9tQC7u7W1tZS1tXu1tTG1tQi1rRC1rQi1rQCtrYytrSGt'.
-     'rQitrQCtpYStpSGtpQitpQClpYSlpXulpQClnBClnAilnACcnG'.
-     'ucnAicnACclAiclACUlFqUlCmUlAiUlACUjFKUjAiUjACMjFKM'.
-     'jEqMjACMhACEhACEewB7ezF7exB7ewB7cwBzcylzcwBzaxBzaw'.
-     'BraxhrawhrawBrYxBrYwBjYwBjWgBaWgBaUgCXBwRMAAAAAXRS'.
-     'TlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxIAAAsSAd'.
-     'LdfvwAAAAHdElNRQfTAwkRFBKiJZ4hAAAB7ElEQVR4nI3S+1vS'.
-     'UBgHcB67WJmIMWAVdDHEDLBC6Go0slj3Ft0m9RRBWQEmFZFDEM'.
-     'Qgt0EMFBY7p/+198hj1kM/9N1+++x73rOd6XT/kStnTx4fPzd9'.
-     'uwfOjFhomj7smAhwj/6Cm2O0xUwy6g7cCL99uCW3jtBmE7lsdr'.
-     'fvejgpzP7uEDFRRoqy2k8xQPnypo2BUMP6waF9Vpf3ciiSzErL'.
-     'XTkPc0zDe3bsHDAcc00yoVgqL3UWN2iENpspff+2vn6D0+NnZ9'.
-     '6lC5K6RuSqBTZn1O/a3rd7v/MSez+WyIpVFX8GuuCA9SjD4N6B'.
-     'oRNTfo5PCAVR0fBXoIuOQzab1XjwwNHx00GOj8/nKtV1DdeArk'.
-     '24R+0ul9PjmbrHPYl+EipyU0OoQSjg8/m83kl/MMhx0fjCkqio'.
-     'SMOE7t4JMAzDsizH81AqSdW2hroLPg4/CEF4PhKNx98vlevrbY'.
-     'QQXgV6kXwVfjkTiSXmhYVcSa7DIE1DOENe7GM6lUym0l+EXKks'.
-     'K20VAeH2M0JvVgrZfL5Qqkiy0lRVaMBd7H7EZUmsiJJcrTdVja'.
-     'wGpdbTLj3/3qwrUOjAfGgg4LnNA5tdQx14Hm00QFBm65hfNzAm'.
-     '+yIFhFtzuj+z2MI/MQn6Uez5pz4Ua41G7VumB/6RX4zMr1TKBr'.
-     'SXAAAAAElFTkSuQmCC' ; 
-
-        //==========================================================
-        // File: bl_silver.png
-        //==========================================================
-        $this->imgdata_large[3][0]= 1481 ;
-        $this->imgdata_large[3][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAMAAAAM7l6QAAADAF'.
-     'BMVEUAAADOzs7Gxsa9vb21tbXOxsbOzsbGzsb3///O1ta1vb2c'.
-     'paVSWlpKWlpSY2ve5+97hIze7/9aY2vO5/9zhJRaa3tSY3PGzt'.
-     'aMlJxrc3tja3NKUlpCSlK1vcZze4RSWmPW5/+Upb3G3v9zhJxS'.
-     'Y3t7jKVaa4TO3veltc6ElK1re5Rjc4ycpbV7hJRaY3M5QlLn7/'.
-     '/Gzt6lrb2EjJzO3v9ja3vG1ve9zu+1xueltdacrc6UpcaMnL1C'.
-     'SlqElLV7jK1zhKVre5zW3u/O1ue1vc6ttcaMlKVze4xrc4RSWm'.
-     'tKUmPG1v+9zve1xu+tveeltd6crdbe5/+9xt6cpb17hJxaY3s5'.
-     'QlrW3vfO1u/Gzue1vdattc6lrcaUnLWMlK2EjKVze5Rrc4xja4'.
-     'RSWnNKUmtCSmO9xuecpcZ7hKVaY4TW3v/O1vfGzu+1vd6ttdal'.
-     'rc69xu+UnL2MlLWEjK1ze5xrc5R7hK1ja4zO1v+1veettd6lrd'.
-     'aMlL3Gzv/39//W1t7Gxs61tb29vcatrbWlpa2cnKWUlJyEhIx7'.
-     'e4TW1ufGxta1tcZSUlqcnK3W1u+UlKW9vda1tc57e4ytrcalpb'.
-     '1ra3vOzu9jY3OUlK29vd6MjKWEhJxaWmtSUmNzc4xKSlpjY3tK'.
-     'SmNCQlqUjJzOxs7///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'.
-     'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'.
-     'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'.
-     'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'.
-     'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'.
-     'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'.
-     'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'.
-     'AAAAAAAAAAAAAAAAAAAAAAAAD///9fnkWVAAAAAnRSTlP/AOW3'.
-     'MEoAAAABYktHRP+lB/LFAAAACXBIWXMAAABFAAAARQBP+QatAA'.
-     'AB/klEQVR42mNgxAsYqCdd3+lcb4hLmj8wMMvEu8DCMqYbU9op'.
-     'UEFB2MTb26eyysomFl06XEEhUCHLpAKo2z/fujikEUVaXUFBMB'.
-     'BouLePuV+VVWGRciIXknSEsImCQd3//xwmPr65llaFcSFJHkjS'.
-     '3iYmWUDZ//8NfCr989NjNUMSUyTg0jneSiaCINn/gmlVQM12qg'.
-     'lJnp5waTMTE5NAkCyHWZW/lXWNfUlikmdYK0zax7siS4EDKJtd'.
-     'mQeU1XRwLBdLkRGASucWmGVnZ4dnhZvn5lmm29iVOWpnJqcuko'.
-     'JKR1Wm5eTkRKYF5eblp9sU2ZeUJiV7zbfVg0pH56UFBQXNjIqK'.
-     'jgkujItX1koKTVmYajsdKu2qETVhwgSXiUDZ2Bn9xqUeoZ5e0t'.
-     'LzYYZ3B092ndjtOnmKTmycW1s7SHa+l5dtB8zlccE6RlN0dGbM'.
-     'mDVbd5KupNBcL6+F82XgHouLj5vRP2PWLGNdd4+ppnxe8tJec6'.
-     'XnNsKkm0uVQ5RDRHQTPTym68nPlZbvkfYCexsa5rpJ2qXa5Umm'.
-     'ocmec3m8vHjmSs+fgxyhC5JDQ8WSPT2lvbzm8vDIe0nbtiBLN8'.
-     '8BigNdu1B6Lsje+fPbUFMLi5TMfGmvHi/puUAv23q2YCTFNqH5'.
-     'MvPnSwPh3HasCbm3XUpv+nS5VtrkEkwAANSTpGHdye9PAAAASn'.
-     'RFWHRzaWduYXR1cmUANGJkODkyYmE4MWZhNTk4MTIyNDJjNjUx'.
-     'NzZhY2UxMDAzOGFhZjdhZWIyNzliNTM2ZGFmZDlkM2RiNDU3Zm'.
-     'NlNT9CliMAAAAASUVORK5CYII=' ; 
-
-        //==========================================================
-        // File: bl_purple.png
-        //==========================================================
-        $this->imgdata_large[4][0]= 1149 ;
-        $this->imgdata_large[4][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAMAAACelLz8AAACAV'.
-     'BMVEX/////////7///5///1v//xv//rf//pf//lP//jP//hP//'.
-     'c///a///Wv//Wvf/Uv//Sv//Qv//Qvf/Off/Mf//Kf//If//If'.
-     'f/GP//GPf/EP//EPf/CP//CPf/CO//AP//APf3Oe/3Kff3Ke/3'.
-     'Ie/3GO/3EO/3AO/vSu/vSufvOefvMefvIefvGOfvEOfvCOfvAO'.
-     'fnUufnSufnMd7nId7nGN7nGNbnEN7nCN7nAN7ejN7ejNbec97e'.
-     'c9beUtbeQtbeIdbeGNbeENbeCNbeANbWpdbWa9bWQs7WGM7WEM'.
-     '7WCM7WAM7Otc7Orc7OnM7OSsbOIb3OGMbOEMbOCMbOAM7OAMbG'.
-     'pcbGnMbGe8bGa8bGKbXGEL3GCL3GAL3FucXBu73AvsC/v7+9pb'.
-     '29Ka29GLW9ELW9CLW9AL29ALW5rrm1lLW1e7W1MbW1GKW1EK21'.
-     'CLW1CK21AK2tjK2thKWtMaWtIaWtGJytCK2tCKWtAK2tAKWlhK'.
-     'Wle6WlEJylCJylAKWlAJyca5ycGJScEJScCJScAJycAJSUWpSU'.
-     'UoyUKZSUEIyUCIyUAJSUAIyMUoyMSoyMIYSMEISMCISMAIyMAI'.
-     'SECHuEAISEAHt7MXt7EHt7CHt7AHt7AHNzKXNzEGtzAHNzAGtr'.
-     'GGtrEGNrCGtrAGtrAGNjCFpjAGNjAFpaAFpaAFIpZn4bAAAAAX'.
-     'RSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxIAAAsS'.
-     'AdLdfvwAAAAHdElNRQfTAwkRFB0ymoOwAAAB9UlEQVR4nGNgIA'.
-     'K42hhqGtm5+WFIWClKycvLK6gbuARGoEj4aMjLSElISUir6Tt7'.
-     'x+aEIWR8leQlwEBSTc/CK7awLguuR0lGQkJMVFRUTFJVzwko1d'.
-     'oFk9OQl5IQE+Dh5hVR0TV3CkkvbJgyASJjDZIR5GBl5eRX0TH1'.
-     'DEqrbJ2ypBEspSgvJSXKw8bMxMavbOLoGZNf1TZlybw4oIyfLN'.
-     'BxotxsLEzsQiaOHkFpBQ2905esrAZK2SpIAaUEuDm5+LTNPAKj'.
-     'C+pbps1evrIDKGWnLictKSkuLKyoZQyUya9o7Z2+YMXKGUApew'.
-     'M9PTVdXR0TEwf3wOjUirruafOXL18xFyjl72Kpb25qaurg4REU'.
-     'EFVe2zJ5zpLlK1aCpbydnZ2dnDwDA6NTopLLeiZNXbB8BcTAyP'.
-     'TQ0JDg4KCY1NS83JKmiVOBepYvX9UPlAovzEiPSU/LLyior2vq'.
-     'mjZr3vLlIF01IC+XVhUWFlZW1Lc290ycOGfxohVATSsXx4Oksn'.
-     'vaWlsb2tq6J0+bM2/RohVA81asbIcEYueU3t7JU6ZNnwNyGkhm'.
-     '+cp5CRCppJnzZ8+ZM3/JUogECBbBIixr8Yqly8FCy8F6ltUgoj'.
-     'lz7sqVK2ByK+cVMSCDxoUrwWDVysXt8WhJKqG4Y8bcuTP6qrGk'.
-     'QwwAABiMu7T4HMi4AAAAAElFTkSuQmCC' ; 
-
-        //==========================================================
-        // File: bl_gray.png
-        //==========================================================
-        $this->imgdata_large[5][0]= 905 ;
-        $this->imgdata_large[5][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAMAAACelLz8AAABO1'.
-     'BMVEX////////3///39/fv7+/e5+fW3t7Wzs7WxsbG1tbGzsbG'.
-     'xsbDxMS/v7++wMC+v7+9zsa9xsa9vb29tbW9ra29pa24uLi1xs'.
-     'a1vb21tbWxtrattbWmpqalra2cra2cpaWcnJycjIyUpaWUnJyU'.
-     'lJSUjIyMnJyMnJSMlJSMlIyMjJSMjIyElJSElIyEjIyEhIR7jI'.
-     'x7hIR7hHt7e3t7e3N7e2tzhIRze3tze3Nzc3Nre3trc3Nrc2tr'.
-     'a2tjc3Njc2tja3Nja2tjY2NjWlpaa2taY2taY2NaY1paWlpaUl'.
-     'JSY2NSY1pSWlpSWlJSUlJSUkpKWlpKWlJKUlpKUlJKUkpKSkpK'.
-     'SkJCUlJCUkJCSkpCSkJCQkI5Sko5QkI5Qjk5OUI5OTkxQkIxOT'.
-     'kxMTkxMTEpMTEhMTEhKSkYISEpy7AFAAAAAXRSTlMAQObYZgAA'.
-     'AAFiS0dEAIgFHUgAAAAJcEhZcwAACxIAAAsSAdLdfvwAAAAHdE'.
-     'lNRQfTAwkRFQfW40uLAAABx0lEQVR4nI3SbXfSMBQA4NV3nce5'.
-     'TecAHUywRMHSgFuBCFsQUqwBS1OsWQh0GTj//y8wZUzdwQ/efM'.
-     'tzcm/uuXdj4z9ic/PR9k4qk1qDnf0X2/uZzKt8GaRvSubg4LVp'.
-     'mkWzCGAT/i3Zsm2XNQHLsm2n2937LaaNnGoJFAEo27B50qN0ay'.
-     'Wg26lXsw8fP8nmzcJb2CbsnF5JmmCE8ncN404KvLfsYwd7/MdV'.
-     'Pdgl/VbKMIzbuwVgVZw2JlSKJTVJ3609vWUY957lgAUd1KNcqr'.
-     'yWnOcOPn8q7d5/8PywAqsOOiVDrn42NFk+HQ7dVuXNYeFdBTpN'.
-     'nY5JdZl8xI5Y+HXYaTVqEDp1hAnRohZM03EUjMdhn5wghOoNnD'.
-     'wSK7KiiDPqEtz+iD4ctdyAifNYzUnScBSxwPd6GLfRURW7Ay5i'.
-     'pS5bmrY8348C5vvUI+TLiIVSJrVA0heK/GDkJxYMRoyfCSmk4s'.
-     'uWc3yic/oBo4yF374LGQs5Xw0GyQljI8bYmEsxVUoKxa6HMpAT'.
-     'vgyhU2mR8uU1pXmsa8ezqb6U4mwWF/5MeY8uLtQ0nmmQ8UWYvb'.
-     'EcJaYWar7QhztrO5Wr4Q4hDbAG/4hfTAF2iCiWrCEAAAAASUVO'.
-     'RK5CYII=' ; 
-
-        //==========================================================
-        // File: bl_brown.png
-        //==========================================================
-        $this->imgdata_large[6][0]= 1053 ;
-        $this->imgdata_large[6][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAABkAAAAZCAMAAADzN3VRAAABoV'.
-     'BMVEX////Gzs7GvbXGrZTGpXu9nHO1nHO1nIy9taXGxs7GtaXO'.
-     'nHPGlFrGjEq9hEq1hEqte0Klczmcazmce1KtnIzGxsbGvb3OlF'.
-     'LOlFq9hFKte0qcc0KUYzGEWimMc1K9ta3OnGvOnGPWnGO9jFq9'.
-     'jFKlc0KUazmMYzl7UilzUjGtpZzGxr3GnGPWpWvepXO1hFJ7Wj'.
-     'FrSiFjUjG1ra3GnHPvxpT/5733zpythFKUa0KEYzlzUilaOSF7'.
-     'Wjm9jErvvYz/99b///f/78bnrYS1hFqle0p7UjFrSiljQiFCMR'.
-     'iMhHO9lGvGjFLWnGv/3q3////erXuthEqlc0paQiFKMRhSQin/'.
-     '1qX/997//++cc0pjSilaQilKORhCKRiclIy9pYzGlGPntYT33q'.
-     '3vvZSEWjlSOSE5KRB7c2O1lHutczmthFqte1JrWkqtjGtCKRBa'.
-     'SjmljGuca0KMYzGMaznOztaclISUYzmEWjFKOSF7a1qEYzFaSi'.
-     'GUjISEa0pKOSm9vb2llIxaQhg5IQiEc2tzY0paORilnJy1raVS'.
-     'OSljUkJjWkKTpvQWAAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHU'.
-     'gAAAAJcEhZcwAACxIAAAsSAdLdfvwAAAAHdElNRQfTAwkREiei'.
-     'zP2EAAAB9UlEQVR4nGWS/VfSUBjHL5QluhhBxtwyWcCus5Blpm'.
-     'wDC4ONaWXCyBi7RMZmpQ2Bypm9W/byV3cHHo/W88s95/s5z/d5'.
-     'uwCcCh/4L3zAf+bs0NC588On9QAYGSUuBINk6GI4cmnsBLk8Go'.
-     '1SFEGMkzRzZeLq5JE8FvDHouw1lqXiCZJOcnCKnx4AcP0GBqmZ'.
-     'mRgRT9MMB4Wbs7cGSXNRik3dnp9fiMUzNCNKgpzN9bsaWaQo9s'.
-     '7dfH7pXiFTZCBU1JK27LmtBO8TDx7mV1eXHqXXyiIUFLWiVzHx'.
-     'BxcJIvV4/cn6wkqmWOOwmVE3UQOAp6HxRKL5bGPj+VwhUhalFq'.
-     '8alm5vAt+LlySZTsebzcKrraIIW4JqZC3N3ga+1+EQTZKZta1M'.
-     'pCZCSeDViqVrThsEdsLJZLJYLpZrHVGScrKBvTQNtQHY6XIM02'.
-     'E6Ik7odRW1Dzy3N28n3kGuB3tQagm7UMBFXI/sATAs7L5vdbEs'.
-     '8Lycm923NB0j5wMe6KOsKIIyxcuqauxbrmlqyEWfPmPy5assY1'.
-     'U1SvWKZWom9nK/HfQ3+v2HYZSMStayTNN0PYKqg11P1nWsWq7u'.
-     '4gJeY8g9PLrddNXRdW8Iryv86I3ja/9s26gvukhDdvUQnIjlKr'.
-     'IdZCNH+3Xw779qbG63f//ZOzb6C4+ofdbzERrSAAAAAElFTkSu'.
-     'QmCC' ; 
-
-        //==========================================================
-        // File: bl_darkgreen.png
-        //==========================================================
-        $this->imgdata_large[7][0]= 1113 ;
-        $this->imgdata_large[7][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAMAAACelLz8AAAB2l'.
-     'BMVEX////////3///v///n/+/e99bW/+/W99bO786/v7++vr69'.
-     '/96999a7wb24vbu1/9a1zqW1u7itxrWosq6l772l1qWlxrWlxq'.
-     '2lva2cxpSU562U3q2UxqWUvaWUpZyM77WM57WMvYyMtZyMrZyM'.
-     'pZSMnJSEvZyEtYyErZSElIx7zpR7xpx7xpR7vZR7jIRz1pRzxp'.
-     'RzjIRrzpRrzoxrxoxrtYRrrYxrrXtrpYRrhHNjzoxjxoxjxoRj'.
-     'vYRjtYRjrXtjpXtjlGNje2tazoxazoRaxoxaxoRavYRatYRatX'.
-     'tarXtapXNanHNajFpae2tSzoRSxoRSvXtStXtSrXtSrXNSpXNS'.
-     'nHNSnGtSlGtSlGNSjGtSjGNKvXtKtXNKrXNKpWtKnGtKlGNKjG'.
-     'NKhGNKhFJKc1pKa1JCrWtCpWtCnGtClGNCjGNCjFpChFpCe1JC'.
-     'a1JCY1I5pWs5nGM5lGM5jFo5hFo5e1o5c0o5WkoxjFoxhFoxhF'.
-     'Ixe1Ixc1Ixc0oxa0ophFIpe0opc0opa0opa0IpY0IpWkIpWjkp'.
-     'UkIpUjkhc0oha0IhY0IhWjkhWjEhUjkhUjEhSjEhSikhQjEhQi'.
-     'kYWjkYSjEYSikYQjEYQikQSikQQikQQiEQOSExf8saAAAAAXRS'.
-     'TlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxIAAAsSAd'.
-     'LdfvwAAAAHdElNRQfTAwkRFCaDkWqUAAAB+ElEQVR4nI3S+1vS'.
-     'UBgHcGZlPV0ks/vFrmQWFimJjiwiYUJWjFBWFhClyZCy5hLrwA'.
-     'x2EIwJC1w7zf2vnU0re+iHvs9++7x7zznvORbLf+TA6ct9fYMX'.
-     'jrfAUYefpp+/iM1ykxf/lmuhUZ/PTwXC8dml5Wcd23o5H5Mk6b'.
-     '5NUU8icXbhS67rNzn9JDnguOEYGQtEEtwC+Crs3RJ76P5A/znr'.
-     'vsNX7wQnEiwHCtK7TTkW8rvdZ9uJtvZTLkxpHhSrP66bNEj7/P'.
-     '3WNoLYeeSWQQCIpe9lQw7RNEU5rDsIYtcJ14Nocg7kRUlBNkxn'.
-     'YmGKcp7cv3vPwR7XOJPmc0VYU3Sv0e9NOBAYG7Hbz/cMjTMveZ'.
-     'CHkqxuTBv0PhYJB4N3XR6PJ5rMAPMnpGUxDX1IxSeMTEaZp1OZ'.
-     'nGAIQiYtsalUIhFlmGTy3sO3AizJCKn6DKYryxzHsWyaneMzr6'.
-     'cWxRVZVlFTe4SpE3zm+U/4+whyiwJcWVMQNr3XONirVWAklxcE'.
-     'EdbqchPhjhVzGpeqhUKhWBQhLElr9fo3pDaQPrw5xOl1CGG1JE'.
-     'k1uYEBIVkrb02+o6RItfq6rBhbw/tuINT96766KhuqYpY3UFPF'.
-     'BbY/19yZ1XF1U0UNBa9T7rZsz80K0jWk6bpWGW55UzbvTHZ+3t'.
-     'vbAv/IT+K1uCmhIrKJAAAAAElFTkSuQmCC' ; 
-
-        //==========================================================
-        // File: bl_green.png
-        //==========================================================
-        $this->imgdata_large[8][0]= 1484 ;
-        $this->imgdata_large[8][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABm'.
-     'JLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsRAAALEQF/ZF+RAAAA'.
-     'B3RJTUUH0wMMFjM4kcoDJQAABVlJREFUeNq9ll2MJFUVx3/11V'.
-     'Vd/TE9vU0v4zLDwJIF16jBqLAPhsRXEiDqg0QTJiQSjcSNvCzw'.
-     'sBEDDxizhvAAxBgf1oR9QF9NiE9ESFZkQyZB5WtddmdnZ3qqqr'.
-     'uqbt367Cofqu3ZZpWVaDzJfbkf53//55z/PVdZXV3l/2H6f7Lp'.
-     '5VdOV/4Nb+GmHpUeA7AdBNxc3kafNb73jRPK9Xwon8ToxVefqU'.
-     'b91wibH5EkCQBCizFihTSviHUHR0hWws9xe3wvJ7/7nPKpgX5y'.
-     '9oFqt3eOgWniRBoAbUBGGqZUibSYaeoT2B5bnkdaSA6793Cv/S'.
-     'QPPbihXBfo5VdOV+8dfgnvwAU62YH5fCZ12sDujFkwyegCqTrB'.
-     'iUOKTOJKj8jr88jS8zy6cXwBTP048nuHX0I0nDlIp7RpTG7kM0'.
-     'sdyAYsTVukUuWGhlWHMq0ITL92lnUp9R1Obz/GmTNnqn9bDD8/'.
-     '+0D1oX0O0zQZZDYCsK2j3Gl9jQqDfHiei8GfiKVLlsZkJaBAN1'.
-     '0i6PgwUbB0GxG5/PrtE/xLRr959Znqw9452oVNI+jiJhnr1pe4'.
-     'k29zB1/nFr5Kj7tpt1YYhJ0FJ7nUYbcJQBgahN2MzeCP/OipR6'.
-     'prgN6Qr6ELFQFUWoRpNVjlKwxZB8DCpE+PtfEKqV1cUzxpVudu'.
-     'GTBHA5Y1g99e+dUio9O/P1Vpq+/WE5GGjDSMoAtAQjrf3C52IP'.
-     'QxpY4WK2hpReka9Gfrhqgz0bACRoCWjDh56kQ1z9FeuUUQxVhK'.
-     'B92sD1VahM+bAJgcoJhGjP/6Ln8rAgDiRCVRKiIzxMkkodBJ85'.
-     'im1IlEHbE4k1xyNveL4YP8HarmGJIOpqyjeQmfNHmTvnqZTWBt'.
-     'vIJXpPwlukJSuSTKGK3pEwtJmiX00ZlInTyNscImO6XBITvH1c'.
-     '8vVt2OucdKvIyeKRTNCivsEMgcpg6taYs30nfq0Gqg6hOSSFJ4'.
-     'BSnJPht0IqEjWmOGocEI6F0J94F0qaL6BntTF0MtUfweKQKAPU'.
-     'Wwp4OcVnQAmVb0p9DLOzjEhEKnGRmoRc7EzRGlwA6NujAKG4yP'.
-     '6Sjwc4aVznZ7DK0xXdkDoJf0kGmFBniFBOBGcZSCCSKd0IwN0k'.
-     'IS+QZWCGVZex4BnUxya3+Zt9iugQbcRFpIAtuHvAZulPUdLhUJ'.
-     'RqegI3WcqaSXddlT3idsWMSRRGkEtNwmyTifAwyBo7LP+11J0e'.
-     '7tM7pZOYblHkBLcqZ5LcYtw6Wbd4CM3SpE9foYZsIHoqDKCrbz'.
-     'mLSQtPwmuhXgtBLs0GBdbXOhFGB7WBKO2F8GXt9/VO97Ya3atF'.
-     '7nUHnwGjGGQqcPxFEdFqURkEidiZszAERoYIsGju1hq21kWee3'.
-     'bw15+8WpsvAy3K1+i3JkkhZyPpxxjjPOsfOYiZ+TFhLPzQnHOU'.
-     'tpzGB2dgA4tscIkKIx19Cxg/fPL7vQJu47eXt1VvsDK8pwPueZ'.
-     'PuZoQMOqhRoJHSs0kKLBWjvjYinmeQGw1TaX1RFdfZ3LMzYLjA'.
-     'C++dkn6AaH2Nobk6cxEzdnuG0TdC8zvdJkN0hqkFkO/jwL0fxa'.
-     'so8sBcuFzQ+/+MRC+BeAHnpwQzn++ee5KT9Eshuy46dcKAXm32'.
-     '0uzPQhS4GttkH2GQID2Wc0Y4LtAbDxhZ/x5A+e/uTG9+jGceXH'.
-     '9/ySnnIXnUzOxXe1038mW3ZynNmam4yYWkO+f9cv+Oljz16/lV'.
-     '9tDz/9nerc1hm8ZEScSRK7VvtYl1i1dklsOKyvc+zg/bzw1O8+'.
-     '/efkajt56kR1ydlEJBc5H46xzbrJ3dY9wrB7hGcff+6/+279L+'.
-     '0fHxyiE8XMLl4AAAAASUVORK5CYII=' ; 
-
-        //==========================================================
-        // File: bl_blue.png
-        //==========================================================
-        $this->imgdata_large[9][0]= 1169 ;
-        $this->imgdata_large[9][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAMAAACelLz8AAACEF'.
-     'BMVEX/////////7//35//v1v/exv/Wvf/Wrf/Wpf/Orf+/v7+9'.
-     'tc69jP+9hP+5ucW1tc6tlP+rq7Wlpdalpcalpb2cnM6cnMacc/'.
-     '+cWv+UlLWUjN6UjK2Uc/+Ma/+MUv+EhKWEa/+EQvd7e8Z7e7V7'.
-     'e6V7c957Wv9za9Zza8ZzSv9ra5xrSv9rOf9rMe9jUudjQv9jOe'.
-     '9aWpRaUt5aUpRaSu9aSudSUoxSSs5SSoxSMf9KQtZKOfdKMedK'.
-     'Kf9KKe9CKf9CKb1CKa1CIfdCIedCId45MXs5Kfc5If85Iec5Id'.
-     'Y5GP8xMbUxMXsxKc4xKZQxIf8xGP8xGO8xGN4xGNYxGL0xGK0p'.
-     'KXMpIYwpGP8pGO8pGOcpGNYpGM4pEP8pEPcpEOcpEN4pENYpEM'.
-     'YpEL0hGKUhEP8hEPchEO8hEOchEN4hENYhEM4hEMYhELUhCP8h'.
-     'CO8hCN4YGJwYGGsYEL0YEK0YEHMYCN4YCM4YCMYYCL0YCKUYAP'.
-     '8QEJQQEIwQEHsQEGsQCM4QCLUQCK0QCKUQCJwQCJQQCIwQCHMQ'.
-     'CGsQAP8QAPcQAO8QAOcQAN4QANYQAM4QAMYQAL0QALUQAKUQAJ'.
-     'QQAIQICGsICGMIAO8IANYIAL0IALUIAK0IAKUIAJwIAJQIAIwI'.
-     'AIQIAHsIAHMIAGsIAGMAAN4AAMYAAK0AAJQAAIwAAIQAAHMAAG'.
-     'sAAGMAAFrR1dDlAAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgA'.
-     'AAAJcEhZcwAACxIAAAsSAdLdfvwAAAAHdElNRQfTAwkRFRPMOZ'.
-     '/2AAAB+klEQVR4nGNgIAIIqeqZmBqpi2JISNml5lVXV3d198Yo'.
-     'oUjwm1SnxsbGRsSm5ZfNXO4tjCTjVh0ABhFx6QV9E1Y0S8JkuN'.
-     '3yAgLc7W3t/QPi4jPKJ8ye1yoIlTKpjvVy15eVUbN0i4zKLJ8w'.
-     'ae6qcKgLqmMj3PUFWFl5NJ0CExLLJzbNW7BWCyxlXR0ba6/Axs'.
-     'zELmfnkRBT0QiSKgXJCOflxUbYy3KyMHEoOrtEZ1c2TZ6/cMl6'.
-     'eaCUamdsbIC7tjgPr4SBS3BMMVDTwkXr1hsDpYy6UmMj/O0tdX'.
-     'QNbDxjknJLWqYsXLx0vStQynxGflpkZGCgs7Onp29SbtNkoMy6'.
-     'pevCgFJWy3oyMuKjgoKCPWNCvEuqWhcsWrJ06XqQlPnMvrKyrM'.
-     'TomJjkZAfHlNa2qdOWrlu63gcopbG8v7+hvLwip7g4JdSxsLZu'.
-     '8dKlS9ettwBKic2eNXHChIkTG5tKqgpr2uo6loLAehWQx0LnzJ'.
-     '49p6mpeXLLlNq6RUvqly6dvnR9Bx9ISnnlvLmT582bMr9t4aL2'.
-     '+vrp60GaDCGB6Ld6wfwFCxYCJZYsXQ+SmL6+FBryInVrFi1atH'.
-     'jJkqVQsH6pNCzCJNvXrQW6CmQJREYFEc2CYevXrwMLAyXXl0oz'.
-     'IAOt0vVQUGSIkabkDV3DwlzNVDAksAAAfUbNQRCwr88AAAAASU'.
-     'VORK5CYII=' ; 
-
-        //==========================================================
-        // File: bs_red.png
-        //==========================================================
-        $this->imgdata_small[0][0]= 437 ;
-        $this->imgdata_small[0][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAMAAAAMs7fIAAAAk1'.
-     'BMVEX////////GxsbGra3/xsbOhITWhIT/hIT/e3v/c3P/a2vG'.
-     'UlK1SkrOUlL/Y2PWUlLGSkrnUlLeSkrnSkr/SkqEGBj/KSmlGB'.
-     'jeGBjvGBj3GBj/EBD/CAj/AAD3AADvAADnAADeAADWAADOAADG'.
-     'AAC9AAC1AACtAAClAACcAACUAACMAACEAAB7AABzAABrAABjAA'.
-     'BuukXBAAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZ'.
-     'cwAACxIAAAsSAdLdfvwAAAAHdElNRQfTAwkUGDNEMgOYAAAAm0'.
-     'lEQVR4nI3Q3RKCIBAFYGZMy9RKzX7MVUAUlQTe/+kS0K49d3wD'.
-     '7JlFaG+CvIR3FvzPXgpLatxevVVS+Jzv0BDGk/UJwOkQ1ph2g/'.
-     'Ct5ACX4wNT1o/zzUoJUFUGBiGfVnDTYGJgmrWy8iKEtp0Bpd2d'.
-     'jLGu56MB7f4JOOfDJAwoNwslk/jOUi+Jts6RVNrC1hkhPy50Ef'.
-     'u79/ADQMQSGQ8bBywAAAAASUVORK5CYII=' ; 
-
-
-        //==========================================================
-        // File: bs_lightblue.png
-        //==========================================================
-        $this->imgdata_small[1][0]= 657 ;
-        $this->imgdata_small[1][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAMAAAAMs7fIAAABVl'.
-     'BMVEX////////d///AwMC7wcS08P+y+P+xxdCwxM+uws2twMur'.
-     'vsinzNynytylzuKhyN6e5v6d5P+d1fOcwNWcu8ub4f+at8iZ3v'.
-     '+ZvdGY2/yW2f+VscGU1vuT1fqTr72Sx+SSxeKR0fWRz/GPz/OP'.
-     'rr+OyeqMy+6Myu2LyeyKxueJudSGw+SGorGDvt+Cvd6CvN2Aud'.
-     'p+uNd+t9Z9tdV8tdR8tNN6sc94r813rct2q8h0qcZ0qMVzp8Rx'.
-     'o8Bwor5tn7ptnrptnrlsnbhqmbRpmbNpi51ol7Flkqtkkqtkka'.
-     'pjj6hijaRhjaZgi6NfiqJfiaFdh55bhJtag5pZgphYgJZYf5VX'.
-     'cn9Ve5FSeI1RdopRdYlQdYlPc4dPcoZPcoVNcINLboBLbH9GZn'.
-     'hGZXdFZHZEY3RDYnJCXW4/W2s/WWg+Wmo7VmU7VGM7U2E6VGM6'.
-     'VGI5UV82T1wGxheQAAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHU'.
-     'gAAAAJcEhZcwAACxIAAAsSAdLdfvwAAAAHdElNRQfTAwkUGTok'.
-     '9Yp9AAAAtElEQVR4nGNgIBaw8wkpKghzwvksPAKiUsraprYiLF'.
-     'ARXkE2JiZ1PXMHXzGIAIekOFBE08TGLTCOCyzCLyvDxsZqZOnk'.
-     'E56kAhaRV9NQUjW2tPcMjs9wBYsY6Oobmlk7egRGpxZmgkW0zC'.
-     '2s7Jy9giKT8gohaiQcnVzc/UNjkrMLCyHmcHr7BYREJKTlFxbm'.
-     'QOxiEIuKTUzJKgQCaZibpdOzQfwCOZibGRi4dcJyw3S4iQ4HAL'.
-     'qvIlIAMH7YAAAAAElFTkSuQmCC' ; 
-
-        //==========================================================
-        // File: bs_gray.png
-        //==========================================================
-        $this->imgdata_small[2][0]= 550 ;
-        $this->imgdata_small[2][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAABEAAAAQCAMAAADH72RtAAABI1'.
-     'BMVEX///8AAAD8EAD8IAD8NAD8RAD8VAAYGBi/v7+goKCCgoJk'.
-     'ZGRGRkb8yAD83AD87AD8/AD4+ADo+ADY+ADI+AC0+ACk+ACU+A'.
-     'CE+AB0/ABk/ABU/ABE/AAw/AAg/AAQ/AAA/AAA+AAA6BAA2CAA'.
-     'yDQAtEQApFQAlGQAhHQAdIgAZJgAVKgARLgAMMgAINwAEOwAAP'.
-     'wAAPgIAPAQAOgYAOAkANgsANA0AMg8AMBEALhMALBUAKhcAKBo'.
-     'AJhwAJB4AIiAAID////4+Pjy8vLs7Ozm5ubg4ODa2trT09PNzc'.
-     '3Hx8fBwcG7u7u1tbWurq6oqKiioqKcnJyWlpaQkJCJiYmDg4N9'.
-     'fX13d3dxcXFra2tkZGReXl5YWFhSUlJMTExGRkZAQEA1BLn4AA'.
-     'AAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxIA'.
-     'AAsSAdLdfvwAAAAHdElNRQfTAwkUGiIctEHoAAAAfElEQVR4nI'.
-     '2N2xKDIAwF+bZ2kAa8cNFosBD//yvKWGh9dN+yk9kjxH28R7ze'.
-     'wzBOYSX6CaNB927Z9qZ66KTSNmBM7UU9Hx2c5qjmJaWCaV5j4t'.
-     'o1ANr40sn5a+x4biElrqHgrXMeac/c1nEpFHG0LSFoo/jO/BeF'.
-     'lJnFbT58ayUf0BpA8wAAAABJRU5ErkJggg==' ; 
-
-        //==========================================================
-        // File: bs_greenblue.png
-        //==========================================================
-        $this->imgdata_small[3][0]= 503 ;
-        $this->imgdata_small[3][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAMAAAAMs7fIAAAAxl'.
-     'BMVEX///////+/v79znJQhSkJ7raU5hHtjraVKnJRCjIRClIyU'.
-     '9++E595avbVaxr2/v7+ctbWcvb17nJxrjIx7paUxQkK9//+Mvb'.
-     '17ra2Evb17tbVCY2MQGBiU5+ec9/eM5+d71tZanJxjra1rvb1j'.
-     'tbVSnJxara1rzs5jxsZKlJRChIQpUlIhQkJatbVSpaU5c3MxY2'.
-     'MYMTEQISFavb1Sra1KnJxCjIw5e3sxa2spWlpClJQhSkoYOTkp'.
-     'Y2MhUlIQKSkIGBgQMTH+e30mAAAAAXRSTlMAQObYZgAAAAFiS0'.
-     'dEAIgFHUgAAAAJcEhZcwAACxIAAAsSAdLdfvwAAAAHdElNRQfT'.
-     'AwkUGTIqLgJPAAAAqklEQVR4nI2QVxOCMBCEM6Mi2OiCvSslJB'.
-     'CUoqjn//9TYgCfubf9Zu9uZxFqO+rscO7b6l/LljMZX29J2pNr'.
-     'YjmX4ZaIEs2NeiWO19NNacl8rHAyD4LR6jjw6PMRdTjZE0JOiU'.
-     'dDv2ALTlzRvSdCCfAHGCc7yRPSrAQRQOWxKc3C/IUjBlDdUcM8'.
-     '97vFGwBY9QsZGBc/A4DWZNbeXIPWZEZI0c2lqSute/gCO9MXGY'.
-     '4/IOkAAAAASUVORK5CYII=' ; 
-
-        //==========================================================
-        // File: bs_yellow.png
-        //==========================================================
-        $this->imgdata_small[4][0]= 507 ;
-        $this->imgdata_small[4][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAMAAAAMs7fIAAAAzF'.
-     'BMVEX///////+/v79zYwCMewDOxoTWzoTezkr/5wj/5wDnzgDe'.
-     'xgC1pQCtnACllACcjACUhABjWgDGvVK1rUrOxlLGvUqEexilnB'.
-     'jv3hj35xj/7wj/7wD35wDv3gDn1gDezgDWxgDOvQDGtQC9rQCE'.
-     'ewB7cwBzawBrYwDWzlLn3lLe1krn3kre1hi9tQC1rQCtpQClnA'.
-     'CclACUjACMhAD/9wC/v7///8bOzoT//4T//3v//3P//2v//2Pn'.
-     '50r//0r//yn39xj//xD//wBjYwDO8noaAAAAAXRSTlMAQObYZg'.
-     'AAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxIAAAsSAdLdfvwAAAAH'.
-     'dElNRQfTAwkUGSDZl3MHAAAAqElEQVR4nI3QWRNDMBAA4My09E'.
-     'IF1SME0VT1okXvM/3//6kEfbZv+81eswA0DfHxRpOV+M+zkDGG'.
-     'rL63zCoJ2ef2RLZDIqNqYexyvFrY9ePkxGWdpvfzC7tEGtIRly'.
-     'nqzboFKMlizAXbNnZyiFUKAy4bZ+B6W0lRaQDLmg4h/k7eFwDL'.
-     'OWIky8qhXUBQ7gKGmsxpC+ah1TdriwByqG8GQNDNr6kLjf/wAx'.
-     'KgEq+FpPbfAAAAAElFTkSuQmCC' ; 
-
-        //==========================================================
-        // File: bs_darkgray.png
-        //==========================================================
-        $this->imgdata_small[5][0]= 611 ;
-        $this->imgdata_small[5][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAMAAAAMCGV4AAABJl'.
-     'BMVEX////////o8v/f6O7W4OnR3PXL1OTL0evEyLvCzePAwMC/'.
-     'v7a8wsq7t7C1xum1vtS1q6GzopmyxeKsrsOqvNWoq7anvN+nsb'.
-     'qhrcGgqbGfpq6cp7+bqMuVmJKRm7yPlKKMnL6FkKWFipOEkLSE'.
-     'j6qEhoqAiaB+jqd8haF7hZR4iJt4g5l3hZl2gIt2cod1hJVzeY'.
-     'VzboJvhp9sfJJsb41peY1pd5xpdoVod4xndI5lcHxka4BjcYVg'.
-     'Z3BfboFbb4lbZnZbYntaZ4laZYVZV3JYYWpXX3JWWm5VX4RVW2'.
-     'NUYX9SXHxPWn5OVFxNWWtNVXVMVWFKV3xHUGZGU3dGTldFSlxE'.
-     'Sk9ESXBCRlNBS3k/SGs/RU4+R1k9R2U6RFU2PUg0PEQxNU0ECL'.
-     'QWAAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAA'.
-     'CxIAAAsSAdLdfvwAAAAHdElNRQfTAwkUGQmbJetrAAAAtklEQV'.
-     'R4nGNgwAK4JZTNNOWlYDxhMT4ZDTOzQE1uMF9CiJWVU0LbxDlS'.
-     'G8QVF+FnZ2KRNHAIiPUHaZGSlmZj5lH19A1KjLUA8lXU5MWllF'.
-     'yjo30TYr2BfG19G11b37CEeN84H38gX1HbwTUkOjo+zjfG3hLI'.
-     'l1exCvCNCwnxjfMz0gTyRdXNHXx9fUNCQu2MwU6SN3ZwD42LCH'.
-     'W30IK4T8vUJSAkNMhDiwPqYiktXWN9JZj7UQAAjWEfhlG+kScA'.
-     'AAAASUVORK5CYII=' ; 
-
-
-        //==========================================================
-        // File: bs_darkgreen.png
-        //==========================================================
-        $this->imgdata_small[6][0]= 666 ;
-        $this->imgdata_small[6][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAMAAAAMs7fIAAABX1'.
-     'BMVEX////////l/+nAwMC86r+8wb28wby8wLy78sCzw7SywrSx'.
-     'wLKwvrGuvK+syK+ryq2rx62n36ym3aumxKmk2qij0Keh16ahva'.
-     'Og1aSguKKe06KeuaCetZ+d0KGdtZ+bz6Cay56ZyZ2Zwp2Zr5qZ'.
-     'rpqYwJuXyZuXrJmVw5mUxZiTxJeTw5eTq5WRwJWPtJKOvZKKuI'.
-     '6Kt42Kn4yJt42ItIuGsomFsYmEsIiEr4eDr4eBrIR/qoN+qIJ8'.
-     'poB7pH56o356on14nnt2nXl0mndzmnZzmXZymHVwlXNvlHJukn'.
-     'FtiHBqjm1qjW1oi2toiWpniWplh2hlhmdkhWdig2VggGNgf2Je'.
-     'fmFdfGBde19bbl1aeFxXdFpWclhVclhVcVdUcFZTb1VSbVRQal'.
-     'JPaVFKY0xKYkxJYUtIYEpHX0lEWkZCWERCV0NCVkM/U0A+U0A+'.
-     'UUA+UEA9Uj89UT48Tj45TDvewfrHAAAAAXRSTlMAQObYZgAAAA'.
-     'FiS0dEAIgFHUgAAAAJcEhZcwAACxIAAAsSAdLdfvwAAAAHdElN'.
-     'RQfTAwkUGRjxlcuZAAAAtElEQVR4nGNgIBZw8osqqIpzw/msfI'.
-     'IiUmr6lo6SbFARASEOJiYtQ2uXADmIAJeEGFBE18LBMySBBywi'.
-     'LC/LwcFiZuvmH5WiAxZR0tRW1DC3dfYJS8zyAouYGBibWtm7+o'.
-     'TEpZfkgEX0rG3snNx9Q2NSCksgaqRd3Ty8gyLiU/NKSiDmcPsF'.
-     'BodHJ2UUlZTkQ+xikIlNSE7LLgECZagL2VQyc0H8YnV2uD94jS'.
-     'ILIo14iQ4HALarJBNwbJVNAAAAAElFTkSuQmCC' ; 
-
-        //==========================================================
-        // File: bs_purple.png
-        //==========================================================
-        $this->imgdata_small[7][0]= 447 ;
-        $this->imgdata_small[7][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAMAAAAMs7fIAAAAnF'.
-     'BMVEX///////+/v7/Gvca9rb3Grcb/xv+1hLWte629hL21e7XG'.
-     'hMbWhNbOe87We9b/hP//e/97OXv/c///a///Y/+cOZz/Sv/WOd'.
-     'bnOefvOe//Kf9jCGNrCGv/EP//CP/nCOf/AP/3APfvAO/nAOfe'.
-     'AN7WANbOAM7GAMa9AL21ALWtAK2lAKWcAJyUAJSMAIyEAIR7AH'.
-     'tzAHNrAGtjAGPP1sZnAAAAAXRSTlMAQObYZgAAAAFiS0dEAIgF'.
-     'HUgAAAAJcEhZcwAACxIAAAsSAdLdfvwAAAAHdElNRQfTAwkUGS'.
-     'o5QpoZAAAAnElEQVR4nI3Q2xJDMBAG4MyQokWrZz3oSkJISJH3'.
-     'f7dK0Gv/Xb7J7vyzCK0NjtPsHuH/2wlhTE7LnTNLCO/TFQjjIp'.
-     'hHAA6bY06LSqppMAY47x+04HXTba2kAFlmQKr+YuVDCGUG2k6/'.
-     'rNwYK8rKwKCnPxHnVS0aA3rag4UQslUGhrlk0Kpv1+sx3tLZ6w'.
-     'dtYemMkOsnz8R3V9/hB87DEu2Wos5+AAAAAElFTkSuQmCC' ; 
-
-
-        //==========================================================
-        // File: bs_brown.png
-        //==========================================================
-        $this->imgdata_small[8][0]= 677 ;
-        $this->imgdata_small[8][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAMAAAAMs7fIAAABaF'.
-     'BMVEX//////////8X/3oD/3nj/1HX/0Gr/xGP/rkv/gBf+iS/2'.
-     'bAL1agDxaQDuZwDrZwLpZQDmZQLlZADjcx7gZATeYQDdZgraXw'.
-     'DZXwHYXgDXiEvXZAvUjlfUXwXTjVfTbR7ShUvRbR7RWwDMWQDL'.
-     'WADKooLKWADJoYLJgkvHWATGoILFn4LFgEvFVgDEZx7EVQDDt6'.
-     '/DVQDCt6/CnoLChlfCVADAwMC+hFe+UgC8UgC6UQC4gVe4UAC3'.
-     'gVe3UAC1gFe1eUu1TwC1TgCzTgCwTQKuTACrSgCqSgCpSgCpSQ'.
-     'CodEulSACkRwCiRgCdRACcRACaQwCYQgCWQgKVQQCVQACUQACS'.
-     'UR6RPwCOPgCNPQCLPACKPACJOwCEOQCBOAB+NwB9NgB8NgB7NQ'.
-     'B6NwJ4NAB3RR52MwB0MgBuLwBtLwBsLwBqLgBpLQBkLQJiKgBh'.
-     'KgBgKwRcKABbKQJbJwBaKQRaJwBYKAJVJQDZvdIYAAAAAXRSTl'.
-     'MAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxIAAAsSAdLd'.
-     'fvwAAAAHdElNRQfTAwkUGho0tvl2AAAAtklEQVR4nGNgIBaoSg'.
-     'mLKGpowfkGMty8AqJKpi4mRlAROR5ONg4JFUv3YHOIgDo/HwsT'.
-     'q6yps29EsjZYREFIkJ2ZS9/OMzA20wEsIi8uKSZtaOPmH5WSFw'.
-     'YW0VRW07Vw8vCLSMguLwCL6FlaObp6B0TGZxSXQ9TouHv6+IXG'.
-     'JGYWlpdDzNEKCgmPjkvLKS0vL4LYxWAen5SelV8OBNZQFxrZ5h'.
-     'aC+GX2MDczMBh7pZakehkTHQ4AA0Am/jsB5gkAAAAASUVORK5C'.
-     'YII=' ; 
-
-        //==========================================================
-        // File: bs_blue.png
-        //==========================================================
-        $this->imgdata_small[9][0]= 436 ;
-        $this->imgdata_small[9][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAMAAAAMs7fIAAAAk1'.
-     'BMVEX///////+/v7+trcbGxv+EhM6EhNaEhP97e/9zc/9ra/9S'.
-     'UsZKSrVSUs5jY/9SUtZKSsZSUudKSt5KSudKSv8YGIQpKf8YGK'.
-     'UYGN4YGO8YGPcQEP8ICP8AAP8AAPcAAO8AAOcAAN4AANYAAM4A'.
-     'AMYAAL0AALUAAK0AAKUAAJwAAJQAAIwAAIQAAHsAAHMAAGsAAG'.
-     'ONFkFbAAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZ'.
-     'cwAACxIAAAsSAdLdfvwAAAAHdElNRQfTAwkUGhNNakHSAAAAmk'.
-     'lEQVR4nI3P2xKCIBAGYGfM6SBWo1nauIqogaDA+z9dK9Lhrv47'.
-     'vtl/2A2CfxNlJRRp9IETYGraJeEb7ocLNKznia8A7Db7umWDUG'.
-     'sxAzhurxRHxok4KQGqCuEhlL45oU1D2w5BztY4KRhj/bCAsetM'.
-     '2uObjwvY8/oX50JItYDxSyZSTrO2mNhvGMbaWAevnbFIcpuTr7'.
-     't+5AkyfBIKSJHdSQAAAABJRU5ErkJggg==' ; 
-
-        //==========================================================
-        // File: bs_green.png
-        //==========================================================
-        $this->imgdata_small[10][0]= 452 ;
-        $this->imgdata_small[10][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAMAAAAMs7fIAAAAn1'.
-     'BMVEX///////+/v7+/v7/G/8aUxpSMvYyUzpSMzoyM1oxarVqE'.
-     '/4R7/3tavVpKnEpaxlpz/3Nr/2tKtUpj/2Na51pKzkpK1kpK50'.
-     'pK/0oYcxgp/ykYlBgY3hgY7xgY9xgQ/xAI/wgA/wAA9wAA7wAA'.
-     '5wAA3gAA1gAAzgAAxgAAvQAAtQAArQAApQAAnAAAlAAAjAAAhA'.
-     'AAewAAcwAAawAAYwA0tyxUAAAAAXRSTlMAQObYZgAAAAFiS0dE'.
-     'AIgFHUgAAAAJcEhZcwAACxIAAAsSAdLdfvwAAAAHdElNRQfTAw'.
-     'kUGgW5vvSDAAAAnklEQVR4nI3QSxKCMAwA0M4gqCgoiiJ+kEAL'.
-     'LQUq0PufzX7ENdnlJZNkgtDS2CYZvK6bf+7EoKLA9cH5SQzv6A'.
-     'YloTywsAbYr44FrlgrXCMJwHl3xxVtuuFkJAPIcw2tGB9GcFli'.
-     'oqEf5GTkSUhVMw2TtD0XSlnDOw3SznE5520vNEi7CwW9+Ayjyq'.
-     'U/3+yPuq5gvhkhL0xlGnqL//AFf14UIh4mkEkAAAAASUVORK5C'.
-     'YII=' ; 
-
-
-        //==========================================================
-        // File: bs_white.png
-        //==========================================================
-        $this->imgdata_small[11][0]= 480 ;
-        $this->imgdata_small[11][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAABEAAAAQCAYAAADwMZRfAAAABm'.
-     'JLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsRAAALEQF/ZF+RAAAA'.
-     'B3RJTUUH0wMLFTsY/ewvBQAAAW1JREFUeJytkz2u4jAUhT/jic'.
-     'gfBUKiZhE0bIKeVbCWrIKenp6eDiGlCEEEBArIxvzGU4xeZjLk'.
-     'jWb05lRXuvbx+exr4bouX1Xjyw7Atz81F4uFBYjjGIDhcCjq1o'.
-     'k6nN1uZwFerxfP55Msy1itVmRZBsB4PK6YveHkeW5d18XzPIIg'.
-     'wPd9Wq0WnU6HMAxJkoQoiuynOIfDwUopkVIihKAoCgAcx6Hdbm'.
-     'OMIU1T5vN55eBKEikljUYDIX6kFUKU9e8aDAZlmjcca+1b7TgO'.
-     '1+uVy+VS9nzfr8e53++VzdZaiqIgz3OMMWitOZ/PaK0JgqDeRC'.
-     'mF53lIKYGfr3O73TDGoJQiTVO01nS73XqT4/FIs9kkCAIej0eZ'.
-     'brPZEMcxSZKgtQZgMpmIWpN+vy+m06n1PK9yTx8Gy+WS/X5Pr9'.
-     'er9GuHLYoiG4YhSilOpxPr9Zrtdlti/JriU5MPjUYjq7UuEWaz'.
-     '2d+P/b/qv/zi75oetJcv7QQXAAAAAElFTkSuQmCC' ; 
-
-
-        //==========================================================
-        // File: bs_cyan.png
-        //==========================================================
-        $this->imgdata_small[12][0]= 633 ;
-        $this->imgdata_small[12][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAMAAAAMs7fIAAABPl'.
-     'BMVEX////////F///AwMCvxsaC1NSC0dGCz8+CzMyA//94//91'.
-     '//9q//9j//9X4uJX09NXz89Xx8dXxMRL//9L5uZL3d1L2NhLxs'.
-     'ZLt7cv//8e9fUe8fEe7u4e398epqYehoYX//8L+PgK//8F9fUE'.
-     '/v4E5+cEb28EZ2cC//8C/v4C/f0CzMwCrq4Cjo4CdXUCaWkCZW'.
-     'UB/PwA//8A/f0A+/sA8/MA7e0A7OwA6+sA5eUA5OQA4uIA4eEA'.
-     '3NwA2toA2NgA1dUA09MA0tIA0NAAysoAxsYAxcUAxMQAv78Avr'.
-     '4AvLwAtrYAtbUAs7MAsLAAra0Aq6sAqKgApaUApKQAoqIAoKAA'.
-     'n58AmpoAlZUAk5MAkpIAkJAAj48AjIwAiYkAh4cAf38AfX0Ae3'.
-     'sAenoAcnIAcHAAa2sAaWkAaGgAYmIUPEuTAAAAAXRSTlMAQObY'.
-     'ZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxIAAAsSAdLdfvwAAA'.
-     'AHdElNRQfTAwkUGQDi+VPPAAAAtElEQVR4nGNgIBawikipyIiy'.
-     'wfksfJpGRkamNtr8LFARPiMFHmFDcztXfwGoFi0jLiZuZRtnry'.
-     'BddrCIiJEGL6eklYO7X3iCOFhE2thESdHawdUnJDZFDiyiamZh'.
-     'aevk5h0UlZSpBhaRtbN3dPHwDY5MSM+EqBFzc/f0DgiLTkjLzI'.
-     'SYw6bjHxgaEZeckZmpD7GLQSAqJj4xNRMIBGFuFtRLA/ENhGBu'.
-     'ZmDgkJBXl5fgIDocAAKcINaFePT4AAAAAElFTkSuQmCC' ; 
-
-        //==========================================================
-        // File: bs_bluegreen.png
-        //==========================================================
-        $this->imgdata_small[13][0]= 493 ;
-        $this->imgdata_small[13][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAMAAAAMs7fIAAAAvV'.
-     'BMVEX///////+/v79j//855/8x3v851v9Spb1C1v8AOUqEtcZK'.
-     'lK1StdYxzv8hxv8AY4QASmNSlK1KpcZKtd4YQlIYnM4YrecIvf'.
-     '8AtfcAre8AjL0AhLUAc5wAa5QAWnsAQloAKTkAGCFKhJxKrdYY'.
-     'jL0Ypd4Atf8ArfcApecAnN4AlM4AjMYAe60Ac6UAY4wAUnNSnL'.
-     '0AlNYAWoQASmsAOVIAITGEtc4YWnsAUnsAMUqtvcaErcYAKUIA'.
-     'GCkAECHUyVh/AAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAA'.
-     'AJcEhZcwAACxIAAAsSAdLdfvwAAAAHdElNRQfTAwkUGxNUcXCT'.
-     'AAAAqUlEQVR4nI2Q1xKCMBREM2NHLCCogAGCjd6SqLT8/2cZKT'.
-     '6zb3tm987OBWCsXoejp8rC35fi4+l6gXFZlD0Rz6fZ1tdDmKR9'.
-     'RdOmkzmP7DDpilfX3SzvRgQ/Vr1uiZplfsCBiVf03RJd140wgj'.
-     'kmNqMtuYXcxyYmNWJdRoYwzpM9qRvGujuCmSR7q7ARY00/MiWk'.
-     'sCnjkobNEm1+HknDZgAqR0GKU43+wxdu2hYzbsHU6AAAAABJRU'.
-     '5ErkJggg==' ; 
-
-        //==========================================================
-        // File: bs_lightred.png
-        //==========================================================
-        $this->imgdata_small[14][0]= 532 ;
-        $this->imgdata_small[14][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAMAAAAMs7fIAAAA3l'.
-     'BMVEX///////+/v7/Gvb0hGBj/5///3v//zu//1u//xucpGCG9'.
-     'nK21lKVSQkp7Wms5KTExISlaOUpjQlIhEBj/tdbOhKXnrcbGjK'.
-     'Wla4TetcbGnK2EWmv/rc73pcZ7UmOcY3vOpbW1jJzenLW9e5Rz'.
-     'Slq1c4xrQlJSOULGhJz/pcb3nL2chIzOnK33rcbelK3WjKWMWm'.
-     'vGe5SEUmM5ISnOtb3GrbXerb3vpb2ca3v/rcaUY3POhJxCKTF7'.
-     'SlrWnK21e4ytc4TvnLXnlK2la3taOUK1lJxrSlLGhJRjQkpSMT'.
-     'lw+q2nAAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZ'.
-     'cwAACxIAAAsSAdLdfvwAAAAHdElNRQfTAwkUGjoP2Nm+AAAAr0'.
-     'lEQVR4nGNgIBaYiOk62imYwPnMkiIyso76yhJSzFARMxkRNk49'.
-     'a3t5OW6oFk1LVkYOfWUHKxUXiEYzLS12DnN3VXkjIRtFsIiSk5'.
-     '6evqGqhYGKugAfWMRa1FpD2UHeQEXQRlgALCJur+rgbCUNFOAS'.
-     'hqjRkZe3MpBTcwEKCEPMMTGSs3Xz8OQHCnBBHckt6OJpIyAMBD'.
-     'wwN/MYc4H4LK4wNzMwmGrzcvFqmxIdDgDiHRT6VVQkrAAAAABJ'.
-     'RU5ErkJggg==' ;
-
-        //==========================================================
-        // File: bxs_lightred.png
-        //==========================================================
-        $this->imgdata_xsmall[0][0]= 432 ;
-        $this->imgdata_xsmall[0][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAMAAAC67D+PAAAA3l'.
-     'BMVEX///////+/v7/Gvb0hGBj/5///3v//zu//1u//xucpGCG9'.
-     'nK21lKVSQkp7Wms5KTExISlaOUpjQlIhEBj/tdbOhKXnrcbGjK'.
-     'Wla4TetcbGnK2EWmv/rc73pcZ7UmOcY3vOpbW1jJzenLW9e5Rz'.
-     'Slq1c4xrQlJSOULGhJz/pcb3nL2chIzOnK33rcbelK3WjKWMWm'.
-     'vGe5SEUmM5ISnOtb3GrbXerb3vpb2ca3v/rcaUY3POhJxCKTF7'.
-     'SlrWnK21e4ytc4TvnLXnlK2la3taOUK1lJxrSlLGhJRjQkpSMT'.
-     'lw+q2nAAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZ'.
-     'cwAACxEAAAsRAX9kX5EAAAAHdElNRQfTAwkUKBOgGhWjAAAAS0'.
-     'lEQVR4nGNgQAEmunYmEJaMCKe1vBxYzJKVQ9lKBSSupKdnaKGi'.
-     'zgdkiqs6WKnYcIGYJnK2HvzCwmCNgi42wsLCECNMeXlNUY0HAL'.
-     'DaB7Du8MiEAAAAAElFTkSuQmCC' ; 
-
-        //==========================================================
-        // File: bxs_bluegreen.png
-        //==========================================================
-        $this->imgdata_xsmall[1][0]= 397 ;
-        $this->imgdata_xsmall[1][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAMAAAC67D+PAAAAvV'.
-     'BMVEX///////+/v79j//855/8x3v851v9Spb1C1v8AOUqEtcZK'.
-     'lK1StdYxzv8hxv8AY4QASmNSlK1KpcZKtd4YQlIYnM4YrecIvf'.
-     '8AtfcAre8AjL0AhLUAc5wAa5QAWnsAQloAKTkAGCFKhJxKrdYY'.
-     'jL0Ypd4Atf8ArfcApecAnN4AlM4AjMYAe60Ac6UAY4wAUnNSnL'.
-     '0AlNYAWoQASmsAOVIAITGEtc4YWnsAUnsAMUqtvcaErcYAKUIA'.
-     'GCkAECHUyVh/AAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAA'.
-     'AJcEhZcwAACxEAAAsRAX9kX5EAAAAHdElNRQfTAwkUKDVyF5Be'.
-     'AAAASUlEQVR4nGNgQAFmYqJcEJaEOJ+UrD5YTJKFTZrfGCQuaq'.
-     'glLWvMaQ5kqujo6hnbKIKYXPr68gp2dmCNJiZAlh3ECGsREWtU'.
-     '4wF1kwdpAHfnSwAAAABJRU5ErkJggg==' ; 
-
-        //==========================================================
-        // File: bxs_navy.png
-        //==========================================================
-        $this->imgdata_xsmall[2][0]= 353 ;
-        $this->imgdata_xsmall[2][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAMAAAC67D+PAAAAk1'.
-     'BMVEX///////+/v7+trcbGxv+EhM6EhNaEhP97e/9zc/9ra/9S'.
-     'UsZKSrVSUs5jY/9SUtZKSsZSUudKSt5KSudKSv8YGIQpKf8YGK'.
-     'UYGN4YGO8YGPcQEP8ICP8AAP8AAPcAAO8AAOcAAN4AANYAAM4A'.
-     'AMYAAL0AALUAAK0AAKUAAJwAAJQAAIwAAIQAAHsAAHMAAGsAAG'.
-     'ONFkFbAAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZ'.
-     'cwAACxEAAAsRAX9kX5EAAAAHdElNRQfTAwkUJxXO4axZAAAAR0'.
-     'lEQVR4nGNgQAGskhKsEJaslIi8ijpYTJaDU1FVAyQuKSujoKKh'.
-     'LQ5kSigpqWro6oOYrOoaWroGBmCNWiCWAdQwUVFWVOMBOp4GCJ'.
-     's5S60AAAAASUVORK5CYII=' ; 
-
-        //==========================================================
-        // File: bxs_gray.png
-        //==========================================================
-        $this->imgdata_xsmall[3][0]= 492 ;
-        $this->imgdata_xsmall[3][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAMAAAC67D+PAAABI1'.
-     'BMVEX///8AAAD8EAD8IAD8NAD8RAD8VAAYGBi/v7+goKCCgoJk'.
-     'ZGRGRkb8yAD83AD87AD8/AD4+ADo+ADY+ADI+AC0+ACk+ACU+A'.
-     'CE+AB0/ABk/ABU/ABE/AAw/AAg/AAQ/AAA/AAA+AAA6BAA2CAA'.
-     'yDQAtEQApFQAlGQAhHQAdIgAZJgAVKgARLgAMMgAINwAEOwAAP'.
-     'wAAPgIAPAQAOgYAOAkANgsANA0AMg8AMBEALhMALBUAKhcAKBo'.
-     'AJhwAJB4AIiAAID////4+Pjy8vLs7Ozm5ubg4ODa2trT09PNzc'.
-     '3Hx8fBwcG7u7u1tbWurq6oqKiioqKcnJyWlpaQkJCJiYmDg4N9'.
-     'fX13d3dxcXFra2tkZGReXl5YWFhSUlJMTExGRkZAQEA1BLn4AA'.
-     'AAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxEA'.
-     'AAsRAX9kX5EAAAAHdElNRQfTAwkUKC74clmyAAAAQklEQVR4nG'.
-     'NgQAVBYVCGt5dXYEQ0mOnp5h4QFgVmeri6+4dHxYMVeHoFRUTH'.
-     'gTUFBIZBWAwMkZEx8bFQM2Lj0UwHANc/DV6yq/BiAAAAAElFTk'.
-     'SuQmCC' ; 
-
-        //==========================================================
-        // File: bxs_graypurple.png
-        //==========================================================
-        $this->imgdata_xsmall[4][0]= 542 ;
-        $this->imgdata_xsmall[4][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAMAAAC67D+PAAABSl'.
-     'BMVEX////////11P/MqdvKrNfAwMC+u7+9u7+4rr24lsi3rby3'.
-     'lMe1rLq1o720q7i0oL20ksSzoryyqbaykMGxlb2wkL+vnbiujb'.
-     '2sjLuri7qpl7GoirWoibenmK2mla6mjLKmhrSllauki7CjhrCj'.
-     'hLGihLChg6+ggq2fkqadkKOcfqqai6Gag6WYe6WXeqSWeaOTd6'.
-     'CTd5+Rdp6RdZ6RdZ2Qg5eOc5qMcpiLcZeJb5WIbpOHbZKGbJGE'.
-     'a4+CaY2AZ4t/Z4p/Zop/Zol+Zol7ZIZ6Y4V5YoR1ZH11X391Xn'.
-     '9zXX1yXXtxXHtvWnluWXhsV3VqVnNpVXJoVHFnU3BmUm9jUGth'.
-     'VGdgTmheTGZcS2RcSmRaSWJYR19XRl5SQllRQlhQQVdPQFZOP1'.
-     'VLPlFJO09IPE5IOk5FOEtEN0lDOEpDOElDNklCNkc/M0XhbrfD'.
-     'AAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACx'.
-     'EAAAsRAX9kX5EAAAAHdElNRQfTAwkUKCgREfyHAAAATUlEQVR4'.
-     'nGNgQAEcIko8EBY3M5Ougy+IxSXMwmTsFsAHZMqrSRvZB0W7A5'.
-     'k6FlYugXEZICaPr394Um4uSAFDRFRCbm4uxAihsDAhVOMBHT0L'.
-     'hkeRpo8AAAAASUVORK5CYII=' ; 
-
-        //==========================================================
-        // File: bxs_red.png
-        //==========================================================
-        $this->imgdata_xsmall[5][0]= 357 ;
-        $this->imgdata_xsmall[5][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAMAAAC67D+PAAAAk1'.
-     'BMVEX////////GxsbGra3/xsbOhITWhIT/hIT/e3v/c3P/a2vG'.
-     'UlK1SkrOUlL/Y2PWUlLGSkrnUlLeSkrnSkr/SkqEGBj/KSmlGB'.
-     'jeGBjvGBj3GBj/EBD/CAj/AAD3AADvAADnAADeAADWAADOAADG'.
-     'AAC9AAC1AACtAAClAACcAACUAACMAACEAAB7AABzAABrAABjAA'.
-     'BuukXBAAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZ'.
-     'cwAACxEAAAsRAX9kX5EAAAAHdElNRQfTAwkUIyjy5SVMAAAAS0'.
-     'lEQVR4nGNgQAFsUpJsEJastIi8ijpYTJaDU0FVgxXIlJKVUVDR'.
-     '0BYHMiUUlVQ1dPVBTDZ1dS1dAwOQAgYtbSDLAGIEq6goK6rxAD'.
-     'yXBg73lwGUAAAAAElFTkSuQmCC' ; 
-
-        //==========================================================
-        // File: bxs_yellow.png
-        //==========================================================
-        $this->imgdata_xsmall[6][0]= 414 ;
-        $this->imgdata_xsmall[6][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAMAAAC67D+PAAAAzF'.
-     'BMVEX///////+/v79zYwCMewDOxoTWzoTezkr/5wj/5wDnzgDe'.
-     'xgC1pQCtnACllACcjACUhABjWgDGvVK1rUrOxlLGvUqEexilnB'.
-     'jv3hj35xj/7wj/7wD35wDv3gDn1gDezgDWxgDOvQDGtQC9rQCE'.
-     'ewB7cwBzawBrYwDWzlLn3lLe1krn3kre1hi9tQC1rQCtpQClnA'.
-     'CclACUjACMhAD/9wC/v7///8bOzoT//4T//3v//3P//2v//2Pn'.
-     '50r//0r//yn39xj//xD//wBjYwDO8noaAAAAAXRSTlMAQObYZg'.
-     'AAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxEAAAsRAX9kX5EAAAAH'.
-     'dElNRQfTAwkUIzoBXFQEAAAAS0lEQVR4nGNgQAFsDhJsEJaTo5'.
-     '2skj5YzMnSSk7ZwBzIlOSUklPiMxYHMnW4FXT5VNVBTDZeXiNV'.
-     'QUGQAgYBYyBLEGIEq5gYK6rxAH4kBmHBaMQQAAAAAElFTkSuQm'.
-     'CC' ; 
-
-        //==========================================================
-        // File: bxs_greenblue.png
-        //==========================================================
-        $this->imgdata_xsmall[7][0]= 410 ;
-        $this->imgdata_xsmall[7][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAMAAAC67D+PAAAAxl'.
-     'BMVEX///////+/v79znJQhSkJ7raU5hHtjraVKnJRCjIRClIyU'.
-     '9++E595avbVaxr2/v7+ctbWcvb17nJxrjIx7paUxQkK9//+Mvb'.
-     '17ra2Evb17tbVCY2MQGBiU5+ec9/eM5+d71tZanJxjra1rvb1j'.
-     'tbVSnJxara1rzs5jxsZKlJRChIQpUlIhQkJatbVSpaU5c3MxY2'.
-     'MYMTEQISFavb1Sra1KnJxCjIw5e3sxa2spWlpClJQhSkoYOTkp'.
-     'Y2MhUlIQKSkIGBgQMTH+e30mAAAAAXRSTlMAQObYZgAAAAFiS0'.
-     'dEAIgFHUgAAAAJcEhZcwAACxEAAAsRAX9kX5EAAAAHdElNRQfT'.
-     'AwkUJy5/6kV9AAAATUlEQVR4nGNgQAGCyuyCEJaGugKHviVYzF'.
-     'hO3sxCWwDIVNLTM9PXtpEGMhW12Cy0DR1ATEFLSxZ7BweQAgYd'.
-     'HUMHBweIEQKiogKoxgMAo/4H5AfSehsAAAAASUVORK5CYII=' ; 
-
-        //==========================================================
-        // File: bxs_purple.png
-        //==========================================================
-        $this->imgdata_xsmall[8][0]= 364 ;
-        $this->imgdata_xsmall[8][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAMAAAC67D+PAAAAnF'.
-     'BMVEX///////+/v7/Gvca9rb3Grcb/xv+1hLWte629hL21e7XG'.
-     'hMbWhNbOe87We9b/hP//e/97OXv/c///a///Y/+cOZz/Sv/WOd'.
-     'bnOefvOe//Kf9jCGNrCGv/EP//CP/nCOf/AP/3APfvAO/nAOfe'.
-     'AN7WANbOAM7GAMa9AL21ALWtAK2lAKWcAJyUAJSMAIyEAIR7AH'.
-     'tzAHNrAGtjAGPP1sZnAAAAAXRSTlMAQObYZgAAAAFiS0dEAIgF'.
-     'HUgAAAAJcEhZcwAACxEAAAsRAX9kX5EAAAAHdElNRQfTAwkUIj'.
-     'mBTjT/AAAASUlEQVR4nGNgQAGskhKsEJaCrJiSuhZYTEFASFlD'.
-     'GyQuqSCnrK6tJwpkiquoamgbGIGYrFpaugbGxmCNunpAljHECB'.
-     'ZBQRZU4wFSMAZsXeM71AAAAABJRU5ErkJggg==' ; 
-
-        //==========================================================
-        // File: bxs_green.png
-        //==========================================================
-        $this->imgdata_xsmall[9][0]= 370 ;
-        $this->imgdata_xsmall[9][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAMAAAC67D+PAAAAn1'.
-     'BMVEX///////+/v7+/v7/G/8aUxpSMvYyUzpSMzoyM1oxarVqE'.
-     '/4R7/3tavVpKnEpaxlpz/3Nr/2tKtUpj/2Na51pKzkpK1kpK50'.
-     'pK/0oYcxgp/ykYlBgY3hgY7xgY9xgQ/xAI/wgA/wAA9wAA7wAA'.
-     '5wAA3gAA1gAAzgAAxgAAvQAAtQAArQAApQAAnAAAlAAAjAAAhA'.
-     'AAewAAcwAAawAAYwA0tyxUAAAAAXRSTlMAQObYZgAAAAFiS0dE'.
-     'AIgFHUgAAAAJcEhZcwAACxEAAAsRAX9kX5EAAAAHdElNRQfTAw'.
-     'kUKBrZxq0HAAAATElEQVR4nGNgQAGccrIcEJaivISyhjaIxa7I'.
-     'I6CiqcMKZMopKqho6OhLA5kyqmqaOobGICartraeoYkJSAGDnj'.
-     '6QZQIxgk1Skg3VeABlVgbItqEBUwAAAABJRU5ErkJggg==' ; 
-
-        //==========================================================
-        // File: bxs_darkgreen.png
-        //==========================================================
-        $this->imgdata_xsmall[10][0]= 563 ;
-        $this->imgdata_xsmall[10][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAMAAAC67D+PAAABX1'.
-     'BMVEX////////l/+nAwMC86r+8wb28wby8wLy78sCzw7SywrSx'.
-     'wLKwvrGuvK+syK+ryq2rx62n36ym3aumxKmk2qij0Keh16ahva'.
-     'Og1aSguKKe06KeuaCetZ+d0KGdtZ+bz6Cay56ZyZ2Zwp2Zr5qZ'.
-     'rpqYwJuXyZuXrJmVw5mUxZiTxJeTw5eTq5WRwJWPtJKOvZKKuI'.
-     '6Kt42Kn4yJt42ItIuGsomFsYmEsIiEr4eDr4eBrIR/qoN+qIJ8'.
-     'poB7pH56o356on14nnt2nXl0mndzmnZzmXZymHVwlXNvlHJukn'.
-     'FtiHBqjm1qjW1oi2toiWpniWplh2hlhmdkhWdig2VggGNgf2Je'.
-     'fmFdfGBde19bbl1aeFxXdFpWclhVclhVcVdUcFZTb1VSbVRQal'.
-     'JPaVFKY0xKYkxJYUtIYEpHX0lEWkZCWERCV0NCVkM/U0A+U0A+'.
-     'UUA+UEA9Uj89UT48Tj45TDvewfrHAAAAAXRSTlMAQObYZgAAAA'.
-     'FiS0dEAIgFHUgAAAAJcEhZcwAACxEAAAsRAX9kX5EAAAAHdElN'.
-     'RQfTAwkUKCFozUQjAAAATUlEQVR4nGNgQAGcoqrcEJYQB5OhSw'.
-     'CIxSXGwWThGcIDZCppK5o7hyV6AZl6NnbuoSmFICZ3YHB0RkkJ'.
-     'SAFDbEJaSUkJxAjeyEheVOMBQj4MOEkWew4AAAAASUVORK5CYI'.
-     'I=' ; 
-
-        //==========================================================
-        // File: bxs_cyan.png
-        //==========================================================
-        $this->imgdata_xsmall[11][0]= 530 ;
-        $this->imgdata_xsmall[11][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAMAAAC67D+PAAABPl'.
-     'BMVEX////////F///AwMCvxsaC1NSC0dGCz8+CzMyA//94//91'.
-     '//9q//9j//9X4uJX09NXz89Xx8dXxMRL//9L5uZL3d1L2NhLxs'.
-     'ZLt7cv//8e9fUe8fEe7u4e398epqYehoYX//8L+PgK//8F9fUE'.
-     '/v4E5+cEb28EZ2cC//8C/v4C/f0CzMwCrq4Cjo4CdXUCaWkCZW'.
-     'UB/PwA//8A/f0A+/sA8/MA7e0A7OwA6+sA5eUA5OQA4uIA4eEA'.
-     '3NwA2toA2NgA1dUA09MA0tIA0NAAysoAxsYAxcUAxMQAv78Avr'.
-     '4AvLwAtrYAtbUAs7MAsLAAra0Aq6sAqKgApaUApKQAoqIAoKAA'.
-     'n58AmpoAlZUAk5MAkpIAkJAAj48AjIwAiYkAh4cAf38AfX0Ae3'.
-     'sAenoAcnIAcHAAa2sAaWkAaGgAYmIUPEuTAAAAAXRSTlMAQObY'.
-     'ZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxEAAAsRAX9kX5EAAA'.
-     'AHdElNRQfTAwkUKQFKuFWqAAAATUlEQVR4nGNgQAGsUjJsEJaR'.
-     'grC5qz9YzIiL28YriB3IlDZRsnYNiZUDMmXtHT2CE9JBTDb/wI'.
-     'jkzEyQAoaomMTMzEyIERzy8hyoxgMAN2MLVPW0f4gAAAAASUVO'.
-     'RK5CYII=' ; 
-
-        //==========================================================
-        // File: bxs_orange.png
-        //==========================================================
-        $this->imgdata_xsmall[12][0]= 572 ;
-        $this->imgdata_xsmall[12][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAMAAAC67D+PAAABaF'.
-     'BMVEX//////////8X/3oD/3nj/1HX/0Gr/xGP/rkv/gBf+iS/2'.
-     'bAL1agDxaQDuZwDrZwLpZQDmZQLlZADjcx7gZATeYQDdZgraXw'.
-     'DZXwHYXgDXiEvXZAvUjlfUXwXTjVfTbR7ShUvRbR7RWwDMWQDL'.
-     'WADKooLKWADJoYLJgkvHWATGoILFn4LFgEvFVgDEZx7EVQDDt6'.
-     '/DVQDCt6/CnoLChlfCVADAwMC+hFe+UgC8UgC6UQC4gVe4UAC3'.
-     'gVe3UAC1gFe1eUu1TwC1TgCzTgCwTQKuTACrSgCqSgCpSgCpSQ'.
-     'CodEulSACkRwCiRgCdRACcRACaQwCYQgCWQgKVQQCVQACUQACS'.
-     'UR6RPwCOPgCNPQCLPACKPACJOwCEOQCBOAB+NwB9NgB8NgB7NQ'.
-     'B6NwJ4NAB3RR52MwB0MgBuLwBtLwBsLwBqLgBpLQBkLQJiKgBh'.
-     'KgBgKwRcKABbKQJbJwBaKQRaJwBYKAJVJQDZvdIYAAAAAXRSTl'.
-     'MAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxEAAAsRAX9k'.
-     'X5EAAAAHdElNRQfTAwkUJBSSy88MAAAATUlEQVR4nGNgQAGqwo'.
-     'paEBYPJ4eKezCIpc7HwmrqG6ENZMpLihm6RaWEAZl6Vo7ekRnF'.
-     'IKZWSHhcTnk5SAFDfFJWeXk5xAjj1FRjVOMBeFwNcWYSLjsAAA'.
-     'AASUVORK5CYII=' ; 
-
-        //==========================================================
-        // File: bxs_lightblue.png
-        //==========================================================
-        $this->imgdata_xsmall[13][0]= 554 ;
-        $this->imgdata_xsmall[13][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAMAAAC67D+PAAABVl'.
-     'BMVEX////////d///AwMC7wcS08P+y+P+xxdCwxM+uws2twMur'.
-     'vsinzNynytylzuKhyN6e5v6d5P+d1fOcwNWcu8ub4f+at8iZ3v'.
-     '+ZvdGY2/yW2f+VscGU1vuT1fqTr72Sx+SSxeKR0fWRz/GPz/OP'.
-     'rr+OyeqMy+6Myu2LyeyKxueJudSGw+SGorGDvt+Cvd6CvN2Aud'.
-     'p+uNd+t9Z9tdV8tdR8tNN6sc94r813rct2q8h0qcZ0qMVzp8Rx'.
-     'o8Bwor5tn7ptnrptnrlsnbhqmbRpmbNpi51ol7Flkqtkkqtkka'.
-     'pjj6hijaRhjaZgi6NfiqJfiaFdh55bhJtag5pZgphYgJZYf5VX'.
-     'cn9Ve5FSeI1RdopRdYlQdYlPc4dPcoZPcoVNcINLboBLbH9GZn'.
-     'hGZXdFZHZEY3RDYnJCXW4/W2s/WWg+Wmo7VmU7VGM7U2E6VGM6'.
-     'VGI5UV82T1wGxheQAAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHU'.
-     'gAAAAJcEhZcwAACxEAAAsRAX9kX5EAAAAHdElNRQfTAwkUJziL'.
-     'PvAsAAAATUlEQVR4nGNgQAHsQgqcEJYgG5Oegy+IxSHOxmTiFs'.
-     'gFZMprKBnbB8e7AplaFlbOQUl5ICanX0BEWmEhSAFDVGxKYWEh'.
-     'xAjusDBuVOMBJO8LrFHRAykAAAAASUVORK5CYII=' ; 
-
-        //==========================================================
-        // File: bxs_darkgray.png
-        //==========================================================
-        $this->imgdata_xsmall[14][0]= 574 ;
-        $this->imgdata_xsmall[14][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAABm'.
-     'JLR0QAAAAAAAD5Q7t/AAAACXBIWXMAAAsRAAALEQF/ZF+RAAAB'.
-     'iElEQVR42k3QPU8TYRwA8P//ebkXrgdIColXRAOEkJqbaExMut'.
-     'DBhE1GNjYHPg+DG6ODiU6QOLjVxITBcFKBYCstlAC2Bz17fe76'.
-     'vLD6+wg/1FpTRFR5lpaub/u1eGBGaAT4HneD4OlXx7avtDYUjT'.
-     'HQabd2Ti8e3vVSKzxrtHS32wIpFVldno22Nqvvg2Bhl0gp/aNm'.
-     'vJ3qqXAtLIva+ks1H0wqlSXi4+d6+OFTfRsAfHJx2d1od24rZP'.
-     'xP2HzopINr1mkesX7ccojqif0v9crxWXODZTno3+dNGA7uWLsd'.
-     'mUYU4fHJCViMG9umLBmM4L6fagZGg9QKfjZ+Qfy3C3G/B3mugF'.
-     'IHHNcDf64E3KJALApk2p8CSolUUqLjFkyxOGMsTtFyJ+Wz57NQ'.
-     '8DghS4sLB0svioeZZo7nPhFoUKZDIVFbglkTTnl5/rC8snjAkJ'.
-     'Bk/XV5LxHC/v7tR8jzTFPbg8LENK9WX0Vv31T2AEmCSmlKCCoh'.
-     'ROnP1U1tPFYjJBRcbtzSf+GPsFTAQBq1n4AAAABKdEVYdHNpZ2'.
-     '5hdHVyZQBiYzYyMDIyNjgwYThjODMyMmUxNjk0NWUzZjljOGFh'.
-     'N2VmZWFhMjA4OTE2ZjkwOTdhZWE1MzYyMjk0MWRkM2I5EqaPDA'.
-     'AAAABJRU5ErkJggg==' ; 
-    }
-}
-
-?>
diff --git a/#jpgraph/src/imgdata_bevels.inc.php b/#jpgraph/src/imgdata_bevels.inc.php
deleted file mode 100644
index c98fa571..00000000
--- a/#jpgraph/src/imgdata_bevels.inc.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-//=======================================================================
-// File:        IMGDATA_BEVELS.INC
-// Description: Base64 encoded images for round bevels
-// Created:     2003-03-20
-// Ver:         $Id: imgdata_bevels.inc.php 1106 2009-02-22 20:16:35Z ljp $
-//
-// Copyright (c) Asial Corporation. All rights reserved.
-//========================================================================
-
-class ImgData_Bevels extends ImgData {
-    protected $name = 'Round Bevels';
-    protected $an = array(MARK_IMG_BEVEL => 'imgdata');
-
-    protected $colors = array('green','purple','orange','red','yellow');
-    protected $index  = array('green'=>1,'purple'=>4,'orange'=>2,'red'=>0,'yellow'=>3);
-    protected $maxidx = 4 ;
-
-    protected $imgdata ;
-
-    function __construct() {
-        //==========================================================
-        // File: bullets_balls_red_013.png
-        //==========================================================
-        $this->imgdata[0][0]= 337 ;
-        $this->imgdata[0][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAMAAAAMs7fIAAAAM1'.
-     'BMVEX////////27t/f3+LFwcmNxMuxm62DmqKth1VpZmIWg6fv'.
-     'HCa7K0BwMEytCjFnIyUlEBg9vhQvAAAAAXRSTlMAQObYZgAAAA'.
-     'FiS0dEAIgFHUgAAAAJcEhZcwAACxIAAAsSAdLdfvwAAAAHdElN'.
-     'RQfTAxcBNhk+pYJVAAAAl0lEQVR4nE2Q2xLDIAgFHUWBKJf//9'.
-     'oekmbafVDZARRbK/pYTKP9WNcNv64zzUdd9BjmrgnsVXRNSzO3'.
-     'CJ5ahdhy0XKQkxld1kxb45j7dp0x2lBNOyVgQpMaoadX7Hs7zr'.
-     'P1yKj47DKBnKaBKiSAkNss7O6PkMx6kIgYXISQJpcZCqdY6KR+'.
-     'J1PkS5Xob/h7MNz8x6D3fz5DKQjpkZOBYAAAAABJRU5ErkJggg'.
-     '==' ; 
-
-        //==========================================================
-        // File: bullets_balls_green_013.png
-        //==========================================================
-        $this->imgdata[1][0]= 344 ;
-        $this->imgdata[1][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAMAAAAMs7fIAAAAM1'.
-     'BMVEX////////27t/e3+K3vriUub/Dm18j4xc3ob10k0ItqQlU'.
-     'e5JBmwpxY1ENaKBgUh0iHgwsSre9AAAAAXRSTlMAQObYZgAAAA'.
-     'FiS0dEAIgFHUgAAAAJcEhZcwAACxIAAAsSAdLdfvwAAAAHdElN'.
-     'RQfTAxcBNTfJXtxZAAAAnklEQVR4nE2QWY4EMQhDUVhSIRC4/2'.
-     'kbaqLp9p+f2AxAayAzDfiK9znPORuvH0x8Ss9z6I9sHp6tcxE9'.
-     'nLmWmebmt5F5p2AR0+C9AWpLBjXRaZsCAT3SqklVp0YkAWaGtd'.
-     'c5Z41/STYpPzW7BjyiRrwkVmQto/Cw9tNEMvsgcekyCyFPboIu'.
-     'IsuXiKffYB4NK4r/h6d4g9HPPwCR7i8+GscIiiaonUAAAAAASU'.
-     'VORK5CYII=' ; 
-
-        //==========================================================
-        // File: bullets_balls_oy_035.png
-        //==========================================================
-        $this->imgdata[2][0]= 341 ;
-        $this->imgdata[2][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAMAAAAMs7fIAAAAM1'.
-     'BMVEX////////27t/f3+K5tbqNwcjnkjXjbxR2i5anfEoNkbis'.
-     'PBxpU0sZbZejKgdqIRIlERIwYtkYAAAAAXRSTlMAQObYZgAAAA'.
-     'FiS0dEAIgFHUgAAAAJcEhZcwAACxIAAAsSAdLdfvwAAAAHdElN'.
-     'RQfTAxcBNgK0wEu5AAAAm0lEQVR4nE3QVxIEIQgEUErAgTHA/U'.
-     '+7zbipf9RXgoGo0liMmX6RdSPLPtZM9F4LuuSIaZtZWffiU6Iz'.
-     'Y8SOMF0NogBj30ioGRGLZgiPvce1TbIRz6oBQEbOFGK0rIoxrn'.
-     '5hDomMA1cfGRCaRVhjS3gkzheM+4HtnlkXcvdZhWG4qZawewe6'.
-     '9Jnz/TKLB/ML6HUepn//QczazuwFO/0Ivpolhi4AAAAASUVORK'.
-     '5CYII=' ; 
-
-        //==========================================================
-        // File: bullets_balls_oy_036.png
-        //==========================================================
-        $this->imgdata[3][0]= 340 ;
-        $this->imgdata[3][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAMAAAAMs7fIAAAAM1'.
-     'BMVEX////////27t/e3+LO3hfYzz65ubiNwci6uQ12ipadgVGa'.
-     'fwsNkbhnVkcaZ5dwSA8lFg7CEepmAAAAAXRSTlMAQObYZgAAAA'.
-     'FiS0dEAIgFHUgAAAAJcEhZcwAACxEAAAsRAX9kX5EAAAAHdElN'.
-     'RQfTAxcCBySi1nevAAAAjElEQVR4nFXPWw7EIAgFUNMoCMhj/6'.
-     'staKczc/2RkwjS2glQ+w3YytgXCXCZpRo8gJdGxZadJws13CUP'.
-     '4SZI4MYiUxypeiGGw1XShVBTNN9kLXP2GRrZPFvKgd7z/sqGGV'.
-     '7C7r7r3l09alYN3iA8Yn+ImdVrNoEeSRqJPAaHfhZzLYwXstdZ'.
-     'rP3n2bvdAI4INwtihiwAAAAASUVORK5CYII=' ;
-
-        //==========================================================
-        // File: bullets_balls_pp_019.png
-        //==========================================================
-        $this->imgdata[4][0]= 334 ;
-        $this->imgdata[4][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAMAAAAMs7fIAAAAM1'.
-     'BMVEX////+/v7i4eO/w8eHxcvKroNVormtfkjrMN2BeXQrepPc'.
-     'Esy4IL+OFaR7F25LHF8mFRh5XXtUAAAAAXRSTlMAQObYZgAAAA'.
-     'FiS0dEAIgFHUgAAAAJcEhZcwAACxIAAAsSAdLdfvwAAAAHdElN'.
-     'RQfTAxcBNgkjEpIxAAAAlElEQVR4nE2QAQ7FIAhDDTAVndL7n3'.
-     'ZV/7JfEwMvFIWUlkTMVNInbVv5ZeJqG7Smh2QTBwJBpsdizAZP'.
-     '5NyW0awhK8kYodnZxS6ECvPRp2sI+y7PBv1mN02KH7h77QCJ8D'.
-     '4VvY5NUgEmCwj6ZMzHtJRgRSXwC1gfcqJJH0GBnSnK1kUQ72DY'.
-     'CPBv+MCS/e0jib77eQAJxwiEWm7hFwAAAABJRU5ErkJggg==' ; 
-
-    }
-}
-
-
-?>
diff --git a/#jpgraph/src/imgdata_diamonds.inc.php b/#jpgraph/src/imgdata_diamonds.inc.php
deleted file mode 100644
index a0d6a421..00000000
--- a/#jpgraph/src/imgdata_diamonds.inc.php
+++ /dev/null
@@ -1,177 +0,0 @@
-<?php
-//=======================================================================
-// File:        IMGDATA_DIAMONDS.INC
-// Description: Base64 encoded images for diamonds
-// Created:     2003-03-20
-// Ver:         $Id: imgdata_diamonds.inc.php 1106 2009-02-22 20:16:35Z ljp $
-//
-// Copyright (c) Asial Corporation. All rights reserved.
-//========================================================================
-
-class ImgData_Diamonds extends ImgData {
-    protected $name = 'Diamonds';
-    protected $an = array(MARK_IMG_DIAMOND =>'imgdata');
-    protected $colors = array('lightblue','darkblue','gray',
-   'blue','pink','purple','red','yellow');
-    protected $index  = array('lightblue' =>7,'darkblue'=>2,'gray'=>6,
-   'blue'=>4,'pink'=>1,'purple'=>5,'red'=>0,'yellow'=>3);
-
-    protected $maxidx = 7 ;
-    protected $imgdata ;
-
-    function __construct() {
-        //==========================================================
-        // File: diam_red.png
-        //==========================================================
-        $this->imgdata[0][0]= 668 ;
-        $this->imgdata[0][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAABsAAAAbCAMAAAC6CgRnAAAA/F'.
-     'BMVEX///////+cAAD/AADOAABjAABrAADWGBjOCAj/CAj/GBj/'.
-     'EBCcCAiMOTl7KSl7ISFzGBilGBjOEBBrCAjv5+eMQkK1QkKtMT'.
-     'GtKSnWKSn/KSlzEBCcEBDexsb/tbXOe3ucWlqcUlKUSkr/e3vn'.
-     'a2u9UlL/a2uEMTHeUlLeSkqtOTn/UlL/SkrWOTn/QkL/OTmlIS'.
-     'H/MTH/ISH39/f/9/f35+fezs7/5+fvzs7WtbXOra3nvb3/zs7G'.
-     'nJzvtbXGlJTepaW9jIy1hITWlJS1e3uta2ulY2P/lJTnhITne3'.
-     'vGY2O9Wlr/c3PeY2O1Skr/Y2P/WlreQkLWISGlEBCglEUaAAAA'.
-     'AXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxIAAA'.
-     'sSAdLdfvwAAAAHdElNRQfTAwsWEw5WI4qnAAABGUlEQVR4nHXQ'.
-     '1XLDMBAFUKUCM1NiO8zcpIxpp8z0//9SWY7b2LHv6EU6s1qtAN'.
-     'iMBAojLPkigpJvogKC4pxDuQipjanlICXof1RQDkYEF21mKIfg'.
-     '/GGKtjAmOKt9oSyuCU7OhyiDCQnjowGfRnooCJIkiWJvv8NxnG'.
-     'nyNAwFcekvZpPP3mu7Vrp8fOq8DYbTyjdnAvBj7Jbd7nP95urs'.
-     '+MC2D6unF+Cu0VJULQBAlsOQuueN3Hrp2nGUvqppemBZ0aU7Se'.
-     'SXvYZFMKaLJn7MH3btJmZEMEmGSOreqy0SI/4ffo3uiUOYEACy'.
-     'OFopmNWlP5uZd9uPWmUoxvK9ilO9NtBo6mS7KkZD0fOJYqgGBU'.
-     'S/T7OKCAA9tfsFOicXcbxt29cAAAAASUVORK5CYII=' ; 
-
-        //==========================================================
-        // File: diam_pink.png
-        //==========================================================
-        $this->imgdata[1][0]= 262 ;
-        $this->imgdata[1][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAABsAAAAbBAMAAAB/+ulmAAAAEl'.
-     'BMVEX///+AgID/M5n/Zpn/zMz/mZn1xELhAAAAAXRSTlMAQObY'.
-     'ZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxIAAAsSAdLdfvwAAA'.
-     'AHdElNRQfTAwsWEi3tX8qUAAAAbUlEQVR4nFXJwQ3AMAhDUdRm'.
-     'kKojuCswABf2X6UEEiC+WF+PyDfoGEuvwXogq3Rk1Y6W0tBSG8'.
-     '6Uwpla6CmJnpoYKRsjjb/Y63vo9kIkLcZCCsbGYGwMRqIzEp1R'.
-     'OBmFk9HQGA2N0ZEIz5HX+h/jailYpfz4dAAAAABJRU5ErkJggg'.
-     '==' ; 
-
-        //==========================================================
-        // File: diam_blue.png
-        //==========================================================
-        $this->imgdata[2][0]= 662 ;
-        $this->imgdata[2][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAABsAAAAbCAMAAAC6CgRnAAAA+V'.
-     'BMVEX///+AgIAAAJwAAP8AAM4AAGMAAGsQEP8YGHMQEHMYGP8Q'.
-     'EKUICJwICM5KSpQxMYQpKXsYGNYQEM4ICGsICP97e85aWpw5OY'.
-     'xSUv85ObVCQt4xMa0pKa0hIaUpKf+9vd6EhLVra+dzc/9SUr1r'.
-     'a/9aWt5SUt5CQrVaWv9KSv8hIXs5Of8xMf8pKdYhIdYYGKUhIf'.
-     '/Ozs739//v7/fn5+/v7//n5/fW1ufOzufOzu/W1v+trc69veel'.
-     'pc6trd6UlMa9vf+MjL21tfe1tf+UlNZzc61ra6Wlpf+EhOeMjP'.
-     '9ra8ZSUpyEhP9CQoxKSrVCQv85Od4xMdYQENZnJhlWAAAAAXRS'.
-     'TlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxIAAAsSAd'.
-     'LdfvwAAAAHdElNRQfTAwsWEx3Snct5AAABFklEQVR4nHXR5XbD'.
-     'IBgGYM6AuHsaqbvOfeuknev9X8xISbplSd5/8JyXwwcA/I0AKm'.
-     'PFchVBdvKNKggKQx2VIoRwMZihMiQE49YUlWBCcPL0hYq4ITh+'.
-     'qKECUoLDZWqoQNA766F/mJHlHXblPJJNiyURhM5eU9cNw5BlmS'.
-     'IrLOLxhzfotF7vwO2j3ez2ap/TmW4AIM7DoN9+tu+vLk6Pdg9O'.
-     '6ufXjfXLm6pxPACSJIpRFAa+/26DhuK6qjbiON40k0N3skjOvm'.
-     'NijBmchF5mi+1jhQqDmWyIzPp1hUlrv8On5l+6mMm1tigFNyrt'.
-     '5R97g+FKKyGKkTNKesXPJTZXOFIrUoKiypcTQVHjK4g8H2dWEQ'.
-     'B8bvUDLSQXSr41rmEAAAAASUVORK5CYII=' ; 
-
-        //==========================================================
-        // File: diam_yellow.png
-        //==========================================================
-        $this->imgdata[3][0]= 262 ;
-        $this->imgdata[3][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAABsAAAAbBAMAAAB/+ulmAAAAEl'.
-     'BMVEX///+AgIBmMwCZZgD/zADMmQD/QLMZAAAAAXRSTlMAQObY'.
-     'ZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxIAAAsSAdLdfvwAAA'.
-     'AHdElNRQfTAwsWEwcv/zIDAAAAbUlEQVR4nFXJwQ3AMAhDUdRm'.
-     'kKojuCswABf2X6UEEiC+WF+PyDfoGEuvwXogq3Rk1Y6W0tBSG8'.
-     '6Uwpla6CmJnpoYKRsjjb/Y63vo9kIkLcZCCsbGYGwMRqIzEp1R'.
-     'OBmFk9HQGA2N0ZEIz5HX+h/jailYpfz4dAAAAABJRU5ErkJggg'.
-     '==' ; 
-
-        //==========================================================
-        // File: diam_lightblue.png
-        //==========================================================
-        $this->imgdata[4][0]= 671 ;
-        $this->imgdata[4][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAABsAAAAbCAMAAAC6CgRnAAAA/1'.
-     'BMVEX///+AgIAAnP8A//8Azv8AY/8Aa/8I//8Y1v8Izv8Y//8Q'.
-     '//8InP8Qzv8Ypf85jP8he/8Yc/8Ia/8pe/8p//8p1v9Ctf8xrf'.
-     '8prf8QnP8Qc/9CjP+1//97//9r//9S//9K//9C//85//8x//8h'.
-     '//9r5/9K3v9S3v851v97zv9Svf85rf8hpf/G3v9SnP9anP9KlP'.
-     '8xhP/n7//v7+f3///n///O//+U//9z//9j//9a//975/9C3v8h'.
-     '1v+E5/+17/9j3v/O7//n9/+95/+l3v9jxv+U1v8Qpf9avf9Ktf'.
-     '+Uxv+11v97tf9rrf+cxv+Mvf9jpf+tzv+Etf/O3v/39/8Akkxr'.
-     'AAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACx'.
-     'IAAAsSAdLdfvwAAAAHdElNRQfTAwsWEiHk6Ya/AAABGUlEQVR4'.
-     'nHXQ13KDMBAF0J2o0E01GHDvJa7p3em95/+/JQJMYjDc0Yt0Zr'.
-     'VaAaxHgtxwbSGPkGQpOIeQ2ORxJiJmNWYZyAhZR0WcgQGhViU0'.
-     'nEGoedDHGxgRapRPcRpXhOr7XZzCmLjaXk9IIjvkOEmSRLG62+'.
-     'F5XlEElhA5sW21GvXj6mGlDBfnJ51lr9svnvEKwH1hu2QPbwd3'.
-     'N9eXVzuL7/Hn29frdKaamgcgy67L3HFG9gDefV+dm5qme4YRXL'.
-     'oVR374mRqUELZYosf84XAxISFRQuMh4rrH8YxGSP6HX6H97NNQ'.
-     'KEAaR08qCeuSnx2a8zIPWqUowtKHSRK91rAw0elmVYQFVc8mhq'.
-     '7p5RD7Ps3IIwA9sfsFxFUX6eZ4Zh4AAAAASUVORK5CYII=' ; 
-
-        //==========================================================
-        // File: diam_purple.png
-        //==========================================================
-        $this->imgdata[5][0]= 657 ;
-        $this->imgdata[5][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAABsAAAAbCAMAAAC6CgRnAAAA/F'.
-     'BMVEX///////8xAP/OAP+cAP9jAP9rAP+cCP85CP/OEP9SKf/O'.
-     'CP9CEP9zGP9rCP+lGP/WOf/WIf9KIf9jOf+MQv+EMf97If9zEP'.
-     '+1Sv+lIf/ne//eUv/na//n5//Oxv/Wzv+chP9zUv97Wv9rQv9a'.
-     'Mf9KGP/v5/+te/97Kf+9Y/+tOf+tKf+lEP/vtf/WMf/WKf/v7+'.
-     'f39/+tnP+9rf9rSv9jQv9CGP+ljP+EY//Gtf+tlP+Ma/9zSv/e'.
-     'zv+UUv+9lP+cWv+lY/+cUv+MOf+EKf+UQv/Opf/OhP/Ga/+1Qv'.
-     '/Oe/+9Uv/ntf/eWv/eSv/WGP/3zv/vlP/WEP//9/+pL4oHAAAA'.
-     'AXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxIAAA'.
-     'sSAdLdfvwAAAAHdElNRQfTAwsWEjX+M1LCAAABDklEQVR4nHXQ'.
-     '1bLDIBAGYFqIEW+ksbr7cXd3ff93OUCamdOE/Mxw882yywLwPz'.
-     '+gNKotlRFUVnNUQlCxTMRFCKEdE+MgpJaEiIOU4DKaoSIygtb3'.
-     'FBUQrm3xjPK4JvXjK0A5hFniYSBtIilQVYUm+X0KTVNiYah+2q'.
-     'ulFb8nUbSovD2+TCavwXQWmnMA6ro+di+uR5cPzfPhVqPV3N1p'.
-     'n3b3+rimAWAYhP3xnXd7P6oc9vadPsa1wYEs00dFQRAFehlX21'.
-     '25Sg9NOgwF5jeNTjVL9om0TjDc1lmeCKZ17nFPzhPtSRt6J06R'.
-     'WKUoeG3MoXRa/wjLHGLodwZcotPqjsYngnWslRBZH91hWTbpD2'.
-     'EdF1ECWW1SAAAAAElFTkSuQmCC' ; 
-
-        //==========================================================
-        // File: diam_gray.png
-        //==========================================================
-        $this->imgdata[6][0]= 262 ;
-        $this->imgdata[6][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAABsAAAAbBAMAAAB/+ulmAAAAEl'.
-     'BMVEX//////wAzMzNmZmbMzMyZmZlq4Qo5AAAAAXRSTlMAQObY'.
-     'ZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxIAAAsSAdLdfvwAAA'.
-     'AHdElNRQfTAwsWExZFTxLxAAAAbUlEQVR4nFXJwQ3AMAhDUdRm'.
-     'kKojuCswABf2X6UEEiC+WF+PyDfoGEuvwXogq3Rk1Y6W0tBSG8'.
-     '6Uwpla6CmJnpoYKRsjjb/Y63vo9kIkLcZCCsbGYGwMRqIzEp1R'.
-     'OBmFk9HQGA2N0ZEIz5HX+h/jailYpfz4dAAAAABJRU5ErkJggg'.
-     '==' ; 
-
-        //==========================================================
-        // File: diam_blgr.png
-        //==========================================================
-        $this->imgdata[7][0]= 262 ;
-        $this->imgdata[7][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAABsAAAAbBAMAAAB/+ulmAAAAEl'.
-     'BMVEX///+AgIBmzP9m///M//+Z//8hMmBVAAAAAXRSTlMAQObY'.
-     'ZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxIAAAsSAdLdfvwAAA'.
-     'AHdElNRQfTAwsWEwCxm6egAAAAbUlEQVR4nFXJwQ3AMAhDUdRm'.
-     'kKojuCswABf2X6UEEiC+WF+PyDfoGEuvwXogq3Rk1Y6W0tBSG8'.
-     '6Uwpla6CmJnpoYKRsjjb/Y63vo9kIkLcZCCsbGYGwMRqIzEp1R'.
-     'OBmFk9HQGA2N0ZEIz5HX+h/jailYpfz4dAAAAABJRU5ErkJggg'.
-     '==' ; 
-    }
-}
-
-?>
diff --git a/#jpgraph/src/imgdata_pushpins.inc.php b/#jpgraph/src/imgdata_pushpins.inc.php
deleted file mode 100644
index e59b7427..00000000
--- a/#jpgraph/src/imgdata_pushpins.inc.php
+++ /dev/null
@@ -1,517 +0,0 @@
-<?php
-//=======================================================================
-// File: IMGDATA_PUSHPINS.INC
-// Description: Base64 encoded images for pushpins
-// Created:  2003-03-20
-// Ver:  $Id: imgdata_pushpins.inc.php 1106 2009-02-22 20:16:35Z ljp $
-//
-// Copyright (c) Asial Corporation. All rights reserved.
-//========================================================================
-
-class ImgData_PushPins extends ImgData {
-    protected $name = 'Push pins';
-    protected $an = array(MARK_IMG_PUSHPIN => 'imgdata_small',
-    MARK_IMG_SPUSHPIN => 'imgdata_small',
-    MARK_IMG_LPUSHPIN => 'imgdata_large');
-
-    protected $colors = array('blue','green','orange','pink','red');
-    protected $index  = array('red' => 0, 'orange' => 1, 'pink' => 2, 'blue' => 3, 'green' => 4 ) ;
-    protected $maxidx = 4 ;
-    protected $imgdata_large, $imgdata_small ;
-
-    function __construct() {
-
-        // The anchor should be where the needle "hits" the paper
-        // (bottom left corner)
-        $this->anchor_x = 0;
-        $this->anchor_y = 1;
-
-        //==========================================================
-        // File: ppl_red.png
-        //==========================================================
-        $this->imgdata_large[0][0]= 2490 ;
-        $this->imgdata_large[0][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAABm'.
-     'JLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsRAAALEQF/ZF+RAAAA'.
-     'B3RJTUUH0wMKBh4Ryh89CgAACUdJREFUeJy9mNtTFFcexz+/7p'.
-     '4Lw1wZJKDGCAwmDAqUySamcCq1ed6k9mn3UfMP7F+1T3nYqn2J'.
-     'lZdoDEjpbq0KG8EBFBFBEJye6Zmenkv32Ydu5GYiUMmeqq6uqT'.
-     '6Xz3zP73aOcIKmAQkIFyD3N/jrBPwlKjLQEglVlJKyUjR3u7cc'.
-     'WLoP3/4dvv03LNrQ8I6x1rFbDML9kOmHvh7IRHU9JKmUSG8vpF'.
-     'IoXX/TV0AiEM5A5jT0noFMFMJHXUt/d5f9TUAbhtQ3cPFruDog'.
-     '8klHMnmO0dGYe/myOJGINEwTz3F2higFXgy8PpAkOC+h8hoaCt'.
-     '4ppHFcQAWSgOQlyI/p+lUjmRxWAwNJd3xca/f34yoFi4tgmjtD'.
-     'NIFkJ4xcgBCgVqEBFJ9DqcZea/gNAAVEg7AOGYnHe9XoaJd3+X'.
-     'LISSSwnz6lsbKCZ9sHh4UVdBkwdA6cPwNnIfJPmC3Ctgft3wwQ'.
-     'QPkvTZJJnbExzfvsM2nMzVG7e5fG48d4lnXwTwEYCjJxuHQBog'.
-     'BHUfKkgAIIhiGk06hTp/Dm5qS1uYlXLvtWd4gPgIiCrAEcVckT'.
-     'Ab5p7TaYJrK1hQaEenrwSiVfQdc91P0kSp7Ii89D5ksY/kAkLy'.
-     'IZXFdXkQjS1YUSEbdcRu168V6+HTUNIKJDRwdE+sBIQmP9Ld59'.
-     'bEBA3of4F/D+uXb7rGaaCSmXI3pPj64PDaHCYfEqFVSjgWo2D2'.
-     '73XlJNQTgCyQykIuBWoNKEeh1aLXBPBCggGdBOgxZVSjoajVhH'.
-     'o5HWlIpq4bCQSgm9vXhK4ZZKh5SUYygp4J1EQVUD9xlU18BJQD'.
-     'bUbJ5T5XJStyxN9fSI099P3baxV1dRloW2h2ivx/yakg2ot6F1'.
-     'EkCa4G1D+zVEq5ArKTWM42Q6HUczQV7U66w9e0ZpdRXlOIQ5vF'.
-     'VHUXILKify4jiEzkOqC3peQMoBQymFlMt4Dx6wUSxSsm2UZXEK'.
-     'P30QvOUt8/2Sd78CdWwFDTA+gsw3cOlPcPUD+CQB52oQ21RKXM'.
-     'eRhGXhOg7VoKrx8KuS4ygZhVg3ZI8FGIfwR9BVgAtfwxdXdP3L'.
-     '86nUR91dXelNXTeWWy10paQHX602YAP1ADASAL7LJvFtMpOCc0'.
-     'cG3FHuGlz6Gr4YEpnoTCbzsdHRbOzy5RCRiLRMk5rjyOtAimwA'.
-     'U4U3SurBN/0wnAASBCVDIKpB4kiAB5Ub0/UvO9LpPAMDGfn005'.
-     'AxPCzxep3Q6iqPLUseBoufCZRsAE6g5g5kKIDfKUj3wnpAG8QB'.
-     '/Z1OIqANQuI65AtwNScyYXR2XlAXL2YZHzcklRKWl5GVFXFtGx'.
-     'MoAiV/EQaAGH6BUQNWgQpwFngv+Ca8KUAQEBcwgTJHyMV7679R'.
-     'XS8YqdSI6u/PMD5ukMtJY3GR2uQkr5aXeWVZOEALmA8WsIAxfL'.
-     'd0goVLAdCOd+/YpgqeVtBv4yiA++q/RKKXixe7GB8PSyoljcVF'.
-     'yg8fyubyMpulEk2lyAIfAAvAC+B+oOQFoAt/+0rAejB/EzjNri'.
-     'vvqNnCd64jxcE39V8spnP+vMbAgDSePKE2NcXm06dslMuUlcID'.
-     'TuFvqwXMBU8N39bGgRR+ki0Dz4L5DSAe9NGD7zq+6kcN1L6H2b'.
-     'ao5WWaQHllRTafPmWrVMJUimoAQrBYJFjQwre7B6A8YAi8LCgD'.
-     '5DVo6/hbb/iHK1KggvFeD3hHziQKEMuiNTNDbXGRTdtmw7Iwla'.
-     'KGH0oqwbscLOoG46rAY6AOzRhY74PT6QuUKEN4PegXxd/yEDTT'.
-     'YMWOk+oEaLkuFdNk0zTZwjfkavDUArXWgGXgFb4dEShXhfYqlI'.
-     'ow3w9rg3B6ED60IOOA5oEYQBrcpG+mj9bg0VG8GMJhVDZLyzAo'.
-     'VSq8rFYxXXefcjVgG9+uisDrXUCApoKSBcUHMBmHhfcgNwhtD3'.
-     'q9IG6Lr15b4OUTmPwBJt8JqGuapp05o0mhoHnptLQfPsR+8IBK'.
-     'uYyNH3yr+B77LHheA3tK1Ta+IrMeTL2C6Xl48TOsNWDDgAz7s5'.
-     '/r+krP/eddCsbj8fDQ4GBm9MqVvvRXX2VULBayRGRzaYn1SoWa'.
-     'UjgB4PIB5QK4ZgBXBKaAHxQsrED1H7CRgCUPwgHZDqACmhWwXv'.
-     '2aDRqGYeRyufS169cvThQKV88PDuYbW1vJ5VRK+5euqxWlPMdX'.
-     'SRqgreHbZGN3ijfKBXBTAeh2Fdwi2MofshP/dvKwCmKhp4m83Y'.
-     'vj8Xg4l8tlCoXC0MTExMTFkZE/1m37wvLGRvKRacoD1209E7Fc'.
-     'pZwYREOQqEJ4z3HskHLsz4AoXykPIBSN0t3dTTQafROoHdumXC'.
-     '4fjoMiog0ODiauX7+eLxQKV3O53ETdti88nJnJ3rl505ifmWm3'.
-     'arWSodR8GNbycDoNHy5C5jFold1k8d+DyvELNwg93d18/vnn9P'.
-     'X1oes6nufx/Plz7t+/fxhQKSWJRCI5NjaWHxkZKdj1+sjSwkJm'.
-     '+uZN/dZ337VqCwullGUVdZjsgIUC5LqhrUPvCugWuApeApPAzY'.
-     'PKHWyaphGNRunt7WVwcBARwfM8Ojo6sCzrMKBhGLphGFEF2Wq1'.
-     '2jc7M5OZ/vHH0MPbt93awkJJmeZsC6ZaMK3DCwvWdNioQUb5B6'.
-     'AdBR+9SzkAz/NwHIeXL18iIui6TjgcJplMMjY2th8wHo+Hh4aG'.
-     'MsPDw6fddru7+Phxx51bt/RbN260qwsLpZhlFZsw9QJ+2Pbrga'.
-     'oJG2FY2oKwuTtVEz9uV34NbqdtbW0xPT1NNBoF4MyZM1y5coWu'.
-     'rq5dQBHRcrlc4tq1a/l8Pj9RMs38ndu3Ez//9JNXLRZNyuXZJk'.
-     'xVYKoExQpsK/+IaAuYb7no8zjC/R+A4zisrq7u+53NZjl16tQ+'.
-     'QIlEIslsNpuPRCJXZ2dnh2/duNFRW1oy07a96MKd575yxRqU1B'.
-     '5vPMpF5HHa1tYW9+7do7Ozc/eQpZTSQ6FQt1Lq8pMnT/5w7969'.
-     'nuLcXE1rNufO9fRMhlKpOyvt9qPtVmvb25fFfvvWbrepVCqHwo'.
-     'xaX19vff/996ZhGC8qlkW9Wt1Onz073fXxxz+6MB+9e9dUjuO+'.
-     '7ebq9wLdB9hoNCrr6+s/4wf3FCJW3fPmTZhXsNWCprjuW66Dfr'.
-     '928KAfBhJAEgiJSLuzs7OSTqctoFkqlZRt26j/I+L/AGjPTN4d'.
-     'Nqn4AAAAAElFTkSuQmCC' ; 
-
-        //==========================================================
-        // File: ppl_orange.png
-        //==========================================================
-        $this->imgdata_large[1][0]= 2753 ;
-        $this->imgdata_large[1][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAABm'.
-     'JLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsRAAALEQF/ZF+RAAAA'.
-     'B3RJTUUH0wMLFQ0VCkHCzQAACk5JREFUeJytmGtzG0d2hp8zNw'.
-     'AEcRdJ6EJK9FL0CqZUm9jWbkwq3vhDstl8dmLvz8rP2H8Q75ZT'.
-     'pkRfpLgqsS6WIFEKGYkiSBCDO+banQ8DUpRWEkklXQUUqlCDfv'.
-     'rp857pgfAOQ4AMOJdg4R/hX96Hf06bvDc5iT07i8yeg8ksiIAI'.
-     '4TBi/ds9/vivD/njapNHvRBfHXMu410AM+BUoVSF05NQsi1sO4'.
-     '8402AXwLQTuP31OAZO2aG0MEn14iSlnI1z3LnMk8IZYJyBwjIs'.
-     '/TWsVIWPJkvMFS4zMfMhUp5BsoCpAAEBLYKaMFGn00jBxnvu02'.
-     '35+JHmSJEnBpQEcPo38MmCxd/nS9Ry71Ga/g1W9a8gn0GsHkgA'.
-     '6DGjxkqb5CoO+YxF3A3p+jGjQUzoK+L/V0ADzFMwtSR8eLbAr8'.
-     'uXOTf9NzhTc0geSLUQcYHgYEH786RMg0zWJHV2Aitv4x/HpHVS'.
-     'QA2YBqTTGIUq5qkPMWaWkVwPnPtAA/BevmZcjxaaUtHh8pJJGu'.
-     'DpCB9FvT7A7YT7S3p5vFMNzmWo/O0MSx/Ms3TqI8r59zFTfUQe'.
-     'I7SBODE3tnfoIxYnNHligwik0zAzDdVpyKbA8sff5YAeMEwgkV'.
-     'cufQeTJzZoCsaFLKXPTnNpoUTNsSgJmNoGsuNQjIDwYD2HlnZy'.
-     'k++yxTKXZfKTU8zOpjhneeQYkorSmGERtIlICBKRbLX+y98YN3'.
-     'ADcNIm+bJD4U3pPnmbEaRgYVRTGBkDSSsmxKfY7ZLuDJA4hdjl'.
-     'JEgyBB2SJOvQ9RzTpNKoEwNq0CNFvOXR3/HxMgYVPObaz8kPmh'.
-     'hkEWMatAfRONGGvLizyOE9P8KkpwhPDAgQKJQbELUD0oOIhbbH'.
-     'JeVTmowxjAgZutB5AoOngA+2DdYrcTyOyYZP9+QpBvI29vwEhb'.
-     'It042BVQgDy9KTMfkwQG1A9ACCLlgBBGUwxxoc52WDh2ATyEPp'.
-     '1hoaPvrEBh0Dq5an9OUsl/9hylk5b5c+mowLc4E2Jtw4Eoljyf'.
-     'ogA/AGEAagNRjGyUxOmEycyVA5EWDBxrmUp3ytLIv/NJP69Goh'.
-     '+9mFydIvS5PZYkvH1oY/RFtKymlwBFQAgQd+kAA6qSQ8pvn2mp'.
-     'SkJkuVFHPHBnQMrEt5Sl+e4/Lvp51PF1PF5Xy6WMvOWZXMom8z'.
-     'OZTQ8+j5sbQiMEwopsCIwRtBGIJSCdzbTGo9NimkDcgdC7Bg49'.
-     'TG5n4/nfr0Si77WdYp1YzyZEkWPdteaEnB7pPqBTxuIf/VgciE'.
-     'SgasCPwh+GNIkaNNag1RiPge5pEhMQVjfoLcF+eoXSvbKxedwn'.
-     'LKzC3KWbOi5/sW5a44/SHFUSgVA7SCzRG0AvA9mPOgFIETgu4n'.
-     'Ww0wNQWFAqRSL6D2ZQYBdDrQ7R7jXiwgRcvIL02makuTmWtpM/'.
-     '+BlLMl5vuWzLVEuwH6oYnR1KS8kJINGXMM2YdfRlALoQoQQKeb'.
-     'bDVwoMdxQMaLCwLo96HZTF5HbrEhmOftianfZisfzueKv7ZmrX'.
-     'MsjhxKXZGBjzyeEHmSE3oWiggtyVGmE8DTIXTC5NxgAxOAGUM8'.
-     'fun9mnSSLQ/CxNzOTgJ3LIMgoGwkKBiiMyaVviHVkdCO4FEKNv'.
-     'LQzWBYHfITPa4UBVM0LR/WB7ARJsdDDTjA6deYFIFUOimJ3d0E'.
-     'sNdLavYYgBpthqKcjiiJRO8K6CK0CsJTjfQAGaJtD9vQFAxNNQ'.
-     '1FB0yBAfA8gdMAIagLoCVAen0M00zMOTYShNDtoHs9CAIUoI4E'.
-     '1IBihCdNhsMhsj6NuV7BCC2IBpBqQaaFOENCCeiEsO1BO4RQgy'.
-     'I5Hm4k4oIU9MrgZSAdBeTabZz+ODxKQRRBFBJo6IUc51anYRQo'.
-     'dto+24FNxYCiaWKkQsj00KkO4gxRRkAngJ868M0u3OkkM+hxQA'.
-     'cQ7YD7GO5XYSsPZybh/TCkFIYY+kWniTW4Q7jXgHvHMhiRpmuW'.
-     'ca08GZkkZ/nY6TZMNhCnf2CuPoDVJvxpB+q9BHA8Ag1uH+oP4c'.
-     'YEPCzDwmzSLquShHW/E0YRbG/BjZtw40hAy7aNzJlzRn75E6N0'.
-     'qiwTzafI7kOU3gWrhzZC2iHcbsPqLlxvJnCt4KC1RYAL3I5hzY'.
-     'Xv/huePYCtITQMKEnyB4KQvMURuJvw889HGSwUCs7CwkLpo6tX'.
-     'Ty/+7nel6VLGDn/8N9m+eZuo1UP8iNhLau6b3RfmOsHBGTUYw9'.
-     'WBNeDrGB4+h/4qNLKwTnLbHj9CJw/6GoIh9Jpvq0HHcayFhYXi'.
-     'l3/4w9LK8vLKexfma3G/mb/3n1njTivS7tNQaaU1grQDjJ868D'.
-     'Axx6vmxnBrY9C9IcSbSXbavNjb/S3eN6/0m1JcKBScixcvllZW'.
-     'Vi6uLC8v12q1v/M8b/HxVjP//YYr32yE4dYWvShO0ogi14xwxq'.
-     'F4rbnxZ3cMjtpvEEeMvwA0TdOYn5/PffHFF7Vr166tvPeLXyx7'.
-     'nrd4+/btyg/frFo//Xgncnd67qCn78earQqcmYD3fSi1wPCTSV'.
-     '3gzqvm9uFOMl5nUAqFQn5paal26dKla57vf7D+6FHph9VV88af'.
-     'vgq79bo70e3VT2l9A3hYg4UiRALVHTCHSZvYBm4A//6quf8zoG'.
-     '3bpuM4acMwKr1+//SDe/dK31+/bv90/Xrcq9fduNW6rbVeC+E7'.
-     'gWdD2DKg4UEpBmPcm10RuScida31ntb62HAigoigDw6Gh0axWH'.
-     'QWFhZKi4uLZ+I4PrVer2e+u37dXPvqq6hbr7tOp1NXWq89h6/b'.
-     '8FBB34WGBesdcPrj38lkMkGlUuml0+mu53nR3t4eo9HoSLhMJk'.
-     'OlUiGdTuN5Hq7rvgA0TdO4cOFC7vPPP6/VarXldqdTu7m2lrv7'.
-     '7beq++BBO263b/tKrfWSXlbvwJ6CuAtDgTYiaBFMw6BSqfDxxx'.
-     '+rarWqGo0GN2/eZGtrC6XenAkRoVKpcPXqVWZmZmg0Gty6desF'.
-     'oIhIOp3Ol8vlmmVZK3fv3Lm09uc/Zwbr653ccPgoNIzvnmn99Z'.
-     '7W9QG46lAaM5mM2l95GIYUi0VOnz7N7OwsWmsymQzyuse5Q8Mw'.
-     'DNLpNDMzM5w/f/7A6AGgUkoajYa9urpayOXzUz/fvZutr68Pim'.
-     'F4/2y1+n2o9Q/ru7uPesPhXnyo4A+vfHp6mmazybNnz9jZ2UFr'.
-     'TbPZJAhe+8/aS0Mphed5NBoNABqNBqPR6MWBVWstvu/nnj9/Pv'.
-     'vo0aPq5uZmPBgM/qcwPf39xV/9ajU1M3Nvq9PZaw8GoT50PjdN'.
-     'k6mpKa5cucL58+eJ45j19XWePHnCzs4OnudhmiaWZRGGIVH05r'.
-     'yEYYjrumxubrKxsfFyDQJ6NBp1Pc+7C4jWumBaVm+kVL2l1H2l'.
-     '1G6otS+H6V6z8u3tbVzXpdFooJRicXGRqakptre3uXXr1ltrcT'.
-     'Qa8ezZszemWAE9rfUdYBOwtVLRbrPZ+48ff+wDvuu6Sr3MB4Dr'.
-     'uty6desgfa1WC3iRyrNnz4pSSmezWUzTfGtYtNYcdvC/9sMlgP'.
-     'n5N4cAAAAASUVORK5CYII=' ; 
-
-        //==========================================================
-        // File: ppl_pink.png
-        //==========================================================
-        $this->imgdata_large[2][0]= 2779 ;
-        $this->imgdata_large[2][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAABm'.
-     'JLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsRAAALEQF/ZF+RAAAA'.
-     'B3RJTUUH0wMLFQolY9lkpgAACmhJREFUeJy9mOtzFNl5h5+3b9'.
-     'Mz0kzPBWmEVtIiWYhIiC0HCDhB8lb8ISk7nzdZ5+/zJ/8BTmpT'.
-     '660CZLwG1pVFgBkgGIHECEaa+/T9nHzQCCQuRpCNz6mp6g893U'.
-     '8/c37ve3qEjxiC4OA4n/Lp/EUu/tsMM/+aEWduVBx7WhdkShcY'.
-     'xUH2zo0Dwod/5N6vf8V//PoGdx8M8EOFPtK9jI8BdHCcMuVSmf'.
-     'LxHLmSZdm2U8xIbmKETDGDZZnIy4dBbCynyGhphurEDBOlHFnn'.
-     'qPcyPxTOwDCOccw7w5nlBRZWylI+ny/mZ6rL1dzUZ5/IWGZU3D'.
-     'ZIOMQDDaJcHDVGWUbJBi9odVr0QoVSPzigIEaZ8vgSS/8wZU3/'.
-     'k1fylipz5dLM2WlrZqHKaGCKbEbontq3KAKWQyZfZKTgYqc9Bp'.
-     '2I2PcJ4ogk/UEBQcwipbFZmT13vDBx8fhnE1Ofnp9yJopFyT3X'.
-     'yANfks0QHSQMDaL37pOxMLIu2UyVkjVKLjyKSeuD8dAYCFkso1'.
-     'gYMaeWJ40T56cl8yAi/O4FSa2P6kYczIDsgVpAqcDImZPMuAB1'.
-     'dkLQtcc8a/bwox8IUHAxZVxGZMouSLVYwKuMkD5IxN+JSdsRJB'.
-     'pexuTVgYYM6EoGmxkmg3/hEhNUMr/hd7dqbOzExMn/GRDAxWZc'.
-     'j3I8HiXfMjF2FQowKw7pjoN6E/Llw/GBJj8qxVOMlX4ipxc/lY'.
-     'kl2zBLkmrTcEzMkoNoRLVidLi/9g+Z3I+1xRHX5EcAihxnbPRv'.
-     'OTU9kZSmpKPy9FTGrLimPZ1H+UiyGaF67w6n7E1DwMngFDxGvc'.
-     'w70v0xZUby5IxjlIyMssUJrJwVWkXBdbXvSvwEibcSdKCAFI16'.
-     '4/sc0SRo9cGAGq1DwvQFzV6DVuBiV4zYnlEts6A2TSPcSiXoxo'.
-     'QqJCEEFMbQ2b69o5qMiOOPqIMQkagu/aSL7waE8101WFShLjk9'.
-     'yxgEvjRUiyYd+gwAjY2J9VpXfZ/JEXLhDp3OR6U4T97+hEnPwx'.
-     'tv4HsRjy2tTQSFzQgDUnwSLBQRI+x1ZgcH87Vcv4SF19Kt0ezS'.
-     '1h9s0Ma25pgr/YJfnLnEysok0+ezjM6EBLldGqKIJYuDRhOQEJ'.
-     'Oih8X9Q0xmcXNjlCofBJgn78wxVz7L2YWf8tPPz1hnfjbjzfxN'.
-     'qVwutq2etZXUQSXikcXGIgUiUkJSDIQMJgYGJsaB3c7b1qQ4GZ'.
-     'xSkdGZIwMeNLfK6uezMnvJK3pLxeVixfvMsyVjSNSO6IV9adPG'.
-     'AArkEEz8oUkFmBjYGO80qfd6pCWIayD59wIKcsjcKqufn7JO/S'.
-     'xfyi+5c24pey5rZ09mJRNkiDdT/tzbkBr3SYkpMYpgEaIJSYhI'.
-     'kSOY1GhilAQk5ntDIojxCZ/kf87Pl85xbuWEnLiUy+cW3NNuJX'.
-     'MmY5meKf6mT7wZS+THdOjxlG06tIlIOMZxchSxcFFEGAwAGGME'.
-     'jwyZYSnWL3cXWiIUbUI6hO/vxXuFOV84ycmlBWthNeflTjuzTi'.
-     'lzJmM5s46Ej0J63/ZoPmoy6PYxtYVNhmfs0mbAND1mmKVMBY1L'.
-     'mxA1LN7WgXQbCApNhKJHRIM+DQbv7yQGhjnJ5NgFuXBuxpu5mD'.
-     'udm3LPuY7pmZLUE6L1SIJaIPFuDAqyw9lnwDYv6NFHkWJh4ZDB'.
-     'wCBFD3uMxsTAwcBAiElpE/KcPg36dIiOvpsRxDCyhmlP2YY9ZU'.
-     'v8NMb/1id+FGO0DTztkSXLOONUqeITsMkW2zwnJEIDFhYGx+A1'.
-     'kwK4mASkvKDPc3p0iYhRRwYUhZLUTyV6Eu0t4s1Y4kcx6W6KaM'.
-     'EZThcXH59RRhGEgIAddnBwNEBKqqpUtWBIF22YDIhJsbEkJqFN'.
-     'qLtERHs7GnUkwISEQAf0uj30bY39PzbiC6qrDu2cExJ69Nhhhz'.
-     '59UlIUipCQOnVi4sjG7ubJBy6um0C+he/0iDHQKIQERYyKFLqr'.
-     'SI/W6kJCnvOcrWSLSquC1/Jw9Ks3R0FQKHr0uMc9bnCDGjX69A'.
-     'H0XlcJkibN5jOe/alCZStHbjJL9lSMLkXExvCXRiDV6GZEeGeX'.
-     '3TvvBVQoEjfBL/v0rT75Th7VU5C8gktI6NLlMY+5yU3WWGODDf'.
-     'r098tHpNFNH7/2lKdXXdz7efLzVaqJIBOCmK8AJUlI6g0aV+9y'.
-     '9+p7AR3bMQpTBWPy7yeN6fy0jNwewfpvC9Xe+3kFoUuXe9zj5n'.
-     'BusEGHjh6GIAGawC2FWuvSvbbF1maFylZAsC1ISZADBiVNSJrP'.
-     'eX73MY//skHP85z5+fnSxQsXj//4n39cmnPn7LbZlsajBmEnBL'.
-     '1nuEGDG9x4aa5Ldz+h0RCuBqwBv1Wo+7vs9r7n++0MmYeAM+zB'.
-     '+61EK1QUEnbbtN+9Bh3Hsebn54u//PdfLq9eWl2ZnZ1dSnaSwu'.
-     'Pin40b9g3doKE0WoNIl65xj3v75njd3BBubQi6ExKmDWkMRKSl'.
-     'tSbVKQcMao1Go5Ugb0+x53nOyZMnSysrKydXLq1cWlxa/McgCB'.
-     'Yev3hU+GPrD3I5/q94k3pXYQY58q6B5Bs0HB//neaGx00gyWaz'.
-     'VCoV7bquCoKAnZ0dfN/f03egLGj0m3XQNE1jdnY2/+WXXy6trq'.
-     '6uzP3oR5eCIFi4detW5feXL1vr679Let37zVB3/mQytjXJwmSB'.
-     'wikHp9ShY0RESqObwPrr5oBERKhUKly4cIFqtUq9XufmzZtsbW'.
-     '2hXvuDwTTNtxZq8TyvsLy8vLS4uLgahOHphw8elL69fNlc++qr'.
-     'uFOrNXPddm1cczVL5f5P+Lv5MuOJgTGxwYbZpZsCdeAq8M1Bcw'.
-     'CGYeC6LtVqlRMnTjAyMkKn0yGXyx0N0LZt03Ec1zCMSrfXO37v'.
-     'zp3S769csb+/ciXt1mrNdHf3ltZ6Lca8ZpJsduhtCdb2gEFJoQ'.
-     'xADYHuHDS3f32lFEEQUK/XGRkZoVAocP78eZaXl9FaI/Jq25Uk'.
-     'yWHAYrHozM/PlxYWFibTND32sFbLXrtyxVz76qukXas1M61WTW'.
-     'm99gx+20TdN9jqtfjP7QzOwwYNp037Zd0DukDnIByA1pqdnR2+'.
-     '++472u02Z8+eZWJiAsMwDsEBRNGBzYJpmsaJEyfyX3zxxdLS0t'.
-     'KlVqu1dP3q1cLta9ekU6u1dat1J9b6Sk9kraV1rYXegW7apDYw'.
-     'kFY6fPc4MNTw88bwfZ/NzU2UUnieRxAEiAiGcXiXfcigiIjruo'.
-     'VyubxkWdbK7fX1xWvffFMInjzBM82uMT5+p++6V1UUrSe7u03t'.
-     '+8lezlKt3gHyl0aSJDQaDa5fv876+vo+w6FzDq1BpZRsb2/bly'.
-     '9f9vL5/Njdu3fzG0+eMJHNxsfn532vXN5NPG/7abPZal6/Hvfe'.
-     'kroPHfsm98f7AHW9Xo+//vrrlmVZm71+37QNw3JnZ9PK4uJGpV'.
-     'pt4Dh+vLGhsrmcfv1iHzu01m89HjIdCon2fb8TBMHtvYeRUn50'.
-     '1Oj4vqp3Ok1f5LYSadfr9dQfDN642P/XeF2DA+SBAuA4jkOhUK'.
-     'BQKESO43S11p3BYBDt7u4y+CtB/i/q7jp1GMiw2AAAAABJRU5E'.
-     'rkJggg==' ; 
-
-        //==========================================================
-        // File: ppl_blue.png
-        //==========================================================
-        $this->imgdata_large[3][0]= 2284 ;
-        $this->imgdata_large[3][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAABm'.
-     'JLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsRAAALEQF/ZF+RAAAA'.
-     'B3RJTUUH0wMLFRAiTZAL3gAACHlJREFUeJy9mGtv29YZgJ9zKF'.
-     'F3y/Q9jh05tuQkarKgbYasde0UBdZgwNou/Vqga/sD9mP2B4a1'.
-     'BbZ9atFPxb5sqOtmXbI19bqsluPYiR3HN90vFEWRZx/IJI5zqa'.
-     'x0OwBBSgR5Hj7v+55zSEFXTUgIJyA9C6/9RsjMjAyFIxxJCDc7'.
-     'iBqKgyZACGg3G2x9+xXf/fG33P3mC9qNKsp1O+1JdkEnQTdgIO'.
-     'ttCSMUi8gj072MnugllAyB9G8rBGi6RsToJTF6iuRoFi1kHKZf'.
-     '7fB8Iggj0/Dy23D2dakNTR3JDsXPvzstxmZGRMER1EwHhQAEgE'.
-     'CLhIkPD6InY9S3djGLJVBtQP1Qb4HDAyoJYQOOZkPx49nhTH9i'.
-     '7MUBGT7egxkJgd70wZS/CUkoZtA/fRoE1DZ2ACiv52ibReCp4e'.
-     '7CIEHomxDiuVdGTqUnf/ZeOjR8fpiVXZul5ZrY3bWwbdcLr/dA'.
-     'AAIpAwQjUWIjQ+g9HZvswiCgBVF9/SI6OSLGzo0i+oLi6+Utbq'.
-     '+bKEftgwOE/0Ohocf66M+cBjo22U2RQLIHMhmYnvaOpR9S8bSU'.
-     'UqCURGpRkuMZMm9cIvPGJZLj0yBjT2LprkiSkykx9cuXIhOnUs'.
-     'm+QNC2XdG02ggBTcvFabsPWwTPpBAChSCgh4kYBpoeplWp47Qs'.
-     '7EYDt21xINzd5GCAxLExRl89Z+nHjpbKMmjbmkgfDzI0JEW53K'.
-     'Jaa6NcAOEX8v52uJzsBlAS6u0hcnTIccPRqhWPCUcLD+s1EaUp'.
-     'HCEhEMCyHNpt9SjgIU12A6iw6xb123vYhaaKjB9tlgMD5X+uBp'.
-     'zdkpg6azA8EaNQtKlVba+Xez4eCntnJrsDdFsW5nYFpxlFN846'.
-     'DXe8utkM4mhi+EgQmjYbS2WqexZKk6BpjwJ2YlK5VjeA3pNDiH'.
-     'YjRWPzPE7tmBo8EWwGhkXx+z3uXL7D3rU97LIF8RBEAl6lK/Uo'.
-     '6JNM1rZ2aTcr3eUgIQOGTgbdwXMGyRejenLYTvQGbAdRuetSud'.
-     'OivVuFZgtCEgICghICnZoMhmlVTPR49LCAEkQUhk/B7KXe0MWf'.
-     'nxj8xVR/cDheK14WZmtVMJSBnlGoN6FmQq0FLfdwJgORKPHRo/'.
-     'Snzx4G0F/FjJ4KiOdmjPCrrx8bffnMybMv9MQGNG3rzlVqtR1B'.
-     'sh/CYXCD4Aag1oCW7ZnUOjSp6WFi/QNEB8Y7BfTNjZyCmUvJ0I'.
-     'XXT47MTp98Ybon9VZCk8cVazfqlNargsY34G7ByAlIjkHd9CCr'.
-     'LbBdiHViUgiECuDKYCdz8b2cywREdiYZOj8zNnLuzOTzx6ODp+'.
-     'OaGaqwVzBFqz0Idhz2loE7YEwBLaAJLQcKbW8qjAcBF5Jh0AMP'.
-     'IOHe6kxgtb3UMO2OxkF//ffK28nQqxfvm3szrtnDVa799Qb/+v'.
-     'NtsbNSpm3tAv8B+w7Ub0FhAyoBcMPec9oK6raXk48ziQBXQcmC'.
-     'pT3YqHa0mpEBkTR6wz/Jjo2cy04+fzwxdDquNfQKO7sFUbpu0c'.
-     'wp3JoAYsA42Bbkl4GCryUNDEM7Avm6Z/CgSYBWG8pNuFuDu1Wo'.
-     'tjoxKIJGeHIiM/jmK9NnX5ycuJQMtUcqXPvLDTa+qIie4hAJ1U'.
-     'vdrmO2HaDfB931twJgAn1A4lGT96obPHPLBbhVgUoTHHWo9aAA'.
-     'JVAKpyKEmQNzWRENAsL18ycKjAFN/9gCNvzLB/390MMmE7pnDi'.
-     'Bvwt0K5Jv3O+0oB22nJ1Vvjb/UMhOpcKknqN1OiMB2DNHU2G5s'.
-     'sVndpGJVcZXjX1IAlvw9PmhRQcOFPhsSDkiBrQR1G7brgs0a7D'.
-     'ag3FK4rguqBXarI4Nt1SJv5gls7TEWtJDRBO2GwnIs8maevFnA'.
-     'Gx6awLZvzeTBu4kFbLigijC47pscpx0xyDfkvtUEnlarCDtrUC'.
-     't2HGIhvPHVdVwqjTIrxRU2a5uUrYoP0QZ2gMvACl7+3V/LuKDq'.
-     'sJuDy597516+CEezIHXv7vcgXQu2l+Bvn8He9Y4AE4kgk5P9DE'.
-     'R6aFdq5Et5Nit3yTf3m9sBcsAN3+D98c0Fit5JawE25r1zg1Fo'.
-     '5B8GFD7g+nVYnu8EUEop9XTa0N/9dUbqcphP/rDJzbUClVbpgR'.
-     'y2fXM3fND95qj75J8AC6BWPINfVSBieK+x+6cS5UCzCLu3oFV9'.
-     'GqCMx2NGOp2Znpv7aXZudsool3T5J/179sxVlHJ4kGPrP2COBX'.
-     '/7DmiApWCjxIMXpYNznYuXM+6TAKWUMppOZzLvv//ery5cuDCT'.
-     'SqVS336bCwr1JfAPB9r+2KAFwJS+OcETzZHz/7v3etl6ipz77X'.
-     'GAMh6PG+l0OjM3NzczOzs3k0pNnFlbW43+e/GKtMqrblSsF03V'.
-     'WHcJA0PjIAzvg9JTze2H67g9DjAwOTmZ+uCDD96anZ2dnZiYmF'.
-     '5dW41++Lvfa1fnr7qllVK9103mXNTnJgPA+YugsvB3HTaEl+Qs'.
-     'AZ/yeHPPDCiTyaRx5syZbGoilV1dW00szC9oV+avusuLy0Xd0X'.
-     'MgFkDM+zkYBZEHV8f7wwKu84zmngQoNU0LaZoWUa4K31y5qX/8'.
-     '4cfyyvwVN5/L10NOKNeg8UmDxoKF5Vfj1xXAgD0JrgAcvBDfel'.
-     'a4g4AykUgY6XR6emJiIru2ttZXq9S0K19eUcuLy8WQE8o5OAsN'.
-     'Ggsmpl+NpoL1g9X4UBU+C9xDgEKIwNTUVOqdd955M9mbnJ3/cj'.
-     '6Vu5aTheXCQXNdVeMzAwJSCGEA2XKpnF1cXIzlFnOVhJPIKdR+'.
-     'c88ctq4AlVKsrKzw0UcfKcC5uXqzXnNqSzb2pwLxOHP/l7Z/BN'.
-     'eB01LKt4HTrusKvGr8jB+hGn8MQAkYQMrfw4Nq/MFPtf+rdvDb'.
-     'k8QL+/5Z4Uepxm7bfwHuTAVUWpWaqAAAAABJRU5ErkJggg==' ; 
-
-        //==========================================================
-        // File: ppl_green.png
-        //==========================================================
-        $this->imgdata_large[4][0]= 2854 ;
-        $this->imgdata_large[4][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAABm'.
-     'JLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsRAAALEQF/ZF+RAAAA'.
-     'B3RJTUUH0wMLFQ4hANhluwAACrNJREFUeJytmF1zE1eagJ+3u9'.
-     'XdkvUty2AbmLEtEzDBgZ0UpDBOalNTUzU3czl7tct/2n+wt3M/'.
-     'NVM12SSTQQSyW2TA+QAJQogtYYFtyfrqL3WfvWj5g8AEjzfvhS'.
-     'SXjk8//Zz3Pf3qCMcJAWxMKlT4kH+jwu/FknnJSUItKFHzCrKA'.
-     'BggBQx5ziz/wn/yBz3hED4/oaJfSjgVoYjJJgTLTZCjohp7IGT'.
-     'k5aZ4kb+bRTR30Q7djj8f/kpPMUSCFedRL6W8e8qMQNE6S4xpv'.
-     'c5HrTPFubiJ3ZnlyOXV59rJYU5Z00h1c3d0brxAiUkScRijisk'.
-     '6XLTyiN3s8HuAJpniXa/q8/pt8Or+0kF8oXJm5YiydWcIpOrJu'.
-     'rjOQwd54AQwsMpTJYhPSoYuLQ58An/DnBQSdImXO8avsTPbqpc'.
-     'lLp67OXDVzMznZLGxSs2qyIRu4at8gKHQEC50kE1icxqCAdxST'.
-     'xjEA44tqaJlERl8uLWvvnX5PHuQfcCdxh5qq0aX76vj4WgWyXO'.
-     'QiNgBP8IAaddr08X8+wHFmJSQhBbPAZGoSZSt5wQs6qoNC7UEd'.
-     '4AEoLIQSCaCCy78Dv8Tiv1hjjW1CRj8XIAgEKqDtt9keboMJZa'.
-     'vMjuzQVd3Xr9prTJo+GF/jKZea95R25Lxs8jg5qFGiwDnOS0mW'.
-     'NE0rjNRIt3WbklUCA9mV3Zdz8OBT/JfCQLB0SKYVVjGFYSfx/E'.
-     '26ow4e6uDujlPFQpE0FU6P8qNTHdXJdEdda0qf0itWBVM3pa/3'.
-     'ccUlIECJet0cAJoeYk5EZCeS5IwEoerSxccJBwRqFFf38QCTaO'.
-     'TRVFKJm3NTbtLNSyh2IkhIXsvLCesEGNCWdmwyruSD/z9kUlRc'.
-     '3bqNlSxhJNJ43p5JITrOEis8Qtr0cXEpU/JT/pmO18n2vb42pU'.
-     '3JnDnHMBqyPlpnoAaxhr2llv1ZUBqEGlqYwDQMsskMOcMgVL3Y'.
-     'ZOQTHAcQQiIGjHCwCaiovjrv4hbcpKuJJjIcDHm685RGr4GLCx'.
-     'YHkAcrLoAoDSLBiAQrMkjqybHJCbxgh+7xAC1MpsgzwRwD3qHL'.
-     'WyTIBdlAa6u2rHfXaew06PV78ZZjAwleNnkolECoH5i090wOcY'.
-     '+TgwYzFHiPi1zkOkXexeAMASnVU+LiyiA1wFUuaqggACLizeWw'.
-     'ycMzyssmVYKkbpGyC5T+OUALk2mKLHKWf+ED/az+YW42d66YL+'.
-     'aNrmEEzQCFEnKw368EgEvcN1m80eTIQIt0TFOjMJHkzNEBBYPp'.
-     'sblf8QHzrORO5JaWZ5ZLl6cuJyyxpNPv4PZdoT+GyIxBfI5uUg'.
-     'eJMCwP2/bIHO1JEudcgUUWOceKNq99mCvnzs5PzRcuTV4y5mRO'.
-     'SMIjo47z5S7a94oQCNKgJsZwO7D/IDNg3/LLhRNXt4JohBb4aG'.
-     '82GLdXcf93mQ+Y43r2RHZp+cRy6cqJK4l8MS+tdItaqiYtc0Mm'.
-     'QpfJARh98HYh9IiXVcaAo58wGb+LBAjbSPgCOcoSa0wzxXtc08'.
-     '/pv8mfyL+9MLVQvDJ1JVHJV6SZbFI1qtTsB+KlehRtRTGE8Afo'.
-     'P4DRcAxiEudhAHjjzz+ubgX4oHowakHQOlqzICQwyVPITGVOXi'.
-     'xfLF6aumzmczl5lHzMff2+fCdPaGttEkXoLQAO9B7C6EugPYby'.
-     'gVPjGXc5eIbNAJPjGwiAbaAJUQv8wVG7GROkJFpyOqn/ovgLba'.
-     '44L0+sDaraXb6jzq7aBQWjBOyUoHcaopOgmaA3IRyNDZnA1HjO'.
-     'HSBkr7eEFDAEngHrQCf+/s2A8cSiSkqcKUeeTjwFy2Jd78t3+L'.
-     'TR4itIiBLwLQhzkJyB5Cx4HXDaENVQCBAQcRqFIHTRaBIvuYXg'.
-     'AdsouuNxEL0ZUBHnSQp66R73zYfUtQ6OytKT8RckQAJQoLtgO5'.
-     'BJgj0D/WfgdyHaAHx8THoUcbGx8ciwhUl3bDEiToURPooeI7pH'.
-     'MziK9Yd9nU5a6GgKjOH41vsgI4hAcyC5AZkapF+AoYNrjjsuhx'.
-     'FbtPmeB5ykyQQzTPAWAQWC8S9oAI0QRRuPb9jkmyMZNAOTklvC'.
-     'GGYZaFkGmkVAh8h4DtKFMIBunG+pB5B5AIkGBDsQ+qBiL20caj'.
-     'zhJknq5KlgMkLjJHJos4kYEbFJi5vc5eYbATVN02bNWe19+32t'.
-     'aJWlFm3wbf8Rz5NbDFJdlOFBF/g7cBf0JkrbBb+F6j1DOduEkU'.
-     '8bWCOiSofPWadBnSZDWmgUkEMGhZCINut8S/0NBtPptFlZrBSu'.
-     'vnt1+ndnflfIp9OJ/279Ubbbd+lP7KBKPoEBsgnqLph/BRzwdS'.
-     'LnBUFvHcfdpRsGPAGqwMco6jynz+e0SPKYCHMfLX5VKHwcenR+'.
-     'Igd1XTcqlUr+xn/cePv91fevzy8sLO2OtrOpWkqL7gXKSAVRdh'.
-     'ZFEmEXoYkwBNqovoc/3GHH3aUR+jwC1oD/AWrANi4hGwyBzqEG'.
-     'Vvb77Dgi0eT1VZzJZMxKpVJYXV1dXF1dXVm6sPSvruue3Xzcyj'.
-     '6/syvDzwj0lNazK6Fj5LFCRZouZpBABj6jXouu3+Np6HNvDHaf'.
-     'g91t74msbMuOJicnSSaTKKUQEUQEpRSO69But1/dB0VEm5uby9'.
-     'y4cWNpdXX1+sLCworrume//PuXpeqnVeOban0U1PW2kcx+O9L7'.
-     'Te9sUB4lWFR9SqNtNGcHx+/RDD2+Am4D94CnQA8OjjlEhMnyJC'.
-     'srK8zOzu7BiYioMAzZ2Njg9u3brwIqpSSXy2WXl5eXLly4sOo4'.
-     'zoV6vV6oflrVP/7Tx8Hmw1Zb6ydqmpWp7ha8h4O3gjOhzVANmF'.
-     'XPMNQWvdDnCXCXuHR+APqH4fbCtm2mp6eZn59H13WJuYXRaKSU'.
-     'UiSTyVcBdV3XDcOwRaTU7/en19bWCn/79G+JL/76RbhZ22y7u+'.
-     '6ahl71nPDz/nO17m7wAxlabFOihy4+DvAcqAMbPzZ3OFzX5dmz'.
-     'Z2iahoiosUUVhiGNRgPHcV4GzGQy5uLiYuH8+fMzo9FoslarJW'.
-     '9+elP75E+fBJu1zY7qqpqBUW3T/niohnVvy+1zm5aVtp+WE2XT'.
-     'nrHFzbjh1tYLz3XdPjD4R3BKKba2tqhWq4dzUO3noBPn4H5PKy'.
-     'LaO++8U7hx48byhQsXVne7u6tf3/v64t3P7mbq9+odt+OuaWi3'.
-     'PLxbW2ytubjbQCgiMnt6VlaurWgz0zM0m02q1WrUaDSUUuqI56'.
-     'ivDxE5MCgiYllWtlwuL5mmufLV/a/O/uXPf9Ff1F+80Lv6Yx29'.
-     '2qHzyZBh3cdvc7gaTZuZkzPh/Py8ACqVSv1/uPZDKXUAGEWRtF'.
-     'qtxEcffZTL5XLF+2v39fqjeivshA/TpP83JLwzYFBzcA4370Cc'.
-     'S81nTRBUs9lkOByi1GuOPI4Rh3+26JZlnSkWi781DOPXvV4v3+'.
-     '/2G0R8kSBxB/jew+tERK+c49m2TblcxrZtXNfl+fPneJ6HZVmU'.
-     'y2VJJpNyaJ9TSinlOA5bW1u4rntkQA0oAG8D54gb9W3ianxM3A'.
-     'e/cn73U3Hq1Cm5du2aPjs7a+ztcSIShmE4ajQa6tatWzQajZ+0'.
-     'fbiKI+It4SvijVUj7kL2qvGfgkskEqTTaZmcnDROnTplJhIJTU'.
-     'QiwPd9P/Q8T6XTaQzDIAiCfzjP/wFVfszuFqdHXgAAAABJRU5E'.
-     'rkJggg==' ; 
-
-
-        //==========================================================
-        // File: pp_red.png
-        //==========================================================
-        $this->imgdata_small[0][0]= 384 ;
-        $this->imgdata_small[0][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABm'.
-     'JLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsSAAALEgHS3X78AAAA'.
-     'B3RJTUUH0wMJFhouFobZrQAAAQ1JREFUeJyV1dFtwyAQBuD/og'.
-     'xQdYxa8gRY6hJ0jK6QdohMkTEuE5wUj5ERen05IoLvID7Jkn2G'.
-     'j8MgTMyMXqRlUQBYq9ydmaL2h1cwqD7l30t+L1iwlbYFRegY7I'.
-     'SHjkEifGg4ww3aBa/l4+9AhxWWr/dLhEunXUGHq6yGniw3QkOw'.
-     '3jJ7UBd82n/VVAlAtvsfp98lAj2sAJOhU4AeQ7DC1ubVBODWDJ'.
-     'TtCsEWa6u5M1NeFs1NzgdtuhHGtj+9Q2IDppQUAL6Cyrlz0gDN'.
-     'ohSMiJCt861672EiAhEhESG3woJ9V9OKTkwRKbdqz4cHmFLSFg'.
-     's69+LvAZKdeZ/n89uLnd2g0S+gjd5g8zzjH5Y/eLLi+NPEAAAA'.
-     'AElFTkSuQmCC' ; 
-
-        //==========================================================
-        // File: pp_orange.png
-        //==========================================================
-        $this->imgdata_small[1][0]= 403 ;
-        $this->imgdata_small[1][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABm'.
-     'JLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsSAAALEgHS3X78AAAA'.
-     'B3RJTUUH0wMJFhwAnApz5AAAASBJREFUeJyN1dFthDAMBuDf7S'.
-     '3BCm2VCRKpS4QxbhikW6IewzcBqm6Fm6JyH7iEEByCn5AJH38g'.
-     'BBIRHNUzBAWAGNfe/SrUGv92CtNt309BrfFdMGPjvt9CD8Fyml'.
-     'ZZaDchRgA/59FDMD18pvNoNyHxMnUmgLmPHoJ+CqqfMaNAH22C'.
-     'fgqKRwR+GRpxGjXBEiuXDBWQhTK3plxijyWWvtKVS5KNG1xM8I'.
-     'OBr7geV1WupDqpmTAPKjCqLhxk/z0PImQmjKrAuI6vMXlhFroD'.
-     'vfdqITXWqg2YMSJEAFcReoag6UXU2DzPG8w5t09YYsAyLWvHrL'.
-     'HUy6D3XmvMAAhAay8kAJpBosX4vt0G4+4Jam6s6Rz1fgFG0ncA'.
-     'f3XfOQcA+Acv5IUSdQw9hgAAAABJRU5ErkJggg==' ; 
-
-        //==========================================================
-        // File: pp_pink.png
-        //==========================================================
-        $this->imgdata_small[2][0]= 419 ;
-        $this->imgdata_small[2][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABm'.
-     'JLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsSAAALEgHS3X78AAAA'.
-     'B3RJTUUH0wMJFhsQzvz1RwAAATBJREFUeJyd1MFthDAQheF/oi'.
-     'gF+JYWQKICkCJRA1vGtrDbxFbhGvY0HVjCLeS2BeTiHFgTB2wg'.
-     'eRISstCnmcG2qCpbuXf3ADBQzWsPfZfS9y9HsEu4/Fo33Wf4Fx'.
-     'gxL3a1XkI3wbTNXHLoboVeLFUYDqObYBy+Fw/Uh9DdCmtOwIjF'.
-     'YvG76CZoOhNGRmpO8zz30CJoOhMAqlDxFzQLppgXj2XaNlP7FF'.
-     'GLL7ccMYCBgZERgCvXLBrfi2DEclmiKZwFY4tp6sW26bVfnede'.
-     'e5Hc5dC2bUgrXGKqWrwcXnNYDjmCrcCIiQgDcFYV05kQ8SXmnB'.
-     'NgPiVN06wrTDGAhz5EWY/FOccTk+cTnHM/YNu2YYllgFxCWuUM'.
-     'ikzGx+2Gc+4N+CoJW8n+5a2UKm2aBoBvGA6L7wfl8aoAAAAASU'.
-     'VORK5CYII=' ; 
-
-
-        //==========================================================
-        // File: pp_blue.png
-        //==========================================================
-        $this->imgdata_small[3][0]= 883 ;
-        $this->imgdata_small[3][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAMAAAC6V+0/AAACi1'.
-     'BMVEX///8AAAAAADMAAGYAAJkAAMwAAP8zAAAzADMzAGYzAJkz'.
-     'AMwzAP9mAABmADNmAGZmAJlmAMxmAP+ZAACZADOZAGaZAJmZAM'.
-     'yZAP/MAADMADPMAGbMAJnMAMzMAP//AAD/ADP/AGb/AJn/AMz/'.
-     'AP8AMwAAMzMAM2YAM5kAM8wAM/8zMwAzMzMzM2YzM5kzM8wzM/'.
-     '9mMwBmMzNmM2ZmM5lmM8xmM/+ZMwCZMzOZM2aZM5mZM8yZM//M'.
-     'MwDMMzPMM2bMM5nMM8zMM///MwD/MzP/M2b/M5n/M8z/M/8AZg'.
-     'AAZjMAZmYAZpkAZswAZv8zZgAzZjMzZmYzZpkzZswzZv9mZgBm'.
-     'ZjNmZmZmZplmZsxmZv+ZZgCZZjOZZmaZZpmZZsyZZv/MZgDMZj'.
-     'PMZmbMZpnMZszMZv//ZgD/ZjP/Zmb/Zpn/Zsz/Zv8AmQAAmTMA'.
-     'mWYAmZkAmcwAmf8zmQAzmTMzmWYzmZkzmcwzmf9mmQBmmTNmmW'.
-     'ZmmZlmmcxmmf+ZmQCZmTOZmWaZmZmZmcyZmf/MmQDMmTPMmWbM'.
-     'mZnMmczMmf//mQD/mTP/mWb/mZn/mcz/mf8AzAAAzDMAzGYAzJ'.
-     'kAzMwAzP8zzAAzzDMzzGYzzJkzzMwzzP9mzABmzDNmzGZmzJlm'.
-     'zMxmzP+ZzACZzDOZzGaZzJmZzMyZzP/MzADMzDPMzGbMzJnMzM'.
-     'zMzP//zAD/zDP/zGb/zJn/zMz/zP8A/wAA/zMA/2YA/5kA/8wA'.
-     '//8z/wAz/zMz/2Yz/5kz/8wz//9m/wBm/zNm/2Zm/5lm/8xm//'.
-     '+Z/wCZ/zOZ/2aZ/5mZ/8yZ///M/wDM/zPM/2bM/5nM/8zM////'.
-     '/wD//zP//2b//5n//8z///9jJVUgAAAAAXRSTlMAQObYZgAAAA'.
-     'FiS0dEAIgFHUgAAAAJcEhZcwAACxIAAAsSAdLdfvwAAAAHdElN'.
-     'RQfTAwkWGTNerea3AAAAYUlEQVR4nHXNwQ3AIAxDUUfyoROxRZ'.
-     'icARin0EBTIP3Hp1gBRqSqYo0seqjZpnngojlWBir5+b8o06lM'.
-     'ha5uFKEpDZulV8l52axhVzqaCdxQp32qVSSwC1wN3fYiw7b76w'.
-     'bN4SMue4/KbwAAAABJRU5ErkJggg==' ; 
-
-        //==========================================================
-        // File: pp_green.png
-        //==========================================================
-        $this->imgdata_small[4][0]= 447 ;
-        $this->imgdata_small[4][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABm'.
-     'JLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsSAAALEgHS3X78AAAA'.
-     'B3RJTUUH0wMJFhkLdq9eKQAAAUxJREFUeJyN1LFVwzAQxvH/8f'.
-     'IeDS0FLKABlN6eIwPYAzCHB0gWYI2jj+i1ABUTQN4TRSQ7iiWZ'.
-     'qxLn9Mt9ydmiqrSq930AYFiu6YdKrf/hP1gYQn6960PxwBaYMG'.
-     'E9UA3dBFtVQjdBOQmBakLennK0CapRwbZRZ3N0O/IeEsqp3HKL'.
-     'Smtt5pUZgTPg4gdDud+6xoS97wM2rsxxmRSoTgoVcMZsXJkBho'.
-     'SmKqCuOuEtls6nmGMFPTUmxBKx/MeyNfQGLoOOiC2ddsxb1Kzv'.
-     'ZzUqu5IXbGDvBJf+hDisi77qFSuhq7Xpuu66TyJLRGbsXVUPxV'.
-     'SxsgkzDMt0mKT3/RcjL8C5hHnvJToXY0xYRZ4xnVKsV/S+a8YA'.
-     'AvCb3s9g13UhYj+TTo93B3fApRV1FVlEAD6H42DjN9/WvzDYuJ'.
-     'dL5b1/ji+/IX8EGWP4AwRii8PdFHTqAAAAAElFTkSuQmCC' ; 
-    }
-}
-
-?>
diff --git a/#jpgraph/src/imgdata_squares.inc.php b/#jpgraph/src/imgdata_squares.inc.php
deleted file mode 100644
index 895dc936..00000000
--- a/#jpgraph/src/imgdata_squares.inc.php
+++ /dev/null
@@ -1,150 +0,0 @@
-<?php
-//=======================================================================
-// File:        IMGDATA_SQUARES.INC
-// Description: Base64 encoded images for squares
-// Created:     2003-03-20
-// Ver:         $Id: imgdata_squares.inc.php 1106 2009-02-22 20:16:35Z ljp $
-//
-// Copyright (c) Asial Corporation. All rights reserved.
-//========================================================================
-
-class ImgData_Squares extends ImgData {
-    protected $name = 'Squares';
-    protected $an = array(MARK_IMG_SQUARE =>'imgdata');
-
-    protected $colors = array('bluegreen','blue','green',
-   'lightblue','orange','purple','red','yellow');
-    protected $index  = array('bluegreen' =>2,'blue'=>5,'green'=>6,
-   'lightblue'=>0,'orange'=>7,'purple'=>4,'red'=>3,'yellow'=>1);
-    protected $maxidx = 7 ;
-    protected $imgdata ;
-
-    function ImgData_Squares () {
-        //==========================================================
-        //sq_lblue.png
-        //==========================================================
-        $this->imgdata[0][0]= 362 ;
-        $this->imgdata[0][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAIAAADZrBkAAAAABm'.
-     'JLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsRAAALEQF/ZF+RAAAA'.
-     'B3RJTUUH0wMLFgojiPx/ygAAAPdJREFUeNpj/P377+kzHx89/c'.
-     'VAHNBQ5VBX52HavPWWjg6nnDQbkXoUFTnnL7zD9PPXrz17HxCj'.
-     'E6Jn6fL7H7/+ZWJgYCBGJ7IeBgYGJogofp1oehDa8OjE1IOiDa'.
-     'tOrHoYGBhY0NwD0enirMDAwMDFxYRVD7ptyDrNTAU0NXix6sGu'.
-     'jYGBgZOT9e/f/0xMjFyczFgVsGAKCfBza2kKzpl3hIuT1c9Xb/'.
-     'PW58/foKchJqx6tmy98vbjj8cvPm/afMnXW1JShA2fNmQ9EBFc'.
-     'Opnw6MGjkwm/Hlw6mQjqwaqTiRg9mDoZv//4M2/+UYJ64EBWgj'.
-     'cm2hwA8l24oNDl+DMAAAAASUVORK5CYII=' ; 
-
-        //==========================================================
-        //sq_yellow.png
-        //==========================================================
-        $this->imgdata[1][0]= 338 ;
-        $this->imgdata[1][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAMAAABhEH5lAAAAWl'.
-     'BMVEX////+/+H+/9/9/9v8/8P8/8H8/7v8/7n6/4P5/335/3n5'.
-     '/3X4/1f4/1P3/031/w30/wn0/wPt+ADp9ADm8ADk7gDc5gDa5A'.
-     'DL1ADFzgCwuACqsgClrABzeAC9M0MzAAAAAWJLR0QAiAUdSAAA'.
-     'AAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU1FB9MDCxYEDlOgDj'.
-     'EAAAB+SURBVHjaVcpbCsQgDEDRGERGKopjDa2a/W9zfLWj9/Nw'.
-     'Ac21ZRBOtZlRN9ApzSYFaDUj79KIorRDbJNO9bN/GUSh2ZRJFJ'.
-     'S18iorURBiyksO8buT0zkfYaUqzI91ckfhWhoGXTLzsDjI68Sz'.
-     'pGMjrzPzauA/iXk1AtykmvgBC8UcWUdc9HkAAAAASUVORK5CYI'.
-     'I=' ; 
-
-        //==========================================================
-        //sq_blgr.png
-        //==========================================================
-        $this->imgdata[2][0]= 347 ;
-        $this->imgdata[2][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAMAAABhEH5lAAAAZl'.
-     'BMVEX////0+vv0+vrz+fry+frv+Png7e/d7e/a6+zY6+250tSz'.
-     '0tSyztCtztGM0NWIz9SDzdNfsLVcrrRZrbJOp61MpqtIr7dHn6'.
-     'RErrZArLQ6q7M2g4kygYcsp68npa4ctr8QZ20JnqepKsl4AAAA'.
-     'AWJLR0QAiAUdSAAAAAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU'.
-     '1FB9MDCxYEByp8tpUAAAB7SURBVHjaVcjRFoIgDADQWZpWJpjY'.
-     'MsnG//9kzIFn3McLzfArDA3MndFjrhvgfDHFBEB9pt0CVzwrY3'.
-     'n2yicjhY4vTSp0nbXtN+hCV53SHDWe61dZY+/9463r2XuifHAM'.
-     '0SoH+6xEcovUlCfefeFSIwfTTQ3fB+pi4lV/bTIgvmaA7a0AAA'.
-     'AASUVORK5CYII=' ; 
-
-        //==========================================================
-        //sq_red.png
-        //==========================================================
-        $this->imgdata[3][0]= 324 ;
-        $this->imgdata[3][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAMAAABhEH5lAAAAXV'.
-     'BMVEX////++Pn99/j99ff99fb98/X98/T98PL55uj43+P24+bw'.
-     'kKPvjaHviJ3teJHpxMnoL2Pjs73WW3rWNljVWXnUVnbUK1DTJk'.
-     '3SUHPOBz/KQmmxPVmuOFasNFOeIkWVka/fAAAAAWJLR0QAiAUd'.
-     'SAAAAAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU1FB9MDCxYEHd'.
-     'ceT+8AAABtSURBVHjaVchbAkMwEAXQq6i3VrQiQfa/zDYTw8z5'.
-     'PCjGt9JVWFt1XWPh1fWNdfDy+tq6WPfRUPENNKnSnXNWPB4uv2'.
-     'b54nSZ8jHrMtOxvWZZZtpD4KP6xLkO9/AhzhaCOMhJh68cOjzV'.
-     '/K/4Ac2cG+nBcaRuAAAAAElFTkSuQmCC' ; 
-
-        //==========================================================
-        //sq_pink.png
-        //==========================================================
-        $this->imgdata[4][0]= 445 ;
-        $this->imgdata[4][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAMAAABhEH5lAAAApV'.
-     'BMVEX////6+Pz69/v49Pr38/r17/jr4+/l3Onj2efh1ua/L+i+'.
-     'q8m+Lue9Lua8qsS8LuW8LeS7pca5LOG4LN+2Y9O2YNW1ZdO1Kt'.
-     'y0atC0aNGzb82zbc6zKtuzKdqycsuwa8qtJtOISZ2GRpuFN6GE'.
-     'NqCDQpmCMZ+BPpd/LJ1/K519S5B9Jpx9Jpt9JZt6RY11BJZ1BJ'.
-     'V0BJV0BJRzBJNvNoRtIoJUEmdZ/XbrAAAAAWJLR0QAiAUdSAAA'.
-     'AAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU1FB9MDCxYDF3iKMD'.
-     'YAAACeSURBVHjaVczbEoIgGARgCiMtrexoWpaa2FHUgvd/tH4Y'.
-     'BnEvv9ldhNPradPnnGBUTtPDzMRPSIF46SaBoR25dYjz3I20Lb'.
-     'ek6BgQz73Il7KKpSgCO0pTHU0886J1sCe0ZYbALjGhjFnEM2es'.
-     'VhZVI4d+B1QtfnV47ywCEaKeP/p7JdLejSYt0j6NIiOq1wJZIs'.
-     'QTDA0ELHwhPBCwyR/Cni9cOmzJtwAAAABJRU5ErkJggg==' ; 
-
-        //==========================================================
-        //sq_blue.png
-        //==========================================================
-        $this->imgdata[5][0]= 283 ;
-        $this->imgdata[5][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAMAAABhEH5lAAAAQl'.
-     'BMVEX////4+fz39/z19vvy8vru7/ni4+7g4fHW1ue8vteXmt6B'.
-     'hdhiZ7FQVaZETcxCSJo1Oq4zNoMjKakhJHcKFaMEC2jRVYdWAA'.
-     'AAAWJLR0QAiAUdSAAAAAlwSFlzAAALEgAACxIB0t1+/AAAAAd0'.
-     'SU1FB9MDCxYDN0PkEP4AAABfSURBVHjaVchHAoAgDATAVcCCIF'.
-     'j4/1elJEjmOFDHKVgDv4iz640gLs+LMF6ZUv/VqcXXplU7Gqpy'.
-     'PFzBT5qml9NzlOX259riWHlS4kOffviHD8PQYZx2EFMPRkw+9Q'.
-     'FSnRPeWEDzKAAAAABJRU5ErkJggg==' ; 
-
-        //==========================================================
-        //sq_green.png
-        //==========================================================
-        $this->imgdata[6][0]= 325 ;
-        $this->imgdata[6][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAMAAABhEH5lAAAAXV'.
-     'BMVEX////2+vX1+vX1+fT0+fPz+PPx9/Dv9u7u9e3h7uHe697a'.
-     '6dnO2s3I1sa10LOvza2ay5aEwYBWlE9TqE5Tkk1RkEpMrUJMg0'.
-     'hKiUNGpEFBojw8oTcsbScaYBMWlwmMT0NtAAAAAWJLR0QAiAUd'.
-     'SAAAAAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU1FB9MDCxYEFd'.
-     'nFx90AAABuSURBVHjaVc9HAoAgDADB2HuJWLDx/2cKBITscW4L'.
-     '5byzMIWtZobNDZIZtrcCGZsRQ8GwvRSRNxIiMuysODKG3alikl'.
-     'ueOPlpKTLBaRmOZxQxaXlfb5ZWI9om4WntrXiDSJzp7SBkwMQa'.
-     'FEy0VR/NAB2kNuj7rgAAAABJRU5ErkJggg==' ; 
-
-        //==========================================================
-        //sq_orange.png
-        //==========================================================
-        $this->imgdata[7][0]= 321 ;
-        $this->imgdata[7][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAMAAABhEH5lAAAAUV'.
-     'BMVEX/////8+n/8uf/8OP/59H/5Mv/zqH/zJ3/ypv/yJf/vYH/'.
-     'u33/uXn/n0n/nUX/m0H/lzn/ljf/lDP/kS3/kCv/iR//hxv/fg'.
-     'n/fAX/eQDYZgDW6ia5AAAAAWJLR0QAiAUdSAAAAAlwSFlzAAAL'.
-     'EgAACxIB0t1+/AAAAAd0SU1FB9MDCxYEJIgbx+cAAAB2SURBVH'.
-     'jaVczRCoQwDETRbLAWLZSGUA35/w/dVI0283i4DODew3YESmWW'.
-     'kg5gWkoQAe6TleUQI/66Sy7i56+kLk7cht2N0+hcnJgQu0SqiC'.
-     '1SzSIbzWSi6gavqJ63wSduRi2f+kwyD5rEukwCdZ1kGAMGMfv9'.
-     'AbWuGMOr5COSAAAAAElFTkSuQmCC' ; 
-    }
-}
-
-?>
diff --git a/#jpgraph/src/imgdata_stars.inc.php b/#jpgraph/src/imgdata_stars.inc.php
deleted file mode 100644
index bc696902..00000000
--- a/#jpgraph/src/imgdata_stars.inc.php
+++ /dev/null
@@ -1,144 +0,0 @@
-<?php
-//=======================================================================
-// File:        IMGDATA_STARS.INC
-// Description: Base64 encoded images for stars
-// Created:     2003-03-20
-// Ver:         $Id: imgdata_stars.inc.php 1106 2009-02-22 20:16:35Z ljp $
-//
-// Copyright (c) Asial Corporation. All rights reserved.
-//========================================================================
-
-
-class ImgData_Stars extends ImgData {
-    protected $name = 'Stars';
-    protected $an = array(MARK_IMG_STAR => 'imgdata');
-
-    protected $colors = array('bluegreen','lightblue','purple','blue','green','pink','red','yellow');
-    protected $index  = array('bluegreen'=>3,'lightblue'=>4,'purple'=>1,
-   'blue'=>5,'green'=>0,'pink'=>7,'red'=>2,'yellow'=>6);
-    protected $maxidx = 7 ;
-    protected $imgdata ;
-
-    function __construct() {
-        //==========================================================
-        // File: bstar_green_001.png
-        //==========================================================
-        $this->imgdata[0][0]= 329 ;
-        $this->imgdata[0][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAABQAAAASCAMAAABsDg4iAAAAUV'.
-     'BMVEX///////+/v7+83rqcyY2Q/4R7/15y/1tp/05p/0lg/zdX'.
-     '/zdX/zVV/zdO/zFJ9TFJvDFD4yg+8Bw+3iU68hwurhYotxYosx'.
-     'YokBoTfwANgQFUp7DWAAAAAXRSTlMAQObYZgAAAAFiS0dEAIgF'.
-     'HUgAAAAJcEhZcwAACxIAAAsSAdLdfvwAAAAHdElNRQfTAxYTJj'.
-     'CRyxgTAAAAcUlEQVR4nH3MSw6AIAwEUBL/IKBWwXL/g0pLojUS'.
-     'ZzGLl8ko9Zumhr5iy66/GH0dp49llNPB5sTotDY5PVuLG6tnM9'.
-     'CVKSIe1joSgPsAKSuANNaENFQvTAGzmheSkUpMBWeJZwqBT8wo'.
-     'hmysD4bnnPsC/x8ItUdGPfAAAAAASUVORK5CYII=' ; 
-        //==========================================================
-        // File: bstar_blred.png
-        //==========================================================
-        $this->imgdata[1][0]= 325 ;
-        $this->imgdata[1][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAABQAAAASCAMAAABsDg4iAAAATl'.
-     'BMVEX///+/v79uRJ6jWPOSUtKrb+ejWO+gWPaGTruJTr6rZvF2'.
-     'RqC2ocqdVuCeV+egV/GsnLuIXL66rMSpcOyATbipY/OdWOp+VK'.
-     'aTU9WhV+yJKBoLAAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgA'.
-     'AAAJcEhZcwAACxIAAAsSAdLdfvwAAAAHdElNRQfTAxYTJwynv1'.
-     'XVAAAAcElEQVR4nH3MyQ6AIAwEUFIqiwju2///qLQmWiJxDnN4'.
-     'mYxSv5lqGCs2nvaLLtZx/VhGOW1MjnPJWp0zsw2wsUY2jd09BY'.
-     'DFmESC+BwA5UCUxhqAhqrA4CGrLpCMVGK4sZe4B+/5RLdiyMb6'.
-     'on/PuS9CdQNC7yBXEQAAAABJRU5ErkJggg==' ; 
-
-        //==========================================================
-        // File: bstar_red_001.png
-        //==========================================================
-        $this->imgdata[2][0]= 325 ;
-        $this->imgdata[2][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAABQAAAASCAMAAABsDg4iAAAATl'.
-     'BMVEX///+/v7+eRFHzWG3SUmHnb37vWGr2WHG7Tlm+TljxZneg'.
-     'Rk3KoaXgVmXnV2nxV227nJ++XGzErK3scIS4TVzzY3fqWG2mVF'.
-     'zVU2PsV2rJFw9VAAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgA'.
-     'AAAJcEhZcwAACxIAAAsSAdLdfvwAAAAHdElNRQfTAxYTJzCI0C'.
-     'lSAAAAcElEQVR4nH3MyQ6AIAwEUFIqiwju2///qLQmWiJxDnN4'.
-     'mYxSv5lqGCs2nvaLLtZx/VhGOW1MjnPJWp0zsw2wsUY2jd09BY'.
-     'DFmESC+BwA5UCUxhqAhqrA4CGrLpCMVGK4sZe4B+/5RLdiyMb6'.
-     'on/PuS9CdQNC7yBXEQAAAABJRU5ErkJggg==' ; 
-
-        //==========================================================
-        // File: bstar_blgr_001.png
-        //==========================================================
-        $this->imgdata[3][0]= 325 ;
-        $this->imgdata[3][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAABQAAAASCAMAAABsDg4iAAAATl'.
-     'BMVEX///+/v79Ehp5Yx/NSq9Jvw+dYwu9YzfZOmbtOmb5myPFG'.
-     'gqChvcpWteBXvedXxvGcsbtcpb6su8RwzOxNmrhjyvNYwupUjK'.
-     'ZTr9VXwOyJhmWNAAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgA'.
-     'AAAJcEhZcwAACxIAAAsSAdLdfvwAAAAHdElNRQfTAxYTJTC65k'.
-     'vQAAAAcElEQVR4nH3MyQ6AIAwEUFIqiwju2///qLQmWiJxDnN4'.
-     'mYxSv5lqGCs2nvaLLtZx/VhGOW1MjnPJWp0zsw2wsUY2jd09BY'.
-     'DFmESC+BwA5UCUxhqAhqrA4CGrLpCMVGK4sZe4B+/5RLdiyMb6'.
-     'on/PuS9CdQNC7yBXEQAAAABJRU5ErkJggg==' ; 
-
-        //==========================================================
-        // File: bstar_blgr_002.png
-        //==========================================================
-        $this->imgdata[4][0]= 325 ;
-        $this->imgdata[4][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAABQAAAASCAMAAABsDg4iAAAATl'.
-     'BMVEX///+/v79EnpxY8/FS0dJv5+dY7+9Y9vBOubtOur5m8fFG'.
-     'nKChycpW3uBX5+ZX8e2curtcvrqswsRw7OdNuLZj8/BY6udUpK'.
-     'ZT1dRX7OtNkrW5AAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgA'.
-     'AAAJcEhZcwAACxIAAAsSAdLdfvwAAAAHdElNRQfTAxYTJgXHeN'.
-     'wwAAAAcElEQVR4nH3MyQ6AIAwEUFIqiwju2///qLQmWiJxDnN4'.
-     'mYxSv5lqGCs2nvaLLtZx/VhGOW1MjnPJWp0zsw2wsUY2jd09BY'.
-     'DFmESC+BwA5UCUxhqAhqrA4CGrLpCMVGK4sZe4B+/5RLdiyMb6'.
-     'on/PuS9CdQNC7yBXEQAAAABJRU5ErkJggg==' ; 
-
-        //==========================================================
-        // File: bstar_blue_001.png
-        //==========================================================
-        $this->imgdata[5][0]= 325 ;
-        $this->imgdata[5][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAABQAAAASCAMAAABsDg4iAAAATl'.
-     'BMVEX///+/v79EY55Yi/NSetJvledYiO9YkPZOb7tObr5mkvFG'.
-     'X6ChrcpWgOBXhedXi/Gcpbtcf76sssRwnOxNcbhjk/NYiepUbK'.
-     'ZTfdVXh+ynNEzzAAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgA'.
-     'AAAJcEhZcwAACxIAAAsSAdLdfvwAAAAHdElNRQfTAxYTJhStyP'.
-     'zCAAAAcElEQVR4nH3MyQ6AIAwEUFIqiwju2///qLQmWiJxDnN4'.
-     'mYxSv5lqGCs2nvaLLtZx/VhGOW1MjnPJWp0zsw2wsUY2jd09BY'.
-     'DFmESC+BwA5UCUxhqAhqrA4CGrLpCMVGK4sZe4B+/5RLdiyMb6'.
-     'on/PuS9CdQNC7yBXEQAAAABJRU5ErkJggg==' ; 
-
-        //==========================================================
-        // File: bstar_oy_007.png
-        //==========================================================
-        $this->imgdata[6][0]= 325 ;
-        $this->imgdata[6][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAABQAAAASCAMAAABsDg4iAAAATl'.
-     'BMVEX///+/v7+ejUTz11jSvVLn02/v1lj21li7q06+r07x2mag'.
-     'lUbKxKHgy1bnz1fx1Ve7t5y+qlzEwqzs03C4pE3z2WPqz1imml'.
-     'TVv1Ps01dGRjeyAAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgA'.
-     'AAAJcEhZcwAACxIAAAsSAdLdfvwAAAAHdElNRQfTAxYTJjsGGc'.
-     'GbAAAAcElEQVR4nH3MyQ6AIAwEUFIqiwju2///qLQmWiJxDnN4'.
-     'mYxSv5lqGCs2nvaLLtZx/VhGOW1MjnPJWp0zsw2wsUY2jd09BY'.
-     'DFmESC+BwA5UCUxhqAhqrA4CGrLpCMVGK4sZe4B+/5RLdiyMb6'.
-     'on/PuS9CdQNC7yBXEQAAAABJRU5ErkJggg==' ; 
-
-        //==========================================================
-        // File: bstar_lred.png
-        //==========================================================
-        $this->imgdata[7][0]= 325 ;
-        $this->imgdata[7][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAABQAAAASCAMAAABsDg4iAAAATl'.
-     'BMVEX///+/v7+eRJPzWN3SUr7nb9TvWNj2WOS7Tqi+TqnxZtyg'.
-     'Ro/KocPgVsjnV9LxV927nLa+XLTErL7scN24TarzY9/qWNemVJ'.
-     'jVU8LsV9VCwcc9AAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgA'.
-     'AAAJcEhZcwAACxIAAAsSAdLdfvwAAAAHdElNRQfTAxYTJxi9ZY'.
-     'GoAAAAcElEQVR4nH3MyQ6AIAwEUFIqiwju2///qLQmWiJxDnN4'.
-     'mYxSv5lqGCs2nvaLLtZx/VhGOW1MjnPJWp0zsw2wsUY2jd09BY'.
-     'DFmESC+BwA5UCUxhqAhqrA4CGrLpCMVGK4sZe4B+/5RLdiyMb6'.
-     'on/PuS9CdQNC7yBXEQAAAABJRU5ErkJggg==' ; 
-    }
-}
-
-?>
diff --git a/#jpgraph/src/jpg-config.inc.php b/#jpgraph/src/jpg-config.inc.php
deleted file mode 100644
index ea16c1e2..00000000
--- a/#jpgraph/src/jpg-config.inc.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php
-//=======================================================================
-// File:        JPG-CONFIG.INC
-// Description: Configuration file for JpGraph library
-// Created:     2004-03-27
-// Ver:         $Id: jpg-config.inc.php 1871 2009-09-29 05:56:39Z ljp $
-//
-// Copyright (c) Asial Corporation. All rights reserved.
-//========================================================================
-
-
-//------------------------------------------------------------------------
-// Directories for cache and font directory.
-//
-// CACHE_DIR:
-// The full absolute name of the directory to be used to store the
-// cached image files. This directory will not be used if the USE_CACHE
-// define (further down) is false. If you enable the cache please note that
-// this directory MUST be readable and writable for the process running PHP.
-// Must end with '/'
-//
-// TTF_DIR:
-// Directory where TTF fonts can be found. Must end with '/'
-//
-// The default values used if these defines are left commented out are:
-//
-// UNIX:
-//   CACHE_DIR /tmp/jpgraph_cache/
-//   TTF_DIR   /usr/share/fonts/truetype/
-//   MBTTF_DIR /usr/share/fonts/truetype/
-//
-// WINDOWS:
-//   CACHE_DIR $SERVER_TEMP/jpgraph_cache/
-//   TTF_DIR   $SERVER_SYSTEMROOT/fonts/
-//   MBTTF_DIR $SERVER_SYSTEMROOT/fonts/
-//
-//------------------------------------------------------------------------
-// define('CACHE_DIR','/tmp/jpgraph_cache/');
-// define('TTF_DIR','/usr/share/fonts/TrueType/');
-// define('MBTTF_DIR','/usr/share/fonts/TrueType/');
-
-//-------------------------------------------------------------------------
-// Cache directory specification for use with CSIM graphs that are
-// using the cache.
-// The directory must be the filesysystem name as seen by PHP
-// and the 'http' version must be the same directory but as
-// seen by the HTTP server relative to the 'htdocs' ddirectory.
-// If a relative path is specified it is taken to be relative from where
-// the image script is executed.
-// Note: The default setting is to create a subdirectory in the
-// directory from where the image script is executed and store all files
-// there. As ususal this directory must be writeable by the PHP process.
-define('CSIMCACHE_DIR','csimcache/');
-define('CSIMCACHE_HTTP_DIR','csimcache/');
-
-//------------------------------------------------------------------------
-// Various JpGraph Settings. Adjust accordingly to your
-// preferences. Note that cache functionality is turned off by
-// default (Enable by setting USE_CACHE to true)
-//------------------------------------------------------------------------
-
-// Deafult locale for error messages.
-// This defaults to English = 'en'
-define('DEFAULT_ERR_LOCALE','en');
-
-// Deafult graphic format set to 'auto' which will automatically
-// choose the best available format in the order png,gif,jpeg
-// (The supported format depends on what your PHP installation supports)
-define('DEFAULT_GFORMAT','auto');
-
-// Should the cache be used at all? By setting this to false no
-// files will be generated in the cache directory.
-// The difference from READ_CACHE being that setting READ_CACHE to
-// false will still create the image in the cache directory
-// just not use it. By setting USE_CACHE=false no files will even
-// be generated in the cache directory.
-define('USE_CACHE',false);
-
-// Should we try to find an image in the cache before generating it?
-// Set this define to false to bypass the reading of the cache and always
-// regenerate the image. Note that even if reading the cache is
-// disabled the cached will still be updated with the newly generated
-// image. Set also 'USE_CACHE' below.
-define('READ_CACHE',true);
-
-// Determine if the error handler should be image based or purely
-// text based. Image based makes it easier since the script will
-// always return an image even in case of errors.
-define('USE_IMAGE_ERROR_HANDLER',true);
-
-// Should the library examine the global php_errmsg string and convert
-// any error in it to a graphical representation. This is handy for the
-// occasions when, for example, header files cannot be found and this results
-// in the graph not being created and just a 'red-cross' image would be seen.
-// This should be turned off for a production site.
-define('CATCH_PHPERRMSG',true);
-
-// Determine if the library should also setup the default PHP
-// error handler to generate a graphic error mesage. This is useful
-// during development to be able to see the error message as an image
-// instead as a 'red-cross' in a page where an image is expected.
-define('INSTALL_PHP_ERR_HANDLER',false);
-
-// Should usage of deprecated functions and parameters give a fatal error?
-// (Useful to check if code is future proof.)
-define('ERR_DEPRECATED',true);
-
-// The builtin GD function imagettfbbox() fuction which calculates the bounding box for
-// text using TTF fonts is buggy. By setting this define to true the library
-// uses its own compensation for this bug. However this will give a
-// slightly different visual apparance than not using this compensation.
-// Enabling this compensation will in general give text a bit more space to more
-// truly reflect the actual bounding box which is a bit larger than what the
-// GD function thinks.
-define('USE_LIBRARY_IMAGETTFBBOX',true);
-
-//------------------------------------------------------------------------
-// The following constants should rarely have to be changed !
-//------------------------------------------------------------------------
-
-// What group should the cached file belong to
-// (Set to '' will give the default group for the 'PHP-user')
-// Please note that the Apache user must be a member of the
-// specified group since otherwise it is impossible for Apache
-// to set the specified group.
-define('CACHE_FILE_GROUP','www');
-
-// What permissions should the cached file have
-// (Set to '' will give the default persmissions for the 'PHP-user')
-define('CACHE_FILE_MOD',0664);
-
-// Default theme class name
-define('DEFAULT_THEME_CLASS', 'UniversalTheme');
-
-define('SUPERSAMPLING', true);
-define('SUPERSAMPLING_SCALE', 1);
-
-?>
diff --git a/#jpgraph/src/jpg-config.inc.php.orig b/#jpgraph/src/jpg-config.inc.php.orig
deleted file mode 100644
index 8b29eec4..00000000
--- a/#jpgraph/src/jpg-config.inc.php.orig
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php
-//=======================================================================
-// File:        JPG-CONFIG.INC
-// Description: Configuration file for JpGraph library
-// Created:     2004-03-27
-// Ver:         $Id: jpg-config.inc.php 1871 2009-09-29 05:56:39Z ljp $
-//
-// Copyright (c) Asial Corporation. All rights reserved.
-//========================================================================
-
-
-//------------------------------------------------------------------------
-// Directories for cache and font directory.
-//
-// CACHE_DIR:
-// The full absolute name of the directory to be used to store the
-// cached image files. This directory will not be used if the USE_CACHE
-// define (further down) is false. If you enable the cache please note that
-// this directory MUST be readable and writable for the process running PHP.
-// Must end with '/'
-//
-// TTF_DIR:
-// Directory where TTF fonts can be found. Must end with '/'
-//
-// The default values used if these defines are left commented out are:
-//
-// UNIX:
-//   CACHE_DIR /tmp/jpgraph_cache/
-//   TTF_DIR   /usr/share/fonts/truetype/
-//   MBTTF_DIR /usr/share/fonts/truetype/
-//
-// WINDOWS:
-//   CACHE_DIR $SERVER_TEMP/jpgraph_cache/
-//   TTF_DIR   $SERVER_SYSTEMROOT/fonts/
-//   MBTTF_DIR $SERVER_SYSTEMROOT/fonts/
-//
-//------------------------------------------------------------------------
-// define('CACHE_DIR','/tmp/jpgraph_cache/');
-// define('TTF_DIR','/usr/share/fonts/truetype/');
-// define('MBTTF_DIR','/usr/share/fonts/truetype/');
-
-//-------------------------------------------------------------------------
-// Cache directory specification for use with CSIM graphs that are
-// using the cache.
-// The directory must be the filesysystem name as seen by PHP
-// and the 'http' version must be the same directory but as
-// seen by the HTTP server relative to the 'htdocs' ddirectory.
-// If a relative path is specified it is taken to be relative from where
-// the image script is executed.
-// Note: The default setting is to create a subdirectory in the
-// directory from where the image script is executed and store all files
-// there. As ususal this directory must be writeable by the PHP process.
-define('CSIMCACHE_DIR','csimcache/');
-define('CSIMCACHE_HTTP_DIR','csimcache/');
-
-//------------------------------------------------------------------------
-// Various JpGraph Settings. Adjust accordingly to your
-// preferences. Note that cache functionality is turned off by
-// default (Enable by setting USE_CACHE to true)
-//------------------------------------------------------------------------
-
-// Deafult locale for error messages.
-// This defaults to English = 'en'
-define('DEFAULT_ERR_LOCALE','en');
-
-// Deafult graphic format set to 'auto' which will automatically
-// choose the best available format in the order png,gif,jpeg
-// (The supported format depends on what your PHP installation supports)
-define('DEFAULT_GFORMAT','auto');
-
-// Should the cache be used at all? By setting this to false no
-// files will be generated in the cache directory.
-// The difference from READ_CACHE being that setting READ_CACHE to
-// false will still create the image in the cache directory
-// just not use it. By setting USE_CACHE=false no files will even
-// be generated in the cache directory.
-define('USE_CACHE',false);
-
-// Should we try to find an image in the cache before generating it?
-// Set this define to false to bypass the reading of the cache and always
-// regenerate the image. Note that even if reading the cache is
-// disabled the cached will still be updated with the newly generated
-// image. Set also 'USE_CACHE' below.
-define('READ_CACHE',true);
-
-// Determine if the error handler should be image based or purely
-// text based. Image based makes it easier since the script will
-// always return an image even in case of errors.
-define('USE_IMAGE_ERROR_HANDLER',true);
-
-// Should the library examine the global php_errmsg string and convert
-// any error in it to a graphical representation. This is handy for the
-// occasions when, for example, header files cannot be found and this results
-// in the graph not being created and just a 'red-cross' image would be seen.
-// This should be turned off for a production site.
-define('CATCH_PHPERRMSG',true);
-
-// Determine if the library should also setup the default PHP
-// error handler to generate a graphic error mesage. This is useful
-// during development to be able to see the error message as an image
-// instead as a 'red-cross' in a page where an image is expected.
-define('INSTALL_PHP_ERR_HANDLER',false);
-
-// Should usage of deprecated functions and parameters give a fatal error?
-// (Useful to check if code is future proof.)
-define('ERR_DEPRECATED',true);
-
-// The builtin GD function imagettfbbox() fuction which calculates the bounding box for
-// text using TTF fonts is buggy. By setting this define to true the library
-// uses its own compensation for this bug. However this will give a
-// slightly different visual apparance than not using this compensation.
-// Enabling this compensation will in general give text a bit more space to more
-// truly reflect the actual bounding box which is a bit larger than what the
-// GD function thinks.
-define('USE_LIBRARY_IMAGETTFBBOX',true);
-
-//------------------------------------------------------------------------
-// The following constants should rarely have to be changed !
-//------------------------------------------------------------------------
-
-// What group should the cached file belong to
-// (Set to '' will give the default group for the 'PHP-user')
-// Please note that the Apache user must be a member of the
-// specified group since otherwise it is impossible for Apache
-// to set the specified group.
-define('CACHE_FILE_GROUP','www');
-
-// What permissions should the cached file have
-// (Set to '' will give the default persmissions for the 'PHP-user')
-define('CACHE_FILE_MOD',0664);
-
-// Default theme class name
-define('DEFAULT_THEME_CLASS', 'FusionTheme');
-
-define('SUPERSAMPLING', true);
-define('SUPERSAMPLING_SCALE', 1);
-
-?>
diff --git a/#jpgraph/src/jpgraph.php b/#jpgraph/src/jpgraph.php
deleted file mode 100644
index 5db0bbc3..00000000
--- a/#jpgraph/src/jpgraph.php
+++ /dev/null
@@ -1,5629 +0,0 @@
-<?php
-//=======================================================================
-// File:        JPGRAPH.PHP
-// Description: PHP Graph Plotting library. Base module.
-// Created:     2001-01-08
-// Ver:         $Id: jpgraph.php 1924 2010-01-11 14:03:26Z ljp $
-//
-// Copyright (c) Asial Corporation. All rights reserved.
-//========================================================================
-
-require_once('jpg-config.inc.php');
-require_once('jpgraph_gradient.php');
-require_once('jpgraph_errhandler.inc.php');
-require_once('jpgraph_ttf.inc.php');
-require_once('jpgraph_rgb.inc.php');
-require_once('jpgraph_text.inc.php');
-require_once('jpgraph_legend.inc.php');
-require_once('jpgraph_theme.inc.php');
-require_once('gd_image.inc.php');
-
-// Version info
-define('JPG_VERSION','4.0.2');
-
-// Minimum required PHP version
-define('MIN_PHPVERSION','5.1.0');
-
-// Special file name to indicate that we only want to calc
-// the image map in the call to Graph::Stroke() used
-// internally from the GetHTMLCSIM() method.
-define('_CSIM_SPECIALFILE','_csim_special_');
-
-// HTTP GET argument that is used with image map
-// to indicate to the script to just generate the image
-// and not the full CSIM HTML page.
-define('_CSIM_DISPLAY','_jpg_csimd');
-
-// Special filename for Graph::Stroke(). If this filename is given
-// then the image will NOT be streamed to browser of file. Instead the
-// Stroke call will return the handler for the created GD image.
-define('_IMG_HANDLER','__handle');
-
-// Special filename for Graph::Stroke(). If this filename is given
-// the image will be stroked to a file with a name based on the script name.
-define('_IMG_AUTO','auto');
-
-// Tick density
-define("TICKD_DENSE",1);
-define("TICKD_NORMAL",2);
-define("TICKD_SPARSE",3);
-define("TICKD_VERYSPARSE",4);
-
-// Side for ticks and labels.
-define("SIDE_LEFT",-1);
-define("SIDE_RIGHT",1);
-define("SIDE_DOWN",-1);
-define("SIDE_BOTTOM",-1);
-define("SIDE_UP",1);
-define("SIDE_TOP",1);
-
-// Legend type stacked vertical or horizontal
-define("LEGEND_VERT",0);
-define("LEGEND_HOR",1);
-
-// Mark types for plot marks
-define("MARK_SQUARE",1);
-define("MARK_UTRIANGLE",2);
-define("MARK_DTRIANGLE",3);
-define("MARK_DIAMOND",4);
-define("MARK_CIRCLE",5);
-define("MARK_FILLEDCIRCLE",6);
-define("MARK_CROSS",7);
-define("MARK_STAR",8);
-define("MARK_X",9);
-define("MARK_LEFTTRIANGLE",10);
-define("MARK_RIGHTTRIANGLE",11);
-define("MARK_FLASH",12);
-define("MARK_IMG",13);
-define("MARK_FLAG1",14);
-define("MARK_FLAG2",15);
-define("MARK_FLAG3",16);
-define("MARK_FLAG4",17);
-
-// Builtin images
-define("MARK_IMG_PUSHPIN",50);
-define("MARK_IMG_SPUSHPIN",50);
-define("MARK_IMG_LPUSHPIN",51);
-define("MARK_IMG_DIAMOND",52);
-define("MARK_IMG_SQUARE",53);
-define("MARK_IMG_STAR",54);
-define("MARK_IMG_BALL",55);
-define("MARK_IMG_SBALL",55);
-define("MARK_IMG_MBALL",56);
-define("MARK_IMG_LBALL",57);
-define("MARK_IMG_BEVEL",58);
-
-// Inline defines
-define("INLINE_YES",1);
-define("INLINE_NO",0);
-
-// Format for background images
-define("BGIMG_FILLPLOT",1);
-define("BGIMG_FILLFRAME",2);
-define("BGIMG_COPY",3);
-define("BGIMG_CENTER",4);
-define("BGIMG_FREE",5);
-
-// Depth of objects
-define("DEPTH_BACK",0);
-define("DEPTH_FRONT",1);
-
-// Direction
-define("VERTICAL",1);
-define("HORIZONTAL",0);
-
-// Axis styles for scientific style axis
-define('AXSTYLE_SIMPLE',1);
-define('AXSTYLE_BOXIN',2);
-define('AXSTYLE_BOXOUT',3);
-define('AXSTYLE_YBOXIN',4);
-define('AXSTYLE_YBOXOUT',5);
-
-// Style for title backgrounds
-define('TITLEBKG_STYLE1',1);
-define('TITLEBKG_STYLE2',2);
-define('TITLEBKG_STYLE3',3);
-define('TITLEBKG_FRAME_NONE',0);
-define('TITLEBKG_FRAME_FULL',1);
-define('TITLEBKG_FRAME_BOTTOM',2);
-define('TITLEBKG_FRAME_BEVEL',3);
-define('TITLEBKG_FILLSTYLE_HSTRIPED',1);
-define('TITLEBKG_FILLSTYLE_VSTRIPED',2);
-define('TITLEBKG_FILLSTYLE_SOLID',3);
-
-// Styles for axis labels background
-define('LABELBKG_NONE',0);
-define('LABELBKG_XAXIS',1);
-define('LABELBKG_YAXIS',2);
-define('LABELBKG_XAXISFULL',3);
-define('LABELBKG_YAXISFULL',4);
-define('LABELBKG_XYFULL',5);
-define('LABELBKG_XY',6);
-
-
-// Style for background gradient fills
-define('BGRAD_FRAME',1);
-define('BGRAD_MARGIN',2);
-define('BGRAD_PLOT',3);
-
-// Width of tab titles
-define('TABTITLE_WIDTHFIT',0);
-define('TABTITLE_WIDTHFULL',-1);
-
-// Defines for 3D skew directions
-define('SKEW3D_UP',0);
-define('SKEW3D_DOWN',1);
-define('SKEW3D_LEFT',2);
-define('SKEW3D_RIGHT',3);
-
-// For internal use only
-define("_JPG_DEBUG",false);
-define("_FORCE_IMGTOFILE",false);
-define("_FORCE_IMGDIR",'/tmp/jpgimg/');
-
-
-//
-// Automatic settings of path for cache and font directory
-// if they have not been previously specified
-//
-if(USE_CACHE) {
-    if (!defined('CACHE_DIR')) {
-        if ( strstr( PHP_OS, 'WIN') ) {
-            if( empty($_SERVER['TEMP']) ) {
-                $t = new ErrMsgText();
-                $msg = $t->Get(11,$file,$lineno);
-                die($msg);
-            }
-            else {
-                define('CACHE_DIR', $_SERVER['TEMP'] . '/');
-            }
-        } else {
-            define('CACHE_DIR','/tmp/jpgraph_cache/');
-        }
-    }
-}
-elseif( !defined('CACHE_DIR') ) {
-    define('CACHE_DIR', '');
-}
-
-//
-// Setup path for western/latin TTF fonts
-//
-if (!defined('TTF_DIR')) {
-    if (strstr( PHP_OS, 'WIN') ) {
-        $sroot = getenv('SystemRoot');
-        if( empty($sroot) ) {
-            $t = new ErrMsgText();
-            $msg = $t->Get(12,$file,$lineno);
-            die($msg);
-        }
-        else {
-            define('TTF_DIR', $sroot.'/fonts/');
-        }
-    } else {
-        define('TTF_DIR','/usr/share/fonts/truetype/');
-    }
-}
-
-//
-// Setup path for MultiByte TTF fonts (japanese, chinese etc.)
-//
-if (!defined('MBTTF_DIR')) {
-    if (strstr( PHP_OS, 'WIN') ) {
-        $sroot = getenv('SystemRoot');
-        if( empty($sroot) ) {
-            $t = new ErrMsgText();
-            $msg = $t->Get(12,$file,$lineno);
-            die($msg);
-        }
-        else {
-            define('MBTTF_DIR', $sroot.'/fonts/');
-        }
-    } else {
-        define('MBTTF_DIR','/usr/share/fonts/truetype/');
-    }
-}
-
-//
-// Check minimum PHP version
-//
-function CheckPHPVersion($aMinVersion) {
-    list($majorC, $minorC, $editC) = preg_split('/[\/.-]/', PHP_VERSION);
-    list($majorR, $minorR, $editR) = preg_split('/[\/.-]/', $aMinVersion);
-
-    if ($majorC < $majorR) return false;
-
-    if ($majorC == $majorR) {
-        if($minorC < $minorR) return false;
-
-        if($minorC == $minorR){
-            if($editC < $editR) return false;
-        }
-    }
-
-    return true;
-}
-
-//
-// Make sure PHP version is high enough
-//
-if( !CheckPHPVersion(MIN_PHPVERSION) ) {
-    JpGraphError::RaiseL(13,PHP_VERSION,MIN_PHPVERSION);
-    die();
-}
-
-//
-// Make GD sanity check
-//
-if( !function_exists("imagetypes") || !function_exists('imagecreatefromstring') ) {
-    JpGraphError::RaiseL(25001);
-    //("This PHP installation is not configured with the GD library. Please recompile PHP with GD support to run JpGraph. (Neither function imagetypes() nor imagecreatefromstring() does exist)");
-}
-
-//
-// Setup PHP error handler
-//
-function _phpErrorHandler($errno,$errmsg,$filename, $linenum, $vars) {
-    // Respect current error level
-    if( $errno & error_reporting() ) {
-        JpGraphError::RaiseL(25003,basename($filename),$linenum,$errmsg);
-    }
-}
-
-if( INSTALL_PHP_ERR_HANDLER ) {
-    set_error_handler("_phpErrorHandler");
-}
-
-//
-// Check if there were any warnings, perhaps some wrong includes by the user. In this
-// case we raise it immediately since otherwise the image will not show and makes
-// debugging difficult. This is controlled by the user setting CATCH_PHPERRMSG
-//
-if( isset($GLOBALS['php_errormsg']) && CATCH_PHPERRMSG && !preg_match('/|Deprecated|/i', $GLOBALS['php_errormsg']) ) {
-    JpGraphError::RaiseL(25004,$GLOBALS['php_errormsg']);
-}
-
-// Useful mathematical function
-function sign($a) {return $a >= 0 ? 1 : -1;}
-
-//
-// Utility function to generate an image name based on the filename we
-// are running from and assuming we use auto detection of graphic format
-// (top level), i.e it is safe to call this function
-// from a script that uses JpGraph
-//
-function GenImgName() {
-    // Determine what format we should use when we save the images
-    $supported = imagetypes();
-    if( $supported & IMG_PNG )    $img_format="png";
-    elseif( $supported & IMG_GIF ) $img_format="gif";
-    elseif( $supported & IMG_JPG ) $img_format="jpeg";
-    elseif( $supported & IMG_WBMP ) $img_format="wbmp";
-    elseif( $supported & IMG_XPM ) $img_format="xpm";
-
-
-    if( !isset($_SERVER['PHP_SELF']) ) {
-        JpGraphError::RaiseL(25005);
-        //(" Can't access PHP_SELF, PHP global variable. You can't run PHP from command line if you want to use the 'auto' naming of cache or image files.");
-    }
-    $fname = basename($_SERVER['PHP_SELF']);
-    if( !empty($_SERVER['QUERY_STRING']) ) {
-        $q = @$_SERVER['QUERY_STRING'];
-        $fname .= '_'.preg_replace("/\W/", "_", $q).'.'.$img_format;
-    }
-    else {
-        $fname = substr($fname,0,strlen($fname)-4).'.'.$img_format;
-    }
-    return $fname;
-}
-
-//===================================================
-// CLASS JpgTimer
-// Description: General timing utility class to handle
-// time measurement of generating graphs. Multiple
-// timers can be started.
-//===================================================
-class JpgTimer {
-    private $start, $idx;
-
-    function __construct() {
-        $this->idx=0;
-    }
-
-    // Push a new timer start on stack
-    function Push() {
-        list($ms,$s)=explode(" ",microtime());
-        $this->start[$this->idx++]=floor($ms*1000) + 1000*$s;
-    }
-
-    // Pop the latest timer start and return the diff with the
-    // current time
-    function Pop() {
-        assert($this->idx>0);
-        list($ms,$s)=explode(" ",microtime());
-        $etime=floor($ms*1000) + (1000*$s);
-        $this->idx--;
-        return $etime-$this->start[$this->idx];
-    }
-} // Class
-
-//===================================================
-// CLASS DateLocale
-// Description: Hold localized text used in dates
-//===================================================
-class DateLocale {
-
-    public $iLocale = 'C'; // environmental locale be used by default
-    private $iDayAbb = null, $iShortDay = null, $iShortMonth = null, $iMonthName = null;
-
-    function __construct() {
-        settype($this->iDayAbb, 'array');
-        settype($this->iShortDay, 'array');
-        settype($this->iShortMonth, 'array');
-        settype($this->iMonthName, 'array');
-        $this->Set('C');
-    }
-
-    function Set($aLocale) {
-        if ( in_array($aLocale, array_keys($this->iDayAbb)) ){
-            $this->iLocale = $aLocale;
-            return TRUE;  // already cached nothing else to do!
-        }
-
-        $pLocale = setlocale(LC_TIME, 0); // get current locale for LC_TIME
-
-        if (is_array($aLocale)) {
-            foreach ($aLocale as $loc) {
-                $res = @setlocale(LC_TIME, $loc);
-                if ( $res ) {
-                    $aLocale = $loc;
-                    break;
-                }
-            }
-        }
-        else {
-            $res = @setlocale(LC_TIME, $aLocale);
-        }
-
-        if ( ! $res ) {
-            JpGraphError::RaiseL(25007,$aLocale);
-            //("You are trying to use the locale ($aLocale) which your PHP installation does not support. Hint: Use '' to indicate the default locale for this geographic region.");
-            return FALSE;
-        }
-
-        $this->iLocale = $aLocale;
-        for( $i = 0, $ofs = 0 - strftime('%w'); $i < 7; $i++, $ofs++ ) {
-            $day = strftime('%a', strtotime("$ofs day"));
-            $day[0] = strtoupper($day[0]);
-            $this->iDayAbb[$aLocale][]= $day[0];
-            $this->iShortDay[$aLocale][]= $day;
-        }
-
-        for($i=1; $i<=12; ++$i) {
-            list($short ,$full) = explode('|', strftime("%b|%B",strtotime("2001-$i-01")));
-            $this->iShortMonth[$aLocale][] = ucfirst($short);
-            $this->iMonthName [$aLocale][] = ucfirst($full);
-        }
-
-        setlocale(LC_TIME, $pLocale);
-
-        return TRUE;
-    }
-
-
-    function GetDayAbb() {
-        return $this->iDayAbb[$this->iLocale];
-    }
-
-    function GetShortDay() {
-        return $this->iShortDay[$this->iLocale];
-    }
-
-    function GetShortMonth() {
-        return $this->iShortMonth[$this->iLocale];
-    }
-
-    function GetShortMonthName($aNbr) {
-        return $this->iShortMonth[$this->iLocale][$aNbr];
-    }
-
-    function GetLongMonthName($aNbr) {
-        return $this->iMonthName[$this->iLocale][$aNbr];
-    }
-
-    function GetMonth() {
-        return $this->iMonthName[$this->iLocale];
-    }
-}
-
-// Global object handlers
-$gDateLocale = new DateLocale();
-$gJpgDateLocale = new DateLocale();
-
-//=======================================================
-// CLASS Footer
-// Description: Encapsulates the footer line in the Graph
-//=======================================================
-class Footer {
-    public $iLeftMargin = 3, $iRightMargin = 3, $iBottomMargin = 3 ;
-    public $left,$center,$right;
-    private $iTimer=null, $itimerpoststring='';
-
-    function __construct() {
-        $this->left = new Text();
-        $this->left->ParagraphAlign('left');
-        $this->center = new Text();
-        $this->center->ParagraphAlign('center');
-        $this->right = new Text();
-        $this->right->ParagraphAlign('right');
-    }
-
-    function SetTimer($aTimer,$aTimerPostString='') {
-        $this->iTimer = $aTimer;
-        $this->itimerpoststring = $aTimerPostString;
-    }
-
-    function SetMargin($aLeft=3,$aRight=3,$aBottom=3) {
-        $this->iLeftMargin = $aLeft;
-        $this->iRightMargin = $aRight;
-        $this->iBottomMargin = $aBottom;
-    }
-
-    function Stroke($aImg) {
-        $y = $aImg->height - $this->iBottomMargin;
-        $x = $this->iLeftMargin;
-        $this->left->Align('left','bottom');
-        $this->left->Stroke($aImg,$x,$y);
-
-        $x = ($aImg->width - $this->iLeftMargin - $this->iRightMargin)/2;
-        $this->center->Align('center','bottom');
-        $this->center->Stroke($aImg,$x,$y);
-
-        $x = $aImg->width - $this->iRightMargin;
-        $this->right->Align('right','bottom');
-        if( $this->iTimer != null ) {
-            $this->right->Set( $this->right->t . sprintf('%.3f',$this->iTimer->Pop()/1000.0) . $this->itimerpoststring );
-        }
-        $this->right->Stroke($aImg,$x,$y);
-    }
-}
-
-
-//===================================================
-// CLASS Graph
-// Description: Main class to handle graphs
-//===================================================
-class Graph {
-    public $cache=null;   // Cache object (singleton)
-    public $img=null;   // Img object (singleton)
-    public $plots=array();  // Array of all plot object in the graph (for Y 1 axis)
-    public $y2plots=array();  // Array of all plot object in the graph (for Y 2 axis)
-    public $ynplots=array();
-    public $xscale=null;  // X Scale object (could be instance of LinearScale or LogScale
-    public $yscale=null,$y2scale=null, $ynscale=array();
-    public $iIcons = array();  // Array of Icons to add to
-    public $cache_name;   // File name to be used for the current graph in the cache directory
-    public $xgrid=null;   // X Grid object (linear or logarithmic)
-    public $ygrid=null,$y2grid=null; //dito for Y
-    public $doframe,$frame_color, $frame_weight; // Frame around graph
-    public $boxed=false, $box_color='black', $box_weight=1;  // Box around plot area
-    public $doshadow=false,$shadow_width=4,$shadow_color='gray@0.5'; // Shadow for graph
-    public $xaxis=null;   // X-axis (instane of Axis class)
-    public $yaxis=null, $y2axis=null, $ynaxis=array(); // Y axis (instance of Axis class)
-    public $margin_color; // Margin color of graph
-    public $plotarea_color=array(255,255,255); // Plot area color
-    public $title,$subtitle,$subsubtitle;  // Title and subtitle(s) text object
-    public $axtype="linlin";  // Type of axis
-    public $xtick_factor,$ytick_factor; // Factor to determine the maximum number of ticks depending on the plot width
-    public $texts=null, $y2texts=null; // Text object to ge shown in the graph
-    public $lines=null, $y2lines=null;
-    public $bands=null, $y2bands=null;
-    public $text_scale_off=0, $text_scale_abscenteroff=-1; // Text scale in fractions and for centering bars
-    public $background_image='',$background_image_type=-1,$background_image_format="png";
-    public $background_image_bright=0,$background_image_contr=0,$background_image_sat=0;
-    public $background_image_xpos=0,$background_image_ypos=0;
-    public $image_bright=0, $image_contr=0, $image_sat=0;
-    public $inline;
-    public $showcsim=0,$csimcolor="red";//debug stuff, draw the csim boundaris on the image if <>0
-    public $grid_depth=DEPTH_BACK; // Draw grid under all plots as default
-    public $iAxisStyle = AXSTYLE_SIMPLE;
-    public $iCSIMdisplay=false,$iHasStroked = false;
-    public $footer;
-    public $csimcachename = '', $csimcachetimeout = 0, $iCSIMImgAlt='';
-    public $iDoClipping = false;
-    public $y2orderback=true;
-    public $tabtitle;
-    public $bkg_gradtype=-1,$bkg_gradstyle=BGRAD_MARGIN;
-    public $bkg_gradfrom='navy', $bkg_gradto='silver';
-    public $plot_gradtype=-1,$plot_gradstyle=BGRAD_MARGIN;
-    public $plot_gradfrom='silver', $plot_gradto='navy';
-
-    public $titlebackground = false;
-    public $titlebackground_color = 'lightblue',
-           $titlebackground_style = 1,
-           $titlebackground_framecolor,
-           $titlebackground_framestyle,
-           $titlebackground_frameweight,
-           $titlebackground_bevelheight;
-    public $titlebkg_fillstyle=TITLEBKG_FILLSTYLE_SOLID;
-    public $titlebkg_scolor1='black',$titlebkg_scolor2='white';
-    public $framebevel, $framebeveldepth;
-    public $framebevelborder, $framebevelbordercolor;
-    public $framebevelcolor1, $framebevelcolor2;
-    public $background_image_mix=100;
-    public $background_cflag = '';
-    public $background_cflag_type = BGIMG_FILLPLOT;
-    public $background_cflag_mix = 100;
-    public $iImgTrans=false,
-           $iImgTransHorizon = 100,$iImgTransSkewDist=150,
-           $iImgTransDirection = 1, $iImgTransMinSize = true,
-           $iImgTransFillColor='white',$iImgTransHighQ=false,
-           $iImgTransBorder=false,$iImgTransHorizonPos=0.5;
-    public $legend;
-    public $graph_theme;
-    protected $iYAxisDeltaPos=50;
-    protected $iIconDepth=DEPTH_BACK;
-    protected $iAxisLblBgType = 0,
-              $iXAxisLblBgFillColor = 'lightgray', $iXAxisLblBgColor = 'black',
-              $iYAxisLblBgFillColor = 'lightgray', $iYAxisLblBgColor = 'black';
-    protected $iTables=NULL;
-
-    protected $isRunningClear = false;
-    protected $inputValues;
-    protected $isAfterSetScale = false;
-
-    // aWIdth   Width in pixels of image
-    // aHeight   Height in pixels of image
-    // aCachedName Name for image file in cache directory
-    // aTimeOut  Timeout in minutes for image in cache
-    // aInline  If true the image is streamed back in the call to Stroke()
-    //   If false the image is just created in the cache
-    function __construct($aWidth=300,$aHeight=200,$aCachedName='',$aTimeout=0,$aInline=true) {
-
-        if( !is_numeric($aWidth) || !is_numeric($aHeight) ) {
-            JpGraphError::RaiseL(25008);//('Image width/height argument in Graph::Graph() must be numeric');
-        }
-
-        // Initialize frame and margin
-        $this->InitializeFrameAndMargin();
-
-        // Automatically generate the image file name based on the name of the script that
-        // generates the graph
-        if( $aCachedName == 'auto' ) {
-            $aCachedName=GenImgName();
-        }
-
-        // Should the image be streamed back to the browser or only to the cache?
-        $this->inline=$aInline;
-
-        $this->img = new RotImage($aWidth,$aHeight);
-        $this->cache  = new ImgStreamCache();
-
-        // Window doesn't like '?' in the file name so replace it with an '_'
-        $aCachedName = str_replace("?","_",$aCachedName);
-        $this->SetupCache($aCachedName, $aTimeout);
-
-        $this->title = new Text();
-        $this->title->ParagraphAlign('center');
-        $this->title->SetFont(FF_DEFAULT,FS_NORMAL); //FF_FONT2, FS_BOLD
-        $this->title->SetMargin(5);
-        $this->title->SetAlign('center');
-
-        $this->subtitle = new Text();
-        $this->subtitle->ParagraphAlign('center');
-        $this->subtitle->SetMargin(3);
-        $this->subtitle->SetAlign('center');
-
-        $this->subsubtitle = new Text();
-        $this->subsubtitle->ParagraphAlign('center');
-        $this->subsubtitle->SetMargin(3);
-        $this->subsubtitle->SetAlign('center');
-
-        $this->legend = new Legend();
-        $this->footer = new Footer();
-
-        // If the cached version exist just read it directly from the
-        // cache, stream it back to browser and exit
-        if( $aCachedName!='' && READ_CACHE && $aInline ) {
-            if( $this->cache->GetAndStream($this->img,$aCachedName) ) {
-                exit();
-            }
-        }
-
-        $this->SetTickDensity(); // Normal density
-
-        $this->tabtitle = new GraphTabTitle();
-
-        if (!$this->isRunningClear) {
-            $this->inputValues = array();
-            $this->inputValues['aWidth'] = $aWidth;
-            $this->inputValues['aHeight'] = $aHeight;
-            $this->inputValues['aCachedName'] = $aCachedName;
-            $this->inputValues['aTimeout'] = $aTimeout;
-            $this->inputValues['aInline'] = $aInline;
-
-            $theme_class = DEFAULT_THEME_CLASS;
-            if (class_exists($theme_class)) {
-                $this->graph_theme = new $theme_class();
-            }
-        }
-    }
-
-    function InitializeFrameAndMargin() {
-        $this->doframe=true;
-        $this->frame_color='black';
-        $this->frame_weight=1; 
-
-        $this->titlebackground_framecolor = 'blue';
-        $this->titlebackground_framestyle = 2;
-        $this->titlebackground_frameweight = 1;
-        $this->titlebackground_bevelheight = 3;
-        $this->titlebkg_fillstyle=TITLEBKG_FILLSTYLE_SOLID;
-        $this->titlebkg_scolor1='black';
-        $this->titlebkg_scolor2='white';
-        $this->framebevel = false;
-        $this->framebeveldepth = 2;
-        $this->framebevelborder = false;
-        $this->framebevelbordercolor='black';
-        $this->framebevelcolor1='white@0.4';
-        $this->framebevelcolor2='black@0.4';
-
-        $this->margin_color = array(250,250,250);
-    }
-
-    function SetupCache($aFilename,$aTimeout=60) {
-        $this->cache_name = $aFilename;
-        $this->cache->SetTimeOut($aTimeout);
-    }
-
-    // Enable final image perspective transformation
-    function Set3DPerspective($aDir=1,$aHorizon=100,$aSkewDist=120,$aQuality=false,$aFillColor='#FFFFFF',$aBorder=false,$aMinSize=true,$aHorizonPos=0.5) {
-        $this->iImgTrans = true;
-        $this->iImgTransHorizon = $aHorizon;
-        $this->iImgTransSkewDist= $aSkewDist;
-        $this->iImgTransDirection = $aDir;
-        $this->iImgTransMinSize = $aMinSize;
-        $this->iImgTransFillColor=$aFillColor;
-        $this->iImgTransHighQ=$aQuality;
-        $this->iImgTransBorder=$aBorder;
-        $this->iImgTransHorizonPos=$aHorizonPos;
-    }
-
-    function SetUserFont($aNormal,$aBold='',$aItalic='',$aBoldIt='') {
-        $this->img->ttf->SetUserFont($aNormal,$aBold,$aItalic,$aBoldIt);
-    }
-
-    function SetUserFont1($aNormal,$aBold='',$aItalic='',$aBoldIt='') {
-        $this->img->ttf->SetUserFont1($aNormal,$aBold,$aItalic,$aBoldIt);
-    }
-
-    function SetUserFont2($aNormal,$aBold='',$aItalic='',$aBoldIt='') {
-        $this->img->ttf->SetUserFont2($aNormal,$aBold,$aItalic,$aBoldIt);
-    }
-
-    function SetUserFont3($aNormal,$aBold='',$aItalic='',$aBoldIt='') {
-        $this->img->ttf->SetUserFont3($aNormal,$aBold,$aItalic,$aBoldIt);
-    }
-
-    // Set Image format and optional quality
-    function SetImgFormat($aFormat,$aQuality=75) {
-        $this->img->SetImgFormat($aFormat,$aQuality);
-    }
-
-    // Should the grid be in front or back of the plot?
-    function SetGridDepth($aDepth) {
-        $this->grid_depth=$aDepth;
-    }
-
-    function SetIconDepth($aDepth) {
-        $this->iIconDepth=$aDepth;
-    }
-
-    // Specify graph angle 0-360 degrees.
-    function SetAngle($aAngle) {
-        $this->img->SetAngle($aAngle);
-    }
-
-    function SetAlphaBlending($aFlg=true) {
-        $this->img->SetAlphaBlending($aFlg);
-    }
-
-    // Shortcut to image margin
-    function SetMargin($lm,$rm,$tm,$bm) {
-        $this->img->SetMargin($lm,$rm,$tm,$bm);
-    }
-
-    function SetY2OrderBack($aBack=true) {
-        $this->y2orderback = $aBack;
-    }
-
-    // Rotate the graph 90 degrees and set the margin
-    // when we have done a 90 degree rotation
-    function Set90AndMargin($lm=0,$rm=0,$tm=0,$bm=0) {
-        $lm = $lm ==0 ? floor(0.2 * $this->img->width)  : $lm ;
-        $rm = $rm ==0 ? floor(0.1 * $this->img->width)  : $rm ;
-        $tm = $tm ==0 ? floor(0.2 * $this->img->height) : $tm ;
-        $bm = $bm ==0 ? floor(0.1 * $this->img->height) : $bm ;
-
-        $adj = ($this->img->height - $this->img->width)/2;
-        $this->img->SetMargin($tm-$adj,$bm-$adj,$rm+$adj,$lm+$adj);
-        $this->img->SetCenter(floor($this->img->width/2),floor($this->img->height/2));
-        $this->SetAngle(90);
-        if( empty($this->yaxis) || empty($this->xaxis) ) {
-            JpgraphError::RaiseL(25009);//('You must specify what scale to use with a call to Graph::SetScale()');
-        }
-        $this->xaxis->SetLabelAlign('right','center');
-        $this->yaxis->SetLabelAlign('center','bottom');
-    }
-
-    function SetClipping($aFlg=true) {
-        $this->iDoClipping = $aFlg ;
-    }
-
-    // Add a plot object to the graph
-    function Add($aPlot) {
-        if( $aPlot == null ) {
-            JpGraphError::RaiseL(25010);//("Graph::Add() You tried to add a null plot to the graph.");
-        }
-        if( is_array($aPlot) && count($aPlot) > 0 ) {
-            $cl = $aPlot[0];
-        }
-        else {
-            $cl = $aPlot;
-        }
-
-        if( $cl instanceof Text ) $this->AddText($aPlot);
-        elseif( class_exists('PlotLine',false) && ($cl instanceof PlotLine) )  $this->AddLine($aPlot);
-        elseif( class_exists('PlotBand',false) && ($cl instanceof PlotBand) ) $this->AddBand($aPlot);
-        elseif( class_exists('IconPlot',false) && ($cl instanceof IconPlot) ) $this->AddIcon($aPlot);
-        elseif( class_exists('GTextTable',false) && ($cl instanceof GTextTable) ) $this->AddTable($aPlot);
-        else {
-            if( is_array($aPlot) ) {
-                $this->plots = array_merge($this->plots,$aPlot);
-            }
-            else {
-                $this->plots[] = $aPlot;
-            }
-        }
-
-        if ($this->graph_theme) {
-            $this->graph_theme->SetupPlot($aPlot);
-        }
-    }
-
-    function AddTable($aTable) {
-        if( is_array($aTable) ) {
-            for($i=0; $i < count($aTable); ++$i ) {
-                $this->iTables[]=$aTable[$i];
-            }
-        }
-        else {
-            $this->iTables[] = $aTable ;
-        }
-    }
-
-    function AddIcon($aIcon) {
-        if( is_array($aIcon) ) {
-            for($i=0; $i < count($aIcon); ++$i ) {
-                $this->iIcons[]=$aIcon[$i];
-            }
-        }
-        else {
-            $this->iIcons[] = $aIcon ;
-        }
-    }
-
-    // Add plot to second Y-scale
-    function AddY2($aPlot) {
-        if( $aPlot == null ) {
-            JpGraphError::RaiseL(25011);//("Graph::AddY2() You tried to add a null plot to the graph.");
-        }
-
-        if( is_array($aPlot) && count($aPlot) > 0 ) {
-            $cl = $aPlot[0];
-        }
-        else {
-            $cl = $aPlot;
-        }
-
-        if( $cl instanceof Text ) {
-            $this->AddText($aPlot,true);
-        }
-        elseif( class_exists('PlotLine',false) && ($cl instanceof PlotLine) ) {
-            $this->AddLine($aPlot,true);
-        }
-        elseif( class_exists('PlotBand',false) && ($cl instanceof PlotBand) ) {
-            $this->AddBand($aPlot,true);
-        }
-        else {
-            $this->y2plots[] = $aPlot;
-        }
-
-        if ($this->graph_theme) {
-            $this->graph_theme->SetupPlot($aPlot);
-        }
-    }
-
-    // Add plot to the extra Y-axises
-    function AddY($aN,$aPlot) {
-
-        if( $aPlot == null ) {
-            JpGraphError::RaiseL(25012);//("Graph::AddYN() You tried to add a null plot to the graph.");
-        }
-
-        if( is_array($aPlot) && count($aPlot) > 0 ) {
-            $cl = $aPlot[0];
-        }
-        else {
-            $cl = $aPlot;
-        }
-
-        if( ($cl instanceof Text) ||
-            (class_exists('PlotLine',false) && ($cl instanceof PlotLine)) ||
-            (class_exists('PlotBand',false) && ($cl instanceof PlotBand)) ) {
-            JpGraph::RaiseL(25013);//('You can only add standard plots to multiple Y-axis');
-        }
-        else {
-            $this->ynplots[$aN][] = $aPlot;
-        }
-
-        if ($this->graph_theme) {
-            $this->graph_theme->SetupPlot($aPlot);
-        }
-    }
-
-    // Add text object to the graph
-    function AddText($aTxt,$aToY2=false) {
-        if( $aTxt == null ) {
-            JpGraphError::RaiseL(25014);//("Graph::AddText() You tried to add a null text to the graph.");
-        }
-        if( $aToY2 ) {
-            if( is_array($aTxt) ) {
-                for($i=0; $i < count($aTxt); ++$i ) {
-                    $this->y2texts[]=$aTxt[$i];
-                }
-            }
-            else {
-                $this->y2texts[] = $aTxt;
-            }
-        }
-        else {
-            if( is_array($aTxt) ) {
-                for($i=0; $i < count($aTxt); ++$i ) {
-                    $this->texts[]=$aTxt[$i];
-                }
-            }
-            else {
-                $this->texts[] = $aTxt;
-            }
-        }
-    }
-
-    // Add a line object (class PlotLine) to the graph
-    function AddLine($aLine,$aToY2=false) {
-        if( $aLine == null ) {
-            JpGraphError::RaiseL(25015);//("Graph::AddLine() You tried to add a null line to the graph.");
-        }
-
-        if( $aToY2 ) {
-            if( is_array($aLine) ) {
-                for($i=0; $i < count($aLine); ++$i ) {
-                    //$this->y2lines[]=$aLine[$i];
-                    $this->y2plots[]=$aLine[$i];
-                }
-            }
-            else {
-                //$this->y2lines[] = $aLine;
-                $this->y2plots[]=$aLine;
-            }
-        }
-        else {
-            if( is_array($aLine) ) {
-                for($i=0; $i<count($aLine); ++$i ) {
-                    //$this->lines[]=$aLine[$i];
-                    $this->plots[]=$aLine[$i];
-                }
-            }
-            else {
-                //$this->lines[] = $aLine;
-                $this->plots[] = $aLine;
-            }
-        }
-    }
-
-    // Add vertical or horizontal band
-    function AddBand($aBand,$aToY2=false) {
-        if( $aBand == null ) {
-            JpGraphError::RaiseL(25016);//(" Graph::AddBand() You tried to add a null band to the graph.");
-        }
-
-        if( $aToY2 ) {
-            if( is_array($aBand) ) {
-                for($i=0; $i < count($aBand); ++$i ) {
-                    $this->y2bands[] = $aBand[$i];
-                }
-            }
-            else {
-                $this->y2bands[] = $aBand;
-            }
-        }
-        else {
-            if( is_array($aBand) ) {
-                for($i=0; $i < count($aBand); ++$i ) {
-                    $this->bands[] = $aBand[$i];
-                }
-            }
-            else {
-                $this->bands[] = $aBand;
-            }
-        }
-    }
-
-    function SetPlotGradient($aFrom='navy',$aTo='silver',$aGradType=2) {
-        $this->plot_gradtype=$aGradType;
-        $this->plot_gradfrom = $aFrom;
-        $this->plot_gradto = $aTo;
-    }
-
-    function SetBackgroundGradient($aFrom='navy',$aTo='silver',$aGradType=2,$aStyle=BGRAD_FRAME) {
-        $this->bkg_gradtype=$aGradType;
-        $this->bkg_gradstyle=$aStyle;
-        $this->bkg_gradfrom = $aFrom;
-        $this->bkg_gradto = $aTo;
-    }
-
-    // Set a country flag in the background
-    function SetBackgroundCFlag($aName,$aBgType=BGIMG_FILLPLOT,$aMix=100) {
-        $this->background_cflag = $aName;
-        $this->background_cflag_type = $aBgType;
-        $this->background_cflag_mix = $aMix;
-    }
-
-    // Alias for the above method
-    function SetBackgroundCountryFlag($aName,$aBgType=BGIMG_FILLPLOT,$aMix=100) {
-        $this->background_cflag = $aName;
-        $this->background_cflag_type = $aBgType;
-        $this->background_cflag_mix = $aMix;
-    }
-
-
-    // Specify a background image
-    function SetBackgroundImage($aFileName,$aBgType=BGIMG_FILLPLOT,$aImgFormat='auto') {
-
-        // Get extension to determine image type
-        if( $aImgFormat == 'auto' ) {
-            $e = explode('.',$aFileName);
-            if( !$e ) {
-                JpGraphError::RaiseL(25018,$aFileName);//('Incorrect file name for Graph::SetBackgroundImage() : '.$aFileName.' Must have a valid image extension (jpg,gif,png) when using autodetection of image type');
-            }
-
-            $valid_formats = array('png', 'jpg', 'gif');
-            $aImgFormat = strtolower($e[count($e)-1]);
-            if ($aImgFormat == 'jpeg')  {
-                $aImgFormat = 'jpg';
-            }
-            elseif (!in_array($aImgFormat, $valid_formats) )  {
-                JpGraphError::RaiseL(25019,$aImgFormat);//('Unknown file extension ($aImgFormat) in Graph::SetBackgroundImage() for filename: '.$aFileName);
-            }
-        }
-
-        $this->background_image = $aFileName;
-        $this->background_image_type=$aBgType;
-        $this->background_image_format=$aImgFormat;
-    }
-
-    function SetBackgroundImageMix($aMix) {
-        $this->background_image_mix = $aMix ;
-    }
-
-    // Adjust background image position
-    function SetBackgroundImagePos($aXpos,$aYpos) {
-        $this->background_image_xpos = $aXpos ;
-        $this->background_image_ypos = $aYpos ;
-    }
-
-    // Specify axis style (boxed or single)
-    function SetAxisStyle($aStyle) {
-        $this->iAxisStyle = $aStyle ;
-    }
-
-    // Set a frame around the plot area
-    function SetBox($aDrawPlotFrame=true,$aPlotFrameColor=array(0,0,0),$aPlotFrameWeight=1) {
-        $this->boxed = $aDrawPlotFrame;
-        $this->box_weight = $aPlotFrameWeight;
-        $this->box_color = $aPlotFrameColor;
-    }
-
-    // Specify color for the plotarea (not the margins)
-    function SetColor($aColor) {
-        $this->plotarea_color=$aColor;
-    }
-
-    // Specify color for the margins (all areas outside the plotarea)
-    function SetMarginColor($aColor) {
-        $this->margin_color=$aColor;
-    }
-
-    // Set a frame around the entire image
-    function SetFrame($aDrawImgFrame=true,$aImgFrameColor=array(0,0,0),$aImgFrameWeight=1) {
-        $this->doframe = $aDrawImgFrame;
-        $this->frame_color = $aImgFrameColor;
-        $this->frame_weight = $aImgFrameWeight;
-    }
-
-    function SetFrameBevel($aDepth=3,$aBorder=false,$aBorderColor='black',$aColor1='white@0.4',$aColor2='darkgray@0.4',$aFlg=true) {
-        $this->framebevel = $aFlg ;
-        $this->framebeveldepth = $aDepth ;
-        $this->framebevelborder = $aBorder ;
-        $this->framebevelbordercolor = $aBorderColor ;
-        $this->framebevelcolor1 = $aColor1 ;
-        $this->framebevelcolor2 = $aColor2 ;
-
-        $this->doshadow = false ;
-    }
-
-    // Set the shadow around the whole image
-    function SetShadow($aShowShadow=true,$aShadowWidth=5,$aShadowColor='darkgray') {
-        $this->doshadow = $aShowShadow;
-        $this->shadow_color = $aShadowColor;
-        $this->shadow_width = $aShadowWidth;
-        $this->footer->iBottomMargin += $aShadowWidth;
-        $this->footer->iRightMargin += $aShadowWidth;
-    }
-
-    // Specify x,y scale. Note that if you manually specify the scale
-    // you must also specify the tick distance with a call to Ticks::Set()
-    function SetScale($aAxisType,$aYMin=1,$aYMax=1,$aXMin=1,$aXMax=1) {
-        $this->axtype = $aAxisType;
-
-        if( $aYMax < $aYMin || $aXMax < $aXMin ) {
-            JpGraphError::RaiseL(25020);//('Graph::SetScale(): Specified Max value must be larger than the specified Min value.');
-        }
-
-        $yt=substr($aAxisType,-3,3);
-        if( $yt == 'lin' ) {
-            $this->yscale = new LinearScale($aYMin,$aYMax);
-        }
-        elseif( $yt == 'int' ) {
-            $this->yscale = new LinearScale($aYMin,$aYMax);
-            $this->yscale->SetIntScale();
-        }
-        elseif( $yt == 'log' ) {
-            $this->yscale = new LogScale($aYMin,$aYMax);
-        }
-        else {
-            JpGraphError::RaiseL(25021,$aAxisType);//("Unknown scale specification for Y-scale. ($aAxisType)");
-        }
-
-        $xt=substr($aAxisType,0,3);
-        if( $xt == 'lin' || $xt == 'tex' ) {
-            $this->xscale = new LinearScale($aXMin,$aXMax,'x');
-            $this->xscale->textscale = ($xt == 'tex');
-        }
-        elseif( $xt == 'int' ) {
-            $this->xscale = new LinearScale($aXMin,$aXMax,'x');
-            $this->xscale->SetIntScale();
-        }
-        elseif( $xt == 'dat' ) {
-            $this->xscale = new DateScale($aXMin,$aXMax,'x');
-        }
-        elseif( $xt == 'log' ) {
-            $this->xscale = new LogScale($aXMin,$aXMax,'x');
-        }
-        else {
-            JpGraphError::RaiseL(25022,$aAxisType);//(" Unknown scale specification for X-scale. ($aAxisType)");
-        }
-
-        $this->xaxis = new Axis($this->img,$this->xscale);
-        $this->yaxis = new Axis($this->img,$this->yscale);
-        $this->xgrid = new Grid($this->xaxis);
-        $this->ygrid = new Grid($this->yaxis);
-        $this->ygrid->Show();
-
-
-        if (!$this->isRunningClear) {
-            $this->inputValues['aAxisType'] = $aAxisType;
-            $this->inputValues['aYMin'] = $aYMin;
-            $this->inputValues['aYMax'] = $aYMax;
-            $this->inputValues['aXMin'] = $aXMin;
-            $this->inputValues['aXMax'] = $aXMax;
-
-            if ($this->graph_theme) {
-                $this->graph_theme->ApplyGraph($this);
-            }
-        }
-
-        $this->isAfterSetScale = true;
-    }
-
-    // Specify secondary Y scale
-    function SetY2Scale($aAxisType='lin',$aY2Min=1,$aY2Max=1) {
-        if( $aAxisType == 'lin' ) {
-            $this->y2scale = new LinearScale($aY2Min,$aY2Max);
-        }
-        elseif( $aAxisType == 'int' ) {
-            $this->y2scale = new LinearScale($aY2Min,$aY2Max);
-            $this->y2scale->SetIntScale();
-        }
-        elseif( $aAxisType == 'log' ) {
-            $this->y2scale = new LogScale($aY2Min,$aY2Max);
-        }
-        else {
-            JpGraphError::RaiseL(25023,$aAxisType);//("JpGraph: Unsupported Y2 axis type: $aAxisType\nMust be one of (lin,log,int)");
-        }
-
-        $this->y2axis = new Axis($this->img,$this->y2scale);
-        $this->y2axis->scale->ticks->SetDirection(SIDE_LEFT);
-        $this->y2axis->SetLabelSide(SIDE_RIGHT);
-        $this->y2axis->SetPos('max');
-        $this->y2axis->SetTitleSide(SIDE_RIGHT);
-
-        // Deafult position is the max x-value
-        $this->y2grid = new Grid($this->y2axis);
-
-        if ($this->graph_theme) {
-          $this->graph_theme->ApplyGraph($this);
-        }
-    }
-
-    // Set the delta position (in pixels) between the multiple Y-axis
-    function SetYDeltaDist($aDist) {
-        $this->iYAxisDeltaPos = $aDist;
-    }
-
-    // Specify secondary Y scale
-    function SetYScale($aN,$aAxisType="lin",$aYMin=1,$aYMax=1) {
-
-        if( $aAxisType == 'lin' ) {
-            $this->ynscale[$aN] = new LinearScale($aYMin,$aYMax);
-        }
-        elseif( $aAxisType == 'int' ) {
-            $this->ynscale[$aN] = new LinearScale($aYMin,$aYMax);
-            $this->ynscale[$aN]->SetIntScale();
-        }
-        elseif( $aAxisType == 'log' ) {
-            $this->ynscale[$aN] = new LogScale($aYMin,$aYMax);
-        }
-        else {
-            JpGraphError::RaiseL(25024,$aAxisType);//("JpGraph: Unsupported Y axis type: $aAxisType\nMust be one of (lin,log,int)");
-        }
-
-        $this->ynaxis[$aN] = new Axis($this->img,$this->ynscale[$aN]);
-        $this->ynaxis[$aN]->scale->ticks->SetDirection(SIDE_LEFT);
-        $this->ynaxis[$aN]->SetLabelSide(SIDE_RIGHT);
-
-        if ($this->graph_theme) {
-            $this->graph_theme->ApplyGraph($this);
-        }
-    }
-
-    // Specify density of ticks when autoscaling 'normal', 'dense', 'sparse', 'verysparse'
-    // The dividing factor have been determined heuristically according to my aesthetic
-    // sense (or lack off) y.m.m.v !
-    function SetTickDensity($aYDensity=TICKD_NORMAL,$aXDensity=TICKD_NORMAL) {
-        $this->xtick_factor=30;
-        $this->ytick_factor=25;
-        switch( $aYDensity ) {
-            case TICKD_DENSE:
-                $this->ytick_factor=12;
-                break;
-            case TICKD_NORMAL:
-                $this->ytick_factor=25;
-                break;
-            case TICKD_SPARSE:
-                $this->ytick_factor=40;
-                break;
-            case TICKD_VERYSPARSE:
-                $this->ytick_factor=100;
-                break;
-            default:
-                JpGraphError::RaiseL(25025,$densy);//("JpGraph: Unsupported Tick density: $densy");
-        }
-        switch( $aXDensity ) {
-            case TICKD_DENSE:
-                $this->xtick_factor=15;
-                break;
-            case TICKD_NORMAL:
-                $this->xtick_factor=30;
-                break;
-            case TICKD_SPARSE:
-                $this->xtick_factor=45;
-                break;
-            case TICKD_VERYSPARSE:
-                $this->xtick_factor=60;
-                break;
-            default:
-                JpGraphError::RaiseL(25025,$densx);//("JpGraph: Unsupported Tick density: $densx");
-        }
-    }
-
-
-    // Get a string of all image map areas
-    function GetCSIMareas() {
-        if( !$this->iHasStroked ) {
-            $this->Stroke(_CSIM_SPECIALFILE);
-        }
-
-        $csim = $this->title->GetCSIMAreas();
-        $csim .= $this->subtitle->GetCSIMAreas();
-        $csim .= $this->subsubtitle->GetCSIMAreas();
-        $csim .= $this->legend->GetCSIMAreas();
-
-        if( $this->y2axis != NULL ) {
-            $csim .= $this->y2axis->title->GetCSIMAreas();
-        }
-
-        if( $this->texts != null ) {
-            $n = count($this->texts);
-            for($i=0; $i < $n; ++$i ) {
-                $csim .= $this->texts[$i]->GetCSIMAreas();
-            }
-        }
-
-        if( $this->y2texts != null && $this->y2scale != null ) {
-            $n = count($this->y2texts);
-            for($i=0; $i < $n; ++$i ) {
-                $csim .= $this->y2texts[$i]->GetCSIMAreas();
-            }
-        }
-
-        if( $this->yaxis != null && $this->xaxis != null ) {
-            $csim .= $this->yaxis->title->GetCSIMAreas();
-            $csim .= $this->xaxis->title->GetCSIMAreas();
-        }
-
-        $n = count($this->plots);
-        for( $i=0; $i < $n; ++$i ) {
-            $csim .= $this->plots[$i]->GetCSIMareas();
-        }
-
-        $n = count($this->y2plots);
-        for( $i=0; $i < $n; ++$i ) {
-            $csim .= $this->y2plots[$i]->GetCSIMareas();
-        }
-
-        $n = count($this->ynaxis);
-        for( $i=0; $i < $n; ++$i ) {
-            $m = count($this->ynplots[$i]);
-            for($j=0; $j < $m; ++$j ) {
-                $csim .= $this->ynplots[$i][$j]->GetCSIMareas();
-            }
-        }
-
-        $n = count($this->iTables);
-        for( $i=0; $i < $n; ++$i ) {
-            $csim .= $this->iTables[$i]->GetCSIMareas();
-        }
-
-        return $csim;
-    }
-
-    // Get a complete <MAP>..</MAP> tag for the final image map
-    function GetHTMLImageMap($aMapName) {
-        $im = "<map name=\"$aMapName\" id=\"$aMapName\" >\n";
-        $im .= $this->GetCSIMareas();
-        $im .= "</map>";
-        return $im;
-    }
-
-    function CheckCSIMCache($aCacheName,$aTimeOut=60) {
-        global $_SERVER;
-
-        if( $aCacheName=='auto' ) {
-            $aCacheName=basename($_SERVER['PHP_SELF']);
-        }
-
-        $urlarg = $this->GetURLArguments();
-        $this->csimcachename = CSIMCACHE_DIR.$aCacheName.$urlarg;
-        $this->csimcachetimeout = $aTimeOut;
-
-        // First determine if we need to check for a cached version
-        // This differs from the standard cache in the sense that the
-        // image and CSIM map HTML file is written relative to the directory
-        // the script executes in and not the specified cache directory.
-        // The reason for this is that the cache directory is not necessarily
-        // accessible from the HTTP server.
-        if( $this->csimcachename != '' ) {
-            $dir = dirname($this->csimcachename);
-            $base = basename($this->csimcachename);
-            $base = strtok($base,'.');
-            $suffix = strtok('.');
-            $basecsim = $dir.'/'.$base.'?'.$urlarg.'_csim_.html';
-            $baseimg = $dir.'/'.$base.'?'.$urlarg.'.'.$this->img->img_format;
-
-            $timedout=false;
-            // Does it exist at all ?
-
-            if( file_exists($basecsim) && file_exists($baseimg) ) {
-                // Check that it hasn't timed out
-                $diff=time()-filemtime($basecsim);
-                if( $this->csimcachetimeout>0 && ($diff > $this->csimcachetimeout*60) ) {
-                    $timedout=true;
-                    @unlink($basecsim);
-                    @unlink($baseimg);
-                }
-                else {
-                    if ($fh = @fopen($basecsim, "r")) {
-                        fpassthru($fh);
-                        return true;
-                    }
-                    else {
-                        JpGraphError::RaiseL(25027,$basecsim);//(" Can't open cached CSIM \"$basecsim\" for reading.");
-                    }
-                }
-            }
-        }
-        return false;
-    }
-
-    // Build the argument string to be used with the csim images
-    static function GetURLArguments($aAddRecursiveBlocker=false) {
-
-        if( $aAddRecursiveBlocker ) {
-            // This is a JPGRAPH internal defined that prevents
-            // us from recursively coming here again
-            $urlarg = _CSIM_DISPLAY.'=1';
-        }
-
-        // Now reconstruct any user URL argument
-        reset($_GET);
-        while( list($key,$value) = each($_GET) ) {
-            if( is_array($value) ) {
-                foreach ( $value as $k => $v ) {
-                    $urlarg .= '&amp;'.$key.'%5B'.$k.'%5D='.urlencode($v);
-                }
-            }
-            else {
-                $urlarg .= '&amp;'.$key.'='.urlencode($value);
-            }
-        }
-
-        // It's not ideal to convert POST argument to GET arguments
-        // but there is little else we can do. One idea for the
-        // future might be recreate the POST header in case.
-        reset($_POST);
-        while( list($key,$value) = each($_POST) ) {
-            if( is_array($value) ) {
-                foreach ( $value as $k => $v ) {
-                    $urlarg .= '&amp;'.$key.'%5B'.$k.'%5D='.urlencode($v);
-                }
-            }
-            else {
-                $urlarg .= '&amp;'.$key.'='.urlencode($value);
-            }
-        }
-
-        return $urlarg;
-    }
-
-    function SetCSIMImgAlt($aAlt) {
-        $this->iCSIMImgAlt = $aAlt;
-    }
-
-    function StrokeCSIM($aScriptName='auto',$aCSIMName='',$aBorder=0) {
-        if( $aCSIMName=='' ) {
-            // create a random map name
-            srand ((double) microtime() * 1000000);
-            $r = rand(0,100000);
-            $aCSIMName='__mapname'.$r.'__';
-        }
-
-        if( $aScriptName=='auto' ) {
-            $aScriptName=basename($_SERVER['PHP_SELF']);
-        }
-
-        $urlarg = $this->GetURLArguments(true);
-
-        if( empty($_GET[_CSIM_DISPLAY]) ) {
-            // First determine if we need to check for a cached version
-            // This differs from the standard cache in the sense that the
-            // image and CSIM map HTML file is written relative to the directory
-            // the script executes in and not the specified cache directory.
-            // The reason for this is that the cache directory is not necessarily
-            // accessible from the HTTP server.
-            if( $this->csimcachename != '' ) {
-                $dir = dirname($this->csimcachename);
-                $base = basename($this->csimcachename);
-                $base = strtok($base,'.');
-                $suffix = strtok('.');
-                $basecsim = $dir.'/'.$base.'?'.$urlarg.'_csim_.html';
-                $baseimg = $base.'?'.$urlarg.'.'.$this->img->img_format;
-
-                // Check that apache can write to directory specified
-
-                if( file_exists($dir) && !is_writeable($dir) ) {
-                    JpgraphError::RaiseL(25028,$dir);//('Apache/PHP does not have permission to write to the CSIM cache directory ('.$dir.'). Check permissions.');
-                }
-
-                // Make sure directory exists
-                $this->cache->MakeDirs($dir);
-
-                // Write the image file
-                $this->Stroke(CSIMCACHE_DIR.$baseimg);
-
-                // Construct wrapper HTML and write to file and send it back to browser
-
-                // In the src URL we must replace the '?' with its encoding to prevent the arguments
-                // to be converted to real arguments.
-                $tmp = str_replace('?','%3f',$baseimg);
-                $htmlwrap = $this->GetHTMLImageMap($aCSIMName)."\n".
-                            '<img src="'.CSIMCACHE_HTTP_DIR.$tmp.'" ismap="ismap" usemap="#'.$aCSIMName.' width="'.$this->img->width.'" height="'.$this->img->height."\" alt=\"".$this->iCSIMImgAlt."\" />\n";
-
-                if($fh =  @fopen($basecsim,'w') ) {
-                    fwrite($fh,$htmlwrap);
-                    fclose($fh);
-                    echo $htmlwrap;
-                }
-                else {
-                    JpGraphError::RaiseL(25029,$basecsim);//(" Can't write CSIM \"$basecsim\" for writing. Check free space and permissions.");
-                }
-            }
-            else {
-
-                if( $aScriptName=='' ) {
-                    JpGraphError::RaiseL(25030);//('Missing script name in call to StrokeCSIM(). You must specify the name of the actual image script as the first parameter to StrokeCSIM().');
-                }
-                echo $this->GetHTMLImageMap($aCSIMName) . $this->GetCSIMImgHTML($aCSIMName, $aScriptName, $aBorder);
-            }
-        }
-        else {
-            $this->Stroke();
-        }
-    }
-
-    function StrokeCSIMImage() {
-        if( @$_GET[_CSIM_DISPLAY] == 1 ) {
-            $this->Stroke();
-        }
-    }
-
-    function GetCSIMImgHTML($aCSIMName, $aScriptName='auto', $aBorder=0 ) {
-        if( $aScriptName=='auto' ) {
-            $aScriptName=basename($_SERVER['PHP_SELF']);
-        }
-        $urlarg = $this->GetURLArguments(true);
-        return "<img src=\"".$aScriptName.'?'.$urlarg."\" ismap=\"ismap\" usemap=\"#".$aCSIMName.'" height="'.$this->img->height."\" alt=\"".$this->iCSIMImgAlt."\" />\n";
-    }
-
-    function GetTextsYMinMax($aY2=false) {
-        if( $aY2 ) {
-            $txts = $this->y2texts;
-        }
-        else {
-            $txts = $this->texts;
-        }
-        $n = count($txts);
-        $min=null;
-        $max=null;
-        for( $i=0; $i < $n; ++$i ) {
-            if( $txts[$i]->iScalePosY !== null && $txts[$i]->iScalePosX !== null  ) {
-                if( $min === null  ) {
-                    $min = $max = $txts[$i]->iScalePosY ;
-                }
-                else {
-                    $min = min($min,$txts[$i]->iScalePosY);
-                    $max = max($max,$txts[$i]->iScalePosY);
-                }
-            }
-        }
-        if( $min !== null ) {
-            return array($min,$max);
-        }
-        else {
-            return null;
-        }
-    }
-
-    function GetTextsXMinMax($aY2=false) {
-        if( $aY2 ) {
-            $txts = $this->y2texts;
-        }
-        else {
-            $txts = $this->texts;
-        }
-        $n = count($txts);
-        $min=null;
-        $max=null;
-        for( $i=0; $i < $n; ++$i ) {
-            if( $txts[$i]->iScalePosY !== null && $txts[$i]->iScalePosX !== null  ) {
-                if( $min === null  ) {
-                    $min = $max = $txts[$i]->iScalePosX ;
-                }
-                else {
-                    $min = min($min,$txts[$i]->iScalePosX);
-                    $max = max($max,$txts[$i]->iScalePosX);
-                }
-            }
-        }
-        if( $min !== null ) {
-            return array($min,$max);
-        }
-        else {
-            return null;
-        }
-    }
-
-    function GetXMinMax() {
-
-        list($min,$ymin) = $this->plots[0]->Min();
-        list($max,$ymax) = $this->plots[0]->Max();
-
-        $i=0;
-        // Some plots, e.g. PlotLine should not affect the scale
-        // and will return (null,null). We should ignore those
-        // values.
-        while( ($min===null || $max === null) && ($i < count($this->plots)-1) ) {
-            ++$i;
-            list($min,$ymin) = $this->plots[$i]->Min();
-            list($max,$ymax) = $this->plots[$i]->Max();
-        }
-
-        foreach( $this->plots as $p ) {
-            list($xmin,$ymin) = $p->Min();
-            list($xmax,$ymax) = $p->Max();
-
-            if( $xmin !== null && $xmax !== null ) {
-                $min = Min($xmin,$min);
-                $max = Max($xmax,$max);
-            }
-        }
-
-        if( $this->y2axis != null ) {
-            foreach( $this->y2plots as $p ) {
-                list($xmin,$ymin) = $p->Min();
-                list($xmax,$ymax) = $p->Max();
-                $min = Min($xmin,$min);
-                $max = Max($xmax,$max);
-            }
-        }
-
-        $n = count($this->ynaxis);
-        for( $i=0; $i < $n; ++$i ) {
-            if( $this->ynaxis[$i] != null) {
-                foreach( $this->ynplots[$i] as $p ) {
-                    list($xmin,$ymin) = $p->Min();
-                    list($xmax,$ymax) = $p->Max();
-                    $min = Min($xmin,$min);
-                    $max = Max($xmax,$max);
-                }
-            }
-        }
-        return array($min,$max);
-    }
-
-    function AdjustMarginsForTitles() {
-        $totrequired = 
-            ($this->title->t != '' 
-                ? $this->title->GetTextHeight($this->img) + $this->title->margin + 5 * SUPERSAMPLING_SCALE
-                : 0 ) +
-            ($this->subtitle->t != '' 
-                ? $this->subtitle->GetTextHeight($this->img) + $this->subtitle->margin + 5 * SUPERSAMPLING_SCALE
-                : 0 ) +
-            ($this->subsubtitle->t != '' 
-                ? $this->subsubtitle->GetTextHeight($this->img) + $this->subsubtitle->margin + 5 * SUPERSAMPLING_SCALE
-                : 0 ) ;
-
-        $btotrequired = 0;
-        if($this->xaxis != null &&  !$this->xaxis->hide && !$this->xaxis->hide_labels ) {
-            // Minimum bottom margin
-            if( $this->xaxis->title->t != '' ) {
-                if( $this->img->a == 90 ) {
-                    $btotrequired = $this->yaxis->title->GetTextHeight($this->img) + 7 ;
-                }
-                else {
-                    $btotrequired = $this->xaxis->title->GetTextHeight($this->img) + 7 ;
-                }
-            }
-            else {
-                $btotrequired = 0;
-            }
-
-            if( $this->img->a == 90 ) {
-                $this->img->SetFont($this->yaxis->font_family,$this->yaxis->font_style,
-                $this->yaxis->font_size);
-                $lh = $this->img->GetTextHeight('Mg',$this->yaxis->label_angle);
-            }
-            else {
-                $this->img->SetFont($this->xaxis->font_family,$this->xaxis->font_style,
-                $this->xaxis->font_size);
-                $lh = $this->img->GetTextHeight('Mg',$this->xaxis->label_angle);
-            }
-
-            $btotrequired += $lh + 6;
-        }
-
-        if( $this->img->a == 90 ) {
-            // DO Nothing. It gets too messy to do this properly for 90 deg...
-        }
-        else{
-            // need more top margin
-            if( $this->img->top_margin < $totrequired ) {
-                $this->SetMargin(
-                    $this->img->raw_left_margin,
-                    $this->img->raw_right_margin,
-                    $totrequired / SUPERSAMPLING_SCALE, 
-                    $this->img->raw_bottom_margin
-                );
-            }
-
-            // need more bottom margin
-            if( $this->img->bottom_margin < $btotrequired ) {
-                $this->SetMargin(
-                    $this->img->raw_left_margin,
-                    $this->img->raw_right_margin,
-                    $this->img->raw_top_margin,
-                    $btotrequired / SUPERSAMPLING_SCALE
-                );
-            }
-        }
-    }
-
-    function StrokeStore($aStrokeFileName) {
-        // Get the handler to prevent the library from sending the
-        // image to the browser
-        $ih = $this->Stroke(_IMG_HANDLER);
-
-        // Stroke it to a file
-        $this->img->Stream($aStrokeFileName);
-
-        // Send it back to browser
-        $this->img->Headers();
-        $this->img->Stream();
-    }
-
-    function doAutoscaleXAxis() {
-    //Check if we should autoscale x-axis
-        if( !$this->xscale->IsSpecified() ) {
-            if( substr($this->axtype,0,4) == "text" ) {
-                $max=0;
-                $n = count($this->plots);
-                for($i=0; $i < $n; ++$i ) {
-                    $p = $this->plots[$i];
-                    // We need some unfortunate sub class knowledge here in order
-                    // to increase number of data points in case it is a line plot
-                    // which has the barcenter set. If not it could mean that the
-                    // last point of the data is outside the scale since the barcenter
-                    // settings means that we will shift the entire plot half a tick step
-                    // to the right in oder to align with the center of the bars.
-                    if( class_exists('BarPlot',false) ) {
-                        $cl = strtolower(get_class($p));
-                        if( (class_exists('BarPlot',false) && ($p instanceof BarPlot)) || empty($p->barcenter) ) {
-                            $max=max($max,$p->numpoints-1);
-                        }
-                        else {
-                            $max=max($max,$p->numpoints);
-                        }
-                    }
-                    else {
-                        if( empty($p->barcenter) ) {
-                            $max=max($max,$p->numpoints-1);
-                        }
-                        else {
-                            $max=max($max,$p->numpoints);
-                        }
-                    }
-                }
-                $min=0;
-                if( $this->y2axis != null ) {
-                    foreach( $this->y2plots as $p ) {
-                        $max=max($max,$p->numpoints-1);
-                    }
-                }
-                $n = count($this->ynaxis);
-                for( $i=0; $i < $n; ++$i ) {
-                    if( $this->ynaxis[$i] != null) {
-                        foreach( $this->ynplots[$i] as $p ) {
-                            $max=max($max,$p->numpoints-1);
-                        }
-                    }
-                }
-
-                $this->xscale->Update($this->img,$min,$max);
-                $this->xscale->ticks->Set($this->xaxis->tick_step,1);
-                $this->xscale->ticks->SupressMinorTickMarks();
-            }
-            else {
-                list($min,$max) = $this->GetXMinMax();
-
-                $lres = $this->GetLinesXMinMax($this->lines);
-                if( $lres ) {
-                    list($linmin,$linmax) = $lres ;
-                    $min = min($min,$linmin);
-                    $max = max($max,$linmax);
-                }
-
-                $lres = $this->GetLinesXMinMax($this->y2lines);
-                if( $lres ) {
-                    list($linmin,$linmax) = $lres ;
-                    $min = min($min,$linmin);
-                    $max = max($max,$linmax);
-                }
-
-                $tres = $this->GetTextsXMinMax();
-                if( $tres ) {
-                    list($tmin,$tmax) = $tres ;
-                    $min = min($min,$tmin);
-                    $max = max($max,$tmax);
-                }
-
-                $tres = $this->GetTextsXMinMax(true);
-                if( $tres ) {
-                    list($tmin,$tmax) = $tres ;
-                    $min = min($min,$tmin);
-                    $max = max($max,$tmax);
-                }
-
-                $this->xscale->AutoScale($this->img,$min,$max,round($this->img->plotwidth/$this->xtick_factor));
-            }
-
-            //Adjust position of y-axis and y2-axis to minimum/maximum of x-scale
-            if( !is_numeric($this->yaxis->pos) && !is_string($this->yaxis->pos) ) {
-                $this->yaxis->SetPos($this->xscale->GetMinVal());
-            }
-        }
-        elseif( $this->xscale->IsSpecified() &&
-                ( $this->xscale->auto_ticks || !$this->xscale->ticks->IsSpecified()) ) {
-            // The tick calculation will use the user suplied min/max values to determine
-            // the ticks. If auto_ticks is false the exact user specifed min and max
-            // values will be used for the scale.
-            // If auto_ticks is true then the scale might be slightly adjusted
-            // so that the min and max values falls on an even major step.
-            $min = $this->xscale->scale[0];
-            $max = $this->xscale->scale[1];
-            $this->xscale->AutoScale($this->img,$min,$max,round($this->img->plotwidth/$this->xtick_factor),false);
-
-            // Now make sure we show enough precision to accurate display the
-            // labels. If this is not done then the user might end up with
-            // a scale that might actually start with, say 13.5, butdue to rounding
-            // the scale label will ony show 14.
-            if( abs(floor($min)-$min) > 0 ) {
-
-                // If the user has set a format then we bail out
-                if( $this->xscale->ticks->label_formatstr == '' && $this->xscale->ticks->label_dateformatstr == '' ) {
-                    $this->xscale->ticks->precision = abs( floor(log10( abs(floor($min)-$min))) )+1;
-                }
-            }
-        }
-
-        // Position the optional Y2 and Yn axis to the rightmost position of the x-axis
-        if( $this->y2axis != null ) {
-            if( !is_numeric($this->y2axis->pos) && !is_string($this->y2axis->pos) ) {
-                $this->y2axis->SetPos($this->xscale->GetMaxVal());
-            }
-            $this->y2axis->SetTitleSide(SIDE_RIGHT);
-        }
-
-        $n = count($this->ynaxis);
-        $nY2adj = $this->y2axis != null ? $this->iYAxisDeltaPos : 0;
-        for( $i=0; $i < $n; ++$i ) {
-            if( $this->ynaxis[$i] != null ) {
-                if( !is_numeric($this->ynaxis[$i]->pos) && !is_string($this->ynaxis[$i]->pos) ) {
-                    $this->ynaxis[$i]->SetPos($this->xscale->GetMaxVal());
-                    $this->ynaxis[$i]->SetPosAbsDelta($i*$this->iYAxisDeltaPos + $nY2adj);
-                }
-                $this->ynaxis[$i]->SetTitleSide(SIDE_RIGHT);
-            }
-        }
-    }
-
-
-    function doAutoScaleYnAxis() {
-
-        if( $this->y2scale != null) {
-            if( !$this->y2scale->IsSpecified() && count($this->y2plots)>0 ) {
-                list($min,$max) = $this->GetPlotsYMinMax($this->y2plots);
-
-                $lres = $this->GetLinesYMinMax($this->y2lines);
-                if( is_array($lres) ) {
-                    list($linmin,$linmax) = $lres ;
-                    $min = min($min,$linmin);
-                    $max = max($max,$linmax);
-                }
-                $tres = $this->GetTextsYMinMax(true);
-                if( is_array($tres) ) {
-                    list($tmin,$tmax) = $tres ;
-                    $min = min($min,$tmin);
-                    $max = max($max,$tmax);
-                }
-                $this->y2scale->AutoScale($this->img,$min,$max,$this->img->plotheight/$this->ytick_factor);
-            }
-            elseif( $this->y2scale->IsSpecified() && ( $this->y2scale->auto_ticks || !$this->y2scale->ticks->IsSpecified()) ) {
-                // The tick calculation will use the user suplied min/max values to determine
-                // the ticks. If auto_ticks is false the exact user specifed min and max
-                // values will be used for the scale.
-                // If auto_ticks is true then the scale might be slightly adjusted
-                // so that the min and max values falls on an even major step.
-                $min = $this->y2scale->scale[0];
-                $max = $this->y2scale->scale[1];
-                $this->y2scale->AutoScale($this->img,$min,$max,
-                $this->img->plotheight/$this->ytick_factor,
-                $this->y2scale->auto_ticks);
-
-                // Now make sure we show enough precision to accurate display the
-                // labels. If this is not done then the user might end up with
-                // a scale that might actually start with, say 13.5, butdue to rounding
-                // the scale label will ony show 14.
-                if( abs(floor($min)-$min) > 0 ) {
-                    // If the user has set a format then we bail out
-                    if( $this->y2scale->ticks->label_formatstr == '' && $this->y2scale->ticks->label_dateformatstr == '' ) {
-                        $this->y2scale->ticks->precision = abs( floor(log10( abs(floor($min)-$min))) )+1;
-                    }
-                }
-
-            }
-        }
-
-
-        //
-        // Autoscale the extra Y-axises
-        //
-        $n = count($this->ynaxis);
-        for( $i=0; $i < $n; ++$i ) {
-            if( $this->ynscale[$i] != null) {
-                if( !$this->ynscale[$i]->IsSpecified() && count($this->ynplots[$i])>0 ) {
-                    list($min,$max) = $this->GetPlotsYMinMax($this->ynplots[$i]);
-                    $this->ynscale[$i]->AutoScale($this->img,$min,$max,$this->img->plotheight/$this->ytick_factor);
-                }
-                elseif( $this->ynscale[$i]->IsSpecified() && ( $this->ynscale[$i]->auto_ticks || !$this->ynscale[$i]->ticks->IsSpecified()) ) {
-                    // The tick calculation will use the user suplied min/max values to determine
-                    // the ticks. If auto_ticks is false the exact user specifed min and max
-                    // values will be used for the scale.
-                    // If auto_ticks is true then the scale might be slightly adjusted
-                    // so that the min and max values falls on an even major step.
-                    $min = $this->ynscale[$i]->scale[0];
-                    $max = $this->ynscale[$i]->scale[1];
-                    $this->ynscale[$i]->AutoScale($this->img,$min,$max,
-                    $this->img->plotheight/$this->ytick_factor,
-                    $this->ynscale[$i]->auto_ticks);
-
-                    // Now make sure we show enough precision to accurate display the
-                    // labels. If this is not done then the user might end up with
-                    // a scale that might actually start with, say 13.5, butdue to rounding
-                    // the scale label will ony show 14.
-                    if( abs(floor($min)-$min) > 0 ) {
-                        // If the user has set a format then we bail out
-                        if( $this->ynscale[$i]->ticks->label_formatstr == '' && $this->ynscale[$i]->ticks->label_dateformatstr == '' ) {
-                            $this->ynscale[$i]->ticks->precision = abs( floor(log10( abs(floor($min)-$min))) )+1;
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    function doAutoScaleYAxis() {
-
-        //Check if we should autoscale y-axis
-        if( !$this->yscale->IsSpecified() && count($this->plots)>0 ) {
-            list($min,$max) = $this->GetPlotsYMinMax($this->plots);
-            $lres = $this->GetLinesYMinMax($this->lines);
-            if( is_array($lres) ) {
-                list($linmin,$linmax) = $lres ;
-                $min = min($min,$linmin);
-                $max = max($max,$linmax);
-            }
-            $tres = $this->GetTextsYMinMax();
-            if( is_array($tres) ) {
-                list($tmin,$tmax) = $tres ;
-                $min = min($min,$tmin);
-                $max = max($max,$tmax);
-            }
-            $this->yscale->AutoScale($this->img,$min,$max,
-            $this->img->plotheight/$this->ytick_factor);
-        }
-        elseif( $this->yscale->IsSpecified() && ( $this->yscale->auto_ticks || !$this->yscale->ticks->IsSpecified()) ) {
-            // The tick calculation will use the user suplied min/max values to determine
-            // the ticks. If auto_ticks is false the exact user specifed min and max
-            // values will be used for the scale.
-            // If auto_ticks is true then the scale might be slightly adjusted
-            // so that the min and max values falls on an even major step.
-            $min = $this->yscale->scale[0];
-            $max = $this->yscale->scale[1];
-            $this->yscale->AutoScale($this->img,$min,$max,
-            $this->img->plotheight/$this->ytick_factor,
-            $this->yscale->auto_ticks);
-
-            // Now make sure we show enough precision to accurate display the
-            // labels. If this is not done then the user might end up with
-            // a scale that might actually start with, say 13.5, butdue to rounding
-            // the scale label will ony show 14.
-            if( abs(floor($min)-$min) > 0 ) {
-
-                // If the user has set a format then we bail out
-                if( $this->yscale->ticks->label_formatstr == '' && $this->yscale->ticks->label_dateformatstr == '' ) {
-                    $this->yscale->ticks->precision = abs( floor(log10( abs(floor($min)-$min))) )+1;
-                }
-            }
-        }
-
-    }
-
-    function InitScaleConstants() {
-        // Setup scale constants
-        if( $this->yscale ) $this->yscale->InitConstants($this->img);
-        if( $this->xscale ) $this->xscale->InitConstants($this->img);
-        if( $this->y2scale ) $this->y2scale->InitConstants($this->img);
-
-        $n=count($this->ynscale);
-        for($i=0; $i < $n; ++$i) {
-            if( $this->ynscale[$i] ) {
-                $this->ynscale[$i]->InitConstants($this->img);
-            }
-        }
-    }
-
-    function doPrestrokeAdjustments() {
-
-        // Do any pre-stroke adjustment that is needed by the different plot types
-        // (i.e bar plots want's to add an offset to the x-labels etc)
-        for($i=0; $i < count($this->plots) ; ++$i ) {
-            $this->plots[$i]->PreStrokeAdjust($this);
-            $this->plots[$i]->DoLegend($this);
-        }
-
-        // Any plots on the second Y scale?
-        if( $this->y2scale != null ) {
-            for($i=0; $i<count($this->y2plots) ; ++$i ) {
-                $this->y2plots[$i]->PreStrokeAdjust($this);
-                $this->y2plots[$i]->DoLegend($this);
-            }
-        }
-
-        // Any plots on the extra Y axises?
-        $n = count($this->ynaxis);
-        for($i=0; $i<$n ; ++$i ) {
-            if( $this->ynplots == null || $this->ynplots[$i] == null) {
-                JpGraphError::RaiseL(25032,$i);//("No plots for Y-axis nbr:$i");
-            }
-            $m = count($this->ynplots[$i]);
-            for($j=0; $j < $m; ++$j ) {
-                $this->ynplots[$i][$j]->PreStrokeAdjust($this);
-                $this->ynplots[$i][$j]->DoLegend($this);
-            }
-        }
-    }
-
-    function StrokeBands($aDepth,$aCSIM) {
-    // Stroke bands
-        if( $this->bands != null && !$aCSIM) {
-            for($i=0; $i < count($this->bands); ++$i) {
-            // Stroke all bands that asks to be in the background
-                if( $this->bands[$i]->depth == $aDepth ) {
-                    $this->bands[$i]->Stroke($this->img,$this->xscale,$this->yscale);
-                }
-            }
-        }
-
-        if( $this->y2bands != null && $this->y2scale != null && !$aCSIM ) {
-            for($i=0; $i < count($this->y2bands); ++$i) {
-            // Stroke all bands that asks to be in the foreground
-                if( $this->y2bands[$i]->depth == $aDepth ) {
-                    $this->y2bands[$i]->Stroke($this->img,$this->xscale,$this->y2scale);
-                }
-            }
-        }
-    }
-
-
-    // Stroke the graph
-    // $aStrokeFileName If != "" the image will be written to this file and NOT
-    // streamed back to the browser
-    function Stroke($aStrokeFileName='') {
-        // Fist make a sanity check that user has specified a scale
-        if( empty($this->yscale) ) {
-            JpGraphError::RaiseL(25031);//('You must specify what scale to use with a call to Graph::SetScale().');
-        }
-
-        // Start by adjusting the margin so that potential titles will fit.
-        $this->AdjustMarginsForTitles();
-
-        // Give the plot a chance to do any scale adjuments the individual plots
-        // wants to do. Right now this is only used by the contour plot to set scale
-        // limits
-        for($i=0; $i < count($this->plots) ; ++$i ) {
-            $this->plots[$i]->PreScaleSetup($this);
-        }
-
-        // Init scale constants that are used to calculate the transformation from
-        // world to pixel coordinates
-        $this->InitScaleConstants();
-
-        // If the filename is the predefined value = '_csim_special_'
-        // we assume that the call to stroke only needs to do enough
-        // to correctly generate the CSIM maps.
-        // We use this variable to skip things we don't strictly need
-        // to do to generate the image map to improve performance
-        // a best we can. Therefor you will see a lot of tests !$_csim in the
-        // code below.
-        $_csim = ($aStrokeFileName===_CSIM_SPECIALFILE);
-
-        // If we are called the second time (perhaps the user has called GetHTMLImageMap()
-        // himself then the legends have alsready been populated once in order to get the
-        // CSIM coordinats. Since we do not want the legends to be populated a second time
-        // we clear the legends
-        $this->legend->Clear();
-
-        // We need to know if we have stroked the plot in the
-        // GetCSIMareas. Otherwise the CSIM hasn't been generated
-        // and in the case of GetCSIM called before stroke to generate
-        // CSIM without storing an image to disk GetCSIM must call Stroke.
-        $this->iHasStroked = true;
-
-        // Setup pre-stroked adjustments and Legends
-        $this->doPrestrokeAdjustments();
-
-        if ($this->graph_theme) {
-            $this->graph_theme->PreStrokeApply($this);
-        }
-
-        // Bail out if any of the Y-axis not been specified and
-        // has no plots. (This means it is impossible to do autoscaling and
-        // no other scale was given so we can't possible draw anything). If you use manual
-        // scaling you also have to supply the tick steps as well.
-        if( (!$this->yscale->IsSpecified() && count($this->plots)==0) ||
-            ($this->y2scale!=null && !$this->y2scale->IsSpecified() && count($this->y2plots)==0) ) {
-            //$e = "n=".count($this->y2plots)."\n";
-            // $e = "Can't draw unspecified Y-scale.<br>\nYou have either:<br>\n";
-            // $e .= "1. Specified an Y axis for autoscaling but have not supplied any plots<br>\n";
-            // $e .= "2. Specified a scale manually but have forgot to specify the tick steps";
-            JpGraphError::RaiseL(25026);
-        }
-
-        // Bail out if no plots and no specified X-scale
-        if( (!$this->xscale->IsSpecified() && count($this->plots)==0 && count($this->y2plots)==0) ) {
-            JpGraphError::RaiseL(25034);//("<strong>JpGraph: Can't draw unspecified X-scale.</strong><br>No plots.<br>");
-        }
-
-        // Autoscale the normal Y-axis
-        $this->doAutoScaleYAxis();
-
-        // Autoscale all additiopnal y-axis
-        $this->doAutoScaleYnAxis();
-
-        // Autoscale the regular x-axis and position the y-axis properly
-        $this->doAutoScaleXAxis();
-
-        // If we have a negative values and x-axis position is at 0
-        // we need to supress the first and possible the last tick since
-        // they will be drawn on top of the y-axis (and possible y2 axis)
-        // The test below might seem strange the reasone being that if
-        // the user hasn't specified a value for position this will not
-        // be set until we do the stroke for the axis so as of now it
-        // is undefined.
-        // For X-text scale we ignore all this since the tick are usually
-        // much further in and not close to the Y-axis. Hence the test
-        // for 'text'
-        if( ($this->yaxis->pos==$this->xscale->GetMinVal() || (is_string($this->yaxis->pos) && $this->yaxis->pos=='min')) &&
-            !is_numeric($this->xaxis->pos) && $this->yscale->GetMinVal() < 0 &&
-            substr($this->axtype,0,4) != 'text' && $this->xaxis->pos != 'min' ) {
-
-            //$this->yscale->ticks->SupressZeroLabel(false);
-            $this->xscale->ticks->SupressFirst();
-            if( $this->y2axis != null ) {
-                $this->xscale->ticks->SupressLast();
-            }
-        }
-        elseif( !is_numeric($this->yaxis->pos) && $this->yaxis->pos=='max' ) {
-            $this->xscale->ticks->SupressLast();
-        }
-
-        if( !$_csim ) {
-            $this->StrokePlotArea();
-            if( $this->iIconDepth == DEPTH_BACK ) {
-                $this->StrokeIcons();
-            }
-        }
-        $this->StrokeAxis(false);
-
-        // Stroke colored bands
-        $this->StrokeBands(DEPTH_BACK,$_csim);
-
-        if( $this->grid_depth == DEPTH_BACK && !$_csim) {
-            $this->ygrid->Stroke();
-            $this->xgrid->Stroke();
-        }
-
-        // Stroke Y2-axis
-        if( $this->y2axis != null && !$_csim) {
-            $this->y2axis->Stroke($this->xscale);
-            $this->y2grid->Stroke();
-        }
-
-        // Stroke yn-axis
-        $n = count($this->ynaxis);
-        for( $i=0; $i < $n; ++$i ) {
-            $this->ynaxis[$i]->Stroke($this->xscale);
-        }
-
-        $oldoff=$this->xscale->off;
-        if( substr($this->axtype,0,4) == 'text' ) {
-            if( $this->text_scale_abscenteroff > -1 ) {
-                // For a text scale the scale factor is the number of pixel per step.
-                // Hence we can use the scale factor as a substitute for number of pixels
-                // per major scale step and use that in order to adjust the offset so that
-                // an object of width "abscenteroff" becomes centered.
-                $this->xscale->off += round($this->xscale->scale_factor/2)-round($this->text_scale_abscenteroff/2);
-            }
-            else {
-                $this->xscale->off += ceil($this->xscale->scale_factor*$this->text_scale_off*$this->xscale->ticks->minor_step);
-            }
-        }
-
-        if( $this->iDoClipping ) {
-            $oldimage = $this->img->CloneCanvasH();
-        }
-
-        if( ! $this->y2orderback ) {
-            // Stroke all plots for Y1 axis
-            for($i=0; $i < count($this->plots); ++$i) {
-                $this->plots[$i]->Stroke($this->img,$this->xscale,$this->yscale);
-                $this->plots[$i]->StrokeMargin($this->img);
-            }
-        }
-
-        // Stroke all plots for Y2 axis
-        if( $this->y2scale != null ) {
-            for($i=0; $i< count($this->y2plots); ++$i ) {
-                $this->y2plots[$i]->Stroke($this->img,$this->xscale,$this->y2scale);
-            }
-        }
-
-        if( $this->y2orderback ) {
-            // Stroke all plots for Y1 axis
-            for($i=0; $i < count($this->plots); ++$i) {
-                $this->plots[$i]->Stroke($this->img,$this->xscale,$this->yscale);
-                $this->plots[$i]->StrokeMargin($this->img);
-            }
-        }
-
-        $n = count($this->ynaxis);
-        for( $i=0; $i < $n; ++$i ) {
-            $m = count($this->ynplots[$i]);
-            for( $j=0; $j < $m; ++$j ) {
-                $this->ynplots[$i][$j]->Stroke($this->img,$this->xscale,$this->ynscale[$i]);
-                $this->ynplots[$i][$j]->StrokeMargin($this->img);
-            }
-        }
-
-        if( $this->iIconDepth == DEPTH_FRONT) {
-            $this->StrokeIcons();
-        }
-
-        if( $this->iDoClipping ) {
-            // Clipping only supports graphs at 0 and 90 degrees
-            if( $this->img->a == 0 ) {
-                $this->img->CopyCanvasH($oldimage,$this->img->img,
-                $this->img->left_margin,$this->img->top_margin,
-                $this->img->left_margin,$this->img->top_margin,
-                $this->img->plotwidth+1,$this->img->plotheight);
-            }
-            elseif( $this->img->a == 90 ) {
-                $adj = ($this->img->height - $this->img->width)/2;
-                $this->img->CopyCanvasH($oldimage,$this->img->img,
-                $this->img->bottom_margin-$adj,$this->img->left_margin+$adj,
-                $this->img->bottom_margin-$adj,$this->img->left_margin+$adj,
-                $this->img->plotheight+1,$this->img->plotwidth);
-            }
-            else {
-                JpGraphError::RaiseL(25035,$this->img->a);//('You have enabled clipping. Cliping is only supported for graphs at 0 or 90 degrees rotation. Please adjust you current angle (='.$this->img->a.' degrees) or disable clipping.');
-            }
-            $this->img->Destroy();
-            $this->img->SetCanvasH($oldimage);
-        }
-
-        $this->xscale->off=$oldoff;
-
-        if( $this->grid_depth == DEPTH_FRONT && !$_csim ) {
-            $this->ygrid->Stroke();
-            $this->xgrid->Stroke();
-        }
-
-        // Stroke colored bands
-        $this->StrokeBands(DEPTH_FRONT,$_csim);
-
-        // Finally draw the axis again since some plots may have nagged
-        // the axis in the edges.
-        if( !$_csim ) {
-            $this->StrokeAxis();
-        }
-
-        if( $this->y2scale != null && !$_csim ) {
-            $this->y2axis->Stroke($this->xscale,false);
-        }
-
-        if( !$_csim ) {
-            $this->StrokePlotBox();
-        }
-
-        // The titles and legends never gets rotated so make sure
-        // that the angle is 0 before stroking them
-        $aa = $this->img->SetAngle(0);
-        $this->StrokeTitles();
-        $this->footer->Stroke($this->img);
-        $this->legend->Stroke($this->img);
-        $this->img->SetAngle($aa);
-        $this->StrokeTexts();
-        $this->StrokeTables();
-
-        if( !$_csim ) {
-
-            $this->img->SetAngle($aa);
-
-            // Draw an outline around the image map
-            if(_JPG_DEBUG) {
-                $this->DisplayClientSideaImageMapAreas();
-            }
-
-            // Should we do any final image transformation
-            if( $this->iImgTrans ) {
-                if( !class_exists('ImgTrans',false) ) {
-                    require_once('jpgraph_imgtrans.php');
-                    //JpGraphError::Raise('In order to use image transformation you must include the file jpgraph_imgtrans.php in your script.');
-                }
-
-                $tform = new ImgTrans($this->img->img);
-                $this->img->img = $tform->Skew3D($this->iImgTransHorizon,$this->iImgTransSkewDist,
-                $this->iImgTransDirection,$this->iImgTransHighQ,
-                $this->iImgTransMinSize,$this->iImgTransFillColor,
-                $this->iImgTransBorder);
-            }
-
-            // If the filename is given as the special "__handle"
-            // then the image handler is returned and the image is NOT
-            // streamed back
-            if( $aStrokeFileName == _IMG_HANDLER ) {
-                return $this->img->img;
-            }
-            else {
-                // Finally stream the generated picture
-                $this->cache->PutAndStream($this->img,$this->cache_name,$this->inline,$aStrokeFileName);
-            }
-        }
-    }
-
-    function SetAxisLabelBackground($aType,$aXFColor='lightgray',$aXColor='black',$aYFColor='lightgray',$aYColor='black') {
-        $this->iAxisLblBgType = $aType;
-        $this->iXAxisLblBgFillColor = $aXFColor;
-        $this->iXAxisLblBgColor = $aXColor;
-        $this->iYAxisLblBgFillColor = $aYFColor;
-        $this->iYAxisLblBgColor = $aYColor;
-    }
-
-    function StrokeAxisLabelBackground() {
-        // Types
-        // 0 = No background
-        // 1 = Only X-labels, length of axis
-        // 2 = Only Y-labels, length of axis
-        // 3 = As 1 but extends to width of graph
-        // 4 = As 2 but extends to height of graph
-        // 5 = Combination of 3 & 4
-        // 6 = Combination of 1 & 2
-
-        $t = $this->iAxisLblBgType ;
-        if( $t < 1 ) return;
-
-        // Stroke optional X-axis label background color
-        if( $t == 1 || $t == 3 || $t == 5 || $t == 6 ) {
-            $this->img->PushColor($this->iXAxisLblBgFillColor);
-            if( $t == 1 || $t == 6 ) {
-                $xl = $this->img->left_margin;
-                $yu = $this->img->height - $this->img->bottom_margin + 1;
-                $xr = $this->img->width - $this->img->right_margin ;
-                $yl = $this->img->height-1-$this->frame_weight;
-            }
-            else { // t==3 || t==5
-                $xl = $this->frame_weight;
-                $yu = $this->img->height - $this->img->bottom_margin + 1;
-                $xr = $this->img->width - 1 - $this->frame_weight;
-                $yl = $this->img->height-1-$this->frame_weight;
-            }
-
-            $this->img->FilledRectangle($xl,$yu,$xr,$yl);
-            $this->img->PopColor();
-
-            // Check if we should add the vertical lines at left and right edge
-            if( $this->iXAxisLblBgColor !== '' ) {
-                // Hardcode to one pixel wide
-                $this->img->SetLineWeight(1);
-                $this->img->PushColor($this->iXAxisLblBgColor);
-                if( $t == 1 || $t == 6 ) {
-                    $this->img->Line($xl,$yu,$xl,$yl);
-                    $this->img->Line($xr,$yu,$xr,$yl);
-                }
-                else {
-                    $xl = $this->img->width - $this->img->right_margin ;
-                    $this->img->Line($xl,$yu-1,$xr,$yu-1);
-                }
-                $this->img->PopColor();
-            }
-        }
-
-        if( $t == 2 || $t == 4 || $t == 5 || $t == 6 ) {
-            $this->img->PushColor($this->iYAxisLblBgFillColor);
-            if( $t == 2 || $t == 6 ) {
-                $xl = $this->frame_weight;
-                $yu = $this->frame_weight+$this->img->top_margin;
-                $xr = $this->img->left_margin - 1;
-                $yl = $this->img->height - $this->img->bottom_margin + 1;
-            }
-            else {
-                $xl = $this->frame_weight;
-                $yu = $this->frame_weight;
-                $xr = $this->img->left_margin - 1;
-                $yl = $this->img->height-1-$this->frame_weight;
-            }
-
-            $this->img->FilledRectangle($xl,$yu,$xr,$yl);
-            $this->img->PopColor();
-
-            // Check if we should add the vertical lines at left and right edge
-            if( $this->iXAxisLblBgColor !== '' ) {
-                $this->img->PushColor($this->iXAxisLblBgColor);
-                if( $t == 2 || $t == 6 ) {
-                    $this->img->Line($xl,$yu-1,$xr,$yu-1);
-                    $this->img->Line($xl,$yl-1,$xr,$yl-1);
-                }
-                else {
-                    $this->img->Line($xr+1,$yu,$xr+1,$this->img->top_margin);
-                }
-                $this->img->PopColor();
-            }
-
-        }
-    }
-
-    function StrokeAxis($aStrokeLabels=true) {
-
-        if( $aStrokeLabels ) {
-            $this->StrokeAxisLabelBackground();
-        }
-
-        // Stroke axis
-        if( $this->iAxisStyle != AXSTYLE_SIMPLE ) {
-            switch( $this->iAxisStyle ) {
-                case AXSTYLE_BOXIN :
-                    $toppos = SIDE_DOWN;
-                    $bottompos = SIDE_UP;
-                    $leftpos = SIDE_RIGHT;
-                    $rightpos = SIDE_LEFT;
-                    break;
-                case AXSTYLE_BOXOUT :
-                    $toppos = SIDE_UP;
-                    $bottompos = SIDE_DOWN;
-                    $leftpos = SIDE_LEFT;
-                    $rightpos = SIDE_RIGHT;
-                    break;
-                case AXSTYLE_YBOXIN:
-                    $toppos = FALSE;
-                    $bottompos = SIDE_UP;
-                    $leftpos = SIDE_RIGHT;
-                    $rightpos = SIDE_LEFT;
-                    break;
-                case AXSTYLE_YBOXOUT:
-                    $toppos = FALSE;
-                    $bottompos = SIDE_DOWN;
-                    $leftpos = SIDE_LEFT;
-                    $rightpos = SIDE_RIGHT;
-                    break;
-                default:
-                    JpGRaphError::RaiseL(25036,$this->iAxisStyle); //('Unknown AxisStyle() : '.$this->iAxisStyle);
-                    break;
-            }
-
-            // By default we hide the first label so it doesn't cross the
-            // Y-axis in case the positon hasn't been set by the user.
-            // However, if we use a box we always want the first value
-            // displayed so we make sure it will be displayed.
-            $this->xscale->ticks->SupressFirst(false);
-
-            // Now draw the bottom X-axis
-            $this->xaxis->SetPos('min');
-            $this->xaxis->SetLabelSide(SIDE_DOWN);
-            $this->xaxis->scale->ticks->SetSide($bottompos);
-            $this->xaxis->Stroke($this->yscale,$aStrokeLabels);
-
-            if( $toppos !== FALSE ) {
-                // We also want a top X-axis
-                $this->xaxis = $this->xaxis;
-                $this->xaxis->SetPos('max');
-                $this->xaxis->SetLabelSide(SIDE_UP);
-                // No title for the top X-axis
-                if( $aStrokeLabels ) {
-                    $this->xaxis->title->Set('');
-                }
-                $this->xaxis->scale->ticks->SetSide($toppos);
-                $this->xaxis->Stroke($this->yscale,$aStrokeLabels);
-            }
-
-            // Stroke the left Y-axis
-            $this->yaxis->SetPos('min');
-            $this->yaxis->SetLabelSide(SIDE_LEFT);
-            $this->yaxis->scale->ticks->SetSide($leftpos);
-            $this->yaxis->Stroke($this->xscale,$aStrokeLabels);
-
-            // Stroke the  right Y-axis
-            $this->yaxis->SetPos('max');
-            // No title for the right side
-            if( $aStrokeLabels ) {
-                $this->yaxis->title->Set('');
-            }
-            $this->yaxis->SetLabelSide(SIDE_RIGHT);
-            $this->yaxis->scale->ticks->SetSide($rightpos);
-            $this->yaxis->Stroke($this->xscale,$aStrokeLabels);
-        }
-        else {
-            $this->xaxis->Stroke($this->yscale,$aStrokeLabels);
-            $this->yaxis->Stroke($this->xscale,$aStrokeLabels);
-        }
-    }
-
-
-    // Private helper function for backgound image
-    static function LoadBkgImage($aImgFormat='',$aFile='',$aImgStr='') {
-        if( $aImgStr != '' ) {
-            return Image::CreateFromString($aImgStr);
-        }
-
-        // Remove case sensitivity and setup appropriate function to create image
-        // Get file extension. This should be the LAST '.' separated part of the filename
-        $e = explode('.',$aFile);
-        $ext = strtolower($e[count($e)-1]);
-        if ($ext == "jpeg")  {
-            $ext = "jpg";
-        }
-
-        if( trim($ext) == '' ) {
-            $ext = 'png';  // Assume PNG if no extension specified
-        }
-
-        if( $aImgFormat == '' ) {
-            $imgtag = $ext;
-        }
-        else {
-            $imgtag = $aImgFormat;
-        }
-
-        $supported = imagetypes();
-        if( ( $ext == 'jpg' && !($supported & IMG_JPG) ) ||
-            ( $ext == 'gif' && !($supported & IMG_GIF) ) ||
-            ( $ext == 'png' && !($supported & IMG_PNG) ) ||
-            ( $ext == 'bmp' && !($supported & IMG_WBMP) ) ||
-            ( $ext == 'xpm' && !($supported & IMG_XPM) ) ) {
-
-            JpGraphError::RaiseL(25037,$aFile);//('The image format of your background image ('.$aFile.') is not supported in your system configuration. ');
-        }
-
-
-        if( $imgtag == "jpg" || $imgtag == "jpeg") {
-            $f = "imagecreatefromjpeg";
-            $imgtag = "jpg";
-        }
-        else {
-            $f = "imagecreatefrom".$imgtag;
-        }
-
-        // Compare specified image type and file extension
-        if( $imgtag != $ext ) {
-            //$t = "Background image seems to be of different type (has different file extension) than specified imagetype. Specified: '".$aImgFormat."'File: '".$aFile."'";
-            JpGraphError::RaiseL(25038, $aImgFormat, $aFile);
-        }
-
-        $img = @$f($aFile);
-        if( !$img ) {
-            JpGraphError::RaiseL(25039,$aFile);//(" Can't read background image: '".$aFile."'");
-        }
-        return $img;
-    }
-
-    function StrokePlotGrad() {
-        if( $this->plot_gradtype < 0  )
-            return;
-            
-        $grad = new Gradient($this->img);
-        $xl = $this->img->left_margin;
-        $yt = $this->img->top_margin;
-        $xr = $xl + $this->img->plotwidth+1 ;
-        $yb = $yt + $this->img->plotheight ;
-        $grad->FilledRectangle($xl,$yt,$xr,$yb,$this->plot_gradfrom,$this->plot_gradto,$this->plot_gradtype);
-
-    }
-
-    function StrokeBackgroundGrad() {
-        if( $this->bkg_gradtype < 0  )
-            return;
-
-        $grad = new Gradient($this->img);
-        if( $this->bkg_gradstyle == BGRAD_PLOT ) {
-            $xl = $this->img->left_margin;
-            $yt = $this->img->top_margin;
-            $xr = $xl + $this->img->plotwidth+1 ;
-            $yb = $yt + $this->img->plotheight ;
-            $grad->FilledRectangle($xl,$yt,$xr,$yb,$this->bkg_gradfrom,$this->bkg_gradto,$this->bkg_gradtype);
-        }
-        else {
-            $xl = 0;
-            $yt = 0;
-            $xr = $xl + $this->img->width - 1;
-            $yb = $yt + $this->img->height - 1 ;
-            if( $this->doshadow  ) {
-                $xr -= $this->shadow_width;
-                $yb -= $this->shadow_width;
-            }
-            if( $this->doframe ) {
-                $yt += $this->frame_weight;
-                $yb -= $this->frame_weight;
-                $xl += $this->frame_weight;
-                $xr -= $this->frame_weight;
-            }
-            $aa = $this->img->SetAngle(0);
-            $grad->FilledRectangle($xl,$yt,$xr,$yb,$this->bkg_gradfrom,$this->bkg_gradto,$this->bkg_gradtype);
-            $aa = $this->img->SetAngle($aa);
-        }
-    }
-
-    function StrokeFrameBackground() {
-        if( $this->background_image != '' && $this->background_cflag != '' ) {
-            JpGraphError::RaiseL(25040);//('It is not possible to specify both a background image and a background country flag.');
-        }
-        if( $this->background_image != '' ) {
-            $bkgimg = $this->LoadBkgImage($this->background_image_format,$this->background_image);
-        }
-        elseif( $this->background_cflag != '' ) {
-            if( ! class_exists('FlagImages',false) ) {
-                JpGraphError::RaiseL(25041);//('In order to use Country flags as backgrounds you must include the "jpgraph_flags.php" file.');
-            }
-            $fobj = new FlagImages(FLAGSIZE4);
-            $dummy='';
-            $bkgimg = $fobj->GetImgByName($this->background_cflag,$dummy);
-            $this->background_image_mix = $this->background_cflag_mix;
-            $this->background_image_type = $this->background_cflag_type;
-        }
-        else {
-            return ;
-        }
-
-        $bw = ImageSX($bkgimg);
-        $bh = ImageSY($bkgimg);
-
-        // No matter what the angle is we always stroke the image and frame
-        // assuming it is 0 degree
-        $aa = $this->img->SetAngle(0);
-
-        switch( $this->background_image_type ) {
-            case BGIMG_FILLPLOT: // Resize to just fill the plotarea
-                $this->FillMarginArea();
-                $this->StrokeFrame();
-                // Special case to hande 90 degree rotated graph corectly
-                if( $aa == 90 ) {
-                    $this->img->SetAngle(90);
-                    $this->FillPlotArea();
-                    $aa = $this->img->SetAngle(0);
-                    $adj = ($this->img->height - $this->img->width)/2;
-                    $this->img->CopyMerge($bkgimg,
-                        $this->img->bottom_margin-$adj,$this->img->left_margin+$adj,
-                        0,0,
-                        $this->img->plotheight+1,$this->img->plotwidth,
-                        $bw,$bh,$this->background_image_mix);
-                }
-                else {
-                    $this->FillPlotArea();
-                    $this->img->CopyMerge($bkgimg,
-                        $this->img->left_margin,$this->img->top_margin+1,
-                        0,0,$this->img->plotwidth+1,$this->img->plotheight,
-                        $bw,$bh,$this->background_image_mix);
-                }
-                break;
-            case BGIMG_FILLFRAME: // Fill the whole area from upper left corner, resize to just fit
-                $hadj=0; $vadj=0;
-                if( $this->doshadow ) {
-                    $hadj = $this->shadow_width;
-                    $vadj = $this->shadow_width;
-                }
-                $this->FillMarginArea();
-                $this->FillPlotArea();
-                $this->img->CopyMerge($bkgimg,0,0,0,0,$this->img->width-$hadj,$this->img->height-$vadj,
-                $bw,$bh,$this->background_image_mix);
-                $this->StrokeFrame();
-                break;
-            case BGIMG_COPY: // Just copy the image from left corner, no resizing
-                $this->FillMarginArea();
-                $this->FillPlotArea();
-                $this->img->CopyMerge($bkgimg,0,0,0,0,$bw,$bh,
-                $bw,$bh,$this->background_image_mix);
-                $this->StrokeFrame();
-                break;
-            case BGIMG_CENTER: // Center original image in the plot area
-                $this->FillMarginArea();
-                $this->FillPlotArea();
-                $centerx = round($this->img->plotwidth/2+$this->img->left_margin-$bw/2);
-                $centery = round($this->img->plotheight/2+$this->img->top_margin-$bh/2);
-                $this->img->CopyMerge($bkgimg,$centerx,$centery,0,0,$bw,$bh,
-                $bw,$bh,$this->background_image_mix);
-                $this->StrokeFrame();
-                break;
-            case BGIMG_FREE: // Just copy the image to the specified location
-                $this->img->CopyMerge($bkgimg,
-                $this->background_image_xpos,$this->background_image_ypos,
-                0,0,$bw,$bh,$bw,$bh,$this->background_image_mix);
-                $this->StrokeFrame(); // New
-                break;
-            default:
-                JpGraphError::RaiseL(25042);//(" Unknown background image layout");
-        }
-        $this->img->SetAngle($aa);
-    }
-
-    // Private
-    // Draw a frame around the image
-    function StrokeFrame() {
-        if( !$this->doframe ) return;
-
-        if( $this->background_image_type <= 1 && ($this->bkg_gradtype < 0 || ($this->bkg_gradtype > 0 && $this->bkg_gradstyle==BGRAD_PLOT)) ) {
-            $c = $this->margin_color;
-        }
-        else {
-            $c = false;
-        }
-
-        if( $this->doshadow ) {
-            $this->img->SetColor($this->frame_color);
-            $this->img->ShadowRectangle(0,0,$this->img->width,$this->img->height,
-            $c,$this->shadow_width,$this->shadow_color);
-        }
-        elseif( $this->framebevel ) {
-            if( $c ) {
-                $this->img->SetColor($this->margin_color);
-                $this->img->FilledRectangle(0,0,$this->img->width-1,$this->img->height-1);
-            }
-            $this->img->Bevel(1,1,$this->img->width-2,$this->img->height-2,
-            $this->framebeveldepth,
-            $this->framebevelcolor1,$this->framebevelcolor2);
-            if( $this->framebevelborder ) {
-                $this->img->SetColor($this->framebevelbordercolor);
-                $this->img->Rectangle(0,0,$this->img->width-1,$this->img->height-1);
-            }
-        }
-        else {
-            $this->img->SetLineWeight($this->frame_weight);
-            if( $c ) {
-                $this->img->SetColor($this->margin_color);
-                $this->img->FilledRectangle(0,0,$this->img->width-1,$this->img->height-1);
-            }
-            $this->img->SetColor($this->frame_color);
-            $this->img->Rectangle(0,0,$this->img->width-1,$this->img->height-1);
-        }
-    }
-
-    function FillMarginArea() {
-        $hadj=0; $vadj=0;
-        if( $this->doshadow ) {
-            $hadj = $this->shadow_width;
-            $vadj = $this->shadow_width;
-        }
-
-        $this->img->SetColor($this->margin_color);
-        $this->img->FilledRectangle(0,0,$this->img->width-1-$hadj,$this->img->height-1-$vadj);
-
-        $this->img->FilledRectangle(0,0,$this->img->width-1-$hadj,$this->img->top_margin);
-        $this->img->FilledRectangle(0,$this->img->top_margin,$this->img->left_margin,$this->img->height-1-$hadj);
-        $this->img->FilledRectangle($this->img->left_margin+1,
-        $this->img->height-$this->img->bottom_margin,
-        $this->img->width-1-$hadj,
-        $this->img->height-1-$hadj);
-        $this->img->FilledRectangle($this->img->width-$this->img->right_margin,
-        $this->img->top_margin+1,
-        $this->img->width-1-$hadj,
-        $this->img->height-$this->img->bottom_margin-1);
-    }
-
-    function FillPlotArea() {
-        $this->img->PushColor($this->plotarea_color);
-        $this->img->FilledRectangle($this->img->left_margin,
-        $this->img->top_margin,
-        $this->img->width-$this->img->right_margin,
-        $this->img->height-$this->img->bottom_margin);
-        $this->img->PopColor();
-    }
-
-    // Stroke the plot area with either a solid color or a background image
-    function StrokePlotArea() {
-        // Note: To be consistent we really should take a possible shadow
-        // into account. However, that causes some problem for the LinearScale class
-        // since in the current design it does not have any links to class Graph which
-        // means it has no way of compensating for the adjusted plotarea in case of a
-        // shadow. So, until I redesign LinearScale we can't compensate for this.
-        // So just set the two adjustment parameters to zero for now.
-        $boxadj = 0; //$this->doframe ? $this->frame_weight : 0 ;
-        $adj = 0; //$this->doshadow ? $this->shadow_width : 0 ;
-
-        if( $this->background_image != '' || $this->background_cflag != '' ) {
-            $this->StrokeFrameBackground();
-        }
-        else {
-            $aa = $this->img->SetAngle(0);
-            $this->StrokeFrame();
-            $aa = $this->img->SetAngle($aa);
-            $this->StrokeBackgroundGrad(); 
-            if( $this->bkg_gradtype < 0 || ($this->bkg_gradtype > 0 && $this->bkg_gradstyle==BGRAD_MARGIN) ) {
-                $this->FillPlotArea();
-            }
-            $this->StrokePlotGrad();
-        }
-    }
-
-    function StrokeIcons() {
-        $n = count($this->iIcons);
-        for( $i=0; $i < $n; ++$i ) {
-            $this->iIcons[$i]->StrokeWithScale($this->img,$this->xscale,$this->yscale);
-        }
-    }
-
-    function StrokePlotBox() {
-        // Should we draw a box around the plot area?
-        if( $this->boxed ) {
-            $this->img->SetLineWeight(1);
-            $this->img->SetLineStyle('solid');
-            $this->img->SetColor($this->box_color);
-            for($i=0; $i < $this->box_weight; ++$i ) {
-                $this->img->Rectangle(
-                $this->img->left_margin-$i,$this->img->top_margin-$i,
-                $this->img->width-$this->img->right_margin+$i,
-                $this->img->height-$this->img->bottom_margin+$i);
-            }
-        }
-    }
-
-    function SetTitleBackgroundFillStyle($aStyle,$aColor1='black',$aColor2='white') {
-        $this->titlebkg_fillstyle = $aStyle;
-        $this->titlebkg_scolor1 = $aColor1;
-        $this->titlebkg_scolor2 = $aColor2;
-    }
-
-    function SetTitleBackground($aBackColor='gray', $aStyle=TITLEBKG_STYLE1, $aFrameStyle=TITLEBKG_FRAME_NONE, $aFrameColor='black', $aFrameWeight=1, $aBevelHeight=3, $aEnable=true) {
-        $this->titlebackground = $aEnable;
-        $this->titlebackground_color = $aBackColor;
-        $this->titlebackground_style = $aStyle;
-        $this->titlebackground_framecolor = $aFrameColor;
-        $this->titlebackground_framestyle = $aFrameStyle;
-        $this->titlebackground_frameweight = $aFrameWeight;
-        $this->titlebackground_bevelheight = $aBevelHeight ;
-    }
-
-
-    function StrokeTitles() {
-
-        $margin=3;
-
-        if( $this->titlebackground ) {
-            // Find out height
-            $this->title->margin += 2 ;
-            $h = $this->title->GetTextHeight($this->img)+$this->title->margin+$margin;
-            if( $this->subtitle->t != '' && !$this->subtitle->hide ) {
-                $h += $this->subtitle->GetTextHeight($this->img)+$margin+
-                $this->subtitle->margin;
-                $h += 2;
-            }
-            if( $this->subsubtitle->t != '' && !$this->subsubtitle->hide ) {
-                $h += $this->subsubtitle->GetTextHeight($this->img)+$margin+
-                $this->subsubtitle->margin;
-                $h += 2;
-            }
-            $this->img->PushColor($this->titlebackground_color);
-            if( $this->titlebackground_style === TITLEBKG_STYLE1 ) {
-                // Inside the frame
-                if( $this->framebevel ) {
-                    $x1 = $y1 = $this->framebeveldepth + 1 ;
-                    $x2 = $this->img->width - $this->framebeveldepth - 2 ;
-                    $this->title->margin += $this->framebeveldepth + 1 ;
-                    $h += $y1 ;
-                    $h += 2;
-                }
-                else {
-                    $x1 = $y1 = $this->frame_weight;
-                    $x2 = $this->img->width - $this->frame_weight-1;
-                }
-            }
-            elseif( $this->titlebackground_style === TITLEBKG_STYLE2 ) {
-                // Cover the frame as well
-                $x1 = $y1 = 0;
-                $x2 = $this->img->width - 1 ;
-            }
-            elseif( $this->titlebackground_style === TITLEBKG_STYLE3 ) {
-                // Cover the frame as well (the difference is that
-                // for style==3 a bevel frame border is on top
-                // of the title background)
-                $x1 = $y1 = 0;
-                $x2 = $this->img->width - 1 ;
-                $h += $this->framebeveldepth ;
-                $this->title->margin += $this->framebeveldepth ;
-            }
-            else {
-                JpGraphError::RaiseL(25043);//('Unknown title background style.');
-            }
-
-            if( $this->titlebackground_framestyle === 3 ) {
-                $h += $this->titlebackground_bevelheight*2 + 1  ;
-                $this->title->margin += $this->titlebackground_bevelheight ;
-            }
-
-            if( $this->doshadow ) {
-                $x2 -= $this->shadow_width ;
-            }
-
-            $indent=0;
-            if( $this->titlebackground_framestyle == TITLEBKG_FRAME_BEVEL ) {
-                $indent = $this->titlebackground_bevelheight;
-            }
-
-            if( $this->titlebkg_fillstyle==TITLEBKG_FILLSTYLE_HSTRIPED ) {
-                $this->img->FilledRectangle2($x1+$indent,$y1+$indent,$x2-$indent,$h-$indent,
-                $this->titlebkg_scolor1,
-                $this->titlebkg_scolor2);
-            }
-            elseif( $this->titlebkg_fillstyle==TITLEBKG_FILLSTYLE_VSTRIPED ) {
-                $this->img->FilledRectangle2($x1+$indent,$y1+$indent,$x2-$indent,$h-$indent,
-                $this->titlebkg_scolor1,
-                $this->titlebkg_scolor2,2);
-            }
-            else {
-                // Solid fill
-                $this->img->FilledRectangle($x1,$y1,$x2,$h);
-            }
-            $this->img->PopColor();
-
-            $this->img->PushColor($this->titlebackground_framecolor);
-            $this->img->SetLineWeight($this->titlebackground_frameweight);
-            if( $this->titlebackground_framestyle == TITLEBKG_FRAME_FULL ) {
-                // Frame background
-                $this->img->Rectangle($x1,$y1,$x2,$h);
-            }
-            elseif( $this->titlebackground_framestyle == TITLEBKG_FRAME_BOTTOM ) {
-                // Bottom line only
-                $this->img->Line($x1,$h,$x2,$h);
-            }
-            elseif( $this->titlebackground_framestyle == TITLEBKG_FRAME_BEVEL ) {
-                $this->img->Bevel($x1,$y1,$x2,$h,$this->titlebackground_bevelheight);
-            }
-            $this->img->PopColor();
-
-            // This is clumsy. But we neeed to stroke the whole graph frame if it is
-            // set to bevel to get the bevel shading on top of the text background
-            if( $this->framebevel && $this->doframe && $this->titlebackground_style === 3 ) {
-                $this->img->Bevel(1,1,$this->img->width-2,$this->img->height-2,
-                $this->framebeveldepth,
-                $this->framebevelcolor1,$this->framebevelcolor2);
-                if( $this->framebevelborder ) {
-                    $this->img->SetColor($this->framebevelbordercolor);
-                    $this->img->Rectangle(0,0,$this->img->width-1,$this->img->height-1);
-                }
-            }
-        }
-
-        // Stroke title
-        $y = $this->title->margin;
-        if( $this->title->halign == 'center' ) {
-            $this->title->Center(0,$this->img->width,$y);
-        }
-        elseif( $this->title->halign == 'left' ) {
-            $this->title->SetPos($this->title->margin+2,$y);
-        }
-        elseif( $this->title->halign == 'right' ) {
-            $indent = 0;
-            if( $this->doshadow ) {
-                $indent = $this->shadow_width+2;
-            }
-            $this->title->SetPos($this->img->width-$this->title->margin-$indent,$y,'right');
-        }
-        $this->title->Stroke($this->img);
-
-        // ... and subtitle
-        $y += $this->title->GetTextHeight($this->img) + $margin + $this->subtitle->margin;
-        if( $this->subtitle->halign == 'center' ) {
-            $this->subtitle->Center(0,$this->img->width,$y);
-        }
-        elseif( $this->subtitle->halign == 'left' ) {
-            $this->subtitle->SetPos($this->subtitle->margin+2,$y);
-        }
-        elseif( $this->subtitle->halign == 'right' ) {
-            $indent = 0;
-            if( $this->doshadow )
-            $indent = $this->shadow_width+2;
-            $this->subtitle->SetPos($this->img->width-$this->subtitle->margin-$indent,$y,'right');
-        }
-        $this->subtitle->Stroke($this->img);
-
-        // ... and subsubtitle
-        $y += $this->subtitle->GetTextHeight($this->img) + $margin + $this->subsubtitle->margin;
-        if( $this->subsubtitle->halign == 'center' ) {
-            $this->subsubtitle->Center(0,$this->img->width,$y);
-        }
-        elseif( $this->subsubtitle->halign == 'left' ) {
-            $this->subsubtitle->SetPos($this->subsubtitle->margin+2,$y);
-        }
-        elseif( $this->subsubtitle->halign == 'right' ) {
-            $indent = 0;
-            if( $this->doshadow )
-            $indent = $this->shadow_width+2;
-            $this->subsubtitle->SetPos($this->img->width-$this->subsubtitle->margin-$indent,$y,'right');
-        }
-        $this->subsubtitle->Stroke($this->img);
-
-        // ... and fancy title
-        $this->tabtitle->Stroke($this->img);
-
-    }
-
-    function StrokeTexts() {
-        // Stroke any user added text objects
-        if( $this->texts != null ) {
-            for($i=0; $i < count($this->texts); ++$i) {
-                $this->texts[$i]->StrokeWithScale($this->img,$this->xscale,$this->yscale);
-            }
-        }
-
-        if( $this->y2texts != null && $this->y2scale != null ) {
-            for($i=0; $i < count($this->y2texts); ++$i) {
-                $this->y2texts[$i]->StrokeWithScale($this->img,$this->xscale,$this->y2scale);
-            }
-        }
-
-    }
-
-    function StrokeTables() {
-        if( $this->iTables != null ) {
-            $n = count($this->iTables);
-            for( $i=0; $i < $n; ++$i ) {
-                $this->iTables[$i]->StrokeWithScale($this->img,$this->xscale,$this->yscale);
-            }
-        }
-    }
-
-    function DisplayClientSideaImageMapAreas() {
-        // Debug stuff - display the outline of the image map areas
-        $csim='';
-        foreach ($this->plots as $p) {
-            $csim.= $p->GetCSIMareas();
-        }
-        $csim .= $this->legend->GetCSIMareas();
-        if (preg_match_all("/area shape=\"(\w+)\" coords=\"([0-9\, ]+)\"/", $csim, $coords)) {
-            $this->img->SetColor($this->csimcolor);
-            $n = count($coords[0]);
-            for ($i=0; $i < $n; $i++) {
-                if ( $coords[1][$i] == 'poly' ) {
-                    preg_match_all('/\s*([0-9]+)\s*,\s*([0-9]+)\s*,*/',$coords[2][$i],$pts);
-                    $this->img->SetStartPoint($pts[1][count($pts[0])-1],$pts[2][count($pts[0])-1]);
-                    $m = count($pts[0]);
-                    for ($j=0; $j < $m; $j++) {
-                        $this->img->LineTo($pts[1][$j],$pts[2][$j]);
-                    }
-                } elseif ( $coords[1][$i] == 'rect' ) {
-                    $pts = preg_split('/,/', $coords[2][$i]);
-                    $this->img->SetStartPoint($pts[0],$pts[1]);
-                    $this->img->LineTo($pts[2],$pts[1]);
-                    $this->img->LineTo($pts[2],$pts[3]);
-                    $this->img->LineTo($pts[0],$pts[3]);
-                    $this->img->LineTo($pts[0],$pts[1]);
-                }
-            }
-        }
-    }
-
-    // Text scale offset in world coordinates
-    function SetTextScaleOff($aOff) {
-        $this->text_scale_off = $aOff;
-        $this->xscale->text_scale_off = $aOff;
-    }
-
-    // Text width of bar to be centered in absolute pixels
-    function SetTextScaleAbsCenterOff($aOff) {
-        $this->text_scale_abscenteroff = $aOff;
-    }
-
-    // Get Y min and max values for added lines
-    function GetLinesYMinMax( $aLines ) {
-        $n = count($aLines);
-        if( $n == 0 ) return false;
-        $min = $aLines[0]->scaleposition ;
-        $max = $min ;
-        $flg = false;
-        for( $i=0; $i < $n; ++$i ) {
-            if( $aLines[$i]->direction == HORIZONTAL ) {
-                $flg = true ;
-                $v = $aLines[$i]->scaleposition ;
-                if( $min > $v ) $min = $v ;
-                if( $max < $v ) $max = $v ;
-            }
-        }
-        return $flg ? array($min,$max) : false ;
-    }
-
-    // Get X min and max values for added lines
-    function GetLinesXMinMax( $aLines ) {
-        $n = count($aLines);
-        if( $n == 0 ) return false ;
-        $min = $aLines[0]->scaleposition ;
-        $max = $min ;
-        $flg = false;
-        for( $i=0; $i < $n; ++$i ) {
-            if( $aLines[$i]->direction == VERTICAL ) {
-                $flg = true ;
-                $v = $aLines[$i]->scaleposition ;
-                if( $min > $v ) $min = $v ;
-                if( $max < $v ) $max = $v ;
-            }
-        }
-        return $flg ? array($min,$max) : false ;
-    }
-
-    // Get min and max values for all included plots
-    function GetPlotsYMinMax($aPlots) {
-        $n = count($aPlots);
-        $i=0;
-        do {
-            list($xmax,$max) = $aPlots[$i]->Max();
-        } while( ++$i < $n && !is_numeric($max) );
-
-        $i=0;
-        do {
-            list($xmin,$min) = $aPlots[$i]->Min();
-        } while( ++$i < $n && !is_numeric($min) );
-
-        if( !is_numeric($min) || !is_numeric($max) ) {
-            JpGraphError::RaiseL(25044);//('Cannot use autoscaling since it is impossible to determine a valid min/max value  of the Y-axis (only null values).');
-        }
-
-        for($i=0; $i < $n; ++$i ) {
-            list($xmax,$ymax)=$aPlots[$i]->Max();
-            list($xmin,$ymin)=$aPlots[$i]->Min();
-            if (is_numeric($ymax)) $max=max($max,$ymax);
-            if (is_numeric($ymin)) $min=min($min,$ymin);
-        }
-        if( $min == '' ) $min = 0;
-        if( $max == '' ) $max = 0;
-        if( $min == 0 && $max == 0 ) {
-            // Special case if all values are 0
-            $min=0;$max=1;
-        }
-        return array($min,$max);
-    }
-
-    function hasLinePlotAndBarPlot() {
-        $has_line = false;
-        $has_bar  = false;
-
-        foreach ($this->plots as $plot) {
-            if ($plot instanceof LinePlot) {
-                $has_line = true;
-            }
-            if ($plot instanceof BarPlot) {
-                $has_bar = true;
-            }
-        }
-
-        if ($has_line && $has_bar) {
-            return true;
-        }
-
-        return false;
-    }
-
-    function SetTheme($graph_theme) {
-
-        if (!($this instanceof PieGraph)) {
-            if (!$this->isAfterSetScale) {
-                JpGraphError::RaiseL(25133);//('Use Graph::SetTheme() after Graph::SetScale().');
-            }
-        }
-
-        if ($this->graph_theme) {
-            $this->ClearTheme();
-        }
-        $this->graph_theme = $graph_theme;
-        $this->graph_theme->ApplyGraph($this);
-    }
-
-    function ClearTheme() {
-        $this->graph_theme = null;
-
-        $this->isRunningClear = true;
-
-        $this->__construct(
-                $this->inputValues['aWidth'],
-                $this->inputValues['aHeight'],
-                $this->inputValues['aCachedName'],
-                $this->inputValues['aTimeout'],
-                $this->inputValues['aInline']
-            );
- 
-        if (!($this instanceof PieGraph)) {
-            if ($this->isAfterSetScale) {
-                $this->SetScale(
-                        $this->inputValues['aAxisType'],
-                        $this->inputValues['aYMin'],
-                        $this->inputValues['aYMax'],
-                        $this->inputValues['aXMin'],
-                        $this->inputValues['aXMax']
-                    );       
-            }
-        }
-
-        $this->isRunningClear = false;
-    }
-
-    function SetSupersampling($do = false, $scale = 2) {
-        if ($do) {
-            define('SUPERSAMPLING_SCALE', $scale);
-           // $this->img->scale = $scale;
-        } else {
-            define('SUPERSAMPLING_SCALE', 1);
-            //$this->img->scale = 0;
-        }
-    }
-
-} // Class
-
-//===================================================
-// CLASS LineProperty
-// Description: Holds properties for a line
-//===================================================
-class LineProperty {
-    public $iWeight=1, $iColor='black', $iStyle='solid', $iShow=false;
-
-    function __construct($aWeight=1,$aColor='black',$aStyle='solid') {
-        $this->iWeight = $aWeight;
-        $this->iColor = $aColor;
-        $this->iStyle = $aStyle;
-    }
-
-    function SetColor($aColor) {
-        $this->iColor = $aColor;
-    }
-
-    function SetWeight($aWeight) {
-        $this->iWeight = $aWeight;
-    }
-
-    function SetStyle($aStyle) {
-        $this->iStyle = $aStyle;
-    }
-
-    function Show($aShow=true) {
-        $this->iShow=$aShow;
-    }
-
-    function Stroke($aImg,$aX1,$aY1,$aX2,$aY2) {
-        if( $this->iShow ) {
-            $aImg->PushColor($this->iColor);
-            $oldls = $aImg->line_style;
-            $oldlw = $aImg->line_weight;
-            $aImg->SetLineWeight($this->iWeight);
-            $aImg->SetLineStyle($this->iStyle);
-            $aImg->StyleLine($aX1,$aY1,$aX2,$aY2);
-            $aImg->PopColor($this->iColor);
-            $aImg->line_style = $oldls;
-            $aImg->line_weight = $oldlw;
-
-        }
-    }
-}
-
-//===================================================
-// CLASS GraphTabTitle
-// Description: Draw "tab" titles on top of graphs
-//===================================================
-class GraphTabTitle extends Text{
-    private $corner = 6 , $posx = 7, $posy = 4;
-    private $fillcolor='lightyellow',$bordercolor='black';
-    private $align = 'left', $width=TABTITLE_WIDTHFIT;
-    function __construct() {
-        $this->t = '';
-        $this->font_style = FS_BOLD;
-        $this->hide = true;
-        $this->color = 'darkred';
-    }
-
-    function SetColor($aTxtColor,$aFillColor='lightyellow',$aBorderColor='black') {
-        $this->color = $aTxtColor;
-        $this->fillcolor = $aFillColor;
-        $this->bordercolor = $aBorderColor;
-    }
-
-    function SetFillColor($aFillColor) {
-        $this->fillcolor = $aFillColor;
-    }
-
-    function SetTabAlign($aAlign) {
-        $this->align = $aAlign;
-    }
-
-    function SetWidth($aWidth) {
-        $this->width = $aWidth ;
-    }
-
-    function Set($t) {
-        $this->t = $t;
-        $this->hide = false;
-    }
-
-    function SetCorner($aD) {
-        $this->corner = $aD ;
-    }
-
-    function Stroke($aImg,$aDummy1=null,$aDummy2=null) {
-        if( $this->hide )
-            return;
-        $this->boxed = false;
-        $w = $this->GetWidth($aImg) + 2*$this->posx;
-        $h = $this->GetTextHeight($aImg) + 2*$this->posy;
-
-        $x = $aImg->left_margin;
-        $y = $aImg->top_margin;
-
-        if( $this->width === TABTITLE_WIDTHFIT ) {
-            if( $this->align == 'left' ) {
-                $p = array($x,                $y,
-                $x,                $y-$h+$this->corner,
-                $x + $this->corner,$y-$h,
-                $x + $w - $this->corner, $y-$h,
-                $x + $w, $y-$h+$this->corner,
-                $x + $w, $y);
-            }
-            elseif( $this->align == 'center' ) {
-                $x += round($aImg->plotwidth/2) - round($w/2);
-                $p = array($x, $y,
-                $x, $y-$h+$this->corner,
-                $x + $this->corner, $y-$h,
-                $x + $w - $this->corner, $y-$h,
-                $x + $w, $y-$h+$this->corner,
-                $x + $w, $y);
-            }
-            else {
-                $x += $aImg->plotwidth -$w;
-                $p = array($x, $y,
-                $x, $y-$h+$this->corner,
-                $x + $this->corner,$y-$h,
-                $x + $w - $this->corner, $y-$h,
-                $x + $w, $y-$h+$this->corner,
-                $x + $w, $y);
-            }
-        }
-        else {
-            if( $this->width === TABTITLE_WIDTHFULL ) {
-                $w = $aImg->plotwidth ;
-            }
-            else {
-                $w = $this->width ;
-            }
-
-            // Make the tab fit the width of the plot area
-            $p = array($x, $y,
-            $x, $y-$h+$this->corner,
-            $x + $this->corner,$y-$h,
-            $x + $w - $this->corner, $y-$h,
-            $x + $w, $y-$h+$this->corner,
-            $x + $w, $y);
-
-        }
-        if( $this->halign == 'left' ) {
-            $aImg->SetTextAlign('left','bottom');
-            $x += $this->posx;
-            $y -= $this->posy;
-        }
-        elseif( $this->halign == 'center' ) {
-            $aImg->SetTextAlign('center','bottom');
-            $x += $w/2;
-            $y -= $this->posy;
-        }
-        else {
-            $aImg->SetTextAlign('right','bottom');
-            $x += $w - $this->posx;
-            $y -= $this->posy;
-        }
-
-        $aImg->SetColor($this->fillcolor);
-        $aImg->FilledPolygon($p);
-
-        $aImg->SetColor($this->bordercolor);
-        $aImg->Polygon($p,true);
-
-        $aImg->SetColor($this->color);
-        $aImg->SetFont($this->font_family,$this->font_style,$this->font_size);
-        $aImg->StrokeText($x,$y,$this->t,0,'center');
-    }
-
-}
-
-//===================================================
-// CLASS SuperScriptText
-// Description: Format a superscript text
-//===================================================
-class SuperScriptText extends Text {
-    private $iSuper='';
-    private $sfont_family='',$sfont_style='',$sfont_size=8;
-    private $iSuperMargin=2,$iVertOverlap=4,$iSuperScale=0.65;
-    private $iSDir=0;
-    private $iSimple=false;
-
-    function __construct($aTxt='',$aSuper='',$aXAbsPos=0,$aYAbsPos=0) {
-        parent::__construct($aTxt,$aXAbsPos,$aYAbsPos);
-        $this->iSuper = $aSuper;
-    }
-
-    function FromReal($aVal,$aPrecision=2) {
-        // Convert a floating point number to scientific notation
-        $neg=1.0;
-        if( $aVal < 0 ) {
-            $neg = -1.0;
-            $aVal = -$aVal;
-        }
-
-        $l = floor(log10($aVal));
-        $a = sprintf("%0.".$aPrecision."f",round($aVal / pow(10,$l),$aPrecision));
-        $a *= $neg;
-        if( $this->iSimple && ($a == 1 || $a==-1) ) $a = '';
-
-        if( $a != '' ) {
-            $this->t = $a.' * 10';
-        }
-        else {
-            if( $neg == 1 ) {
-                $this->t = '10';
-            }
-            else {
-                $this->t = '-10';
-            }
-        }
-        $this->iSuper = $l;
-    }
-
-    function Set($aTxt,$aSuper='') {
-        $this->t = $aTxt;
-        $this->iSuper = $aSuper;
-    }
-
-    function SetSuperFont($aFontFam,$aFontStyle=FS_NORMAL,$aFontSize=8) {
-        $this->sfont_family = $aFontFam;
-        $this->sfont_style = $aFontStyle;
-        $this->sfont_size = $aFontSize;
-    }
-
-    // Total width of text
-    function GetWidth($aImg) {
-        $aImg->SetFont($this->font_family,$this->font_style,$this->font_size);
-        $w = $aImg->GetTextWidth($this->t);
-        $aImg->SetFont($this->sfont_family,$this->sfont_style,$this->sfont_size);
-        $w += $aImg->GetTextWidth($this->iSuper);
-        $w += $this->iSuperMargin;
-        return $w;
-    }
-
-    // Hight of font (approximate the height of the text)
-    function GetFontHeight($aImg) {
-        $aImg->SetFont($this->font_family,$this->font_style,$this->font_size);
-        $h = $aImg->GetFontHeight();
-        $aImg->SetFont($this->sfont_family,$this->sfont_style,$this->sfont_size);
-        $h += $aImg->GetFontHeight();
-        return $h;
-    }
-
-    // Hight of text
-    function GetTextHeight($aImg) {
-        $aImg->SetFont($this->font_family,$this->font_style,$this->font_size);
-        $h = $aImg->GetTextHeight($this->t);
-        $aImg->SetFont($this->sfont_family,$this->sfont_style,$this->sfont_size);
-        $h += $aImg->GetTextHeight($this->iSuper);
-        return $h;
-    }
-
-    function Stroke($aImg,$ax=-1,$ay=-1) {
-
-        // To position the super script correctly we need different
-        // cases to handle the alignmewnt specified since that will
-        // determine how we can interpret the x,y coordinates
-
-        $w = parent::GetWidth($aImg);
-        $h = parent::GetTextHeight($aImg);
-        switch( $this->valign ) {
-            case 'top':
-                $sy = $this->y;
-                break;
-            case 'center':
-                $sy = $this->y - $h/2;
-                break;
-            case 'bottom':
-                $sy = $this->y - $h;
-                break;
-            default:
-                JpGraphError::RaiseL(25052);//('PANIC: Internal error in SuperScript::Stroke(). Unknown vertical alignment for text');
-                break;
-        }
-
-        switch( $this->halign ) {
-            case 'left':
-                $sx = $this->x + $w;
-                break;
-            case 'center':
-                $sx = $this->x + $w/2;
-                break;
-            case 'right':
-                $sx = $this->x;
-                break;
-            default:
-                JpGraphError::RaiseL(25053);//('PANIC: Internal error in SuperScript::Stroke(). Unknown horizontal alignment for text');
-                break;
-        }
-
-        $sx += $this->iSuperMargin;
-        $sy += $this->iVertOverlap;
-
-        // Should we automatically determine the font or
-        // has the user specified it explicetly?
-        if( $this->sfont_family == '' ) {
-            if( $this->font_family <= FF_FONT2 ) {
-                if( $this->font_family == FF_FONT0 ) {
-                    $sff = FF_FONT0;
-                }
-                elseif( $this->font_family == FF_FONT1 ) {
-                    if( $this->font_style == FS_NORMAL ) {
-                        $sff = FF_FONT0;
-                    }
-                    else {
-                        $sff = FF_FONT1;
-                    }
-                }
-                else {
-                    $sff = FF_FONT1;
-                }
-                $sfs = $this->font_style;
-                $sfz = $this->font_size;
-            }
-            else {
-                // TTF fonts
-                $sff = $this->font_family;
-                $sfs = $this->font_style;
-                $sfz = floor($this->font_size*$this->iSuperScale);
-                if( $sfz < 8 ) $sfz = 8;
-            }
-            $this->sfont_family = $sff;
-            $this->sfont_style = $sfs;
-            $this->sfont_size = $sfz;
-        }
-        else {
-            $sff = $this->sfont_family;
-            $sfs = $this->sfont_style;
-            $sfz = $this->sfont_size;
-        }
-
-        parent::Stroke($aImg,$ax,$ay);
-
-        // For the builtin fonts we need to reduce the margins
-        // since the bounding bx reported for the builtin fonts
-        // are much larger than for the TTF fonts.
-        if( $sff <= FF_FONT2 ) {
-            $sx -= 2;
-            $sy += 3;
-        }
-
-        $aImg->SetTextAlign('left','bottom');
-        $aImg->SetFont($sff,$sfs,$sfz);
-        $aImg->PushColor($this->color);
-        $aImg->StrokeText($sx,$sy,$this->iSuper,$this->iSDir,'left');
-        $aImg->PopColor();
-    }
-}
-
-
-//===================================================
-// CLASS Grid
-// Description: responsible for drawing grid lines in graph
-//===================================================
-class Grid {
-    protected $img;
-    protected $scale;
-    protected $majorcolor='#CCCCCC',$minorcolor='#DDDDDD';
-    protected $majortype='solid',$minortype='solid';
-    protected $show=false, $showMinor=false,$majorweight=1,$minorweight=1;
-    protected $fill=false,$fillcolor=array('#EFEFEF','#BBCCFF');
-
-    function __construct($aAxis) {
-        $this->scale = $aAxis->scale;
-        $this->img = $aAxis->img;
-    }
-
-    function SetColor($aMajColor,$aMinColor=false) {
-        $this->majorcolor=$aMajColor;
-        if( $aMinColor === false ) {
-            $aMinColor = $aMajColor ;
-        }
-        $this->minorcolor = $aMinColor;
-    }
-
-    function SetWeight($aMajorWeight,$aMinorWeight=1) {
-        $this->majorweight=$aMajorWeight;
-        $this->minorweight=$aMinorWeight;
-    }
-
-    // Specify if grid should be dashed, dotted or solid
-    function SetLineStyle($aMajorType,$aMinorType='solid') {
-        $this->majortype = $aMajorType;
-        $this->minortype = $aMinorType;
-    }
-
-    function SetStyle($aMajorType,$aMinorType='solid') {
-        $this->SetLineStyle($aMajorType,$aMinorType);
-    }
-
-    // Decide if both major and minor grid should be displayed
-    function Show($aShowMajor=true,$aShowMinor=false) {
-        $this->show=$aShowMajor;
-        $this->showMinor=$aShowMinor;
-    }
-
-    function SetFill($aFlg=true,$aColor1='lightgray',$aColor2='lightblue') {
-        $this->fill = $aFlg;
-        $this->fillcolor = array( $aColor1, $aColor2 );
-    }
-
-    // Display the grid
-    function Stroke() {
-        if( $this->showMinor && !$this->scale->textscale ) {
-            $this->DoStroke($this->scale->ticks->ticks_pos,$this->minortype,$this->minorcolor,$this->minorweight);
-            $this->DoStroke($this->scale->ticks->maj_ticks_pos,$this->majortype,$this->majorcolor,$this->majorweight);
-        }
-        else {
-            $this->DoStroke($this->scale->ticks->maj_ticks_pos,$this->majortype,$this->majorcolor,$this->majorweight);
-        }
-    }
-
-    //--------------
-    // Private methods
-    // Draw the grid
-    function DoStroke($aTicksPos,$aType,$aColor,$aWeight) {
-        if( !$this->show ) return;
-        $nbrgrids = count($aTicksPos);
-
-        if( $this->scale->type == 'y' ) {
-            $xl=$this->img->left_margin;
-            $xr=$this->img->width-$this->img->right_margin;
-
-            if( $this->fill ) {
-                // Draw filled areas
-                $y2 = $aTicksPos[0];
-                $i=1;
-                while( $i < $nbrgrids ) {
-                    $y1 = $y2;
-                    $y2 = $aTicksPos[$i++];
-                    $this->img->SetColor($this->fillcolor[$i & 1]);
-                    $this->img->FilledRectangle($xl,$y1,$xr,$y2);
-                }
-            }
-
-            $this->img->SetColor($aColor);
-            $this->img->SetLineWeight($aWeight);
-
-            // Draw grid lines
-            switch( $aType ) {
-                case 'solid':  $style = LINESTYLE_SOLID; break;
-                case 'dotted': $style = LINESTYLE_DOTTED; break;
-                case 'dashed': $style = LINESTYLE_DASHED; break;
-                case 'longdashed': $style = LINESTYLE_LONGDASH; break;
-                default:
-                    $style = LINESTYLE_SOLID; break;
-            }
-
-            for($i=0; $i < $nbrgrids; ++$i) {
-                $y=$aTicksPos[$i];
-                $this->img->StyleLine($xl,$y,$xr,$y,$style,true);
-            }
-        }
-        elseif( $this->scale->type == 'x' ) {
-            $yu=$this->img->top_margin;
-            $yl=$this->img->height-$this->img->bottom_margin;
-            $limit=$this->img->width-$this->img->right_margin;
-
-            if( $this->fill ) {
-                // Draw filled areas
-                $x2 = $aTicksPos[0];
-                $i=1;
-                while( $i < $nbrgrids ) {
-                    $x1 = $x2;
-                    $x2 = min($aTicksPos[$i++],$limit) ;
-                    $this->img->SetColor($this->fillcolor[$i & 1]);
-                    $this->img->FilledRectangle($x1,$yu,$x2,$yl);
-                }
-            }
-
-            $this->img->SetColor($aColor);
-            $this->img->SetLineWeight($aWeight);
-
-            // We must also test for limit since we might have
-            // an offset and the number of ticks is calculated with
-            // assumption offset==0 so we might end up drawing one
-            // to many gridlines
-            $i=0;
-            $x=$aTicksPos[$i];
-            while( $i<count($aTicksPos) && ($x=$aTicksPos[$i]) <= $limit ) {
-                if    ( $aType == 'solid' )      $this->img->Line($x,$yl,$x,$yu);
-                elseif( $aType == 'dotted' )     $this->img->DashedLineForGrid($x,$yl,$x,$yu,1,6);
-                elseif( $aType == 'dashed' )     $this->img->DashedLineForGrid($x,$yl,$x,$yu,2,4);
-                elseif( $aType == 'longdashed' ) $this->img->DashedLineForGrid($x,$yl,$x,$yu,8,6);
-                ++$i;
-            }
-        }
-        else {
-            JpGraphError::RaiseL(25054,$this->scale->type);//('Internal error: Unknown grid axis ['.$this->scale->type.']');
-        }
-        return true;
-    }
-} // Class
-
-//===================================================
-// CLASS Axis
-// Description: Defines X and Y axis. Notes that at the
-// moment the code is not really good since the axis on
-// several occasion must know wheter it's an X or Y axis.
-// This was a design decision to make the code easier to
-// follow.
-//===================================================
-class AxisPrototype {
-    public $scale=null;
-    public $img=null;
-    public $hide=false,$hide_labels=false;
-    public $title=null;
-    public $font_family=FF_DEFAULT,$font_style=FS_NORMAL,$font_size=8,$label_angle=0;
-    public $tick_step=1;
-    public $pos = false;
-    public $ticks_label = array();
-
-    protected $weight=1;
-    protected $color=array(0,0,0),$label_color=array(0,0,0);
-    protected $ticks_label_colors=null;
-    protected $show_first_label=true,$show_last_label=true;
-    protected $label_step=1; // Used by a text axis to specify what multiple of major steps
-    // should be labeled.
-    protected $labelPos=0;   // Which side of the axis should the labels be?
-    protected $title_adjust,$title_margin,$title_side=SIDE_LEFT;
-    protected $tick_label_margin=5;
-    protected $label_halign = '',$label_valign = '', $label_para_align='left';
-    protected $hide_line=false;
-    protected $iDeltaAbsPos=0;
-
-    function __construct($img,$aScale,$color = array(0,0,0)) {
-        $this->img = $img;
-        $this->scale = $aScale;
-        $this->color = $color;
-        $this->title=new Text('');
-
-        if( $aScale->type == 'y' ) {
-            $this->title_margin = 25;
-            $this->title_adjust = 'middle';
-            $this->title->SetOrientation(90);
-            $this->tick_label_margin=7;
-            $this->labelPos=SIDE_LEFT;
-        }
-        else {
-            $this->title_margin = 5;
-            $this->title_adjust = 'high';
-            $this->title->SetOrientation(0);
-            $this->tick_label_margin=5;
-            $this->labelPos=SIDE_DOWN;
-            $this->title_side=SIDE_DOWN;
-        }
-    }
-
-    function SetLabelFormat($aFormStr) {
-        $this->scale->ticks->SetLabelFormat($aFormStr);
-    }
-
-    function SetLabelFormatString($aFormStr,$aDate=false) {
-        $this->scale->ticks->SetLabelFormat($aFormStr,$aDate);
-    }
-
-    function SetLabelFormatCallback($aFuncName) {
-        $this->scale->ticks->SetFormatCallback($aFuncName);
-    }
-
-    function SetLabelAlign($aHAlign,$aVAlign='top',$aParagraphAlign='left') {
-        $this->label_halign = $aHAlign;
-        $this->label_valign = $aVAlign;
-        $this->label_para_align = $aParagraphAlign;
-    }
-
-    // Don't display the first label
-    function HideFirstTickLabel($aShow=false) {
-        $this->show_first_label=$aShow;
-    }
-
-    function HideLastTickLabel($aShow=false) {
-        $this->show_last_label=$aShow;
-    }
-
-    // Manually specify the major and (optional) minor tick position and labels
-    function SetTickPositions($aMajPos,$aMinPos=NULL,$aLabels=NULL) {
-        $this->scale->ticks->SetTickPositions($aMajPos,$aMinPos,$aLabels);
-    }
-
-    // Manually specify major tick positions and optional labels
-    function SetMajTickPositions($aMajPos,$aLabels=NULL) {
-        $this->scale->ticks->SetTickPositions($aMajPos,NULL,$aLabels);
-    }
-
-    // Hide minor or major tick marks
-    function HideTicks($aHideMinor=true,$aHideMajor=true) {
-        $this->scale->ticks->SupressMinorTickMarks($aHideMinor);
-        $this->scale->ticks->SupressTickMarks($aHideMajor);
-    }
-
-    // Hide zero label
-    function HideZeroLabel($aFlag=true) {
-        $this->scale->ticks->SupressZeroLabel();
-    }
-
-    function HideFirstLastLabel() {
-        // The two first calls to ticks method will supress
-        // automatically generated scale values. However, that
-        // will not affect manually specified value, e.g text-scales.
-        // therefor we also make a kludge here to supress manually
-        // specified scale labels.
-        $this->scale->ticks->SupressLast();
-        $this->scale->ticks->SupressFirst();
-        $this->show_first_label = false;
-        $this->show_last_label = false;
-    }
-
-    // Hide the axis
-    function Hide($aHide=true) {
-        $this->hide=$aHide;
-    }
-
-    // Hide the actual axis-line, but still print the labels
-    function HideLine($aHide=true) {
-        $this->hide_line = $aHide;
-    }
-
-    function HideLabels($aHide=true) {
-        $this->hide_labels = $aHide;
-    }
-
-    // Weight of axis
-    function SetWeight($aWeight) {
-        $this->weight = $aWeight;
-    }
-
-    // Axis color
-    function SetColor($aColor,$aLabelColor=false) {
-        $this->color = $aColor;
-        if( !$aLabelColor ) $this->label_color = $aColor;
-        else $this->label_color = $aLabelColor;
-    }
-
-    // Title on axis
-    function SetTitle($aTitle,$aAdjustAlign='high') {
-        $this->title->Set($aTitle);
-        $this->title_adjust=$aAdjustAlign;
-    }
-
-    // Specify distance from the axis
-    function SetTitleMargin($aMargin) {
-        $this->title_margin=$aMargin;
-    }
-
-    // Which side of the axis should the axis title be?
-    function SetTitleSide($aSideOfAxis) {
-        $this->title_side = $aSideOfAxis;
-    }
-
-    function SetTickSide($aDir) {
-        $this->scale->ticks->SetSide($aDir);
-    }
-
-    function SetTickSize($aMajSize,$aMinSize=3) {
-        $this->scale->ticks->SetSize($aMajSize,$aMinSize=3);
-    }
-
-    // Specify text labels for the ticks. One label for each data point
-    function SetTickLabels($aLabelArray,$aLabelColorArray=null) {
-        $this->ticks_label = $aLabelArray;
-        $this->ticks_label_colors = $aLabelColorArray;
-    }
-
-    function SetLabelMargin($aMargin) {
-        $this->tick_label_margin=$aMargin;
-    }
-
-    // Specify that every $step of the ticks should be displayed starting
-    // at $start
-    function SetTextTickInterval($aStep,$aStart=0) {
-        $this->scale->ticks->SetTextLabelStart($aStart);
-        $this->tick_step=$aStep;
-    }
-
-    // Specify that every $step tick mark should have a label
-    // should be displayed starting
-    function SetTextLabelInterval($aStep) {
-        if( $aStep < 1 ) {
-            JpGraphError::RaiseL(25058);//(" Text label interval must be specified >= 1.");
-        }
-        $this->label_step=$aStep;
-    }
-
-    function SetLabelSide($aSidePos) {
-        $this->labelPos=$aSidePos;
-    }
-
-    // Set the font
-    function SetFont($aFamily,$aStyle=FS_NORMAL,$aSize=10) {
-        $this->font_family = $aFamily;
-        $this->font_style = $aStyle;
-        $this->font_size = $aSize;
-    }
-
-    // Position for axis line on the "other" scale
-    function SetPos($aPosOnOtherScale) {
-        $this->pos=$aPosOnOtherScale;
-    }
-
-    // Set the position of the axis to be X-pixels delta to the right
-    // of the max X-position (used to position the multiple Y-axis)
-    function SetPosAbsDelta($aDelta) {
-        $this->iDeltaAbsPos=$aDelta;
-    }
-
-    // Specify the angle for the tick labels
-    function SetLabelAngle($aAngle) {
-        $this->label_angle = $aAngle;
-    }
-
-} // Class
-
-
-//===================================================
-// CLASS Axis
-// Description: Defines X and Y axis. Notes that at the
-// moment the code is not really good since the axis on
-// several occasion must know wheter it's an X or Y axis.
-// This was a design decision to make the code easier to
-// follow.
-//===================================================
-class Axis extends AxisPrototype {
-
-    function __construct($img,$aScale,$color='black') {
-        parent::__construct($img,$aScale,$color);
-    }
-
-    // Stroke the axis.
-    function Stroke($aOtherAxisScale,$aStrokeLabels=true) {
-        if( $this->hide )
-            return;
-        if( is_numeric($this->pos) ) {
-            $pos=$aOtherAxisScale->Translate($this->pos);
-        }
-        else { // Default to minimum of other scale if pos not set
-            if( ($aOtherAxisScale->GetMinVal() >= 0 && $this->pos==false) || $this->pos == 'min' ) {
-                $pos = $aOtherAxisScale->scale_abs[0];
-            }
-            elseif($this->pos == "max") {
-                $pos = $aOtherAxisScale->scale_abs[1];
-            }
-            else { // If negative set x-axis at 0
-                $this->pos=0;
-                $pos=$aOtherAxisScale->Translate(0);
-            }
-        }
-
-        $pos += $this->iDeltaAbsPos;
-        $this->img->SetLineWeight($this->weight);
-        $this->img->SetColor($this->color);
-        $this->img->SetFont($this->font_family,$this->font_style,$this->font_size);
-
-        if( $this->scale->type == "x" ) {
-            if( !$this->hide_line ) {
-                // Stroke X-axis
-                $this->img->FilledRectangle(
-                    $this->img->left_margin,
-                    $pos,
-                    $this->img->width - $this->img->right_margin,
-                    $pos + $this->weight-1
-                );
-            }
-            if( $this->title_side == SIDE_DOWN ) {
-                $y = $pos + $this->img->GetFontHeight() + $this->title_margin + $this->title->margin;
-                $yalign = 'top';
-            }
-            else {
-                $y = $pos - $this->img->GetFontHeight() - $this->title_margin - $this->title->margin;
-                $yalign = 'bottom';
-            }
-
-            if( $this->title_adjust=='high' ) {
-                $this->title->SetPos($this->img->width-$this->img->right_margin,$y,'right',$yalign);
-            }
-            elseif( $this->title_adjust=='middle' || $this->title_adjust=='center' ) {
-                $this->title->SetPos(($this->img->width-$this->img->left_margin-$this->img->right_margin)/2+$this->img->left_margin,$y,'center',$yalign);
-            }
-            elseif($this->title_adjust=='low') {
-                $this->title->SetPos($this->img->left_margin,$y,'left',$yalign);
-            }
-            else {
-                JpGraphError::RaiseL(25060,$this->title_adjust);//('Unknown alignment specified for X-axis title. ('.$this->title_adjust.')');
-            }
-        }
-        elseif( $this->scale->type == "y" ) {
-            // Add line weight to the height of the axis since
-            // the x-axis could have a width>1 and we want the axis to fit nicely together.
-            if( !$this->hide_line ) {
-                // Stroke Y-axis
-                $this->img->FilledRectangle(
-                    $pos - $this->weight + 1, 
-                    $this->img->top_margin,
-                    $pos,
-                    $this->img->height - $this->img->bottom_margin + $this->weight - 1
-                );
-            }
-
-            $x=$pos ;
-            if( $this->title_side == SIDE_LEFT ) {
-                $x -= $this->title_margin;
-                $x -= $this->title->margin;
-                $halign = 'right';
-            }
-            else {
-                $x += $this->title_margin;
-                $x += $this->title->margin;
-                $halign = 'left';
-            }
-            // If the user has manually specified an hor. align
-            // then we override the automatic settings with this
-            // specifed setting. Since default is 'left' we compare
-            // with that. (This means a manually set 'left' align
-            // will have no effect.)
-            if( $this->title->halign != 'left' ) {
-                $halign = $this->title->halign;
-            }
-            if( $this->title_adjust == 'high' ) {
-                $this->title->SetPos($x,$this->img->top_margin,$halign,'top');
-            }
-            elseif($this->title_adjust=='middle' || $this->title_adjust=='center') {
-                $this->title->SetPos($x,($this->img->height-$this->img->top_margin-$this->img->bottom_margin)/2+$this->img->top_margin,$halign,"center");
-            }
-            elseif($this->title_adjust=='low') {
-                $this->title->SetPos($x,$this->img->height-$this->img->bottom_margin,$halign,'bottom');
-            }
-            else {
-                JpGraphError::RaiseL(25061,$this->title_adjust);//('Unknown alignment specified for Y-axis title. ('.$this->title_adjust.')');
-            }
-        }
-        $this->scale->ticks->Stroke($this->img,$this->scale,$pos);
-        if( $aStrokeLabels ) {
-            if( !$this->hide_labels ) {
-                $this->StrokeLabels($pos);
-            }
-            $this->title->Stroke($this->img);
-        }
-    }
-
-    //---------------
-    // PRIVATE METHODS
-    // Draw all the tick labels on major tick marks
-    function StrokeLabels($aPos,$aMinor=false,$aAbsLabel=false) {
-
-        if( is_array($this->label_color) && count($this->label_color) > 3 ) {
-            $this->ticks_label_colors = $this->label_color;
-            $this->img->SetColor($this->label_color[0]);
-        }
-        else {
-            $this->img->SetColor($this->label_color);
-        }
-        $this->img->SetFont($this->font_family,$this->font_style,$this->font_size);
-        $yoff=$this->img->GetFontHeight()/2;
-
-        // Only draw labels at major tick marks
-        $nbr = count($this->scale->ticks->maj_ticks_label);
-
-        // We have the option to not-display the very first mark
-        // (Usefull when the first label might interfere with another
-        // axis.)
-        $i = $this->show_first_label ? 0 : 1 ;
-        if( !$this->show_last_label ) {
-            --$nbr;
-        }
-        // Now run through all labels making sure we don't overshoot the end
-        // of the scale.
-        $ncolor=0;
-        if( isset($this->ticks_label_colors) ) {
-            $ncolor=count($this->ticks_label_colors);
-        }
-        while( $i < $nbr ) {
-            // $tpos holds the absolute text position for the label
-            $tpos=$this->scale->ticks->maj_ticklabels_pos[$i];
-
-            // Note. the $limit is only used for the x axis since we
-            // might otherwise overshoot if the scale has been centered
-            // This is due to us "loosing" the last tick mark if we center.
-            if( $this->scale->type == 'x' && $tpos > $this->img->width-$this->img->right_margin+1 ) {
-                return;
-            }
-            // we only draw every $label_step label
-            if( ($i % $this->label_step)==0 ) {
-
-                // Set specific label color if specified
-                if( $ncolor > 0 ) {
-                    $this->img->SetColor($this->ticks_label_colors[$i % $ncolor]);
-                }
-
-                // If the label has been specified use that and in other case
-                // just label the mark with the actual scale value
-                $m=$this->scale->ticks->GetMajor();
-
-                // ticks_label has an entry for each data point and is the array
-                // that holds the labels set by the user. If the user hasn't
-                // specified any values we use whats in the automatically asigned
-                // labels in the maj_ticks_label
-                if( isset($this->ticks_label[$i*$m]) ) {
-                    $label=$this->ticks_label[$i*$m];
-                }
-                else {
-                    if( $aAbsLabel ) {
-                        $label=abs($this->scale->ticks->maj_ticks_label[$i]);
-                    }
-                    else {
-                        $label=$this->scale->ticks->maj_ticks_label[$i];
-                    }
-
-                    // We number the scale from 1 and not from 0 so increase by one
-                    if( $this->scale->textscale && 
-                        $this->scale->ticks->label_formfunc == '' &&
-                        ! $this->scale->ticks->HaveManualLabels() ) {
-
-                        ++$label;
-                        
-                    }
-                }
-
-                if( $this->scale->type == "x" ) {
-                    if( $this->labelPos == SIDE_DOWN ) {
-                        if( $this->label_angle==0 || $this->label_angle==90 ) {
-                            if( $this->label_halign=='' && $this->label_valign=='') {
-                                $this->img->SetTextAlign('center','top');
-                            }
-                            else {
-                                $this->img->SetTextAlign($this->label_halign,$this->label_valign);
-                            }
-
-                        }
-                        else {
-                            if( $this->label_halign=='' && $this->label_valign=='') {
-                                $this->img->SetTextAlign("right","top");
-                            }
-                            else {
-                                $this->img->SetTextAlign($this->label_halign,$this->label_valign);
-                            }
-                        }
-                        $this->img->StrokeText($tpos,$aPos+$this->tick_label_margin,$label,
-                        $this->label_angle,$this->label_para_align);
-                    }
-                    else {
-                        if( $this->label_angle==0 || $this->label_angle==90 ) {
-                            if( $this->label_halign=='' && $this->label_valign=='') {
-                                $this->img->SetTextAlign("center","bottom");
-                            }
-                            else {
-                                $this->img->SetTextAlign($this->label_halign,$this->label_valign);
-                            }
-                        }
-                        else {
-                            if( $this->label_halign=='' && $this->label_valign=='') {
-                                $this->img->SetTextAlign("right","bottom");
-                            }
-                            else {
-                                $this->img->SetTextAlign($this->label_halign,$this->label_valign);
-                            }
-                        }
-                        $this->img->StrokeText($tpos,$aPos-$this->tick_label_margin-1,$label,
-                        $this->label_angle,$this->label_para_align);
-                    }
-                }
-                else {
-                    // scale->type == "y"
-                    //if( $this->label_angle!=0 )
-                    //JpGraphError::Raise(" Labels at an angle are not supported on Y-axis");
-                    if( $this->labelPos == SIDE_LEFT ) { // To the left of y-axis
-                        if( $this->label_halign=='' && $this->label_valign=='') {
-                            $this->img->SetTextAlign("right","center");
-                        }
-                        else {
-                            $this->img->SetTextAlign($this->label_halign,$this->label_valign);
-                        }
-                        $this->img->StrokeText($aPos-$this->tick_label_margin,$tpos,$label,$this->label_angle,$this->label_para_align);
-                    }
-                    else { // To the right of the y-axis
-                        if( $this->label_halign=='' && $this->label_valign=='') {
-                            $this->img->SetTextAlign("left","center");
-                        }
-                        else {
-                            $this->img->SetTextAlign($this->label_halign,$this->label_valign);
-                        }
-                        $this->img->StrokeText($aPos+$this->tick_label_margin,$tpos,$label,$this->label_angle,$this->label_para_align);
-                    }
-                }
-            }
-            ++$i;
-        }
-    }
-
-}
-
-
-//===================================================
-// CLASS Ticks
-// Description: Abstract base class for drawing linear and logarithmic
-// tick marks on axis
-//===================================================
-class Ticks {
-    public $label_formatstr='';   // C-style format string to use for labels
-    public $label_formfunc='';
-    public $label_dateformatstr='';
-    public $direction=1; // Should ticks be in(=1) the plot area or outside (=-1)
-    public $supress_last=false,$supress_tickmarks=false,$supress_minor_tickmarks=false;
-    public $maj_ticks_pos = array(), $maj_ticklabels_pos = array(),
-           $ticks_pos = array(), $maj_ticks_label = array();
-    public $precision;
-
-    protected $minor_abs_size=3, $major_abs_size=5;
-    protected $scale;
-    protected $is_set=false;
-    protected $supress_zerolabel=false,$supress_first=false;
-    protected $mincolor='',$majcolor='';
-    protected $weight=1;
-    protected $label_usedateformat=FALSE;
-
-    function __construct($aScale) {
-        $this->scale=$aScale;
-        $this->precision = -1;
-    }
-
-    // Set format string for automatic labels
-    function SetLabelFormat($aFormatString,$aDate=FALSE) {
-        $this->label_formatstr=$aFormatString;
-        $this->label_usedateformat=$aDate;
-    }
-
-    function SetLabelDateFormat($aFormatString) {
-        $this->label_dateformatstr=$aFormatString;
-    }
-
-    function SetFormatCallback($aCallbackFuncName) {
-        $this->label_formfunc = $aCallbackFuncName;
-    }
-
-    // Don't display the first zero label
-    function SupressZeroLabel($aFlag=true) {
-        $this->supress_zerolabel=$aFlag;
-    }
-
-    // Don't display minor tick marks
-    function SupressMinorTickMarks($aHide=true) {
-        $this->supress_minor_tickmarks=$aHide;
-    }
-
-    // Don't display major tick marks
-    function SupressTickMarks($aHide=true) {
-        $this->supress_tickmarks=$aHide;
-    }
-
-    // Hide the first tick mark
-    function SupressFirst($aHide=true) {
-        $this->supress_first=$aHide;
-    }
-
-    // Hide the last tick mark
-    function SupressLast($aHide=true) {
-        $this->supress_last=$aHide;
-    }
-
-    // Size (in pixels) of minor tick marks
-    function GetMinTickAbsSize() {
-        return $this->minor_abs_size;
-    }
-
-    // Size (in pixels) of major tick marks
-    function GetMajTickAbsSize() {
-        return $this->major_abs_size;
-    }
-
-    function SetSize($aMajSize,$aMinSize=3) {
-        $this->major_abs_size = $aMajSize;
-        $this->minor_abs_size = $aMinSize;
-    }
-
-    // Have the ticks been specified
-    function IsSpecified() {
-        return $this->is_set;
-    }
-
-    function SetSide($aSide) {
-        $this->direction=$aSide;
-    }
-
-    // Which side of the axis should the ticks be on
-    function SetDirection($aSide=SIDE_RIGHT) {
-        $this->direction=$aSide;
-    }
-
-    // Set colors for major and minor tick marks
-    function SetMarkColor($aMajorColor,$aMinorColor='') {
-        $this->SetColor($aMajorColor,$aMinorColor);
-    }
-
-    function SetColor($aMajorColor,$aMinorColor='') {
-        $this->majcolor=$aMajorColor;
-
-        // If not specified use same as major
-        if( $aMinorColor == '' ) {
-            $this->mincolor=$aMajorColor;
-        }
-        else {
-            $this->mincolor=$aMinorColor;
-        }
-    }
-
-    function SetWeight($aWeight) {
-        $this->weight=$aWeight;
-    }
-
-} // Class
-
-//===================================================
-// CLASS LinearTicks
-// Description: Draw linear ticks on axis
-//===================================================
-class LinearTicks extends Ticks {
-    public $minor_step=1, $major_step=2;
-    public $xlabel_offset=0,$xtick_offset=0;
-    private $label_offset=0; // What offset should the displayed label have
-    // i.e should we display 0,1,2 or 1,2,3,4 or 2,3,4 etc
-    private $text_label_start=0;
-    private $iManualTickPos = NULL, $iManualMinTickPos = NULL, $iManualTickLabels = NULL;
-    private $iAdjustForDST = false; // If a date falls within the DST period add one hour to the diaplyed time
-
-    function __construct() {
-        $this->precision = -1;
-    }
-
-    // Return major step size in world coordinates
-    function GetMajor() {
-        return $this->major_step;
-    }
-
-    // Return minor step size in world coordinates
-    function GetMinor() {
-        return $this->minor_step;
-    }
-
-    // Set Minor and Major ticks (in world coordinates)
-    function Set($aMajStep,$aMinStep=false) {
-        if( $aMinStep==false ) {
-            $aMinStep=$aMajStep;
-        }
-
-        if( $aMajStep <= 0 || $aMinStep <= 0 ) {
-            JpGraphError::RaiseL(25064);
-            //(" Minor or major step size is 0. Check that you haven't got an accidental SetTextTicks(0) in your code. If this is not the case you might have stumbled upon a bug in JpGraph. Please report this and if possible include the data that caused the problem.");
-        }
-
-        $this->major_step=$aMajStep;
-        $this->minor_step=$aMinStep;
-        $this->is_set = true;
-    }
-
-    function SetMajTickPositions($aMajPos,$aLabels=NULL) {
-        $this->SetTickPositions($aMajPos,NULL,$aLabels);
-    }
-
-    function SetTickPositions($aMajPos,$aMinPos=NULL,$aLabels=NULL) {
-        if( !is_array($aMajPos) || ($aMinPos!==NULL && !is_array($aMinPos)) ) {
-            JpGraphError::RaiseL(25065);//('Tick positions must be specifued as an array()');
-            return;
-        }
-        $n=count($aMajPos);
-        if( is_array($aLabels) && (count($aLabels) != $n) ) {
-            JpGraphError::RaiseL(25066);//('When manually specifying tick positions and labels the number of labels must be the same as the number of specified ticks.');
-        }
-        $this->iManualTickPos = $aMajPos;
-        $this->iManualMinTickPos = $aMinPos;
-        $this->iManualTickLabels = $aLabels;
-    }
-
-    function HaveManualLabels() {
-        return count($this->iManualTickLabels) > 0;
-    }
-
-    // Specify all the tick positions manually and possible also the exact labels
-    function _doManualTickPos($aScale) {
-        $n=count($this->iManualTickPos);
-        $m=count($this->iManualMinTickPos);
-        $doLbl=count($this->iManualTickLabels) > 0;
-
-        $this->maj_ticks_pos = array();
-        $this->maj_ticklabels_pos = array();
-        $this->ticks_pos = array();
-
-        // Now loop through the supplied positions and translate them to screen coordinates
-        // and store them in the maj_label_positions
-        $minScale = $aScale->scale[0];
-        $maxScale = $aScale->scale[1];
-        $j=0;
-        for($i=0; $i < $n ; ++$i ) {
-            // First make sure that the first tick is not lower than the lower scale value
-            if( !isset($this->iManualTickPos[$i]) || $this->iManualTickPos[$i] < $minScale  || $this->iManualTickPos[$i] > $maxScale) {
-                continue;
-            }
-
-            $this->maj_ticks_pos[$j] = $aScale->Translate($this->iManualTickPos[$i]);
-            $this->maj_ticklabels_pos[$j] = $this->maj_ticks_pos[$j];
-
-            // Set the minor tick marks the same as major if not specified
-            if( $m <= 0 ) {
-                $this->ticks_pos[$j] = $this->maj_ticks_pos[$j];
-            }
-            if( $doLbl ) {
-                $this->maj_ticks_label[$j] = $this->iManualTickLabels[$i];
-            }
-            else {
-                $this->maj_ticks_label[$j]=$this->_doLabelFormat($this->iManualTickPos[$i],$i,$n);
-            }
-            ++$j;
-        }
-
-        // Some sanity check
-        if( count($this->maj_ticks_pos) < 2 ) {
-            JpGraphError::RaiseL(25067);//('Your manually specified scale and ticks is not correct. The scale seems to be too small to hold any of the specified tickl marks.');
-        }
-
-        // Setup the minor tick marks
-        $j=0;
-        for($i=0; $i < $m; ++$i ) {
-            if(  empty($this->iManualMinTickPos[$i]) || $this->iManualMinTickPos[$i] < $minScale  || $this->iManualMinTickPos[$i] > $maxScale) {
-                continue;
-            }
-            $this->ticks_pos[$j] = $aScale->Translate($this->iManualMinTickPos[$i]);
-            ++$j;
-        }
-    }
-
-    function _doAutoTickPos($aScale) {
-        $maj_step_abs = $aScale->scale_factor*$this->major_step;
-        $min_step_abs = $aScale->scale_factor*$this->minor_step;
-
-        if( $min_step_abs==0 || $maj_step_abs==0 ) {
-            JpGraphError::RaiseL(25068);//("A plot has an illegal scale. This could for example be that you are trying to use text autoscaling to draw a line plot with only one point or that the plot area is too small. It could also be that no input data value is numeric (perhaps only '-' or 'x')");
-        }
-        // We need to make this an int since comparing it below
-        // with the result from round() can give wrong result, such that
-        // (40 < 40) == TRUE !!!
-        $limit = (int)$aScale->scale_abs[1];
-
-        if( $aScale->textscale ) {
-            // This can only be true for a X-scale (horizontal)
-            // Define ticks for a text scale. This is slightly different from a
-            // normal linear type of scale since the position might be adjusted
-            // and the labels start at on
-            $label = (float)$aScale->GetMinVal()+$this->text_label_start+$this->label_offset;
-            $start_abs=$aScale->scale_factor*$this->text_label_start;
-            $nbrmajticks=round(($aScale->GetMaxVal()-$aScale->GetMinVal()-$this->text_label_start )/$this->major_step)+1;
-
-            $x = $aScale->scale_abs[0]+$start_abs+$this->xlabel_offset*$min_step_abs;
-            for( $i=0; $label <= $aScale->GetMaxVal()+$this->label_offset; ++$i ) {
-                // Apply format to label
-                $this->maj_ticks_label[$i]=$this->_doLabelFormat($label,$i,$nbrmajticks);
-                $label+=$this->major_step;
-
-                // The x-position of the tick marks can be different from the labels.
-                // Note that we record the tick position (not the label) so that the grid
-                // happen upon tick marks and not labels.
-                $xtick=$aScale->scale_abs[0]+$start_abs+$this->xtick_offset*$min_step_abs+$i*$maj_step_abs;
-                $this->maj_ticks_pos[$i]=$xtick;
-                $this->maj_ticklabels_pos[$i] = round($x);
-                $x += $maj_step_abs;
-            }
-        }
-        else {
-            $label = $aScale->GetMinVal();
-            $abs_pos = $aScale->scale_abs[0];
-            $j=0; $i=0;
-            $step = round($maj_step_abs/$min_step_abs);
-            if( $aScale->type == "x" ) {
-                // For a normal linear type of scale the major ticks will always be multiples
-                // of the minor ticks. In order to avoid any rounding issues the major ticks are
-                // defined as every "step" minor ticks and not calculated separately
-                $nbrmajticks=round(($aScale->GetMaxVal()-$aScale->GetMinVal()-$this->text_label_start )/$this->major_step)+1;
-                while( round($abs_pos) <= $limit ) {
-                    $this->ticks_pos[] = round($abs_pos);
-                    $this->ticks_label[] = $label;
-                    if( $step== 0 || $i % $step == 0 && $j < $nbrmajticks ) {
-                        $this->maj_ticks_pos[$j] = round($abs_pos);
-                        $this->maj_ticklabels_pos[$j] = round($abs_pos);
-                        $this->maj_ticks_label[$j]=$this->_doLabelFormat($label,$j,$nbrmajticks);
-                        ++$j;
-                    }
-                    ++$i;
-                    $abs_pos += $min_step_abs;
-                    $label+=$this->minor_step;
-                }
-            }
-            elseif( $aScale->type == "y" ) {
-                //@todo  s=2:20,12  s=1:50,6  $this->major_step:$nbr
-                // abs_point,limit s=1:270,80 s=2:540,160
-             // $this->major_step = 50;
-                $nbrmajticks=round(($aScale->GetMaxVal()-$aScale->GetMinVal())/$this->major_step)+1;
-//                $step = 5;
-                while( round($abs_pos) >= $limit ) {
-                    $this->ticks_pos[$i] = round($abs_pos);
-                    $this->ticks_label[$i]=$label;
-                    if( $step== 0 || $i % $step == 0 && $j < $nbrmajticks) {
-                        $this->maj_ticks_pos[$j] = round($abs_pos);
-                        $this->maj_ticklabels_pos[$j] = round($abs_pos);
-                        $this->maj_ticks_label[$j]=$this->_doLabelFormat($label,$j,$nbrmajticks);
-                        ++$j;
-                    }
-                    ++$i;
-                    $abs_pos += $min_step_abs;
-                    $label += $this->minor_step;
-                }
-            }
-        }
-    }
-
-    function AdjustForDST($aFlg=true) {
-        $this->iAdjustForDST = $aFlg;
-    }
-
-
-    function _doLabelFormat($aVal,$aIdx,$aNbrTicks) {
-
-        // If precision hasn't been specified set it to a sensible value
-        if( $this->precision==-1 ) {
-            $t = log10($this->minor_step);
-            if( $t > 0 || $t === 0.0) {
-                $precision = 0;
-            }
-            else {
-                $precision = -floor($t);
-            }
-        }
-        else {
-            $precision = $this->precision;
-        }
-
-        if( $this->label_formfunc != '' ) {
-            $f=$this->label_formfunc;
-            if( $this->label_formatstr == '' ) {
-                $l = call_user_func($f,$aVal);
-            }
-            else {
-                $l = sprintf($this->label_formatstr, call_user_func($f,$aVal));
-            }
-        }
-        elseif( $this->label_formatstr != '' || $this->label_dateformatstr != '' ) {
-            if( $this->label_usedateformat ) {
-                // Adjust the value to take daylight savings into account
-                if (date("I",$aVal)==1 && $this->iAdjustForDST ) {
-                    // DST
-                    $aVal+=3600;
-                }
-
-                $l = date($this->label_formatstr,$aVal);
-                if( $this->label_formatstr == 'W' ) {
-                    // If we use week formatting then add a single 'w' in front of the
-                    // week number to differentiate it from dates
-                    $l = 'w'.$l;
-                }
-            }
-            else {
-                if( $this->label_dateformatstr !== '' ) {
-                    // Adjust the value to take daylight savings into account
-                    if (date("I",$aVal)==1 && $this->iAdjustForDST ) {
-                        // DST
-                        $aVal+=3600;
-                    }
-
-                    $l = date($this->label_dateformatstr,$aVal);
-                    if( $this->label_formatstr == 'W' ) {
-                        // If we use week formatting then add a single 'w' in front of the
-                        // week number to differentiate it from dates
-                        $l = 'w'.$l;
-                    }
-                }
-                else {
-                    $l = sprintf($this->label_formatstr,$aVal);
-                }
-            }
-        }
-        else {
-            $l = sprintf('%01.'.$precision.'f',round($aVal,$precision));
-        }
-
-        if( ($this->supress_zerolabel && $l==0) ||  ($this->supress_first && $aIdx==0) || ($this->supress_last  && $aIdx==$aNbrTicks-1) ) {
-            $l='';
-        }
-        return $l;
-    }
-
-    // Stroke ticks on either X or Y axis
-    function _StrokeTicks($aImg,$aScale,$aPos) {
-        $hor = $aScale->type == 'x';
-        $aImg->SetLineWeight($this->weight);
-
-        // We need to make this an int since comparing it below
-        // with the result from round() can give wrong result, such that
-        // (40 < 40) == TRUE !!!
-        $limit = (int)$aScale->scale_abs[1];
-
-        // A text scale doesn't have any minor ticks
-        if( !$aScale->textscale ) {
-            // Stroke minor ticks
-            $yu = $aPos - $this->direction*$this->GetMinTickAbsSize();
-            $xr = $aPos + $this->direction*$this->GetMinTickAbsSize();
-            $n = count($this->ticks_pos);
-            for($i=0; $i < $n; ++$i ) {
-                if( !$this->supress_tickmarks && !$this->supress_minor_tickmarks) {
-                    if( $this->mincolor != '') {
-                        $aImg->PushColor($this->mincolor);
-                    }
-                    if( $hor ) {
-                        //if( $this->ticks_pos[$i] <= $limit )
-                        $aImg->Line($this->ticks_pos[$i],$aPos,$this->ticks_pos[$i],$yu);
-                    }
-                    else {
-                        //if( $this->ticks_pos[$i] >= $limit )
-                        $aImg->Line($aPos,$this->ticks_pos[$i],$xr,$this->ticks_pos[$i]);
-                    }
-                    if( $this->mincolor != '' ) {
-                        $aImg->PopColor();
-                    }
-                }
-            }
-        }
-
-        // Stroke major ticks
-        $yu = $aPos - $this->direction*$this->GetMajTickAbsSize();
-        $xr = $aPos + $this->direction*$this->GetMajTickAbsSize();
-        $nbrmajticks=round(($aScale->GetMaxVal()-$aScale->GetMinVal()-$this->text_label_start )/$this->major_step)+1;
-        $n = count($this->maj_ticks_pos);
-        for($i=0; $i < $n ; ++$i ) {
-            if(!($this->xtick_offset > 0 && $i==$nbrmajticks-1) && !$this->supress_tickmarks) {
-                if( $this->majcolor != '') {
-                    $aImg->PushColor($this->majcolor);
-                }
-                if( $hor ) {
-                    //if( $this->maj_ticks_pos[$i] <= $limit )
-                    $aImg->Line($this->maj_ticks_pos[$i],$aPos,$this->maj_ticks_pos[$i],$yu);
-                }
-                else {
-                    //if( $this->maj_ticks_pos[$i] >= $limit )
-                    $aImg->Line($aPos,$this->maj_ticks_pos[$i],$xr,$this->maj_ticks_pos[$i]);
-                }
-                if( $this->majcolor != '') {
-                    $aImg->PopColor();
-                }
-            }
-        }
-
-    }
-
-    // Draw linear ticks
-    function Stroke($aImg,$aScale,$aPos) {
-        if( $this->iManualTickPos != NULL ) {
-            $this->_doManualTickPos($aScale);
-        }
-        else {
-            $this->_doAutoTickPos($aScale);
-        }
-        $this->_StrokeTicks($aImg,$aScale,$aPos, $aScale->type == 'x' );
-    }
-
-    //---------------
-    // PRIVATE METHODS
-    // Spoecify the offset of the displayed tick mark with the tick "space"
-    // Legal values for $o is [0,1] used to adjust where the tick marks and label
-    // should be positioned within the major tick-size
-    // $lo specifies the label offset and $to specifies the tick offset
-    // this comes in handy for example in bar graphs where we wont no offset for the
-    // tick but have the labels displayed halfway under the bars.
-    function SetXLabelOffset($aLabelOff,$aTickOff=-1) {
-        $this->xlabel_offset=$aLabelOff;
-        if( $aTickOff==-1 ) {
-            // Same as label offset
-            $this->xtick_offset=$aLabelOff;
-        }
-        else {
-            $this->xtick_offset=$aTickOff;
-        }
-        if( $aLabelOff>0 ) {
-            $this->SupressLast(); // The last tick wont fit
-        }
-    }
-
-    // Which tick label should we start with?
-    function SetTextLabelStart($aTextLabelOff) {
-        $this->text_label_start=$aTextLabelOff;
-    }
-
-} // Class
-
-//===================================================
-// CLASS LinearScale
-// Description: Handle linear scaling between screen and world
-//===================================================
-class LinearScale {
-    public $textscale=false; // Just a flag to let the Plot class find out if
-    // we are a textscale or not. This is a cludge since
-    // this information is available in Graph::axtype but
-    // we don't have access to the graph object in the Plots
-    // stroke method. So we let graph store the status here
-    // when the linear scale is created. A real cludge...
-    public $type; // is this x or y scale ?
-    public $ticks=null; // Store ticks
-    public $text_scale_off = 0;
-    public $scale_abs=array(0,0);
-    public $scale_factor; // Scale factor between world and screen
-    public $off; // Offset between image edge and plot area
-    public $scale=array(0,0);
-    public $name = 'lin';
-    public $auto_ticks=false; // When using manual scale should the ticks be automatically set?
-    public $world_abs_size; // Plot area size in pixels (Needed public in jpgraph_radar.php)
-    public $intscale=false; // Restrict autoscale to integers
-    protected $autoscale_min=false; // Forced minimum value, auto determine max
-    protected $autoscale_max=false; // Forced maximum value, auto determine min
-    private $gracetop=0,$gracebottom=0;
-
-    private $_world_size; // Plot area size in world coordinates
-
-    function __construct($aMin=0,$aMax=0,$aType='y') {
-        assert($aType=='x' || $aType=='y' );
-        assert($aMin<=$aMax);
-
-        $this->type=$aType;
-        $this->scale=array($aMin,$aMax);
-        $this->world_size=$aMax-$aMin;
-        $this->ticks = new LinearTicks();
-    }
-
-    // Check if scale is set or if we should autoscale
-    // We should do this is either scale or ticks has not been set
-    function IsSpecified() {
-        if( $this->GetMinVal()==$this->GetMaxVal() ) {  // Scale not set
-            return false;
-        }
-        return true;
-    }
-
-    // Set the minimum data value when the autoscaling is used.
-    // Usefull if you want a fix minimum (like 0) but have an
-    // automatic maximum
-    function SetAutoMin($aMin) {
-        $this->autoscale_min=$aMin;
-    }
-
-    // Set the minimum data value when the autoscaling is used.
-    // Usefull if you want a fix minimum (like 0) but have an
-    // automatic maximum
-    function SetAutoMax($aMax) {
-        $this->autoscale_max=$aMax;
-    }
-
-    // If the user manually specifies a scale should the ticks
-    // still be set automatically?
-    function SetAutoTicks($aFlag=true) {
-        $this->auto_ticks = $aFlag;
-    }
-
-    // Specify scale "grace" value (top and bottom)
-    function SetGrace($aGraceTop,$aGraceBottom=0) {
-        if( $aGraceTop<0 || $aGraceBottom < 0  ) {
-            JpGraphError::RaiseL(25069);//(" Grace must be larger then 0");
-        }
-        $this->gracetop=$aGraceTop;
-        $this->gracebottom=$aGraceBottom;
-    }
-
-    // Get the minimum value in the scale
-    function GetMinVal() {
-        return $this->scale[0];
-    }
-
-    // get maximum value for scale
-    function GetMaxVal() {
-        return $this->scale[1];
-    }
-
-    // Specify a new min/max value for sclae
-    function Update($aImg,$aMin,$aMax) {
-        $this->scale=array($aMin,$aMax);
-        $this->world_size=$aMax-$aMin;
-        $this->InitConstants($aImg);
-    }
-
-    // Translate between world and screen
-    function Translate($aCoord) {
-        if( !is_numeric($aCoord) ) {
-            if( $aCoord != '' && $aCoord != '-' && $aCoord != 'x' ) {
-                JpGraphError::RaiseL(25070);//('Your data contains non-numeric values.');
-            }
-            return 0;
-        }
-        else {
-            return round($this->off+($aCoord - $this->scale[0]) * $this->scale_factor);
-        }
-    }
-
-    // Relative translate (don't include offset) usefull when we just want
-    // to know the relative position (in pixels) on the axis
-    function RelTranslate($aCoord) {
-        if( !is_numeric($aCoord) ) {
-            if( $aCoord != '' && $aCoord != '-' && $aCoord != 'x'  ) {
-                JpGraphError::RaiseL(25070);//('Your data contains non-numeric values.');
-            }
-            return 0;
-        }
-        else {
-            return ($aCoord - $this->scale[0]) * $this->scale_factor;
-        }
-    }
-
-    // Restrict autoscaling to only use integers
-    function SetIntScale($aIntScale=true) {
-        $this->intscale=$aIntScale;
-    }
-
-    // Calculate an integer autoscale
-    function IntAutoScale($img,$min,$max,$maxsteps,$majend=true) {
-        // Make sure limits are integers
-        $min=floor($min);
-        $max=ceil($max);
-        if( abs($min-$max)==0 ) {
-            --$min; ++$max;
-        }
-        $maxsteps = floor($maxsteps);
-
-        $gracetop=round(($this->gracetop/100.0)*abs($max-$min));
-        $gracebottom=round(($this->gracebottom/100.0)*abs($max-$min));
-        if( is_numeric($this->autoscale_min) ) {
-            $min = ceil($this->autoscale_min);
-            if( $min >= $max ) {
-                JpGraphError::RaiseL(25071);//('You have specified a min value with SetAutoMin() which is larger than the maximum value used for the scale. This is not possible.');
-            }
-        }
-
-        if( is_numeric($this->autoscale_max) ) {
-            $max = ceil($this->autoscale_max);
-            if( $min >= $max ) {
-                JpGraphError::RaiseL(25072);//('You have specified a max value with SetAutoMax() which is smaller than the miminum value used for the scale. This is not possible.');
-            }
-        }
-
-        if( abs($min-$max ) == 0 ) {
-            ++$max;
-            --$min;
-        }
-
-        $min -= $gracebottom;
-        $max += $gracetop;
-
-        // First get tickmarks as multiples of 1, 10, ...
-        if( $majend ) {
-            list($num1steps,$adj1min,$adj1max,$maj1step) = $this->IntCalcTicks($maxsteps,$min,$max,1);
-        }
-        else {
-            $adj1min = $min;
-            $adj1max = $max;
-            list($num1steps,$maj1step) = $this->IntCalcTicksFreeze($maxsteps,$min,$max,1);
-        }
-
-        if( abs($min-$max) > 2 ) {
-            // Then get tick marks as 2:s 2, 20, ...
-            if( $majend ) {
-                list($num2steps,$adj2min,$adj2max,$maj2step) = $this->IntCalcTicks($maxsteps,$min,$max,5);
-            }
-            else {
-                $adj2min = $min;
-                $adj2max = $max;
-                list($num2steps,$maj2step) = $this->IntCalcTicksFreeze($maxsteps,$min,$max,5);
-            }
-        }
-        else {
-            $num2steps = 10000; // Dummy high value so we don't choose this
-        }
-
-        if( abs($min-$max) > 5 ) {
-            // Then get tickmarks as 5:s 5, 50, 500, ...
-            if( $majend ) {
-                list($num5steps,$adj5min,$adj5max,$maj5step) = $this->IntCalcTicks($maxsteps,$min,$max,2);
-            }
-            else {
-                $adj5min = $min;
-                $adj5max = $max;
-                list($num5steps,$maj5step) = $this->IntCalcTicksFreeze($maxsteps,$min,$max,2);
-            }
-        }
-        else {
-            $num5steps = 10000; // Dummy high value so we don't choose this
-        }
-
-        // Check to see whichof 1:s, 2:s or 5:s fit better with
-        // the requested number of major ticks
-        $match1=abs($num1steps-$maxsteps);
-        $match2=abs($num2steps-$maxsteps);
-        if( !empty($maj5step) && $maj5step > 1 ) {
-            $match5=abs($num5steps-$maxsteps);
-        }
-        else {
-            $match5=10000;  // Dummy high value
-        }
-
-        // Compare these three values and see which is the closest match
-        // We use a 0.6 weight to gravitate towards multiple of 5:s
-        if( $match1 < $match2 ) {
-            if( $match1 < $match5 ) $r=1;
-            else  $r=3;
-        }
-        else {
-            if( $match2 < $match5 ) $r=2;
-            else $r=3;
-        }
-        // Minsteps are always the same as maxsteps for integer scale
-        switch( $r ) {
-            case 1:
-                $this->ticks->Set($maj1step,$maj1step);
-                $this->Update($img,$adj1min,$adj1max);
-                break;
-            case 2:
-                $this->ticks->Set($maj2step,$maj2step);
-                $this->Update($img,$adj2min,$adj2max);
-                break;
-            case 3:
-                $this->ticks->Set($maj5step,$maj5step);
-                $this->Update($img,$adj5min,$adj5max);
-                break;
-            default:
-                JpGraphError::RaiseL(25073,$r);//('Internal error. Integer scale algorithm comparison out of bound (r=$r)');
-        }
-    }
-
-
-    // Calculate autoscale. Used if user hasn't given a scale and ticks
-    // $maxsteps is the maximum number of major tickmarks allowed.
-    function AutoScale($img,$min,$max,$maxsteps,$majend=true) {
-
-        if( !is_numeric($min) || !is_numeric($max) ) {
-            JpGraphError::Raise(25044);
-        }
-
-        if( $this->intscale ) {
-            $this->IntAutoScale($img,$min,$max,$maxsteps,$majend);
-            return;
-        }
-        if( abs($min-$max) < 0.00001 ) {
-            // We need some difference to be able to autoscale
-            // make it 5% above and 5% below value
-            if( $min==0 && $max==0 ) {  // Special case
-                $min=-1; $max=1;
-            }
-            else {
-                $delta = (abs($max)+abs($min))*0.005;
-                $min -= $delta;
-                $max += $delta;
-            }
-        }
-
-        $gracetop=($this->gracetop/100.0)*abs($max-$min);
-        $gracebottom=($this->gracebottom/100.0)*abs($max-$min);
-        if( is_numeric($this->autoscale_min) ) {
-            $min = $this->autoscale_min;
-            if( $min >= $max ) {
-                JpGraphError::RaiseL(25071);//('You have specified a min value with SetAutoMin() which is larger than the maximum value used for the scale. This is not possible.');
-            }
-            if( abs($min-$max ) < 0.001 ) {
-                $max *= 1.2;
-            }
-        }
-
-        if( is_numeric($this->autoscale_max) ) {
-            $max = $this->autoscale_max;
-            if( $min >= $max ) {
-                JpGraphError::RaiseL(25072);//('You have specified a max value with SetAutoMax() which is smaller than the miminum value used for the scale. This is not possible.');
-            }
-            if( abs($min-$max ) < 0.001 ) {
-                $min *= 0.8;
-            }
-        }
-
-        $min -= $gracebottom;
-        $max += $gracetop;
-
-        // First get tickmarks as multiples of 0.1, 1, 10, ...
-        if( $majend ) {
-            list($num1steps,$adj1min,$adj1max,$min1step,$maj1step) = $this->CalcTicks($maxsteps,$min,$max,1,2);
-        }
-        else {
-            $adj1min=$min;
-            $adj1max=$max;
-            list($num1steps,$min1step,$maj1step) = $this->CalcTicksFreeze($maxsteps,$min,$max,1,2,false);
-        }
-
-        // Then get tick marks as 2:s 0.2, 2, 20, ...
-        if( $majend ) {
-            list($num2steps,$adj2min,$adj2max,$min2step,$maj2step) = $this->CalcTicks($maxsteps,$min,$max,5,2);
-        }
-        else {
-            $adj2min=$min;
-            $adj2max=$max;
-            list($num2steps,$min2step,$maj2step) = $this->CalcTicksFreeze($maxsteps,$min,$max,5,2,false);
-        }
-
-        // Then get tickmarks as 5:s 0.05, 0.5, 5, 50, ...
-        if( $majend ) {
-            list($num5steps,$adj5min,$adj5max,$min5step,$maj5step) = $this->CalcTicks($maxsteps,$min,$max,2,5);
-        }
-        else {
-            $adj5min=$min;
-            $adj5max=$max;
-            list($num5steps,$min5step,$maj5step) = $this->CalcTicksFreeze($maxsteps,$min,$max,2,5,false);
-        }
-
-        // Check to see whichof 1:s, 2:s or 5:s fit better with
-        // the requested number of major ticks
-        $match1=abs($num1steps-$maxsteps);
-        $match2=abs($num2steps-$maxsteps);
-        $match5=abs($num5steps-$maxsteps);
-
-        // Compare these three values and see which is the closest match
-        // We use a 0.8 weight to gravitate towards multiple of 5:s
-        $r=$this->MatchMin3($match1,$match2,$match5,0.8);
-        switch( $r ) {
-            case 1:
-                $this->Update($img,$adj1min,$adj1max);
-                $this->ticks->Set($maj1step,$min1step);
-                break;
-            case 2:
-                $this->Update($img,$adj2min,$adj2max);
-                $this->ticks->Set($maj2step,$min2step);
-                break;
-            case 3:
-                $this->Update($img,$adj5min,$adj5max);
-                $this->ticks->Set($maj5step,$min5step);
-                break;
-        }
-    }
-
-    //---------------
-    // PRIVATE METHODS
-
-    // This method recalculates all constants that are depending on the
-    // margins in the image. If the margins in the image are changed
-    // this method should be called for every scale that is registred with
-    // that image. Should really be installed as an observer of that image.
-    function InitConstants($img) {
-        if( $this->type=='x' ) {
-            $this->world_abs_size=$img->width - $img->left_margin - $img->right_margin;
-            $this->off=$img->left_margin;
-            $this->scale_factor = 0;
-            if( $this->world_size > 0 ) {
-                $this->scale_factor=$this->world_abs_size/($this->world_size*1.0);
-            }
-        }
-        else { // y scale
-            $this->world_abs_size=$img->height - $img->top_margin - $img->bottom_margin;
-            $this->off=$img->top_margin+$this->world_abs_size;
-            $this->scale_factor = 0;
-            if( $this->world_size > 0 ) {
-                $this->scale_factor=-$this->world_abs_size/($this->world_size*1.0);
-            }
-        }
-        $size = $this->world_size * $this->scale_factor;
-        $this->scale_abs=array($this->off,$this->off + $size);
-    }
-
-    // Initialize the conversion constants for this scale
-    // This tries to pre-calculate as much as possible to speed up the
-    // actual conversion (with Translate()) later on
-    // $start =scale start in absolute pixels (for x-scale this is an y-position
-    //     and for an y-scale this is an x-position
-    // $len   =absolute length in pixels of scale
-    function SetConstants($aStart,$aLen) {
-        $this->world_abs_size=$aLen;
-        $this->off=$aStart;
-
-        if( $this->world_size<=0 ) {
-            // This should never ever happen !!
-            JpGraphError::RaiseL(25074);
-            //("You have unfortunately stumbled upon a bug in JpGraph. It seems like the scale range is ".$this->world_size." [for ".$this->type." scale] <br> Please report Bug #01 to info@jpgraph.net and include the script that gave this error. This problem could potentially be caused by trying to use \"illegal\" values in the input data arrays (like trying to send in strings or only NULL values) which causes the autoscaling to fail.");
-        }
-
-        // scale_factor = number of pixels per world unit
-        $this->scale_factor=$this->world_abs_size/($this->world_size*1.0);
-
-        // scale_abs = start and end points of scale in absolute pixels
-        $this->scale_abs=array($this->off,$this->off+$this->world_size*$this->scale_factor);
-    }
-
-
-    // Calculate number of ticks steps with a specific division
-    // $a is the divisor of 10**x to generate the first maj tick intervall
-    // $a=1, $b=2 give major ticks with multiple of 10, ...,0.1,1,10,...
-    // $a=5, $b=2 give major ticks with multiple of 2:s ...,0.2,2,20,...
-    // $a=2, $b=5 give major ticks with multiple of 5:s ...,0.5,5,50,...
-    // We return a vector of
-    //  [$numsteps,$adjmin,$adjmax,$minstep,$majstep]
-    // If $majend==true then the first and last marks on the axis will be major
-    // labeled tick marks otherwise it will be adjusted to the closest min tick mark
-    function CalcTicks($maxsteps,$min,$max,$a,$b,$majend=true) {
-        $diff=$max-$min;
-        if( $diff==0 ) {
-            $ld=0;
-        }
-        else {
-            $ld=floor(log10($diff));
-        }
-
-        // Gravitate min towards zero if we are close
-        if( $min>0 && $min < pow(10,$ld) ) $min=0;
-
-        //$majstep=pow(10,$ld-1)/$a;
-        $majstep=pow(10,$ld)/$a;
-        $minstep=$majstep/$b;
-
-        $adjmax=ceil($max/$minstep)*$minstep;
-        $adjmin=floor($min/$minstep)*$minstep;
-        $adjdiff = $adjmax-$adjmin;
-        $numsteps=$adjdiff/$majstep;
-
-        while( $numsteps>$maxsteps ) {
-            $majstep=pow(10,$ld)/$a;
-            $numsteps=$adjdiff/$majstep;
-            ++$ld;
-        }
-
-        $minstep=$majstep/$b;
-        $adjmin=floor($min/$minstep)*$minstep;
-        $adjdiff = $adjmax-$adjmin;
-        if( $majend ) {
-            $adjmin = floor($min/$majstep)*$majstep;
-            $adjdiff = $adjmax-$adjmin;
-            $adjmax = ceil($adjdiff/$majstep)*$majstep+$adjmin;
-        }
-        else {
-            $adjmax=ceil($max/$minstep)*$minstep;
-        }
-
-        return array($numsteps,$adjmin,$adjmax,$minstep,$majstep);
-    }
-
-    function CalcTicksFreeze($maxsteps,$min,$max,$a,$b) {
-        // Same as CalcTicks but don't adjust min/max values
-        $diff=$max-$min;
-        if( $diff==0 ) {
-            $ld=0;
-        }
-        else {
-            $ld=floor(log10($diff));
-        }
-
-        //$majstep=pow(10,$ld-1)/$a;
-        $majstep=pow(10,$ld)/$a;
-        $minstep=$majstep/$b;
-        $numsteps=floor($diff/$majstep);
-
-        while( $numsteps > $maxsteps ) {
-            $majstep=pow(10,$ld)/$a;
-            $numsteps=floor($diff/$majstep);
-            ++$ld;
-        }
-        $minstep=$majstep/$b;
-        return array($numsteps,$minstep,$majstep);
-    }
-
-
-    function IntCalcTicks($maxsteps,$min,$max,$a,$majend=true) {
-        $diff=$max-$min;
-        if( $diff==0 ) {
-            JpGraphError::RaiseL(25075);//('Can\'t automatically determine ticks since min==max.');
-        }
-        else {
-            $ld=floor(log10($diff));
-        }
-
-        // Gravitate min towards zero if we are close
-        if( $min>0 && $min < pow(10,$ld) ) {
-            $min=0;
-        }
-        if( $ld == 0 ) {
-            $ld=1;
-        }
-        if( $a == 1 ) {
-            $majstep = 1;
-        }
-        else {
-            $majstep=pow(10,$ld)/$a;
-        }
-        $adjmax=ceil($max/$majstep)*$majstep;
-
-        $adjmin=floor($min/$majstep)*$majstep;
-        $adjdiff = $adjmax-$adjmin;
-        $numsteps=$adjdiff/$majstep;
-        while( $numsteps>$maxsteps ) {
-            $majstep=pow(10,$ld)/$a;
-            $numsteps=$adjdiff/$majstep;
-            ++$ld;
-        }
-
-        $adjmin=floor($min/$majstep)*$majstep;
-        $adjdiff = $adjmax-$adjmin;
-        if( $majend ) {
-            $adjmin = floor($min/$majstep)*$majstep;
-            $adjdiff = $adjmax-$adjmin;
-            $adjmax = ceil($adjdiff/$majstep)*$majstep+$adjmin;
-        }
-        else {
-            $adjmax=ceil($max/$majstep)*$majstep;
-        }
-
-        return array($numsteps,$adjmin,$adjmax,$majstep);
-    }
-
-
-    function IntCalcTicksFreeze($maxsteps,$min,$max,$a) {
-        // Same as IntCalcTick but don't change min/max values
-        $diff=$max-$min;
-        if( $diff==0 ) {
-            JpGraphError::RaiseL(25075);//('Can\'t automatically determine ticks since min==max.');
-        }
-        else {
-            $ld=floor(log10($diff));
-        }
-        if( $ld == 0 ) {
-            $ld=1;
-        }
-        if( $a == 1 ) {
-            $majstep = 1;
-        }
-        else {
-            $majstep=pow(10,$ld)/$a;
-        }
-
-        $numsteps=floor($diff/$majstep);
-        while( $numsteps > $maxsteps ) {
-            $majstep=pow(10,$ld)/$a;
-            $numsteps=floor($diff/$majstep);
-            ++$ld;
-        }
-
-        return array($numsteps,$majstep);
-    }
-
-    // Determine the minimum of three values witha  weight for last value
-    function MatchMin3($a,$b,$c,$weight) {
-        if( $a < $b ) {
-            if( $a < ($c*$weight) ) {
-                return 1; // $a smallest
-            }
-            else {
-                return 3; // $c smallest
-            }
-        }
-        elseif( $b < ($c*$weight) ) {
-            return 2; // $b smallest
-        }
-        return 3; // $c smallest
-    }
-
-    function __get($name) {
-        $variable_name = '_' . $name; 
-
-        if (isset($this->$variable_name)) {
-            return $this->$variable_name * SUPERSAMPLING_SCALE;
-        } else {
-            JpGraphError::RaiseL('25132', $name);
-        } 
-    }
-
-    function __set($name, $value) {
-        $this->{'_'.$name} = $value;
-    }
-} // Class
-
-
-//===================================================
-// CLASS DisplayValue
-// Description: Used to print data values at data points
-//===================================================
-class DisplayValue {
-    public $margin=5;
-    public $show=false;
-    public $valign='',$halign='center';
-    public $format='%.1f',$negformat='';
-    private $ff=FF_DEFAULT,$fs=FS_NORMAL,$fsize=8;
-    private $iFormCallback='';
-    private $angle=0;
-    private $color='navy',$negcolor='';
-    private $iHideZero=false;
-    public $txt=null;
-
-    function __construct() {
-                $this->txt = new Text();
-    }
-
-    function Show($aFlag=true) {
-        $this->show=$aFlag;
-    }
-
-    function SetColor($aColor,$aNegcolor='') {
-        $this->color = $aColor;
-        $this->negcolor = $aNegcolor;
-    }
-
-    function SetFont($aFontFamily,$aFontStyle=FS_NORMAL,$aFontSize=8) {
-        $this->ff=$aFontFamily;
-        $this->fs=$aFontStyle;
-        $this->fsize=$aFontSize;
-    }
-
-    function ApplyFont($aImg) {
-        $aImg->SetFont($this->ff,$this->fs,$this->fsize);
-    }
-
-    function SetMargin($aMargin) {
-        $this->margin = $aMargin;
-    }
-
-    function SetAngle($aAngle) {
-        $this->angle = $aAngle;
-    }
-
-    function SetAlign($aHAlign,$aVAlign='') {
-        $this->halign = $aHAlign;
-        $this->valign = $aVAlign;
-    }
-
-    function SetFormat($aFormat,$aNegFormat='') {
-        $this->format= $aFormat;
-        $this->negformat= $aNegFormat;
-    }
-
-    function SetFormatCallback($aFunc) {
-        $this->iFormCallback = $aFunc;
-    }
-
-    function HideZero($aFlag=true) {
-        $this->iHideZero=$aFlag;
-    }
-
-    function Stroke($img,$aVal,$x,$y) {
-
-        if( $this->show )
-        {
-            if( $this->negformat=='' ) {
-                $this->negformat=$this->format;
-            }
-            if( $this->negcolor=='' ) {
-                $this->negcolor=$this->color;
-            }
-
-            if( $aVal===NULL || (is_string($aVal) && ($aVal=='' || $aVal=='-' || $aVal=='x' ) ) ) {
-                return;
-            }
-
-            if( is_numeric($aVal) && $aVal==0 && $this->iHideZero ) {
-                return;
-            }
-
-            // Since the value is used in different cirumstances we need to check what
-            // kind of formatting we shall use. For example, to display values in a line
-            // graph we simply display the formatted value, but in the case where the user
-            // has already specified a text string we don't fo anything.
-            if( $this->iFormCallback != '' ) {
-                $f = $this->iFormCallback;
-                $sval = call_user_func($f,$aVal);
-            }
-            elseif( is_numeric($aVal) ) {
-                if( $aVal >= 0 ) {
-                    $sval=sprintf($this->format,$aVal);
-                }
-                else {
-                    $sval=sprintf($this->negformat,$aVal);
-                }
-            }
-            else {
-                $sval=$aVal;
-            }
-
-            $y = $y-sign($aVal)*$this->margin;
-
-            $this->txt->Set($sval);
-            $this->txt->SetPos($x,$y);
-            $this->txt->SetFont($this->ff,$this->fs,$this->fsize);
-            if( $this->valign == '' ) {
-                if( $aVal >= 0 ) {
-                    $valign = "bottom";
-                }
-                else {
-                    $valign = "top";
-                }
-            }
-            else {
-                $valign = $this->valign;
-            }
-            $this->txt->Align($this->halign,$valign);
-
-            $this->txt->SetOrientation($this->angle);
-            if( $aVal > 0 ) {
-                $this->txt->SetColor($this->color);
-            }
-            else {
-                $this->txt->SetColor($this->negcolor);
-            }
-            $this->txt->Stroke($img);
-        }
-    }
-}
-
-//===================================================
-// CLASS Plot
-// Description: Abstract base class for all concrete plot classes
-//===================================================
-class Plot {
-    public $numpoints=0;
-    public $value;
-    public $legend='';
-    public $coords=array();
-    public $color='black';
-    public $hidelegend=false;
-    public $line_weight=1;
-    public $csimtargets=array(),$csimwintargets=array(); // Array of targets for CSIM
-    public $csimareas='';   // Resultant CSIM area tags
-    public $csimalts=null;   // ALT:s for corresponding target
-    public $legendcsimtarget='',$legendcsimwintarget='';
-    public $legendcsimalt='';
-    protected $weight=1;
-    protected $center=false;
-
-    protected $inputValues;
-    protected $isRunningClear = false;
-
-    function __construct($aDatay,$aDatax=false) {
-        $this->numpoints = count($aDatay);
-        if( $this->numpoints==0 ) {
-            JpGraphError::RaiseL(25121);//("Empty input data array specified for plot. Must have at least one data point.");
-        }
-
-        if (!$this->isRunningClear) {
-            $this->inputValues = array();
-            $this->inputValues['aDatay'] = $aDatay;
-            $this->inputValues['aDatax'] = $aDatax;
-        }
-
-        $this->coords[0]=$aDatay;
-        if( is_array($aDatax) ) {
-            $this->coords[1]=$aDatax;
-            $n = count($aDatax);
-            for( $i=0; $i < $n; ++$i ) {
-                if( !is_numeric($aDatax[$i]) ) {
-                    JpGraphError::RaiseL(25070);
-                }
-            }
-        }
-        $this->value = new DisplayValue();
-    }
-
-    // Stroke the plot
-    // "virtual" function which must be implemented by
-    // the subclasses
-    function Stroke($aImg,$aXScale,$aYScale) {
-        JpGraphError::RaiseL(25122);//("JpGraph: Stroke() must be implemented by concrete subclass to class Plot");
-    }
-
-    function HideLegend($f=true) {
-        $this->hidelegend = $f;
-    }
-
-    function DoLegend($graph) {
-        if( !$this->hidelegend )
-        $this->Legend($graph);
-    }
-
-    function StrokeDataValue($img,$aVal,$x,$y) {
-        $this->value->Stroke($img,$aVal,$x,$y);
-    }
-
-    // Set href targets for CSIM
-    function SetCSIMTargets($aTargets,$aAlts='',$aWinTargets='') {
-        $this->csimtargets=$aTargets;
-        $this->csimwintargets=$aWinTargets;
-        $this->csimalts=$aAlts;
-    }
-
-    // Get all created areas
-    function GetCSIMareas() {
-        return $this->csimareas;
-    }
-
-    // "Virtual" function which gets called before any scale
-    // or axis are stroked used to do any plot specific adjustment
-    function PreStrokeAdjust($aGraph) {
-        if( substr($aGraph->axtype,0,4) == "text" && (isset($this->coords[1])) ) {
-            JpGraphError::RaiseL(25123);//("JpGraph: You can't use a text X-scale with specified X-coords. Use a \"int\" or \"lin\" scale instead.");
-        }
-        return true;
-    }
-
-    // Virtual function to the the concrete plot class to make any changes to the graph
-    // and scale before the stroke process begins
-    function PreScaleSetup($aGraph) {
-        // Empty
-    }
-
-    // Get minimum values in plot
-    function Min() {
-        if( isset($this->coords[1]) ) {
-            $x=$this->coords[1];
-        }
-        else {
-            $x='';
-        }
-        if( $x != '' && count($x) > 0 ) {
-            $xm=min($x);
-        }
-        else {
-            $xm=0;
-        }
-        $y=$this->coords[0];
-        $cnt = count($y);
-        if( $cnt > 0 ) {
-            $i=0;
-            while( $i<$cnt && !is_numeric($ym=$y[$i]) ) {
-                $i++;
-            }
-            while( $i < $cnt) {
-                if( is_numeric($y[$i]) ) {
-                    $ym=min($ym,$y[$i]);
-                }
-                ++$i;
-            }
-        }
-        else {
-            $ym='';
-        }
-        return array($xm,$ym);
-    }
-
-    // Get maximum value in plot
-    function Max() {
-        if( isset($this->coords[1]) ) {
-            $x=$this->coords[1];
-        }
-        else {
-            $x='';
-        }
-
-        if( $x!='' && count($x) > 0 ) {
-            $xm=max($x);
-        }
-        else {
-            $xm = $this->numpoints-1;
-        }
-        $y=$this->coords[0];
-        if( count($y) > 0 ) {
-            $cnt = count($y);
-            $i=0;
-            while( $i<$cnt && !is_numeric($ym=$y[$i]) ) {
-                $i++;
-            }
-            while( $i < $cnt ) {
-                if( is_numeric($y[$i]) ) {
-                    $ym=max($ym,$y[$i]);
-                }
-                ++$i;
-            }
-        }
-        else {
-            $ym='';
-        }
-        return array($xm,$ym);
-    }
-
-    function SetColor($aColor) {
-        $this->color=$aColor;
-    }
-
-    function SetLegend($aLegend,$aCSIM='',$aCSIMAlt='',$aCSIMWinTarget='') {
-        $this->legend = $aLegend;
-        $this->legendcsimtarget = $aCSIM;
-        $this->legendcsimwintarget = $aCSIMWinTarget;
-        $this->legendcsimalt = $aCSIMAlt;
-    }
-
-    function SetWeight($aWeight) {
-        $this->weight=$aWeight;
-    }
-
-    function SetLineWeight($aWeight=1) {
-        $this->line_weight=$aWeight;
-    }
-
-    function SetCenter($aCenter=true) {
-        $this->center = $aCenter;
-    }
-
-    // This method gets called by Graph class to plot anything that should go
-    // into the margin after the margin color has been set.
-    function StrokeMargin($aImg) {
-        return true;
-    }
-
-    // Framework function the chance for each plot class to set a legend
-    function Legend($aGraph) {
-        if( $this->legend != '' ) {
-            $aGraph->legend->Add($this->legend,$this->color,'',0,$this->legendcsimtarget,$this->legendcsimalt,$this->legendcsimwintarget);
-        }
-    }
-
-    function Clear() {
-        $this->isRunningClear = true;
-        $this->__construct($this->inputValues['aDatay'], $this->inputValues['aDatax']);
-        $this->isRunningClear = false;
-    }
-
-} // Class
-
-
-// Provide a deterministic list of new colors whenever the getColor() method
-// is called. Used to automatically set colors of plots.
-class ColorFactory {
-
-    static private $iIdx = 0;
-    static private $iColorList = array(
-        'black',
-        'blue',
-        'orange',
-        'darkgreen',
-        'red',
-        'AntiqueWhite3',
-        'aquamarine3',
-        'azure4',
-        'brown',
-        'cadetblue3',
-        'chartreuse4',
-        'chocolate',
-        'darkblue',
-        'darkgoldenrod3',
-        'darkorchid3',
-        'darksalmon',
-        'darkseagreen4',
-        'deepskyblue2',
-        'dodgerblue4',
-        'gold3',
-        'hotpink',
-        'lawngreen',
-        'lightcoral',
-        'lightpink3',
-        'lightseagreen',
-        'lightslateblue',
-        'mediumpurple',
-        'olivedrab',
-        'orangered1',
-        'peru',
-        'slategray',
-        'yellow4',
-        'springgreen2');
-    static private $iNum = 33;
-
-    static function getColor() {
-        if( ColorFactory::$iIdx >= ColorFactory::$iNum )
-            ColorFactory::$iIdx = 0;
-        return ColorFactory::$iColorList[ColorFactory::$iIdx++];
-    }
-
-}
-
-// <EOF>
-?>
diff --git a/#jpgraph/src/jpgraph_antispam-digits.php b/#jpgraph/src/jpgraph_antispam-digits.php
deleted file mode 100644
index d9d350ca..00000000
--- a/#jpgraph/src/jpgraph_antispam-digits.php
+++ /dev/null
@@ -1,205 +0,0 @@
-<?php
-//=======================================================================
-// File:        JPGRAPH_ANTISPAM.PHP
-// Description: Genarate anti-spam challenge
-// Created:     2004-10-07
-// Ver:         $Id: jpgraph_antispam-digits.php 1930 2010-01-22 20:19:27Z ljp $
-//
-// Copyright (c) Asial Corporation. All rights reserved.
-//========================================================================
-
-class HandDigits {
-    public $digits = array();
-    public $iHeight=30, $iWidth=30;
-
-    function __construct() {
-        //==========================================================
-        // d6-small.jpg
-        //==========================================================
-        $this->digits['6'][0]= 645 ;
-        $this->digits['6'][1]=
-     '/9j/4AAQSkZJRgABAQEASgBKAAD//gAJSnBHcmFwaP/bAEMACAYGBwYFCAcHBwkJCAoMFA0MCwsMGRITDxQdGh8eHRocHCAkLicg'.
-     'IiwjHBwoNyksMDE0NDQfJzk9ODI8LjM0Mv/bAEMBCQkJDAsMGA0NGDIhHCEyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
-     'MjIyMjIyMjIyMjIyMjIyMjIyMv/AABEIAB4AEgMBIgACEQEDEQH/xAAZAAEBAAMBAAAAAAAAAAAAAAAABgMEBwX/xAAvEAABAwMC'.
-     'BAQEBwAAAAAAAAABAgMEAAURBiESIjFRBxMUQRUWMmFTYnGRkrHC/8QAFgEBAQEAAAAAAAAAAAAAAAAAAAEC/8QAFhEBAQEAAAAA'.
-     'AAAAAAAAAAAAAAER/9oADAMBAAIRAxEAPwDslwiR3oDku8ONttsAvDiVyMcO/ET7ke5/aoOz6k1Vr5htNjW7a7M1yO3NTQU9JUDu'.
-     'GgrlSn8xyf6p4gXaHJvNps9/mKZtSkGdMjRwpfqAFBLLACRlZUrJONsI2717No1lbZ10kx7XGnRpKWQ/6GVGMfzEJ5VFIVtsOH6e'.
-     'wyKVhYsia0y22pLThSkJK1uniVgdThOM0ol+StIUhpopIyCFq3H8aUVCwnG3PGe4Rp6fLXJtMdyM0ojcIWvIz3HFnAPfrWTXb6GN'.
-     'WaLXDwZjVz8pKEfhuIUFg/bAz9sVJ61nt61mxJFslLtq7e5yPqiBT4UDklKw4MDpt+u+9bFiu9riXNu83R+fcr6tohuQ5HQhmK37'.
-     'paaC8DruScmg6X8KkjZEhbaB9KEyFYSOw26Uqd+e7Qerl5z74DY/1SomP//Z' ; 
-
-        //==========================================================
-        // d2-small.jpg
-        //==========================================================
-        $this->digits['2'][0]= 606 ;
-        $this->digits['2'][1]=
-     '/9j/4AAQSkZJRgABAQEASgBKAAD//gAJSnBHcmFwaP/bAEMACAYGBwYFCAcHBwkJCAoMFA0MCwsMGRITDxQdGh8eHRocHCAkLicg'.
-     'IiwjHBwoNyksMDE0NDQfJzk9ODI8LjM0Mv/bAEMBCQkJDAsMGA0NGDIhHCEyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
-     'MjIyMjIyMjIyMjIyMjIyMjIyMv/AABEIAB4AEQMBIgACEQEDEQH/xAAYAAEBAQEBAAAAAAAAAAAAAAAFAAQHAv/EACsQAAEDBAEC'.
-     'BAYDAAAAAAAAAAIBAwQABQYRIRIxQVFhcQcTFSJSU5GU0f/EABcBAAMBAAAAAAAAAAAAAAAAAAECAwT/xAAZEQACAwEAAAAAAAAA'.
-     'AAAAAAAAARESUUH/2gAMAwEAAhEDEQA/AOqXm/Q8dxmOL4PPSnCSNFixx6nXnkXgRT3Te17JWbGsveueSyLZdbPItNxOKLzTLjou'.
-     'gYCSoSoY8ISKSbFeUrzkdlnTL1YshskiErkQnFEZaF8kkdBBVdjyi6RNL5+9F486eS/ECVkcBtDt1vZcho5viS8ZCp9C9tAIAm/F'.
-     'VoPRU+HRtJ5JVRP1kP0PfwP+1VKrHBMliXG4Nw8VgE4xGkuqk2S1wTUNEVdIvgpL9iL6KtNxY7WOwo9tt0RCitj0sR2uCbFPPzH1'.
-     '7+6rRuSRcljMBMsUy2tky045KOawZk5xtEFBJEROO3hx61kh2rPCIX3MhsyC4QmfTbC6lH8dq5212qwkiG5H6Y/9R2qm+ofxqqsL'.
-     'DLZ6f//Z' ; 
-
-        //==========================================================
-        // d9-small.jpg
-        //==========================================================
-        $this->digits['9'][0]= 680 ;
-        $this->digits['9'][1]=
-     '/9j/4AAQSkZJRgABAQEASgBKAAD//gAJSnBHcmFwaP/bAEMACAYGBwYFCAcHBwkJCAoMFA0MCwsMGRITDxQdGh8eHRocHCAkLicg'.
-     'IiwjHBwoNyksMDE0NDQfJzk9ODI8LjM0Mv/bAEMBCQkJDAsMGA0NGDIhHCEyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
-     'MjIyMjIyMjIyMjIyMjIyMjIyMv/AABEIAB4AEgMBIgACEQEDEQH/xAAZAAACAwEAAAAAAAAAAAAAAAAABAUGBwP/xAArEAABAwMD'.
-     'AgYBBQAAAAAAAAABAgMEBQYRABIhE1EUIjEzQUIHMlJhcdH/xAAWAQEBAQAAAAAAAAAAAAAAAAACAQD/xAAYEQEAAwEAAAAAAAAA'.
-     'AAAAAAAAAREhQf/aAAwDAQACEQMRAD8AkK7brF6X7XpMeGoKhFMLEeT4ZUheEhanF4OcZ2pTgDykk92bZpdCsi7aezLjxkIPUZiV'.
-     'RSCy8hah7EkZ27yM7V+iscal5bE22Lon1qNDmSKROd8Sl+Ix1lMOlIS4HGgQpbStoUCnlJz8HmsXtW3Lst2rmBAelLMRRekOwnYz'.
-     'Edls9QKKnOVLyk7UgcbzzrdBthqEJJwZbAI4x1U/7o1TaFa9lG36aXaZTy54VrcXUgrzsGdx+T30aNydweqVw1GS87T6Lb86Q4ha'.
-     'my/IAYjZBx+snKk99oOQMf1AViE65SY348hzFy6hPKnqtKz7DC1lbqyPrvJKUJ7H+M6Wrt3InP7o1brFNp4bCDGhxGAsqz69VSiQ'.
-     'ORwBxrrQ7itm1ac7Hp0WoGTIc3PSn0pccdcP2WorycfA1RaRHjxosZqOyhtDTSAhCf2gDAGjVHTd9sKSCumynFEZK1tIJUe58/ro'.
-     '1V1//9k=' ; 
-
-        //==========================================================
-        // d5-small.jpg
-        //==========================================================
-        $this->digits['5'][0]= 632 ;
-        $this->digits['5'][1]=
-     '/9j/4AAQSkZJRgABAQEASgBKAAD//gAJSnBHcmFwaP/bAEMACAYGBwYFCAcHBwkJCAoMFA0MCwsMGRITDxQdGh8eHRocHCAkLicg'.
-     'IiwjHBwoNyksMDE0NDQfJzk9ODI8LjM0Mv/bAEMBCQkJDAsMGA0NGDIhHCEyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
-     'MjIyMjIyMjIyMjIyMjIyMjIyMv/AABEIAB4AEgMBIgACEQEDEQH/xAAZAAACAwEAAAAAAAAAAAAAAAAABgIFBwT/xAAoEAABAwME'.
-     'AQQCAwAAAAAAAAABAgMEBQYRABIhIkEUMVFhBxNCgaH/xAAVAQEBAAAAAAAAAAAAAAAAAAAAAv/EABcRAQEBAQAAAAAAAAAAAAAA'.
-     'AAABEUH/2gAMAwEAAhEDEQA/ANGvW4YVOeiRX5b4mv5Sin05IdlupPKdo/j2SO3+6TbPNQvOsTVz33KRT4csR3YUF7Dsh5OSFvug'.
-     'kqG4FPBxnjxpvvi4KZb1pTpU+QwxUi2Y7ZIAefUk5ATxnB9/gbtL/wCH1UpuhPUlZlMVaQ0mS8zJjqZOPfc2TwpIUonI9tw40R1r'.
-     'WNGq/wBdJR1XT3lqHBUnGCfkfWjRWs1ve249erQqQYjOtN1FqPUpCXQ4WIzQSsJwT0UpRwQPG0nzqyuNHobjsl9kBuWqoOoXtT1/'.
-     'WppZcA8lKRj64HxqU+3KpAr6plElRVKef3S4E0K9O8pLXVzKcqSsJAB9wSAca6bSoNXeuA1+5pEV+SGFNU1iKVFqI0Vdx2AJUeoz'.
-     '8DGlTDwG3CAf3q/pI0ah6MDhLz6U+EpXwPoaNMU//9k=' ; 
-
-        //==========================================================
-        // d1-small.jpg
-        //==========================================================
-        $this->digits['1'][0]= 646 ;
-        $this->digits['1'][1]=
-     '/9j/4AAQSkZJRgABAQEASgBKAAD//gAJSnBHcmFwaP/bAEMACAYGBwYFCAcHBwkJCAoMFA0MCwsMGRITDxQdGh8eHRocHCAkLicg'.
-     'IiwjHBwoNyksMDE0NDQfJzk9ODI8LjM0Mv/bAEMBCQkJDAsMGA0NGDIhHCEyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
-     'MjIyMjIyMjIyMjIyMjIyMjIyMv/AABEIAB4AEwMBIgACEQEDEQH/xAAZAAADAAMAAAAAAAAAAAAAAAAABQYCBAf/xAApEAACAQMD'.
-     'AwQBBQAAAAAAAAABAgMEBREABiESMUEHEyJRkSNCYXGB/8QAFgEBAQEAAAAAAAAAAAAAAAAAAAEC/8QAFxEBAQEBAAAAAAAAAAAA'.
-     'AAAAAAEREv/aAAwDAQACEQMRAD8A6jdd4WLbstILnc4Uq0VoWpkJknb6IjXLHJUePOlez923fcW4r1SxWlqC2UbdKirQif3Xw3yA'.
-     'OFAGT09/kO3OmV3a20MFRf6lIYPcpy7yRRAzgxjIy2M8YwcdiBzpX6d22VNvUlTXsFkuwkrKqNSfnK7F8OTzwrAY+l5zoxKskudN'.
-     'EgQPUT9PBkWF3DH+1GPxo1mLnRoAqF2VRgGOFmX/AAgY/GjRUP6hVMFv2FuFqUvUGrpDFJMBnpdyF5bsAQew7Hxzp6LZNT0yQ1DI'.
-     'wp0QCFBhD0jCsfLZHxbx5xxpTuvb1+v9PV7Ztk9roLPLCjmSSN3mX5ZwqjCgZX7PfWxDQb2in96pv9qq46aTE0bW4x9ceAWAYPwS'.
-     'PsYzoixgmheBGjIVcYCnjp/jHjHbRpe1JLn9OnopE/a0ykvjwDx47aNMXqP/2Q==' ; 
-
-        //==========================================================
-        // d8-small.jpg
-        //==========================================================
-        $this->digits['8'][0]= 694 ;
-        $this->digits['8'][1]=
-     '/9j/4AAQSkZJRgABAQEASgBKAAD//gAJSnBHcmFwaP/bAEMACAYGBwYFCAcHBwkJCAoMFA0MCwsMGRITDxQdGh8eHRocHCAkLicg'.
-     'IiwjHBwoNyksMDE0NDQfJzk9ODI8LjM0Mv/bAEMBCQkJDAsMGA0NGDIhHCEyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
-     'MjIyMjIyMjIyMjIyMjIyMjIyMv/AABEIAB4AFQMBIgACEQEDEQH/xAAYAAADAQEAAAAAAAAAAAAAAAAABgcEBf/EACsQAAEDAwMD'.
-     'AwMFAAAAAAAAAAECAwQFBhEAEiEUMVEHE0EVYYEiIzJCsf/EABYBAQEBAAAAAAAAAAAAAAAAAAIAAf/EABcRAQEBAQAAAAAAAAAA'.
-     'AAAAAAABERL/2gAMAwEAAhEDEQA/AKL6gVVUa0i1T5QjvTprUJMlxW4R9zgQXe/AH+kaWrntqlWjaq7gpcmotXAw82ht9yY4tch8'.
-     'uAFC0k7VBXPGMY51ruiaue+bThIj+7NbWqS+7HDxajFf6AlB/k44o8ZOABk4xkL0X0tZiojKrlRuGRJjugqldSlKGf6t7BuUQe3J'.
-     '44xxxrA1a4KVJipLidri8uLHgqOcfjOPxo0o2hdDvS1CmV2Yl6fS5ioipIQR1CAlKkLKR2UUqAI8g6NRSwuuyHab6s1ufLI/Zai7'.
-     'UBJOxhTS0+6B32pWSFH4CidOdWU0ukLiN1BLr0zG5Sdm3GRvcPhIT858DvjXNrVsSLnm/VIdTXS6tTnFsxZTSN3jchaTwps+O/z9'.
-     'tcBVq3hIX0tYqlIiQHdy5CqRHKHXEjAOMgBKjnvyRk4xrQa7OiGt1K5biYZL8SoVEpjOqkFsONtJCNwASeCQrn7aNUKnQYtLp7EC'.
-     'EylmLHQltptPZKQOBo1FzH//2Q==' ; 
-
-        //==========================================================
-        // d4-small.jpg
-        //==========================================================
-        $this->digits['4'][0]= 643 ;
-        $this->digits['4'][1]=
-     '/9j/4AAQSkZJRgABAQEASgBKAAD//gAJSnBHcmFwaP/bAEMACAYGBwYFCAcHBwkJCAoMFA0MCwsMGRITDxQdGh8eHRocHCAkLicg'.
-     'IiwjHBwoNyksMDE0NDQfJzk9ODI8LjM0Mv/bAEMBCQkJDAsMGA0NGDIhHCEyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
-     'MjIyMjIyMjIyMjIyMjIyMjIyMv/AABEIAB4AEgMBIgACEQEDEQH/xAAYAAADAQEAAAAAAAAAAAAAAAAABAYHAv/EAC0QAAIBAwQA'.
-     'BAMJAAAAAAAAAAECAwQFEQAGEiETFDFBUmGBByIjUVNxobHR/8QAFgEBAQEAAAAAAAAAAAAAAAAAAAIB/8QAGBEBAAMBAAAAAAAA'.
-     'AAAAAAAAAAERIVH/2gAMAwEAAhEDEQA/ANjM00Nxmt1xiWW31CZp5uJwoAAaOQ/n7qfcZHqO5my3q5XX7R6ijiqnNut9u4NyJ4yv'.
-     'JJyjYr8Xhrn5g599J7x3ulBNU7Zo7dXXXcLQ8kURYi4epYtkALjOePv1nUvbLvV7P3BZm3DR3eh88Kp7pVzBZI6iUhGWRRGWwE44'.
-     'HX3V+uiL1uHgt+vL/H+aNJQ3CSeCOaFqSaJ1DJKs/TqRkMOvQjvRorHE4pRDLNWLGlRHGUeYIORXs9e5B7OP31E0fmdyb/t0DJ4Q'.
-     '27bfx3YZzPUIoAAz7IpOD6cuxq0uNumqLfVNDOqXBoZEjnZcqhIPXH4c46+WkdoWOltu3IDDLLLVVR83UVcuPEmmcZZ2/rHoAANG'.
-     'GI7KIY1ijoLeEQBVCwIoAHpgY6Hy0aZe7mJ2jeHLKcEhusj6aNKgzr//2Q==' ; 
-
-        //==========================================================
-        // d7-small.jpg
-        //==========================================================
-        $this->digits['7'][0]= 658 ;
-        $this->digits['7'][1]=
-     '/9j/4AAQSkZJRgABAQEASgBKAAD//gAJSnBHcmFwaP/bAEMACAYGBwYFCAcHBwkJCAoMFA0MCwsMGRITDxQdGh8eHRocHCAkLicg'.
-     'IiwjHBwoNyksMDE0NDQfJzk9ODI8LjM0Mv/bAEMBCQkJDAsMGA0NGDIhHCEyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
-     'MjIyMjIyMjIyMjIyMjIyMjIyMv/AABEIAB4AEgMBIgACEQEDEQH/xAAZAAACAwEAAAAAAAAAAAAAAAAABgEFBwT/xAAuEAABAwIE'.
-     'BAQGAwAAAAAAAAABAgMEBREABiExEhMiQSMyUXEHFBclVJFhk9L/xAAXAQADAQAAAAAAAAAAAAAAAAAAAQID/8QAGREBAQEAAwAA'.
-     'AAAAAAAAAAAAAAEREiFR/9oADAMBAAIRAxEAPwDXq9mCjZeQ05VZ5ZST4bfEpa3VdglCbqUe+g9MZ5Uq7V8415WXoMSdQ6etgSps'.
-     '19wpkCMDZKUpv0FZvbi1NzpYasMDLDUbMVXrtQdbeeU23xLWkj5RlLYK0J7anW9gbAjCzkOtsVSUJUdtc6dVZK51UeaFm4LKbhpC'.
-     'l7EhIFkDW974GbRI2XorUVls1OTdKAOqUpR0Hc3198GITQ6k+hLwrEpoODiDenRfW23bBicg78JXxPpD0mgVOW5PAivNNpahsPW5'.
-     '8xxQaSVkboQnhsnYm5OHqDGp1IpsalMKjMsMIC3+XZKbJFth62/QOEfMOZqZXp9JcKZTcGmTky3meSi7xQklI81vMR+sXIz/AEgp'.
-     'Q0qPNu6ea8Q2jqtbp8+2w9h/OKORc/cpHjt1dDSHOtLZ4ekHW23bBjj+o9H/AB539aP94MG0+L//2Q==' ; 
-
-        //==========================================================
-        // d3-small.jpg
-        //==========================================================
-        $this->digits['3'][0]= 662 ;
-        $this->digits['3'][1]=
-     '/9j/4AAQSkZJRgABAQEASgBKAAD//gAJSnBHcmFwaP/bAEMACAYGBwYFCAcHBwkJCAoMFA0MCwsMGRITDxQdGh8eHRocHCAkLicg'.
-     'IiwjHBwoNyksMDE0NDQfJzk9ODI8LjM0Mv/bAEMBCQkJDAsMGA0NGDIhHCEyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
-     'MjIyMjIyMjIyMjIyMjIyMjIyMv/AABEIAB4AEgMBIgACEQEDEQH/xAAZAAACAwEAAAAAAAAAAAAAAAAABAUGBwL/xAArEAABBAED'.
-     'AwMDBQEAAAAAAAABAgMEBREABhIhMUEiMmETFZEHFkJDUdH/xAAWAQEBAQAAAAAAAAAAAAAAAAABAAL/xAAYEQEBAQEBAAAAAAAA'.
-     'AAAAAAAAEQExQf/aAAwDAQACEQMRAD8A0vclruBdk3VVLLUNssGRJsZSCtqOjlgJAHvcOD6c4HnOdIbcttw1W5P29cFEhuawqTXS'.
-     'VsJjnCMBxKkJJx7goAde+ceJfdNxU0UNlyymyXHi6kxWUNl1S3EnkAEIHX2nv86qtTuZr9Q9+1VhRsOoYpYcgSVyAE/TdewkJxnK'.
-     'sBCjkdPGpnOtFMd3PqsXgfOAgD8Y0aX+11H9rDDjn8lr9yj5J+dGqsqxaw6Cc9cQZU4Sp7zTJsIrKlcUEKwhSin1JABI45GUjqOu'.
-     'lbOvjbc3Ts9ynjGCy445UuFLYRzbWgrT6fhSCQSMDke+pew2zYVly/d7YchNqkMJZnQpgV9J8IzwWFJyUrAJHYgjvpLbu37G5nR7'.
-     'vck5C3YRKYEOEVJZj8kjKypXqWvirjk9h+dB9i4faa89TDZUfKlIyT8k+To10a6KTkpcJ/0vL/7o0TS//9k=' ; 
-    }
-}
-
-class AntiSpam {
-
-    private $iNumber='';
-
-    function __construct($aNumber='') {
-        $this->iNumber = $aNumber;
-    }
-
-    function Rand($aLen) {
-        $d='';
-        for($i=0; $i < $aLen; ++$i) {
-            $d .= rand(1,9);
-        }
-        $this->iNumber = $d;
-        return $d;
-    }
-
-    function Stroke() {
-
-        $n=strlen($this->iNumber);
-        for($i=0; $i < $n; ++$i ) {
-            if( !is_numeric($this->iNumber[$i]) || $this->iNumber[$i]==0 ) {
-                return false;
-            }
-        }
-
-        $dd = new HandDigits();
-        $n = strlen($this->iNumber);
-        $img = @imagecreatetruecolor($n*$dd->iWidth, $dd->iHeight);
-        if( $img < 1 ) {
-            return false;
-        }
-        $start=0;
-        for($i=0; $i < $n; ++$i ) {
-            $size = $dd->digits[$this->iNumber[$i]][0];
-            $dimg = imagecreatefromstring(base64_decode($dd->digits[$this->iNumber[$i]][1]));
-            imagecopy($img,$dimg,$start,0,0,0,imagesx($dimg), $dd->iHeight);
-            $start += imagesx($dimg);
-        }
-        $resimg = @imagecreatetruecolor($start+4, $dd->iHeight+4);
-        if( $resimg < 1 ) {
-            return false;
-        }
-        imagecopy($resimg,$img,2,2,0,0,$start, $dd->iHeight);
-        header("Content-type: image/jpeg");
-        imagejpeg($resimg);
-        return true;
-    }
-}
-
-?>
diff --git a/#jpgraph/src/jpgraph_antispam.php b/#jpgraph/src/jpgraph_antispam.php
deleted file mode 100644
index 7998df28..00000000
--- a/#jpgraph/src/jpgraph_antispam.php
+++ /dev/null
@@ -1,615 +0,0 @@
-<?php
-//=======================================================================
-// File:        JPGRAPH_ANTISPAM.PHP
-// Description: Genarate anti-spam challenge
-// Created:     2004-10-07
-// Ver:         $Id: jpgraph_antispam.php 1106 2009-02-22 20:16:35Z ljp $
-//
-// Copyright (c) Asial Corporation. All rights reserved.
-//========================================================================
-
-class HandDigits {
-    public $chars = array();
-    public $iHeight=30, $iWidth=30;
-
-    function __construct() {
-
-        //==========================================================
-        // lj-small.jpg
-        //==========================================================
-        $this->chars['j'][0]= 658 ;
-        $this->chars['j'][1]=
-'/9j/4AAQSkZJRgABAQEASgBKAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAx'.
-'NDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
-'MjIyMjIyMjL/wAARCAAeABUDASIAAhEBAxEB/8QAGAAAAwEBAAAAAAAAAAAAAAAAAAUGBAf/xAAsEAACAQMDAwMBCQAAAAAAAAAB'.
-'AgMEBREAEjEGIUEUUXGBBxMVIiNSYWKC/8QAFgEBAQEAAAAAAAAAAAAAAAAAAwEC/8QAGhEAAwADAQAAAAAAAAAAAAAAAAECERIh'.
-'Mv/aAAwDAQACEQMRAD8A6veK2st8zRWSyV1dUBfvHaGVI4hknsS7AFv4AyM57ayWbqeS+11xtT2etttwo4YqhEqnQs5bcAfyk4AZ'.
-'SOeD441TKRTyingUBG4/ah8j684+dSFzh/BvtaslejMUu9DPQTDnLx4lQ/ONw1TGBm0jdRWqguEMghEisWilgDmNs4Ze+MEEEH40'.
-'aUVFTa7JeLjRXu4GjhmnNbSfqFQVlA3rkckOjH/Q99Glmkl0C/Q06pvsvT9vttXHDF6T1KrWbs5gRgQJM+FDlQxPhjpF1XcVq+qe'.
-'jEoKiOecXBqh2TDDYIXLKuP6549xk8auI6aJqV45oknWdNswkAIkGMYIxjGO2NR1F0LZY5qkWqkS1xrM0M8lMSJpY+TGrnJiQ577'.
-'cEgeNHhi7D3qC3UN69M8tIakRhgrh9o748+eNGtcCiKjjpkQKlMTEg3ZwoxtHHtgfTRpYXArvp//2Q==' ; 
-
-        //==========================================================
-        // lf-small.jpg
-        //==========================================================
-        $this->chars['f'][0]= 633 ;
-        $this->chars['f'][1]=
-'/9j/4AAQSkZJRgABAQEASgBKAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAx'.
-'NDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
-'MjIyMjIyMjL/wAARCAAeABcDASIAAhEBAxEB/8QAGQAAAgMBAAAAAAAAAAAAAAAAAAQFBgcC/8QAKxAAAgEDAwMCBQUAAAAAAAAA'.
-'AQIDBBEhAAUGEjFBEyIHFFFhoRUzYnGS/8QAFQEBAQAAAAAAAAAAAAAAAAAAAQP/xAAaEQACAwEBAAAAAAAAAAAAAAAAAQIRMRIh'.
-'/9oADAMBAAIRAxEAPwDcnmLoIkiSYsouC3tA++O2lU9WkqVjJ+YdhZLsQI/4/YfQm50kZP0vbmaCSU0SRNIH6sghb9INs3t38dvp'.
-'akUuz8x5DwdN5peS1jV1dSipSiVUigIcdQjQ26lIB/c6r3F86SZpE/zCFJaqsihQNhRgdj3Jyfxo0jDSbXHt9Oph9RAoV3qJGltY'.
-'HDOxyb/nRpV0D3RXle21m48XraOk3IUSemUaV4g4Zc9ShcDtgff+tQfwvjq34Dtku7buamFqeJKemCCMxKFsEJU+/FrX8d76sEHG'.
-'aNItzr4usVNdG3S0rmRYAVwEUmyjyQLZ11x7aF4zs9DQOyzml29I2cLa/pixIHi99DFCtU9dFuLIaijo9qiYPmR2mZmB9thgAHOD'.
-'4+mjUrURyrUNMZFEkkIOFuFAbsP9d/OjVIQ6Vh4tP//Z' ; 
-
-        //==========================================================
-        // lb-small.jpg
-        //==========================================================
-        $this->chars['b'][0]= 645 ;
-        $this->chars['b'][1]=
-'/9j/4AAQSkZJRgABAQEASgBKAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAx'.
-'NDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
-'MjIyMjIyMjL/wAARCAAeABUDASIAAhEBAxEB/8QAGQAAAgMBAAAAAAAAAAAAAAAAAAYCAwUH/8QAKxAAAQMDAwMDAwUAAAAAAAAA'.
-'AQIDBAAFEQYSIRMxUSJBYQcVI2JxgqHw/8QAFQEBAQAAAAAAAAAAAAAAAAAAAQL/xAAYEQEBAQEBAAAAAAAAAAAAAAAAATERYf/a'.
-'AAwDAQACEQMRAD8A6H95mxNYwLXcX+pCuilSLXJ6YSplaUELjqxwe4IJ5PIPamJ2V0bPcS7+NxCX1cHggAnIP+xSd9RyzHh2m7FQ'.
-'Q1CvMNQWTjCt+HFD+PB/Y1fI1PL1HFFt0zaGblFdJQ9cJjpZiqPJUlBAKnPcEpGB5NNRKdrOl1NlgiQol4R2w4Sc5VtGf7opZteo'.
-'LhdorjUSM5FnQnlR50NeHQysYxtVxlJHIPgjtRRD3xkaghs6juumdHz4+Y7RVPnt59K2mk7W+fcKWsZ7djTXMkW+xMP3GRJjwIEN'.
-'HTG/CWx5wPY8AADx2NYk3SL9wukvUjGobnBkORksIbjdMANozgEqSo8qJPGO/wAVO36IsjUmBIfZfuM7epZk3F9UhSSk5O0K9Kcq'.
-'8AcU3UzFuhUSBFud6nRXoz96mqmJZWg7m2dqUNhWBwdqQSP1UU5c/FFCn//Z' ; 
-
-        //==========================================================
-        // d6-small.jpg
-        //==========================================================
-        $this->chars['6'][0]= 645 ;
-        $this->chars['6'][1]=
-'/9j/4AAQSkZJRgABAQEASgBKAAD//gAJSnBHcmFwaP/bAEMACAYGBwYFCAcHBwkJCAoMFA0MCwsMGRITDxQdGh8eHRocHCAkLicg'.
-'IiwjHBwoNyksMDE0NDQfJzk9ODI8LjM0Mv/bAEMBCQkJDAsMGA0NGDIhHCEyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
-'MjIyMjIyMjIyMjIyMjIyMjIyMv/AABEIAB4AEgMBIgACEQEDEQH/xAAZAAEBAAMBAAAAAAAAAAAAAAAABgMEBwX/xAAvEAABAwMC'.
-'BAQEBwAAAAAAAAABAgMEAAURBiESIjFRBxMUQRUWMmFTYnGRkrHC/8QAFgEBAQEAAAAAAAAAAAAAAAAAAAEC/8QAFhEBAQEAAAAA'.
-'AAAAAAAAAAAAAAER/9oADAMBAAIRAxEAPwDslwiR3oDku8ONttsAvDiVyMcO/ET7ke5/aoOz6k1Vr5htNjW7a7M1yO3NTQU9JUDu'.
-'GgrlSn8xyf6p4gXaHJvNps9/mKZtSkGdMjRwpfqAFBLLACRlZUrJONsI2717No1lbZ10kx7XGnRpKWQ/6GVGMfzEJ5VFIVtsOH6e'.
-'wyKVhYsia0y22pLThSkJK1uniVgdThOM0ol+StIUhpopIyCFq3H8aUVCwnG3PGe4Rp6fLXJtMdyM0ojcIWvIz3HFnAPfrWTXb6GN'.
-'WaLXDwZjVz8pKEfhuIUFg/bAz9sVJ61nt61mxJFslLtq7e5yPqiBT4UDklKw4MDpt+u+9bFiu9riXNu83R+fcr6tohuQ5HQhmK37'.
-'paaC8DruScmg6X8KkjZEhbaB9KEyFYSOw26Uqd+e7Qerl5z74DY/1SomP//Z' ; 
-
-        //==========================================================
-        // lx-small.jpg
-        //==========================================================
-        $this->chars['x'][0]= 650 ;
-        $this->chars['x'][1]=
-'/9j/4AAQSkZJRgABAQEASgBKAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAx'.
-'NDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
-'MjIyMjIyMjL/wAARCAAeABMDASIAAhEBAxEB/8QAGAAAAwEBAAAAAAAAAAAAAAAAAAUHBgj/xAApEAABAwMDAwQCAwAAAAAAAAAB'.
-'AgMEBQYRACFBBxIxFCJRgRNxkcHw/8QAFQEBAQAAAAAAAAAAAAAAAAAAAAH/xAAWEQEBAQAAAAAAAAAAAAAAAAAAEQH/2gAMAwEA'.
-'AhEDEQA/AH9t3pKvO14UykVARa/HfAlxlDKXR24V2p3z7RlPwdtMep91uWdRGHWELjuTFFtLvcC4SNznnH+21O7ttiodOq1BvC0E'.
-'p9I0lSX2kgqCSklK+5PKCMAng6zV2XRO6u3lSIURtbDRShltlZHa0tW7q/0MeTwnjxq1Jiw2xc9xTLbhSVU5iaXUFfqFFILgJOCd'.
-'9Gt3SXabR6REpkL8yo0RpLCFNx1qBCRjOQMHxo0pEr6o3um2LVYpMEpTVqg25lHn08dfcB9kEgfZ1LIFDuawqZRb7aQlLTzqglsg'.
-'9wQdveOEqBIB425xqhQuk8qo9UKlPrlRblw2ZBeCSVKW6CcoSrI2AGOT41SKzT4dYtmdS5bIXDZhNoWgbZJ94x8AYT/GkM03oNUc'.
-'uKgwqtTZDTMOU0FttqRkoHggnPkEEHRrkJ6t1SlSHYUOc6zHaWrsbQrATk5/vRqK/9k=' ; 
-
-        //==========================================================
-        // d2-small.jpg
-        //==========================================================
-        $this->chars['2'][0]= 606 ;
-        $this->chars['2'][1]=
-'/9j/4AAQSkZJRgABAQEASgBKAAD//gAJSnBHcmFwaP/bAEMACAYGBwYFCAcHBwkJCAoMFA0MCwsMGRITDxQdGh8eHRocHCAkLicg'.
-'IiwjHBwoNyksMDE0NDQfJzk9ODI8LjM0Mv/bAEMBCQkJDAsMGA0NGDIhHCEyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
-'MjIyMjIyMjIyMjIyMjIyMjIyMv/AABEIAB4AEQMBIgACEQEDEQH/xAAYAAEBAQEBAAAAAAAAAAAAAAAFAAQHAv/EACsQAAEDBAEC'.
-'BAYDAAAAAAAAAAIBAwQABQYRIRIxQVFhcQcTFSJSU5GU0f/EABcBAAMBAAAAAAAAAAAAAAAAAAECAwT/xAAZEQACAwEAAAAAAAAA'.
-'AAAAAAAAARESUUH/2gAMAwEAAhEDEQA/AOqXm/Q8dxmOL4PPSnCSNFixx6nXnkXgRT3Te17JWbGsveueSyLZdbPItNxOKLzTLjou'.
-'gYCSoSoY8ISKSbFeUrzkdlnTL1YshskiErkQnFEZaF8kkdBBVdjyi6RNL5+9F486eS/ECVkcBtDt1vZcho5viS8ZCp9C9tAIAm/F'.
-'VoPRU+HRtJ5JVRP1kP0PfwP+1VKrHBMliXG4Nw8VgE4xGkuqk2S1wTUNEVdIvgpL9iL6KtNxY7WOwo9tt0RCitj0sR2uCbFPPzH1'.
-'7+6rRuSRcljMBMsUy2tky045KOawZk5xtEFBJEROO3hx61kh2rPCIX3MhsyC4QmfTbC6lH8dq5212qwkiG5H6Y/9R2qm+ofxqqsL'.
-'DLZ6f//Z' ; 
-
-        //==========================================================
-        // lm-small.jpg
-        //==========================================================
-        $this->chars['m'][0]= 649 ;
-        $this->chars['m'][1]=
-'/9j/4AAQSkZJRgABAQEASgBKAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAx'.
-'NDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
-'MjIyMjIyMjL/wAARCAAeABcDASIAAhEBAxEB/8QAGgAAAgMBAQAAAAAAAAAAAAAAAAcDBAUCBv/EAC0QAAICAQMCBAMJAAAAAAAA'.
-'AAECAwQRAAUSBiETMVFhB2KhFSIyQVJxgZHB/8QAFgEBAQEAAAAAAAAAAAAAAAAAAgED/8QAGREBAQEAAwAAAAAAAAAAAAAAAQAR'.
-'EiEx/9oADAMBAAIRAxEAPwB0MI2lIdgI0Cly3kFXLEn2zx1FDdp7rbpbjUtRWKio3hyxOGQllJzkegX66rQ2qW87Zuk9S5FNVmru'.
-'iywyBhjDKTkeXfSr+GRfYtq2KAO32b1BGxAZu0dyJ2DKPTxY1wPddVszycUq2Golq8jRWbcnJWwCVGMjz+VQP50atxMtm2ZUOY4l'.
-'4qfUnBP0x/Z0amy4jJm10Tt2yddWasFmfaRfdrlG3UcgArnxKzJ+Fu4DqCMkcgNem2DoWav8PLfTm+FPEkuSNTnqueS5bnHIv6CG'.
-'LNjJwM99bm67NB1Ht89KSxNXnr2hNDbiUc47K4KyD2GQMfmMjUnS+7vuIktTqPCaaWCqAMMojPFyw8hyYMQBnAwNJHYGXPTsW9VN'.
-'jg2zf50W9zk524GAEihuz+xbIOD82jW5TkjtRPZkTkJ+4VgDhQfuj/f3OjUxl1f/2Q==' ; 
-
-        //==========================================================
-        // lt-small.jpg
-        //==========================================================
-        $this->chars['t'][0]= 648 ;
-        $this->chars['t'][1]=
-'/9j/4AAQSkZJRgABAQEASgBKAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAx'.
-'NDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
-'MjIyMjIyMjL/wAARCAAeABcDASIAAhEBAxEB/8QAGQAAAgMBAAAAAAAAAAAAAAAAAAQDBQYH/8QAJxAAAQMDAgYDAQEAAAAAAAAA'.
-'AQIDBAUGEQASEyExQVFhIjJxFSP/xAAWAQEBAQAAAAAAAAAAAAAAAAABAAP/xAAZEQADAQEBAAAAAAAAAAAAAAAAAREhMUH/2gAM'.
-'AwEAAhEDEQA/AO4BLEiEy7uG4IGxxs5IOOx76wd2XYidSp1HoD70240gcNNPbDyI6wQQpaz8E9MczkdhqtbsKYLieDk6WLKmZmmL'.
-'Hk7AHVkbkLI+RQc7uRxgkfr1tx2rGu6VbToLVKkhU+kbugGf9WfaknCk5ycaX0zmaa+3JkqvW/CmzojsB9xoF6OoFK0r6HOcEDI0'.
-'aefTuKX5ScMdC14HYq8n12zo1DEUcKTGg1Z+hyBwoPBVIiA/VQyOIgedhUCB4WMfXSV3UufVLcTUIqVf26K6mXDbPVRRzKT54iMg'.
-'+zjtq6mtsyJjclxpKlUhSXEbkgkqWnBx4+J5e/zU0pZemPvJJQzEPDfQOrwwFY9AZ5eeYPLV6FwhoFYZuigxpkJeIjqAeIoAk9wA'.
-'D46EnuD+6Nc1smDNrTlRkxqtMo1vzKhIdYgU9YDqVpISrLhHxSSd21I0aYyqP//Z' ; 
-
-        //==========================================================
-        // li-small.jpg
-        //==========================================================
-        $this->chars['i'][0]= 639 ;
-        $this->chars['i'][1]=
-'/9j/4AAQSkZJRgABAQEASgBKAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAx'.
-'NDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
-'MjIyMjIyMjL/wAARCAAeABYDASIAAhEBAxEB/8QAFwABAQEBAAAAAAAAAAAAAAAABwAGBP/EACcQAAEEAQMEAgIDAAAAAAAAAAEC'.
-'AwQRBQAGEiExQVEHExSBFWFx/8QAFgEBAQEAAAAAAAAAAAAAAAAAAgMB/8QAGBEBAQEBAQAAAAAAAAAAAAAAAAECMRH/2gAMAwEA'.
-'AhEDEQA/AE7c+5M9BeRG29t1WUfKFFYW+GvrI7WD3B9g140YD5T36rcErDjbUR6dCBdejsKUpxITXI2FUrooCh70yvxzHyIlMvuK'.
-'eVSH7IKEpJoKqu/ahddLryR/aMiO187bsmrWShhp1AZS2XHHrWhNJrzdf7f7GiVcHk3sptmHkJcJ2DIftS2FrKlJPXudWuLGYeQp'.
-'t2fmEIckqIZaaKuSGG0lQ4gduRoFRHQ9AOgs2lOJbk9aSUlpjGvAWeSVH2VKq/2dFPw3IjyJe8s281ct3I9UoHJXGiQkD2STrSZ7'.
-'Yf8AOl7JTdw5eOCz0jw3+LbYCfA9nz71msb8KMxoTGTw+5srjsipAdDqFBQBIuiOl6KrdYyJMyTCshlw2G3Fr/HiNqNNAqJJUoGl'.
-'KND+h47km1bZwsvCbYYjycxIyK1qDv2yEi0hQviK8atKDcy9j//Z' ;
-
-
-        //==========================================================
-        // lp-small.jpg
-        //==========================================================
-        $this->chars['p'][0]= 700 ;
-        $this->chars['p'][1]=
-'/9j/4AAQSkZJRgABAQEASgBKAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAx'.
-'NDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
-'MjIyMjIyMjL/wAARCAAeABcDASIAAhEBAxEB/8QAGgAAAQUBAAAAAAAAAAAAAAAAAAECBAUGB//EAC8QAAEDAwMCBAMJAAAAAAAA'.
-'AAECAwQFESEABhIiMRMVUWEHFEEWIzIzcYGRocH/xAAWAQEBAQAAAAAAAAAAAAAAAAADAgH/xAAcEQACAgIDAAAAAAAAAAAAAAAA'.
-'AQIxAxESIUH/2gAMAwEAAhEDEQA/AOh703xG21DMeOyqoVNDjSzERiwU6Ep5qtZNycA97HTF13d33KWtmlt9xwkLl1NkXVxIuQgK'.
-'wLj+hqBvel0qmbR8GnR22nJNZiLeeKr8nDIT1OLJucX+uPbWom7iocRpafOac5MX1ALltp/Cbi+cJH++utdh+WVNL3PNdNYpdWgx'.
-'Y0qmLZSrwJJcQoOJ5XKlJFu4HbJOjVbt+V5nu7eopNRivqcdhK+bFnWwA1Y2AOcgjvj9dGlxy0g5y0xd+hNXoG24C4obizq3HZUh'.
-'YHqtRHD06bG/8a0MbbG1mqekxaBSGmgkrcdcitlLfrckZIz7DUatbeFak0tyRLUwzT5vmiGm0cufEkFBJItfkD+59tKmiO12atFa'.
-'eQukO3ejUxgENqTcfnE5WbkHiOnJ76N2IqI1DibabptS+zkZhtp90F2Y0S026EkAFK/qL46cXv65NVZDfxHmVCK4DE2/RX/lRFbA'.
-'C5LwAyq2EtpHZI7mxPYDRqoctdESimz/2Q==' ; 
-
-        //==========================================================
-        // le-small.jpg
-        //==========================================================
-        $this->chars['e'][0]= 700 ;
-        $this->chars['e'][1]=
-'/9j/4AAQSkZJRgABAQEASgBKAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAx'.
-'NDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
-'MjIyMjIyMjL/wAARCAAeABgDASIAAhEBAxEB/8QAGQAAAgMBAAAAAAAAAAAAAAAAAAYEBQcB/8QAKhAAAQMCBAUEAwEAAAAAAAAA'.
-'AgEDBAURAAYSIQciMTJBE0JRYRQVFoH/xAAXAQEBAQEAAAAAAAAAAAAAAAAAAgED/8QAGREAAwEBAQAAAAAAAAAAAAAAAAERAjFB'.
-'/9oADAMBAAIRAxEAPwDTszvhEYCoS80BTm2bCjQRwdAzVe2yopkpJtpRUVfjEIc4V2oMerByg5Ji30oMyS3GeMunK0upfnu09MdJ'.
-'p2scTmWnnGfx6HThktgLfKj7xEOqyr7QBbL41LhBzpxbcOru0LKDLdSnOHoaltNqSC4qWL0x9xbJYum69caczSaHmGmTmpDUYn4l'.
-'UiqjkynzAVtwV23Ud+X4Ibpa2DCPkjhfUaRO/p8yzpb+YHhUmhbev6ZEll1lvqK3jt2XrbBgp6HVwsK3THpfEubGSoOUyFMpbJmL'.
-'Deh6SgOGKti57EuY6l62JMWdJy7k3hg1LkOozEbVm7suQSkTiKtkEfP1pH664Za/QItccgI4bseTHdNxiXHLQ8yVl7V32XyioqL5'.
-'TGc1ng6eYs0idczXUZscBBABWgEhEtfKNuUezwPnBhEuj8X2M21z9BR6NUX211Kk/UKKAjuhkPhL7XVf8vtgw7UPJlEyrDWFSYLb'.
-'LBNF6qrzG6t0spEu6+fpL7YMXhUndp//2Q==' ; 
-
-        //==========================================================
-        // la-small.jpg
-        //==========================================================
-        $this->chars['a'][0]= 730 ;
-        $this->chars['a'][1]=
-'/9j/4AAQSkZJRgABAQEASgBKAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAx'.
-'NDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
-'MjIyMjIyMjL/wAARCAAeABoDASIAAhEBAxEB/8QAGAABAAMBAAAAAAAAAAAAAAAABgMEBwX/xAAvEAABAwIFAQcCBwAAAAAAAAAB'.
-'AgMEBREAEiExQQYHFBUiUXGBE2EyQkNSgpHh/8QAFwEBAQEBAAAAAAAAAAAAAAAAAAMBAv/EABkRAAMBAQEAAAAAAAAAAAAAAAAB'.
-'IQIRMf/aAAwDAQACEQMRAD8AfdQ1pxjqZMSn0mRUZRYDaklJCE3OawO2ttTxY4hl07qFMVs1Ku02kpPnRGhsAqz8W9T9wDjozq6o'.
-'Q1lDrcZLGVcmUoZg0obpufxK3Ftt9ccqB1GgBcmLSqtVEqOZcr6ARm/kbXHt7DEtc7WTJKTJqEWvRKfLqL9QplSjuPtGVYOJKBrm'.
-'t+U+n94WGStZzNypmRWqckUKTbixy6jAfxPxHtCgKqFNlU5huK6pLMndSlegG4J45N8aKmTMKQRBsCNMzwB+RbHWHGEAZlPZX2hx'.
-'qZIC34ygZoYUbB50JSkFXFhZR9BrpheR4fIbQ6gvurJ7q02bIQTuAOAN8x40HAxRr3TrNRpBmSHVt1KMlTyJTCsqkKAPlSf28W+c'.
-'UGaD1c9HSR1HFUh9tJU45EBcAtcC9+P9wqbg8IAto9o81yputrVGpiUkgHKkqUTZI32+cKm1z1tIUgPBBAKQ4UBQH3uL3xmXSXep'.
-'HVDtXStE5K5jlPU7PF3Q41+okJFkjgC+3OuNSYiSzHaLtRcW4UDMpLYSCbakDW3thhum5p//2Q==' ;
-
-        //==========================================================
-        // d9-small.jpg
-        //==========================================================
-        $this->chars['9'][0]= 680 ;
-        $this->chars['9'][1]=
-'/9j/4AAQSkZJRgABAQEASgBKAAD//gAJSnBHcmFwaP/bAEMACAYGBwYFCAcHBwkJCAoMFA0MCwsMGRITDxQdGh8eHRocHCAkLicg'.
-'IiwjHBwoNyksMDE0NDQfJzk9ODI8LjM0Mv/bAEMBCQkJDAsMGA0NGDIhHCEyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
-'MjIyMjIyMjIyMjIyMjIyMjIyMv/AABEIAB4AEgMBIgACEQEDEQH/xAAZAAACAwEAAAAAAAAAAAAAAAAABAUGBwP/xAArEAABAwMD'.
-'AgYBBQAAAAAAAAABAgMEBQYRABIhE1EUIjEzQUIHMlJhcdH/xAAWAQEBAQAAAAAAAAAAAAAAAAACAQD/xAAYEQEAAwEAAAAAAAAA'.
-'AAAAAAAAAREhQf/aAAwDAQACEQMRAD8AkK7brF6X7XpMeGoKhFMLEeT4ZUheEhanF4OcZ2pTgDykk92bZpdCsi7aezLjxkIPUZiV'.
-'RSCy8hah7EkZ27yM7V+iscal5bE22Lon1qNDmSKROd8Sl+Ix1lMOlIS4HGgQpbStoUCnlJz8HmsXtW3Lst2rmBAelLMRRekOwnYz'.
-'Edls9QKKnOVLyk7UgcbzzrdBthqEJJwZbAI4x1U/7o1TaFa9lG36aXaZTy54VrcXUgrzsGdx+T30aNydweqVw1GS87T6Lb86Q4ha'.
-'my/IAYjZBx+snKk99oOQMf1AViE65SY348hzFy6hPKnqtKz7DC1lbqyPrvJKUJ7H+M6Wrt3InP7o1brFNp4bCDGhxGAsqz69VSiQ'.
-'ORwBxrrQ7itm1ac7Hp0WoGTIc3PSn0pccdcP2WorycfA1RaRHjxosZqOyhtDTSAhCf2gDAGjVHTd9sKSCumynFEZK1tIJUe58/ro'.
-'1V1//9k=' ; 
-
-        //==========================================================
-        // d5-small.jpg
-        //==========================================================
-        $this->chars['5'][0]= 632 ;
-        $this->chars['5'][1]=
-'/9j/4AAQSkZJRgABAQEASgBKAAD//gAJSnBHcmFwaP/bAEMACAYGBwYFCAcHBwkJCAoMFA0MCwsMGRITDxQdGh8eHRocHCAkLicg'.
-'IiwjHBwoNyksMDE0NDQfJzk9ODI8LjM0Mv/bAEMBCQkJDAsMGA0NGDIhHCEyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
-'MjIyMjIyMjIyMjIyMjIyMjIyMv/AABEIAB4AEgMBIgACEQEDEQH/xAAZAAACAwEAAAAAAAAAAAAAAAAABgIFBwT/xAAoEAABAwME'.
-'AQQCAwAAAAAAAAABAgMEBQYRABIhIkEUMVFhBxNCgaH/xAAVAQEBAAAAAAAAAAAAAAAAAAAAAv/EABcRAQEBAQAAAAAAAAAAAAAA'.
-'AAABEUH/2gAMAwEAAhEDEQA/ANGvW4YVOeiRX5b4mv5Sin05IdlupPKdo/j2SO3+6TbPNQvOsTVz33KRT4csR3YUF7Dsh5OSFvug'.
-'kqG4FPBxnjxpvvi4KZb1pTpU+QwxUi2Y7ZIAefUk5ATxnB9/gbtL/wCH1UpuhPUlZlMVaQ0mS8zJjqZOPfc2TwpIUonI9tw40R1r'.
-'WNGq/wBdJR1XT3lqHBUnGCfkfWjRWs1ve249erQqQYjOtN1FqPUpCXQ4WIzQSsJwT0UpRwQPG0nzqyuNHobjsl9kBuWqoOoXtT1/'.
-'WppZcA8lKRj64HxqU+3KpAr6plElRVKef3S4E0K9O8pLXVzKcqSsJAB9wSAca6bSoNXeuA1+5pEV+SGFNU1iKVFqI0Vdx2AJUeoz'.
-'8DGlTDwG3CAf3q/pI0ah6MDhLz6U+EpXwPoaNMU//9k=' ; 
-
-        //==========================================================
-        // d1-small.jpg
-        //==========================================================
-        $this->chars['1'][0]= 646 ;
-        $this->chars['1'][1]=
-'/9j/4AAQSkZJRgABAQEASgBKAAD//gAJSnBHcmFwaP/bAEMACAYGBwYFCAcHBwkJCAoMFA0MCwsMGRITDxQdGh8eHRocHCAkLicg'.
-'IiwjHBwoNyksMDE0NDQfJzk9ODI8LjM0Mv/bAEMBCQkJDAsMGA0NGDIhHCEyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
-'MjIyMjIyMjIyMjIyMjIyMjIyMv/AABEIAB4AEwMBIgACEQEDEQH/xAAZAAADAAMAAAAAAAAAAAAAAAAABQYCBAf/xAApEAACAQMD'.
-'AwQBBQAAAAAAAAABAgMEBREABiESMUEHEyJRkSNCYXGB/8QAFgEBAQEAAAAAAAAAAAAAAAAAAAEC/8QAFxEBAQEBAAAAAAAAAAAA'.
-'AAAAAAEREv/aAAwDAQACEQMRAD8A6jdd4WLbstILnc4Uq0VoWpkJknb6IjXLHJUePOlez923fcW4r1SxWlqC2UbdKirQif3Xw3yA'.
-'OFAGT09/kO3OmV3a20MFRf6lIYPcpy7yRRAzgxjIy2M8YwcdiBzpX6d22VNvUlTXsFkuwkrKqNSfnK7F8OTzwrAY+l5zoxKskudN'.
-'EgQPUT9PBkWF3DH+1GPxo1mLnRoAqF2VRgGOFmX/AAgY/GjRUP6hVMFv2FuFqUvUGrpDFJMBnpdyF5bsAQew7Hxzp6LZNT0yQ1DI'.
-'wp0QCFBhD0jCsfLZHxbx5xxpTuvb1+v9PV7Ztk9roLPLCjmSSN3mX5ZwqjCgZX7PfWxDQb2in96pv9qq46aTE0bW4x9ceAWAYPwS'.
-'PsYzoixgmheBGjIVcYCnjp/jHjHbRpe1JLn9OnopE/a0ykvjwDx47aNMXqP/2Q==' ; 
-
-        //==========================================================
-        // ll-small.jpg
-        //==========================================================
-        $this->chars['l'][0]= 626 ;
-        $this->chars['l'][1]=
-'/9j/4AAQSkZJRgABAQEASgBKAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAx'.
-'NDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
-'MjIyMjIyMjL/wAARCAAeABcDASIAAhEBAxEB/8QAGAAAAgMAAAAAAAAAAAAAAAAAAAYEBQf/xAArEAACAQIFAwIGAwAAAAAAAAAB'.
-'AgMEEQAFBhIhFEFREzEHFSIyYcFxgZH/xAAXAQEAAwAAAAAAAAAAAAAAAAACAAED/8QAGhEAAwEAAwAAAAAAAAAAAAAAAAECMREh'.
-'Qf/aAAwDAQACEQMRAD8A15Zfm1VURj1Fp5AqLKv3OARcL4W5Nzx+MLWjdRz5hqXU6TSb6OCr6WghiQbrJ91gOTy1yT5xZ55myZFk'.
-'Gb5ozX6Ondm28XYqpQDwu7jEH4c5S2UaDy4xxrLmlUDWzk8XaQ3O49hbj+RiB85HNg8Ee3aqwIqhDuux7G/HHbvzgxEqaWOvy09R'.
-'O0o3hjdQoUji20g+fY3wYSM6pJ4Ylr7V+Zz5PSaezHTlTRNWzxySSxt6q1MSkH6AOT2Fu3Aw7RfF/T9DEkLUeawuF2mKSgdWQj2/'.
-'q3+fnDZDlqRZzQGaOGcpTOaeR1u8R+ncN3gj94so2jNWHeMNNKzorEX2qp9v3imNPoRE1zpjUtZ09HJmYq5lury0benZeTww23t3'.
-'Ivgw+T0yRRyyxIqNfkLcA8jt7YMKcBWn/9k=' ;
-
-
-        //==========================================================
-        // ls-small.jpg
-        //==========================================================
-        $this->chars['s'][0]= 701 ;
-        $this->chars['s'][1]=
-'/9j/4AAQSkZJRgABAQEASgBKAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAx'.
-'NDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
-'MjIyMjIyMjL/wAARCAAeABQDASIAAhEBAxEB/8QAGgAAAgMBAQAAAAAAAAAAAAAAAAMCBAUGB//EACwQAAEEAQIFAgUFAAAAAAAA'.
-'AAECAwQFEQAGEhMUITEiYQcjQVFxFRZCUoH/xAAWAQEBAQAAAAAAAAAAAAAAAAADAgH/xAAZEQADAQEBAAAAAAAAAAAAAAAAAQIR'.
-'EiH/2gAMAwEAAhEDEQA/APWZMhmFXSJU+SGmWFiQtAWMJQAnJUr8Z+w/OuQk71uZnMsqnbjy9s8st9UMCQ6kZJdZaIHEkZ/JHceN'.
-'N3HtizuY1JLrG48yLBSC9UTFKQiY4nACir+wAOOMEe2rm2bTbzlqtE1MyBuZAPybpw85KSfDRJ4Cg+Pl/wC61hJeGjV31VuuKqwr'.
-'LGU+whZZK+Rw+oYJAyj3GjS4dZFpZVkqPLktdfMXNcaU2kBC1BIITkdx6c599GlnvPAa3TL2vNvU76n0063acr3YSLCEjpUpUQtW'.
-'Dhf14SMEnOc57aZ8Tegm7dbrEQGZt1PeTDgc1PEW3FeXAvyAkZVkeMDOm2G3f3O7Cl/qEuqkQg4lp6CRxraWfUlRUD24kZA741Ko'.
-'2k1HvlT3ri2sLOCgtsyJz6XEtBwZPAgJAGQMHUNPWKqWItsqh0UCFVyLeKhyLHQ2TMdHNVj+RKlAnJyfto1FW2ahgjrq6LYTFjjf'.
-'lymUOLdWfJyoHA+gA7AAAaNPE3ysJdLT/9k=' ; 
-
-        //==========================================================
-        // lh-small.jpg
-        //==========================================================
-        $this->chars['h'][0]= 677 ;
-        $this->chars['h'][1]=
-'/9j/4AAQSkZJRgABAQEASgBKAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAx'.
-'NDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
-'MjIyMjIyMjL/wAARCAAeABUDASIAAhEBAxEB/8QAGgAAAQUBAAAAAAAAAAAAAAAAAAIDBAUGB//EACwQAAIBAwMCBQIHAAAAAAAA'.
-'AAECAwQFEQAGEiExExQiQVEVggcyU2GRocH/xAAXAQADAQAAAAAAAAAAAAAAAAAAAwQB/8QAGhEBAQEAAwEAAAAAAAAAAAAAAQAC'.
-'AyEyMf/aAAwDAQACEQMRAD8A6DZb95q9bmpK6ieOCzNHJTxmE+NMhQ5fr1fLq3Ejvkak2e7ipiFsqb3R0m4qkPPJRiRXenU9VjKE'.
-'5JVcA9R7nWc3/BUbfoKTdO3VRXhpjbZ2D8Rwk6RyZH6chB+46m7i2hDYtgA2ePlV2VkuKysoLzzRnlIScZJZeeevvjtrX7LK2rp7'.
-'tTwwJ9WjhILDrTKnIdMEDl2+P80aVdJZb1QW+vgqENLPH4sBCDLIwUgnOf4GjVvDnLgUk79T81voqjb8NnuUx8pVRCiEaYUSuynl'.
-'jHU9mOfnOoOx6hqz8PrbNdfEkMUXg1LSM3rKOUywJ7YAJ1ZTWmSpvdvlaVTDSUzJAhH5ZJBgv0x2RSAPlz21WXqoet3ba9nuW8n4'.
-'Jr6qTPqnUNxSM/f6mPvxA9zqJnExTbR+h0nkhVu1uE8j0UBRQ9PGxBKFjnkAScdsDp10a0lc7z0tI7Y5YYN+5GAf7GjVXF4Icj3f'.
-'/9k=' ; 
-
-
-        //==========================================================
-        // ld-small.jpg
-        //==========================================================
-        $this->chars['d'][0]= 681 ;
-        $this->chars['d'][1]=
-'/9j/4AAQSkZJRgABAQEASgBKAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAx'.
-'NDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
-'MjIyMjIyMjL/wAARCAAeABcDASIAAhEBAxEB/8QAGAAAAwEBAAAAAAAAAAAAAAAAAAQFBgH/xAAsEAABAwMEAAQFBQAAAAAAAAAB'.
-'AgMEBQYRABIhMQcTI0EUMlFhkRgicaGx/8QAFgEBAQEAAAAAAAAAAAAAAAAAAgEA/8QAGBEBAQEBAQAAAAAAAAAAAAAAAAECETH/'.
-'2gAMAwEAAhEDEQA/ALUhp6h3W/X63UlypbhCY0WMjLqGzwDtPCfv/WtealNpVInuVBBqCogcdbU36YUkAkJWVHG8YPXBxxzxqPcN'.
-'YtWyWnIlUeW05VEOAvrCnnSkftK1H5lKJPHsMDoDUWq+KdrSbIqsalVsImiEtLUZ2MU71bcYJWkhZ/36ayLHhi/IXZVOmzKqp5uU'.
-'688hTyjuGVEFJKvoQesD86NL2jGZp1EoLDSmk+ZAQ8d7oPzp3YGesFWMfxo1YGvSzLsT9QExVX8phTlMaFOExAJIBGQjJwCcL+/e'.
-'rd+W7GuO0Kw05CQ6+ww69Gfdb2kFIKk7DgEkjgnr86rXRa9HuyP8LV4SH0sIBbWFFDiFEgDaocgdkjo8ccay0qw7ut5nyrcviQqC'.
-'slsRKo0HwlODkBRzxj2AGoXTtpzIdQ8MbffUChz4NCPRaClAo9Mn6c7T3o13wytmo0K05VIqkiPJbizFiMWs4CTgnIIHOST796NL'.
-'Ia1JX//Z' ;
-
-        //==========================================================
-        // d8-small.jpg
-        //==========================================================
-        $this->chars['8'][0]= 694 ;
-        $this->chars['8'][1]=
-'/9j/4AAQSkZJRgABAQEASgBKAAD//gAJSnBHcmFwaP/bAEMACAYGBwYFCAcHBwkJCAoMFA0MCwsMGRITDxQdGh8eHRocHCAkLicg'.
-'IiwjHBwoNyksMDE0NDQfJzk9ODI8LjM0Mv/bAEMBCQkJDAsMGA0NGDIhHCEyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
-'MjIyMjIyMjIyMjIyMjIyMjIyMv/AABEIAB4AFQMBIgACEQEDEQH/xAAYAAADAQEAAAAAAAAAAAAAAAAABgcEBf/EACsQAAEDAwMD'.
-'AwMFAAAAAAAAAAECAwQFBhEAEiEUMVEHE0EVYYEiIzJCsf/EABYBAQEBAAAAAAAAAAAAAAAAAAIAAf/EABcRAQEBAQAAAAAAAAAA'.
-'AAAAAAABERL/2gAMAwEAAhEDEQA/AKL6gVVUa0i1T5QjvTprUJMlxW4R9zgQXe/AH+kaWrntqlWjaq7gpcmotXAw82ht9yY4tch8'.
-'uAFC0k7VBXPGMY51ruiaue+bThIj+7NbWqS+7HDxajFf6AlB/k44o8ZOABk4xkL0X0tZiojKrlRuGRJjugqldSlKGf6t7BuUQe3J'.
-'44xxxrA1a4KVJipLidri8uLHgqOcfjOPxo0o2hdDvS1CmV2Yl6fS5ioipIQR1CAlKkLKR2UUqAI8g6NRSwuuyHab6s1ufLI/Zai7'.
-'UBJOxhTS0+6B32pWSFH4CidOdWU0ukLiN1BLr0zG5Sdm3GRvcPhIT858DvjXNrVsSLnm/VIdTXS6tTnFsxZTSN3jchaTwps+O/z9'.
-'tcBVq3hIX0tYqlIiQHdy5CqRHKHXEjAOMgBKjnvyRk4xrQa7OiGt1K5biYZL8SoVEpjOqkFsONtJCNwASeCQrn7aNUKnQYtLp7EC'.
-'EylmLHQltptPZKQOBo1FzH//2Q==' ; 
-
-        //==========================================================
-        // lz-small.jpg
-        //==========================================================
-        $this->chars['z'][0]= 690 ;
-        $this->chars['z'][1]=
-'/9j/4AAQSkZJRgABAQEASgBKAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAx'.
-'NDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
-'MjIyMjIyMjL/wAARCAAeABYDASIAAhEBAxEB/8QAFwABAQEBAAAAAAAAAAAAAAAABgAHA//EACsQAAEDAwQBAwIHAAAAAAAAAAEC'.
-'AwQFESEABhIxBxMiQVFxCCM0UmGRof/EABYBAQEBAAAAAAAAAAAAAAAAAAECAP/EABgRAAMBAQAAAAAAAAAAAAAAAAABEVEC/9oA'.
-'DAMBAAIRAxEAPwBTWfLu1KXXZDbM4uewNvLajlwhaCbBAwDe5uehYd3xm6t6bi3jvulwqc7KgxXZZeYQLNLeF73WRg4HEdgfzrSa'.
-'P45pNEkznITDc9ypLShtyWhJDJyXC2qxJHZvjoZOjyVv1v8AESt6FFS4ijxvTLbawEApSccrYHJf0+OtJMQ2rNXk7GZMufJgJjTH'.
-'Un9M4qzxT7hyCiThIyRnPXWrRvyLElVBUF6vlhl0lwRYCFKcQhAtyWpVhyWTx+w++rUvp4EWjOvbniUOnVatcS43BYDbJSPZyIBw'.
-'ejclIx+3Wa+J63T6DQanuGszI0eZVJJV60p0Jum5GEi6le7l0PjvSjyRsaTvJqI1BqhhR46ksuMrQVJcUSEoUbHNr/7o7C8L7eiz'.
-'4lLlyJk2cEqW+6V+m0AE9ISLnsj5+O9UhsFK92bZZqb9SRu9p2c4A0OCEqDbYAJSlJwAVZv3fBvbFrg/462btlhuS1RG5nL8pYkq'.
-'KrnsKH06I/rVrQKkf//Z' ;
-
-        //==========================================================
-        // d4-small.jpg
-        //==========================================================
-        $this->chars['4'][0]= 643 ;
-        $this->chars['4'][1]=
-'/9j/4AAQSkZJRgABAQEASgBKAAD//gAJSnBHcmFwaP/bAEMACAYGBwYFCAcHBwkJCAoMFA0MCwsMGRITDxQdGh8eHRocHCAkLicg'.
-'IiwjHBwoNyksMDE0NDQfJzk9ODI8LjM0Mv/bAEMBCQkJDAsMGA0NGDIhHCEyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
-'MjIyMjIyMjIyMjIyMjIyMjIyMv/AABEIAB4AEgMBIgACEQEDEQH/xAAYAAADAQEAAAAAAAAAAAAAAAAABAYHAv/EAC0QAAIBAwQA'.
-'BAMJAAAAAAAAAAECAwQFEQAGEiETFDFBUmGBByIjUVNxobHR/8QAFgEBAQEAAAAAAAAAAAAAAAAAAAIB/8QAGBEBAAMBAAAAAAAA'.
-'AAAAAAAAAAERIVH/2gAMAwEAAhEDEQA/ANjM00Nxmt1xiWW31CZp5uJwoAAaOQ/n7qfcZHqO5my3q5XX7R6ijiqnNut9u4NyJ4yv'.
-'JJyjYr8Xhrn5g599J7x3ulBNU7Zo7dXXXcLQ8kURYi4epYtkALjOePv1nUvbLvV7P3BZm3DR3eh88Kp7pVzBZI6iUhGWRRGWwE44'.
-'HX3V+uiL1uHgt+vL/H+aNJQ3CSeCOaFqSaJ1DJKs/TqRkMOvQjvRorHE4pRDLNWLGlRHGUeYIORXs9e5B7OP31E0fmdyb/t0DJ4Q'.
-'27bfx3YZzPUIoAAz7IpOD6cuxq0uNumqLfVNDOqXBoZEjnZcqhIPXH4c46+WkdoWOltu3IDDLLLVVR83UVcuPEmmcZZ2/rHoAANG'.
-'GI7KIY1ijoLeEQBVCwIoAHpgY6Hy0aZe7mJ2jeHLKcEhusj6aNKgzr//2Q==' ; 
-
-        //==========================================================
-        // lv-small.jpg
-        //==========================================================
-        $this->chars['v'][0]= 648 ;
-        $this->chars['v'][1]=
-'/9j/4AAQSkZJRgABAQEASgBKAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAx'.
-'NDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
-'MjIyMjIyMjL/wAARCAAeABQDASIAAhEBAxEB/8QAGQAAAgMBAAAAAAAAAAAAAAAAAAQDBQYH/8QAKBAAAQQBAwMEAgMAAAAAAAAA'.
-'AQIDBBEFAAYhEzFBEhQiYQdRFTKB/8QAFgEBAQEAAAAAAAAAAAAAAAAAAAEC/8QAFxEBAQEBAAAAAAAAAAAAAAAAAAERIf/aAAwD'.
-'AQACEQMRAD8A6Ngt1SZ4yrYgrecgTFsFJA9aGwAUrUaF2D2Avjzq6CIjiBPkB9bwQVIkIYIDae/wq+P9N+dY4SGMf+Txlev7KBmY'.
-'PoadKRy4zxSgRxaTwO/x09u7KPYnasmHjlsyFZZXt4K23ezjvBpNGgLUrvXfVZyLLbWambiwEbKvvxYAkeotNlIJW2FEJWb7WBda'.
-'NSQI0fHYyJjkrjKRDZQwnpQ1vgBIr+w8+a+9GocZr8iKkuY1eXhsKH8U8iZE9BHz6ZHUc48UfSPqzqH3kfeO9kTTDQYGGietpTaO'.
-'shyW6AocpHNIrv8AvWzk9BUSdPdYS4BcRlomkhIV6KP0VE39V+tU2wdlRMHtZUB8NuTQ+51X27+Kr46ZPIAFV540D8zeLsJ5LMHa'.
-'ubmMBCVJdjx0pRyLoWR4I8aNIQ8BvZMNtMTeUcsptKfc4tC1gAkCyFC+K0aJtf/Z' ;
-
-        //==========================================================
-        // lk-small.jpg
-        //==========================================================
-        $this->chars['k'][0]= 680 ;
-        $this->chars['k'][1]=
-'/9j/4AAQSkZJRgABAQEASgBKAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAx'.
-'NDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
-'MjIyMjIyMjL/wAARCAAeABUDASIAAhEBAxEB/8QAGQAAAwEBAQAAAAAAAAAAAAAAAAUGBAMH/8QALhAAAQMDAwIEBAcAAAAAAAAA'.
-'AQIDBAUREgAGITFBEyIyYQcVUYEUIzNicZHx/8QAFgEBAQEAAAAAAAAAAAAAAAAAAwEE/8QAGxEAAwACAwAAAAAAAAAAAAAAAAEC'.
-'AxESMeH/2gAMAwEAAhEDEQA/APVK/V36dU6NSJDTT8esPLiqfK8S2cCoeTkKvZQ6jm2ldSqKqbu+OgMOvSX3m4UBrLnDlbqiefKl'.
-'Nzz2x1m+IwNP27CkJQ7JkR6rCkMJbP5jp8S2CPfkgD6H+dJ6Ca0nerr+64rTNSqMYrg+C9mmOwhVpDfsuxSbi97DmybaoZeQ5jTl'.
-'PEp18JTIfeW3kq3ly4H26aNZqvTWZsjFcZTsVtSg0G8Rio+vr2vb7g6NLPRnuXy8F+8kl+obUh4KXJdqSJJQnohlkZqJPYBXh3P+'.
-'a4b5Hyp6k1bO7sOotPyXkj9NlwFl0ewstJA9ifrqkVSmET4csoS7UTHXFQ+6SQlskKUMb/tH9ddLVUmS7DqdBqD7U6OsqfS46jzl'.
-'hQ5bXb1K9Scuybdxo2OTu92dwSZkWn0Sb8viQWyn8Qq5D6ifSLd0BIv7q0arTBRSKPToMZbi2GWylsvLK148Wue/XRrRjxOpT2R2'.
-'k9aP/9k=' ; 
-
-        //==========================================================
-        // lr-small.jpg
-        //==========================================================
-        $this->chars['r'][0]= 681 ;
-        $this->chars['r'][1]=
-'/9j/4AAQSkZJRgABAQEASgBKAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAx'.
-'NDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
-'MjIyMjIyMjL/wAARCAAeABYDASIAAhEBAxEB/8QAGgAAAgIDAAAAAAAAAAAAAAAAAAYCBQMEB//EAC4QAAICAQIFAgMJAQAAAAAA'.
-'AAECAwQRBQYAEiExQQdRFGFxEyIyM0JSYoGC8P/EABYBAQEBAAAAAAAAAAAAAAAAAAEAAv/EABcRAQEBAQAAAAAAAAAAAAAAAAAB'.
-'EUH/2gAMAwEAAhEDEQA/AOs0ZdETU54Gt1INSmlPJEsyo7J+jlXPUYBPY9c+eE/dO9tY0a7ren6BVrW7VJTZtW5kZkjXkBSIKveQ'.
-'gHp0AAJ4w+q2hVdT2Md0h46+saS4mr3EUK0gWTAB+vQj2PboeL/ZVOqmhaZVjkFmxdC6tctt3tM2G5/7bAx4C4+qxiWwd3prWzKe'.
-'r3IBAth5OYxozKsgc8y4GTgnJB9uncdTi6tXq2140rRVM13JMEMAVAg7sMdBjJB/18uDgRO9R2Oo6FX2vShkFzURFUq1whIj+8DI'.
-'7EdAFjXv7MeNb0kuStsFEmIaajZaos2fy2Q4VGH7SGxn+Rzw9yMLOm/FzRhZazmOTkP4grYyD3B8j2PTyeFfZ+z7G3BeSS8lmprl'.
-'2K2qcnK0Z5S8gPjrgAY8cNEWmq7u23pEos6/Zji+Kd0rLLGWwseA3joeZj/w4OET1g0vlmrWV+ydFnkUxSgsvM4V+YYIwfHz6cHB'.
-'ZeKZ1//Z' ; 
-
-        //==========================================================
-        // lg-small.jpg
-        //==========================================================
-        $this->chars['g'][0]= 655 ;
-        $this->chars['g'][1]=
-'/9j/4AAQSkZJRgABAQEASgBKAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAx'.
-'NDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
-'MjIyMjIyMjL/wAARCAAeABQDASIAAhEBAxEB/8QAGQAAAgMBAAAAAAAAAAAAAAAAAAQCBQYH/8QAJxAAAQQBAwQCAgMAAAAAAAAA'.
-'AQIDBBEFAAYhBxIxQRNhcYEiQlH/xAAYAQACAwAAAAAAAAAAAAAAAAACAwABBP/EABkRAAMBAQEAAAAAAAAAAAAAAAABAhEhIv/a'.
-'AAwDAQACEQMRAD8AayO4t6bq3hmMHtxyLi4OKeKH5jyASiiQCCQeTRNAeB61FrBb+jTGpLO+BMW24EFMhkhpQru8m7B/H70x09Yi'.
-'q3nv/vLfwpnJ7UNkqSRbngf2ofWkpXV7brymC2malLfagurjW0aHk89xPJ9cX9aprURHWbYEaMHHEBfwpv8AnXPk+/8AdGqGJOxO'.
-'4YbOSxK4y4boIStUWysgkEmxY54r60aOI8oTV9MHtjJwunPUbO46WWo0HLlD8KY4goboFVoquOVEVwLT963WdnxYfT6ZJyz0JvHm'.
-'KvtaSkW4tYNVSqKiTwB+fw5n9sY/cuOXCzDDcluyW3Ckd7V+0n0eNZTH9DdouFalHIOJBUhtDki0pNV3UALo81ehG6IdKjPZ6d47'.
-'4ywltanVJvuJI+RQs/sHRqy2r003JhsImEc/CUyhxRZBjKV2oJ8eRXNmufPnRo1WIz3DdNn/2Q==' ;
-
-        //==========================================================
-        // lc-small.jpg
-        //==========================================================
-        $this->chars['c'][0]= 629 ;
-        $this->chars['c'][1]=
-'/9j/4AAQSkZJRgABAQEASgBKAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAx'.
-'NDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
-'MjIyMjIyMjL/wAARCAAeABcDASIAAhEBAxEB/8QAGQAAAwEBAQAAAAAAAAAAAAAAAAUGBwID/8QALRAAAgICAQIEBAYDAAAAAAAA'.
-'AQIDBAURACExBhIiQRMVUWEHMkJScYFykaH/xAAWAQEBAQAAAAAAAAAAAAAAAAABAgP/xAAXEQEBAQEAAAAAAAAAAAAAAAAAATER'.
-'/9oADAMBAAIRAxEAPwDcoGkmiT4Q8kWvzuPU38D2/v8A1zwrCFayq1qTaFk2H7aJHt05MeMvENzC4upDWkjW9kJXiricAJCigvJN'.
-'IB1IVQT5frrv24twPgunk6a288crbklUSJNNdnSTZ2STHHqOP/Eb17njdZtAoqwEvrEiGVyG117/AG6HhyV8H1sljMldoxXTksGC'.
-'zV7M0oaWGQOVeGQ92I6EMR22D11w4LmEPjaOL51iL8ssc9Z69zHtZkYCGGeQK0ez2UEoU39wCeX1S/LLiEt+mPSbMLxsGVv2kEjR'.
-'305xkaEV/GTULMUT1LD/AAGh8gIZS2jv+vpybb8NMIb0dVLWYWgiiU0vmMphOj6V0TvQI3rfsON1E6dYjGtisa0F1mAWR2NhG0WZ'.
-'3Ls3TqNs5Hc9h23w49NWL9K+Q/VD5T/zhwPH/9k=' ; 
-
-        //==========================================================
-        // d7-small.jpg
-        //==========================================================
-        $this->chars['7'][0]= 658 ;
-        $this->chars['7'][1]=
-'/9j/4AAQSkZJRgABAQEASgBKAAD//gAJSnBHcmFwaP/bAEMACAYGBwYFCAcHBwkJCAoMFA0MCwsMGRITDxQdGh8eHRocHCAkLicg'.
-'IiwjHBwoNyksMDE0NDQfJzk9ODI8LjM0Mv/bAEMBCQkJDAsMGA0NGDIhHCEyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
-'MjIyMjIyMjIyMjIyMjIyMjIyMv/AABEIAB4AEgMBIgACEQEDEQH/xAAZAAACAwEAAAAAAAAAAAAAAAAABgEFBwT/xAAuEAABAwIE'.
-'BAQGAwAAAAAAAAABAgMEBREABiExEhMiQSMyUXEHFBclVJFhk9L/xAAXAQADAQAAAAAAAAAAAAAAAAAAAQID/8QAGREBAQEAAwAA'.
-'AAAAAAAAAAAAAAEREiFR/9oADAMBAAIRAxEAPwDXq9mCjZeQ05VZ5ZST4bfEpa3VdglCbqUe+g9MZ5Uq7V8415WXoMSdQ6etgSps'.
-'19wpkCMDZKUpv0FZvbi1NzpYasMDLDUbMVXrtQdbeeU23xLWkj5RlLYK0J7anW9gbAjCzkOtsVSUJUdtc6dVZK51UeaFm4LKbhpC'.
-'l7EhIFkDW974GbRI2XorUVls1OTdKAOqUpR0Hc3198GITQ6k+hLwrEpoODiDenRfW23bBicg78JXxPpD0mgVOW5PAivNNpahsPW5'.
-'8xxQaSVkboQnhsnYm5OHqDGp1IpsalMKjMsMIC3+XZKbJFth62/QOEfMOZqZXp9JcKZTcGmTky3meSi7xQklI81vMR+sXIz/AEgp'.
-'Q0qPNu6ea8Q2jqtbp8+2w9h/OKORc/cpHjt1dDSHOtLZ4ekHW23bBjj+o9H/AB539aP94MG0+L//2Q==' ; 
-
-        //==========================================================
-        // ly-small.jpg
-        //==========================================================
-        $this->chars['y'][0]= 672 ;
-        $this->chars['y'][1]=
-'/9j/4AAQSkZJRgABAQEASgBKAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAx'.
-'NDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
-'MjIyMjIyMjL/wAARCAAeABQDASIAAhEBAxEB/8QAGAAAAwEBAAAAAAAAAAAAAAAAAAQGBQf/xAArEAABAwMEAQIFBQAAAAAAAAAB'.
-'AgMEBREhAAYSEzEHIhQkQVGxQmFxgaH/xAAWAQEBAQAAAAAAAAAAAAAAAAADAQL/xAAeEQEAAgEEAwAAAAAAAAAAAAABABECAxIh'.
-'MUGR8P/aAAwDAQACEQMRAD8Ar3tys07dVHohemz5dWQ7fk91MsA3IIRY8rkKFySceTqw3JVV0KhyKw+0C1CQp9aUOFSiAk4AIAvn'.
-'76xtz0ioVvbcJ6msx2JtOfZmw1PKI5LQcJNh7UqBKcn6+NRfqPu6s1fYc6GxSJsRfWDUVSGA22ygEckJWSexRNgOP0udXzDKOJ0I'.
-'yo62mHm25Sy80l1Z4lSgpQvZRGLgWwPGjTjbchyLH+Ejx22EtJSgO8kki3kADA/nOjWjGzv73CyQZjUWNVp7bNSrj7qJDqflqUlQ'.
-'DMds24l3HvcNr3Pi9gME6T9WWVsemdYWswwC2lPta4m5WMA3OdUExCmozUJD6g84ntMjrHIFBTdQz5yLDx/WDNytpwW6nAkViqVe'.
-'uvmXdlme6n4dCwlRBKEgA2tj99QG7Ilncp5QqpU31PMsJ6x7A32f6SPxo0hPVCD45oVyKf0MtgeT97/nRrO7UOCFla3tn//Z' ; 
-
-        //==========================================================
-        // d3-small.jpg
-        //==========================================================
-        $this->chars['3'][0]= 662 ;
-        $this->chars['3'][1]=
-'/9j/4AAQSkZJRgABAQEASgBKAAD//gAJSnBHcmFwaP/bAEMACAYGBwYFCAcHBwkJCAoMFA0MCwsMGRITDxQdGh8eHRocHCAkLicg'.
-'IiwjHBwoNyksMDE0NDQfJzk9ODI8LjM0Mv/bAEMBCQkJDAsMGA0NGDIhHCEyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
-'MjIyMjIyMjIyMjIyMjIyMjIyMv/AABEIAB4AEgMBIgACEQEDEQH/xAAZAAACAwEAAAAAAAAAAAAAAAAABAUGBwL/xAArEAABBAED'.
-'AwMDBQEAAAAAAAABAgMEBREABhIhMUEiMmETFZEHFkJDUdH/xAAWAQEBAQAAAAAAAAAAAAAAAAABAAL/xAAYEQEBAQEBAAAAAAAA'.
-'AAAAAAAAEQExQf/aAAwDAQACEQMRAD8A0vclruBdk3VVLLUNssGRJsZSCtqOjlgJAHvcOD6c4HnOdIbcttw1W5P29cFEhuawqTXS'.
-'VsJjnCMBxKkJJx7goAde+ceJfdNxU0UNlyymyXHi6kxWUNl1S3EnkAEIHX2nv86qtTuZr9Q9+1VhRsOoYpYcgSVyAE/TdewkJxnK'.
-'sBCjkdPGpnOtFMd3PqsXgfOAgD8Y0aX+11H9rDDjn8lr9yj5J+dGqsqxaw6Cc9cQZU4Sp7zTJsIrKlcUEKwhSin1JABI45GUjqOu'.
-'lbOvjbc3Ts9ynjGCy445UuFLYRzbWgrT6fhSCQSMDke+pew2zYVly/d7YchNqkMJZnQpgV9J8IzwWFJyUrAJHYgjvpLbu37G5nR7'.
-'vck5C3YRKYEOEVJZj8kjKypXqWvirjk9h+dB9i4faa89TDZUfKlIyT8k+To10a6KTkpcJ/0vL/7o0TS//9k=' ; 
-
-        //==========================================================
-        // ln-small.jpg
-        //==========================================================
-        $this->chars['n'][0]= 643 ;
-        $this->chars['n'][1]=
-'/9j/4AAQSkZJRgABAQEASgBKAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAx'.
-'NDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
-'MjIyMjIyMjL/wAARCAAeABQDASIAAhEBAxEB/8QAGwAAAgEFAAAAAAAAAAAAAAAAAAYCAQMEBQf/xAAtEAACAQMCBAUCBwAAAAAA'.
-'AAABAgMEBREAIQYSE0EHIjFRcWGRIzIzQoGCwf/EABYBAQEBAAAAAAAAAAAAAAAAAAMEAP/EABkRAQEBAQEBAAAAAAAAAAAAAAEA'.
-'AhEhUf/aAAwDAQACEQMRAD8A6FR3p7v4oV9rlkMQsjL00RyOss0KkFxnDcrc2PbI1NOJKyTjW+W5OmKeA0UEJx5meRZS2/8AUfbS'.
-'LVGS1+K16vCzfiR3GmoqqXGyxz06hWPsFlVMfOmq1iNvE69KjBYo3oJMZ3GKeYYPxg/fW+xzZX1FLQyxwSTcpWNceu4G3+aNSmpY'.
-'qmQzzwh2k8yhv2r2H23/AJ0aoy+EWh7I1ntacR3PxDtEzhjWy0wkkIwYmanU5GO6sNh7rrU8AVdTceNbhDXxNHUQvS0tZ3DzwxVA'.
-'fB7hj59/XJ08cPWaKj4gvlwSQiG7dCboqvLy9NOmQT9SM7ayJrBa6K5V91hjlWorp4JGUOAglRSiMMDb82/vgaBGTpVvtNUVtyJg'.
-'5+WNAh5ZCu/r2+dGrgq0pi0DhmlRsSSAfqMd+b6ZyNu3po1Rk1yNBe3/2Q==' ; 
-
-        //==========================================================
-        // lu-small.jpg
-        //==========================================================
-        $this->chars['u'][0]= 671 ;
-        $this->chars['u'][1]=
-'/9j/4AAQSkZJRgABAQEASgBKAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAx'.
-'NDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
-'MjIyMjIyMjL/wAARCAAeABcDASIAAhEBAxEB/8QAGQAAAgMBAAAAAAAAAAAAAAAAAAYDBAUH/8QAJRAAAQQBAwQDAQEAAAAAAAAA'.
-'AQIDBBEFAAYhBxMxYRJBURSB/8QAFgEBAQEAAAAAAAAAAAAAAAAAAQAD/8QAGhEBAQEAAwEAAAAAAAAAAAAAAQARITFBAv/aAAwD'.
-'AQACEQMRAD8A6dLkQmJzu3WVtHIqjf0duKFNuBr5UTQ45F1R8/XI1PMmsYoJyjhS9iI7BKHeKjkXZVXqhyLHP+rrHeR1pZlx1W1M'.
-'wTiW0ukkrS28nn5fV2SPPFfurHUKQhzYG7pLYKEfyBhaSOS7dG/YCki/uvWn3LPDOJrwa4kyEzOYeakqkpC3Hk0bNePQHgDRpchY'.
-'leIZwzUWauKtuPctTSUlCAUmrBHIKuAPV/ujQsmHdm7hya43UbbD3ZVElOQJsdTS6IQaQUqBHCk8E2Pocgam6oYwObHy0Zm0oi45'.
-'T1KBPdpV2f0pom/1Ws7cmPazu98Ltvcq3VzRHfehz8a4pirFEKRZo8eQT+eCdWYfS/b+WYnxpbuVcDRMdHcyTqg2fiAfiLoi+Rf+'.
-'jT7Xc74HtOYnHyUOh8yWUvKeHhy0CiPVUAPoDRrm+OeznTva6lzsyMjCYbbaiNJjJSWElagD5tRpNUSALFeNGoOCH7Bv/9k=' ; 
-
-        //==========================================================
-        // lw-small.jpg
-        //==========================================================
-        $this->chars['w'][0]= 673 ;
-        $this->chars['w'][1]=
-'/9j/4AAQSkZJRgABAQEASgBKAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAx'.
-'NDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
-'MjIyMjIyMjL/wAARCAAeABcDASIAAhEBAxEB/8QAGAAAAgMAAAAAAAAAAAAAAAAAAAYDBAX/xAAtEAACAQMDAgMHBQAAAAAAAAAB'.
-'AgMEBREABhIhMRMUQRUiIzJRYZEWNIGx0f/EABYBAQEBAAAAAAAAAAAAAAAAAAABA//EABoRAAICAwAAAAAAAAAAAAAAAAABERIh'.
-'MVH/2gAMAwEAAhEDEQA/AHXbV13ZLu6t2/uaa1JijWopVp4XUTKSAXRyc+6ehBGeoPbTSlwpql0K3GneqpZViqUhI5JzGMEZJGeh'.
-'GlXfaFILDf7FQzXC426rDLTojs8sLqVkXBGcfKf40twWbdWzZY75R0s90ul3jPtKjVMJDNn4DDp8iEhW+wJ1WZG2KWt3Lv26U1tv'.
-'92o7PaYkgYUbqVepYlmUBlIwqnB++O2jTDt/bBtth9jcpvEWNGqalZQryTlmeR8jPct6+mNGmRC4a1U13htzVFItB5nA/cyOUVfp'.
-'7oz/ALqitJulYJKuqvFsppHALLFb3cp9FBaXr+O51bq0q6i38KK5PDVAAxSzU6SIpz3Kjjn8jUFoS7uFmut1gq17xLFQ+DxOccj8'.
-'Rsn+tVpiyJnqv09YfOXu5AycgZZQEhBZjgDBOOgwO/po0sttWHdNzqLruioa4UwmdaC3kYp4IwSvJlBHKQ4OSe3po0qxM6P/2Q==' ;
-
-        //==========================================================
-        // lq-small.jpg
-        //==========================================================
-        $this->chars['q'][0]= 671 ;
-        $this->chars['q'][1]=
-'/9j/4AAQSkZJRgABAQEASgBKAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAx'.
-'NDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
-'MjIyMjIyMjL/wAARCAAeABQDASIAAhEBAxEB/8QAGQAAAgMBAAAAAAAAAAAAAAAAAAcDBAUG/8QAKRAAAQQBBAICAQQDAAAAAAAA'.
-'AQIDBBEFAAYSIQcxIlETCBQVgSNBYf/EABUBAQEAAAAAAAAAAAAAAAAAAAAB/8QAFhEBAQEAAAAAAAAAAAAAAAAAAAER/9oADAMB'.
-'AAIRAxEAPwDT3H5Qz+O3LN2vtrF/y86NYLzzVlAABJITQPv2a/17vXMboz3lDEYWPuafNx7CFrS03+2jpK2bs0CUkUa7pRvrUu63'.
-'sr438yv7pLEo4XIK5Kcji0uJUkckm+uQUOVH6GsnyJv7A5vaJwuFdkONLmolgONFH4vioKRXYqyCADXvRMh0yspmZ4jyIEtDTK47'.
-'aiA0lQUopBJBI/7X9aNT7amRo228e3a31iO3yUzCcdSPiKAIFdCho0TIswZ7GQlO/hlRxBooih1YXzAoKUkX0LPEBX110dJ7zbuv'.
-'AORpO04cIpmxH23FSEIRwKuNnsdk0o31702XhFMKbuRUZJWP8LTQ6HBCuIB+iVWSR2BXuqK93/hDlvGzEphmG3Ml5JpDi1I7TzNA'.
-'BYFlPafY+/7LBiv1CYDH4iFDOGySlMR22lFP4wCUpANfL11o1r4bxXlWMNEaE/bqlIbCFl/ANPK5Do/M0VDr2Rf3o0TX/9k=' ;
-
-
-
-    }
-}
-
-class AntiSpam {
-
-    private $iData='';
-    private $iDD=null;
-
-    function __construct($aData='') {
-        $this->iData = $aData;
-        $this->iDD = new HandDigits();
-    }
-
-    function Set($aData) {
-        $this->iData = $aData;
-    }
-
-    function Rand($aLen) {
-        $d='';
-        for($i=0; $i < $aLen; ++$i) {
-            if( rand(0,9) < 6 ) {
-                // Digits
-                $d .= chr( ord('1') + rand(0,8) );
-            }
-            else {
-                // Letters
-                do {
-                    $offset = rand(0,25);
-                } while ( $offset==14 );
-                $d .= chr( ord('a') + $offset );
-            }
-        }
-        $this->iData = $d;
-        return $d;
-    }
-
-    function Stroke() {
-
-        $n=strlen($this->iData);
-        if( $n==0 ) {
-            return false;
-        }
-
-        for($i=0; $i < $n; ++$i ) {
-            if( $this->iData[$i]==='0' || strtolower($this->iData[$i])==='o') {
-                return false;
-            }
-        }
-
-        $img = @imagecreatetruecolor($n*$this->iDD->iWidth, $this->iDD->iHeight);
-        if( $img < 1 ) {
-            return false;
-        }
-
-        $start=0;
-        for($i=0; $i < $n; ++$i ) {
-            $dimg = imagecreatefromstring(base64_decode($this->iDD->chars[strtolower($this->iData[$i])][1]));
-            imagecopy($img,$dimg,$start,0,0,0,imagesx($dimg), $this->iDD->iHeight);
-            $start += imagesx($dimg);
-        }
-        $resimg = @imagecreatetruecolor($start+4, $this->iDD->iHeight+4);
-        if( $resimg < 1 ) {
-            return false;
-        }
-
-        imagecopy($resimg,$img,2,2,0,0,$start, $this->iDD->iHeight);
-        header("Content-type: image/jpeg");
-        imagejpeg($resimg);
-        return true;
-    }
-}
-
-?>
diff --git a/#jpgraph/src/jpgraph_bar.php b/#jpgraph/src/jpgraph_bar.php
deleted file mode 100644
index cedc1836..00000000
--- a/#jpgraph/src/jpgraph_bar.php
+++ /dev/null
@@ -1,1190 +0,0 @@
-<?php
-/*=======================================================================
- // File:        JPGRAPH_BAR.PHP
- // Description: Bar plot extension for JpGraph
- // Created:     2001-01-08
- // Ver:         $Id: jpgraph_bar.php 1905 2009-10-06 18:00:21Z ljp $
- //
- // Copyright (c) Asial Corporation. All rights reserved.
- //========================================================================
- */
-
-require_once('jpgraph_plotband.php');
-
-// Pattern for Bars
-DEFINE('PATTERN_DIAG1',1);
-DEFINE('PATTERN_DIAG2',2);
-DEFINE('PATTERN_DIAG3',3);
-DEFINE('PATTERN_DIAG4',4);
-DEFINE('PATTERN_CROSS1',5);
-DEFINE('PATTERN_CROSS2',6);
-DEFINE('PATTERN_CROSS3',7);
-DEFINE('PATTERN_CROSS4',8);
-DEFINE('PATTERN_STRIPE1',9);
-DEFINE('PATTERN_STRIPE2',10);
-
-//===================================================
-// CLASS BarPlot
-// Description: Main code to produce a bar plot
-//===================================================
-class BarPlot extends Plot {
-    public $fill=false,$fill_color="lightblue"; // Default is to fill with light blue
-    public $iPattern=-1,$iPatternDensity=80,$iPatternColor='black';
-    public $valuepos='top';
-    public $grad=false,$grad_style=1;
-    public $grad_fromcolor=array(50,50,200),$grad_tocolor=array(255,255,255);
-    public $ymin=0;
-    protected $width=0.4; // in percent of major ticks
-    protected $abswidth=-1; // Width in absolute pixels
-    protected $ybase=0; // Bars start at 0
-    protected $align="center";
-    protected $bar_shadow=false;
-    protected $bar_shadow_color="black";
-    protected $bar_shadow_hsize=3,$bar_shadow_vsize=3;
-    protected $bar_3d=false;
-    protected $bar_3d_hsize=3,$bar_3d_vsize=3;
-
-    //---------------
-    // CONSTRUCTOR
-    function __construct($datay,$datax=false) {
-        parent::__construct($datay,$datax);
-        ++$this->numpoints;
-    }
-
-    //---------------
-    // PUBLIC METHODS
-
-    // Set a drop shadow for the bar (or rather an "up-right" shadow)
-    function SetShadow($aColor="black",$aHSize=3,$aVSize=3,$aShow=true) {
-        $this->bar_shadow=$aShow;
-        $this->bar_shadow_color=$aColor;
-        $this->bar_shadow_vsize=$aVSize;
-        $this->bar_shadow_hsize=$aHSize;
-
-        // Adjust the value margin to compensate for shadow
-        $this->value->margin += $aVSize;
-    }
-
-    function Set3D($aHSize=3,$aVSize=3,$aShow=true) {
-        $this->bar_3d=$aShow;
-        $this->bar_3d_vsize=$aVSize;
-        $this->bar_3d_hsize=$aHSize;
-
-        $this->value->margin += $aVSize;
-    }
-
-    // DEPRECATED use SetYBase instead
-    function SetYMin($aYStartValue) {
-        //die("JpGraph Error: Deprecated function SetYMin. Use SetYBase() instead.");
-        $this->ybase=$aYStartValue;
-    }
-
-    // Specify the base value for the bars
-    function SetYBase($aYStartValue) {
-        $this->ybase=$aYStartValue;
-    }
-
-    // The method will take the specified pattern anre
-    // return a pattern index that corresponds to the original
-    // patterm being rotated 90 degreees. This is needed when plottin
-    // Horizontal bars
-    function RotatePattern($aPat,$aRotate=true) {
-        $rotate = array(1 => 2, 2 => 1, 3 => 3, 4 => 5, 5 => 4, 6 => 6, 7 => 7, 8 => 8);
-        if( $aRotate ) {
-            return $rotate[$aPat];
-        }
-        else {
-            return $aPat;
-        }
-    }
-
-    function Legend($graph) {
-        if( $this->grad && $this->legend!="" && !$this->fill ) {
-            $color=array($this->grad_fromcolor,$this->grad_tocolor);
-            // In order to differentiate between gradients and cooors specified as an RGB triple
-            $graph->legend->Add($this->legend,$color,"",-$this->grad_style,
-            $this->legendcsimtarget,$this->legendcsimalt,$this->legendcsimwintarget);
-        }
-        elseif( $this->legend!="" && ($this->iPattern > -1 || is_array($this->iPattern)) ) {
-            if( is_array($this->iPattern) ) {
-                $p1 = $this->RotatePattern( $this->iPattern[0], $graph->img->a == 90 );
-                $p2 = $this->iPatternColor[0];
-                $p3 = $this->iPatternDensity[0];
-            }
-            else {
-                $p1 = $this->RotatePattern( $this->iPattern, $graph->img->a == 90 );
-                $p2 = $this->iPatternColor;
-                $p3 = $this->iPatternDensity;
-            }
-            if( $p3 < 90 ) $p3 += 5;
-            $color = array($p1,$p2,$p3,$this->fill_color);
-            // A kludge: Too mark that we add a pattern we use a type value of < 100
-            $graph->legend->Add($this->legend,$color,"",-101,
-                                $this->legendcsimtarget,$this->legendcsimalt,$this->legendcsimwintarget);
-        }
-        elseif( $this->fill_color && $this->legend!="" ) {
-            if( is_array($this->fill_color) ) {
-                $graph->legend->Add($this->legend,$this->fill_color[0],"",0,
-                $this->legendcsimtarget,$this->legendcsimalt,$this->legendcsimwintarget);
-            }
-            else {
-                $graph->legend->Add($this->legend,$this->fill_color,"",0,
-                $this->legendcsimtarget,$this->legendcsimalt,$this->legendcsimwintarget);
-            }
-        }
-    }
-
-    // Gets called before any axis are stroked
-    function PreStrokeAdjust($graph) {
-        parent::PreStrokeAdjust($graph);
-
-        // If we are using a log Y-scale we want the base to be at the
-        // minimum Y-value unless the user have specifically set some other
-        // value than the default.
-        if( substr($graph->axtype,-3,3)=="log" && $this->ybase==0 )
-        $this->ybase = $graph->yaxis->scale->GetMinVal();
-
-        // For a "text" X-axis scale we will adjust the
-        // display of the bars a little bit.
-        if( substr($graph->axtype,0,3)=="tex" ) {
-            // Position the ticks between the bars
-            $graph->xaxis->scale->ticks->SetXLabelOffset(0.5,0);
-
-            // Center the bars
-            if( $this->abswidth > -1 ) {
-                $graph->SetTextScaleAbsCenterOff($this->abswidth);
-            }
-            else {
-                if( $this->align == "center" )
-                $graph->SetTextScaleOff(0.5-$this->width/2);
-                elseif( $this->align == "right" )
-                $graph->SetTextScaleOff(1-$this->width);
-            }
-        }
-        elseif( ($this instanceof AccBarPlot) || ($this instanceof GroupBarPlot) ) {
-            // We only set an absolute width for linear and int scale
-            // for text scale the width will be set to a fraction of
-            // the majstep width.
-            if( $this->abswidth == -1 ) {
-                // Not set
-                // set width to a visuable sensible default
-                $this->abswidth = $graph->img->plotwidth/(2*$this->numpoints);
-            }
-        }
-    }
-
-    function Min() {
-        $m = parent::Min();
-        if( $m[1] >= $this->ybase ) $m[1] = $this->ybase;
-        return $m;
-    }
-
-    function Max() {
-        $m = parent::Max();
-        if( $m[1] <= $this->ybase ) $m[1] = $this->ybase;
-        return $m;
-    }
-
-    // Specify width as fractions of the major stepo size
-    function SetWidth($aWidth) {
-        if( $aWidth > 1 ) {
-            // Interpret this as absolute width
-            $this->abswidth=$aWidth;
-        }
-        else {
-            $this->width=$aWidth;
-        }
-    }
-
-    // Specify width in absolute pixels. If specified this
-    // overrides SetWidth()
-    function SetAbsWidth($aWidth) {
-        $this->abswidth=$aWidth;
-    }
-
-    function SetAlign($aAlign) {
-        $this->align=$aAlign;
-    }
-
-    function SetNoFill() {
-        $this->grad = false;
-        $this->fill_color=false;
-        $this->fill=false;
-    }
-
-    function SetFillColor($aColor) {
-        // Do an extra error check if the color is specified as an RGB array triple
-        // In that case convert it to a hex string since it will otherwise be
-        // interpretated as an array of colors for each individual bar.
-
-        $aColor = RGB::tryHexConversion($aColor);
-        $this->fill = true ;
-        $this->fill_color=$aColor;
-
-    }
-
-    function SetFillGradient($aFromColor,$aToColor=null,$aStyle=null) {
-        $this->grad = true;
-        $this->grad_fromcolor = $aFromColor;
-        $this->grad_tocolor   = $aToColor;
-        $this->grad_style     = $aStyle;
-    }
-
-    function SetValuePos($aPos) {
-        $this->valuepos = $aPos;
-    }
-
-    function SetPattern($aPattern, $aColor='black'){
-        if( is_array($aPattern) ) {
-            $n = count($aPattern);
-            $this->iPattern = array();
-            $this->iPatternDensity = array();
-            if( is_array($aColor) ) {
-                $this->iPatternColor = array();
-                if( count($aColor) != $n ) {
-                    JpGraphError::RaiseL(2001);//('NUmber of colors is not the same as the number of patterns in BarPlot::SetPattern()');
-                }
-            }
-            else {
-                $this->iPatternColor = $aColor;
-            }
-            for( $i=0; $i < $n; ++$i ) {
-                $this->_SetPatternHelper($aPattern[$i], $this->iPattern[$i], $this->iPatternDensity[$i]);
-                if( is_array($aColor) ) {
-                    $this->iPatternColor[$i] = $aColor[$i];
-                }
-            }
-        }
-        else {
-            $this->_SetPatternHelper($aPattern, $this->iPattern, $this->iPatternDensity);
-            $this->iPatternColor = $aColor;
-        }
-    }
-
-    function _SetPatternHelper($aPattern, &$aPatternValue, &$aDensity){
-        switch( $aPattern ) {
-            case PATTERN_DIAG1:
-                $aPatternValue= 1;
-                $aDensity = 92;
-                break;
-            case PATTERN_DIAG2:
-                $aPatternValue= 1;
-                $aDensity = 78;
-                break;
-            case PATTERN_DIAG3:
-                $aPatternValue= 2;
-                $aDensity = 92;
-                break;
-            case PATTERN_DIAG4:
-                $aPatternValue= 2;
-                $aDensity = 78;
-                break;
-            case PATTERN_CROSS1:
-                $aPatternValue= 8;
-                $aDensity = 90;
-                break;
-            case PATTERN_CROSS2:
-                $aPatternValue= 8;
-                $aDensity = 78;
-                break;
-            case PATTERN_CROSS3:
-                $aPatternValue= 8;
-                $aDensity = 65;
-                break;
-            case PATTERN_CROSS4:
-                $aPatternValue= 7;
-                $aDensity = 90;
-                break;
-            case PATTERN_STRIPE1:
-                $aPatternValue= 5;
-                $aDensity = 94;
-                break;
-            case PATTERN_STRIPE2:
-                $aPatternValue= 5;
-                $aDensity = 85;
-                break;
-            default:
-                JpGraphError::RaiseL(2002);
-                //('Unknown pattern specified in call to BarPlot::SetPattern()');
-        }
-    }
-
-    function Stroke($img,$xscale,$yscale) {
-
-        $numpoints = count($this->coords[0]);
-        if( isset($this->coords[1]) ) {
-            if( count($this->coords[1])!=$numpoints ) {
-                JpGraphError::RaiseL(2003,count($this->coords[1]),$numpoints);
-            //"Number of X and Y points are not equal. Number of X-points:".count($this->coords[1])."Number of Y-points:$numpoints");
-            }
-            else {
-                $exist_x = true;
-            }
-        }
-        else {
-            $exist_x = false;
-        }
-
-
-        $numbars=count($this->coords[0]);
-
-        // Use GetMinVal() instead of scale[0] directly since in the case
-        // of log scale we get a correct value. Log scales will have negative
-        // values for values < 1 while still not representing negative numbers.
-        if( $yscale->GetMinVal() >= 0 )
-        $zp=$yscale->scale_abs[0];
-        else {
-            $zp=$yscale->Translate(0);
-        }
-
-        if( $this->abswidth > -1 ) {
-            $abswidth=$this->abswidth;
-        }
-        else {
-            $abswidth=round($this->width*$xscale->scale_factor,0);
-        }
-
-        // Count pontetial pattern array to avoid doing the count for each iteration
-        if( is_array($this->iPattern) ) {
-            $np = count($this->iPattern);
-        }
-
-        $grad = null;
-        for($i=0; $i < $numbars; ++$i) {
-
-            // If value is NULL, or 0 then don't draw a bar at all
-            if ($this->coords[0][$i] === null || $this->coords[0][$i] === '' )
-            continue;
-
-            if( $exist_x ) {
-                $x=$this->coords[1][$i];
-            }
-            else {
-                $x=$i;
-            }
-
-            $x=$xscale->Translate($x);
-
-            // Comment Note: This confuses the positioning when using acc together with
-            // grouped bars. Workaround for fixing #191
-            /*
-            if( !$xscale->textscale ) {
-            if($this->align=="center")
-            $x -= $abswidth/2;
-            elseif($this->align=="right")
-            $x -= $abswidth;
-            }
-            */
-            // Stroke fill color and fill gradient
-            $pts=array(
-            $x,$zp,
-            $x,$yscale->Translate($this->coords[0][$i]),
-            $x+$abswidth,$yscale->Translate($this->coords[0][$i]),
-            $x+$abswidth,$zp);
-            if( $this->grad ) {
-                if( $grad === null ) {
-                    $grad = new Gradient($img);
-                }
-                if( is_array($this->grad_fromcolor) ) {
-                    // The first argument (grad_fromcolor) can be either an array or a single color. If it is an array
-                    // then we have two choices. It can either a) be a single color specified as an RGB triple or it can be
-                    // an array to specify both (from, to style) for each individual bar. The way to know the difference is
-                    // to investgate the first element. If this element is an integer [0,255] then we assume it is an RGB
-                    // triple.
-                    $ng = count($this->grad_fromcolor);
-                    if( $ng === 3 ) {
-                        if( is_numeric($this->grad_fromcolor[0]) && $this->grad_fromcolor[0] > 0 && $this->grad_fromcolor[0] < 256 ) {
-                            // RGB Triple
-                            $fromcolor = $this->grad_fromcolor;
-                            $tocolor = $this->grad_tocolor;
-                            $style = $this->grad_style;
-                        }
-                        else {
-                            $fromcolor = $this->grad_fromcolor[$i % $ng][0];
-                            $tocolor = $this->grad_fromcolor[$i % $ng][1];
-                            $style = $this->grad_fromcolor[$i % $ng][2];
-                        }
-                    }
-                    else {
-                        $fromcolor = $this->grad_fromcolor[$i % $ng][0];
-                        $tocolor = $this->grad_fromcolor[$i % $ng][1];
-                        $style = $this->grad_fromcolor[$i % $ng][2];
-                    }
-                    $grad->FilledRectangle($pts[2],$pts[3],
-                                           $pts[6],$pts[7],
-                                           $fromcolor,$tocolor,$style);
-                }
-                else {
-                    $grad->FilledRectangle($pts[2],$pts[3],
-                    $pts[6],$pts[7],
-                    $this->grad_fromcolor,$this->grad_tocolor,$this->grad_style);
-                }
-            }
-            elseif( !empty($this->fill_color) ) {
-                if(is_array($this->fill_color)) {
-                    $img->PushColor($this->fill_color[$i % count($this->fill_color)]);
-                } else {
-                    $img->PushColor($this->fill_color);
-                }
-                $img->FilledPolygon($pts);
-                $img->PopColor();
-            }
-
-/////////////////////////kokorahen rectangle polygon//////////////////////
-
-            // Remember value of this bar
-            $val=$this->coords[0][$i];
-
-            if( !empty($val) && !is_numeric($val) ) {
-                JpGraphError::RaiseL(2004,$i,$val);
-                //'All values for a barplot must be numeric. You have specified value['.$i.'] == \''.$val.'\'');
-            }
-
-            // Determine the shadow
-            if( $this->bar_shadow && $val != 0) {
-
-                $ssh = $this->bar_shadow_hsize;
-                $ssv = $this->bar_shadow_vsize;
-                // Create points to create a "upper-right" shadow
-                if( $val > 0 ) {
-                    $sp[0]=$pts[6];  $sp[1]=$pts[7];
-                    $sp[2]=$pts[4];  $sp[3]=$pts[5];
-                    $sp[4]=$pts[2];  $sp[5]=$pts[3];
-                    $sp[6]=$pts[2]+$ssh; $sp[7]=$pts[3]-$ssv;
-                    $sp[8]=$pts[4]+$ssh; $sp[9]=$pts[5]-$ssv;
-                    $sp[10]=$pts[6]+$ssh; $sp[11]=$pts[7]-$ssv;
-                }
-                elseif( $val < 0 ) {
-                    $sp[0]=$pts[4];  $sp[1]=$pts[5];
-                    $sp[2]=$pts[6];  $sp[3]=$pts[7];
-                    $sp[4]=$pts[0];  $sp[5]=$pts[1];
-                    $sp[6]=$pts[0]+$ssh; $sp[7]=$pts[1]-$ssv;
-                    $sp[8]=$pts[6]+$ssh; $sp[9]=$pts[7]-$ssv;
-                    $sp[10]=$pts[4]+$ssh; $sp[11]=$pts[5]-$ssv;
-                }
-                if( is_array($this->bar_shadow_color) ) {
-                    $numcolors = count($this->bar_shadow_color);
-                    if( $numcolors == 0 ) {
-                        JpGraphError::RaiseL(2005);//('You have specified an empty array for shadow colors in the bar plot.');
-                    }
-                    $img->PushColor($this->bar_shadow_color[$i % $numcolors]);
-                }
-                else {
-                    $img->PushColor($this->bar_shadow_color);
-                }
-                $img->FilledPolygon($sp);
-                $img->PopColor();
-
-            } elseif( $this->bar_3d && $val != 0) {
-              // Determine the 3D
-
-                $ssh = $this->bar_3d_hsize;
-                $ssv = $this->bar_3d_vsize;
-
-                // Create points to create a "upper-right" shadow
-                if( $val > 0 ) {
-                    $sp1[0]=$pts[6];  $sp1[1]=$pts[7];
-                    $sp1[2]=$pts[4];  $sp1[3]=$pts[5];
-                    $sp1[4]=$pts[4]+$ssh; $sp1[5]=$pts[5]-$ssv;
-                    $sp1[6]=$pts[6]+$ssh; $sp1[7]=$pts[7]-$ssv;
-
-                    $sp2[0]=$pts[4];  $sp2[1]=$pts[5];
-                    $sp2[2]=$pts[2];  $sp2[3]=$pts[3];
-                    $sp2[4]=$pts[2]+$ssh; $sp2[5]=$pts[3]-$ssv;
-                    $sp2[6]=$pts[4]+$ssh; $sp2[7]=$pts[5]-$ssv;
-
-                }
-                elseif( $val < 0 ) {
-                    $sp1[0]=$pts[4];  $sp1[1]=$pts[5];
-                    $sp1[2]=$pts[6];  $sp1[3]=$pts[7];
-                    $sp1[4]=$pts[6]+$ssh; $sp1[5]=$pts[7]-$ssv;
-                    $sp1[6]=$pts[4]+$ssh; $sp1[7]=$pts[5]-$ssv;
-
-                    $sp2[0]=$pts[6];  $sp2[1]=$pts[7];
-                    $sp2[2]=$pts[0];  $sp2[3]=$pts[1];
-                    $sp2[4]=$pts[0]+$ssh; $sp2[5]=$pts[1]-$ssv;
-                    $sp2[6]=$pts[6]+$ssh; $sp2[7]=$pts[7]-$ssv;
-                }
-
-                $base_color = $this->fill_color;
-
-                $img->PushColor($base_color . ':0.7');
-                $img->FilledPolygon($sp1);
-                $img->PopColor();
-
-                $img->PushColor($base_color . ':1.1');
-                $img->FilledPolygon($sp2);
-                $img->PopColor();
-            }
-
-            // Stroke the pattern
-            if( is_array($this->iPattern) ) {
-                $f = new RectPatternFactory();
-                if( is_array($this->iPatternColor) ) {
-                    $pcolor = $this->iPatternColor[$i % $np];
-                }
-                else {
-                    $pcolor = $this->iPatternColor;
-                }
-                $prect = $f->Create($this->iPattern[$i % $np],$pcolor,1);
-                $prect->SetDensity($this->iPatternDensity[$i % $np]);
-
-                if( $val < 0 ) {
-                    $rx = $pts[0];
-                    $ry = $pts[1];
-                }
-                else {
-                    $rx = $pts[2];
-                    $ry = $pts[3];
-                }
-                $width = abs($pts[4]-$pts[0])+1;
-                $height = abs($pts[1]-$pts[3])+1;
-                $prect->SetPos(new Rectangle($rx,$ry,$width,$height));
-                $prect->Stroke($img);
-            }
-            else {
-                if( $this->iPattern > -1 ) {
-                    $f = new RectPatternFactory();
-                    $prect = $f->Create($this->iPattern,$this->iPatternColor,1);
-                    $prect->SetDensity($this->iPatternDensity);
-                    if( $val < 0 ) {
-                        $rx = $pts[0];
-                        $ry = $pts[1];
-                    }
-                    else {
-                        $rx = $pts[2];
-                        $ry = $pts[3];
-                    }
-                    $width = abs($pts[4]-$pts[0])+1;
-                    $height = abs($pts[1]-$pts[3])+1;
-                    $prect->SetPos(new Rectangle($rx,$ry,$width,$height));
-                    $prect->Stroke($img);
-                }
-            }
-
-            // Stroke the outline of the bar
-            if( is_array($this->color) ) {
-                $img->SetColor($this->color[$i % count($this->color)]);
-            }
-            else {
-                $img->SetColor($this->color);
-            }
-
-            $pts[] = $pts[0];
-            $pts[] = $pts[1];
-
-            if( $this->weight > 0 ) {
-                $img->SetLineWeight($this->weight);
-                $img->Polygon($pts);
-            }
-
-            // Determine how to best position the values of the individual bars
-            $x=$pts[2]+($pts[4]-$pts[2])/2;
-            $this->value->SetMargin(5);
-
-            if( $this->valuepos=='top' ) {
-                $y=$pts[3];
-                if( $img->a === 90 ) {
-                    if( $val < 0 ) {
-                        $this->value->SetAlign('right','center');
-                    }
-                    else {
-                        $this->value->SetAlign('left','center');
-                    }
-
-                }
-                else {
-                    if( $val < 0 ) {
-                        $this->value->SetMargin(-5);
-                        $y=$pts[1];
-                        $this->value->SetAlign('center','bottom');
-                    }
-                    else {
-                        $this->value->SetAlign('center','bottom');
-                    }
-
-                }
-                $this->value->Stroke($img,$val,$x,$y);
-            }
-            elseif( $this->valuepos=='max' ) {
-                $y=$pts[3];
-                if( $img->a === 90 ) {
-                    if( $val < 0 )
-                    $this->value->SetAlign('left','center');
-                    else
-                    $this->value->SetAlign('right','center');
-                }
-                else {
-                    if( $val < 0 ) {
-                        $this->value->SetAlign('center','bottom');
-                    }
-                    else {
-                        $this->value->SetAlign('center','top');
-                    }
-                }
-                $this->value->SetMargin(-5);
-                $this->value->Stroke($img,$val,$x,$y);
-            }
-            elseif( $this->valuepos=='center' ) {
-                $y = ($pts[3] + $pts[1])/2;
-                $this->value->SetAlign('center','center');
-                $this->value->SetMargin(0);
-                $this->value->Stroke($img,$val,$x,$y);
-            }
-            elseif( $this->valuepos=='bottom' || $this->valuepos=='min' ) {
-                $y=$pts[1];
-                if( $img->a === 90 ) {
-                    if( $val < 0 )
-                    $this->value->SetAlign('right','center');
-                    else
-                    $this->value->SetAlign('left','center');
-                }
-                $this->value->SetMargin(3);
-                $this->value->Stroke($img,$val,$x,$y);
-            }
-            else {
-                JpGraphError::RaiseL(2006,$this->valuepos);
-                //'Unknown position for values on bars :'.$this->valuepos);
-            }
-            // Create the client side image map
-            $rpts = $img->ArrRotate($pts);
-            $csimcoord=round($rpts[0]).", ".round($rpts[1]);
-            for( $j=1; $j < 4; ++$j){
-                $csimcoord .= ", ".round($rpts[2*$j]).", ".round($rpts[2*$j+1]);
-            }
-            if( !empty($this->csimtargets[$i]) ) {
-                $this->csimareas .= '<area shape="poly" coords="'.$csimcoord.'" ';
-                $this->csimareas .= " href=\"".htmlentities($this->csimtargets[$i])."\"";
-
-                if( !empty($this->csimwintargets[$i]) ) {
-                    $this->csimareas .= " target=\"".$this->csimwintargets[$i]."\" ";
-                }
-
-                $sval='';
-                if( !empty($this->csimalts[$i]) ) {
-                    $sval=sprintf($this->csimalts[$i],$this->coords[0][$i]);
-                    $this->csimareas .= " title=\"$sval\" alt=\"$sval\" ";
-                }
-                $this->csimareas .= " />\n";
-            }
-        }
-        return true;
-    }
-} // Class
-
-//===================================================
-// CLASS GroupBarPlot
-// Description: Produce grouped bar plots
-//===================================================
-class GroupBarPlot extends BarPlot {
-    public $plots; 
-    private $nbrplots=0;
-    //---------------
-    // CONSTRUCTOR
-    function GroupBarPlot($plots) {
-        $this->width=0.7;
-        $this->plots = $plots;
-        $this->nbrplots = count($plots);
-        if( $this->nbrplots < 1 ) {
-            JpGraphError::RaiseL(2007);//('Cannot create GroupBarPlot from empty plot array.');
-        }
-        for($i=0; $i < $this->nbrplots; ++$i ) {
-            if( empty($this->plots[$i]) || !isset($this->plots[$i]) ) {
-                JpGraphError::RaiseL(2008,$i);//("Group bar plot element nbr $i is undefined or empty.");
-            }
-        }
-        $this->numpoints = $plots[0]->numpoints;
-        $this->width=0.7;
-    }
-
-    //---------------
-    // PUBLIC METHODS
-    function Legend($graph) {
-        $n = count($this->plots);
-        for($i=0; $i < $n; ++$i) {
-            $c = get_class($this->plots[$i]);
-            if( !($this->plots[$i] instanceof BarPlot) ) {
-                JpGraphError::RaiseL(2009,$c);
-                //('One of the objects submitted to GroupBar is not a BarPlot. Make sure that you create the Group Bar plot from an array of BarPlot or AccBarPlot objects. (Class = '.$c.')');
-            }
-            $this->plots[$i]->DoLegend($graph);
-        }
-    }
-
-    function Min() {
-        list($xmin,$ymin) = $this->plots[0]->Min();
-        $n = count($this->plots);
-        for($i=0; $i < $n; ++$i) {
-            list($xm,$ym) = $this->plots[$i]->Min();
-            $xmin = max($xmin,$xm);
-            $ymin = min($ymin,$ym);
-        }
-        return array($xmin,$ymin);
-    }
-
-    function Max() {
-        list($xmax,$ymax) = $this->plots[0]->Max();
-        $n = count($this->plots);
-        for($i=0; $i < $n; ++$i) {
-            list($xm,$ym) = $this->plots[$i]->Max();
-            $xmax = max($xmax,$xm);
-            $ymax = max($ymax,$ym);
-        }
-        return array($xmax,$ymax);
-    }
-
-    function GetCSIMareas() {
-        $n = count($this->plots);
-        $csimareas='';
-        for($i=0; $i < $n; ++$i) {
-            $csimareas .= $this->plots[$i]->csimareas;
-        }
-        return $csimareas;
-    }
-
-    // Stroke all the bars next to each other
-    function Stroke($img,$xscale,$yscale) {
-        $tmp=$xscale->off;
-        $n = count($this->plots);
-        $subwidth = $this->width/$this->nbrplots ;
-
-        for( $i=0; $i < $n; ++$i ) {
-            $this->plots[$i]->ymin=$this->ybase;
-            $this->plots[$i]->SetWidth($subwidth);
-
-            // If the client have used SetTextTickInterval() then
-            // major_step will be > 1 and the positioning will fail.
-            // If we assume it is always one the positioning will work
-            // fine with a text scale but this will not work with
-            // arbitrary linear scale
-            $xscale->off = $tmp+$i*round($xscale->scale_factor* $subwidth);
-            $this->plots[$i]->Stroke($img,$xscale,$yscale);
-        }
-        $xscale->off=$tmp;
-    }
-} // Class
-
-//===================================================
-// CLASS AccBarPlot
-// Description: Produce accumulated bar plots
-//===================================================
-class AccBarPlot extends BarPlot {
-    public $plots=null;
-    private $nbrplots=0;
-    //---------------
-    // CONSTRUCTOR
-    function __construct($plots) {
-        $this->plots = $plots;
-        $this->nbrplots = count($plots);
-        if( $this->nbrplots < 1 ) {
-            JpGraphError::RaiseL(2010);//('Cannot create AccBarPlot from empty plot array.');
-        }
-        for($i=0; $i < $this->nbrplots; ++$i ) {
-            if( empty($this->plots[$i]) || !isset($this->plots[$i]) ) {
-                JpGraphError::RaiseL(2011,$i);//("Acc bar plot element nbr $i is undefined or empty.");
-            }
-        }
-
-        // We can only allow individual plost which do not have specified X-positions
-        for($i=0; $i < $this->nbrplots; ++$i ) {
-            if( !empty($this->plots[$i]->coords[1]) ) {
-                JpGraphError::RaiseL(2015);
-                //'Individual bar plots in an AccBarPlot or GroupBarPlot can not have specified X-positions.');
-            }
-        }
-
-        // Use 0 weight by default which means that the individual bar
-        // weights will be used per part n the accumulated bar
-        $this->SetWeight(0);
-
-        $this->numpoints = $plots[0]->numpoints;
-        $this->value = new DisplayValue();
-    }
-
-    //---------------
-    // PUBLIC METHODS
-    function Legend($graph) {
-        $n = count($this->plots);
-        for( $i=$n-1; $i >= 0; --$i ) {
-            $c = get_class($this->plots[$i]);
-            if( !($this->plots[$i] instanceof BarPlot) ) {
-                JpGraphError::RaiseL(2012,$c);
-                //('One of the objects submitted to AccBar is not a BarPlot. Make sure that you create the AccBar plot from an array of BarPlot objects.(Class='.$c.')');
-            }
-            $this->plots[$i]->DoLegend($graph);
-        }
-    }
-
-    function Max() {
-        list($xmax) = $this->plots[0]->Max();
-        $nmax=0;
-        for($i=0; $i < count($this->plots); ++$i) {
-            $n = count($this->plots[$i]->coords[0]);
-            $nmax = max($nmax,$n);
-            list($x) = $this->plots[$i]->Max();
-            $xmax = max($xmax,$x);
-        }
-        for( $i = 0; $i < $nmax; $i++ ) {
-            // Get y-value for bar $i by adding the
-            // individual bars from all the plots added.
-            // It would be wrong to just add the
-            // individual plots max y-value since that
-            // would in most cases give to large y-value.
-            $y=0;
-            if( !isset($this->plots[0]->coords[0][$i]) ) {
-                JpGraphError::RaiseL(2014);
-            }
-            if( $this->plots[0]->coords[0][$i] > 0 )
-            $y=$this->plots[0]->coords[0][$i];
-            for( $j = 1; $j < $this->nbrplots; $j++ ) {
-                if( !isset($this->plots[$j]->coords[0][$i]) ) {
-                    JpGraphError::RaiseL(2014);
-                }
-                if( $this->plots[$j]->coords[0][$i] > 0 )
-                $y += $this->plots[$j]->coords[0][$i];
-            }
-            $ymax[$i] = $y;
-        }
-        $ymax = max($ymax);
-
-        // Bar always start at baseline
-        if( $ymax <= $this->ybase )
-        $ymax = $this->ybase;
-        return array($xmax,$ymax);
-    }
-
-    function Min() {
-        $nmax=0;
-        list($xmin,$ysetmin) = $this->plots[0]->Min();
-        for($i=0; $i < count($this->plots); ++$i) {
-            $n = count($this->plots[$i]->coords[0]);
-            $nmax = max($nmax,$n);
-            list($x,$y) = $this->plots[$i]->Min();
-            $xmin = Min($xmin,$x);
-            $ysetmin = Min($y,$ysetmin);
-        }
-        for( $i = 0; $i < $nmax; $i++ ) {
-            // Get y-value for bar $i by adding the
-            // individual bars from all the plots added.
-            // It would be wrong to just add the
-            // individual plots max y-value since that
-            // would in most cases give to large y-value.
-            $y=0;
-            if( $this->plots[0]->coords[0][$i] < 0 )
-            $y=$this->plots[0]->coords[0][$i];
-            for( $j = 1; $j < $this->nbrplots; $j++ ) {
-                if( $this->plots[$j]->coords[0][$i] < 0 )
-                $y += $this->plots[ $j ]->coords[0][$i];
-            }
-            $ymin[$i] = $y;
-        }
-        $ymin = Min($ysetmin,Min($ymin));
-        // Bar always start at baseline
-        if( $ymin >= $this->ybase )
-        $ymin = $this->ybase;
-        return array($xmin,$ymin);
-    }
-
-    // Stroke acc bar plot
-    function Stroke($img,$xscale,$yscale) {
-        $pattern=NULL;
-        $img->SetLineWeight($this->weight);
-        $grad=null;
-        for($i=0; $i < $this->numpoints-1; $i++) {
-            $accy = 0;
-            $accy_neg = 0;
-            for($j=0; $j < $this->nbrplots; ++$j ) {
-                $img->SetColor($this->plots[$j]->color);
-
-                if ( $this->plots[$j]->coords[0][$i] >= 0) {
-                    $yt=$yscale->Translate($this->plots[$j]->coords[0][$i]+$accy);
-                    $accyt=$yscale->Translate($accy);
-                    $accy+=$this->plots[$j]->coords[0][$i];
-                }
-                else {
-                    //if ( $this->plots[$j]->coords[0][$i] < 0 || $accy_neg < 0 ) {
-                    $yt=$yscale->Translate($this->plots[$j]->coords[0][$i]+$accy_neg);
-                    $accyt=$yscale->Translate($accy_neg);
-                    $accy_neg+=$this->plots[$j]->coords[0][$i];
-                }
-
-                $xt=$xscale->Translate($i);
-
-                if( $this->abswidth > -1 ) {
-                    $abswidth=$this->abswidth;
-                }
-                else {
-                    $abswidth=round($this->width*$xscale->scale_factor,0);
-                }
-
-                $pts=array($xt,$accyt,$xt,$yt,$xt+$abswidth,$yt,$xt+$abswidth,$accyt);
-
-                if( $this->bar_shadow ) {
-                    $ssh = $this->bar_shadow_hsize;
-                    $ssv = $this->bar_shadow_vsize;
-
-                    // We must also differ if we are a positive or negative bar.
-                    if( $j === 0 ) {
-                        // This gets extra complicated since we have to
-                        // see all plots to see if we are negative. It could
-                        // for example be that all plots are 0 until the very
-                        // last one. We therefore need to save the initial setup
-                        // for both the negative and positive case
-
-                        // In case the final bar is positive
-                        $sp[0]=$pts[6]+1; $sp[1]=$pts[7];
-                        $sp[2]=$pts[6]+$ssh; $sp[3]=$pts[7]-$ssv;
-
-                        // In case the final bar is negative
-                        $nsp[0]=$pts[0]; $nsp[1]=$pts[1];
-                        $nsp[2]=$pts[0]+$ssh; $nsp[3]=$pts[1]-$ssv;
-                        $nsp[4]=$pts[6]+$ssh; $nsp[5]=$pts[7]-$ssv;
-                        $nsp[10]=$pts[6]+1; $nsp[11]=$pts[7];
-                    }
-
-                    if( $j === $this->nbrplots-1 ) {
-                        // If this is the last plot of the bar and
-                        // the total value is larger than 0 then we
-                        // add the shadow.
-                        if( is_array($this->bar_shadow_color) ) {
-                            $numcolors = count($this->bar_shadow_color);
-                            if( $numcolors == 0 ) {
-                                JpGraphError::RaiseL(2013);//('You have specified an empty array for shadow colors in the bar plot.');
-                            }
-                            $img->PushColor($this->bar_shadow_color[$i % $numcolors]);
-                        }
-                        else {
-                            $img->PushColor($this->bar_shadow_color);
-                        }
-
-                        if( $accy > 0 ) {
-                            $sp[4]=$pts[4]+$ssh; $sp[5]=$pts[5]-$ssv;
-                            $sp[6]=$pts[2]+$ssh; $sp[7]=$pts[3]-$ssv;
-                            $sp[8]=$pts[2]; $sp[9]=$pts[3]-1;
-                            $sp[10]=$pts[4]+1; $sp[11]=$pts[5];
-                            $img->FilledPolygon($sp,4);
-                        }
-                        elseif( $accy_neg < 0 ) {
-                            $nsp[6]=$pts[4]+$ssh; $nsp[7]=$pts[5]-$ssv;
-                            $nsp[8]=$pts[4]+1; $nsp[9]=$pts[5];
-                            $img->FilledPolygon($nsp,4);
-                        }
-                        $img->PopColor();
-                    }
-                }
-
-
-                // If value is NULL or 0, then don't draw a bar at all
-                if ($this->plots[$j]->coords[0][$i] == 0 ) continue;
-
-                if( $this->plots[$j]->grad ) {
-                    if( $grad === null ) {
-                        $grad = new Gradient($img);
-                    }
-                    if( is_array($this->plots[$j]->grad_fromcolor) ) {
-                        // The first argument (grad_fromcolor) can be either an array or a single color. If it is an array
-                        // then we have two choices. It can either a) be a single color specified as an RGB triple or it can be
-                        // an array to specify both (from, to style) for each individual bar. The way to know the difference is
-                        // to investgate the first element. If this element is an integer [0,255] then we assume it is an RGB
-                        // triple.
-                        $ng = count($this->plots[$j]->grad_fromcolor);
-                        if( $ng === 3 ) {
-                            if( is_numeric($this->plots[$j]->grad_fromcolor[0]) && $this->plots[$j]->grad_fromcolor[0] > 0 &&
-                                 $this->plots[$j]->grad_fromcolor[0] < 256 ) {
-                                // RGB Triple
-                                $fromcolor = $this->plots[$j]->grad_fromcolor;
-                                $tocolor = $this->plots[$j]->grad_tocolor;
-                                $style = $this->plots[$j]->grad_style;
-                            }
-                            else {
-                                $fromcolor = $this->plots[$j]->grad_fromcolor[$i % $ng][0];
-                                $tocolor = $this->plots[$j]->grad_fromcolor[$i % $ng][1];
-                                $style = $this->plots[$j]->grad_fromcolor[$i % $ng][2];
-                            }
-                        }
-                        else {
-                            $fromcolor = $this->plots[$j]->grad_fromcolor[$i % $ng][0];
-                            $tocolor = $this->plots[$j]->grad_fromcolor[$i % $ng][1];
-                            $style = $this->plots[$j]->grad_fromcolor[$i % $ng][2];
-                        }
-                        $grad->FilledRectangle($pts[2],$pts[3],
-                                               $pts[6],$pts[7],
-                                               $fromcolor,$tocolor,$style);
-                    }
-                    else {
-                        $grad->FilledRectangle($pts[2],$pts[3],
-                                               $pts[6],$pts[7],
-                                               $this->plots[$j]->grad_fromcolor,
-                                               $this->plots[$j]->grad_tocolor,
-                                               $this->plots[$j]->grad_style);
-                    }
-                } else {
-                    if (is_array($this->plots[$j]->fill_color) ) {
-                        $numcolors = count($this->plots[$j]->fill_color);
-                        $fillcolor = $this->plots[$j]->fill_color[$i % $numcolors];
-                        // If the bar is specified to be non filled then the fill color is false
-                        if( $fillcolor !== false ) {
-                            $img->SetColor($this->plots[$j]->fill_color[$i % $numcolors]);
-                        }
-                    }
-                    else {
-                        $fillcolor = $this->plots[$j]->fill_color;
-                        if( $fillcolor !== false ) {
-                            $img->SetColor($this->plots[$j]->fill_color);
-                        }
-                    }
-                    if( $fillcolor !== false ) {
-                        $img->FilledPolygon($pts);
-                    }
-                }
-
-                $img->SetColor($this->plots[$j]->color);
-
-                // Stroke the pattern
-                if( $this->plots[$j]->iPattern > -1 ) {
-                    if( $pattern===NULL ) {
-                        $pattern = new RectPatternFactory();
-                    }
-
-                    $prect = $pattern->Create($this->plots[$j]->iPattern,$this->plots[$j]->iPatternColor,1);
-                    $prect->SetDensity($this->plots[$j]->iPatternDensity);
-                    if( $this->plots[$j]->coords[0][$i] < 0 ) {
-                        $rx = $pts[0];
-                        $ry = $pts[1];
-                    }
-                    else {
-                        $rx = $pts[2];
-                        $ry = $pts[3];
-                    }
-                    $width = abs($pts[4]-$pts[0])+1;
-                    $height = abs($pts[1]-$pts[3])+1;
-                    $prect->SetPos(new Rectangle($rx,$ry,$width,$height));
-                    $prect->Stroke($img);
-                }
-
-
-                // CSIM array
-
-                if( $i < count($this->plots[$j]->csimtargets) ) {
-                    // Create the client side image map
-                    $rpts = $img->ArrRotate($pts);
-                    $csimcoord=round($rpts[0]).", ".round($rpts[1]);
-                    for( $k=1; $k < 4; ++$k){
-                        $csimcoord .= ", ".round($rpts[2*$k]).", ".round($rpts[2*$k+1]);
-                    }
-                    if( ! empty($this->plots[$j]->csimtargets[$i]) ) {
-                        $this->csimareas.= '<area shape="poly" coords="'.$csimcoord.'" ';
-                        $this->csimareas.= " href=\"".$this->plots[$j]->csimtargets[$i]."\" ";
-
-                        if( ! empty($this->plots[$j]->csimwintargets[$i]) ) {
-                            $this->csimareas.= " target=\"".$this->plots[$j]->csimwintargets[$i]."\" ";
-                        }
-
-                        $sval='';
-                        if( !empty($this->plots[$j]->csimalts[$i]) ) {
-                            $sval=sprintf($this->plots[$j]->csimalts[$i],$this->plots[$j]->coords[0][$i]);
-                            $this->csimareas .= " title=\"$sval\" ";
-                        }
-                        $this->csimareas .= " alt=\"$sval\" />\n";
-                    }
-                }
-
-                $pts[] = $pts[0];
-                $pts[] = $pts[1];
-                $img->SetLineWeight($this->plots[$j]->weight);
-                $img->Polygon($pts);
-                $img->SetLineWeight(1);
-            }
-
-            // Daw potential bar around the entire accbar bar
-            if( $this->weight > 0 ) {
-                $y=$yscale->Translate(0);
-                $img->SetColor($this->color);
-                $img->SetLineWeight($this->weight);
-                $img->Rectangle($pts[0],$y,$pts[6],$pts[5]);
-            }
-
-            // Draw labels for each acc.bar
-
-            $x=$pts[2]+($pts[4]-$pts[2])/2;
-            if($this->bar_shadow) $x += $ssh;
-
-            // First stroke the accumulated value for the entire bar
-            // This value is always placed at the top/bottom of the bars
-            if( $accy_neg < 0 ) {
-                $y=$yscale->Translate($accy_neg);
-                $this->value->Stroke($img,$accy_neg,$x,$y);
-            }
-            else {
-                $y=$yscale->Translate($accy);
-                $this->value->Stroke($img,$accy,$x,$y);
-            }
-
-            $accy = 0;
-            $accy_neg = 0;
-            for($j=0; $j < $this->nbrplots; ++$j ) {
-
-                // We don't print 0 values in an accumulated bar plot
-                if( $this->plots[$j]->coords[0][$i] == 0 ) continue;
-
-                if ($this->plots[$j]->coords[0][$i] > 0) {
-                    $yt=$yscale->Translate($this->plots[$j]->coords[0][$i]+$accy);
-                    $accyt=$yscale->Translate($accy);
-                    if(  $this->plots[$j]->valuepos=='center' ) {
-                        $y = $accyt-($accyt-$yt)/2;
-                    }
-                    elseif( $this->plots[$j]->valuepos=='bottom' ) {
-                        $y = $accyt;
-                    }
-                    else { // top or max
-                        $y = $accyt-($accyt-$yt);
-                    }
-                    $accy+=$this->plots[$j]->coords[0][$i];
-                    if(  $this->plots[$j]->valuepos=='center' ) {
-                        $this->plots[$j]->value->SetAlign("center","center");
-                        $this->plots[$j]->value->SetMargin(0);
-                    }
-                    elseif( $this->plots[$j]->valuepos=='bottom' ) {
-                        $this->plots[$j]->value->SetAlign('center','bottom');
-                        $this->plots[$j]->value->SetMargin(2);
-                    }
-                    else {
-                        $this->plots[$j]->value->SetAlign('center','top');
-                        $this->plots[$j]->value->SetMargin(1);
-                    }
-                } else {
-                    $yt=$yscale->Translate($this->plots[$j]->coords[0][$i]+$accy_neg);
-                    $accyt=$yscale->Translate($accy_neg);
-                    $accy_neg+=$this->plots[$j]->coords[0][$i];
-                    if(  $this->plots[$j]->valuepos=='center' ) {
-                        $y = $accyt-($accyt-$yt)/2;
-                    }
-                    elseif( $this->plots[$j]->valuepos=='bottom' ) {
-                        $y = $accyt;
-                    }
-                    else {
-                        $y = $accyt-($accyt-$yt);
-                    }
-                    if(  $this->plots[$j]->valuepos=='center' ) {
-                        $this->plots[$j]->value->SetAlign("center","center");
-                        $this->plots[$j]->value->SetMargin(0);
-                    }
-                    elseif( $this->plots[$j]->valuepos=='bottom' ) {
-                        $this->plots[$j]->value->SetAlign('center',$j==0 ? 'bottom':'top');
-                        $this->plots[$j]->value->SetMargin(-2);
-                    }
-                    else {
-                        $this->plots[$j]->value->SetAlign('center','bottom');
-                        $this->plots[$j]->value->SetMargin(-1);
-                    }
-                }
-                $this->plots[$j]->value->Stroke($img,$this->plots[$j]->coords[0][$i],round($x),round($y));
-            }
-
-        }
-        return true;
-    }
-} // Class
-
-/* EOF */
-?>
diff --git a/#jpgraph/src/jpgraph_canvas.php b/#jpgraph/src/jpgraph_canvas.php
deleted file mode 100644
index f9429513..00000000
--- a/#jpgraph/src/jpgraph_canvas.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-/*=======================================================================
- // File:        JPGRAPH_CANVAS.PHP
- // Description: Canvas drawing extension for JpGraph
- // Created:     2001-01-08
- // Ver:         $Id: jpgraph_canvas.php 1923 2010-01-11 13:48:49Z ljp $
- //
- // Copyright (c) Asial Corporation. All rights reserved.
- //========================================================================
- */
-
-//===================================================
-// CLASS CanvasGraph
-// Description: Creates a simple canvas graph which
-// might be used together with the basic Image drawing
-// primitives. Useful to auickoly produce some arbitrary
-// graphic which benefits from all the functionality in the
-// graph liek caching for example.
-//===================================================
-class CanvasGraph extends Graph {
-    //---------------
-    // CONSTRUCTOR
-    function __construct($aWidth=300,$aHeight=200,$aCachedName="",$timeout=0,$inline=1) {
-        parent::__construct($aWidth,$aHeight,$aCachedName,$timeout,$inline);
-    }
-
-    //---------------
-    // PUBLIC METHODS
-
-    function InitFrame() {
-        $this->StrokePlotArea();
-    }
-
-    // Method description
-    function Stroke($aStrokeFileName="") {
-        if( $this->texts != null ) {
-            for($i=0; $i < count($this->texts); ++$i) {
-                $this->texts[$i]->Stroke($this->img);
-            }
-        }
-        if( $this->iTables !== null ) {
-            for($i=0; $i < count($this->iTables); ++$i) {
-                $this->iTables[$i]->Stroke($this->img);
-            }
-        }
-        $this->StrokeTitles();
-
-        // If the filename is the predefined value = '_csim_special_'
-        // we assume that the call to stroke only needs to do enough
-        // to correctly generate the CSIM maps.
-        // We use this variable to skip things we don't strictly need
-        // to do to generate the image map to improve performance
-        // a best we can. Therefor you will see a lot of tests !$_csim in the
-        // code below.
-        $_csim = ($aStrokeFileName===_CSIM_SPECIALFILE);
-
-        // We need to know if we have stroked the plot in the
-        // GetCSIMareas. Otherwise the CSIM hasn't been generated
-        // and in the case of GetCSIM called before stroke to generate
-        // CSIM without storing an image to disk GetCSIM must call Stroke.
-        $this->iHasStroked = true;
-
-        if( !$_csim ) {
-
-            // Should we do any final image transformation
-            if( $this->iImgTrans ) {
-                if( !class_exists('ImgTrans',false) ) {
-                    require_once('jpgraph_imgtrans.php');
-                }
-
-                $tform = new ImgTrans($this->img->img);
-                $this->img->img = $tform->Skew3D($this->iImgTransHorizon,$this->iImgTransSkewDist,
-                $this->iImgTransDirection,$this->iImgTransHighQ,
-                $this->iImgTransMinSize,$this->iImgTransFillColor,
-                $this->iImgTransBorder);
-            }
-
-
-            // If the filename is given as the special _IMG_HANDLER
-            // then the image handler is returned and the image is NOT
-            // streamed back
-            if( $aStrokeFileName == _IMG_HANDLER ) {
-                return $this->img->img;
-            }
-            else {
-                // Finally stream the generated picture
-                $this->cache->PutAndStream($this->img,$this->cache_name,$this->inline,$aStrokeFileName);
-                return true;
-            }
-        }
-    }
-} // Class
-
-/* EOF */
-?>
diff --git a/#jpgraph/src/jpgraph_canvtools.php b/#jpgraph/src/jpgraph_canvtools.php
deleted file mode 100644
index 2290a5bc..00000000
--- a/#jpgraph/src/jpgraph_canvtools.php
+++ /dev/null
@@ -1,523 +0,0 @@
-<?php
-/*=======================================================================
- // File:        JPGRAPH_CANVTOOLS.PHP
- // Description: Some utilities for text and shape drawing on a canvas
- // Created:     2002-08-23
- // Ver:         $Id: jpgraph_canvtools.php 1857 2009-09-28 14:38:14Z ljp $
- //
- // Copyright (c) Asial Corporation. All rights reserved.
- //========================================================================
- */
-
-define('CORNER_TOPLEFT',0);
-define('CORNER_TOPRIGHT',1);
-define('CORNER_BOTTOMRIGHT',2);
-define('CORNER_BOTTOMLEFT',3);
-
-
-//===================================================
-// CLASS CanvasScale
-// Description: Define a scale for canvas so we
-// can abstract away with absolute pixels
-//===================================================
-
-class CanvasScale {
-    private $g;
-    private $w,$h;
-    private $ixmin=0,$ixmax=10,$iymin=0,$iymax=10;
-
-    function __construct($graph,$xmin=0,$xmax=10,$ymin=0,$ymax=10) {
-        $this->g = $graph;
-        $this->w = $graph->img->width;
-        $this->h = $graph->img->height;
-        $this->ixmin = $xmin;
-        $this->ixmax = $xmax;
-        $this->iymin = $ymin;
-        $this->iymax = $ymax;
-    }
-
-    function Set($xmin=0,$xmax=10,$ymin=0,$ymax=10) {
-        $this->ixmin = $xmin;
-        $this->ixmax = $xmax;
-        $this->iymin = $ymin;
-        $this->iymax = $ymax;
-    }
-
-    function Get() {
-        return array($this->ixmin,$this->ixmax,$this->iymin,$this->iymax);
-    }
-
-    function Translate($x,$y) {
-        $xp = round(($x-$this->ixmin)/($this->ixmax - $this->ixmin) * $this->w);
-        $yp = round(($y-$this->iymin)/($this->iymax - $this->iymin) * $this->h);
-        return array($xp,$yp);
-    }
-
-    function TranslateX($x) {
-        $xp = round(($x-$this->ixmin)/($this->ixmax - $this->ixmin) * $this->w);
-        return $xp;
-    }
-
-    function TranslateY($y) {
-        $yp = round(($y-$this->iymin)/($this->iymax - $this->iymin) * $this->h);
-        return $yp;
-    }
-
-}
-
-
-//===================================================
-// CLASS Shape
-// Description: Methods to draw shapes on canvas
-//===================================================
-class Shape {
-    private $img,$scale;
-
-    function __construct($aGraph,$scale) {
-        $this->img = $aGraph->img;
-        $this->img->SetColor('black');
-        $this->scale = $scale;
-    }
-
-    function SetColor($aColor) {
-        $this->img->SetColor($aColor);
-    }
-
-    function Line($x1,$y1,$x2,$y2) {
-        list($x1,$y1) = $this->scale->Translate($x1,$y1);
-        list($x2,$y2) = $this->scale->Translate($x2,$y2);
-        $this->img->Line($x1,$y1,$x2,$y2);
-    }
-
-    function SetLineWeight($aWeight) {
-        $this->img->SetLineWeight($aWeight);
-    }
-
-    function Polygon($p,$aClosed=false) {
-        $n=count($p);
-        for($i=0; $i < $n; $i+=2 ) {
-            $p[$i]   = $this->scale->TranslateX($p[$i]);
-            $p[$i+1] = $this->scale->TranslateY($p[$i+1]);
-        }
-        $this->img->Polygon($p,$aClosed);
-    }
-
-    function FilledPolygon($p) {
-        $n=count($p);
-        for($i=0; $i < $n; $i+=2 ) {
-            $p[$i]   = $this->scale->TranslateX($p[$i]);
-            $p[$i+1] = $this->scale->TranslateY($p[$i+1]);
-        }
-        $this->img->FilledPolygon($p);
-    }
-
-
-    // Draw a bezier curve with defining points in the $aPnts array
-    // using $aSteps steps.
-    // 0=x0, 1=y0
-    // 2=x1, 3=y1
-    // 4=x2, 5=y2
-    // 6=x3, 7=y3
-    function Bezier($p,$aSteps=40) {
-        $x0 = $p[0];
-        $y0 = $p[1];
-        // Calculate coefficients
-        $cx = 3*($p[2]-$p[0]);
-        $bx = 3*($p[4]-$p[2])-$cx;
-        $ax = $p[6]-$p[0]-$cx-$bx;
-        $cy = 3*($p[3]-$p[1]);
-        $by = 3*($p[5]-$p[3])-$cy;
-        $ay = $p[7]-$p[1]-$cy-$by;
-
-        // Step size
-        $delta = 1.0/$aSteps;
-
-        $x_old = $x0;
-        $y_old = $y0;
-        for($t=$delta; $t<=1.0; $t+=$delta) {
-            $tt = $t*$t; $ttt=$tt*$t;
-            $x  = $ax*$ttt + $bx*$tt + $cx*$t + $x0;
-            $y = $ay*$ttt + $by*$tt + $cy*$t + $y0;
-            $this->Line($x_old,$y_old,$x,$y);
-            $x_old = $x;
-            $y_old = $y;
-        }
-        $this->Line($x_old,$y_old,$p[6],$p[7]);
-    }
-
-    function Rectangle($x1,$y1,$x2,$y2) {
-        list($x1,$y1) = $this->scale->Translate($x1,$y1);
-        list($x2,$y2)   = $this->scale->Translate($x2,$y2);
-        $this->img->Rectangle($x1,$y1,$x2,$y2);
-    }
-
-    function FilledRectangle($x1,$y1,$x2,$y2) {
-        list($x1,$y1) = $this->scale->Translate($x1,$y1);
-        list($x2,$y2)   = $this->scale->Translate($x2,$y2);
-        $this->img->FilledRectangle($x1,$y1,$x2,$y2);
-    }
-
-    function Circle($x1,$y1,$r) {
-        list($x1,$y1) = $this->scale->Translate($x1,$y1);
-        if( $r >= 0 )
-        $r   = $this->scale->TranslateX($r);
-        else
-        $r = -$r;
-        $this->img->Circle($x1,$y1,$r);
-    }
-
-    function FilledCircle($x1,$y1,$r) {
-        list($x1,$y1) = $this->scale->Translate($x1,$y1);
-        if( $r >= 0 )
-        $r   = $this->scale->TranslateX($r);
-        else
-        $r = -$r;
-        $this->img->FilledCircle($x1,$y1,$r);
-    }
-
-    function RoundedRectangle($x1,$y1,$x2,$y2,$r=null) {
-        list($x1,$y1) = $this->scale->Translate($x1,$y1);
-        list($x2,$y2)   = $this->scale->Translate($x2,$y2);
-
-        if( $r == null )
-        $r = 5;
-        elseif( $r >= 0 )
-        $r = $this->scale->TranslateX($r);
-        else
-        $r = -$r;
-        $this->img->RoundedRectangle($x1,$y1,$x2,$y2,$r);
-    }
-
-    function FilledRoundedRectangle($x1,$y1,$x2,$y2,$r=null) {
-        list($x1,$y1) = $this->scale->Translate($x1,$y1);
-        list($x2,$y2)   = $this->scale->Translate($x2,$y2);
-
-        if( $r == null )
-        $r = 5;
-        elseif( $r > 0 )
-        $r = $this->scale->TranslateX($r);
-        else
-        $r = -$r;
-        $this->img->FilledRoundedRectangle($x1,$y1,$x2,$y2,$r);
-    }
-
-    function ShadowRectangle($x1,$y1,$x2,$y2,$fcolor=false,$shadow_width=null,$shadow_color=array(102,102,102)) {
-        list($x1,$y1) = $this->scale->Translate($x1,$y1);
-        list($x2,$y2) = $this->scale->Translate($x2,$y2);
-        if( $shadow_width == null )
-        $shadow_width=4;
-        else
-        $shadow_width=$this->scale->TranslateX($shadow_width);
-        $this->img->ShadowRectangle($x1,$y1,$x2,$y2,$fcolor,$shadow_width,$shadow_color);
-    }
-
-    function SetTextAlign($halign,$valign="bottom") {
-        $this->img->SetTextAlign($halign,$valign="bottom");
-    }
-
-    function StrokeText($x1,$y1,$txt,$dir=0,$paragraph_align="left") {
-        list($x1,$y1) = $this->scale->Translate($x1,$y1);
-        $this->img->StrokeText($x1,$y1,$txt,$dir,$paragraph_align);
-    }
-
-    // A rounded rectangle where one of the corner has been moved "into" the
-    // rectangle 'iw' width and 'ih' height. Corners:
-    // 0=Top left, 1=top right, 2=bottom right, 3=bottom left
-    function IndentedRectangle($xt,$yt,$w,$h,$iw=0,$ih=0,$aCorner=3,$aFillColor="",$r=4) {
-
-        list($xt,$yt) = $this->scale->Translate($xt,$yt);
-        list($w,$h)   = $this->scale->Translate($w,$h);
-        list($iw,$ih) = $this->scale->Translate($iw,$ih);
-
-        $xr = $xt + $w - 0;
-        $yl = $yt + $h - 0;
-
-        switch( $aCorner ) {
-            case 0: // Upper left
-                 
-                // Bottom line, left &  right arc
-                $this->img->Line($xt+$r,$yl,$xr-$r,$yl);
-                $this->img->Arc($xt+$r,$yl-$r,$r*2,$r*2,90,180);
-                $this->img->Arc($xr-$r,$yl-$r,$r*2,$r*2,0,90);
-
-                // Right line, Top right arc
-                $this->img->Line($xr,$yt+$r,$xr,$yl-$r);
-                $this->img->Arc($xr-$r,$yt+$r,$r*2,$r*2,270,360);
-
-                // Top line, Top left arc
-                $this->img->Line($xt+$iw+$r,$yt,$xr-$r,$yt);
-                $this->img->Arc($xt+$iw+$r,$yt+$r,$r*2,$r*2,180,270);
-
-                // Left line
-                $this->img->Line($xt,$yt+$ih+$r,$xt,$yl-$r);
-
-                // Indent horizontal, Lower left arc
-                $this->img->Line($xt+$r,$yt+$ih,$xt+$iw-$r,$yt+$ih);
-                $this->img->Arc($xt+$r,$yt+$ih+$r,$r*2,$r*2,180,270);
-
-                // Indent vertical, Indent arc
-                $this->img->Line($xt+$iw,$yt+$r,$xt+$iw,$yt+$ih-$r);
-                $this->img->Arc($xt+$iw-$r,$yt+$ih-$r,$r*2,$r*2,0,90);
-
-                if( $aFillColor != '' ) {
-                    $bc = $this->img->current_color_name;
-                    $this->img->PushColor($aFillColor);
-                    $this->img->FillToBorder($xr-$r,$yl-$r,$bc);
-                    $this->img->PopColor();
-                }
-
-                break;
-
-            case 1: // Upper right
-
-                // Bottom line, left &  right arc
-                $this->img->Line($xt+$r,$yl,$xr-$r,$yl);
-                $this->img->Arc($xt+$r,$yl-$r,$r*2,$r*2,90,180);
-                $this->img->Arc($xr-$r,$yl-$r,$r*2,$r*2,0,90);
-
-                // Left line, Top left arc
-                $this->img->Line($xt,$yt+$r,$xt,$yl-$r);
-                $this->img->Arc($xt+$r,$yt+$r,$r*2,$r*2,180,270);
-
-                // Top line, Top right arc
-                $this->img->Line($xt+$r,$yt,$xr-$iw-$r,$yt);
-                $this->img->Arc($xr-$iw-$r,$yt+$r,$r*2,$r*2,270,360);
-
-                // Right line
-                $this->img->Line($xr,$yt+$ih+$r,$xr,$yl-$r);
-
-                // Indent horizontal, Lower right arc
-                $this->img->Line($xr-$iw+$r,$yt+$ih,$xr-$r,$yt+$ih);
-                $this->img->Arc($xr-$r,$yt+$ih+$r,$r*2,$r*2,270,360);
-
-                // Indent vertical, Indent arc
-                $this->img->Line($xr-$iw,$yt+$r,$xr-$iw,$yt+$ih-$r);
-                $this->img->Arc($xr-$iw+$r,$yt+$ih-$r,$r*2,$r*2,90,180);
-
-                if( $aFillColor != '' ) {
-                    $bc = $this->img->current_color_name;
-                    $this->img->PushColor($aFillColor);
-                    $this->img->FillToBorder($xt+$r,$yl-$r,$bc);
-                    $this->img->PopColor();
-                }
-
-                break;
-
-            case 2: // Lower right
-                // Top line, Top left & Top right arc
-                $this->img->Line($xt+$r,$yt,$xr-$r,$yt);
-                $this->img->Arc($xt+$r,$yt+$r,$r*2,$r*2,180,270);
-                $this->img->Arc($xr-$r,$yt+$r,$r*2,$r*2,270,360);
-
-                // Left line, Bottom left arc
-                $this->img->Line($xt,$yt+$r,$xt,$yl-$r);
-                $this->img->Arc($xt+$r,$yl-$r,$r*2,$r*2,90,180);
-
-                // Bottom line, Bottom right arc
-                $this->img->Line($xt+$r,$yl,$xr-$iw-$r,$yl);
-                $this->img->Arc($xr-$iw-$r,$yl-$r,$r*2,$r*2,0,90);
-
-                // Right line
-                $this->img->Line($xr,$yt+$r,$xr,$yl-$ih-$r);
-                 
-                // Indent horizontal, Lower right arc
-                $this->img->Line($xr-$r,$yl-$ih,$xr-$iw+$r,$yl-$ih);
-                $this->img->Arc($xr-$r,$yl-$ih-$r,$r*2,$r*2,0,90);
-
-                // Indent vertical, Indent arc
-                $this->img->Line($xr-$iw,$yl-$r,$xr-$iw,$yl-$ih+$r);
-                $this->img->Arc($xr-$iw+$r,$yl-$ih+$r,$r*2,$r*2,180,270);
-
-                if( $aFillColor != '' ) {
-                    $bc = $this->img->current_color_name;
-                    $this->img->PushColor($aFillColor);
-                    $this->img->FillToBorder($xt+$r,$yt+$r,$bc);
-                    $this->img->PopColor();
-                }
-
-                break;
-
-            case 3: // Lower left
-                // Top line, Top left & Top right arc
-                $this->img->Line($xt+$r,$yt,$xr-$r,$yt);
-                $this->img->Arc($xt+$r,$yt+$r,$r*2,$r*2,180,270);
-                $this->img->Arc($xr-$r,$yt+$r,$r*2,$r*2,270,360);
-
-                // Right line, Bottom right arc
-                $this->img->Line($xr,$yt+$r,$xr,$yl-$r);
-                $this->img->Arc($xr-$r,$yl-$r,$r*2,$r*2,0,90);
-
-                // Bottom line, Bottom left arc
-                $this->img->Line($xt+$iw+$r,$yl,$xr-$r,$yl);
-                $this->img->Arc($xt+$iw+$r,$yl-$r,$r*2,$r*2,90,180);
-
-                // Left line
-                $this->img->Line($xt,$yt+$r,$xt,$yl-$ih-$r);
-                 
-                // Indent horizontal, Lower left arc
-                $this->img->Line($xt+$r,$yl-$ih,$xt+$iw-$r,$yl-$ih);
-                $this->img->Arc($xt+$r,$yl-$ih-$r,$r*2,$r*2,90,180);
-
-                // Indent vertical, Indent arc
-                $this->img->Line($xt+$iw,$yl-$ih+$r,$xt+$iw,$yl-$r);
-                $this->img->Arc($xt+$iw-$r,$yl-$ih+$r,$r*2,$r*2,270,360);
-
-                if( $aFillColor != '' ) {
-                    $bc = $this->img->current_color_name;
-                    $this->img->PushColor($aFillColor);
-                    $this->img->FillToBorder($xr-$r,$yt+$r,$bc);
-                    $this->img->PopColor();
-                }
-
-                break;
-        }
-    }
-}
-
-
-//===================================================
-// CLASS RectangleText
-// Description: Draws a text paragraph inside a
-// rounded, possible filled, rectangle.
-//===================================================
-class CanvasRectangleText {
-    private $ix,$iy,$iw,$ih,$ir=4;
-    private $iTxt,$iColor='black',$iFillColor='',$iFontColor='black';
-    private $iParaAlign='center';
-    private $iAutoBoxMargin=5;
-    private $iShadowWidth=3,$iShadowColor='';
-
-    function __construct($aTxt='',$xl=0,$yt=0,$w=0,$h=0) {
-        $this->iTxt = new Text($aTxt);
-        $this->ix = $xl;
-        $this->iy = $yt;
-        $this->iw = $w;
-        $this->ih = $h;
-    }
-
-    function SetShadow($aColor='gray',$aWidth=3) {
-        $this->iShadowColor = $aColor;
-        $this->iShadowWidth = $aWidth;
-    }
-
-    function SetFont($FontFam,$aFontStyle,$aFontSize=12) {
-        $this->iTxt->SetFont($FontFam,$aFontStyle,$aFontSize);
-    }
-
-    function SetTxt($aTxt) {
-        $this->iTxt->Set($aTxt);
-    }
-
-    function ParagraphAlign($aParaAlign) {
-        $this->iParaAlign = $aParaAlign;
-    }
-
-    function SetFillColor($aFillColor) {
-        $this->iFillColor = $aFillColor;
-    }
-
-    function SetAutoMargin($aMargin) {
-        $this->iAutoBoxMargin=$aMargin;
-    }
-
-    function SetColor($aColor) {
-        $this->iColor = $aColor;
-    }
-
-    function SetFontColor($aColor) {
-        $this->iFontColor = $aColor;
-    }
-
-    function SetPos($xl=0,$yt=0,$w=0,$h=0) {
-        $this->ix = $xl;
-        $this->iy = $yt;
-        $this->iw = $w;
-        $this->ih = $h;
-    }
-
-    function Pos($xl=0,$yt=0,$w=0,$h=0) {
-        $this->ix = $xl;
-        $this->iy = $yt;
-        $this->iw = $w;
-        $this->ih = $h;
-    }
-
-    function Set($aTxt,$xl,$yt,$w=0,$h=0) {
-        $this->iTxt->Set($aTxt);
-        $this->ix = $xl;
-        $this->iy = $yt;
-        $this->iw = $w;
-        $this->ih = $h;
-    }
-
-    function SetCornerRadius($aRad=5) {
-        $this->ir = $aRad;
-    }
-
-    function Stroke($aImg,$scale) {
-
-        // If coordinates are specifed as negative this means we should
-        // treat them as abolsute (pixels) coordinates
-        if( $this->ix > 0 ) {
-            $this->ix = $scale->TranslateX($this->ix) ;
-        }
-        else {
-            $this->ix = -$this->ix;
-        }
-
-        if( $this->iy > 0 ) {
-            $this->iy = $scale->TranslateY($this->iy) ;
-        }
-        else {
-            $this->iy = -$this->iy;
-        }
-         
-        list($this->iw,$this->ih) = $scale->Translate($this->iw,$this->ih) ;
-
-        if( $this->iw == 0 )
-        $this->iw = round($this->iTxt->GetWidth($aImg) + $this->iAutoBoxMargin);
-        if( $this->ih == 0 ) {
-            $this->ih = round($this->iTxt->GetTextHeight($aImg) + $this->iAutoBoxMargin);
-        }
-
-        if( $this->iShadowColor != '' ) {
-            $aImg->PushColor($this->iShadowColor);
-            $aImg->FilledRoundedRectangle($this->ix+$this->iShadowWidth,
-            $this->iy+$this->iShadowWidth,
-            $this->ix+$this->iw-1+$this->iShadowWidth,
-            $this->iy+$this->ih-1+$this->iShadowWidth,
-            $this->ir);
-            $aImg->PopColor();
-        }
-
-        if( $this->iFillColor != '' ) {
-            $aImg->PushColor($this->iFillColor);
-            $aImg->FilledRoundedRectangle($this->ix,$this->iy,
-            $this->ix+$this->iw-1,
-            $this->iy+$this->ih-1,
-            $this->ir);
-            $aImg->PopColor();
-        }
-
-        if( $this->iColor != '' ) {
-            $aImg->PushColor($this->iColor);
-            $aImg->RoundedRectangle($this->ix,$this->iy,
-            $this->ix+$this->iw-1,
-            $this->iy+$this->ih-1,
-            $this->ir);
-            $aImg->PopColor();
-        }
-
-        $this->iTxt->Align('center','center');
-        $this->iTxt->ParagraphAlign($this->iParaAlign);
-        $this->iTxt->SetColor($this->iFontColor);
-        $this->iTxt->Stroke($aImg, $this->ix+$this->iw/2, $this->iy+$this->ih/2);
-
-        return array($this->iw, $this->ih);
-
-    }
-
-}
-
-
-?>
diff --git a/#jpgraph/src/jpgraph_contour.php b/#jpgraph/src/jpgraph_contour.php
deleted file mode 100644
index 760989e5..00000000
--- a/#jpgraph/src/jpgraph_contour.php
+++ /dev/null
@@ -1,587 +0,0 @@
-<?php
-/*=======================================================================
-// File:        JPGRAPH_CONTOUR.PHP
-// Description: Contour plot
-// Created:     2009-03-08
-// Ver:         $Id: jpgraph_contour.php 1870 2009-09-29 04:24:18Z ljp $
-//
-// Copyright (c) Asial Corporation. All rights reserved.
-//========================================================================
-*/
-require_once('jpgraph_meshinterpolate.inc.php');
-define('HORIZ_EDGE',0);
-define('VERT_EDGE',1);
-
-/**
- * This class encapsulates the core contour plot algorithm. It will find the path
- * of the specified isobars in the data matrix specified. It is assumed that the
- * data matrix models an equspaced X-Y mesh of datavalues corresponding to the Z
- * values.
- *
- */
-class Contour {
-
-    private $dataPoints = array();
-    private $nbrCols=0,$nbrRows=0;
-    private $horizEdges = array(), $vertEdges=array();
-    private $isobarValues = array();
-    private $stack = null;
-    private $isobarCoord = array();
-    private $nbrIsobars = 10, $isobarColors = array();
-    private $invert = true;
-    private $highcontrast = false, $highcontrastbw = false;
-
-    /**
-     * Create a new contour level "algorithm machine".
-     * @param $aMatrix    The values to find the contour from
-     * @param $aIsobars Mixed. If integer it determines the number of isobars to be used. The levels are determined
-     * automatically as equdistance between the min and max value of the matrice.
-     * If $aIsobars is an array then this is interpretated as an array of values to be used as isobars in the
-     * contour plot.
-     * @return an instance of the contour algorithm
-     */
-    function __construct($aMatrix,$aIsobars=10, $aColors=null) {
-
-        $this->nbrRows = count($aMatrix);
-        $this->nbrCols = count($aMatrix[0]);
-        $this->dataPoints = $aMatrix;
-
-        if( is_array($aIsobars) ) {
-            // use the isobar values supplied
-            $this->nbrIsobars = count($aIsobars);
-            $this->isobarValues = $aIsobars;
-        }
-        else {
-            // Determine the isobar values automatically
-            $this->nbrIsobars = $aIsobars;
-            list($min,$max) = $this->getMinMaxVal();
-            $stepSize = ($max-$min) / $aIsobars ;
-            $isobar = $min+$stepSize/2;
-            for ($i = 0; $i < $aIsobars; $i++) {
-                $this->isobarValues[$i] = $isobar;
-                $isobar += $stepSize;
-            }
-        }
-
-        if( $aColors !== null && count($aColors) > 0 ) {
-
-            if( !is_array($aColors) ) {
-                JpGraphError::RaiseL(28001);
-                //'Third argument to Contour must be an array of colors.'
-            }
-
-            if( count($aColors) != count($this->isobarValues) ) {
-                JpGraphError::RaiseL(28002);
-                //'Number of colors must equal the number of isobar lines specified';
-            }
-
-            $this->isobarColors = $aColors;
-        }
-    }
-
-    /**
-     * Flip the plot around the Y-coordinate. This has the same affect as flipping the input
-     * data matrice
-     *
-     * @param $aFlg If true the the vertice in input data matrice position (0,0) corresponds to the top left
-     * corner of teh plot otherwise it will correspond to the bottom left corner (a horizontal flip)
-     */
-    function SetInvert($aFlg=true) {
-        $this->invert = $aFlg;
-    }
-
-    /**
-     * Find the min and max values in the data matrice
-     *
-     * @return array(min_value,max_value)
-     */
-    function getMinMaxVal() {
-        $min = $this->dataPoints[0][0];
-        $max = $this->dataPoints[0][0];
-        for ($i = 0; $i < $this->nbrRows; $i++) {
-            if( ($mi=min($this->dataPoints[$i])) < $min )  $min = $mi;
-            if( ($ma=max($this->dataPoints[$i])) > $max )  $max = $ma;
-        }
-        return array($min,$max);
-    }
-
-    /**
-     * Reset the two matrices that keeps track on where the isobars crosses the
-     * horizontal and vertical edges
-     */
-    function resetEdgeMatrices() {
-        for ($k = 0; $k < 2; $k++) {
-            for ($i = 0; $i <= $this->nbrRows; $i++) {
-                for ($j = 0; $j <= $this->nbrCols; $j++) {
-                    $this->edges[$k][$i][$j] = false;
-                }
-            }
-        }
-    }
-
-    /**
-     * Determine if the specified isobar crosses the horizontal edge specified by its row and column
-     *
-     * @param $aRow Row index of edge to be checked
-     * @param $aCol Col index of edge to be checked
-     * @param $aIsobar Isobar value
-     * @return true if the isobar is crossing this edge
-     */
-    function isobarHCrossing($aRow,$aCol,$aIsobar) {
-
-        if( $aCol >= $this->nbrCols-1 ) {
-            JpGraphError::RaiseL(28003,$aCol);
-            //'ContourPlot Internal Error: isobarHCrossing: Coloumn index too large (%d)'
-        }
-        if( $aRow >= $this->nbrRows ) {
-            JpGraphError::RaiseL(28004,$aRow);
-            //'ContourPlot Internal Error: isobarHCrossing: Row index too large (%d)'
-        }
-
-        $v1 = $this->dataPoints[$aRow][$aCol];
-        $v2 = $this->dataPoints[$aRow][$aCol+1];
-
-        return ($aIsobar-$v1)*($aIsobar-$v2) < 0 ;
-
-    }
-
-    /**
-     * Determine if the specified isobar crosses the vertical edge specified by its row and column
-     *
-     * @param $aRow Row index of edge to be checked
-     * @param $aCol Col index of edge to be checked
-     * @param $aIsobar Isobar value
-     * @return true if the isobar is crossing this edge
-     */
-    function isobarVCrossing($aRow,$aCol,$aIsobar) {
-
-        if( $aRow >= $this->nbrRows-1) {
-            JpGraphError::RaiseL(28005,$aRow);
-            //'isobarVCrossing: Row index too large
-        }
-        if( $aCol >= $this->nbrCols ) {
-            JpGraphError::RaiseL(28006,$aCol);
-            //'isobarVCrossing: Col index too large
-        }
-
-        $v1 = $this->dataPoints[$aRow][$aCol];
-        $v2 = $this->dataPoints[$aRow+1][$aCol];
-
-        return ($aIsobar-$v1)*($aIsobar-$v2) < 0 ;
-
-    }
-
-    /**
-     * Determine all edges, horizontal and vertical that the specified isobar crosses. The crossings
-     * are recorded in the two edge matrices.
-     *
-     * @param $aIsobar The value of the isobar to be checked
-     */
-    function determineIsobarEdgeCrossings($aIsobar) {
-
-        $ib = $this->isobarValues[$aIsobar];
-
-        for ($i = 0; $i < $this->nbrRows-1; $i++) {
-            for ($j = 0; $j < $this->nbrCols-1; $j++) {
-                $this->edges[HORIZ_EDGE][$i][$j] = $this->isobarHCrossing($i,$j,$ib);
-                $this->edges[VERT_EDGE][$i][$j] = $this->isobarVCrossing($i,$j,$ib);
-            }
-        }
-
-        // We now have the bottom and rightmost edges unsearched
-        for ($i = 0; $i < $this->nbrRows-1; $i++) {
-            $this->edges[VERT_EDGE][$i][$j] = $this->isobarVCrossing($i,$this->nbrCols-1,$ib);
-        }
-        for ($j = 0; $j < $this->nbrCols-1; $j++) {
-            $this->edges[HORIZ_EDGE][$i][$j] = $this->isobarHCrossing($this->nbrRows-1,$j,$ib);
-        }
-
-    }
-
-    /**
-     * Return the normalized coordinates for the crossing of the specified edge with the specified
-     * isobar- The crossing is simpy detrmined with a linear interpolation between the two vertices
-     * on each side of the edge and the value of the isobar
-     *
-     * @param $aRow Row of edge
-     * @param $aCol Column of edge
-     * @param $aEdgeDir Determine if this is a horizontal or vertical edge
-     * @param $ib The isobar value
-     * @return unknown_type
-     */
-    function getCrossingCoord($aRow,$aCol,$aEdgeDir,$aIsobarVal) {
-
-        // In order to avoid numerical problem when two vertices are very close
-        // we have to check and avoid dividing by close to zero denumerator.
-        if( $aEdgeDir == HORIZ_EDGE ) {
-            $d = abs($this->dataPoints[$aRow][$aCol] - $this->dataPoints[$aRow][$aCol+1]);
-            if( $d > 0.001 ) {
-                $xcoord = $aCol + abs($aIsobarVal - $this->dataPoints[$aRow][$aCol]) / $d;
-            }
-            else {
-                $xcoord = $aCol;
-            }
-            $ycoord = $aRow;
-        }
-        else {
-            $d = abs($this->dataPoints[$aRow][$aCol] - $this->dataPoints[$aRow+1][$aCol]);
-            if( $d > 0.001 ) {
-                $ycoord = $aRow + abs($aIsobarVal - $this->dataPoints[$aRow][$aCol]) / $d;
-            }
-            else {
-                $ycoord = $aRow;
-            }
-            $xcoord = $aCol;
-        }
-        if( $this->invert ) {
-            $ycoord = $this->nbrRows-1 - $ycoord;
-        }
-        return array($xcoord,$ycoord);
-
-    }
-
-    /**
-     * In order to avoid all kinds of unpleasent extra checks and complex boundary
-     * controls for the degenerated case where the contour levels exactly crosses
-     * one of the vertices we add a very small delta (0.1%) to the data point value.
-     * This has no visible affect but it makes the code sooooo much cleaner.
-     *
-     */
-    function adjustDataPointValues() {
-
-        $ni = count($this->isobarValues);
-        for ($k = 0; $k < $ni; $k++) {
-            $ib = $this->isobarValues[$k];
-            for ($row = 0 ; $row < $this->nbrRows-1; ++$row) {
-                for ($col = 0 ; $col < $this->nbrCols-1; ++$col ) {
-                    if( abs($this->dataPoints[$row][$col] - $ib) < 0.0001 ) {
-                        $this->dataPoints[$row][$col] += $this->dataPoints[$row][$col]*0.001;
-                    }
-                }
-            }
-        }
-
-    }
-
-    /**
-     * @param $aFlg
-     * @param $aBW
-     * @return unknown_type
-     */
-    function UseHighContrastColor($aFlg=true,$aBW=false) {
-        $this->highcontrast = $aFlg;
-        $this->highcontrastbw = $aBW;
-    }
-
-    /**
-     * Calculate suitable colors for each defined isobar
-     *
-     */
-    function CalculateColors() {
-        if ( $this->highcontrast ) {
-            if ( $this->highcontrastbw ) {
-                for ($ib = 0; $ib < $this->nbrIsobars; $ib++) {
-                    $this->isobarColors[$ib] = 'black';
-                }
-            }
-            else {
-                // Use only blue/red scale
-                $step = round(255/($this->nbrIsobars-1));
-                for ($ib = 0; $ib < $this->nbrIsobars; $ib++) {
-                    $this->isobarColors[$ib] = array($ib*$step, 50, 255-$ib*$step);
-                }
-            }
-        }
-        else {
-            $n = $this->nbrIsobars;
-            $v = 0; $step = 1 / ($this->nbrIsobars-1);
-            for ($ib = 0; $ib < $this->nbrIsobars; $ib++) {
-                $this->isobarColors[$ib] = RGB::GetSpectrum($v);
-                $v += $step;
-            }
-        }
-    }
-
-    /**
-     * This is where the main work is done. For each isobar the crossing of the edges are determined
-     * and then each cell is analyzed to find the 0, 2 or 4 crossings. Then the normalized coordinate
-     * for the crossings are determined and pushed on to the isobar stack. When the method is finished
-     * the $isobarCoord will hold one arrayfor each isobar where all the line segments that makes
-     * up the contour plot are stored.
-     *
-     * @return array( $isobarCoord, $isobarValues, $isobarColors )
-     */
-    function getIsobars() {
-
-        $this->adjustDataPointValues();
-
-        for ($isobar = 0; $isobar < $this->nbrIsobars; $isobar++) {
-
-            $ib = $this->isobarValues[$isobar];
-            $this->resetEdgeMatrices();
-            $this->determineIsobarEdgeCrossings($isobar);
-            $this->isobarCoord[$isobar] = array();
-
-            $ncoord = 0;
-
-            for ($row = 0 ; $row < $this->nbrRows-1; ++$row) {
-                for ($col = 0 ; $col < $this->nbrCols-1; ++$col ) {
-
-                    // Find out how many crossings around the edges
-                    $n = 0;
-                    if ( $this->edges[HORIZ_EDGE][$row][$col] )   $neigh[$n++] = array($row,  $col,  HORIZ_EDGE);
-                    if ( $this->edges[HORIZ_EDGE][$row+1][$col] ) $neigh[$n++] = array($row+1,$col,  HORIZ_EDGE);
-                    if ( $this->edges[VERT_EDGE][$row][$col] )    $neigh[$n++] = array($row,  $col,  VERT_EDGE);
-                    if ( $this->edges[VERT_EDGE][$row][$col+1] )  $neigh[$n++] = array($row,  $col+1,VERT_EDGE);
-
-                    if ( $n == 2 ) {
-                        $n1=0; $n2=1;
-                        $this->isobarCoord[$isobar][$ncoord++] = array(
-                        $this->getCrossingCoord($neigh[$n1][0],$neigh[$n1][1],$neigh[$n1][2],$ib),
-                        $this->getCrossingCoord($neigh[$n2][0],$neigh[$n2][1],$neigh[$n2][2],$ib) );
-                    }
-                    elseif ( $n == 4 ) {
-                        // We must determine how to connect the edges either northwest->southeast or
-                        // northeast->southwest. We do that by calculating the imaginary middle value of
-                        // the cell by averaging the for corners. This will compared with the value of the
-                        // top left corner will help determine the orientation of the ridge/creek
-                        $midval = ($this->dataPoints[$row][$col]+$this->dataPoints[$row][$col+1]+$this->dataPoints[$row+1][$col]+$this->dataPoints[$row+1][$col+1])/4;
-                        $v = $this->dataPoints[$row][$col];
-                        if( $midval == $ib ) {
-                            // Orientation "+"
-                            $n1=0; $n2=1; $n3=2; $n4=3;
-                        } elseif ( ($midval > $ib && $v > $ib) ||  ($midval < $ib && $v < $ib) ) {
-                            // Orientation of ridge/valley = "\"
-                            $n1=0; $n2=3; $n3=2; $n4=1;
-                        } elseif ( ($midval > $ib && $v < $ib) ||  ($midval < $ib && $v > $ib) ) {
-                            // Orientation of ridge/valley = "/"
-                            $n1=0; $n2=2; $n3=3; $n4=1;
-                        }
-
-                        $this->isobarCoord[$isobar][$ncoord++] = array(
-                        $this->getCrossingCoord($neigh[$n1][0],$neigh[$n1][1],$neigh[$n1][2],$ib),
-                        $this->getCrossingCoord($neigh[$n2][0],$neigh[$n2][1],$neigh[$n2][2],$ib) );
-
-                        $this->isobarCoord[$isobar][$ncoord++] = array(
-                        $this->getCrossingCoord($neigh[$n3][0],$neigh[$n3][1],$neigh[$n3][2],$ib),
-                        $this->getCrossingCoord($neigh[$n4][0],$neigh[$n4][1],$neigh[$n4][2],$ib) );
-
-                    }
-                }
-            }
-        }
-
-        if( count($this->isobarColors) == 0 ) {
-            // No manually specified colors. Calculate them automatically.
-            $this->CalculateColors();
-        }
-        return array( $this->isobarCoord, $this->isobarValues, $this->isobarColors );
-    }
-}
-
-
-/**
- * This class represent a plotting of a contour outline of data given as a X-Y matrice
- *
- */
-class ContourPlot extends Plot {
-
-    private $contour, $contourCoord, $contourVal, $contourColor;
-    private $nbrCountours = 0 ;
-    private $dataMatrix = array();
-    private $invertLegend = false;
-    private $interpFactor = 1;
-    private $flipData = false;
-    private $isobar = 10;
-    private $showLegend = false;
-    private $highcontrast = false, $highcontrastbw = false;
-    private $manualIsobarColors = array();
-
-    /**
-     * Construct a contour plotting algorithm. The end result of the algorithm is a sequence of
-     * line segments for each isobar given as two vertices.
-     *
-     * @param $aDataMatrix    The Z-data to be used
-     * @param $aIsobar A mixed variable, if it is an integer then this specified the number of isobars to use.
-     * The values of the isobars are automatically detrmined to be equ-spaced between the min/max value of the
-     * data. If it is an array then it explicetely gives the isobar values
-     * @param $aInvert By default the matrice with row index 0 corresponds to Y-value 0, i.e. in the bottom of
-     * the plot. If this argument is true then the row with the highest index in the matrice corresponds  to
-     * Y-value 0. In affect flipping the matrice around an imaginary horizontal axis.
-     * @param $aHighContrast Use high contrast colors (blue/red:ish)
-     * @param $aHighContrastBW Use only black colors for contours
-     * @return an instance of the contour plot algorithm
-     */
-    function __construct($aDataMatrix, $aIsobar=10, $aFactor=1, $aInvert=false, $aIsobarColors=array()) {
-
-        $this->dataMatrix = $aDataMatrix;
-        $this->flipData = $aInvert;
-        $this->isobar = $aIsobar;
-        $this->interpFactor = $aFactor;
-
-        if ( $this->interpFactor > 1 ) {
-
-            if( $this->interpFactor > 5 ) {
-                JpGraphError::RaiseL(28007);// ContourPlot interpolation factor is too large (>5)
-            }
-
-            $ip = new MeshInterpolate();
-            $this->dataMatrix = $ip->Linear($this->dataMatrix, $this->interpFactor);
-        }
-
-        $this->contour = new Contour($this->dataMatrix,$this->isobar,$aIsobarColors);
-
-        if( is_array($aIsobar) )
-            $this->nbrContours = count($aIsobar);
-        else
-            $this->nbrContours = $aIsobar;
-    }
-
-
-    /**
-     * Flipe the data around the center
-     *
-     * @param $aFlg
-     *
-     */
-    function SetInvert($aFlg=true) {
-        $this->flipData = $aFlg;
-    }
-
-    /**
-     * Set the colors for the isobar lines
-     *
-     * @param $aColorArray
-     *
-     */
-    function SetIsobarColors($aColorArray) {
-        $this->manualIsobarColors = $aColorArray;
-    }
-
-    /**
-     * Show the legend
-     *
-     * @param $aFlg true if the legend should be shown
-     *
-     */
-    function ShowLegend($aFlg=true) {
-        $this->showLegend = $aFlg;
-    }
-
-
-    /**
-     * @param $aFlg true if the legend should start with the lowest isobar on top
-     * @return unknown_type
-     */
-    function Invertlegend($aFlg=true) {
-        $this->invertLegend = $aFlg;
-    }
-
-    /* Internal method. Give the min value to be used for the scaling
-     *
-     */
-    function Min() {
-        return array(0,0);
-    }
-
-    /* Internal method. Give the max value to be used for the scaling
-     *
-     */
-    function Max() {
-        return array(count($this->dataMatrix[0])-1,count($this->dataMatrix)-1);
-    }
-
-    /**
-     * Internal ramewrok method to setup the legend to be used for this plot.
-     * @param $aGraph The parent graph class
-     */
-    function Legend($aGraph) {
-
-        if( ! $this->showLegend )
-            return;
-
-        if( $this->invertLegend ) {
-            for ($i = 0; $i < $this->nbrContours; $i++) {
-                $aGraph->legend->Add(sprintf('%.1f',$this->contourVal[$i]), $this->contourColor[$i]);
-            }
-        }
-        else {
-            for ($i = $this->nbrContours-1; $i >= 0 ; $i--) {
-                $aGraph->legend->Add(sprintf('%.1f',$this->contourVal[$i]), $this->contourColor[$i]);
-            }
-        }
-    }
-
-
-    /**
-     *  Framework function which gets called before the Stroke() method is called
-     *
-     *  @see Plot#PreScaleSetup($aGraph)
-     *
-     */
-    function PreScaleSetup($aGraph) {
-        $xn = count($this->dataMatrix[0])-1;
-        $yn = count($this->dataMatrix)-1;
-
-        $aGraph->xaxis->scale->Update($aGraph->img,0,$xn);
-        $aGraph->yaxis->scale->Update($aGraph->img,0,$yn);
-
-        $this->contour->SetInvert($this->flipData);
-        list($this->contourCoord,$this->contourVal,$this->contourColor) = $this->contour->getIsobars();
-    }
-
-    /**
-     * Use high contrast color schema
-     *
-     * @param $aFlg True, to use high contrast color
-     * @param $aBW True, Use only black and white color schema
-     */
-    function UseHighContrastColor($aFlg=true,$aBW=false) {
-        $this->highcontrast = $aFlg;
-        $this->highcontrastbw = $aBW;
-        $this->contour->UseHighContrastColor($this->highcontrast,$this->highcontrastbw);
-    }
-
-    /**
-     * Internal method. Stroke the contour plot to the graph
-     *
-     * @param $img Image handler
-     * @param $xscale Instance of the xscale to use
-     * @param $yscale Instance of the yscale to use
-     */
-    function Stroke($img,$xscale,$yscale) {
-
-        if( count($this->manualIsobarColors) > 0 ) {
-            $this->contourColor = $this->manualIsobarColors;
-            if( count($this->manualIsobarColors) != $this->nbrContours ) {
-                JpGraphError::RaiseL(28002);
-            }
-        }
-
-        $img->SetLineWeight($this->line_weight);
-
-        for ($c = 0; $c < $this->nbrContours; $c++) {
-
-            $img->SetColor( $this->contourColor[$c] );
-
-            $n = count($this->contourCoord[$c]);
-            $i = 0;
-            while ( $i < $n ) {
-                list($x1,$y1) = $this->contourCoord[$c][$i][0];
-                $x1t = $xscale->Translate($x1);
-                $y1t = $yscale->Translate($y1);
-
-                list($x2,$y2) = $this->contourCoord[$c][$i++][1];
-                $x2t = $xscale->Translate($x2);
-                $y2t = $yscale->Translate($y2);
-
-                $img->Line($x1t,$y1t,$x2t,$y2t);
-            }
-
-        }
-    }
-
-}
-
-// EOF
-?>
diff --git a/#jpgraph/src/jpgraph_date.php b/#jpgraph/src/jpgraph_date.php
deleted file mode 100644
index db4c441c..00000000
--- a/#jpgraph/src/jpgraph_date.php
+++ /dev/null
@@ -1,499 +0,0 @@
-<?php
-/*=======================================================================
- // File:        JPGRAPH_DATE.PHP
- // Description: Classes to handle Date scaling
- // Created:     2005-05-02
- // Ver:         $Id: jpgraph_date.php 1106 2009-02-22 20:16:35Z ljp $
- //
- // Copyright (c) Asial Corporation. All rights reserved.
- //========================================================================
- */
-
-define('HOURADJ_1',0+30);
-define('HOURADJ_2',1+30);
-define('HOURADJ_3',2+30);
-define('HOURADJ_4',3+30);
-define('HOURADJ_6',4+30);
-define('HOURADJ_12',5+30);
-
-define('MINADJ_1',0+20);
-define('MINADJ_5',1+20);
-define('MINADJ_10',2+20);
-define('MINADJ_15',3+20);
-define('MINADJ_30',4+20);
-
-define('SECADJ_1',0);
-define('SECADJ_5',1);
-define('SECADJ_10',2);
-define('SECADJ_15',3);
-define('SECADJ_30',4);
-
-
-define('YEARADJ_1',0+30);
-define('YEARADJ_2',1+30);
-define('YEARADJ_5',2+30);
-
-define('MONTHADJ_1',0+20);
-define('MONTHADJ_6',1+20);
-
-define('DAYADJ_1',0);
-define('DAYADJ_WEEK',1);
-define('DAYADJ_7',1);
-
-define('SECPERYEAR',31536000);
-define('SECPERDAY',86400);
-define('SECPERHOUR',3600);
-define('SECPERMIN',60);
-
-
-class DateScale extends LinearScale {
-    private $date_format = '';
-    private $iStartAlign = false, $iEndAlign = false;
-    private $iStartTimeAlign = false, $iEndTimeAlign = false;
-
-    //---------------
-    // CONSTRUCTOR
-    function __construct($aMin=0,$aMax=0,$aType='x') {
-        assert($aType=="x");
-        assert($aMin<=$aMax);
-
-        $this->type=$aType;
-        $this->scale=array($aMin,$aMax);
-        $this->world_size=$aMax-$aMin;
-        $this->ticks = new LinearTicks();
-        $this->intscale=true;
-    }
-
-
-    //------------------------------------------------------------------------------------------
-    // Utility Function AdjDate()
-    // Description: Will round a given time stamp to an even year, month or day
-    // argument.
-    //------------------------------------------------------------------------------------------
-
-    function AdjDate($aTime,$aRound=0,$aYearType=false,$aMonthType=false,$aDayType=false) {
-        $y = (int)date('Y',$aTime); $m = (int)date('m',$aTime); $d = (int)date('d',$aTime);
-        $h=0;$i=0;$s=0;
-        if( $aYearType !== false ) {
-            $yearAdj = array(0=>1, 1=>2, 2=>5);
-            if( $aRound == 0 ) {
-                $y = floor($y/$yearAdj[$aYearType])*$yearAdj[$aYearType];
-            }
-            else {
-                ++$y;
-                $y = ceil($y/$yearAdj[$aYearType])*$yearAdj[$aYearType];
-            }
-            $m=1;$d=1;
-        }
-        elseif( $aMonthType !== false ) {
-            $monthAdj = array(0=>1, 1=>6);
-            if( $aRound == 0 ) {
-                $m = floor($m/$monthAdj[$aMonthType])*$monthAdj[$aMonthType];
-                $d=1;
-            }
-            else {
-                ++$m;
-                $m = ceil($m/$monthAdj[$aMonthType])*$monthAdj[$aMonthType];
-                $d=1;
-            }
-        }
-        elseif( $aDayType !== false ) {
-            if( $aDayType == 0 ) {
-                if( $aRound == 1 ) {
-                    //++$d;
-                    $h=23;$i=59;$s=59;
-                }
-            }
-            else {
-                // Adjust to an even week boundary.
-                $w = (int)date('w',$aTime); // Day of week 0=Sun, 6=Sat
-                if( true ) { // Adjust to start on Mon
-                    if( $w==0 ) $w=6;
-                    else --$w;
-                }
-                if( $aRound == 0 ) {
-                    $d -= $w;
-                }
-                else {
-                    $d += (7-$w);
-                    $h=23;$i=59;$s=59;
-                }
-            }
-        }
-        return mktime($h,$i,$s,$m,$d,$y);
-
-    }
-
-    //------------------------------------------------------------------------------------------
-    // Wrapper for AdjDate that will round a timestamp to an even date rounding
-    // it downwards.
-    //------------------------------------------------------------------------------------------
-    function AdjStartDate($aTime,$aYearType=false,$aMonthType=false,$aDayType=false) {
-        return $this->AdjDate($aTime,0,$aYearType,$aMonthType,$aDayType);
-    }
-
-    //------------------------------------------------------------------------------------------
-    // Wrapper for AdjDate that will round a timestamp to an even date rounding
-    // it upwards
-    //------------------------------------------------------------------------------------------
-    function AdjEndDate($aTime,$aYearType=false,$aMonthType=false,$aDayType=false) {
-        return $this->AdjDate($aTime,1,$aYearType,$aMonthType,$aDayType);
-    }
-
-    //------------------------------------------------------------------------------------------
-    // Utility Function AdjTime()
-    // Description: Will round a given time stamp to an even time according to
-    // argument.
-    //------------------------------------------------------------------------------------------
-
-    function AdjTime($aTime,$aRound=0,$aHourType=false,$aMinType=false,$aSecType=false) {
-        $y = (int)date('Y',$aTime); $m = (int)date('m',$aTime); $d = (int)date('d',$aTime);
-        $h = (int)date('H',$aTime); $i = (int)date('i',$aTime); $s = (int)date('s',$aTime);
-        if( $aHourType !== false ) {
-            $aHourType %= 6;
-            $hourAdj = array(0=>1, 1=>2, 2=>3, 3=>4, 4=>6, 5=>12);
-            if( $aRound == 0 )
-            $h = floor($h/$hourAdj[$aHourType])*$hourAdj[$aHourType];
-            else {
-                if( ($h % $hourAdj[$aHourType]==0) && ($i > 0 || $s > 0) ) {
-                    $h++;
-                }
-                $h = ceil($h/$hourAdj[$aHourType])*$hourAdj[$aHourType];
-                if( $h >= 24 ) {
-                    $aTime += 86400;
-                    $y = (int)date('Y',$aTime); $m = (int)date('m',$aTime); $d = (int)date('d',$aTime);
-                    $h -= 24;
-                }
-            }
-            $i=0;$s=0;
-        }
-        elseif( $aMinType !== false ) {
-            $aMinType %= 5;
-            $minAdj = array(0=>1, 1=>5, 2=>10, 3=>15, 4=>30);
-            if( $aRound == 0 ) {
-                $i = floor($i/$minAdj[$aMinType])*$minAdj[$aMinType];
-            }
-            else {
-                if( ($i % $minAdj[$aMinType]==0) && $s > 0 ) {
-                    $i++;
-                }
-                $i = ceil($i/$minAdj[$aMinType])*$minAdj[$aMinType];
-                if( $i >= 60) {
-                    $aTime += 3600;
-                    $y = (int)date('Y',$aTime); $m = (int)date('m',$aTime); $d = (int)date('d',$aTime);
-                    $h = (int)date('H',$aTime); $i = 0;
-                }
-            }
-            $s=0;
-        }
-        elseif( $aSecType !== false ) {
-            $aSecType %= 5;
-            $secAdj = array(0=>1, 1=>5, 2=>10, 3=>15, 4=>30);
-            if( $aRound == 0 ) {
-                $s = floor($s/$secAdj[$aSecType])*$secAdj[$aSecType];
-            }
-            else {
-                $s = ceil($s/$secAdj[$aSecType]*1.0)*$secAdj[$aSecType];
-                if( $s >= 60) {
-                    $s=0;
-                    $aTime += 60;
-                    $y = (int)date('Y',$aTime); $m = (int)date('m',$aTime); $d = (int)date('d',$aTime);
-                    $h = (int)date('H',$aTime); $i = (int)date('i',$aTime);
-                }
-            }
-        }
-        return mktime($h,$i,$s,$m,$d,$y);
-    }
-
-    //------------------------------------------------------------------------------------------
-    // Wrapper for AdjTime that will round a timestamp to an even time rounding
-    // it downwards.
-    // Example: AdjStartTime(mktime(18,27,13,2,22,2005),false,2) => 18:20
-    //------------------------------------------------------------------------------------------
-    function AdjStartTime($aTime,$aHourType=false,$aMinType=false,$aSecType=false) {
-        return $this->AdjTime($aTime,0,$aHourType,$aMinType,$aSecType);
-    }
-
-    //------------------------------------------------------------------------------------------
-    // Wrapper for AdjTime that will round a timestamp to an even time rounding
-    // it upwards
-    // Example: AdjEndTime(mktime(18,27,13,2,22,2005),false,2) => 18:30
-    //------------------------------------------------------------------------------------------
-    function AdjEndTime($aTime,$aHourType=false,$aMinType=false,$aSecType=false) {
-        return $this->AdjTime($aTime,1,$aHourType,$aMinType,$aSecType);
-    }
-
-    //------------------------------------------------------------------------------------------
-    // DateAutoScale
-    // Autoscale a date axis given start and end time
-    // Returns an array ($start,$end,$major,$minor,$format)
-    //------------------------------------------------------------------------------------------
-    function DoDateAutoScale($aStartTime,$aEndTime,$aDensity=0,$aAdjust=true) {
-        // Format of array
-        // array ( Decision point,  array( array( Major-scale-step-array ),
-        //       array( Minor-scale-step-array ),
-        //       array( 0=date-adjust, 1=time-adjust, adjustment-alignment) )
-        //
-        $scalePoints =
-        array(
-        /* Intervall larger than 10 years */
-        SECPERYEAR*10,array(array(SECPERYEAR*5,SECPERYEAR*2),
-        array(SECPERYEAR),
-        array(0,YEARADJ_1, 0,YEARADJ_1) ),
-
-        /* Intervall larger than 2 years */
-        SECPERYEAR*2,array(array(SECPERYEAR),array(SECPERYEAR),
-        array(0,YEARADJ_1) ),
-
-        /* Intervall larger than 90 days (approx 3 month) */
-        SECPERDAY*90,array(array(SECPERDAY*30,SECPERDAY*14,SECPERDAY*7,SECPERDAY),
-        array(SECPERDAY*5,SECPERDAY*7,SECPERDAY,SECPERDAY),
-        array(0,MONTHADJ_1, 0,DAYADJ_WEEK, 0,DAYADJ_1, 0,DAYADJ_1)),
-
-        /* Intervall larger than 30 days (approx 1 month) */
-        SECPERDAY*30,array(array(SECPERDAY*14,SECPERDAY*7,SECPERDAY*2, SECPERDAY),
-        array(SECPERDAY,SECPERDAY,SECPERDAY,SECPERDAY),
-        array(0,DAYADJ_WEEK, 0,DAYADJ_1, 0,DAYADJ_1, 0,DAYADJ_1)),
-
-        /* Intervall larger than 7 days */
-        SECPERDAY*7,array(array(SECPERDAY,SECPERHOUR*12,SECPERHOUR*6,SECPERHOUR*2),
-        array(SECPERHOUR*6,SECPERHOUR*3,SECPERHOUR,SECPERHOUR),
-        array(0,DAYADJ_1, 1,HOURADJ_12, 1,HOURADJ_6, 1,HOURADJ_1)),
-
-        /* Intervall larger than 1 day */
-        SECPERDAY,array(array(SECPERDAY,SECPERHOUR*12,SECPERHOUR*6,SECPERHOUR*2,SECPERHOUR),
-        array(SECPERHOUR*6,SECPERHOUR*2,SECPERHOUR,SECPERHOUR,SECPERHOUR),
-        array(1,HOURADJ_12, 1,HOURADJ_6, 1,HOURADJ_1, 1,HOURADJ_1)),
-
-        /* Intervall larger than 12 hours */
-        SECPERHOUR*12,array(array(SECPERHOUR*2,SECPERHOUR,SECPERMIN*30,900,600),
-        array(1800,1800,900,300,300),
-        array(1,HOURADJ_1, 1,MINADJ_30, 1,MINADJ_15, 1,MINADJ_10, 1,MINADJ_5) ),
-
-        /* Intervall larger than 2 hours */
-        SECPERHOUR*2,array(array(SECPERHOUR,SECPERMIN*30,900,600,300),
-        array(1800,900,300,120,60),
-        array(1,HOURADJ_1, 1,MINADJ_30, 1,MINADJ_15, 1,MINADJ_10, 1,MINADJ_5) ),
-
-        /* Intervall larger than 1 hours */
-        SECPERHOUR,array(array(SECPERMIN*30,900,600,300),array(900,300,120,60),
-        array(1,MINADJ_30, 1,MINADJ_15, 1,MINADJ_10, 1,MINADJ_5) ),
-
-        /* Intervall larger than 30 min */
-        SECPERMIN*30,array(array(SECPERMIN*15,SECPERMIN*10,SECPERMIN*5,SECPERMIN),
-        array(300,300,60,10),
-        array(1,MINADJ_15, 1,MINADJ_10, 1,MINADJ_5, 1,MINADJ_1)),
-
-        /* Intervall larger than 1 min */
-        SECPERMIN,array(array(SECPERMIN,15,10,5),
-        array(15,5,2,1),
-        array(1,MINADJ_1, 1,SECADJ_15, 1,SECADJ_10, 1,SECADJ_5)),
-
-        /* Intervall larger than 10 sec */
-        10,array(array(5,2),
-        array(1,1),
-        array(1,SECADJ_5, 1,SECADJ_1)),
-
-        /* Intervall larger than 1 sec */
-        1,array(array(1),
-        array(1),
-        array(1,SECADJ_1)),
-        );
-
-        $ns = count($scalePoints);
-        // Establish major and minor scale units for the date scale
-        $diff = $aEndTime - $aStartTime;
-        if( $diff < 1 ) return false;
-        $done=false;
-        $i=0;
-        while( ! $done ) {
-            if( $diff > $scalePoints[2*$i] ) {
-                // Get major and minor scale for this intervall
-                $scaleSteps = $scalePoints[2*$i+1];
-                $major = $scaleSteps[0][min($aDensity,count($scaleSteps[0])-1)];
-                // Try to find out which minor step looks best
-                $minor = $scaleSteps[1][min($aDensity,count($scaleSteps[1])-1)];
-                if( $aAdjust ) {
-                    // Find out how we should align the start and end timestamps
-                    $idx = 2*min($aDensity,floor(count($scaleSteps[2])/2)-1);
-                    if( $scaleSteps[2][$idx] === 0 ) {
-                        // Use date adjustment
-                        $adj = $scaleSteps[2][$idx+1];
-                        if( $adj >= 30 ) {
-                            $start = $this->AdjStartDate($aStartTime,$adj-30);
-                            $end   = $this->AdjEndDate($aEndTime,$adj-30);
-                        }
-                        elseif( $adj >= 20 ) {
-                            $start = $this->AdjStartDate($aStartTime,false,$adj-20);
-                            $end   = $this->AdjEndDate($aEndTime,false,$adj-20);
-                        }
-                        else {
-                            $start = $this->AdjStartDate($aStartTime,false,false,$adj);
-                            $end   = $this->AdjEndDate($aEndTime,false,false,$adj);
-                            // We add 1 second for date adjustment to make sure we end on 00:00 the following day
-                            // This makes the final major tick be srawn when we step day-by-day instead of ending
-                            // on xx:59:59 which would not draw the final major tick
-                            $end++;
-                        }
-                    }
-                    else {
-                        // Use time adjustment
-                        $adj = $scaleSteps[2][$idx+1];
-                        if( $adj >= 30 ) {
-                            $start = $this->AdjStartTime($aStartTime,$adj-30);
-                            $end   = $this->AdjEndTime($aEndTime,$adj-30);
-                        }
-                        elseif( $adj >= 20 ) {
-                            $start = $this->AdjStartTime($aStartTime,false,$adj-20);
-                            $end   = $this->AdjEndTime($aEndTime,false,$adj-20);
-                        }
-                        else {
-                            $start = $this->AdjStartTime($aStartTime,false,false,$adj);
-                            $end   = $this->AdjEndTime($aEndTime,false,false,$adj);
-                        }
-                    }
-                }
-                // If the overall date span is larger than 1 day ten we show date
-                $format = '';
-                if( ($end-$start) > SECPERDAY ) {
-                    $format = 'Y-m-d ';
-                }
-                // If the major step is less than 1 day we need to whow hours + min
-                if( $major < SECPERDAY ) {
-                    $format .= 'H:i';
-                }
-                // If the major step is less than 1 min we need to show sec
-                if( $major < 60 ) {
-                    $format .= ':s';
-                }
-                $done=true;
-            }
-            ++$i;
-        }
-        return array($start,$end,$major,$minor,$format);
-    }
-
-    // Overrides the automatic determined date format. Must be a valid date() format string
-    function SetDateFormat($aFormat) {
-        $this->date_format = $aFormat;
-        $this->ticks->SetLabelDateFormat($this->date_format);
-    }
-
-    function AdjustForDST($aFlg=true) {
-        $this->ticks->AdjustForDST($aFlg);
-    }
-
-
-    function SetDateAlign($aStartAlign,$aEndAlign=false) {
-        if( $aEndAlign === false ) {
-            $aEndAlign=$aStartAlign;
-        }
-        $this->iStartAlign = $aStartAlign;
-        $this->iEndAlign = $aEndAlign;
-    }
-
-    function SetTimeAlign($aStartAlign,$aEndAlign=false) {
-        if( $aEndAlign === false ) {
-            $aEndAlign=$aStartAlign;
-        }
-        $this->iStartTimeAlign = $aStartAlign;
-        $this->iEndTimeAlign = $aEndAlign;
-    }
-
-
-    function AutoScale($img,$aStartTime,$aEndTime,$aNumSteps,$_adummy=false) {
-        // We need to have one dummy argument to make the signature of AutoScale()
-        // identical to LinearScale::AutoScale
-        if( $aStartTime == $aEndTime ) {
-            // Special case when we only have one data point.
-            // Create a small artifical intervall to do the autoscaling
-            $aStartTime -= 10;
-            $aEndTime += 10;
-        }
-        $done=false;
-        $i=0;
-        while( ! $done && $i < 5) {
-            list($adjstart,$adjend,$maj,$min,$format) = $this->DoDateAutoScale($aStartTime,$aEndTime,$i);
-            $n = floor(($adjend-$adjstart)/$maj);
-            if( $n * 1.7 > $aNumSteps ) {
-                $done=true;
-            }
-            $i++;
-        }
-
-        /*
-         if( 0 ) { // DEBUG
-         echo "    Start =".date("Y-m-d H:i:s",$aStartTime)."<br>";
-         echo "    End   =".date("Y-m-d H:i:s",$aEndTime)."<br>";
-         echo "Adj Start =".date("Y-m-d H:i:s",$adjstart)."<br>";
-         echo "Adj End   =".date("Y-m-d H:i:s",$adjend)."<p>";
-         echo "Major = $maj s, ".floor($maj/60)."min, ".floor($maj/3600)."h, ".floor($maj/86400)."day<br>";
-         echo "Min = $min s, ".floor($min/60)."min, ".floor($min/3600)."h, ".floor($min/86400)."day<br>";
-         echo "Format=$format<p>";
-         }
-         */
-
-        if( $this->iStartTimeAlign !== false && $this->iStartAlign !== false ) {
-            JpGraphError::RaiseL(3001);
-            //('It is only possible to use either SetDateAlign() or SetTimeAlign() but not both');
-        }
-
-        if( $this->iStartTimeAlign !== false ) {
-            if( $this->iStartTimeAlign >= 30 ) {
-                $adjstart = $this->AdjStartTime($aStartTime,$this->iStartTimeAlign-30);
-            }
-            elseif(  $this->iStartTimeAlign >= 20 ) {
-                $adjstart = $this->AdjStartTime($aStartTime,false,$this->iStartTimeAlign-20);
-            }
-            else {
-                $adjstart = $this->AdjStartTime($aStartTime,false,false,$this->iStartTimeAlign);
-            }
-        }
-        if( $this->iEndTimeAlign !== false ) {
-            if( $this->iEndTimeAlign >= 30 ) {
-                $adjend = $this->AdjEndTime($aEndTime,$this->iEndTimeAlign-30);
-            }
-            elseif(  $this->iEndTimeAlign >= 20 ) {
-                $adjend = $this->AdjEndTime($aEndTime,false,$this->iEndTimeAlign-20);
-            }
-            else {
-                $adjend = $this->AdjEndTime($aEndTime,false,false,$this->iEndTimeAlign);
-            }
-        }
-
-
-
-        if( $this->iStartAlign !== false ) {
-            if( $this->iStartAlign >= 30 ) {
-                $adjstart = $this->AdjStartDate($aStartTime,$this->iStartAlign-30);
-            }
-            elseif(  $this->iStartAlign >= 20 ) {
-                $adjstart = $this->AdjStartDate($aStartTime,false,$this->iStartAlign-20);
-            }
-            else {
-                $adjstart = $this->AdjStartDate($aStartTime,false,false,$this->iStartAlign);
-            }
-        }
-        if( $this->iEndAlign !== false ) {
-            if( $this->iEndAlign >= 30 ) {
-                $adjend = $this->AdjEndDate($aEndTime,$this->iEndAlign-30);
-            }
-            elseif(  $this->iEndAlign >= 20 ) {
-                $adjend = $this->AdjEndDate($aEndTime,false,$this->iEndAlign-20);
-            }
-            else {
-                $adjend = $this->AdjEndDate($aEndTime,false,false,$this->iEndAlign);
-            }
-        }
-        $this->Update($img,$adjstart,$adjend);
-        if( ! $this->ticks->IsSpecified() )
-        $this->ticks->Set($maj,$min);
-        if( $this->date_format == '' )
-        $this->ticks->SetLabelDateFormat($format);
-        else
-        $this->ticks->SetLabelDateFormat($this->date_format);
-    }
-}
-
-
-?>
diff --git a/#jpgraph/src/jpgraph_errhandler.inc.php b/#jpgraph/src/jpgraph_errhandler.inc.php
deleted file mode 100644
index c15361e3..00000000
--- a/#jpgraph/src/jpgraph_errhandler.inc.php
+++ /dev/null
@@ -1,369 +0,0 @@
-<?php
-//=======================================================================
-// File:        JPGRAPH_ERRHANDLER.PHP
-// Description: Error handler class together with handling of localized
-//              error messages. All localized error messages are stored
-//              in a separate file under the "lang/" subdirectory.
-// Created:     2006-09-24
-// Ver:         $Id: jpgraph_errhandler.inc.php 1920 2009-12-08 10:02:26Z ljp $
-//
-// Copyright 2006 (c) Aditus Consulting. All rights reserved.
-//========================================================================
-
-if( !defined('DEFAULT_ERR_LOCALE') ) {
-    define('DEFAULT_ERR_LOCALE','en');
-}
-
-if( !defined('USE_IMAGE_ERROR_HANDLER') ) {
-    define('USE_IMAGE_ERROR_HANDLER',true);
-}
-
-GLOBAL $__jpg_err_locale ;
-$__jpg_err_locale = DEFAULT_ERR_LOCALE;
-
-class ErrMsgText {
-    private $lt=NULL;
-    function __construct() {
-        GLOBAL $__jpg_err_locale;
-        $file = 'lang/'.$__jpg_err_locale.'.inc.php';
-
-        // If the chosen locale doesn't exist try english
-        if( !file_exists(dirname(__FILE__).'/'.$file) ) {
-            $__jpg_err_locale = 'en';
-        }
-
-        $file = 'lang/'.$__jpg_err_locale.'.inc.php';
-        if( !file_exists(dirname(__FILE__).'/'.$file) ) {
-            die('Chosen locale file ("'.$file.'") for error messages does not exist or is not readable for the PHP process. Please make sure that the file exists and that the file permissions are such that the PHP process is allowed to read this file.');
-        }
-        require($file);
-        $this->lt = $_jpg_messages;
-    }
-
-    function Get($errnbr,$a1=null,$a2=null,$a3=null,$a4=null,$a5=null) {
-        GLOBAL $__jpg_err_locale;
-        if( !isset($this->lt[$errnbr]) ) {
-            return 'Internal error: The specified error message ('.$errnbr.') does not exist in the chosen locale ('.$__jpg_err_locale.')';
-        }
-        $ea = $this->lt[$errnbr];
-        $j=0;
-        if( $a1 !== null ) {
-            $argv[$j++] = $a1;
-            if( $a2 !== null ) {
-                $argv[$j++] = $a2;
-                if( $a3 !== null ) {
-                    $argv[$j++] = $a3;
-                    if( $a4 !== null ) {
-                        $argv[$j++] = $a4;
-                        if( $a5 !== null ) {
-                            $argv[$j++] = $a5;
-                        }
-                    }
-                }
-            }
-        }
-        $numargs = $j;
-        if( $ea[1] != $numargs ) {
-            // Error message argument count do not match.
-            // Just return the error message without arguments.
-            return $ea[0];
-        }
-        switch( $numargs ) {
-            case 1:
-                $msg = sprintf($ea[0],$argv[0]);
-                break;
-            case 2:
-                $msg = sprintf($ea[0],$argv[0],$argv[1]);
-                break;
-            case 3:
-                $msg = sprintf($ea[0],$argv[0],$argv[1],$argv[2]);
-                break;
-            case 4:
-                $msg = sprintf($ea[0],$argv[0],$argv[1],$argv[2],$argv[3]);
-                break;
-            case 5:
-                $msg = sprintf($ea[0],$argv[0],$argv[1],$argv[2],$argv[3],$argv[4]);
-                break;
-            case 0:
-            default:
-                $msg = sprintf($ea[0]);
-                break;
-        }
-        return $msg;
-    }
-}
-     
-//
-// A wrapper class that is used to access the specified error object
-// (to hide the global error parameter and avoid having a GLOBAL directive
-// in all methods.
-//
-class JpGraphError {
-    private static $__iImgFlg = true;
-    private static $__iLogFile = '';
-    private static $__iTitle = 'JpGraph Error: ';
-    public static function Raise($aMsg,$aHalt=true){
-        throw new JpGraphException($aMsg);
-    }
-    public static function SetErrLocale($aLoc) {
-        GLOBAL $__jpg_err_locale ;
-        $__jpg_err_locale = $aLoc;
-    }
-    public static function RaiseL($errnbr,$a1=null,$a2=null,$a3=null,$a4=null,$a5=null) {
-        throw new JpGraphExceptionL($errnbr,$a1,$a2,$a3,$a4,$a5);
-    }
-    public static function SetImageFlag($aFlg=true) {
-    	self::$__iImgFlg = $aFlg;
-    }
-    public static function GetImageFlag() {
-    	return self::$__iImgFlg;
-    }
-    public static function SetLogFile($aFile) {
-    	self::$__iLogFile = $aFile;
-    }
-    public static function GetLogFile() {
-    	return self::$__iLogFile;
-    }
-    public static function SetTitle($aTitle) {
-    	self::$__iTitle = $aTitle;
-    }
-    public static function GetTitle() {
-    	return self::$__iTitle;
-    }    
-}
-
-class JpGraphException extends Exception {
-    // Redefine the exception so message isn't optional
-    public function __construct($message, $code = 0) {
-        // make sure everything is assigned properly
-        parent::__construct($message, $code);
-    }
-    // custom string representation of object
-    public function _toString() {
-        return __CLASS__ . ": [{$this->code}]: {$this->message} at " . basename($this->getFile()) . ":" . $this->getLine() . "\n" . $this->getTraceAsString() . "\n";
-    }
-    // custom representation of error as an image
-    public function Stroke() {
-    	if( JpGraphError::GetImageFlag() ) {
-        	$errobj = new JpGraphErrObjectImg();
-        	$errobj->SetTitle(JpGraphError::GetTitle());
-    	}
-    	else {    		
-    		$errobj = new JpGraphErrObject();
-        	$errobj->SetTitle(JpGraphError::GetTitle());    		
-    		$errobj->SetStrokeDest(JpGraphError::GetLogFile());
-    	}
-        $errobj->Raise($this->getMessage());
-    }
-    static public function defaultHandler(Exception $exception) {
-        global $__jpg_OldHandler;
-        if( $exception instanceof JpGraphException ) {
-            $exception->Stroke();
-        }
-        else {
-            // Restore old handler
-            if( $__jpg_OldHandler !== NULL ) {
-                set_exception_handler($__jpg_OldHandler);
-            }
-            throw $exception;
-        }
-    }
-}
-
-class JpGraphExceptionL extends JpGraphException {
-   // Redefine the exception so message isn't optional
-    public function __construct($errcode,$a1=null,$a2=null,$a3=null,$a4=null,$a5=null) {
-        // make sure everything is assigned properly
-        $errtxt = new ErrMsgText();
-        JpGraphError::SetTitle('JpGraph Error: '.$errcode);
-        parent::__construct($errtxt->Get($errcode,$a1,$a2,$a3,$a4,$a5), 0);
-    }
-}
-
-// Setup the default handler
-global $__jpg_OldHandler;
-$__jpg_OldHandler = set_exception_handler(array('JpGraphException','defaultHandler'));
-
-//
-// First of all set up a default error handler
-//
-
-//=============================================================
-// The default trivial text error handler.
-//=============================================================
-class JpGraphErrObject {
-
-    protected $iTitle = "JpGraph error: ";
-    protected $iDest = false;
-
-
-    function __construct() {
-        // Empty. Reserved for future use
-    }
-
-    function SetTitle($aTitle) {
-        $this->iTitle = $aTitle;
-    }
-
-    function SetStrokeDest($aDest) {
-        $this->iDest = $aDest;
-    }
-
-    // If aHalt is true then execution can't continue. Typical used for fatal errors
-    function Raise($aMsg,$aHalt=false) {
-        if( $this->iDest != '' ) {
-        	if( $this->iDest == 'syslog' ) {
-        		error_log($this->iTitle.$aMsg);	
-        	} 
-        	else {
-        		$str = '['.date('r').'] '.$this->iTitle.$aMsg."\n";
-        		$f = @fopen($this->iDest,'a');
-    	        if( $f ) {            	
-        	        @fwrite($f,$str);
-            	    @fclose($f);
-            	}
-        	}
-        }
-        else {
-        	$aMsg = $this->iTitle.$aMsg;        	
-        	// Check SAPI and if we are called from the command line
-        	// send the error to STDERR instead
-        	if( PHP_SAPI == 'cli' ) {
-        		fwrite(STDERR,$aMsg);
-        	}
-        	else {
-            	echo $aMsg;
-        	}
-        }
-        if( $aHalt )
-        	exit(1);
-    }
-}
-
-//==============================================================
-// An image based error handler
-//==============================================================
-class JpGraphErrObjectImg extends JpGraphErrObject {
-    
-    function __construct() {
-        parent::__construct();
-        // Empty. Reserved for future use
-    }
-
-    function Raise($aMsg,$aHalt=true) {
-        $img_iconerror =
-     'iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAMAAAC7IEhfAAAAaV'.
-     'BMVEX//////2Xy8mLl5V/Z2VvMzFi/v1WyslKlpU+ZmUyMjEh/'.
-     'f0VyckJlZT9YWDxMTDjAwMDy8sLl5bnY2K/MzKW/v5yyspKlpY'.
-     'iYmH+MjHY/PzV/f2xycmJlZVlZWU9MTEXY2Ms/PzwyMjLFTjea'.
-     'AAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACx'.
-     'IAAAsSAdLdfvwAAAAHdElNRQfTBgISOCqusfs5AAABLUlEQVR4'.
-     '2tWV3XKCMBBGWfkranCIVClKLd/7P2Q3QsgCxjDTq+6FE2cPH+'.
-     'xJ0Ogn2lQbsT+Wrs+buAZAV4W5T6Bs0YXBBwpKgEuIu+JERAX6'.
-     'wM2rHjmDdEITmsQEEmWADgZm6rAjhXsoMGY9B/NZBwJzBvn+e3'.
-     'wHntCAJdGu9SviwIwoZVDxPB9+Rc0TSEbQr0j3SA1gwdSn6Db0'.
-     '6Tm1KfV6yzWGQO7zdpvyKLKBDmRFjzeB3LYgK7r6A/noDAfjtS'.
-     'IXaIzbJSv6WgUebTMV4EoRB8a2mQiQjgtF91HdKDKZ1gtFtQjk'.
-     'YcWaR5OKOhkYt+ZsTFdJRfPAApOpQYJTNHvCRSJR6SJngQadfc'.
-     'vd69OLMddVOPCGVnmrFD8bVYd3JXfxXPtLR/+mtv59/ALWiiMx'.
-     'qL72fwAAAABJRU5ErkJggg==' ;
-
-        
-        if( function_exists("imagetypes") ) {
-            $supported = imagetypes();
-        } else {
-            $supported = 0;
-        }
-
-        if( !function_exists('imagecreatefromstring') ) {
-            $supported = 0;
-        }
-        
-        if( ob_get_length() || headers_sent() || !($supported & IMG_PNG) ) {
-            // Special case for headers already sent or that the installation doesn't support
-            // the PNG format (which the error icon is encoded in).
-            // Dont return an image since it can't be displayed
-            die($this->iTitle.' '.$aMsg);
-        }
-
-        $aMsg = wordwrap($aMsg,55);
-        $lines = substr_count($aMsg,"\n");
-
-        // Create the error icon GD
-        $erricon = Image::CreateFromString(base64_decode($img_iconerror));
-
-        // Create an image that contains the error text.
-        $w=400;
-        $h=100 + 15*max(0,$lines-3);
-
-        $img = new Image($w,$h);
-
-
-        // Drop shadow
-        $img->SetColor("gray");
-        $img->FilledRectangle(5,5,$w-1,$h-1,10);
-        $img->SetColor("gray:0.7");
-        $img->FilledRectangle(5,5,$w-3,$h-3,10);
-
-        // Window background
-        $img->SetColor("lightblue");
-        $img->FilledRectangle(1,1,$w-5,$h-5);
-        $img->CopyCanvasH($img->img,$erricon,5,30,0,0,40,40);
-
-        // Window border
-        $img->SetColor("black");
-        $img->Rectangle(1,1,$w-5,$h-5);
-        $img->Rectangle(0,0,$w-4,$h-4);
-
-        // Window top row
-        $img->SetColor("darkred");
-        for($y=3; $y < 18; $y += 2 )
-        $img->Line(1,$y,$w-6,$y);
-
-        // "White shadow"
-        $img->SetColor("white");
-
-        // Left window edge
-        $img->Line(2,2,2,$h-5);
-        $img->Line(2,2,$w-6,2);
-
-        // "Gray button shadow"
-        $img->SetColor("darkgray");
-
-        // Gray window shadow
-        $img->Line(2,$h-6,$w-5,$h-6);
-        $img->Line(3,$h-7,$w-5,$h-7);
-
-        // Window title
-        $m = floor($w/2-5);
-        $l = 110;
-        $img->SetColor("lightgray:1.3");
-        $img->FilledRectangle($m-$l,2,$m+$l,16);
-
-        // Stroke text
-        $img->SetColor("darkred");
-        $img->SetFont(FF_FONT2,FS_BOLD);
-        $img->StrokeText($m-90,15,$this->iTitle);
-        $img->SetColor("black");
-        $img->SetFont(FF_FONT1,FS_NORMAL);
-        $txt = new Text($aMsg,52,25);
-        $txt->SetFont(FF_FONT1);
-        $txt->Align("left","top");
-        $txt->Stroke($img);
-        if ($this->iDest) {
-            $img->Stream($this->iDest);
-        } else {
-            $img->Headers();
-            $img->Stream();
-        }
-        if( $aHalt )
-            die();
-    }
-}
-
-
-
-if( ! USE_IMAGE_ERROR_HANDLER ) {
-	JpGraphError::SetImageFlag(false);
-}
-?>
diff --git a/#jpgraph/src/jpgraph_error.php b/#jpgraph/src/jpgraph_error.php
deleted file mode 100644
index 3ef3ca5b..00000000
--- a/#jpgraph/src/jpgraph_error.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php
-/*=======================================================================
- // File:        JPGRAPH_ERROR.PHP
- // Description: Error plot extension for JpGraph
- // Created:     2001-01-08
- // Ver:         $Id: jpgraph_error.php 1106 2009-02-22 20:16:35Z ljp $
- //
- // Copyright (c) Asial Corporation. All rights reserved.
- //========================================================================
- */
-   
-//===================================================
-// CLASS ErrorPlot
-// Description: Error plot with min/max value for
-// each datapoint
-//===================================================
-class ErrorPlot extends Plot {
-    private $errwidth=2;
-    
-    //---------------
-    // CONSTRUCTOR
-    function __construct($datay,$datax=false) {
-        parent::__construct($datay,$datax);
-        $this->numpoints /= 2;
-    }
-    //---------------
-    // PUBLIC METHODS
-
-    // Gets called before any axis are stroked
-    function PreStrokeAdjust($graph) {
-        if( $this->center ) {
-            $a=0.5; $b=0.5;
-            ++$this->numpoints;
-        } else {
-            $a=0; $b=0;
-        }
-        $graph->xaxis->scale->ticks->SetXLabelOffset($a);
-        $graph->SetTextScaleOff($b);
-        //$graph->xaxis->scale->ticks->SupressMinorTickMarks();
-    }
-
-    // Method description
-    function Stroke($img,$xscale,$yscale) {
-        $numpoints=count($this->coords[0])/2;
-        $img->SetColor($this->color);
-        $img->SetLineWeight($this->weight);
-
-        if( isset($this->coords[1]) ) {
-            if( count($this->coords[1])!=$numpoints )
-            JpGraphError::RaiseL(2003,count($this->coords[1]),$numpoints);
-            //("Number of X and Y points are not equal. Number of X-points:".count($this->coords[1])." Number of Y-points:$numpoints");
-            else
-            $exist_x = true;
-        }
-        else
-        $exist_x = false;
-
-        for( $i=0; $i<$numpoints; ++$i) {
-            if( $exist_x )
-            $x=$this->coords[1][$i];
-            else
-            $x=$i;
-
-            if( !is_numeric($x) ||
-            !is_numeric($this->coords[0][$i*2]) || !is_numeric($this->coords[0][$i*2+1]) ) {
-                continue;
-            }
-
-            $xt = $xscale->Translate($x);
-            $yt1 = $yscale->Translate($this->coords[0][$i*2]);
-            $yt2 = $yscale->Translate($this->coords[0][$i*2+1]);
-            $img->Line($xt,$yt1,$xt,$yt2);
-            $img->Line($xt-$this->errwidth,$yt1,$xt+$this->errwidth,$yt1);
-            $img->Line($xt-$this->errwidth,$yt2,$xt+$this->errwidth,$yt2);
-        }
-        return true;
-    }
-} // Class
-
-
-//===================================================
-// CLASS ErrorLinePlot
-// Description: Combine a line and error plot
-// THIS IS A DEPRECATED PLOT TYPE JUST KEPT FOR
-// BACKWARD COMPATIBILITY
-//===================================================
-class ErrorLinePlot extends ErrorPlot {
-    public $line=null;
-    //---------------
-    // CONSTRUCTOR
-    function __construct($datay,$datax=false) {
-        parent::__construct($datay,$datax);
-        // Calculate line coordinates as the average of the error limits
-        $n = count($datay);
-        for($i=0; $i < $n; $i+=2 ) {
-            $ly[]=($datay[$i]+$datay[$i+1])/2;
-        }
-        $this->line=new LinePlot($ly,$datax);
-    }
-
-    //---------------
-    // PUBLIC METHODS
-    function Legend($graph) {
-        if( $this->legend != "" )
-        $graph->legend->Add($this->legend,$this->color);
-        $this->line->Legend($graph);
-    }
-     
-    function Stroke($img,$xscale,$yscale) {
-        parent::Stroke($img,$xscale,$yscale);
-        $this->line->Stroke($img,$xscale,$yscale);
-    }
-} // Class
-
-
-//===================================================
-// CLASS LineErrorPlot
-// Description: Combine a line and error plot
-//===================================================
-class LineErrorPlot extends ErrorPlot {
-    public $line=null;
-    //---------------
-    // CONSTRUCTOR
-    // Data is (val, errdeltamin, errdeltamax)
-    function __construct($datay,$datax=false) {
-        $ly=array(); $ey=array();
-        $n = count($datay);
-        if( $n % 3 != 0 ) {
-            JpGraphError::RaiseL(4002);
-            //('Error in input data to LineErrorPlot. Number of data points must be a multiple of 3');
-        }
-        for($i=0; $i < $n; $i+=3 ) {
-            $ly[]=$datay[$i];
-            $ey[]=$datay[$i]+$datay[$i+1];
-            $ey[]=$datay[$i]+$datay[$i+2];
-        }
-        parent::__construct($ey,$datax);
-        $this->line=new LinePlot($ly,$datax);
-    }
-
-    //---------------
-    // PUBLIC METHODS
-    function Legend($graph) {
-        if( $this->legend != "" )
-        $graph->legend->Add($this->legend,$this->color);
-        $this->line->Legend($graph);
-    }
-     
-    function Stroke($img,$xscale,$yscale) {
-        parent::Stroke($img,$xscale,$yscale);
-        $this->line->Stroke($img,$xscale,$yscale);
-    }
-} // Class
-
-
-/* EOF */
-?>
diff --git a/#jpgraph/src/jpgraph_flags.php b/#jpgraph/src/jpgraph_flags.php
deleted file mode 100644
index a7e21877..00000000
--- a/#jpgraph/src/jpgraph_flags.php
+++ /dev/null
@@ -1,376 +0,0 @@
-<?php
-//=======================================================================
-// File:        JPGRAPH_FLAGS.PHP
-// Description: Class Jpfile. Handles plotmarks
-// Created:     2003-06-28
-// Ver:         $Id: jpgraph_flags.php 1106 2009-02-22 20:16:35Z ljp $
-//
-// Copyright (c) Asial Corporation. All rights reserved.
-//========================================================================
-
-//------------------------------------------------------------
-// Defines for the different basic sizes of flags
-//------------------------------------------------------------
-DEFINE('FLAGSIZE1',1);
-DEFINE('FLAGSIZE2',2);
-DEFINE('FLAGSIZE3',3);
-DEFINE('FLAGSIZE4',4);
-
-class FlagImages {
-
-    public $iCountryNameMap = array(
-    'Afghanistan' => 'afgh',
-    'Republic of Angola' => 'agla',
-    'Republic of Albania' => 'alba',
-    'Alderney' => 'alde',
-    'Democratic and Popular Republic of Algeria' => 'alge',
-    'Territory of American Samoa' => 'amsa',
-    'Principality of Andorra' => 'andr',
-    'British Overseas Territory of Anguilla' => 'angu',
-    'Antarctica' => 'anta',
-    'Argentine Republic' => 'arge',
-    'League of Arab States' => 'arle',
-    'Republic of Armenia' => 'arme',
-    'Aruba' => 'arub',
-    'Commonwealth of Australia' => 'astl',
-    'Republic of Austria' => 'aust',
-    'Azerbaijani Republic' => 'azer',
-    'Bangladesh' => 'bngl',
-    'British Antarctic Territory' => 'bant',
-    'Kingdom of Belgium' => 'belg',
-    'British Overseas Territory of Bermuda' => 'berm',
-    'Commonwealth of the Bahamas' => 'bhms',
-    'Kingdom of Bahrain' => 'bhrn',
-    'Republic of Belarus' => 'blru',
-    'Republic of Bolivia' => 'blva',
-    'Belize' => 'blze',
-    'Republic of Benin' => 'bnin',
-    'Republic of Botswana' => 'bots',
-    'Federative Republic of Brazil' => 'braz',
-    'Barbados' => 'brbd',
-    'British Indian Ocean Territory' => 'brin',
-    'Brunei Darussalam' => 'brun',
-    'Republic of Burkina' => 'bufa',
-    'Republic of Bulgaria' => 'bulg',
-    'Republic of Burundi' => 'buru',
-    'Overseas Territory of the British Virgin Islands' => 'bvis',
-    'Central African Republic' => 'cafr',
-    'Kingdom of Cambodia' => 'camb',
-    'Republic of Cameroon' => 'came',
-    'Dominion of Canada' => 'cana',
-    'Caribbean Community' => 'cari',
-    'Republic of Cape Verde' => 'cave',
-    'Republic of Chad' => 'chad',
-    'Republic of Chile' => 'chil',
-    'Peoples Republic of China' => 'chin',
-    'Territory of Christmas Island' => 'chms',
-    'Commonwealth of Independent States' => 'cins',
-    'Cook Islands' => 'ckis',
-    'Republic of Colombia' => 'clmb',
-    'Territory of Cocos Islands' => 'cois',
-    'Commonwealth' => 'comn',
-    'Union of the Comoros' => 'como',
-    'Republic of the Congo' => 'cong',
-    'Republic of Costa Rica' => 'corc',
-    'Republic of Croatia' => 'croa',
-    'Republic of Cuba' => 'cuba',
-    'British Overseas Territory of the Cayman Islands' => 'cyis',
-    'Republic of Cyprus' => 'cypr',
-    'The Czech Republic' => 'czec',
-    'Kingdom of Denmark' => 'denm',
-    'Republic of Djibouti' => 'djib',
-    'Commonwealth of Dominica' => 'domn',
-    'Dominican Republic' => 'dore',
-    'Republic of Ecuador' => 'ecua',
-    'Arab Republic of Egypt' => 'egyp',
-    'Republic of El Salvador' => 'elsa',
-    'England' => 'engl',
-    'Republic of Equatorial Guinea' => 'eqgu',
-    'State of Eritrea' => 'erit',
-    'Republic of Estonia' => 'estn',
-    'Ethiopia' => 'ethp',
-    'European Union' => 'euun',
-    'British Overseas Territory of the Falkland Islands' => 'fais',
-    'International Federation of Vexillological Associations' => 'fiav',
-    'Republic of Fiji' => 'fiji',
-    'Republic of Finland' => 'finl',
-    'Territory of French Polynesia' => 'fpol',
-    'French Republic' => 'fran',
-    'Overseas Department of French Guiana' => 'frgu',
-    'Gabonese Republic' => 'gabn',
-    'Republic of the Gambia' => 'gamb',
-    'Republic of Georgia' => 'geor',
-    'Federal Republic of Germany' => 'germ',
-    'Republic of Ghana' => 'ghan',
-    'Gibraltar' => 'gibr',
-    'Hellenic Republic' => 'grec',
-    'State of Grenada' => 'gren',
-    'Overseas Department of Guadeloupe' => 'guad',
-    'Territory of Guam' => 'guam',
-    'Republic of Guatemala' => 'guat',
-    'The Bailiwick of Guernsey' => 'guer',
-    'Republic of Guinea' => 'guin',
-    'Republic of Haiti' => 'hait',
-    'Hong Kong Special Administrative Region' => 'hokn',
-    'Republic of Honduras' => 'hond',
-    'Republic of Hungary' => 'hung',
-    'Republic of Iceland' => 'icel',
-    'International Committee of the Red Cross' => 'icrc',
-    'Republic of India' => 'inda',
-    'Republic of Indonesia' => 'indn',
-    'Republic of Iraq' => 'iraq',
-    'Republic of Ireland' => 'irel',
-    'Organization of the Islamic Conference' => 'isco',
-    'Isle of Man' => 'isma',
-    'State of Israel' => 'isra',
-    'Italian Republic' => 'ital',
-    'Jamaica' => 'jama',
-    'Japan' => 'japa',
-    'The Bailiwick of Jersey' => 'jers',
-    'Hashemite Kingdom of Jordan' => 'jord',
-    'Republic of Kazakhstan' => 'kazk',
-    'Republic of Kenya' => 'keny',
-    'Republic of Kiribati' => 'kirb',
-    'State of Kuwait' => 'kuwa',
-    'Kyrgyz Republic' => 'kyrg',
-    'Republic of Latvia' => 'latv',
-    'Lebanese Republic' => 'leba',
-    'Kingdom of Lesotho' => 'lest',
-    'Republic of Liberia' => 'libe',
-    'Principality of Liechtenstein' => 'liec',
-    'Republic of Lithuania' => 'lith',
-    'Grand Duchy of Luxembourg' => 'luxe',
-    'Macao Special Administrative Region' => 'maca',
-    'Republic of Macedonia' => 'mace',
-    'Republic of Madagascar' => 'mada',
-    'Republic of the Marshall Islands' => 'mais',
-    'Republic of Mali' => 'mali',
-    'Federation of Malaysia' => 'mals',
-    'Republic of Malta' => 'malt',
-    'Republic of Malawi' => 'malw',
-    'Overseas Department of Martinique' => 'mart',
-    'Islamic Republic of Mauritania' => 'maur',
-    'Territorial Collectivity of Mayotte' => 'mayt',
-    'United Mexican States' => 'mexc',
-    'Federated States of Micronesia' => 'micr',
-    'Midway Islands' => 'miis',
-    'Republic of Moldova' => 'mold',
-    'Principality of Monaco' => 'mona',
-    'Republic of Mongolia' => 'mong',
-    'British Overseas Territory of Montserrat' => 'mont',
-    'Kingdom of Morocco' => 'morc',
-    'Republic of Mozambique' => 'moza',
-    'Republic of Mauritius' => 'mrts',
-    'Union of Myanmar' => 'myan',
-    'Republic of Namibia' => 'namb',
-    'North Atlantic Treaty Organization' => 'nato',
-    'Republic of Nauru' => 'naur',
-    'Turkish Republic of Northern Cyprus' => 'ncyp',
-    'Netherlands Antilles' => 'nean',
-    'Kingdom of Nepal' => 'nepa',
-    'Kingdom of the Netherlands' => 'neth',
-    'Territory of Norfolk Island' => 'nfis',
-    'Federal Republic of Nigeria' => 'ngra',
-    'Republic of Nicaragua' => 'nica',
-    'Republic of Niger' => 'nigr',
-    'Niue' => 'niue',
-    'Commonwealth of the Northern Mariana Islands' => 'nmar',
-    'Province of Northern Ireland' => 'noir',
-    'Nordic Council' => 'nord',
-    'Kingdom of Norway' => 'norw',
-    'Territory of New Caledonia and Dependencies' => 'nwca',
-    'New Zealand' => 'nwze',
-    'Organization of American States' => 'oast',
-    'Organization of African Unity' => 'oaun',
-    'International Olympic Committee' => 'olym',
-    'Sultanate of Oman' => 'oman',
-    'Islamic Republic of Pakistan' => 'paks',
-    'Republic of Palau' => 'pala',
-    'Independent State of Papua New Guinea' => 'pang',
-    'Republic of Paraguay' => 'para',
-    'Republic of Peru' => 'peru',
-    'Republic of the Philippines' => 'phil',
-    'British Overseas Territory of the Pitcairn Islands' => 'piis',
-    'Republic of Poland' => 'pola',
-    'Republic of Portugal' => 'port',
-    'Commonwealth of Puerto Rico' => 'purc',
-    'State of Qatar' => 'qata',
-    'Russian Federation' => 'russ',
-    'Romania' => 'rmna',
-    'Republic of Rwanda' => 'rwan',
-    'Kingdom of Saudi Arabia' => 'saar',
-    'Republic of San Marino' => 'sama',
-    'Nordic Sami Conference' => 'sami',
-    'Sark' => 'sark',
-    'Scotland' => 'scot',
-    'Principality of Seborga' => 'sebo',
-    'Republic of Serbia' => 'serb',
-    'Republic of Sierra Leone' => 'sile',
-    'Republic of Singapore' => 'sing',
-    'Republic of Korea' => 'skor',
-    'Republic of Slovenia' => 'slva',
-    'Somali Republic' => 'smla',
-    'Republic of Somaliland' => 'smld',
-    'Republic of South Africa' => 'soaf',
-    'Solomon Islands' => 'sois',
-    'Kingdom of Spain' => 'span',
-    'Secretariat of the Pacific Community' => 'spco',
-    'Democratic Socialist Republic of Sri Lanka' => 'srla',
-    'Saint Lucia' => 'stlu',
-    'Republic of the Sudan' => 'suda',
-    'Republic of Suriname' => 'surn',
-    'Slovak Republic' => 'svka',
-    'Kingdom of Sweden' => 'swdn',
-    'Swiss Confederation' => 'swit',
-    'Syrian Arab Republic' => 'syra',
-    'Kingdom of Swaziland' => 'szld',
-    'Republic of China' => 'taiw',
-    'Taiwan' => 'taiw',
-    'Republic of Tajikistan' => 'tajk',
-    'United Republic of Tanzania' => 'tanz',
-    'Kingdom of Thailand' => 'thal',
-    'Autonomous Region of Tibet' => 'tibe',
-    'Turkmenistan' => 'tkst',
-    'Togolese Republic' => 'togo',
-    'Tokelau' => 'toke',
-    'Kingdom of Tonga' => 'tong',
-    'Tristan da Cunha' => 'trdc',
-    'Tromelin' => 'tris',
-    'Republic of Tunisia' => 'tuns',
-    'Republic of Turkey' => 'turk',
-    'Tuvalu' => 'tuva',
-    'United Arab Emirates' => 'uaem',
-    'Republic of Uganda' => 'ugan',
-    'Ukraine' => 'ukrn',
-    'United Kingdom of Great Britain' => 'unkg',
-    'United Nations' => 'unna',
-    'United States of America' => 'unst',
-    'Oriental Republic of Uruguay' => 'urgy',
-    'Virgin Islands of the United States' => 'usvs',
-    'Republic of Uzbekistan' => 'uzbk',
-    'State of the Vatican City' => 'vacy',
-    'Republic of Vanuatu' => 'vant',
-    'Bolivarian Republic of Venezuela' => 'venz',
-    'Republic of Yemen' => 'yemn',
-    'Democratic Republic of Congo' => 'zare',
-    'Republic of Zimbabwe' => 'zbwe' ) ;
-
-
-    private $iFlagCount = -1;
-    private $iFlagSetMap = array(
-    FLAGSIZE1 => 'flags_thumb35x35',
-    FLAGSIZE2 => 'flags_thumb60x60',
-    FLAGSIZE3 => 'flags_thumb100x100',
-    FLAGSIZE4 => 'flags'
-    );
-
-    private $iFlagData ;
-    private $iOrdIdx=array();
-
-    function FlagImages($aSize=FLAGSIZE1) {
-        switch($aSize) {
-            case FLAGSIZE1 :
-            case FLAGSIZE2 :
-            case FLAGSIZE3 :
-            case FLAGSIZE4 :
-                $file = dirname(__FILE__).'/'.$this->iFlagSetMap[$aSize].'.dat';
-                $fp = fopen($file,'rb');
-                $rawdata = fread($fp,filesize($file));
-                $this->iFlagData = unserialize($rawdata);
-                break;
-            default:
-                JpGraphError::RaiseL(5001,$aSize);
-                //('Unknown flag size. ('.$aSize.')');
-        }
-        $this->iFlagCount = count($this->iCountryNameMap);
-    }
-
-    function GetNum() {
-        return $this->iFlagCount;
-    }
-
-    function GetImgByName($aName,&$outFullName) {
-        $idx = $this->GetIdxByName($aName,$outFullName);
-        return $this->GetImgByIdx($idx);
-    }
-
-    function GetImgByIdx($aIdx) {
-        if( array_key_exists($aIdx,$this->iFlagData) ) {
-            $d = $this->iFlagData[$aIdx][1];
-            return Image::CreateFromString($d);
-        }
-        else {
-            JpGraphError::RaiseL(5002,$aIdx);
-            //("Flag index \"�$aIdx\" does not exist.");
-        }
-    }
-
-    function GetIdxByOrdinal($aOrd,&$outFullName) {
-        $aOrd--;
-        $n = count($this->iOrdIdx);
-        if( $n == 0 ) {
-            reset($this->iCountryNameMap);
-            $this->iOrdIdx=array();
-            $i=0;
-            while( list($key,$val) = each($this->iCountryNameMap) ) {
-                $this->iOrdIdx[$i++] = array($val,$key);
-            }
-            $tmp=$this->iOrdIdx[$aOrd];
-            $outFullName = $tmp[1];
-            return $tmp[0];
-             
-        }
-        elseif( $aOrd >= 0 && $aOrd < $n ) {
-            $tmp=$this->iOrdIdx[$aOrd];
-            $outFullName = $tmp[1];
-            return $tmp[0];
-        }
-        else {
-            JpGraphError::RaiseL(5003,$aOrd);
-            //('Invalid ordinal number specified for flag index.');
-        }
-    }
-
-    function GetIdxByName($aName,&$outFullName) {
-
-        if( is_integer($aName) ) {
-            $idx = $this->GetIdxByOrdinal($aName,$outFullName);
-            return $idx;
-        }
-
-        $found=false;
-        $aName = strtolower($aName);
-        $nlen = strlen($aName);
-        reset($this->iCountryNameMap);
-        // Start by trying to match exact index name
-        while( list($key,$val) = each($this->iCountryNameMap) ) {
-            if( $nlen == strlen($val) && $val == $aName )  {
-                $found=true;
-                break;
-            }
-        }
-        if( !$found ) {
-            reset($this->iCountryNameMap);
-            // If the exact index doesn't work try a (partial) full name
-            while( list($key,$val) = each($this->iCountryNameMap) ) {
-                if( strpos(strtolower($key), $aName) !== false ) {
-                    $found=true;
-                    break;
-                }
-            }
-        }
-        if( $found ) {
-            $outFullName = $key;
-            return $val;
-        }
-        else {
-            JpGraphError::RaiseL(5004,$aName);
-            //("The (partial) country name \"$aName\" does not have a cooresponding flag image. The flag may still exist but under another name, e.g. insted of \"usa\" try \"united states\".");
-        }
-    }
-}
-
-
-
-
-?>
diff --git a/#jpgraph/src/jpgraph_gantt.php b/#jpgraph/src/jpgraph_gantt.php
deleted file mode 100644
index d5afa654..00000000
--- a/#jpgraph/src/jpgraph_gantt.php
+++ /dev/null
@@ -1,3955 +0,0 @@
-<?php
-/*=======================================================================
- // File:        JPGRAPH_GANTT.PHP
- // Description: JpGraph Gantt plot extension
- // Created:     2001-11-12
- // Ver:         $Id: jpgraph_gantt.php 1809 2009-09-09 13:07:33Z ljp $
- //
- // Copyright (c) Asial Corporation. All rights reserved.
- //========================================================================
- */
-
-require_once('jpgraph_plotband.php');
-require_once('jpgraph_iconplot.php');
-require_once('jpgraph_plotmark.inc.php');
-
-// Maximum size for Automatic Gantt chart
-define('MAX_GANTTIMG_SIZE_W',8000);
-define('MAX_GANTTIMG_SIZE_H',5000);
-
-// Scale Header types
-define("GANTT_HDAY",1);
-define("GANTT_HWEEK",2);
-define("GANTT_HMONTH",4);
-define("GANTT_HYEAR",8);
-define("GANTT_HHOUR",16);
-define("GANTT_HMIN",32);
-
-// Bar patterns
-define("GANTT_RDIAG",BAND_RDIAG); // Right diagonal lines
-define("GANTT_LDIAG",BAND_LDIAG); // Left diagonal lines
-define("GANTT_SOLID",BAND_SOLID); // Solid one color
-define("GANTT_VLINE",BAND_VLINE); // Vertical lines
-define("GANTT_HLINE",BAND_HLINE);  // Horizontal lines
-define("GANTT_3DPLANE",BAND_3DPLANE);  // "3D" Plane
-define("GANTT_HVCROSS",BAND_HVCROSS);  // Vertical/Hor crosses
-define("GANTT_DIAGCROSS",BAND_DIAGCROSS); // Diagonal crosses
-
-// Conversion constant
-define("SECPERDAY",3600*24);
-
-// Locales. ONLY KEPT FOR BACKWARDS COMPATIBILITY
-// You should use the proper locale strings directly
-// from now on.
-define("LOCALE_EN","en_UK");
-define("LOCALE_SV","sv_SE");
-
-// Layout of bars
-define("GANTT_EVEN",1);
-define("GANTT_FROMTOP",2);
-
-// Style for minute header
-define("MINUTESTYLE_MM",0);  // 15
-define("MINUTESTYLE_CUSTOM",2);  // Custom format
-
-
-// Style for hour header
-define("HOURSTYLE_HM24",0);  // 13:10
-define("HOURSTYLE_HMAMPM",1);  // 1:10pm
-define("HOURSTYLE_H24",2);  // 13
-define("HOURSTYLE_HAMPM",3);  // 1pm
-define("HOURSTYLE_CUSTOM",4);  // User defined
-
-// Style for day header
-define("DAYSTYLE_ONELETTER",0);  // "M"
-define("DAYSTYLE_LONG",1);  // "Monday"
-define("DAYSTYLE_LONGDAYDATE1",2); // "Monday 23 Jun"
-define("DAYSTYLE_LONGDAYDATE2",3); // "Monday 23 Jun 2003"
-define("DAYSTYLE_SHORT",4);  // "Mon"
-define("DAYSTYLE_SHORTDAYDATE1",5); // "Mon 23/6"
-define("DAYSTYLE_SHORTDAYDATE2",6); // "Mon 23 Jun"
-define("DAYSTYLE_SHORTDAYDATE3",7); // "Mon 23"
-define("DAYSTYLE_SHORTDATE1",8); // "23/6"
-define("DAYSTYLE_SHORTDATE2",9); // "23 Jun"
-define("DAYSTYLE_SHORTDATE3",10); // "Mon 23"
-define("DAYSTYLE_SHORTDATE4",11); // "23"
-define("DAYSTYLE_CUSTOM",12);  // "M"
-
-// Styles for week header
-define("WEEKSTYLE_WNBR",0);
-define("WEEKSTYLE_FIRSTDAY",1);
-define("WEEKSTYLE_FIRSTDAY2",2);
-define("WEEKSTYLE_FIRSTDAYWNBR",3);
-define("WEEKSTYLE_FIRSTDAY2WNBR",4);
-
-// Styles for month header
-define("MONTHSTYLE_SHORTNAME",0);
-define("MONTHSTYLE_LONGNAME",1);
-define("MONTHSTYLE_LONGNAMEYEAR2",2);
-define("MONTHSTYLE_SHORTNAMEYEAR2",3);
-define("MONTHSTYLE_LONGNAMEYEAR4",4);
-define("MONTHSTYLE_SHORTNAMEYEAR4",5);
-define("MONTHSTYLE_FIRSTLETTER",6);
-
-
-// Types of constrain links
-define('CONSTRAIN_STARTSTART',0);
-define('CONSTRAIN_STARTEND',1);
-define('CONSTRAIN_ENDSTART',2);
-define('CONSTRAIN_ENDEND',3);
-
-// Arrow direction for constrain links
-define('ARROW_DOWN',0);
-define('ARROW_UP',1);
-define('ARROW_LEFT',2);
-define('ARROW_RIGHT',3);
-
-// Arrow type for constrain type
-define('ARROWT_SOLID',0);
-define('ARROWT_OPEN',1);
-
-// Arrow size for constrain lines
-define('ARROW_S1',0);
-define('ARROW_S2',1);
-define('ARROW_S3',2);
-define('ARROW_S4',3);
-define('ARROW_S5',4);
-
-// Activity types for use with utility method CreateSimple()
-define('ACTYPE_NORMAL',0);
-define('ACTYPE_GROUP',1);
-define('ACTYPE_MILESTONE',2);
-
-define('ACTINFO_3D',1);
-define('ACTINFO_2D',0);
-
-
-// Check if array_fill() exists
-if (!function_exists('array_fill')) {
-    function array_fill($iStart, $iLen, $vValue) {
-        $aResult = array();
-        for ($iCount = $iStart; $iCount < $iLen + $iStart; $iCount++) {
-            $aResult[$iCount] = $vValue;
-        }
-        return $aResult;
-    }
-}
-
-//===================================================
-// CLASS GanttActivityInfo
-// Description:
-//===================================================
-class GanttActivityInfo {
-    public $iShow=true;
-    public $iLeftColMargin=4,$iRightColMargin=1,$iTopColMargin=1,$iBottomColMargin=3;
-    public $vgrid = null;
-    private $iColor='black';
-    private $iBackgroundColor='lightgray';
-    private $iFFamily=FF_FONT1,$iFStyle=FS_NORMAL,$iFSize=10,$iFontColor='black';
-    private $iTitles=array();
-    private $iWidth=array(),$iHeight=-1;
-    private $iTopHeaderMargin = 4;
-    private $iStyle=1;
-    private $iHeaderAlign='center';
-
-    function __construct() {
-        $this->vgrid = new LineProperty();
-    }
-
-    function Hide($aF=true) {
-        $this->iShow=!$aF;
-    }
-
-    function Show($aF=true) {
-        $this->iShow=$aF;
-    }
-
-    // Specify font
-    function SetFont($aFFamily,$aFStyle=FS_NORMAL,$aFSize=10) {
-        $this->iFFamily = $aFFamily;
-        $this->iFStyle  = $aFStyle;
-        $this->iFSize  = $aFSize;
-    }
-
-    function SetStyle($aStyle) {
-        $this->iStyle = $aStyle;
-    }
-
-    function SetColumnMargin($aLeft,$aRight) {
-        $this->iLeftColMargin = $aLeft;
-        $this->iRightColMargin = $aRight;
-    }
-
-    function SetFontColor($aFontColor) {
-        $this->iFontColor = $aFontColor;
-    }
-
-    function SetColor($aColor) {
-        $this->iColor = $aColor;
-    }
-
-    function SetBackgroundColor($aColor) {
-        $this->iBackgroundColor = $aColor;
-    }
-
-    function SetColTitles($aTitles,$aWidth=null) {
-        $this->iTitles = $aTitles;
-        $this->iWidth = $aWidth;
-    }
-
-    function SetMinColWidth($aWidths) {
-        $n = min(count($this->iTitles),count($aWidths));
-        for($i=0; $i < $n; ++$i ) {
-            if( !empty($aWidths[$i]) ) {
-                if( empty($this->iWidth[$i]) ) {
-                    $this->iWidth[$i] = $aWidths[$i];
-                }
-                else {
-                    $this->iWidth[$i] = max($this->iWidth[$i],$aWidths[$i]);
-                }
-            }
-        }
-    }
-
-    function GetWidth($aImg) {
-        $txt = new TextProperty();
-        $txt->SetFont($this->iFFamily,$this->iFStyle,$this->iFSize);
-        $n = count($this->iTitles) ;
-        $rm=$this->iRightColMargin;
-        $w = 0;
-        for($h=0, $i=0; $i < $n; ++$i ) {
-            $w += $this->iLeftColMargin;
-            $txt->Set($this->iTitles[$i]);
-            if( !empty($this->iWidth[$i]) ) {
-                $w1 = max($txt->GetWidth($aImg)+$rm,$this->iWidth[$i]);
-            }
-            else {
-                $w1 = $txt->GetWidth($aImg)+$rm;
-            }
-            $this->iWidth[$i] = $w1;
-            $w += $w1;
-            $h = max($h,$txt->GetHeight($aImg));
-        }
-        $this->iHeight = $h+$this->iTopHeaderMargin;
-        $txt='';
-        return $w;
-    }
-
-    function GetColStart($aImg,&$aStart,$aAddLeftMargin=false) {
-        $n = count($this->iTitles) ;
-        $adj = $aAddLeftMargin ? $this->iLeftColMargin : 0;
-        $aStart=array($aImg->left_margin+$adj);
-        for( $i=1; $i < $n; ++$i ) {
-            $aStart[$i] = $aStart[$i-1]+$this->iLeftColMargin+$this->iWidth[$i-1];
-        }
-    }
-
-    // Adjust headers left, right or centered
-    function SetHeaderAlign($aAlign) {
-        $this->iHeaderAlign=$aAlign;
-    }
-
-    function Stroke($aImg,$aXLeft,$aYTop,$aXRight,$aYBottom,$aUseTextHeight=false) {
-
-        if( !$this->iShow ) return;
-
-        $txt = new TextProperty();
-        $txt->SetFont($this->iFFamily,$this->iFStyle,$this->iFSize);
-        $txt->SetColor($this->iFontColor);
-        $txt->SetAlign($this->iHeaderAlign,'top');
-        $n=count($this->iTitles);
-
-        if( $n == 0 )
-        return;
-
-        $x = $aXLeft;
-        $h = $this->iHeight;
-        $yTop = $aUseTextHeight ? $aYBottom-$h-$this->iTopColMargin-$this->iBottomColMargin : $aYTop ;
-
-        if( $h < 0 ) {
-            JpGraphError::RaiseL(6001);
-            //('Internal error. Height for ActivityTitles is < 0');
-        }
-
-        $aImg->SetLineWeight(1);
-        // Set background color
-        $aImg->SetColor($this->iBackgroundColor);
-        $aImg->FilledRectangle($aXLeft,$yTop,$aXRight,$aYBottom-1);
-
-        if( $this->iStyle == 1 ) {
-            // Make a 3D effect
-            $aImg->SetColor('white');
-            $aImg->Line($aXLeft,$yTop+1,$aXRight,$yTop+1);
-        }
-
-        for($i=0; $i < $n; ++$i ) {
-            if( $this->iStyle == 1 ) {
-                // Make a 3D effect
-                $aImg->SetColor('white');
-                $aImg->Line($x+1,$yTop,$x+1,$aYBottom);
-            }
-            $x += $this->iLeftColMargin;
-            $txt->Set($this->iTitles[$i]);
-
-            // Adjust the text anchor position according to the choosen alignment
-            $xp = $x;
-            if( $this->iHeaderAlign == 'center' ) {
-                $xp = (($x-$this->iLeftColMargin)+($x+$this->iWidth[$i]))/2;
-            }
-            elseif( $this->iHeaderAlign == 'right' ) {
-                $xp = $x +$this->iWidth[$i]-$this->iRightColMargin;
-            }
-
-            $txt->Stroke($aImg,$xp,$yTop+$this->iTopHeaderMargin);
-            $x += $this->iWidth[$i];
-            if( $i < $n-1 ) {
-                $aImg->SetColor($this->iColor);
-                $aImg->Line($x,$yTop,$x,$aYBottom);
-            }
-        }
-
-        $aImg->SetColor($this->iColor);
-        $aImg->Line($aXLeft,$yTop, $aXRight,$yTop);
-
-        // Stroke vertical column dividers
-        $cols=array();
-        $this->GetColStart($aImg,$cols);
-        $n=count($cols);
-        for( $i=1; $i < $n; ++$i ) {
-            $this->vgrid->Stroke($aImg,$cols[$i],$aYBottom,$cols[$i],
-            $aImg->height - $aImg->bottom_margin);
-        }
-    }
-}
-
-
-//===================================================
-// CLASS GanttGraph
-// Description: Main class to handle gantt graphs
-//===================================================
-class GanttGraph extends Graph {
-    public $scale;  // Public accessible
-    public $hgrid=null;
-    private $iObj=array();    // Gantt objects
-    private $iLabelHMarginFactor=0.2; // 10% margin on each side of the labels
-    private $iLabelVMarginFactor=0.4; // 40% margin on top and bottom of label
-    private $iLayout=GANTT_FROMTOP; // Could also be GANTT_EVEN
-    private $iSimpleFont = FF_FONT1,$iSimpleFontSize=11;
-    private $iSimpleStyle=GANTT_RDIAG,$iSimpleColor='yellow',$iSimpleBkgColor='red';
-    private $iSimpleProgressBkgColor='gray',$iSimpleProgressColor='darkgreen';
-    private $iSimpleProgressStyle=GANTT_SOLID;
-    private $iZoomFactor = 1.0;
-    //---------------
-    // CONSTRUCTOR
-    // Create a new gantt graph
-    function __construct($aWidth=0,$aHeight=0,$aCachedName="",$aTimeOut=0,$aInline=true) {
-
-        // Backward compatibility
-        if( $aWidth == -1 ) $aWidth=0;
-        if( $aHeight == -1 ) $aHeight=0;
-
-        if( $aWidth<  0 || $aHeight < 0 ) {
-            JpgraphError::RaiseL(6002);
-            //("You can't specify negative sizes for Gantt graph dimensions. Use 0 to indicate that you want the library to automatically determine a dimension.");
-        }
-        parent::__construct($aWidth,$aHeight,$aCachedName,$aTimeOut,$aInline);
-        $this->scale = new GanttScale($this->img);
-
-        // Default margins
-        $this->img->SetMargin(15,17,25,15);
-
-        $this->hgrid = new HorizontalGridLine();
-
-        $this->scale->ShowHeaders(GANTT_HWEEK|GANTT_HDAY);
-        $this->SetBox();
-    }
-
-    //---------------
-    // PUBLIC METHODS
-
-    //
-
-    function SetSimpleFont($aFont,$aSize) {
-        $this->iSimpleFont = $aFont;
-        $this->iSimpleFontSize = $aSize;
-    }
-
-    function SetSimpleStyle($aBand,$aColor,$aBkgColor) {
-        $this->iSimpleStyle = $aBand;
-        $this->iSimpleColor = $aColor;
-        $this->iSimpleBkgColor = $aBkgColor;
-    }
-
-    // A utility function to help create basic Gantt charts
-    function CreateSimple($data,$constrains=array(),$progress=array()) {
-        $num = count($data);
-        for( $i=0; $i < $num; ++$i) {
-            switch( $data[$i][1] ) {
-                case ACTYPE_GROUP:
-                    // Create a slightly smaller height bar since the
-                    // "wings" at the end will make it look taller
-                    $a = new GanttBar($data[$i][0],$data[$i][2],$data[$i][3],$data[$i][4],'',8);
-                    $a->title->SetFont($this->iSimpleFont,FS_BOLD,$this->iSimpleFontSize);
-                    $a->rightMark->Show();
-                    $a->rightMark->SetType(MARK_RIGHTTRIANGLE);
-                    $a->rightMark->SetWidth(8);
-                    $a->rightMark->SetColor('black');
-                    $a->rightMark->SetFillColor('black');
-
-                    $a->leftMark->Show();
-                    $a->leftMark->SetType(MARK_LEFTTRIANGLE);
-                    $a->leftMark->SetWidth(8);
-                    $a->leftMark->SetColor('black');
-                    $a->leftMark->SetFillColor('black');
-
-                    $a->SetPattern(BAND_SOLID,'black');
-                    $csimpos = 6;
-                    break;
-
-                case ACTYPE_NORMAL:
-                    $a = new GanttBar($data[$i][0],$data[$i][2],$data[$i][3],$data[$i][4],'',10);
-                    $a->title->SetFont($this->iSimpleFont,FS_NORMAL,$this->iSimpleFontSize);
-                    $a->SetPattern($this->iSimpleStyle,$this->iSimpleColor);
-                    $a->SetFillColor($this->iSimpleBkgColor);
-                    // Check if this activity should have a constrain line
-                    $n = count($constrains);
-                    for( $j=0; $j < $n; ++$j ) {
-                        if( empty($constrains[$j]) || (count($constrains[$j]) != 3) ) {
-                            JpGraphError::RaiseL(6003,$j);
-                            //("Invalid format for Constrain parameter at index=$j in CreateSimple(). Parameter must start with index 0 and contain arrays of (Row,Constrain-To,Constrain-Type)");
-                        }
-                        if( $constrains[$j][0]==$data[$i][0] ) {
-                            $a->SetConstrain($constrains[$j][1],$constrains[$j][2],'black',ARROW_S2,ARROWT_SOLID);
-                        }
-                    }
-
-                    // Check if this activity have a progress bar
-                    $n = count($progress);
-                    for( $j=0; $j < $n; ++$j ) {
-
-                        if( empty($progress[$j]) || (count($progress[$j]) != 2) ) {
-                            JpGraphError::RaiseL(6004,$j);
-                            //("Invalid format for Progress parameter at index=$j in CreateSimple(). Parameter must start with index 0 and contain arrays of (Row,Progress)");
-                        }
-                        if( $progress[$j][0]==$data[$i][0] ) {
-                            $a->progress->Set($progress[$j][1]);
-                            $a->progress->SetPattern($this->iSimpleProgressStyle,
-                            $this->iSimpleProgressColor);
-                            $a->progress->SetFillColor($this->iSimpleProgressBkgColor);
-                            //$a->progress->SetPattern($progress[$j][2],$progress[$j][3]);
-                            break;
-                        }
-                    }
-                    $csimpos = 6;
-                    break;
-
-                case ACTYPE_MILESTONE:
-                    $a = new MileStone($data[$i][0],$data[$i][2],$data[$i][3]);
-                    $a->title->SetFont($this->iSimpleFont,FS_NORMAL,$this->iSimpleFontSize);
-                    $a->caption->SetFont($this->iSimpleFont,FS_NORMAL,$this->iSimpleFontSize);
-                    $csimpos = 5;
-                    break;
-                default:
-                    die('Unknown activity type');
-                    break;
-            }
-
-            // Setup caption
-            $a->caption->Set($data[$i][$csimpos-1]);
-
-            // Check if this activity should have a CSIM target�?
-            if( !empty($data[$i][$csimpos]) ) {
-                $a->SetCSIMTarget($data[$i][$csimpos]);
-                $a->SetCSIMAlt($data[$i][$csimpos+1]);
-            }
-            if( !empty($data[$i][$csimpos+2]) ) {
-                $a->title->SetCSIMTarget($data[$i][$csimpos+2]);
-                $a->title->SetCSIMAlt($data[$i][$csimpos+3]);
-            }
-
-            $this->Add($a);
-        }
-    }
-
-    // Set user specified scale zoom factor when auto sizing is used
-    function SetZoomFactor($aZoom) {
-    	$this->iZoomFactor = $aZoom;
-    }
-
-
-    // Set what headers should be shown
-    function ShowHeaders($aFlg) {
-        $this->scale->ShowHeaders($aFlg);
-    }
-
-    // Specify the fraction of the font height that should be added
-    // as vertical margin
-    function SetLabelVMarginFactor($aVal) {
-        $this->iLabelVMarginFactor = $aVal;
-    }
-
-    // Synonym to the method above
-    function SetVMarginFactor($aVal) {
-        $this->iLabelVMarginFactor = $aVal;
-    }
-
-
-    // Add a new Gantt object
-    function Add($aObject) {
-        if( is_array($aObject) && count($aObject) > 0 ) {
-            $cl = $aObject[0];
-            if( class_exists('IconPlot',false) && ($cl instanceof IconPlot) ) {
-                $this->AddIcon($aObject);
-            }
-            elseif( class_exists('Text',false) && ($cl instanceof Text) ) {
-            	$this->AddText($aObject);
-            }
-            else {
-                $n = count($aObject);
-                for($i=0; $i < $n; ++$i)
-                $this->iObj[] = $aObject[$i];
-            }
-        }
-        else {
-            if( class_exists('IconPlot',false) && ($aObject instanceof IconPlot) ) {
-                $this->AddIcon($aObject);
-            }
-            elseif( class_exists('Text',false) && ($aObject instanceof Text) ) {
-            	$this->AddText($aObject);
-            }
-            else {
-                $this->iObj[] = $aObject;
-            }
-        }
-    }
-
-	function StrokeTexts() {
-        // Stroke any user added text objects
-        if( $this->texts != null ) {
-        	$n = count($this->texts);
-            for($i=0; $i < $n; ++$i) {
-            	if( $this->texts[$i]->iScalePosX !== null && $this->texts[$i]->iScalePosY !== null ) {
-            		$x = $this->scale->TranslateDate($this->texts[$i]->iScalePosX);
-            		$y = $this->scale->TranslateVertPos($this->texts[$i]->iScalePosY);
-            		$y -= $this->scale->GetVertSpacing()/2;
-            	}
-            	else {
-            		$x = $y = null;
-            	}
-                $this->texts[$i]->Stroke($this->img,$x,$y);
-            }
-        }
-	}
-
-    // Override inherit method from Graph and give a warning message
-    function SetScale($aAxisType,$aYMin=1,$aYMax=1,$aXMin=1,$aXMax=1) {
-        JpGraphError::RaiseL(6005);
-        //("SetScale() is not meaningfull with Gantt charts.");
-    }
-
-    // Specify the date range for Gantt graphs (if this is not set it will be
-    // automtically determined from the input data)
-    function SetDateRange($aStart,$aEnd) {
-        // Adjust the start and end so that the indicate the
-        // begining and end of respective start and end days
-        if( strpos($aStart,':') === false )
-        $aStart = date('Y-m-d 00:00',strtotime($aStart));
-        if( strpos($aEnd,':') === false )
-        $aEnd = date('Y-m-d 23:59',strtotime($aEnd));
-        $this->scale->SetRange($aStart,$aEnd);
-    }
-
-    // Get the maximum width of the activity titles columns for the bars
-    // The name is lightly misleading since we from now on can have
-    // multiple columns in the label section. When this was first written
-    // it only supported a single label, hence the name.
-    function GetMaxLabelWidth() {
-        $m=10;
-        if( $this->iObj != null ) {
-            $marg = $this->scale->actinfo->iLeftColMargin+$this->scale->actinfo->iRightColMargin;
-            $n = count($this->iObj);
-            for($i=0; $i < $n; ++$i) {
-                if( !empty($this->iObj[$i]->title) ) {
-                    if( $this->iObj[$i]->title->HasTabs() ) {
-                        list($tot,$w) = $this->iObj[$i]->title->GetWidth($this->img,true);
-                        $m=max($m,$tot);
-                    }
-                    else
-                    $m=max($m,$this->iObj[$i]->title->GetWidth($this->img));
-                }
-            }
-        }
-        return $m;
-    }
-
-    // Get the maximum height of the titles for the bars
-    function GetMaxLabelHeight() {
-        $m=10;
-        if( $this->iObj != null ) {
-            $n = count($this->iObj);
-            // We can not include the title of GnttVLine since that title is stroked at the bottom
-            // of the Gantt bar and not in the activity title columns
-            for($i=0; $i < $n; ++$i) {
-                if( !empty($this->iObj[$i]->title) && !($this->iObj[$i] instanceof GanttVLine) ) {
-                    $m=max($m,$this->iObj[$i]->title->GetHeight($this->img));
-                }
-            }
-        }
-        return $m;
-    }
-
-    function GetMaxBarAbsHeight() {
-        $m=0;
-        if( $this->iObj != null ) {
-            $m = $this->iObj[0]->GetAbsHeight($this->img);
-            $n = count($this->iObj);
-            for($i=1; $i < $n; ++$i) {
-                $m=max($m,$this->iObj[$i]->GetAbsHeight($this->img));
-            }
-        }
-        return $m;
-    }
-
-    // Get the maximum used line number (vertical position) for bars
-    function GetBarMaxLineNumber() {
-        $m=1;
-        if( $this->iObj != null ) {
-            $m = $this->iObj[0]->GetLineNbr();
-            $n = count($this->iObj);
-            for($i=1; $i < $n; ++$i) {
-                $m=max($m,$this->iObj[$i]->GetLineNbr());
-            }
-        }
-        return $m;
-    }
-
-    // Get the minumum and maximum used dates for all bars
-    function GetBarMinMax() {
-        $start = 0 ;
-        $n = count($this->iObj);
-        while( $start < $n && $this->iObj[$start]->GetMaxDate() === false )
-        ++$start;
-        if( $start >= $n ) {
-            JpgraphError::RaiseL(6006);
-            //('Cannot autoscale Gantt chart. No dated activities exist. [GetBarMinMax() start >= n]');
-        }
-
-        $max=$this->scale->NormalizeDate($this->iObj[$start]->GetMaxDate());
-        $min=$this->scale->NormalizeDate($this->iObj[$start]->GetMinDate());
-
-        for($i=$start+1; $i < $n; ++$i) {
-            $rmax = $this->scale->NormalizeDate($this->iObj[$i]->GetMaxDate());
-            if( $rmax != false )
-            $max=Max($max,$rmax);
-            $rmin = $this->scale->NormalizeDate($this->iObj[$i]->GetMinDate());
-            if( $rmin != false )
-            $min=Min($min,$rmin);
-        }
-        $minDate = date("Y-m-d",$min);
-        $min = strtotime($minDate);
-        $maxDate = date("Y-m-d 23:59",$max);
-        $max = strtotime($maxDate);
-        return array($min,$max);
-    }
-
-    // Create a new auto sized canvas if the user hasn't specified a size
-    // The size is determined by what scale the user has choosen and hence
-    // the minimum width needed to display the headers. Some margins are
-    // also added to make it better looking.
-    function AutoSize() {
-
-        if( $this->img->img == null ) {
-            // The predefined left, right, top, bottom margins.
-            // Note that the top margin might incease depending on
-            // the title.
-           $hadj = $vadj = 0;
-           if( $this->doshadow ) {
-           		$hadj = $this->shadow_width;
-                $vadj = $this->shadow_width+5;
-            }
-
-            $lm = $this->img->left_margin;
-            $rm = $this->img->right_margin +$hadj;
-            $rm += 2 ;
-            $tm = $this->img->top_margin;
-            $bm = $this->img->bottom_margin + $vadj;
-            $bm += 2;
-
-            // If there are any added GanttVLine we must make sure that the
-            // bottom margin is wide enough to hold a title.
-            $n = count($this->iObj);
-        	for($i=0; $i < $n; ++$i) {
-            	if( $this->iObj[$i] instanceof GanttVLine ) {
-					$bm = max($bm,$this->iObj[$i]->title->GetHeight($this->img)+10);
-            	}
-        	}
-
-            // First find out the height
-            $n=$this->GetBarMaxLineNumber()+1;
-            $m=max($this->GetMaxLabelHeight(),$this->GetMaxBarAbsHeight());
-            $height=$n*((1+$this->iLabelVMarginFactor)*$m);
-
-            // Add the height of the scale titles
-            $h=$this->scale->GetHeaderHeight();
-            $height += $h;
-
-            // Calculate the top margin needed for title and subtitle
-            if( $this->title->t != "" ) {
-                $tm += $this->title->GetFontHeight($this->img);
-            }
-            if( $this->subtitle->t != "" ) {
-                $tm += $this->subtitle->GetFontHeight($this->img);
-            }
-
-            // ...and then take the bottom and top plot margins into account
-            $height += $tm + $bm + $this->scale->iTopPlotMargin + $this->scale->iBottomPlotMargin;
-            // Now find the minimum width for the chart required
-
-            // If day scale or smaller is shown then we use the day font width
-            // as the base size unit.
-            // If only weeks or above is displayed we use a modified unit to
-            // get a smaller image.
-            if( $this->scale->IsDisplayHour() || $this->scale->IsDisplayMinute() ) {
-                // Add 2 pixel margin on each side
-                $fw=$this->scale->day->GetFontWidth($this->img)+4;
-            }
-            elseif( $this->scale->IsDisplayWeek() ) {
-                $fw = 8;
-            }
-            elseif( $this->scale->IsDisplayMonth() ) {
-                $fw = 4;
-            }
-            else {
-                $fw = 2;
-            }
-
-            $nd=$this->scale->GetNumberOfDays();
-
-            if( $this->scale->IsDisplayDay() ) {
-                // If the days are displayed we also need to figure out
-                // how much space each day's title will require.
-                switch( $this->scale->day->iStyle ) {
-                    case DAYSTYLE_LONG :
-                        $txt = "Monday";
-                        break;
-                    case DAYSTYLE_LONGDAYDATE1 :
-                        $txt =  "Monday 23 Jun";
-                        break;
-                    case DAYSTYLE_LONGDAYDATE2 :
-                        $txt =  "Monday 23 Jun 2003";
-                        break;
-                    case DAYSTYLE_SHORT :
-                        $txt =  "Mon";
-                        break;
-                    case DAYSTYLE_SHORTDAYDATE1 :
-                        $txt =  "Mon 23/6";
-                        break;
-                    case DAYSTYLE_SHORTDAYDATE2 :
-                        $txt =  "Mon 23 Jun";
-                        break;
-                    case DAYSTYLE_SHORTDAYDATE3 :
-                        $txt =  "Mon 23";
-                        break;
-                    case DAYSTYLE_SHORTDATE1 :
-                        $txt =  "23/6";
-                        break;
-                    case DAYSTYLE_SHORTDATE2 :
-                        $txt =  "23 Jun";
-                        break;
-                    case DAYSTYLE_SHORTDATE3 :
-                        $txt =  "Mon 23";
-                        break;
-                    case DAYSTYLE_SHORTDATE4 :
-                        $txt =  "88";
-                        break;
-                    case DAYSTYLE_CUSTOM :
-                        $txt = date($this->scale->day->iLabelFormStr,strtotime('2003-12-20 18:00'));
-                        break;
-                    case DAYSTYLE_ONELETTER :
-                    default:
-                        $txt = "M";
-                        break;
-                }
-                $fw = $this->scale->day->GetStrWidth($this->img,$txt)+6;
-            }
-
-            // If we have hours enabled we must make sure that each day has enough
-            // space to fit the number of hours to be displayed.
-            if( $this->scale->IsDisplayHour() ) {
-                // Depending on what format the user has choose we need different amount
-                // of space. We therefore create a typical string for the choosen format
-                // and determine the length of that string.
-                switch( $this->scale->hour->iStyle ) {
-                    case HOURSTYLE_HMAMPM:
-                        $txt = '12:00pm';
-                        break;
-                    case HOURSTYLE_H24:
-                        // 13
-                        $txt = '24';
-                        break;
-                    case HOURSTYLE_HAMPM:
-                        $txt = '12pm';
-                        break;
-                    case HOURSTYLE_CUSTOM:
-                        $txt = date($this->scale->hour->iLabelFormStr,strtotime('2003-12-20 18:00'));
-                        break;
-                    case HOURSTYLE_HM24:
-                    default:
-                        $txt = '24:00';
-                        break;
-                }
-
-                $hfw = $this->scale->hour->GetStrWidth($this->img,$txt)+6;
-                $mw = $hfw;
-                if( $this->scale->IsDisplayMinute() ) {
-                    // Depending on what format the user has choose we need different amount
-                    // of space. We therefore create a typical string for the choosen format
-                    // and determine the length of that string.
-                    switch( $this->scale->minute->iStyle ) {
-                        case HOURSTYLE_CUSTOM:
-                            $txt2 = date($this->scale->minute->iLabelFormStr,strtotime('2005-05-15 18:55'));
-                            break;
-                        case MINUTESTYLE_MM:
-                        default:
-                            $txt2 = '15';
-                            break;
-                    }
-
-                    $mfw = $this->scale->minute->GetStrWidth($this->img,$txt2)+6;
-                    $n2 = ceil(60 / $this->scale->minute->GetIntervall() );
-                    $mw = $n2 * $mfw;
-                }
-                $hfw = $hfw < $mw ? $mw : $hfw ;
-                $n = ceil(24*60 / $this->scale->TimeToMinutes($this->scale->hour->GetIntervall()) );
-                $hw = $n * $hfw;
-                $fw = $fw < $hw ? $hw : $fw ;
-            }
-
-            // We need to repeat this code block here as well.
-            // THIS iS NOT A MISTAKE !
-            // We really need it since we need to adjust for minutes both in the case
-            // where hour scale is shown and when it is not shown.
-
-            if( $this->scale->IsDisplayMinute() ) {
-                // Depending on what format the user has choose we need different amount
-                // of space. We therefore create a typical string for the choosen format
-                // and determine the length of that string.
-                switch( $this->scale->minute->iStyle ) {
-                    case HOURSTYLE_CUSTOM:
-                        $txt = date($this->scale->minute->iLabelFormStr,strtotime('2005-05-15 18:55'));
-                        break;
-                    case MINUTESTYLE_MM:
-                    default:
-                        $txt = '15';
-                        break;
-                }
-
-                $mfw = $this->scale->minute->GetStrWidth($this->img,$txt)+6;
-                $n = ceil(60 / $this->scale->TimeToMinutes($this->scale->minute->GetIntervall()) );
-                $mw = $n * $mfw;
-                $fw = $fw < $mw ? $mw : $fw ;
-            }
-
-            // If we display week we must make sure that 7*$fw is enough
-            // to fit up to 10 characters of the week font (if the week is enabled)
-            if( $this->scale->IsDisplayWeek() ) {
-                // Depending on what format the user has choose we need different amount
-                // of space
-                $fsw = strlen($this->scale->week->iLabelFormStr);
-                if( $this->scale->week->iStyle==WEEKSTYLE_FIRSTDAY2WNBR ) {
-                    $fsw += 8;
-                }
-                elseif( $this->scale->week->iStyle==WEEKSTYLE_FIRSTDAYWNBR ) {
-                    $fsw += 7;
-                }
-                else {
-                    $fsw += 4;
-                }
-
-                $ww = $fsw*$this->scale->week->GetFontWidth($this->img);
-                if( 7*$fw < $ww ) {
-                    $fw = ceil($ww/7);
-                }
-            }
-
-            if( !$this->scale->IsDisplayDay() && !$this->scale->IsDisplayHour() &&
-            	!( ($this->scale->week->iStyle==WEEKSTYLE_FIRSTDAYWNBR ||
-            		$this->scale->week->iStyle==WEEKSTYLE_FIRSTDAY2WNBR) && $this->scale->IsDisplayWeek() ) ) {
-                // If we don't display the individual days we can shrink the
-                // scale a little bit. This is a little bit pragmatic at the
-                // moment and should be re-written to take into account
-                // a) What scales exactly are shown and
-                // b) what format do they use so we know how wide we need to
-                // make each scale text space at minimum.
-                $fw /= 2;
-                if( !$this->scale->IsDisplayWeek() ) {
-                    $fw /= 1.8;
-                }
-            }
-
-            $cw = $this->GetMaxActInfoColWidth() ;
-            $this->scale->actinfo->SetMinColWidth($cw);
-            if( $this->img->width <= 0 ) {
-                // Now determine the width for the activity titles column
-
-                // Firdst find out the maximum width of each object column
-                $titlewidth = max(max($this->GetMaxLabelWidth(),
-                $this->scale->tableTitle->GetWidth($this->img)),
-                $this->scale->actinfo->GetWidth($this->img));
-
-                // Add the width of the vertivcal divider line
-                $titlewidth += $this->scale->divider->iWeight*2;
-
-				// Adjust the width by the user specified zoom factor
-				$fw *= $this->iZoomFactor;
-
-                // Now get the total width taking
-                // titlewidth, left and rigt margin, dayfont size
-                // into account
-                $width = $titlewidth + $nd*$fw + $lm+$rm;
-            }
-            else {
-                $width = $this->img->width;
-            }
-
-            $width = round($width);
-            $height = round($height);
-            // Make a sanity check on image size
-            if( $width > MAX_GANTTIMG_SIZE_W || $height > MAX_GANTTIMG_SIZE_H ) {
-                JpgraphError::RaiseL(6007,$width,$height);
-                //("Sanity check for automatic Gantt chart size failed. Either the width (=$width) or height (=$height) is larger than MAX_GANTTIMG_SIZE. This could potentially be caused by a wrong date in one of the activities.");
-            }
-            $this->img->CreateImgCanvas($width,$height);
-            $this->img->SetMargin($lm,$rm,$tm,$bm);
-        }
-    }
-
-    // Return an array width the maximum width for each activity
-    // column. This is used when we autosize the columns where we need
-    // to find out the maximum width of each column. In order to do that we
-    // must walk through all the objects, sigh...
-    function GetMaxActInfoColWidth() {
-        $n = count($this->iObj);
-        if( $n == 0 ) return;
-        $w = array();
-        $m = $this->scale->actinfo->iLeftColMargin + $this->scale->actinfo->iRightColMargin;
-
-        for( $i=0; $i < $n; ++$i ) {
-            $tmp = $this->iObj[$i]->title->GetColWidth($this->img,$m);
-            $nn = count($tmp);
-            for( $j=0; $j < $nn; ++$j ) {
-                if( empty($w[$j]) )
-                $w[$j] = $tmp[$j];
-                else
-                $w[$j] = max($w[$j],$tmp[$j]);
-            }
-        }
-        return $w;
-    }
-
-    // Stroke the gantt chart
-    function Stroke($aStrokeFileName="") {
-
-        // If the filename is the predefined value = '_csim_special_'
-        // we assume that the call to stroke only needs to do enough
-        // to correctly generate the CSIM maps.
-        // We use this variable to skip things we don't strictly need
-        // to do to generate the image map to improve performance
-        // a best we can. Therefor you will see a lot of tests !$_csim in the
-        // code below.
-        $_csim = ($aStrokeFileName===_CSIM_SPECIALFILE);
-
-        // Should we autoscale dates?
-
-        if( !$this->scale->IsRangeSet() ) {
-            list($min,$max) = $this->GetBarMinMax();
-            $this->scale->SetRange($min,$max);
-        }
-
-        $this->scale->AdjustStartEndDay();
-
-        // Check if we should autoscale the image
-        $this->AutoSize();
-
-        // Should we start from the top or just spread the bars out even over the
-        // available height
-        $this->scale->SetVertLayout($this->iLayout);
-        if( $this->iLayout == GANTT_FROMTOP ) {
-            $maxheight=max($this->GetMaxLabelHeight(),$this->GetMaxBarAbsHeight());
-            $this->scale->SetVertSpacing($maxheight*(1+$this->iLabelVMarginFactor));
-        }
-        // If it hasn't been set find out the maximum line number
-        if( $this->scale->iVertLines == -1 )
-        	$this->scale->iVertLines = $this->GetBarMaxLineNumber()+1;
-
-        $maxwidth=max($this->scale->actinfo->GetWidth($this->img),
-        max($this->GetMaxLabelWidth(),
-        $this->scale->tableTitle->GetWidth($this->img)));
-
-        $this->scale->SetLabelWidth($maxwidth+$this->scale->divider->iWeight);//*(1+$this->iLabelHMarginFactor));
-
-        if( !$_csim ) {
-            $this->StrokePlotArea();
-            if( $this->iIconDepth == DEPTH_BACK ) {
-                $this->StrokeIcons();
-            }
-        }
-
-        $this->scale->Stroke();
-
-        if( !$_csim ) {
-            // Due to a minor off by 1 bug we need to temporarily adjust the margin
-            $this->img->right_margin--;
-            $this->StrokePlotBox();
-            $this->img->right_margin++;
-        }
-
-        // Stroke Grid line
-        $this->hgrid->Stroke($this->img,$this->scale);
-
-        $n = count($this->iObj);
-        for($i=0; $i < $n; ++$i) {
-            //$this->iObj[$i]->SetLabelLeftMargin(round($maxwidth*$this->iLabelHMarginFactor/2));
-            $this->iObj[$i]->Stroke($this->img,$this->scale);
-        }
-
-        $this->StrokeTitles();
-
-        if( !$_csim ) {
-            $this->StrokeConstrains();
-            $this->footer->Stroke($this->img);
-
-
-            if( $this->iIconDepth == DEPTH_FRONT) {
-                $this->StrokeIcons();
-            }
-
-            // Stroke all added user texts
-            $this->StrokeTexts();
-
-            // Should we do any final image transformation
-            if( $this->iImgTrans ) {
-                if( !class_exists('ImgTrans',false) ) {
-                    require_once('jpgraph_imgtrans.php');
-                }
-
-                $tform = new ImgTrans($this->img->img);
-                $this->img->img = $tform->Skew3D($this->iImgTransHorizon,$this->iImgTransSkewDist,
-                $this->iImgTransDirection,$this->iImgTransHighQ,
-                $this->iImgTransMinSize,$this->iImgTransFillColor,
-                $this->iImgTransBorder);
-            }
-
-
-            // If the filename is given as the special "__handle"
-            // then the image handler is returned and the image is NOT
-            // streamed back
-            if( $aStrokeFileName == _IMG_HANDLER ) {
-                return $this->img->img;
-            }
-            else {
-                // Finally stream the generated picture
-                $this->cache->PutAndStream($this->img,$this->cache_name,$this->inline,
-                $aStrokeFileName);
-            }
-        }
-    }
-
-    function StrokeConstrains() {
-        $n = count($this->iObj);
-
-        // Stroke all constrains
-        for($i=0; $i < $n; ++$i) {
-
-            // Some gantt objects may not have constraints associated with them
-            // for example we can add IconPlots which doesn't have this property.
-            if( empty($this->iObj[$i]->constraints) ) continue;
-
-            $numConstrains = count($this->iObj[$i]->constraints);
-
-            for( $k = 0; $k < $numConstrains; $k++ ) {
-                $vpos = $this->iObj[$i]->constraints[$k]->iConstrainRow;
-                if( $vpos >= 0 ) {
-                    $c1 = $this->iObj[$i]->iConstrainPos;
-
-                    // Find out which object is on the target row
-                    $targetobj = -1;
-                    for( $j=0; $j < $n && $targetobj == -1; ++$j ) {
-                        if( $this->iObj[$j]->iVPos == $vpos ) {
-                            $targetobj = $j;
-                        }
-                    }
-                    if( $targetobj == -1 ) {
-                        JpGraphError::RaiseL(6008,$this->iObj[$i]->iVPos,$vpos);
-                        //('You have specifed a constrain from row='.$this->iObj[$i]->iVPos.' to row='.$vpos.' which does not have any activity.');
-                    }
-                    $c2 = $this->iObj[$targetobj]->iConstrainPos;
-                    if( count($c1) == 4 && count($c2 ) == 4) {
-                        switch( $this->iObj[$i]->constraints[$k]->iConstrainType ) {
-                            case CONSTRAIN_ENDSTART:
-                                if( $c1[1] < $c2[1] ) {
-                                    $link = new GanttLink($c1[2],$c1[3],$c2[0],$c2[1]);
-                                }
-                                else {
-                                    $link = new GanttLink($c1[2],$c1[1],$c2[0],$c2[3]);
-                                }
-                                $link->SetPath(3);
-                                break;
-                            case CONSTRAIN_STARTEND:
-                                if( $c1[1] < $c2[1] ) {
-                                    $link = new GanttLink($c1[0],$c1[3],$c2[2],$c2[1]);
-                                }
-                                else {
-                                    $link = new GanttLink($c1[0],$c1[1],$c2[2],$c2[3]);
-                                }
-                                $link->SetPath(0);
-                                break;
-                            case CONSTRAIN_ENDEND:
-                                if( $c1[1] < $c2[1] ) {
-                                    $link = new GanttLink($c1[2],$c1[3],$c2[2],$c2[1]);
-                                }
-                                else {
-                                    $link = new GanttLink($c1[2],$c1[1],$c2[2],$c2[3]);
-                                }
-                                $link->SetPath(1);
-                                break;
-                            case CONSTRAIN_STARTSTART:
-                                if( $c1[1] < $c2[1] ) {
-                                    $link = new GanttLink($c1[0],$c1[3],$c2[0],$c2[1]);
-                                }
-                                else {
-                                    $link = new GanttLink($c1[0],$c1[1],$c2[0],$c2[3]);
-                                }
-                                $link->SetPath(3);
-                                break;
-                            default:
-                                JpGraphError::RaiseL(6009,$this->iObj[$i]->iVPos,$vpos);
-                                //('Unknown constrain type specified from row='.$this->iObj[$i]->iVPos.' to row='.$vpos);
-                                break;
-                        }
-
-                        $link->SetColor($this->iObj[$i]->constraints[$k]->iConstrainColor);
-                        $link->SetArrow($this->iObj[$i]->constraints[$k]->iConstrainArrowSize,
-                        $this->iObj[$i]->constraints[$k]->iConstrainArrowType);
-
-                        $link->Stroke($this->img);
-                    }
-                }
-            }
-        }
-    }
-
-    function GetCSIMAreas() {
-        if( !$this->iHasStroked )
-        $this->Stroke(_CSIM_SPECIALFILE);
-
-        $csim = $this->title->GetCSIMAreas();
-        $csim .= $this->subtitle->GetCSIMAreas();
-        $csim .= $this->subsubtitle->GetCSIMAreas();
-
-        $n = count($this->iObj);
-        for( $i=$n-1; $i >= 0; --$i )
-        $csim .= $this->iObj[$i]->GetCSIMArea();
-        return $csim;
-    }
-}
-
-//===================================================
-// CLASS PredefIcons
-// Description: Predefined icons for use with Gantt charts
-//===================================================
-define('GICON_WARNINGRED',0);
-define('GICON_TEXT',1);
-define('GICON_ENDCONS',2);
-define('GICON_MAIL',3);
-define('GICON_STARTCONS',4);
-define('GICON_CALC',5);
-define('GICON_MAGNIFIER',6);
-define('GICON_LOCK',7);
-define('GICON_STOP',8);
-define('GICON_WARNINGYELLOW',9);
-define('GICON_FOLDEROPEN',10);
-define('GICON_FOLDER',11);
-define('GICON_TEXTIMPORTANT',12);
-
-class PredefIcons {
-    private $iBuiltinIcon = null, $iLen = -1 ;
-
-    function GetLen() {
-        return $this->iLen ;
-    }
-
-    function GetImg($aIdx) {
-        if( $aIdx < 0 || $aIdx >= $this->iLen ) {
-            JpGraphError::RaiseL(6010,$aIdx);
-            //('Illegal icon index for Gantt builtin icon ['.$aIdx.']');
-        }
-        return Image::CreateFromString(base64_decode($this->iBuiltinIcon[$aIdx][1]));
-    }
-
-    function __construct() {
-        //==========================================================
-        // warning.png
-        //==========================================================
-        $this->iBuiltinIcon[0][0]= 1043 ;
-        $this->iBuiltinIcon[0][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsSAAALEgHS3X78AAAA'.
-     'B3RJTUUH0wgKFSgilWPhUQAAA6BJREFUeNrtl91rHFUYh5/3zMx+Z5JNUoOamCZNaqTZ6IWIkqRiQWmi1IDetHfeiCiltgXBP8AL'.
-     '0SIUxf/AvfRSBS9EKILFFqyIH9CEmFZtPqrBJLs7c+b1YneT3WTTbNsUFPLCcAbmzPt73o9zzgzs2Z793231UOdv3w9k9Z2uzOdA'.
-     '5+2+79yNeL7Hl7hw7oeixRMZ6PJM26W18DNAm/Vh7lR8fqh97NmMF11es1iFpMATqdirwMNA/J4DpIzkr5YsAF1PO6gIMYHRdPwl'.
-     'oO2elmB+qH3sm7XozbkgYvy8SzYnZPtcblyM6I+5z3jQ+0vJfgpEu56BfI9vUkbyi2HZd1QJoeWRiAjBd4SDCW8SSAOy6wBHMzF7'.
-     'YdV2A+ROuvRPLfHoiSU0EMY/cDAIhxJeGngKaN1VgHyPL7NBxI1K9P4QxBzw3K1zJ/zkG8B9uwaQ7/HNsRZv9kohBGD0o7JqMYS/'.
-     '/ynPidQw/LrBiPBcS/yFCT95DvB2BWAy4575PaQbQKW+tPd3GCItu2odKI++YxiKu0d26oWmAD7paZU/rLz37VqIijD2YbnzNBBE'.
-     'IBHf8K8qjL7vYhCGErEU8CTg3xXAeMp96GrJEqkyXkm9Bhui1xfsunjdGhcYLq+IzjsGmBt5YH/cmJkFq6gIqlon3u4LxdKGuCIo'.
-     'Qu41g0E41po+2R33Xt5uz9kRIB2UTle7PnfKrROP1HD4sRjZlq0lzhwoZ6rDNeTi3nEg1si/7FT7kYQbXS6E5E65tA5uRF9tutq0'.
-     'K/VwAF+/FbIYWt6+tjQM/AqUms7A4Wy6d7YSfSNxgMmzi0ycWWworio4QJvj4LpuL5BqugTnXzzqJsJwurrlNhJXFaavW67NRw3F'.
-     'q+aJcCQVe9fzvJGmAY7/dPH0gi0f64OveGxa+usCuQMeZ0+kt8BVrX+qPO9Bzx0MgqBvs+a2PfDdYIf+WAjXU1ub4tqNaPPzRs8A'.
-     'blrli+WVn79cXn0cWKl+tGx7HLc7pu3CSmnfitL+l1UihAhwjFkPQev4K/fSABjBM8JCaFuurJU+rgW41SroA8aNMVNAFtgHJCsn'.
-     'XGy/58QVxAC9MccJtZ5kIzNlW440WrJ2ea4YPA9cAooA7i0A/gS+iqLoOpB1HOegqrYB3UBmJrAtQAJwpwPr1Ry92wVlgZsiYlW1'.
-     'uX1gU36dymgqYxJIJJNJT1W9QqHgNwFQBGYqo94OwHZQUuPD7ACglSvc+5n5T9m/wfJJX4U9qzEAAAAASUVORK5CYII=' ;
-
-        //==========================================================
-        // edit.png
-        //==========================================================
-        $this->iBuiltinIcon[1][0]= 959 ;
-        $this->iBuiltinIcon[1][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABGdBTUEAALGPC/xhBQAAAAZiS0dEAFgAWABY9j+ZuwAAAAlwSFlz'.
-     'AAALEAAACxABrSO9dQAAAAd0SU1FB9AKDAwbIEXOA6AAAAM8SURBVHicpdRPaBxlHMbx76ZvsmOTmm1dsEqQSIIsEmGVBAQjivEQ'.
-     'PAUJngpWsAWlBw8egpQepKwplN4ULEG9CjkEyUFKlSJrWTG0IU51pCsdYW2ncUPjdtp9Z+f3vuNhu8nKbmhaf5cZeGc+PO8zf1Lc'.
-     'm0KhkACICCKCMeaBjiLC0tLSnjNvPmuOHRpH0TZTU1M8zBi9wakzn7OFTs5sw8YYACYmJrre7HkeuVyu69qPF77hlT1XmZ0eQ03O'.
-     'wOLJTvhBx1rLz18VmJ0eY+jVd2FxDkKXnvYLHgb97OgLzE4ON9Hzc1B1QaQzsed5O0Lta3Ec89OnR5h5McfQ+Mw2qgQUnfBOPbZ3'.
-     'bK3l+xOvMT0+3ERLp5FNF6UEjcL32+DdVmGt5WLhDYYPZrbRqreFumXwql0S3w9tnDvLWD5PZigPpdOwuYpSCo3C8wU3UHxQdHbf'.
-     'cZIkNM6dxcnlUM4k1eUFMlUPpUADbpkttFarHe6oYqeOr6yt4RzMQHYUcUsQVtGicHDwKprViuLDkkOtVnsHCHZVRVy/zcj1i5Af'.
-     'h8AjdIts+hUcGcYPK3iBtKM3gD/uAzf/AdY2mmmVgy6X8YNNKmGIvyloPcB8SUin07RQ4EZHFdsdG0wkJEnEaHAJxvKEpSLeaokV'.
-     'r4zWmhUZYLlY4b1D03y5eIEWCtS7vsciAgiIxkQRabWOrlQor66y4pUphoJb1jiO4uO5o0S3q6RSqVbiOmC7VCEgAhLSaDQ48dH7'.
-     'vD46REY0iysegSjKQciRt99ib7qXwX0O+pG4teM6YKHLB9JMq4mTmF9/+AKA4wvLZByH7OgYL7+UY2qvw/7Bfg5kHiXjJFyv3CGO'.
-     'Y1rof+BW4t/XLiPG0DCGr79d4XzRxRnIMn98huXSTYyJ6et1UNYQhRvcinpJq86H3wGPPPM0iBDd+QffD1g4eZjLvuG7S1Wef26E'.
-     'J7L7eSx7gAHVg7V3MSbi6m/r93baBd6qQjerAJg/9Ql/XrvG0ON1+vv7GH3qSfY5fahUnSTpwZgIEQesaVXRPbHRG/xyJSAxMYlp'.
-     'EOm71HUINiY7mGb95l/8jZCyQmJjMDGJjUmsdCROtZ0n/P/Z8v4Fs2MTUUf7vYoAAAAASUVORK5CYII=' ;
-
-        //==========================================================
-        // endconstrain.png
-        //==========================================================
-        $this->iBuiltinIcon[2][0]= 666 ;
-        $this->iBuiltinIcon[2][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABGdBTUEAALGPC/xhBQAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlz'.
-     'AAALDwAACw8BkvkDpQAAAAd0SU1FB9ALEREILkh0+eQAAAIXSURBVHictZU9aFNRFMd/N81HX77aptJUWmp1LHRpIcWhg5sIDlUQ'.
-     'LAXB4t7RRUpwEhy7iQ46CCIoSHcl0CFaoVARU2MFMYktadLXJNok7x2HtCExvuYFmnO4w/3gx+Gc/z1HKRTdMEdXqHbB/sgc/sic'.
-     'nDoYAI8XwDa8o1RMLT+2hAsigtTvbIGVqhX46szUifBGswUeCPgAGB7QeLk0X4Ork+HOxo1VgSqGASjMqkn8W4r4vVtEgI/RRQEL'.
-     'vaoGD85cl5V3nySR/S1mxWxab7f35PnntNyMJeRr9kCMqiHTy09EoeToLwggx6ymiMOD/VwcD7Oa/MHkcIiQx026WGYto5P/U+ZZ'.
-     '7gD0QwDuT5z9N3LrVPi0Xs543eQPKkRzaS54eviJIp4tMFQFMllAWN2qcRZHBnixNM8NYD162xq8u7ePSQ+GX2Pjwxc2dB2cLtB8'.
-     '7GgamCb0anBYBeChMtl8855CarclxU1gvViiUK4w2OMkNDnGeJ8bt9fH90yOnOkCwLFTwhzykhvtYzOWoBBbY//R3dbaNTYhf2RO'.
-     'QpeuUMzv188MlwuHy0H13HnE48UzMcL0WAtUHX8OxZHoG1URiFw7rnLLCswuSPD1ulze/iWjT2PSf+dBXRFtVVGIvzqph0pQL7VE'.
-     'avXYaXXxPwsnt0imdttCocMmZBdK7YU9D8wuNOW0nXc6QWzPsSa5naZ1beb9BbGB6dxGtMnXAAAAAElFTkSuQmCC' ;
-
-        //==========================================================
-        // mail.png
-        //==========================================================
-        $this->iBuiltinIcon[3][0]= 1122 ;
-        $this->iBuiltinIcon[3][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABGdBTUEAALGPC/xhBQAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlz'.
-     'AAALEAAACxABrSO9dQAAAAd0SU1FB9AJHAMfFvL9OU8AAAPfSURBVHictZRdaBRXFMd/987H7tbNx8aYtGCrEexDsOBDaKHFxirb'.
-     'h0qhsiY0ykppKq1osI99C4H2WSiFFMHWUhXBrjRi0uCmtSEUGgP1QWqhWjGkoW7M1kTX3WRn5p4+TJJNGolQ6IXDnDtz+N0z/3PP'.
-     'UWBIpdpYa23b9g09PZ2kUrOrvmUyGVKp1Ao/mUyi56YnVgWfO/P1CihAd/dJMpmaNROIRq8BkM1m0bH6TasC3j6QXgFdXI+DR6PR'.
-     'JX/Pno8B+KLnMKqlpUU8z8MYs2RBEDzWf9J+0RcRbMdxGBsbw/fmCXwPMUEYID4iAVp8wIRmDIHMo4yHSIBSASKC+CWE0C/PF9jU'.
-     '3B6Cp+4M07C5FUtKGNvGwQJctPgIsgD2wRhEIqAMGB+UQYkHJgYYZD7P1HwVlmWhHcfhyk83KeRGUW4t6CgoG5SNUS4KBWgQDUov'.
-     '7AGlwYASBVqH0Bk49dXpCviVV3dw/tI1Bvr7kMIIlh0NYUpjlF0BAYvcxSXmEVLKceHSCJm+PnbueBHbtkNwTXUNBzo6aGpq4sSZ'.
-     'GwT5H7BsF6Wdf1GWHQAoM0upeI9PT1yioS7B7tdaSdSuw7KsUGMAy7HYsmUztTW1nMwM0txssX1rlHjjS5jy/Uq2YkK/eJuLl6/z'.
-     'x+1xkslW6mrixGIODx8EFSlEBC0+tmXT0NhA2763iEUjnLv4C8XpUbSbAB1mKkGJ3J83Od77HW5EszvZSqK2iljMIeJaRGNuJePF'.
-     '6mspY7BJ1DXwQnCd2fxGRq5OUCz8xt72dyhMZcn++Cu3xu9SKhdp2b4ZHWnAtTSxmIWlhcIjlksR3lNBYzlxZsb7+f7ne+xtSzOd'.
-     'u83szH1OnThOPp/n+a0beeP1l4mvq+PU2Qyd+5PY1RuwlAqLYFaBfbTbyPSdfgaH77A//QF4f1O/vpr6RJyq+C5Kc/M8FbFxXItY'.
-     'xOHDrvfo/fxLDnbsJBp5BowBReVWYAzabeTh5ABDw7cWoNNL3YYYNtSv57lnn6Z+Qx01VeuIuBa2DV1HD3H63BAPZu4u1WGpeLHq'.
-     'Rh7+NcjA0O+0p4+CNwXigwnbWlQQdpuEpli+n+PIkcOc//YKuckJJFh2K2anrjFw+QZt6S6kPImIF/b+cqAJD1LihWAxC61twBTo'.
-     'fPcQF/oGsVW5ovHQlavs2/8+uYnRVSOUgHAmmAClBIOBwKC0gPjhIRgEIX2wg7NnwpZW3d3d4vs+vu8TBMGK51rvPM9b8hdteZxd'.
-     'LBbVR8feJDs0Rlv6GFKeXJ21rNRXESxMPR+CBUl0nN7PjtO+dye7Up/8v1I88bf/ixT/AO1/hZsqW+C6AAAAAElFTkSuQmCC' ;
-
-        //==========================================================
-        // startconstrain.png
-        //==========================================================
-        $this->iBuiltinIcon[4][0]= 725 ;
-        $this->iBuiltinIcon[4][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABGdBTUEAALGPC/xhBQAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlz'.
-     'AAALDgAACw4BQL7hQQAAAAd0SU1FB9ALEREICJp5fBkAAAJSSURBVHic3dS9a1NRGMfx77kxtS+xqS9FG6p1ER3qVJpBQUUc3CRU'.
-     'BwURVLB1EAuKIP0THJQiiNRJBK3iJl18AyeltRZa0bbaJMbUNmlNSm5e7s25j0NqpSSmyag/OMM9POdzDuflwn8djz8gClVRrVEV'.
-     'ur4Bl1FTNSzLrSS6vbml0jUUwSXj8Qfk3PkLtLW2AeBIybmrgz3+gFzpucjlE4f4btuFTuWuCF5XDr3a3UPf6cM8GQvxzbsRAJdh'.
-     'ScfxSywml5j7mVypN0eGEJ0tebIre+zxB6Tv7jPReS2hREpOvpmUXU+H5eC913JnNCSRVE60pUVbWoZjprR39Yq70bdqj4pW7PEH'.
-     '5FpvL9e79jOTTHM7ssDL6CJZ08LbvAGnrpZg2mI2Z/MlZfN8IkxuSwu4V9+WIrj7zFlOHfXzKrLIi2SGh5ECKjnNVNxkQEc55vOw'.
-     'rb6O8JLFdHyJ+ayFElUeHvjwkfteL/V7fKTSkFvIQE4DoLI2Mz/muTkTApcBKIwaN8pwIUrKw+ajWwDknAO0d/r4zFaMuRS63sWm'.
-     'RoOdm+vRIriUYjKexrQV+t1o0YEVwfZSVJmD/dIABJuO0LG3lRFx0GOfiAELE9OgCrfU0XnIp5FwGLEy5WEAOxlR5uN+ARhP7GN3'.
-     '5w7Gv4bQI2+xpt4jjv2nWBmIlcExE2vDAHYioszBZXw6CPE4ADoWVHmd/tuwlZR9eXYyoszBfpiNQqaAOU5+TXRN+DeeenADPT9b'.
-     'EVgKVsutKPl0TGWGhwofoquaoKK4apsq/tH/e/kFwBMXLgAEKK4AAAAASUVORK5CYII=' ;
-
-        //==========================================================
-        // calc.png
-        //==========================================================
-        $this->iBuiltinIcon[5][0]= 589 ;
-        $this->iBuiltinIcon[5][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABGdBTUEAALGPC/xhBQAAAAZiS0dEAA4AIwBbgMF12wAAAAlwSFlz'.
-     'AAALEQAACxEBf2RfkQAAAAd0SU1FB9AHBxQeFsqn0wQAAAHKSURBVHicnZWff+RAGIef3U/gcOEgUAgUCgcLhYXCwsHBQeGgUDgs'.
-     'FgMHB4VA/4Bg4XChWFgIFIqBwkJhsRAYeOGF+TQHmWSTTbKd9pU37/x45jvfTDITXEynAbdWKVQB0NazcVm0alcL4rJaRVzm+w/e'.
-     '3iwAkzbYRcnnYgI04GCvsxxSPabYaEdt2Ra6D0atcvvvDmyrMWBX1zPq2ircP/Tk98DiJtjV/fim6ziOCL6dDHZNhxQ3arIMsox4'.
-     'vejleL2Ay9+jaw6A+4OSICG2cacGKhsGxg+CxeqAQS0Y7BYJvowq7iGMOhXHEfzpvpQkA9bLKgOgWKt+4Lo1mM9hs9m17QNsJ70P'.
-     'Fjc/O52joogoX8MZKiBiAFxd9Z1vcj9wfSpUlDRNMcYQxzFpmnJ0FPH8nDe1MQaWSz9woQpWSZKEojDkeaWoKAyr1tlu+s48wfVx'.
-     'u7n5i7jthmGIiEGcT+36PP+gFeJrxWLhb0UA/lb4ggGs1T0rZs0zwM/ZjNfilcIY5tutPxgOW3F6dUX464LrKILLiw+A7WErrl+2'.
-     'rABG1EL/BilZP8DjU2uR4U+2E49P1Z8QJmNXUzl24A9GBT0IruCfi86d9x+D12RGzt+pNAAAAABJRU5ErkJggg==' ;
-
-        //==========================================================
-        // mag.png
-        //==========================================================
-        $this->iBuiltinIcon[6][0]= 1415 ;
-        $this->iBuiltinIcon[6][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABGdBTUEAALGPC/xhBQAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlz'.
-     'AAALDAAACwwBP0AiyAAAAAd0SU1FB9ALDxEWDY6Ul+UAAAUESURBVHicdZVrbFRFGIafsyyF0nalV1R6WiggaAptlzsr1OgEogmC'.
-     '0IgoBAsBgkIrBAPEhBj/AP6xRTCUFEwRI4jcgsitXMrFCJptJWvBNpXYbbXtbtttt6e7e86ec/yxadlCfZPJZDIz73zzzjfvR2VL'.
-     'F7U+hf0HD2JduIzTFy6SlJRkPtkcDgdCCE65OxFC8NPV6wghyM7OptankJ2dzbSC5QghEEIgCSHog9PpNAF27dlN6miZuPgElB4/'.
-     'nmY3O7ZtByA1NVUCkGWZweD1eklJScESTbqxuIjrd+/x6uIl5M19hSy7nfGOeUxf+g7VjU1sKi7C4/GYsiyz7tAJAD4/cRaA1tZW'.
-     'AHIPnECUVGD1+/3U19ebG4uLeHf1akamjsIwoVnVCOvQEdLoVILYYmMo3PIxSBJflpSaDX5FAmju1QAYv/8k/s8+wLVxOU0jR2LZ'.
-     '8sMFAApWrCApbRRDrRZirBYSLBKaoRPQw3SFernf2sav7T0Ubt4KwL4FMwF4Vu8FoHBCKgCzDhwHwLIhZ7y5a89u4m2JhA0wTdDC'.
-     'OrphEjJMNElCHxKDEjaobmvlfo/Krj27CQQCJsCGJW8C0KXqAMxMiosQA8hZWcTFx9OsaniDKh1qmG7VoFsL0x0K06kbeAMhWpRe'.
-     '/KpG+gwHAKUnz7Dz3BUMw6DK18nuw99wt0Nh6VdHI8RJicmETQgFg7SFwjSrGv+oKp6ghldV6dZ0ugJBlF6FmCESQ2w2AIqXLsan'.
-     'BrFYLJTnTCBrdBqveeopWZiPFaBHUegJhegMqGgxEkHDwB/UaQ9rdIV06v0+TD2EEQjQFtAY0dsNgNvt5sialQAIIXh7wQKuVf6J'.
-     'gTsSccPDWlQstClBGjr9eHpVWvUQncEwdYEedF8noQ4vmYmpZMTH0nTvDn25vLbrNmu7bvfnsYEbAMnhcPDgwQPzUo2LJusw/mhp'.
-     'QwlHNO0KBAnoIfxtrcQMT2De1Mm891wyUzNlUlJSpIyMDBobGzlzr5rFM/Koq6vrP8ASGxsLwPmKcvIShjPGZiPOakE3VFB8hHwd'.
-     'vJAxhrk5L7Ly+RQuH/sWgPdXrwFg/6HDFBUsIj09nehfbAWwPWOT9n5RYhqGwarNWxkRM5TRCfF4U1PQsDDJFk9uYhwXvzvKjm3b'.
-     'KSsro3DJInNW5RXp7u2bAKSlpeH1esnPz6eqqgqLpmmcr3Fht9ulfaV7mZk1Bs+lM6T1djM9fhg5egDPpTNMy5TZsW07kydPYdWM'.
-     'aXx96ixOp9O8cfUa80srmDpjOgAulytiQqZpMnvObLbt/JTtHxXj9/tRVdU0DGOAufRpevPDTeac0hJyc3NxOOawfv161lVWS6eX'.
-     'z+9/UOCxu1VWVvaTRGv16NFfjB2bNeAQp9NpTpmSM4DcbrdL0WsGDKLRR+52uwe1yP8jb2lpYfikyY9t80n03UCWZeaXVjw1f+zs'.
-     'Oen+/d+pqanhzp2fKSsrw+l0mi6XiyPl5ZGITdN8fAVJwjRNJEmi1qfw1kw7siyTnJxMe3s71dXV3GpoZO64DG41NPJylvxU5D/e'.
-     'qJKsfWQD9IkaZ2RmUvr9aV4aGYcQgjfO3aWoYBF5eXm4ewIsu/CbdPz1aWb0/p1bNoOrQxlUiuiaFo3c3FyEEOx9+C9CCD6paaTW'.
-     'p/TXyYkTJ0Xe59jf7QOyAKDWp/QXxcFQ61P4pT3ShBBcvnUHIQTjxmX19/8BCeVg+/GPpskAAAAASUVORK5CYII=' ;
-
-        //==========================================================
-        // lock.png
-        //==========================================================
-        $this->iBuiltinIcon[7][0]= 963 ;
-        $this->iBuiltinIcon[7][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABGdBTUEAALGPC/xhBQAAAAZiS0dEAAAAAAAA+UO7fwAAAAlwSFlz'.
-     'AAALCwAACwsBbQSEtwAAAAd0SU1FB9AKAw0XDmwMOwIAAANASURBVHic7ZXfS1t3GMY/3+PprI7aisvo2YU6h6ATA8JW4rrlsF4U'.
-     'qiAsF9mhl0N2cYTRy9G/wptAYWPD9iJtRy5asDe7cYFmyjaXOLaMImOrmkRrjL9yTmIS3120JybWQgfb3R74wuc8Lzw858vLOUpE'.
-     'OK6pqSm2trbY39+nu7tbPHYch7m5OcLhMIA67kWj0aMQEWk6tm17rNm2LSIie3t7ksvlJJ1OSyqVkls3Z8SyLMnlcqTTaVKpFLdu'.
-     'zmBZVj1HeY2VUti2TSQSQSml2bZdi0QirK2tMT09zerqKtlslqGhISYnJ4nHv2N+foFsNquOe9FotLlxOBwmk8lgWRbhcFgymYxY'.
-     'liUi0mqaJoAuIi2macrdO7fFsizx3to0Te7euV1vrXtXEgqFmJmZYWVlhXK5LB4/U9kwDL784kYV0A3DYHd3m4sXRymXywKoRi8U'.
-     'Ch01DgQCJBIJLMsiEAhIIpHw2uLz+eqtYrEYIqKZpimxWEyCwaCMjY01zYPBIJpXqVQqsby8TLVabWKA/v5+RkZGMAyDrq4ulFKH'.
-     'HsfjcWZnZ+ns7KTRqwcnk0mKxSKFQqGJlVKtruuSTCYB6O3trW9UI/v9/iZPB/j8s2HOnX0FgHfeXpeffnzK+fWf+fijvhLs0PtG'.
-     'D/n1OJ9+MsrlSwb3733DwMCAt1EyPj6uACYmJp56168NU6nUqFSE9nZdPE7+WqC/r4NKTagcCJVqDaUUB5VDAA4Pa9x7sMLlSwan'.
-     'WjRmv13D7/erpaWlo604qOp88OF7LC48rPNosMq5Th+Dgxd4/XyA1rbzADi7j8jnf2P++wdcvSr8MJ/i8eomAKlUqn41OsDAQDeD'.
-     'g++yuPCwzm/2vU8+n2a7sMFfj79mp7BBuVzioFSiXHJx3SKuW2Rzy0Up9dxnQVvODALQerqNRn4ZKe0Mvtc6TpzpmqbxalcY9Ato'.
-     '2v06t515C73YQftZB9GLnDrt4LoujuPgOA4Ui+C6yOpXJwZrJ7r/gv4P/u+D9W7fLxTz+1ScQxrZ3atRLaVxdjbY2d184R6/sLHe'.
-     'opHP7/Do90Ua+WWUyezzZHObP/7cfX54/dowE1d66s8TV3oE+Mfn+L/zb4XmHPjRG9YjAAAAAElFTkSuQmCC' ;
-
-        //==========================================================
-        // stop.png
-        //==========================================================
-        $this->iBuiltinIcon[8][0]= 889 ;
-        $this->iBuiltinIcon[8][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABGdBTUEAALGPC/xhBQAAAAZiS0dEAAAAAAAA+UO7fwAAAAlwSFlz'.
-     'AAALDwAACw8BkvkDpQAAAAd0SU1FB9AJDwEvNyD6M/0AAAL2SURBVHic1ZTLaxVnGIefb2bO5OScHJN4oWrFNqcUJYoUEgU3/Qf6'.
-     'F7gwCkIrvdBLUtqqiLhSg9bgBduFSHZdiG5ctkJ3xRDbUFwUmghNzBDanPGMkzOX79LFJGPMOSd204U/+Bbzvd/78F4H/ieJdoad'.
-     'pZKxRFszAI/DcP0HazXY22v+HB01kee1PA/v3zfnjx4xgGnHcNZe7OvuNj+cOEF1ZATv5nUA4jhBSgmADCVWo8Ge2Of9wb18P/G7'.
-     'oUXmYi30zqlTVEdGWLh1g2D6MYlKkXGE0Vl8aa2GEB149+4xXSzyoOIw/mimiZV/DPb25pFOj13A9gOMEChhUEqhVYqWKUk9QAUp'.
-     'sT/P4s8PmKlUmNhQaIJbkDVqBbpw6wZ2zUc4Nm+ePku5p4eOrgpueQOFUoVCVxcD4+N07dpF9+5tVJeWGPBjhvr7WF1zC8ASgtcP'.
-     'H8a7eZ1odh4sh50nzwCw9ZNh3M4Stutiu0X2nB/LyjZ6lcIbVTpdQU/jWVPzLADM8+ZGBRdtC7wrF/O7bR99iu26VL86iU4SAH4b'.
-     'Po5d6AQhstMSvGyI4wS5FJBKSRwnzF8byx/u+PjzzMF1mfryQ1K/jnCahqp1xEopjFLoNEFJSRJHzF799gWHqa+/QKcSUXBI609f'.
-     'Al5W4teQSiHDOipNUKnMI13RvnOXAIEKQixvGWya98SC560MFwPiqEG86JM8q79Q06lvhnOndy5/B6GPCUOMUu3BQgg8z0M3GmBZ'.
-     'iGJn3v2VmsqnfzNx7FDueODuj8ROCFpjtG5TCmOYv32bJ09msP0ISydMfnAUgF8/O45RAA6WTPjlvXcB+Gn7FuRf/zAnNX6x3ARe'.
-     'PSdmqL+P/YHkwMGDOGWDZTlQcNBRhPEComgB/YeHfq2InF1kLlXUOkpMbio1bd7aATRD/X0M1lPeSlM2vt2X1XBZjZnpLG2tmZO6'.
-     'LbQVOIcP+HG2UauH3xgwBqOz9Cc3l1tC24Fz+MvUDroeGNb5if9H/1dM/wLPCYMw9fryKgAAAABJRU5ErkJggg==' ;
-
-        //==========================================================
-        // error.png
-        //==========================================================
-        $this->iBuiltinIcon[9][0]= 541 ;
-        $this->iBuiltinIcon[9][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAMAAAC7IEhfAAAAaVBMVEX//////2Xy8mLl5V/Z2VvMzFi/v1WyslKlpU+ZmUyMjEh/'.
-     'f0VyckJlZT9YWDxMTDjAwMDy8sLl5bnY2K/MzKW/v5yyspKlpYiYmH+MjHY/PzV/f2xycmJlZVlZWU9MTEXY2Ms/PzwyMjLFTjea'.
-     'AAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxIAAAsSAdLdfvwAAAAHdElNRQfTCAkUMSj9wWSOAAABLUlEQVR4'.
-     '2s2U3ZKCMAxGjfzJanFAXFkUle/9H9JUKA1gKTN7Yy6YMjl+kNPK5rlZVSuxf1ZRnlZxFYAm93NnIKvR+MEHUgqBXx93wZGIUrSe'.
-     'h+ctEgbpiMo3iQ4kioHCGxir/ZYUbr7AgPXs9bX0BCYM8vN/cPe8oQYzom3tVsSBMVHEoOJ5dm5F1RsIe9CtqGgRacCAkUvRtevT'.
-     'e2pd6vOWF+gCuc/brcuhyARakBU9FgK5bUBWdHEH8tHpDsZnRTZQGzdLVvQ3CzyYZiTAmSIODEwzFCAdJopuvbpeZDisJ4pKEcjD'.
-     'ijWPJhU1MjCo9dkYfiUVjQNTDKY6CVbR6A0niUSZjRwFanR0l9i/TyvGnFdqwStq5axMfDbyBksld/FUumvxS/Bd9VyJvQDWiiMx'.
-     'iOsCHgAAAABJRU5ErkJggg==' ;
-
-        //==========================================================
-        // openfolder.png
-        //==========================================================
-        $this->iBuiltinIcon[10][0]= 2040 ;
-        $this->iBuiltinIcon[10][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAZiS0dEANAAtwClFht71AAAAAlwSFlz'.
-     'AAALEAAACxABrSO9dQAAAAd0SU1FB9AKDQ4RIXMeaLcAAAd1SURBVHicxZd7jBXVHcc/58zcvTNzH8vusqw8FsTsKiCUUh5WBZXG'.
-     'GkOptmqwNWsWLKXFGlEpzZI0AWNKSy0WhDS22gJKtWlTsSRqzYIuLGB2WVvDIwQMZQMsy2OFfdzde+/OnHP6x907vJaFpjb9JZM5'.
-     'c85Mfp/f9/s7Jxn4P4e41gtSyp78WGvtfdEAcqDFYUOH9HS0NhGk9tPb/ilSyp789UUB2AMuqhQy3Uzm7HGkE6W3dTNZMRI3EcWO'.
-     'jf9ClLmWBT3dzW8jUsevWHCG3UpWl+IkHSxnbDh/Mcz12NevBcuWXTmf6TjnXvJ88gDmVB3pw3+nt3UzHa1NqMzBS2zqPLGFjtMN'.
-     'ZNr3XdW+qyqwZcFk76HX/tHWfuQvyO4W7qhaHwL8efkMRlRUpPv7rqD0RrJ+FgAjLy1a20OIxZJEEuNCRfIApj+om4bGM3u2/sYU'.
-     '9J41d8973f3Dhg1pISTV1dXXBRNJxPGFCzhou+DCQrScZOkktNaeDZjamgeZ9MgiYmVDccvHhjAzJw0NTh8/alyZMaVJicp0iTHj'.
-     'JpgNv38tjWUhhGROdbUL9W5/MH5XCkjlcibi+KIop5LVHLKEu8A/f4r286doa9pGrGwYAAsfqbbH3b8MgO/Nqgy6WvdbbXHMkEFJ'.
-     '4xUOMVEvaTZu3BgmvF4Yk4hz9rO/Ulr5cE9owae/rcGxohSOuiWkC2IjcIqKyPZm+OmCH7GhoZEF077EEzVVweAbJ+riEeO0Ey8y'.
-     'UubqOHn0AOgMwvf59txnBrSp9dgxKmf/+kIP1NY8SFk0jh5ajmNHAWg5b2E5EexojGHjbiVRMoRMNs0LC+Yz46vTuH3enN7BI8fr'.
-     'qFdo0BoVZNC9aVSQ4fNjBzEmQJiARxb+/AqYPMAVB5FsPU5v37g9OxgLhe14ZM5/ju052E6MNZvf5pmHHuLmmWOkEysxUtpGAtme'.
-     'dtHTflJkezqQto3jFRnLssyf1jydxiiM7zNnye/c3ZsqLu2BN5fcMfzrv/hby1tPzmRUoihcTJ87CwQI2yLtDcIqsIjYUf51qBlf'.
-     'OnScOSrdQUOMURkiXsLUzJnvbGhoBGDHH5cGyZLhOpYoNl5hqYnYEXOu5fDl9eYAHntx98n8hFHZcPHUuTSxSASAeK/CGIOxJJ0f'.
-     'bOGNPU280dgkq6Y2yu8vfjCIlwwzr+/ZQ/PHO0gOLuO5qsftDQ2NbN+4OCgqG6WTxWVaq6zpF+DiSHWnicdylp3r6aZTWthIOrNp'.
-     'ktHcvBu0sHX1Sm6ozB3B42d90zZA9bQp7PvgPSzXZfnqX/HS4DKKK2+x69Y/HURs26iBAN5ccsfw7774UcumF37C6f07KSt2OHji'.
-     'DEUJD0tISjyPrrSPlAKvN0JP/U4O1NfjuhG2rvklN1SOpfXwftpbTqAyKRrff5fb7rs9V1R7m4wlz2ihA3HpmXflUWyOH2umpLiY'.
-     'ui3v8M+6bWzfsRNbSgqkxaCkiy0simMuEWEhpcRzIhQWOIAh6tiAwS4owInFiTou5dOnMnl2NR++ujBwXEc9terD6M43nrj6LgAB'.
-     'QnDPA9/irtkP8JRS7Hr/3T6YekDQ1pEiEXOwpUVJzCVlZZFS4mZtkpEo9ChAkDp/jtLMBACy6S4RiQghLyv5cgBRPnKUOX6smUGF'.
-     'hSil0MYw9d77mPy1e5mnFE3batm3czvb6nYgEJztSFGU9LCRlMRdUjIH0+lnEMIwPNXD3NumoVJnrMCJaiciMUZfvQnz4QcBSvV1'.
-     'vjE5GK358t0zmXDnDB79saLpo20c+aSRD+t25JTp7GZQwsEWFiVxl6hlUf/WO9z32CxmL1rOe6u/I2KuwGhzLQCB7/sYY9Bah3el'.
-     'FKbvrrVm4vS7GH/7ncx+chEHGz7myCeNbPtoO0JI2jq78WIRLGkzsqs7V5SfFV5EovXACoiqqsfNpk2vo5VCWtYFBfoU0VoTBAFa'.
-     'a7TRaK2p+MoURk+cxMzq+Rzbv49DDbuo27UTW9h0dedssPxuK+kIfN8XxhgDYPVXf2Fh4XKtFIl4AiklAlBKAYRKKK36wHIweTCt'.
-     'NfHiEkaOn8j0+7/BmDFjaT30GbHywSxcuZkpFfFg+m1jjZ/NmnVvNfRvwd69e8WBA/uNFAIh4JVXXmHsmDHE4vEQQgjQ2lxQIm9N'.
-     'nz35q3BEOZOHzaG2thaA4mRU+L29It+IV21CpbRQfeMFC35gRB/M2rVrubnyZmLxWJhECBEmz/eHyo/7lMlH3LFFujsthNFCCGOu'.
-     '+WNyeUgpjSVzMKtWraKyshLPdcPEeYWCIEBdpIxSivr6eta8vI7d6+cGnhdV06pe1QP+F/QXWmuRL+jZZ58LlVmxYgUVFRV4rhtu'.
-     '4TzMxXAA6XRaRAtsYUkx8I/JtSJQOlSwpmZpCLN8+fPcdNNoHMfB9/0QJgRoP295TlR7UVv8xxZcHMuWIZ9/Hn35vG3JEGZpzVJG'.
-     'jx5N1IlitKahsZE1L69j69qHgx+urFX/lQL9JYdLlfnZihUhzOLFi8N3Ml1dthOxVH/f/8/CtqSJ2JaJ2JZ59J7RPsC/AViJsQS/'.
-     'dBntAAAAAElFTkSuQmCC' ;
-
-        //==========================================================
-        // folder.png
-        //==========================================================
-        $this->iBuiltinIcon[11][0]= 1824 ;
-        $this->iBuiltinIcon[11][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAACIAAAAiCAYAAAA6RwvCAAAABGdBTUEAALGPC/xhBQAAAAZiS0dEAAAAAAAA+UO7fwAAAAlwSFlz'.
-     'AAALEAAACxABrSO9dQAAAAd0SU1FB9ECAQgFFyd9cRUAAAadSURBVHiczdhvbBP3Hcfx9/2xfefEOA5JoCNNnIT8AdtZmYBETJsI'.
-     '6+jQOlQihT1AYgytqzZpD1atfyYqlT1h0lRpT7aRJ4NQpRvZGELVuo5Ua9jEJDIETQsNQyPBsUJMWGPnj//e+e72wNg4xElMR6ed'.
-     'ZNln3933dZ/f93f6yfB/sgmrHdDV1WXlPg8NDZUDScD8LFFFEZZlWYZhWMFg0Orq6sq/gDJAfFy1iiZy9OjrVnj4JzQ1rMWqfxm/'.
-     '309jYyNtbW0kEgnu3bvH4cOH88c/jqSKQl4/XGkd+eVtAN46up1LH92ktqYS++ZX8Pv9NDQ0sGnTJlKpFOFwmO7u7vy5IyMjeVRd'.
-     'XV1+WEOh0IrY4pDnq6wXX/sTiCJaMkFZdRNqxefoe7VtCSqXVDqdZnZ2ltraWkzTpKqqijt3JpFlG7dvj7NzZ1f++qFQyA3EClHL'.
-     'Ql743nFkhxPDtJAd5eTaYSVUfX09lZWVlJWVIUnSg7sVQMBCUcu4ceMGe/bsIRQK1QAzOcyykIM9P0KyudAyCWyqG8nhwqa4SkLt'.
-     '3r0bVVVxu924XC40TUOWZUQxe97CwgIdHR2LMHIxSCaVInVvFElxE0vMY1Pd2NUKJMWNTXHlUfF//4vETJCelwbpFm3MjP2dt37x'.
-     'AlN+PzU1NViWRSwW4+7du3g8HjweD4qi5EFAJzAExIpCANbooxhplfB0FJvTg6xWIqsVRVF6MopkU3FXPcnkJxGU0VEAdF2noqKC'.
-     'W3/8DpnqLjzep2lubsblcjE8PExHR8fboVDID9xYFpLBDpJF0jDQIncQpWlkm31FlFLtp9PfyuW/vYQj1kPSuRW/38+lj27S2Q7v'.
-     '/aWXUBVUffVNtm3blivVCEwsC5Eyc5iiApEpDEAXMqQdldhSiWVQHjJagud+8Fuexck/zv+K82dfoSbSCsDe75/km+4GVPd6+l5t'.
-     '4zJHcqVUYN2yEEtZQDCSJCueRAYsPY49HsFIZVG6p25JUumFafT4DKJN4amtT7Nz38sk5+5A70HMtEYyMkFiZhxzjQ/poXrLQrRU'.
-     'DFGEeFpAlkQkm4pRiCpIKodKzk0T/2QMh+piPjxKZPwiSkUtu/b9mNnJEWS7E8nhAmvpM60oJDkXJxqNozxRRUxPIesispBBlsXV'.
-     'UaKEFo8gzoaJhz8s2lOmrpUG+WBhJ9/60g+Z+fDXTAXfxllRjl1VkO0OFATsYhYliiK21ZKKhhHnFveUqSdKgwAEOp7F2v51vvw8'.
-     'XH7/N1wd/BlTweuUV65BdtgfoLTSkipsdD3tRi0VYpommUwGwzDwdT5HYEc3giAwcvH3jLz3BlPB67jWeZBEKYsSBWwpHZtNKo4q'.
-     'aHTDsJeeiGEYWJaFZVmYpommaRiGQdPnv0bb1m8gSRL/vPIOV979aR4lmAJ2p4qCgCxksNuKJ6VNpx4NYhgGpmkuQhmGQTqdxjAM'.
-     'qr2d7HtxEEEQuH1tkKvvvkF44tqDnrIcKJKAPf1g+LAUElq8dIiu60sApmnm93Pfzc7OYhgGrie+wFe++ztcLhcT1wf54PzPCU9c'.
-     'w7XWjWS3IdsdOAUBWZAxrRJnTQ6SG5bce2FCpmkughmGQSqVYm5uDtnj44sH38TtdhP6+Dwf//V4ttHXrkGURZJaic8RgHQ6jWma'.
-     'SJKUL5RLKNfIOczDKF3XSSaTRCIRhLJWntp3nGfWrSMxc5OLf3iNP4+68T9Ub9nF76lTpxgfHycajZJKpdA0LZ9GbjYV7hcDWZaF'.
-     'pmnMz88Ti8UYunSLmu1HFi2aVkxkaGjINTY2ttDb24vX6+XQoUNs3ryZ8vJyIDu1BUFYkkxhgxeiWlpaOHPmDE1NTdTX1xe98eWG'.
-     'JnF/9dQZCoXUYDA4AOD1ejlw4ACtra2Ul5fniwmCkEcUJiUIAoFAgL6+Pnw+H21tbfT39z8SxCS7hHsfWH9/8dL4MKqnp4eWlhac'.
-     'TmcekEvMNE2am5s5ceIEgUCA9vZ2Tp48ic/nY3j4UsmQHCYOjJHtpeBKqL1799Lc3IzT6UTXdRobGxkYGKC9vZ3W1tZ8Ko86NJ8a'.
-     'tXHjRo4dO8bp06fZsmULGzZsoL+/n0AggNfr5ezZs/8VpGTU5OSkc//+/acBfD4f1dXV7Nq1i4aGBs6dO4fP5+Pq1SuPBbIiyjTN'.
-     'RUnV1dUNXLhwAa/Xy44dO4jFYgBEo9FFF1r134BPuYlk16LrAYXsAlmtq6sbKDwoFAp9m+ykuP5ZQVZF3f8tCdwCov8LyHIoAANI'.
-     'AXf/A1TI0XCDh7OWAAAAAElFTkSuQmCC' ;
-
-        //==========================================================
-        // file_important.png
-        //==========================================================
-        $this->iBuiltinIcon[12][0]= 1785 ;
-        $this->iBuiltinIcon[12][1]=
-     'iVBORw0KGgoAAAANSUhEUgAAACIAAAAiCAYAAAA6RwvCAAAABGdBTUEAALGPC/xhBQAAAAZiS0dEAAAAAAAA+UO7fwAAAAlwSFlz'.
-     'AAALDwAACw8BkvkDpQAAAAd0SU1FB9ECDAcjDeD3lKsAAAZ2SURBVHicrZhPaFzHHcc/897s7lutJCsr2VHsOHWMk0MPbsBUrcnF'.
-     'OFRdSo6FNhdB6SGHlpDmYtJCDyoxyKe6EBxKQkt7KKL0T6ABo0NbciqigtC6PhWKI2NFqqxdSd7V2/dmftPDvPd212t55dCBYfbN'.
-     'zpvfZ77z+/1mdhUjytWrV93Hf/24eD5z9gwiMlDjOKbb7dLtdhER2u02u7u73Lp1CxEZBw4AeZwdNQqkMd9wbziFGINJUt6rRbz5'.
-     '1ptUq1XK5TJBEAAUMHt7e+zu7gKwvLzMysoKwAng/uNg9CgQgFKlgg1DUJ67Vqtx6tQpZmdniaIIpRTOOZRSdDoddnZ2aLfbLC8v'.
-     's7S0xJUrV7ZGwQSj1PhhfRodVdDlMrpc5vup5Z2fvMPdu3fZ29vDWjvwztjYGPV6nVqtRqVS4dKlSywtLQFsAdOH2XwsCEApg3jl'.
-     'w98Rak2gvYjNZpNms0mSJDjnHgkDMDc3dySYQ0Ea8w139YUX0OUKulzyg7UmCEO+l1huvHuDra0t9vf3h1TJYSqVypFhHquIrlQI'.
-     'S5qv/uIDAC7/4bcEQYAKvK+0Wq1DVQGIoog7d+4cCeaRII35hrt+8SsEOkRlUaEyR0UpFIrXHxyMVKVUKnHv3r0jwRwaNelBjBjL'.
-     'Sz/7KYuLiwAsLi7y4z/9kY9e+TpkCuSqjI+Po7XuAWeKXLt2DWNMUZMkwRjDhQsXWFtbK6JpCCT3jfQgxomPtPX19YHWicM5x3c2'.
-     '73Pj3Ru8/aO3mZqaolKpoHVvyuvXr/Ppnf/Q7uzz380NPtu4y/qnG+ztd1hfX2dtbQ3gIvDnRyqSxl1UoPjyz98D4PTp0wPtq39Z'.
-     '4fdzLxegrVaLVqvF5OQkYRgWqpRKJZ77wvNsbW1RG5tgfKLOTH2G7Z1twqBQrgrMDvhInjfSOCY5iIv+hYWFgRZArEWsZWF941Bf'.
-     'SdMUgMnJCWpjVU4cn+HUyePM1Gc4+fRUPkzBI5w1jbukcczLv/5l0XfmzJmBFuCba38r/CRXpT+CrDUoZ0jjB4RYonJAOYRobJKT'.
-     'z5zgqfqxAbsFSH6mpHFM2qdGXh4VnoViD6mSJF2cTQeqDqBaKVHWmonJCWpZjhkC6anR5WsffTgwaHV1FaUUq6urA/2v3f5k4LnV'.
-     'arG9tUn3oI2YBCcWHYAxMVYs1qZEZY2SFB2aYZDGfMN9d7uJiWPSeFiNo5Rclc3NTXZbO6RpF7EJVixYA9agwwDnUiqlEPdQ3imi'.
-     'Jo27BGHIt/7x9yEjc3Nzh27Na7c/4TdffKl4bja3ae5MUIu0T/HOEIaOpJt4gwoSsVTK4SBIY77hFtY3ABBjBiZ90rKwvsH77/+K'.
-     't37wOhO1iPpTk4SBw1mLsz6CnKQ4l3qV+kE+t9XHlNZOk+bUJLVIE1VCcIJWQmJ6qjj30NbcXLkZMt8YPig+Z3n1G5fZ39/j/vY2'.
-     '9ckqZT2Ochbn0p4qNkU/dDfUADdXbh4HXgRO4zNdEU0XL1784PLly5w9e7Z4SazFOfGrEotDcOKrcoJPmrYIXf/Zop3QNd1skuGt'.
-     'cUAb2MgAxvHZTgFUq1Wmp6eZnZ0F8JlTjDduDThBnDeECEoJtbGIp6enqEblzCcEZ1PECU4yVRiOGgd0gc+AB0CZvkv1sWPHOHfu'.
-     'HOfPn8da41cpkkltEBEPJhYnBkTQJcdYVKGkgRxCfBsq5xXNgAa2Bn+hjTOgHEKBP8pzRUxykIH4ifLJRTJAl+UMBJzPHQ6bfe/f'.
-     'cWIzPxlUpD+zugzIZtVk1d8znBAqRxgoQuVQgSJQ3h9C5QhDRYgjUILCAzlnEdsHYTKfMTEBcP7F54YUGVmc2GLlIn6ve6v0ahSt'.
-     '8X25TzjJ+rIx1grKpQPWR4LkGVVsMgghvS0qjPdvm5OeceOTWA5Evo2mFzkjQfL7hZPUy5yvvF/uPFQL3+nbDmsLCEmT3sTmCTNr'.
-     'rogT6yFsOix3ftw7OwQhkvSU6CuinhCk0+kAkFoBazEEICHaHHiPVmU0gnUp4EAc1mYrF0EBVpwPi34VrBkwPxKk3W5ju/e5/c+d'.
-     'bGUHIAIuydTIE5zfc5Wr4lJcahHnHTP3CVGm78DrgY38N+DEibp7dmYKdAQmBh1hjEFjis+9CTWYGK21H6PxPyOI0DobYwzZF/z7'.
-     '7jadTvJtYG0kCD7lfwl49ijgT1gc0AH+dZSJA/xB+Mz/GSIvFoj/B7H1mAd8CO/zAAAAAElFTkSuQmCC' ;
-
-        $this->iLen = count($this->iBuiltinIcon);
-    }
-}
-
-//===================================================
-// Global cache for builtin images
-//===================================================
-$_gPredefIcons = new PredefIcons();
-
-//===================================================
-// CLASS IconImage
-// Description: Holds properties for an icon image
-//===================================================
-class IconImage {
-    private $iGDImage=null;
-    private $iWidth,$iHeight;
-    private $ixalign='left',$iyalign='center';
-    private $iScale=1.0;
-
-    function __construct($aIcon,$aScale=1) {
-        GLOBAL $_gPredefIcons ;
-        if( is_string($aIcon) ) {
-            $this->iGDImage = Graph::LoadBkgImage('',$aIcon);
-        }
-        elseif( is_integer($aIcon) ) {
-            // Builtin image
-            $this->iGDImage = $_gPredefIcons->GetImg($aIcon);
-        }
-        else {
-            JpGraphError::RaiseL(6011);
-            //('Argument to IconImage must be string or integer');
-        }
-        $this->iScale = $aScale;
-        $this->iWidth = Image::GetWidth($this->iGDImage);
-        $this->iHeight = Image::GetHeight($this->iGDImage);
-    }
-
-    function GetWidth() {
-        return round($this->iScale*$this->iWidth);
-    }
-
-    function GetHeight() {
-        return round($this->iScale*$this->iHeight);
-    }
-
-    function SetAlign($aX='left',$aY='center') {
-        $this->ixalign = $aX;
-        $this->iyalign = $aY;
-    }
-
-    function Stroke($aImg,$x,$y) {
-
-        if( $this->ixalign == 'right' ) {
-            $x -= $this->iWidth;
-        }
-        elseif( $this->ixalign == 'center' ) {
-            $x -= round($this->iWidth/2*$this->iScale);
-        }
-
-        if( $this->iyalign == 'bottom' ) {
-            $y -= $this->iHeight;
-        }
-        elseif( $this->iyalign == 'center' ) {
-            $y -= round($this->iHeight/2*$this->iScale);
-        }
-
-        $aImg->Copy($this->iGDImage,
-        			$x,$y,0,0,
-        			round($this->iWidth*$this->iScale),round($this->iHeight*$this->iScale),
-        			$this->iWidth,$this->iHeight);
-    }
-}
-
-
-//===================================================
-// CLASS TextProperty
-// Description: Holds properties for a text
-//===================================================
-class TextProperty {
-    public $iShow=true;
-    public $csimtarget='',$csimwintarget='',$csimalt='';
-    private $iFFamily=FF_FONT1,$iFStyle=FS_NORMAL,$iFSize=10;
-    private $iFontArray=array();
-    private $iColor="black";
-    private $iText="";
-    private $iHAlign="left",$iVAlign="bottom";
-
-    //---------------
-    // CONSTRUCTOR
-    function __construct($aTxt='') {
-        $this->iText = $aTxt;
-    }
-
-    //---------------
-    // PUBLIC METHODS
-    function Set($aTxt) {
-        $this->iText = $aTxt;
-    }
-
-    function SetCSIMTarget($aTarget,$aAltText='',$aWinTarget='') {
-        if( is_string($aTarget) )
-        $aTarget = array($aTarget);
-        $this->csimtarget=$aTarget;
-
-        if( is_string($aWinTarget) )
-        $aWinTarget = array($aWinTarget);
-        $this->csimwintarget=$aWinTarget;
-
-        if( is_string($aAltText) )
-        $aAltText = array($aAltText);
-        $this->csimalt=$aAltText;
-
-    }
-
-    function SetCSIMAlt($aAltText) {
-        if( is_string($aAltText) )
-        $aAltText = array($aAltText);
-        $this->csimalt=$aAltText;
-    }
-
-    // Set text color
-    function SetColor($aColor) {
-        $this->iColor = $aColor;
-    }
-
-    function HasTabs() {
-        if( is_string($this->iText) ) {
-            return substr_count($this->iText,"\t") > 0;
-        }
-        elseif( is_array($this->iText) ) {
-            return false;
-        }
-    }
-
-    // Get number of tabs in string
-    function GetNbrTabs() {
-        if( is_string($this->iText) ) {
-            return substr_count($this->iText,"\t") ;
-        }
-        else{
-            return 0;
-        }
-    }
-
-    // Set alignment
-    function Align($aHAlign,$aVAlign="bottom") {
-        $this->iHAlign=$aHAlign;
-        $this->iVAlign=$aVAlign;
-    }
-
-    // Synonym
-    function SetAlign($aHAlign,$aVAlign="bottom") {
-        $this->iHAlign=$aHAlign;
-        $this->iVAlign=$aVAlign;
-    }
-
-    // Specify font
-    function SetFont($aFFamily,$aFStyle=FS_NORMAL,$aFSize=10) {
-        $this->iFFamily = $aFFamily;
-        $this->iFStyle  = $aFStyle;
-        $this->iFSize  = $aFSize;
-    }
-
-    function SetColumnFonts($aFontArray) {
-        if( !is_array($aFontArray) || count($aFontArray[0]) != 3 ) {
-            JpGraphError::RaiseL(6033);
-            // 'Array of fonts must contain arrays with 3 elements, i.e. (Family, Style, Size)'
-        }
-        $this->iFontArray = $aFontArray;
-    }
-
-
-    function IsColumns() {
-        return is_array($this->iText) ;
-    }
-
-    // Get width of text. If text contains several columns separated by
-    // tabs then return both the total width as well as an array with a
-    // width for each column.
-    function GetWidth($aImg,$aUseTabs=false,$aTabExtraMargin=1.1) {
-        $extra_margin=4;
-        $aImg->SetFont($this->iFFamily,$this->iFStyle,$this->iFSize);
-        if( is_string($this->iText) ) {
-            if( strlen($this->iText) == 0 ) return 0;
-            $tmp = preg_split('/\t/',$this->iText);
-            if( count($tmp) <= 1 || !$aUseTabs ) {
-                $w = $aImg->GetTextWidth($this->iText);
-                return $w + 2*$extra_margin;
-            }
-            else {
-                $tot=0;
-                $n = count($tmp);
-                for($i=0; $i < $n; ++$i) {
-                    $res[$i] = $aImg->GetTextWidth($tmp[$i]);
-                    $tot += $res[$i]*$aTabExtraMargin;
-                }
-                return array(round($tot),$res);
-            }
-        }
-        elseif( is_object($this->iText) ) {
-            // A single icon
-            return $this->iText->GetWidth()+2*$extra_margin;
-        }
-        elseif( is_array($this->iText) ) {
-            // Must be an array of texts. In this case we return the sum of the
-            // length + a fixed margin of 4 pixels on each text string
-            $n = count($this->iText);
-            $nf = count($this->iFontArray);
-            for( $i=0, $w=0; $i < $n; ++$i ) {
-                if( $i < $nf ) {
-                    $aImg->SetFont($this->iFontArray[$i][0],$this->iFontArray[$i][1],$this->iFontArray[$i][2]);
-                }
-                else {
-                    $aImg->SetFont($this->iFFamily,$this->iFStyle,$this->iFSize);
-                }
-                $tmp = $this->iText[$i];
-                if( is_string($tmp) ) {
-                    $w += $aImg->GetTextWidth($tmp)+$extra_margin;
-                }
-                else {
-                    if( is_object($tmp) === false ) {
-                        JpGraphError::RaiseL(6012);
-                    }
-                    $w += $tmp->GetWidth()+$extra_margin;
-                }
-            }
-            return $w;
-        }
-        else {
-            JpGraphError::RaiseL(6012);
-        }
-    }
-
-    // for the case where we have multiple columns this function returns the width of each
-    // column individually. If there is no columns just return the width of the single
-    // column as an array of one
-    function GetColWidth($aImg,$aMargin=0) {
-        $aImg->SetFont($this->iFFamily,$this->iFStyle,$this->iFSize);
-        if( is_array($this->iText) ) {
-            $n = count($this->iText);
-            $nf = count($this->iFontArray);
-            for( $i=0, $w=array(); $i < $n; ++$i ) {
-                $tmp = $this->iText[$i];
-                if( is_string($tmp) ) {
-                    if( $i < $nf ) {
-                        $aImg->SetFont($this->iFontArray[$i][0],$this->iFontArray[$i][1],$this->iFontArray[$i][2]);
-                    }
-                    else {
-                        $aImg->SetFont($this->iFFamily,$this->iFStyle,$this->iFSize);
-                    }
-                    $w[$i] = $aImg->GetTextWidth($tmp)+$aMargin;
-                }
-                else {
-                    if( is_object($tmp) === false ) {
-                        JpGraphError::RaiseL(6012);
-                    }
-                    $w[$i] = $tmp->GetWidth()+$aMargin;
-                }
-            }
-            return $w;
-        }
-        else {
-            return array($this->GetWidth($aImg));
-        }
-    }
-
-    // Get total height of text
-    function GetHeight($aImg) {
-        $nf = count($this->iFontArray);
-        $maxheight = -1;
-
-        if( $nf > 0 ) {
-            // We have to find out the largest font and take that one as the
-            // height of the row
-            for($i=0; $i < $nf; ++$i ) {
-                $aImg->SetFont($this->iFontArray[$i][0],$this->iFontArray[$i][1],$this->iFontArray[$i][2]);
-                $height = $aImg->GetFontHeight();
-                $maxheight = max($height,$maxheight);
-            }
-        }
-
-        $aImg->SetFont($this->iFFamily,$this->iFStyle,$this->iFSize);
-        $height = $aImg->GetFontHeight();
-        $maxheight = max($height,$maxheight);
-        return $maxheight;
-    }
-
-    // Unhide/hide the text
-    function Show($aShow=true) {
-        $this->iShow=$aShow;
-    }
-
-    // Stroke text at (x,y) coordinates. If the text contains tabs then the
-    // x parameter should be an array of positions to be used for each successive
-    // tab mark. If no array is supplied then the tabs will be ignored.
-    function Stroke($aImg,$aX,$aY) {
-        if( $this->iShow ) {
-            $aImg->SetColor($this->iColor);
-            $aImg->SetFont($this->iFFamily,$this->iFStyle,$this->iFSize);
-            $aImg->SetTextAlign($this->iHAlign,$this->iVAlign);
-            if( $this->GetNbrTabs() < 1 ) {
-                if( is_string($this->iText) ) {
-                    if( is_array($aX) ) $aX=$aX[0];
-                    if( is_array($aY) ) $aY=$aY[0];
-                    $aImg->StrokeText($aX,$aY,$this->iText);
-                }
-                elseif( is_array($this->iText) && ($n = count($this->iText)) > 0 ) {
-                    $ax = is_array($aX) ;
-                    $ay = is_array($aY) ;
-                    if( $ax && $ay ) {
-                        // Nothing; both are already arrays
-                    }
-                    elseif( $ax ) {
-                        $aY = array_fill(0,$n,$aY);
-                    }
-                    elseif( $ay ) {
-                        $aX = array_fill(0,$n,$aX);
-                    }
-                    else {
-                        $aX = array_fill(0,$n,$aX);
-                        $aY = array_fill(0,$n,$aY);
-                    }
-                    $n = min($n, count($aX) ) ;
-                    $n = min($n, count($aY) ) ;
-                    for($i=0; $i < $n; ++$i ) {
-                        $tmp = $this->iText[$i];
-                        if( is_object($tmp) ) {
-                            $tmp->Stroke($aImg,$aX[$i],$aY[$i]);
-                        }
-                        else {
-                            if( $i < count($this->iFontArray) ) {
-                                $font = $this->iFontArray[$i];
-                                $aImg->SetFont($font[0],$font[1],$font[2]);
-                            }
-                            else {
-                                $aImg->SetFont($this->iFFamily,$this->iFStyle,$this->iFSize);
-                            }
-                        	$aImg->StrokeText($aX[$i],$aY[$i],str_replace("\t"," ",$tmp));
-                        }
-                    }
-                }
-            }
-            else {
-                $tmp = preg_split('/\t/',$this->iText);
-                $n = min(count($tmp),count($aX));
-                for($i=0; $i < $n; ++$i) {
-                    if( $i < count($this->iFontArray) ) {
-                        $font = $this->iFontArray[$i];
-                        $aImg->SetFont($font[0],$font[1],$font[2]);
-                    }
-                    else {
-                        $aImg->SetFont($this->iFFamily,$this->iFStyle,$this->iFSize);
-                    }
-                    $aImg->StrokeText($aX[$i],$aY,$tmp[$i]);
-                }
-            }
-        }
-    }
-}
-
-//===================================================
-// CLASS HeaderProperty
-// Description: Data encapsulating class to hold property
-// for each type of the scale headers
-//===================================================
-class HeaderProperty {
-    public $grid;
-    public $iShowLabels=true,$iShowGrid=true;
-    public $iTitleVertMargin=3,$iFFamily=FF_FONT0,$iFStyle=FS_NORMAL,$iFSize=8;
-    public $iStyle=0;
-    public $iFrameColor="black",$iFrameWeight=1;
-    public $iBackgroundColor="white";
-    public $iWeekendBackgroundColor="lightgray",$iSundayTextColor="red"; // these are only used with day scale
-    public $iTextColor="black";
-    public $iLabelFormStr="%d";
-    public $iIntervall = 1;
-
-    //---------------
-    // CONSTRUCTOR
-    function __construct() {
-        $this->grid = new LineProperty();
-    }
-
-    //---------------
-    // PUBLIC METHODS
-    function Show($aShow=true) {
-        $this->iShowLabels = $aShow;
-    }
-
-    function SetIntervall($aInt) {
-    	$this->iIntervall = $aInt;
-    }
-
-    function SetInterval($aInt) {
-        $this->iIntervall = $aInt;
-    }
-
-    function GetIntervall() {
-        return $this->iIntervall ;
-    }
-
-    function SetFont($aFFamily,$aFStyle=FS_NORMAL,$aFSize=10) {
-        $this->iFFamily = $aFFamily;
-        $this->iFStyle  = $aFStyle;
-        $this->iFSize  = $aFSize;
-    }
-
-    function SetFontColor($aColor) {
-        $this->iTextColor = $aColor;
-    }
-
-    function GetFontHeight($aImg) {
-        $aImg->SetFont($this->iFFamily,$this->iFStyle,$this->iFSize);
-        return $aImg->GetFontHeight();
-    }
-
-    function GetFontWidth($aImg) {
-        $aImg->SetFont($this->iFFamily,$this->iFStyle,$this->iFSize);
-        return $aImg->GetFontWidth();
-    }
-
-    function GetStrWidth($aImg,$aStr) {
-        $aImg->SetFont($this->iFFamily,$this->iFStyle,$this->iFSize);
-        return $aImg->GetTextWidth($aStr);
-    }
-
-    function SetStyle($aStyle) {
-        $this->iStyle = $aStyle;
-    }
-
-    function SetBackgroundColor($aColor) {
-        $this->iBackgroundColor=$aColor;
-    }
-
-    function SetFrameWeight($aWeight) {
-        $this->iFrameWeight=$aWeight;
-    }
-
-    function SetFrameColor($aColor) {
-        $this->iFrameColor=$aColor;
-    }
-
-    // Only used by day scale
-    function SetWeekendColor($aColor) {
-        $this->iWeekendBackgroundColor=$aColor;
-    }
-
-    // Only used by day scale
-    function SetSundayFontColor($aColor) {
-        $this->iSundayTextColor=$aColor;
-    }
-
-    function SetTitleVertMargin($aMargin) {
-        $this->iTitleVertMargin=$aMargin;
-    }
-
-    function SetLabelFormatString($aStr) {
-        $this->iLabelFormStr=$aStr;
-    }
-
-    function SetFormatString($aStr) {
-        $this->SetLabelFormatString($aStr);
-    }
-
-
-}
-
-//===================================================
-// CLASS GanttScale
-// Description: Responsible for calculating and showing
-// the scale in a gantt chart. This includes providing methods for
-// converting dates to position in the chart as well as stroking the
-// date headers (days, week, etc).
-//===================================================
-class GanttScale {
-    public $minute,$hour,$day,$week,$month,$year;
-    public $divider,$dividerh,$tableTitle;
-    public $iStartDate=-1,$iEndDate=-1;
-    // Number of gantt bar position (n.b not necessariliy the same as the number of bars)
-    // we could have on bar in position 1, and one bar in position 5 then there are two
-    // bars but the number of bar positions is 5
-    public $actinfo;
-    public $iTopPlotMargin=10,$iBottomPlotMargin=15;
-    public $iVertLines=-1;
-    public $iVertHeaderSize=-1;
-    // The width of the labels (defaults to the widest of all labels)
-    private $iLabelWidth;
-    // Out image to stroke the scale to
-    private $iImg;
-    private $iTableHeaderBackgroundColor="white",$iTableHeaderFrameColor="black";
-    private $iTableHeaderFrameWeight=1;
-    private $iAvailableHeight=-1,$iVertSpacing=-1;
-    private $iDateLocale;
-    private $iVertLayout=GANTT_EVEN;
-    private $iUsePlotWeekendBackground=true;
-    private $iWeekStart = 1; // Default to have weekends start on Monday
-
-    //---------------
-    // CONSTRUCTOR
-    function __construct($aImg) {
-        $this->iImg = $aImg;
-        $this->iDateLocale = new DateLocale();
-
-        $this->minute = new HeaderProperty();
-        $this->minute->SetIntervall(15);
-        $this->minute->SetLabelFormatString('i');
-        $this->minute->SetFont(FF_FONT0);
-        $this->minute->grid->SetColor("gray");
-
-        $this->hour = new HeaderProperty();
-        $this->hour->SetFont(FF_FONT0);
-        $this->hour->SetIntervall(6);
-        $this->hour->SetStyle(HOURSTYLE_HM24);
-        $this->hour->SetLabelFormatString('H:i');
-        $this->hour->grid->SetColor("gray");
-
-        $this->day = new HeaderProperty();
-        $this->day->grid->SetColor("gray");
-        $this->day->SetLabelFormatString('l');
-
-        $this->week = new HeaderProperty();
-        $this->week->SetLabelFormatString("w%d");
-        $this->week->SetFont(FF_FONT1);
-
-        $this->month = new HeaderProperty();
-        $this->month->SetFont(FF_FONT1,FS_BOLD);
-
-        $this->year = new HeaderProperty();
-        $this->year->SetFont(FF_FONT1,FS_BOLD);
-
-        $this->divider=new LineProperty();
-        $this->dividerh=new LineProperty();
-        $this->dividerh->SetWeight(2);
-        $this->divider->SetWeight(6);
-        $this->divider->SetColor('gray');
-        $this->divider->SetStyle('fancy');
-
-        $this->tableTitle=new TextProperty();
-        $this->tableTitle->Show(false);
-        $this->actinfo = new GanttActivityInfo();
-    }
-
-    //---------------
-    // PUBLIC METHODS
-    // Specify what headers should be visible
-    function ShowHeaders($aFlg) {
-        $this->day->Show($aFlg & GANTT_HDAY);
-        $this->week->Show($aFlg & GANTT_HWEEK);
-        $this->month->Show($aFlg & GANTT_HMONTH);
-        $this->year->Show($aFlg & GANTT_HYEAR);
-        $this->hour->Show($aFlg & GANTT_HHOUR);
-        $this->minute->Show($aFlg & GANTT_HMIN);
-
-        // Make some default settings of gridlines whihc makes sense
-        if( $aFlg & GANTT_HWEEK ) {
-            $this->month->grid->Show(false);
-            $this->year->grid->Show(false);
-        }
-        if( $aFlg & GANTT_HHOUR ) {
-            $this->day->grid->SetColor("black");
-        }
-    }
-
-    // Should the weekend background stretch all the way down in the plotarea
-    function UseWeekendBackground($aShow) {
-        $this->iUsePlotWeekendBackground = $aShow;
-    }
-
-    // Have a range been specified?
-    function IsRangeSet() {
-        return $this->iStartDate!=-1 && $this->iEndDate!=-1;
-    }
-
-    // Should the layout be from top or even?
-    function SetVertLayout($aLayout) {
-        $this->iVertLayout = $aLayout;
-    }
-
-    // Which locale should be used?
-    function SetDateLocale($aLocale) {
-        $this->iDateLocale->Set($aLocale);
-    }
-
-    // Number of days we are showing
-    function GetNumberOfDays() {
-        return round(($this->iEndDate-$this->iStartDate)/SECPERDAY);
-    }
-
-    // The width of the actual plot area
-    function GetPlotWidth() {
-        $img=$this->iImg;
-        return $img->width - $img->left_margin - $img->right_margin;
-    }
-
-    // Specify the width of the titles(labels) for the activities
-    // (This is by default set to the minimum width enought for the
-    // widest title)
-    function SetLabelWidth($aLabelWidth) {
-        $this->iLabelWidth=$aLabelWidth;
-    }
-
-    // Which day should the week start?
-    // 0==Sun, 1==Monday, 2==Tuesday etc
-    function SetWeekStart($aStartDay) {
-        $this->iWeekStart = $aStartDay % 7;
-
-        //Recalculate the startday since this will change the week start
-        $this->SetRange($this->iStartDate,$this->iEndDate);
-    }
-
-    // Do we show min scale?
-    function IsDisplayMinute() {
-        return $this->minute->iShowLabels;
-    }
-
-    // Do we show day scale?
-    function IsDisplayHour() {
-        return $this->hour->iShowLabels;
-    }
-
-
-    // Do we show day scale?
-    function IsDisplayDay() {
-        return $this->day->iShowLabels;
-    }
-
-    // Do we show week scale?
-    function IsDisplayWeek() {
-        return $this->week->iShowLabels;
-    }
-
-    // Do we show month scale?
-    function IsDisplayMonth() {
-        return $this->month->iShowLabels;
-    }
-
-    // Do we show year scale?
-    function IsDisplayYear() {
-        return $this->year->iShowLabels;
-    }
-
-    // Specify spacing (in percent of bar height) between activity bars
-    function SetVertSpacing($aSpacing) {
-        $this->iVertSpacing = $aSpacing;
-    }
-
-    // Specify scale min and max date either as timestamp or as date strings
-    // Always round to the nearest week boundary
-    function SetRange($aMin,$aMax) {
-        $this->iStartDate = $this->NormalizeDate($aMin);
-        $this->iEndDate = $this->NormalizeDate($aMax);
-    }
-
-
-    // Adjust the start and end date so they fit to beginning/ending
-    // of the week taking the specified week start day into account.
-    function AdjustStartEndDay() {
-
-        if( !($this->IsDisplayYear() ||$this->IsDisplayMonth() || $this->IsDisplayWeek()) ) {
-            // Don't adjust
-            return;
-        }
-
-        // Get day in week for start and ending date (Sun==0)
-        $ds=strftime("%w",$this->iStartDate);
-        $de=strftime("%w",$this->iEndDate);
-
-        // We want to start on iWeekStart day. But first we subtract a week
-        // if the startdate is "behind" the day the week start at.
-        // This way we ensure that the given start date is always included
-        // in the range. If we don't do this the nearest correct weekday in the week
-        // to start at might be later than the start date.
-        if( $ds < $this->iWeekStart )
-        $d = strtotime('-7 day',$this->iStartDate);
-        else
-        $d = $this->iStartDate;
-        $adjdate = strtotime(($this->iWeekStart-$ds).' day',$d /*$this->iStartDate*/ );
-        $this->iStartDate = $adjdate;
-
-        // We want to end on the last day of the week
-        $preferredEndDay = ($this->iWeekStart+6)%7;
-        if( $preferredEndDay != $de ) {
-            // Solve equivalence eq:    $de + x ~ $preferredDay (mod 7)
-            $adj = (7+($preferredEndDay - $de)) % 7;
-            $adjdate = strtotime("+$adj day",$this->iEndDate);
-            $this->iEndDate = $adjdate;
-        }
-    }
-
-    // Specify background for the table title area (upper left corner of the table)
-    function SetTableTitleBackground($aColor) {
-        $this->iTableHeaderBackgroundColor = $aColor;
-    }
-
-    ///////////////////////////////////////
-    // PRIVATE Methods
-
-    // Determine the height of all the scale headers combined
-    function GetHeaderHeight() {
-        $img=$this->iImg;
-        $height=1;
-        if( $this->minute->iShowLabels ) {
-            $height += $this->minute->GetFontHeight($img);
-            $height += $this->minute->iTitleVertMargin;
-        }
-        if( $this->hour->iShowLabels ) {
-            $height += $this->hour->GetFontHeight($img);
-            $height += $this->hour->iTitleVertMargin;
-        }
-        if( $this->day->iShowLabels ) {
-            $height += $this->day->GetFontHeight($img);
-            $height += $this->day->iTitleVertMargin;
-        }
-        if( $this->week->iShowLabels ) {
-            $height += $this->week->GetFontHeight($img);
-            $height += $this->week->iTitleVertMargin;
-        }
-        if( $this->month->iShowLabels ) {
-            $height += $this->month->GetFontHeight($img);
-            $height += $this->month->iTitleVertMargin;
-        }
-        if( $this->year->iShowLabels ) {
-            $height += $this->year->GetFontHeight($img);
-            $height += $this->year->iTitleVertMargin;
-        }
-        return $height;
-    }
-
-    // Get width (in pixels) for a single day
-    function GetDayWidth() {
-        return ($this->GetPlotWidth()-$this->iLabelWidth+1)/$this->GetNumberOfDays();
-    }
-
-    // Get width (in pixels) for a single hour
-    function GetHourWidth() {
-        return $this->GetDayWidth() / 24 ;
-    }
-
-    function GetMinuteWidth() {
-        return $this->GetHourWidth() / 60 ;
-    }
-
-    // Nuber of days in a year
-    function GetNumDaysInYear($aYear) {
-        if( $this->IsLeap($aYear) )
-        return 366;
-        else
-        return 365;
-    }
-
-    // Get week number
-    function GetWeekNbr($aDate,$aSunStart=true) {
-        // We can't use the internal strftime() since it gets the weeknumber
-        // wrong since it doesn't follow ISO on all systems since this is
-        // system linrary dependent.
-        // Even worse is that this works differently if we are on a Windows
-        // or UNIX box (it even differs between UNIX boxes how strftime()
-        // is natively implemented)
-        //
-        // Credit to Nicolas Hoizey <nhoizey@phpheaven.net> for this elegant
-        // version of Week Nbr calculation.
-
-        $day = $this->NormalizeDate($aDate);
-        if( $aSunStart )
-        $day += 60*60*24;
-
-        /*-------------------------------------------------------------------------
-         According to ISO-8601 :
-         "Week 01 of a year is per definition the first week that has the Thursday in this year,
-         which is equivalent to the week that contains the fourth day of January.
-         In other words, the first week of a new year is the week that has the majority of its
-         days in the new year."
-
-         Be carefull, with PHP, -3 % 7 = -3, instead of 4 !!!
-
-         day of year             = date("z", $day) + 1
-         offset to thursday      = 3 - (date("w", $day) + 6) % 7
-         first thursday of year  = 1 + (11 - date("w", mktime(0, 0, 0, 1, 1, date("Y", $day)))) % 7
-         week number             = (thursday's day of year - first thursday's day of year) / 7 + 1
-         ---------------------------------------------------------------------------*/
-
-        $thursday = $day + 60 * 60 * 24 * (3 - (date("w", $day) + 6) % 7);              // take week's thursday
-        $week = 1 + (date("z", $thursday) - (11 - date("w", mktime(0, 0, 0, 1, 1, date("Y", $thursday)))) % 7) / 7;
-
-        return $week;
-    }
-
-    // Is year a leap year?
-    function IsLeap($aYear) {
-        // Is the year a leap year?
-        //$year = 0+date("Y",$aDate);
-        if( $aYear % 4 == 0)
-        if( !($aYear % 100 == 0) || ($aYear % 400 == 0) )
-        return true;
-        return false;
-    }
-
-    // Get current year
-    function GetYear($aDate) {
-        return 0+Date("Y",$aDate);
-    }
-
-    // Return number of days in a year
-    function GetNumDaysInMonth($aMonth,$aYear) {
-        $days=array(31,28,31,30,31,30,31,31,30,31,30,31);
-        $daysl=array(31,29,31,30,31,30,31,31,30,31,30,31);
-        if( $this->IsLeap($aYear))
-        return $daysl[$aMonth];
-        else
-        return $days[$aMonth];
-    }
-
-    // Get day in month
-    function GetMonthDayNbr($aDate) {
-        return 0+strftime("%d",$aDate);
-    }
-
-    // Get day in year
-    function GetYearDayNbr($aDate) {
-        return 0+strftime("%j",$aDate);
-    }
-
-    // Get month number
-    function GetMonthNbr($aDate) {
-        return 0+strftime("%m",$aDate);
-    }
-
-    // Translate a date to screen coordinates (horizontal scale)
-    function TranslateDate($aDate) {
-        //
-        // In order to handle the problem with Daylight savings time
-        // the scale written with equal number of seconds per day beginning
-        // with the start date. This means that we "cement" the state of
-        // DST as it is in the start date. If later the scale includes the
-        // switchover date (depends on the locale) we need to adjust back
-        // if the date we try to translate has a different DST status since
-        // we would otherwise be off by one hour.
-        $aDate = $this->NormalizeDate($aDate);
-        $tmp = localtime($aDate);
-        $cloc = $tmp[8];
-        $tmp = localtime($this->iStartDate);
-        $sloc = $tmp[8];
-        $offset = 0;
-        if( $sloc != $cloc) {
-            if( $sloc )
-            $offset = 3600;
-            else
-            $offset = -3600;
-        }
-        $img=$this->iImg;
-        return ($aDate-$this->iStartDate-$offset)/SECPERDAY*$this->GetDayWidth()+$img->left_margin+$this->iLabelWidth;;
-    }
-
-    // Get screen coordinatesz for the vertical position for a bar
-    function TranslateVertPos($aPos,$atTop=false) {
-        $img=$this->iImg;
-        if( $aPos > $this->iVertLines )
-        	JpGraphError::RaiseL(6015,$aPos);
-        // 'Illegal vertical position %d'
-        if( $this->iVertLayout == GANTT_EVEN ) {
-            // Position the top bar at 1 vert spacing from the scale
-            $pos =  round($img->top_margin + $this->iVertHeaderSize +  ($aPos+1)*$this->iVertSpacing);
-        }
-        else {
-            // position the top bar at 1/2 a vert spacing from the scale
-            $pos = round($img->top_margin + $this->iVertHeaderSize  + $this->iTopPlotMargin + ($aPos+1)*$this->iVertSpacing);
-        }
-
-        if( $atTop )
-            $pos -= $this->iVertSpacing;
-
-        return $pos;
-    }
-
-    // What is the vertical spacing?
-    function GetVertSpacing() {
-        return $this->iVertSpacing;
-    }
-
-    // Convert a date to timestamp
-    function NormalizeDate($aDate) {
-        if( $aDate === false ) return false;
-        if( is_string($aDate) ) {
-            $t = strtotime($aDate);
-            if( $t === FALSE || $t === -1 ) {
-                JpGraphError::RaiseL(6016,$aDate);
-                //("Date string ($aDate) specified for Gantt activity can not be interpretated. Please make sure it is a valid time string, e.g. 2005-04-23 13:30");
-            }
-            return $t;
-        }
-        elseif( is_int($aDate) || is_float($aDate) )
-            return $aDate;
-        else
-            JpGraphError::RaiseL(6017,$aDate);
-        //Unknown date format in GanttScale ($aDate).");
-    }
-
-
-    // Convert a time string to minutes
-
-    function TimeToMinutes($aTimeString) {
-        // Split in hours and minutes
-        $pos=strpos($aTimeString,':');
-        $minint=60;
-        if( $pos === false ) {
-            $hourint = $aTimeString;
-            $minint = 0;
-        }
-        else {
-            $hourint = floor(substr($aTimeString,0,$pos));
-            $minint = floor(substr($aTimeString,$pos+1));
-        }
-        $minint += 60 * $hourint;
-        return $minint;
-    }
-
-    // Stroke the day scale (including gridlines)
-    function StrokeMinutes($aYCoord,$getHeight=false) {
-        $img=$this->iImg;
-        $xt=$img->left_margin+$this->iLabelWidth;
-        $yt=$aYCoord+$img->top_margin;
-        if( $this->minute->iShowLabels ) {
-            $img->SetFont($this->minute->iFFamily,$this->minute->iFStyle,$this->minute->iFSize);
-            $yb = $yt + $img->GetFontHeight() +
-            $this->minute->iTitleVertMargin + $this->minute->iFrameWeight;
-            if( $getHeight ) {
-                return $yb - $img->top_margin;
-            }
-            $xb = $img->width-$img->right_margin+1;
-            $img->SetColor($this->minute->iBackgroundColor);
-            $img->FilledRectangle($xt,$yt,$xb,$yb);
-
-            $x = $xt;
-            $img->SetTextAlign("center");
-            $day = date('w',$this->iStartDate);
-            $minint = $this->minute->GetIntervall() ;
-
-            if( 60 % $minint !== 0 ) {
-                JpGraphError::RaiseL(6018,$minint);
-                //'Intervall for minutes must divide the hour evenly, e.g. 1,5,10,12,15,20,30 etc You have specified an intervall of '.$minint.' minutes.');
-            }
-
-
-            $n = 60 / $minint;
-            $datestamp = $this->iStartDate;
-            $width = $this->GetHourWidth() / $n ;
-            if( $width < 8 ) {
-                // TO small width to draw minute scale
-                JpGraphError::RaiseL(6019,$width);
-                //('The available width ('.$width.') for minutes are to small for this scale to be displayed. Please use auto-sizing or increase the width of the graph.');
-            }
-
-            $nh = ceil(24*60 / $this->TimeToMinutes($this->hour->GetIntervall()) );
-            $nd = $this->GetNumberOfDays();
-            // Convert to intervall to seconds
-            $minint *= 60;
-            for($j=0; $j < $nd; ++$j, $day += 1, $day %= 7) {
-                for( $k=0; $k < $nh; ++$k ) {
-                    for($i=0; $i < $n ;++$i, $x+=$width, $datestamp += $minint ) {
-                        if( $day==6 || $day==0 ) {
-
-                            $img->PushColor($this->day->iWeekendBackgroundColor);
-                            if( $this->iUsePlotWeekendBackground )
-                            $img->FilledRectangle($x,$yt+$this->day->iFrameWeight,$x+$width,$img->height-$img->bottom_margin);
-                            else
-                            $img->FilledRectangle($x,$yt+$this->day->iFrameWeight,$x+$width,$yb-$this->day->iFrameWeight);
-                            $img->PopColor();
-
-                        }
-
-                        if( $day==0 )
-                        $img->SetColor($this->day->iSundayTextColor);
-                        else
-                        $img->SetColor($this->day->iTextColor);
-
-                        switch( $this->minute->iStyle ) {
-                            case MINUTESTYLE_CUSTOM:
-                                $txt = date($this->minute->iLabelFormStr,$datestamp);
-                                break;
-                            case MINUTESTYLE_MM:
-                            default:
-                                // 15
-                                $txt = date('i',$datestamp);
-                                break;
-                        }
-                        $img->StrokeText(round($x+$width/2),round($yb-$this->minute->iTitleVertMargin),$txt);
-
-                        // Fix a rounding problem the wrong way ..
-                        // If we also have hour scale then don't draw the firsta or last
-                        // gridline since that will be overwritten by the hour scale gridline if such exists.
-                        // However, due to the propagation of rounding of the 'x+=width' term in the loop
-                        // this might sometimes be one pixel of so we fix this by not drawing it.
-                        // The proper way to fix it would be to re-calculate the scale for each step and
-                        // not using the additive term.
-                        if( !(($i == $n || $i==0) && $this->hour->iShowLabels && $this->hour->grid->iShow) ) {
-                            $img->SetColor($this->minute->grid->iColor);
-                            $img->SetLineWeight($this->minute->grid->iWeight);
-                            $img->Line($x,$yt,$x,$yb);
-                            $this->minute->grid->Stroke($img,$x,$yb,$x,$img->height-$img->bottom_margin);
-                        }
-                    }
-                }
-            }
-            $img->SetColor($this->minute->iFrameColor);
-            $img->SetLineWeight($this->minute->iFrameWeight);
-            $img->Rectangle($xt,$yt,$xb,$yb);
-            return $yb - $img->top_margin;
-        }
-        return $aYCoord;
-    }
-
-    // Stroke the day scale (including gridlines)
-    function StrokeHours($aYCoord,$getHeight=false) {
-        $img=$this->iImg;
-        $xt=$img->left_margin+$this->iLabelWidth;
-        $yt=$aYCoord+$img->top_margin;
-        if( $this->hour->iShowLabels ) {
-            $img->SetFont($this->hour->iFFamily,$this->hour->iFStyle,$this->hour->iFSize);
-            $yb = $yt + $img->GetFontHeight() +
-            $this->hour->iTitleVertMargin + $this->hour->iFrameWeight;
-            if( $getHeight ) {
-                return $yb - $img->top_margin;
-            }
-            $xb = $img->width-$img->right_margin+1;
-            $img->SetColor($this->hour->iBackgroundColor);
-            $img->FilledRectangle($xt,$yt,$xb,$yb);
-
-            $x = $xt;
-            $img->SetTextAlign("center");
-            $tmp = $this->hour->GetIntervall() ;
-            $minint = $this->TimeToMinutes($tmp);
-            if( 1440 % $minint !== 0 ) {
-                JpGraphError::RaiseL(6020,$tmp);
-                //('Intervall for hours must divide the day evenly, e.g. 0:30, 1:00, 1:30, 4:00 etc. You have specified an intervall of '.$tmp);
-            }
-
-            $n = ceil(24*60 / $minint );
-            $datestamp = $this->iStartDate;
-            $day = date('w',$this->iStartDate);
-            $doback = !$this->minute->iShowLabels;
-            $width = $this->GetDayWidth() / $n ;
-            for($j=0; $j < $this->GetNumberOfDays(); ++$j, $day += 1,$day %= 7) {
-                for($i=0; $i < $n ;++$i, $x+=$width) {
-                    if( $day==6 || $day==0 ) {
-
-                        $img->PushColor($this->day->iWeekendBackgroundColor);
-                        if( $this->iUsePlotWeekendBackground && $doback )
-                        $img->FilledRectangle($x,$yt+$this->day->iFrameWeight,$x+$width,$img->height-$img->bottom_margin);
-                        else
-                        $img->FilledRectangle($x,$yt+$this->day->iFrameWeight,$x+$width,$yb-$this->day->iFrameWeight);
-                        $img->PopColor();
-
-                    }
-
-                    if( $day==0 )
-                    $img->SetColor($this->day->iSundayTextColor);
-                    else
-                    $img->SetColor($this->day->iTextColor);
-
-                    switch( $this->hour->iStyle ) {
-                        case HOURSTYLE_HMAMPM:
-                            // 1:35pm
-                            $txt = date('g:ia',$datestamp);
-                            break;
-                        case HOURSTYLE_H24:
-                            // 13
-                            $txt = date('H',$datestamp);
-                            break;
-                        case HOURSTYLE_HAMPM:
-                            $txt = date('ga',$datestamp);
-                            break;
-                        case HOURSTYLE_CUSTOM:
-                            $txt = date($this->hour->iLabelFormStr,$datestamp);
-                            break;
-                        case HOURSTYLE_HM24:
-                        default:
-                            $txt = date('H:i',$datestamp);
-                            break;
-                    }
-                    $img->StrokeText(round($x+$width/2),round($yb-$this->hour->iTitleVertMargin),$txt);
-                    $img->SetColor($this->hour->grid->iColor);
-                    $img->SetLineWeight($this->hour->grid->iWeight);
-                    $img->Line($x,$yt,$x,$yb);
-                    $this->hour->grid->Stroke($img,$x,$yb,$x,$img->height-$img->bottom_margin);
-                    //$datestamp += $minint*60
-                    $datestamp = mktime(date('H',$datestamp),date('i',$datestamp)+$minint,0,
-                    date("m",$datestamp),date("d",$datestamp)+1,date("Y",$datestamp));
-
-                }
-            }
-            $img->SetColor($this->hour->iFrameColor);
-            $img->SetLineWeight($this->hour->iFrameWeight);
-            $img->Rectangle($xt,$yt,$xb,$yb);
-            return $yb - $img->top_margin;
-        }
-        return $aYCoord;
-    }
-
-
-    // Stroke the day scale (including gridlines)
-    function StrokeDays($aYCoord,$getHeight=false) {
-        $img=$this->iImg;
-        $daywidth=$this->GetDayWidth();
-        $xt=$img->left_margin+$this->iLabelWidth;
-        $yt=$aYCoord+$img->top_margin;
-        if( $this->day->iShowLabels ) {
-            $img->SetFont($this->day->iFFamily,$this->day->iFStyle,$this->day->iFSize);
-            $yb=$yt + $img->GetFontHeight() + $this->day->iTitleVertMargin + $this->day->iFrameWeight;
-            if( $getHeight ) {
-                return $yb - $img->top_margin;
-            }
-            $xb=$img->width-$img->right_margin+1;
-            $img->SetColor($this->day->iBackgroundColor);
-            $img->FilledRectangle($xt,$yt,$xb,$yb);
-
-            $x = $xt;
-            $img->SetTextAlign("center");
-            $day = date('w',$this->iStartDate);
-            $datestamp = $this->iStartDate;
-
-            $doback = !($this->hour->iShowLabels || $this->minute->iShowLabels);
-
-            setlocale(LC_TIME,$this->iDateLocale->iLocale);
-
-            for($i=0; $i < $this->GetNumberOfDays(); ++$i, $x+=$daywidth, $day += 1,$day %= 7) {
-                if( $day==6 || $day==0 ) {
-                    $img->SetColor($this->day->iWeekendBackgroundColor);
-                    if( $this->iUsePlotWeekendBackground && $doback)
-                        $img->FilledRectangle($x,$yt+$this->day->iFrameWeight,
-                                              $x+$daywidth,$img->height-$img->bottom_margin);
-                    else
-                        $img->FilledRectangle($x,$yt+$this->day->iFrameWeight,
-                    $x+$daywidth,$yb-$this->day->iFrameWeight);
-                }
-
-                $mn = strftime('%m',$datestamp);
-                if( $mn[0]=='0' )
-                    $mn = $mn[1];
-
-                switch( $this->day->iStyle ) {
-                    case DAYSTYLE_LONG:
-                        // "Monday"
-                        $txt = strftime('%A',$datestamp);
-                        break;
-                    case DAYSTYLE_SHORT:
-                        // "Mon"
-                        $txt = strftime('%a',$datestamp);
-                        break;
-                    case DAYSTYLE_SHORTDAYDATE1:
-                        // "Mon 23/6"
-                        $txt = strftime('%a %d/'.$mn,$datestamp);
-                        break;
-                    case DAYSTYLE_SHORTDAYDATE2:
-                        // "Mon 23 Jun"
-                        $txt = strftime('%a %d %b',$datestamp);
-                        break;
-                    case DAYSTYLE_SHORTDAYDATE3:
-                        // "Mon 23 Jun 2003"
-                        $txt = strftime('%a %d %b %Y',$datestamp);
-                        break;
-                    case DAYSTYLE_LONGDAYDATE1:
-                        // "Monday 23 Jun"
-                        $txt = strftime('%A %d %b',$datestamp);
-                        break;
-                    case DAYSTYLE_LONGDAYDATE2:
-                        // "Monday 23 Jun 2003"
-                        $txt = strftime('%A %d %b %Y',$datestamp);
-                        break;
-                    case DAYSTYLE_SHORTDATE1:
-                        // "23/6"
-                        $txt = strftime('%d/'.$mn,$datestamp);
-                        break;
-                    case DAYSTYLE_SHORTDATE2:
-                        // "23 Jun"
-                        $txt = strftime('%d %b',$datestamp);
-                        break;
-                    case DAYSTYLE_SHORTDATE3:
-                        // "Mon 23"
-                        $txt = strftime('%a %d',$datestamp);
-                        break;
-                    case DAYSTYLE_SHORTDATE4:
-                        // "23"
-                        $txt = strftime('%d',$datestamp);
-                        break;
-                    case DAYSTYLE_CUSTOM:
-                        // Custom format
-                        $txt = strftime($this->day->iLabelFormStr,$datestamp);
-                        break;
-                    case DAYSTYLE_ONELETTER:
-                    default:
-                        // "M"
-                        $txt = strftime('%A',$datestamp);
-                        $txt = strtoupper($txt[0]);
-                        break;
-                }
-
-                if( $day==0 )
-                    $img->SetColor($this->day->iSundayTextColor);
-                else
-                    $img->SetColor($this->day->iTextColor);
-                $img->StrokeText(round($x+$daywidth/2+1),
-                round($yb-$this->day->iTitleVertMargin),$txt);
-                $img->SetColor($this->day->grid->iColor);
-                $img->SetLineWeight($this->day->grid->iWeight);
-                $img->Line($x,$yt,$x,$yb);
-                $this->day->grid->Stroke($img,$x,$yb,$x,$img->height-$img->bottom_margin);
-                $datestamp = mktime(0,0,0,date("m",$datestamp),date("d",$datestamp)+1,date("Y",$datestamp));
-                //$datestamp += SECPERDAY;
-
-            }
-            $img->SetColor($this->day->iFrameColor);
-            $img->SetLineWeight($this->day->iFrameWeight);
-            $img->Rectangle($xt,$yt,$xb,$yb);
-            return $yb - $img->top_margin;
-        }
-        return $aYCoord;
-    }
-
-    // Stroke week header and grid
-    function StrokeWeeks($aYCoord,$getHeight=false) {
-        if( $this->week->iShowLabels ) {
-            $img=$this->iImg;
-            $yt=$aYCoord+$img->top_margin;
-            $img->SetFont($this->week->iFFamily,$this->week->iFStyle,$this->week->iFSize);
-            $yb=$yt + $img->GetFontHeight() + $this->week->iTitleVertMargin + $this->week->iFrameWeight;
-
-            if( $getHeight ) {
-                return $yb - $img->top_margin;
-            }
-
-            $xt=$img->left_margin+$this->iLabelWidth;
-            $weekwidth=$this->GetDayWidth()*7;
-            $wdays=$this->iDateLocale->GetDayAbb();
-            $xb=$img->width-$img->right_margin+1;
-            $week = $this->iStartDate;
-            $weeknbr=$this->GetWeekNbr($week);
-            $img->SetColor($this->week->iBackgroundColor);
-            $img->FilledRectangle($xt,$yt,$xb,$yb);
-            $img->SetColor($this->week->grid->iColor);
-            $x = $xt;
-            if( $this->week->iStyle==WEEKSTYLE_WNBR ) {
-                $img->SetTextAlign("center");
-                $txtOffset = $weekwidth/2+1;
-            }
-            elseif( $this->week->iStyle==WEEKSTYLE_FIRSTDAY  ||
-                    $this->week->iStyle==WEEKSTYLE_FIRSTDAY2 ||
-                    $this->week->iStyle==WEEKSTYLE_FIRSTDAYWNBR ||
-                    $this->week->iStyle==WEEKSTYLE_FIRSTDAY2WNBR ) {
-                $img->SetTextAlign("left");
-                $txtOffset = 3;
-            }
-            else {
-                JpGraphError::RaiseL(6021);
-                //("Unknown formatting style for week.");
-            }
-
-            for($i=0; $i<$this->GetNumberOfDays()/7; ++$i, $x+=$weekwidth) {
-                $img->PushColor($this->week->iTextColor);
-
-                if( $this->week->iStyle==WEEKSTYLE_WNBR )
-                    $txt = sprintf($this->week->iLabelFormStr,$weeknbr);
-                elseif( $this->week->iStyle==WEEKSTYLE_FIRSTDAY ||
-                        $this->week->iStyle==WEEKSTYLE_FIRSTDAYWNBR )
-                    $txt = date("j/n",$week);
-                elseif( $this->week->iStyle==WEEKSTYLE_FIRSTDAY2 ||
-                        $this->week->iStyle==WEEKSTYLE_FIRSTDAY2WNBR ) {
-                    $monthnbr = date("n",$week)-1;
-                    $shortmonth = $this->iDateLocale->GetShortMonthName($monthnbr);
-                    $txt = Date("j",$week)." ".$shortmonth;
-                }
-
-                if( $this->week->iStyle==WEEKSTYLE_FIRSTDAYWNBR ||
-                $this->week->iStyle==WEEKSTYLE_FIRSTDAY2WNBR ) {
-                    $w = sprintf($this->week->iLabelFormStr,$weeknbr);
-                    $txt .= ' '.$w;
-                }
-
-                $img->StrokeText(round($x+$txtOffset),
-                round($yb-$this->week->iTitleVertMargin),$txt);
-
-                $week = strtotime('+7 day',$week);
-                $weeknbr = $this->GetWeekNbr($week);
-                $img->PopColor();
-                $img->SetLineWeight($this->week->grid->iWeight);
-                $img->Line($x,$yt,$x,$yb);
-                $this->week->grid->Stroke($img,$x,$yb,$x,$img->height-$img->bottom_margin);
-            }
-            $img->SetColor($this->week->iFrameColor);
-            $img->SetLineWeight($this->week->iFrameWeight);
-            $img->Rectangle($xt,$yt,$xb,$yb);
-            return $yb-$img->top_margin;
-        }
-        return $aYCoord;
-    }
-
-    // Format the mont scale header string
-    function GetMonthLabel($aMonthNbr,$year) {
-        $sn = $this->iDateLocale->GetShortMonthName($aMonthNbr);
-        $ln = $this->iDateLocale->GetLongMonthName($aMonthNbr);
-        switch($this->month->iStyle) {
-            case MONTHSTYLE_SHORTNAME:
-                $m=$sn;
-                break;
-            case MONTHSTYLE_LONGNAME:
-                $m=$ln;
-                break;
-            case MONTHSTYLE_SHORTNAMEYEAR2:
-                $m=$sn." '".substr("".$year,2);
-                break;
-            case MONTHSTYLE_SHORTNAMEYEAR4:
-                $m=$sn." ".$year;
-                break;
-            case MONTHSTYLE_LONGNAMEYEAR2:
-                $m=$ln." '".substr("".$year,2);
-                break;
-            case MONTHSTYLE_LONGNAMEYEAR4:
-                $m=$ln." ".$year;
-                break;
-            case MONTHSTYLE_FIRSTLETTER:
-                $m=$sn[0];
-                break;
-        }
-        return $m;
-    }
-
-    // Stroke month scale and gridlines
-    function StrokeMonths($aYCoord,$getHeight=false) {
-        if( $this->month->iShowLabels ) {
-            $img=$this->iImg;
-            $img->SetFont($this->month->iFFamily,$this->month->iFStyle,$this->month->iFSize);
-            $yt=$aYCoord+$img->top_margin;
-            $yb=$yt + $img->GetFontHeight() + $this->month->iTitleVertMargin + $this->month->iFrameWeight;
-            if( $getHeight ) {
-                return $yb - $img->top_margin;
-            }
-            $monthnbr = $this->GetMonthNbr($this->iStartDate)-1;
-            $xt=$img->left_margin+$this->iLabelWidth;
-            $xb=$img->width-$img->right_margin+1;
-
-            $img->SetColor($this->month->iBackgroundColor);
-            $img->FilledRectangle($xt,$yt,$xb,$yb);
-
-            $img->SetLineWeight($this->month->grid->iWeight);
-            $img->SetColor($this->month->iTextColor);
-            $year = 0+strftime("%Y",$this->iStartDate);
-            $img->SetTextAlign("center");
-            if( $this->GetMonthNbr($this->iStartDate) == $this->GetMonthNbr($this->iEndDate)
-                && $this->GetYear($this->iStartDate)==$this->GetYear($this->iEndDate) ) {
-                $monthwidth=$this->GetDayWidth()*($this->GetMonthDayNbr($this->iEndDate) - $this->GetMonthDayNbr($this->iStartDate) + 1);
-            }
-            else {
-                $monthwidth=$this->GetDayWidth()*($this->GetNumDaysInMonth($monthnbr,$year)-$this->GetMonthDayNbr($this->iStartDate)+1);
-            }
-            // Is it enough space to stroke the first month?
-            $monthName = $this->GetMonthLabel($monthnbr,$year);
-            if( $monthwidth >= 1.2*$img->GetTextWidth($monthName) ) {
-                $img->SetColor($this->month->iTextColor);
-                $img->StrokeText(round($xt+$monthwidth/2+1),
-                round($yb-$this->month->iTitleVertMargin),
-                $monthName);
-            }
-            $x = $xt + $monthwidth;
-            while( $x < $xb ) {
-                $img->SetColor($this->month->grid->iColor);
-                $img->Line($x,$yt,$x,$yb);
-                $this->month->grid->Stroke($img,$x,$yb,$x,$img->height-$img->bottom_margin);
-                $monthnbr++;
-                if( $monthnbr==12 ) {
-                    $monthnbr=0;
-                    $year++;
-                }
-                $monthName = $this->GetMonthLabel($monthnbr,$year);
-                $monthwidth=$this->GetDayWidth()*$this->GetNumDaysInMonth($monthnbr,$year);
-                if( $x + $monthwidth < $xb )
-                    $w = $monthwidth;
-                else
-                    $w = $xb-$x;
-                if( $w >= 1.2*$img->GetTextWidth($monthName) ) {
-                    $img->SetColor($this->month->iTextColor);
-                    $img->StrokeText(round($x+$w/2+1),
-                    round($yb-$this->month->iTitleVertMargin),$monthName);
-                }
-                $x += $monthwidth;
-            }
-            $img->SetColor($this->month->iFrameColor);
-            $img->SetLineWeight($this->month->iFrameWeight);
-            $img->Rectangle($xt,$yt,$xb,$yb);
-            return $yb-$img->top_margin;
-        }
-        return $aYCoord;
-    }
-
-    // Stroke year scale and gridlines
-    function StrokeYears($aYCoord,$getHeight=false) {
-        if( $this->year->iShowLabels ) {
-            $img=$this->iImg;
-            $yt=$aYCoord+$img->top_margin;
-            $img->SetFont($this->year->iFFamily,$this->year->iFStyle,$this->year->iFSize);
-            $yb=$yt + $img->GetFontHeight() + $this->year->iTitleVertMargin + $this->year->iFrameWeight;
-
-            if( $getHeight ) {
-                return $yb - $img->top_margin;
-            }
-
-            $xb=$img->width-$img->right_margin+1;
-            $xt=$img->left_margin+$this->iLabelWidth;
-            $year = $this->GetYear($this->iStartDate);
-            $img->SetColor($this->year->iBackgroundColor);
-            $img->FilledRectangle($xt,$yt,$xb,$yb);
-            $img->SetLineWeight($this->year->grid->iWeight);
-            $img->SetTextAlign("center");
-            if( $year == $this->GetYear($this->iEndDate) )
-                $yearwidth=$this->GetDayWidth()*($this->GetYearDayNbr($this->iEndDate)-$this->GetYearDayNbr($this->iStartDate)+1);
-            else
-                $yearwidth=$this->GetDayWidth()*($this->GetNumDaysInYear($year)-$this->GetYearDayNbr($this->iStartDate)+1);
-
-            // The space for a year must be at least 20% bigger than the actual text
-            // so we allow 10% margin on each side
-            if( $yearwidth >= 1.20*$img->GetTextWidth("".$year) ) {
-                $img->SetColor($this->year->iTextColor);
-                $img->StrokeText(round($xt+$yearwidth/2+1),
-                                 round($yb-$this->year->iTitleVertMargin),
-                                 $year);
-            }
-            $x = $xt + $yearwidth;
-            while( $x < $xb ) {
-                $img->SetColor($this->year->grid->iColor);
-                $img->Line($x,$yt,$x,$yb);
-                $this->year->grid->Stroke($img,$x,$yb,$x,$img->height-$img->bottom_margin);
-                $year += 1;
-                $yearwidth=$this->GetDayWidth()*$this->GetNumDaysInYear($year);
-                if( $x + $yearwidth < $xb )
-                    $w = $yearwidth;
-                else
-                    $w = $xb-$x;
-                if( $w >= 1.2*$img->GetTextWidth("".$year) ) {
-                    $img->SetColor($this->year->iTextColor);
-                    $img->StrokeText(round($x+$w/2+1),
-                                     round($yb-$this->year->iTitleVertMargin),
-                                     $year);
-                }
-                $x += $yearwidth;
-            }
-            $img->SetColor($this->year->iFrameColor);
-            $img->SetLineWeight($this->year->iFrameWeight);
-            $img->Rectangle($xt,$yt,$xb,$yb);
-            return $yb-$img->top_margin;
-        }
-        return $aYCoord;
-    }
-
-    // Stroke table title (upper left corner)
-    function StrokeTableHeaders($aYBottom) {
-        $img=$this->iImg;
-        $xt=$img->left_margin;
-        $yt=$img->top_margin;
-        $xb=$xt+$this->iLabelWidth;
-        $yb=$aYBottom+$img->top_margin;
-
-        if( $this->tableTitle->iShow ) {
-            $img->SetColor($this->iTableHeaderBackgroundColor);
-            $img->FilledRectangle($xt,$yt,$xb,$yb);
-            $this->tableTitle->Align("center","top");
-            $this->tableTitle->Stroke($img,$xt+($xb-$xt)/2+1,$yt+2);
-            $img->SetColor($this->iTableHeaderFrameColor);
-            $img->SetLineWeight($this->iTableHeaderFrameWeight);
-            $img->Rectangle($xt,$yt,$xb,$yb);
-        }
-
-        $this->actinfo->Stroke($img,$xt,$yt,$xb,$yb,$this->tableTitle->iShow);
-
-
-        // Draw the horizontal dividing line
-        $this->dividerh->Stroke($img,$xt,$yb,$img->width-$img->right_margin,$yb);
-
-        // Draw the vertical dividing line
-        // We do the width "manually" since we want the line only to grow
-        // to the left
-        $fancy = $this->divider->iStyle == 'fancy' ;
-        if( $fancy ) {
-            $this->divider->iStyle = 'solid';
-        }
-
-        $tmp = $this->divider->iWeight;
-        $this->divider->iWeight=1;
-        $y = $img->height-$img->bottom_margin;
-        for($i=0; $i < $tmp; ++$i ) {
-            $this->divider->Stroke($img,$xb-$i,$yt,$xb-$i,$y);
-        }
-
-        // Should we draw "fancy" divider
-        if( $fancy ) {
-            $img->SetLineWeight(1);
-            $img->SetColor($this->iTableHeaderFrameColor);
-            $img->Line($xb,$yt,$xb,$y);
-            $img->Line($xb-$tmp+1,$yt,$xb-$tmp+1,$y);
-            $img->SetColor('white');
-            $img->Line($xb-$tmp+2,$yt,$xb-$tmp+2,$y);
-        }
-    }
-
-    // Main entry point to stroke scale
-    function Stroke() {
-        if( !$this->IsRangeSet() ) {
-        	JpGraphError::RaiseL(6022);
-        	//("Gantt scale has not been specified.");
-        }
-        $img=$this->iImg;
-
-        // If minutes are displayed then hour interval must be 1
-        if( $this->IsDisplayMinute() && $this->hour->GetIntervall() > 1 ) {
-            JpGraphError::RaiseL(6023);
-            //('If you display both hour and minutes the hour intervall must be 1 (Otherwise it doesn\' make sense to display minutes).');
-        }
-
-        // Stroke all headers. As argument we supply the offset from the
-        // top which depends on any previous headers
-
-        // First find out the height of each header
-        $offy=$this->StrokeYears(0,true);
-        $offm=$this->StrokeMonths($offy,true);
-        $offw=$this->StrokeWeeks($offm,true);
-        $offd=$this->StrokeDays($offw,true);
-        $offh=$this->StrokeHours($offd,true);
-        $offmin=$this->StrokeMinutes($offh,true);
-
-
-        // ... then we can stroke them in the "backwards order to ensure that
-        // the larger scale gridlines is stroked over the smaller scale gridline
-        $this->StrokeMinutes($offh);
-        $this->StrokeHours($offd);
-        $this->StrokeDays($offw);
-        $this->StrokeWeeks($offm);
-        $this->StrokeMonths($offy);
-        $this->StrokeYears(0);
-
-        // Now when we now the oaverall size of the scale headers
-        // we can stroke the overall table headers
-        $this->StrokeTableHeaders($offmin);
-
-        // Now we can calculate the correct scaling factor for each vertical position
-        $this->iAvailableHeight = $img->height - $img->top_margin - $img->bottom_margin - $offd;
-
-        $this->iVertHeaderSize = $offmin;
-        if( $this->iVertSpacing == -1 )
-        	$this->iVertSpacing = $this->iAvailableHeight / $this->iVertLines;
-    }
-}
-
-
-//===================================================
-// CLASS GanttConstraint
-// Just a structure to store all the values for a constraint
-//===================================================
-class GanttConstraint {
-    public $iConstrainRow;
-    public $iConstrainType;
-    public $iConstrainColor;
-    public $iConstrainArrowSize;
-    public $iConstrainArrowType;
-
-    //---------------
-    // CONSTRUCTOR
-    function __construct($aRow,$aType,$aColor,$aArrowSize,$aArrowType){
-        $this->iConstrainType = $aType;
-        $this->iConstrainRow = $aRow;
-        $this->iConstrainColor=$aColor;
-        $this->iConstrainArrowSize=$aArrowSize;
-        $this->iConstrainArrowType=$aArrowType;
-    }
-}
-
-
-//===================================================
-// CLASS GanttPlotObject
-// The common signature for a Gantt object
-//===================================================
-class GanttPlotObject {
-    public $title,$caption;
-    public $csimarea='',$csimtarget='',$csimwintarget='',$csimalt='';
-    public $constraints = array();
-    public $iCaptionMargin=5;
-    public $iConstrainPos=array();
-    protected $iStart="";    // Start date
-    public $iVPos=0;     // Vertical position
-    protected $iLabelLeftMargin=2; // Title margin
-
-    function __construct() {
-        $this->title = new TextProperty();
-        $this->title->Align('left','center');
-        $this->caption = new TextProperty();
-    }
-
-    function GetCSIMArea() {
-        return $this->csimarea;
-    }
-
-    function SetCSIMTarget($aTarget,$aAlt='',$aWinTarget='') {
-        if( !is_string($aTarget) ) {
-            $tv = substr(var_export($aTarget,true),0,40);
-            JpGraphError::RaiseL(6024,$tv);
-            //('CSIM Target must be specified as a string.'."\nStart of target is:\n$tv");
-        }
-        if( !is_string($aAlt) ) {
-            $tv = substr(var_export($aAlt,true),0,40);
-            JpGraphError::RaiseL(6025,$tv);
-            //('CSIM Alt text must be specified as a string.'."\nStart of alt text is:\n$tv");
-        }
-
-        $this->csimtarget=$aTarget;
-        $this->csimwintarget=$aWinTarget;
-        $this->csimalt=$aAlt;
-    }
-
-    function SetCSIMAlt($aAlt) {
-        if( !is_string($aAlt) ) {
-            $tv = substr(var_export($aAlt,true),0,40);
-            JpGraphError::RaiseL(6025,$tv);
-            //('CSIM Alt text must be specified as a string.'."\nStart of alt text is:\n$tv");
-        }
-        $this->csimalt=$aAlt;
-    }
-
-    function SetConstrain($aRow,$aType,$aColor='black',$aArrowSize=ARROW_S2,$aArrowType=ARROWT_SOLID) {
-        $this->constraints[] = new GanttConstraint($aRow, $aType, $aColor, $aArrowSize, $aArrowType);
-    }
-
-    function SetConstrainPos($xt,$yt,$xb,$yb) {
-        $this->iConstrainPos = array($xt,$yt,$xb,$yb);
-    }
-
-    function GetMinDate() {
-        return $this->iStart;
-    }
-
-    function GetMaxDate() {
-        return $this->iStart;
-    }
-
-    function SetCaptionMargin($aMarg) {
-        $this->iCaptionMargin=$aMarg;
-    }
-
-    function GetAbsHeight($aImg) {
-        return 0;
-    }
-
-    function GetLineNbr() {
-        return $this->iVPos;
-    }
-
-    function SetLabelLeftMargin($aOff) {
-        $this->iLabelLeftMargin=$aOff;
-    }
-
-    function StrokeActInfo($aImg,$aScale,$aYPos) {
-        $cols=array();
-        $aScale->actinfo->GetColStart($aImg,$cols,true);
-        $this->title->Stroke($aImg,$cols,$aYPos);
-    }
-}
-
-//===================================================
-// CLASS Progress
-// Holds parameters for the progress indicator
-// displyed within a bar
-//===================================================
-class Progress {
-    public $iProgress=-1;
-    public $iPattern=GANTT_SOLID;
-    public $iColor="black", $iFillColor='black';
-    public $iDensity=98, $iHeight=0.65;
-
-    function Set($aProg) {
-        if( $aProg < 0.0 || $aProg > 1.0 ) {
-        	JpGraphError::RaiseL(6027);
-        	//("Progress value must in range [0, 1]");
-        }
-        $this->iProgress = $aProg;
-    }
-
-    function SetPattern($aPattern,$aColor="blue",$aDensity=98) {
-        $this->iPattern = $aPattern;
-        $this->iColor = $aColor;
-        $this->iDensity = $aDensity;
-    }
-
-    function SetFillColor($aColor) {
-        $this->iFillColor = $aColor;
-    }
-
-    function SetHeight($aHeight) {
-        $this->iHeight = $aHeight;
-    }
-}
-
-define('GANTT_HGRID1',0);
-define('GANTT_HGRID2',1);
-
-//===================================================
-// CLASS HorizontalGridLine
-// Responsible for drawinf horizontal gridlines and filled alternatibg rows
-//===================================================
-class HorizontalGridLine {
-    private $iGraph=NULL;
-    private $iRowColor1 = '', $iRowColor2 = '';
-    private $iShow=false;
-    private $line=null;
-    private $iStart=0; // 0=from left margin, 1=just along header
-
-    function __construct() {
-        $this->line = new LineProperty();
-        $this->line->SetColor('gray@0.4');
-        $this->line->SetStyle('dashed');
-    }
-
-    function Show($aShow=true) {
-        $this->iShow = $aShow;
-    }
-
-    function SetRowFillColor($aColor1,$aColor2='') {
-        $this->iRowColor1 = $aColor1;
-        $this->iRowColor2 = $aColor2;
-    }
-
-    function SetStart($aStart) {
-        $this->iStart = $aStart;
-    }
-
-    function Stroke($aImg,$aScale) {
-
-        if( ! $this->iShow ) return;
-
-        // Get horizontal width of line
-        /*
-        $limst = $aScale->iStartDate;
-        $limen = $aScale->iEndDate;
-        $xt = round($aScale->TranslateDate($aScale->iStartDate));
-        $xb = round($aScale->TranslateDate($limen));
-        */
-
-        if( $this->iStart === 0 ) {
-            $xt = $aImg->left_margin-1;
-        }
-        else {
-            $xt = round($aScale->TranslateDate($aScale->iStartDate))+1;
-        }
-
-        $xb = $aImg->width-$aImg->right_margin;
-
-        $yt = round($aScale->TranslateVertPos(0));
-        $yb = round($aScale->TranslateVertPos(1));
-        $height = $yb - $yt;
-
-        // Loop around for all lines in the chart
-        for($i=0; $i < $aScale->iVertLines; ++$i ) {
-            $yb = $yt - $height;
-            $this->line->Stroke($aImg,$xt,$yb,$xb,$yb);
-            if( $this->iRowColor1 !== '' ) {
-                if( $i % 2 == 0 ) {
-                    $aImg->PushColor($this->iRowColor1);
-                    $aImg->FilledRectangle($xt,$yt,$xb,$yb);
-                    $aImg->PopColor();
-                }
-                elseif( $this->iRowColor2 !== '' ) {
-                    $aImg->PushColor($this->iRowColor2);
-                    $aImg->FilledRectangle($xt,$yt,$xb,$yb);
-                    $aImg->PopColor();
-                }
-            }
-            $yt = round($aScale->TranslateVertPos($i+1));
-        }
-        $yb = $yt - $height;
-        $this->line->Stroke($aImg,$xt,$yb,$xb,$yb);
-    }
-}
-
-
-//===================================================
-// CLASS GanttBar
-// Responsible for formatting individual gantt bars
-//===================================================
-class GanttBar extends GanttPlotObject {
-    public $progress;
-    public $leftMark,$rightMark;
-    private $iEnd;
-    private $iHeightFactor=0.5;
-    private $iFillColor="white",$iFrameColor="black";
-    private $iShadow=false,$iShadowColor="darkgray",$iShadowWidth=1,$iShadowFrame="black";
-    private $iPattern=GANTT_RDIAG,$iPatternColor="blue",$iPatternDensity=95;
-    private $iBreakStyle=false, $iBreakLineStyle='dotted',$iBreakLineWeight=1;
-    //---------------
-    // CONSTRUCTOR
-    function __construct($aPos,$aLabel,$aStart,$aEnd,$aCaption="",$aHeightFactor=0.6) {
-        parent::__construct();
-        $this->iStart = $aStart;
-        // Is the end date given as a date or as number of days added to start date?
-        if( is_string($aEnd) ) {
-            // If end date has been specified without a time we will asssume
-            // end date is at the end of that date
-            if( strpos($aEnd,':') === false ) {
-            	$this->iEnd = strtotime($aEnd)+SECPERDAY-1;
-            }
-            else {
-            	$this->iEnd = $aEnd;
-            }
-        }
-        elseif(is_int($aEnd) || is_float($aEnd) ) {
-        	$this->iEnd = strtotime($aStart)+round($aEnd*SECPERDAY);
-        }
-        $this->iVPos = $aPos;
-        $this->iHeightFactor = $aHeightFactor;
-        $this->title->Set($aLabel);
-        $this->caption = new TextProperty($aCaption);
-        $this->caption->Align("left","center");
-        $this->leftMark =new PlotMark();
-        $this->leftMark->Hide();
-        $this->rightMark=new PlotMark();
-        $this->rightMark->Hide();
-        $this->progress = new Progress();
-    }
-
-    //---------------
-    // PUBLIC METHODS
-    function SetShadow($aShadow=true,$aColor="gray") {
-        $this->iShadow=$aShadow;
-        $this->iShadowColor=$aColor;
-    }
-
-    function SetBreakStyle($aFlg=true,$aLineStyle='dotted',$aLineWeight=1) {
-    	$this->iBreakStyle = $aFlg;
-    	$this->iBreakLineStyle = $aLineStyle;
-    	$this->iBreakLineWeight = $aLineWeight;
-    }
-
-    function GetMaxDate() {
-        return $this->iEnd;
-    }
-
-    function SetHeight($aHeight) {
-        $this->iHeightFactor = $aHeight;
-    }
-
-    function SetColor($aColor) {
-        $this->iFrameColor = $aColor;
-    }
-
-    function SetFillColor($aColor) {
-        $this->iFillColor = $aColor;
-    }
-
-    function GetAbsHeight($aImg) {
-        if( is_int($this->iHeightFactor) || $this->leftMark->show || $this->rightMark->show ) {
-            $m=-1;
-            if( is_int($this->iHeightFactor) )
-            	$m = $this->iHeightFactor;
-            if( $this->leftMark->show )
-            	$m = max($m,$this->leftMark->width*2);
-            if( $this->rightMark->show )
-            	$m = max($m,$this->rightMark->width*2);
-            return $m;
-        }
-        else
-        	return -1;
-    }
-
-    function SetPattern($aPattern,$aColor="blue",$aDensity=95) {
-        $this->iPattern = $aPattern;
-        $this->iPatternColor = $aColor;
-        $this->iPatternDensity = $aDensity;
-    }
-
-    function Stroke($aImg,$aScale) {
-        $factory = new RectPatternFactory();
-        $prect = $factory->Create($this->iPattern,$this->iPatternColor);
-        $prect->SetDensity($this->iPatternDensity);
-
-        // If height factor is specified as a float between 0,1 then we take it as meaning
-        // percetage of the scale width between horizontal line.
-        // If it is an integer > 1 we take it to mean the absolute height in pixels
-        if( $this->iHeightFactor > -0.0 && $this->iHeightFactor <= 1.1)
-        	$vs = $aScale->GetVertSpacing()*$this->iHeightFactor;
-        elseif(is_int($this->iHeightFactor) && $this->iHeightFactor>2 && $this->iHeightFactor < 200 )
-        	$vs = $this->iHeightFactor;
-        else {
-        	JpGraphError::RaiseL(6028,$this->iHeightFactor);
-        	//	("Specified height (".$this->iHeightFactor.") for gantt bar is out of range.");
-        }
-
-        // Clip date to min max dates to show
-        $st = $aScale->NormalizeDate($this->iStart);
-        $en = $aScale->NormalizeDate($this->iEnd);
-
-        $limst = max($st,$aScale->iStartDate);
-        $limen = min($en,$aScale->iEndDate);
-
-        $xt = round($aScale->TranslateDate($limst));
-        $xb = round($aScale->TranslateDate($limen));
-        $yt = round($aScale->TranslateVertPos($this->iVPos)-$vs-($aScale->GetVertSpacing()/2-$vs/2));
-        $yb = round($aScale->TranslateVertPos($this->iVPos)-($aScale->GetVertSpacing()/2-$vs/2));
-        $middle = round($yt+($yb-$yt)/2);
-        $this->StrokeActInfo($aImg,$aScale,$middle);
-
-        // CSIM for title
-        if( ! empty($this->title->csimtarget) ) {
-            $colwidth = $this->title->GetColWidth($aImg);
-            $colstarts=array();
-            $aScale->actinfo->GetColStart($aImg,$colstarts,true);
-            $n = min(count($colwidth),count($this->title->csimtarget));
-            for( $i=0; $i < $n; ++$i ) {
-                $title_xt = $colstarts[$i];
-                $title_xb = $title_xt + $colwidth[$i];
-                $coords = "$title_xt,$yt,$title_xb,$yt,$title_xb,$yb,$title_xt,$yb";
-
-                if( ! empty($this->title->csimtarget[$i]) ) {
-                    $this->csimarea .= "<area shape=\"poly\" coords=\"$coords\" href=\"".$this->title->csimtarget[$i]."\"";
-
-                    if( ! empty($this->title->csimwintarget[$i]) ) {
-                        $this->csimarea .= "target=\"".$this->title->csimwintarget[$i]."\" ";
-                    }
-
-                    if( ! empty($this->title->csimalt[$i]) ) {
-                        $tmp = $this->title->csimalt[$i];
-                        $this->csimarea .= " title=\"$tmp\" alt=\"$tmp\" ";
-                    }
-                    $this->csimarea .= " />\n";
-                }
-            }
-        }
-
-        // Check if the bar is totally outside the current scale range
-        if( $en <  $aScale->iStartDate || $st > $aScale->iEndDate )
-        	return;
-
-
-        // Remember the positions for the bar
-        $this->SetConstrainPos($xt,$yt,$xb,$yb);
-
-
-
-        $prect->ShowFrame(false);
-        $prect->SetBackground($this->iFillColor);
-        if( $this->iBreakStyle ) {
-        	$aImg->SetColor($this->iFrameColor);
-        	$olds = $aImg->SetLineStyle($this->iBreakLineStyle);
-        	$oldw = $aImg->SetLineWeight($this->iBreakLineWeight);
-        	$aImg->StyleLine($xt,$yt,$xb,$yt);
-        	$aImg->StyleLine($xt,$yb,$xb,$yb);
-        	$aImg->SetLineStyle($olds);
-        	$aImg->SetLineWeight($oldw);
-        }
-        else {
-	        if( $this->iShadow ) {
-	            $aImg->SetColor($this->iFrameColor);
-	            $aImg->ShadowRectangle($xt,$yt,$xb,$yb,$this->iFillColor,$this->iShadowWidth,$this->iShadowColor);
-	            $prect->SetPos(new Rectangle($xt+1,$yt+1,$xb-$xt-$this->iShadowWidth-2,$yb-$yt-$this->iShadowWidth-2));
-	            $prect->Stroke($aImg);
-	        }
-	        else {
-	            $prect->SetPos(new Rectangle($xt,$yt,$xb-$xt+1,$yb-$yt+1));
-	            $prect->Stroke($aImg);
-	            $aImg->SetColor($this->iFrameColor);
-	            $aImg->Rectangle($xt,$yt,$xb,$yb);
-	        }
-        }
-        // CSIM for bar
-        if( ! empty($this->csimtarget) ) {
-
-            $coords = "$xt,$yt,$xb,$yt,$xb,$yb,$xt,$yb";
-            $this->csimarea .= "<area shape=\"poly\" coords=\"$coords\" href=\"".$this->csimtarget."\"";
-
-            if( !empty($this->csimwintarget) ) {
-                $this->csimarea .= " target=\"".$this->csimwintarget."\" ";
-            }
-
-            if( $this->csimalt != '' ) {
-                $tmp = $this->csimalt;
-                $this->csimarea .= " title=\"$tmp\" alt=\"$tmp\" ";
-            }
-            $this->csimarea .= " />\n";
-        }
-
-        // Draw progress bar inside activity bar
-        if( $this->progress->iProgress > 0 ) {
-
-            $xtp = $aScale->TranslateDate($st);
-            $xbp = $aScale->TranslateDate($en);
-            $len = ($xbp-$xtp)*$this->progress->iProgress;
-
-            $endpos = $xtp+$len;
-            if( $endpos > $xt ) {
-
-                // Take away the length of the progress that is not visible (before the start date)
-                $len -= ($xt-$xtp);
-
-                // Is the the progress bar visible after the start date?
-                if( $xtp < $xt )
-                $xtp = $xt;
-
-                // Make sure that the progess bar doesn't extend over the end date
-                if( $xtp+$len-1 > $xb )
-                $len = $xb - $xtp ;
-
-                $prog = $factory->Create($this->progress->iPattern,$this->progress->iColor);
-                $prog->SetDensity($this->progress->iDensity);
-                $prog->SetBackground($this->progress->iFillColor);
-                $barheight = ($yb-$yt+1);
-                if( $this->iShadow )
-                	$barheight -= $this->iShadowWidth;
-                $progressheight = floor($barheight*$this->progress->iHeight);
-                $marg = ceil(($barheight-$progressheight)/2);
-                $pos = new Rectangle($xtp,$yt + $marg, $len,$barheight-2*$marg);
-                $prog->SetPos($pos);
-                $prog->Stroke($aImg);
-            }
-        }
-
-        // We don't plot the end mark if the bar has been capped
-        if( $limst == $st ) {
-            $y = $middle;
-            // We treat the RIGHT and LEFT triangle mark a little bi
-            // special so that these marks are placed right under the
-            // bar.
-            if( $this->leftMark->GetType() == MARK_LEFTTRIANGLE ) {
-                $y = $yb ;
-            }
-            $this->leftMark->Stroke($aImg,$xt,$y);
-        }
-        if( $limen == $en ) {
-            $y = $middle;
-            // We treat the RIGHT and LEFT triangle mark a little bi
-            // special so that these marks are placed right under the
-            // bar.
-            if( $this->rightMark->GetType() == MARK_RIGHTTRIANGLE ) {
-                $y = $yb ;
-            }
-            $this->rightMark->Stroke($aImg,$xb,$y);
-
-            $margin = $this->iCaptionMargin;
-            if( $this->rightMark->show )
-            	$margin += $this->rightMark->GetWidth();
-            $this->caption->Stroke($aImg,$xb+$margin,$middle);
-        }
-    }
-}
-
-//===================================================
-// CLASS MileStone
-// Responsible for formatting individual milestones
-//===================================================
-class MileStone extends GanttPlotObject {
-    public $mark;
-
-    //---------------
-    // CONSTRUCTOR
-    function __construct($aVPos,$aLabel,$aDate,$aCaption="") {
-        GanttPlotObject::__construct();
-        $this->caption->Set($aCaption);
-        $this->caption->Align("left","center");
-        $this->caption->SetFont(FF_FONT1,FS_BOLD);
-        $this->title->Set($aLabel);
-        $this->title->SetColor("darkred");
-        $this->mark = new PlotMark();
-        $this->mark->SetWidth(10);
-        $this->mark->SetType(MARK_DIAMOND);
-        $this->mark->SetColor("darkred");
-        $this->mark->SetFillColor("darkred");
-        $this->iVPos = $aVPos;
-        $this->iStart = $aDate;
-    }
-
-    //---------------
-    // PUBLIC METHODS
-
-    function GetAbsHeight($aImg) {
-        return max($this->title->GetHeight($aImg),$this->mark->GetWidth());
-    }
-
-    function Stroke($aImg,$aScale) {
-        // Put the mark in the middle at the middle of the day
-        $d = $aScale->NormalizeDate($this->iStart)+SECPERDAY/2;
-        $x = $aScale->TranslateDate($d);
-        $y = $aScale->TranslateVertPos($this->iVPos)-($aScale->GetVertSpacing()/2);
-
-        $this->StrokeActInfo($aImg,$aScale,$y);
-
-        // CSIM for title
-        if( ! empty($this->title->csimtarget) ) {
-
-            $yt = round($y - $this->title->GetHeight($aImg)/2);
-            $yb = round($y + $this->title->GetHeight($aImg)/2);
-
-            $colwidth = $this->title->GetColWidth($aImg);
-            $colstarts=array();
-            $aScale->actinfo->GetColStart($aImg,$colstarts,true);
-            $n = min(count($colwidth),count($this->title->csimtarget));
-            for( $i=0; $i < $n; ++$i ) {
-                $title_xt = $colstarts[$i];
-                $title_xb = $title_xt + $colwidth[$i];
-                $coords = "$title_xt,$yt,$title_xb,$yt,$title_xb,$yb,$title_xt,$yb";
-
-                if( !empty($this->title->csimtarget[$i]) ) {
-
-                    $this->csimarea .= "<area shape=\"poly\" coords=\"$coords\" href=\"".$this->title->csimtarget[$i]."\"";
-
-                    if( !empty($this->title->csimwintarget[$i]) ) {
-                        $this->csimarea .= "target=\"".$this->title->csimwintarget[$i]."\"";
-                    }
-
-                    if( ! empty($this->title->csimalt[$i]) ) {
-                        $tmp = $this->title->csimalt[$i];
-                        $this->csimarea .= " title=\"$tmp\" alt=\"$tmp\" ";
-                    }
-                    $this->csimarea .= " />\n";
-                }
-            }
-        }
-
-        if( $d <  $aScale->iStartDate || $d > $aScale->iEndDate )
-        	return;
-
-        // Remember the coordinates for any constrains linking to
-        // this milestone
-        $w = $this->mark->GetWidth()/2;
-        $this->SetConstrainPos($x,round($y-$w),$x,round($y+$w));
-
-        // Setup CSIM
-        if( $this->csimtarget != '' ) {
-            $this->mark->SetCSIMTarget( $this->csimtarget );
-            $this->mark->SetCSIMAlt( $this->csimalt );
-        }
-
-        $this->mark->Stroke($aImg,$x,$y);
-        $this->caption->Stroke($aImg,$x+$this->mark->width/2+$this->iCaptionMargin,$y);
-
-        $this->csimarea .= $this->mark->GetCSIMAreas();
-    }
-}
-
-
-//===================================================
-// CLASS GanttVLine
-// Responsible for formatting individual milestones
-//===================================================
-
-class TextPropertyBelow extends TextProperty {
-    function __construct($aTxt='') {
-        parent::__construct($aTxt);
-    }
-
-    function GetColWidth($aImg,$aMargin=0) {
-        // Since we are not stroking the title in the columns
-        // but rather under the graph we want this to return 0.
-        return array(0);
-    }
-}
-
-class GanttVLine extends GanttPlotObject {
-
-    private $iLine,$title_margin=3, $iDayOffset=0.5;
-    private $iStartRow = -1, $iEndRow = -1;
-
-    //---------------
-    // CONSTRUCTOR
-    function __construct($aDate,$aTitle="",$aColor="darkred",$aWeight=2,$aStyle="solid") {
-        GanttPlotObject::__construct();
-        $this->iLine = new LineProperty();
-        $this->iLine->SetColor($aColor);
-        $this->iLine->SetWeight($aWeight);
-        $this->iLine->SetStyle($aStyle);
-        $this->iStart = $aDate;
-        $this->title = new TextPropertyBelow();
-        $this->title->Set($aTitle);
-    }
-
-    //---------------
-    // PUBLIC METHODS
-
-    // Set start and end rows for the VLine. By default the entire heigh of the
-    // Gantt chart is used
-    function SetRowSpan($aStart, $aEnd=-1) {
-        $this->iStartRow = $aStart;
-        $this->iEndRow = $aEnd;
-    }
-
-    function SetDayOffset($aOff=0.5) {
-        if( $aOff < 0.0 || $aOff > 1.0 ) {
-        	JpGraphError::RaiseL(6029);
-        	//("Offset for vertical line must be in range [0,1]");
-        }
-        $this->iDayOffset = $aOff;
-    }
-
-    function SetTitleMargin($aMarg) {
-        $this->title_margin = $aMarg;
-    }
-
-    function SetWeight($aWeight) {
-        $this->iLine->SetWeight($aWeight);
-    }
-
-    function Stroke($aImg,$aScale) {
-        $d = $aScale->NormalizeDate($this->iStart);
-        if( $d <  $aScale->iStartDate || $d > $aScale->iEndDate )
-            return;
-        if($this->iDayOffset != 0.0)
-            $d += 24*60*60*$this->iDayOffset;
-        $x = $aScale->TranslateDate($d);//d=1006858800,
-
-        if( $this->iStartRow > -1 ) {
-            $y1 = $aScale->TranslateVertPos($this->iStartRow,true) ;
-        }
-        else {
-            $y1 = $aScale->iVertHeaderSize+$aImg->top_margin;
-        }
-
-        if( $this->iEndRow > -1 ) {
-            $y2 = $aScale->TranslateVertPos($this->iEndRow);
-        }
-        else {
-            $y2 = $aImg->height - $aImg->bottom_margin;
-        }
-
-        $this->iLine->Stroke($aImg,$x,$y1,$x,$y2);
-        $this->title->Align("center","top");
-        $this->title->Stroke($aImg,$x,$y2+$this->title_margin);
-    }
-}
-
-//===================================================
-// CLASS LinkArrow
-// Handles the drawing of a an arrow
-//===================================================
-class LinkArrow {
-    private $ix,$iy;
-    private $isizespec = array(
-    array(2,3),array(3,5),array(3,8),array(6,15),array(8,22));
-    private $iDirection=ARROW_DOWN,$iType=ARROWT_SOLID,$iSize=ARROW_S2;
-    private $iColor='black';
-
-    function __construct($x,$y,$aDirection,$aType=ARROWT_SOLID,$aSize=ARROW_S2) {
-        $this->iDirection = $aDirection;
-        $this->iType = $aType;
-        $this->iSize = $aSize;
-        $this->ix = $x;
-        $this->iy = $y;
-    }
-
-    function SetColor($aColor) {
-        $this->iColor = $aColor;
-    }
-
-    function SetSize($aSize) {
-        $this->iSize = $aSize;
-    }
-
-    function SetType($aType) {
-        $this->iType = $aType;
-    }
-
-    function Stroke($aImg) {
-        list($dx,$dy) = $this->isizespec[$this->iSize];
-        $x = $this->ix;
-        $y = $this->iy;
-        switch ( $this->iDirection ) {
-            case ARROW_DOWN:
-                $c = array($x,$y,$x-$dx,$y-$dy,$x+$dx,$y-$dy,$x,$y);
-                break;
-            case ARROW_UP:
-                $c = array($x,$y,$x-$dx,$y+$dy,$x+$dx,$y+$dy,$x,$y);
-                break;
-            case ARROW_LEFT:
-                $c = array($x,$y,$x+$dy,$y-$dx,$x+$dy,$y+$dx,$x,$y);
-                break;
-            case ARROW_RIGHT:
-                $c = array($x,$y,$x-$dy,$y-$dx,$x-$dy,$y+$dx,$x,$y);
-                break;
-            default:
-                JpGraphError::RaiseL(6030);
-                //('Unknown arrow direction for link.');
-                die();
-                break;
-        }
-        $aImg->SetColor($this->iColor);
-        switch( $this->iType ) {
-            case ARROWT_SOLID:
-                $aImg->FilledPolygon($c);
-                break;
-            case ARROWT_OPEN:
-                $aImg->Polygon($c);
-                break;
-            default:
-                JpGraphError::RaiseL(6031);
-                //('Unknown arrow type for link.');
-                die();
-                break;
-        }
-    }
-}
-
-//===================================================
-// CLASS GanttLink
-// Handles the drawing of a link line between 2 points
-//===================================================
-
-class GanttLink {
-    private $ix1,$ix2,$iy1,$iy2;
-    private $iPathType=2,$iPathExtend=15;
-    private $iColor='black',$iWeight=1;
-    private $iArrowSize=ARROW_S2,$iArrowType=ARROWT_SOLID;
-
-    function __construct($x1=0,$y1=0,$x2=0,$y2=0) {
-        $this->ix1 = $x1;
-        $this->ix2 = $x2;
-        $this->iy1 = $y1;
-        $this->iy2 = $y2;
-    }
-
-    function SetPos($x1,$y1,$x2,$y2) {
-        $this->ix1 = $x1;
-        $this->ix2 = $x2;
-        $this->iy1 = $y1;
-        $this->iy2 = $y2;
-    }
-
-    function SetPath($aPath) {
-        $this->iPathType = $aPath;
-    }
-
-    function SetColor($aColor) {
-        $this->iColor = $aColor;
-    }
-
-    function SetArrow($aSize,$aType=ARROWT_SOLID) {
-        $this->iArrowSize = $aSize;
-        $this->iArrowType = $aType;
-    }
-
-    function SetWeight($aWeight) {
-        $this->iWeight = $aWeight;
-    }
-
-    function Stroke($aImg) {
-        // The way the path for the arrow is constructed is partly based
-        // on some heuristics. This is not an exact science but draws the
-        // path in a way that, for me, makes esthetic sence. For example
-        // if the start and end activities are very close we make a small
-        // detour to endter the target horixontally. If there are more
-        // space between axctivities then no suh detour is made and the
-        // target is "hit" directly vertical. I have tried to keep this
-        // simple. no doubt this could become almost infinitive complex
-        // and have some real AI. Feel free to modify this.
-        // This will no-doubt be tweaked as times go by. One design aim
-        // is to avoid having the user choose what types of arrow
-        // he wants.
-
-        // The arrow is drawn between (x1,y1) to (x2,y2)
-        $x1 = $this->ix1 ;
-        $x2 = $this->ix2 ;
-        $y1 = $this->iy1 ;
-        $y2 = $this->iy2 ;
-
-        // Depending on if the target is below or above we have to
-        // handle thi different.
-        if( $y2 > $y1 ) {
-            $arrowtype = ARROW_DOWN;
-            $midy = round(($y2-$y1)/2+$y1);
-            if( $x2 > $x1 ) {
-                switch ( $this->iPathType  ) {
-                    case 0:
-                        $c = array($x1,$y1,$x1,$midy,$x2,$midy,$x2,$y2);
-                        break;
-                    case 1:
-                    case 2:
-                    case 3:
-                        $c = array($x1,$y1,$x2,$y1,$x2,$y2);
-                        break;
-                    default:
-                        JpGraphError::RaiseL(6032,$this->iPathType);
-                        //('Internal error: Unknown path type (='.$this->iPathType .') specified for link.');
-                        exit(1);
-                        break;
-                }
-            }
-            else {
-                switch ( $this->iPathType  ) {
-                    case 0:
-                    case 1:
-                        $c = array($x1,$y1,$x1,$midy,$x2,$midy,$x2,$y2);
-                        break;
-                    case 2:
-                        // Always extend out horizontally a bit from the first point
-                        // If we draw a link back in time (end to start) and the bars
-                        // are very close we also change the path so it comes in from
-                        // the left on the activity
-                        $c = array($x1,$y1,$x1+$this->iPathExtend,$y1,
-                        $x1+$this->iPathExtend,$midy,
-                        $x2,$midy,$x2,$y2);
-                        break;
-                    case 3:
-                        if( $y2-$midy < 6 ) {
-                            $c = array($x1,$y1,$x1,$midy,
-                            $x2-$this->iPathExtend,$midy,
-                            $x2-$this->iPathExtend,$y2,
-                            $x2,$y2);
-                            $arrowtype = ARROW_RIGHT;
-                        }
-                        else {
-                            $c = array($x1,$y1,$x1,$midy,$x2,$midy,$x2,$y2);
-                        }
-                        break;
-                    default:
-                        JpGraphError::RaiseL(6032,$this->iPathType);
-                        //('Internal error: Unknown path type specified for link.');
-                        exit(1);
-                        break;
-                }
-            }
-            $arrow = new LinkArrow($x2,$y2,$arrowtype);
-        }
-        else {
-            // Y2 < Y1
-            $arrowtype = ARROW_UP;
-            $midy = round(($y1-$y2)/2+$y2);
-            if( $x2 > $x1 ) {
-                switch ( $this->iPathType  ) {
-                    case 0:
-                    case 1:
-                        $c = array($x1,$y1,$x1,$midy,$x2,$midy,$x2,$y2);
-                        break;
-                    case 3:
-                        if( $midy-$y2 < 8 ) {
-                            $arrowtype = ARROW_RIGHT;
-                            $c = array($x1,$y1,$x1,$y2,$x2,$y2);
-                        }
-                        else {
-                            $c = array($x1,$y1,$x1,$midy,$x2,$midy,$x2,$y2);
-                        }
-                        break;
-                    default:
-                        JpGraphError::RaiseL(6032,$this->iPathType);
-                        //('Internal error: Unknown path type specified for link.');
-                        break;
-                }
-            }
-            else {
-                switch ( $this->iPathType  ) {
-                    case 0:
-                    case 1:
-                        $c = array($x1,$y1,$x1,$midy,$x2,$midy,$x2,$y2);
-                        break;
-                    case 2:
-                        // Always extend out horizontally a bit from the first point
-                        $c = array($x1,$y1,$x1+$this->iPathExtend,$y1,
-                        $x1+$this->iPathExtend,$midy,
-                        $x2,$midy,$x2,$y2);
-                        break;
-                    case 3:
-                        if( $midy-$y2 < 16 ) {
-                            $arrowtype = ARROW_RIGHT;
-                            $c = array($x1,$y1,$x1,$midy,$x2-$this->iPathExtend,$midy,
-                            $x2-$this->iPathExtend,$y2,
-                            $x2,$y2);
-                        }
-                        else {
-                            $c = array($x1,$y1,$x1,$midy,$x2,$midy,$x2,$y2);
-                        }
-                        break;
-                    default:
-                        JpGraphError::RaiseL(6032,$this->iPathType);
-                        //('Internal error: Unknown path type specified for link.');
-                        break;
-                }
-            }
-            $arrow = new LinkArrow($x2,$y2,$arrowtype);
-        }
-        $aImg->SetColor($this->iColor);
-        $aImg->SetLineWeight($this->iWeight);
-        $aImg->Polygon($c);
-        $aImg->SetLineWeight(1);
-        $arrow->SetColor($this->iColor);
-        $arrow->SetSize($this->iArrowSize);
-        $arrow->SetType($this->iArrowType);
-        $arrow->Stroke($aImg);
-    }
-}
-
-// <EOF>
-?>
diff --git a/#jpgraph/src/jpgraph_gb2312.php b/#jpgraph/src/jpgraph_gb2312.php
deleted file mode 100644
index eff07cbc..00000000
--- a/#jpgraph/src/jpgraph_gb2312.php
+++ /dev/null
@@ -1,1552 +0,0 @@
-<?php
-//=======================================================================
-// File:        JPGRAPH_GB2312.PHP
-// Description: Chinese font conversions
-// Created:     2003-05-30
-// Ver:         $Id: jpgraph_gb2312.php 1106 2009-02-22 20:16:35Z ljp $
-//
-// Copyright (c) Asial Corporation. All rights reserved.
-//========================================================================
-
-
-class GB2312toUTF8 {
-    // --------------------------------------------------------------------
-    // This code table is used to translate GB2312 code (key) to
-    // it's corresponding Unicode value (data)
-    // --------------------------------------------------------------------
-    private $codetable = array(
-    8481 => 12288, 8482 => 12289, 8483 => 12290, 8484 => 12539, 8485 => 713,
-    8486 => 711, 8487 => 168, 8488 => 12291, 8489 => 12293, 8490 => 8213,
-    8491 => 65374, 8492 => 8214, 8493 => 8230, 8494 => 8216, 8495 => 8217,
-    8496 => 8220, 8497 => 8221, 8498 => 12308, 8499 => 12309, 8500 => 12296,
-    8501 => 12297, 8502 => 12298, 8503 => 12299, 8504 => 12300, 8505 => 12301,
-    8506 => 12302, 8507 => 12303, 8508 => 12310, 8509 => 12311, 8510 => 12304,
-    8511 => 12305, 8512 => 177, 8513 => 215, 8514 => 247, 8515 => 8758,
-    8516 => 8743, 8517 => 8744, 8518 => 8721, 8519 => 8719, 8520 => 8746,
-    8521 => 8745, 8522 => 8712, 8523 => 8759, 8524 => 8730, 8525 => 8869,
-    8526 => 8741, 8527 => 8736, 8528 => 8978, 8529 => 8857, 8530 => 8747,
-    8531 => 8750, 8532 => 8801, 8533 => 8780, 8534 => 8776, 8535 => 8765,
-    8536 => 8733, 8537 => 8800, 8538 => 8814, 8539 => 8815, 8540 => 8804,
-    8541 => 8805, 8542 => 8734, 8543 => 8757, 8544 => 8756, 8545 => 9794,
-    8546 => 9792, 8547 => 176, 8548 => 8242, 8549 => 8243, 8550 => 8451,
-    8551 => 65284, 8552 => 164, 8553 => 65504, 8554 => 65505, 8555 => 8240,
-    8556 => 167, 8557 => 8470, 8558 => 9734, 8559 => 9733, 8560 => 9675,
-    8561 => 9679, 8562 => 9678, 8563 => 9671, 8564 => 9670, 8565 => 9633,
-    8566 => 9632, 8567 => 9651, 8568 => 9650, 8569 => 8251, 8570 => 8594,
-    8571 => 8592, 8572 => 8593, 8573 => 8595, 8574 => 12307, 8753 => 9352,
-    8754 => 9353, 8755 => 9354, 8756 => 9355, 8757 => 9356, 8758 => 9357,
-    8759 => 9358, 8760 => 9359, 8761 => 9360, 8762 => 9361, 8763 => 9362,
-    8764 => 9363, 8765 => 9364, 8766 => 9365, 8767 => 9366, 8768 => 9367,
-    8769 => 9368, 8770 => 9369, 8771 => 9370, 8772 => 9371, 8773 => 9332,
-    8774 => 9333, 8775 => 9334, 8776 => 9335, 8777 => 9336, 8778 => 9337,
-    8779 => 9338, 8780 => 9339, 8781 => 9340, 8782 => 9341, 8783 => 9342,
-    8784 => 9343, 8785 => 9344, 8786 => 9345, 8787 => 9346, 8788 => 9347,
-    8789 => 9348, 8790 => 9349, 8791 => 9350, 8792 => 9351, 8793 => 9312,
-    8794 => 9313, 8795 => 9314, 8796 => 9315, 8797 => 9316, 8798 => 9317,
-    8799 => 9318, 8800 => 9319, 8801 => 9320, 8802 => 9321, 8805 => 12832,
-    8806 => 12833, 8807 => 12834, 8808 => 12835, 8809 => 12836, 8810 => 12837,
-    8811 => 12838, 8812 => 12839, 8813 => 12840, 8814 => 12841, 8817 => 8544,
-    8818 => 8545, 8819 => 8546, 8820 => 8547, 8821 => 8548, 8822 => 8549,
-    8823 => 8550, 8824 => 8551, 8825 => 8552, 8826 => 8553, 8827 => 8554,
-    8828 => 8555, 8993 => 65281, 8994 => 65282, 8995 => 65283, 8996 => 65509,
-    8997 => 65285, 8998 => 65286, 8999 => 65287, 9000 => 65288, 9001 => 65289,
-    9002 => 65290, 9003 => 65291, 9004 => 65292, 9005 => 65293, 9006 => 65294,
-    9007 => 65295, 9008 => 65296, 9009 => 65297, 9010 => 65298, 9011 => 65299,
-    9012 => 65300, 9013 => 65301, 9014 => 65302, 9015 => 65303, 9016 => 65304,
-    9017 => 65305, 9018 => 65306, 9019 => 65307, 9020 => 65308, 9021 => 65309,
-    9022 => 65310, 9023 => 65311, 9024 => 65312, 9025 => 65313, 9026 => 65314,
-    9027 => 65315, 9028 => 65316, 9029 => 65317, 9030 => 65318, 9031 => 65319,
-    9032 => 65320, 9033 => 65321, 9034 => 65322, 9035 => 65323, 9036 => 65324,
-    9037 => 65325, 9038 => 65326, 9039 => 65327, 9040 => 65328, 9041 => 65329,
-    9042 => 65330, 9043 => 65331, 9044 => 65332, 9045 => 65333, 9046 => 65334,
-    9047 => 65335, 9048 => 65336, 9049 => 65337, 9050 => 65338, 9051 => 65339,
-    9052 => 65340, 9053 => 65341, 9054 => 65342, 9055 => 65343, 9056 => 65344,
-    9057 => 65345, 9058 => 65346, 9059 => 65347, 9060 => 65348, 9061 => 65349,
-    9062 => 65350, 9063 => 65351, 9064 => 65352, 9065 => 65353, 9066 => 65354,
-    9067 => 65355, 9068 => 65356, 9069 => 65357, 9070 => 65358, 9071 => 65359,
-    9072 => 65360, 9073 => 65361, 9074 => 65362, 9075 => 65363, 9076 => 65364,
-    9077 => 65365, 9078 => 65366, 9079 => 65367, 9080 => 65368, 9081 => 65369,
-    9082 => 65370, 9083 => 65371, 9084 => 65372, 9085 => 65373, 9086 => 65507,
-    9249 => 12353, 9250 => 12354, 9251 => 12355, 9252 => 12356, 9253 => 12357,
-    9254 => 12358, 9255 => 12359, 9256 => 12360, 9257 => 12361, 9258 => 12362,
-    9259 => 12363, 9260 => 12364, 9261 => 12365, 9262 => 12366, 9263 => 12367,
-    9264 => 12368, 9265 => 12369, 9266 => 12370, 9267 => 12371, 9268 => 12372,
-    9269 => 12373, 9270 => 12374, 9271 => 12375, 9272 => 12376, 9273 => 12377,
-    9274 => 12378, 9275 => 12379, 9276 => 12380, 9277 => 12381, 9278 => 12382,
-    9279 => 12383, 9280 => 12384, 9281 => 12385, 9282 => 12386, 9283 => 12387,
-    9284 => 12388, 9285 => 12389, 9286 => 12390, 9287 => 12391, 9288 => 12392,
-    9289 => 12393, 9290 => 12394, 9291 => 12395, 9292 => 12396, 9293 => 12397,
-    9294 => 12398, 9295 => 12399, 9296 => 12400, 9297 => 12401, 9298 => 12402,
-    9299 => 12403, 9300 => 12404, 9301 => 12405, 9302 => 12406, 9303 => 12407,
-    9304 => 12408, 9305 => 12409, 9306 => 12410, 9307 => 12411, 9308 => 12412,
-    9309 => 12413, 9310 => 12414, 9311 => 12415, 9312 => 12416, 9313 => 12417,
-    9314 => 12418, 9315 => 12419, 9316 => 12420, 9317 => 12421, 9318 => 12422,
-    9319 => 12423, 9320 => 12424, 9321 => 12425, 9322 => 12426, 9323 => 12427,
-    9324 => 12428, 9325 => 12429, 9326 => 12430, 9327 => 12431, 9328 => 12432,
-    9329 => 12433, 9330 => 12434, 9331 => 12435, 9505 => 12449, 9506 => 12450,
-    9507 => 12451, 9508 => 12452, 9509 => 12453, 9510 => 12454, 9511 => 12455,
-    9512 => 12456, 9513 => 12457, 9514 => 12458, 9515 => 12459, 9516 => 12460,
-    9517 => 12461, 9518 => 12462, 9519 => 12463, 9520 => 12464, 9521 => 12465,
-    9522 => 12466, 9523 => 12467, 9524 => 12468, 9525 => 12469, 9526 => 12470,
-    9527 => 12471, 9528 => 12472, 9529 => 12473, 9530 => 12474, 9531 => 12475,
-    9532 => 12476, 9533 => 12477, 9534 => 12478, 9535 => 12479, 9536 => 12480,
-    9537 => 12481, 9538 => 12482, 9539 => 12483, 9540 => 12484, 9541 => 12485,
-    9542 => 12486, 9543 => 12487, 9544 => 12488, 9545 => 12489, 9546 => 12490,
-    9547 => 12491, 9548 => 12492, 9549 => 12493, 9550 => 12494, 9551 => 12495,
-    9552 => 12496, 9553 => 12497, 9554 => 12498, 9555 => 12499, 9556 => 12500,
-    9557 => 12501, 9558 => 12502, 9559 => 12503, 9560 => 12504, 9561 => 12505,
-    9562 => 12506, 9563 => 12507, 9564 => 12508, 9565 => 12509, 9566 => 12510,
-    9567 => 12511, 9568 => 12512, 9569 => 12513, 9570 => 12514, 9571 => 12515,
-    9572 => 12516, 9573 => 12517, 9574 => 12518, 9575 => 12519, 9576 => 12520,
-    9577 => 12521, 9578 => 12522, 9579 => 12523, 9580 => 12524, 9581 => 12525,
-    9582 => 12526, 9583 => 12527, 9584 => 12528, 9585 => 12529, 9586 => 12530,
-    9587 => 12531, 9588 => 12532, 9589 => 12533, 9590 => 12534, 9761 => 913,
-    9762 => 914, 9763 => 915, 9764 => 916, 9765 => 917, 9766 => 918,
-    9767 => 919, 9768 => 920, 9769 => 921, 9770 => 922, 9771 => 923,
-    9772 => 924, 9773 => 925, 9774 => 926, 9775 => 927, 9776 => 928,
-    9777 => 929, 9778 => 931, 9779 => 932, 9780 => 933, 9781 => 934,
-    9782 => 935, 9783 => 936, 9784 => 937, 9793 => 945, 9794 => 946,
-    9795 => 947, 9796 => 948, 9797 => 949, 9798 => 950, 9799 => 951,
-    9800 => 952, 9801 => 953, 9802 => 954, 9803 => 955, 9804 => 956,
-    9805 => 957, 9806 => 958, 9807 => 959, 9808 => 960, 9809 => 961,
-    9810 => 963, 9811 => 964, 9812 => 965, 9813 => 966, 9814 => 967,
-    9815 => 968, 9816 => 969, 10017 => 1040, 10018 => 1041, 10019 => 1042,
-    10020 => 1043, 10021 => 1044, 10022 => 1045, 10023 => 1025, 10024 => 1046,
-    10025 => 1047, 10026 => 1048, 10027 => 1049, 10028 => 1050, 10029 => 1051,
-    10030 => 1052, 10031 => 1053, 10032 => 1054, 10033 => 1055, 10034 => 1056,
-    10035 => 1057, 10036 => 1058, 10037 => 1059, 10038 => 1060, 10039 => 1061,
-    10040 => 1062, 10041 => 1063, 10042 => 1064, 10043 => 1065, 10044 => 1066,
-    10045 => 1067, 10046 => 1068, 10047 => 1069, 10048 => 1070, 10049 => 1071,
-    10065 => 1072, 10066 => 1073, 10067 => 1074, 10068 => 1075, 10069 => 1076,
-    10070 => 1077, 10071 => 1105, 10072 => 1078, 10073 => 1079, 10074 => 1080,
-    10075 => 1081, 10076 => 1082, 10077 => 1083, 10078 => 1084, 10079 => 1085,
-    10080 => 1086, 10081 => 1087, 10082 => 1088, 10083 => 1089, 10084 => 1090,
-    10085 => 1091, 10086 => 1092, 10087 => 1093, 10088 => 1094, 10089 => 1095,
-    10090 => 1096, 10091 => 1097, 10092 => 1098, 10093 => 1099, 10094 => 1100,
-    10095 => 1101, 10096 => 1102, 10097 => 1103, 10273 => 257, 10274 => 225,
-    10275 => 462, 10276 => 224, 10277 => 275, 10278 => 233, 10279 => 283,
-    10280 => 232, 10281 => 299, 10282 => 237, 10283 => 464, 10284 => 236,
-    10285 => 333, 10286 => 243, 10287 => 466, 10288 => 242, 10289 => 363,
-    10290 => 250, 10291 => 468, 10292 => 249, 10293 => 470, 10294 => 472,
-    10295 => 474, 10296 => 476, 10297 => 252, 10298 => 234, 10309 => 12549,
-    10310 => 12550, 10311 => 12551, 10312 => 12552, 10313 => 12553, 10314 => 12554,
-    10315 => 12555, 10316 => 12556, 10317 => 12557, 10318 => 12558, 10319 => 12559,
-    10320 => 12560, 10321 => 12561, 10322 => 12562, 10323 => 12563, 10324 => 12564,
-    10325 => 12565, 10326 => 12566, 10327 => 12567, 10328 => 12568, 10329 => 12569,
-    10330 => 12570, 10331 => 12571, 10332 => 12572, 10333 => 12573, 10334 => 12574,
-    10335 => 12575, 10336 => 12576, 10337 => 12577, 10338 => 12578, 10339 => 12579,
-    10340 => 12580, 10341 => 12581, 10342 => 12582, 10343 => 12583, 10344 => 12584,
-    10345 => 12585, 10532 => 9472, 10533 => 9473, 10534 => 9474, 10535 => 9475,
-    10536 => 9476, 10537 => 9477, 10538 => 9478, 10539 => 9479, 10540 => 9480,
-    10541 => 9481, 10542 => 9482, 10543 => 9483, 10544 => 9484, 10545 => 9485,
-    10546 => 9486, 10547 => 9487, 10548 => 9488, 10549 => 9489, 10550 => 9490,
-    10551 => 9491, 10552 => 9492, 10553 => 9493, 10554 => 9494, 10555 => 9495,
-    10556 => 9496, 10557 => 9497, 10558 => 9498, 10559 => 9499, 10560 => 9500,
-    10561 => 9501, 10562 => 9502, 10563 => 9503, 10564 => 9504, 10565 => 9505,
-    10566 => 9506, 10567 => 9507, 10568 => 9508, 10569 => 9509, 10570 => 9510,
-    10571 => 9511, 10572 => 9512, 10573 => 9513, 10574 => 9514, 10575 => 9515,
-    10576 => 9516, 10577 => 9517, 10578 => 9518, 10579 => 9519, 10580 => 9520,
-    10581 => 9521, 10582 => 9522, 10583 => 9523, 10584 => 9524, 10585 => 9525,
-    10586 => 9526, 10587 => 9527, 10588 => 9528, 10589 => 9529, 10590 => 9530,
-    10591 => 9531, 10592 => 9532, 10593 => 9533, 10594 => 9534, 10595 => 9535,
-    10596 => 9536, 10597 => 9537, 10598 => 9538, 10599 => 9539, 10600 => 9540,
-    10601 => 9541, 10602 => 9542, 10603 => 9543, 10604 => 9544, 10605 => 9545,
-    10606 => 9546, 10607 => 9547, 12321 => 21834, 12322 => 38463, 12323 => 22467,
-    12324 => 25384, 12325 => 21710, 12326 => 21769, 12327 => 21696, 12328 => 30353,
-    12329 => 30284, 12330 => 34108, 12331 => 30702, 12332 => 33406, 12333 => 30861,
-    12334 => 29233, 12335 => 38552, 12336 => 38797, 12337 => 27688, 12338 => 23433,
-    12339 => 20474, 12340 => 25353, 12341 => 26263, 12342 => 23736, 12343 => 33018,
-    12344 => 26696, 12345 => 32942, 12346 => 26114, 12347 => 30414, 12348 => 20985,
-    12349 => 25942, 12350 => 29100, 12351 => 32753, 12352 => 34948, 12353 => 20658,
-    12354 => 22885, 12355 => 25034, 12356 => 28595, 12357 => 33453, 12358 => 25420,
-    12359 => 25170, 12360 => 21485, 12361 => 21543, 12362 => 31494, 12363 => 20843,
-    12364 => 30116, 12365 => 24052, 12366 => 25300, 12367 => 36299, 12368 => 38774,
-    12369 => 25226, 12370 => 32793, 12371 => 22365, 12372 => 38712, 12373 => 32610,
-    12374 => 29240, 12375 => 30333, 12376 => 26575, 12377 => 30334, 12378 => 25670,
-    12379 => 20336, 12380 => 36133, 12381 => 25308, 12382 => 31255, 12383 => 26001,
-    12384 => 29677, 12385 => 25644, 12386 => 25203, 12387 => 33324, 12388 => 39041,
-    12389 => 26495, 12390 => 29256, 12391 => 25198, 12392 => 25292, 12393 => 20276,
-    12394 => 29923, 12395 => 21322, 12396 => 21150, 12397 => 32458, 12398 => 37030,
-    12399 => 24110, 12400 => 26758, 12401 => 27036, 12402 => 33152, 12403 => 32465,
-    12404 => 26834, 12405 => 30917, 12406 => 34444, 12407 => 38225, 12408 => 20621,
-    12409 => 35876, 12410 => 33502, 12411 => 32990, 12412 => 21253, 12413 => 35090,
-    12414 => 21093, 12577 => 34180, 12578 => 38649, 12579 => 20445, 12580 => 22561,
-    12581 => 39281, 12582 => 23453, 12583 => 25265, 12584 => 25253, 12585 => 26292,
-    12586 => 35961, 12587 => 40077, 12588 => 29190, 12589 => 26479, 12590 => 30865,
-    12591 => 24754, 12592 => 21329, 12593 => 21271, 12594 => 36744, 12595 => 32972,
-    12596 => 36125, 12597 => 38049, 12598 => 20493, 12599 => 29384, 12600 => 22791,
-    12601 => 24811, 12602 => 28953, 12603 => 34987, 12604 => 22868, 12605 => 33519,
-    12606 => 26412, 12607 => 31528, 12608 => 23849, 12609 => 32503, 12610 => 29997,
-    12611 => 27893, 12612 => 36454, 12613 => 36856, 12614 => 36924, 12615 => 40763,
-    12616 => 27604, 12617 => 37145, 12618 => 31508, 12619 => 24444, 12620 => 30887,
-    12621 => 34006, 12622 => 34109, 12623 => 27605, 12624 => 27609, 12625 => 27606,
-    12626 => 24065, 12627 => 24199, 12628 => 30201, 12629 => 38381, 12630 => 25949,
-    12631 => 24330, 12632 => 24517, 12633 => 36767, 12634 => 22721, 12635 => 33218,
-    12636 => 36991, 12637 => 38491, 12638 => 38829, 12639 => 36793, 12640 => 32534,
-    12641 => 36140, 12642 => 25153, 12643 => 20415, 12644 => 21464, 12645 => 21342,
-    12646 => 36776, 12647 => 36777, 12648 => 36779, 12649 => 36941, 12650 => 26631,
-    12651 => 24426, 12652 => 33176, 12653 => 34920, 12654 => 40150, 12655 => 24971,
-    12656 => 21035, 12657 => 30250, 12658 => 24428, 12659 => 25996, 12660 => 28626,
-    12661 => 28392, 12662 => 23486, 12663 => 25672, 12664 => 20853, 12665 => 20912,
-    12666 => 26564, 12667 => 19993, 12668 => 31177, 12669 => 39292, 12670 => 28851,
-    12833 => 30149, 12834 => 24182, 12835 => 29627, 12836 => 33760, 12837 => 25773,
-    12838 => 25320, 12839 => 38069, 12840 => 27874, 12841 => 21338, 12842 => 21187,
-    12843 => 25615, 12844 => 38082, 12845 => 31636, 12846 => 20271, 12847 => 24091,
-    12848 => 33334, 12849 => 33046, 12850 => 33162, 12851 => 28196, 12852 => 27850,
-    12853 => 39539, 12854 => 25429, 12855 => 21340, 12856 => 21754, 12857 => 34917,
-    12858 => 22496, 12859 => 19981, 12860 => 24067, 12861 => 27493, 12862 => 31807,
-    12863 => 37096, 12864 => 24598, 12865 => 25830, 12866 => 29468, 12867 => 35009,
-    12868 => 26448, 12869 => 25165, 12870 => 36130, 12871 => 30572, 12872 => 36393,
-    12873 => 37319, 12874 => 24425, 12875 => 33756, 12876 => 34081, 12877 => 39184,
-    12878 => 21442, 12879 => 34453, 12880 => 27531, 12881 => 24813, 12882 => 24808,
-    12883 => 28799, 12884 => 33485, 12885 => 33329, 12886 => 20179, 12887 => 27815,
-    12888 => 34255, 12889 => 25805, 12890 => 31961, 12891 => 27133, 12892 => 26361,
-    12893 => 33609, 12894 => 21397, 12895 => 31574, 12896 => 20391, 12897 => 20876,
-    12898 => 27979, 12899 => 23618, 12900 => 36461, 12901 => 25554, 12902 => 21449,
-    12903 => 33580, 12904 => 33590, 12905 => 26597, 12906 => 30900, 12907 => 25661,
-    12908 => 23519, 12909 => 23700, 12910 => 24046, 12911 => 35815, 12912 => 25286,
-    12913 => 26612, 12914 => 35962, 12915 => 25600, 12916 => 25530, 12917 => 34633,
-    12918 => 39307, 12919 => 35863, 12920 => 32544, 12921 => 38130, 12922 => 20135,
-    12923 => 38416, 12924 => 39076, 12925 => 26124, 12926 => 29462, 13089 => 22330,
-    13090 => 23581, 13091 => 24120, 13092 => 38271, 13093 => 20607, 13094 => 32928,
-    13095 => 21378, 13096 => 25950, 13097 => 30021, 13098 => 21809, 13099 => 20513,
-    13100 => 36229, 13101 => 25220, 13102 => 38046, 13103 => 26397, 13104 => 22066,
-    13105 => 28526, 13106 => 24034, 13107 => 21557, 13108 => 28818, 13109 => 36710,
-    13110 => 25199, 13111 => 25764, 13112 => 25507, 13113 => 24443, 13114 => 28552,
-    13115 => 37108, 13116 => 33251, 13117 => 36784, 13118 => 23576, 13119 => 26216,
-    13120 => 24561, 13121 => 27785, 13122 => 38472, 13123 => 36225, 13124 => 34924,
-    13125 => 25745, 13126 => 31216, 13127 => 22478, 13128 => 27225, 13129 => 25104,
-    13130 => 21576, 13131 => 20056, 13132 => 31243, 13133 => 24809, 13134 => 28548,
-    13135 => 35802, 13136 => 25215, 13137 => 36894, 13138 => 39563, 13139 => 31204,
-    13140 => 21507, 13141 => 30196, 13142 => 25345, 13143 => 21273, 13144 => 27744,
-    13145 => 36831, 13146 => 24347, 13147 => 39536, 13148 => 32827, 13149 => 40831,
-    13150 => 20360, 13151 => 23610, 13152 => 36196, 13153 => 32709, 13154 => 26021,
-    13155 => 28861, 13156 => 20805, 13157 => 20914, 13158 => 34411, 13159 => 23815,
-    13160 => 23456, 13161 => 25277, 13162 => 37228, 13163 => 30068, 13164 => 36364,
-    13165 => 31264, 13166 => 24833, 13167 => 31609, 13168 => 20167, 13169 => 32504,
-    13170 => 30597, 13171 => 19985, 13172 => 33261, 13173 => 21021, 13174 => 20986,
-    13175 => 27249, 13176 => 21416, 13177 => 36487, 13178 => 38148, 13179 => 38607,
-    13180 => 28353, 13181 => 38500, 13182 => 26970, 13345 => 30784, 13346 => 20648,
-    13347 => 30679, 13348 => 25616, 13349 => 35302, 13350 => 22788, 13351 => 25571,
-    13352 => 24029, 13353 => 31359, 13354 => 26941, 13355 => 20256, 13356 => 33337,
-    13357 => 21912, 13358 => 20018, 13359 => 30126, 13360 => 31383, 13361 => 24162,
-    13362 => 24202, 13363 => 38383, 13364 => 21019, 13365 => 21561, 13366 => 28810,
-    13367 => 25462, 13368 => 38180, 13369 => 22402, 13370 => 26149, 13371 => 26943,
-    13372 => 37255, 13373 => 21767, 13374 => 28147, 13375 => 32431, 13376 => 34850,
-    13377 => 25139, 13378 => 32496, 13379 => 30133, 13380 => 33576, 13381 => 30913,
-    13382 => 38604, 13383 => 36766, 13384 => 24904, 13385 => 29943, 13386 => 35789,
-    13387 => 27492, 13388 => 21050, 13389 => 36176, 13390 => 27425, 13391 => 32874,
-    13392 => 33905, 13393 => 22257, 13394 => 21254, 13395 => 20174, 13396 => 19995,
-    13397 => 20945, 13398 => 31895, 13399 => 37259, 13400 => 31751, 13401 => 20419,
-    13402 => 36479, 13403 => 31713, 13404 => 31388, 13405 => 25703, 13406 => 23828,
-    13407 => 20652, 13408 => 33030, 13409 => 30209, 13410 => 31929, 13411 => 28140,
-    13412 => 32736, 13413 => 26449, 13414 => 23384, 13415 => 23544, 13416 => 30923,
-    13417 => 25774, 13418 => 25619, 13419 => 25514, 13420 => 25387, 13421 => 38169,
-    13422 => 25645, 13423 => 36798, 13424 => 31572, 13425 => 30249, 13426 => 25171,
-    13427 => 22823, 13428 => 21574, 13429 => 27513, 13430 => 20643, 13431 => 25140,
-    13432 => 24102, 13433 => 27526, 13434 => 20195, 13435 => 36151, 13436 => 34955,
-    13437 => 24453, 13438 => 36910, 13601 => 24608, 13602 => 32829, 13603 => 25285,
-    13604 => 20025, 13605 => 21333, 13606 => 37112, 13607 => 25528, 13608 => 32966,
-    13609 => 26086, 13610 => 27694, 13611 => 20294, 13612 => 24814, 13613 => 28129,
-    13614 => 35806, 13615 => 24377, 13616 => 34507, 13617 => 24403, 13618 => 25377,
-    13619 => 20826, 13620 => 33633, 13621 => 26723, 13622 => 20992, 13623 => 25443,
-    13624 => 36424, 13625 => 20498, 13626 => 23707, 13627 => 31095, 13628 => 23548,
-    13629 => 21040, 13630 => 31291, 13631 => 24764, 13632 => 36947, 13633 => 30423,
-    13634 => 24503, 13635 => 24471, 13636 => 30340, 13637 => 36460, 13638 => 28783,
-    13639 => 30331, 13640 => 31561, 13641 => 30634, 13642 => 20979, 13643 => 37011,
-    13644 => 22564, 13645 => 20302, 13646 => 28404, 13647 => 36842, 13648 => 25932,
-    13649 => 31515, 13650 => 29380, 13651 => 28068, 13652 => 32735, 13653 => 23265,
-    13654 => 25269, 13655 => 24213, 13656 => 22320, 13657 => 33922, 13658 => 31532,
-    13659 => 24093, 13660 => 24351, 13661 => 36882, 13662 => 32532, 13663 => 39072,
-    13664 => 25474, 13665 => 28359, 13666 => 30872, 13667 => 28857, 13668 => 20856,
-    13669 => 38747, 13670 => 22443, 13671 => 30005, 13672 => 20291, 13673 => 30008,
-    13674 => 24215, 13675 => 24806, 13676 => 22880, 13677 => 28096, 13678 => 27583,
-    13679 => 30857, 13680 => 21500, 13681 => 38613, 13682 => 20939, 13683 => 20993,
-    13684 => 25481, 13685 => 21514, 13686 => 38035, 13687 => 35843, 13688 => 36300,
-    13689 => 29241, 13690 => 30879, 13691 => 34678, 13692 => 36845, 13693 => 35853,
-    13694 => 21472, 13857 => 19969, 13858 => 30447, 13859 => 21486, 13860 => 38025,
-    13861 => 39030, 13862 => 40718, 13863 => 38189, 13864 => 23450, 13865 => 35746,
-    13866 => 20002, 13867 => 19996, 13868 => 20908, 13869 => 33891, 13870 => 25026,
-    13871 => 21160, 13872 => 26635, 13873 => 20375, 13874 => 24683, 13875 => 20923,
-    13876 => 27934, 13877 => 20828, 13878 => 25238, 13879 => 26007, 13880 => 38497,
-    13881 => 35910, 13882 => 36887, 13883 => 30168, 13884 => 37117, 13885 => 30563,
-    13886 => 27602, 13887 => 29322, 13888 => 29420, 13889 => 35835, 13890 => 22581,
-    13891 => 30585, 13892 => 36172, 13893 => 26460, 13894 => 38208, 13895 => 32922,
-    13896 => 24230, 13897 => 28193, 13898 => 22930, 13899 => 31471, 13900 => 30701,
-    13901 => 38203, 13902 => 27573, 13903 => 26029, 13904 => 32526, 13905 => 22534,
-    13906 => 20817, 13907 => 38431, 13908 => 23545, 13909 => 22697, 13910 => 21544,
-    13911 => 36466, 13912 => 25958, 13913 => 39039, 13914 => 22244, 13915 => 38045,
-    13916 => 30462, 13917 => 36929, 13918 => 25479, 13919 => 21702, 13920 => 22810,
-    13921 => 22842, 13922 => 22427, 13923 => 36530, 13924 => 26421, 13925 => 36346,
-    13926 => 33333, 13927 => 21057, 13928 => 24816, 13929 => 22549, 13930 => 34558,
-    13931 => 23784, 13932 => 40517, 13933 => 20420, 13934 => 39069, 13935 => 35769,
-    13936 => 23077, 13937 => 24694, 13938 => 21380, 13939 => 25212, 13940 => 36943,
-    13941 => 37122, 13942 => 39295, 13943 => 24681, 13944 => 32780, 13945 => 20799,
-    13946 => 32819, 13947 => 23572, 13948 => 39285, 13949 => 27953, 13950 => 20108,
-    14113 => 36144, 14114 => 21457, 14115 => 32602, 14116 => 31567, 14117 => 20240,
-    14118 => 20047, 14119 => 38400, 14120 => 27861, 14121 => 29648, 14122 => 34281,
-    14123 => 24070, 14124 => 30058, 14125 => 32763, 14126 => 27146, 14127 => 30718,
-    14128 => 38034, 14129 => 32321, 14130 => 20961, 14131 => 28902, 14132 => 21453,
-    14133 => 36820, 14134 => 33539, 14135 => 36137, 14136 => 29359, 14137 => 39277,
-    14138 => 27867, 14139 => 22346, 14140 => 33459, 14141 => 26041, 14142 => 32938,
-    14143 => 25151, 14144 => 38450, 14145 => 22952, 14146 => 20223, 14147 => 35775,
-    14148 => 32442, 14149 => 25918, 14150 => 33778, 14151 => 38750, 14152 => 21857,
-    14153 => 39134, 14154 => 32933, 14155 => 21290, 14156 => 35837, 14157 => 21536,
-    14158 => 32954, 14159 => 24223, 14160 => 27832, 14161 => 36153, 14162 => 33452,
-    14163 => 37210, 14164 => 21545, 14165 => 27675, 14166 => 20998, 14167 => 32439,
-    14168 => 22367, 14169 => 28954, 14170 => 27774, 14171 => 31881, 14172 => 22859,
-    14173 => 20221, 14174 => 24575, 14175 => 24868, 14176 => 31914, 14177 => 20016,
-    14178 => 23553, 14179 => 26539, 14180 => 34562, 14181 => 23792, 14182 => 38155,
-    14183 => 39118, 14184 => 30127, 14185 => 28925, 14186 => 36898, 14187 => 20911,
-    14188 => 32541, 14189 => 35773, 14190 => 22857, 14191 => 20964, 14192 => 20315,
-    14193 => 21542, 14194 => 22827, 14195 => 25975, 14196 => 32932, 14197 => 23413,
-    14198 => 25206, 14199 => 25282, 14200 => 36752, 14201 => 24133, 14202 => 27679,
-    14203 => 31526, 14204 => 20239, 14205 => 20440, 14206 => 26381, 14369 => 28014,
-    14370 => 28074, 14371 => 31119, 14372 => 34993, 14373 => 24343, 14374 => 29995,
-    14375 => 25242, 14376 => 36741, 14377 => 20463, 14378 => 37340, 14379 => 26023,
-    14380 => 33071, 14381 => 33105, 14382 => 24220, 14383 => 33104, 14384 => 36212,
-    14385 => 21103, 14386 => 35206, 14387 => 36171, 14388 => 22797, 14389 => 20613,
-    14390 => 20184, 14391 => 38428, 14392 => 29238, 14393 => 33145, 14394 => 36127,
-    14395 => 23500, 14396 => 35747, 14397 => 38468, 14398 => 22919, 14399 => 32538,
-    14400 => 21648, 14401 => 22134, 14402 => 22030, 14403 => 35813, 14404 => 25913,
-    14405 => 27010, 14406 => 38041, 14407 => 30422, 14408 => 28297, 14409 => 24178,
-    14410 => 29976, 14411 => 26438, 14412 => 26577, 14413 => 31487, 14414 => 32925,
-    14415 => 36214, 14416 => 24863, 14417 => 31174, 14418 => 25954, 14419 => 36195,
-    14420 => 20872, 14421 => 21018, 14422 => 38050, 14423 => 32568, 14424 => 32923,
-    14425 => 32434, 14426 => 23703, 14427 => 28207, 14428 => 26464, 14429 => 31705,
-    14430 => 30347, 14431 => 39640, 14432 => 33167, 14433 => 32660, 14434 => 31957,
-    14435 => 25630, 14436 => 38224, 14437 => 31295, 14438 => 21578, 14439 => 21733,
-    14440 => 27468, 14441 => 25601, 14442 => 25096, 14443 => 40509, 14444 => 33011,
-    14445 => 30105, 14446 => 21106, 14447 => 38761, 14448 => 33883, 14449 => 26684,
-    14450 => 34532, 14451 => 38401, 14452 => 38548, 14453 => 38124, 14454 => 20010,
-    14455 => 21508, 14456 => 32473, 14457 => 26681, 14458 => 36319, 14459 => 32789,
-    14460 => 26356, 14461 => 24218, 14462 => 32697, 14625 => 22466, 14626 => 32831,
-    14627 => 26775, 14628 => 24037, 14629 => 25915, 14630 => 21151, 14631 => 24685,
-    14632 => 40858, 14633 => 20379, 14634 => 36524, 14635 => 20844, 14636 => 23467,
-    14637 => 24339, 14638 => 24041, 14639 => 27742, 14640 => 25329, 14641 => 36129,
-    14642 => 20849, 14643 => 38057, 14644 => 21246, 14645 => 27807, 14646 => 33503,
-    14647 => 29399, 14648 => 22434, 14649 => 26500, 14650 => 36141, 14651 => 22815,
-    14652 => 36764, 14653 => 33735, 14654 => 21653, 14655 => 31629, 14656 => 20272,
-    14657 => 27837, 14658 => 23396, 14659 => 22993, 14660 => 40723, 14661 => 21476,
-    14662 => 34506, 14663 => 39592, 14664 => 35895, 14665 => 32929, 14666 => 25925,
-    14667 => 39038, 14668 => 22266, 14669 => 38599, 14670 => 21038, 14671 => 29916,
-    14672 => 21072, 14673 => 23521, 14674 => 25346, 14675 => 35074, 14676 => 20054,
-    14677 => 25296, 14678 => 24618, 14679 => 26874, 14680 => 20851, 14681 => 23448,
-    14682 => 20896, 14683 => 35266, 14684 => 31649, 14685 => 39302, 14686 => 32592,
-    14687 => 24815, 14688 => 28748, 14689 => 36143, 14690 => 20809, 14691 => 24191,
-    14692 => 36891, 14693 => 29808, 14694 => 35268, 14695 => 22317, 14696 => 30789,
-    14697 => 24402, 14698 => 40863, 14699 => 38394, 14700 => 36712, 14701 => 39740,
-    14702 => 35809, 14703 => 30328, 14704 => 26690, 14705 => 26588, 14706 => 36330,
-    14707 => 36149, 14708 => 21053, 14709 => 36746, 14710 => 28378, 14711 => 26829,
-    14712 => 38149, 14713 => 37101, 14714 => 22269, 14715 => 26524, 14716 => 35065,
-    14717 => 36807, 14718 => 21704, 14881 => 39608, 14882 => 23401, 14883 => 28023,
-    14884 => 27686, 14885 => 20133, 14886 => 23475, 14887 => 39559, 14888 => 37219,
-    14889 => 25000, 14890 => 37039, 14891 => 38889, 14892 => 21547, 14893 => 28085,
-    14894 => 23506, 14895 => 20989, 14896 => 21898, 14897 => 32597, 14898 => 32752,
-    14899 => 25788, 14900 => 25421, 14901 => 26097, 14902 => 25022, 14903 => 24717,
-    14904 => 28938, 14905 => 27735, 14906 => 27721, 14907 => 22831, 14908 => 26477,
-    14909 => 33322, 14910 => 22741, 14911 => 22158, 14912 => 35946, 14913 => 27627,
-    14914 => 37085, 14915 => 22909, 14916 => 32791, 14917 => 21495, 14918 => 28009,
-    14919 => 21621, 14920 => 21917, 14921 => 33655, 14922 => 33743, 14923 => 26680,
-    14924 => 31166, 14925 => 21644, 14926 => 20309, 14927 => 21512, 14928 => 30418,
-    14929 => 35977, 14930 => 38402, 14931 => 27827, 14932 => 28088, 14933 => 36203,
-    14934 => 35088, 14935 => 40548, 14936 => 36154, 14937 => 22079, 14938 => 40657,
-    14939 => 30165, 14940 => 24456, 14941 => 29408, 14942 => 24680, 14943 => 21756,
-    14944 => 20136, 14945 => 27178, 14946 => 34913, 14947 => 24658, 14948 => 36720,
-    14949 => 21700, 14950 => 28888, 14951 => 34425, 14952 => 40511, 14953 => 27946,
-    14954 => 23439, 14955 => 24344, 14956 => 32418, 14957 => 21897, 14958 => 20399,
-    14959 => 29492, 14960 => 21564, 14961 => 21402, 14962 => 20505, 14963 => 21518,
-    14964 => 21628, 14965 => 20046, 14966 => 24573, 14967 => 29786, 14968 => 22774,
-    14969 => 33899, 14970 => 32993, 14971 => 34676, 14972 => 29392, 14973 => 31946,
-    14974 => 28246, 15137 => 24359, 15138 => 34382, 15139 => 21804, 15140 => 25252,
-    15141 => 20114, 15142 => 27818, 15143 => 25143, 15144 => 33457, 15145 => 21719,
-    15146 => 21326, 15147 => 29502, 15148 => 28369, 15149 => 30011, 15150 => 21010,
-    15151 => 21270, 15152 => 35805, 15153 => 27088, 15154 => 24458, 15155 => 24576,
-    15156 => 28142, 15157 => 22351, 15158 => 27426, 15159 => 29615, 15160 => 26707,
-    15161 => 36824, 15162 => 32531, 15163 => 25442, 15164 => 24739, 15165 => 21796,
-    15166 => 30186, 15167 => 35938, 15168 => 28949, 15169 => 28067, 15170 => 23462,
-    15171 => 24187, 15172 => 33618, 15173 => 24908, 15174 => 40644, 15175 => 30970,
-    15176 => 34647, 15177 => 31783, 15178 => 30343, 15179 => 20976, 15180 => 24822,
-    15181 => 29004, 15182 => 26179, 15183 => 24140, 15184 => 24653, 15185 => 35854,
-    15186 => 28784, 15187 => 25381, 15188 => 36745, 15189 => 24509, 15190 => 24674,
-    15191 => 34516, 15192 => 22238, 15193 => 27585, 15194 => 24724, 15195 => 24935,
-    15196 => 21321, 15197 => 24800, 15198 => 26214, 15199 => 36159, 15200 => 31229,
-    15201 => 20250, 15202 => 28905, 15203 => 27719, 15204 => 35763, 15205 => 35826,
-    15206 => 32472, 15207 => 33636, 15208 => 26127, 15209 => 23130, 15210 => 39746,
-    15211 => 27985, 15212 => 28151, 15213 => 35905, 15214 => 27963, 15215 => 20249,
-    15216 => 28779, 15217 => 33719, 15218 => 25110, 15219 => 24785, 15220 => 38669,
-    15221 => 36135, 15222 => 31096, 15223 => 20987, 15224 => 22334, 15225 => 22522,
-    15226 => 26426, 15227 => 30072, 15228 => 31293, 15229 => 31215, 15230 => 31637,
-    15393 => 32908, 15394 => 39269, 15395 => 36857, 15396 => 28608, 15397 => 35749,
-    15398 => 40481, 15399 => 23020, 15400 => 32489, 15401 => 32521, 15402 => 21513,
-    15403 => 26497, 15404 => 26840, 15405 => 36753, 15406 => 31821, 15407 => 38598,
-    15408 => 21450, 15409 => 24613, 15410 => 30142, 15411 => 27762, 15412 => 21363,
-    15413 => 23241, 15414 => 32423, 15415 => 25380, 15416 => 20960, 15417 => 33034,
-    15418 => 24049, 15419 => 34015, 15420 => 25216, 15421 => 20864, 15422 => 23395,
-    15423 => 20238, 15424 => 31085, 15425 => 21058, 15426 => 24760, 15427 => 27982,
-    15428 => 23492, 15429 => 23490, 15430 => 35745, 15431 => 35760, 15432 => 26082,
-    15433 => 24524, 15434 => 38469, 15435 => 22931, 15436 => 32487, 15437 => 32426,
-    15438 => 22025, 15439 => 26551, 15440 => 22841, 15441 => 20339, 15442 => 23478,
-    15443 => 21152, 15444 => 33626, 15445 => 39050, 15446 => 36158, 15447 => 30002,
-    15448 => 38078, 15449 => 20551, 15450 => 31292, 15451 => 20215, 15452 => 26550,
-    15453 => 39550, 15454 => 23233, 15455 => 27516, 15456 => 30417, 15457 => 22362,
-    15458 => 23574, 15459 => 31546, 15460 => 38388, 15461 => 29006, 15462 => 20860,
-    15463 => 32937, 15464 => 33392, 15465 => 22904, 15466 => 32516, 15467 => 33575,
-    15468 => 26816, 15469 => 26604, 15470 => 30897, 15471 => 30839, 15472 => 25315,
-    15473 => 25441, 15474 => 31616, 15475 => 20461, 15476 => 21098, 15477 => 20943,
-    15478 => 33616, 15479 => 27099, 15480 => 37492, 15481 => 36341, 15482 => 36145,
-    15483 => 35265, 15484 => 38190, 15485 => 31661, 15486 => 20214, 15649 => 20581,
-    15650 => 33328, 15651 => 21073, 15652 => 39279, 15653 => 28176, 15654 => 28293,
-    15655 => 28071, 15656 => 24314, 15657 => 20725, 15658 => 23004, 15659 => 23558,
-    15660 => 27974, 15661 => 27743, 15662 => 30086, 15663 => 33931, 15664 => 26728,
-    15665 => 22870, 15666 => 35762, 15667 => 21280, 15668 => 37233, 15669 => 38477,
-    15670 => 34121, 15671 => 26898, 15672 => 30977, 15673 => 28966, 15674 => 33014,
-    15675 => 20132, 15676 => 37066, 15677 => 27975, 15678 => 39556, 15679 => 23047,
-    15680 => 22204, 15681 => 25605, 15682 => 38128, 15683 => 30699, 15684 => 20389,
-    15685 => 33050, 15686 => 29409, 15687 => 35282, 15688 => 39290, 15689 => 32564,
-    15690 => 32478, 15691 => 21119, 15692 => 25945, 15693 => 37237, 15694 => 36735,
-    15695 => 36739, 15696 => 21483, 15697 => 31382, 15698 => 25581, 15699 => 25509,
-    15700 => 30342, 15701 => 31224, 15702 => 34903, 15703 => 38454, 15704 => 25130,
-    15705 => 21163, 15706 => 33410, 15707 => 26708, 15708 => 26480, 15709 => 25463,
-    15710 => 30571, 15711 => 31469, 15712 => 27905, 15713 => 32467, 15714 => 35299,
-    15715 => 22992, 15716 => 25106, 15717 => 34249, 15718 => 33445, 15719 => 30028,
-    15720 => 20511, 15721 => 20171, 15722 => 30117, 15723 => 35819, 15724 => 23626,
-    15725 => 24062, 15726 => 31563, 15727 => 26020, 15728 => 37329, 15729 => 20170,
-    15730 => 27941, 15731 => 35167, 15732 => 32039, 15733 => 38182, 15734 => 20165,
-    15735 => 35880, 15736 => 36827, 15737 => 38771, 15738 => 26187, 15739 => 31105,
-    15740 => 36817, 15741 => 28908, 15742 => 28024, 15905 => 23613, 15906 => 21170,
-    15907 => 33606, 15908 => 20834, 15909 => 33550, 15910 => 30555, 15911 => 26230,
-    15912 => 40120, 15913 => 20140, 15914 => 24778, 15915 => 31934, 15916 => 31923,
-    15917 => 32463, 15918 => 20117, 15919 => 35686, 15920 => 26223, 15921 => 39048,
-    15922 => 38745, 15923 => 22659, 15924 => 25964, 15925 => 38236, 15926 => 24452,
-    15927 => 30153, 15928 => 38742, 15929 => 31455, 15930 => 31454, 15931 => 20928,
-    15932 => 28847, 15933 => 31384, 15934 => 25578, 15935 => 31350, 15936 => 32416,
-    15937 => 29590, 15938 => 38893, 15939 => 20037, 15940 => 28792, 15941 => 20061,
-    15942 => 37202, 15943 => 21417, 15944 => 25937, 15945 => 26087, 15946 => 33276,
-    15947 => 33285, 15948 => 21646, 15949 => 23601, 15950 => 30106, 15951 => 38816,
-    15952 => 25304, 15953 => 29401, 15954 => 30141, 15955 => 23621, 15956 => 39545,
-    15957 => 33738, 15958 => 23616, 15959 => 21632, 15960 => 30697, 15961 => 20030,
-    15962 => 27822, 15963 => 32858, 15964 => 25298, 15965 => 25454, 15966 => 24040,
-    15967 => 20855, 15968 => 36317, 15969 => 36382, 15970 => 38191, 15971 => 20465,
-    15972 => 21477, 15973 => 24807, 15974 => 28844, 15975 => 21095, 15976 => 25424,
-    15977 => 40515, 15978 => 23071, 15979 => 20518, 15980 => 30519, 15981 => 21367,
-    15982 => 32482, 15983 => 25733, 15984 => 25899, 15985 => 25225, 15986 => 25496,
-    15987 => 20500, 15988 => 29237, 15989 => 35273, 15990 => 20915, 15991 => 35776,
-    15992 => 32477, 15993 => 22343, 15994 => 33740, 15995 => 38055, 15996 => 20891,
-    15997 => 21531, 15998 => 23803, 16161 => 20426, 16162 => 31459, 16163 => 27994,
-    16164 => 37089, 16165 => 39567, 16166 => 21888, 16167 => 21654, 16168 => 21345,
-    16169 => 21679, 16170 => 24320, 16171 => 25577, 16172 => 26999, 16173 => 20975,
-    16174 => 24936, 16175 => 21002, 16176 => 22570, 16177 => 21208, 16178 => 22350,
-    16179 => 30733, 16180 => 30475, 16181 => 24247, 16182 => 24951, 16183 => 31968,
-    16184 => 25179, 16185 => 25239, 16186 => 20130, 16187 => 28821, 16188 => 32771,
-    16189 => 25335, 16190 => 28900, 16191 => 38752, 16192 => 22391, 16193 => 33499,
-    16194 => 26607, 16195 => 26869, 16196 => 30933, 16197 => 39063, 16198 => 31185,
-    16199 => 22771, 16200 => 21683, 16201 => 21487, 16202 => 28212, 16203 => 20811,
-    16204 => 21051, 16205 => 23458, 16206 => 35838, 16207 => 32943, 16208 => 21827,
-    16209 => 22438, 16210 => 24691, 16211 => 22353, 16212 => 21549, 16213 => 31354,
-    16214 => 24656, 16215 => 23380, 16216 => 25511, 16217 => 25248, 16218 => 21475,
-    16219 => 25187, 16220 => 23495, 16221 => 26543, 16222 => 21741, 16223 => 31391,
-    16224 => 33510, 16225 => 37239, 16226 => 24211, 16227 => 35044, 16228 => 22840,
-    16229 => 22446, 16230 => 25358, 16231 => 36328, 16232 => 33007, 16233 => 22359,
-    16234 => 31607, 16235 => 20393, 16236 => 24555, 16237 => 23485, 16238 => 27454,
-    16239 => 21281, 16240 => 31568, 16241 => 29378, 16242 => 26694, 16243 => 30719,
-    16244 => 30518, 16245 => 26103, 16246 => 20917, 16247 => 20111, 16248 => 30420,
-    16249 => 23743, 16250 => 31397, 16251 => 33909, 16252 => 22862, 16253 => 39745,
-    16254 => 20608, 16417 => 39304, 16418 => 24871, 16419 => 28291, 16420 => 22372,
-    16421 => 26118, 16422 => 25414, 16423 => 22256, 16424 => 25324, 16425 => 25193,
-    16426 => 24275, 16427 => 38420, 16428 => 22403, 16429 => 25289, 16430 => 21895,
-    16431 => 34593, 16432 => 33098, 16433 => 36771, 16434 => 21862, 16435 => 33713,
-    16436 => 26469, 16437 => 36182, 16438 => 34013, 16439 => 23146, 16440 => 26639,
-    16441 => 25318, 16442 => 31726, 16443 => 38417, 16444 => 20848, 16445 => 28572,
-    16446 => 35888, 16447 => 25597, 16448 => 35272, 16449 => 25042, 16450 => 32518,
-    16451 => 28866, 16452 => 28389, 16453 => 29701, 16454 => 27028, 16455 => 29436,
-    16456 => 24266, 16457 => 37070, 16458 => 26391, 16459 => 28010, 16460 => 25438,
-    16461 => 21171, 16462 => 29282, 16463 => 32769, 16464 => 20332, 16465 => 23013,
-    16466 => 37226, 16467 => 28889, 16468 => 28061, 16469 => 21202, 16470 => 20048,
-    16471 => 38647, 16472 => 38253, 16473 => 34174, 16474 => 30922, 16475 => 32047,
-    16476 => 20769, 16477 => 22418, 16478 => 25794, 16479 => 32907, 16480 => 31867,
-    16481 => 27882, 16482 => 26865, 16483 => 26974, 16484 => 20919, 16485 => 21400,
-    16486 => 26792, 16487 => 29313, 16488 => 40654, 16489 => 31729, 16490 => 29432,
-    16491 => 31163, 16492 => 28435, 16493 => 29702, 16494 => 26446, 16495 => 37324,
-    16496 => 40100, 16497 => 31036, 16498 => 33673, 16499 => 33620, 16500 => 21519,
-    16501 => 26647, 16502 => 20029, 16503 => 21385, 16504 => 21169, 16505 => 30782,
-    16506 => 21382, 16507 => 21033, 16508 => 20616, 16509 => 20363, 16510 => 20432,
-    16673 => 30178, 16674 => 31435, 16675 => 31890, 16676 => 27813, 16677 => 38582,
-    16678 => 21147, 16679 => 29827, 16680 => 21737, 16681 => 20457, 16682 => 32852,
-    16683 => 33714, 16684 => 36830, 16685 => 38256, 16686 => 24265, 16687 => 24604,
-    16688 => 28063, 16689 => 24088, 16690 => 25947, 16691 => 33080, 16692 => 38142,
-    16693 => 24651, 16694 => 28860, 16695 => 32451, 16696 => 31918, 16697 => 20937,
-    16698 => 26753, 16699 => 31921, 16700 => 33391, 16701 => 20004, 16702 => 36742,
-    16703 => 37327, 16704 => 26238, 16705 => 20142, 16706 => 35845, 16707 => 25769,
-    16708 => 32842, 16709 => 20698, 16710 => 30103, 16711 => 29134, 16712 => 23525,
-    16713 => 36797, 16714 => 28518, 16715 => 20102, 16716 => 25730, 16717 => 38243,
-    16718 => 24278, 16719 => 26009, 16720 => 21015, 16721 => 35010, 16722 => 28872,
-    16723 => 21155, 16724 => 29454, 16725 => 29747, 16726 => 26519, 16727 => 30967,
-    16728 => 38678, 16729 => 20020, 16730 => 37051, 16731 => 40158, 16732 => 28107,
-    16733 => 20955, 16734 => 36161, 16735 => 21533, 16736 => 25294, 16737 => 29618,
-    16738 => 33777, 16739 => 38646, 16740 => 40836, 16741 => 38083, 16742 => 20278,
-    16743 => 32666, 16744 => 20940, 16745 => 28789, 16746 => 38517, 16747 => 23725,
-    16748 => 39046, 16749 => 21478, 16750 => 20196, 16751 => 28316, 16752 => 29705,
-    16753 => 27060, 16754 => 30827, 16755 => 39311, 16756 => 30041, 16757 => 21016,
-    16758 => 30244, 16759 => 27969, 16760 => 26611, 16761 => 20845, 16762 => 40857,
-    16763 => 32843, 16764 => 21657, 16765 => 31548, 16766 => 31423, 16929 => 38534,
-    16930 => 22404, 16931 => 25314, 16932 => 38471, 16933 => 27004, 16934 => 23044,
-    16935 => 25602, 16936 => 31699, 16937 => 28431, 16938 => 38475, 16939 => 33446,
-    16940 => 21346, 16941 => 39045, 16942 => 24208, 16943 => 28809, 16944 => 25523,
-    16945 => 21348, 16946 => 34383, 16947 => 40065, 16948 => 40595, 16949 => 30860,
-    16950 => 38706, 16951 => 36335, 16952 => 36162, 16953 => 40575, 16954 => 28510,
-    16955 => 31108, 16956 => 24405, 16957 => 38470, 16958 => 25134, 16959 => 39540,
-    16960 => 21525, 16961 => 38109, 16962 => 20387, 16963 => 26053, 16964 => 23653,
-    16965 => 23649, 16966 => 32533, 16967 => 34385, 16968 => 27695, 16969 => 24459,
-    16970 => 29575, 16971 => 28388, 16972 => 32511, 16973 => 23782, 16974 => 25371,
-    16975 => 23402, 16976 => 28390, 16977 => 21365, 16978 => 20081, 16979 => 25504,
-    16980 => 30053, 16981 => 25249, 16982 => 36718, 16983 => 20262, 16984 => 20177,
-    16985 => 27814, 16986 => 32438, 16987 => 35770, 16988 => 33821, 16989 => 34746,
-    16990 => 32599, 16991 => 36923, 16992 => 38179, 16993 => 31657, 16994 => 39585,
-    16995 => 35064, 16996 => 33853, 16997 => 27931, 16998 => 39558, 16999 => 32476,
-    17000 => 22920, 17001 => 40635, 17002 => 29595, 17003 => 30721, 17004 => 34434,
-    17005 => 39532, 17006 => 39554, 17007 => 22043, 17008 => 21527, 17009 => 22475,
-    17010 => 20080, 17011 => 40614, 17012 => 21334, 17013 => 36808, 17014 => 33033,
-    17015 => 30610, 17016 => 39314, 17017 => 34542, 17018 => 28385, 17019 => 34067,
-    17020 => 26364, 17021 => 24930, 17022 => 28459, 17185 => 35881, 17186 => 33426,
-    17187 => 33579, 17188 => 30450, 17189 => 27667, 17190 => 24537, 17191 => 33725,
-    17192 => 29483, 17193 => 33541, 17194 => 38170, 17195 => 27611, 17196 => 30683,
-    17197 => 38086, 17198 => 21359, 17199 => 33538, 17200 => 20882, 17201 => 24125,
-    17202 => 35980, 17203 => 36152, 17204 => 20040, 17205 => 29611, 17206 => 26522,
-    17207 => 26757, 17208 => 37238, 17209 => 38665, 17210 => 29028, 17211 => 27809,
-    17212 => 30473, 17213 => 23186, 17214 => 38209, 17215 => 27599, 17216 => 32654,
-    17217 => 26151, 17218 => 23504, 17219 => 22969, 17220 => 23194, 17221 => 38376,
-    17222 => 38391, 17223 => 20204, 17224 => 33804, 17225 => 33945, 17226 => 27308,
-    17227 => 30431, 17228 => 38192, 17229 => 29467, 17230 => 26790, 17231 => 23391,
-    17232 => 30511, 17233 => 37274, 17234 => 38753, 17235 => 31964, 17236 => 36855,
-    17237 => 35868, 17238 => 24357, 17239 => 31859, 17240 => 31192, 17241 => 35269,
-    17242 => 27852, 17243 => 34588, 17244 => 23494, 17245 => 24130, 17246 => 26825,
-    17247 => 30496, 17248 => 32501, 17249 => 20885, 17250 => 20813, 17251 => 21193,
-    17252 => 23081, 17253 => 32517, 17254 => 38754, 17255 => 33495, 17256 => 25551,
-    17257 => 30596, 17258 => 34256, 17259 => 31186, 17260 => 28218, 17261 => 24217,
-    17262 => 22937, 17263 => 34065, 17264 => 28781, 17265 => 27665, 17266 => 25279,
-    17267 => 30399, 17268 => 25935, 17269 => 24751, 17270 => 38397, 17271 => 26126,
-    17272 => 34719, 17273 => 40483, 17274 => 38125, 17275 => 21517, 17276 => 21629,
-    17277 => 35884, 17278 => 25720, 17441 => 25721, 17442 => 34321, 17443 => 27169,
-    17444 => 33180, 17445 => 30952, 17446 => 25705, 17447 => 39764, 17448 => 25273,
-    17449 => 26411, 17450 => 33707, 17451 => 22696, 17452 => 40664, 17453 => 27819,
-    17454 => 28448, 17455 => 23518, 17456 => 38476, 17457 => 35851, 17458 => 29279,
-    17459 => 26576, 17460 => 25287, 17461 => 29281, 17462 => 20137, 17463 => 22982,
-    17464 => 27597, 17465 => 22675, 17466 => 26286, 17467 => 24149, 17468 => 21215,
-    17469 => 24917, 17470 => 26408, 17471 => 30446, 17472 => 30566, 17473 => 29287,
-    17474 => 31302, 17475 => 25343, 17476 => 21738, 17477 => 21584, 17478 => 38048,
-    17479 => 37027, 17480 => 23068, 17481 => 32435, 17482 => 27670, 17483 => 20035,
-    17484 => 22902, 17485 => 32784, 17486 => 22856, 17487 => 21335, 17488 => 30007,
-    17489 => 38590, 17490 => 22218, 17491 => 25376, 17492 => 33041, 17493 => 24700,
-    17494 => 38393, 17495 => 28118, 17496 => 21602, 17497 => 39297, 17498 => 20869,
-    17499 => 23273, 17500 => 33021, 17501 => 22958, 17502 => 38675, 17503 => 20522,
-    17504 => 27877, 17505 => 23612, 17506 => 25311, 17507 => 20320, 17508 => 21311,
-    17509 => 33147, 17510 => 36870, 17511 => 28346, 17512 => 34091, 17513 => 25288,
-    17514 => 24180, 17515 => 30910, 17516 => 25781, 17517 => 25467, 17518 => 24565,
-    17519 => 23064, 17520 => 37247, 17521 => 40479, 17522 => 23615, 17523 => 25423,
-    17524 => 32834, 17525 => 23421, 17526 => 21870, 17527 => 38218, 17528 => 38221,
-    17529 => 28037, 17530 => 24744, 17531 => 26592, 17532 => 29406, 17533 => 20957,
-    17534 => 23425, 17697 => 25319, 17698 => 27870, 17699 => 29275, 17700 => 25197,
-    17701 => 38062, 17702 => 32445, 17703 => 33043, 17704 => 27987, 17705 => 20892,
-    17706 => 24324, 17707 => 22900, 17708 => 21162, 17709 => 24594, 17710 => 22899,
-    17711 => 26262, 17712 => 34384, 17713 => 30111, 17714 => 25386, 17715 => 25062,
-    17716 => 31983, 17717 => 35834, 17718 => 21734, 17719 => 27431, 17720 => 40485,
-    17721 => 27572, 17722 => 34261, 17723 => 21589, 17724 => 20598, 17725 => 27812,
-    17726 => 21866, 17727 => 36276, 17728 => 29228, 17729 => 24085, 17730 => 24597,
-    17731 => 29750, 17732 => 25293, 17733 => 25490, 17734 => 29260, 17735 => 24472,
-    17736 => 28227, 17737 => 27966, 17738 => 25856, 17739 => 28504, 17740 => 30424,
-    17741 => 30928, 17742 => 30460, 17743 => 30036, 17744 => 21028, 17745 => 21467,
-    17746 => 20051, 17747 => 24222, 17748 => 26049, 17749 => 32810, 17750 => 32982,
-    17751 => 25243, 17752 => 21638, 17753 => 21032, 17754 => 28846, 17755 => 34957,
-    17756 => 36305, 17757 => 27873, 17758 => 21624, 17759 => 32986, 17760 => 22521,
-    17761 => 35060, 17762 => 36180, 17763 => 38506, 17764 => 37197, 17765 => 20329,
-    17766 => 27803, 17767 => 21943, 17768 => 30406, 17769 => 30768, 17770 => 25256,
-    17771 => 28921, 17772 => 28558, 17773 => 24429, 17774 => 34028, 17775 => 26842,
-    17776 => 30844, 17777 => 31735, 17778 => 33192, 17779 => 26379, 17780 => 40527,
-    17781 => 25447, 17782 => 30896, 17783 => 22383, 17784 => 30738, 17785 => 38713,
-    17786 => 25209, 17787 => 25259, 17788 => 21128, 17789 => 29749, 17790 => 27607,
-    17953 => 21860, 17954 => 33086, 17955 => 30130, 17956 => 30382, 17957 => 21305,
-    17958 => 30174, 17959 => 20731, 17960 => 23617, 17961 => 35692, 17962 => 31687,
-    17963 => 20559, 17964 => 29255, 17965 => 39575, 17966 => 39128, 17967 => 28418,
-    17968 => 29922, 17969 => 31080, 17970 => 25735, 17971 => 30629, 17972 => 25340,
-    17973 => 39057, 17974 => 36139, 17975 => 21697, 17976 => 32856, 17977 => 20050,
-    17978 => 22378, 17979 => 33529, 17980 => 33805, 17981 => 24179, 17982 => 20973,
-    17983 => 29942, 17984 => 35780, 17985 => 23631, 17986 => 22369, 17987 => 27900,
-    17988 => 39047, 17989 => 23110, 17990 => 30772, 17991 => 39748, 17992 => 36843,
-    17993 => 31893, 17994 => 21078, 17995 => 25169, 17996 => 38138, 17997 => 20166,
-    17998 => 33670, 17999 => 33889, 18000 => 33769, 18001 => 33970, 18002 => 22484,
-    18003 => 26420, 18004 => 22275, 18005 => 26222, 18006 => 28006, 18007 => 35889,
-    18008 => 26333, 18009 => 28689, 18010 => 26399, 18011 => 27450, 18012 => 26646,
-    18013 => 25114, 18014 => 22971, 18015 => 19971, 18016 => 20932, 18017 => 28422,
-    18018 => 26578, 18019 => 27791, 18020 => 20854, 18021 => 26827, 18022 => 22855,
-    18023 => 27495, 18024 => 30054, 18025 => 23822, 18026 => 33040, 18027 => 40784,
-    18028 => 26071, 18029 => 31048, 18030 => 31041, 18031 => 39569, 18032 => 36215,
-    18033 => 23682, 18034 => 20062, 18035 => 20225, 18036 => 21551, 18037 => 22865,
-    18038 => 30732, 18039 => 22120, 18040 => 27668, 18041 => 36804, 18042 => 24323,
-    18043 => 27773, 18044 => 27875, 18045 => 35755, 18046 => 25488, 18209 => 24688,
-    18210 => 27965, 18211 => 29301, 18212 => 25190, 18213 => 38030, 18214 => 38085,
-    18215 => 21315, 18216 => 36801, 18217 => 31614, 18218 => 20191, 18219 => 35878,
-    18220 => 20094, 18221 => 40660, 18222 => 38065, 18223 => 38067, 18224 => 21069,
-    18225 => 28508, 18226 => 36963, 18227 => 27973, 18228 => 35892, 18229 => 22545,
-    18230 => 23884, 18231 => 27424, 18232 => 27465, 18233 => 26538, 18234 => 21595,
-    18235 => 33108, 18236 => 32652, 18237 => 22681, 18238 => 34103, 18239 => 24378,
-    18240 => 25250, 18241 => 27207, 18242 => 38201, 18243 => 25970, 18244 => 24708,
-    18245 => 26725, 18246 => 30631, 18247 => 20052, 18248 => 20392, 18249 => 24039,
-    18250 => 38808, 18251 => 25772, 18252 => 32728, 18253 => 23789, 18254 => 20431,
-    18255 => 31373, 18256 => 20999, 18257 => 33540, 18258 => 19988, 18259 => 24623,
-    18260 => 31363, 18261 => 38054, 18262 => 20405, 18263 => 20146, 18264 => 31206,
-    18265 => 29748, 18266 => 21220, 18267 => 33465, 18268 => 25810, 18269 => 31165,
-    18270 => 23517, 18271 => 27777, 18272 => 38738, 18273 => 36731, 18274 => 27682,
-    18275 => 20542, 18276 => 21375, 18277 => 28165, 18278 => 25806, 18279 => 26228,
-    18280 => 27696, 18281 => 24773, 18282 => 39031, 18283 => 35831, 18284 => 24198,
-    18285 => 29756, 18286 => 31351, 18287 => 31179, 18288 => 19992, 18289 => 37041,
-    18290 => 29699, 18291 => 27714, 18292 => 22234, 18293 => 37195, 18294 => 27845,
-    18295 => 36235, 18296 => 21306, 18297 => 34502, 18298 => 26354, 18299 => 36527,
-    18300 => 23624, 18301 => 39537, 18302 => 28192, 18465 => 21462, 18466 => 23094,
-    18467 => 40843, 18468 => 36259, 18469 => 21435, 18470 => 22280, 18471 => 39079,
-    18472 => 26435, 18473 => 37275, 18474 => 27849, 18475 => 20840, 18476 => 30154,
-    18477 => 25331, 18478 => 29356, 18479 => 21048, 18480 => 21149, 18481 => 32570,
-    18482 => 28820, 18483 => 30264, 18484 => 21364, 18485 => 40522, 18486 => 27063,
-    18487 => 30830, 18488 => 38592, 18489 => 35033, 18490 => 32676, 18491 => 28982,
-    18492 => 29123, 18493 => 20873, 18494 => 26579, 18495 => 29924, 18496 => 22756,
-    18497 => 25880, 18498 => 22199, 18499 => 35753, 18500 => 39286, 18501 => 25200,
-    18502 => 32469, 18503 => 24825, 18504 => 28909, 18505 => 22764, 18506 => 20161,
-    18507 => 20154, 18508 => 24525, 18509 => 38887, 18510 => 20219, 18511 => 35748,
-    18512 => 20995, 18513 => 22922, 18514 => 32427, 18515 => 25172, 18516 => 20173,
-    18517 => 26085, 18518 => 25102, 18519 => 33592, 18520 => 33993, 18521 => 33635,
-    18522 => 34701, 18523 => 29076, 18524 => 28342, 18525 => 23481, 18526 => 32466,
-    18527 => 20887, 18528 => 25545, 18529 => 26580, 18530 => 32905, 18531 => 33593,
-    18532 => 34837, 18533 => 20754, 18534 => 23418, 18535 => 22914, 18536 => 36785,
-    18537 => 20083, 18538 => 27741, 18539 => 20837, 18540 => 35109, 18541 => 36719,
-    18542 => 38446, 18543 => 34122, 18544 => 29790, 18545 => 38160, 18546 => 38384,
-    18547 => 28070, 18548 => 33509, 18549 => 24369, 18550 => 25746, 18551 => 27922,
-    18552 => 33832, 18553 => 33134, 18554 => 40131, 18555 => 22622, 18556 => 36187,
-    18557 => 19977, 18558 => 21441, 18721 => 20254, 18722 => 25955, 18723 => 26705,
-    18724 => 21971, 18725 => 20007, 18726 => 25620, 18727 => 39578, 18728 => 25195,
-    18729 => 23234, 18730 => 29791, 18731 => 33394, 18732 => 28073, 18733 => 26862,
-    18734 => 20711, 18735 => 33678, 18736 => 30722, 18737 => 26432, 18738 => 21049,
-    18739 => 27801, 18740 => 32433, 18741 => 20667, 18742 => 21861, 18743 => 29022,
-    18744 => 31579, 18745 => 26194, 18746 => 29642, 18747 => 33515, 18748 => 26441,
-    18749 => 23665, 18750 => 21024, 18751 => 29053, 18752 => 34923, 18753 => 38378,
-    18754 => 38485, 18755 => 25797, 18756 => 36193, 18757 => 33203, 18758 => 21892,
-    18759 => 27733, 18760 => 25159, 18761 => 32558, 18762 => 22674, 18763 => 20260,
-    18764 => 21830, 18765 => 36175, 18766 => 26188, 18767 => 19978, 18768 => 23578,
-    18769 => 35059, 18770 => 26786, 18771 => 25422, 18772 => 31245, 18773 => 28903,
-    18774 => 33421, 18775 => 21242, 18776 => 38902, 18777 => 23569, 18778 => 21736,
-    18779 => 37045, 18780 => 32461, 18781 => 22882, 18782 => 36170, 18783 => 34503,
-    18784 => 33292, 18785 => 33293, 18786 => 36198, 18787 => 25668, 18788 => 23556,
-    18789 => 24913, 18790 => 28041, 18791 => 31038, 18792 => 35774, 18793 => 30775,
-    18794 => 30003, 18795 => 21627, 18796 => 20280, 18797 => 36523, 18798 => 28145,
-    18799 => 23072, 18800 => 32453, 18801 => 31070, 18802 => 27784, 18803 => 23457,
-    18804 => 23158, 18805 => 29978, 18806 => 32958, 18807 => 24910, 18808 => 28183,
-    18809 => 22768, 18810 => 29983, 18811 => 29989, 18812 => 29298, 18813 => 21319,
-    18814 => 32499, 18977 => 30465, 18978 => 30427, 18979 => 21097, 18980 => 32988,
-    18981 => 22307, 18982 => 24072, 18983 => 22833, 18984 => 29422, 18985 => 26045,
-    18986 => 28287, 18987 => 35799, 18988 => 23608, 18989 => 34417, 18990 => 21313,
-    18991 => 30707, 18992 => 25342, 18993 => 26102, 18994 => 20160, 18995 => 39135,
-    18996 => 34432, 18997 => 23454, 18998 => 35782, 18999 => 21490, 19000 => 30690,
-    19001 => 20351, 19002 => 23630, 19003 => 39542, 19004 => 22987, 19005 => 24335,
-    19006 => 31034, 19007 => 22763, 19008 => 19990, 19009 => 26623, 19010 => 20107,
-    19011 => 25325, 19012 => 35475, 19013 => 36893, 19014 => 21183, 19015 => 26159,
-    19016 => 21980, 19017 => 22124, 19018 => 36866, 19019 => 20181, 19020 => 20365,
-    19021 => 37322, 19022 => 39280, 19023 => 27663, 19024 => 24066, 19025 => 24643,
-    19026 => 23460, 19027 => 35270, 19028 => 35797, 19029 => 25910, 19030 => 25163,
-    19031 => 39318, 19032 => 23432, 19033 => 23551, 19034 => 25480, 19035 => 21806,
-    19036 => 21463, 19037 => 30246, 19038 => 20861, 19039 => 34092, 19040 => 26530,
-    19041 => 26803, 19042 => 27530, 19043 => 25234, 19044 => 36755, 19045 => 21460,
-    19046 => 33298, 19047 => 28113, 19048 => 30095, 19049 => 20070, 19050 => 36174,
-    19051 => 23408, 19052 => 29087, 19053 => 34223, 19054 => 26257, 19055 => 26329,
-    19056 => 32626, 19057 => 34560, 19058 => 40653, 19059 => 40736, 19060 => 23646,
-    19061 => 26415, 19062 => 36848, 19063 => 26641, 19064 => 26463, 19065 => 25101,
-    19066 => 31446, 19067 => 22661, 19068 => 24246, 19069 => 25968, 19070 => 28465,
-    19233 => 24661, 19234 => 21047, 19235 => 32781, 19236 => 25684, 19237 => 34928,
-    19238 => 29993, 19239 => 24069, 19240 => 26643, 19241 => 25332, 19242 => 38684,
-    19243 => 21452, 19244 => 29245, 19245 => 35841, 19246 => 27700, 19247 => 30561,
-    19248 => 31246, 19249 => 21550, 19250 => 30636, 19251 => 39034, 19252 => 33308,
-    19253 => 35828, 19254 => 30805, 19255 => 26388, 19256 => 28865, 19257 => 26031,
-    19258 => 25749, 19259 => 22070, 19260 => 24605, 19261 => 31169, 19262 => 21496,
-    19263 => 19997, 19264 => 27515, 19265 => 32902, 19266 => 23546, 19267 => 21987,
-    19268 => 22235, 19269 => 20282, 19270 => 20284, 19271 => 39282, 19272 => 24051,
-    19273 => 26494, 19274 => 32824, 19275 => 24578, 19276 => 39042, 19277 => 36865,
-    19278 => 23435, 19279 => 35772, 19280 => 35829, 19281 => 25628, 19282 => 33368,
-    19283 => 25822, 19284 => 22013, 19285 => 33487, 19286 => 37221, 19287 => 20439,
-    19288 => 32032, 19289 => 36895, 19290 => 31903, 19291 => 20723, 19292 => 22609,
-    19293 => 28335, 19294 => 23487, 19295 => 35785, 19296 => 32899, 19297 => 37240,
-    19298 => 33948, 19299 => 31639, 19300 => 34429, 19301 => 38539, 19302 => 38543,
-    19303 => 32485, 19304 => 39635, 19305 => 30862, 19306 => 23681, 19307 => 31319,
-    19308 => 36930, 19309 => 38567, 19310 => 31071, 19311 => 23385, 19312 => 25439,
-    19313 => 31499, 19314 => 34001, 19315 => 26797, 19316 => 21766, 19317 => 32553,
-    19318 => 29712, 19319 => 32034, 19320 => 38145, 19321 => 25152, 19322 => 22604,
-    19323 => 20182, 19324 => 23427, 19325 => 22905, 19326 => 22612, 19489 => 29549,
-    19490 => 25374, 19491 => 36427, 19492 => 36367, 19493 => 32974, 19494 => 33492,
-    19495 => 25260, 19496 => 21488, 19497 => 27888, 19498 => 37214, 19499 => 22826,
-    19500 => 24577, 19501 => 27760, 19502 => 22349, 19503 => 25674, 19504 => 36138,
-    19505 => 30251, 19506 => 28393, 19507 => 22363, 19508 => 27264, 19509 => 30192,
-    19510 => 28525, 19511 => 35885, 19512 => 35848, 19513 => 22374, 19514 => 27631,
-    19515 => 34962, 19516 => 30899, 19517 => 25506, 19518 => 21497, 19519 => 28845,
-    19520 => 27748, 19521 => 22616, 19522 => 25642, 19523 => 22530, 19524 => 26848,
-    19525 => 33179, 19526 => 21776, 19527 => 31958, 19528 => 20504, 19529 => 36538,
-    19530 => 28108, 19531 => 36255, 19532 => 28907, 19533 => 25487, 19534 => 28059,
-    19535 => 28372, 19536 => 32486, 19537 => 33796, 19538 => 26691, 19539 => 36867,
-    19540 => 28120, 19541 => 38518, 19542 => 35752, 19543 => 22871, 19544 => 29305,
-    19545 => 34276, 19546 => 33150, 19547 => 30140, 19548 => 35466, 19549 => 26799,
-    19550 => 21076, 19551 => 36386, 19552 => 38161, 19553 => 25552, 19554 => 39064,
-    19555 => 36420, 19556 => 21884, 19557 => 20307, 19558 => 26367, 19559 => 22159,
-    19560 => 24789, 19561 => 28053, 19562 => 21059, 19563 => 23625, 19564 => 22825,
-    19565 => 28155, 19566 => 22635, 19567 => 30000, 19568 => 29980, 19569 => 24684,
-    19570 => 33300, 19571 => 33094, 19572 => 25361, 19573 => 26465, 19574 => 36834,
-    19575 => 30522, 19576 => 36339, 19577 => 36148, 19578 => 38081, 19579 => 24086,
-    19580 => 21381, 19581 => 21548, 19582 => 28867, 19745 => 27712, 19746 => 24311,
-    19747 => 20572, 19748 => 20141, 19749 => 24237, 19750 => 25402, 19751 => 33351,
-    19752 => 36890, 19753 => 26704, 19754 => 37230, 19755 => 30643, 19756 => 21516,
-    19757 => 38108, 19758 => 24420, 19759 => 31461, 19760 => 26742, 19761 => 25413,
-    19762 => 31570, 19763 => 32479, 19764 => 30171, 19765 => 20599, 19766 => 25237,
-    19767 => 22836, 19768 => 36879, 19769 => 20984, 19770 => 31171, 19771 => 31361,
-    19772 => 22270, 19773 => 24466, 19774 => 36884, 19775 => 28034, 19776 => 23648,
-    19777 => 22303, 19778 => 21520, 19779 => 20820, 19780 => 28237, 19781 => 22242,
-    19782 => 25512, 19783 => 39059, 19784 => 33151, 19785 => 34581, 19786 => 35114,
-    19787 => 36864, 19788 => 21534, 19789 => 23663, 19790 => 33216, 19791 => 25302,
-    19792 => 25176, 19793 => 33073, 19794 => 40501, 19795 => 38464, 19796 => 39534,
-    19797 => 39548, 19798 => 26925, 19799 => 22949, 19800 => 25299, 19801 => 21822,
-    19802 => 25366, 19803 => 21703, 19804 => 34521, 19805 => 27964, 19806 => 23043,
-    19807 => 29926, 19808 => 34972, 19809 => 27498, 19810 => 22806, 19811 => 35916,
-    19812 => 24367, 19813 => 28286, 19814 => 29609, 19815 => 39037, 19816 => 20024,
-    19817 => 28919, 19818 => 23436, 19819 => 30871, 19820 => 25405, 19821 => 26202,
-    19822 => 30358, 19823 => 24779, 19824 => 23451, 19825 => 23113, 19826 => 19975,
-    19827 => 33109, 19828 => 27754, 19829 => 29579, 19830 => 20129, 19831 => 26505,
-    19832 => 32593, 19833 => 24448, 19834 => 26106, 19835 => 26395, 19836 => 24536,
-    19837 => 22916, 19838 => 23041, 20001 => 24013, 20002 => 24494, 20003 => 21361,
-    20004 => 38886, 20005 => 36829, 20006 => 26693, 20007 => 22260, 20008 => 21807,
-    20009 => 24799, 20010 => 20026, 20011 => 28493, 20012 => 32500, 20013 => 33479,
-    20014 => 33806, 20015 => 22996, 20016 => 20255, 20017 => 20266, 20018 => 23614,
-    20019 => 32428, 20020 => 26410, 20021 => 34074, 20022 => 21619, 20023 => 30031,
-    20024 => 32963, 20025 => 21890, 20026 => 39759, 20027 => 20301, 20028 => 28205,
-    20029 => 35859, 20030 => 23561, 20031 => 24944, 20032 => 21355, 20033 => 30239,
-    20034 => 28201, 20035 => 34442, 20036 => 25991, 20037 => 38395, 20038 => 32441,
-    20039 => 21563, 20040 => 31283, 20041 => 32010, 20042 => 38382, 20043 => 21985,
-    20044 => 32705, 20045 => 29934, 20046 => 25373, 20047 => 34583, 20048 => 28065,
-    20049 => 31389, 20050 => 25105, 20051 => 26017, 20052 => 21351, 20053 => 25569,
-    20054 => 27779, 20055 => 24043, 20056 => 21596, 20057 => 38056, 20058 => 20044,
-    20059 => 27745, 20060 => 35820, 20061 => 23627, 20062 => 26080, 20063 => 33436,
-    20064 => 26791, 20065 => 21566, 20066 => 21556, 20067 => 27595, 20068 => 27494,
-    20069 => 20116, 20070 => 25410, 20071 => 21320, 20072 => 33310, 20073 => 20237,
-    20074 => 20398, 20075 => 22366, 20076 => 25098, 20077 => 38654, 20078 => 26212,
-    20079 => 29289, 20080 => 21247, 20081 => 21153, 20082 => 24735, 20083 => 35823,
-    20084 => 26132, 20085 => 29081, 20086 => 26512, 20087 => 35199, 20088 => 30802,
-    20089 => 30717, 20090 => 26224, 20091 => 22075, 20092 => 21560, 20093 => 38177,
-    20094 => 29306, 20257 => 31232, 20258 => 24687, 20259 => 24076, 20260 => 24713,
-    20261 => 33181, 20262 => 22805, 20263 => 24796, 20264 => 29060, 20265 => 28911,
-    20266 => 28330, 20267 => 27728, 20268 => 29312, 20269 => 27268, 20270 => 34989,
-    20271 => 24109, 20272 => 20064, 20273 => 23219, 20274 => 21916, 20275 => 38115,
-    20276 => 27927, 20277 => 31995, 20278 => 38553, 20279 => 25103, 20280 => 32454,
-    20281 => 30606, 20282 => 34430, 20283 => 21283, 20284 => 38686, 20285 => 36758,
-    20286 => 26247, 20287 => 23777, 20288 => 20384, 20289 => 29421, 20290 => 19979,
-    20291 => 21414, 20292 => 22799, 20293 => 21523, 20294 => 25472, 20295 => 38184,
-    20296 => 20808, 20297 => 20185, 20298 => 40092, 20299 => 32420, 20300 => 21688,
-    20301 => 36132, 20302 => 34900, 20303 => 33335, 20304 => 38386, 20305 => 28046,
-    20306 => 24358, 20307 => 23244, 20308 => 26174, 20309 => 38505, 20310 => 29616,
-    20311 => 29486, 20312 => 21439, 20313 => 33146, 20314 => 39301, 20315 => 32673,
-    20316 => 23466, 20317 => 38519, 20318 => 38480, 20319 => 32447, 20320 => 30456,
-    20321 => 21410, 20322 => 38262, 20323 => 39321, 20324 => 31665, 20325 => 35140,
-    20326 => 28248, 20327 => 20065, 20328 => 32724, 20329 => 31077, 20330 => 35814,
-    20331 => 24819, 20332 => 21709, 20333 => 20139, 20334 => 39033, 20335 => 24055,
-    20336 => 27233, 20337 => 20687, 20338 => 21521, 20339 => 35937, 20340 => 33831,
-    20341 => 30813, 20342 => 38660, 20343 => 21066, 20344 => 21742, 20345 => 22179,
-    20346 => 38144, 20347 => 28040, 20348 => 23477, 20349 => 28102, 20350 => 26195,
-    20513 => 23567, 20514 => 23389, 20515 => 26657, 20516 => 32918, 20517 => 21880,
-    20518 => 31505, 20519 => 25928, 20520 => 26964, 20521 => 20123, 20522 => 27463,
-    20523 => 34638, 20524 => 38795, 20525 => 21327, 20526 => 25375, 20527 => 25658,
-    20528 => 37034, 20529 => 26012, 20530 => 32961, 20531 => 35856, 20532 => 20889,
-    20533 => 26800, 20534 => 21368, 20535 => 34809, 20536 => 25032, 20537 => 27844,
-    20538 => 27899, 20539 => 35874, 20540 => 23633, 20541 => 34218, 20542 => 33455,
-    20543 => 38156, 20544 => 27427, 20545 => 36763, 20546 => 26032, 20547 => 24571,
-    20548 => 24515, 20549 => 20449, 20550 => 34885, 20551 => 26143, 20552 => 33125,
-    20553 => 29481, 20554 => 24826, 20555 => 20852, 20556 => 21009, 20557 => 22411,
-    20558 => 24418, 20559 => 37026, 20560 => 34892, 20561 => 37266, 20562 => 24184,
-    20563 => 26447, 20564 => 24615, 20565 => 22995, 20566 => 20804, 20567 => 20982,
-    20568 => 33016, 20569 => 21256, 20570 => 27769, 20571 => 38596, 20572 => 29066,
-    20573 => 20241, 20574 => 20462, 20575 => 32670, 20576 => 26429, 20577 => 21957,
-    20578 => 38152, 20579 => 31168, 20580 => 34966, 20581 => 32483, 20582 => 22687,
-    20583 => 25100, 20584 => 38656, 20585 => 34394, 20586 => 22040, 20587 => 39035,
-    20588 => 24464, 20589 => 35768, 20590 => 33988, 20591 => 37207, 20592 => 21465,
-    20593 => 26093, 20594 => 24207, 20595 => 30044, 20596 => 24676, 20597 => 32110,
-    20598 => 23167, 20599 => 32490, 20600 => 32493, 20601 => 36713, 20602 => 21927,
-    20603 => 23459, 20604 => 24748, 20605 => 26059, 20606 => 29572, 20769 => 36873,
-    20770 => 30307, 20771 => 30505, 20772 => 32474, 20773 => 38772, 20774 => 34203,
-    20775 => 23398, 20776 => 31348, 20777 => 38634, 20778 => 34880, 20779 => 21195,
-    20780 => 29071, 20781 => 24490, 20782 => 26092, 20783 => 35810, 20784 => 23547,
-    20785 => 39535, 20786 => 24033, 20787 => 27529, 20788 => 27739, 20789 => 35757,
-    20790 => 35759, 20791 => 36874, 20792 => 36805, 20793 => 21387, 20794 => 25276,
-    20795 => 40486, 20796 => 40493, 20797 => 21568, 20798 => 20011, 20799 => 33469,
-    20800 => 29273, 20801 => 34460, 20802 => 23830, 20803 => 34905, 20804 => 28079,
-    20805 => 38597, 20806 => 21713, 20807 => 20122, 20808 => 35766, 20809 => 28937,
-    20810 => 21693, 20811 => 38409, 20812 => 28895, 20813 => 28153, 20814 => 30416,
-    20815 => 20005, 20816 => 30740, 20817 => 34578, 20818 => 23721, 20819 => 24310,
-    20820 => 35328, 20821 => 39068, 20822 => 38414, 20823 => 28814, 20824 => 27839,
-    20825 => 22852, 20826 => 25513, 20827 => 30524, 20828 => 34893, 20829 => 28436,
-    20830 => 33395, 20831 => 22576, 20832 => 29141, 20833 => 21388, 20834 => 30746,
-    20835 => 38593, 20836 => 21761, 20837 => 24422, 20838 => 28976, 20839 => 23476,
-    20840 => 35866, 20841 => 39564, 20842 => 27523, 20843 => 22830, 20844 => 40495,
-    20845 => 31207, 20846 => 26472, 20847 => 25196, 20848 => 20335, 20849 => 30113,
-    20850 => 32650, 20851 => 27915, 20852 => 38451, 20853 => 27687, 20854 => 20208,
-    20855 => 30162, 20856 => 20859, 20857 => 26679, 20858 => 28478, 20859 => 36992,
-    20860 => 33136, 20861 => 22934, 20862 => 29814, 21025 => 25671, 21026 => 23591,
-    21027 => 36965, 21028 => 31377, 21029 => 35875, 21030 => 23002, 21031 => 21676,
-    21032 => 33280, 21033 => 33647, 21034 => 35201, 21035 => 32768, 21036 => 26928,
-    21037 => 22094, 21038 => 32822, 21039 => 29239, 21040 => 37326, 21041 => 20918,
-    21042 => 20063, 21043 => 39029, 21044 => 25494, 21045 => 19994, 21046 => 21494,
-    21047 => 26355, 21048 => 33099, 21049 => 22812, 21050 => 28082, 21051 => 19968,
-    21052 => 22777, 21053 => 21307, 21054 => 25558, 21055 => 38129, 21056 => 20381,
-    21057 => 20234, 21058 => 34915, 21059 => 39056, 21060 => 22839, 21061 => 36951,
-    21062 => 31227, 21063 => 20202, 21064 => 33008, 21065 => 30097, 21066 => 27778,
-    21067 => 23452, 21068 => 23016, 21069 => 24413, 21070 => 26885, 21071 => 34433,
-    21072 => 20506, 21073 => 24050, 21074 => 20057, 21075 => 30691, 21076 => 20197,
-    21077 => 33402, 21078 => 25233, 21079 => 26131, 21080 => 37009, 21081 => 23673,
-    21082 => 20159, 21083 => 24441, 21084 => 33222, 21085 => 36920, 21086 => 32900,
-    21087 => 30123, 21088 => 20134, 21089 => 35028, 21090 => 24847, 21091 => 27589,
-    21092 => 24518, 21093 => 20041, 21094 => 30410, 21095 => 28322, 21096 => 35811,
-    21097 => 35758, 21098 => 35850, 21099 => 35793, 21100 => 24322, 21101 => 32764,
-    21102 => 32716, 21103 => 32462, 21104 => 33589, 21105 => 33643, 21106 => 22240,
-    21107 => 27575, 21108 => 38899, 21109 => 38452, 21110 => 23035, 21111 => 21535,
-    21112 => 38134, 21113 => 28139, 21114 => 23493, 21115 => 39278, 21116 => 23609,
-    21117 => 24341, 21118 => 38544, 21281 => 21360, 21282 => 33521, 21283 => 27185,
-    21284 => 23156, 21285 => 40560, 21286 => 24212, 21287 => 32552, 21288 => 33721,
-    21289 => 33828, 21290 => 33829, 21291 => 33639, 21292 => 34631, 21293 => 36814,
-    21294 => 36194, 21295 => 30408, 21296 => 24433, 21297 => 39062, 21298 => 30828,
-    21299 => 26144, 21300 => 21727, 21301 => 25317, 21302 => 20323, 21303 => 33219,
-    21304 => 30152, 21305 => 24248, 21306 => 38605, 21307 => 36362, 21308 => 34553,
-    21309 => 21647, 21310 => 27891, 21311 => 28044, 21312 => 27704, 21313 => 24703,
-    21314 => 21191, 21315 => 29992, 21316 => 24189, 21317 => 20248, 21318 => 24736,
-    21319 => 24551, 21320 => 23588, 21321 => 30001, 21322 => 37038, 21323 => 38080,
-    21324 => 29369, 21325 => 27833, 21326 => 28216, 21327 => 37193, 21328 => 26377,
-    21329 => 21451, 21330 => 21491, 21331 => 20305, 21332 => 37321, 21333 => 35825,
-    21334 => 21448, 21335 => 24188, 21336 => 36802, 21337 => 28132, 21338 => 20110,
-    21339 => 30402, 21340 => 27014, 21341 => 34398, 21342 => 24858, 21343 => 33286,
-    21344 => 20313, 21345 => 20446, 21346 => 36926, 21347 => 40060, 21348 => 24841,
-    21349 => 28189, 21350 => 28180, 21351 => 38533, 21352 => 20104, 21353 => 23089,
-    21354 => 38632, 21355 => 19982, 21356 => 23679, 21357 => 31161, 21358 => 23431,
-    21359 => 35821, 21360 => 32701, 21361 => 29577, 21362 => 22495, 21363 => 33419,
-    21364 => 37057, 21365 => 21505, 21366 => 36935, 21367 => 21947, 21368 => 23786,
-    21369 => 24481, 21370 => 24840, 21371 => 27442, 21372 => 29425, 21373 => 32946,
-    21374 => 35465, 21537 => 28020, 21538 => 23507, 21539 => 35029, 21540 => 39044,
-    21541 => 35947, 21542 => 39533, 21543 => 40499, 21544 => 28170, 21545 => 20900,
-    21546 => 20803, 21547 => 22435, 21548 => 34945, 21549 => 21407, 21550 => 25588,
-    21551 => 36757, 21552 => 22253, 21553 => 21592, 21554 => 22278, 21555 => 29503,
-    21556 => 28304, 21557 => 32536, 21558 => 36828, 21559 => 33489, 21560 => 24895,
-    21561 => 24616, 21562 => 38498, 21563 => 26352, 21564 => 32422, 21565 => 36234,
-    21566 => 36291, 21567 => 38053, 21568 => 23731, 21569 => 31908, 21570 => 26376,
-    21571 => 24742, 21572 => 38405, 21573 => 32792, 21574 => 20113, 21575 => 37095,
-    21576 => 21248, 21577 => 38504, 21578 => 20801, 21579 => 36816, 21580 => 34164,
-    21581 => 37213, 21582 => 26197, 21583 => 38901, 21584 => 23381, 21585 => 21277,
-    21586 => 30776, 21587 => 26434, 21588 => 26685, 21589 => 21705, 21590 => 28798,
-    21591 => 23472, 21592 => 36733, 21593 => 20877, 21594 => 22312, 21595 => 21681,
-    21596 => 25874, 21597 => 26242, 21598 => 36190, 21599 => 36163, 21600 => 33039,
-    21601 => 33900, 21602 => 36973, 21603 => 31967, 21604 => 20991, 21605 => 34299,
-    21606 => 26531, 21607 => 26089, 21608 => 28577, 21609 => 34468, 21610 => 36481,
-    21611 => 22122, 21612 => 36896, 21613 => 30338, 21614 => 28790, 21615 => 29157,
-    21616 => 36131, 21617 => 25321, 21618 => 21017, 21619 => 27901, 21620 => 36156,
-    21621 => 24590, 21622 => 22686, 21623 => 24974, 21624 => 26366, 21625 => 36192,
-    21626 => 25166, 21627 => 21939, 21628 => 28195, 21629 => 26413, 21630 => 36711,
-    21793 => 38113, 21794 => 38392, 21795 => 30504, 21796 => 26629, 21797 => 27048,
-    21798 => 21643, 21799 => 20045, 21800 => 28856, 21801 => 35784, 21802 => 25688,
-    21803 => 25995, 21804 => 23429, 21805 => 31364, 21806 => 20538, 21807 => 23528,
-    21808 => 30651, 21809 => 27617, 21810 => 35449, 21811 => 31896, 21812 => 27838,
-    21813 => 30415, 21814 => 26025, 21815 => 36759, 21816 => 23853, 21817 => 23637,
-    21818 => 34360, 21819 => 26632, 21820 => 21344, 21821 => 25112, 21822 => 31449,
-    21823 => 28251, 21824 => 32509, 21825 => 27167, 21826 => 31456, 21827 => 24432,
-    21828 => 28467, 21829 => 24352, 21830 => 25484, 21831 => 28072, 21832 => 26454,
-    21833 => 19976, 21834 => 24080, 21835 => 36134, 21836 => 20183, 21837 => 32960,
-    21838 => 30260, 21839 => 38556, 21840 => 25307, 21841 => 26157, 21842 => 25214,
-    21843 => 27836, 21844 => 36213, 21845 => 29031, 21846 => 32617, 21847 => 20806,
-    21848 => 32903, 21849 => 21484, 21850 => 36974, 21851 => 25240, 21852 => 21746,
-    21853 => 34544, 21854 => 36761, 21855 => 32773, 21856 => 38167, 21857 => 34071,
-    21858 => 36825, 21859 => 27993, 21860 => 29645, 21861 => 26015, 21862 => 30495,
-    21863 => 29956, 21864 => 30759, 21865 => 33275, 21866 => 36126, 21867 => 38024,
-    21868 => 20390, 21869 => 26517, 21870 => 30137, 21871 => 35786, 21872 => 38663,
-    21873 => 25391, 21874 => 38215, 21875 => 38453, 21876 => 33976, 21877 => 25379,
-    21878 => 30529, 21879 => 24449, 21880 => 29424, 21881 => 20105, 21882 => 24596,
-    21883 => 25972, 21884 => 25327, 21885 => 27491, 21886 => 25919, 22049 => 24103,
-    22050 => 30151, 22051 => 37073, 22052 => 35777, 22053 => 33437, 22054 => 26525,
-    22055 => 25903, 22056 => 21553, 22057 => 34584, 22058 => 30693, 22059 => 32930,
-    22060 => 33026, 22061 => 27713, 22062 => 20043, 22063 => 32455, 22064 => 32844,
-    22065 => 30452, 22066 => 26893, 22067 => 27542, 22068 => 25191, 22069 => 20540,
-    22070 => 20356, 22071 => 22336, 22072 => 25351, 22073 => 27490, 22074 => 36286,
-    22075 => 21482, 22076 => 26088, 22077 => 32440, 22078 => 24535, 22079 => 25370,
-    22080 => 25527, 22081 => 33267, 22082 => 33268, 22083 => 32622, 22084 => 24092,
-    22085 => 23769, 22086 => 21046, 22087 => 26234, 22088 => 31209, 22089 => 31258,
-    22090 => 36136, 22091 => 28825, 22092 => 30164, 22093 => 28382, 22094 => 27835,
-    22095 => 31378, 22096 => 20013, 22097 => 30405, 22098 => 24544, 22099 => 38047,
-    22100 => 34935, 22101 => 32456, 22102 => 31181, 22103 => 32959, 22104 => 37325,
-    22105 => 20210, 22106 => 20247, 22107 => 33311, 22108 => 21608, 22109 => 24030,
-    22110 => 27954, 22111 => 35788, 22112 => 31909, 22113 => 36724, 22114 => 32920,
-    22115 => 24090, 22116 => 21650, 22117 => 30385, 22118 => 23449, 22119 => 26172,
-    22120 => 39588, 22121 => 29664, 22122 => 26666, 22123 => 34523, 22124 => 26417,
-    22125 => 29482, 22126 => 35832, 22127 => 35803, 22128 => 36880, 22129 => 31481,
-    22130 => 28891, 22131 => 29038, 22132 => 25284, 22133 => 30633, 22134 => 22065,
-    22135 => 20027, 22136 => 33879, 22137 => 26609, 22138 => 21161, 22139 => 34496,
-    22140 => 36142, 22141 => 38136, 22142 => 31569, 22305 => 20303, 22306 => 27880,
-    22307 => 31069, 22308 => 39547, 22309 => 25235, 22310 => 29226, 22311 => 25341,
-    22312 => 19987, 22313 => 30742, 22314 => 36716, 22315 => 25776, 22316 => 36186,
-    22317 => 31686, 22318 => 26729, 22319 => 24196, 22320 => 35013, 22321 => 22918,
-    22322 => 25758, 22323 => 22766, 22324 => 29366, 22325 => 26894, 22326 => 38181,
-    22327 => 36861, 22328 => 36184, 22329 => 22368, 22330 => 32512, 22331 => 35846,
-    22332 => 20934, 22333 => 25417, 22334 => 25305, 22335 => 21331, 22336 => 26700,
-    22337 => 29730, 22338 => 33537, 22339 => 37196, 22340 => 21828, 22341 => 30528,
-    22342 => 28796, 22343 => 27978, 22344 => 20857, 22345 => 21672, 22346 => 36164,
-    22347 => 23039, 22348 => 28363, 22349 => 28100, 22350 => 23388, 22351 => 32043,
-    22352 => 20180, 22353 => 31869, 22354 => 28371, 22355 => 23376, 22356 => 33258,
-    22357 => 28173, 22358 => 23383, 22359 => 39683, 22360 => 26837, 22361 => 36394,
-    22362 => 23447, 22363 => 32508, 22364 => 24635, 22365 => 32437, 22366 => 37049,
-    22367 => 36208, 22368 => 22863, 22369 => 25549, 22370 => 31199, 22371 => 36275,
-    22372 => 21330, 22373 => 26063, 22374 => 31062, 22375 => 35781, 22376 => 38459,
-    22377 => 32452, 22378 => 38075, 22379 => 32386, 22380 => 22068, 22381 => 37257,
-    22382 => 26368, 22383 => 32618, 22384 => 23562, 22385 => 36981, 22386 => 26152,
-    22387 => 24038, 22388 => 20304, 22389 => 26590, 22390 => 20570, 22391 => 20316,
-    22392 => 22352, 22393 => 24231, 22561 => 20109, 22562 => 19980, 22563 => 20800,
-    22564 => 19984, 22565 => 24319, 22566 => 21317, 22567 => 19989, 22568 => 20120,
-    22569 => 19998, 22570 => 39730, 22571 => 23404, 22572 => 22121, 22573 => 20008,
-    22574 => 31162, 22575 => 20031, 22576 => 21269, 22577 => 20039, 22578 => 22829,
-    22579 => 29243, 22580 => 21358, 22581 => 27664, 22582 => 22239, 22583 => 32996,
-    22584 => 39319, 22585 => 27603, 22586 => 30590, 22587 => 40727, 22588 => 20022,
-    22589 => 20127, 22590 => 40720, 22591 => 20060, 22592 => 20073, 22593 => 20115,
-    22594 => 33416, 22595 => 23387, 22596 => 21868, 22597 => 22031, 22598 => 20164,
-    22599 => 21389, 22600 => 21405, 22601 => 21411, 22602 => 21413, 22603 => 21422,
-    22604 => 38757, 22605 => 36189, 22606 => 21274, 22607 => 21493, 22608 => 21286,
-    22609 => 21294, 22610 => 21310, 22611 => 36188, 22612 => 21350, 22613 => 21347,
-    22614 => 20994, 22615 => 21000, 22616 => 21006, 22617 => 21037, 22618 => 21043,
-    22619 => 21055, 22620 => 21056, 22621 => 21068, 22622 => 21086, 22623 => 21089,
-    22624 => 21084, 22625 => 33967, 22626 => 21117, 22627 => 21122, 22628 => 21121,
-    22629 => 21136, 22630 => 21139, 22631 => 20866, 22632 => 32596, 22633 => 20155,
-    22634 => 20163, 22635 => 20169, 22636 => 20162, 22637 => 20200, 22638 => 20193,
-    22639 => 20203, 22640 => 20190, 22641 => 20251, 22642 => 20211, 22643 => 20258,
-    22644 => 20324, 22645 => 20213, 22646 => 20261, 22647 => 20263, 22648 => 20233,
-    22649 => 20267, 22650 => 20318, 22651 => 20327, 22652 => 25912, 22653 => 20314,
-    22654 => 20317, 22817 => 20319, 22818 => 20311, 22819 => 20274, 22820 => 20285,
-    22821 => 20342, 22822 => 20340, 22823 => 20369, 22824 => 20361, 22825 => 20355,
-    22826 => 20367, 22827 => 20350, 22828 => 20347, 22829 => 20394, 22830 => 20348,
-    22831 => 20396, 22832 => 20372, 22833 => 20454, 22834 => 20456, 22835 => 20458,
-    22836 => 20421, 22837 => 20442, 22838 => 20451, 22839 => 20444, 22840 => 20433,
-    22841 => 20447, 22842 => 20472, 22843 => 20521, 22844 => 20556, 22845 => 20467,
-    22846 => 20524, 22847 => 20495, 22848 => 20526, 22849 => 20525, 22850 => 20478,
-    22851 => 20508, 22852 => 20492, 22853 => 20517, 22854 => 20520, 22855 => 20606,
-    22856 => 20547, 22857 => 20565, 22858 => 20552, 22859 => 20558, 22860 => 20588,
-    22861 => 20603, 22862 => 20645, 22863 => 20647, 22864 => 20649, 22865 => 20666,
-    22866 => 20694, 22867 => 20742, 22868 => 20717, 22869 => 20716, 22870 => 20710,
-    22871 => 20718, 22872 => 20743, 22873 => 20747, 22874 => 20189, 22875 => 27709,
-    22876 => 20312, 22877 => 20325, 22878 => 20430, 22879 => 40864, 22880 => 27718,
-    22881 => 31860, 22882 => 20846, 22883 => 24061, 22884 => 40649, 22885 => 39320,
-    22886 => 20865, 22887 => 22804, 22888 => 21241, 22889 => 21261, 22890 => 35335,
-    22891 => 21264, 22892 => 20971, 22893 => 22809, 22894 => 20821, 22895 => 20128,
-    22896 => 20822, 22897 => 20147, 22898 => 34926, 22899 => 34980, 22900 => 20149,
-    22901 => 33044, 22902 => 35026, 22903 => 31104, 22904 => 23348, 22905 => 34819,
-    22906 => 32696, 22907 => 20907, 22908 => 20913, 22909 => 20925, 22910 => 20924,
-    23073 => 20935, 23074 => 20886, 23075 => 20898, 23076 => 20901, 23077 => 35744,
-    23078 => 35750, 23079 => 35751, 23080 => 35754, 23081 => 35764, 23082 => 35765,
-    23083 => 35767, 23084 => 35778, 23085 => 35779, 23086 => 35787, 23087 => 35791,
-    23088 => 35790, 23089 => 35794, 23090 => 35795, 23091 => 35796, 23092 => 35798,
-    23093 => 35800, 23094 => 35801, 23095 => 35804, 23096 => 35807, 23097 => 35808,
-    23098 => 35812, 23099 => 35816, 23100 => 35817, 23101 => 35822, 23102 => 35824,
-    23103 => 35827, 23104 => 35830, 23105 => 35833, 23106 => 35836, 23107 => 35839,
-    23108 => 35840, 23109 => 35842, 23110 => 35844, 23111 => 35847, 23112 => 35852,
-    23113 => 35855, 23114 => 35857, 23115 => 35858, 23116 => 35860, 23117 => 35861,
-    23118 => 35862, 23119 => 35865, 23120 => 35867, 23121 => 35864, 23122 => 35869,
-    23123 => 35871, 23124 => 35872, 23125 => 35873, 23126 => 35877, 23127 => 35879,
-    23128 => 35882, 23129 => 35883, 23130 => 35886, 23131 => 35887, 23132 => 35890,
-    23133 => 35891, 23134 => 35893, 23135 => 35894, 23136 => 21353, 23137 => 21370,
-    23138 => 38429, 23139 => 38434, 23140 => 38433, 23141 => 38449, 23142 => 38442,
-    23143 => 38461, 23144 => 38460, 23145 => 38466, 23146 => 38473, 23147 => 38484,
-    23148 => 38495, 23149 => 38503, 23150 => 38508, 23151 => 38514, 23152 => 38516,
-    23153 => 38536, 23154 => 38541, 23155 => 38551, 23156 => 38576, 23157 => 37015,
-    23158 => 37019, 23159 => 37021, 23160 => 37017, 23161 => 37036, 23162 => 37025,
-    23163 => 37044, 23164 => 37043, 23165 => 37046, 23166 => 37050, 23329 => 37048,
-    23330 => 37040, 23331 => 37071, 23332 => 37061, 23333 => 37054, 23334 => 37072,
-    23335 => 37060, 23336 => 37063, 23337 => 37075, 23338 => 37094, 23339 => 37090,
-    23340 => 37084, 23341 => 37079, 23342 => 37083, 23343 => 37099, 23344 => 37103,
-    23345 => 37118, 23346 => 37124, 23347 => 37154, 23348 => 37150, 23349 => 37155,
-    23350 => 37169, 23351 => 37167, 23352 => 37177, 23353 => 37187, 23354 => 37190,
-    23355 => 21005, 23356 => 22850, 23357 => 21154, 23358 => 21164, 23359 => 21165,
-    23360 => 21182, 23361 => 21759, 23362 => 21200, 23363 => 21206, 23364 => 21232,
-    23365 => 21471, 23366 => 29166, 23367 => 30669, 23368 => 24308, 23369 => 20981,
-    23370 => 20988, 23371 => 39727, 23372 => 21430, 23373 => 24321, 23374 => 30042,
-    23375 => 24047, 23376 => 22348, 23377 => 22441, 23378 => 22433, 23379 => 22654,
-    23380 => 22716, 23381 => 22725, 23382 => 22737, 23383 => 22313, 23384 => 22316,
-    23385 => 22314, 23386 => 22323, 23387 => 22329, 23388 => 22318, 23389 => 22319,
-    23390 => 22364, 23391 => 22331, 23392 => 22338, 23393 => 22377, 23394 => 22405,
-    23395 => 22379, 23396 => 22406, 23397 => 22396, 23398 => 22395, 23399 => 22376,
-    23400 => 22381, 23401 => 22390, 23402 => 22387, 23403 => 22445, 23404 => 22436,
-    23405 => 22412, 23406 => 22450, 23407 => 22479, 23408 => 22439, 23409 => 22452,
-    23410 => 22419, 23411 => 22432, 23412 => 22485, 23413 => 22488, 23414 => 22490,
-    23415 => 22489, 23416 => 22482, 23417 => 22456, 23418 => 22516, 23419 => 22511,
-    23420 => 22520, 23421 => 22500, 23422 => 22493, 23585 => 22539, 23586 => 22541,
-    23587 => 22525, 23588 => 22509, 23589 => 22528, 23590 => 22558, 23591 => 22553,
-    23592 => 22596, 23593 => 22560, 23594 => 22629, 23595 => 22636, 23596 => 22657,
-    23597 => 22665, 23598 => 22682, 23599 => 22656, 23600 => 39336, 23601 => 40729,
-    23602 => 25087, 23603 => 33401, 23604 => 33405, 23605 => 33407, 23606 => 33423,
-    23607 => 33418, 23608 => 33448, 23609 => 33412, 23610 => 33422, 23611 => 33425,
-    23612 => 33431, 23613 => 33433, 23614 => 33451, 23615 => 33464, 23616 => 33470,
-    23617 => 33456, 23618 => 33480, 23619 => 33482, 23620 => 33507, 23621 => 33432,
-    23622 => 33463, 23623 => 33454, 23624 => 33483, 23625 => 33484, 23626 => 33473,
-    23627 => 33449, 23628 => 33460, 23629 => 33441, 23630 => 33450, 23631 => 33439,
-    23632 => 33476, 23633 => 33486, 23634 => 33444, 23635 => 33505, 23636 => 33545,
-    23637 => 33527, 23638 => 33508, 23639 => 33551, 23640 => 33543, 23641 => 33500,
-    23642 => 33524, 23643 => 33490, 23644 => 33496, 23645 => 33548, 23646 => 33531,
-    23647 => 33491, 23648 => 33553, 23649 => 33562, 23650 => 33542, 23651 => 33556,
-    23652 => 33557, 23653 => 33504, 23654 => 33493, 23655 => 33564, 23656 => 33617,
-    23657 => 33627, 23658 => 33628, 23659 => 33544, 23660 => 33682, 23661 => 33596,
-    23662 => 33588, 23663 => 33585, 23664 => 33691, 23665 => 33630, 23666 => 33583,
-    23667 => 33615, 23668 => 33607, 23669 => 33603, 23670 => 33631, 23671 => 33600,
-    23672 => 33559, 23673 => 33632, 23674 => 33581, 23675 => 33594, 23676 => 33587,
-    23677 => 33638, 23678 => 33637, 23841 => 33640, 23842 => 33563, 23843 => 33641,
-    23844 => 33644, 23845 => 33642, 23846 => 33645, 23847 => 33646, 23848 => 33712,
-    23849 => 33656, 23850 => 33715, 23851 => 33716, 23852 => 33696, 23853 => 33706,
-    23854 => 33683, 23855 => 33692, 23856 => 33669, 23857 => 33660, 23858 => 33718,
-    23859 => 33705, 23860 => 33661, 23861 => 33720, 23862 => 33659, 23863 => 33688,
-    23864 => 33694, 23865 => 33704, 23866 => 33722, 23867 => 33724, 23868 => 33729,
-    23869 => 33793, 23870 => 33765, 23871 => 33752, 23872 => 22535, 23873 => 33816,
-    23874 => 33803, 23875 => 33757, 23876 => 33789, 23877 => 33750, 23878 => 33820,
-    23879 => 33848, 23880 => 33809, 23881 => 33798, 23882 => 33748, 23883 => 33759,
-    23884 => 33807, 23885 => 33795, 23886 => 33784, 23887 => 33785, 23888 => 33770,
-    23889 => 33733, 23890 => 33728, 23891 => 33830, 23892 => 33776, 23893 => 33761,
-    23894 => 33884, 23895 => 33873, 23896 => 33882, 23897 => 33881, 23898 => 33907,
-    23899 => 33927, 23900 => 33928, 23901 => 33914, 23902 => 33929, 23903 => 33912,
-    23904 => 33852, 23905 => 33862, 23906 => 33897, 23907 => 33910, 23908 => 33932,
-    23909 => 33934, 23910 => 33841, 23911 => 33901, 23912 => 33985, 23913 => 33997,
-    23914 => 34000, 23915 => 34022, 23916 => 33981, 23917 => 34003, 23918 => 33994,
-    23919 => 33983, 23920 => 33978, 23921 => 34016, 23922 => 33953, 23923 => 33977,
-    23924 => 33972, 23925 => 33943, 23926 => 34021, 23927 => 34019, 23928 => 34060,
-    23929 => 29965, 23930 => 34104, 23931 => 34032, 23932 => 34105, 23933 => 34079,
-    23934 => 34106, 24097 => 34134, 24098 => 34107, 24099 => 34047, 24100 => 34044,
-    24101 => 34137, 24102 => 34120, 24103 => 34152, 24104 => 34148, 24105 => 34142,
-    24106 => 34170, 24107 => 30626, 24108 => 34115, 24109 => 34162, 24110 => 34171,
-    24111 => 34212, 24112 => 34216, 24113 => 34183, 24114 => 34191, 24115 => 34169,
-    24116 => 34222, 24117 => 34204, 24118 => 34181, 24119 => 34233, 24120 => 34231,
-    24121 => 34224, 24122 => 34259, 24123 => 34241, 24124 => 34268, 24125 => 34303,
-    24126 => 34343, 24127 => 34309, 24128 => 34345, 24129 => 34326, 24130 => 34364,
-    24131 => 24318, 24132 => 24328, 24133 => 22844, 24134 => 22849, 24135 => 32823,
-    24136 => 22869, 24137 => 22874, 24138 => 22872, 24139 => 21263, 24140 => 23586,
-    24141 => 23589, 24142 => 23596, 24143 => 23604, 24144 => 25164, 24145 => 25194,
-    24146 => 25247, 24147 => 25275, 24148 => 25290, 24149 => 25306, 24150 => 25303,
-    24151 => 25326, 24152 => 25378, 24153 => 25334, 24154 => 25401, 24155 => 25419,
-    24156 => 25411, 24157 => 25517, 24158 => 25590, 24159 => 25457, 24160 => 25466,
-    24161 => 25486, 24162 => 25524, 24163 => 25453, 24164 => 25516, 24165 => 25482,
-    24166 => 25449, 24167 => 25518, 24168 => 25532, 24169 => 25586, 24170 => 25592,
-    24171 => 25568, 24172 => 25599, 24173 => 25540, 24174 => 25566, 24175 => 25550,
-    24176 => 25682, 24177 => 25542, 24178 => 25534, 24179 => 25669, 24180 => 25665,
-    24181 => 25611, 24182 => 25627, 24183 => 25632, 24184 => 25612, 24185 => 25638,
-    24186 => 25633, 24187 => 25694, 24188 => 25732, 24189 => 25709, 24190 => 25750,
-    24353 => 25722, 24354 => 25783, 24355 => 25784, 24356 => 25753, 24357 => 25786,
-    24358 => 25792, 24359 => 25808, 24360 => 25815, 24361 => 25828, 24362 => 25826,
-    24363 => 25865, 24364 => 25893, 24365 => 25902, 24366 => 24331, 24367 => 24530,
-    24368 => 29977, 24369 => 24337, 24370 => 21343, 24371 => 21489, 24372 => 21501,
-    24373 => 21481, 24374 => 21480, 24375 => 21499, 24376 => 21522, 24377 => 21526,
-    24378 => 21510, 24379 => 21579, 24380 => 21586, 24381 => 21587, 24382 => 21588,
-    24383 => 21590, 24384 => 21571, 24385 => 21537, 24386 => 21591, 24387 => 21593,
-    24388 => 21539, 24389 => 21554, 24390 => 21634, 24391 => 21652, 24392 => 21623,
-    24393 => 21617, 24394 => 21604, 24395 => 21658, 24396 => 21659, 24397 => 21636,
-    24398 => 21622, 24399 => 21606, 24400 => 21661, 24401 => 21712, 24402 => 21677,
-    24403 => 21698, 24404 => 21684, 24405 => 21714, 24406 => 21671, 24407 => 21670,
-    24408 => 21715, 24409 => 21716, 24410 => 21618, 24411 => 21667, 24412 => 21717,
-    24413 => 21691, 24414 => 21695, 24415 => 21708, 24416 => 21721, 24417 => 21722,
-    24418 => 21724, 24419 => 21673, 24420 => 21674, 24421 => 21668, 24422 => 21725,
-    24423 => 21711, 24424 => 21726, 24425 => 21787, 24426 => 21735, 24427 => 21792,
-    24428 => 21757, 24429 => 21780, 24430 => 21747, 24431 => 21794, 24432 => 21795,
-    24433 => 21775, 24434 => 21777, 24435 => 21799, 24436 => 21802, 24437 => 21863,
-    24438 => 21903, 24439 => 21941, 24440 => 21833, 24441 => 21869, 24442 => 21825,
-    24443 => 21845, 24444 => 21823, 24445 => 21840, 24446 => 21820, 24609 => 21815,
-    24610 => 21846, 24611 => 21877, 24612 => 21878, 24613 => 21879, 24614 => 21811,
-    24615 => 21808, 24616 => 21852, 24617 => 21899, 24618 => 21970, 24619 => 21891,
-    24620 => 21937, 24621 => 21945, 24622 => 21896, 24623 => 21889, 24624 => 21919,
-    24625 => 21886, 24626 => 21974, 24627 => 21905, 24628 => 21883, 24629 => 21983,
-    24630 => 21949, 24631 => 21950, 24632 => 21908, 24633 => 21913, 24634 => 21994,
-    24635 => 22007, 24636 => 21961, 24637 => 22047, 24638 => 21969, 24639 => 21995,
-    24640 => 21996, 24641 => 21972, 24642 => 21990, 24643 => 21981, 24644 => 21956,
-    24645 => 21999, 24646 => 21989, 24647 => 22002, 24648 => 22003, 24649 => 21964,
-    24650 => 21965, 24651 => 21992, 24652 => 22005, 24653 => 21988, 24654 => 36756,
-    24655 => 22046, 24656 => 22024, 24657 => 22028, 24658 => 22017, 24659 => 22052,
-    24660 => 22051, 24661 => 22014, 24662 => 22016, 24663 => 22055, 24664 => 22061,
-    24665 => 22104, 24666 => 22073, 24667 => 22103, 24668 => 22060, 24669 => 22093,
-    24670 => 22114, 24671 => 22105, 24672 => 22108, 24673 => 22092, 24674 => 22100,
-    24675 => 22150, 24676 => 22116, 24677 => 22129, 24678 => 22123, 24679 => 22139,
-    24680 => 22140, 24681 => 22149, 24682 => 22163, 24683 => 22191, 24684 => 22228,
-    24685 => 22231, 24686 => 22237, 24687 => 22241, 24688 => 22261, 24689 => 22251,
-    24690 => 22265, 24691 => 22271, 24692 => 22276, 24693 => 22282, 24694 => 22281,
-    24695 => 22300, 24696 => 24079, 24697 => 24089, 24698 => 24084, 24699 => 24081,
-    24700 => 24113, 24701 => 24123, 24702 => 24124, 24865 => 24119, 24866 => 24132,
-    24867 => 24148, 24868 => 24155, 24869 => 24158, 24870 => 24161, 24871 => 23692,
-    24872 => 23674, 24873 => 23693, 24874 => 23696, 24875 => 23702, 24876 => 23688,
-    24877 => 23704, 24878 => 23705, 24879 => 23697, 24880 => 23706, 24881 => 23708,
-    24882 => 23733, 24883 => 23714, 24884 => 23741, 24885 => 23724, 24886 => 23723,
-    24887 => 23729, 24888 => 23715, 24889 => 23745, 24890 => 23735, 24891 => 23748,
-    24892 => 23762, 24893 => 23780, 24894 => 23755, 24895 => 23781, 24896 => 23810,
-    24897 => 23811, 24898 => 23847, 24899 => 23846, 24900 => 23854, 24901 => 23844,
-    24902 => 23838, 24903 => 23814, 24904 => 23835, 24905 => 23896, 24906 => 23870,
-    24907 => 23860, 24908 => 23869, 24909 => 23916, 24910 => 23899, 24911 => 23919,
-    24912 => 23901, 24913 => 23915, 24914 => 23883, 24915 => 23882, 24916 => 23913,
-    24917 => 23924, 24918 => 23938, 24919 => 23961, 24920 => 23965, 24921 => 35955,
-    24922 => 23991, 24923 => 24005, 24924 => 24435, 24925 => 24439, 24926 => 24450,
-    24927 => 24455, 24928 => 24457, 24929 => 24460, 24930 => 24469, 24931 => 24473,
-    24932 => 24476, 24933 => 24488, 24934 => 24493, 24935 => 24501, 24936 => 24508,
-    24937 => 34914, 24938 => 24417, 24939 => 29357, 24940 => 29360, 24941 => 29364,
-    24942 => 29367, 24943 => 29368, 24944 => 29379, 24945 => 29377, 24946 => 29390,
-    24947 => 29389, 24948 => 29394, 24949 => 29416, 24950 => 29423, 24951 => 29417,
-    24952 => 29426, 24953 => 29428, 24954 => 29431, 24955 => 29441, 24956 => 29427,
-    24957 => 29443, 24958 => 29434, 25121 => 29435, 25122 => 29463, 25123 => 29459,
-    25124 => 29473, 25125 => 29450, 25126 => 29470, 25127 => 29469, 25128 => 29461,
-    25129 => 29474, 25130 => 29497, 25131 => 29477, 25132 => 29484, 25133 => 29496,
-    25134 => 29489, 25135 => 29520, 25136 => 29517, 25137 => 29527, 25138 => 29536,
-    25139 => 29548, 25140 => 29551, 25141 => 29566, 25142 => 33307, 25143 => 22821,
-    25144 => 39143, 25145 => 22820, 25146 => 22786, 25147 => 39267, 25148 => 39271,
-    25149 => 39272, 25150 => 39273, 25151 => 39274, 25152 => 39275, 25153 => 39276,
-    25154 => 39284, 25155 => 39287, 25156 => 39293, 25157 => 39296, 25158 => 39300,
-    25159 => 39303, 25160 => 39306, 25161 => 39309, 25162 => 39312, 25163 => 39313,
-    25164 => 39315, 25165 => 39316, 25166 => 39317, 25167 => 24192, 25168 => 24209,
-    25169 => 24203, 25170 => 24214, 25171 => 24229, 25172 => 24224, 25173 => 24249,
-    25174 => 24245, 25175 => 24254, 25176 => 24243, 25177 => 36179, 25178 => 24274,
-    25179 => 24273, 25180 => 24283, 25181 => 24296, 25182 => 24298, 25183 => 33210,
-    25184 => 24516, 25185 => 24521, 25186 => 24534, 25187 => 24527, 25188 => 24579,
-    25189 => 24558, 25190 => 24580, 25191 => 24545, 25192 => 24548, 25193 => 24574,
-    25194 => 24581, 25195 => 24582, 25196 => 24554, 25197 => 24557, 25198 => 24568,
-    25199 => 24601, 25200 => 24629, 25201 => 24614, 25202 => 24603, 25203 => 24591,
-    25204 => 24589, 25205 => 24617, 25206 => 24619, 25207 => 24586, 25208 => 24639,
-    25209 => 24609, 25210 => 24696, 25211 => 24697, 25212 => 24699, 25213 => 24698,
-    25214 => 24642, 25377 => 24682, 25378 => 24701, 25379 => 24726, 25380 => 24730,
-    25381 => 24749, 25382 => 24733, 25383 => 24707, 25384 => 24722, 25385 => 24716,
-    25386 => 24731, 25387 => 24812, 25388 => 24763, 25389 => 24753, 25390 => 24797,
-    25391 => 24792, 25392 => 24774, 25393 => 24794, 25394 => 24756, 25395 => 24864,
-    25396 => 24870, 25397 => 24853, 25398 => 24867, 25399 => 24820, 25400 => 24832,
-    25401 => 24846, 25402 => 24875, 25403 => 24906, 25404 => 24949, 25405 => 25004,
-    25406 => 24980, 25407 => 24999, 25408 => 25015, 25409 => 25044, 25410 => 25077,
-    25411 => 24541, 25412 => 38579, 25413 => 38377, 25414 => 38379, 25415 => 38385,
-    25416 => 38387, 25417 => 38389, 25418 => 38390, 25419 => 38396, 25420 => 38398,
-    25421 => 38403, 25422 => 38404, 25423 => 38406, 25424 => 38408, 25425 => 38410,
-    25426 => 38411, 25427 => 38412, 25428 => 38413, 25429 => 38415, 25430 => 38418,
-    25431 => 38421, 25432 => 38422, 25433 => 38423, 25434 => 38425, 25435 => 38426,
-    25436 => 20012, 25437 => 29247, 25438 => 25109, 25439 => 27701, 25440 => 27732,
-    25441 => 27740, 25442 => 27722, 25443 => 27811, 25444 => 27781, 25445 => 27792,
-    25446 => 27796, 25447 => 27788, 25448 => 27752, 25449 => 27753, 25450 => 27764,
-    25451 => 27766, 25452 => 27782, 25453 => 27817, 25454 => 27856, 25455 => 27860,
-    25456 => 27821, 25457 => 27895, 25458 => 27896, 25459 => 27889, 25460 => 27863,
-    25461 => 27826, 25462 => 27872, 25463 => 27862, 25464 => 27898, 25465 => 27883,
-    25466 => 27886, 25467 => 27825, 25468 => 27859, 25469 => 27887, 25470 => 27902,
-    25633 => 27961, 25634 => 27943, 25635 => 27916, 25636 => 27971, 25637 => 27976,
-    25638 => 27911, 25639 => 27908, 25640 => 27929, 25641 => 27918, 25642 => 27947,
-    25643 => 27981, 25644 => 27950, 25645 => 27957, 25646 => 27930, 25647 => 27983,
-    25648 => 27986, 25649 => 27988, 25650 => 27955, 25651 => 28049, 25652 => 28015,
-    25653 => 28062, 25654 => 28064, 25655 => 27998, 25656 => 28051, 25657 => 28052,
-    25658 => 27996, 25659 => 28000, 25660 => 28028, 25661 => 28003, 25662 => 28186,
-    25663 => 28103, 25664 => 28101, 25665 => 28126, 25666 => 28174, 25667 => 28095,
-    25668 => 28128, 25669 => 28177, 25670 => 28134, 25671 => 28125, 25672 => 28121,
-    25673 => 28182, 25674 => 28075, 25675 => 28172, 25676 => 28078, 25677 => 28203,
-    25678 => 28270, 25679 => 28238, 25680 => 28267, 25681 => 28338, 25682 => 28255,
-    25683 => 28294, 25684 => 28243, 25685 => 28244, 25686 => 28210, 25687 => 28197,
-    25688 => 28228, 25689 => 28383, 25690 => 28337, 25691 => 28312, 25692 => 28384,
-    25693 => 28461, 25694 => 28386, 25695 => 28325, 25696 => 28327, 25697 => 28349,
-    25698 => 28347, 25699 => 28343, 25700 => 28375, 25701 => 28340, 25702 => 28367,
-    25703 => 28303, 25704 => 28354, 25705 => 28319, 25706 => 28514, 25707 => 28486,
-    25708 => 28487, 25709 => 28452, 25710 => 28437, 25711 => 28409, 25712 => 28463,
-    25713 => 28470, 25714 => 28491, 25715 => 28532, 25716 => 28458, 25717 => 28425,
-    25718 => 28457, 25719 => 28553, 25720 => 28557, 25721 => 28556, 25722 => 28536,
-    25723 => 28530, 25724 => 28540, 25725 => 28538, 25726 => 28625, 25889 => 28617,
-    25890 => 28583, 25891 => 28601, 25892 => 28598, 25893 => 28610, 25894 => 28641,
-    25895 => 28654, 25896 => 28638, 25897 => 28640, 25898 => 28655, 25899 => 28698,
-    25900 => 28707, 25901 => 28699, 25902 => 28729, 25903 => 28725, 25904 => 28751,
-    25905 => 28766, 25906 => 23424, 25907 => 23428, 25908 => 23445, 25909 => 23443,
-    25910 => 23461, 25911 => 23480, 25912 => 29999, 25913 => 39582, 25914 => 25652,
-    25915 => 23524, 25916 => 23534, 25917 => 35120, 25918 => 23536, 25919 => 36423,
-    25920 => 35591, 25921 => 36790, 25922 => 36819, 25923 => 36821, 25924 => 36837,
-    25925 => 36846, 25926 => 36836, 25927 => 36841, 25928 => 36838, 25929 => 36851,
-    25930 => 36840, 25931 => 36869, 25932 => 36868, 25933 => 36875, 25934 => 36902,
-    25935 => 36881, 25936 => 36877, 25937 => 36886, 25938 => 36897, 25939 => 36917,
-    25940 => 36918, 25941 => 36909, 25942 => 36911, 25943 => 36932, 25944 => 36945,
-    25945 => 36946, 25946 => 36944, 25947 => 36968, 25948 => 36952, 25949 => 36962,
-    25950 => 36955, 25951 => 26297, 25952 => 36980, 25953 => 36989, 25954 => 36994,
-    25955 => 37000, 25956 => 36995, 25957 => 37003, 25958 => 24400, 25959 => 24407,
-    25960 => 24406, 25961 => 24408, 25962 => 23611, 25963 => 21675, 25964 => 23632,
-    25965 => 23641, 25966 => 23409, 25967 => 23651, 25968 => 23654, 25969 => 32700,
-    25970 => 24362, 25971 => 24361, 25972 => 24365, 25973 => 33396, 25974 => 24380,
-    25975 => 39739, 25976 => 23662, 25977 => 22913, 25978 => 22915, 25979 => 22925,
-    25980 => 22953, 25981 => 22954, 25982 => 22947, 26145 => 22935, 26146 => 22986,
-    26147 => 22955, 26148 => 22942, 26149 => 22948, 26150 => 22994, 26151 => 22962,
-    26152 => 22959, 26153 => 22999, 26154 => 22974, 26155 => 23045, 26156 => 23046,
-    26157 => 23005, 26158 => 23048, 26159 => 23011, 26160 => 23000, 26161 => 23033,
-    26162 => 23052, 26163 => 23049, 26164 => 23090, 26165 => 23092, 26166 => 23057,
-    26167 => 23075, 26168 => 23059, 26169 => 23104, 26170 => 23143, 26171 => 23114,
-    26172 => 23125, 26173 => 23100, 26174 => 23138, 26175 => 23157, 26176 => 33004,
-    26177 => 23210, 26178 => 23195, 26179 => 23159, 26180 => 23162, 26181 => 23230,
-    26182 => 23275, 26183 => 23218, 26184 => 23250, 26185 => 23252, 26186 => 23224,
-    26187 => 23264, 26188 => 23267, 26189 => 23281, 26190 => 23254, 26191 => 23270,
-    26192 => 23256, 26193 => 23260, 26194 => 23305, 26195 => 23319, 26196 => 23318,
-    26197 => 23346, 26198 => 23351, 26199 => 23360, 26200 => 23573, 26201 => 23580,
-    26202 => 23386, 26203 => 23397, 26204 => 23411, 26205 => 23377, 26206 => 23379,
-    26207 => 23394, 26208 => 39541, 26209 => 39543, 26210 => 39544, 26211 => 39546,
-    26212 => 39551, 26213 => 39549, 26214 => 39552, 26215 => 39553, 26216 => 39557,
-    26217 => 39560, 26218 => 39562, 26219 => 39568, 26220 => 39570, 26221 => 39571,
-    26222 => 39574, 26223 => 39576, 26224 => 39579, 26225 => 39580, 26226 => 39581,
-    26227 => 39583, 26228 => 39584, 26229 => 39586, 26230 => 39587, 26231 => 39589,
-    26232 => 39591, 26233 => 32415, 26234 => 32417, 26235 => 32419, 26236 => 32421,
-    26237 => 32424, 26238 => 32425, 26401 => 32429, 26402 => 32432, 26403 => 32446,
-    26404 => 32448, 26405 => 32449, 26406 => 32450, 26407 => 32457, 26408 => 32459,
-    26409 => 32460, 26410 => 32464, 26411 => 32468, 26412 => 32471, 26413 => 32475,
-    26414 => 32480, 26415 => 32481, 26416 => 32488, 26417 => 32491, 26418 => 32494,
-    26419 => 32495, 26420 => 32497, 26421 => 32498, 26422 => 32525, 26423 => 32502,
-    26424 => 32506, 26425 => 32507, 26426 => 32510, 26427 => 32513, 26428 => 32514,
-    26429 => 32515, 26430 => 32519, 26431 => 32520, 26432 => 32523, 26433 => 32524,
-    26434 => 32527, 26435 => 32529, 26436 => 32530, 26437 => 32535, 26438 => 32537,
-    26439 => 32540, 26440 => 32539, 26441 => 32543, 26442 => 32545, 26443 => 32546,
-    26444 => 32547, 26445 => 32548, 26446 => 32549, 26447 => 32550, 26448 => 32551,
-    26449 => 32554, 26450 => 32555, 26451 => 32556, 26452 => 32557, 26453 => 32559,
-    26454 => 32560, 26455 => 32561, 26456 => 32562, 26457 => 32563, 26458 => 32565,
-    26459 => 24186, 26460 => 30079, 26461 => 24027, 26462 => 30014, 26463 => 37013,
-    26464 => 29582, 26465 => 29585, 26466 => 29614, 26467 => 29602, 26468 => 29599,
-    26469 => 29647, 26470 => 29634, 26471 => 29649, 26472 => 29623, 26473 => 29619,
-    26474 => 29632, 26475 => 29641, 26476 => 29640, 26477 => 29669, 26478 => 29657,
-    26479 => 39036, 26480 => 29706, 26481 => 29673, 26482 => 29671, 26483 => 29662,
-    26484 => 29626, 26485 => 29682, 26486 => 29711, 26487 => 29738, 26488 => 29787,
-    26489 => 29734, 26490 => 29733, 26491 => 29736, 26492 => 29744, 26493 => 29742,
-    26494 => 29740, 26657 => 29723, 26658 => 29722, 26659 => 29761, 26660 => 29788,
-    26661 => 29783, 26662 => 29781, 26663 => 29785, 26664 => 29815, 26665 => 29805,
-    26666 => 29822, 26667 => 29852, 26668 => 29838, 26669 => 29824, 26670 => 29825,
-    26671 => 29831, 26672 => 29835, 26673 => 29854, 26674 => 29864, 26675 => 29865,
-    26676 => 29840, 26677 => 29863, 26678 => 29906, 26679 => 29882, 26680 => 38890,
-    26681 => 38891, 26682 => 38892, 26683 => 26444, 26684 => 26451, 26685 => 26462,
-    26686 => 26440, 26687 => 26473, 26688 => 26533, 26689 => 26503, 26690 => 26474,
-    26691 => 26483, 26692 => 26520, 26693 => 26535, 26694 => 26485, 26695 => 26536,
-    26696 => 26526, 26697 => 26541, 26698 => 26507, 26699 => 26487, 26700 => 26492,
-    26701 => 26608, 26702 => 26633, 26703 => 26584, 26704 => 26634, 26705 => 26601,
-    26706 => 26544, 26707 => 26636, 26708 => 26585, 26709 => 26549, 26710 => 26586,
-    26711 => 26547, 26712 => 26589, 26713 => 26624, 26714 => 26563, 26715 => 26552,
-    26716 => 26594, 26717 => 26638, 26718 => 26561, 26719 => 26621, 26720 => 26674,
-    26721 => 26675, 26722 => 26720, 26723 => 26721, 26724 => 26702, 26725 => 26722,
-    26726 => 26692, 26727 => 26724, 26728 => 26755, 26729 => 26653, 26730 => 26709,
-    26731 => 26726, 26732 => 26689, 26733 => 26727, 26734 => 26688, 26735 => 26686,
-    26736 => 26698, 26737 => 26697, 26738 => 26665, 26739 => 26805, 26740 => 26767,
-    26741 => 26740, 26742 => 26743, 26743 => 26771, 26744 => 26731, 26745 => 26818,
-    26746 => 26990, 26747 => 26876, 26748 => 26911, 26749 => 26912, 26750 => 26873,
-    26913 => 26916, 26914 => 26864, 26915 => 26891, 26916 => 26881, 26917 => 26967,
-    26918 => 26851, 26919 => 26896, 26920 => 26993, 26921 => 26937, 26922 => 26976,
-    26923 => 26946, 26924 => 26973, 26925 => 27012, 26926 => 26987, 26927 => 27008,
-    26928 => 27032, 26929 => 27000, 26930 => 26932, 26931 => 27084, 26932 => 27015,
-    26933 => 27016, 26934 => 27086, 26935 => 27017, 26936 => 26982, 26937 => 26979,
-    26938 => 27001, 26939 => 27035, 26940 => 27047, 26941 => 27067, 26942 => 27051,
-    26943 => 27053, 26944 => 27092, 26945 => 27057, 26946 => 27073, 26947 => 27082,
-    26948 => 27103, 26949 => 27029, 26950 => 27104, 26951 => 27021, 26952 => 27135,
-    26953 => 27183, 26954 => 27117, 26955 => 27159, 26956 => 27160, 26957 => 27237,
-    26958 => 27122, 26959 => 27204, 26960 => 27198, 26961 => 27296, 26962 => 27216,
-    26963 => 27227, 26964 => 27189, 26965 => 27278, 26966 => 27257, 26967 => 27197,
-    26968 => 27176, 26969 => 27224, 26970 => 27260, 26971 => 27281, 26972 => 27280,
-    26973 => 27305, 26974 => 27287, 26975 => 27307, 26976 => 29495, 26977 => 29522,
-    26978 => 27521, 26979 => 27522, 26980 => 27527, 26981 => 27524, 26982 => 27538,
-    26983 => 27539, 26984 => 27533, 26985 => 27546, 26986 => 27547, 26987 => 27553,
-    26988 => 27562, 26989 => 36715, 26990 => 36717, 26991 => 36721, 26992 => 36722,
-    26993 => 36723, 26994 => 36725, 26995 => 36726, 26996 => 36728, 26997 => 36727,
-    26998 => 36729, 26999 => 36730, 27000 => 36732, 27001 => 36734, 27002 => 36737,
-    27003 => 36738, 27004 => 36740, 27005 => 36743, 27006 => 36747, 27169 => 36749,
-    27170 => 36750, 27171 => 36751, 27172 => 36760, 27173 => 36762, 27174 => 36558,
-    27175 => 25099, 27176 => 25111, 27177 => 25115, 27178 => 25119, 27179 => 25122,
-    27180 => 25121, 27181 => 25125, 27182 => 25124, 27183 => 25132, 27184 => 33255,
-    27185 => 29935, 27186 => 29940, 27187 => 29951, 27188 => 29967, 27189 => 29969,
-    27190 => 29971, 27191 => 25908, 27192 => 26094, 27193 => 26095, 27194 => 26096,
-    27195 => 26122, 27196 => 26137, 27197 => 26482, 27198 => 26115, 27199 => 26133,
-    27200 => 26112, 27201 => 28805, 27202 => 26359, 27203 => 26141, 27204 => 26164,
-    27205 => 26161, 27206 => 26166, 27207 => 26165, 27208 => 32774, 27209 => 26207,
-    27210 => 26196, 27211 => 26177, 27212 => 26191, 27213 => 26198, 27214 => 26209,
-    27215 => 26199, 27216 => 26231, 27217 => 26244, 27218 => 26252, 27219 => 26279,
-    27220 => 26269, 27221 => 26302, 27222 => 26331, 27223 => 26332, 27224 => 26342,
-    27225 => 26345, 27226 => 36146, 27227 => 36147, 27228 => 36150, 27229 => 36155,
-    27230 => 36157, 27231 => 36160, 27232 => 36165, 27233 => 36166, 27234 => 36168,
-    27235 => 36169, 27236 => 36167, 27237 => 36173, 27238 => 36181, 27239 => 36185,
-    27240 => 35271, 27241 => 35274, 27242 => 35275, 27243 => 35276, 27244 => 35278,
-    27245 => 35279, 27246 => 35280, 27247 => 35281, 27248 => 29294, 27249 => 29343,
-    27250 => 29277, 27251 => 29286, 27252 => 29295, 27253 => 29310, 27254 => 29311,
-    27255 => 29316, 27256 => 29323, 27257 => 29325, 27258 => 29327, 27259 => 29330,
-    27260 => 25352, 27261 => 25394, 27262 => 25520, 27425 => 25663, 27426 => 25816,
-    27427 => 32772, 27428 => 27626, 27429 => 27635, 27430 => 27645, 27431 => 27637,
-    27432 => 27641, 27433 => 27653, 27434 => 27655, 27435 => 27654, 27436 => 27661,
-    27437 => 27669, 27438 => 27672, 27439 => 27673, 27440 => 27674, 27441 => 27681,
-    27442 => 27689, 27443 => 27684, 27444 => 27690, 27445 => 27698, 27446 => 25909,
-    27447 => 25941, 27448 => 25963, 27449 => 29261, 27450 => 29266, 27451 => 29270,
-    27452 => 29232, 27453 => 34402, 27454 => 21014, 27455 => 32927, 27456 => 32924,
-    27457 => 32915, 27458 => 32956, 27459 => 26378, 27460 => 32957, 27461 => 32945,
-    27462 => 32939, 27463 => 32941, 27464 => 32948, 27465 => 32951, 27466 => 32999,
-    27467 => 33000, 27468 => 33001, 27469 => 33002, 27470 => 32987, 27471 => 32962,
-    27472 => 32964, 27473 => 32985, 27474 => 32973, 27475 => 32983, 27476 => 26384,
-    27477 => 32989, 27478 => 33003, 27479 => 33009, 27480 => 33012, 27481 => 33005,
-    27482 => 33037, 27483 => 33038, 27484 => 33010, 27485 => 33020, 27486 => 26389,
-    27487 => 33042, 27488 => 35930, 27489 => 33078, 27490 => 33054, 27491 => 33068,
-    27492 => 33048, 27493 => 33074, 27494 => 33096, 27495 => 33100, 27496 => 33107,
-    27497 => 33140, 27498 => 33113, 27499 => 33114, 27500 => 33137, 27501 => 33120,
-    27502 => 33129, 27503 => 33148, 27504 => 33149, 27505 => 33133, 27506 => 33127,
-    27507 => 22605, 27508 => 23221, 27509 => 33160, 27510 => 33154, 27511 => 33169,
-    27512 => 28373, 27513 => 33187, 27514 => 33194, 27515 => 33228, 27516 => 26406,
-    27517 => 33226, 27518 => 33211, 27681 => 33217, 27682 => 33190, 27683 => 27428,
-    27684 => 27447, 27685 => 27449, 27686 => 27459, 27687 => 27462, 27688 => 27481,
-    27689 => 39121, 27690 => 39122, 27691 => 39123, 27692 => 39125, 27693 => 39129,
-    27694 => 39130, 27695 => 27571, 27696 => 24384, 27697 => 27586, 27698 => 35315,
-    27699 => 26000, 27700 => 40785, 27701 => 26003, 27702 => 26044, 27703 => 26054,
-    27704 => 26052, 27705 => 26051, 27706 => 26060, 27707 => 26062, 27708 => 26066,
-    27709 => 26070, 27710 => 28800, 27711 => 28828, 27712 => 28822, 27713 => 28829,
-    27714 => 28859, 27715 => 28864, 27716 => 28855, 27717 => 28843, 27718 => 28849,
-    27719 => 28904, 27720 => 28874, 27721 => 28944, 27722 => 28947, 27723 => 28950,
-    27724 => 28975, 27725 => 28977, 27726 => 29043, 27727 => 29020, 27728 => 29032,
-    27729 => 28997, 27730 => 29042, 27731 => 29002, 27732 => 29048, 27733 => 29050,
-    27734 => 29080, 27735 => 29107, 27736 => 29109, 27737 => 29096, 27738 => 29088,
-    27739 => 29152, 27740 => 29140, 27741 => 29159, 27742 => 29177, 27743 => 29213,
-    27744 => 29224, 27745 => 28780, 27746 => 28952, 27747 => 29030, 27748 => 29113,
-    27749 => 25150, 27750 => 25149, 27751 => 25155, 27752 => 25160, 27753 => 25161,
-    27754 => 31035, 27755 => 31040, 27756 => 31046, 27757 => 31049, 27758 => 31067,
-    27759 => 31068, 27760 => 31059, 27761 => 31066, 27762 => 31074, 27763 => 31063,
-    27764 => 31072, 27765 => 31087, 27766 => 31079, 27767 => 31098, 27768 => 31109,
-    27769 => 31114, 27770 => 31130, 27771 => 31143, 27772 => 31155, 27773 => 24529,
-    27774 => 24528, 27937 => 24636, 27938 => 24669, 27939 => 24666, 27940 => 24679,
-    27941 => 24641, 27942 => 24665, 27943 => 24675, 27944 => 24747, 27945 => 24838,
-    27946 => 24845, 27947 => 24925, 27948 => 25001, 27949 => 24989, 27950 => 25035,
-    27951 => 25041, 27952 => 25094, 27953 => 32896, 27954 => 32895, 27955 => 27795,
-    27956 => 27894, 27957 => 28156, 27958 => 30710, 27959 => 30712, 27960 => 30720,
-    27961 => 30729, 27962 => 30743, 27963 => 30744, 27964 => 30737, 27965 => 26027,
-    27966 => 30765, 27967 => 30748, 27968 => 30749, 27969 => 30777, 27970 => 30778,
-    27971 => 30779, 27972 => 30751, 27973 => 30780, 27974 => 30757, 27975 => 30764,
-    27976 => 30755, 27977 => 30761, 27978 => 30798, 27979 => 30829, 27980 => 30806,
-    27981 => 30807, 27982 => 30758, 27983 => 30800, 27984 => 30791, 27985 => 30796,
-    27986 => 30826, 27987 => 30875, 27988 => 30867, 27989 => 30874, 27990 => 30855,
-    27991 => 30876, 27992 => 30881, 27993 => 30883, 27994 => 30898, 27995 => 30905,
-    27996 => 30885, 27997 => 30932, 27998 => 30937, 27999 => 30921, 28000 => 30956,
-    28001 => 30962, 28002 => 30981, 28003 => 30964, 28004 => 30995, 28005 => 31012,
-    28006 => 31006, 28007 => 31028, 28008 => 40859, 28009 => 40697, 28010 => 40699,
-    28011 => 40700, 28012 => 30449, 28013 => 30468, 28014 => 30477, 28015 => 30457,
-    28016 => 30471, 28017 => 30472, 28018 => 30490, 28019 => 30498, 28020 => 30489,
-    28021 => 30509, 28022 => 30502, 28023 => 30517, 28024 => 30520, 28025 => 30544,
-    28026 => 30545, 28027 => 30535, 28028 => 30531, 28029 => 30554, 28030 => 30568,
-    28193 => 30562, 28194 => 30565, 28195 => 30591, 28196 => 30605, 28197 => 30589,
-    28198 => 30592, 28199 => 30604, 28200 => 30609, 28201 => 30623, 28202 => 30624,
-    28203 => 30640, 28204 => 30645, 28205 => 30653, 28206 => 30010, 28207 => 30016,
-    28208 => 30030, 28209 => 30027, 28210 => 30024, 28211 => 30043, 28212 => 30066,
-    28213 => 30073, 28214 => 30083, 28215 => 32600, 28216 => 32609, 28217 => 32607,
-    28218 => 35400, 28219 => 32616, 28220 => 32628, 28221 => 32625, 28222 => 32633,
-    28223 => 32641, 28224 => 32638, 28225 => 30413, 28226 => 30437, 28227 => 34866,
-    28228 => 38021, 28229 => 38022, 28230 => 38023, 28231 => 38027, 28232 => 38026,
-    28233 => 38028, 28234 => 38029, 28235 => 38031, 28236 => 38032, 28237 => 38036,
-    28238 => 38039, 28239 => 38037, 28240 => 38042, 28241 => 38043, 28242 => 38044,
-    28243 => 38051, 28244 => 38052, 28245 => 38059, 28246 => 38058, 28247 => 38061,
-    28248 => 38060, 28249 => 38063, 28250 => 38064, 28251 => 38066, 28252 => 38068,
-    28253 => 38070, 28254 => 38071, 28255 => 38072, 28256 => 38073, 28257 => 38074,
-    28258 => 38076, 28259 => 38077, 28260 => 38079, 28261 => 38084, 28262 => 38088,
-    28263 => 38089, 28264 => 38090, 28265 => 38091, 28266 => 38092, 28267 => 38093,
-    28268 => 38094, 28269 => 38096, 28270 => 38097, 28271 => 38098, 28272 => 38101,
-    28273 => 38102, 28274 => 38103, 28275 => 38105, 28276 => 38104, 28277 => 38107,
-    28278 => 38110, 28279 => 38111, 28280 => 38112, 28281 => 38114, 28282 => 38116,
-    28283 => 38117, 28284 => 38119, 28285 => 38120, 28286 => 38122, 28449 => 38121,
-    28450 => 38123, 28451 => 38126, 28452 => 38127, 28453 => 38131, 28454 => 38132,
-    28455 => 38133, 28456 => 38135, 28457 => 38137, 28458 => 38140, 28459 => 38141,
-    28460 => 38143, 28461 => 38147, 28462 => 38146, 28463 => 38150, 28464 => 38151,
-    28465 => 38153, 28466 => 38154, 28467 => 38157, 28468 => 38158, 28469 => 38159,
-    28470 => 38162, 28471 => 38163, 28472 => 38164, 28473 => 38165, 28474 => 38166,
-    28475 => 38168, 28476 => 38171, 28477 => 38173, 28478 => 38174, 28479 => 38175,
-    28480 => 38178, 28481 => 38186, 28482 => 38187, 28483 => 38185, 28484 => 38188,
-    28485 => 38193, 28486 => 38194, 28487 => 38196, 28488 => 38198, 28489 => 38199,
-    28490 => 38200, 28491 => 38204, 28492 => 38206, 28493 => 38207, 28494 => 38210,
-    28495 => 38197, 28496 => 38212, 28497 => 38213, 28498 => 38214, 28499 => 38217,
-    28500 => 38220, 28501 => 38222, 28502 => 38223, 28503 => 38226, 28504 => 38227,
-    28505 => 38228, 28506 => 38230, 28507 => 38231, 28508 => 38232, 28509 => 38233,
-    28510 => 38235, 28511 => 38238, 28512 => 38239, 28513 => 38237, 28514 => 38241,
-    28515 => 38242, 28516 => 38244, 28517 => 38245, 28518 => 38246, 28519 => 38247,
-    28520 => 38248, 28521 => 38249, 28522 => 38250, 28523 => 38251, 28524 => 38252,
-    28525 => 38255, 28526 => 38257, 28527 => 38258, 28528 => 38259, 28529 => 38202,
-    28530 => 30695, 28531 => 30700, 28532 => 38601, 28533 => 31189, 28534 => 31213,
-    28535 => 31203, 28536 => 31211, 28537 => 31238, 28538 => 23879, 28539 => 31235,
-    28540 => 31234, 28541 => 31262, 28542 => 31252, 28705 => 31289, 28706 => 31287,
-    28707 => 31313, 28708 => 40655, 28709 => 39333, 28710 => 31344, 28711 => 30344,
-    28712 => 30350, 28713 => 30355, 28714 => 30361, 28715 => 30372, 28716 => 29918,
-    28717 => 29920, 28718 => 29996, 28719 => 40480, 28720 => 40482, 28721 => 40488,
-    28722 => 40489, 28723 => 40490, 28724 => 40491, 28725 => 40492, 28726 => 40498,
-    28727 => 40497, 28728 => 40502, 28729 => 40504, 28730 => 40503, 28731 => 40505,
-    28732 => 40506, 28733 => 40510, 28734 => 40513, 28735 => 40514, 28736 => 40516,
-    28737 => 40518, 28738 => 40519, 28739 => 40520, 28740 => 40521, 28741 => 40523,
-    28742 => 40524, 28743 => 40526, 28744 => 40529, 28745 => 40533, 28746 => 40535,
-    28747 => 40538, 28748 => 40539, 28749 => 40540, 28750 => 40542, 28751 => 40547,
-    28752 => 40550, 28753 => 40551, 28754 => 40552, 28755 => 40553, 28756 => 40554,
-    28757 => 40555, 28758 => 40556, 28759 => 40561, 28760 => 40557, 28761 => 40563,
-    28762 => 30098, 28763 => 30100, 28764 => 30102, 28765 => 30112, 28766 => 30109,
-    28767 => 30124, 28768 => 30115, 28769 => 30131, 28770 => 30132, 28771 => 30136,
-    28772 => 30148, 28773 => 30129, 28774 => 30128, 28775 => 30147, 28776 => 30146,
-    28777 => 30166, 28778 => 30157, 28779 => 30179, 28780 => 30184, 28781 => 30182,
-    28782 => 30180, 28783 => 30187, 28784 => 30183, 28785 => 30211, 28786 => 30193,
-    28787 => 30204, 28788 => 30207, 28789 => 30224, 28790 => 30208, 28791 => 30213,
-    28792 => 30220, 28793 => 30231, 28794 => 30218, 28795 => 30245, 28796 => 30232,
-    28797 => 30229, 28798 => 30233, 28961 => 30235, 28962 => 30268, 28963 => 30242,
-    28964 => 30240, 28965 => 30272, 28966 => 30253, 28967 => 30256, 28968 => 30271,
-    28969 => 30261, 28970 => 30275, 28971 => 30270, 28972 => 30259, 28973 => 30285,
-    28974 => 30302, 28975 => 30292, 28976 => 30300, 28977 => 30294, 28978 => 30315,
-    28979 => 30319, 28980 => 32714, 28981 => 31462, 28982 => 31352, 28983 => 31353,
-    28984 => 31360, 28985 => 31366, 28986 => 31368, 28987 => 31381, 28988 => 31398,
-    28989 => 31392, 28990 => 31404, 28991 => 31400, 28992 => 31405, 28993 => 31411,
-    28994 => 34916, 28995 => 34921, 28996 => 34930, 28997 => 34941, 28998 => 34943,
-    28999 => 34946, 29000 => 34978, 29001 => 35014, 29002 => 34999, 29003 => 35004,
-    29004 => 35017, 29005 => 35042, 29006 => 35022, 29007 => 35043, 29008 => 35045,
-    29009 => 35057, 29010 => 35098, 29011 => 35068, 29012 => 35048, 29013 => 35070,
-    29014 => 35056, 29015 => 35105, 29016 => 35097, 29017 => 35091, 29018 => 35099,
-    29019 => 35082, 29020 => 35124, 29021 => 35115, 29022 => 35126, 29023 => 35137,
-    29024 => 35174, 29025 => 35195, 29026 => 30091, 29027 => 32997, 29028 => 30386,
-    29029 => 30388, 29030 => 30684, 29031 => 32786, 29032 => 32788, 29033 => 32790,
-    29034 => 32796, 29035 => 32800, 29036 => 32802, 29037 => 32805, 29038 => 32806,
-    29039 => 32807, 29040 => 32809, 29041 => 32808, 29042 => 32817, 29043 => 32779,
-    29044 => 32821, 29045 => 32835, 29046 => 32838, 29047 => 32845, 29048 => 32850,
-    29049 => 32873, 29050 => 32881, 29051 => 35203, 29052 => 39032, 29053 => 39040,
-    29054 => 39043, 29217 => 39049, 29218 => 39052, 29219 => 39053, 29220 => 39055,
-    29221 => 39060, 29222 => 39066, 29223 => 39067, 29224 => 39070, 29225 => 39071,
-    29226 => 39073, 29227 => 39074, 29228 => 39077, 29229 => 39078, 29230 => 34381,
-    29231 => 34388, 29232 => 34412, 29233 => 34414, 29234 => 34431, 29235 => 34426,
-    29236 => 34428, 29237 => 34427, 29238 => 34472, 29239 => 34445, 29240 => 34443,
-    29241 => 34476, 29242 => 34461, 29243 => 34471, 29244 => 34467, 29245 => 34474,
-    29246 => 34451, 29247 => 34473, 29248 => 34486, 29249 => 34500, 29250 => 34485,
-    29251 => 34510, 29252 => 34480, 29253 => 34490, 29254 => 34481, 29255 => 34479,
-    29256 => 34505, 29257 => 34511, 29258 => 34484, 29259 => 34537, 29260 => 34545,
-    29261 => 34546, 29262 => 34541, 29263 => 34547, 29264 => 34512, 29265 => 34579,
-    29266 => 34526, 29267 => 34548, 29268 => 34527, 29269 => 34520, 29270 => 34513,
-    29271 => 34563, 29272 => 34567, 29273 => 34552, 29274 => 34568, 29275 => 34570,
-    29276 => 34573, 29277 => 34569, 29278 => 34595, 29279 => 34619, 29280 => 34590,
-    29281 => 34597, 29282 => 34606, 29283 => 34586, 29284 => 34622, 29285 => 34632,
-    29286 => 34612, 29287 => 34609, 29288 => 34601, 29289 => 34615, 29290 => 34623,
-    29291 => 34690, 29292 => 34594, 29293 => 34685, 29294 => 34686, 29295 => 34683,
-    29296 => 34656, 29297 => 34672, 29298 => 34636, 29299 => 34670, 29300 => 34699,
-    29301 => 34643, 29302 => 34659, 29303 => 34684, 29304 => 34660, 29305 => 34649,
-    29306 => 34661, 29307 => 34707, 29308 => 34735, 29309 => 34728, 29310 => 34770,
-    29473 => 34758, 29474 => 34696, 29475 => 34693, 29476 => 34733, 29477 => 34711,
-    29478 => 34691, 29479 => 34731, 29480 => 34789, 29481 => 34732, 29482 => 34741,
-    29483 => 34739, 29484 => 34763, 29485 => 34771, 29486 => 34749, 29487 => 34769,
-    29488 => 34752, 29489 => 34762, 29490 => 34779, 29491 => 34794, 29492 => 34784,
-    29493 => 34798, 29494 => 34838, 29495 => 34835, 29496 => 34814, 29497 => 34826,
-    29498 => 34843, 29499 => 34849, 29500 => 34873, 29501 => 34876, 29502 => 32566,
-    29503 => 32578, 29504 => 32580, 29505 => 32581, 29506 => 33296, 29507 => 31482,
-    29508 => 31485, 29509 => 31496, 29510 => 31491, 29511 => 31492, 29512 => 31509,
-    29513 => 31498, 29514 => 31531, 29515 => 31503, 29516 => 31559, 29517 => 31544,
-    29518 => 31530, 29519 => 31513, 29520 => 31534, 29521 => 31537, 29522 => 31520,
-    29523 => 31525, 29524 => 31524, 29525 => 31539, 29526 => 31550, 29527 => 31518,
-    29528 => 31576, 29529 => 31578, 29530 => 31557, 29531 => 31605, 29532 => 31564,
-    29533 => 31581, 29534 => 31584, 29535 => 31598, 29536 => 31611, 29537 => 31586,
-    29538 => 31602, 29539 => 31601, 29540 => 31632, 29541 => 31654, 29542 => 31655,
-    29543 => 31672, 29544 => 31660, 29545 => 31645, 29546 => 31656, 29547 => 31621,
-    29548 => 31658, 29549 => 31644, 29550 => 31650, 29551 => 31659, 29552 => 31668,
-    29553 => 31697, 29554 => 31681, 29555 => 31692, 29556 => 31709, 29557 => 31706,
-    29558 => 31717, 29559 => 31718, 29560 => 31722, 29561 => 31756, 29562 => 31742,
-    29563 => 31740, 29564 => 31759, 29565 => 31766, 29566 => 31755, 29729 => 31775,
-    29730 => 31786, 29731 => 31782, 29732 => 31800, 29733 => 31809, 29734 => 31808,
-    29735 => 33278, 29736 => 33281, 29737 => 33282, 29738 => 33284, 29739 => 33260,
-    29740 => 34884, 29741 => 33313, 29742 => 33314, 29743 => 33315, 29744 => 33325,
-    29745 => 33327, 29746 => 33320, 29747 => 33323, 29748 => 33336, 29749 => 33339,
-    29750 => 33331, 29751 => 33332, 29752 => 33342, 29753 => 33348, 29754 => 33353,
-    29755 => 33355, 29756 => 33359, 29757 => 33370, 29758 => 33375, 29759 => 33384,
-    29760 => 34942, 29761 => 34949, 29762 => 34952, 29763 => 35032, 29764 => 35039,
-    29765 => 35166, 29766 => 32669, 29767 => 32671, 29768 => 32679, 29769 => 32687,
-    29770 => 32688, 29771 => 32690, 29772 => 31868, 29773 => 25929, 29774 => 31889,
-    29775 => 31901, 29776 => 31900, 29777 => 31902, 29778 => 31906, 29779 => 31922,
-    29780 => 31932, 29781 => 31933, 29782 => 31937, 29783 => 31943, 29784 => 31948,
-    29785 => 31949, 29786 => 31944, 29787 => 31941, 29788 => 31959, 29789 => 31976,
-    29790 => 33390, 29791 => 26280, 29792 => 32703, 29793 => 32718, 29794 => 32725,
-    29795 => 32741, 29796 => 32737, 29797 => 32742, 29798 => 32745, 29799 => 32750,
-    29800 => 32755, 29801 => 31992, 29802 => 32119, 29803 => 32166, 29804 => 32174,
-    29805 => 32327, 29806 => 32411, 29807 => 40632, 29808 => 40628, 29809 => 36211,
-    29810 => 36228, 29811 => 36244, 29812 => 36241, 29813 => 36273, 29814 => 36199,
-    29815 => 36205, 29816 => 35911, 29817 => 35913, 29818 => 37194, 29819 => 37200,
-    29820 => 37198, 29821 => 37199, 29822 => 37220, 29985 => 37218, 29986 => 37217,
-    29987 => 37232, 29988 => 37225, 29989 => 37231, 29990 => 37245, 29991 => 37246,
-    29992 => 37234, 29993 => 37236, 29994 => 37241, 29995 => 37260, 29996 => 37253,
-    29997 => 37264, 29998 => 37261, 29999 => 37265, 30000 => 37282, 30001 => 37283,
-    30002 => 37290, 30003 => 37293, 30004 => 37294, 30005 => 37295, 30006 => 37301,
-    30007 => 37300, 30008 => 37306, 30009 => 35925, 30010 => 40574, 30011 => 36280,
-    30012 => 36331, 30013 => 36357, 30014 => 36441, 30015 => 36457, 30016 => 36277,
-    30017 => 36287, 30018 => 36284, 30019 => 36282, 30020 => 36292, 30021 => 36310,
-    30022 => 36311, 30023 => 36314, 30024 => 36318, 30025 => 36302, 30026 => 36303,
-    30027 => 36315, 30028 => 36294, 30029 => 36332, 30030 => 36343, 30031 => 36344,
-    30032 => 36323, 30033 => 36345, 30034 => 36347, 30035 => 36324, 30036 => 36361,
-    30037 => 36349, 30038 => 36372, 30039 => 36381, 30040 => 36383, 30041 => 36396,
-    30042 => 36398, 30043 => 36387, 30044 => 36399, 30045 => 36410, 30046 => 36416,
-    30047 => 36409, 30048 => 36405, 30049 => 36413, 30050 => 36401, 30051 => 36425,
-    30052 => 36417, 30053 => 36418, 30054 => 36433, 30055 => 36434, 30056 => 36426,
-    30057 => 36464, 30058 => 36470, 30059 => 36476, 30060 => 36463, 30061 => 36468,
-    30062 => 36485, 30063 => 36495, 30064 => 36500, 30065 => 36496, 30066 => 36508,
-    30067 => 36510, 30068 => 35960, 30069 => 35970, 30070 => 35978, 30071 => 35973,
-    30072 => 35992, 30073 => 35988, 30074 => 26011, 30075 => 35286, 30076 => 35294,
-    30077 => 35290, 30078 => 35292, 30241 => 35301, 30242 => 35307, 30243 => 35311,
-    30244 => 35390, 30245 => 35622, 30246 => 38739, 30247 => 38633, 30248 => 38643,
-    30249 => 38639, 30250 => 38662, 30251 => 38657, 30252 => 38664, 30253 => 38671,
-    30254 => 38670, 30255 => 38698, 30256 => 38701, 30257 => 38704, 30258 => 38718,
-    30259 => 40832, 30260 => 40835, 30261 => 40837, 30262 => 40838, 30263 => 40839,
-    30264 => 40840, 30265 => 40841, 30266 => 40842, 30267 => 40844, 30268 => 40702,
-    30269 => 40715, 30270 => 40717, 30271 => 38585, 30272 => 38588, 30273 => 38589,
-    30274 => 38606, 30275 => 38610, 30276 => 30655, 30277 => 38624, 30278 => 37518,
-    30279 => 37550, 30280 => 37576, 30281 => 37694, 30282 => 37738, 30283 => 37834,
-    30284 => 37775, 30285 => 37950, 30286 => 37995, 30287 => 40063, 30288 => 40066,
-    30289 => 40069, 30290 => 40070, 30291 => 40071, 30292 => 40072, 30293 => 31267,
-    30294 => 40075, 30295 => 40078, 30296 => 40080, 30297 => 40081, 30298 => 40082,
-    30299 => 40084, 30300 => 40085, 30301 => 40090, 30302 => 40091, 30303 => 40094,
-    30304 => 40095, 30305 => 40096, 30306 => 40097, 30307 => 40098, 30308 => 40099,
-    30309 => 40101, 30310 => 40102, 30311 => 40103, 30312 => 40104, 30313 => 40105,
-    30314 => 40107, 30315 => 40109, 30316 => 40110, 30317 => 40112, 30318 => 40113,
-    30319 => 40114, 30320 => 40115, 30321 => 40116, 30322 => 40117, 30323 => 40118,
-    30324 => 40119, 30325 => 40122, 30326 => 40123, 30327 => 40124, 30328 => 40125,
-    30329 => 40132, 30330 => 40133, 30331 => 40134, 30332 => 40135, 30333 => 40138,
-    30334 => 40139, 30497 => 40140, 30498 => 40141, 30499 => 40142, 30500 => 40143,
-    30501 => 40144, 30502 => 40147, 30503 => 40148, 30504 => 40149, 30505 => 40151,
-    30506 => 40152, 30507 => 40153, 30508 => 40156, 30509 => 40157, 30510 => 40159,
-    30511 => 40162, 30512 => 38780, 30513 => 38789, 30514 => 38801, 30515 => 38802,
-    30516 => 38804, 30517 => 38831, 30518 => 38827, 30519 => 38819, 30520 => 38834,
-    30521 => 38836, 30522 => 39601, 30523 => 39600, 30524 => 39607, 30525 => 40536,
-    30526 => 39606, 30527 => 39610, 30528 => 39612, 30529 => 39617, 30530 => 39616,
-    30531 => 39621, 30532 => 39618, 30533 => 39627, 30534 => 39628, 30535 => 39633,
-    30536 => 39749, 30537 => 39747, 30538 => 39751, 30539 => 39753, 30540 => 39752,
-    30541 => 39757, 30542 => 39761, 30543 => 39144, 30544 => 39181, 30545 => 39214,
-    30546 => 39253, 30547 => 39252, 30548 => 39647, 30549 => 39649, 30550 => 39654,
-    30551 => 39663, 30552 => 39659, 30553 => 39675, 30554 => 39661, 30555 => 39673,
-    30556 => 39688, 30557 => 39695, 30558 => 39699, 30559 => 39711, 30560 => 39715,
-    30561 => 40637, 30562 => 40638, 30563 => 32315, 30564 => 40578, 30565 => 40583,
-    30566 => 40584, 30567 => 40587, 30568 => 40594, 30569 => 37846, 30570 => 40605,
-    30571 => 40607, 30572 => 40667, 30573 => 40668, 30574 => 40669, 30575 => 40672,
-    30576 => 40671, 30577 => 40674, 30578 => 40681, 30579 => 40679, 30580 => 40677,
-    30581 => 40682, 30582 => 40687, 30583 => 40738, 30584 => 40748, 30585 => 40751,
-    30586 => 40761, 30587 => 40759, 30588 => 40765, 30589 => 40766, 30590 => 40772,
-    0 => 0 );
-
-    function gb2utf8($gb) {
-        if( !trim($gb) ) return $gb;
-        $utf8='';
-        while($gb) {
-            if( ord(substr($gb,0,1)) > 127 ) {
-                $t=substr($gb,0,2);
-                $gb=substr($gb,2);
-                $utf8 .= $this->u2utf8($this->codetable[hexdec(bin2hex($t))-0x8080]);
-            }
-            else {
-                $t=substr($gb,0,1);
-                $gb=substr($gb,1);
-                $utf8 .= $this->u2utf8($t);
-            }
-        }
-        return $utf8;
-    }
-
-    function u2utf8($c) {
-        $str='';
-        if ($c < 0x80) {
-            $str.=$c;
-        }
-        else if ($c < 0x800) {
-            $str.=chr(0xC0 | $c>>6);
-            $str.=chr(0x80 | $c & 0x3F);
-        }
-        else if ($c < 0x10000) {
-            $str.=chr(0xE0 | $c>>12);
-            $str.=chr(0x80 | $c>>6 & 0x3F);
-            $str.=chr(0x80 | $c & 0x3F);
-        }
-        else if ($c < 0x200000) {
-            $str.=chr(0xF0 | $c>>18);
-            $str.=chr(0x80 | $c>>12 & 0x3F);
-            $str.=chr(0x80 | $c>>6 & 0x3F);
-            $str.=chr(0x80 | $c & 0x3F);
-        }
-        return $str;
-    }
-
-} // END Class
-
-?>
diff --git a/#jpgraph/src/jpgraph_gradient.php b/#jpgraph/src/jpgraph_gradient.php
deleted file mode 100644
index 225cf60c..00000000
--- a/#jpgraph/src/jpgraph_gradient.php
+++ /dev/null
@@ -1,434 +0,0 @@
-<?php
-/*=======================================================================
- // File:        JPGRAPH_GRADIENT.PHP
- // Description: Create a color gradient
- // Created:     2003-02-01
- // Ver:         $Id: jpgraph_gradient.php 1761 2009-08-01 08:31:28Z ljp $
- //
- // Copyright (c) Asial Corporation. All rights reserved.
- //========================================================================
- */
-
-// Styles for gradient color fill
-define("GRAD_VER",1);
-define("GRAD_VERT",1);
-define("GRAD_HOR",2);
-define("GRAD_MIDHOR",3);
-define("GRAD_MIDVER",4);
-define("GRAD_CENTER",5);
-define("GRAD_WIDE_MIDVER",6);
-define("GRAD_WIDE_MIDHOR",7);
-define("GRAD_LEFT_REFLECTION",8);
-define("GRAD_RIGHT_REFLECTION",9);
-define("GRAD_RAISED_PANEL",10);
-define("GRAD_DIAGONAL",11);
-
-//===================================================
-// CLASS Gradient
-// Description: Handles gradient fills. This is to be
-// considered a "friend" class of Class Image.
-//===================================================
-class Gradient {
-    private $img=null, $numcolors=100;
-    //---------------
-    // CONSTRUCTOR
-    function __construct(&$img) {
-        $this->img = $img;
-    }
-
-
-    function SetNumColors($aNum) {
-        $this->numcolors=$aNum;
-    }
-    //---------------
-    // PUBLIC METHODS
-    // Produce a gradient filled rectangle with a smooth transition between
-    // two colors.
-    // ($xl,$yt)  Top left corner
-    // ($xr,$yb) Bottom right
-    // $from_color Starting color in gradient
-    // $to_color End color in the gradient
-    // $style  Which way is the gradient oriented?
-    function FilledRectangle($xl,$yt,$xr,$yb,$from_color,$to_color,$style=1) {
-        $this->img->SetLineWeight(1);
-        switch( $style ) {
-            case GRAD_VER:
-                $steps = ceil(abs($xr-$xl)+1);
-                $delta = $xr>=$xl ? 1 : -1;
-                $this->GetColArray($from_color,$to_color,$steps,$colors,$this->numcolors);
-                for( $i=0, $x=$xl; $i < $steps; ++$i ) {
-                    $this->img->current_color = $colors[$i];
-                    $this->img->Line($x,$yt,$x,$yb);
-                    $x += $delta;
-                }
-                break;
-
-            case GRAD_HOR:
-                $steps = ceil(abs($yb-$yt)+1);
-                $delta = $yb >= $yt ? 1 : -1;
-                $this->GetColArray($from_color,$to_color,$steps,$colors,$this->numcolors);
-                for($i=0,$y=$yt; $i < $steps; ++$i) {
-                    $this->img->current_color = $colors[$i];
-                    $this->img->Line($xl,$y,$xr,$y);
-                    $y += $delta;
-                }
-                break;
-
-            case GRAD_MIDHOR:
-                $steps = ceil(abs($yb-$yt)/2);
-                $delta = $yb >= $yt ? 1 : -1;
-                $this->GetColArray($from_color,$to_color,$steps,$colors,$this->numcolors);
-                for($y=$yt, $i=0; $i < $steps;  ++$i) {
-                    $this->img->current_color = $colors[$i];
-                    $this->img->Line($xl,$y,$xr,$y);
-                    $y += $delta;
-                }
-                --$i;
-                if( abs($yb-$yt) % 2 == 1 ) {
-                    --$steps;
-                }
-                for($j=0; $j < $steps; ++$j, --$i) {
-                    $this->img->current_color = $colors[$i];
-                    $this->img->Line($xl,$y,$xr,$y);
-                    $y += $delta;
-                }
-                $this->img->Line($xl,$y,$xr,$y);
-                break;
-
-            case GRAD_MIDVER:
-                $steps = ceil(abs($xr-$xl)/2);
-                $delta = $xr>=$xl ? 1 : -1;
-                $this->GetColArray($from_color,$to_color,$steps,$colors,$this->numcolors);
-                for($x=$xl, $i=0; $i < $steps; ++$i) {
-                    $this->img->current_color = $colors[$i];
-                    $this->img->Line($x,$yb,$x,$yt);
-                    $x += $delta;
-                }
-                --$i;
-                if( abs($xr-$xl) % 2 == 1 ) {
-                    --$steps;
-                }
-                for($j=0; $j < $steps; ++$j, --$i) {
-                    $this->img->current_color = $colors[$i];
-                    $this->img->Line($x,$yb,$x,$yt);
-                    $x += $delta;
-                }
-                $this->img->Line($x,$yb,$x,$yt);
-                break;
-
-            case GRAD_WIDE_MIDVER:
-                $diff = ceil(abs($xr-$xl));
-                $steps = floor(abs($diff)/3);
-                $firststep = $diff - 2*$steps ;
-                $delta = $xr >= $xl ? 1 : -1;
-                $this->GetColArray($from_color,$to_color,$firststep,$colors,$this->numcolors);
-                for($x=$xl, $i=0; $i < $firststep; ++$i) {
-                    $this->img->current_color = $colors[$i];
-                    $this->img->Line($x,$yb,$x,$yt);
-                    $x += $delta;
-                }
-                --$i;
-                $this->img->current_color = $colors[$i];
-                for($j=0; $j< $steps; ++$j) {
-                    $this->img->Line($x,$yb,$x,$yt);
-                    $x += $delta;
-                }
-
-                for($j=0; $j < $steps; ++$j, --$i) {
-                    $this->img->current_color = $colors[$i];
-                    $this->img->Line($x,$yb,$x,$yt);
-                    $x += $delta;
-                }
-                break;
-
-            case GRAD_WIDE_MIDHOR:
-                $diff = ceil(abs($yb-$yt));
-                $steps = floor(abs($diff)/3);
-                $firststep = $diff - 2*$steps ;
-                $delta = $yb >= $yt? 1 : -1;
-                $this->GetColArray($from_color,$to_color,$firststep,$colors,$this->numcolors);
-                for($y=$yt, $i=0; $i < $firststep;  ++$i) {
-                    $this->img->current_color = $colors[$i];
-                    $this->img->Line($xl,$y,$xr,$y);
-                    $y += $delta;
-                }
-                --$i;
-                $this->img->current_color = $colors[$i];
-                for($j=0; $j < $steps; ++$j) {
-                    $this->img->Line($xl,$y,$xr,$y);
-                    $y += $delta;
-                }
-                for($j=0; $j < $steps; ++$j, --$i) {
-                    $this->img->current_color = $colors[$i];
-                    $this->img->Line($xl,$y,$xr,$y);
-                    $y += $delta;
-                }
-                break;
-
-            case GRAD_LEFT_REFLECTION:
-                $steps1 = ceil(0.3*abs($xr-$xl));
-                $delta = $xr>=$xl ? 1 : -1;
-
-                $from_color = $this->img->rgb->Color($from_color);
-                $adj = 1.4;
-                $m = ($adj-1.0)*(255-min(255,min($from_color[0],min($from_color[1],$from_color[2]))));
-                $from_color2 = array(min(255,$from_color[0]+$m),
-                min(255,$from_color[1]+$m), min(255,$from_color[2]+$m));
-
-                $this->GetColArray($from_color2,$to_color,$steps1,$colors,$this->numcolors);
-                $n = count($colors);
-                for($x=$xl, $i=0; $i < $steps1 && $i < $n; ++$i) {
-                    $this->img->current_color = $colors[$i];
-                    $this->img->Line($x,$yb,$x,$yt);
-                    $x += $delta;
-                }
-                $steps2 = max(1,ceil(0.08*abs($xr-$xl)));
-                $this->img->SetColor($to_color);
-                for($j=0; $j< $steps2; ++$j) {
-                    $this->img->Line($x,$yb,$x,$yt);
-                    $x += $delta;
-                }
-                $steps = abs($xr-$xl)-$steps1-$steps2;
-                $this->GetColArray($to_color,$from_color,$steps,$colors,$this->numcolors);
-                $n = count($colors);
-                for($i=0; $i < $steps && $i < $n; ++$i) {
-                    $this->img->current_color = $colors[$i];
-                    $this->img->Line($x,$yb,$x,$yt);
-                    $x += $delta;
-                }
-                break;
-
-            case GRAD_RIGHT_REFLECTION:
-                $steps1 = ceil(0.7*abs($xr-$xl));
-                $delta = $xr>=$xl ? 1 : -1;
-
-                $this->GetColArray($from_color,$to_color,$steps1,$colors,$this->numcolors);
-                $n = count($colors);
-                for($x=$xl, $i=0; $i < $steps1 && $i < $n; ++$i) {
-                    $this->img->current_color = $colors[$i];
-                    $this->img->Line($x,$yb,$x,$yt);
-                    $x += $delta;
-                }
-                $steps2 = max(1,ceil(0.08*abs($xr-$xl)));
-                $this->img->SetColor($to_color);
-                for($j=0; $j< $steps2; ++$j) {
-                    $this->img->Line($x,$yb,$x,$yt);
-                    $x += $delta;
-                }
-
-                $from_color = $this->img->rgb->Color($from_color);
-                $adj = 1.4;
-                $m = ($adj-1.0)*(255-min(255,min($from_color[0],min($from_color[1],$from_color[2]))));
-                $from_color = array(min(255,$from_color[0]+$m),
-                min(255,$from_color[1]+$m), min(255,$from_color[2]+$m));
-
-                $steps = abs($xr-$xl)-$steps1-$steps2;
-                $this->GetColArray($to_color,$from_color,$steps,$colors,$this->numcolors);
-                $n = count($colors);
-                for($i=0; $i < $steps && $i < $n; ++$i) {
-                    $this->img->current_color = $colors[$i];
-                    $this->img->Line($x,$yb,$x,$yt);
-                    $x += $delta;
-                }
-                break;
-
-            case GRAD_CENTER:
-                $steps = ceil(min(($yb-$yt)+1,($xr-$xl)+1)/2);
-                $this->GetColArray($from_color,$to_color,$steps,$colors,$this->numcolors);
-                $dx = ($xr-$xl)/2;
-                $dy = ($yb-$yt)/2;
-                $x=$xl;$y=$yt;$x2=$xr;$y2=$yb;
-                $n = count($colors);
-                for($x=$xl, $i=0; $x < $xl+$dx && $y < $yt+$dy && $i < $n; ++$x, ++$y, --$x2, --$y2, ++$i) {
-                    $this->img->current_color = $colors[$i];
-                    $this->img->Rectangle($x,$y,$x2,$y2);
-                }
-                $this->img->Line($x,$y,$x2,$y2);
-                break;
-
-            case GRAD_RAISED_PANEL:
-                // right to left
-                $steps1 = $xr-$xl;
-                $delta = $xr>=$xl ? 1 : -1;
-                $this->GetColArray($to_color,$from_color,$steps1,$colors,$this->numcolors);
-                $n = count($colors);
-                for($x=$xl, $i=0; $i < $steps1 && $i < $n; ++$i) {
-                    $this->img->current_color = $colors[$i];
-                    $this->img->Line($x,$yb,$x,$yt);
-                    $x += $delta;
-                }
-
-                // left to right
-                $xr -= 3;
-                $xl += 3;
-                $yb -= 3;
-                $yt += 3;
-                $steps2 = $xr-$xl;
-                $delta = $xr>=$xl ? 1 : -1;
-                for($x=$xl, $j=$steps2; $j >= 0; --$j) {
-                    $this->img->current_color = $colors[$j];
-                    $this->img->Line($x,$yb,$x,$yt);
-                    $x += $delta;
-                }
-                break;
-
-            case GRAD_DIAGONAL:
-                // use the longer dimension to determine the required number of steps.
-                // first loop draws from one corner to the mid-diagonal and the second
-                // loop draws from the mid-diagonal to the opposing corner.
-                if($xr-$xl > $yb - $yt) {
-                    // width is greater than height -> use x-dimension for steps
-                    $steps = $xr-$xl;
-                    $delta = $xr>=$xl ? 1 : -1;
-                    $this->GetColArray($from_color,$to_color,$steps*2,$colors,$this->numcolors);
-                    $n = count($colors);
-
-                    for($x=$xl, $i=0; $i < $steps && $i < $n; ++$i) {
-                        $this->img->current_color = $colors[$i];
-                        $y = $yt+($i/$steps)*($yb-$yt)*$delta;
-                        $this->img->Line($x,$yt,$xl,$y);
-                        $x += $delta;
-                    }
-
-                    for($x=$xl, $i = 0; $i < $steps && $i < $n; ++$i) {
-                        $this->img->current_color = $colors[$steps+$i];
-                        $y = $yt+($i/$steps)*($yb-$yt)*$delta;
-                        $this->img->Line($x,$yb,$xr,$y);
-                        $x += $delta;
-                    }
-                } else {
-                    // height is greater than width -> use y-dimension for steps
-                    $steps = $yb-$yt;
-                    $delta = $yb>=$yt ? 1 : -1;
-                    $this->GetColArray($from_color,$to_color,$steps*2,$colors,$this->numcolors);
-                    $n = count($colors);
-
-                    for($y=$yt, $i=0; $i < $steps && $i < $n; ++$i) {
-                        $this->img->current_color = $colors[$i];
-                        $x = $xl+($i/$steps)*($xr-$xl)*$delta;
-                        $this->img->Line($x,$yt,$xl,$y);
-                        $y += $delta;
-                    }
-
-                    for($y=$yt, $i = 0; $i < $steps && $i < $n; ++$i) {
-                        $this->img->current_color = $colors[$steps+$i];
-                        $x = $xl+($i/$steps)*($xr-$xl)*$delta;
-                        $this->img->Line($x,$yb,$xr,$y);
-                        $x += $delta;
-                    }
-
-                }
-                break;
-
-            default:
-                JpGraphError::RaiseL(7001,$style);
-                //("Unknown gradient style (=$style).");
-                break;
-        }
-    }
-
-    // Fill a special case of a polygon with a flat bottom
-    // with a gradient. Can be used for filled line plots.
-    // Please note that this is NOT a generic gradient polygon fill
-    // routine. It assumes that the bottom is flat (like a drawing
-    // of a mountain)
-    function FilledFlatPolygon($pts,$from_color,$to_color) {
-        if( count($pts) == 0 ) return;
-
-        $maxy=$pts[1];
-        $miny=$pts[1];
-        $n = count($pts) ;
-        for( $i=0, $idx=0; $i < $n; $i += 2) {
-            $x = round($pts[$i]);
-            $y = round($pts[$i+1]);
-            $miny = min($miny,$y);
-            $maxy = max($maxy,$y);
-        }
-
-        $colors = array();
-        $this->GetColArray($from_color,$to_color,abs($maxy-$miny)+1,$colors,$this->numcolors);
-        for($i=$miny, $idx=0; $i <= $maxy; ++$i ) {
-            $colmap[$i] = $colors[$idx++];
-        }
-
-        $n = count($pts)/2 ;
-        $idx = 0 ;
-        while( $idx < $n-1 ) {
-            $p1 = array(round($pts[$idx*2]),round($pts[$idx*2+1]));
-            $p2 = array(round($pts[++$idx*2]),round($pts[$idx*2+1]));
-
-            // Find the largest rectangle we can fill
-            $y = max($p1[1],$p2[1]) ;
-            for($yy=$maxy; $yy > $y; --$yy) {
-                $this->img->current_color = $colmap[$yy];
-                $this->img->Line($p1[0],$yy,$p2[0]-1,$yy);
-            }
-
-            if( $p1[1] == $p2[1] ) {
-                continue;
-            }
-
-            // Fill the rest using lines (slow...)
-            $slope = ($p2[0]-$p1[0])/($p1[1]-$p2[1]);
-            $x1 = $p1[0];
-            $x2 = $p2[0]-1;
-            $start = $y;
-            if( $p1[1] > $p2[1] ) {
-                while( $y >= $p2[1] ) {
-                    $x1=$slope*($start-$y)+$p1[0];
-                    $this->img->current_color = $colmap[$y];
-                    $this->img->Line($x1,$y,$x2,$y);
-                    --$y;
-                }
-            }
-            else {
-                while( $y >= $p1[1] ) {
-                    $x2=$p2[0]+$slope*($start-$y);
-                    $this->img->current_color = $colmap[$y];
-                    $this->img->Line($x1,$y,$x2,$y);
-                    --$y;
-                }
-            }
-        }
-    }
-
-    //---------------
-    // PRIVATE METHODS
-    // Add to the image color map the necessary colors to do the transition
-    // between the two colors using $numcolors intermediate colors
-    function GetColArray($from_color,$to_color,$arr_size,&$colors,$numcols=100) {
-        if( $arr_size==0 ) {
-            return;
-        }
-
-        // If color is given as text get it's corresponding r,g,b values
-        $from_color = $this->img->rgb->Color($from_color);
-        $to_color = $this->img->rgb->Color($to_color);
-
-        $rdelta=($to_color[0]-$from_color[0])/$numcols;
-        $gdelta=($to_color[1]-$from_color[1])/$numcols;
-        $bdelta=($to_color[2]-$from_color[2])/$numcols;
-        $colorsperstep = $numcols/$arr_size;
-        $prevcolnum = -1;
-        $from_alpha = $from_color[3];
-        $to_alpha = $to_color[3];
-        $adelta = ( $to_alpha - $from_alpha ) / $numcols ;
-        for ($i=0; $i < $arr_size; ++$i) {
-            $colnum = floor($colorsperstep*$i);
-            if ( $colnum == $prevcolnum ) {
-                $colors[$i] = $colidx;
-            }
-            else {
-                $r = floor($from_color[0] + $colnum*$rdelta);
-                $g = floor($from_color[1] + $colnum*$gdelta);
-                $b = floor($from_color[2] + $colnum*$bdelta);
-                $alpha = $from_alpha + $colnum*$adelta;
-                $colidx = $this->img->rgb->Allocate(sprintf("#%02x%02x%02x",$r,$g,$b),$alpha);
-                $colors[$i] = $colidx;
-            }
-            $prevcolnum = $colnum;
-        }
-    }
-} // Class
-
-?>
diff --git a/#jpgraph/src/jpgraph_iconplot.php b/#jpgraph/src/jpgraph_iconplot.php
deleted file mode 100644
index 584f8017..00000000
--- a/#jpgraph/src/jpgraph_iconplot.php
+++ /dev/null
@@ -1,190 +0,0 @@
-<?php
-//=======================================================================
-// File:        JPGRAPH_ICONPLOT.PHP
-// Description: Extension module to add icons to plots
-// Created:     2004-02-18
-// Ver:         $Id: jpgraph_iconplot.php 1404 2009-06-28 15:25:41Z ljp $
-//
-// Copyright (c) Asial Corporation. All rights reserved.
-//========================================================================
-
-
-//===================================================
-// CLASS IconPlot
-// Description: Make it possible to add a (small) image
-// to the graph
-//===================================================
-class IconPlot {
-    public $iX=0,$iY=0,$iScale=1.0,$iMix=100;
-    private $iHorAnchor='left',$iVertAnchor='top';
-    private $iFile='';
-    private $iAnchors = array('left','right','top','bottom','center');
-    private $iCountryFlag='',$iCountryStdSize=3;
-    private $iScalePosY=null,$iScalePosX=null;
-    private $iImgString='';
-
-
-    function __construct($aFile="",$aX=0,$aY=0,$aScale=1.0,$aMix=100) {
-        $this->iFile = $aFile;
-        $this->iX=$aX;
-        $this->iY=$aY;
-        $this->iScale= $aScale;
-        if( $aMix < 0 || $aMix > 100 ) {
-            JpGraphError::RaiseL(8001); //('Mix value for icon must be between 0 and 100.');
-        }
-        $this->iMix = $aMix ;
-    }
-
-    function SetCountryFlag($aFlag,$aX=0,$aY=0,$aScale=1.0,$aMix=100,$aStdSize=3) {
-        $this->iCountryFlag = $aFlag;
-        $this->iX=$aX;
-        $this->iY=$aY;
-        $this->iScale= $aScale;
-        if( $aMix < 0 || $aMix > 100 ) {
-            JpGraphError::RaiseL(8001);//'Mix value for icon must be between 0 and 100.');
-        }
-        $this->iMix = $aMix;
-        $this->iCountryStdSize = $aStdSize;
-    }
-
-    function SetPos($aX,$aY) {
-        $this->iX=$aX;
-        $this->iY=$aY;
-    }
-
-    function CreateFromString($aStr) {
-        $this->iImgString = $aStr;
-    }
-
-    function SetScalePos($aX,$aY) {
-        $this->iScalePosX = $aX;
-        $this->iScalePosY = $aY;
-    }
-
-    function SetScale($aScale) {
-        $this->iScale = $aScale;
-    }
-
-    function SetMix($aMix) {
-        if( $aMix < 0 || $aMix > 100 ) {
-            JpGraphError::RaiseL(8001);//('Mix value for icon must be between 0 and 100.');
-        }
-        $this->iMix = $aMix ;
-    }
-
-    function SetAnchor($aXAnchor='left',$aYAnchor='center') {
-        if( !in_array($aXAnchor,$this->iAnchors) ||
-        !in_array($aYAnchor,$this->iAnchors) ) {
-            JpGraphError::RaiseL(8002);//("Anchor position for icons must be one of 'top', 'bottom', 'left', 'right' or 'center'");
-        }
-        $this->iHorAnchor=$aXAnchor;
-        $this->iVertAnchor=$aYAnchor;
-    }
-
-    function PreStrokeAdjust($aGraph) {
-        // Nothing to do ...
-    }
-
-    function DoLegend($aGraph) {
-        // Nothing to do ...
-    }
-
-    function Max() {
-        return array(false,false);
-    }
-
-
-    // The next four function are framework function tht gets called
-    // from Gantt and is not menaiungfull in the context of Icons but
-    // they must be implemented to avoid errors.
-    function GetMaxDate() { return false;   }
-    function GetMinDate() { return false;   }
-    function GetLineNbr() { return 0;   }
-    function GetAbsHeight() {return 0;  }
-
-
-    function Min() {
-        return array(false,false);
-    }
-
-    function StrokeMargin(&$aImg) {
-        return true;
-    }
-
-    function Stroke($aImg,$axscale=null,$ayscale=null) {
-        $this->StrokeWithScale($aImg,$axscale,$ayscale);
-    }
-
-    function StrokeWithScale($aImg,$axscale,$ayscale) {
-        if( $this->iScalePosX === null || $this->iScalePosY === null ||
-        	$axscale === null || $ayscale === null ) {
-            $this->_Stroke($aImg);
-        }
-        else {
-            $this->_Stroke($aImg,
-            	round($axscale->Translate($this->iScalePosX)),
-            	round($ayscale->Translate($this->iScalePosY)));
-        }
-    }
-
-    function GetWidthHeight() {
-        $dummy=0;
-        return $this->_Stroke($dummy,null,null,true);
-    }
-
-    function _Stroke($aImg,$x=null,$y=null,$aReturnWidthHeight=false) {
-        if( $this->iFile != '' && $this->iCountryFlag != '' ) {
-            JpGraphError::RaiseL(8003);//('It is not possible to specify both an image file and a country flag for the same icon.');
-        }
-        if( $this->iFile != '' ) {
-            $gdimg = Graph::LoadBkgImage('',$this->iFile);
-        }
-        elseif( $this->iImgString != '') {
-            $gdimg = Image::CreateFromString($this->iImgString);
-        }
-
-        else {
-            if( ! class_exists('FlagImages',false) ) {
-                JpGraphError::RaiseL(8004);//('In order to use Country flags as icons you must include the "jpgraph_flags.php" file.');
-            }
-            $fobj = new FlagImages($this->iCountryStdSize);
-            $dummy='';
-            $gdimg = $fobj->GetImgByName($this->iCountryFlag,$dummy);
-        }
-
-        $iconw = imagesx($gdimg);
-        $iconh = imagesy($gdimg);
-
-        if( $aReturnWidthHeight ) {
-            return array(round($iconw*$this->iScale),round($iconh*$this->iScale));
-        }
-
-        if( $x !== null && $y !== null ) {
-            $this->iX = $x; $this->iY = $y;
-        }
-        if( $this->iX >= 0  && $this->iX <= 1.0 ) {
-            $w = imagesx($aImg->img);
-            $this->iX = round($w*$this->iX);
-        }
-        if( $this->iY >= 0  && $this->iY <= 1.0 ) {
-            $h = imagesy($aImg->img);
-            $this->iY = round($h*$this->iY);
-        }
-
-        if( $this->iHorAnchor == 'center' )
-        $this->iX -= round($iconw*$this->iScale/2);
-        if( $this->iHorAnchor == 'right' )
-        $this->iX -= round($iconw*$this->iScale);
-        if( $this->iVertAnchor == 'center' )
-        $this->iY -= round($iconh*$this->iScale/2);
-        if( $this->iVertAnchor == 'bottom' )
-        $this->iY -= round($iconh*$this->iScale);
-
-        $aImg->CopyMerge($gdimg,$this->iX,$this->iY,0,0,
-        round($iconw*$this->iScale),round($iconh*$this->iScale),
-        $iconw,$iconh,
-        $this->iMix);
-    }
-}
-
-?>
diff --git a/#jpgraph/src/jpgraph_imgtrans.php b/#jpgraph/src/jpgraph_imgtrans.php
deleted file mode 100644
index 411a7811..00000000
--- a/#jpgraph/src/jpgraph_imgtrans.php
+++ /dev/null
@@ -1,223 +0,0 @@
-<?php
-//=======================================================================
-// File:        JPGRAPH_IMGTRANS.PHP
-// Description: Extension for JpGraph to do some simple img transformations
-// Created:     2003-09-06
-// Ver:         $Id: jpgraph_imgtrans.php 1106 2009-02-22 20:16:35Z ljp $
-//
-// Copyright (c) Asial Corporation. All rights reserved.
-//========================================================================
-
-//------------------------------------------------------------------------
-// Class ImgTrans
-// Perform some simple image transformations.
-//------------------------------------------------------------------------
-class ImgTrans {
-    private $gdImg=null;
-
-    function __construct($aGdImg) {
-        // Constructor
-        $this->gdImg = $aGdImg;
-    }
-
-    // --------------------------------------------------------------------
-    // _TransVert3D() and _TransHor3D() are helper methods to
-    // Skew3D().
-    // --------------------------------------------------------------------
-    function _TransVert3D($aGdImg,$aHorizon=100,$aSkewDist=120,$aDir=SKEW3D_DOWN,$aMinSize=true,$aFillColor='#FFFFFF',$aQuality=false,$aBorder=false,$aHorizonPos=0.5) {
-
-
-        // Parameter check
-    if( $aHorizonPos < 0 || $aHorizonPos > 1.0 ) {
-        JpGraphError::RaiseL(9001);
-        //("Value for image transformation out of bounds.\nVanishing point on horizon must be specified as a value between 0 and 1.");
-    }
-
-    $w = imagesx($aGdImg);
-    $h = imagesy($aGdImg);
-
-    // Create new image
-    $ww = $w;
-    if( $aMinSize )
-    $hh = ceil($h * $aHorizon / ($aSkewDist+$h));
-    else
-    $hh = $h;
-
-    $newgdh = imagecreatetruecolor($ww,$hh);
-    $crgb = new RGB( $newgdh );
-    $fillColor = $crgb->Allocate($aFillColor);
-    imagefilledrectangle($newgdh,0,0,$ww-1,$hh-1,$fillColor);
-
-    if( $aBorder ) {
-        $colidx = $crgb->Allocate($aBorder);
-        imagerectangle($newgdh,0,0,$ww-1,$hh-1,$colidx);
-    }
-
-    $mid = round($w * $aHorizonPos);
-
-    $last=$h;
-    for($y=0; $y < $h; ++$y) {
-
-        $yp = $h-$y-1;
-        $yt = floor($yp * $aHorizon / ($aSkewDist + $yp));
-
-        if( !$aQuality ) {
-            if( $last <= $yt ) continue ;
-            $last = $yt;
-        }
-
-        for($x=0; $x < $w; ++$x) {
-            $xt = ($x-$mid) * $aSkewDist / ($aSkewDist + $yp);
-            if( $aDir == SKEW3D_UP )
-            $rgb = imagecolorat($aGdImg,$x,$h-$y-1);
-            else
-            $rgb = imagecolorat($aGdImg,$x,$y);
-            $r = ($rgb >> 16) & 0xFF;
-            $g = ($rgb >> 8) & 0xFF;
-            $b = $rgb & 0xFF;
-            $colidx = imagecolorallocate($newgdh,$r,$g,$b);
-            $xt = round($xt+$mid);
-            if( $aDir == SKEW3D_UP ) {
-                $syt = $yt;
-            }
-            else {
-                $syt = $hh-$yt-1;
-            }
-
-            if( !empty($set[$yt]) ) {
-                $nrgb = imagecolorat($newgdh,$xt,$syt);
-                $nr = ($nrgb >> 16) & 0xFF;
-                $ng = ($nrgb >> 8) & 0xFF;
-                $nb = $nrgb & 0xFF;
-                $colidx = imagecolorallocate($newgdh,floor(($r+$nr)/2),
-                floor(($g+$ng)/2),floor(($b+$nb)/2));
-            }
-
-            imagesetpixel($newgdh,$xt,$syt,$colidx);
-        }
-
-        $set[$yt] = true;
-    }
-
-    return $newgdh;
-    }
-
-    // --------------------------------------------------------------------
-    // _TransVert3D() and _TransHor3D() are helper methods to
-    // Skew3D().
-    // --------------------------------------------------------------------
-    function _TransHor3D($aGdImg,$aHorizon=100,$aSkewDist=120,$aDir=SKEW3D_LEFT,$aMinSize=true,$aFillColor='#FFFFFF',$aQuality=false,$aBorder=false,$aHorizonPos=0.5) {
-
-        $w = imagesx($aGdImg);
-        $h = imagesy($aGdImg);
-
-        // Create new image
-        $hh = $h;
-        if( $aMinSize )
-        $ww = ceil($w * $aHorizon / ($aSkewDist+$w));
-        else
-        $ww = $w;
-
-        $newgdh = imagecreatetruecolor($ww,$hh);
-        $crgb = new RGB( $newgdh );
-        $fillColor = $crgb->Allocate($aFillColor);
-        imagefilledrectangle($newgdh,0,0,$ww-1,$hh-1,$fillColor);
-
-        if( $aBorder ) {
-            $colidx = $crgb->Allocate($aBorder);
-            imagerectangle($newgdh,0,0,$ww-1,$hh-1,$colidx);
-        }
-
-        $mid = round($h * $aHorizonPos);
-
-        $last = -1;
-        for($x=0; $x < $w-1; ++$x) {
-            $xt = floor($x * $aHorizon / ($aSkewDist + $x));
-            if( !$aQuality ) {
-                if( $last >= $xt ) continue ;
-                $last = $xt;
-            }
-
-            for($y=0; $y < $h; ++$y) {
-                $yp = $h-$y-1;
-                $yt = ($yp-$mid) * $aSkewDist / ($aSkewDist + $x);
-
-                if( $aDir == SKEW3D_RIGHT )
-                $rgb = imagecolorat($aGdImg,$w-$x-1,$y);
-                else
-                $rgb = imagecolorat($aGdImg,$x,$y);
-                $r = ($rgb >> 16) & 0xFF;
-                $g = ($rgb >> 8) & 0xFF;
-                $b = $rgb & 0xFF;
-                $colidx = imagecolorallocate($newgdh,$r,$g,$b);
-                $yt = floor($hh-$yt-$mid-1);
-                if( $aDir == SKEW3D_RIGHT ) {
-                    $sxt = $ww-$xt-1;
-                }
-                else
-                $sxt = $xt ;
-
-                if( !empty($set[$xt]) ) {
-                    $nrgb = imagecolorat($newgdh,$sxt,$yt);
-                    $nr = ($nrgb >> 16) & 0xFF;
-                    $ng = ($nrgb >> 8) & 0xFF;
-                    $nb = $nrgb & 0xFF;
-                    $colidx = imagecolorallocate($newgdh,floor(($r+$nr)/2),
-                    floor(($g+$ng)/2),floor(($b+$nb)/2));
-                }
-                imagesetpixel($newgdh,$sxt,$yt,$colidx);
-            }
-
-            $set[$xt] = true;
-        }
-
-        return $newgdh;
-    }
-
-    // --------------------------------------------------------------------
-    // Skew image for the apperance of a 3D effect
-    // This transforms an image into a 3D-skewed version
-    // of the image. The transformation is specified by giving the height
-    // of the artificial horizon and specifying a "skew" factor which
-    // is the distance on the horizon line between the point of
-    // convergence and perspective line.
-    //
-    // The function returns the GD handle of the transformed image
-    // leaving the original image untouched.
-    //
-    // Parameters:
-    // * $aGdImg, GD handle to the image to be transformed
-    // * $aHorizon, Distance to the horizon
-    // * $aSkewDist, Distance from the horizon point of convergence
-    //   on the horizon line to the perspective points. A larger
-    //   value will fore-shorten the image more
-    // * $aDir, parameter specifies type of convergence. This of this
-    //   as the walls in a room you are looking at. This specifies if the
-    //   image should be applied on the left,right,top or bottom walls.
-    // * $aMinSize, true=make the new image just as big as needed,
-    //   false = keep the image the same size as the original image
-    // * $aFillColor, Background fill color in the image
-    // * $aHiQuality, true=performa some interpolation that improves
-    //   the image quality but at the expense of performace. Enabling
-    //   high quality will have a dramatic effect on the time it takes
-    //   to transform an image.
-    // * $aBorder, if set to anything besides false this will draw a
-    //   a border of the speciied color around the image
-    // --------------------------------------------------------------------
-    function Skew3D($aHorizon=120,$aSkewDist=150,$aDir=SKEW3D_DOWN,$aHiQuality=false,$aMinSize=true,$aFillColor='#FFFFFF',$aBorder=false) {
-        return $this->_Skew3D($this->gdImg,$aHorizon,$aSkewDist,$aDir,$aHiQuality,
-        $aMinSize,$aFillColor,$aBorder);
-    }
-
-    function _Skew3D($aGdImg,$aHorizon=120,$aSkewDist=150,$aDir=SKEW3D_DOWN,$aHiQuality=false,$aMinSize=true,$aFillColor='#FFFFFF',$aBorder=false) {
-        if( $aDir == SKEW3D_DOWN || $aDir == SKEW3D_UP )
-        return $this->_TransVert3D($aGdImg,$aHorizon,$aSkewDist,$aDir,$aMinSize,$aFillColor,$aHiQuality,$aBorder);
-        else
-        return $this->_TransHor3D($aGdImg,$aHorizon,$aSkewDist,$aDir,$aMinSize,$aFillColor,$aHiQuality,$aBorder);
-
-    }
-
-}
-
-
-?>
diff --git a/#jpgraph/src/jpgraph_led.php b/#jpgraph/src/jpgraph_led.php
deleted file mode 100644
index 83bb2692..00000000
--- a/#jpgraph/src/jpgraph_led.php
+++ /dev/null
@@ -1,311 +0,0 @@
-<?php
-//=======================================================================
-// File:        JPGRAPH_LED.PHP
-// Description: Module to generate Dotted LED-like digits
-// Created:     2006-11-26
-// Ver:         $Id: jpgraph_led.php 1674 2009-07-22 19:42:23Z ljp $
-//
-// Copyright 2006 (c) Asial Corporation. All rights reserved.
-//
-// Changed: 2007-08-06 by Alexander Kurochkin (inspector@list.ru)
-//========================================================================
-
-// Constants for color schema
-DEFINE('LEDC_RED', 0);
-DEFINE('LEDC_GREEN', 1);
-DEFINE('LEDC_BLUE', 2);
-DEFINE('LEDC_YELLOW', 3);
-DEFINE('LEDC_GRAY', 4);
-DEFINE('LEDC_CHOCOLATE', 5);
-DEFINE('LEDC_PERU', 6);
-DEFINE('LEDC_GOLDENROD', 7);
-DEFINE('LEDC_KHAKI', 8);
-DEFINE('LEDC_OLIVE', 9);
-DEFINE('LEDC_LIMEGREEN', 10);
-DEFINE('LEDC_FORESTGREEN', 11);
-DEFINE('LEDC_TEAL', 12);
-DEFINE('LEDC_STEELBLUE', 13);
-DEFINE('LEDC_NAVY', 14);
-DEFINE('LEDC_INVERTGRAY', 15);
-
-// Check that mb_strlen() is available
-if( ! function_exists('mb_strlen') ) {
-    JpGraphError::RaiseL(25500);
-    //'Multibyte strings must be enabled in the PHP installation in order to run the LED module
-    // so that the function mb_strlen() is available. See PHP documentation for more information.'
-}
-
-//========================================================================
-// CLASS DigitalLED74
-// Description:
-// Construct a number as an image that looks like LED numbers in a
-// 7x4 digital matrix
-//========================================================================
-class DigitalLED74
-{
-    private $iLED_X = 4, $iLED_Y=7,
-
-        // fg-up, fg-down, bg
-        $iColorSchema = array(
-            LEDC_RED  => array('red','darkred:0.9','red:0.3'),// 0
-            LEDC_GREEN  => array('green','darkgreen','green:0.3'),// 1
-            LEDC_BLUE  => array('lightblue:0.9','darkblue:0.85','darkblue:0.7'),// 2
-            LEDC_YELLOW  => array('yellow','yellow:0.4','yellow:0.3'),// 3
-            LEDC_GRAY  => array('gray:1.4','darkgray:0.85','darkgray:0.7'),
-            LEDC_CHOCOLATE => array('chocolate','chocolate:0.7','chocolate:0.5'),
-            LEDC_PERU  => array('peru:0.95','peru:0.6','peru:0.5'),
-            LEDC_GOLDENROD => array('goldenrod','goldenrod:0.6','goldenrod:0.5'),
-            LEDC_KHAKI  => array('khaki:0.7','khaki:0.4','khaki:0.3'),
-            LEDC_OLIVE  => array('#808000','#808000:0.7','#808000:0.6'),
-            LEDC_LIMEGREEN => array('limegreen:0.9','limegreen:0.5','limegreen:0.4'),
-            LEDC_FORESTGREEN => array('forestgreen','forestgreen:0.7','forestgreen:0.5'),
-            LEDC_TEAL  => array('teal','teal:0.7','teal:0.5'),
-            LEDC_STEELBLUE => array('steelblue','steelblue:0.65','steelblue:0.5'),
-            LEDC_NAVY  => array('navy:1.3','navy:0.95','navy:0.8'),//14
-            LEDC_INVERTGRAY => array('darkgray','lightgray:1.5','white')//15
-            ),
-
-        /* Each line of the character is encoded as a 4 bit value
-         0      ____
-         1      ___x
-         2      __x_
-         3      __xx
-         4      _x__
-         5      _x_x
-         6      _xx_
-         7      _xxx
-         8      x___
-         9      x__x
-         10     x_x_
-         11     x_xx
-         12     xx__
-         13     xx_x
-         14     xxx_
-         15     xxxx
-        */
-
-        $iLEDSpec = array(
-            0 => array(6,9,11,15,13,9,6),
-            1 => array(2,6,10,2,2,2,2),
-            2 => array(6,9,1,2,4,8,15),
-            3 => array(6,9,1,6,1,9,6),
-            4 => array(1,3,5,9,15,1,1),
-            5 => array(15,8,8,14,1,9,6),
-            6 => array(6,8,8,14,9,9,6),
-            7 => array(15,1,1,2,4,4,4),
-            8 => array(6,9,9,6,9,9,6),
-            9 => array(6,9,9,7,1,1,6),
-            '!' => array(4,4,4,4,4,0,4),
-            '?' => array(6,9,1,2,2,0,2),
-            '#' => array(0,9,15,9,15,9,0),
-            '@' => array(6,9,11,11,10,9,6),
-            '-' => array(0,0,0,15,0,0,0),
-            '_' => array(0,0,0,0,0,0,15),
-            '=' => array(0,0,15,0,15,0,0),
-            '+' => array(0,0,4,14,4,0,0),
-            '|' => array(4,4,4,4,4,4,4), //vertical line, used for simulate rus 'Ы'
-            ',' => array(0,0,0,0,0,12,4),
-            '.' => array(0,0,0,0,0,12,12),
-            ':' => array(12,12,0,0,0,12,12),
-            ';' => array(12,12,0,0,0,12,4),
-            '[' => array(3,2,2,2,2,2,3),
-            ']' => array(12,4,4,4,4,4,12),
-            '(' => array(1,2,2,2,2,2,1),
-            ')' => array(8,4,4,4,4,4,8),
-            '{' => array(3,2,2,6,2,2,3),
-            '}' => array(12,4,4,6,4,4,12),
-            '<' => array(1,2,4,8,4,2,1),
-            '>' => array(8,4,2,1,2,4,8),
-            '*' => array(9,6,15,6,9,0,0),
-            '"' => array(10,10,0,0,0,0,0),
-            '\'' => array(4,4,0,0,0,0,0),
-            '`' => array(4,2,0,0,0,0,0),
-            '~' => array(13,11,0,0,0,0,0),
-            '^' => array(4,10,0,0,0,0,0),
-            '\\' => array(8,8,4,6,2,1,1),
-            '/' => array(1,1,2,6,4,8,8),
-            '%' => array(1,9,2,6,4,9,8),
-            '&' => array(0,4,10,4,11,10,5),
-            '$' => array(2,7,8,6,1,14,4),
-            ' ' => array(0,0,0,0,0,0,0),
-            '•' => array(0,0,6,6,0,0,0), //149
-            '°' => array(14,10,14,0,0,0,0), //176
-            '†' => array(4,4,14,4,4,4,4), //134
-            '‡' => array(4,4,14,4,14,4,4), //135
-            '±' => array(0,4,14,4,0,14,0), //177
-            '‰' => array(0,4,2,15,2,4,0), //137 show right arrow
-            '™' => array(0,2,4,15,4,2,0), //156 show left arrow
-            'Ў' => array(0,0,8,8,0,0,0), //159 show small hi-stick - that need for simulate rus 'Ф'
-            "\t" => array(8,8,8,0,0,0,0), //show hi-stick - that need for simulate rus 'У'
-            "\r" => array(8,8,8,8,8,8,8), //vertical line - that need for simulate 'M', 'W' and rus 'М','Ш' ,'Щ'
-            "\n" => array(15,15,15,15,15,15,15), //fill up - that need for simulate rus 'Ж'
-            "Ґ" => array(10,5,10,5,10,5,10), //chess
-            "µ" => array(15,0,15,0,15,0,15), //4 horizontal lines
-            // latin
-            'A' => array(6,9,9,15,9,9,9),
-            'B' => array(14,9,9,14,9,9,14),
-            'C' => array(6,9,8,8,8,9,6),
-            'D' => array(14,9,9,9,9,9,14),
-            'E' => array(15,8,8,14,8,8,15),
-            'F' => array(15,8,8,14,8,8,8),
-            'G' => array(6,9,8,8,11,9,6),
-            'H' => array(9,9,9,15,9,9,9),
-            'I' => array(14,4,4,4,4,4,14),
-            'J' => array(15,1,1,1,1,9,6),
-            'K' => array(8,9,10,12,12,10,9),
-            'L' => array(8,8,8,8,8,8,15),
-            'M' => array(8,13,10,8,8,8,8),// need to add \r
-            'N' => array(9,9,13,11,9,9,9),
-            'O' => array(6,9,9,9,9,9,6),
-            'P' => array(14,9,9,14,8,8,8),
-            'Q' => array(6,9,9,9,13,11,6),
-            'R' => array(14,9,9,14,12,10,9),
-            'S' => array(6,9,8,6,1,9,6),
-            'T' => array(14,4,4,4,4,4,4),
-            'U' => array(9,9,9,9,9,9,6),
-            'V' => array(0,0,0,10,10,10,4),
-            'W' => array(8,8,8,8,10,13,8),// need to add \r
-            'X' => array(9,9,6,6,6,9,9),
-            'Y' => array(10,10,10,10,4,4,4),
-            'Z' => array(15,1,2,6,4,8,15),
-            // russian utf-8
-            'А' => array(6,9,9,15,9,9,9),
-            'Б' => array(14,8,8,14,9,9,14),
-            'В' => array(14,9,9,14,9,9,14),
-            'Г' => array(15,8,8,8,8,8,8),
-            'Д' => array(14,9,9,9,9,9,14),
-            'Е' => array(15,8,8,14,8,8,15),
-            'Ё' => array(6,15,8,14,8,8,15),
-            //Ж is combine: >\n<
-            'З' => array(6,9,1,2,1,9,6),
-            'И' => array(9,9,9,11,13,9,9),
-            'Й' => array(13,9,9,11,13,9,9),
-            'К' => array(9,10,12,10,9,9,9),
-            'Л' => array(7,9,9,9,9,9,9),
-            'М' => array(8,13,10,8,8,8,8),// need to add \r
-            'Н' => array(9,9,9,15,9,9,9),
-            'О' => array(6,9,9,9,9,9,6),
-            'П' => array(15,9,9,9,9,9,9),
-            'Р' => array(14,9,9,14,8,8,8),
-            'С' => array(6,9,8,8,8,9,6),
-            'Т' => array(14,4,4,4,4,4,4),
-            'У' => array(9,9,9,7,1,9,6),
-            'Ф' => array(2,7,10,10,7,2,2),// need to add Ў
-            'Х' => array(9,9,6,6,6,9,9),
-            'Ц' => array(10,10,10,10,10,15,1),
-            'Ч' => array(9,9,9,7,1,1,1),
-            'Ш' => array(10,10,10,10,10,10,15),// \r
-            'Щ' => array(10,10,10,10,10,15,0),// need to add \r
-            'Ъ' => array(12,4,4,6,5,5,6),
-            'Ы' => array(8,8,8,14,9,9,14),// need to add |
-            'Ь' => array(8,8,8,14,9,9,14),
-            'Э' => array(6,9,1,7,1,9,6),
-            'Ю' => array(2,2,2,3,2,2,2),// need to add O
-            'Я' => array(7,9,9,7,3,5,9)
-            ),
-
-        $iSuperSampling = 3, $iMarg = 1, $iRad = 4;
-
-    function __construct($aRadius = 2, $aMargin= 0.6) {
-        $this->iRad = $aRadius;
-        $this->iMarg = $aMargin;
-    }
-
-    function SetSupersampling($aSuperSampling = 2) {
-        $this->iSuperSampling = $aSuperSampling;
-    }
-
-    function _GetLED($aLedIdx, $aColor = 0) {
-        $width=  $this->iLED_X*$this->iRad*2 +  ($this->iLED_X+1)*$this->iMarg + $this->iRad ;
-        $height= $this->iLED_Y*$this->iRad*2 +  ($this->iLED_Y)*$this->iMarg + $this->iRad * 2;
-
-        // Adjust radious for supersampling
-        $rad = $this->iRad * $this->iSuperSampling;
-
-        // Margin in between "Led" dots
-        $marg = $this->iMarg * $this->iSuperSampling;
-
-        $swidth = $width*$this->iSuperSampling;
-        $sheight = $height*$this->iSuperSampling;
-
-        $simg = new RotImage($swidth, $sheight, 0, DEFAULT_GFORMAT, false);
-        $simg->SetColor($this->iColorSchema[$aColor][2]);
-        $simg->FilledRectangle(0, 0, $swidth-1, $sheight-1);
-
-        if( array_key_exists($aLedIdx, $this->iLEDSpec) ) {
-            $d = $this->iLEDSpec[$aLedIdx];
-        }
-        else {
-            $d = array(0,0,0,0,0,0,0);
-        }
-
-        for($r = 0; $r < 7; ++$r) {
-            $dr = $d[$r];
-            for($c = 0; $c < 4; ++$c) {
-                if( ($dr & pow(2,3-$c)) !== 0 ) {
-                    $color = $this->iColorSchema[$aColor][0];
-                }
-                else {
-                    $color = $this->iColorSchema[$aColor][1];
-                }
-
-                $x = 2*$rad*$c+$rad + ($c+1)*$marg + $rad ;
-                $y = 2*$rad*$r+$rad + ($r+1)*$marg + $rad ;
-
-                $simg->SetColor($color);
-                $simg->FilledCircle($x,$y,$rad);
-            }
-        }
-
-        $img =  new Image($width, $height, DEFAULT_GFORMAT, false);
-        $img->Copy($simg->img, 0, 0, 0, 0, $width, $height, $swidth, $sheight);
-        $simg->Destroy();
-        unset($simg);
-        return $img;
-    }
-
-
-    function Stroke($aValStr, $aColor = 0, $aFileName = '') {
-    	$this->StrokeNumber($aValStr, $aColor, $aFileName);
-    }
-
-
-    function StrokeNumber($aValStr, $aColor = 0, $aFileName = '') {
-        if( $aColor < 0 || $aColor >= sizeof($this->iColorSchema) ) {
-            $aColor = 0;
-        }
-
-        if(($n = mb_strlen($aValStr,'utf8')) == 0) {
-            $aValStr = ' ';
-            $n = 1;
-        }
-
-        for($i = 0; $i < $n; ++$i) {
-            $d = mb_substr($aValStr, $i, 1, 'utf8');
-            if(  ctype_digit($d) ) {
-                $d = (int)$d;
-            }
-            else {
-               $d = strtoupper($d);
-            }
-            $digit_img[$i] = $this->_GetLED($d, $aColor);
-        }
-
-        $w = imagesx($digit_img[0]->img);
-        $h = imagesy($digit_img[0]->img);
-
-        $number_img = new Image($w*$n, $h, DEFAULT_GFORMAT, false);
-
-        for($i = 0; $i < $n; ++$i) {
-            $number_img->Copy($digit_img[$i]->img, $i*$w, 0, 0, 0, $w, $h, $w, $h);
-        }
-
-        if( $aFileName != '' ) {
-            $number_img->Stream($aFileName);
-        } else {
-            $number_img->Headers();
-            $number_img->Stream();
-        }
-    }
-}
-?>
diff --git a/#jpgraph/src/jpgraph_legend.inc.php b/#jpgraph/src/jpgraph_legend.inc.php
deleted file mode 100644
index c7f38b51..00000000
--- a/#jpgraph/src/jpgraph_legend.inc.php
+++ /dev/null
@@ -1,494 +0,0 @@
-<?php
-//=======================================================================
-// File:        JPGRAPH_LEGEND.INC.PHP
-// Description: Class to handle the legend box in the graph that gives
-//              names on the data series. The number of rows and columns
-//              in the legend are user specifyable.
-// Created:     2001-01-08 (Refactored to separate file 2008-08-01)
-// Ver:         $Id: jpgraph_legend.inc.php 1926 2010-01-11 16:33:07Z ljp $
-//
-// Copyright (c) Asial Corporation. All rights reserved.
-//========================================================================
-
-DEFINE('_DEFAULT_LPM_SIZE',8); // Default Legend Plot Mark size
-
-
-//===================================================
-// CLASS Legend
-// Description: Responsible for drawing the box containing
-// all the legend text for the graph
-//===================================================
-
-class Legend {
-    public $txtcol=array();
-    public $font_family=FF_DEFAULT,$font_style=FS_NORMAL,$font_size=8; // old. 12
-    private $color=array(120,120,120); // Default frame color
-    private $fill_color=array(245,245,245); // Default fill color
-    private $shadow=false; // Shadow around legend "box"
-    private $shadow_color='darkgray';
-    private $mark_abs_hsize=_DEFAULT_LPM_SIZE,$mark_abs_vsize=_DEFAULT_LPM_SIZE;
-    private $xmargin=10,$ymargin=0,$shadow_width=2;
-    private $xlmargin=4;
-    private $ylinespacing=5;
-    
-     // We need a separate margin since the baseline of the last text would coincide with the bottom otherwise
-    private $ybottom_margin = 8;
-    
-    private $xpos=0.05, $ypos=0.15, $xabspos=-1, $yabspos=-1;
-    private $halign="right", $valign="top";
-    private $font_color='black';
-    private $hide=false,$layout_n=1;
-    private $weight=1,$frameweight=1;
-    private $csimareas='';
-    private $reverse = false ;
-    private $bkg_gradtype=-1, $bkg_gradfrom='lightgray', $bkg_gradto='gray';
-
-    //---------------
-    // CONSTRUCTOR
-    function __construct() {
-        // Empty
-    }
-    //---------------
-    // PUBLIC METHODS
-    function Hide($aHide=true) {
-        $this->hide=$aHide;
-    }
-
-    function SetHColMargin($aXMarg) {
-        $this->xmargin = $aXMarg;
-    }
-
-    function SetVColMargin($aSpacing) {
-        $this->ylinespacing = $aSpacing ;
-    }
-
-    function SetLeftMargin($aXMarg) {
-        $this->xlmargin = $aXMarg;
-    }
-
-    // Synonym
-    function SetLineSpacing($aSpacing) {
-        $this->ylinespacing = $aSpacing ;
-    }
-
-    function SetShadow($aShow='gray',$aWidth=4) {
-        if( is_string($aShow) ) {
-            $this->shadow_color = $aShow;
-            $this->shadow=true;
-        }
-        else {
-            $this->shadow = $aShow;
-        }
-        $this->shadow_width = $aWidth;
-    }
-
-    function SetMarkAbsSize($aSize) {
-        $this->mark_abs_vsize = $aSize ;
-        $this->mark_abs_hsize = $aSize ;
-    }
-
-    function SetMarkAbsVSize($aSize) {
-        $this->mark_abs_vsize = $aSize ;
-    }
-
-    function SetMarkAbsHSize($aSize) {
-        $this->mark_abs_hsize = $aSize ;
-    }
-
-    function SetLineWeight($aWeight) {
-        $this->weight = $aWeight;
-    }
-
-    function SetFrameWeight($aWeight) {
-        $this->frameweight = $aWeight;
-    }
-
-    function SetLayout($aDirection=LEGEND_VERT) {
-        $this->layout_n = $aDirection==LEGEND_VERT ? 1 : 99 ;
-    }
-
-    function SetColumns($aCols) {
-        $this->layout_n = $aCols ;
-    }
-
-    function SetReverse($f=true) {
-        $this->reverse = $f ;
-    }
-
-    // Set color on frame around box
-    function SetColor($aFontColor,$aColor='black') {
-        $this->font_color=$aFontColor;
-        $this->color=$aColor;
-    }
-
-    function SetFont($aFamily,$aStyle=FS_NORMAL,$aSize=10) {
-        $this->font_family = $aFamily;
-        $this->font_style = $aStyle;
-        $this->font_size = $aSize;
-    }
-
-    function SetPos($aX,$aY,$aHAlign='right',$aVAlign='top') {
-        $this->Pos($aX,$aY,$aHAlign,$aVAlign);
-    }
-
-    function SetAbsPos($aX,$aY,$aHAlign='right',$aVAlign='top') {
-        $this->xabspos=$aX;
-        $this->yabspos=$aY;
-        $this->halign=$aHAlign;
-        $this->valign=$aVAlign;
-    }
-
-    function Pos($aX,$aY,$aHAlign='right',$aVAlign='top') {
-        if( !($aX<1 && $aY<1) ) {
-            JpGraphError::RaiseL(25120);//(" Position for legend must be given as percentage in range 0-1");
-        }
-        $this->xpos=$aX;
-        $this->ypos=$aY;
-        $this->halign=$aHAlign;
-        $this->valign=$aVAlign;
-    }
-
-    function SetFillColor($aColor) {
-        $this->fill_color=$aColor;
-    }
-
-    function Clear() {
-        $this->txtcol = array();
-    }
-
-    function Add($aTxt,$aColor,$aPlotmark='',$aLinestyle=0,$csimtarget='',$csimalt='',$csimwintarget='') {
-        $this->txtcol[]=array($aTxt,$aColor,$aPlotmark,$aLinestyle,$csimtarget,$csimalt,$csimwintarget);
-    }
-
-    function GetCSIMAreas() {
-        return $this->csimareas;
-    }
-
-    function SetBackgroundGradient($aFrom='navy',$aTo='silver',$aGradType=2) {
-        $this->bkg_gradtype=$aGradType;
-        $this->bkg_gradfrom = $aFrom;
-        $this->bkg_gradto = $aTo;
-    }
-
-    function HasItems() {
-        return (boolean)(count($this->txtcol));
-    }
-
-    function Stroke($aImg) {
-        // Constant
-        $fillBoxFrameWeight=1;
-
-        if( $this->hide ) return;
-
-        $aImg->SetFont($this->font_family,$this->font_style,$this->font_size);
-
-        if( $this->reverse ) {
-            $this->txtcol = array_reverse($this->txtcol);
-        }
-
-        $n=count($this->txtcol);
-        if( $n == 0 ) return;
-
-        // Find out the max width and height of each column to be able
-        // to size the legend box.
-        $numcolumns = ($n > $this->layout_n ? $this->layout_n : $n);
-        for( $i=0; $i < $numcolumns; ++$i ) {
-            $colwidth[$i] = $aImg->GetTextWidth($this->txtcol[$i][0]) +
-                            2*$this->xmargin + 2*$this->mark_abs_hsize;
-            $colheight[$i] = 0;
-
-        }
-
-        // Find our maximum height in each row
-        $rows = 0 ; $rowheight[0] = 0;
-        for( $i=0; $i < $n; ++$i ) {
-            $h = max($this->mark_abs_vsize,$aImg->GetTextHeight($this->txtcol[$i][0]))+$this->ylinespacing;
-
-            // Makes sure we always have a minimum of 1/4 (1/2 on each side) of the mark as space
-            // between two vertical legend entries
-            //$h = round(max($h,$this->mark_abs_vsize+$this->ymargin));
-            //echo "Textheight #$i: tetxheight=".$aImg->GetTextHeight($this->txtcol[$i][0]).', ';
-            //echo "h=$h ({$this->mark_abs_vsize},{$this->ymargin})<br>";
-            if( $i % $numcolumns == 0 ) {
-                $rows++;
-                $rowheight[$rows-1] = 0;
-            }
-            $rowheight[$rows-1] = max($rowheight[$rows-1],$h)+1;
-        }
-
-        $abs_height = 0;
-        for( $i=0; $i < $rows; ++$i ) {
-            $abs_height += $rowheight[$i] ;
-        }
-
-        // Make sure that the height is at least as high as mark size + ymargin
-        $abs_height = max($abs_height,$this->mark_abs_vsize);
-        $abs_height += $this->ybottom_margin; 
-
-        // Find out the maximum width in each column
-        for( $i=$numcolumns; $i < $n; ++$i ) {
-            $colwidth[$i % $numcolumns] = max(
-                $aImg->GetTextWidth($this->txtcol[$i][0])+2*$this->xmargin+2*$this->mark_abs_hsize,
-                $colwidth[$i % $numcolumns]);
-        }
-
-        // Get the total width
-        $mtw = 0;
-        for( $i=0; $i < $numcolumns; ++$i ) {
-            $mtw += $colwidth[$i] ;
-        }
-
-        // remove the last rows interpace margin (since there is no next row)
-        $abs_height -= $this->ylinespacing;
-
-
-        // Find out maximum width we need for legend box
-        $abs_width = $mtw+$this->xlmargin+($numcolumns-1)*$this->mark_abs_hsize;
-
-        if( $this->xabspos === -1  && $this->yabspos === -1 ) {
-            $this->xabspos = $this->xpos*$aImg->width ;
-            $this->yabspos = $this->ypos*$aImg->height ;
-        }
-
-        // Positioning of the legend box
-        if( $this->halign == 'left' ) {
-        	$xp = $this->xabspos;
-        }
-        elseif( $this->halign == 'center' ) {
-        	$xp = $this->xabspos - $abs_width/2;
-        }
-        else {
-        	$xp = $aImg->width - $this->xabspos - $abs_width;
-        }
-
-        $yp=$this->yabspos;
-        if( $this->valign == 'center' ) {
-        	$yp-=$abs_height/2;
-        }
-        elseif( $this->valign == 'bottom' ) {
-        	$yp-=$abs_height;
-        }
-
-        // Stroke legend box
-        $aImg->SetColor($this->color);
-        $aImg->SetLineWeight($this->frameweight);
-        $aImg->SetLineStyle('solid');
-
-        if( $this->shadow ) {
-        	$aImg->ShadowRectangle($xp,$yp,
-                                   $xp+$abs_width+$this->shadow_width+2,
-                                   $yp+$abs_height+$this->shadow_width+2,
-                                   $this->fill_color,$this->shadow_width+2,$this->shadow_color);
-        }
-        else {
-            $aImg->SetColor($this->fill_color);
-            $aImg->FilledRectangle($xp,$yp,$xp+$abs_width,$yp+$abs_height);
-            $aImg->SetColor($this->color);
-            $aImg->Rectangle($xp,$yp,$xp+$abs_width,$yp+$abs_height);
-        }
-
-        if( $this->bkg_gradtype >= 0 ) {
-            $grad = new Gradient($aImg);
-            $grad->FilledRectangle($xp+1, $yp+1,
-                                   $xp+$abs_width-3, $yp+$abs_height-3,
-                                   $this->bkg_gradfrom, $this->bkg_gradto,
-                                   $this->bkg_gradtype);
-        }
-
-        // x1,y1 is the position for the legend marker + text
-        // The vertical position is the baseline position for the text
-        // and every marker is adjusted acording to that.
-
-        // For multiline texts this get more complicated.
-
-        $x1 = $xp + $this->xlmargin;
-        $y1 = $yp + $rowheight[0] - $this->ylinespacing + 2 ; // The ymargin is included in rowheight
-
-        // Now, y1 is the bottom vertical position of the first legend, i.e if
-        // the legend has multiple lines it is the bottom line.
-
-        $grad = new Gradient($aImg);
-        $patternFactory = null;
-
-        // Now stroke each legend in turn
-        // Each plot has added the following information to  the legend
-        // p[0] = Legend text
-        // p[1] = Color,
-        // p[2] = For markers a reference to the PlotMark object
-        // p[3] = For lines the line style, for gradient the negative gradient style
-        // p[4] = CSIM target
-        // p[5] = CSIM Alt text
-        $i = 1 ; $row = 0;
-        foreach($this->txtcol as $p) {
-
-            // STROKE DEBUG BOX
-            if( _JPG_DEBUG ) {
-                $aImg->SetLineWeight(1);
-                $aImg->SetColor('red');
-                $aImg->SetLineStyle('solid');
-                $aImg->Rectangle($x1,$y1,$xp+$abs_width-1,$y1-$rowheight[$row]);
-            }
-
-            $aImg->SetLineWeight($this->weight);
-            $x1 = round($x1)+1; // We add one to not collide with the border
-            $y1=round($y1);
-
-            // This is the center offset up from the baseline which is
-            // considered the "center" of the marks. This gets slightly complicated since
-            // we need to consider if the text is a multiline paragraph or if it is only
-            // a single line. The reason is that for single line the y1 corresponds to the baseline
-            // and that is fine. However for a multiline paragraph there is no single baseline
-            // and in that case the y1 corresponds to the lowest y for the bounding box. In that
-            // case we center the mark in the middle of the paragraph
-            if( !preg_match('/\n/',$p[0]) ) {
-                // Single line
-                $marky = ceil($y1-$this->mark_abs_vsize/2)-1;
-            } else {
-                // Paragraph
-                $marky = $y1 - $aImg->GetTextHeight($p[0])/2;
-
-              //  echo "y1=$y1, p[o]={$p[0]}, marky=$marky<br>";
-            }
-
-            //echo "<br>Mark #$i: marky=$marky<br>";
-
-            $x1 += $this->mark_abs_hsize;
-    
-            if ( !empty($p[2]) && $p[2]->GetType() > -1 ) {
-
-
-                // Make a plot mark legend. This is constructed with a mark which
-                // is run through with a line
-
-                // First construct a bit of the line that looks exactly like the
-                // line in the plot
-                $aImg->SetColor($p[1]);
-                if( is_string($p[3]) || $p[3]>0 ) {
-                    $aImg->SetLineStyle($p[3]);
-                    $aImg->StyleLine($x1-$this->mark_abs_hsize,$marky,$x1+$this->mark_abs_hsize,$marky);
-                }
-
-                // Stroke a mark using image
-                if( $p[2]->GetType() == MARK_IMG ) {
-                    $p[2]->Stroke($aImg,$x1,$marky);
-                }
-
-                // Stroke a mark with the standard size
-                // (As long as it is not an image mark )
-                if( $p[2]->GetType() != MARK_IMG ) {
-
-                    // Clear any user callbacks since we ont want them called for
-                    // the legend marks
-                    $p[2]->iFormatCallback = '';
-                    $p[2]->iFormatCallback2 = '';
-
-                    // Since size for circles is specified as the radius
-                    // this means that we must half the size to make the total
-                    // width behave as the other marks
-                    if( $p[2]->GetType() == MARK_FILLEDCIRCLE || $p[2]->GetType() == MARK_CIRCLE ) {
-                        $p[2]->SetSize(min($this->mark_abs_vsize,$this->mark_abs_hsize)/2);
-                        $p[2]->Stroke($aImg,$x1,$marky);
-                    }
-                    else {
-                        $p[2]->SetSize(min($this->mark_abs_vsize,$this->mark_abs_hsize));
-                        $p[2]->Stroke($aImg,$x1,$marky);
-                    }
-                }
-            }
-            elseif ( !empty($p[2]) && (is_string($p[3]) || $p[3]>0 ) ) {
-                // Draw a styled line
-                $aImg->SetColor($p[1]);
-                $aImg->SetLineStyle($p[3]);
-                $aImg->StyleLine($x1-$this->mark_abs_hsize,$marky,$x1+$this->mark_abs_hsize,$marky);
-                $aImg->StyleLine($x1-$this->mark_abs_hsize,$marky+1,$x1+$this->mark_abs_hsize,$marky+1);
-            }
-            else {
-                // Draw a colored box
-                $color = $p[1] ;
-
-                // We make boxes slightly larger to better show
-                $boxsize = max($this->mark_abs_vsize,$this->mark_abs_hsize) + 2 ;
-
-                $ym = $marky-ceil($boxsize/2) ; // Marker y-coordinate
-
-                // We either need to plot a gradient or a
-                // pattern. To differentiate we use a kludge.
-                // Patterns have a p[3] value of < -100
-                if( $p[3] < -100 ) {
-                    // p[1][0] == iPattern, p[1][1] == iPatternColor, p[1][2] == iPatternDensity
-                    if( $patternFactory == null ) {
-                        $patternFactory = new RectPatternFactory();
-                    }
-                    $prect = $patternFactory->Create($p[1][0],$p[1][1],1);
-                    $prect->SetBackground($p[1][3]);
-                    $prect->SetDensity($p[1][2]+1);
-                    $prect->SetPos(new Rectangle($x1,$ym,$boxsize,$boxsize));
-                    $prect->Stroke($aImg);
-                    $prect=null;
-                }
-                else {
-                    if( is_array($color) && count($color)==2 ) {
-                        // The client want a gradient color
-                        $grad->FilledRectangle($x1-$boxsize/2,$ym,
-                                               $x1+$boxsize/2,$ym+$boxsize,
-                                               $color[0],$color[1],-$p[3]);
-                    }
-                    else {
-                        $aImg->SetColor($p[1]);
-                        $aImg->FilledRectangle($x1-$boxsize/2,$ym, $x1+$boxsize/2,$ym+$boxsize);
-                    }
-
-                    // Draw a plot frame line
-                    $aImg->SetColor($this->color);
-                    $aImg->SetLineWeight($fillBoxFrameWeight);
-                    $aImg->Rectangle($x1-$boxsize/2,$ym,
-                                     $x1+$boxsize/2,$ym+$boxsize);
-                }
-            }
-            $aImg->SetColor($this->font_color);
-            $aImg->SetFont($this->font_family,$this->font_style,$this->font_size);
-            $aImg->SetTextAlign('left','baseline');
-
-            $debug=false;
-            $aImg->StrokeText($x1+$this->mark_abs_hsize+$this->xmargin,$y1,$p[0],
-                0,'left',$debug);
-
-            // Add CSIM for Legend if defined
-            if( !empty($p[4]) ) {
-
-                $xs = $x1 - $this->mark_abs_hsize ;
-                $ys = $y1 + 1 ;
-                $xe = $x1 + $aImg->GetTextWidth($p[0]) + $this->mark_abs_hsize + $this->xmargin ;
-                $ye = $y1-$rowheight[$row]+1;
-                $coords = "$xs,$ys,$xe,$y1,$xe,$ye,$xs,$ye";
-                if( ! empty($p[4]) ) {
-                    $this->csimareas .= "<area shape=\"poly\" coords=\"$coords\" href=\"".htmlentities($p[4])."\"";
-
-                    if( !empty($p[6]) ) {
-                        $this->csimareas .= " target=\"".$p[6]."\"";
-                    }
-
-                    if( !empty($p[5]) ) {
-                        $tmp=sprintf($p[5],$p[0]);
-                        $this->csimareas .= " title=\"$tmp\" alt=\"$tmp\" ";
-                    }
-                    $this->csimareas .= " />\n";
-                }
-            }
-
-            if( $i >= $this->layout_n ) {
-                $x1 = $xp+$this->xlmargin;
-                $row++;
-                if( !empty($rowheight[$row]) )
-                    $y1 += $rowheight[$row];
-                $i = 1;
-            }
-            else {
-                $x1 += $colwidth[($i-1) % $numcolumns] ;
-                ++$i;
-            }
-        }
-    }
-} // Class
-
-?>
diff --git a/#jpgraph/src/jpgraph_line.php b/#jpgraph/src/jpgraph_line.php
deleted file mode 100644
index 21dd8213..00000000
--- a/#jpgraph/src/jpgraph_line.php
+++ /dev/null
@@ -1,682 +0,0 @@
-<?php
-/*=======================================================================
- // File:  		 JPGRAPH_LINE.PHP
- // Description: Line plot extension for JpGraph
- // Created:  	 2001-01-08
- // Ver:  		 $Id: jpgraph_line.php 1921 2009-12-11 11:46:39Z ljp $
- //
- // Copyright (c) Asial Corporation. All rights reserved.
- //========================================================================
- */
-
-require_once ('jpgraph_plotmark.inc.php');
-
-// constants for the (filled) area
-DEFINE("LP_AREA_FILLED", true);
-DEFINE("LP_AREA_NOT_FILLED", false);
-DEFINE("LP_AREA_BORDER",false);
-DEFINE("LP_AREA_NO_BORDER",true);
-
-//===================================================
-// CLASS LinePlot
-// Description:
-//===================================================
-class LinePlot extends Plot{
-    public $mark=null;
-    protected $filled=false;
-    protected $fill_color='blue';
-    protected $step_style=false, $center=false;
-    protected $line_style=1; // Default to solid
-    protected $filledAreas = array(); // array of arrays(with min,max,col,filled in them)
-    public $barcenter=false;  // When we mix line and bar. Should we center the line in the bar.
-    protected $fillFromMin = false, $fillFromMax = false;
-    protected $fillgrad=false,$fillgrad_fromcolor='navy',$fillgrad_tocolor='silver',$fillgrad_numcolors=100;
-    protected $iFastStroke=false;
-
-    //---------------
-    // CONSTRUCTOR
-    function LinePlot($datay,$datax=false) {
-        parent::__construct($datay,$datax);
-        $this->mark = new PlotMark() ;
-        $this->color = ColorFactory::getColor();
-        $this->fill_color = $this->color;
-    }
-    //---------------
-    // PUBLIC METHODS
-
-    function SetFilled($aFlg=true) {
-		$this->filled = $aFlg;
-    }
-
-    function SetBarCenter($aFlag=true) {
-        $this->barcenter=$aFlag;
-    }
-
-    function SetStyle($aStyle) {
-        $this->line_style=$aStyle;
-    }
-
-    function SetStepStyle($aFlag=true) {
-        $this->step_style = $aFlag;
-    }
-
-    function SetColor($aColor) {
-        parent::SetColor($aColor);
-    }
-
-    function SetFillFromYMin($f=true) {
-        $this->fillFromMin = $f ;
-    }
-
-    function SetFillFromYMax($f=true) {
-        $this->fillFromMax = $f ;
-    }
-
-    function SetFillColor($aColor,$aFilled=true) {
-    	//$this->color = $aColor;
-        $this->fill_color=$aColor;
-        $this->filled=$aFilled;
-    }
-
-    function SetFillGradient($aFromColor,$aToColor,$aNumColors=100,$aFilled=true) {
-        $this->fillgrad_fromcolor = $aFromColor;
-        $this->fillgrad_tocolor   = $aToColor;
-        $this->fillgrad_numcolors = $aNumColors;
-        $this->filled = $aFilled;
-        $this->fillgrad = true;
-    }
-
-    function Legend($graph) {
-        if( $this->legend!="" ) {
-            if( $this->filled && !$this->fillgrad ) {
-                $graph->legend->Add($this->legend,
-                $this->fill_color,$this->mark,0,
-                $this->legendcsimtarget,$this->legendcsimalt,$this->legendcsimwintarget);
-            }
-            elseif( $this->fillgrad ) {
-                $color=array($this->fillgrad_fromcolor,$this->fillgrad_tocolor);
-                // In order to differentiate between gradients and cooors specified as an RGB triple
-                $graph->legend->Add($this->legend,$color,"",-2 /* -GRAD_HOR */,
-                $this->legendcsimtarget,$this->legendcsimalt,$this->legendcsimwintarget);
-            } else {
-                $graph->legend->Add($this->legend,
-                $this->color,$this->mark,$this->line_style,
-                $this->legendcsimtarget,$this->legendcsimalt,$this->legendcsimwintarget);
-            }
-        }
-    }
-
-    function AddArea($aMin=0,$aMax=0,$aFilled=LP_AREA_NOT_FILLED,$aColor="gray9",$aBorder=LP_AREA_BORDER) {
-        if($aMin > $aMax) {
-            // swap
-            $tmp = $aMin;
-            $aMin = $aMax;
-            $aMax = $tmp;
-        }
-        $this->filledAreas[] = array($aMin,$aMax,$aColor,$aFilled,$aBorder);
-    }
-
-    // Gets called before any axis are stroked
-    function PreStrokeAdjust($graph) {
-
-        // If another plot type have already adjusted the
-        // offset we don't touch it.
-        // (We check for empty in case the scale is  a log scale
-        // and hence doesn't contain any xlabel_offset)
-        if( empty($graph->xaxis->scale->ticks->xlabel_offset) || $graph->xaxis->scale->ticks->xlabel_offset == 0 ) {
-            if( $this->center ) {
-                ++$this->numpoints;
-                $a=0.5; $b=0.5;
-            } else {
-                $a=0; $b=0;
-            }
-            $graph->xaxis->scale->ticks->SetXLabelOffset($a);
-            $graph->SetTextScaleOff($b);
-            //$graph->xaxis->scale->ticks->SupressMinorTickMarks();
-        }
-    }
-
-    function SetFastStroke($aFlg=true) {
-        $this->iFastStroke = $aFlg;
-    }
-
-    function FastStroke($img,$xscale,$yscale,$aStartPoint=0,$exist_x=true) {
-        // An optimized stroke for many data points with no extra
-        // features but 60% faster. You can't have values or line styles, or null
-        // values in plots.
-        $numpoints=count($this->coords[0]);
-        if( $this->barcenter ) {
-            $textadj = 0.5-$xscale->text_scale_off;
-        }
-        else {
-            $textadj = 0;
-        }
-
-        $img->SetColor($this->color);
-        $img->SetLineWeight($this->weight);
-        $pnts=$aStartPoint;
-        while( $pnts < $numpoints ) {
-            if( $exist_x ) {
-                $x=$this->coords[1][$pnts];
-            }
-            else {
-                $x=$pnts+$textadj;
-            }
-            $xt = $xscale->Translate($x);
-            $y=$this->coords[0][$pnts];
-            $yt = $yscale->Translate($y);
-            if( is_numeric($y) ) {
-                $cord[] = $xt;
-                $cord[] = $yt;
-            }
-            elseif( $y == '-' && $pnts > 0 ) {
-                // Just ignore
-            }
-            else {
-                JpGraphError::RaiseL(10002);//('Plot too complicated for fast line Stroke. Use standard Stroke()');
-            }
-            ++$pnts;
-        } // WHILE
-
-        $img->Polygon($cord,false,true);
-    }
-
-    function Stroke($img,$xscale,$yscale) {
-        $idx=0;
-        $numpoints=count($this->coords[0]);
-        if( isset($this->coords[1]) ) {
-            if( count($this->coords[1])!=$numpoints ) {
-                JpGraphError::RaiseL(2003,count($this->coords[1]),$numpoints);
-            //("Number of X and Y points are not equal. Number of X-points:".count($this->coords[1])." Number of Y-points:$numpoints");
-            }
-            else {
-                $exist_x = true;
-            }
-        }
-        else {
-            $exist_x = false;
-        }
-
-        if( $this->barcenter ) {
-            $textadj = 0.5-$xscale->text_scale_off;
-        }
-        else {
-            $textadj = 0;
-        }
-
-        // Find the first numeric data point
-        $startpoint=0;
-        while( $startpoint < $numpoints && !is_numeric($this->coords[0][$startpoint]) ) {
-            ++$startpoint;
-        }
-
-        // Bail out if no data points
-        if( $startpoint == $numpoints ) return;
-
-        if( $this->iFastStroke ) {
-            $this->FastStroke($img,$xscale,$yscale,$startpoint,$exist_x);
-            return;
-        }
-
-        if( $exist_x ) {
-            $xs=$this->coords[1][$startpoint];
-        }
-        else {
-            $xs= $textadj+$startpoint;
-        }
-
-        $img->SetStartPoint($xscale->Translate($xs),
-        $yscale->Translate($this->coords[0][$startpoint]));
-
-        if( $this->filled ) {
-            if( $this->fillFromMax ) {
-                //$max = $yscale->GetMaxVal();
-                $cord[$idx++] = $xscale->Translate($xs);
-                $cord[$idx++] = $yscale->scale_abs[1];
-            }
-            else {
-                $min = $yscale->GetMinVal();
-                if( $min > 0 || $this->fillFromMin ) {
-                    $fillmin = $yscale->scale_abs[0];//Translate($min);
-                }
-                else {
-                    $fillmin = $yscale->Translate(0);
-                }
-
-                $cord[$idx++] = $xscale->Translate($xs);
-                $cord[$idx++] = $fillmin;
-            }
-        }
-        $xt = $xscale->Translate($xs);
-        $yt = $yscale->Translate($this->coords[0][$startpoint]);
-        $cord[$idx++] = $xt;
-        $cord[$idx++] = $yt;
-        $yt_old = $yt;
-        $xt_old = $xt;
-        $y_old = $this->coords[0][$startpoint];
-
-        $this->value->Stroke($img,$this->coords[0][$startpoint],$xt,$yt);
-
-        $img->SetColor($this->color);
-        $img->SetLineWeight($this->weight);
-        $img->SetLineStyle($this->line_style);
-        $pnts=$startpoint+1;
-        $firstnonumeric = false;
-
-
-        while( $pnts < $numpoints ) {
-
-            if( $exist_x ) {
-                $x=$this->coords[1][$pnts];
-            }
-            else {
-                $x=$pnts+$textadj;
-            }
-            $xt = $xscale->Translate($x);
-            $yt = $yscale->Translate($this->coords[0][$pnts]);
-
-            $y=$this->coords[0][$pnts];
-            if( $this->step_style ) {
-                // To handle null values within step style we need to record the
-                // first non numeric value so we know from where to start if the
-                // non value is '-'.
-                if( is_numeric($y) ) {
-                    $firstnonumeric = false;
-                    if( is_numeric($y_old) ) {
-                        $img->StyleLine($xt_old,$yt_old,$xt,$yt_old);
-                        $img->StyleLine($xt,$yt_old,$xt,$yt);
-                    }
-                    elseif( $y_old == '-' ) {
-                        $img->StyleLine($xt_first,$yt_first,$xt,$yt_first);
-                        $img->StyleLine($xt,$yt_first,$xt,$yt);
-                    }
-                    else {
-                        $yt_old = $yt;
-                        $xt_old = $xt;
-                    }
-                    $cord[$idx++] = $xt;
-                    $cord[$idx++] = $yt_old;
-                    $cord[$idx++] = $xt;
-                    $cord[$idx++] = $yt;
-                }
-                elseif( $firstnonumeric==false ) {
-                    $firstnonumeric = true;
-                    $yt_first = $yt_old;
-                    $xt_first = $xt_old;
-                }
-            }
-            else {
-                $tmp1=$y;
-                $prev=$this->coords[0][$pnts-1];
-                if( $tmp1==='' || $tmp1===NULL || $tmp1==='X' ) $tmp1 = 'x';
-                if( $prev==='' || $prev===null || $prev==='X' ) $prev = 'x';
-
-                if( is_numeric($y) || (is_string($y) && $y != '-') ) {
-                    if( is_numeric($y) && (is_numeric($prev) || $prev === '-' ) ) {
-                        $img->StyleLineTo($xt,$yt);
-                    }
-                    else {
-                        $img->SetStartPoint($xt,$yt);
-                    }
-                }
-                if( $this->filled && $tmp1 !== '-' ) {
-                    if( $tmp1 === 'x' ) {
-                        $cord[$idx++] = $cord[$idx-3];
-                        $cord[$idx++] = $fillmin;
-                    }
-                    elseif( $prev === 'x' ) {
-                        $cord[$idx++] = $xt;
-                        $cord[$idx++] = $fillmin;
-                        $cord[$idx++] = $xt;
-                        $cord[$idx++] = $yt;
-                    }
-                    else {
-                        $cord[$idx++] = $xt;
-                        $cord[$idx++] = $yt;
-                    }
-                }
-                else {
-                    if( is_numeric($tmp1)  && (is_numeric($prev) || $prev === '-' ) ) {
-                        $cord[$idx++] = $xt;
-                        $cord[$idx++] = $yt;
-                    }
-                }
-            }
-            $yt_old = $yt;
-            $xt_old = $xt;
-            $y_old = $y;
-
-            $this->StrokeDataValue($img,$this->coords[0][$pnts],$xt,$yt);
-
-            ++$pnts;
-        }
-
-        if( $this->filled  ) {
-            $cord[$idx++] = $xt;
-            if( $this->fillFromMax ) {
-                $cord[$idx++] = $yscale->scale_abs[1];
-            }
-            else {
-                if( $min > 0 || $this->fillFromMin ) {
-                    $cord[$idx++] = $yscale->Translate($min);
-                }
-                else {
-                    $cord[$idx++] = $yscale->Translate(0);
-                }
-            }
-            if( $this->fillgrad ) {
-                $img->SetLineWeight(1);
-                $grad = new Gradient($img);
-                $grad->SetNumColors($this->fillgrad_numcolors);
-                $grad->FilledFlatPolygon($cord,$this->fillgrad_fromcolor,$this->fillgrad_tocolor);
-                $img->SetLineWeight($this->weight);
-            }
-            else {
-                $img->SetColor($this->fill_color);
-                $img->FilledPolygon($cord);
-            }
-            if( $this->weight > 0 ) { 
-                $img->SetLineWeight($this->weight);
-                $img->SetColor($this->color);
-                // Remove first and last coordinate before drawing the line
-                // sine we otherwise get the vertical start and end lines which
-                // doesn't look appropriate
-                $img->Polygon(array_slice($cord,2,count($cord)-4));
-            }
-        }
-
-        if(!empty($this->filledAreas)) {
-
-            $minY = $yscale->Translate($yscale->GetMinVal());
-            $factor = ($this->step_style ? 4 : 2);
-
-            for($i = 0; $i < sizeof($this->filledAreas); ++$i) {
-                // go through all filled area elements ordered by insertion
-                // fill polygon array
-                $areaCoords[] = $cord[$this->filledAreas[$i][0] * $factor];
-                $areaCoords[] = $minY;
-
-                $areaCoords =
-                array_merge($areaCoords,
-                array_slice($cord,
-                $this->filledAreas[$i][0] * $factor,
-                ($this->filledAreas[$i][1] - $this->filledAreas[$i][0] + ($this->step_style ? 0 : 1))  * $factor));
-                $areaCoords[] = $areaCoords[sizeof($areaCoords)-2]; // last x
-                $areaCoords[] = $minY; // last y
-
-                if($this->filledAreas[$i][3]) {
-                    $img->SetColor($this->filledAreas[$i][2]);
-                    $img->FilledPolygon($areaCoords);
-                    $img->SetColor($this->color);
-                }
-                // Check if we should draw the frame.
-                // If not we still re-draw the line since it might have been
-                // partially overwritten by the filled area and it doesn't look
-                // very good.
-                if( $this->filledAreas[$i][4] ) {
-                    $img->Polygon($areaCoords);
-                }
-                else {
-                    $img->Polygon($cord);
-                }
-
-                $areaCoords = array();
-            }
-        }
-
-        if( $this->mark->type == -1 || $this->mark->show == false )
-        return;
-
-        for( $pnts=0; $pnts<$numpoints; ++$pnts) {
-
-            if( $exist_x ) {
-                $x=$this->coords[1][$pnts];
-            }
-            else {
-                $x=$pnts+$textadj;
-            }
-            $xt = $xscale->Translate($x);
-            $yt = $yscale->Translate($this->coords[0][$pnts]);
-
-            if( is_numeric($this->coords[0][$pnts]) ) {
-                if( !empty($this->csimtargets[$pnts]) ) {
-                    if( !empty($this->csimwintargets[$pnts]) ) {
-                        $this->mark->SetCSIMTarget($this->csimtargets[$pnts],$this->csimwintargets[$pnts]);
-                    }
-                    else {
-                        $this->mark->SetCSIMTarget($this->csimtargets[$pnts]);
-                    }
-                    $this->mark->SetCSIMAlt($this->csimalts[$pnts]);
-                }
-                if( $exist_x ) {
-                    $x=$this->coords[1][$pnts];
-                }
-                else {
-                    $x=$pnts;
-                }
-                $this->mark->SetCSIMAltVal($this->coords[0][$pnts],$x);
-                $this->mark->Stroke($img,$xt,$yt);
-                $this->csimareas .= $this->mark->GetCSIMAreas();
-            }
-        }
-    }
-} // Class
-
-
-//===================================================
-// CLASS AccLinePlot
-// Description:
-//===================================================
-class AccLinePlot extends Plot {
-    protected $plots=null,$nbrplots=0;
-    private $iStartEndZero=true;
-    //---------------
-    // CONSTRUCTOR
-    function __construct($plots) {
-        $this->plots = $plots;
-        $this->nbrplots = count($plots);
-        $this->numpoints = $plots[0]->numpoints;
-
-        // Verify that all plots have the same number of data points
-        for( $i=1; $i < $this->nbrplots; ++$i ) {
-            if( $plots[$i]->numpoints != $this->numpoints ) {
-                JpGraphError::RaiseL(10003);//('Each plot in an accumulated lineplot must have the same number of data points',0)
-            }
-        }
-
-        for($i=0; $i < $this->nbrplots; ++$i ) {
-            $this->LineInterpolate($this->plots[$i]->coords[0]);
-        }
-    }
-
-    //---------------
-    // PUBLIC METHODS
-    function Legend($graph) {
-        foreach( $this->plots as $p ) {
-            $p->DoLegend($graph);
-        }
-    }
-
-    function Max() {
-        list($xmax) = $this->plots[0]->Max();
-        $nmax=0;
-        $n = count($this->plots);
-        for($i=0; $i < $n; ++$i) {
-            $nc = count($this->plots[$i]->coords[0]);
-            $nmax = max($nmax,$nc);
-            list($x) = $this->plots[$i]->Max();
-            $xmax = Max($xmax,$x);
-        }
-        for( $i = 0; $i < $nmax; $i++ ) {
-            // Get y-value for line $i by adding the
-            // individual bars from all the plots added.
-            // It would be wrong to just add the
-            // individual plots max y-value since that
-            // would in most cases give to large y-value.
-            $y=$this->plots[0]->coords[0][$i];
-            for( $j = 1; $j < $this->nbrplots; $j++ ) {
-                $y += $this->plots[ $j ]->coords[0][$i];
-            }
-            $ymax[$i] = $y;
-        }
-        $ymax = max($ymax);
-        return array($xmax,$ymax);
-    }
-
-    function Min() {
-        $nmax=0;
-        list($xmin,$ysetmin) = $this->plots[0]->Min();
-        $n = count($this->plots);
-        for($i=0; $i < $n; ++$i) {
-            $nc = count($this->plots[$i]->coords[0]);
-            $nmax = max($nmax,$nc);
-            list($x,$y) = $this->plots[$i]->Min();
-            $xmin = Min($xmin,$x);
-            $ysetmin = Min($y,$ysetmin);
-        }
-        for( $i = 0; $i < $nmax; $i++ ) {
-            // Get y-value for line $i by adding the
-            // individual bars from all the plots added.
-            // It would be wrong to just add the
-            // individual plots min y-value since that
-            // would in most cases give to small y-value.
-            $y=$this->plots[0]->coords[0][$i];
-            for( $j = 1; $j < $this->nbrplots; $j++ ) {
-                $y += $this->plots[ $j ]->coords[0][$i];
-            }
-            $ymin[$i] = $y;
-        }
-        $ymin = Min($ysetmin,Min($ymin));
-        return array($xmin,$ymin);
-    }
-
-    // Gets called before any axis are stroked
-    function PreStrokeAdjust($graph) {
-
-        // If another plot type have already adjusted the
-        // offset we don't touch it.
-        // (We check for empty in case the scale is  a log scale
-        // and hence doesn't contain any xlabel_offset)
-
-        if( empty($graph->xaxis->scale->ticks->xlabel_offset) ||
-        $graph->xaxis->scale->ticks->xlabel_offset == 0 ) {
-            if( $this->center ) {
-                ++$this->numpoints;
-                $a=0.5; $b=0.5;
-            } else {
-                $a=0; $b=0;
-            }
-            $graph->xaxis->scale->ticks->SetXLabelOffset($a);
-            $graph->SetTextScaleOff($b);
-            $graph->xaxis->scale->ticks->SupressMinorTickMarks();
-        }
-
-    }
-
-    function SetInterpolateMode($aIntMode) {
-        $this->iStartEndZero=$aIntMode;
-    }
-
-    // Replace all '-' with an interpolated value. We use straightforward
-    // linear interpolation. If the data starts with one or several '-' they
-    // will be replaced by the the first valid data point
-    function LineInterpolate(&$aData) {
-
-        $n=count($aData);
-        $i=0;
-
-        // If first point is undefined we will set it to the same as the first
-        // valid data
-        if( $aData[$i]==='-' ) {
-            // Find the first valid data
-            while( $i < $n && $aData[$i]==='-' ) {
-                ++$i;
-            }
-            if( $i < $n ) {
-                for($j=0; $j < $i; ++$j ) {
-                    if( $this->iStartEndZero )
-                    $aData[$i] = 0;
-                    else
-                    $aData[$j] = $aData[$i];
-                }
-            }
-            else {
-                // All '-' => Error
-                return false;
-            }
-        }
-
-        while($i < $n) {
-            while( $i < $n && $aData[$i] !== '-' ) {
-                ++$i;
-            }
-            if( $i < $n ) {
-                $pstart=$i-1;
-
-                // Now see how long this segment of '-' are
-                while( $i < $n && $aData[$i] === '-' ) {
-                    ++$i;
-                }
-                if( $i < $n ) {
-                    $pend=$i;
-                    $size=$pend-$pstart;
-                    $k=($aData[$pend]-$aData[$pstart])/$size;
-                    // Replace the segment of '-' with a linear interpolated value.
-                    for($j=1; $j < $size; ++$j ) {
-                        $aData[$pstart+$j] = $aData[$pstart] + $j*$k ;
-                    }
-                }
-                else {
-                    // There are no valid end point. The '-' goes all the way to the end
-                    // In that case we just set all the remaining values the the same as the
-                    // last valid data point.
-                    for( $j=$pstart+1; $j < $n; ++$j )
-                    if( $this->iStartEndZero ) {
-                        $aData[$j] = 0;
-                    }
-                    else {
-                        $aData[$j] = $aData[$pstart] ;
-                    }
-                }
-            }
-        }
-        return true;
-    }
-
-    // To avoid duplicate of line drawing code here we just
-    // change the y-values for each plot and then restore it
-    // after we have made the stroke. We must do this copy since
-    // it wouldn't be possible to create an acc line plot
-    // with the same graphs, i.e AccLinePlot(array($pl,$pl,$pl));
-    // since this method would have a side effect.
-    function Stroke($img,$xscale,$yscale) {
-        $img->SetLineWeight($this->weight);
-        $this->numpoints = count($this->plots[0]->coords[0]);
-        // Allocate array
-        $coords[$this->nbrplots][$this->numpoints]=0;
-        for($i=0; $i<$this->numpoints; $i++) {
-            $coords[0][$i]=$this->plots[0]->coords[0][$i];
-            $accy=$coords[0][$i];
-            for($j=1; $j<$this->nbrplots; ++$j ) {
-                $coords[$j][$i] = $this->plots[$j]->coords[0][$i]+$accy;
-                $accy = $coords[$j][$i];
-            }
-        }
-        for($j=$this->nbrplots-1; $j>=0; --$j) {
-            $p=$this->plots[$j];
-            for( $i=0; $i<$this->numpoints; ++$i) {
-                $tmp[$i]=$p->coords[0][$i];
-                $p->coords[0][$i]=$coords[$j][$i];
-            }
-            $p->Stroke($img,$xscale,$yscale);
-            for( $i=0; $i<$this->numpoints; ++$i) {
-                $p->coords[0][$i]=$tmp[$i];
-            }
-            $p->coords[0][]=$tmp;
-        }
-    }
-} // Class
-
-
-/* EOF */
-?>
diff --git a/#jpgraph/src/jpgraph_log.php b/#jpgraph/src/jpgraph_log.php
deleted file mode 100644
index d5146ecd..00000000
--- a/#jpgraph/src/jpgraph_log.php
+++ /dev/null
@@ -1,305 +0,0 @@
-<?php
-/*=======================================================================
- // File:        JPGRAPH_LOG.PHP
- // Description: Log scale plot extension for JpGraph
- // Created:     2001-01-08
- // Ver:         $Id: jpgraph_log.php 1106 2009-02-22 20:16:35Z ljp $
- //
- // Copyright (c) Asial Corporation. All rights reserved.
- //========================================================================
- */
-
-DEFINE('LOGLABELS_PLAIN',0);
-DEFINE('LOGLABELS_MAGNITUDE',1);
-
-//===================================================
-// CLASS LogScale
-// Description: Logarithmic scale between world and screen
-//===================================================
-class LogScale extends LinearScale {
-    //---------------
-    // CONSTRUCTOR
-
-    // Log scale is specified using the log of min and max
-    function __construct($min,$max,$type="y") {
-        parent::__construct($min,$max,$type);
-        $this->ticks = new LogTicks();
-        $this->name = 'log';
-    }
-
-    //----------------
-    // PUBLIC METHODS
-
-    // Translate between world and screen
-    function Translate($a) {
-        if( !is_numeric($a) ) {
-            if( $a != '' && $a != '-' && $a != 'x' ) { 
-                JpGraphError::RaiseL(11001);
-                // ('Your data contains non-numeric values.');
-            }
-            return 1;
-        }
-        if( $a < 0 ) {
-            JpGraphError::RaiseL(11002);
-            //("Negative data values can not be used in a log scale.");
-            exit(1);
-        }
-        if( $a==0 ) $a=1;
-        $a=log10($a);
-        return ceil($this->off + ($a*1.0 - $this->scale[0]) * $this->scale_factor);
-    }
-
-    // Relative translate (don't include offset) usefull when we just want
-    // to know the relative position (in pixels) on the axis
-    function RelTranslate($a) {
-        if( !is_numeric($a) ) {
-            if( $a != '' && $a != '-' && $a != 'x' ) {
-                JpGraphError::RaiseL(11001);
-                //('Your data contains non-numeric values.');
-            }
-            return 1;
-        }
-        if( $a==0 ) {
-            $a=1;
-        }
-        $a=log10($a);
-        return round(($a*1.0 - $this->scale[0]) * $this->scale_factor);
-    }
-
-    // Use bcpow() for increased precision
-    function GetMinVal() {
-        if( function_exists("bcpow") ) {
-            return round(bcpow(10,$this->scale[0],15),14);
-        }
-        else {
-            return round(pow(10,$this->scale[0]),14);
-        }
-    }
-
-    function GetMaxVal() {
-        if( function_exists("bcpow") ) {
-            return round(bcpow(10,$this->scale[1],15),14);
-        }
-        else {
-            return round(pow(10,$this->scale[1]),14);
-        }
-    }
-
-    // Logarithmic autoscaling is much simplier since we just
-    // set the min and max to logs of the min and max values.
-    // Note that for log autoscale the "maxstep" the fourth argument
-    // isn't used. This is just included to give the method the same
-    // signature as the linear counterpart.
-    function AutoScale($img,$min,$max,$maxsteps,$majend=true) {
-        if( $min==0 ) $min=1;
-
-        if( $max <= 0 ) {
-            JpGraphError::RaiseL(11004);
-            //('Scale error for logarithmic scale. You have a problem with your data values. The max value must be greater than 0. It is mathematically impossible to have 0 in a logarithmic scale.');
-        }
-        if( is_numeric($this->autoscale_min) ) {
-            $smin = round($this->autoscale_min);
-            $smax = ceil(log10($max));
-            if( $min >= $max ) {
-                JpGraphError::RaiseL(25071);//('You have specified a min value with SetAutoMin() which is larger than the maximum value used for the scale. This is not possible.');
-            }
-        }
-        else {
-            $smin = floor(log10($min));
-            if( is_numeric($this->autoscale_max) ) {
-                $smax = round($this->autoscale_max);
-                if( $smin >= $smax ) {
-                    JpGraphError::RaiseL(25072);//('You have specified a max value with SetAutoMax() which is smaller than the miminum value used for the scale. This is not possible.');
-                }
-            }
-            else
-            $smax = ceil(log10($max));
-        }
-
-        $this->Update($img,$smin,$smax);
-    }
-    //---------------
-    // PRIVATE METHODS
-} // Class
-
-//===================================================
-// CLASS LogTicks
-// Description:
-//===================================================
-class LogTicks extends Ticks{
-    private $label_logtype=LOGLABELS_MAGNITUDE;
-    private $ticklabels_pos = array();
-    //---------------
-    // CONSTRUCTOR
-    function LogTicks() {
-    }
-    //---------------
-    // PUBLIC METHODS
-    function IsSpecified() {
-        return true;
-    }
-
-    function SetLabelLogType($aType) {
-        $this->label_logtype = $aType;
-    }
-
-    // For log scale it's meaningless to speak about a major step
-    // We just return -1 to make the framework happy (specifically
-    // StrokeLabels() )
-    function GetMajor() {
-        return -1;
-    }
-
-    function SetTextLabelStart($aStart) {
-        JpGraphError::RaiseL(11005);
-        //('Specifying tick interval for a logarithmic scale is undefined. Remove any calls to SetTextLabelStart() or SetTextTickInterval() on the logarithmic scale.');
-    }
-
-    function SetXLabelOffset($dummy) {
-        // For log scales we dont care about XLabel offset
-    }
-
-    // Draw ticks on image "img" using scale "scale". The axis absolute
-    // position in the image is specified in pos, i.e. for an x-axis
-    // it specifies the absolute y-coord and for Y-ticks it specified the
-    // absolute x-position.
-    function Stroke($img,$scale,$pos) {
-        $start = $scale->GetMinVal();
-        $limit = $scale->GetMaxVal();
-        $nextMajor = 10*$start;
-        $step = $nextMajor / 10.0;
-
-
-        $img->SetLineWeight($this->weight);
-
-        if( $scale->type == "y" ) {
-            // member direction specified if the ticks should be on
-            // left or right side.
-            $a=$pos + $this->direction*$this->GetMinTickAbsSize();
-            $a2=$pos + $this->direction*$this->GetMajTickAbsSize();
-             
-            $count=1;
-            $this->maj_ticks_pos[0]=$scale->Translate($start);
-            $this->maj_ticklabels_pos[0]=$scale->Translate($start);
-            if( $this->supress_first )
-            $this->maj_ticks_label[0]="";
-            else {
-                if( $this->label_formfunc != '' ) {
-                    $f = $this->label_formfunc;
-                    $this->maj_ticks_label[0]=call_user_func($f,$start);
-                }
-                elseif( $this->label_logtype == LOGLABELS_PLAIN ) {
-                    $this->maj_ticks_label[0]=$start;
-                }
-                else {
-                    $this->maj_ticks_label[0]='10^'.round(log10($start));
-                }
-            }
-            $i=1;
-            for($y=$start; $y<=$limit; $y+=$step,++$count  ) {
-                $ys=$scale->Translate($y);
-                $this->ticks_pos[]=$ys;
-                $this->ticklabels_pos[]=$ys;
-                if( $count % 10 == 0 ) {
-                    if( !$this->supress_tickmarks ) {
-                        if( $this->majcolor!="" ) {
-                            $img->PushColor($this->majcolor);
-                            $img->Line($pos,$ys,$a2,$ys);
-                            $img->PopColor();
-                        }
-                        else {
-                            $img->Line($pos,$ys,$a2,$ys);
-                        }
-                    }
-
-                    $this->maj_ticks_pos[$i]=$ys;
-                    $this->maj_ticklabels_pos[$i]=$ys;
-
-                    if( $this->label_formfunc != '' ) {
-                        $f = $this->label_formfunc;
-                        $this->maj_ticks_label[$i]=call_user_func($f,$nextMajor);
-                    }
-                    elseif( $this->label_logtype == 0 ) {
-                        $this->maj_ticks_label[$i]=$nextMajor;
-                    }
-                    else {
-                        $this->maj_ticks_label[$i]='10^'.round(log10($nextMajor));
-                    }
-                    ++$i;
-                    $nextMajor *= 10;
-                    $step *= 10;
-                    $count=1;
-                }
-                else {
-                    if( !$this->supress_tickmarks && !$this->supress_minor_tickmarks) {
-                        if( $this->mincolor!="" ) {
-                            $img->PushColor($this->mincolor);
-                        }
-                        $img->Line($pos,$ys,$a,$ys);
-                        if( $this->mincolor!="" ) {
-                            $img->PopColor();
-                        }
-                    }
-                }
-            }
-        }
-        else {
-            $a=$pos - $this->direction*$this->GetMinTickAbsSize();
-            $a2=$pos - $this->direction*$this->GetMajTickAbsSize();
-            $count=1;
-            $this->maj_ticks_pos[0]=$scale->Translate($start);
-            $this->maj_ticklabels_pos[0]=$scale->Translate($start);
-            if( $this->supress_first ) {
-                $this->maj_ticks_label[0]="";
-            }
-            else {
-                if( $this->label_formfunc != '' ) {
-                    $f = $this->label_formfunc;
-                    $this->maj_ticks_label[0]=call_user_func($f,$start);
-                }
-                elseif( $this->label_logtype == 0 ) {
-                    $this->maj_ticks_label[0]=$start;
-                }
-                else {
-                    $this->maj_ticks_label[0]='10^'.round(log10($start));
-                }
-            }
-            $i=1;
-            for($x=$start; $x<=$limit; $x+=$step,++$count  ) {
-                $xs=$scale->Translate($x);
-                $this->ticks_pos[]=$xs;
-                $this->ticklabels_pos[]=$xs;
-                if( $count % 10 == 0 ) {
-                    if( !$this->supress_tickmarks ) {
-                        $img->Line($xs,$pos,$xs,$a2);
-                    }
-                    $this->maj_ticks_pos[$i]=$xs;
-                    $this->maj_ticklabels_pos[$i]=$xs;
-
-                    if( $this->label_formfunc != '' ) {
-                        $f = $this->label_formfunc;
-                        $this->maj_ticks_label[$i]=call_user_func($f,$nextMajor);
-                    }
-                    elseif( $this->label_logtype == 0 ) {
-                        $this->maj_ticks_label[$i]=$nextMajor;
-                    }
-                    else {
-                        $this->maj_ticks_label[$i]='10^'.round(log10($nextMajor));
-                    }
-                    ++$i;
-                    $nextMajor *= 10;
-                    $step *= 10;
-                    $count=1;
-                }
-                else {
-                    if( !$this->supress_tickmarks && !$this->supress_minor_tickmarks) {
-                        $img->Line($xs,$pos,$xs,$a);
-                    }
-                }
-            }
-        }
-        return true;
-    }
-} // Class
-/* EOF */
-?>
diff --git a/#jpgraph/src/jpgraph_meshinterpolate.inc.php b/#jpgraph/src/jpgraph_meshinterpolate.inc.php
deleted file mode 100644
index 7e8ae535..00000000
--- a/#jpgraph/src/jpgraph_meshinterpolate.inc.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-/*=======================================================================
-// File:        JPGRAPH_MESHINTERPOLATE.INC.PHP
-// Description: Utility class to do mesh linear interpolation of a matrix
-// Created:     2009-03-09
-// Ver:         $Id: jpgraph_meshinterpolate.inc.php 1709 2009-07-30 08:00:08Z ljp $
-//
-// Copyright (c) Asial Corporation. All rights reserved.
-//========================================================================
-*/
-  
-/**
-* Utility function to do linear mesh interpolation
-* @param $aDat Matrix to interpolate
-* @param $aFactor Interpolation factor  
-*/
-function doMeshInterpolate( &$aData, $aFactor ) {
-    $m = new MeshInterpolate();
-    $aData = $m->Linear($aData,$aFactor);
-}
-
-/**
- * Utility class to interpolate a given data matrix
- *
- */
-class MeshInterpolate {
-    private $data = array();
-
-   /**
-    * Calculate the mid points of the given rectangle which has its top left
-    * corner at $row,$col. The $aFactordecides how many spliots should be done.
-    * i.e. how many more divisions should be done recursively
-    *
-    * @param $row Top left corner of square to work with
-    * @param $col Top left corner of square to work with
-    * $param $aFactor In how many subsquare should we split this square. A value of 1 indicates that no action
-    */
-    function IntSquare( $aRow, $aCol, $aFactor ) {
-        if ( $aFactor <= 1 )
-            return;
-
-        $step = pow( 2, $aFactor-1 );
-
-        $v0 = $this->data[$aRow][$aCol];
-        $v1 = $this->data[$aRow][$aCol + $step];
-        $v2 = $this->data[$aRow + $step][$aCol];
-        $v3 = $this->data[$aRow + $step][$aCol + $step];
-
-        $this->data[$aRow][$aCol + $step / 2] = ( $v0 + $v1 ) / 2;
-        $this->data[$aRow + $step / 2][$aCol] = ( $v0 + $v2 ) / 2;
-        $this->data[$aRow + $step][$aCol + $step / 2] = ( $v2 + $v3 ) / 2;
-        $this->data[$aRow + $step / 2][$aCol + $step] = ( $v1 + $v3 ) / 2;
-        $this->data[$aRow + $step / 2][$aCol + $step / 2] = ( $v0 + $v1 + $v2 + $v3 ) / 4;
-
-        $this->IntSquare( $aRow, $aCol, $aFactor-1 );
-        $this->IntSquare( $aRow, $aCol + $step / 2, $aFactor-1 );
-        $this->IntSquare( $aRow + $step / 2, $aCol, $aFactor-1 );
-        $this->IntSquare( $aRow + $step / 2, $aCol + $step / 2, $aFactor-1 );
-    }
-
-    /**
-     * Interpolate values in a matrice so that the total number of data points
-     * in vert and horizontal axis are $aIntNbr more. For example $aIntNbr=2 will
-     * make the data matrice have tiwce as many vertical and horizontal dta points.
-     *
-     * Note: This will blow up the matrcide in memory size in the order of $aInNbr^2
-     *
-     * @param  $ &$aData The original data matricde
-     * @param  $aInNbr Interpolation factor
-     * @return the interpolated matrice
-     */
-    function Linear( &$aData, $aIntFactor ) {
-        $step = pow( 2, $aIntFactor-1 );
-
-        $orig_cols = count( $aData[0] );
-        $orig_rows = count( $aData );
-        // Number of new columns/rows
-        // N = (a-1) * 2^(f-1) + 1
-        $p = pow( 2, $aIntFactor-1 );
-        $new_cols = $p * ( $orig_cols - 1 ) + 1;
-        $new_rows = $p * ( $orig_rows - 1 ) + 1;
-
-        $this->data = array_fill( 0, $new_rows, array_fill( 0, $new_cols, 0 ) );
-        // Initialize the new matrix with the values that we know
-        for ( $i = 0; $i < $new_rows; $i++ ) {
-            for ( $j = 0; $j < $new_cols; $j++ ) {
-                $v = 0 ;
-                if ( ( $i % $step == 0 ) && ( $j % $step == 0 ) ) {
-                    $v = $aData[$i / $step][$j / $step];
-                }
-                $this->data[$i][$j] = $v;
-            }
-        }
-
-        for ( $i = 0; $i < $new_rows-1; $i += $step ) {
-            for ( $j = 0; $j < $new_cols-1; $j += $step ) {
-                $this->IntSquare( $i, $j, $aIntFactor );
-            }
-        }
-
-        return $this->data;
-    }
-}
-  
-?>
diff --git a/#jpgraph/src/jpgraph_mgraph.php b/#jpgraph/src/jpgraph_mgraph.php
deleted file mode 100644
index 80b2b6d7..00000000
--- a/#jpgraph/src/jpgraph_mgraph.php
+++ /dev/null
@@ -1,345 +0,0 @@
-<?php
-/*=======================================================================
- // File:        JPGRAPH_MGRAPH.PHP
- // Description: Class to handle multiple graphs in the same image
- // Created:     2006-01-15
- // Ver:         $Id: jpgraph_mgraph.php 1770 2009-08-17 06:10:22Z ljp $
- //
- // Copyright (c) Asial Corporation. All rights reserved.
- //========================================================================
- */
-
-//=============================================================================
-// CLASS MGraph
-// Description: Create a container image that can hold several graph
-//=============================================================================
-class MGraph {
-
-    public $title = null, $subtitle = null, $subsubtitle = null;
-
-    protected $img=NULL;
-    protected $iCnt=0,$iGraphs = array(); // image_handle, x, y, fx, fy, sizex, sizey
-    protected $iFillColor='white', $iCurrentColor=0;
-    protected $lm=4,$rm=4,$tm=4,$bm=4;
-    protected $iDoFrame = FALSE, $iFrameColor = 'black', $iFrameWeight = 1;
-    protected $iLineWeight = 1;
-    protected $expired=false;
-    protected $cache=null,$cache_name = '',$inline=true;
-    protected $image_format='png',$image_quality=75;
-    protected $iWidth=NULL,$iHeight=NULL;
-    protected $background_image='',$background_image_center=true,
-    $backround_image_format='',$background_image_mix=100,
-    $background_image_y=NULL, $background_image_x=NULL;
-    private $doshadow=false, $shadow_width=4, $shadow_color='gray@0.5';
-    public $footer;
-
-
-    // Create a new instane of the combined graph
-    function __construct($aWidth=NULL,$aHeight=NULL,$aCachedName='',$aTimeOut=0,$aInline=true) {
-        $this->iWidth = $aWidth;
-        $this->iHeight = $aHeight;
-
-        // If the cached version exist just read it directly from the
-        // cache, stream it back to browser and exit
-        if( $aCachedName!='' && READ_CACHE && $aInline ) {
-            $this->cache = new ImgStreamCache();
-            $this->cache->SetTimeOut($aTimeOut);
-            $image = new Image();
-            if( $this->cache->GetAndStream($image,$aCachedName) ) {
-                exit();
-            }
-        }
-        $this->inline = $aInline;
-        $this->cache_name = $aCachedName;
-
-        $this->title = new Text();
-        $this->title->ParagraphAlign('center');
-        $this->title->SetFont(FF_FONT2,FS_BOLD);
-        $this->title->SetMargin(3);
-        $this->title->SetAlign('center');
-
-        $this->subtitle = new Text();
-        $this->subtitle->ParagraphAlign('center');
-        $this->subtitle->SetFont(FF_FONT1,FS_BOLD);
-        $this->subtitle->SetMargin(3);
-        $this->subtitle->SetAlign('center');
-
-        $this->subsubtitle = new Text();
-        $this->subsubtitle->ParagraphAlign('center');
-        $this->subsubtitle->SetFont(FF_FONT1,FS_NORMAL);
-        $this->subsubtitle->SetMargin(3);
-        $this->subsubtitle->SetAlign('center');
-
-        $this->footer = new Footer();
-
-    }
-
-    // Specify background fill color for the combined graph
-    function SetFillColor($aColor) {
-        $this->iFillColor = $aColor;
-    }
-
-    // Add a frame around the combined graph
-    function SetFrame($aFlg,$aColor='black',$aWeight=1) {
-        $this->iDoFrame = $aFlg;
-        $this->iFrameColor = $aColor;
-        $this->iFrameWeight = $aWeight;
-    }
-
-    // Specify a background image blend
-    function SetBackgroundImageMix($aMix) {
-        $this->background_image_mix = $aMix ;
-    }
-
-    // Specify a background image
-    function SetBackgroundImage($aFileName,$aCenter_aX=NULL,$aY=NULL) {
-        // Second argument can be either a boolean value or
-        // a numeric
-        $aCenter=TRUE;
-        $aX=NULL;
-
-        if( is_numeric($aCenter_aX) ) {
-            $aX=$aCenter_aX;
-        }
-
-        // Get extension to determine image type
-        $e = explode('.',$aFileName);
-        if( !$e ) {
-            JpGraphError::RaiseL(12002,$aFileName);
-            //('Incorrect file name for MGraph::SetBackgroundImage() : '.$aFileName.' Must have a valid image extension (jpg,gif,png) when using autodetection of image type');
-        }
-
-        $valid_formats = array('png', 'jpg', 'gif');
-        $aImgFormat = strtolower($e[count($e)-1]);
-        if ($aImgFormat == 'jpeg')  {
-            $aImgFormat = 'jpg';
-        }
-        elseif (!in_array($aImgFormat, $valid_formats) )  {
-            JpGraphError::RaiseL(12003,$aImgFormat,$aFileName);
-            //('Unknown file extension ($aImgFormat) in MGraph::SetBackgroundImage() for filename: '.$aFileName);
-        }
-
-        $this->background_image = $aFileName;
-        $this->background_image_center=$aCenter;
-        $this->background_image_format=$aImgFormat;
-        $this->background_image_x = $aX;
-        $this->background_image_y = $aY;
-    }
-
-    function _strokeBackgroundImage() {
-        if( $this->background_image == '' ) return;
-
-        $bkgimg = Graph::LoadBkgImage('',$this->background_image);
-
-        // Background width & Heoght
-        $bw = imagesx($bkgimg);
-        $bh = imagesy($bkgimg);
-
-        // Canvas width and height
-        $cw = imagesx($this->img);
-        $ch = imagesy($this->img);
-
-        if( $this->doshadow ) {
-            $cw -= $this->shadow_width;
-            $ch -= $this->shadow_width;
-        }
-
-        if( $this->background_image_x === NULL || $this->background_image_y === NULL ) {
-            if( $this->background_image_center ) {
-                // Center original image in the plot area
-                $x = round($cw/2-$bw/2); $y = round($ch/2-$bh/2);
-            }
-            else {
-                // Just copy the image from left corner, no resizing
-                $x=0; $y=0;
-            }
-        }
-        else {
-            $x = $this->background_image_x;
-            $y = $this->background_image_y;
-        }
-        imagecopymerge($this->img,$bkgimg,$x,$y,0,0,$bw,$bh,$this->background_image_mix);
-    }
-
-    function AddMix($aGraph,$x=0,$y=0,$mix=100,$fx=0,$fy=0,$w=0,$h=0) {
-        $this->_gdImgHandle($aGraph->Stroke( _IMG_HANDLER),$x,$y,$fx=0,$fy=0,$w,$h,$mix);
-    }
-
-    function Add($aGraph,$x=0,$y=0,$fx=0,$fy=0,$w=0,$h=0) {
-        $this->_gdImgHandle($aGraph->Stroke( _IMG_HANDLER),$x,$y,$fx=0,$fy=0,$w,$h);
-    }
-
-    function _gdImgHandle($agdCanvas,$x,$y,$fx=0,$fy=0,$w=0,$h=0,$mix=100) {
-        if( $w == 0 ) {
-            $w = @imagesx($agdCanvas);
-        }
-        if( $w === NULL ) {
-            JpGraphError::RaiseL(12007);
-            //('Argument to MGraph::Add() is not a valid GD image handle.');
-            return;
-        }
-        if( $h == 0 ) {
-            $h = @imagesy($agdCanvas);
-        }
-        $this->iGraphs[$this->iCnt++] = array($agdCanvas,$x,$y,$fx,$fy,$w,$h,$mix);
-    }
-
-    function SetMargin($lm,$rm,$tm,$bm) {
-        $this->lm = $lm;
-        $this->rm = $rm;
-        $this->tm = $tm;
-        $this->bm = $bm;
-    }
-
-    function SetExpired($aFlg=true) {
-        $this->expired = $aFlg;
-    }
-
-    function SetImgFormat($aFormat,$aQuality=75) {
-        $this->image_format = $aFormat;
-        $this->image_quality = $aQuality;
-    }
-
-    // Set the shadow around the whole image
-    function SetShadow($aShowShadow=true,$aShadowWidth=4,$aShadowColor='gray@0.3') {
-        $this->doshadow = $aShowShadow;
-        $this->shadow_color = $aShadowColor;
-        $this->shadow_width = $aShadowWidth;
-        $this->footer->iBottomMargin += $aShadowWidth;
-        $this->footer->iRightMargin += $aShadowWidth;
-    }
-
-    function StrokeTitle($image,$w,$h) {
-        // Stroke title
-        if( $this->title->t !== '' ) {
-
-            $margin = 3;
-
-            $y = $this->title->margin;
-            if( $this->title->halign == 'center' ) {
-                $this->title->Center(0,$w,$y);
-            }
-            elseif( $this->title->halign == 'left' ) {
-                $this->title->SetPos($this->title->margin+2,$y);
-            }
-            elseif( $this->title->halign == 'right' ) {
-                $indent = 0;
-                if( $this->doshadow ) {
-                    $indent = $this->shadow_width+2;
-                }
-                $this->title->SetPos($w-$this->title->margin-$indent,$y,'right');
-            }
-            $this->title->Stroke($image);
-
-            // ... and subtitle
-            $y += $this->title->GetTextHeight($image) + $margin + $this->subtitle->margin;
-            if( $this->subtitle->halign == 'center' ) {
-                $this->subtitle->Center(0,$w,$y);
-            }
-            elseif( $this->subtitle->halign == 'left' ) {
-                $this->subtitle->SetPos($this->subtitle->margin+2,$y);
-            }
-            elseif( $this->subtitle->halign == 'right' ) {
-                $indent = 0;
-                if( $this->doshadow ) {
-                    $indent = $this->shadow_width+2;
-                }
-                $this->subtitle->SetPos($this->img->width-$this->subtitle->margin-$indent,$y,'right');
-            }
-            $this->subtitle->Stroke($image);
-
-            // ... and subsubtitle
-            $y += $this->subtitle->GetTextHeight($image) + $margin + $this->subsubtitle->margin;
-            if( $this->subsubtitle->halign == 'center' ) {
-                $this->subsubtitle->Center(0,$w,$y);
-            }
-            elseif( $this->subsubtitle->halign == 'left' ) {
-                $this->subsubtitle->SetPos($this->subsubtitle->margin+2,$y);
-            }
-            elseif( $this->subsubtitle->halign == 'right' ) {
-                $indent = 0;
-                if( $this->doshadow ) {
-                    $indent = $this->shadow_width+2;
-                }
-                $this->subsubtitle->SetPos($w-$this->subsubtitle->margin-$indent,$y,'right');
-            }
-            $this->subsubtitle->Stroke($image);
-
-        }
-    }
-
-    function Stroke($aFileName='') {
-        // Find out the necessary size for the container image
-        $w=0; $h=0;
-        for($i=0; $i < $this->iCnt; ++$i ) {
-            $maxw = $this->iGraphs[$i][1]+$this->iGraphs[$i][5];
-            $maxh = $this->iGraphs[$i][2]+$this->iGraphs[$i][6];
-            $w = max( $w, $maxw );
-            $h = max( $h, $maxh );
-        }
-        $w += $this->lm+$this->rm;
-        $h += $this->tm+$this->bm;
-
-        // User specified width,height overrides
-        if( $this->iWidth !== NULL && $this->iWidth !== 0 ) $w = $this->iWidth;
-        if( $this->iHeight!== NULL && $this->iHeight !== 0) $h = $this->iHeight;
-
-        if( $this->doshadow ) {
-            $w += $this->shadow_width;
-            $h += $this->shadow_width;
-        }
-
-        $image = new Image($w,$h);
-        $image->SetImgFormat( $this->image_format,$this->image_quality);
-
-        if( $this->doshadow ) {
-            $image->SetColor($this->iFrameColor);
-            $image->ShadowRectangle(0,0,$w-1,$h-1,$this->iFillColor,$this->shadow_width,$this->shadow_color);
-            $w -= $this->shadow_width;
-            $h -= $this->shadow_width;
-        }
-        else {
-            $image->SetColor($this->iFillColor);
-            $image->FilledRectangle(0,0,$w-1,$h-1);
-        }
-        $image->SetExpired($this->expired);
-
-        $this->img = $image->img;
-        $this->_strokeBackgroundImage();
-
-        if( $this->iDoFrame && ! $this->doshadow ) {
-           $image->SetColor($this->iFrameColor);
-           $image->SetLineWeight($this->iFrameWeight);
-           $image->Rectangle(0,0,$w-1,$h-1);
-        }
-
-        // Copy all sub graphs to the container
-        for($i=0; $i < $this->iCnt; ++$i ) {
-            $image->CopyMerge($this->iGraphs[$i][0],
-                            $this->iGraphs[$i][1]+$this->lm,$this->iGraphs[$i][2]+$this->tm,
-                            $this->iGraphs[$i][3],$this->iGraphs[$i][4],
-                            $this->iGraphs[$i][5],$this->iGraphs[$i][6],
-                            -1,-1, /* Full from width and height */
-                            $this->iGraphs[$i][7]);
-
-
-        }
-
-        $this->StrokeTitle($image,$w,$h);
-        $this->footer->Stroke($image);
-
-        // Output image
-        if( $aFileName == _IMG_HANDLER ) {
-            return $image->img;
-        }
-        else {
-            //Finally stream the generated picture
-            $this->cache = new ImgStreamCache();
-            $this->cache->PutAndStream($image,$this->cache_name,$this->inline,$aFileName);
-        }
-    }
-}
-
-// EOF
-
-?>
diff --git a/#jpgraph/src/jpgraph_pie.php b/#jpgraph/src/jpgraph_pie.php
deleted file mode 100644
index c79d30fa..00000000
--- a/#jpgraph/src/jpgraph_pie.php
+++ /dev/null
@@ -1,1495 +0,0 @@
-<?php
-/*=======================================================================
- // File:        JPGRAPH_PIE.PHP
- // Description: Pie plot extension for JpGraph
- // Created:     2001-02-14
- // Ver:         $Id: jpgraph_pie.php 1926 2010-01-11 16:33:07Z ljp $
- //
- // Copyright (c) Asial Corporation. All rights reserved.
- //========================================================================
- */
-
-
-// Defines for PiePlot::SetLabelType()
-define("PIE_VALUE_ABS",1);
-define("PIE_VALUE_PER",0);
-define("PIE_VALUE_PERCENTAGE",0);
-define("PIE_VALUE_ADJPERCENTAGE",2);
-define("PIE_VALUE_ADJPER",2);
-
-//===================================================
-// CLASS PiePlot
-// Description: Draws a pie plot
-//===================================================
-class PiePlot {
-    public $posx=0.5,$posy=0.5;
-    public $is_using_plot_theme = false;
-    public $theme="earth";
-    protected $use_plot_theme_colors = false;
-    protected $radius=0.3;
-    protected $explode_radius=array(),$explode_all=false,$explode_r=20;
-    protected $labels=null, $legends=null;
-    protected $csimtargets=null,$csimwintargets=null;  // Array of targets for CSIM
-    protected $csimareas='';  // Generated CSIM text
-    protected $csimalts=null;  // ALT tags for corresponding target
-    protected $data=null;
-    public $title;
-    protected $startangle=0;
-    protected $weight=1, $color="black";
-    protected $legend_margin=6,$show_labels=true;
-    protected $themearr = array(
- "earth"  => array(136,34,40,45,46,62,63,134,74,10,120,136,141,168,180,77,209,218,346,395,89,430),
- "pastel" => array(27,415,128,59,66,79,105,110,42,147,152,230,236,240,331,337,405,38),
- "water"  => array(8,370,24,40,335,56,213,237,268,14,326,387,10,388),
- "sand"   => array(27,168,34,170,19,50,65,72,131,209,46,393));
-    protected $setslicecolors=array();
-    protected $labeltype=0; // Default to percentage
-    protected $pie_border=true,$pie_interior_border=true;
-    public $value;
-    protected $ishadowcolor='',$ishadowdrop=4;
-    protected $ilabelposadj=1;
-    protected $legendcsimtargets = array(),$legendcsimwintargets = array();
-    protected $legendcsimalts = array();
-    protected $adjusted_data = array();
-    public $guideline = null;
-    protected $guidelinemargin=10,$iShowGuideLineForSingle = false;
-    protected $iGuideLineCurve = false,$iGuideVFactor=1.4,$iGuideLineRFactor=0.8;
-    protected $la = array(); // Holds the exact angle for each label
-
-    //---------------
-    // CONSTRUCTOR
-    function __construct($data) {
-        $this->data = array_reverse($data);
-        $this->title = new Text("");
-        $this->title->SetFont(FF_DEFAULT,FS_BOLD);
-        $this->value = new DisplayValue();
-        $this->value->Show();
-        $this->value->SetFormat('%.1f%%');
-        $this->guideline = new LineProperty();
-    }
-
-    //---------------
-    // PUBLIC METHODS
-    function SetCenter($x,$y=0.5) {
-        $this->posx = $x;
-        $this->posy = $y;
-    }
-
-    // Enable guideline and set drwaing policy
-    function SetGuideLines($aFlg=true,$aCurved=true,$aAlways=false) {
-        $this->guideline->Show($aFlg);
-        $this->iShowGuideLineForSingle = $aAlways;
-        $this->iGuideLineCurve = $aCurved;
-    }
-
-    // Adjuste the distance between labels and labels and pie
-    function SetGuideLinesAdjust($aVFactor,$aRFactor=0.8) {
-        $this->iGuideVFactor=$aVFactor;
-        $this->iGuideLineRFactor=$aRFactor;
-    }
-
-    function SetColor($aColor) {
-        $this->color = $aColor;
-    }
-
-    function SetSliceColors($aColors) {
-        $this->setslicecolors = $aColors;
-    }
-
-    function SetShadow($aColor='darkgray',$aDropWidth=4) {
-        $this->ishadowcolor = $aColor;
-        $this->ishadowdrop = $aDropWidth;
-    }
-
-    function SetCSIMTargets($aTargets,$aAlts='',$aWinTargets='') {
-        $this->csimtargets=array_reverse($aTargets);
-        if( is_array($aWinTargets) )
-        $this->csimwintargets=array_reverse($aWinTargets);
-        if( is_array($aAlts) )
-        $this->csimalts=array_reverse($aAlts);
-    }
-
-    function GetCSIMareas() {
-        return $this->csimareas;
-    }
-
-    function AddSliceToCSIM($i,$xc,$yc,$radius,$sa,$ea) {
-        //Slice number, ellipse centre (x,y), height, width, start angle, end angle
-        while( $sa > 2*M_PI ) $sa = $sa - 2*M_PI;
-        while( $ea > 2*M_PI ) $ea = $ea - 2*M_PI;
-
-        $sa = 2*M_PI - $sa;
-        $ea = 2*M_PI - $ea;
-
-        // Special case when we have only one slice since then both start and end
-        // angle will be == 0
-        if( abs($sa - $ea) < 0.0001 ) {
-            $sa=2*M_PI; $ea=0;
-        }
-
-        //add coordinates of the centre to the map
-        $xc = floor($xc);$yc=floor($yc);
-        $coords = "$xc, $yc";
-
-        //add coordinates of the first point on the arc to the map
-        $xp = floor(($radius*cos($ea))+$xc);
-        $yp = floor($yc-$radius*sin($ea));
-        $coords.= ", $xp, $yp";
-
-        //add coordinates every 0.2 radians
-        $a=$ea+0.2;
-
-        // If we cross the 360-limit with a slice we need to handle
-        // the fact that end angle is smaller than start
-        if( $sa < $ea ) {
-            while ($a <= 2*M_PI) {
-                $xp = floor($radius*cos($a)+$xc);
-                $yp = floor($yc-$radius*sin($a));
-                $coords.= ", $xp, $yp";
-                $a += 0.2;
-            }
-            $a -= 2*M_PI;
-        }
-
-
-        while ($a < $sa) {
-            $xp = floor($radius*cos($a)+$xc);
-            $yp = floor($yc-$radius*sin($a));
-            $coords.= ", $xp, $yp";
-            $a += 0.2;
-        }
-
-        //Add the last point on the arc
-        $xp = floor($radius*cos($sa)+$xc);
-        $yp = floor($yc-$radius*sin($sa));
-        $coords.= ", $xp, $yp";
-        if( !empty($this->csimtargets[$i]) ) {
-            $this->csimareas .= "<area shape=\"poly\" coords=\"$coords\" href=\"".$this->csimtargets[$i]."\"";
-            $tmp="";
-            if( !empty($this->csimwintargets[$i]) ) {
-                $this->csimareas .= " target=\"".$this->csimwintargets[$i]."\" ";
-            }
-            if( !empty($this->csimalts[$i]) ) {
-                $tmp=sprintf($this->csimalts[$i],$this->data[$i]);
-                $this->csimareas .= " title=\"$tmp\" alt=\"$tmp\" ";
-            }
-            $this->csimareas .= " />\n";
-        }
-    }
-
-
-    function SetTheme($aTheme) {
-//        JpGraphError::RaiseL(15012,$aTheme);
-//        return;
-
-        if( in_array($aTheme,array_keys($this->themearr)) ) {
-            $this->theme = $aTheme;
-            $this->is_using_plot_theme = true;
-        } else {
-            JpGraphError::RaiseL(15001,$aTheme);//("PiePLot::SetTheme() Unknown theme: $aTheme");
-        }
-    }
-
-    function ExplodeSlice($e,$radius=20) {
-        if( ! is_integer($e) )
-        JpGraphError::RaiseL(15002);//('Argument to PiePlot::ExplodeSlice() must be an integer');
-        $this->explode_radius[$e]=$radius;
-    }
-
-    function ExplodeAll($radius=20) {
-        $this->explode_all=true;
-        $this->explode_r = $radius;
-    }
-
-    function Explode($aExplodeArr) {
-        if( !is_array($aExplodeArr) ) {
-            JpGraphError::RaiseL(15003);
-            //("Argument to PiePlot::Explode() must be an array with integer distances.");
-        }
-        $this->explode_radius = $aExplodeArr;
-    }
-
-    function SetStartAngle($aStart) {
-        if( $aStart < 0 || $aStart > 360 ) {
-            JpGraphError::RaiseL(15004);//('Slice start angle must be between 0 and 360 degrees.');
-        }
-        if( $aStart == 0 ) {
-            $this->startangle = 0;
-        }
-        else {
-            $this->startangle = 360-$aStart;
-            $this->startangle *= M_PI/180;
-        }
-    }
-
-    // Size in percentage
-    function SetSize($aSize) {
-        if( ($aSize>0 && $aSize<=0.5) || ($aSize>10 && $aSize<1000) )
-        $this->radius = $aSize;
-        else
-        JpGraphError::RaiseL(15006);
-        //("PiePlot::SetSize() Radius for pie must either be specified as a fraction [0, 0.5] of the size of the image or as an absolute size in pixels  in the range [10, 1000]");
-    }
-
-    // Set label arrays
-    function SetLegends($aLegend) {
-        $this->legends = $aLegend;
-    }
-
-    // Set text labels for slices
-    function SetLabels($aLabels,$aLblPosAdj="auto") {
-        $this->labels = array_reverse($aLabels);
-        $this->ilabelposadj=$aLblPosAdj;
-    }
-
-    function SetLabelPos($aLblPosAdj) {
-        $this->ilabelposadj=$aLblPosAdj;
-    }
-
-    // Should we display actual value or percentage?
-    function SetLabelType($aType) {
-        if( $aType < 0 || $aType > 2 )
-        	JpGraphError::RaiseL(15008,$aType);
-	        //("PiePlot::SetLabelType() Type for pie plots must be 0 or 1 (not $t).");
-        $this->labeltype = $aType;
-    }
-
-    // Deprecated.
-    function SetValueType($aType) {
-        $this->SetLabelType($aType);
-    }
-
-    // Should the circle around a pie plot be displayed
-    function ShowBorder($exterior=true,$interior=true) {
-        $this->pie_border = $exterior;
-        $this->pie_interior_border = $interior;
-    }
-
-    // Setup the legends
-    function Legend($graph) {
-        $colors = array_keys($graph->img->rgb->rgb_table);
-        sort($colors);
-        $ta=$this->themearr[$this->theme];
-        $n = count($this->data);
-
-        if( $this->setslicecolors==null ) {
-            $numcolors=count($ta);
-            if( class_exists('PiePlot3D',false) && ($this instanceof PiePlot3D) ) {
-                $ta = array_reverse(array_slice($ta,0,$n));
-            }
-        }
-        else {
-            $this->setslicecolors = array_slice($this->setslicecolors,0,$n);
-            $numcolors=count($this->setslicecolors);
-            if( $graph->pieaa && !($this instanceof PiePlot3D) ) {
-                $this->setslicecolors = array_reverse($this->setslicecolors);
-            }
-        }
-
-        $sum=0;
-        for($i=0; $i < $n; ++$i)
-            $sum += $this->data[$i];
-
-        // Bail out with error if the sum is 0
-        if( $sum==0 )
-        JpGraphError::RaiseL(15009);//("Illegal pie plot. Sum of all data is zero for Pie!");
-
-        // Make sure we don't plot more values than data points
-        // (in case the user added more legends than data points)
-        $n = min(count($this->legends),count($this->data));
-        if( $this->legends != "" ) {
-            $this->legends = array_reverse(array_slice($this->legends,0,$n));
-        }
-        for( $i=$n-1; $i >= 0; --$i ) {
-            $l = $this->legends[$i];
-            // Replace possible format with actual values
-            if( count($this->csimalts) > $i ) {
-                $fmt = $this->csimalts[$i];
-            }
-            else {
-                $fmt = "%d"; // Deafult Alt if no other has been specified
-            }
-            if( $this->labeltype==0 ) {
-                $l = sprintf($l,100*$this->data[$i]/$sum);
-                $alt = sprintf($fmt,$this->data[$i]);
-
-            }
-            elseif( $this->labeltype == 1)  {
-                $l = sprintf($l,$this->data[$i]);
-                $alt = sprintf($fmt,$this->data[$i]);
-
-            }
-            else {
-                $l = sprintf($l,$this->adjusted_data[$i]);
-                $alt = sprintf($fmt,$this->adjusted_data[$i]);
-            }
-
-            if( empty($this->csimwintargets[$i]) ) {
-                $wintarg = '';
-            }
-            else {
-                $wintarg = $this->csimwintargets[$i];
-            }
-
-            if( $this->setslicecolors==null ) {
-                $graph->legend->Add($l,$colors[$ta[$i%$numcolors]],"",0,$this->csimtargets[$i],$alt,$wintarg);
-            }
-            else {
-                $graph->legend->Add($l,$this->setslicecolors[$i%$numcolors],"",0,$this->csimtargets[$i],$alt,$wintarg);
-            }
-        }
-    }
-
-    // Adjust the rounded percetage value so that the sum of
-    // of the pie slices are always 100%
-    // Using the Hare/Niemeyer method
-    function AdjPercentage($aData,$aPrec=0) {
-        $mul=100;
-        if( $aPrec > 0 && $aPrec < 3 ) {
-            if( $aPrec == 1 )
-            $mul=1000;
-            else
-            $mul=10000;
-        }
-
-        $tmp = array();
-        $result = array();
-        $quote_sum=0;
-        $n = count($aData) ;
-        for( $i=0, $sum=0; $i < $n; ++$i )
-        $sum+=$aData[$i];
-        foreach($aData as $index => $value) {
-            $tmp_percentage=$value/$sum*$mul;
-            $result[$index]=floor($tmp_percentage);
-            $tmp[$index]=$tmp_percentage-$result[$index];
-            $quote_sum+=$result[$index];
-        }
-        if( $quote_sum == $mul) {
-            if( $mul > 100 ) {
-                $tmp = $mul / 100;
-                for( $i=0; $i < $n; ++$i ) {
-                    $result[$i] /= $tmp ;
-                }
-            }
-            return $result;
-        }
-        arsort($tmp,SORT_NUMERIC);
-        reset($tmp);
-        for($i=0; $i < $mul-$quote_sum; $i++)
-        {
-            $result[key($tmp)]++;
-            next($tmp);
-        }
-        if( $mul > 100 ) {
-            $tmp = $mul / 100;
-            for( $i=0; $i < $n; ++$i ) {
-                $result[$i] /= $tmp ;
-            }
-        }
-        return $result;
-    }
-
-
-    function Stroke($img,$aaoption=0) {
-        // aaoption is used to handle antialias
-        // aaoption == 0 a normal pie
-        // aaoption == 1 just the body
-        // aaoption == 2 just the values
-
-        // Explode scaling. If anti alias we scale the image
-        // twice and we also need to scale the exploding distance
-        $expscale = $aaoption === 1 ? 2 : 1;
-
-        if( $this->labeltype == 2 ) {
-            // Adjust the data so that it will add up to 100%
-            $this->adjusted_data = $this->AdjPercentage($this->data);
-        }
-
-        if ($this->use_plot_theme_colors) {
-            $this->setslicecolors = null;
-        }
-
-        $colors = array_keys($img->rgb->rgb_table);
-        sort($colors);
-        $ta=$this->themearr[$this->theme];
-        $n = count($this->data);
-
-        if( $this->setslicecolors==null ) {
-            $numcolors=count($ta);
-        }
-        else {
-            // We need to create an array of colors as long as the data
-            // since we need to reverse it to get the colors in the right order
-            $numcolors=count($this->setslicecolors);
-            $i = 2*$numcolors;
-            while( $n > $i ) {
-                $this->setslicecolors = array_merge($this->setslicecolors,$this->setslicecolors);
-                $i += $n;
-            }
-            $tt = array_slice($this->setslicecolors,0,$n % $numcolors);
-            $this->setslicecolors = array_merge($this->setslicecolors,$tt);
-            $this->setslicecolors = array_reverse($this->setslicecolors);
-        }
-
-        // Draw the slices
-        $sum=0;
-        for($i=0; $i < $n; ++$i)
-            $sum += $this->data[$i];
-
-        // Bail out with error if the sum is 0
-        if( $sum==0 ) {
-            JpGraphError::RaiseL(15009);//("Sum of all data is 0 for Pie.");
-        }
-
-        // Set up the pie-circle
-        if( $this->radius <= 1 ) {
-            $radius = floor($this->radius*min($img->width,$img->height));
-        }
-        else {
-            $radius = $aaoption === 1 ? $this->radius*2 : $this->radius;
-        }
-
-        if( $this->posx <= 1 && $this->posx > 0 ) {
-            $xc = round($this->posx*$img->width);
-        }
-        else {
-            $xc = $this->posx ;
-        }
-
-        if( $this->posy <= 1 && $this->posy > 0 ) {
-            $yc = round($this->posy*$img->height);
-        }
-        else {
-            $yc = $this->posy ;
-        }
-
-        $n = count($this->data);
-
-        if( $this->explode_all ) {
-            for($i=0; $i < $n; ++$i) {
-                $this->explode_radius[$i]=$this->explode_r;
-            }
-        }
-
-        // If we have a shadow and not just drawing the labels
-        if( $this->ishadowcolor != "" && $aaoption !== 2) {
-            $accsum=0;
-            $angle2 = $this->startangle;
-            $img->SetColor($this->ishadowcolor);
-            for($i=0; $sum > 0 && $i < $n; ++$i) {
-                $j = $n-$i-1;
-                $d = $this->data[$i];
-                $angle1 = $angle2;
-                $accsum += $d;
-                $angle2 = $this->startangle+2*M_PI*$accsum/$sum;
-                if( empty($this->explode_radius[$j]) ) {
-                    $this->explode_radius[$j]=0;
-                }
-
-                if( $d < 0.00001 ) continue;
-
-                $la = 2*M_PI - (abs($angle2-$angle1)/2.0+$angle1);
-
-                $xcm = $xc + $this->explode_radius[$j]*cos($la)*$expscale;
-                $ycm = $yc - $this->explode_radius[$j]*sin($la)*$expscale;
-
-                $xcm += $this->ishadowdrop*$expscale;
-                $ycm += $this->ishadowdrop*$expscale;
-
-                $_sa = round($angle1*180/M_PI);
-                $_ea = round($angle2*180/M_PI);
-
-                // The CakeSlice method draws a full circle in case of start angle = end angle
-                // for pie slices we don't want this behaviour unless we only have one
-                // slice in the pie in case it is the wanted behaviour
-                if( $_ea-$_sa > 0.1 || $n==1 ) {
-                    $img->CakeSlice($xcm,$ycm,$radius-1,$radius-1,
-                    $angle1*180/M_PI,$angle2*180/M_PI,$this->ishadowcolor);
-                }
-            }
-        }
-
-        //--------------------------------------------------------------------------------
-        // This is the main loop to draw each cake slice
-        //--------------------------------------------------------------------------------
-
-        // Set up the accumulated sum, start angle for first slice and border color
-        $accsum=0;
-        $angle2 = $this->startangle;
-        $img->SetColor($this->color);
-
-        // Loop though all the slices if there is a pie to draw (sum>0)
-        // There are n slices in total
-        for($i=0; $sum>0 && $i < $n; ++$i) {
-
-            // $j is the actual index used for the slice
-            $j = $n-$i-1;
-
-            // Make sure we havea  valid distance to explode the slice
-            if( empty($this->explode_radius[$j]) ) {
-                $this->explode_radius[$j]=0;
-            }
-
-            // The actual numeric value for the slice
-            $d = $this->data[$i];
-
-            $angle1 = $angle2;
-
-            // Accumlate the sum
-            $accsum += $d;
-
-            // The new angle when we add the "size" of this slice
-            // angle1 is then the start and angle2 the end of this slice
-            $angle2 = $this->NormAngle($this->startangle+2*M_PI*$accsum/$sum);
-
-            // We avoid some trouble by not allowing end angle to be 0, in that case
-            // we translate to 360
-
-            // la is used to hold the label angle, which is centered on the slice
-            if( $angle2 < 0.0001 && $angle1 > 0.0001 ) {
-                $this->la[$i] = 2*M_PI - (abs(2*M_PI-$angle1)/2.0+$angle1);
-            }
-            elseif( $angle1 > $angle2 ) {
-                // The case where the slice crosses the 3 a'clock line
-                // Remember that the slices are counted clockwise and
-                // labels are counted counter clockwise so we need to revert with 2 PI
-                $this->la[$i] = 2*M_PI-$this->NormAngle($angle1 + ((2*M_PI - $angle1)+$angle2)/2);
-            }
-            else {
-                $this->la[$i] = 2*M_PI - (abs($angle2-$angle1)/2.0+$angle1);
-            }
-
-            // Too avoid rounding problems we skip the slice if it is too small
-            if( $d < 0.00001 ) continue;
-
-            // If the user has specified an array of colors for each slice then use
-            // that a color otherwise use the theme array (ta) of colors
-            if( $this->setslicecolors==null ) {
-                $slicecolor=$colors[$ta[$i%$numcolors]];
-            }
-            else {
-                $slicecolor=$this->setslicecolors[$i%$numcolors];
-            }
-
-//            $_sa = round($angle1*180/M_PI);
-//            $_ea = round($angle2*180/M_PI);
-//            $_la = round($this->la[$i]*180/M_PI);
-//            echo "Slice#$i: ang1=$_sa , ang2=$_ea, la=$_la, color=$slicecolor<br>";
-
-
-            // If we have enabled antialias then we don't draw any border so
-            // make the bordedr color the same as the slice color
-            if( $this->pie_interior_border && $aaoption===0 ) {
-                $img->SetColor($this->color);
-            }
-            else {
-                $img->SetColor($slicecolor);
-            }
-            $arccolor = $this->pie_border && $aaoption===0 ? $this->color : "";
-
-            // Calculate the x,y coordinates for the base of this slice taking
-            // the exploded distance into account. Here we use the mid angle as the
-            // ray of extension and we have the mid angle handy as it is also the
-            // label angle
-            $xcm = $xc + $this->explode_radius[$j]*cos($this->la[$i])*$expscale;
-            $ycm = $yc - $this->explode_radius[$j]*sin($this->la[$i])*$expscale;
-
-            // If we are not just drawing the labels then draw this cake slice
-            if( $aaoption !== 2 ) {
-
-                $_sa = round($angle1*180/M_PI);
-                $_ea = round($angle2*180/M_PI);
-                $_la = round($this->la[$i]*180/M_PI);
-                //echo "[$i] sa=$_sa, ea=$_ea, la[$i]=$_la, (color=$slicecolor)<br>";
-
-                // The CakeSlice method draws a full circle in case of start angle = end angle
-                // for pie slices we want this in case the slice have a value larger than 99% of the
-                // total sum
-                if( abs($_ea-$_sa) >= 1 || $d == $sum ) {
-                    $img->CakeSlice($xcm,$ycm,$radius-1,$radius-1,$_sa,$_ea,$slicecolor,$arccolor);
-                }
-            }
-
-            // If the CSIM is used then make sure we register a CSIM area for this slice as well
-            if( $this->csimtargets && $aaoption !== 1 ) {
-                $this->AddSliceToCSIM($i,$xcm,$ycm,$radius,$angle1,$angle2);
-            }
-        }
-
-        // Format the titles for each slice
-        if( $aaoption !== 2 ) {
-            for( $i=0; $i < $n; ++$i) {
-                if( $this->labeltype==0 ) {
-                    if( $sum != 0 )
-                    $l = 100.0*$this->data[$i]/$sum;
-                    else
-                    $l = 0.0;
-                }
-                elseif( $this->labeltype==1 ) {
-                    $l = $this->data[$i]*1.0;
-                }
-                else {
-                    $l = $this->adjusted_data[$i];
-                }
-                if( isset($this->labels[$i]) && is_string($this->labels[$i]) )
-                $this->labels[$i]=sprintf($this->labels[$i],$l);
-                else
-                $this->labels[$i]=$l;
-            }
-        }
-
-        if( $this->value->show && $aaoption !== 1 ) {
-            $this->StrokeAllLabels($img,$xc,$yc,$radius);
-        }
-
-        // Adjust title position
-        if( $aaoption !== 1 ) {
-            $this->title->SetPos($xc,
-            $yc-$this->title->GetFontHeight($img)-$radius-$this->title->margin,
-     "center","bottom");
-            $this->title->Stroke($img);
-        }
-
-    }
-
-    //---------------
-    // PRIVATE METHODS
-
-    function NormAngle($a) {
-        while( $a < 0 ) $a += 2*M_PI;
-        while( $a > 2*M_PI ) $a -= 2*M_PI;
-        return $a;
-    }
-
-    function Quadrant($a) {
-        $a=$this->NormAngle($a);
-        if( $a > 0 && $a <= M_PI/2 )
-        return 0;
-        if( $a > M_PI/2 && $a <= M_PI )
-        return 1;
-        if( $a > M_PI && $a <= 1.5*M_PI )
-        return 2;
-        if( $a > 1.5*M_PI )
-        return 3;
-    }
-
-    function StrokeGuideLabels($img,$xc,$yc,$radius) {
-        $n = count($this->labels);
-
-        //-----------------------------------------------------------------------
-        // Step 1 of the algorithm is to construct a number of clusters
-        // a cluster is defined as all slices within the same quadrant (almost)
-        // that has an angular distance less than the treshold
-        //-----------------------------------------------------------------------
-        $tresh_hold=25 * M_PI/180; // 25 degrees difference to be in a cluster
-        $incluster=false; // flag if we are currently in a cluster or not
-        $clusters = array(); // array of clusters
-        $cidx=-1;  // running cluster index
-
-        // Go through all the labels and construct a number of clusters
-        for($i=0; $i < $n-1; ++$i) {
-            // Calc the angle distance between two consecutive slices
-            $a1=$this->la[$i];
-            $a2=$this->la[$i+1];
-            $q1 = $this->Quadrant($a1);
-            $q2 = $this->Quadrant($a2);
-            $diff = abs($a1-$a2);
-            if( $diff < $tresh_hold ) {
-                if( $incluster ) {
-                    $clusters[$cidx][1]++;
-                    // Each cluster can only cover one quadrant
-                    // Do we cross a quadrant ( and must break the cluster)
-                    if( $q1 !=  $q2 ) {
-                        // If we cross a quadrant boundary we normally start a
-                        // new cluster. However we need to take the 12'a clock
-                        // and 6'a clock positions into a special consideration.
-                        // Case 1: WE go from q=1 to q=2 if the last slice on
-                        // the cluster for q=1 is close to 12'a clock and the
-                        // first slice in q=0 is small we extend the previous
-                        // cluster
-                        if( $q1 == 1 && $q2 == 0 && $a2 > (90-15)*M_PI/180 ) {
-                            if( $i < $n-2 ) {
-                                $a3 = $this->la[$i+2];
-                                // If there isn't a cluster coming up with the next-next slice
-                                // we extend the previous cluster to cover this slice as well
-                                if( abs($a3-$a2) >= $tresh_hold ) {
-                                    $clusters[$cidx][1]++;
-                                    $i++;
-                                }
-                            }
-                        }
-                        elseif( $q1 == 3 && $q2 == 2 && $a2 > (270-15)*M_PI/180 ) {
-                            if( $i < $n-2 ) {
-                                $a3 = $this->la[$i+2];
-                                // If there isn't a cluster coming up with the next-next slice
-                                // we extend the previous cluster to cover this slice as well
-                                if( abs($a3-$a2) >= $tresh_hold ) {
-                                    $clusters[$cidx][1]++;
-                                    $i++;
-                                }
-                            }
-                        }
-
-                        if( $q1==2 && $q2==1 && $a2 > (180-15)*M_PI/180 ) {
-                            $clusters[$cidx][1]++;
-                            $i++;
-                        }
-
-                        $incluster = false;
-                    }
-                }
-                elseif( $q1 == $q2)  {
-                    $incluster = true;
-                    // Now we have a special case for quadrant 0. If we previously
-                    // have a cluster of one in quadrant 0 we just extend that
-                    // cluster. If we don't do this then we risk that the label
-                    // for the cluster of one will cross the guide-line
-                    if( $q1 == 0 && $cidx > -1 &&
-                    $clusters[$cidx][1] == 1 &&
-                    $this->Quadrant($this->la[$clusters[$cidx][0]]) == 0 ) {
-                        $clusters[$cidx][1]++;
-                    }
-                    else {
-                        $cidx++;
-                        $clusters[$cidx][0] = $i;
-                        $clusters[$cidx][1] = 1;
-                    }
-                }
-                else {
-                    // Create a "cluster" of one since we are just crossing
-                    // a quadrant
-                    $cidx++;
-                    $clusters[$cidx][0] = $i;
-                    $clusters[$cidx][1] = 1;
-                }
-            }
-            else {
-                if( $incluster ) {
-                    // Add the last slice
-                    $clusters[$cidx][1]++;
-                    $incluster = false;
-                }
-                else { // Create a "cluster" of one
-                    $cidx++;
-                    $clusters[$cidx][0] = $i;
-                    $clusters[$cidx][1] = 1;
-                }
-            }
-        }
-        // Handle the very last slice
-        if( $incluster ) {
-            $clusters[$cidx][1]++;
-        }
-        else { // Create a "cluster" of one
-            $cidx++;
-            $clusters[$cidx][0] = $i;
-            $clusters[$cidx][1] = 1;
-        }
-
-        /*
-         if( true ) {
-         // Debug printout in labels
-         for( $i=0; $i <= $cidx; ++$i ) {
-         for( $j=0; $j < $clusters[$i][1]; ++$j ) {
-         $a = $this->la[$clusters[$i][0]+$j];
-         $aa = round($a*180/M_PI);
-         $q = $this->Quadrant($a);
-         $this->labels[$clusters[$i][0]+$j]="[$q:$aa] $i:$j";
-         }
-         }
-         }
-         */
-
-        //-----------------------------------------------------------------------
-        // Step 2 of the algorithm is use the clusters and draw the labels
-        // and guidelines
-        //-----------------------------------------------------------------------
-
-        // We use the font height as the base factor for how far we need to
-        // spread the labels in the Y-direction.
-        $this->value->ApplyFont($img);
-        $fh = $img->GetFontHeight();
-        $origvstep=$fh*$this->iGuideVFactor;
-        $this->value->SetMargin(0);
-
-        // Number of clusters found
-        $nc = count($clusters);
-
-        // Walk through all the clusters
-        for($i=0; $i < $nc; ++$i) {
-
-            // Start angle and number of slices in this cluster
-            $csize = $clusters[$i][1];
-            $a = $this->la[$clusters[$i][0]];
-            $q = $this->Quadrant($a);
-
-            // Now set up the start and end conditions to make sure that
-            // in each cluster we walk through the all the slices starting with the slice
-            // closest to the equator. Since all slices are numbered clockwise from "3'a clock"
-            // we have different conditions depending on in which quadrant the slice lies within.
-            if( $q == 0 ) {
-                $start = $csize-1; $idx = $start; $step = -1; $vstep = -$origvstep;
-            }
-            elseif( $q == 1 ) {
-                $start = 0; $idx = $start; $step = 1; $vstep = -$origvstep;
-            }
-            elseif( $q == 2 ) {
-                $start = $csize-1; $idx = $start; $step = -1; $vstep = $origvstep;
-            }
-            elseif( $q == 3 ) {
-                $start = 0; $idx = $start; $step = 1; $vstep = $origvstep;
-            }
-
-            // Walk through all slices within this cluster
-            for($j=0; $j < $csize; ++$j) {
-                // Now adjust the position of the labels in each cluster starting
-                // with the slice that is closest to the equator of the pie
-                $a = $this->la[$clusters[$i][0]+$idx];
-
-                // Guide line start in the center of the arc of the slice
-                $r = $radius+$this->explode_radius[$n-1-($clusters[$i][0]+$idx)];
-                $x = round($r*cos($a)+$xc);
-                $y = round($yc-$r*sin($a));
-
-                // The distance from the arc depends on chosen font and the "R-Factor"
-                $r += $fh*$this->iGuideLineRFactor;
-
-                // Should the labels be placed curved along the pie or in straight columns
-                // outside the pie?
-                if( $this->iGuideLineCurve )
-                $xt=round($r*cos($a)+$xc);
-
-                // If this is the first slice in the cluster we need some first time
-                // proessing
-                if( $idx == $start ) {
-                    if( ! $this->iGuideLineCurve )
-                    $xt=round($r*cos($a)+$xc);
-                    $yt=round($yc-$r*sin($a));
-
-                    // Some special consideration in case this cluster starts
-                    // in quadrant 1 or 3 very close to the "equator" (< 20 degrees)
-                    // and the previous clusters last slice is within the tolerance.
-                    // In that case we add a font height to this labels Y-position
-                    // so it doesn't collide with
-                    // the slice in the previous cluster
-                    $prevcluster = ($i + ($nc-1) ) % $nc;
-                    $previdx=$clusters[$prevcluster][0]+$clusters[$prevcluster][1]-1;
-                    if( $q == 1 && $a > 160*M_PI/180 ) {
-                        // Get the angle for the previous clusters last slice
-                        $diff = abs($a-$this->la[$previdx]);
-                        if( $diff < $tresh_hold ) {
-                            $yt -= $fh;
-                        }
-                    }
-                    elseif( $q == 3 && $a > 340*M_PI/180 ) {
-                        // We need to subtract 360 to compare angle distance between
-                        // q=0 and q=3
-                        $diff = abs($a-$this->la[$previdx]-360*M_PI/180);
-                        if( $diff < $tresh_hold ) {
-                            $yt += $fh;
-                        }
-                    }
-
-                }
-                else {
-                    // The step is at minimum $vstep but if the slices are relatively large
-                    // we make sure that we add at least a step that corresponds to the vertical
-                    // distance between the centers at the arc on the slice
-                    $prev_a = $this->la[$clusters[$i][0]+($idx-$step)];
-                    $dy = abs($radius*(sin($a)-sin($prev_a))*1.2);
-                    if( $vstep > 0 )
-                    $yt += max($vstep,$dy);
-                    else
-                    $yt += min($vstep,-$dy);
-                }
-
-                $label = $this->labels[$clusters[$i][0]+$idx];
-
-                if( $csize == 1 ) {
-                    // A "meta" cluster with only one slice
-                    $r = $radius+$this->explode_radius[$n-1-($clusters[$i][0]+$idx)];
-                    $rr = $r+$img->GetFontHeight()/2;
-                    $xt=round($rr*cos($a)+$xc);
-                    $yt=round($yc-$rr*sin($a));
-                    $this->StrokeLabel($label,$img,$xc,$yc,$a,$r);
-                    if( $this->iShowGuideLineForSingle )
-                    $this->guideline->Stroke($img,$x,$y,$xt,$yt);
-                }
-                else {
-                    $this->guideline->Stroke($img,$x,$y,$xt,$yt);
-                    if( $q==1 || $q==2 ) {
-                        // Left side of Pie
-                        $this->guideline->Stroke($img,$xt,$yt,$xt-$this->guidelinemargin,$yt);
-                        $lbladj = -$this->guidelinemargin-5;
-                        $this->value->halign = "right";
-                        $this->value->valign = "center";
-                    }
-                    else {
-                        // Right side of pie
-                        $this->guideline->Stroke($img,$xt,$yt,$xt+$this->guidelinemargin,$yt);
-                        $lbladj = $this->guidelinemargin+5;
-                        $this->value->halign = "left";
-                        $this->value->valign = "center";
-                    }
-                    $this->value->Stroke($img,$label,$xt+$lbladj,$yt);
-                }
-
-                // Udate idx to point to next slice in the cluster to process
-                $idx += $step;
-            }
-        }
-    }
-
-    function StrokeAllLabels($img,$xc,$yc,$radius) {
-        // First normalize all angles for labels
-        $n = count($this->la);
-        for($i=0; $i < $n; ++$i) {
-            $this->la[$i] = $this->NormAngle($this->la[$i]);
-        }
-        if( $this->guideline->iShow ) {
-            $this->StrokeGuideLabels($img,$xc,$yc,$radius);
-        }
-        else {
-            $n = count($this->labels);
-            for($i=0; $i < $n; ++$i) {
-                $this->StrokeLabel($this->labels[$i],$img,$xc,$yc,
-                $this->la[$i],
-                $radius + $this->explode_radius[$n-1-$i]);
-            }
-        }
-    }
-
-    // Position the labels of each slice
-    function StrokeLabel($label,$img,$xc,$yc,$a,$r) {
-
-        // Default value
-        if( $this->ilabelposadj === 'auto' )
-        $this->ilabelposadj = 0.65;
-
-        // We position the values diferently depending on if they are inside
-        // or outside the pie
-        if( $this->ilabelposadj < 1.0 ) {
-
-            $this->value->SetAlign('center','center');
-            $this->value->margin = 0;
-
-            $xt=round($this->ilabelposadj*$r*cos($a)+$xc);
-            $yt=round($yc-$this->ilabelposadj*$r*sin($a));
-
-            $this->value->Stroke($img,$label,$xt,$yt);
-        }
-        else {
-
-            $this->value->halign = "left";
-            $this->value->valign = "top";
-            $this->value->margin = 0;
-
-            // Position the axis title.
-            // dx, dy is the offset from the top left corner of the bounding box that sorrounds the text
-            // that intersects with the extension of the corresponding axis. The code looks a little
-            // bit messy but this is really the only way of having a reasonable position of the
-            // axis titles.
-            $this->value->ApplyFont($img);
-            $h=$img->GetTextHeight($label);
-            // For numeric values the format of the display value
-            // must be taken into account
-            if( is_numeric($label) ) {
-                if( $label > 0 )
-                $w=$img->GetTextWidth(sprintf($this->value->format,$label));
-                else
-                $w=$img->GetTextWidth(sprintf($this->value->negformat,$label));
-            }
-            else
-            $w=$img->GetTextWidth($label);
-
-            if( $this->ilabelposadj > 1.0 && $this->ilabelposadj < 5.0) {
-                $r *= $this->ilabelposadj;
-            }
-
-            $r += $img->GetFontHeight()/1.5;
-
-            $xt=round($r*cos($a)+$xc);
-            $yt=round($yc-$r*sin($a));
-
-            // Normalize angle
-            while( $a < 0 ) $a += 2*M_PI;
-            while( $a > 2*M_PI ) $a -= 2*M_PI;
-
-            if( $a>=7*M_PI/4 || $a <= M_PI/4 ) $dx=0;
-            if( $a>=M_PI/4 && $a <= 3*M_PI/4 ) $dx=($a-M_PI/4)*2/M_PI;
-            if( $a>=3*M_PI/4 && $a <= 5*M_PI/4 ) $dx=1;
-            if( $a>=5*M_PI/4 && $a <= 7*M_PI/4 ) $dx=(1-($a-M_PI*5/4)*2/M_PI);
-
-            if( $a>=7*M_PI/4 ) $dy=(($a-M_PI)-3*M_PI/4)*2/M_PI;
-            if( $a<=M_PI/4 ) $dy=(1-$a*2/M_PI);
-            if( $a>=M_PI/4 && $a <= 3*M_PI/4 ) $dy=1;
-            if( $a>=3*M_PI/4 && $a <= 5*M_PI/4 ) $dy=(1-($a-3*M_PI/4)*2/M_PI);
-            if( $a>=5*M_PI/4 && $a <= 7*M_PI/4 ) $dy=0;
-
-            $this->value->Stroke($img,$label,$xt-$dx*$w,$yt-$dy*$h);
-        }
-    }
-
-    function UsePlotThemeColors($flag = true) {
-        $this->use_plot_theme_colors = $flag;
-    }
-} // Class
-
-
-//===================================================
-// CLASS PiePlotC
-// Description: Same as a normal pie plot but with a
-// filled circle in the center
-//===================================================
-class PiePlotC extends PiePlot {
-    private $imidsize=0.5;  // Fraction of total width
-    private $imidcolor='white';
-    public $midtitle='';
-    private $middlecsimtarget='',$middlecsimwintarget='',$middlecsimalt='';
-
-    function __construct($data,$aCenterTitle='') {
-        parent::__construct($data);
-        $this->midtitle = new Text();
-        $this->midtitle->ParagraphAlign('center');
-    }
-
-    function SetMid($aTitle,$aColor='white',$aSize=0.5) {
-        $this->midtitle->Set($aTitle);
-
-        $this->imidsize = $aSize ;
-        $this->imidcolor = $aColor ;
-    }
-
-    function SetMidTitle($aTitle) {
-        $this->midtitle->Set($aTitle);
-    }
-
-    function SetMidSize($aSize) {
-        $this->imidsize = $aSize ;
-    }
-
-    function SetMidColor($aColor) {
-        $this->imidcolor = $aColor ;
-    }
-
-    function SetMidCSIM($aTarget,$aAlt='',$aWinTarget='') {
-        $this->middlecsimtarget = $aTarget;
-        $this->middlecsimwintarget = $aWinTarget;
-        $this->middlecsimalt = $aAlt;
-    }
-
-    function AddSliceToCSIM($i,$xc,$yc,$radius,$sa,$ea) {
-        //Slice number, ellipse centre (x,y), radius, start angle, end angle
-        while( $sa > 2*M_PI ) $sa = $sa - 2*M_PI;
-        while( $ea > 2*M_PI ) $ea = $ea - 2*M_PI;
-
-        $sa = 2*M_PI - $sa;
-        $ea = 2*M_PI - $ea;
-
-        // Special case when we have only one slice since then both start and end
-        // angle will be == 0
-        if( abs($sa - $ea) < 0.0001 ) {
-            $sa=2*M_PI; $ea=0;
-        }
-
-        // Add inner circle first point
-        $xp = floor(($this->imidsize*$radius*cos($ea))+$xc);
-        $yp = floor($yc-($this->imidsize*$radius*sin($ea)));
-        $coords = "$xp, $yp";
-
-        //add coordinates every 0.25 radians
-        $a=$ea+0.25;
-
-        // If we cross the 360-limit with a slice we need to handle
-        // the fact that end angle is smaller than start
-        if( $sa < $ea ) {
-            while ($a <= 2*M_PI) {
-                $xp = floor($radius*cos($a)+$xc);
-                $yp = floor($yc-$radius*sin($a));
-                $coords.= ", $xp, $yp";
-                $a += 0.25;
-            }
-            $a -= 2*M_PI;
-        }
-
-        while ($a < $sa) {
-            $xp = floor(($this->imidsize*$radius*cos($a)+$xc));
-            $yp = floor($yc-($this->imidsize*$radius*sin($a)));
-            $coords.= ", $xp, $yp";
-            $a += 0.25;
-        }
-
-        // Make sure we end at the last point
-        $xp = floor(($this->imidsize*$radius*cos($sa)+$xc));
-        $yp = floor($yc-($this->imidsize*$radius*sin($sa)));
-        $coords.= ", $xp, $yp";
-
-        // Straight line to outer circle
-        $xp = floor($radius*cos($sa)+$xc);
-        $yp = floor($yc-$radius*sin($sa));
-        $coords.= ", $xp, $yp";
-
-        //add coordinates every 0.25 radians
-        $a=$sa - 0.25;
-        while ($a > $ea) {
-            $xp = floor($radius*cos($a)+$xc);
-            $yp = floor($yc-$radius*sin($a));
-            $coords.= ", $xp, $yp";
-            $a -= 0.25;
-        }
-
-        //Add the last point on the arc
-        $xp = floor($radius*cos($ea)+$xc);
-        $yp = floor($yc-$radius*sin($ea));
-        $coords.= ", $xp, $yp";
-
-        // Close the arc
-        $xp = floor(($this->imidsize*$radius*cos($ea))+$xc);
-        $yp = floor($yc-($this->imidsize*$radius*sin($ea)));
-        $coords .= ", $xp, $yp";
-
-        if( !empty($this->csimtargets[$i]) ) {
-            $this->csimareas .= "<area shape=\"poly\" coords=\"$coords\" href=\"".
-            $this->csimtargets[$i]."\"";
-            if( !empty($this->csimwintargets[$i]) ) {
-                $this->csimareas .= " target=\"".$this->csimwintargets[$i]."\" ";
-            }
-            if( !empty($this->csimalts[$i]) ) {
-                $tmp=sprintf($this->csimalts[$i],$this->data[$i]);
-                $this->csimareas .= " title=\"$tmp\"  alt=\"$tmp\" ";
-            }
-            $this->csimareas .= " />\n";
-        }
-    }
-
-
-    function Stroke($img,$aaoption=0) {
-
-        // Stroke the pie but don't stroke values
-        $tmp =  $this->value->show;
-        $this->value->show = false;
-        parent::Stroke($img,$aaoption);
-        $this->value->show = $tmp;
-
-        $xc = round($this->posx*$img->width);
-        $yc = round($this->posy*$img->height);
-
-        $radius = floor($this->radius * min($img->width,$img->height)) ;
-
-
-        if( $this->imidsize > 0 && $aaoption !== 2 ) {
-
-            if( $this->ishadowcolor != "" ) {
-                $img->SetColor($this->ishadowcolor);
-                $img->FilledCircle($xc+$this->ishadowdrop,$yc+$this->ishadowdrop,
-                round($radius*$this->imidsize));
-            }
-
-            $img->SetColor($this->imidcolor);
-            $img->FilledCircle($xc,$yc,round($radius*$this->imidsize));
-
-            if(  $this->pie_border && $aaoption === 0 ) {
-                $img->SetColor($this->color);
-                $img->Circle($xc,$yc,round($radius*$this->imidsize));
-            }
-
-            if( !empty($this->middlecsimtarget) )
-            $this->AddMiddleCSIM($xc,$yc,round($radius*$this->imidsize));
-
-        }
-
-        if( $this->value->show && $aaoption !== 1) {
-            $this->StrokeAllLabels($img,$xc,$yc,$radius);
-            $this->midtitle->SetPos($xc,$yc,'center','center');
-            $this->midtitle->Stroke($img);
-        }
-
-    }
-
-    function AddMiddleCSIM($xc,$yc,$r) {
-        $xc=round($xc);$yc=round($yc);$r=round($r);
-        $this->csimareas .= "<area shape=\"circle\" coords=\"$xc,$yc,$r\" href=\"".
-        $this->middlecsimtarget."\"";
-        if( !empty($this->middlecsimwintarget) ) {
-            $this->csimareas .= " target=\"".$this->middlecsimwintarget."\"";
-        }
-        if( !empty($this->middlecsimalt) ) {
-            $tmp = $this->middlecsimalt;
-            $this->csimareas .= " title=\"$tmp\" alt=\"$tmp\" ";
-        }
-        $this->csimareas .= " />\n";
-    }
-
-    function StrokeLabel($label,$img,$xc,$yc,$a,$r) {
-
-        if( $this->ilabelposadj === 'auto' )
-        $this->ilabelposadj = (1-$this->imidsize)/2+$this->imidsize;
-
-        parent::StrokeLabel($label,$img,$xc,$yc,$a,$r);
-
-    }
-
-}
-
-
-//===================================================
-// CLASS PieGraph
-// Description:
-//===================================================
-class PieGraph extends Graph {
-    private $posx, $posy, $radius;
-    private $legends=array();
-    public $plots=array();
-    public $pieaa = false ;
-    //---------------
-    // CONSTRUCTOR
-    function __construct($width=300,$height=200,$cachedName="",$timeout=0,$inline=1) {
-        parent::__construct($width,$height,$cachedName,$timeout,$inline);
-        $this->posx=$width/2;
-        $this->posy=$height/2;
-        $this->SetColor(array(255,255,255));
-
-        if ($this->graph_theme) {
-          $this->graph_theme->ApplyGraph($this);
-        }
-    }
-
-    //---------------
-    // PUBLIC METHODS
-    function Add($aObj) {
-
-        if( is_array($aObj) && count($aObj) > 0 )
-        $cl = $aObj[0];
-        else
-        $cl = $aObj;
-
-        if( $cl instanceof Text )
-        $this->AddText($aObj);
-        elseif( class_exists('IconPlot',false) && ($cl instanceof IconPlot) )
-        $this->AddIcon($aObj);
-        else {
-            if( is_array($aObj) ) {
-                $n = count($aObj);
-                for($i=0; $i < $n; ++$i ) {
-                    //if ($aObj[$i]->theme) {
-                    //    $this->ClearTheme();
-                    //}
-                    $this->plots[] = $aObj[$i];
-                }
-            }
-            else {
-                //if ($aObj->theme) {
-                //    $this->ClearTheme();
-                //}
-                $this->plots[] = $aObj;
-            }
-        }
-
-        if ($this->graph_theme) {
-            $this->graph_theme->SetupPlot($aObj);
-            if ($aObj->is_using_plot_theme) {
-                $aObj->UsePlotThemeColors();
-            }
-        }
-    }
-
-    function SetAntiAliasing($aFlg=true) {
-        $this->pieaa = $aFlg;
-    }
-
-    function SetColor($c) {
-        $this->SetMarginColor($c);
-    }
-
-
-    function DisplayCSIMAreas() {
-        $csim="";
-        foreach($this->plots as $p ) {
-            $csim .= $p->GetCSIMareas();
-        }
-        
-        $csim.= $this->legend->GetCSIMareas();
-        if (preg_match_all("/area shape=\"(\w+)\" coords=\"([0-9\, ]+)\"/", $csim, $coords)) {
-            $this->img->SetColor($this->csimcolor);
-            $n = count($coords[0]);
-            for ($i=0; $i < $n; $i++) {
-                if ($coords[1][$i]=="poly") {
-                    preg_match_all('/\s*([0-9]+)\s*,\s*([0-9]+)\s*,*/',$coords[2][$i],$pts);
-                    $this->img->SetStartPoint($pts[1][count($pts[0])-1],$pts[2][count($pts[0])-1]);
-                    $m = count($pts[0]);
-                    for ($j=0; $j < $m; $j++) {
-                        $this->img->LineTo($pts[1][$j],$pts[2][$j]);
-                    }
-                } else if ($coords[1][$i]=="rect") {
-                    $pts = preg_split('/,/', $coords[2][$i]);
-                    $this->img->SetStartPoint($pts[0],$pts[1]);
-                    $this->img->LineTo($pts[2],$pts[1]);
-                    $this->img->LineTo($pts[2],$pts[3]);
-                    $this->img->LineTo($pts[0],$pts[3]);
-                    $this->img->LineTo($pts[0],$pts[1]);
-
-                }
-            }
-        }
-    }
-
-    // Method description
-    function Stroke($aStrokeFileName="") {
-
-        // If the filename is the predefined value = '_csim_special_'
-        // we assume that the call to stroke only needs to do enough
-        // to correctly generate the CSIM maps.
-        // We use this variable to skip things we don't strictly need
-        // to do to generate the image map to improve performance
-        // a best we can. Therefor you will see a lot of tests !$_csim in the
-        // code below.
-        $_csim = ($aStrokeFileName===_CSIM_SPECIALFILE);
-
-        // If we are called the second time (perhaps the user has called GetHTMLImageMap()
-        // himself then the legends have alsready been populated once in order to get the
-        // CSIM coordinats. Since we do not want the legends to be populated a second time
-        // we clear the legends
-        $this->legend->Clear();
-
-        // We need to know if we have stroked the plot in the
-        // GetCSIMareas. Otherwise the CSIM hasn't been generated
-        // and in the case of GetCSIM called before stroke to generate
-        // CSIM without storing an image to disk GetCSIM must call Stroke.
-        $this->iHasStroked = true;
-
-        $n = count($this->plots);
-
-        if( $this->pieaa ) {
-
-            if( !$_csim ) {
-                if( $this->background_image != "" ) {
-                    $this->StrokeFrameBackground();
-                }
-                else {
-                    $this->StrokeFrame();
-                    $this->StrokeBackgroundGrad();
-                }
-            }
-
-
-            $w = $this->img->width;
-            $h = $this->img->height;
-            $oldimg = $this->img->img;
-
-            $this->img->CreateImgCanvas(2*$w,2*$h);
-
-            $this->img->SetColor( $this->margin_color );
-            $this->img->FilledRectangle(0,0,2*$w-1,2*$h-1);
-
-            // Make all icons *2 i size since we will be scaling down the
-            // imahe to do the anti aliasing
-            $ni = count($this->iIcons);
-            for($i=0; $i < $ni; ++$i) {
-                $this->iIcons[$i]->iScale *= 2 ;
-                if( $this->iIcons[$i]->iX > 1 )
-                $this->iIcons[$i]->iX *= 2 ;
-                if( $this->iIcons[$i]->iY > 1 )
-                $this->iIcons[$i]->iY *= 2 ;
-            }
-
-            $this->StrokeIcons();
-
-            for($i=0; $i < $n; ++$i) {
-                if( $this->plots[$i]->posx > 1 )
-                $this->plots[$i]->posx *= 2 ;
-                if( $this->plots[$i]->posy > 1 )
-                $this->plots[$i]->posy *= 2 ;
-
-                $this->plots[$i]->Stroke($this->img,1);
-
-                if( $this->plots[$i]->posx > 1 )
-                $this->plots[$i]->posx /= 2 ;
-                if( $this->plots[$i]->posy > 1 )
-                $this->plots[$i]->posy /= 2 ;
-            }
-
-            $indent = $this->doframe ? ($this->frame_weight + ($this->doshadow ? $this->shadow_width : 0 )) : 0 ;
-            $indent += $this->framebevel ? $this->framebeveldepth + 1 : 0 ;
-            $this->img->CopyCanvasH($oldimg,$this->img->img,$indent,$indent,$indent,$indent,
-            $w-2*$indent,$h-2*$indent,2*($w-$indent),2*($h-$indent));
-
-            $this->img->img = $oldimg ;
-            $this->img->width = $w ;
-            $this->img->height = $h ;
-
-            for($i=0; $i < $n; ++$i) {
-                $this->plots[$i]->Stroke($this->img,2); // Stroke labels
-                $this->plots[$i]->Legend($this);
-            }
-
-        }
-        else {
-
-            if( !$_csim ) {
-                if( $this->background_image != "" ) {
-                    $this->StrokeFrameBackground();
-                }
-                else {
-                    $this->StrokeFrame();
-                    $this->StrokeBackgroundGrad();
-                }
-            }
-
-            $this->StrokeIcons();
-
-            for($i=0; $i < $n; ++$i) {
-                $this->plots[$i]->Stroke($this->img);
-                $this->plots[$i]->Legend($this);
-            }
-        }
-
-        $this->legend->Stroke($this->img);
-        $this->footer->Stroke($this->img);
-        $this->StrokeTitles();
-
-        if( !$_csim ) {
-
-            // Stroke texts
-            if( $this->texts != null ) {
-                $n = count($this->texts);
-                for($i=0; $i < $n; ++$i ) {
-                    $this->texts[$i]->Stroke($this->img);
-                }
-            }
-
-            if( _JPG_DEBUG ) {
-                $this->DisplayCSIMAreas();
-            }
-
-            // Should we do any final image transformation
-            if( $this->iImgTrans ) {
-                if( !class_exists('ImgTrans',false) ) {
-                    require_once('jpgraph_imgtrans.php');
-                    //JpGraphError::Raise('In order to use image transformation you must include the file jpgraph_imgtrans.php in your script.');
-                }
-
-                $tform = new ImgTrans($this->img->img);
-                $this->img->img = $tform->Skew3D($this->iImgTransHorizon,$this->iImgTransSkewDist,
-                $this->iImgTransDirection,$this->iImgTransHighQ,
-                $this->iImgTransMinSize,$this->iImgTransFillColor,
-                $this->iImgTransBorder);
-            }
-
-
-            // If the filename is given as the special "__handle"
-            // then the image handler is returned and the image is NOT
-            // streamed back
-            if( $aStrokeFileName == _IMG_HANDLER ) {
-                return $this->img->img;
-            }
-            else {
-                // Finally stream the generated picture
-                $this->cache->PutAndStream($this->img,$this->cache_name,$this->inline,
-                $aStrokeFileName);
-            }
-        }
-    }
-} // Class
-
-/* EOF */
-?>
diff --git a/#jpgraph/src/jpgraph_pie3d.php b/#jpgraph/src/jpgraph_pie3d.php
deleted file mode 100644
index 52b8631e..00000000
--- a/#jpgraph/src/jpgraph_pie3d.php
+++ /dev/null
@@ -1,933 +0,0 @@
-<?php
-/*=======================================================================
- // File:        JPGRAPH_PIE3D.PHP
- // Description: 3D Pie plot extension for JpGraph
- // Created:     2001-03-24
- // Ver:         $Id: jpgraph_pie3d.php 1329 2009-06-20 19:23:30Z ljp $
- //
- // Copyright (c) Asial Corporation. All rights reserved.
- //========================================================================
- */
-
-//===================================================
-// CLASS PiePlot3D
-// Description: Plots a 3D pie with a specified projection
-// angle between 20 and 70 degrees.
-//===================================================
-class PiePlot3D extends PiePlot {
-    private $labelhintcolor="red",$showlabelhint=true;
-    private $angle=50;
-    private $edgecolor="", $edgeweight=1;
-    private $iThickness=false;
-
-    //---------------
-    // CONSTRUCTOR
-    function __construct($data) {
-        $this->radius = 0.5;
-        $this->data = $data;
-        $this->title = new Text("");
-        $this->title->SetFont(FF_FONT1,FS_BOLD);
-        $this->value = new DisplayValue();
-        $this->value->Show();
-        $this->value->SetFormat('%.0f%%');
-    }
-
-    //---------------
-    // PUBLIC METHODS
-
-    // Set label arrays
-    function SetLegends($aLegend) {
-        $this->legends = array_reverse(array_slice($aLegend,0,count($this->data)));
-    }
-
-    function SetSliceColors($aColors) {
-        $this->setslicecolors = $aColors;
-    }
-
-    function Legend($aGraph) {
-        parent::Legend($aGraph);
-        $aGraph->legend->txtcol = array_reverse($aGraph->legend->txtcol);
-    }
-
-    function SetCSIMTargets($aTargets,$aAlts='',$aWinTargets='') {
-        $this->csimtargets = $aTargets;
-        $this->csimwintargets = $aWinTargets;
-        $this->csimalts = $aAlts;
-    }
-
-    // Should the slices be separated by a line? If color is specified as "" no line
-    // will be used to separate pie slices.
-    function SetEdge($aColor='black',$aWeight=1) {
-        $this->edgecolor = $aColor;
-        $this->edgeweight = $aWeight;
-    }
-
-    // Specify projection angle for 3D in degrees
-    // Must be between 20 and 70 degrees
-    function SetAngle($a) {
-        if( $a<5 || $a>90 ) {
-            JpGraphError::RaiseL(14002);
-            //("PiePlot3D::SetAngle() 3D Pie projection angle must be between 5 and 85 degrees.");
-        }
-        else {
-            $this->angle = $a;
-        }
-    }
-
-    function Add3DSliceToCSIM($i,$xc,$yc,$height,$width,$thick,$sa,$ea) {  //Slice number, ellipse centre (x,y), height, width, start angle, end angle
-
-        $sa *= M_PI/180;
-        $ea *= M_PI/180;
-
-        //add coordinates of the centre to the map
-        $coords = "$xc, $yc";
-
-        //add coordinates of the first point on the arc to the map
-        $xp = floor($width*cos($sa)/2+$xc);
-        $yp = floor($yc-$height*sin($sa)/2);
-        $coords.= ", $xp, $yp";
-
-        //If on the front half, add the thickness offset
-        if ($sa >= M_PI && $sa <= 2*M_PI*1.01) {
-            $yp = floor($yp+$thick);
-            $coords.= ", $xp, $yp";
-        }
-
-        //add coordinates every 0.2 radians
-        $a=$sa+0.2;
-        while ($a<$ea) {
-            $xp = floor($width*cos($a)/2+$xc);
-            if ($a >= M_PI && $a <= 2*M_PI*1.01) {
-                $yp = floor($yc-($height*sin($a)/2)+$thick);
-            } else {
-                $yp = floor($yc-$height*sin($a)/2);
-            }
-            $coords.= ", $xp, $yp";
-            $a += 0.2;
-        }
-
-        //Add the last point on the arc
-        $xp = floor($width*cos($ea)/2+$xc);
-        $yp = floor($yc-$height*sin($ea)/2);
-
-
-        if ($ea >= M_PI && $ea <= 2*M_PI*1.01) {
-            $coords.= ", $xp, ".floor($yp+$thick);
-        }
-        $coords.= ", $xp, $yp";
-        $alt='';
-
-        if( !empty($this->csimtargets[$i]) ) {
-            $this->csimareas .= "<area shape=\"poly\" coords=\"$coords\" href=\"".$this->csimtargets[$i]."\"";
-
-            if( !empty($this->csimwintargets[$i]) ) {
-                $this->csimareas .= " target=\"".$this->csimwintargets[$i]."\" ";
-            }
-             
-            if( !empty($this->csimalts[$i]) ) {
-                $tmp=sprintf($this->csimalts[$i],$this->data[$i]);
-                $this->csimareas .= "alt=\"$tmp\" title=\"$tmp\" ";
-            }
-            $this->csimareas .=  " />\n";
-        }
-
-    }
-
-    function SetLabels($aLabels,$aLblPosAdj="auto") {
-        $this->labels = $aLabels;
-        $this->ilabelposadj=$aLblPosAdj;
-    }
-
-
-    // Distance from the pie to the labels
-    function SetLabelMargin($m) {
-        $this->value->SetMargin($m);
-    }
-
-    // Show a thin line from the pie to the label for a specific slice
-    function ShowLabelHint($f=true) {
-        $this->showlabelhint=$f;
-    }
-
-    // Set color of hint line to label for each slice
-    function SetLabelHintColor($c) {
-        $this->labelhintcolor=$c;
-    }
-
-    function SetHeight($aHeight) {
-        $this->iThickness = $aHeight;
-    }
-
-
-    // Normalize Angle between 0-360
-    function NormAngle($a) {
-        // Normalize anle to 0 to 2M_PI
-        //
-        if( $a > 0 ) {
-            while($a > 360) $a -= 360;
-        }
-        else {
-            while($a < 0) $a += 360;
-        }
-        if( $a < 0 )
-        $a = 360 + $a;
-
-        if( $a == 360 ) $a=0;
-        return $a;
-    }
-
-
-
-    // Draw one 3D pie slice at position ($xc,$yc) with height $z
-    function Pie3DSlice($img,$xc,$yc,$w,$h,$sa,$ea,$z,$fillcolor,$shadow=0.65) {
-
-        // Due to the way the 3D Pie algorithm works we are
-        // guaranteed that any slice we get into this method
-        // belongs to either the left or right side of the
-        // pie ellipse. Hence, no slice will cross 90 or 270
-        // point.
-        if( ($sa < 90 && $ea > 90) || ( ($sa > 90 && $sa < 270) && $ea > 270) ) {
-            JpGraphError::RaiseL(14003);//('Internal assertion failed. Pie3D::Pie3DSlice');
-            exit(1);
-        }
-
-        $p[] = array();
-
-        // Setup pre-calculated values
-        $rsa = $sa/180*M_PI; // to Rad
-        $rea = $ea/180*M_PI; // to Rad
-        $sinsa = sin($rsa);
-        $cossa = cos($rsa);
-        $sinea = sin($rea);
-        $cosea = cos($rea);
-
-        // p[] is the points for the overall slice and
-        // pt[] is the points for the top pie
-
-        // Angular step when approximating the arc with a polygon train.
-        $step = 0.05;
-
-        if( $sa >= 270 ) {
-            if( $ea > 360 || ($ea > 0 && $ea <= 90) ) {
-                if( $ea > 0 && $ea <= 90 ) {
-                    // Adjust angle to simplify conditions in loops
-                    $rea += 2*M_PI;
-                }
-
-                $p = array($xc,$yc,$xc,$yc+$z,
-                $xc+$w*$cossa,$z+$yc-$h*$sinsa);
-                $pt = array($xc,$yc,$xc+$w*$cossa,$yc-$h*$sinsa);
-
-                for( $a=$rsa; $a < 2*M_PI; $a += $step ) {
-                    $tca = cos($a);
-                    $tsa = sin($a);
-                    $p[] = $xc+$w*$tca;
-                    $p[] = $z+$yc-$h*$tsa;
-                    $pt[] = $xc+$w*$tca;
-                    $pt[] = $yc-$h*$tsa;
-                }
-
-                $pt[] = $xc+$w;
-                $pt[] = $yc;
-
-                $p[] = $xc+$w;
-                $p[] = $z+$yc;
-                $p[] = $xc+$w;
-                $p[] = $yc;
-                $p[] = $xc;
-                $p[] = $yc;
-
-                for( $a=2*M_PI+$step; $a < $rea; $a += $step ) {
-                    $pt[] = $xc + $w*cos($a);
-                    $pt[] = $yc - $h*sin($a);
-                }
-
-                $pt[] = $xc+$w*$cosea;
-                $pt[] = $yc-$h*$sinea;
-                $pt[] = $xc;
-                $pt[] = $yc;
-
-            }
-            else {
-                $p = array($xc,$yc,$xc,$yc+$z,
-                $xc+$w*$cossa,$z+$yc-$h*$sinsa);
-                $pt = array($xc,$yc,$xc+$w*$cossa,$yc-$h*$sinsa);
-
-                $rea = $rea == 0.0 ? 2*M_PI : $rea;
-                for( $a=$rsa; $a < $rea; $a += $step ) {
-                    $tca = cos($a);
-                    $tsa = sin($a);
-                    $p[] = $xc+$w*$tca;
-                    $p[] = $z+$yc-$h*$tsa;
-                    $pt[] = $xc+$w*$tca;
-                    $pt[] = $yc-$h*$tsa;
-                }
-
-                $pt[] = $xc+$w*$cosea;
-                $pt[] = $yc-$h*$sinea;
-                $pt[] = $xc;
-                $pt[] = $yc;
-
-                $p[] = $xc+$w*$cosea;
-                $p[] = $z+$yc-$h*$sinea;
-                $p[] = $xc+$w*$cosea;
-                $p[] = $yc-$h*$sinea;
-                $p[] = $xc;
-                $p[] = $yc;
-            }
-        }
-        elseif( $sa >= 180 ) {
-            $p = array($xc,$yc,$xc,$yc+$z,$xc+$w*$cosea,$z+$yc-$h*$sinea);
-            $pt = array($xc,$yc,$xc+$w*$cosea,$yc-$h*$sinea);
-
-            for( $a=$rea; $a>$rsa; $a -= $step ) {
-                $tca = cos($a);
-                $tsa = sin($a);
-                $p[] = $xc+$w*$tca;
-                $p[] = $z+$yc-$h*$tsa;
-                $pt[] = $xc+$w*$tca;
-                $pt[] = $yc-$h*$tsa;
-            }
-
-            $pt[] = $xc+$w*$cossa;
-            $pt[] = $yc-$h*$sinsa;
-            $pt[] = $xc;
-            $pt[] = $yc;
-
-            $p[] = $xc+$w*$cossa;
-            $p[] = $z+$yc-$h*$sinsa;
-            $p[] = $xc+$w*$cossa;
-            $p[] = $yc-$h*$sinsa;
-            $p[] = $xc;
-            $p[] = $yc;
-
-        }
-        elseif( $sa >= 90 ) {
-            if( $ea > 180 ) {
-                $p = array($xc,$yc,$xc,$yc+$z,$xc+$w*$cosea,$z+$yc-$h*$sinea);
-                $pt = array($xc,$yc,$xc+$w*$cosea,$yc-$h*$sinea);
-
-                for( $a=$rea; $a > M_PI; $a -= $step ) {
-                    $tca = cos($a);
-                    $tsa = sin($a);
-                    $p[] = $xc+$w*$tca;
-                    $p[] = $z + $yc - $h*$tsa;
-                    $pt[] = $xc+$w*$tca;
-                    $pt[] = $yc-$h*$tsa;
-                }
-
-                $p[] = $xc-$w;
-                $p[] = $z+$yc;
-                $p[] = $xc-$w;
-                $p[] = $yc;
-                $p[] = $xc;
-                $p[] = $yc;
-
-                $pt[] = $xc-$w;
-                $pt[] = $z+$yc;
-                $pt[] = $xc-$w;
-                $pt[] = $yc;
-
-                for( $a=M_PI-$step; $a > $rsa; $a -= $step ) {
-                    $pt[] = $xc + $w*cos($a);
-                    $pt[] = $yc - $h*sin($a);
-                }
-
-                $pt[] = $xc+$w*$cossa;
-                $pt[] = $yc-$h*$sinsa;
-                $pt[] = $xc;
-                $pt[] = $yc;
-
-            }
-            else { // $sa >= 90 && $ea <= 180
-                $p = array($xc,$yc,$xc,$yc+$z,
-                $xc+$w*$cosea,$z+$yc-$h*$sinea,
-                $xc+$w*$cosea,$yc-$h*$sinea,
-                $xc,$yc);
-
-                $pt = array($xc,$yc,$xc+$w*$cosea,$yc-$h*$sinea);
-
-                for( $a=$rea; $a>$rsa; $a -= $step ) {
-                    $pt[] = $xc + $w*cos($a);
-                    $pt[] = $yc - $h*sin($a);
-                }
-
-                $pt[] = $xc+$w*$cossa;
-                $pt[] = $yc-$h*$sinsa;
-                $pt[] = $xc;
-                $pt[] = $yc;
-
-            }
-        }
-        else { // sa > 0 && ea < 90
-
-            $p = array($xc,$yc,$xc,$yc+$z,
-            $xc+$w*$cossa,$z+$yc-$h*$sinsa,
-            $xc+$w*$cossa,$yc-$h*$sinsa,
-            $xc,$yc);
-
-            $pt = array($xc,$yc,$xc+$w*$cossa,$yc-$h*$sinsa);
-
-            for( $a=$rsa; $a < $rea; $a += $step ) {
-                $pt[] = $xc + $w*cos($a);
-                $pt[] = $yc - $h*sin($a);
-            }
-
-            $pt[] = $xc+$w*$cosea;
-            $pt[] = $yc-$h*$sinea;
-            $pt[] = $xc;
-            $pt[] = $yc;
-        }
-         
-        $img->PushColor($fillcolor.":".$shadow);
-        $img->FilledPolygon($p);
-        $img->PopColor();
-
-        $img->PushColor($fillcolor);
-        $img->FilledPolygon($pt);
-        $img->PopColor();
-    }
-
-    function SetStartAngle($aStart) {
-        if( $aStart < 0 || $aStart > 360 ) {
-            JpGraphError::RaiseL(14004);//('Slice start angle must be between 0 and 360 degrees.');
-        }
-        $this->startangle = $aStart;
-    }
-
-    // Draw a 3D Pie
-    function Pie3D($aaoption,$img,$data,$colors,$xc,$yc,$d,$angle,$z,
-                   $shadow=0.65,$startangle=0,$edgecolor="",$edgeweight=1) {
-
-        //---------------------------------------------------------------------------
-        // As usual the algorithm get more complicated than I originally
-        // envisioned. I believe that this is as simple as it is possible
-        // to do it with the features I want. It's a good exercise to start
-        // thinking on how to do this to convince your self that all this
-        // is really needed for the general case.
-        //
-        // The algorithm two draw 3D pies without "real 3D" is done in
-        // two steps.
-        // First imagine the pie cut in half through a thought line between
-        // 12'a clock and 6'a clock. It now easy to imagine that we can plot
-        // the individual slices for each half by starting with the topmost
-        // pie slice and continue down to 6'a clock.
-        //
-        // In the algortithm this is done in three principal steps
-        // Step 1. Do the knife cut to ensure by splitting slices that extends
-        // over the cut line. This is done by splitting the original slices into
-        // upto 3 subslices.
-        // Step 2. Find the top slice for each half
-        // Step 3. Draw the slices from top to bottom
-        //
-        // The thing that slightly complicates this scheme with all the
-        // angle comparisons below is that we can have an arbitrary start
-        // angle so we must take into account the different equivalence classes.
-        // For the same reason we must walk through the angle array in a
-        // modulo fashion.
-        //
-        // Limitations of algorithm:
-        // * A small exploded slice which crosses the 270 degree point
-        //   will get slightly nagged close to the center due to the fact that
-        //   we print the slices in Z-order and that the slice left part
-        //   get printed first and might get slightly nagged by a larger
-        //   slice on the right side just before the right part of the small
-        //   slice. Not a major problem though.
-        //---------------------------------------------------------------------------
-
-
-        // Determine the height of the ellippse which gives an
-        // indication of the inclination angle
-        $h = ($angle/90.0)*$d;
-        $sum = 0;
-        for($i=0; $i<count($data); ++$i ) {
-            $sum += $data[$i];
-        }
-
-        // Special optimization
-        if( $sum==0 ) return;
-
-        if( $this->labeltype == 2 ) {
-            $this->adjusted_data = $this->AdjPercentage($data);
-        }
-
-        // Setup the start
-        $accsum = 0;
-        $a = $startangle;
-        $a = $this->NormAngle($a);
-
-        //
-        // Step 1 . Split all slices that crosses 90 or 270
-        //
-        $idx=0;
-        $adjexplode=array();
-        $numcolors = count($colors);
-        for($i=0; $i<count($data); ++$i, ++$idx ) {
-            $da = $data[$i]/$sum * 360;
-
-            if( empty($this->explode_radius[$i]) ) {
-                $this->explode_radius[$i]=0;
-            }
-
-            $expscale=1;
-            if( $aaoption == 1 ) {
-                $expscale=2;
-            }
-
-            $la = $a + $da/2;
-            $explode = array( $xc + $this->explode_radius[$i]*cos($la*M_PI/180)*$expscale,
-            $yc - $this->explode_radius[$i]*sin($la*M_PI/180) * ($h/$d) *$expscale );
-            $adjexplode[$idx] = $explode;
-            $labeldata[$i] = array($la,$explode[0],$explode[1]);
-            $originalangles[$i] = array($a,$a+$da);
-
-            $ne = $this->NormAngle($a+$da);
-            if( $da <= 180 ) {
-                // If the slice size is <= 90 it can at maximum cut across
-                // one boundary (either 90 or 270) where it needs to be split
-                $split=-1; // no split
-                if( ($da<=90 && ($a <= 90 && $ne > 90)) ||
-                (($da <= 180 && $da >90)  && (($a < 90 || $a >= 270) && $ne > 90)) ) {
-                    $split = 90;
-                }
-                elseif( ($da<=90 && ($a <= 270 && $ne > 270)) ||
-                (($da<=180 && $da>90) && ($a >= 90 && $a < 270 && ($a+$da) > 270 )) ) {
-                    $split = 270;
-                }
-                if( $split > 0 ) { // split in two
-                    $angles[$idx] = array($a,$split);
-                    $adjcolors[$idx] = $colors[$i % $numcolors];
-                    $adjexplode[$idx] = $explode;
-                    $angles[++$idx] = array($split,$ne);
-                    $adjcolors[$idx] = $colors[$i % $numcolors];
-                    $adjexplode[$idx] = $explode;
-                }
-                else { // no split
-                    $angles[$idx] = array($a,$ne);
-                    $adjcolors[$idx] = $colors[$i  % $numcolors];
-                    $adjexplode[$idx] = $explode;
-                }
-            }
-            else {
-                // da>180
-                // Slice may, depending on position, cross one or two
-                // bonudaries
-
-                if( $a < 90 )        $split = 90;
-                elseif( $a <= 270 )  $split = 270;
-                else                 $split = 90;
-
-                $angles[$idx] = array($a,$split);
-                $adjcolors[$idx] = $colors[$i % $numcolors];
-                $adjexplode[$idx] = $explode;
-                //if( $a+$da > 360-$split ) {
-                // For slices larger than 270 degrees we might cross
-                // another boundary as well. This means that we must
-                // split the slice further. The comparison gets a little
-                // bit complicated since we must take into accound that
-                // a pie might have a startangle >0 and hence a slice might
-                // wrap around the 0 angle.
-                // Three cases:
-                //  a) Slice starts before 90 and hence gets a split=90, but
-                //     we must also check if we need to split at 270
-                //  b) Slice starts after 90 but before 270 and slices
-                //     crosses 90 (after a wrap around of 0)
-                //  c) If start is > 270 (hence the firstr split is at 90)
-                //     and the slice is so large that it goes all the way
-                //     around 270.
-                if( ($a < 90 && ($a+$da > 270)) || ($a > 90 && $a<=270 && ($a+$da>360+90) ) || ($a > 270 && $this->NormAngle($a+$da)>270) ) {
-                    $angles[++$idx] = array($split,360-$split);
-                    $adjcolors[$idx] = $colors[$i % $numcolors];
-                    $adjexplode[$idx] = $explode;
-                    $angles[++$idx] = array(360-$split,$ne);
-                    $adjcolors[$idx] = $colors[$i % $numcolors];
-                    $adjexplode[$idx] = $explode;
-                }
-                else {
-                    // Just a simple split to the previous decided
-                    // angle.
-                    $angles[++$idx] = array($split,$ne);
-                    $adjcolors[$idx] = $colors[$i % $numcolors];
-                    $adjexplode[$idx] = $explode;
-                }
-            }
-            $a += $da;
-            $a = $this->NormAngle($a);
-        }
-
-        // Total number of slices
-        $n = count($angles);
-
-        for($i=0; $i<$n; ++$i) {
-            list($dbgs,$dbge) = $angles[$i];
-        }
-
-        //
-        // Step 2. Find start index (first pie that starts in upper left quadrant)
-        //
-        $minval = $angles[0][0];
-        $min = 0;
-        for( $i=0; $i<$n; ++$i ) {
-            if( $angles[$i][0] < $minval ) {
-                $minval = $angles[$i][0];
-                $min = $i;
-            }
-        }
-        $j = $min;
-        $cnt = 0;
-        while( $angles[$j][1] <= 90 ) {
-            $j++;
-            if( $j>=$n) {
-                $j=0;
-            }
-            if( $cnt > $n ) {
-                JpGraphError::RaiseL(14005);
-                //("Pie3D Internal error (#1). Trying to wrap twice when looking for start index");
-            }
-            ++$cnt;
-        }
-        $start = $j;
-
-        //
-        // Step 3. Print slices in z-order
-        //
-        $cnt = 0;
-
-        // First stroke all the slices between 90 and 270 (left half circle)
-        // counterclockwise
-         
-        while( $angles[$j][0] < 270  && $aaoption !== 2 ) {
-
-            list($x,$y) = $adjexplode[$j];
-
-            $this->Pie3DSlice($img,$x,$y,$d,$h,$angles[$j][0],$angles[$j][1],
-            $z,$adjcolors[$j],$shadow);
-
-            $last = array($x,$y,$j);
-
-            $j++;
-            if( $j >= $n ) $j=0;
-            if( $cnt > $n ) {
-                JpGraphError::RaiseL(14006);
-                //("Pie3D Internal Error: Z-Sorting algorithm for 3D Pies is not working properly (2). Trying to wrap twice while stroking.");
-            }
-            ++$cnt;
-        }
-         
-        $slice_left = $n-$cnt;
-        $j=$start-1;
-        if($j<0) $j=$n-1;
-        $cnt = 0;
-
-        // The stroke all slices from 90 to -90 (right half circle)
-        // clockwise
-        while( $cnt < $slice_left  && $aaoption !== 2 ) {
-
-            list($x,$y) = $adjexplode[$j];
-
-            $this->Pie3DSlice($img,$x,$y,$d,$h,$angles[$j][0],$angles[$j][1],
-            $z,$adjcolors[$j],$shadow);
-            $j--;
-            if( $cnt > $n ) {
-                JpGraphError::RaiseL(14006);
-                //("Pie3D Internal Error: Z-Sorting algorithm for 3D Pies is not working properly (2). Trying to wrap twice while stroking.");
-            }
-            if($j<0) $j=$n-1;
-            $cnt++;
-        }
-
-        // Now do a special thing. Stroke the last slice on the left
-        // halfcircle one more time.  This is needed in the case where
-        // the slice close to 270 have been exploded. In that case the
-        // part of the slice close to the center of the pie might be
-        // slightly nagged.
-        if( $aaoption !== 2 )
-        $this->Pie3DSlice($img,$last[0],$last[1],$d,$h,$angles[$last[2]][0],
-        $angles[$last[2]][1],$z,$adjcolors[$last[2]],$shadow);
-
-
-        if( $aaoption !== 1 ) {
-            // Now print possible labels and add csim
-            $this->value->ApplyFont($img);
-            $margin = $img->GetFontHeight()/2 + $this->value->margin ;
-            for($i=0; $i < count($data); ++$i ) {
-                $la = $labeldata[$i][0];
-                $x = $labeldata[$i][1] + cos($la*M_PI/180)*($d+$margin)*$this->ilabelposadj;
-                $y = $labeldata[$i][2] - sin($la*M_PI/180)*($h+$margin)*$this->ilabelposadj;
-                if( $this->ilabelposadj >= 1.0 ) {
-                    if( $la > 180 && $la < 360 ) $y += $z;
-                }
-                if( $this->labeltype == 0 ) {
-                    if( $sum > 0 ) $l = 100*$data[$i]/$sum;
-                    else $l = 0;
-                }
-                elseif( $this->labeltype == 1 ) {
-                    $l = $data[$i];
-                }
-                else {
-                    $l = $this->adjusted_data[$i];
-                }
-                if( isset($this->labels[$i]) && is_string($this->labels[$i]) ) {
-                    $l=sprintf($this->labels[$i],$l);
-                }
-
-                $this->StrokeLabels($l,$img,$labeldata[$i][0]*M_PI/180,$x,$y,$z);
-                 
-                $this->Add3DSliceToCSIM($i,$labeldata[$i][1],$labeldata[$i][2],$h*2,$d*2,$z,
-                $originalangles[$i][0],$originalangles[$i][1]);
-            }
-        }
-
-        //
-        // Finally add potential lines in pie
-        //
-
-        if( $edgecolor=="" || $aaoption !== 0 ) return;
-
-        $accsum = 0;
-        $a = $startangle;
-        $a = $this->NormAngle($a);
-
-        $a *= M_PI/180.0;
-
-        $idx=0;
-        $img->PushColor($edgecolor);
-        $img->SetLineWeight($edgeweight);
-
-        $fulledge = true;
-        for($i=0; $i < count($data) && $fulledge; ++$i ) {
-            if( empty($this->explode_radius[$i]) ) {
-                $this->explode_radius[$i]=0;
-            }
-            if( $this->explode_radius[$i] > 0 ) {
-                $fulledge = false;
-            }
-        }
-         
-
-        for($i=0; $i < count($data); ++$i, ++$idx ) {
-
-            $da = $data[$i]/$sum * 2*M_PI;
-            $this->StrokeFullSliceFrame($img,$xc,$yc,$a,$a+$da,$d,$h,$z,$edgecolor,
-            $this->explode_radius[$i],$fulledge);
-            $a += $da;
-        }
-        $img->PopColor();
-    }
-
-    function StrokeFullSliceFrame($img,$xc,$yc,$sa,$ea,$w,$h,$z,$edgecolor,$exploderadius,$fulledge) {
-        $step = 0.02;
-
-        if( $exploderadius > 0 ) {
-            $la = ($sa+$ea)/2;
-            $xc += $exploderadius*cos($la);
-            $yc -= $exploderadius*sin($la) * ($h/$w) ;
-             
-        }
-
-        $p = array($xc,$yc,$xc+$w*cos($sa),$yc-$h*sin($sa));
-
-        for($a=$sa; $a < $ea; $a += $step ) {
-            $p[] = $xc + $w*cos($a);
-            $p[] = $yc - $h*sin($a);
-        }
-
-        $p[] = $xc+$w*cos($ea);
-        $p[] = $yc-$h*sin($ea);
-        $p[] = $xc;
-        $p[] = $yc;
-
-        $img->SetColor($edgecolor);
-        $img->Polygon($p);
-
-        // Unfortunately we can't really draw the full edge around the whole of
-        // of the slice if any of the slices are exploded. The reason is that
-        // this algorithm is to simply. There are cases where the edges will
-        // "overwrite" other slices when they have been exploded.
-        // Doing the full, proper 3D hidden lines stiff is actually quite
-        // tricky. So for exploded pies we only draw the top edge. Not perfect
-        // but the "real" solution is much more complicated.
-        if( $fulledge && !( $sa > 0 && $sa < M_PI && $ea < M_PI) ) {
-
-            if($sa < M_PI && $ea > M_PI) {
-                $sa = M_PI;
-            }
-
-            if($sa < 2*M_PI && (($ea >= 2*M_PI) || ($ea > 0 && $ea < $sa ) ) ) {
-                $ea = 2*M_PI;
-            }
-
-            if( $sa >= M_PI && $ea <= 2*M_PI ) {
-                $p = array($xc + $w*cos($sa),$yc - $h*sin($sa),
-                $xc + $w*cos($sa),$z + $yc - $h*sin($sa));
-
-                for($a=$sa+$step; $a < $ea; $a += $step ) {
-                    $p[] = $xc + $w*cos($a);
-                    $p[] = $z + $yc - $h*sin($a);
-                }
-                $p[] = $xc + $w*cos($ea);
-                $p[] = $z + $yc - $h*sin($ea);
-                $p[] = $xc + $w*cos($ea);
-                $p[] = $yc - $h*sin($ea);
-                $img->SetColor($edgecolor);
-                $img->Polygon($p);
-            }
-        }
-    }
-
-    function Stroke($img,$aaoption=0) {
-        $n = count($this->data);
-
-        // If user hasn't set the colors use the theme array
-        if( $this->setslicecolors==null ) {
-            $colors = array_keys($img->rgb->rgb_table);
-            sort($colors);
-            $idx_a=$this->themearr[$this->theme];
-            $ca = array();
-            $m = count($idx_a);
-            for($i=0; $i < $m; ++$i) {
-                $ca[$i] = $colors[$idx_a[$i]];
-            }
-            $ca = array_reverse(array_slice($ca,0,$n));
-        }
-        else {
-            $ca = $this->setslicecolors;
-        }
-
-
-        if( $this->posx <= 1 && $this->posx > 0 ) {
-            $xc = round($this->posx*$img->width);
-        }
-        else {
-            $xc = $this->posx ;
-        }
-
-        if( $this->posy <= 1 && $this->posy > 0 ) {
-            $yc = round($this->posy*$img->height);
-        }
-        else {
-            $yc = $this->posy ;
-        }
-
-        if( $this->radius <= 1 ) {
-            $width = floor($this->radius*min($img->width,$img->height));
-            // Make sure that the pie doesn't overflow the image border
-            // The 0.9 factor is simply an extra margin to leave some space
-            // between the pie an the border of the image.
-            $width = min($width,min($xc*0.9,($yc*90/$this->angle-$width/4)*0.9));
-        }
-        else {
-            $width = $this->radius * ($aaoption === 1 ? 2 : 1 ) ;
-        }
-
-        // Add a sanity check for width
-        if( $width < 1 ) {
-            JpGraphError::RaiseL(14007);//("Width for 3D Pie is 0. Specify a size > 0");
-        }
-
-        // Establish a thickness. By default the thickness is a fifth of the
-        // pie slice width (=pie radius) but since the perspective depends
-        // on the inclination angle we use some heuristics to make the edge
-        // slightly thicker the less the angle.
-
-        // Has user specified an absolute thickness? In that case use
-        // that instead
-
-        if( $this->iThickness ) {
-            $thick = $this->iThickness;
-            $thick *= ($aaoption === 1 ? 2 : 1 );
-        }
-        else {
-            $thick = $width/12;
-        }
-        $a = $this->angle;
-        
-        if( $a <= 30 ) $thick *= 1.6;
-        elseif( $a <= 40 ) $thick *= 1.4;
-        elseif( $a <= 50 ) $thick *= 1.2;
-        elseif( $a <= 60 ) $thick *= 1.0;
-        elseif( $a <= 70 ) $thick *= 0.8;
-        elseif( $a <= 80 ) $thick *= 0.7;
-        else $thick *= 0.6;
-
-        $thick = floor($thick);
-
-        if( $this->explode_all ) {
-            for($i=0; $i < $n; ++$i)
-                $this->explode_radius[$i]=$this->explode_r;
-        }
-
-        $this->Pie3D($aaoption,$img,$this->data, $ca, $xc, $yc, $width, $this->angle,
-        $thick, 0.65, $this->startangle, $this->edgecolor, $this->edgeweight);
-
-        // Adjust title position
-        if( $aaoption != 1 ) {
-            $this->title->SetPos($xc,$yc-$this->title->GetFontHeight($img)-$width/2-$this->title->margin,         "center","bottom");
-            $this->title->Stroke($img);
-        }
-    }
-
-    //---------------
-    // PRIVATE METHODS
-
-    // Position the labels of each slice
-    function StrokeLabels($label,$img,$a,$xp,$yp,$z) {
-        $this->value->halign="left";
-        $this->value->valign="top";
-
-        // Position the axis title.
-        // dx, dy is the offset from the top left corner of the bounding box that sorrounds the text
-        // that intersects with the extension of the corresponding axis. The code looks a little
-        // bit messy but this is really the only way of having a reasonable position of the
-        // axis titles.
-        $this->value->ApplyFont($img);
-        $h=$img->GetTextHeight($label);
-        // For numeric values the format of the display value
-        // must be taken into account
-        if( is_numeric($label) ) {
-            if( $label >= 0 ) {
-                $w=$img->GetTextWidth(sprintf($this->value->format,$label));
-            }
-            else {
-                $w=$img->GetTextWidth(sprintf($this->value->negformat,$label));
-            }
-        }
-        else {
-            $w=$img->GetTextWidth($label);
-        }
-        
-        while( $a > 2*M_PI ) {
-            $a -= 2*M_PI;
-        }
-        
-        if( $a>=7*M_PI/4 || $a <= M_PI/4 ) $dx=0;
-        if( $a>=M_PI/4 && $a <= 3*M_PI/4 ) $dx=($a-M_PI/4)*2/M_PI;
-        if( $a>=3*M_PI/4 && $a <= 5*M_PI/4 ) $dx=1;
-        if( $a>=5*M_PI/4 && $a <= 7*M_PI/4 ) $dx=(1-($a-M_PI*5/4)*2/M_PI);
-
-        if( $a>=7*M_PI/4 ) $dy=(($a-M_PI)-3*M_PI/4)*2/M_PI;
-        if( $a<=M_PI/4 ) $dy=(1-$a*2/M_PI);
-        if( $a>=M_PI/4 && $a <= 3*M_PI/4 ) $dy=1;
-        if( $a>=3*M_PI/4 && $a <= 5*M_PI/4 ) $dy=(1-($a-3*M_PI/4)*2/M_PI);
-        if( $a>=5*M_PI/4 && $a <= 7*M_PI/4 ) $dy=0;
-
-        $x = round($xp-$dx*$w);
-        $y = round($yp-$dy*$h);
-
-        // Mark anchor point for debugging
-        /*
-        $img->SetColor('red');
-        $img->Line($xp-10,$yp,$xp+10,$yp);
-        $img->Line($xp,$yp-10,$xp,$yp+10);
-        */
-
-        $oldmargin = $this->value->margin;
-        $this->value->margin=0;
-        $this->value->Stroke($img,$label,$x,$y);
-        $this->value->margin=$oldmargin;
-
-    }
-} // Class
-
-/* EOF */
-?>
diff --git a/#jpgraph/src/jpgraph_plotband.php b/#jpgraph/src/jpgraph_plotband.php
deleted file mode 100644
index b7aef750..00000000
--- a/#jpgraph/src/jpgraph_plotband.php
+++ /dev/null
@@ -1,635 +0,0 @@
-<?php
-//=======================================================================
-// File:        JPGRAPH_PLOTBAND.PHP
-// Description: PHP4 Graph Plotting library. Extension module.
-// Created:     2004-02-18
-// Ver:         $Id: jpgraph_plotband.php 1106 2009-02-22 20:16:35Z ljp $
-//
-// Copyright (c) Asial Corporation. All rights reserved.
-//========================================================================
-
-// Constants for types of static bands in plot area
-define("BAND_RDIAG",1); // Right diagonal lines
-define("BAND_LDIAG",2); // Left diagonal lines
-define("BAND_SOLID",3); // Solid one color
-define("BAND_VLINE",4); // Vertical lines
-define("BAND_HLINE",5);  // Horizontal lines
-define("BAND_3DPLANE",6);  // "3D" Plane
-define("BAND_HVCROSS",7);  // Vertical/Hor crosses
-define("BAND_DIAGCROSS",8); // Diagonal crosses
-
-
-// Utility class to hold coordinates for a rectangle
-class Rectangle {
-    public $x,$y,$w,$h;
-    public $xe, $ye;
-    function __construct($aX,$aY,$aWidth,$aHeight) {
-        $this->x=$aX;
-        $this->y=$aY;
-        $this->w=$aWidth;
-        $this->h=$aHeight;
-        $this->xe=$aX+$aWidth-1;
-        $this->ye=$aY+$aHeight-1;
-    }
-}
-
-//=====================================================================
-// Class RectPattern
-// Base class for pattern hierarchi that is used to display patterned
-// bands on the graph. Any subclass that doesn't override Stroke()
-// must at least implement method DoPattern($aImg) which is responsible
-// for drawing the pattern onto the graph.
-//=====================================================================
-class RectPattern {
-    protected $color;
-    protected $weight;
-    protected $rect=null;
-    protected $doframe=true;
-    protected $linespacing; // Line spacing in pixels
-    protected $iBackgroundColor=-1;  // Default is no background fill
-
-    function __construct($aColor,$aWeight=1) {
-        $this->color = $aColor;
-        $this->weight = $aWeight;
-    }
-
-    function SetBackground($aBackgroundColor) {
-        $this->iBackgroundColor=$aBackgroundColor;
-    }
-
-    function SetPos($aRect) {
-        $this->rect = $aRect;
-    }
-
-    function ShowFrame($aShow=true) {
-        $this->doframe=$aShow;
-    }
-
-    function SetDensity($aDens) {
-        if( $aDens < 1 || $aDens > 100 )
-        JpGraphError::RaiseL(16001,$aDens);
-        //(" Desity for pattern must be between 1 and 100. (You tried $aDens)");
-        // 1% corresponds to linespacing=50
-        // 100 % corresponds to linespacing 1
-        $this->linespacing = floor(((100-$aDens)/100.0)*50)+1;
-
-    }
-
-    function Stroke($aImg) {
-        if( $this->rect == null )
-        JpGraphError::RaiseL(16002);
-        //(" No positions specified for pattern.");
-
-        if( !(is_numeric($this->iBackgroundColor) && $this->iBackgroundColor==-1) ) {
-            $aImg->SetColor($this->iBackgroundColor);
-            $aImg->FilledRectangle($this->rect->x,$this->rect->y,$this->rect->xe,$this->rect->ye);
-        }
-
-        $aImg->SetColor($this->color);
-        $aImg->SetLineWeight($this->weight);
-
-        // Virtual function implemented by subclass
-        $this->DoPattern($aImg);
-
-        // Frame around the pattern area
-        if( $this->doframe )
-        $aImg->Rectangle($this->rect->x,$this->rect->y,$this->rect->xe,$this->rect->ye);
-    }
-
-}
-
-
-//=====================================================================
-// Class RectPatternSolid
-// Implements a solid band
-//=====================================================================
-class RectPatternSolid extends RectPattern {
-
-    function __construct($aColor="black",$aWeight=1) {
-        parent::__construct($aColor,$aWeight);
-    }
-
-    function DoPattern($aImg) {
-        $aImg->SetColor($this->color);
-        $aImg->FilledRectangle($this->rect->x,$this->rect->y,
-        $this->rect->xe,$this->rect->ye);
-    }
-}
-
-//=====================================================================
-// Class RectPatternHor
-// Implements horizontal line pattern
-//=====================================================================
-class RectPatternHor extends RectPattern {
-
-    function __construct($aColor="black",$aWeight=1,$aLineSpacing=7) {
-        parent::__construct($aColor,$aWeight);
-        $this->linespacing = $aLineSpacing;
-    }
-
-    function DoPattern($aImg) {
-        $x0 = $this->rect->x;
-        $x1 = $this->rect->xe;
-        $y = $this->rect->y;
-        while( $y < $this->rect->ye ) {
-            $aImg->Line($x0,$y,$x1,$y);
-            $y += $this->linespacing;
-        }
-    }
-}
-
-//=====================================================================
-// Class RectPatternVert
-// Implements vertical line pattern
-//=====================================================================
-class RectPatternVert extends RectPattern {
-
-    function __construct($aColor="black",$aWeight=1,$aLineSpacing=7) {
-        parent::__construct($aColor,$aWeight);
-        $this->linespacing = $aLineSpacing;
-    }
-
-    //--------------------
-    // Private methods
-    //
-    function DoPattern($aImg) {
-        $x = $this->rect->x;
-        $y0 = $this->rect->y;
-        $y1 = $this->rect->ye;
-        while( $x < $this->rect->xe ) {
-            $aImg->Line($x,$y0,$x,$y1);
-            $x += $this->linespacing;
-        }
-    }
-}
-
-
-//=====================================================================
-// Class RectPatternRDiag
-// Implements right diagonal pattern
-//=====================================================================
-class RectPatternRDiag extends RectPattern {
-
-    function __construct($aColor="black",$aWeight=1,$aLineSpacing=12) {
-        parent::__construct($aColor,$aWeight);
-        $this->linespacing = $aLineSpacing;
-    }
-
-    function DoPattern($aImg) {
-        //  --------------------
-        //  | /   /   /   /   /|
-        //  |/   /   /   /   / |
-        //  |   /   /   /   /  |
-        //  --------------------
-        $xe = $this->rect->xe;
-        $ye = $this->rect->ye;
-        $x0 = $this->rect->x + round($this->linespacing/2);
-        $y0 = $this->rect->y;
-        $x1 = $this->rect->x;
-        $y1 = $this->rect->y + round($this->linespacing/2);
-
-        while($x0<=$xe && $y1<=$ye) {
-            $aImg->Line($x0,$y0,$x1,$y1);
-            $x0 += $this->linespacing;
-            $y1 += $this->linespacing;
-        }
-
-        if( $xe-$x1 > $ye-$y0 ) {
-            // Width larger than height
-            $x1 = $this->rect->x + ($y1-$ye);
-            $y1 = $ye;
-            $y0 = $this->rect->y;
-            while( $x0 <= $xe ) {
-                $aImg->Line($x0,$y0,$x1,$y1);
-                $x0 += $this->linespacing;
-                $x1 += $this->linespacing;
-            }
-             
-            $y0=$this->rect->y + ($x0-$xe);
-            $x0=$xe;
-        }
-        else {
-            // Height larger than width
-            $diff = $x0-$xe;
-            $y0 = $diff+$this->rect->y;
-            $x0 = $xe;
-            $x1 = $this->rect->x;
-            while( $y1 <= $ye ) {
-                $aImg->Line($x0,$y0,$x1,$y1);
-                $y1 += $this->linespacing;
-                $y0 += $this->linespacing;
-            }
-             
-            $diff = $y1-$ye;
-            $y1 = $ye;
-            $x1 = $diff + $this->rect->x;
-        }
-
-        while( $y0 <= $ye ) {
-            $aImg->Line($x0,$y0,$x1,$y1);
-            $y0 += $this->linespacing;
-            $x1 += $this->linespacing;
-        }
-    }
-}
-
-//=====================================================================
-// Class RectPatternLDiag
-// Implements left diagonal pattern
-//=====================================================================
-class RectPatternLDiag extends RectPattern {
-
-    function __construct($aColor="black",$aWeight=1,$aLineSpacing=12) {
-        $this->linespacing = $aLineSpacing;
-        parent::__construct($aColor,$aWeight);
-    }
-
-    function DoPattern($aImg) {
-        //  --------------------
-        //  |\   \   \   \   \ |
-        //  | \   \   \   \   \|
-        //  |  \   \   \   \   |
-        //  |------------------|
-        $xe = $this->rect->xe;
-        $ye = $this->rect->ye;
-        $x0 = $this->rect->x + round($this->linespacing/2);
-        $y0 = $this->rect->ye;
-        $x1 = $this->rect->x;
-        $y1 = $this->rect->ye - round($this->linespacing/2);
-
-        while($x0<=$xe && $y1>=$this->rect->y) {
-            $aImg->Line($x0,$y0,$x1,$y1);
-            $x0 += $this->linespacing;
-            $y1 -= $this->linespacing;
-        }
-        if( $xe-$x1 > $ye-$this->rect->y ) {
-            // Width larger than height
-            $x1 = $this->rect->x + ($this->rect->y-$y1);
-            $y0=$ye; $y1=$this->rect->y;
-            while( $x0 <= $xe ) {
-                $aImg->Line($x0,$y0,$x1,$y1);
-                $x0 += $this->linespacing;
-                $x1 += $this->linespacing;
-            }
-             
-            $y0=$this->rect->ye - ($x0-$xe);
-            $x0=$xe;
-        }
-        else {
-            // Height larger than width
-            $diff = $x0-$xe;
-            $y0 = $ye-$diff;
-            $x0 = $xe;
-            while( $y1 >= $this->rect->y ) {
-                $aImg->Line($x0,$y0,$x1,$y1);
-                $y0 -= $this->linespacing;
-                $y1 -= $this->linespacing;
-            }
-            $diff = $this->rect->y - $y1;
-            $x1 = $this->rect->x + $diff;
-            $y1 = $this->rect->y;
-        }
-        while( $y0 >= $this->rect->y ) {
-            $aImg->Line($x0,$y0,$x1,$y1);
-            $y0 -= $this->linespacing;
-            $x1 += $this->linespacing;
-        }
-    }
-}
-
-//=====================================================================
-// Class RectPattern3DPlane
-// Implements "3D" plane pattern
-//=====================================================================
-class RectPattern3DPlane extends RectPattern {
-    private $alpha=50;  // Parameter that specifies the distance
-    // to "simulated" horizon in pixel from the
-    // top of the band. Specifies how fast the lines
-    // converge.
-
-    function __construct($aColor="black",$aWeight=1) {
-        parent::__construct($aColor,$aWeight);
-        $this->SetDensity(10);  // Slightly larger default
-    }
-
-    function SetHorizon($aHorizon) {
-        $this->alpha=$aHorizon;
-    }
-
-    function DoPattern($aImg) {
-        // "Fake" a nice 3D grid-effect.
-        $x0 = $this->rect->x + $this->rect->w/2;
-        $y0 = $this->rect->y;
-        $x1 = $x0;
-        $y1 = $this->rect->ye;
-        $x0_right = $x0;
-        $x1_right = $x1;
-
-        // BTW "apa" means monkey in Swedish but is really a shortform for
-        // "alpha+a" which was the labels I used on paper when I derived the
-        // geometric to get the 3D perspective right.
-        // $apa is the height of the bounding rectangle plus the distance to the
-        // artifical horizon (alpha)
-        $apa = $this->rect->h + $this->alpha;
-
-        // Three cases and three loops
-        // 1) The endpoint of the line ends on the bottom line
-        // 2) The endpoint ends on the side
-        // 3) Horizontal lines
-
-        // Endpoint falls on bottom line
-        $middle=$this->rect->x + $this->rect->w/2;
-        $dist=$this->linespacing;
-        $factor=$this->alpha /($apa);
-        while($x1>$this->rect->x) {
-            $aImg->Line($x0,$y0,$x1,$y1);
-            $aImg->Line($x0_right,$y0,$x1_right,$y1);
-            $x1 = $middle - $dist;
-            $x0 = $middle - $dist * $factor;
-            $x1_right = $middle + $dist;
-            $x0_right =  $middle + $dist * $factor;
-            $dist += $this->linespacing;
-        }
-
-        // Endpoint falls on sides
-        $dist -= $this->linespacing;
-        $d=$this->rect->w/2;
-        $c = $apa - $d*$apa/$dist;
-        while( $x0>$this->rect->x ) {
-            $aImg->Line($x0,$y0,$this->rect->x,$this->rect->ye-$c);
-            $aImg->Line($x0_right,$y0,$this->rect->xe,$this->rect->ye-$c);
-            $dist += $this->linespacing;
-            $x0 = $middle - $dist * $factor;
-            $x1 = $middle - $dist;
-            $x0_right =  $middle + $dist * $factor;
-            $c = $apa - $d*$apa/$dist;
-        }
-
-        // Horizontal lines
-        // They need some serious consideration since they are a function
-        // of perspective depth (alpha) and density (linespacing)
-        $x0=$this->rect->x;
-        $x1=$this->rect->xe;
-        $y=$this->rect->ye;
-
-        // The first line is drawn directly. Makes the loop below slightly
-        // more readable.
-        $aImg->Line($x0,$y,$x1,$y);
-        $hls = $this->linespacing;
-
-        // A correction factor for vertical "brick" line spacing to account for
-        // a) the difference in number of pixels hor vs vert
-        // b) visual apperance to make the first layer of "bricks" look more
-        // square.
-        $vls = $this->linespacing*0.6;
-
-        $ds = $hls*($apa-$vls)/$apa;
-        // Get the slope for the "perspective line" going from bottom right
-        // corner to top left corner of the "first" brick.
-
-        // Uncomment the following lines if you want to get a visual understanding
-        // of what this helpline does. BTW this mimics the way you would get the
-        // perspective right when drawing on paper.
-        /*
-        $x0 = $middle;
-        $y0 = $this->rect->ye;
-        $len=floor(($this->rect->ye-$this->rect->y)/$vls);
-        $x1 = $middle+round($len*$ds);
-        $y1 = $this->rect->ye-$len*$vls;
-        $aImg->PushColor("red");
-        $aImg->Line($x0,$y0,$x1,$y1);
-        $aImg->PopColor();
-        */
-
-        $y -= $vls;
-        $k=($this->rect->ye-($this->rect->ye-$vls))/($middle-($middle-$ds));
-        $dist = $hls;
-        while( $y>$this->rect->y ) {
-            $aImg->Line($this->rect->x,$y,$this->rect->xe,$y);
-            $adj = $k*$dist/(1+$dist*$k/$apa);
-            if( $adj < 2 ) $adj=1;
-            $y = $this->rect->ye - round($adj);
-            $dist += $hls;
-        }
-    }
-}
-
-//=====================================================================
-// Class RectPatternCross
-// Vert/Hor crosses
-//=====================================================================
-class RectPatternCross extends RectPattern {
-    private $vert=null;
-    private $hor=null;
-    function __construct($aColor="black",$aWeight=1) {
-        parent::__construct($aColor,$aWeight);
-        $this->vert = new RectPatternVert($aColor,$aWeight);
-        $this->hor  = new RectPatternHor($aColor,$aWeight);
-    }
-
-    function SetOrder($aDepth) {
-        $this->vert->SetOrder($aDepth);
-        $this->hor->SetOrder($aDepth);
-    }
-
-    function SetPos($aRect) {
-        parent::SetPos($aRect);
-        $this->vert->SetPos($aRect);
-        $this->hor->SetPos($aRect);
-    }
-
-    function SetDensity($aDens) {
-        $this->vert->SetDensity($aDens);
-        $this->hor->SetDensity($aDens);
-    }
-
-    function DoPattern($aImg) {
-        $this->vert->DoPattern($aImg);
-        $this->hor->DoPattern($aImg);
-    }
-}
-
-//=====================================================================
-// Class RectPatternDiagCross
-// Vert/Hor crosses
-//=====================================================================
-
-class RectPatternDiagCross extends RectPattern {
-    private $left=null;
-    private $right=null;
-    function __construct($aColor="black",$aWeight=1) {
-        parent::__construct($aColor,$aWeight);
-        $this->right = new RectPatternRDiag($aColor,$aWeight);
-        $this->left  = new RectPatternLDiag($aColor,$aWeight);
-    }
-
-    function SetOrder($aDepth) {
-        $this->left->SetOrder($aDepth);
-        $this->right->SetOrder($aDepth);
-    }
-
-    function SetPos($aRect) {
-        parent::SetPos($aRect);
-        $this->left->SetPos($aRect);
-        $this->right->SetPos($aRect);
-    }
-
-    function SetDensity($aDens) {
-        $this->left->SetDensity($aDens);
-        $this->right->SetDensity($aDens);
-    }
-
-    function DoPattern($aImg) {
-        $this->left->DoPattern($aImg);
-        $this->right->DoPattern($aImg);
-    }
-
-}
-
-//=====================================================================
-// Class RectPatternFactory
-// Factory class for rectangular pattern
-//=====================================================================
-class RectPatternFactory {
-    function __construct() {
-        // Empty
-    }
-    function Create($aPattern,$aColor,$aWeight=1) {
-        switch($aPattern) {
-            case BAND_RDIAG:
-                $obj =  new RectPatternRDiag($aColor,$aWeight);
-                break;
-            case BAND_LDIAG:
-                $obj =  new RectPatternLDiag($aColor,$aWeight);
-                break;
-            case BAND_SOLID:
-                $obj =  new RectPatternSolid($aColor,$aWeight);
-                break;
-            case BAND_VLINE:
-                $obj =  new RectPatternVert($aColor,$aWeight);
-                break;
-            case BAND_HLINE:
-                $obj =  new RectPatternHor($aColor,$aWeight);
-                break;
-            case BAND_3DPLANE:
-                $obj =  new RectPattern3DPlane($aColor,$aWeight);
-                break;
-            case BAND_HVCROSS:
-                $obj =  new RectPatternCross($aColor,$aWeight);
-                break;
-            case BAND_DIAGCROSS:
-                $obj =  new RectPatternDiagCross($aColor,$aWeight);
-                break;
-            default:
-                JpGraphError::RaiseL(16003,$aPattern);
-                //(" Unknown pattern specification ($aPattern)");
-        }
-        return $obj;
-    }
-}
-
-
-//=====================================================================
-// Class PlotBand
-// Factory class which is used by the client.
-// It is responsible for factoring the corresponding pattern
-// concrete class.
-//=====================================================================
-class PlotBand {
-    public $depth; // Determine if band should be over or under the plots
-    private $prect=null;
-    private $dir, $min, $max;
-
-    function __construct($aDir,$aPattern,$aMin,$aMax,$aColor="black",$aWeight=1,$aDepth=DEPTH_BACK) {
-        $f =  new RectPatternFactory();
-        $this->prect = $f->Create($aPattern,$aColor,$aWeight);
-        if( is_numeric($aMin) && is_numeric($aMax) && ($aMin > $aMax) )
-        JpGraphError::RaiseL(16004);
-        //('Min value for plotband is larger than specified max value. Please correct.');
-        $this->dir = $aDir;
-        $this->min = $aMin;
-        $this->max = $aMax;
-        $this->depth=$aDepth;
-    }
-
-    // Set position. aRect contains absolute image coordinates
-    function SetPos($aRect) {
-        assert( $this->prect != null ) ;
-        $this->prect->SetPos($aRect);
-    }
-
-    function ShowFrame($aFlag=true) {
-        $this->prect->ShowFrame($aFlag);
-    }
-
-    // Set z-order. In front of pplot or in the back
-    function SetOrder($aDepth) {
-        $this->depth=$aDepth;
-    }
-
-    function SetDensity($aDens) {
-        $this->prect->SetDensity($aDens);
-    }
-
-    function GetDir() {
-        return $this->dir;
-    }
-
-    function GetMin() {
-        return $this->min;
-    }
-
-    function GetMax() {
-        return $this->max;
-    }
-
-    function PreStrokeAdjust($aGraph) {
-        // Nothing to do
-    }
-
-    // Display band
-    function Stroke($aImg,$aXScale,$aYScale) {
-        assert( $this->prect != null ) ;
-        if( $this->dir == HORIZONTAL ) {
-            if( $this->min === 'min' ) $this->min = $aYScale->GetMinVal();
-            if( $this->max === 'max' ) $this->max = $aYScale->GetMaxVal();
-
-            // Only draw the bar if it actually appears in the range
-            if ($this->min < $aYScale->GetMaxVal() && $this->max > $aYScale->GetMinVal()) {
-                 
-                // Trucate to limit of axis
-                $this->min = max($this->min, $aYScale->GetMinVal());
-                $this->max = min($this->max, $aYScale->GetMaxVal());
-
-                $x=$aXScale->scale_abs[0];
-                $y=$aYScale->Translate($this->max);
-                $width=$aXScale->scale_abs[1]-$aXScale->scale_abs[0]+1;
-                $height=abs($y-$aYScale->Translate($this->min))+1;
-                $this->prect->SetPos(new Rectangle($x,$y,$width,$height));
-                $this->prect->Stroke($aImg);
-            }
-        }
-        else { // VERTICAL
-            if( $this->min === 'min' ) $this->min = $aXScale->GetMinVal();
-            if( $this->max === 'max' ) $this->max = $aXScale->GetMaxVal();
-
-            // Only draw the bar if it actually appears in the range
-            if ($this->min < $aXScale->GetMaxVal() && $this->max > $aXScale->GetMinVal()) {
-                 
-                // Trucate to limit of axis
-                $this->min = max($this->min, $aXScale->GetMinVal());
-                $this->max = min($this->max, $aXScale->GetMaxVal());
-
-                $y=$aYScale->scale_abs[1];
-                $x=$aXScale->Translate($this->min);
-                $height=abs($aYScale->scale_abs[1]-$aYScale->scale_abs[0]);
-                $width=abs($x-$aXScale->Translate($this->max));
-                $this->prect->SetPos(new Rectangle($x,$y,$width,$height));
-                $this->prect->Stroke($aImg);
-            }
-        }
-    }
-}
-
-
-?>
diff --git a/#jpgraph/src/jpgraph_plotline.php b/#jpgraph/src/jpgraph_plotline.php
deleted file mode 100644
index 4ee0f564..00000000
--- a/#jpgraph/src/jpgraph_plotline.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?php
-/*=======================================================================
- // File:  		 JPGRAPH_PLOTLINE.PHP
- // Description: PlotLine extension for JpGraph
- // Created:  	 2009-03-24
- // Ver:  		 $Id: jpgraph_plotline.php 1931 2010-03-22 15:05:48Z ljp $
- //
- // CLASS PlotLine
- // Data container class to hold properties for a static
- // line that is drawn directly in the plot area.
- // Useful to add static borders inside a plot to show for example set-values
- //
- // Copyright (c) Asial Corporation. All rights reserved.
- //========================================================================
- */
-
-class PlotLine {
-    public $scaleposition, $direction=-1;
-    protected $weight=1;
-    protected $color = 'black';
-    private $legend='',$hidelegend=false, $legendcsimtarget='', $legendcsimalt='',$legendcsimwintarget='';
-    private $iLineStyle='solid';
-    public $numpoints=0; // Needed since the framework expects this property
-
-    function __construct($aDir=HORIZONTAL,$aPos=0,$aColor='black',$aWeight=1) {
-        $this->direction = $aDir;
-        $this->color=$aColor;
-        $this->weight=$aWeight;
-        $this->scaleposition=$aPos;
-    }
-
-    function SetLegend($aLegend,$aCSIM='',$aCSIMAlt='',$aCSIMWinTarget='') {
-        $this->legend = $aLegend;
-        $this->legendcsimtarget = $aCSIM;
-        $this->legendcsimwintarget = $aCSIMWinTarget;
-        $this->legendcsimalt = $aCSIMAlt;
-    }
-
-    function HideLegend($f=true) {
-        $this->hidelegend = $f;
-    }
-
-    function SetPosition($aScalePosition) {
-        $this->scaleposition=$aScalePosition;
-    }
-
-    function SetDirection($aDir) {
-        $this->direction = $aDir;
-    }
-
-    function SetColor($aColor) {
-        $this->color=$aColor;
-    }
-
-    function SetWeight($aWeight) {
-        $this->weight=$aWeight;
-    }
-
-    function SetLineStyle($aStyle) {
-        $this->iLineStyle = $aStyle;
-    }
-
-    function GetCSIMAreas() {
-        return '';
-    }
-
-    //---------------
-    // PRIVATE METHODS
-
-    function DoLegend($graph) {
-        if( !$this->hidelegend ) $this->Legend($graph);
-    }
-
-    // Framework function the chance for each plot class to set a legend
-    function Legend($aGraph) {
-        if( $this->legend != '' ) {
-            $dummyPlotMark = new PlotMark();
-            $lineStyle = 1;
-            $aGraph->legend->Add($this->legend,$this->color,$dummyPlotMark,$lineStyle,
-            $this->legendcsimtarget,$this->legendcsimalt,$this->legendcsimwintarget);
-        }
-    }
-
-    function PreStrokeAdjust($aGraph) {
-        // Nothing to do
-    }
-
-    // Called by framework to allow the object to draw
-    // optional information in the margin area
-    function StrokeMargin($aImg) {
-        // Nothing to do
-    }
-
-    // Framework function to allow the object to adjust the scale
-    function PrescaleSetup($aGraph) {
-        // Nothing to do
-    }
-
-    function Min() {
-        return array(null,null);
-    }
-
-    function Max() {
-        return array(null,null);
-    }
-
-    function _Stroke($aImg,$aMinX,$aMinY,$aMaxX,$aMaxY,$aXPos,$aYPos) {
-        $aImg->SetColor($this->color);
-        $aImg->SetLineWeight($this->weight);
-        $oldStyle = $aImg->SetLineStyle($this->iLineStyle);
-        if( $this->direction == VERTICAL ) {
-            $ymin_abs = $aMinY;
-            $ymax_abs = $aMaxY;
-            $xpos_abs = $aXPos;
-            $aImg->StyleLine($xpos_abs, $ymin_abs, $xpos_abs, $ymax_abs);
-        }
-        elseif( $this->direction == HORIZONTAL ) {
-            $xmin_abs = $aMinX;
-            $xmax_abs = $aMaxX;
-            $ypos_abs = $aYPos;
-            $aImg->StyleLine($xmin_abs, $ypos_abs, $xmax_abs, $ypos_abs);
-        }
-        else {
-            JpGraphError::RaiseL(25125);//(" Illegal direction for static line");
-        }
-        $aImg->SetLineStyle($oldStyle);
-    }
-
-    function Stroke($aImg,$aXScale,$aYScale) {
-        $this->_Stroke($aImg,
-            $aImg->left_margin,
-            $aYScale->Translate($aYScale->GetMinVal()),
-            $aImg->width-$aImg->right_margin,
-            $aYScale->Translate($aYScale->GetMaxVal()),
-            $aXScale->Translate($this->scaleposition),
-            $aYScale->Translate($this->scaleposition)
-        );
-    }
-}
-
-
-?>
diff --git a/#jpgraph/src/jpgraph_plotmark.inc.php b/#jpgraph/src/jpgraph_plotmark.inc.php
deleted file mode 100644
index 29c4d032..00000000
--- a/#jpgraph/src/jpgraph_plotmark.inc.php
+++ /dev/null
@@ -1,504 +0,0 @@
-<?php
-//=======================================================================
-// File:        JPGRAPH_PLOTMARK.PHP
-// Description: Class file. Handles plotmarks
-// Created:     2003-03-21
-// Ver:         $Id: jpgraph_plotmark.inc.php 1106 2009-02-22 20:16:35Z ljp $
-//
-// Copyright (c) Asial Corporation. All rights reserved.
-//========================================================================
-
-
-//===================================================
-// CLASS PlotMark
-// Description: Handles the plot marks in graphs
-//===================================================
-
-class PlotMark {
-    public $title, $show=true;
-    public $type,$weight=1;
-    public $iFormatCallback="", $iFormatCallback2="";
-    public $fill_color="blue";
-    public $color="black", $width=4;
-    private $yvalue,$xvalue='',$csimtarget,$csimwintarget='',$csimalt,$csimareas;
-    private $markimg='',$iScale=1.0;
-    private $oldfilename='',$iFileName='';
-    private $imgdata_balls = null;
-    private $imgdata_diamonds = null;
-    private $imgdata_squares = null;
-    private $imgdata_bevels = null;
-    private $imgdata_stars = null;
-    private $imgdata_pushpins = null;
-
-    //--------------
-    // CONSTRUCTOR
-    function __construct() {
-        $this->title = new Text();
-        $this->title->Hide();
-        $this->csimareas = '';
-        $this->type=-1;
-    }
-    //---------------
-    // PUBLIC METHODS
-    function SetType($aType,$aFileName='',$aScale=1.0) {
-        $this->type = $aType;
-        if( $aType == MARK_IMG && $aFileName=='' ) {
-            JpGraphError::RaiseL(23003);//('A filename must be specified if you set the mark type to MARK_IMG.');
-        }
-        $this->iFileName = $aFileName;
-        $this->iScale = $aScale;
-    }
-
-    function SetCallback($aFunc) {
-        $this->iFormatCallback = $aFunc;
-    }
-
-    function SetCallbackYX($aFunc) {
-        $this->iFormatCallback2 = $aFunc;
-    }
-
-    function GetType() {
-        return $this->type;
-    }
-
-    function SetColor($aColor) {
-        $this->color=$aColor;
-    }
-
-    function SetFillColor($aFillColor) {
-        $this->fill_color = $aFillColor;
-    }
-
-    function SetWeight($aWeight) {
-        $this->weight = $aWeight;
-    }
-
-    // Synonym for SetWidth()
-    function SetSize($aWidth) {
-        $this->width=$aWidth;
-    }
-
-    function SetWidth($aWidth) {
-        $this->width=$aWidth;
-    }
-
-    function SetDefaultWidth() {
-        switch( $this->type ) {
-            case MARK_CIRCLE:
-            case MARK_FILLEDCIRCLE:
-                $this->width=4;
-                break;
-            default:
-                $this->width=7;
-        }
-    }
-
-    function GetWidth() {
-        return $this->width;
-    }
-
-    function Hide($aHide=true) {
-        $this->show = !$aHide;
-    }
-
-    function Show($aShow=true) {
-        $this->show = $aShow;
-    }
-
-    function SetCSIMAltVal($aY,$aX='') {
-        $this->yvalue=$aY;
-        $this->xvalue=$aX;
-    }
-
-    function SetCSIMTarget($aTarget,$aWinTarget='') {
-        $this->csimtarget=$aTarget;
-        $this->csimwintarget=$aWinTarget;
-    }
-
-    function SetCSIMAlt($aAlt) {
-        $this->csimalt=$aAlt;
-    }
-
-    function GetCSIMAreas(){
-        return $this->csimareas;
-    }
-
-    function AddCSIMPoly($aPts) {
-        $coords = round($aPts[0]).", ".round($aPts[1]);
-        $n = count($aPts)/2;
-        for( $i=1; $i < $n; ++$i){
-            $coords .= ", ".round($aPts[2*$i]).", ".round($aPts[2*$i+1]);
-        }
-        $this->csimareas="";
-        if( !empty($this->csimtarget) ) {
-            $this->csimareas .= "<area shape=\"poly\" coords=\"$coords\" href=\"".htmlentities($this->csimtarget)."\"";
-
-            if( !empty($this->csimwintarget) ) {
-                $this->csimareas .= " target=\"".$this->csimwintarget."\" ";
-            }
-
-            if( !empty($this->csimalt) ) {
-                $tmp=sprintf($this->csimalt,$this->yvalue,$this->xvalue);
-                $this->csimareas .= " title=\"$tmp\" alt=\"$tmp\"";
-            }
-            $this->csimareas .= " />\n";
-        }
-    }
-
-    function AddCSIMCircle($x,$y,$r) {
-        $x = round($x); $y=round($y); $r=round($r);
-        $this->csimareas="";
-        if( !empty($this->csimtarget) ) {
-            $this->csimareas .= "<area shape=\"circle\" coords=\"$x,$y,$r\" href=\"".htmlentities($this->csimtarget)."\"";
-
-            if( !empty($this->csimwintarget) ) {
-                $this->csimareas .= " target=\"".$this->csimwintarget."\" ";
-            }
-
-            if( !empty($this->csimalt) ) {
-                $tmp=sprintf($this->csimalt,$this->yvalue,$this->xvalue);
-                $this->csimareas .= " title=\"$tmp\" alt=\"$tmp\" ";
-            }
-            $this->csimareas .= " />\n";
-        }
-    }
-     
-    function Stroke($img,$x,$y) {
-        if( !$this->show ) return;
-
-        if( $this->iFormatCallback != '' || $this->iFormatCallback2 != '' ) {
-
-            if( $this->iFormatCallback != '' ) {
-                $f = $this->iFormatCallback;
-                list($width,$color,$fcolor) = call_user_func($f,$this->yvalue);
-                $filename = $this->iFileName;
-                $imgscale = $this->iScale;
-            }
-            else {
-                $f = $this->iFormatCallback2;
-                list($width,$color,$fcolor,$filename,$imgscale) = call_user_func($f,$this->yvalue,$this->xvalue);
-                if( $filename=="" ) $filename = $this->iFileName;
-                if( $imgscale=="" ) $imgscale = $this->iScale;
-            }
-
-            if( $width=="" ) $width = $this->width;
-            if( $color=="" ) $color = $this->color;
-            if( $fcolor=="" ) $fcolor = $this->fill_color;
-
-        }
-        else {
-            $fcolor = $this->fill_color;
-            $color = $this->color;
-            $width = $this->width;
-            $filename = $this->iFileName;
-            $imgscale = $this->iScale;
-        }
-
-        if( $this->type == MARK_IMG ||
-        ($this->type >= MARK_FLAG1 && $this->type <= MARK_FLAG4 ) ||
-        $this->type >= MARK_IMG_PUSHPIN ) {
-
-            // Note: For the builtin images we use the "filename" parameter
-            // to denote the color
-            $anchor_x = 0.5;
-            $anchor_y = 0.5;
-            switch( $this->type ) {
-                case MARK_FLAG1:
-                case MARK_FLAG2:
-                case MARK_FLAG3:
-                case MARK_FLAG4:
-                    $this->markimg = FlagCache::GetFlagImgByName($this->type-MARK_FLAG1+1,$filename);
-                    break;
-
-                case MARK_IMG :
-                    // Load an image and use that as a marker
-                    // Small optimization, if we have already read an image don't
-                    // waste time reading it again.
-                    if( $this->markimg == '' || !($this->oldfilename === $filename) ) {
-                        $this->markimg = Graph::LoadBkgImage('',$filename);
-                        $this->oldfilename = $filename ;
-                    }
-                    break;
-
-                case MARK_IMG_PUSHPIN:
-                case MARK_IMG_SPUSHPIN:
-                case MARK_IMG_LPUSHPIN:
-                    if( $this->imgdata_pushpins == null ) {
-                        require_once 'imgdata_pushpins.inc.php';
-                        $this->imgdata_pushpins = new ImgData_PushPins();
-                    }
-                    $this->markimg = $this->imgdata_pushpins->GetImg($this->type,$filename);
-                    list($anchor_x,$anchor_y) = $this->imgdata_pushpins->GetAnchor();
-                    break;
-
-                case MARK_IMG_SQUARE:
-                    if( $this->imgdata_squares == null ) {
-                        require_once 'imgdata_squares.inc.php';
-                        $this->imgdata_squares = new ImgData_Squares();
-                    }
-                    $this->markimg = $this->imgdata_squares->GetImg($this->type,$filename);
-                    list($anchor_x,$anchor_y) = $this->imgdata_squares->GetAnchor();
-                    break;
-
-                case MARK_IMG_STAR:
-                    if( $this->imgdata_stars == null ) {
-                        require_once 'imgdata_stars.inc.php';
-                        $this->imgdata_stars = new ImgData_Stars();
-                    }
-                    $this->markimg = $this->imgdata_stars->GetImg($this->type,$filename);
-                    list($anchor_x,$anchor_y) = $this->imgdata_stars->GetAnchor();
-                    break;
-
-                case MARK_IMG_BEVEL:
-                    if( $this->imgdata_bevels == null ) {
-                        require_once 'imgdata_bevels.inc.php';
-                        $this->imgdata_bevels = new ImgData_Bevels();
-                    }
-                    $this->markimg = $this->imgdata_bevels->GetImg($this->type,$filename);
-                    list($anchor_x,$anchor_y) = $this->imgdata_bevels->GetAnchor();
-                    break;
-
-                case MARK_IMG_DIAMOND:
-                    if( $this->imgdata_diamonds == null ) {
-                        require_once 'imgdata_diamonds.inc.php';
-                        $this->imgdata_diamonds = new ImgData_Diamonds();
-                    }
-                    $this->markimg = $this->imgdata_diamonds->GetImg($this->type,$filename);
-                    list($anchor_x,$anchor_y) = $this->imgdata_diamonds->GetAnchor();
-                    break;
-
-                case MARK_IMG_BALL:
-                case MARK_IMG_SBALL:
-                case MARK_IMG_MBALL:
-                case MARK_IMG_LBALL:
-                    if( $this->imgdata_balls == null ) {
-                        require_once 'imgdata_balls.inc.php';
-                        $this->imgdata_balls = new ImgData_Balls();
-                    }
-                    $this->markimg = $this->imgdata_balls->GetImg($this->type,$filename);
-                    list($anchor_x,$anchor_y) = $this->imgdata_balls->GetAnchor();
-                    break;
-            }
-
-            $w = $img->GetWidth($this->markimg);
-            $h = $img->GetHeight($this->markimg);
-             
-            $dw = round($imgscale * $w );
-            $dh = round($imgscale * $h );
-
-            // Do potential rotation
-            list($x,$y) = $img->Rotate($x,$y);
-
-            $dx = round($x-$dw*$anchor_x);
-            $dy = round($y-$dh*$anchor_y);
-             
-            $this->width = max($dx,$dy);
-             
-            $img->Copy($this->markimg,$dx,$dy,0,0,$dw,$dh,$w,$h);
-            if( !empty($this->csimtarget) ) {
-                $this->csimareas = "<area shape=\"rect\" coords=\"".
-                $dx.','.$dy.','.round($dx+$dw).','.round($dy+$dh).'" '.
-      "href=\"".htmlentities($this->csimtarget)."\"";
-
-                if( !empty($this->csimwintarget) ) {
-                    $this->csimareas .= " target=\"".$this->csimwintarget."\" ";
-                }
-
-                if( !empty($this->csimalt) ) {
-                    $tmp=sprintf($this->csimalt,$this->yvalue,$this->xvalue);
-                    $this->csimareas .= " title=\"$tmp\" alt=\"$tmp\" ";
-                }
-                $this->csimareas .= " />\n";
-            }
-             
-            // Stroke title
-            $this->title->Align("center","top");
-            $this->title->Stroke($img,$x,$y+round($dh/2));
-            return;
-        }
-
-        $weight = $this->weight;
-        $dx=round($width/2,0);
-        $dy=round($width/2,0);
-        $pts=0;
-
-        switch( $this->type ) {
-            case MARK_SQUARE:
-                $c[]=$x-$dx;$c[]=$y-$dy;
-                $c[]=$x+$dx;$c[]=$y-$dy;
-                $c[]=$x+$dx;$c[]=$y+$dy;
-                $c[]=$x-$dx;$c[]=$y+$dy;
-                $c[]=$x-$dx;$c[]=$y-$dy;
-                $pts=5;
-                break;
-            case MARK_UTRIANGLE:
-                ++$dx;++$dy;
-                $c[]=$x-$dx;$c[]=$y+0.87*$dy; // tan(60)/2*$dx
-                $c[]=$x;$c[]=$y-0.87*$dy;
-                $c[]=$x+$dx;$c[]=$y+0.87*$dy;
-                $c[]=$x-$dx;$c[]=$y+0.87*$dy; // tan(60)/2*$dx
-                $pts=4;
-                break;
-            case MARK_DTRIANGLE:
-                ++$dx;++$dy;
-                $c[]=$x;$c[]=$y+0.87*$dy; // tan(60)/2*$dx
-                $c[]=$x-$dx;$c[]=$y-0.87*$dy;
-                $c[]=$x+$dx;$c[]=$y-0.87*$dy;
-                $c[]=$x;$c[]=$y+0.87*$dy; // tan(60)/2*$dx
-                $pts=4;
-                break;
-            case MARK_DIAMOND:
-                $c[]=$x;$c[]=$y+$dy;
-                $c[]=$x-$dx;$c[]=$y;
-                $c[]=$x;$c[]=$y-$dy;
-                $c[]=$x+$dx;$c[]=$y;
-                $c[]=$x;$c[]=$y+$dy;
-                $pts=5;
-                break;
-            case MARK_LEFTTRIANGLE:
-                $c[]=$x;$c[]=$y;
-                $c[]=$x;$c[]=$y+2*$dy;
-                $c[]=$x+$dx*2;$c[]=$y;
-                $c[]=$x;$c[]=$y;
-                $pts=4;
-                break;
-            case MARK_RIGHTTRIANGLE:
-                $c[]=$x-$dx*2;$c[]=$y;
-                $c[]=$x;$c[]=$y+2*$dy;
-                $c[]=$x;$c[]=$y;
-                $c[]=$x-$dx*2;$c[]=$y;
-                $pts=4;
-                break;
-            case MARK_FLASH:
-                $dy *= 2;
-                $c[]=$x+$dx/2; $c[]=$y-$dy;
-                $c[]=$x-$dx+$dx/2; $c[]=$y+$dy*0.7-$dy;
-                $c[]=$x+$dx/2; $c[]=$y+$dy*1.3-$dy;
-                $c[]=$x-$dx+$dx/2; $c[]=$y+2*$dy-$dy;
-                $img->SetLineWeight($weight);
-                $img->SetColor($color);
-                $img->Polygon($c);
-                $img->SetLineWeight(1);
-                $this->AddCSIMPoly($c);
-                break;
-        }
-
-        if( $pts>0 ) {
-            $this->AddCSIMPoly($c);
-            $img->SetLineWeight($weight);
-            $img->SetColor($fcolor);
-            $img->FilledPolygon($c);
-            $img->SetColor($color);
-            $img->Polygon($c);
-            $img->SetLineWeight(1);
-        }
-        elseif( $this->type==MARK_CIRCLE ) {
-            $img->SetColor($color);
-            $img->Circle($x,$y,$width);
-            $this->AddCSIMCircle($x,$y,$width);
-        }
-        elseif( $this->type==MARK_FILLEDCIRCLE ) {
-            $img->SetColor($fcolor);
-            $img->FilledCircle($x,$y,$width);
-            $img->SetColor($color);
-            $img->Circle($x,$y,$width);
-            $this->AddCSIMCircle($x,$y,$width);
-        }
-        elseif( $this->type==MARK_CROSS ) {
-            // Oversize by a pixel to match the X
-            $img->SetColor($color);
-            $img->SetLineWeight($weight);
-            $img->Line($x,$y+$dy+1,$x,$y-$dy-1);
-            $img->Line($x-$dx-1,$y,$x+$dx+1,$y);
-            $this->AddCSIMCircle($x,$y,$dx);
-        }
-        elseif( $this->type==MARK_X ) {
-            $img->SetColor($color);
-            $img->SetLineWeight($weight);
-            $img->Line($x+$dx,$y+$dy,$x-$dx,$y-$dy);
-            $img->Line($x-$dx,$y+$dy,$x+$dx,$y-$dy);
-            $this->AddCSIMCircle($x,$y,$dx+$dy);
-        }
-        elseif( $this->type==MARK_STAR ) {
-            $img->SetColor($color);
-            $img->SetLineWeight($weight);
-            $img->Line($x+$dx,$y+$dy,$x-$dx,$y-$dy);
-            $img->Line($x-$dx,$y+$dy,$x+$dx,$y-$dy);
-            // Oversize by a pixel to match the X
-            $img->Line($x,$y+$dy+1,$x,$y-$dy-1);
-            $img->Line($x-$dx-1,$y,$x+$dx+1,$y);
-            $this->AddCSIMCircle($x,$y,$dx+$dy);
-        }
-
-        // Stroke title
-        $this->title->Align("center","center");
-        $this->title->Stroke($img,$x,$y);
-    }
-} // Class
-
-
-
-//========================================================================
-// CLASS ImgData
-// Description: Base class for all image data classes that contains the
-// real image data.
-//========================================================================
-class ImgData {
-    protected $name = '';  // Each subclass gives a name
-    protected $an = array();  // Data array names
-    protected $colors = array(); // Available colors
-    protected $index  = array(); // Index for colors
-    protected $maxidx = 0 ;  // Max color index
-    protected $anchor_x=0.5, $anchor_y=0.5 ;    // Where is the center of the image
-    
-    function __construct() {
-        // Empty
-    }
-    
-    // Create a GD image from the data and return a GD handle
-    function GetImg($aMark,$aIdx) {
-        $n = $this->an[$aMark];
-        if( is_string($aIdx) ) {
-            if( !in_array($aIdx,$this->colors) ) {
-                JpGraphError::RaiseL(23001,$this->name,$aIdx);//('This marker "'.($this->name).'" does not exist in color: '.$aIdx);
-            }
-            $idx = $this->index[$aIdx];
-        }
-        elseif( !is_integer($aIdx) ||
-        (is_integer($aIdx) && $aIdx > $this->maxidx ) ) {
-            JpGraphError::RaiseL(23002,$this->name);//('Mark color index too large for marker "'.($this->name).'"');
-        }
-        else
-        $idx = $aIdx ;
-        return Image::CreateFromString(base64_decode($this->{$n}[$idx][1]));
-    }
-    
-    function GetAnchor() {
-        return array($this->anchor_x,$this->anchor_y);
-    }
-}
-
-
-// Keep a global flag cache to reduce memory usage
-$_gFlagCache=array(
-1 => null,
-2 => null,
-3 => null,
-4 => null,
-);
-// Only supposed to b called as statics
-class FlagCache {
-    
-    static function GetFlagImgByName($aSize,$aName) {
-        global $_gFlagCache;
-        require_once('jpgraph_flags.php');
-        if( $_gFlagCache[$aSize] === null ) {
-            $_gFlagCache[$aSize] = new FlagImages($aSize);
-        }
-        $f = $_gFlagCache[$aSize];
-        $idx = $f->GetIdxByName($aName,$aFullName);
-        return $f->GetImgByIdx($idx);
-    }
-}
-
-?>
diff --git a/#jpgraph/src/jpgraph_polar.php b/#jpgraph/src/jpgraph_polar.php
deleted file mode 100644
index 62c6bbc8..00000000
--- a/#jpgraph/src/jpgraph_polar.php
+++ /dev/null
@@ -1,897 +0,0 @@
-<?php
-/*=======================================================================
- // File:        JPGRAPH_POLAR.PHP
- // Description: Polar plot extension for JpGraph
- // Created:     2003-02-02
- // Ver:         $Id: jpgraph_polar.php 1796 2009-09-07 09:37:19Z ljp $
- //
- // Copyright (c) Asial Corporation. All rights reserved.
- //========================================================================
- */
-
-require_once ('jpgraph_plotmark.inc.php');
-require_once "jpgraph_log.php";
-
-
-define('POLAR_360',1);
-define('POLAR_180',2);
-
-//
-// Note. Don't attempt to make sense of this code.
-// In order not to have to be able to inherit the scaling code
-// from the main graph package we have had to make some "tricks" since
-// the original scaling and axis was not designed to do what is
-// required here.
-// There were two option. 1: Re-implement everything and get a clean design
-// and 2: do some "small" trickery and be able to inherit most of
-// the functionlity from the main graph package.
-// We choose 2: here in order to save some time.
-//
-
-//--------------------------------------------------------------------------
-// class PolarPlot
-//--------------------------------------------------------------------------
-class PolarPlot {
-    public $line_style='solid',$mark;
-    public $legendcsimtarget='';
-    public $legendcsimalt='';
-    public $legend="";
-    public $csimtargets=array(); // Array of targets for CSIM
-    public $csimareas="";   // Resultant CSIM area tags
-    public $csimalts=null;   // ALT:s for corresponding target
-    public $scale=null;
-    private $numpoints=0;
-    private $iColor='navy',$iFillColor='';
-    private $iLineWeight=1;
-    private $coord=null;
-
-    function __construct($aData) {
-        $n = count($aData);
-        if( $n & 1 ) {
-            JpGraphError::RaiseL(17001);
-            //('Polar plots must have an even number of data point. Each data point is a tuple (angle,radius).');
-        }
-        $this->numpoints = $n/2;
-        $this->coord = $aData;
-        $this->mark = new PlotMark();
-    }
-
-    function SetWeight($aWeight) {
-        $this->iLineWeight = $aWeight;
-    }
-
-    function SetColor($aColor){
-        $this->iColor = $aColor;
-    }
-
-    function SetFillColor($aColor){
-        $this->iFillColor = $aColor;
-    }
-
-    function Max() {
-        $m = $this->coord[1];
-        $i=1;
-        while( $i < $this->numpoints ) {
-            $m = max($m,$this->coord[2*$i+1]);
-            ++$i;
-        }
-        return $m;
-    }
-    // Set href targets for CSIM
-    function SetCSIMTargets($aTargets,$aAlts=null) {
-        $this->csimtargets=$aTargets;
-        $this->csimalts=$aAlts;
-    }
-
-    // Get all created areas
-    function GetCSIMareas() {
-        return $this->csimareas;
-    }
-
-    function SetLegend($aLegend,$aCSIM="",$aCSIMAlt="") {
-        $this->legend = $aLegend;
-        $this->legendcsimtarget = $aCSIM;
-        $this->legendcsimalt = $aCSIMAlt;
-    }
-
-    // Private methods
-
-    function Legend($aGraph) {
-        $color = $this->iColor ;
-        if( $this->legend != "" ) {
-            if( $this->iFillColor!='' ) {
-                $color = $this->iFillColor;
-                $aGraph->legend->Add($this->legend,$color,$this->mark,0,
-                $this->legendcsimtarget,$this->legendcsimalt);
-            }
-            else {
-                $aGraph->legend->Add($this->legend,$color,$this->mark,$this->line_style,
-                $this->legendcsimtarget,$this->legendcsimalt);
-            }
-        }
-    }
-
-    function Stroke($img,$scale) {
-
-        $i=0;
-        $p=array();
-        $this->csimareas='';
-        while($i < $this->numpoints) {
-            list($x1,$y1) = $scale->PTranslate($this->coord[2*$i],$this->coord[2*$i+1]);
-            $p[2*$i] = $x1;
-            $p[2*$i+1] = $y1;
-
-            if( isset($this->csimtargets[$i]) ) {
-                $this->mark->SetCSIMTarget($this->csimtargets[$i]);
-                $this->mark->SetCSIMAlt($this->csimalts[$i]);
-                $this->mark->SetCSIMAltVal($this->coord[2*$i], $this->coord[2*$i+1]);
-                $this->mark->Stroke($img,$x1,$y1);
-                $this->csimareas .= $this->mark->GetCSIMAreas();
-            }
-            else {
-            	$this->mark->Stroke($img,$x1,$y1);
-            }
-
-            ++$i;
-        }
-
-        if( $this->iFillColor != '' ) {
-            $img->SetColor($this->iFillColor);
-            $img->FilledPolygon($p);
-        }
-        $img->SetLineWeight($this->iLineWeight);
-        $img->SetColor($this->iColor);
-        $img->Polygon($p,$this->iFillColor!='');
-    }
-}
-
-//--------------------------------------------------------------------------
-// class PolarAxis
-//--------------------------------------------------------------------------
-class PolarAxis extends Axis {
-    private $angle_step=15,$angle_color='lightgray',$angle_label_color='black';
-    private $angle_fontfam=FF_FONT1,$angle_fontstyle=FS_NORMAL,$angle_fontsize=10;
-    private $angle_fontcolor = 'navy';
-    private $gridminor_color='lightgray',$gridmajor_color='lightgray';
-    private $show_minor_grid = false, $show_major_grid = true ;
-    private $show_angle_mark=true, $show_angle_grid=true, $show_angle_label=true;
-    private $angle_tick_len=3, $angle_tick_len2=3, $angle_tick_color='black';
-    private $show_angle_tick=true;
-    private $radius_tick_color='black';
-
-    function __construct($img,$aScale) {
-        parent::__construct($img,$aScale);
-    }
-
-    function ShowAngleDegreeMark($aFlg=true) {
-        $this->show_angle_mark = $aFlg;
-    }
-
-    function SetAngleStep($aStep) {
-        $this->angle_step=$aStep;
-    }
-
-    function HideTicks($aFlg=true,$aAngleFlg=true) {
-        parent::HideTicks($aFlg,$aFlg);
-        $this->show_angle_tick = !$aAngleFlg;
-    }
-
-    function ShowAngleLabel($aFlg=true) {
-        $this->show_angle_label = $aFlg;
-    }
-
-    function ShowGrid($aMajor=true,$aMinor=false,$aAngle=true) {
-        $this->show_minor_grid = $aMinor;
-        $this->show_major_grid = $aMajor;
-        $this->show_angle_grid = $aAngle ;
-    }
-
-    function SetAngleFont($aFontFam,$aFontStyle=FS_NORMAL,$aFontSize=10) {
-        $this->angle_fontfam = $aFontFam;
-        $this->angle_fontstyle = $aFontStyle;
-        $this->angle_fontsize = $aFontSize;
-    }
-
-    function SetColor($aColor,$aRadColor='',$aAngleColor='') {
-        if( $aAngleColor == '' )
-        $aAngleColor=$aColor;
-        parent::SetColor($aColor,$aRadColor);
-        $this->angle_fontcolor = $aAngleColor;
-    }
-
-    function SetGridColor($aMajorColor,$aMinorColor='',$aAngleColor='') {
-        if( $aMinorColor == '' )
-        $aMinorColor = $aMajorColor;
-        if( $aAngleColor == '' )
-        $aAngleColor = $aMajorColor;
-
-        $this->gridminor_color = $aMinorColor;
-        $this->gridmajor_color = $aMajorColor;
-        $this->angle_color = $aAngleColor;
-    }
-
-    function SetTickColors($aRadColor,$aAngleColor='') {
-        $this->radius_tick_color = $aRadColor;
-        $this->angle_tick_color = $aAngleColor;
-    }
-
-    // Private methods
-    function StrokeGrid($pos) {
-        $x = round($this->img->left_margin + $this->img->plotwidth/2);
-        $this->scale->ticks->Stroke($this->img,$this->scale,$pos);
-
-        // Stroke the minor arcs
-        $pmin = array();
-        $p = $this->scale->ticks->ticks_pos;
-        $n = count($p);
-        $i = 0;
-        $this->img->SetColor($this->gridminor_color);
-        while( $i < $n ) {
-            $r = $p[$i]-$x+1;
-            $pmin[]=$r;
-            if( $this->show_minor_grid ) {
-                $this->img->Circle($x,$pos,$r);
-            }
-            $i++;
-        }
-
-        $limit = max($this->img->plotwidth,$this->img->plotheight)*1.4 ;
-        while( $r < $limit ) {
-            $off = $r;
-            $i=1;
-            $r = $off + round($p[$i]-$x+1);
-            while( $r < $limit && $i < $n ) {
-                $r = $off+$p[$i]-$x;
-                $pmin[]=$r;
-                if( $this->show_minor_grid ) {
-                    $this->img->Circle($x,$pos,$r);
-                }
-                $i++;
-            }
-        }
-
-        // Stroke the major arcs
-        if( $this->show_major_grid ) {
-            // First determine how many minor step on
-            // every major step. We have recorded the minor radius
-            // in pmin and use these values. This is done in order
-            // to avoid rounding errors if we were to recalculate the
-            // different major radius.
-            $pmaj = $this->scale->ticks->maj_ticks_pos;
-            $p = $this->scale->ticks->ticks_pos;
-            if( $this->scale->name == 'lin' ) {
-                $step=round(($pmaj[1] - $pmaj[0])/($p[1] - $p[0]));
-            }
-            else {
-                $step=9;
-            }
-            $n = round(count($pmin)/$step);
-            $i = 0;
-            $this->img->SetColor($this->gridmajor_color);
-            $limit = max($this->img->plotwidth,$this->img->plotheight)*1.4 ;
-            $off = $r;
-            $i=0;
-            $r = $pmin[$i*$step];
-            while( $r < $limit && $i < $n ) {
-                $r = $pmin[$i*$step];
-                $this->img->Circle($x,$pos,$r);
-                $i++;
-            }
-        }
-
-        // Draw angles
-        if( $this->show_angle_grid ) {
-            $this->img->SetColor($this->angle_color);
-            $d = max($this->img->plotheight,$this->img->plotwidth)*1.4 ;
-            $a = 0;
-            $p = $this->scale->ticks->ticks_pos;
-            $start_radius = $p[1]-$x;
-            while( $a < 360 ) {
-                if( $a == 90 || $a == 270 ) {
-                    // Make sure there are no rounding problem with
-                    // exactly vertical lines
-                    $this->img->Line($x+$start_radius*cos($a/180*M_PI)+1,
-                                     $pos-$start_radius*sin($a/180*M_PI),
-                                     $x+$start_radius*cos($a/180*M_PI)+1,
-                                     $pos-$d*sin($a/180*M_PI));
-
-                }
-                else {
-                    $this->img->Line($x+$start_radius*cos($a/180*M_PI)+1,
-                                     $pos-$start_radius*sin($a/180*M_PI),
-                                     $x+$d*cos($a/180*M_PI),
-                                     $pos-$d*sin($a/180*M_PI));
-                }
-                $a += $this->angle_step;
-            }
-        }
-    }
-
-    function StrokeAngleLabels($pos,$type) {
-
-        if( !$this->show_angle_label )
-            return;
-
-        $x0 = round($this->img->left_margin+$this->img->plotwidth/2)+1;
-
-        $d = max($this->img->plotwidth,$this->img->plotheight)*1.42;
-        $a = $this->angle_step;
-        $t = new Text();
-        $t->SetColor($this->angle_fontcolor);
-        $t->SetFont($this->angle_fontfam,$this->angle_fontstyle,$this->angle_fontsize);
-        $xright = $this->img->width - $this->img->right_margin;
-        $ytop = $this->img->top_margin;
-        $xleft = $this->img->left_margin;
-        $ybottom = $this->img->height - $this->img->bottom_margin;
-        $ha = 'left';
-        $va = 'center';
-        $w = $this->img->plotwidth/2;
-        $h = $this->img->plotheight/2;
-        $xt = $x0; $yt = $pos;
-        $margin=5;
-
-        $tl  = $this->angle_tick_len ; // Outer len
-        $tl2 = $this->angle_tick_len2 ; // Interior len
-
-        $this->img->SetColor($this->angle_tick_color);
-        $rot90 = $this->img->a == 90 ;
-
-        if( $type == POLAR_360 ) {
-
-            // Corner angles of the four corners
-            $ca1 = atan($h/$w)/M_PI*180;
-            $ca2 = 180-$ca1;
-            $ca3 = $ca1+180;
-            $ca4 = 360-$ca1;
-            $end = 360;
-
-            while( $a < $end ) {
-                $ca = cos($a/180*M_PI);
-                $sa = sin($a/180*M_PI);
-                $x = $d*$ca;
-                $y = $d*$sa;
-                $xt=1000;$yt=1000;
-                if( $a <= $ca1 || $a >= $ca4 ) {
-                    $yt = $pos - $w * $y/$x;
-                    $xt = $xright + $margin;
-                    if( $rot90 ) {
-                        $ha = 'center';
-                        $va = 'top';
-                    }
-                    else {
-                        $ha = 'left';
-                        $va = 'center';
-                    }
-                    $x1=$xright-$tl2; $x2=$xright+$tl;
-                    $y1=$y2=$yt;
-                }
-                elseif( $a > $ca1 && $a < $ca2 ) {
-                    $xt = $x0 + $h * $x/$y;
-                    $yt = $ytop - $margin;
-                    if( $rot90 ) {
-                        $ha = 'left';
-                        $va = 'center';
-                    }
-                    else {
-                        $ha = 'center';
-                        $va = 'bottom';
-                    }
-                    $y1=$ytop+$tl2;$y2=$ytop-$tl;
-                    $x1=$x2=$xt;
-                }
-                elseif( $a >= $ca2 && $a <= $ca3 ) {
-                    $yt = $pos + $w * $y/$x;
-                    $xt = $xleft - $margin;
-                    if( $rot90 ) {
-                        $ha = 'center';
-                        $va = 'bottom';
-                    }
-                    else {
-                        $ha = 'right';
-                        $va = 'center';
-                    }
-                    $x1=$xleft+$tl2;$x2=$xleft-$tl;
-                    $y1=$y2=$yt;
-                }
-                else {
-                    $xt = $x0 - $h * $x/$y;
-                    $yt = $ybottom + $margin;
-                    if( $rot90 ) {
-                        $ha = 'right';
-                        $va = 'center';
-                    }
-                    else {
-                        $ha = 'center';
-                        $va = 'top';
-                    }
-                    $y1=$ybottom-$tl2;$y2=$ybottom+$tl;
-                    $x1=$x2=$xt;
-                }
-                if( $a != 0 && $a != 180 ) {
-                    $t->Align($ha,$va);
-                    if( $this->scale->clockwise ) {
-                        $t->Set(360-$a);
-                    }
-                    else {
-                        $t->Set($a);
-                    }
-                    if( $this->show_angle_mark && $t->font_family > 4 ) {
-                        $a .= SymChar::Get('degree');
-                    }
-                    $t->Stroke($this->img,$xt,$yt);
-                    if( $this->show_angle_tick ) {
-                        $this->img->Line($x1,$y1,$x2,$y2);
-                    }
-                }
-                $a += $this->angle_step;
-            }
-        }
-        else {
-            // POLAR_HALF
-            $ca1 = atan($h/$w*2)/M_PI*180;
-            $ca2 = 180-$ca1;
-            $end = 180;
-            while( $a < $end ) {
-                $ca = cos($a/180*M_PI);
-                $sa = sin($a/180*M_PI);
-                $x = $d*$ca;
-                $y = $d*$sa;
-                if( $a <= $ca1 ) {
-                    $yt = $pos - $w * $y/$x;
-                    $xt = $xright + $margin;
-                    if( $rot90 ) {
-                        $ha = 'center';
-                        $va = 'top';
-                    }
-                    else {
-                        $ha = 'left';
-                        $va = 'center';
-                    }
-                    $x1=$xright-$tl2; $x2=$xright+$tl;
-                    $y1=$y2=$yt;
-                }
-                elseif( $a > $ca1 && $a < $ca2 ) {
-                    $xt = $x0 + 2*$h * $x/$y;
-                    $yt = $ytop - $margin;
-                    if( $rot90 ) {
-                        $ha = 'left';
-                        $va = 'center';
-                    }
-                    else {
-                        $ha = 'center';
-                        $va = 'bottom';
-                    }
-                    $y1=$ytop+$tl2;$y2=$ytop-$tl;
-                    $x1=$x2=$xt;
-                }
-                elseif( $a >= $ca2 ) {
-                    $yt = $pos + $w * $y/$x;
-                    $xt = $xleft - $margin;
-                    if( $rot90 ) {
-                        $ha = 'center';
-                        $va = 'bottom';
-                    }
-                    else {
-                        $ha = 'right';
-                        $va = 'center';
-                    }
-                    $x1=$xleft+$tl2;$x2=$xleft-$tl;
-                    $y1=$y2=$yt;
-                }
-                $t->Align($ha,$va);
-                if( $this->show_angle_mark && $t->font_family > 4 ) {
-                	$a .= SymChar::Get('degree');
-                }
-                $t->Set($a);
-                $t->Stroke($this->img,$xt,$yt);
-                if( $this->show_angle_tick ) {
-                    $this->img->Line($x1,$y1,$x2,$y2);
-                }
-                $a += $this->angle_step;
-            }
-        }
-    }
-
-    function Stroke($pos,$dummy=true) {
-
-        $this->img->SetLineWeight($this->weight);
-        $this->img->SetColor($this->color);
-        $this->img->SetFont($this->font_family,$this->font_style,$this->font_size);
-        if( !$this->hide_line ) {
-            $this->img->FilledRectangle($this->img->left_margin,$pos,
-                                        $this->img->width-$this->img->right_margin,
-                                        $pos+$this->weight-1);
-        }
-        $y=$pos+$this->img->GetFontHeight()+$this->title_margin+$this->title->margin;
-        if( $this->title_adjust=="high" ) {
-            $this->title->SetPos($this->img->width-$this->img->right_margin,$y,"right","top");
-        }
-        elseif( $this->title_adjust=="middle" || $this->title_adjust=="center" ) {
-            $this->title->SetPos(($this->img->width-$this->img->left_margin-$this->img->right_margin)/2+$this->img->left_margin,
-                                $y,"center","top");
-        }
-        elseif($this->title_adjust=="low") {
-            $this->title->SetPos($this->img->left_margin,$y,"left","top");
-        }
-        else {
-            JpGraphError::RaiseL(17002,$this->title_adjust);
-            //('Unknown alignment specified for X-axis title. ('.$this->title_adjust.')');
-        }
-
-
-        if (!$this->hide_labels) {
-            $this->StrokeLabels($pos,false);
-        }
-        $this->img->SetColor($this->radius_tick_color);
-        $this->scale->ticks->Stroke($this->img,$this->scale,$pos);
-
-        //
-        // Mirror the positions for the left side of the scale
-        //
-        $mid = 2*($this->img->left_margin+$this->img->plotwidth/2);
-        $n = count($this->scale->ticks->ticks_pos);
-        $i=0;
-        while( $i < $n ) {
-            $this->scale->ticks->ticks_pos[$i] =
-            $mid-$this->scale->ticks->ticks_pos[$i] ;
-            ++$i;
-        }
-
-        $n = count($this->scale->ticks->maj_ticks_pos);
-        $i=0;
-        while( $i < $n ) {
-            $this->scale->ticks->maj_ticks_pos[$i] =
-            $mid-$this->scale->ticks->maj_ticks_pos[$i] ;
-            ++$i;
-        }
-
-        $n = count($this->scale->ticks->maj_ticklabels_pos);
-        $i=1;
-        while( $i < $n ) {
-            $this->scale->ticks->maj_ticklabels_pos[$i] =
-            $mid-$this->scale->ticks->maj_ticklabels_pos[$i] ;
-            ++$i;
-        }
-
-        // Draw the left side of the scale
-        $n = count($this->scale->ticks->ticks_pos);
-        $yu = $pos - $this->scale->ticks->direction*$this->scale->ticks->GetMinTickAbsSize();
-
-
-        // Minor ticks
-        if( ! $this->scale->ticks->supress_minor_tickmarks ) {
-            $i=1;
-            while( $i < $n/2 ) {
-                $x = round($this->scale->ticks->ticks_pos[$i]) ;
-                $this->img->Line($x,$pos,$x,$yu);
-                ++$i;
-            }
-        }
-
-        $n = count($this->scale->ticks->maj_ticks_pos);
-        $yu = $pos - $this->scale->ticks->direction*$this->scale->ticks->GetMajTickAbsSize();
-
-
-        // Major ticks
-        if( ! $this->scale->ticks->supress_tickmarks ) {
-            $i=1;
-            while( $i < $n/2 ) {
-                $x = round($this->scale->ticks->maj_ticks_pos[$i]) ;
-                $this->img->Line($x,$pos,$x,$yu);
-                ++$i;
-            }
-        }
-        if (!$this->hide_labels) {
-            $this->StrokeLabels($pos,false);
-        }
-        $this->title->Stroke($this->img);
-    }
-}
-
-class PolarScale extends LinearScale {
-    private $graph;
-    public $clockwise=false;
-
-    function __construct($aMax,$graph,$aClockwise) {
-        parent::__construct(0,$aMax,'x');
-        $this->graph = $graph;
-        $this->clockwise = $aClockwise;
-    }
-
-    function SetClockwise($aFlg) {
-        $this->clockwise = $aFlg;
-    }
-
-    function _Translate($v) {
-        return parent::Translate($v);
-    }
-
-    function PTranslate($aAngle,$aRad) {
-
-        $m = $this->scale[1];
-        $w = $this->graph->img->plotwidth/2;
-        $aRad = $aRad/$m*$w;
-
-        $a = $aAngle/180 * M_PI;
-        if( $this->clockwise ) { 
-            $a = 2*M_PI-$a;
-        }
-
-        $x = cos($a) * $aRad;
-        $y = sin($a) * $aRad;
-
-        $x += $this->_Translate(0);
-
-        if( $this->graph->iType == POLAR_360 ) {
-            $y = ($this->graph->img->top_margin + $this->graph->img->plotheight/2) - $y;
-        }
-        else {
-            $y = ($this->graph->img->top_margin + $this->graph->img->plotheight) - $y;
-        }
-        return array($x,$y);
-    }
-}
-
-class PolarLogScale extends LogScale {
-    private $graph;
-    public $clockwise=false;
-
-    function __construct($aMax,$graph,$aClockwise=false) {
-        parent::__construct(0,$aMax,'x');
-        $this->graph = $graph;
-        $this->ticks->SetLabelLogType(LOGLABELS_MAGNITUDE);
-        $this->clockwise = $aClockwise;
-
-    }
-
-    function SetClockwise($aFlg) {
-        $this->clockwise = $aFlg;
-    }
-
-    function PTranslate($aAngle,$aRad) {
-
-        if( $aRad == 0 )
-        $aRad = 1;
-        $aRad = log10($aRad);
-        $m = $this->scale[1];
-        $w = $this->graph->img->plotwidth/2;
-        $aRad = $aRad/$m*$w;
-
-        $a = $aAngle/180 * M_PI;
-        if( $this->clockwise ) {
-            $a = 2*M_PI-$a;
-        }
-
-        $x = cos( $a ) * $aRad;
-        $y = sin( $a ) * $aRad;
-
-        $x += $w+$this->graph->img->left_margin;//$this->_Translate(0);
-        if( $this->graph->iType == POLAR_360 ) {
-            $y = ($this->graph->img->top_margin + $this->graph->img->plotheight/2) - $y;
-        }
-        else {
-            $y = ($this->graph->img->top_margin + $this->graph->img->plotheight) - $y;
-        }
-        return array($x,$y);
-    }
-}
-
-class PolarGraph extends Graph {
-    public $scale;
-    public $axis;
-    public $iType=POLAR_360;
-    private $iClockwise=false;
-
-    function __construct($aWidth=300,$aHeight=200,$aCachedName="",$aTimeOut=0,$aInline=true) {
-        parent::__construct($aWidth,$aHeight,$aCachedName,$aTimeOut,$aInline) ;
-        $this->SetDensity(TICKD_DENSE);
-        $this->SetBox();
-        $this->SetMarginColor('white');
-    }
-
-    function SetDensity($aDense) {
-        $this->SetTickDensity(TICKD_NORMAL,$aDense);
-    }
-
-    function SetClockwise($aFlg) {
-        $this->scale->SetClockwise($aFlg);
-    }
-
-    function Set90AndMargin($lm=0,$rm=0,$tm=0,$bm=0) {
-        $adj = ($this->img->height - $this->img->width)/2;
-        $this->SetAngle(90);
-        $lm2 = -$adj + ($lm-$rm+$tm+$bm)/2;
-        $rm2 = -$adj + (-$lm+$rm+$tm+$bm)/2;
-        $tm2 = $adj + ($tm-$bm+$lm+$rm)/2;
-        $bm2 = $adj + (-$tm+$bm+$lm+$rm)/2;
-        $this->SetMargin($lm2, $rm2, $tm2, $bm2);
-        $this->axis->SetLabelAlign('right','center');
-    }
-
-    function SetScale($aScale,$rmax=0,$dummy1=1,$dummy2=1,$dummy3=1) {
-        if( $aScale == 'lin' ) {
-            $this->scale = new PolarScale($rmax,$this,$this->iClockwise);
-        }
-        elseif( $aScale == 'log' ) {
-            $this->scale = new PolarLogScale($rmax,$this,$this->iClockwise);
-        }
-        else {
-            JpGraphError::RaiseL(17004);//('Unknown scale type for polar graph. Must be "lin" or "log"');
-        }
-
-        $this->axis = new PolarAxis($this->img,$this->scale);
-        $this->SetMargin(40,40,50,40);
-    }
-
-    function SetType($aType) {
-        $this->iType = $aType;
-    }
-
-    function SetPlotSize($w,$h) {
-        $this->SetMargin(($this->img->width-$w)/2,($this->img->width-$w)/2,
-                         ($this->img->height-$h)/2,($this->img->height-$h)/2);
-    }
-
-    // Private methods
-    function GetPlotsMax() {
-        $n = count($this->plots);
-        $m = $this->plots[0]->Max();
-        $i=1;
-        while($i < $n) {
-            $m = max($this->plots[$i]->Max(),$m);
-            ++$i;
-        }
-        return $m;
-    }
-
-    function Stroke($aStrokeFileName="") {
-
-        // Start by adjusting the margin so that potential titles will fit.
-        $this->AdjustMarginsForTitles();
-
-        // If the filename is the predefined value = '_csim_special_'
-        // we assume that the call to stroke only needs to do enough
-        // to correctly generate the CSIM maps.
-        // We use this variable to skip things we don't strictly need
-        // to do to generate the image map to improve performance
-        // a best we can. Therefor you will see a lot of tests !$_csim in the
-        // code below.
-        $_csim = ($aStrokeFileName===_CSIM_SPECIALFILE);
-
-        // We need to know if we have stroked the plot in the
-        // GetCSIMareas. Otherwise the CSIM hasn't been generated
-        // and in the case of GetCSIM called before stroke to generate
-        // CSIM without storing an image to disk GetCSIM must call Stroke.
-        $this->iHasStroked = true;
-
-        //Check if we should autoscale axis
-        if( !$this->scale->IsSpecified() && count($this->plots)>0 ) {
-            $max = $this->GetPlotsMax();
-            $t1 = $this->img->plotwidth;
-            $this->img->plotwidth /= 2;
-            $t2 = $this->img->left_margin;
-            $this->img->left_margin += $this->img->plotwidth+1;
-            $this->scale->AutoScale($this->img,0,$max,
-            $this->img->plotwidth/$this->xtick_factor/2);
-            $this->img->plotwidth = $t1;
-            $this->img->left_margin = $t2;
-        }
-        else {
-            // The tick calculation will use the user suplied min/max values to determine
-            // the ticks. If auto_ticks is false the exact user specifed min and max
-            // values will be used for the scale.
-            // If auto_ticks is true then the scale might be slightly adjusted
-            // so that the min and max values falls on an even major step.
-            //$min = 0;
-            $max = $this->scale->scale[1];
-            $t1 = $this->img->plotwidth;
-            $this->img->plotwidth /= 2;
-            $t2 = $this->img->left_margin;
-            $this->img->left_margin += $this->img->plotwidth+1;
-            $this->scale->AutoScale($this->img,0,$max,
-            $this->img->plotwidth/$this->xtick_factor/2);
-            $this->img->plotwidth = $t1;
-            $this->img->left_margin = $t2;
-        }
-
-        if( $this->iType ==  POLAR_180 ) {
-        	$pos = $this->img->height - $this->img->bottom_margin;
-        }
-        else {
-        	$pos = $this->img->plotheight/2 + $this->img->top_margin;
-        }
-
-        if( !$_csim ) {
-            $this->StrokePlotArea();
-        }
-
-        $this->iDoClipping = true;
-
-        if( $this->iDoClipping ) {
-            $oldimage = $this->img->CloneCanvasH();
-        }
-
-        if( !$_csim ) {
-            $this->axis->StrokeGrid($pos);
-        }
-
-        // Stroke all plots for Y1 axis
-        for($i=0; $i < count($this->plots); ++$i) {
-            $this->plots[$i]->Stroke($this->img,$this->scale);
-        }
-
-
-        if( $this->iDoClipping ) {
-            // Clipping only supports graphs at 0 and 90 degrees
-            if( $this->img->a == 0  ) {
-                $this->img->CopyCanvasH($oldimage,$this->img->img,
-                                        $this->img->left_margin,$this->img->top_margin,
-                                        $this->img->left_margin,$this->img->top_margin,
-                                        $this->img->plotwidth+1,$this->img->plotheight+1);
-            }
-            elseif( $this->img->a == 90 ) {
-                $adj1 = round(($this->img->height - $this->img->width)/2);
-                $adj2 = round(($this->img->width - $this->img->height)/2);
-                $lm = $this->img->left_margin;
-                $rm = $this->img->right_margin;
-                $tm = $this->img->top_margin;
-                $bm = $this->img->bottom_margin;
-                $this->img->CopyCanvasH($oldimage,$this->img->img,
-                                        $adj2 + round(($lm-$rm+$tm+$bm)/2),
-                                        $adj1 + round(($tm-$bm+$lm+$rm)/2),
-                                        $adj2 + round(($lm-$rm+$tm+$bm)/2),
-                                        $adj1 + round(($tm-$bm+$lm+$rm)/2),
-                                        $this->img->plotheight+1,
-                                        $this->img->plotwidth+1);
-            }
-            $this->img->Destroy();
-            $this->img->SetCanvasH($oldimage);
-        }
-
-        if( !$_csim ) {
-            $this->axis->Stroke($pos);
-            $this->axis->StrokeAngleLabels($pos,$this->iType);
-        }
-
-        if( !$_csim ) {
-            $this->StrokePlotBox();
-            $this->footer->Stroke($this->img);
-
-            // The titles and legends never gets rotated so make sure
-            // that the angle is 0 before stroking them
-            $aa = $this->img->SetAngle(0);
-            $this->StrokeTitles();
-        }
-
-        for($i=0; $i < count($this->plots) ; ++$i ) {
-            $this->plots[$i]->Legend($this);
-        }
-
-        $this->legend->Stroke($this->img);
-
-        if( !$_csim ) {
-
-            $this->StrokeTexts();
-            $this->img->SetAngle($aa);
-
-            // Draw an outline around the image map
-            if(_JPG_DEBUG)
-            	$this->DisplayClientSideaImageMapAreas();
-
-            // If the filename is given as the special "__handle"
-            // then the image handler is returned and the image is NOT
-            // streamed back
-            if( $aStrokeFileName == _IMG_HANDLER ) {
-                return $this->img->img;
-            }
-            else {
-                // Finally stream the generated picture
-                $this->cache->PutAndStream($this->img,$this->cache_name,$this->inline,$aStrokeFileName);
-            }
-        }
-    }
-}
-
-
-
-?>
diff --git a/#jpgraph/src/jpgraph_radar.php b/#jpgraph/src/jpgraph_radar.php
deleted file mode 100644
index 1d3de628..00000000
--- a/#jpgraph/src/jpgraph_radar.php
+++ /dev/null
@@ -1,861 +0,0 @@
-<?php
-/*=======================================================================
- // File:        JPGRAPH_RADAR.PHP
- // Description: Radar plot extension for JpGraph
- // Created:     2001-02-04
- // Ver:         $Id: jpgraph_radar.php 1783 2009-08-25 11:41:01Z ljp $
- //
- // Copyright (c) Asial Corporation. All rights reserved.
- //========================================================================
- */
-
-require_once('jpgraph_plotmark.inc.php');
-
-//===================================================
-// CLASS RadarLogTicks
-// Description: Logarithmic ticks
-//===================================================
-class RadarLogTicks extends Ticks {
-
-    function __construct() {
-            // Empty
-    }
-
-    function Stroke($aImg,&$grid,$aPos,$aAxisAngle,$aScale,&$aMajPos,&$aMajLabel) {
-        $start = $aScale->GetMinVal();
-        $limit = $aScale->GetMaxVal();
-        $nextMajor = 10*$start;
-        $step = $nextMajor / 10.0;
-        $count=1;
-
-        $ticklen_maj=5;
-        $dx_maj=round(sin($aAxisAngle)*$ticklen_maj);
-        $dy_maj=round(cos($aAxisAngle)*$ticklen_maj);
-        $ticklen_min=3;
-        $dx_min=round(sin($aAxisAngle)*$ticklen_min);
-        $dy_min=round(cos($aAxisAngle)*$ticklen_min);
-
-        $aMajPos=array();
-        $aMajLabel=array();
-
-        if( $this->supress_first ) {
-            $aMajLabel[] = '';
-        }
-        else {
-            $aMajLabel[]=$start;
-        }
-
-        $yr=$aScale->RelTranslate($start);
-        $xt=round($yr*cos($aAxisAngle))+$aScale->scale_abs[0];
-        $yt=$aPos-round($yr*sin($aAxisAngle));
-        $aMajPos[]=$xt+2*$dx_maj;
-        $aMajPos[]=$yt-$aImg->GetFontheight()/2;
-        $grid[]=$xt;
-        $grid[]=$yt;
-
-        $aImg->SetLineWeight($this->weight);
-
-        for($y=$start; $y<=$limit; $y+=$step,++$count  ) {
-            $yr=$aScale->RelTranslate($y);
-            $xt=round($yr*cos($aAxisAngle))+$aScale->scale_abs[0];
-            $yt=$aPos-round($yr*sin($aAxisAngle));
-            if( $count % 10 == 0 ) {
-                $grid[]=$xt;
-                $grid[]=$yt;
-                $aMajPos[]=$xt+2*$dx_maj;
-                $aMajPos[]=$yt-$aImg->GetFontheight()/2;
-                if( !$this->supress_tickmarks ) {
-                    if( $this->majcolor != '' ) {
-                        $aImg->PushColor($this->majcolor);
-                    }
-                    $aImg->Line($xt+$dx_maj,$yt+$dy_maj,$xt-$dx_maj,$yt-$dy_maj);
-                    if( $this->majcolor != '' ) {
-                        $aImg->PopColor();
-                    }
-                }
-                if( $this->label_formfunc != '' ) {
-                    $f=$this->label_formfunc;
-                    $l = call_user_func($f,$nextMajor);
-                }
-                else {
-                    $l = $nextMajor;
-                }
-
-                $aMajLabel[]=$l;
-                $nextMajor *= 10;
-                $step *= 10;
-                $count=1;
-            }
-            else {
-                if( !$this->supress_minor_tickmarks ) {
-                    if( $this->mincolor != '' ) {
-                        $aImg->PushColor($this->mincolor);
-                    }
-                    $aImg->Line($xt+$dx_min,$yt+$dy_min,$xt-$dx_min,$yt-$dy_min);
-                    if( $this->mincolor != '' ) {
-                        $aImg->PopColor();
-                    }
-                }
-            }
-        }
-    }
-}
-
-//===================================================
-// CLASS RadarLinear
-// Description: Linear ticks
-//===================================================
-class RadarLinearTicks extends Ticks {
-
-    private $minor_step=1, $major_step=2;
-    private $xlabel_offset=0,$xtick_offset=0;
-
-    function __construct() {
-        // Empty
-    }
-
-    // Return major step size in world coordinates
-    function GetMajor() {
-        return $this->major_step;
-    }
-
-    // Return minor step size in world coordinates
-    function GetMinor() {
-        return $this->minor_step;
-    }
-
-    // Set Minor and Major ticks (in world coordinates)
-    function Set($aMajStep,$aMinStep=false) {
-        if( $aMinStep==false ) {
-            $aMinStep=$aMajStep;
-        }
-
-        if( $aMajStep <= 0 || $aMinStep <= 0 ) {
-            JpGraphError::RaiseL(25064);
-            //JpGraphError::Raise(" Minor or major step size is 0. Check that you haven't got an accidental SetTextTicks(0) in your code. If this is not the case you might have stumbled upon a bug in JpGraph. Please report this and if possible include the data that caused the problem.");
-        }
-
-        $this->major_step=$aMajStep;
-        $this->minor_step=$aMinStep;
-        $this->is_set = true;
-    }
-
-    function Stroke($aImg,&$grid,$aPos,$aAxisAngle,$aScale,&$aMajPos,&$aMajLabel) {
-        // Prepare to draw linear ticks
-        $maj_step_abs = abs($aScale->scale_factor*$this->major_step);
-        $min_step_abs = abs($aScale->scale_factor*$this->minor_step);
-        $nbrmaj = round($aScale->world_abs_size/$maj_step_abs);
-        $nbrmin = round($aScale->world_abs_size/$min_step_abs);
-        $skip = round($nbrmin/$nbrmaj); // Don't draw minor on top of major
-
-        // Draw major ticks
-        $ticklen2=$this->major_abs_size;
-        $dx=round(sin($aAxisAngle)*$ticklen2);
-        $dy=round(cos($aAxisAngle)*$ticklen2);
-        $label=$aScale->scale[0]+$this->major_step;
-
-        $aImg->SetLineWeight($this->weight);
-
-        $aMajPos = array();
-        $aMajLabel = array();
-
-        for($i=1; $i<=$nbrmaj; ++$i) {
-            $xt=round($i*$maj_step_abs*cos($aAxisAngle))+$aScale->scale_abs[0];
-            $yt=$aPos-round($i*$maj_step_abs*sin($aAxisAngle));
-
-            if( $this->label_formfunc != '' ) {
-                $f=$this->label_formfunc;
-                $l = call_user_func($f,$label);
-            }
-            else {
-                $l = $label;
-            }
-
-            $aMajLabel[]=$l;
-            $label += $this->major_step;
-            $grid[]=$xt;
-            $grid[]=$yt;
-            $aMajPos[($i-1)*2]=$xt+2*$dx;
-            $aMajPos[($i-1)*2+1]=$yt-$aImg->GetFontheight()/2;
-            if( !$this->supress_tickmarks ) {
-                if( $this->majcolor != '' ) {
-                    $aImg->PushColor($this->majcolor);
-                }
-                $aImg->Line($xt+$dx,$yt+$dy,$xt-$dx,$yt-$dy);
-                if( $this->majcolor != '' ) {
-                    $aImg->PopColor();
-                }
-            }
-        }
-
-        // Draw minor ticks
-        $ticklen2=$this->minor_abs_size;
-        $dx=round(sin($aAxisAngle)*$ticklen2);
-        $dy=round(cos($aAxisAngle)*$ticklen2);
-        if( !$this->supress_tickmarks && !$this->supress_minor_tickmarks) {
-            if( $this->mincolor != '' ) {
-                $aImg->PushColor($this->mincolor);
-            }
-            for($i=1; $i<=$nbrmin; ++$i) {
-                if( ($i % $skip) == 0 ) {
-                    continue;
-                }
-                $xt=round($i*$min_step_abs*cos($aAxisAngle))+$aScale->scale_abs[0];
-                $yt=$aPos-round($i*$min_step_abs*sin($aAxisAngle));
-                $aImg->Line($xt+$dx,$yt+$dy,$xt-$dx,$yt-$dy);
-            }
-            if( $this->mincolor != '' ) {
-                $aImg->PopColor();
-            }
-        }
-    }
-}
-
-
-//===================================================
-// CLASS RadarAxis
-// Description: Implements axis for the radar graph
-//===================================================
-class RadarAxis extends AxisPrototype {
-    public $title=null;
-    private $title_color='navy';
-    private $len=0;
-
-    function __construct($img,$aScale,$color=array(0,0,0)) {
-        parent::__construct($img,$aScale,$color);
-        $this->len = $img->plotheight;
-        $this->title = new Text();
-        $this->title->SetFont(FF_FONT1,FS_BOLD);
-        $this->color = array(0,0,0);
-    }
-
-    // Stroke the axis
-    // $pos    = Vertical position of axis
-    // $aAxisAngle = Axis angle
-    // $grid   = Returns an array with positions used to draw the grid
-    // $lf   = Label flag, TRUE if the axis should have labels
-    function Stroke($pos,$aAxisAngle,&$grid,$title,$lf) {
-        $this->img->SetColor($this->color);
-
-        // Determine end points for the axis
-        $x=round($this->scale->world_abs_size*cos($aAxisAngle)+$this->scale->scale_abs[0]);
-        $y=round($pos-$this->scale->world_abs_size*sin($aAxisAngle));
-
-        // Draw axis
-        $this->img->SetColor($this->color);
-        $this->img->SetLineWeight($this->weight);
-        if( !$this->hide ) {
-            $this->img->Line($this->scale->scale_abs[0],$pos,$x,$y);
-        }
-
-        $this->scale->ticks->Stroke($this->img,$grid,$pos,$aAxisAngle,$this->scale,$majpos,$majlabel);
-        $ncolor=0;
-        if( isset($this->ticks_label_colors) ) {
-            $ncolor=count($this->ticks_label_colors);
-        }
-
-        // Draw labels
-        if( $lf && !$this->hide ) {
-            $this->img->SetFont($this->font_family,$this->font_style,$this->font_size);
-            $this->img->SetTextAlign('left','top');
-            $this->img->SetColor($this->label_color);
-
-            // majpos contains (x,y) coordinates for labels
-            if( ! $this->hide_labels ) {
-                $n = floor(count($majpos)/2);
-                for($i=0; $i < $n; ++$i) {
-                    // Set specific label color if specified
-                    if( $ncolor > 0 ) {
-                        $this->img->SetColor($this->ticks_label_colors[$i % $ncolor]);
-                    }
-
-                    if( $this->ticks_label != null && isset($this->ticks_label[$i]) ) {
-                        $this->img->StrokeText($majpos[$i*2],$majpos[$i*2+1],$this->ticks_label[$i]);
-                    }
-                    else {
-                        $this->img->StrokeText($majpos[$i*2],$majpos[$i*2+1],$majlabel[$i]);
-                    }
-                }
-            }
-        }
-        $this->_StrokeAxisTitle($pos,$aAxisAngle,$title);
-    }
-
-    function _StrokeAxisTitle($pos,$aAxisAngle,$title) {
-        $this->title->Set($title);
-        $marg=6+$this->title->margin;
-        $xt=round(($this->scale->world_abs_size+$marg)*cos($aAxisAngle)+$this->scale->scale_abs[0]);
-        $yt=round($pos-($this->scale->world_abs_size+$marg)*sin($aAxisAngle));
-
-        // Position the axis title.
-        // dx, dy is the offset from the top left corner of the bounding box that sorrounds the text
-        // that intersects with the extension of the corresponding axis. The code looks a little
-        // bit messy but this is really the only way of having a reasonable position of the
-        // axis titles.
-        if( $this->title->iWordwrap > 0 ) {
-            $title = wordwrap($title,$this->title->iWordwrap,"\n");
-        }
-
-        $h=$this->img->GetTextHeight($title)*1.2;
-        $w=$this->img->GetTextWidth($title)*1.2;
-
-        while( $aAxisAngle > 2*M_PI )
-            $aAxisAngle -= 2*M_PI;
-
-        // Around 3 a'clock
-        if( $aAxisAngle>=7*M_PI/4 || $aAxisAngle <= M_PI/4 ) $dx=-0.15; // Small trimming to make the dist to the axis more even
-
-        // Around 12 a'clock
-        if( $aAxisAngle>=M_PI/4 && $aAxisAngle <= 3*M_PI/4 ) $dx=($aAxisAngle-M_PI/4)*2/M_PI;
-
-        // Around 9 a'clock
-        if( $aAxisAngle>=3*M_PI/4 && $aAxisAngle <= 5*M_PI/4 ) $dx=1;
-
-        // Around 6 a'clock
-        if( $aAxisAngle>=5*M_PI/4 && $aAxisAngle <= 7*M_PI/4 ) $dx=(1-($aAxisAngle-M_PI*5/4)*2/M_PI);
-
-        if( $aAxisAngle>=7*M_PI/4 ) $dy=(($aAxisAngle-M_PI)-3*M_PI/4)*2/M_PI;
-        if( $aAxisAngle<=M_PI/12 ) $dy=(0.5-$aAxisAngle*2/M_PI);
-        if( $aAxisAngle<=M_PI/4 && $aAxisAngle > M_PI/12) $dy=(1-$aAxisAngle*2/M_PI);
-        if( $aAxisAngle>=M_PI/4 && $aAxisAngle <= 3*M_PI/4 ) $dy=1;
-        if( $aAxisAngle>=3*M_PI/4 && $aAxisAngle <= 5*M_PI/4 ) $dy=(1-($aAxisAngle-3*M_PI/4)*2/M_PI);
-        if( $aAxisAngle>=5*M_PI/4 && $aAxisAngle <= 7*M_PI/4 ) $dy=0;
-
-        if( !$this->hide ) {
-            $this->title->Stroke($this->img,$xt-$dx*$w,$yt-$dy*$h,$title);
-        }
-    }
-
-} // Class
-
-
-//===================================================
-// CLASS RadarGrid
-// Description: Draws grid for the radar graph
-//===================================================
-class RadarGrid { //extends Grid {
-    private $type='solid';
-    private $grid_color='#DDDDDD';
-    private $show=false, $weight=1;
-
-    function __construct() {
-        // Empty
-    }
-
-    function SetColor($aMajColor) {
-        $this->grid_color = $aMajColor;
-    }
-
-    function SetWeight($aWeight) {
-        $this->weight=$aWeight;
-    }
-
-    // Specify if grid should be dashed, dotted or solid
-    function SetLineStyle($aType) {
-        $this->type = $aType;
-    }
-
-    // Decide if both major and minor grid should be displayed
-    function Show($aShowMajor=true) {
-        $this->show=$aShowMajor;
-    }
-
-    function Stroke($img,$grid) {
-        if( !$this->show ) {
-            return;
-        }
-
-        $nbrticks = count($grid[0])/2;
-        $nbrpnts = count($grid);
-        $img->SetColor($this->grid_color);
-        $img->SetLineWeight($this->weight);
-
-        for($i=0; $i<$nbrticks; ++$i) {
-            for($j=0; $j<$nbrpnts; ++$j) {
-                $pnts[$j*2]=$grid[$j][$i*2];
-                $pnts[$j*2+1]=$grid[$j][$i*2+1];
-            }
-            for($k=0; $k<$nbrpnts; ++$k ){
-                $l=($k+1)%$nbrpnts;
-                if( $this->type == 'solid' )
-                    $img->Line($pnts[$k*2],$pnts[$k*2+1],$pnts[$l*2],$pnts[$l*2+1]);
-                elseif( $this->type == 'dotted' )
-                    $img->DashedLine($pnts[$k*2],$pnts[$k*2+1],$pnts[$l*2],$pnts[$l*2+1],1,6);
-                elseif( $this->type == 'dashed' )
-                    $img->DashedLine($pnts[$k*2],$pnts[$k*2+1],$pnts[$l*2],$pnts[$l*2+1],2,4);
-                elseif( $this->type == 'longdashed' )
-                    $img->DashedLine($pnts[$k*2],$pnts[$k*2+1],$pnts[$l*2],$pnts[$l*2+1],8,6);
-            }
-            $pnts=array();
-        }
-    }
-} // Class
-
-
-//===================================================
-// CLASS RadarPlot
-// Description: Plot a radarplot
-//===================================================
-class RadarPlot {
-    public $mark=null;
-    public $legend='';
-    public $legendcsimtarget='';
-    public $legendcsimalt='';
-    public $csimtargets=array(); // Array of targets for CSIM
-    public $csimareas="";   // Resultant CSIM area tags
-    public $csimalts=null;   // ALT:s for corresponding target
-    private $data=array();
-    private $fill=false, $fill_color=array(200,170,180);
-    private $color=array(0,0,0);
-    private $weight=1;
-    private $linestyle='solid';
-
-    //---------------
-    // CONSTRUCTOR
-    function __construct($data) {
-        $this->data = $data;
-        $this->mark = new PlotMark();
-    }
-
-    function Min() {
-        return Min($this->data);
-    }
-
-    function Max() {
-        return Max($this->data);
-    }
-
-    function SetLegend($legend) {
-        $this->legend=$legend;
-    }
-
-    function SetLineStyle($aStyle) {
-        $this->linestyle=$aStyle;
-    }
-
-    function SetLineWeight($w) {
-        $this->weight=$w;
-    }
-
-    function SetFillColor($aColor) {
-        $this->fill_color = $aColor;
-        $this->fill = true;
-    }
-
-    function SetFill($f=true) {
-        $this->fill = $f;
-    }
-
-    function SetColor($aColor,$aFillColor=false) {
-        $this->color = $aColor;
-        if( $aFillColor ) {
-            $this->SetFillColor($aFillColor);
-            $this->fill = true;
-        }
-    }
-
-    // Set href targets for CSIM
-    function SetCSIMTargets($aTargets,$aAlts=null) {
-        $this->csimtargets=$aTargets;
-        $this->csimalts=$aAlts;
-    }
-
-    // Get all created areas
-    function GetCSIMareas() {
-        return $this->csimareas;
-    }
-
-    function Stroke($img, $pos, $scale, $startangle) {
-        $nbrpnts = count($this->data);
-        $astep=2*M_PI/$nbrpnts;
-        $a=$startangle;
-
-        for($i=0; $i<$nbrpnts; ++$i) {
-
-            // Rotate each non null point to the correct axis-angle
-            $cs=$scale->RelTranslate($this->data[$i]);
-            $x=round($cs*cos($a)+$scale->scale_abs[0]);
-            $y=round($pos-$cs*sin($a));
-
-            $pnts[$i*2]=$x;
-            $pnts[$i*2+1]=$y;
-
-            // If the next point is null then we draw this polygon segment
-            // to the center, skip the next and draw the next segment from
-            // the center up to the point on the axis with the first non-null
-            // value and continues from that point. Some additoinal logic is necessary
-            // to handle the boundary conditions
-            if( $i < $nbrpnts-1 ) {
-                if( is_null($this->data[$i+1]) ) {
-                    $cs = 0;
-                    $x=round($cs*cos($a)+$scale->scale_abs[0]);
-                    $y=round($pos-$cs*sin($a));
-                    $pnts[$i*2]=$x;
-                    $pnts[$i*2+1]=$y;
-                    $a += $astep;
-                }
-            }
-
-            $a += $astep;
-        }
-
-        if( $this->fill ) {
-            $img->SetColor($this->fill_color);
-            $img->FilledPolygon($pnts);
-        }
-
-        $img->SetLineWeight($this->weight);
-        $img->SetColor($this->color);
-        $img->SetLineStyle($this->linestyle);
-        $pnts[] = $pnts[0];
-        $pnts[] = $pnts[1];
-        $img->Polygon($pnts);
-        $img->SetLineStyle('solid'); // Reset line style to default
-
-        // Add plotmarks on top
-        if( $this->mark->show ) {
-			for($i=0; $i < $nbrpnts; ++$i) {
-	            if( isset($this->csimtargets[$i]) ) {
-	                $this->mark->SetCSIMTarget($this->csimtargets[$i]);
-	                $this->mark->SetCSIMAlt($this->csimalts[$i]);
-	                $this->mark->SetCSIMAltVal($pnts[$i*2], $pnts[$i*2+1]);
-	                $this->mark->Stroke($img, $pnts[$i*2], $pnts[$i*2+1]);
-	                $this->csimareas .= $this->mark->GetCSIMAreas();
-	            }
-	            else {
-					$this->mark->Stroke($img,$pnts[$i*2],$pnts[$i*2+1]);
-	            }
-            }
-        }
-
-    }
-
-    function GetCount() {
-        return count($this->data);
-    }
-
-    function Legend($graph) {
-        if( $this->legend == '' ) {
-            return;
-        }
-        if( $this->fill ) {
-            $graph->legend->Add($this->legend,$this->fill_color,$this->mark);
-        } else {
-            $graph->legend->Add($this->legend,$this->color,$this->mark);
-        }
-    }
-
-} // Class
-
-//===================================================
-// CLASS RadarGraph
-// Description: Main container for a radar graph
-//===================================================
-class RadarGraph extends Graph {
-    public $grid,$axis=null;
-    private $posx,$posy;
-    private $len;
-    private $axis_title=null;
-
-    function __construct($width=300,$height=200,$cachedName="",$timeout=0,$inline=1) {
-        parent::__construct($width,$height,$cachedName,$timeout,$inline);
-        $this->posx = $width/2;
-        $this->posy = $height/2;
-        $this->len = min($width,$height)*0.35;
-        $this->SetColor(array(255,255,255));
-        $this->SetTickDensity(TICKD_NORMAL);
-        $this->SetScale('lin');
-        $this->SetGridDepth(DEPTH_FRONT);
-    }
-
-    function HideTickMarks($aFlag=true) {
-        $this->axis->scale->ticks->SupressTickMarks($aFlag);
-    }
-
-    function ShowMinorTickmarks($aFlag=true) {
-        $this->yscale->ticks->SupressMinorTickMarks(!$aFlag);
-    }
-
-    function SetScale($axtype,$ymin=1,$ymax=1,$dummy1=null,$dumy2=null) {
-        if( $axtype != 'lin' && $axtype != 'log' ) {
-            JpGraphError::RaiseL(18003,$axtype);
-            //("Illegal scale for radarplot ($axtype). Must be \"lin\" or \"log\"");
-        }
-        if( $axtype == 'lin' ) {
-            $this->yscale = new LinearScale($ymin,$ymax);
-            $this->yscale->ticks = new RadarLinearTicks();
-            $this->yscale->ticks->SupressMinorTickMarks();
-        }
-        elseif( $axtype == 'log' ) {
-            $this->yscale = new LogScale($ymin,$ymax);
-            $this->yscale->ticks = new RadarLogTicks();
-        }
-
-        $this->axis = new RadarAxis($this->img,$this->yscale);
-        $this->grid = new RadarGrid();
-    }
-
-    function SetSize($aSize) {
-        if( $aSize < 0.1 || $aSize>1 ) {
-            JpGraphError::RaiseL(18004,$aSize);
-            //("Radar Plot size must be between 0.1 and 1. (Your value=$s)");
-        }
-        $this->len=min($this->img->width,$this->img->height)*$aSize/2;
-    }
-
-    function SetPlotSize($aSize) {
-        $this->SetSize($aSize);
-    }
-
-    function SetTickDensity($densy=TICKD_NORMAL,$dummy1=null) {
-        $this->ytick_factor=25;
-        switch( $densy ) {
-            case TICKD_DENSE:
-                $this->ytick_factor=12;
-                break;
-            case TICKD_NORMAL:
-                $this->ytick_factor=25;
-                break;
-            case TICKD_SPARSE:
-                $this->ytick_factor=40;
-                break;
-            case TICKD_VERYSPARSE:
-                $this->ytick_factor=70;
-                break;
-            default:
-                JpGraphError::RaiseL(18005,$densy);
-                //("RadarPlot Unsupported Tick density: $densy");
-        }
-    }
-
-    function SetPos($px,$py=0.5) {
-        $this->SetCenter($px,$py);
-    }
-
-    function SetCenter($px,$py=0.5) {
-        if( $px >= 0 && $px <= 1 ) {
-        	$this->posx = $this->img->width*$px;
-        }
-        else {
-        	$this->posx = $px;
-        }
-        if( $py >= 0 && $py <= 1 ) {
-        	$this->posy = $this->img->height*$py;
-        }
-        else {
-        	$this->posy = $py;
-        }
-    }
-
-    function SetColor($aColor) {
-        $this->SetMarginColor($aColor);
-    }
-
-    function SetTitles($aTitleArray) {
-        $this->axis_title = $aTitleArray;
-    }
-
-    function Add($aPlot) {
-    	if( $aPlot == null ) {
-            JpGraphError::RaiseL(25010);//("Graph::Add() You tried to add a null plot to the graph.");
-        }
-        if( is_array($aPlot) && count($aPlot) > 0 ) {
-            $cl = $aPlot[0];
-        }
-        else {
-            $cl = $aPlot;
-        }
-
-        if( $cl instanceof Text ) $this->AddText($aPlot);
-        elseif( class_exists('IconPlot',false) && ($cl instanceof IconPlot) ) $this->AddIcon($aPlot);
-        else {
-            $this->plots[] = $aPlot;
-        }
-    }
-
-    function GetPlotsYMinMax($aPlots) {
-        $min=$aPlots[0]->Min();
-        $max=$aPlots[0]->Max();
-        foreach( $this->plots as $p ) {
-            $max=max($max,$p->Max());
-            $min=min($min,$p->Min());
-        }
-        if( $min < 0 ) {
-            JpGraphError::RaiseL(18006,$min);
-            //("Minimum data $min (Radar plots should only be used when all data points > 0)");
-        }
-        return array($min,$max);
-    }
-
-    function StrokeIcons() {
-    	if( $this->iIcons != null ) {
-        	$n = count($this->iIcons);
-        	for( $i=0; $i < $n; ++$i ) {
-            	$this->iIcons[$i]->Stroke($this->img);
-        	}
-    	}
-    }
-
-	function StrokeTexts() {
-        if( $this->texts != null ) {
-			$n = count($this->texts);
-            for( $i=0; $i < $n; ++$i ) {
-                $this->texts[$i]->Stroke($this->img);
-            }
-        }
-    }
-
-    // Stroke the Radar graph
-    function Stroke($aStrokeFileName='') {
-
-        // If the filename is the predefined value = '_csim_special_'
-        // we assume that the call to stroke only needs to do enough
-        // to correctly generate the CSIM maps.
-        // We use this variable to skip things we don't strictly need
-        // to do to generate the image map to improve performance
-        // a best we can. Therefor you will see a lot of tests !$_csim in the
-        // code below.
-        $_csim = ( $aStrokeFileName === _CSIM_SPECIALFILE );
-
-        // We need to know if we have stroked the plot in the
-        // GetCSIMareas. Otherwise the CSIM hasn't been generated
-        // and in the case of GetCSIM called before stroke to generate
-        // CSIM without storing an image to disk GetCSIM must call Stroke.
-        $this->iHasStroked = true;
-
-        $n = count($this->plots);
-        // Set Y-scale
-
-        if( !$this->yscale->IsSpecified() && count($this->plots) > 0 ) {
-            list($min,$max) = $this->GetPlotsYMinMax($this->plots);
-            $this->yscale->AutoScale($this->img,0,$max,$this->len/$this->ytick_factor);
-        }
-        elseif( $this->yscale->IsSpecified() &&
-                ( $this->yscale->auto_ticks || !$this->yscale->ticks->IsSpecified()) ) {
-
-            // The tick calculation will use the user suplied min/max values to determine
-            // the ticks. If auto_ticks is false the exact user specifed min and max
-            // values will be used for the scale.
-            // If auto_ticks is true then the scale might be slightly adjusted
-            // so that the min and max values falls on an even major step.
-            $min = $this->yscale->scale[0];
-            $max = $this->yscale->scale[1];
-            $this->yscale->AutoScale($this->img,$min,$max,
-                                     $this->len/$this->ytick_factor,
-                                     $this->yscale->auto_ticks);
-        }
-
-        // Set start position end length of scale (in absolute pixels)
-        $this->yscale->SetConstants($this->posx,$this->len);
-
-        // We need as many axis as there are data points
-        $nbrpnts=$this->plots[0]->GetCount();
-
-        // If we have no titles just number the axis 1,2,3,...
-        if( $this->axis_title==null ) {
-            for($i=0; $i < $nbrpnts; ++$i ) {
-                $this->axis_title[$i] = $i+1;
-            }
-        }
-        elseif( count($this->axis_title) < $nbrpnts) {
-            JpGraphError::RaiseL(18007);
-            // ("Number of titles does not match number of points in plot.");
-        }
-        for( $i=0; $i < $n; ++$i ) {
-            if( $nbrpnts != $this->plots[$i]->GetCount() ) {
-                JpGraphError::RaiseL(18008);
-                //("Each radar plot must have the same number of data points.");
-            }
-        }
-
-        if( !$_csim ) {
-        	if( $this->background_image != '' ) {
-            	$this->StrokeFrameBackground();
-        	}
-        	else {
-            	$this->StrokeFrame();
-            	$this->StrokeBackgroundGrad();
-        	}
-        }
-        $astep=2*M_PI/$nbrpnts;
-
-		if( !$_csim ) {
-     		if( $this->iIconDepth == DEPTH_BACK ) {
-        		$this->StrokeIcons();
-        	}
-
-
-	        // Prepare legends
-    	    for($i=0; $i < $n; ++$i) {
-        	    $this->plots[$i]->Legend($this);
-	        }
-    	    $this->legend->Stroke($this->img);
-        	$this->footer->Stroke($this->img);
-		}
-
-		if( !$_csim ) {
-	        if( $this->grid_depth == DEPTH_BACK ) {
-	            // Draw axis and grid
-	            for( $i=0,$a=M_PI/2; $i < $nbrpnts; ++$i, $a += $astep ) {
-	                $this->axis->Stroke($this->posy,$a,$grid[$i],$this->axis_title[$i],$i==0);
-	            }
-                $this->grid->Stroke($this->img,$grid);
-	        }
-            if( $this->iIconDepth == DEPTH_BACK ) {
-                $this->StrokeIcons();
-            }
-
-		}
-
-        // Plot points
-        $a=M_PI/2;
-        for($i=0; $i < $n; ++$i ) {
-            $this->plots[$i]->Stroke($this->img, $this->posy, $this->yscale, $a);
-        }
-
-        if( !$_csim ) {
-            if( $this->grid_depth != DEPTH_BACK ) {
-                // Draw axis and grid
-                for( $i=0,$a=M_PI/2; $i < $nbrpnts; ++$i, $a += $astep ) {
-                   $this->axis->Stroke($this->posy,$a,$grid[$i],$this->axis_title[$i],$i==0);
-                }
-                $this->grid->Stroke($this->img,$grid);
-            }
-
-        	$this->StrokeTitles();
-       		$this->StrokeTexts();
-       		if( $this->iIconDepth == DEPTH_FRONT ) {
-        		$this->StrokeIcons();
-        	}
-		}
-
-        // Should we do any final image transformation
-        if( $this->iImgTrans && !$_csim ) {
-            if( !class_exists('ImgTrans',false) ) {
-                require_once('jpgraph_imgtrans.php');
-            }
-
-            $tform = new ImgTrans($this->img->img);
-            $this->img->img = $tform->Skew3D($this->iImgTransHorizon,$this->iImgTransSkewDist,
-            $this->iImgTransDirection,$this->iImgTransHighQ,
-            $this->iImgTransMinSize,$this->iImgTransFillColor,
-            $this->iImgTransBorder);
-        }
-
-		if( !$_csim ) {
-	        // If the filename is given as the special "__handle"
-	        // then the image handler is returned and the image is NOT
-	        // streamed back
-	        if( $aStrokeFileName == _IMG_HANDLER ) {
-	            return $this->img->img;
-	        }
-	        else {
-	            // Finally stream the generated picture
-	            $this->cache->PutAndStream($this->img,$this->cache_name,$this->inline,$aStrokeFileName);
-	        }
-		}
-    }
-} // Class
-
-/* EOF */
-?>
diff --git a/#jpgraph/src/jpgraph_regstat.php b/#jpgraph/src/jpgraph_regstat.php
deleted file mode 100644
index 0f6c96be..00000000
--- a/#jpgraph/src/jpgraph_regstat.php
+++ /dev/null
@@ -1,215 +0,0 @@
-<?php
-/*=======================================================================
- // File:        JPGRAPH_REGSTAT.PHP
- // Description: Regression and statistical analysis helper classes
- // Created:     2002-12-01
- // Ver:         $Id: jpgraph_regstat.php 1131 2009-03-11 20:08:24Z ljp $
- //
- // Copyright (c) Asial Corporation. All rights reserved.
- //========================================================================
- */
-
-//------------------------------------------------------------------------
-// CLASS Spline
-// Create a new data array from an existing data array but with more points.
-// The new points are interpolated using a cubic spline algorithm
-//------------------------------------------------------------------------
-class Spline {
-    // 3:rd degree polynom approximation
-
-    private $xdata,$ydata;   // Data vectors
-    private $y2;   // 2:nd derivate of ydata
-    private $n=0;
-
-    function __construct($xdata,$ydata) {
-        $this->y2 = array();
-        $this->xdata = $xdata;
-        $this->ydata = $ydata;
-
-        $n = count($ydata);
-        $this->n = $n;
-        if( $this->n !== count($xdata) ) {
-            JpGraphError::RaiseL(19001);
-            //('Spline: Number of X and Y coordinates must be the same');
-        }
-
-        // Natural spline 2:derivate == 0 at endpoints
-        $this->y2[0]    = 0.0;
-        $this->y2[$n-1] = 0.0;
-        $delta[0] = 0.0;
-
-        // Calculate 2:nd derivate
-        for($i=1; $i < $n-1; ++$i) {
-            $d = ($xdata[$i+1]-$xdata[$i-1]);
-            if( $d == 0  ) {
-                JpGraphError::RaiseL(19002);
-                //('Invalid input data for spline. Two or more consecutive input X-values are equal. Each input X-value must differ since from a mathematical point of view it must be a one-to-one mapping, i.e. each X-value must correspond to exactly one Y-value.');
-            }
-            $s = ($xdata[$i]-$xdata[$i-1])/$d;
-            $p = $s*$this->y2[$i-1]+2.0;
-            $this->y2[$i] = ($s-1.0)/$p;
-            $delta[$i] = ($ydata[$i+1]-$ydata[$i])/($xdata[$i+1]-$xdata[$i]) -
-            ($ydata[$i]-$ydata[$i-1])/($xdata[$i]-$xdata[$i-1]);
-            $delta[$i] = (6.0*$delta[$i]/($xdata[$i+1]-$xdata[$i-1])-$s*$delta[$i-1])/$p;
-        }
-
-        // Backward substitution
-        for( $j=$n-2; $j >= 0; --$j ) {
-            $this->y2[$j] = $this->y2[$j]*$this->y2[$j+1] + $delta[$j];
-        }
-    }
-
-    // Return the two new data vectors
-    function Get($num=50) {
-        $n = $this->n ;
-        $step = ($this->xdata[$n-1]-$this->xdata[0]) / ($num-1);
-        $xnew=array();
-        $ynew=array();
-        $xnew[0] = $this->xdata[0];
-        $ynew[0] = $this->ydata[0];
-        for( $j=1; $j < $num; ++$j ) {
-            $xnew[$j] = $xnew[0]+$j*$step;
-            $ynew[$j] = $this->Interpolate($xnew[$j]);
-        }
-        return array($xnew,$ynew);
-    }
-
-    // Return a single interpolated Y-value from an x value
-    function Interpolate($xpoint) {
-
-        $max = $this->n-1;
-        $min = 0;
-
-        // Binary search to find interval
-        while( $max-$min > 1 ) {
-            $k = ($max+$min) / 2;
-            if( $this->xdata[$k] > $xpoint )
-            $max=$k;
-            else
-            $min=$k;
-        }
-
-        // Each interval is interpolated by a 3:degree polynom function
-        $h = $this->xdata[$max]-$this->xdata[$min];
-
-        if( $h == 0  ) {
-            JpGraphError::RaiseL(19002);
-            //('Invalid input data for spline. Two or more consecutive input X-values are equal. Each input X-value must differ since from a mathematical point of view it must be a one-to-one mapping, i.e. each X-value must correspond to exactly one Y-value.');
-        }
-
-
-        $a = ($this->xdata[$max]-$xpoint)/$h;
-        $b = ($xpoint-$this->xdata[$min])/$h;
-        return $a*$this->ydata[$min]+$b*$this->ydata[$max]+
-        (($a*$a*$a-$a)*$this->y2[$min]+($b*$b*$b-$b)*$this->y2[$max])*($h*$h)/6.0;
-    }
-}
-
-//------------------------------------------------------------------------
-// CLASS Bezier
-// Create a new data array from a number of control points
-//------------------------------------------------------------------------
-class Bezier {
-    /**
-     * @author Thomas Despoix, openXtrem company
-     * @license released under QPL
-     * @abstract Bezier interoplated point generation,
-     * computed from control points data sets, based on Paul Bourke algorithm :
-     * http://local.wasp.uwa.edu.au/~pbourke/geometry/bezier/index2.html
-     */
-    private $datax = array();
-    private $datay = array();
-    private $n=0;
-
-    function __construct($datax, $datay, $attraction_factor = 1) {
-        // Adding control point multiple time will raise their attraction power over the curve
-        $this->n = count($datax);
-        if( $this->n !== count($datay) ) {
-            JpGraphError::RaiseL(19003);
-            //('Bezier: Number of X and Y coordinates must be the same');
-        }
-        $idx=0;
-        foreach($datax as $datumx) {
-            for ($i = 0; $i < $attraction_factor; $i++) {
-                $this->datax[$idx++] = $datumx;
-            }
-        }
-        $idx=0;
-        foreach($datay as $datumy) {
-            for ($i = 0; $i < $attraction_factor; $i++) {
-                $this->datay[$idx++] = $datumy;
-            }
-        }
-        $this->n *= $attraction_factor;
-    }
-
-    /**
-     * Return a set of data points that specifies the bezier curve with $steps points
-     * @param $steps Number of new points to return
-     * @return array($datax, $datay)
-     */
-    function Get($steps) {
-        $datax = array();
-        $datay = array();
-        for ($i = 0; $i < $steps; $i++) {
-            list($datumx, $datumy) = $this->GetPoint((double) $i / (double) $steps);
-            $datax[$i] = $datumx;
-            $datay[$i] = $datumy;
-        }
-         
-        $datax[] = end($this->datax);
-        $datay[] = end($this->datay);
-         
-        return array($datax, $datay);
-    }
-
-    /**
-     * Return one point on the bezier curve. $mu is the position on the curve where $mu is in the
-     * range 0 $mu < 1 where 0 is tha start point and 1 is the end point. Note that every newly computed
-     * point depends on all the existing points
-     * 
-     * @param $mu Position on the bezier curve
-     * @return array($x, $y)
-     */
-    function GetPoint($mu) {
-        $n = $this->n - 1;
-        $k = 0;
-        $kn = 0;
-        $nn = 0;
-        $nkn = 0;
-        $blend = 0.0;
-        $newx = 0.0;
-        $newy = 0.0;
-
-        $muk = 1.0;
-        $munk = (double) pow(1-$mu,(double) $n);
-
-        for ($k = 0; $k <= $n; $k++) {
-            $nn = $n;
-            $kn = $k;
-            $nkn = $n - $k;
-            $blend = $muk * $munk;
-            $muk *= $mu;
-            $munk /= (1-$mu);
-            while ($nn >= 1) {
-                $blend *= $nn;
-                $nn--;
-                if ($kn > 1) {
-                    $blend /= (double) $kn;
-                    $kn--;
-                }
-                if ($nkn > 1) {
-                    $blend /= (double) $nkn;
-                    $nkn--;
-                }
-            }
-            $newx += $this->datax[$k] * $blend;
-            $newy += $this->datay[$k] * $blend;
-        }
-
-        return array($newx, $newy);
-    }
-}
-
-// EOF
-?>
diff --git a/#jpgraph/src/jpgraph_rgb.inc.php b/#jpgraph/src/jpgraph_rgb.inc.php
deleted file mode 100644
index 53892611..00000000
--- a/#jpgraph/src/jpgraph_rgb.inc.php
+++ /dev/null
@@ -1,615 +0,0 @@
-<?php
-//=======================================================================
-// File:        JPGRAPH_RGB.INC.PHP
-// Description: Class to handle RGb color space specification and
-//              named colors
-// Created:     2001-01-08 (Refactored to separate file 2008-08-01)
-// Ver:         $Id: jpgraph_rgb.inc.php 1893 2009-10-02 23:15:25Z ljp $
-//
-// Copyright (c) Asial Corporation. All rights reserved.
-//========================================================================
-
-
-/*===================================================
-// CLASS RGB
-// Description: Color definitions as RGB triples
-//===================================================
-*/
-
-class RGB {
-    public $rgb_table;
-    public $img;
-
-    function __construct($aImg=null) {
-        $this->img = $aImg;
-
-        // Conversion array between color names and RGB
-        $this->rgb_table = array(
-            'aqua'=> array(0,255,255),
-            'lime'=> array(0,255,0),
-            'teal'=> array(0,128,128),
-            'whitesmoke'=>array(245,245,245),
-            'gainsboro'=>array(220,220,220),
-            'oldlace'=>array(253,245,230),
-            'linen'=>array(250,240,230),
-            'antiquewhite'=>array(250,235,215),
-            'papayawhip'=>array(255,239,213),
-            'blanchedalmond'=>array(255,235,205),
-            'bisque'=>array(255,228,196),
-            'peachpuff'=>array(255,218,185),
-            'navajowhite'=>array(255,222,173),
-            'moccasin'=>array(255,228,181),
-            'cornsilk'=>array(255,248,220),
-            'ivory'=>array(255,255,240),
-            'lemonchiffon'=>array(255,250,205),
-            'seashell'=>array(255,245,238),
-            'mintcream'=>array(245,255,250),
-            'azure'=>array(240,255,255),
-            'aliceblue'=>array(240,248,255),
-            'lavender'=>array(230,230,250),
-            'lavenderblush'=>array(255,240,245),
-            'mistyrose'=>array(255,228,225),
-            'white'=>array(255,255,255),
-            'black'=>array(0,0,0),
-            'darkslategray'=>array(47,79,79),
-            'dimgray'=>array(105,105,105),
-            'slategray'=>array(112,128,144),
-            'lightslategray'=>array(119,136,153),
-            'gray'=>array(190,190,190),
-            'lightgray'=>array(211,211,211),
-            'midnightblue'=>array(25,25,112),
-            'navy'=>array(0,0,128),
-            'indigo'=>array(75,0,130),
-            'electricindigo'=>array(102,0,255),
-            'deepindigo'=>array(138,43,226),
-            'pigmentindigo'=>array(75,0,130),
-            'indigodye'=>array(0,65,106),
-            'cornflowerblue'=>array(100,149,237),
-            'darkslateblue'=>array(72,61,139),
-            'slateblue'=>array(106,90,205),
-            'mediumslateblue'=>array(123,104,238),
-            'lightslateblue'=>array(132,112,255),
-            'mediumblue'=>array(0,0,205),
-            'royalblue'=>array(65,105,225),
-            'blue'=>array(0,0,255),
-            'dodgerblue'=>array(30,144,255),
-            'deepskyblue'=>array(0,191,255),
-            'skyblue'=>array(135,206,235),
-            'lightskyblue'=>array(135,206,250),
-            'steelblue'=>array(70,130,180),
-            'lightred'=>array(211,167,168),
-            'lightsteelblue'=>array(176,196,222),
-            'lightblue'=>array(173,216,230),
-            'powderblue'=>array(176,224,230),
-            'paleturquoise'=>array(175,238,238),
-            'darkturquoise'=>array(0,206,209),
-            'mediumturquoise'=>array(72,209,204),
-            'turquoise'=>array(64,224,208),
-            'cyan'=>array(0,255,255),
-            'lightcyan'=>array(224,255,255),
-            'cadetblue'=>array(95,158,160),
-            'mediumaquamarine'=>array(102,205,170),
-            'aquamarine'=>array(127,255,212),
-            'darkgreen'=>array(0,100,0),
-            'darkolivegreen'=>array(85,107,47),
-            'darkseagreen'=>array(143,188,143),
-            'seagreen'=>array(46,139,87),
-            'mediumseagreen'=>array(60,179,113),
-            'lightseagreen'=>array(32,178,170),
-            'palegreen'=>array(152,251,152),
-            'springgreen'=>array(0,255,127),
-            'lawngreen'=>array(124,252,0),
-            'green'=>array(0,255,0),
-            'chartreuse'=>array(127,255,0),
-            'mediumspringgreen'=>array(0,250,154),
-            'greenyellow'=>array(173,255,47),
-            'limegreen'=>array(50,205,50),
-            'yellowgreen'=>array(154,205,50),
-            'forestgreen'=>array(34,139,34),
-            'olivedrab'=>array(107,142,35),
-            'darkkhaki'=>array(189,183,107),
-            'khaki'=>array(240,230,140),
-            'palegoldenrod'=>array(238,232,170),
-            'lightgoldenrodyellow'=>array(250,250,210),
-            'lightyellow'=>array(255,255,200),
-            'yellow'=>array(255,255,0),
-            'gold'=>array(255,215,0),
-            'lightgoldenrod'=>array(238,221,130),
-            'goldenrod'=>array(218,165,32),
-            'darkgoldenrod'=>array(184,134,11),
-            'rosybrown'=>array(188,143,143),
-            'indianred'=>array(205,92,92),
-            'saddlebrown'=>array(139,69,19),
-            'sienna'=>array(160,82,45),
-            'peru'=>array(205,133,63),
-            'burlywood'=>array(222,184,135),
-            'beige'=>array(245,245,220),
-            'wheat'=>array(245,222,179),
-            'sandybrown'=>array(244,164,96),
-            'tan'=>array(210,180,140),
-            'chocolate'=>array(210,105,30),
-            'firebrick'=>array(178,34,34),
-            'brown'=>array(165,42,42),
-            'darksalmon'=>array(233,150,122),
-            'salmon'=>array(250,128,114),
-            'lightsalmon'=>array(255,160,122),
-            'orange'=>array(255,165,0),
-            'darkorange'=>array(255,140,0),
-            'coral'=>array(255,127,80),
-            'lightcoral'=>array(240,128,128),
-            'tomato'=>array(255,99,71),
-            'orangered'=>array(255,69,0),
-            'red'=>array(255,0,0),
-            'hotpink'=>array(255,105,180),
-            'deeppink'=>array(255,20,147),
-            'pink'=>array(255,192,203),
-            'lightpink'=>array(255,182,193),
-            'palevioletred'=>array(219,112,147),
-            'maroon'=>array(176,48,96),
-            'mediumvioletred'=>array(199,21,133),
-            'violetred'=>array(208,32,144),
-            'magenta'=>array(255,0,255),
-            'violet'=>array(238,130,238),
-            'plum'=>array(221,160,221),
-            'orchid'=>array(218,112,214),
-            'mediumorchid'=>array(186,85,211),
-            'darkorchid'=>array(153,50,204),
-            'darkviolet'=>array(148,0,211),
-            'blueviolet'=>array(138,43,226),
-            'purple'=>array(160,32,240),
-            'mediumpurple'=>array(147,112,219),
-            'thistle'=>array(216,191,216),
-            'snow1'=>array(255,250,250),
-            'snow2'=>array(238,233,233),
-            'snow3'=>array(205,201,201),
-            'snow4'=>array(139,137,137),
-            'seashell1'=>array(255,245,238),
-            'seashell2'=>array(238,229,222),
-            'seashell3'=>array(205,197,191),
-            'seashell4'=>array(139,134,130),
-            'AntiqueWhite1'=>array(255,239,219),
-            'AntiqueWhite2'=>array(238,223,204),
-            'AntiqueWhite3'=>array(205,192,176),
-            'AntiqueWhite4'=>array(139,131,120),
-            'bisque1'=>array(255,228,196),
-            'bisque2'=>array(238,213,183),
-            'bisque3'=>array(205,183,158),
-            'bisque4'=>array(139,125,107),
-            'peachPuff1'=>array(255,218,185),
-            'peachpuff2'=>array(238,203,173),
-            'peachpuff3'=>array(205,175,149),
-            'peachpuff4'=>array(139,119,101),
-            'navajowhite1'=>array(255,222,173),
-            'navajowhite2'=>array(238,207,161),
-            'navajowhite3'=>array(205,179,139),
-            'navajowhite4'=>array(139,121,94),
-            'lemonchiffon1'=>array(255,250,205),
-            'lemonchiffon2'=>array(238,233,191),
-            'lemonchiffon3'=>array(205,201,165),
-            'lemonchiffon4'=>array(139,137,112),
-            'ivory1'=>array(255,255,240),
-            'ivory2'=>array(238,238,224),
-            'ivory3'=>array(205,205,193),
-            'ivory4'=>array(139,139,131),
-            'honeydew'=>array(193,205,193),
-            'lavenderblush1'=>array(255,240,245),
-            'lavenderblush2'=>array(238,224,229),
-            'lavenderblush3'=>array(205,193,197),
-            'lavenderblush4'=>array(139,131,134),
-            'mistyrose1'=>array(255,228,225),
-            'mistyrose2'=>array(238,213,210),
-            'mistyrose3'=>array(205,183,181),
-            'mistyrose4'=>array(139,125,123),
-            'azure1'=>array(240,255,255),
-            'azure2'=>array(224,238,238),
-            'azure3'=>array(193,205,205),
-            'azure4'=>array(131,139,139),
-            'slateblue1'=>array(131,111,255),
-            'slateblue2'=>array(122,103,238),
-            'slateblue3'=>array(105,89,205),
-            'slateblue4'=>array(71,60,139),
-            'royalblue1'=>array(72,118,255),
-            'royalblue2'=>array(67,110,238),
-            'royalblue3'=>array(58,95,205),
-            'royalblue4'=>array(39,64,139),
-            'dodgerblue1'=>array(30,144,255),
-            'dodgerblue2'=>array(28,134,238),
-            'dodgerblue3'=>array(24,116,205),
-            'dodgerblue4'=>array(16,78,139),
-            'steelblue1'=>array(99,184,255),
-            'steelblue2'=>array(92,172,238),
-            'steelblue3'=>array(79,148,205),
-            'steelblue4'=>array(54,100,139),
-            'deepskyblue1'=>array(0,191,255),
-            'deepskyblue2'=>array(0,178,238),
-            'deepskyblue3'=>array(0,154,205),
-            'deepskyblue4'=>array(0,104,139),
-            'skyblue1'=>array(135,206,255),
-            'skyblue2'=>array(126,192,238),
-            'skyblue3'=>array(108,166,205),
-            'skyblue4'=>array(74,112,139),
-            'lightskyblue1'=>array(176,226,255),
-            'lightskyblue2'=>array(164,211,238),
-            'lightskyblue3'=>array(141,182,205),
-            'lightskyblue4'=>array(96,123,139),
-            'slategray1'=>array(198,226,255),
-            'slategray2'=>array(185,211,238),
-            'slategray3'=>array(159,182,205),
-            'slategray4'=>array(108,123,139),
-            'lightsteelblue1'=>array(202,225,255),
-            'lightsteelblue2'=>array(188,210,238),
-            'lightsteelblue3'=>array(162,181,205),
-            'lightsteelblue4'=>array(110,123,139),
-            'lightblue1'=>array(191,239,255),
-            'lightblue2'=>array(178,223,238),
-            'lightblue3'=>array(154,192,205),
-            'lightblue4'=>array(104,131,139),
-            'lightcyan1'=>array(224,255,255),
-            'lightcyan2'=>array(209,238,238),
-            'lightcyan3'=>array(180,205,205),
-            'lightcyan4'=>array(122,139,139),
-            'paleturquoise1'=>array(187,255,255),
-            'paleturquoise2'=>array(174,238,238),
-            'paleturquoise3'=>array(150,205,205),
-            'paleturquoise4'=>array(102,139,139),
-            'cadetblue1'=>array(152,245,255),
-            'cadetblue2'=>array(142,229,238),
-            'cadetblue3'=>array(122,197,205),
-            'cadetblue4'=>array(83,134,139),
-            'turquoise1'=>array(0,245,255),
-            'turquoise2'=>array(0,229,238),
-            'turquoise3'=>array(0,197,205),
-            'turquoise4'=>array(0,134,139),
-            'cyan1'=>array(0,255,255),
-            'cyan2'=>array(0,238,238),
-            'cyan3'=>array(0,205,205),
-            'cyan4'=>array(0,139,139),
-            'darkslategray1'=>array(151,255,255),
-            'darkslategray2'=>array(141,238,238),
-            'darkslategray3'=>array(121,205,205),
-            'darkslategray4'=>array(82,139,139),
-            'aquamarine1'=>array(127,255,212),
-            'aquamarine2'=>array(118,238,198),
-            'aquamarine3'=>array(102,205,170),
-            'aquamarine4'=>array(69,139,116),
-            'darkseagreen1'=>array(193,255,193),
-            'darkseagreen2'=>array(180,238,180),
-            'darkseagreen3'=>array(155,205,155),
-            'darkseagreen4'=>array(105,139,105),
-            'seagreen1'=>array(84,255,159),
-            'seagreen2'=>array(78,238,148),
-            'seagreen3'=>array(67,205,128),
-            'seagreen4'=>array(46,139,87),
-            'palegreen1'=>array(154,255,154),
-            'palegreen2'=>array(144,238,144),
-            'palegreen3'=>array(124,205,124),
-            'palegreen4'=>array(84,139,84),
-            'springgreen1'=>array(0,255,127),
-            'springgreen2'=>array(0,238,118),
-            'springgreen3'=>array(0,205,102),
-            'springgreen4'=>array(0,139,69),
-            'chartreuse1'=>array(127,255,0),
-            'chartreuse2'=>array(118,238,0),
-            'chartreuse3'=>array(102,205,0),
-            'chartreuse4'=>array(69,139,0),
-            'olivedrab1'=>array(192,255,62),
-            'olivedrab2'=>array(179,238,58),
-            'olivedrab3'=>array(154,205,50),
-            'olivedrab4'=>array(105,139,34),
-            'darkolivegreen1'=>array(202,255,112),
-            'darkolivegreen2'=>array(188,238,104),
-            'darkolivegreen3'=>array(162,205,90),
-            'darkolivegreen4'=>array(110,139,61),
-            'khaki1'=>array(255,246,143),
-            'khaki2'=>array(238,230,133),
-            'khaki3'=>array(205,198,115),
-            'khaki4'=>array(139,134,78),
-            'lightgoldenrod1'=>array(255,236,139),
-            'lightgoldenrod2'=>array(238,220,130),
-            'lightgoldenrod3'=>array(205,190,112),
-            'lightgoldenrod4'=>array(139,129,76),
-            'yellow1'=>array(255,255,0),
-            'yellow2'=>array(238,238,0),
-            'yellow3'=>array(205,205,0),
-            'yellow4'=>array(139,139,0),
-            'gold1'=>array(255,215,0),
-            'gold2'=>array(238,201,0),
-            'gold3'=>array(205,173,0),
-            'gold4'=>array(139,117,0),
-            'goldenrod1'=>array(255,193,37),
-            'goldenrod2'=>array(238,180,34),
-            'goldenrod3'=>array(205,155,29),
-            'goldenrod4'=>array(139,105,20),
-            'darkgoldenrod1'=>array(255,185,15),
-            'darkgoldenrod2'=>array(238,173,14),
-            'darkgoldenrod3'=>array(205,149,12),
-            'darkgoldenrod4'=>array(139,101,8),
-            'rosybrown1'=>array(255,193,193),
-            'rosybrown2'=>array(238,180,180),
-            'rosybrown3'=>array(205,155,155),
-            'rosybrown4'=>array(139,105,105),
-            'indianred1'=>array(255,106,106),
-            'indianred2'=>array(238,99,99),
-            'indianred3'=>array(205,85,85),
-            'indianred4'=>array(139,58,58),
-            'sienna1'=>array(255,130,71),
-            'sienna2'=>array(238,121,66),
-            'sienna3'=>array(205,104,57),
-            'sienna4'=>array(139,71,38),
-            'burlywood1'=>array(255,211,155),
-            'burlywood2'=>array(238,197,145),
-            'burlywood3'=>array(205,170,125),
-            'burlywood4'=>array(139,115,85),
-            'wheat1'=>array(255,231,186),
-            'wheat2'=>array(238,216,174),
-            'wheat3'=>array(205,186,150),
-            'wheat4'=>array(139,126,102),
-            'tan1'=>array(255,165,79),
-            'tan2'=>array(238,154,73),
-            'tan3'=>array(205,133,63),
-            'tan4'=>array(139,90,43),
-            'chocolate1'=>array(255,127,36),
-            'chocolate2'=>array(238,118,33),
-            'chocolate3'=>array(205,102,29),
-            'chocolate4'=>array(139,69,19),
-            'firebrick1'=>array(255,48,48),
-            'firebrick2'=>array(238,44,44),
-            'firebrick3'=>array(205,38,38),
-            'firebrick4'=>array(139,26,26),
-            'brown1'=>array(255,64,64),
-            'brown2'=>array(238,59,59),
-            'brown3'=>array(205,51,51),
-            'brown4'=>array(139,35,35),
-            'salmon1'=>array(255,140,105),
-            'salmon2'=>array(238,130,98),
-            'salmon3'=>array(205,112,84),
-            'salmon4'=>array(139,76,57),
-            'lightsalmon1'=>array(255,160,122),
-            'lightsalmon2'=>array(238,149,114),
-            'lightsalmon3'=>array(205,129,98),
-            'lightsalmon4'=>array(139,87,66),
-            'orange1'=>array(255,165,0),
-            'orange2'=>array(238,154,0),
-            'orange3'=>array(205,133,0),
-            'orange4'=>array(139,90,0),
-            'darkorange1'=>array(255,127,0),
-            'darkorange2'=>array(238,118,0),
-            'darkorange3'=>array(205,102,0),
-            'darkorange4'=>array(139,69,0),
-            'coral1'=>array(255,114,86),
-            'coral2'=>array(238,106,80),
-            'coral3'=>array(205,91,69),
-            'coral4'=>array(139,62,47),
-            'tomato1'=>array(255,99,71),
-            'tomato2'=>array(238,92,66),
-            'tomato3'=>array(205,79,57),
-            'tomato4'=>array(139,54,38),
-            'orangered1'=>array(255,69,0),
-            'orangered2'=>array(238,64,0),
-            'orangered3'=>array(205,55,0),
-            'orangered4'=>array(139,37,0),
-            'deeppink1'=>array(255,20,147),
-            'deeppink2'=>array(238,18,137),
-            'deeppink3'=>array(205,16,118),
-            'deeppink4'=>array(139,10,80),
-            'hotpink1'=>array(255,110,180),
-            'hotpink2'=>array(238,106,167),
-            'hotpink3'=>array(205,96,144),
-            'hotpink4'=>array(139,58,98),
-            'pink1'=>array(255,181,197),
-            'pink2'=>array(238,169,184),
-            'pink3'=>array(205,145,158),
-            'pink4'=>array(139,99,108),
-            'lightpink1'=>array(255,174,185),
-            'lightpink2'=>array(238,162,173),
-            'lightpink3'=>array(205,140,149),
-            'lightpink4'=>array(139,95,101),
-            'palevioletred1'=>array(255,130,171),
-            'palevioletred2'=>array(238,121,159),
-            'palevioletred3'=>array(205,104,137),
-            'palevioletred4'=>array(139,71,93),
-            'maroon1'=>array(255,52,179),
-            'maroon2'=>array(238,48,167),
-            'maroon3'=>array(205,41,144),
-            'maroon4'=>array(139,28,98),
-            'violetred1'=>array(255,62,150),
-            'violetred2'=>array(238,58,140),
-            'violetred3'=>array(205,50,120),
-            'violetred4'=>array(139,34,82),
-            'magenta1'=>array(255,0,255),
-            'magenta2'=>array(238,0,238),
-            'magenta3'=>array(205,0,205),
-            'magenta4'=>array(139,0,139),
-            'mediumred'=>array(140,34,34),
-            'orchid1'=>array(255,131,250),
-            'orchid2'=>array(238,122,233),
-            'orchid3'=>array(205,105,201),
-            'orchid4'=>array(139,71,137),
-            'plum1'=>array(255,187,255),
-            'plum2'=>array(238,174,238),
-            'plum3'=>array(205,150,205),
-            'plum4'=>array(139,102,139),
-            'mediumorchid1'=>array(224,102,255),
-            'mediumorchid2'=>array(209,95,238),
-            'mediumorchid3'=>array(180,82,205),
-            'mediumorchid4'=>array(122,55,139),
-            'darkorchid1'=>array(191,62,255),
-            'darkorchid2'=>array(178,58,238),
-            'darkorchid3'=>array(154,50,205),
-            'darkorchid4'=>array(104,34,139),
-            'purple1'=>array(155,48,255),
-            'purple2'=>array(145,44,238),
-            'purple3'=>array(125,38,205),
-            'purple4'=>array(85,26,139),
-            'mediumpurple1'=>array(171,130,255),
-            'mediumpurple2'=>array(159,121,238),
-            'mediumpurple3'=>array(137,104,205),
-            'mediumpurple4'=>array(93,71,139),
-            'thistle1'=>array(255,225,255),
-            'thistle2'=>array(238,210,238),
-            'thistle3'=>array(205,181,205),
-            'thistle4'=>array(139,123,139),
-            'gray1'=>array(10,10,10),
-            'gray2'=>array(40,40,30),
-            'gray3'=>array(70,70,70),
-            'gray4'=>array(100,100,100),
-            'gray5'=>array(130,130,130),
-            'gray6'=>array(160,160,160),
-            'gray7'=>array(190,190,190),
-            'gray8'=>array(210,210,210),
-            'gray9'=>array(240,240,240),
-            'darkgray'=>array(100,100,100),
-            'darkblue'=>array(0,0,139),
-            'darkcyan'=>array(0,139,139),
-            'darkmagenta'=>array(139,0,139),
-            'darkred'=>array(139,0,0),
-            'silver'=>array(192, 192, 192),
-            'eggplant'=>array(144,176,168),
-            'lightgreen'=>array(144,238,144));
-    }
-
-
-    //----------------
-    // PUBLIC METHODS
-    // Colors can be specified as either
-    // 1. #xxxxxx   HTML style
-    // 2. "colorname"  as a named color
-    // 3. array(r,g,b) RGB triple
-    // This function translates this to a native RGB format and returns an
-    // RGB triple.
-
-    function Color($aColor) {
-        if (is_string($aColor)) {
-            $matches = array();
-            // this regex will parse a color string and fill the $matches array as such:
-            // 0: the full match if any
-            // 1: a hex string preceded by a hash, can be 3 characters (#fff) or 6 (#ffffff) (4 or 5 also accepted but...)
-            // 2,3,4: r,g,b values in hex if the first character of the string is #
-            // 5: all alpha-numeric characters at the beginning of the string if string does not start with #
-            // 6: alpha value prefixed by @ if supplied
-            // 7: alpha value with @ stripped
-            // 8: adjust value prefixed with : if supplied
-            // 9: adjust value with : stripped
-            $regex = '/(#([0-9a-fA-F]{1,2})([0-9a-fA-F]{1,2})([0-9a-fA-F]{1,2}))?([\w]+)?(@([\d\.,]+))?(:([\d\.,]+))?/';
-            if(!preg_match($regex, $aColor, $matches)) {
-                JpGraphError::RaiseL(25078,$aColor);//(" Unknown color: $aColor");
-            }
-            if(empty($matches[5])) {
-                $r = strlen($matches[2]) == 1 ? $matches[2].$matches[2] : $matches[2];
-                $g = strlen($matches[3]) == 1 ? $matches[3].$matches[3] : $matches[3];
-                $b = strlen($matches[4]) == 1 ? $matches[4].$matches[4] : $matches[4];
-                $r = hexdec($r);
-                $g = hexdec($g);
-                $b = hexdec($b);
-            }else {
-                if(!isset($this->rgb_table[$matches[5]]) ) {
-                    JpGraphError::RaiseL(25078,$aColor);//(" Unknown color: $aColor");
-                }
-                $r = $this->rgb_table[$matches[5]][0];
-                $g = $this->rgb_table[$matches[5]][1];
-                $b = $this->rgb_table[$matches[5]][2];
-            }
-            $alpha	= isset($matches[7]) ? str_replace(',','.',$matches[7]) : 0;
-            $adj	= isset($matches[9]) ? str_replace(',','.',$matches[9]) : 1.0;
-
-            if( $adj < 0 ) {
-                JpGraphError::RaiseL(25077);//('Adjustment factor for color must be > 0');
-            }
-
-            // Scale adj so that an adj=2 always
-            // makes the color 100% white (i.e. 255,255,255.
-            // and adj=1 neutral and adj=0 black.
-            if( $adj == 1) {
-                return array($r,$g,$b,$alpha);
-            }
-            elseif( $adj > 1 ) {
-                $m = ($adj-1.0)*(255-min(255,min($r,min($g,$b))));
-                return array(min(255,$r+$m), min(255,$g+$m), min(255,$b+$m),$alpha);
-            }
-            elseif( $adj < 1 ) {
-                $m = ($adj-1.0)*max(255,max($r,max($g,$b)));
-                return array(max(0,$r+$m), max(0,$g+$m), max(0,$b+$m),$alpha);
-            }
-        } elseif( is_array($aColor) ) {
-            if(!isset($aColor[3])) $aColor[3] = 0;
-            return $aColor;
-        }
-        else {
-            JpGraphError::RaiseL(25079,$aColor,count($aColor));//(" Unknown color specification: $aColor , size=".count($aColor));
-        }
-    }
-
-    // Compare two colors
-    // return true if equal
-    function Equal($aCol1,$aCol2) {
-        $c1 = $this->Color($aCol1);
-        $c2 = $this->Color($aCol2);
-        return $c1[0]==$c2[0] && $c1[1]==$c2[1] && $c1[2]==$c2[2] ;
-    }
-
-    // Allocate a new color in the current image
-    // Return new color index, -1 if no more colors could be allocated
-    function Allocate($aColor,$aAlpha=0.0) {
-        list ($r, $g, $b, $a) = $this->color($aColor);
-        // If alpha is specified in the color string then this
-        // takes precedence over the second argument
-        if( $a > 0 ) {
-            $aAlpha = $a;
-        }
-        if( $aAlpha < 0 || $aAlpha > 1 ) {
-            JpGraphError::RaiseL(25080);//('Alpha parameter for color must be between 0.0 and 1.0');
-        }
-        return imagecolorresolvealpha($this->img, $r, $g, $b, round($aAlpha * 127));
-    }
-
-    // Try to convert an array with three valid numbers to the corresponding hex array
-    // This is currenly only used in processing the colors for barplots in order to be able
-    // to handle the case where the color might be specified as an array of colros as well.
-    // In that case we must be able to find out if an array of values should be interpretated as
-    // a single color (specifeid as an RGB triple)
-    static function tryHexConversion($aColor) {
-        if( is_array( $aColor ) ) {
-            if( count( $aColor ) == 3 ) {
-                if( is_numeric($aColor[0]) && is_numeric($aColor[1]) && is_numeric($aColor[2]) ) {
-                    if( ($aColor[0] >= 0 && $aColor[0] <= 255) &&
-                        ($aColor[1] >= 0 && $aColor[1] <= 255) &&
-                        ($aColor[2] >= 0 && $aColor[2] <= 255) ) {
-                        return sprintf('#%02x%02x%02x',$aColor[0],$aColor[1],$aColor[2]);
-                    }
-                }
-            }
-        }
-        return $aColor;
-    }
-
-    // Return a RGB tripple corresponding to a position in the normal light spectrum
-    // The argumen values is in the range [0, 1] where a value of 0 correponds to blue and
-    // a value of 1 corresponds to red. Values in betwen is mapped to a linear interpolation
-    // of the constituting colors in the visible color spectra.
-    // The $aDynamicRange specified how much of the dynamic range we shold use
-    // a value of 1.0 give the full dyanmic range and a lower value give more dark
-    // colors. In the extreme of 0.0 then all colors will be black.
-    static function GetSpectrum($aVal,$aDynamicRange=1.0) {
-        if( $aVal < 0 || $aVal > 1.0001 ) {
-            return array(0,0,0); // Invalid case - just return black
-        }
-
-        $sat = round(255*$aDynamicRange);
-        $a = 0.25;
-        if( $aVal <= 0.25 ) {
-            return array(0, round($sat*$aVal/$a), $sat);
-        }
-        elseif( $aVal <= 0.5 ) {
-            return array(0, $sat, round($sat-$sat*($aVal-0.25)/$a));
-        }
-        elseif( $aVal <= 0.75 ) {
-            return array(round($sat*($aVal-0.5)/$a), $sat, 0);
-        }
-        else {
-            return array($sat, round($sat-$sat*($aVal-0.75)/$a), 0);
-        }
-    }
-
-} // Class
-
-?>
diff --git a/#jpgraph/src/jpgraph_scatter.php b/#jpgraph/src/jpgraph_scatter.php
deleted file mode 100644
index fe987c2c..00000000
--- a/#jpgraph/src/jpgraph_scatter.php
+++ /dev/null
@@ -1,242 +0,0 @@
-<?php
-/*=======================================================================
- // File:        JPGRAPH_SCATTER.PHP
- // Description: Scatter (and impuls) plot extension for JpGraph
- // Created:     2001-02-11
- // Ver:         $Id: jpgraph_scatter.php 1397 2009-06-27 21:34:14Z ljp $
- //
- // Copyright (c) Asial Corporation. All rights reserved.
- //========================================================================
- */
-require_once ('jpgraph_plotmark.inc.php');
-
-//===================================================
-// CLASS FieldArrow
-// Description: Draw an arrow at (x,y) with angle a
-//===================================================
-class FieldArrow {
-    public $iColor='black';
-    public $iSize=10;  // Length in pixels for  arrow
-    public $iArrowSize = 2;
-    private $isizespec = array(
-    	array(2,1),array(3,2),array(4,3),array(6,4),array(7,4),array(8,5),array(10,6),array(12,7),array(16,8),array(20,10)
-    	);
-    function __construct() {
-    	// Empty
-    }
-
-    function SetSize($aSize,$aArrowSize=2) {
-        $this->iSize = $aSize;
-        $this->iArrowSize = $aArrowSize;
-    }
-
-    function SetColor($aColor) {
-        $this->iColor = $aColor;
-    }
-
-    function Stroke($aImg,$x,$y,$a) {
-        // First rotate the center coordinates
-        list($x,$y) = $aImg->Rotate($x,$y);
-
-        $old_origin = $aImg->SetCenter($x,$y);
-        $old_a = $aImg->a;
-        $aImg->SetAngle(-$a+$old_a);
-
-        $dx = round($this->iSize/2);
-        $c = array($x-$dx,$y,$x+$dx,$y);
-        $x += $dx;
-
-        list($dx,$dy) = $this->isizespec[$this->iArrowSize];
-        $ca = array($x,$y,$x-$dx,$y-$dy,$x-$dx,$y+$dy,$x,$y);
-
-        $aImg->SetColor($this->iColor);
-        $aImg->Polygon($c);
-        $aImg->FilledPolygon($ca);
-
-        $aImg->SetCenter($old_origin[0],$old_origin[1]);
-        $aImg->SetAngle($old_a);
-    }
-}
-
-//===================================================
-// CLASS FieldPlot
-// Description: Render a field plot
-//===================================================
-class FieldPlot extends Plot {
-    public $arrow = '';
-    private $iAngles = array();
-    private $iCallback = '';
-
-    function __construct($datay,$datax,$angles) {
-        if( (count($datax) != count($datay)) )
-        JpGraphError::RaiseL(20001);//("Fieldplots must have equal number of X and Y points.");
-        if( (count($datax) != count($angles)) )
-        JpGraphError::RaiseL(20002);//("Fieldplots must have an angle specified for each X and Y points.");
-
-        $this->iAngles = $angles;
-
-        parent::__construct($datay,$datax);
-        $this->value->SetAlign('center','center');
-        $this->value->SetMargin(15);
-
-        $this->arrow = new FieldArrow();
-    }
-
-    function SetCallback($aFunc) {
-        $this->iCallback = $aFunc;
-    }
-
-    function Stroke($img,$xscale,$yscale) {
-
-        // Remeber base color and size
-        $bc = $this->arrow->iColor;
-        $bs = $this->arrow->iSize;
-        $bas = $this->arrow->iArrowSize;
-
-        for( $i=0; $i<$this->numpoints; ++$i ) {
-            // Skip null values
-            if( $this->coords[0][$i]==="" )
-            continue;
-
-            $f = $this->iCallback;
-            if( $f != "" ) {
-                list($cc,$cs,$cas) = call_user_func($f,$this->coords[1][$i],$this->coords[0][$i],$this->iAngles[$i]);
-                // Fall back on global data if the callback isn't set
-                if( $cc  == "" ) $cc = $bc;
-                if( $cs  == "" ) $cs = $bs;
-                if( $cas == "" ) $cas = $bas;
-                $this->arrow->SetColor($cc);
-                $this->arrow->SetSize($cs,$cas);
-            }
-
-            $xt = $xscale->Translate($this->coords[1][$i]);
-            $yt = $yscale->Translate($this->coords[0][$i]);
-
-            $this->arrow->Stroke($img,$xt,$yt,$this->iAngles[$i]);
-            $this->value->Stroke($img,$this->coords[0][$i],$xt,$yt);
-        }
-    }
-
-    // Framework function
-    function Legend($aGraph) {
-        if( $this->legend != "" ) {
-            $aGraph->legend->Add($this->legend,$this->mark->fill_color,$this->mark,0,
-            $this->legendcsimtarget,$this->legendcsimalt,$this->legendcsimwintarget);
-        }
-    }
-}
-
-//===================================================
-// CLASS ScatterPlot
-// Description: Render X and Y plots
-//===================================================
-class ScatterPlot extends Plot {
-    public $mark,$link;
-    private $impuls = false;
-    //---------------
-    // CONSTRUCTOR
-    function __construct($datay,$datax=false) {
-        if( (count($datax) != count($datay)) && is_array($datax)) {
-        	JpGraphError::RaiseL(20003);//("Scatterplot must have equal number of X and Y points.");
-        }
-        parent::__construct($datay,$datax);
-        $this->mark = new PlotMark();
-        $this->mark->SetType(MARK_SQUARE);
-        $this->mark->SetColor($this->color);
-        $this->value->SetAlign('center','center');
-        $this->value->SetMargin(0);
-        $this->link = new LineProperty(1,'black','solid');
-        $this->link->iShow = false;
-    }
-
-    //---------------
-    // PUBLIC METHODS
-    function SetImpuls($f=true) {
-        $this->impuls = $f;
-    }
-
-    function SetStem($f=true) {
-        $this->impuls = $f;
-    }
-
-    // Combine the scatter plot points with a line
-    function SetLinkPoints($aFlag=true,$aColor="black",$aWeight=1,$aStyle='solid') {
-    	$this->link->iShow = $aFlag;
-    	$this->link->iColor = $aColor;
-    	$this->link->iWeight = $aWeight;
-    	$this->link->iStyle = $aStyle;
-    }
-
-    function Stroke($img,$xscale,$yscale) {
-
-        $ymin=$yscale->scale_abs[0];
-        if( $yscale->scale[0] < 0 )
-        $yzero=$yscale->Translate(0);
-        else
-        $yzero=$yscale->scale_abs[0];
-
-        $this->csimareas = '';
-        for( $i=0; $i<$this->numpoints; ++$i ) {
-
-            // Skip null values
-            if( $this->coords[0][$i]==='' || $this->coords[0][$i]==='-' || $this->coords[0][$i]==='x')
-            continue;
-
-            if( isset($this->coords[1]) )
-            $xt = $xscale->Translate($this->coords[1][$i]);
-            else
-            $xt = $xscale->Translate($i);
-            $yt = $yscale->Translate($this->coords[0][$i]);
-
-
-            if( $this->link->iShow && isset($yt_old) ) {
-                $img->SetColor($this->link->iColor);
-                $img->SetLineWeight($this->link->iWeight);
-                $old = $img->SetLineStyle($this->link->iStyle);
-                $img->StyleLine($xt_old,$yt_old,$xt,$yt);
-                $img->SetLineStyle($old);
-            }
-
-            if( $this->impuls ) {
-                $img->SetColor($this->color);
-                $img->SetLineWeight($this->weight);
-                $img->Line($xt,$yzero,$xt,$yt);
-            }
-
-            if( !empty($this->csimtargets[$i]) ) {
-                if( !empty($this->csimwintargets[$i]) ) {
-                    $this->mark->SetCSIMTarget($this->csimtargets[$i],$this->csimwintargets[$i]);
-                }
-                else {
-                    $this->mark->SetCSIMTarget($this->csimtargets[$i]);
-                }
-                $this->mark->SetCSIMAlt($this->csimalts[$i]);
-            }
-
-            if( isset($this->coords[1]) ) {
-                $this->mark->SetCSIMAltVal($this->coords[0][$i],$this->coords[1][$i]);
-            }
-            else {
-                $this->mark->SetCSIMAltVal($this->coords[0][$i],$i);
-            }
-
-            $this->mark->Stroke($img,$xt,$yt);
-
-            $this->csimareas .= $this->mark->GetCSIMAreas();
-            $this->value->Stroke($img,$this->coords[0][$i],$xt,$yt);
-
-            $xt_old = $xt;
-            $yt_old = $yt;
-        }
-    }
-
-    // Framework function
-    function Legend($aGraph) {
-        if( $this->legend != "" ) {
-            $aGraph->legend->Add($this->legend,$this->mark->fill_color,$this->mark,0,
-            $this->legendcsimtarget,$this->legendcsimalt,$this->legendcsimwintarget);
-        }
-    }
-} // Class
-/* EOF */
-?>
diff --git a/#jpgraph/src/jpgraph_stock.php b/#jpgraph/src/jpgraph_stock.php
deleted file mode 100644
index 88c42084..00000000
--- a/#jpgraph/src/jpgraph_stock.php
+++ /dev/null
@@ -1,198 +0,0 @@
-<?php
-/*=======================================================================
- // File:        JPGRAPH_STOCK.PHP
- // Description: Stock plot extension for JpGraph
- // Created:     2003-01-27
- // Ver:         $Id: jpgraph_stock.php 1364 2009-06-24 07:07:44Z ljp $
- //
- // Copyright (c) Asial Corporation. All rights reserved.
- //========================================================================
- */
-
-//===================================================
-// CLASS StockPlot
-//===================================================
-class StockPlot extends Plot {
-    protected $iTupleSize = 4;
-    private $iWidth=9;
-    private $iEndLines=1;
-    private $iStockColor1='white',$iStockColor2='darkred',$iStockColor3='darkred';
-    //---------------
-    // CONSTRUCTOR
-    function __construct($datay,$datax=false) {
-        if( count($datay) % $this->iTupleSize ) {
-            JpGraphError::RaiseL(21001,$this->iTupleSize);
-            //('Data values for Stock charts must contain an even multiple of '.$this->iTupleSize.' data points.');
-        }
-        parent::__construct($datay,$datax);
-        $this->numpoints /= $this->iTupleSize;
-    }
-    //---------------
-    // PUBLIC METHODS
-
-    function SetColor($aColor,$aColor1='white',$aColor2='darkred',$aColor3='darkred') {
-        $this->color = $aColor;
-        $this->iStockColor1 = $aColor1;
-        $this->iStockColor2 = $aColor2;
-        $this->iStockColor3 = $aColor3;
-    }
-
-    function SetWidth($aWidth) {
-        // Make sure it's odd
-        $this->iWidth = 2*floor($aWidth/2)+1;
-    }
-
-    function HideEndLines($aHide=true) {
-        $this->iEndLines = !$aHide;
-    }
-
-    // Gets called before any axis are stroked
-    function PreStrokeAdjust($graph) {
-        if( $this->center ) {
-            $a=0.5; $b=0.5;
-            $this->numpoints++;
-        } else {
-            $a=0; $b=0;
-        }
-        $graph->xaxis->scale->ticks->SetXLabelOffset($a);
-        $graph->SetTextScaleOff($b);
-    }
-
-    // Method description
-    function Stroke($img,$xscale,$yscale) {
-        $n=$this->numpoints;
-        if( $this->center ) $n--;
-        if( isset($this->coords[1]) ) {
-            if( count($this->coords[1])!=$n ) {
-                JpGraphError::RaiseL(2003,count($this->coords[1]),$n);
-                // ("Number of X and Y points are not equal. Number of X-points:".count($this->coords[1])." Number of Y-points:$numpoints");
-            }
-            else {
-                $exist_x = true;
-            }
-        }
-        else {
-            $exist_x = false;
-        }
-
-        if( $exist_x ) {
-            $xs=$this->coords[1][0];
-        }
-        else {
-            $xs=0;
-        }
-
-        $ts = $this->iTupleSize;
-        $this->csimareas = '';
-        for( $i=0; $i<$n; ++$i) {
-
-            //If value is NULL, then don't draw a bar at all
-            if ($this->coords[0][$i*$ts] === null) continue;
-
-            if( $exist_x ) {
-                $x=$this->coords[1][$i];
-				if ($x === null) continue;
-            }
-            else {
-                $x=$i;
-            }
-            $xt = $xscale->Translate($x);
-
-            $neg = $this->coords[0][$i*$ts] > $this->coords[0][$i*$ts+1] ;
-            $yopen  = $yscale->Translate($this->coords[0][$i*$ts]);
-            $yclose = $yscale->Translate($this->coords[0][$i*$ts+1]);
-            $ymin   = $yscale->Translate($this->coords[0][$i*$ts+2]);
-            $ymax   = $yscale->Translate($this->coords[0][$i*$ts+3]);
-
-            $dx = floor($this->iWidth/2);
-            $xl = $xt - $dx;
-            $xr = $xt + $dx;
-
-            if( $neg ) {
-                $img->SetColor($this->iStockColor3);
-            }
-            else {
-                $img->SetColor($this->iStockColor1);
-            }
-            $img->FilledRectangle($xl,$yopen,$xr,$yclose);
-            $img->SetLineWeight($this->weight);
-            if( $neg ) {
-                $img->SetColor($this->iStockColor2);
-            }
-            else {
-                $img->SetColor($this->color);
-            }
-
-            $img->Rectangle($xl,$yopen,$xr,$yclose);
-
-            if( $yopen < $yclose ) {
-                $ytop = $yopen ;
-                $ybottom = $yclose ;
-            }
-            else {
-                $ytop = $yclose ;
-                $ybottom = $yopen ;
-            }
-            $img->SetColor($this->color);
-            $img->Line($xt,$ytop,$xt,$ymax);
-            $img->Line($xt,$ybottom,$xt,$ymin);
-
-            if( $this->iEndLines ) {
-                $img->Line($xl,$ymax,$xr,$ymax);
-                $img->Line($xl,$ymin,$xr,$ymin);
-            }
-
-            // A chance for subclasses to add things to the bar
-            // for data point i
-            $this->ModBox($img,$xscale,$yscale,$i,$xl,$xr,$neg);
-
-            // Setup image maps
-            if( !empty($this->csimtargets[$i]) ) {
-                $this->csimareas.= '<area shape="rect" coords="'.
-                round($xl).','.round($ytop).','.
-                round($xr).','.round($ybottom).'" ';
-                $this->csimareas .= ' href="'.$this->csimtargets[$i].'"';
-                if( !empty($this->csimalts[$i]) ) {
-                    $sval=$this->csimalts[$i];
-                    $this->csimareas .= " title=\"$sval\" alt=\"$sval\" ";
-                }
-                $this->csimareas.= "  />\n";
-            }
-        }
-        return true;
-    }
-
-    // A hook for subclasses to modify the plot
-    function ModBox($img,$xscale,$yscale,$i,$xl,$xr,$neg) {}
-
-} // Class
-
-//===================================================
-// CLASS BoxPlot
-//===================================================
-class BoxPlot extends StockPlot {
-    private $iPColor='black',$iNColor='white';
-
-    function __construct($datay,$datax=false) {
-        $this->iTupleSize=5;
-        parent::__construct($datay,$datax);
-    }
-
-    function SetMedianColor($aPos,$aNeg) {
-        $this->iPColor = $aPos;
-        $this->iNColor = $aNeg;
-    }
-
-    function ModBox($img,$xscale,$yscale,$i,$xl,$xr,$neg) {
-        if( $neg )
-        $img->SetColor($this->iNColor);
-        else
-        $img->SetColor($this->iPColor);
-
-        $y = $yscale->Translate($this->coords[0][$i*5+4]);
-        $img->Line($xl,$y,$xr,$y);
-    }
-}
-
-/* EOF */
-?>
diff --git a/#jpgraph/src/jpgraph_table.php b/#jpgraph/src/jpgraph_table.php
deleted file mode 100644
index 852d78b0..00000000
--- a/#jpgraph/src/jpgraph_table.php
+++ /dev/null
@@ -1,1325 +0,0 @@
-<?php
-/*=======================================================================
- // File:        JPGRAPH_TABLE.PHP
- // Description: Classes to create basic tables of data
- // Created:     2006-01-25
- // Ver:         $Id: jpgraph_table.php 1514 2009-07-07 11:15:58Z ljp $
- //
- // Copyright (c) Asial Corporation. All rights reserved.
- //========================================================================
- */
-
-// Style of grid lines in table
-DEFINE('TGRID_SINGLE',1);
-DEFINE('TGRID_DOUBLE',2);
-DEFINE('TGRID_DOUBLE2',3);
-
-// Type of constrain for image constrain
-DEFINE('TIMG_WIDTH',1);
-DEFINE('TIMG_HEIGHT',2);
-
-//---------------------------------------------------------------------
-// CLASS GTextTableCell
-// Description:
-// Internal class that represents each cell in the table
-//---------------------------------------------------------------------
-class GTextTableCell {
-    public $iColSpan=1,$iRowSpan=1;
-    public $iMarginLeft=5,$iMarginRight=5,$iMarginTop=5,$iMarginBottom=5;
-    public $iVal=NULL;
-    private $iBGColor='', $iFontColor='black';
-    private $iFF=FF_FONT1,$iFS=FS_NORMAL,$iFSize=10;
-    private $iRow=0, $iCol=0;
-    private $iVertAlign = 'bottom', $iHorAlign = 'left';
-    private $iMerged=FALSE,$iPRow=NULL,$iPCol=NULL;
-    private $iTable=NULL;
-    private $iGridColor=array('darkgray','darkgray','darkgray','darkgray');
-    private $iGridWeight=array(1,1,0,0); // left,top,bottom,right;
-    private $iGridStyle=array(TGRID_SINGLE,TGRID_SINGLE,TGRID_SINGLE,TGRID_SINGLE); // left,top,bottom,right;
-    private $iNumberFormat=null;
-    private $iIcon=null, $iIconConstrain=array();
-    private $iCSIMtarget = '',$iCSIMwintarget = '', $iCSIMalt = '', $iCSIMArea = '';
-
-    function __construct($aVal='',$aRow=0,$aCol=0) {
-        $this->iVal = new Text($aVal);
-        $this->iRow = $aRow;
-        $this->iCol = $aCol;
-        $this->iPRow = $aRow; // Initialiy each cell is its own parent
-        $this->iPCol = $aCol;
-        $this->iIconConstrain = array(-1,-1);
-    }
-
-    function Init($aTable) {
-        $this->iTable = $aTable;
-    }
-
-    function SetCSIMTarget($aTarget,$aAlt='',$aWinTarget='') {
-        $this->iCSIMtarget = $aTarget;
-        $this->iCSIMwintarget = $aWinTarget;
-        $this->iCSIMalt = $aAlt;
-    }
-
-    function GetCSIMArea() {
-        if( $this->iCSIMtarget !== '' )
-        return $this->iCSIMArea;
-        else
-        return '';
-    }
-
-    function SetImageConstrain($aType,$aVal) {
-        if( !in_array($aType,array(TIMG_WIDTH, TIMG_HEIGHT)) ) {
-            JpGraphError::RaiseL(27015);
-        }
-        $this->iIconConstrain = array($aType,$aVal);
-    }
-
-    function SetCountryFlag($aFlag,$aScale=1.0,$aMix=100,$aStdSize=3) {
-        $this->iIcon = new IconPlot();
-        $this->iIcon->SetCountryFlag($aFlag,0,0,$aScale,$aMix,$aStdSize);
-    }
-
-    function SetImage($aFile,$aScale=1.0,$aMix=100) {
-        $this->iIcon = new IconPlot($aFile,0,0,$aScale,$aMix);
-    }
-
-    function SetImageFromString($aStr,$aScale=1.0,$aMix=100) {
-        $this->iIcon = new IconPlot("",0,0,$aScale,$aMix);
-        $this->iIcon->CreateFromString($aStr);
-    }
-
-    function SetRowColSpan($aRowSpan,$aColSpan) {
-        $this->iRowSpan = $aRowSpan;
-        $this->iColSpan = $aColSpan;
-        $this->iMerged = true;
-    }
-
-    function SetMerged($aPRow,$aPCol,$aFlg=true) {
-        $this->iMerged = $aFlg;
-        $this->iPRow=$aPRow;
-        $this->iPCol=$aPCol;
-    }
-
-    function IsMerged() {
-        return $this->iMerged;
-    }
-
-    function SetNumberFormat($aF) {
-        $this->iNumberFormat = $aF;
-    }
-
-    function Set($aTxt) {
-        $this->iVal->Set($aTxt);
-    }
-
-    function SetFont($aFF,$aFS,$aFSize) {
-        $this->iFF = $aFF;
-        $this->iFS = $aFS;
-        $this->iFSize = $aFSize;
-        $this->iVal->SetFont($aFF,$aFS,$aFSize);
-    }
-
-    function SetFillColor($aColor) {
-        $this->iBGColor=$aColor;
-    }
-
-    function SetFontColor($aColor) {
-        $this->iFontColor=$aColor;
-    }
-
-    function SetGridColor($aLeft,$aTop=null,$aBottom=null,$aRight=null) {
-        if( $aLeft !== null ) $this->iGridColor[0] = $aLeft;
-        if( $aTop !== null ) $this->iGridColor[1] = $aTop;
-        if( $aBottom !== null ) $this->iGridColor[2] = $aBottom;
-        if( $aRight !== null )$this->iGridColor[3] = $aRight;
-    }
-
-    function SetGridStyle($aLeft,$aTop=null,$aBottom=null,$aRight=null) {
-        if( $aLeft !== null ) $this->iGridStyle[0] = $aLeft;
-        if( $aTop !== null ) $this->iGridStyle[1] = $aTop;
-        if( $aBottom !== null ) $this->iGridStyle[2] = $aBottom;
-        if( $aRight !== null )$this->iGridStyle[3] = $aRight;
-    }
-
-    function SetGridWeight($aLeft=null,$aTop=null,$aBottom=null,$aRight=null) {
-        if( $aLeft !== null ) $this->iGridWeight[0] = $aLeft;
-        if( $aTop !== null ) $this->iGridWeight[1] = $aTop;
-        if( $aBottom !== null ) $this->iGridWeight[2] = $aBottom;
-        if( $aRight !== null ) $this->iGridWeight[3] = $aRight;
-    }
-
-    function SetMargin($aLeft,$aRight,$aTop,$aBottom) {
-        $this->iMarginLeft=$aLeft;
-        $this->iMarginRight=$aRight;
-        $this->iMarginTop=$aTop;
-        $this->iMarginBottom=$aBottom;
-    }
-
-    function GetWidth($aImg) {
-        if( $this->iIcon !== null ) {
-            if( $this->iIconConstrain[0] == TIMG_WIDTH ) {
-            	$this->iIcon->SetScale(1);
-            	$tmp = $this->iIcon->GetWidthHeight();
-                $this->iIcon->SetScale($this->iIconConstrain[1]/$tmp[0]);
-            }
-            elseif( $this->iIconConstrain[0] == TIMG_HEIGHT ) {
-            	$this->iIcon->SetScale(1);
-            	$tmp = $this->iIcon->GetWidthHeight();
-                $this->iIcon->SetScale($this->iIconConstrain[1]/$tmp[1]);
-            }
-            $tmp = $this->iIcon->GetWidthHeight();
-            $iwidth = $tmp[0];
-        }
-        else {
-            $iwidth=0;
-        }
-        if( $this->iTable->iCells[$this->iPRow][$this->iPCol]->iVal->dir == 0 ) {
-            $pwidth = $this->iTable->iCells[$this->iPRow][$this->iPCol]->iVal->GetWidth($aImg);
-        }
-        elseif( $this->iTable->iCells[$this->iPRow][$this->iPCol]->iVal->dir == 90 ) {
-            $pwidth = $this->iTable->iCells[$this->iPRow][$this->iPCol]->iVal->GetFontHeight($aImg)+2;
-        }
-        else {
-            $pwidth = $this->iTable->iCells[$this->iPRow][$this->iPCol]->iVal->GetWidth($aImg)+2;
-        }
-
-        $pcolspan = $this->iTable->iCells[$this->iPRow][$this->iPCol]->iColSpan;
-        return round(max($iwidth,$pwidth)/$pcolspan) + $this->iMarginLeft + $this->iMarginRight;
-    }
-
-    function GetHeight($aImg) {
-        if( $this->iIcon !== null ) {
-            if( $this->iIconConstrain[0] == TIMG_WIDTH ) {
-            	$this->iIcon->SetScale(1);
-            	$tmp = $this->iIcon->GetWidthHeight();
-            	$this->iIcon->SetScale($this->iIconConstrain[1]/$tmp[0]);
-            }
-            elseif( $this->iIconConstrain[0] == TIMG_HEIGHT ) {
-            	$this->iIcon->SetScale(1);
-            	$tmp = $this->iIcon->GetWidthHeight();
-                $this->iIcon->SetScale($this->iIconConstrain[1]/$tmp[1]);
-            }
-            $tmp = $this->iIcon->GetWidthHeight();
-            $iheight =  $tmp[1];
-        }
-        else {
-            $iheight = 0;
-        }
-        if( $this->iTable->iCells[$this->iPRow][$this->iPCol]->iVal->dir == 0 ) {
-            $pheight = $this->iTable->iCells[$this->iPRow][$this->iPCol]->iVal->GetHeight($aImg);
-        }
-        else {
-            $pheight = $this->iTable->iCells[$this->iPRow][$this->iPCol]->iVal->GetHeight($aImg)+1;
-        }
-        $prowspan = $this->iTable->iCells[$this->iPRow][$this->iPCol]->iRowSpan;
-        return round(max($iheight,$pheight)/$prowspan) + $this->iMarginTop + $this->iMarginBottom;
-    }
-
-    function SetAlign($aHorAlign='left',$aVertAlign='bottom') {
-        $aHorAlign = strtolower($aHorAlign);
-        $aVertAlign = strtolower($aVertAlign);
-        $chk = array('left','right','center','bottom','top','middle');
-        if( !in_array($aHorAlign,$chk) || !in_array($aVertAlign,$chk) ) {
-            JpGraphError::RaiseL(27011,$aHorAlign,$aVertAlign);
-        }
-        $this->iVertAlign = $aVertAlign;
-        $this->iHorAlign = $aHorAlign;
-    }
-
-    function AdjustMarginsForGrid() {
-        if( $this->iCol > 0 ) {
-            switch( $this->iGridStyle[0] ) {
-                case TGRID_SINGLE:  $wf=1;  break;
-                case TGRID_DOUBLE:  $wf=3;  break;
-                case TGRID_DOUBLE2: $wf=4;  break;
-            }
-            $this->iMarginLeft += $this->iGridWeight[0]*$wf;
-        }
-        if( $this->iRow > 0 ) {
-            switch( $this->iGridStyle[1] ) {
-                case TGRID_SINGLE:  $wf=1;  break;
-                case TGRID_DOUBLE:  $wf=3;  break;
-                case TGRID_DOUBLE2: $wf=4;  break;
-            }
-            $this->iMarginTop += $this->iGridWeight[1]*$wf;
-        }
-        if( $this->iRow+$this->iRowSpan-1 < $this->iTable->iSize[0]-1 ) {
-            switch( $this->iGridStyle[2] ) {
-                case TGRID_SINGLE: $wf=1; break;
-                case TGRID_DOUBLE: $wf=3; break;
-                case TGRID_DOUBLE2: $wf=4; break;
-            }
-            $this->iMarginBottom += $this->iGridWeight[2]*$wf;
-        }
-        if( $this->iCol+$this->iColSpan-1 < $this->iTable->iSize[1]-1 ) {
-            switch( $this->iGridStyle[3] ) {
-                case TGRID_SINGLE: $wf=1; break;
-                case TGRID_DOUBLE: $wf=3; break;
-                case TGRID_DOUBLE2: $wf=4; break;
-            }
-            $this->iMarginRight += $this->iGridWeight[3]*$wf;
-        }
-    }
-
-    function StrokeVGrid($aImg,$aX,$aY,$aWidth,$aHeight,$aDir=1) {
-        // Left or right grid line
-        // For the right we increase the X-pos and for the right we decrease it. This is
-        // determined by the direction argument.
-        $idx = $aDir==1 ? 0 : 3;
-
-        // We don't stroke the grid lines that are on the edge of the table since this is
-        // the place of the border.
-        if( ( ($this->iCol > 0 && $idx==0) || ($this->iCol+$this->iColSpan-1 < $this->iTable->iSize[1]-1 && $idx==3) )
-        && $this->iGridWeight[$idx] > 0 ) {
-            $x = $aDir==1 ? $aX : $aX + $aWidth-1;
-            $y = $aY+$aHeight-1;
-            $aImg->SetColor($this->iGridColor[$idx]);
-            switch( $this->iGridStyle[$idx] ) {
-                case TGRID_SINGLE:
-                    for( $i=0; $i < $this->iGridWeight[$idx]; ++$i )
-                    $aImg->Line($x+$i*$aDir,$aY, $x+$i*$aDir,$y);
-                    break;
-
-                case TGRID_DOUBLE:
-                    for( $i=0; $i < $this->iGridWeight[$idx]; ++$i )
-                    $aImg->Line($x+$i*$aDir,$aY, $x+$i*$aDir,$y);
-                    $x += $this->iGridWeight[$idx]*2;
-                    for( $i=0; $i < $this->iGridWeight[$idx]; ++$i )
-                    $aImg->Line($x+$i*$aDir,$aY, $x+$i*$aDir,$y);
-                    break;
-
-                case TGRID_DOUBLE2:
-                    for( $i=0; $i < $this->iGridWeight[$idx]*2; ++$i )
-                    $aImg->Line($x+$i*$aDir,$aY,$x+$i*$aDir,$y);
-                    $x += $this->iGridWeight[$idx]*3;
-                    for( $i=0; $i < $this->iGridWeight[$idx]; ++$i )
-                    $aImg->Line($x+$i*$aDir,$aY, $x+$i*$aDir,$y);
-                    break;
-            }
-        }
-    }
-
-    function StrokeHGrid($aImg,$aX,$aY,$aWidth,$aHeight,$aDir=1) {
-        // Top or bottom grid line
-        // For the left we increase the X-pos and for the right we decrease it. This is
-        // determined by the direction argument.
-        $idx = $aDir==1 ? 1 : 2;
-
-        // We don't stroke the grid lines that are on the edge of the table since this is
-        // the place of the border.
-        if( ( ($this->iRow > 0 && $idx==1) || ($this->iRow+$this->iRowSpan-1 < $this->iTable->iSize[0]-1 && $idx==2) )
-        && $this->iGridWeight[$idx] > 0) {
-            $y = $aDir==1 ? $aY : $aY+$aHeight-1;
-            $x = $aX+$aWidth-1;
-            $aImg->SetColor($this->iGridColor[$idx]);
-            switch( $this->iGridStyle[$idx] ) {
-                case TGRID_SINGLE:
-                    for( $i=0; $i < $this->iGridWeight[$idx]; ++$i )
-                    $aImg->Line($aX,$y+$i, $x,$y+$i);
-                    break;
-
-                case TGRID_DOUBLE:
-                    for( $i=0; $i < $this->iGridWeight[$idx]; ++$i )
-                    $aImg->Line($aX,$y+$i, $x,$y+$i);
-                    $y += $this->iGridWeight[$idx]*2;
-                    for( $i=0; $i < $this->iGridWeight[$idx]; ++$i )
-                    $aImg->Line($aX,$y+$i, $x,$y+$i);
-                    break;
-
-                case TGRID_DOUBLE2:
-                    for( $i=0; $i < $this->iGridWeight[$idx]*2; ++$i )
-                    $aImg->Line($aX,$y+$i, $x,$y+$i);
-                    $y += $this->iGridWeight[$idx]*3;
-                    for( $i=0; $i < $this->iGridWeight[$idx]; ++$i )
-                    $aImg->Line($aX,$y+$i, $x,$y+$i);
-                    break;
-            }
-        }
-    }
-
-    function Stroke($aImg,$aX,$aY,$aWidth,$aHeight) {
-        // If this is a merged cell we only stroke if it is the parent cell.
-        // The parent cell holds the merged cell block
-        if( $this->iMerged && ($this->iRow != $this->iPRow || $this->iCol != $this->iPCol) ) {
-            return;
-        }
-
-        if( $this->iBGColor != '' ) {
-            $aImg->SetColor($this->iBGColor);
-            $aImg->FilledRectangle($aX,$aY,$aX+$aWidth-1,$aY+$aHeight-1);
-        }
-
-        $coords = $aX.','.$aY.','.($aX+$aWidth-1).','.$aY.','.($aX+$aWidth-1).','.($aY+$aHeight-1).','.$aX.','.($aY+$aHeight-1);
-        if( ! empty($this->iCSIMtarget) ) {
-            $this->iCSIMArea = '<area shape="poly" coords="'.$coords.'" href="'.$this->iCSIMtarget.'"';
-            if( ! empty($this->iCSIMwintarget) ) {
-                $this->iCSIMArea .= " target=\"".$this->iCSIMwintarget."\"";
-            }
-            if( ! empty($this->iCSIMalt) ) {
-                $this->iCSIMArea .= ' alt="'.$this->iCSIMalt.'" title="'.$this->iCSIMalt."\" ";
-            }
-            $this->iCSIMArea .= " />\n";
-        }
-
-        $this->StrokeVGrid($aImg,$aX,$aY,$aWidth,$aHeight);
-        $this->StrokeVGrid($aImg,$aX,$aY,$aWidth,$aHeight,-1);
-        $this->StrokeHGrid($aImg,$aX,$aY,$aWidth,$aHeight);
-        $this->StrokeHGrid($aImg,$aX,$aY,$aWidth,$aHeight,-1);
-
-        if( $this->iIcon !== null ) {
-            switch( $this->iHorAlign ) {
-                case 'left':
-                    $x = $aX+$this->iMarginLeft;
-                    $hanchor='left';
-                    break;
-                case 'center':
-                case 'middle':
-                    $x = $aX+$this->iMarginLeft+round(($aWidth-$this->iMarginLeft-$this->iMarginRight)/2);
-                    $hanchor='center';
-                    break;
-                case 'right':
-                    $x = $aX+$aWidth-$this->iMarginRight-1;
-                    $hanchor='right';
-                    break;
-                default:
-                    JpGraphError::RaiseL(27012,$this->iHorAlign);
-            }
-
-            switch( $this->iVertAlign ) {
-                case 'top':
-                    $y = $aY+$this->iMarginTop;
-                    $vanchor='top';
-                    break;
-                case 'center':
-                case 'middle':
-                    $y = $aY+$this->iMarginTop+round(($aHeight-$this->iMarginTop-$this->iMarginBottom)/2);
-                    $vanchor='center';
-                    break;
-                case 'bottom':
-                    $y = $aY+$aHeight-1-$this->iMarginBottom;
-                    $vanchor='bottom';
-                    break;
-                default:
-                    JpGraphError::RaiseL(27012,$this->iVertAlign);
-            }
-            $this->iIcon->SetAnchor($hanchor,$vanchor);
-            $this->iIcon->_Stroke($aImg,$x,$y);
-        }
-        $this->iVal->SetColor($this->iFontColor);
-        $this->iVal->SetFont($this->iFF,$this->iFS,$this->iFSize);
-        switch( $this->iHorAlign ) {
-            case 'left':
-                $x = $aX+$this->iMarginLeft;
-                break;
-            case 'center':
-            case 'middle':
-                $x = $aX+$this->iMarginLeft+round(($aWidth-$this->iMarginLeft-$this->iMarginRight)/2);
-                break;
-            case 'right':
-                $x = $aX+$aWidth-$this->iMarginRight-1;
-                break;
-            default:
-                JpGraphError::RaiseL(27012,$this->iHorAlign);
-        }
-        // A workaround for the shortcomings in the TTF font handling in GD
-        // The anchor position for rotated text (=90) is to "short" so we add
-        // an offset based on the actual font size
-        if( $this->iVal->dir != 0 && $this->iVal->font_family >= 10 ) {
-            $aY += 4 + round($this->iVal->font_size*0.8);
-        }
-        switch( $this->iVertAlign ) {
-            case 'top':
-                $y = $aY+$this->iMarginTop;
-                break;
-            case 'center':
-            case 'middle':
-                $y = $aY+$this->iMarginTop+round(($aHeight-$this->iMarginTop-$this->iMarginBottom)/2);
-                //$y -= round($this->iVal->GetFontHeight($aImg)/2);
-                $y -= round($this->iVal->GetHeight($aImg)/2);
-                break;
-            case 'bottom':
-                //$y = $aY+$aHeight-1-$this->iMarginBottom-$this->iVal->GetFontHeight($aImg);
-                $y = $aY+$aHeight-$this->iMarginBottom-$this->iVal->GetHeight($aImg);
-                break;
-            default:
-                JpGraphError::RaiseL(27012,$this->iVertAlign);
-        }
-        $this->iVal->SetAlign($this->iHorAlign,'top');
-        if( $this->iNumberFormat !== null && is_numeric($this->iVal->t) ) {
-            $this->iVal->t = sprintf($this->iNumberFormat,$this->iVal->t);
-        }
-        $this->iVal->Stroke($aImg,$x,$y);
-    }
-}
-
-//---------------------------------------------------------------------
-// CLASS GTextTable
-// Description:
-// Graphic text table
-//---------------------------------------------------------------------
-class GTextTable {
-    public $iCells = array(), $iSize=array(0,0); // Need to be public since they are used by the cell
-    private $iWidth=0, $iHeight=0;
-    private $iColWidth=NULL,$iRowHeight=NULL;
-    private $iImg=NULL;
-    private $iXPos=0, $iYPos=0;
-    private $iScaleXPos=null,$iScaleYPos=null;
-    private $iBGColor='';
-    private $iBorderColor='black',$iBorderWeight=1;
-    private $iInit=false;
-    private $iYAnchor='top',$iXAnchor='left';
-    /*-----------------------------------------------------------------
-     * First and second phase constructors
-     *-----------------------------------------------------------------
-     */
-    function __construct() {
-        // Empty
-    }
-
-    function Init($aRows=0,$aCols=0,$aFillText='') {
-        $this->iSize[0] = $aRows;
-        $this->iSize[1] = $aCols;
-        for($i=0; $i < $this->iSize[0]; ++$i) {
-            for($j=0; $j < $this->iSize[1]; ++$j) {
-                $this->iCells[$i][$j] = new GTextTableCell($aFillText,$i,$j);
-                $this->iCells[$i][$j]->Init($this);
-            }
-        }
-        $this->iInit=true;
-    }
-
-    /*-----------------------------------------------------------------
-     * Outer border of table
-     *-----------------------------------------------------------------
-     */
-    function SetBorder($aWeight=1,$aColor='black') {
-        $this->iBorderColor=$aColor;
-        $this->iBorderWeight = $aWeight;
-    }
-
-
-    /*-----------------------------------------------------------------
-     * Position in graph of table
-     *-----------------------------------------------------------------
-     */
-    function SetPos($aX,$aY) {
-        $this->iXPos = $aX;
-        $this->iYPos = $aY;
-    }
-
-    function SetScalePos($aX,$aY) {
-        $this->iScaleXPos = $aX;
-        $this->iScaleYPos = $aY;
-    }
-
-    function SetAnchorPos($aXAnchor,$aYAnchor='top') {
-        $this->iXAnchor = $aXAnchor;
-        $this->iYAnchor = $aYAnchor;
-    }
-
-    /*-----------------------------------------------------------------
-     * Setup country flag in a cell
-     *-----------------------------------------------------------------
-     */
-    function SetCellCountryFlag($aRow,$aCol,$aFlag,$aScale=1.0,$aMix=100,$aStdSize=3) {
-        $this->_chkR($aRow);
-        $this->_chkC($aCol);
-        $this->iCells[$aRow][$aCol]->SetCountryFlag($aFlag,$aScale,$aMix,$aStdSize);
-
-    }
-
-    /*-----------------------------------------------------------------
-     * Setup image in a cell
-     *-----------------------------------------------------------------
-     */
-    function SetCellImage($aRow,$aCol,$aFile,$aScale=1.0,$aMix=100) {
-        $this->_chkR($aRow);
-        $this->_chkC($aCol);
-        $this->iCells[$aRow][$aCol]->SetImage($aFile,$aScale,$aMix);
-    }
-
-    function SetRowImage($aRow,$aFile,$aScale=1.0,$aMix=100) {
-        $this->_chkR($aRow);
-        for($j=0; $j < $this->iSize[1]; ++$j) {
-            $this->iCells[$aRow][$j]->SetImage($aFile,$aScale,$aMix);
-        }
-    }
-
-    function SetColImage($aCol,$aFile,$aScale=1.0,$aMix=100) {
-        $this->_chkC($aCol);
-        for($j=0; $j < $this->iSize[0]; ++$j) {
-            $this->iCells[$j][$aCol]->SetImage($aFile,$aScale,$aMix);
-        }
-    }
-
-    function SetImage($aFileR1,$aScaleC1=null,$aMixR2=null,$aC2=null,$aFile=null,$aScale=1.0,$aMix=100) {
-        if( $aScaleC1 !== null && $aMixR2!==null && $aC2!==null && $aFile!==null ) {
-            $this->_chkR($aArgR1);  $this->_chkC($aC1);
-            $this->_chkR($aR2);  $this->_chkC($aC2);
-        }
-        else {
-            if( $aScaleC1 !== null ) $aScale = $aScaleC1;
-            if( $aMixR2 !== null ) $aMix = $aMixR2;
-            $aFile = $aFileR1;
-            $aMixR2 = $this->iSize[0]-1; $aFileR1 = 0;
-            $aC2 = $this->iSize[1]-1; $aScaleC1 = 0;
-        }
-        for($i=$aArgR1; $i <= $aR2; ++$i) {
-            for($j=$aC1; $j <= $aC2; ++$j) {
-                $this->iCells[$i][$j]->SetImage($aFile,$aScale,$aMix);
-            }
-        }
-    }
-
-    function SetCellImageConstrain($aRow,$aCol,$aType,$aVal) {
-        $this->_chkR($aRow);
-        $this->_chkC($aCol);
-        $this->iCells[$aRow][$aCol]->SetImageConstrain($aType,$aVal);
-    }
-
-    /*-----------------------------------------------------------------
-     * Generate a HTML version of the table
-     *-----------------------------------------------------------------
-     */
-    function toString() {
-        $t = '<table border=1 cellspacing=0 cellpadding=0>';
-        for($i=0; $i < $this->iSize[0]; ++$i) {
-            $t .= '<tr>';
-            for($j=0; $j < $this->iSize[1]; ++$j) {
-                $t .= '<td>';
-                if( $this->iCells[$i][$j]->iMerged )
-                $t .= 'M ';
-                $t .= 'val='.$this->iCells[$i][$j]->iVal->t;
-                $t .= ' (cs='.$this->iCells[$i][$j]->iColSpan.
-        ', rs='.$this->iCells[$i][$j]->iRowSpan.')';
-                $t .= '</td>';
-            }
-            $t .= '</tr>';
-        }
-        $t .= '</table>';
-        return $t;
-    }
-
-    /*-----------------------------------------------------------------
-     * Specify data for table
-     *-----------------------------------------------------------------
-     */
-    function Set($aArg1,$aArg2=NULL,$aArg3=NULL) {
-        if( $aArg2===NULL && $aArg3===NULL ) {
-            if( is_array($aArg1) ) {
-                if( is_array($aArg1[0]) ) {
-                    $m = count($aArg1);
-                    // Find the longest row
-                    $n=0;
-                    for($i=0; $i < $m; ++$i)
-                    $n = max(count($aArg1[$i]),$n);
-                    for($i=0; $i < $m; ++$i) {
-                        for($j=0; $j < $n; ++$j) {
-                            if( isset($aArg1[$i][$j]) ){
-                                $this->_setcell($i,$j,(string)$aArg1[$i][$j]);
-                            }
-                            else {
-                                $this->_setcell($i,$j);
-                            }
-                        }
-                    }
-                    $this->iSize[0] = $m;
-                    $this->iSize[1] = $n;
-                    $this->iInit=true;
-                }
-                else {
-                    JpGraphError::RaiseL(27001);
-                    //('Illegal argument to GTextTable::Set(). Array must be 2 dimensional');
-                }
-            }
-            else {
-                JpGraphError::RaiseL(27002);
-                //('Illegal argument to GTextTable::Set()');
-            }
-        }
-        else {
-            // Must be in the form (row,col,val)
-            $this->_chkR($aArg1);
-            $this->_chkC($aArg2);
-            $this->_setcell($aArg1,$aArg2,(string)$aArg3);
-        }
-    }
-
-    /*---------------------------------------------------------------------
-     * Cell margin setting
-     *---------------------------------------------------------------------
-     */
-    function SetPadding($aArgR1,$aC1=null,$aR2=null,$aC2=null,$aPad=null) {
-        if( $aC1 !== null && $aR2!==null && $aC2!==null && $aPad!==null ) {
-            $this->_chkR($aArgR1);  $this->_chkC($aC1);
-            $this->_chkR($aR2);  $this->_chkC($aC2);
-        }
-        else {
-            $aPad = $aArgR1;
-            $aR2 = $this->iSize[0]-1; $aArgR1 = 0;
-            $aC2 = $this->iSize[1]-1; $aC1 = 0;
-        }
-        for($i=$aArgR1; $i <= $aR2; ++$i) {
-            for($j=$aC1; $j <= $aC2; ++$j) {
-                $this->iCells[$i][$j]->SetMargin($aPad,$aPad,$aPad,$aPad);
-            }
-        }
-    }
-
-    function SetRowPadding($aRow,$aPad) {
-        $this->_chkR($aRow);
-        for($j=0; $j < $this->iSize[1]; ++$j) {
-            $this->iCells[$aRow][$j]->SetMargin($aPad,$aPad,$aPad,$aPad);
-        }
-    }
-
-    function SetColPadding($aCol,$aPad) {
-        $this->_chkC($aCol);
-        for($j=0; $j < $this->iSize[0]; ++$j) {
-            $this->iCells[$j][$aCol]->SetMargin($aPad,$aPad,$aPad,$aPad);
-        }
-    }
-
-    function SetCellPadding($aRow,$aCol,$aPad) {
-        $this->_chkR($aRow);
-        $this->_chkC($aCol);
-        $this->iCells[$aRow][$aCol]->SetMargin($aPad,$aPad,$aPad,$aPad);
-    }
-
-
-    /*---------------------------------------------------------------------
-     * Cell text orientation setting
-     *---------------------------------------------------------------------
-     */
-    function SetTextOrientation($aArgR1,$aC1=null,$aR2=null,$aC2=null,$aO=null) {
-        if( $aC1 !== null && $aR2!==null && $aC2!==null && $aPad!==null ) {
-            $this->_chkR($aArgR1);  $this->_chkC($aC1);
-            $this->_chkR($aR2);  $this->_chkC($aC2);
-        }
-        else {
-            $aO = $aArgR1;
-            $aR2 = $this->iSize[0]-1; $aArgR1 = 0;
-            $aC2 = $this->iSize[1]-1; $aC1 = 0;
-        }
-        for($i=$aArgR1; $i <= $aR2; ++$i) {
-            for($j=$aC1; $j <= $aC2; ++$j) {
-                $this->iCells[$i][$j]->iVal->SetOrientation($aO);
-            }
-        }
-    }
-
-    function SetRowTextOrientation($aRow,$aO) {
-        $this->_chkR($aRow);
-        for($j=0; $j < $this->iSize[1]; ++$j) {
-            $this->iCells[$aRow][$j]->iVal->SetOrientation($aO);
-        }
-    }
-
-    function SetColTextOrientation($aCol,$aO) {
-        $this->_chkC($aCol);
-        for($j=0; $j < $this->iSize[0]; ++$j) {
-            $this->iCells[$j][$aCol]->iVal->SetOrientation($aO);
-        }
-    }
-
-    function SetCellTextOrientation($aRow,$aCol,$aO) {
-        $this->_chkR($aRow);
-        $this->_chkC($aCol);
-        $this->iCells[$aRow][$aCol]->iVal->SetOrientation($aO);
-    }
-
-
-
-
-    /*---------------------------------------------------------------------
-     * Font color setting
-     *---------------------------------------------------------------------
-     */
-
-    function SetColor($aArgR1,$aC1=null,$aR2=null,$aC2=null,$aArg=null) {
-        if( $aC1 !== null && $aR2!==null && $aC2!==null && $aArg!==null ) {
-            $this->_chkR($aArgR1);  $this->_chkC($aC1);
-            $this->_chkR($aR2);  $this->_chkC($aC2);
-        }
-        else {
-            $aArg = $aArgR1;
-            $aR2 = $this->iSize[0]-1; $aArgR1 = 0;
-            $aC2 = $this->iSize[1]-1; $aC1 = 0;
-        }
-        for($i=$aArgR1; $i <= $aR2; ++$i) {
-            for($j=$aC1; $j <= $aC2; ++$j) {
-                $this->iCells[$i][$j]->SetFontColor($aArg);
-            }
-        }
-    }
-
-    function SetRowColor($aRow,$aColor) {
-        $this->_chkR($aRow);
-        for($j=0; $j < $this->iSize[1]; ++$j) {
-            $this->iCells[$aRow][$j]->SetFontColor($aColor);
-        }
-    }
-
-    function SetColColor($aCol,$aColor) {
-        $this->_chkC($aCol);
-        for($i=0; $i < $this->iSize[0]; ++$i) {
-            $this->iCells[$i][$aCol]->SetFontColor($aColor);
-        }
-    }
-
-    function SetCellColor($aRow,$aCol,$aColor) {
-        $this->_chkR($aRow);
-        $this->_chkC($aCol);
-        $this->iCells[$aRow][$aCol]->SetFontColor($aColor);
-    }
-
-    /*---------------------------------------------------------------------
-     * Fill color settings
-     *---------------------------------------------------------------------
-     */
-
-    function SetFillColor($aArgR1,$aC1=null,$aR2=null,$aC2=null,$aArg=null) {
-        if( $aC1 !== null && $aR2!==null && $aC2!==null && $aArg!==null ) {
-            $this->_chkR($aArgR1);  $this->_chkC($aC1);
-            $this->_chkR($aR2);  $this->_chkC($aC2);
-            for($i=$aArgR1; $i <= $aR2; ++$i) {
-                for($j=$aC1; $j <= $aC2; ++$j) {
-                    $this->iCells[$i][$j]->SetFillColor($aArg);
-                }
-            }
-        }
-        else {
-            $this->iBGColor = $aArgR1;
-        }
-    }
-
-    function SetRowFillColor($aRow,$aColor) {
-        $this->_chkR($aRow);
-        for($j=0; $j < $this->iSize[1]; ++$j) {
-            $this->iCells[$aRow][$j]->SetFillColor($aColor);
-        }
-    }
-
-    function SetColFillColor($aCol,$aColor) {
-        $this->_chkC($aCol);
-        for($i=0; $i < $this->iSize[0]; ++$i) {
-            $this->iCells[$i][$aCol]->SetFillColor($aColor);
-        }
-    }
-
-    function SetCellFillColor($aRow,$aCol,$aColor) {
-        $this->_chkR($aRow);
-        $this->_chkC($aCol);
-        $this->iCells[$aRow][$aCol]->SetFillColor($aColor);
-    }
-
-    /*---------------------------------------------------------------------
-     * Font family setting
-     *---------------------------------------------------------------------
-     */
-    function SetFont() {
-        $numargs = func_num_args();
-        if( $numargs == 2 || $numargs == 3 ) {
-            $aFF = func_get_arg(0);
-            $aFS = func_get_arg(1);
-            if( $numargs == 3 )
-            $aFSize=func_get_arg(2);
-            else
-            $aFSize=10;
-            $aR2 = $this->iSize[0]-1; $aR1 = 0;
-            $aC2 = $this->iSize[1]-1; $aC1 = 0;
-
-        }
-        elseif($numargs == 6 || $numargs == 7 ) {
-            $aR1 = func_get_arg(0); $aC1 = func_get_arg(1);
-            $aR2 = func_get_arg(2); $aC2 = func_get_arg(3);
-            $aFF = func_get_arg(4); $aFS = func_get_arg(5);
-            if( $numargs == 7 )
-            $aFSize=func_get_arg(6);
-            else
-            $aFSize=10;
-        }
-        else {
-            JpGraphError::RaiseL(27003);
-            //('Wrong number of arguments to GTextTable::SetColor()');
-        }
-        $this->_chkR($aR1);  $this->_chkC($aC1);
-        $this->_chkR($aR2);  $this->_chkC($aC2);
-        for($i=$aR1; $i <= $aR2; ++$i) {
-            for($j=$aC1; $j <= $aC2; ++$j) {
-                $this->iCells[$i][$j]->SetFont($aFF,$aFS,$aFSize);
-            }
-        }
-    }
-
-    function SetRowFont($aRow,$aFF,$aFS,$aFSize=10) {
-        $this->_chkR($aRow);
-        for($j=0; $j < $this->iSize[1]; ++$j) {
-            $this->iCells[$aRow][$j]->SetFont($aFF,$aFS,$aFSize);
-        }
-    }
-
-    function SetColFont($aCol,$aFF,$aFS,$aFSize=10) {
-        $this->_chkC($aCol);
-        for($i=0; $i < $this->iSize[0]; ++$i) {
-            $this->iCells[$i][$aCol]->SetFont($aFF,$aFS,$aFSize);
-        }
-    }
-
-    function SetCellFont($aRow,$aCol,$aFF,$aFS,$aFSize=10) {
-        $this->_chkR($aRow);
-        $this->_chkC($aCol);
-        $this->iCells[$aRow][$aCol]->SetFont($aFF,$aFS,$aFSize);
-    }
-
-    /*---------------------------------------------------------------------
-     * Cell align settings
-     *---------------------------------------------------------------------
-     */
-
-    function SetAlign($aR1HAlign=null,$aC1VAlign=null,$aR2=null,$aC2=null,$aHArg=null,$aVArg='center') {
-        if( $aC1VAlign !== null && $aR2!==null && $aC2!==null && $aHArg!==null ) {
-            $this->_chkR($aR1HAlign);  $this->_chkC($aC1VAlign);
-            $this->_chkR($aR2);  $this->_chkC($aC2);
-        }
-        else {
-            if( $aR1HAlign === null ) {
-                JpGraphError::RaiseL(27010);
-            }
-            if( $aC1VAlign === null ) {
-                $aC1VAlign = 'center';
-            }
-            $aHArg = $aR1HAlign;
-            $aVArg = $aC1VAlign === null ? 'center' : $aC1VAlign ;
-            $aR2 = $this->iSize[0]-1; $aR1HAlign = 0;
-            $aC2 = $this->iSize[1]-1; $aC1VAlign = 0;
-        }
-        for($i=$aR1HAlign; $i <= $aR2; ++$i) {
-            for($j=$aC1VAlign; $j <= $aC2; ++$j) {
-                $this->iCells[$i][$j]->SetAlign($aHArg,$aVArg);
-            }
-        }
-    }
-
-    function SetCellAlign($aRow,$aCol,$aHorAlign,$aVertAlign='bottom') {
-        $this->_chkR($aRow);
-        $this->_chkC($aCol);
-        $this->iCells[$aRow][$aCol]->SetAlign($aHorAlign,$aVertAlign);
-    }
-
-    function SetRowAlign($aRow,$aHorAlign,$aVertAlign='bottom') {
-        $this->_chkR($aRow);
-        for($j=0; $j < $this->iSize[1]; ++$j) {
-            $this->iCells[$aRow][$j]->SetAlign($aHorAlign,$aVertAlign);
-        }
-    }
-
-    function SetColAlign($aCol,$aHorAlign,$aVertAlign='bottom') {
-        $this->_chkC($aCol);
-        for($i=0; $i < $this->iSize[0]; ++$i) {
-            $this->iCells[$i][$aCol]->SetAlign($aHorAlign,$aVertAlign);
-        }
-    }
-
-    /*---------------------------------------------------------------------
-     * Cell number format
-     *---------------------------------------------------------------------
-     */
-
-    function SetNumberFormat($aArgR1,$aC1=null,$aR2=null,$aC2=null,$aArg=null) {
-        if( $aC1 !== null && $aR2!==null && $aC2!==null && $aArg!==null ) {
-            $this->_chkR($aArgR1);  $this->_chkC($aC1);
-            $this->_chkR($aR2);  $this->_chkC($aC2);
-        }
-        else {
-            $aArg = $aArgR1;
-            $aR2 = $this->iSize[0]-1; $aArgR1 = 0;
-            $aC2 = $this->iSize[1]-1; $aC1 = 0;
-        }
-        if( !is_string($aArg) ) {
-            JpGraphError::RaiseL(27013); // argument must be a string
-        }
-        for($i=$aArgR1; $i <= $aR2; ++$i) {
-            for($j=$aC1; $j <= $aC2; ++$j) {
-                $this->iCells[$i][$j]->SetNumberFormat($aArg);
-            }
-        }
-    }
-
-    function SetRowNumberFormat($aRow,$aF) {
-        $this->_chkR($aRow);
-        if( !is_string($aF) ) {
-            JpGraphError::RaiseL(27013); // argument must be a string
-        }
-        for($j=0; $j < $this->iSize[1]; ++$j) {
-            $this->iCells[$aRow][$j]->SetNumberFormat($aF);
-        }
-    }
-
-    function SetColNumberFormat($aCol,$aF) {
-        $this->_chkC($aCol);
-        if( !is_string($aF) ) {
-            JpGraphError::RaiseL(27013); // argument must be a string
-        }
-        for($i=0; $i < $this->iSize[0]; ++$i) {
-            $this->iCells[$i][$aCol]->SetNumberFormat($aF);
-        }
-    }
-
-    function SetCellNumberFormat($aRow,$aCol,$aF) {
-        $this->_chkR($aRow); $this->_chkC($aCol);
-        if( !is_string($aF) ) {
-            JpGraphError::RaiseL(27013); // argument must be a string
-        }
-        $this->iCells[$aRow][$aCol]->SetNumberFormat($aF);
-    }
-
-    /*---------------------------------------------------------------------
-     * Set row and column min size
-     *---------------------------------------------------------------------
-     */
-
-    function SetMinColWidth($aColWidth,$aWidth=null) {
-        // If there is only one argument this means that all
-        // columns get set to the same width
-        if( $aWidth===null ) {
-            for($i=0; $i < $this->iSize[1]; ++$i) {
-                $this->iColWidth[$i]  = $aColWidth;
-            }
-        }
-        else {
-            $this->_chkC($aColWidth);
-            $this->iColWidth[$aColWidth]  = $aWidth;
-        }
-    }
-
-    function SetMinRowHeight($aRowHeight,$aHeight=null) {
-        // If there is only one argument this means that all
-        // rows get set to the same height
-        if( $aHeight===null ) {
-            for($i=0; $i < $this->iSize[0]; ++$i) {
-                $this->iRowHeight[$i]  = $aRowHeight;
-            }
-        }
-        else {
-            $this->_chkR($aRowHeight);
-            $this->iRowHeight[$aRowHeight]  = $aHeight;
-        }
-    }
-
-    /*---------------------------------------------------------------------
-     * Grid line settings
-     *---------------------------------------------------------------------
-     */
-
-    function SetGrid($aWeight=1,$aColor='black',$aStyle=TGRID_SINGLE) {
-        $rc = $this->iSize[0];
-        $cc = $this->iSize[1];
-        for($i=0; $i < $rc; ++$i) {
-            for($j=0; $j < $cc; ++$j) {
-                $this->iCells[$i][$j]->SetGridColor($aColor,$aColor);
-                $this->iCells[$i][$j]->SetGridWeight($aWeight,$aWeight);
-                $this->iCells[$i][$j]->SetGridStyle($aStyle);
-            }
-        }
-    }
-
-    function SetColGrid($aCol,$aWeight=1,$aColor='black',$aStyle=TGRID_SINGLE) {
-        $this->_chkC($aCol);
-        for($i=0; $i < $this->iSize[0]; ++$i) {
-            $this->iCells[$i][$aCol]->SetGridWeight($aWeight);
-            $this->iCells[$i][$aCol]->SetGridColor($aColor);
-            $this->iCells[$i][$aCol]->SetGridStyle($aStyle);
-        }
-    }
-
-    function SetRowGrid($aRow,$aWeight=1,$aColor='black',$aStyle=TGRID_SINGLE) {
-        $this->_chkR($aRow);
-        for($j=0; $j < $this->iSize[1]; ++$j) {
-            $this->iCells[$aRow][$j]->SetGridWeight(NULL,$aWeight);
-            $this->iCells[$aRow][$j]->SetGridColor(NULL,$aColor);
-            $this->iCells[$aRow][$j]->SetGridStyle(NULL,$aStyle);
-        }
-    }
-
-    /*---------------------------------------------------------------------
-     * Merge cells
-     *---------------------------------------------------------------------
-     */
-
-    function MergeRow($aRow,$aHAlign='center',$aVAlign='center') {
-        $this->_chkR($aRow);
-        $this->MergeCells($aRow,0,$aRow,$this->iSize[1]-1,$aHAlign,$aVAlign);
-    }
-
-    function MergeCol($aCol,$aHAlign='center',$aVAlign='center') {
-        $this->_chkC($aCol);
-        $this->MergeCells(0,$aCol,$this->iSize[0]-1,$aCol,$aHAlign,$aVAlign);
-    }
-
-    function MergeCells($aR1,$aC1,$aR2,$aC2,$aHAlign='center',$aVAlign='center') {
-        if( $aR1 > $aR2 || $aC1 > $aC2 ) {
-            JpGraphError::RaiseL(27004);
-            //('GTextTable::MergeCells(). Specified cell range to be merged is not valid.');
-        }
-        $this->_chkR($aR1); $this->_chkC($aC1);
-        $this->_chkR($aR2); $this->_chkC($aC2);
-        $rspan = $aR2-$aR1+1;
-        $cspan = $aC2-$aC1+1;
-        // Setup the parent cell for this merged group
-        if( $this->iCells[$aR1][$aC1]->IsMerged() ) {
-            JpGraphError::RaiseL(27005,$aR1,$aC1,$aR2,$aC2);
-            //("Cannot merge already merged cells in the range ($aR1,$aC1), ($aR2,$aC2)");
-        }
-        $this->iCells[$aR1][$aC1]->SetRowColSpan($rspan,$cspan);
-        $this->iCells[$aR1][$aC1]->SetAlign($aHAlign,$aVAlign);
-        for($i=$aR1; $i <= $aR2; ++$i) {
-            for($j=$aC1; $j <= $aC2; ++$j) {
-                if( ! ($i == $aR1 && $j == $aC1) ) {
-                    if( $this->iCells[$i][$j]->IsMerged() ) {
-                        JpGraphError::RaiseL(27005,$aR1,$aC1,$aR2,$aC2);
-                        //("Cannot merge already merged cells in the range ($aR1,$aC1), ($aR2,$aC2)");
-                    }
-                    $this->iCells[$i][$j]->SetMerged($aR1,$aC1,true);
-                }
-            }
-        }
-    }
-
-
-    /*---------------------------------------------------------------------
-     * CSIM methods
-     *---------------------------------------------------------------------
-     */
-
-    function SetCSIMTarget($aTarget,$aAlt=null,$aAutoTarget=false) {
-        $m = $this->iSize[0];
-        $n = $this->iSize[1];
-        $csim = '';
-        for($i=0; $i < $m; ++$i) {
-            for($j=0; $j < $n; ++$j) {
-                if( $aAutoTarget )
-                $t = $aTarget."?row=$i&col=$j";
-                else
-                $t = $aTarget;
-                $this->iCells[$i][$j]->SetCSIMTarget($t,$aAlt);
-            }
-        }
-    }
-
-    function SetCellCSIMTarget($aRow,$aCol,$aTarget,$aAlt=null) {
-        $this->_chkR($aRow);
-        $this->_chkC($aCol);
-        $this->iCells[$aRow][$aCol]->SetCSIMTarget($aTarget,$aAlt);
-    }
-
-    /*---------------------------------------------------------------------
-     * Private methods
-     *---------------------------------------------------------------------
-     */
-
-    function GetCSIMAreas() {
-        $m = $this->iSize[0];
-        $n = $this->iSize[1];
-        $csim = '';
-        for($i=0; $i < $m; ++$i) {
-            for($j=0; $j < $n; ++$j) {
-                $csim .= $this->iCells[$i][$j]->GetCSIMArea();
-            }
-        }
-        return $csim;
-    }
-
-    function _chkC($aCol) {
-        if( ! $this->iInit ) {
-            JpGraphError::Raise(27014); // Table not initialized
-        }
-        if( $aCol < 0 || $aCol >= $this->iSize[1] )
-        JpGraphError::RaiseL(27006,$aCol);
-        //("GTextTable:\nColumn argument ($aCol) is outside specified table size.");
-    }
-
-    function _chkR($aRow) {
-        if( ! $this->iInit ) {
-            JpGraphError::Raise(27014); // Table not initialized
-        }
-        if( $aRow < 0 || $aRow >= $this->iSize[0] )
-        JpGraphError::RaiseL(27007,$aRow);
-        //("GTextTable:\nRow argument ($aRow) is outside specified table size.");
-    }
-
-    function _getScalePos() {
-        if( $this->iScaleXPos === null || $this->iScaleYPos === null ) {
-            return false;
-        }
-        return array($this->iScaleXPos, $this->iScaleYPos);
-    }
-
-    function _autoSizeTable($aImg) {
-        // Get maximum column width and row height
-        $m = $this->iSize[0];
-        $n = $this->iSize[1];
-        $w=1;$h=1;
-
-        // Get maximum row height per row
-        for($i=0; $i < $m; ++$i) {
-            $h=0;
-            for($j=0; $j < $n; ++$j) {
-                $h = max($h,$this->iCells[$i][$j]->GetHeight($aImg));
-            }
-            if( isset($this->iRowHeight[$i]) ) {
-                $this->iRowHeight[$i]  = max($h,$this->iRowHeight[$i]);
-            }
-            else
-            $this->iRowHeight[$i]  = $h;
-        }
-
-        // Get maximum col width per columns
-        for($j=0; $j < $n; ++$j) {
-            $w=0;
-            for($i=0; $i < $m; ++$i) {
-                $w = max($w,$this->iCells[$i][$j]->GetWidth($aImg));
-            }
-            if( isset($this->iColWidth[$j]) ) {
-                $this->iColWidth[$j]  = max($w,$this->iColWidth[$j]);
-            }
-            else
-            $this->iColWidth[$j]  = $w;
-        }
-    }
-
-    function _setcell($aRow,$aCol,$aVal='') {
-        if( isset($this->iCells[$aRow][$aCol]) ) {
-            $this->iCells[$aRow][$aCol]->Set($aVal);
-        }
-        else {
-            $this->iCells[$aRow][$aCol] = new GTextTableCell((string)$aVal,$aRow,$aCol);
-            $this->iCells[$aRow][$aCol]->Init($this);
-        }
-    }
-
-    function StrokeWithScale($aImg,$aXScale,$aYScale) {
-        if( is_numeric($this->iScaleXPos) && is_numeric($this->iScaleYPos) ) {
-            $x = round($aXScale->Translate($this->iScaleXPos));
-            $y = round($aYScale->Translate($this->iScaleYPos));
-            $this->Stroke($aImg,$x,$y);
-        }
-        else {
-            $this->Stroke($aImg);
-        }
-    }
-
-    function Stroke($aImg,$aX=NULL,$aY=NULL) {
-        if( $aX !== NULL && $aY !== NULL ) {
-            $this->iXPos = $aX;
-            $this->iYPos = $aY;
-        }
-
-        $rc = $this->iSize[0]; // row count
-        $cc = $this->iSize[1]; // column count
-
-        if( $rc == 0 || $cc == 0 ) {
-            JpGraphError::RaiseL(27009);
-        }
-
-        // Adjust margins of each cell based on the weight of the grid. Each table grid line
-        // is actually occupying the left side and top part of each cell.
-        for($j=0; $j < $cc; ++$j) {
-            $this->iCells[0][$j]->iMarginTop += $this->iBorderWeight;
-        }
-        for($i=0; $i < $rc; ++$i) {
-            $this->iCells[$i][0]->iMarginLeft += $this->iBorderWeight;
-        }
-        for($i=0; $i < $rc; ++$i) {
-            for($j=0; $j < $cc; ++$j) {
-                $this->iCells[$i][$j]->AdjustMarginsForGrid();
-            }
-        }
-
-        // adjust row and column size depending on cell content
-        $this->_autoSizeTable($aImg);
-
-        if( $this->iSize[1] != count($this->iColWidth) || $this->iSize[0] != count($this->iRowHeight) ) {
-            JpGraphError::RaiseL(27008);
-            //('Column and row size arrays must match the dimesnions of the table');
-        }
-
-        // Find out overall table size
-        $width=0;
-        for($i=0; $i < $cc; ++$i) {
-            $width += $this->iColWidth[$i];
-        }
-        $height=0;
-        for($i=0; $i < $rc; ++$i) {
-            $height += $this->iRowHeight[$i];
-        }
-
-        // Adjust the X,Y position to alway be at the top left corner
-        // The anchor position, i.e. how the client want to interpret the specified
-        // x and y coordinate must be taken into account
-        switch( strtolower($this->iXAnchor) ) {
-            case 'left' :
-                break;
-            case 'center':
-                $this->iXPos -= round($width/2);
-                break;
-            case 'right':
-                $this->iXPos -= $width;
-                break;
-        }
-        switch( strtolower($this->iYAnchor) ) {
-            case 'top' :
-                break;
-            case 'center':
-            case 'middle':
-                $this->iYPos -= round($height/2);
-                break;
-            case 'bottom':
-                $this->iYPos -= $height;
-                break;
-        }
-
-        // Set the overall background color of the table if set
-        if( $this->iBGColor !== '' ) {
-            $aImg->SetColor($this->iBGColor);
-            $aImg->FilledRectangle($this->iXPos,$this->iYPos,$this->iXPos+$width,$this->iYPos+$height);
-        }
-
-        // Stroke all cells
-        $rpos=$this->iYPos;
-        for($i=0; $i < $rc; ++$i) {
-            $cpos=$this->iXPos;
-            for($j=0; $j < $cc; ++$j) {
-                // Calculate width and height of this cell if it is spanning
-                // more than one column or row
-                $cwidth=0;
-                for( $k=0; $k < $this->iCells[$i][$j]->iColSpan; ++$k ) {
-                    $cwidth += $this->iColWidth[$j+$k];
-                }
-                $cheight=0;
-                for( $k=0; $k < $this->iCells[$i][$j]->iRowSpan; ++$k ) {
-                    $cheight += $this->iRowHeight[$i+$k];
-                }
-
-                $this->iCells[$i][$j]->Stroke($aImg,$cpos,$rpos,$cwidth,$cheight);
-                $cpos += $this->iColWidth[$j];
-            }
-            $rpos += $this->iRowHeight[$i];
-        }
-
-        // Stroke outer border
-        $aImg->SetColor($this->iBorderColor);
-        if( $this->iBorderWeight == 1 )
-        $aImg->Rectangle($this->iXPos,$this->iYPos,$this->iXPos+$width,$this->iYPos+$height);
-        else {
-            for( $i=0; $i < $this->iBorderWeight; ++$i )
-            $aImg->Rectangle($this->iXPos+$i,$this->iYPos+$i,
-            $this->iXPos+$width-1+$this->iBorderWeight-$i,
-            $this->iYPos+$height-1+$this->iBorderWeight-$i);
-        }
-    }
-}
-
-/*
- EOF
- */
-?>
diff --git a/#jpgraph/src/jpgraph_text.inc.php b/#jpgraph/src/jpgraph_text.inc.php
deleted file mode 100644
index 7d0f6687..00000000
--- a/#jpgraph/src/jpgraph_text.inc.php
+++ /dev/null
@@ -1,327 +0,0 @@
-<?php
-//=======================================================================
-// File:        JPGRAPH_TEXT.INC.PHP
-// Description: Class to handle text as object in the graph.
-//              The low level text layout engine is handled by the GD class
-// Created:     2001-01-08 (Refactored to separate file 2008-08-01)
-// Ver:         $Id: jpgraph_text.inc.php 1844 2009-09-26 17:05:31Z ljp $
-//
-// Copyright (c) Asial Corporation. All rights reserved.
-//========================================================================
-
-
-//===================================================
-// CLASS Text
-// Description: Arbitrary text object that can be added to the graph
-//===================================================
-class Text {
-    public $t;
-    public $x=0,$y=0,$halign="left",$valign="top",$color=array(0,0,0);
-    public $hide=false, $dir=0;
-    public $iScalePosY=null,$iScalePosX=null;
-    public $iWordwrap=0;
-    public $font_family=FF_DEFAULT,$font_style=FS_NORMAL; // old. FF_FONT1
-    protected $boxed=false; // Should the text be boxed
-    protected $paragraph_align="left";
-    protected $icornerradius=0,$ishadowwidth=3;
-    protected $fcolor='white',$bcolor='black',$shadow=false;
-    protected $iCSIMarea='',$iCSIMalt='',$iCSIMtarget='',$iCSIMWinTarget='';
-    private $iBoxType = 1; // Which variant of filled box around text we want
-
-    // for __get, __set
-    private $_margin;
-    private $_font_size=8; // old. 12
-
-    //---------------
-    // CONSTRUCTOR
-
-    // Create new text at absolute pixel coordinates
-    function __construct($aTxt="",$aXAbsPos=0,$aYAbsPos=0) {
-        if( ! is_string($aTxt) ) {
-            JpGraphError::RaiseL(25050);//('First argument to Text::Text() must be s atring.');
-        }
-        $this->t = $aTxt;
-        $this->x = round($aXAbsPos);
-        $this->y = round($aYAbsPos);
-        $this->margin = 0;
-    }
-    //---------------
-    // PUBLIC METHODS
-    // Set the string in the text object
-    function Set($aTxt) {
-        $this->t = $aTxt;
-    }
-
-    // Alias for Pos()
-    function SetPos($aXAbsPos=0,$aYAbsPos=0,$aHAlign="left",$aVAlign="top") {
-    //$this->Pos($aXAbsPos,$aYAbsPos,$aHAlign,$aVAlign);
-        $this->x = $aXAbsPos;
-        $this->y = $aYAbsPos;
-        $this->halign = $aHAlign;
-        $this->valign = $aVAlign;
-    }
-
-    function SetScalePos($aX,$aY) {
-        $this->iScalePosX = $aX;
-        $this->iScalePosY = $aY;
-    }
-
-    // Specify alignment for the text
-    function Align($aHAlign,$aVAlign="top",$aParagraphAlign="") {
-        $this->halign = $aHAlign;
-        $this->valign = $aVAlign;
-        if( $aParagraphAlign != "" )
-            $this->paragraph_align = $aParagraphAlign;
-    }
-
-    // Alias
-    function SetAlign($aHAlign,$aVAlign="top",$aParagraphAlign="") {
-        $this->Align($aHAlign,$aVAlign,$aParagraphAlign);
-    }
-
-    // Specifies the alignment for a multi line text
-    function ParagraphAlign($aAlign) {
-        $this->paragraph_align = $aAlign;
-    }
-
-    // Specifies the alignment for a multi line text
-    function SetParagraphAlign($aAlign) {
-        $this->paragraph_align = $aAlign;
-    }
-
-    function SetShadow($aShadowColor='gray',$aShadowWidth=3) {
-        $this->ishadowwidth=$aShadowWidth;
-        $this->shadow=$aShadowColor;
-        $this->boxed=true;
-    }
-
-    function SetWordWrap($aCol) {
-        $this->iWordwrap = $aCol ;
-    }
-
-    // Specify that the text should be boxed. fcolor=frame color, bcolor=border color,
-    // $shadow=drop shadow should be added around the text.
-    function SetBox($aFrameColor=array(255,255,255),$aBorderColor=array(0,0,0),$aShadowColor=false,$aCornerRadius=4,$aShadowWidth=3) {
-        if( $aFrameColor === false ) {
-            $this->boxed=false;
-        }
-        else {
-            $this->boxed=true;
-        }
-        $this->fcolor=$aFrameColor;
-        $this->bcolor=$aBorderColor;
-        // For backwards compatibility when shadow was just true or false
-        if( $aShadowColor === true ) {
-            $aShadowColor = 'gray';
-        }
-        $this->shadow=$aShadowColor;
-        $this->icornerradius=$aCornerRadius;
-        $this->ishadowwidth=$aShadowWidth;
-    }
-
-    function SetBox2($aFrameColor=array(255,255,255),$aBorderColor=array(0,0,0),$aShadowColor=false,$aCornerRadius=4,$aShadowWidth=3) {
-        $this->iBoxType=2;
-        $this->SetBox($aFrameColor,$aBorderColor,$aShadowColor,$aCornerRadius,$aShadowWidth);
-    }
-
-    // Hide the text
-    function Hide($aHide=true) {
-        $this->hide=$aHide;
-    }
-
-    // This looks ugly since it's not a very orthogonal design
-    // but I added this "inverse" of Hide() to harmonize
-    // with some classes which I designed more recently (especially)
-    // jpgraph_gantt
-    function Show($aShow=true) {
-        $this->hide=!$aShow;
-    }
-
-    // Specify font
-    function SetFont($aFamily,$aStyle=FS_NORMAL,$aSize=10) {
-        $this->font_family=$aFamily;
-        $this->font_style=$aStyle;
-        $this->font_size=$aSize;
-    }
-
-    // Center the text between $left and $right coordinates
-    function Center($aLeft,$aRight,$aYAbsPos=false) {
-        $this->x = $aLeft + ($aRight-$aLeft )/2;
-        $this->halign = "center";
-        if( is_numeric($aYAbsPos) )
-            $this->y = $aYAbsPos;
-    }
-
-    // Set text color
-    function SetColor($aColor) {
-        $this->color = $aColor;
-    }
-
-    function SetAngle($aAngle) {
-        $this->SetOrientation($aAngle);
-    }
-
-    // Orientation of text. Note only TTF fonts can have an arbitrary angle
-    function SetOrientation($aDirection=0) {
-        if( is_numeric($aDirection) )
-            $this->dir=$aDirection;
-        elseif( $aDirection=="h" )
-            $this->dir = 0;
-        elseif( $aDirection=="v" )
-            $this->dir = 90;
-        else
-            JpGraphError::RaiseL(25051);//(" Invalid direction specified for text.");
-    }
-
-    // Total width of text
-    function GetWidth($aImg) {
-        $aImg->SetFont($this->font_family,$this->font_style,$this->raw_font_size);
-        $w = $aImg->GetTextWidth($this->t,$this->dir);
-        return $w;
-    }
-
-    // Hight of font
-    function GetFontHeight($aImg) {
-        $aImg->SetFont($this->font_family,$this->font_style,$this->raw_font_size);
-        $h = $aImg->GetFontHeight();
-        return $h;
-
-    }
-
-    function GetTextHeight($aImg) {
-        $aImg->SetFont($this->font_family,$this->font_style,$this->raw_font_size);
-        $h = $aImg->GetTextHeight($this->t,$this->dir);
-        return $h;
-    }
-
-    function GetHeight($aImg) {
-    // Synonym for GetTextHeight()
-        $aImg->SetFont($this->font_family,$this->font_style,$this->raw_font_size);
-        $h = $aImg->GetTextHeight($this->t,$this->dir);
-        return $h;
-    }
-
-    // Set the margin which will be interpretated differently depending
-    // on the context.
-    function SetMargin($aMarg) {
-        $this->margin = $aMarg;
-    }
-
-    function StrokeWithScale($aImg,$axscale,$ayscale) {
-        if( $this->iScalePosX === null || $this->iScalePosY === null ) {
-            $this->Stroke($aImg);
-        }
-        else {
-            $this->Stroke($aImg,
-                round($axscale->Translate($this->iScalePosX)),
-                round($ayscale->Translate($this->iScalePosY)));
-        }
-    }
-
-    function SetCSIMTarget($aURITarget,$aAlt='',$aWinTarget='') {
-        $this->iCSIMtarget = $aURITarget;
-        $this->iCSIMalt = $aAlt;
-        $this->iCSIMWinTarget = $aWinTarget;
-    }
-
-    function GetCSIMareas() {
-        if( $this->iCSIMtarget !== '' ) {
-            return $this->iCSIMarea;
-        }
-        else {
-            return '';
-        }
-    }
-
-    // Display text in image
-    function Stroke($aImg,$x=null,$y=null) {
-
-        if( $x !== null ) $this->x = round($x);
-        if( $y !== null ) $this->y = round($y);
-
-        // Insert newlines
-        if( $this->iWordwrap > 0 ) {
-            $this->t = wordwrap($this->t,$this->iWordwrap,"\n");
-        }
-
-        // If position been given as a fraction of the image size
-        // calculate the absolute position
-        if( $this->x < 1 && $this->x > 0 ) $this->x *= $aImg->width;
-        if( $this->y < 1 && $this->y > 0 ) $this->y *= $aImg->height;
-
-        $aImg->PushColor($this->color);
-        $aImg->SetFont($this->font_family,$this->font_style,$this->raw_font_size);
-        $aImg->SetTextAlign($this->halign,$this->valign);
-
-        if( $this->boxed ) {
-            if( $this->fcolor=="nofill" ) {
-                $this->fcolor=false;
-            }
-
-            $oldweight=$aImg->SetLineWeight(1);
-
-            if( $this->iBoxType == 2 && $this->font_family > FF_FONT2+2 ) {
-
-                $bbox = $aImg->StrokeBoxedText2($this->x, $this->y,
-                                                $this->t, $this->dir,
-                                                $this->fcolor,
-                                                $this->bcolor,
-                                                $this->shadow,
-                                                $this->paragraph_align,
-                                                2,4,
-                                                $this->icornerradius,
-                                                $this->ishadowwidth);
-            }
-            else {
-                $bbox = $aImg->StrokeBoxedText($this->x,$this->y,$this->t,
-                    $this->dir,$this->fcolor,$this->bcolor,$this->shadow,
-                    $this->paragraph_align,3,3,$this->icornerradius,
-                    $this->ishadowwidth);
-            }
-
-            $aImg->SetLineWeight($oldweight);
-        }
-        else {
-            $debug=false;
-            $bbox = $aImg->StrokeText($this->x,$this->y,$this->t,$this->dir,$this->paragraph_align,$debug);
-        }
-
-        // Create CSIM targets
-        $coords = $bbox[0].','.$bbox[1].','.$bbox[2].','.$bbox[3].','.$bbox[4].','.$bbox[5].','.$bbox[6].','.$bbox[7];
-        $this->iCSIMarea = "<area shape=\"poly\" coords=\"$coords\" href=\"".htmlentities($this->iCSIMtarget)."\" ";
-        if( trim($this->iCSIMalt) != '' ) {
-            $this->iCSIMarea .= " alt=\"".$this->iCSIMalt."\" ";
-            $this->iCSIMarea .= " title=\"".$this->iCSIMalt."\" ";
-        }
-        if( trim($this->iCSIMWinTarget) != '' ) {
-            $this->iCSIMarea .= " target=\"".$this->iCSIMWinTarget."\" ";
-        }
-        $this->iCSIMarea .= " />\n";
-
-        $aImg->PopColor($this->color);
-    }
-
-    function __get($name) {
-
-        if (strpos($name, 'raw_') !== false) {
-            // if $name == 'raw_left_margin' , return $this->_left_margin;
-            $variable_name = '_' . str_replace('raw_', '', $name);
-            return $this->$variable_name;
-        }
-
-        $variable_name = '_' . $name; 
-
-        if (isset($this->$variable_name)) {
-            return $this->$variable_name * SUPERSAMPLING_SCALE;
-        } else {
-            JpGraphError::RaiseL('25132', $name);
-        } 
-    }
-
-    function __set($name, $value) {
-        $this->{'_'.$name} = $value;
-    }
-} // Class
-
-
-?>
diff --git a/#jpgraph/src/jpgraph_theme.inc.php b/#jpgraph/src/jpgraph_theme.inc.php
deleted file mode 100644
index 0cc54c47..00000000
--- a/#jpgraph/src/jpgraph_theme.inc.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-//=======================================================================
-// File:        JPGRAPH_THEME.INC.PHP
-// Description: Class to define graph theme
-// Created:     2010-09-29 
-// Ver:         $Id: jpgraph_theme.inc.php 83 2010-10-01 11:24:19Z atsushi $
-//
-// Copyright (c) Asial Corporation. All rights reserved.
-//========================================================================
-
-
-// include Theme classes
-foreach (glob(dirname(__FILE__) . '/themes/*.php') as $theme_class_script) {
-  require_once($theme_class_script);
-}
-
-//===================================================
-// CLASS 
-// Description: 
-//===================================================
-abstract class Theme {
-    protected $color_index;
-    
-    function __construct() {
-        $this->color_index = 0;
-    }
-    /**
-    * 
-    */
-    abstract function GetColorList();
-
-    /**
-    *
-    */
-    abstract function ApplyPlot($plot);
-
-
-    /**
-    *
-    */   
-    function SetupPlot($plot) {
-        if (is_array($plot)) {
-            foreach ($plot as $obj) {
-                $this->ApplyPlot($obj);
-            }
-        } else {
-            $this->ApplyPlot($plot);
-        }
-    }
-
-    /**
-    *
-    */
-    function ApplyGraph($graph) {
-
-        $this->graph = $graph;
-        $method_name = '';
-
-        if (get_class($graph) == 'Graph') {
-            $method_name = 'SetupGraph';
-        } else {
-            $method_name = 'Setup' . get_class($graph);
-        }
-
-        if (method_exists($this, $method_name)) {
-            $this->$method_name($graph);
-        } else {
-            JpGraphError::RaiseL(30001, $method_name, $method_name); //Theme::%s() is not defined. \nPlease make %s(\$graph) function in your theme classs.
-        }
-    }
-
-    /**
-    *
-    */
-    function PreStrokeApply($graph) {
-    }
-
-    /**
-    *
-    */
-    function GetThemeColors($num = 30) { 
-        $result_list = array();
-
-        $old_index = $this->color_index;
-        $this->color_index = 0;
-        $count = 0;
-  
-        $i = 0;
-        while (true) {
-            for ($j = 0; $j < count($this->GetColorList()); $j++) {
-                if (++$count > $num) {
-                    break 2;
-                }
-                $result_list[] = $this->GetNextColor();
-            }
-            $i++;
-        }
-
-        $this->color_index = $old_index;
-        
-        return $result_list;
-    }
-
-    /**
-    *
-    */
-    function GetNextColor() {
-        $color_list = $this->GetColorList();
-
-        $color = null;
-        if (isset($color_list[$this->color_index])) {
-            $color = $color_list[$this->color_index];
-        } else {
-            $color_count = count($color_list);
-            if ($color_count <= $this->color_index) {
-                $color_tmp = $color_list[$this->color_index % $color_count];
-                $brightness = 1.0 - intval($this->color_index / $color_count) * 0.2;
-                $rgb = new RGB();
-                $color = $color_tmp . ':' . $brightness;
-                $color = $rgb->Color($color);
-                $alpha = array_pop($color);
-                $color = $rgb->tryHexConversion($color);
-                if ($alpha) {
-                    $color .= '@' . $alpha;
-                }
-            }
-        }
-
-        $this->color_index++;
-
-        return $color;
-    }
-
-} // Class
-
-?>
diff --git a/#jpgraph/src/jpgraph_ttf.inc.php b/#jpgraph/src/jpgraph_ttf.inc.php
deleted file mode 100644
index 5a1bc3e2..00000000
--- a/#jpgraph/src/jpgraph_ttf.inc.php
+++ /dev/null
@@ -1,631 +0,0 @@
-<?php
-//=======================================================================
-// File:        jpgraph_ttf.inc.php
-// Description: Handling of TTF fonts
-// Created:     2006-11-19
-// Ver:         $Id: jpgraph_ttf.inc.php 1858 2009-09-28 14:39:51Z ljp $
-//
-// Copyright (c) Asial Corporation. All rights reserved.
-//========================================================================
-
-// TTF Font families
-define("FF_COURIER",10);
-define("FF_VERDANA",11);
-define("FF_TIMES",12);
-define("FF_COMIC",14);
-define("FF_ARIAL",15);
-define("FF_GEORGIA",16);
-define("FF_TREBUCHE",17);
-
-// Gnome Vera font
-// Available from http://www.gnome.org/fonts/
-define("FF_VERA",18);
-define("FF_VERAMONO",19);
-define("FF_VERASERIF",20);
-
-// Chinese font
-define("FF_SIMSUN",30);
-define("FF_CHINESE",31);
-define("FF_BIG5",32);
-
-// Japanese font
-define("FF_MINCHO",40);
-define("FF_PMINCHO",41);
-define("FF_GOTHIC",42);
-define("FF_PGOTHIC",43);
-
-// Hebrew fonts
-define("FF_DAVID",44);
-define("FF_MIRIAM",45);
-define("FF_AHRON",46);
-
-// Dejavu-fonts http://sourceforge.net/projects/dejavu
-define("FF_DV_SANSSERIF",47);
-define("FF_DV_SERIF",48);
-define("FF_DV_SANSSERIFMONO",49);
-define("FF_DV_SERIFCOND",50);
-define("FF_DV_SANSSERIFCOND",51);
-
-// Extra fonts
-// Download fonts from
-// http://www.webfontlist.com
-// http://www.webpagepublicity.com/free-fonts.html
-// http://www.fontonic.com/fonts.asp?width=d&offset=120
-// http://www.fontspace.com/category/famous
-
-// define("FF_SPEEDO",71);  // This font is also known as Bauer (Used for development gauge fascia)
-define("FF_DIGITAL",72); // Digital readout font
-define("FF_COMPUTER",73); // The classic computer font
-define("FF_CALCULATOR",74); // Triad font
-
-define("FF_USERFONT",90);
-define("FF_USERFONT1",90);
-define("FF_USERFONT2",91);
-define("FF_USERFONT3",92);
-
-// Limits for fonts
-define("_FIRST_FONT",10);
-define("_LAST_FONT",99);
-
-// TTF Font styles
-define("FS_NORMAL",9001);
-define("FS_BOLD",9002);
-define("FS_ITALIC",9003);
-define("FS_BOLDIT",9004);
-define("FS_BOLDITALIC",9004);
-
-//Definitions for internal font
-define("FF_FONT0",1);
-define("FF_FONT1",2);
-define("FF_FONT2",4);
-
-//------------------------------------------------------------------------
-// Defines for font setup
-//------------------------------------------------------------------------
-
-// Actual name of the TTF file used together with FF_CHINESE aka FF_BIG5
-// This is the TTF file being used when the font family is specified as
-// either FF_CHINESE or FF_BIG5
-define('CHINESE_TTF_FONT','bkai00mp.ttf');
-
-// Special unicode greek language support
-define("LANGUAGE_GREEK",false);
-
-// If you are setting this config to true the conversion of greek characters
-// will assume that the input text is windows 1251
-define("GREEK_FROM_WINDOWS",false);
-
-// Special unicode cyrillic language support
-define("LANGUAGE_CYRILLIC",false);
-
-// If you are setting this config to true the conversion
-// will assume that the input text is windows 1251, if
-// false it will assume koi8-r
-define("CYRILLIC_FROM_WINDOWS",false);
-
-// The following constant is used to auto-detect
-// whether cyrillic conversion is really necessary
-// if enabled. Just replace 'windows-1251' with a variable
-// containing the input character encoding string
-// of your application calling jpgraph.
-// A typical such string would be 'UTF-8' or 'utf-8'.
-// The comparison is case-insensitive.
-// If this charset is not a 'koi8-r' or 'windows-1251'
-// derivate then no conversion is done.
-//
-// This constant can be very important in multi-user
-// multi-language environments where a cyrillic conversion
-// could be needed for some cyrillic people
-// and resulting in just erraneous conversions
-// for not-cyrillic language based people.
-//
-// Example: In the free project management
-// software dotproject.net $locale_char_set is dynamically
-// set by the language environment the user has chosen.
-//
-// Usage: define('LANGUAGE_CHARSET', $locale_char_set);
-//
-// where $locale_char_set is a GLOBAL (string) variable
-// from the application including JpGraph.
-//
-define('LANGUAGE_CHARSET', null);
-
-// Japanese TrueType font used with FF_MINCHO, FF_PMINCHO, FF_GOTHIC, FF_PGOTHIC
-// Standard fonts from Infomation-technology Promotion Agency (IPA)
-// See http://mix-mplus-ipa.sourceforge.jp/
-define('MINCHO_TTF_FONT','ipam.ttf');
-define('PMINCHO_TTF_FONT','ipamp.ttf');
-define('GOTHIC_TTF_FONT','ipag.ttf');
-define('PGOTHIC_TTF_FONT','ipagp.ttf');
-
-// Assume that Japanese text have been entered in EUC-JP encoding.
-// If this define is true then conversion from EUC-JP to UTF8 is done
-// automatically in the library using the mbstring module in PHP.
-define('ASSUME_EUCJP_ENCODING',false);
-
-
-// Default font family
-define('FF_DEFAULT', FF_DV_SANSSERIF);
-
-
-
-//=================================================================
-// CLASS LanguageConv
-// Description:
-// Converts various character encoding into proper
-// UTF-8 depending on how the library have been configured and
-// what font family is being used
-//=================================================================
-class LanguageConv {
-    private $g2312 = null ;
-
-    function Convert($aTxt,$aFF) {
-        if( LANGUAGE_GREEK ) {
-            if( GREEK_FROM_WINDOWS ) {
-                $unistring = LanguageConv::gr_win2uni($aTxt);
-            } else  {
-                $unistring = LanguageConv::gr_iso2uni($aTxt);
-            }
-            return $unistring;
-        } elseif( LANGUAGE_CYRILLIC ) {
-            if( CYRILLIC_FROM_WINDOWS && (!defined('LANGUAGE_CHARSET') || stristr(LANGUAGE_CHARSET, 'windows-1251')) ) {
-                $aTxt = convert_cyr_string($aTxt, "w", "k");
-            }
-            if( !defined('LANGUAGE_CHARSET') || stristr(LANGUAGE_CHARSET, 'koi8-r') || stristr(LANGUAGE_CHARSET, 'windows-1251')) {
-                $isostring = convert_cyr_string($aTxt, "k", "i");
-                $unistring = LanguageConv::iso2uni($isostring);
-            }
-            else {
-                $unistring = $aTxt;
-            }
-            return $unistring;
-        }
-        elseif( $aFF === FF_SIMSUN ) {
-            // Do Chinese conversion
-            if( $this->g2312 == null ) {
-                include_once 'jpgraph_gb2312.php' ;
-                $this->g2312 = new GB2312toUTF8();
-            }
-            return $this->g2312->gb2utf8($aTxt);
-        }
-        elseif( $aFF === FF_BIG5 ) {
-            if( !function_exists('iconv') ) {
-                JpGraphError::RaiseL(25006);
-                //('Usage of FF_CHINESE (FF_BIG5) font family requires that your PHP setup has the iconv() function. By default this is not compiled into PHP (needs the "--width-iconv" when configured).');
-            }
-            return iconv('BIG5','UTF-8',$aTxt);
-        }
-        elseif( ASSUME_EUCJP_ENCODING &&
-        ($aFF == FF_MINCHO || $aFF == FF_GOTHIC || $aFF == FF_PMINCHO || $aFF == FF_PGOTHIC) ) {
-            if( !function_exists('mb_convert_encoding') ) {
-                JpGraphError::RaiseL(25127);
-            }
-            return mb_convert_encoding($aTxt, 'UTF-8','EUC-JP');
-        }
-        elseif( $aFF == FF_DAVID || $aFF == FF_MIRIAM || $aFF == FF_AHRON ) {
-            return LanguageConv::heb_iso2uni($aTxt);
-        }
-        else
-        return $aTxt;
-    }
-
-    // Translate iso encoding to unicode
-    public static function iso2uni ($isoline){
-        $uniline='';
-        for ($i=0; $i < strlen($isoline); $i++){
-            $thischar=substr($isoline,$i,1);
-            $charcode=ord($thischar);
-            $uniline.=($charcode>175) ? "&#" . (1040+($charcode-176)). ";" : $thischar;
-        }
-        return $uniline;
-    }
-
-    // Translate greek iso encoding to unicode
-    public static function gr_iso2uni ($isoline) {
-        $uniline='';
-        for ($i=0; $i < strlen($isoline); $i++) {
-            $thischar=substr($isoline,$i,1);
-            $charcode=ord($thischar);
-            $uniline.=($charcode>179 && $charcode!=183 && $charcode!=187 && $charcode!=189) ? "&#" . (900+($charcode-180)). ";" : $thischar;
-        }
-        return $uniline;
-    }
-
-    // Translate greek win encoding to unicode
-    public static function gr_win2uni ($winline) {
-        $uniline='';
-        for ($i=0; $i < strlen($winline); $i++) {
-            $thischar=substr($winline,$i,1);
-            $charcode=ord($thischar);
-            if ($charcode==161 || $charcode==162) {
-                $uniline.="&#" . (740+$charcode). ";";
-            }
-            else {
-                $uniline.=(($charcode>183 && $charcode!=187 && $charcode!=189) || $charcode==180) ? "&#" . (900+($charcode-180)). ";" : $thischar;
-            }
-        }
-        return $uniline;
-    }
-
-    public static function heb_iso2uni($isoline) {
-        $isoline = hebrev($isoline);
-        $o = '';
-
-        $n = strlen($isoline);
-        for($i=0; $i < $n; $i++) {
-            $c=ord( substr($isoline,$i,1) );
-            $o .= ($c > 223) && ($c < 251) ? '&#'.(1264+$c).';' : chr($c);
-        }
-        return utf8_encode($o);
-    }
-}
-
-//=============================================================
-// CLASS TTF
-// Description: Handle TTF font names and mapping and loading of
-//              font files
-//=============================================================
-class TTF {
-    private $font_files,$style_names;
-
-    function __construct() {
-
-	        // String names for font styles to be used in error messages
-	    $this->style_names=array(
-	    	FS_NORMAL =>'normal',
-	    	FS_BOLD =>'bold',
-	    	FS_ITALIC =>'italic',
-	    	FS_BOLDITALIC =>'bolditalic');
-
-	    // File names for available fonts
-	    $this->font_files=array(
-	    FF_COURIER => array(FS_NORMAL =>'cour.ttf',
-	    	FS_BOLD  =>'courbd.ttf',
-	    	FS_ITALIC =>'couri.ttf',
-	    	FS_BOLDITALIC =>'courbi.ttf' ),
-	    FF_GEORGIA => array(FS_NORMAL =>'georgia.ttf',
-	    	FS_BOLD  =>'georgiab.ttf',
-	    	FS_ITALIC =>'georgiai.ttf',
-	    	FS_BOLDITALIC =>'' ),
-	    FF_TREBUCHE =>array(FS_NORMAL =>'trebuc.ttf',
-	    	FS_BOLD  =>'trebucbd.ttf',
-	    	FS_ITALIC =>'trebucit.ttf',
-	    	FS_BOLDITALIC =>'trebucbi.ttf' ),
-	    FF_VERDANA  => array(FS_NORMAL =>'verdana.ttf',
-	    	FS_BOLD  =>'verdanab.ttf',
-	    	FS_ITALIC =>'verdanai.ttf',
-	    	FS_BOLDITALIC =>'' ),
-	    FF_TIMES =>   array(FS_NORMAL =>'times.ttf',
-	    	FS_BOLD  =>'timesbd.ttf',
-	    	FS_ITALIC =>'timesi.ttf',
-	    	FS_BOLDITALIC =>'timesbi.ttf' ),
-	    FF_COMIC =>   array(FS_NORMAL =>'comic.ttf',
-	    	FS_BOLD  =>'comicbd.ttf',
-	    	FS_ITALIC =>'',
-	    	FS_BOLDITALIC =>'' ),
-	    FF_ARIAL =>   array(FS_NORMAL =>'arial.ttf',
-	    	FS_BOLD  =>'arialbd.ttf',
-	    	FS_ITALIC =>'ariali.ttf',
-	    	FS_BOLDITALIC =>'arialbi.ttf' ) ,
-	    FF_VERA =>    array(FS_NORMAL =>'Vera.ttf',
-	    	FS_BOLD  =>'VeraBd.ttf',
-	    	FS_ITALIC =>'VeraIt.ttf',
-	    	FS_BOLDITALIC =>'VeraBI.ttf' ),
-	    FF_VERAMONO => array(FS_NORMAL =>'VeraMono.ttf',
-	    	FS_BOLD =>'VeraMoBd.ttf',
-	    	FS_ITALIC =>'VeraMoIt.ttf',
-	    	FS_BOLDITALIC =>'VeraMoBI.ttf' ),
-	    FF_VERASERIF=> array(FS_NORMAL =>'VeraSe.ttf',
-	    	FS_BOLD =>'VeraSeBd.ttf',
-	    	FS_ITALIC =>'',
-	    	FS_BOLDITALIC =>'' ) ,
-
-	    /* Chinese fonts */
-	    FF_SIMSUN  =>  array(
-	    	FS_NORMAL =>'simsun.ttc',
-	    	FS_BOLD =>'simhei.ttf',
-	    	FS_ITALIC =>'',
-	    	FS_BOLDITALIC =>'' ),
-	    FF_CHINESE  =>   array(
-	    	FS_NORMAL =>CHINESE_TTF_FONT,
-	    	FS_BOLD =>'',
-	    	FS_ITALIC =>'',
-	    	FS_BOLDITALIC =>'' ),
-	    FF_BIG5  =>   array(
-	    	FS_NORMAL =>CHINESE_TTF_FONT,
-	    	FS_BOLD =>'',
-	    	FS_ITALIC =>'',
-	    	FS_BOLDITALIC =>'' ),
-
-	    /* Japanese fonts */
-	    FF_MINCHO  =>  array(
-	    	FS_NORMAL =>MINCHO_TTF_FONT,
-	    	FS_BOLD =>'',
-	    	FS_ITALIC =>'',
-	    	FS_BOLDITALIC =>'' ),
-
-	    FF_PMINCHO  =>  array(
-	    	FS_NORMAL =>PMINCHO_TTF_FONT,
-	    	FS_BOLD =>'',
-	    	FS_ITALIC =>'',
-	    	FS_BOLDITALIC =>'' ),
-
-	    FF_GOTHIC   =>  array(
-	    	FS_NORMAL =>GOTHIC_TTF_FONT,
-	    	FS_BOLD =>'',
-	    	FS_ITALIC =>'',
-	    	FS_BOLDITALIC =>'' ),
-
-	    FF_PGOTHIC  =>  array(
-	    	FS_NORMAL =>PGOTHIC_TTF_FONT,
-	    	FS_BOLD =>'',
-	    	FS_ITALIC =>'',
-	    	FS_BOLDITALIC =>'' ),
-
-	    /* Hebrew fonts */
-	    FF_DAVID  =>  array(
-	    	FS_NORMAL =>'DAVIDNEW.TTF',
-	    	FS_BOLD =>'',
-	    	FS_ITALIC =>'',
-	    	FS_BOLDITALIC =>'' ),
-
-	    FF_MIRIAM  =>  array(
-	    	FS_NORMAL =>'MRIAMY.TTF',
-	    	FS_BOLD =>'',
-	    	FS_ITALIC =>'',
-	    	FS_BOLDITALIC =>'' ),
-
-	    FF_AHRON  =>  array(
-	    	FS_NORMAL =>'ahronbd.ttf',
-	    	FS_BOLD =>'',
-	    	FS_ITALIC =>'',
-	    	FS_BOLDITALIC =>'' ),
-
-	    /* Misc fonts */
-	    FF_DIGITAL =>   array(
-	    	FS_NORMAL =>'DIGIRU__.TTF',
-	    	FS_BOLD =>'Digirtu_.ttf',
-	    	FS_ITALIC =>'Digir___.ttf',
-	    	FS_BOLDITALIC =>'DIGIRT__.TTF' ),
-
-	    /* This is an experimental font for the speedometer development
-	    FF_SPEEDO =>    array(
-	    FS_NORMAL =>'Speedo.ttf',
-	    FS_BOLD =>'',
-	    FS_ITALIC =>'',
-	    FS_BOLDITALIC =>'' ),
-	    */
-
-	    FF_COMPUTER  =>  array(
-	    	FS_NORMAL =>'COMPUTER.TTF',
-	    	FS_BOLD =>'',
-	    	FS_ITALIC =>'',
-	    	FS_BOLDITALIC =>'' ),
-
-	    FF_CALCULATOR => array(
-	    	FS_NORMAL =>'Triad_xs.ttf',
-	    	FS_BOLD =>'',
-	    	FS_ITALIC =>'',
-	    	FS_BOLDITALIC =>'' ),
-
-	    /* Dejavu fonts */
-	    FF_DV_SANSSERIF => array(
-	    	FS_NORMAL =>array('DejaVuSans.ttf'),
-	    	FS_BOLD =>array('DejaVuSans-Bold.ttf','DejaVuSansBold.ttf'),
-	    	FS_ITALIC =>array('DejaVuSans-Oblique.ttf','DejaVuSansOblique.ttf'),
-	    	FS_BOLDITALIC =>array('DejaVuSans-BoldOblique.ttf','DejaVuSansBoldOblique.ttf') ),
-
-	    FF_DV_SANSSERIFMONO => array(
-	    	FS_NORMAL =>array('DejaVuSansMono.ttf','DejaVuMonoSans.ttf'),
-	    	FS_BOLD =>array('DejaVuSansMono-Bold.ttf','DejaVuMonoSansBold.ttf'),
-	    	FS_ITALIC =>array('DejaVuSansMono-Oblique.ttf','DejaVuMonoSansOblique.ttf'),
-	    	FS_BOLDITALIC =>array('DejaVuSansMono-BoldOblique.ttf','DejaVuMonoSansBoldOblique.ttf') ),
-
-	    FF_DV_SANSSERIFCOND => array(
-	    	FS_NORMAL =>array('DejaVuSansCondensed.ttf','DejaVuCondensedSans.ttf'),
-	    	FS_BOLD =>array('DejaVuSansCondensed-Bold.ttf','DejaVuCondensedSansBold.ttf'),
-	    	FS_ITALIC =>array('DejaVuSansCondensed-Oblique.ttf','DejaVuCondensedSansOblique.ttf'),
-	    	FS_BOLDITALIC =>array('DejaVuSansCondensed-BoldOblique.ttf','DejaVuCondensedSansBoldOblique.ttf') ),
-
-	    FF_DV_SERIF => array(
-	    	FS_NORMAL =>array('DejaVuSerif.ttf'),
-	    	FS_BOLD =>array('DejaVuSerif-Bold.ttf','DejaVuSerifBold.ttf'),
-	    	FS_ITALIC =>array('DejaVuSerif-Italic.ttf','DejaVuSerifItalic.ttf'),
-	    	FS_BOLDITALIC =>array('DejaVuSerif-BoldItalic.ttf','DejaVuSerifBoldItalic.ttf') ),
-
-	    FF_DV_SERIFCOND => array(
-	    	FS_NORMAL =>array('DejaVuSerifCondensed.ttf','DejaVuCondensedSerif.ttf'),
-	    	FS_BOLD =>array('DejaVuSerifCondensed-Bold.ttf','DejaVuCondensedSerifBold.ttf'),
-	    	FS_ITALIC =>array('DejaVuSerifCondensed-Italic.ttf','DejaVuCondensedSerifItalic.ttf'),
-	    	FS_BOLDITALIC =>array('DejaVuSerifCondensed-BoldItalic.ttf','DejaVuCondensedSerifBoldItalic.ttf') ),
-
-
-	    /* Placeholders for defined fonts */
-	    FF_USERFONT1 => array(
-	    	FS_NORMAL =>'',
-	    	FS_BOLD =>'',
-	    	FS_ITALIC =>'',
-	    	FS_BOLDITALIC =>'' ),
-
-	    FF_USERFONT2 => array(
-	    	FS_NORMAL =>'',
-	    	FS_BOLD =>'',
-	    	FS_ITALIC =>'',
-	    	FS_BOLDITALIC =>'' ),
-
-	    FF_USERFONT3 => array(
-	    	FS_NORMAL =>'',
-	    	FS_BOLD =>'',
-	    	FS_ITALIC =>'',
-	    	FS_BOLDITALIC =>'' ),
-
-	    );
-    }
-
-    //---------------
-    // PUBLIC METHODS
-    // Create the TTF file from the font specification
-    function File($family,$style=FS_NORMAL) {
-        $fam = @$this->font_files[$family];
-        if( !$fam ) {
-            JpGraphError::RaiseL(25046,$family);//("Specified TTF font family (id=$family) is unknown or does not exist. Please note that TTF fonts are not distributed with JpGraph for copyright reasons. You can find the MS TTF WEB-fonts (arial, courier etc) for download at http://corefonts.sourceforge.net/");
-        }
-        $ff = @$fam[$style];
-
-        // There are several optional file names. They are tried in order
-        // and the first one found is used
-        if( !is_array($ff) ) {
-            $ff = array($ff);
-        }
-
-        $jpgraph_font_dir = dirname(__FILE__).'/fonts/';
-
-        foreach ($ff as $font_file) {
-            // All font families are guaranteed to have the normal style
-
-            if( $font_file==='' )
-                    JpGraphError::RaiseL(25047,$this->style_names[$style],$this->font_files[$family][FS_NORMAL]);//('Style "'.$this->style_names[$style].'" is not available for font family '.$this->font_files[$family][FS_NORMAL].'.');
-            if( !$font_file ) {
-                JpGraphError::RaiseL(25048,$fam);//("Unknown font style specification [$fam].");
-            }
-
-            // check jpgraph/src/fonts dir
-            $jpgraph_font_file = $jpgraph_font_dir . $font_file;
-            if (file_exists($jpgraph_font_file) === true && is_readable($jpgraph_font_file) === true) { 
-                $font_file = $jpgraph_font_file;
-                break;
-            }
-
-            // check OS font dir
-            if ($family >= FF_MINCHO && $family <= FF_PGOTHIC) {
-                $font_file = MBTTF_DIR.$font_file;
-            } else {
-                $font_file = TTF_DIR.$font_file;
-            }
-            if (file_exists($font_file) === true && is_readable($font_file) === true) { 
-                break;
-            }
-        }
-
-        if( !file_exists($font_file) ) {
-        	JpGraphError::RaiseL(25049,$font_file);//("Font file \"$font_file\" is not readable or does not exist.");
-        }
-
-        return $font_file;
-    }
-
-    function SetUserFont($aNormal,$aBold='',$aItalic='',$aBoldIt='') {
-        $this->font_files[FF_USERFONT] =
-        	array(FS_NORMAL     => $aNormal,
-        		  FS_BOLD => $aBold,
-        		  FS_ITALIC => $aItalic,
-        		  FS_BOLDITALIC => $aBoldIt ) ;
-    }
-
-    function SetUserFont1($aNormal,$aBold='',$aItalic='',$aBoldIt='') {
-        $this->font_files[FF_USERFONT1] =
-        	array(FS_NORMAL     => $aNormal,
-        		  FS_BOLD => $aBold,
-        		  FS_ITALIC => $aItalic,
-        		  FS_BOLDITALIC => $aBoldIt ) ;
-    }
-
-    function SetUserFont2($aNormal,$aBold='',$aItalic='',$aBoldIt='') {
-        $this->font_files[FF_USERFONT2] =
-        	array(FS_NORMAL     => $aNormal,
-        		  FS_BOLD => $aBold,
-        		  FS_ITALIC => $aItalic,
-        		  FS_BOLDITALIC => $aBoldIt ) ;
-    }
-
-    function SetUserFont3($aNormal,$aBold='',$aItalic='',$aBoldIt='') {
-        $this->font_files[FF_USERFONT3] =
-        	array(FS_NORMAL     => $aNormal,
-        		  FS_BOLD => $aBold,
-        		  FS_ITALIC => $aItalic,
-        		  FS_BOLDITALIC => $aBoldIt ) ;
-    }
-
-} // Class
-
-
-//=============================================================================
-// CLASS SymChar
-// Description: Code values for some commonly used characters that
-//              normally isn't available directly on the keyboard, for example
-//              mathematical and greek symbols.
-//=============================================================================
-class  SymChar {
-    static function Get($aSymb,$aCapital=FALSE) {
-        $iSymbols = array(
-        /* Greek */
-        array('alpha','03B1','0391'),
-        array('beta','03B2','0392'),
-        array('gamma','03B3','0393'),
-        array('delta','03B4','0394'),
-        array('epsilon','03B5','0395'),
-        array('zeta','03B6','0396'),
-        array('ny','03B7','0397'),
-        array('eta','03B8','0398'),
-        array('theta','03B8','0398'),
-        array('iota','03B9','0399'),
-        array('kappa','03BA','039A'),
-        array('lambda','03BB','039B'),
-        array('mu','03BC','039C'),
-        array('nu','03BD','039D'),
-        array('xi','03BE','039E'),
-        array('omicron','03BF','039F'),
-        array('pi','03C0','03A0'),
-        array('rho','03C1','03A1'),
-        array('sigma','03C3','03A3'),
-        array('tau','03C4','03A4'),
-        array('upsilon','03C5','03A5'),
-        array('phi','03C6','03A6'),
-        array('chi','03C7','03A7'),
-        array('psi','03C8','03A8'),
-        array('omega','03C9','03A9'),
-        /* Money */
-        array('euro','20AC'),
-        array('yen','00A5'),
-        array('pound','20A4'),
-        /* Math */
-        array('approx','2248'),
-        array('neq','2260'),
-        array('not','2310'),
-        array('def','2261'),
-        array('inf','221E'),
-        array('sqrt','221A'),
-        array('int','222B'),
-        /* Misc */
-        array('copy','00A9'),
-        array('para','00A7'),
-        array('tm','2122'),   /* Trademark symbol */
-        array('rtm','00AE'),   /* Registered trademark */
-        array('degree','00b0'),
-        array('lte','2264'), /* Less than or equal */
-        array('gte','2265'), /* Greater than or equal */
-
-        );
-
-        $n = count($iSymbols);
-        $i=0;
-        $found = false;
-        $aSymb = strtolower($aSymb);
-        while( $i < $n && !$found ) {
-            $found = $aSymb === $iSymbols[$i++][0];
-        }
-        if( $found ) {
-            $ca = $iSymbols[--$i];
-            if( $aCapital && count($ca)==3 )
-                $s = $ca[2];
-            else
-                $s = $ca[1];
-            return sprintf('&#%04d;',hexdec($s));
-        }
-        else
-            return '';
-    }
-}
-
-
-?>
diff --git a/#jpgraph/src/jpgraph_utils.inc.php b/#jpgraph/src/jpgraph_utils.inc.php
deleted file mode 100644
index f0d002c1..00000000
--- a/#jpgraph/src/jpgraph_utils.inc.php
+++ /dev/null
@@ -1,685 +0,0 @@
-<?php
-/*=======================================================================
- // File:        JPGRAPH_UTILS.INC
- // Description: Collection of non-essential "nice to have" utilities
- // Created:     2005-11-20
- // Ver:         $Id: jpgraph_utils.inc.php 1777 2009-08-23 17:34:36Z ljp $
- //
- // Copyright (c) Asial Corporation. All rights reserved.
- //========================================================================
- */
-
-//===================================================
-// CLASS FuncGenerator
-// Description: Utility class to help generate data for function plots.
-// The class supports both parametric and regular functions.
-//===================================================
-class FuncGenerator {
-    private $iFunc='',$iXFunc='',$iMin,$iMax,$iStepSize;
-
-    function __construct($aFunc,$aXFunc='') {
-        $this->iFunc = $aFunc;
-        $this->iXFunc = $aXFunc;
-    }
-
-    function E($aXMin,$aXMax,$aSteps=50) {
-        $this->iMin = $aXMin;
-        $this->iMax = $aXMax;
-        $this->iStepSize = ($aXMax-$aXMin)/$aSteps;
-
-        if( $this->iXFunc != '' )
-        $t = 'for($i='.$aXMin.'; $i<='.$aXMax.'; $i += '.$this->iStepSize.') {$ya[]='.$this->iFunc.';$xa[]='.$this->iXFunc.';}';
-        elseif( $this->iFunc != '' )
-        $t = 'for($x='.$aXMin.'; $x<='.$aXMax.'; $x += '.$this->iStepSize.') {$ya[]='.$this->iFunc.';$xa[]=$x;} $x='.$aXMax.';$ya[]='.$this->iFunc.';$xa[]=$x;';
-        else
-        JpGraphError::RaiseL(24001);//('FuncGenerator : No function specified. ');
-
-        @eval($t);
-
-        // If there is an error in the function specifcation this is the only
-        // way we can discover that.
-        if( empty($xa) || empty($ya) )
-        JpGraphError::RaiseL(24002);//('FuncGenerator : Syntax error in function specification ');
-
-        return array($xa,$ya);
-    }
-}
-
-
-//=============================================================================
-// CLASS DateScaleUtils
-// Description: Help to create a manual date scale
-//=============================================================================
-define('DSUTILS_MONTH',1); // Major and minor ticks on a monthly basis
-define('DSUTILS_MONTH1',1); // Major and minor ticks on a monthly basis
-define('DSUTILS_MONTH2',2); // Major ticks on a bi-monthly basis
-define('DSUTILS_MONTH3',3); // Major icks on a tri-monthly basis
-define('DSUTILS_MONTH6',4); // Major on a six-monthly basis
-define('DSUTILS_WEEK1',5); // Major ticks on a weekly basis
-define('DSUTILS_WEEK2',6); // Major ticks on a bi-weekly basis
-define('DSUTILS_WEEK4',7); // Major ticks on a quod-weekly basis
-define('DSUTILS_DAY1',8); // Major ticks on a daily basis
-define('DSUTILS_DAY2',9); // Major ticks on a bi-daily basis
-define('DSUTILS_DAY4',10); // Major ticks on a qoud-daily basis
-define('DSUTILS_YEAR1',11); // Major ticks on a yearly basis
-define('DSUTILS_YEAR2',12); // Major ticks on a bi-yearly basis
-define('DSUTILS_YEAR5',13); // Major ticks on a five-yearly basis
-
-
-class DateScaleUtils {
-    public static $iMin=0, $iMax=0;
-
-    private static $starthour,$startmonth, $startday, $startyear;
-    private static $endmonth, $endyear, $endday;
-    private static $tickPositions=array(),$minTickPositions=array();
-    private static $iUseWeeks = true;
-
-    static function UseWeekFormat($aFlg) {
-        self::$iUseWeeks = $aFlg;
-    }
-
-    static function doYearly($aType,$aMinor=false) {
-        $i=0; $j=0;
-        $m = self::$startmonth;
-        $y = self::$startyear;
-
-        if( self::$startday == 1 ) {
-            self::$tickPositions[$i++] = mktime(0,0,0,$m,1,$y);
-        }
-        ++$m;
-
-
-        switch( $aType ) {
-            case DSUTILS_YEAR1:
-                for($y=self::$startyear; $y <= self::$endyear; ++$y ) {
-                    if( $aMinor ) {
-                        while( $m <= 12 ) {
-                            if( !($y == self::$endyear && $m > self::$endmonth) ) {
-                                self::$minTickPositions[$j++] = mktime(0,0,0,$m,1,$y);
-                            }
-                            ++$m;
-                        }
-                        $m=1;
-                    }
-                    self::$tickPositions[$i++] = mktime(0,0,0,1,1,$y);
-                }
-                break;
-            case DSUTILS_YEAR2:
-                $y=self::$startyear;
-                while( $y <= self::$endyear ) {
-                    self::$tickPositions[$i++] = mktime(0,0,0,1,1,$y);
-                    for($k=0; $k < 1; ++$k ) {
-                        ++$y;
-                        if( $aMinor ) {
-                            self::$minTickPositions[$j++] = mktime(0,0,0,1,1,$y);
-                        }
-                    }
-                    ++$y;
-                }
-                break;
-            case DSUTILS_YEAR5:
-                $y=self::$startyear;
-                while( $y <= self::$endyear ) {
-                    self::$tickPositions[$i++] = mktime(0,0,0,1,1,$y);
-                    for($k=0; $k < 4; ++$k ) {
-                        ++$y;
-                        if( $aMinor ) {
-                            self::$minTickPositions[$j++] = mktime(0,0,0,1,1,$y);
-                        }
-                    }
-                    ++$y;
-                }
-                break;
-        }
-    }
-
-    static function doDaily($aType,$aMinor=false) {
-        $m = self::$startmonth;
-        $y = self::$startyear;
-        $d = self::$startday;
-        $h = self::$starthour;
-        $i=0;$j=0;
-
-        if( $h == 0 ) {
-            self::$tickPositions[$i++] = mktime(0,0,0,$m,$d,$y);
-        }
-        $t = mktime(0,0,0,$m,$d,$y);
-
-        switch($aType) {
-            case DSUTILS_DAY1:
-                while( $t <= self::$iMax ) {
-                    $t = strtotime('+1 day',$t);
-                    self::$tickPositions[$i++] = $t;
-                    if( $aMinor ) {
-                        self::$minTickPositions[$j++] = strtotime('+12 hours',$t);
-                    }
-                }
-                break;
-            case DSUTILS_DAY2:
-                while( $t <= self::$iMax ) {
-                    $t = strtotime('+1 day',$t);
-                    if( $aMinor ) {
-                        self::$minTickPositions[$j++] = $t;
-                    }
-                    $t = strtotime('+1 day',$t);
-                    self::$tickPositions[$i++] = $t;
-                }
-                break;
-            case DSUTILS_DAY4:
-                while( $t <= self::$iMax ) {
-                    for($k=0; $k < 3; ++$k ) {
-                        $t = strtotime('+1 day',$t);
-                        if( $aMinor ) {
-                            self::$minTickPositions[$j++] = $t;
-                        }
-                    }
-                    $t = strtotime('+1 day',$t);
-                    self::$tickPositions[$i++] = $t;
-                }
-                break;
-        }
-    }
-
-    static function doWeekly($aType,$aMinor=false) {
-        $hpd = 3600*24;
-        $hpw = 3600*24*7;
-        // Find out week number of min date
-        $thursday = self::$iMin + $hpd * (3 - (date('w', self::$iMin) + 6) % 7);
-        $week = 1 + (date('z', $thursday) - (11 - date('w', mktime(0, 0, 0, 1, 1, date('Y', $thursday)))) % 7) / 7;
-        $daynumber = date('w',self::$iMin);
-        if( $daynumber == 0 ) $daynumber = 7;
-        $m = self::$startmonth;
-        $y = self::$startyear;
-        $d = self::$startday;
-        $i=0;$j=0;
-        // The assumption is that the weeks start on Monday. If the first day
-        // is later in the week then the first week tick has to be on the following
-        // week.
-        if( $daynumber == 1 ) {
-            self::$tickPositions[$i++] = mktime(0,0,0,$m,$d,$y);
-            $t = mktime(0,0,0,$m,$d,$y) + $hpw;
-        }
-        else {
-            $t = mktime(0,0,0,$m,$d,$y) + $hpd*(8-$daynumber);
-        }
-
-        switch($aType) {
-            case DSUTILS_WEEK1:
-                $cnt=0;
-                break;
-            case DSUTILS_WEEK2:
-                $cnt=1;
-                break;
-            case DSUTILS_WEEK4:
-                $cnt=3;
-                break;
-        }
-        while( $t <= self::$iMax ) {
-            self::$tickPositions[$i++] = $t;
-            for($k=0; $k < $cnt; ++$k ) {
-                $t += $hpw;
-                if( $aMinor ) {
-                    self::$minTickPositions[$j++] = $t;
-                }
-            }
-            $t += $hpw;
-        }
-    }
-
-    static function doMonthly($aType,$aMinor=false) {
-        $monthcount=0;
-        $m = self::$startmonth;
-        $y = self::$startyear;
-        $i=0; $j=0;
-
-        // Skip the first month label if it is before the startdate
-        if( self::$startday == 1 ) {
-            self::$tickPositions[$i++] = mktime(0,0,0,$m,1,$y);
-            $monthcount=1;
-        }
-        if( $aType == 1 ) {
-            if( self::$startday < 15 ) {
-                self::$minTickPositions[$j++] = mktime(0,0,0,$m,15,$y);
-            }
-        }
-        ++$m;
-
-        // Loop through all the years included in the scale
-        for($y=self::$startyear; $y <= self::$endyear; ++$y ) {
-            // Loop through all the months. There are three cases to consider:
-            // 1. We are in the first year and must start with the startmonth
-            // 2. We are in the end year and we must stop at last month of the scale
-            // 3. A year in between where we run through all the 12 months
-            $stopmonth = $y == self::$endyear ? self::$endmonth : 12;
-            while( $m <= $stopmonth ) {
-                switch( $aType ) {
-                    case DSUTILS_MONTH1:
-                        // Set minor tick at the middle of the month
-                        if( $aMinor ) {
-                            if( $m <= $stopmonth ) {
-                                if( !($y==self::$endyear && $m==$stopmonth && self::$endday < 15) )
-                                self::$minTickPositions[$j++] = mktime(0,0,0,$m,15,$y);
-                            }
-                        }
-                        // Major at month
-                        // Get timestamp of first hour of first day in each month
-                        self::$tickPositions[$i++] = mktime(0,0,0,$m,1,$y);
-
-                        break;
-                    case DSUTILS_MONTH2:
-                        if( $aMinor ) {
-                            // Set minor tick at start of each month
-                            self::$minTickPositions[$j++] = mktime(0,0,0,$m,1,$y);
-                        }
-
-                        // Major at every second month
-                        // Get timestamp of first hour of first day in each month
-                        if( $monthcount % 2 == 0 ) {
-                            self::$tickPositions[$i++] = mktime(0,0,0,$m,1,$y);
-                        }
-                        break;
-                    case DSUTILS_MONTH3:
-                        if( $aMinor ) {
-                            // Set minor tick at start of each month
-                            self::$minTickPositions[$j++] = mktime(0,0,0,$m,1,$y);
-                        }
-                        // Major at every third month
-                        // Get timestamp of first hour of first day in each month
-                        if( $monthcount % 3 == 0 ) {
-                            self::$tickPositions[$i++] = mktime(0,0,0,$m,1,$y);
-                        }
-                        break;
-                    case DSUTILS_MONTH6:
-                        if( $aMinor ) {
-                            // Set minor tick at start of each month
-                            self::$minTickPositions[$j++] = mktime(0,0,0,$m,1,$y);
-                        }
-                        // Major at every third month
-                        // Get timestamp of first hour of first day in each month
-                        if( $monthcount % 6 == 0 ) {
-                            self::$tickPositions[$i++] = mktime(0,0,0,$m,1,$y);
-                        }
-                        break;
-                }
-                ++$m;
-                ++$monthcount;
-            }
-            $m=1;
-        }
-
-        // For the case where all dates are within the same month
-        // we want to make sure we have at least two ticks on the scale
-        // since the scale want work properly otherwise
-        if(self::$startmonth == self::$endmonth && self::$startyear == self::$endyear && $aType==1 ) {
-            self::$tickPositions[$i++] = mktime(0 ,0 ,0, self::$startmonth + 1, 1, self::$startyear);
-        }
-
-        return array(self::$tickPositions,self::$minTickPositions);
-    }
-
-    static function GetTicks($aData,$aType=1,$aMinor=false,$aEndPoints=false) {
-        $n = count($aData);
-        return self::GetTicksFromMinMax($aData[0],$aData[$n-1],$aType,$aMinor,$aEndPoints);
-    }
-
-    static function GetAutoTicks($aMin,$aMax,$aMaxTicks=10,$aMinor=false) {
-        $diff = $aMax - $aMin;
-        $spd = 3600*24;
-        $spw = $spd*7;
-        $spm = $spd*30;
-        $spy = $spd*352;
-
-        if( self::$iUseWeeks )
-        $w = 'W';
-        else
-        $w = 'd M';
-
-        // Decision table for suitable scales
-        // First value: Main decision point
-        // Second value: Array of formatting depending on divisor for wanted max number of ticks. <divisor><formatting><format-string>,..
-        $tt = array(
-            array($spw, array(1,DSUTILS_DAY1,'d M',2,DSUTILS_DAY2,'d M',-1,DSUTILS_DAY4,'d M')),
-            array($spm, array(1,DSUTILS_DAY1,'d M',2,DSUTILS_DAY2,'d M',4,DSUTILS_DAY4,'d M',7,DSUTILS_WEEK1,$w,-1,DSUTILS_WEEK2,$w)),
-            array($spy, array(1,DSUTILS_DAY1,'d M',2,DSUTILS_DAY2,'d M',4,DSUTILS_DAY4,'d M',7,DSUTILS_WEEK1,$w,14,DSUTILS_WEEK2,$w,30,DSUTILS_MONTH1,'M',60,DSUTILS_MONTH2,'M',-1,DSUTILS_MONTH3,'M')),
-            array(-1, array(30,DSUTILS_MONTH1,'M-Y',60,DSUTILS_MONTH2,'M-Y',90,DSUTILS_MONTH3,'M-Y',180,DSUTILS_MONTH6,'M-Y',352,DSUTILS_YEAR1,'Y',704,DSUTILS_YEAR2,'Y',-1,DSUTILS_YEAR5,'Y')));
-
-        $ntt = count($tt);
-        $nd = floor($diff/$spd);
-        for($i=0; $i < $ntt; ++$i ) {
-            if( $diff <= $tt[$i][0] || $i==$ntt-1) {
-                $t = $tt[$i][1];
-                $n = count($t)/3;
-                for( $j=0; $j < $n; ++$j ) {
-                    if( $nd/$t[3*$j] <= $aMaxTicks || $j==$n-1) {
-                        $type = $t[3*$j+1];
-                        $fs = $t[3*$j+2];
-                        list($tickPositions,$minTickPositions) = self::GetTicksFromMinMax($aMin,$aMax,$type,$aMinor);
-                        return array($fs,$tickPositions,$minTickPositions,$type);
-                    }
-                }
-            }
-        }
-    }
-
-    static function GetTicksFromMinMax($aMin,$aMax,$aType,$aMinor=false,$aEndPoints=false) {
-        self::$starthour = date('G',$aMin);
-        self::$startmonth = date('n',$aMin);
-        self::$startday = date('j',$aMin);
-        self::$startyear = date('Y',$aMin);
-        self::$endmonth = date('n',$aMax);
-        self::$endyear = date('Y',$aMax);
-        self::$endday = date('j',$aMax);
-        self::$iMin = $aMin;
-        self::$iMax = $aMax;
-
-        if( $aType <= DSUTILS_MONTH6 ) {
-            self::doMonthly($aType,$aMinor);
-        }
-        elseif( $aType <= DSUTILS_WEEK4 ) {
-            self::doWeekly($aType,$aMinor);
-        }
-        elseif( $aType <= DSUTILS_DAY4 ) {
-            self::doDaily($aType,$aMinor);
-        }
-        elseif( $aType <= DSUTILS_YEAR5 ) {
-            self::doYearly($aType,$aMinor);
-        }
-        else {
-            JpGraphError::RaiseL(24003);
-        }
-        // put a label at the very left data pos
-        if( $aEndPoints ) {
-            $tickPositions[$i++] = $aData[0];
-        }
-
-        // put a label at the very right data pos
-        if( $aEndPoints ) {
-            $tickPositions[$i] = $aData[$n-1];
-        }
-
-        return array(self::$tickPositions,self::$minTickPositions);
-    }
-}
-
-//=============================================================================
-// Class ReadFileData
-//=============================================================================
-Class ReadFileData {
-    //----------------------------------------------------------------------------
-    // Desciption:
-    // Read numeric data from a file.
-    // Each value should be separated by either a new line or by a specified
-    // separator character (default is ',').
-    // Before returning the data each value is converted to a proper float
-    // value. The routine is robust in the sense that non numeric data in the
-    // file will be discarded.
-    //
-    // Returns:
-    // The number of data values read on success, FALSE on failure
-    //----------------------------------------------------------------------------
-    static function FromCSV($aFile,&$aData,$aSepChar=',',$aMaxLineLength=1024) {
-        $rh = @fopen($aFile,'r');
-        if( $rh === false ) {
-                return false;
-        }
-        $tmp = array();
-        $lineofdata = fgetcsv($rh, 1000, ',');
-        while ( $lineofdata !== FALSE) {
-            $tmp = array_merge($tmp,$lineofdata);
-            $lineofdata = fgetcsv($rh, $aMaxLineLength, $aSepChar);
-        }
-        fclose($rh);
-
-        // Now make sure that all data is numeric. By default
-        // all data is read as strings
-        $n = count($tmp);
-        $aData = array();
-        $cnt=0;
-        for($i=0; $i < $n; ++$i) {
-            if( $tmp[$i] !== "" ) {
-                $aData[$cnt++] = floatval($tmp[$i]);
-            }
-        }
-        return $cnt;
-    }
-
-    //----------------------------------------------------------------------------
-    // Desciption:
-    // Read numeric data from a file.
-    // Each value should be separated by either a new line or by a specified
-    // separator character (default is ',').
-    // Before returning the data each value is converted to a proper float
-    // value. The routine is robust in the sense that non numeric data in the
-    // file will be discarded.
-    //
-    // Options:
-    // 'separator'     => ',',
-    // 'enclosure'     => '"',
-    // 'readlength'    => 1024,
-    // 'ignore_first'  => false,
-    // 'first_as_key'  => false
-    // 'escape'        => '\',   # PHP >= 5.3 only
-    //
-    // Returns:
-    // The number of lines read on success, FALSE on failure
-    //----------------------------------------------------------------------------
-    static function FromCSV2($aFile, &$aData, $aOptions = array()) {
-        $aDefaults = array(
-            'separator'     => ',',
-            'enclosure'     => chr(34),
-            'escape'        => chr(92),
-            'readlength'    => 1024,
-            'ignore_first'  => false,
-            'first_as_key'  => false
-            );
-
-        $aOptions = array_merge(
-            $aDefaults, is_array($aOptions) ? $aOptions : array());
-
-        if( $aOptions['first_as_key'] ) {
-            $aOptions['ignore_first'] =  true;
-        }
-
-        $rh = @fopen($aFile, 'r');
-
-        if( $rh === false ) {
-            return false;
-        }
-
-        $aData  = array();
-        $aLine  = fgetcsv($rh,
-                          $aOptions['readlength'],
-                          $aOptions['separator'],
-                          $aOptions['enclosure']
-                          /*, $aOptions['escape']     # PHP >= 5.3 only */
-                          );
-
-        // Use numeric array keys for the columns by default
-        // If specified use first lines values as assoc keys instead
-        $keys = array_keys($aLine);
-        if( $aOptions['first_as_key'] ) {
-            $keys = array_values($aLine);
-        }
-
-        $num_lines = 0;
-        $num_cols  = count($aLine);
-
-        while ($aLine !== false) {
-            if( is_array($aLine) && count($aLine) != $num_cols ) {
-                JpGraphError::RaiseL(24004);
-                // 'ReadCSV2: Column count mismatch in %s line %d'
-            }
-
-            // fgetcsv returns NULL for empty lines
-            if( !is_null($aLine) ) {
-                $num_lines++;
-
-                if( !($aOptions['ignore_first'] && $num_lines == 1) && is_numeric($aLine[0]) ) {
-                    for( $i = 0; $i < $num_cols; $i++ ) {
-                        $aData[ $keys[$i] ][] = floatval($aLine[$i]);
-                    }
-                }
-            }
-
-            $aLine = fgetcsv($rh,
-                             $aOptions['readlength'],
-                             $aOptions['separator'],
-                             $aOptions['enclosure']
-                             /*, $aOptions['escape']     # PHP >= 5.3 only*/
-                );
-        }
-
-        fclose($rh);
-
-        if( $aOptions['ignore_first'] ) {
-            $num_lines--;
-        }
-
-        return $num_lines;
-    }
-
-    // Read data from two columns in a plain text file
-    static function From2Col($aFile, $aCol1, $aCol2, $aSepChar=' ') {
-        $lines = @file($aFile,FILE_IGNORE_NEW_LINES|FILE_SKIP_EMPTY_LINES);
-        if( $lines === false ) {
-                return false;
-        }
-        $s = '/[\s]+/';
-        if( $aSepChar == ',' ) {
-                        $s = '/[\s]*,[\s]*/';
-        }
-        elseif( $aSepChar == ';' ) {
-                        $s = '/[\s]*;[\s]*/';
-        }
-        foreach( $lines as $line => $datarow ) {
-                $split = preg_split($s,$datarow);
-                $aCol1[] = floatval(trim($split[0]));
-                $aCol2[] = floatval(trim($split[1]));
-        }
-
-        return count($lines);
-    }
-
-    // Read data from one columns in a plain text file
-    static function From1Col($aFile, $aCol1) {
-        $lines = @file($aFile,FILE_IGNORE_NEW_LINES|FILE_SKIP_EMPTY_LINES);
-        if( $lines === false ) {
-                return false;
-        }
-        foreach( $lines as $line => $datarow ) {
-                $aCol1[] = floatval(trim($datarow));
-        }
-
-        return count($lines);
-    }
-
-    static function FromMatrix($aFile,$aSepChar=' ') {
-        $lines = @file($aFile,FILE_IGNORE_NEW_LINES|FILE_SKIP_EMPTY_LINES);
-        if( $lines === false ) {
-                return false;
-        }
-        $mat = array();
-        $reg = '/'.$aSepChar.'/';
-        foreach( $lines as $line => $datarow ) {
-                $row = preg_split($reg,trim($datarow));
-                foreach ($row as $key => $cell ) {
-                        $row[$key] = floatval(trim($cell));
-                }
-                $mat[] = $row;
-        }
-        return $mat;
-    }
-
-
-}
-
-define('__LR_EPSILON', 1.0e-8);
-//=============================================================================
-// Class LinearRegression
-//=============================================================================
-class LinearRegression {
-        private $ix=array(),$iy=array();
-        private $ib=0, $ia=0;
-        private $icalculated=false;
-        public $iDet=0, $iCorr=0, $iStdErr=0;
-
-        public function __construct($aDataX,$aDataY) {
-                if( count($aDataX) !== count($aDataY) ) {
-                        JpGraph::Raise('LinearRegression: X and Y data array must be of equal length.');
-                }
-                $this->ix = $aDataX;
-                $this->iy = $aDataY;
-        }
-
-        public function Calc() {
-
-                $this->icalculated = true;
-
-                $n = count($this->ix);
-                $sx2 = 0 ;
-                $sy2 = 0 ;
-                $sxy = 0 ;
-                $sx = 0 ;
-                $sy = 0 ;
-
-                for( $i=0; $i < $n; ++$i ) {
-                        $sx2 += $this->ix[$i] * $this->ix[$i];
-                        $sy2 += $this->iy[$i] * $this->iy[$i];
-                        $sxy += $this->ix[$i] * $this->iy[$i];
-                        $sx += $this->ix[$i];
-                        $sy += $this->iy[$i];
-                }
-
-                if( $n*$sx2 - $sx*$sx > __LR_EPSILON ) {
-                        $this->ib = ($n*$sxy - $sx*$sy) / ( $n*$sx2 - $sx*$sx );
-                        $this->ia = ( $sy - $this->ib*$sx ) / $n;
-
-                        $sx = $this->ib * ( $sxy - $sx*$sy/$n );
-                        $sy2 = $sy2 - $sy*$sy/$n;
-                        $sy = $sy2 - $sx;
-
-                        $this->iDet = $sx / $sy2;
-                        $this->iCorr = sqrt($this->iDet);
-                        if( $n > 2 ) {
-                                $this->iStdErr = sqrt( $sy / ($n-2) );
-                        }
-                        else {
-                                $this->iStdErr = NAN ;
-                        }
-                }
-                else {
-                        $this->ib = 0;
-                        $this->ia = 0;
-                }
-
-        }
-
-        public function GetAB() {
-                if( $this->icalculated == false )
-                        $this->Calc();
-                return array($this->ia, $this->ib);
-        }
-
-        public function GetStat() {
-                if( $this->icalculated == false )
-                        $this->Calc();
-                return array($this->iStdErr, $this->iCorr, $this->iDet);
-        }
-
-        public function GetY($aMinX, $aMaxX, $aStep=1) {
-                if( $this->icalculated == false )
-                        $this->Calc();
-
-                $yy = array();
-                $i = 0;
-                for( $x=$aMinX; $x <= $aMaxX; $x += $aStep ) {
-                        $xx[$i  ] = $x;
-                        $yy[$i++] = $this->ia + $this->ib * $x;
-                }
-
-                return array($xx,$yy);
-        }
-
-}
-
-?>
diff --git a/#jpgraph/src/jpgraph_windrose.php b/#jpgraph/src/jpgraph_windrose.php
deleted file mode 100644
index 8eef2cbe..00000000
--- a/#jpgraph/src/jpgraph_windrose.php
+++ /dev/null
@@ -1,1566 +0,0 @@
-<?php
-/*=======================================================================
- // File:        JPGRAPH_WINDROSE.PHP
- // Description: Windrose extension for JpGraph
- // Created:     2003-09-17
- // Ver:         $Id: jpgraph_windrose.php 1928 2010-01-11 19:56:51Z ljp $
- //
- // Copyright (c) Asial Corporation. All rights reserved.
- //========================================================================
- */
-
-require_once('jpgraph_glayout_vh.inc.php');
-
-//------------------------------------------------------------------------
-// Determine how many compass directions to show
-//------------------------------------------------------------------------
-define('WINDROSE_TYPE4',1);
-define('WINDROSE_TYPE8',2);
-define('WINDROSE_TYPE16',3);
-define('WINDROSE_TYPEFREE',4);
-
-//------------------------------------------------------------------------
-// How should the labels for the circular grids be aligned
-//------------------------------------------------------------------------
-define('LBLALIGN_CENTER',1);
-define('LBLALIGN_TOP',2);
-
-//------------------------------------------------------------------------
-// How should the labels around the plot be align
-//------------------------------------------------------------------------
-define('LBLPOSITION_CENTER',1);
-define('LBLPOSITION_EDGE',2);
-
-//------------------------------------------------------------------------
-// Interpretation of ordinal values in the data
-//------------------------------------------------------------------------
-define('KEYENCODING_CLOCKWISE',1);
-define('KEYENCODING_ANTICLOCKWISE',2);
-
-// Internal debug flag
-define('__DEBUG',false);
-
-
-//===================================================
-// CLASS WindrosePlotScale
-//===================================================
-class WindrosePlotScale {
-    private $iMax,$iDelta=5;
-    private $iNumCirc=3;
-    public $iMaxNum=0;
-    private $iLblFmt='%.0f%%';
-    public $iFontFamily=FF_VERDANA,$iFontStyle=FS_NORMAL,$iFontSize=10;
-    public $iZFontFamily=FF_ARIAL,$iZFontStyle=FS_NORMAL,$iZFontSize=10;
-    public $iFontColor='black',$iZFontColor='black';
-    private $iFontFrameColor=false, $iFontBkgColor=false;
-    private $iLblZeroTxt=null;
-    private $iLblAlign=LBLALIGN_CENTER;
-    public $iAngle='auto';
-    private $iManualScale = false;
-    private $iHideLabels = false;
-
-    function __construct($aData) {
-        $max=0;
-        $totlegsum = 0;
-        $maxnum=0;
-        $this->iZeroSum=0;
-        foreach( $aData as $idx => $legdata ) {
-            $legsum = array_sum($legdata);
-            $maxnum = max($maxnum,count($legdata)-1);
-            $max = max($legsum-$legdata[0],$max);
-            $totlegsum += $legsum;
-            $this->iZeroSum += $legdata[0] ;
-        }
-        if( round($totlegsum) > 100 ) {
-            JpGraphError::RaiseL(22001,$legsum);
-            //("Total percentage for all windrose legs in a windrose plot can not exceed  100% !\n(Current max is: ".$legsum.')');
-        }
-        $this->iMax = $max ;
-        $this->iMaxNum = $maxnum;
-        $this->iNumCirc = $this->GetNumCirc();
-        $this->iMaxVal = $this->iNumCirc * $this->iDelta ;
-    }
-
-    // Return number of grid circles
-    function GetNumCirc() {
-        // Never return less than 1 circles
-        $num = ceil($this->iMax / $this->iDelta);
-        return max(1,$num) ;
-    }
-
-    function SetMaxValue($aMax) {
-        $this->iMax = $aMax;
-        $this->iNumCirc = $this->GetNumCirc();
-        $this->iMaxVal = $this->iNumCirc * $this->iDelta ;
-    }
-
-    // Set step size for circular grid
-    function Set($aMax,$aDelta=null) {
-        if( $aDelta==null ) {
-            $this->SetMaxValue($aMax);
-            return;
-        }
-        $this->iDelta = $aDelta;
-        $this->iNumCirc = ceil($aMax/$aDelta); //$this->GetNumCirc();
-        $this->iMaxVal = $this->iNumCirc * $this->iDelta ;
-        $this->iMax=$aMax;
-        // Remember that user has specified interval so don't
-        // do autoscaling
-        $this->iManualScale = true;
-    }
-
-    function AutoScale($aRadius,$aMinDist=30) {
-
-        if( $this->iManualScale ) return;
-
-        // Make sure distance (in pixels) between two circles
-        // is never less than $aMinDist pixels
-        $tst = ceil($aRadius / $this->iNumCirc) ;
-
-        while( $tst <= $aMinDist && $this->iDelta < 100 ) {
-            $this->iDelta += 5;
-            $tst = ceil($aRadius / $this->GetNumCirc()) ;
-        }
-
-        if( $this->iDelta >= 100 ) {
-            JpGraphError::RaiseL(22002);//('Graph is too small to have a scale. Please make the graph larger.');
-        }
-
-        // If the distance is to large try with multiples of 2 instead
-        if( $tst > $aMinDist * 3 ) {
-            $this->iDelta = 2;
-            $tst = ceil($aRadius / $this->iNumCirc) ;
-
-            while( $tst <= $aMinDist && $this->iDelta < 100 ) {
-                $this->iDelta += 2;
-                $tst = ceil($aRadius / $this->GetNumCirc()) ;
-            }
-
-            if( $this->iDelta >= 100 ) {
-                JpGraphError::RaiseL(22002); //('Graph is too small to have a scale. Please make the graph larger.');
-            }
-        }
-
-        $this->iNumCirc = $this->GetNumCirc();
-        $this->iMaxVal = $this->iNumCirc * $this->iDelta ;
-    }
-
-    // Return max of all leg values
-    function GetMax() {
-        return $this->iMax;
-    }
-
-    function Hide($aFlg=true) {
-        $this->iHideLabels = $aFlg;
-    }
-
-    function SetAngle($aAngle) {
-        $this->iAngle = $aAngle ;
-    }
-
-    // Translate a Leg value to radius distance
-    function RelTranslate($aVal,$r,$ri) {
-        $tv = round($aVal/$this->iMaxVal*($r-$ri));
-        return $tv ;
-    }
-
-    function SetLabelAlign($aAlign) {
-        $this->iLblAlign = $aAlign ;
-    }
-
-    function SetLabelFormat($aFmt) {
-        $this->iLblFmt = $aFmt ;
-    }
-
-    function SetLabelFillColor($aBkgColor,$aBorderColor=false) {
-
-        $this->iFontBkgColor = $aBkgColor;
-        if( $aBorderColor === false ) {
-            $this->iFontFrameColor = $aBkgColor;
-        }
-        else {
-            $this->iFontFrameColor = $aBorderColor;
-        }
-    }
-
-    function SetFontColor($aColor) {
-        $this->iFontColor = $aColor ;
-        $this->iZFontColor = $aColor ;
-    }
-
-    function SetFont($aFontFamily,$aFontStyle=FS_NORMAL,$aFontSize=10) {
-        $this->iFontFamily = $aFontFamily ;
-        $this->iFontStyle = $aFontStyle ;
-        $this->iFontSize = $aFontSize ;
-        $this->SetZFont($aFontFamily,$aFontStyle,$aFontSize);
-    }
-
-    function SetZFont($aFontFamily,$aFontStyle=FS_NORMAL,$aFontSize=10) {
-        $this->iZFontFamily = $aFontFamily ;
-        $this->iZFontStyle = $aFontStyle ;
-        $this->iZFontSize = $aFontSize ;
-    }
-
-    function SetZeroLabel($aTxt) {
-        $this->iLblZeroTxt = $aTxt ;
-    }
-
-    function SetZFontColor($aColor) {
-        $this->iZFontColor = $aColor ;
-    }
-
-    function StrokeLabels($aImg,$xc,$yc,$ri,$rr) {
-
-        if( $this->iHideLabels ) return;
-
-        // Setup some convinient vairables
-        $a = $this->iAngle * M_PI/180.0;
-        $n = $this->iNumCirc;
-        $d = $this->iDelta;
-
-        // Setup the font and font color
-        $val = new Text();
-        $val->SetFont($this->iFontFamily,$this->iFontStyle,$this->iFontSize);
-        $val->SetColor($this->iFontColor);
-
-        if( $this->iFontBkgColor !== false ) {
-            $val->SetBox($this->iFontBkgColor,$this->iFontFrameColor);
-        }
-
-        // Position the labels relative to the radiant circles
-        if( $this->iLblAlign == LBLALIGN_TOP ) {
-            if( $a > 0 && $a <= M_PI/2 ) {
-                $val->SetAlign('left','bottom');
-            }
-            elseif( $a > M_PI/2 && $a <= M_PI ) {
-                $val->SetAlign('right','bottom');
-            }
-        }
-        elseif( $this->iLblAlign == LBLALIGN_CENTER ) {
-            $val->SetAlign('center','center');
-        }
-
-        // Stroke the labels close to each circle
-        $v = $d ;
-        $si = sin($a);
-        $co = cos($a);
-        for( $i=0; $i < $n; ++$i, $v += $d ) {
-            $r = $ri + ($i+1) * $rr;
-            $x = $xc + $co * $r;
-            $y = $yc - $si * $r;
-            $val->Set(sprintf($this->iLblFmt,$v));
-            $val->Stroke($aImg,$x,$y);
-        }
-
-        // Print the text in the zero circle
-        if( $this->iLblZeroTxt === null ) {
-            $this->iLblZeroTxt = sprintf($this->iLblFmt,$this->iZeroSum);
-        }
-        else {
-            $this->iLblZeroTxt = sprintf($this->iLblZeroTxt,$this->iZeroSum);
-        }
-
-        $val->Set($this->iLblZeroTxt);
-        $val->SetAlign('center','center');
-        $val->SetParagraphAlign('center');
-        $val->SetColor($this->iZFontColor);
-        $val->SetFont($this->iZFontFamily,$this->iZFontStyle,$this->iZFontSize);
-        $val->Stroke($aImg,$xc,$yc);
-    }
-}
-
-//===================================================
-// CLASS LegendStyle
-//===================================================
-class LegendStyle {
-    public $iLength = 40, $iMargin = 20 , $iBottomMargin=5;
-    public $iCircleWeight=2,  $iCircleRadius = 18, $iCircleColor='black';
-    public $iTxtFontFamily=FF_VERDANA,$iTxtFontStyle=FS_NORMAL,$iTxtFontSize=8;
-    public $iLblFontFamily=FF_VERDANA,$iLblFontStyle=FS_NORMAL,$iLblFontSize=8;
-    public $iCircleFontFamily=FF_VERDANA,$iCircleFontStyle=FS_NORMAL,$iCircleFontSize=8;
-    public $iLblFontColor='black',$iTxtFontColor='black',$iCircleFontColor='black';
-    public $iShow=true;
-    public $iFormatString='%.1f';
-    public $iTxtMargin=6, $iTxt='';
-    public $iZCircleTxt='Calm';
-
-    function SetFont($aFontFamily,$aFontStyle=FS_NORMAL,$aFontSize=10) {
-        $this->iLblFontFamily = $aFontFamily ;
-        $this->iLblFontStyle = $aFontStyle ;
-        $this->iLblFontSize = $aFontSize ;
-        $this->iTxtFontFamily = $aFontFamily ;
-        $this->iTxtFontStyle = $aFontStyle ;
-        $this->iTxtFontSize = $aFontSize ;
-        $this->iCircleFontFamily = $aFontFamily ;
-        $this->iCircleFontStyle = $aFontStyle ;
-        $this->iCircleFontSize = $aFontSize ;
-    }
-
-    function SetLFont($aFontFamily,$aFontStyle=FS_NORMAL,$aFontSize=10) {
-        $this->iLblFontFamily = $aFontFamily ;
-        $this->iLblFontStyle = $aFontStyle ;
-        $this->iLblFontSize = $aFontSize ;
-    }
-
-    function SetTFont($aFontFamily,$aFontStyle=FS_NORMAL,$aFontSize=10) {
-        $this->iTxtFontFamily = $aFontFamily ;
-        $this->iTxtFontStyle = $aFontStyle ;
-        $this->iTxtFontSize = $aFontSize ;
-    }
-
-    function SetCFont($aFontFamily,$aFontStyle=FS_NORMAL,$aFontSize=10) {
-        $this->iCircleFontFamily = $aFontFamily ;
-        $this->iCircleFontStyle = $aFontStyle ;
-        $this->iCircleFontSize = $aFontSize ;
-    }
-
-
-    function SetFontColor($aColor) {
-        $this->iTxtFontColor = $aColor ;
-        $this->iLblFontColor = $aColor ;
-        $this->iCircleFontColor = $aColor ;
-    }
-
-    function SetTFontColor($aColor) {
-        $this->iTxtFontColor = $aColor ;
-    }
-
-    function SetLFontColor($aColor) {
-        $this->iLblFontColor = $aColor ;
-    }
-
-    function SetCFontColor($aColor) {
-        $this->iCircleFontColor = $aColor ;
-    }
-
-    function SetCircleWeight($aWeight) {
-        $this->iCircleWeight = $aWeight;
-    }
-
-    function SetCircleRadius($aRadius) {
-        $this->iCircleRadius = $aRadius;
-    }
-
-    function SetCircleColor($aColor) {
-        $this->iCircleColor = $aColor ;
-    }
-
-    function SetCircleText($aTxt) {
-        $this->iZCircleTxt = $aTxt;
-    }
-
-    function SetMargin($aMarg,$aBottomMargin=5) {
-        $this->iMargin=$aMarg;
-        $this->iBottomMargin=$aBottomMargin;
-    }
-
-    function SetLength($aLength) {
-        $this->iLength = $aLength ;
-    }
-
-    function Show($aFlg=true) {
-        $this->iShow = $aFlg;
-    }
-
-    function Hide($aFlg=true) {
-        $this->iShow = ! $aFlg;
-    }
-
-    function SetFormat($aFmt) {
-        $this->iFormatString=$aFmt;
-    }
-
-    function SetText($aTxt) {
-        $this->iTxt = $aTxt ;
-    }
-
-}
-
-define('RANGE_OVERLAPPING',0);
-define('RANGE_DISCRETE',1);
-
-//===================================================
-// CLASS WindrosePlot
-//===================================================
-class WindrosePlot {
-    private $iAntiAlias=true;
-    private $iData=array();
-    public $iX=0.5,$iY=0.5;
-    public $iSize=0.55;
-    private $iGridColor1='gray',$iGridColor2='darkgreen';
-    private $iRadialColorArray=array();
-    private $iRadialWeightArray=array();
-    private $iRadialStyleArray=array();
-    private $iRanges = array(1,2,3,5,6,10,13.5,99.0);
-    private $iRangeStyle = RANGE_OVERLAPPING ;
-    public $iCenterSize=60;
-    private $iType = WINDROSE_TYPE16;
-    public $iFontFamily=FF_VERDANA,$iFontStyle=FS_NORMAL,$iFontSize=10;
-    public $iFontColor='darkgray';
-    private $iRadialGridStyle='longdashed';
-    private $iAllDirectionLabels =  array('E','ENE','NE','NNE','N','NNW','NW','WNW','W','WSW','SW','SSW','S','SSE','SE','ESE');
-    private $iStandardDirections = array();
-    private $iCircGridWeight=3, $iRadialGridWeight=1;
-    private $iLabelMargin=12;
-    private $iLegweights = array(2,4,6,8,10,12,14,16,18,20);
-    private $iLegColors = array('orange','black','blue','red','green','purple','navy','yellow','brown');
-    private $iLabelFormatString='', $iLabels=array();
-    private $iLabelPositioning = LBLPOSITION_EDGE;
-    private $iColor='white';
-    private $iShowBox=false, $iBoxColor='black',$iBoxWeight=1,$iBoxStyle='solid';
-    private $iOrdinalEncoding=KEYENCODING_ANTICLOCKWISE;
-    public $legend=null;
-
-    function __construct($aData) {
-        $this->iData = $aData;
-        $this->legend = new LegendStyle();
-
-        // Setup the scale
-        $this->scale = new WindrosePlotScale($this->iData);
-
-        // default label for free type i agle and a degree sign
-        $this->iLabelFormatString = '%.1f'.SymChar::Get('degree');
-
-        $delta = 2*M_PI/16;
-        for( $i=0, $a=0; $i < 16; ++$i, $a += $delta ) {
-            $this->iStandardDirections[$this->iAllDirectionLabels[$i]] = $a;
-        }
-    }
-
-    // Dummy method to make window plots have the same signature as the
-    // layout classes since windrose plots are "leaf" classes in the hierarchy
-    function LayoutSize() {
-        return 1;
-    }
-
-    function SetSize($aSize) {
-        $this->iSize = $aSize;
-    }
-
-    function SetDataKeyEncoding($aEncoding) {
-        $this->iOrdinalEncoding = $aEncoding;
-    }
-
-    function SetColor($aColor) {
-        $this->iColor = $aColor;
-    }
-
-    function SetRadialColors($aColors) {
-        $this->iRadialColorArray = $aColors;
-    }
-
-    function SetRadialWeights($aWeights) {
-        $this->iRadialWeightArray = $aWeights;
-    }
-
-    function SetRadialStyles($aStyles) {
-        $this->iRadialStyleArray = $aStyles;
-    }
-
-    function SetBox($aColor='black',$aWeight=1, $aStyle='solid', $aShow=true) {
-        $this->iShowBox = $aShow ;
-        $this->iBoxColor = $aColor ;
-        $this->iBoxWeight = $aWeight ;
-        $this->iBoxStyle = $aStyle;
-    }
-
-    function SetLabels($aLabels) {
-        $this->iLabels = $aLabels ;
-    }
-
-    function SetLabelMargin($aMarg) {
-        $this->iLabelMargin = $aMarg ;
-    }
-
-    function SetLabelFormat($aLblFormat) {
-        $this->iLabelFormatString = $aLblFormat ;
-    }
-
-    function SetCompassLabels($aLabels) {
-        if( count($aLabels) != 16 ) {
-            JpgraphError::RaiseL(22004); //('Label specification for windrose directions must have 16 values (one for each compass direction).');
-        }
-        $this->iAllDirectionLabels = $aLabels ;
-
-        $delta = 2*M_PI/16;
-        for( $i=0, $a=0; $i < 16; ++$i, $a += $delta ) {
-            $this->iStandardDirections[$this->iAllDirectionLabels[$i]] = $a;
-        }
-
-    }
-
-    function SetCenterSize($aSize) {
-        $this->iCenterSize = $aSize;
-    }
-    // Alias for SetCenterSize
-    function SetZCircleSize($aSize) {
-        $this->iCenterSize = $aSize;
-    }
-
-    function SetFont($aFFam,$aFStyle=FS_NORMAL,$aFSize=10) {
-        $this->iFontFamily = $aFFam ;
-        $this->iFontStyle = $aFStyle ;
-        $this->iFontSize = $aFSize ;
-    }
-
-    function SetFontColor($aColor) {
-        $this->iFontColor=$aColor;
-    }
-
-    function SetGridColor($aColor1,$aColor2) {
-        $this->iGridColor1 = $aColor1;
-        $this->iGridColor2 = $aColor2;
-    }
-
-    function SetGridWeight($aGrid1=1,$aGrid2=2) {
-        $this->iCircGridWeight = $aGrid1 ;
-        $this->iRadialGridWeight = $aGrid2 ;
-    }
-
-    function SetRadialGridStyle($aStyle) {
-        $aStyle = strtolower($aStyle);
-        if( !in_array($aStyle,array('solid','dotted','dashed','longdashed')) ) {
-            JpGraphError::RaiseL(22005); //("Line style for radial lines must be on of ('solid','dotted','dashed','longdashed') ");
-        }
-        $this->iRadialGridStyle=$aStyle;
-    }
-
-    function SetRanges($aRanges) {
-        $this->iRanges = $aRanges;
-    }
-
-    function SetRangeStyle($aStyle) {
-        $this->iRangeStyle = $aStyle;
-    }
-
-    function SetRangeColors($aLegColors) {
-        $this->iLegColors = $aLegColors;
-    }
-
-    function SetRangeWeights($aWeights) {
-        $n=count($aWeights);
-        for($i=0; $i< $n; ++$i ) {
-            $aWeights[$i] = floor($aWeights[$i]/2);
-        }
-        $this->iLegweights = $aWeights;
-
-    }
-
-    function SetType($aType) {
-        if( $aType < WINDROSE_TYPE4 || $aType > WINDROSE_TYPEFREE ) {
-            JpGraphError::RaiseL(22006); //('Illegal windrose type specified.');
-        }
-        $this->iType = $aType;
-    }
-
-    // Alias for SetPos()
-    function SetCenterPos($aX,$aY) {
-        $this->iX = $aX;
-        $this->iY = $aY;        
-    }
-    
-    function SetPos($aX,$aY) {
-        $this->iX = $aX;
-        $this->iY = $aY;
-    }
-
-    function SetAntiAlias($aFlag) {
-        $this->iAntiAlias = $aFlag ;
-        if( ! $aFlag )
-        $this->iCircGridWeight = 1;
-    }
-
-    function _ThickCircle($aImg,$aXC,$aYC,$aRad,$aWeight=2,$aColor) {
-
-        $aImg->SetColor($aColor);
-        $aRad *= 2 ;
-        $aImg->Ellipse($aXC,$aYC,$aRad,$aRad);
-        if( $aWeight > 1 ) {
-            $aImg->Ellipse($aXC,$aYC,$aRad+1,$aRad+1);
-            $aImg->Ellipse($aXC,$aYC,$aRad+2,$aRad+2);
-            if( $aWeight > 2 ) {
-                $aImg->Ellipse($aXC,$aYC,$aRad+3,$aRad+3);
-                $aImg->Ellipse($aXC,$aYC,$aRad+3,$aRad+4);
-                $aImg->Ellipse($aXC,$aYC,$aRad+4,$aRad+3);
-            }
-        }
-    }
-
-    function _StrokeWindLeg($aImg,$xc,$yc,$a,$ri,$r,$weight,$color) {
-
-        // If less than 1 px long then we assume this has been caused by rounding problems
-        // and should not be stroked
-        if( $r < 1 ) return;
-
-        $xt = $xc + cos($a)*$ri;
-        $yt = $yc - sin($a)*$ri;
-        $xxt = $xc + cos($a)*($ri+$r);
-        $yyt = $yc - sin($a)*($ri+$r);
-
-        $x1 = $xt - $weight*sin($a);
-        $y1 = $yt - $weight*cos($a);
-        $x2 = $xxt - $weight*sin($a);
-        $y2 = $yyt - $weight*cos($a);
-
-        $x3 = $xxt + $weight*sin($a);
-        $y3 = $yyt + $weight*cos($a);
-        $x4 = $xt + $weight*sin($a);
-        $y4 = $yt + $weight*cos($a);
-
-        $pts = array($x1,$y1,$x2,$y2,$x3,$y3,$x4,$y4);
-        $aImg->SetColor($color);
-        $aImg->FilledPolygon($pts);
-
-    }
-
-    function _StrokeLegend($aImg,$x,$y,$scaling=1,$aReturnWidth=false) {
-
-        if( ! $this->legend->iShow ) return 0;
-
-        $nlc = count($this->iLegColors);
-        $nlw = count($this->iLegweights);
-
-        // Setup font for ranges
-        $value = new Text();
-        $value->SetAlign('center','bottom');
-        $value->SetFont($this->legend->iLblFontFamily,
-        $this->legend->iLblFontStyle,
-        $this->legend->iLblFontSize*$scaling);
-        $value->SetColor($this->legend->iLblFontColor);
-
-        // Remember x-center
-        $xcenter = $x ;
-
-        // Construct format string
-        $fmt = $this->legend->iFormatString.'-'.$this->legend->iFormatString;
-
-        // Make sure that the length of each range is enough to cover the
-        // size of the labels
-        $tst = sprintf($fmt,$this->iRanges[0],$this->iRanges[1]);
-        $value->Set($tst);
-        $w = $value->GetWidth($aImg);
-        $l = round(max($this->legend->iLength * $scaling,$w*1.5));
-
-        $r = $this->legend->iCircleRadius * $scaling ;
-        $len = 2*$r + $this->scale->iMaxNum * $l;
-
-        // We are called just to find out the width
-        if( $aReturnWidth ) return $len;
-
-        $x -= round($len/2);
-        $x += $r;
-
-        // 4 pixels extra vertical margin since the circle sometimes is +/- 1 pixel of the
-        // theorethical radius due to imperfection in the GD library
-        //$y -= round(max($r,$scaling*$this->iLegweights[($this->scale->iMaxNum-1) % $nlw])+4*$scaling);
-        $y -= ($this->legend->iCircleRadius + 2)*$scaling+$this->legend->iBottomMargin*$scaling;
-
-        // Adjust for bottom text
-        if( $this->legend->iTxt != '' ) {
-            // Setup font for text
-            $value->Set($this->legend->iTxt);
-            $y -= /*$this->legend->iTxtMargin + */ $value->GetHeight($aImg);
-        }
-
-        // Stroke 0-circle
-        $this->_ThickCircle($aImg,$x,$y,$r,$this->legend->iCircleWeight,
-        $this->legend->iCircleColor);
-
-        // Remember the center of the circe
-        $xc=$x; $yc=$y;
-
-        $value->SetAlign('center','bottom');
-        $x += $r+1;
-
-        // Stroke all used ranges
-        $txty = $y -
-        round($this->iLegweights[($this->scale->iMaxNum-1)%$nlw]*$scaling) - 4*$scaling;
-        if( $this->scale->iMaxNum >= count($this->iRanges) ) {
-            JpGraphError::RaiseL(22007); //('To few values for the range legend.');
-        }
-        $i=0;$idx=0;
-        while( $i < $this->scale->iMaxNum ) {
-            $y1 = $y - round($this->iLegweights[$i % $nlw]*$scaling);
-            $y2 = $y + round($this->iLegweights[$i % $nlw]*$scaling);
-            $x2 = $x + $l ;
-            $aImg->SetColor($this->iLegColors[$i % $nlc]);
-            $aImg->FilledRectangle($x,$y1,$x2,$y2);
-            if( $this->iRangeStyle == RANGE_OVERLAPPING ) {
-                $lbl = sprintf($fmt,$this->iRanges[$idx],$this->iRanges[$idx+1]);
-            }
-            else {
-                $lbl = sprintf($fmt,$this->iRanges[$idx],$this->iRanges[$idx+1]);
-                ++$idx;
-            }
-            $value->Set($lbl);
-            $value->Stroke($aImg,$x+$l/2,$txty);
-            $x = $x2;
-            ++$i;++$idx;
-        }
-
-        // Setup circle font
-        $value->SetFont($this->legend->iCircleFontFamily,
-        $this->legend->iCircleFontStyle,
-        $this->legend->iCircleFontSize*$scaling);
-        $value->SetColor($this->legend->iCircleFontColor);
-
-        // Stroke 0-circle text
-        $value->Set($this->legend->iZCircleTxt);
-        $value->SetAlign('center','center');
-        $value->ParagraphAlign('center');
-        $value->Stroke($aImg,$xc,$yc);
-
-        // Setup circle font
-        $value->SetFont($this->legend->iTxtFontFamily,
-        $this->legend->iTxtFontStyle,
-        $this->legend->iTxtFontSize*$scaling);
-        $value->SetColor($this->legend->iTxtFontColor);
-
-        // Draw the text under the legend
-        $value->Set($this->legend->iTxt);
-        $value->SetAlign('center','top');
-        $value->SetParagraphAlign('center');
-        $value->Stroke($aImg,$xcenter,$y2+$this->legend->iTxtMargin*$scaling);
-    }
-
-    function SetAutoScaleAngle($aIsRegRose=true) {
-
-        // If the user already has manually set an angle don't
-        // trye to find a position
-        if( is_numeric($this->scale->iAngle) )
-            return;
-
-        if( $aIsRegRose ) {
-
-            // Create a complete data for all directions
-            // and translate string directions to ordinal values.
-            // This will much simplify the logic below
-            for( $i=0; $i < 16; ++$i ) {
-                $dtxt = $this->iAllDirectionLabels[$i];
-                if( !empty($this->iData[$dtxt]) ) {
-                    $data[$i] = $this->iData[$dtxt];
-                }
-                elseif( !empty($this->iData[strtolower($dtxt)]) ) {
-                    $data[$i] = $this->iData[strtolower($dtxt)];
-                }
-                elseif( !empty($this->iData[$i]) ) {
-                    $data[$i] = $this->iData[$i];
-                }
-                else {
-                    $data[$i] = array();
-                }
-            }
-
-            // Find the leg which has the lowest weighted sum of number of data around it
-            $c0 = array_sum($data[0]);
-            $c1 = array_sum($data[1]);
-            $found = 1;
-            $min = $c0+$c1*100; // Initialize to a high value
-            for( $i=1; $i < 15; ++$i ) {
-                $c2 = array_sum($data[$i+1]);
-
-                // Weight the leg we will use more to give preference
-                // to a short middle leg even if the 3 way sum is similair
-                $w = $c0 + 3*$c1 + $c2 ;
-                if( $w < $min ) {
-                    $min = $w;
-                    $found = $i;
-                }
-                $c0 = $c1;
-                $c1 = $c2;
-            }
-            $this->scale->iAngle = $found*22.5;
-        }
-        else {
-            $n = count($this->iData);
-            foreach( $this->iData as $dir => $leg ) {
-                if( !is_numeric($dir) ) {
-                    $pos = array_search(strtoupper($dir),$this->iAllDirectionLabels);
-                    if( $pos !== false ) {
-                        $dir = $pos*22.5;
-                    }
-                }
-                $data[round($dir)] = $leg;
-            }
-
-            // Get all the angles for the data and sort it
-            $keys = array_keys($data);
-            sort($keys, SORT_NUMERIC);
-
-            $n = count($data);
-            $found = false;
-            $max = 0 ;
-            for( $i=0; $i < 15; ++$i ) {
-                $try_a = round(22.5*$i);
-
-                if( $try_a > $keys[$n-1] ) break;
-
-                if( in_array($try_a,$keys) ) continue;
-
-                // Find the angle just lower than this
-                $j=0;
-                while( $j < $n && $keys[$j] <= $try_a ) ++$j;
-                if( $j == 0 ) {
-                    $kj = 0; $keys[$n-1];
-                    $d1 = 0; abs($kj-$try_a);
-                }
-                else {
-                    --$j;
-                    $kj = $keys[$j];
-                    $d1 = abs($kj-$try_a);
-                }
-
-                // Find the angle just larger than this
-                $l=$n-1;
-                while( $l >= 0 && $keys[$l] >= $try_a ) --$l;
-                if( $l == $n-1) {
-                    $kl = $keys[0];
-                    $d2 = abs($kl-$try_a);
-                }
-                else {
-                    ++$l;
-                    $kl = $keys[$l];
-                    $d2 = abs($kl-$try_a);
-                }
-
-                // Weight the distance so that legs with large spread
-                // gets a better weight
-                $w = $d1 + $d2;
-                if( $i == 0 ) {
-                    $w = round(1.4 * $w);
-                }
-                $diff = abs($d1 - $d2);
-                $w *= (360-$diff);
-                if( $w > $max ) {
-                    $found = $i;
-                    $max = $w;
-                }
-            }
-
-            $a = $found*22.5;
-
-            // Some heuristics to have some preferred positions
-            if( $keys[$n-1] < 25 ) $a = 45;
-            elseif( $keys[0] > 60 ) $a = 45;
-            elseif( $keys[0] > 25 && $keys[$n-1] < 340 ) $a = 0;
-            elseif( $keys[$n-1] < 75 ) $a = 90;
-            elseif( $keys[$n-1] < 120 ) $a = 135;
-            elseif( $keys[$n-1] < 160 ) $a = 180;
-
-            $this->scale->iAngle = $a ;
-        }
-    }
-
-    function NormAngle($a) {
-        while( $a > 360 ) {
-            $a -= 360;
-        }
-        return $a;
-    }
-
-    function SetLabelPosition($aPos) {
-        $this->iLabelPositioning  = $aPos ;
-    }
-
-    function _StrokeFreeRose($dblImg,$value,$scaling,$xc,$yc,$r,$ri) {
-
-        // Plot radial grid lines and remember the end position
-        // and the angle for later use when plotting the labels
-        if( $this->iType != WINDROSE_TYPEFREE ) {
-            JpGraphError::RaiseL(22008); //('Internal error: Trying to plot free Windrose even though type is not a free windorose');
-        }
-
-        // Check if we should auto-position the angle for the
-        // labels. Basically we try to find a firection with smallest
-        // (or none) data.
-        $this->SetAutoScaleAngle(false);
-
-        $nlc = count($this->iLegColors);
-        $nlw = count($this->iLegweights);
-
-        // Stroke grid lines for directions and remember the
-        // position for the labels
-        $txtpos=array();
-        $num = count($this->iData);
-
-        $keys = array_keys($this->iData);
-
-        foreach( $this->iData as $dir => $legdata ) {
-            if( in_array($dir,$this->iAllDirectionLabels,true) === true) {
-                $a = $this->iStandardDirections[strtoupper($dir)];
-                if( in_array($a*180/M_PI,$keys) ) {
-                    JpGraphError::RaiseL(22009,round($a*180/M_PI));
-                    //('You have specified the same direction twice, once with an angle and once with a compass direction ('.$a*180/M_PI.' degrees.)');
-                }
-            }
-            elseif( is_numeric($dir) ) {
-                $this->NormAngle($dir);
-
-                if( $this->iOrdinalEncoding == KEYENCODING_CLOCKWISE ) {
-                    $dir = 360-$dir;
-                }
-
-                $a = $dir * M_PI/180;
-            }
-            else {
-                JpGraphError::RaiseL(22010);//('Direction must either be a numeric value or one of the 16 compass directions');
-            }
-
-            $xxc = round($xc + cos($a)*$ri);
-            $yyc = round($yc - sin($a)*$ri);
-            $x = round($xc + cos($a)*$r);
-            $y = round($yc - sin($a)*$r);
-            if( empty($this->iRadialColorArray[$dir]) ) {
-                $dblImg->SetColor($this->iGridColor2);
-            }
-            else {
-                $dblImg->SetColor($this->iRadialColorArray[$dir]);
-            }
-            if( empty($this->iRadialWeightArray[$dir]) ) {
-                $dblImg->SetLineWeight($this->iRadialGridWeight);
-            }
-            else {
-                $dblImg->SetLineWeight($this->iRadialWeightArray[$dir]);
-            }
-            if( empty($this->iRadialStyleArray[$dir]) ) {
-                $dblImg->SetLineStyle($this->iRadialGridStyle);
-            }
-            else {
-                $dblImg->SetLineStyle($this->iRadialStyleArray[$dir]);
-            }
-            $dblImg->StyleLine($xxc,$yyc,$x,$y);
-            $txtpos[] = array($x,$y,$a);
-        }
-        $dblImg->SetLineWeight(1);
-
-        // Setup labels
-        $lr = $scaling * $this->iLabelMargin;
-
-        if( $this->iLabelPositioning == LBLPOSITION_EDGE ) {
-            $value->SetAlign('left','top');
-        }
-        else {
-            $value->SetAlign('center','center');
-            $value->SetMargin(0);
-        }
-
-        for($i=0; $i < $num; ++$i ) {
-
-            list($x,$y,$a) = $txtpos[$i];
-
-            // Determine the label
-
-            $da = $a*180/M_PI;
-            if( $this->iOrdinalEncoding == KEYENCODING_CLOCKWISE ) {
-                $da = 360 - $da;
-            }
-
-            //$da = 360-$da;
-            
-            if( !empty($this->iLabels[$keys[$i]]) ) {
-                $lbl = $this->iLabels[$keys[$i]];
-            }
-            else {
-                $lbl = sprintf($this->iLabelFormatString,$da);
-            }
-
-            if( $this->iLabelPositioning == LBLPOSITION_CENTER ) {
-                $dx = $dy = 0;
-            }
-            else {
-                // LBLPOSIITON_EDGE
-                if( $a>=7*M_PI/4 || $a <= M_PI/4 ) $dx=0;
-                if( $a>=M_PI/4 && $a <= 3*M_PI/4 ) $dx=($a-M_PI/4)*2/M_PI;
-                if( $a>=3*M_PI/4 && $a <= 5*M_PI/4 ) $dx=1;
-                if( $a>=5*M_PI/4 && $a <= 7*M_PI/4 ) $dx=(1-($a-M_PI*5/4)*2/M_PI);
-
-                if( $a>=7*M_PI/4 ) $dy=(($a-M_PI)-3*M_PI/4)*2/M_PI;
-                if( $a<=M_PI/4 ) $dy=(0.5+$a*2/M_PI);
-                if( $a>=M_PI/4 && $a <= 3*M_PI/4 ) $dy=1;
-                if( $a>=3*M_PI/4 && $a <= 5*M_PI/4 ) $dy=(1-($a-3*M_PI/4)*2/M_PI);
-                if( $a>=5*M_PI/4 && $a <= 7*M_PI/4 ) $dy=0;
-            }
-
-            $value->Set($lbl);
-            $th = $value->GetHeight($dblImg);
-            $tw = $value->GetWidth($dblImg);
-            $xt=round($lr*cos($a)+$x) - $dx*$tw;
-            $yt=round($y-$lr*sin($a)) - $dy*$th;
-
-            $value->Stroke($dblImg,$xt,$yt);
-        }
-
-        if( __DEBUG ) {
-            $dblImg->SetColor('red');
-            $dblImg->Circle($xc,$yc,$lr+$r);
-        }
-
-        // Stroke all the legs
-        reset($this->iData);
-        $i=0;
-        foreach($this->iData as $dir => $legdata) {
-            $legdata = array_slice($legdata,1);
-            $nn = count($legdata);
-
-            $a = $txtpos[$i][2];
-            $rri = $ri/$scaling;
-            for( $j=0; $j < $nn; ++$j ) {
-                // We want the non scaled original radius
-                $legr = $this->scale->RelTranslate($legdata[$j],$r/$scaling,$ri/$scaling) ;
-                $this->_StrokeWindLeg($dblImg, $xc, $yc, $a,
-                $rri *$scaling,
-                $legr *$scaling,
-                $this->iLegweights[$j % $nlw] * $scaling,
-                $this->iLegColors[$j % $nlc]);
-                $rri += $legr;
-            }
-            ++$i;
-        }
-    }
-
-    // Translate potential string specified compass labels to their
-    // corresponding index.
-    function FixupIndexes($aDataArray,$num) {
-        $ret = array();
-        $keys = array_keys($aDataArray);
-        foreach($aDataArray as $idx => $data) {
-            if( is_string($idx) ) {
-                $idx = strtoupper($idx);
-                $res = array_search($idx,$this->iAllDirectionLabels);
-                if( $res === false ) {
-                    JpGraphError::RaiseL(22011,$idx); //('Windrose index must be numeric or direction label. You have specified index='.$idx);
-                }
-                $idx = $res;
-                if( $idx % (16 / $num) !== 0 ) {
-                    JpGraphError::RaiseL(22012); //('Windrose radial axis specification contains a direction which is not enabled.');
-                }
-                $idx /= (16/$num) ;
-
-                if( in_array($idx,$keys,1) ) {
-                    JpgraphError::RaiseL(22013,$idx); //('You have specified the look&feel for the same compass direction twice, once with text and once with index (Index='.$idx.')');
-                }
-            }
-            if( $idx < 0 || $idx > 15 ) {
-                JpgraphError::RaiseL(22014); //('Index for copmass direction must be between 0 and 15.');
-            }
-            $ret[$idx] = $data;
-        }
-        return $ret;
-    }
-
-    function _StrokeRegularRose($dblImg,$value,$scaling,$xc,$yc,$r,$ri) {
-        // _StrokeRegularRose($dblImg,$xc,$yc,$r,$ri)
-        // Plot radial grid lines and remember the end position
-        // and the angle for later use when plotting the labels
-        switch( $this->iType ) {
-            case WINDROSE_TYPE4:
-                $num = 4; break;
-            case WINDROSE_TYPE8:
-                $num = 8; break;
-            case WINDROSE_TYPE16:
-                $num = 16; break;
-            default:
-                JpGraphError::RaiseL(22015);//('You have specified an undefined Windrose plot type.');
-        }
-
-        // Check if we should auto-position the angle for the
-        // labels. Basically we try to find a firection with smallest
-        // (or none) data.
-        $this->SetAutoScaleAngle(true);
-
-        $nlc = count($this->iLegColors);
-        $nlw = count($this->iLegweights);
-
-        $this->iRadialColorArray = $this->FixupIndexes($this->iRadialColorArray,$num);
-        $this->iRadialWeightArray = $this->FixupIndexes($this->iRadialWeightArray,$num);
-        $this->iRadialStyleArray = $this->FixupIndexes($this->iRadialStyleArray,$num);
-
-        $txtpos=array();
-        $a = 2*M_PI/$num;
-        $dblImg->SetColor($this->iGridColor2);
-        $dblImg->SetLineStyle($this->iRadialGridStyle);
-        $dblImg->SetLineWeight($this->iRadialGridWeight);
-
-        // Translate any name specified directions to the index
-        // so we can easily use it in the loop below
-        for($i=0; $i < $num; ++$i ) {
-            $xxc = round($xc + cos($a*$i)*$ri);
-            $yyc = round($yc - sin($a*$i)*$ri);
-            $x = round($xc + cos($a*$i)*$r);
-            $y = round($yc - sin($a*$i)*$r);
-            if( empty($this->iRadialColorArray[$i]) ) {
-                $dblImg->SetColor($this->iGridColor2);
-            }
-            else {
-                $dblImg->SetColor($this->iRadialColorArray[$i]);
-            }
-            if( empty($this->iRadialWeightArray[$i]) ) {
-                $dblImg->SetLineWeight($this->iRadialGridWeight);
-            }
-            else {
-                $dblImg->SetLineWeight($this->iRadialWeightArray[$i]);
-            }
-            if( empty($this->iRadialStyleArray[$i]) ) {
-                $dblImg->SetLineStyle($this->iRadialGridStyle);
-            }
-            else {
-                $dblImg->SetLineStyle($this->iRadialStyleArray[$i]);
-            }
-
-            $dblImg->StyleLine($xxc,$yyc,$x,$y);
-            $txtpos[] = array($x,$y,$a*$i);
-        }
-        $dblImg->SetLineWeight(1);
-
-        $lr = $scaling * $this->iLabelMargin;
-        if( $this->iLabelPositioning == LBLPOSITION_CENTER ) {
-            $value->SetAlign('center','center');
-        }
-        else {
-            $value->SetAlign('left','top');
-            $value->SetMargin(0);
-            $lr /= 2 ;
-        }
-
-        for($i=0; $i < $num; ++$i ) {
-            list($x,$y,$a) = $txtpos[$i];
-
-            // Set the position of the label
-            if( $this->iLabelPositioning == LBLPOSITION_CENTER ) {
-                $dx = $dy = 0;
-            }
-            else {
-                // LBLPOSIITON_EDGE
-                if( $a>=7*M_PI/4 || $a <= M_PI/4 ) $dx=0;
-                if( $a>=M_PI/4 && $a <= 3*M_PI/4 ) $dx=($a-M_PI/4)*2/M_PI;
-                if( $a>=3*M_PI/4 && $a <= 5*M_PI/4 ) $dx=1;
-                if( $a>=5*M_PI/4 && $a <= 7*M_PI/4 ) $dx=(1-($a-M_PI*5/4)*2/M_PI);
-
-                if( $a>=7*M_PI/4 ) $dy=(($a-M_PI)-3*M_PI/4)*2/M_PI;
-                if( $a<=M_PI/4 ) $dy=(0.5+$a*2/M_PI);
-                if( $a>=M_PI/4 && $a <= 3*M_PI/4 ) $dy=1;
-                if( $a>=3*M_PI/4 && $a <= 5*M_PI/4 ) $dy=(1-($a-3*M_PI/4)*2/M_PI);
-                if( $a>=5*M_PI/4 && $a <= 7*M_PI/4 ) $dy=0;
-            }
-
-            $value->Set($this->iAllDirectionLabels[$i*(16/$num)]);
-            $th = $value->GetHeight($dblImg);
-            $tw = $value->GetWidth($dblImg);
-            $xt=round($lr*cos($a)+$x) - $dx*$tw;
-            $yt=round($y-$lr*sin($a)) - $dy*$th;
-
-            $value->Stroke($dblImg,$xt,$yt);
-        }
-
-        if( __DEBUG ) {
-            $dblImg->SetColor("red");
-            $dblImg->Circle($xc,$yc,$lr+$r);
-        }
-
-        // Stroke all the legs
-        reset($this->iData);
-        $keys = array_keys($this->iData);
-        foreach($this->iData as $idx => $legdata) {
-            $legdata = array_slice($legdata,1);
-            $nn = count($legdata);
-            if( is_string($idx) ) {
-                $idx = strtoupper($idx);
-                $idx = array_search($idx,$this->iAllDirectionLabels);
-                if( $idx === false ) {
-                    JpGraphError::RaiseL(22016);//('Windrose leg index must be numeric or direction label.');
-                }
-                if( $idx % (16 / $num) !== 0 ) {
-                    JpGraphError::RaiseL(22017);//('Windrose data contains a direction which is not enabled. Please adjust what labels are displayed.');
-                }
-                $idx /= (16/$num) ;
-
-                if( in_array($idx,$keys,1) ) {
-                    JpgraphError::RaiseL(22018,$idx);//('You have specified data for the same compass direction twice, once with text and once with index (Index='.$idx.')');
-
-                }
-            }
-            if( $idx < 0 || $idx > 15 ) {
-                JpgraphError::RaiseL(22019);//('Index for direction must be between 0 and 15. You can\'t specify angles for a Regular Windplot, only index and compass directions.');
-            }
-            $a = $idx * (360 / $num) ;
-            $a *= M_PI/180.0;
-            $rri = $ri/$scaling;
-            for( $j=0; $j < $nn; ++$j ) {
-                // We want the non scaled original radius
-                $legr = $this->scale->RelTranslate($legdata[$j], $r/$scaling,$ri/$scaling) ;
-                $this->_StrokeWindLeg($dblImg, $xc, $yc, $a,
-                $rri *$scaling,
-                $legr *$scaling,
-                $this->iLegweights[$j % $nlw] * $scaling,
-                $this->iLegColors[$j % $nlc]);
-                $rri += $legr;
-            }
-        }
-    }
-
-
-    function getWidth($aImg) {
-
-        $scaling = 1;//$this->iAntiAlias ? 2 : 1 ;
-       	if( $this->iSize > 0 && $this->iSize < 1 ) {
-			$this->iSize *= min($aImg->width,$aImg->height);
-       	}
-
-
-        $value = new Text();
-        $value->SetFont($this->iFontFamily,$this->iFontStyle,$this->iFontSize*$scaling);
-        $value->SetColor($this->iFontColor);
-        // Setup extra size around the graph needed so that the labels
-        // doesn't get cut. For this we need to find the largest label.
-        // The code below gives a possible a little to large margin. The
-        // really, really proper way would be to account for what angle
-        // the label are at
-        $n = count($this->iLabels);
-        if( $n > 0 ) {
-            $maxh=0;$maxw=0;
-            foreach($this->iLabels as $key => $lbl) {
-                $value->Set($lbl);
-                $maxw = max($maxw,$value->GetWidth($aImg));
-            }
-        }
-        else {
-            $value->Set('888.888'); // Dummy value to get width/height
-            $maxw = $value->GetWidth($aImg);
-        }
-        // Add an extra margin of 50% the font size
-        $maxw += round($this->iFontSize*$scaling * 0.4) ;
-
-        $valxmarg = 1.5*$maxw+2*$this->iLabelMargin*$scaling;
-        $w = round($this->iSize*$scaling + $valxmarg);
-
-        // Make sure that the width of the legend fits
-        $legendwidth = $this->_StrokeLegend($aImg,0,0,$scaling,true)+10*$scaling;
-        $w = max($w,$legendwidth);
-
-        return $w;
-    }
-
-    function getHeight($aImg) {
-
-        $scaling = 1;//$this->iAntiAlias ? 2 : 1 ;
-       	if( $this->iSize > 0 && $this->iSize < 1 ) {
-			$this->iSize *= min($aImg->width,$aImg->height);
-       	}
-
-        $value = new Text();
-        $value->SetFont($this->iFontFamily,$this->iFontStyle,$this->iFontSize*$scaling);
-        $value->SetColor($this->iFontColor);
-        // Setup extra size around the graph needed so that the labels
-        // doesn't get cut. For this we need to find the largest label.
-        // The code below gives a possible a little to large margin. The
-        // really, really proper way would be to account for what angle
-        // the label are at
-        $n = count($this->iLabels);
-        if( $n > 0 ) {
-            $maxh=0;$maxw=0;
-            foreach($this->iLabels as $key => $lbl) {
-                $value->Set($lbl);
-                $maxh = max($maxh,$value->GetHeight($aImg));
-            }
-        }
-        else {
-            $value->Set('180.8'); // Dummy value to get width/height
-            $maxh = $value->GetHeight($aImg);
-        }
-        // Add an extra margin of 50% the font size
-        //$maxh += round($this->iFontSize*$scaling * 0.5) ;
-        $valymarg = 2*$maxh+2*$this->iLabelMargin*$scaling;
-
-        $legendheight = round($this->legend->iShow ? 1 : 0);
-        $legendheight *= max($this->legend->iCircleRadius*2,$this->legend->iTxtFontSize*2)+
-        				 $this->legend->iMargin + $this->legend->iBottomMargin + 2;
-        $legendheight *= $scaling;
-        $h = round($this->iSize*$scaling + $valymarg) + $legendheight ;
-
-        return $h;
-    }
-
-    function Stroke($aGraph) {
-
-		$aImg = $aGraph->img;
-
-		if( $this->iX > 0 && $this->iX < 1 ) {
-			$this->iX = round( $aImg->width * $this->iX ) ;
-		}
-
-       	if( $this->iY > 0 && $this->iY < 1 ) {
-       		$this->iY = round( $aImg->height * $this->iY ) ;
-       	}
-
-       	if( $this->iSize > 0 && $this->iSize < 1 ) {
-			$this->iSize *= min($aImg->width,$aImg->height);
-       	}
-
-       	if( $this->iCenterSize > 0 && $this->iCenterSize < 1 ) {
-			$this->iCenterSize *= $this->iSize;
-       	}
-
-        $this->scale->AutoScale(($this->iSize - $this->iCenterSize)/2, round(2.5*$this->scale->iFontSize));
-
-        $scaling = $this->iAntiAlias ? 2 : 1 ;
-
-        $value = new Text();
-        $value->SetFont($this->iFontFamily,$this->iFontStyle,$this->iFontSize*$scaling);
-        $value->SetColor($this->iFontColor);
-
-        $legendheight = round($this->legend->iShow ? 1 : 0);
-        $legendheight *= max($this->legend->iCircleRadius*2,$this->legend->iTxtFontSize*2)+
-        $this->legend->iMargin + $this->legend->iBottomMargin + 2;
-        $legendheight *= $scaling;
-
-        $w = $scaling*$this->getWidth($aImg);
-        $h = $scaling*$this->getHeight($aImg);
-
-        // Copy back the double buffered image to the proper canvas
-        $ww = $w / $scaling ;
-        $hh = $h / $scaling ;
-
-        // Create the double buffer
-        if( $this->iAntiAlias ) {
-            $dblImg = new RotImage($w,$h);
-            // Set the background color
-            $dblImg->SetColor($this->iColor);
-            $dblImg->FilledRectangle(0,0,$w,$h);
-        }
-        else {
-            $dblImg = $aImg ;
-            // Make sure the ix and it coordinates correpond to the new top left center
-            $dblImg->SetTranslation($this->iX-$w/2, $this->iY-$h/2);
-        }
-
-        if( __DEBUG ) {
-            $dblImg->SetColor('red');
-            $dblImg->Rectangle(0,0,$w-1,$h-1);
-        }
-
-        $dblImg->SetColor('black');
-
-        if( $this->iShowBox ) {
-            $dblImg->SetColor($this->iBoxColor);
-            $old = $dblImg->SetLineWeight($this->iBoxWeight);
-            $dblImg->SetLineStyle($this->iBoxStyle);
-            $dblImg->Rectangle(0,0,$w-1,$h-1);
-            $dblImg->SetLineWeight($old);
-        }
-
-        $xc = round($w/2);
-        $yc = round(($h-$legendheight)/2);
-
-        if( __DEBUG ) {
-            $dblImg->SetColor('red');
-            $old = $dblImg->SetLineWeight(2);
-            $dblImg->Line($xc-5,$yc-5,$xc+5,$yc+5);
-			$dblImg->Line($xc+5,$yc-5,$xc-5,$yc+5);
-			$dblImg->SetLineWeight($old);
-        }
-
-        $this->iSize *= $scaling;
-
-        // Inner circle size
-        $ri = $this->iCenterSize/2 ;
-
-        // Full circle radius
-        $r = round( $this->iSize/2 );
-
-        // Get number of grid circles
-        $n = $this->scale->GetNumCirc();
-
-        // Plot circle grids
-        $ri *= $scaling ;
-        $rr = round(($r-$ri)/$n);
-        for( $i = 1; $i <= $n; ++$i ) {
-            $this->_ThickCircle($dblImg,$xc,$yc,$rr*$i+$ri,
-            $this->iCircGridWeight,$this->iGridColor1);
-        }
-
-        $num = 0 ;
-
-        if( $this->iType == WINDROSE_TYPEFREE ) {
-            $this->_StrokeFreeRose($dblImg,$value,$scaling,$xc,$yc,$r,$ri);
-        }
-        else {
-            // Check if we need to re-code the interpretation of the ordinal
-            // number in the data. Internally ordinal value 0 is East and then
-            // counted anti-clockwise. The user might choose an encoding
-            // that have 0 being the first axis to the right of the "N" axis and then
-            // counted clock-wise
-            if( $this->iOrdinalEncoding == KEYENCODING_CLOCKWISE ) {
-                if( $this->iType == WINDROSE_TYPE16 ) {
-                    $const1 = 19; $const2 = 16;
-                }
-                elseif( $this->iType == WINDROSE_TYPE8 ) {
-                    $const1 = 9; $const2 = 8;
-                }
-                else {
-                    $const1 = 4; $const2 = 4;
-                }
-                $tmp = array();
-                $n=count($this->iData);
-                foreach( $this->iData as $key => $val ) {
-                    if( is_numeric($key) ) {
-                        $key = ($const1 - $key) % $const2 ;
-                    }
-                    $tmp[$key] = $val;
-                }
-                $this->iData = $tmp;
-            }
-            $this->_StrokeRegularRose($dblImg,$value,$scaling,$xc,$yc,$r,$ri);
-        }
-
-        // Stroke the labels
-        $this->scale->iFontSize *= $scaling;
-        $this->scale->iZFontSize *= $scaling;
-        $this->scale->StrokeLabels($dblImg,$xc,$yc,$ri,$rr);
-
-        // Stroke the inner circle again since the legs
-        // might have written over it
-        $this->_ThickCircle($dblImg,$xc,$yc,$ri,$this->iCircGridWeight,$this->iGridColor1);
-
-        if( $ww > $aImg->width ) {
-            JpgraphError::RaiseL(22020);
-            //('Windrose plot is too large to fit the specified Graph size. Please use WindrosePlot::SetSize() to make the plot smaller or increase the size of the Graph in the initial WindroseGraph() call.');
-        }
-
-        $x = $xc;
-        $y = $h;
-        $this->_StrokeLegend($dblImg,$x,$y,$scaling);
-
-        if( $this->iAntiAlias ) {
-            $aImg->Copy($dblImg->img, $this->iX-$ww/2, $this->iY-$hh/2, 0, 0, $ww,$hh, $w,$h);
-        }
-
-        // We need to restore the translation matrix
-        $aImg->SetTranslation(0,0);
-
-    }
-
-}
-
-//============================================================
-// CLASS WindroseGraph
-//============================================================
-class WindroseGraph extends Graph {
-    private $posx, $posy;
-    public $plots=array();
-
-    function __construct($width=300,$height=200,$cachedName="",$timeout=0,$inline=1) {
-        parent::__construct($width,$height,$cachedName,$timeout,$inline);
-        $this->posx=$width/2;
-        $this->posy=$height/2;
-        $this->SetColor('white');
-        $this->title->SetFont(FF_VERDANA,FS_NORMAL,12);
-        $this->title->SetMargin(8);
-        $this->subtitle->SetFont(FF_VERDANA,FS_NORMAL,10);
-        $this->subtitle->SetMargin(0);
-        $this->subsubtitle->SetFont(FF_VERDANA,FS_NORMAL,8);
-        $this->subsubtitle->SetMargin(0);
-    }
-
-    function StrokeTexts() {
-        if( $this->texts != null ) {
-            $n = count($this->texts);
-            for($i=0; $i < $n; ++$i ) {
-                $this->texts[$i]->Stroke($this->img);
-            }
-        }
-    }
-
-    function StrokeIcons() {
-        if( $this->iIcons != null ) {
-            $n = count($this->iIcons);
-            for( $i=0; $i < $n; ++$i ) {
-                // Since Windrose graphs doesn't have any linear scale the position of
-                // each icon has to be given as absolute coordinates
-                $this->iIcons[$i]->_Stroke($this->img);
-            }
-        }
-    }
-
-    //---------------
-    // PUBLIC METHODS
-    function Add($aObj) {
-        if( is_array($aObj) && count($aObj) > 0 ) {
-            $cl = $aObj[0];
-        }
-        else {
-            $cl = $aObj;
-        }
-        if( $cl instanceof Text ) {
-            $this->AddText($aObj);
-        }
-        elseif( $cl instanceof IconPlot ) {
-            $this->AddIcon($aObj);
-        }
-        elseif( ($cl instanceof WindrosePlot) || ($cl instanceof LayoutRect) || ($cl instanceof LayoutHor)) {
-            $this->plots[] = $aObj;
-        }
-        else {
-            JpgraphError::RaiseL(22021);
-        }
-    }
-
-    function AddText($aTxt,$aToY2=false) {
-        parent::AddText($aTxt);
-    }
-
-    function SetColor($c) {
-        $this->SetMarginColor($c);
-    }
-
-    // Method description
-    function Stroke($aStrokeFileName="") {
-
-        // If the filename is the predefined value = '_csim_special_'
-        // we assume that the call to stroke only needs to do enough
-        // to correctly generate the CSIM maps.
-        // We use this variable to skip things we don't strictly need
-        // to do to generate the image map to improve performance
-        // as best we can. Therefore you will see a lot of tests !$_csim in the
-        // code below.
-        $_csim = ($aStrokeFileName===_CSIM_SPECIALFILE);
-
-        // We need to know if we have stroked the plot in the
-        // GetCSIMareas. Otherwise the CSIM hasn't been generated
-        // and in the case of GetCSIM called before stroke to generate
-        // CSIM without storing an image to disk GetCSIM must call Stroke.
-        $this->iHasStroked = true;
-
-        if( $this->background_image != "" || $this->background_cflag != "" ) {
-            $this->StrokeFrameBackground();
-        }
-        else {
-            $this->StrokeFrame();
-        }
-
-        // n holds number of plots
-        $n = count($this->plots);
-        for($i=0; $i < $n ; ++$i) {
-     		$this->plots[$i]->Stroke($this);
-        }
-
-        $this->footer->Stroke($this->img);
-        $this->StrokeIcons();
-        $this->StrokeTexts();
-        $this->StrokeTitles();
-
-        // If the filename is given as the special "__handle"
-        // then the image handler is returned and the image is NOT
-        // streamed back
-        if( $aStrokeFileName == _IMG_HANDLER ) {
-            return $this->img->img;
-        }
-        else {
-            // Finally stream the generated picture
-            $this->cache->PutAndStream($this->img,$this->cache_name,$this->inline,
-            $aStrokeFileName);
-        }
-    }
-
-} // Class
-
-?>
diff --git a/#jpgraph/src/lang/de.inc.php b/#jpgraph/src/lang/de.inc.php
deleted file mode 100644
index 37ba264f..00000000
--- a/#jpgraph/src/lang/de.inc.php
+++ /dev/null
@@ -1,552 +0,0 @@
-<?php
-/*=======================================================================
-// File:        DE.INC.PHP
-// Description: German language file for error messages
-// Created:     2006-03-06
-// Author:      Timo Leopold (timo@leopold-hh.de)
-//              Johan Persson (ljp@localhost.nil)
-// Ver:         $Id: de.inc.php 1886 2009-10-01 23:30:16Z ljp $
-//
-// Copyright (c)
-//========================================================================
-*/
-
-// Notiz: Das Format fuer jede Fehlermeldung ist array(<Fehlermeldung>,<Anzahl der Argumente>)
-$_jpg_messages = array(
-
-/*
-** Headers wurden bereits gesendet - Fehler. Dies wird als HTML formatiert, weil es direkt als text zurueckgesendet wird
-*/
-10  => array('<table border="1"><tr><td style="color:darkred;font-size:1.2em;"><b>JpGraph Fehler:</b>
-HTTP header wurden bereits gesendet.<br>Fehler in der Datei <b>%s</b> in der Zeile <b>%d</b>.</td></tr><tr><td><b>Erklärung:</b><br>HTTP header wurden bereits zum Browser gesendet, wobei die Daten als Text gekennzeichnet wurden, bevor die Bibliothek die Chance hatte, seinen Bild-HTTP-Header zum Browser zu schicken. Dies verhindert, dass die Bibliothek Bilddaten zum Browser schicken kann (weil sie vom Browser als Text interpretiert würden und daher nur Mist dargestellt würde).<p>Wahrscheinlich steht Text im Skript bevor <i>Graph::Stroke()</i> aufgerufen wird. Wenn dieser Text zum Browser gesendet wird, nimmt dieser an, dass die gesamten Daten aus Text bestehen. Such nach irgendwelchem Text, auch nach Leerzeichen und Zeilenumbrüchen, die eventuell bereits zum Browser gesendet wurden. <p>Zum Beispiel ist ein oft auftretender Fehler, eine Leerzeile am Anfang der Datei oder vor <i>Graph::Stroke()</i> zu lassen."<b>&lt;?php</b>".</td></tr></table>',2),
-
-/*
-** Setup Fehler
-*/
-11 => array('Es wurde kein Pfad für CACHE_DIR angegeben. Bitte gib einen Pfad CACHE_DIR in der Datei jpg-config.inc an.',0),
-12 => array('Es wurde kein Pfad für TTF_DIR angegeben und der Pfad kann nicht automatisch ermittelt werden. Bitte gib den Pfad in der Datei jpg-config.inc an.',0),
-13 => array('The installed PHP version (%s) is not compatible with this release of the library. The library requires at least PHP version %s',2),
-
-/*
-**  jpgraph_bar
-*/
-
-2001 => array('Die Anzahl der Farben ist nicht gleich der Anzahl der Vorlagen in BarPlot::SetPattern().',0),
-2002 => array('Unbekannte Vorlage im Aufruf von BarPlot::SetPattern().',0),
-2003 => array('Anzahl der X- und Y-Koordinaten sind nicht identisch. Anzahl der X-Koordinaten: %d; Anzahl der Y-Koordinaten: %d.',2),
-2004 => array('Alle Werte für ein Balkendiagramm (barplot) müssen numerisch sein. Du hast den Wert nr [%d] == %s angegeben.',2),
-2005 => array('Du hast einen leeren Vektor für die Schattierungsfarben im Balkendiagramm (barplot) angegeben.',0),
-2006 => array('Unbekannte Position für die Werte der Balken: %s.',1),
-2007 => array('Kann GroupBarPlot nicht aus einem leeren Vektor erzeugen.',0),
-2008 => array('GroupBarPlot Element nbr %d wurde nicht definiert oder ist leer.',0),
-2009 => array('Eins der Objekte, das an GroupBar weitergegeben wurde ist kein Balkendiagramm (BarPlot). Versichere Dich, dass Du den GroupBarPlot aus einem Vektor von Balkendiagrammen (barplot) oder AccBarPlot-Objekten erzeugst. (Class = %s)',1),
-2010 => array('Kann AccBarPlot nicht aus einem leeren Vektor erzeugen.',0),
-2011 => array('AccBarPlot-Element nbr %d wurde nicht definiert oder ist leer.',1),
-2012 => array('Eins der Objekte, das an AccBar weitergegeben wurde ist kein Balkendiagramm (barplot). Versichere Dich, dass Du den AccBar-Plot aus einem Vektor von Balkendiagrammen (barplot) erzeugst. (Class=%s)',1),
-2013 => array('Du hast einen leeren Vektor für die Schattierungsfarben im Balkendiagramm (barplot) angegeben.',0),
-2014 => array('Die Anzahl der Datenpunkte jeder Datenreihe in AccBarPlot muss gleich sein.',0),
-2015 => array('Individual bar plots in an AccBarPlot or GroupBarPlot can not have specified X-coordinates',0),
-
-
-/*
-**  jpgraph_date
-*/
-
-3001 => array('Es ist nur möglich, entweder SetDateAlign() oder SetTimeAlign() zu benutzen, nicht beides!',0),
-
-/*
-**  jpgraph_error
-*/
-
-4002 => array('Fehler bei den Eingabedaten von LineErrorPlot. Die Anzahl der Datenpunkte mus ein Mehrfaches von drei sein!',0),
-
-/*
-**  jpgraph_flags
-*/
-
-5001 => array('Unbekannte Flaggen-Größe (%d).',1),
-5002 => array('Der Flaggen-Index %s existiert nicht.',1),
-5003 => array('Es wurde eine ungültige Ordnungszahl (%d) für den Flaggen-Index angegeben.',1),
-5004 => array('Der Landesname %s hat kein korrespondierendes Flaggenbild. Die Flagge mag existieren, abr eventuell unter einem anderen Namen, z.B. versuche "united states" statt "usa".',1),
-
-
-/*
-**  jpgraph_gantt
-*/
-
-6001 => array('Interner Fehler. Die Höhe für ActivityTitles ist < 0.',0),
-6002 => array('Es dürfen keine negativen Werte für die Gantt-Diagramm-Dimensionen angegeben werden. Verwende 0, wenn die Dimensionen automatisch ermittelt werden sollen.',0),
-6003 => array('Ungültiges Format für den Bedingungs-Parameter bei Index=%d in CreateSimple(). Der Parameter muss bei index 0 starten und Vektoren in der Form (Row,Constrain-To,Constrain-Type) enthalten.',1),
-6004 => array('Ungültiges Format für den Fortschritts-Parameter bei Index=%d in CreateSimple(). Der Parameter muss bei Index 0 starten und Vektoren in der Form (Row,Progress) enthalten.',1),
-6005 => array('SetScale() ist nicht sinnvoll bei Gantt-Diagrammen.',0),
-6006 => array('Das Gantt-Diagramm kann nicht automatisch skaliert werden. Es existieren keine Aktivitäten mit Termin. [GetBarMinMax() start >= n]',0),
-6007 => array('Plausibiltätsprüfung für die automatische Gantt-Diagramm-Größe schlug fehl. Entweder die Breite (=%d) oder die Höhe (=%d) ist größer als MAX_GANTTIMG_SIZE. Dies kann möglicherweise durch einen falschen Wert bei einer Aktivität hervorgerufen worden sein.',2),
-6008 => array('Du hast eine Bedingung angegeben von Reihe=%d bis Reihe=%d, die keine Aktivität hat.',2),
-6009 => array('Unbekannter Bedingungstyp von Reihe=%d bis Reihe=%d',2),
-6010 => array('Ungültiger Icon-Index für das eingebaute Gantt-Icon [%d]',1),
-6011 => array('Argument für IconImage muss entweder ein String oder ein Integer sein.',0),
-6012 => array('Unbekannter Typ bei der Gantt-Objekt-Title-Definition.',0),
-6015 => array('Ungültige vertikale Position %d',1),
-6016 => array('Der eingegebene Datums-String (%s) für eine Gantt-Aktivität kann nicht interpretiert werden. Versichere Dich, dass es ein gültiger Datumsstring ist, z.B. 2005-04-23 13:30',1),
-6017 => array('Unbekannter Datumstyp in GanttScale (%s).',1),
-6018 => array('Intervall für Minuten muss ein gerader Teiler einer Stunde sein, z.B. 1,5,10,12,15,20,30, etc. Du hast ein Intervall von %d Minuten angegeben.',1),
-6019 => array('Die vorhandene Breite (%d) für die Minuten ist zu klein, um angezeigt zu werden. Bitte benutze die automatische Größenermittlung oder vergrößere die Breite des Diagramms.',1),
-6020 => array('Das Intervall für die Stunden muss ein gerader Teiler eines Tages sein, z.B. 0:30, 1:00, 1:30, 4:00, etc. Du hast ein Intervall von %d eingegeben.',1),
-6021 => array('Unbekanntes Format für die Woche.',0),
-6022 => array('Die Gantt-Skala wurde nicht eingegeben.',0),
-6023 => array('Wenn Du sowohl Stunden als auch Minuten anzeigen lassen willst, muss das Stunden-Interval gleich 1 sein (anderenfalls ist es nicht sinnvoll, Minuten anzeigen zu lassen).',0),
-6024 => array('Das CSIM-Ziel muss als String angegeben werden. Der Start des Ziels ist: %d',1),
-6025 => array('Der CSIM-Alt-Text muss als String angegeben werden. Der Beginn des Alt-Textes ist: %d',1),
-6027 => array('Der Fortschrittswert muss im Bereich [0, 1] liegen.',0),
-6028 => array('Die eingegebene Höhe (%d) für GanttBar ist nicht im zulässigen Bereich.',1),
-6029 => array('Der Offset für die vertikale Linie muss im Bereich [0,1] sein.',0),
-6030 => array('Unbekannte Pfeilrichtung für eine Verbindung.',0),
-6031 => array('Unbekannter Pfeiltyp für eine Verbindung.',0),
-6032 => array('Interner Fehler: Unbekannter Pfadtyp (=%d) für eine Verbindung.',1),
-6033 => array('Array of fonts must contain arrays with 3 elements, i.e. (Family, Style, Size)',0),
-
-/*
-**  jpgraph_gradient
-*/
-
-7001 => array('Unbekannter Gradiententyp (=%d).',1),
-
-/*
-**  jpgraph_iconplot
-*/
-
-8001 => array('Der Mix-Wert für das Icon muss zwischen 0 und 100 sein.',0),
-8002 => array('Die Ankerposition für Icons muss entweder "top", "bottom", "left", "right" oder "center" sein.',0),
-8003 => array('Es ist nicht möglich, gleichzeitig ein Bild und eine Landesflagge für dasselbe Icon zu definieren',0),
-8004 => array('Wenn Du Landesflaggen benutzen willst, musst Du die Datei "jpgraph_flags.php" hinzufügen (per include).',0),
-
-/*
-**  jpgraph_imgtrans
-*/
-
-9001 => array('Der Wert für die Bildtransformation ist außerhalb des zulässigen Bereichs. Der verschwindende Punkt am Horizont muss als Wert zwischen 0 und 1 angegeben werden.',0),
-
-/*
-**  jpgraph_lineplot
-*/
-
-10001 => array('Die Methode LinePlot::SetFilled() sollte nicht mehr benutzt werden. Benutze lieber SetFillColor()',0),
-10002 => array('Der Plot ist zu kompliziert für FastLineStroke. Benutze lieber den StandardStroke()',0),
-10003 => array('Each plot in an accumulated lineplot must have the same number of data points.',0),
-/*
-**  jpgraph_log
-*/
-
-11001 => array('Deine Daten enthalten nicht-numerische Werte.',0),
-11002 => array('Negative Werte können nicht für logarithmische Achsen verwendet werden.',0),
-11003 => array('Deine Daten enthalten nicht-numerische Werte.',0),
-11004 => array('Skalierungsfehler für die logarithmische Achse. Es gibt ein Problem mit den Daten der Achse. Der größte Wert muss größer sein als Null. Es ist mathematisch nicht möglich, einen Wert gleich Null in der Skala zu haben.',0),
-11005 => array('Das Tick-Intervall für die logarithmische Achse ist nicht definiert. Lösche jeden Aufruf von SetTextLabelStart() oder SetTextTickInterval() bei der logarithmischen Achse.',0),
-
-/*
-**  jpgraph_mgraph
-*/
-
-12001 => array("Du benutzt GD 2.x und versuchst ein Nicht-Truecolor-Bild als Hintergrundbild zu benutzen. Um Hintergrundbilder mit GD 2.x zu benutzen, ist es notwendig Truecolor zu aktivieren, indem die USE_TRUECOLOR-Konstante auf TRUE gesetzt wird. Wegen eines Bugs in GD 2.0.1 ist die Qualität der Truetype-Schriften sehr schlecht, wenn man Truetype-Schriften mit Truecolor-Bildern verwendet.",0),
-12002 => array('Ungültiger Dateiname für MGraph::SetBackgroundImage() : %s. Die Datei muss eine gültige Dateierweiterung haben (jpg,gif,png), wenn die automatische Typerkennung verwendet wird.',1),
-12003 => array('Unbekannte Dateierweiterung (%s) in MGraph::SetBackgroundImage() für Dateiname: %s',2),
-12004 => array('Das Bildformat des Hintergrundbildes (%s) wird von Deiner System-Konfiguration nicht unterstützt. ',1),
-12005 => array('Das Hintergrundbild kann nicht gelesen werden: %s',1),
-12006 => array('Es wurden ungültige Größen für Breite oder Höhe beim Erstellen des Bildes angegeben, (Breite=%d, Höhe=%d)',2),
-12007 => array('Das Argument für MGraph::Add() ist nicht gültig für GD.',0),
-12008 => array('Deine PHP- (und GD-lib-) Installation scheint keine bekannten Bildformate zu unterstützen.',0),
-12009 => array('Deine PHP-Installation unterstützt das gewählte Bildformat nicht: %s',1),
-12010 => array('Es konnte kein Bild als Datei %s erzeugt werden. Überprüfe, ob Du die entsprechenden Schreibrechte im aktuellen Verzeichnis hast.',1),
-12011 => array('Es konnte kein Truecolor-Bild erzeugt werden. Überprüfe, ob Du wirklich die GD2-Bibliothek installiert hast.',0),
-12012 => array('Es konnte kein Bild erzeugt werden. Überprüfe, ob Du wirklich die GD2-Bibliothek installiert hast.',0),
-
-/*
-**  jpgraph_pie3d
-*/
-
-14001 => array('Pie3D::ShowBorder(). Missbilligte Funktion. Benutze Pie3D::SetEdge(), um die Ecken der Tortenstücke zu kontrollieren.',0),
-14002 => array('PiePlot3D::SetAngle() 3D-Torten-Projektionswinkel muss zwischen 5 und 85 Grad sein.',0),
-14003 => array('Interne Festlegung schlug fehl. Pie3D::Pie3DSlice',0),
-14004 => array('Tortenstück-Startwinkel muss zwischen 0 und 360 Grad sein.',0),
-14005 => array('Pie3D Interner Fehler: Versuch, zweimal zu umhüllen bei der Suche nach dem Startindex.',0,),
-14006 => array('Pie3D Interner Fehler: Z-Sortier-Algorithmus für 3D-Tortendiagramme funktioniert nicht einwandfrei (2). Versuch, zweimal zu umhüllen beim Erstellen des Bildes.',0),
-14007 => array('Die Breite für das 3D-Tortendiagramm ist 0. Gib eine Breite > 0 an.',0),
-
-/*
-**  jpgraph_pie
-*/
-
-15001 => array('PiePLot::SetTheme() Unbekannter Stil: %s',1),
-15002 => array('Argument für PiePlot::ExplodeSlice() muss ein Integer-Wert sein',0),
-15003 => array('Argument für PiePlot::Explode() muss ein Vektor mit Integer-Werten sein.',0),
-15004 => array('Tortenstück-Startwinkel muss zwischen 0 und 360 Grad sein.',0),
-15005 => array('PiePlot::SetFont() sollte nicht mehr verwendet werden. Benutze stattdessen PiePlot->value->SetFont().',0),
-15006 => array('PiePlot::SetSize() Radius für Tortendiagramm muss entweder als Bruch [0, 0.5] der Bildgröße oder als Absoluwert in Pixel im Bereich [10, 1000] angegeben werden.',0),
-15007 => array('PiePlot::SetFontColor() sollte nicht mehr verwendet werden. Benutze stattdessen PiePlot->value->SetColor()..',0),
-15008 => array('PiePlot::SetLabelType() der Typ für Tortendiagramme muss entweder 0 or 1 sein (nicht %d).',1),
-15009 => array('Ungültiges Tortendiagramm. Die Summe aller Daten ist Null.',0),
-15010 => array('Die Summe aller Daten ist Null.',0),
-15011 => array('Um Bildtransformationen benutzen zu können, muss die Datei jpgraph_imgtrans.php eingefügt werden (per include).',0), // @todo translate into German
-15012 => array('PiePlot::SetTheme() is no longer recommended. Use PieGraph::SetTheme()',0),
-
-/*
-**  jpgraph_plotband
-*/
-
-16001 => array('Die Dichte für das Pattern muss zwischen 1 und 100 sein. (Du hast %f eingegeben)',1),
-16002 => array('Es wurde keine Position für das Pattern angegeben.',0),
-16003 => array('Unbekannte Pattern-Definition (%d)',0),
-16004 => array('Der Mindeswert für das PlotBand ist größer als der Maximalwert. Bitte korrigiere dies!',0),
-
-
-/*
-**  jpgraph_polar
-*/
-
-17001 => array('PolarPlots müssen eine gerade Anzahl von Datenpunkten haben. Jeder Datenpunkt ist ein Tupel (Winkel, Radius).',0),
-17002 => array('Unbekannte Ausrichtung für X-Achsen-Titel. (%s)',1),
-//17003 => array('Set90AndMargin() wird für PolarGraph nicht unterstützt.',0),
-17004 => array('Unbekannter Achsentyp für PolarGraph. Er muss entweder \'lin\' oder \'log\' sein.',0),
-
-/*
-**  jpgraph_radar
-*/
-
-18001 => array('ClientSideImageMaps werden für RadarPlots nicht unterstützt.',0),
-18002 => array('RadarGraph::SupressTickMarks() sollte nicht mehr verwendet werden. Benutze stattdessen HideTickMarks().',0),
-18003 => array('Ungültiger Achsentyp für RadarPlot (%s). Er muss entweder \'lin\' oder \'log\' sein.',1),
-18004 => array('Die RadarPlot-Größe muss zwischen 0.1 und 1 sein. (Dein Wert=%f)',1),
-18005 => array('RadarPlot: nicht unterstützte Tick-Dichte: %d',1),
-18006 => array('Minimum Daten %f (RadarPlots sollten nur verwendet werden, wenn alle Datenpunkte einen Wert > 0 haben).',1),
-18007 => array('Die Anzahl der Titel entspricht nicht der Anzahl der Datenpunkte.',0),
-18008 => array('Jeder RadarPlot muss die gleiche Anzahl von Datenpunkten haben.',0),
-
-/*
-**  jpgraph_regstat
-*/
-
-19001 => array('Spline: Anzahl der X- und Y-Koordinaten muss gleich sein.',0),
-19002 => array('Ungültige Dateneingabe für Spline. Zwei oder mehr aufeinanderfolgende X-Werte sind identisch. Jeder eigegebene X-Wert muss unterschiedlich sein, weil vom mathematischen Standpunkt ein Eins-zu-Eins-Mapping vorliegen muss, d.h. jeder X-Wert korrespondiert mit exakt einem Y-Wert.',0),
-19003 => array('Bezier: Anzahl der X- und Y-Koordinaten muss gleich sein.',0),
-
-/*
-**  jpgraph_scatter
-*/
-
-20001 => array('Fieldplots müssen die gleiche Anzahl von X und Y Datenpunkten haben.',0),
-20002 => array('Bei Fieldplots muss ein Winkel für jeden X und Y Datenpunkt angegeben werden.',0),
-20003 => array('Scatterplots müssen die gleiche Anzahl von X- und Y-Datenpunkten haben.',0),
-
-/*
-**  jpgraph_stock
-*/
-
-21001 => array('Die Anzahl der Datenwerte für Stock-Charts müssen ein Mehrfaches von %d Datenpunkten sein.',1),
-
-/*
-**  jpgraph_plotmark
-*/
-
-23001 => array('Der Marker "%s" existiert nicht in der Farbe: %d',2),
-23002 => array('Der Farb-Index ist zu hoch für den Marker "%s"',1),
-23003 => array('Ein Dateiname muss angegeben werden, wenn Du den Marker-Typ auf MARK_IMG setzt.',0),
-
-/*
-**  jpgraph_utils
-*/
-
-24001 => array('FuncGenerator : Keine Funktion definiert. ',0),
-24002 => array('FuncGenerator : Syntax-Fehler in der Funktionsdefinition ',0),
-24003 => array('DateScaleUtils: Unknown tick type specified in call to GetTicks()',0),
-24004 => array('ReadCSV2: Die anzahl der spalten fehler in %s reihe %d',2),
-/*
-**  jpgraph
-*/
-
-25001 => array('Diese PHP-Installation ist nicht mit der GD-Bibliothek kompiliert. Bitte kompiliere PHP mit GD-Unterstützung neu, damit JpGraph funktioniert. (Weder die Funktion imagetypes() noch imagecreatefromstring() existiert!)',0),
-25002 => array('Diese PHP-Installation scheint nicht die benötigte GD-Bibliothek zu unterstützen. Bitte schau in der PHP-Dokumentation nach, wie man die GD-Bibliothek installiert und aktiviert.',0),
-25003 => array('Genereller PHP Fehler : Bei %s:%d : %s',3),
-25004 => array('Genereller PHP Fehler : %s ',1),
-25005 => array('PHP_SELF, die PHP-Global-Variable kann nicht ermittelt werden. PHP kann nicht von der Kommandozeile gestartet werden, wenn der Cache oder die Bilddateien automatisch benannt werden sollen.',0),
-25006 => array('Die Benutzung der FF_CHINESE (FF_BIG5) Schriftfamilie benötigt die iconv() Funktion in Deiner PHP-Konfiguration. Dies wird nicht defaultmäßig in PHP kompiliert (benötigt "--width-iconv" bei der Konfiguration).',0),
-25007 => array('Du versuchst das lokale (%s) zu verwenden, was von Deiner PHP-Installation nicht unterstützt wird. Hinweis: Benutze \'\', um das defaultmäßige Lokale für diese geographische Region festzulegen.',1),
-25008 => array('Die Bild-Breite und Höhe in Graph::Graph() müssen numerisch sein',0),
-25009 => array('Die Skalierung der Achsen muss angegeben werden mit Graph::SetScale()',0),
-
-25010 => array('Graph::Add() Du hast versucht, einen leeren Plot zum Graph hinzuzufügen.',0),
-25011 => array('Graph::AddY2() Du hast versucht, einen leeren Plot zum Graph hinzuzufügen.',0),
-25012 => array('Graph::AddYN() Du hast versucht, einen leeren Plot zum Graph hinzuzufügen.',0),
-25013 => array('Es können nur Standard-Plots zu multiplen Y-Achsen hinzugefügt werden',0),
-25014 => array('Graph::AddText() Du hast versucht, einen leeren Text zum Graph hinzuzufügen.',0),
-25015 => array('Graph::AddLine() Du hast versucht, eine leere Linie zum Graph hinzuzufügen.',0),
-25016 => array('Graph::AddBand() Du hast versucht, ein leeres Band zum Graph hinzuzufügen.',0),
-25017 => array('Du benutzt GD 2.x und versuchst, ein Hintergrundbild in einem Truecolor-Bild zu verwenden. Um Hintergrundbilder mit GD 2.x zu verwenden, ist es notwendig, Truecolor zu aktivieren, indem die USE_TRUECOLOR-Konstante auf TRUE gesetzt wird. Wegen eines Bugs in GD 2.0.1 ist die Qualität der Schrift sehr schlecht, wenn Truetype-Schrift in Truecolor-Bildern verwendet werden.',0),
-25018 => array('Falscher Dateiname für Graph::SetBackgroundImage() : "%s" muss eine gültige Dateinamenerweiterung (jpg,gif,png) haben, wenn die automatische Dateityperkennung verwenndet werden soll.',1),
-25019 => array('Unbekannte Dateinamenerweiterung (%s) in Graph::SetBackgroundImage() für Dateiname: "%s"',2),
-
-25020 => array('Graph::SetScale(): Dar Maximalwert muss größer sein als der Mindestwert.',0),
-25021 => array('Unbekannte Achsendefinition für die Y-Achse. (%s)',1),
-25022 => array('Unbekannte Achsendefinition für die X-Achse. (%s)',1),
-25023 => array('Nicht unterstützter Y2-Achsentyp: "%s" muss einer von (lin,log,int) sein.',1),
-25024 => array('Nicht unterstützter X-Achsentyp: "%s" muss einer von (lin,log,int) sein.',1),
-25025 => array('Nicht unterstützte Tick-Dichte: %d',1),
-25026 => array('Nicht unterstützter Typ der nicht angegebenen Y-Achse. Du hast entweder: 1. einen Y-Achsentyp für automatisches Skalieren definiert, aber keine Plots angegeben. 2. eine Achse direkt definiert, aber vergessen, die Tick-Dichte zu festzulegen.',0),
-25027 => array('Kann cached CSIM "%s" zum Lesen nicht öffnen.',1),
-25028 => array('Apache/PHP hat keine Schreibrechte, in das CSIM-Cache-Verzeichnis (%s) zu schreiben. Überprüfe die Rechte.',1),
-25029 => array('Kann nicht in das CSIM "%s" schreiben. Überprüfe die Schreibrechte und den freien Speicherplatz.',1),
-
-25030 => array('Fehlender Skriptname für StrokeCSIM(). Der Name des aktuellen Skriptes muss als erster Parameter von StrokeCSIM() angegeben werden.',0),
-25031 => array('Der Achsentyp muss mittels Graph::SetScale() angegeben werden.',0),
-25032 => array('Es existieren keine Plots für die Y-Achse nbr:%d',1),
-25033 => array('',0),
-25034 => array('Undefinierte X-Achse kann nicht gezeichnet werden. Es wurden keine Plots definiert.',0),
-25035 => array('Du hast Clipping aktiviert. Clipping wird nur für Diagramme mit 0 oder 90 Grad Rotation unterstützt. Bitte verändere Deinen Rotationswinkel (=%d Grad) dementsprechend oder deaktiviere Clipping.',1),
-25036 => array('Unbekannter Achsentyp AxisStyle() : %s',1),
-25037 => array('Das Bildformat Deines Hintergrundbildes (%s) wird von Deiner System-Konfiguration nicht unterstützt. ',1),
-25038 => array('Das Hintergrundbild scheint von einem anderen Typ (unterschiedliche Dateierweiterung) zu sein als der angegebene Typ. Angegebenen: %s; Datei: %s',2),
-25039 => array('Hintergrundbild kann nicht gelesen werden: "%s"',1),
-
-25040 => array('Es ist nicht möglich, sowohl ein Hintergrundbild als auch eine Hintergrund-Landesflagge anzugeben.',0),
-25041 => array('Um Landesflaggen als Hintergrund benutzen zu können, muss die Datei "jpgraph_flags.php" eingefügt werden (per include).',0),
-25042 => array('Unbekanntes Hintergrundbild-Layout',0),
-25043 => array('Unbekannter Titelhintergrund-Stil.',0),
-25044 => array('Automatisches Skalieren kann nicht verwendet werden, weil es unmöglich ist, einen gültigen min/max Wert für die Y-Achse zu ermitteln (nur Null-Werte).',0),
-25045 => array('Die Schriftfamilien FF_HANDWRT und FF_BOOK sind wegen Copyright-Problemen nicht mehr verfügbar. Diese Schriften können nicht mehr mit JpGraph verteilt werden. Bitte lade Dir Schriften von http://corefonts.sourceforge.net/ herunter.',0),
-25046 => array('Angegebene TTF-Schriftfamilie (id=%d) ist unbekannt oder existiert nicht. Bitte merke Dir, dass TTF-Schriften wegen Copyright-Problemen nicht mit JpGraph mitgeliefert werden. Du findest MS-TTF-Internetschriften (arial, courier, etc.) zum Herunterladen unter http://corefonts.sourceforge.net/',1),
-25047 => array('Stil %s ist nicht verfügbar für Schriftfamilie %s',2),
-25048 => array('Unbekannte Schriftstildefinition [%s].',1),
-25049 => array('Schriftdatei "%s" ist nicht lesbar oder existiert nicht.',1),
-
-25050 => array('Erstes Argument für Text::Text() muss ein String sein.',0),
-25051 => array('Ungültige Richtung angegeben für Text.',0),
-25052 => array('PANIK: Interner Fehler in SuperScript::Stroke(). Unbekannte vertikale Ausrichtung für Text.',0),
-25053 => array('PANIK: Interner Fehler in SuperScript::Stroke(). Unbekannte horizontale Ausrichtung für Text.',0),
-25054 => array('Interner Fehler: Unbekannte Grid-Achse %s',1),
-25055 => array('Axis::SetTickDirection() sollte nicht mehr verwendet werden. Benutze stattdessen Axis::SetTickSide().',0),
-25056 => array('SetTickLabelMargin() sollte nicht mehr verwendet werden. Benutze stattdessen Axis::SetLabelMargin().',0),
-25057 => array('SetTextTicks() sollte nicht mehr verwendet werden. Benutze stattdessen SetTextTickInterval().',0),
-25058 => array('TextLabelIntevall >= 1 muss angegeben werden.',0),
-25059 => array('SetLabelPos() sollte nicht mehr verwendet werden. Benutze stattdessen Axis::SetLabelSide().',0),
-
-25060 => array('Unbekannte Ausrichtung angegeben für X-Achsentitel (%s).',1),
-25061 => array('Unbekannte Ausrichtung angegeben für Y-Achsentitel (%s).',1),
-25062 => array('Label unter einem Winkel werden für die Y-Achse nicht unterstützt.',0),
-25063 => array('Ticks::SetPrecision() sollte nicht mehr verwendet werden. Benutze stattdessen Ticks::SetLabelFormat() (oder Ticks::SetFormatCallback()).',0),
-25064 => array('Kleinere oder größere Schrittgröße ist 0. Überprüfe, ob Du fälschlicherweise SetTextTicks(0) in Deinem Skript hast. Wenn dies nicht der Fall ist, bist Du eventuell über einen Bug in JpGraph gestolpert. Bitte sende einen Report und füge den Code an, der den Fehler verursacht hat.',0),
-25065 => array('Tick-Positionen müssen als array() angegeben werden',0),
-25066 => array('Wenn die Tick-Positionen und -Label von Hand eingegeben werden, muss die Anzahl der Ticks und der Label gleich sein.',0),
-25067 => array('Deine von Hand eingegebene Achse und Ticks sind nicht korrekt. Die Skala scheint zu klein zu sein für den Tickabstand.',0),
-25068 => array('Ein Plot hat eine ungültige Achse. Dies kann beispielsweise der Fall sein, wenn Du automatisches Text-Skalieren verwendest, um ein Liniendiagramm zu zeichnen mit nur einem Datenpunkt, oder wenn die Bildfläche zu klein ist. Es kann auch der Fall sein, dass kein Datenpunkt einen numerischen Wert hat (vielleicht nur \'-\' oder \'x\').',0),
-25069 => array('Grace muss größer sein als 0',0),
-
-25070 => array('Deine Daten enthalten nicht-numerische Werte.',0),
-25071 => array('Du hast mit SetAutoMin() einen Mindestwert angegeben, der größer ist als der Maximalwert für die Achse. Dies ist nicht möglich.',0),
-25072 => array('Du hast mit SetAutoMax() einen Maximalwert angegeben, der kleiner ist als der Minimalwert der Achse. Dies ist nicht möglich.',0),
-25073 => array('Interner Fehler. Der Integer-Skalierungs-Algorithmus-Vergleich ist außerhalb der Grenzen  (r=%f).',1),
-25074 => array('Interner Fehler. Der Skalierungsbereich ist negativ (%f) [für %s Achse]. Dieses Problem könnte verursacht werden durch den Versuch, \'ungültige\' Werte in die Daten-Vektoren einzugeben (z.B. nur String- oder NULL-Werte), was beim automatischen Skalieren einen Fehler erzeugt.',2),
-25075 => array('Die automatischen Ticks können nicht gesetzt werden, weil min==max.',0),
-25077 => array('Einstellfaktor für die Farbe muss größer sein als 0',0),
-25078 => array('Unbekannte Farbe: %s',1),
-25079 => array('Unbekannte Farbdefinition: %s, Größe=%d',2),
-
-25080 => array('Der Alpha-Parameter für Farben muss zwischen 0.0 und 1.0 liegen.',0),
-25081 => array('Das ausgewählte Grafikformat wird entweder nicht unterstützt oder ist unbekannt [%s]',1),
-25082 => array('Es wurden ungültige Größen für Breite und Höhe beim Erstellen des Bildes definiert (Breite=%d, Höhe=%d).',2),
-25083 => array('Es wurde eine ungültige Größe beim Kopieren des Bildes angegeben. Die Größe für das kopierte Bild wurde auf 1 Pixel oder weniger gesetzt.',0),
-25084 => array('Fehler beim Erstellen eines temporären GD-Canvas. Möglicherweise liegt ein Arbeitsspeicherproblem vor.',0),
-25085 => array('Ein Bild kann nicht aus dem angegebenen String erzeugt werden. Er ist entweder in einem nicht unterstützen Format oder er represäntiert ein kaputtes Bild.',0),
-25086 => array('Du scheinst nur GD 1.x installiert zu haben. Um Alphablending zu aktivieren, ist GD 2.x oder höher notwendig. Bitte installiere GD 2.x oder versichere Dich, dass die Konstante USE_GD2 richtig gesetzt ist. Standardmäßig wird die installierte GD-Version automatisch erkannt. Ganz selten wird GD2 erkannt, obwohl nur GD1 installiert ist. Die Konstante USE_GD2 muss dann zu "false" gesetzt werden.',0),
-25087 => array('Diese PHP-Version wurde ohne TTF-Unterstützung konfiguriert. PHP muss mit TTF-Unterstützung neu kompiliert und installiert werden.',0),
-25088 => array('Die GD-Schriftunterstützung wurde falsch konfiguriert. Der Aufruf von imagefontwidth() ist fehlerhaft.',0),
-25089 => array('Die GD-Schriftunterstützung wurde falsch konfiguriert. Der Aufruf von imagefontheight() ist fehlerhaft.',0),
-
-25090 => array('Unbekannte Richtung angegeben im Aufruf von StrokeBoxedText() [%s].',1),
-25091 => array('Die interne Schrift untestützt das Schreiben von Text in einem beliebigen Winkel nicht. Benutze stattdessen TTF-Schriften.',0),
-25092 => array('Es liegt entweder ein Konfigurationsproblem mit TrueType oder ein Problem beim Lesen der Schriftdatei "%s" vor. Versichere Dich, dass die Datei existiert und Leserechte und -pfad vergeben sind. (wenn \'basedir\' restriction in PHP aktiviert ist, muss die Schriftdatei im Dokumentwurzelverzeichnis abgelegt werden). Möglicherweise ist die FreeType-Bibliothek falsch installiert. Versuche, mindestens zur FreeType-Version 2.1.13 zu aktualisieren und kompiliere GD mit einem korrekten Setup neu, damit die FreeType-Bibliothek gefunden werden kann.',1),
-25093 => array('Die Schriftdatei "%s" kann nicht gelesen werden beim Aufruf von Image::GetBBoxTTF. Bitte versichere Dich, dass die Schrift gesetzt wurde, bevor diese Methode aufgerufen wird, und dass die Schrift im TTF-Verzeichnis installiert ist.',1),
-25094 => array('Die Textrichtung muss in einem Winkel zwischen 0 und 90 engegeben werden.',0),
-25095 => array('Unbekannte Schriftfamilien-Definition. ',0),
-25096 => array('Der Farbpalette können keine weiteren Farben zugewiesen werden. Dem Bild wurde bereits die größtmögliche Anzahl von Farben (%d) zugewiesen und die Palette ist voll. Verwende stattdessen ein TrueColor-Bild',0),
-25097 => array('Eine Farbe wurde als leerer String im Aufruf von PushColor() angegegeben.',0),
-25098 => array('Negativer Farbindex. Unpassender Aufruf von PopColor().',0),
-25099 => array('Die Parameter für Helligkeit und Kontrast sind außerhalb des zulässigen Bereichs [-1,1]',0),
-
-25100 => array('Es liegt ein Problem mit der Farbpalette und dem GD-Setup vor. Bitte deaktiviere anti-aliasing oder verwende GD2 mit TrueColor. Wenn die GD2-Bibliothek installiert ist, versichere Dich, dass die Konstante USE_GD2 auf "true" gesetzt und TrueColor aktiviert ist.',0),
-25101 => array('Ungültiges numerisches Argument für SetLineStyle(): (%d)',1),
-25102 => array('Ungültiges String-Argument für SetLineStyle(): %s',1),
-25103 => array('Ungültiges Argument für SetLineStyle %s',1),
-25104 => array('Unbekannter Linientyp: %s',1),
-25105 => array('Es wurden NULL-Daten für ein gefülltes Polygon angegeben. Sorge dafür, dass keine NULL-Daten angegeben werden.',0),
-25106 => array('Image::FillToBorder : es können keine weiteren Farben zugewiesen werden.',0),
-25107 => array('In Datei "%s" kann nicht geschrieben werden. Überprüfe die aktuellen Schreibrechte.',1),
-25108 => array('Das Bild kann nicht gestreamt werden. Möglicherweise liegt ein Fehler im PHP/GD-Setup vor. Kompiliere PHP neu und verwende die eingebaute GD-Bibliothek, die mit PHP angeboten wird.',0),
-25109 => array('Deine PHP- (und GD-lib-) Installation scheint keine bekannten Grafikformate zu unterstützen. Sorge zunächst dafür, dass GD als PHP-Modul kompiliert ist. Wenn Du außerdem JPEG-Bilder verwenden willst, musst Du die JPEG-Bibliothek installieren. Weitere Details sind in der PHP-Dokumentation zu finden.',0),
-
-25110 => array('Dein PHP-Installation unterstützt das gewählte Grafikformat nicht: %s',1),
-25111 => array('Das gecachete Bild %s kann nicht gelöscht werden. Problem mit den Rechten?',1),
-25112 => array('Das Datum der gecacheten Datei (%s) liegt in der Zukunft.',1),
-25113 => array('Das gecachete Bild %s kann nicht gelöscht werden. Problem mit den Rechten?',1),
-25114 => array('PHP hat nicht die erforderlichen Rechte, um in die Cache-Datei %s zu schreiben. Bitte versichere Dich, dass der Benutzer, der PHP anwendet, die entsprechenden Schreibrechte für die Datei hat, wenn Du das Cache-System in JPGraph verwenden willst.',1),
-25115 => array('Berechtigung für gecachetes Bild %s kann nicht gesetzt werden. Problem mit den Rechten?',1),
-25116 => array('Datei kann nicht aus dem Cache %s geöffnet werden',1),
-25117 => array('Gecachetes Bild %s kann nicht zum Lesen geöffnet werden.',1),
-25118 => array('Verzeichnis %s kann nicht angelegt werden. Versichere Dich, dass PHP die Schreibrechte in diesem Verzeichnis hat.',1),
-25119 => array('Rechte für Datei %s können nicht gesetzt werden. Problem mit den Rechten?',1),
-
-25120 => array('Die Position für die Legende muss als Prozentwert im Bereich 0-1 angegeben werden.',0),
-25121 => array('Eine leerer Datenvektor wurde für den Plot eingegeben. Es muss wenigstens ein Datenpunkt vorliegen.',0),
-25122 => array('Stroke() muss als Subklasse der Klasse Plot definiert sein.',0),
-25123 => array('Du kannst keine Text-X-Achse mit X-Koordinaten verwenden. Benutze stattdessen eine "int" oder "lin" Achse.',0),
-25124 => array('Der Eingabedatenvektor mus aufeinanderfolgende Werte von 0 aufwärts beinhalten. Der angegebene Y-Vektor beginnt mit leeren Werten (NULL).',0),
-25125 => array('Ungültige Richtung für statische Linie.',0),
-25126 => array('Es kann kein TrueColor-Bild erzeugt werden. Überprüfe, ob die GD2-Bibliothek und PHP korrekt aufgesetzt wurden.',0),
-25127 => array('The library has been configured for automatic encoding conversion of Japanese fonts. This requires that PHP has the mb_convert_encoding() function. Your PHP installation lacks this function (PHP needs the "--enable-mbstring" when compiled).',0),
-25128 => array('The function imageantialias() is not available in your PHP installation. Use the GD version that comes with PHP and not the standalone version.',0),
-25129 => array('Anti-alias can not be used with dashed lines. Please disable anti-alias or use solid lines.',0),
-25130 => array('Too small plot area. (%d x %d). With the given image size and margins there is to little space left for the plot. Increase the plot size or reduce the margins.',2),
-
-25131 => array('StrokeBoxedText2() only supports TTF fonts and not built-in bitmap fonts.',0),
-25132 => array('Undefined property %s.',1), // @todo translate
-25133 => array('Use Graph::SetTheme() after Graph::SetScale().',0), // @todo translate
-
-/*
-**  jpgraph_led
-*/
-
-25500 => array('Multibyte strings must be enabled in the PHP installation in order to run the LED module so that the function mb_strlen() is available. See PHP documentation for more information.',0),
-
-
-/*
-**---------------------------------------------------------------------------------------------
-** Pro-version strings
-**---------------------------------------------------------------------------------------------
-*/
-
-/*
-**  jpgraph_table
-*/
-
-27001 => array('GTextTable: Ungültiges Argument für Set(). Das Array-Argument muss 2-- dimensional sein.',0),
-27002 => array('GTextTable: Ungültiges Argument für Set()',0),
-27003 => array('GTextTable: Falsche Anzahl von Argumenten für GTextTable::SetColor()',0),
-27004 => array('GTextTable: Angegebener Zellenbereich, der verschmolzen werden soll, ist ungültig.',0),
-27005 => array('GTextTable: Bereits verschmolzene Zellen im Bereich (%d,%d) bis (%d,%d) können nicht ein weiteres Mal verschmolzen werden.',4),
-27006 => array('GTextTable: Spalten-Argument = %d liegt außerhalb der festgelegten Tabellengröße.',1),
-27007 => array('GTextTable: Zeilen-Argument = %d liegt außerhalb der festgelegten Tabellengröße.',1),
-27008 => array('GTextTable: Spalten- und Zeilengröße müssen zu den Dimensionen der Tabelle passen.',0),
-27009 => array('GTextTable: Die Anzahl der Tabellenspalten oder -zeilen ist 0. Versichere Dich, dass die Methoden Init() oder Set() aufgerufen werden.',0),
-27010 => array('GTextTable: Es wurde keine Ausrichtung beim Aufruf von SetAlign() angegeben.',0),
-27011 => array('GTextTable: Es wurde eine unbekannte Ausrichtung beim Aufruf von SetAlign() abgegeben. Horizontal=%s, Vertikal=%s',2),
-27012 => array('GTextTable: Interner Fehler. Es wurde ein ungültiges Argument festgeleget %s',1),
-27013 => array('GTextTable: Das Argument für FormatNumber() muss ein String sein.',0),
-27014 => array('GTextTable: Die Tabelle wurde weder mit einem Aufruf von Set() noch von Init() initialisiert.',0),
-27015 => array('GTextTable: Der Zellenbildbedingungstyp muss entweder TIMG_WIDTH oder TIMG_HEIGHT sein.',0),
-
-/*
-**  jpgraph_windrose
-*/
-
-22001 => array('Die Gesamtsumme der prozentualen Anteile aller Windrosenarme darf 100%% nicht überschreiten!\n(Aktuell max: %d)',1),
-22002 => array('Das Bild ist zu klein für eine Skala. Bitte vergrößere das Bild.',0),
-22004 => array('Die Etikettendefinition für Windrosenrichtungen müssen 16 Werte haben (eine für jede Kompassrichtung).',0),
-22005 => array('Der Linientyp für radiale Linien muss einer von ("solid","dotted","dashed","longdashed") sein.',0),
-22006 => array('Es wurde ein ungültiger Windrosentyp angegeben.',0),
-22007 => array('Es wurden zu wenig Werte für die Bereichslegende angegeben.',0),
-22008 => array('Interner Fehler: Versuch, eine freie Windrose zu plotten, obwohl der Typ keine freie Windrose ist.',0),
-22009 => array('Du hast die gleiche Richtung zweimal angegeben, einmal mit einem Winkel und einmal mit einer Kompassrichtung (%f Grad).',0),
-22010 => array('Die Richtung muss entweder ein numerischer Wert sein oder eine der 16 Kompassrichtungen',0),
-22011 => array('Der Windrosenindex muss ein numerischer oder Richtungswert sein. Du hast angegeben Index=%d',1),
-22012 => array('Die radiale Achsendefinition für die Windrose enthält eine nicht aktivierte Richtung.',0),
-22013 => array('Du hast dasselbe Look&Feel für die gleiche Kompassrichtung zweimal engegeben, einmal mit Text und einmal mit einem Index (Index=%d)',1),
-22014 => array('Der Index für eine Kompassrichtung muss zwischen 0 und 15 sein.',0),
-22015 => array('Du hast einen unbekannten Windrosenplottyp angegeben.',0),
-22016 => array('Der Windrosenarmindex muss ein numerischer oder ein Richtungswert sein.',0),
-22017 => array('Die Windrosendaten enthalten eine Richtung, die nicht aktiviert ist. Bitte berichtige, welche Label angezeigt werden sollen.',0),
-22018 => array('Du hast für dieselbe Kompassrichtung zweimal Daten angegeben, einmal mit Text und einmal mit einem Index (Index=%d)',1),
-22019 => array('Der Index für eine Richtung muss zwischen 0 und 15 sein. Winkel dürfen nicht für einen regelmäßigen Windplot angegeben werden, sondern entweder ein Index oder eine Kompassrichtung.',0),
-22020 => array('Der Windrosenplot ist zu groß für die angegebene Bildgröße. Benutze entweder WindrosePlot::SetSize(), um den Plot kleiner zu machen oder vergrößere das Bild im ursprünglichen Aufruf von WindroseGraph().',0),
-22021 => array('It is only possible to add Text, IconPlot or WindrosePlot to a Windrose Graph',0),
-
-/*
-**  jpgraph_odometer
-*/
-
-13001 => array('Unbekannter Nadeltypstil (%d).',1),
-13002 => array('Ein Wert für das Odometer (%f) ist außerhalb des angegebenen Bereichs [%f,%f]',3),
-
-/*
-**  jpgraph_barcode
-*/
-
-1001 => array('Unbekannte Kodier-Specifikation: %s',1),
-1002 => array('datenvalidierung schlug fehl. [%s] kann nicht mittels der Kodierung "%s" kodiert werden',2),
-1003 => array('Interner Kodierfehler. Kodieren von %s ist nicht möglich in Code 128',1),
-1004 => array('Interner barcode Fehler. Unbekannter UPC-E Kodiertyp: %s',1),
-1005 => array('Interner Fehler. Das Textzeichen-Tupel (%s, %s) kann nicht im Code-128 Zeichensatz C kodiert werden.',2),
-1006 => array('Interner Kodierfehler für CODE 128. Es wurde versucht, CTRL in CHARSET != A zu kodieren.',0),
-1007 => array('Interner Kodierfehler für CODE 128. Es wurde versucht, DEL in CHARSET != B zu kodieren.',0),
-1008 => array('Interner Kodierfehler für CODE 128. Es wurde versucht, kleine Buchstaben in CHARSET != B zu kodieren.',0),
-1009 => array('Kodieren mittels CODE 93 wird noch nicht unterstützt.',0),
-1010 => array('Kodieren mittels POSTNET wird noch nicht unterstützt.',0),
-1011 => array('Nicht untrstütztes Barcode-Backend für den Typ %s',1),
-
-/*
-** PDF417
-*/
-
-26000 => array('PDF417: The PDF417 module requires that the PHP installation must support the function bcmod(). This is normally enabled at compile time. See documentation for more information.',0),
-26001 => array('PDF417: Die Anzahl der Spalten muss zwischen 1 und 30 sein.',0),
-26002 => array('PDF417: Der Fehler-Level muss zwischen 0 und 8 sein.',0),
-26003 => array('PDF417: Ungültiges Format für Eingabedaten, um sie mit PDF417 zu kodieren.',0),
-26004 => array('PDF417: die eigebenen Daten können nicht mit Fehler-Level %d und %d spalten kodiert werden, weil daraus zu viele Symbole oder mehr als 90 Zeilen resultieren.',2),
-26005 => array('PDF417: Die Datei "%s" kann nicht zum Schreiben geöffnet werden.',1),
-26006 => array('PDF417: Interner Fehler. Die Eingabedatendatei für PDF417-Cluster %d ist fehlerhaft.',1),
-26007 => array('PDF417: Interner Fehler. GetPattern: Ungültiger Code-Wert %d (Zeile %d)',2),
-26008 => array('PDF417: Interner Fehler. Modus wurde nicht in der Modusliste!! Modus %d',1),
-26009 => array('PDF417: Kodierfehler: Ungültiges Zeichen. Zeichen kann nicht mit ASCII-Code %d kodiert werden.',1),
-26010 => array('PDF417: Interner Fehler: Keine Eingabedaten beim Dekodieren.',0),
-26011 => array('PDF417: Kodierfehler. Numerisches Kodieren bei nicht-numerischen Daten nicht möglich.',0),
-26012 => array('PDF417: Interner Fehler. Es wurden für den Binary-Kompressor keine Daten zum Dekodieren eingegeben.',0),
-26013 => array('PDF417: Interner Fehler. Checksum Fehler. Koeffiziententabellen sind fehlerhaft.',0),
-26014 => array('PDF417: Interner Fehler. Es wurden keine Daten zum Berechnen von Kodewörtern eingegeben.',0),
-26015 => array('PDF417: Interner Fehler. Ein Eintrag 0 in die Statusübertragungstabellen ist nicht NULL. Eintrag 1 = (%s)',1),
-26016 => array('PDF417: Interner Fehler: Nichtregistrierter Statusübertragungsmodus beim Dekodieren.',0),
-
-
-/*
-** jpgraph_contour
-*/
-
-28001 => array('Dritten parameter fur Contour muss ein vector der fargen sind.',0),
-28002 => array('Die anzahlen der farges jeder isobar linien muss gleich sein.',0),
-28003 => array('ContourPlot Interner Fehler: isobarHCrossing: Spalten index ist zu hoch (%d)',1),
-28004 => array('ContourPlot Interner Fehler: isobarHCrossing: Reihe index ist zu hoch (%d)',1),
-28005 => array('ContourPlot Interner Fehler: isobarVCrossing: Reihe index ist zu hoch (%d)',1),
-28006 => array('ContourPlot Interner Fehler: isobarVCrossing: Spalten index ist zu hoch (%d)',1),
-28007 => array('ContourPlot. Interpolation faktor ist zu hoch (>5)',0),
-
-
-/*
- * jpgraph_matrix and colormap
-*/
-29201 => array('Min range value must be less or equal to max range value for colormaps',0),
-29202 => array('The distance between min and max value is too small for numerical precision',0),
-29203 => array('Number of color quantification level must be at least %d',1),
-29204 => array('Number of colors (%d) is invalid for this colormap. It must be a number that can be written as: %d + k*%d',3),
-29205 => array('Colormap specification out of range. Must be an integer in range [0,%d]',1),
-29206 => array('Invalid object added to MatrixGraph',0),
-29207 => array('Empty input data specified for MatrixPlot',0),
-29208 => array('Unknown side specifiction for matrix labels "%s"',1),
-29209 => array('CSIM Target matrix must be the same size as the data matrix (csim=%d x %d, data=%d x %d)',4),
-29210 => array('CSIM Target for matrix labels does not match the number of labels (csim=%d, labels=%d)',2),
-
-
-/*
-* jpgraph_theme
-*/
-30001 => array("Theme::%s() is not defined. \nPlease make %s(\$graph) function in your theme classs.",2),
-
-
-);
-
-?>
diff --git a/#jpgraph/src/lang/en.inc.php b/#jpgraph/src/lang/en.inc.php
deleted file mode 100644
index 101e8bd8..00000000
--- a/#jpgraph/src/lang/en.inc.php
+++ /dev/null
@@ -1,545 +0,0 @@
-<?php
-/*=======================================================================
-// File:     EN.INC.PHP
-// Description: English language file for error messages
-// Created:     2006-01-25
-// Ver:        $Id: en.inc.php 1886 2009-10-01 23:30:16Z ljp $
-//
-// Copyright (c) Asial Corporation. All rights reserved.
-//========================================================================
-*/
-
-// Note: Format of each error message is array(<error message>,<number of arguments>)
-$_jpg_messages = array(
-
-/*
-** Headers already sent error. This is formatted as HTML different since this will be sent back directly as text
-*/
-10  => array('<table border="1"><tr><td style="color:darkred; font-size:1.2em;"><b>JpGraph Error:</b>
-HTTP headers have already been sent.<br>Caused by output from file <b>%s</b> at line <b>%d</b>.</td></tr><tr><td><b>Explanation:</b><br>HTTP headers have already been sent back to the browser indicating the data as text before the library got a chance to send it\'s image HTTP header to this browser. This makes it impossible for the library to send back image data to the browser (since that would be interpretated as text by the browser and show up as junk text).<p>Most likely you have some text in your script before the call to <i>Graph::Stroke()</i>. If this texts gets sent back to the browser the browser will assume that all data is plain text. Look for any text, even spaces and newlines, that might have been sent back to the browser. <p>For example it is a common mistake to leave a blank line before the opening "<b>&lt;?php</b>".</td></tr></table>',2),
-
-/*
-** Setup errors
-*/
-11 => array('No path specified for CACHE_DIR. Please specify CACHE_DIR manually in jpg-config.inc',0),
-12 => array('No path specified for TTF_DIR and path can not be determined automatically. Please specify TTF_DIR manually (in jpg-config.inc).',0),
-13 => array('The installed PHP version (%s) is not compatible with this release of the library. The library requires at least PHP version %s',2),
-
-
-/*
-**  jpgraph_bar
-*/
-
-2001 => array('Number of colors is not the same as the number of patterns in BarPlot::SetPattern()',0),
-2002 => array('Unknown pattern specified in call to BarPlot::SetPattern()',0),
-2003 => array('Number of X and Y points are not equal. Number of X-points: %d Number of Y-points: %d',2),
-2004 => array('All values for a barplot must be numeric. You have specified value nr [%d] == %s',2),
-2005 => array('You have specified an empty array for shadow colors in the bar plot.',0),
-2006 => array('Unknown position for values on bars : %s',1),
-2007 => array('Cannot create GroupBarPlot from empty plot array.',0),
-2008 => array('Group bar plot element nbr %d is undefined or empty.',0),
-2009 => array('One of the objects submitted to GroupBar is not a BarPlot. Make sure that you create the GroupBar plot from an array of BarPlot or AccBarPlot objects. (Class = %s)',1),
-2010 => array('Cannot create AccBarPlot from empty plot array.',0),
-2011 => array('Acc bar plot element nbr %d is undefined or empty.',1),
-2012 => array('One of the objects submitted to AccBar is not a BarPlot. Make sure that you create the AccBar plot from an array of BarPlot objects. (Class=%s)',1),
-2013 => array('You have specified an empty array for shadow colors in the bar plot.',0),
-2014 => array('Number of datapoints for each data set in accbarplot must be the same',0),
-2015 => array('Individual bar plots in an AccBarPlot or GroupBarPlot can not have specified X-coordinates',0),
-
-
-/*
-**  jpgraph_date
-*/
-
-3001 => array('It is only possible to use either SetDateAlign() or SetTimeAlign() but not both',0),
-
-/*
-**  jpgraph_error
-*/
-
-4002 => array('Error in input data to LineErrorPlot. Number of data points must be a multiple of 3',0),
-
-/*
-**  jpgraph_flags
-*/
-
-5001 => array('Unknown flag size (%d).',1),
-5002 => array('Flag index %s does not exist.',1),
-5003 => array('Invalid ordinal number (%d) specified for flag index.',1),
-5004 => array('The (partial) country name %s does not have a corresponding flag image. The flag may still exist but under another name, e.g. instead of "usa" try "united states".',1),
-
-
-/*
-**  jpgraph_gantt
-*/
-
-6001 => array('Internal error. Height for ActivityTitles is < 0',0),
-6002 => array('You can\'t specify negative sizes for Gantt graph dimensions. Use 0 to indicate that you want the library to automatically determine a dimension.',0),
-6003 => array('Invalid format for Constrain parameter at index=%d in CreateSimple(). Parameter must start with index 0 and contain arrays of (Row,Constrain-To,Constrain-Type)',1),
-6004 => array('Invalid format for Progress parameter at index=%d in CreateSimple(). Parameter must start with index 0 and contain arrays of (Row,Progress)',1),
-6005 => array('SetScale() is not meaningful with Gantt charts.',0),
-6006 => array('Cannot autoscale Gantt chart. No dated activities exist. [GetBarMinMax() start >= n]',0),
-6007 => array('Sanity check for automatic Gantt chart size failed. Either the width (=%d) or height (=%d) is larger than MAX_GANTTIMG_SIZE. This could potentially be caused by a wrong date in one of the activities.',2),
-6008 => array('You have specified a constrain from row=%d to row=%d which does not have any activity',2),
-6009 => array('Unknown constrain type specified from row=%d to row=%d',2),
-6010 => array('Illegal icon index for Gantt builtin icon [%d]',1),
-6011 => array('Argument to IconImage must be string or integer',0),
-6012 => array('Unknown type in Gantt object title specification',0),
-6015 => array('Illegal vertical position %d',1),
-6016 => array('Date string (%s) specified for Gantt activity can not be interpretated. Please make sure it is a valid time string, e.g. 2005-04-23 13:30',1),
-6017 => array('Unknown date format in GanttScale (%s).',1),
-6018 => array('Interval for minutes must divide the hour evenly, e.g. 1,5,10,12,15,20,30 etc You have specified an interval of %d minutes.',1),
-6019 => array('The available width (%d) for minutes are to small for this scale to be displayed. Please use auto-sizing or increase the width of the graph.',1),
-6020 => array('Interval for hours must divide the day evenly, e.g. 0:30, 1:00, 1:30, 4:00 etc. You have specified an interval of %d',1),
-6021 => array('Unknown formatting style for week.',0),
-6022 => array('Gantt scale has not been specified.',0),
-6023 => array('If you display both hour and minutes the hour interval must be 1 (Otherwise it doesn\'t make sense to display minutes).',0),
-6024 => array('CSIM Target must be specified as a string. Start of target is: %d',1),
-6025 => array('CSIM Alt text must be specified as a string. Start of alt text is: %d',1),
-6027 => array('Progress value must in range [0, 1]',0),
-6028 => array('Specified height (%d) for gantt bar is out of range.',1),
-6029 => array('Offset for vertical line must be in range [0,1]',0),
-6030 => array('Unknown arrow direction for link.',0),
-6031 => array('Unknown arrow type for link.',0),
-6032 => array('Internal error: Unknown path type (=%d) specified for link.',1),
-6033 => array('Array of fonts must contain arrays with 3 elements, i.e. (Family, Style, Size)',0),
-
-/*
-**  jpgraph_gradient
-*/
-
-7001 => array('Unknown gradient style (=%d).',1),
-
-/*
-**  jpgraph_iconplot
-*/
-
-8001 => array('Mix value for icon must be between 0 and 100.',0),
-8002 => array('Anchor position for icons must be one of "top", "bottom", "left", "right" or "center"',0),
-8003 => array('It is not possible to specify both an image file and a country flag for the same icon.',0),
-8004 => array('In order to use Country flags as icons you must include the "jpgraph_flags.php" file.',0),
-
-/*
-**  jpgraph_imgtrans
-*/
-
-9001 => array('Value for image transformation out of bounds. Vanishing point on horizon must be specified as a value between 0 and 1.',0),
-
-/*
-**  jpgraph_lineplot
-*/
-
-10001 => array('LinePlot::SetFilled() is deprecated. Use SetFillColor()',0),
-10002 => array('Plot too complicated for fast line Stroke. Use standard Stroke()',0),
-10003 => array('Each plot in an accumulated lineplot must have the same number of data points.',0),
-
-/*
-**  jpgraph_log
-*/
-
-11001 => array('Your data contains non-numeric values.',0),
-11002 => array('Negative data values can not be used in a log scale.',0),
-11003 => array('Your data contains non-numeric values.',0),
-11004 => array('Scale error for logarithmic scale. You have a problem with your data values. The max value must be greater than 0. It is mathematically impossible to have 0 in a logarithmic scale.',0),
-11005 => array('Specifying tick interval for a logarithmic scale is undefined. Remove any calls to SetTextLabelStart() or SetTextTickInterval() on the logarithmic scale.',0),
-
-/*
-**  jpgraph_mgraph
-*/
-
-12001 => array("You are using GD 2.x and are trying to use a background images on a non truecolor image. To use background images with GD 2.x it is necessary to enable truecolor by setting the USE_TRUECOLOR constant to TRUE. Due to a bug in GD 2.0.1 using any truetype fonts with truecolor images will result in very poor quality fonts.",0),
-12002 => array('Incorrect file name for MGraph::SetBackgroundImage() : %s Must have a valid image extension (jpg,gif,png) when using auto detection of image type',1),
-12003 => array('Unknown file extension (%s) in MGraph::SetBackgroundImage() for filename: %s',2),
-12004 => array('The image format of your background image (%s) is not supported in your system configuration. ',1),
-12005 => array('Can\'t read background image: %s',1),
-12006 => array('Illegal sizes specified for width or height when creating an image, (width=%d, height=%d)',2),
-12007 => array('Argument to MGraph::Add() is not a valid GD image handle.',0),
-12008 => array('Your PHP (and GD-lib) installation does not appear to support any known graphic formats.',0),
-12009 => array('Your PHP installation does not support the chosen graphic format: %s',1),
-12010 => array('Can\'t create or stream image to file %s Check that PHP has enough permission to write a file to the current directory.',1),
-12011 => array('Can\'t create truecolor image. Check that you really have GD2 library installed.',0),
-12012 => array('Can\'t create image. Check that you really have GD2 library installed.',0),
-
-/*
-**  jpgraph_pie3d
-*/
-
-14001 => array('Pie3D::ShowBorder() . Deprecated function. Use Pie3D::SetEdge() to control the edges around slices.',0),
-14002 => array('PiePlot3D::SetAngle() 3D Pie projection angle must be between 5 and 85 degrees.',0),
-14003 => array('Internal assertion failed. Pie3D::Pie3DSlice',0),
-14004 => array('Slice start angle must be between 0 and 360 degrees.',0),
-14005 => array('Pie3D Internal error: Trying to wrap twice when looking for start index',0,),
-14006 => array('Pie3D Internal Error: Z-Sorting algorithm for 3D Pies is not working properly (2). Trying to wrap twice while stroking.',0),
-14007 => array('Width for 3D Pie is 0. Specify a size > 0',0),
-
-/*
-**  jpgraph_pie
-*/
-
-15001 => array('PiePLot::SetTheme() Unknown theme: %s',1),
-15002 => array('Argument to PiePlot::ExplodeSlice() must be an integer',0),
-15003 => array('Argument to PiePlot::Explode() must be an array with integer distances.',0),
-15004 => array('Slice start angle must be between 0 and 360 degrees.',0),
-15005 => array('PiePlot::SetFont() is deprecated. Use PiePlot->value->SetFont() instead.',0),
-15006 => array('PiePlot::SetSize() Radius for pie must either be specified as a fraction [0, 0.5] of the size of the image or as an absolute size in pixels  in the range [10, 1000]',0),
-15007 => array('PiePlot::SetFontColor() is deprecated. Use PiePlot->value->SetColor() instead.',0),
-15008 => array('PiePlot::SetLabelType() Type for pie plots must be 0 or 1 (not %d).',1),
-15009 => array('Illegal pie plot. Sum of all data is zero for Pie Plot',0),
-15010 => array('Sum of all data is 0 for Pie.',0),
-15011 => array('In order to use image transformation you must include the file jpgraph_imgtrans.php in your script.',0),
-15012 => array('PiePlot::SetTheme() is no longer supported. Use PieGraph::SetTheme()',0),
-
-/*
-**  jpgraph_plotband
-*/
-
-16001 => array('Density for pattern must be between 1 and 100. (You tried %f)',1),
-16002 => array('No positions specified for pattern.',0),
-16003 => array('Unknown pattern specification (%d)',0),
-16004 => array('Min value for plotband is larger than specified max value. Please correct.',0),
-
-
-/*
-**  jpgraph_polar
-*/
-
-17001 => array('Polar plots must have an even number of data point. Each data point is a tuple (angle,radius).',0),
-17002 => array('Unknown alignment specified for X-axis title. (%s)',1),
-//17003 => array('Set90AndMargin() is not supported for polar graphs.',0),
-17004 => array('Unknown scale type for polar graph. Must be "lin" or "log"',0),
-
-/*
-**  jpgraph_radar
-*/
-
-18001 => array('Client side image maps not supported for RadarPlots.',0),
-18002 => array('RadarGraph::SupressTickMarks() is deprecated. Use HideTickMarks() instead.',0),
-18003 => array('Illegal scale for radarplot (%s). Must be \'lin\' or \'log\'',1),
-18004 => array('Radar Plot size must be between 0.1 and 1. (Your value=%f)',1),
-18005 => array('RadarPlot Unsupported Tick density: %d',1),
-18006 => array('Minimum data %f (Radar plots should only be used when all data points > 0)',1),
-18007 => array('Number of titles does not match number of points in plot.',0),
-18008 => array('Each radar plot must have the same number of data points.',0),
-
-/*
-**  jpgraph_regstat
-*/
-
-19001 => array('Spline: Number of X and Y coordinates must be the same',0),
-19002 => array('Invalid input data for spline. Two or more consecutive input X-values are equal. Each input X-value must differ since from a mathematical point of view it must be a one-to-one mapping, i.e. each X-value must correspond to exactly one Y-value.',0),
-19003 => array('Bezier: Number of X and Y coordinates must be the same',0),
-
-/*
-**  jpgraph_scatter
-*/
-
-20001 => array('Fieldplots must have equal number of X and Y points.',0),
-20002 => array('Fieldplots must have an angle specified for each X and Y points.',0),
-20003 => array('Scatterplot must have equal number of X and Y points.',0),
-
-/*
-**  jpgraph_stock
-*/
-
-21001 => array('Data values for Stock charts must contain an even multiple of %d data points.',1),
-
-/*
-**  jpgraph_plotmark
-*/
-
-23001 => array('This marker "%s" does not exist in color with index: %d',2),
-23002 => array('Mark color index too large for marker "%s"',1),
-23003 => array('A filename must be specified if you set the mark type to MARK_IMG.',0),
-
-/*
-**  jpgraph_utils
-*/
-
-24001 => array('FuncGenerator : No function specified. ',0),
-24002 => array('FuncGenerator : Syntax error in function specification ',0),
-24003 => array('DateScaleUtils: Unknown tick type specified in call to GetTicks()',0),
-24004 => array('ReadCSV2: Column count mismatch in %s line %d',2),
-/*
-**  jpgraph
-*/
-
-25001 => array('This PHP installation is not configured with the GD library. Please recompile PHP with GD support to run JpGraph. (Neither function imagetypes() nor imagecreatefromstring() does exist)',0),
-25002 => array('Your PHP installation does not seem to have the required GD library. Please see the PHP documentation on how to install and enable the GD library.',0),
-25003 => array('General PHP error : At %s:%d : %s',3),
-25004 => array('General PHP error : %s ',1),
-25005 => array('Can\'t access PHP_SELF, PHP global variable. You can\'t run PHP from command line if you want to use the \'auto\' naming of cache or image files.',0),
-25006 => array('Usage of FF_CHINESE (FF_BIG5) font family requires that your PHP setup has the iconv() function. By default this is not compiled into PHP (needs the "--width-iconv" when configured).',0),
-25007 => array('You are trying to use the locale (%s) which your PHP installation does not support. Hint: Use \'\' to indicate the default locale for this geographic region.',1),
-25008 => array('Image width/height argument in Graph::Graph() must be numeric',0),
-25009 => array('You must specify what scale to use with a call to Graph::SetScale()',0),
-
-25010 => array('Graph::Add() You tried to add a null plot to the graph.',0),
-25011 => array('Graph::AddY2() You tried to add a null plot to the graph.',0),
-25012 => array('Graph::AddYN() You tried to add a null plot to the graph.',0),
-25013 => array('You can only add standard plots to multiple Y-axis',0),
-25014 => array('Graph::AddText() You tried to add a null text to the graph.',0),
-25015 => array('Graph::AddLine() You tried to add a null line to the graph.',0),
-25016 => array('Graph::AddBand() You tried to add a null band to the graph.',0),
-25017 => array('You are using GD 2.x and are trying to use a background images on a non truecolor image. To use background images with GD 2.x it is necessary to enable truecolor by setting the USE_TRUECOLOR constant to TRUE. Due to a bug in GD 2.0.1 using any truetype fonts with truecolor images will result in very poor quality fonts.',0),
-25018 => array('Incorrect file name for Graph::SetBackgroundImage() : "%s" Must have a valid image extension (jpg,gif,png) when using auto detection of image type',1),
-25019 => array('Unknown file extension (%s) in Graph::SetBackgroundImage() for filename: "%s"',2),
-
-25020 => array('Graph::SetScale(): Specified Max value must be larger than the specified Min value.',0),
-25021 => array('Unknown scale specification for Y-scale. (%s)',1),
-25022 => array('Unknown scale specification for X-scale. (%s)',1),
-25023 => array('Unsupported Y2 axis type: "%s" Must be one of (lin,log,int)',1),
-25024 => array('Unsupported Y axis type:  "%s" Must be one of (lin,log,int)',1),
-25025 => array('Unsupported Tick density: %d',1),
-25026 => array('Can\'t draw unspecified Y-scale. You have either: 1. Specified an Y axis for auto scaling but have not supplied any plots. 2. Specified a scale manually but have forgot to specify the tick steps',0),
-25027 => array('Can\'t open cached CSIM "%s" for reading.',1),
-25028 => array('Apache/PHP does not have permission to write to the CSIM cache directory (%s). Check permissions.',1),
-25029 => array('Can\'t write CSIM "%s" for writing. Check free space and permissions.',1),
-
-25030 => array('Missing script name in call to StrokeCSIM(). You must specify the name of the actual image script as the first parameter to StrokeCSIM().',0),
-25031 => array('You must specify what scale to use with a call to Graph::SetScale().',0),
-25032 => array('No plots for Y-axis nbr:%d',1),
-25033 => array('',0),
-25034 => array('Can\'t draw unspecified X-scale. No plots specified.',0),
-25035 => array('You have enabled clipping. Clipping is only supported for graphs at 0 or 90 degrees rotation. Please adjust you current angle (=%d degrees) or disable clipping.',1),
-25036 => array('Unknown AxisStyle() : %s',1),
-25037 => array('The image format of your background image (%s) is not supported in your system configuration. ',1),
-25038 => array('Background image seems to be of different type (has different file extension) than specified imagetype. Specified: %s File: %s',2),
-25039 => array('Can\'t read background image: "%s"',1),
-
-25040 => array('It is not possible to specify both a background image and a background country flag.',0),
-25041 => array('In order to use Country flags as backgrounds you must include the "jpgraph_flags.php" file.',0),
-25042 => array('Unknown background image layout',0),
-25043 => array('Unknown title background style.',0),
-25044 => array('Cannot use auto scaling since it is impossible to determine a valid min/max value of the Y-axis (only null values).',0),
-25045 => array('Font families FF_HANDWRT and FF_BOOK are no longer available due to copyright problem with these fonts. Fonts can no longer be distributed with JpGraph. Please download fonts from http://corefonts.sourceforge.net/',0),
-25046 => array('Specified TTF font family (id=%d) is unknown or does not exist. Please note that TTF fonts are not distributed with JpGraph for copyright reasons. You can find the MS TTF WEB-fonts (arial, courier etc) for download at http://corefonts.sourceforge.net/',1),
-25047 => array('Style %s is not available for font family %s',2),
-25048 => array('Unknown font style specification [%s].',1),
-25049 => array('Font file "%s" is not readable or does not exist.',1),
-
-25050 => array('First argument to Text::Text() must be a string.',0),
-25051 => array('Invalid direction specified for text.',0),
-25052 => array('PANIC: Internal error in SuperScript::Stroke(). Unknown vertical alignment for text',0),
-25053 => array('PANIC: Internal error in SuperScript::Stroke(). Unknown horizontal alignment for text',0),
-25054 => array('Internal error: Unknown grid axis %s',1),
-25055 => array('Axis::SetTickDirection() is deprecated. Use Axis::SetTickSide() instead',0),
-25056 => array('SetTickLabelMargin() is deprecated. Use Axis::SetLabelMargin() instead.',0),
-25057 => array('SetTextTicks() is deprecated. Use SetTextTickInterval() instead.',0),
-25058 => array('Text label interval must be specified >= 1.',0),
-25059 => array('SetLabelPos() is deprecated. Use Axis::SetLabelSide() instead.',0),
-
-25060 => array('Unknown alignment specified for X-axis title. (%s)',1),
-25061 => array('Unknown alignment specified for Y-axis title. (%s)',1),
-25062 => array('Labels at an angle are not supported on Y-axis',0),
-25063 => array('Ticks::SetPrecision() is deprecated. Use Ticks::SetLabelFormat() (or Ticks::SetFormatCallback()) instead',0),
-25064 => array('Minor or major step size is 0. Check that you haven\'t got an accidental SetTextTicks(0) in your code. If this is not the case you might have stumbled upon a bug in JpGraph. Please report this and if possible include the data that caused the problem',0),
-25065 => array('Tick positions must be specified as an array()',0),
-25066 => array('When manually specifying tick positions and labels the number of labels must be the same as the number of specified ticks.',0),
-25067 => array('Your manually specified scale and ticks is not correct. The scale seems to be too small to hold any of the specified tick marks.',0),
-25068 => array('A plot has an illegal scale. This could for example be that you are trying to use text auto scaling to draw a line plot with only one point or that the plot area is too small. It could also be that no input data value is numeric (perhaps only \'-\' or \'x\')',0),
-25069 => array('Grace must be larger then 0',0),
-25070 => array('Either X or Y data arrays contains non-numeric values. Check that the data is really specified as numeric data and not as strings. It is an error to specify data for example as \'-2345.2\' (using quotes).',0),
-25071 => array('You have specified a min value with SetAutoMin() which is larger than the maximum value used for the scale. This is not possible.',0),
-25072 => array('You have specified a max value with SetAutoMax() which is smaller than the minimum value used for the scale. This is not possible.',0),
-25073 => array('Internal error. Integer scale algorithm comparison out of bound (r=%f)',1),
-25074 => array('Internal error. The scale range is negative (%f) [for %s scale] This problem could potentially be caused by trying to use \"illegal\" values in the input data arrays (like trying to send in strings or only NULL values) which causes the auto scaling to fail.',2),
-25075 => array('Can\'t automatically determine ticks since min==max.',0),
-25077 => array('Adjustment factor for color must be > 0',0),
-25078 => array('Unknown color: %s',1),
-25079 => array('Unknown color specification: %s, size=%d',2),
-
-25080 => array('Alpha parameter for color must be between 0.0 and 1.0',0),
-25081 => array('Selected graphic format is either not supported or unknown [%s]',1),
-25082 => array('Illegal sizes specified for width or height when creating an image, (width=%d, height=%d)',2),
-25083 => array('Illegal image size when copying image. Size for copied to image is 1 pixel or less.',0),
-25084 => array('Failed to create temporary GD canvas. Possible Out of memory problem.',0),
-25085 => array('An image can not be created from the supplied string. It is either in a format not supported or the string is representing an corrupt image.',0),
-25086 => array('You only seem to have GD 1.x installed. To enable Alphablending requires GD 2.x or higher. Please install GD or make sure the constant USE_GD2 is specified correctly to reflect your installation. By default it tries to auto detect what version of GD you have installed. On some very rare occasions it may falsely detect GD2 where only GD1 is installed. You must then set USE_GD2 to false.',0),
-25087 => array('This PHP build has not been configured with TTF support. You need to recompile your PHP installation with FreeType support.',0),
-25088 => array('You have a misconfigured GD font support. The call to imagefontwidth() fails.',0),
-25089 => array('You have a misconfigured GD font support. The call to imagefontheight() fails.',0),
-
-25090 => array('Unknown direction specified in call to StrokeBoxedText() [%s]',1),
-25091 => array('Internal font does not support drawing text at arbitrary angle. Use TTF fonts instead.',0),
-25092 => array('There is either a configuration problem with TrueType or a problem reading font file "%s" Make sure file exists and is in a readable place for the HTTP process. (If \'basedir\' restriction is enabled in PHP then the font file must be located in the document root.). It might also be a wrongly installed FreeType library. Try upgrading to at least FreeType 2.1.13 and recompile GD with the correct setup so it can find the new FT library.',1),
-25093 => array('Can not read font file "%s" in call to Image::GetBBoxTTF. Please make sure that you have set a font before calling this method and that the font is installed in the TTF directory.',1),
-25094 => array('Direction for text most be given as an angle between 0 and 90.',0),
-25095 => array('Unknown font font family specification. ',0),
-25096 => array('Can\'t allocate any more colors in palette image. Image has already allocated maximum of %d colors and the palette  is now full. Change to a truecolor image instead',0),
-25097 => array('Color specified as empty string in PushColor().',0),
-25098 => array('Negative Color stack index. Unmatched call to PopColor()',0),
-25099 => array('Parameters for brightness and Contrast out of range [-1,1]',0),
-
-25100 => array('Problem with color palette and your GD setup. Please disable anti-aliasing or use GD2 with true-color. If you have GD2 library installed please make sure that you have set the USE_GD2 constant to true and truecolor is enabled.',0),
-25101 => array('Illegal numeric argument to SetLineStyle(): (%d)',1),
-25102 => array('Illegal string argument to SetLineStyle(): %s',1),
-25103 => array('Illegal argument to SetLineStyle %s',1),
-25104 => array('Unknown line style: %s',1),
-25105 => array('NULL data specified for a filled polygon. Check that your data is not NULL.',0),
-25106 => array('Image::FillToBorder : Can not allocate more colors',0),
-25107 => array('Can\'t write to file "%s". Check that the process running PHP has enough permission.',1),
-25108 => array('Can\'t stream image. This is most likely due to a faulty PHP/GD setup. Try to recompile PHP and use the built-in GD library that comes with PHP.',0),
-25109 => array('Your PHP (and GD-lib) installation does not appear to support any known graphic formats. You need to first make sure GD is compiled as a module to PHP. If you also want to use JPEG images you must get the JPEG library. Please see the PHP docs for details.',0),
-
-25110 => array('Your PHP installation does not support the chosen graphic format: %s',1),
-25111 => array('Can\'t delete cached image %s. Permission problem?',1),
-25112 => array('Cached imagefile (%s) has file date in the future.',1),
-25113 => array('Can\'t delete cached image "%s". Permission problem?',1),
-25114 => array('PHP has not enough permissions to write to the cache file "%s". Please make sure that the user running PHP has write permission for this file if you wan to use the cache system with JpGraph.',1),
-25115 => array('Can\'t set permission for cached image "%s". Permission problem?',1),
-25116 => array('Cant open file from cache "%s"',1),
-25117 => array('Can\'t open cached image "%s" for reading.',1),
-25118 => array('Can\'t create directory "%s". Make sure PHP has write permission to this directory.',1),
-25119 => array('Can\'t set permissions for "%s". Permission problems?',1),
-
-25120 => array('Position for legend must be given as percentage in range 0-1',0),
-25121 => array('Empty input data array specified for plot. Must have at least one data point.',0),
-25122 => array('Stroke() must be implemented by concrete subclass to class Plot',0),
-25123 => array('You can\'t use a text X-scale with specified X-coords. Use a "int" or "lin" scale instead.',0),
-25124 => array('The input data array must have consecutive values from position 0 and forward. The given y-array starts with empty values (NULL)',0),
-25125 => array('Illegal direction for static line',0),
-25126 => array('Can\'t create truecolor image. Check that the GD2 library is properly setup with PHP.',0),
-25127 => array('The library has been configured for automatic encoding conversion of Japanese fonts. This requires that PHP has the mb_convert_encoding() function. Your PHP installation lacks this function (PHP needs the "--enable-mbstring" when compiled).',0),
-25128 => array('The function imageantialias() is not available in your PHP installation. Use the GD version that comes with PHP and not the standalone version.',0),
-25129 => array('Anti-alias can not be used with dashed lines. Please disable anti-alias or use solid lines.',0),
-25130 => array('Too small plot area. (%d x %d). With the given image size and margins there is to little space left for the plot. Increase the plot size or reduce the margins.',2),
-
-25131 => array('StrokeBoxedText2() only supports TTF fonts and not built-in bitmap fonts.',0),
-25132 => array('Undefined property %s.',1),
-25133 => array('Use Graph::SetTheme() after Graph::SetScale().',0),
-
-/*
-**  jpgraph_led
-*/
-
-25500 => array('Multibyte strings must be enabled in the PHP installation in order to run the LED module so that the function mb_strlen() is available. See PHP documentation for more information.',0),
-
-/*
-**---------------------------------------------------------------------------------------------
-** Pro-version strings
-**---------------------------------------------------------------------------------------------
-*/
-
-/*
-**  jpgraph_table
-*/
-
-27001 => array('GTextTable: Invalid argument to Set(). Array argument must be 2 dimensional',0),
-27002 => array('GTextTable: Invalid argument to Set()',0),
-27003 => array('GTextTable: Wrong number of arguments to GTextTable::SetColor()',0),
-27004 => array('GTextTable: Specified cell range to be merged is not valid.',0),
-27005 => array('GTextTable: Cannot merge already merged cells in the range: (%d,%d) to (%d,%d)',4),
-27006 => array('GTextTable: Column argument = %d is outside specified table size.',1),
-27007 => array('GTextTable: Row argument = %d is outside specified table size.',1),
-27008 => array('GTextTable: Column and row size arrays must match the dimensions of the table',0),
-27009 => array('GTextTable: Number of table columns or rows are 0. Make sure Init() or Set() is called.',0),
-27010 => array('GTextTable: No alignment specified in call to SetAlign()',0),
-27011 => array('GTextTable: Unknown alignment specified in SetAlign(). Horizontal=%s, Vertical=%s',2),
-27012 => array('GTextTable: Internal error. Invalid alignment specified =%s',1),
-27013 => array('GTextTable: Argument to FormatNumber() must be a string.',0),
-27014 => array('GTextTable: Table is not initilaized with either a call to Set() or Init()',0),
-27015 => array('GTextTable: Cell image constrain type must be TIMG_WIDTH or TIMG_HEIGHT',0),
-
-/*
-**  jpgraph_windrose
-*/
-
-22001 => array('Total percentage for all windrose legs in a windrose plot can not exceed 100%% !\n(Current max is: %d)',1),
-22002 => array('Graph is too small to have a scale. Please make the graph larger.',0),
-22004 => array('Label specification for windrose directions must have 16 values (one for each compass direction).',0),
-22005 => array('Line style for radial lines must be on of ("solid","dotted","dashed","longdashed") ',0),
-22006 => array('Illegal windrose type specified.',0),
-22007 => array('To few values for the range legend.',0),
-22008 => array('Internal error: Trying to plot free Windrose even though type is not a free windrose',0),
-22009 => array('You have specified the same direction twice, once with an angle and once with a compass direction (%f degrees)',0),
-22010 => array('Direction must either be a numeric value or one of the 16 compass directions',0),
-22011 => array('Windrose index must be numeric or direction label. You have specified index=%d',1),
-22012 => array('Windrose radial axis specification contains a direction which is not enabled.',0),
-22013 => array('You have specified the look&feel for the same compass direction twice, once with text and once with index (Index=%d)',1),
-22014 => array('Index for compass direction must be between 0 and 15.',0),
-22015 => array('You have specified an undefined Windrose plot type.',0),
-22016 => array('Windrose leg index must be numeric or direction label.',0),
-22017 => array('Windrose data contains a direction which is not enabled. Please adjust what labels are displayed.',0),
-22018 => array('You have specified data for the same compass direction twice, once with text and once with index (Index=%d)',1),
-22019 => array('Index for direction must be between 0 and 15. You can\'t specify angles for a Regular Windplot, only index and compass directions.',0),
-22020 => array('Windrose plot is too large to fit the specified Graph size. Please use WindrosePlot::SetSize() to make the plot smaller or increase the size of the Graph in the initial WindroseGraph() call.',0),
-22021 => array('It is only possible to add Text, IconPlot or WindrosePlot to a Windrose Graph',0),
-/*
-**  jpgraph_odometer
-*/
-
-13001 => array('Unknown needle style (%d).',1),
-13002 => array('Value for odometer (%f) is outside specified scale [%f,%f]',3),
-
-/*
-**  jpgraph_barcode
-*/
-
-1001 => array('Unknown encoder specification: %s',1),
-1002 => array('Data validation failed. Can\'t encode [%s] using encoding "%s"',2),
-1003 => array('Internal encoding error. Trying to encode %s is not possible in Code 128',1),
-1004 => array('Internal barcode error. Unknown UPC-E encoding type: %s',1),
-1005 => array('Internal error. Can\'t encode character tuple (%s, %s) in Code-128 charset C',2),
-1006 => array('Internal encoding error for CODE 128. Trying to encode control character in CHARSET != A',0),
-1007 => array('Internal encoding error for CODE 128. Trying to encode DEL in CHARSET != B',0),
-1008 => array('Internal encoding error for CODE 128. Trying to encode small letters in CHARSET != B',0),
-1009 => array('Encoding using CODE 93 is not yet supported.',0),
-1010 => array('Encoding using POSTNET is not yet supported.',0),
-1011 => array('Non supported barcode backend for type %s',1),
-
-/*
-** PDF417
-*/
-26000 => array('PDF417: The PDF417 module requires that the PHP installation must support the function bcmod(). This is normally enabled at compile time. See documentation for more information.',0),
-26001 => array('PDF417: Number of Columns must be >= 1 and <= 30',0),
-26002 => array('PDF417: Error level must be between 0 and 8',0),
-26003 => array('PDF417: Invalid format for input data to encode with PDF417',0),
-26004 => array('PDF417: Can\'t encode given data with error level %d and %d columns since it results in too many symbols or more than 90 rows.',2),
-26005 => array('PDF417: Can\'t open file "%s" for writing',1),
-26006 => array('PDF417: Internal error. Data files for PDF417 cluster %d is corrupted.',1),
-26007 => array('PDF417: Internal error. GetPattern: Illegal Code Value = %d (row=%d)',2),
-26008 => array('PDF417: Internal error. Mode not found in mode list!! mode=%d',1),
-26009 => array('PDF417: Encode error: Illegal character. Can\'t encode character with ASCII code=%d',1),
-26010 => array('PDF417: Internal error: No input data in decode.',0),
-26011 => array('PDF417: Encoding error. Can\'t use numeric encoding on non-numeric data.',0),
-26012 => array('PDF417: Internal error. No input data to decode for Binary compressor.',0),
-26013 => array('PDF417: Internal error. Checksum error. Coefficient tables corrupted.',0),
-26014 => array('PDF417: Internal error. No data to calculate codewords on.',0),
-26015 => array('PDF417: Internal error. State transition table entry 0 is NULL. Entry 1 = (%s)',1),
-26016 => array('PDF417: Internal error: Unrecognized state transition mode in decode.',0),
-
-/*
-** jpgraph_contour
-*/
-
-28001 => array('Third argument to Contour must be an array of colors.',0),
-28002 => array('Number of colors must equal the number of isobar lines specified',0),
-28003 => array('ContourPlot Internal Error: isobarHCrossing: Coloumn index too large (%d)',1),
-28004 => array('ContourPlot Internal Error: isobarHCrossing: Row index too large (%d)',1),
-28005 => array('ContourPlot Internal Error: isobarVCrossing: Row index too large (%d)',1),
-28006 => array('ContourPlot Internal Error: isobarVCrossing: Col index too large (%d)',1),
-28007 => array('ContourPlot interpolation factor is too large (>5)',0),
-
-/*
- * jpgraph_matrix and colormap
-*/
-29201 => array('Min range value must be less or equal to max range value for colormaps',0),
-29202 => array('The distance between min and max value is too small for numerical precision',0),
-29203 => array('Number of color quantification level must be at least %d',1),
-29204 => array('Number of colors (%d) is invalid for this colormap. It must be a number that can be written as: %d + k*%d',3),
-29205 => array('Colormap specification out of range. Must be an integer in range [0,%d]',1),
-29206 => array('Invalid object added to MatrixGraph',0),
-29207 => array('Empty input data specified for MatrixPlot',0),
-29208 => array('Unknown side specifiction for matrix labels "%s"',1),
-29209 => array('CSIM Target matrix must be the same size as the data matrix (csim=%d x %d, data=%d x %d)',4),
-29210 => array('CSIM Target for matrix labels does not match the number of labels (csim=%d, labels=%d)',2),
-
-
-/*
-* jpgraph_theme
-*/
-30001 => array("Theme::%s() is not defined. \nPlease make %s(\$graph) function in your theme classs.",2),
-
-);
-
-?>
diff --git a/#jpgraph/src/lang/prod.inc.php b/#jpgraph/src/lang/prod.inc.php
deleted file mode 100644
index c34c2b3b..00000000
--- a/#jpgraph/src/lang/prod.inc.php
+++ /dev/null
@@ -1,386 +0,0 @@
-<?php
-/*=======================================================================
-// File: 	PROD.INC.PHP
-// Description: Special localization file with the same error messages
-//              for all errors.
-// Created: 	2006-02-18
-// Ver:		$Id: prod.inc.php 1886 2009-10-01 23:30:16Z ljp $
-//
-// Copyright (c) Asial Corporation. All rights reserved.
-//========================================================================
-*/
-
-// The single error message for all errors
-DEFINE('DEFAULT_ERROR_MESSAGE','We are sorry but the system could not generate the requested image. Please contact site support to resolve this problem. Problem no: #');
-
-// Note: Format of each error message is array(<error message>,<number of arguments>)
-$_jpg_messages = array(
-
-/*
-** Headers already sent error. This is formatted as HTML different since this will be sent back directly as text
-*/
-10  => array('<table border=1><tr><td><font color=darkred size=4><b>JpGraph Error:</b>
-HTTP headers have already been sent.<br>Caused by output from file <b>%s</b> at line <b>%d</b>.</font></td></tr><tr><td><b>Explanation:</b><br>HTTP headers have already been sent back to the browser indicating the data as text before the library got a chance to send it\'s image HTTP header to this browser. This makes it impossible for the library to send back image data to the browser (since that would be interpretated as text by the browser and show up as junk text).<p>Most likely you have some text in your script before the call to <i>Graph::Stroke()</i>. If this texts gets sent back to the browser the browser will assume that all data is plain text. Look for any text, even spaces and newlines, that might have been sent back to the browser. <p>For example it is a common mistake to leave a blank line before the opening "<b>&lt;?php</b>".</td></tr></table>',2),
-
-
-11 => array(DEFAULT_ERROR_MESSAGE.'11',0),
-12 => array(DEFAULT_ERROR_MESSAGE.'12',0),
-13 => array(DEFAULT_ERROR_MESSAGE.'13',0),
-2001 => array(DEFAULT_ERROR_MESSAGE.'2001',0),
-2002 => array(DEFAULT_ERROR_MESSAGE.'2002',0),
-2003 => array(DEFAULT_ERROR_MESSAGE.'2003',0),
-2004 => array(DEFAULT_ERROR_MESSAGE.'2004',0),
-2005 => array(DEFAULT_ERROR_MESSAGE.'2005',0),
-2006 => array(DEFAULT_ERROR_MESSAGE.'2006',0),
-2007 => array(DEFAULT_ERROR_MESSAGE.'2007',0),
-2008 => array(DEFAULT_ERROR_MESSAGE.'2008',0),
-2009 => array(DEFAULT_ERROR_MESSAGE.'2009',0),
-2010 => array(DEFAULT_ERROR_MESSAGE.'2010',0),
-2011 => array(DEFAULT_ERROR_MESSAGE.'2011',0),
-2012 => array(DEFAULT_ERROR_MESSAGE.'2012',0),
-2013 => array(DEFAULT_ERROR_MESSAGE.'2013',0),
-2014 => array(DEFAULT_ERROR_MESSAGE.'2014',0),
-3001 => array(DEFAULT_ERROR_MESSAGE.'3001',0),
-4002 => array(DEFAULT_ERROR_MESSAGE.'4002',0),
-5001 => array(DEFAULT_ERROR_MESSAGE.'5001',0),
-5002 => array(DEFAULT_ERROR_MESSAGE.'5002',0),
-5003 => array(DEFAULT_ERROR_MESSAGE.'5003',0),
-5004 => array(DEFAULT_ERROR_MESSAGE.'5004',0),
-6001 => array(DEFAULT_ERROR_MESSAGE.'6001',0),
-6002 => array(DEFAULT_ERROR_MESSAGE.'6002',0),
-6003 => array(DEFAULT_ERROR_MESSAGE.'6003',0),
-6004 => array(DEFAULT_ERROR_MESSAGE.'6004',0),
-6005 => array(DEFAULT_ERROR_MESSAGE.'6005',0),
-6006 => array(DEFAULT_ERROR_MESSAGE.'6006',0),
-6007 => array(DEFAULT_ERROR_MESSAGE.'6007',0),
-6008 => array(DEFAULT_ERROR_MESSAGE.'6008',0),
-6009 => array(DEFAULT_ERROR_MESSAGE.'6009',0),
-6010 => array(DEFAULT_ERROR_MESSAGE.'6010',0),
-6011 => array(DEFAULT_ERROR_MESSAGE.'6011',0),
-6012 => array(DEFAULT_ERROR_MESSAGE.'6012',0),
-6015 => array(DEFAULT_ERROR_MESSAGE.'6015',0),
-6016 => array(DEFAULT_ERROR_MESSAGE.'6016',0),
-6017 => array(DEFAULT_ERROR_MESSAGE.'6017',0),
-6018 => array(DEFAULT_ERROR_MESSAGE.'6018',0),
-6019 => array(DEFAULT_ERROR_MESSAGE.'6019',0),
-6020 => array(DEFAULT_ERROR_MESSAGE.'6020',0),
-6021 => array(DEFAULT_ERROR_MESSAGE.'6021',0),
-6022 => array(DEFAULT_ERROR_MESSAGE.'6022',0),
-6023 => array(DEFAULT_ERROR_MESSAGE.'6023',0),
-6024 => array(DEFAULT_ERROR_MESSAGE.'6024',0),
-6025 => array(DEFAULT_ERROR_MESSAGE.'6025',0),
-6027 => array(DEFAULT_ERROR_MESSAGE.'6027',0),
-6028 => array(DEFAULT_ERROR_MESSAGE.'6028',0),
-6029 => array(DEFAULT_ERROR_MESSAGE.'6029',0),
-6030 => array(DEFAULT_ERROR_MESSAGE.'6030',0),
-6031 => array(DEFAULT_ERROR_MESSAGE.'6031',0),
-6032 => array(DEFAULT_ERROR_MESSAGE.'6032',0),
-6033 => array(DEFAULT_ERROR_MESSAGE.'6033',0),
-7001 => array(DEFAULT_ERROR_MESSAGE.'7001',0),
-8001 => array(DEFAULT_ERROR_MESSAGE.'8001',0),
-8002 => array(DEFAULT_ERROR_MESSAGE.'8002',0),
-8003 => array(DEFAULT_ERROR_MESSAGE.'8003',0),
-8004 => array(DEFAULT_ERROR_MESSAGE.'8004',0),
-9001 => array(DEFAULT_ERROR_MESSAGE.'9001',0),
-10001 => array(DEFAULT_ERROR_MESSAGE.'10001',0),
-10002 => array(DEFAULT_ERROR_MESSAGE.'10002',0),
-10003 => array(DEFAULT_ERROR_MESSAGE.'10003',0),
-11001 => array(DEFAULT_ERROR_MESSAGE.'11001',0),
-11002 => array(DEFAULT_ERROR_MESSAGE.'11002',0),
-11003 => array(DEFAULT_ERROR_MESSAGE.'11003',0),
-11004 => array(DEFAULT_ERROR_MESSAGE.'11004',0),
-11005 => array(DEFAULT_ERROR_MESSAGE.'11005',0),
-12001 => array(DEFAULT_ERROR_MESSAGE.'12001',0),
-12002 => array(DEFAULT_ERROR_MESSAGE.'12002',0),
-12003 => array(DEFAULT_ERROR_MESSAGE.'12003',0),
-12004 => array(DEFAULT_ERROR_MESSAGE.'12004',0),
-12005 => array(DEFAULT_ERROR_MESSAGE.'12005',0),
-12006 => array(DEFAULT_ERROR_MESSAGE.'12006',0),
-12007 => array(DEFAULT_ERROR_MESSAGE.'12007',0),
-12008 => array(DEFAULT_ERROR_MESSAGE.'12008',0),
-12009 => array(DEFAULT_ERROR_MESSAGE.'12009',0),
-12010 => array(DEFAULT_ERROR_MESSAGE.'12010',0),
-12011 => array(DEFAULT_ERROR_MESSAGE.'12011',0),
-12012 => array(DEFAULT_ERROR_MESSAGE.'12012',0),
-14001 => array(DEFAULT_ERROR_MESSAGE.'14001',0),
-14002 => array(DEFAULT_ERROR_MESSAGE.'14002',0),
-14003 => array(DEFAULT_ERROR_MESSAGE.'14003',0),
-14004 => array(DEFAULT_ERROR_MESSAGE.'14004',0),
-14005 => array(DEFAULT_ERROR_MESSAGE.'14005',0),
-14006 => array(DEFAULT_ERROR_MESSAGE.'14006',0),
-14007 => array(DEFAULT_ERROR_MESSAGE.'14007',0),
-15001 => array(DEFAULT_ERROR_MESSAGE.'15001',0),
-15002 => array(DEFAULT_ERROR_MESSAGE.'15002',0),
-15003 => array(DEFAULT_ERROR_MESSAGE.'15003',0),
-15004 => array(DEFAULT_ERROR_MESSAGE.'15004',0),
-15005 => array(DEFAULT_ERROR_MESSAGE.'15005',0),
-15006 => array(DEFAULT_ERROR_MESSAGE.'15006',0),
-15007 => array(DEFAULT_ERROR_MESSAGE.'15007',0),
-15008 => array(DEFAULT_ERROR_MESSAGE.'15008',0),
-15009 => array(DEFAULT_ERROR_MESSAGE.'15009',0),
-15010 => array(DEFAULT_ERROR_MESSAGE.'15010',0),
-15011 => array(DEFAULT_ERROR_MESSAGE.'15011',0),
-15012 => array(DEFAULT_ERROR_MESSAGE.'15012',0),
-16001 => array(DEFAULT_ERROR_MESSAGE.'16001',0),
-16002 => array(DEFAULT_ERROR_MESSAGE.'16002',0),
-16003 => array(DEFAULT_ERROR_MESSAGE.'16003',0),
-16004 => array(DEFAULT_ERROR_MESSAGE.'16004',0),
-17001 => array(DEFAULT_ERROR_MESSAGE.'17001',0),
-17002 => array(DEFAULT_ERROR_MESSAGE.'17002',0),
-17004 => array(DEFAULT_ERROR_MESSAGE.'17004',0),
-18001 => array(DEFAULT_ERROR_MESSAGE.'18001',0),
-18002 => array(DEFAULT_ERROR_MESSAGE.'18002',0),
-18003 => array(DEFAULT_ERROR_MESSAGE.'18003',0),
-18004 => array(DEFAULT_ERROR_MESSAGE.'18004',0),
-18005 => array(DEFAULT_ERROR_MESSAGE.'18005',0),
-18006 => array(DEFAULT_ERROR_MESSAGE.'18006',0),
-18007 => array(DEFAULT_ERROR_MESSAGE.'18007',0),
-18008 => array(DEFAULT_ERROR_MESSAGE.'18008',0),
-19001 => array(DEFAULT_ERROR_MESSAGE.'19001',0),
-19002 => array(DEFAULT_ERROR_MESSAGE.'19002',0),
-19003 => array(DEFAULT_ERROR_MESSAGE.'19003',0),
-20001 => array(DEFAULT_ERROR_MESSAGE.'20001',0),
-20002 => array(DEFAULT_ERROR_MESSAGE.'20002',0),
-20003 => array(DEFAULT_ERROR_MESSAGE.'20003',0),
-21001 => array(DEFAULT_ERROR_MESSAGE.'21001',0),
-23001 => array(DEFAULT_ERROR_MESSAGE.'23001',0),
-23002 => array(DEFAULT_ERROR_MESSAGE.'23002',0),
-23003 => array(DEFAULT_ERROR_MESSAGE.'23003',0),
-24001 => array(DEFAULT_ERROR_MESSAGE.'24001',0),
-24002 => array(DEFAULT_ERROR_MESSAGE.'24002',0),
-24003 => array(DEFAULT_ERROR_MESSAGE.'24003',0),
-24004 => array(DEFAULT_ERROR_MESSAGE.'24004',0),
-25001 => array(DEFAULT_ERROR_MESSAGE.'25001',0),
-25002 => array(DEFAULT_ERROR_MESSAGE.'25002',0),
-25003 => array(DEFAULT_ERROR_MESSAGE.'25003',0),
-25004 => array(DEFAULT_ERROR_MESSAGE.'25004',0),
-25005 => array(DEFAULT_ERROR_MESSAGE.'25005',0),
-25006 => array(DEFAULT_ERROR_MESSAGE.'25006',0),
-25007 => array(DEFAULT_ERROR_MESSAGE.'25007',0),
-25008 => array(DEFAULT_ERROR_MESSAGE.'25008',0),
-25009 => array(DEFAULT_ERROR_MESSAGE.'25009',0),
-25010 => array(DEFAULT_ERROR_MESSAGE.'25010',0),
-25011 => array(DEFAULT_ERROR_MESSAGE.'25011',0),
-25012 => array(DEFAULT_ERROR_MESSAGE.'25012',0),
-25013 => array(DEFAULT_ERROR_MESSAGE.'25013',0),
-25014 => array(DEFAULT_ERROR_MESSAGE.'25014',0),
-25015 => array(DEFAULT_ERROR_MESSAGE.'25015',0),
-25016 => array(DEFAULT_ERROR_MESSAGE.'25016',0),
-25017 => array(DEFAULT_ERROR_MESSAGE.'25017',0),
-25018 => array(DEFAULT_ERROR_MESSAGE.'25018',0),
-25019 => array(DEFAULT_ERROR_MESSAGE.'25019',0),
-25020 => array(DEFAULT_ERROR_MESSAGE.'25020',0),
-25021 => array(DEFAULT_ERROR_MESSAGE.'25021',0),
-25022 => array(DEFAULT_ERROR_MESSAGE.'25022',0),
-25023 => array(DEFAULT_ERROR_MESSAGE.'25023',0),
-25024 => array(DEFAULT_ERROR_MESSAGE.'25024',0),
-25025 => array(DEFAULT_ERROR_MESSAGE.'25025',0),
-25026 => array(DEFAULT_ERROR_MESSAGE.'25026',0),
-25027 => array(DEFAULT_ERROR_MESSAGE.'25027',0),
-25028 => array(DEFAULT_ERROR_MESSAGE.'25028',0),
-25029 => array(DEFAULT_ERROR_MESSAGE.'25029',0),
-25030 => array(DEFAULT_ERROR_MESSAGE.'25030',0),
-25031 => array(DEFAULT_ERROR_MESSAGE.'25031',0),
-25032 => array(DEFAULT_ERROR_MESSAGE.'25032',0),
-25033 => array(DEFAULT_ERROR_MESSAGE.'25033',0),
-25034 => array(DEFAULT_ERROR_MESSAGE.'25034',0),
-25035 => array(DEFAULT_ERROR_MESSAGE.'25035',0),
-25036 => array(DEFAULT_ERROR_MESSAGE.'25036',0),
-25037 => array(DEFAULT_ERROR_MESSAGE.'25037',0),
-25038 => array(DEFAULT_ERROR_MESSAGE.'25038',0),
-25039 => array(DEFAULT_ERROR_MESSAGE.'25039',0),
-25040 => array(DEFAULT_ERROR_MESSAGE.'25040',0),
-25041 => array(DEFAULT_ERROR_MESSAGE.'25041',0),
-25042 => array(DEFAULT_ERROR_MESSAGE.'25042',0),
-25043 => array(DEFAULT_ERROR_MESSAGE.'25043',0),
-25044 => array(DEFAULT_ERROR_MESSAGE.'25044',0),
-25045 => array(DEFAULT_ERROR_MESSAGE.'25045',0),
-25046 => array(DEFAULT_ERROR_MESSAGE.'25046',0),
-25047 => array(DEFAULT_ERROR_MESSAGE.'25047',0),
-25048 => array(DEFAULT_ERROR_MESSAGE.'25048',0),
-25049 => array(DEFAULT_ERROR_MESSAGE.'25049',0),
-25050 => array(DEFAULT_ERROR_MESSAGE.'25050',0),
-25051 => array(DEFAULT_ERROR_MESSAGE.'25051',0),
-25052 => array(DEFAULT_ERROR_MESSAGE.'25052',0),
-25053 => array(DEFAULT_ERROR_MESSAGE.'25053',0),
-25054 => array(DEFAULT_ERROR_MESSAGE.'25054',0),
-25055 => array(DEFAULT_ERROR_MESSAGE.'25055',0),
-25056 => array(DEFAULT_ERROR_MESSAGE.'25056',0),
-25057 => array(DEFAULT_ERROR_MESSAGE.'25057',0),
-25058 => array(DEFAULT_ERROR_MESSAGE.'25058',0),
-25059 => array(DEFAULT_ERROR_MESSAGE.'25059',0),
-25060 => array(DEFAULT_ERROR_MESSAGE.'25060',0),
-25061 => array(DEFAULT_ERROR_MESSAGE.'25061',0),
-25062 => array(DEFAULT_ERROR_MESSAGE.'25062',0),
-25063 => array(DEFAULT_ERROR_MESSAGE.'25063',0),
-25064 => array(DEFAULT_ERROR_MESSAGE.'25064',0),
-25065 => array(DEFAULT_ERROR_MESSAGE.'25065',0),
-25066 => array(DEFAULT_ERROR_MESSAGE.'25066',0),
-25067 => array(DEFAULT_ERROR_MESSAGE.'25067',0),
-25068 => array(DEFAULT_ERROR_MESSAGE.'25068',0),
-25069 => array(DEFAULT_ERROR_MESSAGE.'25069',0),
-25070 => array(DEFAULT_ERROR_MESSAGE.'25070',0),
-25071 => array(DEFAULT_ERROR_MESSAGE.'25071',0),
-25072 => array(DEFAULT_ERROR_MESSAGE.'25072',0),
-25073 => array(DEFAULT_ERROR_MESSAGE.'25073',0),
-25074 => array(DEFAULT_ERROR_MESSAGE.'25074',0),
-25075 => array(DEFAULT_ERROR_MESSAGE.'25075',0),
-25077 => array(DEFAULT_ERROR_MESSAGE.'25077',0),
-25078 => array(DEFAULT_ERROR_MESSAGE.'25078',0),
-25079 => array(DEFAULT_ERROR_MESSAGE.'25079',0),
-25080 => array(DEFAULT_ERROR_MESSAGE.'25080',0),
-25081 => array(DEFAULT_ERROR_MESSAGE.'25081',0),
-25082 => array(DEFAULT_ERROR_MESSAGE.'25082',0),
-25083 => array(DEFAULT_ERROR_MESSAGE.'25083',0),
-25084 => array(DEFAULT_ERROR_MESSAGE.'25084',0),
-25085 => array(DEFAULT_ERROR_MESSAGE.'25085',0),
-25086 => array(DEFAULT_ERROR_MESSAGE.'25086',0),
-25087 => array(DEFAULT_ERROR_MESSAGE.'25087',0),
-25088 => array(DEFAULT_ERROR_MESSAGE.'25088',0),
-25089 => array(DEFAULT_ERROR_MESSAGE.'25089',0),
-25090 => array(DEFAULT_ERROR_MESSAGE.'25090',0),
-25091 => array(DEFAULT_ERROR_MESSAGE.'25091',0),
-25092 => array(DEFAULT_ERROR_MESSAGE.'25092',0),
-25093 => array(DEFAULT_ERROR_MESSAGE.'25093',0),
-25094 => array(DEFAULT_ERROR_MESSAGE.'25094',0),
-25095 => array(DEFAULT_ERROR_MESSAGE.'25095',0),
-25096 => array(DEFAULT_ERROR_MESSAGE.'25096',0),
-25097 => array(DEFAULT_ERROR_MESSAGE.'25097',0),
-25098 => array(DEFAULT_ERROR_MESSAGE.'25098',0),
-25099 => array(DEFAULT_ERROR_MESSAGE.'25099',0),
-25100 => array(DEFAULT_ERROR_MESSAGE.'25100',0),
-25101 => array(DEFAULT_ERROR_MESSAGE.'25101',0),
-25102 => array(DEFAULT_ERROR_MESSAGE.'25102',0),
-25103 => array(DEFAULT_ERROR_MESSAGE.'25103',0),
-25104 => array(DEFAULT_ERROR_MESSAGE.'25104',0),
-25105 => array(DEFAULT_ERROR_MESSAGE.'25105',0),
-25106 => array(DEFAULT_ERROR_MESSAGE.'25106',0),
-25107 => array(DEFAULT_ERROR_MESSAGE.'25107',0),
-25108 => array(DEFAULT_ERROR_MESSAGE.'25108',0),
-25109 => array(DEFAULT_ERROR_MESSAGE.'25109',0),
-25110 => array(DEFAULT_ERROR_MESSAGE.'25110',0),
-25111 => array(DEFAULT_ERROR_MESSAGE.'25111',0),
-25112 => array(DEFAULT_ERROR_MESSAGE.'25112',0),
-25113 => array(DEFAULT_ERROR_MESSAGE.'25113',0),
-25114 => array(DEFAULT_ERROR_MESSAGE.'25114',0),
-25115 => array(DEFAULT_ERROR_MESSAGE.'25115',0),
-25116 => array(DEFAULT_ERROR_MESSAGE.'25116',0),
-25117 => array(DEFAULT_ERROR_MESSAGE.'25117',0),
-25118 => array(DEFAULT_ERROR_MESSAGE.'25118',0),
-25119 => array(DEFAULT_ERROR_MESSAGE.'25119',0),
-25120 => array(DEFAULT_ERROR_MESSAGE.'25120',0),
-25121 => array(DEFAULT_ERROR_MESSAGE.'25121',0),
-25122 => array(DEFAULT_ERROR_MESSAGE.'25122',0),
-25123 => array(DEFAULT_ERROR_MESSAGE.'25123',0),
-25124 => array(DEFAULT_ERROR_MESSAGE.'25124',0),
-25125 => array(DEFAULT_ERROR_MESSAGE.'25125',0),
-25126 => array(DEFAULT_ERROR_MESSAGE.'25126',0),
-25127 => array(DEFAULT_ERROR_MESSAGE.'25127',0),
-25128 => array(DEFAULT_ERROR_MESSAGE.'25128',0),
-25129 => array(DEFAULT_ERROR_MESSAGE.'25129',0),
-25130 => array(DEFAULT_ERROR_MESSAGE.'25130',0),
-25131 => array(DEFAULT_ERROR_MESSAGE.'25131',0),
-25132 => array(DEFAULT_ERROR_MESSAGE.'25132',0),
-25133 => array(DEFAULT_ERROR_MESSAGE.'25133',0),
-25500 => array(DEFAULT_ERROR_MESSAGE.'25500',0),
-24003 => array(DEFAULT_ERROR_MESSAGE.'24003',0),
-24004 => array(DEFAULT_ERROR_MESSAGE.'24004',0),
-24005 => array(DEFAULT_ERROR_MESSAGE.'24005',0),
-24006 => array(DEFAULT_ERROR_MESSAGE.'24006',0),
-24007 => array(DEFAULT_ERROR_MESSAGE.'24007',0),
-24008 => array(DEFAULT_ERROR_MESSAGE.'24008',0),
-24009 => array(DEFAULT_ERROR_MESSAGE.'24009',0),
-24010 => array(DEFAULT_ERROR_MESSAGE.'24010',0),
-24011 => array(DEFAULT_ERROR_MESSAGE.'24011',0),
-24012 => array(DEFAULT_ERROR_MESSAGE.'24012',0),
-24013 => array(DEFAULT_ERROR_MESSAGE.'24013',0),
-24014 => array(DEFAULT_ERROR_MESSAGE.'24014',0),
-24015 => array(DEFAULT_ERROR_MESSAGE.'24015',0),
-22001 => array(DEFAULT_ERROR_MESSAGE.'22001',0),
-22002 => array(DEFAULT_ERROR_MESSAGE.'22002',0),
-22004 => array(DEFAULT_ERROR_MESSAGE.'22004',0),
-22005 => array(DEFAULT_ERROR_MESSAGE.'22005',0),
-22006 => array(DEFAULT_ERROR_MESSAGE.'22006',0),
-22007 => array(DEFAULT_ERROR_MESSAGE.'22007',0),
-22008 => array(DEFAULT_ERROR_MESSAGE.'22008',0),
-22009 => array(DEFAULT_ERROR_MESSAGE.'22009',0),
-22010 => array(DEFAULT_ERROR_MESSAGE.'22010',0),
-22011 => array(DEFAULT_ERROR_MESSAGE.'22011',0),
-22012 => array(DEFAULT_ERROR_MESSAGE.'22012',0),
-22013 => array(DEFAULT_ERROR_MESSAGE.'22013',0),
-22014 => array(DEFAULT_ERROR_MESSAGE.'22014',0),
-22015 => array(DEFAULT_ERROR_MESSAGE.'22015',0),
-22016 => array(DEFAULT_ERROR_MESSAGE.'22016',0),
-22017 => array(DEFAULT_ERROR_MESSAGE.'22017',0),
-22018 => array(DEFAULT_ERROR_MESSAGE.'22018',0),
-22019 => array(DEFAULT_ERROR_MESSAGE.'22019',0),
-22020 => array(DEFAULT_ERROR_MESSAGE.'22020',0),
-13001 => array(DEFAULT_ERROR_MESSAGE.'13001',0),
-13002 => array(DEFAULT_ERROR_MESSAGE.'13002',0),
-1001 => array(DEFAULT_ERROR_MESSAGE.'1001',0),
-1002 => array(DEFAULT_ERROR_MESSAGE.'1002',0),
-1003 => array(DEFAULT_ERROR_MESSAGE.'1003',0),
-1004 => array(DEFAULT_ERROR_MESSAGE.'1004',0),
-1005 => array(DEFAULT_ERROR_MESSAGE.'1005',0),
-1006 => array(DEFAULT_ERROR_MESSAGE.'1006',0),
-1007 => array(DEFAULT_ERROR_MESSAGE.'1007',0),
-1008 => array(DEFAULT_ERROR_MESSAGE.'1008',0),
-1009 => array(DEFAULT_ERROR_MESSAGE.'1009',0),
-1010 => array(DEFAULT_ERROR_MESSAGE.'1010',0),
-1011 => array(DEFAULT_ERROR_MESSAGE.'1011',0),
-26000 => array(DEFAULT_ERROR_MESSAGE.'26000',0),
-26001 => array(DEFAULT_ERROR_MESSAGE.'26001',0),
-26002 => array(DEFAULT_ERROR_MESSAGE.'26002',0),
-26003 => array(DEFAULT_ERROR_MESSAGE.'26003',0),
-26004 => array(DEFAULT_ERROR_MESSAGE.'26004',0),
-26005 => array(DEFAULT_ERROR_MESSAGE.'26005',0),
-26006 => array(DEFAULT_ERROR_MESSAGE.'26006',0),
-26007 => array(DEFAULT_ERROR_MESSAGE.'26007',0),
-26008 => array(DEFAULT_ERROR_MESSAGE.'26008',0),
-26009 => array(DEFAULT_ERROR_MESSAGE.'26009',0),
-26010 => array(DEFAULT_ERROR_MESSAGE.'26010',0),
-26011 => array(DEFAULT_ERROR_MESSAGE.'26011',0),
-26012 => array(DEFAULT_ERROR_MESSAGE.'26012',0),
-26013 => array(DEFAULT_ERROR_MESSAGE.'26013',0),
-26014 => array(DEFAULT_ERROR_MESSAGE.'26014',0),
-26015 => array(DEFAULT_ERROR_MESSAGE.'26015',0),
-26016 => array(DEFAULT_ERROR_MESSAGE.'26016',0),
-
-27001 => array(DEFAULT_ERROR_MESSAGE.'27001',0),
-27002 => array(DEFAULT_ERROR_MESSAGE.'27002',0),
-27003 => array(DEFAULT_ERROR_MESSAGE.'27003',0),
-27004 => array(DEFAULT_ERROR_MESSAGE.'27004',0),
-27005 => array(DEFAULT_ERROR_MESSAGE.'27005',0),
-27006 => array(DEFAULT_ERROR_MESSAGE.'27006',0),
-27007 => array(DEFAULT_ERROR_MESSAGE.'27007',0),
-27008 => array(DEFAULT_ERROR_MESSAGE.'27008',0),
-27009 => array(DEFAULT_ERROR_MESSAGE.'27009',0),
-27010 => array(DEFAULT_ERROR_MESSAGE.'27010',0),
-27011 => array(DEFAULT_ERROR_MESSAGE.'27011',0),
-27012 => array(DEFAULT_ERROR_MESSAGE.'27012',0),
-27013 => array(DEFAULT_ERROR_MESSAGE.'27013',0),
-27014 => array(DEFAULT_ERROR_MESSAGE.'27014',0),
-27015 => array(DEFAULT_ERROR_MESSAGE.'27015',0),
-
-28001 => array(DEFAULT_ERROR_MESSAGE.'28001',0),
-28002 => array(DEFAULT_ERROR_MESSAGE.'28002',0),
-28003 => array(DEFAULT_ERROR_MESSAGE.'28003',0),
-28004 => array(DEFAULT_ERROR_MESSAGE.'28004',0),
-28005 => array(DEFAULT_ERROR_MESSAGE.'28005',0),
-28006 => array(DEFAULT_ERROR_MESSAGE.'28006',0),
-28007 => array(DEFAULT_ERROR_MESSAGE.'28007',0),
-
-29201 => array(DEFAULT_ERROR_MESSAGE.'28001',0),
-29202 => array(DEFAULT_ERROR_MESSAGE.'28002',0),
-29203 => array(DEFAULT_ERROR_MESSAGE.'28003',0),
-29204 => array(DEFAULT_ERROR_MESSAGE.'28004',0),
-29205 => array(DEFAULT_ERROR_MESSAGE.'28005',0),
-29206 => array(DEFAULT_ERROR_MESSAGE.'28006',0),
-29207 => array(DEFAULT_ERROR_MESSAGE.'28007',0),
-29208 => array(DEFAULT_ERROR_MESSAGE.'28008',0),
-29209 => array(DEFAULT_ERROR_MESSAGE.'28009',0),
-29210 => array(DEFAULT_ERROR_MESSAGE.'28010',0),
-
-);
-
-?>
diff --git a/#jpgraph/src/themes/AquaTheme.class.php b/#jpgraph/src/themes/AquaTheme.class.php
deleted file mode 100644
index 751b4202..00000000
--- a/#jpgraph/src/themes/AquaTheme.class.php
+++ /dev/null
@@ -1,202 +0,0 @@
-<?php
-
-/**
-* Aqua Theme class
-*/
-class AquaTheme extends Theme 
-{
-    protected $font_color       = '#0044CC';
-    protected $background_color = '#DDFFFF';
-    protected $axis_color       = '#0066CC';
-    protected $grid_color       = '#3366CC';
-
-    function GetColorList() {
-        return array(
-            '#183152',
-            '#C4D7ED',
-            '#375D81',
-            '#ABC8E2',
-            '#E1E6FA',
-            '#9BBAB2',
-            '#3B4259',
-            '#0063BC',
-            '#1D5A73',
-            '#ABABFF',
-            '#27ADC5',
-            '#EDFFCC',
-
-/*
-
-            '#66FFFF',
-            '#00AABB',
-            '#00FFCC',
-            '#33CCFF',
-            '#008866',
-            '#99FFFF',
-            '#0099FF',
-            '#99FFCC',
-            '#3399FF',
-            '#2277FF',
-            '#445588',
-            '#003388',
-            '#338877',
-            '#55DDFF',
-            '#00FF99',
-            '#BBBBBB',
-            '#77AAFF',
-            '#00FFCC',
-*/
-        );
-    }
-
-    function SetupGraph($graph) {
-
-        // graph
-        /*
-        $img = $graph->img;
-        $height = $img->height;
-        $graph->SetMargin($img->left_margin, $img->right_margin, $img->top_margin, $height * 0.25);
-        */
-        $graph->SetFrame(false);
-        $graph->SetMarginColor('white');
-        $graph->SetBackgroundGradient($this->background_color, '#FFFFFF', GRAD_HOR, BGRAD_PLOT);
-
-        // legend
-        $graph->legend->SetFrameWeight(0);
-        $graph->legend->Pos(0.5, 0.85, 'center', 'top');
-        $graph->legend->SetFillColor('white');
-        $graph->legend->SetLayout(LEGEND_HOR);
-        $graph->legend->SetColumns(3);
-        $graph->legend->SetShadow(false);
-        $graph->legend->SetMarkAbsSize(5);
-
-        // xaxis
-        $graph->xaxis->title->SetColor($this->font_color);  
-        $graph->xaxis->SetColor($this->axis_color, $this->font_color);    
-        $graph->xaxis->SetTickSide(SIDE_BOTTOM);
-        $graph->xaxis->SetLabelMargin(10);
-                
-        // yaxis
-        $graph->yaxis->title->SetColor($this->font_color);  
-        $graph->yaxis->SetColor($this->axis_color, $this->font_color);    
-        $graph->yaxis->SetTickSide(SIDE_LEFT);
-        $graph->yaxis->SetLabelMargin(8);
-        $graph->yaxis->HideLine();
-        $graph->yaxis->HideTicks();
-        $graph->xaxis->SetTitleMargin(15);
-
-        // grid
-        $graph->ygrid->SetColor($this->grid_color);
-        $graph->ygrid->SetLineStyle('dotted');
-
-
-        // font
-        $graph->title->SetColor($this->font_color);
-        $graph->subtitle->SetColor($this->font_color);
-        $graph->subsubtitle->SetColor($this->font_color);
-
-//        $graph->img->SetAntiAliasing();
-    }
-
-
-    function SetupPieGraph($graph) {
-
-        // graph
-        $graph->SetFrame(false);
-
-        // legend
-        $graph->legend->SetFillColor('white');
-
-        $graph->legend->SetFrameWeight(0);
-        $graph->legend->Pos(0.5, 0.80, 'center', 'top');
-        $graph->legend->SetLayout(LEGEND_HOR);
-        $graph->legend->SetColumns(4);
-
-        $graph->legend->SetShadow(false);
-        $graph->legend->SetMarkAbsSize(5);
-
-        // title
-        $graph->title->SetColor($this->font_color);
-        $graph->subtitle->SetColor($this->font_color);
-        $graph->subsubtitle->SetColor($this->font_color);
-
-        $graph->SetAntiAliasing();
-    }
-
-
-    function PreStrokeApply($graph) {
-        if ($graph->legend->HasItems()) {
-            $img = $graph->img;
-            $height = $img->height;
-            $graph->SetMargin(
-                $img->raw_left_margin, 
-                $img->raw_right_margin, 
-                $img->raw_top_margin, 
-                $height * 0.25
-            );
-        }
-    }
-
-    function ApplyPlot($plot) {
-
-        switch (get_class($plot))
-        { 
-            case 'GroupBarPlot':
-            {
-                foreach ($plot->plots as $_plot) {
-                    $this->ApplyPlot($_plot);
-                }
-                break;
-            }
-
-            case 'AccBarPlot':
-            {
-                foreach ($plot->plots as $_plot) {
-                    $this->ApplyPlot($_plot);
-                }
-                break;
-            }
-
-            case 'BarPlot':
-            {
-                $plot->Clear();
-
-                $color = $this->GetNextColor();
-                $plot->SetColor($color);
-                $plot->SetFillColor($color);
-                //$plot->SetShadow();
-                break;
-            }
-
-            case 'LinePlot':
-            {
-                $plot->Clear();
-                $plot->SetColor($this->GetNextColor());
-                $plot->SetWeight(2);
-//                $plot->SetBarCenter();
-                break;
-            }
-
-            case 'PiePlot':
-            {
-                $plot->SetCenter(0.5, 0.45);
-                $plot->ShowBorder(false);
-                $plot->SetSliceColors($this->GetThemeColors());
-                break;
-            }
-
-            case 'PiePlot3D':
-            {
-                $plot->SetSliceColors($this->GetThemeColors());
-                break;
-            }
-    
-            default:
-            {
-            }
-        }
-    }
-}
-
-
-?>
diff --git a/#jpgraph/src/themes/GreenTheme.class.php b/#jpgraph/src/themes/GreenTheme.class.php
deleted file mode 100644
index a61fbd83..00000000
--- a/#jpgraph/src/themes/GreenTheme.class.php
+++ /dev/null
@@ -1,178 +0,0 @@
-<?php
-
-/**
-* Green Theme class
-*/
-class GreenTheme extends Theme 
-{
-    private $font_color       = '#009900';
-    private $background_color = '#EEFFDD';
-    private $axis_color       = '#00CC00';
-    private $grid_color       = '#33CC33';
-
-    function GetColorList() {
-        return array(
-            '#66CC00',
-            '#009900',
-            '#AAFF77',
-            '#559922',
-            '#00CC33',
-            '#99FF00',
-            '#009966',
-            '#00FF99',
-            '#99BB66',
-            '#33FF00',
-            '#DDFFBB',
-            '#669933',
-            '#BBDDCC',
-            '#77CCBB',
-            '#668833',
-            '#BBEE66',
-        );
-    }
-
-    function SetupGraph($graph) {
-
-        // graph
-        /*
-        $img = $graph->img;
-        $height = $img->height;
-        $graph->SetMargin($img->left_margin, $img->right_margin, $img->top_margin, $height * 0.25);
-        */
-        $graph->SetFrame(false);
-        $graph->SetMarginColor('white');
-        $graph->SetBackgroundGradient($this->background_color, '#FFFFFF', GRAD_HOR, BGRAD_PLOT);
-
-        // legend
-        $graph->legend->SetFrameWeight(0);
-        $graph->legend->Pos(0.5, 0.85, 'center', 'top');
-        $graph->legend->SetFillColor('white');
-        $graph->legend->SetLayout(LEGEND_HOR);
-        $graph->legend->SetColumns(3);
-        $graph->legend->SetShadow(false);
-        $graph->legend->SetMarkAbsSize(5);
-
-        // xaxis
-        $graph->xaxis->title->SetColor($this->font_color);  
-        $graph->xaxis->SetColor($this->axis_color, $this->font_color);    
-        $graph->xaxis->SetTickSide(SIDE_BOTTOM);
-        $graph->xaxis->SetLabelMargin(10);
-                
-        // yaxis
-        $graph->yaxis->title->SetColor($this->font_color);  
-        $graph->yaxis->SetColor($this->axis_color, $this->font_color);    
-        $graph->yaxis->SetTickSide(SIDE_LEFT);
-        $graph->yaxis->SetLabelMargin(8);
-        $graph->yaxis->HideLine();
-        $graph->yaxis->HideTicks();
-        $graph->xaxis->SetTitleMargin(15);
-
-        // grid
-        $graph->ygrid->SetColor($this->grid_color);
-        $graph->ygrid->SetLineStyle('dotted');
-
-
-        // font
-        $graph->title->SetColor($this->font_color);
-        $graph->subtitle->SetColor($this->font_color);
-        $graph->subsubtitle->SetColor($this->font_color);
-
-//        $graph->img->SetAntiAliasing();
-    }
-
-
-    function SetupPieGraph($graph) {
-
-        // graph
-        $graph->SetFrame(false);
-
-        // legend
-        $graph->legend->SetFillColor('white');
-        /*
-        $graph->legend->SetFrameWeight(0);
-        $graph->legend->Pos(0.5, 0.85, 'center', 'top');
-        $graph->legend->SetLayout(LEGEND_HOR);
-        $graph->legend->SetColumns(3);
-        */
-        $graph->legend->SetShadow(false);
-        $graph->legend->SetMarkAbsSize(5);
-
-        // title
-        $graph->title->SetColor($this->font_color);
-        $graph->subtitle->SetColor($this->font_color);
-        $graph->subsubtitle->SetColor($this->font_color);
-
-        $graph->SetAntiAliasing();
-    }
-
-
-    function PreStrokeApply($graph) {
-        if ($graph->legend->HasItems()) {
-            $img = $graph->img;
-            $height = $img->height;
-            $graph->SetMargin($img->left_margin, $img->right_margin, $img->top_margin, $height * 0.25);
-        }
-    }
-
-    function ApplyPlot($plot) {
-
-        switch (get_class($plot))
-        { 
-            case 'GroupBarPlot':
-            {
-                foreach ($plot->plots as $_plot) {
-                    $this->ApplyPlot($_plot);
-                }
-                break;
-            }
-
-            case 'AccBarPlot':
-            {
-                foreach ($plot->plots as $_plot) {
-                    $this->ApplyPlot($_plot);
-                }
-                break;
-            }
-
-            case 'BarPlot':
-            {
-                $plot->Clear();
-
-                $color = $this->GetNextColor();
-                $plot->SetColor($color);
-                $plot->SetFillColor($color);
-                $plot->SetShadow('red', 3, 4, false);
-                break;
-            }
-
-            case 'LinePlot':
-            {
-                $plot->Clear();
-
-                $plot->SetColor($this->GetNextColor().'@0.4');
-                $plot->SetWeight(2);
-                break;
-            }
-
-            case 'PiePlot':
-            {
-                $plot->ShowBorder(false);
-                $plot->SetSliceColors($this->GetThemeColors());
-                break;
-            }
-
-            case 'PiePlot3D':
-            {
-                $plot->SetSliceColors($this->GetThemeColors());
-                break;
-            }
-    
-            default:
-            {
-            }
-        }
-    }
-}
-
-
-?>
diff --git a/#jpgraph/src/themes/OceanTheme.class.php b/#jpgraph/src/themes/OceanTheme.class.php
deleted file mode 100644
index b2750360..00000000
--- a/#jpgraph/src/themes/OceanTheme.class.php
+++ /dev/null
@@ -1,180 +0,0 @@
-<?php
-
-/**
-* Ocean Theme class
-*/
-class OceanTheme extends Theme 
-{
-    protected $font_color       = '#0066FF';
-    private $background_color = '#DDEEFF';
-    private $axis_color       = '#0000CC';
-    private $grid_color       = '#3333CC';
-
-    function GetColorList() {
-        return array(
-            '#0066FF',
-            '#CCCCFF',
-            '#0000FF',
-            '#3366FF',
-            '#33CCFF',
-            '#660088',
-            '#3300FF',
-            '#0099FF',
-            '#6633FF',
-            '#0055EE',
-            '#2277EE',
-            '#3300FF',
-            '#AA00EE',
-            '#778899',
-            '#114499',
-            '#7744EE',
-            '#002288',
-            '#6666FF',
-        );
-    }
-
-    function SetupGraph($graph) {
-
-        // graph
-        /*
-        $img = $graph->img;
-        $height = $img->height;
-        $graph->SetMargin($img->left_margin, $img->right_margin, $img->top_margin, $height * 0.25);
-        */
-        $graph->SetFrame(false);
-        $graph->SetMarginColor('white');
-        $graph->SetBackgroundGradient($this->background_color, '#FFFFFF', GRAD_HOR, BGRAD_PLOT);
-
-        // legend
-        $graph->legend->SetFrameWeight(0);
-        $graph->legend->Pos(0.5, 0.85, 'center', 'top');
-        $graph->legend->SetFillColor('white');
-        $graph->legend->SetLayout(LEGEND_HOR);
-        $graph->legend->SetColumns(3);
-        $graph->legend->SetShadow(false);
-        $graph->legend->SetMarkAbsSize(5);
-
-        // xaxis
-        $graph->xaxis->title->SetColor($this->font_color);  
-        $graph->xaxis->SetColor($this->axis_color, $this->font_color);    
-        $graph->xaxis->SetTickSide(SIDE_BOTTOM);
-        $graph->xaxis->SetLabelMargin(10);
-                
-        // yaxis
-        $graph->yaxis->title->SetColor($this->font_color);  
-        $graph->yaxis->SetColor($this->axis_color, $this->font_color);    
-        $graph->yaxis->SetTickSide(SIDE_LEFT);
-        $graph->yaxis->SetLabelMargin(8);
-        $graph->yaxis->HideLine();
-        $graph->yaxis->HideTicks();
-        $graph->xaxis->SetTitleMargin(15);
-
-        // grid
-        $graph->ygrid->SetColor($this->grid_color);
-        $graph->ygrid->SetLineStyle('dotted');
-
-
-        // font
-        $graph->title->SetColor($this->font_color);
-        $graph->subtitle->SetColor($this->font_color);
-        $graph->subsubtitle->SetColor($this->font_color);
-
-//        $graph->img->SetAntiAliasing();
-    }
-
-
-    function SetupPieGraph($graph) {
-
-        // graph
-        $graph->SetFrame(false);
-
-        // legend
-        $graph->legend->SetFillColor('white');
-        /*
-        $graph->legend->SetFrameWeight(0);
-        $graph->legend->Pos(0.5, 0.85, 'center', 'top');
-        $graph->legend->SetLayout(LEGEND_HOR);
-        $graph->legend->SetColumns(3);
-        */
-        $graph->legend->SetShadow(false);
-        $graph->legend->SetMarkAbsSize(5);
-
-        // title
-        $graph->title->SetColor($this->font_color);
-        $graph->subtitle->SetColor($this->font_color);
-        $graph->subsubtitle->SetColor($this->font_color);
-
-        $graph->SetAntiAliasing();
-    }
-
-
-    function PreStrokeApply($graph) {
-        if ($graph->legend->HasItems()) {
-            $img = $graph->img;
-            $height = $img->height;
-            $graph->SetMargin($img->left_margin, $img->right_margin, $img->top_margin, $height * 0.25);
-        }
-    }
-
-    function ApplyPlot($plot) {
-
-        switch (get_class($plot))
-        { 
-            case 'GroupBarPlot':
-            {
-                foreach ($plot->plots as $_plot) {
-                    $this->ApplyPlot($_plot);
-                }
-                break;
-            }
-
-            case 'AccBarPlot':
-            {
-                foreach ($plot->plots as $_plot) {
-                    $this->ApplyPlot($_plot);
-                }
-                break;
-            }
-
-            case 'BarPlot':
-            {
-                $plot->Clear();
-
-                $color = $this->GetNextColor();
-                $plot->SetColor($color);
-                $plot->SetFillColor($color);
-                $plot->SetShadow('red', 3, 4, false);
-                break;
-            }
-
-            case 'LinePlot':
-            {
-                $plot->Clear();
-
-                $plot->SetColor($this->GetNextColor());
-                $plot->SetWeight(2);
-                break;
-            }
-
-            case 'PiePlot':
-            {
-                $plot->ShowBorder(false);
-                $plot->SetSliceColors($this->GetThemeColors());
-                break;
-            }
-
-            case 'PiePlot3D':
-            {
-                $plot->SetSliceColors($this->GetThemeColors());
-                break;
-            }
-    
-            default:
-            {
-            }
-        }
-    }
-}
-
-
-?>
diff --git a/#jpgraph/src/themes/OrangeTheme.class.php b/#jpgraph/src/themes/OrangeTheme.class.php
deleted file mode 100644
index ea26dad8..00000000
--- a/#jpgraph/src/themes/OrangeTheme.class.php
+++ /dev/null
@@ -1,180 +0,0 @@
-<?php
-
-/**
-* Orange Theme class
-*/
-class OrangeTheme extends Theme 
-{
-    private $font_color       = '#CC4400';
-    private $background_color = '#FFEEDD';
-    private $axis_color       = '#CC6600';
-    private $grid_color       = '#CC6633';
-
-    function GetColorList() {
-        return array(
-            '#FF9900',
-            '#FFCC00',
-            '#AA6600',
-            '#CCCC00',
-            '#CC6600',
-            '#FFFF66',
-            '#CCFF00',
-            '#CC3300',
-            '#669933',
-            '#EE7700',
-            '#AAEE33',
-            '#77AA00',
-            '#CCFF99',
-            '#FF6633',
-            '#885500',
-            '#AADD00',
-            '#99CC44',
-            '#887711',
-        );
-    }
-
-    function SetupGraph($graph) {
-
-        // graph
-        /*
-        $img = $graph->img;
-        $height = $img->height;
-        $graph->SetMargin($img->left_margin, $img->right_margin, $img->top_margin, $height * 0.25);
-        */
-        $graph->SetFrame(false);
-        $graph->SetMarginColor('white');
-        $graph->SetBackgroundGradient($this->background_color, '#FFFFFF', GRAD_HOR, BGRAD_PLOT);
-
-        // legend
-        $graph->legend->SetFrameWeight(0);
-        $graph->legend->Pos(0.5, 0.85, 'center', 'top');
-        $graph->legend->SetFillColor('white');
-        $graph->legend->SetLayout(LEGEND_HOR);
-        $graph->legend->SetColumns(3);
-        $graph->legend->SetShadow(false);
-        $graph->legend->SetMarkAbsSize(5);
-
-        // xaxis
-        $graph->xaxis->title->SetColor($this->font_color);  
-        $graph->xaxis->SetColor($this->axis_color, $this->font_color);    
-        $graph->xaxis->SetTickSide(SIDE_BOTTOM);
-        $graph->xaxis->SetLabelMargin(10);
-                
-        // yaxis
-        $graph->yaxis->title->SetColor($this->font_color);  
-        $graph->yaxis->SetColor($this->axis_color, $this->font_color);    
-        $graph->yaxis->SetTickSide(SIDE_LEFT);
-        $graph->yaxis->SetLabelMargin(8);
-        $graph->yaxis->HideLine();
-        $graph->yaxis->HideTicks();
-        $graph->xaxis->SetTitleMargin(15);
-
-        // grid
-        $graph->ygrid->SetColor($this->grid_color);
-        $graph->ygrid->SetLineStyle('dotted');
-
-
-        // font
-        $graph->title->SetColor($this->font_color);
-        $graph->subtitle->SetColor($this->font_color);
-        $graph->subsubtitle->SetColor($this->font_color);
-
-//        $graph->img->SetAntiAliasing();
-    }
-
-
-    function SetupPieGraph($graph) {
-
-        // graph
-        $graph->SetFrame(false);
-
-        // legend
-        $graph->legend->SetFillColor('white');
-        /*
-        $graph->legend->SetFrameWeight(0);
-        $graph->legend->Pos(0.5, 0.85, 'center', 'top');
-        $graph->legend->SetLayout(LEGEND_HOR);
-        $graph->legend->SetColumns(3);
-        */
-        $graph->legend->SetShadow(false);
-        $graph->legend->SetMarkAbsSize(5);
-
-        // title
-        $graph->title->SetColor($this->font_color);
-        $graph->subtitle->SetColor($this->font_color);
-        $graph->subsubtitle->SetColor($this->font_color);
-
-        $graph->SetAntiAliasing();
-    }
-
-
-    function PreStrokeApply($graph) {
-        if ($graph->legend->HasItems()) {
-            $img = $graph->img;
-            $height = $img->height;
-            $graph->SetMargin($img->left_margin, $img->right_margin, $img->top_margin, $height * 0.25);
-        }
-    }
-
-    function ApplyPlot($plot) {
-
-        switch (get_class($plot))
-        { 
-            case 'GroupBarPlot':
-            {
-                foreach ($plot->plots as $_plot) {
-                    $this->ApplyPlot($_plot);
-                }
-                break;
-            }
-
-            case 'AccBarPlot':
-            {
-                foreach ($plot->plots as $_plot) {
-                    $this->ApplyPlot($_plot);
-                }
-                break;
-            }
-
-            case 'BarPlot':
-            {
-                $plot->Clear();
-
-                $color = $this->GetNextColor();
-                $plot->SetColor($color);
-                $plot->SetFillColor($color);
-                $plot->SetShadow('red', 3, 4, false);
-                break;
-            }
-
-            case 'LinePlot':
-            {
-                $plot->Clear();
-
-                $plot->SetColor($this->GetNextColor().'@0.4');
-                $plot->SetWeight(2);
-                break;
-            }
-
-            case 'PiePlot':
-            {
-                $plot->ShowBorder(false);
-                $plot->SetSliceColors($this->GetThemeColors());
-                break;
-            }
-
-            case 'PiePlot3D':
-            {
-                $plot->SetSliceColors($this->GetThemeColors());
-                break;
-            }
-    
-            default:
-            {
-            }
-        }
-    }
-}
-
-
-?>
diff --git a/#jpgraph/src/themes/PastelTheme.class.php b/#jpgraph/src/themes/PastelTheme.class.php
deleted file mode 100644
index d3f1ddb6..00000000
--- a/#jpgraph/src/themes/PastelTheme.class.php
+++ /dev/null
@@ -1,175 +0,0 @@
-<?php
-
-/**
-* Pastel Theme class
-*/
-class PastelTheme extends Theme 
-{
-    private $font_color       = '#0044CC';
-    private $background_color = '#DDFFFF';
-    private $axis_color       = '#0066CC';
-    private $grid_color       = '#3366CC';
-
-    function GetColorList() {
-        return array(
-            '#FFAACC',
-            '#AAEECC',
-            '#AACCFF',
-            '#CCAAFF',
-            '#EEDDFF',
-            '#FFCCAA',
-            '#CCBBDD',
-            '#CCFFAA',
-            '#C7D7C2',
-            '#FFEEDD',
-            '#FFCCEE',
-            '#BFECFA',
-        );
-    }
-
-    function SetupGraph($graph) {
-
-        // graph
-        /*
-        $img = $graph->img;
-        $height = $img->height;
-        $graph->SetMargin($img->left_margin, $img->right_margin, $img->top_margin, $height * 0.25);
-        */
-        $graph->SetFrame(false);
-        $graph->SetMarginColor('white');
-        $graph->SetBackgroundGradient($this->background_color, '#FFFFFF', GRAD_HOR, BGRAD_PLOT);
-
-        // legend
-        $graph->legend->SetFrameWeight(0);
-        $graph->legend->Pos(0.5, 0.85, 'center', 'top');
-        $graph->legend->SetFillColor('white');
-        $graph->legend->SetLayout(LEGEND_HOR);
-        $graph->legend->SetColumns(3);
-        $graph->legend->SetShadow(false);
-        $graph->legend->SetMarkAbsSize(5);
-
-        // xaxis
-        $graph->xaxis->title->SetColor($this->font_color);  
-        $graph->xaxis->SetColor($this->axis_color, $this->font_color);    
-        $graph->xaxis->SetTickSide(SIDE_BOTTOM);
-        $graph->xaxis->SetLabelMargin(10);
-                
-        // yaxis
-        $graph->yaxis->title->SetColor($this->font_color);  
-        $graph->yaxis->SetColor($this->axis_color, $this->font_color);    
-        $graph->yaxis->SetTickSide(SIDE_LEFT);
-        $graph->yaxis->SetLabelMargin(8);
-        $graph->yaxis->HideLine();
-        $graph->yaxis->HideTicks();
-        $graph->xaxis->SetTitleMargin(15);
-
-        // grid
-        $graph->ygrid->SetColor($this->grid_color);
-        $graph->ygrid->SetLineStyle('dotted');
-
-
-        // font
-        $graph->title->SetColor($this->font_color);
-        $graph->subtitle->SetColor($this->font_color);
-        $graph->subsubtitle->SetColor($this->font_color);
-
-//        $graph->img->SetAntiAliasing();
-    }
-
-
-    function SetupPieGraph($graph) {
-
-        // graph
-        $graph->SetFrame(false);
-
-        // legend
-        $graph->legend->SetFillColor('white');
-
-        $graph->legend->SetFrameWeight(0);
-        $graph->legend->Pos(0.5, 0.80, 'center', 'top');
-        $graph->legend->SetLayout(LEGEND_HOR);
-        $graph->legend->SetColumns(4);
-
-        $graph->legend->SetShadow(false);
-        $graph->legend->SetMarkAbsSize(5);
-
-        // title
-        $graph->title->SetColor($this->font_color);
-        $graph->subtitle->SetColor($this->font_color);
-        $graph->subsubtitle->SetColor($this->font_color);
-
-        $graph->SetAntiAliasing();
-    }
-
-
-    function PreStrokeApply($graph) {
-        if ($graph->legend->HasItems()) {
-            $img = $graph->img;
-            $height = $img->height;
-            $graph->SetMargin($img->left_margin, $img->right_margin, $img->top_margin, $height * 0.25);
-        }
-    }
-
-    function ApplyPlot($plot) {
-
-        switch (get_class($plot))
-        { 
-            case 'GroupBarPlot':
-            {
-                foreach ($plot->plots as $_plot) {
-                    $this->ApplyPlot($_plot);
-                }
-                break;
-            }
-
-            case 'AccBarPlot':
-            {
-                foreach ($plot->plots as $_plot) {
-                    $this->ApplyPlot($_plot);
-                }
-                break;
-            }
-
-            case 'BarPlot':
-            {
-                $plot->Clear();
-
-                $color = $this->GetNextColor();
-                $plot->SetColor($color);
-                $plot->SetFillColor($color);
-                $plot->SetShadow('red', 3, 4, false);
-                break;
-            }
-
-            case 'LinePlot':
-            {
-                $plot->Clear();
-                $plot->SetColor($this->GetNextColor().'@0.4');
-                $plot->SetWeight(2);
-//                $plot->SetBarCenter();
-                break;
-            }
-
-            case 'PiePlot':
-            {
-                $plot->SetCenter(0.5, 0.45);
-                $plot->ShowBorder(false);
-                $plot->SetSliceColors($this->GetThemeColors());
-                break;
-            }
-
-            case 'PiePlot3D':
-            {
-                $plot->SetSliceColors($this->GetThemeColors());
-                break;
-            }
-    
-            default:
-            {
-            }
-        }
-    }
-}
-
-
-?>
diff --git a/#jpgraph/src/themes/RoseTheme.class.php b/#jpgraph/src/themes/RoseTheme.class.php
deleted file mode 100644
index 5a146300..00000000
--- a/#jpgraph/src/themes/RoseTheme.class.php
+++ /dev/null
@@ -1,180 +0,0 @@
-<?php
-
-/**
-* Rose Theme class
-*/
-class RoseTheme extends Theme 
-{
-    private $font_color       = '#CC0044';
-    private $background_color = '#FFDDDD';
-    private $axis_color       = '#CC0000';
-    private $grid_color       = '#CC3333';
-
-    function GetColorList() {
-        return array(
-            '#FF0000',
-            '#FF99FF',
-            '#AA0099',
-            '#FF00FF',
-            '#FF6666',
-            '#FF0099',
-            '#FFBB88',
-            '#AA2211',
-            '#FF6699',
-            '#BBAA88',
-            '#FF2200',
-            '#883333',
-            '#EE7777',
-            '#EE7711',
-            '#FF0066',
-            '#DD7711',
-            '#AA6600',
-            '#EE5500',
-        );
-    }
-
-    function SetupGraph($graph) {
-
-        // graph
-        /*
-        $img = $graph->img;
-        $height = $img->height;
-        $graph->SetMargin($img->left_margin, $img->right_margin, $img->top_margin, $height * 0.25);
-        */
-        $graph->SetFrame(false);
-        $graph->SetMarginColor('white');
-        $graph->SetBackgroundGradient($this->background_color, '#FFFFFF', GRAD_HOR, BGRAD_PLOT);
-
-        // legend
-        $graph->legend->SetFrameWeight(0);
-        $graph->legend->Pos(0.5, 0.85, 'center', 'top');
-        $graph->legend->SetFillColor('white');
-        $graph->legend->SetLayout(LEGEND_HOR);
-        $graph->legend->SetColumns(3);
-        $graph->legend->SetShadow(false);
-        $graph->legend->SetMarkAbsSize(5);
-
-        // xaxis
-        $graph->xaxis->title->SetColor($this->font_color);  
-        $graph->xaxis->SetColor($this->axis_color, $this->font_color);    
-        $graph->xaxis->SetTickSide(SIDE_BOTTOM);
-        $graph->xaxis->SetLabelMargin(10);
-                
-        // yaxis
-        $graph->yaxis->title->SetColor($this->font_color);  
-        $graph->yaxis->SetColor($this->axis_color, $this->font_color);    
-        $graph->yaxis->SetTickSide(SIDE_LEFT);
-        $graph->yaxis->SetLabelMargin(8);
-        $graph->yaxis->HideLine();
-        $graph->yaxis->HideTicks();
-        $graph->xaxis->SetTitleMargin(15);
-
-        // grid
-        $graph->ygrid->SetColor($this->grid_color);
-        $graph->ygrid->SetLineStyle('dotted');
-
-
-        // font
-        $graph->title->SetColor($this->font_color);
-        $graph->subtitle->SetColor($this->font_color);
-        $graph->subsubtitle->SetColor($this->font_color);
-
-//        $graph->img->SetAntiAliasing();
-    }
-
-
-    function SetupPieGraph($graph) {
-
-        // graph
-        $graph->SetFrame(false);
-
-        // legend
-        $graph->legend->SetFillColor('white');
-        /*
-        $graph->legend->SetFrameWeight(0);
-        $graph->legend->Pos(0.5, 0.85, 'center', 'top');
-        $graph->legend->SetLayout(LEGEND_HOR);
-        $graph->legend->SetColumns(3);
-        */
-        $graph->legend->SetShadow(false);
-        $graph->legend->SetMarkAbsSize(5);
-
-        // title
-        $graph->title->SetColor($this->font_color);
-        $graph->subtitle->SetColor($this->font_color);
-        $graph->subsubtitle->SetColor($this->font_color);
-
-        $graph->SetAntiAliasing();
-    }
-
-
-    function PreStrokeApply($graph) {
-        if ($graph->legend->HasItems()) {
-            $img = $graph->img;
-            $height = $img->height;
-            $graph->SetMargin($img->left_margin, $img->right_margin, $img->top_margin, $height * 0.25);
-        }
-    }
-
-    function ApplyPlot($plot) {
-
-        switch (get_class($plot))
-        { 
-            case 'GroupBarPlot':
-            {
-                foreach ($plot->plots as $_plot) {
-                    $this->ApplyPlot($_plot);
-                }
-                break;
-            }
-
-            case 'AccBarPlot':
-            {
-                foreach ($plot->plots as $_plot) {
-                    $this->ApplyPlot($_plot);
-                }
-                break;
-            }
-
-            case 'BarPlot':
-            {
-                $plot->Clear();
-
-                $color = $this->GetNextColor();
-                $plot->SetColor($color);
-                $plot->SetFillColor($color);
-                $plot->SetShadow('red', 3, 4, false);
-                break;
-            }
-
-            case 'LinePlot':
-            {
-                $plot->Clear();
-
-                $plot->SetColor($this->GetNextColor().'@0.4');
-                $plot->SetWeight(2);
-                break;
-            }
-
-            case 'PiePlot':
-            {
-                $plot->ShowBorder(false);
-                $plot->SetSliceColors($this->GetThemeColors());
-                break;
-            }
-
-            case 'PiePlot3D':
-            {
-                $plot->SetSliceColors($this->GetThemeColors());
-                break;
-            }
-    
-            default:
-            {
-            }
-        }
-    }
-}
-
-
-?>
diff --git a/#jpgraph/src/themes/SoftyTheme.class.php b/#jpgraph/src/themes/SoftyTheme.class.php
deleted file mode 100644
index 222cf85a..00000000
--- a/#jpgraph/src/themes/SoftyTheme.class.php
+++ /dev/null
@@ -1,209 +0,0 @@
-<?php
-
-/**
-* Softy Theme class
-*/
-class SoftyTheme extends Theme 
-{
-    protected $font_color       = '#000000';
-    protected $background_color = '#F7F8F4';
-    protected $axis_color       = '#000000';
-    protected $grid_color       = '#CCCCCC';
-
-    function GetColorList() {
-        return array(
-            '#CFE7FB',
-            '#F9D76F',
-            '#B9D566',
-            '#FFBB90',
-            '#66BBBB',
-            '#E69090',
-            '#BB90BB',
-            '#9AB67C',
-            '#D1CC66',
-
-/*
-
-            '#AFD8F8',
-            '#F6BD0F',
-            '#8BBA00',
-            '#FF8E46',
-            '#008E8E',
-
-            '#D64646',
-            '#8E468E',
-            '#588526',
-            '#B3AA00',
-            '#008ED6',
-
-            '#9D080D',
-            '#A186BE',
-            */
-        );
-    }
-
-    function SetupGraph($graph) {
-
-        // graph
-        $graph->SetFrame(false);
-        $graph->SetMarginColor('white');
-
-        // legend
-        $graph->legend->SetFrameWeight(0);
-        $graph->legend->Pos(0.5, 0.85, 'center', 'top');
-        $graph->legend->SetFillColor('white');
-        $graph->legend->SetLayout(LEGEND_HOR);
-        $graph->legend->SetColumns(3);
-        $graph->legend->SetShadow(false);
-        $graph->legend->SetMarkAbsSize(5);
-
-        // xaxis
-        $graph->xaxis->title->SetColor($this->font_color);  
-        $graph->xaxis->SetColor($this->axis_color, $this->font_color);    
-        $graph->xaxis->SetTickSide(SIDE_BOTTOM);
-        $graph->xaxis->SetLabelMargin(10);
-                
-        // yaxis
-        $graph->yaxis->title->SetColor($this->font_color);  
-        $graph->yaxis->SetColor($this->axis_color, $this->font_color);    
-        $graph->yaxis->SetTickSide(SIDE_LEFT);
-        $graph->yaxis->SetLabelMargin(8);
-        $graph->yaxis->HideLine();
-        $graph->yaxis->HideTicks();
-        $graph->xaxis->SetTitleMargin(15);
-
-        // y2~
-        if (isset($graph->y2axis)) {
-            $graph->y2axis->title->SetColor($this->font_color);  
-            $graph->y2axis->SetColor($this->axis_color, $this->font_color);    
-            $graph->y2axis->SetTickSide(SIDE_LEFT);
-            $graph->y2axis->SetLabelMargin(8);
-            $graph->y2axis->HideLine();
-            $graph->y2axis->HideTicks();
-        }
-
-        // yn
-        if (isset($graph->y2axis)) {
-            foreach ($graph->ynaxis as $axis) {
-                $axis->title->SetColor($this->font_color);  
-                $axis->SetColor($this->axis_color, $this->font_color);    
-                $axis->SetTickSide(SIDE_LEFT);
-                $axis->SetLabelMargin(8);
-                $axis->HideLine();
-                $axis->HideTicks();
-            }
-        }
-
-        // grid
-        $graph->ygrid->SetColor($this->grid_color);
-        $graph->ygrid->SetLineStyle('dotted');
-        $graph->ygrid->SetFill(true, '#FFFFFF', $this->background_color);
-        $graph->xgrid->Show();
-        $graph->xgrid->SetColor($this->grid_color);
-        $graph->xgrid->SetLineStyle('dotted');
-
-
-        // font
-        $graph->title->SetColor($this->font_color);
-        $graph->subtitle->SetColor($this->font_color);
-        $graph->subsubtitle->SetColor($this->font_color);
-
-//        $graph->img->SetAntiAliasing();
-    }
-
-
-    function SetupPieGraph($graph) {
-
-        // graph
-        $graph->SetFrame(false);
-
-        // title
-        $graph->title->SetColor($this->font_color);
-        $graph->subtitle->SetColor($this->font_color);
-        $graph->subsubtitle->SetColor($this->font_color);
-
-        $graph->SetAntiAliasing();
-    }
-
-
-    function PreStrokeApply($graph) {
-        if ($graph->legend->HasItems()) {
-            $img = $graph->img;
-            $graph->SetMargin($img->left_margin, $img->right_margin, $img->top_margin, $img->height * 0.25);
-//            $graph->SetMargin(200, $img->right_margin, $img->top_margin, $height * 0.25);
-        }
-    }
-
-    function ApplyPlot($plot) {
-
-        switch (get_class($plot))
-        { 
-            case 'BarPlot':
-            {
-                $plot->Clear();
-
-                $color = $this->GetNextColor();
-                $plot->SetColor($color);
-                $plot->SetFillColor($color);
-                $plot->SetShadow('red', 3, 4, false);
-                $plot->value->SetAlign('center', 'center');
-                break;
-            }
-
-            case 'LinePlot':
-            {
-                $plot->Clear();
-
-                $plot->SetColor($this->GetNextColor());
-                $plot->SetWeight(2);
-//                $plot->SetBarCenter();
-                break;
-            }
-
-            case 'PiePlot':
-            {
-                $plot->ShowBorder(false);
-                $plot->SetSliceColors($this->GetThemeColors());
-                break;
-            }
-
-
-            case 'GroupBarPlot':
-            {
-                foreach ($plot->plots as $_plot) {
-                    $this->ApplyPlot($_plot);
-                }
-                break;
-            }
-
-            case 'AccBarPlot':
-            {
-                $plot->value->SetAlign('center', 'center');
-                foreach ($plot->plots as $_plot) {
-                    $this->ApplyPlot($_plot);
-                    $_plot->SetValuePos('center');
-                }
-                break;
-            }
-
-            case 'ScatterPlot':
-            {
-                break;
-            }
-
-
-            case 'PiePlot3D':
-            {
-                $plot->SetSliceColors($this->GetThemeColors());
-                break;
-            }
-    
-            default:
-            {
-            }
-        }
-    }
-}
-
-
-?>
diff --git a/#jpgraph/src/themes/UniversalTheme.class.php b/#jpgraph/src/themes/UniversalTheme.class.php
deleted file mode 100644
index 44b57a6e..00000000
--- a/#jpgraph/src/themes/UniversalTheme.class.php
+++ /dev/null
@@ -1,188 +0,0 @@
-<?php
-
-/**
-* Universal Theme class
-*/
-class UniversalTheme extends Theme 
-{
-    private $font_color       = '#444444';
-    private $background_color = '#F4F4F4';
-    private $axis_color       = '#888888';
-    private $grid_color       = '#E3E3E3';
-
-    function GetColorList() {
-        return array(
-            '#61a9f3',#blue
-            '#f381b9',#red
-            '#61E3A9',#green
-
-            #'#D56DE2',
-            '#85eD82',
-            '#F7b7b7',
-            '#CFDF49',
-            '#88d8f2',
-            '#07AF7B',
-            '#B9E3F9',
-            '#FFF3AD',
-            '#EF606A',
-            '#EC8833',
-            '#FFF100',
-            '#87C9A5',
-        );
-    }
-
-    function SetupGraph($graph) {
-
-        // graph
-        /*
-        $img = $graph->img;
-        $height = $img->height;
-        $graph->SetMargin($img->left_margin, $img->right_margin, $img->top_margin, $height * 0.25);
-        */
-        $graph->SetFrame(false);
-        $graph->SetMarginColor('white');
-        $graph->SetBox(true, '#DADADA');
-//        $graph->SetBackgroundGradient($this->background_color, '#FFFFFF', GRAD_HOR, BGRAD_PLOT);
-
-        // legend
-        $graph->legend->SetFrameWeight(0);
-        $graph->legend->Pos(0.5, 0.85, 'center', 'top');
-        $graph->legend->SetFillColor('white');
-        $graph->legend->SetLayout(LEGEND_HOR);
-        $graph->legend->SetColumns(3);
-        $graph->legend->SetShadow(false);
-        $graph->legend->SetMarkAbsSize(5);
-
-        // xaxis
-        $graph->xaxis->title->SetColor($this->font_color);  
-        $graph->xaxis->SetColor($this->axis_color, $this->font_color);    
-        $graph->xaxis->SetTickSide(SIDE_BOTTOM);
-        $graph->xaxis->SetLabelMargin(10);
-        $graph->xaxis->HideTicks();
-        $graph->xaxis->SetTitleMargin(15);
-        //$graph->xaxis->SetLabelMargin(30);
-                
-        // yaxis
-        $graph->yaxis->title->SetColor($this->font_color);  
-        $graph->yaxis->SetColor($this->axis_color, $this->font_color);    
-        $graph->yaxis->SetTickSide(SIDE_LEFT);
-        $graph->yaxis->SetLabelMargin(8);
-//        $graph->yaxis->SetTickPositions(array(50, 100, 150));
-//        $graph->yaxis->HideLine();
-        $graph->yaxis->HideTicks();
-
-        // grid
-        $graph->ygrid->SetColor($this->grid_color);
-        $graph->ygrid->SetFill(true, '#FFFFFF', $this->background_color);
- //       $graph->ygrid->SetLineStyle('dotted');
-
-
-        // font
-        $graph->title->SetColor($this->font_color);
-        $graph->subtitle->SetColor($this->font_color);
-        $graph->subsubtitle->SetColor($this->font_color);
-
-        $graph->img->SetAntiAliasing();
-    }
-
-
-    function SetupPieGraph($graph) {
-
-        // graph
-        $graph->SetFrame(false);
-
-        // legend
-        $graph->legend->SetFillColor('white');
-
-        $graph->legend->SetFrameWeight(0);
-        $graph->legend->Pos(0.5, 0.80, 'center', 'top');
-        $graph->legend->SetLayout(LEGEND_HOR);
-        $graph->legend->SetColumns(4);
-
-        $graph->legend->SetShadow(false);
-        $graph->legend->SetMarkAbsSize(5);
-
-        // title
-        $graph->title->SetColor($this->font_color);
-        $graph->subtitle->SetColor($this->font_color);
-        $graph->subsubtitle->SetColor($this->font_color);
-
-        $graph->SetAntiAliasing();
-    }
-
-
-    function PreStrokeApply($graph) {
-        if ($graph->legend->HasItems()) {
-            $img = $graph->img;
-            $height = $img->height;
-            $graph->SetMargin(
-                $img->raw_left_margin, 
-                $img->raw_right_margin, 
-                $img->raw_top_margin, 
-                $height * 0.25
-            );
-        }
-    }
-
-    function ApplyPlot($plot) {
-
-        switch (get_class($plot))
-        { 
-            case 'GroupBarPlot':
-            {
-                foreach ($plot->plots as $_plot) {
-                    $this->ApplyPlot($_plot);
-                }
-                break;
-            }
-
-            case 'AccBarPlot':
-            {
-                foreach ($plot->plots as $_plot) {
-                    $this->ApplyPlot($_plot);
-                }
-                break;
-            }
-
-            case 'BarPlot':
-            {
-                $plot->Clear();
-
-                $color = $this->GetNextColor();
-                $plot->SetColor($color);
-                $plot->SetFillColor($color);
-                $plot->SetShadow('red', 3, 4, false);
-                break;
-            }
-
-            case 'LinePlot':
-            {
-                $plot->Clear();
-                $plot->SetColor($this->GetNextColor().'@0.4');
-                $plot->SetWeight(2);
-                break;
-            }
-
-            case 'PiePlot':
-            {
-                $plot->SetCenter(0.5, 0.45);
-                $plot->ShowBorder(false);
-                $plot->SetSliceColors($this->GetThemeColors());
-                break;
-            }
-
-            case 'PiePlot3D':
-            {
-                $plot->SetSliceColors($this->GetThemeColors());
-                break;
-            }
-    
-            default:
-            {
-            }
-        }
-    }
-}
-
-
-?>
diff --git a/#jpgraph/src/themes/VividTheme.class.php b/#jpgraph/src/themes/VividTheme.class.php
deleted file mode 100644
index 38a77091..00000000
--- a/#jpgraph/src/themes/VividTheme.class.php
+++ /dev/null
@@ -1,175 +0,0 @@
-<?php
-
-/**
-* Vivid Theme class
-*/
-class VividTheme extends Theme 
-{
-    private $font_color       = '#0044CC';
-    private $background_color = '#DDFFFF';
-    private $axis_color       = '#0066CC';
-    private $grid_color       = '#3366CC';
-
-    function GetColorList() {
-        return array(
-            '#FFFB11',
-            '#005EBC',
-            '#9AEB67',
-            '#FF4A26',
-            '#FDFF98',
-            '#6B7EFF',
-            '#BCE02E',
-            '#E0642E',
-            '#E0D62E',
-            '#2E97E0',
-            '#02927F',
-            '#FF005A',
-        );
-    }
-
-    function SetupGraph($graph) {
-
-        // graph
-        /*
-        $img = $graph->img;
-        $height = $img->height;
-        $graph->SetMargin($img->left_margin, $img->right_margin, $img->top_margin, $height * 0.25);
-        */
-        $graph->SetFrame(false);
-        $graph->SetMarginColor('white');
-        $graph->SetBackgroundGradient($this->background_color, '#FFFFFF', GRAD_HOR, BGRAD_PLOT);
-
-        // legend
-        $graph->legend->SetFrameWeight(0);
-        $graph->legend->Pos(0.5, 0.85, 'center', 'top');
-        $graph->legend->SetFillColor('white');
-        $graph->legend->SetLayout(LEGEND_HOR);
-        $graph->legend->SetColumns(3);
-        $graph->legend->SetShadow(false);
-        $graph->legend->SetMarkAbsSize(5);
-
-        // xaxis
-        $graph->xaxis->title->SetColor($this->font_color);  
-        $graph->xaxis->SetColor($this->axis_color, $this->font_color);    
-        $graph->xaxis->SetTickSide(SIDE_BOTTOM);
-        $graph->xaxis->SetLabelMargin(10);
-                
-        // yaxis
-        $graph->yaxis->title->SetColor($this->font_color);  
-        $graph->yaxis->SetColor($this->axis_color, $this->font_color);    
-        $graph->yaxis->SetTickSide(SIDE_LEFT);
-        $graph->yaxis->SetLabelMargin(8);
-        $graph->yaxis->HideLine();
-        $graph->yaxis->HideTicks();
-        $graph->xaxis->SetTitleMargin(15);
-
-        // grid
-        $graph->ygrid->SetColor($this->grid_color);
-        $graph->ygrid->SetLineStyle('dotted');
-
-
-        // font
-        $graph->title->SetColor($this->font_color);
-        $graph->subtitle->SetColor($this->font_color);
-        $graph->subsubtitle->SetColor($this->font_color);
-
-//        $graph->img->SetAntiAliasing();
-    }
-
-
-    function SetupPieGraph($graph) {
-
-        // graph
-        $graph->SetFrame(false);
-
-        // legend
-        $graph->legend->SetFillColor('white');
-
-        $graph->legend->SetFrameWeight(0);
-        $graph->legend->Pos(0.5, 0.80, 'center', 'top');
-        $graph->legend->SetLayout(LEGEND_HOR);
-        $graph->legend->SetColumns(4);
-
-        $graph->legend->SetShadow(false);
-        $graph->legend->SetMarkAbsSize(5);
-
-        // title
-        $graph->title->SetColor($this->font_color);
-        $graph->subtitle->SetColor($this->font_color);
-        $graph->subsubtitle->SetColor($this->font_color);
-
-        $graph->SetAntiAliasing();
-    }
-
-
-    function PreStrokeApply($graph) {
-        if ($graph->legend->HasItems()) {
-            $img = $graph->img;
-            $height = $img->height;
-            $graph->SetMargin($img->left_margin, $img->right_margin, $img->top_margin, $height * 0.25);
-        }
-    }
-
-    function ApplyPlot($plot) {
-
-        switch (get_class($plot))
-        { 
-            case 'GroupBarPlot':
-            {
-                foreach ($plot->plots as $_plot) {
-                    $this->ApplyPlot($_plot);
-                }
-                break;
-            }
-
-            case 'AccBarPlot':
-            {
-                foreach ($plot->plots as $_plot) {
-                    $this->ApplyPlot($_plot);
-                }
-                break;
-            }
-
-            case 'BarPlot':
-            {
-                $plot->Clear();
-
-                $color = $this->GetNextColor();
-                $plot->SetColor($color);
-                $plot->SetFillColor($color);
-                $plot->SetShadow('red', 3, 4, false);
-                break;
-            }
-
-            case 'LinePlot':
-            {
-                $plot->Clear();
-                $plot->SetColor($this->GetNextColor().'@0.4');
-                $plot->SetWeight(2);
-//                $plot->SetBarCenter();
-                break;
-            }
-
-            case 'PiePlot':
-            {
-                $plot->SetCenter(0.5, 0.45);
-                $plot->ShowBorder(false);
-                $plot->SetSliceColors($this->GetThemeColors());
-                break;
-            }
-
-            case 'PiePlot3D':
-            {
-                $plot->SetSliceColors($this->GetThemeColors());
-                break;
-            }
-    
-            default:
-            {
-            }
-        }
-    }
-}
-
-
-?>
diff --git a/#pma/CONTRIBUTING.md b/#pma/CONTRIBUTING.md
deleted file mode 100644
index e13da812..00000000
--- a/#pma/CONTRIBUTING.md
+++ /dev/null
@@ -1,34 +0,0 @@
-# Contributing to phpMyAdmin
-
-As an open source project, phpMyAdmin welcomes contributions of many forms.
-
-## Bug reporting
-
-We appreciate your effort to improve phpMyAdmin by submitting a bug report. Before doing so, please check the following things: 
-
-1. Check whether the bug you face **hasn't been already reported**. Duplicate reports takes us time, that we could be used to fix other bugs or make improvements. 
-2. Specify the phpMyAdmin, server, PHP, MySQL and browser information that may be helpful to fix the problem, especially exact **version numbers**. 
-3. If you got some error, please **describe what happened** and add error message. Reports like "I get error when I clicked on some link." are useless. 
-4. Provide easy steps to reproduce and if possible include your table structure (``SHOW CREATE TABLE `tbl_name```); if your problem implies specific data, attach a small export file for sample rows. 
-5. **Security problems** should not be reported here. See [our security page](https://www.phpmyadmin.net/security/).
-Thanks for your help! 
-
-Please report [bugs on GitHub][1].
-
-[1]: https://github.com/phpmyadmin/phpmyadmin/issues/new
-
-## Patches submission
-
-Patches are welcome as [pull requests on GitHub][2].  Please include a
-Signed-off-by tag.  Note that by submitting patches with the Signed-off-by
-tag, you are giving permission to license the patch as GPLv2-or-later.  See
-[the DCO file][3] for details.
-
-[2]: https://github.com/phpmyadmin/phpmyadmin/pulls
-[3]: https://github.com/phpmyadmin/phpmyadmin/blob/master/DCO
-
-## More information
-
-You can find more information on our website:
-
-https://www.phpmyadmin.net/contribute/
diff --git a/#pma/ChangeLog b/#pma/ChangeLog
deleted file mode 100644
index 29de1421..00000000
--- a/#pma/ChangeLog
+++ /dev/null
@@ -1,417 +0,0 @@
-phpMyAdmin - ChangeLog
-======================
-
-4.6.5.2 (2016-12-05)
-- issue #12765 Fixed SQL export with newlines
-
-4.6.5.1 (2016-11-25)
-- issue #12735 Incorrect parameters to escapeString in Node.php
-- issue #12734 Fix PHP error when mbstring is not installed
-- issue #12736 Don't force partition count to be specified when creating a new table
-
-4.6.5 (2016-11-24)
-- issue        Remove potentionally license problematic sRGB profile
-- issue #12459 Display read only fields as read only when editing
-- issue #12384 Fix expanding of navigation pane when clicking on database
-- issue #12430 Impove partitioning support
-- issue #12374 Reintroduced simplified PmaAbsoluteUri configuration directive
-- issue        Always use UTC time in HTTP headers
-- issue #12479 Simplified validation of external links
-- issue #12483 Fix browsing tables with built in transformations
-- issue #12485 Do not show warning about short blowfish_secret if none is set
-- issue #12251 Fixed random logouts due to wrong cookie path
-- issue #12480 Fixed editing of ENUM/SET/DECIMAL fields structure
-- issue #12497 Missing escaping of configuration used in SQL (hide_db and only_db)
-- issue #12476 Add error checking in reading advisory rules file
-- issue #12477 Add checking missing elements and confirming element types from json_decode
-- issue #12251 Automatically save SQL query in browser local storage rather than in cookie
-- issue #12292 Unable to edit transformations
-- issue #12502 Remove unused paramenter when connecting to MySQLi
-- issue #12303 Fix number formatting with different settings of precision in PHP
-- issue #12405 Use single quotes in PHP code
-- issue #12534 Option for the dropped column is not removed from 'after_field' select, after the column is dropped
-- issue #12531 Properly detect DROP DATABASE queries
-- issue #12470 Fix possible race condition in setting URL hash
-- issue #11924 Remove caching of server information
-- issue #11628 Proper parsing of INSERT ... ON DUPLICATE KEY queries
-- issue #12545 Proper parsing of CREATE TABLE ... PARTITION queries
-- issue #12473 Code can throw unhandled exception
-- issue #12550 Do not try to keep alive session even after expiry
-- issue #12512 Fixed rendering BBCode links in setup
-- issue #12518 Fixed copy of table with generated columns
-- issue #12221 Fixed export of table with generated columns
-- issue #12320 Copying a user does not copy usergroup
-- issue #12272 Adding a new row with default enum goes to no selection when you want to add more then 2 rows
-- issue #12487 Drag and drop import prevents file dropping to blob column file selector on the insert tab
-- issue #12554 Absence of scrolling makes it impossible to read longer text values in grid editing
-- issue #12530 "Edit routine" crashes when the current user is not the definer, even if privileges are adequate
-- issue #12300 Export selective tables by-default dumps Events also
-- issue #12298 Fixed export of view definitions
-- issue #12242 Edit routine detail dialog does not fill "Return length" field in mysql functions
-- issue #12575 New index Confirm adds whitespace around the field name
-- issue #12382 Bug in zoom search
-- issue #12321 Assign LIMIT clause only to syntactically correct queries
-- issue #12461 Can't Execute SQL With Sub-Query Due To "LIMIT 0,25" Inserted At Wrong Place
-- issue #12511 Clarify documentation on ArbitraryServerRegexp
-- issue #12508 Remove duplicate code in SQL escaping
-- issue #12475 Cleanup code for getting table information
-- issue #12579 phpMyAdmin's export of a Select statment without a FROM clause generates Wrong SQL
-- issue #12316 Correct export of complex SELECT statements
-- issue #12080 Fixed parsing of subselect queries
-- issue #11740 Fixed handling DELETE ... USING queries
-- issue #12100 Fixed handling of CASE operator
-- issue #12455 Query history stores separate entry for every letter typed
-- issue #12327 Create PHP code no longer works
-- issue #12179 Fixed bookmarking of query with multiple statements
-- issue #12419 Wrong description on GRANT OPTION
-- issue #12615 Fixed regexp for matching browser versions
-- issue #12569 Avoid showing import errors twice
-- issue #12362 prefs_manage.php can leave an orphaned temporary file
-- issue #12619 Unable to export csv when using union select
-- issue #12625 Broken Edit links in query results of JOIN query
-- issue #12634 Drop DB error in import if DB doesn't exist
-- issue #12338 Designer reverts to first saved ER after EACH relation create or delete
-- issue #12639 'Show trace' in Console generates JS error for functions in query's trace called without any arguments
-- issue #12366 Fix user creation with certain MariaDB setups
-- issue #12616 Refuse to work with mbstring.func_overload enabled
-- issue #12472 Properly report connection without password in setup
-- issue #12365 Fix records count for large tables
-- issue #12533 Fix records count for complex queries
-- issue #12454 Query history not updated in console until page refresh
-- issue #12344 Fixed parsing of labels in loop
-- issue #12228 Fixed parsing of BEGIN labels
-- issue #12637 Fixed editing some timestamp values
-- issue #12622 Fixed javascript error in designer
-- issue #12334 Missing page indicator or VIEWs
-- issue #12610 Export of tables with Timestamp/Datetime/Time columns defined with ON UPDATE clause with precision fails
-- issue #12661 Error inserting into pma__history after timeout
-- issue #12195 Row_format = fixed not visible
-- issue #12665 Cannot add a foreign key - non-indexed fields not listed in InnoDB tables
-- issue #12674 Allow for proper MySQL-allowed strings as identifiers
-- issue #12651 Allow for partial dates on table insert page
-- issue #12681 Fixed designer with tables using special chars
-- issue #12652 Fixed visual query builder for foreign keys with more fields
-- issue #12257 Improved search page performance
-- issue #12322 Avoid selecting default function for foreign keys
-- issue #12453 Fixed escaping of SQL parts in some corner cases
-- issue #12542 Missing table name in account privileges editor
-- issue #12691 Remove ksort call on empty array in PMA_getPlugins function
-- issue #12443 Check parameter type before processing
-- issue #12299 Avoid generating too long URLs in search
-- issue #12361 Fix self SQL injection in table-specific privileges
-- issue #12698 Add link to release notes and download on new version notification
-- issue #12712 Error when trying to setup replication (fatal error in call to an old PMA_DBI_connect function)
-- issue        [security] Unsafe generation of $cfg['blowfish_secret'], see PMASA-2016-58
-- issue        [security] phpMyAdmin's phpinfo functionality is removed, see PMASA-2016-59
-- issue        [security] AllowRoot and allow/deny rule bypass with specially-crafted username, see PMASA-2016-60
-- issue        [security] Username matching weaknesses with allow/deny rules, see PMASA-2016-61
-- issue        [security] Possible to bypass logout timeout, see PMASA-2016-62
-- issue        [security] Full path disclosure (FPD) weaknesses, see PMASA-2016-63
-- issue        [security] Multiple XSS weaknesses, see PMASA-2016-64
-- issue        [security] Multiple denial-of-service (DOS) vulnerabilities, see PMASA-2016-65
-- issue        [security] Possible to bypass white-list protection for URL redirection, see PMASA-2016-66
-- issue        [security] BBCode injection to login page, see PMASA-2016-67
-- issue        [security] Denial-of-service (DOS) vulnerability in table partitioning, see PMASA-2016-68
-- issue        [security] Multiple SQL injection vulnerabilities, see PMASA-2016-69
-- issue        [security] Incorrect serialized string parsing, see PMASA-2016-70
-- issue        [security] CSRF token not stripped from the URL, see PMASA-2016-71
-
-4.6.4 (2016-08-16)
-- issue        [security] Weaknesses with cookie encryption, see PMASA-2016-29
-- issue        [security] Improve session cookie code for openid.php and signon.php example files
-- issue        [security] Full path disclosure in openid.php and signon.php example files
-- issue        [security] Multiple XSS vulnerabilities, see PMASA-2016-30
-- issue        [security] Multiple XSS vulnerabilities, see PMASA-2016-31
-- issue        [security] Unsafe generation of BlowfishSecret (when not supplied by the user)
-- issue        [security] Referrer leak when phpinfo is enabled
-- issue        [security] PHP code injection, see PMASA-2016-32
-- issue        [security] Full path disclosure, see PMASA-2016-33
-- issue        [security] SQL injection attack, see PMASA-2016-34
-- issue        [security] Local file exposure through LOAD DATA LOCAL INFILE, see PMASA-2016-35
-- issue        [security] Local file exposure through symlinks with UploadDir, see PMASA-2016-36
-- issue        [security] Path traversal with SaveDir and UploadDir, see PMASA-2016-37
-- issue        [security] Multiple XSS vulnerabilities, see PMASA-2016-38
-- issue        [security] SQL injection vulnerability as control user, see PMASA-2016-39
-- issue        [security] SQL injection vulnerability, see PMASA-2016-40
-- issue        [security] Denial-of-service attack through transformation feature, see PMASA-2016-41
-- issue        [security] SQL injection vulnerability as control user, see PMASA-2016-42
-- issue        [security] Verify data before unserializing, see PMASA-2016-43
-- issue        [security] Use HTTPS for wiki links
-- issue        Remove Swekey support
-- issue        [security] SSRF in setup script, see PMASA-2016-44
-- issue        [security] Denial-of-service attack with $cfg['AllowArbitraryServer'] = true and persistent connections, see PMASA-2016-45
-- issue        [security] Improve SSL certificate handling
-- issue        [security] Fix full path disclosure in debugging code
-- issue        [security] Possible circumvention of IP-based allow/deny rules with IPv6 and proxy server, see PMASA-2016-47
-- issue        [security] Detect if user is logged in, see PMASA-2016-48
-- issue        [security] Bypass URL redirection protection, see PMASA-2016-49
-- issue        [security] Referrer leak, see PMASA-2016-50
-- issue        [security] Reflected File Download, see PMASA-2016-51
-- issue        [security] ArbitraryServerRegexp bypass, see PMASA-2016-52
-- issue        [security] Denial-of-service attack by entering long password, see PMASA-2016-53
-- issue        [security] Remote code execution vulnerability when running as CGI, see PMASA-2016-054
-- issue        [security] Administrators could trigger SQL injection attack against users
-- issue        [security] Denial-of-service attack when PHP uses dbase extension, see PMASA-2016-55
-- issue        [security] Remove tode execution vulnerability when PHP uses dbase extension, see PMASA-2016-56
-- issue        [security] Denial-of-service attack by using for loops, see PMASA-2016-46
-- issue        Include X-Robots-Tag header in responses
-- issue        Enforce numeric field length when creating table
-- issue        Fixed invalid Content-Length in some HTTP responses
-- issue #12394 Create view should require a view name
-- issue #12391 Message with 'Change password successfully' displayed, but does not take effect
-- issue        Tighten control on PHP sessions and session cookies
-- issue #12409 Re-enable overhead on server databases view
-- issue #12414 Fixed rendering of Original theme
-- issue #12413 Fixed deleting users in non English locales
-- issue #12416 Fixed replication status output in Databases listing
-- issue #12303 Avoid typecasting to float when not needed
-- issue #12425 Duplicate message variable names in messages.inc.php
-- issue #12399 Adding index to table shows wrong top navigation
-- issue #12424 Fixed password change on MariaDB without auth plugin
-- issue #12339 Do not error on unset server port
-- issue #12422 Improvements to the original theme
-- issue #12395 Do not try to load old transformation plugins
-- issue #12423 Fixed replication status in database listing
-- issue #12433 Copy table with prefix does not copy the indexes
-- issue #12375 Search in database: Window content is not scrolling down when clicking first time on Browse link
-- issue #12346 SQL Editor textareas can have their size increased from the top, distorting the page view
-
-4.6.3 (2016-06-23)
-- issue #12249 Fixed cookie path on Windows
-- issue #12279 Fixed error reporting on connect problems
-- issue #12290 Fixed export of tables without explicitly set engine
-- issue #12285 Designer JavaScript error: Show/Hide tables list
-- issue #12293 Fix MySQL SSL connection with some PHP versions
-- issue #12279 Fix MySQL connection error on version mismatch
-- issue #12281 Keep user attributes (privileges, authentication mode, etc) when copying a user
-- issue #12308 Fix division by zero in case of misconfigured MySQL server
-- issue #12317 Fix editing server variables
-- issue #12303 Fix table size calculation in some circumstances
-- issue #12310 Fix listing routines for non privileged user
-- issue        Escape generated query in exporting a database
-- issue        Setup script doesn't use input type 'password' in all relevant locations
-- issue        [security] BBCode injection in setup script, see PMASA-2016-17
-- issue        [security] Cookie attribute injection attack, see PMASA-2016-18
-- issue        Redirect loop when directly calling url.php
-- issue        [security] SQL injection attack, see PMASA-2016-19
-- issue        [security] XSS attack in Table Structure page, see PMASA-2016-20
-- issue        [security] XSS attack in Server Privileges page, see PMASA-2016-21
-- issue        [security] DOS attack vulnerability, see PMASA-2016-22
-- issue        [security] Multiple full path disclosure vulnerabilities, see PMASA-2016-23
-- issue        [security] Full path disclosure when running in debug mode
-- issue        [security] XSS attack with partition range and table structure, see PMASA-2016-25
-- issue        [security] XSS attack when checking database privileges, see PMASA-2016-26
-- issue        [security] XSS attack when MySQL server is using a specific payload log_bin directive, see PMASA-2016-26
-- issue        [security] XSS vulnerabilities in Transformation feature, see PMASA-2016-26
-
-4.6.2 (2016-05-25)
-- issue        [security] User SQL queries can be revealed through URL GET parameters, see PMASA-2016-14
-- issue        [security] Self XSS vulneratbility, see PMASA-2016-16
-- issue #12225 Use https for documentation links
-- issue #12234 Fix schema export with too many tables
-- issue #12240 Avoid parsing non JSON responses as JSON
-- issue #12244 Avoid using too log URLs when getting javascripts
-- issue #12118 Fixed setting mixed case languages
-- issue #12229 Avoid storing objects in session when debugging SQL
-- issue #12249 Fix cookie path on IIS
-- issue #11705 Fix occassional 200 errors on Windows
-- issue #12219 Fix locking issues when importing SQL
-- issue #12231 Avoid confusing warning when mysql extension is missing
-- issue        Improve handling of logout
-- issue        Safer handling of sessions during authentication
-- issue #12209 Fix server selection on main page
-- issue #12192 Avoid storing full error data in session
-- issue #12082 Fixed export of ARCHIVE tables with keys
-- issue #11565 Add session reload for config authentication
-- issue #12229 Do not fail on errors stored in session
-- issue #12248 Fix loading of APC based upload progress bar
-
-4.6.1 (2016-05-02)
-- issue #12120 PMA_Util not found in insert_edit.lib.php
-- issue #12118 Fixed activation of some languages
-- issue #12121 Fixed error in 3NF step of normalization
-- issue #12135 Fix offering JSON datatype in incompatible MySQL versions
-- issue #12132 Can not open table with JSON field
-- issue #12125 Cannot highlight a column if I scroll down from the top of the table
-- issue #12154 Fixed possible PHP error in SQL parser
-- issue #12029 Fixed SQL quoting in SQL export
-- issue #12129 Improve performance of database structure page
-- issue #12159 Fix PHP error if user did unpack new version over old one
-- issue #12165 Fix parsing of expression 0
-- issue #12146 Document setup with Google Cloud SQL
-- issue #12197 Fix parsing of queries with double \
-- issue #12202 Fixed setting of language from user configuration
-- issue #12200 Fixed check for ndb version
-- issue #12206 Fixed loading of configuration file
-- issue #12204 Check if sessions are working and report failures
-- issue #12211 non-clickable initial letter for users / and can't modify users with MySQL 5.7.12
-- issue #12215 Fixed config tab persistence errors
-- issue #12217 Fixed javascript erros on user creation
-- issue #12144 Fixed parsing of some AS clauses
-- issue #12205 Fixed parsing of FULL OUTER JOIN queries
-- issue #12171 Fixed editing of VIEW structure
-- issue #12208 Avoid printing executed queries on import
-
-4.6.0.0 (2016-03-22)
-+ issue #11456 Disabled storage engines
-+ issue #11479 Allow setting routine wise privileges
-- issue        Hide Insert tab for non-updatable views
-+ issue #11490 UI for defining partitioning in create table window
-+ issue #11438 Support JSON data type
-+ issue        Editing partitions in table Structure
-- issue        Tracking does not make sense for information_schema
-- issue #11550 Regression in Find and replace
-+ issue #11619 TokuDB Tables Show Size as "unknown"
-+ issue #11654 Use a slider for Internal relations
-+ issue #11641 Ability to disable the navigationhiding Feature
-- issue #11647 Restrict configuration NavigationTreeDbSeparator to strings
-- issue #11667 Disable the tooltip in the navigation panel's filter box
-+ issue        Copy results to clipboard
-+ issue #11504 Reactivate cut&paste possibility in print view
-- issue #11702 Extraneous message after edit + grid-edit
-- issue #11668 Table header is empty with browsing an empty table
-+ issue #11701 Allow changing parameter order of routines
-- issue #11708 Remove no password warning
-+ issue #11711 Clarify the meaning of "Stand-in structure for view" in SQL export
-- issue        HTML line break shown after a MySQL connection error message
-- issue #11728 CSV import skip row count after
-- issue        Fixed displaying of SQL query on table operations
-- issue #6321  Display binary strings as text if they are valid UTF-8
-+ issue #11743 Display routine specific privileges
-+ issue #11538 Copy multiple tables to database
-+ issue        Support Cloudflare Flexible SSL
-- issue        Handle empty TABLE_COMMENT
-+ issue #11833 Drop support for old Internet Explorer versions
-+ issue #11796 Use modals for displaying forms in db structure page
-+ issue #11789 Show MySQL error messages in user language
-+ issue        Add 'ssl_verify' configuration directive for self-signed certificates with mysqlnd and PHP >= 5.6
-+ issue #11874 Show more used PHP extensions
-- issue #11874 Report when version check and error reporting are disabled
-- issue #11849 Fix PDF schema export
-- issue #11412 Remove ForceSSL configuration directive
-- issue        Remove support for Mozilla Prism
-- issue #11412 Remove PmaAbsoluteUri configuration directive
-- issue #11914 Fix autoloading of phpseclib
-- issue #11880 Fixed rendering of missing extension error
-- issue #11923 Errors on Structure tab when user only has select access on certain columns
-- issue #11972 Missing documentation for $cfg['Servers'][$i]['favorite'] and $cfg['NumFavoriteTables']
-- issue #11907 Avoid displaying UPDATE query twice
-- issue #11850 Fixed CSV import
-- issue        Fix SQL syntax highlighting in database search page
-- issue #12056 Fix error when we can not generate random string
-- issue #12055 Fixed PHP syntax error in templates
-- issue #12054 Fixed processing of queries with escaped quotes
-- issue #12041 Fixed exporting tables with fields DEFAULT and COMMENT
-- issue #12073 Hide edit and delete buttons when the results are not related to a table
-- issue #12083 Fixed parsing of field definition
-- issue #12081 Fixed rendering of table stats
-- issue #11705 Fixed problems with PHP on Windows on table structure
-- issue #12085 Like search strings being escaped incorrectly
-- issue #12092 Rename exported databases/tables doesn't seem to work
-- issue #12099 Undefined index: controllink
-- issue #12094 PHP Fatal error: Call to undefined function __()
-- issue #12098 Fix login after logout with http authentication
-- issue #12074 Fixed possible invalid SQL export
-- issue #12026 Fixed parsing of UNION SELECT with brackets
-- issue #12109 Fixed parsing of CREATE TABLE [AS] SELECT
-- issue #12105 Multi-server drap-and-drop import always fails
-- issue #12116 Fulltext indexes are not copied when using copy database function
-
-4.5.5.1 (2016-02-29)
-- issue #11971 CREATE UNIQUE INDEX index type is not recognized by parser.
-- issue #11982 Row count wrong when grouping joined tables.
-- issue #12012 Column definition with default value and comment in CREATE TABLE expoerted faulty.
-- issue #12020 New statement but no delimiter and unexpected token with REPLACE.
-- issue #12029 Fixed incorrect usage of SQL parser context in SQL export
-- issue        [security] XSS vulnerability in SQL parser, see PMASA-2016-10.
-- issue        [security] Multiple XSS vulnerabilities, see PMASA-2016-11.
-- issue        [security] Multiple XSS vulnerabilities, see PMASA-2016-12.
-- issue        [security] Vulnerability allowing man-in-the-middle attack on API call to GitHub, see PMASA-2016-13.
-- issue #12048 Fixed inclusion of gettext library from SQL parser
-
-4.5.5.0 (2016-02-22)
-- issue        Undefined index: is_ajax_request
-- issue #11855 Fix password change on MariaDB 10.1 and newer
-- issue #11874 Validate version information before further processing it
-- issue #11881 Full processlist lost on refresh
-- issue #11834 Adjust privileges fails if database name contains underscores
-- issue #11906 'Loading...' banner shows on login screen
-- issue #11930 Fixed changing of table parameters, eg. AUTO_INCREMENT
-- issue #11885 Call to undefined function SqlParser\ctype_alnum()
-- issue #11879 4.5.3.1 - NOW() function not recognized by parser
-- issue #11867 Gracefully handle the DESC statement
-- issue #11843 Fractional timestamp causes corrupted SQL export
-- issue #11836 Static analysis error for valid WHERE condition with IF keyword
-- issue #11800 Syntax Verifier error using REGEXP in SQL statement
-- issue #11799 Backslashes in comments are being interpreted as escape characters
-- issue #11909 Can't insert row into table that contains generated column
-- issue #11677 sql-parser and php-gettext collide.
-- issue #11920 Can't disable backquotes in export
-- issue #11911 Inserts via tbl_change.php in VARBINARY columns does not allow using HEX() and MD5()
-- issue #11939 Correct content type for uploaded error reports
-- issue #11940 Silent errors from checking local documentation
-- issue #11944 Fixed error on servers with disabled php_uname
-- issue #11946 Correctly store and report file upload errors
-- issue #11948 Avoid javascript errors on invalid location hash
-- issue #11950 Fix PHP warning on configuration errors
-- issue #11951 Silent errors on checking for writable folders
-- issue #11952 Silent warning on invalid file upload
-- issue #11953 Do not fail getting filename with open_basedir limitations
-- issue #11956 unrecognized keyword interval
-- issue        Field names and aliases are being correctly parsed now.
-- issue #11959 Fix javascript error in setup
-- issue #11964 Undefined index: TABLE_COMMENT in database structure page
-- issue #11967 Fix PHP error on loading invalid XML or ODS file
-- issue #11969 Missing confirmation while dropping a view in view_operations.php
-- issue #11968 Fix export of index comments in SQL
-- issue #11979 DECLARE not accepted as valid SQL
-
-4.5.4.1 (2016-01-29)
-- issue #11892 Error with PMA 4.4.15.3
-- issue #11896 Remove hard dependency on phpseclib
-
-4.5.4.0 (2016-01-28)
-- issue #11724 live data edit of big sets is not working
-- issue        Table list not saved in db QBE bookmarked search
-- issue #11777 While 'changing a column', query fails with a syntax error after the 'CHARSET=' keyword
-- issue #11783 Avoid syntax error in javascript messages on invalid PHP setting for max_input_vars
-- issue #11784 Properly handle errors in upacking zip archive
-- issue #11785 Set PHP's internal encoding to UTF-8
-- issue #11786 Fixed Kanji encoding in some specific cases
-- issue #11787 Check whether iconv works before using it
-- issue #11788 Avoid conversion of MySQL error messages
-- issue #11792 Undefined index: parameters
-- issue #11802 Undefined index: field_name_orig
-- issue        Undefined index: host
-- issue #11810 'Add to central columns' (per column button) does nothing
-- issue #11727 SQL duplicate entry error trying to INSERT in designer_settings table
-- issue #11798 Fix handling of databases with dot in a name
-- issue #11820 Fix hiding of page content behind menu
-- issue #11780 FROM clause not generated after loading search bookmark
-- issue #11826 Fix creating/editing VIEW with DEFINER containing special chars
-- issue #11828 Do not invoke FLUSH PRIVILEGES when server in --skip-grant-tables
-- issue #11804 Misleading message for configuration storage
-- issue #11772 Table pagination does nothing when session expired
-- issue #11840 Index comments not working properly
-- issue #11791 Better handle local storage errors
-- issue #11752 Improve detection of privileges for privilege adjusting
-- issue #11854 Undefined property: stdClass::$releases at version check when disabled in config
-- issue #11814 SQL comment and variable stripped from bookmark on save
-- issue        Gracefully handle errors in regex based javascript search
-- issue        [security] Multiple full path disclosure vulnerabilities, see PMASA-2016-1
-- issue        [security] Unsafe generation of CSRF token, see PMASA-2016-2
-- issue        [security] Multiple XSS vulnerabilities, see PMASA-2016-3
-- issue        [security] Insecure password generation in JavaScript, see PMASA-2016-4
-- issue        [security] Unsafe comparison of CSRF token, see PMASA-2016-5
-- issue        [security] Multiple full path disclosure vulnerabilities, see PMASA-2016-6
-- issue        [security] XSS vulnerability in normalization page, see PMASA-2016-7
-- issue        [security] Full path disclosure vulnerability in SQL parser, see PMASA-2016-8
-- issue        [security] XSS vulnerability in SQL editor, see PMASA-2016-9
-
-         --- Older ChangeLogs can be found on our project website ---
-                     https://www.phpmyadmin.net/old-stuff/ChangeLogs/
-
-# vim: et ts=4 sw=4 sts=4
-# vim: ft=changelog fenc=utf-8
-# vim: fde=getline(v\:lnum-1)=~'^\\s*$'&&getline(v\:lnum)=~'\\S'?'>1'\:1&&v\:lnum>4&&getline(v\:lnum)!~'^#'
-# vim: fdn=1 fdm=expr
diff --git a/#pma/DCO b/#pma/DCO
deleted file mode 100644
index 49b75da9..00000000
--- a/#pma/DCO
+++ /dev/null
@@ -1,44 +0,0 @@
-If you would like to make a contribution to the phpMyAdmin Project, please
-certify to the following:
-***
-phpMyAdmin Developer's Certificate of Origin. Version 1.0
-
-By making a contribution to this project, I certify that:
-
-(a) The contribution was created in whole or in part by me and I have the
-    right to submit it under the license of "GNU General Public License or
-    any later version" ("GPLv2-or-later"); or
-
-(b) The contribution is based upon previous work that, to the best of my
-    knowledge, is covered under an appropriate open source license and I have
-    the right under that license to submit that work with modifications,
-    whether created in whole or in part by me, under GPLv2-or-later; or
-
-(c) The contribution was provided directly to me by some other person who
-    certified (a) or (b) and I have not modified it.
-
-(d) I understand and agree that this project and the contribution are public
-    and that a record of the contribution (including all metadata and
-    personal information I submit with it, including my sign-off) is
-    maintained indefinitely and may be redistributed consistent with
-    phpMyAdmin's policies and the requirements of the GPLv2-or-later where
-    they are relevant.
-
-(e) I am granting this work to this project under the terms of the
-    GPLv2-or-later.
-
-    https://www.gnu.org/licenses/gpl-2.0.html
-
-***
-***
-And please confirm your certification to the above by adding the following
-line to your patch:
-
-	Signed-off-by: Jane Developer <jane@example.org>
-
-using your real name (sorry, no pseudonyms or anonymous contributions).
-
-If you are a developer who is authorized to contribute to phpMyAdmin on
-behalf of your employer, then please use your corporate email address in the
-Signed-off-by tag.  If not, then please use a personal email address.
-
diff --git a/#pma/LICENSE b/#pma/LICENSE
deleted file mode 100644
index d159169d..00000000
--- a/#pma/LICENSE
+++ /dev/null
@@ -1,339 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-                            NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
diff --git a/#pma/README b/#pma/README
deleted file mode 100644
index 0101eb89..00000000
--- a/#pma/README
+++ /dev/null
@@ -1,52 +0,0 @@
-phpMyAdmin - Readme
-===================
-
-Version 4.6.5.2
-
-A web interface for MySQL and MariaDB.
-
-https://www.phpmyadmin.net/
-
-Summary
--------
-
-phpMyAdmin is intended to handle the administration of MySQL over the web.
-For a summary of features, list of requirements, and installation instructions,
-please see the documentation in the ./doc/ folder or at https://docs.phpmyadmin.net/
-
-Copyright
----------
-
-Copyright © 1998 onwards -- the phpMyAdmin team
-
-Certain libraries are copyrighted by their respective authors;
-see the full copyright list for details.
-
-For full copyright information, please see ./doc/copyright.rst
-
-License
--------
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License version 2, as published by the
-Free Software Foundation.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Licensing of current contributions
-----------------------------------
-
-Beginning on 2013-12-01, new contributions to this codebase are all licensed
-under terms compatible with GPLv2-or-later.  phpMyAdmin is currently
-transitioning older code to GPLv2-or-later, but work is not yet complete.
-
-Enjoy!
-------
-
-The phpMyAdmin team
diff --git a/#pma/RELEASE-DATE-4.6.5.2 b/#pma/RELEASE-DATE-4.6.5.2
deleted file mode 100644
index ad07334a..00000000
--- a/#pma/RELEASE-DATE-4.6.5.2
+++ /dev/null
@@ -1 +0,0 @@
-Mon Dec  5 22:35:53 UTC 2016
diff --git a/#pma/browse_foreigners.php b/#pma/browse_foreigners.php
deleted file mode 100644
index 68a50a16..00000000
--- a/#pma/browse_foreigners.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * display selection for relational field values
- *
- * @package PhpMyAdmin
- */
-
-require_once 'libraries/common.inc.php';
-require_once 'libraries/transformations.lib.php';
-require_once 'libraries/browse_foreigners.lib.php';
-
-/**
- * Sets globals from $_REQUEST
- */
-$request_params = array(
-    'data',
-    'field'
-);
-
-foreach ($request_params as $one_request_param) {
-    if (isset($_REQUEST[$one_request_param])) {
-        $GLOBALS[$one_request_param] = $_REQUEST[$one_request_param];
-    }
-}
-
-PMA\libraries\Util::checkParameters(array('db', 'table', 'field'));
-
-$response = PMA\libraries\Response::getInstance();
-$response->getFooter()->setMinimal();
-$header = $response->getHeader();
-$header->disableMenuAndConsole();
-$header->setBodyId('body_browse_foreigners');
-
-/**
- * Displays the frame
- */
-
-$cfgRelation = PMA_getRelationsParam();
-$foreigners  = ($cfgRelation['relwork'] ? PMA_getForeigners($db, $table) : false);
-$foreign_limit = PMA_getForeignLimit(
-    isset($_REQUEST['foreign_showAll']) ? $_REQUEST['foreign_showAll'] : null
-);
-
-$foreignData = PMA_getForeignData(
-    $foreigners, $_REQUEST['field'], true,
-    isset($_REQUEST['foreign_filter'])
-    ? $_REQUEST['foreign_filter']
-    : '',
-    isset($foreign_limit) ? $foreign_limit : null,
-    true // for getting value in $foreignData['the_total']
-);
-
-// HTML output
-$html = PMA_getHtmlForRelationalFieldSelection(
-    $db, $table, $_REQUEST['field'], $foreignData,
-    isset($fieldkey) ? $fieldkey : null,
-    isset($data) ? $data : null
-);
-
-$response->addHtml($html);
diff --git a/#pma/build.xml b/#pma/build.xml
deleted file mode 100644
index 53f88312..00000000
--- a/#pma/build.xml
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="phpMyAdmin" default="build" basedir=".">
- <property name="source" value="."/>
- <property name="source_comma_sep" value="."/>
- <property environment="env"/>
- <property name="env.PHPUNIT_XML" value="phpunit.xml.dist"/>
- <property name="env.PHPUNIT_XML_NOCOVERAGE" value="phpunit.xml.nocoverage"/>
- <property name="env.PHPUNIT_XML_HHVM" value="phpunit.xml.hhvm"/>
- <property name="env.PHPUNIT_ARGS" value=""/>
-
- <target name="clean" description="Clean up and create artifact directories">
-  <delete dir="${basedir}/build/api"/>
-  <delete dir="${basedir}/build/code-browser"/>
-  <delete dir="${basedir}/build/coverage"/>
-  <delete dir="${basedir}/build/logs"/>
-  <delete dir="${basedir}/build/pdepend"/>
-
-  <mkdir dir="${basedir}/build/api"/>
-  <mkdir dir="${basedir}/build/code-browser"/>
-  <mkdir dir="${basedir}/build/coverage"/>
-  <mkdir dir="${basedir}/build/logs"/>
-  <mkdir dir="${basedir}/build/pdepend"/>
- </target>
-
- <target name="phpunit" description="Run unit tests using PHPUnit and generates junit.xml and clover.xml">
-  <exec executable="${basedir}/vendor/bin/phpunit" failonerror="true">
-      <arg line="--configuration ${env.PHPUNIT_XML} ${env.PHPUNIT_ARGS}"/>
-  </exec>
- </target>
-
- <target name="phpunit-nocoverage" description="Run unit tests using PHPUnit and generates junit.xml">
-  <exec executable="${basedir}/vendor/bin/phpunit" failonerror="true">
-      <arg line="--configuration ${env.PHPUNIT_XML_NOCOVERAGE} ${env.PHPUNIT_ARGS}"/>
-  </exec>
- </target>
-
- <target name="phpunit-hhvm" description="Run unit tests using PHPUnit with HHVM specific config">
-  <exec executable="${basedir}/vendor/bin/phpunit" failonerror="true">
-      <arg line="--configuration ${env.PHPUNIT_XML_HHVM} ${env.PHPUNIT_ARGS}"/>
-  </exec>
- </target>
-
- <target name="pdepend" description="Generate jdepend.xml and software metrics charts using PHP_Depend">
-  <exec executable="pdepend">
-   <arg line="'--jdepend-xml=${basedir}/build/logs/jdepend.xml'
-              '--jdepend-chart=${basedir}/build/pdepend/dependencies.svg'
-              '--overview-pyramid=${basedir}/build/pdepend/overview-pyramid.svg'
-              ${source_comma_sep}" />
-  </exec>
- </target>
-
- <target name="phpmd" description="Generate pmd.xml using PHPMD">
-  <exec executable="phpmd">
-   <arg line="${source_comma_sep}
-              xml
-              codesize,design,naming,unusedcode
-              --exclude test,build,tcpdf,php-gettext,bfShapeFiles,phpseclib,recaptchalib.php,vendor,sql-parser
-              --reportfile '${basedir}/build/logs/pmd.xml'" />
-  </exec>
- </target>
-
- <target name="phpcpd" description="Generate pmd-cpd.xml using PHPCPD">
-  <exec executable="phpcpd">
-   <arg line="--log-pmd '${basedir}/build/logs/pmd-cpd.xml'
-              --exclude test
-              --exclude build
-              --exclude vendor
-              --exclude libraries/tcpdf
-              --exclude libraries/php-gettext
-              --exclude libraries/bfShapeFiles
-              --exclude libraries/phpseclib
-              --exclude libraries/plugins/auth/recaptcha/recaptchalib.php
-              --exclude libraries/sql-parser
-              ${source}" />
-  </exec>
- </target>
-
- <target name="phploc" description="Generate phploc.csv">
-  <exec executable="phploc">
-   <arg line="--log-csv '${basedir}/build/logs/phploc.csv'
-              --exclude test
-              --exclude build
-              --exclude vendor
-              --exclude libraries/tcpdf
-              --exclude libraries/php-gettext
-              --exclude libraries/bfShapeFiles
-              --exclude libraries/phpseclib
-              --exclude libraries/plugins/auth/recaptcha/recaptchalib.php
-              --exclude libraries/sql-parser
-              ${source}" />
-  </exec>
- </target>
-
- <target name="phpcs-config" description="PHPCS configuration tweaking">
-  <exec executable="phpcs">
-   <arg line="--config-set installed_paths ${basedir}/vendor/phpmyadmin/coding-standard" />
-  </exec>
- </target>
-
- <target name="phpcs" description="Generate checkstyle.xml using PHP_CodeSniffer excluding third party libraries" depends="phpcs-config">
-  <exec executable="phpcs">
-   <arg line="
-              --ignore=*/php-gettext/*,*/vendor/*,*/tcpdf/*,*/canvg/*,*/codemirror/*,*/openlayers/*,*/jquery/*,*/jqplot/*,*/build/*,*/bfShapeFiles/*,*/phpseclib/*,*/recaptcha/*,*/sql-parser/*
-              --report=checkstyle
-              --extensions=php
-              --report-file='${basedir}/build/logs/checkstyle.xml'
-              --standard=PMAStandard
-              ${source}" />
-  </exec>
- </target>
-
- <target name="phpdoc" description="Generate API documentation using PHPDocumentor">
-  <exec executable="phpdoc">
-   <arg line="-d ${source} -t '${basedir}/build/api'" />
-  </exec>
- </target>
-
- <target name="phpcb" description="Aggregate tool output with PHP_CodeBrowser">
-  <exec executable="phpcb">
-   <arg line="--log    '${basedir}/build/logs'
-              --source '${source}'
-              --output '${basedir}/build/code-browser'" />
-  </exec>
- </target>
-
-<target name="jshint" description="Javascript checks">
-  <apply executable="jshint" output="${basedir}/build/logs/jshint-jslint.xml"  parallel="true">
-   <arg line="--config ./.jshintrc --reporter=jslint" />
-   <fileset dir="${basedir}">
-    <include name="js/pmd/*.js" />
-    <include name="js/*.js" />
-    <include name="setup/*.js" />
-   </fileset>
-  </apply>
- </target>
-
- <target name="jshint-checkstyle" description="Javascript checks">
-  <apply executable="jshint" output="${basedir}/build/logs/jshint-checkstyle.xml"  parallel="true">
-   <arg line="--config ./.jshintrc --reporter=checkstyle" />
-   <fileset dir="${basedir}">
-    <include name="js/pmd/*.js" />
-    <include name="js/*.js" />
-    <include name="setup/*.js" />
-   </fileset>
-  </apply>
- </target>
-
- <target name="locales" description="Generate locales">
-   <exec executable="./scripts/generate-mo" failonerror="true">
-     <arg line="--quiet" />
-   </exec>
- </target>
-
- <target name="lint" description="Perform syntax check of sourcecode files">
-  <apply executable="php" failonerror="true">
-   <arg value="-l" />
-
-   <fileset dir="${basedir}">
-    <include name="libraries/**/*.php" />
-    <include name="templates/**/*.phtml" />
-    <include name="setup/**/*.php" />
-    <include name="test/**/*.php" />
-    <include name="*.php" />
-    <modified />
-   </fileset>
-  </apply>
- </target>
-
- <target name="build" depends="clean,phpunit,pdepend,phpmd,phpcpd,phpcs,phpdoc,phploc,phpcb,lint,jshint,locales"/>
-</project>
diff --git a/#pma/changelog.php b/#pma/changelog.php
deleted file mode 100644
index c19bcf53..00000000
--- a/#pma/changelog.php
+++ /dev/null
@@ -1,162 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Simple script to set correct charset for changelog
- *
- * @package PhpMyAdmin
- */
-
-/**
- * Gets core libraries and defines some variables
- */
-require 'libraries/common.inc.php';
-
-$response = PMA\libraries\Response::getInstance();
-$response->disable();
-$response->getHeader()->sendHttpHeaders();
-
-$filename = CHANGELOG_FILE;
-
-/**
- * Read changelog.
- */
-// Check if the file is available, some distributions remove these.
-if (@is_readable($filename)) {
-
-    // Test if the if is in a compressed format
-    if (substr($filename, -3) == '.gz') {
-        ob_start();
-        readgzfile($filename);
-        $changelog = ob_get_contents();
-        ob_end_clean();
-    } else {
-        $changelog = file_get_contents($filename);
-    }
-} else {
-    printf(
-        __(
-            'The %s file is not available on this system, please visit '
-            . 'www.phpmyadmin.net for more information.'
-        ),
-        $filename
-    );
-    exit;
-}
-
-/**
- * Whole changelog in variable.
- */
-$changelog = htmlspecialchars($changelog);
-
-$tracker_url = 'https://sourceforge.net/support/tracker.php?aid=\\1';
-$tracker_url_bug = 'https://sourceforge.net/p/phpmyadmin/bugs/\\1/';
-$tracker_url_rfe = 'https://sourceforge.net/p/phpmyadmin/feature-requests/\\1/';
-$tracker_url_patch = 'https://sourceforge.net/p/phpmyadmin/patches/\\1/';
-$github_url = 'https://github.com/phpmyadmin/phpmyadmin/';
-$faq_url = 'https://docs.phpmyadmin.net/en/latest/faq.html';
-
-$replaces = array(
-    '@(https?://[./a-zA-Z0-9.-_-]*[/a-zA-Z0-9_])@'
-    => '<a href="url.php?url=\\1">\\1</a>',
-
-    // sourceforge users
-    '/([0-9]{4}-[0-9]{2}-[0-9]{2}) (.+[^ ]) +&lt;(.*)@users.sourceforge.net&gt;/i'
-    => '\\1 <a href="url.php?url=https://sourceforge.net/users/\\3/">\\2</a>',
-    '/thanks to ([^\(\r\n]+) \(([-\w]+)\)/i'
-    => 'thanks to <a href="url.php?url=https://sourceforge.net/users/\\2/">\\1</a>',
-    '/thanks to ([^\(\r\n]+) -\s+([-\w]+)/i'
-    => 'thanks to <a href="url.php?url=https://sourceforge.net/users/\\2/">\\1</a>',
-
-    // mail address
-    '/([0-9]{4}-[0-9]{2}-[0-9]{2}) (.+[^ ]) +&lt;(.*@.*)&gt;/i'
-    => '\\1 <a href="mailto:\\3">\\2</a>',
-
-    // linking patches
-    '/patch\s*#?([0-9]{6,})/i'
-    => '<a href="url.php?url=' . $tracker_url . '">patch #\\1</a>',
-
-    // linking RFE
-    '/(?:rfe|feature)\s*#?([0-9]{6,})/i'
-    => '<a href="url.php?url=https://sourceforge.net/support/tracker.php?aid=\\1">RFE #\\1</a>',
-
-    // linking files
-    '/(\s+)([\\/a-z_0-9\.]+\.(?:php3?|html|pl|js|sh))/i'
-    => '\\1<a href="url.php?url=' . $github_url . 'commits/HEAD/\\2">\\2</a>',
-
-    // FAQ entries
-    '/FAQ ([0-9]+)\.([0-9a-z]+)/i'
-    => '<a href="url.php?url=' . $faq_url . '#faq\\1-\\2">FAQ \\1.\\2</a>',
-
-    // linking bugs
-    '/bug\s*#?([0-9]{6,})/i'
-    => '<a href="url.php?url=https://sourceforge.net/support/tracker.php?aid=\\1">bug #\\1</a>',
-
-    // all other 6+ digit numbers are treated as bugs
-    '/(?<!bug|RFE|patch) #?([0-9]{6,})/i'
-    => '<a href="url.php?url=' . $tracker_url . '">bug #\\1</a>',
-
-    // GitHub issues
-    '/issue\s*#?([0-9]{4,5}) /i'
-    => '<a href="url.php?url=' . $github_url . 'issues/\\1">issue #\\1</a> ',
-
-    // transitioned SF.net project bug/rfe/patch links
-    // by the time we reach 6-digit numbers, we can probably retire the above links
-    '/patch\s*#?([0-9]{4,5}) /i'
-    => '<a href="url.php?url=' . $tracker_url_patch . '">patch #\\1</a> ',
-    '/(?:rfe|feature)\s*#?([0-9]{4,5}) /i'
-    => '<a href="url.php?url=' . $tracker_url_rfe . '">RFE #\\1</a> ',
-    '/bug\s*#?([0-9]{4,5}) /i'
-    => '<a href="url.php?url=' . $tracker_url_bug . '">bug #\\1</a> ',
-    '/(?<!bug|RFE|patch) #?([0-9]{4,5}) /i'
-    => '<a href="url.php?url=' . $tracker_url_bug . '">bug #\\1</a> ',
-
-    // CVE/CAN entries
-    '/((CAN|CVE)-[0-9]+-[0-9]+)/'
-    => '<a href="url.php?url=https://cve.mitre.org/cgi-bin/cvename.cgi?name=\\1">\\1</a>',
-
-    // PMASAentries
-    '/(PMASA-[0-9]+-[0-9]+)/'
-    => '<a href="url.php?url=https://www.phpmyadmin.net/security/\\1/">\\1</a>',
-
-    // Highlight releases (with links)
-    '/([0-9]+)\.([0-9]+)\.([0-9]+)\.0 (\([0-9-]+\))/'
-    => '<a name="\\1_\\2_\\3"></a>'
-        . '<a href="url.php?url=' . $github_url . 'commits/RELEASE_\\1_\\2_\\3">'
-        . '\\1.\\2.\\3.0 \\4</a>',
-    '/([0-9]+)\.([0-9]+)\.([0-9]+)\.([1-9][0-9]*) (\([0-9-]+\))/'
-    => '<a name="\\1_\\2_\\3_\\4"></a>'
-        . '<a href="url.php?url=' . $github_url . 'commits/RELEASE_\\1_\\2_\\3_\\4">'
-        . '\\1.\\2.\\3.\\4 \\5</a>',
-
-    // Highlight releases (not linkable)
-    '/(    ### )(.*)/'
-    => '\\1<b>\\2</b>',
-
-);
-
-header('Content-type: text/html; charset=utf-8');
-?>
-<!DOCTYPE HTML>
-<html lang="en" dir="ltr">
-<head>
-    <link rel="icon" href="favicon.ico" type="image/x-icon" />
-    <link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
-    <title>phpMyAdmin - ChangeLog</title>
-    <meta charset="utf-8" />
-</head>
-<body>
-<h1>phpMyAdmin - ChangeLog</h1>
-<?php
-echo '<pre>';
-echo preg_replace(array_keys($replaces), $replaces, $changelog);
-echo '</pre>';
-?>
-<script type="text/javascript">
-var links = document.getElementsByTagName("a");
-for(var i = 0; i < links.length; i++) {
-    links[i].target = "_blank";
-    links[i].rel = "noopener noreferrer";
-}
-</script>
-</body>
-</html>
diff --git a/#pma/chk_rel.php b/#pma/chk_rel.php
deleted file mode 100644
index b2cd6301..00000000
--- a/#pma/chk_rel.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Displays status of phpMyAdmin configuration storage
- *
- * @package PhpMyAdmin
- */
-
-require_once 'libraries/common.inc.php';
-
-// If request for creating the pmadb
-if (isset($_REQUEST['create_pmadb'])) {
-    if (PMA_createPMADatabase()) {
-        PMA_fixPMATables('phpmyadmin');
-    }
-}
-
-// If request for creating all PMA tables.
-if (isset($_REQUEST['fixall_pmadb'])) {
-    PMA_fixPMATables($GLOBALS['db']);
-}
-
-$cfgRelation = PMA_getRelationsParam();
-// If request for creating missing PMA tables.
-if (isset($_REQUEST['fix_pmadb'])) {
-    PMA_fixPMATables($cfgRelation['db']);
-}
-
-$response = PMA\libraries\Response::getInstance();
-$response->addHTML(
-    PMA_getRelationsParamDiagnostic($cfgRelation)
-);
diff --git a/#pma/composer.json b/#pma/composer.json
deleted file mode 100644
index 086b84e4..00000000
--- a/#pma/composer.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "name": "phpmyadmin/phpmyadmin",
-    "type": "application",
-    "description": "MySQL web administration tool",
-    "keywords": ["phpmyadmin","mysql","web"],
-    "homepage": "https://www.phpmyadmin.net/",
-    "license": "GPL-2.0+",
-    "authors": [
-        {
-            "name": "The phpMyAdmin Team",
-            "email": "developers@phpmyadmin.net",
-            "homepage": "https://www.phpmyadmin.net/team/"
-        }
-    ],
-    "support": {
-        "forum": "https://www.phpmyadmin.net/support/",
-        "issues": "https://github.com/phpmyadmin/phpmyadmin/issues",
-        "wiki": "https://wiki.phpmyadmin.net/",
-        "docs": "https://docs.phpmyadmin.net/",
-        "source": "https://github.com/phpmyadmin/phpmyadmin"
-    },
-    "non-feature-branches": ["RELEASE_.*"],
-    "require": {
-        "php": ">=5.5.0"
-    },
-    "require-dev": {
-        "satooshi/php-coveralls": "~0.6",
-        "phpunit/phpunit": "~4.1",
-        "codacy/coverage": "dev-master",
-        "phpunit/phpunit-selenium": "~1.2",
-        "squizlabs/php_codesniffer": "2.*",
-        "phpmyadmin/coding-standard": ">=0.1.0"
-    },
-    "repositories": [
-        {
-            "type": "composer",
-            "url": "https://www.phpmyadmin.net"
-        }
-    ]
-}
diff --git a/#pma/config.inc.php b/#pma/config.inc.php
deleted file mode 100644
index ecb3d44a..00000000
--- a/#pma/config.inc.php
+++ /dev/null
@@ -1,161 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * phpMyAdmin sample configuration, you can use it as base for
- * manual configuration. For easier setup you can use setup/
- *
- * All directives are explained in documentation in the doc/ folder
- * or at <https://docs.phpmyadmin.net/>.
- *
- * @package PhpMyAdmin
- */
-
-/**
- * This is needed for cookie based authentication to encrypt password in
- * cookie. Needs to be 32 chars long.
- */
-$cfg['blowfish_secret'] = 'pmablowfishsecret!'; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */
-
-/**
- * Servers configuration
- */
-$i = 0;
-
-/**
- * First server
- */
-$i++;
-/* Authentication type */
-$cfg['Servers'][$i]['auth_type'] = 'config';
-/* Server parameters */
-$cfg['Servers'][$i]['host'] = 'localhost';
-$cfg['Servers'][$i]['user'] = 'lgadmin';
-$cfg['Servers'][$i]['password'] = '!S1ge1nA';
-$cfg['Servers'][$i]['only_db'] = 'leitgedanken';
-$cfg['Servers'][$i]['only_db'] = 'leitgedanken';
-$cfg['ThemeDefault'] = 'fallen';
-$cfg['Servers'][$i]['connect_type'] = 'tcp';
-$cfg['Servers'][$i]['compress'] = false;
-$cfg['Servers'][$i]['AllowNoPassword'] = false;
-$cfg['ActionLinksMode'] = 'icons';
-
-/**
- * phpMyAdmin configuration storage settings.
- */
-
-/* User used to manipulate with storage */
-// $cfg['Servers'][$i]['controlhost'] = '';
-// $cfg['Servers'][$i]['controlport'] = '';
-// $cfg['Servers'][$i]['controluser'] = 'pma';
-// $cfg['Servers'][$i]['controlpass'] = 'pmapass';
-
-/* Storage database and tables */
-// $cfg['Servers'][$i]['pmadb'] = 'phpmyadmin';
-// $cfg['Servers'][$i]['bookmarktable'] = 'pma__bookmark';
-// $cfg['Servers'][$i]['relation'] = 'pma__relation';
-// $cfg['Servers'][$i]['table_info'] = 'pma__table_info';
-// $cfg['Servers'][$i]['table_coords'] = 'pma__table_coords';
-// $cfg['Servers'][$i]['pdf_pages'] = 'pma__pdf_pages';
-// $cfg['Servers'][$i]['column_info'] = 'pma__column_info';
-// $cfg['Servers'][$i]['history'] = 'pma__history';
-// $cfg['Servers'][$i]['table_uiprefs'] = 'pma__table_uiprefs';
-// $cfg['Servers'][$i]['tracking'] = 'pma__tracking';
-// $cfg['Servers'][$i]['userconfig'] = 'pma__userconfig';
-// $cfg['Servers'][$i]['recent'] = 'pma__recent';
-// $cfg['Servers'][$i]['favorite'] = 'pma__favorite';
-// $cfg['Servers'][$i]['users'] = 'pma__users';
-// $cfg['Servers'][$i]['usergroups'] = 'pma__usergroups';
-// $cfg['Servers'][$i]['navigationhiding'] = 'pma__navigationhiding';
-// $cfg['Servers'][$i]['savedsearches'] = 'pma__savedsearches';
-// $cfg['Servers'][$i]['central_columns'] = 'pma__central_columns';
-// $cfg['Servers'][$i]['designer_settings'] = 'pma__designer_settings';
-// $cfg['Servers'][$i]['export_templates'] = 'pma__export_templates';
-
-/**
- * End of servers configuration
- */
-
-/**
- * Directories for saving/loading files from server
- */
-$cfg['UploadDir'] = '';
-$cfg['SaveDir'] = '';
-
-/**
- * Whether to display icons or text or both icons and text in table row
- * action segment. Value can be either of 'icons', 'text' or 'both'.
- * default = 'both'
- */
-//$cfg['RowActionType'] = 'icons';
-
-/**
- * Defines whether a user should be displayed a "show all (records)"
- * button in browse mode or not.
- * default = false
- */
-//$cfg['ShowAll'] = true;
-
-/**
- * Number of rows displayed when browsing a result set. If the result
- * set contains more rows, "Previous" and "Next".
- * Possible values: 25, 50, 100, 250, 500
- * default = 25
- */
-//$cfg['MaxRows'] = 50;
-
-/**
- * Disallow editing of binary fields
- * valid values are:
- *   false    allow editing
- *   'blob'   allow editing except for BLOB fields
- *   'noblob' disallow editing except for BLOB fields
- *   'all'    disallow editing
- * default = 'blob'
- */
-//$cfg['ProtectBinary'] = false;
-
-/**
- * Default language to use, if not browser-defined or user-defined
- * (you find all languages in the locale folder)
- * uncomment the desired line:
- * default = 'en'
- */
-//$cfg['DefaultLang'] = 'en';
-//$cfg['DefaultLang'] = 'de';
-
-/**
- * How many columns should be used for table display of a database?
- * (a value larger than 1 results in some information being hidden)
- * default = 1
- */
-//$cfg['PropertiesNumColumns'] = 2;
-
-/**
- * Set to true if you want DB-based query history.If false, this utilizes
- * JS-routines to display query history (lost by window close)
- *
- * This requires configuration storage enabled, see above.
- * default = false
- */
-//$cfg['QueryHistoryDB'] = true;
-
-/**
- * When using DB-based query history, how many entries should be kept?
- * default = 25
- */
-//$cfg['QueryHistoryMax'] = 100;
-
-/**
- * Whether or not to query the user before sending the error report to
- * the phpMyAdmin team when a JavaScript error occurs
- *
- * Available options
- * ('ask' | 'always' | 'never')
- * default = 'ask'
- */
-//$cfg['SendErrorReports'] = 'always';
-
-/**
- * You can find more configuration options in the documentation
- * in the doc/ folder or at <https://docs.phpmyadmin.net/>.
- */
diff --git a/#pma/config.sample.inc.php b/#pma/config.sample.inc.php
deleted file mode 100644
index 578ae841..00000000
--- a/#pma/config.sample.inc.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * phpMyAdmin sample configuration, you can use it as base for
- * manual configuration. For easier setup you can use setup/
- *
- * All directives are explained in documentation in the doc/ folder
- * or at <https://docs.phpmyadmin.net/>.
- *
- * @package PhpMyAdmin
- */
-
-/**
- * This is needed for cookie based authentication to encrypt password in
- * cookie. Needs to be 32 chars long.
- */
-$cfg['blowfish_secret'] = ''; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */
-
-/**
- * Servers configuration
- */
-$i = 0;
-
-/**
- * First server
- */
-$i++;
-/* Authentication type */
-$cfg['Servers'][$i]['auth_type'] = 'cookie';
-/* Server parameters */
-$cfg['Servers'][$i]['host'] = 'localhost';
-$cfg['Servers'][$i]['connect_type'] = 'tcp';
-$cfg['Servers'][$i]['compress'] = false;
-$cfg['Servers'][$i]['AllowNoPassword'] = false;
-
-/**
- * phpMyAdmin configuration storage settings.
- */
-
-/* User used to manipulate with storage */
-// $cfg['Servers'][$i]['controlhost'] = '';
-// $cfg['Servers'][$i]['controlport'] = '';
-// $cfg['Servers'][$i]['controluser'] = 'pma';
-// $cfg['Servers'][$i]['controlpass'] = 'pmapass';
-
-/* Storage database and tables */
-// $cfg['Servers'][$i]['pmadb'] = 'phpmyadmin';
-// $cfg['Servers'][$i]['bookmarktable'] = 'pma__bookmark';
-// $cfg['Servers'][$i]['relation'] = 'pma__relation';
-// $cfg['Servers'][$i]['table_info'] = 'pma__table_info';
-// $cfg['Servers'][$i]['table_coords'] = 'pma__table_coords';
-// $cfg['Servers'][$i]['pdf_pages'] = 'pma__pdf_pages';
-// $cfg['Servers'][$i]['column_info'] = 'pma__column_info';
-// $cfg['Servers'][$i]['history'] = 'pma__history';
-// $cfg['Servers'][$i]['table_uiprefs'] = 'pma__table_uiprefs';
-// $cfg['Servers'][$i]['tracking'] = 'pma__tracking';
-// $cfg['Servers'][$i]['userconfig'] = 'pma__userconfig';
-// $cfg['Servers'][$i]['recent'] = 'pma__recent';
-// $cfg['Servers'][$i]['favorite'] = 'pma__favorite';
-// $cfg['Servers'][$i]['users'] = 'pma__users';
-// $cfg['Servers'][$i]['usergroups'] = 'pma__usergroups';
-// $cfg['Servers'][$i]['navigationhiding'] = 'pma__navigationhiding';
-// $cfg['Servers'][$i]['savedsearches'] = 'pma__savedsearches';
-// $cfg['Servers'][$i]['central_columns'] = 'pma__central_columns';
-// $cfg['Servers'][$i]['designer_settings'] = 'pma__designer_settings';
-// $cfg['Servers'][$i]['export_templates'] = 'pma__export_templates';
-
-/**
- * End of servers configuration
- */
-
-/**
- * Directories for saving/loading files from server
- */
-$cfg['UploadDir'] = '';
-$cfg['SaveDir'] = '';
-
-/**
- * Whether to display icons or text or both icons and text in table row
- * action segment. Value can be either of 'icons', 'text' or 'both'.
- * default = 'both'
- */
-//$cfg['RowActionType'] = 'icons';
-
-/**
- * Defines whether a user should be displayed a "show all (records)"
- * button in browse mode or not.
- * default = false
- */
-//$cfg['ShowAll'] = true;
-
-/**
- * Number of rows displayed when browsing a result set. If the result
- * set contains more rows, "Previous" and "Next".
- * Possible values: 25, 50, 100, 250, 500
- * default = 25
- */
-//$cfg['MaxRows'] = 50;
-
-/**
- * Disallow editing of binary fields
- * valid values are:
- *   false    allow editing
- *   'blob'   allow editing except for BLOB fields
- *   'noblob' disallow editing except for BLOB fields
- *   'all'    disallow editing
- * default = 'blob'
- */
-//$cfg['ProtectBinary'] = false;
-
-/**
- * Default language to use, if not browser-defined or user-defined
- * (you find all languages in the locale folder)
- * uncomment the desired line:
- * default = 'en'
- */
-//$cfg['DefaultLang'] = 'en';
-//$cfg['DefaultLang'] = 'de';
-
-/**
- * How many columns should be used for table display of a database?
- * (a value larger than 1 results in some information being hidden)
- * default = 1
- */
-//$cfg['PropertiesNumColumns'] = 2;
-
-/**
- * Set to true if you want DB-based query history.If false, this utilizes
- * JS-routines to display query history (lost by window close)
- *
- * This requires configuration storage enabled, see above.
- * default = false
- */
-//$cfg['QueryHistoryDB'] = true;
-
-/**
- * When using DB-based query history, how many entries should be kept?
- * default = 25
- */
-//$cfg['QueryHistoryMax'] = 100;
-
-/**
- * Whether or not to query the user before sending the error report to
- * the phpMyAdmin team when a JavaScript error occurs
- *
- * Available options
- * ('ask' | 'always' | 'never')
- * default = 'ask'
- */
-//$cfg['SendErrorReports'] = 'always';
-
-/**
- * You can find more configuration options in the documentation
- * in the doc/ folder or at <https://docs.phpmyadmin.net/>.
- */
diff --git a/#pma/db_central_columns.php b/#pma/db_central_columns.php
deleted file mode 100644
index a1cd31ba..00000000
--- a/#pma/db_central_columns.php
+++ /dev/null
@@ -1,153 +0,0 @@
-<?php
-
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Central Columns view/edit
- *
- * @package PhpMyAdmin
- */
-/**
- * Gets some core libraries
- */
-require_once 'libraries/common.inc.php';
-require_once 'libraries/central_columns.lib.php';
-
-if (isset($_POST['edit_save']) || isset($_POST['add_new_column'])) {
-    $col_name = $_POST['col_name'];
-    if (isset($_POST['edit_save'])) {
-        $orig_col_name = $_POST['orig_col_name'];
-    }
-    $col_default = $_POST['col_default'];
-    if ($col_default == 'NONE' && $_POST['col_default_sel'] != 'USER_DEFINED') {
-        $col_default = "";
-    }
-    $col_extra = isset($_POST['col_extra']) ? $_POST['col_extra'] : '';
-    $col_isNull = isset($_POST['col_isNull'])?1:0;
-    $col_length = $_POST['col_length'];
-    $col_attribute = $_POST['col_attribute'];
-    $col_type = $_POST['col_type'];
-    $collation = $_POST['collation'];
-    if (isset($orig_col_name) && $orig_col_name) {
-        echo PMA_updateOneColumn(
-            $db, $orig_col_name, $col_name, $col_type, $col_attribute,
-            $col_length, $col_isNull, $collation, $col_extra, $col_default
-        );
-        exit;
-    } else {
-        $tmp_msg = PMA_updateOneColumn(
-            $db, "", $col_name, $col_type, $col_attribute,
-            $col_length, $col_isNull, $collation, $col_extra, $col_default
-        );
-    }
-}
-if (isset($_POST['populateColumns'])) {
-    $selected_tbl = $_POST['selectedTable'];
-    echo PMA_getHTMLforColumnDropdown($db, $selected_tbl);
-    exit;
-}
-if (isset($_POST['getColumnList'])) {
-    echo PMA_getCentralColumnsListRaw($db, $_POST['cur_table']);
-    exit;
-}
-if (isset($_POST['add_column'])) {
-    $selected_col = array();
-    $selected_tbl = $_POST['table-select'];
-    $selected_col[] = $_POST['column-select'];
-    $tmp_msg = PMA_syncUniqueColumns($selected_col, false, $selected_tbl);
-}
-$response = PMA\libraries\Response::getInstance();
-$header = $response->getHeader();
-$scripts = $header->getScripts();
-$scripts->addFile('jquery/jquery.uitablefilter.js');
-$scripts->addFile('jquery/jquery.tablesorter.js');
-$scripts->addFile('db_central_columns.js');
-$cfgCentralColumns = PMA_centralColumnsGetParams();
-$pmadb = $cfgCentralColumns['db'];
-$pmatable = $cfgCentralColumns['table'];
-$max_rows = intval($GLOBALS['cfg']['MaxRows']);
-
-if (isset($_REQUEST['edit_central_columns_page'])) {
-    $selected_fld = $_REQUEST['selected_fld'];
-    $selected_db = $_REQUEST['db'];
-    $edit_central_column_page = PMA_getHTMLforEditingPage(
-        $selected_fld, $selected_db
-    );
-    $response->addHTML($edit_central_column_page);
-    exit;
-}
-if (isset($_POST['multi_edit_central_column_save'])) {
-    $message = PMA_updateMultipleColumn();
-    if (!is_bool($message)) {
-        $response->setRequestStatus(false);
-        $response->addJSON('message', $message);
-    }
-}
-if (isset($_POST['delete_save'])) {
-    $col_name = array();
-    parse_str($_POST['col_name'], $col_name);
-    $tmp_msg = PMA_deleteColumnsFromList($col_name['selected_fld'], false);
-}
-if (isset($_REQUEST['total_rows']) && $_REQUEST['total_rows']) {
-    $total_rows = $_REQUEST['total_rows'];
-} else {
-    $total_rows = PMA_getCentralColumnsCount($db);
-}
-if (PMA_isValid($_REQUEST['pos'], 'integer')) {
-    $pos = intval($_REQUEST['pos']);
-} else {
-    $pos = 0;
-}
-$addNewColumn = PMA_getHTMLforAddNewColumn($db);
-$response->addHTML($addNewColumn);
-if ($total_rows <= 0) {
-    $response->addHTML(
-        '<fieldset>' . __(
-            'The central list of columns for the current database is empty.'
-        ) . '</fieldset>'
-    );
-    $columnAdd = PMA_getHTMLforAddCentralColumn($total_rows, $pos, $db);
-    $response->addHTML($columnAdd);
-    exit;
-}
-$table_navigation_html = PMA_getHTMLforTableNavigation($total_rows, $pos, $db);
-$response->addHTML($table_navigation_html);
-$columnAdd = PMA_getHTMLforAddCentralColumn($total_rows, $pos, $db);
-$response->addHTML($columnAdd);
-$deleteRowForm = '<form method="post" id="del_form" action="db_central_columns.php">'
-        . PMA_URL_getHiddenInputs(
-            $db
-        )
-        . '<input id="del_col_name" type="hidden" name="col_name" value="">'
-        . '<input type="hidden" name="pos" value="' . $pos . '">'
-        . '<input type="hidden" name="delete_save" value="delete"></form>';
-$response->addHTML($deleteRowForm);
-$table_struct = '<div id="tableslistcontainer">'
-        . '<form name="tableslistcontainer">'
-        . '<table id="table_columns" class="tablesorter" '
-        . 'style="min-width:100%" class="data">';
-$response->addHTML($table_struct);
-$tableheader = PMA_getCentralColumnsTableHeader(
-    'column_heading', __('Click to sort.'), 2
-);
-$response->addHTML($tableheader);
-$result = PMA_getColumnsList($db, $pos, $max_rows);
-$odd_row = true;
-$row_num = 0;
-foreach ($result as $row) {
-    $tableHtmlRow = PMA_getHTMLforCentralColumnsTableRow(
-        $row, $odd_row, $row_num, $db
-    );
-    $response->addHTML($tableHtmlRow);
-    $odd_row = !$odd_row;
-    $row_num++;
-}
-$response->addHTML('</table>');
-$tablefooter = PMA_getCentralColumnsTableFooter($pmaThemeImage, $text_dir);
-$response->addHTML($tablefooter);
-$response->addHTML('</form></div>');
-$message = PMA\libraries\Message::success(
-    sprintf(__('Showing rows %1$s - %2$s.'), ($pos + 1), ($pos + count($result)))
-);
-if (isset($tmp_msg) && $tmp_msg !== true) {
-    $message = $tmp_msg;
-}
diff --git a/#pma/db_datadict.php b/#pma/db_datadict.php
deleted file mode 100644
index d94bebf0..00000000
--- a/#pma/db_datadict.php
+++ /dev/null
@@ -1,214 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Renders data dictionary
- *
- * @package PhpMyAdmin
- */
-
-/**
- * Gets the variables sent or posted to this script, then displays headers
- */
-require_once 'libraries/common.inc.php';
-
-if (! isset($selected_tbl)) {
-    include 'libraries/db_common.inc.php';
-    list(
-        $tables,
-        $num_tables,
-        $total_num_tables,
-        $sub_part,
-        $is_show_stats,
-        $db_is_system_schema,
-        $tooltip_truename,
-        $tooltip_aliasname,
-        $pos
-    ) = PMA\libraries\Util::getDbInfo($db, isset($sub_part) ? $sub_part : '');
-}
-
-$response = PMA\libraries\Response::getInstance();
-$header   = $response->getHeader();
-$header->enablePrintView();
-
-/**
- * Gets the relations settings
- */
-$cfgRelation  = PMA_getRelationsParam();
-
-require_once 'libraries/transformations.lib.php';
-
-/**
- * Check parameters
- */
-PMA\libraries\Util::checkParameters(array('db'));
-
-/**
- * Defines the url to return to in case of error in a sql statement
- */
-$err_url = 'db_sql.php' . PMA_URL_getCommon(array('db' => $db));
-
-if ($cfgRelation['commwork']) {
-    $comment = PMA_getDbComment($db);
-
-    /**
-     * Displays DB comment
-     */
-    if ($comment) {
-        echo '<p>' , __('Database comment')
-            , '<br /><i>' , htmlspecialchars($comment) , '</i></p>';
-    } // end if
-}
-
-/**
- * Selects the database and gets tables names
- */
-$GLOBALS['dbi']->selectDb($db);
-$tables = $GLOBALS['dbi']->getTables($db);
-
-$count  = 0;
-foreach ($tables as $table) {
-    $comments = PMA_getComments($db, $table);
-
-    echo '<div>' , "\n";
-
-    echo '<h2>' , htmlspecialchars($table) , '</h2>' , "\n";
-
-    /**
-     * Gets table information
-     */
-    $show_comment = $GLOBALS['dbi']->getTable($db, $table)
-        ->getStatusInfo('TABLE_COMMENT');
-
-    /**
-     * Gets table keys and retains them
-     */
-    $GLOBALS['dbi']->selectDb($db);
-    $indexes = $GLOBALS['dbi']->getTableIndexes($db, $table);
-    list($primary, $pk_array, $indexes_info, $indexes_data)
-        = PMA\libraries\Util::processIndexData($indexes);
-
-    /**
-     * Gets columns properties
-     */
-    $columns = $GLOBALS['dbi']->getColumns($db, $table);
-
-    // Check if we can use Relations
-    list($res_rel, $have_rel) = PMA_getRelationsAndStatus(
-        ! empty($cfgRelation['relation']), $db, $table
-    );
-
-    /**
-     * Displays the comments of the table if MySQL >= 3.23
-     */
-    if (!empty($show_comment)) {
-        echo __('Table comments:') , ' ';
-        echo htmlspecialchars($show_comment) , '<br /><br />';
-    }
-
-    /**
-     * Displays the table structure
-     */
-
-    echo '<table width="100%" class="print">';
-    echo '<tr><th width="50">' , __('Column') , '</th>';
-    echo '<th width="80">' , __('Type') , '</th>';
-    echo '<th width="40">' , __('Null') , '</th>';
-    echo '<th width="70">' , __('Default') , '</th>';
-    if ($have_rel) {
-        echo '    <th>' , __('Links to') , '</th>' , "\n";
-    }
-    echo '    <th>' , __('Comments') , '</th>' , "\n";
-    if ($cfgRelation['mimework']) {
-        echo '    <th>MIME</th>' , "\n";
-    }
-    echo '</tr>';
-    $odd_row = true;
-    foreach ($columns as $row) {
-
-        if ($row['Null'] == '') {
-            $row['Null'] = 'NO';
-        }
-        $extracted_columnspec
-            = PMA\libraries\Util::extractColumnSpec($row['Type']);
-
-        // reformat mysql query output
-        // set or enum types: slashes single quotes inside options
-
-        $type = htmlspecialchars($extracted_columnspec['print_type']);
-        $attribute     = $extracted_columnspec['attribute'];
-        if (! isset($row['Default'])) {
-            if ($row['Null'] != 'NO') {
-                $row['Default'] = '<i>NULL</i>';
-            }
-        } else {
-            $row['Default'] = htmlspecialchars($row['Default']);
-        }
-        $column_name = $row['Field'];
-
-        echo '<tr class="';
-        echo $odd_row ? 'odd' : 'even'; $odd_row = ! $odd_row;
-        echo '">';
-        echo '<td class="nowrap">';
-        echo htmlspecialchars($column_name);
-
-        if (isset($pk_array[$row['Field']])) {
-            echo ' <em>(' , __('Primary') , ')</em>';
-        }
-        echo '</td>';
-        echo '<td'
-            , PMA\libraries\Util::getClassForType(
-                $extracted_columnspec['type']
-            )
-            , ' lang="en" dir="ltr">' , $type , '</td>';
-
-        echo '<td>';
-        echo (($row['Null'] == 'NO') ? __('No') : __('Yes'));
-        echo '</td>';
-        echo '<td class="nowrap">';
-        if (isset($row['Default'])) {
-            echo $row['Default'];
-        }
-        echo '</td>';
-
-        if ($have_rel) {
-            echo '    <td>';
-            if ($foreigner = PMA_searchColumnInForeigners($res_rel, $column_name)) {
-                echo htmlspecialchars(
-                    $foreigner['foreign_table']
-                    . ' -> '
-                    . $foreigner['foreign_field']
-                );
-            }
-            echo '</td>' , "\n";
-        }
-        echo '    <td>';
-        if (isset($comments[$column_name])) {
-            echo htmlspecialchars($comments[$column_name]);
-        }
-        echo '</td>' , "\n";
-        if ($cfgRelation['mimework']) {
-            $mime_map = PMA_getMIME($db, $table, true);
-
-            echo '    <td>';
-            if (isset($mime_map[$column_name])) {
-                echo htmlspecialchars(
-                    str_replace('_', '/', $mime_map[$column_name]['mimetype'])
-                );
-            }
-            echo '</td>' , "\n";
-        }
-        echo '</tr>';
-    } // end foreach
-    $count++;
-    echo '</table>';
-    // display indexes information
-    if (count(PMA\libraries\Index::getFromTable($table, $db)) > 0) {
-        echo PMA\libraries\Index::getHtmlForIndexes($table, $db, true);
-    }
-    echo '</div>';
-} //ends main while
-
-/**
- * Displays the footer
- */
-echo PMA\libraries\Util::getButton();
diff --git a/#pma/db_designer.php b/#pma/db_designer.php
deleted file mode 100644
index 9720a097..00000000
--- a/#pma/db_designer.php
+++ /dev/null
@@ -1,190 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * phpMyAdmin designer general code
- *
- * @package PhpMyAdmin-Designer
- */
-
-require_once 'libraries/common.inc.php';
-require_once 'libraries/pmd_common.php';
-require_once 'libraries/db_designer.lib.php';
-
-$response = PMA\libraries\Response::getInstance();
-
-if (isset($_REQUEST['dialog'])) {
-
-    if ($_REQUEST['dialog'] == 'edit') {
-        $html = PMA_getHtmlForEditOrDeletePages($GLOBALS['db'], 'editPage');
-    } else if ($_REQUEST['dialog'] == 'delete') {
-        $html = PMA_getHtmlForEditOrDeletePages($GLOBALS['db'], 'deletePage');
-    } else if ($_REQUEST['dialog'] == 'save_as') {
-        $html = PMA_getHtmlForPageSaveAs($GLOBALS['db']);
-    } else if ($_REQUEST['dialog'] == 'export') {
-        include_once 'libraries/plugin_interface.lib.php';
-        $html = PMA_getHtmlForSchemaExport(
-            $GLOBALS['db'], $_REQUEST['selected_page']
-        );
-    }
-
-    if (! empty($html)) {
-        $response->addHTML($html);
-    }
-    return;
-}
-
-if (isset($_REQUEST['operation'])) {
-
-    if ($_REQUEST['operation'] == 'deletePage') {
-        $success = PMA_deletePage($_REQUEST['selected_page']);
-        $response->setRequestStatus($success);
-    } elseif ($_REQUEST['operation'] == 'savePage') {
-        if ($_REQUEST['save_page'] == 'same') {
-            $page = $_REQUEST['selected_page'];
-        } else { // new
-            $page = PMA_createNewPage($_REQUEST['selected_value'], $GLOBALS['db']);
-            $response->addJSON('id', $page);
-        }
-        $success = PMA_saveTablePositions($page);
-        $response->setRequestStatus($success);
-    } elseif ($_REQUEST['operation'] == 'setDisplayField') {
-        PMA_saveDisplayField(
-            $_REQUEST['db'], $_REQUEST['table'], $_REQUEST['field']
-        );
-        $response->setRequestStatus(true);
-    } elseif ($_REQUEST['operation'] == 'addNewRelation') {
-        list($success, $message) = PMA_addNewRelation(
-            $_REQUEST['db'],
-            $_REQUEST['T1'],
-            $_REQUEST['F1'],
-            $_REQUEST['T2'],
-            $_REQUEST['F2'],
-            $_REQUEST['on_delete'],
-            $_REQUEST['on_update']
-        );
-        $response->setRequestStatus($success);
-        $response->addJSON('message', $message);
-    } elseif ($_REQUEST['operation'] == 'removeRelation') {
-        list($success, $message) = PMA_removeRelation(
-            $_REQUEST['T1'],
-            $_REQUEST['F1'],
-            $_REQUEST['T2'],
-            $_REQUEST['F2']
-        );
-        $response->setRequestStatus($success);
-        $response->addJSON('message', $message);
-    } elseif ($_REQUEST['operation'] == 'save_setting_value') {
-        $success = PMA_saveDesignerSetting($_REQUEST['index'], $_REQUEST['value']);
-        $response->setRequestStatus($success);
-    }
-
-    return;
-}
-
-require 'libraries/db_common.inc.php';
-
-$script_display_field = PMA_getTablesInfo();
-$tab_column = PMA_getColumnsInfo();
-$script_tables = PMA_getScriptTabs();
-$tables_pk_or_unique_keys = PMA_getPKOrUniqueKeys();
-$tables_all_keys = PMA_getAllKeys();
-$classes_side_menu = PMA_returnClassNamesFromMenuButtons();
-
-$display_page = -1;
-$selected_page = null;
-
-if (isset($_REQUEST['query'])) {
-    $display_page = PMA_getDefaultPage($_REQUEST['db']);
-} else {
-    if (! empty($_REQUEST['page'])) {
-        $display_page = $_REQUEST['page'];
-    } else {
-        $display_page = PMA_getLoadingPage($_REQUEST['db']);
-    }
-}
-if ($display_page != -1) {
-    $selected_page = PMA_getPageName($display_page);
-}
-$tab_pos = PMA_getTablePositions($display_page);
-$script_contr = PMA_getScriptContr();
-
-$params = array('lang' => $GLOBALS['lang']);
-if (isset($_GET['db'])) {
-    $params['db'] = $_GET['db'];
-}
-
-$response = PMA\libraries\Response::getInstance();
-$response->getFooter()->setMinimal();
-$header   = $response->getHeader();
-$header->setBodyId('pmd_body');
-
-$scripts  = $header->getScripts();
-$scripts->addFile('jquery/jquery.fullscreen.js');
-$scripts->addFile('pmd/designer_db.js');
-$scripts->addFile('pmd/designer_objects.js');
-$scripts->addFile('pmd/designer_page.js');
-$scripts->addFile('pmd/history.js');
-$scripts->addFile('pmd/move.js');
-$scripts->addFile('pmd/init.js');
-
-list(
-    $tables,
-    $num_tables,
-    $total_num_tables,
-    $sub_part,
-    $is_show_stats,
-    $db_is_system_schema,
-    $tooltip_truename,
-    $tooltip_aliasname,
-    $pos
-) = PMA\libraries\Util::getDbInfo($db, isset($sub_part) ? $sub_part : '');
-
-// Embed some data into HTML, later it will be read
-// by pmd/init.js and converted to JS variables.
-$response->addHTML(
-    PMA_getHtmlForJSFields(
-        $script_tables, $script_contr, $script_display_field, $display_page
-    )
-);
-$response->addHTML(
-    PMA_getDesignerPageMenu(
-        isset($_REQUEST['query']),
-        $selected_page,
-        $classes_side_menu
-    )
-);
-
-
-
-$response->addHTML('<div id="canvas_outer">');
-$response->addHTML(
-    '<form action="" id="container-form" method="post" name="form1">'
-);
-
-$response->addHTML(PMA_getHTMLCanvas());
-$response->addHTML(PMA_getHTMLTableList($tab_pos, $display_page));
-
-$response->addHTML(
-    PMA_getDatabaseTables(
-        $tab_pos, $display_page, $tab_column,
-        $tables_all_keys, $tables_pk_or_unique_keys
-    )
-);
-$response->addHTML('</form>');
-$response->addHTML('</div>'); // end canvas_outer
-
-$response->addHTML('<div id="pmd_hint"></div>');
-
-$response->addHTML(PMA_getNewRelationPanel());
-$response->addHTML(PMA_getDeleteRelationPanel());
-
-if (isset($_REQUEST['query'])) {
-    $response->addHTML(PMA_getOptionsPanel());
-    $response->addHTML(PMA_getRenameToPanel());
-    $response->addHTML(PMA_getHavingQueryPanel());
-    $response->addHTML(PMA_getAggregateQueryPanel());
-    $response->addHTML(PMA_getWhereQueryPanel());
-    $response->addHTML(PMA_getQueryDetails());
-}
-
-$response->addHTML('<div id="PMA_disable_floating_menubar"></div>');
diff --git a/#pma/db_events.php b/#pma/db_events.php
deleted file mode 100644
index 606b5d22..00000000
--- a/#pma/db_events.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Events management.
- *
- * @package PhpMyAdmin
- */
-
-/**
- * Include required files
- */
-require_once 'libraries/common.inc.php';
-
-/**
- * Include all other files
- */
-require_once 'libraries/rte/rte_events.lib.php';
-
-/**
- * Do the magic
- */
-$_PMA_RTE = 'EVN';
-require_once 'libraries/rte/rte_main.inc.php';
diff --git a/#pma/db_export.php b/#pma/db_export.php
deleted file mode 100644
index 2ff84170..00000000
--- a/#pma/db_export.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * dumps a database
- *
- * @package PhpMyAdmin
- */
-use PMA\libraries\config\PageSettings;
-use PMA\libraries\Response;
-
-/**
- * Gets some core libraries
- */
-require_once 'libraries/common.inc.php';
-require_once 'libraries/config/user_preferences.forms.php';
-require_once 'libraries/config/page_settings.forms.php';
-require_once 'libraries/export.lib.php';
-
-PageSettings::showGroup('Export');
-
-$response = Response::getInstance();
-$header   = $response->getHeader();
-$scripts  = $header->getScripts();
-$scripts->addFile('export.js');
-
-// $sub_part is used in PMA\libraries\Util::getDbInfo() to see if we are coming from
-// db_export.php, in which case we don't obey $cfg['MaxTableList']
-$sub_part  = '_export';
-require_once 'libraries/db_common.inc.php';
-$url_query .= '&amp;goto=db_export.php';
-
-list(
-    $tables,
-    $num_tables,
-    $total_num_tables,
-    $sub_part,
-    $is_show_stats,
-    $db_is_system_schema,
-    $tooltip_truename,
-    $tooltip_aliasname,
-    $pos
-) = PMA\libraries\Util::getDbInfo($db, isset($sub_part) ? $sub_part : '');
-
-/**
- * Displays the form
- */
-$export_page_title = __('View dump (schema) of database');
-
-// exit if no tables in db found
-if ($num_tables < 1) {
-    PMA\libraries\Message::error(__('No tables found in database.'))->display();
-    exit;
-} // end if
-
-$multi_values  = '<div class="export_table_list_container">';
-if (isset($_GET['structure_or_data_forced'])) {
-    $force_val = htmlspecialchars($_GET['structure_or_data_forced']);
-} else {
-    $force_val = 0;
-}
-$multi_values .= '<input type="hidden" name="structure_or_data_forced" value="'
-    . $force_val . '">';
-$multi_values .= '<table class="export_table_select">'
-    . '<thead><tr><th></th>'
-    . '<th>' . __('Tables') . '</th>'
-    . '<th class="export_structure">' . __('Structure') . '</th>'
-    . '<th class="export_data">' . __('Data') . '</th>'
-    . '</tr><tr>'
-    . '<td></td>'
-    . '<td class="export_table_name all">' . __('Select all') . '</td>'
-    . '<td class="export_structure all">'
-    . '<input type="checkbox" id="table_structure_all" /></td>'
-    . '<td class="export_data all"><input type="checkbox" id="table_data_all" />'
-    . '</td>'
-    . '</tr></thead>'
-    . '<tbody>';
-$multi_values .= "\n";
-
-// when called by libraries/mult_submits.inc.php
-if (!empty($_POST['selected_tbl']) && empty($table_select)) {
-    $table_select = $_POST['selected_tbl'];
-}
-
-// Check if the selected tables are defined in $_GET
-// (from clicking Back button on export.php)
-foreach (array('table_select', 'table_structure', 'table_data') as $one_key) {
-    if (isset($_GET[$one_key])) {
-        $_GET[$one_key] = urldecode($_GET[$one_key]);
-        $_GET[$one_key] = explode(",", $_GET[$one_key]);
-    }
-}
-
-foreach ($tables as $each_table) {
-    if (isset($_GET['table_select']) && is_array($_GET['table_select'])) {
-        $is_checked = PMA_getCheckedClause(
-            $each_table['Name'], $_GET['table_select']
-        );
-    } elseif (isset($table_select)) {
-        $is_checked = PMA_getCheckedClause(
-            $each_table['Name'], $table_select
-        );
-    } else {
-        $is_checked = ' checked="checked"';
-    }
-    if (isset($_GET['table_structure']) && is_array($_GET['table_structure'])) {
-        $structure_checked = PMA_getCheckedClause(
-            $each_table['Name'], $_GET['table_structure']
-        );
-    } else {
-        $structure_checked = $is_checked;
-    }
-    if (isset($_GET['table_data']) && is_array($_GET['table_data'])) {
-        $data_checked = PMA_getCheckedClause(
-            $each_table['Name'], $_GET['table_data']
-        );
-    } else {
-        $data_checked = $is_checked;
-    }
-    $table_html   = htmlspecialchars($each_table['Name']);
-    $multi_values .= '<tr>';
-    $multi_values .= '<td><input type="checkbox" name="table_select[]"'
-        . ' value="' . $table_html . '"' . $is_checked . ' /></td>';
-    $multi_values .= '<td class="export_table_name">'
-        . str_replace(' ', '&nbsp;', $table_html) . '</td>';
-    $multi_values .= '<td class="export_structure">'
-        . '<input type="checkbox" name="table_structure[]"'
-        . ' value="' . $table_html . '"' . $structure_checked . ' /></td>';
-    $multi_values .= '<td class="export_data">'
-        . '<input type="checkbox" name="table_data[]"'
-        . ' value="' . $table_html . '"' . $data_checked . ' /></td>';
-    $multi_values .= '</tr>';
-} // end for
-
-$multi_values .= "\n";
-$multi_values .= '</tbody></table></div>';
-
-require_once 'libraries/display_export.lib.php';
-if (! isset($sql_query)) {
-    $sql_query = '';
-}
-if (! isset($num_tables)) {
-    $num_tables = 0;
-}
-if (! isset($unlim_num_rows)) {
-    $unlim_num_rows = 0;
-}
-if (! isset($multi_values)) {
-    $multi_values = '';
-}
-$response = Response::getInstance();
-$response->addHTML(
-    PMA_getExportDisplay(
-        'database', $db, $table, $sql_query, $num_tables,
-        $unlim_num_rows, $multi_values
-    )
-);
diff --git a/#pma/db_import.php b/#pma/db_import.php
deleted file mode 100644
index 251a6b0c..00000000
--- a/#pma/db_import.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Database import page
- *
- * @package PhpMyAdmin
- */
-
-use PMA\libraries\config\PageSettings;
-
-require_once 'libraries/common.inc.php';
-require_once 'libraries/config/user_preferences.forms.php';
-require_once 'libraries/config/page_settings.forms.php';
-
-PageSettings::showGroup('Import');
-
-$response = PMA\libraries\Response::getInstance();
-$header   = $response->getHeader();
-$scripts  = $header->getScripts();
-$scripts->addFile('import.js');
-
-/**
- * Gets tables information and displays top links
- */
-require 'libraries/db_common.inc.php';
-
-list(
-    $tables,
-    $num_tables,
-    $total_num_tables,
-    $sub_part,
-    $is_show_stats,
-    $db_is_system_schema,
-    $tooltip_truename,
-    $tooltip_aliasname,
-    $pos
-) = PMA\libraries\Util::getDbInfo($db, isset($sub_part) ? $sub_part : '');
-
-require 'libraries/display_import.lib.php';
-$response = PMA\libraries\Response::getInstance();
-$response->addHTML(
-    PMA_getImportDisplay(
-        'database', $db, $table, $max_upload_size
-    )
-);
diff --git a/#pma/db_operations.php b/#pma/db_operations.php
deleted file mode 100644
index 3dd0c0ce..00000000
--- a/#pma/db_operations.php
+++ /dev/null
@@ -1,315 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * handles miscellaneous db operations:
- *  - move/rename
- *  - copy
- *  - changing collation
- *  - changing comment
- *  - adding tables
- *  - viewing PDF schemas
- *
- * @package PhpMyAdmin
- */
-use PMA\libraries\plugins\export\ExportSql;
-
-/**
- * requirements
- */
-require_once 'libraries/common.inc.php';
-require_once 'libraries/mysql_charsets.inc.php';
-require_once 'libraries/display_create_table.lib.php';
-
-/**
- * functions implementation for this script
- */
-require_once 'libraries/check_user_privileges.lib.php';
-require_once 'libraries/operations.lib.php';
-
-// add a javascript file for jQuery functions to handle Ajax actions
-$response = PMA\libraries\Response::getInstance();
-$header = $response->getHeader();
-$scripts = $header->getScripts();
-$scripts->addFile('db_operations.js');
-
-$sql_query = '';
-
-/**
- * Rename/move or copy database
- */
-if (mb_strlen($GLOBALS['db'])
-    && (! empty($_REQUEST['db_rename']) || ! empty($_REQUEST['db_copy']))
-) {
-    if (! empty($_REQUEST['db_rename'])) {
-        $move = true;
-    } else {
-        $move = false;
-    }
-
-    if (! isset($_REQUEST['newname'])
-        || ! mb_strlen($_REQUEST['newname'])
-    ) {
-        $message = PMA\libraries\Message::error(__('The database name is empty!'));
-    } else {
-        $_error = false;
-        if ($move || ! empty($_REQUEST['create_database_before_copying'])) {
-            PMA_createDbBeforeCopy();
-        }
-
-        // here I don't use DELIMITER because it's not part of the
-        // language; I have to send each statement one by one
-
-        // to avoid selecting alternatively the current and new db
-        // we would need to modify the CREATE definitions to qualify
-        // the db name
-        PMA_runProcedureAndFunctionDefinitions($GLOBALS['db']);
-
-        // go back to current db, just in case
-        $GLOBALS['dbi']->selectDb($GLOBALS['db']);
-
-        $tables_full = $GLOBALS['dbi']->getTablesFull($GLOBALS['db']);
-
-        include_once "libraries/plugin_interface.lib.php";
-        // remove all foreign key constraints, otherwise we can get errors
-        /* @var $export_sql_plugin ExportSql */
-        $export_sql_plugin = PMA_getPlugin(
-            "export",
-            "sql",
-            'libraries/plugins/export/',
-            array(
-                'single_table' => isset($single_table),
-                'export_type'  => 'database'
-            )
-        );
-
-        // create stand-in tables for views
-        $views = PMA_getViewsAndCreateSqlViewStandIn(
-            $tables_full, $export_sql_plugin, $GLOBALS['db']
-        );
-
-        // copy tables
-        $sqlConstratints = PMA_copyTables(
-            $tables_full, $move, $GLOBALS['db']
-        );
-
-        // handle the views
-        if (! $_error) {
-            PMA_handleTheViews($views, $move, $GLOBALS['db']);
-        }
-        unset($views);
-
-        // now that all tables exist, create all the accumulated constraints
-        if (! $_error && count($sqlConstratints) > 0) {
-            PMA_createAllAccumulatedConstraints($sqlConstratints);
-        }
-        unset($sqlConstratints);
-
-        if (PMA_MYSQL_INT_VERSION >= 50100) {
-            // here DELIMITER is not used because it's not part of the
-            // language; each statement is sent one by one
-
-            PMA_runEventDefinitionsForDb($GLOBALS['db']);
-        }
-
-        // go back to current db, just in case
-        $GLOBALS['dbi']->selectDb($GLOBALS['db']);
-
-        // Duplicate the bookmarks for this db (done once for each db)
-        PMA_duplicateBookmarks($_error, $GLOBALS['db']);
-
-        if (! $_error && $move) {
-            if (isset($_REQUEST['adjust_privileges'])
-                && ! empty($_REQUEST['adjust_privileges'])
-            ) {
-                PMA_AdjustPrivileges_moveDB($GLOBALS['db'], $_REQUEST['newname']);
-            }
-
-            /**
-             * cleanup pmadb stuff for this db
-             */
-            include_once 'libraries/relation_cleanup.lib.php';
-            PMA_relationsCleanupDatabase($GLOBALS['db']);
-
-            // if someday the RENAME DATABASE reappears, do not DROP
-            $local_query = 'DROP DATABASE '
-                . PMA\libraries\Util::backquote($GLOBALS['db']) . ';';
-            $sql_query .= "\n" . $local_query;
-            $GLOBALS['dbi']->query($local_query);
-
-            $message = PMA\libraries\Message::success(
-                __('Database %1$s has been renamed to %2$s.')
-            );
-            $message->addParam($GLOBALS['db']);
-            $message->addParam($_REQUEST['newname']);
-        } elseif (! $_error) {
-            if (isset($_REQUEST['adjust_privileges'])
-                && ! empty($_REQUEST['adjust_privileges'])
-            ) {
-                PMA_AdjustPrivileges_copyDB($GLOBALS['db'], $_REQUEST['newname']);
-            }
-
-            $message = PMA\libraries\Message::success(
-                __('Database %1$s has been copied to %2$s.')
-            );
-            $message->addParam($GLOBALS['db']);
-            $message->addParam($_REQUEST['newname']);
-        } else {
-            $message = PMA\libraries\Message::error();
-        }
-        $reload     = true;
-
-        /* Change database to be used */
-        if (! $_error && $move) {
-            $GLOBALS['db'] = $_REQUEST['newname'];
-        } elseif (! $_error) {
-            if (isset($_REQUEST['switch_to_new'])
-                && $_REQUEST['switch_to_new'] == 'true'
-            ) {
-                $GLOBALS['PMA_Config']->setCookie('pma_switch_to_new', 'true');
-                $GLOBALS['db'] = $_REQUEST['newname'];
-            } else {
-                $GLOBALS['PMA_Config']->setCookie('pma_switch_to_new', '');
-            }
-        }
-    }
-
-    /**
-     * Database has been successfully renamed/moved.  If in an Ajax request,
-     * generate the output with {@link PMA\libraries\Response} and exit
-     */
-    if ($GLOBALS['is_ajax_request'] == true) {
-        $response = PMA\libraries\Response::getInstance();
-        $response->setRequestStatus($message->isSuccess());
-        $response->addJSON('message', $message);
-        $response->addJSON('newname', $_REQUEST['newname']);
-        $response->addJSON(
-            'sql_query',
-            PMA\libraries\Util::getMessage(null, $sql_query)
-        );
-        $response->addJSON('db', $GLOBALS['db']);
-        exit;
-    }
-}
-
-/**
- * Settings for relations stuff
- */
-
-$cfgRelation = PMA_getRelationsParam();
-
-/**
- * Check if comments were updated
- * (must be done before displaying the menu tabs)
- */
-if (isset($_REQUEST['comment'])) {
-    PMA_setDbComment($GLOBALS['db'], $_REQUEST['comment']);
-}
-
-require 'libraries/db_common.inc.php';
-$url_query .= '&amp;goto=db_operations.php';
-
-// Gets the database structure
-$sub_part = '_structure';
-
-list(
-    $tables,
-    $num_tables,
-    $total_num_tables,
-    $sub_part,
-    $is_show_stats,
-    $db_is_system_schema,
-    $tooltip_truename,
-    $tooltip_aliasname,
-    $pos
-) = PMA\libraries\Util::getDbInfo($db, isset($sub_part) ? $sub_part : '');
-
-echo "\n";
-
-if (isset($message)) {
-    echo PMA\libraries\Util::getMessage($message, $sql_query);
-    unset($message);
-}
-
-$_REQUEST['db_collation'] = PMA_getDbCollation($GLOBALS['db']);
-$is_information_schema = $GLOBALS['dbi']->isSystemSchema($GLOBALS['db']);
-
-$response->addHTML('<div id="boxContainer" data-box-width="300">');
-
-if (!$is_information_schema) {
-    if ($cfgRelation['commwork']) {
-        /**
-         * database comment
-         */
-        $response->addHTML(PMA_getHtmlForDatabaseComment($GLOBALS['db']));
-    }
-
-    $response->addHTML('<div class="operations_half_width">');
-    $response->addHTML(PMA_getHtmlForCreateTable($db));
-    $response->addHTML('</div>');
-
-    /**
-     * rename database
-     */
-    if ($GLOBALS['db'] != 'mysql') {
-        $response->addHTML(PMA_getHtmlForRenameDatabase($GLOBALS['db']));
-    }
-
-    // Drop link if allowed
-    // Don't even try to drop information_schema.
-    // You won't be able to. Believe me. You won't.
-    // Don't allow to easily drop mysql database, RFE #1327514.
-    if (($is_superuser || $GLOBALS['cfg']['AllowUserDropDatabase'])
-        && ! $db_is_system_schema
-        && $GLOBALS['db'] != 'mysql'
-    ) {
-        $response->addHTML(PMA_getHtmlForDropDatabaseLink($GLOBALS['db']));
-    }
-    /**
-     * Copy database
-     */
-    $response->addHTML(PMA_getHtmlForCopyDatabase($GLOBALS['db']));
-
-    /**
-     * Change database charset
-     */
-    $response->addHTML(PMA_getHtmlForChangeDatabaseCharset($GLOBALS['db'], $table));
-
-    if (! $cfgRelation['allworks']
-        && $cfg['PmaNoRelation_DisableWarning'] == false
-    ) {
-        $message = PMA\libraries\Message::notice(
-            __(
-                'The phpMyAdmin configuration storage has been deactivated. ' .
-                '%sFind out why%s.'
-            )
-        );
-        $message->addParam(
-            '<a href="'
-            . './chk_rel.php' . $url_query . '">',
-            false
-        );
-        $message->addParam('</a>', false);
-        /* Show error if user has configured something, notice elsewhere */
-        if (!empty($cfg['Servers'][$server]['pmadb'])) {
-            $message->isError(true);
-        }
-    } // end if
-} // end if (!$is_information_schema)
-
-$response->addHTML('</div>');
-
-// not sure about displaying the PDF dialog in case db is information_schema
-if ($cfgRelation['pdfwork'] && $num_tables > 0) {
-    // We only show this if we find something in the new pdf_pages table
-    $test_query = '
-        SELECT *
-        FROM ' . PMA\libraries\Util::backquote($GLOBALS['cfgRelation']['db'])
-        . '.' . PMA\libraries\Util::backquote($cfgRelation['pdf_pages']) . '
-        WHERE db_name = \'' . $GLOBALS['dbi']->escapeString($GLOBALS['db'])
-        . '\'';
-    $test_rs = PMA_queryAsControlUser(
-        $test_query,
-        false,
-        PMA\libraries\DatabaseInterface::QUERY_STORE
-    );
-} // end if
diff --git a/#pma/db_qbe.php b/#pma/db_qbe.php
deleted file mode 100644
index c2baaf62..00000000
--- a/#pma/db_qbe.php
+++ /dev/null
@@ -1,153 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * query by example the whole database
- *
- * @package PhpMyAdmin
- */
-use PMA\libraries\SavedSearches;
-
-/**
- * requirements
- */
-require_once 'libraries/common.inc.php';
-require_once 'libraries/bookmark.lib.php';
-require_once 'libraries/sql.lib.php';
-
-$response = PMA\libraries\Response::getInstance();
-
-// Gets the relation settings
-$cfgRelation = PMA_getRelationsParam();
-
-$savedSearchList = array();
-$savedSearch = null;
-$currentSearchId = null;
-if ($cfgRelation['savedsearcheswork']) {
-    $header = $response->getHeader();
-    $scripts = $header->getScripts();
-    $scripts->addFile('db_qbe.js');
-
-    //Get saved search list.
-    $savedSearch = new SavedSearches($GLOBALS);
-    $savedSearch->setUsername($GLOBALS['cfg']['Server']['user'])
-        ->setDbname($_REQUEST['db']);
-
-    if (!empty($_REQUEST['searchId'])) {
-        $savedSearch->setId($_REQUEST['searchId']);
-    }
-
-    //Action field is sent.
-    if (isset($_REQUEST['action'])) {
-        $savedSearch->setSearchName($_REQUEST['searchName']);
-        if ('create' === $_REQUEST['action']) {
-            $saveResult = $savedSearch->setId(null)
-                ->setCriterias($_REQUEST)
-                ->save();
-        } elseif ('update' === $_REQUEST['action']) {
-            $saveResult = $savedSearch->setCriterias($_REQUEST)
-                ->save();
-        } elseif ('delete' === $_REQUEST['action']) {
-            $deleteResult = $savedSearch->delete();
-            //After deletion, reset search.
-            $savedSearch = new SavedSearches($GLOBALS);
-            $savedSearch->setUsername($GLOBALS['cfg']['Server']['user'])
-                ->setDbname($_REQUEST['db']);
-            $_REQUEST = array();
-        } elseif ('load' === $_REQUEST['action']) {
-            if (empty($_REQUEST['searchId'])) {
-                //when not loading a search, reset the object.
-                $savedSearch = new SavedSearches($GLOBALS);
-                $savedSearch->setUsername($GLOBALS['cfg']['Server']['user'])
-                    ->setDbname($_REQUEST['db']);
-                $_REQUEST = array();
-            } else {
-                $loadResult = $savedSearch->load();
-            }
-        }
-        //Else, it's an "update query"
-    }
-
-    $savedSearchList = $savedSearch->getList();
-    $currentSearchId = $savedSearch->getId();
-}
-
-/**
- * A query has been submitted -> (maybe) execute it
- */
-$message_to_display = false;
-if (isset($_REQUEST['submit_sql']) && ! empty($sql_query)) {
-    if (! preg_match('@^SELECT@i', $sql_query)) {
-        $message_to_display = true;
-    } else {
-        $goto = 'db_sql.php';
-        PMA_executeQueryAndSendQueryResponse(
-            null, // analyzed_sql_results
-            false, // is_gotofile
-            $_REQUEST['db'], // db
-            null, // table
-            false, // find_real_end
-            null, // sql_query_for_bookmark
-            null, // extra_data
-            null, // message_to_show
-            null, // message
-            null, // sql_data
-            $goto, // goto
-            $pmaThemeImage, // pmaThemeImage
-            null, // disp_query
-            null, // disp_message
-            null, // query_type
-            $sql_query, // sql_query
-            null, // selectedTables
-            null // complete_query
-        );
-    }
-}
-
-$sub_part  = '_qbe';
-require 'libraries/db_common.inc.php';
-$url_query .= '&amp;goto=db_qbe.php';
-$url_params['goto'] = 'db_qbe.php';
-
-list(
-    $tables,
-    $num_tables,
-    $total_num_tables,
-    $sub_part,
-    $is_show_stats,
-    $db_is_system_schema,
-    $tooltip_truename,
-    $tooltip_aliasname,
-    $pos
-) = PMA\libraries\Util::getDbInfo($db, isset($sub_part) ? $sub_part : '');
-
-if ($message_to_display) {
-    PMA\libraries\Message::error(
-        __('You have to choose at least one column to display!')
-    )
-        ->display();
-}
-unset($message_to_display);
-
-// create new qbe search instance
-$db_qbe = new PMA\libraries\DbQbe($GLOBALS['db'], $savedSearchList, $savedSearch);
-
-$url = 'db_designer.php' . PMA_URL_getCommon(
-    array_merge(
-        $url_params,
-        array('query' => 1)
-    )
-);
-$response->addHTML(
-    PMA\libraries\Message::notice(
-        sprintf(
-            __('Switch to %svisual builder%s'),
-            '<a href="' . $url . '">',
-            '</a>'
-        )
-    )
-);
-
-/**
- * Displays the Query by example form
- */
-$response->addHTML($db_qbe->getSelectionForm());
diff --git a/#pma/db_routines.php b/#pma/db_routines.php
deleted file mode 100644
index 5cfcf2fb..00000000
--- a/#pma/db_routines.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Routines management.
- *
- * @package PhpMyAdmin
- */
-
-/**
- * Include required files
- */
-require_once 'libraries/common.inc.php';
-require_once 'libraries/mysql_charsets.inc.php';
-
-/**
- * Include all other files
- */
-require_once 'libraries/check_user_privileges.lib.php';
-require_once 'libraries/rte/rte_routines.lib.php';
-
-/**
- * Do the magic
- */
-$_PMA_RTE = 'RTN';
-require_once 'libraries/rte/rte_main.inc.php';
diff --git a/#pma/db_search.php b/#pma/db_search.php
deleted file mode 100644
index 4f15b9ea..00000000
--- a/#pma/db_search.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * searches the entire database
- *
- * @todo    make use of UNION when searching multiple tables
- * @todo    display executed query, optional?
- * @package PhpMyAdmin
- */
-
-/**
- * Gets some core libraries
- */
-require_once 'libraries/common.inc.php';
-
-use PMA\libraries\DbSearch;
-
-$response = PMA\libraries\Response::getInstance();
-$header   = $response->getHeader();
-$scripts  = $header->getScripts();
-$scripts->addFile('db_search.js');
-$scripts->addFile('sql.js');
-$scripts->addFile('makegrid.js');
-$scripts->addFile('jquery/jquery-ui-timepicker-addon.js');
-
-require 'libraries/db_common.inc.php';
-
-// If config variable $GLOBALS['cfg']['UseDbSearch'] is on false : exit.
-if (! $GLOBALS['cfg']['UseDbSearch']) {
-    PMA\libraries\Util::mysqlDie(
-        __('Access denied!'), '', false, $err_url
-    );
-} // end if
-$url_query .= '&amp;goto=db_search.php';
-$url_params['goto'] = 'db_search.php';
-
-// Create a database search instance
-$db_search = new DbSearch($GLOBALS['db']);
-
-// Display top links if we are not in an Ajax request
-if ($GLOBALS['is_ajax_request'] != true) {
-    list(
-        $tables,
-        $num_tables,
-        $total_num_tables,
-        $sub_part,
-        $is_show_stats,
-        $db_is_system_schema,
-        $tooltip_truename,
-        $tooltip_aliasname,
-        $pos
-    ) = PMA\libraries\Util::getDbInfo($db, isset($sub_part) ? $sub_part : '');
-}
-
-// Main search form has been submitted, get results
-if (isset($_REQUEST['submit_search'])) {
-    $response->addHTML($db_search->getSearchResults());
-} else {
-    $response->addHTML('<div id="searchresults"></div>');
-}
-
-// If we are in an Ajax request, we need to exit after displaying all the HTML
-if ($GLOBALS['is_ajax_request'] == true && empty($_REQUEST['ajax_page_request'])) {
-    exit;
-}
-
-// Display the search form
-$response->addHTML(
-    '<div id="togglesearchresultsdiv"><a id="togglesearchresultlink"></a></div>'
-    . '<br class="clearfloat" />'
-);
-$response->addHTML($db_search->getSelectionForm());
-$response->addHTML($db_search->getResultDivs());
diff --git a/#pma/db_sql.php b/#pma/db_sql.php
deleted file mode 100644
index c1daf093..00000000
--- a/#pma/db_sql.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Database SQL executor
- *
- * @package PhpMyAdmin
- */
-use PMA\libraries\config\PageSettings;
-
-/**
- *
- */
-require_once 'libraries/common.inc.php';
-require_once 'libraries/config/user_preferences.forms.php';
-require_once 'libraries/config/page_settings.forms.php';
-
-PageSettings::showGroup('Sql_queries');
-
-/**
- * Runs common work
- */
-$response = PMA\libraries\Response::getInstance();
-$header   = $response->getHeader();
-$scripts  = $header->getScripts();
-$scripts->addFile('makegrid.js');
-$scripts->addFile('jquery/jquery.uitablefilter.js');
-$scripts->addFile('sql.js');
-
-require 'libraries/db_common.inc.php';
-require_once 'libraries/sql_query_form.lib.php';
-
-// After a syntax error, we return to this script
-// with the typed query in the textarea.
-$goto = 'db_sql.php';
-$back = 'db_sql.php';
-
-/**
- * Query box, bookmark, insert data from textfile
- */
-$response->addHTML(
-    PMA_getHtmlForSqlQueryForm(
-        true, false,
-        isset($_REQUEST['delimiter'])
-        ? htmlspecialchars($_REQUEST['delimiter'])
-        : ';'
-    )
-);
diff --git a/#pma/db_sql_autocomplete.php b/#pma/db_sql_autocomplete.php
deleted file mode 100644
index b760e232..00000000
--- a/#pma/db_sql_autocomplete.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Table/Column autocomplete in SQL editors
- *
- * @package PhpMyAdmin
- */
-
-require_once 'libraries/common.inc.php';
-
-if ($GLOBALS['cfg']['EnableAutocompleteForTablesAndColumns']) {
-    $db = isset($_POST['db']) ? $_POST['db'] : $GLOBALS['db'];
-    $sql_autocomplete = array();
-    if ($db) {
-        $tableNames = $GLOBALS['dbi']->getTables($db);
-        foreach ($tableNames as $tableName) {
-            $sql_autocomplete[$tableName] = $GLOBALS['dbi']->getColumns(
-                $db, $tableName
-            );
-        }
-    }
-} else {
-    $sql_autocomplete = true;
-}
-$response = PMA\libraries\Response::getInstance();
-$response->addJSON("tables", json_encode($sql_autocomplete));
diff --git a/#pma/db_sql_format.php b/#pma/db_sql_format.php
deleted file mode 100644
index c89ace5f..00000000
--- a/#pma/db_sql_format.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Format SQL for SQL editors
- *
- * @package PhpMyAdmin
- */
-
-/**
- * Loading common files. Used to check for authorization, localization and to
- * load the parsing library.
- */
-require_once 'libraries/common.inc.php';
-
-$query = !empty($_POST['sql']) ? $_POST['sql'] : '';
-
-$query = SqlParser\Utils\Formatter::format($query);
-
-$response = PMA\libraries\Response::getInstance();
-$response->addJSON("sql", $query);
diff --git a/#pma/db_structure.php b/#pma/db_structure.php
deleted file mode 100644
index 4bdb9ccb..00000000
--- a/#pma/db_structure.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Database structure manipulation
- *
- * @package PhpMyAdmin
- */
-
-namespace PMA;
-
-use PMA\libraries\controllers\database\DatabaseStructureController;
-use PMA\libraries\Response;
-use PMA\libraries\Util;
-
-require_once 'libraries/common.inc.php';
-require_once 'libraries/db_common.inc.php';
-
-$container = libraries\di\Container::getDefaultContainer();
-$container->factory('PMA\libraries\controllers\database\DatabaseStructureController');
-$container->alias(
-    'DatabaseStructureController',
-    'PMA\libraries\controllers\database\DatabaseStructureController'
-);
-$container->set('PMA\libraries\Response', Response::getInstance());
-$container->alias('response', 'PMA\libraries\Response');
-
-/* Define dependencies for the concerned controller */
-$dependency_definitions = array(
-    'db' => $db,
-    'url_query' => &$GLOBALS['url_query'],
-);
-
-/** @var DatabaseStructureController $controller */
-$controller = $container->get(
-    'DatabaseStructureController',
-    $dependency_definitions
-);
-$controller->indexAction();
diff --git a/#pma/db_tracking.php b/#pma/db_tracking.php
deleted file mode 100644
index c8f78379..00000000
--- a/#pma/db_tracking.php
+++ /dev/null
@@ -1,150 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Tracking configuration for database
- *
- * @package PhpMyAdmin
- */
-use PMA\libraries\Tracker;
-
-/**
- * Run common work
- */
-require_once 'libraries/common.inc.php';
-
-require_once './libraries/tracking.lib.php';
-require_once 'libraries/display_create_table.lib.php';
-
-//Get some js files needed for Ajax requests
-$response = PMA\libraries\Response::getInstance();
-$header   = $response->getHeader();
-$scripts  = $header->getScripts();
-$scripts->addFile('jquery/jquery.tablesorter.js');
-$scripts->addFile('db_tracking.js');
-
-/**
- * If we are not in an Ajax request, then do the common work and show the links etc.
- */
-require 'libraries/db_common.inc.php';
-$url_query .= '&amp;goto=tbl_tracking.php&amp;back=db_tracking.php';
-
-// Get the database structure
-$sub_part = '_structure';
-
-list(
-    $tables,
-    $num_tables,
-    $total_num_tables,
-    $sub_part,
-    $is_show_stats,
-    $db_is_system_schema,
-    $tooltip_truename,
-    $tooltip_aliasname,
-    $pos
-) = PMA\libraries\Util::getDbInfo($db, isset($sub_part) ? $sub_part : '');
-
-// Work to do?
-//  (here, do not use $_REQUEST['db] as it can be crafted)
-if (isset($_REQUEST['delete_tracking']) && isset($_REQUEST['table'])) {
-
-    Tracker::deleteTracking($GLOBALS['db'], $_REQUEST['table']);
-    PMA\libraries\Message::success(
-        __('Tracking data deleted successfully.')
-    )->display();
-
-} elseif (isset($_REQUEST['submit_create_version'])) {
-
-    PMA_createTrackingForMultipleTables($_REQUEST['selected']);
-    PMA\libraries\Message::success(
-        sprintf(
-            __(
-                'Version %1$s was created for selected tables,'
-                . ' tracking is active for them.'
-            ),
-            htmlspecialchars($_REQUEST['version'])
-        )
-    )->display();
-
-} elseif (isset($_REQUEST['submit_mult'])) {
-
-    if (! empty($_REQUEST['selected_tbl'])) {
-        if ($_REQUEST['submit_mult'] == 'delete_tracking') {
-
-            foreach ($_REQUEST['selected_tbl'] as $table) {
-                Tracker::deleteTracking($GLOBALS['db'], $table);
-            }
-            PMA\libraries\Message::success(
-                __('Tracking data deleted successfully.')
-            )->display();
-
-        } elseif ($_REQUEST['submit_mult'] == 'track') {
-
-            echo PMA_getHtmlForDataDefinitionAndManipulationStatements(
-                'db_tracking.php' . $url_query,
-                0,
-                $GLOBALS['db'],
-                $_REQUEST['selected_tbl']
-            );
-            exit;
-        }
-    } else {
-        PMA\libraries\Message::notice(
-            __('No tables selected.')
-        )->display();
-    }
-}
-
-// Get tracked data about the database
-$data = Tracker::getTrackedData($_REQUEST['db'], '', '1');
-
-// No tables present and no log exist
-if ($num_tables == 0 && count($data['ddlog']) == 0) {
-    echo '<p>' , __('No tables found in database.') , '</p>' , "\n";
-
-    if (empty($db_is_system_schema)) {
-        echo PMA_getHtmlForCreateTable($db);
-    }
-    exit;
-}
-
-// ---------------------------------------------------------------------------
-$cfgRelation = PMA_getRelationsParam();
-
-// Prepare statement to get HEAD version
-$all_tables_query = ' SELECT table_name, MAX(version) as version FROM ' .
-    PMA\libraries\Util::backquote($cfgRelation['db']) . '.' .
-    PMA\libraries\Util::backquote($cfgRelation['tracking']) .
-    ' WHERE db_name = \'' . $GLOBALS['dbi']->escapeString($_REQUEST['db']) .
-    '\' ' .
-    ' GROUP BY table_name' .
-    ' ORDER BY table_name ASC';
-
-$all_tables_result = PMA_queryAsControlUser($all_tables_query);
-
-// If a HEAD version exists
-if (is_object($all_tables_result)
-    && $GLOBALS['dbi']->numRows($all_tables_result) > 0
-) {
-    PMA_displayTrackedTables(
-        $GLOBALS['db'], $all_tables_result, $url_query, $pmaThemeImage,
-        $text_dir, $cfgRelation
-    );
-}
-
-$untracked_tables = PMA_getUntrackedTables($GLOBALS['db']);
-
-// If untracked tables exist
-if (count($untracked_tables) > 0) {
-    PMA_displayUntrackedTables(
-        $GLOBALS['db'], $untracked_tables, $url_query, $pmaThemeImage, $text_dir
-    );
-}
-// If available print out database log
-if (count($data['ddlog']) > 0) {
-    $log = '';
-    foreach ($data['ddlog'] as $entry) {
-        $log .= '# ' . $entry['date'] . ' ' . $entry['username'] . "\n"
-            . $entry['statement'] . "\n";
-    }
-    echo PMA\libraries\Util::getMessage(__('Database Log'), $log);
-}
diff --git a/#pma/db_triggers.php b/#pma/db_triggers.php
deleted file mode 100644
index a415fb43..00000000
--- a/#pma/db_triggers.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Triggers management.
- *
- * @package PhpMyAdmin
- */
-
-/**
- * Include required files
- */
-require_once 'libraries/common.inc.php';
-
-/**
- * Include all other files
- */
-require_once 'libraries/rte/rte_triggers.lib.php';
-
-/**
- * Do the magic
- */
-$_PMA_RTE = 'TRI';
-require_once 'libraries/rte/rte_main.inc.php';
diff --git a/#pma/doc/Makefile b/#pma/doc/Makefile
deleted file mode 100644
index a2f6a6fd..00000000
--- a/#pma/doc/Makefile
+++ /dev/null
@@ -1,197 +0,0 @@
-# Makefile for Sphinx documentation
-#
-
-# You can set these variables from the command line.
-SPHINXOPTS    =
-SPHINXBUILD   = sphinx-build
-PAPER         =
-BUILDDIR      = .
-
-# User-friendly check for sphinx-build
-ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
-$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/)
-endif
-
-# Internal variables.
-PAPEROPT_a4     = -D latex_paper_size=a4
-PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
-# the i18n builder cannot share the environment and doctrees with the others
-I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
-
-.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext
-
-help:
-	@echo "Please use \`make <target>' where <target> is one of"
-	@echo "  html       to make standalone HTML files"
-	@echo "  dirhtml    to make HTML files named index.html in directories"
-	@echo "  singlehtml to make a single large HTML file"
-	@echo "  pickle     to make pickle files"
-	@echo "  json       to make JSON files"
-	@echo "  htmlhelp   to make HTML files and a HTML help project"
-	@echo "  qthelp     to make HTML files and a qthelp project"
-	@echo "  devhelp    to make HTML files and a Devhelp project"
-	@echo "  epub       to make an epub"
-	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
-	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
-	@echo "  latexpdfja to make LaTeX files and run them through platex/dvipdfmx"
-	@echo "  text       to make text files"
-	@echo "  man        to make manual pages"
-	@echo "  texinfo    to make Texinfo files"
-	@echo "  info       to make Texinfo files and run them through makeinfo"
-	@echo "  gettext    to make PO message catalogs"
-	@echo "  changes    to make an overview of all changed/added/deprecated items"
-	@echo "  xml        to make Docutils-native XML files"
-	@echo "  pseudoxml  to make pseudoxml-XML files for display purposes"
-	@echo "  linkcheck  to check all external links for integrity"
-	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
-
-clean:
-	-rm -rf $(BUILDDIR)/doctrees
-	-rm -rf $(BUILDDIR)/html
-	-rm -rf $(BUILDDIR)/dirhtml
-	-rm -rf $(BUILDDIR)/singlehtml
-	-rm -rf $(BUILDDIR)/pickle
-	-rm -rf $(BUILDDIR)/json
-	-rm -rf $(BUILDDIR)/htmlhelp
-	-rm -rf $(BUILDDIR)/qthelp
-	-rm -rf $(BUILDDIR)/devhelp
-	-rm -rf $(BUILDDIR)/epub
-	-rm -rf $(BUILDDIR)/latex
-	-rm -rf $(BUILDDIR)/text
-	-rm -rf $(BUILDDIR)/man
-	-rm -rf $(BUILDDIR)/texinfo
-	-rm -rf $(BUILDDIR)/info
-	-rm -rf $(BUILDDIR)/gettext
-	-rm -rf $(BUILDDIR)/changes
-	-rm -rf $(BUILDDIR)/linkcheck
-	-rm -rf $(BUILDDIR)/doctest
-	-rm -rf $(BUILDDIR)/xml
-	-rm -rf $(BUILDDIR)/pseudoxml
-
-html:
-	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
-	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
-
-dirhtml:
-	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
-	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
-
-singlehtml:
-	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
-	@echo
-	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
-
-pickle:
-	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
-	@echo
-	@echo "Build finished; now you can process the pickle files."
-
-json:
-	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
-	@echo
-	@echo "Build finished; now you can process the JSON files."
-
-htmlhelp:
-	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
-	@echo
-	@echo "Build finished; now you can run HTML Help Workshop with the" \
-	      ".hhp project file in $(BUILDDIR)/htmlhelp."
-
-qthelp:
-	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
-	@echo
-	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
-	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
-	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/phpMyAdmin.qhcp"
-	@echo "To view the help file:"
-	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/phpMyAdmin.qhc"
-
-devhelp:
-	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
-	@echo
-	@echo "Build finished."
-	@echo "To view the help file:"
-	@echo "# mkdir -p $$HOME/.local/share/devhelp/phpMyAdmin"
-	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/phpMyAdmin"
-	@echo "# devhelp"
-
-epub:
-	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
-	@echo
-	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
-
-latex:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo
-	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
-	@echo "Run \`make' in that directory to run these through (pdf)latex" \
-	      "(use \`make latexpdf' here to do that automatically)."
-
-latexpdf:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo "Running LaTeX files through pdflatex..."
-	$(MAKE) -C $(BUILDDIR)/latex all-pdf
-	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
-
-latexpdfja:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo "Running LaTeX files through platex and dvipdfmx..."
-	$(MAKE) -C $(BUILDDIR)/latex all-pdf-ja
-	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
-
-text:
-	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
-	@echo
-	@echo "Build finished. The text files are in $(BUILDDIR)/text."
-
-man:
-	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
-	@echo
-	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
-
-texinfo:
-	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
-	@echo
-	@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
-	@echo "Run \`make' in that directory to run these through makeinfo" \
-	      "(use \`make info' here to do that automatically)."
-
-info:
-	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
-	@echo "Running Texinfo files through makeinfo..."
-	make -C $(BUILDDIR)/texinfo info
-	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
-
-gettext:
-	$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
-	@echo
-	@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
-
-changes:
-	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
-	@echo
-	@echo "The overview file is in $(BUILDDIR)/changes."
-
-linkcheck:
-	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
-	@echo
-	@echo "Link check complete; look for any errors in the above output " \
-	      "or in $(BUILDDIR)/linkcheck/output.txt."
-
-doctest:
-	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
-	@echo "Testing of doctests in the sources finished, look at the " \
-	      "results in $(BUILDDIR)/doctest/output.txt."
-
-xml:
-	$(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILDDIR)/xml
-	@echo
-	@echo "Build finished. The XML files are in $(BUILDDIR)/xml."
-
-pseudoxml:
-	$(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml
-	@echo
-	@echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml."
diff --git a/#pma/doc/_ext/configext.py b/#pma/doc/_ext/configext.py
deleted file mode 100644
index 021b4505..00000000
--- a/#pma/doc/_ext/configext.py
+++ /dev/null
@@ -1,188 +0,0 @@
-from sphinx.domains import Domain, ObjType
-from sphinx.roles import XRefRole
-from sphinx.domains.std import GenericObject, StandardDomain
-from sphinx.directives import ObjectDescription
-from sphinx.util.nodes import clean_astext, make_refnode
-from sphinx.util import ws_re
-from sphinx import addnodes
-from sphinx.util.docfields import Field
-from docutils import nodes
-
-def get_id_from_cfg(text):
-    '''
-    Formats anchor ID from config option.
-    '''
-    if text[:6] == '$cfg[\'':
-        text = text[6:]
-    if text[-2:] == '\']':
-        text = text[:-2]
-    text = text.replace('[$i]', '')
-    parts = text.split("']['")
-    return parts
-
-
-class ConfigOption(ObjectDescription):
-    indextemplate = 'configuration option; %s'
-    parse_node = None
-
-    has_arguments = True
-
-    doc_field_types = [
-        Field('default', label='Default value', has_arg=False,
-              names=('default', )),
-        Field('type', label='Type', has_arg=False,
-              names=('type',)),
-    ]
-
-
-    def handle_signature(self, sig, signode):
-        signode.clear()
-        signode += addnodes.desc_name(sig, sig)
-        # normalize whitespace like XRefRole does
-        name = ws_re.sub('', sig)
-        return name
-
-    def add_target_and_index(self, name, sig, signode):
-        targetparts =  get_id_from_cfg(name)
-        targetname = 'cfg_%s' % '_'.join(targetparts)
-        signode['ids'].append(targetname)
-        self.state.document.note_explicit_target(signode)
-        indextype = 'single'
-
-        # Generic index entries
-        indexentry = self.indextemplate % (name,)
-        self.indexnode['entries'].append((indextype, indexentry,
-                                          targetname, targetname))
-        self.indexnode['entries'].append((indextype, name,
-                                          targetname, targetname))
-
-        # Server section
-        if targetparts[0] == 'Servers' and len(targetparts) > 1:
-            indexname = ', '.join(targetparts[1:])
-            self.indexnode['entries'].append((indextype, 'server configuration; %s' % indexname,
-                                              targetname, targetname))
-            self.indexnode['entries'].append((indextype, indexname,
-                                              targetname, targetname))
-        else:
-            indexname = ', '.join(targetparts)
-            self.indexnode['entries'].append((indextype, indexname,
-                                              targetname, targetname))
-
-        self.env.domaindata['config']['objects'][self.objtype, name] = \
-            self.env.docname, targetname
-
-
-class ConfigSectionXRefRole(XRefRole):
-    """
-    Cross-referencing role for configuration sections (adds an index entry).
-    """
-
-    def result_nodes(self, document, env, node, is_ref):
-        if not is_ref:
-            return [node], []
-        varname = node['reftarget']
-        tgtid = 'index-%s' % env.new_serialno('index')
-        indexnode = addnodes.index()
-        indexnode['entries'] = [
-            ('single', varname, tgtid, varname),
-            ('single', 'configuration section; %s' % varname, tgtid, varname)
-        ]
-        targetnode = nodes.target('', '', ids=[tgtid])
-        document.note_explicit_target(targetnode)
-        return [indexnode, targetnode, node], []
-
-class ConfigSection(ObjectDescription):
-    indextemplate = 'configuration section; %s'
-    parse_node = None
-
-    def handle_signature(self, sig, signode):
-        if self.parse_node:
-            name = self.parse_node(self.env, sig, signode)
-        else:
-            signode.clear()
-            signode += addnodes.desc_name(sig, sig)
-            # normalize whitespace like XRefRole does
-            name = ws_re.sub('', sig)
-        return name
-
-    def add_target_and_index(self, name, sig, signode):
-        targetname = '%s-%s' % (self.objtype, name)
-        signode['ids'].append(targetname)
-        self.state.document.note_explicit_target(signode)
-        if self.indextemplate:
-            colon = self.indextemplate.find(':')
-            if colon != -1:
-                indextype = self.indextemplate[:colon].strip()
-                indexentry = self.indextemplate[colon+1:].strip() % (name,)
-            else:
-                indextype = 'single'
-                indexentry = self.indextemplate % (name,)
-            self.indexnode['entries'].append((indextype, indexentry,
-                                              targetname, targetname))
-        self.env.domaindata['config']['objects'][self.objtype, name] = \
-            self.env.docname, targetname
-
-
-class ConfigOptionXRefRole(XRefRole):
-    """
-    Cross-referencing role for configuration options (adds an index entry).
-    """
-
-    def result_nodes(self, document, env, node, is_ref):
-        if not is_ref:
-            return [node], []
-        varname = node['reftarget']
-        tgtid = 'index-%s' % env.new_serialno('index')
-        indexnode = addnodes.index()
-        indexnode['entries'] = [
-            ('single', varname, tgtid, varname),
-            ('single', 'configuration option; %s' % varname, tgtid, varname)
-        ]
-        targetnode = nodes.target('', '', ids=[tgtid])
-        document.note_explicit_target(targetnode)
-        return [indexnode, targetnode, node], []
-
-
-class ConfigFileDomain(Domain):
-    name = 'config'
-    label = 'Config'
-
-    object_types = {
-            'option':  ObjType('config option', 'option'),
-            'section':  ObjType('config section', 'section'),
-            }
-    directives = {
-            'option': ConfigOption,
-            'section': ConfigSection,
-            }
-    roles = {
-            'option': ConfigOptionXRefRole(),
-            'section': ConfigSectionXRefRole(),
-            }
-
-    initial_data = {
-        'objects': {},      # (type, name) -> docname, labelid
-    }
-
-    def clear_doc(self, docname):
-        for key, (fn, _) in self.data['objects'].items():
-            if fn == docname:
-                del self.data['objects'][key]
-
-    def resolve_xref(self, env, fromdocname, builder,
-                     typ, target, node, contnode):
-        docname, labelid = self.data['objects'].get((typ, target), ('', ''))
-        if not docname:
-            return None
-        else:
-            return make_refnode(builder, fromdocname, docname,
-                                labelid, contnode)
-
-    def get_objects(self):
-        for (type, name), info in self.data['objects'].items():
-            yield (name, name, type, info[0], info[1],
-                   self.object_types[type].attrs['searchprio'])
-
-def setup(app):
-    app.add_domain(ConfigFileDomain)
-
diff --git a/#pma/doc/conf.py b/#pma/doc/conf.py
deleted file mode 100644
index a6eb890e..00000000
--- a/#pma/doc/conf.py
+++ /dev/null
@@ -1,304 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# phpMyAdmin documentation build configuration file, created by
-# sphinx-quickstart on Wed Sep 26 14:04:48 2012.
-#
-# This file is execfile()d with the current directory set to its containing dir.
-#
-# Note that not all possible configuration values are present in this
-# autogenerated file.
-#
-# All configuration values have a default; values that are commented out
-# serve to show the default.
-
-import sys
-import os
-
-# If extensions (or modules to document with autodoc) are in another directory,
-# add these directories to sys.path here. If the directory is relative to the
-# documentation root, use os.path.abspath to make it absolute, like shown here.
-#sys.path.insert(0, os.path.abspath('.'))
-sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), "_ext")))
-
-# -- General configuration ------------------------------------------------
-
-# If your documentation needs a minimal Sphinx version, state it here.
-#needs_sphinx = '1.0'
-
-# Add any Sphinx extension module names here, as strings. They can be
-# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
-# ones.
-extensions = ['configext']
-
-# Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
-
-# The suffix of source filenames.
-source_suffix = '.rst'
-
-# The encoding of source files.
-#source_encoding = 'utf-8-sig'
-
-# The master toctree document.
-master_doc = 'index'
-
-# General information about the project.
-project = u'phpMyAdmin'
-copyright = u'2012 - 2016, The phpMyAdmin devel team'
-
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-#
-# The short X.Y version.
-version = '4.6.5.2'
-# The full version, including alpha/beta/rc tags.
-release = version
-
-# The language for content autogenerated by Sphinx. Refer to documentation
-# for a list of supported languages.
-#language = None
-
-# There are two options for replacing |today|: either, you set today to some
-# non-false value, then it is used:
-#today = ''
-# Else, today_fmt is used as the format for a strftime call.
-#today_fmt = '%B %d, %Y'
-
-# List of patterns, relative to source directory, that match files and
-# directories to ignore when looking for source files.
-exclude_patterns = ['_build', 'html', 'doctrees']
-
-# The reST default role (used for this markup: `text`) to use for all
-# documents.
-#default_role = None
-
-# If true, '()' will be appended to :func: etc. cross-reference text.
-#add_function_parentheses = True
-
-# If true, the current module name will be prepended to all description
-# unit titles (such as .. function::).
-#add_module_names = True
-
-# If true, sectionauthor and moduleauthor directives will be shown in the
-# output. They are ignored by default.
-#show_authors = False
-
-# The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
-
-# A list of ignored prefixes for module index sorting.
-#modindex_common_prefix = []
-
-# If true, keep warnings as "system message" paragraphs in the built documents.
-#keep_warnings = False
-
-
-# -- Options for HTML output ----------------------------------------------
-
-# The theme to use for HTML and HTML Help pages.  See the documentation for
-# a list of builtin themes.
-html_theme = 'default'
-
-# Theme options are theme-specific and customize the look and feel of a theme
-# further.  For a list of options available for each theme, see the
-# documentation.
-#html_theme_options = {}
-
-# Add any paths that contain custom themes here, relative to this directory.
-#html_theme_path = []
-
-# The name for this set of Sphinx documents.  If None, it defaults to
-# "<project> v<release> documentation".
-#html_title = None
-
-# A shorter title for the navigation bar.  Default is the same as html_title.
-#html_short_title = None
-
-# The name of an image file (relative to this directory) to place at the top
-# of the sidebar.
-#html_logo = None
-
-# The name of an image file (within the static path) to use as favicon of the
-# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
-# pixels large.
-#html_favicon = None
-
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
-#html_static_path = ['_static']
-
-# Add any extra paths that contain custom files (such as robots.txt or
-# .htaccess) here, relative to this directory. These files are copied
-# directly to the root of the documentation.
-#html_extra_path = []
-
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-#html_last_updated_fmt = '%b %d, %Y'
-
-# If true, SmartyPants will be used to convert quotes and dashes to
-# typographically correct entities.
-#html_use_smartypants = True
-
-# Custom sidebar templates, maps document names to template names.
-#html_sidebars = {}
-
-# Additional templates that should be rendered to pages, maps page names to
-# template names.
-#html_additional_pages = {}
-
-# If false, no module index is generated.
-#html_domain_indices = True
-
-# If false, no index is generated.
-#html_use_index = True
-
-# If true, the index is split into individual pages for each letter.
-#html_split_index = False
-
-# If true, links to the reST sources are added to the pages.
-#html_show_sourcelink = True
-
-# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
-#html_show_sphinx = True
-
-# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-#html_show_copyright = True
-
-# If true, an OpenSearch description file will be output, and all pages will
-# contain a <link> tag referring to it.  The value of this option must be the
-# base URL from which the finished HTML is served.
-#html_use_opensearch = ''
-
-# This is the file name suffix for HTML files (e.g. ".xhtml").
-#html_file_suffix = None
-
-# Output file base name for HTML help builder.
-htmlhelp_basename = 'phpMyAdmindoc'
-
-
-# -- Options for LaTeX output ---------------------------------------------
-
-latex_elements = {
-# The paper size ('letterpaper' or 'a4paper').
-#'papersize': 'letterpaper',
-
-# The font size ('10pt', '11pt' or '12pt').
-#'pointsize': '10pt',
-
-# Additional stuff for the LaTeX preamble.
-#'preamble': '',
-}
-
-# Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title,
-#  author, documentclass [howto, manual, or own class]).
-latex_documents = [
-  ('index', 'phpMyAdmin.tex', u'phpMyAdmin Documentation',
-   u'The phpMyAdmin devel team', 'manual'),
-]
-
-# The name of an image file (relative to this directory) to place at the top of
-# the title page.
-#latex_logo = None
-
-# For "manual" documents, if this is true, then toplevel headings are parts,
-# not chapters.
-#latex_use_parts = False
-
-# If true, show page references after internal links.
-#latex_show_pagerefs = False
-
-# If true, show URL addresses after external links.
-#latex_show_urls = False
-
-# Documents to append as an appendix to all manuals.
-#latex_appendices = []
-
-# If false, no module index is generated.
-#latex_domain_indices = True
-
-
-# -- Options for manual page output ---------------------------------------
-
-# One entry per manual page. List of tuples
-# (source start file, name, description, authors, manual section).
-man_pages = [
-    ('index', 'phpmyadmin', u'phpMyAdmin Documentation',
-     [u'The phpMyAdmin devel team'], 1)
-]
-
-# If true, show URL addresses after external links.
-#man_show_urls = False
-
-
-# -- Options for Texinfo output -------------------------------------------
-
-# Grouping the document tree into Texinfo files. List of tuples
-# (source start file, target name, title, author,
-#  dir menu entry, description, category)
-texinfo_documents = [
-  ('index', 'phpMyAdmin', u'phpMyAdmin Documentation',
-   u'The phpMyAdmin devel team', 'phpMyAdmin', 'One line description of project.',
-   'Miscellaneous'),
-]
-
-# Documents to append as an appendix to all manuals.
-#texinfo_appendices = []
-
-# If false, no module index is generated.
-#texinfo_domain_indices = True
-
-# How to display URL addresses: 'footnote', 'no', or 'inline'.
-#texinfo_show_urls = 'footnote'
-
-
-# -- Options for Epub output ---------------------------------------------------
-
-# Bibliographic Dublin Core info.
-epub_title = u'phpMyAdmin'
-epub_author = u'The phpMyAdmin devel team'
-epub_publisher = u'The phpMyAdmin devel team'
-epub_copyright = copyright
-
-# The language of the text. It defaults to the language option
-# or en if the language is not set.
-#epub_language = ''
-
-# The scheme of the identifier. Typical schemes are ISBN or URL.
-#epub_scheme = ''
-
-# The unique identifier of the text. This can be a ISBN number
-# or the project homepage.
-#epub_identifier = ''
-
-# A unique identification for the text.
-#epub_uid = ''
-
-# A tuple containing the cover image and cover page html template filenames.
-#epub_cover = ()
-
-# HTML files that should be inserted before the pages created by sphinx.
-# The format is a list of tuples containing the path and title.
-#epub_pre_files = []
-
-# HTML files shat should be inserted after the pages created by sphinx.
-# The format is a list of tuples containing the path and title.
-#epub_post_files = []
-
-# A list of files that should not be packed into the epub file.
-#epub_exclude_files = []
-
-# The depth of the table of contents in toc.ncx.
-#epub_tocdepth = 3
-
-# Allow duplicate toc entries.
-#epub_tocdup = True
-
-# Highlight PHP without starting <?php tag
-from sphinx.highlighting import lexers
-from pygments.lexers.web import PhpLexer
-
-lexers['php'] = PhpLexer(startinline=True)
diff --git a/#pma/doc/config.rst b/#pma/doc/config.rst
deleted file mode 100644
index 36c1b974..00000000
--- a/#pma/doc/config.rst
+++ /dev/null
@@ -1,2979 +0,0 @@
-.. index:: config.inc.php
-
-.. _config:
-
-Configuration
-=============
-
-Almost all configurable data is placed in :file:`config.inc.php`. If this file
-does not exist, please refer to the :ref:`setup` section to create one. This
-file only needs to contain the parameters you want to change from their
-corresponding default value in :file:`libraries/config.default.php`.
-
-If a directive is missing from your file, you can just add another line with
-the file. This file is for over-writing the defaults; if you wish to use the
-default value there's no need to add a line here.
-
-The parameters which relate to design (like colors) are placed in
-:file:`themes/themename/layout.inc.php`. You might also want to create
-:file:`config.footer.inc.php` and :file:`config.header.inc.php` files to add
-your site specific code to be included on start and end of each page.
-
-.. note::
-
-    Some distributions (eg. Debian or Ubuntu) store :file:`config.inc.php` in
-    ``/etc/phpmyadmin`` instead of within phpMyAdmin sources.
-
-.. warning::
-
-    :term:`Mac` users should note that if you are on a version before
-    :term:`Mac OS X`, PHP does not seem to
-    like :term:`Mac` end of lines character (``\r``). So
-    ensure you choose the option that allows to use the \*nix end of line
-    character (``\n``) in your text editor before saving a script you have
-    modified.
-
-Basic settings
---------------
-
-.. config:option:: $cfg['PmaAbsoluteUri']
-
-    :type: string
-    :default: ``''``
-
-    .. versionchanged:: 4.6.5
-        
-        This setting was not available in phpMyAdmin 4.6.0 - 4.6.4.
-
-    Sets here the complete :term:`URL` (with full path) to your phpMyAdmin
-    installation's directory. E.g.
-    ``https://www.example.net/path_to_your_phpMyAdmin_directory/``.  Note also
-    that the :term:`URL` on most of web servers are case–sensitive. Don’t
-    forget the trailing slash at the end.
-
-    Starting with version 2.3.0, it is advisable to try leaving this blank. In
-    most cases phpMyAdmin automatically detects the proper setting. Users of
-    port forwarding will need to set :config:option:`$cfg['PmaAbsoluteUri']`
-    (`more info <https://sourceforge.net/p/phpmyadmin/support-requests/795/>`_).
-
-    A good test is to browse a table, edit a row and save it. There should be
-    an error message if phpMyAdmin is having trouble auto–detecting the correct
-    value. If you get an error that this must be set or if the autodetect code
-    fails to detect your path, please post a bug report on our bug tracker so
-    we can improve the code.
-
-    .. seealso:: :ref:`faq1_40`, :ref:`faq2_5`, :ref:`faq4_7`, :ref:`faq5_16`
-
-.. config:option:: $cfg['PmaNoRelation_DisableWarning']
-
-    :type: boolean
-    :default: false
-
-    Starting with version 2.3.0 phpMyAdmin offers a lot of features to
-    work with master / foreign – tables (see :config:option:`$cfg['Servers'][$i]['pmadb']`).
-
-    If you tried to set this
-    up and it does not work for you, have a look on the :guilabel:`Structure` page
-    of one database where you would like to use it. You will find a link
-    that will analyze why those features have been disabled.
-
-    If you do not want to use those features set this variable to ``true`` to
-    stop this message from appearing.
-
-.. config:option:: $cfg['SuhosinDisableWarning']
-
-    :type: boolean
-    :default: false
-
-    A warning is displayed on the main page if Suhosin is detected.
-
-    You can set this parameter to ``true`` to stop this message from appearing.
-
-.. config:option:: $cfg['LoginCookieValidityDisableWarning']
-
-    :type: boolean
-    :default: false
-
-    A warning is displayed on the main page if the PHP parameter
-    session.gc_maxlifetime is lower than cookie validity configured in phpMyAdmin.
-
-    You can set this parameter to ``true`` to stop this message from appearing.
-
-.. config:option:: $cfg['ServerLibraryDifference_DisableWarning']
-
-    :type: boolean
-    :default: false
-
-    A warning is displayed on the main page if there is a difference
-    between the MySQL library and server version.
-
-    You can set this parameter to ``true`` to stop this message from appearing.
-
-.. config:option:: $cfg['ReservedWordDisableWarning']
-
-    :type: boolean
-    :default: false
-
-    This warning is displayed on the Structure page of a table if one or more
-    column names match with words which are MySQL reserved.
-
-    If you want to turn off this warning, you can set it to ``true`` and
-    warning will no longer be displayed.
-
-.. config:option:: $cfg['TranslationWarningThreshold']
-
-    :type: integer
-    :default: 80
-
-    Show warning about incomplete translations on certain threshold.
-
-.. config:option:: $cfg['SendErrorReports']
-
-    :type: string
-    :default: ``'ask'``
-
-    Sets the default behavior for JavaScript error reporting.
-
-    Whenever an error is detected in the JavaScript execution, an error report
-    may be sent to the phpMyAdmin team if the user agrees.
-
-    The default setting of ``'ask'`` will ask the user everytime there is a new
-    error report. However you can set this parameter to ``'always'`` to send error
-    reports without asking for confirmation or you can set it to ``'never'`` to
-    never send error reports.
-
-    This directive is available both in the configuration file and in users
-    preferences. If the person in charge of a multi-user installation prefers
-    to disable this feature for all users, a value of ``'never'`` should be
-    set, and the :config:option:`$cfg['UserprefsDisallow']` directive should
-    contain ``'SendErrorReports'`` in one of its array values.
-
-.. config:option:: $cfg['ConsoleEnterExecutes']
-
-    :type: boolean
-    :default: false
-
-    Setting this to ``true`` allows the user to execute queries by pressing Enter
-    instead of Ctrl+Enter. A new line can be inserted by pressing Shift + Enter.
-
-    The behaviour of the console can be temporarily changed using console's
-    settings interface.
-
-.. config:option:: $cfg['AllowThirdPartyFraming']
-
-    :type: boolean
-    :default: false
-
-    Setting this to ``true`` allows phpMyAdmin to be included inside a frame,
-    and is a potential security hole allowing cross-frame scripting attacks or
-    clickjacking.
-
-Server connection settings
---------------------------
-
-.. config:option:: $cfg['Servers']
-
-    :type: array
-    :default: one server array with settings listed below
-
-    Since version 1.4.2, phpMyAdmin supports the administration of multiple
-    MySQL servers. Therefore, a :config:option:`$cfg['Servers']`-array has been
-    added which contains the login information for the different servers. The
-    first :config:option:`$cfg['Servers'][$i]['host']` contains the hostname of
-    the first server, the second :config:option:`$cfg['Servers'][$i]['host']`
-    the hostname of the second server, etc. In
-    :file:`libraries/config.default.php`, there is only one section for server
-    definition, however you can put as many as you need in
-    :file:`config.inc.php`, copy that block or needed parts (you don't have to
-    define all settings, just those you need to change).
-
-    .. note::
-
-        The :config:option:`$cfg['Servers']` array starts with
-        $cfg['Servers'][1]. Do not use $cfg['Servers'][0]. If you want more
-        than one server, just copy following section (including $i
-        incrementation) serveral times. There is no need to define full server
-        array, just define values you need to change.
-
-
-.. config:option:: $cfg['Servers'][$i]['host']
-
-    :type: string
-    :default: ``'localhost'``
-
-    The hostname or :term:`IP` address of your $i-th MySQL-server. E.g.
-    ``localhost``.
-
-    Possible values are:
-
-    * hostname, e.g., ``'localhost'`` or ``'mydb.example.org'``
-    * IP address, e.g., ``'127.0.0.1'`` or ``'192.168.10.1'``
-    * dot - ``'.'``, i.e., use named pipes on windows systems
-    * empty - ``''``, disables this server
-
-    .. note::
-
-        phpMyAdmin supports connecting to MySQL servers reachable via IPv6 only.
-		To connect to an IPv6 MySQL server, enter its IPv6 address in this field.
-
-.. config:option:: $cfg['Servers'][$i]['port']
-
-    :type: string
-    :default: ``''``
-
-    The port-number of your $i-th MySQL-server. Default is 3306 (leave
-    blank).
-
-    .. note::
-
-       If you use ``localhost`` as the hostname, MySQL ignores this port number
-       and connects with the socket, so if you want to connect to a port
-       different from the default port, use ``127.0.0.1`` or the real hostname
-       in :config:option:`$cfg['Servers'][$i]['host']`.
-
-.. config:option:: $cfg['Servers'][$i]['socket']
-
-    :type: string
-    :default: ``''``
-
-    The path to the socket to use. Leave blank for default. To determine
-    the correct socket, check your MySQL configuration or, using the
-    :command:`mysql` command–line client, issue the ``status`` command. Among the
-    resulting information displayed will be the socket used.
-
-.. config:option:: $cfg['Servers'][$i]['ssl']
-
-    :type: boolean
-    :default: false
-
-    Whether to enable SSL for the connection between phpMyAdmin and the MySQL server.
-
-    When using the ``'mysql'`` extension,
-    none of the remaining ``'ssl...'`` configuration options apply.
-
-    We strongly recommend the ``'mysqli'`` extension when using this option.
-
-    .. seealso:: :ref:`example-google-ssl`
-
-.. config:option:: $cfg['Servers'][$i]['ssl_key']
-
-    :type: string
-    :default: NULL
-
-    Path to the key file when using SSL for connecting to the MySQL server.
-
-    For example:
-
-    .. code-block:: php
-
-        $cfg['Servers'][$i]['ssl_key'] = '/etc/mysql/server-key.pem';
-
-    .. seealso:: :ref:`example-google-ssl`
-
-.. config:option:: $cfg['Servers'][$i]['ssl_cert']
-
-    :type: string
-    :default: NULL
-
-    Path to the cert file when using SSL for connecting to the MySQL server.
-
-    .. seealso:: :ref:`example-google-ssl`
-
-.. config:option:: $cfg['Servers'][$i]['ssl_ca']
-
-    :type: string
-    :default: NULL
-
-    Path to the CA file when using SSL for connecting to the MySQL server.
-
-    .. seealso:: :ref:`example-google-ssl`
-
-.. config:option:: $cfg['Servers'][$i]['ssl_ca_path']
-
-    :type: string
-    :default: NULL
-
-    Directory containing trusted SSL CA certificates in PEM format.
-
-.. config:option:: $cfg['Servers'][$i]['ssl_ciphers']
-
-    :type: string
-    :default: NULL
-
-    List of allowable ciphers for SSL connections to the MySQL server.
-
-.. config:option:: $cfg['Servers'][$i]['ssl_verify']
-
-    :type: boolean
-    :default: true
-
-    .. versionadded:: 4.6.0
-
-        This is supported since phpMyAdmin 4.6.0.
-
-    If your PHP install uses the MySQL Native Driver (mysqlnd), your
-    MySQL server is 5.6 or later, and your SSL certificate is self-signed,
-    there is a chance your SSL connection will fail due to validation.
-    Setting this to ``false`` will disable the validation check.
-
-    Since PHP 5.6.0 it also verifies whether server name matches CN of it's
-    certificate. There is currently no way to disable just this check without
-    disabling complete SSL verification.
-
-    .. note::
-
-        This flag only works with PHP 5.6.16 or later.
-
-    .. seealso:: :ref:`example-google-ssl`
-
-.. config:option:: $cfg['Servers'][$i]['connect_type']
-
-    :type: string
-    :default: ``'tcp'``
-
-    What type connection to use with the MySQL server. Your options are
-    ``'socket'`` and ``'tcp'``. It defaults to tcp as that is nearly guaranteed
-    to be available on all MySQL servers, while sockets are not supported on
-    some platforms. To use the socket mode, your MySQL server must be on the
-    same machine as the Web server.
-
-.. config:option:: $cfg['Servers'][$i]['compress']
-
-    :type: boolean
-    :default: false
-
-    Whether to use a compressed protocol for the MySQL server connection
-    or not (experimental).
-
-.. _controlhost:
-.. config:option:: $cfg['Servers'][$i]['controlhost']
-
-    :type: string
-    :default: ``''``
-
-    Permits to use an alternate host to hold the configuration storage
-    data.
-
-.. _controlport:
-.. config:option:: $cfg['Servers'][$i]['controlport']
-
-    :type: string
-    :default: ``''``
-
-    Permits to use an alternate port to connect to the host that
-    holds the configuration storage.
-
-.. _controluser:
-.. config:option:: $cfg['Servers'][$i]['controluser']
-
-    :type: string
-    :default: ``''``
-
-.. config:option:: $cfg['Servers'][$i]['controlpass']
-
-    :type: string
-    :default: ``''``
-
-    This special account is used for 2 distinct purposes: to make possible all
-    relational features (see :config:option:`$cfg['Servers'][$i]['pmadb']`).
-
-    .. versionchanged:: 2.2.5
-        those were called ``stduser`` and ``stdpass``
-
-    .. seealso:: :ref:`setup`, :ref:`authentication_modes`, :ref:`linked-tables`
-
-.. config:option:: $cfg['Servers'][$i]['auth_type']
-
-    :type: string
-    :default: ``'cookie'``
-
-    Whether config or cookie or :term:`HTTP` or signon authentication should be
-    used for this server.
-
-    * 'config' authentication (``$auth_type = 'config'``) is the plain old
-      way: username and password are stored in :file:`config.inc.php`.
-    * 'cookie' authentication mode (``$auth_type = 'cookie'``) allows you to
-      log in as any valid MySQL user with the help of cookies.
-    * 'http' authentication allows you to log in as any
-      valid MySQL user via HTTP-Auth.
-    * 'signon' authentication mode (``$auth_type = 'signon'``) allows you to
-      log in from prepared PHP session data or using supplied PHP script.
-
-    .. seealso:: :ref:`authentication_modes`
-
-.. _servers_auth_http_realm:
-.. config:option:: $cfg['Servers'][$i]['auth_http_realm']
-
-    :type: string
-    :default: ``''``
-
-    When using auth\_type = ``http``, this field allows to define a custom
-    :term:`HTTP` Basic Auth Realm which will be displayed to the user. If not
-    explicitly specified in your configuration, a string combined of
-    "phpMyAdmin " and either :config:option:`$cfg['Servers'][$i]['verbose']` or
-    :config:option:`$cfg['Servers'][$i]['host']` will be used.
-
-.. _servers_user:
-.. config:option:: $cfg['Servers'][$i]['user']
-
-    :type: string
-    :default: ``'root'``
-
-.. config:option:: $cfg['Servers'][$i]['password']
-
-    :type: string
-    :default: ``''``
-
-    When using :config:option:`$cfg['Servers'][$i]['auth_type']` set to
-    'config', this is the user/password-pair which phpMyAdmin will use to
-    connect to the MySQL server. This user/password pair is not needed when
-    :term:`HTTP` or cookie authentication is used
-    and should be empty.
-
-.. _servers_nopassword:
-.. config:option:: $cfg['Servers'][$i]['nopassword']
-
-    :type: boolean
-    :default: false
-
-    Allow attempt to log in without password when a login with password
-    fails. This can be used together with http authentication, when
-    authentication is done some other way and phpMyAdmin gets user name
-    from auth and uses empty password for connecting to MySQL. Password
-    login is still tried first, but as fallback, no password method is
-    tried.
-
-.. _servers_only_db:
-.. config:option:: $cfg['Servers'][$i]['only_db']
-
-    :type: string or array
-    :default: ``''``
-
-    If set to a (an array of) database name(s), only this (these)
-    database(s) will be shown to the user. Since phpMyAdmin 2.2.1,
-    this/these database(s) name(s) may contain MySQL wildcards characters
-    ("\_" and "%"): if you want to use literal instances of these
-    characters, escape them (I.E. use ``'my\_db'`` and not ``'my_db'``).
-
-    This setting is an efficient way to lower the server load since the
-    latter does not need to send MySQL requests to build the available
-    database list. But **it does not replace the privileges rules of the
-    MySQL database server**. If set, it just means only these databases
-    will be displayed but **not that all other databases can't be used.**
-
-    An example of using more that one database:
-
-    .. code-block:: php
-
-        $cfg['Servers'][$i]['only_db'] = array('db1', 'db2');
-
-    .. versionchanged:: 4.0.0
-        Previous versions permitted to specify the display order of
-        the database names via this directive.
-
-.. config:option:: $cfg['Servers'][$i]['hide_db']
-
-    :type: string
-    :default: ``''``
-
-    Regular expression for hiding some databases from unprivileged users.
-    This only hides them from listing, but a user is still able to access
-    them (using, for example, the SQL query area). To limit access, use
-    the MySQL privilege system.  For example, to hide all databases
-    starting with the letter "a", use
-
-    .. code-block:: php
-
-        $cfg['Servers'][$i]['hide_db'] = '^a';
-
-    and to hide both "db1" and "db2" use
-
-    .. code-block:: php
-
-        $cfg['Servers'][$i]['hide_db'] = '^(db1|db2)$';
-
-    More information on regular expressions can be found in the `PCRE
-    pattern syntax
-    <https://php.net/manual/en/reference.pcre.pattern.syntax.php>`_ portion
-    of the PHP reference manual.
-
-.. config:option:: $cfg['Servers'][$i]['verbose']
-
-    :type: string
-    :default: ``''``
-
-    Only useful when using phpMyAdmin with multiple server entries. If
-    set, this string will be displayed instead of the hostname in the
-    pull-down menu on the main page. This can be useful if you want to
-    show only certain databases on your system, for example. For HTTP
-    auth, all non-US-ASCII characters will be stripped.
-
-.. config:option:: $cfg['Servers'][$i]['pmadb']
-
-    :type: string
-    :default: ``''``
-
-    The name of the database containing the phpMyAdmin configuration
-    storage.
-
-    See the :ref:`linked-tables`  section in this document to see the benefits of
-    this feature, and for a quick way of creating this database and the needed
-    tables.
-
-    If you are the only user of this phpMyAdmin installation, you can use your
-    current database to store those special tables; in this case, just put your
-    current database name in :config:option:`$cfg['Servers'][$i]['pmadb']`. For a
-    multi-user installation, set this parameter to the name of your central
-    database containing the phpMyAdmin configuration storage.
-
-.. _bookmark:
-.. config:option:: $cfg['Servers'][$i]['bookmarktable']
-
-    :type: string or false
-    :default: ``''``
-
-    Since release 2.2.0 phpMyAdmin allows users to bookmark queries. This
-    can be useful for queries you often run. To allow the usage of this
-    functionality:
-
-    * set up :config:option:`$cfg['Servers'][$i]['pmadb']` and the phpMyAdmin configuration storage
-    * enter the table name in :config:option:`$cfg['Servers'][$i]['bookmarktable']`
-
-    This feature can be disabled by setting the configuration to ``false``.
-
-.. _relation:
-.. config:option:: $cfg['Servers'][$i]['relation']
-
-    :type: string or false
-    :default: ``''``
-
-    Since release 2.2.4 you can describe, in a special 'relation' table,
-    which column is a key in another table (a foreign key). phpMyAdmin
-    currently uses this to:
-
-    * make clickable, when you browse the master table, the data values that
-      point to the foreign table;
-    * display in an optional tool-tip the "display column" when browsing the
-      master table, if you move the mouse to a column containing a foreign
-      key (use also the 'table\_info' table); (see :ref:`faqdisplay`)
-    * in edit/insert mode, display a drop-down list of possible foreign keys
-      (key value and "display column" are shown) (see :ref:`faq6_21`)
-    * display links on the table properties page, to check referential
-      integrity (display missing foreign keys) for each described key;
-    * in query-by-example, create automatic joins (see :ref:`faq6_6`)
-    * enable you to get a :term:`PDF` schema of
-      your database (also uses the table\_coords table).
-
-    The keys can be numeric or character.
-
-    To allow the usage of this functionality:
-
-    * set up :config:option:`$cfg['Servers'][$i]['pmadb']` and the phpMyAdmin configuration storage
-    * put the relation table name in :config:option:`$cfg['Servers'][$i]['relation']`
-    * now as normal user open phpMyAdmin and for each one of your tables
-      where you want to use this feature, click :guilabel:`Structure/Relation view/`
-      and choose foreign columns.
-
-    This feature can be disabled by setting the configuration to ``false``.
-
-    .. note::
-
-        In the current version, ``master_db`` must be the same as ``foreign_db``.
-        Those columns have been put in future development of the cross-db
-        relations.
-
-.. _table_info:
-.. config:option:: $cfg['Servers'][$i]['table_info']
-
-    :type: string or false
-    :default: ``''``
-
-    Since release 2.3.0 you can describe, in a special 'table\_info'
-    table, which column is to be displayed as a tool-tip when moving the
-    cursor over the corresponding key. This configuration variable will
-    hold the name of this special table. To allow the usage of this
-    functionality:
-
-    * set up :config:option:`$cfg['Servers'][$i]['pmadb']` and the phpMyAdmin configuration storage
-    * put the table name in :config:option:`$cfg['Servers'][$i]['table\_info']` (e.g.
-      ``pma__table_info``)
-    * then for each table where you want to use this feature, click
-      "Structure/Relation view/Choose column to display" to choose the
-      column.
-
-    This feature can be disabled by setting the configuration to ``false``.
-
-    .. seealso:: :ref:`faqdisplay`
-
-.. _table_coords:
-.. config:option:: $cfg['Servers'][$i]['table_coords']
-
-    :type: string or false
-    :default: ``''``
-
-.. config:option:: $cfg['Servers'][$i]['pdf_pages']
-
-    :type: string or false
-    :default: ``''``
-
-    Since release 2.3.0 you can have phpMyAdmin create :term:`PDF` pages
-    showing the relations between your tables. Further, the designer interface
-    permits visually managing the relations. To do this it needs two tables
-    "pdf\_pages" (storing information about the available :term:`PDF` pages)
-    and "table\_coords" (storing coordinates where each table will be placed on
-    a :term:`PDF` schema output).  You must be using the "relation" feature.
-
-    To allow the usage of this functionality:
-
-    * set up :config:option:`$cfg['Servers'][$i]['pmadb']` and the phpMyAdmin configuration storage
-    * put the correct table names in
-      :config:option:`$cfg['Servers'][$i]['table\_coords']` and
-      :config:option:`$cfg['Servers'][$i]['pdf\_pages']`
-
-    This feature can be disabled by setting either of the configurations to ``false``.
-
-    .. seealso:: :ref:`faqpdf`.
-
-.. _col_com:
-.. config:option:: $cfg['Servers'][$i]['column_info']
-
-    :type: string or false
-    :default: ``''``
-
-    This part requires a content update!  Since release 2.3.0 you can
-    store comments to describe each column for each table. These will then
-    be shown on the "printview".
-
-    Starting with release 2.5.0, comments are consequently used on the table
-    property pages and table browse view, showing up as tool-tips above the
-    column name (properties page) or embedded within the header of table in
-    browse view. They can also be shown in a table dump. Please see the
-    relevant configuration directives later on.
-
-    Also new in release 2.5.0 is a MIME- transformation system which is also
-    based on the following table structure. See :ref:`transformations` for
-    further information. To use the MIME- transformation system, your
-    column\_info table has to have the three new columns 'mimetype',
-    'transformation', 'transformation\_options'.
-
-    Starting with release 4.3.0, a new input-oriented transformation system
-    has been introduced. Also, backward compatibility code used in the old
-    transformations system was removed. As a result, an update to column\_info
-    table is necessary for previous transformations and the new input-oriented
-    transformation system to work. phpMyAdmin will upgrade it automatically
-    for you by analyzing your current column\_info table structure.
-    However, if something goes wrong with the auto-upgrade then you can
-    use the SQL script found in ``./sql/upgrade_column_info_4_3_0+.sql``
-    to upgrade it manually.
-
-    To allow the usage of this functionality:
-
-    * set up :config:option:`$cfg['Servers'][$i]['pmadb']` and the phpMyAdmin configuration storage
-    * put the table name in :config:option:`$cfg['Servers'][$i]['column\_info']` (e.g.
-      ``pma__column_info``)
-    * to update your PRE-2.5.0 Column\_comments table use this:  and
-      remember that the Variable in :file:`config.inc.php` has been renamed from
-      :config:option:`$cfg['Servers'][$i]['column\_comments']` to
-      :config:option:`$cfg['Servers'][$i]['column\_info']`
-
-      .. code-block:: mysql
-
-           ALTER TABLE `pma__column_comments`
-           ADD `mimetype` VARCHAR( 255 ) NOT NULL,
-           ADD `transformation` VARCHAR( 255 ) NOT NULL,
-           ADD `transformation_options` VARCHAR( 255 ) NOT NULL;
-    * to update your PRE-4.3.0 Column\_info table manually use this
-      ``./sql/upgrade_column_info_4_3_0+.sql`` SQL script.
-
-    This feature can be disabled by setting the configuration to ``false``.
-
-    .. note::
-
-        For auto-upgrade functionality to work, your
-        ``$cfg['Servers'][$i]['controluser']`` must have ALTER privilege on
-        ``phpmyadmin`` database. See the `MySQL documentation for GRANT
-        <https://dev.mysql.com/doc/mysql/en/grant.html>`_ on how to
-        ``GRANT`` privileges to a user.
-
-.. _history:
-.. config:option:: $cfg['Servers'][$i]['history']
-
-    :type: string or false
-    :default: ``''``
-
-    Since release 2.5.0 you can store your :term:`SQL` history, which means all
-    queries you entered manually into the phpMyAdmin interface. If you don't
-    want to use a table-based history, you can use the JavaScript-based
-    history.
-
-    Using that, all your history items are deleted when closing the window.
-    Using :config:option:`$cfg['QueryHistoryMax']` you can specify an amount of
-    history items you want to have on hold. On every login, this list gets cut
-    to the maximum amount.
-
-    The query history is only available if JavaScript is enabled in
-    your browser.
-
-    To allow the usage of this functionality:
-
-    * set up :config:option:`$cfg['Servers'][$i]['pmadb']` and the phpMyAdmin configuration storage
-    * put the table name in :config:option:`$cfg['Servers'][$i]['history']` (e.g.
-      ``pma__history``)
-
-    This feature can be disabled by setting the configuration to ``false``.
-
-.. _recent:
-.. config:option:: $cfg['Servers'][$i]['recent']
-
-    :type: string or false
-    :default: ``''``
-
-    Since release 3.5.0 you can show recently used tables in the
-    navigation panel. It helps you to jump across table directly, without
-    the need to select the database, and then select the table. Using
-    :config:option:`$cfg['NumRecentTables']` you can configure the maximum number
-    of recent tables shown. When you select a table from the list, it will jump to
-    the page specified in :config:option:`$cfg['NavigationTreeDefaultTabTable']`.
-
-    Without configuring the storage, you can still access the recently used tables,
-    but it will disappear after you logout.
-
-    To allow the usage of this functionality persistently:
-
-    * set up :config:option:`$cfg['Servers'][$i]['pmadb']` and the phpMyAdmin configuration storage
-    * put the table name in :config:option:`$cfg['Servers'][$i]['recent']` (e.g.
-      ``pma__recent``)
-
-    This feature can be disabled by setting the configuration to ``false``.
-
-.. _favorite:
-.. config:option:: $cfg['Servers'][$i]['favorite']
-
-    :type: string or false
-    :default: ``''``
-
-    Since release 4.2.0 you can show a list of selected tables in the
-    navigation panel. It helps you to jump to the table directly, without
-    the need to select the database, and then select the table. When you
-    select a table from the list, it will jump to the page specified in
-    :config:option:`$cfg['NavigationTreeDefaultTabTable']`.
-    
-    You can add tables to this list or remove tables from it in database
-    structure page by clicking on the star icons next to table names. Using
-    :config:option:`$cfg['NumFavoriteTables']` you can configure the maximum
-    number of favorite tables shown.
-
-    Without configuring the storage, you can still access the favorite tables,
-    but it will disappear after you logout.
-
-    To allow the usage of this functionality persistently:
-
-    * set up :config:option:`$cfg['Servers'][$i]['pmadb']` and the phpMyAdmin configuration storage
-    * put the table name in :config:option:`$cfg['Servers'][$i]['favorite']` (e.g.
-      ``pma__favorite``)
-
-    This feature can be disabled by setting the configuration to ``false``.
-
-.. _table_uiprefs:
-.. config:option:: $cfg['Servers'][$i]['table_uiprefs']
-
-    :type: string or false
-    :default: ``''``
-
-    Since release 3.5.0 phpMyAdmin can be configured to remember several
-    things (sorted column :config:option:`$cfg['RememberSorting']`, column order,
-    and column visibility from a database table) for browsing tables. Without
-    configuring the storage, these features still can be used, but the values will
-    disappear after you logout.
-
-    To allow the usage of these functionality persistently:
-
-    * set up :config:option:`$cfg['Servers'][$i]['pmadb']` and the phpMyAdmin configuration storage
-    * put the table name in :config:option:`$cfg['Servers'][$i]['table\_uiprefs']` (e.g.
-      ``pma__table_uiprefs``)
-
-    This feature can be disabled by setting the configuration to ``false``.
-
-.. config:option:: $cfg['Servers'][$i]['users']
-
-    :type: string or false
-    :default: ``''``
-
-.. config:option:: $cfg['Servers'][$i]['usergroups']
-
-    :type: string or false
-    :default: ``''``
-
-    Since release 4.1.0 you can create different user groups with menu items
-    attached to them. Users can be assigned to these groups and the logged in
-    user would only see menu items configured to the usergroup he is assigned to.
-    To do this it needs two tables "usergroups" (storing allowed menu items for each
-    user group) and "users" (storing users and their assignments to user groups).
-
-    To allow the usage of this functionality:
-
-    * set up :config:option:`$cfg['Servers'][$i]['pmadb']` and the phpMyAdmin configuration storage
-    * put the correct table names in
-      :config:option:`$cfg['Servers'][$i]['users']` (e.g. ``pma__users``) and
-      :config:option:`$cfg['Servers'][$i]['usergroups']` (e.g. ``pma__usergroups``)
-
-    This feature can be disabled by setting either of the configurations to ``false``.
-
-    .. seealso:: :ref:`configurablemenus`
-
-.. _navigationhiding:
-.. config:option:: $cfg['Servers'][$i]['navigationhiding']
-
-    :type: string or false
-    :default: ``''``
-
-    Since release 4.1.0 you can hide/show items in the navigation tree.
-
-    To allow the usage of this functionality:
-
-    * set up :config:option:`$cfg['Servers'][$i]['pmadb']` and the phpMyAdmin configuration storage
-    * put the table name in :config:option:`$cfg['Servers'][$i]['navigationhiding']` (e.g.
-      ``pma__navigationhiding``)
-
-    This feature can be disabled by setting the configuration to ``false``.
-
-.. _central_columns:
-.. config:option:: $cfg['Servers'][$i]['central_columns']
-
-    :type: string or false
-    :default: ``''``
-
-    Since release 4.3.0 you can have a central list of columns per database.
-    You can add/remove columns to the list as per your requirement. These columns
-    in the central list will be available to use while you create a new column for
-    a table or create a table itself. You can select a column from central list
-    while creating a new column, it will save you from writing the same column definition
-    over again or from writing different names for similar column.
-
-    To allow the usage of this functionality:
-
-    * set up :config:option:`$cfg['Servers'][$i]['pmadb']` and the phpMyAdmin configuration storage
-    * put the table name in :config:option:`$cfg['Servers'][$i]['central_columns']` (e.g.
-      ``pma__central_columns``)
-
-    This feature can be disabled by setting the configuration to ``false``.
-
-.. _designer_settings:
-.. config:option:: $cfg['Servers'][$i]['designer_settings']
-
-    :type: string or false
-    :default: ``''``
-
-    Since release 4.5.0 your designer settings can be remembered.
-    Your choice regarding 'Angular/Direct Links', 'Snap to Grid', 'Toggle Relation Lines',
-    'Small/Big All', 'Move Menu' and 'Pin Text' can be remembered persistently.
-
-    To allow the usage of this functionality:
-
-    * set up :config:option:`$cfg['Servers'][$i]['pmadb']` and the phpMyAdmin configuration storage
-    * put the table name in :config:option:`$cfg['Servers'][$i]['designer_settings']` (e.g.
-      ``pma__designer_settings``)
-
-    This feature can be disabled by setting the configuration to ``false``.
-
-.. _savedsearches:
-.. config:option:: $cfg['Servers'][$i]['savedsearches']
-
-    :type: string or false
-    :default: ``''``
-
-    Since release 4.2.0 you can save and load query-by-example searches from the Database > Query panel.
-
-    To allow the usage of this functionality:
-
-    * set up :config:option:`$cfg['Servers'][$i]['pmadb']` and the phpMyAdmin configuration storage
-    * put the table name in :config:option:`$cfg['Servers'][$i]['savedsearches']` (e.g.
-      ``pma__savedsearches``)
-
-    This feature can be disabled by setting the configuration to ``false``.
-
-.. _export_templates:
-.. config:option:: $cfg['Servers'][$i]['export_templates']
-
-    :type: string or false
-    :default: ``''``
-
-    Since release 4.5.0 you can save and load export templates.
-
-    To allow the usage of this functionality:
-
-    * set up :config:option:`$cfg['Servers'][$i]['pmadb']` and the phpMyAdmin configuration storage
-    * put the table name in :config:option:`$cfg['Servers'][$i]['export_templates']` (e.g.
-      ``pma__export_templates``)
-
-    This feature can be disabled by setting the configuration to ``false``.
-
-.. _tracking:
-.. config:option:: $cfg['Servers'][$i]['tracking']
-
-    :type: string or false
-    :default: ``''``
-
-    Since release 3.3.x a tracking mechanism is available. It helps you to
-    track every :term:`SQL` command which is
-    executed by phpMyAdmin. The mechanism supports logging of data
-    manipulation and data definition statements. After enabling it you can
-    create versions of tables.
-
-    The creation of a version has two effects:
-
-    * phpMyAdmin saves a snapshot of the table, including structure and
-      indexes.
-    * phpMyAdmin logs all commands which change the structure and/or data of
-      the table and links these commands with the version number.
-
-    Of course you can view the tracked changes. On the :guilabel:`Tracking`
-    page a complete report is available for every version. For the report you
-    can use filters, for example you can get a list of statements within a date
-    range. When you want to filter usernames you can enter \* for all names or
-    you enter a list of names separated by ','. In addition you can export the
-    (filtered) report to a file or to a temporary database.
-
-    To allow the usage of this functionality:
-
-    * set up :config:option:`$cfg['Servers'][$i]['pmadb']` and the phpMyAdmin configuration storage
-    * put the table name in :config:option:`$cfg['Servers'][$i]['tracking']` (e.g.
-      ``pma__tracking``)
-
-    This feature can be disabled by setting the configuration to ``false``.
-
-.. _tracking2:
-.. config:option:: $cfg['Servers'][$i]['tracking_version_auto_create']
-
-    :type: boolean
-    :default: false
-
-    Whether the tracking mechanism creates versions for tables and views
-    automatically.
-
-    If this is set to true and you create a table or view with
-
-    * CREATE TABLE ...
-    * CREATE VIEW ...
-
-    and no version exists for it, the mechanism will create a version for
-    you automatically.
-
-.. _tracking3:
-.. config:option:: $cfg['Servers'][$i]['tracking_default_statements']
-
-    :type: string
-    :default: ``'CREATE TABLE,ALTER TABLE,DROP TABLE,RENAME TABLE,CREATE INDEX,DROP INDEX,INSERT,UPDATE,DELETE,TRUNCATE,REPLACE,CREATE VIEW,ALTER VIEW,DROP VIEW,CREATE DATABASE,ALTER DATABASE,DROP DATABASE'``
-
-    Defines the list of statements the auto-creation uses for new
-    versions.
-
-.. _tracking4:
-.. config:option:: $cfg['Servers'][$i]['tracking_add_drop_view']
-
-    :type: boolean
-    :default: true
-
-    Whether a DROP VIEW IF EXISTS statement will be added as first line to
-    the log when creating a view.
-
-.. _tracking5:
-.. config:option:: $cfg['Servers'][$i]['tracking_add_drop_table']
-
-    :type: boolean
-    :default: true
-
-    Whether a DROP TABLE IF EXISTS statement will be added as first line
-    to the log when creating a table.
-
-.. _tracking6:
-.. config:option:: $cfg['Servers'][$i]['tracking_add_drop_database']
-
-    :type: boolean
-    :default: true
-
-    Whether a DROP DATABASE IF EXISTS statement will be added as first
-    line to the log when creating a database.
-
-.. _userconfig:
-.. config:option:: $cfg['Servers'][$i]['userconfig']
-
-    :type: string or false
-    :default: ``''``
-
-    Since release 3.4.x phpMyAdmin allows users to set most preferences by
-    themselves and store them in the database.
-
-    If you don't allow for storing preferences in
-    :config:option:`$cfg['Servers'][$i]['pmadb']`, users can still personalize
-    phpMyAdmin, but settings will be saved in browser's local storage, or, it
-    is is unavailable, until the end of session.
-
-    To allow the usage of this functionality:
-
-    * set up :config:option:`$cfg['Servers'][$i]['pmadb']` and the phpMyAdmin configuration storage
-    * put the table name in :config:option:`$cfg['Servers'][$i]['userconfig']`
-
-    This feature can be disabled by setting the configuration to ``false``.
-
-.. config:option:: $cfg['Servers'][$i]['MaxTableUiprefs']
-
-    :type: integer
-    :default: 100
-
-    Maximum number of rows saved in
-    :config:option:`$cfg['Servers'][$i]['table_uiprefs']` table.
-
-    When tables are dropped or renamed,
-    :config:option:`$cfg['Servers'][$i]['table_uiprefs']` may contain invalid data
-    (referring to tables which no longer exist). We only keep this number of newest
-    rows in :config:option:`$cfg['Servers'][$i]['table_uiprefs']` and automatically
-    delete older rows.
-
-.. config:option:: $cfg['Servers'][$i]['SessionTimeZone']
-
-    :type: string
-    :default: ``''``
-
-    Sets the time zone used by phpMyAdmin. Leave blank to use the time zone of your
-    database server. Possible values are explained at
-    https://dev.mysql.com/doc/refman/5.7/en/time-zone-support.html
-
-    This is useful when your database server uses a time zone which is different from the
-    time zone you want to use in phpMyAdmin.
-
-.. config:option:: $cfg['Servers'][$i]['AllowRoot']
-
-    :type: boolean
-    :default: true
-
-    Whether to allow root access. This is just a shortcut for the
-    :config:option:`$cfg['Servers'][$i]['AllowDeny']['rules']` below.
-
-.. config:option:: $cfg['Servers'][$i]['AllowNoPassword']
-
-    :type: boolean
-    :default: false
-
-    Whether to allow logins without a password. The default value of
-    ``false`` for this parameter prevents unintended access to a MySQL
-    server with was left with an empty password for root or on which an
-    anonymous (blank) user is defined.
-
-.. _servers_allowdeny_order:
-.. config:option:: $cfg['Servers'][$i]['AllowDeny']['order']
-
-    :type: string
-    :default: ``''``
-
-    If your rule order is empty, then :term:`IP`
-    authorization is disabled.
-
-    If your rule order is set to
-    ``'deny,allow'`` then the system applies all deny rules followed by
-    allow rules. Access is allowed by default. Any client which does not
-    match a Deny command or does match an Allow command will be allowed
-    access to the server.
-
-    If your rule order is set to ``'allow,deny'``
-    then the system applies all allow rules followed by deny rules. Access
-    is denied by default. Any client which does not match an Allow
-    directive or does match a Deny directive will be denied access to the
-    server.
-
-    If your rule order is set to ``'explicit'``, authorization is
-    performed in a similar fashion to rule order 'deny,allow', with the
-    added restriction that your host/username combination **must** be
-    listed in the *allow* rules, and not listed in the *deny* rules. This
-    is the **most** secure means of using Allow/Deny rules, and was
-    available in Apache by specifying allow and deny rules without setting
-    any order.
-
-    Please also see :config:option:`$cfg['TrustedProxies']` for
-    detecting IP address behind proxies.
-
-.. _servers_allowdeny_rules:
-.. config:option:: $cfg['Servers'][$i]['AllowDeny']['rules']
-
-    :type: array of strings
-    :default: array()
-
-    The general format for the rules is as such:
-
-    .. code-block:: none
-
-        <'allow' | 'deny'> <username> [from] <ipmask>
-
-    If you wish to match all users, it is possible to use a ``'%'`` as a
-    wildcard in the *username* field.
-
-    There are a few shortcuts you can
-    use in the *ipmask* field as well (please note that those containing
-    SERVER\_ADDRESS might not be available on all webservers):
-
-    .. code-block:: none
-
-
-        'all' -> 0.0.0.0/0
-        'localhost' -> 127.0.0.1/8
-        'localnetA' -> SERVER_ADDRESS/8
-        'localnetB' -> SERVER_ADDRESS/16
-        'localnetC' -> SERVER_ADDRESS/24
-
-    Having an empty rule list is equivalent to either using ``'allow %
-    from all'`` if your rule order is set to ``'deny,allow'`` or ``'deny %
-    from all'`` if your rule order is set to ``'allow,deny'`` or
-    ``'explicit'``.
-
-    For the :term:`IP address` matching
-    system, the following work:
-
-    * ``xxx.xxx.xxx.xxx`` (an exact :term:`IP address`)
-    * ``xxx.xxx.xxx.[yyy-zzz]`` (an :term:`IP address` range)
-    * ``xxx.xxx.xxx.xxx/nn`` (CIDR, Classless Inter-Domain Routing type :term:`IP` addresses)
-
-    But the following does not work:
-
-    * ``xxx.xxx.xxx.xx[yyy-zzz]`` (partial :term:`IP` address range)
-
-    For :term:`IPv6` addresses, the following work:
-
-    * ``xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx`` (an exact :term:`IPv6` address)
-    * ``xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:[yyyy-zzzz]`` (an :term:`IPv6` address range)
-    * ``xxxx:xxxx:xxxx:xxxx/nn`` (CIDR, Classless Inter-Domain Routing type :term:`IPv6` addresses)
-
-    But the following does not work:
-
-    * ``xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xx[yyy-zzz]`` (partial :term:`IPv6` address range)
-
-.. config:option:: $cfg['Servers'][$i]['DisableIS']
-
-    :type: boolean
-    :default: false
-
-    Disable using ``INFORMATION_SCHEMA`` to retrieve information (use
-    ``SHOW`` commands instead), because of speed issues when many
-    databases are present. Currently used in some parts of the code, more
-    to come.
-
-.. config:option:: $cfg['Servers'][$i]['SignonScript']
-
-    :type: string
-    :default: ``''``
-
-    Name of PHP script to be sourced and executed to obtain login
-    credentials. This is alternative approach to session based single
-    signon. The script has to provide a function called
-    ``get_login_credentials`` which returns list of username and
-    password, accepting single parameter of existing username (can be
-    empty). See :file:`examples/signon-script.php` for an example:
-
-    .. literalinclude:: ../examples/signon-script.php
-        :language: php
-
-    .. seealso:: :ref:`auth_signon`
-
-.. config:option:: $cfg['Servers'][$i]['SignonSession']
-
-    :type: string
-    :default: ``''``
-
-    Name of session which will be used for signon authentication method.
-    You should use something different than ``phpMyAdmin``, because this
-    is session which phpMyAdmin uses internally. Takes effect only if
-    :config:option:`$cfg['Servers'][$i]['SignonScript']` is not configured.
-
-    .. seealso:: :ref:`auth_signon`
-
-.. config:option:: $cfg['Servers'][$i]['SignonURL']
-
-    :type: string
-    :default: ``''``
-
-    :term:`URL` where user will be redirected
-    to log in for signon authentication method. Should be absolute
-    including protocol.
-
-    .. seealso:: :ref:`auth_signon`
-
-.. config:option:: $cfg['Servers'][$i]['LogoutURL']
-
-    :type: string
-    :default: ``''``
-
-    :term:`URL` where user will be redirected
-    after logout (doesn't affect config authentication method). Should be
-    absolute including protocol.
-
-Generic settings
-----------------
-
-.. config:option:: $cfg['ServerDefault']
-
-    :type: integer
-    :default: 1
-
-    If you have more than one server configured, you can set
-    :config:option:`$cfg['ServerDefault']` to any one of them to autoconnect to that
-    server when phpMyAdmin is started, or set it to 0 to be given a list
-    of servers without logging in.
-
-    If you have only one server configured,
-    :config:option:`$cfg['ServerDefault']` MUST be set to that server.
-
-.. config:option:: $cfg['VersionCheck']
-
-    :type: boolean
-    :default: true
-
-    Enables check for latest versions using JavaScript on the main phpMyAdmin
-    page or by directly accessing :file:`version_check.php`.
-
-    .. note::
-
-        This setting can be adjusted by your vendor.
-
-.. config:option:: $cfg['ProxyUrl']
-
-    :type: string
-    :default: ""
-
-    The url of the proxy to be used when phpmyadmin needs to access the outside
-    internet such as when retrieving the latest version info or submitting error
-    reports.  You need this if the server where phpMyAdmin is installed does not
-    have direct access to the internet.
-    The format is: "hostname:portnumber"
-
-.. config:option:: $cfg['ProxyUser']
-
-    :type: string
-    :default: ""
-
-    The username for authenticating with the proxy. By default, no
-    authentication is performed. If a username is supplied, Basic
-    Authentication will be performed. No other types of authentication
-    are currently supported.
-
-.. config:option:: $cfg['ProxyPass']
-
-    :type: string
-    :default: ""
-
-    The password for authenticating with the proxy.
-
-.. config:option:: $cfg['MaxDbList']
-
-    :type: integer
-    :default: 100
-
-    The maximum number of database names to be displayed in the main panel's
-    database list.
-
-.. config:option:: $cfg['MaxTableList']
-
-    :type: integer
-    :default: 250
-
-    The maximum number of table names to be displayed in the main panel's
-    list (except on the Export page).
-
-.. config:option:: $cfg['ShowHint']
-
-    :type: boolean
-    :default: true
-
-    Whether or not to show hints (for example, hints when hovering over
-    table headers).
-
-.. config:option:: $cfg['MaxCharactersInDisplayedSQL']
-
-    :type: integer
-    :default: 1000
-
-    The maximum number of characters when a :term:`SQL` query is displayed. The
-    default limit of 1000 should be correct to avoid the display of tons of
-    hexadecimal codes that represent BLOBs, but some users have real
-    :term:`SQL` queries that are longer than 1000 characters. Also, if a
-    query's length exceeds this limit, this query is not saved in the history.
-
-.. config:option:: $cfg['PersistentConnections']
-
-    :type: boolean
-    :default: false
-
-    Whether `persistent connections <https://php.net/manual/en/features
-    .persistent-connections.php>`_ should be used or not. Works with
-    following extensions:
-
-    * mysql (`mysql\_pconnect <https://php.net/manual/en/function.mysql-
-      pconnect.php>`_),
-    * mysqli (requires PHP 5.3.0 or newer, `more information
-      <https://php.net/manual/en/mysqli.persistconns.php>`_).
-
-.. config:option:: $cfg['ForceSSL']
-
-    :type: boolean
-    :default: false
-
-    .. deprecated:: 4.6.0
-        
-        This setting is no longer available since phpMyAdmin 4.6.0. Please
-        adjust your webserver instead.
-
-    Whether to force using https while accessing phpMyAdmin. In a reverse
-    proxy setup, setting this to ``true`` is not supported.
-
-    .. note::
-
-        In some setups (like separate SSL proxy or load balancer) you might
-        have to set :config:option:`$cfg['PmaAbsoluteUri']` for correct
-        redirection.
-
-.. config:option:: $cfg['ExecTimeLimit']
-
-    :type: integer [number of seconds]
-    :default: 300
-
-    Set the number of seconds a script is allowed to run. If seconds is
-    set to zero, no time limit is imposed. This setting is used while
-    importing/exporting dump files but has
-    no effect when PHP is running in safe mode.
-
-.. config:option:: $cfg['SessionSavePath']
-
-    :type: string
-    :default: ``''``
-
-    Path for storing session data (`session\_save\_path PHP parameter
-    <https://php.net/session_save_path>`_).
-
-.. config:option:: $cfg['MemoryLimit']
-
-    :type: string [number of bytes]
-    :default: ``'-1'``
-
-    Set the number of bytes a script is allowed to allocate. If set to
-    ``'-1'``, no limit is imposed. If set to ``'0'``, no change of the
-    memory limit is attempted and the :file:`php.ini` ``memory_limit`` is
-    used.
-
-    This setting is used while importing/exporting dump files
-    so you definitely don't want to put here a too low
-    value. It has no effect when PHP is running in safe mode.
-
-    You can also use any string as in :file:`php.ini`, eg. '16M'. Ensure you
-    don't omit the suffix (16 means 16 bytes!)
-
-.. config:option:: $cfg['SkipLockedTables']
-
-    :type: boolean
-    :default: false
-
-    Mark used tables and make it possible to show databases with locked
-    tables (since MySQL 3.23.30).
-
-.. config:option:: $cfg['ShowSQL']
-
-    :type: boolean
-    :default: true
-
-    Defines whether :term:`SQL` queries
-    generated by phpMyAdmin should be displayed or not.
-
-.. config:option:: $cfg['RetainQueryBox']
-
-    :type: boolean
-    :default: false
-
-    Defines whether the :term:`SQL` query box
-    should be kept displayed after its submission.
-
-.. config:option:: $cfg['CodemirrorEnable']
-
-    :type: boolean
-    :default: true
-
-    Defines whether to use a Javascript code editor for SQL query boxes.
-    CodeMirror provides syntax highlighting and line numbers.  However,
-    middle-clicking for pasting the clipboard contents in some Linux
-    distributions (such as Ubuntu) is not supported by all browsers.
-
-.. config:option:: $cfg['DefaultForeignKeyChecks']
-
-    :type: string
-    :default: ``'default'``
-
-    Default value of the checkbox for foreign key checks, to disable/enable
-    foreign key checks for certain queries. The possible values are ``'default'``,
-    ``'enable'`` or ``'disable'``. If set to ``'default'``, the value of the
-    MySQL variable ``FOREIGN_KEY_CHECKS`` is used.
-
-.. config:option:: $cfg['AllowUserDropDatabase']
-
-    :type: boolean
-    :default: false
-
-    .. warning::
-
-        This is not a security measure as there will be always ways to
-        circumvent this. If you want to prohibit users from dropping databases,
-        revoke their corresponding DROP privilege.
-
-    Defines whether normal users (non-administrator) are allowed to delete
-    their own database or not. If set as false, the link :guilabel:`Drop
-    Database` will not be shown, and even a ``DROP DATABASE mydatabase`` will
-    be rejected. Quite practical for :term:`ISP` 's with many customers.
-
-    This limitation of :term:`SQL` queries is not as strict as when using MySQL
-    privileges. This is due to nature of :term:`SQL` queries which might be
-    quite complicated.  So this choice should be viewed as help to avoid
-    accidental dropping rather than strict privilege limitation.
-
-.. config:option:: $cfg['Confirm']
-
-    :type: boolean
-    :default: true
-
-    Whether a warning ("Are your really sure...") should be displayed when
-    you're about to lose data.
-
-.. config:option:: $cfg['UseDbSearch']
-
-    :type: boolean
-    :default: true
-
-    Define whether the "search string inside database" is enabled or not.
-
-.. config:option:: $cfg['IgnoreMultiSubmitErrors']
-
-    :type: boolean
-    :default: false
-
-    Define whether phpMyAdmin will continue executing a multi-query
-    statement if one of the queries fails. Default is to abort execution.
-
-Cookie authentication options
------------------------------
-
-.. config:option:: $cfg['blowfish_secret']
-
-    :type: string
-    :default: ``''``
-
-    The "cookie" auth\_type uses AES algorithm to encrypt the password. If you
-    are using the "cookie" auth\_type, enter here a random passphrase of your
-    choice. It will be used internally by the AES algorithm: you won’t be
-    prompted for this passphrase. 
-    
-    The secret should be 32 characters long. Using shorter will lead to weaker security
-    of encrypted cookies, using longer will cause no harm.
-
-    .. note::
-
-        The configuration is called blowfish_secret for historical reasons as
-        Blowfish algorithm was originally used to do the encryption.
-
-    .. versionchanged:: 3.1.0
-        Since version 3.1.0 phpMyAdmin can generate this on the fly, but it
-        makes a bit weaker security as this generated secret is stored in
-        session and furthermore it makes impossible to recall user name from
-        cookie.
-
-.. config:option:: $cfg['LoginCookieRecall']
-
-    :type: boolean
-    :default: true
-
-    Define whether the previous login should be recalled or not in cookie
-    authentication mode.
-
-    This is automatically disabled if you do not have
-    configured :config:option:`$cfg['blowfish_secret']`.
-
-.. config:option:: $cfg['LoginCookieValidity']
-
-    :type: integer [number of seconds]
-    :default: 1440
-
-    Define how long a login cookie is valid. Please note that php
-    configuration option `session.gc\_maxlifetime
-    <https://php.net/manual/en/session.configuration.php#ini.session.gc-
-    maxlifetime>`_ might limit session validity and if the session is lost,
-    the login cookie is also invalidated. So it is a good idea to set
-    ``session.gc_maxlifetime`` at least to the same value of
-    :config:option:`$cfg['LoginCookieValidity']`.
-
-.. config:option:: $cfg['LoginCookieStore']
-
-    :type: integer [number of seconds]
-    :default: 0
-
-    Define how long login cookie should be stored in browser. Default 0
-    means that it will be kept for existing session. This is recommended
-    for not trusted environments.
-
-.. config:option:: $cfg['LoginCookieDeleteAll']
-
-    :type: boolean
-    :default: true
-
-    If enabled (default), logout deletes cookies for all servers,
-    otherwise only for current one. Setting this to false makes it easy to
-    forget to log out from other server, when you are using more of them.
-
-.. _AllowArbitraryServer:
-.. config:option:: $cfg['AllowArbitraryServer']
-
-    :type: boolean
-    :default: false
-
-    If enabled, allows you to log in to arbitrary servers using cookie
-    authentication.
-
-    .. note::
-
-        Please use this carefully, as this may allow users access to MySQL servers
-        behind the firewall where your :term:`HTTP` server is placed.
-        See also :config:option:`$cfg['ArbitraryServerRegexp']`.
-
-.. config:option:: $cfg['ArbitraryServerRegexp']
-
-    :type: string
-    :default: ``''``
-
-    Restricts the MySQL servers to which the user can log in when
-    :config:option:`$cfg['AllowArbitraryServer']` is enabled by
-    matching the :term:`IP` or the hostname of the MySQL server
-    to the given regular expression. The regular expression must be enclosed
-    with a delimiter character.
-
-    It is recommended to include start and end symbols in the regullar
-    expression, so that you can avoid partial matches on the string.
-
-    **Examples:**
-
-    .. code-block:: php
-
-        // Allow connection to three listed servers:
-        $cfg['ArbitraryServerRegexp'] = '/^(server|another|yetdifferent)$/'; 
-
-        // Allow connection to range of IP addresses:
-        $cfg['ArbitraryServerRegexp'] = '@^192\.168\.0\.[0-9]{1,}$@';
-
-        // Allow connection to server name ending with -mysql:
-        $cfg['ArbitraryServerRegexp'] = '@^[^:]\-mysql$@';
-
-    .. note::
-
-        The whole server name is matched, it can include port as well. Due to
-        way MySQL is permissive in connection parameters, it is possible to use
-        connection strings as ```server:3306-mysql```. This can be used to
-        bypass regullar expression by the suffix, while connecting to another
-        server.
-
-.. config:option:: $cfg['CaptchaLoginPublicKey']
-
-    :type: string
-    :default: ``''``
-
-    The public key for the reCaptcha service that can be obtained from
-    https://www.google.com/recaptcha.
-
-    reCaptcha will be then used in :ref:`cookie`.
-
-.. config:option:: $cfg['CaptchaLoginPrivateKey']
-
-    :type: string
-    :default: ``''``
-
-    The private key for the reCaptcha service that can be obtain from
-    https://www.google.com/recaptcha.
-
-    reCaptcha will be then used in :ref:`cookie`.
-
-Navigation panel setup
-----------------------
-
-.. config:option:: $cfg['ShowDatabasesNavigationAsTree']
-
-    :type: boolean
-    :default: true
-
-    In the navigation panel, replaces the database tree with a selector
-
-.. config:option:: $cfg['FirstLevelNavigationItems']
-
-    :type: integer
-    :default: 100
-
-    The number of first level databases that can be displayed on each page
-    of navigation tree.
-
-.. config:option:: $cfg['MaxNavigationItems']
-
-    :type: integer
-    :default: 50
-
-    The number of items (tables, columns, indexes) that can be displayed on each
-    page of the navigation tree.
-
-.. config:option:: $cfg['NavigationTreeEnableGrouping']
-
-    :type: boolean
-    :default: true
-
-    Defines whether to group the databases based on a common prefix
-    in their name :config:option:`$cfg['NavigationTreeDbSeparator']`.
-
-.. config:option:: $cfg['NavigationTreeDbSeparator']
-
-    :type: string
-    :default: ``'_'``
-
-    The string used to separate the parts of the database name when
-    showing them in a tree.
-
-.. config:option:: $cfg['NavigationTreeTableSeparator']
-
-    :type: string or array
-    :default: ``'__'``
-
-    Defines a string to be used to nest table spaces. This means if you have
-    tables like ``first__second__third`` this will be shown as a three-level
-    hierarchy like: first > second > third.  If set to false or empty, the
-    feature is disabled. NOTE: You should not use this separator at the
-    beginning or end of a table name or multiple times after another without
-    any other characters in between.
-
-.. config:option:: $cfg['NavigationTreeTableLevel']
-
-    :type: integer
-    :default: 1
-
-    Defines how many sublevels should be displayed when splitting up
-    tables by the above separator.
-
-.. config:option:: $cfg['NumRecentTables']
-
-    :type: integer
-    :default: 10
-
-    The maximum number of recently used tables shown in the navigation
-    panel. Set this to 0 (zero) to disable the listing of recent tables.
-
-.. config:option:: $cfg['NumFavoriteTables']
-
-    :type: integer
-    :default: 10
-
-    The maximum number of favorite tables shown in the navigation
-    panel. Set this to 0 (zero) to disable the listing of favorite tables.
-
-.. config:option:: $cfg['ZeroConf']
-
-    :type: boolean
-    :default: true
-
-    Enables Zero Configuration mode in which the user will be offered a choice to
-    create phpMyAdmin configuration storage in the current database
-    or use the existing one, if already present.
-
-    This setting has no effect if the phpMyAdmin configuration storage database
-    is properly created and the related configuration directives (such as
-    :config:option:`$cfg['Servers'][$i]['pmadb']` and so on) are configured.
-
-.. config:option:: $cfg['NavigationLinkWithMainPanel']
-
-    :type: boolean
-    :default: true
-
-    Defines whether or not to link with main panel by highlighting
-    the current database or table.
-
-.. config:option:: $cfg['NavigationDisplayLogo']
-
-    :type: boolean
-    :default: true
-
-    Defines whether or not to display the phpMyAdmin logo at the top of
-    the navigation panel.
-
-.. config:option:: $cfg['NavigationLogoLink']
-
-    :type: string
-    :default: ``'index.php'``
-
-    Enter :term:`URL` where logo in the navigation panel will point to.
-    For use especially with self made theme which changes this.
-    For external URLs, you should include URL scheme as well.
-
-.. config:option:: $cfg['NavigationLogoLinkWindow']
-
-    :type: string
-    :default: ``'main'``
-
-    Whether to open the linked page in the main window (``main``) or in a
-    new one (``new``). Note: use ``new`` if you are linking to
-    ``phpmyadmin.net``.
-
-.. config:option:: $cfg['NavigationTreeDisplayItemFilterMinimum']
-
-    :type: integer
-    :default: 30
-
-    Defines the minimum number of items (tables, views, routines and
-    events) to display a JavaScript filter box above the list of items in
-    the navigation tree.
-
-    To disable the filter completely some high number can be used (e.g. 9999)
-
-.. config:option:: $cfg['NavigationTreeDisplayDbFilterMinimum']
-
-    :type: integer
-    :default: 30
-
-    Defines the minimum number of databases to display a JavaScript filter
-    box above the list of databases in the navigation tree.
-
-    To disable the filter completely some high number can be used
-    (e.g. 9999)
-
-.. config:option:: $cfg['NavigationDisplayServers']
-
-    :type: boolean
-    :default: true
-
-    Defines whether or not to display a server choice at the top of the
-    navigation panel.
-
-.. config:option:: $cfg['DisplayServersList']
-
-    :type: boolean
-    :default: false
-
-    Defines whether to display this server choice as links instead of in a
-    drop-down.
-
-.. config:option:: $cfg['NavigationTreeDefaultTabTable']
-
-    :type: string
-    :default: ``'structure'``
-
-    Defines the tab displayed by default when clicking the small icon next
-    to each table name in the navigation panel. The possible values are the
-    localized equivalent of:
-
-    * ``structure``
-    * ``sql``
-    * ``search``
-    * ``insert``
-    * ``browse``
-
-.. config:option:: $cfg['NavigationTreeDefaultTabTable2']
-
-    :type: string
-    :default: null
-
-    Defines the tab displayed by default when clicking the second small icon next
-    to each table name in the navigation panel. The possible values are the
-    localized equivalent of:
-
-    * ``(empty)``
-    * ``structure``
-    * ``sql``
-    * ``search``
-    * ``insert``
-    * ``browse``
-
-.. config:option:: $cfg['NavigationTreeEnableExpansion']
-
-    :type: boolean
-    :default: false
-
-    Whether to offer the possibility of tree expansion in the navigation panel.
-
-.. config:option:: $cfg['NavigationTreeShowTables']
-
-    :type: boolean
-    :default: true
-
-    Whether to show tables under database in the navigation panel.
-
-.. config:option:: $cfg['NavigationTreeShowViews']
-
-    :type: boolean
-    :default: true
-
-    Whether to show views under database in the navigation panel.
-
-.. config:option:: $cfg['NavigationTreeShowFunctions']
-
-    :type: boolean
-    :default: true
-
-    Whether to show functions under database in the navigation panel.
-
-.. config:option:: $cfg['NavigationTreeShowProcedures']
-
-    :type: boolean
-    :default: true
-
-    Whether to show procedures under database in the navigation panel.
-
-.. config:option:: $cfg['NavigationTreeShowEvents']
-
-    :type: boolean
-    :default: true
-
-    Whether to show events under database in the navigation panel.
-
-
-Main panel
-----------
-
-.. config:option:: $cfg['ShowStats']
-
-    :type: boolean
-    :default: true
-
-    Defines whether or not to display space usage and statistics about
-    databases and tables. Note that statistics requires at least MySQL
-    3.23.3 and that, at this date, MySQL doesn't return such information
-    for Berkeley DB tables.
-
-.. config:option:: $cfg['ShowServerInfo']
-
-    :type: boolean
-    :default: true
-
-    Defines whether to display detailed server information on main page.
-    You can additionally hide more information by using
-    :config:option:`$cfg['Servers'][$i]['verbose']`.
-
-.. config:option:: $cfg['ShowChgPassword']
-
-    :type: boolean
-    :default: true
-
-.. config:option:: $cfg['ShowCreateDb']
-
-    :type: boolean
-    :default: true
-
-    Defines whether to display the 
-    :guilabel:`Change password` links and form for creating database or not at
-    the starting main (right) frame. This setting does not check MySQL commands
-    entered directly.
-
-    Also note that enabling the :guilabel:`Change password` link has no effect
-    with config authentication mode: because of the hard coded password value
-    in the configuration file, end users can't be allowed to change their
-    passwords.
-
-.. config:option:: $cfg['ShowGitRevision']
-
-    :type: boolean
-    :default: true
-
-    Defines whether to display informations about the current Git revision (if
-    applicable) on the main panel.
-
-.. config:option:: $cfg['MysqlMinVersion']
-
-    :type: array
-
-    Defines the minimum supported MySQL version. The default is chosen
-    by the phpMyAdmin team; however this directive was asked by a developer
-    of the Plesk control panel to ease integration with older MySQL servers
-    (where most of the phpMyAdmin features work).
-
-Database structure
-------------------
-
-.. config:option:: $cfg['ShowDbStructureCreation']
-
-    :type: boolean
-    :default: false
-
-    Defines whether the database structure page (tables list) has a
-    "Creation" column that displays when each table was created.
-
-.. config:option:: $cfg['ShowDbStructureLastUpdate']
-
-    :type: boolean
-    :default: false
-
-    Defines whether the database structure page (tables list) has a "Last
-    update" column that displays when each table was last updated.
-
-.. config:option:: $cfg['ShowDbStructureLastCheck']
-
-    :type: boolean
-    :default: false
-
-    Defines whether the database structure page (tables list) has a "Last
-    check" column that displays when each table was last checked.
-
-.. config:option:: $cfg['HideStructureActions']
-
-    :type: boolean
-    :default: true
-
-    Defines whether the table structure actions are hidden under a "More"
-    drop-down.
-
-Browse mode
------------
-
-.. config:option:: $cfg['TableNavigationLinksMode']
-
-    :type: string
-    :default: ``'icons'``
-
-    Defines whether the table navigation links contain ``'icons'``, ``'text'``
-    or ``'both'``.
-
-.. config:option:: $cfg['ActionLinksMode']
-
-    :type: string
-    :default: ``'both'``
-
-    If set to ``icons``, will display icons instead of text for db and table
-    properties links (like :guilabel:`Browse`, :guilabel:`Select`,
-    :guilabel:`Insert`, ...). Can be set to ``'both'``
-    if you want icons AND text. When set to ``text``, will only show text.
-
-.. config:option:: $cfg['RowActionType']
-
-    :type: string
-    :default: ``'both'``
-
-    Whether to display icons or text or both icons and text in table row action
-    segment. Value can be either of ``'icons'``, ``'text'`` or ``'both'``.
-
-.. config:option:: $cfg['ShowAll']
-
-    :type: boolean
-    :default: false
-
-    Defines whether a user should be displayed a "Show all" button in browse
-    mode or not in all cases. By default it is shown only on small tables (less
-    than 500 rows) to avoid performance issues while getting too many rows.
-
-.. config:option:: $cfg['MaxRows']
-
-    :type: integer
-    :default: 25
-
-    Number of rows displayed when browsing a result set and no LIMIT
-    clause is used. If the result set contains more rows, "Previous" and
-    "Next" links will be shown. Possible values: 25,50,100,250,500.
-
-.. config:option:: $cfg['Order']
-
-    :type: string
-    :default: ``'SMART'``
-
-    Defines whether columns are displayed in ascending (``ASC``) order, in
-    descending (``DESC``) order or in a "smart" (``SMART``) order - I.E.
-    descending order for columns of type TIME, DATE, DATETIME and
-    TIMESTAMP, ascending order else- by default.
-
-.. config:option:: $cfg['GridEditing']
-
-    :type: string
-    :default: ``'double-click'``
-
-    Defines which action (``double-click`` or ``click``) triggers grid
-    editing. Can be deactivated with the ``disabled`` value.
-
-.. config:option:: $cfg['RelationalDisplay']
-
-    :type: string
-    :default: ``'K'``
-
-    Defines the initial behavior for Options > Relational. ``K``, which
-    is the default, displays the key while ``D`` shows the display column.
-
-.. config:option:: $cfg['SaveCellsAtOnce']
-
-    :type: boolean
-    :default: false
-
-    Defines whether or not to save all edited cells at once for grid
-    editing.
-
-Editing mode
-------------
-
-.. config:option:: $cfg['ProtectBinary']
-
-    :type: boolean or string
-    :default: ``'blob'``
-
-    Defines whether ``BLOB`` or ``BINARY`` columns are protected from
-    editing when browsing a table's content. Valid values are:
-
-    * ``false`` to allow editing of all columns;
-    * ``'blob'`` to allow editing of all columns except ``BLOBS``;
-    * ``'noblob'`` to disallow editing of all columns except ``BLOBS`` (the
-      opposite of ``'blob'``);
-    * ``'all'`` to disallow editing of all ``BINARY`` or ``BLOB`` columns.
-
-.. config:option:: $cfg['ShowFunctionFields']
-
-    :type: boolean
-    :default: true
-
-    Defines whether or not MySQL functions fields should be initially
-    displayed in edit/insert mode. Since version 2.10, the user can toggle
-    this setting from the interface.
-
-.. config:option:: $cfg['ShowFieldTypesInDataEditView']
-
-    :type: boolean
-    :default: true
-
-    Defines whether or not type fields should be initially displayed in
-    edit/insert mode. The user can toggle this setting from the interface.
-
-.. config:option:: $cfg['InsertRows']
-
-    :type: integer
-    :default: 2
-
-    Defines the maximum number of concurrent entries for the Insert page.
-
-.. config:option:: $cfg['ForeignKeyMaxLimit']
-
-    :type: integer
-    :default: 100
-
-    If there are fewer items than this in the set of foreign keys, then a
-    drop-down box of foreign keys is presented, in the style described by
-    the :config:option:`$cfg['ForeignKeyDropdownOrder']` setting.
-
-.. config:option:: $cfg['ForeignKeyDropdownOrder']
-
-    :type: array
-    :default: array('content-id', 'id-content')
-
-    For the foreign key drop-down fields, there are several methods of
-    display, offering both the key and value data. The contents of the
-    array should be one or both of the following strings: ``content-id``,
-    ``id-content``.
-
-Export and import settings
---------------------------
-
-.. config:option:: $cfg['ZipDump']
-
-    :type: boolean
-    :default: true
-
-.. config:option:: $cfg['GZipDump']
-
-    :type: boolean
-    :default: true
-
-.. config:option:: $cfg['BZipDump']
-
-    :type: boolean
-    :default: true
-
-    Defines whether to allow the use of zip/GZip/BZip2 compression when
-    creating a dump file
-
-.. config:option:: $cfg['CompressOnFly']
-
-    :type: boolean
-    :default: true
-
-    Defines whether to allow on the fly compression for GZip/BZip2
-    compressed exports. This doesn't affect smaller dumps and allows users
-    to create larger dumps that won't otherwise fit in memory due to php
-    memory limit. Produced files contain more GZip/BZip2 headers, but all
-    normal programs handle this correctly.
-
-.. config:option:: $cfg['Export']
-
-    :type: array
-    :default: array(...)
-
-    In this array are defined default parameters for export, names of
-    items are similar to texts seen on export page, so you can easily
-    identify what they mean.
-
-.. config:option:: $cfg['Export']['method']
-
-    :type: string
-    :default: ``'quick'``
-
-    Defines how the export form is displayed when it loads. Valid values
-    are:
-
-    * ``quick`` to display the minimum number of options to configure
-    * ``custom`` to display every available option to configure
-    * ``custom-no-form`` same as ``custom`` but does not display the option
-      of using quick export
-
-
-
-.. config:option:: $cfg['Import']
-
-    :type: array
-    :default: array(...)
-
-    In this array are defined default parameters for import, names of
-    items are similar to texts seen on import page, so you can easily
-    identify what they mean.
-
-
-Tabs display settings
----------------------
-
-.. config:option:: $cfg['TabsMode']
-
-    :type: string
-    :default: ``'both'``
-
-    Defines whether the menu tabs contain ``'icons'``, ``'text'`` or ``'both'``.
-
-.. config:option:: $cfg['PropertiesNumColumns']
-
-    :type: integer
-    :default: 1
-
-    How many columns will be utilized to display the tables on the database
-    property view? When setting this to a value larger than 1, the type of the
-    database will be omitted for more display space.
-
-.. config:option:: $cfg['DefaultTabServer']
-
-    :type: string
-    :default: ``'welcome'``
-
-    Defines the tab displayed by default on server view. The possible values
-    are the localized equivalent of:
-
-    * ``welcome`` (recommended for multi-user setups)
-    * ``databases``,
-    * ``status``
-    * ``variables``
-    * ``privileges``
-
-.. config:option:: $cfg['DefaultTabDatabase']
-
-    :type: string
-    :default: ``'structure'``
-
-    Defines the tab displayed by default on database view. The possible values
-    are the localized equivalent of:
-
-    * ``structure``
-    * ``sql``
-    * ``search``
-    * ``operations``
-
-.. config:option:: $cfg['DefaultTabTable']
-
-    :type: string
-    :default: ``'browse'``
-
-    Defines the tab displayed by default on table view. The possible values
-    are the localized equivalent of:
-
-    * ``structure``
-    * ``sql``
-    * ``search``
-    * ``insert``
-    * ``browse``
-
-PDF Options
------------
-
-.. config:option:: $cfg['PDFPageSizes']
-
-    :type: array
-    :default: ``array('A3', 'A4', 'A5', 'letter', 'legal')``
-
-    Array of possible paper sizes for creating PDF pages.
-
-    You should never need to change this.
-
-.. config:option:: $cfg['PDFDefaultPageSize']
-
-    :type: string
-    :default: ``'A4'``
-
-    Default page size to use when creating PDF pages. Valid values are any
-    listed in :config:option:`$cfg['PDFPageSizes']`.
-
-Languages
----------
-
-.. config:option:: $cfg['DefaultLang']
-
-    :type: string
-    :default: ``'en'``
-
-    Defines the default language to use, if not browser-defined or user-
-    defined. The corresponding language file needs to be in
-    locale/*code*/LC\_MESSAGES/phpmyadmin.mo.
-
-.. config:option:: $cfg['DefaultConnectionCollation']
-
-    :type: string
-    :default: ``'utf8_general_ci'``
-
-    Defines the default connection collation to use, if not user-defined.
-    See the `MySQL documentation for charsets
-    <https://dev.mysql.com/doc/mysql/en/charset-charsets.html>`_
-    for list of possible values.
-
-.. config:option:: $cfg['Lang']
-
-    :type: string
-    :default: not set
-
-    Force language to use. The corresponding language file needs to be in
-    locale/*code*/LC\_MESSAGES/phpmyadmin.mo.
-
-.. config:option:: $cfg['FilterLanguages']
-
-    :type: string
-    :default: ``''``
-
-    Limit list of available languages to those matching the given regular
-    expression. For example if you want only Czech and English, you should
-    set filter to ``'^(cs|en)'``.
-
-.. config:option:: $cfg['RecodingEngine']
-
-    :type: string
-    :default: ``'auto'``
-
-    You can select here which functions will be used for character set
-    conversion. Possible values are:
-
-    * auto - automatically use available one (first is tested iconv, then
-      recode)
-    * iconv - use iconv or libiconv functions
-    * recode - use recode\_string function
-    * mb - use mbstring extension
-    * none - disable encoding conversion
-
-    Enabled charset conversion activates a pull-down menu in the Export
-    and Import pages, to choose the character set when exporting a file.
-    The default value in this menu comes from
-    :config:option:`$cfg['Export']['charset']` and :config:option:`$cfg['Import']['charset']`.
-
-.. config:option:: $cfg['IconvExtraParams']
-
-    :type: string
-    :default: ``'//TRANSLIT'``
-
-    Specify some parameters for iconv used in charset conversion. See
-    `iconv documentation <https://www.gnu.org/software/libiconv/documentati
-    on/libiconv/iconv_open.3.html>`_ for details. By default
-    ``//TRANSLIT`` is used, so that invalid characters will be
-    transliterated.
-
-.. config:option:: $cfg['AvailableCharsets']
-
-    :type: array
-    :default: array(...)
-
-    Available character sets for MySQL conversion. You can add your own
-    (any of supported by recode/iconv) or remove these which you don't
-    use. Character sets will be shown in same order as here listed, so if
-    you frequently use some of these move them to the top.
-
-Web server settings
--------------------
-
-.. config:option:: $cfg['OBGzip']
-
-    :type: string/boolean
-    :default: ``'auto'``
-
-    Defines whether to use GZip output buffering for increased speed in
-    :term:`HTTP` transfers. Set to
-    true/false for enabling/disabling. When set to 'auto' (string),
-    phpMyAdmin tries to enable output buffering and will automatically
-    disable it if your browser has some problems with buffering. IE6 with
-    a certain patch is known to cause data corruption when having enabled
-    buffering.
-
-.. config:option:: $cfg['TrustedProxies']
-
-    :type: array
-    :default: array()
-
-    Lists proxies and HTTP headers which are trusted for
-    :config:option:`$cfg['Servers'][$i]['AllowDeny']['order']`. This list is by
-    default empty, you need to fill in some trusted proxy servers if you
-    want to use rules for IP addresses behind proxy.
-
-    The following example specifies that phpMyAdmin should trust a
-    HTTP\_X\_FORWARDED\_FOR (``X -Forwarded-For``) header coming from the proxy
-    1.2.3.4:
-
-    .. code-block:: php
-
-        $cfg['TrustedProxies'] = array('1.2.3.4' => 'HTTP_X_FORWARDED_FOR');
-
-    The :config:option:`$cfg['Servers'][$i]['AllowDeny']['rules']` directive uses the
-    client's IP address as usual.
-
-.. config:option:: $cfg['GD2Available']
-
-    :type: string
-    :default: ``'auto'``
-
-    Specifies whether GD >= 2 is available. If yes it can be used for MIME
-    transformations. Possible values are:
-
-    * auto - automatically detect
-    * yes - GD 2 functions can be used
-    * no - GD 2 function cannot be used
-
-.. config:option:: $cfg['CheckConfigurationPermissions']
-
-    :type: boolean
-    :default: true
-
-    We normally check the permissions on the configuration file to ensure
-    it's not world writable. However, phpMyAdmin could be installed on a
-    NTFS filesystem mounted on a non-Windows server, in which case the
-    permissions seems wrong but in fact cannot be detected. In this case a
-    sysadmin would set this parameter to ``false``.
-
-.. config:option:: $cfg['LinkLengthLimit']
-
-    :type: integer
-    :default: 1000
-
-    Limit for length of :term:`URL` in links.  When length would be above this
-    limit, it is replaced by form with button. This is required as some web
-    servers (:term:`IIS`) have problems with long :term:`URL` .
-
-.. config:option:: $cfg['CSPAllow']
-
-    :type: string
-    :default: ``''``
-
-    Additional string to include in allowed script and image sources in Content
-    Security Policy header.
-
-    This can be useful when you want to include some external JavaScript files
-    in :file:`config.footer.inc.php` or :file:`config.header.inc.php`, which
-    would be normally not allowed by Content Security Policy.
-
-    To allow some sites, just list them within the string:
-
-    .. code-block:: php
-
-        $cfg['CSPAllow'] = 'example.com example.net';
-
-    .. versionadded:: 4.0.4
-
-.. config:option:: $cfg['DisableMultiTableMaintenance']
-
-    :type: boolean
-    :default: false
-
-    In the database Structure page, it's possible to mark some tables then
-    choose an operation like optimizing for many tables. This can slow
-    down a server; therefore, setting this to ``true`` prevents this kind
-    of multiple maintenance operation.
-
-Theme settings
---------------
-
-    Please directly modify :file:`themes/themename/layout.inc.php`, although
-    your changes will be overwritten with the next update.
-
-Design customization
---------------------
-
-.. config:option:: $cfg['NavigationTreePointerEnable']
-
-    :type: boolean
-    :default: true
-
-    When set to true, hovering over an item in the navigation panel causes that item to be marked
-    (the background is highlighted).
-
-.. config:option:: $cfg['BrowsePointerEnable']
-
-    :type: boolean
-    :default: true
-
-    When set to true, hovering over a row in the Browse page causes that row to be marked (the background
-    is highlighted).
-
-.. config:option:: $cfg['BrowseMarkerEnable']
-
-    :type: boolean
-    :default: true
-
-    When set to true, a data row is marked (the background is highlighted) when the row is selected
-    with the checkbox.
-
-.. config:option:: $cfg['LimitChars']
-
-    :type: integer
-    :default: 50
-
-    Maximum number of characters shown in any non-numeric field on browse
-    view. Can be turned off by a toggle button on the browse page.
-
-.. config:option:: $cfg['RowActionLinks']
-
-    :type: string
-    :default: ``'left'``
-
-    Defines the place where table row links (Edit, Copy, Delete) would be
-    put when tables contents are displayed (you may have them displayed at
-    the left side, right side, both sides or nowhere).
-
-.. config:option:: $cfg['RowActionLinksWithoutUnique']
-
-    :type: boolean
-    :default: false
-
-    Defines whether to show row links (Edit, Copy, Delete) and checkboxes
-    for multiple row operations even when the selection does not have a unique key.
-    Using row actions in the absence of a unique key may result in different/more
-    rows being affected since there is no guaranteed way to select the exact row(s).
-
-.. config:option:: $cfg['RememberSorting']
-
-    :type: boolean
-    :default: true
-
-    If enabled, remember the sorting of each table when browsing them.
-
-.. config:option:: $cfg['TablePrimaryKeyOrder']
-
-    :type: string
-    :default: ``'NONE'``
-
-    This defines the default sort order for the tables, having a primary key,
-    when there is no sort order defines externally.
-    Acceptable values : ['NONE', 'ASC', 'DESC']
-
-.. config:option:: $cfg['ShowBrowseComments']
-
-    :type: boolean
-    :default: true
-
-.. config:option:: $cfg['ShowPropertyComments']
-
-    :type: boolean
-    :default: true
-
-    By setting the corresponding variable to ``true`` you can enable the
-    display of column comments in Browse or Property display. In browse
-    mode, the comments are shown inside the header. In property mode,
-    comments are displayed using a CSS-formatted dashed-line below the
-    name of the column. The comment is shown as a tool-tip for that
-    column.
-
-Text fields
------------
-
-.. config:option:: $cfg['CharEditing']
-
-    :type: string
-    :default: ``'input'``
-
-    Defines which type of editing controls should be used for CHAR and
-    VARCHAR columns. Applies to data editing and also to the default values
-    in structure editing. Possible values are:
-
-    * input - this allows to limit size of text to size of columns in MySQL,
-      but has problems with newlines in columns
-    * textarea - no problems with newlines in columns, but also no length
-      limitations
-
-.. config:option:: $cfg['MinSizeForInputField']
-
-    :type: integer
-    :default: 4
-
-    Defines the minimum size for input fields generated for CHAR and
-    VARCHAR columns.
-
-.. config:option:: $cfg['MaxSizeForInputField']
-
-    :type: integer
-    :default: 60
-
-    Defines the maximum size for input fields generated for CHAR and
-    VARCHAR columns.
-
-.. config:option:: $cfg['TextareaCols']
-
-    :type: integer
-    :default: 40
-
-.. config:option:: $cfg['TextareaRows']
-
-    :type: integer
-    :default: 15
-
-.. config:option:: $cfg['CharTextareaCols']
-
-    :type: integer
-    :default: 40
-
-.. config:option:: $cfg['CharTextareaRows']
-
-    :type: integer
-    :default: 2
-
-    Number of columns and rows for the textareas. This value will be
-    emphasized (\*2) for :term:`SQL` query
-    textareas and (\*1.25) for :term:`SQL`
-    textareas inside the query window.
-
-    The Char\* values are used for CHAR
-    and VARCHAR editing (if configured via :config:option:`$cfg['CharEditing']`).
-
-.. config:option:: $cfg['LongtextDoubleTextarea']
-
-    :type: boolean
-    :default: true
-
-    Defines whether textarea for LONGTEXT columns should have double size.
-
-.. config:option:: $cfg['TextareaAutoSelect']
-
-    :type: boolean
-    :default: false
-
-    Defines if the whole textarea of the query box will be selected on
-    click.
-
-.. config:option:: $cfg['EnableAutocompleteForTablesAndColumns']
-
-    :type: boolean
-    :default: true
-
-    Whether to enable autocomplete for table and column names in any
-    SQL query box.
-
-
-SQL query box settings
-----------------------
-
-.. config:option:: $cfg['SQLQuery']['Edit']
-
-    :type: boolean
-    :default: true
-
-    Whether to display an edit link to change a query in any SQL Query
-    box.
-
-.. config:option:: $cfg['SQLQuery']['Explain']
-
-    :type: boolean
-    :default: true
-
-    Whether to display a link to explain a SELECT query in any SQL Query
-    box.
-
-.. config:option:: $cfg['SQLQuery']['ShowAsPHP']
-
-    :type: boolean
-    :default: true
-
-    Whether to display a link to wrap a query in PHP code in any SQL Query
-    box.
-
-.. config:option:: $cfg['SQLQuery']['Refresh']
-
-    :type: boolean
-    :default: true
-
-    Whether to display a link to refresh a query in any SQL Query box.
-
-.. _web-dirs:
-
-Web server upload/save/import directories
------------------------------------------
-
-If PHP is running in safe mode, all directories must be owned by the same user
-as the owner of the phpMyAdmin scripts.
-
-If the directory where phpMyAdmin is installed is subject to an
-``open_basedir`` restriction, you need to create a temporary directory in some
-directory accessible by the PHP interpreter.
-
-For security reasons, all directories should be outside the tree published by
-webserver. If you cannot avoid having this directory published by webserver,
-limit access to it either by web server configuration (for example using
-.htaccess or web.config files) or place at least an empty :file:`index.html`
-file there, so that directory listing is not possible. However as long as the
-directory is accessible by web server, an attacker can guess filenames to download
-the files.
-
-.. config:option:: $cfg['UploadDir']
-
-    :type: string
-    :default: ``''``
-
-    The name of the directory where :term:`SQL` files have been uploaded by
-    other means than phpMyAdmin (for example, ftp). Those files are available
-    under a drop-down box when you click the database or table name, then the
-    Import tab.
-
-    If
-    you want different directory for each user, %u will be replaced with
-    username.
-
-    Please note that the file names must have the suffix ".sql"
-    (or ".sql.bz2" or ".sql.gz" if support for compressed formats is
-    enabled).
-
-    This feature is useful when your file is too big to be
-    uploaded via :term:`HTTP`, or when file
-    uploads are disabled in PHP.
-
-    .. warning::
-
-        Please see top of this chapter (:ref:`web-dirs`) for instructions how
-        to setup this directory and how to make its usage secure.
-
-    .. seealso::
-
-        See :ref:`faq1_16` for alternatives.
-
-.. config:option:: $cfg['SaveDir']
-
-    :type: string
-    :default: ``''``
-
-    The name of the directory where dumps can be saved.
-
-    If you want different directory for each user, %u will be replaced with
-    username.
-
-    Please note that the directory must exist and has to be writable for
-    the user running webserver.
-
-    .. warning::
-
-        Please see top of this chapter (:ref:`web-dirs`) for instructions how
-        to setup this directory and how to make its usage secure.
-
-.. config:option:: $cfg['TempDir']
-
-    :type: string
-    :default: ``''``
-
-    The name of the directory where temporary files can be stored.
-
-    This is needed for importing ESRI Shapefiles, see :ref:`faq6_30` and to
-    work around limitations of ``open_basedir`` for uploaded files, see
-    :ref:`faq1_11`.
-
-    This directory should have as strict permissions as possible as the only
-    user required to access this directory is the one who runs the webserver.
-    If you have root privileges, simply make this user owner of this directory
-    and make it accessible only by it:
-
-    .. code-block:: sh
-
-        chown www-data:www-data tmp
-        chmod 700 tmp
-
-    If you cannot change owner of the directory, you can achieve a similar
-    setup using :term:`ACL`:
-
-    .. code-block:: sh
-
-        chmod 700 tmp
-        setfacl -m "g:www-data:rwx" tmp
-        setfacl -d -m "g:www-data:rwx" tmp
-
-    If neither of above works for you, you can still make the directory
-    :command:`chmod 777`, but it might impose risk of other users on system
-    reading and writing data in this directory.
-
-    .. warning::
-
-        Please see top of this chapter (:ref:`web-dirs`) for instructions how
-        to setup this directory and how to make its usage secure.
-
-Various display setting
------------------------
-
-.. config:option:: $cfg['RepeatCells']
-
-    :type: integer
-    :default: 100
-
-    Repeat the headers every X cells, or 0 to deactivate.
-
-.. config:option:: $cfg['QueryHistoryDB']
-
-    :type: boolean
-    :default: false
-
-.. config:option:: $cfg['QueryHistoryMax']
-
-    :type: integer
-    :default: 25
-
-    If :config:option:`$cfg['QueryHistoryDB']` is set to ``true``, all your
-    Queries are logged to a table, which has to be created by you (see
-    :config:option:`$cfg['Servers'][$i]['history']`). If set to false, all your
-    queries will be appended to the form, but only as long as your window is
-    opened they remain saved.
-
-    When using the JavaScript based query window, it will always get updated
-    when you click on a new table/db to browse and will focus if you click on
-    :guilabel:`Edit SQL` after using a query. You can suppress updating the
-    query window by checking the box :guilabel:`Do not overwrite this query
-    from outside the window` below the query textarea. Then you can browse
-    tables/databases in the background without losing the contents of the
-    textarea, so this is especially useful when composing a query with tables
-    you first have to look in. The checkbox will get automatically checked
-    whenever you change the contents of the textarea. Please uncheck the button
-    whenever you definitely want the query window to get updated even though
-    you have made alterations.
-
-    If :config:option:`$cfg['QueryHistoryDB']` is set to ``true`` you can
-    specify the amount of saved history items using
-    :config:option:`$cfg['QueryHistoryMax']`.
-
-.. config:option:: $cfg['BrowseMIME']
-
-    :type: boolean
-    :default: true
-
-    Enable :ref:`transformations`.
-
-.. config:option:: $cfg['MaxExactCount']
-
-    :type: integer
-    :default: 500000
-
-    For InnoDB tables, determines for how large tables phpMyAdmin should
-    get the exact row count using ``SELECT COUNT``. If the approximate row
-    count as returned by ``SHOW TABLE STATUS`` is smaller than this value,
-    ``SELECT COUNT`` will be used, otherwise the approximate count will be
-    used.
-
-.. config:option:: $cfg['MaxExactCountViews']
-
-    :type: integer
-    :default: 0
-
-    For VIEWs, since obtaining the exact count could have an impact on
-    performance, this value is the maximum to be displayed, using a
-    ``SELECT COUNT ... LIMIT``. Setting this to 0 bypasses any row
-    counting.
-
-.. config:option:: $cfg['NaturalOrder']
-
-    :type: boolean
-    :default: true
-
-    Sorts database and table names according to natural order (for
-    example, t1, t2, t10). Currently implemented in the navigation panel
-    and in Database view, for the table list.
-
-.. config:option:: $cfg['InitialSlidersState']
-
-    :type: string
-    :default: ``'closed'``
-
-    If set to ``'closed'``, the visual sliders are initially in a closed
-    state. A value of ``'open'`` does the reverse. To completely disable
-    all visual sliders, use ``'disabled'``.
-
-.. config:option:: $cfg['UserprefsDisallow']
-
-    :type: array
-    :default: array()
-
-    Contains names of configuration options (keys in ``$cfg`` array) that
-    users can't set through user preferences. For possible values, refer
-    to :file:`libraries/config/user_preferences.forms.php`.
-
-.. config:option:: $cfg['UserprefsDeveloperTab']
-
-    :type: boolean
-    :default: false
-
-    Activates in the user preferences a tab containing options for
-    developers of phpMyAdmin.
-
-Page titles
------------
-
-.. config:option:: $cfg['TitleTable']
-
-    :type: string
-    :default: ``'@HTTP_HOST@ / @VSERVER@ / @DATABASE@ / @TABLE@ | @PHPMYADMIN@'``
-
-.. config:option:: $cfg['TitleDatabase']
-
-    :type: string
-    :default: ``'@HTTP_HOST@ / @VSERVER@ / @DATABASE@ | @PHPMYADMIN@'``
-
-.. config:option:: $cfg['TitleServer']
-
-    :type: string
-    :default: ``'@HTTP_HOST@ / @VSERVER@ | @PHPMYADMIN@'``
-
-.. config:option:: $cfg['TitleDefault']
-
-    :type: string
-    :default: ``'@HTTP_HOST@ | @PHPMYADMIN@'``
-
-    Allows you to specify window's title bar. You can use :ref:`faq6_27`.
-
-Theme manager settings
-----------------------
-
-.. config:option:: $cfg['ThemePath']
-
-    :type: string
-    :default: ``'./themes'``
-
-    If theme manager is active, use this as the path of the subdirectory
-    containing all the themes.
-
-.. config:option:: $cfg['ThemeManager']
-
-    :type: boolean
-    :default: true
-
-    Enables user-selectable themes. See :ref:`faqthemes`.
-
-.. config:option:: $cfg['ThemeDefault']
-
-    :type: string
-    :default: ``'pmahomme'``
-
-    The default theme (a subdirectory under :config:option:`$cfg['ThemePath']`).
-
-.. config:option:: $cfg['ThemePerServer']
-
-    :type: boolean
-    :default: false
-
-    Whether to allow different theme for each server.
-
-Default queries
----------------
-
-.. config:option:: $cfg['DefaultQueryTable']
-
-    :type: string
-    :default: ``'SELECT * FROM @TABLE@ WHERE 1'``
-
-.. config:option:: $cfg['DefaultQueryDatabase']
-
-    :type: string
-    :default: ``''``
-
-    Default queries that will be displayed in query boxes when user didn't
-    specify any. You can use standard :ref:`faq6_27`.
-
-
-MySQL settings
---------------
-
-.. config:option:: $cfg['DefaultFunctions']
-
-    :type: array
-    :default: array(...)
-
-    Functions selected by default when inserting/changing row, Functions
-    are defined for meta types as (FUNC\_NUMBER, FUNC\_DATE, FUNC\_CHAR,
-    FUNC\_SPATIAL, FUNC\_UUID) and for ``first_timestamp``, which is used
-    for first timestamp column in table.
-
-
-Developer
----------
-
-.. warning::
-
-    These settings might have huge effect on performance or security.
-
-.. config:option:: $cfg['DBG']
-
-    :type: array
-    :default: array(...)
-
-.. config:option:: $cfg['DBG']['sql']
-
-    :type: boolean
-    :default: false
-
-    Enable logging queries and execution times to be
-    displayed in the console's Debug SQL tab.
-
-.. config:option:: $cfg['DBG']['demo']
-
-    :type: boolean
-    :default: false
-
-    Enable to let server present itself as demo server.
-    This is used for <https://demo.phpmyadmin.net/>.
-
-
-Examples
---------
-
-See following configuration snippets for usual setups of phpMyAdmin.
-
-.. _example-google-ssl:
-
-Google Cloud SQL with SSL
-+++++++++++++++++++++++++
-
-To connect to Google Could SQL, you currently need to disable certificate
-verification. This is caused by the certficate being issued for CN matching
-your instance name, but you connect to an IP address and PHP tries to match
-these two. With verfication you end up with error message like::
-
-    Peer certificate CN=`api-project-851612429544:pmatest' did not match expected CN=`8.8.8.8'
-
-.. warning::
-
-    With disabled verification your traffic is encrypted, but you're open to
-    man in the middle attacks.
-
-To connect phpMyAdmin to Google Cloud SQL using SSL download the client and
-server certificates and tell phpMyAdmin to use them:
-
-.. code-block:: php
-
-    // IP address of your instance
-    $cfg['Servers'][2]['host'] = '8.8.8.8';
-    // Use SSL for connection
-    $cfg['Servers'][$i]['ssl'] = true;
-    // Client secret key
-    $cfg['Servers'][$i]['ssl_key'] = '../client-key.pem';
-    // Client certificate
-    $cfg['Servers'][$i]['ssl_cert'] = '../client-cert.pem';
-    // Server certification authority
-    $cfg['Servers'][$i]['ssl_ca'] = '../server-ca.pem';
-    // Disable SSL verification (see above note)
-    $cfg['Servers'][$i]['ssl_verify'] = false;
-
-.. seealso::
-
-    :config:option:`$cfg['Servers'][$i]['ssl']`,
-    :config:option:`$cfg['Servers'][$i]['ssl_key']`,
-    :config:option:`$cfg['Servers'][$i]['ssl_cert']`,
-    :config:option:`$cfg['Servers'][$i]['ssl_ca']`,
-    :config:option:`$cfg['Servers'][$i]['ssl_verify']`
diff --git a/#pma/doc/copyright.rst b/#pma/doc/copyright.rst
deleted file mode 100644
index 28f42e6d..00000000
--- a/#pma/doc/copyright.rst
+++ /dev/null
@@ -1,49 +0,0 @@
-.. _copyright:
-
-Copyright
-=========
-
-.. code-block:: none
-
-    Copyright (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com>
-    Copyright (C) 2001-2014 Marc Delisle <marc_at_infomarc.info>
-        Olivier Müller <om_at_omnis.ch>
-        Robin Johnson <robbat2_at_users.sourceforge.net>
-        Alexander M. Turek <me_at_derrabus.de>
-        Michal Čihař <michal_at_cihar.com>
-        Garvin Hicking <me_at_supergarv.de>
-        Michael Keck <mkkeck_at_users.sourceforge.net>
-        Sebastian Mendel <cybot_tm_at_users.sourceforge.net>
-        [check credits for more details]
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License version 2, as
-published by the Free Software Foundation.
-
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-Third party licenses
-++++++++++++++++++++
-
-phpMyAdmin includes several third party libraries which come under their
-respective licenses.
-
-jQuery's license, which is where we got the files under js/jquery/ is
-(MIT|GPL), a copy of each license is available in this repository (GPL
-is available as LICENSE, MIT as js/jquery/MIT-LICENSE.txt).
-
-TCPDF which is located under libraries/tcpdf is released under GPL
-version 3 and the license is available as libraries/tcpdf/LICENSE.TXT.
-
-DejaVu fonts which are located under libraries/tcpdf/fonts/ and their
-license is documented in
-libraries/tcpdf/fonts/dejavu-fonts-ttf-2.33/LICENSE.
-
-PHP-gettext which is located under libraries/php-gettext/ is released
-under GPL version 2 license which is available in the LICENSE file.
diff --git a/#pma/doc/credits.rst b/#pma/doc/credits.rst
deleted file mode 100644
index fed0fd6e..00000000
--- a/#pma/doc/credits.rst
+++ /dev/null
@@ -1,1111 +0,0 @@
-.. _credits:
-
-Credits
-=======
-
-
-Credits, in chronological order
-+++++++++++++++++++++++++++++++
-
-* Tobias Ratschiller <tobias\_at\_ratschiller.com>
-
-  * creator of the phpmyadmin project
-
-  * maintainer from 1998 to summer 2000
-
-* Marc Delisle <marc\_at\_infomarc.info>
-
-  * multi-language version in December 1998
-
-  * various fixes and improvements
-
-  * :term:`SQL` analyser (most of it)
-
-  * current project maintainer
-
-  * maintains content on our website
-
-* Olivier Müller <om\_at\_omnis.ch>
-
-  * started SourceForge phpMyAdmin project in March 2001
-
-  * sync'ed different existing CVS trees with new features and bugfixes
-
-  * multi-language improvements, dynamic language selection
-
-  * many bugfixes and improvements
-
-* Loïc Chapeaux <lolo\_at\_phpheaven.net>
-
-  * rewrote and optimized JavaScript, DHTML and DOM stuff
-
-  * rewrote the scripts so they fit the :term:`PEAR` coding standards and
-    generate XHTML1.0 and CSS2 compliant codes
-
-  * improved the language detection system
-
-  * many bugfixes and improvements
-
-* Robin Johnson <robbat2\_at\_users.sourceforge.net>
-
-  * database maintenance controls
-
-  * table type code
-
-  * Host authentication :term:`IP` Allow/Deny
-
-  * DB-based configuration (Not completed)
-
-  * :term:`SQL` parser and pretty-printer
-
-  * :term:`SQL` validator
-
-  * many bugfixes and improvements
-
-* Armel Fauveau <armel.fauveau\_at\_globalis-ms.com>
-
-  * bookmarks feature
-
-  * multiple dump feature
-
-  * gzip dump feature
-
-  * zip dump feature
-
-* Geert Lund <glund\_at\_silversoft.dk>
-
-  * various fixes
-
-  * moderator of the phpMyAdmin former users forum at phpwizard.net
-
-* Korakot Chaovavanich <korakot\_at\_iname.com>
-
-  * "insert as new row" feature
-
-* Pete Kelly <webmaster\_at\_trafficg.com>
-
-  * rewrote and fix dump code
-
-  * bugfixes
-
-* Steve Alberty <alberty\_at\_neptunlabs.de>
-
-  * rewrote dump code for PHP4
-
-  * mySQL table statistics
-
-  * bugfixes
-
-* Benjamin Gandon <gandon\_at\_isia.cma.fr>
-
-  * main author of the version 2.1.0.1
-
-  * bugfixes
-
-* Alexander M. Turek <me\_at\_derrabus.de>
-
-  * MySQL 4.0 / 4.1 / 5.0 compatibility
-
-  * abstract database interface (PMA\_DBI) with MySQLi support
-
-  * privileges administration
-
-  * :term:`XML` exports
-
-  * various features and fixes
-
-  * German language file updates
-
-* Mike Beck <mike.beck\_at\_web.de>
-
-  * automatic joins in QBE
-
-  * links column in printview
-
-  * Relation view
-
-* Michal Čihař <michal\_at\_cihar.com>
-
-  * enhanced index creation/display feature
-
-  * feature to use a different charset for HTML than for MySQL
-
-  * improvements of export feature
-
-  * various features and fixes
-
-  * Czech language file updates
-
-  * created current website for phpMyAdmin
-
-* Christophe Gesché from the "MySQL Form Generator for PHPMyAdmin"
-  (https://sourceforge.net/projects/phpmysqlformgen/)
-
-  * suggested the patch for multiple table printviews
-
-* Garvin Hicking <me\_at\_supergarv.de>
-
-  * built the patch for vertical display of table rows
-
-  * built the Javascript based Query window + :term:`SQL` history
-
-  * Improvement of column/db comments
-
-  * (MIME)-Transformations for columns
-
-  * Use custom alias names for Databases in left frame
-
-  * hierarchical/nested table display
-
-  * :term:`PDF`-scratchboard for WYSIWYG-
-    distribution of :term:`PDF` relations
-
-  * new icon sets
-
-  * vertical display of column properties page
-
-  * some bugfixes, features, support, German language additions
-
-* Yukihiro Kawada <kawada\_at\_den.fujifilm.co.jp>
-
-  * japanese kanji encoding conversion feature
-
-* Piotr Roszatycki <d3xter\_at\_users.sourceforge.net> and Dan Wilson
-
-  * the Cookie authentication mode
-
-* Axel Sander <n8falke\_at\_users.sourceforge.net>
-
-  * table relation-links feature
-
-* Maxime Delorme <delorme.maxime\_at\_free.fr>
-
-  * :term:`PDF` schema output, thanks also to
-    Olivier Plathey for the "FPDF" library (see <http://www.fpdf.org/>), Steven
-    Wittens for the "UFPDF" library and
-    Nicola Asuni for the "TCPDF" library (see <https://tcpdf.org/>).
-
-* Olof Edlund <olof.edlund\_at\_upright.se>
-
-  * :term:`SQL` validator server
-
-* Ivan R. Lanin <ivanlanin\_at\_users.sourceforge.net>
-
-  * phpMyAdmin logo (until June 2004)
-
-* Mike Cochrane <mike\_at\_graftonhall.co.nz>
-
-  * blowfish library from the Horde project (withdrawn in release 4.0)
-
-* Marcel Tschopp <ne0x\_at\_users.sourceforge.net>
-
-  * mysqli support
-
-  * many bugfixes and improvements
-
-* Nicola Asuni (Tecnick.com)
-
-  * TCPDF library (<https://tcpdf.org>)
-
-* Michael Keck <mkkeck\_at\_users.sourceforge.net>
-
-  * redesign for 2.6.0
-
-  * phpMyAdmin sailboat logo (June 2004)
-
-* Mathias Landhäußer
-
-  * Representation at conferences
-
-* Sebastian Mendel <cybot\_tm\_at\_users.sourceforge.net>
-
-  * interface improvements
-
-  * various bugfixes
-
-* Ivan A Kirillov
-
-  * new relations Designer
-
-* Raj Kissu Rajandran (Google Summer of Code 2008)
-
-  * BLOBstreaming support (withdrawn in release 4.0)
-
-* Piotr Przybylski (Google Summer of Code 2008, 2010 and 2011)
-
-  * improved setup script
-
-  * user preferences
-
-  * Drizzle support
-
-* Derek Schaefer (Google Summer of Code 2009)
-
-  * Improved the import system
-
-* Alexander Rutkowski (Google Summer of Code 2009)
-
-  * Tracking mechanism
-
-* Zahra Naeem (Google Summer of Code 2009)
-
-  * Synchronization feature (removed in release 4.0)
-
-* Tomáš Srnka (Google Summer of Code 2009)
-
-  * Replication support
-
-* Muhammad Adnan (Google Summer of Code 2010)
-
-  * Relation schema export to multiple formats
-
-* Lori Lee (Google Summer of Code 2010)
-
-  * User interface improvements
-
-  * ENUM/SET editor
-
-  * Simplified interface for export/import
-
-* Ninad Pundalik (Google Summer of Code 2010)
-
-  * AJAXifying the interface
-
-* Martynas Mickevičius (Google Summer of Code 2010)
-
-  * Charts
-
-* Barrie Leslie
-
-  * BLOBstreaming support with PBMS PHP extension (withdrawn in release
-    4.0)
-
-* Ankit Gupta (Google Summer of Code 2010)
-
-  * Visual query builder
-
-* Madhura Jayaratne (Google Summer of Code 2011)
-
-  * OpenGIS support
-
-* Ammar Yasir (Google Summer of Code 2011)
-
-  * Zoom search
-
-* Aris Feryanto (Google Summer of Code 2011)
-
-  * Browse-mode improvements
-
-* Thilanka Kaushalya (Google Summer of Code 2011)
-
-  * AJAXification
-
-* Tyron Madlener (Google Summer of Code 2011)
-
-  * Query statistics and charts for the status page
-
-* Zarubin Stas (Google Summer of Code 2011)
-
-  * Automated testing
-
-* Rouslan Placella (Google Summer of Code 2011 and 2012)
-
-  * Improved support for Stored Routines, Triggers and Events
-
-  * Italian translation updates
-
-  * Removal of frames, new navigation
-
-* Dieter Adriaenssens
-
-  * Various bugfixes
-
-  * Dutch translation updates
-
-* Alex Marin (Google Summer of Code 2012)
-
-  * New plugins and properties system
-
-* Thilina Buddika Abeyrathna (Google Summer of Code 2012)
-
-  * Refactoring
-
-* Atul Pratap Singh  (Google Summer of Code 2012)
-
-  * Refactoring
-
-* Chanaka Indrajith (Google Summer of Code 2012)
-
-  * Refactoring
-
-* Yasitha Pandithawatta (Google Summer of Code 2012)
-
-  * Automated testing
-
-* Jim Wigginton (phpseclib.sourceforge.net)
-
-  * phpseclib
-
-* Bin Zu (Google Summer of Code 2013)
-
-  * Refactoring
-
-* Supun Nakandala (Google Summer of Code 2013)
-
-  * Refactoring
-
-* Mohamed Ashraf (Google Summer of Code 2013)
-
-  * AJAX error reporting
-
-* Adam Kang (Google Summer of Code 2013)
-
-  * Automated testing
-
-* Ayush Chaudhary (Google Summer of Code 2013)
-
-  * Automated testing
-
-* Kasun Chathuranga (Google Summer of Code 2013)
-
-  * Interface improvements
-
-* Hugues Peccatte
-
-  * Load/save query by example (database search bookmarks)
-
-* Smita Kumari (Google Summer of Code 2014)
-
-  * Central list of columns
-
-  * Improve table structure (normalization)
-
-* Ashutosh Dhundhara (Google Summer of Code 2014)
-
-  * Interface improvements
-
-* Dhananjay Nakrani (Google Summer of Code 2014)
-
-  * PHP error reporting
-
-* Edward Cheng (Google Summer of Code 2014)
-
-  * SQL Query Console
-
-* Kankanamge Bimal Yashodha (Google Summer of Code 2014)
-
-  * Refactoring: Designer/schema integration
-
-* Chirayu Chiripal (Google Summer of Code 2014)
-
-  * Custom field handlers (Input based MIME transformations)
-
-  * Export with table/column name changes
-
-* Dan Ungureanu (Google Summer of Code 2015)
-
-  * New parser and analyzer
-
-* Nisarg Jhaveri (Google Summer of Code 2015)
-
-  * Page-related settings
-
-  * SQL debugging integration to the Console
-
-  * Other UI improvements
-
-* Deven Bansod (Google Summer of Code 2015)
-
-  * Print view using CSS
-
-  * Other UI improvements and new features
-
-And also to the following people who have contributed minor changes,
-enhancements, bugfixes or support for a new language since version
-2.1.0:
-
-Bora Alioglu, Ricardo ?, Sven-Erik Andersen, Alessandro Astarita,
-Péter Bakondy, Borges Botelho, Olivier Bussier, Neil Darlow, Mats
-Engstrom, Ian Davidson, Laurent Dhima, Kristof Hamann, Thomas Kläger,
-Lubos Klokner, Martin Marconcini, Girish Nair, David Nordenberg,
-Andreas Pauley, Bernard M. Piller, Laurent Haas, "Sakamoto", Yuval
-Sarna, www.securereality.com.au, Alexis Soulard, Alvar Soome, Siu Sun,
-Peter Svec, Michael Tacelosky, Rachim Tamsjadi, Kositer Uros, Luís V.,
-Martijn W. van der Lee, Algis Vainauskas, Daniel Villanueva, Vinay,
-Ignacio Vazquez-Abrams, Chee Wai, Jakub Wilk, Thomas Michael
-Winningham, Vilius Zigmantas, "Manuzhai".
-
-
-Translators
-+++++++++++
-
-Following people have contributed to translation of phpMyAdmin:
-
-
-
-* Albanian
-
-    * Arben Çokaj <acokaj\_at\_shkoder.net>
-
-
-* Arabic
-
-    * Ahmed Saleh Abd El-Raouf Ismae <a.saleh.ismael\_at\_gmail.com>
-    * Ahmed Saad <egbrave\_at\_hotmail.com>
-    * hassan mokhtari <persiste1\_at\_gmail.com>
-
-
-* Armenian
-
-    * Andrey Aleksanyants <aaleksanyants\_at\_yahoo.com>
-
-
-* Azerbaijani
-
-    * Mircəlal <01youknowme\_at\_gmail.com>
-    * Huseyn <huseyn_esgerov\_at\_mail.ru>
-    * Sevdimali İsa <sevdimaliisayev\_at\_mail.ru>
-    * Jafar <sharifov\_at\_programmer.net>
-
-
-* Belarusian
-
-    * Viktar Palstsiuk <vipals\_at\_gmail.com>
-
-
-* Bulgarian
-
-    * Boyan Kehayov <bkehayov\_at\_gmail.com>
-    * Valter Georgiev <blagynchy\_at\_gmail.com>
-    * Valentin Mladenov <hudsonvsm\_at\_gmail.com>
-    * P <plamen_mbx\_at\_yahoo.com>
-    * krasimir <vip\_at\_krasio-valia.com>
-
-
-* Catalan
-
-    * josep constanti <jconstanti\_at\_yahoo.es>
-    * Xavier Navarro <xvnavarro\_at\_gmail.com>
-
-
-* Chinese (China)
-
-    * Vincent Lau <3092849\_at\_qq.com>
-    * Zheng Dan <clanboy\_at\_163.com>
-    * disorderman <disorderman\_at\_qq.com>
-    * Rex Lee <duguying2008\_at\_gmail.com>
-    *  <fundawang\_at\_gmail.com>
-    * popcorner <memoword\_at\_163.com>
-    * Yizhou Qiang <qyz.yswy\_at\_hotmail.com>
-    * zz <tczzjin\_at\_gmail.com>
-    * Terry Weng <wengshiyu\_at\_gmail.com>
-    * whh <whhlcj\_at\_126.com>
-
-
-* Chinese (Taiwan)
-
-    * Albert Song <albb0920\_at\_gmail.com>
-    * Chien Wei Lin <cwlin0416\_at\_gmail.com>
-    * LNDDYL <lnddyl\_at\_outlook.com>
-    * Peter Dave Hello <xs910203\_at\_gmail.com>
-
-
-* Colognian
-
-    * Purodha <publi\_at\_web.de>
-
-
-* Czech
-
-    * Aleš Hakl <ales\_at\_hakl.net>
-    * Dalibor Straka <dalibor.straka3\_at\_gmail.com>
-    * Martin Vidner <martin\_at\_vidner.net>
-    * Ondra Šimeček <ondrasek.simecek\_at\_gmail.com>
-    * Jan Palider <palider\_at\_seznam.cz>
-    * Petr Kateřiňák <petr.katerinak\_at\_gmail.com>
-
-
-* Danish
-
-    * Aputsiaĸ Niels Janussen <aj\_at\_isit.gl>
-    * Dennis Jakobsen <dennis.jakobsen\_at\_gmail.com>
-    * Jonas <jonas.den.smarte\_at\_gmail.com>
-    * Claus Svalekjaer <just.my.smtp.server\_at\_gmail.com>
-
-
-* Dutch
-
-    * A. Voogt <a.voogt\_at\_hccnet.nl>
-    * dingo thirteen <dingo13\_at\_gmail.com>
-    * Robin van der Vliet <info\_at\_robinvandervliet.nl>
-    * Dieter Adriaenssens <ruleant\_at\_users.sourceforge.net>
-    * Niko Strijbol <strijbol.niko\_at\_gmail.com>
-
-
-* English (United Kingdom)
-
-    * Dries Verschuere <dries.verschuere\_at\_outlook.com>
-    * Francisco Rocha <j.francisco.o.rocha\_at\_zoho.com>
-    * Marc Delisle <marc\_at\_infomarc.info>
-    * Marek Tomaštík <tomastik.m\_at\_gmail.com>
-
-
-* Esperanto
-
-    * Eliovir <eliovir\_at\_gmail.com>
-    * Robin van der Vliet <info\_at\_robinvandervliet.nl>
-
-
-* Estonian
-
-    * Kristjan Räts <kristjanrats\_at\_gmail.com>
-
-
-* Finnish
-
-    * Juha <jremes\_at\_outlook.com>
-    * Lari Oesch <lari\_at\_oesch.me>
-
-
-* French
-
-    * Marc Delisle <marc\_at\_infomarc.info>
-
-
-* Frisian
-
-    * Robin van der Vliet <info\_at\_robinvandervliet.nl>
-
-
-* Galician
-
-    * Xosé Calvo <xosecalvo\_at\_gmail.com>
-
-
-* German
-
-    * Julian Ladisch <github.com-t3if\_at\_ladisch.de>
-    * Jan Erik Zassenhaus <jan.zassenhaus\_at\_jgerman.de>
-    * Lasse Goericke <lasse\_at\_mydom.de>
-    * Matthias Bluthardt <matthias\_at\_bluthardt.org>
-    * Michael Koch <michael.koch\_at\_enough.de>
-    * Ann + J.M. <phpMyAdmin\_at\_ZweiSteinSoft.de>
-    *  <pma\_at\_sebastianmendel.de>
-    * Phillip Rohmberger <rohmberger\_at\_hotmail.de>
-    * Hauke Henningsen <sqrt\_at\_entless.org>
-
-
-* Greek
-
-    * Παναγιώτης Παπάζογλου <papaz_p\_at\_yahoo.com>
-
-
-* Hebrew
-
-    * Moshe Harush <mmh15\_at\_windowslive.com>
-    * Yaron Shahrabani <sh.yaron\_at\_gmail.com>
-    * Eyal Visoker <visokereyal\_at\_gmail.com>
-
-
-* Hindi
-
-    * Atul Pratap Singh <atulpratapsingh05\_at\_gmail.com>
-    * Yogeshwar <charanyogeshwar\_at\_gmail.com>
-    * Deven Bansod <devenbansod.bits\_at\_gmail.com>
-    * Kushagra Pandey <kushagra4296\_at\_gmail.com>
-    * Nisarg Jhaveri <nisargjhaveri\_at\_gmail.com>
-    * Roohan Kazi <roohan_cena\_at\_yahoo.co.in>
-    * Yugal Pantola <yug.scorpio\_at\_gmail.com>
-
-
-* Hungarian
-
-    * Akos Eros <erosakos02\_at\_gmail.com>
-    * Dániel Tóth <leedermeister\_at\_gmail.com>
-    * Szász Attila <undernetangel\_at\_gmail.com>
-    * Balázs Úr <urbalazs\_at\_gmail.com>
-
-
-* Indonesian
-
-    * Deky Arifianto <Deky40\_at\_gmail.com>
-    * Andika Triwidada <andika\_at\_gmail.com>
-    * Dadan Setia <da2n_s\_at\_yahoo.co.id>
-    * Dadan Setia <dadan.setia\_at\_gmail.com>
-    * Yohanes Edwin <edwin\_at\_yohanesedwin.com>
-    * Fadhiil Rachman <fadhiilrachman\_at\_gmail.com>
-    * Benny <tarzq28\_at\_gmail.com>
-    * Tommy Surbakti <tommy\_at\_surbakti.net>
-    * Zufar Fathi Suhardi <zufar.bogor\_at\_gmail.com>
-
-
-* Interlingua
-
-    * Giovanni Sora <g.sora\_at\_tiscali.it>
-
-
-* Italian
-
-    * Francesco Saverio Giacobazzi <francesco.giacobazzi\_at\_ferrania.it>
-    * Marco Pozzato <ironpotts\_at\_gmail.com>
-    * Stefano Martinelli <stefano.ste.martinelli\_at\_gmail.com>
-
-
-* Japanese
-
-    * k725 <alexalex.kobayashi\_at\_gmail.com>
-    * Hiroshi Chiyokawa <hiroshi.chiyokawa\_at\_gmail.com>
-    * Masahiko HISAKAWA <orzkun\_at\_ageage.jp>
-    * worldwideskier <worldwideskier\_at\_yahoo.co.jp>
-
-
-* Kannada
-
-    * Robin van der Vliet <info\_at\_robinvandervliet.nl>
-    * Shameem Ahmed A Mulla <shameem.sam\_at\_gmail.com>
-
-
-* Korean
-
-    * Bumsoo Kim <bskim45\_at\_gmail.com>
-    * Kyeong Su Shin <cdac1234\_at\_gmail.com>
-    * Dongyoung Kim <dckyoung\_at\_gmail.com>
-    * Myung-han Yu <greatymh\_at\_gmail.com>
-    * JongDeok <human.zion\_at\_gmail.com>
-    * Yong Kim <kim\_at\_nhn.com>
-    * 이경준 <kyungjun2\_at\_gmail.com>
-    * Seongki Shin <skshin\_at\_gmail.com>
-    * Yoon Bum-Jong <virusyoon\_at\_gmail.com>
-    * Koo Youngmin <youngminz.kr\_at\_gmail.com>
-
-
-* Kurdish Sorani
-
-    * Alan Hilal <alan.hilal94\_at\_gmail.com>
-    * Aso Naderi <aso.naderi\_at\_gmail.com>
-    * muhammad <esy_vb\_at\_yahoo.com>
-    * Zrng Abdulla <zhyarabdulla94\_at\_gmail.com>
-
-
-* Latvian
-
-    * Latvian TV <dnighttv\_at\_gmail.com>
-    * Edgars Neimanis <edgarsneims5092\_at\_inbox.lv>
-    * Ukko <perkontevs\_at\_gmail.com>
-
-
-* Limburgish
-
-    * Robin van der Vliet <info\_at\_robinvandervliet.nl>
-
-
-* Lithuanian
-
-    * Vytautas Motuzas <v.motuzas\_at\_gmail.com>
-
-
-* Malay
-
-    * Amir Hamzah <amir.overlord666\_at\_gmail.com>
-    * diprofinfiniti <anonynuine-999\_at\_yahoo.com>
-
-
-* Nepali
-
-    * Nabin Ghimire <nnabinn\_at\_hotmail.com>
-
-
-* Norwegian Bokmål
-
-    * Børge Holm-Wennberg <borge947\_at\_gmail.com>
-    * Tor Stokkan <danorse\_at\_gmail.com>
-    * Espen Frøyshov <efroys\_at\_gmail.com>
-    * Kurt Eilertsen <kurt\_at\_kheds.com>
-    * Christoffer Haugom <ph3n1x.nobody\_at\_gmail.com>
-    * Sebastian <sebastian\_at\_sgundersen.com>
-    * Tomas <tomas\_at\_tomasruud.com>
-
-
-* Persian
-
-    * ashkan shirian <ashkan.shirian\_at\_gmail.com>
-    * HM <goodlinuxuser\_at\_chmail.ir>
-
-
-* Polish
-
-    * Andrzej <andrzej\_at\_kynu.pl>
-    * Przemo <info\_at\_opsbielany.waw.pl>
-    * Krystian Biesaga <krystian4842\_at\_gmail.com>
-    * Maciej Gryniuk <maciejka45\_at\_gmail.com>
-    * Michał VonFlynee <vonflynee\_at\_gmail.com>
-
-
-* Portuguese
-
-    * Alexandre Badalo <alexandre.badalo\_at\_sapo.pt>
-    * João Rodrigues <geral\_at\_jonilive.com>
-    * Pedro Ribeiro <p.m42.ribeiro\_at\_gmail.com>
-    * Sandro Amaral <sandro123iv\_at\_gmail.com>
-
-
-* Portuguese (Brazil)
-
-    * Alex Rohleder <alexrohleder96\_at\_outlook.com>
-    * bruno mendax <brunomendax\_at\_gmail.com>
-    * Danilo GUia <danilo.eng\_at\_globomail.com>
-    * Douglas Rafael Morais Kollar <douglas.kollar\_at\_pg.df.gov.br>
-    * Douglas Eccker <douglaseccker\_at\_hotmail.com>
-    * Ed Jr <edjacobjunior\_at\_gmail.com>
-    * Guilherme Souza Silva <g.szsilva\_at\_gmail.com>
-    * Guilherme Seibt <gui\_at\_webseibt.net>
-    * Helder Santana <helder.bs.santana\_at\_gmail.com>
-    * Junior Zancan <jrzancan\_at\_hotmail.com>
-    * Luis <luis.eduardo.braschi\_at\_outlook.com>
-    * Marcos Algeri <malgeri\_at\_gmail.com>
-    * Marc Delisle <marc\_at\_infomarc.info>
-    * Renato Rodrigues de Lima Júnio <renatomdd\_at\_yahoo.com.br>
-    * Thiago Casotti <thiago.casotti\_at\_uol.com.br>
-    * Victor Laureano <victor.laureano\_at\_gmail.com>
-    * Vinícius Araújo <vinipitta\_at\_gmail.com>
-    * Washington Bruno Rodrigues Cav <washingtonbruno\_at\_msn.com>
-    * Yan Gabriel <yansilvagabriel\_at\_gmail.com>
-
-
-* Punjabi
-
-    * Robin van der Vliet <info\_at\_robinvandervliet.nl>
-
-
-* Romanian
-
-    * Alex <amihaita\_at\_yahoo.com>
-    * Costel Cocerhan <costa1988sv\_at\_gmail.com>
-    * Ion Adrian-Ionut <john\_at\_panevo.ro>
-    * Raul Molnar <molnar.raul\_at\_wservices.eu>
-    * Deleted User <noreply\_at\_weblate.org>
-    * Stefan Murariu <stefan.murariu\_at\_yahoo.com>
-
-
-* Russian
-
-    * Andrey Aleksanyants <aaleksanyants\_at\_yahoo.com>
-    *  <ddrmoscow\_at\_gmail.com>
-    * Robin van der Vliet <info\_at\_robinvandervliet.nl>
-    * Хомутов Иван Сергеевич <khomutov.ivan\_at\_mail.ru>
-    * Alexey Rubinov <orion1979\_at\_yandex.ru>
-    * Олег Карпов <salvadoporjc\_at\_gmail.com>
-    * Egorov Artyom <unlucky\_at\_inbox.ru>
-
-
-* Serbian
-
-    * Smart Kid <kidsmart33\_at\_gmail.com>
-
-
-* Sinhala
-
-    * Madhura Jayaratne <madhura.cj\_at\_gmail.com>
-
-
-* Slovak
-
-    * Martin Lacina <martin\_at\_whistler.sk>
-    * Patrik Kollmann <parkourpotex\_at\_gmail.com>
-    * Jozef Pistej <pistej2\_at\_gmail.com>
-
-
-* Slovenian
-
-    * Domen <mitenem\_at\_outlook.com>
-
-
-* Spanish
-
-    * Luis García Sevillano <floss.dev\_at\_gmail.com>
-    * Franco <fulanodetal.github1\_at\_openaliasbox.org>
-    * Luis Ruiz <luisan00\_at\_hotmail.com>
-    * Macofe <macofe.languagetool\_at\_gmail.com>
-    * Matías Bellone <matiasbellone+weblate\_at\_gmail.com>
-    * Rodrigo A. <ra4\_at\_openmailbox.org>
-    * FAMMA TV NOTICIAS MEDIOS DE CO <revistafammatvmusic.oficial\_at\_gmail.com>
-    * Ronnie Simon <ronniesimonf\_at\_gmail.com>
-
-
-* Swedish
-
-    * Anders Jonsson <anders.jonsson\_at\_norsjovallen.se>
-
-
-* Tamil
-
-    * கணேஷ் குமார் <GANESHTHEONE\_at\_gmail.com>
-    * Achchuthan Yogarajah <achch1990\_at\_gmail.com>
-    * Rifthy Ahmed <rifthy456\_at\_gmail.com>
-
-
-* Thai
-
-    *  <nontawat39\_at\_gmail.com>
-    * Somthanat W. <somthanat\_at\_gmail.com>
-
-
-* Turkish
-
-    * Burak Yavuz <hitowerdigit\_at\_hotmail.com>
-
-
-* Ukrainian
-
-    * Сергій Педько <nitrotoll\_at\_gmail.com>
-    * Igor <vmta\_at\_yahoo.com>
-    * Vitaliy Perekupka <vperekupka\_at\_gmail.com>
-
-
-* Vietnamese
-
-    * Bao Phan <baophan94\_at\_icloud.com>
-    * Xuan Hung <mr.hungdx\_at\_gmail.com>
-    * Bao trinh minh <trinhminhbao\_at\_gmail.com>
-
-
-* West Flemish
-
-    * Robin van der Vliet <info\_at\_robinvandervliet.nl>
-
-Documentation translators
-+++++++++++++++++++++++++
-
-Following people have contributed to translation of phpMyAdmin documentation:
-
-* Albanian
-
-    * Arben Çokaj <acokaj\_at\_shkoder.net>
-
-
-* Arabic
-
-    * Ahmed El Azzabi <ahmedtek1993\_at\_gmail.com>
-    * Omar Essam <omar_2412\_at\_live.com>
-
-
-* Armenian
-
-    * Andrey Aleksanyants <aaleksanyants\_at\_yahoo.com>
-
-
-* Azerbaijani
-
-    * Mircəlal <01youknowme\_at\_gmail.com>
-    * Sevdimali İsa <sevdimaliisayev\_at\_mail.ru>
-
-
-* Catalan
-
-    * josep constanti <jconstanti\_at\_yahoo.es>
-    * Joan Montané <joan\_at\_montane.cat>
-    * Xavier Navarro <xvnavarro\_at\_gmail.com>
-
-
-* Chinese (China)
-
-    * Vincent Lau <3092849\_at\_qq.com>
-    * 罗攀登 <6375lpd\_at\_gmail.com>
-    * disorderman <disorderman\_at\_qq.com>
-    * ITXiaoPang <djh1017555\_at\_126.com>
-    * tunnel213 <tunnel213\_at\_aliyun.com>
-    * Terry Weng <wengshiyu\_at\_gmail.com>
-    * whh <whhlcj\_at\_126.com>
-
-
-* Chinese (Taiwan)
-
-    * Chien Wei Lin <cwlin0416\_at\_gmail.com>
-    * Peter Dave Hello <xs910203\_at\_gmail.com>
-
-
-* Czech
-
-    * Aleš Hakl <ales\_at\_hakl.net>
-    * Michal Čihař <michal\_at\_cihar.com>
-    * Jan Palider <palider\_at\_seznam.cz>
-    * Petr Kateřiňák <petr.katerinak\_at\_gmail.com>
-
-
-* Danish
-
-    * Aputsiaĸ Niels Janussen <aj\_at\_isit.gl>
-    * Claus Svalekjaer <just.my.smtp.server\_at\_gmail.com>
-
-
-* Dutch
-
-    * A. Voogt <a.voogt\_at\_hccnet.nl>
-    * dingo thirteen <dingo13\_at\_gmail.com>
-    * Dries Verschuere <dries.verschuere\_at\_outlook.com>
-    * Robin van der Vliet <info\_at\_robinvandervliet.nl>
-    * Stefan Koolen <nast3zz\_at\_gmail.com>
-    * Ray Borggreve <ray\_at\_datahuis.net>
-    * Dieter Adriaenssens <ruleant\_at\_users.sourceforge.net>
-    * Tom Hofman <tom.hofman\_at\_gmail.com>
-
-
-* Estonian
-
-    * Kristjan Räts <kristjanrats\_at\_gmail.com>
-
-
-* Finnish
-
-    * Juha <jremes\_at\_outlook.com>
-
-
-* French
-
-    * Cédric Corazza <cedric.corazza\_at\_wanadoo.fr>
-    * Étienne Gilli <etienne.gilli\_at\_gmail.com>
-    * Marc Delisle <marc\_at\_infomarc.info>
-    * Donavan_Martin <mart.donavan\_at\_hotmail.com>
-
-
-* Frisian
-
-    * Robin van der Vliet <info\_at\_robinvandervliet.nl>
-
-
-* Galician
-
-    * Xosé Calvo <xosecalvo\_at\_gmail.com>
-
-
-* German
-
-    * Daniel <d.gnauk89\_at\_googlemail.com>
-    * JH M <janhenrikm\_at\_yahoo.de>
-    * Lasse Goericke <lasse\_at\_mydom.de>
-    * Michael Koch <michael.koch\_at\_enough.de>
-    * Ann + J.M. <phpMyAdmin\_at\_ZweiSteinSoft.de>
-    * Niemand Jedermann <predatorix\_at\_web.de>
-    * Phillip Rohmberger <rohmberger\_at\_hotmail.de>
-    * Hauke Henningsen <sqrt\_at\_entless.org>
-
-
-* Greek
-
-    * Παναγιώτης Παπάζογλου <papaz_p\_at\_yahoo.com>
-
-
-* Hungarian
-
-    * Balázs Úr <urbalazs\_at\_gmail.com>
-
-
-* Italian
-
-    * Francesco Saverio Giacobazzi <francesco.giacobazzi\_at\_ferrania.it>
-    * Marco Pozzato <ironpotts\_at\_gmail.com>
-    * Stefano Martinelli <stefano.ste.martinelli\_at\_gmail.com>
-    * TWS <tablettws\_at\_gmail.com>
-
-
-* Japanese
-
-    * Eshin Kunishima <ek\_at\_luna.miko.im>
-    * Hiroshi Chiyokawa <hiroshi.chiyokawa\_at\_gmail.com>
-
-
-* Lithuanian
-
-    * Jur Kis <atvejis\_at\_gmail.com>
-    * Dovydas <dovy.buz\_at\_gmail.com>
-
-
-* Norwegian Bokmål
-
-    * Tor Stokkan <danorse\_at\_gmail.com>
-    * Kurt Eilertsen <kurt\_at\_kheds.com>
-
-
-* Portuguese (Brazil)
-
-    * Alexandre Moretti <alemoretti2010\_at\_hotmail.com>
-    * Douglas Rafael Morais Kollar <douglas.kollar\_at\_pg.df.gov.br>
-    * Guilherme Seibt <gui\_at\_webseibt.net>
-    * Helder Santana <helder.bs.santana\_at\_gmail.com>
-    * Michal Čihař <michal\_at\_cihar.com>
-    * Michel Souza <michel.ekio\_at\_gmail.com>
-    * Danilo Azevedo <mrdaniloazevedo\_at\_gmail.com>
-    * Thiago Casotti <thiago.casotti\_at\_uol.com.br>
-    * Vinícius Araújo <vinipitta\_at\_gmail.com>
-    * Yan Gabriel <yansilvagabriel\_at\_gmail.com>
-
-
-* Slovak
-
-    * Martin Lacina <martin\_at\_whistler.sk>
-    * Michal Čihař <michal\_at\_cihar.com>
-    * Jozef Pistej <pistej2\_at\_gmail.com>
-
-
-* Slovenian
-
-    * Domen <mitenem\_at\_outlook.com>
-
-
-* Spanish
-
-    * Luis García Sevillano <floss.dev\_at\_gmail.com>
-    * Franco <fulanodetal.github1\_at\_openaliasbox.org>
-    * Matías Bellone <matiasbellone+weblate\_at\_gmail.com>
-    * Ronnie Simon <ronniesimonf\_at\_gmail.com>
-
-
-* Turkish
-
-    * Burak Yavuz <hitowerdigit\_at\_hotmail.com>
-
-Original Credits of Version 2.1.0
-+++++++++++++++++++++++++++++++++
-
-This work is based on Peter Kuppelwieser's MySQL-Webadmin. It was his
-idea to create a web-based interface to MySQL using PHP3. Although I
-have not used any of his source-code, there are some concepts I've
-borrowed from him. phpMyAdmin was created because Peter told me he
-wasn't going to further develop his (great) tool.
-
-Thanks go to
-
-* Amalesh Kempf <ak-lsml\_at\_living-source.com> who contributed the
-  code for the check when dropping a table or database. He also
-  suggested that you should be able to specify the primary key on
-  tbl\_create.php3. To version 1.1.1 he contributed the ldi\_\*.php3-set
-  (Import text-files) as well as a bug-report. Plus many smaller
-  improvements.
-* Jan Legenhausen <jan\_at\_nrw.net>: He made many of the changes that
-  were introduced in 1.3.0 (including quite significant ones like the
-  authentication). For 1.4.1 he enhanced the table-dump feature. Plus
-  bug-fixes and help.
-* Marc Delisle <DelislMa\_at\_CollegeSherbrooke.qc.ca> made phpMyAdmin
-  language-independent by outsourcing the strings to a separate file. He
-  also contributed the French translation.
-* Alexandr Bravo <abravo\_at\_hq.admiral.ru> who contributed
-  tbl\_select.php3, a feature to display only some columns from a table.
-* Chris Jackson <chrisj\_at\_ctel.net> added support for MySQL functions
-  in tbl\_change.php3. He also added the "Query by Example" feature in
-  2.0.
-* Dave Walton <walton\_at\_nordicdms.com> added support for multiple
-  servers and is a regular contributor for bug-fixes.
-* Gabriel Ash <ga244\_at\_is8.nyu.edu> contributed the random access
-  features for 2.0.6.
-
-The following people have contributed minor changes, enhancements,
-bugfixes or support for a new language:
-
-Jim Kraai, Jordi Bruguera, Miquel Obrador, Geert Lund, Thomas
-Kleemann, Alexander Leidinger, Kiko Albiol, Daniel C. Chao, Pavel
-Piankov, Sascha Kettler, Joe Pruett, Renato Lins, Mark Kronsbein,
-Jannis Hermanns, G. Wieggers.
-
-And thanks to everyone else who sent me email with suggestions, bug-
-reports and or just some feedback.
-
diff --git a/#pma/doc/developers.rst b/#pma/doc/developers.rst
deleted file mode 100644
index 2b2f5868..00000000
--- a/#pma/doc/developers.rst
+++ /dev/null
@@ -1,12 +0,0 @@
-.. _developers:
-
-Developers Information
-======================
-
-phpMyAdmin is Open Source, so you're invited to contribute to it. Many
-great features have been written by other people and you too can help
-to make phpMyAdmin a useful tool.
-
-You can check out all the possibilities to contribute in the
-`contribute section on our website
-<https://www.phpmyadmin.net/contribute/>`_.
diff --git a/#pma/doc/doctrees/config.doctree b/#pma/doc/doctrees/config.doctree
deleted file mode 100644
index ea4020d0..00000000
Binary files a/#pma/doc/doctrees/config.doctree and /dev/null differ
diff --git a/#pma/doc/doctrees/copyright.doctree b/#pma/doc/doctrees/copyright.doctree
deleted file mode 100644
index cc03a3e0..00000000
Binary files a/#pma/doc/doctrees/copyright.doctree and /dev/null differ
diff --git a/#pma/doc/doctrees/credits.doctree b/#pma/doc/doctrees/credits.doctree
deleted file mode 100644
index df4fca8e..00000000
Binary files a/#pma/doc/doctrees/credits.doctree and /dev/null differ
diff --git a/#pma/doc/doctrees/developers.doctree b/#pma/doc/doctrees/developers.doctree
deleted file mode 100644
index 03c5c299..00000000
Binary files a/#pma/doc/doctrees/developers.doctree and /dev/null differ
diff --git a/#pma/doc/doctrees/environment.pickle b/#pma/doc/doctrees/environment.pickle
deleted file mode 100644
index 71c33ee3..00000000
Binary files a/#pma/doc/doctrees/environment.pickle and /dev/null differ
diff --git a/#pma/doc/doctrees/faq.doctree b/#pma/doc/doctrees/faq.doctree
deleted file mode 100644
index 7d013c8c..00000000
Binary files a/#pma/doc/doctrees/faq.doctree and /dev/null differ
diff --git a/#pma/doc/doctrees/glossary.doctree b/#pma/doc/doctrees/glossary.doctree
deleted file mode 100644
index 51369210..00000000
Binary files a/#pma/doc/doctrees/glossary.doctree and /dev/null differ
diff --git a/#pma/doc/doctrees/import_export.doctree b/#pma/doc/doctrees/import_export.doctree
deleted file mode 100644
index 1ef97361..00000000
Binary files a/#pma/doc/doctrees/import_export.doctree and /dev/null differ
diff --git a/#pma/doc/doctrees/index.doctree b/#pma/doc/doctrees/index.doctree
deleted file mode 100644
index 00734491..00000000
Binary files a/#pma/doc/doctrees/index.doctree and /dev/null differ
diff --git a/#pma/doc/doctrees/intro.doctree b/#pma/doc/doctrees/intro.doctree
deleted file mode 100644
index 5ac503de..00000000
Binary files a/#pma/doc/doctrees/intro.doctree and /dev/null differ
diff --git a/#pma/doc/doctrees/other.doctree b/#pma/doc/doctrees/other.doctree
deleted file mode 100644
index 9045c633..00000000
Binary files a/#pma/doc/doctrees/other.doctree and /dev/null differ
diff --git a/#pma/doc/doctrees/privileges.doctree b/#pma/doc/doctrees/privileges.doctree
deleted file mode 100644
index 01bc7119..00000000
Binary files a/#pma/doc/doctrees/privileges.doctree and /dev/null differ
diff --git a/#pma/doc/doctrees/require.doctree b/#pma/doc/doctrees/require.doctree
deleted file mode 100644
index 776585d8..00000000
Binary files a/#pma/doc/doctrees/require.doctree and /dev/null differ
diff --git a/#pma/doc/doctrees/setup.doctree b/#pma/doc/doctrees/setup.doctree
deleted file mode 100644
index 699d1ddc..00000000
Binary files a/#pma/doc/doctrees/setup.doctree and /dev/null differ
diff --git a/#pma/doc/doctrees/transformations.doctree b/#pma/doc/doctrees/transformations.doctree
deleted file mode 100644
index b929a981..00000000
Binary files a/#pma/doc/doctrees/transformations.doctree and /dev/null differ
diff --git a/#pma/doc/doctrees/user.doctree b/#pma/doc/doctrees/user.doctree
deleted file mode 100644
index b3dd3256..00000000
Binary files a/#pma/doc/doctrees/user.doctree and /dev/null differ
diff --git a/#pma/doc/doctrees/vendors.doctree b/#pma/doc/doctrees/vendors.doctree
deleted file mode 100644
index bdbeae39..00000000
Binary files a/#pma/doc/doctrees/vendors.doctree and /dev/null differ
diff --git a/#pma/doc/faq.rst b/#pma/doc/faq.rst
deleted file mode 100644
index 8acf8440..00000000
--- a/#pma/doc/faq.rst
+++ /dev/null
@@ -1,2220 +0,0 @@
-.. _faq:
-
-FAQ - Frequently Asked Questions
-================================
-
-Please have a look at our `Link section
-<https://www.phpmyadmin.net/docs/>`_ on the official
-phpMyAdmin homepage for in-depth coverage of phpMyAdmin's features and
-or interface.
-
-.. _faqserver:
-
-Server
-++++++
-
-.. _faq1_1:
-
-1.1 My server is crashing each time a specific action is required or phpMyAdmin sends a blank page or a page full of cryptic characters to my browser, what can I do?
----------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-Try to set the :config:option:`$cfg['OBGzip']`  directive to ``false`` in your
-:file:`config.inc.php` file and the ``zlib.output_compression`` directive to
-``Off`` in your php configuration file.
-
-.. _faq1_2:
-
-1.2 My Apache server crashes when using phpMyAdmin.
----------------------------------------------------
-
-You should first try the latest versions of Apache (and possibly MySQL). If
-your server keeps crashing, please ask for help in the various Apache support
-groups.
-
-.. seealso:: :ref:`faq1_1`
-
-.. _faq1_3:
-
-1.3 (withdrawn).
-----------------
-
-.. _faq1_4:
-
-1.4 Using phpMyAdmin on IIS, I'm displayed the error message: "The specified CGI application misbehaved by not returning a complete set of HTTP headers ...".
--------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-You just forgot to read the *install.txt* file from the PHP
-distribution. Have a look at the last message in this `PHP bug report #12061
-<https://bugs.php.net/bug.php?id=12061>`_ from the official PHP bug
-database.
-
-.. _faq1_5:
-
-1.5 Using phpMyAdmin on IIS, I'm facing crashes and/or many error messages with the HTTP.
------------------------------------------------------------------------------------------
-
-This is a known problem with the PHP :term:`ISAPI` filter: it's not so stable.
-Please use instead the cookie authentication mode.
-
-.. _faq1_6:
-
-1.6 I can't use phpMyAdmin on PWS: nothing is displayed!
---------------------------------------------------------
-
-This seems to be a PWS bug. Filippo Simoncini found a workaround (at
-this time there is no better fix): remove or comment the ``DOCTYPE``
-declarations (2 lines) from the scripts :file:`libraries/Header.class.php`
-and :file:`index.php`.
-
-.. _faq1_7:
-
-1.7 How can I GZip a dump or a CSV export? It does not seem to work.
---------------------------------------------------------------------
-
-This feature is based on the ``gzencode()``
-PHP function to be more independent of the platform (Unix/Windows,
-Safe Mode or not, and so on). So, you must have Zlib support
-(``--with-zlib``).
-
-.. _faq1_8:
-
-1.8 I cannot insert a text file in a table, and I get an error about safe mode being in effect.
------------------------------------------------------------------------------------------------
-
-Your uploaded file is saved by PHP in the "upload dir", as defined in
-:file:`php.ini` by the variable ``upload_tmp_dir`` (usually the system
-default is */tmp*). We recommend the following setup for Apache
-servers running in safe mode, to enable uploads of files while being
-reasonably secure:
-
-* create a separate directory for uploads: :command:`mkdir /tmp/php`
-* give ownership to the Apache server's user.group: :command:`chown
-  apache.apache /tmp/php`
-* give proper permission: :command:`chmod 600 /tmp/php`
-* put ``upload_tmp_dir = /tmp/php`` in :file:`php.ini`
-* restart Apache
-
-.. _faq1_9:
-
-1.9 (withdrawn).
-----------------
-
-.. _faq1_10:
-
-1.10 I'm having troubles when uploading files with phpMyAdmin running on a secure server. My browser is Internet Explorer and I'm using the Apache server.
-----------------------------------------------------------------------------------------------------------------------------------------------------------
-
-As suggested by "Rob M" in the phpWizard forum, add this line to your
-*httpd.conf*:
-
-.. code-block:: apache
-
-    SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown
-
-It seems to clear up many problems between Internet Explorer and SSL.
-
-.. _faq1_11:
-
-1.11 I get an 'open\_basedir restriction' while uploading a file from the query box.
-------------------------------------------------------------------------------------
-
-Since version 2.2.4, phpMyAdmin supports servers with open\_basedir
-restrictions. However you need to create temporary directory and configure it
-as :config:option:`$cfg['TempDir']`. The uploaded files will be moved there,
-and after execution of your :term:`SQL` commands, removed.
-
-.. _faq1_12:
-
-1.12 I have lost my MySQL root password, what can I do?
--------------------------------------------------------
-
-The MySQL manual explains how to `reset the permissions
-<https://dev.mysql.com/doc/mysql/en/resetting-permissions.html>`_.
-
-.. _faq1_13:
-
-1.13 (withdrawn).
------------------
-
-.. _faq1_14:
-
-1.14 (withdrawn).
------------------
-
-.. _faq1_15:
-
-1.15 I have problems with *mysql.user* column names.
-----------------------------------------------------
-
-In previous MySQL versions, the ``User`` and ``Password``columns were
-named ``user`` and ``password``. Please modify your column names to
-align with current standards.
-
-.. _faq1_16:
-
-1.16 I cannot upload big dump files (memory, HTTP or timeout problems).
------------------------------------------------------------------------
-
-Starting with version 2.7.0, the import engine has been re–written and
-these problems should not occur. If possible, upgrade your phpMyAdmin
-to the latest version to take advantage of the new import features.
-
-The first things to check (or ask your host provider to check) are the
-values of ``upload_max_filesize``, ``memory_limit`` and
-``post_max_size`` in the :file:`php.ini` configuration file. All of these
-three settings limit the maximum size of data that can be submitted
-and handled by PHP. One user also said that ``post_max_size`` and
-``memory_limit`` need to be larger than ``upload_max_filesize``.
-There exist several workarounds if your upload is too big or your
-hosting provider is unwilling to change the settings:
-
-* Look at the :config:option:`$cfg['UploadDir']` feature. This allows one to upload a file to the server
-  via scp, ftp, or your favorite file transfer method. PhpMyAdmin is
-  then able to import the files from the temporary directory. More
-  information is available in the :ref:`config`  of this document.
-* Using a utility (such as `BigDump
-  <http://www.ozerov.de/bigdump/>`_) to split the files before
-  uploading. We cannot support this or any third party applications, but
-  are aware of users having success with it.
-* If you have shell (command line) access, use MySQL to import the files
-  directly. You can do this by issuing the "source" command from within
-  MySQL:
-
-  .. code-block:: mysql
-
-    source filename.sql;
-
-.. _faq1_17:
-
-1.17 Which Database versions does phpMyAdmin support?
------------------------------------------------------
-
-For `MySQL <https://www.mysql.com/>`_, versions 5.5 and newer are supported. 
-For older MySQL versions, our `Downloads <https://www.phpmyadmin.net/downloads/>`_ page offers older phpMyAdmin versions 
-(which may have become unsupported).
-
-For `MariaDB <https://mariadb.org/>`_, versions 5.5 and newer are supported.
-
-.. _faq1_17a:
-
-1.17a I cannot connect to the MySQL server. It always returns the error message, "Client does not support authentication protocol requested by server; consider upgrading MySQL client"
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-You tried to access MySQL with an old MySQL client library. The
-version of your MySQL client library can be checked in your phpinfo()
-output. In general, it should have at least the same minor version as
-your server - as mentioned in :ref:`faq1_17`. This problem is
-generally caused by using MySQL version 4.1 or newer. MySQL changed
-the authentication hash and your PHP is trying to use the old method.
-The proper solution is to use the `mysqli extension
-<https://www.php.net/mysqli>`_ with the proper client library to match
-your MySQL installation. More
-information (and several workarounds) are located in the `MySQL
-Documentation <https://dev.mysql.com/doc/mysql/en/old-client.html>`_.
-
-.. _faq1_18:
-
-1.18 (withdrawn).
------------------
-
-.. _faq1_19:
-
-1.19 I can't run the "display relations" feature because the script seems not to know the font face I'm using!
---------------------------------------------------------------------------------------------------------------
-
-The :term:`TCPDF` library we're using for this feature requires some special
-files to use font faces. Please refers to the `TCPDF manual
-<https://tcpdf.org/>`_ to build these files.
-
-.. _faqmysql:
-
-1.20 I receive an error about missing mysqli and mysql extensions.
-------------------------------------------------------------------
-
-To connect to a MySQL server, PHP needs a set of MySQL functions
-called "MySQL extension". This extension may be part of the PHP
-distribution (compiled-in), otherwise it needs to be loaded
-dynamically. Its name is probably *mysqli.so* or *php\_mysqli.dll*.
-phpMyAdmin tried to load the extension but failed. Usually, the
-problem is solved by installing a software package called "PHP-MySQL"
-or something similar.
-
-There are currently two interfaces PHP provides as MySQL extensions - ``mysql``
-and ``mysqli``. The ``mysqli`` is tried first, because it's the best one.
-
-.. _faq1_21:
-
-1.21 I am running the CGI version of PHP under Unix, and I cannot log in using cookie auth.
--------------------------------------------------------------------------------------------
-
-In :file:`php.ini`, set ``mysql.max_links`` higher than 1.
-
-.. _faq1_22:
-
-1.22 I don't see the "Location of text file" field, so I cannot upload.
------------------------------------------------------------------------
-
-This is most likely because in :file:`php.ini`, your ``file_uploads``
-parameter is not set to "on".
-
-.. _faq1_23:
-
-1.23 I'm running MySQL on a Win32 machine. Each time I create a new table the table and column names are changed to lowercase!
-------------------------------------------------------------------------------------------------------------------------------
-
-This happens because the MySQL directive ``lower_case_table_names``
-defaults to 1 (``ON``) in the Win32 version of MySQL. You can change
-this behavior by simply changing the directive to 0 (``OFF``): Just
-edit your ``my.ini`` file that should be located in your Windows
-directory and add the following line to the group [mysqld]:
-
-.. code-block:: ini
-
-    set-variable = lower_case_table_names=0
-
-Next, save the file and restart the MySQL service. You can always
-check the value of this directive using the query
-
-.. code-block:: mysql
-
-    SHOW VARIABLES LIKE 'lower_case_table_names';
-
-.. _faq1_24:
-
-1.24 (withdrawn).
------------------
-
-.. _faq1_25:
-
-1.25 I am running Apache with mod\_gzip-1.3.26.1a on Windows XP, and I get problems, such as undefined variables when I run a SQL query.
-----------------------------------------------------------------------------------------------------------------------------------------
-
-A tip from Jose Fandos: put a comment on the following two lines in
-httpd.conf, like this:
-
-.. code-block:: apache
-
-
-    # mod_gzip_item_include file \.php$
-    # mod_gzip_item_include mime "application/x-httpd-php.*"
-
-as this version of mod\_gzip on Apache (Windows) has problems handling
-PHP scripts. Of course you have to restart Apache.
-
-.. _faq1_26:
-
-1.26 I just installed phpMyAdmin in my document root of IIS but I get the error "No input file specified" when trying to run phpMyAdmin.
-----------------------------------------------------------------------------------------------------------------------------------------
-
-This is a permission problem. Right-click on the phpmyadmin folder and
-choose properties. Under the tab Security, click on "Add" and select
-the user "IUSR\_machine" from the list. Now set his permissions and it
-should work.
-
-.. _faq1_27:
-
-1.27 I get empty page when I want to view huge page (eg. db\_structure.php with plenty of tables).
---------------------------------------------------------------------------------------------------
-
-This was caused by a `PHP bug <https://bugs.php.net/21079>`_ that occur when
-GZIP output buffering is enabled. If you turn off it (by
-:config:option:`$cfg['OBGzip']` in :file:`config.inc.php`), it should work.
-This bug will has been fixed in PHP 5.0.0.
-
-.. _faq1_28:
-
-1.28 My MySQL server sometimes refuses queries and returns the message 'Errorcode: 13'. What does this mean?
-------------------------------------------------------------------------------------------------------------
-
-This can happen due to a MySQL bug when having database / table names
-with upper case characters although ``lower_case_table_names`` is
-set to 1. To fix this, turn off this directive, convert all database
-and table names to lower case and turn it on again. Alternatively,
-there's a bug-fix available starting with MySQL 3.23.56 /
-4.0.11-gamma.
-
-.. _faq1_29:
-
-1.29 When I create a table or modify a column, I get an error and the columns are duplicated.
----------------------------------------------------------------------------------------------
-
-It is possible to configure Apache in such a way that PHP has problems
-interpreting .php files.
-
-The problems occur when two different (and conflicting) set of
-directives are used:
-
-.. code-block:: apache
-
-
-    SetOutputFilter PHP
-    SetInputFilter PHP
-
-and
-
-.. code-block:: apache
-
-    AddType application/x-httpd-php .php
-
-In the case we saw, one set of directives was in
-``/etc/httpd/conf/httpd.conf``, while the other set was in
-``/etc/httpd/conf/addon-modules/php.conf``. The recommended way is
-with ``AddType``, so just comment out the first set of lines and
-restart Apache:
-
-.. code-block:: apache
-
-
-    #SetOutputFilter PHP
-    #SetInputFilter PHP
-
-.. _faq1_30:
-
-1.30 I get the error "navigation.php: Missing hash".
-----------------------------------------------------
-
-This problem is known to happen when the server is running Turck
-MMCache but upgrading MMCache to version 2.3.21 solves the problem.
-
-.. _faq1_31:
-
-1.31 Does phpMyAdmin support PHP 5?
------------------------------------
-
-Yes.
-
-Since release 4.5, phpMyAdmin supports only PHP 5.5 and newer. Since release 4.1 phpMyAdmin supports only PHP 5.3 and newer. For PHP 5.2 you can use 4.0.x releases.
-
-.. _faq1_32:
-
-1.32 Can I use HTTP authentication with IIS?
---------------------------------------------
-
-Yes. This procedure was tested with phpMyAdmin 2.6.1, PHP 4.3.9 in
-:term:`ISAPI` mode under :term:`IIS` 5.1.
-
-#. In your :file:`php.ini` file, set ``cgi.rfc2616_headers = 0``
-#. In ``Web Site Properties -> File/Directory Security -> Anonymous
-   Access`` dialog box, check the ``Anonymous access`` checkbox and
-   uncheck any other checkboxes (i.e. uncheck ``Basic authentication``,
-   ``Integrated Windows authentication``, and ``Digest`` if it's
-   enabled.) Click ``OK``.
-#. In ``Custom Errors``, select the range of ``401;1`` through ``401;5``
-   and click the ``Set to Default`` button.
-
-.. seealso:: :rfc:`2616`
-
-.. _faq1_33:
-
-1.33 (withdrawn).
------------------
-
-.. _faq1_34:
-
-1.34 Can I access directly to database or table pages?
-------------------------------------------------------
-
-Yes. Out of the box, you can use :term:`URL` like
-https://example.com/phpMyAdmin/index.php?server=X&db=database&table=table&target=script.
-For ``server`` you use the server number
-which refers to the order of the server paragraph in
-:file:`config.inc.php`. Table and script parts are optional. If you want
-https://example.com/phpMyAdmin/database[/table][/script] :term:`URL`, you need to do some configuration. Following
-lines apply only for `Apache <https://httpd.apache.org/>`_ web server.
-First make sure, that you have enabled some features within global
-configuration. You need ``Options SymLinksIfOwnerMatch`` and ``AllowOverride
-FileInfo`` enabled for directory where phpMyAdmin is installed and you
-need mod\_rewrite to be enabled. Then you just need to create
-following :term:`.htaccess` file in root folder of phpMyAdmin installation (don't
-forget to change directory name inside of it):
-
-.. code-block:: apache
-
-
-    RewriteEngine On
-    RewriteBase /path_to_phpMyAdmin
-    RewriteRule ^([a-zA-Z0-9_]+)/([a-zA-Z0-9_]+)/([a-z_]+\.php)$ index.php?db=$1&table=$2&target=$3 [R]
-    RewriteRule ^([a-zA-Z0-9_]+)/([a-z_]+\.php)$ index.php?db=$1&target=$2 [R]
-    RewriteRule ^([a-zA-Z0-9_]+)/([a-zA-Z0-9_]+)$ index.php?db=$1&table=$2 [R]
-    RewriteRule ^([a-zA-Z0-9_]+)$ index.php?db=$1 [R]
-
-.. _faq1_35:
-
-1.35 Can I use HTTP authentication with Apache CGI?
----------------------------------------------------
-
-Yes. However you need to pass authentication variable to :term:`CGI` using
-following rewrite rule:
-
-.. code-block:: apache
-
-
-    RewriteEngine On
-    RewriteRule .* - [E=REMOTE_USER:%{HTTP:Authorization},L]
-
-.. _faq1_36:
-
-1.36 I get an error "500 Internal Server Error".
-------------------------------------------------
-
-There can be many explanations to this and a look at your server's
-error log file might give a clue.
-
-.. _faq1_37:
-
-1.37 I run phpMyAdmin on cluster of different machines and password encryption in cookie auth doesn't work.
------------------------------------------------------------------------------------------------------------
-
-If your cluster consist of different architectures, PHP code used for
-encryption/decryption won't work correct. This is caused by use of
-pack/unpack functions in code. Only solution is to use mcrypt
-extension which works fine in this case.
-
-.. _faq1_38:
-
-1.38 Can I use phpMyAdmin on a server on which Suhosin is enabled?
-------------------------------------------------------------------
-
-Yes but the default configuration values of Suhosin are known to cause
-problems with some operations, for example editing a table with many
-columns and no primary key or with textual primary key.
-
-Suhosin configuration might lead to malfunction in some cases and it
-can not be fully avoided as phpMyAdmin is kind of application which
-needs to transfer big amounts of columns in single HTTP request, what
-is something what Suhosin tries to prevent. Generally all
-``suhosin.request.*``, ``suhosin.post.*`` and ``suhosin.get.*``
-directives can have negative effect on phpMyAdmin usability. You can
-always find in your error logs which limit did cause dropping of
-variable, so you can diagnose the problem and adjust matching
-configuration variable.
-
-The default values for most Suhosin configuration options will work in
-most scenarios, however you might want to adjust at least following
-parameters:
-
-* `suhosin.request.max\_vars <http://www.hardened-
-  php.net/suhosin/configuration.html#suhosin.request.max_vars>`_ should
-  be increased (eg. 2048)
-* `suhosin.post.max\_vars <http://www.hardened-
-  php.net/suhosin/configuration.html#suhosin.post.max_vars>`_ should be
-  increased (eg. 2048)
-* `suhosin.request.max\_array\_index\_length <http://www.hardened-php.ne
-  t/suhosin/configuration.html#suhosin.request.max_array_index_length>`_
-  should be increased (eg. 256)
-* `suhosin.post.max\_array\_index\_length <http://www.hardened-php.net/s
-  uhosin/configuration.html#suhosin.post.max_array_index_length>`_
-  should be increased (eg. 256)
-* `suhosin.request.max\_totalname\_length <http://www.hardened-php.net/s
-  uhosin/configuration.html#suhosin.request.max_totalname_length>`_
-  should be increased (eg. 8192)
-* `suhosin.post.max\_totalname\_length <http://www.hardened-php.net/suho
-  sin/configuration.html#suhosin.post.max_totalname_length>`_ should be
-  increased (eg. 8192)
-* `suhosin.get.max\_value\_length <http://www.hardened-
-  php.net/suhosin/configuration.html#suhosin.get.max_value_length>`_
-  should be increased (eg. 1024)
-* `suhosin.sql.bailout\_on\_error <http://www.hardened-
-  php.net/suhosin/configuration.html#suhosin.sql.bailout_on_error>`_
-  needs to be disabled (the default)
-* `suhosin.log.\* <http://www.hardened-
-  php.net/suhosin/configuration.html#logging_configuration>`_ should not
-  include :term:`SQL`, otherwise you get big
-  slowdown
-
-You can also disable the warning using the :config:option:`$cfg['SuhosinDisableWarning']`.
-
-.. _faq1_39:
-
-1.39 When I try to connect via https, I can log in, but then my connection is redirected back to http. What can cause this behavior?
-------------------------------------------------------------------------------------------------------------------------------------
-
-Be sure that you have enabled ``SSLOptions`` and ``StdEnvVars`` in
-your Apache configuration.
-
-.. seealso:: <http://httpd.apache.org/docs/2.0/mod/mod_ssl.html#ssloptions>
-
-.. _faq1_40:
-
-1.40 When accessing phpMyAdmin via an Apache reverse proxy, cookie login does not work.
----------------------------------------------------------------------------------------
-
-To be able to use cookie auth Apache must know that it has to rewrite
-the set-cookie headers. Example from the Apache 2.2 documentation:
-
-.. code-block:: apache
-
-
-    ProxyPass /mirror/foo/ http://backend.example.com/
-    ProxyPassReverse /mirror/foo/ http://backend.example.com/
-    ProxyPassReverseCookieDomain backend.example.com public.example.com
-    ProxyPassReverseCookiePath / /mirror/foo/
-
-Note: if the backend url looks like https://example.com/~user/phpmyadmin, the
-tilde (~) must be url encoded as %7E in the ProxyPassReverse\* lines.
-This is not specific to phpmyadmin, it's just the behavior of Apache.
-
-.. code-block:: apache
-
-
-    ProxyPass /mirror/foo/ http://backend.example.com/~user/phpmyadmin
-    ProxyPassReverse /mirror/foo/ http://backend.example.com/%7Euser/phpmyadmin
-    ProxyPassReverseCookiePath /%7Euser/phpmyadmin /mirror/foo
-
-.. seealso:: <https://httpd.apache.org/docs/2.2/mod/mod_proxy.html>, :config:option:`$cfg['PmaAbsoluteUri']`
-
-.. _faq1_41:
-
-1.41 When I view a database and ask to see its privileges, I get an error about an unknown column.
---------------------------------------------------------------------------------------------------
-
-The MySQL server's privilege tables are not up to date, you need to
-run the :command:`mysql_upgrade` command on the server.
-
-.. _faq1_42:
-
-1.42 How can I prevent robots from accessing phpMyAdmin?
---------------------------------------------------------
-
-You can add various rules to :term:`.htaccess` to filter access based on user agent
-field. This is quite easy to circumvent, but could prevent at least
-some robots accessing your installation.
-
-.. code-block:: apache
-
-
-    RewriteEngine on
-
-    # Allow only GET and POST verbs
-    RewriteCond %{REQUEST_METHOD} !^(GET|POST)$ [NC,OR]
-
-    # Ban Typical Vulnerability Scanners and others
-    # Kick out Script Kiddies
-    RewriteCond %{HTTP_USER_AGENT} ^(java|curl|wget).* [NC,OR]
-    RewriteCond %{HTTP_USER_AGENT} ^.*(libwww-perl|curl|wget|python|nikto|wkito|pikto|scan|acunetix).* [NC,OR]
-    RewriteCond %{HTTP_USER_AGENT} ^.*(winhttp|HTTrack|clshttp|archiver|loader|email|harvest|extract|grab|miner).* [NC,OR]
-
-    # Ban Search Engines, Crawlers to your administrative panel
-    # No reasons to access from bots
-    # Ultimately Better than the useless robots.txt
-    # Did google respect robots.txt?
-    # Try google: intitle:phpMyAdmin intext:"Welcome to phpMyAdmin *.*.*" intext:"Log in" -wiki -forum -forums -questions intext:"Cookies must be enabled"
-    RewriteCond %{HTTP_USER_AGENT} ^.*(AdsBot-Google|ia_archiver|Scooter|Ask.Jeeves|Baiduspider|Exabot|FAST.Enterprise.Crawler|FAST-WebCrawler|www\.neomo\.de|Gigabot|Mediapartners-Google|Google.Desktop|Feedfetcher-Google|Googlebot|heise-IT-Markt-Crawler|heritrix|ibm.com\cs/crawler|ICCrawler|ichiro|MJ12bot|MetagerBot|msnbot-NewsBlogs|msnbot|msnbot-media|NG-Search|lucene.apache.org|NutchCVS|OmniExplorer_Bot|online.link.validator|psbot0|Seekbot|Sensis.Web.Crawler|SEO.search.Crawler|Seoma.\[SEO.Crawler\]|SEOsearch|Snappy|www.urltrends.com|www.tkl.iis.u-tokyo.ac.jp/~crawler|SynooBot|crawleradmin.t-info@telekom.de|TurnitinBot|voyager|W3.SiteSearch.Crawler|W3C-checklink|W3C_Validator|www.WISEnutbot.com|yacybot|Yahoo-MMCrawler|Yahoo\!.DE.Slurp|Yahoo\!.Slurp|YahooSeeker).* [NC]
-    RewriteRule .* - [F]
-
-.. _faq1_43:
-
-1.43 Why can't I display the structure of my table containing hundreds of columns?
-----------------------------------------------------------------------------------
-
-Because your PHP's ``memory_limit`` is too low; adjust it in :file:`php.ini`.
-
-.. _faq1:44:
-
-1.44 How can I reduce the installed size of phpMyAdmin on disk?
----------------------------------------------------------------
-
-Some users have requested to be able to reduce the size of the phpMyAdmin installation.
-This is not recommended and could lead to confusion over missing features, but can be done.
-A list of files and corresponding functionality which degrade gracefully when removed include:
-
-* :file:`./libraries/tcpdf` folder (exporting to PDF)
-* :file:`./locale/` folder, or unused subfolders (interface translations)
-* Any unused themes in :file:`./themes/`
-* :file:`./js/jquery/src/` (included for licensing reasons)
-* :file:`./js/line_counts.php`
-* :file:`./doc/` (documentation)
-* :file:`./setup/` (setup script)
-* :file:`./examples/`
-* :file:`./sql/` (SQL scripts to configure advanced functionality)
-
-.. _faqconfig:
-
-Configuration
-+++++++++++++
-
-.. _faq2_1:
-
-2.1 The error message "Warning: Cannot add header information - headers already sent by ..." is displayed, what's the problem?
-------------------------------------------------------------------------------------------------------------------------------
-
-Edit your :file:`config.inc.php` file and ensure there is nothing (I.E. no
-blank lines, no spaces, no characters...) neither before the ``<?php`` tag at
-the beginning, neither after the ``?>`` tag at the end. We also got a report
-from a user under :term:`IIS`, that used a zipped distribution kit: the file
-:file:`libraries/Config.class.php` contained an end-of-line character (hex 0A)
-at the end; removing this character cleared his errors.
-
-.. _faq2_2:
-
-2.2 phpMyAdmin can't connect to MySQL. What's wrong?
-----------------------------------------------------
-
-Either there is an error with your PHP setup or your username/password
-is wrong. Try to make a small script which uses mysql\_connect and see
-if it works. If it doesn't, it may be you haven't even compiled MySQL
-support into PHP.
-
-.. _faq2_3:
-
-2.3 The error message "Warning: MySQL Connection Failed: Can't connect to local MySQL server through socket '/tmp/mysql.sock' (111) ..." is displayed. What can I do?
----------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-For RedHat users, Harald Legner suggests this on the mailing list:
-
-On my RedHat-Box the socket of MySQL is */var/lib/mysql/mysql.sock*.
-In your :file:`php.ini` you will find a line
-
-.. code-block:: ini
-
-    mysql.default_socket = /tmp/mysql.sock
-
-change it to
-
-.. code-block:: ini
-
-    mysql.default_socket = /var/lib/mysql/mysql.sock
-
-Then restart apache and it will work.
-
-Here is a fix suggested by Brad Ummer:
-
-* First, you need to determine what socket is being used by MySQL. To do
-  this, telnet to your server and go to the MySQL bin directory. In this
-  directory there should be a file named *mysqladmin*. Type
-  ``./mysqladmin variables``, and this should give you a bunch of info
-  about your MySQL server, including the socket (*/tmp/mysql.sock*, for
-  example).
-* Then, you need to tell PHP to use this socket. To do this in
-  phpMyAdmin, you need to complete the socket information in the
-  :file:`config.inc.php`. For example:
-  :config:option:`$cfg['Servers'][$i]['socket']`  Please also make sure that
-  the permissions of this file allow to be readable by your webserver (i.e.
-  '0755').
-
-Have also a look at the `corresponding section of the MySQL
-documentation <https://dev.mysql.com/doc/en/can-not-connect-to-
-server.html>`_.
-
-.. _faq2_4:
-
-2.4 Nothing is displayed by my browser when I try to run phpMyAdmin, what can I do?
------------------------------------------------------------------------------------
-
-Try to set the :config:option:`$cfg['OBGzip']` directive to ``false`` in the phpMyAdmin configuration
-file. It helps sometime. Also have a look at your PHP version number:
-if it contains "b" or "alpha" it means you're running a testing
-version of PHP. That's not a so good idea, please upgrade to a plain
-revision.
-
-.. _faq2_5:
-
-2.5 Each time I want to insert or change a row or drop a database or a table, an error 404 (page not found) is displayed or, with HTTP or cookie authentication, I'm asked to log in again. What's wrong?
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-Check your webserver setup if it correctly fills in either PHP_SELF or REQUEST_URI variables.
-
-If you are running phpMyAdmin behind reverse proxy, please set the
-:config:option:`$cfg['PmaAbsoluteUri']` directive in the phpMyAdmin
-configuration file to match your setup.
-
-.. _faq2_6:
-
-2.6 I get an "Access denied for user: 'root@localhost' (Using password: YES)"-error when trying to access a MySQL-Server on a host which is port-forwarded for my localhost.
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-When you are using a port on your localhost, which you redirect via
-port-forwarding to another host, MySQL is not resolving the localhost
-as expected. Erik Wasser explains: The solution is: if your host is
-"localhost" MySQL (the command line tool :command:`mysql` as well) always
-tries to use the socket connection for speeding up things. And that
-doesn't work in this configuration with port forwarding. If you enter
-"127.0.0.1" as hostname, everything is right and MySQL uses the
-:term:`TCP` connection.
-
-.. _faqthemes:
-
-2.7 Using and creating themes
------------------------------
-
-Themes are configured with :config:option:`$cfg['ThemePath']`,
-:config:option:`$cfg['ThemeManager']` and :config:option:`$cfg['ThemeDefault']`.
-Under :config:option:`$cfg['ThemePath']`, you should not delete the
-directory ``pmahomme`` or its underlying structure, because this is the
-system theme used by phpMyAdmin. ``pmahomme`` contains all images and
-styles, for backwards compatibility and for all themes that would not
-include images or css-files.  If :config:option:`$cfg['ThemeManager']`
-is enabled, you can select your favorite theme on the main page. Your selected
-theme will be stored in a cookie.
-
-To create a theme:
-
-* make a new subdirectory (for example "your\_theme\_name") under :config:option:`$cfg['ThemePath']` (by
-  default ``themes``)
-* copy the files and directories from ``pmahomme`` to "your\_theme\_name"
-* edit the css-files in "your\_theme\_name/css"
-* put your new images in "your\_theme\_name/img"
-* edit :file:`layout.inc.php` in "your\_theme\_name"
-* edit :file:`info.inc.php` in "your\_theme\_name" to contain your chosen
-  theme name, that will be visible in user interface
-* make a new screenshot of your theme and save it under
-  "your\_theme\_name/screen.png"
-
-In theme directory there is file :file:`info.inc.php` which contains theme
-verbose name, theme generation and theme version. These versions and
-generations are enumerated from 1 and do not have any direct
-dependence on phpMyAdmin version. Themes within same generation should
-be backwards compatible - theme with version 2 should work in
-phpMyAdmin requiring version 1. Themes with different generation are
-incompatible.
-
-If you do not want to use your own symbols and buttons, remove the
-directory "img" in "your\_theme\_name". phpMyAdmin will use the
-default icons and buttons (from the system-theme ``pmahomme``).
-
-.. _faqmissingparameters:
-
-2.8 I get "Missing parameters" errors, what can I do?
------------------------------------------------------
-
-Here are a few points to check:
-
-* In :file:`config.inc.php`, try to leave the :config:option:`$cfg['PmaAbsoluteUri']` directive empty. See also
-  :ref:`faq4_7`.
-* Maybe you have a broken PHP installation or you need to upgrade your
-  Zend Optimizer. See <https://bugs.php.net/bug.php?id=31134>.
-* If you are using Hardened PHP with the ini directive
-  ``varfilter.max_request_variables`` set to the default (200) or
-  another low value, you could get this error if your table has a high
-  number of columns. Adjust this setting accordingly. (Thanks to Klaus
-  Dorninger for the hint).
-* In the :file:`php.ini` directive ``arg_separator.input``, a value of ";"
-  will cause this error. Replace it with "&;".
-* If you are using `Hardened-PHP <http://www.hardened-php.net/>`_, you
-  might want to increase `request limits <http://www.hardened-
-  php.net/hphp/troubleshooting.html>`_.
-* The directory specified in the :file:`php.ini` directive
-  ``session.save_path`` does not exist or is read-only.
-
-.. _faq2_9:
-
-2.9 Seeing an upload progress bar
----------------------------------
-
-To be able to see a progress bar during your uploads, your server must
-have the `APC <https://php.net/manual/en/book.apc.php>`_ extension, the
-`uploadprogress <https://pecl.php.net/package/uploadprogress>`_ one, or
-you must be running PHP 5.4.0 or higher. Moreover, the JSON extension
-has to be enabled in your PHP.
-
-If using APC, you must set ``apc.rfc1867`` to ``on`` in your :file:`php.ini`.
-
-If using PHP 5.4.0 or higher, you must set
-``session.upload_progress.enabled`` to ``1`` in your :file:`php.ini`. However,
-starting from phpMyAdmin version 4.0.4, session-based upload progress has
-been temporarily deactivated due to its problematic behavior.
-
-.. seealso:: :rfc:`1867`
-
-.. _faqlimitations:
-
-Known limitations
-+++++++++++++++++
-
-.. _login_bug:
-
-3.1 When using HTTP authentication, a user who logged out can not log in again in with the same nick.
------------------------------------------------------------------------------------------------------
-
-This is related to the authentication mechanism (protocol) used by
-phpMyAdmin. To bypass this problem: just close all the opened browser
-windows and then go back to phpMyAdmin. You should be able to log in
-again.
-
-.. _faq3_2:
-
-3.2 When dumping a large table in compressed mode, I get a memory limit error or a time limit error.
-----------------------------------------------------------------------------------------------------
-
-Compressed dumps are built in memory and because of this are limited
-to php's memory limit. For GZip/BZip2 exports this can be overcome
-since 2.5.4 using :config:option:`$cfg['CompressOnFly']` (enabled by default).
-Zip exports can not be handled this way, so if you need Zip files for larger
-dump, you have to use another way.
-
-.. _faq3_3:
-
-3.3 With InnoDB tables, I lose foreign key relationships when I rename a table or a column.
--------------------------------------------------------------------------------------------
-
-This is an InnoDB bug, see <https://bugs.mysql.com/bug.php?id=21704>.
-
-.. _faq3_4:
-
-3.4 I am unable to import dumps I created with the mysqldump tool bundled with the MySQL server distribution.
--------------------------------------------------------------------------------------------------------------
-
-The problem is that older versions of ``mysqldump`` created invalid
-comments like this:
-
-.. code-block:: mysql
-
-
-    -- MySQL dump 8.22
-    --
-    -- Host: localhost Database: database
-    ---------------------------------------------------------
-    -- Server version 3.23.54
-
-The invalid part of the code is the horizontal line made of dashes
-that appears once in every dump created with mysqldump. If you want to
-run your dump you have to turn it into valid MySQL. This means, you
-have to add a whitespace after the first two dashes of the line or add
-a # before it:  ``-- -------------------------------------------------------`` or
-``#---------------------------------------------------------``
-
-.. _faq3_5:
-
-3.5 When using nested folders, multiple hierarchies are displayed in a wrong manner.
-------------------------------------------------------------------------------------
-
-Please note that you should not use the separating string multiple
-times without any characters between them, or at the beginning/end of
-your table name. If you have to, think about using another
-TableSeparator or disabling that feature.
-
-.. seealso:: :config:option:`$cfg['NavigationTreeTableSeparator']`
-
-.. _faq3_6:
-
-3.6 (withdrawn).
------------------
-
-.. _faq3_7:
-
-3.7 I have table with many (100+) columns and when I try to browse table I get series of errors like "Warning: unable to parse url". How can this be fixed?
------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-Your table neither have a primary key nor an unique one, so we must
-use a long expression to identify this row. This causes problems to
-parse\_url function. The workaround is to create a primary or unique
-key.
-
-.. _faq3_8:
-
-3.8 I cannot use (clickable) HTML-forms in columns where I put a MIME-Transformation onto!
-------------------------------------------------------------------------------------------
-
-Due to a surrounding form-container (for multi-row delete checkboxes),
-no nested forms can be put inside the table where phpMyAdmin displays
-the results. You can, however, use any form inside of a table if keep
-the parent form-container with the target to tbl\_row\_delete.php and
-just put your own input-elements inside. If you use a custom submit
-input field, the form will submit itself to the displaying page again,
-where you can validate the $HTTP\_POST\_VARS in a transformation. For
-a tutorial on how to effectively use transformations, see our `Link
-section <https://www.phpmyadmin.net/docs/>`_ on the
-official phpMyAdmin-homepage.
-
-.. _faq3_9:
-
-3.9 I get error messages when using "--sql\_mode=ANSI" for the MySQL server.
-----------------------------------------------------------------------------
-
-When MySQL is running in ANSI-compatibility mode, there are some major
-differences in how :term:`SQL` is structured (see
-<https://dev.mysql.com/doc/refman/5.7/en/sql-mode.html#sqlmode_ansi>). Most important of all, the
-quote-character (") is interpreted as an identifier quote character and not as
-a string quote character, which makes many internal phpMyAdmin operations into
-invalid :term:`SQL` statements. There is no
-workaround to this behaviour.  News to this item will be posted in `Bug report
-#1013 <https://sourceforge.net/p/phpmyadmin/bugs/1013/>`_.
-
-.. _faq3_10:
-
-3.10 Homonyms and no primary key: When the results of a SELECT display more that one column with the same value (for example ``SELECT lastname from employees where firstname like 'A%'`` and two "Smith" values are displayed), if I click Edit I cannot be sure that I am editing the intended row.
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-Please make sure that your table has a primary key, so that phpMyAdmin
-can use it for the Edit and Delete links.
-
-.. _faq3_11:
-
-3.11 The number of rows for InnoDB tables is not correct.
----------------------------------------------------------
-
-phpMyAdmin uses a quick method to get the row count, and this method only
-returns an approximate count in the case of InnoDB tables. See
-:config:option:`$cfg['MaxExactCount']` for a way to modify those results, but
-this could have a serious impact on performance.
-However, one can easily replace the approximate row count with exact count by
-simply clicking on the approximate count. This can also be done for all tables
-at once by clicking on the rows sum displayed at the bottom.
-
-.. _faq3_12:
-
-3.12 (withdrawn).
------------------
-
-.. _faq3_13:
-
-3.13 I get an error when entering ``USE`` followed by a db name containing an hyphen.
--------------------------------------------------------------------------------------
-
-The tests I have made with MySQL 5.1.49 shows that the API does not
-accept this syntax for the USE command.
-
-.. _faq3_14:
-
-3.14 I am not able to browse a table when I don't have the right to SELECT one of the columns.
-----------------------------------------------------------------------------------------------
-
-This has been a known limitation of phpMyAdmin since the beginning and
-it's not likely to be solved in the future.
-
-.. _faq3_15:
-
-3.15 (withdrawn).
------------------
-
-.. _faq3_16:
-
-3.16 (withdrawn).
------------------
-
-.. _faq3_17:
-
-3.17 (withdrawn).
------------------
-
-.. _faq3_18:
-
-3.18 When I import a CSV file that contains multiple tables, they are lumped together into a single table.
-----------------------------------------------------------------------------------------------------------
-
-There is no reliable way to differentiate tables in :term:`CSV` format. For the
-time being, you will have to break apart :term:`CSV` files containing multiple
-tables.
-
-.. _faq3_19:
-
-3.19 When I import a file and have phpMyAdmin determine the appropriate data structure it only uses int, decimal, and varchar types.
-------------------------------------------------------------------------------------------------------------------------------------
-
-Currently, the import type-detection system can only assign these
-MySQL types to columns. In future, more will likely be added but for
-the time being you will have to edit the structure to your liking
-post-import.  Also, you should note the fact that phpMyAdmin will use
-the size of the largest item in any given column as the column size
-for the appropriate type. If you know you will be adding larger items
-to that column then you should manually adjust the column sizes
-accordingly. This is done for the sake of efficiency.
-
-.. _faq3_20:
-
-3.20 After upgrading, some bookmarks are gone or their content cannot be shown.
--------------------------------------------------------------------------------
-
-At some point, the character set used to store bookmark content has changed.
-It's better to recreate your bookmark from the newer phpMyAdmin version.
-
-.. _faqmultiuser:
-
-ISPs, multi-user installations
-++++++++++++++++++++++++++++++
-
-.. _faq4_1:
-
-4.1 I'm an ISP. Can I setup one central copy of phpMyAdmin or do I need to install it for each customer?
---------------------------------------------------------------------------------------------------------
-
-Since version 2.0.3, you can setup a central copy of phpMyAdmin for all your
-users. The development of this feature was kindly sponsored by NetCologne GmbH.
-This requires a properly setup MySQL user management and phpMyAdmin
-:term:`HTTP` or cookie authentication.
-
-.. seealso:: :ref:`authentication_modes`
-
-.. _faq4_2:
-
-4.2 What's the preferred way of making phpMyAdmin secure against evil access?
------------------------------------------------------------------------------
-
-This depends on your system. If you're running a server which cannot be
-accessed by other people, it's sufficient to use the directory protection
-bundled with your webserver (with Apache you can use :term:`.htaccess` files,
-for example). If other people have telnet access to your server, you should use
-phpMyAdmin's :term:`HTTP` or cookie authentication features.
-
-Suggestions:
-
-* Your :file:`config.inc.php` file should be ``chmod 660``.
-* All your phpMyAdmin files should be chown -R phpmy.apache, where phpmy
-  is a user whose password is only known to you, and apache is the group
-  under which Apache runs.
-* Follow security recommendations for PHP and your webserver.
-
-.. _faq4_3:
-
-4.3 I get errors about not being able to include a file in */lang* or in */libraries*.
---------------------------------------------------------------------------------------
-
-Check :file:`php.ini`, or ask your sysadmin to check it. The
-``include_path`` must contain "." somewhere in it, and
-``open_basedir``, if used, must contain "." and "./lang" to allow
-normal operation of phpMyAdmin.
-
-.. _faq4_4:
-
-4.4 phpMyAdmin always gives "Access denied" when using HTTP authentication.
----------------------------------------------------------------------------
-
-This could happen for several reasons:
-
-* :config:option:`$cfg['Servers'][$i]['controluser']` and/or :config:option:`$cfg['Servers'][$i]['controlpass']`  are wrong.
-* The username/password you specify in the login dialog are invalid.
-* You have already setup a security mechanism for the phpMyAdmin-
-  directory, eg. a :term:`.htaccess` file. This would interfere with phpMyAdmin's
-  authentication, so remove it.
-
-.. _faq4_5:
-
-4.5 Is it possible to let users create their own databases?
------------------------------------------------------------
-
-Starting with 2.2.5, in the user management page, you can enter a
-wildcard database name for a user (for example "joe%"), and put the
-privileges you want. For example, adding ``SELECT, INSERT, UPDATE,
-DELETE, CREATE, DROP, INDEX, ALTER`` would let a user create/manage
-his/her database(s).
-
-.. _faq4_6:
-
-4.6 How can I use the Host-based authentication additions?
-----------------------------------------------------------
-
-If you have existing rules from an old :term:`.htaccess` file, you can take them and
-add a username between the ``'deny'``/``'allow'`` and ``'from'``
-strings. Using the username wildcard of ``'%'`` would be a major
-benefit here if your installation is suited to using it. Then you can
-just add those updated lines into the
-:config:option:`$cfg['Servers'][$i]['AllowDeny']['rules']` array.
-
-If you want a pre-made sample, you can try this fragment. It stops the
-'root' user from logging in from any networks other than the private
-network :term:`IP` blocks.
-
-.. code-block:: php
-
-
-    //block root from logging in except from the private networks
-    $cfg['Servers'][$i]['AllowDeny']['order'] = 'deny,allow';
-    $cfg['Servers'][$i]['AllowDeny']['rules'] = array(
-        'deny root from all',
-        'allow root from localhost',
-        'allow root from 10.0.0.0/8',
-        'allow root from 192.168.0.0/16',
-        'allow root from 172.16.0.0/12',
-    );
-
-.. _faq4_7:
-
-4.7 Authentication window is displayed more than once, why?
------------------------------------------------------------
-
-This happens if you are using a :term:`URL` to start phpMyAdmin which is
-different than the one set in your :config:option:`$cfg['PmaAbsoluteUri']`. For
-example, a missing "www", or entering with an :term:`IP` address while a domain
-name is defined in the config file.
-
-.. _faq4_8:
-
-4.8 Which parameters can I use in the URL that starts phpMyAdmin?
------------------------------------------------------------------
-
-When starting phpMyAdmin, you can use the ``db``, ``pma_username``,
-``pma_password`` and ``server`` parameters. This last one can contain
-either the numeric host index (from ``$i`` of the configuration file)
-or one of the host names present in the configuration file. Using
-``pma_username`` and ``pma_password`` has been tested along with the
-usage of 'cookie' ``auth_type``.
-
-.. _faqbrowsers:
-
-Browsers or client OS
-+++++++++++++++++++++
-
-.. _faq5_1:
-
-5.1 I get an out of memory error, and my controls are non-functional, when trying to create a table with more than 14 columns.
-------------------------------------------------------------------------------------------------------------------------------
-
-We could reproduce this problem only under Win98/98SE. Testing under
-WinNT4 or Win2K, we could easily create more than 60 columns.  A
-workaround is to create a smaller number of columns, then come back to
-your table properties and add the other columns.
-
-.. _faq5_2:
-
-5.2 With Xitami 2.5b4, phpMyAdmin won't process form fields.
-------------------------------------------------------------
-
-This is not a phpMyAdmin problem but a Xitami known bug: you'll face
-it with each script/website that use forms. Upgrade or downgrade your
-Xitami server.
-
-.. _faq5_3:
-
-5.3 I have problems dumping tables with Konqueror (phpMyAdmin 2.2.2).
----------------------------------------------------------------------
-
-With Konqueror 2.1.1: plain dumps, zip and GZip dumps work ok, except
-that the proposed file name for the dump is always 'tbl\_dump.php'.
-Bzip2 dumps don't seem to work. With Konqueror 2.2.1: plain dumps
-work; zip dumps are placed into the user's temporary directory, so
-they must be moved before closing Konqueror, or else they disappear.
-GZip dumps give an error message. Testing needs to be done for
-Konqueror 2.2.2.
-
-.. _faq5_4:
-
-5.4 I can't use the cookie authentication mode because Internet Explorer never stores the cookies.
---------------------------------------------------------------------------------------------------
-
-MS Internet Explorer seems to be really buggy about cookies, at least
-till version 6.
-
-.. _faq5_5:
-
-5.5 In Internet Explorer 5.0, I get JavaScript errors when browsing my rows.
-----------------------------------------------------------------------------
-
-Upgrade to at least Internet Explorer 5.5 SP2.
-
-.. _faq5_6:
-
-5.6 In Internet Explorer 5.0, 5.5 or 6.0, I get an error (like "Page not found") when trying to modify a row in a table with many columns, or with a text column.
------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-Your table neither have a primary key nor an unique one, so we must use a long
-:term:`URL` to identify this row. There is a limit on the length of the
-:term:`URL` in those browsers, and this not happen in Netscape, for example.
-The workaround is to create a primary or unique key, or use another browser.
-
-.. _faq5_7:
-
-5.7 I refresh (reload) my browser, and come back to the welcome page.
----------------------------------------------------------------------
-
-Some browsers support right-clicking into the frame you want to
-refresh, just do this in the right frame.
-
-.. _faq5_8:
-
-5.8 With Mozilla 0.9.7 I have problems sending a query modified in the query box.
----------------------------------------------------------------------------------
-
-Looks like a Mozilla bug: 0.9.6 was OK. We will keep an eye on future
-Mozilla versions.
-
-.. _faq5_9:
-
-5.9 With Mozilla 0.9.? to 1.0 and Netscape 7.0-PR1 I can't type a whitespace in the SQL-Query edit area: the page scrolls down.
--------------------------------------------------------------------------------------------------------------------------------
-
-This is a Mozilla bug (see bug #26882 at `BugZilla
-<https://bugzilla.mozilla.org/>`_).
-
-.. _faq5_10:
-
-5.10 With Netscape 4.75 I get empty rows between each row of data in a CSV exported file.
------------------------------------------------------------------------------------------
-
-This is a known Netscape 4.75 bug: it adds some line feeds when
-exporting data in octet-stream mode. Since we can't detect the
-specific Netscape version, we cannot workaround this bug.
-
-.. _faq5_11:
-
-5.11 Extended-ASCII characters like German umlauts are displayed wrong.
------------------------------------------------------------------------
-
-Please ensure that you have set your browser's character set to the
-one of the language file you have selected on phpMyAdmin's start page.
-Alternatively, you can try the auto detection mode that is supported
-by the recent versions of the most browsers.
-
-.. _faq5_12:
-
-5.12 Mac OS X Safari browser changes special characters to "?".
----------------------------------------------------------------
-
-This issue has been reported by a :term:`Mac OS X` user, who adds that Chimera,
-Netscape and Mozilla do not have this problem.
-
-.. _faq5_13:
-
-5.13 With Internet Explorer 5.5 or 6, and HTTP authentication type, I cannot manage two servers: I log in to the first one, then the other one, but if I switch back to the first, I have to log in on each operation.
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-This is a bug in Internet Explorer, other browsers do not behave this
-way.
-
-.. _faq5_14:
-
-5.14 Using Opera6, I can manage to get to the authentication, but nothing happens after that, only a blank screen.
-------------------------------------------------------------------------------------------------------------------
-
-Please upgrade to Opera7 at least.
-
-.. _faq5_15:
-
-5.15 I have display problems with Safari.
------------------------------------------
-
-Please upgrade to at least version 1.2.3.
-
-.. _faq5_16:
-
-5.16 With Internet Explorer, I get "Access is denied" Javascript errors. Or I cannot make phpMyAdmin work under Windows.
-------------------------------------------------------------------------------------------------------------------------
-
-Please check the following points:
-
-* Maybe you have defined your :config:option:`$cfg['PmaAbsoluteUri']` setting in
-  :file:`config.inc.php` to an :term:`IP` address and you are starting phpMyAdmin
-  with a :term:`URL` containing a domain name, or the reverse situation.
-* Security settings in IE and/or Microsoft Security Center are too high,
-  thus blocking scripts execution.
-* The Windows Firewall is blocking Apache and MySQL. You must allow
-  :term:`HTTP` ports (80 or 443) and MySQL
-  port (usually 3306) in the "in" and "out" directions.
-
-.. _faq5_17:
-
-5.17 With Firefox, I cannot delete rows of data or drop a database.
--------------------------------------------------------------------
-
-Many users have confirmed that the Tabbrowser Extensions plugin they
-installed in their Firefox is causing the problem.
-
-.. _faq5_18:
-
-5.18 With Konqueror 4.2.x an invalid ``LIMIT`` clause is generated when I browse a table.
------------------------------------------------------------------------------------------
-
-This happens only when both of these conditions are met: using the
-``http`` authentication mode and ``register_globals`` being set to
-``On`` on the server. It seems to be a browser-specific problem;
-meanwhile use the ``cookie`` authentication mode.
-
-.. _faq5_19:
-
-5.19 I get JavaScript errors in my browser.
--------------------------------------------
-
-Issues have been reported with some combinations of browser
-extensions. To troubleshoot, disable all extensions then clear your
-browser cache to see if the problem goes away.
-
-.. _faqusing:
-
-Using phpMyAdmin
-++++++++++++++++
-
-.. _faq6_1:
-
-6.1 I can't insert new rows into a table / I can't create a table - MySQL brings up a SQL error.
-------------------------------------------------------------------------------------------------
-
-Examine the :term:`SQL` error with care.
-Often the problem is caused by specifying a wrong column-type. Common
-errors include:
-
-* Using ``VARCHAR`` without a size argument
-* Using ``TEXT`` or ``BLOB`` with a size argument
-
-Also, look at the syntax chapter in the MySQL manual to confirm that
-your syntax is correct.
-
-.. _faq6_2:
-
-6.2 When I create a table, I set an index for two columns and phpMyAdmin generates only one index with those two columns.
--------------------------------------------------------------------------------------------------------------------------
-
-This is the way to create a multi-columns index. If you want two
-indexes, create the first one when creating the table, save, then
-display the table properties and click the Index link to create the
-other index.
-
-.. _faq6_3:
-
-6.3 How can I insert a null value into my table?
-------------------------------------------------
-
-Since version 2.2.3, you have a checkbox for each column that can be
-null. Before 2.2.3, you had to enter "null", without the quotes, as
-the column's value. Since version 2.5.5, you have to use the checkbox
-to get a real NULL value, so if you enter "NULL" this means you want a
-literal NULL in the column, and not a NULL value (this works in PHP4).
-
-.. _faq6_4:
-
-6.4 How can I backup my database or table?
-------------------------------------------
-
-Click on a database or table name in the navigation panel, the properties will
-be displayed. Then on the menu, click "Export", you can dump the structure, the
-data, or both. This will generate standard :term:`SQL` statements that can be
-used to recreate your database/table.  You will need to choose "Save as file",
-so that phpMyAdmin can transmit the resulting dump to your station.  Depending
-on your PHP configuration, you will see options to compress the dump. See also
-the :config:option:`$cfg['ExecTimeLimit']` configuration variable. For
-additional help on this subject, look for the word "dump" in this document.
-
-.. _faq6_5:
-
-6.5 How can I restore (upload) my database or table using a dump? How can I run a ".sql" file?
-----------------------------------------------------------------------------------------------
-
-Click on a database name in the navigation panel, the properties will
-be displayed. Select "Import" from the list of tabs in the right–hand
-frame (or ":term:`SQL`" if your phpMyAdmin
-version is previous to 2.7.0). In the "Location of the text file"
-section, type in the path to your dump filename, or use the Browse
-button. Then click Go.  With version 2.7.0, the import engine has been
-re–written, if possible it is suggested that you upgrade to take
-advantage of the new features.  For additional help on this subject,
-look for the word "upload" in this document.
-
-Note: For errors while importing of dumps exported from older MySQL versions to newer MySQL versions,
-please check :ref:`faq6_41`.
-
-.. _faq6_6:
-
-6.6 How can I use the relation table in Query-by-example?
----------------------------------------------------------
-
-Here is an example with the tables persons, towns and countries, all
-located in the database "mydb". If you don't have a ``pma__relation``
-table, create it as explained in the configuration section. Then
-create the example tables:
-
-.. code-block:: mysql
-
-
-    CREATE TABLE REL_countries (
-    country_code char(1) NOT NULL default '',
-    description varchar(10) NOT NULL default '',
-    PRIMARY KEY (country_code)
-    ) TYPE=MyISAM;
-
-    INSERT INTO REL_countries VALUES ('C', 'Canada');
-
-    CREATE TABLE REL_persons (
-    id tinyint(4) NOT NULL auto_increment,
-    person_name varchar(32) NOT NULL default '',
-    town_code varchar(5) default '0',
-    country_code char(1) NOT NULL default '',
-    PRIMARY KEY (id)
-    ) TYPE=MyISAM;
-
-    INSERT INTO REL_persons VALUES (11, 'Marc', 'S', '');
-    INSERT INTO REL_persons VALUES (15, 'Paul', 'S', 'C');
-
-    CREATE TABLE REL_towns (
-    town_code varchar(5) NOT NULL default '0',
-    description varchar(30) NOT NULL default '',
-    PRIMARY KEY (town_code)
-    ) TYPE=MyISAM;
-
-    INSERT INTO REL_towns VALUES ('S', 'Sherbrooke');
-    INSERT INTO REL_towns VALUES ('M', 'Montréal');
-
-To setup appropriate links and display information:
-
-* on table "REL\_persons" click Structure, then Relation view
-* for "town\_code", choose from dropdowns, "mydb", "REL\_towns", "code"
-  for foreign database, table and column respectively
-* for "country\_code", choose  from dropdowns, "mydb", "REL\_countries",
-  "country\_code" for foreign database, table and column respectively
-* on table "REL\_towns" click Structure, then Relation view
-* in "Choose column to display", choose "description"
-* repeat the two previous steps for table "REL\_countries"
-
-Then test like this:
-
-* Click on your db name in the navigation panel
-* Choose "Query"
-* Use tables: persons, towns, countries
-* Click "Update query"
-* In the columns row, choose persons.person\_name and click the "Show"
-  tickbox
-* Do the same for towns.description and countries.descriptions in the
-  other 2 columns
-* Click "Update query" and you will see in the query box that the
-  correct joins have been generated
-* Click "Submit query"
-
-.. _faqdisplay:
-
-6.7 How can I use the "display column" feature?
------------------------------------------------
-
-Starting from the previous example, create the ``pma__table_info`` as
-explained in the configuration section, then browse your persons
-table, and move the mouse over a town code or country code.  See also
-:ref:`faq6_21` for an additional feature that "display column"
-enables: drop-down list of possible values.
-
-.. _faqpdf:
-
-6.8 How can I produce a PDF schema of my database?
---------------------------------------------------
-
-First the configuration variables "relation", "table\_coords" and
-"pdf\_pages" have to be filled in.  Then you need to think about your
-schema layout. Which tables will go on which pages?
-
-* Select your database in the navigation panel.
-* Choose "Operations" in the navigation bar at the top.
-* Choose "Edit :term:`PDF` Pages" near the
-  bottom of the page.
-* Enter a name for the first :term:`PDF` page
-  and click Go. If you like, you can use the "automatic layout," which
-  will put all your linked tables onto the new page.
-* Select the name of the new page (making sure the Edit radio button is
-  selected) and click Go.
-* Select a table from the list, enter its coordinates and click Save.
-  Coordinates are relative; your diagram will be automatically scaled to
-  fit the page. When initially placing tables on the page, just pick any
-  coordinates -- say, 50x50. After clicking Save, you can then use the
-  :ref:`wysiwyg` to position the element correctly.
-* When you'd like to look at your :term:`PDF`, first be sure to click the Save
-  button beneath the list of tables and coordinates, to save any changes you
-  made there. Then scroll all the way down, select the :term:`PDF` options you
-  want, and click Go.
-* Internet Explorer for Windows may suggest an incorrect filename when
-  you try to save a generated :term:`PDF`.
-  When saving a generated :term:`PDF`, be
-  sure that the filename ends in ".pdf", for example "schema.pdf".
-  Browsers on other operating systems, and other browsers on Windows, do
-  not have this problem.
-
-.. _faq6_9:
-
-6.9 phpMyAdmin is changing the type of one of my columns!
----------------------------------------------------------
-
-No, it's MySQL that is doing `silent column type changing
-<https://dev.mysql.com/doc/en/silent-column-changes.html>`_.
-
-.. _underscore:
-
-6.10 When creating a privilege, what happens with underscores in the database name?
------------------------------------------------------------------------------------
-
-If you do not put a backslash before the underscore, this is a
-wildcard grant, and the underscore means "any character". So, if the
-database name is "john\_db", the user would get rights to john1db,
-john2db ... If you put a backslash before the underscore, it means
-that the database name will have a real underscore.
-
-.. _faq6_11:
-
-6.11 What is the curious symbol ø in the statistics pages?
-----------------------------------------------------------
-
-It means "average".
-
-.. _faqexport:
-
-6.12 I want to understand some Export options.
-----------------------------------------------
-
-**Structure:**
-
-* "Add DROP TABLE" will add a line telling MySQL to `drop the table
-  <https://dev.mysql.com/doc/mysql/en/drop-table.html>`_, if it already
-  exists during the import. It does NOT drop the table after your
-  export, it only affects the import file.
-* "If Not Exists" will only create the table if it doesn't exist.
-  Otherwise, you may get an error if the table name exists but has a
-  different structure.
-* "Add AUTO\_INCREMENT value" ensures that AUTO\_INCREMENT value (if
-  any) will be included in backup.
-* "Enclose table and column names with backquotes" ensures that column
-  and table names formed with special characters are protected.
-* "Add into comments" includes column comments, relations, and MIME
-  types set in the pmadb in the dump as :term:`SQL` comments
-  (*/\* xxx \*/*).
-
-**Data:**
-
-* "Complete inserts" adds the column names on every INSERT command, for
-  better documentation (but resulting file is bigger).
-* "Extended inserts" provides a shorter dump file by using only once the
-  INSERT verb and the table name.
-* "Delayed inserts" are best explained in the `MySQL manual - INSERT DELAYED Syntax
-  <https://dev.mysql.com/doc/mysql/en/insert-delayed.html>`_.
-* "Ignore inserts" treats errors as a warning instead. Again, more info
-  is provided in the `MySQL manual - INSERT Syntax
-  <https://dev.mysql.com/doc/mysql/en/insert.html>`_, but basically with
-  this selected, invalid values are adjusted and inserted rather than
-  causing the entire statement to fail.
-
-.. _faq6_13:
-
-6.13 I would like to create a database with a dot in its name.
---------------------------------------------------------------
-
-This is a bad idea, because in MySQL the syntax "database.table" is
-the normal way to reference a database and table name. Worse, MySQL
-will usually let you create a database with a dot, but then you cannot
-work with it, nor delete it.
-
-.. _faqsqlvalidator:
-
-6.14 (withdrawn).
------------------
-
-.. _faq6_15:
-
-6.15 I want to add a BLOB column and put an index on it, but MySQL says "BLOB column '...' used in key specification without a key length".
--------------------------------------------------------------------------------------------------------------------------------------------
-
-The right way to do this, is to create the column without any indexes,
-then display the table structure and use the "Create an index" dialog.
-On this page, you will be able to choose your BLOB column, and set a
-size to the index, which is the condition to create an index on a BLOB
-column.
-
-.. _faq6_16:
-
-6.16 How can I simply move in page with plenty editing fields?
---------------------------------------------------------------
-
-You can use :kbd:`Ctrl+arrows` (:kbd:`Option+Arrows` in Safari) for moving on
-most pages with many editing fields (table structure changes, row editing,
-etc.).
-
-.. _faq6_17:
-
-6.17 Transformations: I can't enter my own mimetype! WTF is this feature then useful for?
------------------------------------------------------------------------------------------
-
-Slow down :). Defining mimetypes is of no use, if you can't put
-transformations on them. Otherwise you could just put a comment on the
-column. Because entering your own mimetype will cause serious syntax
-checking issues and validation, this introduces a high-risk false-
-user-input situation. Instead you have to initialize mimetypes using
-functions or empty mimetype definitions.
-
-Plus, you have a whole overview of available mimetypes. Who knows all those
-mimetypes by heart so he/she can enter it at will?
-
-.. _faqbookmark:
-
-6.18 Bookmarks: Where can I store bookmarks? Why can't I see any bookmarks below the query box? What are these variables for?
------------------------------------------------------------------------------------------------------------------------------
-
-Any query you have executed can be stored as a bookmark on the page
-where the results are displayed. You will find a button labeled
-'Bookmark this query' just at the end of the page. As soon as you have
-stored a bookmark, it is related to the database you run the query on.
-You can now access a bookmark dropdown on each page, the query box
-appears on for that database.
-
-You can also have, inside the query, placeholders for variables.
-This is done by inserting into the query SQL comments between ``/*`` and
-``*/``. Inside the comments, the special strings ``[VARIABLE{variable-number}]`` is used.
-Be aware that the whole query minus the SQL comments must be
-valid by itself, otherwise you won't be able to store it as a bookmark.
-
-When you execute the bookmark, everything typed into the *Variables*
-input boxes on the query box page will replace the strings ``/*[VARIABLE{variable-number}]*/`` in
-your stored query.
-
-Also remember, that everything else inside the ``/*[VARIABLE{variable-number}]*/`` string for
-your query will remain the way it is, but will be stripped of the ``/**/``
-chars. So you can use:
-
-.. code-block:: mysql
-
-    /*, [VARIABLE1] AS myname */
-
-which will be expanded to
-
-.. code-block:: mysql
-
-    , VARIABLE1 as myname
-
-in your query, where VARIABLE1 is the string you entered in the Variable 1 input box.
-
-A more complex example. Say you have stored
-this query:
-
-.. code-block:: mysql
-
-    SELECT Name, Address FROM addresses WHERE 1 /* AND Name LIKE '%[VARIABLE1]%' */
-
-Say, you now enter "phpMyAdmin" as the variable for the stored query, the full
-query will be:
-
-.. code-block:: mysql
-
-    SELECT Name, Address FROM addresses WHERE 1 AND Name LIKE '%phpMyAdmin%'
-
-**NOTE THE ABSENCE OF SPACES** inside the ``/**/`` construct. Any spaces
-inserted there will be later also inserted as spaces in your query and may lead
-to unexpected results especially when using the variable expansion inside of a
-"LIKE ''" expression.
-
-.. _faq6_19:
-
-6.19 How can I create simple LATEX document to include exported table?
-----------------------------------------------------------------------
-
-You can simply include table in your LATEX documents,
-minimal sample document should look like following one (assuming you
-have table exported in file :file:`table.tex`):
-
-.. code-block:: latex
-
-
-    \documentclass{article} % or any class you want
-    \usepackage{longtable}  % for displaying table
-    \begin{document}        % start of document
-    \include{table}         % including exported table
-    \end{document}          % end of document
-
-.. _faq6_20:
-
-6.20 I see a lot of databases which are not mine, and cannot access them.
--------------------------------------------------------------------------
-
-You have one of these global privileges: CREATE TEMPORARY TABLES, SHOW
-DATABASES, LOCK TABLES. Those privileges also enable users to see all the
-database names. So if your users do not need those privileges, you can remove
-them and their databases list will shorten.
-
-.. seealso:: <https://bugs.mysql.com/179>
-
-.. _faq6_21:
-
-6.21 In edit/insert mode, how can I see a list of possible values for a column, based on some foreign table?
-------------------------------------------------------------------------------------------------------------
-
-You have to setup appropriate links between the tables, and also setup
-the "display column" in the foreign table. See :ref:`faq6_6` for an
-example. Then, if there are 100 values or less in the foreign table, a
-drop-down list of values will be available. You will see two lists of
-values, the first list containing the key and the display column, the
-second list containing the display column and the key. The reason for
-this is to be able to type the first letter of either the key or the
-display column. For 100 values or more, a distinct window will appear,
-to browse foreign key values and choose one. To change the default
-limit of 100, see :config:option:`$cfg['ForeignKeyMaxLimit']`.
-
-
-.. _faq6_22:
-
-6.22 Bookmarks: Can I execute a default bookmark automatically when entering Browse mode for a table?
------------------------------------------------------------------------------------------------------
-
-Yes. If a bookmark has the same label as a table name and it's not a
-public bookmark, it will be executed.
-
-.. _faq6_23:
-
-6.23 Export: I heard phpMyAdmin can export Microsoft Excel files?
------------------------------------------------------------------
-
-You can use :term:`CSV` for Microsoft Excel,
-which works out of the box.
-
-.. versionchanged:: 3.4.5
-    Since phpMyAdmin 3.4.5 support for direct export to Microsoft Excel version
-    97 and newer was dropped.
-
-.. _faq6_24:
-
-6.24 Now that phpMyAdmin supports native MySQL 4.1.x column comments, what happens to my column comments stored in pmadb?
--------------------------------------------------------------------------------------------------------------------------
-
-Automatic migration of a table's pmadb-style column comments to the
-native ones is done whenever you enter Structure page for this table.
-
-.. _faq6_25:
-
-6.25 (withdrawn).
------------------
-
-.. _faq6_26:
-
-6.26 How can I select a range of rows?
---------------------------------------
-
-Click the first row of the range, hold the shift key and click the
-last row of the range. This works everywhere you see rows, for example
-in Browse mode or on the Structure page.
-
-.. _faq6_27:
-
-6.27 What format strings can I use?
------------------------------------
-
-In all places where phpMyAdmin accepts format strings, you can use
-``@VARIABLE@`` expansion and `strftime <https://php.net/strftime>`_
-format strings. The expanded variables depend on a context (for
-example, if you haven't chosen a table, you can not get the table
-name), but the following variables can be used:
-
-``@HTTP_HOST@``
-    HTTP host that runs phpMyAdmin
-``@SERVER@``
-    MySQL server name
-``@VERBOSE@``
-    Verbose MySQL server name as defined in :config:option:`$cfg['Servers'][$i]['verbose']`
-``@VSERVER@``
-    Verbose MySQL server name if set, otherwise normal
-``@DATABASE@``
-    Currently opened database
-``@TABLE@``
-    Currently opened table
-``@COLUMNS@``
-    Columns of the currently opened table
-``@PHPMYADMIN@``
-    phpMyAdmin with version
-
-.. _wysiwyg:
-
-6.28 How can I easily edit relational schema for export?
---------------------------------------------------------
-
-By clicking on the button 'toggle scratchboard' on the page where you
-edit x/y coordinates of those elements you can activate a scratchboard
-where all your elements are placed. By clicking on an element, you can
-move them around in the pre-defined area and the x/y coordinates will
-get updated dynamically. Likewise, when entering a new position
-directly into the input field, the new position in the scratchboard
-changes after your cursor leaves the input field.
-
-You have to click on the 'OK'-button below the tables to save the new
-positions. If you want to place a new element, first add it to the
-table of elements and then you can drag the new element around.
-
-By changing the paper size and the orientation you can change the size
-of the scratchboard as well. You can do so by just changing the
-dropdown field below, and the scratchboard will resize automatically,
-without interfering with the current placement of the elements.
-
-If ever an element gets out of range you can either enlarge the paper
-size or click on the 'reset' button to place all elements below each
-other.
-
-.. _faq6_29:
-
-6.29 Why can't I get a chart from my query result table?
---------------------------------------------------------
-
-Not every table can be put to the chart. Only tables with one, two or
-three columns can be visualised as a chart. Moreover the table must be
-in a special format for chart script to understand it. Currently
-supported formats can be found in the `wiki <https://wiki.phpmyadmin.ne
-t/pma/Charts#Data_formats_for_query_results_chart>`_.
-
-.. _faq6_30:
-
-6.30 Import: How can I import ESRI Shapefiles?
-----------------------------------------------
-
-An ESRI Shapefile is actually a set of several files, where .shp file
-contains geometry data and .dbf file contains data related to those
-geometry data. To read data from .dbf file you need to have PHP
-compiled with the dBase extension (--enable-dbase). Otherwise only
-geometry data will be imported.
-
-To upload these set of files you can use either of the following
-methods:
-
-Configure upload directory with :config:option:`$cfg['UploadDir']`, upload both .shp and .dbf files with
-the same filename and chose the .shp file from the import page.
-
-Create a Zip archive with .shp and .dbf files and import it. For this
-to work, you need to set :config:option:`$cfg['TempDir']` to a place where the web server user can
-write (for example ``'./tmp'``).
-
-To create the temporary directory on a UNIX-based system, you can do:
-
-.. code-block:: sh
-
-    cd phpMyAdmin
-    mkdir tmp
-    chmod o+rwx tmp
-
-.. _faq6_31:
-
-6.31 How do I create a relation in designer?
---------------------------------------------
-
-To select relation, click:  The display column is shown in pink. To
-set/unset a column as the display column, click the "Choose column to
-display" icon, then click on the appropriate column name.
-
-.. _faq6_32:
-
-6.32 How can I use the zoom search feature?
--------------------------------------------
-
-The Zoom search feature is an alternative to table search feature. It allows
-you to explore a table by representing its data in a scatter plot. You can
-locate this feature by selecting a table and clicking the :guilabel:`Search`
-tab. One of the sub-tabs in the :guilabel:`Table Search` page is
-:guilabel:`Zoom Search`.
-
-Consider the table REL\_persons in :ref:`faq6_6` for
-an example. To use zoom search, two columns need to be selected, for
-example, id and town\_code. The id values will be represented on one
-axis and town\_code values on the other axis. Each row will be
-represented as a point in a scatter plot based on its id and
-town\_code. You can include two additional search criteria apart from
-the two fields to display.
-
-You can choose which field should be
-displayed as label for each point. If a display column has been set
-for the table (see :ref:`faqdisplay`), it is taken as the label unless
-you specify otherwise. You can also select the maximum number of rows
-you want to be displayed in the plot by specifing it in the 'Max rows
-to plot' field. Once you have decided over your criteria, click 'Go'
-to display the plot.
-
-After the plot is generated, you can use the
-mousewheel to zoom in and out of the plot. In addition, panning
-feature is enabled to navigate through the plot. You can zoom-in to a
-certain level of detail and use panning to locate your area of
-interest. Clicking on a point opens a dialogue box, displaying field
-values of the data row represented by the point. You can edit the
-values if required and click on submit to issue an update query. Basic
-instructions on how to use can be viewed by clicking the 'How to use?'
-link located just above the plot.
-
-.. _faq6_33:
-
-6.33 When browsing a table, how can I copy a column name?
----------------------------------------------------------
-
-Selecting the name of the column within the browse table header cell
-for copying is difficult, as the columns support reordering by
-dragging the header cells as well as sorting by clicking on the linked
-column name. To copy a column name, double-click on the empty area
-next to the column name, when the tooltip tells you to do so. This
-will show you an input box with the column name. You may right-click
-the column name within this input box to copy it to your clipboard.
-
-.. _faq6_34:
-
-6.34 How can I use the Favorite Tables feature?
----------------------------------------------------------
-
-Favorite Tables feature is very much similar to Recent Tables feature.
-It allows you to add a shortcut for the frequently used tables of any
-database in the navigation panel . You can easily navigate to any table
-in the list by simply choosing it from the list. These tables are stored
-in your browser's local storage if you have not configured your
-`phpMyAdmin Configuration Storage`. Otherwise these entries are stored in
-`phpMyAdmin Configuration Storage`.
-
-IMPORTANT: In absence of `phpMyAdmin Configuration Storage`, your Favorite
-tables may be different in different browsers based on your different
-selections in them.
-
-To add a table to Favorite list simply click on the `Gray` star in front
-of a table name in the list of tables of a Database and wait until it
-turns to `Yellow`.
-To remove a table from list, simply click on the `Yellow` star and
-wait until it turns `Gray` again.
-
-Using :config:option:`$cfg['NumFavoriteTables']` in your :file:`config.inc.php`
-file, you can define the  maximum number of favorite tables shown in the
-navigation panel. Its default value is `10`.
-
-.. _faq6_35:
-
-6.35 How can I use the Range search feature?
----------------------------------------------------------
-
-With the help of range search feature, one can specify a range of values for
-particular column(s) while performing search operation on a table from the `Search`
-tab.
-
-To use this feature simply click on the `BETWEEN` or `NOT BETWEEN` operators
-from the operator select list in front of the column name. On choosing one of the
-above options, a dialog box will show up asking for the `Minimum` and `Maximum`
-value for that column. Only the specified range of values will be included
-in case of `BETWEEN` and excluded in case of `NOT BETWEEN` from the final results.
-
-Note: The Range search feature will work only `Numeric` and `Date` data type columns.
-
-.. _faq6_36:
-
-6.36 What is Central columns and How can I use this feature?
-------------------------------------------------------------
-
-As the name suggests, the Central columns feature enables to maintain a central list of
-columns per database to avoid similar name for the same data element and bring consistency
-of data type for the same data element. You can use the central list of columns to
-add an element to any table structure in that database which will save from writing
-similar column name and column definition.
-
-To add a column to central list, go to table structure page, check the columns you want
-to include and then simply click on "Add to central columns". If you want to add all
-unique columns from more than one table from a database then go to database structure page,
-check the tables you want to include and then select "Add columns to central list".
-
-To remove a column from central list, go to Table structure page, check the columns you want
-to remove and then simply click on "Remove from central columns". If you want to remove all
-columns from more than one tables from a database then go to database structure page,
-check the tables you want to include and then select "Remove columns from central list".
-
-To view and manage the central list, select the database you want to manage central columns
-for then from the top menu click on "Central columns". You will be taken to a page where
-you will have options to edit, delete or add new columns to central list.
-
-.. _faq6_37:
-
-6.37 How can I use Improve Table structure feature?
----------------------------------------------------------
-
-Improve table structure feature helps to bring the table structure upto
-Third Normal Form. A wizard is presented to user which asks questions about the
-elements during the various steps for normalization and a new structure is proposed
-accordingly to bring the table into the First/Second/Third Normal form.
-On startup of the wizard, user gets to select upto what normal form they want to
-normalize the table structure.
-
-Here is an example table which you can use to test all of the three First, Second and
-Third Normal Form.
-
-.. code-block:: mysql
-
-    CREATE TABLE `VetOffice` (
-     `petName` varchar(64) NOT NULL,
-     `petBreed` varchar(64) NOT NULL,
-     `petType` varchar(64) NOT NULL,
-     `petDOB` date NOT NULL,
-     `ownerLastName` varchar(64) NOT NULL,
-     `ownerFirstName` varchar(64) NOT NULL,
-     `ownerPhone1` int(12) NOT NULL,
-     `ownerPhone2` int(12) NOT NULL,
-     `ownerEmail` varchar(64) NOT NULL,
-    );
-
-The above table is not in First normal Form as no primary key exists. Primary key
-is supposed to be (`petName`,`ownerLastName`,`ownerFirstName`) . If the primary key
-is chosen as suggested the resultant table won't be in Second as well as Third Normal
-form as the following dependencies exists.
-
-.. code-block:: mysql
-
-    (OwnerLastName, OwnerFirstName) -> OwnerEmail
-    (OwnerLastName, OwnerFirstName) -> OwnerPhone
-    PetBreed -> PetType
-
-Which says, OwnerEmail depends on OwnerLastName and OwnerFirstName.
-OwnerPhone depends on OwnerLastName and OwnerFirstName.
-PetType depends on PetBreed.
-
-.. _faq6_38:
-
-6.38 How can I reassign auto-incremented values? 
-------------------------------------------------
-
-Some users prefer their AUTO_INCREMENT values to be consecutive; this is not
-always the case after row deletion.
-
-Here are the steps to accomplish this. These are manual steps because they
-involve a manual verification at one point.
-
-* Ensure that you have exclusive access to the table to rearrange
-
-* On your primary key column (i.e. id), remove the AUTO_INCREMENT setting
-
-* Delete your primary key in Structure > indexes
-
-* Create a new column future_id as primary key, AUTO_INCREMENT
-
-* Browse your table and verify that the new increments correspond to what
-  you're expecting
-
-* Drop your old id column
-
-* Rename the future_id column to id
-
-* Move the new id column via Structure > Move columns
-
-.. _faq6_39:
-
-6.39 What is the "Adjust privileges" option when renaming, copying, or moving a database, table, column, or procedure?
-----------------------------------------------------------------------------------------------------------------------
-
-When renaming/copying/moving a database/table/column/procedure,
-MySQL does not adjust the original privileges relating to these objects
-on its own. By selecting this option, phpMyAdmin will adjust the privilege
-table so that users have the same privileges on the new items.
-
-For example: A user 'bob'@'localhost' has a 'SELECT' privilege on a
-column named 'id'. Now, if this column is renamed to 'id_new', MySQL,
-on its own, would **not** adjust the column privileges to the new column name.
-phpMyAdmin can make this adjustment for you automatically.
-
-Notes:
-
-* While adjusting privileges for a database, the privileges of all
-  database-related elements (tables, columns and procedures) are also adjusted
-  to the database's new name.
-
-* Similarly, while adjusting privileges for a table, the privileges of all
-  the columns inside the new table are also adjusted.
-
-* While adjusting privileges, the user performing the operation **must** have the following
-  privileges:
-
-  * SELECT, INSERT, UPDATE, DELETE privileges on following tables:
-    `mysql`.`db`, `mysql`.`columns_priv`, `mysql`.`tables_priv`, `mysql`.`procs_priv`
-  * FLUSH privilege (GLOBAL)
-
-Thus, if you want to replicate the database/table/column/procedure as it is
-while renaming/copying/moving these objects, make sure you have checked this option.
-
-.. _faq6_40:
-
-6.40 I see "Bind parameters" checkbox in the "SQL" page. How do I write parameterized SQL queries?
---------------------------------------------------------------------------------------------------
-
-From version 4.5, phpMyAdmin allows users to execute parameterized queries in the "SQL" page.
-Parameters should be prefixed with a colon(:) and when the "Bind parameters" checkbox is checked
-these parameters will be identified and input fields for these parameters will be presented.
-Values entered in these field will be substituted in the query before being executed.
-
-.. _faq6_41:
-
-6.41 I get import errors while importing the dumps exported from older MySQL versions (pre-5.7.6) into newer MySQL versions (5.7.7+), but they work fine when imported back on same older versions ?
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-If you get errors like *#1031 - Table storage engine for 'table_name' doesn't have this option*
-while importing the dumps exported from pre-5.7.7 MySQL servers into new MySQL server versions 5.7.7+,
-it might be because ROW_FORMAT=FIXED is not supported with InnoDB tables. Moreover, the value of
-`innodb_strict_mode <http://dev.mysql.com/doc/refman/5.7/en/innodb-parameters.html#sysvar_innodb_strict_mode>`_ would define if this would be reported as a warning or as an error.
-
-Since MySQL version 5.7.9, the default value for `innodb_strict_mode` is `ON` and thus would generate
-an error when such a CREATE TABLE or ALTER TABLE statement is encountered.
-
-There are two ways of preventing such errors while importing:
-
-* Change the value of `innodb_strict_mode` to `OFF` before starting the import and turn it `ON` after
-  the import is successfully completed.
-* This can be achieved in two ways:
-
-  * Go to 'Variables' page and edit the value of `innodb_strict_mode`
-  * Run the query : `SET GLOBAL `innodb_strict_mode` = '[value]'`
-
-After the import is done, it is suggested that the value of `innodb_strict_mode` should be reset to the
-original value.
-
-.. _faqproject:
-
-phpMyAdmin project
-++++++++++++++++++
-
-.. _faq7_1:
-
-7.1 I have found a bug. How do I inform developers?
----------------------------------------------------
-
-Our issues tracker is located at <https://github.com/phpmyadmin/phpmyadmin/issues>.
-
-.. _faq7_2:
-
-7.2 I want to translate the messages to a new language or upgrade an existing language, where do I start?
----------------------------------------------------------------------------------------------------------
-
-Translations are very welcome and all you need to have are the
-language skills. The easiest way is to use our `online translation
-service <https://hosted.weblate.org/projects/phpmyadmin/>`_. You can check
-out all the possibilities to translate in the `translate section on
-our website <https://www.phpmyadmin.net/translate/>`_.
-
-.. _faq7_3:
-
-7.3 I would like to help out with the development of phpMyAdmin. How should I proceed?
---------------------------------------------------------------------------------------
-
-We welcome every contribution to the development of phpMyAdmin. You
-can check out all the possibilities to contribute in the `contribute
-section on our website
-<https://www.phpmyadmin.net/contribute/>`_.
-
-.. seealso:: :ref:`developers`
-
-.. _faqsecurity:
-
-Security
-++++++++
-
-.. _faq8_1:
-
-8.1 Where can I get information about the security alerts issued for phpMyAdmin?
---------------------------------------------------------------------------------
-
-Please refer to <https://www.phpmyadmin.net/security/>.
-
-.. _faq8_2:
-
-8.2 How can I protect phpMyAdmin against brute force attacks?
--------------------------------------------------------------
-
-If you use Apache web server, phpMyAdmin exports information about
-authentication to the Apache environment and it can be used in Apache
-logs. Currently there are two variables available:
-
-
-``userID``
-    User name of currently active user (he does not have to be logged in).
-``userStatus``
-    Status of currently active user, one of ``ok`` (user is logged in),
-    ``mysql-denied`` (MySQL denied user login), ``allow-denied`` (user denied
-    by allow/deny rules), ``root-denied`` (root is denied in configuration),
-    ``empty-denied`` (empty password is denied).
-
-``LogFormat`` directive for Apache can look like following:
-
-.. code-block:: apache
-
-    LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %{userID}n %{userStatus}n"   pma_combined
-
-You can then use any log analyzing tools to detect possible break-in
-attempts.
-
-.. _faq8_3:
-
-8.3 Why are there path disclosures when directly loading certain files?
------------------------------------------------------------------------
-
-This is a server configuration problem. Never enable ``display_errors`` on a production site.
-
-.. _faqsynchronization:
-
-Synchronization
-+++++++++++++++
-
-.. _faq9_1:
-
-9.1 (withdrawn).
-----------------
-
-.. _faq9_2:
-
-9.2 (withdrawn).
-----------------
-
diff --git a/#pma/doc/glossary.rst b/#pma/doc/glossary.rst
deleted file mode 100644
index 763e58e1..00000000
--- a/#pma/doc/glossary.rst
+++ /dev/null
@@ -1,401 +0,0 @@
-.. _glossary:
-
-Glossary
-========
-
-From Wikipedia, the free encyclopedia
-
-.. glossary::
-
-    .htaccess
-      the default name of Apache's directory-level configuration file.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/.htaccess>
-
-    ACL
-      Access Contol List
-
-    Blowfish
-      a keyed, symmetric block cipher, designed in 1993 by Bruce Schneier.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/Blowfish_(cipher)>
-
-    Browser
-      a software application that enables a user to display and interact with text, images, and other information typically located on a web page at a website on the World Wide Web.	
-
-      .. seealso:: <https://en.wikipedia.org/wiki/Web_browser>
-
-    bzip2
-      a free software/open source data compression algorithm and program developed by Julian Seward.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/Bzip2>
-
-    CGI
-      Common Gateway Interface is an important World Wide Web technology that
-      enables a client web browser to request data from a program executed on
-      the Web server.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/CGI>
-
-    Changelog
-      a log or record of changes made to a project.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/Changelog>
-
-    Client
-      a computer system that accesses a (remote) service on another computer by some kind of network.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/Client_(computing)>
-
-    column
-      a set of data values of a particular simple type, one for each row of the table.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/Column_(database)>
-
-    Cookie
-      a packet of information sent by a server to a World Wide Web browser and then sent back by the browser each time it accesses that server.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/HTTP_cookie>
-
-    CSV
-      Comma- separated values	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/Comma-separated_values>
-
-    DB
-      look at :term:`database`
-
-    database
-      an organized collection of data.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/Database>
-
-    Engine
-      look at :term:`storage engines`
-
-    extension
-      a PHP module that extends PHP with additional functionality.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/extension>
-
-    FAQ
-      Frequently Asked Questions is a list of commonly asked question and there
-      answers.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/FAQ>
-
-    Field
-      one part of divided data/columns.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/Field_(computer_science)>
-
-    foreign key
-      a column or group of columns in a database row that point to a key column
-      or group of columns forming a key of another database row in some
-      (usually different) table.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/Foreign_key>
-
-    FPDF
-      the free :term:`PDF` library	
-
-      .. seealso:: <http://www.fpdf.org/>
-
-    GD
-      Graphics Library by Thomas Boutell and others for dynamically manipulating images.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/GD_Graphics_Library>
-
-    GD2
-      look at :term:`gd`
-
-    gzip
-      gzip is short for GNU zip, a GNU free software file compression program.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/Gzip>
-
-    host
-      any machine connected to a computer network, a node that has a hostname.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/Host>
-
-    hostname
-      the unique name by which a network attached device is known on a network.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/Hostname>
-
-    HTTP
-      HyperText Transfer Protocol is the primary method used to transfer or
-      convey information on the World Wide Web.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/HyperText_Transfer_Protocol>
-
-    https
-      a :term:`HTTP`-connection with additional security measures.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/Https:_URI_scheme>
-
-    IEC
-      International Electrotechnical Commission
-
-    IIS
-      Internet Information Services is a set of Internet-based services for
-      servers using Microsoft Windows.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/Internet_Information_Services>
-
-    Index
-      a feature that allows quick access to the rows in a table.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/Index_(database)>
-
-    IP
-      Internet Protocol is a data-oriented protocol used by source and
-      destination hosts for communicating data across a packet-switched
-      internetwork.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/Internet_Protocol>
-
-    IP Address
-      a unique number that devices use in order to identify and communicate with each other on a network utilizing the Internet Protocol standard.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/IP_Address>
-
-    IPv6
-      IPv6 (Internet Protocol version 6) is the latest revision of the
-      Internet Protocol (:term:`IP`), designed to deal with the
-      long-anticipated problem of its precedessor IPv4 running out of addresses.
-
-      .. seealso:: <https://www.wikipedia.org/wiki/IPv6>
-
-    ISAPI
-      Internet Server Application Programming Interface is the API of Internet Information Services (IIS).	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/ISAPI>
-
-    ISP
-      Internet service provider is a business or organization that offers users
-      access to the Internet and related services.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/ISP>
-
-    ISO
-      International Standards Organisation
-
-    JPEG
-      a most commonly used standard method of lossy compression for photographic images.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/JPEG>
-
-    JPG
-      look at :term:`jpeg`
-
-    Key
-      look at :term:`index`
-
-    LATEX
-      a document preparation system for the TEX typesetting program.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/LaTeX>
-
-    Mac
-       Apple Macintosh is line of personal computers is designed, developed, manufactured, and marketed by Apple Computer.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/Mac>
-
-    Mac OS X
-      the operating system which is included with all currently shipping Apple Macintosh computers in the consumer and professional markets.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/Mac_OS_X>
-
-    MCrypt
-      a cryptographic library.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/MCrypt>
-
-    mcrypt
-      the MCrypt PHP extension.	
-
-      .. seealso:: <https://php.net/mcrypt>
-
-    MIME
-      Multipurpose Internet Mail Extensions is
-      an Internet Standard for the format of e-mail.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/MIME>
-
-    module
-      some sort of extension for the Apache Webserver.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/module>
-
-    mod_proxy_fcgi
-      an Apache module implmenting a Fast CGI interface; PHP can be run as a CGI module, FastCGI, or
-      directly as an Apache module.
-
-    MySQL
-      a multithreaded, multi-user, SQL (Structured Query Language) Database Management System (DBMS).	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/MySQL>
-
-    mysqli
-      the improved MySQL client PHP extension.	
-
-      .. seealso:: <https://php.net/mysqli>
-
-    mysql
-      the MySQL client PHP extension.	
-
-      .. seealso:: <https://php.net/mysql>
-
-    OpenDocument
-      open standard for office documents.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/OpenDocument>
-
-    OS X
-      look at :term:`Mac OS X`.
-
-      .. seealso:: <https://www.wikipedia.org/wiki/OS_X>
-
-    PDF
-      Portable Document Format is a file format developed by Adobe Systems for
-      representing two dimensional documents in a device independent and
-      resolution independent format.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/Portable_Document_Format>
-
-    PEAR
-      the PHP Extension and Application Repository.	
-
-      .. seealso:: <https://pear.php.net/>
-
-    PCRE
-      Perl Compatible Regular Expressions is the perl-compatible regular
-      expression functions for PHP	
-
-      .. seealso:: <https://php.net/pcre>
-
-    PHP
-      short for "PHP: Hypertext Preprocessor", is an open-source, reflective
-      programming language used mainly for developing server-side applications
-      and dynamic web content, and more recently, a broader range of software
-      applications.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/PHP>
-
-    port
-      a connection through which data is sent and received.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/Port_(computing)>
-
-    RFC
-      Request for Comments (RFC) documents are a series of memoranda
-      encompassing new research, innovations, and methodologies applicable to
-      Internet technologies.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/Request_for_Comments>
-
-    RFC 1952
-      GZIP file format specification version 4.3
-
-      .. seealso:: :rfc:`1952`
-
-    Row (record, tuple)
-      represents a single, implicitly structured data item in a table.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/Row_(database)>
-
-    Server
-      a computer system that provides services to other computing systems over a network.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/Server_(computing)>
-
-    Storage Engines
-      handlers for different table types	
-
-      .. seealso:: <https://dev.mysql.com/doc/en/storage-engines.html>
-
-    socket
-      a form of inter-process communication.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/Socket#Computer_sockets>
-
-    SSL
-      Secure Sockets Layer is a cryptographic protocol which provides secure
-      communication on the Internet.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/Secure_Sockets_Layer>
-
-    Stored procedure
-      a subroutine available to applications accessing a relational database system	
-
-      .. seealso:: <https://en.wikipedia.org/wiki/Stored_procedure>
-
-    SQL
-      Structured Query Language	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/SQL>
-
-    table
-      a set of data elements (cells) that is organized, defined and stored as
-      horizontal rows and vertical columns where each item can be uniquely
-      identified by a label or key or by it?s position in relation to other
-      items.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/Table_(database)>
-
-    tar
-      a type of archive file format: the Tape ARchive format.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/Tar_(file_format)>
-
-    TCP
-      Transmission Control Protocol is one of the core protocols of the
-      Internet protocol suite.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/TCP>
-
-    TCPDF
-      Rewrite of :term:`UFPDF` with various improvements.
-
-      .. seealso:: <https://tcpdf.org/>
-
-    trigger
-      a procedural code that is automatically executed in response to certain events on a particular table or view in a database	
-
-      .. seealso:: <https://en.wikipedia.org/wiki/Database_trigger>
-
-    UFPDF
-      Unicode/UTF-8 extension for :term:`FPDF`
-
-    URL
-      Uniform Resource Locator is a sequence of characters, conforming to a
-      standardized format, that is used for referring to resources, such as
-      documents and images on the Internet, by their location.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/URL>
-
-    Webserver
-      A computer (program) that is responsible for accepting HTTP requests from clients and serving them Web pages.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/Webserver>
-
-    XML
-      Extensible Markup Language is a W3C-recommended general- purpose markup
-      language for creating special-purpose markup languages, capable of
-      describing many different kinds of data.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/XML>
-
-    ZIP
-      a popular data compression and archival format.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/ZIP_(file_format)>
-
-    zlib
-      an open-source, cross- platform data compression library by Jean-loup Gailly and Mark Adler.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/Zlib>
-
-
diff --git a/#pma/doc/html/.buildinfo b/#pma/doc/html/.buildinfo
deleted file mode 100644
index 2e5d87fc..00000000
--- a/#pma/doc/html/.buildinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-# Sphinx build info version 1
-# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: 8141c5d2d73fe5923f589f1cf37a51a1
-tags: 645f666f9bcd5a90fca523b33c5a78b7
diff --git a/#pma/doc/html/_images/usergroups.png b/#pma/doc/html/_images/usergroups.png
deleted file mode 100644
index bd8efdcc..00000000
Binary files a/#pma/doc/html/_images/usergroups.png and /dev/null differ
diff --git a/#pma/doc/html/_sources/config.txt b/#pma/doc/html/_sources/config.txt
deleted file mode 100644
index 36c1b974..00000000
--- a/#pma/doc/html/_sources/config.txt
+++ /dev/null
@@ -1,2979 +0,0 @@
-.. index:: config.inc.php
-
-.. _config:
-
-Configuration
-=============
-
-Almost all configurable data is placed in :file:`config.inc.php`. If this file
-does not exist, please refer to the :ref:`setup` section to create one. This
-file only needs to contain the parameters you want to change from their
-corresponding default value in :file:`libraries/config.default.php`.
-
-If a directive is missing from your file, you can just add another line with
-the file. This file is for over-writing the defaults; if you wish to use the
-default value there's no need to add a line here.
-
-The parameters which relate to design (like colors) are placed in
-:file:`themes/themename/layout.inc.php`. You might also want to create
-:file:`config.footer.inc.php` and :file:`config.header.inc.php` files to add
-your site specific code to be included on start and end of each page.
-
-.. note::
-
-    Some distributions (eg. Debian or Ubuntu) store :file:`config.inc.php` in
-    ``/etc/phpmyadmin`` instead of within phpMyAdmin sources.
-
-.. warning::
-
-    :term:`Mac` users should note that if you are on a version before
-    :term:`Mac OS X`, PHP does not seem to
-    like :term:`Mac` end of lines character (``\r``). So
-    ensure you choose the option that allows to use the \*nix end of line
-    character (``\n``) in your text editor before saving a script you have
-    modified.
-
-Basic settings
---------------
-
-.. config:option:: $cfg['PmaAbsoluteUri']
-
-    :type: string
-    :default: ``''``
-
-    .. versionchanged:: 4.6.5
-        
-        This setting was not available in phpMyAdmin 4.6.0 - 4.6.4.
-
-    Sets here the complete :term:`URL` (with full path) to your phpMyAdmin
-    installation's directory. E.g.
-    ``https://www.example.net/path_to_your_phpMyAdmin_directory/``.  Note also
-    that the :term:`URL` on most of web servers are case–sensitive. Don’t
-    forget the trailing slash at the end.
-
-    Starting with version 2.3.0, it is advisable to try leaving this blank. In
-    most cases phpMyAdmin automatically detects the proper setting. Users of
-    port forwarding will need to set :config:option:`$cfg['PmaAbsoluteUri']`
-    (`more info <https://sourceforge.net/p/phpmyadmin/support-requests/795/>`_).
-
-    A good test is to browse a table, edit a row and save it. There should be
-    an error message if phpMyAdmin is having trouble auto–detecting the correct
-    value. If you get an error that this must be set or if the autodetect code
-    fails to detect your path, please post a bug report on our bug tracker so
-    we can improve the code.
-
-    .. seealso:: :ref:`faq1_40`, :ref:`faq2_5`, :ref:`faq4_7`, :ref:`faq5_16`
-
-.. config:option:: $cfg['PmaNoRelation_DisableWarning']
-
-    :type: boolean
-    :default: false
-
-    Starting with version 2.3.0 phpMyAdmin offers a lot of features to
-    work with master / foreign – tables (see :config:option:`$cfg['Servers'][$i]['pmadb']`).
-
-    If you tried to set this
-    up and it does not work for you, have a look on the :guilabel:`Structure` page
-    of one database where you would like to use it. You will find a link
-    that will analyze why those features have been disabled.
-
-    If you do not want to use those features set this variable to ``true`` to
-    stop this message from appearing.
-
-.. config:option:: $cfg['SuhosinDisableWarning']
-
-    :type: boolean
-    :default: false
-
-    A warning is displayed on the main page if Suhosin is detected.
-
-    You can set this parameter to ``true`` to stop this message from appearing.
-
-.. config:option:: $cfg['LoginCookieValidityDisableWarning']
-
-    :type: boolean
-    :default: false
-
-    A warning is displayed on the main page if the PHP parameter
-    session.gc_maxlifetime is lower than cookie validity configured in phpMyAdmin.
-
-    You can set this parameter to ``true`` to stop this message from appearing.
-
-.. config:option:: $cfg['ServerLibraryDifference_DisableWarning']
-
-    :type: boolean
-    :default: false
-
-    A warning is displayed on the main page if there is a difference
-    between the MySQL library and server version.
-
-    You can set this parameter to ``true`` to stop this message from appearing.
-
-.. config:option:: $cfg['ReservedWordDisableWarning']
-
-    :type: boolean
-    :default: false
-
-    This warning is displayed on the Structure page of a table if one or more
-    column names match with words which are MySQL reserved.
-
-    If you want to turn off this warning, you can set it to ``true`` and
-    warning will no longer be displayed.
-
-.. config:option:: $cfg['TranslationWarningThreshold']
-
-    :type: integer
-    :default: 80
-
-    Show warning about incomplete translations on certain threshold.
-
-.. config:option:: $cfg['SendErrorReports']
-
-    :type: string
-    :default: ``'ask'``
-
-    Sets the default behavior for JavaScript error reporting.
-
-    Whenever an error is detected in the JavaScript execution, an error report
-    may be sent to the phpMyAdmin team if the user agrees.
-
-    The default setting of ``'ask'`` will ask the user everytime there is a new
-    error report. However you can set this parameter to ``'always'`` to send error
-    reports without asking for confirmation or you can set it to ``'never'`` to
-    never send error reports.
-
-    This directive is available both in the configuration file and in users
-    preferences. If the person in charge of a multi-user installation prefers
-    to disable this feature for all users, a value of ``'never'`` should be
-    set, and the :config:option:`$cfg['UserprefsDisallow']` directive should
-    contain ``'SendErrorReports'`` in one of its array values.
-
-.. config:option:: $cfg['ConsoleEnterExecutes']
-
-    :type: boolean
-    :default: false
-
-    Setting this to ``true`` allows the user to execute queries by pressing Enter
-    instead of Ctrl+Enter. A new line can be inserted by pressing Shift + Enter.
-
-    The behaviour of the console can be temporarily changed using console's
-    settings interface.
-
-.. config:option:: $cfg['AllowThirdPartyFraming']
-
-    :type: boolean
-    :default: false
-
-    Setting this to ``true`` allows phpMyAdmin to be included inside a frame,
-    and is a potential security hole allowing cross-frame scripting attacks or
-    clickjacking.
-
-Server connection settings
---------------------------
-
-.. config:option:: $cfg['Servers']
-
-    :type: array
-    :default: one server array with settings listed below
-
-    Since version 1.4.2, phpMyAdmin supports the administration of multiple
-    MySQL servers. Therefore, a :config:option:`$cfg['Servers']`-array has been
-    added which contains the login information for the different servers. The
-    first :config:option:`$cfg['Servers'][$i]['host']` contains the hostname of
-    the first server, the second :config:option:`$cfg['Servers'][$i]['host']`
-    the hostname of the second server, etc. In
-    :file:`libraries/config.default.php`, there is only one section for server
-    definition, however you can put as many as you need in
-    :file:`config.inc.php`, copy that block or needed parts (you don't have to
-    define all settings, just those you need to change).
-
-    .. note::
-
-        The :config:option:`$cfg['Servers']` array starts with
-        $cfg['Servers'][1]. Do not use $cfg['Servers'][0]. If you want more
-        than one server, just copy following section (including $i
-        incrementation) serveral times. There is no need to define full server
-        array, just define values you need to change.
-
-
-.. config:option:: $cfg['Servers'][$i]['host']
-
-    :type: string
-    :default: ``'localhost'``
-
-    The hostname or :term:`IP` address of your $i-th MySQL-server. E.g.
-    ``localhost``.
-
-    Possible values are:
-
-    * hostname, e.g., ``'localhost'`` or ``'mydb.example.org'``
-    * IP address, e.g., ``'127.0.0.1'`` or ``'192.168.10.1'``
-    * dot - ``'.'``, i.e., use named pipes on windows systems
-    * empty - ``''``, disables this server
-
-    .. note::
-
-        phpMyAdmin supports connecting to MySQL servers reachable via IPv6 only.
-		To connect to an IPv6 MySQL server, enter its IPv6 address in this field.
-
-.. config:option:: $cfg['Servers'][$i]['port']
-
-    :type: string
-    :default: ``''``
-
-    The port-number of your $i-th MySQL-server. Default is 3306 (leave
-    blank).
-
-    .. note::
-
-       If you use ``localhost`` as the hostname, MySQL ignores this port number
-       and connects with the socket, so if you want to connect to a port
-       different from the default port, use ``127.0.0.1`` or the real hostname
-       in :config:option:`$cfg['Servers'][$i]['host']`.
-
-.. config:option:: $cfg['Servers'][$i]['socket']
-
-    :type: string
-    :default: ``''``
-
-    The path to the socket to use. Leave blank for default. To determine
-    the correct socket, check your MySQL configuration or, using the
-    :command:`mysql` command–line client, issue the ``status`` command. Among the
-    resulting information displayed will be the socket used.
-
-.. config:option:: $cfg['Servers'][$i]['ssl']
-
-    :type: boolean
-    :default: false
-
-    Whether to enable SSL for the connection between phpMyAdmin and the MySQL server.
-
-    When using the ``'mysql'`` extension,
-    none of the remaining ``'ssl...'`` configuration options apply.
-
-    We strongly recommend the ``'mysqli'`` extension when using this option.
-
-    .. seealso:: :ref:`example-google-ssl`
-
-.. config:option:: $cfg['Servers'][$i]['ssl_key']
-
-    :type: string
-    :default: NULL
-
-    Path to the key file when using SSL for connecting to the MySQL server.
-
-    For example:
-
-    .. code-block:: php
-
-        $cfg['Servers'][$i]['ssl_key'] = '/etc/mysql/server-key.pem';
-
-    .. seealso:: :ref:`example-google-ssl`
-
-.. config:option:: $cfg['Servers'][$i]['ssl_cert']
-
-    :type: string
-    :default: NULL
-
-    Path to the cert file when using SSL for connecting to the MySQL server.
-
-    .. seealso:: :ref:`example-google-ssl`
-
-.. config:option:: $cfg['Servers'][$i]['ssl_ca']
-
-    :type: string
-    :default: NULL
-
-    Path to the CA file when using SSL for connecting to the MySQL server.
-
-    .. seealso:: :ref:`example-google-ssl`
-
-.. config:option:: $cfg['Servers'][$i]['ssl_ca_path']
-
-    :type: string
-    :default: NULL
-
-    Directory containing trusted SSL CA certificates in PEM format.
-
-.. config:option:: $cfg['Servers'][$i]['ssl_ciphers']
-
-    :type: string
-    :default: NULL
-
-    List of allowable ciphers for SSL connections to the MySQL server.
-
-.. config:option:: $cfg['Servers'][$i]['ssl_verify']
-
-    :type: boolean
-    :default: true
-
-    .. versionadded:: 4.6.0
-
-        This is supported since phpMyAdmin 4.6.0.
-
-    If your PHP install uses the MySQL Native Driver (mysqlnd), your
-    MySQL server is 5.6 or later, and your SSL certificate is self-signed,
-    there is a chance your SSL connection will fail due to validation.
-    Setting this to ``false`` will disable the validation check.
-
-    Since PHP 5.6.0 it also verifies whether server name matches CN of it's
-    certificate. There is currently no way to disable just this check without
-    disabling complete SSL verification.
-
-    .. note::
-
-        This flag only works with PHP 5.6.16 or later.
-
-    .. seealso:: :ref:`example-google-ssl`
-
-.. config:option:: $cfg['Servers'][$i]['connect_type']
-
-    :type: string
-    :default: ``'tcp'``
-
-    What type connection to use with the MySQL server. Your options are
-    ``'socket'`` and ``'tcp'``. It defaults to tcp as that is nearly guaranteed
-    to be available on all MySQL servers, while sockets are not supported on
-    some platforms. To use the socket mode, your MySQL server must be on the
-    same machine as the Web server.
-
-.. config:option:: $cfg['Servers'][$i]['compress']
-
-    :type: boolean
-    :default: false
-
-    Whether to use a compressed protocol for the MySQL server connection
-    or not (experimental).
-
-.. _controlhost:
-.. config:option:: $cfg['Servers'][$i]['controlhost']
-
-    :type: string
-    :default: ``''``
-
-    Permits to use an alternate host to hold the configuration storage
-    data.
-
-.. _controlport:
-.. config:option:: $cfg['Servers'][$i]['controlport']
-
-    :type: string
-    :default: ``''``
-
-    Permits to use an alternate port to connect to the host that
-    holds the configuration storage.
-
-.. _controluser:
-.. config:option:: $cfg['Servers'][$i]['controluser']
-
-    :type: string
-    :default: ``''``
-
-.. config:option:: $cfg['Servers'][$i]['controlpass']
-
-    :type: string
-    :default: ``''``
-
-    This special account is used for 2 distinct purposes: to make possible all
-    relational features (see :config:option:`$cfg['Servers'][$i]['pmadb']`).
-
-    .. versionchanged:: 2.2.5
-        those were called ``stduser`` and ``stdpass``
-
-    .. seealso:: :ref:`setup`, :ref:`authentication_modes`, :ref:`linked-tables`
-
-.. config:option:: $cfg['Servers'][$i]['auth_type']
-
-    :type: string
-    :default: ``'cookie'``
-
-    Whether config or cookie or :term:`HTTP` or signon authentication should be
-    used for this server.
-
-    * 'config' authentication (``$auth_type = 'config'``) is the plain old
-      way: username and password are stored in :file:`config.inc.php`.
-    * 'cookie' authentication mode (``$auth_type = 'cookie'``) allows you to
-      log in as any valid MySQL user with the help of cookies.
-    * 'http' authentication allows you to log in as any
-      valid MySQL user via HTTP-Auth.
-    * 'signon' authentication mode (``$auth_type = 'signon'``) allows you to
-      log in from prepared PHP session data or using supplied PHP script.
-
-    .. seealso:: :ref:`authentication_modes`
-
-.. _servers_auth_http_realm:
-.. config:option:: $cfg['Servers'][$i]['auth_http_realm']
-
-    :type: string
-    :default: ``''``
-
-    When using auth\_type = ``http``, this field allows to define a custom
-    :term:`HTTP` Basic Auth Realm which will be displayed to the user. If not
-    explicitly specified in your configuration, a string combined of
-    "phpMyAdmin " and either :config:option:`$cfg['Servers'][$i]['verbose']` or
-    :config:option:`$cfg['Servers'][$i]['host']` will be used.
-
-.. _servers_user:
-.. config:option:: $cfg['Servers'][$i]['user']
-
-    :type: string
-    :default: ``'root'``
-
-.. config:option:: $cfg['Servers'][$i]['password']
-
-    :type: string
-    :default: ``''``
-
-    When using :config:option:`$cfg['Servers'][$i]['auth_type']` set to
-    'config', this is the user/password-pair which phpMyAdmin will use to
-    connect to the MySQL server. This user/password pair is not needed when
-    :term:`HTTP` or cookie authentication is used
-    and should be empty.
-
-.. _servers_nopassword:
-.. config:option:: $cfg['Servers'][$i]['nopassword']
-
-    :type: boolean
-    :default: false
-
-    Allow attempt to log in without password when a login with password
-    fails. This can be used together with http authentication, when
-    authentication is done some other way and phpMyAdmin gets user name
-    from auth and uses empty password for connecting to MySQL. Password
-    login is still tried first, but as fallback, no password method is
-    tried.
-
-.. _servers_only_db:
-.. config:option:: $cfg['Servers'][$i]['only_db']
-
-    :type: string or array
-    :default: ``''``
-
-    If set to a (an array of) database name(s), only this (these)
-    database(s) will be shown to the user. Since phpMyAdmin 2.2.1,
-    this/these database(s) name(s) may contain MySQL wildcards characters
-    ("\_" and "%"): if you want to use literal instances of these
-    characters, escape them (I.E. use ``'my\_db'`` and not ``'my_db'``).
-
-    This setting is an efficient way to lower the server load since the
-    latter does not need to send MySQL requests to build the available
-    database list. But **it does not replace the privileges rules of the
-    MySQL database server**. If set, it just means only these databases
-    will be displayed but **not that all other databases can't be used.**
-
-    An example of using more that one database:
-
-    .. code-block:: php
-
-        $cfg['Servers'][$i]['only_db'] = array('db1', 'db2');
-
-    .. versionchanged:: 4.0.0
-        Previous versions permitted to specify the display order of
-        the database names via this directive.
-
-.. config:option:: $cfg['Servers'][$i]['hide_db']
-
-    :type: string
-    :default: ``''``
-
-    Regular expression for hiding some databases from unprivileged users.
-    This only hides them from listing, but a user is still able to access
-    them (using, for example, the SQL query area). To limit access, use
-    the MySQL privilege system.  For example, to hide all databases
-    starting with the letter "a", use
-
-    .. code-block:: php
-
-        $cfg['Servers'][$i]['hide_db'] = '^a';
-
-    and to hide both "db1" and "db2" use
-
-    .. code-block:: php
-
-        $cfg['Servers'][$i]['hide_db'] = '^(db1|db2)$';
-
-    More information on regular expressions can be found in the `PCRE
-    pattern syntax
-    <https://php.net/manual/en/reference.pcre.pattern.syntax.php>`_ portion
-    of the PHP reference manual.
-
-.. config:option:: $cfg['Servers'][$i]['verbose']
-
-    :type: string
-    :default: ``''``
-
-    Only useful when using phpMyAdmin with multiple server entries. If
-    set, this string will be displayed instead of the hostname in the
-    pull-down menu on the main page. This can be useful if you want to
-    show only certain databases on your system, for example. For HTTP
-    auth, all non-US-ASCII characters will be stripped.
-
-.. config:option:: $cfg['Servers'][$i]['pmadb']
-
-    :type: string
-    :default: ``''``
-
-    The name of the database containing the phpMyAdmin configuration
-    storage.
-
-    See the :ref:`linked-tables`  section in this document to see the benefits of
-    this feature, and for a quick way of creating this database and the needed
-    tables.
-
-    If you are the only user of this phpMyAdmin installation, you can use your
-    current database to store those special tables; in this case, just put your
-    current database name in :config:option:`$cfg['Servers'][$i]['pmadb']`. For a
-    multi-user installation, set this parameter to the name of your central
-    database containing the phpMyAdmin configuration storage.
-
-.. _bookmark:
-.. config:option:: $cfg['Servers'][$i]['bookmarktable']
-
-    :type: string or false
-    :default: ``''``
-
-    Since release 2.2.0 phpMyAdmin allows users to bookmark queries. This
-    can be useful for queries you often run. To allow the usage of this
-    functionality:
-
-    * set up :config:option:`$cfg['Servers'][$i]['pmadb']` and the phpMyAdmin configuration storage
-    * enter the table name in :config:option:`$cfg['Servers'][$i]['bookmarktable']`
-
-    This feature can be disabled by setting the configuration to ``false``.
-
-.. _relation:
-.. config:option:: $cfg['Servers'][$i]['relation']
-
-    :type: string or false
-    :default: ``''``
-
-    Since release 2.2.4 you can describe, in a special 'relation' table,
-    which column is a key in another table (a foreign key). phpMyAdmin
-    currently uses this to:
-
-    * make clickable, when you browse the master table, the data values that
-      point to the foreign table;
-    * display in an optional tool-tip the "display column" when browsing the
-      master table, if you move the mouse to a column containing a foreign
-      key (use also the 'table\_info' table); (see :ref:`faqdisplay`)
-    * in edit/insert mode, display a drop-down list of possible foreign keys
-      (key value and "display column" are shown) (see :ref:`faq6_21`)
-    * display links on the table properties page, to check referential
-      integrity (display missing foreign keys) for each described key;
-    * in query-by-example, create automatic joins (see :ref:`faq6_6`)
-    * enable you to get a :term:`PDF` schema of
-      your database (also uses the table\_coords table).
-
-    The keys can be numeric or character.
-
-    To allow the usage of this functionality:
-
-    * set up :config:option:`$cfg['Servers'][$i]['pmadb']` and the phpMyAdmin configuration storage
-    * put the relation table name in :config:option:`$cfg['Servers'][$i]['relation']`
-    * now as normal user open phpMyAdmin and for each one of your tables
-      where you want to use this feature, click :guilabel:`Structure/Relation view/`
-      and choose foreign columns.
-
-    This feature can be disabled by setting the configuration to ``false``.
-
-    .. note::
-
-        In the current version, ``master_db`` must be the same as ``foreign_db``.
-        Those columns have been put in future development of the cross-db
-        relations.
-
-.. _table_info:
-.. config:option:: $cfg['Servers'][$i]['table_info']
-
-    :type: string or false
-    :default: ``''``
-
-    Since release 2.3.0 you can describe, in a special 'table\_info'
-    table, which column is to be displayed as a tool-tip when moving the
-    cursor over the corresponding key. This configuration variable will
-    hold the name of this special table. To allow the usage of this
-    functionality:
-
-    * set up :config:option:`$cfg['Servers'][$i]['pmadb']` and the phpMyAdmin configuration storage
-    * put the table name in :config:option:`$cfg['Servers'][$i]['table\_info']` (e.g.
-      ``pma__table_info``)
-    * then for each table where you want to use this feature, click
-      "Structure/Relation view/Choose column to display" to choose the
-      column.
-
-    This feature can be disabled by setting the configuration to ``false``.
-
-    .. seealso:: :ref:`faqdisplay`
-
-.. _table_coords:
-.. config:option:: $cfg['Servers'][$i]['table_coords']
-
-    :type: string or false
-    :default: ``''``
-
-.. config:option:: $cfg['Servers'][$i]['pdf_pages']
-
-    :type: string or false
-    :default: ``''``
-
-    Since release 2.3.0 you can have phpMyAdmin create :term:`PDF` pages
-    showing the relations between your tables. Further, the designer interface
-    permits visually managing the relations. To do this it needs two tables
-    "pdf\_pages" (storing information about the available :term:`PDF` pages)
-    and "table\_coords" (storing coordinates where each table will be placed on
-    a :term:`PDF` schema output).  You must be using the "relation" feature.
-
-    To allow the usage of this functionality:
-
-    * set up :config:option:`$cfg['Servers'][$i]['pmadb']` and the phpMyAdmin configuration storage
-    * put the correct table names in
-      :config:option:`$cfg['Servers'][$i]['table\_coords']` and
-      :config:option:`$cfg['Servers'][$i]['pdf\_pages']`
-
-    This feature can be disabled by setting either of the configurations to ``false``.
-
-    .. seealso:: :ref:`faqpdf`.
-
-.. _col_com:
-.. config:option:: $cfg['Servers'][$i]['column_info']
-
-    :type: string or false
-    :default: ``''``
-
-    This part requires a content update!  Since release 2.3.0 you can
-    store comments to describe each column for each table. These will then
-    be shown on the "printview".
-
-    Starting with release 2.5.0, comments are consequently used on the table
-    property pages and table browse view, showing up as tool-tips above the
-    column name (properties page) or embedded within the header of table in
-    browse view. They can also be shown in a table dump. Please see the
-    relevant configuration directives later on.
-
-    Also new in release 2.5.0 is a MIME- transformation system which is also
-    based on the following table structure. See :ref:`transformations` for
-    further information. To use the MIME- transformation system, your
-    column\_info table has to have the three new columns 'mimetype',
-    'transformation', 'transformation\_options'.
-
-    Starting with release 4.3.0, a new input-oriented transformation system
-    has been introduced. Also, backward compatibility code used in the old
-    transformations system was removed. As a result, an update to column\_info
-    table is necessary for previous transformations and the new input-oriented
-    transformation system to work. phpMyAdmin will upgrade it automatically
-    for you by analyzing your current column\_info table structure.
-    However, if something goes wrong with the auto-upgrade then you can
-    use the SQL script found in ``./sql/upgrade_column_info_4_3_0+.sql``
-    to upgrade it manually.
-
-    To allow the usage of this functionality:
-
-    * set up :config:option:`$cfg['Servers'][$i]['pmadb']` and the phpMyAdmin configuration storage
-    * put the table name in :config:option:`$cfg['Servers'][$i]['column\_info']` (e.g.
-      ``pma__column_info``)
-    * to update your PRE-2.5.0 Column\_comments table use this:  and
-      remember that the Variable in :file:`config.inc.php` has been renamed from
-      :config:option:`$cfg['Servers'][$i]['column\_comments']` to
-      :config:option:`$cfg['Servers'][$i]['column\_info']`
-
-      .. code-block:: mysql
-
-           ALTER TABLE `pma__column_comments`
-           ADD `mimetype` VARCHAR( 255 ) NOT NULL,
-           ADD `transformation` VARCHAR( 255 ) NOT NULL,
-           ADD `transformation_options` VARCHAR( 255 ) NOT NULL;
-    * to update your PRE-4.3.0 Column\_info table manually use this
-      ``./sql/upgrade_column_info_4_3_0+.sql`` SQL script.
-
-    This feature can be disabled by setting the configuration to ``false``.
-
-    .. note::
-
-        For auto-upgrade functionality to work, your
-        ``$cfg['Servers'][$i]['controluser']`` must have ALTER privilege on
-        ``phpmyadmin`` database. See the `MySQL documentation for GRANT
-        <https://dev.mysql.com/doc/mysql/en/grant.html>`_ on how to
-        ``GRANT`` privileges to a user.
-
-.. _history:
-.. config:option:: $cfg['Servers'][$i]['history']
-
-    :type: string or false
-    :default: ``''``
-
-    Since release 2.5.0 you can store your :term:`SQL` history, which means all
-    queries you entered manually into the phpMyAdmin interface. If you don't
-    want to use a table-based history, you can use the JavaScript-based
-    history.
-
-    Using that, all your history items are deleted when closing the window.
-    Using :config:option:`$cfg['QueryHistoryMax']` you can specify an amount of
-    history items you want to have on hold. On every login, this list gets cut
-    to the maximum amount.
-
-    The query history is only available if JavaScript is enabled in
-    your browser.
-
-    To allow the usage of this functionality:
-
-    * set up :config:option:`$cfg['Servers'][$i]['pmadb']` and the phpMyAdmin configuration storage
-    * put the table name in :config:option:`$cfg['Servers'][$i]['history']` (e.g.
-      ``pma__history``)
-
-    This feature can be disabled by setting the configuration to ``false``.
-
-.. _recent:
-.. config:option:: $cfg['Servers'][$i]['recent']
-
-    :type: string or false
-    :default: ``''``
-
-    Since release 3.5.0 you can show recently used tables in the
-    navigation panel. It helps you to jump across table directly, without
-    the need to select the database, and then select the table. Using
-    :config:option:`$cfg['NumRecentTables']` you can configure the maximum number
-    of recent tables shown. When you select a table from the list, it will jump to
-    the page specified in :config:option:`$cfg['NavigationTreeDefaultTabTable']`.
-
-    Without configuring the storage, you can still access the recently used tables,
-    but it will disappear after you logout.
-
-    To allow the usage of this functionality persistently:
-
-    * set up :config:option:`$cfg['Servers'][$i]['pmadb']` and the phpMyAdmin configuration storage
-    * put the table name in :config:option:`$cfg['Servers'][$i]['recent']` (e.g.
-      ``pma__recent``)
-
-    This feature can be disabled by setting the configuration to ``false``.
-
-.. _favorite:
-.. config:option:: $cfg['Servers'][$i]['favorite']
-
-    :type: string or false
-    :default: ``''``
-
-    Since release 4.2.0 you can show a list of selected tables in the
-    navigation panel. It helps you to jump to the table directly, without
-    the need to select the database, and then select the table. When you
-    select a table from the list, it will jump to the page specified in
-    :config:option:`$cfg['NavigationTreeDefaultTabTable']`.
-    
-    You can add tables to this list or remove tables from it in database
-    structure page by clicking on the star icons next to table names. Using
-    :config:option:`$cfg['NumFavoriteTables']` you can configure the maximum
-    number of favorite tables shown.
-
-    Without configuring the storage, you can still access the favorite tables,
-    but it will disappear after you logout.
-
-    To allow the usage of this functionality persistently:
-
-    * set up :config:option:`$cfg['Servers'][$i]['pmadb']` and the phpMyAdmin configuration storage
-    * put the table name in :config:option:`$cfg['Servers'][$i]['favorite']` (e.g.
-      ``pma__favorite``)
-
-    This feature can be disabled by setting the configuration to ``false``.
-
-.. _table_uiprefs:
-.. config:option:: $cfg['Servers'][$i]['table_uiprefs']
-
-    :type: string or false
-    :default: ``''``
-
-    Since release 3.5.0 phpMyAdmin can be configured to remember several
-    things (sorted column :config:option:`$cfg['RememberSorting']`, column order,
-    and column visibility from a database table) for browsing tables. Without
-    configuring the storage, these features still can be used, but the values will
-    disappear after you logout.
-
-    To allow the usage of these functionality persistently:
-
-    * set up :config:option:`$cfg['Servers'][$i]['pmadb']` and the phpMyAdmin configuration storage
-    * put the table name in :config:option:`$cfg['Servers'][$i]['table\_uiprefs']` (e.g.
-      ``pma__table_uiprefs``)
-
-    This feature can be disabled by setting the configuration to ``false``.
-
-.. config:option:: $cfg['Servers'][$i]['users']
-
-    :type: string or false
-    :default: ``''``
-
-.. config:option:: $cfg['Servers'][$i]['usergroups']
-
-    :type: string or false
-    :default: ``''``
-
-    Since release 4.1.0 you can create different user groups with menu items
-    attached to them. Users can be assigned to these groups and the logged in
-    user would only see menu items configured to the usergroup he is assigned to.
-    To do this it needs two tables "usergroups" (storing allowed menu items for each
-    user group) and "users" (storing users and their assignments to user groups).
-
-    To allow the usage of this functionality:
-
-    * set up :config:option:`$cfg['Servers'][$i]['pmadb']` and the phpMyAdmin configuration storage
-    * put the correct table names in
-      :config:option:`$cfg['Servers'][$i]['users']` (e.g. ``pma__users``) and
-      :config:option:`$cfg['Servers'][$i]['usergroups']` (e.g. ``pma__usergroups``)
-
-    This feature can be disabled by setting either of the configurations to ``false``.
-
-    .. seealso:: :ref:`configurablemenus`
-
-.. _navigationhiding:
-.. config:option:: $cfg['Servers'][$i]['navigationhiding']
-
-    :type: string or false
-    :default: ``''``
-
-    Since release 4.1.0 you can hide/show items in the navigation tree.
-
-    To allow the usage of this functionality:
-
-    * set up :config:option:`$cfg['Servers'][$i]['pmadb']` and the phpMyAdmin configuration storage
-    * put the table name in :config:option:`$cfg['Servers'][$i]['navigationhiding']` (e.g.
-      ``pma__navigationhiding``)
-
-    This feature can be disabled by setting the configuration to ``false``.
-
-.. _central_columns:
-.. config:option:: $cfg['Servers'][$i]['central_columns']
-
-    :type: string or false
-    :default: ``''``
-
-    Since release 4.3.0 you can have a central list of columns per database.
-    You can add/remove columns to the list as per your requirement. These columns
-    in the central list will be available to use while you create a new column for
-    a table or create a table itself. You can select a column from central list
-    while creating a new column, it will save you from writing the same column definition
-    over again or from writing different names for similar column.
-
-    To allow the usage of this functionality:
-
-    * set up :config:option:`$cfg['Servers'][$i]['pmadb']` and the phpMyAdmin configuration storage
-    * put the table name in :config:option:`$cfg['Servers'][$i]['central_columns']` (e.g.
-      ``pma__central_columns``)
-
-    This feature can be disabled by setting the configuration to ``false``.
-
-.. _designer_settings:
-.. config:option:: $cfg['Servers'][$i]['designer_settings']
-
-    :type: string or false
-    :default: ``''``
-
-    Since release 4.5.0 your designer settings can be remembered.
-    Your choice regarding 'Angular/Direct Links', 'Snap to Grid', 'Toggle Relation Lines',
-    'Small/Big All', 'Move Menu' and 'Pin Text' can be remembered persistently.
-
-    To allow the usage of this functionality:
-
-    * set up :config:option:`$cfg['Servers'][$i]['pmadb']` and the phpMyAdmin configuration storage
-    * put the table name in :config:option:`$cfg['Servers'][$i]['designer_settings']` (e.g.
-      ``pma__designer_settings``)
-
-    This feature can be disabled by setting the configuration to ``false``.
-
-.. _savedsearches:
-.. config:option:: $cfg['Servers'][$i]['savedsearches']
-
-    :type: string or false
-    :default: ``''``
-
-    Since release 4.2.0 you can save and load query-by-example searches from the Database > Query panel.
-
-    To allow the usage of this functionality:
-
-    * set up :config:option:`$cfg['Servers'][$i]['pmadb']` and the phpMyAdmin configuration storage
-    * put the table name in :config:option:`$cfg['Servers'][$i]['savedsearches']` (e.g.
-      ``pma__savedsearches``)
-
-    This feature can be disabled by setting the configuration to ``false``.
-
-.. _export_templates:
-.. config:option:: $cfg['Servers'][$i]['export_templates']
-
-    :type: string or false
-    :default: ``''``
-
-    Since release 4.5.0 you can save and load export templates.
-
-    To allow the usage of this functionality:
-
-    * set up :config:option:`$cfg['Servers'][$i]['pmadb']` and the phpMyAdmin configuration storage
-    * put the table name in :config:option:`$cfg['Servers'][$i]['export_templates']` (e.g.
-      ``pma__export_templates``)
-
-    This feature can be disabled by setting the configuration to ``false``.
-
-.. _tracking:
-.. config:option:: $cfg['Servers'][$i]['tracking']
-
-    :type: string or false
-    :default: ``''``
-
-    Since release 3.3.x a tracking mechanism is available. It helps you to
-    track every :term:`SQL` command which is
-    executed by phpMyAdmin. The mechanism supports logging of data
-    manipulation and data definition statements. After enabling it you can
-    create versions of tables.
-
-    The creation of a version has two effects:
-
-    * phpMyAdmin saves a snapshot of the table, including structure and
-      indexes.
-    * phpMyAdmin logs all commands which change the structure and/or data of
-      the table and links these commands with the version number.
-
-    Of course you can view the tracked changes. On the :guilabel:`Tracking`
-    page a complete report is available for every version. For the report you
-    can use filters, for example you can get a list of statements within a date
-    range. When you want to filter usernames you can enter \* for all names or
-    you enter a list of names separated by ','. In addition you can export the
-    (filtered) report to a file or to a temporary database.
-
-    To allow the usage of this functionality:
-
-    * set up :config:option:`$cfg['Servers'][$i]['pmadb']` and the phpMyAdmin configuration storage
-    * put the table name in :config:option:`$cfg['Servers'][$i]['tracking']` (e.g.
-      ``pma__tracking``)
-
-    This feature can be disabled by setting the configuration to ``false``.
-
-.. _tracking2:
-.. config:option:: $cfg['Servers'][$i]['tracking_version_auto_create']
-
-    :type: boolean
-    :default: false
-
-    Whether the tracking mechanism creates versions for tables and views
-    automatically.
-
-    If this is set to true and you create a table or view with
-
-    * CREATE TABLE ...
-    * CREATE VIEW ...
-
-    and no version exists for it, the mechanism will create a version for
-    you automatically.
-
-.. _tracking3:
-.. config:option:: $cfg['Servers'][$i]['tracking_default_statements']
-
-    :type: string
-    :default: ``'CREATE TABLE,ALTER TABLE,DROP TABLE,RENAME TABLE,CREATE INDEX,DROP INDEX,INSERT,UPDATE,DELETE,TRUNCATE,REPLACE,CREATE VIEW,ALTER VIEW,DROP VIEW,CREATE DATABASE,ALTER DATABASE,DROP DATABASE'``
-
-    Defines the list of statements the auto-creation uses for new
-    versions.
-
-.. _tracking4:
-.. config:option:: $cfg['Servers'][$i]['tracking_add_drop_view']
-
-    :type: boolean
-    :default: true
-
-    Whether a DROP VIEW IF EXISTS statement will be added as first line to
-    the log when creating a view.
-
-.. _tracking5:
-.. config:option:: $cfg['Servers'][$i]['tracking_add_drop_table']
-
-    :type: boolean
-    :default: true
-
-    Whether a DROP TABLE IF EXISTS statement will be added as first line
-    to the log when creating a table.
-
-.. _tracking6:
-.. config:option:: $cfg['Servers'][$i]['tracking_add_drop_database']
-
-    :type: boolean
-    :default: true
-
-    Whether a DROP DATABASE IF EXISTS statement will be added as first
-    line to the log when creating a database.
-
-.. _userconfig:
-.. config:option:: $cfg['Servers'][$i]['userconfig']
-
-    :type: string or false
-    :default: ``''``
-
-    Since release 3.4.x phpMyAdmin allows users to set most preferences by
-    themselves and store them in the database.
-
-    If you don't allow for storing preferences in
-    :config:option:`$cfg['Servers'][$i]['pmadb']`, users can still personalize
-    phpMyAdmin, but settings will be saved in browser's local storage, or, it
-    is is unavailable, until the end of session.
-
-    To allow the usage of this functionality:
-
-    * set up :config:option:`$cfg['Servers'][$i]['pmadb']` and the phpMyAdmin configuration storage
-    * put the table name in :config:option:`$cfg['Servers'][$i]['userconfig']`
-
-    This feature can be disabled by setting the configuration to ``false``.
-
-.. config:option:: $cfg['Servers'][$i]['MaxTableUiprefs']
-
-    :type: integer
-    :default: 100
-
-    Maximum number of rows saved in
-    :config:option:`$cfg['Servers'][$i]['table_uiprefs']` table.
-
-    When tables are dropped or renamed,
-    :config:option:`$cfg['Servers'][$i]['table_uiprefs']` may contain invalid data
-    (referring to tables which no longer exist). We only keep this number of newest
-    rows in :config:option:`$cfg['Servers'][$i]['table_uiprefs']` and automatically
-    delete older rows.
-
-.. config:option:: $cfg['Servers'][$i]['SessionTimeZone']
-
-    :type: string
-    :default: ``''``
-
-    Sets the time zone used by phpMyAdmin. Leave blank to use the time zone of your
-    database server. Possible values are explained at
-    https://dev.mysql.com/doc/refman/5.7/en/time-zone-support.html
-
-    This is useful when your database server uses a time zone which is different from the
-    time zone you want to use in phpMyAdmin.
-
-.. config:option:: $cfg['Servers'][$i]['AllowRoot']
-
-    :type: boolean
-    :default: true
-
-    Whether to allow root access. This is just a shortcut for the
-    :config:option:`$cfg['Servers'][$i]['AllowDeny']['rules']` below.
-
-.. config:option:: $cfg['Servers'][$i]['AllowNoPassword']
-
-    :type: boolean
-    :default: false
-
-    Whether to allow logins without a password. The default value of
-    ``false`` for this parameter prevents unintended access to a MySQL
-    server with was left with an empty password for root or on which an
-    anonymous (blank) user is defined.
-
-.. _servers_allowdeny_order:
-.. config:option:: $cfg['Servers'][$i]['AllowDeny']['order']
-
-    :type: string
-    :default: ``''``
-
-    If your rule order is empty, then :term:`IP`
-    authorization is disabled.
-
-    If your rule order is set to
-    ``'deny,allow'`` then the system applies all deny rules followed by
-    allow rules. Access is allowed by default. Any client which does not
-    match a Deny command or does match an Allow command will be allowed
-    access to the server.
-
-    If your rule order is set to ``'allow,deny'``
-    then the system applies all allow rules followed by deny rules. Access
-    is denied by default. Any client which does not match an Allow
-    directive or does match a Deny directive will be denied access to the
-    server.
-
-    If your rule order is set to ``'explicit'``, authorization is
-    performed in a similar fashion to rule order 'deny,allow', with the
-    added restriction that your host/username combination **must** be
-    listed in the *allow* rules, and not listed in the *deny* rules. This
-    is the **most** secure means of using Allow/Deny rules, and was
-    available in Apache by specifying allow and deny rules without setting
-    any order.
-
-    Please also see :config:option:`$cfg['TrustedProxies']` for
-    detecting IP address behind proxies.
-
-.. _servers_allowdeny_rules:
-.. config:option:: $cfg['Servers'][$i]['AllowDeny']['rules']
-
-    :type: array of strings
-    :default: array()
-
-    The general format for the rules is as such:
-
-    .. code-block:: none
-
-        <'allow' | 'deny'> <username> [from] <ipmask>
-
-    If you wish to match all users, it is possible to use a ``'%'`` as a
-    wildcard in the *username* field.
-
-    There are a few shortcuts you can
-    use in the *ipmask* field as well (please note that those containing
-    SERVER\_ADDRESS might not be available on all webservers):
-
-    .. code-block:: none
-
-
-        'all' -> 0.0.0.0/0
-        'localhost' -> 127.0.0.1/8
-        'localnetA' -> SERVER_ADDRESS/8
-        'localnetB' -> SERVER_ADDRESS/16
-        'localnetC' -> SERVER_ADDRESS/24
-
-    Having an empty rule list is equivalent to either using ``'allow %
-    from all'`` if your rule order is set to ``'deny,allow'`` or ``'deny %
-    from all'`` if your rule order is set to ``'allow,deny'`` or
-    ``'explicit'``.
-
-    For the :term:`IP address` matching
-    system, the following work:
-
-    * ``xxx.xxx.xxx.xxx`` (an exact :term:`IP address`)
-    * ``xxx.xxx.xxx.[yyy-zzz]`` (an :term:`IP address` range)
-    * ``xxx.xxx.xxx.xxx/nn`` (CIDR, Classless Inter-Domain Routing type :term:`IP` addresses)
-
-    But the following does not work:
-
-    * ``xxx.xxx.xxx.xx[yyy-zzz]`` (partial :term:`IP` address range)
-
-    For :term:`IPv6` addresses, the following work:
-
-    * ``xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx`` (an exact :term:`IPv6` address)
-    * ``xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:[yyyy-zzzz]`` (an :term:`IPv6` address range)
-    * ``xxxx:xxxx:xxxx:xxxx/nn`` (CIDR, Classless Inter-Domain Routing type :term:`IPv6` addresses)
-
-    But the following does not work:
-
-    * ``xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xx[yyy-zzz]`` (partial :term:`IPv6` address range)
-
-.. config:option:: $cfg['Servers'][$i]['DisableIS']
-
-    :type: boolean
-    :default: false
-
-    Disable using ``INFORMATION_SCHEMA`` to retrieve information (use
-    ``SHOW`` commands instead), because of speed issues when many
-    databases are present. Currently used in some parts of the code, more
-    to come.
-
-.. config:option:: $cfg['Servers'][$i]['SignonScript']
-
-    :type: string
-    :default: ``''``
-
-    Name of PHP script to be sourced and executed to obtain login
-    credentials. This is alternative approach to session based single
-    signon. The script has to provide a function called
-    ``get_login_credentials`` which returns list of username and
-    password, accepting single parameter of existing username (can be
-    empty). See :file:`examples/signon-script.php` for an example:
-
-    .. literalinclude:: ../examples/signon-script.php
-        :language: php
-
-    .. seealso:: :ref:`auth_signon`
-
-.. config:option:: $cfg['Servers'][$i]['SignonSession']
-
-    :type: string
-    :default: ``''``
-
-    Name of session which will be used for signon authentication method.
-    You should use something different than ``phpMyAdmin``, because this
-    is session which phpMyAdmin uses internally. Takes effect only if
-    :config:option:`$cfg['Servers'][$i]['SignonScript']` is not configured.
-
-    .. seealso:: :ref:`auth_signon`
-
-.. config:option:: $cfg['Servers'][$i]['SignonURL']
-
-    :type: string
-    :default: ``''``
-
-    :term:`URL` where user will be redirected
-    to log in for signon authentication method. Should be absolute
-    including protocol.
-
-    .. seealso:: :ref:`auth_signon`
-
-.. config:option:: $cfg['Servers'][$i]['LogoutURL']
-
-    :type: string
-    :default: ``''``
-
-    :term:`URL` where user will be redirected
-    after logout (doesn't affect config authentication method). Should be
-    absolute including protocol.
-
-Generic settings
-----------------
-
-.. config:option:: $cfg['ServerDefault']
-
-    :type: integer
-    :default: 1
-
-    If you have more than one server configured, you can set
-    :config:option:`$cfg['ServerDefault']` to any one of them to autoconnect to that
-    server when phpMyAdmin is started, or set it to 0 to be given a list
-    of servers without logging in.
-
-    If you have only one server configured,
-    :config:option:`$cfg['ServerDefault']` MUST be set to that server.
-
-.. config:option:: $cfg['VersionCheck']
-
-    :type: boolean
-    :default: true
-
-    Enables check for latest versions using JavaScript on the main phpMyAdmin
-    page or by directly accessing :file:`version_check.php`.
-
-    .. note::
-
-        This setting can be adjusted by your vendor.
-
-.. config:option:: $cfg['ProxyUrl']
-
-    :type: string
-    :default: ""
-
-    The url of the proxy to be used when phpmyadmin needs to access the outside
-    internet such as when retrieving the latest version info or submitting error
-    reports.  You need this if the server where phpMyAdmin is installed does not
-    have direct access to the internet.
-    The format is: "hostname:portnumber"
-
-.. config:option:: $cfg['ProxyUser']
-
-    :type: string
-    :default: ""
-
-    The username for authenticating with the proxy. By default, no
-    authentication is performed. If a username is supplied, Basic
-    Authentication will be performed. No other types of authentication
-    are currently supported.
-
-.. config:option:: $cfg['ProxyPass']
-
-    :type: string
-    :default: ""
-
-    The password for authenticating with the proxy.
-
-.. config:option:: $cfg['MaxDbList']
-
-    :type: integer
-    :default: 100
-
-    The maximum number of database names to be displayed in the main panel's
-    database list.
-
-.. config:option:: $cfg['MaxTableList']
-
-    :type: integer
-    :default: 250
-
-    The maximum number of table names to be displayed in the main panel's
-    list (except on the Export page).
-
-.. config:option:: $cfg['ShowHint']
-
-    :type: boolean
-    :default: true
-
-    Whether or not to show hints (for example, hints when hovering over
-    table headers).
-
-.. config:option:: $cfg['MaxCharactersInDisplayedSQL']
-
-    :type: integer
-    :default: 1000
-
-    The maximum number of characters when a :term:`SQL` query is displayed. The
-    default limit of 1000 should be correct to avoid the display of tons of
-    hexadecimal codes that represent BLOBs, but some users have real
-    :term:`SQL` queries that are longer than 1000 characters. Also, if a
-    query's length exceeds this limit, this query is not saved in the history.
-
-.. config:option:: $cfg['PersistentConnections']
-
-    :type: boolean
-    :default: false
-
-    Whether `persistent connections <https://php.net/manual/en/features
-    .persistent-connections.php>`_ should be used or not. Works with
-    following extensions:
-
-    * mysql (`mysql\_pconnect <https://php.net/manual/en/function.mysql-
-      pconnect.php>`_),
-    * mysqli (requires PHP 5.3.0 or newer, `more information
-      <https://php.net/manual/en/mysqli.persistconns.php>`_).
-
-.. config:option:: $cfg['ForceSSL']
-
-    :type: boolean
-    :default: false
-
-    .. deprecated:: 4.6.0
-        
-        This setting is no longer available since phpMyAdmin 4.6.0. Please
-        adjust your webserver instead.
-
-    Whether to force using https while accessing phpMyAdmin. In a reverse
-    proxy setup, setting this to ``true`` is not supported.
-
-    .. note::
-
-        In some setups (like separate SSL proxy or load balancer) you might
-        have to set :config:option:`$cfg['PmaAbsoluteUri']` for correct
-        redirection.
-
-.. config:option:: $cfg['ExecTimeLimit']
-
-    :type: integer [number of seconds]
-    :default: 300
-
-    Set the number of seconds a script is allowed to run. If seconds is
-    set to zero, no time limit is imposed. This setting is used while
-    importing/exporting dump files but has
-    no effect when PHP is running in safe mode.
-
-.. config:option:: $cfg['SessionSavePath']
-
-    :type: string
-    :default: ``''``
-
-    Path for storing session data (`session\_save\_path PHP parameter
-    <https://php.net/session_save_path>`_).
-
-.. config:option:: $cfg['MemoryLimit']
-
-    :type: string [number of bytes]
-    :default: ``'-1'``
-
-    Set the number of bytes a script is allowed to allocate. If set to
-    ``'-1'``, no limit is imposed. If set to ``'0'``, no change of the
-    memory limit is attempted and the :file:`php.ini` ``memory_limit`` is
-    used.
-
-    This setting is used while importing/exporting dump files
-    so you definitely don't want to put here a too low
-    value. It has no effect when PHP is running in safe mode.
-
-    You can also use any string as in :file:`php.ini`, eg. '16M'. Ensure you
-    don't omit the suffix (16 means 16 bytes!)
-
-.. config:option:: $cfg['SkipLockedTables']
-
-    :type: boolean
-    :default: false
-
-    Mark used tables and make it possible to show databases with locked
-    tables (since MySQL 3.23.30).
-
-.. config:option:: $cfg['ShowSQL']
-
-    :type: boolean
-    :default: true
-
-    Defines whether :term:`SQL` queries
-    generated by phpMyAdmin should be displayed or not.
-
-.. config:option:: $cfg['RetainQueryBox']
-
-    :type: boolean
-    :default: false
-
-    Defines whether the :term:`SQL` query box
-    should be kept displayed after its submission.
-
-.. config:option:: $cfg['CodemirrorEnable']
-
-    :type: boolean
-    :default: true
-
-    Defines whether to use a Javascript code editor for SQL query boxes.
-    CodeMirror provides syntax highlighting and line numbers.  However,
-    middle-clicking for pasting the clipboard contents in some Linux
-    distributions (such as Ubuntu) is not supported by all browsers.
-
-.. config:option:: $cfg['DefaultForeignKeyChecks']
-
-    :type: string
-    :default: ``'default'``
-
-    Default value of the checkbox for foreign key checks, to disable/enable
-    foreign key checks for certain queries. The possible values are ``'default'``,
-    ``'enable'`` or ``'disable'``. If set to ``'default'``, the value of the
-    MySQL variable ``FOREIGN_KEY_CHECKS`` is used.
-
-.. config:option:: $cfg['AllowUserDropDatabase']
-
-    :type: boolean
-    :default: false
-
-    .. warning::
-
-        This is not a security measure as there will be always ways to
-        circumvent this. If you want to prohibit users from dropping databases,
-        revoke their corresponding DROP privilege.
-
-    Defines whether normal users (non-administrator) are allowed to delete
-    their own database or not. If set as false, the link :guilabel:`Drop
-    Database` will not be shown, and even a ``DROP DATABASE mydatabase`` will
-    be rejected. Quite practical for :term:`ISP` 's with many customers.
-
-    This limitation of :term:`SQL` queries is not as strict as when using MySQL
-    privileges. This is due to nature of :term:`SQL` queries which might be
-    quite complicated.  So this choice should be viewed as help to avoid
-    accidental dropping rather than strict privilege limitation.
-
-.. config:option:: $cfg['Confirm']
-
-    :type: boolean
-    :default: true
-
-    Whether a warning ("Are your really sure...") should be displayed when
-    you're about to lose data.
-
-.. config:option:: $cfg['UseDbSearch']
-
-    :type: boolean
-    :default: true
-
-    Define whether the "search string inside database" is enabled or not.
-
-.. config:option:: $cfg['IgnoreMultiSubmitErrors']
-
-    :type: boolean
-    :default: false
-
-    Define whether phpMyAdmin will continue executing a multi-query
-    statement if one of the queries fails. Default is to abort execution.
-
-Cookie authentication options
------------------------------
-
-.. config:option:: $cfg['blowfish_secret']
-
-    :type: string
-    :default: ``''``
-
-    The "cookie" auth\_type uses AES algorithm to encrypt the password. If you
-    are using the "cookie" auth\_type, enter here a random passphrase of your
-    choice. It will be used internally by the AES algorithm: you won’t be
-    prompted for this passphrase. 
-    
-    The secret should be 32 characters long. Using shorter will lead to weaker security
-    of encrypted cookies, using longer will cause no harm.
-
-    .. note::
-
-        The configuration is called blowfish_secret for historical reasons as
-        Blowfish algorithm was originally used to do the encryption.
-
-    .. versionchanged:: 3.1.0
-        Since version 3.1.0 phpMyAdmin can generate this on the fly, but it
-        makes a bit weaker security as this generated secret is stored in
-        session and furthermore it makes impossible to recall user name from
-        cookie.
-
-.. config:option:: $cfg['LoginCookieRecall']
-
-    :type: boolean
-    :default: true
-
-    Define whether the previous login should be recalled or not in cookie
-    authentication mode.
-
-    This is automatically disabled if you do not have
-    configured :config:option:`$cfg['blowfish_secret']`.
-
-.. config:option:: $cfg['LoginCookieValidity']
-
-    :type: integer [number of seconds]
-    :default: 1440
-
-    Define how long a login cookie is valid. Please note that php
-    configuration option `session.gc\_maxlifetime
-    <https://php.net/manual/en/session.configuration.php#ini.session.gc-
-    maxlifetime>`_ might limit session validity and if the session is lost,
-    the login cookie is also invalidated. So it is a good idea to set
-    ``session.gc_maxlifetime`` at least to the same value of
-    :config:option:`$cfg['LoginCookieValidity']`.
-
-.. config:option:: $cfg['LoginCookieStore']
-
-    :type: integer [number of seconds]
-    :default: 0
-
-    Define how long login cookie should be stored in browser. Default 0
-    means that it will be kept for existing session. This is recommended
-    for not trusted environments.
-
-.. config:option:: $cfg['LoginCookieDeleteAll']
-
-    :type: boolean
-    :default: true
-
-    If enabled (default), logout deletes cookies for all servers,
-    otherwise only for current one. Setting this to false makes it easy to
-    forget to log out from other server, when you are using more of them.
-
-.. _AllowArbitraryServer:
-.. config:option:: $cfg['AllowArbitraryServer']
-
-    :type: boolean
-    :default: false
-
-    If enabled, allows you to log in to arbitrary servers using cookie
-    authentication.
-
-    .. note::
-
-        Please use this carefully, as this may allow users access to MySQL servers
-        behind the firewall where your :term:`HTTP` server is placed.
-        See also :config:option:`$cfg['ArbitraryServerRegexp']`.
-
-.. config:option:: $cfg['ArbitraryServerRegexp']
-
-    :type: string
-    :default: ``''``
-
-    Restricts the MySQL servers to which the user can log in when
-    :config:option:`$cfg['AllowArbitraryServer']` is enabled by
-    matching the :term:`IP` or the hostname of the MySQL server
-    to the given regular expression. The regular expression must be enclosed
-    with a delimiter character.
-
-    It is recommended to include start and end symbols in the regullar
-    expression, so that you can avoid partial matches on the string.
-
-    **Examples:**
-
-    .. code-block:: php
-
-        // Allow connection to three listed servers:
-        $cfg['ArbitraryServerRegexp'] = '/^(server|another|yetdifferent)$/'; 
-
-        // Allow connection to range of IP addresses:
-        $cfg['ArbitraryServerRegexp'] = '@^192\.168\.0\.[0-9]{1,}$@';
-
-        // Allow connection to server name ending with -mysql:
-        $cfg['ArbitraryServerRegexp'] = '@^[^:]\-mysql$@';
-
-    .. note::
-
-        The whole server name is matched, it can include port as well. Due to
-        way MySQL is permissive in connection parameters, it is possible to use
-        connection strings as ```server:3306-mysql```. This can be used to
-        bypass regullar expression by the suffix, while connecting to another
-        server.
-
-.. config:option:: $cfg['CaptchaLoginPublicKey']
-
-    :type: string
-    :default: ``''``
-
-    The public key for the reCaptcha service that can be obtained from
-    https://www.google.com/recaptcha.
-
-    reCaptcha will be then used in :ref:`cookie`.
-
-.. config:option:: $cfg['CaptchaLoginPrivateKey']
-
-    :type: string
-    :default: ``''``
-
-    The private key for the reCaptcha service that can be obtain from
-    https://www.google.com/recaptcha.
-
-    reCaptcha will be then used in :ref:`cookie`.
-
-Navigation panel setup
-----------------------
-
-.. config:option:: $cfg['ShowDatabasesNavigationAsTree']
-
-    :type: boolean
-    :default: true
-
-    In the navigation panel, replaces the database tree with a selector
-
-.. config:option:: $cfg['FirstLevelNavigationItems']
-
-    :type: integer
-    :default: 100
-
-    The number of first level databases that can be displayed on each page
-    of navigation tree.
-
-.. config:option:: $cfg['MaxNavigationItems']
-
-    :type: integer
-    :default: 50
-
-    The number of items (tables, columns, indexes) that can be displayed on each
-    page of the navigation tree.
-
-.. config:option:: $cfg['NavigationTreeEnableGrouping']
-
-    :type: boolean
-    :default: true
-
-    Defines whether to group the databases based on a common prefix
-    in their name :config:option:`$cfg['NavigationTreeDbSeparator']`.
-
-.. config:option:: $cfg['NavigationTreeDbSeparator']
-
-    :type: string
-    :default: ``'_'``
-
-    The string used to separate the parts of the database name when
-    showing them in a tree.
-
-.. config:option:: $cfg['NavigationTreeTableSeparator']
-
-    :type: string or array
-    :default: ``'__'``
-
-    Defines a string to be used to nest table spaces. This means if you have
-    tables like ``first__second__third`` this will be shown as a three-level
-    hierarchy like: first > second > third.  If set to false or empty, the
-    feature is disabled. NOTE: You should not use this separator at the
-    beginning or end of a table name or multiple times after another without
-    any other characters in between.
-
-.. config:option:: $cfg['NavigationTreeTableLevel']
-
-    :type: integer
-    :default: 1
-
-    Defines how many sublevels should be displayed when splitting up
-    tables by the above separator.
-
-.. config:option:: $cfg['NumRecentTables']
-
-    :type: integer
-    :default: 10
-
-    The maximum number of recently used tables shown in the navigation
-    panel. Set this to 0 (zero) to disable the listing of recent tables.
-
-.. config:option:: $cfg['NumFavoriteTables']
-
-    :type: integer
-    :default: 10
-
-    The maximum number of favorite tables shown in the navigation
-    panel. Set this to 0 (zero) to disable the listing of favorite tables.
-
-.. config:option:: $cfg['ZeroConf']
-
-    :type: boolean
-    :default: true
-
-    Enables Zero Configuration mode in which the user will be offered a choice to
-    create phpMyAdmin configuration storage in the current database
-    or use the existing one, if already present.
-
-    This setting has no effect if the phpMyAdmin configuration storage database
-    is properly created and the related configuration directives (such as
-    :config:option:`$cfg['Servers'][$i]['pmadb']` and so on) are configured.
-
-.. config:option:: $cfg['NavigationLinkWithMainPanel']
-
-    :type: boolean
-    :default: true
-
-    Defines whether or not to link with main panel by highlighting
-    the current database or table.
-
-.. config:option:: $cfg['NavigationDisplayLogo']
-
-    :type: boolean
-    :default: true
-
-    Defines whether or not to display the phpMyAdmin logo at the top of
-    the navigation panel.
-
-.. config:option:: $cfg['NavigationLogoLink']
-
-    :type: string
-    :default: ``'index.php'``
-
-    Enter :term:`URL` where logo in the navigation panel will point to.
-    For use especially with self made theme which changes this.
-    For external URLs, you should include URL scheme as well.
-
-.. config:option:: $cfg['NavigationLogoLinkWindow']
-
-    :type: string
-    :default: ``'main'``
-
-    Whether to open the linked page in the main window (``main``) or in a
-    new one (``new``). Note: use ``new`` if you are linking to
-    ``phpmyadmin.net``.
-
-.. config:option:: $cfg['NavigationTreeDisplayItemFilterMinimum']
-
-    :type: integer
-    :default: 30
-
-    Defines the minimum number of items (tables, views, routines and
-    events) to display a JavaScript filter box above the list of items in
-    the navigation tree.
-
-    To disable the filter completely some high number can be used (e.g. 9999)
-
-.. config:option:: $cfg['NavigationTreeDisplayDbFilterMinimum']
-
-    :type: integer
-    :default: 30
-
-    Defines the minimum number of databases to display a JavaScript filter
-    box above the list of databases in the navigation tree.
-
-    To disable the filter completely some high number can be used
-    (e.g. 9999)
-
-.. config:option:: $cfg['NavigationDisplayServers']
-
-    :type: boolean
-    :default: true
-
-    Defines whether or not to display a server choice at the top of the
-    navigation panel.
-
-.. config:option:: $cfg['DisplayServersList']
-
-    :type: boolean
-    :default: false
-
-    Defines whether to display this server choice as links instead of in a
-    drop-down.
-
-.. config:option:: $cfg['NavigationTreeDefaultTabTable']
-
-    :type: string
-    :default: ``'structure'``
-
-    Defines the tab displayed by default when clicking the small icon next
-    to each table name in the navigation panel. The possible values are the
-    localized equivalent of:
-
-    * ``structure``
-    * ``sql``
-    * ``search``
-    * ``insert``
-    * ``browse``
-
-.. config:option:: $cfg['NavigationTreeDefaultTabTable2']
-
-    :type: string
-    :default: null
-
-    Defines the tab displayed by default when clicking the second small icon next
-    to each table name in the navigation panel. The possible values are the
-    localized equivalent of:
-
-    * ``(empty)``
-    * ``structure``
-    * ``sql``
-    * ``search``
-    * ``insert``
-    * ``browse``
-
-.. config:option:: $cfg['NavigationTreeEnableExpansion']
-
-    :type: boolean
-    :default: false
-
-    Whether to offer the possibility of tree expansion in the navigation panel.
-
-.. config:option:: $cfg['NavigationTreeShowTables']
-
-    :type: boolean
-    :default: true
-
-    Whether to show tables under database in the navigation panel.
-
-.. config:option:: $cfg['NavigationTreeShowViews']
-
-    :type: boolean
-    :default: true
-
-    Whether to show views under database in the navigation panel.
-
-.. config:option:: $cfg['NavigationTreeShowFunctions']
-
-    :type: boolean
-    :default: true
-
-    Whether to show functions under database in the navigation panel.
-
-.. config:option:: $cfg['NavigationTreeShowProcedures']
-
-    :type: boolean
-    :default: true
-
-    Whether to show procedures under database in the navigation panel.
-
-.. config:option:: $cfg['NavigationTreeShowEvents']
-
-    :type: boolean
-    :default: true
-
-    Whether to show events under database in the navigation panel.
-
-
-Main panel
-----------
-
-.. config:option:: $cfg['ShowStats']
-
-    :type: boolean
-    :default: true
-
-    Defines whether or not to display space usage and statistics about
-    databases and tables. Note that statistics requires at least MySQL
-    3.23.3 and that, at this date, MySQL doesn't return such information
-    for Berkeley DB tables.
-
-.. config:option:: $cfg['ShowServerInfo']
-
-    :type: boolean
-    :default: true
-
-    Defines whether to display detailed server information on main page.
-    You can additionally hide more information by using
-    :config:option:`$cfg['Servers'][$i]['verbose']`.
-
-.. config:option:: $cfg['ShowChgPassword']
-
-    :type: boolean
-    :default: true
-
-.. config:option:: $cfg['ShowCreateDb']
-
-    :type: boolean
-    :default: true
-
-    Defines whether to display the 
-    :guilabel:`Change password` links and form for creating database or not at
-    the starting main (right) frame. This setting does not check MySQL commands
-    entered directly.
-
-    Also note that enabling the :guilabel:`Change password` link has no effect
-    with config authentication mode: because of the hard coded password value
-    in the configuration file, end users can't be allowed to change their
-    passwords.
-
-.. config:option:: $cfg['ShowGitRevision']
-
-    :type: boolean
-    :default: true
-
-    Defines whether to display informations about the current Git revision (if
-    applicable) on the main panel.
-
-.. config:option:: $cfg['MysqlMinVersion']
-
-    :type: array
-
-    Defines the minimum supported MySQL version. The default is chosen
-    by the phpMyAdmin team; however this directive was asked by a developer
-    of the Plesk control panel to ease integration with older MySQL servers
-    (where most of the phpMyAdmin features work).
-
-Database structure
-------------------
-
-.. config:option:: $cfg['ShowDbStructureCreation']
-
-    :type: boolean
-    :default: false
-
-    Defines whether the database structure page (tables list) has a
-    "Creation" column that displays when each table was created.
-
-.. config:option:: $cfg['ShowDbStructureLastUpdate']
-
-    :type: boolean
-    :default: false
-
-    Defines whether the database structure page (tables list) has a "Last
-    update" column that displays when each table was last updated.
-
-.. config:option:: $cfg['ShowDbStructureLastCheck']
-
-    :type: boolean
-    :default: false
-
-    Defines whether the database structure page (tables list) has a "Last
-    check" column that displays when each table was last checked.
-
-.. config:option:: $cfg['HideStructureActions']
-
-    :type: boolean
-    :default: true
-
-    Defines whether the table structure actions are hidden under a "More"
-    drop-down.
-
-Browse mode
------------
-
-.. config:option:: $cfg['TableNavigationLinksMode']
-
-    :type: string
-    :default: ``'icons'``
-
-    Defines whether the table navigation links contain ``'icons'``, ``'text'``
-    or ``'both'``.
-
-.. config:option:: $cfg['ActionLinksMode']
-
-    :type: string
-    :default: ``'both'``
-
-    If set to ``icons``, will display icons instead of text for db and table
-    properties links (like :guilabel:`Browse`, :guilabel:`Select`,
-    :guilabel:`Insert`, ...). Can be set to ``'both'``
-    if you want icons AND text. When set to ``text``, will only show text.
-
-.. config:option:: $cfg['RowActionType']
-
-    :type: string
-    :default: ``'both'``
-
-    Whether to display icons or text or both icons and text in table row action
-    segment. Value can be either of ``'icons'``, ``'text'`` or ``'both'``.
-
-.. config:option:: $cfg['ShowAll']
-
-    :type: boolean
-    :default: false
-
-    Defines whether a user should be displayed a "Show all" button in browse
-    mode or not in all cases. By default it is shown only on small tables (less
-    than 500 rows) to avoid performance issues while getting too many rows.
-
-.. config:option:: $cfg['MaxRows']
-
-    :type: integer
-    :default: 25
-
-    Number of rows displayed when browsing a result set and no LIMIT
-    clause is used. If the result set contains more rows, "Previous" and
-    "Next" links will be shown. Possible values: 25,50,100,250,500.
-
-.. config:option:: $cfg['Order']
-
-    :type: string
-    :default: ``'SMART'``
-
-    Defines whether columns are displayed in ascending (``ASC``) order, in
-    descending (``DESC``) order or in a "smart" (``SMART``) order - I.E.
-    descending order for columns of type TIME, DATE, DATETIME and
-    TIMESTAMP, ascending order else- by default.
-
-.. config:option:: $cfg['GridEditing']
-
-    :type: string
-    :default: ``'double-click'``
-
-    Defines which action (``double-click`` or ``click``) triggers grid
-    editing. Can be deactivated with the ``disabled`` value.
-
-.. config:option:: $cfg['RelationalDisplay']
-
-    :type: string
-    :default: ``'K'``
-
-    Defines the initial behavior for Options > Relational. ``K``, which
-    is the default, displays the key while ``D`` shows the display column.
-
-.. config:option:: $cfg['SaveCellsAtOnce']
-
-    :type: boolean
-    :default: false
-
-    Defines whether or not to save all edited cells at once for grid
-    editing.
-
-Editing mode
-------------
-
-.. config:option:: $cfg['ProtectBinary']
-
-    :type: boolean or string
-    :default: ``'blob'``
-
-    Defines whether ``BLOB`` or ``BINARY`` columns are protected from
-    editing when browsing a table's content. Valid values are:
-
-    * ``false`` to allow editing of all columns;
-    * ``'blob'`` to allow editing of all columns except ``BLOBS``;
-    * ``'noblob'`` to disallow editing of all columns except ``BLOBS`` (the
-      opposite of ``'blob'``);
-    * ``'all'`` to disallow editing of all ``BINARY`` or ``BLOB`` columns.
-
-.. config:option:: $cfg['ShowFunctionFields']
-
-    :type: boolean
-    :default: true
-
-    Defines whether or not MySQL functions fields should be initially
-    displayed in edit/insert mode. Since version 2.10, the user can toggle
-    this setting from the interface.
-
-.. config:option:: $cfg['ShowFieldTypesInDataEditView']
-
-    :type: boolean
-    :default: true
-
-    Defines whether or not type fields should be initially displayed in
-    edit/insert mode. The user can toggle this setting from the interface.
-
-.. config:option:: $cfg['InsertRows']
-
-    :type: integer
-    :default: 2
-
-    Defines the maximum number of concurrent entries for the Insert page.
-
-.. config:option:: $cfg['ForeignKeyMaxLimit']
-
-    :type: integer
-    :default: 100
-
-    If there are fewer items than this in the set of foreign keys, then a
-    drop-down box of foreign keys is presented, in the style described by
-    the :config:option:`$cfg['ForeignKeyDropdownOrder']` setting.
-
-.. config:option:: $cfg['ForeignKeyDropdownOrder']
-
-    :type: array
-    :default: array('content-id', 'id-content')
-
-    For the foreign key drop-down fields, there are several methods of
-    display, offering both the key and value data. The contents of the
-    array should be one or both of the following strings: ``content-id``,
-    ``id-content``.
-
-Export and import settings
---------------------------
-
-.. config:option:: $cfg['ZipDump']
-
-    :type: boolean
-    :default: true
-
-.. config:option:: $cfg['GZipDump']
-
-    :type: boolean
-    :default: true
-
-.. config:option:: $cfg['BZipDump']
-
-    :type: boolean
-    :default: true
-
-    Defines whether to allow the use of zip/GZip/BZip2 compression when
-    creating a dump file
-
-.. config:option:: $cfg['CompressOnFly']
-
-    :type: boolean
-    :default: true
-
-    Defines whether to allow on the fly compression for GZip/BZip2
-    compressed exports. This doesn't affect smaller dumps and allows users
-    to create larger dumps that won't otherwise fit in memory due to php
-    memory limit. Produced files contain more GZip/BZip2 headers, but all
-    normal programs handle this correctly.
-
-.. config:option:: $cfg['Export']
-
-    :type: array
-    :default: array(...)
-
-    In this array are defined default parameters for export, names of
-    items are similar to texts seen on export page, so you can easily
-    identify what they mean.
-
-.. config:option:: $cfg['Export']['method']
-
-    :type: string
-    :default: ``'quick'``
-
-    Defines how the export form is displayed when it loads. Valid values
-    are:
-
-    * ``quick`` to display the minimum number of options to configure
-    * ``custom`` to display every available option to configure
-    * ``custom-no-form`` same as ``custom`` but does not display the option
-      of using quick export
-
-
-
-.. config:option:: $cfg['Import']
-
-    :type: array
-    :default: array(...)
-
-    In this array are defined default parameters for import, names of
-    items are similar to texts seen on import page, so you can easily
-    identify what they mean.
-
-
-Tabs display settings
----------------------
-
-.. config:option:: $cfg['TabsMode']
-
-    :type: string
-    :default: ``'both'``
-
-    Defines whether the menu tabs contain ``'icons'``, ``'text'`` or ``'both'``.
-
-.. config:option:: $cfg['PropertiesNumColumns']
-
-    :type: integer
-    :default: 1
-
-    How many columns will be utilized to display the tables on the database
-    property view? When setting this to a value larger than 1, the type of the
-    database will be omitted for more display space.
-
-.. config:option:: $cfg['DefaultTabServer']
-
-    :type: string
-    :default: ``'welcome'``
-
-    Defines the tab displayed by default on server view. The possible values
-    are the localized equivalent of:
-
-    * ``welcome`` (recommended for multi-user setups)
-    * ``databases``,
-    * ``status``
-    * ``variables``
-    * ``privileges``
-
-.. config:option:: $cfg['DefaultTabDatabase']
-
-    :type: string
-    :default: ``'structure'``
-
-    Defines the tab displayed by default on database view. The possible values
-    are the localized equivalent of:
-
-    * ``structure``
-    * ``sql``
-    * ``search``
-    * ``operations``
-
-.. config:option:: $cfg['DefaultTabTable']
-
-    :type: string
-    :default: ``'browse'``
-
-    Defines the tab displayed by default on table view. The possible values
-    are the localized equivalent of:
-
-    * ``structure``
-    * ``sql``
-    * ``search``
-    * ``insert``
-    * ``browse``
-
-PDF Options
------------
-
-.. config:option:: $cfg['PDFPageSizes']
-
-    :type: array
-    :default: ``array('A3', 'A4', 'A5', 'letter', 'legal')``
-
-    Array of possible paper sizes for creating PDF pages.
-
-    You should never need to change this.
-
-.. config:option:: $cfg['PDFDefaultPageSize']
-
-    :type: string
-    :default: ``'A4'``
-
-    Default page size to use when creating PDF pages. Valid values are any
-    listed in :config:option:`$cfg['PDFPageSizes']`.
-
-Languages
----------
-
-.. config:option:: $cfg['DefaultLang']
-
-    :type: string
-    :default: ``'en'``
-
-    Defines the default language to use, if not browser-defined or user-
-    defined. The corresponding language file needs to be in
-    locale/*code*/LC\_MESSAGES/phpmyadmin.mo.
-
-.. config:option:: $cfg['DefaultConnectionCollation']
-
-    :type: string
-    :default: ``'utf8_general_ci'``
-
-    Defines the default connection collation to use, if not user-defined.
-    See the `MySQL documentation for charsets
-    <https://dev.mysql.com/doc/mysql/en/charset-charsets.html>`_
-    for list of possible values.
-
-.. config:option:: $cfg['Lang']
-
-    :type: string
-    :default: not set
-
-    Force language to use. The corresponding language file needs to be in
-    locale/*code*/LC\_MESSAGES/phpmyadmin.mo.
-
-.. config:option:: $cfg['FilterLanguages']
-
-    :type: string
-    :default: ``''``
-
-    Limit list of available languages to those matching the given regular
-    expression. For example if you want only Czech and English, you should
-    set filter to ``'^(cs|en)'``.
-
-.. config:option:: $cfg['RecodingEngine']
-
-    :type: string
-    :default: ``'auto'``
-
-    You can select here which functions will be used for character set
-    conversion. Possible values are:
-
-    * auto - automatically use available one (first is tested iconv, then
-      recode)
-    * iconv - use iconv or libiconv functions
-    * recode - use recode\_string function
-    * mb - use mbstring extension
-    * none - disable encoding conversion
-
-    Enabled charset conversion activates a pull-down menu in the Export
-    and Import pages, to choose the character set when exporting a file.
-    The default value in this menu comes from
-    :config:option:`$cfg['Export']['charset']` and :config:option:`$cfg['Import']['charset']`.
-
-.. config:option:: $cfg['IconvExtraParams']
-
-    :type: string
-    :default: ``'//TRANSLIT'``
-
-    Specify some parameters for iconv used in charset conversion. See
-    `iconv documentation <https://www.gnu.org/software/libiconv/documentati
-    on/libiconv/iconv_open.3.html>`_ for details. By default
-    ``//TRANSLIT`` is used, so that invalid characters will be
-    transliterated.
-
-.. config:option:: $cfg['AvailableCharsets']
-
-    :type: array
-    :default: array(...)
-
-    Available character sets for MySQL conversion. You can add your own
-    (any of supported by recode/iconv) or remove these which you don't
-    use. Character sets will be shown in same order as here listed, so if
-    you frequently use some of these move them to the top.
-
-Web server settings
--------------------
-
-.. config:option:: $cfg['OBGzip']
-
-    :type: string/boolean
-    :default: ``'auto'``
-
-    Defines whether to use GZip output buffering for increased speed in
-    :term:`HTTP` transfers. Set to
-    true/false for enabling/disabling. When set to 'auto' (string),
-    phpMyAdmin tries to enable output buffering and will automatically
-    disable it if your browser has some problems with buffering. IE6 with
-    a certain patch is known to cause data corruption when having enabled
-    buffering.
-
-.. config:option:: $cfg['TrustedProxies']
-
-    :type: array
-    :default: array()
-
-    Lists proxies and HTTP headers which are trusted for
-    :config:option:`$cfg['Servers'][$i]['AllowDeny']['order']`. This list is by
-    default empty, you need to fill in some trusted proxy servers if you
-    want to use rules for IP addresses behind proxy.
-
-    The following example specifies that phpMyAdmin should trust a
-    HTTP\_X\_FORWARDED\_FOR (``X -Forwarded-For``) header coming from the proxy
-    1.2.3.4:
-
-    .. code-block:: php
-
-        $cfg['TrustedProxies'] = array('1.2.3.4' => 'HTTP_X_FORWARDED_FOR');
-
-    The :config:option:`$cfg['Servers'][$i]['AllowDeny']['rules']` directive uses the
-    client's IP address as usual.
-
-.. config:option:: $cfg['GD2Available']
-
-    :type: string
-    :default: ``'auto'``
-
-    Specifies whether GD >= 2 is available. If yes it can be used for MIME
-    transformations. Possible values are:
-
-    * auto - automatically detect
-    * yes - GD 2 functions can be used
-    * no - GD 2 function cannot be used
-
-.. config:option:: $cfg['CheckConfigurationPermissions']
-
-    :type: boolean
-    :default: true
-
-    We normally check the permissions on the configuration file to ensure
-    it's not world writable. However, phpMyAdmin could be installed on a
-    NTFS filesystem mounted on a non-Windows server, in which case the
-    permissions seems wrong but in fact cannot be detected. In this case a
-    sysadmin would set this parameter to ``false``.
-
-.. config:option:: $cfg['LinkLengthLimit']
-
-    :type: integer
-    :default: 1000
-
-    Limit for length of :term:`URL` in links.  When length would be above this
-    limit, it is replaced by form with button. This is required as some web
-    servers (:term:`IIS`) have problems with long :term:`URL` .
-
-.. config:option:: $cfg['CSPAllow']
-
-    :type: string
-    :default: ``''``
-
-    Additional string to include in allowed script and image sources in Content
-    Security Policy header.
-
-    This can be useful when you want to include some external JavaScript files
-    in :file:`config.footer.inc.php` or :file:`config.header.inc.php`, which
-    would be normally not allowed by Content Security Policy.
-
-    To allow some sites, just list them within the string:
-
-    .. code-block:: php
-
-        $cfg['CSPAllow'] = 'example.com example.net';
-
-    .. versionadded:: 4.0.4
-
-.. config:option:: $cfg['DisableMultiTableMaintenance']
-
-    :type: boolean
-    :default: false
-
-    In the database Structure page, it's possible to mark some tables then
-    choose an operation like optimizing for many tables. This can slow
-    down a server; therefore, setting this to ``true`` prevents this kind
-    of multiple maintenance operation.
-
-Theme settings
---------------
-
-    Please directly modify :file:`themes/themename/layout.inc.php`, although
-    your changes will be overwritten with the next update.
-
-Design customization
---------------------
-
-.. config:option:: $cfg['NavigationTreePointerEnable']
-
-    :type: boolean
-    :default: true
-
-    When set to true, hovering over an item in the navigation panel causes that item to be marked
-    (the background is highlighted).
-
-.. config:option:: $cfg['BrowsePointerEnable']
-
-    :type: boolean
-    :default: true
-
-    When set to true, hovering over a row in the Browse page causes that row to be marked (the background
-    is highlighted).
-
-.. config:option:: $cfg['BrowseMarkerEnable']
-
-    :type: boolean
-    :default: true
-
-    When set to true, a data row is marked (the background is highlighted) when the row is selected
-    with the checkbox.
-
-.. config:option:: $cfg['LimitChars']
-
-    :type: integer
-    :default: 50
-
-    Maximum number of characters shown in any non-numeric field on browse
-    view. Can be turned off by a toggle button on the browse page.
-
-.. config:option:: $cfg['RowActionLinks']
-
-    :type: string
-    :default: ``'left'``
-
-    Defines the place where table row links (Edit, Copy, Delete) would be
-    put when tables contents are displayed (you may have them displayed at
-    the left side, right side, both sides or nowhere).
-
-.. config:option:: $cfg['RowActionLinksWithoutUnique']
-
-    :type: boolean
-    :default: false
-
-    Defines whether to show row links (Edit, Copy, Delete) and checkboxes
-    for multiple row operations even when the selection does not have a unique key.
-    Using row actions in the absence of a unique key may result in different/more
-    rows being affected since there is no guaranteed way to select the exact row(s).
-
-.. config:option:: $cfg['RememberSorting']
-
-    :type: boolean
-    :default: true
-
-    If enabled, remember the sorting of each table when browsing them.
-
-.. config:option:: $cfg['TablePrimaryKeyOrder']
-
-    :type: string
-    :default: ``'NONE'``
-
-    This defines the default sort order for the tables, having a primary key,
-    when there is no sort order defines externally.
-    Acceptable values : ['NONE', 'ASC', 'DESC']
-
-.. config:option:: $cfg['ShowBrowseComments']
-
-    :type: boolean
-    :default: true
-
-.. config:option:: $cfg['ShowPropertyComments']
-
-    :type: boolean
-    :default: true
-
-    By setting the corresponding variable to ``true`` you can enable the
-    display of column comments in Browse or Property display. In browse
-    mode, the comments are shown inside the header. In property mode,
-    comments are displayed using a CSS-formatted dashed-line below the
-    name of the column. The comment is shown as a tool-tip for that
-    column.
-
-Text fields
------------
-
-.. config:option:: $cfg['CharEditing']
-
-    :type: string
-    :default: ``'input'``
-
-    Defines which type of editing controls should be used for CHAR and
-    VARCHAR columns. Applies to data editing and also to the default values
-    in structure editing. Possible values are:
-
-    * input - this allows to limit size of text to size of columns in MySQL,
-      but has problems with newlines in columns
-    * textarea - no problems with newlines in columns, but also no length
-      limitations
-
-.. config:option:: $cfg['MinSizeForInputField']
-
-    :type: integer
-    :default: 4
-
-    Defines the minimum size for input fields generated for CHAR and
-    VARCHAR columns.
-
-.. config:option:: $cfg['MaxSizeForInputField']
-
-    :type: integer
-    :default: 60
-
-    Defines the maximum size for input fields generated for CHAR and
-    VARCHAR columns.
-
-.. config:option:: $cfg['TextareaCols']
-
-    :type: integer
-    :default: 40
-
-.. config:option:: $cfg['TextareaRows']
-
-    :type: integer
-    :default: 15
-
-.. config:option:: $cfg['CharTextareaCols']
-
-    :type: integer
-    :default: 40
-
-.. config:option:: $cfg['CharTextareaRows']
-
-    :type: integer
-    :default: 2
-
-    Number of columns and rows for the textareas. This value will be
-    emphasized (\*2) for :term:`SQL` query
-    textareas and (\*1.25) for :term:`SQL`
-    textareas inside the query window.
-
-    The Char\* values are used for CHAR
-    and VARCHAR editing (if configured via :config:option:`$cfg['CharEditing']`).
-
-.. config:option:: $cfg['LongtextDoubleTextarea']
-
-    :type: boolean
-    :default: true
-
-    Defines whether textarea for LONGTEXT columns should have double size.
-
-.. config:option:: $cfg['TextareaAutoSelect']
-
-    :type: boolean
-    :default: false
-
-    Defines if the whole textarea of the query box will be selected on
-    click.
-
-.. config:option:: $cfg['EnableAutocompleteForTablesAndColumns']
-
-    :type: boolean
-    :default: true
-
-    Whether to enable autocomplete for table and column names in any
-    SQL query box.
-
-
-SQL query box settings
-----------------------
-
-.. config:option:: $cfg['SQLQuery']['Edit']
-
-    :type: boolean
-    :default: true
-
-    Whether to display an edit link to change a query in any SQL Query
-    box.
-
-.. config:option:: $cfg['SQLQuery']['Explain']
-
-    :type: boolean
-    :default: true
-
-    Whether to display a link to explain a SELECT query in any SQL Query
-    box.
-
-.. config:option:: $cfg['SQLQuery']['ShowAsPHP']
-
-    :type: boolean
-    :default: true
-
-    Whether to display a link to wrap a query in PHP code in any SQL Query
-    box.
-
-.. config:option:: $cfg['SQLQuery']['Refresh']
-
-    :type: boolean
-    :default: true
-
-    Whether to display a link to refresh a query in any SQL Query box.
-
-.. _web-dirs:
-
-Web server upload/save/import directories
------------------------------------------
-
-If PHP is running in safe mode, all directories must be owned by the same user
-as the owner of the phpMyAdmin scripts.
-
-If the directory where phpMyAdmin is installed is subject to an
-``open_basedir`` restriction, you need to create a temporary directory in some
-directory accessible by the PHP interpreter.
-
-For security reasons, all directories should be outside the tree published by
-webserver. If you cannot avoid having this directory published by webserver,
-limit access to it either by web server configuration (for example using
-.htaccess or web.config files) or place at least an empty :file:`index.html`
-file there, so that directory listing is not possible. However as long as the
-directory is accessible by web server, an attacker can guess filenames to download
-the files.
-
-.. config:option:: $cfg['UploadDir']
-
-    :type: string
-    :default: ``''``
-
-    The name of the directory where :term:`SQL` files have been uploaded by
-    other means than phpMyAdmin (for example, ftp). Those files are available
-    under a drop-down box when you click the database or table name, then the
-    Import tab.
-
-    If
-    you want different directory for each user, %u will be replaced with
-    username.
-
-    Please note that the file names must have the suffix ".sql"
-    (or ".sql.bz2" or ".sql.gz" if support for compressed formats is
-    enabled).
-
-    This feature is useful when your file is too big to be
-    uploaded via :term:`HTTP`, or when file
-    uploads are disabled in PHP.
-
-    .. warning::
-
-        Please see top of this chapter (:ref:`web-dirs`) for instructions how
-        to setup this directory and how to make its usage secure.
-
-    .. seealso::
-
-        See :ref:`faq1_16` for alternatives.
-
-.. config:option:: $cfg['SaveDir']
-
-    :type: string
-    :default: ``''``
-
-    The name of the directory where dumps can be saved.
-
-    If you want different directory for each user, %u will be replaced with
-    username.
-
-    Please note that the directory must exist and has to be writable for
-    the user running webserver.
-
-    .. warning::
-
-        Please see top of this chapter (:ref:`web-dirs`) for instructions how
-        to setup this directory and how to make its usage secure.
-
-.. config:option:: $cfg['TempDir']
-
-    :type: string
-    :default: ``''``
-
-    The name of the directory where temporary files can be stored.
-
-    This is needed for importing ESRI Shapefiles, see :ref:`faq6_30` and to
-    work around limitations of ``open_basedir`` for uploaded files, see
-    :ref:`faq1_11`.
-
-    This directory should have as strict permissions as possible as the only
-    user required to access this directory is the one who runs the webserver.
-    If you have root privileges, simply make this user owner of this directory
-    and make it accessible only by it:
-
-    .. code-block:: sh
-
-        chown www-data:www-data tmp
-        chmod 700 tmp
-
-    If you cannot change owner of the directory, you can achieve a similar
-    setup using :term:`ACL`:
-
-    .. code-block:: sh
-
-        chmod 700 tmp
-        setfacl -m "g:www-data:rwx" tmp
-        setfacl -d -m "g:www-data:rwx" tmp
-
-    If neither of above works for you, you can still make the directory
-    :command:`chmod 777`, but it might impose risk of other users on system
-    reading and writing data in this directory.
-
-    .. warning::
-
-        Please see top of this chapter (:ref:`web-dirs`) for instructions how
-        to setup this directory and how to make its usage secure.
-
-Various display setting
------------------------
-
-.. config:option:: $cfg['RepeatCells']
-
-    :type: integer
-    :default: 100
-
-    Repeat the headers every X cells, or 0 to deactivate.
-
-.. config:option:: $cfg['QueryHistoryDB']
-
-    :type: boolean
-    :default: false
-
-.. config:option:: $cfg['QueryHistoryMax']
-
-    :type: integer
-    :default: 25
-
-    If :config:option:`$cfg['QueryHistoryDB']` is set to ``true``, all your
-    Queries are logged to a table, which has to be created by you (see
-    :config:option:`$cfg['Servers'][$i]['history']`). If set to false, all your
-    queries will be appended to the form, but only as long as your window is
-    opened they remain saved.
-
-    When using the JavaScript based query window, it will always get updated
-    when you click on a new table/db to browse and will focus if you click on
-    :guilabel:`Edit SQL` after using a query. You can suppress updating the
-    query window by checking the box :guilabel:`Do not overwrite this query
-    from outside the window` below the query textarea. Then you can browse
-    tables/databases in the background without losing the contents of the
-    textarea, so this is especially useful when composing a query with tables
-    you first have to look in. The checkbox will get automatically checked
-    whenever you change the contents of the textarea. Please uncheck the button
-    whenever you definitely want the query window to get updated even though
-    you have made alterations.
-
-    If :config:option:`$cfg['QueryHistoryDB']` is set to ``true`` you can
-    specify the amount of saved history items using
-    :config:option:`$cfg['QueryHistoryMax']`.
-
-.. config:option:: $cfg['BrowseMIME']
-
-    :type: boolean
-    :default: true
-
-    Enable :ref:`transformations`.
-
-.. config:option:: $cfg['MaxExactCount']
-
-    :type: integer
-    :default: 500000
-
-    For InnoDB tables, determines for how large tables phpMyAdmin should
-    get the exact row count using ``SELECT COUNT``. If the approximate row
-    count as returned by ``SHOW TABLE STATUS`` is smaller than this value,
-    ``SELECT COUNT`` will be used, otherwise the approximate count will be
-    used.
-
-.. config:option:: $cfg['MaxExactCountViews']
-
-    :type: integer
-    :default: 0
-
-    For VIEWs, since obtaining the exact count could have an impact on
-    performance, this value is the maximum to be displayed, using a
-    ``SELECT COUNT ... LIMIT``. Setting this to 0 bypasses any row
-    counting.
-
-.. config:option:: $cfg['NaturalOrder']
-
-    :type: boolean
-    :default: true
-
-    Sorts database and table names according to natural order (for
-    example, t1, t2, t10). Currently implemented in the navigation panel
-    and in Database view, for the table list.
-
-.. config:option:: $cfg['InitialSlidersState']
-
-    :type: string
-    :default: ``'closed'``
-
-    If set to ``'closed'``, the visual sliders are initially in a closed
-    state. A value of ``'open'`` does the reverse. To completely disable
-    all visual sliders, use ``'disabled'``.
-
-.. config:option:: $cfg['UserprefsDisallow']
-
-    :type: array
-    :default: array()
-
-    Contains names of configuration options (keys in ``$cfg`` array) that
-    users can't set through user preferences. For possible values, refer
-    to :file:`libraries/config/user_preferences.forms.php`.
-
-.. config:option:: $cfg['UserprefsDeveloperTab']
-
-    :type: boolean
-    :default: false
-
-    Activates in the user preferences a tab containing options for
-    developers of phpMyAdmin.
-
-Page titles
------------
-
-.. config:option:: $cfg['TitleTable']
-
-    :type: string
-    :default: ``'@HTTP_HOST@ / @VSERVER@ / @DATABASE@ / @TABLE@ | @PHPMYADMIN@'``
-
-.. config:option:: $cfg['TitleDatabase']
-
-    :type: string
-    :default: ``'@HTTP_HOST@ / @VSERVER@ / @DATABASE@ | @PHPMYADMIN@'``
-
-.. config:option:: $cfg['TitleServer']
-
-    :type: string
-    :default: ``'@HTTP_HOST@ / @VSERVER@ | @PHPMYADMIN@'``
-
-.. config:option:: $cfg['TitleDefault']
-
-    :type: string
-    :default: ``'@HTTP_HOST@ | @PHPMYADMIN@'``
-
-    Allows you to specify window's title bar. You can use :ref:`faq6_27`.
-
-Theme manager settings
-----------------------
-
-.. config:option:: $cfg['ThemePath']
-
-    :type: string
-    :default: ``'./themes'``
-
-    If theme manager is active, use this as the path of the subdirectory
-    containing all the themes.
-
-.. config:option:: $cfg['ThemeManager']
-
-    :type: boolean
-    :default: true
-
-    Enables user-selectable themes. See :ref:`faqthemes`.
-
-.. config:option:: $cfg['ThemeDefault']
-
-    :type: string
-    :default: ``'pmahomme'``
-
-    The default theme (a subdirectory under :config:option:`$cfg['ThemePath']`).
-
-.. config:option:: $cfg['ThemePerServer']
-
-    :type: boolean
-    :default: false
-
-    Whether to allow different theme for each server.
-
-Default queries
----------------
-
-.. config:option:: $cfg['DefaultQueryTable']
-
-    :type: string
-    :default: ``'SELECT * FROM @TABLE@ WHERE 1'``
-
-.. config:option:: $cfg['DefaultQueryDatabase']
-
-    :type: string
-    :default: ``''``
-
-    Default queries that will be displayed in query boxes when user didn't
-    specify any. You can use standard :ref:`faq6_27`.
-
-
-MySQL settings
---------------
-
-.. config:option:: $cfg['DefaultFunctions']
-
-    :type: array
-    :default: array(...)
-
-    Functions selected by default when inserting/changing row, Functions
-    are defined for meta types as (FUNC\_NUMBER, FUNC\_DATE, FUNC\_CHAR,
-    FUNC\_SPATIAL, FUNC\_UUID) and for ``first_timestamp``, which is used
-    for first timestamp column in table.
-
-
-Developer
----------
-
-.. warning::
-
-    These settings might have huge effect on performance or security.
-
-.. config:option:: $cfg['DBG']
-
-    :type: array
-    :default: array(...)
-
-.. config:option:: $cfg['DBG']['sql']
-
-    :type: boolean
-    :default: false
-
-    Enable logging queries and execution times to be
-    displayed in the console's Debug SQL tab.
-
-.. config:option:: $cfg['DBG']['demo']
-
-    :type: boolean
-    :default: false
-
-    Enable to let server present itself as demo server.
-    This is used for <https://demo.phpmyadmin.net/>.
-
-
-Examples
---------
-
-See following configuration snippets for usual setups of phpMyAdmin.
-
-.. _example-google-ssl:
-
-Google Cloud SQL with SSL
-+++++++++++++++++++++++++
-
-To connect to Google Could SQL, you currently need to disable certificate
-verification. This is caused by the certficate being issued for CN matching
-your instance name, but you connect to an IP address and PHP tries to match
-these two. With verfication you end up with error message like::
-
-    Peer certificate CN=`api-project-851612429544:pmatest' did not match expected CN=`8.8.8.8'
-
-.. warning::
-
-    With disabled verification your traffic is encrypted, but you're open to
-    man in the middle attacks.
-
-To connect phpMyAdmin to Google Cloud SQL using SSL download the client and
-server certificates and tell phpMyAdmin to use them:
-
-.. code-block:: php
-
-    // IP address of your instance
-    $cfg['Servers'][2]['host'] = '8.8.8.8';
-    // Use SSL for connection
-    $cfg['Servers'][$i]['ssl'] = true;
-    // Client secret key
-    $cfg['Servers'][$i]['ssl_key'] = '../client-key.pem';
-    // Client certificate
-    $cfg['Servers'][$i]['ssl_cert'] = '../client-cert.pem';
-    // Server certification authority
-    $cfg['Servers'][$i]['ssl_ca'] = '../server-ca.pem';
-    // Disable SSL verification (see above note)
-    $cfg['Servers'][$i]['ssl_verify'] = false;
-
-.. seealso::
-
-    :config:option:`$cfg['Servers'][$i]['ssl']`,
-    :config:option:`$cfg['Servers'][$i]['ssl_key']`,
-    :config:option:`$cfg['Servers'][$i]['ssl_cert']`,
-    :config:option:`$cfg['Servers'][$i]['ssl_ca']`,
-    :config:option:`$cfg['Servers'][$i]['ssl_verify']`
diff --git a/#pma/doc/html/_sources/copyright.txt b/#pma/doc/html/_sources/copyright.txt
deleted file mode 100644
index 28f42e6d..00000000
--- a/#pma/doc/html/_sources/copyright.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-.. _copyright:
-
-Copyright
-=========
-
-.. code-block:: none
-
-    Copyright (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com>
-    Copyright (C) 2001-2014 Marc Delisle <marc_at_infomarc.info>
-        Olivier Müller <om_at_omnis.ch>
-        Robin Johnson <robbat2_at_users.sourceforge.net>
-        Alexander M. Turek <me_at_derrabus.de>
-        Michal Čihař <michal_at_cihar.com>
-        Garvin Hicking <me_at_supergarv.de>
-        Michael Keck <mkkeck_at_users.sourceforge.net>
-        Sebastian Mendel <cybot_tm_at_users.sourceforge.net>
-        [check credits for more details]
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License version 2, as
-published by the Free Software Foundation.
-
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-Third party licenses
-++++++++++++++++++++
-
-phpMyAdmin includes several third party libraries which come under their
-respective licenses.
-
-jQuery's license, which is where we got the files under js/jquery/ is
-(MIT|GPL), a copy of each license is available in this repository (GPL
-is available as LICENSE, MIT as js/jquery/MIT-LICENSE.txt).
-
-TCPDF which is located under libraries/tcpdf is released under GPL
-version 3 and the license is available as libraries/tcpdf/LICENSE.TXT.
-
-DejaVu fonts which are located under libraries/tcpdf/fonts/ and their
-license is documented in
-libraries/tcpdf/fonts/dejavu-fonts-ttf-2.33/LICENSE.
-
-PHP-gettext which is located under libraries/php-gettext/ is released
-under GPL version 2 license which is available in the LICENSE file.
diff --git a/#pma/doc/html/_sources/credits.txt b/#pma/doc/html/_sources/credits.txt
deleted file mode 100644
index fed0fd6e..00000000
--- a/#pma/doc/html/_sources/credits.txt
+++ /dev/null
@@ -1,1111 +0,0 @@
-.. _credits:
-
-Credits
-=======
-
-
-Credits, in chronological order
-+++++++++++++++++++++++++++++++
-
-* Tobias Ratschiller <tobias\_at\_ratschiller.com>
-
-  * creator of the phpmyadmin project
-
-  * maintainer from 1998 to summer 2000
-
-* Marc Delisle <marc\_at\_infomarc.info>
-
-  * multi-language version in December 1998
-
-  * various fixes and improvements
-
-  * :term:`SQL` analyser (most of it)
-
-  * current project maintainer
-
-  * maintains content on our website
-
-* Olivier Müller <om\_at\_omnis.ch>
-
-  * started SourceForge phpMyAdmin project in March 2001
-
-  * sync'ed different existing CVS trees with new features and bugfixes
-
-  * multi-language improvements, dynamic language selection
-
-  * many bugfixes and improvements
-
-* Loïc Chapeaux <lolo\_at\_phpheaven.net>
-
-  * rewrote and optimized JavaScript, DHTML and DOM stuff
-
-  * rewrote the scripts so they fit the :term:`PEAR` coding standards and
-    generate XHTML1.0 and CSS2 compliant codes
-
-  * improved the language detection system
-
-  * many bugfixes and improvements
-
-* Robin Johnson <robbat2\_at\_users.sourceforge.net>
-
-  * database maintenance controls
-
-  * table type code
-
-  * Host authentication :term:`IP` Allow/Deny
-
-  * DB-based configuration (Not completed)
-
-  * :term:`SQL` parser and pretty-printer
-
-  * :term:`SQL` validator
-
-  * many bugfixes and improvements
-
-* Armel Fauveau <armel.fauveau\_at\_globalis-ms.com>
-
-  * bookmarks feature
-
-  * multiple dump feature
-
-  * gzip dump feature
-
-  * zip dump feature
-
-* Geert Lund <glund\_at\_silversoft.dk>
-
-  * various fixes
-
-  * moderator of the phpMyAdmin former users forum at phpwizard.net
-
-* Korakot Chaovavanich <korakot\_at\_iname.com>
-
-  * "insert as new row" feature
-
-* Pete Kelly <webmaster\_at\_trafficg.com>
-
-  * rewrote and fix dump code
-
-  * bugfixes
-
-* Steve Alberty <alberty\_at\_neptunlabs.de>
-
-  * rewrote dump code for PHP4
-
-  * mySQL table statistics
-
-  * bugfixes
-
-* Benjamin Gandon <gandon\_at\_isia.cma.fr>
-
-  * main author of the version 2.1.0.1
-
-  * bugfixes
-
-* Alexander M. Turek <me\_at\_derrabus.de>
-
-  * MySQL 4.0 / 4.1 / 5.0 compatibility
-
-  * abstract database interface (PMA\_DBI) with MySQLi support
-
-  * privileges administration
-
-  * :term:`XML` exports
-
-  * various features and fixes
-
-  * German language file updates
-
-* Mike Beck <mike.beck\_at\_web.de>
-
-  * automatic joins in QBE
-
-  * links column in printview
-
-  * Relation view
-
-* Michal Čihař <michal\_at\_cihar.com>
-
-  * enhanced index creation/display feature
-
-  * feature to use a different charset for HTML than for MySQL
-
-  * improvements of export feature
-
-  * various features and fixes
-
-  * Czech language file updates
-
-  * created current website for phpMyAdmin
-
-* Christophe Gesché from the "MySQL Form Generator for PHPMyAdmin"
-  (https://sourceforge.net/projects/phpmysqlformgen/)
-
-  * suggested the patch for multiple table printviews
-
-* Garvin Hicking <me\_at\_supergarv.de>
-
-  * built the patch for vertical display of table rows
-
-  * built the Javascript based Query window + :term:`SQL` history
-
-  * Improvement of column/db comments
-
-  * (MIME)-Transformations for columns
-
-  * Use custom alias names for Databases in left frame
-
-  * hierarchical/nested table display
-
-  * :term:`PDF`-scratchboard for WYSIWYG-
-    distribution of :term:`PDF` relations
-
-  * new icon sets
-
-  * vertical display of column properties page
-
-  * some bugfixes, features, support, German language additions
-
-* Yukihiro Kawada <kawada\_at\_den.fujifilm.co.jp>
-
-  * japanese kanji encoding conversion feature
-
-* Piotr Roszatycki <d3xter\_at\_users.sourceforge.net> and Dan Wilson
-
-  * the Cookie authentication mode
-
-* Axel Sander <n8falke\_at\_users.sourceforge.net>
-
-  * table relation-links feature
-
-* Maxime Delorme <delorme.maxime\_at\_free.fr>
-
-  * :term:`PDF` schema output, thanks also to
-    Olivier Plathey for the "FPDF" library (see <http://www.fpdf.org/>), Steven
-    Wittens for the "UFPDF" library and
-    Nicola Asuni for the "TCPDF" library (see <https://tcpdf.org/>).
-
-* Olof Edlund <olof.edlund\_at\_upright.se>
-
-  * :term:`SQL` validator server
-
-* Ivan R. Lanin <ivanlanin\_at\_users.sourceforge.net>
-
-  * phpMyAdmin logo (until June 2004)
-
-* Mike Cochrane <mike\_at\_graftonhall.co.nz>
-
-  * blowfish library from the Horde project (withdrawn in release 4.0)
-
-* Marcel Tschopp <ne0x\_at\_users.sourceforge.net>
-
-  * mysqli support
-
-  * many bugfixes and improvements
-
-* Nicola Asuni (Tecnick.com)
-
-  * TCPDF library (<https://tcpdf.org>)
-
-* Michael Keck <mkkeck\_at\_users.sourceforge.net>
-
-  * redesign for 2.6.0
-
-  * phpMyAdmin sailboat logo (June 2004)
-
-* Mathias Landhäußer
-
-  * Representation at conferences
-
-* Sebastian Mendel <cybot\_tm\_at\_users.sourceforge.net>
-
-  * interface improvements
-
-  * various bugfixes
-
-* Ivan A Kirillov
-
-  * new relations Designer
-
-* Raj Kissu Rajandran (Google Summer of Code 2008)
-
-  * BLOBstreaming support (withdrawn in release 4.0)
-
-* Piotr Przybylski (Google Summer of Code 2008, 2010 and 2011)
-
-  * improved setup script
-
-  * user preferences
-
-  * Drizzle support
-
-* Derek Schaefer (Google Summer of Code 2009)
-
-  * Improved the import system
-
-* Alexander Rutkowski (Google Summer of Code 2009)
-
-  * Tracking mechanism
-
-* Zahra Naeem (Google Summer of Code 2009)
-
-  * Synchronization feature (removed in release 4.0)
-
-* Tomáš Srnka (Google Summer of Code 2009)
-
-  * Replication support
-
-* Muhammad Adnan (Google Summer of Code 2010)
-
-  * Relation schema export to multiple formats
-
-* Lori Lee (Google Summer of Code 2010)
-
-  * User interface improvements
-
-  * ENUM/SET editor
-
-  * Simplified interface for export/import
-
-* Ninad Pundalik (Google Summer of Code 2010)
-
-  * AJAXifying the interface
-
-* Martynas Mickevičius (Google Summer of Code 2010)
-
-  * Charts
-
-* Barrie Leslie
-
-  * BLOBstreaming support with PBMS PHP extension (withdrawn in release
-    4.0)
-
-* Ankit Gupta (Google Summer of Code 2010)
-
-  * Visual query builder
-
-* Madhura Jayaratne (Google Summer of Code 2011)
-
-  * OpenGIS support
-
-* Ammar Yasir (Google Summer of Code 2011)
-
-  * Zoom search
-
-* Aris Feryanto (Google Summer of Code 2011)
-
-  * Browse-mode improvements
-
-* Thilanka Kaushalya (Google Summer of Code 2011)
-
-  * AJAXification
-
-* Tyron Madlener (Google Summer of Code 2011)
-
-  * Query statistics and charts for the status page
-
-* Zarubin Stas (Google Summer of Code 2011)
-
-  * Automated testing
-
-* Rouslan Placella (Google Summer of Code 2011 and 2012)
-
-  * Improved support for Stored Routines, Triggers and Events
-
-  * Italian translation updates
-
-  * Removal of frames, new navigation
-
-* Dieter Adriaenssens
-
-  * Various bugfixes
-
-  * Dutch translation updates
-
-* Alex Marin (Google Summer of Code 2012)
-
-  * New plugins and properties system
-
-* Thilina Buddika Abeyrathna (Google Summer of Code 2012)
-
-  * Refactoring
-
-* Atul Pratap Singh  (Google Summer of Code 2012)
-
-  * Refactoring
-
-* Chanaka Indrajith (Google Summer of Code 2012)
-
-  * Refactoring
-
-* Yasitha Pandithawatta (Google Summer of Code 2012)
-
-  * Automated testing
-
-* Jim Wigginton (phpseclib.sourceforge.net)
-
-  * phpseclib
-
-* Bin Zu (Google Summer of Code 2013)
-
-  * Refactoring
-
-* Supun Nakandala (Google Summer of Code 2013)
-
-  * Refactoring
-
-* Mohamed Ashraf (Google Summer of Code 2013)
-
-  * AJAX error reporting
-
-* Adam Kang (Google Summer of Code 2013)
-
-  * Automated testing
-
-* Ayush Chaudhary (Google Summer of Code 2013)
-
-  * Automated testing
-
-* Kasun Chathuranga (Google Summer of Code 2013)
-
-  * Interface improvements
-
-* Hugues Peccatte
-
-  * Load/save query by example (database search bookmarks)
-
-* Smita Kumari (Google Summer of Code 2014)
-
-  * Central list of columns
-
-  * Improve table structure (normalization)
-
-* Ashutosh Dhundhara (Google Summer of Code 2014)
-
-  * Interface improvements
-
-* Dhananjay Nakrani (Google Summer of Code 2014)
-
-  * PHP error reporting
-
-* Edward Cheng (Google Summer of Code 2014)
-
-  * SQL Query Console
-
-* Kankanamge Bimal Yashodha (Google Summer of Code 2014)
-
-  * Refactoring: Designer/schema integration
-
-* Chirayu Chiripal (Google Summer of Code 2014)
-
-  * Custom field handlers (Input based MIME transformations)
-
-  * Export with table/column name changes
-
-* Dan Ungureanu (Google Summer of Code 2015)
-
-  * New parser and analyzer
-
-* Nisarg Jhaveri (Google Summer of Code 2015)
-
-  * Page-related settings
-
-  * SQL debugging integration to the Console
-
-  * Other UI improvements
-
-* Deven Bansod (Google Summer of Code 2015)
-
-  * Print view using CSS
-
-  * Other UI improvements and new features
-
-And also to the following people who have contributed minor changes,
-enhancements, bugfixes or support for a new language since version
-2.1.0:
-
-Bora Alioglu, Ricardo ?, Sven-Erik Andersen, Alessandro Astarita,
-Péter Bakondy, Borges Botelho, Olivier Bussier, Neil Darlow, Mats
-Engstrom, Ian Davidson, Laurent Dhima, Kristof Hamann, Thomas Kläger,
-Lubos Klokner, Martin Marconcini, Girish Nair, David Nordenberg,
-Andreas Pauley, Bernard M. Piller, Laurent Haas, "Sakamoto", Yuval
-Sarna, www.securereality.com.au, Alexis Soulard, Alvar Soome, Siu Sun,
-Peter Svec, Michael Tacelosky, Rachim Tamsjadi, Kositer Uros, Luís V.,
-Martijn W. van der Lee, Algis Vainauskas, Daniel Villanueva, Vinay,
-Ignacio Vazquez-Abrams, Chee Wai, Jakub Wilk, Thomas Michael
-Winningham, Vilius Zigmantas, "Manuzhai".
-
-
-Translators
-+++++++++++
-
-Following people have contributed to translation of phpMyAdmin:
-
-
-
-* Albanian
-
-    * Arben Çokaj <acokaj\_at\_shkoder.net>
-
-
-* Arabic
-
-    * Ahmed Saleh Abd El-Raouf Ismae <a.saleh.ismael\_at\_gmail.com>
-    * Ahmed Saad <egbrave\_at\_hotmail.com>
-    * hassan mokhtari <persiste1\_at\_gmail.com>
-
-
-* Armenian
-
-    * Andrey Aleksanyants <aaleksanyants\_at\_yahoo.com>
-
-
-* Azerbaijani
-
-    * Mircəlal <01youknowme\_at\_gmail.com>
-    * Huseyn <huseyn_esgerov\_at\_mail.ru>
-    * Sevdimali İsa <sevdimaliisayev\_at\_mail.ru>
-    * Jafar <sharifov\_at\_programmer.net>
-
-
-* Belarusian
-
-    * Viktar Palstsiuk <vipals\_at\_gmail.com>
-
-
-* Bulgarian
-
-    * Boyan Kehayov <bkehayov\_at\_gmail.com>
-    * Valter Georgiev <blagynchy\_at\_gmail.com>
-    * Valentin Mladenov <hudsonvsm\_at\_gmail.com>
-    * P <plamen_mbx\_at\_yahoo.com>
-    * krasimir <vip\_at\_krasio-valia.com>
-
-
-* Catalan
-
-    * josep constanti <jconstanti\_at\_yahoo.es>
-    * Xavier Navarro <xvnavarro\_at\_gmail.com>
-
-
-* Chinese (China)
-
-    * Vincent Lau <3092849\_at\_qq.com>
-    * Zheng Dan <clanboy\_at\_163.com>
-    * disorderman <disorderman\_at\_qq.com>
-    * Rex Lee <duguying2008\_at\_gmail.com>
-    *  <fundawang\_at\_gmail.com>
-    * popcorner <memoword\_at\_163.com>
-    * Yizhou Qiang <qyz.yswy\_at\_hotmail.com>
-    * zz <tczzjin\_at\_gmail.com>
-    * Terry Weng <wengshiyu\_at\_gmail.com>
-    * whh <whhlcj\_at\_126.com>
-
-
-* Chinese (Taiwan)
-
-    * Albert Song <albb0920\_at\_gmail.com>
-    * Chien Wei Lin <cwlin0416\_at\_gmail.com>
-    * LNDDYL <lnddyl\_at\_outlook.com>
-    * Peter Dave Hello <xs910203\_at\_gmail.com>
-
-
-* Colognian
-
-    * Purodha <publi\_at\_web.de>
-
-
-* Czech
-
-    * Aleš Hakl <ales\_at\_hakl.net>
-    * Dalibor Straka <dalibor.straka3\_at\_gmail.com>
-    * Martin Vidner <martin\_at\_vidner.net>
-    * Ondra Šimeček <ondrasek.simecek\_at\_gmail.com>
-    * Jan Palider <palider\_at\_seznam.cz>
-    * Petr Kateřiňák <petr.katerinak\_at\_gmail.com>
-
-
-* Danish
-
-    * Aputsiaĸ Niels Janussen <aj\_at\_isit.gl>
-    * Dennis Jakobsen <dennis.jakobsen\_at\_gmail.com>
-    * Jonas <jonas.den.smarte\_at\_gmail.com>
-    * Claus Svalekjaer <just.my.smtp.server\_at\_gmail.com>
-
-
-* Dutch
-
-    * A. Voogt <a.voogt\_at\_hccnet.nl>
-    * dingo thirteen <dingo13\_at\_gmail.com>
-    * Robin van der Vliet <info\_at\_robinvandervliet.nl>
-    * Dieter Adriaenssens <ruleant\_at\_users.sourceforge.net>
-    * Niko Strijbol <strijbol.niko\_at\_gmail.com>
-
-
-* English (United Kingdom)
-
-    * Dries Verschuere <dries.verschuere\_at\_outlook.com>
-    * Francisco Rocha <j.francisco.o.rocha\_at\_zoho.com>
-    * Marc Delisle <marc\_at\_infomarc.info>
-    * Marek Tomaštík <tomastik.m\_at\_gmail.com>
-
-
-* Esperanto
-
-    * Eliovir <eliovir\_at\_gmail.com>
-    * Robin van der Vliet <info\_at\_robinvandervliet.nl>
-
-
-* Estonian
-
-    * Kristjan Räts <kristjanrats\_at\_gmail.com>
-
-
-* Finnish
-
-    * Juha <jremes\_at\_outlook.com>
-    * Lari Oesch <lari\_at\_oesch.me>
-
-
-* French
-
-    * Marc Delisle <marc\_at\_infomarc.info>
-
-
-* Frisian
-
-    * Robin van der Vliet <info\_at\_robinvandervliet.nl>
-
-
-* Galician
-
-    * Xosé Calvo <xosecalvo\_at\_gmail.com>
-
-
-* German
-
-    * Julian Ladisch <github.com-t3if\_at\_ladisch.de>
-    * Jan Erik Zassenhaus <jan.zassenhaus\_at\_jgerman.de>
-    * Lasse Goericke <lasse\_at\_mydom.de>
-    * Matthias Bluthardt <matthias\_at\_bluthardt.org>
-    * Michael Koch <michael.koch\_at\_enough.de>
-    * Ann + J.M. <phpMyAdmin\_at\_ZweiSteinSoft.de>
-    *  <pma\_at\_sebastianmendel.de>
-    * Phillip Rohmberger <rohmberger\_at\_hotmail.de>
-    * Hauke Henningsen <sqrt\_at\_entless.org>
-
-
-* Greek
-
-    * Παναγιώτης Παπάζογλου <papaz_p\_at\_yahoo.com>
-
-
-* Hebrew
-
-    * Moshe Harush <mmh15\_at\_windowslive.com>
-    * Yaron Shahrabani <sh.yaron\_at\_gmail.com>
-    * Eyal Visoker <visokereyal\_at\_gmail.com>
-
-
-* Hindi
-
-    * Atul Pratap Singh <atulpratapsingh05\_at\_gmail.com>
-    * Yogeshwar <charanyogeshwar\_at\_gmail.com>
-    * Deven Bansod <devenbansod.bits\_at\_gmail.com>
-    * Kushagra Pandey <kushagra4296\_at\_gmail.com>
-    * Nisarg Jhaveri <nisargjhaveri\_at\_gmail.com>
-    * Roohan Kazi <roohan_cena\_at\_yahoo.co.in>
-    * Yugal Pantola <yug.scorpio\_at\_gmail.com>
-
-
-* Hungarian
-
-    * Akos Eros <erosakos02\_at\_gmail.com>
-    * Dániel Tóth <leedermeister\_at\_gmail.com>
-    * Szász Attila <undernetangel\_at\_gmail.com>
-    * Balázs Úr <urbalazs\_at\_gmail.com>
-
-
-* Indonesian
-
-    * Deky Arifianto <Deky40\_at\_gmail.com>
-    * Andika Triwidada <andika\_at\_gmail.com>
-    * Dadan Setia <da2n_s\_at\_yahoo.co.id>
-    * Dadan Setia <dadan.setia\_at\_gmail.com>
-    * Yohanes Edwin <edwin\_at\_yohanesedwin.com>
-    * Fadhiil Rachman <fadhiilrachman\_at\_gmail.com>
-    * Benny <tarzq28\_at\_gmail.com>
-    * Tommy Surbakti <tommy\_at\_surbakti.net>
-    * Zufar Fathi Suhardi <zufar.bogor\_at\_gmail.com>
-
-
-* Interlingua
-
-    * Giovanni Sora <g.sora\_at\_tiscali.it>
-
-
-* Italian
-
-    * Francesco Saverio Giacobazzi <francesco.giacobazzi\_at\_ferrania.it>
-    * Marco Pozzato <ironpotts\_at\_gmail.com>
-    * Stefano Martinelli <stefano.ste.martinelli\_at\_gmail.com>
-
-
-* Japanese
-
-    * k725 <alexalex.kobayashi\_at\_gmail.com>
-    * Hiroshi Chiyokawa <hiroshi.chiyokawa\_at\_gmail.com>
-    * Masahiko HISAKAWA <orzkun\_at\_ageage.jp>
-    * worldwideskier <worldwideskier\_at\_yahoo.co.jp>
-
-
-* Kannada
-
-    * Robin van der Vliet <info\_at\_robinvandervliet.nl>
-    * Shameem Ahmed A Mulla <shameem.sam\_at\_gmail.com>
-
-
-* Korean
-
-    * Bumsoo Kim <bskim45\_at\_gmail.com>
-    * Kyeong Su Shin <cdac1234\_at\_gmail.com>
-    * Dongyoung Kim <dckyoung\_at\_gmail.com>
-    * Myung-han Yu <greatymh\_at\_gmail.com>
-    * JongDeok <human.zion\_at\_gmail.com>
-    * Yong Kim <kim\_at\_nhn.com>
-    * 이경준 <kyungjun2\_at\_gmail.com>
-    * Seongki Shin <skshin\_at\_gmail.com>
-    * Yoon Bum-Jong <virusyoon\_at\_gmail.com>
-    * Koo Youngmin <youngminz.kr\_at\_gmail.com>
-
-
-* Kurdish Sorani
-
-    * Alan Hilal <alan.hilal94\_at\_gmail.com>
-    * Aso Naderi <aso.naderi\_at\_gmail.com>
-    * muhammad <esy_vb\_at\_yahoo.com>
-    * Zrng Abdulla <zhyarabdulla94\_at\_gmail.com>
-
-
-* Latvian
-
-    * Latvian TV <dnighttv\_at\_gmail.com>
-    * Edgars Neimanis <edgarsneims5092\_at\_inbox.lv>
-    * Ukko <perkontevs\_at\_gmail.com>
-
-
-* Limburgish
-
-    * Robin van der Vliet <info\_at\_robinvandervliet.nl>
-
-
-* Lithuanian
-
-    * Vytautas Motuzas <v.motuzas\_at\_gmail.com>
-
-
-* Malay
-
-    * Amir Hamzah <amir.overlord666\_at\_gmail.com>
-    * diprofinfiniti <anonynuine-999\_at\_yahoo.com>
-
-
-* Nepali
-
-    * Nabin Ghimire <nnabinn\_at\_hotmail.com>
-
-
-* Norwegian Bokmål
-
-    * Børge Holm-Wennberg <borge947\_at\_gmail.com>
-    * Tor Stokkan <danorse\_at\_gmail.com>
-    * Espen Frøyshov <efroys\_at\_gmail.com>
-    * Kurt Eilertsen <kurt\_at\_kheds.com>
-    * Christoffer Haugom <ph3n1x.nobody\_at\_gmail.com>
-    * Sebastian <sebastian\_at\_sgundersen.com>
-    * Tomas <tomas\_at\_tomasruud.com>
-
-
-* Persian
-
-    * ashkan shirian <ashkan.shirian\_at\_gmail.com>
-    * HM <goodlinuxuser\_at\_chmail.ir>
-
-
-* Polish
-
-    * Andrzej <andrzej\_at\_kynu.pl>
-    * Przemo <info\_at\_opsbielany.waw.pl>
-    * Krystian Biesaga <krystian4842\_at\_gmail.com>
-    * Maciej Gryniuk <maciejka45\_at\_gmail.com>
-    * Michał VonFlynee <vonflynee\_at\_gmail.com>
-
-
-* Portuguese
-
-    * Alexandre Badalo <alexandre.badalo\_at\_sapo.pt>
-    * João Rodrigues <geral\_at\_jonilive.com>
-    * Pedro Ribeiro <p.m42.ribeiro\_at\_gmail.com>
-    * Sandro Amaral <sandro123iv\_at\_gmail.com>
-
-
-* Portuguese (Brazil)
-
-    * Alex Rohleder <alexrohleder96\_at\_outlook.com>
-    * bruno mendax <brunomendax\_at\_gmail.com>
-    * Danilo GUia <danilo.eng\_at\_globomail.com>
-    * Douglas Rafael Morais Kollar <douglas.kollar\_at\_pg.df.gov.br>
-    * Douglas Eccker <douglaseccker\_at\_hotmail.com>
-    * Ed Jr <edjacobjunior\_at\_gmail.com>
-    * Guilherme Souza Silva <g.szsilva\_at\_gmail.com>
-    * Guilherme Seibt <gui\_at\_webseibt.net>
-    * Helder Santana <helder.bs.santana\_at\_gmail.com>
-    * Junior Zancan <jrzancan\_at\_hotmail.com>
-    * Luis <luis.eduardo.braschi\_at\_outlook.com>
-    * Marcos Algeri <malgeri\_at\_gmail.com>
-    * Marc Delisle <marc\_at\_infomarc.info>
-    * Renato Rodrigues de Lima Júnio <renatomdd\_at\_yahoo.com.br>
-    * Thiago Casotti <thiago.casotti\_at\_uol.com.br>
-    * Victor Laureano <victor.laureano\_at\_gmail.com>
-    * Vinícius Araújo <vinipitta\_at\_gmail.com>
-    * Washington Bruno Rodrigues Cav <washingtonbruno\_at\_msn.com>
-    * Yan Gabriel <yansilvagabriel\_at\_gmail.com>
-
-
-* Punjabi
-
-    * Robin van der Vliet <info\_at\_robinvandervliet.nl>
-
-
-* Romanian
-
-    * Alex <amihaita\_at\_yahoo.com>
-    * Costel Cocerhan <costa1988sv\_at\_gmail.com>
-    * Ion Adrian-Ionut <john\_at\_panevo.ro>
-    * Raul Molnar <molnar.raul\_at\_wservices.eu>
-    * Deleted User <noreply\_at\_weblate.org>
-    * Stefan Murariu <stefan.murariu\_at\_yahoo.com>
-
-
-* Russian
-
-    * Andrey Aleksanyants <aaleksanyants\_at\_yahoo.com>
-    *  <ddrmoscow\_at\_gmail.com>
-    * Robin van der Vliet <info\_at\_robinvandervliet.nl>
-    * Хомутов Иван Сергеевич <khomutov.ivan\_at\_mail.ru>
-    * Alexey Rubinov <orion1979\_at\_yandex.ru>
-    * Олег Карпов <salvadoporjc\_at\_gmail.com>
-    * Egorov Artyom <unlucky\_at\_inbox.ru>
-
-
-* Serbian
-
-    * Smart Kid <kidsmart33\_at\_gmail.com>
-
-
-* Sinhala
-
-    * Madhura Jayaratne <madhura.cj\_at\_gmail.com>
-
-
-* Slovak
-
-    * Martin Lacina <martin\_at\_whistler.sk>
-    * Patrik Kollmann <parkourpotex\_at\_gmail.com>
-    * Jozef Pistej <pistej2\_at\_gmail.com>
-
-
-* Slovenian
-
-    * Domen <mitenem\_at\_outlook.com>
-
-
-* Spanish
-
-    * Luis García Sevillano <floss.dev\_at\_gmail.com>
-    * Franco <fulanodetal.github1\_at\_openaliasbox.org>
-    * Luis Ruiz <luisan00\_at\_hotmail.com>
-    * Macofe <macofe.languagetool\_at\_gmail.com>
-    * Matías Bellone <matiasbellone+weblate\_at\_gmail.com>
-    * Rodrigo A. <ra4\_at\_openmailbox.org>
-    * FAMMA TV NOTICIAS MEDIOS DE CO <revistafammatvmusic.oficial\_at\_gmail.com>
-    * Ronnie Simon <ronniesimonf\_at\_gmail.com>
-
-
-* Swedish
-
-    * Anders Jonsson <anders.jonsson\_at\_norsjovallen.se>
-
-
-* Tamil
-
-    * கணேஷ் குமார் <GANESHTHEONE\_at\_gmail.com>
-    * Achchuthan Yogarajah <achch1990\_at\_gmail.com>
-    * Rifthy Ahmed <rifthy456\_at\_gmail.com>
-
-
-* Thai
-
-    *  <nontawat39\_at\_gmail.com>
-    * Somthanat W. <somthanat\_at\_gmail.com>
-
-
-* Turkish
-
-    * Burak Yavuz <hitowerdigit\_at\_hotmail.com>
-
-
-* Ukrainian
-
-    * Сергій Педько <nitrotoll\_at\_gmail.com>
-    * Igor <vmta\_at\_yahoo.com>
-    * Vitaliy Perekupka <vperekupka\_at\_gmail.com>
-
-
-* Vietnamese
-
-    * Bao Phan <baophan94\_at\_icloud.com>
-    * Xuan Hung <mr.hungdx\_at\_gmail.com>
-    * Bao trinh minh <trinhminhbao\_at\_gmail.com>
-
-
-* West Flemish
-
-    * Robin van der Vliet <info\_at\_robinvandervliet.nl>
-
-Documentation translators
-+++++++++++++++++++++++++
-
-Following people have contributed to translation of phpMyAdmin documentation:
-
-* Albanian
-
-    * Arben Çokaj <acokaj\_at\_shkoder.net>
-
-
-* Arabic
-
-    * Ahmed El Azzabi <ahmedtek1993\_at\_gmail.com>
-    * Omar Essam <omar_2412\_at\_live.com>
-
-
-* Armenian
-
-    * Andrey Aleksanyants <aaleksanyants\_at\_yahoo.com>
-
-
-* Azerbaijani
-
-    * Mircəlal <01youknowme\_at\_gmail.com>
-    * Sevdimali İsa <sevdimaliisayev\_at\_mail.ru>
-
-
-* Catalan
-
-    * josep constanti <jconstanti\_at\_yahoo.es>
-    * Joan Montané <joan\_at\_montane.cat>
-    * Xavier Navarro <xvnavarro\_at\_gmail.com>
-
-
-* Chinese (China)
-
-    * Vincent Lau <3092849\_at\_qq.com>
-    * 罗攀登 <6375lpd\_at\_gmail.com>
-    * disorderman <disorderman\_at\_qq.com>
-    * ITXiaoPang <djh1017555\_at\_126.com>
-    * tunnel213 <tunnel213\_at\_aliyun.com>
-    * Terry Weng <wengshiyu\_at\_gmail.com>
-    * whh <whhlcj\_at\_126.com>
-
-
-* Chinese (Taiwan)
-
-    * Chien Wei Lin <cwlin0416\_at\_gmail.com>
-    * Peter Dave Hello <xs910203\_at\_gmail.com>
-
-
-* Czech
-
-    * Aleš Hakl <ales\_at\_hakl.net>
-    * Michal Čihař <michal\_at\_cihar.com>
-    * Jan Palider <palider\_at\_seznam.cz>
-    * Petr Kateřiňák <petr.katerinak\_at\_gmail.com>
-
-
-* Danish
-
-    * Aputsiaĸ Niels Janussen <aj\_at\_isit.gl>
-    * Claus Svalekjaer <just.my.smtp.server\_at\_gmail.com>
-
-
-* Dutch
-
-    * A. Voogt <a.voogt\_at\_hccnet.nl>
-    * dingo thirteen <dingo13\_at\_gmail.com>
-    * Dries Verschuere <dries.verschuere\_at\_outlook.com>
-    * Robin van der Vliet <info\_at\_robinvandervliet.nl>
-    * Stefan Koolen <nast3zz\_at\_gmail.com>
-    * Ray Borggreve <ray\_at\_datahuis.net>
-    * Dieter Adriaenssens <ruleant\_at\_users.sourceforge.net>
-    * Tom Hofman <tom.hofman\_at\_gmail.com>
-
-
-* Estonian
-
-    * Kristjan Räts <kristjanrats\_at\_gmail.com>
-
-
-* Finnish
-
-    * Juha <jremes\_at\_outlook.com>
-
-
-* French
-
-    * Cédric Corazza <cedric.corazza\_at\_wanadoo.fr>
-    * Étienne Gilli <etienne.gilli\_at\_gmail.com>
-    * Marc Delisle <marc\_at\_infomarc.info>
-    * Donavan_Martin <mart.donavan\_at\_hotmail.com>
-
-
-* Frisian
-
-    * Robin van der Vliet <info\_at\_robinvandervliet.nl>
-
-
-* Galician
-
-    * Xosé Calvo <xosecalvo\_at\_gmail.com>
-
-
-* German
-
-    * Daniel <d.gnauk89\_at\_googlemail.com>
-    * JH M <janhenrikm\_at\_yahoo.de>
-    * Lasse Goericke <lasse\_at\_mydom.de>
-    * Michael Koch <michael.koch\_at\_enough.de>
-    * Ann + J.M. <phpMyAdmin\_at\_ZweiSteinSoft.de>
-    * Niemand Jedermann <predatorix\_at\_web.de>
-    * Phillip Rohmberger <rohmberger\_at\_hotmail.de>
-    * Hauke Henningsen <sqrt\_at\_entless.org>
-
-
-* Greek
-
-    * Παναγιώτης Παπάζογλου <papaz_p\_at\_yahoo.com>
-
-
-* Hungarian
-
-    * Balázs Úr <urbalazs\_at\_gmail.com>
-
-
-* Italian
-
-    * Francesco Saverio Giacobazzi <francesco.giacobazzi\_at\_ferrania.it>
-    * Marco Pozzato <ironpotts\_at\_gmail.com>
-    * Stefano Martinelli <stefano.ste.martinelli\_at\_gmail.com>
-    * TWS <tablettws\_at\_gmail.com>
-
-
-* Japanese
-
-    * Eshin Kunishima <ek\_at\_luna.miko.im>
-    * Hiroshi Chiyokawa <hiroshi.chiyokawa\_at\_gmail.com>
-
-
-* Lithuanian
-
-    * Jur Kis <atvejis\_at\_gmail.com>
-    * Dovydas <dovy.buz\_at\_gmail.com>
-
-
-* Norwegian Bokmål
-
-    * Tor Stokkan <danorse\_at\_gmail.com>
-    * Kurt Eilertsen <kurt\_at\_kheds.com>
-
-
-* Portuguese (Brazil)
-
-    * Alexandre Moretti <alemoretti2010\_at\_hotmail.com>
-    * Douglas Rafael Morais Kollar <douglas.kollar\_at\_pg.df.gov.br>
-    * Guilherme Seibt <gui\_at\_webseibt.net>
-    * Helder Santana <helder.bs.santana\_at\_gmail.com>
-    * Michal Čihař <michal\_at\_cihar.com>
-    * Michel Souza <michel.ekio\_at\_gmail.com>
-    * Danilo Azevedo <mrdaniloazevedo\_at\_gmail.com>
-    * Thiago Casotti <thiago.casotti\_at\_uol.com.br>
-    * Vinícius Araújo <vinipitta\_at\_gmail.com>
-    * Yan Gabriel <yansilvagabriel\_at\_gmail.com>
-
-
-* Slovak
-
-    * Martin Lacina <martin\_at\_whistler.sk>
-    * Michal Čihař <michal\_at\_cihar.com>
-    * Jozef Pistej <pistej2\_at\_gmail.com>
-
-
-* Slovenian
-
-    * Domen <mitenem\_at\_outlook.com>
-
-
-* Spanish
-
-    * Luis García Sevillano <floss.dev\_at\_gmail.com>
-    * Franco <fulanodetal.github1\_at\_openaliasbox.org>
-    * Matías Bellone <matiasbellone+weblate\_at\_gmail.com>
-    * Ronnie Simon <ronniesimonf\_at\_gmail.com>
-
-
-* Turkish
-
-    * Burak Yavuz <hitowerdigit\_at\_hotmail.com>
-
-Original Credits of Version 2.1.0
-+++++++++++++++++++++++++++++++++
-
-This work is based on Peter Kuppelwieser's MySQL-Webadmin. It was his
-idea to create a web-based interface to MySQL using PHP3. Although I
-have not used any of his source-code, there are some concepts I've
-borrowed from him. phpMyAdmin was created because Peter told me he
-wasn't going to further develop his (great) tool.
-
-Thanks go to
-
-* Amalesh Kempf <ak-lsml\_at\_living-source.com> who contributed the
-  code for the check when dropping a table or database. He also
-  suggested that you should be able to specify the primary key on
-  tbl\_create.php3. To version 1.1.1 he contributed the ldi\_\*.php3-set
-  (Import text-files) as well as a bug-report. Plus many smaller
-  improvements.
-* Jan Legenhausen <jan\_at\_nrw.net>: He made many of the changes that
-  were introduced in 1.3.0 (including quite significant ones like the
-  authentication). For 1.4.1 he enhanced the table-dump feature. Plus
-  bug-fixes and help.
-* Marc Delisle <DelislMa\_at\_CollegeSherbrooke.qc.ca> made phpMyAdmin
-  language-independent by outsourcing the strings to a separate file. He
-  also contributed the French translation.
-* Alexandr Bravo <abravo\_at\_hq.admiral.ru> who contributed
-  tbl\_select.php3, a feature to display only some columns from a table.
-* Chris Jackson <chrisj\_at\_ctel.net> added support for MySQL functions
-  in tbl\_change.php3. He also added the "Query by Example" feature in
-  2.0.
-* Dave Walton <walton\_at\_nordicdms.com> added support for multiple
-  servers and is a regular contributor for bug-fixes.
-* Gabriel Ash <ga244\_at\_is8.nyu.edu> contributed the random access
-  features for 2.0.6.
-
-The following people have contributed minor changes, enhancements,
-bugfixes or support for a new language:
-
-Jim Kraai, Jordi Bruguera, Miquel Obrador, Geert Lund, Thomas
-Kleemann, Alexander Leidinger, Kiko Albiol, Daniel C. Chao, Pavel
-Piankov, Sascha Kettler, Joe Pruett, Renato Lins, Mark Kronsbein,
-Jannis Hermanns, G. Wieggers.
-
-And thanks to everyone else who sent me email with suggestions, bug-
-reports and or just some feedback.
-
diff --git a/#pma/doc/html/_sources/developers.txt b/#pma/doc/html/_sources/developers.txt
deleted file mode 100644
index 2b2f5868..00000000
--- a/#pma/doc/html/_sources/developers.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-.. _developers:
-
-Developers Information
-======================
-
-phpMyAdmin is Open Source, so you're invited to contribute to it. Many
-great features have been written by other people and you too can help
-to make phpMyAdmin a useful tool.
-
-You can check out all the possibilities to contribute in the
-`contribute section on our website
-<https://www.phpmyadmin.net/contribute/>`_.
diff --git a/#pma/doc/html/_sources/faq.txt b/#pma/doc/html/_sources/faq.txt
deleted file mode 100644
index 8acf8440..00000000
--- a/#pma/doc/html/_sources/faq.txt
+++ /dev/null
@@ -1,2220 +0,0 @@
-.. _faq:
-
-FAQ - Frequently Asked Questions
-================================
-
-Please have a look at our `Link section
-<https://www.phpmyadmin.net/docs/>`_ on the official
-phpMyAdmin homepage for in-depth coverage of phpMyAdmin's features and
-or interface.
-
-.. _faqserver:
-
-Server
-++++++
-
-.. _faq1_1:
-
-1.1 My server is crashing each time a specific action is required or phpMyAdmin sends a blank page or a page full of cryptic characters to my browser, what can I do?
----------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-Try to set the :config:option:`$cfg['OBGzip']`  directive to ``false`` in your
-:file:`config.inc.php` file and the ``zlib.output_compression`` directive to
-``Off`` in your php configuration file.
-
-.. _faq1_2:
-
-1.2 My Apache server crashes when using phpMyAdmin.
----------------------------------------------------
-
-You should first try the latest versions of Apache (and possibly MySQL). If
-your server keeps crashing, please ask for help in the various Apache support
-groups.
-
-.. seealso:: :ref:`faq1_1`
-
-.. _faq1_3:
-
-1.3 (withdrawn).
-----------------
-
-.. _faq1_4:
-
-1.4 Using phpMyAdmin on IIS, I'm displayed the error message: "The specified CGI application misbehaved by not returning a complete set of HTTP headers ...".
--------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-You just forgot to read the *install.txt* file from the PHP
-distribution. Have a look at the last message in this `PHP bug report #12061
-<https://bugs.php.net/bug.php?id=12061>`_ from the official PHP bug
-database.
-
-.. _faq1_5:
-
-1.5 Using phpMyAdmin on IIS, I'm facing crashes and/or many error messages with the HTTP.
------------------------------------------------------------------------------------------
-
-This is a known problem with the PHP :term:`ISAPI` filter: it's not so stable.
-Please use instead the cookie authentication mode.
-
-.. _faq1_6:
-
-1.6 I can't use phpMyAdmin on PWS: nothing is displayed!
---------------------------------------------------------
-
-This seems to be a PWS bug. Filippo Simoncini found a workaround (at
-this time there is no better fix): remove or comment the ``DOCTYPE``
-declarations (2 lines) from the scripts :file:`libraries/Header.class.php`
-and :file:`index.php`.
-
-.. _faq1_7:
-
-1.7 How can I GZip a dump or a CSV export? It does not seem to work.
---------------------------------------------------------------------
-
-This feature is based on the ``gzencode()``
-PHP function to be more independent of the platform (Unix/Windows,
-Safe Mode or not, and so on). So, you must have Zlib support
-(``--with-zlib``).
-
-.. _faq1_8:
-
-1.8 I cannot insert a text file in a table, and I get an error about safe mode being in effect.
------------------------------------------------------------------------------------------------
-
-Your uploaded file is saved by PHP in the "upload dir", as defined in
-:file:`php.ini` by the variable ``upload_tmp_dir`` (usually the system
-default is */tmp*). We recommend the following setup for Apache
-servers running in safe mode, to enable uploads of files while being
-reasonably secure:
-
-* create a separate directory for uploads: :command:`mkdir /tmp/php`
-* give ownership to the Apache server's user.group: :command:`chown
-  apache.apache /tmp/php`
-* give proper permission: :command:`chmod 600 /tmp/php`
-* put ``upload_tmp_dir = /tmp/php`` in :file:`php.ini`
-* restart Apache
-
-.. _faq1_9:
-
-1.9 (withdrawn).
-----------------
-
-.. _faq1_10:
-
-1.10 I'm having troubles when uploading files with phpMyAdmin running on a secure server. My browser is Internet Explorer and I'm using the Apache server.
-----------------------------------------------------------------------------------------------------------------------------------------------------------
-
-As suggested by "Rob M" in the phpWizard forum, add this line to your
-*httpd.conf*:
-
-.. code-block:: apache
-
-    SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown
-
-It seems to clear up many problems between Internet Explorer and SSL.
-
-.. _faq1_11:
-
-1.11 I get an 'open\_basedir restriction' while uploading a file from the query box.
-------------------------------------------------------------------------------------
-
-Since version 2.2.4, phpMyAdmin supports servers with open\_basedir
-restrictions. However you need to create temporary directory and configure it
-as :config:option:`$cfg['TempDir']`. The uploaded files will be moved there,
-and after execution of your :term:`SQL` commands, removed.
-
-.. _faq1_12:
-
-1.12 I have lost my MySQL root password, what can I do?
--------------------------------------------------------
-
-The MySQL manual explains how to `reset the permissions
-<https://dev.mysql.com/doc/mysql/en/resetting-permissions.html>`_.
-
-.. _faq1_13:
-
-1.13 (withdrawn).
------------------
-
-.. _faq1_14:
-
-1.14 (withdrawn).
------------------
-
-.. _faq1_15:
-
-1.15 I have problems with *mysql.user* column names.
-----------------------------------------------------
-
-In previous MySQL versions, the ``User`` and ``Password``columns were
-named ``user`` and ``password``. Please modify your column names to
-align with current standards.
-
-.. _faq1_16:
-
-1.16 I cannot upload big dump files (memory, HTTP or timeout problems).
------------------------------------------------------------------------
-
-Starting with version 2.7.0, the import engine has been re–written and
-these problems should not occur. If possible, upgrade your phpMyAdmin
-to the latest version to take advantage of the new import features.
-
-The first things to check (or ask your host provider to check) are the
-values of ``upload_max_filesize``, ``memory_limit`` and
-``post_max_size`` in the :file:`php.ini` configuration file. All of these
-three settings limit the maximum size of data that can be submitted
-and handled by PHP. One user also said that ``post_max_size`` and
-``memory_limit`` need to be larger than ``upload_max_filesize``.
-There exist several workarounds if your upload is too big or your
-hosting provider is unwilling to change the settings:
-
-* Look at the :config:option:`$cfg['UploadDir']` feature. This allows one to upload a file to the server
-  via scp, ftp, or your favorite file transfer method. PhpMyAdmin is
-  then able to import the files from the temporary directory. More
-  information is available in the :ref:`config`  of this document.
-* Using a utility (such as `BigDump
-  <http://www.ozerov.de/bigdump/>`_) to split the files before
-  uploading. We cannot support this or any third party applications, but
-  are aware of users having success with it.
-* If you have shell (command line) access, use MySQL to import the files
-  directly. You can do this by issuing the "source" command from within
-  MySQL:
-
-  .. code-block:: mysql
-
-    source filename.sql;
-
-.. _faq1_17:
-
-1.17 Which Database versions does phpMyAdmin support?
------------------------------------------------------
-
-For `MySQL <https://www.mysql.com/>`_, versions 5.5 and newer are supported. 
-For older MySQL versions, our `Downloads <https://www.phpmyadmin.net/downloads/>`_ page offers older phpMyAdmin versions 
-(which may have become unsupported).
-
-For `MariaDB <https://mariadb.org/>`_, versions 5.5 and newer are supported.
-
-.. _faq1_17a:
-
-1.17a I cannot connect to the MySQL server. It always returns the error message, "Client does not support authentication protocol requested by server; consider upgrading MySQL client"
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-You tried to access MySQL with an old MySQL client library. The
-version of your MySQL client library can be checked in your phpinfo()
-output. In general, it should have at least the same minor version as
-your server - as mentioned in :ref:`faq1_17`. This problem is
-generally caused by using MySQL version 4.1 or newer. MySQL changed
-the authentication hash and your PHP is trying to use the old method.
-The proper solution is to use the `mysqli extension
-<https://www.php.net/mysqli>`_ with the proper client library to match
-your MySQL installation. More
-information (and several workarounds) are located in the `MySQL
-Documentation <https://dev.mysql.com/doc/mysql/en/old-client.html>`_.
-
-.. _faq1_18:
-
-1.18 (withdrawn).
------------------
-
-.. _faq1_19:
-
-1.19 I can't run the "display relations" feature because the script seems not to know the font face I'm using!
---------------------------------------------------------------------------------------------------------------
-
-The :term:`TCPDF` library we're using for this feature requires some special
-files to use font faces. Please refers to the `TCPDF manual
-<https://tcpdf.org/>`_ to build these files.
-
-.. _faqmysql:
-
-1.20 I receive an error about missing mysqli and mysql extensions.
-------------------------------------------------------------------
-
-To connect to a MySQL server, PHP needs a set of MySQL functions
-called "MySQL extension". This extension may be part of the PHP
-distribution (compiled-in), otherwise it needs to be loaded
-dynamically. Its name is probably *mysqli.so* or *php\_mysqli.dll*.
-phpMyAdmin tried to load the extension but failed. Usually, the
-problem is solved by installing a software package called "PHP-MySQL"
-or something similar.
-
-There are currently two interfaces PHP provides as MySQL extensions - ``mysql``
-and ``mysqli``. The ``mysqli`` is tried first, because it's the best one.
-
-.. _faq1_21:
-
-1.21 I am running the CGI version of PHP under Unix, and I cannot log in using cookie auth.
--------------------------------------------------------------------------------------------
-
-In :file:`php.ini`, set ``mysql.max_links`` higher than 1.
-
-.. _faq1_22:
-
-1.22 I don't see the "Location of text file" field, so I cannot upload.
------------------------------------------------------------------------
-
-This is most likely because in :file:`php.ini`, your ``file_uploads``
-parameter is not set to "on".
-
-.. _faq1_23:
-
-1.23 I'm running MySQL on a Win32 machine. Each time I create a new table the table and column names are changed to lowercase!
-------------------------------------------------------------------------------------------------------------------------------
-
-This happens because the MySQL directive ``lower_case_table_names``
-defaults to 1 (``ON``) in the Win32 version of MySQL. You can change
-this behavior by simply changing the directive to 0 (``OFF``): Just
-edit your ``my.ini`` file that should be located in your Windows
-directory and add the following line to the group [mysqld]:
-
-.. code-block:: ini
-
-    set-variable = lower_case_table_names=0
-
-Next, save the file and restart the MySQL service. You can always
-check the value of this directive using the query
-
-.. code-block:: mysql
-
-    SHOW VARIABLES LIKE 'lower_case_table_names';
-
-.. _faq1_24:
-
-1.24 (withdrawn).
------------------
-
-.. _faq1_25:
-
-1.25 I am running Apache with mod\_gzip-1.3.26.1a on Windows XP, and I get problems, such as undefined variables when I run a SQL query.
-----------------------------------------------------------------------------------------------------------------------------------------
-
-A tip from Jose Fandos: put a comment on the following two lines in
-httpd.conf, like this:
-
-.. code-block:: apache
-
-
-    # mod_gzip_item_include file \.php$
-    # mod_gzip_item_include mime "application/x-httpd-php.*"
-
-as this version of mod\_gzip on Apache (Windows) has problems handling
-PHP scripts. Of course you have to restart Apache.
-
-.. _faq1_26:
-
-1.26 I just installed phpMyAdmin in my document root of IIS but I get the error "No input file specified" when trying to run phpMyAdmin.
-----------------------------------------------------------------------------------------------------------------------------------------
-
-This is a permission problem. Right-click on the phpmyadmin folder and
-choose properties. Under the tab Security, click on "Add" and select
-the user "IUSR\_machine" from the list. Now set his permissions and it
-should work.
-
-.. _faq1_27:
-
-1.27 I get empty page when I want to view huge page (eg. db\_structure.php with plenty of tables).
---------------------------------------------------------------------------------------------------
-
-This was caused by a `PHP bug <https://bugs.php.net/21079>`_ that occur when
-GZIP output buffering is enabled. If you turn off it (by
-:config:option:`$cfg['OBGzip']` in :file:`config.inc.php`), it should work.
-This bug will has been fixed in PHP 5.0.0.
-
-.. _faq1_28:
-
-1.28 My MySQL server sometimes refuses queries and returns the message 'Errorcode: 13'. What does this mean?
-------------------------------------------------------------------------------------------------------------
-
-This can happen due to a MySQL bug when having database / table names
-with upper case characters although ``lower_case_table_names`` is
-set to 1. To fix this, turn off this directive, convert all database
-and table names to lower case and turn it on again. Alternatively,
-there's a bug-fix available starting with MySQL 3.23.56 /
-4.0.11-gamma.
-
-.. _faq1_29:
-
-1.29 When I create a table or modify a column, I get an error and the columns are duplicated.
----------------------------------------------------------------------------------------------
-
-It is possible to configure Apache in such a way that PHP has problems
-interpreting .php files.
-
-The problems occur when two different (and conflicting) set of
-directives are used:
-
-.. code-block:: apache
-
-
-    SetOutputFilter PHP
-    SetInputFilter PHP
-
-and
-
-.. code-block:: apache
-
-    AddType application/x-httpd-php .php
-
-In the case we saw, one set of directives was in
-``/etc/httpd/conf/httpd.conf``, while the other set was in
-``/etc/httpd/conf/addon-modules/php.conf``. The recommended way is
-with ``AddType``, so just comment out the first set of lines and
-restart Apache:
-
-.. code-block:: apache
-
-
-    #SetOutputFilter PHP
-    #SetInputFilter PHP
-
-.. _faq1_30:
-
-1.30 I get the error "navigation.php: Missing hash".
-----------------------------------------------------
-
-This problem is known to happen when the server is running Turck
-MMCache but upgrading MMCache to version 2.3.21 solves the problem.
-
-.. _faq1_31:
-
-1.31 Does phpMyAdmin support PHP 5?
------------------------------------
-
-Yes.
-
-Since release 4.5, phpMyAdmin supports only PHP 5.5 and newer. Since release 4.1 phpMyAdmin supports only PHP 5.3 and newer. For PHP 5.2 you can use 4.0.x releases.
-
-.. _faq1_32:
-
-1.32 Can I use HTTP authentication with IIS?
---------------------------------------------
-
-Yes. This procedure was tested with phpMyAdmin 2.6.1, PHP 4.3.9 in
-:term:`ISAPI` mode under :term:`IIS` 5.1.
-
-#. In your :file:`php.ini` file, set ``cgi.rfc2616_headers = 0``
-#. In ``Web Site Properties -> File/Directory Security -> Anonymous
-   Access`` dialog box, check the ``Anonymous access`` checkbox and
-   uncheck any other checkboxes (i.e. uncheck ``Basic authentication``,
-   ``Integrated Windows authentication``, and ``Digest`` if it's
-   enabled.) Click ``OK``.
-#. In ``Custom Errors``, select the range of ``401;1`` through ``401;5``
-   and click the ``Set to Default`` button.
-
-.. seealso:: :rfc:`2616`
-
-.. _faq1_33:
-
-1.33 (withdrawn).
------------------
-
-.. _faq1_34:
-
-1.34 Can I access directly to database or table pages?
-------------------------------------------------------
-
-Yes. Out of the box, you can use :term:`URL` like
-https://example.com/phpMyAdmin/index.php?server=X&db=database&table=table&target=script.
-For ``server`` you use the server number
-which refers to the order of the server paragraph in
-:file:`config.inc.php`. Table and script parts are optional. If you want
-https://example.com/phpMyAdmin/database[/table][/script] :term:`URL`, you need to do some configuration. Following
-lines apply only for `Apache <https://httpd.apache.org/>`_ web server.
-First make sure, that you have enabled some features within global
-configuration. You need ``Options SymLinksIfOwnerMatch`` and ``AllowOverride
-FileInfo`` enabled for directory where phpMyAdmin is installed and you
-need mod\_rewrite to be enabled. Then you just need to create
-following :term:`.htaccess` file in root folder of phpMyAdmin installation (don't
-forget to change directory name inside of it):
-
-.. code-block:: apache
-
-
-    RewriteEngine On
-    RewriteBase /path_to_phpMyAdmin
-    RewriteRule ^([a-zA-Z0-9_]+)/([a-zA-Z0-9_]+)/([a-z_]+\.php)$ index.php?db=$1&table=$2&target=$3 [R]
-    RewriteRule ^([a-zA-Z0-9_]+)/([a-z_]+\.php)$ index.php?db=$1&target=$2 [R]
-    RewriteRule ^([a-zA-Z0-9_]+)/([a-zA-Z0-9_]+)$ index.php?db=$1&table=$2 [R]
-    RewriteRule ^([a-zA-Z0-9_]+)$ index.php?db=$1 [R]
-
-.. _faq1_35:
-
-1.35 Can I use HTTP authentication with Apache CGI?
----------------------------------------------------
-
-Yes. However you need to pass authentication variable to :term:`CGI` using
-following rewrite rule:
-
-.. code-block:: apache
-
-
-    RewriteEngine On
-    RewriteRule .* - [E=REMOTE_USER:%{HTTP:Authorization},L]
-
-.. _faq1_36:
-
-1.36 I get an error "500 Internal Server Error".
-------------------------------------------------
-
-There can be many explanations to this and a look at your server's
-error log file might give a clue.
-
-.. _faq1_37:
-
-1.37 I run phpMyAdmin on cluster of different machines and password encryption in cookie auth doesn't work.
------------------------------------------------------------------------------------------------------------
-
-If your cluster consist of different architectures, PHP code used for
-encryption/decryption won't work correct. This is caused by use of
-pack/unpack functions in code. Only solution is to use mcrypt
-extension which works fine in this case.
-
-.. _faq1_38:
-
-1.38 Can I use phpMyAdmin on a server on which Suhosin is enabled?
-------------------------------------------------------------------
-
-Yes but the default configuration values of Suhosin are known to cause
-problems with some operations, for example editing a table with many
-columns and no primary key or with textual primary key.
-
-Suhosin configuration might lead to malfunction in some cases and it
-can not be fully avoided as phpMyAdmin is kind of application which
-needs to transfer big amounts of columns in single HTTP request, what
-is something what Suhosin tries to prevent. Generally all
-``suhosin.request.*``, ``suhosin.post.*`` and ``suhosin.get.*``
-directives can have negative effect on phpMyAdmin usability. You can
-always find in your error logs which limit did cause dropping of
-variable, so you can diagnose the problem and adjust matching
-configuration variable.
-
-The default values for most Suhosin configuration options will work in
-most scenarios, however you might want to adjust at least following
-parameters:
-
-* `suhosin.request.max\_vars <http://www.hardened-
-  php.net/suhosin/configuration.html#suhosin.request.max_vars>`_ should
-  be increased (eg. 2048)
-* `suhosin.post.max\_vars <http://www.hardened-
-  php.net/suhosin/configuration.html#suhosin.post.max_vars>`_ should be
-  increased (eg. 2048)
-* `suhosin.request.max\_array\_index\_length <http://www.hardened-php.ne
-  t/suhosin/configuration.html#suhosin.request.max_array_index_length>`_
-  should be increased (eg. 256)
-* `suhosin.post.max\_array\_index\_length <http://www.hardened-php.net/s
-  uhosin/configuration.html#suhosin.post.max_array_index_length>`_
-  should be increased (eg. 256)
-* `suhosin.request.max\_totalname\_length <http://www.hardened-php.net/s
-  uhosin/configuration.html#suhosin.request.max_totalname_length>`_
-  should be increased (eg. 8192)
-* `suhosin.post.max\_totalname\_length <http://www.hardened-php.net/suho
-  sin/configuration.html#suhosin.post.max_totalname_length>`_ should be
-  increased (eg. 8192)
-* `suhosin.get.max\_value\_length <http://www.hardened-
-  php.net/suhosin/configuration.html#suhosin.get.max_value_length>`_
-  should be increased (eg. 1024)
-* `suhosin.sql.bailout\_on\_error <http://www.hardened-
-  php.net/suhosin/configuration.html#suhosin.sql.bailout_on_error>`_
-  needs to be disabled (the default)
-* `suhosin.log.\* <http://www.hardened-
-  php.net/suhosin/configuration.html#logging_configuration>`_ should not
-  include :term:`SQL`, otherwise you get big
-  slowdown
-
-You can also disable the warning using the :config:option:`$cfg['SuhosinDisableWarning']`.
-
-.. _faq1_39:
-
-1.39 When I try to connect via https, I can log in, but then my connection is redirected back to http. What can cause this behavior?
-------------------------------------------------------------------------------------------------------------------------------------
-
-Be sure that you have enabled ``SSLOptions`` and ``StdEnvVars`` in
-your Apache configuration.
-
-.. seealso:: <http://httpd.apache.org/docs/2.0/mod/mod_ssl.html#ssloptions>
-
-.. _faq1_40:
-
-1.40 When accessing phpMyAdmin via an Apache reverse proxy, cookie login does not work.
----------------------------------------------------------------------------------------
-
-To be able to use cookie auth Apache must know that it has to rewrite
-the set-cookie headers. Example from the Apache 2.2 documentation:
-
-.. code-block:: apache
-
-
-    ProxyPass /mirror/foo/ http://backend.example.com/
-    ProxyPassReverse /mirror/foo/ http://backend.example.com/
-    ProxyPassReverseCookieDomain backend.example.com public.example.com
-    ProxyPassReverseCookiePath / /mirror/foo/
-
-Note: if the backend url looks like https://example.com/~user/phpmyadmin, the
-tilde (~) must be url encoded as %7E in the ProxyPassReverse\* lines.
-This is not specific to phpmyadmin, it's just the behavior of Apache.
-
-.. code-block:: apache
-
-
-    ProxyPass /mirror/foo/ http://backend.example.com/~user/phpmyadmin
-    ProxyPassReverse /mirror/foo/ http://backend.example.com/%7Euser/phpmyadmin
-    ProxyPassReverseCookiePath /%7Euser/phpmyadmin /mirror/foo
-
-.. seealso:: <https://httpd.apache.org/docs/2.2/mod/mod_proxy.html>, :config:option:`$cfg['PmaAbsoluteUri']`
-
-.. _faq1_41:
-
-1.41 When I view a database and ask to see its privileges, I get an error about an unknown column.
---------------------------------------------------------------------------------------------------
-
-The MySQL server's privilege tables are not up to date, you need to
-run the :command:`mysql_upgrade` command on the server.
-
-.. _faq1_42:
-
-1.42 How can I prevent robots from accessing phpMyAdmin?
---------------------------------------------------------
-
-You can add various rules to :term:`.htaccess` to filter access based on user agent
-field. This is quite easy to circumvent, but could prevent at least
-some robots accessing your installation.
-
-.. code-block:: apache
-
-
-    RewriteEngine on
-
-    # Allow only GET and POST verbs
-    RewriteCond %{REQUEST_METHOD} !^(GET|POST)$ [NC,OR]
-
-    # Ban Typical Vulnerability Scanners and others
-    # Kick out Script Kiddies
-    RewriteCond %{HTTP_USER_AGENT} ^(java|curl|wget).* [NC,OR]
-    RewriteCond %{HTTP_USER_AGENT} ^.*(libwww-perl|curl|wget|python|nikto|wkito|pikto|scan|acunetix).* [NC,OR]
-    RewriteCond %{HTTP_USER_AGENT} ^.*(winhttp|HTTrack|clshttp|archiver|loader|email|harvest|extract|grab|miner).* [NC,OR]
-
-    # Ban Search Engines, Crawlers to your administrative panel
-    # No reasons to access from bots
-    # Ultimately Better than the useless robots.txt
-    # Did google respect robots.txt?
-    # Try google: intitle:phpMyAdmin intext:"Welcome to phpMyAdmin *.*.*" intext:"Log in" -wiki -forum -forums -questions intext:"Cookies must be enabled"
-    RewriteCond %{HTTP_USER_AGENT} ^.*(AdsBot-Google|ia_archiver|Scooter|Ask.Jeeves|Baiduspider|Exabot|FAST.Enterprise.Crawler|FAST-WebCrawler|www\.neomo\.de|Gigabot|Mediapartners-Google|Google.Desktop|Feedfetcher-Google|Googlebot|heise-IT-Markt-Crawler|heritrix|ibm.com\cs/crawler|ICCrawler|ichiro|MJ12bot|MetagerBot|msnbot-NewsBlogs|msnbot|msnbot-media|NG-Search|lucene.apache.org|NutchCVS|OmniExplorer_Bot|online.link.validator|psbot0|Seekbot|Sensis.Web.Crawler|SEO.search.Crawler|Seoma.\[SEO.Crawler\]|SEOsearch|Snappy|www.urltrends.com|www.tkl.iis.u-tokyo.ac.jp/~crawler|SynooBot|crawleradmin.t-info@telekom.de|TurnitinBot|voyager|W3.SiteSearch.Crawler|W3C-checklink|W3C_Validator|www.WISEnutbot.com|yacybot|Yahoo-MMCrawler|Yahoo\!.DE.Slurp|Yahoo\!.Slurp|YahooSeeker).* [NC]
-    RewriteRule .* - [F]
-
-.. _faq1_43:
-
-1.43 Why can't I display the structure of my table containing hundreds of columns?
-----------------------------------------------------------------------------------
-
-Because your PHP's ``memory_limit`` is too low; adjust it in :file:`php.ini`.
-
-.. _faq1:44:
-
-1.44 How can I reduce the installed size of phpMyAdmin on disk?
----------------------------------------------------------------
-
-Some users have requested to be able to reduce the size of the phpMyAdmin installation.
-This is not recommended and could lead to confusion over missing features, but can be done.
-A list of files and corresponding functionality which degrade gracefully when removed include:
-
-* :file:`./libraries/tcpdf` folder (exporting to PDF)
-* :file:`./locale/` folder, or unused subfolders (interface translations)
-* Any unused themes in :file:`./themes/`
-* :file:`./js/jquery/src/` (included for licensing reasons)
-* :file:`./js/line_counts.php`
-* :file:`./doc/` (documentation)
-* :file:`./setup/` (setup script)
-* :file:`./examples/`
-* :file:`./sql/` (SQL scripts to configure advanced functionality)
-
-.. _faqconfig:
-
-Configuration
-+++++++++++++
-
-.. _faq2_1:
-
-2.1 The error message "Warning: Cannot add header information - headers already sent by ..." is displayed, what's the problem?
-------------------------------------------------------------------------------------------------------------------------------
-
-Edit your :file:`config.inc.php` file and ensure there is nothing (I.E. no
-blank lines, no spaces, no characters...) neither before the ``<?php`` tag at
-the beginning, neither after the ``?>`` tag at the end. We also got a report
-from a user under :term:`IIS`, that used a zipped distribution kit: the file
-:file:`libraries/Config.class.php` contained an end-of-line character (hex 0A)
-at the end; removing this character cleared his errors.
-
-.. _faq2_2:
-
-2.2 phpMyAdmin can't connect to MySQL. What's wrong?
-----------------------------------------------------
-
-Either there is an error with your PHP setup or your username/password
-is wrong. Try to make a small script which uses mysql\_connect and see
-if it works. If it doesn't, it may be you haven't even compiled MySQL
-support into PHP.
-
-.. _faq2_3:
-
-2.3 The error message "Warning: MySQL Connection Failed: Can't connect to local MySQL server through socket '/tmp/mysql.sock' (111) ..." is displayed. What can I do?
----------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-For RedHat users, Harald Legner suggests this on the mailing list:
-
-On my RedHat-Box the socket of MySQL is */var/lib/mysql/mysql.sock*.
-In your :file:`php.ini` you will find a line
-
-.. code-block:: ini
-
-    mysql.default_socket = /tmp/mysql.sock
-
-change it to
-
-.. code-block:: ini
-
-    mysql.default_socket = /var/lib/mysql/mysql.sock
-
-Then restart apache and it will work.
-
-Here is a fix suggested by Brad Ummer:
-
-* First, you need to determine what socket is being used by MySQL. To do
-  this, telnet to your server and go to the MySQL bin directory. In this
-  directory there should be a file named *mysqladmin*. Type
-  ``./mysqladmin variables``, and this should give you a bunch of info
-  about your MySQL server, including the socket (*/tmp/mysql.sock*, for
-  example).
-* Then, you need to tell PHP to use this socket. To do this in
-  phpMyAdmin, you need to complete the socket information in the
-  :file:`config.inc.php`. For example:
-  :config:option:`$cfg['Servers'][$i]['socket']`  Please also make sure that
-  the permissions of this file allow to be readable by your webserver (i.e.
-  '0755').
-
-Have also a look at the `corresponding section of the MySQL
-documentation <https://dev.mysql.com/doc/en/can-not-connect-to-
-server.html>`_.
-
-.. _faq2_4:
-
-2.4 Nothing is displayed by my browser when I try to run phpMyAdmin, what can I do?
------------------------------------------------------------------------------------
-
-Try to set the :config:option:`$cfg['OBGzip']` directive to ``false`` in the phpMyAdmin configuration
-file. It helps sometime. Also have a look at your PHP version number:
-if it contains "b" or "alpha" it means you're running a testing
-version of PHP. That's not a so good idea, please upgrade to a plain
-revision.
-
-.. _faq2_5:
-
-2.5 Each time I want to insert or change a row or drop a database or a table, an error 404 (page not found) is displayed or, with HTTP or cookie authentication, I'm asked to log in again. What's wrong?
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-Check your webserver setup if it correctly fills in either PHP_SELF or REQUEST_URI variables.
-
-If you are running phpMyAdmin behind reverse proxy, please set the
-:config:option:`$cfg['PmaAbsoluteUri']` directive in the phpMyAdmin
-configuration file to match your setup.
-
-.. _faq2_6:
-
-2.6 I get an "Access denied for user: 'root@localhost' (Using password: YES)"-error when trying to access a MySQL-Server on a host which is port-forwarded for my localhost.
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-When you are using a port on your localhost, which you redirect via
-port-forwarding to another host, MySQL is not resolving the localhost
-as expected. Erik Wasser explains: The solution is: if your host is
-"localhost" MySQL (the command line tool :command:`mysql` as well) always
-tries to use the socket connection for speeding up things. And that
-doesn't work in this configuration with port forwarding. If you enter
-"127.0.0.1" as hostname, everything is right and MySQL uses the
-:term:`TCP` connection.
-
-.. _faqthemes:
-
-2.7 Using and creating themes
------------------------------
-
-Themes are configured with :config:option:`$cfg['ThemePath']`,
-:config:option:`$cfg['ThemeManager']` and :config:option:`$cfg['ThemeDefault']`.
-Under :config:option:`$cfg['ThemePath']`, you should not delete the
-directory ``pmahomme`` or its underlying structure, because this is the
-system theme used by phpMyAdmin. ``pmahomme`` contains all images and
-styles, for backwards compatibility and for all themes that would not
-include images or css-files.  If :config:option:`$cfg['ThemeManager']`
-is enabled, you can select your favorite theme on the main page. Your selected
-theme will be stored in a cookie.
-
-To create a theme:
-
-* make a new subdirectory (for example "your\_theme\_name") under :config:option:`$cfg['ThemePath']` (by
-  default ``themes``)
-* copy the files and directories from ``pmahomme`` to "your\_theme\_name"
-* edit the css-files in "your\_theme\_name/css"
-* put your new images in "your\_theme\_name/img"
-* edit :file:`layout.inc.php` in "your\_theme\_name"
-* edit :file:`info.inc.php` in "your\_theme\_name" to contain your chosen
-  theme name, that will be visible in user interface
-* make a new screenshot of your theme and save it under
-  "your\_theme\_name/screen.png"
-
-In theme directory there is file :file:`info.inc.php` which contains theme
-verbose name, theme generation and theme version. These versions and
-generations are enumerated from 1 and do not have any direct
-dependence on phpMyAdmin version. Themes within same generation should
-be backwards compatible - theme with version 2 should work in
-phpMyAdmin requiring version 1. Themes with different generation are
-incompatible.
-
-If you do not want to use your own symbols and buttons, remove the
-directory "img" in "your\_theme\_name". phpMyAdmin will use the
-default icons and buttons (from the system-theme ``pmahomme``).
-
-.. _faqmissingparameters:
-
-2.8 I get "Missing parameters" errors, what can I do?
------------------------------------------------------
-
-Here are a few points to check:
-
-* In :file:`config.inc.php`, try to leave the :config:option:`$cfg['PmaAbsoluteUri']` directive empty. See also
-  :ref:`faq4_7`.
-* Maybe you have a broken PHP installation or you need to upgrade your
-  Zend Optimizer. See <https://bugs.php.net/bug.php?id=31134>.
-* If you are using Hardened PHP with the ini directive
-  ``varfilter.max_request_variables`` set to the default (200) or
-  another low value, you could get this error if your table has a high
-  number of columns. Adjust this setting accordingly. (Thanks to Klaus
-  Dorninger for the hint).
-* In the :file:`php.ini` directive ``arg_separator.input``, a value of ";"
-  will cause this error. Replace it with "&;".
-* If you are using `Hardened-PHP <http://www.hardened-php.net/>`_, you
-  might want to increase `request limits <http://www.hardened-
-  php.net/hphp/troubleshooting.html>`_.
-* The directory specified in the :file:`php.ini` directive
-  ``session.save_path`` does not exist or is read-only.
-
-.. _faq2_9:
-
-2.9 Seeing an upload progress bar
----------------------------------
-
-To be able to see a progress bar during your uploads, your server must
-have the `APC <https://php.net/manual/en/book.apc.php>`_ extension, the
-`uploadprogress <https://pecl.php.net/package/uploadprogress>`_ one, or
-you must be running PHP 5.4.0 or higher. Moreover, the JSON extension
-has to be enabled in your PHP.
-
-If using APC, you must set ``apc.rfc1867`` to ``on`` in your :file:`php.ini`.
-
-If using PHP 5.4.0 or higher, you must set
-``session.upload_progress.enabled`` to ``1`` in your :file:`php.ini`. However,
-starting from phpMyAdmin version 4.0.4, session-based upload progress has
-been temporarily deactivated due to its problematic behavior.
-
-.. seealso:: :rfc:`1867`
-
-.. _faqlimitations:
-
-Known limitations
-+++++++++++++++++
-
-.. _login_bug:
-
-3.1 When using HTTP authentication, a user who logged out can not log in again in with the same nick.
------------------------------------------------------------------------------------------------------
-
-This is related to the authentication mechanism (protocol) used by
-phpMyAdmin. To bypass this problem: just close all the opened browser
-windows and then go back to phpMyAdmin. You should be able to log in
-again.
-
-.. _faq3_2:
-
-3.2 When dumping a large table in compressed mode, I get a memory limit error or a time limit error.
-----------------------------------------------------------------------------------------------------
-
-Compressed dumps are built in memory and because of this are limited
-to php's memory limit. For GZip/BZip2 exports this can be overcome
-since 2.5.4 using :config:option:`$cfg['CompressOnFly']` (enabled by default).
-Zip exports can not be handled this way, so if you need Zip files for larger
-dump, you have to use another way.
-
-.. _faq3_3:
-
-3.3 With InnoDB tables, I lose foreign key relationships when I rename a table or a column.
--------------------------------------------------------------------------------------------
-
-This is an InnoDB bug, see <https://bugs.mysql.com/bug.php?id=21704>.
-
-.. _faq3_4:
-
-3.4 I am unable to import dumps I created with the mysqldump tool bundled with the MySQL server distribution.
--------------------------------------------------------------------------------------------------------------
-
-The problem is that older versions of ``mysqldump`` created invalid
-comments like this:
-
-.. code-block:: mysql
-
-
-    -- MySQL dump 8.22
-    --
-    -- Host: localhost Database: database
-    ---------------------------------------------------------
-    -- Server version 3.23.54
-
-The invalid part of the code is the horizontal line made of dashes
-that appears once in every dump created with mysqldump. If you want to
-run your dump you have to turn it into valid MySQL. This means, you
-have to add a whitespace after the first two dashes of the line or add
-a # before it:  ``-- -------------------------------------------------------`` or
-``#---------------------------------------------------------``
-
-.. _faq3_5:
-
-3.5 When using nested folders, multiple hierarchies are displayed in a wrong manner.
-------------------------------------------------------------------------------------
-
-Please note that you should not use the separating string multiple
-times without any characters between them, or at the beginning/end of
-your table name. If you have to, think about using another
-TableSeparator or disabling that feature.
-
-.. seealso:: :config:option:`$cfg['NavigationTreeTableSeparator']`
-
-.. _faq3_6:
-
-3.6 (withdrawn).
------------------
-
-.. _faq3_7:
-
-3.7 I have table with many (100+) columns and when I try to browse table I get series of errors like "Warning: unable to parse url". How can this be fixed?
------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-Your table neither have a primary key nor an unique one, so we must
-use a long expression to identify this row. This causes problems to
-parse\_url function. The workaround is to create a primary or unique
-key.
-
-.. _faq3_8:
-
-3.8 I cannot use (clickable) HTML-forms in columns where I put a MIME-Transformation onto!
-------------------------------------------------------------------------------------------
-
-Due to a surrounding form-container (for multi-row delete checkboxes),
-no nested forms can be put inside the table where phpMyAdmin displays
-the results. You can, however, use any form inside of a table if keep
-the parent form-container with the target to tbl\_row\_delete.php and
-just put your own input-elements inside. If you use a custom submit
-input field, the form will submit itself to the displaying page again,
-where you can validate the $HTTP\_POST\_VARS in a transformation. For
-a tutorial on how to effectively use transformations, see our `Link
-section <https://www.phpmyadmin.net/docs/>`_ on the
-official phpMyAdmin-homepage.
-
-.. _faq3_9:
-
-3.9 I get error messages when using "--sql\_mode=ANSI" for the MySQL server.
-----------------------------------------------------------------------------
-
-When MySQL is running in ANSI-compatibility mode, there are some major
-differences in how :term:`SQL` is structured (see
-<https://dev.mysql.com/doc/refman/5.7/en/sql-mode.html#sqlmode_ansi>). Most important of all, the
-quote-character (") is interpreted as an identifier quote character and not as
-a string quote character, which makes many internal phpMyAdmin operations into
-invalid :term:`SQL` statements. There is no
-workaround to this behaviour.  News to this item will be posted in `Bug report
-#1013 <https://sourceforge.net/p/phpmyadmin/bugs/1013/>`_.
-
-.. _faq3_10:
-
-3.10 Homonyms and no primary key: When the results of a SELECT display more that one column with the same value (for example ``SELECT lastname from employees where firstname like 'A%'`` and two "Smith" values are displayed), if I click Edit I cannot be sure that I am editing the intended row.
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-Please make sure that your table has a primary key, so that phpMyAdmin
-can use it for the Edit and Delete links.
-
-.. _faq3_11:
-
-3.11 The number of rows for InnoDB tables is not correct.
----------------------------------------------------------
-
-phpMyAdmin uses a quick method to get the row count, and this method only
-returns an approximate count in the case of InnoDB tables. See
-:config:option:`$cfg['MaxExactCount']` for a way to modify those results, but
-this could have a serious impact on performance.
-However, one can easily replace the approximate row count with exact count by
-simply clicking on the approximate count. This can also be done for all tables
-at once by clicking on the rows sum displayed at the bottom.
-
-.. _faq3_12:
-
-3.12 (withdrawn).
------------------
-
-.. _faq3_13:
-
-3.13 I get an error when entering ``USE`` followed by a db name containing an hyphen.
--------------------------------------------------------------------------------------
-
-The tests I have made with MySQL 5.1.49 shows that the API does not
-accept this syntax for the USE command.
-
-.. _faq3_14:
-
-3.14 I am not able to browse a table when I don't have the right to SELECT one of the columns.
-----------------------------------------------------------------------------------------------
-
-This has been a known limitation of phpMyAdmin since the beginning and
-it's not likely to be solved in the future.
-
-.. _faq3_15:
-
-3.15 (withdrawn).
------------------
-
-.. _faq3_16:
-
-3.16 (withdrawn).
------------------
-
-.. _faq3_17:
-
-3.17 (withdrawn).
------------------
-
-.. _faq3_18:
-
-3.18 When I import a CSV file that contains multiple tables, they are lumped together into a single table.
-----------------------------------------------------------------------------------------------------------
-
-There is no reliable way to differentiate tables in :term:`CSV` format. For the
-time being, you will have to break apart :term:`CSV` files containing multiple
-tables.
-
-.. _faq3_19:
-
-3.19 When I import a file and have phpMyAdmin determine the appropriate data structure it only uses int, decimal, and varchar types.
-------------------------------------------------------------------------------------------------------------------------------------
-
-Currently, the import type-detection system can only assign these
-MySQL types to columns. In future, more will likely be added but for
-the time being you will have to edit the structure to your liking
-post-import.  Also, you should note the fact that phpMyAdmin will use
-the size of the largest item in any given column as the column size
-for the appropriate type. If you know you will be adding larger items
-to that column then you should manually adjust the column sizes
-accordingly. This is done for the sake of efficiency.
-
-.. _faq3_20:
-
-3.20 After upgrading, some bookmarks are gone or their content cannot be shown.
--------------------------------------------------------------------------------
-
-At some point, the character set used to store bookmark content has changed.
-It's better to recreate your bookmark from the newer phpMyAdmin version.
-
-.. _faqmultiuser:
-
-ISPs, multi-user installations
-++++++++++++++++++++++++++++++
-
-.. _faq4_1:
-
-4.1 I'm an ISP. Can I setup one central copy of phpMyAdmin or do I need to install it for each customer?
---------------------------------------------------------------------------------------------------------
-
-Since version 2.0.3, you can setup a central copy of phpMyAdmin for all your
-users. The development of this feature was kindly sponsored by NetCologne GmbH.
-This requires a properly setup MySQL user management and phpMyAdmin
-:term:`HTTP` or cookie authentication.
-
-.. seealso:: :ref:`authentication_modes`
-
-.. _faq4_2:
-
-4.2 What's the preferred way of making phpMyAdmin secure against evil access?
------------------------------------------------------------------------------
-
-This depends on your system. If you're running a server which cannot be
-accessed by other people, it's sufficient to use the directory protection
-bundled with your webserver (with Apache you can use :term:`.htaccess` files,
-for example). If other people have telnet access to your server, you should use
-phpMyAdmin's :term:`HTTP` or cookie authentication features.
-
-Suggestions:
-
-* Your :file:`config.inc.php` file should be ``chmod 660``.
-* All your phpMyAdmin files should be chown -R phpmy.apache, where phpmy
-  is a user whose password is only known to you, and apache is the group
-  under which Apache runs.
-* Follow security recommendations for PHP and your webserver.
-
-.. _faq4_3:
-
-4.3 I get errors about not being able to include a file in */lang* or in */libraries*.
---------------------------------------------------------------------------------------
-
-Check :file:`php.ini`, or ask your sysadmin to check it. The
-``include_path`` must contain "." somewhere in it, and
-``open_basedir``, if used, must contain "." and "./lang" to allow
-normal operation of phpMyAdmin.
-
-.. _faq4_4:
-
-4.4 phpMyAdmin always gives "Access denied" when using HTTP authentication.
----------------------------------------------------------------------------
-
-This could happen for several reasons:
-
-* :config:option:`$cfg['Servers'][$i]['controluser']` and/or :config:option:`$cfg['Servers'][$i]['controlpass']`  are wrong.
-* The username/password you specify in the login dialog are invalid.
-* You have already setup a security mechanism for the phpMyAdmin-
-  directory, eg. a :term:`.htaccess` file. This would interfere with phpMyAdmin's
-  authentication, so remove it.
-
-.. _faq4_5:
-
-4.5 Is it possible to let users create their own databases?
------------------------------------------------------------
-
-Starting with 2.2.5, in the user management page, you can enter a
-wildcard database name for a user (for example "joe%"), and put the
-privileges you want. For example, adding ``SELECT, INSERT, UPDATE,
-DELETE, CREATE, DROP, INDEX, ALTER`` would let a user create/manage
-his/her database(s).
-
-.. _faq4_6:
-
-4.6 How can I use the Host-based authentication additions?
-----------------------------------------------------------
-
-If you have existing rules from an old :term:`.htaccess` file, you can take them and
-add a username between the ``'deny'``/``'allow'`` and ``'from'``
-strings. Using the username wildcard of ``'%'`` would be a major
-benefit here if your installation is suited to using it. Then you can
-just add those updated lines into the
-:config:option:`$cfg['Servers'][$i]['AllowDeny']['rules']` array.
-
-If you want a pre-made sample, you can try this fragment. It stops the
-'root' user from logging in from any networks other than the private
-network :term:`IP` blocks.
-
-.. code-block:: php
-
-
-    //block root from logging in except from the private networks
-    $cfg['Servers'][$i]['AllowDeny']['order'] = 'deny,allow';
-    $cfg['Servers'][$i]['AllowDeny']['rules'] = array(
-        'deny root from all',
-        'allow root from localhost',
-        'allow root from 10.0.0.0/8',
-        'allow root from 192.168.0.0/16',
-        'allow root from 172.16.0.0/12',
-    );
-
-.. _faq4_7:
-
-4.7 Authentication window is displayed more than once, why?
------------------------------------------------------------
-
-This happens if you are using a :term:`URL` to start phpMyAdmin which is
-different than the one set in your :config:option:`$cfg['PmaAbsoluteUri']`. For
-example, a missing "www", or entering with an :term:`IP` address while a domain
-name is defined in the config file.
-
-.. _faq4_8:
-
-4.8 Which parameters can I use in the URL that starts phpMyAdmin?
------------------------------------------------------------------
-
-When starting phpMyAdmin, you can use the ``db``, ``pma_username``,
-``pma_password`` and ``server`` parameters. This last one can contain
-either the numeric host index (from ``$i`` of the configuration file)
-or one of the host names present in the configuration file. Using
-``pma_username`` and ``pma_password`` has been tested along with the
-usage of 'cookie' ``auth_type``.
-
-.. _faqbrowsers:
-
-Browsers or client OS
-+++++++++++++++++++++
-
-.. _faq5_1:
-
-5.1 I get an out of memory error, and my controls are non-functional, when trying to create a table with more than 14 columns.
-------------------------------------------------------------------------------------------------------------------------------
-
-We could reproduce this problem only under Win98/98SE. Testing under
-WinNT4 or Win2K, we could easily create more than 60 columns.  A
-workaround is to create a smaller number of columns, then come back to
-your table properties and add the other columns.
-
-.. _faq5_2:
-
-5.2 With Xitami 2.5b4, phpMyAdmin won't process form fields.
-------------------------------------------------------------
-
-This is not a phpMyAdmin problem but a Xitami known bug: you'll face
-it with each script/website that use forms. Upgrade or downgrade your
-Xitami server.
-
-.. _faq5_3:
-
-5.3 I have problems dumping tables with Konqueror (phpMyAdmin 2.2.2).
----------------------------------------------------------------------
-
-With Konqueror 2.1.1: plain dumps, zip and GZip dumps work ok, except
-that the proposed file name for the dump is always 'tbl\_dump.php'.
-Bzip2 dumps don't seem to work. With Konqueror 2.2.1: plain dumps
-work; zip dumps are placed into the user's temporary directory, so
-they must be moved before closing Konqueror, or else they disappear.
-GZip dumps give an error message. Testing needs to be done for
-Konqueror 2.2.2.
-
-.. _faq5_4:
-
-5.4 I can't use the cookie authentication mode because Internet Explorer never stores the cookies.
---------------------------------------------------------------------------------------------------
-
-MS Internet Explorer seems to be really buggy about cookies, at least
-till version 6.
-
-.. _faq5_5:
-
-5.5 In Internet Explorer 5.0, I get JavaScript errors when browsing my rows.
-----------------------------------------------------------------------------
-
-Upgrade to at least Internet Explorer 5.5 SP2.
-
-.. _faq5_6:
-
-5.6 In Internet Explorer 5.0, 5.5 or 6.0, I get an error (like "Page not found") when trying to modify a row in a table with many columns, or with a text column.
------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-Your table neither have a primary key nor an unique one, so we must use a long
-:term:`URL` to identify this row. There is a limit on the length of the
-:term:`URL` in those browsers, and this not happen in Netscape, for example.
-The workaround is to create a primary or unique key, or use another browser.
-
-.. _faq5_7:
-
-5.7 I refresh (reload) my browser, and come back to the welcome page.
----------------------------------------------------------------------
-
-Some browsers support right-clicking into the frame you want to
-refresh, just do this in the right frame.
-
-.. _faq5_8:
-
-5.8 With Mozilla 0.9.7 I have problems sending a query modified in the query box.
----------------------------------------------------------------------------------
-
-Looks like a Mozilla bug: 0.9.6 was OK. We will keep an eye on future
-Mozilla versions.
-
-.. _faq5_9:
-
-5.9 With Mozilla 0.9.? to 1.0 and Netscape 7.0-PR1 I can't type a whitespace in the SQL-Query edit area: the page scrolls down.
--------------------------------------------------------------------------------------------------------------------------------
-
-This is a Mozilla bug (see bug #26882 at `BugZilla
-<https://bugzilla.mozilla.org/>`_).
-
-.. _faq5_10:
-
-5.10 With Netscape 4.75 I get empty rows between each row of data in a CSV exported file.
------------------------------------------------------------------------------------------
-
-This is a known Netscape 4.75 bug: it adds some line feeds when
-exporting data in octet-stream mode. Since we can't detect the
-specific Netscape version, we cannot workaround this bug.
-
-.. _faq5_11:
-
-5.11 Extended-ASCII characters like German umlauts are displayed wrong.
------------------------------------------------------------------------
-
-Please ensure that you have set your browser's character set to the
-one of the language file you have selected on phpMyAdmin's start page.
-Alternatively, you can try the auto detection mode that is supported
-by the recent versions of the most browsers.
-
-.. _faq5_12:
-
-5.12 Mac OS X Safari browser changes special characters to "?".
----------------------------------------------------------------
-
-This issue has been reported by a :term:`Mac OS X` user, who adds that Chimera,
-Netscape and Mozilla do not have this problem.
-
-.. _faq5_13:
-
-5.13 With Internet Explorer 5.5 or 6, and HTTP authentication type, I cannot manage two servers: I log in to the first one, then the other one, but if I switch back to the first, I have to log in on each operation.
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-This is a bug in Internet Explorer, other browsers do not behave this
-way.
-
-.. _faq5_14:
-
-5.14 Using Opera6, I can manage to get to the authentication, but nothing happens after that, only a blank screen.
-------------------------------------------------------------------------------------------------------------------
-
-Please upgrade to Opera7 at least.
-
-.. _faq5_15:
-
-5.15 I have display problems with Safari.
------------------------------------------
-
-Please upgrade to at least version 1.2.3.
-
-.. _faq5_16:
-
-5.16 With Internet Explorer, I get "Access is denied" Javascript errors. Or I cannot make phpMyAdmin work under Windows.
-------------------------------------------------------------------------------------------------------------------------
-
-Please check the following points:
-
-* Maybe you have defined your :config:option:`$cfg['PmaAbsoluteUri']` setting in
-  :file:`config.inc.php` to an :term:`IP` address and you are starting phpMyAdmin
-  with a :term:`URL` containing a domain name, or the reverse situation.
-* Security settings in IE and/or Microsoft Security Center are too high,
-  thus blocking scripts execution.
-* The Windows Firewall is blocking Apache and MySQL. You must allow
-  :term:`HTTP` ports (80 or 443) and MySQL
-  port (usually 3306) in the "in" and "out" directions.
-
-.. _faq5_17:
-
-5.17 With Firefox, I cannot delete rows of data or drop a database.
--------------------------------------------------------------------
-
-Many users have confirmed that the Tabbrowser Extensions plugin they
-installed in their Firefox is causing the problem.
-
-.. _faq5_18:
-
-5.18 With Konqueror 4.2.x an invalid ``LIMIT`` clause is generated when I browse a table.
------------------------------------------------------------------------------------------
-
-This happens only when both of these conditions are met: using the
-``http`` authentication mode and ``register_globals`` being set to
-``On`` on the server. It seems to be a browser-specific problem;
-meanwhile use the ``cookie`` authentication mode.
-
-.. _faq5_19:
-
-5.19 I get JavaScript errors in my browser.
--------------------------------------------
-
-Issues have been reported with some combinations of browser
-extensions. To troubleshoot, disable all extensions then clear your
-browser cache to see if the problem goes away.
-
-.. _faqusing:
-
-Using phpMyAdmin
-++++++++++++++++
-
-.. _faq6_1:
-
-6.1 I can't insert new rows into a table / I can't create a table - MySQL brings up a SQL error.
-------------------------------------------------------------------------------------------------
-
-Examine the :term:`SQL` error with care.
-Often the problem is caused by specifying a wrong column-type. Common
-errors include:
-
-* Using ``VARCHAR`` without a size argument
-* Using ``TEXT`` or ``BLOB`` with a size argument
-
-Also, look at the syntax chapter in the MySQL manual to confirm that
-your syntax is correct.
-
-.. _faq6_2:
-
-6.2 When I create a table, I set an index for two columns and phpMyAdmin generates only one index with those two columns.
--------------------------------------------------------------------------------------------------------------------------
-
-This is the way to create a multi-columns index. If you want two
-indexes, create the first one when creating the table, save, then
-display the table properties and click the Index link to create the
-other index.
-
-.. _faq6_3:
-
-6.3 How can I insert a null value into my table?
-------------------------------------------------
-
-Since version 2.2.3, you have a checkbox for each column that can be
-null. Before 2.2.3, you had to enter "null", without the quotes, as
-the column's value. Since version 2.5.5, you have to use the checkbox
-to get a real NULL value, so if you enter "NULL" this means you want a
-literal NULL in the column, and not a NULL value (this works in PHP4).
-
-.. _faq6_4:
-
-6.4 How can I backup my database or table?
-------------------------------------------
-
-Click on a database or table name in the navigation panel, the properties will
-be displayed. Then on the menu, click "Export", you can dump the structure, the
-data, or both. This will generate standard :term:`SQL` statements that can be
-used to recreate your database/table.  You will need to choose "Save as file",
-so that phpMyAdmin can transmit the resulting dump to your station.  Depending
-on your PHP configuration, you will see options to compress the dump. See also
-the :config:option:`$cfg['ExecTimeLimit']` configuration variable. For
-additional help on this subject, look for the word "dump" in this document.
-
-.. _faq6_5:
-
-6.5 How can I restore (upload) my database or table using a dump? How can I run a ".sql" file?
-----------------------------------------------------------------------------------------------
-
-Click on a database name in the navigation panel, the properties will
-be displayed. Select "Import" from the list of tabs in the right–hand
-frame (or ":term:`SQL`" if your phpMyAdmin
-version is previous to 2.7.0). In the "Location of the text file"
-section, type in the path to your dump filename, or use the Browse
-button. Then click Go.  With version 2.7.0, the import engine has been
-re–written, if possible it is suggested that you upgrade to take
-advantage of the new features.  For additional help on this subject,
-look for the word "upload" in this document.
-
-Note: For errors while importing of dumps exported from older MySQL versions to newer MySQL versions,
-please check :ref:`faq6_41`.
-
-.. _faq6_6:
-
-6.6 How can I use the relation table in Query-by-example?
----------------------------------------------------------
-
-Here is an example with the tables persons, towns and countries, all
-located in the database "mydb". If you don't have a ``pma__relation``
-table, create it as explained in the configuration section. Then
-create the example tables:
-
-.. code-block:: mysql
-
-
-    CREATE TABLE REL_countries (
-    country_code char(1) NOT NULL default '',
-    description varchar(10) NOT NULL default '',
-    PRIMARY KEY (country_code)
-    ) TYPE=MyISAM;
-
-    INSERT INTO REL_countries VALUES ('C', 'Canada');
-
-    CREATE TABLE REL_persons (
-    id tinyint(4) NOT NULL auto_increment,
-    person_name varchar(32) NOT NULL default '',
-    town_code varchar(5) default '0',
-    country_code char(1) NOT NULL default '',
-    PRIMARY KEY (id)
-    ) TYPE=MyISAM;
-
-    INSERT INTO REL_persons VALUES (11, 'Marc', 'S', '');
-    INSERT INTO REL_persons VALUES (15, 'Paul', 'S', 'C');
-
-    CREATE TABLE REL_towns (
-    town_code varchar(5) NOT NULL default '0',
-    description varchar(30) NOT NULL default '',
-    PRIMARY KEY (town_code)
-    ) TYPE=MyISAM;
-
-    INSERT INTO REL_towns VALUES ('S', 'Sherbrooke');
-    INSERT INTO REL_towns VALUES ('M', 'Montréal');
-
-To setup appropriate links and display information:
-
-* on table "REL\_persons" click Structure, then Relation view
-* for "town\_code", choose from dropdowns, "mydb", "REL\_towns", "code"
-  for foreign database, table and column respectively
-* for "country\_code", choose  from dropdowns, "mydb", "REL\_countries",
-  "country\_code" for foreign database, table and column respectively
-* on table "REL\_towns" click Structure, then Relation view
-* in "Choose column to display", choose "description"
-* repeat the two previous steps for table "REL\_countries"
-
-Then test like this:
-
-* Click on your db name in the navigation panel
-* Choose "Query"
-* Use tables: persons, towns, countries
-* Click "Update query"
-* In the columns row, choose persons.person\_name and click the "Show"
-  tickbox
-* Do the same for towns.description and countries.descriptions in the
-  other 2 columns
-* Click "Update query" and you will see in the query box that the
-  correct joins have been generated
-* Click "Submit query"
-
-.. _faqdisplay:
-
-6.7 How can I use the "display column" feature?
------------------------------------------------
-
-Starting from the previous example, create the ``pma__table_info`` as
-explained in the configuration section, then browse your persons
-table, and move the mouse over a town code or country code.  See also
-:ref:`faq6_21` for an additional feature that "display column"
-enables: drop-down list of possible values.
-
-.. _faqpdf:
-
-6.8 How can I produce a PDF schema of my database?
---------------------------------------------------
-
-First the configuration variables "relation", "table\_coords" and
-"pdf\_pages" have to be filled in.  Then you need to think about your
-schema layout. Which tables will go on which pages?
-
-* Select your database in the navigation panel.
-* Choose "Operations" in the navigation bar at the top.
-* Choose "Edit :term:`PDF` Pages" near the
-  bottom of the page.
-* Enter a name for the first :term:`PDF` page
-  and click Go. If you like, you can use the "automatic layout," which
-  will put all your linked tables onto the new page.
-* Select the name of the new page (making sure the Edit radio button is
-  selected) and click Go.
-* Select a table from the list, enter its coordinates and click Save.
-  Coordinates are relative; your diagram will be automatically scaled to
-  fit the page. When initially placing tables on the page, just pick any
-  coordinates -- say, 50x50. After clicking Save, you can then use the
-  :ref:`wysiwyg` to position the element correctly.
-* When you'd like to look at your :term:`PDF`, first be sure to click the Save
-  button beneath the list of tables and coordinates, to save any changes you
-  made there. Then scroll all the way down, select the :term:`PDF` options you
-  want, and click Go.
-* Internet Explorer for Windows may suggest an incorrect filename when
-  you try to save a generated :term:`PDF`.
-  When saving a generated :term:`PDF`, be
-  sure that the filename ends in ".pdf", for example "schema.pdf".
-  Browsers on other operating systems, and other browsers on Windows, do
-  not have this problem.
-
-.. _faq6_9:
-
-6.9 phpMyAdmin is changing the type of one of my columns!
----------------------------------------------------------
-
-No, it's MySQL that is doing `silent column type changing
-<https://dev.mysql.com/doc/en/silent-column-changes.html>`_.
-
-.. _underscore:
-
-6.10 When creating a privilege, what happens with underscores in the database name?
------------------------------------------------------------------------------------
-
-If you do not put a backslash before the underscore, this is a
-wildcard grant, and the underscore means "any character". So, if the
-database name is "john\_db", the user would get rights to john1db,
-john2db ... If you put a backslash before the underscore, it means
-that the database name will have a real underscore.
-
-.. _faq6_11:
-
-6.11 What is the curious symbol ø in the statistics pages?
-----------------------------------------------------------
-
-It means "average".
-
-.. _faqexport:
-
-6.12 I want to understand some Export options.
-----------------------------------------------
-
-**Structure:**
-
-* "Add DROP TABLE" will add a line telling MySQL to `drop the table
-  <https://dev.mysql.com/doc/mysql/en/drop-table.html>`_, if it already
-  exists during the import. It does NOT drop the table after your
-  export, it only affects the import file.
-* "If Not Exists" will only create the table if it doesn't exist.
-  Otherwise, you may get an error if the table name exists but has a
-  different structure.
-* "Add AUTO\_INCREMENT value" ensures that AUTO\_INCREMENT value (if
-  any) will be included in backup.
-* "Enclose table and column names with backquotes" ensures that column
-  and table names formed with special characters are protected.
-* "Add into comments" includes column comments, relations, and MIME
-  types set in the pmadb in the dump as :term:`SQL` comments
-  (*/\* xxx \*/*).
-
-**Data:**
-
-* "Complete inserts" adds the column names on every INSERT command, for
-  better documentation (but resulting file is bigger).
-* "Extended inserts" provides a shorter dump file by using only once the
-  INSERT verb and the table name.
-* "Delayed inserts" are best explained in the `MySQL manual - INSERT DELAYED Syntax
-  <https://dev.mysql.com/doc/mysql/en/insert-delayed.html>`_.
-* "Ignore inserts" treats errors as a warning instead. Again, more info
-  is provided in the `MySQL manual - INSERT Syntax
-  <https://dev.mysql.com/doc/mysql/en/insert.html>`_, but basically with
-  this selected, invalid values are adjusted and inserted rather than
-  causing the entire statement to fail.
-
-.. _faq6_13:
-
-6.13 I would like to create a database with a dot in its name.
---------------------------------------------------------------
-
-This is a bad idea, because in MySQL the syntax "database.table" is
-the normal way to reference a database and table name. Worse, MySQL
-will usually let you create a database with a dot, but then you cannot
-work with it, nor delete it.
-
-.. _faqsqlvalidator:
-
-6.14 (withdrawn).
------------------
-
-.. _faq6_15:
-
-6.15 I want to add a BLOB column and put an index on it, but MySQL says "BLOB column '...' used in key specification without a key length".
--------------------------------------------------------------------------------------------------------------------------------------------
-
-The right way to do this, is to create the column without any indexes,
-then display the table structure and use the "Create an index" dialog.
-On this page, you will be able to choose your BLOB column, and set a
-size to the index, which is the condition to create an index on a BLOB
-column.
-
-.. _faq6_16:
-
-6.16 How can I simply move in page with plenty editing fields?
---------------------------------------------------------------
-
-You can use :kbd:`Ctrl+arrows` (:kbd:`Option+Arrows` in Safari) for moving on
-most pages with many editing fields (table structure changes, row editing,
-etc.).
-
-.. _faq6_17:
-
-6.17 Transformations: I can't enter my own mimetype! WTF is this feature then useful for?
------------------------------------------------------------------------------------------
-
-Slow down :). Defining mimetypes is of no use, if you can't put
-transformations on them. Otherwise you could just put a comment on the
-column. Because entering your own mimetype will cause serious syntax
-checking issues and validation, this introduces a high-risk false-
-user-input situation. Instead you have to initialize mimetypes using
-functions or empty mimetype definitions.
-
-Plus, you have a whole overview of available mimetypes. Who knows all those
-mimetypes by heart so he/she can enter it at will?
-
-.. _faqbookmark:
-
-6.18 Bookmarks: Where can I store bookmarks? Why can't I see any bookmarks below the query box? What are these variables for?
------------------------------------------------------------------------------------------------------------------------------
-
-Any query you have executed can be stored as a bookmark on the page
-where the results are displayed. You will find a button labeled
-'Bookmark this query' just at the end of the page. As soon as you have
-stored a bookmark, it is related to the database you run the query on.
-You can now access a bookmark dropdown on each page, the query box
-appears on for that database.
-
-You can also have, inside the query, placeholders for variables.
-This is done by inserting into the query SQL comments between ``/*`` and
-``*/``. Inside the comments, the special strings ``[VARIABLE{variable-number}]`` is used.
-Be aware that the whole query minus the SQL comments must be
-valid by itself, otherwise you won't be able to store it as a bookmark.
-
-When you execute the bookmark, everything typed into the *Variables*
-input boxes on the query box page will replace the strings ``/*[VARIABLE{variable-number}]*/`` in
-your stored query.
-
-Also remember, that everything else inside the ``/*[VARIABLE{variable-number}]*/`` string for
-your query will remain the way it is, but will be stripped of the ``/**/``
-chars. So you can use:
-
-.. code-block:: mysql
-
-    /*, [VARIABLE1] AS myname */
-
-which will be expanded to
-
-.. code-block:: mysql
-
-    , VARIABLE1 as myname
-
-in your query, where VARIABLE1 is the string you entered in the Variable 1 input box.
-
-A more complex example. Say you have stored
-this query:
-
-.. code-block:: mysql
-
-    SELECT Name, Address FROM addresses WHERE 1 /* AND Name LIKE '%[VARIABLE1]%' */
-
-Say, you now enter "phpMyAdmin" as the variable for the stored query, the full
-query will be:
-
-.. code-block:: mysql
-
-    SELECT Name, Address FROM addresses WHERE 1 AND Name LIKE '%phpMyAdmin%'
-
-**NOTE THE ABSENCE OF SPACES** inside the ``/**/`` construct. Any spaces
-inserted there will be later also inserted as spaces in your query and may lead
-to unexpected results especially when using the variable expansion inside of a
-"LIKE ''" expression.
-
-.. _faq6_19:
-
-6.19 How can I create simple LATEX document to include exported table?
-----------------------------------------------------------------------
-
-You can simply include table in your LATEX documents,
-minimal sample document should look like following one (assuming you
-have table exported in file :file:`table.tex`):
-
-.. code-block:: latex
-
-
-    \documentclass{article} % or any class you want
-    \usepackage{longtable}  % for displaying table
-    \begin{document}        % start of document
-    \include{table}         % including exported table
-    \end{document}          % end of document
-
-.. _faq6_20:
-
-6.20 I see a lot of databases which are not mine, and cannot access them.
--------------------------------------------------------------------------
-
-You have one of these global privileges: CREATE TEMPORARY TABLES, SHOW
-DATABASES, LOCK TABLES. Those privileges also enable users to see all the
-database names. So if your users do not need those privileges, you can remove
-them and their databases list will shorten.
-
-.. seealso:: <https://bugs.mysql.com/179>
-
-.. _faq6_21:
-
-6.21 In edit/insert mode, how can I see a list of possible values for a column, based on some foreign table?
-------------------------------------------------------------------------------------------------------------
-
-You have to setup appropriate links between the tables, and also setup
-the "display column" in the foreign table. See :ref:`faq6_6` for an
-example. Then, if there are 100 values or less in the foreign table, a
-drop-down list of values will be available. You will see two lists of
-values, the first list containing the key and the display column, the
-second list containing the display column and the key. The reason for
-this is to be able to type the first letter of either the key or the
-display column. For 100 values or more, a distinct window will appear,
-to browse foreign key values and choose one. To change the default
-limit of 100, see :config:option:`$cfg['ForeignKeyMaxLimit']`.
-
-
-.. _faq6_22:
-
-6.22 Bookmarks: Can I execute a default bookmark automatically when entering Browse mode for a table?
------------------------------------------------------------------------------------------------------
-
-Yes. If a bookmark has the same label as a table name and it's not a
-public bookmark, it will be executed.
-
-.. _faq6_23:
-
-6.23 Export: I heard phpMyAdmin can export Microsoft Excel files?
------------------------------------------------------------------
-
-You can use :term:`CSV` for Microsoft Excel,
-which works out of the box.
-
-.. versionchanged:: 3.4.5
-    Since phpMyAdmin 3.4.5 support for direct export to Microsoft Excel version
-    97 and newer was dropped.
-
-.. _faq6_24:
-
-6.24 Now that phpMyAdmin supports native MySQL 4.1.x column comments, what happens to my column comments stored in pmadb?
--------------------------------------------------------------------------------------------------------------------------
-
-Automatic migration of a table's pmadb-style column comments to the
-native ones is done whenever you enter Structure page for this table.
-
-.. _faq6_25:
-
-6.25 (withdrawn).
------------------
-
-.. _faq6_26:
-
-6.26 How can I select a range of rows?
---------------------------------------
-
-Click the first row of the range, hold the shift key and click the
-last row of the range. This works everywhere you see rows, for example
-in Browse mode or on the Structure page.
-
-.. _faq6_27:
-
-6.27 What format strings can I use?
------------------------------------
-
-In all places where phpMyAdmin accepts format strings, you can use
-``@VARIABLE@`` expansion and `strftime <https://php.net/strftime>`_
-format strings. The expanded variables depend on a context (for
-example, if you haven't chosen a table, you can not get the table
-name), but the following variables can be used:
-
-``@HTTP_HOST@``
-    HTTP host that runs phpMyAdmin
-``@SERVER@``
-    MySQL server name
-``@VERBOSE@``
-    Verbose MySQL server name as defined in :config:option:`$cfg['Servers'][$i]['verbose']`
-``@VSERVER@``
-    Verbose MySQL server name if set, otherwise normal
-``@DATABASE@``
-    Currently opened database
-``@TABLE@``
-    Currently opened table
-``@COLUMNS@``
-    Columns of the currently opened table
-``@PHPMYADMIN@``
-    phpMyAdmin with version
-
-.. _wysiwyg:
-
-6.28 How can I easily edit relational schema for export?
---------------------------------------------------------
-
-By clicking on the button 'toggle scratchboard' on the page where you
-edit x/y coordinates of those elements you can activate a scratchboard
-where all your elements are placed. By clicking on an element, you can
-move them around in the pre-defined area and the x/y coordinates will
-get updated dynamically. Likewise, when entering a new position
-directly into the input field, the new position in the scratchboard
-changes after your cursor leaves the input field.
-
-You have to click on the 'OK'-button below the tables to save the new
-positions. If you want to place a new element, first add it to the
-table of elements and then you can drag the new element around.
-
-By changing the paper size and the orientation you can change the size
-of the scratchboard as well. You can do so by just changing the
-dropdown field below, and the scratchboard will resize automatically,
-without interfering with the current placement of the elements.
-
-If ever an element gets out of range you can either enlarge the paper
-size or click on the 'reset' button to place all elements below each
-other.
-
-.. _faq6_29:
-
-6.29 Why can't I get a chart from my query result table?
---------------------------------------------------------
-
-Not every table can be put to the chart. Only tables with one, two or
-three columns can be visualised as a chart. Moreover the table must be
-in a special format for chart script to understand it. Currently
-supported formats can be found in the `wiki <https://wiki.phpmyadmin.ne
-t/pma/Charts#Data_formats_for_query_results_chart>`_.
-
-.. _faq6_30:
-
-6.30 Import: How can I import ESRI Shapefiles?
-----------------------------------------------
-
-An ESRI Shapefile is actually a set of several files, where .shp file
-contains geometry data and .dbf file contains data related to those
-geometry data. To read data from .dbf file you need to have PHP
-compiled with the dBase extension (--enable-dbase). Otherwise only
-geometry data will be imported.
-
-To upload these set of files you can use either of the following
-methods:
-
-Configure upload directory with :config:option:`$cfg['UploadDir']`, upload both .shp and .dbf files with
-the same filename and chose the .shp file from the import page.
-
-Create a Zip archive with .shp and .dbf files and import it. For this
-to work, you need to set :config:option:`$cfg['TempDir']` to a place where the web server user can
-write (for example ``'./tmp'``).
-
-To create the temporary directory on a UNIX-based system, you can do:
-
-.. code-block:: sh
-
-    cd phpMyAdmin
-    mkdir tmp
-    chmod o+rwx tmp
-
-.. _faq6_31:
-
-6.31 How do I create a relation in designer?
---------------------------------------------
-
-To select relation, click:  The display column is shown in pink. To
-set/unset a column as the display column, click the "Choose column to
-display" icon, then click on the appropriate column name.
-
-.. _faq6_32:
-
-6.32 How can I use the zoom search feature?
--------------------------------------------
-
-The Zoom search feature is an alternative to table search feature. It allows
-you to explore a table by representing its data in a scatter plot. You can
-locate this feature by selecting a table and clicking the :guilabel:`Search`
-tab. One of the sub-tabs in the :guilabel:`Table Search` page is
-:guilabel:`Zoom Search`.
-
-Consider the table REL\_persons in :ref:`faq6_6` for
-an example. To use zoom search, two columns need to be selected, for
-example, id and town\_code. The id values will be represented on one
-axis and town\_code values on the other axis. Each row will be
-represented as a point in a scatter plot based on its id and
-town\_code. You can include two additional search criteria apart from
-the two fields to display.
-
-You can choose which field should be
-displayed as label for each point. If a display column has been set
-for the table (see :ref:`faqdisplay`), it is taken as the label unless
-you specify otherwise. You can also select the maximum number of rows
-you want to be displayed in the plot by specifing it in the 'Max rows
-to plot' field. Once you have decided over your criteria, click 'Go'
-to display the plot.
-
-After the plot is generated, you can use the
-mousewheel to zoom in and out of the plot. In addition, panning
-feature is enabled to navigate through the plot. You can zoom-in to a
-certain level of detail and use panning to locate your area of
-interest. Clicking on a point opens a dialogue box, displaying field
-values of the data row represented by the point. You can edit the
-values if required and click on submit to issue an update query. Basic
-instructions on how to use can be viewed by clicking the 'How to use?'
-link located just above the plot.
-
-.. _faq6_33:
-
-6.33 When browsing a table, how can I copy a column name?
----------------------------------------------------------
-
-Selecting the name of the column within the browse table header cell
-for copying is difficult, as the columns support reordering by
-dragging the header cells as well as sorting by clicking on the linked
-column name. To copy a column name, double-click on the empty area
-next to the column name, when the tooltip tells you to do so. This
-will show you an input box with the column name. You may right-click
-the column name within this input box to copy it to your clipboard.
-
-.. _faq6_34:
-
-6.34 How can I use the Favorite Tables feature?
----------------------------------------------------------
-
-Favorite Tables feature is very much similar to Recent Tables feature.
-It allows you to add a shortcut for the frequently used tables of any
-database in the navigation panel . You can easily navigate to any table
-in the list by simply choosing it from the list. These tables are stored
-in your browser's local storage if you have not configured your
-`phpMyAdmin Configuration Storage`. Otherwise these entries are stored in
-`phpMyAdmin Configuration Storage`.
-
-IMPORTANT: In absence of `phpMyAdmin Configuration Storage`, your Favorite
-tables may be different in different browsers based on your different
-selections in them.
-
-To add a table to Favorite list simply click on the `Gray` star in front
-of a table name in the list of tables of a Database and wait until it
-turns to `Yellow`.
-To remove a table from list, simply click on the `Yellow` star and
-wait until it turns `Gray` again.
-
-Using :config:option:`$cfg['NumFavoriteTables']` in your :file:`config.inc.php`
-file, you can define the  maximum number of favorite tables shown in the
-navigation panel. Its default value is `10`.
-
-.. _faq6_35:
-
-6.35 How can I use the Range search feature?
----------------------------------------------------------
-
-With the help of range search feature, one can specify a range of values for
-particular column(s) while performing search operation on a table from the `Search`
-tab.
-
-To use this feature simply click on the `BETWEEN` or `NOT BETWEEN` operators
-from the operator select list in front of the column name. On choosing one of the
-above options, a dialog box will show up asking for the `Minimum` and `Maximum`
-value for that column. Only the specified range of values will be included
-in case of `BETWEEN` and excluded in case of `NOT BETWEEN` from the final results.
-
-Note: The Range search feature will work only `Numeric` and `Date` data type columns.
-
-.. _faq6_36:
-
-6.36 What is Central columns and How can I use this feature?
-------------------------------------------------------------
-
-As the name suggests, the Central columns feature enables to maintain a central list of
-columns per database to avoid similar name for the same data element and bring consistency
-of data type for the same data element. You can use the central list of columns to
-add an element to any table structure in that database which will save from writing
-similar column name and column definition.
-
-To add a column to central list, go to table structure page, check the columns you want
-to include and then simply click on "Add to central columns". If you want to add all
-unique columns from more than one table from a database then go to database structure page,
-check the tables you want to include and then select "Add columns to central list".
-
-To remove a column from central list, go to Table structure page, check the columns you want
-to remove and then simply click on "Remove from central columns". If you want to remove all
-columns from more than one tables from a database then go to database structure page,
-check the tables you want to include and then select "Remove columns from central list".
-
-To view and manage the central list, select the database you want to manage central columns
-for then from the top menu click on "Central columns". You will be taken to a page where
-you will have options to edit, delete or add new columns to central list.
-
-.. _faq6_37:
-
-6.37 How can I use Improve Table structure feature?
----------------------------------------------------------
-
-Improve table structure feature helps to bring the table structure upto
-Third Normal Form. A wizard is presented to user which asks questions about the
-elements during the various steps for normalization and a new structure is proposed
-accordingly to bring the table into the First/Second/Third Normal form.
-On startup of the wizard, user gets to select upto what normal form they want to
-normalize the table structure.
-
-Here is an example table which you can use to test all of the three First, Second and
-Third Normal Form.
-
-.. code-block:: mysql
-
-    CREATE TABLE `VetOffice` (
-     `petName` varchar(64) NOT NULL,
-     `petBreed` varchar(64) NOT NULL,
-     `petType` varchar(64) NOT NULL,
-     `petDOB` date NOT NULL,
-     `ownerLastName` varchar(64) NOT NULL,
-     `ownerFirstName` varchar(64) NOT NULL,
-     `ownerPhone1` int(12) NOT NULL,
-     `ownerPhone2` int(12) NOT NULL,
-     `ownerEmail` varchar(64) NOT NULL,
-    );
-
-The above table is not in First normal Form as no primary key exists. Primary key
-is supposed to be (`petName`,`ownerLastName`,`ownerFirstName`) . If the primary key
-is chosen as suggested the resultant table won't be in Second as well as Third Normal
-form as the following dependencies exists.
-
-.. code-block:: mysql
-
-    (OwnerLastName, OwnerFirstName) -> OwnerEmail
-    (OwnerLastName, OwnerFirstName) -> OwnerPhone
-    PetBreed -> PetType
-
-Which says, OwnerEmail depends on OwnerLastName and OwnerFirstName.
-OwnerPhone depends on OwnerLastName and OwnerFirstName.
-PetType depends on PetBreed.
-
-.. _faq6_38:
-
-6.38 How can I reassign auto-incremented values? 
-------------------------------------------------
-
-Some users prefer their AUTO_INCREMENT values to be consecutive; this is not
-always the case after row deletion.
-
-Here are the steps to accomplish this. These are manual steps because they
-involve a manual verification at one point.
-
-* Ensure that you have exclusive access to the table to rearrange
-
-* On your primary key column (i.e. id), remove the AUTO_INCREMENT setting
-
-* Delete your primary key in Structure > indexes
-
-* Create a new column future_id as primary key, AUTO_INCREMENT
-
-* Browse your table and verify that the new increments correspond to what
-  you're expecting
-
-* Drop your old id column
-
-* Rename the future_id column to id
-
-* Move the new id column via Structure > Move columns
-
-.. _faq6_39:
-
-6.39 What is the "Adjust privileges" option when renaming, copying, or moving a database, table, column, or procedure?
-----------------------------------------------------------------------------------------------------------------------
-
-When renaming/copying/moving a database/table/column/procedure,
-MySQL does not adjust the original privileges relating to these objects
-on its own. By selecting this option, phpMyAdmin will adjust the privilege
-table so that users have the same privileges on the new items.
-
-For example: A user 'bob'@'localhost' has a 'SELECT' privilege on a
-column named 'id'. Now, if this column is renamed to 'id_new', MySQL,
-on its own, would **not** adjust the column privileges to the new column name.
-phpMyAdmin can make this adjustment for you automatically.
-
-Notes:
-
-* While adjusting privileges for a database, the privileges of all
-  database-related elements (tables, columns and procedures) are also adjusted
-  to the database's new name.
-
-* Similarly, while adjusting privileges for a table, the privileges of all
-  the columns inside the new table are also adjusted.
-
-* While adjusting privileges, the user performing the operation **must** have the following
-  privileges:
-
-  * SELECT, INSERT, UPDATE, DELETE privileges on following tables:
-    `mysql`.`db`, `mysql`.`columns_priv`, `mysql`.`tables_priv`, `mysql`.`procs_priv`
-  * FLUSH privilege (GLOBAL)
-
-Thus, if you want to replicate the database/table/column/procedure as it is
-while renaming/copying/moving these objects, make sure you have checked this option.
-
-.. _faq6_40:
-
-6.40 I see "Bind parameters" checkbox in the "SQL" page. How do I write parameterized SQL queries?
---------------------------------------------------------------------------------------------------
-
-From version 4.5, phpMyAdmin allows users to execute parameterized queries in the "SQL" page.
-Parameters should be prefixed with a colon(:) and when the "Bind parameters" checkbox is checked
-these parameters will be identified and input fields for these parameters will be presented.
-Values entered in these field will be substituted in the query before being executed.
-
-.. _faq6_41:
-
-6.41 I get import errors while importing the dumps exported from older MySQL versions (pre-5.7.6) into newer MySQL versions (5.7.7+), but they work fine when imported back on same older versions ?
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-If you get errors like *#1031 - Table storage engine for 'table_name' doesn't have this option*
-while importing the dumps exported from pre-5.7.7 MySQL servers into new MySQL server versions 5.7.7+,
-it might be because ROW_FORMAT=FIXED is not supported with InnoDB tables. Moreover, the value of
-`innodb_strict_mode <http://dev.mysql.com/doc/refman/5.7/en/innodb-parameters.html#sysvar_innodb_strict_mode>`_ would define if this would be reported as a warning or as an error.
-
-Since MySQL version 5.7.9, the default value for `innodb_strict_mode` is `ON` and thus would generate
-an error when such a CREATE TABLE or ALTER TABLE statement is encountered.
-
-There are two ways of preventing such errors while importing:
-
-* Change the value of `innodb_strict_mode` to `OFF` before starting the import and turn it `ON` after
-  the import is successfully completed.
-* This can be achieved in two ways:
-
-  * Go to 'Variables' page and edit the value of `innodb_strict_mode`
-  * Run the query : `SET GLOBAL `innodb_strict_mode` = '[value]'`
-
-After the import is done, it is suggested that the value of `innodb_strict_mode` should be reset to the
-original value.
-
-.. _faqproject:
-
-phpMyAdmin project
-++++++++++++++++++
-
-.. _faq7_1:
-
-7.1 I have found a bug. How do I inform developers?
----------------------------------------------------
-
-Our issues tracker is located at <https://github.com/phpmyadmin/phpmyadmin/issues>.
-
-.. _faq7_2:
-
-7.2 I want to translate the messages to a new language or upgrade an existing language, where do I start?
----------------------------------------------------------------------------------------------------------
-
-Translations are very welcome and all you need to have are the
-language skills. The easiest way is to use our `online translation
-service <https://hosted.weblate.org/projects/phpmyadmin/>`_. You can check
-out all the possibilities to translate in the `translate section on
-our website <https://www.phpmyadmin.net/translate/>`_.
-
-.. _faq7_3:
-
-7.3 I would like to help out with the development of phpMyAdmin. How should I proceed?
---------------------------------------------------------------------------------------
-
-We welcome every contribution to the development of phpMyAdmin. You
-can check out all the possibilities to contribute in the `contribute
-section on our website
-<https://www.phpmyadmin.net/contribute/>`_.
-
-.. seealso:: :ref:`developers`
-
-.. _faqsecurity:
-
-Security
-++++++++
-
-.. _faq8_1:
-
-8.1 Where can I get information about the security alerts issued for phpMyAdmin?
---------------------------------------------------------------------------------
-
-Please refer to <https://www.phpmyadmin.net/security/>.
-
-.. _faq8_2:
-
-8.2 How can I protect phpMyAdmin against brute force attacks?
--------------------------------------------------------------
-
-If you use Apache web server, phpMyAdmin exports information about
-authentication to the Apache environment and it can be used in Apache
-logs. Currently there are two variables available:
-
-
-``userID``
-    User name of currently active user (he does not have to be logged in).
-``userStatus``
-    Status of currently active user, one of ``ok`` (user is logged in),
-    ``mysql-denied`` (MySQL denied user login), ``allow-denied`` (user denied
-    by allow/deny rules), ``root-denied`` (root is denied in configuration),
-    ``empty-denied`` (empty password is denied).
-
-``LogFormat`` directive for Apache can look like following:
-
-.. code-block:: apache
-
-    LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %{userID}n %{userStatus}n"   pma_combined
-
-You can then use any log analyzing tools to detect possible break-in
-attempts.
-
-.. _faq8_3:
-
-8.3 Why are there path disclosures when directly loading certain files?
------------------------------------------------------------------------
-
-This is a server configuration problem. Never enable ``display_errors`` on a production site.
-
-.. _faqsynchronization:
-
-Synchronization
-+++++++++++++++
-
-.. _faq9_1:
-
-9.1 (withdrawn).
-----------------
-
-.. _faq9_2:
-
-9.2 (withdrawn).
-----------------
-
diff --git a/#pma/doc/html/_sources/glossary.txt b/#pma/doc/html/_sources/glossary.txt
deleted file mode 100644
index 763e58e1..00000000
--- a/#pma/doc/html/_sources/glossary.txt
+++ /dev/null
@@ -1,401 +0,0 @@
-.. _glossary:
-
-Glossary
-========
-
-From Wikipedia, the free encyclopedia
-
-.. glossary::
-
-    .htaccess
-      the default name of Apache's directory-level configuration file.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/.htaccess>
-
-    ACL
-      Access Contol List
-
-    Blowfish
-      a keyed, symmetric block cipher, designed in 1993 by Bruce Schneier.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/Blowfish_(cipher)>
-
-    Browser
-      a software application that enables a user to display and interact with text, images, and other information typically located on a web page at a website on the World Wide Web.	
-
-      .. seealso:: <https://en.wikipedia.org/wiki/Web_browser>
-
-    bzip2
-      a free software/open source data compression algorithm and program developed by Julian Seward.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/Bzip2>
-
-    CGI
-      Common Gateway Interface is an important World Wide Web technology that
-      enables a client web browser to request data from a program executed on
-      the Web server.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/CGI>
-
-    Changelog
-      a log or record of changes made to a project.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/Changelog>
-
-    Client
-      a computer system that accesses a (remote) service on another computer by some kind of network.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/Client_(computing)>
-
-    column
-      a set of data values of a particular simple type, one for each row of the table.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/Column_(database)>
-
-    Cookie
-      a packet of information sent by a server to a World Wide Web browser and then sent back by the browser each time it accesses that server.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/HTTP_cookie>
-
-    CSV
-      Comma- separated values	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/Comma-separated_values>
-
-    DB
-      look at :term:`database`
-
-    database
-      an organized collection of data.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/Database>
-
-    Engine
-      look at :term:`storage engines`
-
-    extension
-      a PHP module that extends PHP with additional functionality.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/extension>
-
-    FAQ
-      Frequently Asked Questions is a list of commonly asked question and there
-      answers.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/FAQ>
-
-    Field
-      one part of divided data/columns.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/Field_(computer_science)>
-
-    foreign key
-      a column or group of columns in a database row that point to a key column
-      or group of columns forming a key of another database row in some
-      (usually different) table.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/Foreign_key>
-
-    FPDF
-      the free :term:`PDF` library	
-
-      .. seealso:: <http://www.fpdf.org/>
-
-    GD
-      Graphics Library by Thomas Boutell and others for dynamically manipulating images.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/GD_Graphics_Library>
-
-    GD2
-      look at :term:`gd`
-
-    gzip
-      gzip is short for GNU zip, a GNU free software file compression program.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/Gzip>
-
-    host
-      any machine connected to a computer network, a node that has a hostname.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/Host>
-
-    hostname
-      the unique name by which a network attached device is known on a network.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/Hostname>
-
-    HTTP
-      HyperText Transfer Protocol is the primary method used to transfer or
-      convey information on the World Wide Web.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/HyperText_Transfer_Protocol>
-
-    https
-      a :term:`HTTP`-connection with additional security measures.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/Https:_URI_scheme>
-
-    IEC
-      International Electrotechnical Commission
-
-    IIS
-      Internet Information Services is a set of Internet-based services for
-      servers using Microsoft Windows.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/Internet_Information_Services>
-
-    Index
-      a feature that allows quick access to the rows in a table.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/Index_(database)>
-
-    IP
-      Internet Protocol is a data-oriented protocol used by source and
-      destination hosts for communicating data across a packet-switched
-      internetwork.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/Internet_Protocol>
-
-    IP Address
-      a unique number that devices use in order to identify and communicate with each other on a network utilizing the Internet Protocol standard.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/IP_Address>
-
-    IPv6
-      IPv6 (Internet Protocol version 6) is the latest revision of the
-      Internet Protocol (:term:`IP`), designed to deal with the
-      long-anticipated problem of its precedessor IPv4 running out of addresses.
-
-      .. seealso:: <https://www.wikipedia.org/wiki/IPv6>
-
-    ISAPI
-      Internet Server Application Programming Interface is the API of Internet Information Services (IIS).	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/ISAPI>
-
-    ISP
-      Internet service provider is a business or organization that offers users
-      access to the Internet and related services.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/ISP>
-
-    ISO
-      International Standards Organisation
-
-    JPEG
-      a most commonly used standard method of lossy compression for photographic images.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/JPEG>
-
-    JPG
-      look at :term:`jpeg`
-
-    Key
-      look at :term:`index`
-
-    LATEX
-      a document preparation system for the TEX typesetting program.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/LaTeX>
-
-    Mac
-       Apple Macintosh is line of personal computers is designed, developed, manufactured, and marketed by Apple Computer.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/Mac>
-
-    Mac OS X
-      the operating system which is included with all currently shipping Apple Macintosh computers in the consumer and professional markets.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/Mac_OS_X>
-
-    MCrypt
-      a cryptographic library.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/MCrypt>
-
-    mcrypt
-      the MCrypt PHP extension.	
-
-      .. seealso:: <https://php.net/mcrypt>
-
-    MIME
-      Multipurpose Internet Mail Extensions is
-      an Internet Standard for the format of e-mail.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/MIME>
-
-    module
-      some sort of extension for the Apache Webserver.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/module>
-
-    mod_proxy_fcgi
-      an Apache module implmenting a Fast CGI interface; PHP can be run as a CGI module, FastCGI, or
-      directly as an Apache module.
-
-    MySQL
-      a multithreaded, multi-user, SQL (Structured Query Language) Database Management System (DBMS).	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/MySQL>
-
-    mysqli
-      the improved MySQL client PHP extension.	
-
-      .. seealso:: <https://php.net/mysqli>
-
-    mysql
-      the MySQL client PHP extension.	
-
-      .. seealso:: <https://php.net/mysql>
-
-    OpenDocument
-      open standard for office documents.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/OpenDocument>
-
-    OS X
-      look at :term:`Mac OS X`.
-
-      .. seealso:: <https://www.wikipedia.org/wiki/OS_X>
-
-    PDF
-      Portable Document Format is a file format developed by Adobe Systems for
-      representing two dimensional documents in a device independent and
-      resolution independent format.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/Portable_Document_Format>
-
-    PEAR
-      the PHP Extension and Application Repository.	
-
-      .. seealso:: <https://pear.php.net/>
-
-    PCRE
-      Perl Compatible Regular Expressions is the perl-compatible regular
-      expression functions for PHP	
-
-      .. seealso:: <https://php.net/pcre>
-
-    PHP
-      short for "PHP: Hypertext Preprocessor", is an open-source, reflective
-      programming language used mainly for developing server-side applications
-      and dynamic web content, and more recently, a broader range of software
-      applications.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/PHP>
-
-    port
-      a connection through which data is sent and received.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/Port_(computing)>
-
-    RFC
-      Request for Comments (RFC) documents are a series of memoranda
-      encompassing new research, innovations, and methodologies applicable to
-      Internet technologies.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/Request_for_Comments>
-
-    RFC 1952
-      GZIP file format specification version 4.3
-
-      .. seealso:: :rfc:`1952`
-
-    Row (record, tuple)
-      represents a single, implicitly structured data item in a table.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/Row_(database)>
-
-    Server
-      a computer system that provides services to other computing systems over a network.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/Server_(computing)>
-
-    Storage Engines
-      handlers for different table types	
-
-      .. seealso:: <https://dev.mysql.com/doc/en/storage-engines.html>
-
-    socket
-      a form of inter-process communication.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/Socket#Computer_sockets>
-
-    SSL
-      Secure Sockets Layer is a cryptographic protocol which provides secure
-      communication on the Internet.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/Secure_Sockets_Layer>
-
-    Stored procedure
-      a subroutine available to applications accessing a relational database system	
-
-      .. seealso:: <https://en.wikipedia.org/wiki/Stored_procedure>
-
-    SQL
-      Structured Query Language	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/SQL>
-
-    table
-      a set of data elements (cells) that is organized, defined and stored as
-      horizontal rows and vertical columns where each item can be uniquely
-      identified by a label or key or by it?s position in relation to other
-      items.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/Table_(database)>
-
-    tar
-      a type of archive file format: the Tape ARchive format.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/Tar_(file_format)>
-
-    TCP
-      Transmission Control Protocol is one of the core protocols of the
-      Internet protocol suite.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/TCP>
-
-    TCPDF
-      Rewrite of :term:`UFPDF` with various improvements.
-
-      .. seealso:: <https://tcpdf.org/>
-
-    trigger
-      a procedural code that is automatically executed in response to certain events on a particular table or view in a database	
-
-      .. seealso:: <https://en.wikipedia.org/wiki/Database_trigger>
-
-    UFPDF
-      Unicode/UTF-8 extension for :term:`FPDF`
-
-    URL
-      Uniform Resource Locator is a sequence of characters, conforming to a
-      standardized format, that is used for referring to resources, such as
-      documents and images on the Internet, by their location.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/URL>
-
-    Webserver
-      A computer (program) that is responsible for accepting HTTP requests from clients and serving them Web pages.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/Webserver>
-
-    XML
-      Extensible Markup Language is a W3C-recommended general- purpose markup
-      language for creating special-purpose markup languages, capable of
-      describing many different kinds of data.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/XML>
-
-    ZIP
-      a popular data compression and archival format.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/ZIP_(file_format)>
-
-    zlib
-      an open-source, cross- platform data compression library by Jean-loup Gailly and Mark Adler.	
-
-      .. seealso:: <https://www.wikipedia.org/wiki/Zlib>
-
-
diff --git a/#pma/doc/html/_sources/import_export.txt b/#pma/doc/html/_sources/import_export.txt
deleted file mode 100644
index 5921cd5c..00000000
--- a/#pma/doc/html/_sources/import_export.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-Import and export
-=================
-
-In addition to the standard Import and Export tab, you can also import an SQL file directly by dragging and dropping
-it from your local file manager to the phpMyAdmin interface in your web browser.
-
-Open Document Spreadsheet
--------------------------
-
-When importing an ODS speadsheet, the spreadsheet must be named in a specific way in order to make the
-import as simple as possible.
-
-Table name
-~~~~~~~~~~
-
-During import, phpMyAdmin uses the sheet name as the table name; you should rename the
-sheet in your spreadsheet program in order to match your existing table name (or the table you wish to create,
-though this is less of a concern since you could quickly rename the new table from the Operations tab).
-
-Column names
-~~~~~~~~~~~~
-
-You should also make the first row of your spreadsheet a header with the names of the columns (this can be
-accomplished by inserting a new row at the top of your spreadsheet). When on the Import screen, select the
-checkbox for "The first line of the file contains the table column names;" this way your newly imported
-data will go to the proper columns.
-
diff --git a/#pma/doc/html/_sources/index.txt b/#pma/doc/html/_sources/index.txt
deleted file mode 100644
index 917ddf81..00000000
--- a/#pma/doc/html/_sources/index.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-.. phpMyAdmin documentation master file, created by
-   sphinx-quickstart on Wed Sep 26 14:04:48 2012.
-   You can adapt this file completely to your liking, but it should at least
-   contain the root `toctree` directive.
-
-Welcome to phpMyAdmin's documentation!
-======================================
-
-Contents:
-
-.. toctree::
-    :maxdepth: 2
-
-    intro
-    require
-    setup
-    config
-    user
-    faq
-    developers
-    vendors
-    copyright
-    credits
-    glossary
-
-
-Indices and tables
-==================
-
-* :ref:`genindex`
-* :ref:`search`
-* :ref:`glossary`
diff --git a/#pma/doc/html/_sources/intro.txt b/#pma/doc/html/_sources/intro.txt
deleted file mode 100644
index b8c348df..00000000
--- a/#pma/doc/html/_sources/intro.txt
+++ /dev/null
@@ -1,68 +0,0 @@
-.. _intro:
-
-Introduction
-============
-
-phpMyAdmin can manage a whole MySQL server (needs a super-user) as
-well as a single database. To accomplish the latter you'll need a
-properly set up MySQL user who can read/write only the desired
-database. It's up to you to look up the appropriate part in the MySQL
-manual.
-
-
-Supported features
-------------------
-
-Currently phpMyAdmin can:
-
-* browse and drop databases, tables, views, columns and indexes
-* display multiple results sets through stored procedures or queries
-* create, copy, drop, rename and alter databases, tables, columns and
-  indexes
-* maintenance server, databases and tables, with proposals on server
-  configuration
-* execute, edit and bookmark any :term:`SQL`-statement, even batch-queries
-* load text files into tables
-* create [#f1]_ and read dumps of tables
-* export [#f1]_ data to various formats: :term:`CSV`, :term:`XML`, :term:`PDF`,
-  :term:`ISO`/:term:`IEC` 26300 - :term:`OpenDocument` Text and Spreadsheet, Microsoft
-  Word 2000, and LATEX formats
-* import data and :term:`MySQL` structures from :term:`OpenDocument` spreadsheets, as
-  well as :term:`XML`, :term:`CSV`, and :term:`SQL` files
-* administer multiple servers
-* manage MySQL users and privileges
-* check referential integrity in MyISAM tables
-* using Query-by-example (QBE), create complex queries automatically
-  connecting required tables
-* create :term:`PDF` graphics of your
-  database layout
-* search globally in a database or a subset of it
-* transform stored data into any format using a set of predefined
-  functions, like displaying BLOB-data as image or download-link
-* track changes on databases, tables and views
-* support InnoDB tables and foreign keys
-* support mysqli, the improved MySQL extension see :ref:`faq1_17`
-* create, edit, call, export and drop stored procedures and functions
-* create, edit, export and drop events and triggers
-* communicate in `80 different languages
-  <https://www.phpmyadmin.net/translations/>`_
-
-
-A word about users
-------------------
-
-Many people have difficulty understanding the concept of user
-management with regards to phpMyAdmin. When a user logs in to
-phpMyAdmin, that username and password are passed directly to MySQL.
-phpMyAdmin does no account management on its own (other than allowing
-one to manipulate the MySQL user account information); all users must
-be valid MySQL users.
-
-.. rubric:: Footnotes
-
-.. [#f1]
-
-    phpMyAdmin can compress (:term:`Zip`, :term:`GZip` or :term:`RFC 1952`
-    formats) dumps and :term:`CSV` exports if you use PHP with
-    :term:`Zlib` support (``--with-zlib``).
-    Proper support may also need changes in :file:`php.ini`.
diff --git a/#pma/doc/html/_sources/other.txt b/#pma/doc/html/_sources/other.txt
deleted file mode 100644
index 61e83acc..00000000
--- a/#pma/doc/html/_sources/other.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-Other sources of information
-============================
-
-Printed Book
-------------
-
-The definitive guide to using phpMyAdmin is the book Mastering phpMyAdmin for
-Effective MySQL Management by Marc Delisle. You can get information on that
-book and other officially endorsed `books at the phpMyAdmin site`_.
-
-.. _books at the phpMyAdmin site: https://www.phpmyadmin.net/docs/
-
-Tutorials
----------
-
-Third party tutorials and articles are listed on our `wiki page`_.
-
-.. _wiki page: https://wiki.phpmyadmin.net/pma/Articles
diff --git a/#pma/doc/html/_sources/privileges.txt b/#pma/doc/html/_sources/privileges.txt
deleted file mode 100644
index 6a7b8c37..00000000
--- a/#pma/doc/html/_sources/privileges.txt
+++ /dev/null
@@ -1,74 +0,0 @@
-User management
-===============
-
-User management is the process of controlling which users are allowed to
-connect to the MySQL server and what permissions they have on each database.
-phpMyAdmin does not handle user management, rather it passes the username and
-password on to MySQL, which then determines whether a user is permitted to
-perform a particular action. Within phpMyAdmin, administrators have full
-control over creating users, viewing and editing privileges for existing users,
-and removing users.
-
-Within phpMyAdmin, user management is controlled via the :guilabel:`Users` link
-from the main page. Users can be created, edited, and removed.
-
-Creating a new user
--------------------
-
-To create a new user, click the :guilabel:`Add a new user` link near the bottom
-of the :guilabel:`Users` page (you must be a "superuser", e.g., user "root").
-Use the textboxes and drop-downs to configure the user to your particular
-needs. You can then select whether to create a database for that user and grant
-specific global privileges. Once you've created the user (by clicking Go), you
-can define that user's permissions on a specific database (don't grant global
-privileges in that case). In general, users do not need any global privileges
-(other than USAGE), only permissions for their specific database.
-
-Editing an existing user
-------------------------
-
-To edit an existing user, simply click the pencil icon to the right of that
-user in the :guilabel:`Users` page. You can then edit their global- and
-database-specific privileges, change their password, or even copy those
-privileges to a new user.
-
-Deleting a user
----------------
-
-From the :guilabel:`Users` page, check the checkbox for the user you wish to
-remove, select whether or not to also remove any databases of the same name (if
-they exist), and click Go.
-
-Assigning privileges to user for a specific database
-----------------------------------------------------
-
-Users are assigned to databases by editing the user record (from the
-:guilabel:`Users` link on the home page) not from within the :guilabel:`Users`
-link under the table. If you are creating a user specifically for a given table
-you will have to create the user first (with no global privileges) and then go
-back and edit that user to add the table and privileges for the individual
-table.
-
-.. _configurablemenus:
-
-Configurable menus and user groups
-----------------------------------
-
-By enabling :config:option:`$cfg['Servers'][$i]['usergroups']` and
-:config:option:`$cfg['Servers'][$i]['usergroups']` you can customize what users
-will see in the phpMyAdmin navigation.
-
-.. warning::
-
-    This feature only limits what a user sees, he is still able to use all the
-    functions. So this can not be considered as a security limitation. Should
-    you want to limit what users can do, use MySQL privileges to achieve that.
-
-With this feature enabled, the :guilabel:`User accounts` management interface gains 
-a second tab for managing :guilabel:`User groups`, where you can define what each
-group will view (see image below) and you can then assign each user to one of
-these groups. Users will be presented with a simplified user interface, which might be
-useful for inexperienced users who could be overwhelmed by all the features
-phpMyAdmin provides.
-
-.. image:: images/usergroups.png
diff --git a/#pma/doc/html/_sources/require.txt b/#pma/doc/html/_sources/require.txt
deleted file mode 100644
index 4e3c7ec7..00000000
--- a/#pma/doc/html/_sources/require.txt
+++ /dev/null
@@ -1,59 +0,0 @@
-.. _require:
-
-Requirements
-============
-
-Web server
-----------
-
-Since phpMyAdmin's interface is based entirely in your browser, you'll need a
-web server (such as Apache, nginx, :term:`IIS`) to install phpMyAdmin's files into.
-
-PHP
----
-
-* You need PHP 5.5.0 or newer, with ``session`` support, the Standard PHP Library
-  (SPL) extension, JSON support, and the ``mbstring`` extension.
-
-* To support uploading of ZIP files, you need the PHP ``zip`` extension.
-
-* You need GD2 support in PHP to display inline thumbnails of JPEGs
-  ("image/jpeg: inline") with their original aspect ratio.
-
-* When using the cookie authentication (the default), the `openssl
-  <https://www.php.net/openssl>`_ extension is strongly suggested.
-
-* To support upload progress bars, see :ref:`faq2_9`.
-
-* To support XML and Open Document Spreadsheet importing, you need the
-  `libxml <https://www.php.net/libxml>`_ extension.
-
-* To support reCAPTCHA on the login page, you need the
-  `openssl <https://www.php.net/openssl>`_ extension.
-
-* To support displaying phpMyAdmin's latest version, you need to enable
-  ``allow_url_open`` in your :file:`php.ini` or to have the
-  `curl <https://www.php.net/curl>`_ extension.
-
-* Performance suggestion: install the ``ctype`` extension.
-
-.. seealso:: :ref:`faq1_31`, :ref:`authentication_modes`
-
-Database
---------
-
-phpMyAdmin supports MySQL-compatible databases.
-
-* MySQL 5.5 or newer
-* MariaDB 5.5 or newer
-
-.. seealso:: :ref:`faq1_17`
-
-Web browser
------------
-
-To access phpMyAdmin you need a web browser with cookies and JavaScript
-enabled.
-
-You need browser which is supported by jQuery 2.0, see
-<https://jquery.com/browser-support/>.
diff --git a/#pma/doc/html/_sources/setup.txt b/#pma/doc/html/_sources/setup.txt
deleted file mode 100644
index 0d812542..00000000
--- a/#pma/doc/html/_sources/setup.txt
+++ /dev/null
@@ -1,819 +0,0 @@
-.. _setup:
-
-Installation
-============
-
-phpMyAdmin does not apply any special security methods to the MySQL
-database server. It is still the system administrator's job to grant
-permissions on the MySQL databases properly. phpMyAdmin's :guilabel:`Users`
-page can be used for this.
-
-.. warning::
-
-    :term:`Mac` users should note that if you are on a version before
-    :term:`Mac OS X`, StuffIt unstuffs with :term:`Mac` formats. So you'll have
-    to resave as in BBEdit to Unix style ALL phpMyAdmin scripts before
-    uploading them to your server, as PHP seems not to like :term:`Mac`-style
-    end of lines character ("``\r``").
-
-Linux distributions
-+++++++++++++++++++
-
-phpMyAdmin is included in most Linux distributions. It is recommended to use
-distribution packages when possible - they usually provide integration to your
-distribution and you will automatically get security updates from your distribution.
-
-
-Debian
-------
-
-Debian's package repositories include a phpMyAdmin package, but be aware that
-the configuration file is maintained in ``/etc/phpmyadmin`` and may differ in
-some ways from the official phpMyAdmin documentation.
-
-OpenSUSE
---------
-
-OpenSUSE already comes with phpMyAdmin package, just install packages from
-the `openSUSE Build Service <https://software.opensuse.org/package/phpMyAdmin>`_.
-
-Ubuntu
-------
-
-Ubuntu ships phpMyAdmin package, however if you want to use recent version, you
-can use packages from
-`PPA for Michal Čihař <https://launchpad.net/~nijel/+archive/phpmyadmin>`_.
-
-Gentoo
-------
-
-Gentoo ships the phpMyAdmin package, both in a near stock configuration as well
-as in a ``webapp-config`` configuration. Use ``emerge dev-db/phpmyadmin`` to
-install.
-
-Mandriva
---------
-
-Mandriva ships the phpMyAdmin package in their ``contrib`` branch and can be
-installed via the usual Control Center.
-
-Fedora
-------
-
-Fedora ships the phpMyAdmin package, but be aware that the configuration file
-is maintained in ``/etc/phpMyAdmin/`` and may differ in some ways from the
-official phpMyAdmin documentation.
-
-Red Hat Enterprise Linux
-------------------------
-
-Red Hat Enterprise Linux itself and thus derivatives like CentOS don't
-ship phpMyAdmin, but the Fedora-driven repository
-`Extra Packages for Enterprise Linux (EPEL) <https://fedoraproject.org/wiki/EPEL>`_
-is doing so, if it's
-`enabled <https://fedoraproject.org/wiki/EPEL/FAQ#howtouse>`_.
-But be aware that the configuration file is maintained in
-``/etc/phpMyAdmin/`` and may differ in some ways from the
-official phpMyAdmin documentation.
-
-
-Installing on Windows
-+++++++++++++++++++++
-
-The easiest way to get phpMyAdmin on Windows is using third party products
-which include phpMyAdmin together with a database and web server such as
-`XAMPP <https://www.apachefriends.org/>`_.
-
-You can find more of such options at `Wikipedia <https://en.wikipedia.org/wiki/List_of_AMP_packages>`_.
-
-
-Installing using Composer
-+++++++++++++++++++++++++
-
-You can install phpMyAdmin using `Composer <https://getcomposer.org/>`_,
-however it's currently not available in the default
-`Packagist <https://packagist.org/>`_ repository due to its technical
-limitations.
-
-The installation is possible by adding our own repository
-<https://www.phpmyadmin.net/packages.json>:
-
-.. code-block:: sh
-
-    composer create-project phpmyadmin/phpmyadmin --repository-url=https://www.phpmyadmin.net/packages.json --no-dev
-
-Installing using Docker
-+++++++++++++++++++++++
-
-phpMyAdmin comes with a Docker image, which you can easily deploy. You can
-download it using:
-
-.. code-block:: sh
-
-    docker pull phpmyadmin/phpmyadmin
-
-The phpMyAdmin server will be executed on port 80. It supports several ways of
-configuring the link to the database server, which you can manage using
-environment variables:
-
-.. envvar:: PMA_ARBITRARY
-
-    Allows you to enter database server hostname on login form (see
-    :config:option:`$cfg['AllowArbitraryServer']`).
-
-.. envvar:: PMA_HOST
-    
-    Host name or IP address of the database server to use.
-
-.. envvar:: PMA_HOSTS
-    
-    Comma separated host names or IP addresses of the database servers to use.
-
-.. envvar:: PMA_USER
-    
-    User name to use for :ref:`auth_config`.
-
-.. envvar:: PMA_PASSWORD
-    
-    Password to use for :ref:`auth_config`.
-
-.. envvar:: PMA_PORT
-    
-    Port of the databse server to use.
-
-.. envvar:: PMA_ABSOLUTE_URI
-   
-    The fully-qualified path (``https://pma.example.net/``) where the reverse
-    proxy makes phpMyAdmin available.
-
-By default, :ref:`cookie` is used, but if :envvar:`PMA_USER` and
-:envvar:`PMA_PASSWORD` are set, it is switched to :ref:`auth_config`.
-
-.. note::
-
-    The credentials you need to login are stored in the MySQL server, in case
-    of Docker image there are various ways to set it (for example
-    :envvar:`MYSQL_ROOT_PASSWORD` when starting MySQL container). Please check 
-    documentation for `MariaDB container <https://hub.docker.com/r/_/mariadb/>`_
-    or `MySQL container <https://hub.docker.com/r/_/mysql/>`_.
-
-Additionally configuration can be tweaked by :file:`/www/config.user.inc.php`. If
-this file exists, it will be loaded after configuration generated from above
-environment variables, so you can override any configuration variable. This
-configuraiton can be added as a volume when invoking docker using 
-`-v /some/local/directory/config.user.inc.php:/www/config.user.inc.php` parameters.
-
-.. seealso:: 
-   
-    See :ref:`config` for detailed description of configuration options.
-
-Docker Volumes
---------------
-
-You can use following volumes to customise image behavior:
-
-:file:`/www/config.user.inc.php`
-
-    Can be used for additional settings, see previous chapter for more details.
-
-:file:`/sessions/`
-
-    Directory where PHP sessions are stored. You might want to share this 
-    for example when uswing :ref:`auth_signon`.
-
-Docker Examples
----------------
-
-To connect phpMyAdmin to given server use:
-
-.. code-block:: sh
-
-    docker run --name myadmin -d -e PMA_HOST=dbhost -p 8080:80 phpmyadmin/phpmyadmin
-
-To connect phpMyAdmin to more servers use:
-
-.. code-block:: sh
-
-    docker run --name myadmin -d -e PMA_HOSTS=dbhost1,dbhost2,dbhost3 -p 8080:80 phpmyadmin/phpmyadmin
-
-To use arbitrary server option:
-
-.. code-block:: sh
-
-    docker run --name myadmin -d --link mysql_db_server:db -p 8080:80 -e PMA_ARBITRARY=1 phpmyadmin/phpmyadmin
-
-You can also link the database container using Docker:
-
-.. code-block:: sh
-
-    docker run --name phpmyadmin -d --link mysql_db_server:db -p 8080:80 phpmyadmin/phpmyadmin
-
-Running with additional configration:
-
-.. code-block:: sh
-
-    docker run --name phpmyadmin -d --link mysql_db_server:db -p 8080:80 -v /some/local/directory/config.user.inc.php:/config.user.inc.php phpmyadmin/phpmyadmin
-
-Using docker-compose
---------------------
-
-Alternatively you can also use docker-compose with the docker-compose.yml from
-<https://github.com/phpmyadmin/docker>.  This will run phpMyAdmin with
-arbitrary server - allowing you to specify MySQL/MariaDB server on login page.
-
-.. code-block:: sh
-
-    docker-compose up -d
-
-.. _quick_install:
-
-Quick Install
-+++++++++++++
-
-#. Choose an appropriate distribution kit from the phpmyadmin.net
-   Downloads page. Some kits contain only the English messages, others
-   contain all languages. We'll assume you chose a kit whose name
-   looks like ``phpMyAdmin-x.x.x -all-languages.tar.gz``.
-#. Ensure you have downloaded a genuine archive, see :ref:`verify`.
-#. Untar or unzip the distribution (be sure to unzip the subdirectories):
-   ``tar -xzvf phpMyAdmin_x.x.x-all-languages.tar.gz`` in your
-   webserver's document root. If you don't have direct access to your
-   document root, put the files in a directory on your local machine,
-   and, after step 4, transfer the directory on your web server using,
-   for example, ftp.
-#. Ensure that all the scripts have the appropriate owner (if PHP is
-   running in safe mode, having some scripts with an owner different from
-   the owner of other scripts will be a problem). See :ref:`faq4_2` and
-   :ref:`faq1_26` for suggestions.
-#. Now you must configure your installation. There are two methods that
-   can be used. Traditionally, users have hand-edited a copy of
-   :file:`config.inc.php`, but now a wizard-style setup script is provided
-   for those who prefer a graphical installation. Creating a
-   :file:`config.inc.php` is still a quick way to get started and needed for
-   some advanced features.
-
-
-Manually creating the file
---------------------------
-
-To manually create the file, simply use your text editor to create the
-file :file:`config.inc.php` (you can copy :file:`config.sample.inc.php` to get
-a minimal configuration file) in the main (top-level) phpMyAdmin
-directory (the one that contains :file:`index.php`). phpMyAdmin first
-loads :file:`libraries/config.default.php` and then overrides those values
-with anything found in :file:`config.inc.php`. If the default value is
-okay for a particular setting, there is no need to include it in
-:file:`config.inc.php`. You'll probably need only a few directives to get going; a
-simple configuration may look like this:
-
-.. code-block:: xml+php
-
-
-    <?php
-    // use here a value of your choice at least 32 chars long
-    $cfg['blowfish_secret'] = '1{dd0`<Q),5XP_:R9UK%%8\"EEcyH#{o';
-
-    $i=0;
-    $i++;
-    $cfg['Servers'][$i]['auth_type']     = 'cookie';
-    ?>
-
-Or, if you prefer to not be prompted every time you log in:
-
-.. code-block:: xml+php
-
-
-    <?php
-
-    $i=0;
-    $i++;
-    $cfg['Servers'][$i]['user']          = 'root';
-    $cfg['Servers'][$i]['password']      = 'cbb74bc'; // use here your password
-    $cfg['Servers'][$i]['auth_type']     = 'config';
-    ?>
-
-For a full explanation of possible configuration values, see the
-:ref:`config` of this document.
-
-.. index:: Setup script
-
-.. _setup_script:
-
-Using Setup script
-------------------
-
-Instead of manually editing :file:`config.inc.php`, you can use phpMyAdmin's 
-setup feature. First you must manually create a folder ``config``
-in the phpMyAdmin directory. This is a security measure. On a
-Linux/Unix system you can use the following commands:
-
-.. code-block:: sh
-
-
-    cd phpMyAdmin
-    mkdir config                        # create directory for saving
-    chmod o+rw config                   # give it world writable permissions
-
-And to edit an existing configuration, copy it over first:
-
-.. code-block:: sh
-
-
-    cp config.inc.php config/           # copy current configuration for editing
-    chmod o+w config/config.inc.php     # give it world writable permissions
-
-.. note::
-
-    Debian and Ubuntu have simplified this setup and all you need to do is to
-    execute :program:`/usr/sbin/pma-configure`.
-
-On other platforms, simply create the folder and ensure that your web
-server has read and write access to it. :ref:`faq1_26` can help with
-this.
-
-Next, open your browser and visit the location where you installed phpMyAdmin, with the ``/setup`` suffix. If you have an existing configuration,
-use the ``Load`` button to bring its content inside the setup panel.
-Note that **changes are not saved to disk until you explicitly choose ``Save``**
-from the *Configuration* area of the screen. Normally the script saves the new
-:file:`config.inc.php` to the ``config/`` directory, but if the webserver does
-not have the proper permissions you may see the error "Cannot load or
-save configuration." Ensure that the ``config/`` directory exists and
-has the proper permissions - or use the ``Download`` link to save the
-config file locally and upload it (via FTP or some similar means) to the
-proper location.
-
-Once the file has been saved, it must be moved out of the ``config/``
-directory and the permissions must be reset, again as a security
-measure:
-
-.. code-block:: sh
-
-
-    mv config/config.inc.php .         # move file to current directory
-    chmod o-rw config.inc.php          # remove world read and write permissions
-    rm -rf config                      # remove not needed directory
-
-.. note::
-
-    Debian and Ubuntu have simplified this setup and all you need to do is to
-    execute :program:`/usr/sbin/pma-secure`.
-
-Now the file is ready to be used. You can choose to review or edit the
-file with your favorite editor, if you prefer to set some advanced
-options which the setup script does not provide.
-
-#. If you are using the ``auth_type`` "config", it is suggested that you
-   protect the phpMyAdmin installation directory because using config
-   does not require a user to enter a password to access the phpMyAdmin
-   installation. Use of an alternate authentication method is
-   recommended, for example with HTTP–AUTH in a :term:`.htaccess` file or switch to using
-   ``auth_type`` cookie or http. See the :ref:`faqmultiuser`
-   for additional information, especially :ref:`faq4_4`.
-#. Open the `main phpMyAdmin directory <index.php>`_ in your browser.
-   phpMyAdmin should now display a welcome screen and your databases, or
-   a login dialog if using :term:`HTTP` or
-   cookie authentication mode.
-#. You should deny access to the ``./libraries`` and ``./setup/lib``
-   subfolders in your webserver configuration.
-   Such configuration prevents from possible
-   path exposure and cross side scripting vulnerabilities that might
-   happen to be found in that code. For the Apache webserver, this is
-   often accomplished with a :term:`.htaccess` file in those directories.
-#. It is generally a good idea to protect a public phpMyAdmin installation
-   against access by robots as they usually can not do anything good
-   there. You can do this using ``robots.txt`` file in root of your
-   webserver or limit access by web server configuration, see
-   :ref:`faq1_42`.
-
-
-.. _verify:
-
-Verifying phpMyAdmin releases
-+++++++++++++++++++++++++++++
-
-Since July 2015 all phpMyAdmin releases are cryptographically signed by the
-releasing developer, who through January 2016 was Marc Delisle. His key id is
-0xFEFC65D181AF644A, his PGP fingerprint is:
-
-.. code-block:: console
-
-    436F F188 4B1A 0C3F DCBF 0D79 FEFC 65D1 81AF 644A
-
-and you can get more identification information from <https://keybase.io/lem9>.
-
-Beginning in January 2016, the release manager is Isaac Bennetch. His key id is
-0xCE752F178259BD92, and his PGP fingerprint is:
-
-.. code-block:: console
-
-    3D06 A59E CE73 0EB7 1B51 1C17 CE75 2F17 8259 BD92
-
-and you can get more identification information from <https://keybase.io/ibennetch>.
-
-Some additional downloads (for example themes) might be signed by Michal Čihař. His key id is
-0x9C27B31342B7511D, and his PGP fingerprint is:
-
-.. code-block:: console
-
-    63CB 1DF1 EF12 CF2A C0EE 5A32 9C27 B313 42B7 511D
-
-and you can get more identification information from <https://keybase.io/nijel>.
-
-You should verify that the signature matches
-the archive you have downloaded. This way you can be sure that you are using
-the same code that was released.
-
-Each archive is accompanied with ``.asc`` files which contains the PGP signature
-for it. Once you have both of them in the same folder, you can verify the signature:
-
-.. code-block:: console
-
-    $ gpg --verify phpMyAdmin-4.5.4.1-all-languages.zip.asc
-    gpg: Signature made Fri 29 Jan 2016 08:59:37 AM EST using RSA key ID 8259BD92
-    gpg: Can't check signature: public key not found
-
-As you can see gpg complains that it does not know the public key. At this
-point you should do one of the following steps:
-
-* Download the keyring from `our download server <https://files.phpmyadmin.net/phpmyadmin.keyring>`_, then import it with:
-
-.. code-block:: console
-
-   $ gpg --import phpmyadmin.keyring
-
-* Download and import the key from one of the key servers:
-
-.. code-block:: console
-
-    $ gpg --keyserver hkp://pgp.mit.edu --recv-keys 3D06A59ECE730EB71B511C17CE752F178259BD92
-    gpg: requesting key 8259BD92 from hkp server pgp.mit.edu
-    gpg: key 8259BD92: public key "Isaac Bennetch <bennetch@gmail.com>" imported
-    gpg: no ultimately trusted keys found
-    gpg: Total number processed: 1
-    gpg:               imported: 1  (RSA: 1)
-
-This will improve the situation a bit - at this point you can verify that the
-signature from the given key is correct but you still can not trust the name used
-in the key:
-
-.. code-block:: console
-
-    $ gpg --verify phpMyAdmin-4.5.4.1-all-languages.zip.asc
-    gpg: Signature made Fri 29 Jan 2016 08:59:37 AM EST using RSA key ID 8259BD92
-    gpg: Good signature from "Isaac Bennetch <bennetch@gmail.com>"
-    gpg:                 aka "Isaac Bennetch <isaac@bennetch.org>"
-    gpg: WARNING: This key is not certified with a trusted signature!
-    gpg:          There is no indication that the signature belongs to the owner.
-    Primary key fingerprint: 3D06 A59E CE73 0EB7 1B51  1C17 CE75 2F17 8259 BD92
-
-The problem here is that anybody could issue the key with this name.  You need to
-ensure that the key is actually owned by the mentioned person.  The GNU Privacy
-Handbook covers this topic in the chapter `Validating other keys on your public
-keyring`_. The most reliable method is to meet the developer in person and
-exchange key fingerprints, however you can also rely on the web of trust. This way
-you can trust the key transitively though signatures of others, who have met
-the developer in person. For example you can see how `Isaac's key links to
-Linus's key`_.
-
-Once the key is trusted, the warning will not occur:
-
-.. code-block:: console
-
-    $ gpg --verify phpMyAdmin-4.5.4.1-all-languages.zip.asc
-    gpg: Signature made Fri 29 Jan 2016 08:59:37 AM EST using RSA key ID 8259BD92
-    gpg: Good signature from "Isaac Bennetch <bennetch@gmail.com>" [full]
-
-Should the signature be invalid (the archive has been changed), you would get a
-clear error regardless of the fact that the key is trusted or not:
-
-.. code-block:: console
-
-    $ gpg --verify phpMyAdmin-4.5.4.1-all-languages.zip.asc
-    gpg: Signature made Fri 29 Jan 2016 08:59:37 AM EST using RSA key ID 8259BD92
-    gpg: BAD signature from "Isaac Bennetch <bennetch@gmail.com>" [unknown]
-
-.. _Validating other keys on your public keyring: https://www.gnupg.org/gph/en/manual.html#AEN335
-
-.. _Isaac's key links to Linus's key: https://pgp.cs.uu.nl/mk_path.cgi?FROM=ABAF11C65A2970B130ABE3C479BE3E4300411886&TO=3D06A59ECE730EB71B511C17CE752F178259BD92
-
-
-.. index::
-    single: Configuration storage
-    single: phpMyAdmin configuration storage
-    single: pmadb
-
-.. _linked-tables:
-
-phpMyAdmin configuration storage
-++++++++++++++++++++++++++++++++
-
-For a whole set of additional features (bookmarks, comments, :term:`SQL`-history,
-tracking mechanism, :term:`PDF`-generation, column contents transformation,
-etc.) you need to create a set of special tables.  Those tables can be located
-in your own database, or in a central database for a multi-user installation
-(this database would then be accessed by the controluser, so no other user
-should have rights to it).
-
-Zero configuration
-------------------
-
-In many cases, this database structure can be automatically created and
-configured. This is called “Zero Configuration” mode and can be particularly
-useful in shared hosting situations. “Zeroconf” mode is on by default, to
-disable set :config:option:`$cfg['ZeroConf']` to false.
-
-The following three scenarios are covered by the Zero Configuration mode:
-
-* When entering a database where the configuration storage tables are not
-  present, phpMyAdmin offers to create them from the Operations tab.
-* When entering a database where the tables do already exist, the software
-  automatically detects this and begins using them. This is the most common
-  situation; after the tables are initially created automatically they are
-  continually used without disturbing the user; this is also most useful on
-  shared hosting where the user is not able to edit :file:`config.inc.php` and
-  usually the user only has access to one database.
-* When having access to multiple databases, if the user first enters the
-  database containing the configuration storage tables then switches to
-  another database,
-  phpMyAdmin continues to use the tables from the first database; the user is
-  not prompted to create more tables in the new database.
-
-
-Manual configuration
---------------------
-
-Please look at your ``./sql/`` directory, where you should find a
-file called *create\_tables.sql*. (If you are using a Windows server,
-pay special attention to :ref:`faq1_23`).
-
-If you already had this infrastructure and:
-
-* upgraded to MySQL 4.1.2 or newer, please use
-  :file:`sql/upgrade_tables_mysql_4_1_2+.sql`.
-* upgraded to phpMyAdmin 4.3.0 or newer from 2.5.0 or newer (<= 4.2.x),
-  please use :file:`sql/upgrade_column_info_4_3_0+.sql`.
-
-and then create new tables by importing :file:`sql/create_tables.sql`.
-
-You can use your phpMyAdmin to create the tables for you. Please be
-aware that you may need special (administrator) privileges to create
-the database and tables, and that the script may need some tuning,
-depending on the database name.
-
-After having imported the :file:`sql/create_tables.sql` file, you
-should specify the table names in your :file:`config.inc.php` file. The
-directives used for that can be found in the :ref:`config`.
-
-You will also need to have a controluser
-(:config:option:`$cfg['Servers'][$i]['controluser']` and
-:config:option:`$cfg['Servers'][$i]['controlpass']` settings)
-with the proper rights to those tables. For example you can create it
-using following statement:
-
-.. code-block:: mysql
-
-   GRANT SELECT, INSERT, UPDATE, DELETE ON <pma_db>.* TO 'pma'@'localhost'  IDENTIFIED BY 'pmapass';
-
-.. _upgrading:
-
-Upgrading from an older version
-+++++++++++++++++++++++++++++++
-
-.. warning::
-
-    **Never** extract the new version over an existing installation of
-    phpMyAdmin, always first remove the old files keeping just the
-    configuration.
-
-    This way you will not leave old no longer working code in the directory,
-    which can have severe security implications or can cause various breakages.
-
-
-Simply copy :file:`config.inc.php` from your previous installation into
-the newly unpacked one. Configuration files from old versions may
-require some tweaking as some options have been changed or removed.
-For compatibility with PHP 5.3 and later, remove a
-``set_magic_quotes_runtime(0);`` statement that you might find near
-the end of your configuration file.
-
-You should **not** copy :file:`libraries/config.default.php` over
-:file:`config.inc.php` because the default configuration file is version-
-specific.
-
-If you have upgraded your MySQL server from a version previous to 4.1.2 to
-version 5.x or newer and if you use the phpMyAdmin configuration storage, you
-should run the :term:`SQL` script found in
-:file:`sql/upgrade_tables_mysql_4_1_2+.sql`.
-
-If you have upgraded your phpMyAdmin to 4.3.0 or newer from 2.5.0 or
-newer (<= 4.2.x) and if you use the phpMyAdmin configuration storage, you
-should run the :term:`SQL` script found in
-:file:`sql/upgrade_column_info_4_3_0+.sql`.
-
-Do not forget to clear the browser cache and to empty the old session by
-logging out and logging in again.
-
-.. index:: Authentication mode
-
-.. _authentication_modes:
-
-Using authentication modes
-++++++++++++++++++++++++++
-
-:term:`HTTP` and cookie authentication modes are recommended in a **multi-user
-environment** where you want to give users access to their own database and
-don't want them to play around with others. Nevertheless be aware that MS
-Internet Explorer seems to be really buggy about cookies, at least till version
-6. Even in a **single-user environment**, you might prefer to use :term:`HTTP`
-or cookie mode so that your user/password pair are not in clear in the
-configuration file.
-
-:term:`HTTP` and cookie authentication
-modes are more secure: the MySQL login information does not need to be
-set in the phpMyAdmin configuration file (except possibly for the
-:config:option:`$cfg['Servers'][$i]['controluser']`).
-However, keep in mind that the password travels in plain text, unless
-you are using the HTTPS protocol. In cookie mode, the password is
-stored, encrypted with the AES algorithm, in a temporary cookie.
-
-Then each of the *true* users should be granted a set of privileges
-on a set of particular databases. Normally you shouldn't give global
-privileges to an ordinary user, unless you understand the impact of those
-privileges (for example, you are creating a superuser).
-For example, to grant the user *real_user* with all privileges on
-the database *user_base*:
-
-.. code-block:: mysql
-
-   GRANT ALL PRIVILEGES ON user_base.* TO 'real_user'@localhost IDENTIFIED BY 'real_password';
-
-
-What the user may now do is controlled entirely by the MySQL user management
-system. With HTTP or cookie authentication mode, you don't need to fill the
-user/password fields inside the :config:option:`$cfg['Servers']`.
-
-.. index:: pair: HTTP; Authentication mode
-
-HTTP authentication mode
-------------------------
-
-* Uses :term:`HTTP` Basic authentication
-  method and allows you to log in as any valid MySQL user.
-* Is supported with most PHP configurations. For :term:`IIS` (:term:`ISAPI`)
-  support using :term:`CGI` PHP see :ref:`faq1_32`, for using with Apache
-  :term:`CGI` see :ref:`faq1_35`.
-* When PHP is running under Apache's :term:`mod_proxy_fcgi` (e.g. with PHP-FPM),
-  ``Authorization`` headers are not passed to the underlying FCGI application,
-  such that your credentials will not reach the application. In this case, you can
-  add the following configuration directive:
-
-  .. code-block:: apache
-
-     SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1
-
-* See also :ref:`faq4_4` about not using the :term:`.htaccess` mechanism along with
-  ':term:`HTTP`' authentication mode.
-
-.. index:: pair: Cookie; Authentication mode
-
-.. _cookie:
-
-Cookie authentication mode
---------------------------
-
-* Username and password are stored in cookies during the session and password
-  is deleted when it ends.
-* With this mode, the user can truly log out of phpMyAdmin and log
-  back in with the same username.
-* If you want to allow users to enter any hostname to connect (rather than only
-  servers that are configured in :file:`config.inc.php`),
-  see the :config:option:`$cfg['AllowArbitraryServer']` directive.
-* As mentioned in the :ref:`require` section, having the ``mcrypt`` extension will
-  speed up access considerably, but is not required.
-
-.. index:: pair: Signon; Authentication mode
-
-.. _auth_signon:
-
-Signon authentication mode
---------------------------
-
-* This mode is a convenient way of using credentials from another
-  application to authenticate to phpMyAdmin to implement single signon
-  solution.
-* The other application has to store login information into session
-  data (see :config:option:`$cfg['Servers'][$i]['SignonSession']`) or you
-  need to implement script to return the credentials (see
-  :config:option:`$cfg['Servers'][$i]['SignonScript']`).
-* When no credentials are available, the user is being redirected to
-  :config:option:`$cfg['Servers'][$i]['SignonURL']`, where you should handle
-  the login process.
-
-The very basic example of saving credentials in a session is available as
-:file:`examples/signon.php`:
-
-.. literalinclude:: ../examples/signon.php
-    :language: php
-
-Alternatively you can also use this way to integrate with OpenID as shown
-in :file:`examples/openid.php`:
-
-.. literalinclude:: ../examples/openid.php
-    :language: php
-
-If you intend to pass the credentials using some other means than, you have to
-implement wrapper in PHP to get that data and set it to
-:config:option:`$cfg['Servers'][$i]['SignonScript']`. There is very minimal example
-in :file:`examples/signon-script.php`:
-
-.. literalinclude:: ../examples/signon-script.php
-    :language: php
-
-.. seealso::
-    :config:option:`$cfg['Servers'][$i]['auth_type']`,
-    :config:option:`$cfg['Servers'][$i]['SignonSession']`,
-    :config:option:`$cfg['Servers'][$i]['SignonScript']`,
-    :config:option:`$cfg['Servers'][$i]['SignonURL']`
-
-
-.. index:: pair: Config; Authentication mode
-
-.. _auth_config:
-
-Config authentication mode
---------------------------
-
-* This mode is sometimes the less secure one because it requires you to fill the
-  :config:option:`$cfg['Servers'][$i]['user']` and
-  :config:option:`$cfg['Servers'][$i]['password']`
-  fields (and as a result, anyone who can read your :file:`config.inc.php`
-  can discover your username and password).
-* In the :ref:`faqmultiuser` section, there is an entry explaining how
-  to protect your configuration file.
-* For additional security in this mode, you may wish to consider the
-  Host authentication :config:option:`$cfg['Servers'][$i]['AllowDeny']['order']`
-  and :config:option:`$cfg['Servers'][$i]['AllowDeny']['rules']` configuration directives.
-* Unlike cookie and http, does not require a user to log in when first
-  loading the phpMyAdmin site. This is by design but could allow any
-  user to access your installation. Use of some restriction method is
-  suggested, perhaps a :term:`.htaccess` file with the HTTP-AUTH directive or disallowing
-  incoming HTTP requests at one’s router or firewall will suffice (both
-  of which are beyond the scope of this manual but easily searchable
-  with Google).
-
-
-Securing your phpMyAdmin installation
-+++++++++++++++++++++++++++++++++++++
-
-The phpMyAdmin team tries hard to make the application secure, however there
-are always ways to make your installation more secure:
-
-* Serve phpMyAdmin on HTTPS only. Preferably, you should use HSTS as well, so that
-  you're protected from protocol downgrade attacks.
-* Remove the ``test`` directory from phpMyAdmin, unless you are developing and need test suite.
-* Remove the ``setup`` directory from phpMyAdmin, you will probably not
-  use it after the initial setup.
-* Properly choose an authentication method - :ref:`cookie`
-  is probably the best choice for shared hosting.
-* In case you don't want all MySQL users to be able to access
-  phpMyAdmin, you can use :config:option:`$cfg['Servers'][$i]['AllowDeny']['rules']` to limit them.
-* Consider hiding phpMyAdmin behind an authentication proxy, so that
-  users need to authenticate prior to providing MySQL credentials
-  to phpMyAdmin. You can achieve this by configuring your web server to request
-  HTTP authentication. For example in Apache this can be done with:
-    
-  .. code-block:: apache
-
-     AuthType Basic
-     AuthName "Restricted Access"
-     AuthUserFile /usr/share/phpmyadmin/passwd
-     Require valid-user
-
-  Once you have changed the configuration, you need to create a list of users which
-  can authenticate. This can be done using the :program:`htpasswd` utility:
-
-  .. code-block:: sh
-
-     htpasswd -c /usr/share/phpmyadmin/passwd username
-
-* If you are afraid of automated attacks, enabling Captcha by
-  :config:option:`$cfg['CaptchaLoginPublicKey']` and
-  :config:option:`$cfg['CaptchaLoginPrivateKey']` might be an option.
-
-Known issues
-++++++++++++
-
-Users with column-specific privileges are unable to "Browse"
-------------------------------------------------------------
-
-If a user has only column-specific privileges on some (but not all) columns in a table, "Browse"
-will fail with an error message.
-
-As a workaround, a bookmarked query with the same name as the table can be created, this will
-run when using the "Browse" link instead. `Issue 11922 <https://github.com/phpmyadmin/phpmyadmin/issues/11922>`_.
-
-Trouble logging back in after logging out using 'http' authentication
-----------------------------------------------------------------------
-
-When using the 'http' ``auth_type``, it can be impossible to log back in (when the logout comes
-manually or after a period of inactivity). `Issue 11898 <https://github.com/phpmyadmin/phpmyadmin/issues/11898>`_.
diff --git a/#pma/doc/html/_sources/transformations.txt b/#pma/doc/html/_sources/transformations.txt
deleted file mode 100644
index 7b5f1a00..00000000
--- a/#pma/doc/html/_sources/transformations.txt
+++ /dev/null
@@ -1,138 +0,0 @@
-.. _transformations:
-
-Transformations
-===============
-
-.. _transformationsintro:
-
-Introduction
-++++++++++++
-
-To enable transformations, you have to setup the ``column_info``
-table and the proper directives. Please see the :ref:`config` on how to do so.
-
-You can apply different transformations to the contents of each
-column. The transformation will take the content of each column and
-transform it with certain rules defined in the selected
-transformation.
-
-Say you have a column 'filename' which contains a filename. Normally
-you would see in phpMyAdmin only this filename. Using transformations
-you can transform that filename into a HTML link, so you can click
-inside of the phpMyAdmin structure on the column's link and will see
-the file displayed in a new browser window. Using transformation
-options you can also specify strings to append/prepend to a string or
-the format you want the output stored in.
-
-For a general overview of all available transformations and their
-options, you can consult your *<www.your-host.com>/<your-install-
-dir>/transformation\_overview.php* installation.
-
-For a tutorial on how to effectively use transformations, see our
-`Link section <https://www.phpmyadmin.net/home_page/docs.php>`_ on the
-official phpMyAdmin homepage.
-
-.. _transformationshowto:
-
-Usage
-+++++
-
-Go to your *tbl\_structure.php* page (i.e. reached through clicking on
-the 'Structure' link for a table). There click on "Change" (or change
-icon) and there you will see three new fields at the end of the line.
-They are called 'MIME-type', 'Browser transformation' and
-'Transformation options'.
-
-* The field 'MIME-type' is a drop-down field. Select the MIME-type that
-  corresponds to the column's contents. Please note that transformations
-  are inactive as long as no MIME-type is selected.
-* The field 'Browser transformation' is a drop-down field. You can
-  choose from a hopefully growing amount of pre-defined transformations.
-  See below for information on how to build your own transformation.
-  There are global transformations and mimetype-bound transformations.
-  Global transformations can be used for any mimetype. They will take
-  the mimetype, if necessary, into regard. Mimetype-bound
-  transformations usually only operate on a certain mimetype. There are
-  transformations which operate on the main mimetype (like 'image'),
-  which will most likely take the subtype into regard, and those who
-  only operate on a specific subtype (like 'image/jpeg'). You can use
-  transformations on mimetypes for which the function was not defined
-  for. There is no security check for you selected the right
-  transformation, so take care of what the output will be like.
-* The field 'Transformation options' is a free-type textfield. You have
-  to enter transform-function specific options here. Usually the
-  transforms can operate with default options, but it is generally a
-  good idea to look up the overview to see which options are necessary.
-  Much like the ENUM/SET-Fields, you have to split up several options
-  using the format 'a','b','c',...(NOTE THE MISSING BLANKS). This is
-  because internally the options will be parsed as an array, leaving the
-  first value the first element in the array, and so forth. If you want
-  to specify a MIME character set you can define it in the
-  transformation\_options. You have to put that outside of the pre-
-  defined options of the specific mime-transform, as the last value of
-  the set. Use the format "'; charset=XXX'". If you use a transform, for
-  which you can specify 2 options and you want to append a character
-  set, enter "'first parameter','second parameter','charset=us-ascii'".
-  You can, however use the defaults for the parameters: "'','','charset
-  =us-ascii'".
-
-.. _transformationsfiles:
-
-File structure
-++++++++++++++
-
-All specific transformations for mimetypes are defined through class
-files in the directory 'libraries/plugins/transformations/'. Each of
-them extends a certain transformation abstract class declared in
-libraries/plugins/transformations/abstract.
-
-They are stored in files to ease up customization and easy adding of
-new transformations.
-
-Because the user cannot enter own mimetypes, it is kept sure that
-transformations always work. It makes no sense to apply a
-transformation to a mimetype the transform-function doesn't know to
-handle.
-
-There is a file called '*transformations.lib.php*' that provides some
-basic functions which can be included by any other transform function.
-
-The file name convention is ``[Mimetype]_[Subtype]_[Transformation
-Name].class.php``, while the abtract class that it extends has the
-name ``[Transformation Name]TransformationsPlugin``. All of the
-methods that have to be implemented by a transformations plug-in are:
-
-#. getMIMEType() and getMIMESubtype() in the main class;
-#. getName(), getInfo() and applyTransformation() in the abstract class
-   it extends.
-
-The getMIMEType(), getMIMESubtype() and getName() methods return the
-name of the MIME type, MIME Subtype and transformation accordingly.
-getInfo() returns the transformation's description and possible
-options it may receive and applyTransformation() is the method that
-does the actual work of the transformation plug-in.
-
-Please see the libraries/plugins/transformations/TEMPLATE and
-libraries/plugins/transformations/TEMPLATE\_ABSTRACT files for adding
-your own transformation plug-in. You can also generate a new
-transformation plug-in (with or without the abstract transformation
-class), by using
-:file:`scripts/transformations_generator_plugin.sh` or
-:file:`scripts/transformations_generator_main_class.sh`.
-
-The applyTransformation() method always gets passed three variables:
-
-#. **$buffer** - Contains the text inside of the column. This is the
-   text, you want to transform.
-#. **$options** - Contains any user-passed options to a transform
-   function as an array.
-#. **$meta** - Contains an object with information about your column. The
-   data is drawn from the output of the `mysql\_fetch\_field()
-   <https://www.php.net/mysql_fetch_field>`_ function. This means, all
-   object properties described on the `manual page
-   <https://www.php.net/mysql_fetch_field>`_ are available in this
-   variable and can be used to transform a column accordingly to
-   unsigned/zerofill/not\_null/... properties. The $meta->mimetype
-   variable contains the original MIME-type of the column (i.e.
-   'text/plain', 'image/jpeg' etc.)
-
diff --git a/#pma/doc/html/_sources/user.txt b/#pma/doc/html/_sources/user.txt
deleted file mode 100644
index 06a3c9c4..00000000
--- a/#pma/doc/html/_sources/user.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-User Guide
-==========
-
-.. toctree::
-    :maxdepth: 2
-
-    transformations
-    privileges
-    other
-    import_export
diff --git a/#pma/doc/html/_sources/vendors.txt b/#pma/doc/html/_sources/vendors.txt
deleted file mode 100644
index e24f23c6..00000000
--- a/#pma/doc/html/_sources/vendors.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-Distributing and packaging phpMyAdmin
-=====================================
-
-This document is intended to give advices to people who want to
-redistribute phpMyAdmin inside other software package such as Linux
-distribution or some all in one package including web server and MySQL
-server.
-
-Generally you can customize some basic aspects (paths to some files and
-behavior) in :file:`libraries/vendor_config.php`.
-
-For example if you want setup script to generate config file in var, change
-``SETUP_CONFIG_FILE`` to :file:`/var/lib/phpmyadmin/config.inc.php` and you
-will also probably want to skip directory writable check, so set
-``SETUP_DIR_WRITABLE`` to false.
-
-External libraries
-------------------
-
-phpMyAdmin includes several external libraries, you might want to
-replace them with system ones if they are available, but please note
-that you should test whether version you provide is compatible with the
-one we ship.
-
-Currently known list of external libraries:
-
-js/jquery
-    jQuery js framework and various jQuery based libraries.
-
-libraries/php-gettext
-    php-gettext library
-libraries/tcpdf
-    tcpdf library, stripped down of not needed files
-libraries/phpseclib
-    portions of phpseclib library
diff --git a/#pma/doc/html/_static/ajax-loader.gif b/#pma/doc/html/_static/ajax-loader.gif
deleted file mode 100644
index 61faf8ca..00000000
Binary files a/#pma/doc/html/_static/ajax-loader.gif and /dev/null differ
diff --git a/#pma/doc/html/_static/basic.css b/#pma/doc/html/_static/basic.css
deleted file mode 100644
index 2b513f0c..00000000
--- a/#pma/doc/html/_static/basic.css
+++ /dev/null
@@ -1,604 +0,0 @@
-/*
- * basic.css
- * ~~~~~~~~~
- *
- * Sphinx stylesheet -- basic theme.
- *
- * :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
- * :license: BSD, see LICENSE for details.
- *
- */
-
-/* -- main layout ----------------------------------------------------------- */
-
-div.clearer {
-    clear: both;
-}
-
-/* -- relbar ---------------------------------------------------------------- */
-
-div.related {
-    width: 100%;
-    font-size: 90%;
-}
-
-div.related h3 {
-    display: none;
-}
-
-div.related ul {
-    margin: 0;
-    padding: 0 0 0 10px;
-    list-style: none;
-}
-
-div.related li {
-    display: inline;
-}
-
-div.related li.right {
-    float: right;
-    margin-right: 5px;
-}
-
-/* -- sidebar --------------------------------------------------------------- */
-
-div.sphinxsidebarwrapper {
-    padding: 10px 5px 0 10px;
-}
-
-div.sphinxsidebar {
-    float: left;
-    width: 230px;
-    margin-left: -100%;
-    font-size: 90%;
-    word-wrap: break-word;
-    overflow-wrap : break-word;
-}
-
-div.sphinxsidebar ul {
-    list-style: none;
-}
-
-div.sphinxsidebar ul ul,
-div.sphinxsidebar ul.want-points {
-    margin-left: 20px;
-    list-style: square;
-}
-
-div.sphinxsidebar ul ul {
-    margin-top: 0;
-    margin-bottom: 0;
-}
-
-div.sphinxsidebar form {
-    margin-top: 10px;
-}
-
-div.sphinxsidebar input {
-    border: 1px solid #98dbcc;
-    font-family: sans-serif;
-    font-size: 1em;
-}
-
-div.sphinxsidebar #searchbox input[type="text"] {
-    width: 170px;
-}
-
-img {
-    border: 0;
-    max-width: 100%;
-}
-
-/* -- search page ----------------------------------------------------------- */
-
-ul.search {
-    margin: 10px 0 0 20px;
-    padding: 0;
-}
-
-ul.search li {
-    padding: 5px 0 5px 20px;
-    background-image: url(file.png);
-    background-repeat: no-repeat;
-    background-position: 0 7px;
-}
-
-ul.search li a {
-    font-weight: bold;
-}
-
-ul.search li div.context {
-    color: #888;
-    margin: 2px 0 0 30px;
-    text-align: left;
-}
-
-ul.keywordmatches li.goodmatch a {
-    font-weight: bold;
-}
-
-/* -- index page ------------------------------------------------------------ */
-
-table.contentstable {
-    width: 90%;
-}
-
-table.contentstable p.biglink {
-    line-height: 150%;
-}
-
-a.biglink {
-    font-size: 1.3em;
-}
-
-span.linkdescr {
-    font-style: italic;
-    padding-top: 5px;
-    font-size: 90%;
-}
-
-/* -- general index --------------------------------------------------------- */
-
-table.indextable {
-    width: 100%;
-}
-
-table.indextable td {
-    text-align: left;
-    vertical-align: top;
-}
-
-table.indextable dl, table.indextable dd {
-    margin-top: 0;
-    margin-bottom: 0;
-}
-
-table.indextable tr.pcap {
-    height: 10px;
-}
-
-table.indextable tr.cap {
-    margin-top: 10px;
-    background-color: #f2f2f2;
-}
-
-img.toggler {
-    margin-right: 3px;
-    margin-top: 3px;
-    cursor: pointer;
-}
-
-div.modindex-jumpbox {
-    border-top: 1px solid #ddd;
-    border-bottom: 1px solid #ddd;
-    margin: 1em 0 1em 0;
-    padding: 0.4em;
-}
-
-div.genindex-jumpbox {
-    border-top: 1px solid #ddd;
-    border-bottom: 1px solid #ddd;
-    margin: 1em 0 1em 0;
-    padding: 0.4em;
-}
-
-/* -- general body styles --------------------------------------------------- */
-
-div.body p, div.body dd, div.body li, div.body blockquote {
-    -moz-hyphens: auto;
-    -ms-hyphens: auto;
-    -webkit-hyphens: auto;
-    hyphens: auto;
-}
-
-a.headerlink {
-    visibility: hidden;
-}
-
-h1:hover > a.headerlink,
-h2:hover > a.headerlink,
-h3:hover > a.headerlink,
-h4:hover > a.headerlink,
-h5:hover > a.headerlink,
-h6:hover > a.headerlink,
-dt:hover > a.headerlink,
-caption:hover > a.headerlink,
-p.caption:hover > a.headerlink,
-div.code-block-caption:hover > a.headerlink {
-    visibility: visible;
-}
-
-div.body p.caption {
-    text-align: inherit;
-}
-
-div.body td {
-    text-align: left;
-}
-
-.field-list ul {
-    padding-left: 1em;
-}
-
-.first {
-    margin-top: 0 !important;
-}
-
-p.rubric {
-    margin-top: 30px;
-    font-weight: bold;
-}
-
-img.align-left, .figure.align-left, object.align-left {
-    clear: left;
-    float: left;
-    margin-right: 1em;
-}
-
-img.align-right, .figure.align-right, object.align-right {
-    clear: right;
-    float: right;
-    margin-left: 1em;
-}
-
-img.align-center, .figure.align-center, object.align-center {
-  display: block;
-  margin-left: auto;
-  margin-right: auto;
-}
-
-.align-left {
-    text-align: left;
-}
-
-.align-center {
-    text-align: center;
-}
-
-.align-right {
-    text-align: right;
-}
-
-/* -- sidebars -------------------------------------------------------------- */
-
-div.sidebar {
-    margin: 0 0 0.5em 1em;
-    border: 1px solid #ddb;
-    padding: 7px 7px 0 7px;
-    background-color: #ffe;
-    width: 40%;
-    float: right;
-}
-
-p.sidebar-title {
-    font-weight: bold;
-}
-
-/* -- topics ---------------------------------------------------------------- */
-
-div.topic {
-    border: 1px solid #ccc;
-    padding: 7px 7px 0 7px;
-    margin: 10px 0 10px 0;
-}
-
-p.topic-title {
-    font-size: 1.1em;
-    font-weight: bold;
-    margin-top: 10px;
-}
-
-/* -- admonitions ----------------------------------------------------------- */
-
-div.admonition {
-    margin-top: 10px;
-    margin-bottom: 10px;
-    padding: 7px;
-}
-
-div.admonition dt {
-    font-weight: bold;
-}
-
-div.admonition dl {
-    margin-bottom: 0;
-}
-
-p.admonition-title {
-    margin: 0px 10px 5px 0px;
-    font-weight: bold;
-}
-
-div.body p.centered {
-    text-align: center;
-    margin-top: 25px;
-}
-
-/* -- tables ---------------------------------------------------------------- */
-
-table.docutils {
-    border: 0;
-    border-collapse: collapse;
-}
-
-table caption span.caption-number {
-    font-style: italic;
-}
-
-table caption span.caption-text {
-}
-
-table.docutils td, table.docutils th {
-    padding: 1px 8px 1px 5px;
-    border-top: 0;
-    border-left: 0;
-    border-right: 0;
-    border-bottom: 1px solid #aaa;
-}
-
-table.field-list td, table.field-list th {
-    border: 0 !important;
-}
-
-table.footnote td, table.footnote th {
-    border: 0 !important;
-}
-
-th {
-    text-align: left;
-    padding-right: 5px;
-}
-
-table.citation {
-    border-left: solid 1px gray;
-    margin-left: 1px;
-}
-
-table.citation td {
-    border-bottom: none;
-}
-
-/* -- figures --------------------------------------------------------------- */
-
-div.figure {
-    margin: 0.5em;
-    padding: 0.5em;
-}
-
-div.figure p.caption {
-    padding: 0.3em;
-}
-
-div.figure p.caption span.caption-number {
-    font-style: italic;
-}
-
-div.figure p.caption span.caption-text {
-}
-
-
-/* -- other body styles ----------------------------------------------------- */
-
-ol.arabic {
-    list-style: decimal;
-}
-
-ol.loweralpha {
-    list-style: lower-alpha;
-}
-
-ol.upperalpha {
-    list-style: upper-alpha;
-}
-
-ol.lowerroman {
-    list-style: lower-roman;
-}
-
-ol.upperroman {
-    list-style: upper-roman;
-}
-
-dl {
-    margin-bottom: 15px;
-}
-
-dd p {
-    margin-top: 0px;
-}
-
-dd ul, dd table {
-    margin-bottom: 10px;
-}
-
-dd {
-    margin-top: 3px;
-    margin-bottom: 10px;
-    margin-left: 30px;
-}
-
-dt:target, .highlighted {
-    background-color: #fbe54e;
-}
-
-dl.glossary dt {
-    font-weight: bold;
-    font-size: 1.1em;
-}
-
-.field-list ul {
-    margin: 0;
-    padding-left: 1em;
-}
-
-.field-list p {
-    margin: 0;
-}
-
-.optional {
-    font-size: 1.3em;
-}
-
-.sig-paren {
-    font-size: larger;
-}
-
-.versionmodified {
-    font-style: italic;
-}
-
-.system-message {
-    background-color: #fda;
-    padding: 5px;
-    border: 3px solid red;
-}
-
-.footnote:target  {
-    background-color: #ffa;
-}
-
-.line-block {
-    display: block;
-    margin-top: 1em;
-    margin-bottom: 1em;
-}
-
-.line-block .line-block {
-    margin-top: 0;
-    margin-bottom: 0;
-    margin-left: 1.5em;
-}
-
-.guilabel, .menuselection {
-    font-family: sans-serif;
-}
-
-.accelerator {
-    text-decoration: underline;
-}
-
-.classifier {
-    font-style: oblique;
-}
-
-abbr, acronym {
-    border-bottom: dotted 1px;
-    cursor: help;
-}
-
-/* -- code displays --------------------------------------------------------- */
-
-pre {
-    overflow: auto;
-    overflow-y: hidden;  /* fixes display issues on Chrome browsers */
-}
-
-td.linenos pre {
-    padding: 5px 0px;
-    border: 0;
-    background-color: transparent;
-    color: #aaa;
-}
-
-table.highlighttable {
-    margin-left: 0.5em;
-}
-
-table.highlighttable td {
-    padding: 0 0.5em 0 0.5em;
-}
-
-div.code-block-caption {
-    padding: 2px 5px;
-    font-size: small;
-}
-
-div.code-block-caption code {
-    background-color: transparent;
-}
-
-div.code-block-caption + div > div.highlight > pre {
-    margin-top: 0;
-}
-
-div.code-block-caption span.caption-number {
-    padding: 0.1em 0.3em;
-    font-style: italic;
-}
-
-div.code-block-caption span.caption-text {
-}
-
-div.literal-block-wrapper {
-    padding: 1em 1em 0;
-}
-
-div.literal-block-wrapper div.highlight {
-    margin: 0;
-}
-
-code.descname {
-    background-color: transparent;
-    font-weight: bold;
-    font-size: 1.2em;
-}
-
-code.descclassname {
-    background-color: transparent;
-}
-
-code.xref, a code {
-    background-color: transparent;
-    font-weight: bold;
-}
-
-h1 code, h2 code, h3 code, h4 code, h5 code, h6 code {
-    background-color: transparent;
-}
-
-.viewcode-link {
-    float: right;
-}
-
-.viewcode-back {
-    float: right;
-    font-family: sans-serif;
-}
-
-div.viewcode-block:target {
-    margin: -1px -10px;
-    padding: 0 10px;
-}
-
-/* -- math display ---------------------------------------------------------- */
-
-img.math {
-    vertical-align: middle;
-}
-
-div.body div.math p {
-    text-align: center;
-}
-
-span.eqno {
-    float: right;
-}
-
-/* -- printout stylesheet --------------------------------------------------- */
-
-@media print {
-    div.document,
-    div.documentwrapper,
-    div.bodywrapper {
-        margin: 0 !important;
-        width: 100%;
-    }
-
-    div.sphinxsidebar,
-    div.related,
-    div.footer,
-    #top-link {
-        display: none;
-    }
-}
\ No newline at end of file
diff --git a/#pma/doc/html/_static/classic.css b/#pma/doc/html/_static/classic.css
deleted file mode 100644
index d98894b3..00000000
--- a/#pma/doc/html/_static/classic.css
+++ /dev/null
@@ -1,261 +0,0 @@
-/*
- * default.css_t
- * ~~~~~~~~~~~~~
- *
- * Sphinx stylesheet -- default theme.
- *
- * :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
- * :license: BSD, see LICENSE for details.
- *
- */
-
-@import url("basic.css");
-
-/* -- page layout ----------------------------------------------------------- */
-
-body {
-    font-family: sans-serif;
-    font-size: 100%;
-    background-color: #11303d;
-    color: #000;
-    margin: 0;
-    padding: 0;
-}
-
-div.document {
-    background-color: #1c4e63;
-}
-
-div.documentwrapper {
-    float: left;
-    width: 100%;
-}
-
-div.bodywrapper {
-    margin: 0 0 0 230px;
-}
-
-div.body {
-    background-color: #ffffff;
-    color: #000000;
-    padding: 0 20px 30px 20px;
-}
-
-div.footer {
-    color: #ffffff;
-    width: 100%;
-    padding: 9px 0 9px 0;
-    text-align: center;
-    font-size: 75%;
-}
-
-div.footer a {
-    color: #ffffff;
-    text-decoration: underline;
-}
-
-div.related {
-    background-color: #133f52;
-    line-height: 30px;
-    color: #ffffff;
-}
-
-div.related a {
-    color: #ffffff;
-}
-
-div.sphinxsidebar {
-}
-
-div.sphinxsidebar h3 {
-    font-family: 'Trebuchet MS', sans-serif;
-    color: #ffffff;
-    font-size: 1.4em;
-    font-weight: normal;
-    margin: 0;
-    padding: 0;
-}
-
-div.sphinxsidebar h3 a {
-    color: #ffffff;
-}
-
-div.sphinxsidebar h4 {
-    font-family: 'Trebuchet MS', sans-serif;
-    color: #ffffff;
-    font-size: 1.3em;
-    font-weight: normal;
-    margin: 5px 0 0 0;
-    padding: 0;
-}
-
-div.sphinxsidebar p {
-    color: #ffffff;
-}
-
-div.sphinxsidebar p.topless {
-    margin: 5px 10px 10px 10px;
-}
-
-div.sphinxsidebar ul {
-    margin: 10px;
-    padding: 0;
-    color: #ffffff;
-}
-
-div.sphinxsidebar a {
-    color: #98dbcc;
-}
-
-div.sphinxsidebar input {
-    border: 1px solid #98dbcc;
-    font-family: sans-serif;
-    font-size: 1em;
-}
-
-
-
-/* -- hyperlink styles ------------------------------------------------------ */
-
-a {
-    color: #355f7c;
-    text-decoration: none;
-}
-
-a:visited {
-    color: #355f7c;
-    text-decoration: none;
-}
-
-a:hover {
-    text-decoration: underline;
-}
-
-
-
-/* -- body styles ----------------------------------------------------------- */
-
-div.body h1,
-div.body h2,
-div.body h3,
-div.body h4,
-div.body h5,
-div.body h6 {
-    font-family: 'Trebuchet MS', sans-serif;
-    background-color: #f2f2f2;
-    font-weight: normal;
-    color: #20435c;
-    border-bottom: 1px solid #ccc;
-    margin: 20px -20px 10px -20px;
-    padding: 3px 0 3px 10px;
-}
-
-div.body h1 { margin-top: 0; font-size: 200%; }
-div.body h2 { font-size: 160%; }
-div.body h3 { font-size: 140%; }
-div.body h4 { font-size: 120%; }
-div.body h5 { font-size: 110%; }
-div.body h6 { font-size: 100%; }
-
-a.headerlink {
-    color: #c60f0f;
-    font-size: 0.8em;
-    padding: 0 4px 0 4px;
-    text-decoration: none;
-}
-
-a.headerlink:hover {
-    background-color: #c60f0f;
-    color: white;
-}
-
-div.body p, div.body dd, div.body li, div.body blockquote {
-    text-align: justify;
-    line-height: 130%;
-}
-
-div.admonition p.admonition-title + p {
-    display: inline;
-}
-
-div.admonition p {
-    margin-bottom: 5px;
-}
-
-div.admonition pre {
-    margin-bottom: 5px;
-}
-
-div.admonition ul, div.admonition ol {
-    margin-bottom: 5px;
-}
-
-div.note {
-    background-color: #eee;
-    border: 1px solid #ccc;
-}
-
-div.seealso {
-    background-color: #ffc;
-    border: 1px solid #ff6;
-}
-
-div.topic {
-    background-color: #eee;
-}
-
-div.warning {
-    background-color: #ffe4e4;
-    border: 1px solid #f66;
-}
-
-p.admonition-title {
-    display: inline;
-}
-
-p.admonition-title:after {
-    content: ":";
-}
-
-pre {
-    padding: 5px;
-    background-color: #eeffcc;
-    color: #333333;
-    line-height: 120%;
-    border: 1px solid #ac9;
-    border-left: none;
-    border-right: none;
-}
-
-code {
-    background-color: #ecf0f3;
-    padding: 0 1px 0 1px;
-    font-size: 0.95em;
-}
-
-th {
-    background-color: #ede;
-}
-
-.warning code {
-    background: #efc2c2;
-}
-
-.note code {
-    background: #d6d6d6;
-}
-
-.viewcode-back {
-    font-family: sans-serif;
-}
-
-div.viewcode-block:target {
-    background-color: #f4debf;
-    border-top: 1px solid #ac9;
-    border-bottom: 1px solid #ac9;
-}
-
-div.code-block-caption {
-    color: #efefef;
-    background-color: #1c4e63;
-}
\ No newline at end of file
diff --git a/#pma/doc/html/_static/comment-bright.png b/#pma/doc/html/_static/comment-bright.png
deleted file mode 100644
index 551517b8..00000000
Binary files a/#pma/doc/html/_static/comment-bright.png and /dev/null differ
diff --git a/#pma/doc/html/_static/comment-close.png b/#pma/doc/html/_static/comment-close.png
deleted file mode 100644
index 09b54be4..00000000
Binary files a/#pma/doc/html/_static/comment-close.png and /dev/null differ
diff --git a/#pma/doc/html/_static/comment.png b/#pma/doc/html/_static/comment.png
deleted file mode 100644
index 92feb52b..00000000
Binary files a/#pma/doc/html/_static/comment.png and /dev/null differ
diff --git a/#pma/doc/html/_static/default.css b/#pma/doc/html/_static/default.css
deleted file mode 100644
index 81b93636..00000000
--- a/#pma/doc/html/_static/default.css
+++ /dev/null
@@ -1 +0,0 @@
-@import url("classic.css");
diff --git a/#pma/doc/html/_static/doctools.js b/#pma/doc/html/_static/doctools.js
deleted file mode 100644
index 81634956..00000000
--- a/#pma/doc/html/_static/doctools.js
+++ /dev/null
@@ -1,287 +0,0 @@
-/*
- * doctools.js
- * ~~~~~~~~~~~
- *
- * Sphinx JavaScript utilities for all documentation.
- *
- * :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
- * :license: BSD, see LICENSE for details.
- *
- */
-
-/**
- * select a different prefix for underscore
- */
-$u = _.noConflict();
-
-/**
- * make the code below compatible with browsers without
- * an installed firebug like debugger
-if (!window.console || !console.firebug) {
-  var names = ["log", "debug", "info", "warn", "error", "assert", "dir",
-    "dirxml", "group", "groupEnd", "time", "timeEnd", "count", "trace",
-    "profile", "profileEnd"];
-  window.console = {};
-  for (var i = 0; i < names.length; ++i)
-    window.console[names[i]] = function() {};
-}
- */
-
-/**
- * small helper function to urldecode strings
- */
-jQuery.urldecode = function(x) {
-  return decodeURIComponent(x).replace(/\+/g, ' ');
-};
-
-/**
- * small helper function to urlencode strings
- */
-jQuery.urlencode = encodeURIComponent;
-
-/**
- * This function returns the parsed url parameters of the
- * current request. Multiple values per key are supported,
- * it will always return arrays of strings for the value parts.
- */
-jQuery.getQueryParameters = function(s) {
-  if (typeof s == 'undefined')
-    s = document.location.search;
-  var parts = s.substr(s.indexOf('?') + 1).split('&');
-  var result = {};
-  for (var i = 0; i < parts.length; i++) {
-    var tmp = parts[i].split('=', 2);
-    var key = jQuery.urldecode(tmp[0]);
-    var value = jQuery.urldecode(tmp[1]);
-    if (key in result)
-      result[key].push(value);
-    else
-      result[key] = [value];
-  }
-  return result;
-};
-
-/**
- * highlight a given string on a jquery object by wrapping it in
- * span elements with the given class name.
- */
-jQuery.fn.highlightText = function(text, className) {
-  function highlight(node) {
-    if (node.nodeType == 3) {
-      var val = node.nodeValue;
-      var pos = val.toLowerCase().indexOf(text);
-      if (pos >= 0 && !jQuery(node.parentNode).hasClass(className)) {
-        var span = document.createElement("span");
-        span.className = className;
-        span.appendChild(document.createTextNode(val.substr(pos, text.length)));
-        node.parentNode.insertBefore(span, node.parentNode.insertBefore(
-          document.createTextNode(val.substr(pos + text.length)),
-          node.nextSibling));
-        node.nodeValue = val.substr(0, pos);
-      }
-    }
-    else if (!jQuery(node).is("button, select, textarea")) {
-      jQuery.each(node.childNodes, function() {
-        highlight(this);
-      });
-    }
-  }
-  return this.each(function() {
-    highlight(this);
-  });
-};
-
-/*
- * backward compatibility for jQuery.browser
- * This will be supported until firefox bug is fixed.
- */
-if (!jQuery.browser) {
-  jQuery.uaMatch = function(ua) {
-    ua = ua.toLowerCase();
-
-    var match = /(chrome)[ \/]([\w.]+)/.exec(ua) ||
-      /(webkit)[ \/]([\w.]+)/.exec(ua) ||
-      /(opera)(?:.*version|)[ \/]([\w.]+)/.exec(ua) ||
-      /(msie) ([\w.]+)/.exec(ua) ||
-      ua.indexOf("compatible") < 0 && /(mozilla)(?:.*? rv:([\w.]+)|)/.exec(ua) ||
-      [];
-
-    return {
-      browser: match[ 1 ] || "",
-      version: match[ 2 ] || "0"
-    };
-  };
-  jQuery.browser = {};
-  jQuery.browser[jQuery.uaMatch(navigator.userAgent).browser] = true;
-}
-
-/**
- * Small JavaScript module for the documentation.
- */
-var Documentation = {
-
-  init : function() {
-    this.fixFirefoxAnchorBug();
-    this.highlightSearchWords();
-    this.initIndexTable();
-    
-  },
-
-  /**
-   * i18n support
-   */
-  TRANSLATIONS : {},
-  PLURAL_EXPR : function(n) { return n == 1 ? 0 : 1; },
-  LOCALE : 'unknown',
-
-  // gettext and ngettext don't access this so that the functions
-  // can safely bound to a different name (_ = Documentation.gettext)
-  gettext : function(string) {
-    var translated = Documentation.TRANSLATIONS[string];
-    if (typeof translated == 'undefined')
-      return string;
-    return (typeof translated == 'string') ? translated : translated[0];
-  },
-
-  ngettext : function(singular, plural, n) {
-    var translated = Documentation.TRANSLATIONS[singular];
-    if (typeof translated == 'undefined')
-      return (n == 1) ? singular : plural;
-    return translated[Documentation.PLURALEXPR(n)];
-  },
-
-  addTranslations : function(catalog) {
-    for (var key in catalog.messages)
-      this.TRANSLATIONS[key] = catalog.messages[key];
-    this.PLURAL_EXPR = new Function('n', 'return +(' + catalog.plural_expr + ')');
-    this.LOCALE = catalog.locale;
-  },
-
-  /**
-   * add context elements like header anchor links
-   */
-  addContextElements : function() {
-    $('div[id] > :header:first').each(function() {
-      $('<a class="headerlink">\u00B6</a>').
-      attr('href', '#' + this.id).
-      attr('title', _('Permalink to this headline')).
-      appendTo(this);
-    });
-    $('dt[id]').each(function() {
-      $('<a class="headerlink">\u00B6</a>').
-      attr('href', '#' + this.id).
-      attr('title', _('Permalink to this definition')).
-      appendTo(this);
-    });
-  },
-
-  /**
-   * workaround a firefox stupidity
-   * see: https://bugzilla.mozilla.org/show_bug.cgi?id=645075
-   */
-  fixFirefoxAnchorBug : function() {
-    if (document.location.hash)
-      window.setTimeout(function() {
-        document.location.href += '';
-      }, 10);
-  },
-
-  /**
-   * highlight the search words provided in the url in the text
-   */
-  highlightSearchWords : function() {
-    var params = $.getQueryParameters();
-    var terms = (params.highlight) ? params.highlight[0].split(/\s+/) : [];
-    if (terms.length) {
-      var body = $('div.body');
-      if (!body.length) {
-        body = $('body');
-      }
-      window.setTimeout(function() {
-        $.each(terms, function() {
-          body.highlightText(this.toLowerCase(), 'highlighted');
-        });
-      }, 10);
-      $('<p class="highlight-link"><a href="javascript:Documentation.' +
-        'hideSearchWords()">' + _('Hide Search Matches') + '</a></p>')
-          .appendTo($('#searchbox'));
-    }
-  },
-
-  /**
-   * init the domain index toggle buttons
-   */
-  initIndexTable : function() {
-    var togglers = $('img.toggler').click(function() {
-      var src = $(this).attr('src');
-      var idnum = $(this).attr('id').substr(7);
-      $('tr.cg-' + idnum).toggle();
-      if (src.substr(-9) == 'minus.png')
-        $(this).attr('src', src.substr(0, src.length-9) + 'plus.png');
-      else
-        $(this).attr('src', src.substr(0, src.length-8) + 'minus.png');
-    }).css('display', '');
-    if (DOCUMENTATION_OPTIONS.COLLAPSE_INDEX) {
-        togglers.click();
-    }
-  },
-
-  /**
-   * helper function to hide the search marks again
-   */
-  hideSearchWords : function() {
-    $('#searchbox .highlight-link').fadeOut(300);
-    $('span.highlighted').removeClass('highlighted');
-  },
-
-  /**
-   * make the url absolute
-   */
-  makeURL : function(relativeURL) {
-    return DOCUMENTATION_OPTIONS.URL_ROOT + '/' + relativeURL;
-  },
-
-  /**
-   * get the current relative url
-   */
-  getCurrentURL : function() {
-    var path = document.location.pathname;
-    var parts = path.split(/\//);
-    $.each(DOCUMENTATION_OPTIONS.URL_ROOT.split(/\//), function() {
-      if (this == '..')
-        parts.pop();
-    });
-    var url = parts.join('/');
-    return path.substring(url.lastIndexOf('/') + 1, path.length - 1);
-  },
-
-  initOnKeyListeners: function() {
-    $(document).keyup(function(event) {
-      var activeElementType = document.activeElement.tagName;
-      // don't navigate when in search box or textarea
-      if (activeElementType !== 'TEXTAREA' && activeElementType !== 'INPUT' && activeElementType !== 'SELECT') {
-        switch (event.keyCode) {
-          case 37: // left
-            var prevHref = $('link[rel="prev"]').prop('href');
-            if (prevHref) {
-              window.location.href = prevHref;
-              return false;
-            }
-          case 39: // right
-            var nextHref = $('link[rel="next"]').prop('href');
-            if (nextHref) {
-              window.location.href = nextHref;
-              return false;
-            }
-        }
-      }
-    });
-  }
-};
-
-// quick alias for translations
-_ = Documentation.gettext;
-
-$(document).ready(function() {
-  Documentation.init();
-});
\ No newline at end of file
diff --git a/#pma/doc/html/_static/down-pressed.png b/#pma/doc/html/_static/down-pressed.png
deleted file mode 100644
index 7c30d004..00000000
Binary files a/#pma/doc/html/_static/down-pressed.png and /dev/null differ
diff --git a/#pma/doc/html/_static/down.png b/#pma/doc/html/_static/down.png
deleted file mode 100644
index f48098a4..00000000
Binary files a/#pma/doc/html/_static/down.png and /dev/null differ
diff --git a/#pma/doc/html/_static/file.png b/#pma/doc/html/_static/file.png
deleted file mode 100644
index 254c60bf..00000000
Binary files a/#pma/doc/html/_static/file.png and /dev/null differ
diff --git a/#pma/doc/html/_static/jquery.js b/#pma/doc/html/_static/jquery.js
deleted file mode 100644
index e03e1484..00000000
--- a/#pma/doc/html/_static/jquery.js
+++ /dev/null
@@ -1,10351 +0,0 @@
-/*!
- * jQuery JavaScript Library v1.11.3
- * http://jquery.com/
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- *
- * Copyright 2005, 2014 jQuery Foundation, Inc. and other contributors
- * Released under the MIT license
- * http://jquery.org/license
- *
- * Date: 2015-11-11T21:12Z
- */
-
-(function( global, factory ) {
-
-	if ( typeof module === "object" && typeof module.exports === "object" ) {
-		// For CommonJS and CommonJS-like environments where a proper window is present,
-		// execute the factory and get jQuery
-		// For environments that do not inherently posses a window with a document
-		// (such as Node.js), expose a jQuery-making factory as module.exports
-		// This accentuates the need for the creation of a real window
-		// e.g. var jQuery = require("jquery")(window);
-		// See ticket #14549 for more info
-		module.exports = global.document ?
-			factory( global, true ) :
-			function( w ) {
-				if ( !w.document ) {
-					throw new Error( "jQuery requires a window with a document" );
-				}
-				return factory( w );
-			};
-	} else {
-		factory( global );
-	}
-
-// Pass this if window is not defined yet
-}(typeof window !== "undefined" ? window : this, function( window, noGlobal ) {
-
-// Can't do this because several apps including ASP.NET trace
-// the stack via arguments.caller.callee and Firefox dies if
-// you try to trace through "use strict" call chains. (#13335)
-// Support: Firefox 18+
-//
-
-var deletedIds = [];
-
-var slice = deletedIds.slice;
-
-var concat = deletedIds.concat;
-
-var push = deletedIds.push;
-
-var indexOf = deletedIds.indexOf;
-
-var class2type = {};
-
-var toString = class2type.toString;
-
-var hasOwn = class2type.hasOwnProperty;
-
-var support = {};
-
-
-
-var
-	version = "1.11.3",
-
-	// Define a local copy of jQuery
-	jQuery = function( selector, context ) {
-		// The jQuery object is actually just the init constructor 'enhanced'
-		// Need init if jQuery is called (just allow error to be thrown if not included)
-		return new jQuery.fn.init( selector, context );
-	},
-
-	// Support: Android<4.1, IE<9
-	// Make sure we trim BOM and NBSP
-	rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,
-
-	// Matches dashed string for camelizing
-	rmsPrefix = /^-ms-/,
-	rdashAlpha = /-([\da-z])/gi,
-
-	// Used by jQuery.camelCase as callback to replace()
-	fcamelCase = function( all, letter ) {
-		return letter.toUpperCase();
-	};
-
-jQuery.fn = jQuery.prototype = {
-	// The current version of jQuery being used
-	jquery: version,
-
-	constructor: jQuery,
-
-	// Start with an empty selector
-	selector: "",
-
-	// The default length of a jQuery object is 0
-	length: 0,
-
-	toArray: function() {
-		return slice.call( this );
-	},
-
-	// Get the Nth element in the matched element set OR
-	// Get the whole matched element set as a clean array
-	get: function( num ) {
-		return num != null ?
-
-			// Return just the one element from the set
-			( num < 0 ? this[ num + this.length ] : this[ num ] ) :
-
-			// Return all the elements in a clean array
-			slice.call( this );
-	},
-
-	// Take an array of elements and push it onto the stack
-	// (returning the new matched element set)
-	pushStack: function( elems ) {
-
-		// Build a new jQuery matched element set
-		var ret = jQuery.merge( this.constructor(), elems );
-
-		// Add the old object onto the stack (as a reference)
-		ret.prevObject = this;
-		ret.context = this.context;
-
-		// Return the newly-formed element set
-		return ret;
-	},
-
-	// Execute a callback for every element in the matched set.
-	// (You can seed the arguments with an array of args, but this is
-	// only used internally.)
-	each: function( callback, args ) {
-		return jQuery.each( this, callback, args );
-	},
-
-	map: function( callback ) {
-		return this.pushStack( jQuery.map(this, function( elem, i ) {
-			return callback.call( elem, i, elem );
-		}));
-	},
-
-	slice: function() {
-		return this.pushStack( slice.apply( this, arguments ) );
-	},
-
-	first: function() {
-		return this.eq( 0 );
-	},
-
-	last: function() {
-		return this.eq( -1 );
-	},
-
-	eq: function( i ) {
-		var len = this.length,
-			j = +i + ( i < 0 ? len : 0 );
-		return this.pushStack( j >= 0 && j < len ? [ this[j] ] : [] );
-	},
-
-	end: function() {
-		return this.prevObject || this.constructor(null);
-	},
-
-	// For internal use only.
-	// Behaves like an Array's method, not like a jQuery method.
-	push: push,
-	sort: deletedIds.sort,
-	splice: deletedIds.splice
-};
-
-jQuery.extend = jQuery.fn.extend = function() {
-	var src, copyIsArray, copy, name, options, clone,
-		target = arguments[0] || {},
-		i = 1,
-		length = arguments.length,
-		deep = false;
-
-	// Handle a deep copy situation
-	if ( typeof target === "boolean" ) {
-		deep = target;
-
-		// skip the boolean and the target
-		target = arguments[ i ] || {};
-		i++;
-	}
-
-	// Handle case when target is a string or something (possible in deep copy)
-	if ( typeof target !== "object" && !jQuery.isFunction(target) ) {
-		target = {};
-	}
-
-	// extend jQuery itself if only one argument is passed
-	if ( i === length ) {
-		target = this;
-		i--;
-	}
-
-	for ( ; i < length; i++ ) {
-		// Only deal with non-null/undefined values
-		if ( (options = arguments[ i ]) != null ) {
-			// Extend the base object
-			for ( name in options ) {
-				src = target[ name ];
-				copy = options[ name ];
-
-				// Prevent never-ending loop
-				if ( target === copy ) {
-					continue;
-				}
-
-				// Recurse if we're merging plain objects or arrays
-				if ( deep && copy && ( jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)) ) ) {
-					if ( copyIsArray ) {
-						copyIsArray = false;
-						clone = src && jQuery.isArray(src) ? src : [];
-
-					} else {
-						clone = src && jQuery.isPlainObject(src) ? src : {};
-					}
-
-					// Never move original objects, clone them
-					target[ name ] = jQuery.extend( deep, clone, copy );
-
-				// Don't bring in undefined values
-				} else if ( copy !== undefined ) {
-					target[ name ] = copy;
-				}
-			}
-		}
-	}
-
-	// Return the modified object
-	return target;
-};
-
-jQuery.extend({
-	// Unique for each copy of jQuery on the page
-	expando: "jQuery" + ( version + Math.random() ).replace( /\D/g, "" ),
-
-	// Assume jQuery is ready without the ready module
-	isReady: true,
-
-	error: function( msg ) {
-		throw new Error( msg );
-	},
-
-	noop: function() {},
-
-	// See test/unit/core.js for details concerning isFunction.
-	// Since version 1.3, DOM methods and functions like alert
-	// aren't supported. They return false on IE (#2968).
-	isFunction: function( obj ) {
-		return jQuery.type(obj) === "function";
-	},
-
-	isArray: Array.isArray || function( obj ) {
-		return jQuery.type(obj) === "array";
-	},
-
-	isWindow: function( obj ) {
-		/* jshint eqeqeq: false */
-		return obj != null && obj == obj.window;
-	},
-
-	isNumeric: function( obj ) {
-		// parseFloat NaNs numeric-cast false positives (null|true|false|"")
-		// ...but misinterprets leading-number strings, particularly hex literals ("0x...")
-		// subtraction forces infinities to NaN
-		// adding 1 corrects loss of precision from parseFloat (#15100)
-		return !jQuery.isArray( obj ) && (obj - parseFloat( obj ) + 1) >= 0;
-	},
-
-	isEmptyObject: function( obj ) {
-		var name;
-		for ( name in obj ) {
-			return false;
-		}
-		return true;
-	},
-
-	isPlainObject: function( obj ) {
-		var key;
-
-		// Must be an Object.
-		// Because of IE, we also have to check the presence of the constructor property.
-		// Make sure that DOM nodes and window objects don't pass through, as well
-		if ( !obj || jQuery.type(obj) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) {
-			return false;
-		}
-
-		try {
-			// Not own constructor property must be Object
-			if ( obj.constructor &&
-				!hasOwn.call(obj, "constructor") &&
-				!hasOwn.call(obj.constructor.prototype, "isPrototypeOf") ) {
-				return false;
-			}
-		} catch ( e ) {
-			// IE8,9 Will throw exceptions on certain host objects #9897
-			return false;
-		}
-
-		// Support: IE<9
-		// Handle iteration over inherited properties before own properties.
-		if ( support.ownLast ) {
-			for ( key in obj ) {
-				return hasOwn.call( obj, key );
-			}
-		}
-
-		// Own properties are enumerated firstly, so to speed up,
-		// if last one is own, then all properties are own.
-		for ( key in obj ) {}
-
-		return key === undefined || hasOwn.call( obj, key );
-	},
-
-	type: function( obj ) {
-		if ( obj == null ) {
-			return obj + "";
-		}
-		return typeof obj === "object" || typeof obj === "function" ?
-			class2type[ toString.call(obj) ] || "object" :
-			typeof obj;
-	},
-
-	// Evaluates a script in a global context
-	// Workarounds based on findings by Jim Driscoll
-	// http://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context
-	globalEval: function( data ) {
-		if ( data && jQuery.trim( data ) ) {
-			// We use execScript on Internet Explorer
-			// We use an anonymous function so that context is window
-			// rather than jQuery in Firefox
-			( window.execScript || function( data ) {
-				window[ "eval" ].call( window, data );
-			} )( data );
-		}
-	},
-
-	// Convert dashed to camelCase; used by the css and data modules
-	// Microsoft forgot to hump their vendor prefix (#9572)
-	camelCase: function( string ) {
-		return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase );
-	},
-
-	nodeName: function( elem, name ) {
-		return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase();
-	},
-
-	// args is for internal usage only
-	each: function( obj, callback, args ) {
-		var value,
-			i = 0,
-			length = obj.length,
-			isArray = isArraylike( obj );
-
-		if ( args ) {
-			if ( isArray ) {
-				for ( ; i < length; i++ ) {
-					value = callback.apply( obj[ i ], args );
-
-					if ( value === false ) {
-						break;
-					}
-				}
-			} else {
-				for ( i in obj ) {
-					value = callback.apply( obj[ i ], args );
-
-					if ( value === false ) {
-						break;
-					}
-				}
-			}
-
-		// A special, fast, case for the most common use of each
-		} else {
-			if ( isArray ) {
-				for ( ; i < length; i++ ) {
-					value = callback.call( obj[ i ], i, obj[ i ] );
-
-					if ( value === false ) {
-						break;
-					}
-				}
-			} else {
-				for ( i in obj ) {
-					value = callback.call( obj[ i ], i, obj[ i ] );
-
-					if ( value === false ) {
-						break;
-					}
-				}
-			}
-		}
-
-		return obj;
-	},
-
-	// Support: Android<4.1, IE<9
-	trim: function( text ) {
-		return text == null ?
-			"" :
-			( text + "" ).replace( rtrim, "" );
-	},
-
-	// results is for internal usage only
-	makeArray: function( arr, results ) {
-		var ret = results || [];
-
-		if ( arr != null ) {
-			if ( isArraylike( Object(arr) ) ) {
-				jQuery.merge( ret,
-					typeof arr === "string" ?
-					[ arr ] : arr
-				);
-			} else {
-				push.call( ret, arr );
-			}
-		}
-
-		return ret;
-	},
-
-	inArray: function( elem, arr, i ) {
-		var len;
-
-		if ( arr ) {
-			if ( indexOf ) {
-				return indexOf.call( arr, elem, i );
-			}
-
-			len = arr.length;
-			i = i ? i < 0 ? Math.max( 0, len + i ) : i : 0;
-
-			for ( ; i < len; i++ ) {
-				// Skip accessing in sparse arrays
-				if ( i in arr && arr[ i ] === elem ) {
-					return i;
-				}
-			}
-		}
-
-		return -1;
-	},
-
-	merge: function( first, second ) {
-		var len = +second.length,
-			j = 0,
-			i = first.length;
-
-		while ( j < len ) {
-			first[ i++ ] = second[ j++ ];
-		}
-
-		// Support: IE<9
-		// Workaround casting of .length to NaN on otherwise arraylike objects (e.g., NodeLists)
-		if ( len !== len ) {
-			while ( second[j] !== undefined ) {
-				first[ i++ ] = second[ j++ ];
-			}
-		}
-
-		first.length = i;
-
-		return first;
-	},
-
-	grep: function( elems, callback, invert ) {
-		var callbackInverse,
-			matches = [],
-			i = 0,
-			length = elems.length,
-			callbackExpect = !invert;
-
-		// Go through the array, only saving the items
-		// that pass the validator function
-		for ( ; i < length; i++ ) {
-			callbackInverse = !callback( elems[ i ], i );
-			if ( callbackInverse !== callbackExpect ) {
-				matches.push( elems[ i ] );
-			}
-		}
-
-		return matches;
-	},
-
-	// arg is for internal usage only
-	map: function( elems, callback, arg ) {
-		var value,
-			i = 0,
-			length = elems.length,
-			isArray = isArraylike( elems ),
-			ret = [];
-
-		// Go through the array, translating each of the items to their new values
-		if ( isArray ) {
-			for ( ; i < length; i++ ) {
-				value = callback( elems[ i ], i, arg );
-
-				if ( value != null ) {
-					ret.push( value );
-				}
-			}
-
-		// Go through every key on the object,
-		} else {
-			for ( i in elems ) {
-				value = callback( elems[ i ], i, arg );
-
-				if ( value != null ) {
-					ret.push( value );
-				}
-			}
-		}
-
-		// Flatten any nested arrays
-		return concat.apply( [], ret );
-	},
-
-	// A global GUID counter for objects
-	guid: 1,
-
-	// Bind a function to a context, optionally partially applying any
-	// arguments.
-	proxy: function( fn, context ) {
-		var args, proxy, tmp;
-
-		if ( typeof context === "string" ) {
-			tmp = fn[ context ];
-			context = fn;
-			fn = tmp;
-		}
-
-		// Quick check to determine if target is callable, in the spec
-		// this throws a TypeError, but we will just return undefined.
-		if ( !jQuery.isFunction( fn ) ) {
-			return undefined;
-		}
-
-		// Simulated bind
-		args = slice.call( arguments, 2 );
-		proxy = function() {
-			return fn.apply( context || this, args.concat( slice.call( arguments ) ) );
-		};
-
-		// Set the guid of unique handler to the same of original handler, so it can be removed
-		proxy.guid = fn.guid = fn.guid || jQuery.guid++;
-
-		return proxy;
-	},
-
-	now: function() {
-		return +( new Date() );
-	},
-
-	// jQuery.support is not used in Core but other projects attach their
-	// properties to it so it needs to exist.
-	support: support
-});
-
-// Populate the class2type map
-jQuery.each("Boolean Number String Function Array Date RegExp Object Error".split(" "), function(i, name) {
-	class2type[ "[object " + name + "]" ] = name.toLowerCase();
-});
-
-function isArraylike( obj ) {
-
-	// Support: iOS 8.2 (not reproducible in simulator)
-	// `in` check used to prevent JIT error (gh-2145)
-	// hasOwn isn't used here due to false negatives
-	// regarding Nodelist length in IE
-	var length = "length" in obj && obj.length,
-		type = jQuery.type( obj );
-
-	if ( type === "function" || jQuery.isWindow( obj ) ) {
-		return false;
-	}
-
-	if ( obj.nodeType === 1 && length ) {
-		return true;
-	}
-
-	return type === "array" || length === 0 ||
-		typeof length === "number" && length > 0 && ( length - 1 ) in obj;
-}
-var Sizzle =
-/*!
- * Sizzle CSS Selector Engine v2.2.0-pre
- * http://sizzlejs.com/
- *
- * Copyright 2008, 2014 jQuery Foundation, Inc. and other contributors
- * Released under the MIT license
- * http://jquery.org/license
- *
- * Date: 2014-12-16
- */
-(function( window ) {
-
-var i,
-	support,
-	Expr,
-	getText,
-	isXML,
-	tokenize,
-	compile,
-	select,
-	outermostContext,
-	sortInput,
-	hasDuplicate,
-
-	// Local document vars
-	setDocument,
-	document,
-	docElem,
-	documentIsHTML,
-	rbuggyQSA,
-	rbuggyMatches,
-	matches,
-	contains,
-
-	// Instance-specific data
-	expando = "sizzle" + 1 * new Date(),
-	preferredDoc = window.document,
-	dirruns = 0,
-	done = 0,
-	classCache = createCache(),
-	tokenCache = createCache(),
-	compilerCache = createCache(),
-	sortOrder = function( a, b ) {
-		if ( a === b ) {
-			hasDuplicate = true;
-		}
-		return 0;
-	},
-
-	// General-purpose constants
-	MAX_NEGATIVE = 1 << 31,
-
-	// Instance methods
-	hasOwn = ({}).hasOwnProperty,
-	arr = [],
-	pop = arr.pop,
-	push_native = arr.push,
-	push = arr.push,
-	slice = arr.slice,
-	// Use a stripped-down indexOf as it's faster than native
-	// http://jsperf.com/thor-indexof-vs-for/5
-	indexOf = function( list, elem ) {
-		var i = 0,
-			len = list.length;
-		for ( ; i < len; i++ ) {
-			if ( list[i] === elem ) {
-				return i;
-			}
-		}
-		return -1;
-	},
-
-	booleans = "checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",
-
-	// Regular expressions
-
-	// Whitespace characters http://www.w3.org/TR/css3-selectors/#whitespace
-	whitespace = "[\\x20\\t\\r\\n\\f]",
-	// http://www.w3.org/TR/css3-syntax/#characters
-	characterEncoding = "(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",
-
-	// Loosely modeled on CSS identifier characters
-	// An unquoted value should be a CSS identifier http://www.w3.org/TR/css3-selectors/#attribute-selectors
-	// Proper syntax: http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier
-	identifier = characterEncoding.replace( "w", "w#" ),
-
-	// Attribute selectors: http://www.w3.org/TR/selectors/#attribute-selectors
-	attributes = "\\[" + whitespace + "*(" + characterEncoding + ")(?:" + whitespace +
-		// Operator (capture 2)
-		"*([*^$|!~]?=)" + whitespace +
-		// "Attribute values must be CSS identifiers [capture 5] or strings [capture 3 or capture 4]"
-		"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|(" + identifier + "))|)" + whitespace +
-		"*\\]",
-
-	pseudos = ":(" + characterEncoding + ")(?:\\((" +
-		// To reduce the number of selectors needing tokenize in the preFilter, prefer arguments:
-		// 1. quoted (capture 3; capture 4 or capture 5)
-		"('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|" +
-		// 2. simple (capture 6)
-		"((?:\\\\.|[^\\\\()[\\]]|" + attributes + ")*)|" +
-		// 3. anything else (capture 2)
-		".*" +
-		")\\)|)",
-
-	// Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter
-	rwhitespace = new RegExp( whitespace + "+", "g" ),
-	rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + whitespace + "+$", "g" ),
-
-	rcomma = new RegExp( "^" + whitespace + "*," + whitespace + "*" ),
-	rcombinators = new RegExp( "^" + whitespace + "*([>+~]|" + whitespace + ")" + whitespace + "*" ),
-
-	rattributeQuotes = new RegExp( "=" + whitespace + "*([^\\]'\"]*?)" + whitespace + "*\\]", "g" ),
-
-	rpseudo = new RegExp( pseudos ),
-	ridentifier = new RegExp( "^" + identifier + "$" ),
-
-	matchExpr = {
-		"ID": new RegExp( "^#(" + characterEncoding + ")" ),
-		"CLASS": new RegExp( "^\\.(" + characterEncoding + ")" ),
-		"TAG": new RegExp( "^(" + characterEncoding.replace( "w", "w*" ) + ")" ),
-		"ATTR": new RegExp( "^" + attributes ),
-		"PSEUDO": new RegExp( "^" + pseudos ),
-		"CHILD": new RegExp( "^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" + whitespace +
-			"*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" + whitespace +
-			"*(\\d+)|))" + whitespace + "*\\)|)", "i" ),
-		"bool": new RegExp( "^(?:" + booleans + ")$", "i" ),
-		// For use in libraries implementing .is()
-		// We use this for POS matching in `select`
-		"needsContext": new RegExp( "^" + whitespace + "*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" +
-			whitespace + "*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)", "i" )
-	},
-
-	rinputs = /^(?:input|select|textarea|button)$/i,
-	rheader = /^h\d$/i,
-
-	rnative = /^[^{]+\{\s*\[native \w/,
-
-	// Easily-parseable/retrievable ID or TAG or CLASS selectors
-	rquickExpr = /^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,
-
-	rsibling = /[+~]/,
-	rescape = /'|\\/g,
-
-	// CSS escapes http://www.w3.org/TR/CSS21/syndata.html#escaped-characters
-	runescape = new RegExp( "\\\\([\\da-f]{1,6}" + whitespace + "?|(" + whitespace + ")|.)", "ig" ),
-	funescape = function( _, escaped, escapedWhitespace ) {
-		var high = "0x" + escaped - 0x10000;
-		// NaN means non-codepoint
-		// Support: Firefox<24
-		// Workaround erroneous numeric interpretation of +"0x"
-		return high !== high || escapedWhitespace ?
-			escaped :
-			high < 0 ?
-				// BMP codepoint
-				String.fromCharCode( high + 0x10000 ) :
-				// Supplemental Plane codepoint (surrogate pair)
-				String.fromCharCode( high >> 10 | 0xD800, high & 0x3FF | 0xDC00 );
-	},
-
-	// Used for iframes
-	// See setDocument()
-	// Removing the function wrapper causes a "Permission Denied"
-	// error in IE
-	unloadHandler = function() {
-		setDocument();
-	};
-
-// Optimize for push.apply( _, NodeList )
-try {
-	push.apply(
-		(arr = slice.call( preferredDoc.childNodes )),
-		preferredDoc.childNodes
-	);
-	// Support: Android<4.0
-	// Detect silently failing push.apply
-	arr[ preferredDoc.childNodes.length ].nodeType;
-} catch ( e ) {
-	push = { apply: arr.length ?
-
-		// Leverage slice if possible
-		function( target, els ) {
-			push_native.apply( target, slice.call(els) );
-		} :
-
-		// Support: IE<9
-		// Otherwise append directly
-		function( target, els ) {
-			var j = target.length,
-				i = 0;
-			// Can't trust NodeList.length
-			while ( (target[j++] = els[i++]) ) {}
-			target.length = j - 1;
-		}
-	};
-}
-
-function Sizzle( selector, context, results, seed ) {
-	var match, elem, m, nodeType,
-		// QSA vars
-		i, groups, old, nid, newContext, newSelector;
-
-	if ( ( context ? context.ownerDocument || context : preferredDoc ) !== document ) {
-		setDocument( context );
-	}
-
-	context = context || document;
-	results = results || [];
-	nodeType = context.nodeType;
-
-	if ( typeof selector !== "string" || !selector ||
-		nodeType !== 1 && nodeType !== 9 && nodeType !== 11 ) {
-
-		return results;
-	}
-
-	if ( !seed && documentIsHTML ) {
-
-		// Try to shortcut find operations when possible (e.g., not under DocumentFragment)
-		if ( nodeType !== 11 && (match = rquickExpr.exec( selector )) ) {
-			// Speed-up: Sizzle("#ID")
-			if ( (m = match[1]) ) {
-				if ( nodeType === 9 ) {
-					elem = context.getElementById( m );
-					// Check parentNode to catch when Blackberry 4.6 returns
-					// nodes that are no longer in the document (jQuery #6963)
-					if ( elem && elem.parentNode ) {
-						// Handle the case where IE, Opera, and Webkit return items
-						// by name instead of ID
-						if ( elem.id === m ) {
-							results.push( elem );
-							return results;
-						}
-					} else {
-						return results;
-					}
-				} else {
-					// Context is not a document
-					if ( context.ownerDocument && (elem = context.ownerDocument.getElementById( m )) &&
-						contains( context, elem ) && elem.id === m ) {
-						results.push( elem );
-						return results;
-					}
-				}
-
-			// Speed-up: Sizzle("TAG")
-			} else if ( match[2] ) {
-				push.apply( results, context.getElementsByTagName( selector ) );
-				return results;
-
-			// Speed-up: Sizzle(".CLASS")
-			} else if ( (m = match[3]) && support.getElementsByClassName ) {
-				push.apply( results, context.getElementsByClassName( m ) );
-				return results;
-			}
-		}
-
-		// QSA path
-		if ( support.qsa && (!rbuggyQSA || !rbuggyQSA.test( selector )) ) {
-			nid = old = expando;
-			newContext = context;
-			newSelector = nodeType !== 1 && selector;
-
-			// qSA works strangely on Element-rooted queries
-			// We can work around this by specifying an extra ID on the root
-			// and working up from there (Thanks to Andrew Dupont for the technique)
-			// IE 8 doesn't work on object elements
-			if ( nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) {
-				groups = tokenize( selector );
-
-				if ( (old = context.getAttribute("id")) ) {
-					nid = old.replace( rescape, "\\$&" );
-				} else {
-					context.setAttribute( "id", nid );
-				}
-				nid = "[id='" + nid + "'] ";
-
-				i = groups.length;
-				while ( i-- ) {
-					groups[i] = nid + toSelector( groups[i] );
-				}
-				newContext = rsibling.test( selector ) && testContext( context.parentNode ) || context;
-				newSelector = groups.join(",");
-			}
-
-			if ( newSelector ) {
-				try {
-					push.apply( results,
-						newContext.querySelectorAll( newSelector )
-					);
-					return results;
-				} catch(qsaError) {
-				} finally {
-					if ( !old ) {
-						context.removeAttribute("id");
-					}
-				}
-			}
-		}
-	}
-
-	// All others
-	return select( selector.replace( rtrim, "$1" ), context, results, seed );
-}
-
-/**
- * Create key-value caches of limited size
- * @returns {Function(string, Object)} Returns the Object data after storing it on itself with
- *	property name the (space-suffixed) string and (if the cache is larger than Expr.cacheLength)
- *	deleting the oldest entry
- */
-function createCache() {
-	var keys = [];
-
-	function cache( key, value ) {
-		// Use (key + " ") to avoid collision with native prototype properties (see Issue #157)
-		if ( keys.push( key + " " ) > Expr.cacheLength ) {
-			// Only keep the most recent entries
-			delete cache[ keys.shift() ];
-		}
-		return (cache[ key + " " ] = value);
-	}
-	return cache;
-}
-
-/**
- * Mark a function for special use by Sizzle
- * @param {Function} fn The function to mark
- */
-function markFunction( fn ) {
-	fn[ expando ] = true;
-	return fn;
-}
-
-/**
- * Support testing using an element
- * @param {Function} fn Passed the created div and expects a boolean result
- */
-function assert( fn ) {
-	var div = document.createElement("div");
-
-	try {
-		return !!fn( div );
-	} catch (e) {
-		return false;
-	} finally {
-		// Remove from its parent by default
-		if ( div.parentNode ) {
-			div.parentNode.removeChild( div );
-		}
-		// release memory in IE
-		div = null;
-	}
-}
-
-/**
- * Adds the same handler for all of the specified attrs
- * @param {String} attrs Pipe-separated list of attributes
- * @param {Function} handler The method that will be applied
- */
-function addHandle( attrs, handler ) {
-	var arr = attrs.split("|"),
-		i = attrs.length;
-
-	while ( i-- ) {
-		Expr.attrHandle[ arr[i] ] = handler;
-	}
-}
-
-/**
- * Checks document order of two siblings
- * @param {Element} a
- * @param {Element} b
- * @returns {Number} Returns less than 0 if a precedes b, greater than 0 if a follows b
- */
-function siblingCheck( a, b ) {
-	var cur = b && a,
-		diff = cur && a.nodeType === 1 && b.nodeType === 1 &&
-			( ~b.sourceIndex || MAX_NEGATIVE ) -
-			( ~a.sourceIndex || MAX_NEGATIVE );
-
-	// Use IE sourceIndex if available on both nodes
-	if ( diff ) {
-		return diff;
-	}
-
-	// Check if b follows a
-	if ( cur ) {
-		while ( (cur = cur.nextSibling) ) {
-			if ( cur === b ) {
-				return -1;
-			}
-		}
-	}
-
-	return a ? 1 : -1;
-}
-
-/**
- * Returns a function to use in pseudos for input types
- * @param {String} type
- */
-function createInputPseudo( type ) {
-	return function( elem ) {
-		var name = elem.nodeName.toLowerCase();
-		return name === "input" && elem.type === type;
-	};
-}
-
-/**
- * Returns a function to use in pseudos for buttons
- * @param {String} type
- */
-function createButtonPseudo( type ) {
-	return function( elem ) {
-		var name = elem.nodeName.toLowerCase();
-		return (name === "input" || name === "button") && elem.type === type;
-	};
-}
-
-/**
- * Returns a function to use in pseudos for positionals
- * @param {Function} fn
- */
-function createPositionalPseudo( fn ) {
-	return markFunction(function( argument ) {
-		argument = +argument;
-		return markFunction(function( seed, matches ) {
-			var j,
-				matchIndexes = fn( [], seed.length, argument ),
-				i = matchIndexes.length;
-
-			// Match elements found at the specified indexes
-			while ( i-- ) {
-				if ( seed[ (j = matchIndexes[i]) ] ) {
-					seed[j] = !(matches[j] = seed[j]);
-				}
-			}
-		});
-	});
-}
-
-/**
- * Checks a node for validity as a Sizzle context
- * @param {Element|Object=} context
- * @returns {Element|Object|Boolean} The input node if acceptable, otherwise a falsy value
- */
-function testContext( context ) {
-	return context && typeof context.getElementsByTagName !== "undefined" && context;
-}
-
-// Expose support vars for convenience
-support = Sizzle.support = {};
-
-/**
- * Detects XML nodes
- * @param {Element|Object} elem An element or a document
- * @returns {Boolean} True iff elem is a non-HTML XML node
- */
-isXML = Sizzle.isXML = function( elem ) {
-	// documentElement is verified for cases where it doesn't yet exist
-	// (such as loading iframes in IE - #4833)
-	var documentElement = elem && (elem.ownerDocument || elem).documentElement;
-	return documentElement ? documentElement.nodeName !== "HTML" : false;
-};
-
-/**
- * Sets document-related variables once based on the current document
- * @param {Element|Object} [doc] An element or document object to use to set the document
- * @returns {Object} Returns the current document
- */
-setDocument = Sizzle.setDocument = function( node ) {
-	var hasCompare, parent,
-		doc = node ? node.ownerDocument || node : preferredDoc;
-
-	// If no document and documentElement is available, return
-	if ( doc === document || doc.nodeType !== 9 || !doc.documentElement ) {
-		return document;
-	}
-
-	// Set our document
-	document = doc;
-	docElem = doc.documentElement;
-	parent = doc.defaultView;
-
-	// Support: IE>8
-	// If iframe document is assigned to "document" variable and if iframe has been reloaded,
-	// IE will throw "permission denied" error when accessing "document" variable, see jQuery #13936
-	// IE6-8 do not support the defaultView property so parent will be undefined
-	if ( parent && parent !== parent.top ) {
-		// IE11 does not have attachEvent, so all must suffer
-		if ( parent.addEventListener ) {
-			parent.addEventListener( "unload", unloadHandler, false );
-		} else if ( parent.attachEvent ) {
-			parent.attachEvent( "onunload", unloadHandler );
-		}
-	}
-
-	/* Support tests
-	---------------------------------------------------------------------- */
-	documentIsHTML = !isXML( doc );
-
-	/* Attributes
-	---------------------------------------------------------------------- */
-
-	// Support: IE<8
-	// Verify that getAttribute really returns attributes and not properties
-	// (excepting IE8 booleans)
-	support.attributes = assert(function( div ) {
-		div.className = "i";
-		return !div.getAttribute("className");
-	});
-
-	/* getElement(s)By*
-	---------------------------------------------------------------------- */
-
-	// Check if getElementsByTagName("*") returns only elements
-	support.getElementsByTagName = assert(function( div ) {
-		div.appendChild( doc.createComment("") );
-		return !div.getElementsByTagName("*").length;
-	});
-
-	// Support: IE<9
-	support.getElementsByClassName = rnative.test( doc.getElementsByClassName );
-
-	// Support: IE<10
-	// Check if getElementById returns elements by name
-	// The broken getElementById methods don't pick up programatically-set names,
-	// so use a roundabout getElementsByName test
-	support.getById = assert(function( div ) {
-		docElem.appendChild( div ).id = expando;
-		return !doc.getElementsByName || !doc.getElementsByName( expando ).length;
-	});
-
-	// ID find and filter
-	if ( support.getById ) {
-		Expr.find["ID"] = function( id, context ) {
-			if ( typeof context.getElementById !== "undefined" && documentIsHTML ) {
-				var m = context.getElementById( id );
-				// Check parentNode to catch when Blackberry 4.6 returns
-				// nodes that are no longer in the document #6963
-				return m && m.parentNode ? [ m ] : [];
-			}
-		};
-		Expr.filter["ID"] = function( id ) {
-			var attrId = id.replace( runescape, funescape );
-			return function( elem ) {
-				return elem.getAttribute("id") === attrId;
-			};
-		};
-	} else {
-		// Support: IE6/7
-		// getElementById is not reliable as a find shortcut
-		delete Expr.find["ID"];
-
-		Expr.filter["ID"] =  function( id ) {
-			var attrId = id.replace( runescape, funescape );
-			return function( elem ) {
-				var node = typeof elem.getAttributeNode !== "undefined" && elem.getAttributeNode("id");
-				return node && node.value === attrId;
-			};
-		};
-	}
-
-	// Tag
-	Expr.find["TAG"] = support.getElementsByTagName ?
-		function( tag, context ) {
-			if ( typeof context.getElementsByTagName !== "undefined" ) {
-				return context.getElementsByTagName( tag );
-
-			// DocumentFragment nodes don't have gEBTN
-			} else if ( support.qsa ) {
-				return context.querySelectorAll( tag );
-			}
-		} :
-
-		function( tag, context ) {
-			var elem,
-				tmp = [],
-				i = 0,
-				// By happy coincidence, a (broken) gEBTN appears on DocumentFragment nodes too
-				results = context.getElementsByTagName( tag );
-
-			// Filter out possible comments
-			if ( tag === "*" ) {
-				while ( (elem = results[i++]) ) {
-					if ( elem.nodeType === 1 ) {
-						tmp.push( elem );
-					}
-				}
-
-				return tmp;
-			}
-			return results;
-		};
-
-	// Class
-	Expr.find["CLASS"] = support.getElementsByClassName && function( className, context ) {
-		if ( documentIsHTML ) {
-			return context.getElementsByClassName( className );
-		}
-	};
-
-	/* QSA/matchesSelector
-	---------------------------------------------------------------------- */
-
-	// QSA and matchesSelector support
-
-	// matchesSelector(:active) reports false when true (IE9/Opera 11.5)
-	rbuggyMatches = [];
-
-	// qSa(:focus) reports false when true (Chrome 21)
-	// We allow this because of a bug in IE8/9 that throws an error
-	// whenever `document.activeElement` is accessed on an iframe
-	// So, we allow :focus to pass through QSA all the time to avoid the IE error
-	// See http://bugs.jquery.com/ticket/13378
-	rbuggyQSA = [];
-
-	if ( (support.qsa = rnative.test( doc.querySelectorAll )) ) {
-		// Build QSA regex
-		// Regex strategy adopted from Diego Perini
-		assert(function( div ) {
-			// Select is set to empty string on purpose
-			// This is to test IE's treatment of not explicitly
-			// setting a boolean content attribute,
-			// since its presence should be enough
-			// http://bugs.jquery.com/ticket/12359
-			docElem.appendChild( div ).innerHTML = "<a id='" + expando + "'></a>" +
-				"<select id='" + expando + "-\f]' msallowcapture=''>" +
-				"<option selected=''></option></select>";
-
-			// Support: IE8, Opera 11-12.16
-			// Nothing should be selected when empty strings follow ^= or $= or *=
-			// The test attribute must be unknown in Opera but "safe" for WinRT
-			// http://msdn.microsoft.com/en-us/library/ie/hh465388.aspx#attribute_section
-			if ( div.querySelectorAll("[msallowcapture^='']").length ) {
-				rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:''|\"\")" );
-			}
-
-			// Support: IE8
-			// Boolean attributes and "value" are not treated correctly
-			if ( !div.querySelectorAll("[selected]").length ) {
-				rbuggyQSA.push( "\\[" + whitespace + "*(?:value|" + booleans + ")" );
-			}
-
-			// Support: Chrome<29, Android<4.2+, Safari<7.0+, iOS<7.0+, PhantomJS<1.9.7+
-			if ( !div.querySelectorAll( "[id~=" + expando + "-]" ).length ) {
-				rbuggyQSA.push("~=");
-			}
-
-			// Webkit/Opera - :checked should return selected option elements
-			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
-			// IE8 throws error here and will not see later tests
-			if ( !div.querySelectorAll(":checked").length ) {
-				rbuggyQSA.push(":checked");
-			}
-
-			// Support: Safari 8+, iOS 8+
-			// https://bugs.webkit.org/show_bug.cgi?id=136851
-			// In-page `selector#id sibing-combinator selector` fails
-			if ( !div.querySelectorAll( "a#" + expando + "+*" ).length ) {
-				rbuggyQSA.push(".#.+[+~]");
-			}
-		});
-
-		assert(function( div ) {
-			// Support: Windows 8 Native Apps
-			// The type and name attributes are restricted during .innerHTML assignment
-			var input = doc.createElement("input");
-			input.setAttribute( "type", "hidden" );
-			div.appendChild( input ).setAttribute( "name", "D" );
-
-			// Support: IE8
-			// Enforce case-sensitivity of name attribute
-			if ( div.querySelectorAll("[name=d]").length ) {
-				rbuggyQSA.push( "name" + whitespace + "*[*^$|!~]?=" );
-			}
-
-			// FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled)
-			// IE8 throws error here and will not see later tests
-			if ( !div.querySelectorAll(":enabled").length ) {
-				rbuggyQSA.push( ":enabled", ":disabled" );
-			}
-
-			// Opera 10-11 does not throw on post-comma invalid pseudos
-			div.querySelectorAll("*,:x");
-			rbuggyQSA.push(",.*:");
-		});
-	}
-
-	if ( (support.matchesSelector = rnative.test( (matches = docElem.matches ||
-		docElem.webkitMatchesSelector ||
-		docElem.mozMatchesSelector ||
-		docElem.oMatchesSelector ||
-		docElem.msMatchesSelector) )) ) {
-
-		assert(function( div ) {
-			// Check to see if it's possible to do matchesSelector
-			// on a disconnected node (IE 9)
-			support.disconnectedMatch = matches.call( div, "div" );
-
-			// This should fail with an exception
-			// Gecko does not error, returns false instead
-			matches.call( div, "[s!='']:x" );
-			rbuggyMatches.push( "!=", pseudos );
-		});
-	}
-
-	rbuggyQSA = rbuggyQSA.length && new RegExp( rbuggyQSA.join("|") );
-	rbuggyMatches = rbuggyMatches.length && new RegExp( rbuggyMatches.join("|") );
-
-	/* Contains
-	---------------------------------------------------------------------- */
-	hasCompare = rnative.test( docElem.compareDocumentPosition );
-
-	// Element contains another
-	// Purposefully does not implement inclusive descendent
-	// As in, an element does not contain itself
-	contains = hasCompare || rnative.test( docElem.contains ) ?
-		function( a, b ) {
-			var adown = a.nodeType === 9 ? a.documentElement : a,
-				bup = b && b.parentNode;
-			return a === bup || !!( bup && bup.nodeType === 1 && (
-				adown.contains ?
-					adown.contains( bup ) :
-					a.compareDocumentPosition && a.compareDocumentPosition( bup ) & 16
-			));
-		} :
-		function( a, b ) {
-			if ( b ) {
-				while ( (b = b.parentNode) ) {
-					if ( b === a ) {
-						return true;
-					}
-				}
-			}
-			return false;
-		};
-
-	/* Sorting
-	---------------------------------------------------------------------- */
-
-	// Document order sorting
-	sortOrder = hasCompare ?
-	function( a, b ) {
-
-		// Flag for duplicate removal
-		if ( a === b ) {
-			hasDuplicate = true;
-			return 0;
-		}
-
-		// Sort on method existence if only one input has compareDocumentPosition
-		var compare = !a.compareDocumentPosition - !b.compareDocumentPosition;
-		if ( compare ) {
-			return compare;
-		}
-
-		// Calculate position if both inputs belong to the same document
-		compare = ( a.ownerDocument || a ) === ( b.ownerDocument || b ) ?
-			a.compareDocumentPosition( b ) :
-
-			// Otherwise we know they are disconnected
-			1;
-
-		// Disconnected nodes
-		if ( compare & 1 ||
-			(!support.sortDetached && b.compareDocumentPosition( a ) === compare) ) {
-
-			// Choose the first element that is related to our preferred document
-			if ( a === doc || a.ownerDocument === preferredDoc && contains(preferredDoc, a) ) {
-				return -1;
-			}
-			if ( b === doc || b.ownerDocument === preferredDoc && contains(preferredDoc, b) ) {
-				return 1;
-			}
-
-			// Maintain original order
-			return sortInput ?
-				( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) :
-				0;
-		}
-
-		return compare & 4 ? -1 : 1;
-	} :
-	function( a, b ) {
-		// Exit early if the nodes are identical
-		if ( a === b ) {
-			hasDuplicate = true;
-			return 0;
-		}
-
-		var cur,
-			i = 0,
-			aup = a.parentNode,
-			bup = b.parentNode,
-			ap = [ a ],
-			bp = [ b ];
-
-		// Parentless nodes are either documents or disconnected
-		if ( !aup || !bup ) {
-			return a === doc ? -1 :
-				b === doc ? 1 :
-				aup ? -1 :
-				bup ? 1 :
-				sortInput ?
-				( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) :
-				0;
-
-		// If the nodes are siblings, we can do a quick check
-		} else if ( aup === bup ) {
-			return siblingCheck( a, b );
-		}
-
-		// Otherwise we need full lists of their ancestors for comparison
-		cur = a;
-		while ( (cur = cur.parentNode) ) {
-			ap.unshift( cur );
-		}
-		cur = b;
-		while ( (cur = cur.parentNode) ) {
-			bp.unshift( cur );
-		}
-
-		// Walk down the tree looking for a discrepancy
-		while ( ap[i] === bp[i] ) {
-			i++;
-		}
-
-		return i ?
-			// Do a sibling check if the nodes have a common ancestor
-			siblingCheck( ap[i], bp[i] ) :
-
-			// Otherwise nodes in our document sort first
-			ap[i] === preferredDoc ? -1 :
-			bp[i] === preferredDoc ? 1 :
-			0;
-	};
-
-	return doc;
-};
-
-Sizzle.matches = function( expr, elements ) {
-	return Sizzle( expr, null, null, elements );
-};
-
-Sizzle.matchesSelector = function( elem, expr ) {
-	// Set document vars if needed
-	if ( ( elem.ownerDocument || elem ) !== document ) {
-		setDocument( elem );
-	}
-
-	// Make sure that attribute selectors are quoted
-	expr = expr.replace( rattributeQuotes, "='$1']" );
-
-	if ( support.matchesSelector && documentIsHTML &&
-		( !rbuggyMatches || !rbuggyMatches.test( expr ) ) &&
-		( !rbuggyQSA     || !rbuggyQSA.test( expr ) ) ) {
-
-		try {
-			var ret = matches.call( elem, expr );
-
-			// IE 9's matchesSelector returns false on disconnected nodes
-			if ( ret || support.disconnectedMatch ||
-					// As well, disconnected nodes are said to be in a document
-					// fragment in IE 9
-					elem.document && elem.document.nodeType !== 11 ) {
-				return ret;
-			}
-		} catch (e) {}
-	}
-
-	return Sizzle( expr, document, null, [ elem ] ).length > 0;
-};
-
-Sizzle.contains = function( context, elem ) {
-	// Set document vars if needed
-	if ( ( context.ownerDocument || context ) !== document ) {
-		setDocument( context );
-	}
-	return contains( context, elem );
-};
-
-Sizzle.attr = function( elem, name ) {
-	// Set document vars if needed
-	if ( ( elem.ownerDocument || elem ) !== document ) {
-		setDocument( elem );
-	}
-
-	var fn = Expr.attrHandle[ name.toLowerCase() ],
-		// Don't get fooled by Object.prototype properties (jQuery #13807)
-		val = fn && hasOwn.call( Expr.attrHandle, name.toLowerCase() ) ?
-			fn( elem, name, !documentIsHTML ) :
-			undefined;
-
-	return val !== undefined ?
-		val :
-		support.attributes || !documentIsHTML ?
-			elem.getAttribute( name ) :
-			(val = elem.getAttributeNode(name)) && val.specified ?
-				val.value :
-				null;
-};
-
-Sizzle.error = function( msg ) {
-	throw new Error( "Syntax error, unrecognized expression: " + msg );
-};
-
-/**
- * Document sorting and removing duplicates
- * @param {ArrayLike} results
- */
-Sizzle.uniqueSort = function( results ) {
-	var elem,
-		duplicates = [],
-		j = 0,
-		i = 0;
-
-	// Unless we *know* we can detect duplicates, assume their presence
-	hasDuplicate = !support.detectDuplicates;
-	sortInput = !support.sortStable && results.slice( 0 );
-	results.sort( sortOrder );
-
-	if ( hasDuplicate ) {
-		while ( (elem = results[i++]) ) {
-			if ( elem === results[ i ] ) {
-				j = duplicates.push( i );
-			}
-		}
-		while ( j-- ) {
-			results.splice( duplicates[ j ], 1 );
-		}
-	}
-
-	// Clear input after sorting to release objects
-	// See https://github.com/jquery/sizzle/pull/225
-	sortInput = null;
-
-	return results;
-};
-
-/**
- * Utility function for retrieving the text value of an array of DOM nodes
- * @param {Array|Element} elem
- */
-getText = Sizzle.getText = function( elem ) {
-	var node,
-		ret = "",
-		i = 0,
-		nodeType = elem.nodeType;
-
-	if ( !nodeType ) {
-		// If no nodeType, this is expected to be an array
-		while ( (node = elem[i++]) ) {
-			// Do not traverse comment nodes
-			ret += getText( node );
-		}
-	} else if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) {
-		// Use textContent for elements
-		// innerText usage removed for consistency of new lines (jQuery #11153)
-		if ( typeof elem.textContent === "string" ) {
-			return elem.textContent;
-		} else {
-			// Traverse its children
-			for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
-				ret += getText( elem );
-			}
-		}
-	} else if ( nodeType === 3 || nodeType === 4 ) {
-		return elem.nodeValue;
-	}
-	// Do not include comment or processing instruction nodes
-
-	return ret;
-};
-
-Expr = Sizzle.selectors = {
-
-	// Can be adjusted by the user
-	cacheLength: 50,
-
-	createPseudo: markFunction,
-
-	match: matchExpr,
-
-	attrHandle: {},
-
-	find: {},
-
-	relative: {
-		">": { dir: "parentNode", first: true },
-		" ": { dir: "parentNode" },
-		"+": { dir: "previousSibling", first: true },
-		"~": { dir: "previousSibling" }
-	},
-
-	preFilter: {
-		"ATTR": function( match ) {
-			match[1] = match[1].replace( runescape, funescape );
-
-			// Move the given value to match[3] whether quoted or unquoted
-			match[3] = ( match[3] || match[4] || match[5] || "" ).replace( runescape, funescape );
-
-			if ( match[2] === "~=" ) {
-				match[3] = " " + match[3] + " ";
-			}
-
-			return match.slice( 0, 4 );
-		},
-
-		"CHILD": function( match ) {
-			/* matches from matchExpr["CHILD"]
-				1 type (only|nth|...)
-				2 what (child|of-type)
-				3 argument (even|odd|\d*|\d*n([+-]\d+)?|...)
-				4 xn-component of xn+y argument ([+-]?\d*n|)
-				5 sign of xn-component
-				6 x of xn-component
-				7 sign of y-component
-				8 y of y-component
-			*/
-			match[1] = match[1].toLowerCase();
-
-			if ( match[1].slice( 0, 3 ) === "nth" ) {
-				// nth-* requires argument
-				if ( !match[3] ) {
-					Sizzle.error( match[0] );
-				}
-
-				// numeric x and y parameters for Expr.filter.CHILD
-				// remember that false/true cast respectively to 0/1
-				match[4] = +( match[4] ? match[5] + (match[6] || 1) : 2 * ( match[3] === "even" || match[3] === "odd" ) );
-				match[5] = +( ( match[7] + match[8] ) || match[3] === "odd" );
-
-			// other types prohibit arguments
-			} else if ( match[3] ) {
-				Sizzle.error( match[0] );
-			}
-
-			return match;
-		},
-
-		"PSEUDO": function( match ) {
-			var excess,
-				unquoted = !match[6] && match[2];
-
-			if ( matchExpr["CHILD"].test( match[0] ) ) {
-				return null;
-			}
-
-			// Accept quoted arguments as-is
-			if ( match[3] ) {
-				match[2] = match[4] || match[5] || "";
-
-			// Strip excess characters from unquoted arguments
-			} else if ( unquoted && rpseudo.test( unquoted ) &&
-				// Get excess from tokenize (recursively)
-				(excess = tokenize( unquoted, true )) &&
-				// advance to the next closing parenthesis
-				(excess = unquoted.indexOf( ")", unquoted.length - excess ) - unquoted.length) ) {
-
-				// excess is a negative index
-				match[0] = match[0].slice( 0, excess );
-				match[2] = unquoted.slice( 0, excess );
-			}
-
-			// Return only captures needed by the pseudo filter method (type and argument)
-			return match.slice( 0, 3 );
-		}
-	},
-
-	filter: {
-
-		"TAG": function( nodeNameSelector ) {
-			var nodeName = nodeNameSelector.replace( runescape, funescape ).toLowerCase();
-			return nodeNameSelector === "*" ?
-				function() { return true; } :
-				function( elem ) {
-					return elem.nodeName && elem.nodeName.toLowerCase() === nodeName;
-				};
-		},
-
-		"CLASS": function( className ) {
-			var pattern = classCache[ className + " " ];
-
-			return pattern ||
-				(pattern = new RegExp( "(^|" + whitespace + ")" + className + "(" + whitespace + "|$)" )) &&
-				classCache( className, function( elem ) {
-					return pattern.test( typeof elem.className === "string" && elem.className || typeof elem.getAttribute !== "undefined" && elem.getAttribute("class") || "" );
-				});
-		},
-
-		"ATTR": function( name, operator, check ) {
-			return function( elem ) {
-				var result = Sizzle.attr( elem, name );
-
-				if ( result == null ) {
-					return operator === "!=";
-				}
-				if ( !operator ) {
-					return true;
-				}
-
-				result += "";
-
-				return operator === "=" ? result === check :
-					operator === "!=" ? result !== check :
-					operator === "^=" ? check && result.indexOf( check ) === 0 :
-					operator === "*=" ? check && result.indexOf( check ) > -1 :
-					operator === "$=" ? check && result.slice( -check.length ) === check :
-					operator === "~=" ? ( " " + result.replace( rwhitespace, " " ) + " " ).indexOf( check ) > -1 :
-					operator === "|=" ? result === check || result.slice( 0, check.length + 1 ) === check + "-" :
-					false;
-			};
-		},
-
-		"CHILD": function( type, what, argument, first, last ) {
-			var simple = type.slice( 0, 3 ) !== "nth",
-				forward = type.slice( -4 ) !== "last",
-				ofType = what === "of-type";
-
-			return first === 1 && last === 0 ?
-
-				// Shortcut for :nth-*(n)
-				function( elem ) {
-					return !!elem.parentNode;
-				} :
-
-				function( elem, context, xml ) {
-					var cache, outerCache, node, diff, nodeIndex, start,
-						dir = simple !== forward ? "nextSibling" : "previousSibling",
-						parent = elem.parentNode,
-						name = ofType && elem.nodeName.toLowerCase(),
-						useCache = !xml && !ofType;
-
-					if ( parent ) {
-
-						// :(first|last|only)-(child|of-type)
-						if ( simple ) {
-							while ( dir ) {
-								node = elem;
-								while ( (node = node[ dir ]) ) {
-									if ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) {
-										return false;
-									}
-								}
-								// Reverse direction for :only-* (if we haven't yet done so)
-								start = dir = type === "only" && !start && "nextSibling";
-							}
-							return true;
-						}
-
-						start = [ forward ? parent.firstChild : parent.lastChild ];
-
-						// non-xml :nth-child(...) stores cache data on `parent`
-						if ( forward && useCache ) {
-							// Seek `elem` from a previously-cached index
-							outerCache = parent[ expando ] || (parent[ expando ] = {});
-							cache = outerCache[ type ] || [];
-							nodeIndex = cache[0] === dirruns && cache[1];
-							diff = cache[0] === dirruns && cache[2];
-							node = nodeIndex && parent.childNodes[ nodeIndex ];
-
-							while ( (node = ++nodeIndex && node && node[ dir ] ||
-
-								// Fallback to seeking `elem` from the start
-								(diff = nodeIndex = 0) || start.pop()) ) {
-
-								// When found, cache indexes on `parent` and break
-								if ( node.nodeType === 1 && ++diff && node === elem ) {
-									outerCache[ type ] = [ dirruns, nodeIndex, diff ];
-									break;
-								}
-							}
-
-						// Use previously-cached element index if available
-						} else if ( useCache && (cache = (elem[ expando ] || (elem[ expando ] = {}))[ type ]) && cache[0] === dirruns ) {
-							diff = cache[1];
-
-						// xml :nth-child(...) or :nth-last-child(...) or :nth(-last)?-of-type(...)
-						} else {
-							// Use the same loop as above to seek `elem` from the start
-							while ( (node = ++nodeIndex && node && node[ dir ] ||
-								(diff = nodeIndex = 0) || start.pop()) ) {
-
-								if ( ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) && ++diff ) {
-									// Cache the index of each encountered element
-									if ( useCache ) {
-										(node[ expando ] || (node[ expando ] = {}))[ type ] = [ dirruns, diff ];
-									}
-
-									if ( node === elem ) {
-										break;
-									}
-								}
-							}
-						}
-
-						// Incorporate the offset, then check against cycle size
-						diff -= last;
-						return diff === first || ( diff % first === 0 && diff / first >= 0 );
-					}
-				};
-		},
-
-		"PSEUDO": function( pseudo, argument ) {
-			// pseudo-class names are case-insensitive
-			// http://www.w3.org/TR/selectors/#pseudo-classes
-			// Prioritize by case sensitivity in case custom pseudos are added with uppercase letters
-			// Remember that setFilters inherits from pseudos
-			var args,
-				fn = Expr.pseudos[ pseudo ] || Expr.setFilters[ pseudo.toLowerCase() ] ||
-					Sizzle.error( "unsupported pseudo: " + pseudo );
-
-			// The user may use createPseudo to indicate that
-			// arguments are needed to create the filter function
-			// just as Sizzle does
-			if ( fn[ expando ] ) {
-				return fn( argument );
-			}
-
-			// But maintain support for old signatures
-			if ( fn.length > 1 ) {
-				args = [ pseudo, pseudo, "", argument ];
-				return Expr.setFilters.hasOwnProperty( pseudo.toLowerCase() ) ?
-					markFunction(function( seed, matches ) {
-						var idx,
-							matched = fn( seed, argument ),
-							i = matched.length;
-						while ( i-- ) {
-							idx = indexOf( seed, matched[i] );
-							seed[ idx ] = !( matches[ idx ] = matched[i] );
-						}
-					}) :
-					function( elem ) {
-						return fn( elem, 0, args );
-					};
-			}
-
-			return fn;
-		}
-	},
-
-	pseudos: {
-		// Potentially complex pseudos
-		"not": markFunction(function( selector ) {
-			// Trim the selector passed to compile
-			// to avoid treating leading and trailing
-			// spaces as combinators
-			var input = [],
-				results = [],
-				matcher = compile( selector.replace( rtrim, "$1" ) );
-
-			return matcher[ expando ] ?
-				markFunction(function( seed, matches, context, xml ) {
-					var elem,
-						unmatched = matcher( seed, null, xml, [] ),
-						i = seed.length;
-
-					// Match elements unmatched by `matcher`
-					while ( i-- ) {
-						if ( (elem = unmatched[i]) ) {
-							seed[i] = !(matches[i] = elem);
-						}
-					}
-				}) :
-				function( elem, context, xml ) {
-					input[0] = elem;
-					matcher( input, null, xml, results );
-					// Don't keep the element (issue #299)
-					input[0] = null;
-					return !results.pop();
-				};
-		}),
-
-		"has": markFunction(function( selector ) {
-			return function( elem ) {
-				return Sizzle( selector, elem ).length > 0;
-			};
-		}),
-
-		"contains": markFunction(function( text ) {
-			text = text.replace( runescape, funescape );
-			return function( elem ) {
-				return ( elem.textContent || elem.innerText || getText( elem ) ).indexOf( text ) > -1;
-			};
-		}),
-
-		// "Whether an element is represented by a :lang() selector
-		// is based solely on the element's language value
-		// being equal to the identifier C,
-		// or beginning with the identifier C immediately followed by "-".
-		// The matching of C against the element's language value is performed case-insensitively.
-		// The identifier C does not have to be a valid language name."
-		// http://www.w3.org/TR/selectors/#lang-pseudo
-		"lang": markFunction( function( lang ) {
-			// lang value must be a valid identifier
-			if ( !ridentifier.test(lang || "") ) {
-				Sizzle.error( "unsupported lang: " + lang );
-			}
-			lang = lang.replace( runescape, funescape ).toLowerCase();
-			return function( elem ) {
-				var elemLang;
-				do {
-					if ( (elemLang = documentIsHTML ?
-						elem.lang :
-						elem.getAttribute("xml:lang") || elem.getAttribute("lang")) ) {
-
-						elemLang = elemLang.toLowerCase();
-						return elemLang === lang || elemLang.indexOf( lang + "-" ) === 0;
-					}
-				} while ( (elem = elem.parentNode) && elem.nodeType === 1 );
-				return false;
-			};
-		}),
-
-		// Miscellaneous
-		"target": function( elem ) {
-			var hash = window.location && window.location.hash;
-			return hash && hash.slice( 1 ) === elem.id;
-		},
-
-		"root": function( elem ) {
-			return elem === docElem;
-		},
-
-		"focus": function( elem ) {
-			return elem === document.activeElement && (!document.hasFocus || document.hasFocus()) && !!(elem.type || elem.href || ~elem.tabIndex);
-		},
-
-		// Boolean properties
-		"enabled": function( elem ) {
-			return elem.disabled === false;
-		},
-
-		"disabled": function( elem ) {
-			return elem.disabled === true;
-		},
-
-		"checked": function( elem ) {
-			// In CSS3, :checked should return both checked and selected elements
-			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
-			var nodeName = elem.nodeName.toLowerCase();
-			return (nodeName === "input" && !!elem.checked) || (nodeName === "option" && !!elem.selected);
-		},
-
-		"selected": function( elem ) {
-			// Accessing this property makes selected-by-default
-			// options in Safari work properly
-			if ( elem.parentNode ) {
-				elem.parentNode.selectedIndex;
-			}
-
-			return elem.selected === true;
-		},
-
-		// Contents
-		"empty": function( elem ) {
-			// http://www.w3.org/TR/selectors/#empty-pseudo
-			// :empty is negated by element (1) or content nodes (text: 3; cdata: 4; entity ref: 5),
-			//   but not by others (comment: 8; processing instruction: 7; etc.)
-			// nodeType < 6 works because attributes (2) do not appear as children
-			for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
-				if ( elem.nodeType < 6 ) {
-					return false;
-				}
-			}
-			return true;
-		},
-
-		"parent": function( elem ) {
-			return !Expr.pseudos["empty"]( elem );
-		},
-
-		// Element/input types
-		"header": function( elem ) {
-			return rheader.test( elem.nodeName );
-		},
-
-		"input": function( elem ) {
-			return rinputs.test( elem.nodeName );
-		},
-
-		"button": function( elem ) {
-			var name = elem.nodeName.toLowerCase();
-			return name === "input" && elem.type === "button" || name === "button";
-		},
-
-		"text": function( elem ) {
-			var attr;
-			return elem.nodeName.toLowerCase() === "input" &&
-				elem.type === "text" &&
-
-				// Support: IE<8
-				// New HTML5 attribute values (e.g., "search") appear with elem.type === "text"
-				( (attr = elem.getAttribute("type")) == null || attr.toLowerCase() === "text" );
-		},
-
-		// Position-in-collection
-		"first": createPositionalPseudo(function() {
-			return [ 0 ];
-		}),
-
-		"last": createPositionalPseudo(function( matchIndexes, length ) {
-			return [ length - 1 ];
-		}),
-
-		"eq": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			return [ argument < 0 ? argument + length : argument ];
-		}),
-
-		"even": createPositionalPseudo(function( matchIndexes, length ) {
-			var i = 0;
-			for ( ; i < length; i += 2 ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		}),
-
-		"odd": createPositionalPseudo(function( matchIndexes, length ) {
-			var i = 1;
-			for ( ; i < length; i += 2 ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		}),
-
-		"lt": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			var i = argument < 0 ? argument + length : argument;
-			for ( ; --i >= 0; ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		}),
-
-		"gt": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			var i = argument < 0 ? argument + length : argument;
-			for ( ; ++i < length; ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		})
-	}
-};
-
-Expr.pseudos["nth"] = Expr.pseudos["eq"];
-
-// Add button/input type pseudos
-for ( i in { radio: true, checkbox: true, file: true, password: true, image: true } ) {
-	Expr.pseudos[ i ] = createInputPseudo( i );
-}
-for ( i in { submit: true, reset: true } ) {
-	Expr.pseudos[ i ] = createButtonPseudo( i );
-}
-
-// Easy API for creating new setFilters
-function setFilters() {}
-setFilters.prototype = Expr.filters = Expr.pseudos;
-Expr.setFilters = new setFilters();
-
-tokenize = Sizzle.tokenize = function( selector, parseOnly ) {
-	var matched, match, tokens, type,
-		soFar, groups, preFilters,
-		cached = tokenCache[ selector + " " ];
-
-	if ( cached ) {
-		return parseOnly ? 0 : cached.slice( 0 );
-	}
-
-	soFar = selector;
-	groups = [];
-	preFilters = Expr.preFilter;
-
-	while ( soFar ) {
-
-		// Comma and first run
-		if ( !matched || (match = rcomma.exec( soFar )) ) {
-			if ( match ) {
-				// Don't consume trailing commas as valid
-				soFar = soFar.slice( match[0].length ) || soFar;
-			}
-			groups.push( (tokens = []) );
-		}
-
-		matched = false;
-
-		// Combinators
-		if ( (match = rcombinators.exec( soFar )) ) {
-			matched = match.shift();
-			tokens.push({
-				value: matched,
-				// Cast descendant combinators to space
-				type: match[0].replace( rtrim, " " )
-			});
-			soFar = soFar.slice( matched.length );
-		}
-
-		// Filters
-		for ( type in Expr.filter ) {
-			if ( (match = matchExpr[ type ].exec( soFar )) && (!preFilters[ type ] ||
-				(match = preFilters[ type ]( match ))) ) {
-				matched = match.shift();
-				tokens.push({
-					value: matched,
-					type: type,
-					matches: match
-				});
-				soFar = soFar.slice( matched.length );
-			}
-		}
-
-		if ( !matched ) {
-			break;
-		}
-	}
-
-	// Return the length of the invalid excess
-	// if we're just parsing
-	// Otherwise, throw an error or return tokens
-	return parseOnly ?
-		soFar.length :
-		soFar ?
-			Sizzle.error( selector ) :
-			// Cache the tokens
-			tokenCache( selector, groups ).slice( 0 );
-};
-
-function toSelector( tokens ) {
-	var i = 0,
-		len = tokens.length,
-		selector = "";
-	for ( ; i < len; i++ ) {
-		selector += tokens[i].value;
-	}
-	return selector;
-}
-
-function addCombinator( matcher, combinator, base ) {
-	var dir = combinator.dir,
-		checkNonElements = base && dir === "parentNode",
-		doneName = done++;
-
-	return combinator.first ?
-		// Check against closest ancestor/preceding element
-		function( elem, context, xml ) {
-			while ( (elem = elem[ dir ]) ) {
-				if ( elem.nodeType === 1 || checkNonElements ) {
-					return matcher( elem, context, xml );
-				}
-			}
-		} :
-
-		// Check against all ancestor/preceding elements
-		function( elem, context, xml ) {
-			var oldCache, outerCache,
-				newCache = [ dirruns, doneName ];
-
-			// We can't set arbitrary data on XML nodes, so they don't benefit from dir caching
-			if ( xml ) {
-				while ( (elem = elem[ dir ]) ) {
-					if ( elem.nodeType === 1 || checkNonElements ) {
-						if ( matcher( elem, context, xml ) ) {
-							return true;
-						}
-					}
-				}
-			} else {
-				while ( (elem = elem[ dir ]) ) {
-					if ( elem.nodeType === 1 || checkNonElements ) {
-						outerCache = elem[ expando ] || (elem[ expando ] = {});
-						if ( (oldCache = outerCache[ dir ]) &&
-							oldCache[ 0 ] === dirruns && oldCache[ 1 ] === doneName ) {
-
-							// Assign to newCache so results back-propagate to previous elements
-							return (newCache[ 2 ] = oldCache[ 2 ]);
-						} else {
-							// Reuse newcache so results back-propagate to previous elements
-							outerCache[ dir ] = newCache;
-
-							// A match means we're done; a fail means we have to keep checking
-							if ( (newCache[ 2 ] = matcher( elem, context, xml )) ) {
-								return true;
-							}
-						}
-					}
-				}
-			}
-		};
-}
-
-function elementMatcher( matchers ) {
-	return matchers.length > 1 ?
-		function( elem, context, xml ) {
-			var i = matchers.length;
-			while ( i-- ) {
-				if ( !matchers[i]( elem, context, xml ) ) {
-					return false;
-				}
-			}
-			return true;
-		} :
-		matchers[0];
-}
-
-function multipleContexts( selector, contexts, results ) {
-	var i = 0,
-		len = contexts.length;
-	for ( ; i < len; i++ ) {
-		Sizzle( selector, contexts[i], results );
-	}
-	return results;
-}
-
-function condense( unmatched, map, filter, context, xml ) {
-	var elem,
-		newUnmatched = [],
-		i = 0,
-		len = unmatched.length,
-		mapped = map != null;
-
-	for ( ; i < len; i++ ) {
-		if ( (elem = unmatched[i]) ) {
-			if ( !filter || filter( elem, context, xml ) ) {
-				newUnmatched.push( elem );
-				if ( mapped ) {
-					map.push( i );
-				}
-			}
-		}
-	}
-
-	return newUnmatched;
-}
-
-function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postSelector ) {
-	if ( postFilter && !postFilter[ expando ] ) {
-		postFilter = setMatcher( postFilter );
-	}
-	if ( postFinder && !postFinder[ expando ] ) {
-		postFinder = setMatcher( postFinder, postSelector );
-	}
-	return markFunction(function( seed, results, context, xml ) {
-		var temp, i, elem,
-			preMap = [],
-			postMap = [],
-			preexisting = results.length,
-
-			// Get initial elements from seed or context
-			elems = seed || multipleContexts( selector || "*", context.nodeType ? [ context ] : context, [] ),
-
-			// Prefilter to get matcher input, preserving a map for seed-results synchronization
-			matcherIn = preFilter && ( seed || !selector ) ?
-				condense( elems, preMap, preFilter, context, xml ) :
-				elems,
-
-			matcherOut = matcher ?
-				// If we have a postFinder, or filtered seed, or non-seed postFilter or preexisting results,
-				postFinder || ( seed ? preFilter : preexisting || postFilter ) ?
-
-					// ...intermediate processing is necessary
-					[] :
-
-					// ...otherwise use results directly
-					results :
-				matcherIn;
-
-		// Find primary matches
-		if ( matcher ) {
-			matcher( matcherIn, matcherOut, context, xml );
-		}
-
-		// Apply postFilter
-		if ( postFilter ) {
-			temp = condense( matcherOut, postMap );
-			postFilter( temp, [], context, xml );
-
-			// Un-match failing elements by moving them back to matcherIn
-			i = temp.length;
-			while ( i-- ) {
-				if ( (elem = temp[i]) ) {
-					matcherOut[ postMap[i] ] = !(matcherIn[ postMap[i] ] = elem);
-				}
-			}
-		}
-
-		if ( seed ) {
-			if ( postFinder || preFilter ) {
-				if ( postFinder ) {
-					// Get the final matcherOut by condensing this intermediate into postFinder contexts
-					temp = [];
-					i = matcherOut.length;
-					while ( i-- ) {
-						if ( (elem = matcherOut[i]) ) {
-							// Restore matcherIn since elem is not yet a final match
-							temp.push( (matcherIn[i] = elem) );
-						}
-					}
-					postFinder( null, (matcherOut = []), temp, xml );
-				}
-
-				// Move matched elements from seed to results to keep them synchronized
-				i = matcherOut.length;
-				while ( i-- ) {
-					if ( (elem = matcherOut[i]) &&
-						(temp = postFinder ? indexOf( seed, elem ) : preMap[i]) > -1 ) {
-
-						seed[temp] = !(results[temp] = elem);
-					}
-				}
-			}
-
-		// Add elements to results, through postFinder if defined
-		} else {
-			matcherOut = condense(
-				matcherOut === results ?
-					matcherOut.splice( preexisting, matcherOut.length ) :
-					matcherOut
-			);
-			if ( postFinder ) {
-				postFinder( null, results, matcherOut, xml );
-			} else {
-				push.apply( results, matcherOut );
-			}
-		}
-	});
-}
-
-function matcherFromTokens( tokens ) {
-	var checkContext, matcher, j,
-		len = tokens.length,
-		leadingRelative = Expr.relative[ tokens[0].type ],
-		implicitRelative = leadingRelative || Expr.relative[" "],
-		i = leadingRelative ? 1 : 0,
-
-		// The foundational matcher ensures that elements are reachable from top-level context(s)
-		matchContext = addCombinator( function( elem ) {
-			return elem === checkContext;
-		}, implicitRelative, true ),
-		matchAnyContext = addCombinator( function( elem ) {
-			return indexOf( checkContext, elem ) > -1;
-		}, implicitRelative, true ),
-		matchers = [ function( elem, context, xml ) {
-			var ret = ( !leadingRelative && ( xml || context !== outermostContext ) ) || (
-				(checkContext = context).nodeType ?
-					matchContext( elem, context, xml ) :
-					matchAnyContext( elem, context, xml ) );
-			// Avoid hanging onto element (issue #299)
-			checkContext = null;
-			return ret;
-		} ];
-
-	for ( ; i < len; i++ ) {
-		if ( (matcher = Expr.relative[ tokens[i].type ]) ) {
-			matchers = [ addCombinator(elementMatcher( matchers ), matcher) ];
-		} else {
-			matcher = Expr.filter[ tokens[i].type ].apply( null, tokens[i].matches );
-
-			// Return special upon seeing a positional matcher
-			if ( matcher[ expando ] ) {
-				// Find the next relative operator (if any) for proper handling
-				j = ++i;
-				for ( ; j < len; j++ ) {
-					if ( Expr.relative[ tokens[j].type ] ) {
-						break;
-					}
-				}
-				return setMatcher(
-					i > 1 && elementMatcher( matchers ),
-					i > 1 && toSelector(
-						// If the preceding token was a descendant combinator, insert an implicit any-element `*`
-						tokens.slice( 0, i - 1 ).concat({ value: tokens[ i - 2 ].type === " " ? "*" : "" })
-					).replace( rtrim, "$1" ),
-					matcher,
-					i < j && matcherFromTokens( tokens.slice( i, j ) ),
-					j < len && matcherFromTokens( (tokens = tokens.slice( j )) ),
-					j < len && toSelector( tokens )
-				);
-			}
-			matchers.push( matcher );
-		}
-	}
-
-	return elementMatcher( matchers );
-}
-
-function matcherFromGroupMatchers( elementMatchers, setMatchers ) {
-	var bySet = setMatchers.length > 0,
-		byElement = elementMatchers.length > 0,
-		superMatcher = function( seed, context, xml, results, outermost ) {
-			var elem, j, matcher,
-				matchedCount = 0,
-				i = "0",
-				unmatched = seed && [],
-				setMatched = [],
-				contextBackup = outermostContext,
-				// We must always have either seed elements or outermost context
-				elems = seed || byElement && Expr.find["TAG"]( "*", outermost ),
-				// Use integer dirruns iff this is the outermost matcher
-				dirrunsUnique = (dirruns += contextBackup == null ? 1 : Math.random() || 0.1),
-				len = elems.length;
-
-			if ( outermost ) {
-				outermostContext = context !== document && context;
-			}
-
-			// Add elements passing elementMatchers directly to results
-			// Keep `i` a string if there are no elements so `matchedCount` will be "00" below
-			// Support: IE<9, Safari
-			// Tolerate NodeList properties (IE: "length"; Safari: <number>) matching elements by id
-			for ( ; i !== len && (elem = elems[i]) != null; i++ ) {
-				if ( byElement && elem ) {
-					j = 0;
-					while ( (matcher = elementMatchers[j++]) ) {
-						if ( matcher( elem, context, xml ) ) {
-							results.push( elem );
-							break;
-						}
-					}
-					if ( outermost ) {
-						dirruns = dirrunsUnique;
-					}
-				}
-
-				// Track unmatched elements for set filters
-				if ( bySet ) {
-					// They will have gone through all possible matchers
-					if ( (elem = !matcher && elem) ) {
-						matchedCount--;
-					}
-
-					// Lengthen the array for every element, matched or not
-					if ( seed ) {
-						unmatched.push( elem );
-					}
-				}
-			}
-
-			// Apply set filters to unmatched elements
-			matchedCount += i;
-			if ( bySet && i !== matchedCount ) {
-				j = 0;
-				while ( (matcher = setMatchers[j++]) ) {
-					matcher( unmatched, setMatched, context, xml );
-				}
-
-				if ( seed ) {
-					// Reintegrate element matches to eliminate the need for sorting
-					if ( matchedCount > 0 ) {
-						while ( i-- ) {
-							if ( !(unmatched[i] || setMatched[i]) ) {
-								setMatched[i] = pop.call( results );
-							}
-						}
-					}
-
-					// Discard index placeholder values to get only actual matches
-					setMatched = condense( setMatched );
-				}
-
-				// Add matches to results
-				push.apply( results, setMatched );
-
-				// Seedless set matches succeeding multiple successful matchers stipulate sorting
-				if ( outermost && !seed && setMatched.length > 0 &&
-					( matchedCount + setMatchers.length ) > 1 ) {
-
-					Sizzle.uniqueSort( results );
-				}
-			}
-
-			// Override manipulation of globals by nested matchers
-			if ( outermost ) {
-				dirruns = dirrunsUnique;
-				outermostContext = contextBackup;
-			}
-
-			return unmatched;
-		};
-
-	return bySet ?
-		markFunction( superMatcher ) :
-		superMatcher;
-}
-
-compile = Sizzle.compile = function( selector, match /* Internal Use Only */ ) {
-	var i,
-		setMatchers = [],
-		elementMatchers = [],
-		cached = compilerCache[ selector + " " ];
-
-	if ( !cached ) {
-		// Generate a function of recursive functions that can be used to check each element
-		if ( !match ) {
-			match = tokenize( selector );
-		}
-		i = match.length;
-		while ( i-- ) {
-			cached = matcherFromTokens( match[i] );
-			if ( cached[ expando ] ) {
-				setMatchers.push( cached );
-			} else {
-				elementMatchers.push( cached );
-			}
-		}
-
-		// Cache the compiled function
-		cached = compilerCache( selector, matcherFromGroupMatchers( elementMatchers, setMatchers ) );
-
-		// Save selector and tokenization
-		cached.selector = selector;
-	}
-	return cached;
-};
-
-/**
- * A low-level selection function that works with Sizzle's compiled
- *  selector functions
- * @param {String|Function} selector A selector or a pre-compiled
- *  selector function built with Sizzle.compile
- * @param {Element} context
- * @param {Array} [results]
- * @param {Array} [seed] A set of elements to match against
- */
-select = Sizzle.select = function( selector, context, results, seed ) {
-	var i, tokens, token, type, find,
-		compiled = typeof selector === "function" && selector,
-		match = !seed && tokenize( (selector = compiled.selector || selector) );
-
-	results = results || [];
-
-	// Try to minimize operations if there is no seed and only one group
-	if ( match.length === 1 ) {
-
-		// Take a shortcut and set the context if the root selector is an ID
-		tokens = match[0] = match[0].slice( 0 );
-		if ( tokens.length > 2 && (token = tokens[0]).type === "ID" &&
-				support.getById && context.nodeType === 9 && documentIsHTML &&
-				Expr.relative[ tokens[1].type ] ) {
-
-			context = ( Expr.find["ID"]( token.matches[0].replace(runescape, funescape), context ) || [] )[0];
-			if ( !context ) {
-				return results;
-
-			// Precompiled matchers will still verify ancestry, so step up a level
-			} else if ( compiled ) {
-				context = context.parentNode;
-			}
-
-			selector = selector.slice( tokens.shift().value.length );
-		}
-
-		// Fetch a seed set for right-to-left matching
-		i = matchExpr["needsContext"].test( selector ) ? 0 : tokens.length;
-		while ( i-- ) {
-			token = tokens[i];
-
-			// Abort if we hit a combinator
-			if ( Expr.relative[ (type = token.type) ] ) {
-				break;
-			}
-			if ( (find = Expr.find[ type ]) ) {
-				// Search, expanding context for leading sibling combinators
-				if ( (seed = find(
-					token.matches[0].replace( runescape, funescape ),
-					rsibling.test( tokens[0].type ) && testContext( context.parentNode ) || context
-				)) ) {
-
-					// If seed is empty or no tokens remain, we can return early
-					tokens.splice( i, 1 );
-					selector = seed.length && toSelector( tokens );
-					if ( !selector ) {
-						push.apply( results, seed );
-						return results;
-					}
-
-					break;
-				}
-			}
-		}
-	}
-
-	// Compile and execute a filtering function if one is not provided
-	// Provide `match` to avoid retokenization if we modified the selector above
-	( compiled || compile( selector, match ) )(
-		seed,
-		context,
-		!documentIsHTML,
-		results,
-		rsibling.test( selector ) && testContext( context.parentNode ) || context
-	);
-	return results;
-};
-
-// One-time assignments
-
-// Sort stability
-support.sortStable = expando.split("").sort( sortOrder ).join("") === expando;
-
-// Support: Chrome 14-35+
-// Always assume duplicates if they aren't passed to the comparison function
-support.detectDuplicates = !!hasDuplicate;
-
-// Initialize against the default document
-setDocument();
-
-// Support: Webkit<537.32 - Safari 6.0.3/Chrome 25 (fixed in Chrome 27)
-// Detached nodes confoundingly follow *each other*
-support.sortDetached = assert(function( div1 ) {
-	// Should return 1, but returns 4 (following)
-	return div1.compareDocumentPosition( document.createElement("div") ) & 1;
-});
-
-// Support: IE<8
-// Prevent attribute/property "interpolation"
-// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx
-if ( !assert(function( div ) {
-	div.innerHTML = "<a href='#'></a>";
-	return div.firstChild.getAttribute("href") === "#" ;
-}) ) {
-	addHandle( "type|href|height|width", function( elem, name, isXML ) {
-		if ( !isXML ) {
-			return elem.getAttribute( name, name.toLowerCase() === "type" ? 1 : 2 );
-		}
-	});
-}
-
-// Support: IE<9
-// Use defaultValue in place of getAttribute("value")
-if ( !support.attributes || !assert(function( div ) {
-	div.innerHTML = "<input/>";
-	div.firstChild.setAttribute( "value", "" );
-	return div.firstChild.getAttribute( "value" ) === "";
-}) ) {
-	addHandle( "value", function( elem, name, isXML ) {
-		if ( !isXML && elem.nodeName.toLowerCase() === "input" ) {
-			return elem.defaultValue;
-		}
-	});
-}
-
-// Support: IE<9
-// Use getAttributeNode to fetch booleans when getAttribute lies
-if ( !assert(function( div ) {
-	return div.getAttribute("disabled") == null;
-}) ) {
-	addHandle( booleans, function( elem, name, isXML ) {
-		var val;
-		if ( !isXML ) {
-			return elem[ name ] === true ? name.toLowerCase() :
-					(val = elem.getAttributeNode( name )) && val.specified ?
-					val.value :
-				null;
-		}
-	});
-}
-
-return Sizzle;
-
-})( window );
-
-
-
-jQuery.find = Sizzle;
-jQuery.expr = Sizzle.selectors;
-jQuery.expr[":"] = jQuery.expr.pseudos;
-jQuery.unique = Sizzle.uniqueSort;
-jQuery.text = Sizzle.getText;
-jQuery.isXMLDoc = Sizzle.isXML;
-jQuery.contains = Sizzle.contains;
-
-
-
-var rneedsContext = jQuery.expr.match.needsContext;
-
-var rsingleTag = (/^<(\w+)\s*\/?>(?:<\/\1>|)$/);
-
-
-
-var risSimple = /^.[^:#\[\.,]*$/;
-
-// Implement the identical functionality for filter and not
-function winnow( elements, qualifier, not ) {
-	if ( jQuery.isFunction( qualifier ) ) {
-		return jQuery.grep( elements, function( elem, i ) {
-			/* jshint -W018 */
-			return !!qualifier.call( elem, i, elem ) !== not;
-		});
-
-	}
-
-	if ( qualifier.nodeType ) {
-		return jQuery.grep( elements, function( elem ) {
-			return ( elem === qualifier ) !== not;
-		});
-
-	}
-
-	if ( typeof qualifier === "string" ) {
-		if ( risSimple.test( qualifier ) ) {
-			return jQuery.filter( qualifier, elements, not );
-		}
-
-		qualifier = jQuery.filter( qualifier, elements );
-	}
-
-	return jQuery.grep( elements, function( elem ) {
-		return ( jQuery.inArray( elem, qualifier ) >= 0 ) !== not;
-	});
-}
-
-jQuery.filter = function( expr, elems, not ) {
-	var elem = elems[ 0 ];
-
-	if ( not ) {
-		expr = ":not(" + expr + ")";
-	}
-
-	return elems.length === 1 && elem.nodeType === 1 ?
-		jQuery.find.matchesSelector( elem, expr ) ? [ elem ] : [] :
-		jQuery.find.matches( expr, jQuery.grep( elems, function( elem ) {
-			return elem.nodeType === 1;
-		}));
-};
-
-jQuery.fn.extend({
-	find: function( selector ) {
-		var i,
-			ret = [],
-			self = this,
-			len = self.length;
-
-		if ( typeof selector !== "string" ) {
-			return this.pushStack( jQuery( selector ).filter(function() {
-				for ( i = 0; i < len; i++ ) {
-					if ( jQuery.contains( self[ i ], this ) ) {
-						return true;
-					}
-				}
-			}) );
-		}
-
-		for ( i = 0; i < len; i++ ) {
-			jQuery.find( selector, self[ i ], ret );
-		}
-
-		// Needed because $( selector, context ) becomes $( context ).find( selector )
-		ret = this.pushStack( len > 1 ? jQuery.unique( ret ) : ret );
-		ret.selector = this.selector ? this.selector + " " + selector : selector;
-		return ret;
-	},
-	filter: function( selector ) {
-		return this.pushStack( winnow(this, selector || [], false) );
-	},
-	not: function( selector ) {
-		return this.pushStack( winnow(this, selector || [], true) );
-	},
-	is: function( selector ) {
-		return !!winnow(
-			this,
-
-			// If this is a positional/relative selector, check membership in the returned set
-			// so $("p:first").is("p:last") won't return true for a doc with two "p".
-			typeof selector === "string" && rneedsContext.test( selector ) ?
-				jQuery( selector ) :
-				selector || [],
-			false
-		).length;
-	}
-});
-
-
-// Initialize a jQuery object
-
-
-// A central reference to the root jQuery(document)
-var rootjQuery,
-
-	// Use the correct document accordingly with window argument (sandbox)
-	document = window.document,
-
-	// A simple way to check for HTML strings
-	// Prioritize #id over <tag> to avoid XSS via location.hash (#9521)
-	// Strict HTML recognition (#11290: must start with <)
-	rquickExpr = /^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,
-
-	init = jQuery.fn.init = function( selector, context ) {
-		var match, elem;
-
-		// HANDLE: $(""), $(null), $(undefined), $(false)
-		if ( !selector ) {
-			return this;
-		}
-
-		// Handle HTML strings
-		if ( typeof selector === "string" ) {
-			if ( selector.charAt(0) === "<" && selector.charAt( selector.length - 1 ) === ">" && selector.length >= 3 ) {
-				// Assume that strings that start and end with <> are HTML and skip the regex check
-				match = [ null, selector, null ];
-
-			} else {
-				match = rquickExpr.exec( selector );
-			}
-
-			// Match html or make sure no context is specified for #id
-			if ( match && (match[1] || !context) ) {
-
-				// HANDLE: $(html) -> $(array)
-				if ( match[1] ) {
-					context = context instanceof jQuery ? context[0] : context;
-
-					// scripts is true for back-compat
-					// Intentionally let the error be thrown if parseHTML is not present
-					jQuery.merge( this, jQuery.parseHTML(
-						match[1],
-						context && context.nodeType ? context.ownerDocument || context : document,
-						true
-					) );
-
-					// HANDLE: $(html, props)
-					if ( rsingleTag.test( match[1] ) && jQuery.isPlainObject( context ) ) {
-						for ( match in context ) {
-							// Properties of context are called as methods if possible
-							if ( jQuery.isFunction( this[ match ] ) ) {
-								this[ match ]( context[ match ] );
-
-							// ...and otherwise set as attributes
-							} else {
-								this.attr( match, context[ match ] );
-							}
-						}
-					}
-
-					return this;
-
-				// HANDLE: $(#id)
-				} else {
-					elem = document.getElementById( match[2] );
-
-					// Check parentNode to catch when Blackberry 4.6 returns
-					// nodes that are no longer in the document #6963
-					if ( elem && elem.parentNode ) {
-						// Handle the case where IE and Opera return items
-						// by name instead of ID
-						if ( elem.id !== match[2] ) {
-							return rootjQuery.find( selector );
-						}
-
-						// Otherwise, we inject the element directly into the jQuery object
-						this.length = 1;
-						this[0] = elem;
-					}
-
-					this.context = document;
-					this.selector = selector;
-					return this;
-				}
-
-			// HANDLE: $(expr, $(...))
-			} else if ( !context || context.jquery ) {
-				return ( context || rootjQuery ).find( selector );
-
-			// HANDLE: $(expr, context)
-			// (which is just equivalent to: $(context).find(expr)
-			} else {
-				return this.constructor( context ).find( selector );
-			}
-
-		// HANDLE: $(DOMElement)
-		} else if ( selector.nodeType ) {
-			this.context = this[0] = selector;
-			this.length = 1;
-			return this;
-
-		// HANDLE: $(function)
-		// Shortcut for document ready
-		} else if ( jQuery.isFunction( selector ) ) {
-			return typeof rootjQuery.ready !== "undefined" ?
-				rootjQuery.ready( selector ) :
-				// Execute immediately if ready is not present
-				selector( jQuery );
-		}
-
-		if ( selector.selector !== undefined ) {
-			this.selector = selector.selector;
-			this.context = selector.context;
-		}
-
-		return jQuery.makeArray( selector, this );
-	};
-
-// Give the init function the jQuery prototype for later instantiation
-init.prototype = jQuery.fn;
-
-// Initialize central reference
-rootjQuery = jQuery( document );
-
-
-var rparentsprev = /^(?:parents|prev(?:Until|All))/,
-	// methods guaranteed to produce a unique set when starting from a unique set
-	guaranteedUnique = {
-		children: true,
-		contents: true,
-		next: true,
-		prev: true
-	};
-
-jQuery.extend({
-	dir: function( elem, dir, until ) {
-		var matched = [],
-			cur = elem[ dir ];
-
-		while ( cur && cur.nodeType !== 9 && (until === undefined || cur.nodeType !== 1 || !jQuery( cur ).is( until )) ) {
-			if ( cur.nodeType === 1 ) {
-				matched.push( cur );
-			}
-			cur = cur[dir];
-		}
-		return matched;
-	},
-
-	sibling: function( n, elem ) {
-		var r = [];
-
-		for ( ; n; n = n.nextSibling ) {
-			if ( n.nodeType === 1 && n !== elem ) {
-				r.push( n );
-			}
-		}
-
-		return r;
-	}
-});
-
-jQuery.fn.extend({
-	has: function( target ) {
-		var i,
-			targets = jQuery( target, this ),
-			len = targets.length;
-
-		return this.filter(function() {
-			for ( i = 0; i < len; i++ ) {
-				if ( jQuery.contains( this, targets[i] ) ) {
-					return true;
-				}
-			}
-		});
-	},
-
-	closest: function( selectors, context ) {
-		var cur,
-			i = 0,
-			l = this.length,
-			matched = [],
-			pos = rneedsContext.test( selectors ) || typeof selectors !== "string" ?
-				jQuery( selectors, context || this.context ) :
-				0;
-
-		for ( ; i < l; i++ ) {
-			for ( cur = this[i]; cur && cur !== context; cur = cur.parentNode ) {
-				// Always skip document fragments
-				if ( cur.nodeType < 11 && (pos ?
-					pos.index(cur) > -1 :
-
-					// Don't pass non-elements to Sizzle
-					cur.nodeType === 1 &&
-						jQuery.find.matchesSelector(cur, selectors)) ) {
-
-					matched.push( cur );
-					break;
-				}
-			}
-		}
-
-		return this.pushStack( matched.length > 1 ? jQuery.unique( matched ) : matched );
-	},
-
-	// Determine the position of an element within
-	// the matched set of elements
-	index: function( elem ) {
-
-		// No argument, return index in parent
-		if ( !elem ) {
-			return ( this[0] && this[0].parentNode ) ? this.first().prevAll().length : -1;
-		}
-
-		// index in selector
-		if ( typeof elem === "string" ) {
-			return jQuery.inArray( this[0], jQuery( elem ) );
-		}
-
-		// Locate the position of the desired element
-		return jQuery.inArray(
-			// If it receives a jQuery object, the first element is used
-			elem.jquery ? elem[0] : elem, this );
-	},
-
-	add: function( selector, context ) {
-		return this.pushStack(
-			jQuery.unique(
-				jQuery.merge( this.get(), jQuery( selector, context ) )
-			)
-		);
-	},
-
-	addBack: function( selector ) {
-		return this.add( selector == null ?
-			this.prevObject : this.prevObject.filter(selector)
-		);
-	}
-});
-
-function sibling( cur, dir ) {
-	do {
-		cur = cur[ dir ];
-	} while ( cur && cur.nodeType !== 1 );
-
-	return cur;
-}
-
-jQuery.each({
-	parent: function( elem ) {
-		var parent = elem.parentNode;
-		return parent && parent.nodeType !== 11 ? parent : null;
-	},
-	parents: function( elem ) {
-		return jQuery.dir( elem, "parentNode" );
-	},
-	parentsUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "parentNode", until );
-	},
-	next: function( elem ) {
-		return sibling( elem, "nextSibling" );
-	},
-	prev: function( elem ) {
-		return sibling( elem, "previousSibling" );
-	},
-	nextAll: function( elem ) {
-		return jQuery.dir( elem, "nextSibling" );
-	},
-	prevAll: function( elem ) {
-		return jQuery.dir( elem, "previousSibling" );
-	},
-	nextUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "nextSibling", until );
-	},
-	prevUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "previousSibling", until );
-	},
-	siblings: function( elem ) {
-		return jQuery.sibling( ( elem.parentNode || {} ).firstChild, elem );
-	},
-	children: function( elem ) {
-		return jQuery.sibling( elem.firstChild );
-	},
-	contents: function( elem ) {
-		return jQuery.nodeName( elem, "iframe" ) ?
-			elem.contentDocument || elem.contentWindow.document :
-			jQuery.merge( [], elem.childNodes );
-	}
-}, function( name, fn ) {
-	jQuery.fn[ name ] = function( until, selector ) {
-		var ret = jQuery.map( this, fn, until );
-
-		if ( name.slice( -5 ) !== "Until" ) {
-			selector = until;
-		}
-
-		if ( selector && typeof selector === "string" ) {
-			ret = jQuery.filter( selector, ret );
-		}
-
-		if ( this.length > 1 ) {
-			// Remove duplicates
-			if ( !guaranteedUnique[ name ] ) {
-				ret = jQuery.unique( ret );
-			}
-
-			// Reverse order for parents* and prev-derivatives
-			if ( rparentsprev.test( name ) ) {
-				ret = ret.reverse();
-			}
-		}
-
-		return this.pushStack( ret );
-	};
-});
-var rnotwhite = (/\S+/g);
-
-
-
-// String to Object options format cache
-var optionsCache = {};
-
-// Convert String-formatted options into Object-formatted ones and store in cache
-function createOptions( options ) {
-	var object = optionsCache[ options ] = {};
-	jQuery.each( options.match( rnotwhite ) || [], function( _, flag ) {
-		object[ flag ] = true;
-	});
-	return object;
-}
-
-/*
- * Create a callback list using the following parameters:
- *
- *	options: an optional list of space-separated options that will change how
- *			the callback list behaves or a more traditional option object
- *
- * By default a callback list will act like an event callback list and can be
- * "fired" multiple times.
- *
- * Possible options:
- *
- *	once:			will ensure the callback list can only be fired once (like a Deferred)
- *
- *	memory:			will keep track of previous values and will call any callback added
- *					after the list has been fired right away with the latest "memorized"
- *					values (like a Deferred)
- *
- *	unique:			will ensure a callback can only be added once (no duplicate in the list)
- *
- *	stopOnFalse:	interrupt callings when a callback returns false
- *
- */
-jQuery.Callbacks = function( options ) {
-
-	// Convert options from String-formatted to Object-formatted if needed
-	// (we check in cache first)
-	options = typeof options === "string" ?
-		( optionsCache[ options ] || createOptions( options ) ) :
-		jQuery.extend( {}, options );
-
-	var // Flag to know if list is currently firing
-		firing,
-		// Last fire value (for non-forgettable lists)
-		memory,
-		// Flag to know if list was already fired
-		fired,
-		// End of the loop when firing
-		firingLength,
-		// Index of currently firing callback (modified by remove if needed)
-		firingIndex,
-		// First callback to fire (used internally by add and fireWith)
-		firingStart,
-		// Actual callback list
-		list = [],
-		// Stack of fire calls for repeatable lists
-		stack = !options.once && [],
-		// Fire callbacks
-		fire = function( data ) {
-			memory = options.memory && data;
-			fired = true;
-			firingIndex = firingStart || 0;
-			firingStart = 0;
-			firingLength = list.length;
-			firing = true;
-			for ( ; list && firingIndex < firingLength; firingIndex++ ) {
-				if ( list[ firingIndex ].apply( data[ 0 ], data[ 1 ] ) === false && options.stopOnFalse ) {
-					memory = false; // To prevent further calls using add
-					break;
-				}
-			}
-			firing = false;
-			if ( list ) {
-				if ( stack ) {
-					if ( stack.length ) {
-						fire( stack.shift() );
-					}
-				} else if ( memory ) {
-					list = [];
-				} else {
-					self.disable();
-				}
-			}
-		},
-		// Actual Callbacks object
-		self = {
-			// Add a callback or a collection of callbacks to the list
-			add: function() {
-				if ( list ) {
-					// First, we save the current length
-					var start = list.length;
-					(function add( args ) {
-						jQuery.each( args, function( _, arg ) {
-							var type = jQuery.type( arg );
-							if ( type === "function" ) {
-								if ( !options.unique || !self.has( arg ) ) {
-									list.push( arg );
-								}
-							} else if ( arg && arg.length && type !== "string" ) {
-								// Inspect recursively
-								add( arg );
-							}
-						});
-					})( arguments );
-					// Do we need to add the callbacks to the
-					// current firing batch?
-					if ( firing ) {
-						firingLength = list.length;
-					// With memory, if we're not firing then
-					// we should call right away
-					} else if ( memory ) {
-						firingStart = start;
-						fire( memory );
-					}
-				}
-				return this;
-			},
-			// Remove a callback from the list
-			remove: function() {
-				if ( list ) {
-					jQuery.each( arguments, function( _, arg ) {
-						var index;
-						while ( ( index = jQuery.inArray( arg, list, index ) ) > -1 ) {
-							list.splice( index, 1 );
-							// Handle firing indexes
-							if ( firing ) {
-								if ( index <= firingLength ) {
-									firingLength--;
-								}
-								if ( index <= firingIndex ) {
-									firingIndex--;
-								}
-							}
-						}
-					});
-				}
-				return this;
-			},
-			// Check if a given callback is in the list.
-			// If no argument is given, return whether or not list has callbacks attached.
-			has: function( fn ) {
-				return fn ? jQuery.inArray( fn, list ) > -1 : !!( list && list.length );
-			},
-			// Remove all callbacks from the list
-			empty: function() {
-				list = [];
-				firingLength = 0;
-				return this;
-			},
-			// Have the list do nothing anymore
-			disable: function() {
-				list = stack = memory = undefined;
-				return this;
-			},
-			// Is it disabled?
-			disabled: function() {
-				return !list;
-			},
-			// Lock the list in its current state
-			lock: function() {
-				stack = undefined;
-				if ( !memory ) {
-					self.disable();
-				}
-				return this;
-			},
-			// Is it locked?
-			locked: function() {
-				return !stack;
-			},
-			// Call all callbacks with the given context and arguments
-			fireWith: function( context, args ) {
-				if ( list && ( !fired || stack ) ) {
-					args = args || [];
-					args = [ context, args.slice ? args.slice() : args ];
-					if ( firing ) {
-						stack.push( args );
-					} else {
-						fire( args );
-					}
-				}
-				return this;
-			},
-			// Call all the callbacks with the given arguments
-			fire: function() {
-				self.fireWith( this, arguments );
-				return this;
-			},
-			// To know if the callbacks have already been called at least once
-			fired: function() {
-				return !!fired;
-			}
-		};
-
-	return self;
-};
-
-
-jQuery.extend({
-
-	Deferred: function( func ) {
-		var tuples = [
-				// action, add listener, listener list, final state
-				[ "resolve", "done", jQuery.Callbacks("once memory"), "resolved" ],
-				[ "reject", "fail", jQuery.Callbacks("once memory"), "rejected" ],
-				[ "notify", "progress", jQuery.Callbacks("memory") ]
-			],
-			state = "pending",
-			promise = {
-				state: function() {
-					return state;
-				},
-				always: function() {
-					deferred.done( arguments ).fail( arguments );
-					return this;
-				},
-				then: function( /* fnDone, fnFail, fnProgress */ ) {
-					var fns = arguments;
-					return jQuery.Deferred(function( newDefer ) {
-						jQuery.each( tuples, function( i, tuple ) {
-							var fn = jQuery.isFunction( fns[ i ] ) && fns[ i ];
-							// deferred[ done | fail | progress ] for forwarding actions to newDefer
-							deferred[ tuple[1] ](function() {
-								var returned = fn && fn.apply( this, arguments );
-								if ( returned && jQuery.isFunction( returned.promise ) ) {
-									returned.promise()
-										.done( newDefer.resolve )
-										.fail( newDefer.reject )
-										.progress( newDefer.notify );
-								} else {
-									newDefer[ tuple[ 0 ] + "With" ]( this === promise ? newDefer.promise() : this, fn ? [ returned ] : arguments );
-								}
-							});
-						});
-						fns = null;
-					}).promise();
-				},
-				// Get a promise for this deferred
-				// If obj is provided, the promise aspect is added to the object
-				promise: function( obj ) {
-					return obj != null ? jQuery.extend( obj, promise ) : promise;
-				}
-			},
-			deferred = {};
-
-		// Keep pipe for back-compat
-		promise.pipe = promise.then;
-
-		// Add list-specific methods
-		jQuery.each( tuples, function( i, tuple ) {
-			var list = tuple[ 2 ],
-				stateString = tuple[ 3 ];
-
-			// promise[ done | fail | progress ] = list.add
-			promise[ tuple[1] ] = list.add;
-
-			// Handle state
-			if ( stateString ) {
-				list.add(function() {
-					// state = [ resolved | rejected ]
-					state = stateString;
-
-				// [ reject_list | resolve_list ].disable; progress_list.lock
-				}, tuples[ i ^ 1 ][ 2 ].disable, tuples[ 2 ][ 2 ].lock );
-			}
-
-			// deferred[ resolve | reject | notify ]
-			deferred[ tuple[0] ] = function() {
-				deferred[ tuple[0] + "With" ]( this === deferred ? promise : this, arguments );
-				return this;
-			};
-			deferred[ tuple[0] + "With" ] = list.fireWith;
-		});
-
-		// Make the deferred a promise
-		promise.promise( deferred );
-
-		// Call given func if any
-		if ( func ) {
-			func.call( deferred, deferred );
-		}
-
-		// All done!
-		return deferred;
-	},
-
-	// Deferred helper
-	when: function( subordinate /* , ..., subordinateN */ ) {
-		var i = 0,
-			resolveValues = slice.call( arguments ),
-			length = resolveValues.length,
-
-			// the count of uncompleted subordinates
-			remaining = length !== 1 || ( subordinate && jQuery.isFunction( subordinate.promise ) ) ? length : 0,
-
-			// the master Deferred. If resolveValues consist of only a single Deferred, just use that.
-			deferred = remaining === 1 ? subordinate : jQuery.Deferred(),
-
-			// Update function for both resolve and progress values
-			updateFunc = function( i, contexts, values ) {
-				return function( value ) {
-					contexts[ i ] = this;
-					values[ i ] = arguments.length > 1 ? slice.call( arguments ) : value;
-					if ( values === progressValues ) {
-						deferred.notifyWith( contexts, values );
-
-					} else if ( !(--remaining) ) {
-						deferred.resolveWith( contexts, values );
-					}
-				};
-			},
-
-			progressValues, progressContexts, resolveContexts;
-
-		// add listeners to Deferred subordinates; treat others as resolved
-		if ( length > 1 ) {
-			progressValues = new Array( length );
-			progressContexts = new Array( length );
-			resolveContexts = new Array( length );
-			for ( ; i < length; i++ ) {
-				if ( resolveValues[ i ] && jQuery.isFunction( resolveValues[ i ].promise ) ) {
-					resolveValues[ i ].promise()
-						.done( updateFunc( i, resolveContexts, resolveValues ) )
-						.fail( deferred.reject )
-						.progress( updateFunc( i, progressContexts, progressValues ) );
-				} else {
-					--remaining;
-				}
-			}
-		}
-
-		// if we're not waiting on anything, resolve the master
-		if ( !remaining ) {
-			deferred.resolveWith( resolveContexts, resolveValues );
-		}
-
-		return deferred.promise();
-	}
-});
-
-
-// The deferred used on DOM ready
-var readyList;
-
-jQuery.fn.ready = function( fn ) {
-	// Add the callback
-	jQuery.ready.promise().done( fn );
-
-	return this;
-};
-
-jQuery.extend({
-	// Is the DOM ready to be used? Set to true once it occurs.
-	isReady: false,
-
-	// A counter to track how many items to wait for before
-	// the ready event fires. See #6781
-	readyWait: 1,
-
-	// Hold (or release) the ready event
-	holdReady: function( hold ) {
-		if ( hold ) {
-			jQuery.readyWait++;
-		} else {
-			jQuery.ready( true );
-		}
-	},
-
-	// Handle when the DOM is ready
-	ready: function( wait ) {
-
-		// Abort if there are pending holds or we're already ready
-		if ( wait === true ? --jQuery.readyWait : jQuery.isReady ) {
-			return;
-		}
-
-		// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
-		if ( !document.body ) {
-			return setTimeout( jQuery.ready );
-		}
-
-		// Remember that the DOM is ready
-		jQuery.isReady = true;
-
-		// If a normal DOM Ready event fired, decrement, and wait if need be
-		if ( wait !== true && --jQuery.readyWait > 0 ) {
-			return;
-		}
-
-		// If there are functions bound, to execute
-		readyList.resolveWith( document, [ jQuery ] );
-
-		// Trigger any bound ready events
-		if ( jQuery.fn.triggerHandler ) {
-			jQuery( document ).triggerHandler( "ready" );
-			jQuery( document ).off( "ready" );
-		}
-	}
-});
-
-/**
- * Clean-up method for dom ready events
- */
-function detach() {
-	if ( document.addEventListener ) {
-		document.removeEventListener( "DOMContentLoaded", completed, false );
-		window.removeEventListener( "load", completed, false );
-
-	} else {
-		document.detachEvent( "onreadystatechange", completed );
-		window.detachEvent( "onload", completed );
-	}
-}
-
-/**
- * The ready event handler and self cleanup method
- */
-function completed() {
-	// readyState === "complete" is good enough for us to call the dom ready in oldIE
-	if ( document.addEventListener || event.type === "load" || document.readyState === "complete" ) {
-		detach();
-		jQuery.ready();
-	}
-}
-
-jQuery.ready.promise = function( obj ) {
-	if ( !readyList ) {
-
-		readyList = jQuery.Deferred();
-
-		// Catch cases where $(document).ready() is called after the browser event has already occurred.
-		// we once tried to use readyState "interactive" here, but it caused issues like the one
-		// discovered by ChrisS here: http://bugs.jquery.com/ticket/12282#comment:15
-		if ( document.readyState === "complete" ) {
-			// Handle it asynchronously to allow scripts the opportunity to delay ready
-			setTimeout( jQuery.ready );
-
-		// Standards-based browsers support DOMContentLoaded
-		} else if ( document.addEventListener ) {
-			// Use the handy event callback
-			document.addEventListener( "DOMContentLoaded", completed, false );
-
-			// A fallback to window.onload, that will always work
-			window.addEventListener( "load", completed, false );
-
-		// If IE event model is used
-		} else {
-			// Ensure firing before onload, maybe late but safe also for iframes
-			document.attachEvent( "onreadystatechange", completed );
-
-			// A fallback to window.onload, that will always work
-			window.attachEvent( "onload", completed );
-
-			// If IE and not a frame
-			// continually check to see if the document is ready
-			var top = false;
-
-			try {
-				top = window.frameElement == null && document.documentElement;
-			} catch(e) {}
-
-			if ( top && top.doScroll ) {
-				(function doScrollCheck() {
-					if ( !jQuery.isReady ) {
-
-						try {
-							// Use the trick by Diego Perini
-							// http://javascript.nwbox.com/IEContentLoaded/
-							top.doScroll("left");
-						} catch(e) {
-							return setTimeout( doScrollCheck, 50 );
-						}
-
-						// detach all dom ready events
-						detach();
-
-						// and execute any waiting functions
-						jQuery.ready();
-					}
-				})();
-			}
-		}
-	}
-	return readyList.promise( obj );
-};
-
-
-var strundefined = typeof undefined;
-
-
-
-// Support: IE<9
-// Iteration over object's inherited properties before its own
-var i;
-for ( i in jQuery( support ) ) {
-	break;
-}
-support.ownLast = i !== "0";
-
-// Note: most support tests are defined in their respective modules.
-// false until the test is run
-support.inlineBlockNeedsLayout = false;
-
-// Execute ASAP in case we need to set body.style.zoom
-jQuery(function() {
-	// Minified: var a,b,c,d
-	var val, div, body, container;
-
-	body = document.getElementsByTagName( "body" )[ 0 ];
-	if ( !body || !body.style ) {
-		// Return for frameset docs that don't have a body
-		return;
-	}
-
-	// Setup
-	div = document.createElement( "div" );
-	container = document.createElement( "div" );
-	container.style.cssText = "position:absolute;border:0;width:0;height:0;top:0;left:-9999px";
-	body.appendChild( container ).appendChild( div );
-
-	if ( typeof div.style.zoom !== strundefined ) {
-		// Support: IE<8
-		// Check if natively block-level elements act like inline-block
-		// elements when setting their display to 'inline' and giving
-		// them layout
-		div.style.cssText = "display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1";
-
-		support.inlineBlockNeedsLayout = val = div.offsetWidth === 3;
-		if ( val ) {
-			// Prevent IE 6 from affecting layout for positioned elements #11048
-			// Prevent IE from shrinking the body in IE 7 mode #12869
-			// Support: IE<8
-			body.style.zoom = 1;
-		}
-	}
-
-	body.removeChild( container );
-});
-
-
-
-
-(function() {
-	var div = document.createElement( "div" );
-
-	// Execute the test only if not already executed in another module.
-	if (support.deleteExpando == null) {
-		// Support: IE<9
-		support.deleteExpando = true;
-		try {
-			delete div.test;
-		} catch( e ) {
-			support.deleteExpando = false;
-		}
-	}
-
-	// Null elements to avoid leaks in IE.
-	div = null;
-})();
-
-
-/**
- * Determines whether an object can have data
- */
-jQuery.acceptData = function( elem ) {
-	var noData = jQuery.noData[ (elem.nodeName + " ").toLowerCase() ],
-		nodeType = +elem.nodeType || 1;
-
-	// Do not set data on non-element DOM nodes because it will not be cleared (#8335).
-	return nodeType !== 1 && nodeType !== 9 ?
-		false :
-
-		// Nodes accept data unless otherwise specified; rejection can be conditional
-		!noData || noData !== true && elem.getAttribute("classid") === noData;
-};
-
-
-var rbrace = /^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,
-	rmultiDash = /([A-Z])/g;
-
-function dataAttr( elem, key, data ) {
-	// If nothing was found internally, try to fetch any
-	// data from the HTML5 data-* attribute
-	if ( data === undefined && elem.nodeType === 1 ) {
-
-		var name = "data-" + key.replace( rmultiDash, "-$1" ).toLowerCase();
-
-		data = elem.getAttribute( name );
-
-		if ( typeof data === "string" ) {
-			try {
-				data = data === "true" ? true :
-					data === "false" ? false :
-					data === "null" ? null :
-					// Only convert to a number if it doesn't change the string
-					+data + "" === data ? +data :
-					rbrace.test( data ) ? jQuery.parseJSON( data ) :
-					data;
-			} catch( e ) {}
-
-			// Make sure we set the data so it isn't changed later
-			jQuery.data( elem, key, data );
-
-		} else {
-			data = undefined;
-		}
-	}
-
-	return data;
-}
-
-// checks a cache object for emptiness
-function isEmptyDataObject( obj ) {
-	var name;
-	for ( name in obj ) {
-
-		// if the public data object is empty, the private is still empty
-		if ( name === "data" && jQuery.isEmptyObject( obj[name] ) ) {
-			continue;
-		}
-		if ( name !== "toJSON" ) {
-			return false;
-		}
-	}
-
-	return true;
-}
-
-function internalData( elem, name, data, pvt /* Internal Use Only */ ) {
-	if ( !jQuery.acceptData( elem ) ) {
-		return;
-	}
-
-	var ret, thisCache,
-		internalKey = jQuery.expando,
-
-		// We have to handle DOM nodes and JS objects differently because IE6-7
-		// can't GC object references properly across the DOM-JS boundary
-		isNode = elem.nodeType,
-
-		// Only DOM nodes need the global jQuery cache; JS object data is
-		// attached directly to the object so GC can occur automatically
-		cache = isNode ? jQuery.cache : elem,
-
-		// Only defining an ID for JS objects if its cache already exists allows
-		// the code to shortcut on the same path as a DOM node with no cache
-		id = isNode ? elem[ internalKey ] : elem[ internalKey ] && internalKey;
-
-	// Avoid doing any more work than we need to when trying to get data on an
-	// object that has no data at all
-	if ( (!id || !cache[id] || (!pvt && !cache[id].data)) && data === undefined && typeof name === "string" ) {
-		return;
-	}
-
-	if ( !id ) {
-		// Only DOM nodes need a new unique ID for each element since their data
-		// ends up in the global cache
-		if ( isNode ) {
-			id = elem[ internalKey ] = deletedIds.pop() || jQuery.guid++;
-		} else {
-			id = internalKey;
-		}
-	}
-
-	if ( !cache[ id ] ) {
-		// Avoid exposing jQuery metadata on plain JS objects when the object
-		// is serialized using JSON.stringify
-		cache[ id ] = isNode ? {} : { toJSON: jQuery.noop };
-	}
-
-	// An object can be passed to jQuery.data instead of a key/value pair; this gets
-	// shallow copied over onto the existing cache
-	if ( typeof name === "object" || typeof name === "function" ) {
-		if ( pvt ) {
-			cache[ id ] = jQuery.extend( cache[ id ], name );
-		} else {
-			cache[ id ].data = jQuery.extend( cache[ id ].data, name );
-		}
-	}
-
-	thisCache = cache[ id ];
-
-	// jQuery data() is stored in a separate object inside the object's internal data
-	// cache in order to avoid key collisions between internal data and user-defined
-	// data.
-	if ( !pvt ) {
-		if ( !thisCache.data ) {
-			thisCache.data = {};
-		}
-
-		thisCache = thisCache.data;
-	}
-
-	if ( data !== undefined ) {
-		thisCache[ jQuery.camelCase( name ) ] = data;
-	}
-
-	// Check for both converted-to-camel and non-converted data property names
-	// If a data property was specified
-	if ( typeof name === "string" ) {
-
-		// First Try to find as-is property data
-		ret = thisCache[ name ];
-
-		// Test for null|undefined property data
-		if ( ret == null ) {
-
-			// Try to find the camelCased property
-			ret = thisCache[ jQuery.camelCase( name ) ];
-		}
-	} else {
-		ret = thisCache;
-	}
-
-	return ret;
-}
-
-function internalRemoveData( elem, name, pvt ) {
-	if ( !jQuery.acceptData( elem ) ) {
-		return;
-	}
-
-	var thisCache, i,
-		isNode = elem.nodeType,
-
-		// See jQuery.data for more information
-		cache = isNode ? jQuery.cache : elem,
-		id = isNode ? elem[ jQuery.expando ] : jQuery.expando;
-
-	// If there is already no cache entry for this object, there is no
-	// purpose in continuing
-	if ( !cache[ id ] ) {
-		return;
-	}
-
-	if ( name ) {
-
-		thisCache = pvt ? cache[ id ] : cache[ id ].data;
-
-		if ( thisCache ) {
-
-			// Support array or space separated string names for data keys
-			if ( !jQuery.isArray( name ) ) {
-
-				// try the string as a key before any manipulation
-				if ( name in thisCache ) {
-					name = [ name ];
-				} else {
-
-					// split the camel cased version by spaces unless a key with the spaces exists
-					name = jQuery.camelCase( name );
-					if ( name in thisCache ) {
-						name = [ name ];
-					} else {
-						name = name.split(" ");
-					}
-				}
-			} else {
-				// If "name" is an array of keys...
-				// When data is initially created, via ("key", "val") signature,
-				// keys will be converted to camelCase.
-				// Since there is no way to tell _how_ a key was added, remove
-				// both plain key and camelCase key. #12786
-				// This will only penalize the array argument path.
-				name = name.concat( jQuery.map( name, jQuery.camelCase ) );
-			}
-
-			i = name.length;
-			while ( i-- ) {
-				delete thisCache[ name[i] ];
-			}
-
-			// If there is no data left in the cache, we want to continue
-			// and let the cache object itself get destroyed
-			if ( pvt ? !isEmptyDataObject(thisCache) : !jQuery.isEmptyObject(thisCache) ) {
-				return;
-			}
-		}
-	}
-
-	// See jQuery.data for more information
-	if ( !pvt ) {
-		delete cache[ id ].data;
-
-		// Don't destroy the parent cache unless the internal data object
-		// had been the only thing left in it
-		if ( !isEmptyDataObject( cache[ id ] ) ) {
-			return;
-		}
-	}
-
-	// Destroy the cache
-	if ( isNode ) {
-		jQuery.cleanData( [ elem ], true );
-
-	// Use delete when supported for expandos or `cache` is not a window per isWindow (#10080)
-	/* jshint eqeqeq: false */
-	} else if ( support.deleteExpando || cache != cache.window ) {
-		/* jshint eqeqeq: true */
-		delete cache[ id ];
-
-	// When all else fails, null
-	} else {
-		cache[ id ] = null;
-	}
-}
-
-jQuery.extend({
-	cache: {},
-
-	// The following elements (space-suffixed to avoid Object.prototype collisions)
-	// throw uncatchable exceptions if you attempt to set expando properties
-	noData: {
-		"applet ": true,
-		"embed ": true,
-		// ...but Flash objects (which have this classid) *can* handle expandos
-		"object ": "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
-	},
-
-	hasData: function( elem ) {
-		elem = elem.nodeType ? jQuery.cache[ elem[jQuery.expando] ] : elem[ jQuery.expando ];
-		return !!elem && !isEmptyDataObject( elem );
-	},
-
-	data: function( elem, name, data ) {
-		return internalData( elem, name, data );
-	},
-
-	removeData: function( elem, name ) {
-		return internalRemoveData( elem, name );
-	},
-
-	// For internal use only.
-	_data: function( elem, name, data ) {
-		return internalData( elem, name, data, true );
-	},
-
-	_removeData: function( elem, name ) {
-		return internalRemoveData( elem, name, true );
-	}
-});
-
-jQuery.fn.extend({
-	data: function( key, value ) {
-		var i, name, data,
-			elem = this[0],
-			attrs = elem && elem.attributes;
-
-		// Special expections of .data basically thwart jQuery.access,
-		// so implement the relevant behavior ourselves
-
-		// Gets all values
-		if ( key === undefined ) {
-			if ( this.length ) {
-				data = jQuery.data( elem );
-
-				if ( elem.nodeType === 1 && !jQuery._data( elem, "parsedAttrs" ) ) {
-					i = attrs.length;
-					while ( i-- ) {
-
-						// Support: IE11+
-						// The attrs elements can be null (#14894)
-						if ( attrs[ i ] ) {
-							name = attrs[ i ].name;
-							if ( name.indexOf( "data-" ) === 0 ) {
-								name = jQuery.camelCase( name.slice(5) );
-								dataAttr( elem, name, data[ name ] );
-							}
-						}
-					}
-					jQuery._data( elem, "parsedAttrs", true );
-				}
-			}
-
-			return data;
-		}
-
-		// Sets multiple values
-		if ( typeof key === "object" ) {
-			return this.each(function() {
-				jQuery.data( this, key );
-			});
-		}
-
-		return arguments.length > 1 ?
-
-			// Sets one value
-			this.each(function() {
-				jQuery.data( this, key, value );
-			}) :
-
-			// Gets one value
-			// Try to fetch any internally stored data first
-			elem ? dataAttr( elem, key, jQuery.data( elem, key ) ) : undefined;
-	},
-
-	removeData: function( key ) {
-		return this.each(function() {
-			jQuery.removeData( this, key );
-		});
-	}
-});
-
-
-jQuery.extend({
-	queue: function( elem, type, data ) {
-		var queue;
-
-		if ( elem ) {
-			type = ( type || "fx" ) + "queue";
-			queue = jQuery._data( elem, type );
-
-			// Speed up dequeue by getting out quickly if this is just a lookup
-			if ( data ) {
-				if ( !queue || jQuery.isArray(data) ) {
-					queue = jQuery._data( elem, type, jQuery.makeArray(data) );
-				} else {
-					queue.push( data );
-				}
-			}
-			return queue || [];
-		}
-	},
-
-	dequeue: function( elem, type ) {
-		type = type || "fx";
-
-		var queue = jQuery.queue( elem, type ),
-			startLength = queue.length,
-			fn = queue.shift(),
-			hooks = jQuery._queueHooks( elem, type ),
-			next = function() {
-				jQuery.dequeue( elem, type );
-			};
-
-		// If the fx queue is dequeued, always remove the progress sentinel
-		if ( fn === "inprogress" ) {
-			fn = queue.shift();
-			startLength--;
-		}
-
-		if ( fn ) {
-
-			// Add a progress sentinel to prevent the fx queue from being
-			// automatically dequeued
-			if ( type === "fx" ) {
-				queue.unshift( "inprogress" );
-			}
-
-			// clear up the last queue stop function
-			delete hooks.stop;
-			fn.call( elem, next, hooks );
-		}
-
-		if ( !startLength && hooks ) {
-			hooks.empty.fire();
-		}
-	},
-
-	// not intended for public consumption - generates a queueHooks object, or returns the current one
-	_queueHooks: function( elem, type ) {
-		var key = type + "queueHooks";
-		return jQuery._data( elem, key ) || jQuery._data( elem, key, {
-			empty: jQuery.Callbacks("once memory").add(function() {
-				jQuery._removeData( elem, type + "queue" );
-				jQuery._removeData( elem, key );
-			})
-		});
-	}
-});
-
-jQuery.fn.extend({
-	queue: function( type, data ) {
-		var setter = 2;
-
-		if ( typeof type !== "string" ) {
-			data = type;
-			type = "fx";
-			setter--;
-		}
-
-		if ( arguments.length < setter ) {
-			return jQuery.queue( this[0], type );
-		}
-
-		return data === undefined ?
-			this :
-			this.each(function() {
-				var queue = jQuery.queue( this, type, data );
-
-				// ensure a hooks for this queue
-				jQuery._queueHooks( this, type );
-
-				if ( type === "fx" && queue[0] !== "inprogress" ) {
-					jQuery.dequeue( this, type );
-				}
-			});
-	},
-	dequeue: function( type ) {
-		return this.each(function() {
-			jQuery.dequeue( this, type );
-		});
-	},
-	clearQueue: function( type ) {
-		return this.queue( type || "fx", [] );
-	},
-	// Get a promise resolved when queues of a certain type
-	// are emptied (fx is the type by default)
-	promise: function( type, obj ) {
-		var tmp,
-			count = 1,
-			defer = jQuery.Deferred(),
-			elements = this,
-			i = this.length,
-			resolve = function() {
-				if ( !( --count ) ) {
-					defer.resolveWith( elements, [ elements ] );
-				}
-			};
-
-		if ( typeof type !== "string" ) {
-			obj = type;
-			type = undefined;
-		}
-		type = type || "fx";
-
-		while ( i-- ) {
-			tmp = jQuery._data( elements[ i ], type + "queueHooks" );
-			if ( tmp && tmp.empty ) {
-				count++;
-				tmp.empty.add( resolve );
-			}
-		}
-		resolve();
-		return defer.promise( obj );
-	}
-});
-var pnum = (/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/).source;
-
-var cssExpand = [ "Top", "Right", "Bottom", "Left" ];
-
-var isHidden = function( elem, el ) {
-		// isHidden might be called from jQuery#filter function;
-		// in that case, element will be second argument
-		elem = el || elem;
-		return jQuery.css( elem, "display" ) === "none" || !jQuery.contains( elem.ownerDocument, elem );
-	};
-
-
-
-// Multifunctional method to get and set values of a collection
-// The value/s can optionally be executed if it's a function
-var access = jQuery.access = function( elems, fn, key, value, chainable, emptyGet, raw ) {
-	var i = 0,
-		length = elems.length,
-		bulk = key == null;
-
-	// Sets many values
-	if ( jQuery.type( key ) === "object" ) {
-		chainable = true;
-		for ( i in key ) {
-			jQuery.access( elems, fn, i, key[i], true, emptyGet, raw );
-		}
-
-	// Sets one value
-	} else if ( value !== undefined ) {
-		chainable = true;
-
-		if ( !jQuery.isFunction( value ) ) {
-			raw = true;
-		}
-
-		if ( bulk ) {
-			// Bulk operations run against the entire set
-			if ( raw ) {
-				fn.call( elems, value );
-				fn = null;
-
-			// ...except when executing function values
-			} else {
-				bulk = fn;
-				fn = function( elem, key, value ) {
-					return bulk.call( jQuery( elem ), value );
-				};
-			}
-		}
-
-		if ( fn ) {
-			for ( ; i < length; i++ ) {
-				fn( elems[i], key, raw ? value : value.call( elems[i], i, fn( elems[i], key ) ) );
-			}
-		}
-	}
-
-	return chainable ?
-		elems :
-
-		// Gets
-		bulk ?
-			fn.call( elems ) :
-			length ? fn( elems[0], key ) : emptyGet;
-};
-var rcheckableType = (/^(?:checkbox|radio)$/i);
-
-
-
-(function() {
-	// Minified: var a,b,c
-	var input = document.createElement( "input" ),
-		div = document.createElement( "div" ),
-		fragment = document.createDocumentFragment();
-
-	// Setup
-	div.innerHTML = "  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>";
-
-	// IE strips leading whitespace when .innerHTML is used
-	support.leadingWhitespace = div.firstChild.nodeType === 3;
-
-	// Make sure that tbody elements aren't automatically inserted
-	// IE will insert them into empty tables
-	support.tbody = !div.getElementsByTagName( "tbody" ).length;
-
-	// Make sure that link elements get serialized correctly by innerHTML
-	// This requires a wrapper element in IE
-	support.htmlSerialize = !!div.getElementsByTagName( "link" ).length;
-
-	// Makes sure cloning an html5 element does not cause problems
-	// Where outerHTML is undefined, this still works
-	support.html5Clone =
-		document.createElement( "nav" ).cloneNode( true ).outerHTML !== "<:nav></:nav>";
-
-	// Check if a disconnected checkbox will retain its checked
-	// value of true after appended to the DOM (IE6/7)
-	input.type = "checkbox";
-	input.checked = true;
-	fragment.appendChild( input );
-	support.appendChecked = input.checked;
-
-	// Make sure textarea (and checkbox) defaultValue is properly cloned
-	// Support: IE6-IE11+
-	div.innerHTML = "<textarea>x</textarea>";
-	support.noCloneChecked = !!div.cloneNode( true ).lastChild.defaultValue;
-
-	// #11217 - WebKit loses check when the name is after the checked attribute
-	fragment.appendChild( div );
-	div.innerHTML = "<input type='radio' checked='checked' name='t'/>";
-
-	// Support: Safari 5.1, iOS 5.1, Android 4.x, Android 2.3
-	// old WebKit doesn't clone checked state correctly in fragments
-	support.checkClone = div.cloneNode( true ).cloneNode( true ).lastChild.checked;
-
-	// Support: IE<9
-	// Opera does not clone events (and typeof div.attachEvent === undefined).
-	// IE9-10 clones events bound via attachEvent, but they don't trigger with .click()
-	support.noCloneEvent = true;
-	if ( div.attachEvent ) {
-		div.attachEvent( "onclick", function() {
-			support.noCloneEvent = false;
-		});
-
-		div.cloneNode( true ).click();
-	}
-
-	// Execute the test only if not already executed in another module.
-	if (support.deleteExpando == null) {
-		// Support: IE<9
-		support.deleteExpando = true;
-		try {
-			delete div.test;
-		} catch( e ) {
-			support.deleteExpando = false;
-		}
-	}
-})();
-
-
-(function() {
-	var i, eventName,
-		div = document.createElement( "div" );
-
-	// Support: IE<9 (lack submit/change bubble), Firefox 23+ (lack focusin event)
-	for ( i in { submit: true, change: true, focusin: true }) {
-		eventName = "on" + i;
-
-		if ( !(support[ i + "Bubbles" ] = eventName in window) ) {
-			// Beware of CSP restrictions (https://developer.mozilla.org/en/Security/CSP)
-			div.setAttribute( eventName, "t" );
-			support[ i + "Bubbles" ] = div.attributes[ eventName ].expando === false;
-		}
-	}
-
-	// Null elements to avoid leaks in IE.
-	div = null;
-})();
-
-
-var rformElems = /^(?:input|select|textarea)$/i,
-	rkeyEvent = /^key/,
-	rmouseEvent = /^(?:mouse|pointer|contextmenu)|click/,
-	rfocusMorph = /^(?:focusinfocus|focusoutblur)$/,
-	rtypenamespace = /^([^.]*)(?:\.(.+)|)$/;
-
-function returnTrue() {
-	return true;
-}
-
-function returnFalse() {
-	return false;
-}
-
-function safeActiveElement() {
-	try {
-		return document.activeElement;
-	} catch ( err ) { }
-}
-
-/*
- * Helper functions for managing events -- not part of the public interface.
- * Props to Dean Edwards' addEvent library for many of the ideas.
- */
-jQuery.event = {
-
-	global: {},
-
-	add: function( elem, types, handler, data, selector ) {
-		var tmp, events, t, handleObjIn,
-			special, eventHandle, handleObj,
-			handlers, type, namespaces, origType,
-			elemData = jQuery._data( elem );
-
-		// Don't attach events to noData or text/comment nodes (but allow plain objects)
-		if ( !elemData ) {
-			return;
-		}
-
-		// Caller can pass in an object of custom data in lieu of the handler
-		if ( handler.handler ) {
-			handleObjIn = handler;
-			handler = handleObjIn.handler;
-			selector = handleObjIn.selector;
-		}
-
-		// Make sure that the handler has a unique ID, used to find/remove it later
-		if ( !handler.guid ) {
-			handler.guid = jQuery.guid++;
-		}
-
-		// Init the element's event structure and main handler, if this is the first
-		if ( !(events = elemData.events) ) {
-			events = elemData.events = {};
-		}
-		if ( !(eventHandle = elemData.handle) ) {
-			eventHandle = elemData.handle = function( e ) {
-				// Discard the second event of a jQuery.event.trigger() and
-				// when an event is called after a page has unloaded
-				return typeof jQuery !== strundefined && (!e || jQuery.event.triggered !== e.type) ?
-					jQuery.event.dispatch.apply( eventHandle.elem, arguments ) :
-					undefined;
-			};
-			// Add elem as a property of the handle fn to prevent a memory leak with IE non-native events
-			eventHandle.elem = elem;
-		}
-
-		// Handle multiple events separated by a space
-		types = ( types || "" ).match( rnotwhite ) || [ "" ];
-		t = types.length;
-		while ( t-- ) {
-			tmp = rtypenamespace.exec( types[t] ) || [];
-			type = origType = tmp[1];
-			namespaces = ( tmp[2] || "" ).split( "." ).sort();
-
-			// There *must* be a type, no attaching namespace-only handlers
-			if ( !type ) {
-				continue;
-			}
-
-			// If event changes its type, use the special event handlers for the changed type
-			special = jQuery.event.special[ type ] || {};
-
-			// If selector defined, determine special event api type, otherwise given type
-			type = ( selector ? special.delegateType : special.bindType ) || type;
-
-			// Update special based on newly reset type
-			special = jQuery.event.special[ type ] || {};
-
-			// handleObj is passed to all event handlers
-			handleObj = jQuery.extend({
-				type: type,
-				origType: origType,
-				data: data,
-				handler: handler,
-				guid: handler.guid,
-				selector: selector,
-				needsContext: selector && jQuery.expr.match.needsContext.test( selector ),
-				namespace: namespaces.join(".")
-			}, handleObjIn );
-
-			// Init the event handler queue if we're the first
-			if ( !(handlers = events[ type ]) ) {
-				handlers = events[ type ] = [];
-				handlers.delegateCount = 0;
-
-				// Only use addEventListener/attachEvent if the special events handler returns false
-				if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) {
-					// Bind the global event handler to the element
-					if ( elem.addEventListener ) {
-						elem.addEventListener( type, eventHandle, false );
-
-					} else if ( elem.attachEvent ) {
-						elem.attachEvent( "on" + type, eventHandle );
-					}
-				}
-			}
-
-			if ( special.add ) {
-				special.add.call( elem, handleObj );
-
-				if ( !handleObj.handler.guid ) {
-					handleObj.handler.guid = handler.guid;
-				}
-			}
-
-			// Add to the element's handler list, delegates in front
-			if ( selector ) {
-				handlers.splice( handlers.delegateCount++, 0, handleObj );
-			} else {
-				handlers.push( handleObj );
-			}
-
-			// Keep track of which events have ever been used, for event optimization
-			jQuery.event.global[ type ] = true;
-		}
-
-		// Nullify elem to prevent memory leaks in IE
-		elem = null;
-	},
-
-	// Detach an event or set of events from an element
-	remove: function( elem, types, handler, selector, mappedTypes ) {
-		var j, handleObj, tmp,
-			origCount, t, events,
-			special, handlers, type,
-			namespaces, origType,
-			elemData = jQuery.hasData( elem ) && jQuery._data( elem );
-
-		if ( !elemData || !(events = elemData.events) ) {
-			return;
-		}
-
-		// Once for each type.namespace in types; type may be omitted
-		types = ( types || "" ).match( rnotwhite ) || [ "" ];
-		t = types.length;
-		while ( t-- ) {
-			tmp = rtypenamespace.exec( types[t] ) || [];
-			type = origType = tmp[1];
-			namespaces = ( tmp[2] || "" ).split( "." ).sort();
-
-			// Unbind all events (on this namespace, if provided) for the element
-			if ( !type ) {
-				for ( type in events ) {
-					jQuery.event.remove( elem, type + types[ t ], handler, selector, true );
-				}
-				continue;
-			}
-
-			special = jQuery.event.special[ type ] || {};
-			type = ( selector ? special.delegateType : special.bindType ) || type;
-			handlers = events[ type ] || [];
-			tmp = tmp[2] && new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" );
-
-			// Remove matching events
-			origCount = j = handlers.length;
-			while ( j-- ) {
-				handleObj = handlers[ j ];
-
-				if ( ( mappedTypes || origType === handleObj.origType ) &&
-					( !handler || handler.guid === handleObj.guid ) &&
-					( !tmp || tmp.test( handleObj.namespace ) ) &&
-					( !selector || selector === handleObj.selector || selector === "**" && handleObj.selector ) ) {
-					handlers.splice( j, 1 );
-
-					if ( handleObj.selector ) {
-						handlers.delegateCount--;
-					}
-					if ( special.remove ) {
-						special.remove.call( elem, handleObj );
-					}
-				}
-			}
-
-			// Remove generic event handler if we removed something and no more handlers exist
-			// (avoids potential for endless recursion during removal of special event handlers)
-			if ( origCount && !handlers.length ) {
-				if ( !special.teardown || special.teardown.call( elem, namespaces, elemData.handle ) === false ) {
-					jQuery.removeEvent( elem, type, elemData.handle );
-				}
-
-				delete events[ type ];
-			}
-		}
-
-		// Remove the expando if it's no longer used
-		if ( jQuery.isEmptyObject( events ) ) {
-			delete elemData.handle;
-
-			// removeData also checks for emptiness and clears the expando if empty
-			// so use it instead of delete
-			jQuery._removeData( elem, "events" );
-		}
-	},
-
-	trigger: function( event, data, elem, onlyHandlers ) {
-		var handle, ontype, cur,
-			bubbleType, special, tmp, i,
-			eventPath = [ elem || document ],
-			type = hasOwn.call( event, "type" ) ? event.type : event,
-			namespaces = hasOwn.call( event, "namespace" ) ? event.namespace.split(".") : [];
-
-		cur = tmp = elem = elem || document;
-
-		// Don't do events on text and comment nodes
-		if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
-			return;
-		}
-
-		// focus/blur morphs to focusin/out; ensure we're not firing them right now
-		if ( rfocusMorph.test( type + jQuery.event.triggered ) ) {
-			return;
-		}
-
-		if ( type.indexOf(".") >= 0 ) {
-			// Namespaced trigger; create a regexp to match event type in handle()
-			namespaces = type.split(".");
-			type = namespaces.shift();
-			namespaces.sort();
-		}
-		ontype = type.indexOf(":") < 0 && "on" + type;
-
-		// Caller can pass in a jQuery.Event object, Object, or just an event type string
-		event = event[ jQuery.expando ] ?
-			event :
-			new jQuery.Event( type, typeof event === "object" && event );
-
-		// Trigger bitmask: & 1 for native handlers; & 2 for jQuery (always true)
-		event.isTrigger = onlyHandlers ? 2 : 3;
-		event.namespace = namespaces.join(".");
-		event.namespace_re = event.namespace ?
-			new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" ) :
-			null;
-
-		// Clean up the event in case it is being reused
-		event.result = undefined;
-		if ( !event.target ) {
-			event.target = elem;
-		}
-
-		// Clone any incoming data and prepend the event, creating the handler arg list
-		data = data == null ?
-			[ event ] :
-			jQuery.makeArray( data, [ event ] );
-
-		// Allow special events to draw outside the lines
-		special = jQuery.event.special[ type ] || {};
-		if ( !onlyHandlers && special.trigger && special.trigger.apply( elem, data ) === false ) {
-			return;
-		}
-
-		// Determine event propagation path in advance, per W3C events spec (#9951)
-		// Bubble up to document, then to window; watch for a global ownerDocument var (#9724)
-		if ( !onlyHandlers && !special.noBubble && !jQuery.isWindow( elem ) ) {
-
-			bubbleType = special.delegateType || type;
-			if ( !rfocusMorph.test( bubbleType + type ) ) {
-				cur = cur.parentNode;
-			}
-			for ( ; cur; cur = cur.parentNode ) {
-				eventPath.push( cur );
-				tmp = cur;
-			}
-
-			// Only add window if we got to document (e.g., not plain obj or detached DOM)
-			if ( tmp === (elem.ownerDocument || document) ) {
-				eventPath.push( tmp.defaultView || tmp.parentWindow || window );
-			}
-		}
-
-		// Fire handlers on the event path
-		i = 0;
-		while ( (cur = eventPath[i++]) && !event.isPropagationStopped() ) {
-
-			event.type = i > 1 ?
-				bubbleType :
-				special.bindType || type;
-
-			// jQuery handler
-			handle = ( jQuery._data( cur, "events" ) || {} )[ event.type ] && jQuery._data( cur, "handle" );
-			if ( handle ) {
-				handle.apply( cur, data );
-			}
-
-			// Native handler
-			handle = ontype && cur[ ontype ];
-			if ( handle && handle.apply && jQuery.acceptData( cur ) ) {
-				event.result = handle.apply( cur, data );
-				if ( event.result === false ) {
-					event.preventDefault();
-				}
-			}
-		}
-		event.type = type;
-
-		// If nobody prevented the default action, do it now
-		if ( !onlyHandlers && !event.isDefaultPrevented() ) {
-
-			if ( (!special._default || special._default.apply( eventPath.pop(), data ) === false) &&
-				jQuery.acceptData( elem ) ) {
-
-				// Call a native DOM method on the target with the same name name as the event.
-				// Can't use an .isFunction() check here because IE6/7 fails that test.
-				// Don't do default actions on window, that's where global variables be (#6170)
-				if ( ontype && elem[ type ] && !jQuery.isWindow( elem ) ) {
-
-					// Don't re-trigger an onFOO event when we call its FOO() method
-					tmp = elem[ ontype ];
-
-					if ( tmp ) {
-						elem[ ontype ] = null;
-					}
-
-					// Prevent re-triggering of the same event, since we already bubbled it above
-					jQuery.event.triggered = type;
-					try {
-						elem[ type ]();
-					} catch ( e ) {
-						// IE<9 dies on focus/blur to hidden element (#1486,#12518)
-						// only reproducible on winXP IE8 native, not IE9 in IE8 mode
-					}
-					jQuery.event.triggered = undefined;
-
-					if ( tmp ) {
-						elem[ ontype ] = tmp;
-					}
-				}
-			}
-		}
-
-		return event.result;
-	},
-
-	dispatch: function( event ) {
-
-		// Make a writable jQuery.Event from the native event object
-		event = jQuery.event.fix( event );
-
-		var i, ret, handleObj, matched, j,
-			handlerQueue = [],
-			args = slice.call( arguments ),
-			handlers = ( jQuery._data( this, "events" ) || {} )[ event.type ] || [],
-			special = jQuery.event.special[ event.type ] || {};
-
-		// Use the fix-ed jQuery.Event rather than the (read-only) native event
-		args[0] = event;
-		event.delegateTarget = this;
-
-		// Call the preDispatch hook for the mapped type, and let it bail if desired
-		if ( special.preDispatch && special.preDispatch.call( this, event ) === false ) {
-			return;
-		}
-
-		// Determine handlers
-		handlerQueue = jQuery.event.handlers.call( this, event, handlers );
-
-		// Run delegates first; they may want to stop propagation beneath us
-		i = 0;
-		while ( (matched = handlerQueue[ i++ ]) && !event.isPropagationStopped() ) {
-			event.currentTarget = matched.elem;
-
-			j = 0;
-			while ( (handleObj = matched.handlers[ j++ ]) && !event.isImmediatePropagationStopped() ) {
-
-				// Triggered event must either 1) have no namespace, or
-				// 2) have namespace(s) a subset or equal to those in the bound event (both can have no namespace).
-				if ( !event.namespace_re || event.namespace_re.test( handleObj.namespace ) ) {
-
-					event.handleObj = handleObj;
-					event.data = handleObj.data;
-
-					ret = ( (jQuery.event.special[ handleObj.origType ] || {}).handle || handleObj.handler )
-							.apply( matched.elem, args );
-
-					if ( ret !== undefined ) {
-						if ( (event.result = ret) === false ) {
-							event.preventDefault();
-							event.stopPropagation();
-						}
-					}
-				}
-			}
-		}
-
-		// Call the postDispatch hook for the mapped type
-		if ( special.postDispatch ) {
-			special.postDispatch.call( this, event );
-		}
-
-		return event.result;
-	},
-
-	handlers: function( event, handlers ) {
-		var sel, handleObj, matches, i,
-			handlerQueue = [],
-			delegateCount = handlers.delegateCount,
-			cur = event.target;
-
-		// Find delegate handlers
-		// Black-hole SVG <use> instance trees (#13180)
-		// Avoid non-left-click bubbling in Firefox (#3861)
-		if ( delegateCount && cur.nodeType && (!event.button || event.type !== "click") ) {
-
-			/* jshint eqeqeq: false */
-			for ( ; cur != this; cur = cur.parentNode || this ) {
-				/* jshint eqeqeq: true */
-
-				// Don't check non-elements (#13208)
-				// Don't process clicks on disabled elements (#6911, #8165, #11382, #11764)
-				if ( cur.nodeType === 1 && (cur.disabled !== true || event.type !== "click") ) {
-					matches = [];
-					for ( i = 0; i < delegateCount; i++ ) {
-						handleObj = handlers[ i ];
-
-						// Don't conflict with Object.prototype properties (#13203)
-						sel = handleObj.selector + " ";
-
-						if ( matches[ sel ] === undefined ) {
-							matches[ sel ] = handleObj.needsContext ?
-								jQuery( sel, this ).index( cur ) >= 0 :
-								jQuery.find( sel, this, null, [ cur ] ).length;
-						}
-						if ( matches[ sel ] ) {
-							matches.push( handleObj );
-						}
-					}
-					if ( matches.length ) {
-						handlerQueue.push({ elem: cur, handlers: matches });
-					}
-				}
-			}
-		}
-
-		// Add the remaining (directly-bound) handlers
-		if ( delegateCount < handlers.length ) {
-			handlerQueue.push({ elem: this, handlers: handlers.slice( delegateCount ) });
-		}
-
-		return handlerQueue;
-	},
-
-	fix: function( event ) {
-		if ( event[ jQuery.expando ] ) {
-			return event;
-		}
-
-		// Create a writable copy of the event object and normalize some properties
-		var i, prop, copy,
-			type = event.type,
-			originalEvent = event,
-			fixHook = this.fixHooks[ type ];
-
-		if ( !fixHook ) {
-			this.fixHooks[ type ] = fixHook =
-				rmouseEvent.test( type ) ? this.mouseHooks :
-				rkeyEvent.test( type ) ? this.keyHooks :
-				{};
-		}
-		copy = fixHook.props ? this.props.concat( fixHook.props ) : this.props;
-
-		event = new jQuery.Event( originalEvent );
-
-		i = copy.length;
-		while ( i-- ) {
-			prop = copy[ i ];
-			event[ prop ] = originalEvent[ prop ];
-		}
-
-		// Support: IE<9
-		// Fix target property (#1925)
-		if ( !event.target ) {
-			event.target = originalEvent.srcElement || document;
-		}
-
-		// Support: Chrome 23+, Safari?
-		// Target should not be a text node (#504, #13143)
-		if ( event.target.nodeType === 3 ) {
-			event.target = event.target.parentNode;
-		}
-
-		// Support: IE<9
-		// For mouse/key events, metaKey==false if it's undefined (#3368, #11328)
-		event.metaKey = !!event.metaKey;
-
-		return fixHook.filter ? fixHook.filter( event, originalEvent ) : event;
-	},
-
-	// Includes some event props shared by KeyEvent and MouseEvent
-	props: "altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),
-
-	fixHooks: {},
-
-	keyHooks: {
-		props: "char charCode key keyCode".split(" "),
-		filter: function( event, original ) {
-
-			// Add which for key events
-			if ( event.which == null ) {
-				event.which = original.charCode != null ? original.charCode : original.keyCode;
-			}
-
-			return event;
-		}
-	},
-
-	mouseHooks: {
-		props: "button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),
-		filter: function( event, original ) {
-			var body, eventDoc, doc,
-				button = original.button,
-				fromElement = original.fromElement;
-
-			// Calculate pageX/Y if missing and clientX/Y available
-			if ( event.pageX == null && original.clientX != null ) {
-				eventDoc = event.target.ownerDocument || document;
-				doc = eventDoc.documentElement;
-				body = eventDoc.body;
-
-				event.pageX = original.clientX + ( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) - ( doc && doc.clientLeft || body && body.clientLeft || 0 );
-				event.pageY = original.clientY + ( doc && doc.scrollTop  || body && body.scrollTop  || 0 ) - ( doc && doc.clientTop  || body && body.clientTop  || 0 );
-			}
-
-			// Add relatedTarget, if necessary
-			if ( !event.relatedTarget && fromElement ) {
-				event.relatedTarget = fromElement === event.target ? original.toElement : fromElement;
-			}
-
-			// Add which for click: 1 === left; 2 === middle; 3 === right
-			// Note: button is not normalized, so don't use it
-			if ( !event.which && button !== undefined ) {
-				event.which = ( button & 1 ? 1 : ( button & 2 ? 3 : ( button & 4 ? 2 : 0 ) ) );
-			}
-
-			return event;
-		}
-	},
-
-	special: {
-		load: {
-			// Prevent triggered image.load events from bubbling to window.load
-			noBubble: true
-		},
-		focus: {
-			// Fire native event if possible so blur/focus sequence is correct
-			trigger: function() {
-				if ( this !== safeActiveElement() && this.focus ) {
-					try {
-						this.focus();
-						return false;
-					} catch ( e ) {
-						// Support: IE<9
-						// If we error on focus to hidden element (#1486, #12518),
-						// let .trigger() run the handlers
-					}
-				}
-			},
-			delegateType: "focusin"
-		},
-		blur: {
-			trigger: function() {
-				if ( this === safeActiveElement() && this.blur ) {
-					this.blur();
-					return false;
-				}
-			},
-			delegateType: "focusout"
-		},
-		click: {
-			// For checkbox, fire native event so checked state will be right
-			trigger: function() {
-				if ( jQuery.nodeName( this, "input" ) && this.type === "checkbox" && this.click ) {
-					this.click();
-					return false;
-				}
-			},
-
-			// For cross-browser consistency, don't fire native .click() on links
-			_default: function( event ) {
-				return jQuery.nodeName( event.target, "a" );
-			}
-		},
-
-		beforeunload: {
-			postDispatch: function( event ) {
-
-				// Support: Firefox 20+
-				// Firefox doesn't alert if the returnValue field is not set.
-				if ( event.result !== undefined && event.originalEvent ) {
-					event.originalEvent.returnValue = event.result;
-				}
-			}
-		}
-	},
-
-	simulate: function( type, elem, event, bubble ) {
-		// Piggyback on a donor event to simulate a different one.
-		// Fake originalEvent to avoid donor's stopPropagation, but if the
-		// simulated event prevents default then we do the same on the donor.
-		var e = jQuery.extend(
-			new jQuery.Event(),
-			event,
-			{
-				type: type,
-				isSimulated: true,
-				originalEvent: {}
-			}
-		);
-		if ( bubble ) {
-			jQuery.event.trigger( e, null, elem );
-		} else {
-			jQuery.event.dispatch.call( elem, e );
-		}
-		if ( e.isDefaultPrevented() ) {
-			event.preventDefault();
-		}
-	}
-};
-
-jQuery.removeEvent = document.removeEventListener ?
-	function( elem, type, handle ) {
-		if ( elem.removeEventListener ) {
-			elem.removeEventListener( type, handle, false );
-		}
-	} :
-	function( elem, type, handle ) {
-		var name = "on" + type;
-
-		if ( elem.detachEvent ) {
-
-			// #8545, #7054, preventing memory leaks for custom events in IE6-8
-			// detachEvent needed property on element, by name of that event, to properly expose it to GC
-			if ( typeof elem[ name ] === strundefined ) {
-				elem[ name ] = null;
-			}
-
-			elem.detachEvent( name, handle );
-		}
-	};
-
-jQuery.Event = function( src, props ) {
-	// Allow instantiation without the 'new' keyword
-	if ( !(this instanceof jQuery.Event) ) {
-		return new jQuery.Event( src, props );
-	}
-
-	// Event object
-	if ( src && src.type ) {
-		this.originalEvent = src;
-		this.type = src.type;
-
-		// Events bubbling up the document may have been marked as prevented
-		// by a handler lower down the tree; reflect the correct value.
-		this.isDefaultPrevented = src.defaultPrevented ||
-				src.defaultPrevented === undefined &&
-				// Support: IE < 9, Android < 4.0
-				src.returnValue === false ?
-			returnTrue :
-			returnFalse;
-
-	// Event type
-	} else {
-		this.type = src;
-	}
-
-	// Put explicitly provided properties onto the event object
-	if ( props ) {
-		jQuery.extend( this, props );
-	}
-
-	// Create a timestamp if incoming event doesn't have one
-	this.timeStamp = src && src.timeStamp || jQuery.now();
-
-	// Mark it as fixed
-	this[ jQuery.expando ] = true;
-};
-
-// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding
-// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
-jQuery.Event.prototype = {
-	isDefaultPrevented: returnFalse,
-	isPropagationStopped: returnFalse,
-	isImmediatePropagationStopped: returnFalse,
-
-	preventDefault: function() {
-		var e = this.originalEvent;
-
-		this.isDefaultPrevented = returnTrue;
-		if ( !e ) {
-			return;
-		}
-
-		// If preventDefault exists, run it on the original event
-		if ( e.preventDefault ) {
-			e.preventDefault();
-
-		// Support: IE
-		// Otherwise set the returnValue property of the original event to false
-		} else {
-			e.returnValue = false;
-		}
-	},
-	stopPropagation: function() {
-		var e = this.originalEvent;
-
-		this.isPropagationStopped = returnTrue;
-		if ( !e ) {
-			return;
-		}
-		// If stopPropagation exists, run it on the original event
-		if ( e.stopPropagation ) {
-			e.stopPropagation();
-		}
-
-		// Support: IE
-		// Set the cancelBubble property of the original event to true
-		e.cancelBubble = true;
-	},
-	stopImmediatePropagation: function() {
-		var e = this.originalEvent;
-
-		this.isImmediatePropagationStopped = returnTrue;
-
-		if ( e && e.stopImmediatePropagation ) {
-			e.stopImmediatePropagation();
-		}
-
-		this.stopPropagation();
-	}
-};
-
-// Create mouseenter/leave events using mouseover/out and event-time checks
-jQuery.each({
-	mouseenter: "mouseover",
-	mouseleave: "mouseout",
-	pointerenter: "pointerover",
-	pointerleave: "pointerout"
-}, function( orig, fix ) {
-	jQuery.event.special[ orig ] = {
-		delegateType: fix,
-		bindType: fix,
-
-		handle: function( event ) {
-			var ret,
-				target = this,
-				related = event.relatedTarget,
-				handleObj = event.handleObj;
-
-			// For mousenter/leave call the handler if related is outside the target.
-			// NB: No relatedTarget if the mouse left/entered the browser window
-			if ( !related || (related !== target && !jQuery.contains( target, related )) ) {
-				event.type = handleObj.origType;
-				ret = handleObj.handler.apply( this, arguments );
-				event.type = fix;
-			}
-			return ret;
-		}
-	};
-});
-
-// IE submit delegation
-if ( !support.submitBubbles ) {
-
-	jQuery.event.special.submit = {
-		setup: function() {
-			// Only need this for delegated form submit events
-			if ( jQuery.nodeName( this, "form" ) ) {
-				return false;
-			}
-
-			// Lazy-add a submit handler when a descendant form may potentially be submitted
-			jQuery.event.add( this, "click._submit keypress._submit", function( e ) {
-				// Node name check avoids a VML-related crash in IE (#9807)
-				var elem = e.target,
-					form = jQuery.nodeName( elem, "input" ) || jQuery.nodeName( elem, "button" ) ? elem.form : undefined;
-				if ( form && !jQuery._data( form, "submitBubbles" ) ) {
-					jQuery.event.add( form, "submit._submit", function( event ) {
-						event._submit_bubble = true;
-					});
-					jQuery._data( form, "submitBubbles", true );
-				}
-			});
-			// return undefined since we don't need an event listener
-		},
-
-		postDispatch: function( event ) {
-			// If form was submitted by the user, bubble the event up the tree
-			if ( event._submit_bubble ) {
-				delete event._submit_bubble;
-				if ( this.parentNode && !event.isTrigger ) {
-					jQuery.event.simulate( "submit", this.parentNode, event, true );
-				}
-			}
-		},
-
-		teardown: function() {
-			// Only need this for delegated form submit events
-			if ( jQuery.nodeName( this, "form" ) ) {
-				return false;
-			}
-
-			// Remove delegated handlers; cleanData eventually reaps submit handlers attached above
-			jQuery.event.remove( this, "._submit" );
-		}
-	};
-}
-
-// IE change delegation and checkbox/radio fix
-if ( !support.changeBubbles ) {
-
-	jQuery.event.special.change = {
-
-		setup: function() {
-
-			if ( rformElems.test( this.nodeName ) ) {
-				// IE doesn't fire change on a check/radio until blur; trigger it on click
-				// after a propertychange. Eat the blur-change in special.change.handle.
-				// This still fires onchange a second time for check/radio after blur.
-				if ( this.type === "checkbox" || this.type === "radio" ) {
-					jQuery.event.add( this, "propertychange._change", function( event ) {
-						if ( event.originalEvent.propertyName === "checked" ) {
-							this._just_changed = true;
-						}
-					});
-					jQuery.event.add( this, "click._change", function( event ) {
-						if ( this._just_changed && !event.isTrigger ) {
-							this._just_changed = false;
-						}
-						// Allow triggered, simulated change events (#11500)
-						jQuery.event.simulate( "change", this, event, true );
-					});
-				}
-				return false;
-			}
-			// Delegated event; lazy-add a change handler on descendant inputs
-			jQuery.event.add( this, "beforeactivate._change", function( e ) {
-				var elem = e.target;
-
-				if ( rformElems.test( elem.nodeName ) && !jQuery._data( elem, "changeBubbles" ) ) {
-					jQuery.event.add( elem, "change._change", function( event ) {
-						if ( this.parentNode && !event.isSimulated && !event.isTrigger ) {
-							jQuery.event.simulate( "change", this.parentNode, event, true );
-						}
-					});
-					jQuery._data( elem, "changeBubbles", true );
-				}
-			});
-		},
-
-		handle: function( event ) {
-			var elem = event.target;
-
-			// Swallow native change events from checkbox/radio, we already triggered them above
-			if ( this !== elem || event.isSimulated || event.isTrigger || (elem.type !== "radio" && elem.type !== "checkbox") ) {
-				return event.handleObj.handler.apply( this, arguments );
-			}
-		},
-
-		teardown: function() {
-			jQuery.event.remove( this, "._change" );
-
-			return !rformElems.test( this.nodeName );
-		}
-	};
-}
-
-// Create "bubbling" focus and blur events
-if ( !support.focusinBubbles ) {
-	jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) {
-
-		// Attach a single capturing handler on the document while someone wants focusin/focusout
-		var handler = function( event ) {
-				jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ), true );
-			};
-
-		jQuery.event.special[ fix ] = {
-			setup: function() {
-				var doc = this.ownerDocument || this,
-					attaches = jQuery._data( doc, fix );
-
-				if ( !attaches ) {
-					doc.addEventListener( orig, handler, true );
-				}
-				jQuery._data( doc, fix, ( attaches || 0 ) + 1 );
-			},
-			teardown: function() {
-				var doc = this.ownerDocument || this,
-					attaches = jQuery._data( doc, fix ) - 1;
-
-				if ( !attaches ) {
-					doc.removeEventListener( orig, handler, true );
-					jQuery._removeData( doc, fix );
-				} else {
-					jQuery._data( doc, fix, attaches );
-				}
-			}
-		};
-	});
-}
-
-jQuery.fn.extend({
-
-	on: function( types, selector, data, fn, /*INTERNAL*/ one ) {
-		var type, origFn;
-
-		// Types can be a map of types/handlers
-		if ( typeof types === "object" ) {
-			// ( types-Object, selector, data )
-			if ( typeof selector !== "string" ) {
-				// ( types-Object, data )
-				data = data || selector;
-				selector = undefined;
-			}
-			for ( type in types ) {
-				this.on( type, selector, data, types[ type ], one );
-			}
-			return this;
-		}
-
-		if ( data == null && fn == null ) {
-			// ( types, fn )
-			fn = selector;
-			data = selector = undefined;
-		} else if ( fn == null ) {
-			if ( typeof selector === "string" ) {
-				// ( types, selector, fn )
-				fn = data;
-				data = undefined;
-			} else {
-				// ( types, data, fn )
-				fn = data;
-				data = selector;
-				selector = undefined;
-			}
-		}
-		if ( fn === false ) {
-			fn = returnFalse;
-		} else if ( !fn ) {
-			return this;
-		}
-
-		if ( one === 1 ) {
-			origFn = fn;
-			fn = function( event ) {
-				// Can use an empty set, since event contains the info
-				jQuery().off( event );
-				return origFn.apply( this, arguments );
-			};
-			// Use same guid so caller can remove using origFn
-			fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ );
-		}
-		return this.each( function() {
-			jQuery.event.add( this, types, fn, data, selector );
-		});
-	},
-	one: function( types, selector, data, fn ) {
-		return this.on( types, selector, data, fn, 1 );
-	},
-	off: function( types, selector, fn ) {
-		var handleObj, type;
-		if ( types && types.preventDefault && types.handleObj ) {
-			// ( event )  dispatched jQuery.Event
-			handleObj = types.handleObj;
-			jQuery( types.delegateTarget ).off(
-				handleObj.namespace ? handleObj.origType + "." + handleObj.namespace : handleObj.origType,
-				handleObj.selector,
-				handleObj.handler
-			);
-			return this;
-		}
-		if ( typeof types === "object" ) {
-			// ( types-object [, selector] )
-			for ( type in types ) {
-				this.off( type, selector, types[ type ] );
-			}
-			return this;
-		}
-		if ( selector === false || typeof selector === "function" ) {
-			// ( types [, fn] )
-			fn = selector;
-			selector = undefined;
-		}
-		if ( fn === false ) {
-			fn = returnFalse;
-		}
-		return this.each(function() {
-			jQuery.event.remove( this, types, fn, selector );
-		});
-	},
-
-	trigger: function( type, data ) {
-		return this.each(function() {
-			jQuery.event.trigger( type, data, this );
-		});
-	},
-	triggerHandler: function( type, data ) {
-		var elem = this[0];
-		if ( elem ) {
-			return jQuery.event.trigger( type, data, elem, true );
-		}
-	}
-});
-
-
-function createSafeFragment( document ) {
-	var list = nodeNames.split( "|" ),
-		safeFrag = document.createDocumentFragment();
-
-	if ( safeFrag.createElement ) {
-		while ( list.length ) {
-			safeFrag.createElement(
-				list.pop()
-			);
-		}
-	}
-	return safeFrag;
-}
-
-var nodeNames = "abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|" +
-		"header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",
-	rinlinejQuery = / jQuery\d+="(?:null|\d+)"/g,
-	rnoshimcache = new RegExp("<(?:" + nodeNames + ")[\\s/>]", "i"),
-	rleadingWhitespace = /^\s+/,
-	rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,
-	rtagName = /<([\w:]+)/,
-	rtbody = /<tbody/i,
-	rhtml = /<|&#?\w+;/,
-	rnoInnerhtml = /<(?:script|style|link)/i,
-	// checked="checked" or checked
-	rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,
-	rscriptType = /^$|\/(?:java|ecma)script/i,
-	rscriptTypeMasked = /^true\/(.*)/,
-	rcleanScript = /^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,
-
-	// We have to close these tags to support XHTML (#13200)
-	wrapMap = {
-		option: [ 1, "<select multiple='multiple'>", "</select>" ],
-		legend: [ 1, "<fieldset>", "</fieldset>" ],
-		area: [ 1, "<map>", "</map>" ],
-		param: [ 1, "<object>", "</object>" ],
-		thead: [ 1, "<table>", "</table>" ],
-		tr: [ 2, "<table><tbody>", "</tbody></table>" ],
-		col: [ 2, "<table><tbody></tbody><colgroup>", "</colgroup></table>" ],
-		td: [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ],
-
-		// IE6-8 can't serialize link, script, style, or any html5 (NoScope) tags,
-		// unless wrapped in a div with non-breaking characters in front of it.
-		_default: support.htmlSerialize ? [ 0, "", "" ] : [ 1, "X<div>", "</div>"  ]
-	},
-	safeFragment = createSafeFragment( document ),
-	fragmentDiv = safeFragment.appendChild( document.createElement("div") );
-
-wrapMap.optgroup = wrapMap.option;
-wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
-wrapMap.th = wrapMap.td;
-
-function getAll( context, tag ) {
-	var elems, elem,
-		i = 0,
-		found = typeof context.getElementsByTagName !== strundefined ? context.getElementsByTagName( tag || "*" ) :
-			typeof context.querySelectorAll !== strundefined ? context.querySelectorAll( tag || "*" ) :
-			undefined;
-
-	if ( !found ) {
-		for ( found = [], elems = context.childNodes || context; (elem = elems[i]) != null; i++ ) {
-			if ( !tag || jQuery.nodeName( elem, tag ) ) {
-				found.push( elem );
-			} else {
-				jQuery.merge( found, getAll( elem, tag ) );
-			}
-		}
-	}
-
-	return tag === undefined || tag && jQuery.nodeName( context, tag ) ?
-		jQuery.merge( [ context ], found ) :
-		found;
-}
-
-// Used in buildFragment, fixes the defaultChecked property
-function fixDefaultChecked( elem ) {
-	if ( rcheckableType.test( elem.type ) ) {
-		elem.defaultChecked = elem.checked;
-	}
-}
-
-// Support: IE<8
-// Manipulating tables requires a tbody
-function manipulationTarget( elem, content ) {
-	return jQuery.nodeName( elem, "table" ) &&
-		jQuery.nodeName( content.nodeType !== 11 ? content : content.firstChild, "tr" ) ?
-
-		elem.getElementsByTagName("tbody")[0] ||
-			elem.appendChild( elem.ownerDocument.createElement("tbody") ) :
-		elem;
-}
-
-// Replace/restore the type attribute of script elements for safe DOM manipulation
-function disableScript( elem ) {
-	elem.type = (jQuery.find.attr( elem, "type" ) !== null) + "/" + elem.type;
-	return elem;
-}
-function restoreScript( elem ) {
-	var match = rscriptTypeMasked.exec( elem.type );
-	if ( match ) {
-		elem.type = match[1];
-	} else {
-		elem.removeAttribute("type");
-	}
-	return elem;
-}
-
-// Mark scripts as having already been evaluated
-function setGlobalEval( elems, refElements ) {
-	var elem,
-		i = 0;
-	for ( ; (elem = elems[i]) != null; i++ ) {
-		jQuery._data( elem, "globalEval", !refElements || jQuery._data( refElements[i], "globalEval" ) );
-	}
-}
-
-function cloneCopyEvent( src, dest ) {
-
-	if ( dest.nodeType !== 1 || !jQuery.hasData( src ) ) {
-		return;
-	}
-
-	var type, i, l,
-		oldData = jQuery._data( src ),
-		curData = jQuery._data( dest, oldData ),
-		events = oldData.events;
-
-	if ( events ) {
-		delete curData.handle;
-		curData.events = {};
-
-		for ( type in events ) {
-			for ( i = 0, l = events[ type ].length; i < l; i++ ) {
-				jQuery.event.add( dest, type, events[ type ][ i ] );
-			}
-		}
-	}
-
-	// make the cloned public data object a copy from the original
-	if ( curData.data ) {
-		curData.data = jQuery.extend( {}, curData.data );
-	}
-}
-
-function fixCloneNodeIssues( src, dest ) {
-	var nodeName, e, data;
-
-	// We do not need to do anything for non-Elements
-	if ( dest.nodeType !== 1 ) {
-		return;
-	}
-
-	nodeName = dest.nodeName.toLowerCase();
-
-	// IE6-8 copies events bound via attachEvent when using cloneNode.
-	if ( !support.noCloneEvent && dest[ jQuery.expando ] ) {
-		data = jQuery._data( dest );
-
-		for ( e in data.events ) {
-			jQuery.removeEvent( dest, e, data.handle );
-		}
-
-		// Event data gets referenced instead of copied if the expando gets copied too
-		dest.removeAttribute( jQuery.expando );
-	}
-
-	// IE blanks contents when cloning scripts, and tries to evaluate newly-set text
-	if ( nodeName === "script" && dest.text !== src.text ) {
-		disableScript( dest ).text = src.text;
-		restoreScript( dest );
-
-	// IE6-10 improperly clones children of object elements using classid.
-	// IE10 throws NoModificationAllowedError if parent is null, #12132.
-	} else if ( nodeName === "object" ) {
-		if ( dest.parentNode ) {
-			dest.outerHTML = src.outerHTML;
-		}
-
-		// This path appears unavoidable for IE9. When cloning an object
-		// element in IE9, the outerHTML strategy above is not sufficient.
-		// If the src has innerHTML and the destination does not,
-		// copy the src.innerHTML into the dest.innerHTML. #10324
-		if ( support.html5Clone && ( src.innerHTML && !jQuery.trim(dest.innerHTML) ) ) {
-			dest.innerHTML = src.innerHTML;
-		}
-
-	} else if ( nodeName === "input" && rcheckableType.test( src.type ) ) {
-		// IE6-8 fails to persist the checked state of a cloned checkbox
-		// or radio button. Worse, IE6-7 fail to give the cloned element
-		// a checked appearance if the defaultChecked value isn't also set
-
-		dest.defaultChecked = dest.checked = src.checked;
-
-		// IE6-7 get confused and end up setting the value of a cloned
-		// checkbox/radio button to an empty string instead of "on"
-		if ( dest.value !== src.value ) {
-			dest.value = src.value;
-		}
-
-	// IE6-8 fails to return the selected option to the default selected
-	// state when cloning options
-	} else if ( nodeName === "option" ) {
-		dest.defaultSelected = dest.selected = src.defaultSelected;
-
-	// IE6-8 fails to set the defaultValue to the correct value when
-	// cloning other types of input fields
-	} else if ( nodeName === "input" || nodeName === "textarea" ) {
-		dest.defaultValue = src.defaultValue;
-	}
-}
-
-jQuery.extend({
-	clone: function( elem, dataAndEvents, deepDataAndEvents ) {
-		var destElements, node, clone, i, srcElements,
-			inPage = jQuery.contains( elem.ownerDocument, elem );
-
-		if ( support.html5Clone || jQuery.isXMLDoc(elem) || !rnoshimcache.test( "<" + elem.nodeName + ">" ) ) {
-			clone = elem.cloneNode( true );
-
-		// IE<=8 does not properly clone detached, unknown element nodes
-		} else {
-			fragmentDiv.innerHTML = elem.outerHTML;
-			fragmentDiv.removeChild( clone = fragmentDiv.firstChild );
-		}
-
-		if ( (!support.noCloneEvent || !support.noCloneChecked) &&
-				(elem.nodeType === 1 || elem.nodeType === 11) && !jQuery.isXMLDoc(elem) ) {
-
-			// We eschew Sizzle here for performance reasons: http://jsperf.com/getall-vs-sizzle/2
-			destElements = getAll( clone );
-			srcElements = getAll( elem );
-
-			// Fix all IE cloning issues
-			for ( i = 0; (node = srcElements[i]) != null; ++i ) {
-				// Ensure that the destination node is not null; Fixes #9587
-				if ( destElements[i] ) {
-					fixCloneNodeIssues( node, destElements[i] );
-				}
-			}
-		}
-
-		// Copy the events from the original to the clone
-		if ( dataAndEvents ) {
-			if ( deepDataAndEvents ) {
-				srcElements = srcElements || getAll( elem );
-				destElements = destElements || getAll( clone );
-
-				for ( i = 0; (node = srcElements[i]) != null; i++ ) {
-					cloneCopyEvent( node, destElements[i] );
-				}
-			} else {
-				cloneCopyEvent( elem, clone );
-			}
-		}
-
-		// Preserve script evaluation history
-		destElements = getAll( clone, "script" );
-		if ( destElements.length > 0 ) {
-			setGlobalEval( destElements, !inPage && getAll( elem, "script" ) );
-		}
-
-		destElements = srcElements = node = null;
-
-		// Return the cloned set
-		return clone;
-	},
-
-	buildFragment: function( elems, context, scripts, selection ) {
-		var j, elem, contains,
-			tmp, tag, tbody, wrap,
-			l = elems.length,
-
-			// Ensure a safe fragment
-			safe = createSafeFragment( context ),
-
-			nodes = [],
-			i = 0;
-
-		for ( ; i < l; i++ ) {
-			elem = elems[ i ];
-
-			if ( elem || elem === 0 ) {
-
-				// Add nodes directly
-				if ( jQuery.type( elem ) === "object" ) {
-					jQuery.merge( nodes, elem.nodeType ? [ elem ] : elem );
-
-				// Convert non-html into a text node
-				} else if ( !rhtml.test( elem ) ) {
-					nodes.push( context.createTextNode( elem ) );
-
-				// Convert html into DOM nodes
-				} else {
-					tmp = tmp || safe.appendChild( context.createElement("div") );
-
-					// Deserialize a standard representation
-					tag = (rtagName.exec( elem ) || [ "", "" ])[ 1 ].toLowerCase();
-					wrap = wrapMap[ tag ] || wrapMap._default;
-
-					tmp.innerHTML = wrap[1] + elem.replace( rxhtmlTag, "<$1></$2>" ) + wrap[2];
-
-					// Descend through wrappers to the right content
-					j = wrap[0];
-					while ( j-- ) {
-						tmp = tmp.lastChild;
-					}
-
-					// Manually add leading whitespace removed by IE
-					if ( !support.leadingWhitespace && rleadingWhitespace.test( elem ) ) {
-						nodes.push( context.createTextNode( rleadingWhitespace.exec( elem )[0] ) );
-					}
-
-					// Remove IE's autoinserted <tbody> from table fragments
-					if ( !support.tbody ) {
-
-						// String was a <table>, *may* have spurious <tbody>
-						elem = tag === "table" && !rtbody.test( elem ) ?
-							tmp.firstChild :
-
-							// String was a bare <thead> or <tfoot>
-							wrap[1] === "<table>" && !rtbody.test( elem ) ?
-								tmp :
-								0;
-
-						j = elem && elem.childNodes.length;
-						while ( j-- ) {
-							if ( jQuery.nodeName( (tbody = elem.childNodes[j]), "tbody" ) && !tbody.childNodes.length ) {
-								elem.removeChild( tbody );
-							}
-						}
-					}
-
-					jQuery.merge( nodes, tmp.childNodes );
-
-					// Fix #12392 for WebKit and IE > 9
-					tmp.textContent = "";
-
-					// Fix #12392 for oldIE
-					while ( tmp.firstChild ) {
-						tmp.removeChild( tmp.firstChild );
-					}
-
-					// Remember the top-level container for proper cleanup
-					tmp = safe.lastChild;
-				}
-			}
-		}
-
-		// Fix #11356: Clear elements from fragment
-		if ( tmp ) {
-			safe.removeChild( tmp );
-		}
-
-		// Reset defaultChecked for any radios and checkboxes
-		// about to be appended to the DOM in IE 6/7 (#8060)
-		if ( !support.appendChecked ) {
-			jQuery.grep( getAll( nodes, "input" ), fixDefaultChecked );
-		}
-
-		i = 0;
-		while ( (elem = nodes[ i++ ]) ) {
-
-			// #4087 - If origin and destination elements are the same, and this is
-			// that element, do not do anything
-			if ( selection && jQuery.inArray( elem, selection ) !== -1 ) {
-				continue;
-			}
-
-			contains = jQuery.contains( elem.ownerDocument, elem );
-
-			// Append to fragment
-			tmp = getAll( safe.appendChild( elem ), "script" );
-
-			// Preserve script evaluation history
-			if ( contains ) {
-				setGlobalEval( tmp );
-			}
-
-			// Capture executables
-			if ( scripts ) {
-				j = 0;
-				while ( (elem = tmp[ j++ ]) ) {
-					if ( rscriptType.test( elem.type || "" ) ) {
-						scripts.push( elem );
-					}
-				}
-			}
-		}
-
-		tmp = null;
-
-		return safe;
-	},
-
-	cleanData: function( elems, /* internal */ acceptData ) {
-		var elem, type, id, data,
-			i = 0,
-			internalKey = jQuery.expando,
-			cache = jQuery.cache,
-			deleteExpando = support.deleteExpando,
-			special = jQuery.event.special;
-
-		for ( ; (elem = elems[i]) != null; i++ ) {
-			if ( acceptData || jQuery.acceptData( elem ) ) {
-
-				id = elem[ internalKey ];
-				data = id && cache[ id ];
-
-				if ( data ) {
-					if ( data.events ) {
-						for ( type in data.events ) {
-							if ( special[ type ] ) {
-								jQuery.event.remove( elem, type );
-
-							// This is a shortcut to avoid jQuery.event.remove's overhead
-							} else {
-								jQuery.removeEvent( elem, type, data.handle );
-							}
-						}
-					}
-
-					// Remove cache only if it was not already removed by jQuery.event.remove
-					if ( cache[ id ] ) {
-
-						delete cache[ id ];
-
-						// IE does not allow us to delete expando properties from nodes,
-						// nor does it have a removeAttribute function on Document nodes;
-						// we must handle all of these cases
-						if ( deleteExpando ) {
-							delete elem[ internalKey ];
-
-						} else if ( typeof elem.removeAttribute !== strundefined ) {
-							elem.removeAttribute( internalKey );
-
-						} else {
-							elem[ internalKey ] = null;
-						}
-
-						deletedIds.push( id );
-					}
-				}
-			}
-		}
-	}
-});
-
-jQuery.fn.extend({
-	text: function( value ) {
-		return access( this, function( value ) {
-			return value === undefined ?
-				jQuery.text( this ) :
-				this.empty().append( ( this[0] && this[0].ownerDocument || document ).createTextNode( value ) );
-		}, null, value, arguments.length );
-	},
-
-	append: function() {
-		return this.domManip( arguments, function( elem ) {
-			if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
-				var target = manipulationTarget( this, elem );
-				target.appendChild( elem );
-			}
-		});
-	},
-
-	prepend: function() {
-		return this.domManip( arguments, function( elem ) {
-			if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
-				var target = manipulationTarget( this, elem );
-				target.insertBefore( elem, target.firstChild );
-			}
-		});
-	},
-
-	before: function() {
-		return this.domManip( arguments, function( elem ) {
-			if ( this.parentNode ) {
-				this.parentNode.insertBefore( elem, this );
-			}
-		});
-	},
-
-	after: function() {
-		return this.domManip( arguments, function( elem ) {
-			if ( this.parentNode ) {
-				this.parentNode.insertBefore( elem, this.nextSibling );
-			}
-		});
-	},
-
-	remove: function( selector, keepData /* Internal Use Only */ ) {
-		var elem,
-			elems = selector ? jQuery.filter( selector, this ) : this,
-			i = 0;
-
-		for ( ; (elem = elems[i]) != null; i++ ) {
-
-			if ( !keepData && elem.nodeType === 1 ) {
-				jQuery.cleanData( getAll( elem ) );
-			}
-
-			if ( elem.parentNode ) {
-				if ( keepData && jQuery.contains( elem.ownerDocument, elem ) ) {
-					setGlobalEval( getAll( elem, "script" ) );
-				}
-				elem.parentNode.removeChild( elem );
-			}
-		}
-
-		return this;
-	},
-
-	empty: function() {
-		var elem,
-			i = 0;
-
-		for ( ; (elem = this[i]) != null; i++ ) {
-			// Remove element nodes and prevent memory leaks
-			if ( elem.nodeType === 1 ) {
-				jQuery.cleanData( getAll( elem, false ) );
-			}
-
-			// Remove any remaining nodes
-			while ( elem.firstChild ) {
-				elem.removeChild( elem.firstChild );
-			}
-
-			// If this is a select, ensure that it displays empty (#12336)
-			// Support: IE<9
-			if ( elem.options && jQuery.nodeName( elem, "select" ) ) {
-				elem.options.length = 0;
-			}
-		}
-
-		return this;
-	},
-
-	clone: function( dataAndEvents, deepDataAndEvents ) {
-		dataAndEvents = dataAndEvents == null ? false : dataAndEvents;
-		deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents;
-
-		return this.map(function() {
-			return jQuery.clone( this, dataAndEvents, deepDataAndEvents );
-		});
-	},
-
-	html: function( value ) {
-		return access( this, function( value ) {
-			var elem = this[ 0 ] || {},
-				i = 0,
-				l = this.length;
-
-			if ( value === undefined ) {
-				return elem.nodeType === 1 ?
-					elem.innerHTML.replace( rinlinejQuery, "" ) :
-					undefined;
-			}
-
-			// See if we can take a shortcut and just use innerHTML
-			if ( typeof value === "string" && !rnoInnerhtml.test( value ) &&
-				( support.htmlSerialize || !rnoshimcache.test( value )  ) &&
-				( support.leadingWhitespace || !rleadingWhitespace.test( value ) ) &&
-				!wrapMap[ (rtagName.exec( value ) || [ "", "" ])[ 1 ].toLowerCase() ] ) {
-
-				value = value.replace( rxhtmlTag, "<$1></$2>" );
-
-				try {
-					for (; i < l; i++ ) {
-						// Remove element nodes and prevent memory leaks
-						elem = this[i] || {};
-						if ( elem.nodeType === 1 ) {
-							jQuery.cleanData( getAll( elem, false ) );
-							elem.innerHTML = value;
-						}
-					}
-
-					elem = 0;
-
-				// If using innerHTML throws an exception, use the fallback method
-				} catch(e) {}
-			}
-
-			if ( elem ) {
-				this.empty().append( value );
-			}
-		}, null, value, arguments.length );
-	},
-
-	replaceWith: function() {
-		var arg = arguments[ 0 ];
-
-		// Make the changes, replacing each context element with the new content
-		this.domManip( arguments, function( elem ) {
-			arg = this.parentNode;
-
-			jQuery.cleanData( getAll( this ) );
-
-			if ( arg ) {
-				arg.replaceChild( elem, this );
-			}
-		});
-
-		// Force removal if there was no new content (e.g., from empty arguments)
-		return arg && (arg.length || arg.nodeType) ? this : this.remove();
-	},
-
-	detach: function( selector ) {
-		return this.remove( selector, true );
-	},
-
-	domManip: function( args, callback ) {
-
-		// Flatten any nested arrays
-		args = concat.apply( [], args );
-
-		var first, node, hasScripts,
-			scripts, doc, fragment,
-			i = 0,
-			l = this.length,
-			set = this,
-			iNoClone = l - 1,
-			value = args[0],
-			isFunction = jQuery.isFunction( value );
-
-		// We can't cloneNode fragments that contain checked, in WebKit
-		if ( isFunction ||
-				( l > 1 && typeof value === "string" &&
-					!support.checkClone && rchecked.test( value ) ) ) {
-			return this.each(function( index ) {
-				var self = set.eq( index );
-				if ( isFunction ) {
-					args[0] = value.call( this, index, self.html() );
-				}
-				self.domManip( args, callback );
-			});
-		}
-
-		if ( l ) {
-			fragment = jQuery.buildFragment( args, this[ 0 ].ownerDocument, false, this );
-			first = fragment.firstChild;
-
-			if ( fragment.childNodes.length === 1 ) {
-				fragment = first;
-			}
-
-			if ( first ) {
-				scripts = jQuery.map( getAll( fragment, "script" ), disableScript );
-				hasScripts = scripts.length;
-
-				// Use the original fragment for the last item instead of the first because it can end up
-				// being emptied incorrectly in certain situations (#8070).
-				for ( ; i < l; i++ ) {
-					node = fragment;
-
-					if ( i !== iNoClone ) {
-						node = jQuery.clone( node, true, true );
-
-						// Keep references to cloned scripts for later restoration
-						if ( hasScripts ) {
-							jQuery.merge( scripts, getAll( node, "script" ) );
-						}
-					}
-
-					callback.call( this[i], node, i );
-				}
-
-				if ( hasScripts ) {
-					doc = scripts[ scripts.length - 1 ].ownerDocument;
-
-					// Reenable scripts
-					jQuery.map( scripts, restoreScript );
-
-					// Evaluate executable scripts on first document insertion
-					for ( i = 0; i < hasScripts; i++ ) {
-						node = scripts[ i ];
-						if ( rscriptType.test( node.type || "" ) &&
-							!jQuery._data( node, "globalEval" ) && jQuery.contains( doc, node ) ) {
-
-							if ( node.src ) {
-								// Optional AJAX dependency, but won't run scripts if not present
-								if ( jQuery._evalUrl ) {
-									jQuery._evalUrl( node.src );
-								}
-							} else {
-								jQuery.globalEval( ( node.text || node.textContent || node.innerHTML || "" ).replace( rcleanScript, "" ) );
-							}
-						}
-					}
-				}
-
-				// Fix #11809: Avoid leaking memory
-				fragment = first = null;
-			}
-		}
-
-		return this;
-	}
-});
-
-jQuery.each({
-	appendTo: "append",
-	prependTo: "prepend",
-	insertBefore: "before",
-	insertAfter: "after",
-	replaceAll: "replaceWith"
-}, function( name, original ) {
-	jQuery.fn[ name ] = function( selector ) {
-		var elems,
-			i = 0,
-			ret = [],
-			insert = jQuery( selector ),
-			last = insert.length - 1;
-
-		for ( ; i <= last; i++ ) {
-			elems = i === last ? this : this.clone(true);
-			jQuery( insert[i] )[ original ]( elems );
-
-			// Modern browsers can apply jQuery collections as arrays, but oldIE needs a .get()
-			push.apply( ret, elems.get() );
-		}
-
-		return this.pushStack( ret );
-	};
-});
-
-
-var iframe,
-	elemdisplay = {};
-
-/**
- * Retrieve the actual display of a element
- * @param {String} name nodeName of the element
- * @param {Object} doc Document object
- */
-// Called only from within defaultDisplay
-function actualDisplay( name, doc ) {
-	var style,
-		elem = jQuery( doc.createElement( name ) ).appendTo( doc.body ),
-
-		// getDefaultComputedStyle might be reliably used only on attached element
-		display = window.getDefaultComputedStyle && ( style = window.getDefaultComputedStyle( elem[ 0 ] ) ) ?
-
-			// Use of this method is a temporary fix (more like optmization) until something better comes along,
-			// since it was removed from specification and supported only in FF
-			style.display : jQuery.css( elem[ 0 ], "display" );
-
-	// We don't have any data stored on the element,
-	// so use "detach" method as fast way to get rid of the element
-	elem.detach();
-
-	return display;
-}
-
-/**
- * Try to determine the default display value of an element
- * @param {String} nodeName
- */
-function defaultDisplay( nodeName ) {
-	var doc = document,
-		display = elemdisplay[ nodeName ];
-
-	if ( !display ) {
-		display = actualDisplay( nodeName, doc );
-
-		// If the simple way fails, read from inside an iframe
-		if ( display === "none" || !display ) {
-
-			// Use the already-created iframe if possible
-			iframe = (iframe || jQuery( "<iframe frameborder='0' width='0' height='0'/>" )).appendTo( doc.documentElement );
-
-			// Always write a new HTML skeleton so Webkit and Firefox don't choke on reuse
-			doc = ( iframe[ 0 ].contentWindow || iframe[ 0 ].contentDocument ).document;
-
-			// Support: IE
-			doc.write();
-			doc.close();
-
-			display = actualDisplay( nodeName, doc );
-			iframe.detach();
-		}
-
-		// Store the correct default display
-		elemdisplay[ nodeName ] = display;
-	}
-
-	return display;
-}
-
-
-(function() {
-	var shrinkWrapBlocksVal;
-
-	support.shrinkWrapBlocks = function() {
-		if ( shrinkWrapBlocksVal != null ) {
-			return shrinkWrapBlocksVal;
-		}
-
-		// Will be changed later if needed.
-		shrinkWrapBlocksVal = false;
-
-		// Minified: var b,c,d
-		var div, body, container;
-
-		body = document.getElementsByTagName( "body" )[ 0 ];
-		if ( !body || !body.style ) {
-			// Test fired too early or in an unsupported environment, exit.
-			return;
-		}
-
-		// Setup
-		div = document.createElement( "div" );
-		container = document.createElement( "div" );
-		container.style.cssText = "position:absolute;border:0;width:0;height:0;top:0;left:-9999px";
-		body.appendChild( container ).appendChild( div );
-
-		// Support: IE6
-		// Check if elements with layout shrink-wrap their children
-		if ( typeof div.style.zoom !== strundefined ) {
-			// Reset CSS: box-sizing; display; margin; border
-			div.style.cssText =
-				// Support: Firefox<29, Android 2.3
-				// Vendor-prefix box-sizing
-				"-webkit-box-sizing:content-box;-moz-box-sizing:content-box;" +
-				"box-sizing:content-box;display:block;margin:0;border:0;" +
-				"padding:1px;width:1px;zoom:1";
-			div.appendChild( document.createElement( "div" ) ).style.width = "5px";
-			shrinkWrapBlocksVal = div.offsetWidth !== 3;
-		}
-
-		body.removeChild( container );
-
-		return shrinkWrapBlocksVal;
-	};
-
-})();
-var rmargin = (/^margin/);
-
-var rnumnonpx = new RegExp( "^(" + pnum + ")(?!px)[a-z%]+$", "i" );
-
-
-
-var getStyles, curCSS,
-	rposition = /^(top|right|bottom|left)$/;
-
-if ( window.getComputedStyle ) {
-	getStyles = function( elem ) {
-		// Support: IE<=11+, Firefox<=30+ (#15098, #14150)
-		// IE throws on elements created in popups
-		// FF meanwhile throws on frame elements through "defaultView.getComputedStyle"
-		if ( elem.ownerDocument.defaultView.opener ) {
-			return elem.ownerDocument.defaultView.getComputedStyle( elem, null );
-		}
-
-		return window.getComputedStyle( elem, null );
-	};
-
-	curCSS = function( elem, name, computed ) {
-		var width, minWidth, maxWidth, ret,
-			style = elem.style;
-
-		computed = computed || getStyles( elem );
-
-		// getPropertyValue is only needed for .css('filter') in IE9, see #12537
-		ret = computed ? computed.getPropertyValue( name ) || computed[ name ] : undefined;
-
-		if ( computed ) {
-
-			if ( ret === "" && !jQuery.contains( elem.ownerDocument, elem ) ) {
-				ret = jQuery.style( elem, name );
-			}
-
-			// A tribute to the "awesome hack by Dean Edwards"
-			// Chrome < 17 and Safari 5.0 uses "computed value" instead of "used value" for margin-right
-			// Safari 5.1.7 (at least) returns percentage for a larger set of values, but width seems to be reliably pixels
-			// this is against the CSSOM draft spec: http://dev.w3.org/csswg/cssom/#resolved-values
-			if ( rnumnonpx.test( ret ) && rmargin.test( name ) ) {
-
-				// Remember the original values
-				width = style.width;
-				minWidth = style.minWidth;
-				maxWidth = style.maxWidth;
-
-				// Put in the new values to get a computed value out
-				style.minWidth = style.maxWidth = style.width = ret;
-				ret = computed.width;
-
-				// Revert the changed values
-				style.width = width;
-				style.minWidth = minWidth;
-				style.maxWidth = maxWidth;
-			}
-		}
-
-		// Support: IE
-		// IE returns zIndex value as an integer.
-		return ret === undefined ?
-			ret :
-			ret + "";
-	};
-} else if ( document.documentElement.currentStyle ) {
-	getStyles = function( elem ) {
-		return elem.currentStyle;
-	};
-
-	curCSS = function( elem, name, computed ) {
-		var left, rs, rsLeft, ret,
-			style = elem.style;
-
-		computed = computed || getStyles( elem );
-		ret = computed ? computed[ name ] : undefined;
-
-		// Avoid setting ret to empty string here
-		// so we don't default to auto
-		if ( ret == null && style && style[ name ] ) {
-			ret = style[ name ];
-		}
-
-		// From the awesome hack by Dean Edwards
-		// http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
-
-		// If we're not dealing with a regular pixel number
-		// but a number that has a weird ending, we need to convert it to pixels
-		// but not position css attributes, as those are proportional to the parent element instead
-		// and we can't measure the parent instead because it might trigger a "stacking dolls" problem
-		if ( rnumnonpx.test( ret ) && !rposition.test( name ) ) {
-
-			// Remember the original values
-			left = style.left;
-			rs = elem.runtimeStyle;
-			rsLeft = rs && rs.left;
-
-			// Put in the new values to get a computed value out
-			if ( rsLeft ) {
-				rs.left = elem.currentStyle.left;
-			}
-			style.left = name === "fontSize" ? "1em" : ret;
-			ret = style.pixelLeft + "px";
-
-			// Revert the changed values
-			style.left = left;
-			if ( rsLeft ) {
-				rs.left = rsLeft;
-			}
-		}
-
-		// Support: IE
-		// IE returns zIndex value as an integer.
-		return ret === undefined ?
-			ret :
-			ret + "" || "auto";
-	};
-}
-
-
-
-
-function addGetHookIf( conditionFn, hookFn ) {
-	// Define the hook, we'll check on the first run if it's really needed.
-	return {
-		get: function() {
-			var condition = conditionFn();
-
-			if ( condition == null ) {
-				// The test was not ready at this point; screw the hook this time
-				// but check again when needed next time.
-				return;
-			}
-
-			if ( condition ) {
-				// Hook not needed (or it's not possible to use it due to missing dependency),
-				// remove it.
-				// Since there are no other hooks for marginRight, remove the whole object.
-				delete this.get;
-				return;
-			}
-
-			// Hook needed; redefine it so that the support test is not executed again.
-
-			return (this.get = hookFn).apply( this, arguments );
-		}
-	};
-}
-
-
-(function() {
-	// Minified: var b,c,d,e,f,g, h,i
-	var div, style, a, pixelPositionVal, boxSizingReliableVal,
-		reliableHiddenOffsetsVal, reliableMarginRightVal;
-
-	// Setup
-	div = document.createElement( "div" );
-	div.innerHTML = "  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>";
-	a = div.getElementsByTagName( "a" )[ 0 ];
-	style = a && a.style;
-
-	// Finish early in limited (non-browser) environments
-	if ( !style ) {
-		return;
-	}
-
-	style.cssText = "float:left;opacity:.5";
-
-	// Support: IE<9
-	// Make sure that element opacity exists (as opposed to filter)
-	support.opacity = style.opacity === "0.5";
-
-	// Verify style float existence
-	// (IE uses styleFloat instead of cssFloat)
-	support.cssFloat = !!style.cssFloat;
-
-	div.style.backgroundClip = "content-box";
-	div.cloneNode( true ).style.backgroundClip = "";
-	support.clearCloneStyle = div.style.backgroundClip === "content-box";
-
-	// Support: Firefox<29, Android 2.3
-	// Vendor-prefix box-sizing
-	support.boxSizing = style.boxSizing === "" || style.MozBoxSizing === "" ||
-		style.WebkitBoxSizing === "";
-
-	jQuery.extend(support, {
-		reliableHiddenOffsets: function() {
-			if ( reliableHiddenOffsetsVal == null ) {
-				computeStyleTests();
-			}
-			return reliableHiddenOffsetsVal;
-		},
-
-		boxSizingReliable: function() {
-			if ( boxSizingReliableVal == null ) {
-				computeStyleTests();
-			}
-			return boxSizingReliableVal;
-		},
-
-		pixelPosition: function() {
-			if ( pixelPositionVal == null ) {
-				computeStyleTests();
-			}
-			return pixelPositionVal;
-		},
-
-		// Support: Android 2.3
-		reliableMarginRight: function() {
-			if ( reliableMarginRightVal == null ) {
-				computeStyleTests();
-			}
-			return reliableMarginRightVal;
-		}
-	});
-
-	function computeStyleTests() {
-		// Minified: var b,c,d,j
-		var div, body, container, contents;
-
-		body = document.getElementsByTagName( "body" )[ 0 ];
-		if ( !body || !body.style ) {
-			// Test fired too early or in an unsupported environment, exit.
-			return;
-		}
-
-		// Setup
-		div = document.createElement( "div" );
-		container = document.createElement( "div" );
-		container.style.cssText = "position:absolute;border:0;width:0;height:0;top:0;left:-9999px";
-		body.appendChild( container ).appendChild( div );
-
-		div.style.cssText =
-			// Support: Firefox<29, Android 2.3
-			// Vendor-prefix box-sizing
-			"-webkit-box-sizing:border-box;-moz-box-sizing:border-box;" +
-			"box-sizing:border-box;display:block;margin-top:1%;top:1%;" +
-			"border:1px;padding:1px;width:4px;position:absolute";
-
-		// Support: IE<9
-		// Assume reasonable values in the absence of getComputedStyle
-		pixelPositionVal = boxSizingReliableVal = false;
-		reliableMarginRightVal = true;
-
-		// Check for getComputedStyle so that this code is not run in IE<9.
-		if ( window.getComputedStyle ) {
-			pixelPositionVal = ( window.getComputedStyle( div, null ) || {} ).top !== "1%";
-			boxSizingReliableVal =
-				( window.getComputedStyle( div, null ) || { width: "4px" } ).width === "4px";
-
-			// Support: Android 2.3
-			// Div with explicit width and no margin-right incorrectly
-			// gets computed margin-right based on width of container (#3333)
-			// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
-			contents = div.appendChild( document.createElement( "div" ) );
-
-			// Reset CSS: box-sizing; display; margin; border; padding
-			contents.style.cssText = div.style.cssText =
-				// Support: Firefox<29, Android 2.3
-				// Vendor-prefix box-sizing
-				"-webkit-box-sizing:content-box;-moz-box-sizing:content-box;" +
-				"box-sizing:content-box;display:block;margin:0;border:0;padding:0";
-			contents.style.marginRight = contents.style.width = "0";
-			div.style.width = "1px";
-
-			reliableMarginRightVal =
-				!parseFloat( ( window.getComputedStyle( contents, null ) || {} ).marginRight );
-
-			div.removeChild( contents );
-		}
-
-		// Support: IE8
-		// Check if table cells still have offsetWidth/Height when they are set
-		// to display:none and there are still other visible table cells in a
-		// table row; if so, offsetWidth/Height are not reliable for use when
-		// determining if an element has been hidden directly using
-		// display:none (it is still safe to use offsets if a parent element is
-		// hidden; don safety goggles and see bug #4512 for more information).
-		div.innerHTML = "<table><tr><td></td><td>t</td></tr></table>";
-		contents = div.getElementsByTagName( "td" );
-		contents[ 0 ].style.cssText = "margin:0;border:0;padding:0;display:none";
-		reliableHiddenOffsetsVal = contents[ 0 ].offsetHeight === 0;
-		if ( reliableHiddenOffsetsVal ) {
-			contents[ 0 ].style.display = "";
-			contents[ 1 ].style.display = "none";
-			reliableHiddenOffsetsVal = contents[ 0 ].offsetHeight === 0;
-		}
-
-		body.removeChild( container );
-	}
-
-})();
-
-
-// A method for quickly swapping in/out CSS properties to get correct calculations.
-jQuery.swap = function( elem, options, callback, args ) {
-	var ret, name,
-		old = {};
-
-	// Remember the old values, and insert the new ones
-	for ( name in options ) {
-		old[ name ] = elem.style[ name ];
-		elem.style[ name ] = options[ name ];
-	}
-
-	ret = callback.apply( elem, args || [] );
-
-	// Revert the old values
-	for ( name in options ) {
-		elem.style[ name ] = old[ name ];
-	}
-
-	return ret;
-};
-
-
-var
-		ralpha = /alpha\([^)]*\)/i,
-	ropacity = /opacity\s*=\s*([^)]*)/,
-
-	// swappable if display is none or starts with table except "table", "table-cell", or "table-caption"
-	// see here for display values: https://developer.mozilla.org/en-US/docs/CSS/display
-	rdisplayswap = /^(none|table(?!-c[ea]).+)/,
-	rnumsplit = new RegExp( "^(" + pnum + ")(.*)$", "i" ),
-	rrelNum = new RegExp( "^([+-])=(" + pnum + ")", "i" ),
-
-	cssShow = { position: "absolute", visibility: "hidden", display: "block" },
-	cssNormalTransform = {
-		letterSpacing: "0",
-		fontWeight: "400"
-	},
-
-	cssPrefixes = [ "Webkit", "O", "Moz", "ms" ];
-
-
-// return a css property mapped to a potentially vendor prefixed property
-function vendorPropName( style, name ) {
-
-	// shortcut for names that are not vendor prefixed
-	if ( name in style ) {
-		return name;
-	}
-
-	// check for vendor prefixed names
-	var capName = name.charAt(0).toUpperCase() + name.slice(1),
-		origName = name,
-		i = cssPrefixes.length;
-
-	while ( i-- ) {
-		name = cssPrefixes[ i ] + capName;
-		if ( name in style ) {
-			return name;
-		}
-	}
-
-	return origName;
-}
-
-function showHide( elements, show ) {
-	var display, elem, hidden,
-		values = [],
-		index = 0,
-		length = elements.length;
-
-	for ( ; index < length; index++ ) {
-		elem = elements[ index ];
-		if ( !elem.style ) {
-			continue;
-		}
-
-		values[ index ] = jQuery._data( elem, "olddisplay" );
-		display = elem.style.display;
-		if ( show ) {
-			// Reset the inline display of this element to learn if it is
-			// being hidden by cascaded rules or not
-			if ( !values[ index ] && display === "none" ) {
-				elem.style.display = "";
-			}
-
-			// Set elements which have been overridden with display: none
-			// in a stylesheet to whatever the default browser style is
-			// for such an element
-			if ( elem.style.display === "" && isHidden( elem ) ) {
-				values[ index ] = jQuery._data( elem, "olddisplay", defaultDisplay(elem.nodeName) );
-			}
-		} else {
-			hidden = isHidden( elem );
-
-			if ( display && display !== "none" || !hidden ) {
-				jQuery._data( elem, "olddisplay", hidden ? display : jQuery.css( elem, "display" ) );
-			}
-		}
-	}
-
-	// Set the display of most of the elements in a second loop
-	// to avoid the constant reflow
-	for ( index = 0; index < length; index++ ) {
-		elem = elements[ index ];
-		if ( !elem.style ) {
-			continue;
-		}
-		if ( !show || elem.style.display === "none" || elem.style.display === "" ) {
-			elem.style.display = show ? values[ index ] || "" : "none";
-		}
-	}
-
-	return elements;
-}
-
-function setPositiveNumber( elem, value, subtract ) {
-	var matches = rnumsplit.exec( value );
-	return matches ?
-		// Guard against undefined "subtract", e.g., when used as in cssHooks
-		Math.max( 0, matches[ 1 ] - ( subtract || 0 ) ) + ( matches[ 2 ] || "px" ) :
-		value;
-}
-
-function augmentWidthOrHeight( elem, name, extra, isBorderBox, styles ) {
-	var i = extra === ( isBorderBox ? "border" : "content" ) ?
-		// If we already have the right measurement, avoid augmentation
-		4 :
-		// Otherwise initialize for horizontal or vertical properties
-		name === "width" ? 1 : 0,
-
-		val = 0;
-
-	for ( ; i < 4; i += 2 ) {
-		// both box models exclude margin, so add it if we want it
-		if ( extra === "margin" ) {
-			val += jQuery.css( elem, extra + cssExpand[ i ], true, styles );
-		}
-
-		if ( isBorderBox ) {
-			// border-box includes padding, so remove it if we want content
-			if ( extra === "content" ) {
-				val -= jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
-			}
-
-			// at this point, extra isn't border nor margin, so remove border
-			if ( extra !== "margin" ) {
-				val -= jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
-			}
-		} else {
-			// at this point, extra isn't content, so add padding
-			val += jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
-
-			// at this point, extra isn't content nor padding, so add border
-			if ( extra !== "padding" ) {
-				val += jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
-			}
-		}
-	}
-
-	return val;
-}
-
-function getWidthOrHeight( elem, name, extra ) {
-
-	// Start with offset property, which is equivalent to the border-box value
-	var valueIsBorderBox = true,
-		val = name === "width" ? elem.offsetWidth : elem.offsetHeight,
-		styles = getStyles( elem ),
-		isBorderBox = support.boxSizing && jQuery.css( elem, "boxSizing", false, styles ) === "border-box";
-
-	// some non-html elements return undefined for offsetWidth, so check for null/undefined
-	// svg - https://bugzilla.mozilla.org/show_bug.cgi?id=649285
-	// MathML - https://bugzilla.mozilla.org/show_bug.cgi?id=491668
-	if ( val <= 0 || val == null ) {
-		// Fall back to computed then uncomputed css if necessary
-		val = curCSS( elem, name, styles );
-		if ( val < 0 || val == null ) {
-			val = elem.style[ name ];
-		}
-
-		// Computed unit is not pixels. Stop here and return.
-		if ( rnumnonpx.test(val) ) {
-			return val;
-		}
-
-		// we need the check for style in case a browser which returns unreliable values
-		// for getComputedStyle silently falls back to the reliable elem.style
-		valueIsBorderBox = isBorderBox && ( support.boxSizingReliable() || val === elem.style[ name ] );
-
-		// Normalize "", auto, and prepare for extra
-		val = parseFloat( val ) || 0;
-	}
-
-	// use the active box-sizing model to add/subtract irrelevant styles
-	return ( val +
-		augmentWidthOrHeight(
-			elem,
-			name,
-			extra || ( isBorderBox ? "border" : "content" ),
-			valueIsBorderBox,
-			styles
-		)
-	) + "px";
-}
-
-jQuery.extend({
-	// Add in style property hooks for overriding the default
-	// behavior of getting and setting a style property
-	cssHooks: {
-		opacity: {
-			get: function( elem, computed ) {
-				if ( computed ) {
-					// We should always get a number back from opacity
-					var ret = curCSS( elem, "opacity" );
-					return ret === "" ? "1" : ret;
-				}
-			}
-		}
-	},
-
-	// Don't automatically add "px" to these possibly-unitless properties
-	cssNumber: {
-		"columnCount": true,
-		"fillOpacity": true,
-		"flexGrow": true,
-		"flexShrink": true,
-		"fontWeight": true,
-		"lineHeight": true,
-		"opacity": true,
-		"order": true,
-		"orphans": true,
-		"widows": true,
-		"zIndex": true,
-		"zoom": true
-	},
-
-	// Add in properties whose names you wish to fix before
-	// setting or getting the value
-	cssProps: {
-		// normalize float css property
-		"float": support.cssFloat ? "cssFloat" : "styleFloat"
-	},
-
-	// Get and set the style property on a DOM Node
-	style: function( elem, name, value, extra ) {
-		// Don't set styles on text and comment nodes
-		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || !elem.style ) {
-			return;
-		}
-
-		// Make sure that we're working with the right name
-		var ret, type, hooks,
-			origName = jQuery.camelCase( name ),
-			style = elem.style;
-
-		name = jQuery.cssProps[ origName ] || ( jQuery.cssProps[ origName ] = vendorPropName( style, origName ) );
-
-		// gets hook for the prefixed version
-		// followed by the unprefixed version
-		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
-
-		// Check if we're setting a value
-		if ( value !== undefined ) {
-			type = typeof value;
-
-			// convert relative number strings (+= or -=) to relative numbers. #7345
-			if ( type === "string" && (ret = rrelNum.exec( value )) ) {
-				value = ( ret[1] + 1 ) * ret[2] + parseFloat( jQuery.css( elem, name ) );
-				// Fixes bug #9237
-				type = "number";
-			}
-
-			// Make sure that null and NaN values aren't set. See: #7116
-			if ( value == null || value !== value ) {
-				return;
-			}
-
-			// If a number was passed in, add 'px' to the (except for certain CSS properties)
-			if ( type === "number" && !jQuery.cssNumber[ origName ] ) {
-				value += "px";
-			}
-
-			// Fixes #8908, it can be done more correctly by specifing setters in cssHooks,
-			// but it would mean to define eight (for every problematic property) identical functions
-			if ( !support.clearCloneStyle && value === "" && name.indexOf("background") === 0 ) {
-				style[ name ] = "inherit";
-			}
-
-			// If a hook was provided, use that value, otherwise just set the specified value
-			if ( !hooks || !("set" in hooks) || (value = hooks.set( elem, value, extra )) !== undefined ) {
-
-				// Support: IE
-				// Swallow errors from 'invalid' CSS values (#5509)
-				try {
-					style[ name ] = value;
-				} catch(e) {}
-			}
-
-		} else {
-			// If a hook was provided get the non-computed value from there
-			if ( hooks && "get" in hooks && (ret = hooks.get( elem, false, extra )) !== undefined ) {
-				return ret;
-			}
-
-			// Otherwise just get the value from the style object
-			return style[ name ];
-		}
-	},
-
-	css: function( elem, name, extra, styles ) {
-		var num, val, hooks,
-			origName = jQuery.camelCase( name );
-
-		// Make sure that we're working with the right name
-		name = jQuery.cssProps[ origName ] || ( jQuery.cssProps[ origName ] = vendorPropName( elem.style, origName ) );
-
-		// gets hook for the prefixed version
-		// followed by the unprefixed version
-		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
-
-		// If a hook was provided get the computed value from there
-		if ( hooks && "get" in hooks ) {
-			val = hooks.get( elem, true, extra );
-		}
-
-		// Otherwise, if a way to get the computed value exists, use that
-		if ( val === undefined ) {
-			val = curCSS( elem, name, styles );
-		}
-
-		//convert "normal" to computed value
-		if ( val === "normal" && name in cssNormalTransform ) {
-			val = cssNormalTransform[ name ];
-		}
-
-		// Return, converting to number if forced or a qualifier was provided and val looks numeric
-		if ( extra === "" || extra ) {
-			num = parseFloat( val );
-			return extra === true || jQuery.isNumeric( num ) ? num || 0 : val;
-		}
-		return val;
-	}
-});
-
-jQuery.each([ "height", "width" ], function( i, name ) {
-	jQuery.cssHooks[ name ] = {
-		get: function( elem, computed, extra ) {
-			if ( computed ) {
-				// certain elements can have dimension info if we invisibly show them
-				// however, it must have a current display style that would benefit from this
-				return rdisplayswap.test( jQuery.css( elem, "display" ) ) && elem.offsetWidth === 0 ?
-					jQuery.swap( elem, cssShow, function() {
-						return getWidthOrHeight( elem, name, extra );
-					}) :
-					getWidthOrHeight( elem, name, extra );
-			}
-		},
-
-		set: function( elem, value, extra ) {
-			var styles = extra && getStyles( elem );
-			return setPositiveNumber( elem, value, extra ?
-				augmentWidthOrHeight(
-					elem,
-					name,
-					extra,
-					support.boxSizing && jQuery.css( elem, "boxSizing", false, styles ) === "border-box",
-					styles
-				) : 0
-			);
-		}
-	};
-});
-
-if ( !support.opacity ) {
-	jQuery.cssHooks.opacity = {
-		get: function( elem, computed ) {
-			// IE uses filters for opacity
-			return ropacity.test( (computed && elem.currentStyle ? elem.currentStyle.filter : elem.style.filter) || "" ) ?
-				( 0.01 * parseFloat( RegExp.$1 ) ) + "" :
-				computed ? "1" : "";
-		},
-
-		set: function( elem, value ) {
-			var style = elem.style,
-				currentStyle = elem.currentStyle,
-				opacity = jQuery.isNumeric( value ) ? "alpha(opacity=" + value * 100 + ")" : "",
-				filter = currentStyle && currentStyle.filter || style.filter || "";
-
-			// IE has trouble with opacity if it does not have layout
-			// Force it by setting the zoom level
-			style.zoom = 1;
-
-			// if setting opacity to 1, and no other filters exist - attempt to remove filter attribute #6652
-			// if value === "", then remove inline opacity #12685
-			if ( ( value >= 1 || value === "" ) &&
-					jQuery.trim( filter.replace( ralpha, "" ) ) === "" &&
-					style.removeAttribute ) {
-
-				// Setting style.filter to null, "" & " " still leave "filter:" in the cssText
-				// if "filter:" is present at all, clearType is disabled, we want to avoid this
-				// style.removeAttribute is IE Only, but so apparently is this code path...
-				style.removeAttribute( "filter" );
-
-				// if there is no filter style applied in a css rule or unset inline opacity, we are done
-				if ( value === "" || currentStyle && !currentStyle.filter ) {
-					return;
-				}
-			}
-
-			// otherwise, set new filter values
-			style.filter = ralpha.test( filter ) ?
-				filter.replace( ralpha, opacity ) :
-				filter + " " + opacity;
-		}
-	};
-}
-
-jQuery.cssHooks.marginRight = addGetHookIf( support.reliableMarginRight,
-	function( elem, computed ) {
-		if ( computed ) {
-			// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
-			// Work around by temporarily setting element display to inline-block
-			return jQuery.swap( elem, { "display": "inline-block" },
-				curCSS, [ elem, "marginRight" ] );
-		}
-	}
-);
-
-// These hooks are used by animate to expand properties
-jQuery.each({
-	margin: "",
-	padding: "",
-	border: "Width"
-}, function( prefix, suffix ) {
-	jQuery.cssHooks[ prefix + suffix ] = {
-		expand: function( value ) {
-			var i = 0,
-				expanded = {},
-
-				// assumes a single number if not a string
-				parts = typeof value === "string" ? value.split(" ") : [ value ];
-
-			for ( ; i < 4; i++ ) {
-				expanded[ prefix + cssExpand[ i ] + suffix ] =
-					parts[ i ] || parts[ i - 2 ] || parts[ 0 ];
-			}
-
-			return expanded;
-		}
-	};
-
-	if ( !rmargin.test( prefix ) ) {
-		jQuery.cssHooks[ prefix + suffix ].set = setPositiveNumber;
-	}
-});
-
-jQuery.fn.extend({
-	css: function( name, value ) {
-		return access( this, function( elem, name, value ) {
-			var styles, len,
-				map = {},
-				i = 0;
-
-			if ( jQuery.isArray( name ) ) {
-				styles = getStyles( elem );
-				len = name.length;
-
-				for ( ; i < len; i++ ) {
-					map[ name[ i ] ] = jQuery.css( elem, name[ i ], false, styles );
-				}
-
-				return map;
-			}
-
-			return value !== undefined ?
-				jQuery.style( elem, name, value ) :
-				jQuery.css( elem, name );
-		}, name, value, arguments.length > 1 );
-	},
-	show: function() {
-		return showHide( this, true );
-	},
-	hide: function() {
-		return showHide( this );
-	},
-	toggle: function( state ) {
-		if ( typeof state === "boolean" ) {
-			return state ? this.show() : this.hide();
-		}
-
-		return this.each(function() {
-			if ( isHidden( this ) ) {
-				jQuery( this ).show();
-			} else {
-				jQuery( this ).hide();
-			}
-		});
-	}
-});
-
-
-function Tween( elem, options, prop, end, easing ) {
-	return new Tween.prototype.init( elem, options, prop, end, easing );
-}
-jQuery.Tween = Tween;
-
-Tween.prototype = {
-	constructor: Tween,
-	init: function( elem, options, prop, end, easing, unit ) {
-		this.elem = elem;
-		this.prop = prop;
-		this.easing = easing || "swing";
-		this.options = options;
-		this.start = this.now = this.cur();
-		this.end = end;
-		this.unit = unit || ( jQuery.cssNumber[ prop ] ? "" : "px" );
-	},
-	cur: function() {
-		var hooks = Tween.propHooks[ this.prop ];
-
-		return hooks && hooks.get ?
-			hooks.get( this ) :
-			Tween.propHooks._default.get( this );
-	},
-	run: function( percent ) {
-		var eased,
-			hooks = Tween.propHooks[ this.prop ];
-
-		if ( this.options.duration ) {
-			this.pos = eased = jQuery.easing[ this.easing ](
-				percent, this.options.duration * percent, 0, 1, this.options.duration
-			);
-		} else {
-			this.pos = eased = percent;
-		}
-		this.now = ( this.end - this.start ) * eased + this.start;
-
-		if ( this.options.step ) {
-			this.options.step.call( this.elem, this.now, this );
-		}
-
-		if ( hooks && hooks.set ) {
-			hooks.set( this );
-		} else {
-			Tween.propHooks._default.set( this );
-		}
-		return this;
-	}
-};
-
-Tween.prototype.init.prototype = Tween.prototype;
-
-Tween.propHooks = {
-	_default: {
-		get: function( tween ) {
-			var result;
-
-			if ( tween.elem[ tween.prop ] != null &&
-				(!tween.elem.style || tween.elem.style[ tween.prop ] == null) ) {
-				return tween.elem[ tween.prop ];
-			}
-
-			// passing an empty string as a 3rd parameter to .css will automatically
-			// attempt a parseFloat and fallback to a string if the parse fails
-			// so, simple values such as "10px" are parsed to Float.
-			// complex values such as "rotate(1rad)" are returned as is.
-			result = jQuery.css( tween.elem, tween.prop, "" );
-			// Empty strings, null, undefined and "auto" are converted to 0.
-			return !result || result === "auto" ? 0 : result;
-		},
-		set: function( tween ) {
-			// use step hook for back compat - use cssHook if its there - use .style if its
-			// available and use plain properties where available
-			if ( jQuery.fx.step[ tween.prop ] ) {
-				jQuery.fx.step[ tween.prop ]( tween );
-			} else if ( tween.elem.style && ( tween.elem.style[ jQuery.cssProps[ tween.prop ] ] != null || jQuery.cssHooks[ tween.prop ] ) ) {
-				jQuery.style( tween.elem, tween.prop, tween.now + tween.unit );
-			} else {
-				tween.elem[ tween.prop ] = tween.now;
-			}
-		}
-	}
-};
-
-// Support: IE <=9
-// Panic based approach to setting things on disconnected nodes
-
-Tween.propHooks.scrollTop = Tween.propHooks.scrollLeft = {
-	set: function( tween ) {
-		if ( tween.elem.nodeType && tween.elem.parentNode ) {
-			tween.elem[ tween.prop ] = tween.now;
-		}
-	}
-};
-
-jQuery.easing = {
-	linear: function( p ) {
-		return p;
-	},
-	swing: function( p ) {
-		return 0.5 - Math.cos( p * Math.PI ) / 2;
-	}
-};
-
-jQuery.fx = Tween.prototype.init;
-
-// Back Compat <1.8 extension point
-jQuery.fx.step = {};
-
-
-
-
-var
-	fxNow, timerId,
-	rfxtypes = /^(?:toggle|show|hide)$/,
-	rfxnum = new RegExp( "^(?:([+-])=|)(" + pnum + ")([a-z%]*)$", "i" ),
-	rrun = /queueHooks$/,
-	animationPrefilters = [ defaultPrefilter ],
-	tweeners = {
-		"*": [ function( prop, value ) {
-			var tween = this.createTween( prop, value ),
-				target = tween.cur(),
-				parts = rfxnum.exec( value ),
-				unit = parts && parts[ 3 ] || ( jQuery.cssNumber[ prop ] ? "" : "px" ),
-
-				// Starting value computation is required for potential unit mismatches
-				start = ( jQuery.cssNumber[ prop ] || unit !== "px" && +target ) &&
-					rfxnum.exec( jQuery.css( tween.elem, prop ) ),
-				scale = 1,
-				maxIterations = 20;
-
-			if ( start && start[ 3 ] !== unit ) {
-				// Trust units reported by jQuery.css
-				unit = unit || start[ 3 ];
-
-				// Make sure we update the tween properties later on
-				parts = parts || [];
-
-				// Iteratively approximate from a nonzero starting point
-				start = +target || 1;
-
-				do {
-					// If previous iteration zeroed out, double until we get *something*
-					// Use a string for doubling factor so we don't accidentally see scale as unchanged below
-					scale = scale || ".5";
-
-					// Adjust and apply
-					start = start / scale;
-					jQuery.style( tween.elem, prop, start + unit );
-
-				// Update scale, tolerating zero or NaN from tween.cur()
-				// And breaking the loop if scale is unchanged or perfect, or if we've just had enough
-				} while ( scale !== (scale = tween.cur() / target) && scale !== 1 && --maxIterations );
-			}
-
-			// Update tween properties
-			if ( parts ) {
-				start = tween.start = +start || +target || 0;
-				tween.unit = unit;
-				// If a +=/-= token was provided, we're doing a relative animation
-				tween.end = parts[ 1 ] ?
-					start + ( parts[ 1 ] + 1 ) * parts[ 2 ] :
-					+parts[ 2 ];
-			}
-
-			return tween;
-		} ]
-	};
-
-// Animations created synchronously will run synchronously
-function createFxNow() {
-	setTimeout(function() {
-		fxNow = undefined;
-	});
-	return ( fxNow = jQuery.now() );
-}
-
-// Generate parameters to create a standard animation
-function genFx( type, includeWidth ) {
-	var which,
-		attrs = { height: type },
-		i = 0;
-
-	// if we include width, step value is 1 to do all cssExpand values,
-	// if we don't include width, step value is 2 to skip over Left and Right
-	includeWidth = includeWidth ? 1 : 0;
-	for ( ; i < 4 ; i += 2 - includeWidth ) {
-		which = cssExpand[ i ];
-		attrs[ "margin" + which ] = attrs[ "padding" + which ] = type;
-	}
-
-	if ( includeWidth ) {
-		attrs.opacity = attrs.width = type;
-	}
-
-	return attrs;
-}
-
-function createTween( value, prop, animation ) {
-	var tween,
-		collection = ( tweeners[ prop ] || [] ).concat( tweeners[ "*" ] ),
-		index = 0,
-		length = collection.length;
-	for ( ; index < length; index++ ) {
-		if ( (tween = collection[ index ].call( animation, prop, value )) ) {
-
-			// we're done with this property
-			return tween;
-		}
-	}
-}
-
-function defaultPrefilter( elem, props, opts ) {
-	/* jshint validthis: true */
-	var prop, value, toggle, tween, hooks, oldfire, display, checkDisplay,
-		anim = this,
-		orig = {},
-		style = elem.style,
-		hidden = elem.nodeType && isHidden( elem ),
-		dataShow = jQuery._data( elem, "fxshow" );
-
-	// handle queue: false promises
-	if ( !opts.queue ) {
-		hooks = jQuery._queueHooks( elem, "fx" );
-		if ( hooks.unqueued == null ) {
-			hooks.unqueued = 0;
-			oldfire = hooks.empty.fire;
-			hooks.empty.fire = function() {
-				if ( !hooks.unqueued ) {
-					oldfire();
-				}
-			};
-		}
-		hooks.unqueued++;
-
-		anim.always(function() {
-			// doing this makes sure that the complete handler will be called
-			// before this completes
-			anim.always(function() {
-				hooks.unqueued--;
-				if ( !jQuery.queue( elem, "fx" ).length ) {
-					hooks.empty.fire();
-				}
-			});
-		});
-	}
-
-	// height/width overflow pass
-	if ( elem.nodeType === 1 && ( "height" in props || "width" in props ) ) {
-		// Make sure that nothing sneaks out
-		// Record all 3 overflow attributes because IE does not
-		// change the overflow attribute when overflowX and
-		// overflowY are set to the same value
-		opts.overflow = [ style.overflow, style.overflowX, style.overflowY ];
-
-		// Set display property to inline-block for height/width
-		// animations on inline elements that are having width/height animated
-		display = jQuery.css( elem, "display" );
-
-		// Test default display if display is currently "none"
-		checkDisplay = display === "none" ?
-			jQuery._data( elem, "olddisplay" ) || defaultDisplay( elem.nodeName ) : display;
-
-		if ( checkDisplay === "inline" && jQuery.css( elem, "float" ) === "none" ) {
-
-			// inline-level elements accept inline-block;
-			// block-level elements need to be inline with layout
-			if ( !support.inlineBlockNeedsLayout || defaultDisplay( elem.nodeName ) === "inline" ) {
-				style.display = "inline-block";
-			} else {
-				style.zoom = 1;
-			}
-		}
-	}
-
-	if ( opts.overflow ) {
-		style.overflow = "hidden";
-		if ( !support.shrinkWrapBlocks() ) {
-			anim.always(function() {
-				style.overflow = opts.overflow[ 0 ];
-				style.overflowX = opts.overflow[ 1 ];
-				style.overflowY = opts.overflow[ 2 ];
-			});
-		}
-	}
-
-	// show/hide pass
-	for ( prop in props ) {
-		value = props[ prop ];
-		if ( rfxtypes.exec( value ) ) {
-			delete props[ prop ];
-			toggle = toggle || value === "toggle";
-			if ( value === ( hidden ? "hide" : "show" ) ) {
-
-				// If there is dataShow left over from a stopped hide or show and we are going to proceed with show, we should pretend to be hidden
-				if ( value === "show" && dataShow && dataShow[ prop ] !== undefined ) {
-					hidden = true;
-				} else {
-					continue;
-				}
-			}
-			orig[ prop ] = dataShow && dataShow[ prop ] || jQuery.style( elem, prop );
-
-		// Any non-fx value stops us from restoring the original display value
-		} else {
-			display = undefined;
-		}
-	}
-
-	if ( !jQuery.isEmptyObject( orig ) ) {
-		if ( dataShow ) {
-			if ( "hidden" in dataShow ) {
-				hidden = dataShow.hidden;
-			}
-		} else {
-			dataShow = jQuery._data( elem, "fxshow", {} );
-		}
-
-		// store state if its toggle - enables .stop().toggle() to "reverse"
-		if ( toggle ) {
-			dataShow.hidden = !hidden;
-		}
-		if ( hidden ) {
-			jQuery( elem ).show();
-		} else {
-			anim.done(function() {
-				jQuery( elem ).hide();
-			});
-		}
-		anim.done(function() {
-			var prop;
-			jQuery._removeData( elem, "fxshow" );
-			for ( prop in orig ) {
-				jQuery.style( elem, prop, orig[ prop ] );
-			}
-		});
-		for ( prop in orig ) {
-			tween = createTween( hidden ? dataShow[ prop ] : 0, prop, anim );
-
-			if ( !( prop in dataShow ) ) {
-				dataShow[ prop ] = tween.start;
-				if ( hidden ) {
-					tween.end = tween.start;
-					tween.start = prop === "width" || prop === "height" ? 1 : 0;
-				}
-			}
-		}
-
-	// If this is a noop like .hide().hide(), restore an overwritten display value
-	} else if ( (display === "none" ? defaultDisplay( elem.nodeName ) : display) === "inline" ) {
-		style.display = display;
-	}
-}
-
-function propFilter( props, specialEasing ) {
-	var index, name, easing, value, hooks;
-
-	// camelCase, specialEasing and expand cssHook pass
-	for ( index in props ) {
-		name = jQuery.camelCase( index );
-		easing = specialEasing[ name ];
-		value = props[ index ];
-		if ( jQuery.isArray( value ) ) {
-			easing = value[ 1 ];
-			value = props[ index ] = value[ 0 ];
-		}
-
-		if ( index !== name ) {
-			props[ name ] = value;
-			delete props[ index ];
-		}
-
-		hooks = jQuery.cssHooks[ name ];
-		if ( hooks && "expand" in hooks ) {
-			value = hooks.expand( value );
-			delete props[ name ];
-
-			// not quite $.extend, this wont overwrite keys already present.
-			// also - reusing 'index' from above because we have the correct "name"
-			for ( index in value ) {
-				if ( !( index in props ) ) {
-					props[ index ] = value[ index ];
-					specialEasing[ index ] = easing;
-				}
-			}
-		} else {
-			specialEasing[ name ] = easing;
-		}
-	}
-}
-
-function Animation( elem, properties, options ) {
-	var result,
-		stopped,
-		index = 0,
-		length = animationPrefilters.length,
-		deferred = jQuery.Deferred().always( function() {
-			// don't match elem in the :animated selector
-			delete tick.elem;
-		}),
-		tick = function() {
-			if ( stopped ) {
-				return false;
-			}
-			var currentTime = fxNow || createFxNow(),
-				remaining = Math.max( 0, animation.startTime + animation.duration - currentTime ),
-				// archaic crash bug won't allow us to use 1 - ( 0.5 || 0 ) (#12497)
-				temp = remaining / animation.duration || 0,
-				percent = 1 - temp,
-				index = 0,
-				length = animation.tweens.length;
-
-			for ( ; index < length ; index++ ) {
-				animation.tweens[ index ].run( percent );
-			}
-
-			deferred.notifyWith( elem, [ animation, percent, remaining ]);
-
-			if ( percent < 1 && length ) {
-				return remaining;
-			} else {
-				deferred.resolveWith( elem, [ animation ] );
-				return false;
-			}
-		},
-		animation = deferred.promise({
-			elem: elem,
-			props: jQuery.extend( {}, properties ),
-			opts: jQuery.extend( true, { specialEasing: {} }, options ),
-			originalProperties: properties,
-			originalOptions: options,
-			startTime: fxNow || createFxNow(),
-			duration: options.duration,
-			tweens: [],
-			createTween: function( prop, end ) {
-				var tween = jQuery.Tween( elem, animation.opts, prop, end,
-						animation.opts.specialEasing[ prop ] || animation.opts.easing );
-				animation.tweens.push( tween );
-				return tween;
-			},
-			stop: function( gotoEnd ) {
-				var index = 0,
-					// if we are going to the end, we want to run all the tweens
-					// otherwise we skip this part
-					length = gotoEnd ? animation.tweens.length : 0;
-				if ( stopped ) {
-					return this;
-				}
-				stopped = true;
-				for ( ; index < length ; index++ ) {
-					animation.tweens[ index ].run( 1 );
-				}
-
-				// resolve when we played the last frame
-				// otherwise, reject
-				if ( gotoEnd ) {
-					deferred.resolveWith( elem, [ animation, gotoEnd ] );
-				} else {
-					deferred.rejectWith( elem, [ animation, gotoEnd ] );
-				}
-				return this;
-			}
-		}),
-		props = animation.props;
-
-	propFilter( props, animation.opts.specialEasing );
-
-	for ( ; index < length ; index++ ) {
-		result = animationPrefilters[ index ].call( animation, elem, props, animation.opts );
-		if ( result ) {
-			return result;
-		}
-	}
-
-	jQuery.map( props, createTween, animation );
-
-	if ( jQuery.isFunction( animation.opts.start ) ) {
-		animation.opts.start.call( elem, animation );
-	}
-
-	jQuery.fx.timer(
-		jQuery.extend( tick, {
-			elem: elem,
-			anim: animation,
-			queue: animation.opts.queue
-		})
-	);
-
-	// attach callbacks from options
-	return animation.progress( animation.opts.progress )
-		.done( animation.opts.done, animation.opts.complete )
-		.fail( animation.opts.fail )
-		.always( animation.opts.always );
-}
-
-jQuery.Animation = jQuery.extend( Animation, {
-	tweener: function( props, callback ) {
-		if ( jQuery.isFunction( props ) ) {
-			callback = props;
-			props = [ "*" ];
-		} else {
-			props = props.split(" ");
-		}
-
-		var prop,
-			index = 0,
-			length = props.length;
-
-		for ( ; index < length ; index++ ) {
-			prop = props[ index ];
-			tweeners[ prop ] = tweeners[ prop ] || [];
-			tweeners[ prop ].unshift( callback );
-		}
-	},
-
-	prefilter: function( callback, prepend ) {
-		if ( prepend ) {
-			animationPrefilters.unshift( callback );
-		} else {
-			animationPrefilters.push( callback );
-		}
-	}
-});
-
-jQuery.speed = function( speed, easing, fn ) {
-	var opt = speed && typeof speed === "object" ? jQuery.extend( {}, speed ) : {
-		complete: fn || !fn && easing ||
-			jQuery.isFunction( speed ) && speed,
-		duration: speed,
-		easing: fn && easing || easing && !jQuery.isFunction( easing ) && easing
-	};
-
-	opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration :
-		opt.duration in jQuery.fx.speeds ? jQuery.fx.speeds[ opt.duration ] : jQuery.fx.speeds._default;
-
-	// normalize opt.queue - true/undefined/null -> "fx"
-	if ( opt.queue == null || opt.queue === true ) {
-		opt.queue = "fx";
-	}
-
-	// Queueing
-	opt.old = opt.complete;
-
-	opt.complete = function() {
-		if ( jQuery.isFunction( opt.old ) ) {
-			opt.old.call( this );
-		}
-
-		if ( opt.queue ) {
-			jQuery.dequeue( this, opt.queue );
-		}
-	};
-
-	return opt;
-};
-
-jQuery.fn.extend({
-	fadeTo: function( speed, to, easing, callback ) {
-
-		// show any hidden elements after setting opacity to 0
-		return this.filter( isHidden ).css( "opacity", 0 ).show()
-
-			// animate to the value specified
-			.end().animate({ opacity: to }, speed, easing, callback );
-	},
-	animate: function( prop, speed, easing, callback ) {
-		var empty = jQuery.isEmptyObject( prop ),
-			optall = jQuery.speed( speed, easing, callback ),
-			doAnimation = function() {
-				// Operate on a copy of prop so per-property easing won't be lost
-				var anim = Animation( this, jQuery.extend( {}, prop ), optall );
-
-				// Empty animations, or finishing resolves immediately
-				if ( empty || jQuery._data( this, "finish" ) ) {
-					anim.stop( true );
-				}
-			};
-			doAnimation.finish = doAnimation;
-
-		return empty || optall.queue === false ?
-			this.each( doAnimation ) :
-			this.queue( optall.queue, doAnimation );
-	},
-	stop: function( type, clearQueue, gotoEnd ) {
-		var stopQueue = function( hooks ) {
-			var stop = hooks.stop;
-			delete hooks.stop;
-			stop( gotoEnd );
-		};
-
-		if ( typeof type !== "string" ) {
-			gotoEnd = clearQueue;
-			clearQueue = type;
-			type = undefined;
-		}
-		if ( clearQueue && type !== false ) {
-			this.queue( type || "fx", [] );
-		}
-
-		return this.each(function() {
-			var dequeue = true,
-				index = type != null && type + "queueHooks",
-				timers = jQuery.timers,
-				data = jQuery._data( this );
-
-			if ( index ) {
-				if ( data[ index ] && data[ index ].stop ) {
-					stopQueue( data[ index ] );
-				}
-			} else {
-				for ( index in data ) {
-					if ( data[ index ] && data[ index ].stop && rrun.test( index ) ) {
-						stopQueue( data[ index ] );
-					}
-				}
-			}
-
-			for ( index = timers.length; index--; ) {
-				if ( timers[ index ].elem === this && (type == null || timers[ index ].queue === type) ) {
-					timers[ index ].anim.stop( gotoEnd );
-					dequeue = false;
-					timers.splice( index, 1 );
-				}
-			}
-
-			// start the next in the queue if the last step wasn't forced
-			// timers currently will call their complete callbacks, which will dequeue
-			// but only if they were gotoEnd
-			if ( dequeue || !gotoEnd ) {
-				jQuery.dequeue( this, type );
-			}
-		});
-	},
-	finish: function( type ) {
-		if ( type !== false ) {
-			type = type || "fx";
-		}
-		return this.each(function() {
-			var index,
-				data = jQuery._data( this ),
-				queue = data[ type + "queue" ],
-				hooks = data[ type + "queueHooks" ],
-				timers = jQuery.timers,
-				length = queue ? queue.length : 0;
-
-			// enable finishing flag on private data
-			data.finish = true;
-
-			// empty the queue first
-			jQuery.queue( this, type, [] );
-
-			if ( hooks && hooks.stop ) {
-				hooks.stop.call( this, true );
-			}
-
-			// look for any active animations, and finish them
-			for ( index = timers.length; index--; ) {
-				if ( timers[ index ].elem === this && timers[ index ].queue === type ) {
-					timers[ index ].anim.stop( true );
-					timers.splice( index, 1 );
-				}
-			}
-
-			// look for any animations in the old queue and finish them
-			for ( index = 0; index < length; index++ ) {
-				if ( queue[ index ] && queue[ index ].finish ) {
-					queue[ index ].finish.call( this );
-				}
-			}
-
-			// turn off finishing flag
-			delete data.finish;
-		});
-	}
-});
-
-jQuery.each([ "toggle", "show", "hide" ], function( i, name ) {
-	var cssFn = jQuery.fn[ name ];
-	jQuery.fn[ name ] = function( speed, easing, callback ) {
-		return speed == null || typeof speed === "boolean" ?
-			cssFn.apply( this, arguments ) :
-			this.animate( genFx( name, true ), speed, easing, callback );
-	};
-});
-
-// Generate shortcuts for custom animations
-jQuery.each({
-	slideDown: genFx("show"),
-	slideUp: genFx("hide"),
-	slideToggle: genFx("toggle"),
-	fadeIn: { opacity: "show" },
-	fadeOut: { opacity: "hide" },
-	fadeToggle: { opacity: "toggle" }
-}, function( name, props ) {
-	jQuery.fn[ name ] = function( speed, easing, callback ) {
-		return this.animate( props, speed, easing, callback );
-	};
-});
-
-jQuery.timers = [];
-jQuery.fx.tick = function() {
-	var timer,
-		timers = jQuery.timers,
-		i = 0;
-
-	fxNow = jQuery.now();
-
-	for ( ; i < timers.length; i++ ) {
-		timer = timers[ i ];
-		// Checks the timer has not already been removed
-		if ( !timer() && timers[ i ] === timer ) {
-			timers.splice( i--, 1 );
-		}
-	}
-
-	if ( !timers.length ) {
-		jQuery.fx.stop();
-	}
-	fxNow = undefined;
-};
-
-jQuery.fx.timer = function( timer ) {
-	jQuery.timers.push( timer );
-	if ( timer() ) {
-		jQuery.fx.start();
-	} else {
-		jQuery.timers.pop();
-	}
-};
-
-jQuery.fx.interval = 13;
-
-jQuery.fx.start = function() {
-	if ( !timerId ) {
-		timerId = setInterval( jQuery.fx.tick, jQuery.fx.interval );
-	}
-};
-
-jQuery.fx.stop = function() {
-	clearInterval( timerId );
-	timerId = null;
-};
-
-jQuery.fx.speeds = {
-	slow: 600,
-	fast: 200,
-	// Default speed
-	_default: 400
-};
-
-
-// Based off of the plugin by Clint Helfers, with permission.
-// http://blindsignals.com/index.php/2009/07/jquery-delay/
-jQuery.fn.delay = function( time, type ) {
-	time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time;
-	type = type || "fx";
-
-	return this.queue( type, function( next, hooks ) {
-		var timeout = setTimeout( next, time );
-		hooks.stop = function() {
-			clearTimeout( timeout );
-		};
-	});
-};
-
-
-(function() {
-	// Minified: var a,b,c,d,e
-	var input, div, select, a, opt;
-
-	// Setup
-	div = document.createElement( "div" );
-	div.setAttribute( "className", "t" );
-	div.innerHTML = "  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>";
-	a = div.getElementsByTagName("a")[ 0 ];
-
-	// First batch of tests.
-	select = document.createElement("select");
-	opt = select.appendChild( document.createElement("option") );
-	input = div.getElementsByTagName("input")[ 0 ];
-
-	a.style.cssText = "top:1px";
-
-	// Test setAttribute on camelCase class. If it works, we need attrFixes when doing get/setAttribute (ie6/7)
-	support.getSetAttribute = div.className !== "t";
-
-	// Get the style information from getAttribute
-	// (IE uses .cssText instead)
-	support.style = /top/.test( a.getAttribute("style") );
-
-	// Make sure that URLs aren't manipulated
-	// (IE normalizes it by default)
-	support.hrefNormalized = a.getAttribute("href") === "/a";
-
-	// Check the default checkbox/radio value ("" on WebKit; "on" elsewhere)
-	support.checkOn = !!input.value;
-
-	// Make sure that a selected-by-default option has a working selected property.
-	// (WebKit defaults to false instead of true, IE too, if it's in an optgroup)
-	support.optSelected = opt.selected;
-
-	// Tests for enctype support on a form (#6743)
-	support.enctype = !!document.createElement("form").enctype;
-
-	// Make sure that the options inside disabled selects aren't marked as disabled
-	// (WebKit marks them as disabled)
-	select.disabled = true;
-	support.optDisabled = !opt.disabled;
-
-	// Support: IE8 only
-	// Check if we can trust getAttribute("value")
-	input = document.createElement( "input" );
-	input.setAttribute( "value", "" );
-	support.input = input.getAttribute( "value" ) === "";
-
-	// Check if an input maintains its value after becoming a radio
-	input.value = "t";
-	input.setAttribute( "type", "radio" );
-	support.radioValue = input.value === "t";
-})();
-
-
-var rreturn = /\r/g;
-
-jQuery.fn.extend({
-	val: function( value ) {
-		var hooks, ret, isFunction,
-			elem = this[0];
-
-		if ( !arguments.length ) {
-			if ( elem ) {
-				hooks = jQuery.valHooks[ elem.type ] || jQuery.valHooks[ elem.nodeName.toLowerCase() ];
-
-				if ( hooks && "get" in hooks && (ret = hooks.get( elem, "value" )) !== undefined ) {
-					return ret;
-				}
-
-				ret = elem.value;
-
-				return typeof ret === "string" ?
-					// handle most common string cases
-					ret.replace(rreturn, "") :
-					// handle cases where value is null/undef or number
-					ret == null ? "" : ret;
-			}
-
-			return;
-		}
-
-		isFunction = jQuery.isFunction( value );
-
-		return this.each(function( i ) {
-			var val;
-
-			if ( this.nodeType !== 1 ) {
-				return;
-			}
-
-			if ( isFunction ) {
-				val = value.call( this, i, jQuery( this ).val() );
-			} else {
-				val = value;
-			}
-
-			// Treat null/undefined as ""; convert numbers to string
-			if ( val == null ) {
-				val = "";
-			} else if ( typeof val === "number" ) {
-				val += "";
-			} else if ( jQuery.isArray( val ) ) {
-				val = jQuery.map( val, function( value ) {
-					return value == null ? "" : value + "";
-				});
-			}
-
-			hooks = jQuery.valHooks[ this.type ] || jQuery.valHooks[ this.nodeName.toLowerCase() ];
-
-			// If set returns undefined, fall back to normal setting
-			if ( !hooks || !("set" in hooks) || hooks.set( this, val, "value" ) === undefined ) {
-				this.value = val;
-			}
-		});
-	}
-});
-
-jQuery.extend({
-	valHooks: {
-		option: {
-			get: function( elem ) {
-				var val = jQuery.find.attr( elem, "value" );
-				return val != null ?
-					val :
-					// Support: IE10-11+
-					// option.text throws exceptions (#14686, #14858)
-					jQuery.trim( jQuery.text( elem ) );
-			}
-		},
-		select: {
-			get: function( elem ) {
-				var value, option,
-					options = elem.options,
-					index = elem.selectedIndex,
-					one = elem.type === "select-one" || index < 0,
-					values = one ? null : [],
-					max = one ? index + 1 : options.length,
-					i = index < 0 ?
-						max :
-						one ? index : 0;
-
-				// Loop through all the selected options
-				for ( ; i < max; i++ ) {
-					option = options[ i ];
-
-					// oldIE doesn't update selected after form reset (#2551)
-					if ( ( option.selected || i === index ) &&
-							// Don't return options that are disabled or in a disabled optgroup
-							( support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null ) &&
-							( !option.parentNode.disabled || !jQuery.nodeName( option.parentNode, "optgroup" ) ) ) {
-
-						// Get the specific value for the option
-						value = jQuery( option ).val();
-
-						// We don't need an array for one selects
-						if ( one ) {
-							return value;
-						}
-
-						// Multi-Selects return an array
-						values.push( value );
-					}
-				}
-
-				return values;
-			},
-
-			set: function( elem, value ) {
-				var optionSet, option,
-					options = elem.options,
-					values = jQuery.makeArray( value ),
-					i = options.length;
-
-				while ( i-- ) {
-					option = options[ i ];
-
-					if ( jQuery.inArray( jQuery.valHooks.option.get( option ), values ) >= 0 ) {
-
-						// Support: IE6
-						// When new option element is added to select box we need to
-						// force reflow of newly added node in order to workaround delay
-						// of initialization properties
-						try {
-							option.selected = optionSet = true;
-
-						} catch ( _ ) {
-
-							// Will be executed only in IE6
-							option.scrollHeight;
-						}
-
-					} else {
-						option.selected = false;
-					}
-				}
-
-				// Force browsers to behave consistently when non-matching value is set
-				if ( !optionSet ) {
-					elem.selectedIndex = -1;
-				}
-
-				return options;
-			}
-		}
-	}
-});
-
-// Radios and checkboxes getter/setter
-jQuery.each([ "radio", "checkbox" ], function() {
-	jQuery.valHooks[ this ] = {
-		set: function( elem, value ) {
-			if ( jQuery.isArray( value ) ) {
-				return ( elem.checked = jQuery.inArray( jQuery(elem).val(), value ) >= 0 );
-			}
-		}
-	};
-	if ( !support.checkOn ) {
-		jQuery.valHooks[ this ].get = function( elem ) {
-			// Support: Webkit
-			// "" is returned instead of "on" if a value isn't specified
-			return elem.getAttribute("value") === null ? "on" : elem.value;
-		};
-	}
-});
-
-
-
-
-var nodeHook, boolHook,
-	attrHandle = jQuery.expr.attrHandle,
-	ruseDefault = /^(?:checked|selected)$/i,
-	getSetAttribute = support.getSetAttribute,
-	getSetInput = support.input;
-
-jQuery.fn.extend({
-	attr: function( name, value ) {
-		return access( this, jQuery.attr, name, value, arguments.length > 1 );
-	},
-
-	removeAttr: function( name ) {
-		return this.each(function() {
-			jQuery.removeAttr( this, name );
-		});
-	}
-});
-
-jQuery.extend({
-	attr: function( elem, name, value ) {
-		var hooks, ret,
-			nType = elem.nodeType;
-
-		// don't get/set attributes on text, comment and attribute nodes
-		if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
-			return;
-		}
-
-		// Fallback to prop when attributes are not supported
-		if ( typeof elem.getAttribute === strundefined ) {
-			return jQuery.prop( elem, name, value );
-		}
-
-		// All attributes are lowercase
-		// Grab necessary hook if one is defined
-		if ( nType !== 1 || !jQuery.isXMLDoc( elem ) ) {
-			name = name.toLowerCase();
-			hooks = jQuery.attrHooks[ name ] ||
-				( jQuery.expr.match.bool.test( name ) ? boolHook : nodeHook );
-		}
-
-		if ( value !== undefined ) {
-
-			if ( value === null ) {
-				jQuery.removeAttr( elem, name );
-
-			} else if ( hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ) {
-				return ret;
-
-			} else {
-				elem.setAttribute( name, value + "" );
-				return value;
-			}
-
-		} else if ( hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ) {
-			return ret;
-
-		} else {
-			ret = jQuery.find.attr( elem, name );
-
-			// Non-existent attributes return null, we normalize to undefined
-			return ret == null ?
-				undefined :
-				ret;
-		}
-	},
-
-	removeAttr: function( elem, value ) {
-		var name, propName,
-			i = 0,
-			attrNames = value && value.match( rnotwhite );
-
-		if ( attrNames && elem.nodeType === 1 ) {
-			while ( (name = attrNames[i++]) ) {
-				propName = jQuery.propFix[ name ] || name;
-
-				// Boolean attributes get special treatment (#10870)
-				if ( jQuery.expr.match.bool.test( name ) ) {
-					// Set corresponding property to false
-					if ( getSetInput && getSetAttribute || !ruseDefault.test( name ) ) {
-						elem[ propName ] = false;
-					// Support: IE<9
-					// Also clear defaultChecked/defaultSelected (if appropriate)
-					} else {
-						elem[ jQuery.camelCase( "default-" + name ) ] =
-							elem[ propName ] = false;
-					}
-
-				// See #9699 for explanation of this approach (setting first, then removal)
-				} else {
-					jQuery.attr( elem, name, "" );
-				}
-
-				elem.removeAttribute( getSetAttribute ? name : propName );
-			}
-		}
-	},
-
-	attrHooks: {
-		type: {
-			set: function( elem, value ) {
-				if ( !support.radioValue && value === "radio" && jQuery.nodeName(elem, "input") ) {
-					// Setting the type on a radio button after the value resets the value in IE6-9
-					// Reset value to default in case type is set after value during creation
-					var val = elem.value;
-					elem.setAttribute( "type", value );
-					if ( val ) {
-						elem.value = val;
-					}
-					return value;
-				}
-			}
-		}
-	}
-});
-
-// Hook for boolean attributes
-boolHook = {
-	set: function( elem, value, name ) {
-		if ( value === false ) {
-			// Remove boolean attributes when set to false
-			jQuery.removeAttr( elem, name );
-		} else if ( getSetInput && getSetAttribute || !ruseDefault.test( name ) ) {
-			// IE<8 needs the *property* name
-			elem.setAttribute( !getSetAttribute && jQuery.propFix[ name ] || name, name );
-
-		// Use defaultChecked and defaultSelected for oldIE
-		} else {
-			elem[ jQuery.camelCase( "default-" + name ) ] = elem[ name ] = true;
-		}
-
-		return name;
-	}
-};
-
-// Retrieve booleans specially
-jQuery.each( jQuery.expr.match.bool.source.match( /\w+/g ), function( i, name ) {
-
-	var getter = attrHandle[ name ] || jQuery.find.attr;
-
-	attrHandle[ name ] = getSetInput && getSetAttribute || !ruseDefault.test( name ) ?
-		function( elem, name, isXML ) {
-			var ret, handle;
-			if ( !isXML ) {
-				// Avoid an infinite loop by temporarily removing this function from the getter
-				handle = attrHandle[ name ];
-				attrHandle[ name ] = ret;
-				ret = getter( elem, name, isXML ) != null ?
-					name.toLowerCase() :
-					null;
-				attrHandle[ name ] = handle;
-			}
-			return ret;
-		} :
-		function( elem, name, isXML ) {
-			if ( !isXML ) {
-				return elem[ jQuery.camelCase( "default-" + name ) ] ?
-					name.toLowerCase() :
-					null;
-			}
-		};
-});
-
-// fix oldIE attroperties
-if ( !getSetInput || !getSetAttribute ) {
-	jQuery.attrHooks.value = {
-		set: function( elem, value, name ) {
-			if ( jQuery.nodeName( elem, "input" ) ) {
-				// Does not return so that setAttribute is also used
-				elem.defaultValue = value;
-			} else {
-				// Use nodeHook if defined (#1954); otherwise setAttribute is fine
-				return nodeHook && nodeHook.set( elem, value, name );
-			}
-		}
-	};
-}
-
-// IE6/7 do not support getting/setting some attributes with get/setAttribute
-if ( !getSetAttribute ) {
-
-	// Use this for any attribute in IE6/7
-	// This fixes almost every IE6/7 issue
-	nodeHook = {
-		set: function( elem, value, name ) {
-			// Set the existing or create a new attribute node
-			var ret = elem.getAttributeNode( name );
-			if ( !ret ) {
-				elem.setAttributeNode(
-					(ret = elem.ownerDocument.createAttribute( name ))
-				);
-			}
-
-			ret.value = value += "";
-
-			// Break association with cloned elements by also using setAttribute (#9646)
-			if ( name === "value" || value === elem.getAttribute( name ) ) {
-				return value;
-			}
-		}
-	};
-
-	// Some attributes are constructed with empty-string values when not defined
-	attrHandle.id = attrHandle.name = attrHandle.coords =
-		function( elem, name, isXML ) {
-			var ret;
-			if ( !isXML ) {
-				return (ret = elem.getAttributeNode( name )) && ret.value !== "" ?
-					ret.value :
-					null;
-			}
-		};
-
-	// Fixing value retrieval on a button requires this module
-	jQuery.valHooks.button = {
-		get: function( elem, name ) {
-			var ret = elem.getAttributeNode( name );
-			if ( ret && ret.specified ) {
-				return ret.value;
-			}
-		},
-		set: nodeHook.set
-	};
-
-	// Set contenteditable to false on removals(#10429)
-	// Setting to empty string throws an error as an invalid value
-	jQuery.attrHooks.contenteditable = {
-		set: function( elem, value, name ) {
-			nodeHook.set( elem, value === "" ? false : value, name );
-		}
-	};
-
-	// Set width and height to auto instead of 0 on empty string( Bug #8150 )
-	// This is for removals
-	jQuery.each([ "width", "height" ], function( i, name ) {
-		jQuery.attrHooks[ name ] = {
-			set: function( elem, value ) {
-				if ( value === "" ) {
-					elem.setAttribute( name, "auto" );
-					return value;
-				}
-			}
-		};
-	});
-}
-
-if ( !support.style ) {
-	jQuery.attrHooks.style = {
-		get: function( elem ) {
-			// Return undefined in the case of empty string
-			// Note: IE uppercases css property names, but if we were to .toLowerCase()
-			// .cssText, that would destroy case senstitivity in URL's, like in "background"
-			return elem.style.cssText || undefined;
-		},
-		set: function( elem, value ) {
-			return ( elem.style.cssText = value + "" );
-		}
-	};
-}
-
-
-
-
-var rfocusable = /^(?:input|select|textarea|button|object)$/i,
-	rclickable = /^(?:a|area)$/i;
-
-jQuery.fn.extend({
-	prop: function( name, value ) {
-		return access( this, jQuery.prop, name, value, arguments.length > 1 );
-	},
-
-	removeProp: function( name ) {
-		name = jQuery.propFix[ name ] || name;
-		return this.each(function() {
-			// try/catch handles cases where IE balks (such as removing a property on window)
-			try {
-				this[ name ] = undefined;
-				delete this[ name ];
-			} catch( e ) {}
-		});
-	}
-});
-
-jQuery.extend({
-	propFix: {
-		"for": "htmlFor",
-		"class": "className"
-	},
-
-	prop: function( elem, name, value ) {
-		var ret, hooks, notxml,
-			nType = elem.nodeType;
-
-		// don't get/set properties on text, comment and attribute nodes
-		if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
-			return;
-		}
-
-		notxml = nType !== 1 || !jQuery.isXMLDoc( elem );
-
-		if ( notxml ) {
-			// Fix name and attach hooks
-			name = jQuery.propFix[ name ] || name;
-			hooks = jQuery.propHooks[ name ];
-		}
-
-		if ( value !== undefined ) {
-			return hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ?
-				ret :
-				( elem[ name ] = value );
-
-		} else {
-			return hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ?
-				ret :
-				elem[ name ];
-		}
-	},
-
-	propHooks: {
-		tabIndex: {
-			get: function( elem ) {
-				// elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set
-				// http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
-				// Use proper attribute retrieval(#12072)
-				var tabindex = jQuery.find.attr( elem, "tabindex" );
-
-				return tabindex ?
-					parseInt( tabindex, 10 ) :
-					rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ?
-						0 :
-						-1;
-			}
-		}
-	}
-});
-
-// Some attributes require a special call on IE
-// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx
-if ( !support.hrefNormalized ) {
-	// href/src property should get the full normalized URL (#10299/#12915)
-	jQuery.each([ "href", "src" ], function( i, name ) {
-		jQuery.propHooks[ name ] = {
-			get: function( elem ) {
-				return elem.getAttribute( name, 4 );
-			}
-		};
-	});
-}
-
-// Support: Safari, IE9+
-// mis-reports the default selected property of an option
-// Accessing the parent's selectedIndex property fixes it
-if ( !support.optSelected ) {
-	jQuery.propHooks.selected = {
-		get: function( elem ) {
-			var parent = elem.parentNode;
-
-			if ( parent ) {
-				parent.selectedIndex;
-
-				// Make sure that it also works with optgroups, see #5701
-				if ( parent.parentNode ) {
-					parent.parentNode.selectedIndex;
-				}
-			}
-			return null;
-		}
-	};
-}
-
-jQuery.each([
-	"tabIndex",
-	"readOnly",
-	"maxLength",
-	"cellSpacing",
-	"cellPadding",
-	"rowSpan",
-	"colSpan",
-	"useMap",
-	"frameBorder",
-	"contentEditable"
-], function() {
-	jQuery.propFix[ this.toLowerCase() ] = this;
-});
-
-// IE6/7 call enctype encoding
-if ( !support.enctype ) {
-	jQuery.propFix.enctype = "encoding";
-}
-
-
-
-
-var rclass = /[\t\r\n\f]/g;
-
-jQuery.fn.extend({
-	addClass: function( value ) {
-		var classes, elem, cur, clazz, j, finalValue,
-			i = 0,
-			len = this.length,
-			proceed = typeof value === "string" && value;
-
-		if ( jQuery.isFunction( value ) ) {
-			return this.each(function( j ) {
-				jQuery( this ).addClass( value.call( this, j, this.className ) );
-			});
-		}
-
-		if ( proceed ) {
-			// The disjunction here is for better compressibility (see removeClass)
-			classes = ( value || "" ).match( rnotwhite ) || [];
-
-			for ( ; i < len; i++ ) {
-				elem = this[ i ];
-				cur = elem.nodeType === 1 && ( elem.className ?
-					( " " + elem.className + " " ).replace( rclass, " " ) :
-					" "
-				);
-
-				if ( cur ) {
-					j = 0;
-					while ( (clazz = classes[j++]) ) {
-						if ( cur.indexOf( " " + clazz + " " ) < 0 ) {
-							cur += clazz + " ";
-						}
-					}
-
-					// only assign if different to avoid unneeded rendering.
-					finalValue = jQuery.trim( cur );
-					if ( elem.className !== finalValue ) {
-						elem.className = finalValue;
-					}
-				}
-			}
-		}
-
-		return this;
-	},
-
-	removeClass: function( value ) {
-		var classes, elem, cur, clazz, j, finalValue,
-			i = 0,
-			len = this.length,
-			proceed = arguments.length === 0 || typeof value === "string" && value;
-
-		if ( jQuery.isFunction( value ) ) {
-			return this.each(function( j ) {
-				jQuery( this ).removeClass( value.call( this, j, this.className ) );
-			});
-		}
-		if ( proceed ) {
-			classes = ( value || "" ).match( rnotwhite ) || [];
-
-			for ( ; i < len; i++ ) {
-				elem = this[ i ];
-				// This expression is here for better compressibility (see addClass)
-				cur = elem.nodeType === 1 && ( elem.className ?
-					( " " + elem.className + " " ).replace( rclass, " " ) :
-					""
-				);
-
-				if ( cur ) {
-					j = 0;
-					while ( (clazz = classes[j++]) ) {
-						// Remove *all* instances
-						while ( cur.indexOf( " " + clazz + " " ) >= 0 ) {
-							cur = cur.replace( " " + clazz + " ", " " );
-						}
-					}
-
-					// only assign if different to avoid unneeded rendering.
-					finalValue = value ? jQuery.trim( cur ) : "";
-					if ( elem.className !== finalValue ) {
-						elem.className = finalValue;
-					}
-				}
-			}
-		}
-
-		return this;
-	},
-
-	toggleClass: function( value, stateVal ) {
-		var type = typeof value;
-
-		if ( typeof stateVal === "boolean" && type === "string" ) {
-			return stateVal ? this.addClass( value ) : this.removeClass( value );
-		}
-
-		if ( jQuery.isFunction( value ) ) {
-			return this.each(function( i ) {
-				jQuery( this ).toggleClass( value.call(this, i, this.className, stateVal), stateVal );
-			});
-		}
-
-		return this.each(function() {
-			if ( type === "string" ) {
-				// toggle individual class names
-				var className,
-					i = 0,
-					self = jQuery( this ),
-					classNames = value.match( rnotwhite ) || [];
-
-				while ( (className = classNames[ i++ ]) ) {
-					// check each className given, space separated list
-					if ( self.hasClass( className ) ) {
-						self.removeClass( className );
-					} else {
-						self.addClass( className );
-					}
-				}
-
-			// Toggle whole class name
-			} else if ( type === strundefined || type === "boolean" ) {
-				if ( this.className ) {
-					// store className if set
-					jQuery._data( this, "__className__", this.className );
-				}
-
-				// If the element has a class name or if we're passed "false",
-				// then remove the whole classname (if there was one, the above saved it).
-				// Otherwise bring back whatever was previously saved (if anything),
-				// falling back to the empty string if nothing was stored.
-				this.className = this.className || value === false ? "" : jQuery._data( this, "__className__" ) || "";
-			}
-		});
-	},
-
-	hasClass: function( selector ) {
-		var className = " " + selector + " ",
-			i = 0,
-			l = this.length;
-		for ( ; i < l; i++ ) {
-			if ( this[i].nodeType === 1 && (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) >= 0 ) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-});
-
-
-
-
-// Return jQuery for attributes-only inclusion
-
-
-jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblclick " +
-	"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
-	"change select submit keydown keypress keyup error contextmenu").split(" "), function( i, name ) {
-
-	// Handle event binding
-	jQuery.fn[ name ] = function( data, fn ) {
-		return arguments.length > 0 ?
-			this.on( name, null, data, fn ) :
-			this.trigger( name );
-	};
-});
-
-jQuery.fn.extend({
-	hover: function( fnOver, fnOut ) {
-		return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
-	},
-
-	bind: function( types, data, fn ) {
-		return this.on( types, null, data, fn );
-	},
-	unbind: function( types, fn ) {
-		return this.off( types, null, fn );
-	},
-
-	delegate: function( selector, types, data, fn ) {
-		return this.on( types, selector, data, fn );
-	},
-	undelegate: function( selector, types, fn ) {
-		// ( namespace ) or ( selector, types [, fn] )
-		return arguments.length === 1 ? this.off( selector, "**" ) : this.off( types, selector || "**", fn );
-	}
-});
-
-
-var nonce = jQuery.now();
-
-var rquery = (/\?/);
-
-
-
-var rvalidtokens = /(,)|(\[|{)|(}|])|"(?:[^"\\\r\n]|\\["\\\/bfnrt]|\\u[\da-fA-F]{4})*"\s*:?|true|false|null|-?(?!0\d)\d+(?:\.\d+|)(?:[eE][+-]?\d+|)/g;
-
-jQuery.parseJSON = function( data ) {
-	// Attempt to parse using the native JSON parser first
-	if ( window.JSON && window.JSON.parse ) {
-		// Support: Android 2.3
-		// Workaround failure to string-cast null input
-		return window.JSON.parse( data + "" );
-	}
-
-	var requireNonComma,
-		depth = null,
-		str = jQuery.trim( data + "" );
-
-	// Guard against invalid (and possibly dangerous) input by ensuring that nothing remains
-	// after removing valid tokens
-	return str && !jQuery.trim( str.replace( rvalidtokens, function( token, comma, open, close ) {
-
-		// Force termination if we see a misplaced comma
-		if ( requireNonComma && comma ) {
-			depth = 0;
-		}
-
-		// Perform no more replacements after returning to outermost depth
-		if ( depth === 0 ) {
-			return token;
-		}
-
-		// Commas must not follow "[", "{", or ","
-		requireNonComma = open || comma;
-
-		// Determine new depth
-		// array/object open ("[" or "{"): depth += true - false (increment)
-		// array/object close ("]" or "}"): depth += false - true (decrement)
-		// other cases ("," or primitive): depth += true - true (numeric cast)
-		depth += !close - !open;
-
-		// Remove this token
-		return "";
-	}) ) ?
-		( Function( "return " + str ) )() :
-		jQuery.error( "Invalid JSON: " + data );
-};
-
-
-// Cross-browser xml parsing
-jQuery.parseXML = function( data ) {
-	var xml, tmp;
-	if ( !data || typeof data !== "string" ) {
-		return null;
-	}
-	try {
-		if ( window.DOMParser ) { // Standard
-			tmp = new DOMParser();
-			xml = tmp.parseFromString( data, "text/xml" );
-		} else { // IE
-			xml = new ActiveXObject( "Microsoft.XMLDOM" );
-			xml.async = "false";
-			xml.loadXML( data );
-		}
-	} catch( e ) {
-		xml = undefined;
-	}
-	if ( !xml || !xml.documentElement || xml.getElementsByTagName( "parsererror" ).length ) {
-		jQuery.error( "Invalid XML: " + data );
-	}
-	return xml;
-};
-
-
-var
-	// Document location
-	ajaxLocParts,
-	ajaxLocation,
-
-	rhash = /#.*$/,
-	rts = /([?&])_=[^&]*/,
-	rheaders = /^(.*?):[ \t]*([^\r\n]*)\r?$/mg, // IE leaves an \r character at EOL
-	// #7653, #8125, #8152: local protocol detection
-	rlocalProtocol = /^(?:about|app|app-storage|.+-extension|file|res|widget):$/,
-	rnoContent = /^(?:GET|HEAD)$/,
-	rprotocol = /^\/\//,
-	rurl = /^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,
-
-	/* Prefilters
-	 * 1) They are useful to introduce custom dataTypes (see ajax/jsonp.js for an example)
-	 * 2) These are called:
-	 *    - BEFORE asking for a transport
-	 *    - AFTER param serialization (s.data is a string if s.processData is true)
-	 * 3) key is the dataType
-	 * 4) the catchall symbol "*" can be used
-	 * 5) execution will start with transport dataType and THEN continue down to "*" if needed
-	 */
-	prefilters = {},
-
-	/* Transports bindings
-	 * 1) key is the dataType
-	 * 2) the catchall symbol "*" can be used
-	 * 3) selection will start with transport dataType and THEN go to "*" if needed
-	 */
-	transports = {},
-
-	// Avoid comment-prolog char sequence (#10098); must appease lint and evade compression
-	allTypes = "*/".concat("*");
-
-// #8138, IE may throw an exception when accessing
-// a field from window.location if document.domain has been set
-try {
-	ajaxLocation = location.href;
-} catch( e ) {
-	// Use the href attribute of an A element
-	// since IE will modify it given document.location
-	ajaxLocation = document.createElement( "a" );
-	ajaxLocation.href = "";
-	ajaxLocation = ajaxLocation.href;
-}
-
-// Segment location into parts
-ajaxLocParts = rurl.exec( ajaxLocation.toLowerCase() ) || [];
-
-// Base "constructor" for jQuery.ajaxPrefilter and jQuery.ajaxTransport
-function addToPrefiltersOrTransports( structure ) {
-
-	// dataTypeExpression is optional and defaults to "*"
-	return function( dataTypeExpression, func ) {
-
-		if ( typeof dataTypeExpression !== "string" ) {
-			func = dataTypeExpression;
-			dataTypeExpression = "*";
-		}
-
-		var dataType,
-			i = 0,
-			dataTypes = dataTypeExpression.toLowerCase().match( rnotwhite ) || [];
-
-		if ( jQuery.isFunction( func ) ) {
-			// For each dataType in the dataTypeExpression
-			while ( (dataType = dataTypes[i++]) ) {
-				// Prepend if requested
-				if ( dataType.charAt( 0 ) === "+" ) {
-					dataType = dataType.slice( 1 ) || "*";
-					(structure[ dataType ] = structure[ dataType ] || []).unshift( func );
-
-				// Otherwise append
-				} else {
-					(structure[ dataType ] = structure[ dataType ] || []).push( func );
-				}
-			}
-		}
-	};
-}
-
-// Base inspection function for prefilters and transports
-function inspectPrefiltersOrTransports( structure, options, originalOptions, jqXHR ) {
-
-	var inspected = {},
-		seekingTransport = ( structure === transports );
-
-	function inspect( dataType ) {
-		var selected;
-		inspected[ dataType ] = true;
-		jQuery.each( structure[ dataType ] || [], function( _, prefilterOrFactory ) {
-			var dataTypeOrTransport = prefilterOrFactory( options, originalOptions, jqXHR );
-			if ( typeof dataTypeOrTransport === "string" && !seekingTransport && !inspected[ dataTypeOrTransport ] ) {
-				options.dataTypes.unshift( dataTypeOrTransport );
-				inspect( dataTypeOrTransport );
-				return false;
-			} else if ( seekingTransport ) {
-				return !( selected = dataTypeOrTransport );
-			}
-		});
-		return selected;
-	}
-
-	return inspect( options.dataTypes[ 0 ] ) || !inspected[ "*" ] && inspect( "*" );
-}
-
-// A special extend for ajax options
-// that takes "flat" options (not to be deep extended)
-// Fixes #9887
-function ajaxExtend( target, src ) {
-	var deep, key,
-		flatOptions = jQuery.ajaxSettings.flatOptions || {};
-
-	for ( key in src ) {
-		if ( src[ key ] !== undefined ) {
-			( flatOptions[ key ] ? target : ( deep || (deep = {}) ) )[ key ] = src[ key ];
-		}
-	}
-	if ( deep ) {
-		jQuery.extend( true, target, deep );
-	}
-
-	return target;
-}
-
-/* Handles responses to an ajax request:
- * - finds the right dataType (mediates between content-type and expected dataType)
- * - returns the corresponding response
- */
-function ajaxHandleResponses( s, jqXHR, responses ) {
-	var firstDataType, ct, finalDataType, type,
-		contents = s.contents,
-		dataTypes = s.dataTypes;
-
-	// Remove auto dataType and get content-type in the process
-	while ( dataTypes[ 0 ] === "*" ) {
-		dataTypes.shift();
-		if ( ct === undefined ) {
-			ct = s.mimeType || jqXHR.getResponseHeader("Content-Type");
-		}
-	}
-
-	// Check if we're dealing with a known content-type
-	if ( ct ) {
-		for ( type in contents ) {
-			if ( contents[ type ] && contents[ type ].test( ct ) ) {
-				dataTypes.unshift( type );
-				break;
-			}
-		}
-	}
-
-	// Check to see if we have a response for the expected dataType
-	if ( dataTypes[ 0 ] in responses ) {
-		finalDataType = dataTypes[ 0 ];
-	} else {
-		// Try convertible dataTypes
-		for ( type in responses ) {
-			if ( !dataTypes[ 0 ] || s.converters[ type + " " + dataTypes[0] ] ) {
-				finalDataType = type;
-				break;
-			}
-			if ( !firstDataType ) {
-				firstDataType = type;
-			}
-		}
-		// Or just use first one
-		finalDataType = finalDataType || firstDataType;
-	}
-
-	// If we found a dataType
-	// We add the dataType to the list if needed
-	// and return the corresponding response
-	if ( finalDataType ) {
-		if ( finalDataType !== dataTypes[ 0 ] ) {
-			dataTypes.unshift( finalDataType );
-		}
-		return responses[ finalDataType ];
-	}
-}
-
-/* Chain conversions given the request and the original response
- * Also sets the responseXXX fields on the jqXHR instance
- */
-function ajaxConvert( s, response, jqXHR, isSuccess ) {
-	var conv2, current, conv, tmp, prev,
-		converters = {},
-		// Work with a copy of dataTypes in case we need to modify it for conversion
-		dataTypes = s.dataTypes.slice();
-
-	// Create converters map with lowercased keys
-	if ( dataTypes[ 1 ] ) {
-		for ( conv in s.converters ) {
-			converters[ conv.toLowerCase() ] = s.converters[ conv ];
-		}
-	}
-
-	current = dataTypes.shift();
-
-	// Convert to each sequential dataType
-	while ( current ) {
-
-		if ( s.responseFields[ current ] ) {
-			jqXHR[ s.responseFields[ current ] ] = response;
-		}
-
-		// Apply the dataFilter if provided
-		if ( !prev && isSuccess && s.dataFilter ) {
-			response = s.dataFilter( response, s.dataType );
-		}
-
-		prev = current;
-		current = dataTypes.shift();
-
-		if ( current ) {
-
-			// There's only work to do if current dataType is non-auto
-			if ( current === "*" ) {
-
-				current = prev;
-
-			// Convert response if prev dataType is non-auto and differs from current
-			} else if ( prev !== "*" && prev !== current ) {
-
-				// Seek a direct converter
-				conv = converters[ prev + " " + current ] || converters[ "* " + current ];
-
-				// If none found, seek a pair
-				if ( !conv ) {
-					for ( conv2 in converters ) {
-
-						// If conv2 outputs current
-						tmp = conv2.split( " " );
-						if ( tmp[ 1 ] === current ) {
-
-							// If prev can be converted to accepted input
-							conv = converters[ prev + " " + tmp[ 0 ] ] ||
-								converters[ "* " + tmp[ 0 ] ];
-							if ( conv ) {
-								// Condense equivalence converters
-								if ( conv === true ) {
-									conv = converters[ conv2 ];
-
-								// Otherwise, insert the intermediate dataType
-								} else if ( converters[ conv2 ] !== true ) {
-									current = tmp[ 0 ];
-									dataTypes.unshift( tmp[ 1 ] );
-								}
-								break;
-							}
-						}
-					}
-				}
-
-				// Apply converter (if not an equivalence)
-				if ( conv !== true ) {
-
-					// Unless errors are allowed to bubble, catch and return them
-					if ( conv && s[ "throws" ] ) {
-						response = conv( response );
-					} else {
-						try {
-							response = conv( response );
-						} catch ( e ) {
-							return { state: "parsererror", error: conv ? e : "No conversion from " + prev + " to " + current };
-						}
-					}
-				}
-			}
-		}
-	}
-
-	return { state: "success", data: response };
-}
-
-jQuery.extend({
-
-	// Counter for holding the number of active queries
-	active: 0,
-
-	// Last-Modified header cache for next request
-	lastModified: {},
-	etag: {},
-
-	ajaxSettings: {
-		url: ajaxLocation,
-		type: "GET",
-		isLocal: rlocalProtocol.test( ajaxLocParts[ 1 ] ),
-		global: true,
-		processData: true,
-		async: true,
-		contentType: "application/x-www-form-urlencoded; charset=UTF-8",
-		/*
-		timeout: 0,
-		data: null,
-		dataType: null,
-		username: null,
-		password: null,
-		cache: null,
-		throws: false,
-		traditional: false,
-		headers: {},
-		*/
-
-		accepts: {
-			"*": allTypes,
-			text: "text/plain",
-			html: "text/html",
-			xml: "application/xml, text/xml",
-			json: "application/json, text/javascript"
-		},
-
-		contents: {
-			xml: /xml/,
-			html: /html/,
-			json: /json/
-		},
-
-		responseFields: {
-			xml: "responseXML",
-			text: "responseText",
-			json: "responseJSON"
-		},
-
-		// Data converters
-		// Keys separate source (or catchall "*") and destination types with a single space
-		converters: {
-
-			// Convert anything to text
-			"* text": String,
-
-			// Text to html (true = no transformation)
-			"text html": true,
-
-			// Evaluate text as a json expression
-			"text json": jQuery.parseJSON,
-
-			// Parse text as xml
-			"text xml": jQuery.parseXML
-		},
-
-		// For options that shouldn't be deep extended:
-		// you can add your own custom options here if
-		// and when you create one that shouldn't be
-		// deep extended (see ajaxExtend)
-		flatOptions: {
-			url: true,
-			context: true
-		}
-	},
-
-	// Creates a full fledged settings object into target
-	// with both ajaxSettings and settings fields.
-	// If target is omitted, writes into ajaxSettings.
-	ajaxSetup: function( target, settings ) {
-		return settings ?
-
-			// Building a settings object
-			ajaxExtend( ajaxExtend( target, jQuery.ajaxSettings ), settings ) :
-
-			// Extending ajaxSettings
-			ajaxExtend( jQuery.ajaxSettings, target );
-	},
-
-	ajaxPrefilter: addToPrefiltersOrTransports( prefilters ),
-	ajaxTransport: addToPrefiltersOrTransports( transports ),
-
-	// Main method
-	ajax: function( url, options ) {
-
-		// If url is an object, simulate pre-1.5 signature
-		if ( typeof url === "object" ) {
-			options = url;
-			url = undefined;
-		}
-
-		// Force options to be an object
-		options = options || {};
-
-		var // Cross-domain detection vars
-			parts,
-			// Loop variable
-			i,
-			// URL without anti-cache param
-			cacheURL,
-			// Response headers as string
-			responseHeadersString,
-			// timeout handle
-			timeoutTimer,
-
-			// To know if global events are to be dispatched
-			fireGlobals,
-
-			transport,
-			// Response headers
-			responseHeaders,
-			// Create the final options object
-			s = jQuery.ajaxSetup( {}, options ),
-			// Callbacks context
-			callbackContext = s.context || s,
-			// Context for global events is callbackContext if it is a DOM node or jQuery collection
-			globalEventContext = s.context && ( callbackContext.nodeType || callbackContext.jquery ) ?
-				jQuery( callbackContext ) :
-				jQuery.event,
-			// Deferreds
-			deferred = jQuery.Deferred(),
-			completeDeferred = jQuery.Callbacks("once memory"),
-			// Status-dependent callbacks
-			statusCode = s.statusCode || {},
-			// Headers (they are sent all at once)
-			requestHeaders = {},
-			requestHeadersNames = {},
-			// The jqXHR state
-			state = 0,
-			// Default abort message
-			strAbort = "canceled",
-			// Fake xhr
-			jqXHR = {
-				readyState: 0,
-
-				// Builds headers hashtable if needed
-				getResponseHeader: function( key ) {
-					var match;
-					if ( state === 2 ) {
-						if ( !responseHeaders ) {
-							responseHeaders = {};
-							while ( (match = rheaders.exec( responseHeadersString )) ) {
-								responseHeaders[ match[1].toLowerCase() ] = match[ 2 ];
-							}
-						}
-						match = responseHeaders[ key.toLowerCase() ];
-					}
-					return match == null ? null : match;
-				},
-
-				// Raw string
-				getAllResponseHeaders: function() {
-					return state === 2 ? responseHeadersString : null;
-				},
-
-				// Caches the header
-				setRequestHeader: function( name, value ) {
-					var lname = name.toLowerCase();
-					if ( !state ) {
-						name = requestHeadersNames[ lname ] = requestHeadersNames[ lname ] || name;
-						requestHeaders[ name ] = value;
-					}
-					return this;
-				},
-
-				// Overrides response content-type header
-				overrideMimeType: function( type ) {
-					if ( !state ) {
-						s.mimeType = type;
-					}
-					return this;
-				},
-
-				// Status-dependent callbacks
-				statusCode: function( map ) {
-					var code;
-					if ( map ) {
-						if ( state < 2 ) {
-							for ( code in map ) {
-								// Lazy-add the new callback in a way that preserves old ones
-								statusCode[ code ] = [ statusCode[ code ], map[ code ] ];
-							}
-						} else {
-							// Execute the appropriate callbacks
-							jqXHR.always( map[ jqXHR.status ] );
-						}
-					}
-					return this;
-				},
-
-				// Cancel the request
-				abort: function( statusText ) {
-					var finalText = statusText || strAbort;
-					if ( transport ) {
-						transport.abort( finalText );
-					}
-					done( 0, finalText );
-					return this;
-				}
-			};
-
-		// Attach deferreds
-		deferred.promise( jqXHR ).complete = completeDeferred.add;
-		jqXHR.success = jqXHR.done;
-		jqXHR.error = jqXHR.fail;
-
-		// Remove hash character (#7531: and string promotion)
-		// Add protocol if not provided (#5866: IE7 issue with protocol-less urls)
-		// Handle falsy url in the settings object (#10093: consistency with old signature)
-		// We also use the url parameter if available
-		s.url = ( ( url || s.url || ajaxLocation ) + "" ).replace( rhash, "" ).replace( rprotocol, ajaxLocParts[ 1 ] + "//" );
-
-		// Alias method option to type as per ticket #12004
-		s.type = options.method || options.type || s.method || s.type;
-
-		// Extract dataTypes list
-		s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().match( rnotwhite ) || [ "" ];
-
-		// A cross-domain request is in order when we have a protocol:host:port mismatch
-		if ( s.crossDomain == null ) {
-			parts = rurl.exec( s.url.toLowerCase() );
-			s.crossDomain = !!( parts &&
-				( parts[ 1 ] !== ajaxLocParts[ 1 ] || parts[ 2 ] !== ajaxLocParts[ 2 ] ||
-					( parts[ 3 ] || ( parts[ 1 ] === "http:" ? "80" : "443" ) ) !==
-						( ajaxLocParts[ 3 ] || ( ajaxLocParts[ 1 ] === "http:" ? "80" : "443" ) ) )
-			);
-		}
-
-		// Convert data if not already a string
-		if ( s.data && s.processData && typeof s.data !== "string" ) {
-			s.data = jQuery.param( s.data, s.traditional );
-		}
-
-		// Apply prefilters
-		inspectPrefiltersOrTransports( prefilters, s, options, jqXHR );
-
-		// If request was aborted inside a prefilter, stop there
-		if ( state === 2 ) {
-			return jqXHR;
-		}
-
-		// We can fire global events as of now if asked to
-		// Don't fire events if jQuery.event is undefined in an AMD-usage scenario (#15118)
-		fireGlobals = jQuery.event && s.global;
-
-		// Watch for a new set of requests
-		if ( fireGlobals && jQuery.active++ === 0 ) {
-			jQuery.event.trigger("ajaxStart");
-		}
-
-		// Uppercase the type
-		s.type = s.type.toUpperCase();
-
-		// Determine if request has content
-		s.hasContent = !rnoContent.test( s.type );
-
-		// Save the URL in case we're toying with the If-Modified-Since
-		// and/or If-None-Match header later on
-		cacheURL = s.url;
-
-		// More options handling for requests with no content
-		if ( !s.hasContent ) {
-
-			// If data is available, append data to url
-			if ( s.data ) {
-				cacheURL = ( s.url += ( rquery.test( cacheURL ) ? "&" : "?" ) + s.data );
-				// #9682: remove data so that it's not used in an eventual retry
-				delete s.data;
-			}
-
-			// Add anti-cache in url if needed
-			if ( s.cache === false ) {
-				s.url = rts.test( cacheURL ) ?
-
-					// If there is already a '_' parameter, set its value
-					cacheURL.replace( rts, "$1_=" + nonce++ ) :
-
-					// Otherwise add one to the end
-					cacheURL + ( rquery.test( cacheURL ) ? "&" : "?" ) + "_=" + nonce++;
-			}
-		}
-
-		// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
-		if ( s.ifModified ) {
-			if ( jQuery.lastModified[ cacheURL ] ) {
-				jqXHR.setRequestHeader( "If-Modified-Since", jQuery.lastModified[ cacheURL ] );
-			}
-			if ( jQuery.etag[ cacheURL ] ) {
-				jqXHR.setRequestHeader( "If-None-Match", jQuery.etag[ cacheURL ] );
-			}
-		}
-
-		// Set the correct header, if data is being sent
-		if ( s.data && s.hasContent && s.contentType !== false || options.contentType ) {
-			jqXHR.setRequestHeader( "Content-Type", s.contentType );
-		}
-
-		// Set the Accepts header for the server, depending on the dataType
-		jqXHR.setRequestHeader(
-			"Accept",
-			s.dataTypes[ 0 ] && s.accepts[ s.dataTypes[0] ] ?
-				s.accepts[ s.dataTypes[0] ] + ( s.dataTypes[ 0 ] !== "*" ? ", " + allTypes + "; q=0.01" : "" ) :
-				s.accepts[ "*" ]
-		);
-
-		// Check for headers option
-		for ( i in s.headers ) {
-			jqXHR.setRequestHeader( i, s.headers[ i ] );
-		}
-
-		// Allow custom headers/mimetypes and early abort
-		if ( s.beforeSend && ( s.beforeSend.call( callbackContext, jqXHR, s ) === false || state === 2 ) ) {
-			// Abort if not done already and return
-			return jqXHR.abort();
-		}
-
-		// aborting is no longer a cancellation
-		strAbort = "abort";
-
-		// Install callbacks on deferreds
-		for ( i in { success: 1, error: 1, complete: 1 } ) {
-			jqXHR[ i ]( s[ i ] );
-		}
-
-		// Get transport
-		transport = inspectPrefiltersOrTransports( transports, s, options, jqXHR );
-
-		// If no transport, we auto-abort
-		if ( !transport ) {
-			done( -1, "No Transport" );
-		} else {
-			jqXHR.readyState = 1;
-
-			// Send global event
-			if ( fireGlobals ) {
-				globalEventContext.trigger( "ajaxSend", [ jqXHR, s ] );
-			}
-			// Timeout
-			if ( s.async && s.timeout > 0 ) {
-				timeoutTimer = setTimeout(function() {
-					jqXHR.abort("timeout");
-				}, s.timeout );
-			}
-
-			try {
-				state = 1;
-				transport.send( requestHeaders, done );
-			} catch ( e ) {
-				// Propagate exception as error if not done
-				if ( state < 2 ) {
-					done( -1, e );
-				// Simply rethrow otherwise
-				} else {
-					throw e;
-				}
-			}
-		}
-
-		// Callback for when everything is done
-		function done( status, nativeStatusText, responses, headers ) {
-			var isSuccess, success, error, response, modified,
-				statusText = nativeStatusText;
-
-			// Called once
-			if ( state === 2 ) {
-				return;
-			}
-
-			// State is "done" now
-			state = 2;
-
-			// Clear timeout if it exists
-			if ( timeoutTimer ) {
-				clearTimeout( timeoutTimer );
-			}
-
-			// Dereference transport for early garbage collection
-			// (no matter how long the jqXHR object will be used)
-			transport = undefined;
-
-			// Cache response headers
-			responseHeadersString = headers || "";
-
-			// Set readyState
-			jqXHR.readyState = status > 0 ? 4 : 0;
-
-			// Determine if successful
-			isSuccess = status >= 200 && status < 300 || status === 304;
-
-			// Get response data
-			if ( responses ) {
-				response = ajaxHandleResponses( s, jqXHR, responses );
-			}
-
-			// Convert no matter what (that way responseXXX fields are always set)
-			response = ajaxConvert( s, response, jqXHR, isSuccess );
-
-			// If successful, handle type chaining
-			if ( isSuccess ) {
-
-				// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
-				if ( s.ifModified ) {
-					modified = jqXHR.getResponseHeader("Last-Modified");
-					if ( modified ) {
-						jQuery.lastModified[ cacheURL ] = modified;
-					}
-					modified = jqXHR.getResponseHeader("etag");
-					if ( modified ) {
-						jQuery.etag[ cacheURL ] = modified;
-					}
-				}
-
-				// if no content
-				if ( status === 204 || s.type === "HEAD" ) {
-					statusText = "nocontent";
-
-				// if not modified
-				} else if ( status === 304 ) {
-					statusText = "notmodified";
-
-				// If we have data, let's convert it
-				} else {
-					statusText = response.state;
-					success = response.data;
-					error = response.error;
-					isSuccess = !error;
-				}
-			} else {
-				// We extract error from statusText
-				// then normalize statusText and status for non-aborts
-				error = statusText;
-				if ( status || !statusText ) {
-					statusText = "error";
-					if ( status < 0 ) {
-						status = 0;
-					}
-				}
-			}
-
-			// Set data for the fake xhr object
-			jqXHR.status = status;
-			jqXHR.statusText = ( nativeStatusText || statusText ) + "";
-
-			// Success/Error
-			if ( isSuccess ) {
-				deferred.resolveWith( callbackContext, [ success, statusText, jqXHR ] );
-			} else {
-				deferred.rejectWith( callbackContext, [ jqXHR, statusText, error ] );
-			}
-
-			// Status-dependent callbacks
-			jqXHR.statusCode( statusCode );
-			statusCode = undefined;
-
-			if ( fireGlobals ) {
-				globalEventContext.trigger( isSuccess ? "ajaxSuccess" : "ajaxError",
-					[ jqXHR, s, isSuccess ? success : error ] );
-			}
-
-			// Complete
-			completeDeferred.fireWith( callbackContext, [ jqXHR, statusText ] );
-
-			if ( fireGlobals ) {
-				globalEventContext.trigger( "ajaxComplete", [ jqXHR, s ] );
-				// Handle the global AJAX counter
-				if ( !( --jQuery.active ) ) {
-					jQuery.event.trigger("ajaxStop");
-				}
-			}
-		}
-
-		return jqXHR;
-	},
-
-	getJSON: function( url, data, callback ) {
-		return jQuery.get( url, data, callback, "json" );
-	},
-
-	getScript: function( url, callback ) {
-		return jQuery.get( url, undefined, callback, "script" );
-	}
-});
-
-jQuery.each( [ "get", "post" ], function( i, method ) {
-	jQuery[ method ] = function( url, data, callback, type ) {
-		// shift arguments if data argument was omitted
-		if ( jQuery.isFunction( data ) ) {
-			type = type || callback;
-			callback = data;
-			data = undefined;
-		}
-
-		return jQuery.ajax({
-			url: url,
-			type: method,
-			dataType: type,
-			data: data,
-			success: callback
-		});
-	};
-});
-
-
-jQuery._evalUrl = function( url ) {
-	return jQuery.ajax({
-		url: url,
-		type: "GET",
-		dataType: "script",
-		async: false,
-		global: false,
-		"throws": true
-	});
-};
-
-
-jQuery.fn.extend({
-	wrapAll: function( html ) {
-		if ( jQuery.isFunction( html ) ) {
-			return this.each(function(i) {
-				jQuery(this).wrapAll( html.call(this, i) );
-			});
-		}
-
-		if ( this[0] ) {
-			// The elements to wrap the target around
-			var wrap = jQuery( html, this[0].ownerDocument ).eq(0).clone(true);
-
-			if ( this[0].parentNode ) {
-				wrap.insertBefore( this[0] );
-			}
-
-			wrap.map(function() {
-				var elem = this;
-
-				while ( elem.firstChild && elem.firstChild.nodeType === 1 ) {
-					elem = elem.firstChild;
-				}
-
-				return elem;
-			}).append( this );
-		}
-
-		return this;
-	},
-
-	wrapInner: function( html ) {
-		if ( jQuery.isFunction( html ) ) {
-			return this.each(function(i) {
-				jQuery(this).wrapInner( html.call(this, i) );
-			});
-		}
-
-		return this.each(function() {
-			var self = jQuery( this ),
-				contents = self.contents();
-
-			if ( contents.length ) {
-				contents.wrapAll( html );
-
-			} else {
-				self.append( html );
-			}
-		});
-	},
-
-	wrap: function( html ) {
-		var isFunction = jQuery.isFunction( html );
-
-		return this.each(function(i) {
-			jQuery( this ).wrapAll( isFunction ? html.call(this, i) : html );
-		});
-	},
-
-	unwrap: function() {
-		return this.parent().each(function() {
-			if ( !jQuery.nodeName( this, "body" ) ) {
-				jQuery( this ).replaceWith( this.childNodes );
-			}
-		}).end();
-	}
-});
-
-
-jQuery.expr.filters.hidden = function( elem ) {
-	// Support: Opera <= 12.12
-	// Opera reports offsetWidths and offsetHeights less than zero on some elements
-	return elem.offsetWidth <= 0 && elem.offsetHeight <= 0 ||
-		(!support.reliableHiddenOffsets() &&
-			((elem.style && elem.style.display) || jQuery.css( elem, "display" )) === "none");
-};
-
-jQuery.expr.filters.visible = function( elem ) {
-	return !jQuery.expr.filters.hidden( elem );
-};
-
-
-
-
-var r20 = /%20/g,
-	rbracket = /\[\]$/,
-	rCRLF = /\r?\n/g,
-	rsubmitterTypes = /^(?:submit|button|image|reset|file)$/i,
-	rsubmittable = /^(?:input|select|textarea|keygen)/i;
-
-function buildParams( prefix, obj, traditional, add ) {
-	var name;
-
-	if ( jQuery.isArray( obj ) ) {
-		// Serialize array item.
-		jQuery.each( obj, function( i, v ) {
-			if ( traditional || rbracket.test( prefix ) ) {
-				// Treat each array item as a scalar.
-				add( prefix, v );
-
-			} else {
-				// Item is non-scalar (array or object), encode its numeric index.
-				buildParams( prefix + "[" + ( typeof v === "object" ? i : "" ) + "]", v, traditional, add );
-			}
-		});
-
-	} else if ( !traditional && jQuery.type( obj ) === "object" ) {
-		// Serialize object item.
-		for ( name in obj ) {
-			buildParams( prefix + "[" + name + "]", obj[ name ], traditional, add );
-		}
-
-	} else {
-		// Serialize scalar item.
-		add( prefix, obj );
-	}
-}
-
-// Serialize an array of form elements or a set of
-// key/values into a query string
-jQuery.param = function( a, traditional ) {
-	var prefix,
-		s = [],
-		add = function( key, value ) {
-			// If value is a function, invoke it and return its value
-			value = jQuery.isFunction( value ) ? value() : ( value == null ? "" : value );
-			s[ s.length ] = encodeURIComponent( key ) + "=" + encodeURIComponent( value );
-		};
-
-	// Set traditional to true for jQuery <= 1.3.2 behavior.
-	if ( traditional === undefined ) {
-		traditional = jQuery.ajaxSettings && jQuery.ajaxSettings.traditional;
-	}
-
-	// If an array was passed in, assume that it is an array of form elements.
-	if ( jQuery.isArray( a ) || ( a.jquery && !jQuery.isPlainObject( a ) ) ) {
-		// Serialize the form elements
-		jQuery.each( a, function() {
-			add( this.name, this.value );
-		});
-
-	} else {
-		// If traditional, encode the "old" way (the way 1.3.2 or older
-		// did it), otherwise encode params recursively.
-		for ( prefix in a ) {
-			buildParams( prefix, a[ prefix ], traditional, add );
-		}
-	}
-
-	// Return the resulting serialization
-	return s.join( "&" ).replace( r20, "+" );
-};
-
-jQuery.fn.extend({
-	serialize: function() {
-		return jQuery.param( this.serializeArray() );
-	},
-	serializeArray: function() {
-		return this.map(function() {
-			// Can add propHook for "elements" to filter or add form elements
-			var elements = jQuery.prop( this, "elements" );
-			return elements ? jQuery.makeArray( elements ) : this;
-		})
-		.filter(function() {
-			var type = this.type;
-			// Use .is(":disabled") so that fieldset[disabled] works
-			return this.name && !jQuery( this ).is( ":disabled" ) &&
-				rsubmittable.test( this.nodeName ) && !rsubmitterTypes.test( type ) &&
-				( this.checked || !rcheckableType.test( type ) );
-		})
-		.map(function( i, elem ) {
-			var val = jQuery( this ).val();
-
-			return val == null ?
-				null :
-				jQuery.isArray( val ) ?
-					jQuery.map( val, function( val ) {
-						return { name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
-					}) :
-					{ name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
-		}).get();
-	}
-});
-
-
-// Create the request object
-// (This is still attached to ajaxSettings for backward compatibility)
-jQuery.ajaxSettings.xhr = window.ActiveXObject !== undefined ?
-	// Support: IE6+
-	function() {
-
-		// XHR cannot access local files, always use ActiveX for that case
-		return !this.isLocal &&
-
-			// Support: IE7-8
-			// oldIE XHR does not support non-RFC2616 methods (#13240)
-			// See http://msdn.microsoft.com/en-us/library/ie/ms536648(v=vs.85).aspx
-			// and http://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9
-			// Although this check for six methods instead of eight
-			// since IE also does not support "trace" and "connect"
-			/^(get|post|head|put|delete|options)$/i.test( this.type ) &&
-
-			createStandardXHR() || createActiveXHR();
-	} :
-	// For all other browsers, use the standard XMLHttpRequest object
-	createStandardXHR;
-
-var xhrId = 0,
-	xhrCallbacks = {},
-	xhrSupported = jQuery.ajaxSettings.xhr();
-
-// Support: IE<10
-// Open requests must be manually aborted on unload (#5280)
-// See https://support.microsoft.com/kb/2856746 for more info
-if ( window.attachEvent ) {
-	window.attachEvent( "onunload", function() {
-		for ( var key in xhrCallbacks ) {
-			xhrCallbacks[ key ]( undefined, true );
-		}
-	});
-}
-
-// Determine support properties
-support.cors = !!xhrSupported && ( "withCredentials" in xhrSupported );
-xhrSupported = support.ajax = !!xhrSupported;
-
-// Create transport if the browser can provide an xhr
-if ( xhrSupported ) {
-
-	jQuery.ajaxTransport(function( options ) {
-		// Cross domain only allowed if supported through XMLHttpRequest
-		if ( !options.crossDomain || support.cors ) {
-
-			var callback;
-
-			return {
-				send: function( headers, complete ) {
-					var i,
-						xhr = options.xhr(),
-						id = ++xhrId;
-
-					// Open the socket
-					xhr.open( options.type, options.url, options.async, options.username, options.password );
-
-					// Apply custom fields if provided
-					if ( options.xhrFields ) {
-						for ( i in options.xhrFields ) {
-							xhr[ i ] = options.xhrFields[ i ];
-						}
-					}
-
-					// Override mime type if needed
-					if ( options.mimeType && xhr.overrideMimeType ) {
-						xhr.overrideMimeType( options.mimeType );
-					}
-
-					// X-Requested-With header
-					// For cross-domain requests, seeing as conditions for a preflight are
-					// akin to a jigsaw puzzle, we simply never set it to be sure.
-					// (it can always be set on a per-request basis or even using ajaxSetup)
-					// For same-domain requests, won't change header if already provided.
-					if ( !options.crossDomain && !headers["X-Requested-With"] ) {
-						headers["X-Requested-With"] = "XMLHttpRequest";
-					}
-
-					// Set headers
-					for ( i in headers ) {
-						// Support: IE<9
-						// IE's ActiveXObject throws a 'Type Mismatch' exception when setting
-						// request header to a null-value.
-						//
-						// To keep consistent with other XHR implementations, cast the value
-						// to string and ignore `undefined`.
-						if ( headers[ i ] !== undefined ) {
-							xhr.setRequestHeader( i, headers[ i ] + "" );
-						}
-					}
-
-					// Do send the request
-					// This may raise an exception which is actually
-					// handled in jQuery.ajax (so no try/catch here)
-					xhr.send( ( options.hasContent && options.data ) || null );
-
-					// Listener
-					callback = function( _, isAbort ) {
-						var status, statusText, responses;
-
-						// Was never called and is aborted or complete
-						if ( callback && ( isAbort || xhr.readyState === 4 ) ) {
-							// Clean up
-							delete xhrCallbacks[ id ];
-							callback = undefined;
-							xhr.onreadystatechange = jQuery.noop;
-
-							// Abort manually if needed
-							if ( isAbort ) {
-								if ( xhr.readyState !== 4 ) {
-									xhr.abort();
-								}
-							} else {
-								responses = {};
-								status = xhr.status;
-
-								// Support: IE<10
-								// Accessing binary-data responseText throws an exception
-								// (#11426)
-								if ( typeof xhr.responseText === "string" ) {
-									responses.text = xhr.responseText;
-								}
-
-								// Firefox throws an exception when accessing
-								// statusText for faulty cross-domain requests
-								try {
-									statusText = xhr.statusText;
-								} catch( e ) {
-									// We normalize with Webkit giving an empty statusText
-									statusText = "";
-								}
-
-								// Filter status for non standard behaviors
-
-								// If the request is local and we have data: assume a success
-								// (success with no data won't get notified, that's the best we
-								// can do given current implementations)
-								if ( !status && options.isLocal && !options.crossDomain ) {
-									status = responses.text ? 200 : 404;
-								// IE - #1450: sometimes returns 1223 when it should be 204
-								} else if ( status === 1223 ) {
-									status = 204;
-								}
-							}
-						}
-
-						// Call complete if needed
-						if ( responses ) {
-							complete( status, statusText, responses, xhr.getAllResponseHeaders() );
-						}
-					};
-
-					if ( !options.async ) {
-						// if we're in sync mode we fire the callback
-						callback();
-					} else if ( xhr.readyState === 4 ) {
-						// (IE6 & IE7) if it's in cache and has been
-						// retrieved directly we need to fire the callback
-						setTimeout( callback );
-					} else {
-						// Add to the list of active xhr callbacks
-						xhr.onreadystatechange = xhrCallbacks[ id ] = callback;
-					}
-				},
-
-				abort: function() {
-					if ( callback ) {
-						callback( undefined, true );
-					}
-				}
-			};
-		}
-	});
-}
-
-// Functions to create xhrs
-function createStandardXHR() {
-	try {
-		return new window.XMLHttpRequest();
-	} catch( e ) {}
-}
-
-function createActiveXHR() {
-	try {
-		return new window.ActiveXObject( "Microsoft.XMLHTTP" );
-	} catch( e ) {}
-}
-
-
-
-
-// Install script dataType
-jQuery.ajaxSetup({
-	accepts: {
-		script: "text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"
-	},
-	contents: {
-		script: /(?:java|ecma)script/
-	},
-	converters: {
-		"text script": function( text ) {
-			jQuery.globalEval( text );
-			return text;
-		}
-	}
-});
-
-// Handle cache's special case and global
-jQuery.ajaxPrefilter( "script", function( s ) {
-	if ( s.cache === undefined ) {
-		s.cache = false;
-	}
-	if ( s.crossDomain ) {
-		s.type = "GET";
-		s.global = false;
-	}
-});
-
-// Bind script tag hack transport
-jQuery.ajaxTransport( "script", function(s) {
-
-	// This transport only deals with cross domain requests
-	if ( s.crossDomain ) {
-
-		var script,
-			head = document.head || jQuery("head")[0] || document.documentElement;
-
-		return {
-
-			send: function( _, callback ) {
-
-				script = document.createElement("script");
-
-				script.async = true;
-
-				if ( s.scriptCharset ) {
-					script.charset = s.scriptCharset;
-				}
-
-				script.src = s.url;
-
-				// Attach handlers for all browsers
-				script.onload = script.onreadystatechange = function( _, isAbort ) {
-
-					if ( isAbort || !script.readyState || /loaded|complete/.test( script.readyState ) ) {
-
-						// Handle memory leak in IE
-						script.onload = script.onreadystatechange = null;
-
-						// Remove the script
-						if ( script.parentNode ) {
-							script.parentNode.removeChild( script );
-						}
-
-						// Dereference the script
-						script = null;
-
-						// Callback if not abort
-						if ( !isAbort ) {
-							callback( 200, "success" );
-						}
-					}
-				};
-
-				// Circumvent IE6 bugs with base elements (#2709 and #4378) by prepending
-				// Use native DOM manipulation to avoid our domManip AJAX trickery
-				head.insertBefore( script, head.firstChild );
-			},
-
-			abort: function() {
-				if ( script ) {
-					script.onload( undefined, true );
-				}
-			}
-		};
-	}
-});
-
-
-
-
-var oldCallbacks = [],
-	rjsonp = /(=)\?(?=&|$)|\?\?/;
-
-// Default jsonp settings
-jQuery.ajaxSetup({
-	jsonp: "callback",
-	jsonpCallback: function() {
-		var callback = oldCallbacks.pop() || ( jQuery.expando + "_" + ( nonce++ ) );
-		this[ callback ] = true;
-		return callback;
-	}
-});
-
-// Detect, normalize options and install callbacks for jsonp requests
-jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
-
-	var callbackName, overwritten, responseContainer,
-		jsonProp = s.jsonp !== false && ( rjsonp.test( s.url ) ?
-			"url" :
-			typeof s.data === "string" && !( s.contentType || "" ).indexOf("application/x-www-form-urlencoded") && rjsonp.test( s.data ) && "data"
-		);
-
-	// Handle iff the expected data type is "jsonp" or we have a parameter to set
-	if ( jsonProp || s.dataTypes[ 0 ] === "jsonp" ) {
-
-		// Get callback name, remembering preexisting value associated with it
-		callbackName = s.jsonpCallback = jQuery.isFunction( s.jsonpCallback ) ?
-			s.jsonpCallback() :
-			s.jsonpCallback;
-
-		// Insert callback into url or form data
-		if ( jsonProp ) {
-			s[ jsonProp ] = s[ jsonProp ].replace( rjsonp, "$1" + callbackName );
-		} else if ( s.jsonp !== false ) {
-			s.url += ( rquery.test( s.url ) ? "&" : "?" ) + s.jsonp + "=" + callbackName;
-		}
-
-		// Use data converter to retrieve json after script execution
-		s.converters["script json"] = function() {
-			if ( !responseContainer ) {
-				jQuery.error( callbackName + " was not called" );
-			}
-			return responseContainer[ 0 ];
-		};
-
-		// force json dataType
-		s.dataTypes[ 0 ] = "json";
-
-		// Install callback
-		overwritten = window[ callbackName ];
-		window[ callbackName ] = function() {
-			responseContainer = arguments;
-		};
-
-		// Clean-up function (fires after converters)
-		jqXHR.always(function() {
-			// Restore preexisting value
-			window[ callbackName ] = overwritten;
-
-			// Save back as free
-			if ( s[ callbackName ] ) {
-				// make sure that re-using the options doesn't screw things around
-				s.jsonpCallback = originalSettings.jsonpCallback;
-
-				// save the callback name for future use
-				oldCallbacks.push( callbackName );
-			}
-
-			// Call if it was a function and we have a response
-			if ( responseContainer && jQuery.isFunction( overwritten ) ) {
-				overwritten( responseContainer[ 0 ] );
-			}
-
-			responseContainer = overwritten = undefined;
-		});
-
-		// Delegate to script
-		return "script";
-	}
-});
-
-
-
-
-// data: string of html
-// context (optional): If specified, the fragment will be created in this context, defaults to document
-// keepScripts (optional): If true, will include scripts passed in the html string
-jQuery.parseHTML = function( data, context, keepScripts ) {
-	if ( !data || typeof data !== "string" ) {
-		return null;
-	}
-	if ( typeof context === "boolean" ) {
-		keepScripts = context;
-		context = false;
-	}
-	context = context || document;
-
-	var parsed = rsingleTag.exec( data ),
-		scripts = !keepScripts && [];
-
-	// Single tag
-	if ( parsed ) {
-		return [ context.createElement( parsed[1] ) ];
-	}
-
-	parsed = jQuery.buildFragment( [ data ], context, scripts );
-
-	if ( scripts && scripts.length ) {
-		jQuery( scripts ).remove();
-	}
-
-	return jQuery.merge( [], parsed.childNodes );
-};
-
-
-// Keep a copy of the old load method
-var _load = jQuery.fn.load;
-
-/**
- * Load a url into a page
- */
-jQuery.fn.load = function( url, params, callback ) {
-	if ( typeof url !== "string" && _load ) {
-		return _load.apply( this, arguments );
-	}
-
-	var selector, response, type,
-		self = this,
-		off = url.indexOf(" ");
-
-	if ( off >= 0 ) {
-		selector = jQuery.trim( url.slice( off, url.length ) );
-		url = url.slice( 0, off );
-	}
-
-	// If it's a function
-	if ( jQuery.isFunction( params ) ) {
-
-		// We assume that it's the callback
-		callback = params;
-		params = undefined;
-
-	// Otherwise, build a param string
-	} else if ( params && typeof params === "object" ) {
-		type = "POST";
-	}
-
-	// If we have elements to modify, make the request
-	if ( self.length > 0 ) {
-		jQuery.ajax({
-			url: url,
-
-			// if "type" variable is undefined, then "GET" method will be used
-			type: type,
-			dataType: "html",
-			data: params
-		}).done(function( responseText ) {
-
-			// Save response for use in complete callback
-			response = arguments;
-
-			self.html( selector ?
-
-				// If a selector was specified, locate the right elements in a dummy div
-				// Exclude scripts to avoid IE 'Permission Denied' errors
-				jQuery("<div>").append( jQuery.parseHTML( responseText ) ).find( selector ) :
-
-				// Otherwise use the full result
-				responseText );
-
-		}).complete( callback && function( jqXHR, status ) {
-			self.each( callback, response || [ jqXHR.responseText, status, jqXHR ] );
-		});
-	}
-
-	return this;
-};
-
-
-
-
-// Attach a bunch of functions for handling common AJAX events
-jQuery.each( [ "ajaxStart", "ajaxStop", "ajaxComplete", "ajaxError", "ajaxSuccess", "ajaxSend" ], function( i, type ) {
-	jQuery.fn[ type ] = function( fn ) {
-		return this.on( type, fn );
-	};
-});
-
-
-
-
-jQuery.expr.filters.animated = function( elem ) {
-	return jQuery.grep(jQuery.timers, function( fn ) {
-		return elem === fn.elem;
-	}).length;
-};
-
-
-
-
-
-var docElem = window.document.documentElement;
-
-/**
- * Gets a window from an element
- */
-function getWindow( elem ) {
-	return jQuery.isWindow( elem ) ?
-		elem :
-		elem.nodeType === 9 ?
-			elem.defaultView || elem.parentWindow :
-			false;
-}
-
-jQuery.offset = {
-	setOffset: function( elem, options, i ) {
-		var curPosition, curLeft, curCSSTop, curTop, curOffset, curCSSLeft, calculatePosition,
-			position = jQuery.css( elem, "position" ),
-			curElem = jQuery( elem ),
-			props = {};
-
-		// set position first, in-case top/left are set even on static elem
-		if ( position === "static" ) {
-			elem.style.position = "relative";
-		}
-
-		curOffset = curElem.offset();
-		curCSSTop = jQuery.css( elem, "top" );
-		curCSSLeft = jQuery.css( elem, "left" );
-		calculatePosition = ( position === "absolute" || position === "fixed" ) &&
-			jQuery.inArray("auto", [ curCSSTop, curCSSLeft ] ) > -1;
-
-		// need to be able to calculate position if either top or left is auto and position is either absolute or fixed
-		if ( calculatePosition ) {
-			curPosition = curElem.position();
-			curTop = curPosition.top;
-			curLeft = curPosition.left;
-		} else {
-			curTop = parseFloat( curCSSTop ) || 0;
-			curLeft = parseFloat( curCSSLeft ) || 0;
-		}
-
-		if ( jQuery.isFunction( options ) ) {
-			options = options.call( elem, i, curOffset );
-		}
-
-		if ( options.top != null ) {
-			props.top = ( options.top - curOffset.top ) + curTop;
-		}
-		if ( options.left != null ) {
-			props.left = ( options.left - curOffset.left ) + curLeft;
-		}
-
-		if ( "using" in options ) {
-			options.using.call( elem, props );
-		} else {
-			curElem.css( props );
-		}
-	}
-};
-
-jQuery.fn.extend({
-	offset: function( options ) {
-		if ( arguments.length ) {
-			return options === undefined ?
-				this :
-				this.each(function( i ) {
-					jQuery.offset.setOffset( this, options, i );
-				});
-		}
-
-		var docElem, win,
-			box = { top: 0, left: 0 },
-			elem = this[ 0 ],
-			doc = elem && elem.ownerDocument;
-
-		if ( !doc ) {
-			return;
-		}
-
-		docElem = doc.documentElement;
-
-		// Make sure it's not a disconnected DOM node
-		if ( !jQuery.contains( docElem, elem ) ) {
-			return box;
-		}
-
-		// If we don't have gBCR, just use 0,0 rather than error
-		// BlackBerry 5, iOS 3 (original iPhone)
-		if ( typeof elem.getBoundingClientRect !== strundefined ) {
-			box = elem.getBoundingClientRect();
-		}
-		win = getWindow( doc );
-		return {
-			top: box.top  + ( win.pageYOffset || docElem.scrollTop )  - ( docElem.clientTop  || 0 ),
-			left: box.left + ( win.pageXOffset || docElem.scrollLeft ) - ( docElem.clientLeft || 0 )
-		};
-	},
-
-	position: function() {
-		if ( !this[ 0 ] ) {
-			return;
-		}
-
-		var offsetParent, offset,
-			parentOffset = { top: 0, left: 0 },
-			elem = this[ 0 ];
-
-		// fixed elements are offset from window (parentOffset = {top:0, left: 0}, because it is its only offset parent
-		if ( jQuery.css( elem, "position" ) === "fixed" ) {
-			// we assume that getBoundingClientRect is available when computed position is fixed
-			offset = elem.getBoundingClientRect();
-		} else {
-			// Get *real* offsetParent
-			offsetParent = this.offsetParent();
-
-			// Get correct offsets
-			offset = this.offset();
-			if ( !jQuery.nodeName( offsetParent[ 0 ], "html" ) ) {
-				parentOffset = offsetParent.offset();
-			}
-
-			// Add offsetParent borders
-			parentOffset.top  += jQuery.css( offsetParent[ 0 ], "borderTopWidth", true );
-			parentOffset.left += jQuery.css( offsetParent[ 0 ], "borderLeftWidth", true );
-		}
-
-		// Subtract parent offsets and element margins
-		// note: when an element has margin: auto the offsetLeft and marginLeft
-		// are the same in Safari causing offset.left to incorrectly be 0
-		return {
-			top:  offset.top  - parentOffset.top - jQuery.css( elem, "marginTop", true ),
-			left: offset.left - parentOffset.left - jQuery.css( elem, "marginLeft", true)
-		};
-	},
-
-	offsetParent: function() {
-		return this.map(function() {
-			var offsetParent = this.offsetParent || docElem;
-
-			while ( offsetParent && ( !jQuery.nodeName( offsetParent, "html" ) && jQuery.css( offsetParent, "position" ) === "static" ) ) {
-				offsetParent = offsetParent.offsetParent;
-			}
-			return offsetParent || docElem;
-		});
-	}
-});
-
-// Create scrollLeft and scrollTop methods
-jQuery.each( { scrollLeft: "pageXOffset", scrollTop: "pageYOffset" }, function( method, prop ) {
-	var top = /Y/.test( prop );
-
-	jQuery.fn[ method ] = function( val ) {
-		return access( this, function( elem, method, val ) {
-			var win = getWindow( elem );
-
-			if ( val === undefined ) {
-				return win ? (prop in win) ? win[ prop ] :
-					win.document.documentElement[ method ] :
-					elem[ method ];
-			}
-
-			if ( win ) {
-				win.scrollTo(
-					!top ? val : jQuery( win ).scrollLeft(),
-					top ? val : jQuery( win ).scrollTop()
-				);
-
-			} else {
-				elem[ method ] = val;
-			}
-		}, method, val, arguments.length, null );
-	};
-});
-
-// Add the top/left cssHooks using jQuery.fn.position
-// Webkit bug: https://bugs.webkit.org/show_bug.cgi?id=29084
-// getComputedStyle returns percent when specified for top/left/bottom/right
-// rather than make the css module depend on the offset module, we just check for it here
-jQuery.each( [ "top", "left" ], function( i, prop ) {
-	jQuery.cssHooks[ prop ] = addGetHookIf( support.pixelPosition,
-		function( elem, computed ) {
-			if ( computed ) {
-				computed = curCSS( elem, prop );
-				// if curCSS returns percentage, fallback to offset
-				return rnumnonpx.test( computed ) ?
-					jQuery( elem ).position()[ prop ] + "px" :
-					computed;
-			}
-		}
-	);
-});
-
-
-// Create innerHeight, innerWidth, height, width, outerHeight and outerWidth methods
-jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
-	jQuery.each( { padding: "inner" + name, content: type, "": "outer" + name }, function( defaultExtra, funcName ) {
-		// margin is only for outerHeight, outerWidth
-		jQuery.fn[ funcName ] = function( margin, value ) {
-			var chainable = arguments.length && ( defaultExtra || typeof margin !== "boolean" ),
-				extra = defaultExtra || ( margin === true || value === true ? "margin" : "border" );
-
-			return access( this, function( elem, type, value ) {
-				var doc;
-
-				if ( jQuery.isWindow( elem ) ) {
-					// As of 5/8/2012 this will yield incorrect results for Mobile Safari, but there
-					// isn't a whole lot we can do. See pull request at this URL for discussion:
-					// https://github.com/jquery/jquery/pull/764
-					return elem.document.documentElement[ "client" + name ];
-				}
-
-				// Get document width or height
-				if ( elem.nodeType === 9 ) {
-					doc = elem.documentElement;
-
-					// Either scroll[Width/Height] or offset[Width/Height] or client[Width/Height], whichever is greatest
-					// unfortunately, this causes bug #3838 in IE6/8 only, but there is currently no good, small way to fix it.
-					return Math.max(
-						elem.body[ "scroll" + name ], doc[ "scroll" + name ],
-						elem.body[ "offset" + name ], doc[ "offset" + name ],
-						doc[ "client" + name ]
-					);
-				}
-
-				return value === undefined ?
-					// Get width or height on the element, requesting but not forcing parseFloat
-					jQuery.css( elem, type, extra ) :
-
-					// Set width or height on the element
-					jQuery.style( elem, type, value, extra );
-			}, type, chainable ? margin : undefined, chainable, null );
-		};
-	});
-});
-
-
-// The number of elements contained in the matched element set
-jQuery.fn.size = function() {
-	return this.length;
-};
-
-jQuery.fn.andSelf = jQuery.fn.addBack;
-
-
-
-
-// Register as a named AMD module, since jQuery can be concatenated with other
-// files that may use define, but not via a proper concatenation script that
-// understands anonymous AMD modules. A named AMD is safest and most robust
-// way to register. Lowercase jquery is used because AMD module names are
-// derived from file names, and jQuery is normally delivered in a lowercase
-// file name. Do this after creating the global so that if an AMD module wants
-// to call noConflict to hide this version of jQuery, it will work.
-
-// Note that for maximum portability, libraries that are not jQuery should
-// declare themselves as anonymous modules, and avoid setting a global if an
-// AMD loader is present. jQuery is a special case. For more information, see
-// https://github.com/jrburke/requirejs/wiki/Updating-existing-libraries#wiki-anon
-
-if ( typeof define === "function" && define.amd ) {
-	define( "jquery", [], function() {
-		return jQuery;
-	});
-}
-
-
-
-
-var
-	// Map over jQuery in case of overwrite
-	_jQuery = window.jQuery,
-
-	// Map over the $ in case of overwrite
-	_$ = window.$;
-
-jQuery.noConflict = function( deep ) {
-	if ( window.$ === jQuery ) {
-		window.$ = _$;
-	}
-
-	if ( deep && window.jQuery === jQuery ) {
-		window.jQuery = _jQuery;
-	}
-
-	return jQuery;
-};
-
-// Expose jQuery and $ identifiers, even in
-// AMD (#7102#comment:10, https://github.com/jquery/jquery/pull/557)
-// and CommonJS for browser emulators (#13566)
-if ( typeof noGlobal === strundefined ) {
-	window.jQuery = window.$ = jQuery;
-}
-
-
-
-
-return jQuery;
-
-}));
diff --git a/#pma/doc/html/_static/minus.png b/#pma/doc/html/_static/minus.png
deleted file mode 100644
index 0f22b16b..00000000
Binary files a/#pma/doc/html/_static/minus.png and /dev/null differ
diff --git a/#pma/doc/html/_static/plus.png b/#pma/doc/html/_static/plus.png
deleted file mode 100644
index 0cfe084c..00000000
Binary files a/#pma/doc/html/_static/plus.png and /dev/null differ
diff --git a/#pma/doc/html/_static/pygments.css b/#pma/doc/html/_static/pygments.css
deleted file mode 100644
index 57eadc03..00000000
--- a/#pma/doc/html/_static/pygments.css
+++ /dev/null
@@ -1,63 +0,0 @@
-.highlight .hll { background-color: #ffffcc }
-.highlight  { background: #eeffcc; }
-.highlight .c { color: #408090; font-style: italic } /* Comment */
-.highlight .err { border: 1px solid #FF0000 } /* Error */
-.highlight .k { color: #007020; font-weight: bold } /* Keyword */
-.highlight .o { color: #666666 } /* Operator */
-.highlight .cm { color: #408090; font-style: italic } /* Comment.Multiline */
-.highlight .cp { color: #007020 } /* Comment.Preproc */
-.highlight .c1 { color: #408090; font-style: italic } /* Comment.Single */
-.highlight .cs { color: #408090; background-color: #fff0f0 } /* Comment.Special */
-.highlight .gd { color: #A00000 } /* Generic.Deleted */
-.highlight .ge { font-style: italic } /* Generic.Emph */
-.highlight .gr { color: #FF0000 } /* Generic.Error */
-.highlight .gh { color: #000080; font-weight: bold } /* Generic.Heading */
-.highlight .gi { color: #00A000 } /* Generic.Inserted */
-.highlight .go { color: #333333 } /* Generic.Output */
-.highlight .gp { color: #c65d09; font-weight: bold } /* Generic.Prompt */
-.highlight .gs { font-weight: bold } /* Generic.Strong */
-.highlight .gu { color: #800080; font-weight: bold } /* Generic.Subheading */
-.highlight .gt { color: #0044DD } /* Generic.Traceback */
-.highlight .kc { color: #007020; font-weight: bold } /* Keyword.Constant */
-.highlight .kd { color: #007020; font-weight: bold } /* Keyword.Declaration */
-.highlight .kn { color: #007020; font-weight: bold } /* Keyword.Namespace */
-.highlight .kp { color: #007020 } /* Keyword.Pseudo */
-.highlight .kr { color: #007020; font-weight: bold } /* Keyword.Reserved */
-.highlight .kt { color: #902000 } /* Keyword.Type */
-.highlight .m { color: #208050 } /* Literal.Number */
-.highlight .s { color: #4070a0 } /* Literal.String */
-.highlight .na { color: #4070a0 } /* Name.Attribute */
-.highlight .nb { color: #007020 } /* Name.Builtin */
-.highlight .nc { color: #0e84b5; font-weight: bold } /* Name.Class */
-.highlight .no { color: #60add5 } /* Name.Constant */
-.highlight .nd { color: #555555; font-weight: bold } /* Name.Decorator */
-.highlight .ni { color: #d55537; font-weight: bold } /* Name.Entity */
-.highlight .ne { color: #007020 } /* Name.Exception */
-.highlight .nf { color: #06287e } /* Name.Function */
-.highlight .nl { color: #002070; font-weight: bold } /* Name.Label */
-.highlight .nn { color: #0e84b5; font-weight: bold } /* Name.Namespace */
-.highlight .nt { color: #062873; font-weight: bold } /* Name.Tag */
-.highlight .nv { color: #bb60d5 } /* Name.Variable */
-.highlight .ow { color: #007020; font-weight: bold } /* Operator.Word */
-.highlight .w { color: #bbbbbb } /* Text.Whitespace */
-.highlight .mb { color: #208050 } /* Literal.Number.Bin */
-.highlight .mf { color: #208050 } /* Literal.Number.Float */
-.highlight .mh { color: #208050 } /* Literal.Number.Hex */
-.highlight .mi { color: #208050 } /* Literal.Number.Integer */
-.highlight .mo { color: #208050 } /* Literal.Number.Oct */
-.highlight .sb { color: #4070a0 } /* Literal.String.Backtick */
-.highlight .sc { color: #4070a0 } /* Literal.String.Char */
-.highlight .sd { color: #4070a0; font-style: italic } /* Literal.String.Doc */
-.highlight .s2 { color: #4070a0 } /* Literal.String.Double */
-.highlight .se { color: #4070a0; font-weight: bold } /* Literal.String.Escape */
-.highlight .sh { color: #4070a0 } /* Literal.String.Heredoc */
-.highlight .si { color: #70a0d0; font-style: italic } /* Literal.String.Interpol */
-.highlight .sx { color: #c65d09 } /* Literal.String.Other */
-.highlight .sr { color: #235388 } /* Literal.String.Regex */
-.highlight .s1 { color: #4070a0 } /* Literal.String.Single */
-.highlight .ss { color: #517918 } /* Literal.String.Symbol */
-.highlight .bp { color: #007020 } /* Name.Builtin.Pseudo */
-.highlight .vc { color: #bb60d5 } /* Name.Variable.Class */
-.highlight .vg { color: #bb60d5 } /* Name.Variable.Global */
-.highlight .vi { color: #bb60d5 } /* Name.Variable.Instance */
-.highlight .il { color: #208050 } /* Literal.Number.Integer.Long */
\ No newline at end of file
diff --git a/#pma/doc/html/_static/searchtools.js b/#pma/doc/html/_static/searchtools.js
deleted file mode 100644
index 066857ce..00000000
--- a/#pma/doc/html/_static/searchtools.js
+++ /dev/null
@@ -1,651 +0,0 @@
-/*
- * searchtools.js_t
- * ~~~~~~~~~~~~~~~~
- *
- * Sphinx JavaScript utilities for the full-text search.
- *
- * :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
- * :license: BSD, see LICENSE for details.
- *
- */
-
-
-/* Non-minified version JS is _stemmer.js if file is provided */ 
-/**
- * Porter Stemmer
- */
-var Stemmer = function() {
-
-  var step2list = {
-    ational: 'ate',
-    tional: 'tion',
-    enci: 'ence',
-    anci: 'ance',
-    izer: 'ize',
-    bli: 'ble',
-    alli: 'al',
-    entli: 'ent',
-    eli: 'e',
-    ousli: 'ous',
-    ization: 'ize',
-    ation: 'ate',
-    ator: 'ate',
-    alism: 'al',
-    iveness: 'ive',
-    fulness: 'ful',
-    ousness: 'ous',
-    aliti: 'al',
-    iviti: 'ive',
-    biliti: 'ble',
-    logi: 'log'
-  };
-
-  var step3list = {
-    icate: 'ic',
-    ative: '',
-    alize: 'al',
-    iciti: 'ic',
-    ical: 'ic',
-    ful: '',
-    ness: ''
-  };
-
-  var c = "[^aeiou]";          // consonant
-  var v = "[aeiouy]";          // vowel
-  var C = c + "[^aeiouy]*";    // consonant sequence
-  var V = v + "[aeiou]*";      // vowel sequence
-
-  var mgr0 = "^(" + C + ")?" + V + C;                      // [C]VC... is m>0
-  var meq1 = "^(" + C + ")?" + V + C + "(" + V + ")?$";    // [C]VC[V] is m=1
-  var mgr1 = "^(" + C + ")?" + V + C + V + C;              // [C]VCVC... is m>1
-  var s_v   = "^(" + C + ")?" + v;                         // vowel in stem
-
-  this.stemWord = function (w) {
-    var stem;
-    var suffix;
-    var firstch;
-    var origword = w;
-
-    if (w.length < 3)
-      return w;
-
-    var re;
-    var re2;
-    var re3;
-    var re4;
-
-    firstch = w.substr(0,1);
-    if (firstch == "y")
-      w = firstch.toUpperCase() + w.substr(1);
-
-    // Step 1a
-    re = /^(.+?)(ss|i)es$/;
-    re2 = /^(.+?)([^s])s$/;
-
-    if (re.test(w))
-      w = w.replace(re,"$1$2");
-    else if (re2.test(w))
-      w = w.replace(re2,"$1$2");
-
-    // Step 1b
-    re = /^(.+?)eed$/;
-    re2 = /^(.+?)(ed|ing)$/;
-    if (re.test(w)) {
-      var fp = re.exec(w);
-      re = new RegExp(mgr0);
-      if (re.test(fp[1])) {
-        re = /.$/;
-        w = w.replace(re,"");
-      }
-    }
-    else if (re2.test(w)) {
-      var fp = re2.exec(w);
-      stem = fp[1];
-      re2 = new RegExp(s_v);
-      if (re2.test(stem)) {
-        w = stem;
-        re2 = /(at|bl|iz)$/;
-        re3 = new RegExp("([^aeiouylsz])\\1$");
-        re4 = new RegExp("^" + C + v + "[^aeiouwxy]$");
-        if (re2.test(w))
-          w = w + "e";
-        else if (re3.test(w)) {
-          re = /.$/;
-          w = w.replace(re,"");
-        }
-        else if (re4.test(w))
-          w = w + "e";
-      }
-    }
-
-    // Step 1c
-    re = /^(.+?)y$/;
-    if (re.test(w)) {
-      var fp = re.exec(w);
-      stem = fp[1];
-      re = new RegExp(s_v);
-      if (re.test(stem))
-        w = stem + "i";
-    }
-
-    // Step 2
-    re = /^(.+?)(ational|tional|enci|anci|izer|bli|alli|entli|eli|ousli|ization|ation|ator|alism|iveness|fulness|ousness|aliti|iviti|biliti|logi)$/;
-    if (re.test(w)) {
-      var fp = re.exec(w);
-      stem = fp[1];
-      suffix = fp[2];
-      re = new RegExp(mgr0);
-      if (re.test(stem))
-        w = stem + step2list[suffix];
-    }
-
-    // Step 3
-    re = /^(.+?)(icate|ative|alize|iciti|ical|ful|ness)$/;
-    if (re.test(w)) {
-      var fp = re.exec(w);
-      stem = fp[1];
-      suffix = fp[2];
-      re = new RegExp(mgr0);
-      if (re.test(stem))
-        w = stem + step3list[suffix];
-    }
-
-    // Step 4
-    re = /^(.+?)(al|ance|ence|er|ic|able|ible|ant|ement|ment|ent|ou|ism|ate|iti|ous|ive|ize)$/;
-    re2 = /^(.+?)(s|t)(ion)$/;
-    if (re.test(w)) {
-      var fp = re.exec(w);
-      stem = fp[1];
-      re = new RegExp(mgr1);
-      if (re.test(stem))
-        w = stem;
-    }
-    else if (re2.test(w)) {
-      var fp = re2.exec(w);
-      stem = fp[1] + fp[2];
-      re2 = new RegExp(mgr1);
-      if (re2.test(stem))
-        w = stem;
-    }
-
-    // Step 5
-    re = /^(.+?)e$/;
-    if (re.test(w)) {
-      var fp = re.exec(w);
-      stem = fp[1];
-      re = new RegExp(mgr1);
-      re2 = new RegExp(meq1);
-      re3 = new RegExp("^" + C + v + "[^aeiouwxy]$");
-      if (re.test(stem) || (re2.test(stem) && !(re3.test(stem))))
-        w = stem;
-    }
-    re = /ll$/;
-    re2 = new RegExp(mgr1);
-    if (re.test(w) && re2.test(w)) {
-      re = /.$/;
-      w = w.replace(re,"");
-    }
-
-    // and turn initial Y back to y
-    if (firstch == "y")
-      w = firstch.toLowerCase() + w.substr(1);
-    return w;
-  }
-}
-
-
-
-/**
- * Simple result scoring code.
- */
-var Scorer = {
-  // Implement the following function to further tweak the score for each result
-  // The function takes a result array [filename, title, anchor, descr, score]
-  // and returns the new score.
-  /*
-  score: function(result) {
-    return result[4];
-  },
-  */
-
-  // query matches the full name of an object
-  objNameMatch: 11,
-  // or matches in the last dotted part of the object name
-  objPartialMatch: 6,
-  // Additive scores depending on the priority of the object
-  objPrio: {0:  15,   // used to be importantResults
-            1:  5,   // used to be objectResults
-            2: -5},  // used to be unimportantResults
-  //  Used when the priority is not in the mapping.
-  objPrioDefault: 0,
-
-  // query found in title
-  title: 15,
-  // query found in terms
-  term: 5
-};
-
-
-/**
- * Search Module
- */
-var Search = {
-
-  _index : null,
-  _queued_query : null,
-  _pulse_status : -1,
-
-  init : function() {
-      var params = $.getQueryParameters();
-      if (params.q) {
-          var query = params.q[0];
-          $('input[name="q"]')[0].value = query;
-          this.performSearch(query);
-      }
-  },
-
-  loadIndex : function(url) {
-    $.ajax({type: "GET", url: url, data: null,
-            dataType: "script", cache: true,
-            complete: function(jqxhr, textstatus) {
-              if (textstatus != "success") {
-                document.getElementById("searchindexloader").src = url;
-              }
-            }});
-  },
-
-  setIndex : function(index) {
-    var q;
-    this._index = index;
-    if ((q = this._queued_query) !== null) {
-      this._queued_query = null;
-      Search.query(q);
-    }
-  },
-
-  hasIndex : function() {
-      return this._index !== null;
-  },
-
-  deferQuery : function(query) {
-      this._queued_query = query;
-  },
-
-  stopPulse : function() {
-      this._pulse_status = 0;
-  },
-
-  startPulse : function() {
-    if (this._pulse_status >= 0)
-        return;
-    function pulse() {
-      var i;
-      Search._pulse_status = (Search._pulse_status + 1) % 4;
-      var dotString = '';
-      for (i = 0; i < Search._pulse_status; i++)
-        dotString += '.';
-      Search.dots.text(dotString);
-      if (Search._pulse_status > -1)
-        window.setTimeout(pulse, 500);
-    }
-    pulse();
-  },
-
-  /**
-   * perform a search for something (or wait until index is loaded)
-   */
-  performSearch : function(query) {
-    // create the required interface elements
-    this.out = $('#search-results');
-    this.title = $('<h2>' + _('Searching') + '</h2>').appendTo(this.out);
-    this.dots = $('<span></span>').appendTo(this.title);
-    this.status = $('<p style="display: none"></p>').appendTo(this.out);
-    this.output = $('<ul class="search"/>').appendTo(this.out);
-
-    $('#search-progress').text(_('Preparing search...'));
-    this.startPulse();
-
-    // index already loaded, the browser was quick!
-    if (this.hasIndex())
-      this.query(query);
-    else
-      this.deferQuery(query);
-  },
-
-  /**
-   * execute search (requires search index to be loaded)
-   */
-  query : function(query) {
-    var i;
-    var stopwords = ["a","and","are","as","at","be","but","by","for","if","in","into","is","it","near","no","not","of","on","or","such","that","the","their","then","there","these","they","this","to","was","will","with"];
-
-    // stem the searchterms and add them to the correct list
-    var stemmer = new Stemmer();
-    var searchterms = [];
-    var excluded = [];
-    var hlterms = [];
-    var tmp = query.split(/\s+/);
-    var objectterms = [];
-    for (i = 0; i < tmp.length; i++) {
-      if (tmp[i] !== "") {
-          objectterms.push(tmp[i].toLowerCase());
-      }
-
-      if ($u.indexOf(stopwords, tmp[i].toLowerCase()) != -1 || tmp[i].match(/^\d+$/) ||
-          tmp[i] === "") {
-        // skip this "word"
-        continue;
-      }
-      // stem the word
-      var word = stemmer.stemWord(tmp[i].toLowerCase());
-      var toAppend;
-      // select the correct list
-      if (word[0] == '-') {
-        toAppend = excluded;
-        word = word.substr(1);
-      }
-      else {
-        toAppend = searchterms;
-        hlterms.push(tmp[i].toLowerCase());
-      }
-      // only add if not already in the list
-      if (!$u.contains(toAppend, word))
-        toAppend.push(word);
-    }
-    var highlightstring = '?highlight=' + $.urlencode(hlterms.join(" "));
-
-    // console.debug('SEARCH: searching for:');
-    // console.info('required: ', searchterms);
-    // console.info('excluded: ', excluded);
-
-    // prepare search
-    var terms = this._index.terms;
-    var titleterms = this._index.titleterms;
-
-    // array of [filename, title, anchor, descr, score]
-    var results = [];
-    $('#search-progress').empty();
-
-    // lookup as object
-    for (i = 0; i < objectterms.length; i++) {
-      var others = [].concat(objectterms.slice(0, i),
-                             objectterms.slice(i+1, objectterms.length));
-      results = results.concat(this.performObjectSearch(objectterms[i], others));
-    }
-
-    // lookup as search terms in fulltext
-    results = results.concat(this.performTermsSearch(searchterms, excluded, terms, titleterms));
-
-    // let the scorer override scores with a custom scoring function
-    if (Scorer.score) {
-      for (i = 0; i < results.length; i++)
-        results[i][4] = Scorer.score(results[i]);
-    }
-
-    // now sort the results by score (in opposite order of appearance, since the
-    // display function below uses pop() to retrieve items) and then
-    // alphabetically
-    results.sort(function(a, b) {
-      var left = a[4];
-      var right = b[4];
-      if (left > right) {
-        return 1;
-      } else if (left < right) {
-        return -1;
-      } else {
-        // same score: sort alphabetically
-        left = a[1].toLowerCase();
-        right = b[1].toLowerCase();
-        return (left > right) ? -1 : ((left < right) ? 1 : 0);
-      }
-    });
-
-    // for debugging
-    //Search.lastresults = results.slice();  // a copy
-    //console.info('search results:', Search.lastresults);
-
-    // print the results
-    var resultCount = results.length;
-    function displayNextItem() {
-      // results left, load the summary and display it
-      if (results.length) {
-        var item = results.pop();
-        var listItem = $('<li style="display:none"></li>');
-        if (DOCUMENTATION_OPTIONS.FILE_SUFFIX === '') {
-          // dirhtml builder
-          var dirname = item[0] + '/';
-          if (dirname.match(/\/index\/$/)) {
-            dirname = dirname.substring(0, dirname.length-6);
-          } else if (dirname == 'index/') {
-            dirname = '';
-          }
-          listItem.append($('<a/>').attr('href',
-            DOCUMENTATION_OPTIONS.URL_ROOT + dirname +
-            highlightstring + item[2]).html(item[1]));
-        } else {
-          // normal html builders
-          listItem.append($('<a/>').attr('href',
-            item[0] + DOCUMENTATION_OPTIONS.FILE_SUFFIX +
-            highlightstring + item[2]).html(item[1]));
-        }
-        if (item[3]) {
-          listItem.append($('<span> (' + item[3] + ')</span>'));
-          Search.output.append(listItem);
-          listItem.slideDown(5, function() {
-            displayNextItem();
-          });
-        } else if (DOCUMENTATION_OPTIONS.HAS_SOURCE) {
-          $.ajax({url: DOCUMENTATION_OPTIONS.URL_ROOT + '_sources/' + item[0] + '.txt',
-                  dataType: "text",
-                  complete: function(jqxhr, textstatus) {
-                    var data = jqxhr.responseText;
-                    if (data !== '' && data !== undefined) {
-                      listItem.append(Search.makeSearchSummary(data, searchterms, hlterms));
-                    }
-                    Search.output.append(listItem);
-                    listItem.slideDown(5, function() {
-                      displayNextItem();
-                    });
-                  }});
-        } else {
-          // no source available, just display title
-          Search.output.append(listItem);
-          listItem.slideDown(5, function() {
-            displayNextItem();
-          });
-        }
-      }
-      // search finished, update title and status message
-      else {
-        Search.stopPulse();
-        Search.title.text(_('Search Results'));
-        if (!resultCount)
-          Search.status.text(_('Your search did not match any documents. Please make sure that all words are spelled correctly and that you\'ve selected enough categories.'));
-        else
-            Search.status.text(_('Search finished, found %s page(s) matching the search query.').replace('%s', resultCount));
-        Search.status.fadeIn(500);
-      }
-    }
-    displayNextItem();
-  },
-
-  /**
-   * search for object names
-   */
-  performObjectSearch : function(object, otherterms) {
-    var filenames = this._index.filenames;
-    var objects = this._index.objects;
-    var objnames = this._index.objnames;
-    var titles = this._index.titles;
-
-    var i;
-    var results = [];
-
-    for (var prefix in objects) {
-      for (var name in objects[prefix]) {
-        var fullname = (prefix ? prefix + '.' : '') + name;
-        if (fullname.toLowerCase().indexOf(object) > -1) {
-          var score = 0;
-          var parts = fullname.split('.');
-          // check for different match types: exact matches of full name or
-          // "last name" (i.e. last dotted part)
-          if (fullname == object || parts[parts.length - 1] == object) {
-            score += Scorer.objNameMatch;
-          // matches in last name
-          } else if (parts[parts.length - 1].indexOf(object) > -1) {
-            score += Scorer.objPartialMatch;
-          }
-          var match = objects[prefix][name];
-          var objname = objnames[match[1]][2];
-          var title = titles[match[0]];
-          // If more than one term searched for, we require other words to be
-          // found in the name/title/description
-          if (otherterms.length > 0) {
-            var haystack = (prefix + ' ' + name + ' ' +
-                            objname + ' ' + title).toLowerCase();
-            var allfound = true;
-            for (i = 0; i < otherterms.length; i++) {
-              if (haystack.indexOf(otherterms[i]) == -1) {
-                allfound = false;
-                break;
-              }
-            }
-            if (!allfound) {
-              continue;
-            }
-          }
-          var descr = objname + _(', in ') + title;
-
-          var anchor = match[3];
-          if (anchor === '')
-            anchor = fullname;
-          else if (anchor == '-')
-            anchor = objnames[match[1]][1] + '-' + fullname;
-          // add custom score for some objects according to scorer
-          if (Scorer.objPrio.hasOwnProperty(match[2])) {
-            score += Scorer.objPrio[match[2]];
-          } else {
-            score += Scorer.objPrioDefault;
-          }
-          results.push([filenames[match[0]], fullname, '#'+anchor, descr, score]);
-        }
-      }
-    }
-
-    return results;
-  },
-
-  /**
-   * search for full-text terms in the index
-   */
-  performTermsSearch : function(searchterms, excluded, terms, titleterms) {
-    var filenames = this._index.filenames;
-    var titles = this._index.titles;
-
-    var i, j, file;
-    var fileMap = {};
-    var scoreMap = {};
-    var results = [];
-
-    // perform the search on the required terms
-    for (i = 0; i < searchterms.length; i++) {
-      var word = searchterms[i];
-      var files = [];
-      var _o = [
-        {files: terms[word], score: Scorer.term},
-        {files: titleterms[word], score: Scorer.title}
-      ];
-
-      // no match but word was a required one
-      if ($u.every(_o, function(o){return o.files === undefined;})) {
-        break;
-      }
-      // found search word in contents
-      $u.each(_o, function(o) {
-        var _files = o.files;
-        if (_files === undefined)
-          return
-
-        if (_files.length === undefined)
-          _files = [_files];
-        files = files.concat(_files);
-
-        // set score for the word in each file to Scorer.term
-        for (j = 0; j < _files.length; j++) {
-          file = _files[j];
-          if (!(file in scoreMap))
-            scoreMap[file] = {}
-          scoreMap[file][word] = o.score;
-        }
-      });
-
-      // create the mapping
-      for (j = 0; j < files.length; j++) {
-        file = files[j];
-        if (file in fileMap)
-          fileMap[file].push(word);
-        else
-          fileMap[file] = [word];
-      }
-    }
-
-    // now check if the files don't contain excluded terms
-    for (file in fileMap) {
-      var valid = true;
-
-      // check if all requirements are matched
-      if (fileMap[file].length != searchterms.length)
-          continue;
-
-      // ensure that none of the excluded terms is in the search result
-      for (i = 0; i < excluded.length; i++) {
-        if (terms[excluded[i]] == file ||
-            titleterms[excluded[i]] == file ||
-            $u.contains(terms[excluded[i]] || [], file) ||
-            $u.contains(titleterms[excluded[i]] || [], file)) {
-          valid = false;
-          break;
-        }
-      }
-
-      // if we have still a valid result we can add it to the result list
-      if (valid) {
-        // select one (max) score for the file.
-        // for better ranking, we should calculate ranking by using words statistics like basic tf-idf...
-        var score = $u.max($u.map(fileMap[file], function(w){return scoreMap[file][w]}));
-        results.push([filenames[file], titles[file], '', null, score]);
-      }
-    }
-    return results;
-  },
-
-  /**
-   * helper function to return a node containing the
-   * search summary for a given text. keywords is a list
-   * of stemmed words, hlwords is the list of normal, unstemmed
-   * words. the first one is used to find the occurrence, the
-   * latter for highlighting it.
-   */
-  makeSearchSummary : function(text, keywords, hlwords) {
-    var textLower = text.toLowerCase();
-    var start = 0;
-    $.each(keywords, function() {
-      var i = textLower.indexOf(this.toLowerCase());
-      if (i > -1)
-        start = i;
-    });
-    start = Math.max(start - 120, 0);
-    var excerpt = ((start > 0) ? '...' : '') +
-      $.trim(text.substr(start, 240)) +
-      ((start + 240 - text.length) ? '...' : '');
-    var rv = $('<div class="context"></div>').text(excerpt);
-    $.each(hlwords, function() {
-      rv = rv.highlightText(this, 'highlighted');
-    });
-    return rv;
-  }
-};
-
-$(document).ready(function() {
-  Search.init();
-});
\ No newline at end of file
diff --git a/#pma/doc/html/_static/sidebar.js b/#pma/doc/html/_static/sidebar.js
deleted file mode 100644
index 4282fe91..00000000
--- a/#pma/doc/html/_static/sidebar.js
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * sidebar.js
- * ~~~~~~~~~~
- *
- * This script makes the Sphinx sidebar collapsible.
- *
- * .sphinxsidebar contains .sphinxsidebarwrapper.  This script adds
- * in .sphixsidebar, after .sphinxsidebarwrapper, the #sidebarbutton
- * used to collapse and expand the sidebar.
- *
- * When the sidebar is collapsed the .sphinxsidebarwrapper is hidden
- * and the width of the sidebar and the margin-left of the document
- * are decreased. When the sidebar is expanded the opposite happens.
- * This script saves a per-browser/per-session cookie used to
- * remember the position of the sidebar among the pages.
- * Once the browser is closed the cookie is deleted and the position
- * reset to the default (expanded).
- *
- * :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
- * :license: BSD, see LICENSE for details.
- *
- */
-
-$(function() {
-  
-  
-  
-  
-  
-  
-  
-
-  // global elements used by the functions.
-  // the 'sidebarbutton' element is defined as global after its
-  // creation, in the add_sidebar_button function
-  var bodywrapper = $('.bodywrapper');
-  var sidebar = $('.sphinxsidebar');
-  var sidebarwrapper = $('.sphinxsidebarwrapper');
-
-  // for some reason, the document has no sidebar; do not run into errors
-  if (!sidebar.length) return;
-
-  // original margin-left of the bodywrapper and width of the sidebar
-  // with the sidebar expanded
-  var bw_margin_expanded = bodywrapper.css('margin-left');
-  var ssb_width_expanded = sidebar.width();
-
-  // margin-left of the bodywrapper and width of the sidebar
-  // with the sidebar collapsed
-  var bw_margin_collapsed = '.8em';
-  var ssb_width_collapsed = '.8em';
-
-  // colors used by the current theme
-  var dark_color = $('.related').css('background-color');
-  var light_color = $('.document').css('background-color');
-
-  function sidebar_is_collapsed() {
-    return sidebarwrapper.is(':not(:visible)');
-  }
-
-  function toggle_sidebar() {
-    if (sidebar_is_collapsed())
-      expand_sidebar();
-    else
-      collapse_sidebar();
-  }
-
-  function collapse_sidebar() {
-    sidebarwrapper.hide();
-    sidebar.css('width', ssb_width_collapsed);
-    bodywrapper.css('margin-left', bw_margin_collapsed);
-    sidebarbutton.css({
-        'margin-left': '0',
-        'height': bodywrapper.height()
-    });
-    sidebarbutton.find('span').text('»');
-    sidebarbutton.attr('title', _('Expand sidebar'));
-    document.cookie = 'sidebar=collapsed';
-  }
-
-  function expand_sidebar() {
-    bodywrapper.css('margin-left', bw_margin_expanded);
-    sidebar.css('width', ssb_width_expanded);
-    sidebarwrapper.show();
-    sidebarbutton.css({
-        'margin-left': ssb_width_expanded-12,
-        'height': bodywrapper.height()
-    });
-    sidebarbutton.find('span').text('«');
-    sidebarbutton.attr('title', _('Collapse sidebar'));
-    document.cookie = 'sidebar=expanded';
-  }
-
-  function add_sidebar_button() {
-    sidebarwrapper.css({
-        'float': 'left',
-        'margin-right': '0',
-        'width': ssb_width_expanded - 28
-    });
-    // create the button
-    sidebar.append(
-        '<div id="sidebarbutton"><span>&laquo;</span></div>'
-    );
-    var sidebarbutton = $('#sidebarbutton');
-    light_color = sidebarbutton.css('background-color');
-    // find the height of the viewport to center the '<<' in the page
-    var viewport_height;
-    if (window.innerHeight)
- 	  viewport_height = window.innerHeight;
-    else
-	  viewport_height = $(window).height();
-    sidebarbutton.find('span').css({
-        'display': 'block',
-        'margin-top': (viewport_height - sidebar.position().top - 20) / 2
-    });
-
-    sidebarbutton.click(toggle_sidebar);
-    sidebarbutton.attr('title', _('Collapse sidebar'));
-    sidebarbutton.css({
-        'color': '#FFFFFF',
-        'border-left': '1px solid ' + dark_color,
-        'font-size': '1.2em',
-        'cursor': 'pointer',
-        'height': bodywrapper.height(),
-        'padding-top': '1px',
-        'margin-left': ssb_width_expanded - 12
-    });
-
-    sidebarbutton.hover(
-      function () {
-          $(this).css('background-color', dark_color);
-      },
-      function () {
-          $(this).css('background-color', light_color);
-      }
-    );
-  }
-
-  function set_position_from_cookie() {
-    if (!document.cookie)
-      return;
-    var items = document.cookie.split(';');
-    for(var k=0; k<items.length; k++) {
-      var key_val = items[k].split('=');
-      var key = key_val[0].replace(/ /, "");  // strip leading spaces
-      if (key == 'sidebar') {
-        var value = key_val[1];
-        if ((value == 'collapsed') && (!sidebar_is_collapsed()))
-          collapse_sidebar();
-        else if ((value == 'expanded') && (sidebar_is_collapsed()))
-          expand_sidebar();
-      }
-    }
-  }
-
-  add_sidebar_button();
-  var sidebarbutton = $('#sidebarbutton');
-  set_position_from_cookie();
-});
\ No newline at end of file
diff --git a/#pma/doc/html/_static/underscore.js b/#pma/doc/html/_static/underscore.js
deleted file mode 100644
index b4f49a02..00000000
--- a/#pma/doc/html/_static/underscore.js
+++ /dev/null
@@ -1,1415 +0,0 @@
-//     Underscore.js 1.7.0
-//     http://underscorejs.org
-//     (c) 2009-2014 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
-//     Underscore may be freely distributed under the MIT license.
-
-(function() {
-
-  // Baseline setup
-  // --------------
-
-  // Establish the root object, `window` in the browser, or `exports` on the server.
-  var root = this;
-
-  // Save the previous value of the `_` variable.
-  var previousUnderscore = root._;
-
-  // Save bytes in the minified (but not gzipped) version:
-  var ArrayProto = Array.prototype, ObjProto = Object.prototype, FuncProto = Function.prototype;
-
-  // Create quick reference variables for speed access to core prototypes.
-  var
-    push             = ArrayProto.push,
-    slice            = ArrayProto.slice,
-    concat           = ArrayProto.concat,
-    toString         = ObjProto.toString,
-    hasOwnProperty   = ObjProto.hasOwnProperty;
-
-  // All **ECMAScript 5** native function implementations that we hope to use
-  // are declared here.
-  var
-    nativeIsArray      = Array.isArray,
-    nativeKeys         = Object.keys,
-    nativeBind         = FuncProto.bind;
-
-  // Create a safe reference to the Underscore object for use below.
-  var _ = function(obj) {
-    if (obj instanceof _) return obj;
-    if (!(this instanceof _)) return new _(obj);
-    this._wrapped = obj;
-  };
-
-  // Export the Underscore object for **Node.js**, with
-  // backwards-compatibility for the old `require()` API. If we're in
-  // the browser, add `_` as a global object.
-  if (typeof exports !== 'undefined') {
-    if (typeof module !== 'undefined' && module.exports) {
-      exports = module.exports = _;
-    }
-    exports._ = _;
-  } else {
-    root._ = _;
-  }
-
-  // Current version.
-  _.VERSION = '1.7.0';
-
-  // Internal function that returns an efficient (for current engines) version
-  // of the passed-in callback, to be repeatedly applied in other Underscore
-  // functions.
-  var createCallback = function(func, context, argCount) {
-    if (context === void 0) return func;
-    switch (argCount == null ? 3 : argCount) {
-      case 1: return function(value) {
-        return func.call(context, value);
-      };
-      case 2: return function(value, other) {
-        return func.call(context, value, other);
-      };
-      case 3: return function(value, index, collection) {
-        return func.call(context, value, index, collection);
-      };
-      case 4: return function(accumulator, value, index, collection) {
-        return func.call(context, accumulator, value, index, collection);
-      };
-    }
-    return function() {
-      return func.apply(context, arguments);
-    };
-  };
-
-  // A mostly-internal function to generate callbacks that can be applied
-  // to each element in a collection, returning the desired result — either
-  // identity, an arbitrary callback, a property matcher, or a property accessor.
-  _.iteratee = function(value, context, argCount) {
-    if (value == null) return _.identity;
-    if (_.isFunction(value)) return createCallback(value, context, argCount);
-    if (_.isObject(value)) return _.matches(value);
-    return _.property(value);
-  };
-
-  // Collection Functions
-  // --------------------
-
-  // The cornerstone, an `each` implementation, aka `forEach`.
-  // Handles raw objects in addition to array-likes. Treats all
-  // sparse array-likes as if they were dense.
-  _.each = _.forEach = function(obj, iteratee, context) {
-    if (obj == null) return obj;
-    iteratee = createCallback(iteratee, context);
-    var i, length = obj.length;
-    if (length === +length) {
-      for (i = 0; i < length; i++) {
-        iteratee(obj[i], i, obj);
-      }
-    } else {
-      var keys = _.keys(obj);
-      for (i = 0, length = keys.length; i < length; i++) {
-        iteratee(obj[keys[i]], keys[i], obj);
-      }
-    }
-    return obj;
-  };
-
-  // Return the results of applying the iteratee to each element.
-  _.map = _.collect = function(obj, iteratee, context) {
-    if (obj == null) return [];
-    iteratee = _.iteratee(iteratee, context);
-    var keys = obj.length !== +obj.length && _.keys(obj),
-        length = (keys || obj).length,
-        results = Array(length),
-        currentKey;
-    for (var index = 0; index < length; index++) {
-      currentKey = keys ? keys[index] : index;
-      results[index] = iteratee(obj[currentKey], currentKey, obj);
-    }
-    return results;
-  };
-
-  var reduceError = 'Reduce of empty array with no initial value';
-
-  // **Reduce** builds up a single result from a list of values, aka `inject`,
-  // or `foldl`.
-  _.reduce = _.foldl = _.inject = function(obj, iteratee, memo, context) {
-    if (obj == null) obj = [];
-    iteratee = createCallback(iteratee, context, 4);
-    var keys = obj.length !== +obj.length && _.keys(obj),
-        length = (keys || obj).length,
-        index = 0, currentKey;
-    if (arguments.length < 3) {
-      if (!length) throw new TypeError(reduceError);
-      memo = obj[keys ? keys[index++] : index++];
-    }
-    for (; index < length; index++) {
-      currentKey = keys ? keys[index] : index;
-      memo = iteratee(memo, obj[currentKey], currentKey, obj);
-    }
-    return memo;
-  };
-
-  // The right-associative version of reduce, also known as `foldr`.
-  _.reduceRight = _.foldr = function(obj, iteratee, memo, context) {
-    if (obj == null) obj = [];
-    iteratee = createCallback(iteratee, context, 4);
-    var keys = obj.length !== + obj.length && _.keys(obj),
-        index = (keys || obj).length,
-        currentKey;
-    if (arguments.length < 3) {
-      if (!index) throw new TypeError(reduceError);
-      memo = obj[keys ? keys[--index] : --index];
-    }
-    while (index--) {
-      currentKey = keys ? keys[index] : index;
-      memo = iteratee(memo, obj[currentKey], currentKey, obj);
-    }
-    return memo;
-  };
-
-  // Return the first value which passes a truth test. Aliased as `detect`.
-  _.find = _.detect = function(obj, predicate, context) {
-    var result;
-    predicate = _.iteratee(predicate, context);
-    _.some(obj, function(value, index, list) {
-      if (predicate(value, index, list)) {
-        result = value;
-        return true;
-      }
-    });
-    return result;
-  };
-
-  // Return all the elements that pass a truth test.
-  // Aliased as `select`.
-  _.filter = _.select = function(obj, predicate, context) {
-    var results = [];
-    if (obj == null) return results;
-    predicate = _.iteratee(predicate, context);
-    _.each(obj, function(value, index, list) {
-      if (predicate(value, index, list)) results.push(value);
-    });
-    return results;
-  };
-
-  // Return all the elements for which a truth test fails.
-  _.reject = function(obj, predicate, context) {
-    return _.filter(obj, _.negate(_.iteratee(predicate)), context);
-  };
-
-  // Determine whether all of the elements match a truth test.
-  // Aliased as `all`.
-  _.every = _.all = function(obj, predicate, context) {
-    if (obj == null) return true;
-    predicate = _.iteratee(predicate, context);
-    var keys = obj.length !== +obj.length && _.keys(obj),
-        length = (keys || obj).length,
-        index, currentKey;
-    for (index = 0; index < length; index++) {
-      currentKey = keys ? keys[index] : index;
-      if (!predicate(obj[currentKey], currentKey, obj)) return false;
-    }
-    return true;
-  };
-
-  // Determine if at least one element in the object matches a truth test.
-  // Aliased as `any`.
-  _.some = _.any = function(obj, predicate, context) {
-    if (obj == null) return false;
-    predicate = _.iteratee(predicate, context);
-    var keys = obj.length !== +obj.length && _.keys(obj),
-        length = (keys || obj).length,
-        index, currentKey;
-    for (index = 0; index < length; index++) {
-      currentKey = keys ? keys[index] : index;
-      if (predicate(obj[currentKey], currentKey, obj)) return true;
-    }
-    return false;
-  };
-
-  // Determine if the array or object contains a given value (using `===`).
-  // Aliased as `include`.
-  _.contains = _.include = function(obj, target) {
-    if (obj == null) return false;
-    if (obj.length !== +obj.length) obj = _.values(obj);
-    return _.indexOf(obj, target) >= 0;
-  };
-
-  // Invoke a method (with arguments) on every item in a collection.
-  _.invoke = function(obj, method) {
-    var args = slice.call(arguments, 2);
-    var isFunc = _.isFunction(method);
-    return _.map(obj, function(value) {
-      return (isFunc ? method : value[method]).apply(value, args);
-    });
-  };
-
-  // Convenience version of a common use case of `map`: fetching a property.
-  _.pluck = function(obj, key) {
-    return _.map(obj, _.property(key));
-  };
-
-  // Convenience version of a common use case of `filter`: selecting only objects
-  // containing specific `key:value` pairs.
-  _.where = function(obj, attrs) {
-    return _.filter(obj, _.matches(attrs));
-  };
-
-  // Convenience version of a common use case of `find`: getting the first object
-  // containing specific `key:value` pairs.
-  _.findWhere = function(obj, attrs) {
-    return _.find(obj, _.matches(attrs));
-  };
-
-  // Return the maximum element (or element-based computation).
-  _.max = function(obj, iteratee, context) {
-    var result = -Infinity, lastComputed = -Infinity,
-        value, computed;
-    if (iteratee == null && obj != null) {
-      obj = obj.length === +obj.length ? obj : _.values(obj);
-      for (var i = 0, length = obj.length; i < length; i++) {
-        value = obj[i];
-        if (value > result) {
-          result = value;
-        }
-      }
-    } else {
-      iteratee = _.iteratee(iteratee, context);
-      _.each(obj, function(value, index, list) {
-        computed = iteratee(value, index, list);
-        if (computed > lastComputed || computed === -Infinity && result === -Infinity) {
-          result = value;
-          lastComputed = computed;
-        }
-      });
-    }
-    return result;
-  };
-
-  // Return the minimum element (or element-based computation).
-  _.min = function(obj, iteratee, context) {
-    var result = Infinity, lastComputed = Infinity,
-        value, computed;
-    if (iteratee == null && obj != null) {
-      obj = obj.length === +obj.length ? obj : _.values(obj);
-      for (var i = 0, length = obj.length; i < length; i++) {
-        value = obj[i];
-        if (value < result) {
-          result = value;
-        }
-      }
-    } else {
-      iteratee = _.iteratee(iteratee, context);
-      _.each(obj, function(value, index, list) {
-        computed = iteratee(value, index, list);
-        if (computed < lastComputed || computed === Infinity && result === Infinity) {
-          result = value;
-          lastComputed = computed;
-        }
-      });
-    }
-    return result;
-  };
-
-  // Shuffle a collection, using the modern version of the
-  // [Fisher-Yates shuffle](http://en.wikipedia.org/wiki/Fisher–Yates_shuffle).
-  _.shuffle = function(obj) {
-    var set = obj && obj.length === +obj.length ? obj : _.values(obj);
-    var length = set.length;
-    var shuffled = Array(length);
-    for (var index = 0, rand; index < length; index++) {
-      rand = _.random(0, index);
-      if (rand !== index) shuffled[index] = shuffled[rand];
-      shuffled[rand] = set[index];
-    }
-    return shuffled;
-  };
-
-  // Sample **n** random values from a collection.
-  // If **n** is not specified, returns a single random element.
-  // The internal `guard` argument allows it to work with `map`.
-  _.sample = function(obj, n, guard) {
-    if (n == null || guard) {
-      if (obj.length !== +obj.length) obj = _.values(obj);
-      return obj[_.random(obj.length - 1)];
-    }
-    return _.shuffle(obj).slice(0, Math.max(0, n));
-  };
-
-  // Sort the object's values by a criterion produced by an iteratee.
-  _.sortBy = function(obj, iteratee, context) {
-    iteratee = _.iteratee(iteratee, context);
-    return _.pluck(_.map(obj, function(value, index, list) {
-      return {
-        value: value,
-        index: index,
-        criteria: iteratee(value, index, list)
-      };
-    }).sort(function(left, right) {
-      var a = left.criteria;
-      var b = right.criteria;
-      if (a !== b) {
-        if (a > b || a === void 0) return 1;
-        if (a < b || b === void 0) return -1;
-      }
-      return left.index - right.index;
-    }), 'value');
-  };
-
-  // An internal function used for aggregate "group by" operations.
-  var group = function(behavior) {
-    return function(obj, iteratee, context) {
-      var result = {};
-      iteratee = _.iteratee(iteratee, context);
-      _.each(obj, function(value, index) {
-        var key = iteratee(value, index, obj);
-        behavior(result, value, key);
-      });
-      return result;
-    };
-  };
-
-  // Groups the object's values by a criterion. Pass either a string attribute
-  // to group by, or a function that returns the criterion.
-  _.groupBy = group(function(result, value, key) {
-    if (_.has(result, key)) result[key].push(value); else result[key] = [value];
-  });
-
-  // Indexes the object's values by a criterion, similar to `groupBy`, but for
-  // when you know that your index values will be unique.
-  _.indexBy = group(function(result, value, key) {
-    result[key] = value;
-  });
-
-  // Counts instances of an object that group by a certain criterion. Pass
-  // either a string attribute to count by, or a function that returns the
-  // criterion.
-  _.countBy = group(function(result, value, key) {
-    if (_.has(result, key)) result[key]++; else result[key] = 1;
-  });
-
-  // Use a comparator function to figure out the smallest index at which
-  // an object should be inserted so as to maintain order. Uses binary search.
-  _.sortedIndex = function(array, obj, iteratee, context) {
-    iteratee = _.iteratee(iteratee, context, 1);
-    var value = iteratee(obj);
-    var low = 0, high = array.length;
-    while (low < high) {
-      var mid = low + high >>> 1;
-      if (iteratee(array[mid]) < value) low = mid + 1; else high = mid;
-    }
-    return low;
-  };
-
-  // Safely create a real, live array from anything iterable.
-  _.toArray = function(obj) {
-    if (!obj) return [];
-    if (_.isArray(obj)) return slice.call(obj);
-    if (obj.length === +obj.length) return _.map(obj, _.identity);
-    return _.values(obj);
-  };
-
-  // Return the number of elements in an object.
-  _.size = function(obj) {
-    if (obj == null) return 0;
-    return obj.length === +obj.length ? obj.length : _.keys(obj).length;
-  };
-
-  // Split a collection into two arrays: one whose elements all satisfy the given
-  // predicate, and one whose elements all do not satisfy the predicate.
-  _.partition = function(obj, predicate, context) {
-    predicate = _.iteratee(predicate, context);
-    var pass = [], fail = [];
-    _.each(obj, function(value, key, obj) {
-      (predicate(value, key, obj) ? pass : fail).push(value);
-    });
-    return [pass, fail];
-  };
-
-  // Array Functions
-  // ---------------
-
-  // Get the first element of an array. Passing **n** will return the first N
-  // values in the array. Aliased as `head` and `take`. The **guard** check
-  // allows it to work with `_.map`.
-  _.first = _.head = _.take = function(array, n, guard) {
-    if (array == null) return void 0;
-    if (n == null || guard) return array[0];
-    if (n < 0) return [];
-    return slice.call(array, 0, n);
-  };
-
-  // Returns everything but the last entry of the array. Especially useful on
-  // the arguments object. Passing **n** will return all the values in
-  // the array, excluding the last N. The **guard** check allows it to work with
-  // `_.map`.
-  _.initial = function(array, n, guard) {
-    return slice.call(array, 0, Math.max(0, array.length - (n == null || guard ? 1 : n)));
-  };
-
-  // Get the last element of an array. Passing **n** will return the last N
-  // values in the array. The **guard** check allows it to work with `_.map`.
-  _.last = function(array, n, guard) {
-    if (array == null) return void 0;
-    if (n == null || guard) return array[array.length - 1];
-    return slice.call(array, Math.max(array.length - n, 0));
-  };
-
-  // Returns everything but the first entry of the array. Aliased as `tail` and `drop`.
-  // Especially useful on the arguments object. Passing an **n** will return
-  // the rest N values in the array. The **guard**
-  // check allows it to work with `_.map`.
-  _.rest = _.tail = _.drop = function(array, n, guard) {
-    return slice.call(array, n == null || guard ? 1 : n);
-  };
-
-  // Trim out all falsy values from an array.
-  _.compact = function(array) {
-    return _.filter(array, _.identity);
-  };
-
-  // Internal implementation of a recursive `flatten` function.
-  var flatten = function(input, shallow, strict, output) {
-    if (shallow && _.every(input, _.isArray)) {
-      return concat.apply(output, input);
-    }
-    for (var i = 0, length = input.length; i < length; i++) {
-      var value = input[i];
-      if (!_.isArray(value) && !_.isArguments(value)) {
-        if (!strict) output.push(value);
-      } else if (shallow) {
-        push.apply(output, value);
-      } else {
-        flatten(value, shallow, strict, output);
-      }
-    }
-    return output;
-  };
-
-  // Flatten out an array, either recursively (by default), or just one level.
-  _.flatten = function(array, shallow) {
-    return flatten(array, shallow, false, []);
-  };
-
-  // Return a version of the array that does not contain the specified value(s).
-  _.without = function(array) {
-    return _.difference(array, slice.call(arguments, 1));
-  };
-
-  // Produce a duplicate-free version of the array. If the array has already
-  // been sorted, you have the option of using a faster algorithm.
-  // Aliased as `unique`.
-  _.uniq = _.unique = function(array, isSorted, iteratee, context) {
-    if (array == null) return [];
-    if (!_.isBoolean(isSorted)) {
-      context = iteratee;
-      iteratee = isSorted;
-      isSorted = false;
-    }
-    if (iteratee != null) iteratee = _.iteratee(iteratee, context);
-    var result = [];
-    var seen = [];
-    for (var i = 0, length = array.length; i < length; i++) {
-      var value = array[i];
-      if (isSorted) {
-        if (!i || seen !== value) result.push(value);
-        seen = value;
-      } else if (iteratee) {
-        var computed = iteratee(value, i, array);
-        if (_.indexOf(seen, computed) < 0) {
-          seen.push(computed);
-          result.push(value);
-        }
-      } else if (_.indexOf(result, value) < 0) {
-        result.push(value);
-      }
-    }
-    return result;
-  };
-
-  // Produce an array that contains the union: each distinct element from all of
-  // the passed-in arrays.
-  _.union = function() {
-    return _.uniq(flatten(arguments, true, true, []));
-  };
-
-  // Produce an array that contains every item shared between all the
-  // passed-in arrays.
-  _.intersection = function(array) {
-    if (array == null) return [];
-    var result = [];
-    var argsLength = arguments.length;
-    for (var i = 0, length = array.length; i < length; i++) {
-      var item = array[i];
-      if (_.contains(result, item)) continue;
-      for (var j = 1; j < argsLength; j++) {
-        if (!_.contains(arguments[j], item)) break;
-      }
-      if (j === argsLength) result.push(item);
-    }
-    return result;
-  };
-
-  // Take the difference between one array and a number of other arrays.
-  // Only the elements present in just the first array will remain.
-  _.difference = function(array) {
-    var rest = flatten(slice.call(arguments, 1), true, true, []);
-    return _.filter(array, function(value){
-      return !_.contains(rest, value);
-    });
-  };
-
-  // Zip together multiple lists into a single array -- elements that share
-  // an index go together.
-  _.zip = function(array) {
-    if (array == null) return [];
-    var length = _.max(arguments, 'length').length;
-    var results = Array(length);
-    for (var i = 0; i < length; i++) {
-      results[i] = _.pluck(arguments, i);
-    }
-    return results;
-  };
-
-  // Converts lists into objects. Pass either a single array of `[key, value]`
-  // pairs, or two parallel arrays of the same length -- one of keys, and one of
-  // the corresponding values.
-  _.object = function(list, values) {
-    if (list == null) return {};
-    var result = {};
-    for (var i = 0, length = list.length; i < length; i++) {
-      if (values) {
-        result[list[i]] = values[i];
-      } else {
-        result[list[i][0]] = list[i][1];
-      }
-    }
-    return result;
-  };
-
-  // Return the position of the first occurrence of an item in an array,
-  // or -1 if the item is not included in the array.
-  // If the array is large and already in sort order, pass `true`
-  // for **isSorted** to use binary search.
-  _.indexOf = function(array, item, isSorted) {
-    if (array == null) return -1;
-    var i = 0, length = array.length;
-    if (isSorted) {
-      if (typeof isSorted == 'number') {
-        i = isSorted < 0 ? Math.max(0, length + isSorted) : isSorted;
-      } else {
-        i = _.sortedIndex(array, item);
-        return array[i] === item ? i : -1;
-      }
-    }
-    for (; i < length; i++) if (array[i] === item) return i;
-    return -1;
-  };
-
-  _.lastIndexOf = function(array, item, from) {
-    if (array == null) return -1;
-    var idx = array.length;
-    if (typeof from == 'number') {
-      idx = from < 0 ? idx + from + 1 : Math.min(idx, from + 1);
-    }
-    while (--idx >= 0) if (array[idx] === item) return idx;
-    return -1;
-  };
-
-  // Generate an integer Array containing an arithmetic progression. A port of
-  // the native Python `range()` function. See
-  // [the Python documentation](http://docs.python.org/library/functions.html#range).
-  _.range = function(start, stop, step) {
-    if (arguments.length <= 1) {
-      stop = start || 0;
-      start = 0;
-    }
-    step = step || 1;
-
-    var length = Math.max(Math.ceil((stop - start) / step), 0);
-    var range = Array(length);
-
-    for (var idx = 0; idx < length; idx++, start += step) {
-      range[idx] = start;
-    }
-
-    return range;
-  };
-
-  // Function (ahem) Functions
-  // ------------------
-
-  // Reusable constructor function for prototype setting.
-  var Ctor = function(){};
-
-  // Create a function bound to a given object (assigning `this`, and arguments,
-  // optionally). Delegates to **ECMAScript 5**'s native `Function.bind` if
-  // available.
-  _.bind = function(func, context) {
-    var args, bound;
-    if (nativeBind && func.bind === nativeBind) return nativeBind.apply(func, slice.call(arguments, 1));
-    if (!_.isFunction(func)) throw new TypeError('Bind must be called on a function');
-    args = slice.call(arguments, 2);
-    bound = function() {
-      if (!(this instanceof bound)) return func.apply(context, args.concat(slice.call(arguments)));
-      Ctor.prototype = func.prototype;
-      var self = new Ctor;
-      Ctor.prototype = null;
-      var result = func.apply(self, args.concat(slice.call(arguments)));
-      if (_.isObject(result)) return result;
-      return self;
-    };
-    return bound;
-  };
-
-  // Partially apply a function by creating a version that has had some of its
-  // arguments pre-filled, without changing its dynamic `this` context. _ acts
-  // as a placeholder, allowing any combination of arguments to be pre-filled.
-  _.partial = function(func) {
-    var boundArgs = slice.call(arguments, 1);
-    return function() {
-      var position = 0;
-      var args = boundArgs.slice();
-      for (var i = 0, length = args.length; i < length; i++) {
-        if (args[i] === _) args[i] = arguments[position++];
-      }
-      while (position < arguments.length) args.push(arguments[position++]);
-      return func.apply(this, args);
-    };
-  };
-
-  // Bind a number of an object's methods to that object. Remaining arguments
-  // are the method names to be bound. Useful for ensuring that all callbacks
-  // defined on an object belong to it.
-  _.bindAll = function(obj) {
-    var i, length = arguments.length, key;
-    if (length <= 1) throw new Error('bindAll must be passed function names');
-    for (i = 1; i < length; i++) {
-      key = arguments[i];
-      obj[key] = _.bind(obj[key], obj);
-    }
-    return obj;
-  };
-
-  // Memoize an expensive function by storing its results.
-  _.memoize = function(func, hasher) {
-    var memoize = function(key) {
-      var cache = memoize.cache;
-      var address = hasher ? hasher.apply(this, arguments) : key;
-      if (!_.has(cache, address)) cache[address] = func.apply(this, arguments);
-      return cache[address];
-    };
-    memoize.cache = {};
-    return memoize;
-  };
-
-  // Delays a function for the given number of milliseconds, and then calls
-  // it with the arguments supplied.
-  _.delay = function(func, wait) {
-    var args = slice.call(arguments, 2);
-    return setTimeout(function(){
-      return func.apply(null, args);
-    }, wait);
-  };
-
-  // Defers a function, scheduling it to run after the current call stack has
-  // cleared.
-  _.defer = function(func) {
-    return _.delay.apply(_, [func, 1].concat(slice.call(arguments, 1)));
-  };
-
-  // Returns a function, that, when invoked, will only be triggered at most once
-  // during a given window of time. Normally, the throttled function will run
-  // as much as it can, without ever going more than once per `wait` duration;
-  // but if you'd like to disable the execution on the leading edge, pass
-  // `{leading: false}`. To disable execution on the trailing edge, ditto.
-  _.throttle = function(func, wait, options) {
-    var context, args, result;
-    var timeout = null;
-    var previous = 0;
-    if (!options) options = {};
-    var later = function() {
-      previous = options.leading === false ? 0 : _.now();
-      timeout = null;
-      result = func.apply(context, args);
-      if (!timeout) context = args = null;
-    };
-    return function() {
-      var now = _.now();
-      if (!previous && options.leading === false) previous = now;
-      var remaining = wait - (now - previous);
-      context = this;
-      args = arguments;
-      if (remaining <= 0 || remaining > wait) {
-        clearTimeout(timeout);
-        timeout = null;
-        previous = now;
-        result = func.apply(context, args);
-        if (!timeout) context = args = null;
-      } else if (!timeout && options.trailing !== false) {
-        timeout = setTimeout(later, remaining);
-      }
-      return result;
-    };
-  };
-
-  // Returns a function, that, as long as it continues to be invoked, will not
-  // be triggered. The function will be called after it stops being called for
-  // N milliseconds. If `immediate` is passed, trigger the function on the
-  // leading edge, instead of the trailing.
-  _.debounce = function(func, wait, immediate) {
-    var timeout, args, context, timestamp, result;
-
-    var later = function() {
-      var last = _.now() - timestamp;
-
-      if (last < wait && last > 0) {
-        timeout = setTimeout(later, wait - last);
-      } else {
-        timeout = null;
-        if (!immediate) {
-          result = func.apply(context, args);
-          if (!timeout) context = args = null;
-        }
-      }
-    };
-
-    return function() {
-      context = this;
-      args = arguments;
-      timestamp = _.now();
-      var callNow = immediate && !timeout;
-      if (!timeout) timeout = setTimeout(later, wait);
-      if (callNow) {
-        result = func.apply(context, args);
-        context = args = null;
-      }
-
-      return result;
-    };
-  };
-
-  // Returns the first function passed as an argument to the second,
-  // allowing you to adjust arguments, run code before and after, and
-  // conditionally execute the original function.
-  _.wrap = function(func, wrapper) {
-    return _.partial(wrapper, func);
-  };
-
-  // Returns a negated version of the passed-in predicate.
-  _.negate = function(predicate) {
-    return function() {
-      return !predicate.apply(this, arguments);
-    };
-  };
-
-  // Returns a function that is the composition of a list of functions, each
-  // consuming the return value of the function that follows.
-  _.compose = function() {
-    var args = arguments;
-    var start = args.length - 1;
-    return function() {
-      var i = start;
-      var result = args[start].apply(this, arguments);
-      while (i--) result = args[i].call(this, result);
-      return result;
-    };
-  };
-
-  // Returns a function that will only be executed after being called N times.
-  _.after = function(times, func) {
-    return function() {
-      if (--times < 1) {
-        return func.apply(this, arguments);
-      }
-    };
-  };
-
-  // Returns a function that will only be executed before being called N times.
-  _.before = function(times, func) {
-    var memo;
-    return function() {
-      if (--times > 0) {
-        memo = func.apply(this, arguments);
-      } else {
-        func = null;
-      }
-      return memo;
-    };
-  };
-
-  // Returns a function that will be executed at most one time, no matter how
-  // often you call it. Useful for lazy initialization.
-  _.once = _.partial(_.before, 2);
-
-  // Object Functions
-  // ----------------
-
-  // Retrieve the names of an object's properties.
-  // Delegates to **ECMAScript 5**'s native `Object.keys`
-  _.keys = function(obj) {
-    if (!_.isObject(obj)) return [];
-    if (nativeKeys) return nativeKeys(obj);
-    var keys = [];
-    for (var key in obj) if (_.has(obj, key)) keys.push(key);
-    return keys;
-  };
-
-  // Retrieve the values of an object's properties.
-  _.values = function(obj) {
-    var keys = _.keys(obj);
-    var length = keys.length;
-    var values = Array(length);
-    for (var i = 0; i < length; i++) {
-      values[i] = obj[keys[i]];
-    }
-    return values;
-  };
-
-  // Convert an object into a list of `[key, value]` pairs.
-  _.pairs = function(obj) {
-    var keys = _.keys(obj);
-    var length = keys.length;
-    var pairs = Array(length);
-    for (var i = 0; i < length; i++) {
-      pairs[i] = [keys[i], obj[keys[i]]];
-    }
-    return pairs;
-  };
-
-  // Invert the keys and values of an object. The values must be serializable.
-  _.invert = function(obj) {
-    var result = {};
-    var keys = _.keys(obj);
-    for (var i = 0, length = keys.length; i < length; i++) {
-      result[obj[keys[i]]] = keys[i];
-    }
-    return result;
-  };
-
-  // Return a sorted list of the function names available on the object.
-  // Aliased as `methods`
-  _.functions = _.methods = function(obj) {
-    var names = [];
-    for (var key in obj) {
-      if (_.isFunction(obj[key])) names.push(key);
-    }
-    return names.sort();
-  };
-
-  // Extend a given object with all the properties in passed-in object(s).
-  _.extend = function(obj) {
-    if (!_.isObject(obj)) return obj;
-    var source, prop;
-    for (var i = 1, length = arguments.length; i < length; i++) {
-      source = arguments[i];
-      for (prop in source) {
-        if (hasOwnProperty.call(source, prop)) {
-            obj[prop] = source[prop];
-        }
-      }
-    }
-    return obj;
-  };
-
-  // Return a copy of the object only containing the whitelisted properties.
-  _.pick = function(obj, iteratee, context) {
-    var result = {}, key;
-    if (obj == null) return result;
-    if (_.isFunction(iteratee)) {
-      iteratee = createCallback(iteratee, context);
-      for (key in obj) {
-        var value = obj[key];
-        if (iteratee(value, key, obj)) result[key] = value;
-      }
-    } else {
-      var keys = concat.apply([], slice.call(arguments, 1));
-      obj = new Object(obj);
-      for (var i = 0, length = keys.length; i < length; i++) {
-        key = keys[i];
-        if (key in obj) result[key] = obj[key];
-      }
-    }
-    return result;
-  };
-
-   // Return a copy of the object without the blacklisted properties.
-  _.omit = function(obj, iteratee, context) {
-    if (_.isFunction(iteratee)) {
-      iteratee = _.negate(iteratee);
-    } else {
-      var keys = _.map(concat.apply([], slice.call(arguments, 1)), String);
-      iteratee = function(value, key) {
-        return !_.contains(keys, key);
-      };
-    }
-    return _.pick(obj, iteratee, context);
-  };
-
-  // Fill in a given object with default properties.
-  _.defaults = function(obj) {
-    if (!_.isObject(obj)) return obj;
-    for (var i = 1, length = arguments.length; i < length; i++) {
-      var source = arguments[i];
-      for (var prop in source) {
-        if (obj[prop] === void 0) obj[prop] = source[prop];
-      }
-    }
-    return obj;
-  };
-
-  // Create a (shallow-cloned) duplicate of an object.
-  _.clone = function(obj) {
-    if (!_.isObject(obj)) return obj;
-    return _.isArray(obj) ? obj.slice() : _.extend({}, obj);
-  };
-
-  // Invokes interceptor with the obj, and then returns obj.
-  // The primary purpose of this method is to "tap into" a method chain, in
-  // order to perform operations on intermediate results within the chain.
-  _.tap = function(obj, interceptor) {
-    interceptor(obj);
-    return obj;
-  };
-
-  // Internal recursive comparison function for `isEqual`.
-  var eq = function(a, b, aStack, bStack) {
-    // Identical objects are equal. `0 === -0`, but they aren't identical.
-    // See the [Harmony `egal` proposal](http://wiki.ecmascript.org/doku.php?id=harmony:egal).
-    if (a === b) return a !== 0 || 1 / a === 1 / b;
-    // A strict comparison is necessary because `null == undefined`.
-    if (a == null || b == null) return a === b;
-    // Unwrap any wrapped objects.
-    if (a instanceof _) a = a._wrapped;
-    if (b instanceof _) b = b._wrapped;
-    // Compare `[[Class]]` names.
-    var className = toString.call(a);
-    if (className !== toString.call(b)) return false;
-    switch (className) {
-      // Strings, numbers, regular expressions, dates, and booleans are compared by value.
-      case '[object RegExp]':
-      // RegExps are coerced to strings for comparison (Note: '' + /a/i === '/a/i')
-      case '[object String]':
-        // Primitives and their corresponding object wrappers are equivalent; thus, `"5"` is
-        // equivalent to `new String("5")`.
-        return '' + a === '' + b;
-      case '[object Number]':
-        // `NaN`s are equivalent, but non-reflexive.
-        // Object(NaN) is equivalent to NaN
-        if (+a !== +a) return +b !== +b;
-        // An `egal` comparison is performed for other numeric values.
-        return +a === 0 ? 1 / +a === 1 / b : +a === +b;
-      case '[object Date]':
-      case '[object Boolean]':
-        // Coerce dates and booleans to numeric primitive values. Dates are compared by their
-        // millisecond representations. Note that invalid dates with millisecond representations
-        // of `NaN` are not equivalent.
-        return +a === +b;
-    }
-    if (typeof a != 'object' || typeof b != 'object') return false;
-    // Assume equality for cyclic structures. The algorithm for detecting cyclic
-    // structures is adapted from ES 5.1 section 15.12.3, abstract operation `JO`.
-    var length = aStack.length;
-    while (length--) {
-      // Linear search. Performance is inversely proportional to the number of
-      // unique nested structures.
-      if (aStack[length] === a) return bStack[length] === b;
-    }
-    // Objects with different constructors are not equivalent, but `Object`s
-    // from different frames are.
-    var aCtor = a.constructor, bCtor = b.constructor;
-    if (
-      aCtor !== bCtor &&
-      // Handle Object.create(x) cases
-      'constructor' in a && 'constructor' in b &&
-      !(_.isFunction(aCtor) && aCtor instanceof aCtor &&
-        _.isFunction(bCtor) && bCtor instanceof bCtor)
-    ) {
-      return false;
-    }
-    // Add the first object to the stack of traversed objects.
-    aStack.push(a);
-    bStack.push(b);
-    var size, result;
-    // Recursively compare objects and arrays.
-    if (className === '[object Array]') {
-      // Compare array lengths to determine if a deep comparison is necessary.
-      size = a.length;
-      result = size === b.length;
-      if (result) {
-        // Deep compare the contents, ignoring non-numeric properties.
-        while (size--) {
-          if (!(result = eq(a[size], b[size], aStack, bStack))) break;
-        }
-      }
-    } else {
-      // Deep compare objects.
-      var keys = _.keys(a), key;
-      size = keys.length;
-      // Ensure that both objects contain the same number of properties before comparing deep equality.
-      result = _.keys(b).length === size;
-      if (result) {
-        while (size--) {
-          // Deep compare each member
-          key = keys[size];
-          if (!(result = _.has(b, key) && eq(a[key], b[key], aStack, bStack))) break;
-        }
-      }
-    }
-    // Remove the first object from the stack of traversed objects.
-    aStack.pop();
-    bStack.pop();
-    return result;
-  };
-
-  // Perform a deep comparison to check if two objects are equal.
-  _.isEqual = function(a, b) {
-    return eq(a, b, [], []);
-  };
-
-  // Is a given array, string, or object empty?
-  // An "empty" object has no enumerable own-properties.
-  _.isEmpty = function(obj) {
-    if (obj == null) return true;
-    if (_.isArray(obj) || _.isString(obj) || _.isArguments(obj)) return obj.length === 0;
-    for (var key in obj) if (_.has(obj, key)) return false;
-    return true;
-  };
-
-  // Is a given value a DOM element?
-  _.isElement = function(obj) {
-    return !!(obj && obj.nodeType === 1);
-  };
-
-  // Is a given value an array?
-  // Delegates to ECMA5's native Array.isArray
-  _.isArray = nativeIsArray || function(obj) {
-    return toString.call(obj) === '[object Array]';
-  };
-
-  // Is a given variable an object?
-  _.isObject = function(obj) {
-    var type = typeof obj;
-    return type === 'function' || type === 'object' && !!obj;
-  };
-
-  // Add some isType methods: isArguments, isFunction, isString, isNumber, isDate, isRegExp.
-  _.each(['Arguments', 'Function', 'String', 'Number', 'Date', 'RegExp'], function(name) {
-    _['is' + name] = function(obj) {
-      return toString.call(obj) === '[object ' + name + ']';
-    };
-  });
-
-  // Define a fallback version of the method in browsers (ahem, IE), where
-  // there isn't any inspectable "Arguments" type.
-  if (!_.isArguments(arguments)) {
-    _.isArguments = function(obj) {
-      return _.has(obj, 'callee');
-    };
-  }
-
-  // Optimize `isFunction` if appropriate. Work around an IE 11 bug.
-  if (typeof /./ !== 'function') {
-    _.isFunction = function(obj) {
-      return typeof obj == 'function' || false;
-    };
-  }
-
-  // Is a given object a finite number?
-  _.isFinite = function(obj) {
-    return isFinite(obj) && !isNaN(parseFloat(obj));
-  };
-
-  // Is the given value `NaN`? (NaN is the only number which does not equal itself).
-  _.isNaN = function(obj) {
-    return _.isNumber(obj) && obj !== +obj;
-  };
-
-  // Is a given value a boolean?
-  _.isBoolean = function(obj) {
-    return obj === true || obj === false || toString.call(obj) === '[object Boolean]';
-  };
-
-  // Is a given value equal to null?
-  _.isNull = function(obj) {
-    return obj === null;
-  };
-
-  // Is a given variable undefined?
-  _.isUndefined = function(obj) {
-    return obj === void 0;
-  };
-
-  // Shortcut function for checking if an object has a given property directly
-  // on itself (in other words, not on a prototype).
-  _.has = function(obj, key) {
-    return obj != null && hasOwnProperty.call(obj, key);
-  };
-
-  // Utility Functions
-  // -----------------
-
-  // Run Underscore.js in *noConflict* mode, returning the `_` variable to its
-  // previous owner. Returns a reference to the Underscore object.
-  _.noConflict = function() {
-    root._ = previousUnderscore;
-    return this;
-  };
-
-  // Keep the identity function around for default iteratees.
-  _.identity = function(value) {
-    return value;
-  };
-
-  _.constant = function(value) {
-    return function() {
-      return value;
-    };
-  };
-
-  _.noop = function(){};
-
-  _.property = function(key) {
-    return function(obj) {
-      return obj[key];
-    };
-  };
-
-  // Returns a predicate for checking whether an object has a given set of `key:value` pairs.
-  _.matches = function(attrs) {
-    var pairs = _.pairs(attrs), length = pairs.length;
-    return function(obj) {
-      if (obj == null) return !length;
-      obj = new Object(obj);
-      for (var i = 0; i < length; i++) {
-        var pair = pairs[i], key = pair[0];
-        if (pair[1] !== obj[key] || !(key in obj)) return false;
-      }
-      return true;
-    };
-  };
-
-  // Run a function **n** times.
-  _.times = function(n, iteratee, context) {
-    var accum = Array(Math.max(0, n));
-    iteratee = createCallback(iteratee, context, 1);
-    for (var i = 0; i < n; i++) accum[i] = iteratee(i);
-    return accum;
-  };
-
-  // Return a random integer between min and max (inclusive).
-  _.random = function(min, max) {
-    if (max == null) {
-      max = min;
-      min = 0;
-    }
-    return min + Math.floor(Math.random() * (max - min + 1));
-  };
-
-  // A (possibly faster) way to get the current timestamp as an integer.
-  _.now = Date.now || function() {
-    return new Date().getTime();
-  };
-
-   // List of HTML entities for escaping.
-  var escapeMap = {
-    '&': '&amp;',
-    '<': '&lt;',
-    '>': '&gt;',
-    '"': '&quot;',
-    "'": '&#x27;',
-    '`': '&#x60;'
-  };
-  var unescapeMap = _.invert(escapeMap);
-
-  // Functions for escaping and unescaping strings to/from HTML interpolation.
-  var createEscaper = function(map) {
-    var escaper = function(match) {
-      return map[match];
-    };
-    // Regexes for identifying a key that needs to be escaped
-    var source = '(?:' + _.keys(map).join('|') + ')';
-    var testRegexp = RegExp(source);
-    var replaceRegexp = RegExp(source, 'g');
-    return function(string) {
-      string = string == null ? '' : '' + string;
-      return testRegexp.test(string) ? string.replace(replaceRegexp, escaper) : string;
-    };
-  };
-  _.escape = createEscaper(escapeMap);
-  _.unescape = createEscaper(unescapeMap);
-
-  // If the value of the named `property` is a function then invoke it with the
-  // `object` as context; otherwise, return it.
-  _.result = function(object, property) {
-    if (object == null) return void 0;
-    var value = object[property];
-    return _.isFunction(value) ? object[property]() : value;
-  };
-
-  // Generate a unique integer id (unique within the entire client session).
-  // Useful for temporary DOM ids.
-  var idCounter = 0;
-  _.uniqueId = function(prefix) {
-    var id = ++idCounter + '';
-    return prefix ? prefix + id : id;
-  };
-
-  // By default, Underscore uses ERB-style template delimiters, change the
-  // following template settings to use alternative delimiters.
-  _.templateSettings = {
-    evaluate    : /<%([\s\S]+?)%>/g,
-    interpolate : /<%=([\s\S]+?)%>/g,
-    escape      : /<%-([\s\S]+?)%>/g
-  };
-
-  // When customizing `templateSettings`, if you don't want to define an
-  // interpolation, evaluation or escaping regex, we need one that is
-  // guaranteed not to match.
-  var noMatch = /(.)^/;
-
-  // Certain characters need to be escaped so that they can be put into a
-  // string literal.
-  var escapes = {
-    "'":      "'",
-    '\\':     '\\',
-    '\r':     'r',
-    '\n':     'n',
-    '\u2028': 'u2028',
-    '\u2029': 'u2029'
-  };
-
-  var escaper = /\\|'|\r|\n|\u2028|\u2029/g;
-
-  var escapeChar = function(match) {
-    return '\\' + escapes[match];
-  };
-
-  // JavaScript micro-templating, similar to John Resig's implementation.
-  // Underscore templating handles arbitrary delimiters, preserves whitespace,
-  // and correctly escapes quotes within interpolated code.
-  // NB: `oldSettings` only exists for backwards compatibility.
-  _.template = function(text, settings, oldSettings) {
-    if (!settings && oldSettings) settings = oldSettings;
-    settings = _.defaults({}, settings, _.templateSettings);
-
-    // Combine delimiters into one regular expression via alternation.
-    var matcher = RegExp([
-      (settings.escape || noMatch).source,
-      (settings.interpolate || noMatch).source,
-      (settings.evaluate || noMatch).source
-    ].join('|') + '|$', 'g');
-
-    // Compile the template source, escaping string literals appropriately.
-    var index = 0;
-    var source = "__p+='";
-    text.replace(matcher, function(match, escape, interpolate, evaluate, offset) {
-      source += text.slice(index, offset).replace(escaper, escapeChar);
-      index = offset + match.length;
-
-      if (escape) {
-        source += "'+\n((__t=(" + escape + "))==null?'':_.escape(__t))+\n'";
-      } else if (interpolate) {
-        source += "'+\n((__t=(" + interpolate + "))==null?'':__t)+\n'";
-      } else if (evaluate) {
-        source += "';\n" + evaluate + "\n__p+='";
-      }
-
-      // Adobe VMs need the match returned to produce the correct offest.
-      return match;
-    });
-    source += "';\n";
-
-    // If a variable is not specified, place data values in local scope.
-    if (!settings.variable) source = 'with(obj||{}){\n' + source + '}\n';
-
-    source = "var __t,__p='',__j=Array.prototype.join," +
-      "print=function(){__p+=__j.call(arguments,'');};\n" +
-      source + 'return __p;\n';
-
-    try {
-      var render = new Function(settings.variable || 'obj', '_', source);
-    } catch (e) {
-      e.source = source;
-      throw e;
-    }
-
-    var template = function(data) {
-      return render.call(this, data, _);
-    };
-
-    // Provide the compiled source as a convenience for precompilation.
-    var argument = settings.variable || 'obj';
-    template.source = 'function(' + argument + '){\n' + source + '}';
-
-    return template;
-  };
-
-  // Add a "chain" function. Start chaining a wrapped Underscore object.
-  _.chain = function(obj) {
-    var instance = _(obj);
-    instance._chain = true;
-    return instance;
-  };
-
-  // OOP
-  // ---------------
-  // If Underscore is called as a function, it returns a wrapped object that
-  // can be used OO-style. This wrapper holds altered versions of all the
-  // underscore functions. Wrapped objects may be chained.
-
-  // Helper function to continue chaining intermediate results.
-  var result = function(obj) {
-    return this._chain ? _(obj).chain() : obj;
-  };
-
-  // Add your own custom functions to the Underscore object.
-  _.mixin = function(obj) {
-    _.each(_.functions(obj), function(name) {
-      var func = _[name] = obj[name];
-      _.prototype[name] = function() {
-        var args = [this._wrapped];
-        push.apply(args, arguments);
-        return result.call(this, func.apply(_, args));
-      };
-    });
-  };
-
-  // Add all of the Underscore functions to the wrapper object.
-  _.mixin(_);
-
-  // Add all mutator Array functions to the wrapper.
-  _.each(['pop', 'push', 'reverse', 'shift', 'sort', 'splice', 'unshift'], function(name) {
-    var method = ArrayProto[name];
-    _.prototype[name] = function() {
-      var obj = this._wrapped;
-      method.apply(obj, arguments);
-      if ((name === 'shift' || name === 'splice') && obj.length === 0) delete obj[0];
-      return result.call(this, obj);
-    };
-  });
-
-  // Add all accessor Array functions to the wrapper.
-  _.each(['concat', 'join', 'slice'], function(name) {
-    var method = ArrayProto[name];
-    _.prototype[name] = function() {
-      return result.call(this, method.apply(this._wrapped, arguments));
-    };
-  });
-
-  // Extracts the result from a wrapped and chained object.
-  _.prototype.value = function() {
-    return this._wrapped;
-  };
-
-  // AMD registration happens at the end for compatibility with AMD loaders
-  // that may not enforce next-turn semantics on modules. Even though general
-  // practice for AMD registration is to be anonymous, underscore registers
-  // as a named module because, like jQuery, it is a base library that is
-  // popular enough to be bundled in a third party lib, but not be part of
-  // an AMD load request. Those cases could generate an error when an
-  // anonymous define() is called outside of a loader request.
-  if (typeof define === 'function' && define.amd) {
-    define('underscore', [], function() {
-      return _;
-    });
-  }
-}.call(this));
diff --git a/#pma/doc/html/_static/up-pressed.png b/#pma/doc/html/_static/up-pressed.png
deleted file mode 100644
index 99e72109..00000000
Binary files a/#pma/doc/html/_static/up-pressed.png and /dev/null differ
diff --git a/#pma/doc/html/_static/up.png b/#pma/doc/html/_static/up.png
deleted file mode 100644
index 26de002e..00000000
Binary files a/#pma/doc/html/_static/up.png and /dev/null differ
diff --git a/#pma/doc/html/_static/websupport.js b/#pma/doc/html/_static/websupport.js
deleted file mode 100644
index 98e7f40b..00000000
--- a/#pma/doc/html/_static/websupport.js
+++ /dev/null
@@ -1,808 +0,0 @@
-/*
- * websupport.js
- * ~~~~~~~~~~~~~
- *
- * sphinx.websupport utilities for all documentation.
- *
- * :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
- * :license: BSD, see LICENSE for details.
- *
- */
-
-(function($) {
-  $.fn.autogrow = function() {
-    return this.each(function() {
-    var textarea = this;
-
-    $.fn.autogrow.resize(textarea);
-
-    $(textarea)
-      .focus(function() {
-        textarea.interval = setInterval(function() {
-          $.fn.autogrow.resize(textarea);
-        }, 500);
-      })
-      .blur(function() {
-        clearInterval(textarea.interval);
-      });
-    });
-  };
-
-  $.fn.autogrow.resize = function(textarea) {
-    var lineHeight = parseInt($(textarea).css('line-height'), 10);
-    var lines = textarea.value.split('\n');
-    var columns = textarea.cols;
-    var lineCount = 0;
-    $.each(lines, function() {
-      lineCount += Math.ceil(this.length / columns) || 1;
-    });
-    var height = lineHeight * (lineCount + 1);
-    $(textarea).css('height', height);
-  };
-})(jQuery);
-
-(function($) {
-  var comp, by;
-
-  function init() {
-    initEvents();
-    initComparator();
-  }
-
-  function initEvents() {
-    $(document).on("click", 'a.comment-close', function(event) {
-      event.preventDefault();
-      hide($(this).attr('id').substring(2));
-    });
-    $(document).on("click", 'a.vote', function(event) {
-      event.preventDefault();
-      handleVote($(this));
-    });
-    $(document).on("click", 'a.reply', function(event) {
-      event.preventDefault();
-      openReply($(this).attr('id').substring(2));
-    });
-    $(document).on("click", 'a.close-reply', function(event) {
-      event.preventDefault();
-      closeReply($(this).attr('id').substring(2));
-    });
-    $(document).on("click", 'a.sort-option', function(event) {
-      event.preventDefault();
-      handleReSort($(this));
-    });
-    $(document).on("click", 'a.show-proposal', function(event) {
-      event.preventDefault();
-      showProposal($(this).attr('id').substring(2));
-    });
-    $(document).on("click", 'a.hide-proposal', function(event) {
-      event.preventDefault();
-      hideProposal($(this).attr('id').substring(2));
-    });
-    $(document).on("click", 'a.show-propose-change', function(event) {
-      event.preventDefault();
-      showProposeChange($(this).attr('id').substring(2));
-    });
-    $(document).on("click", 'a.hide-propose-change', function(event) {
-      event.preventDefault();
-      hideProposeChange($(this).attr('id').substring(2));
-    });
-    $(document).on("click", 'a.accept-comment', function(event) {
-      event.preventDefault();
-      acceptComment($(this).attr('id').substring(2));
-    });
-    $(document).on("click", 'a.delete-comment', function(event) {
-      event.preventDefault();
-      deleteComment($(this).attr('id').substring(2));
-    });
-    $(document).on("click", 'a.comment-markup', function(event) {
-      event.preventDefault();
-      toggleCommentMarkupBox($(this).attr('id').substring(2));
-    });
-  }
-
-  /**
-   * Set comp, which is a comparator function used for sorting and
-   * inserting comments into the list.
-   */
-  function setComparator() {
-    // If the first three letters are "asc", sort in ascending order
-    // and remove the prefix.
-    if (by.substring(0,3) == 'asc') {
-      var i = by.substring(3);
-      comp = function(a, b) { return a[i] - b[i]; };
-    } else {
-      // Otherwise sort in descending order.
-      comp = function(a, b) { return b[by] - a[by]; };
-    }
-
-    // Reset link styles and format the selected sort option.
-    $('a.sel').attr('href', '#').removeClass('sel');
-    $('a.by' + by).removeAttr('href').addClass('sel');
-  }
-
-  /**
-   * Create a comp function. If the user has preferences stored in
-   * the sortBy cookie, use those, otherwise use the default.
-   */
-  function initComparator() {
-    by = 'rating'; // Default to sort by rating.
-    // If the sortBy cookie is set, use that instead.
-    if (document.cookie.length > 0) {
-      var start = document.cookie.indexOf('sortBy=');
-      if (start != -1) {
-        start = start + 7;
-        var end = document.cookie.indexOf(";", start);
-        if (end == -1) {
-          end = document.cookie.length;
-          by = unescape(document.cookie.substring(start, end));
-        }
-      }
-    }
-    setComparator();
-  }
-
-  /**
-   * Show a comment div.
-   */
-  function show(id) {
-    $('#ao' + id).hide();
-    $('#ah' + id).show();
-    var context = $.extend({id: id}, opts);
-    var popup = $(renderTemplate(popupTemplate, context)).hide();
-    popup.find('textarea[name="proposal"]').hide();
-    popup.find('a.by' + by).addClass('sel');
-    var form = popup.find('#cf' + id);
-    form.submit(function(event) {
-      event.preventDefault();
-      addComment(form);
-    });
-    $('#s' + id).after(popup);
-    popup.slideDown('fast', function() {
-      getComments(id);
-    });
-  }
-
-  /**
-   * Hide a comment div.
-   */
-  function hide(id) {
-    $('#ah' + id).hide();
-    $('#ao' + id).show();
-    var div = $('#sc' + id);
-    div.slideUp('fast', function() {
-      div.remove();
-    });
-  }
-
-  /**
-   * Perform an ajax request to get comments for a node
-   * and insert the comments into the comments tree.
-   */
-  function getComments(id) {
-    $.ajax({
-     type: 'GET',
-     url: opts.getCommentsURL,
-     data: {node: id},
-     success: function(data, textStatus, request) {
-       var ul = $('#cl' + id);
-       var speed = 100;
-       $('#cf' + id)
-         .find('textarea[name="proposal"]')
-         .data('source', data.source);
-
-       if (data.comments.length === 0) {
-         ul.html('<li>No comments yet.</li>');
-         ul.data('empty', true);
-       } else {
-         // If there are comments, sort them and put them in the list.
-         var comments = sortComments(data.comments);
-         speed = data.comments.length * 100;
-         appendComments(comments, ul);
-         ul.data('empty', false);
-       }
-       $('#cn' + id).slideUp(speed + 200);
-       ul.slideDown(speed);
-     },
-     error: function(request, textStatus, error) {
-       showError('Oops, there was a problem retrieving the comments.');
-     },
-     dataType: 'json'
-    });
-  }
-
-  /**
-   * Add a comment via ajax and insert the comment into the comment tree.
-   */
-  function addComment(form) {
-    var node_id = form.find('input[name="node"]').val();
-    var parent_id = form.find('input[name="parent"]').val();
-    var text = form.find('textarea[name="comment"]').val();
-    var proposal = form.find('textarea[name="proposal"]').val();
-
-    if (text == '') {
-      showError('Please enter a comment.');
-      return;
-    }
-
-    // Disable the form that is being submitted.
-    form.find('textarea,input').attr('disabled', 'disabled');
-
-    // Send the comment to the server.
-    $.ajax({
-      type: "POST",
-      url: opts.addCommentURL,
-      dataType: 'json',
-      data: {
-        node: node_id,
-        parent: parent_id,
-        text: text,
-        proposal: proposal
-      },
-      success: function(data, textStatus, error) {
-        // Reset the form.
-        if (node_id) {
-          hideProposeChange(node_id);
-        }
-        form.find('textarea')
-          .val('')
-          .add(form.find('input'))
-          .removeAttr('disabled');
-	var ul = $('#cl' + (node_id || parent_id));
-        if (ul.data('empty')) {
-          $(ul).empty();
-          ul.data('empty', false);
-        }
-        insertComment(data.comment);
-        var ao = $('#ao' + node_id);
-        ao.find('img').attr({'src': opts.commentBrightImage});
-        if (node_id) {
-          // if this was a "root" comment, remove the commenting box
-          // (the user can get it back by reopening the comment popup)
-          $('#ca' + node_id).slideUp();
-        }
-      },
-      error: function(request, textStatus, error) {
-        form.find('textarea,input').removeAttr('disabled');
-        showError('Oops, there was a problem adding the comment.');
-      }
-    });
-  }
-
-  /**
-   * Recursively append comments to the main comment list and children
-   * lists, creating the comment tree.
-   */
-  function appendComments(comments, ul) {
-    $.each(comments, function() {
-      var div = createCommentDiv(this);
-      ul.append($(document.createElement('li')).html(div));
-      appendComments(this.children, div.find('ul.comment-children'));
-      // To avoid stagnating data, don't store the comments children in data.
-      this.children = null;
-      div.data('comment', this);
-    });
-  }
-
-  /**
-   * After adding a new comment, it must be inserted in the correct
-   * location in the comment tree.
-   */
-  function insertComment(comment) {
-    var div = createCommentDiv(comment);
-
-    // To avoid stagnating data, don't store the comments children in data.
-    comment.children = null;
-    div.data('comment', comment);
-
-    var ul = $('#cl' + (comment.node || comment.parent));
-    var siblings = getChildren(ul);
-
-    var li = $(document.createElement('li'));
-    li.hide();
-
-    // Determine where in the parents children list to insert this comment.
-    for(i=0; i < siblings.length; i++) {
-      if (comp(comment, siblings[i]) <= 0) {
-        $('#cd' + siblings[i].id)
-          .parent()
-          .before(li.html(div));
-        li.slideDown('fast');
-        return;
-      }
-    }
-
-    // If we get here, this comment rates lower than all the others,
-    // or it is the only comment in the list.
-    ul.append(li.html(div));
-    li.slideDown('fast');
-  }
-
-  function acceptComment(id) {
-    $.ajax({
-      type: 'POST',
-      url: opts.acceptCommentURL,
-      data: {id: id},
-      success: function(data, textStatus, request) {
-        $('#cm' + id).fadeOut('fast');
-        $('#cd' + id).removeClass('moderate');
-      },
-      error: function(request, textStatus, error) {
-        showError('Oops, there was a problem accepting the comment.');
-      }
-    });
-  }
-
-  function deleteComment(id) {
-    $.ajax({
-      type: 'POST',
-      url: opts.deleteCommentURL,
-      data: {id: id},
-      success: function(data, textStatus, request) {
-        var div = $('#cd' + id);
-        if (data == 'delete') {
-          // Moderator mode: remove the comment and all children immediately
-          div.slideUp('fast', function() {
-            div.remove();
-          });
-          return;
-        }
-        // User mode: only mark the comment as deleted
-        div
-          .find('span.user-id:first')
-          .text('[deleted]').end()
-          .find('div.comment-text:first')
-          .text('[deleted]').end()
-          .find('#cm' + id + ', #dc' + id + ', #ac' + id + ', #rc' + id +
-                ', #sp' + id + ', #hp' + id + ', #cr' + id + ', #rl' + id)
-          .remove();
-        var comment = div.data('comment');
-        comment.username = '[deleted]';
-        comment.text = '[deleted]';
-        div.data('comment', comment);
-      },
-      error: function(request, textStatus, error) {
-        showError('Oops, there was a problem deleting the comment.');
-      }
-    });
-  }
-
-  function showProposal(id) {
-    $('#sp' + id).hide();
-    $('#hp' + id).show();
-    $('#pr' + id).slideDown('fast');
-  }
-
-  function hideProposal(id) {
-    $('#hp' + id).hide();
-    $('#sp' + id).show();
-    $('#pr' + id).slideUp('fast');
-  }
-
-  function showProposeChange(id) {
-    $('#pc' + id).hide();
-    $('#hc' + id).show();
-    var textarea = $('#pt' + id);
-    textarea.val(textarea.data('source'));
-    $.fn.autogrow.resize(textarea[0]);
-    textarea.slideDown('fast');
-  }
-
-  function hideProposeChange(id) {
-    $('#hc' + id).hide();
-    $('#pc' + id).show();
-    var textarea = $('#pt' + id);
-    textarea.val('').removeAttr('disabled');
-    textarea.slideUp('fast');
-  }
-
-  function toggleCommentMarkupBox(id) {
-    $('#mb' + id).toggle();
-  }
-
-  /** Handle when the user clicks on a sort by link. */
-  function handleReSort(link) {
-    var classes = link.attr('class').split(/\s+/);
-    for (var i=0; i<classes.length; i++) {
-      if (classes[i] != 'sort-option') {
-	by = classes[i].substring(2);
-      }
-    }
-    setComparator();
-    // Save/update the sortBy cookie.
-    var expiration = new Date();
-    expiration.setDate(expiration.getDate() + 365);
-    document.cookie= 'sortBy=' + escape(by) +
-                     ';expires=' + expiration.toUTCString();
-    $('ul.comment-ul').each(function(index, ul) {
-      var comments = getChildren($(ul), true);
-      comments = sortComments(comments);
-      appendComments(comments, $(ul).empty());
-    });
-  }
-
-  /**
-   * Function to process a vote when a user clicks an arrow.
-   */
-  function handleVote(link) {
-    if (!opts.voting) {
-      showError("You'll need to login to vote.");
-      return;
-    }
-
-    var id = link.attr('id');
-    if (!id) {
-      // Didn't click on one of the voting arrows.
-      return;
-    }
-    // If it is an unvote, the new vote value is 0,
-    // Otherwise it's 1 for an upvote, or -1 for a downvote.
-    var value = 0;
-    if (id.charAt(1) != 'u') {
-      value = id.charAt(0) == 'u' ? 1 : -1;
-    }
-    // The data to be sent to the server.
-    var d = {
-      comment_id: id.substring(2),
-      value: value
-    };
-
-    // Swap the vote and unvote links.
-    link.hide();
-    $('#' + id.charAt(0) + (id.charAt(1) == 'u' ? 'v' : 'u') + d.comment_id)
-      .show();
-
-    // The div the comment is displayed in.
-    var div = $('div#cd' + d.comment_id);
-    var data = div.data('comment');
-
-    // If this is not an unvote, and the other vote arrow has
-    // already been pressed, unpress it.
-    if ((d.value !== 0) && (data.vote === d.value * -1)) {
-      $('#' + (d.value == 1 ? 'd' : 'u') + 'u' + d.comment_id).hide();
-      $('#' + (d.value == 1 ? 'd' : 'u') + 'v' + d.comment_id).show();
-    }
-
-    // Update the comments rating in the local data.
-    data.rating += (data.vote === 0) ? d.value : (d.value - data.vote);
-    data.vote = d.value;
-    div.data('comment', data);
-
-    // Change the rating text.
-    div.find('.rating:first')
-      .text(data.rating + ' point' + (data.rating == 1 ? '' : 's'));
-
-    // Send the vote information to the server.
-    $.ajax({
-      type: "POST",
-      url: opts.processVoteURL,
-      data: d,
-      error: function(request, textStatus, error) {
-        showError('Oops, there was a problem casting that vote.');
-      }
-    });
-  }
-
-  /**
-   * Open a reply form used to reply to an existing comment.
-   */
-  function openReply(id) {
-    // Swap out the reply link for the hide link
-    $('#rl' + id).hide();
-    $('#cr' + id).show();
-
-    // Add the reply li to the children ul.
-    var div = $(renderTemplate(replyTemplate, {id: id})).hide();
-    $('#cl' + id)
-      .prepend(div)
-      // Setup the submit handler for the reply form.
-      .find('#rf' + id)
-      .submit(function(event) {
-        event.preventDefault();
-        addComment($('#rf' + id));
-        closeReply(id);
-      })
-      .find('input[type=button]')
-      .click(function() {
-        closeReply(id);
-      });
-    div.slideDown('fast', function() {
-      $('#rf' + id).find('textarea').focus();
-    });
-  }
-
-  /**
-   * Close the reply form opened with openReply.
-   */
-  function closeReply(id) {
-    // Remove the reply div from the DOM.
-    $('#rd' + id).slideUp('fast', function() {
-      $(this).remove();
-    });
-
-    // Swap out the hide link for the reply link
-    $('#cr' + id).hide();
-    $('#rl' + id).show();
-  }
-
-  /**
-   * Recursively sort a tree of comments using the comp comparator.
-   */
-  function sortComments(comments) {
-    comments.sort(comp);
-    $.each(comments, function() {
-      this.children = sortComments(this.children);
-    });
-    return comments;
-  }
-
-  /**
-   * Get the children comments from a ul. If recursive is true,
-   * recursively include childrens' children.
-   */
-  function getChildren(ul, recursive) {
-    var children = [];
-    ul.children().children("[id^='cd']")
-      .each(function() {
-        var comment = $(this).data('comment');
-        if (recursive)
-          comment.children = getChildren($(this).find('#cl' + comment.id), true);
-        children.push(comment);
-      });
-    return children;
-  }
-
-  /** Create a div to display a comment in. */
-  function createCommentDiv(comment) {
-    if (!comment.displayed && !opts.moderator) {
-      return $('<div class="moderate">Thank you!  Your comment will show up '
-               + 'once it is has been approved by a moderator.</div>');
-    }
-    // Prettify the comment rating.
-    comment.pretty_rating = comment.rating + ' point' +
-      (comment.rating == 1 ? '' : 's');
-    // Make a class (for displaying not yet moderated comments differently)
-    comment.css_class = comment.displayed ? '' : ' moderate';
-    // Create a div for this comment.
-    var context = $.extend({}, opts, comment);
-    var div = $(renderTemplate(commentTemplate, context));
-
-    // If the user has voted on this comment, highlight the correct arrow.
-    if (comment.vote) {
-      var direction = (comment.vote == 1) ? 'u' : 'd';
-      div.find('#' + direction + 'v' + comment.id).hide();
-      div.find('#' + direction + 'u' + comment.id).show();
-    }
-
-    if (opts.moderator || comment.text != '[deleted]') {
-      div.find('a.reply').show();
-      if (comment.proposal_diff)
-        div.find('#sp' + comment.id).show();
-      if (opts.moderator && !comment.displayed)
-        div.find('#cm' + comment.id).show();
-      if (opts.moderator || (opts.username == comment.username))
-        div.find('#dc' + comment.id).show();
-    }
-    return div;
-  }
-
-  /**
-   * A simple template renderer. Placeholders such as <%id%> are replaced
-   * by context['id'] with items being escaped. Placeholders such as <#id#>
-   * are not escaped.
-   */
-  function renderTemplate(template, context) {
-    var esc = $(document.createElement('div'));
-
-    function handle(ph, escape) {
-      var cur = context;
-      $.each(ph.split('.'), function() {
-        cur = cur[this];
-      });
-      return escape ? esc.text(cur || "").html() : cur;
-    }
-
-    return template.replace(/<([%#])([\w\.]*)\1>/g, function() {
-      return handle(arguments[2], arguments[1] == '%' ? true : false);
-    });
-  }
-
-  /** Flash an error message briefly. */
-  function showError(message) {
-    $(document.createElement('div')).attr({'class': 'popup-error'})
-      .append($(document.createElement('div'))
-               .attr({'class': 'error-message'}).text(message))
-      .appendTo('body')
-      .fadeIn("slow")
-      .delay(2000)
-      .fadeOut("slow");
-  }
-
-  /** Add a link the user uses to open the comments popup. */
-  $.fn.comment = function() {
-    return this.each(function() {
-      var id = $(this).attr('id').substring(1);
-      var count = COMMENT_METADATA[id];
-      var title = count + ' comment' + (count == 1 ? '' : 's');
-      var image = count > 0 ? opts.commentBrightImage : opts.commentImage;
-      var addcls = count == 0 ? ' nocomment' : '';
-      $(this)
-        .append(
-          $(document.createElement('a')).attr({
-            href: '#',
-            'class': 'sphinx-comment-open' + addcls,
-            id: 'ao' + id
-          })
-            .append($(document.createElement('img')).attr({
-              src: image,
-              alt: 'comment',
-              title: title
-            }))
-            .click(function(event) {
-              event.preventDefault();
-              show($(this).attr('id').substring(2));
-            })
-        )
-        .append(
-          $(document.createElement('a')).attr({
-            href: '#',
-            'class': 'sphinx-comment-close hidden',
-            id: 'ah' + id
-          })
-            .append($(document.createElement('img')).attr({
-              src: opts.closeCommentImage,
-              alt: 'close',
-              title: 'close'
-            }))
-            .click(function(event) {
-              event.preventDefault();
-              hide($(this).attr('id').substring(2));
-            })
-        );
-    });
-  };
-
-  var opts = {
-    processVoteURL: '/_process_vote',
-    addCommentURL: '/_add_comment',
-    getCommentsURL: '/_get_comments',
-    acceptCommentURL: '/_accept_comment',
-    deleteCommentURL: '/_delete_comment',
-    commentImage: '/static/_static/comment.png',
-    closeCommentImage: '/static/_static/comment-close.png',
-    loadingImage: '/static/_static/ajax-loader.gif',
-    commentBrightImage: '/static/_static/comment-bright.png',
-    upArrow: '/static/_static/up.png',
-    downArrow: '/static/_static/down.png',
-    upArrowPressed: '/static/_static/up-pressed.png',
-    downArrowPressed: '/static/_static/down-pressed.png',
-    voting: false,
-    moderator: false
-  };
-
-  if (typeof COMMENT_OPTIONS != "undefined") {
-    opts = jQuery.extend(opts, COMMENT_OPTIONS);
-  }
-
-  var popupTemplate = '\
-    <div class="sphinx-comments" id="sc<%id%>">\
-      <p class="sort-options">\
-        Sort by:\
-        <a href="#" class="sort-option byrating">best rated</a>\
-        <a href="#" class="sort-option byascage">newest</a>\
-        <a href="#" class="sort-option byage">oldest</a>\
-      </p>\
-      <div class="comment-header">Comments</div>\
-      <div class="comment-loading" id="cn<%id%>">\
-        loading comments... <img src="<%loadingImage%>" alt="" /></div>\
-      <ul id="cl<%id%>" class="comment-ul"></ul>\
-      <div id="ca<%id%>">\
-      <p class="add-a-comment">Add a comment\
-        (<a href="#" class="comment-markup" id="ab<%id%>">markup</a>):</p>\
-      <div class="comment-markup-box" id="mb<%id%>">\
-        reStructured text markup: <i>*emph*</i>, <b>**strong**</b>, \
-        <code>``code``</code>, \
-        code blocks: <code>::</code> and an indented block after blank line</div>\
-      <form method="post" id="cf<%id%>" class="comment-form" action="">\
-        <textarea name="comment" cols="80"></textarea>\
-        <p class="propose-button">\
-          <a href="#" id="pc<%id%>" class="show-propose-change">\
-            Propose a change &#9657;\
-          </a>\
-          <a href="#" id="hc<%id%>" class="hide-propose-change">\
-            Propose a change &#9663;\
-          </a>\
-        </p>\
-        <textarea name="proposal" id="pt<%id%>" cols="80"\
-                  spellcheck="false"></textarea>\
-        <input type="submit" value="Add comment" />\
-        <input type="hidden" name="node" value="<%id%>" />\
-        <input type="hidden" name="parent" value="" />\
-      </form>\
-      </div>\
-    </div>';
-
-  var commentTemplate = '\
-    <div id="cd<%id%>" class="sphinx-comment<%css_class%>">\
-      <div class="vote">\
-        <div class="arrow">\
-          <a href="#" id="uv<%id%>" class="vote" title="vote up">\
-            <img src="<%upArrow%>" />\
-          </a>\
-          <a href="#" id="uu<%id%>" class="un vote" title="vote up">\
-            <img src="<%upArrowPressed%>" />\
-          </a>\
-        </div>\
-        <div class="arrow">\
-          <a href="#" id="dv<%id%>" class="vote" title="vote down">\
-            <img src="<%downArrow%>" id="da<%id%>" />\
-          </a>\
-          <a href="#" id="du<%id%>" class="un vote" title="vote down">\
-            <img src="<%downArrowPressed%>" />\
-          </a>\
-        </div>\
-      </div>\
-      <div class="comment-content">\
-        <p class="tagline comment">\
-          <span class="user-id"><%username%></span>\
-          <span class="rating"><%pretty_rating%></span>\
-          <span class="delta"><%time.delta%></span>\
-        </p>\
-        <div class="comment-text comment"><#text#></div>\
-        <p class="comment-opts comment">\
-          <a href="#" class="reply hidden" id="rl<%id%>">reply &#9657;</a>\
-          <a href="#" class="close-reply" id="cr<%id%>">reply &#9663;</a>\
-          <a href="#" id="sp<%id%>" class="show-proposal">proposal &#9657;</a>\
-          <a href="#" id="hp<%id%>" class="hide-proposal">proposal &#9663;</a>\
-          <a href="#" id="dc<%id%>" class="delete-comment hidden">delete</a>\
-          <span id="cm<%id%>" class="moderation hidden">\
-            <a href="#" id="ac<%id%>" class="accept-comment">accept</a>\
-          </span>\
-        </p>\
-        <pre class="proposal" id="pr<%id%>">\
-<#proposal_diff#>\
-        </pre>\
-          <ul class="comment-children" id="cl<%id%>"></ul>\
-        </div>\
-        <div class="clearleft"></div>\
-      </div>\
-    </div>';
-
-  var replyTemplate = '\
-    <li>\
-      <div class="reply-div" id="rd<%id%>">\
-        <form id="rf<%id%>">\
-          <textarea name="comment" cols="80"></textarea>\
-          <input type="submit" value="Add reply" />\
-          <input type="button" value="Cancel" />\
-          <input type="hidden" name="parent" value="<%id%>" />\
-          <input type="hidden" name="node" value="" />\
-        </form>\
-      </div>\
-    </li>';
-
-  $(document).ready(function() {
-    init();
-  });
-})(jQuery);
-
-$(document).ready(function() {
-  // add comment anchors for all paragraphs that are commentable
-  $('.sphinx-has-comment').comment();
-
-  // highlight search words in search results
-  $("div.context").each(function() {
-    var params = $.getQueryParameters();
-    var terms = (params.q) ? params.q[0].split(/\s+/) : [];
-    var result = $(this);
-    $.each(terms, function() {
-      result.highlightText(this.toLowerCase(), 'highlighted');
-    });
-  });
-
-  // directly open comment window if requested
-  var anchor = document.location.hash;
-  if (anchor.substring(0, 9) == '#comment-') {
-    $('#ao' + anchor.substring(9)).click();
-    document.location.hash = '#s' + anchor.substring(9);
-  }
-});
diff --git a/#pma/doc/html/config.html b/#pma/doc/html/config.html
deleted file mode 100644
index 932f5131..00000000
--- a/#pma/doc/html/config.html
+++ /dev/null
@@ -1,5145 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    
-    <title>Configuration &#8212; phpMyAdmin 4.6.5.2 documentation</title>
-    
-    <link rel="stylesheet" href="_static/classic.css" type="text/css" />
-    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
-    
-    <script type="text/javascript">
-      var DOCUMENTATION_OPTIONS = {
-        URL_ROOT:    './',
-        VERSION:     '4.6.5.2',
-        COLLAPSE_INDEX: false,
-        FILE_SUFFIX: '.html',
-        HAS_SOURCE:  true
-      };
-    </script>
-    <script type="text/javascript" src="_static/jquery.js"></script>
-    <script type="text/javascript" src="_static/underscore.js"></script>
-    <script type="text/javascript" src="_static/doctools.js"></script>
-    <link rel="copyright" title="Copyright" href="copyright.html" />
-    <link rel="top" title="phpMyAdmin 4.6.5.2 documentation" href="index.html" />
-    <link rel="next" title="User Guide" href="user.html" />
-    <link rel="prev" title="Installation" href="setup.html" /> 
-  </head>
-  <body role="document">
-    <div class="related" role="navigation" aria-label="related navigation">
-      <h3>Navigation</h3>
-      <ul>
-        <li class="right" style="margin-right: 10px">
-          <a href="genindex.html" title="General Index"
-             accesskey="I">index</a></li>
-        <li class="right" >
-          <a href="user.html" title="User Guide"
-             accesskey="N">next</a> |</li>
-        <li class="right" >
-          <a href="setup.html" title="Installation"
-             accesskey="P">previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">phpMyAdmin 4.6.5.2 documentation</a> &#187;</li> 
-      </ul>
-    </div>  
-
-    <div class="document">
-      <div class="documentwrapper">
-        <div class="bodywrapper">
-          <div class="body" role="main">
-            
-  <div class="section" id="configuration">
-<span id="config"></span><span id="index-0"></span><h1>Configuration<a class="headerlink" href="#configuration" title="Permalink to this headline">¶</a></h1>
-<p>Almost all configurable data is placed in <code class="file docutils literal"><span class="pre">config.inc.php</span></code>. If this file
-does not exist, please refer to the <a class="reference internal" href="setup.html#setup"><span class="std std-ref">Installation</span></a> section to create one. This
-file only needs to contain the parameters you want to change from their
-corresponding default value in <code class="file docutils literal"><span class="pre">libraries/config.default.php</span></code>.</p>
-<p>If a directive is missing from your file, you can just add another line with
-the file. This file is for over-writing the defaults; if you wish to use the
-default value there&#8217;s no need to add a line here.</p>
-<p>The parameters which relate to design (like colors) are placed in
-<code class="file docutils literal"><span class="pre">themes/themename/layout.inc.php</span></code>. You might also want to create
-<code class="file docutils literal"><span class="pre">config.footer.inc.php</span></code> and <code class="file docutils literal"><span class="pre">config.header.inc.php</span></code> files to add
-your site specific code to be included on start and end of each page.</p>
-<div class="admonition note">
-<p class="first admonition-title">Note</p>
-<p class="last">Some distributions (eg. Debian or Ubuntu) store <code class="file docutils literal"><span class="pre">config.inc.php</span></code> in
-<code class="docutils literal"><span class="pre">/etc/phpmyadmin</span></code> instead of within phpMyAdmin sources.</p>
-</div>
-<div class="admonition warning">
-<p class="first admonition-title">Warning</p>
-<p class="last"><a class="reference internal" href="glossary.html#term-mac"><span class="xref std std-term">Mac</span></a> users should note that if you are on a version before
-<a class="reference internal" href="glossary.html#term-mac-os-x"><span class="xref std std-term">Mac OS X</span></a>, PHP does not seem to
-like <a class="reference internal" href="glossary.html#term-mac"><span class="xref std std-term">Mac</span></a> end of lines character (<code class="docutils literal"><span class="pre">\r</span></code>). So
-ensure you choose the option that allows to use the *nix end of line
-character (<code class="docutils literal"><span class="pre">\n</span></code>) in your text editor before saving a script you have
-modified.</p>
-</div>
-<div class="section" id="basic-settings">
-<h2>Basic settings<a class="headerlink" href="#basic-settings" title="Permalink to this headline">¶</a></h2>
-<dl class="option">
-<dt id="cfg_PmaAbsoluteUri">
-<code class="descname">$cfg['PmaAbsoluteUri']</code><a class="headerlink" href="#cfg_PmaAbsoluteUri" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">''</span></code></td>
-</tr>
-</tbody>
-</table>
-<div class="versionchanged">
-<p><span class="versionmodified">Changed in version 4.6.5: </span>This setting was not available in phpMyAdmin 4.6.0 - 4.6.4.</p>
-</div>
-<p>Sets here the complete <a class="reference internal" href="glossary.html#term-url"><span class="xref std std-term">URL</span></a> (with full path) to your phpMyAdmin
-installation&#8217;s directory. E.g.
-<code class="docutils literal"><span class="pre">https://www.example.net/path_to_your_phpMyAdmin_directory/</span></code>.  Note also
-that the <a class="reference internal" href="glossary.html#term-url"><span class="xref std std-term">URL</span></a> on most of web servers are case–sensitive. Don’t
-forget the trailing slash at the end.</p>
-<p>Starting with version 2.3.0, it is advisable to try leaving this blank. In
-most cases phpMyAdmin automatically detects the proper setting. Users of
-port forwarding will need to set <span class="target" id="index-1"></span><a class="reference internal" href="#cfg_PmaAbsoluteUri"><code class="xref config config-option docutils literal"><span class="pre">$cfg['PmaAbsoluteUri']</span></code></a>
-(<a class="reference external" href="https://sourceforge.net/p/phpmyadmin/support-requests/795/">more info</a>).</p>
-<p>A good test is to browse a table, edit a row and save it. There should be
-an error message if phpMyAdmin is having trouble auto–detecting the correct
-value. If you get an error that this must be set or if the autodetect code
-fails to detect your path, please post a bug report on our bug tracker so
-we can improve the code.</p>
-<div class="admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last"><a class="reference internal" href="faq.html#faq1-40"><span class="std std-ref">1.40 When accessing phpMyAdmin via an Apache reverse proxy, cookie login does not work.</span></a>, <a class="reference internal" href="faq.html#faq2-5"><span class="std std-ref">2.5 Each time I want to insert or change a row or drop a database or a table, an error 404 (page not found) is displayed or, with HTTP or cookie authentication, I&#8217;m asked to log in again. What&#8217;s wrong?</span></a>, <a class="reference internal" href="faq.html#faq4-7"><span class="std std-ref">4.7 Authentication window is displayed more than once, why?</span></a>, <a class="reference internal" href="faq.html#faq5-16"><span class="std std-ref">5.16 With Internet Explorer, I get &#8220;Access is denied&#8221; Javascript errors. Or I cannot make phpMyAdmin work under Windows.</span></a></p>
-</div>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_PmaNoRelation_DisableWarning">
-<code class="descname">$cfg['PmaNoRelation_DisableWarning']</code><a class="headerlink" href="#cfg_PmaNoRelation_DisableWarning" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">false</td>
-</tr>
-</tbody>
-</table>
-<p>Starting with version 2.3.0 phpMyAdmin offers a lot of features to
-work with master / foreign – tables (see <span class="target" id="index-2"></span><a class="reference internal" href="#cfg_Servers_pmadb"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['pmadb']</span></code></a>).</p>
-<p>If you tried to set this
-up and it does not work for you, have a look on the <span class="guilabel">Structure</span> page
-of one database where you would like to use it. You will find a link
-that will analyze why those features have been disabled.</p>
-<p>If you do not want to use those features set this variable to <code class="docutils literal"><span class="pre">true</span></code> to
-stop this message from appearing.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_SuhosinDisableWarning">
-<code class="descname">$cfg['SuhosinDisableWarning']</code><a class="headerlink" href="#cfg_SuhosinDisableWarning" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">false</td>
-</tr>
-</tbody>
-</table>
-<p>A warning is displayed on the main page if Suhosin is detected.</p>
-<p>You can set this parameter to <code class="docutils literal"><span class="pre">true</span></code> to stop this message from appearing.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_LoginCookieValidityDisableWarning">
-<code class="descname">$cfg['LoginCookieValidityDisableWarning']</code><a class="headerlink" href="#cfg_LoginCookieValidityDisableWarning" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">false</td>
-</tr>
-</tbody>
-</table>
-<p>A warning is displayed on the main page if the PHP parameter
-session.gc_maxlifetime is lower than cookie validity configured in phpMyAdmin.</p>
-<p>You can set this parameter to <code class="docutils literal"><span class="pre">true</span></code> to stop this message from appearing.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_ServerLibraryDifference_DisableWarning">
-<code class="descname">$cfg['ServerLibraryDifference_DisableWarning']</code><a class="headerlink" href="#cfg_ServerLibraryDifference_DisableWarning" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">false</td>
-</tr>
-</tbody>
-</table>
-<p>A warning is displayed on the main page if there is a difference
-between the MySQL library and server version.</p>
-<p>You can set this parameter to <code class="docutils literal"><span class="pre">true</span></code> to stop this message from appearing.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_ReservedWordDisableWarning">
-<code class="descname">$cfg['ReservedWordDisableWarning']</code><a class="headerlink" href="#cfg_ReservedWordDisableWarning" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">false</td>
-</tr>
-</tbody>
-</table>
-<p>This warning is displayed on the Structure page of a table if one or more
-column names match with words which are MySQL reserved.</p>
-<p>If you want to turn off this warning, you can set it to <code class="docutils literal"><span class="pre">true</span></code> and
-warning will no longer be displayed.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_TranslationWarningThreshold">
-<code class="descname">$cfg['TranslationWarningThreshold']</code><a class="headerlink" href="#cfg_TranslationWarningThreshold" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">integer</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">80</td>
-</tr>
-</tbody>
-</table>
-<p>Show warning about incomplete translations on certain threshold.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_SendErrorReports">
-<code class="descname">$cfg['SendErrorReports']</code><a class="headerlink" href="#cfg_SendErrorReports" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">'ask'</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>Sets the default behavior for JavaScript error reporting.</p>
-<p>Whenever an error is detected in the JavaScript execution, an error report
-may be sent to the phpMyAdmin team if the user agrees.</p>
-<p>The default setting of <code class="docutils literal"><span class="pre">'ask'</span></code> will ask the user everytime there is a new
-error report. However you can set this parameter to <code class="docutils literal"><span class="pre">'always'</span></code> to send error
-reports without asking for confirmation or you can set it to <code class="docutils literal"><span class="pre">'never'</span></code> to
-never send error reports.</p>
-<p>This directive is available both in the configuration file and in users
-preferences. If the person in charge of a multi-user installation prefers
-to disable this feature for all users, a value of <code class="docutils literal"><span class="pre">'never'</span></code> should be
-set, and the <span class="target" id="index-3"></span><a class="reference internal" href="#cfg_UserprefsDisallow"><code class="xref config config-option docutils literal"><span class="pre">$cfg['UserprefsDisallow']</span></code></a> directive should
-contain <code class="docutils literal"><span class="pre">'SendErrorReports'</span></code> in one of its array values.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_ConsoleEnterExecutes">
-<code class="descname">$cfg['ConsoleEnterExecutes']</code><a class="headerlink" href="#cfg_ConsoleEnterExecutes" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">false</td>
-</tr>
-</tbody>
-</table>
-<p>Setting this to <code class="docutils literal"><span class="pre">true</span></code> allows the user to execute queries by pressing Enter
-instead of Ctrl+Enter. A new line can be inserted by pressing Shift + Enter.</p>
-<p>The behaviour of the console can be temporarily changed using console&#8217;s
-settings interface.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_AllowThirdPartyFraming">
-<code class="descname">$cfg['AllowThirdPartyFraming']</code><a class="headerlink" href="#cfg_AllowThirdPartyFraming" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">false</td>
-</tr>
-</tbody>
-</table>
-<p>Setting this to <code class="docutils literal"><span class="pre">true</span></code> allows phpMyAdmin to be included inside a frame,
-and is a potential security hole allowing cross-frame scripting attacks or
-clickjacking.</p>
-</dd></dl>
-
-</div>
-<div class="section" id="server-connection-settings">
-<h2>Server connection settings<a class="headerlink" href="#server-connection-settings" title="Permalink to this headline">¶</a></h2>
-<dl class="option">
-<dt id="cfg_Servers">
-<code class="descname">$cfg['Servers']</code><a class="headerlink" href="#cfg_Servers" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">array</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">one server array with settings listed below</td>
-</tr>
-</tbody>
-</table>
-<p>Since version 1.4.2, phpMyAdmin supports the administration of multiple
-MySQL servers. Therefore, a <span class="target" id="index-4"></span><a class="reference internal" href="#cfg_Servers"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers']</span></code></a>-array has been
-added which contains the login information for the different servers. The
-first <span class="target" id="index-5"></span><a class="reference internal" href="#cfg_Servers_host"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['host']</span></code></a> contains the hostname of
-the first server, the second <span class="target" id="index-6"></span><a class="reference internal" href="#cfg_Servers_host"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['host']</span></code></a>
-the hostname of the second server, etc. In
-<code class="file docutils literal"><span class="pre">libraries/config.default.php</span></code>, there is only one section for server
-definition, however you can put as many as you need in
-<code class="file docutils literal"><span class="pre">config.inc.php</span></code>, copy that block or needed parts (you don&#8217;t have to
-define all settings, just those you need to change).</p>
-<div class="admonition note">
-<p class="first admonition-title">Note</p>
-<p class="last">The <span class="target" id="index-7"></span><a class="reference internal" href="#cfg_Servers"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers']</span></code></a> array starts with
-$cfg[&#8216;Servers&#8217;][1]. Do not use $cfg[&#8216;Servers&#8217;][0]. If you want more
-than one server, just copy following section (including $i
-incrementation) serveral times. There is no need to define full server
-array, just define values you need to change.</p>
-</div>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_Servers_host">
-<code class="descname">$cfg['Servers'][$i]['host']</code><a class="headerlink" href="#cfg_Servers_host" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">'localhost'</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>The hostname or <a class="reference internal" href="glossary.html#term-ip"><span class="xref std std-term">IP</span></a> address of your $i-th MySQL-server. E.g.
-<code class="docutils literal"><span class="pre">localhost</span></code>.</p>
-<p>Possible values are:</p>
-<ul class="simple">
-<li>hostname, e.g., <code class="docutils literal"><span class="pre">'localhost'</span></code> or <code class="docutils literal"><span class="pre">'mydb.example.org'</span></code></li>
-<li>IP address, e.g., <code class="docutils literal"><span class="pre">'127.0.0.1'</span></code> or <code class="docutils literal"><span class="pre">'192.168.10.1'</span></code></li>
-<li>dot - <code class="docutils literal"><span class="pre">'.'</span></code>, i.e., use named pipes on windows systems</li>
-<li>empty - <code class="docutils literal"><span class="pre">''</span></code>, disables this server</li>
-</ul>
-<div class="admonition note">
-<p class="first admonition-title">Note</p>
-<dl class="last docutils">
-<dt>phpMyAdmin supports connecting to MySQL servers reachable via IPv6 only.</dt>
-<dd>To connect to an IPv6 MySQL server, enter its IPv6 address in this field.</dd>
-</dl>
-</div>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_Servers_port">
-<code class="descname">$cfg['Servers'][$i]['port']</code><a class="headerlink" href="#cfg_Servers_port" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">''</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>The port-number of your $i-th MySQL-server. Default is 3306 (leave
-blank).</p>
-<div class="admonition note">
-<p class="first admonition-title">Note</p>
-<p class="last">If you use <code class="docutils literal"><span class="pre">localhost</span></code> as the hostname, MySQL ignores this port number
-and connects with the socket, so if you want to connect to a port
-different from the default port, use <code class="docutils literal"><span class="pre">127.0.0.1</span></code> or the real hostname
-in <span class="target" id="index-8"></span><a class="reference internal" href="#cfg_Servers_host"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['host']</span></code></a>.</p>
-</div>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_Servers_socket">
-<code class="descname">$cfg['Servers'][$i]['socket']</code><a class="headerlink" href="#cfg_Servers_socket" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">''</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>The path to the socket to use. Leave blank for default. To determine
-the correct socket, check your MySQL configuration or, using the
-<strong class="command">mysql</strong> command–line client, issue the <code class="docutils literal"><span class="pre">status</span></code> command. Among the
-resulting information displayed will be the socket used.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_Servers_ssl">
-<code class="descname">$cfg['Servers'][$i]['ssl']</code><a class="headerlink" href="#cfg_Servers_ssl" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">false</td>
-</tr>
-</tbody>
-</table>
-<p>Whether to enable SSL for the connection between phpMyAdmin and the MySQL server.</p>
-<p>When using the <code class="docutils literal"><span class="pre">'mysql'</span></code> extension,
-none of the remaining <code class="docutils literal"><span class="pre">'ssl...'</span></code> configuration options apply.</p>
-<p>We strongly recommend the <code class="docutils literal"><span class="pre">'mysqli'</span></code> extension when using this option.</p>
-<div class="admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last"><a class="reference internal" href="#example-google-ssl"><span class="std std-ref">Google Cloud SQL with SSL</span></a></p>
-</div>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_Servers_ssl_key">
-<code class="descname">$cfg['Servers'][$i]['ssl_key']</code><a class="headerlink" href="#cfg_Servers_ssl_key" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">NULL</td>
-</tr>
-</tbody>
-</table>
-<p>Path to the key file when using SSL for connecting to the MySQL server.</p>
-<p>For example:</p>
-<div class="highlight-php"><div class="highlight"><pre><span class="nv">$cfg</span><span class="p">[</span><span class="s1">&#39;Servers&#39;</span><span class="p">][</span><span class="nv">$i</span><span class="p">][</span><span class="s1">&#39;ssl_key&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="s1">&#39;/etc/mysql/server-key.pem&#39;</span><span class="p">;</span>
-</pre></div>
-</div>
-<div class="admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last"><a class="reference internal" href="#example-google-ssl"><span class="std std-ref">Google Cloud SQL with SSL</span></a></p>
-</div>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_Servers_ssl_cert">
-<code class="descname">$cfg['Servers'][$i]['ssl_cert']</code><a class="headerlink" href="#cfg_Servers_ssl_cert" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">NULL</td>
-</tr>
-</tbody>
-</table>
-<p>Path to the cert file when using SSL for connecting to the MySQL server.</p>
-<div class="admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last"><a class="reference internal" href="#example-google-ssl"><span class="std std-ref">Google Cloud SQL with SSL</span></a></p>
-</div>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_Servers_ssl_ca">
-<code class="descname">$cfg['Servers'][$i]['ssl_ca']</code><a class="headerlink" href="#cfg_Servers_ssl_ca" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">NULL</td>
-</tr>
-</tbody>
-</table>
-<p>Path to the CA file when using SSL for connecting to the MySQL server.</p>
-<div class="admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last"><a class="reference internal" href="#example-google-ssl"><span class="std std-ref">Google Cloud SQL with SSL</span></a></p>
-</div>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_Servers_ssl_ca_path">
-<code class="descname">$cfg['Servers'][$i]['ssl_ca_path']</code><a class="headerlink" href="#cfg_Servers_ssl_ca_path" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">NULL</td>
-</tr>
-</tbody>
-</table>
-<p>Directory containing trusted SSL CA certificates in PEM format.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_Servers_ssl_ciphers">
-<code class="descname">$cfg['Servers'][$i]['ssl_ciphers']</code><a class="headerlink" href="#cfg_Servers_ssl_ciphers" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">NULL</td>
-</tr>
-</tbody>
-</table>
-<p>List of allowable ciphers for SSL connections to the MySQL server.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_Servers_ssl_verify">
-<code class="descname">$cfg['Servers'][$i]['ssl_verify']</code><a class="headerlink" href="#cfg_Servers_ssl_verify" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">true</td>
-</tr>
-</tbody>
-</table>
-<div class="versionadded">
-<p><span class="versionmodified">New in version 4.6.0: </span>This is supported since phpMyAdmin 4.6.0.</p>
-</div>
-<p>If your PHP install uses the MySQL Native Driver (mysqlnd), your
-MySQL server is 5.6 or later, and your SSL certificate is self-signed,
-there is a chance your SSL connection will fail due to validation.
-Setting this to <code class="docutils literal"><span class="pre">false</span></code> will disable the validation check.</p>
-<p>Since PHP 5.6.0 it also verifies whether server name matches CN of it&#8217;s
-certificate. There is currently no way to disable just this check without
-disabling complete SSL verification.</p>
-<div class="admonition note">
-<p class="first admonition-title">Note</p>
-<p class="last">This flag only works with PHP 5.6.16 or later.</p>
-</div>
-<div class="admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last"><a class="reference internal" href="#example-google-ssl"><span class="std std-ref">Google Cloud SQL with SSL</span></a></p>
-</div>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_Servers_connect_type">
-<code class="descname">$cfg['Servers'][$i]['connect_type']</code><a class="headerlink" href="#cfg_Servers_connect_type" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">'tcp'</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>What type connection to use with the MySQL server. Your options are
-<code class="docutils literal"><span class="pre">'socket'</span></code> and <code class="docutils literal"><span class="pre">'tcp'</span></code>. It defaults to tcp as that is nearly guaranteed
-to be available on all MySQL servers, while sockets are not supported on
-some platforms. To use the socket mode, your MySQL server must be on the
-same machine as the Web server.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_Servers_compress">
-<code class="descname">$cfg['Servers'][$i]['compress']</code><a class="headerlink" href="#cfg_Servers_compress" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">false</td>
-</tr>
-</tbody>
-</table>
-<p>Whether to use a compressed protocol for the MySQL server connection
-or not (experimental).</p>
-</dd></dl>
-
-<span class="target" id="controlhost"></span><dl class="option">
-<dt id="cfg_Servers_controlhost">
-<code class="descname">$cfg['Servers'][$i]['controlhost']</code><a class="headerlink" href="#cfg_Servers_controlhost" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">''</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>Permits to use an alternate host to hold the configuration storage
-data.</p>
-</dd></dl>
-
-<span class="target" id="controlport"></span><dl class="option">
-<dt id="cfg_Servers_controlport">
-<code class="descname">$cfg['Servers'][$i]['controlport']</code><a class="headerlink" href="#cfg_Servers_controlport" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">''</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>Permits to use an alternate port to connect to the host that
-holds the configuration storage.</p>
-</dd></dl>
-
-<span class="target" id="controluser"></span><dl class="option">
-<dt id="cfg_Servers_controluser">
-<code class="descname">$cfg['Servers'][$i]['controluser']</code><a class="headerlink" href="#cfg_Servers_controluser" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">''</span></code></td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_Servers_controlpass">
-<code class="descname">$cfg['Servers'][$i]['controlpass']</code><a class="headerlink" href="#cfg_Servers_controlpass" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">''</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>This special account is used for 2 distinct purposes: to make possible all
-relational features (see <span class="target" id="index-9"></span><a class="reference internal" href="#cfg_Servers_pmadb"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['pmadb']</span></code></a>).</p>
-<div class="versionchanged">
-<p><span class="versionmodified">Changed in version 2.2.5: </span>those were called <code class="docutils literal"><span class="pre">stduser</span></code> and <code class="docutils literal"><span class="pre">stdpass</span></code></p>
-</div>
-<div class="admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last"><a class="reference internal" href="setup.html#setup"><span class="std std-ref">Installation</span></a>, <a class="reference internal" href="setup.html#authentication-modes"><span class="std std-ref">Using authentication modes</span></a>, <a class="reference internal" href="setup.html#linked-tables"><span class="std std-ref">phpMyAdmin configuration storage</span></a></p>
-</div>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_Servers_auth_type">
-<code class="descname">$cfg['Servers'][$i]['auth_type']</code><a class="headerlink" href="#cfg_Servers_auth_type" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">'cookie'</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>Whether config or cookie or <a class="reference internal" href="glossary.html#term-http"><span class="xref std std-term">HTTP</span></a> or signon authentication should be
-used for this server.</p>
-<ul class="simple">
-<li>&#8216;config&#8217; authentication (<code class="docutils literal"><span class="pre">$auth_type&nbsp;=&nbsp;'config'</span></code>) is the plain old
-way: username and password are stored in <code class="file docutils literal"><span class="pre">config.inc.php</span></code>.</li>
-<li>&#8216;cookie&#8217; authentication mode (<code class="docutils literal"><span class="pre">$auth_type&nbsp;=&nbsp;'cookie'</span></code>) allows you to
-log in as any valid MySQL user with the help of cookies.</li>
-<li>&#8216;http&#8217; authentication allows you to log in as any
-valid MySQL user via HTTP-Auth.</li>
-<li>&#8216;signon&#8217; authentication mode (<code class="docutils literal"><span class="pre">$auth_type&nbsp;=&nbsp;'signon'</span></code>) allows you to
-log in from prepared PHP session data or using supplied PHP script.</li>
-</ul>
-<div class="admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last"><a class="reference internal" href="setup.html#authentication-modes"><span class="std std-ref">Using authentication modes</span></a></p>
-</div>
-</dd></dl>
-
-<span class="target" id="servers-auth-http-realm"></span><dl class="option">
-<dt id="cfg_Servers_auth_http_realm">
-<code class="descname">$cfg['Servers'][$i]['auth_http_realm']</code><a class="headerlink" href="#cfg_Servers_auth_http_realm" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">''</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>When using auth_type = <code class="docutils literal"><span class="pre">http</span></code>, this field allows to define a custom
-<a class="reference internal" href="glossary.html#term-http"><span class="xref std std-term">HTTP</span></a> Basic Auth Realm which will be displayed to the user. If not
-explicitly specified in your configuration, a string combined of
-&#8220;phpMyAdmin &#8221; and either <span class="target" id="index-10"></span><a class="reference internal" href="#cfg_Servers_verbose"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['verbose']</span></code></a> or
-<span class="target" id="index-11"></span><a class="reference internal" href="#cfg_Servers_host"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['host']</span></code></a> will be used.</p>
-</dd></dl>
-
-<span class="target" id="servers-user"></span><dl class="option">
-<dt id="cfg_Servers_user">
-<code class="descname">$cfg['Servers'][$i]['user']</code><a class="headerlink" href="#cfg_Servers_user" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">'root'</span></code></td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_Servers_password">
-<code class="descname">$cfg['Servers'][$i]['password']</code><a class="headerlink" href="#cfg_Servers_password" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">''</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>When using <span class="target" id="index-12"></span><a class="reference internal" href="#cfg_Servers_auth_type"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['auth_type']</span></code></a> set to
-&#8216;config&#8217;, this is the user/password-pair which phpMyAdmin will use to
-connect to the MySQL server. This user/password pair is not needed when
-<a class="reference internal" href="glossary.html#term-http"><span class="xref std std-term">HTTP</span></a> or cookie authentication is used
-and should be empty.</p>
-</dd></dl>
-
-<span class="target" id="servers-nopassword"></span><dl class="option">
-<dt id="cfg_Servers_nopassword">
-<code class="descname">$cfg['Servers'][$i]['nopassword']</code><a class="headerlink" href="#cfg_Servers_nopassword" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">false</td>
-</tr>
-</tbody>
-</table>
-<p>Allow attempt to log in without password when a login with password
-fails. This can be used together with http authentication, when
-authentication is done some other way and phpMyAdmin gets user name
-from auth and uses empty password for connecting to MySQL. Password
-login is still tried first, but as fallback, no password method is
-tried.</p>
-</dd></dl>
-
-<span class="target" id="servers-only-db"></span><dl class="option">
-<dt id="cfg_Servers_only_db">
-<code class="descname">$cfg['Servers'][$i]['only_db']</code><a class="headerlink" href="#cfg_Servers_only_db" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string or array</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">''</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>If set to a (an array of) database name(s), only this (these)
-database(s) will be shown to the user. Since phpMyAdmin 2.2.1,
-this/these database(s) name(s) may contain MySQL wildcards characters
-(&#8220;_&#8221; and &#8220;%&#8221;): if you want to use literal instances of these
-characters, escape them (I.E. use <code class="docutils literal"><span class="pre">'my\_db'</span></code> and not <code class="docutils literal"><span class="pre">'my_db'</span></code>).</p>
-<p>This setting is an efficient way to lower the server load since the
-latter does not need to send MySQL requests to build the available
-database list. But <strong>it does not replace the privileges rules of the
-MySQL database server</strong>. If set, it just means only these databases
-will be displayed but <strong>not that all other databases can&#8217;t be used.</strong></p>
-<p>An example of using more that one database:</p>
-<div class="highlight-php"><div class="highlight"><pre><span class="nv">$cfg</span><span class="p">[</span><span class="s1">&#39;Servers&#39;</span><span class="p">][</span><span class="nv">$i</span><span class="p">][</span><span class="s1">&#39;only_db&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="k">array</span><span class="p">(</span><span class="s1">&#39;db1&#39;</span><span class="p">,</span> <span class="s1">&#39;db2&#39;</span><span class="p">);</span>
-</pre></div>
-</div>
-<div class="versionchanged">
-<p><span class="versionmodified">Changed in version 4.0.0: </span>Previous versions permitted to specify the display order of
-the database names via this directive.</p>
-</div>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_Servers_hide_db">
-<code class="descname">$cfg['Servers'][$i]['hide_db']</code><a class="headerlink" href="#cfg_Servers_hide_db" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">''</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>Regular expression for hiding some databases from unprivileged users.
-This only hides them from listing, but a user is still able to access
-them (using, for example, the SQL query area). To limit access, use
-the MySQL privilege system.  For example, to hide all databases
-starting with the letter &#8220;a&#8221;, use</p>
-<div class="highlight-php"><div class="highlight"><pre><span class="nv">$cfg</span><span class="p">[</span><span class="s1">&#39;Servers&#39;</span><span class="p">][</span><span class="nv">$i</span><span class="p">][</span><span class="s1">&#39;hide_db&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="s1">&#39;^a&#39;</span><span class="p">;</span>
-</pre></div>
-</div>
-<p>and to hide both &#8220;db1&#8221; and &#8220;db2&#8221; use</p>
-<div class="highlight-php"><div class="highlight"><pre><span class="nv">$cfg</span><span class="p">[</span><span class="s1">&#39;Servers&#39;</span><span class="p">][</span><span class="nv">$i</span><span class="p">][</span><span class="s1">&#39;hide_db&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="s1">&#39;^(db1|db2)$&#39;</span><span class="p">;</span>
-</pre></div>
-</div>
-<p>More information on regular expressions can be found in the <a class="reference external" href="https://php.net/manual/en/reference.pcre.pattern.syntax.php">PCRE
-pattern syntax</a> portion
-of the PHP reference manual.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_Servers_verbose">
-<code class="descname">$cfg['Servers'][$i]['verbose']</code><a class="headerlink" href="#cfg_Servers_verbose" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">''</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>Only useful when using phpMyAdmin with multiple server entries. If
-set, this string will be displayed instead of the hostname in the
-pull-down menu on the main page. This can be useful if you want to
-show only certain databases on your system, for example. For HTTP
-auth, all non-US-ASCII characters will be stripped.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_Servers_pmadb">
-<code class="descname">$cfg['Servers'][$i]['pmadb']</code><a class="headerlink" href="#cfg_Servers_pmadb" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">''</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>The name of the database containing the phpMyAdmin configuration
-storage.</p>
-<p>See the <a class="reference internal" href="setup.html#linked-tables"><span class="std std-ref">phpMyAdmin configuration storage</span></a>  section in this document to see the benefits of
-this feature, and for a quick way of creating this database and the needed
-tables.</p>
-<p>If you are the only user of this phpMyAdmin installation, you can use your
-current database to store those special tables; in this case, just put your
-current database name in <span class="target" id="index-13"></span><a class="reference internal" href="#cfg_Servers_pmadb"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['pmadb']</span></code></a>. For a
-multi-user installation, set this parameter to the name of your central
-database containing the phpMyAdmin configuration storage.</p>
-</dd></dl>
-
-<span class="target" id="bookmark"></span><dl class="option">
-<dt id="cfg_Servers_bookmarktable">
-<code class="descname">$cfg['Servers'][$i]['bookmarktable']</code><a class="headerlink" href="#cfg_Servers_bookmarktable" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string or false</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">''</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>Since release 2.2.0 phpMyAdmin allows users to bookmark queries. This
-can be useful for queries you often run. To allow the usage of this
-functionality:</p>
-<ul class="simple">
-<li>set up <span class="target" id="index-14"></span><a class="reference internal" href="#cfg_Servers_pmadb"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['pmadb']</span></code></a> and the phpMyAdmin configuration storage</li>
-<li>enter the table name in <span class="target" id="index-15"></span><a class="reference internal" href="#cfg_Servers_bookmarktable"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['bookmarktable']</span></code></a></li>
-</ul>
-<p>This feature can be disabled by setting the configuration to <code class="docutils literal"><span class="pre">false</span></code>.</p>
-</dd></dl>
-
-<span class="target" id="relation"></span><dl class="option">
-<dt id="cfg_Servers_relation">
-<code class="descname">$cfg['Servers'][$i]['relation']</code><a class="headerlink" href="#cfg_Servers_relation" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string or false</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">''</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>Since release 2.2.4 you can describe, in a special &#8216;relation&#8217; table,
-which column is a key in another table (a foreign key). phpMyAdmin
-currently uses this to:</p>
-<ul class="simple">
-<li>make clickable, when you browse the master table, the data values that
-point to the foreign table;</li>
-<li>display in an optional tool-tip the &#8220;display column&#8221; when browsing the
-master table, if you move the mouse to a column containing a foreign
-key (use also the &#8216;table_info&#8217; table); (see <a class="reference internal" href="faq.html#faqdisplay"><span class="std std-ref">6.7 How can I use the &#8220;display column&#8221; feature?</span></a>)</li>
-<li>in edit/insert mode, display a drop-down list of possible foreign keys
-(key value and &#8220;display column&#8221; are shown) (see <a class="reference internal" href="faq.html#faq6-21"><span class="std std-ref">6.21 In edit/insert mode, how can I see a list of possible values for a column, based on some foreign table?</span></a>)</li>
-<li>display links on the table properties page, to check referential
-integrity (display missing foreign keys) for each described key;</li>
-<li>in query-by-example, create automatic joins (see <a class="reference internal" href="faq.html#faq6-6"><span class="std std-ref">6.6 How can I use the relation table in Query-by-example?</span></a>)</li>
-<li>enable you to get a <a class="reference internal" href="glossary.html#term-pdf"><span class="xref std std-term">PDF</span></a> schema of
-your database (also uses the table_coords table).</li>
-</ul>
-<p>The keys can be numeric or character.</p>
-<p>To allow the usage of this functionality:</p>
-<ul class="simple">
-<li>set up <span class="target" id="index-16"></span><a class="reference internal" href="#cfg_Servers_pmadb"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['pmadb']</span></code></a> and the phpMyAdmin configuration storage</li>
-<li>put the relation table name in <span class="target" id="index-17"></span><a class="reference internal" href="#cfg_Servers_relation"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['relation']</span></code></a></li>
-<li>now as normal user open phpMyAdmin and for each one of your tables
-where you want to use this feature, click <span class="guilabel">Structure/Relation view/</span>
-and choose foreign columns.</li>
-</ul>
-<p>This feature can be disabled by setting the configuration to <code class="docutils literal"><span class="pre">false</span></code>.</p>
-<div class="admonition note">
-<p class="first admonition-title">Note</p>
-<p class="last">In the current version, <code class="docutils literal"><span class="pre">master_db</span></code> must be the same as <code class="docutils literal"><span class="pre">foreign_db</span></code>.
-Those columns have been put in future development of the cross-db
-relations.</p>
-</div>
-</dd></dl>
-
-<span class="target" id="table-info"></span><dl class="option">
-<dt id="cfg_Servers_table_info">
-<code class="descname">$cfg['Servers'][$i]['table_info']</code><a class="headerlink" href="#cfg_Servers_table_info" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string or false</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">''</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>Since release 2.3.0 you can describe, in a special &#8216;table_info&#8217;
-table, which column is to be displayed as a tool-tip when moving the
-cursor over the corresponding key. This configuration variable will
-hold the name of this special table. To allow the usage of this
-functionality:</p>
-<ul class="simple">
-<li>set up <span class="target" id="index-18"></span><a class="reference internal" href="#cfg_Servers_pmadb"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['pmadb']</span></code></a> and the phpMyAdmin configuration storage</li>
-<li>put the table name in <span class="target" id="index-19"></span><a class="reference internal" href="#cfg_Servers_table_info"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['table_info']</span></code></a> (e.g.
-<code class="docutils literal"><span class="pre">pma__table_info</span></code>)</li>
-<li>then for each table where you want to use this feature, click
-&#8220;Structure/Relation view/Choose column to display&#8221; to choose the
-column.</li>
-</ul>
-<p>This feature can be disabled by setting the configuration to <code class="docutils literal"><span class="pre">false</span></code>.</p>
-<div class="admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last"><a class="reference internal" href="faq.html#faqdisplay"><span class="std std-ref">6.7 How can I use the &#8220;display column&#8221; feature?</span></a></p>
-</div>
-</dd></dl>
-
-<span class="target" id="table-coords"></span><dl class="option">
-<dt id="cfg_Servers_table_coords">
-<code class="descname">$cfg['Servers'][$i]['table_coords']</code><a class="headerlink" href="#cfg_Servers_table_coords" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string or false</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">''</span></code></td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_Servers_pdf_pages">
-<code class="descname">$cfg['Servers'][$i]['pdf_pages']</code><a class="headerlink" href="#cfg_Servers_pdf_pages" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string or false</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">''</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>Since release 2.3.0 you can have phpMyAdmin create <a class="reference internal" href="glossary.html#term-pdf"><span class="xref std std-term">PDF</span></a> pages
-showing the relations between your tables. Further, the designer interface
-permits visually managing the relations. To do this it needs two tables
-&#8220;pdf_pages&#8221; (storing information about the available <a class="reference internal" href="glossary.html#term-pdf"><span class="xref std std-term">PDF</span></a> pages)
-and &#8220;table_coords&#8221; (storing coordinates where each table will be placed on
-a <a class="reference internal" href="glossary.html#term-pdf"><span class="xref std std-term">PDF</span></a> schema output).  You must be using the &#8220;relation&#8221; feature.</p>
-<p>To allow the usage of this functionality:</p>
-<ul class="simple">
-<li>set up <span class="target" id="index-20"></span><a class="reference internal" href="#cfg_Servers_pmadb"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['pmadb']</span></code></a> and the phpMyAdmin configuration storage</li>
-<li>put the correct table names in
-<span class="target" id="index-21"></span><a class="reference internal" href="#cfg_Servers_table_coords"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['table_coords']</span></code></a> and
-<span class="target" id="index-22"></span><a class="reference internal" href="#cfg_Servers_pdf_pages"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['pdf_pages']</span></code></a></li>
-</ul>
-<p>This feature can be disabled by setting either of the configurations to <code class="docutils literal"><span class="pre">false</span></code>.</p>
-<div class="admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last"><a class="reference internal" href="faq.html#faqpdf"><span class="std std-ref">6.8 How can I produce a PDF schema of my database?</span></a>.</p>
-</div>
-</dd></dl>
-
-<span class="target" id="col-com"></span><dl class="option">
-<dt id="cfg_Servers_column_info">
-<code class="descname">$cfg['Servers'][$i]['column_info']</code><a class="headerlink" href="#cfg_Servers_column_info" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string or false</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">''</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>This part requires a content update!  Since release 2.3.0 you can
-store comments to describe each column for each table. These will then
-be shown on the &#8220;printview&#8221;.</p>
-<p>Starting with release 2.5.0, comments are consequently used on the table
-property pages and table browse view, showing up as tool-tips above the
-column name (properties page) or embedded within the header of table in
-browse view. They can also be shown in a table dump. Please see the
-relevant configuration directives later on.</p>
-<p>Also new in release 2.5.0 is a MIME- transformation system which is also
-based on the following table structure. See <a class="reference internal" href="transformations.html#transformations"><span class="std std-ref">Transformations</span></a> for
-further information. To use the MIME- transformation system, your
-column_info table has to have the three new columns &#8216;mimetype&#8217;,
-&#8216;transformation&#8217;, &#8216;transformation_options&#8217;.</p>
-<p>Starting with release 4.3.0, a new input-oriented transformation system
-has been introduced. Also, backward compatibility code used in the old
-transformations system was removed. As a result, an update to column_info
-table is necessary for previous transformations and the new input-oriented
-transformation system to work. phpMyAdmin will upgrade it automatically
-for you by analyzing your current column_info table structure.
-However, if something goes wrong with the auto-upgrade then you can
-use the SQL script found in <code class="docutils literal"><span class="pre">./sql/upgrade_column_info_4_3_0+.sql</span></code>
-to upgrade it manually.</p>
-<p>To allow the usage of this functionality:</p>
-<ul>
-<li><p class="first">set up <span class="target" id="index-23"></span><a class="reference internal" href="#cfg_Servers_pmadb"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['pmadb']</span></code></a> and the phpMyAdmin configuration storage</p>
-</li>
-<li><p class="first">put the table name in <span class="target" id="index-24"></span><a class="reference internal" href="#cfg_Servers_column_info"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['column_info']</span></code></a> (e.g.
-<code class="docutils literal"><span class="pre">pma__column_info</span></code>)</p>
-</li>
-<li><p class="first">to update your PRE-2.5.0 Column_comments table use this:  and
-remember that the Variable in <code class="file docutils literal"><span class="pre">config.inc.php</span></code> has been renamed from
-<span class="target" id="index-25"></span><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['column_comments']</span></code> to
-<span class="target" id="index-26"></span><a class="reference internal" href="#cfg_Servers_column_info"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['column_info']</span></code></a></p>
-<div class="highlight-mysql"><div class="highlight"><pre><span class="k">ALTER</span> <span class="k">TABLE</span> <span class="ss">`pma__column_comments`</span>
-<span class="k">ADD</span> <span class="ss">`mimetype`</span> <span class="kt">VARCHAR</span><span class="p">(</span> <span class="mi">255</span> <span class="p">)</span> <span class="k">NOT</span> <span class="no">NULL</span><span class="p">,</span>
-<span class="k">ADD</span> <span class="ss">`transformation`</span> <span class="kt">VARCHAR</span><span class="p">(</span> <span class="mi">255</span> <span class="p">)</span> <span class="k">NOT</span> <span class="no">NULL</span><span class="p">,</span>
-<span class="k">ADD</span> <span class="ss">`transformation_options`</span> <span class="kt">VARCHAR</span><span class="p">(</span> <span class="mi">255</span> <span class="p">)</span> <span class="k">NOT</span> <span class="no">NULL</span><span class="p">;</span>
-</pre></div>
-</div>
-</li>
-<li><p class="first">to update your PRE-4.3.0 Column_info table manually use this
-<code class="docutils literal"><span class="pre">./sql/upgrade_column_info_4_3_0+.sql</span></code> SQL script.</p>
-</li>
-</ul>
-<p>This feature can be disabled by setting the configuration to <code class="docutils literal"><span class="pre">false</span></code>.</p>
-<div class="admonition note">
-<p class="first admonition-title">Note</p>
-<p class="last">For auto-upgrade functionality to work, your
-<code class="docutils literal"><span class="pre">$cfg['Servers'][$i]['controluser']</span></code> must have ALTER privilege on
-<code class="docutils literal"><span class="pre">phpmyadmin</span></code> database. See the <a class="reference external" href="https://dev.mysql.com/doc/mysql/en/grant.html">MySQL documentation for GRANT</a> on how to
-<code class="docutils literal"><span class="pre">GRANT</span></code> privileges to a user.</p>
-</div>
-</dd></dl>
-
-<span class="target" id="history"></span><dl class="option">
-<dt id="cfg_Servers_history">
-<code class="descname">$cfg['Servers'][$i]['history']</code><a class="headerlink" href="#cfg_Servers_history" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string or false</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">''</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>Since release 2.5.0 you can store your <a class="reference internal" href="glossary.html#term-sql"><span class="xref std std-term">SQL</span></a> history, which means all
-queries you entered manually into the phpMyAdmin interface. If you don&#8217;t
-want to use a table-based history, you can use the JavaScript-based
-history.</p>
-<p>Using that, all your history items are deleted when closing the window.
-Using <span class="target" id="index-27"></span><a class="reference internal" href="#cfg_QueryHistoryMax"><code class="xref config config-option docutils literal"><span class="pre">$cfg['QueryHistoryMax']</span></code></a> you can specify an amount of
-history items you want to have on hold. On every login, this list gets cut
-to the maximum amount.</p>
-<p>The query history is only available if JavaScript is enabled in
-your browser.</p>
-<p>To allow the usage of this functionality:</p>
-<ul class="simple">
-<li>set up <span class="target" id="index-28"></span><a class="reference internal" href="#cfg_Servers_pmadb"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['pmadb']</span></code></a> and the phpMyAdmin configuration storage</li>
-<li>put the table name in <span class="target" id="index-29"></span><a class="reference internal" href="#cfg_Servers_history"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['history']</span></code></a> (e.g.
-<code class="docutils literal"><span class="pre">pma__history</span></code>)</li>
-</ul>
-<p>This feature can be disabled by setting the configuration to <code class="docutils literal"><span class="pre">false</span></code>.</p>
-</dd></dl>
-
-<span class="target" id="recent"></span><dl class="option">
-<dt id="cfg_Servers_recent">
-<code class="descname">$cfg['Servers'][$i]['recent']</code><a class="headerlink" href="#cfg_Servers_recent" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string or false</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">''</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>Since release 3.5.0 you can show recently used tables in the
-navigation panel. It helps you to jump across table directly, without
-the need to select the database, and then select the table. Using
-<span class="target" id="index-30"></span><a class="reference internal" href="#cfg_NumRecentTables"><code class="xref config config-option docutils literal"><span class="pre">$cfg['NumRecentTables']</span></code></a> you can configure the maximum number
-of recent tables shown. When you select a table from the list, it will jump to
-the page specified in <span class="target" id="index-31"></span><a class="reference internal" href="#cfg_NavigationTreeDefaultTabTable"><code class="xref config config-option docutils literal"><span class="pre">$cfg['NavigationTreeDefaultTabTable']</span></code></a>.</p>
-<p>Without configuring the storage, you can still access the recently used tables,
-but it will disappear after you logout.</p>
-<p>To allow the usage of this functionality persistently:</p>
-<ul class="simple">
-<li>set up <span class="target" id="index-32"></span><a class="reference internal" href="#cfg_Servers_pmadb"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['pmadb']</span></code></a> and the phpMyAdmin configuration storage</li>
-<li>put the table name in <span class="target" id="index-33"></span><a class="reference internal" href="#cfg_Servers_recent"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['recent']</span></code></a> (e.g.
-<code class="docutils literal"><span class="pre">pma__recent</span></code>)</li>
-</ul>
-<p>This feature can be disabled by setting the configuration to <code class="docutils literal"><span class="pre">false</span></code>.</p>
-</dd></dl>
-
-<span class="target" id="favorite"></span><dl class="option">
-<dt id="cfg_Servers_favorite">
-<code class="descname">$cfg['Servers'][$i]['favorite']</code><a class="headerlink" href="#cfg_Servers_favorite" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string or false</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">''</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>Since release 4.2.0 you can show a list of selected tables in the
-navigation panel. It helps you to jump to the table directly, without
-the need to select the database, and then select the table. When you
-select a table from the list, it will jump to the page specified in
-<span class="target" id="index-34"></span><a class="reference internal" href="#cfg_NavigationTreeDefaultTabTable"><code class="xref config config-option docutils literal"><span class="pre">$cfg['NavigationTreeDefaultTabTable']</span></code></a>.</p>
-<p>You can add tables to this list or remove tables from it in database
-structure page by clicking on the star icons next to table names. Using
-<span class="target" id="index-35"></span><a class="reference internal" href="#cfg_NumFavoriteTables"><code class="xref config config-option docutils literal"><span class="pre">$cfg['NumFavoriteTables']</span></code></a> you can configure the maximum
-number of favorite tables shown.</p>
-<p>Without configuring the storage, you can still access the favorite tables,
-but it will disappear after you logout.</p>
-<p>To allow the usage of this functionality persistently:</p>
-<ul class="simple">
-<li>set up <span class="target" id="index-36"></span><a class="reference internal" href="#cfg_Servers_pmadb"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['pmadb']</span></code></a> and the phpMyAdmin configuration storage</li>
-<li>put the table name in <span class="target" id="index-37"></span><a class="reference internal" href="#cfg_Servers_favorite"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['favorite']</span></code></a> (e.g.
-<code class="docutils literal"><span class="pre">pma__favorite</span></code>)</li>
-</ul>
-<p>This feature can be disabled by setting the configuration to <code class="docutils literal"><span class="pre">false</span></code>.</p>
-</dd></dl>
-
-<span class="target" id="table-uiprefs"></span><dl class="option">
-<dt id="cfg_Servers_table_uiprefs">
-<code class="descname">$cfg['Servers'][$i]['table_uiprefs']</code><a class="headerlink" href="#cfg_Servers_table_uiprefs" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string or false</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">''</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>Since release 3.5.0 phpMyAdmin can be configured to remember several
-things (sorted column <span class="target" id="index-38"></span><a class="reference internal" href="#cfg_RememberSorting"><code class="xref config config-option docutils literal"><span class="pre">$cfg['RememberSorting']</span></code></a>, column order,
-and column visibility from a database table) for browsing tables. Without
-configuring the storage, these features still can be used, but the values will
-disappear after you logout.</p>
-<p>To allow the usage of these functionality persistently:</p>
-<ul class="simple">
-<li>set up <span class="target" id="index-39"></span><a class="reference internal" href="#cfg_Servers_pmadb"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['pmadb']</span></code></a> and the phpMyAdmin configuration storage</li>
-<li>put the table name in <span class="target" id="index-40"></span><a class="reference internal" href="#cfg_Servers_table_uiprefs"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['table_uiprefs']</span></code></a> (e.g.
-<code class="docutils literal"><span class="pre">pma__table_uiprefs</span></code>)</li>
-</ul>
-<p>This feature can be disabled by setting the configuration to <code class="docutils literal"><span class="pre">false</span></code>.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_Servers_users">
-<code class="descname">$cfg['Servers'][$i]['users']</code><a class="headerlink" href="#cfg_Servers_users" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string or false</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">''</span></code></td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_Servers_usergroups">
-<code class="descname">$cfg['Servers'][$i]['usergroups']</code><a class="headerlink" href="#cfg_Servers_usergroups" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string or false</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">''</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>Since release 4.1.0 you can create different user groups with menu items
-attached to them. Users can be assigned to these groups and the logged in
-user would only see menu items configured to the usergroup he is assigned to.
-To do this it needs two tables &#8220;usergroups&#8221; (storing allowed menu items for each
-user group) and &#8220;users&#8221; (storing users and their assignments to user groups).</p>
-<p>To allow the usage of this functionality:</p>
-<ul class="simple">
-<li>set up <span class="target" id="index-41"></span><a class="reference internal" href="#cfg_Servers_pmadb"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['pmadb']</span></code></a> and the phpMyAdmin configuration storage</li>
-<li>put the correct table names in
-<span class="target" id="index-42"></span><a class="reference internal" href="#cfg_Servers_users"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['users']</span></code></a> (e.g. <code class="docutils literal"><span class="pre">pma__users</span></code>) and
-<span class="target" id="index-43"></span><a class="reference internal" href="#cfg_Servers_usergroups"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['usergroups']</span></code></a> (e.g. <code class="docutils literal"><span class="pre">pma__usergroups</span></code>)</li>
-</ul>
-<p>This feature can be disabled by setting either of the configurations to <code class="docutils literal"><span class="pre">false</span></code>.</p>
-<div class="admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last"><a class="reference internal" href="privileges.html#configurablemenus"><span class="std std-ref">Configurable menus and user groups</span></a></p>
-</div>
-</dd></dl>
-
-<span class="target" id="navigationhiding"></span><dl class="option">
-<dt id="cfg_Servers_navigationhiding">
-<code class="descname">$cfg['Servers'][$i]['navigationhiding']</code><a class="headerlink" href="#cfg_Servers_navigationhiding" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string or false</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">''</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>Since release 4.1.0 you can hide/show items in the navigation tree.</p>
-<p>To allow the usage of this functionality:</p>
-<ul class="simple">
-<li>set up <span class="target" id="index-44"></span><a class="reference internal" href="#cfg_Servers_pmadb"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['pmadb']</span></code></a> and the phpMyAdmin configuration storage</li>
-<li>put the table name in <span class="target" id="index-45"></span><a class="reference internal" href="#cfg_Servers_navigationhiding"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['navigationhiding']</span></code></a> (e.g.
-<code class="docutils literal"><span class="pre">pma__navigationhiding</span></code>)</li>
-</ul>
-<p>This feature can be disabled by setting the configuration to <code class="docutils literal"><span class="pre">false</span></code>.</p>
-</dd></dl>
-
-<span class="target" id="central-columns"></span><dl class="option">
-<dt id="cfg_Servers_central_columns">
-<code class="descname">$cfg['Servers'][$i]['central_columns']</code><a class="headerlink" href="#cfg_Servers_central_columns" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string or false</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">''</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>Since release 4.3.0 you can have a central list of columns per database.
-You can add/remove columns to the list as per your requirement. These columns
-in the central list will be available to use while you create a new column for
-a table or create a table itself. You can select a column from central list
-while creating a new column, it will save you from writing the same column definition
-over again or from writing different names for similar column.</p>
-<p>To allow the usage of this functionality:</p>
-<ul class="simple">
-<li>set up <span class="target" id="index-46"></span><a class="reference internal" href="#cfg_Servers_pmadb"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['pmadb']</span></code></a> and the phpMyAdmin configuration storage</li>
-<li>put the table name in <span class="target" id="index-47"></span><a class="reference internal" href="#cfg_Servers_central_columns"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['central_columns']</span></code></a> (e.g.
-<code class="docutils literal"><span class="pre">pma__central_columns</span></code>)</li>
-</ul>
-<p>This feature can be disabled by setting the configuration to <code class="docutils literal"><span class="pre">false</span></code>.</p>
-</dd></dl>
-
-<span class="target" id="designer-settings"></span><dl class="option">
-<dt id="cfg_Servers_designer_settings">
-<code class="descname">$cfg['Servers'][$i]['designer_settings']</code><a class="headerlink" href="#cfg_Servers_designer_settings" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string or false</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">''</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>Since release 4.5.0 your designer settings can be remembered.
-Your choice regarding &#8216;Angular/Direct Links&#8217;, &#8216;Snap to Grid&#8217;, &#8216;Toggle Relation Lines&#8217;,
-&#8216;Small/Big All&#8217;, &#8216;Move Menu&#8217; and &#8216;Pin Text&#8217; can be remembered persistently.</p>
-<p>To allow the usage of this functionality:</p>
-<ul class="simple">
-<li>set up <span class="target" id="index-48"></span><a class="reference internal" href="#cfg_Servers_pmadb"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['pmadb']</span></code></a> and the phpMyAdmin configuration storage</li>
-<li>put the table name in <span class="target" id="index-49"></span><a class="reference internal" href="#cfg_Servers_designer_settings"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['designer_settings']</span></code></a> (e.g.
-<code class="docutils literal"><span class="pre">pma__designer_settings</span></code>)</li>
-</ul>
-<p>This feature can be disabled by setting the configuration to <code class="docutils literal"><span class="pre">false</span></code>.</p>
-</dd></dl>
-
-<span class="target" id="savedsearches"></span><dl class="option">
-<dt id="cfg_Servers_savedsearches">
-<code class="descname">$cfg['Servers'][$i]['savedsearches']</code><a class="headerlink" href="#cfg_Servers_savedsearches" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string or false</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">''</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>Since release 4.2.0 you can save and load query-by-example searches from the Database &gt; Query panel.</p>
-<p>To allow the usage of this functionality:</p>
-<ul class="simple">
-<li>set up <span class="target" id="index-50"></span><a class="reference internal" href="#cfg_Servers_pmadb"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['pmadb']</span></code></a> and the phpMyAdmin configuration storage</li>
-<li>put the table name in <span class="target" id="index-51"></span><a class="reference internal" href="#cfg_Servers_savedsearches"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['savedsearches']</span></code></a> (e.g.
-<code class="docutils literal"><span class="pre">pma__savedsearches</span></code>)</li>
-</ul>
-<p>This feature can be disabled by setting the configuration to <code class="docutils literal"><span class="pre">false</span></code>.</p>
-</dd></dl>
-
-<span class="target" id="export-templates"></span><dl class="option">
-<dt id="cfg_Servers_export_templates">
-<code class="descname">$cfg['Servers'][$i]['export_templates']</code><a class="headerlink" href="#cfg_Servers_export_templates" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string or false</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">''</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>Since release 4.5.0 you can save and load export templates.</p>
-<p>To allow the usage of this functionality:</p>
-<ul class="simple">
-<li>set up <span class="target" id="index-52"></span><a class="reference internal" href="#cfg_Servers_pmadb"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['pmadb']</span></code></a> and the phpMyAdmin configuration storage</li>
-<li>put the table name in <span class="target" id="index-53"></span><a class="reference internal" href="#cfg_Servers_export_templates"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['export_templates']</span></code></a> (e.g.
-<code class="docutils literal"><span class="pre">pma__export_templates</span></code>)</li>
-</ul>
-<p>This feature can be disabled by setting the configuration to <code class="docutils literal"><span class="pre">false</span></code>.</p>
-</dd></dl>
-
-<span class="target" id="tracking"></span><dl class="option">
-<dt id="cfg_Servers_tracking">
-<code class="descname">$cfg['Servers'][$i]['tracking']</code><a class="headerlink" href="#cfg_Servers_tracking" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string or false</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">''</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>Since release 3.3.x a tracking mechanism is available. It helps you to
-track every <a class="reference internal" href="glossary.html#term-sql"><span class="xref std std-term">SQL</span></a> command which is
-executed by phpMyAdmin. The mechanism supports logging of data
-manipulation and data definition statements. After enabling it you can
-create versions of tables.</p>
-<p>The creation of a version has two effects:</p>
-<ul class="simple">
-<li>phpMyAdmin saves a snapshot of the table, including structure and
-indexes.</li>
-<li>phpMyAdmin logs all commands which change the structure and/or data of
-the table and links these commands with the version number.</li>
-</ul>
-<p>Of course you can view the tracked changes. On the <span class="guilabel">Tracking</span>
-page a complete report is available for every version. For the report you
-can use filters, for example you can get a list of statements within a date
-range. When you want to filter usernames you can enter * for all names or
-you enter a list of names separated by &#8216;,&#8217;. In addition you can export the
-(filtered) report to a file or to a temporary database.</p>
-<p>To allow the usage of this functionality:</p>
-<ul class="simple">
-<li>set up <span class="target" id="index-54"></span><a class="reference internal" href="#cfg_Servers_pmadb"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['pmadb']</span></code></a> and the phpMyAdmin configuration storage</li>
-<li>put the table name in <span class="target" id="index-55"></span><a class="reference internal" href="#cfg_Servers_tracking"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['tracking']</span></code></a> (e.g.
-<code class="docutils literal"><span class="pre">pma__tracking</span></code>)</li>
-</ul>
-<p>This feature can be disabled by setting the configuration to <code class="docutils literal"><span class="pre">false</span></code>.</p>
-</dd></dl>
-
-<span class="target" id="tracking2"></span><dl class="option">
-<dt id="cfg_Servers_tracking_version_auto_create">
-<code class="descname">$cfg['Servers'][$i]['tracking_version_auto_create']</code><a class="headerlink" href="#cfg_Servers_tracking_version_auto_create" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">false</td>
-</tr>
-</tbody>
-</table>
-<p>Whether the tracking mechanism creates versions for tables and views
-automatically.</p>
-<p>If this is set to true and you create a table or view with</p>
-<ul class="simple">
-<li>CREATE TABLE ...</li>
-<li>CREATE VIEW ...</li>
-</ul>
-<p>and no version exists for it, the mechanism will create a version for
-you automatically.</p>
-</dd></dl>
-
-<span class="target" id="tracking3"></span><dl class="option">
-<dt id="cfg_Servers_tracking_default_statements">
-<code class="descname">$cfg['Servers'][$i]['tracking_default_statements']</code><a class="headerlink" href="#cfg_Servers_tracking_default_statements" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">'CREATE</span> <span class="pre">TABLE,ALTER</span> <span class="pre">TABLE,DROP</span> <span class="pre">TABLE,RENAME</span> <span class="pre">TABLE,CREATE</span> <span class="pre">INDEX,DROP</span> <span class="pre">INDEX,INSERT,UPDATE,DELETE,TRUNCATE,REPLACE,CREATE</span> <span class="pre">VIEW,ALTER</span> <span class="pre">VIEW,DROP</span> <span class="pre">VIEW,CREATE</span> <span class="pre">DATABASE,ALTER</span> <span class="pre">DATABASE,DROP</span> <span class="pre">DATABASE'</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>Defines the list of statements the auto-creation uses for new
-versions.</p>
-</dd></dl>
-
-<span class="target" id="tracking4"></span><dl class="option">
-<dt id="cfg_Servers_tracking_add_drop_view">
-<code class="descname">$cfg['Servers'][$i]['tracking_add_drop_view']</code><a class="headerlink" href="#cfg_Servers_tracking_add_drop_view" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">true</td>
-</tr>
-</tbody>
-</table>
-<p>Whether a DROP VIEW IF EXISTS statement will be added as first line to
-the log when creating a view.</p>
-</dd></dl>
-
-<span class="target" id="tracking5"></span><dl class="option">
-<dt id="cfg_Servers_tracking_add_drop_table">
-<code class="descname">$cfg['Servers'][$i]['tracking_add_drop_table']</code><a class="headerlink" href="#cfg_Servers_tracking_add_drop_table" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">true</td>
-</tr>
-</tbody>
-</table>
-<p>Whether a DROP TABLE IF EXISTS statement will be added as first line
-to the log when creating a table.</p>
-</dd></dl>
-
-<span class="target" id="tracking6"></span><dl class="option">
-<dt id="cfg_Servers_tracking_add_drop_database">
-<code class="descname">$cfg['Servers'][$i]['tracking_add_drop_database']</code><a class="headerlink" href="#cfg_Servers_tracking_add_drop_database" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">true</td>
-</tr>
-</tbody>
-</table>
-<p>Whether a DROP DATABASE IF EXISTS statement will be added as first
-line to the log when creating a database.</p>
-</dd></dl>
-
-<span class="target" id="userconfig"></span><dl class="option">
-<dt id="cfg_Servers_userconfig">
-<code class="descname">$cfg['Servers'][$i]['userconfig']</code><a class="headerlink" href="#cfg_Servers_userconfig" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string or false</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">''</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>Since release 3.4.x phpMyAdmin allows users to set most preferences by
-themselves and store them in the database.</p>
-<p>If you don&#8217;t allow for storing preferences in
-<span class="target" id="index-56"></span><a class="reference internal" href="#cfg_Servers_pmadb"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['pmadb']</span></code></a>, users can still personalize
-phpMyAdmin, but settings will be saved in browser&#8217;s local storage, or, it
-is is unavailable, until the end of session.</p>
-<p>To allow the usage of this functionality:</p>
-<ul class="simple">
-<li>set up <span class="target" id="index-57"></span><a class="reference internal" href="#cfg_Servers_pmadb"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['pmadb']</span></code></a> and the phpMyAdmin configuration storage</li>
-<li>put the table name in <span class="target" id="index-58"></span><a class="reference internal" href="#cfg_Servers_userconfig"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['userconfig']</span></code></a></li>
-</ul>
-<p>This feature can be disabled by setting the configuration to <code class="docutils literal"><span class="pre">false</span></code>.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_Servers_MaxTableUiprefs">
-<code class="descname">$cfg['Servers'][$i]['MaxTableUiprefs']</code><a class="headerlink" href="#cfg_Servers_MaxTableUiprefs" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">integer</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">100</td>
-</tr>
-</tbody>
-</table>
-<p>Maximum number of rows saved in
-<span class="target" id="index-59"></span><a class="reference internal" href="#cfg_Servers_table_uiprefs"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['table_uiprefs']</span></code></a> table.</p>
-<p>When tables are dropped or renamed,
-<span class="target" id="index-60"></span><a class="reference internal" href="#cfg_Servers_table_uiprefs"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['table_uiprefs']</span></code></a> may contain invalid data
-(referring to tables which no longer exist). We only keep this number of newest
-rows in <span class="target" id="index-61"></span><a class="reference internal" href="#cfg_Servers_table_uiprefs"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['table_uiprefs']</span></code></a> and automatically
-delete older rows.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_Servers_SessionTimeZone">
-<code class="descname">$cfg['Servers'][$i]['SessionTimeZone']</code><a class="headerlink" href="#cfg_Servers_SessionTimeZone" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">''</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>Sets the time zone used by phpMyAdmin. Leave blank to use the time zone of your
-database server. Possible values are explained at
-<a class="reference external" href="https://dev.mysql.com/doc/refman/5.7/en/time-zone-support.html">https://dev.mysql.com/doc/refman/5.7/en/time-zone-support.html</a></p>
-<p>This is useful when your database server uses a time zone which is different from the
-time zone you want to use in phpMyAdmin.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_Servers_AllowRoot">
-<code class="descname">$cfg['Servers'][$i]['AllowRoot']</code><a class="headerlink" href="#cfg_Servers_AllowRoot" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">true</td>
-</tr>
-</tbody>
-</table>
-<p>Whether to allow root access. This is just a shortcut for the
-<span class="target" id="index-62"></span><a class="reference internal" href="#cfg_Servers_AllowDeny_rules"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['AllowDeny']['rules']</span></code></a> below.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_Servers_AllowNoPassword">
-<code class="descname">$cfg['Servers'][$i]['AllowNoPassword']</code><a class="headerlink" href="#cfg_Servers_AllowNoPassword" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">false</td>
-</tr>
-</tbody>
-</table>
-<p>Whether to allow logins without a password. The default value of
-<code class="docutils literal"><span class="pre">false</span></code> for this parameter prevents unintended access to a MySQL
-server with was left with an empty password for root or on which an
-anonymous (blank) user is defined.</p>
-</dd></dl>
-
-<span class="target" id="servers-allowdeny-order"></span><dl class="option">
-<dt id="cfg_Servers_AllowDeny_order">
-<code class="descname">$cfg['Servers'][$i]['AllowDeny']['order']</code><a class="headerlink" href="#cfg_Servers_AllowDeny_order" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">''</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>If your rule order is empty, then <a class="reference internal" href="glossary.html#term-ip"><span class="xref std std-term">IP</span></a>
-authorization is disabled.</p>
-<p>If your rule order is set to
-<code class="docutils literal"><span class="pre">'deny,allow'</span></code> then the system applies all deny rules followed by
-allow rules. Access is allowed by default. Any client which does not
-match a Deny command or does match an Allow command will be allowed
-access to the server.</p>
-<p>If your rule order is set to <code class="docutils literal"><span class="pre">'allow,deny'</span></code>
-then the system applies all allow rules followed by deny rules. Access
-is denied by default. Any client which does not match an Allow
-directive or does match a Deny directive will be denied access to the
-server.</p>
-<p>If your rule order is set to <code class="docutils literal"><span class="pre">'explicit'</span></code>, authorization is
-performed in a similar fashion to rule order &#8216;deny,allow&#8217;, with the
-added restriction that your host/username combination <strong>must</strong> be
-listed in the <em>allow</em> rules, and not listed in the <em>deny</em> rules. This
-is the <strong>most</strong> secure means of using Allow/Deny rules, and was
-available in Apache by specifying allow and deny rules without setting
-any order.</p>
-<p>Please also see <span class="target" id="index-63"></span><a class="reference internal" href="#cfg_TrustedProxies"><code class="xref config config-option docutils literal"><span class="pre">$cfg['TrustedProxies']</span></code></a> for
-detecting IP address behind proxies.</p>
-</dd></dl>
-
-<span class="target" id="servers-allowdeny-rules"></span><dl class="option">
-<dt id="cfg_Servers_AllowDeny_rules">
-<code class="descname">$cfg['Servers'][$i]['AllowDeny']['rules']</code><a class="headerlink" href="#cfg_Servers_AllowDeny_rules" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">array of strings</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">array()</td>
-</tr>
-</tbody>
-</table>
-<p>The general format for the rules is as such:</p>
-<div class="highlight-none"><div class="highlight"><pre>&lt;&#39;allow&#39; | &#39;deny&#39;&gt; &lt;username&gt; [from] &lt;ipmask&gt;
-</pre></div>
-</div>
-<p>If you wish to match all users, it is possible to use a <code class="docutils literal"><span class="pre">'%'</span></code> as a
-wildcard in the <em>username</em> field.</p>
-<p>There are a few shortcuts you can
-use in the <em>ipmask</em> field as well (please note that those containing
-SERVER_ADDRESS might not be available on all webservers):</p>
-<div class="highlight-none"><div class="highlight"><pre>&#39;all&#39; -&gt; 0.0.0.0/0
-&#39;localhost&#39; -&gt; 127.0.0.1/8
-&#39;localnetA&#39; -&gt; SERVER_ADDRESS/8
-&#39;localnetB&#39; -&gt; SERVER_ADDRESS/16
-&#39;localnetC&#39; -&gt; SERVER_ADDRESS/24
-</pre></div>
-</div>
-<p>Having an empty rule list is equivalent to either using <code class="docutils literal"><span class="pre">'allow</span> <span class="pre">%</span>
-<span class="pre">from</span> <span class="pre">all'</span></code> if your rule order is set to <code class="docutils literal"><span class="pre">'deny,allow'</span></code> or <code class="docutils literal"><span class="pre">'deny</span> <span class="pre">%</span>
-<span class="pre">from</span> <span class="pre">all'</span></code> if your rule order is set to <code class="docutils literal"><span class="pre">'allow,deny'</span></code> or
-<code class="docutils literal"><span class="pre">'explicit'</span></code>.</p>
-<p>For the <a class="reference internal" href="glossary.html#term-ip-address"><span class="xref std std-term">IP address</span></a> matching
-system, the following work:</p>
-<ul class="simple">
-<li><code class="docutils literal"><span class="pre">xxx.xxx.xxx.xxx</span></code> (an exact <a class="reference internal" href="glossary.html#term-ip-address"><span class="xref std std-term">IP address</span></a>)</li>
-<li><code class="docutils literal"><span class="pre">xxx.xxx.xxx.[yyy-zzz]</span></code> (an <a class="reference internal" href="glossary.html#term-ip-address"><span class="xref std std-term">IP address</span></a> range)</li>
-<li><code class="docutils literal"><span class="pre">xxx.xxx.xxx.xxx/nn</span></code> (CIDR, Classless Inter-Domain Routing type <a class="reference internal" href="glossary.html#term-ip"><span class="xref std std-term">IP</span></a> addresses)</li>
-</ul>
-<p>But the following does not work:</p>
-<ul class="simple">
-<li><code class="docutils literal"><span class="pre">xxx.xxx.xxx.xx[yyy-zzz]</span></code> (partial <a class="reference internal" href="glossary.html#term-ip"><span class="xref std std-term">IP</span></a> address range)</li>
-</ul>
-<p>For <a class="reference internal" href="glossary.html#term-ipv6"><span class="xref std std-term">IPv6</span></a> addresses, the following work:</p>
-<ul class="simple">
-<li><code class="docutils literal"><span class="pre">xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx</span></code> (an exact <a class="reference internal" href="glossary.html#term-ipv6"><span class="xref std std-term">IPv6</span></a> address)</li>
-<li><code class="docutils literal"><span class="pre">xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:[yyyy-zzzz]</span></code> (an <a class="reference internal" href="glossary.html#term-ipv6"><span class="xref std std-term">IPv6</span></a> address range)</li>
-<li><code class="docutils literal"><span class="pre">xxxx:xxxx:xxxx:xxxx/nn</span></code> (CIDR, Classless Inter-Domain Routing type <a class="reference internal" href="glossary.html#term-ipv6"><span class="xref std std-term">IPv6</span></a> addresses)</li>
-</ul>
-<p>But the following does not work:</p>
-<ul class="simple">
-<li><code class="docutils literal"><span class="pre">xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xx[yyy-zzz]</span></code> (partial <a class="reference internal" href="glossary.html#term-ipv6"><span class="xref std std-term">IPv6</span></a> address range)</li>
-</ul>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_Servers_DisableIS">
-<code class="descname">$cfg['Servers'][$i]['DisableIS']</code><a class="headerlink" href="#cfg_Servers_DisableIS" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">false</td>
-</tr>
-</tbody>
-</table>
-<p>Disable using <code class="docutils literal"><span class="pre">INFORMATION_SCHEMA</span></code> to retrieve information (use
-<code class="docutils literal"><span class="pre">SHOW</span></code> commands instead), because of speed issues when many
-databases are present. Currently used in some parts of the code, more
-to come.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_Servers_SignonScript">
-<code class="descname">$cfg['Servers'][$i]['SignonScript']</code><a class="headerlink" href="#cfg_Servers_SignonScript" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">''</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>Name of PHP script to be sourced and executed to obtain login
-credentials. This is alternative approach to session based single
-signon. The script has to provide a function called
-<code class="docutils literal"><span class="pre">get_login_credentials</span></code> which returns list of username and
-password, accepting single parameter of existing username (can be
-empty). See <code class="file docutils literal"><span class="pre">examples/signon-script.php</span></code> for an example:</p>
-<div class="highlight-php"><div class="highlight"><pre><span class="o">&lt;?</span><span class="nx">php</span>
-<span class="cm">/* vim: set expandtab sw=4 ts=4 sts=4: */</span>
-<span class="sd">/**</span>
-<span class="sd"> * Single signon for phpMyAdmin</span>
-<span class="sd"> *</span>
-<span class="sd"> * This is just example how to use script based single signon with</span>
-<span class="sd"> * phpMyAdmin, it is not intended to be perfect code and look, only</span>
-<span class="sd"> * shows how you can integrate this functionality in your application.</span>
-<span class="sd"> *</span>
-<span class="sd"> * @package    PhpMyAdmin</span>
-<span class="sd"> * @subpackage Example</span>
-<span class="sd"> */</span>
-
-
-<span class="sd">/**</span>
-<span class="sd"> * This function returns username and password.</span>
-<span class="sd"> *</span>
-<span class="sd"> * It can optionally use configured username as parameter.</span>
-<span class="sd"> *</span>
-<span class="sd"> * @param string $user User name</span>
-<span class="sd"> *</span>
-<span class="sd"> * @return array</span>
-<span class="sd"> */</span>
-<span class="k">function</span> <span class="nf">get_login_credentials</span><span class="p">(</span><span class="nv">$user</span><span class="p">)</span>
-<span class="p">{</span>
-    <span class="cm">/* Optionally we can use passed username */</span>
-    <span class="k">if</span> <span class="p">(</span><span class="o">!</span><span class="k">empty</span><span class="p">(</span><span class="nv">$user</span><span class="p">))</span> <span class="p">{</span>
-        <span class="k">return</span> <span class="k">array</span><span class="p">(</span><span class="nv">$user</span><span class="p">,</span> <span class="s1">&#39;password&#39;</span><span class="p">);</span>
-    <span class="p">}</span>
-
-    <span class="cm">/* Here we would retrieve the credentials */</span>
-    <span class="nv">$credentials</span> <span class="o">=</span> <span class="k">array</span><span class="p">(</span><span class="s1">&#39;root&#39;</span><span class="p">,</span> <span class="s1">&#39;&#39;</span><span class="p">);</span>
-
-    <span class="k">return</span> <span class="nv">$credentials</span><span class="p">;</span>
-<span class="p">}</span>
-</pre></div>
-</div>
-<div class="admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last"><a class="reference internal" href="setup.html#auth-signon"><span class="std std-ref">Signon authentication mode</span></a></p>
-</div>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_Servers_SignonSession">
-<code class="descname">$cfg['Servers'][$i]['SignonSession']</code><a class="headerlink" href="#cfg_Servers_SignonSession" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">''</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>Name of session which will be used for signon authentication method.
-You should use something different than <code class="docutils literal"><span class="pre">phpMyAdmin</span></code>, because this
-is session which phpMyAdmin uses internally. Takes effect only if
-<span class="target" id="index-64"></span><a class="reference internal" href="#cfg_Servers_SignonScript"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['SignonScript']</span></code></a> is not configured.</p>
-<div class="admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last"><a class="reference internal" href="setup.html#auth-signon"><span class="std std-ref">Signon authentication mode</span></a></p>
-</div>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_Servers_SignonURL">
-<code class="descname">$cfg['Servers'][$i]['SignonURL']</code><a class="headerlink" href="#cfg_Servers_SignonURL" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">''</span></code></td>
-</tr>
-</tbody>
-</table>
-<p><a class="reference internal" href="glossary.html#term-url"><span class="xref std std-term">URL</span></a> where user will be redirected
-to log in for signon authentication method. Should be absolute
-including protocol.</p>
-<div class="admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last"><a class="reference internal" href="setup.html#auth-signon"><span class="std std-ref">Signon authentication mode</span></a></p>
-</div>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_Servers_LogoutURL">
-<code class="descname">$cfg['Servers'][$i]['LogoutURL']</code><a class="headerlink" href="#cfg_Servers_LogoutURL" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">''</span></code></td>
-</tr>
-</tbody>
-</table>
-<p><a class="reference internal" href="glossary.html#term-url"><span class="xref std std-term">URL</span></a> where user will be redirected
-after logout (doesn&#8217;t affect config authentication method). Should be
-absolute including protocol.</p>
-</dd></dl>
-
-</div>
-<div class="section" id="generic-settings">
-<h2>Generic settings<a class="headerlink" href="#generic-settings" title="Permalink to this headline">¶</a></h2>
-<dl class="option">
-<dt id="cfg_ServerDefault">
-<code class="descname">$cfg['ServerDefault']</code><a class="headerlink" href="#cfg_ServerDefault" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">integer</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">1</td>
-</tr>
-</tbody>
-</table>
-<p>If you have more than one server configured, you can set
-<span class="target" id="index-65"></span><a class="reference internal" href="#cfg_ServerDefault"><code class="xref config config-option docutils literal"><span class="pre">$cfg['ServerDefault']</span></code></a> to any one of them to autoconnect to that
-server when phpMyAdmin is started, or set it to 0 to be given a list
-of servers without logging in.</p>
-<p>If you have only one server configured,
-<span class="target" id="index-66"></span><a class="reference internal" href="#cfg_ServerDefault"><code class="xref config config-option docutils literal"><span class="pre">$cfg['ServerDefault']</span></code></a> MUST be set to that server.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_VersionCheck">
-<code class="descname">$cfg['VersionCheck']</code><a class="headerlink" href="#cfg_VersionCheck" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">true</td>
-</tr>
-</tbody>
-</table>
-<p>Enables check for latest versions using JavaScript on the main phpMyAdmin
-page or by directly accessing <code class="file docutils literal"><span class="pre">version_check.php</span></code>.</p>
-<div class="admonition note">
-<p class="first admonition-title">Note</p>
-<p class="last">This setting can be adjusted by your vendor.</p>
-</div>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_ProxyUrl">
-<code class="descname">$cfg['ProxyUrl']</code><a class="headerlink" href="#cfg_ProxyUrl" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">&#8220;&#8221;</td>
-</tr>
-</tbody>
-</table>
-<p>The url of the proxy to be used when phpmyadmin needs to access the outside
-internet such as when retrieving the latest version info or submitting error
-reports.  You need this if the server where phpMyAdmin is installed does not
-have direct access to the internet.
-The format is: &#8220;hostname:portnumber&#8221;</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_ProxyUser">
-<code class="descname">$cfg['ProxyUser']</code><a class="headerlink" href="#cfg_ProxyUser" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">&#8220;&#8221;</td>
-</tr>
-</tbody>
-</table>
-<p>The username for authenticating with the proxy. By default, no
-authentication is performed. If a username is supplied, Basic
-Authentication will be performed. No other types of authentication
-are currently supported.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_ProxyPass">
-<code class="descname">$cfg['ProxyPass']</code><a class="headerlink" href="#cfg_ProxyPass" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">&#8220;&#8221;</td>
-</tr>
-</tbody>
-</table>
-<p>The password for authenticating with the proxy.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_MaxDbList">
-<code class="descname">$cfg['MaxDbList']</code><a class="headerlink" href="#cfg_MaxDbList" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">integer</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">100</td>
-</tr>
-</tbody>
-</table>
-<p>The maximum number of database names to be displayed in the main panel&#8217;s
-database list.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_MaxTableList">
-<code class="descname">$cfg['MaxTableList']</code><a class="headerlink" href="#cfg_MaxTableList" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">integer</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">250</td>
-</tr>
-</tbody>
-</table>
-<p>The maximum number of table names to be displayed in the main panel&#8217;s
-list (except on the Export page).</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_ShowHint">
-<code class="descname">$cfg['ShowHint']</code><a class="headerlink" href="#cfg_ShowHint" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">true</td>
-</tr>
-</tbody>
-</table>
-<p>Whether or not to show hints (for example, hints when hovering over
-table headers).</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_MaxCharactersInDisplayedSQL">
-<code class="descname">$cfg['MaxCharactersInDisplayedSQL']</code><a class="headerlink" href="#cfg_MaxCharactersInDisplayedSQL" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">integer</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">1000</td>
-</tr>
-</tbody>
-</table>
-<p>The maximum number of characters when a <a class="reference internal" href="glossary.html#term-sql"><span class="xref std std-term">SQL</span></a> query is displayed. The
-default limit of 1000 should be correct to avoid the display of tons of
-hexadecimal codes that represent BLOBs, but some users have real
-<a class="reference internal" href="glossary.html#term-sql"><span class="xref std std-term">SQL</span></a> queries that are longer than 1000 characters. Also, if a
-query&#8217;s length exceeds this limit, this query is not saved in the history.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_PersistentConnections">
-<code class="descname">$cfg['PersistentConnections']</code><a class="headerlink" href="#cfg_PersistentConnections" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">false</td>
-</tr>
-</tbody>
-</table>
-<p>Whether <a class="reference external" href="https://php.net/manual/en/features.persistent-connections.php">persistent connections</a> should be used or not. Works with
-following extensions:</p>
-<ul class="simple">
-<li>mysql (<a class="reference external" href="https://php.net/manual/en/function.mysql-pconnect.php">mysql_pconnect</a>),</li>
-<li>mysqli (requires PHP 5.3.0 or newer, <a class="reference external" href="https://php.net/manual/en/mysqli.persistconns.php">more information</a>).</li>
-</ul>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_ForceSSL">
-<code class="descname">$cfg['ForceSSL']</code><a class="headerlink" href="#cfg_ForceSSL" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">false</td>
-</tr>
-</tbody>
-</table>
-<div class="deprecated">
-<p><span class="versionmodified">Deprecated since version 4.6.0: </span>This setting is no longer available since phpMyAdmin 4.6.0. Please
-adjust your webserver instead.</p>
-</div>
-<p>Whether to force using https while accessing phpMyAdmin. In a reverse
-proxy setup, setting this to <code class="docutils literal"><span class="pre">true</span></code> is not supported.</p>
-<div class="admonition note">
-<p class="first admonition-title">Note</p>
-<p class="last">In some setups (like separate SSL proxy or load balancer) you might
-have to set <span class="target" id="index-67"></span><a class="reference internal" href="#cfg_PmaAbsoluteUri"><code class="xref config config-option docutils literal"><span class="pre">$cfg['PmaAbsoluteUri']</span></code></a> for correct
-redirection.</p>
-</div>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_ExecTimeLimit">
-<code class="descname">$cfg['ExecTimeLimit']</code><a class="headerlink" href="#cfg_ExecTimeLimit" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">integer [number of seconds]</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">300</td>
-</tr>
-</tbody>
-</table>
-<p>Set the number of seconds a script is allowed to run. If seconds is
-set to zero, no time limit is imposed. This setting is used while
-importing/exporting dump files but has
-no effect when PHP is running in safe mode.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_SessionSavePath">
-<code class="descname">$cfg['SessionSavePath']</code><a class="headerlink" href="#cfg_SessionSavePath" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">''</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>Path for storing session data (<a class="reference external" href="https://php.net/session_save_path">session_save_path PHP parameter</a>).</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_MemoryLimit">
-<code class="descname">$cfg['MemoryLimit']</code><a class="headerlink" href="#cfg_MemoryLimit" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string [number of bytes]</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">'-1'</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>Set the number of bytes a script is allowed to allocate. If set to
-<code class="docutils literal"><span class="pre">'-1'</span></code>, no limit is imposed. If set to <code class="docutils literal"><span class="pre">'0'</span></code>, no change of the
-memory limit is attempted and the <code class="file docutils literal"><span class="pre">php.ini</span></code> <code class="docutils literal"><span class="pre">memory_limit</span></code> is
-used.</p>
-<p>This setting is used while importing/exporting dump files
-so you definitely don&#8217;t want to put here a too low
-value. It has no effect when PHP is running in safe mode.</p>
-<p>You can also use any string as in <code class="file docutils literal"><span class="pre">php.ini</span></code>, eg. &#8216;16M&#8217;. Ensure you
-don&#8217;t omit the suffix (16 means 16 bytes!)</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_SkipLockedTables">
-<code class="descname">$cfg['SkipLockedTables']</code><a class="headerlink" href="#cfg_SkipLockedTables" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">false</td>
-</tr>
-</tbody>
-</table>
-<p>Mark used tables and make it possible to show databases with locked
-tables (since MySQL 3.23.30).</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_ShowSQL">
-<code class="descname">$cfg['ShowSQL']</code><a class="headerlink" href="#cfg_ShowSQL" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">true</td>
-</tr>
-</tbody>
-</table>
-<p>Defines whether <a class="reference internal" href="glossary.html#term-sql"><span class="xref std std-term">SQL</span></a> queries
-generated by phpMyAdmin should be displayed or not.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_RetainQueryBox">
-<code class="descname">$cfg['RetainQueryBox']</code><a class="headerlink" href="#cfg_RetainQueryBox" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">false</td>
-</tr>
-</tbody>
-</table>
-<p>Defines whether the <a class="reference internal" href="glossary.html#term-sql"><span class="xref std std-term">SQL</span></a> query box
-should be kept displayed after its submission.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_CodemirrorEnable">
-<code class="descname">$cfg['CodemirrorEnable']</code><a class="headerlink" href="#cfg_CodemirrorEnable" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">true</td>
-</tr>
-</tbody>
-</table>
-<p>Defines whether to use a Javascript code editor for SQL query boxes.
-CodeMirror provides syntax highlighting and line numbers.  However,
-middle-clicking for pasting the clipboard contents in some Linux
-distributions (such as Ubuntu) is not supported by all browsers.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_DefaultForeignKeyChecks">
-<code class="descname">$cfg['DefaultForeignKeyChecks']</code><a class="headerlink" href="#cfg_DefaultForeignKeyChecks" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">'default'</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>Default value of the checkbox for foreign key checks, to disable/enable
-foreign key checks for certain queries. The possible values are <code class="docutils literal"><span class="pre">'default'</span></code>,
-<code class="docutils literal"><span class="pre">'enable'</span></code> or <code class="docutils literal"><span class="pre">'disable'</span></code>. If set to <code class="docutils literal"><span class="pre">'default'</span></code>, the value of the
-MySQL variable <code class="docutils literal"><span class="pre">FOREIGN_KEY_CHECKS</span></code> is used.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_AllowUserDropDatabase">
-<code class="descname">$cfg['AllowUserDropDatabase']</code><a class="headerlink" href="#cfg_AllowUserDropDatabase" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">false</td>
-</tr>
-</tbody>
-</table>
-<div class="admonition warning">
-<p class="first admonition-title">Warning</p>
-<p class="last">This is not a security measure as there will be always ways to
-circumvent this. If you want to prohibit users from dropping databases,
-revoke their corresponding DROP privilege.</p>
-</div>
-<p>Defines whether normal users (non-administrator) are allowed to delete
-their own database or not. If set as false, the link <span class="guilabel">Drop
-Database</span> will not be shown, and even a <code class="docutils literal"><span class="pre">DROP</span> <span class="pre">DATABASE</span> <span class="pre">mydatabase</span></code> will
-be rejected. Quite practical for <a class="reference internal" href="glossary.html#term-isp"><span class="xref std std-term">ISP</span></a> &#8216;s with many customers.</p>
-<p>This limitation of <a class="reference internal" href="glossary.html#term-sql"><span class="xref std std-term">SQL</span></a> queries is not as strict as when using MySQL
-privileges. This is due to nature of <a class="reference internal" href="glossary.html#term-sql"><span class="xref std std-term">SQL</span></a> queries which might be
-quite complicated.  So this choice should be viewed as help to avoid
-accidental dropping rather than strict privilege limitation.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_Confirm">
-<code class="descname">$cfg['Confirm']</code><a class="headerlink" href="#cfg_Confirm" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">true</td>
-</tr>
-</tbody>
-</table>
-<p>Whether a warning (&#8220;Are your really sure...&#8221;) should be displayed when
-you&#8217;re about to lose data.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_UseDbSearch">
-<code class="descname">$cfg['UseDbSearch']</code><a class="headerlink" href="#cfg_UseDbSearch" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">true</td>
-</tr>
-</tbody>
-</table>
-<p>Define whether the &#8220;search string inside database&#8221; is enabled or not.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_IgnoreMultiSubmitErrors">
-<code class="descname">$cfg['IgnoreMultiSubmitErrors']</code><a class="headerlink" href="#cfg_IgnoreMultiSubmitErrors" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">false</td>
-</tr>
-</tbody>
-</table>
-<p>Define whether phpMyAdmin will continue executing a multi-query
-statement if one of the queries fails. Default is to abort execution.</p>
-</dd></dl>
-
-</div>
-<div class="section" id="cookie-authentication-options">
-<h2>Cookie authentication options<a class="headerlink" href="#cookie-authentication-options" title="Permalink to this headline">¶</a></h2>
-<dl class="option">
-<dt id="cfg_blowfish_secret">
-<code class="descname">$cfg['blowfish_secret']</code><a class="headerlink" href="#cfg_blowfish_secret" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">''</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>The &#8220;cookie&#8221; auth_type uses AES algorithm to encrypt the password. If you
-are using the &#8220;cookie&#8221; auth_type, enter here a random passphrase of your
-choice. It will be used internally by the AES algorithm: you won’t be
-prompted for this passphrase.</p>
-<p>The secret should be 32 characters long. Using shorter will lead to weaker security
-of encrypted cookies, using longer will cause no harm.</p>
-<div class="admonition note">
-<p class="first admonition-title">Note</p>
-<p class="last">The configuration is called blowfish_secret for historical reasons as
-Blowfish algorithm was originally used to do the encryption.</p>
-</div>
-<div class="versionchanged">
-<p><span class="versionmodified">Changed in version 3.1.0: </span>Since version 3.1.0 phpMyAdmin can generate this on the fly, but it
-makes a bit weaker security as this generated secret is stored in
-session and furthermore it makes impossible to recall user name from
-cookie.</p>
-</div>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_LoginCookieRecall">
-<code class="descname">$cfg['LoginCookieRecall']</code><a class="headerlink" href="#cfg_LoginCookieRecall" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">true</td>
-</tr>
-</tbody>
-</table>
-<p>Define whether the previous login should be recalled or not in cookie
-authentication mode.</p>
-<p>This is automatically disabled if you do not have
-configured <span class="target" id="index-68"></span><a class="reference internal" href="#cfg_blowfish_secret"><code class="xref config config-option docutils literal"><span class="pre">$cfg['blowfish_secret']</span></code></a>.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_LoginCookieValidity">
-<code class="descname">$cfg['LoginCookieValidity']</code><a class="headerlink" href="#cfg_LoginCookieValidity" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">integer [number of seconds]</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">1440</td>
-</tr>
-</tbody>
-</table>
-<p>Define how long a login cookie is valid. Please note that php
-configuration option <a class="reference external" href="https://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime">session.gc_maxlifetime</a> might limit session validity and if the session is lost,
-the login cookie is also invalidated. So it is a good idea to set
-<code class="docutils literal"><span class="pre">session.gc_maxlifetime</span></code> at least to the same value of
-<span class="target" id="index-69"></span><a class="reference internal" href="#cfg_LoginCookieValidity"><code class="xref config config-option docutils literal"><span class="pre">$cfg['LoginCookieValidity']</span></code></a>.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_LoginCookieStore">
-<code class="descname">$cfg['LoginCookieStore']</code><a class="headerlink" href="#cfg_LoginCookieStore" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">integer [number of seconds]</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">0</td>
-</tr>
-</tbody>
-</table>
-<p>Define how long login cookie should be stored in browser. Default 0
-means that it will be kept for existing session. This is recommended
-for not trusted environments.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_LoginCookieDeleteAll">
-<code class="descname">$cfg['LoginCookieDeleteAll']</code><a class="headerlink" href="#cfg_LoginCookieDeleteAll" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">true</td>
-</tr>
-</tbody>
-</table>
-<p>If enabled (default), logout deletes cookies for all servers,
-otherwise only for current one. Setting this to false makes it easy to
-forget to log out from other server, when you are using more of them.</p>
-</dd></dl>
-
-<span class="target" id="allowarbitraryserver"></span><dl class="option">
-<dt id="cfg_AllowArbitraryServer">
-<code class="descname">$cfg['AllowArbitraryServer']</code><a class="headerlink" href="#cfg_AllowArbitraryServer" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">false</td>
-</tr>
-</tbody>
-</table>
-<p>If enabled, allows you to log in to arbitrary servers using cookie
-authentication.</p>
-<div class="admonition note">
-<p class="first admonition-title">Note</p>
-<p class="last">Please use this carefully, as this may allow users access to MySQL servers
-behind the firewall where your <a class="reference internal" href="glossary.html#term-http"><span class="xref std std-term">HTTP</span></a> server is placed.
-See also <span class="target" id="index-70"></span><a class="reference internal" href="#cfg_ArbitraryServerRegexp"><code class="xref config config-option docutils literal"><span class="pre">$cfg['ArbitraryServerRegexp']</span></code></a>.</p>
-</div>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_ArbitraryServerRegexp">
-<code class="descname">$cfg['ArbitraryServerRegexp']</code><a class="headerlink" href="#cfg_ArbitraryServerRegexp" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">''</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>Restricts the MySQL servers to which the user can log in when
-<span class="target" id="index-71"></span><a class="reference internal" href="#cfg_AllowArbitraryServer"><code class="xref config config-option docutils literal"><span class="pre">$cfg['AllowArbitraryServer']</span></code></a> is enabled by
-matching the <a class="reference internal" href="glossary.html#term-ip"><span class="xref std std-term">IP</span></a> or the hostname of the MySQL server
-to the given regular expression. The regular expression must be enclosed
-with a delimiter character.</p>
-<p>It is recommended to include start and end symbols in the regullar
-expression, so that you can avoid partial matches on the string.</p>
-<p><strong>Examples:</strong></p>
-<div class="highlight-php"><div class="highlight"><pre><span class="c1">// Allow connection to three listed servers:</span>
-<span class="nv">$cfg</span><span class="p">[</span><span class="s1">&#39;ArbitraryServerRegexp&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="s1">&#39;/^(server|another|yetdifferent)$/&#39;</span><span class="p">;</span>
-
-<span class="c1">// Allow connection to range of IP addresses:</span>
-<span class="nv">$cfg</span><span class="p">[</span><span class="s1">&#39;ArbitraryServerRegexp&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="s1">&#39;@^192\.168\.0\.[0-9]{1,}$@&#39;</span><span class="p">;</span>
-
-<span class="c1">// Allow connection to server name ending with -mysql:</span>
-<span class="nv">$cfg</span><span class="p">[</span><span class="s1">&#39;ArbitraryServerRegexp&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="s1">&#39;@^[^:]\-mysql$@&#39;</span><span class="p">;</span>
-</pre></div>
-</div>
-<div class="admonition note">
-<p class="first admonition-title">Note</p>
-<p class="last">The whole server name is matched, it can include port as well. Due to
-way MySQL is permissive in connection parameters, it is possible to use
-connection strings as <code class="docutils literal"><span class="pre">`server:3306-mysql`</span></code>. This can be used to
-bypass regullar expression by the suffix, while connecting to another
-server.</p>
-</div>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_CaptchaLoginPublicKey">
-<code class="descname">$cfg['CaptchaLoginPublicKey']</code><a class="headerlink" href="#cfg_CaptchaLoginPublicKey" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">''</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>The public key for the reCaptcha service that can be obtained from
-<a class="reference external" href="https://www.google.com/recaptcha">https://www.google.com/recaptcha</a>.</p>
-<p>reCaptcha will be then used in <a class="reference internal" href="setup.html#cookie"><span class="std std-ref">Cookie authentication mode</span></a>.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_CaptchaLoginPrivateKey">
-<code class="descname">$cfg['CaptchaLoginPrivateKey']</code><a class="headerlink" href="#cfg_CaptchaLoginPrivateKey" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">''</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>The private key for the reCaptcha service that can be obtain from
-<a class="reference external" href="https://www.google.com/recaptcha">https://www.google.com/recaptcha</a>.</p>
-<p>reCaptcha will be then used in <a class="reference internal" href="setup.html#cookie"><span class="std std-ref">Cookie authentication mode</span></a>.</p>
-</dd></dl>
-
-</div>
-<div class="section" id="navigation-panel-setup">
-<h2>Navigation panel setup<a class="headerlink" href="#navigation-panel-setup" title="Permalink to this headline">¶</a></h2>
-<dl class="option">
-<dt id="cfg_ShowDatabasesNavigationAsTree">
-<code class="descname">$cfg['ShowDatabasesNavigationAsTree']</code><a class="headerlink" href="#cfg_ShowDatabasesNavigationAsTree" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">true</td>
-</tr>
-</tbody>
-</table>
-<p>In the navigation panel, replaces the database tree with a selector</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_FirstLevelNavigationItems">
-<code class="descname">$cfg['FirstLevelNavigationItems']</code><a class="headerlink" href="#cfg_FirstLevelNavigationItems" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">integer</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">100</td>
-</tr>
-</tbody>
-</table>
-<p>The number of first level databases that can be displayed on each page
-of navigation tree.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_MaxNavigationItems">
-<code class="descname">$cfg['MaxNavigationItems']</code><a class="headerlink" href="#cfg_MaxNavigationItems" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">integer</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">50</td>
-</tr>
-</tbody>
-</table>
-<p>The number of items (tables, columns, indexes) that can be displayed on each
-page of the navigation tree.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_NavigationTreeEnableGrouping">
-<code class="descname">$cfg['NavigationTreeEnableGrouping']</code><a class="headerlink" href="#cfg_NavigationTreeEnableGrouping" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">true</td>
-</tr>
-</tbody>
-</table>
-<p>Defines whether to group the databases based on a common prefix
-in their name <span class="target" id="index-72"></span><a class="reference internal" href="#cfg_NavigationTreeDbSeparator"><code class="xref config config-option docutils literal"><span class="pre">$cfg['NavigationTreeDbSeparator']</span></code></a>.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_NavigationTreeDbSeparator">
-<code class="descname">$cfg['NavigationTreeDbSeparator']</code><a class="headerlink" href="#cfg_NavigationTreeDbSeparator" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">'_'</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>The string used to separate the parts of the database name when
-showing them in a tree.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_NavigationTreeTableSeparator">
-<code class="descname">$cfg['NavigationTreeTableSeparator']</code><a class="headerlink" href="#cfg_NavigationTreeTableSeparator" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string or array</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">'__'</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>Defines a string to be used to nest table spaces. This means if you have
-tables like <code class="docutils literal"><span class="pre">first__second__third</span></code> this will be shown as a three-level
-hierarchy like: first &gt; second &gt; third.  If set to false or empty, the
-feature is disabled. NOTE: You should not use this separator at the
-beginning or end of a table name or multiple times after another without
-any other characters in between.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_NavigationTreeTableLevel">
-<code class="descname">$cfg['NavigationTreeTableLevel']</code><a class="headerlink" href="#cfg_NavigationTreeTableLevel" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">integer</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">1</td>
-</tr>
-</tbody>
-</table>
-<p>Defines how many sublevels should be displayed when splitting up
-tables by the above separator.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_NumRecentTables">
-<code class="descname">$cfg['NumRecentTables']</code><a class="headerlink" href="#cfg_NumRecentTables" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">integer</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">10</td>
-</tr>
-</tbody>
-</table>
-<p>The maximum number of recently used tables shown in the navigation
-panel. Set this to 0 (zero) to disable the listing of recent tables.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_NumFavoriteTables">
-<code class="descname">$cfg['NumFavoriteTables']</code><a class="headerlink" href="#cfg_NumFavoriteTables" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">integer</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">10</td>
-</tr>
-</tbody>
-</table>
-<p>The maximum number of favorite tables shown in the navigation
-panel. Set this to 0 (zero) to disable the listing of favorite tables.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_ZeroConf">
-<code class="descname">$cfg['ZeroConf']</code><a class="headerlink" href="#cfg_ZeroConf" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">true</td>
-</tr>
-</tbody>
-</table>
-<p>Enables Zero Configuration mode in which the user will be offered a choice to
-create phpMyAdmin configuration storage in the current database
-or use the existing one, if already present.</p>
-<p>This setting has no effect if the phpMyAdmin configuration storage database
-is properly created and the related configuration directives (such as
-<span class="target" id="index-73"></span><a class="reference internal" href="#cfg_Servers_pmadb"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['pmadb']</span></code></a> and so on) are configured.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_NavigationLinkWithMainPanel">
-<code class="descname">$cfg['NavigationLinkWithMainPanel']</code><a class="headerlink" href="#cfg_NavigationLinkWithMainPanel" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">true</td>
-</tr>
-</tbody>
-</table>
-<p>Defines whether or not to link with main panel by highlighting
-the current database or table.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_NavigationDisplayLogo">
-<code class="descname">$cfg['NavigationDisplayLogo']</code><a class="headerlink" href="#cfg_NavigationDisplayLogo" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">true</td>
-</tr>
-</tbody>
-</table>
-<p>Defines whether or not to display the phpMyAdmin logo at the top of
-the navigation panel.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_NavigationLogoLink">
-<code class="descname">$cfg['NavigationLogoLink']</code><a class="headerlink" href="#cfg_NavigationLogoLink" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">'index.php'</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>Enter <a class="reference internal" href="glossary.html#term-url"><span class="xref std std-term">URL</span></a> where logo in the navigation panel will point to.
-For use especially with self made theme which changes this.
-For external URLs, you should include URL scheme as well.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_NavigationLogoLinkWindow">
-<code class="descname">$cfg['NavigationLogoLinkWindow']</code><a class="headerlink" href="#cfg_NavigationLogoLinkWindow" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">'main'</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>Whether to open the linked page in the main window (<code class="docutils literal"><span class="pre">main</span></code>) or in a
-new one (<code class="docutils literal"><span class="pre">new</span></code>). Note: use <code class="docutils literal"><span class="pre">new</span></code> if you are linking to
-<code class="docutils literal"><span class="pre">phpmyadmin.net</span></code>.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_NavigationTreeDisplayItemFilterMinimum">
-<code class="descname">$cfg['NavigationTreeDisplayItemFilterMinimum']</code><a class="headerlink" href="#cfg_NavigationTreeDisplayItemFilterMinimum" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">integer</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">30</td>
-</tr>
-</tbody>
-</table>
-<p>Defines the minimum number of items (tables, views, routines and
-events) to display a JavaScript filter box above the list of items in
-the navigation tree.</p>
-<p>To disable the filter completely some high number can be used (e.g. 9999)</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_NavigationTreeDisplayDbFilterMinimum">
-<code class="descname">$cfg['NavigationTreeDisplayDbFilterMinimum']</code><a class="headerlink" href="#cfg_NavigationTreeDisplayDbFilterMinimum" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">integer</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">30</td>
-</tr>
-</tbody>
-</table>
-<p>Defines the minimum number of databases to display a JavaScript filter
-box above the list of databases in the navigation tree.</p>
-<p>To disable the filter completely some high number can be used
-(e.g. 9999)</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_NavigationDisplayServers">
-<code class="descname">$cfg['NavigationDisplayServers']</code><a class="headerlink" href="#cfg_NavigationDisplayServers" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">true</td>
-</tr>
-</tbody>
-</table>
-<p>Defines whether or not to display a server choice at the top of the
-navigation panel.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_DisplayServersList">
-<code class="descname">$cfg['DisplayServersList']</code><a class="headerlink" href="#cfg_DisplayServersList" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">false</td>
-</tr>
-</tbody>
-</table>
-<p>Defines whether to display this server choice as links instead of in a
-drop-down.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_NavigationTreeDefaultTabTable">
-<code class="descname">$cfg['NavigationTreeDefaultTabTable']</code><a class="headerlink" href="#cfg_NavigationTreeDefaultTabTable" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">'structure'</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>Defines the tab displayed by default when clicking the small icon next
-to each table name in the navigation panel. The possible values are the
-localized equivalent of:</p>
-<ul class="simple">
-<li><code class="docutils literal"><span class="pre">structure</span></code></li>
-<li><code class="docutils literal"><span class="pre">sql</span></code></li>
-<li><code class="docutils literal"><span class="pre">search</span></code></li>
-<li><code class="docutils literal"><span class="pre">insert</span></code></li>
-<li><code class="docutils literal"><span class="pre">browse</span></code></li>
-</ul>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_NavigationTreeDefaultTabTable2">
-<code class="descname">$cfg['NavigationTreeDefaultTabTable2']</code><a class="headerlink" href="#cfg_NavigationTreeDefaultTabTable2" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">null</td>
-</tr>
-</tbody>
-</table>
-<p>Defines the tab displayed by default when clicking the second small icon next
-to each table name in the navigation panel. The possible values are the
-localized equivalent of:</p>
-<ul class="simple">
-<li><code class="docutils literal"><span class="pre">(empty)</span></code></li>
-<li><code class="docutils literal"><span class="pre">structure</span></code></li>
-<li><code class="docutils literal"><span class="pre">sql</span></code></li>
-<li><code class="docutils literal"><span class="pre">search</span></code></li>
-<li><code class="docutils literal"><span class="pre">insert</span></code></li>
-<li><code class="docutils literal"><span class="pre">browse</span></code></li>
-</ul>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_NavigationTreeEnableExpansion">
-<code class="descname">$cfg['NavigationTreeEnableExpansion']</code><a class="headerlink" href="#cfg_NavigationTreeEnableExpansion" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">false</td>
-</tr>
-</tbody>
-</table>
-<p>Whether to offer the possibility of tree expansion in the navigation panel.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_NavigationTreeShowTables">
-<code class="descname">$cfg['NavigationTreeShowTables']</code><a class="headerlink" href="#cfg_NavigationTreeShowTables" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">true</td>
-</tr>
-</tbody>
-</table>
-<p>Whether to show tables under database in the navigation panel.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_NavigationTreeShowViews">
-<code class="descname">$cfg['NavigationTreeShowViews']</code><a class="headerlink" href="#cfg_NavigationTreeShowViews" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">true</td>
-</tr>
-</tbody>
-</table>
-<p>Whether to show views under database in the navigation panel.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_NavigationTreeShowFunctions">
-<code class="descname">$cfg['NavigationTreeShowFunctions']</code><a class="headerlink" href="#cfg_NavigationTreeShowFunctions" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">true</td>
-</tr>
-</tbody>
-</table>
-<p>Whether to show functions under database in the navigation panel.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_NavigationTreeShowProcedures">
-<code class="descname">$cfg['NavigationTreeShowProcedures']</code><a class="headerlink" href="#cfg_NavigationTreeShowProcedures" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">true</td>
-</tr>
-</tbody>
-</table>
-<p>Whether to show procedures under database in the navigation panel.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_NavigationTreeShowEvents">
-<code class="descname">$cfg['NavigationTreeShowEvents']</code><a class="headerlink" href="#cfg_NavigationTreeShowEvents" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">true</td>
-</tr>
-</tbody>
-</table>
-<p>Whether to show events under database in the navigation panel.</p>
-</dd></dl>
-
-</div>
-<div class="section" id="main-panel">
-<h2>Main panel<a class="headerlink" href="#main-panel" title="Permalink to this headline">¶</a></h2>
-<dl class="option">
-<dt id="cfg_ShowStats">
-<code class="descname">$cfg['ShowStats']</code><a class="headerlink" href="#cfg_ShowStats" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">true</td>
-</tr>
-</tbody>
-</table>
-<p>Defines whether or not to display space usage and statistics about
-databases and tables. Note that statistics requires at least MySQL
-3.23.3 and that, at this date, MySQL doesn&#8217;t return such information
-for Berkeley DB tables.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_ShowServerInfo">
-<code class="descname">$cfg['ShowServerInfo']</code><a class="headerlink" href="#cfg_ShowServerInfo" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">true</td>
-</tr>
-</tbody>
-</table>
-<p>Defines whether to display detailed server information on main page.
-You can additionally hide more information by using
-<span class="target" id="index-74"></span><a class="reference internal" href="#cfg_Servers_verbose"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['verbose']</span></code></a>.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_ShowChgPassword">
-<code class="descname">$cfg['ShowChgPassword']</code><a class="headerlink" href="#cfg_ShowChgPassword" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">true</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_ShowCreateDb">
-<code class="descname">$cfg['ShowCreateDb']</code><a class="headerlink" href="#cfg_ShowCreateDb" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">true</td>
-</tr>
-</tbody>
-</table>
-<p>Defines whether to display the
-<span class="guilabel">Change password</span> links and form for creating database or not at
-the starting main (right) frame. This setting does not check MySQL commands
-entered directly.</p>
-<p>Also note that enabling the <span class="guilabel">Change password</span> link has no effect
-with config authentication mode: because of the hard coded password value
-in the configuration file, end users can&#8217;t be allowed to change their
-passwords.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_ShowGitRevision">
-<code class="descname">$cfg['ShowGitRevision']</code><a class="headerlink" href="#cfg_ShowGitRevision" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">true</td>
-</tr>
-</tbody>
-</table>
-<p>Defines whether to display informations about the current Git revision (if
-applicable) on the main panel.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_MysqlMinVersion">
-<code class="descname">$cfg['MysqlMinVersion']</code><a class="headerlink" href="#cfg_MysqlMinVersion" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">array</td>
-</tr>
-</tbody>
-</table>
-<p>Defines the minimum supported MySQL version. The default is chosen
-by the phpMyAdmin team; however this directive was asked by a developer
-of the Plesk control panel to ease integration with older MySQL servers
-(where most of the phpMyAdmin features work).</p>
-</dd></dl>
-
-</div>
-<div class="section" id="database-structure">
-<h2>Database structure<a class="headerlink" href="#database-structure" title="Permalink to this headline">¶</a></h2>
-<dl class="option">
-<dt id="cfg_ShowDbStructureCreation">
-<code class="descname">$cfg['ShowDbStructureCreation']</code><a class="headerlink" href="#cfg_ShowDbStructureCreation" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">false</td>
-</tr>
-</tbody>
-</table>
-<p>Defines whether the database structure page (tables list) has a
-&#8220;Creation&#8221; column that displays when each table was created.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_ShowDbStructureLastUpdate">
-<code class="descname">$cfg['ShowDbStructureLastUpdate']</code><a class="headerlink" href="#cfg_ShowDbStructureLastUpdate" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">false</td>
-</tr>
-</tbody>
-</table>
-<p>Defines whether the database structure page (tables list) has a &#8220;Last
-update&#8221; column that displays when each table was last updated.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_ShowDbStructureLastCheck">
-<code class="descname">$cfg['ShowDbStructureLastCheck']</code><a class="headerlink" href="#cfg_ShowDbStructureLastCheck" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">false</td>
-</tr>
-</tbody>
-</table>
-<p>Defines whether the database structure page (tables list) has a &#8220;Last
-check&#8221; column that displays when each table was last checked.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_HideStructureActions">
-<code class="descname">$cfg['HideStructureActions']</code><a class="headerlink" href="#cfg_HideStructureActions" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">true</td>
-</tr>
-</tbody>
-</table>
-<p>Defines whether the table structure actions are hidden under a &#8220;More&#8221;
-drop-down.</p>
-</dd></dl>
-
-</div>
-<div class="section" id="browse-mode">
-<h2>Browse mode<a class="headerlink" href="#browse-mode" title="Permalink to this headline">¶</a></h2>
-<dl class="option">
-<dt id="cfg_TableNavigationLinksMode">
-<code class="descname">$cfg['TableNavigationLinksMode']</code><a class="headerlink" href="#cfg_TableNavigationLinksMode" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">'icons'</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>Defines whether the table navigation links contain <code class="docutils literal"><span class="pre">'icons'</span></code>, <code class="docutils literal"><span class="pre">'text'</span></code>
-or <code class="docutils literal"><span class="pre">'both'</span></code>.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_ActionLinksMode">
-<code class="descname">$cfg['ActionLinksMode']</code><a class="headerlink" href="#cfg_ActionLinksMode" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">'both'</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>If set to <code class="docutils literal"><span class="pre">icons</span></code>, will display icons instead of text for db and table
-properties links (like <span class="guilabel">Browse</span>, <span class="guilabel">Select</span>,
-<span class="guilabel">Insert</span>, ...). Can be set to <code class="docutils literal"><span class="pre">'both'</span></code>
-if you want icons AND text. When set to <code class="docutils literal"><span class="pre">text</span></code>, will only show text.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_RowActionType">
-<code class="descname">$cfg['RowActionType']</code><a class="headerlink" href="#cfg_RowActionType" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">'both'</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>Whether to display icons or text or both icons and text in table row action
-segment. Value can be either of <code class="docutils literal"><span class="pre">'icons'</span></code>, <code class="docutils literal"><span class="pre">'text'</span></code> or <code class="docutils literal"><span class="pre">'both'</span></code>.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_ShowAll">
-<code class="descname">$cfg['ShowAll']</code><a class="headerlink" href="#cfg_ShowAll" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">false</td>
-</tr>
-</tbody>
-</table>
-<p>Defines whether a user should be displayed a &#8220;Show all&#8221; button in browse
-mode or not in all cases. By default it is shown only on small tables (less
-than 500 rows) to avoid performance issues while getting too many rows.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_MaxRows">
-<code class="descname">$cfg['MaxRows']</code><a class="headerlink" href="#cfg_MaxRows" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">integer</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">25</td>
-</tr>
-</tbody>
-</table>
-<p>Number of rows displayed when browsing a result set and no LIMIT
-clause is used. If the result set contains more rows, &#8220;Previous&#8221; and
-&#8220;Next&#8221; links will be shown. Possible values: 25,50,100,250,500.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_Order">
-<code class="descname">$cfg['Order']</code><a class="headerlink" href="#cfg_Order" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">'SMART'</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>Defines whether columns are displayed in ascending (<code class="docutils literal"><span class="pre">ASC</span></code>) order, in
-descending (<code class="docutils literal"><span class="pre">DESC</span></code>) order or in a &#8220;smart&#8221; (<code class="docutils literal"><span class="pre">SMART</span></code>) order - I.E.
-descending order for columns of type TIME, DATE, DATETIME and
-TIMESTAMP, ascending order else- by default.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_GridEditing">
-<code class="descname">$cfg['GridEditing']</code><a class="headerlink" href="#cfg_GridEditing" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">'double-click'</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>Defines which action (<code class="docutils literal"><span class="pre">double-click</span></code> or <code class="docutils literal"><span class="pre">click</span></code>) triggers grid
-editing. Can be deactivated with the <code class="docutils literal"><span class="pre">disabled</span></code> value.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_RelationalDisplay">
-<code class="descname">$cfg['RelationalDisplay']</code><a class="headerlink" href="#cfg_RelationalDisplay" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">'K'</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>Defines the initial behavior for Options &gt; Relational. <code class="docutils literal"><span class="pre">K</span></code>, which
-is the default, displays the key while <code class="docutils literal"><span class="pre">D</span></code> shows the display column.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_SaveCellsAtOnce">
-<code class="descname">$cfg['SaveCellsAtOnce']</code><a class="headerlink" href="#cfg_SaveCellsAtOnce" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">false</td>
-</tr>
-</tbody>
-</table>
-<p>Defines whether or not to save all edited cells at once for grid
-editing.</p>
-</dd></dl>
-
-</div>
-<div class="section" id="editing-mode">
-<h2>Editing mode<a class="headerlink" href="#editing-mode" title="Permalink to this headline">¶</a></h2>
-<dl class="option">
-<dt id="cfg_ProtectBinary">
-<code class="descname">$cfg['ProtectBinary']</code><a class="headerlink" href="#cfg_ProtectBinary" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean or string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">'blob'</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>Defines whether <code class="docutils literal"><span class="pre">BLOB</span></code> or <code class="docutils literal"><span class="pre">BINARY</span></code> columns are protected from
-editing when browsing a table&#8217;s content. Valid values are:</p>
-<ul class="simple">
-<li><code class="docutils literal"><span class="pre">false</span></code> to allow editing of all columns;</li>
-<li><code class="docutils literal"><span class="pre">'blob'</span></code> to allow editing of all columns except <code class="docutils literal"><span class="pre">BLOBS</span></code>;</li>
-<li><code class="docutils literal"><span class="pre">'noblob'</span></code> to disallow editing of all columns except <code class="docutils literal"><span class="pre">BLOBS</span></code> (the
-opposite of <code class="docutils literal"><span class="pre">'blob'</span></code>);</li>
-<li><code class="docutils literal"><span class="pre">'all'</span></code> to disallow editing of all <code class="docutils literal"><span class="pre">BINARY</span></code> or <code class="docutils literal"><span class="pre">BLOB</span></code> columns.</li>
-</ul>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_ShowFunctionFields">
-<code class="descname">$cfg['ShowFunctionFields']</code><a class="headerlink" href="#cfg_ShowFunctionFields" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">true</td>
-</tr>
-</tbody>
-</table>
-<p>Defines whether or not MySQL functions fields should be initially
-displayed in edit/insert mode. Since version 2.10, the user can toggle
-this setting from the interface.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_ShowFieldTypesInDataEditView">
-<code class="descname">$cfg['ShowFieldTypesInDataEditView']</code><a class="headerlink" href="#cfg_ShowFieldTypesInDataEditView" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">true</td>
-</tr>
-</tbody>
-</table>
-<p>Defines whether or not type fields should be initially displayed in
-edit/insert mode. The user can toggle this setting from the interface.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_InsertRows">
-<code class="descname">$cfg['InsertRows']</code><a class="headerlink" href="#cfg_InsertRows" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">integer</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">2</td>
-</tr>
-</tbody>
-</table>
-<p>Defines the maximum number of concurrent entries for the Insert page.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_ForeignKeyMaxLimit">
-<code class="descname">$cfg['ForeignKeyMaxLimit']</code><a class="headerlink" href="#cfg_ForeignKeyMaxLimit" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">integer</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">100</td>
-</tr>
-</tbody>
-</table>
-<p>If there are fewer items than this in the set of foreign keys, then a
-drop-down box of foreign keys is presented, in the style described by
-the <span class="target" id="index-75"></span><a class="reference internal" href="#cfg_ForeignKeyDropdownOrder"><code class="xref config config-option docutils literal"><span class="pre">$cfg['ForeignKeyDropdownOrder']</span></code></a> setting.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_ForeignKeyDropdownOrder">
-<code class="descname">$cfg['ForeignKeyDropdownOrder']</code><a class="headerlink" href="#cfg_ForeignKeyDropdownOrder" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">array</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">array(&#8216;content-id&#8217;, &#8216;id-content&#8217;)</td>
-</tr>
-</tbody>
-</table>
-<p>For the foreign key drop-down fields, there are several methods of
-display, offering both the key and value data. The contents of the
-array should be one or both of the following strings: <code class="docutils literal"><span class="pre">content-id</span></code>,
-<code class="docutils literal"><span class="pre">id-content</span></code>.</p>
-</dd></dl>
-
-</div>
-<div class="section" id="export-and-import-settings">
-<h2>Export and import settings<a class="headerlink" href="#export-and-import-settings" title="Permalink to this headline">¶</a></h2>
-<dl class="option">
-<dt id="cfg_ZipDump">
-<code class="descname">$cfg['ZipDump']</code><a class="headerlink" href="#cfg_ZipDump" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">true</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_GZipDump">
-<code class="descname">$cfg['GZipDump']</code><a class="headerlink" href="#cfg_GZipDump" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">true</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_BZipDump">
-<code class="descname">$cfg['BZipDump']</code><a class="headerlink" href="#cfg_BZipDump" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">true</td>
-</tr>
-</tbody>
-</table>
-<p>Defines whether to allow the use of zip/GZip/BZip2 compression when
-creating a dump file</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_CompressOnFly">
-<code class="descname">$cfg['CompressOnFly']</code><a class="headerlink" href="#cfg_CompressOnFly" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">true</td>
-</tr>
-</tbody>
-</table>
-<p>Defines whether to allow on the fly compression for GZip/BZip2
-compressed exports. This doesn&#8217;t affect smaller dumps and allows users
-to create larger dumps that won&#8217;t otherwise fit in memory due to php
-memory limit. Produced files contain more GZip/BZip2 headers, but all
-normal programs handle this correctly.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_Export">
-<code class="descname">$cfg['Export']</code><a class="headerlink" href="#cfg_Export" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">array</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">array(...)</td>
-</tr>
-</tbody>
-</table>
-<p>In this array are defined default parameters for export, names of
-items are similar to texts seen on export page, so you can easily
-identify what they mean.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_Export_method">
-<code class="descname">$cfg['Export']['method']</code><a class="headerlink" href="#cfg_Export_method" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">'quick'</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>Defines how the export form is displayed when it loads. Valid values
-are:</p>
-<ul class="simple">
-<li><code class="docutils literal"><span class="pre">quick</span></code> to display the minimum number of options to configure</li>
-<li><code class="docutils literal"><span class="pre">custom</span></code> to display every available option to configure</li>
-<li><code class="docutils literal"><span class="pre">custom-no-form</span></code> same as <code class="docutils literal"><span class="pre">custom</span></code> but does not display the option
-of using quick export</li>
-</ul>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_Import">
-<code class="descname">$cfg['Import']</code><a class="headerlink" href="#cfg_Import" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">array</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">array(...)</td>
-</tr>
-</tbody>
-</table>
-<p>In this array are defined default parameters for import, names of
-items are similar to texts seen on import page, so you can easily
-identify what they mean.</p>
-</dd></dl>
-
-</div>
-<div class="section" id="tabs-display-settings">
-<h2>Tabs display settings<a class="headerlink" href="#tabs-display-settings" title="Permalink to this headline">¶</a></h2>
-<dl class="option">
-<dt id="cfg_TabsMode">
-<code class="descname">$cfg['TabsMode']</code><a class="headerlink" href="#cfg_TabsMode" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">'both'</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>Defines whether the menu tabs contain <code class="docutils literal"><span class="pre">'icons'</span></code>, <code class="docutils literal"><span class="pre">'text'</span></code> or <code class="docutils literal"><span class="pre">'both'</span></code>.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_PropertiesNumColumns">
-<code class="descname">$cfg['PropertiesNumColumns']</code><a class="headerlink" href="#cfg_PropertiesNumColumns" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">integer</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">1</td>
-</tr>
-</tbody>
-</table>
-<p>How many columns will be utilized to display the tables on the database
-property view? When setting this to a value larger than 1, the type of the
-database will be omitted for more display space.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_DefaultTabServer">
-<code class="descname">$cfg['DefaultTabServer']</code><a class="headerlink" href="#cfg_DefaultTabServer" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">'welcome'</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>Defines the tab displayed by default on server view. The possible values
-are the localized equivalent of:</p>
-<ul class="simple">
-<li><code class="docutils literal"><span class="pre">welcome</span></code> (recommended for multi-user setups)</li>
-<li><code class="docutils literal"><span class="pre">databases</span></code>,</li>
-<li><code class="docutils literal"><span class="pre">status</span></code></li>
-<li><code class="docutils literal"><span class="pre">variables</span></code></li>
-<li><code class="docutils literal"><span class="pre">privileges</span></code></li>
-</ul>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_DefaultTabDatabase">
-<code class="descname">$cfg['DefaultTabDatabase']</code><a class="headerlink" href="#cfg_DefaultTabDatabase" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">'structure'</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>Defines the tab displayed by default on database view. The possible values
-are the localized equivalent of:</p>
-<ul class="simple">
-<li><code class="docutils literal"><span class="pre">structure</span></code></li>
-<li><code class="docutils literal"><span class="pre">sql</span></code></li>
-<li><code class="docutils literal"><span class="pre">search</span></code></li>
-<li><code class="docutils literal"><span class="pre">operations</span></code></li>
-</ul>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_DefaultTabTable">
-<code class="descname">$cfg['DefaultTabTable']</code><a class="headerlink" href="#cfg_DefaultTabTable" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">'browse'</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>Defines the tab displayed by default on table view. The possible values
-are the localized equivalent of:</p>
-<ul class="simple">
-<li><code class="docutils literal"><span class="pre">structure</span></code></li>
-<li><code class="docutils literal"><span class="pre">sql</span></code></li>
-<li><code class="docutils literal"><span class="pre">search</span></code></li>
-<li><code class="docutils literal"><span class="pre">insert</span></code></li>
-<li><code class="docutils literal"><span class="pre">browse</span></code></li>
-</ul>
-</dd></dl>
-
-</div>
-<div class="section" id="pdf-options">
-<h2>PDF Options<a class="headerlink" href="#pdf-options" title="Permalink to this headline">¶</a></h2>
-<dl class="option">
-<dt id="cfg_PDFPageSizes">
-<code class="descname">$cfg['PDFPageSizes']</code><a class="headerlink" href="#cfg_PDFPageSizes" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">array</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">array('A3',</span> <span class="pre">'A4',</span> <span class="pre">'A5',</span> <span class="pre">'letter',</span> <span class="pre">'legal')</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>Array of possible paper sizes for creating PDF pages.</p>
-<p>You should never need to change this.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_PDFDefaultPageSize">
-<code class="descname">$cfg['PDFDefaultPageSize']</code><a class="headerlink" href="#cfg_PDFDefaultPageSize" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">'A4'</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>Default page size to use when creating PDF pages. Valid values are any
-listed in <span class="target" id="index-76"></span><a class="reference internal" href="#cfg_PDFPageSizes"><code class="xref config config-option docutils literal"><span class="pre">$cfg['PDFPageSizes']</span></code></a>.</p>
-</dd></dl>
-
-</div>
-<div class="section" id="languages">
-<h2>Languages<a class="headerlink" href="#languages" title="Permalink to this headline">¶</a></h2>
-<dl class="option">
-<dt id="cfg_DefaultLang">
-<code class="descname">$cfg['DefaultLang']</code><a class="headerlink" href="#cfg_DefaultLang" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">'en'</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>Defines the default language to use, if not browser-defined or user-
-defined. The corresponding language file needs to be in
-locale/<em>code</em>/LC_MESSAGES/phpmyadmin.mo.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_DefaultConnectionCollation">
-<code class="descname">$cfg['DefaultConnectionCollation']</code><a class="headerlink" href="#cfg_DefaultConnectionCollation" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">'utf8_general_ci'</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>Defines the default connection collation to use, if not user-defined.
-See the <a class="reference external" href="https://dev.mysql.com/doc/mysql/en/charset-charsets.html">MySQL documentation for charsets</a>
-for list of possible values.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_Lang">
-<code class="descname">$cfg['Lang']</code><a class="headerlink" href="#cfg_Lang" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">not set</td>
-</tr>
-</tbody>
-</table>
-<p>Force language to use. The corresponding language file needs to be in
-locale/<em>code</em>/LC_MESSAGES/phpmyadmin.mo.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_FilterLanguages">
-<code class="descname">$cfg['FilterLanguages']</code><a class="headerlink" href="#cfg_FilterLanguages" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">''</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>Limit list of available languages to those matching the given regular
-expression. For example if you want only Czech and English, you should
-set filter to <code class="docutils literal"><span class="pre">'^(cs|en)'</span></code>.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_RecodingEngine">
-<code class="descname">$cfg['RecodingEngine']</code><a class="headerlink" href="#cfg_RecodingEngine" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">'auto'</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>You can select here which functions will be used for character set
-conversion. Possible values are:</p>
-<ul class="simple">
-<li>auto - automatically use available one (first is tested iconv, then
-recode)</li>
-<li>iconv - use iconv or libiconv functions</li>
-<li>recode - use recode_string function</li>
-<li>mb - use mbstring extension</li>
-<li>none - disable encoding conversion</li>
-</ul>
-<p>Enabled charset conversion activates a pull-down menu in the Export
-and Import pages, to choose the character set when exporting a file.
-The default value in this menu comes from
-<span class="target" id="index-77"></span><code class="xref config config-option docutils literal"><span class="pre">$cfg['Export']['charset']</span></code> and <span class="target" id="index-78"></span><code class="xref config config-option docutils literal"><span class="pre">$cfg['Import']['charset']</span></code>.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_IconvExtraParams">
-<code class="descname">$cfg['IconvExtraParams']</code><a class="headerlink" href="#cfg_IconvExtraParams" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">'//TRANSLIT'</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>Specify some parameters for iconv used in charset conversion. See
-<a class="reference external" href="https://www.gnu.org/software/libiconv/documentation/libiconv/iconv_open.3.html">iconv documentation</a> for details. By default
-<code class="docutils literal"><span class="pre">//TRANSLIT</span></code> is used, so that invalid characters will be
-transliterated.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_AvailableCharsets">
-<code class="descname">$cfg['AvailableCharsets']</code><a class="headerlink" href="#cfg_AvailableCharsets" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">array</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">array(...)</td>
-</tr>
-</tbody>
-</table>
-<p>Available character sets for MySQL conversion. You can add your own
-(any of supported by recode/iconv) or remove these which you don&#8217;t
-use. Character sets will be shown in same order as here listed, so if
-you frequently use some of these move them to the top.</p>
-</dd></dl>
-
-</div>
-<div class="section" id="web-server-settings">
-<h2>Web server settings<a class="headerlink" href="#web-server-settings" title="Permalink to this headline">¶</a></h2>
-<dl class="option">
-<dt id="cfg_OBGzip">
-<code class="descname">$cfg['OBGzip']</code><a class="headerlink" href="#cfg_OBGzip" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string/boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">'auto'</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>Defines whether to use GZip output buffering for increased speed in
-<a class="reference internal" href="glossary.html#term-http"><span class="xref std std-term">HTTP</span></a> transfers. Set to
-true/false for enabling/disabling. When set to &#8216;auto&#8217; (string),
-phpMyAdmin tries to enable output buffering and will automatically
-disable it if your browser has some problems with buffering. IE6 with
-a certain patch is known to cause data corruption when having enabled
-buffering.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_TrustedProxies">
-<code class="descname">$cfg['TrustedProxies']</code><a class="headerlink" href="#cfg_TrustedProxies" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">array</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">array()</td>
-</tr>
-</tbody>
-</table>
-<p>Lists proxies and HTTP headers which are trusted for
-<span class="target" id="index-79"></span><a class="reference internal" href="#cfg_Servers_AllowDeny_order"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['AllowDeny']['order']</span></code></a>. This list is by
-default empty, you need to fill in some trusted proxy servers if you
-want to use rules for IP addresses behind proxy.</p>
-<p>The following example specifies that phpMyAdmin should trust a
-HTTP_X_FORWARDED_FOR (<code class="docutils literal"><span class="pre">X</span> <span class="pre">-Forwarded-For</span></code>) header coming from the proxy
-1.2.3.4:</p>
-<div class="highlight-php"><div class="highlight"><pre><span class="nv">$cfg</span><span class="p">[</span><span class="s1">&#39;TrustedProxies&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="k">array</span><span class="p">(</span><span class="s1">&#39;1.2.3.4&#39;</span> <span class="o">=&gt;</span> <span class="s1">&#39;HTTP_X_FORWARDED_FOR&#39;</span><span class="p">);</span>
-</pre></div>
-</div>
-<p>The <span class="target" id="index-80"></span><a class="reference internal" href="#cfg_Servers_AllowDeny_rules"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['AllowDeny']['rules']</span></code></a> directive uses the
-client&#8217;s IP address as usual.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_GD2Available">
-<code class="descname">$cfg['GD2Available']</code><a class="headerlink" href="#cfg_GD2Available" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">'auto'</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>Specifies whether GD &gt;= 2 is available. If yes it can be used for MIME
-transformations. Possible values are:</p>
-<ul class="simple">
-<li>auto - automatically detect</li>
-<li>yes - GD 2 functions can be used</li>
-<li>no - GD 2 function cannot be used</li>
-</ul>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_CheckConfigurationPermissions">
-<code class="descname">$cfg['CheckConfigurationPermissions']</code><a class="headerlink" href="#cfg_CheckConfigurationPermissions" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">true</td>
-</tr>
-</tbody>
-</table>
-<p>We normally check the permissions on the configuration file to ensure
-it&#8217;s not world writable. However, phpMyAdmin could be installed on a
-NTFS filesystem mounted on a non-Windows server, in which case the
-permissions seems wrong but in fact cannot be detected. In this case a
-sysadmin would set this parameter to <code class="docutils literal"><span class="pre">false</span></code>.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_LinkLengthLimit">
-<code class="descname">$cfg['LinkLengthLimit']</code><a class="headerlink" href="#cfg_LinkLengthLimit" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">integer</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">1000</td>
-</tr>
-</tbody>
-</table>
-<p>Limit for length of <a class="reference internal" href="glossary.html#term-url"><span class="xref std std-term">URL</span></a> in links.  When length would be above this
-limit, it is replaced by form with button. This is required as some web
-servers (<a class="reference internal" href="glossary.html#term-iis"><span class="xref std std-term">IIS</span></a>) have problems with long <a class="reference internal" href="glossary.html#term-url"><span class="xref std std-term">URL</span></a> .</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_CSPAllow">
-<code class="descname">$cfg['CSPAllow']</code><a class="headerlink" href="#cfg_CSPAllow" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">''</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>Additional string to include in allowed script and image sources in Content
-Security Policy header.</p>
-<p>This can be useful when you want to include some external JavaScript files
-in <code class="file docutils literal"><span class="pre">config.footer.inc.php</span></code> or <code class="file docutils literal"><span class="pre">config.header.inc.php</span></code>, which
-would be normally not allowed by Content Security Policy.</p>
-<p>To allow some sites, just list them within the string:</p>
-<div class="highlight-php"><div class="highlight"><pre><span class="nv">$cfg</span><span class="p">[</span><span class="s1">&#39;CSPAllow&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="s1">&#39;example.com example.net&#39;</span><span class="p">;</span>
-</pre></div>
-</div>
-<div class="versionadded">
-<p><span class="versionmodified">New in version 4.0.4.</span></p>
-</div>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_DisableMultiTableMaintenance">
-<code class="descname">$cfg['DisableMultiTableMaintenance']</code><a class="headerlink" href="#cfg_DisableMultiTableMaintenance" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">false</td>
-</tr>
-</tbody>
-</table>
-<p>In the database Structure page, it&#8217;s possible to mark some tables then
-choose an operation like optimizing for many tables. This can slow
-down a server; therefore, setting this to <code class="docutils literal"><span class="pre">true</span></code> prevents this kind
-of multiple maintenance operation.</p>
-</dd></dl>
-
-</div>
-<div class="section" id="theme-settings">
-<h2>Theme settings<a class="headerlink" href="#theme-settings" title="Permalink to this headline">¶</a></h2>
-<blockquote>
-<div>Please directly modify <code class="file docutils literal"><span class="pre">themes/themename/layout.inc.php</span></code>, although
-your changes will be overwritten with the next update.</div></blockquote>
-</div>
-<div class="section" id="design-customization">
-<h2>Design customization<a class="headerlink" href="#design-customization" title="Permalink to this headline">¶</a></h2>
-<dl class="option">
-<dt id="cfg_NavigationTreePointerEnable">
-<code class="descname">$cfg['NavigationTreePointerEnable']</code><a class="headerlink" href="#cfg_NavigationTreePointerEnable" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">true</td>
-</tr>
-</tbody>
-</table>
-<p>When set to true, hovering over an item in the navigation panel causes that item to be marked
-(the background is highlighted).</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_BrowsePointerEnable">
-<code class="descname">$cfg['BrowsePointerEnable']</code><a class="headerlink" href="#cfg_BrowsePointerEnable" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">true</td>
-</tr>
-</tbody>
-</table>
-<p>When set to true, hovering over a row in the Browse page causes that row to be marked (the background
-is highlighted).</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_BrowseMarkerEnable">
-<code class="descname">$cfg['BrowseMarkerEnable']</code><a class="headerlink" href="#cfg_BrowseMarkerEnable" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">true</td>
-</tr>
-</tbody>
-</table>
-<p>When set to true, a data row is marked (the background is highlighted) when the row is selected
-with the checkbox.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_LimitChars">
-<code class="descname">$cfg['LimitChars']</code><a class="headerlink" href="#cfg_LimitChars" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">integer</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">50</td>
-</tr>
-</tbody>
-</table>
-<p>Maximum number of characters shown in any non-numeric field on browse
-view. Can be turned off by a toggle button on the browse page.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_RowActionLinks">
-<code class="descname">$cfg['RowActionLinks']</code><a class="headerlink" href="#cfg_RowActionLinks" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">'left'</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>Defines the place where table row links (Edit, Copy, Delete) would be
-put when tables contents are displayed (you may have them displayed at
-the left side, right side, both sides or nowhere).</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_RowActionLinksWithoutUnique">
-<code class="descname">$cfg['RowActionLinksWithoutUnique']</code><a class="headerlink" href="#cfg_RowActionLinksWithoutUnique" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">false</td>
-</tr>
-</tbody>
-</table>
-<p>Defines whether to show row links (Edit, Copy, Delete) and checkboxes
-for multiple row operations even when the selection does not have a unique key.
-Using row actions in the absence of a unique key may result in different/more
-rows being affected since there is no guaranteed way to select the exact row(s).</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_RememberSorting">
-<code class="descname">$cfg['RememberSorting']</code><a class="headerlink" href="#cfg_RememberSorting" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">true</td>
-</tr>
-</tbody>
-</table>
-<p>If enabled, remember the sorting of each table when browsing them.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_TablePrimaryKeyOrder">
-<code class="descname">$cfg['TablePrimaryKeyOrder']</code><a class="headerlink" href="#cfg_TablePrimaryKeyOrder" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">'NONE'</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>This defines the default sort order for the tables, having a primary key,
-when there is no sort order defines externally.
-Acceptable values : [&#8216;NONE&#8217;, &#8216;ASC&#8217;, &#8216;DESC&#8217;]</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_ShowBrowseComments">
-<code class="descname">$cfg['ShowBrowseComments']</code><a class="headerlink" href="#cfg_ShowBrowseComments" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">true</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_ShowPropertyComments">
-<code class="descname">$cfg['ShowPropertyComments']</code><a class="headerlink" href="#cfg_ShowPropertyComments" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">true</td>
-</tr>
-</tbody>
-</table>
-<p>By setting the corresponding variable to <code class="docutils literal"><span class="pre">true</span></code> you can enable the
-display of column comments in Browse or Property display. In browse
-mode, the comments are shown inside the header. In property mode,
-comments are displayed using a CSS-formatted dashed-line below the
-name of the column. The comment is shown as a tool-tip for that
-column.</p>
-</dd></dl>
-
-</div>
-<div class="section" id="text-fields">
-<h2>Text fields<a class="headerlink" href="#text-fields" title="Permalink to this headline">¶</a></h2>
-<dl class="option">
-<dt id="cfg_CharEditing">
-<code class="descname">$cfg['CharEditing']</code><a class="headerlink" href="#cfg_CharEditing" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">'input'</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>Defines which type of editing controls should be used for CHAR and
-VARCHAR columns. Applies to data editing and also to the default values
-in structure editing. Possible values are:</p>
-<ul class="simple">
-<li>input - this allows to limit size of text to size of columns in MySQL,
-but has problems with newlines in columns</li>
-<li>textarea - no problems with newlines in columns, but also no length
-limitations</li>
-</ul>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_MinSizeForInputField">
-<code class="descname">$cfg['MinSizeForInputField']</code><a class="headerlink" href="#cfg_MinSizeForInputField" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">integer</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">4</td>
-</tr>
-</tbody>
-</table>
-<p>Defines the minimum size for input fields generated for CHAR and
-VARCHAR columns.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_MaxSizeForInputField">
-<code class="descname">$cfg['MaxSizeForInputField']</code><a class="headerlink" href="#cfg_MaxSizeForInputField" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">integer</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">60</td>
-</tr>
-</tbody>
-</table>
-<p>Defines the maximum size for input fields generated for CHAR and
-VARCHAR columns.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_TextareaCols">
-<code class="descname">$cfg['TextareaCols']</code><a class="headerlink" href="#cfg_TextareaCols" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">integer</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">40</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_TextareaRows">
-<code class="descname">$cfg['TextareaRows']</code><a class="headerlink" href="#cfg_TextareaRows" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">integer</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">15</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_CharTextareaCols">
-<code class="descname">$cfg['CharTextareaCols']</code><a class="headerlink" href="#cfg_CharTextareaCols" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">integer</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">40</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_CharTextareaRows">
-<code class="descname">$cfg['CharTextareaRows']</code><a class="headerlink" href="#cfg_CharTextareaRows" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">integer</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">2</td>
-</tr>
-</tbody>
-</table>
-<p>Number of columns and rows for the textareas. This value will be
-emphasized (*2) for <a class="reference internal" href="glossary.html#term-sql"><span class="xref std std-term">SQL</span></a> query
-textareas and (*1.25) for <a class="reference internal" href="glossary.html#term-sql"><span class="xref std std-term">SQL</span></a>
-textareas inside the query window.</p>
-<p>The Char* values are used for CHAR
-and VARCHAR editing (if configured via <span class="target" id="index-81"></span><a class="reference internal" href="#cfg_CharEditing"><code class="xref config config-option docutils literal"><span class="pre">$cfg['CharEditing']</span></code></a>).</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_LongtextDoubleTextarea">
-<code class="descname">$cfg['LongtextDoubleTextarea']</code><a class="headerlink" href="#cfg_LongtextDoubleTextarea" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">true</td>
-</tr>
-</tbody>
-</table>
-<p>Defines whether textarea for LONGTEXT columns should have double size.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_TextareaAutoSelect">
-<code class="descname">$cfg['TextareaAutoSelect']</code><a class="headerlink" href="#cfg_TextareaAutoSelect" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">false</td>
-</tr>
-</tbody>
-</table>
-<p>Defines if the whole textarea of the query box will be selected on
-click.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_EnableAutocompleteForTablesAndColumns">
-<code class="descname">$cfg['EnableAutocompleteForTablesAndColumns']</code><a class="headerlink" href="#cfg_EnableAutocompleteForTablesAndColumns" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">true</td>
-</tr>
-</tbody>
-</table>
-<p>Whether to enable autocomplete for table and column names in any
-SQL query box.</p>
-</dd></dl>
-
-</div>
-<div class="section" id="sql-query-box-settings">
-<h2>SQL query box settings<a class="headerlink" href="#sql-query-box-settings" title="Permalink to this headline">¶</a></h2>
-<dl class="option">
-<dt id="cfg_SQLQuery_Edit">
-<code class="descname">$cfg['SQLQuery']['Edit']</code><a class="headerlink" href="#cfg_SQLQuery_Edit" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">true</td>
-</tr>
-</tbody>
-</table>
-<p>Whether to display an edit link to change a query in any SQL Query
-box.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_SQLQuery_Explain">
-<code class="descname">$cfg['SQLQuery']['Explain']</code><a class="headerlink" href="#cfg_SQLQuery_Explain" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">true</td>
-</tr>
-</tbody>
-</table>
-<p>Whether to display a link to explain a SELECT query in any SQL Query
-box.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_SQLQuery_ShowAsPHP">
-<code class="descname">$cfg['SQLQuery']['ShowAsPHP']</code><a class="headerlink" href="#cfg_SQLQuery_ShowAsPHP" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">true</td>
-</tr>
-</tbody>
-</table>
-<p>Whether to display a link to wrap a query in PHP code in any SQL Query
-box.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_SQLQuery_Refresh">
-<code class="descname">$cfg['SQLQuery']['Refresh']</code><a class="headerlink" href="#cfg_SQLQuery_Refresh" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">true</td>
-</tr>
-</tbody>
-</table>
-<p>Whether to display a link to refresh a query in any SQL Query box.</p>
-</dd></dl>
-
-</div>
-<div class="section" id="web-server-upload-save-import-directories">
-<span id="web-dirs"></span><h2>Web server upload/save/import directories<a class="headerlink" href="#web-server-upload-save-import-directories" title="Permalink to this headline">¶</a></h2>
-<p>If PHP is running in safe mode, all directories must be owned by the same user
-as the owner of the phpMyAdmin scripts.</p>
-<p>If the directory where phpMyAdmin is installed is subject to an
-<code class="docutils literal"><span class="pre">open_basedir</span></code> restriction, you need to create a temporary directory in some
-directory accessible by the PHP interpreter.</p>
-<p>For security reasons, all directories should be outside the tree published by
-webserver. If you cannot avoid having this directory published by webserver,
-limit access to it either by web server configuration (for example using
-.htaccess or web.config files) or place at least an empty <code class="file docutils literal"><span class="pre">index.html</span></code>
-file there, so that directory listing is not possible. However as long as the
-directory is accessible by web server, an attacker can guess filenames to download
-the files.</p>
-<dl class="option">
-<dt id="cfg_UploadDir">
-<code class="descname">$cfg['UploadDir']</code><a class="headerlink" href="#cfg_UploadDir" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">''</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>The name of the directory where <a class="reference internal" href="glossary.html#term-sql"><span class="xref std std-term">SQL</span></a> files have been uploaded by
-other means than phpMyAdmin (for example, ftp). Those files are available
-under a drop-down box when you click the database or table name, then the
-Import tab.</p>
-<p>If
-you want different directory for each user, %u will be replaced with
-username.</p>
-<p>Please note that the file names must have the suffix &#8221;.sql&#8221;
-(or &#8221;.sql.bz2&#8221; or &#8221;.sql.gz&#8221; if support for compressed formats is
-enabled).</p>
-<p>This feature is useful when your file is too big to be
-uploaded via <a class="reference internal" href="glossary.html#term-http"><span class="xref std std-term">HTTP</span></a>, or when file
-uploads are disabled in PHP.</p>
-<div class="admonition warning">
-<p class="first admonition-title">Warning</p>
-<p class="last">Please see top of this chapter (<a class="reference internal" href="#web-dirs"><span class="std std-ref">Web server upload/save/import directories</span></a>) for instructions how
-to setup this directory and how to make its usage secure.</p>
-</div>
-<div class="admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">See <a class="reference internal" href="faq.html#faq1-16"><span class="std std-ref">1.16 I cannot upload big dump files (memory, HTTP or timeout problems).</span></a> for alternatives.</p>
-</div>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_SaveDir">
-<code class="descname">$cfg['SaveDir']</code><a class="headerlink" href="#cfg_SaveDir" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">''</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>The name of the directory where dumps can be saved.</p>
-<p>If you want different directory for each user, %u will be replaced with
-username.</p>
-<p>Please note that the directory must exist and has to be writable for
-the user running webserver.</p>
-<div class="admonition warning">
-<p class="first admonition-title">Warning</p>
-<p class="last">Please see top of this chapter (<a class="reference internal" href="#web-dirs"><span class="std std-ref">Web server upload/save/import directories</span></a>) for instructions how
-to setup this directory and how to make its usage secure.</p>
-</div>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_TempDir">
-<code class="descname">$cfg['TempDir']</code><a class="headerlink" href="#cfg_TempDir" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">''</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>The name of the directory where temporary files can be stored.</p>
-<p>This is needed for importing ESRI Shapefiles, see <a class="reference internal" href="faq.html#faq6-30"><span class="std std-ref">6.30 Import: How can I import ESRI Shapefiles?</span></a> and to
-work around limitations of <code class="docutils literal"><span class="pre">open_basedir</span></code> for uploaded files, see
-<a class="reference internal" href="faq.html#faq1-11"><span class="std std-ref">1.11 I get an &#8216;open_basedir restriction&#8217; while uploading a file from the query box.</span></a>.</p>
-<p>This directory should have as strict permissions as possible as the only
-user required to access this directory is the one who runs the webserver.
-If you have root privileges, simply make this user owner of this directory
-and make it accessible only by it:</p>
-<div class="highlight-sh"><div class="highlight"><pre>chown www-data:www-data tmp
-chmod <span class="m">700</span> tmp
-</pre></div>
-</div>
-<p>If you cannot change owner of the directory, you can achieve a similar
-setup using <a class="reference internal" href="glossary.html#term-acl"><span class="xref std std-term">ACL</span></a>:</p>
-<div class="highlight-sh"><div class="highlight"><pre>chmod <span class="m">700</span> tmp
-setfacl -m <span class="s2">&quot;g:www-data:rwx&quot;</span> tmp
-setfacl -d -m <span class="s2">&quot;g:www-data:rwx&quot;</span> tmp
-</pre></div>
-</div>
-<p>If neither of above works for you, you can still make the directory
-<strong class="command">chmod 777</strong>, but it might impose risk of other users on system
-reading and writing data in this directory.</p>
-<div class="admonition warning">
-<p class="first admonition-title">Warning</p>
-<p class="last">Please see top of this chapter (<a class="reference internal" href="#web-dirs"><span class="std std-ref">Web server upload/save/import directories</span></a>) for instructions how
-to setup this directory and how to make its usage secure.</p>
-</div>
-</dd></dl>
-
-</div>
-<div class="section" id="various-display-setting">
-<h2>Various display setting<a class="headerlink" href="#various-display-setting" title="Permalink to this headline">¶</a></h2>
-<dl class="option">
-<dt id="cfg_RepeatCells">
-<code class="descname">$cfg['RepeatCells']</code><a class="headerlink" href="#cfg_RepeatCells" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">integer</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">100</td>
-</tr>
-</tbody>
-</table>
-<p>Repeat the headers every X cells, or 0 to deactivate.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_QueryHistoryDB">
-<code class="descname">$cfg['QueryHistoryDB']</code><a class="headerlink" href="#cfg_QueryHistoryDB" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">false</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_QueryHistoryMax">
-<code class="descname">$cfg['QueryHistoryMax']</code><a class="headerlink" href="#cfg_QueryHistoryMax" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">integer</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">25</td>
-</tr>
-</tbody>
-</table>
-<p>If <span class="target" id="index-82"></span><a class="reference internal" href="#cfg_QueryHistoryDB"><code class="xref config config-option docutils literal"><span class="pre">$cfg['QueryHistoryDB']</span></code></a> is set to <code class="docutils literal"><span class="pre">true</span></code>, all your
-Queries are logged to a table, which has to be created by you (see
-<span class="target" id="index-83"></span><a class="reference internal" href="#cfg_Servers_history"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['history']</span></code></a>). If set to false, all your
-queries will be appended to the form, but only as long as your window is
-opened they remain saved.</p>
-<p>When using the JavaScript based query window, it will always get updated
-when you click on a new table/db to browse and will focus if you click on
-<span class="guilabel">Edit SQL</span> after using a query. You can suppress updating the
-query window by checking the box <span class="guilabel">Do not overwrite this query
-from outside the window</span> below the query textarea. Then you can browse
-tables/databases in the background without losing the contents of the
-textarea, so this is especially useful when composing a query with tables
-you first have to look in. The checkbox will get automatically checked
-whenever you change the contents of the textarea. Please uncheck the button
-whenever you definitely want the query window to get updated even though
-you have made alterations.</p>
-<p>If <span class="target" id="index-84"></span><a class="reference internal" href="#cfg_QueryHistoryDB"><code class="xref config config-option docutils literal"><span class="pre">$cfg['QueryHistoryDB']</span></code></a> is set to <code class="docutils literal"><span class="pre">true</span></code> you can
-specify the amount of saved history items using
-<span class="target" id="index-85"></span><a class="reference internal" href="#cfg_QueryHistoryMax"><code class="xref config config-option docutils literal"><span class="pre">$cfg['QueryHistoryMax']</span></code></a>.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_BrowseMIME">
-<code class="descname">$cfg['BrowseMIME']</code><a class="headerlink" href="#cfg_BrowseMIME" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">true</td>
-</tr>
-</tbody>
-</table>
-<p>Enable <a class="reference internal" href="transformations.html#transformations"><span class="std std-ref">Transformations</span></a>.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_MaxExactCount">
-<code class="descname">$cfg['MaxExactCount']</code><a class="headerlink" href="#cfg_MaxExactCount" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">integer</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">500000</td>
-</tr>
-</tbody>
-</table>
-<p>For InnoDB tables, determines for how large tables phpMyAdmin should
-get the exact row count using <code class="docutils literal"><span class="pre">SELECT</span> <span class="pre">COUNT</span></code>. If the approximate row
-count as returned by <code class="docutils literal"><span class="pre">SHOW</span> <span class="pre">TABLE</span> <span class="pre">STATUS</span></code> is smaller than this value,
-<code class="docutils literal"><span class="pre">SELECT</span> <span class="pre">COUNT</span></code> will be used, otherwise the approximate count will be
-used.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_MaxExactCountViews">
-<code class="descname">$cfg['MaxExactCountViews']</code><a class="headerlink" href="#cfg_MaxExactCountViews" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">integer</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">0</td>
-</tr>
-</tbody>
-</table>
-<p>For VIEWs, since obtaining the exact count could have an impact on
-performance, this value is the maximum to be displayed, using a
-<code class="docutils literal"><span class="pre">SELECT</span> <span class="pre">COUNT</span> <span class="pre">...</span> <span class="pre">LIMIT</span></code>. Setting this to 0 bypasses any row
-counting.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_NaturalOrder">
-<code class="descname">$cfg['NaturalOrder']</code><a class="headerlink" href="#cfg_NaturalOrder" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">true</td>
-</tr>
-</tbody>
-</table>
-<p>Sorts database and table names according to natural order (for
-example, t1, t2, t10). Currently implemented in the navigation panel
-and in Database view, for the table list.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_InitialSlidersState">
-<code class="descname">$cfg['InitialSlidersState']</code><a class="headerlink" href="#cfg_InitialSlidersState" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">'closed'</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>If set to <code class="docutils literal"><span class="pre">'closed'</span></code>, the visual sliders are initially in a closed
-state. A value of <code class="docutils literal"><span class="pre">'open'</span></code> does the reverse. To completely disable
-all visual sliders, use <code class="docutils literal"><span class="pre">'disabled'</span></code>.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_UserprefsDisallow">
-<code class="descname">$cfg['UserprefsDisallow']</code><a class="headerlink" href="#cfg_UserprefsDisallow" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">array</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">array()</td>
-</tr>
-</tbody>
-</table>
-<p>Contains names of configuration options (keys in <code class="docutils literal"><span class="pre">$cfg</span></code> array) that
-users can&#8217;t set through user preferences. For possible values, refer
-to <code class="file docutils literal"><span class="pre">libraries/config/user_preferences.forms.php</span></code>.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_UserprefsDeveloperTab">
-<code class="descname">$cfg['UserprefsDeveloperTab']</code><a class="headerlink" href="#cfg_UserprefsDeveloperTab" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">false</td>
-</tr>
-</tbody>
-</table>
-<p>Activates in the user preferences a tab containing options for
-developers of phpMyAdmin.</p>
-</dd></dl>
-
-</div>
-<div class="section" id="page-titles">
-<h2>Page titles<a class="headerlink" href="#page-titles" title="Permalink to this headline">¶</a></h2>
-<dl class="option">
-<dt id="cfg_TitleTable">
-<code class="descname">$cfg['TitleTable']</code><a class="headerlink" href="#cfg_TitleTable" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">'&#64;HTTP_HOST&#64;</span> <span class="pre">/</span> <span class="pre">&#64;VSERVER&#64;</span> <span class="pre">/</span> <span class="pre">&#64;DATABASE&#64;</span> <span class="pre">/</span> <span class="pre">&#64;TABLE&#64;</span> <span class="pre">|</span> <span class="pre">&#64;PHPMYADMIN&#64;'</span></code></td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_TitleDatabase">
-<code class="descname">$cfg['TitleDatabase']</code><a class="headerlink" href="#cfg_TitleDatabase" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">'&#64;HTTP_HOST&#64;</span> <span class="pre">/</span> <span class="pre">&#64;VSERVER&#64;</span> <span class="pre">/</span> <span class="pre">&#64;DATABASE&#64;</span> <span class="pre">|</span> <span class="pre">&#64;PHPMYADMIN&#64;'</span></code></td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_TitleServer">
-<code class="descname">$cfg['TitleServer']</code><a class="headerlink" href="#cfg_TitleServer" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">'&#64;HTTP_HOST&#64;</span> <span class="pre">/</span> <span class="pre">&#64;VSERVER&#64;</span> <span class="pre">|</span> <span class="pre">&#64;PHPMYADMIN&#64;'</span></code></td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_TitleDefault">
-<code class="descname">$cfg['TitleDefault']</code><a class="headerlink" href="#cfg_TitleDefault" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">'&#64;HTTP_HOST&#64;</span> <span class="pre">|</span> <span class="pre">&#64;PHPMYADMIN&#64;'</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>Allows you to specify window&#8217;s title bar. You can use <a class="reference internal" href="faq.html#faq6-27"><span class="std std-ref">6.27 What format strings can I use?</span></a>.</p>
-</dd></dl>
-
-</div>
-<div class="section" id="theme-manager-settings">
-<h2>Theme manager settings<a class="headerlink" href="#theme-manager-settings" title="Permalink to this headline">¶</a></h2>
-<dl class="option">
-<dt id="cfg_ThemePath">
-<code class="descname">$cfg['ThemePath']</code><a class="headerlink" href="#cfg_ThemePath" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">'./themes'</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>If theme manager is active, use this as the path of the subdirectory
-containing all the themes.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_ThemeManager">
-<code class="descname">$cfg['ThemeManager']</code><a class="headerlink" href="#cfg_ThemeManager" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">true</td>
-</tr>
-</tbody>
-</table>
-<p>Enables user-selectable themes. See <a class="reference internal" href="faq.html#faqthemes"><span class="std std-ref">2.7 Using and creating themes</span></a>.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_ThemeDefault">
-<code class="descname">$cfg['ThemeDefault']</code><a class="headerlink" href="#cfg_ThemeDefault" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">'pmahomme'</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>The default theme (a subdirectory under <span class="target" id="index-86"></span><a class="reference internal" href="#cfg_ThemePath"><code class="xref config config-option docutils literal"><span class="pre">$cfg['ThemePath']</span></code></a>).</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_ThemePerServer">
-<code class="descname">$cfg['ThemePerServer']</code><a class="headerlink" href="#cfg_ThemePerServer" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">false</td>
-</tr>
-</tbody>
-</table>
-<p>Whether to allow different theme for each server.</p>
-</dd></dl>
-
-</div>
-<div class="section" id="default-queries">
-<h2>Default queries<a class="headerlink" href="#default-queries" title="Permalink to this headline">¶</a></h2>
-<dl class="option">
-<dt id="cfg_DefaultQueryTable">
-<code class="descname">$cfg['DefaultQueryTable']</code><a class="headerlink" href="#cfg_DefaultQueryTable" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">'SELECT</span> <span class="pre">*</span> <span class="pre">FROM</span> <span class="pre">&#64;TABLE&#64;</span> <span class="pre">WHERE</span> <span class="pre">1'</span></code></td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_DefaultQueryDatabase">
-<code class="descname">$cfg['DefaultQueryDatabase']</code><a class="headerlink" href="#cfg_DefaultQueryDatabase" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">string</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body"><code class="docutils literal"><span class="pre">''</span></code></td>
-</tr>
-</tbody>
-</table>
-<p>Default queries that will be displayed in query boxes when user didn&#8217;t
-specify any. You can use standard <a class="reference internal" href="faq.html#faq6-27"><span class="std std-ref">6.27 What format strings can I use?</span></a>.</p>
-</dd></dl>
-
-</div>
-<div class="section" id="mysql-settings">
-<h2>MySQL settings<a class="headerlink" href="#mysql-settings" title="Permalink to this headline">¶</a></h2>
-<dl class="option">
-<dt id="cfg_DefaultFunctions">
-<code class="descname">$cfg['DefaultFunctions']</code><a class="headerlink" href="#cfg_DefaultFunctions" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">array</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">array(...)</td>
-</tr>
-</tbody>
-</table>
-<p>Functions selected by default when inserting/changing row, Functions
-are defined for meta types as (FUNC_NUMBER, FUNC_DATE, FUNC_CHAR,
-FUNC_SPATIAL, FUNC_UUID) and for <code class="docutils literal"><span class="pre">first_timestamp</span></code>, which is used
-for first timestamp column in table.</p>
-</dd></dl>
-
-</div>
-<div class="section" id="developer">
-<h2>Developer<a class="headerlink" href="#developer" title="Permalink to this headline">¶</a></h2>
-<div class="admonition warning">
-<p class="first admonition-title">Warning</p>
-<p class="last">These settings might have huge effect on performance or security.</p>
-</div>
-<dl class="option">
-<dt id="cfg_DBG">
-<code class="descname">$cfg['DBG']</code><a class="headerlink" href="#cfg_DBG" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">array</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">array(...)</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_DBG_sql">
-<code class="descname">$cfg['DBG']['sql']</code><a class="headerlink" href="#cfg_DBG_sql" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">false</td>
-</tr>
-</tbody>
-</table>
-<p>Enable logging queries and execution times to be
-displayed in the console&#8217;s Debug SQL tab.</p>
-</dd></dl>
-
-<dl class="option">
-<dt id="cfg_DBG_demo">
-<code class="descname">$cfg['DBG']['demo']</code><a class="headerlink" href="#cfg_DBG_demo" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Type:</th><td class="field-body">boolean</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Default value:</th><td class="field-body">false</td>
-</tr>
-</tbody>
-</table>
-<p>Enable to let server present itself as demo server.
-This is used for &lt;<a class="reference external" href="https://demo.phpmyadmin.net/">https://demo.phpmyadmin.net/</a>&gt;.</p>
-</dd></dl>
-
-</div>
-<div class="section" id="examples">
-<h2>Examples<a class="headerlink" href="#examples" title="Permalink to this headline">¶</a></h2>
-<p>See following configuration snippets for usual setups of phpMyAdmin.</p>
-<div class="section" id="google-cloud-sql-with-ssl">
-<span id="example-google-ssl"></span><h3>Google Cloud SQL with SSL<a class="headerlink" href="#google-cloud-sql-with-ssl" title="Permalink to this headline">¶</a></h3>
-<p>To connect to Google Could SQL, you currently need to disable certificate
-verification. This is caused by the certficate being issued for CN matching
-your instance name, but you connect to an IP address and PHP tries to match
-these two. With verfication you end up with error message like:</p>
-<div class="highlight-default"><div class="highlight"><pre>Peer certificate CN=`api-project-851612429544:pmatest&#39; did not match expected CN=`8.8.8.8&#39;
-</pre></div>
-</div>
-<div class="admonition warning">
-<p class="first admonition-title">Warning</p>
-<p class="last">With disabled verification your traffic is encrypted, but you&#8217;re open to
-man in the middle attacks.</p>
-</div>
-<p>To connect phpMyAdmin to Google Cloud SQL using SSL download the client and
-server certificates and tell phpMyAdmin to use them:</p>
-<div class="highlight-php"><div class="highlight"><pre><span class="c1">// IP address of your instance</span>
-<span class="nv">$cfg</span><span class="p">[</span><span class="s1">&#39;Servers&#39;</span><span class="p">][</span><span class="mi">2</span><span class="p">][</span><span class="s1">&#39;host&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="s1">&#39;8.8.8.8&#39;</span><span class="p">;</span>
-<span class="c1">// Use SSL for connection</span>
-<span class="nv">$cfg</span><span class="p">[</span><span class="s1">&#39;Servers&#39;</span><span class="p">][</span><span class="nv">$i</span><span class="p">][</span><span class="s1">&#39;ssl&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="k">true</span><span class="p">;</span>
-<span class="c1">// Client secret key</span>
-<span class="nv">$cfg</span><span class="p">[</span><span class="s1">&#39;Servers&#39;</span><span class="p">][</span><span class="nv">$i</span><span class="p">][</span><span class="s1">&#39;ssl_key&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="s1">&#39;../client-key.pem&#39;</span><span class="p">;</span>
-<span class="c1">// Client certificate</span>
-<span class="nv">$cfg</span><span class="p">[</span><span class="s1">&#39;Servers&#39;</span><span class="p">][</span><span class="nv">$i</span><span class="p">][</span><span class="s1">&#39;ssl_cert&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="s1">&#39;../client-cert.pem&#39;</span><span class="p">;</span>
-<span class="c1">// Server certification authority</span>
-<span class="nv">$cfg</span><span class="p">[</span><span class="s1">&#39;Servers&#39;</span><span class="p">][</span><span class="nv">$i</span><span class="p">][</span><span class="s1">&#39;ssl_ca&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="s1">&#39;../server-ca.pem&#39;</span><span class="p">;</span>
-<span class="c1">// Disable SSL verification (see above note)</span>
-<span class="nv">$cfg</span><span class="p">[</span><span class="s1">&#39;Servers&#39;</span><span class="p">][</span><span class="nv">$i</span><span class="p">][</span><span class="s1">&#39;ssl_verify&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="k">false</span><span class="p">;</span>
-</pre></div>
-</div>
-<div class="admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last"><span class="target" id="index-87"></span><a class="reference internal" href="#cfg_Servers_ssl"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['ssl']</span></code></a>,
-<span class="target" id="index-88"></span><a class="reference internal" href="#cfg_Servers_ssl_key"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['ssl_key']</span></code></a>,
-<span class="target" id="index-89"></span><a class="reference internal" href="#cfg_Servers_ssl_cert"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['ssl_cert']</span></code></a>,
-<span class="target" id="index-90"></span><a class="reference internal" href="#cfg_Servers_ssl_ca"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['ssl_ca']</span></code></a>,
-<span class="target" id="index-91"></span><a class="reference internal" href="#cfg_Servers_ssl_verify"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['ssl_verify']</span></code></a></p>
-</div>
-</div>
-</div>
-</div>
-
-
-          </div>
-        </div>
-      </div>
-      <div class="sphinxsidebar" role="navigation" aria-label="main navigation">
-        <div class="sphinxsidebarwrapper">
-  <h3><a href="index.html">Table Of Contents</a></h3>
-  <ul>
-<li><a class="reference internal" href="#">Configuration</a><ul>
-<li><a class="reference internal" href="#basic-settings">Basic settings</a></li>
-<li><a class="reference internal" href="#server-connection-settings">Server connection settings</a></li>
-<li><a class="reference internal" href="#generic-settings">Generic settings</a></li>
-<li><a class="reference internal" href="#cookie-authentication-options">Cookie authentication options</a></li>
-<li><a class="reference internal" href="#navigation-panel-setup">Navigation panel setup</a></li>
-<li><a class="reference internal" href="#main-panel">Main panel</a></li>
-<li><a class="reference internal" href="#database-structure">Database structure</a></li>
-<li><a class="reference internal" href="#browse-mode">Browse mode</a></li>
-<li><a class="reference internal" href="#editing-mode">Editing mode</a></li>
-<li><a class="reference internal" href="#export-and-import-settings">Export and import settings</a></li>
-<li><a class="reference internal" href="#tabs-display-settings">Tabs display settings</a></li>
-<li><a class="reference internal" href="#pdf-options">PDF Options</a></li>
-<li><a class="reference internal" href="#languages">Languages</a></li>
-<li><a class="reference internal" href="#web-server-settings">Web server settings</a></li>
-<li><a class="reference internal" href="#theme-settings">Theme settings</a></li>
-<li><a class="reference internal" href="#design-customization">Design customization</a></li>
-<li><a class="reference internal" href="#text-fields">Text fields</a></li>
-<li><a class="reference internal" href="#sql-query-box-settings">SQL query box settings</a></li>
-<li><a class="reference internal" href="#web-server-upload-save-import-directories">Web server upload/save/import directories</a></li>
-<li><a class="reference internal" href="#various-display-setting">Various display setting</a></li>
-<li><a class="reference internal" href="#page-titles">Page titles</a></li>
-<li><a class="reference internal" href="#theme-manager-settings">Theme manager settings</a></li>
-<li><a class="reference internal" href="#default-queries">Default queries</a></li>
-<li><a class="reference internal" href="#mysql-settings">MySQL settings</a></li>
-<li><a class="reference internal" href="#developer">Developer</a></li>
-<li><a class="reference internal" href="#examples">Examples</a><ul>
-<li><a class="reference internal" href="#google-cloud-sql-with-ssl">Google Cloud SQL with SSL</a></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-
-  <h4>Previous topic</h4>
-  <p class="topless"><a href="setup.html"
-                        title="previous chapter">Installation</a></p>
-  <h4>Next topic</h4>
-  <p class="topless"><a href="user.html"
-                        title="next chapter">User Guide</a></p>
-  <div role="note" aria-label="source link">
-    <h3>This Page</h3>
-    <ul class="this-page-menu">
-      <li><a href="_sources/config.txt"
-            rel="nofollow">Show Source</a></li>
-    </ul>
-   </div>
-<div id="searchbox" style="display: none" role="search">
-  <h3>Quick search</h3>
-    <form class="search" action="search.html" method="get">
-      <div><input type="text" name="q" /></div>
-      <div><input type="submit" value="Go" /></div>
-      <input type="hidden" name="check_keywords" value="yes" />
-      <input type="hidden" name="area" value="default" />
-    </form>
-</div>
-<script type="text/javascript">$('#searchbox').show(0);</script>
-        </div>
-      </div>
-      <div class="clearer"></div>
-    </div>
-    <div class="related" role="navigation" aria-label="related navigation">
-      <h3>Navigation</h3>
-      <ul>
-        <li class="right" style="margin-right: 10px">
-          <a href="genindex.html" title="General Index"
-             >index</a></li>
-        <li class="right" >
-          <a href="user.html" title="User Guide"
-             >next</a> |</li>
-        <li class="right" >
-          <a href="setup.html" title="Installation"
-             >previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">phpMyAdmin 4.6.5.2 documentation</a> &#187;</li> 
-      </ul>
-    </div>
-    <div class="footer" role="contentinfo">
-        &#169; <a href="copyright.html">Copyright</a> 2012 - 2016, The phpMyAdmin devel team.
-      Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.4.6.
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/#pma/doc/html/copyright.html b/#pma/doc/html/copyright.html
deleted file mode 100644
index 7185d7bd..00000000
--- a/#pma/doc/html/copyright.html
+++ /dev/null
@@ -1,154 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    
-    <title>Copyright &#8212; phpMyAdmin 4.6.5.2 documentation</title>
-    
-    <link rel="stylesheet" href="_static/classic.css" type="text/css" />
-    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
-    
-    <script type="text/javascript">
-      var DOCUMENTATION_OPTIONS = {
-        URL_ROOT:    './',
-        VERSION:     '4.6.5.2',
-        COLLAPSE_INDEX: false,
-        FILE_SUFFIX: '.html',
-        HAS_SOURCE:  true
-      };
-    </script>
-    <script type="text/javascript" src="_static/jquery.js"></script>
-    <script type="text/javascript" src="_static/underscore.js"></script>
-    <script type="text/javascript" src="_static/doctools.js"></script>
-    <link rel="copyright" title="Copyright" href="#" />
-    <link rel="top" title="phpMyAdmin 4.6.5.2 documentation" href="index.html" />
-    <link rel="next" title="Credits" href="credits.html" />
-    <link rel="prev" title="Distributing and packaging phpMyAdmin" href="vendors.html" /> 
-  </head>
-  <body role="document">
-    <div class="related" role="navigation" aria-label="related navigation">
-      <h3>Navigation</h3>
-      <ul>
-        <li class="right" style="margin-right: 10px">
-          <a href="genindex.html" title="General Index"
-             accesskey="I">index</a></li>
-        <li class="right" >
-          <a href="credits.html" title="Credits"
-             accesskey="N">next</a> |</li>
-        <li class="right" >
-          <a href="vendors.html" title="Distributing and packaging phpMyAdmin"
-             accesskey="P">previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">phpMyAdmin 4.6.5.2 documentation</a> &#187;</li> 
-      </ul>
-    </div>  
-
-    <div class="document">
-      <div class="documentwrapper">
-        <div class="bodywrapper">
-          <div class="body" role="main">
-            
-  <div class="section" id="copyright">
-<span id="id1"></span><h1>Copyright<a class="headerlink" href="#copyright" title="Permalink to this headline">¶</a></h1>
-<div class="highlight-none"><div class="highlight"><pre>Copyright (C) 1998-2000 Tobias Ratschiller &lt;tobias_at_ratschiller.com&gt;
-Copyright (C) 2001-2014 Marc Delisle &lt;marc_at_infomarc.info&gt;
-    Olivier Müller &lt;om_at_omnis.ch&gt;
-    Robin Johnson &lt;robbat2_at_users.sourceforge.net&gt;
-    Alexander M. Turek &lt;me_at_derrabus.de&gt;
-    Michal Čihař &lt;michal_at_cihar.com&gt;
-    Garvin Hicking &lt;me_at_supergarv.de&gt;
-    Michael Keck &lt;mkkeck_at_users.sourceforge.net&gt;
-    Sebastian Mendel &lt;cybot_tm_at_users.sourceforge.net&gt;
-    [check credits for more details]
-</pre></div>
-</div>
-<p>This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License version 2, as
-published by the Free Software Foundation.</p>
-<p>This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-General Public License for more details.</p>
-<p>You should have received a copy of the GNU General Public License
-along with this program. If not, see &lt;<a class="reference external" href="https://www.gnu.org/licenses/">https://www.gnu.org/licenses/</a>&gt;.</p>
-<div class="section" id="third-party-licenses">
-<h2>Third party licenses<a class="headerlink" href="#third-party-licenses" title="Permalink to this headline">¶</a></h2>
-<p>phpMyAdmin includes several third party libraries which come under their
-respective licenses.</p>
-<p>jQuery&#8217;s license, which is where we got the files under js/jquery/ is
-(MIT|GPL), a copy of each license is available in this repository (GPL
-is available as LICENSE, MIT as js/jquery/MIT-LICENSE.txt).</p>
-<p>TCPDF which is located under libraries/tcpdf is released under GPL
-version 3 and the license is available as libraries/tcpdf/LICENSE.TXT.</p>
-<p>DejaVu fonts which are located under libraries/tcpdf/fonts/ and their
-license is documented in
-libraries/tcpdf/fonts/dejavu-fonts-ttf-2.33/LICENSE.</p>
-<p>PHP-gettext which is located under libraries/php-gettext/ is released
-under GPL version 2 license which is available in the LICENSE file.</p>
-</div>
-</div>
-
-
-          </div>
-        </div>
-      </div>
-      <div class="sphinxsidebar" role="navigation" aria-label="main navigation">
-        <div class="sphinxsidebarwrapper">
-  <h3><a href="index.html">Table Of Contents</a></h3>
-  <ul>
-<li><a class="reference internal" href="#">Copyright</a><ul>
-<li><a class="reference internal" href="#third-party-licenses">Third party licenses</a></li>
-</ul>
-</li>
-</ul>
-
-  <h4>Previous topic</h4>
-  <p class="topless"><a href="vendors.html"
-                        title="previous chapter">Distributing and packaging phpMyAdmin</a></p>
-  <h4>Next topic</h4>
-  <p class="topless"><a href="credits.html"
-                        title="next chapter">Credits</a></p>
-  <div role="note" aria-label="source link">
-    <h3>This Page</h3>
-    <ul class="this-page-menu">
-      <li><a href="_sources/copyright.txt"
-            rel="nofollow">Show Source</a></li>
-    </ul>
-   </div>
-<div id="searchbox" style="display: none" role="search">
-  <h3>Quick search</h3>
-    <form class="search" action="search.html" method="get">
-      <div><input type="text" name="q" /></div>
-      <div><input type="submit" value="Go" /></div>
-      <input type="hidden" name="check_keywords" value="yes" />
-      <input type="hidden" name="area" value="default" />
-    </form>
-</div>
-<script type="text/javascript">$('#searchbox').show(0);</script>
-        </div>
-      </div>
-      <div class="clearer"></div>
-    </div>
-    <div class="related" role="navigation" aria-label="related navigation">
-      <h3>Navigation</h3>
-      <ul>
-        <li class="right" style="margin-right: 10px">
-          <a href="genindex.html" title="General Index"
-             >index</a></li>
-        <li class="right" >
-          <a href="credits.html" title="Credits"
-             >next</a> |</li>
-        <li class="right" >
-          <a href="vendors.html" title="Distributing and packaging phpMyAdmin"
-             >previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">phpMyAdmin 4.6.5.2 documentation</a> &#187;</li> 
-      </ul>
-    </div>
-    <div class="footer" role="contentinfo">
-        &#169; <a href="#">Copyright</a> 2012 - 2016, The phpMyAdmin devel team.
-      Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.4.6.
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/#pma/doc/html/credits.html b/#pma/doc/html/credits.html
deleted file mode 100644
index 6e88aeba..00000000
--- a/#pma/doc/html/credits.html
+++ /dev/null
@@ -1,1336 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    
-    <title>Credits &#8212; phpMyAdmin 4.6.5.2 documentation</title>
-    
-    <link rel="stylesheet" href="_static/classic.css" type="text/css" />
-    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
-    
-    <script type="text/javascript">
-      var DOCUMENTATION_OPTIONS = {
-        URL_ROOT:    './',
-        VERSION:     '4.6.5.2',
-        COLLAPSE_INDEX: false,
-        FILE_SUFFIX: '.html',
-        HAS_SOURCE:  true
-      };
-    </script>
-    <script type="text/javascript" src="_static/jquery.js"></script>
-    <script type="text/javascript" src="_static/underscore.js"></script>
-    <script type="text/javascript" src="_static/doctools.js"></script>
-    <link rel="copyright" title="Copyright" href="copyright.html" />
-    <link rel="top" title="phpMyAdmin 4.6.5.2 documentation" href="index.html" />
-    <link rel="next" title="Glossary" href="glossary.html" />
-    <link rel="prev" title="Copyright" href="copyright.html" /> 
-  </head>
-  <body role="document">
-    <div class="related" role="navigation" aria-label="related navigation">
-      <h3>Navigation</h3>
-      <ul>
-        <li class="right" style="margin-right: 10px">
-          <a href="genindex.html" title="General Index"
-             accesskey="I">index</a></li>
-        <li class="right" >
-          <a href="glossary.html" title="Glossary"
-             accesskey="N">next</a> |</li>
-        <li class="right" >
-          <a href="copyright.html" title="Copyright"
-             accesskey="P">previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">phpMyAdmin 4.6.5.2 documentation</a> &#187;</li> 
-      </ul>
-    </div>  
-
-    <div class="document">
-      <div class="documentwrapper">
-        <div class="bodywrapper">
-          <div class="body" role="main">
-            
-  <div class="section" id="credits">
-<span id="id1"></span><h1>Credits<a class="headerlink" href="#credits" title="Permalink to this headline">¶</a></h1>
-<div class="section" id="credits-in-chronological-order">
-<h2>Credits, in chronological order<a class="headerlink" href="#credits-in-chronological-order" title="Permalink to this headline">¶</a></h2>
-<ul class="simple">
-<li>Tobias Ratschiller &lt;tobias_at_ratschiller.com&gt;<ul>
-<li>creator of the phpmyadmin project</li>
-<li>maintainer from 1998 to summer 2000</li>
-</ul>
-</li>
-<li>Marc Delisle &lt;marc_at_infomarc.info&gt;<ul>
-<li>multi-language version in December 1998</li>
-<li>various fixes and improvements</li>
-<li><a class="reference internal" href="glossary.html#term-sql"><span class="xref std std-term">SQL</span></a> analyser (most of it)</li>
-<li>current project maintainer</li>
-<li>maintains content on our website</li>
-</ul>
-</li>
-<li>Olivier Müller &lt;om_at_omnis.ch&gt;<ul>
-<li>started SourceForge phpMyAdmin project in March 2001</li>
-<li>sync&#8217;ed different existing CVS trees with new features and bugfixes</li>
-<li>multi-language improvements, dynamic language selection</li>
-<li>many bugfixes and improvements</li>
-</ul>
-</li>
-<li>Loïc Chapeaux &lt;lolo_at_phpheaven.net&gt;<ul>
-<li>rewrote and optimized JavaScript, DHTML and DOM stuff</li>
-<li>rewrote the scripts so they fit the <a class="reference internal" href="glossary.html#term-pear"><span class="xref std std-term">PEAR</span></a> coding standards and
-generate XHTML1.0 and CSS2 compliant codes</li>
-<li>improved the language detection system</li>
-<li>many bugfixes and improvements</li>
-</ul>
-</li>
-<li>Robin Johnson &lt;robbat2_at_users.sourceforge.net&gt;<ul>
-<li>database maintenance controls</li>
-<li>table type code</li>
-<li>Host authentication <a class="reference internal" href="glossary.html#term-ip"><span class="xref std std-term">IP</span></a> Allow/Deny</li>
-<li>DB-based configuration (Not completed)</li>
-<li><a class="reference internal" href="glossary.html#term-sql"><span class="xref std std-term">SQL</span></a> parser and pretty-printer</li>
-<li><a class="reference internal" href="glossary.html#term-sql"><span class="xref std std-term">SQL</span></a> validator</li>
-<li>many bugfixes and improvements</li>
-</ul>
-</li>
-<li>Armel Fauveau &lt;armel.fauveau_at_globalis-ms.com&gt;<ul>
-<li>bookmarks feature</li>
-<li>multiple dump feature</li>
-<li>gzip dump feature</li>
-<li>zip dump feature</li>
-</ul>
-</li>
-<li>Geert Lund &lt;glund_at_silversoft.dk&gt;<ul>
-<li>various fixes</li>
-<li>moderator of the phpMyAdmin former users forum at phpwizard.net</li>
-</ul>
-</li>
-<li>Korakot Chaovavanich &lt;korakot_at_iname.com&gt;<ul>
-<li>&#8220;insert as new row&#8221; feature</li>
-</ul>
-</li>
-<li>Pete Kelly &lt;webmaster_at_trafficg.com&gt;<ul>
-<li>rewrote and fix dump code</li>
-<li>bugfixes</li>
-</ul>
-</li>
-<li>Steve Alberty &lt;alberty_at_neptunlabs.de&gt;<ul>
-<li>rewrote dump code for PHP4</li>
-<li>mySQL table statistics</li>
-<li>bugfixes</li>
-</ul>
-</li>
-<li>Benjamin Gandon &lt;gandon_at_isia.cma.fr&gt;<ul>
-<li>main author of the version 2.1.0.1</li>
-<li>bugfixes</li>
-</ul>
-</li>
-<li>Alexander M. Turek &lt;me_at_derrabus.de&gt;<ul>
-<li>MySQL 4.0 / 4.1 / 5.0 compatibility</li>
-<li>abstract database interface (PMA_DBI) with MySQLi support</li>
-<li>privileges administration</li>
-<li><a class="reference internal" href="glossary.html#term-xml"><span class="xref std std-term">XML</span></a> exports</li>
-<li>various features and fixes</li>
-<li>German language file updates</li>
-</ul>
-</li>
-<li>Mike Beck &lt;mike.beck_at_web.de&gt;<ul>
-<li>automatic joins in QBE</li>
-<li>links column in printview</li>
-<li>Relation view</li>
-</ul>
-</li>
-<li>Michal Čihař &lt;michal_at_cihar.com&gt;<ul>
-<li>enhanced index creation/display feature</li>
-<li>feature to use a different charset for HTML than for MySQL</li>
-<li>improvements of export feature</li>
-<li>various features and fixes</li>
-<li>Czech language file updates</li>
-<li>created current website for phpMyAdmin</li>
-</ul>
-</li>
-<li>Christophe Gesché from the &#8220;MySQL Form Generator for PHPMyAdmin&#8221;
-(<a class="reference external" href="https://sourceforge.net/projects/phpmysqlformgen/">https://sourceforge.net/projects/phpmysqlformgen/</a>)<ul>
-<li>suggested the patch for multiple table printviews</li>
-</ul>
-</li>
-<li>Garvin Hicking &lt;me_at_supergarv.de&gt;<ul>
-<li>built the patch for vertical display of table rows</li>
-<li>built the Javascript based Query window + <a class="reference internal" href="glossary.html#term-sql"><span class="xref std std-term">SQL</span></a> history</li>
-<li>Improvement of column/db comments</li>
-<li>(MIME)-Transformations for columns</li>
-<li>Use custom alias names for Databases in left frame</li>
-<li>hierarchical/nested table display</li>
-<li><a class="reference internal" href="glossary.html#term-pdf"><span class="xref std std-term">PDF</span></a>-scratchboard for WYSIWYG-
-distribution of <a class="reference internal" href="glossary.html#term-pdf"><span class="xref std std-term">PDF</span></a> relations</li>
-<li>new icon sets</li>
-<li>vertical display of column properties page</li>
-<li>some bugfixes, features, support, German language additions</li>
-</ul>
-</li>
-<li>Yukihiro Kawada &lt;kawada_at_den.fujifilm.co.jp&gt;<ul>
-<li>japanese kanji encoding conversion feature</li>
-</ul>
-</li>
-<li>Piotr Roszatycki &lt;d3xter_at_users.sourceforge.net&gt; and Dan Wilson<ul>
-<li>the Cookie authentication mode</li>
-</ul>
-</li>
-<li>Axel Sander &lt;n8falke_at_users.sourceforge.net&gt;<ul>
-<li>table relation-links feature</li>
-</ul>
-</li>
-<li>Maxime Delorme &lt;delorme.maxime_at_free.fr&gt;<ul>
-<li><a class="reference internal" href="glossary.html#term-pdf"><span class="xref std std-term">PDF</span></a> schema output, thanks also to
-Olivier Plathey for the &#8220;FPDF&#8221; library (see &lt;<a class="reference external" href="http://www.fpdf.org/">http://www.fpdf.org/</a>&gt;), Steven
-Wittens for the &#8220;UFPDF&#8221; library and
-Nicola Asuni for the &#8220;TCPDF&#8221; library (see &lt;<a class="reference external" href="https://tcpdf.org/">https://tcpdf.org/</a>&gt;).</li>
-</ul>
-</li>
-<li>Olof Edlund &lt;olof.edlund_at_upright.se&gt;<ul>
-<li><a class="reference internal" href="glossary.html#term-sql"><span class="xref std std-term">SQL</span></a> validator server</li>
-</ul>
-</li>
-<li>Ivan R. Lanin &lt;ivanlanin_at_users.sourceforge.net&gt;<ul>
-<li>phpMyAdmin logo (until June 2004)</li>
-</ul>
-</li>
-<li>Mike Cochrane &lt;mike_at_graftonhall.co.nz&gt;<ul>
-<li>blowfish library from the Horde project (withdrawn in release 4.0)</li>
-</ul>
-</li>
-<li>Marcel Tschopp &lt;ne0x_at_users.sourceforge.net&gt;<ul>
-<li>mysqli support</li>
-<li>many bugfixes and improvements</li>
-</ul>
-</li>
-<li>Nicola Asuni (Tecnick.com)<ul>
-<li>TCPDF library (&lt;<a class="reference external" href="https://tcpdf.org">https://tcpdf.org</a>&gt;)</li>
-</ul>
-</li>
-<li>Michael Keck &lt;mkkeck_at_users.sourceforge.net&gt;<ul>
-<li>redesign for 2.6.0</li>
-<li>phpMyAdmin sailboat logo (June 2004)</li>
-</ul>
-</li>
-<li>Mathias Landhäußer<ul>
-<li>Representation at conferences</li>
-</ul>
-</li>
-<li>Sebastian Mendel &lt;cybot_tm_at_users.sourceforge.net&gt;<ul>
-<li>interface improvements</li>
-<li>various bugfixes</li>
-</ul>
-</li>
-<li>Ivan A Kirillov<ul>
-<li>new relations Designer</li>
-</ul>
-</li>
-<li>Raj Kissu Rajandran (Google Summer of Code 2008)<ul>
-<li>BLOBstreaming support (withdrawn in release 4.0)</li>
-</ul>
-</li>
-<li>Piotr Przybylski (Google Summer of Code 2008, 2010 and 2011)<ul>
-<li>improved setup script</li>
-<li>user preferences</li>
-<li>Drizzle support</li>
-</ul>
-</li>
-<li>Derek Schaefer (Google Summer of Code 2009)<ul>
-<li>Improved the import system</li>
-</ul>
-</li>
-<li>Alexander Rutkowski (Google Summer of Code 2009)<ul>
-<li>Tracking mechanism</li>
-</ul>
-</li>
-<li>Zahra Naeem (Google Summer of Code 2009)<ul>
-<li>Synchronization feature (removed in release 4.0)</li>
-</ul>
-</li>
-<li>Tomáš Srnka (Google Summer of Code 2009)<ul>
-<li>Replication support</li>
-</ul>
-</li>
-<li>Muhammad Adnan (Google Summer of Code 2010)<ul>
-<li>Relation schema export to multiple formats</li>
-</ul>
-</li>
-<li>Lori Lee (Google Summer of Code 2010)<ul>
-<li>User interface improvements</li>
-<li>ENUM/SET editor</li>
-<li>Simplified interface for export/import</li>
-</ul>
-</li>
-<li>Ninad Pundalik (Google Summer of Code 2010)<ul>
-<li>AJAXifying the interface</li>
-</ul>
-</li>
-<li>Martynas Mickevičius (Google Summer of Code 2010)<ul>
-<li>Charts</li>
-</ul>
-</li>
-<li>Barrie Leslie<ul>
-<li>BLOBstreaming support with PBMS PHP extension (withdrawn in release
-4.0)</li>
-</ul>
-</li>
-<li>Ankit Gupta (Google Summer of Code 2010)<ul>
-<li>Visual query builder</li>
-</ul>
-</li>
-<li>Madhura Jayaratne (Google Summer of Code 2011)<ul>
-<li>OpenGIS support</li>
-</ul>
-</li>
-<li>Ammar Yasir (Google Summer of Code 2011)<ul>
-<li>Zoom search</li>
-</ul>
-</li>
-<li>Aris Feryanto (Google Summer of Code 2011)<ul>
-<li>Browse-mode improvements</li>
-</ul>
-</li>
-<li>Thilanka Kaushalya (Google Summer of Code 2011)<ul>
-<li>AJAXification</li>
-</ul>
-</li>
-<li>Tyron Madlener (Google Summer of Code 2011)<ul>
-<li>Query statistics and charts for the status page</li>
-</ul>
-</li>
-<li>Zarubin Stas (Google Summer of Code 2011)<ul>
-<li>Automated testing</li>
-</ul>
-</li>
-<li>Rouslan Placella (Google Summer of Code 2011 and 2012)<ul>
-<li>Improved support for Stored Routines, Triggers and Events</li>
-<li>Italian translation updates</li>
-<li>Removal of frames, new navigation</li>
-</ul>
-</li>
-<li>Dieter Adriaenssens<ul>
-<li>Various bugfixes</li>
-<li>Dutch translation updates</li>
-</ul>
-</li>
-<li>Alex Marin (Google Summer of Code 2012)<ul>
-<li>New plugins and properties system</li>
-</ul>
-</li>
-<li>Thilina Buddika Abeyrathna (Google Summer of Code 2012)<ul>
-<li>Refactoring</li>
-</ul>
-</li>
-<li>Atul Pratap Singh  (Google Summer of Code 2012)<ul>
-<li>Refactoring</li>
-</ul>
-</li>
-<li>Chanaka Indrajith (Google Summer of Code 2012)<ul>
-<li>Refactoring</li>
-</ul>
-</li>
-<li>Yasitha Pandithawatta (Google Summer of Code 2012)<ul>
-<li>Automated testing</li>
-</ul>
-</li>
-<li>Jim Wigginton (phpseclib.sourceforge.net)<ul>
-<li>phpseclib</li>
-</ul>
-</li>
-<li>Bin Zu (Google Summer of Code 2013)<ul>
-<li>Refactoring</li>
-</ul>
-</li>
-<li>Supun Nakandala (Google Summer of Code 2013)<ul>
-<li>Refactoring</li>
-</ul>
-</li>
-<li>Mohamed Ashraf (Google Summer of Code 2013)<ul>
-<li>AJAX error reporting</li>
-</ul>
-</li>
-<li>Adam Kang (Google Summer of Code 2013)<ul>
-<li>Automated testing</li>
-</ul>
-</li>
-<li>Ayush Chaudhary (Google Summer of Code 2013)<ul>
-<li>Automated testing</li>
-</ul>
-</li>
-<li>Kasun Chathuranga (Google Summer of Code 2013)<ul>
-<li>Interface improvements</li>
-</ul>
-</li>
-<li>Hugues Peccatte<ul>
-<li>Load/save query by example (database search bookmarks)</li>
-</ul>
-</li>
-<li>Smita Kumari (Google Summer of Code 2014)<ul>
-<li>Central list of columns</li>
-<li>Improve table structure (normalization)</li>
-</ul>
-</li>
-<li>Ashutosh Dhundhara (Google Summer of Code 2014)<ul>
-<li>Interface improvements</li>
-</ul>
-</li>
-<li>Dhananjay Nakrani (Google Summer of Code 2014)<ul>
-<li>PHP error reporting</li>
-</ul>
-</li>
-<li>Edward Cheng (Google Summer of Code 2014)<ul>
-<li>SQL Query Console</li>
-</ul>
-</li>
-<li>Kankanamge Bimal Yashodha (Google Summer of Code 2014)<ul>
-<li>Refactoring: Designer/schema integration</li>
-</ul>
-</li>
-<li>Chirayu Chiripal (Google Summer of Code 2014)<ul>
-<li>Custom field handlers (Input based MIME transformations)</li>
-<li>Export with table/column name changes</li>
-</ul>
-</li>
-<li>Dan Ungureanu (Google Summer of Code 2015)<ul>
-<li>New parser and analyzer</li>
-</ul>
-</li>
-<li>Nisarg Jhaveri (Google Summer of Code 2015)<ul>
-<li>Page-related settings</li>
-<li>SQL debugging integration to the Console</li>
-<li>Other UI improvements</li>
-</ul>
-</li>
-<li>Deven Bansod (Google Summer of Code 2015)<ul>
-<li>Print view using CSS</li>
-<li>Other UI improvements and new features</li>
-</ul>
-</li>
-</ul>
-<p>And also to the following people who have contributed minor changes,
-enhancements, bugfixes or support for a new language since version
-2.1.0:</p>
-<p>Bora Alioglu, Ricardo ?, Sven-Erik Andersen, Alessandro Astarita,
-Péter Bakondy, Borges Botelho, Olivier Bussier, Neil Darlow, Mats
-Engstrom, Ian Davidson, Laurent Dhima, Kristof Hamann, Thomas Kläger,
-Lubos Klokner, Martin Marconcini, Girish Nair, David Nordenberg,
-Andreas Pauley, Bernard M. Piller, Laurent Haas, &#8220;Sakamoto&#8221;, Yuval
-Sarna, www.securereality.com.au, Alexis Soulard, Alvar Soome, Siu Sun,
-Peter Svec, Michael Tacelosky, Rachim Tamsjadi, Kositer Uros, Luís V.,
-Martijn W. van der Lee, Algis Vainauskas, Daniel Villanueva, Vinay,
-Ignacio Vazquez-Abrams, Chee Wai, Jakub Wilk, Thomas Michael
-Winningham, Vilius Zigmantas, &#8220;Manuzhai&#8221;.</p>
-</div>
-<div class="section" id="translators">
-<h2>Translators<a class="headerlink" href="#translators" title="Permalink to this headline">¶</a></h2>
-<p>Following people have contributed to translation of phpMyAdmin:</p>
-<ul>
-<li><p class="first">Albanian</p>
-<blockquote>
-<div><ul class="simple">
-<li>Arben Çokaj &lt;acokaj_at_shkoder.net&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Arabic</p>
-<blockquote>
-<div><ul class="simple">
-<li>Ahmed Saleh Abd El-Raouf Ismae &lt;a.saleh.ismael_at_gmail.com&gt;</li>
-<li>Ahmed Saad &lt;egbrave_at_hotmail.com&gt;</li>
-<li>hassan mokhtari &lt;persiste1_at_gmail.com&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Armenian</p>
-<blockquote>
-<div><ul class="simple">
-<li>Andrey Aleksanyants &lt;aaleksanyants_at_yahoo.com&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Azerbaijani</p>
-<blockquote>
-<div><ul class="simple">
-<li>Mircəlal &lt;01youknowme_at_gmail.com&gt;</li>
-<li>Huseyn &lt;huseyn_esgerov_at_mail.ru&gt;</li>
-<li>Sevdimali İsa &lt;sevdimaliisayev_at_mail.ru&gt;</li>
-<li>Jafar &lt;sharifov_at_programmer.net&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Belarusian</p>
-<blockquote>
-<div><ul class="simple">
-<li>Viktar Palstsiuk &lt;vipals_at_gmail.com&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Bulgarian</p>
-<blockquote>
-<div><ul class="simple">
-<li>Boyan Kehayov &lt;bkehayov_at_gmail.com&gt;</li>
-<li>Valter Georgiev &lt;blagynchy_at_gmail.com&gt;</li>
-<li>Valentin Mladenov &lt;hudsonvsm_at_gmail.com&gt;</li>
-<li>P &lt;plamen_mbx_at_yahoo.com&gt;</li>
-<li>krasimir &lt;vip_at_krasio-valia.com&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Catalan</p>
-<blockquote>
-<div><ul class="simple">
-<li>josep constanti &lt;jconstanti_at_yahoo.es&gt;</li>
-<li>Xavier Navarro &lt;xvnavarro_at_gmail.com&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Chinese (China)</p>
-<blockquote>
-<div><ul class="simple">
-<li>Vincent Lau &lt;3092849_at_qq.com&gt;</li>
-<li>Zheng Dan &lt;clanboy_at_163.com&gt;</li>
-<li>disorderman &lt;disorderman_at_qq.com&gt;</li>
-<li>Rex Lee &lt;duguying2008_at_gmail.com&gt;</li>
-<li>&lt;fundawang_at_gmail.com&gt;</li>
-<li>popcorner &lt;memoword_at_163.com&gt;</li>
-<li>Yizhou Qiang &lt;qyz.yswy_at_hotmail.com&gt;</li>
-<li>zz &lt;tczzjin_at_gmail.com&gt;</li>
-<li>Terry Weng &lt;wengshiyu_at_gmail.com&gt;</li>
-<li>whh &lt;whhlcj_at_126.com&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Chinese (Taiwan)</p>
-<blockquote>
-<div><ul class="simple">
-<li>Albert Song &lt;albb0920_at_gmail.com&gt;</li>
-<li>Chien Wei Lin &lt;cwlin0416_at_gmail.com&gt;</li>
-<li>LNDDYL &lt;lnddyl_at_outlook.com&gt;</li>
-<li>Peter Dave Hello &lt;xs910203_at_gmail.com&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Colognian</p>
-<blockquote>
-<div><ul class="simple">
-<li>Purodha &lt;publi_at_web.de&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Czech</p>
-<blockquote>
-<div><ul class="simple">
-<li>Aleš Hakl &lt;ales_at_hakl.net&gt;</li>
-<li>Dalibor Straka &lt;dalibor.straka3_at_gmail.com&gt;</li>
-<li>Martin Vidner &lt;martin_at_vidner.net&gt;</li>
-<li>Ondra Šimeček &lt;ondrasek.simecek_at_gmail.com&gt;</li>
-<li>Jan Palider &lt;palider_at_seznam.cz&gt;</li>
-<li>Petr Kateřiňák &lt;petr.katerinak_at_gmail.com&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Danish</p>
-<blockquote>
-<div><ul class="simple">
-<li>Aputsiaĸ Niels Janussen &lt;aj_at_isit.gl&gt;</li>
-<li>Dennis Jakobsen &lt;dennis.jakobsen_at_gmail.com&gt;</li>
-<li>Jonas &lt;jonas.den.smarte_at_gmail.com&gt;</li>
-<li>Claus Svalekjaer &lt;just.my.smtp.server_at_gmail.com&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Dutch</p>
-<blockquote>
-<div><ul class="simple">
-<li><ol class="first upperalpha">
-<li>Voogt &lt;a.voogt_at_hccnet.nl&gt;</li>
-</ol>
-</li>
-<li>dingo thirteen &lt;dingo13_at_gmail.com&gt;</li>
-<li>Robin van der Vliet &lt;info_at_robinvandervliet.nl&gt;</li>
-<li>Dieter Adriaenssens &lt;ruleant_at_users.sourceforge.net&gt;</li>
-<li>Niko Strijbol &lt;strijbol.niko_at_gmail.com&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">English (United Kingdom)</p>
-<blockquote>
-<div><ul class="simple">
-<li>Dries Verschuere &lt;dries.verschuere_at_outlook.com&gt;</li>
-<li>Francisco Rocha &lt;j.francisco.o.rocha_at_zoho.com&gt;</li>
-<li>Marc Delisle &lt;marc_at_infomarc.info&gt;</li>
-<li>Marek Tomaštík &lt;tomastik.m_at_gmail.com&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Esperanto</p>
-<blockquote>
-<div><ul class="simple">
-<li>Eliovir &lt;eliovir_at_gmail.com&gt;</li>
-<li>Robin van der Vliet &lt;info_at_robinvandervliet.nl&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Estonian</p>
-<blockquote>
-<div><ul class="simple">
-<li>Kristjan Räts &lt;kristjanrats_at_gmail.com&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Finnish</p>
-<blockquote>
-<div><ul class="simple">
-<li>Juha &lt;jremes_at_outlook.com&gt;</li>
-<li>Lari Oesch &lt;lari_at_oesch.me&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">French</p>
-<blockquote>
-<div><ul class="simple">
-<li>Marc Delisle &lt;marc_at_infomarc.info&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Frisian</p>
-<blockquote>
-<div><ul class="simple">
-<li>Robin van der Vliet &lt;info_at_robinvandervliet.nl&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Galician</p>
-<blockquote>
-<div><ul class="simple">
-<li>Xosé Calvo &lt;xosecalvo_at_gmail.com&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">German</p>
-<blockquote>
-<div><ul class="simple">
-<li>Julian Ladisch &lt;github.com-t3if_at_ladisch.de&gt;</li>
-<li>Jan Erik Zassenhaus &lt;jan.zassenhaus_at_jgerman.de&gt;</li>
-<li>Lasse Goericke &lt;lasse_at_mydom.de&gt;</li>
-<li>Matthias Bluthardt &lt;matthias_at_bluthardt.org&gt;</li>
-<li>Michael Koch &lt;michael.koch_at_enough.de&gt;</li>
-<li>Ann + J.M. &lt;phpMyAdmin_at_ZweiSteinSoft.de&gt;</li>
-<li>&lt;pma_at_sebastianmendel.de&gt;</li>
-<li>Phillip Rohmberger &lt;rohmberger_at_hotmail.de&gt;</li>
-<li>Hauke Henningsen &lt;sqrt_at_entless.org&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Greek</p>
-<blockquote>
-<div><ul class="simple">
-<li>Παναγιώτης Παπάζογλου &lt;papaz_p_at_yahoo.com&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Hebrew</p>
-<blockquote>
-<div><ul class="simple">
-<li>Moshe Harush &lt;mmh15_at_windowslive.com&gt;</li>
-<li>Yaron Shahrabani &lt;sh.yaron_at_gmail.com&gt;</li>
-<li>Eyal Visoker &lt;visokereyal_at_gmail.com&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Hindi</p>
-<blockquote>
-<div><ul class="simple">
-<li>Atul Pratap Singh &lt;atulpratapsingh05_at_gmail.com&gt;</li>
-<li>Yogeshwar &lt;charanyogeshwar_at_gmail.com&gt;</li>
-<li>Deven Bansod &lt;devenbansod.bits_at_gmail.com&gt;</li>
-<li>Kushagra Pandey &lt;kushagra4296_at_gmail.com&gt;</li>
-<li>Nisarg Jhaveri &lt;nisargjhaveri_at_gmail.com&gt;</li>
-<li>Roohan Kazi &lt;roohan_cena_at_yahoo.co.in&gt;</li>
-<li>Yugal Pantola &lt;yug.scorpio_at_gmail.com&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Hungarian</p>
-<blockquote>
-<div><ul class="simple">
-<li>Akos Eros &lt;erosakos02_at_gmail.com&gt;</li>
-<li>Dániel Tóth &lt;leedermeister_at_gmail.com&gt;</li>
-<li>Szász Attila &lt;undernetangel_at_gmail.com&gt;</li>
-<li>Balázs Úr &lt;urbalazs_at_gmail.com&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Indonesian</p>
-<blockquote>
-<div><ul class="simple">
-<li>Deky Arifianto &lt;Deky40_at_gmail.com&gt;</li>
-<li>Andika Triwidada &lt;andika_at_gmail.com&gt;</li>
-<li>Dadan Setia &lt;da2n_s_at_yahoo.co.id&gt;</li>
-<li>Dadan Setia &lt;dadan.setia_at_gmail.com&gt;</li>
-<li>Yohanes Edwin &lt;edwin_at_yohanesedwin.com&gt;</li>
-<li>Fadhiil Rachman &lt;fadhiilrachman_at_gmail.com&gt;</li>
-<li>Benny &lt;tarzq28_at_gmail.com&gt;</li>
-<li>Tommy Surbakti &lt;tommy_at_surbakti.net&gt;</li>
-<li>Zufar Fathi Suhardi &lt;zufar.bogor_at_gmail.com&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Interlingua</p>
-<blockquote>
-<div><ul class="simple">
-<li>Giovanni Sora &lt;g.sora_at_tiscali.it&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Italian</p>
-<blockquote>
-<div><ul class="simple">
-<li>Francesco Saverio Giacobazzi &lt;francesco.giacobazzi_at_ferrania.it&gt;</li>
-<li>Marco Pozzato &lt;ironpotts_at_gmail.com&gt;</li>
-<li>Stefano Martinelli &lt;stefano.ste.martinelli_at_gmail.com&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Japanese</p>
-<blockquote>
-<div><ul class="simple">
-<li>k725 &lt;alexalex.kobayashi_at_gmail.com&gt;</li>
-<li>Hiroshi Chiyokawa &lt;hiroshi.chiyokawa_at_gmail.com&gt;</li>
-<li>Masahiko HISAKAWA &lt;orzkun_at_ageage.jp&gt;</li>
-<li>worldwideskier &lt;worldwideskier_at_yahoo.co.jp&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Kannada</p>
-<blockquote>
-<div><ul class="simple">
-<li>Robin van der Vliet &lt;info_at_robinvandervliet.nl&gt;</li>
-<li>Shameem Ahmed A Mulla &lt;shameem.sam_at_gmail.com&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Korean</p>
-<blockquote>
-<div><ul class="simple">
-<li>Bumsoo Kim &lt;bskim45_at_gmail.com&gt;</li>
-<li>Kyeong Su Shin &lt;cdac1234_at_gmail.com&gt;</li>
-<li>Dongyoung Kim &lt;dckyoung_at_gmail.com&gt;</li>
-<li>Myung-han Yu &lt;greatymh_at_gmail.com&gt;</li>
-<li>JongDeok &lt;human.zion_at_gmail.com&gt;</li>
-<li>Yong Kim &lt;kim_at_nhn.com&gt;</li>
-<li>이경준 &lt;kyungjun2_at_gmail.com&gt;</li>
-<li>Seongki Shin &lt;skshin_at_gmail.com&gt;</li>
-<li>Yoon Bum-Jong &lt;virusyoon_at_gmail.com&gt;</li>
-<li>Koo Youngmin &lt;youngminz.kr_at_gmail.com&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Kurdish Sorani</p>
-<blockquote>
-<div><ul class="simple">
-<li>Alan Hilal &lt;alan.hilal94_at_gmail.com&gt;</li>
-<li>Aso Naderi &lt;aso.naderi_at_gmail.com&gt;</li>
-<li>muhammad &lt;esy_vb_at_yahoo.com&gt;</li>
-<li>Zrng Abdulla &lt;zhyarabdulla94_at_gmail.com&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Latvian</p>
-<blockquote>
-<div><ul class="simple">
-<li>Latvian TV &lt;dnighttv_at_gmail.com&gt;</li>
-<li>Edgars Neimanis &lt;edgarsneims5092_at_inbox.lv&gt;</li>
-<li>Ukko &lt;perkontevs_at_gmail.com&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Limburgish</p>
-<blockquote>
-<div><ul class="simple">
-<li>Robin van der Vliet &lt;info_at_robinvandervliet.nl&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Lithuanian</p>
-<blockquote>
-<div><ul class="simple">
-<li>Vytautas Motuzas &lt;v.motuzas_at_gmail.com&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Malay</p>
-<blockquote>
-<div><ul class="simple">
-<li>Amir Hamzah &lt;amir.overlord666_at_gmail.com&gt;</li>
-<li>diprofinfiniti &lt;anonynuine-999_at_yahoo.com&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Nepali</p>
-<blockquote>
-<div><ul class="simple">
-<li>Nabin Ghimire &lt;nnabinn_at_hotmail.com&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Norwegian Bokmål</p>
-<blockquote>
-<div><ul class="simple">
-<li>Børge Holm-Wennberg &lt;borge947_at_gmail.com&gt;</li>
-<li>Tor Stokkan &lt;danorse_at_gmail.com&gt;</li>
-<li>Espen Frøyshov &lt;efroys_at_gmail.com&gt;</li>
-<li>Kurt Eilertsen &lt;kurt_at_kheds.com&gt;</li>
-<li>Christoffer Haugom &lt;ph3n1x.nobody_at_gmail.com&gt;</li>
-<li>Sebastian &lt;sebastian_at_sgundersen.com&gt;</li>
-<li>Tomas &lt;tomas_at_tomasruud.com&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Persian</p>
-<blockquote>
-<div><ul class="simple">
-<li>ashkan shirian &lt;ashkan.shirian_at_gmail.com&gt;</li>
-<li>HM &lt;goodlinuxuser_at_chmail.ir&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Polish</p>
-<blockquote>
-<div><ul class="simple">
-<li>Andrzej &lt;andrzej_at_kynu.pl&gt;</li>
-<li>Przemo &lt;info_at_opsbielany.waw.pl&gt;</li>
-<li>Krystian Biesaga &lt;krystian4842_at_gmail.com&gt;</li>
-<li>Maciej Gryniuk &lt;maciejka45_at_gmail.com&gt;</li>
-<li>Michał VonFlynee &lt;vonflynee_at_gmail.com&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Portuguese</p>
-<blockquote>
-<div><ul class="simple">
-<li>Alexandre Badalo &lt;alexandre.badalo_at_sapo.pt&gt;</li>
-<li>João Rodrigues &lt;geral_at_jonilive.com&gt;</li>
-<li>Pedro Ribeiro &lt;p.m42.ribeiro_at_gmail.com&gt;</li>
-<li>Sandro Amaral &lt;sandro123iv_at_gmail.com&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Portuguese (Brazil)</p>
-<blockquote>
-<div><ul class="simple">
-<li>Alex Rohleder &lt;alexrohleder96_at_outlook.com&gt;</li>
-<li>bruno mendax &lt;brunomendax_at_gmail.com&gt;</li>
-<li>Danilo GUia &lt;danilo.eng_at_globomail.com&gt;</li>
-<li>Douglas Rafael Morais Kollar &lt;douglas.kollar_at_pg.df.gov.br&gt;</li>
-<li>Douglas Eccker &lt;douglaseccker_at_hotmail.com&gt;</li>
-<li>Ed Jr &lt;edjacobjunior_at_gmail.com&gt;</li>
-<li>Guilherme Souza Silva &lt;g.szsilva_at_gmail.com&gt;</li>
-<li>Guilherme Seibt &lt;gui_at_webseibt.net&gt;</li>
-<li>Helder Santana &lt;helder.bs.santana_at_gmail.com&gt;</li>
-<li>Junior Zancan &lt;jrzancan_at_hotmail.com&gt;</li>
-<li>Luis &lt;luis.eduardo.braschi_at_outlook.com&gt;</li>
-<li>Marcos Algeri &lt;malgeri_at_gmail.com&gt;</li>
-<li>Marc Delisle &lt;marc_at_infomarc.info&gt;</li>
-<li>Renato Rodrigues de Lima Júnio &lt;renatomdd_at_yahoo.com.br&gt;</li>
-<li>Thiago Casotti &lt;thiago.casotti_at_uol.com.br&gt;</li>
-<li>Victor Laureano &lt;victor.laureano_at_gmail.com&gt;</li>
-<li>Vinícius Araújo &lt;vinipitta_at_gmail.com&gt;</li>
-<li>Washington Bruno Rodrigues Cav &lt;washingtonbruno_at_msn.com&gt;</li>
-<li>Yan Gabriel &lt;yansilvagabriel_at_gmail.com&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Punjabi</p>
-<blockquote>
-<div><ul class="simple">
-<li>Robin van der Vliet &lt;info_at_robinvandervliet.nl&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Romanian</p>
-<blockquote>
-<div><ul class="simple">
-<li>Alex &lt;amihaita_at_yahoo.com&gt;</li>
-<li>Costel Cocerhan &lt;costa1988sv_at_gmail.com&gt;</li>
-<li>Ion Adrian-Ionut &lt;john_at_panevo.ro&gt;</li>
-<li>Raul Molnar &lt;molnar.raul_at_wservices.eu&gt;</li>
-<li>Deleted User &lt;noreply_at_weblate.org&gt;</li>
-<li>Stefan Murariu &lt;stefan.murariu_at_yahoo.com&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Russian</p>
-<blockquote>
-<div><ul class="simple">
-<li>Andrey Aleksanyants &lt;aaleksanyants_at_yahoo.com&gt;</li>
-<li>&lt;ddrmoscow_at_gmail.com&gt;</li>
-<li>Robin van der Vliet &lt;info_at_robinvandervliet.nl&gt;</li>
-<li>Хомутов Иван Сергеевич &lt;khomutov.ivan_at_mail.ru&gt;</li>
-<li>Alexey Rubinov &lt;orion1979_at_yandex.ru&gt;</li>
-<li>Олег Карпов &lt;salvadoporjc_at_gmail.com&gt;</li>
-<li>Egorov Artyom &lt;unlucky_at_inbox.ru&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Serbian</p>
-<blockquote>
-<div><ul class="simple">
-<li>Smart Kid &lt;kidsmart33_at_gmail.com&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Sinhala</p>
-<blockquote>
-<div><ul class="simple">
-<li>Madhura Jayaratne &lt;madhura.cj_at_gmail.com&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Slovak</p>
-<blockquote>
-<div><ul class="simple">
-<li>Martin Lacina &lt;martin_at_whistler.sk&gt;</li>
-<li>Patrik Kollmann &lt;parkourpotex_at_gmail.com&gt;</li>
-<li>Jozef Pistej &lt;pistej2_at_gmail.com&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Slovenian</p>
-<blockquote>
-<div><ul class="simple">
-<li>Domen &lt;mitenem_at_outlook.com&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Spanish</p>
-<blockquote>
-<div><ul class="simple">
-<li>Luis García Sevillano &lt;floss.dev_at_gmail.com&gt;</li>
-<li>Franco &lt;fulanodetal.github1_at_openaliasbox.org&gt;</li>
-<li>Luis Ruiz &lt;luisan00_at_hotmail.com&gt;</li>
-<li>Macofe &lt;macofe.languagetool_at_gmail.com&gt;</li>
-<li>Matías Bellone &lt;matiasbellone+weblate_at_gmail.com&gt;</li>
-<li>Rodrigo A. &lt;ra4_at_openmailbox.org&gt;</li>
-<li>FAMMA TV NOTICIAS MEDIOS DE CO &lt;revistafammatvmusic.oficial_at_gmail.com&gt;</li>
-<li>Ronnie Simon &lt;ronniesimonf_at_gmail.com&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Swedish</p>
-<blockquote>
-<div><ul class="simple">
-<li>Anders Jonsson &lt;anders.jonsson_at_norsjovallen.se&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Tamil</p>
-<blockquote>
-<div><ul class="simple">
-<li>கணேஷ் குமார் &lt;GANESHTHEONE_at_gmail.com&gt;</li>
-<li>Achchuthan Yogarajah &lt;achch1990_at_gmail.com&gt;</li>
-<li>Rifthy Ahmed &lt;rifthy456_at_gmail.com&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Thai</p>
-<blockquote>
-<div><ul class="simple">
-<li>&lt;nontawat39_at_gmail.com&gt;</li>
-<li>Somthanat W. &lt;somthanat_at_gmail.com&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Turkish</p>
-<blockquote>
-<div><ul class="simple">
-<li>Burak Yavuz &lt;hitowerdigit_at_hotmail.com&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Ukrainian</p>
-<blockquote>
-<div><ul class="simple">
-<li>Сергій Педько &lt;nitrotoll_at_gmail.com&gt;</li>
-<li>Igor &lt;vmta_at_yahoo.com&gt;</li>
-<li>Vitaliy Perekupka &lt;vperekupka_at_gmail.com&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Vietnamese</p>
-<blockquote>
-<div><ul class="simple">
-<li>Bao Phan &lt;baophan94_at_icloud.com&gt;</li>
-<li>Xuan Hung &lt;mr.hungdx_at_gmail.com&gt;</li>
-<li>Bao trinh minh &lt;trinhminhbao_at_gmail.com&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">West Flemish</p>
-<blockquote>
-<div><ul class="simple">
-<li>Robin van der Vliet &lt;info_at_robinvandervliet.nl&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-</ul>
-</div>
-<div class="section" id="documentation-translators">
-<h2>Documentation translators<a class="headerlink" href="#documentation-translators" title="Permalink to this headline">¶</a></h2>
-<p>Following people have contributed to translation of phpMyAdmin documentation:</p>
-<ul>
-<li><p class="first">Albanian</p>
-<blockquote>
-<div><ul class="simple">
-<li>Arben Çokaj &lt;acokaj_at_shkoder.net&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Arabic</p>
-<blockquote>
-<div><ul class="simple">
-<li>Ahmed El Azzabi &lt;ahmedtek1993_at_gmail.com&gt;</li>
-<li>Omar Essam &lt;omar_2412_at_live.com&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Armenian</p>
-<blockquote>
-<div><ul class="simple">
-<li>Andrey Aleksanyants &lt;aaleksanyants_at_yahoo.com&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Azerbaijani</p>
-<blockquote>
-<div><ul class="simple">
-<li>Mircəlal &lt;01youknowme_at_gmail.com&gt;</li>
-<li>Sevdimali İsa &lt;sevdimaliisayev_at_mail.ru&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Catalan</p>
-<blockquote>
-<div><ul class="simple">
-<li>josep constanti &lt;jconstanti_at_yahoo.es&gt;</li>
-<li>Joan Montané &lt;joan_at_montane.cat&gt;</li>
-<li>Xavier Navarro &lt;xvnavarro_at_gmail.com&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Chinese (China)</p>
-<blockquote>
-<div><ul class="simple">
-<li>Vincent Lau &lt;3092849_at_qq.com&gt;</li>
-<li>罗攀登 &lt;6375lpd_at_gmail.com&gt;</li>
-<li>disorderman &lt;disorderman_at_qq.com&gt;</li>
-<li>ITXiaoPang &lt;djh1017555_at_126.com&gt;</li>
-<li>tunnel213 &lt;tunnel213_at_aliyun.com&gt;</li>
-<li>Terry Weng &lt;wengshiyu_at_gmail.com&gt;</li>
-<li>whh &lt;whhlcj_at_126.com&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Chinese (Taiwan)</p>
-<blockquote>
-<div><ul class="simple">
-<li>Chien Wei Lin &lt;cwlin0416_at_gmail.com&gt;</li>
-<li>Peter Dave Hello &lt;xs910203_at_gmail.com&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Czech</p>
-<blockquote>
-<div><ul class="simple">
-<li>Aleš Hakl &lt;ales_at_hakl.net&gt;</li>
-<li>Michal Čihař &lt;michal_at_cihar.com&gt;</li>
-<li>Jan Palider &lt;palider_at_seznam.cz&gt;</li>
-<li>Petr Kateřiňák &lt;petr.katerinak_at_gmail.com&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Danish</p>
-<blockquote>
-<div><ul class="simple">
-<li>Aputsiaĸ Niels Janussen &lt;aj_at_isit.gl&gt;</li>
-<li>Claus Svalekjaer &lt;just.my.smtp.server_at_gmail.com&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Dutch</p>
-<blockquote>
-<div><ul class="simple">
-<li><ol class="first upperalpha">
-<li>Voogt &lt;a.voogt_at_hccnet.nl&gt;</li>
-</ol>
-</li>
-<li>dingo thirteen &lt;dingo13_at_gmail.com&gt;</li>
-<li>Dries Verschuere &lt;dries.verschuere_at_outlook.com&gt;</li>
-<li>Robin van der Vliet &lt;info_at_robinvandervliet.nl&gt;</li>
-<li>Stefan Koolen &lt;nast3zz_at_gmail.com&gt;</li>
-<li>Ray Borggreve &lt;ray_at_datahuis.net&gt;</li>
-<li>Dieter Adriaenssens &lt;ruleant_at_users.sourceforge.net&gt;</li>
-<li>Tom Hofman &lt;tom.hofman_at_gmail.com&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Estonian</p>
-<blockquote>
-<div><ul class="simple">
-<li>Kristjan Räts &lt;kristjanrats_at_gmail.com&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Finnish</p>
-<blockquote>
-<div><ul class="simple">
-<li>Juha &lt;jremes_at_outlook.com&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">French</p>
-<blockquote>
-<div><ul class="simple">
-<li>Cédric Corazza &lt;cedric.corazza_at_wanadoo.fr&gt;</li>
-<li>Étienne Gilli &lt;etienne.gilli_at_gmail.com&gt;</li>
-<li>Marc Delisle &lt;marc_at_infomarc.info&gt;</li>
-<li>Donavan_Martin &lt;mart.donavan_at_hotmail.com&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Frisian</p>
-<blockquote>
-<div><ul class="simple">
-<li>Robin van der Vliet &lt;info_at_robinvandervliet.nl&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Galician</p>
-<blockquote>
-<div><ul class="simple">
-<li>Xosé Calvo &lt;xosecalvo_at_gmail.com&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">German</p>
-<blockquote>
-<div><ul class="simple">
-<li>Daniel &lt;d.gnauk89_at_googlemail.com&gt;</li>
-<li>JH M &lt;janhenrikm_at_yahoo.de&gt;</li>
-<li>Lasse Goericke &lt;lasse_at_mydom.de&gt;</li>
-<li>Michael Koch &lt;michael.koch_at_enough.de&gt;</li>
-<li>Ann + J.M. &lt;phpMyAdmin_at_ZweiSteinSoft.de&gt;</li>
-<li>Niemand Jedermann &lt;predatorix_at_web.de&gt;</li>
-<li>Phillip Rohmberger &lt;rohmberger_at_hotmail.de&gt;</li>
-<li>Hauke Henningsen &lt;sqrt_at_entless.org&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Greek</p>
-<blockquote>
-<div><ul class="simple">
-<li>Παναγιώτης Παπάζογλου &lt;papaz_p_at_yahoo.com&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Hungarian</p>
-<blockquote>
-<div><ul class="simple">
-<li>Balázs Úr &lt;urbalazs_at_gmail.com&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Italian</p>
-<blockquote>
-<div><ul class="simple">
-<li>Francesco Saverio Giacobazzi &lt;francesco.giacobazzi_at_ferrania.it&gt;</li>
-<li>Marco Pozzato &lt;ironpotts_at_gmail.com&gt;</li>
-<li>Stefano Martinelli &lt;stefano.ste.martinelli_at_gmail.com&gt;</li>
-<li>TWS &lt;tablettws_at_gmail.com&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Japanese</p>
-<blockquote>
-<div><ul class="simple">
-<li>Eshin Kunishima &lt;ek_at_luna.miko.im&gt;</li>
-<li>Hiroshi Chiyokawa &lt;hiroshi.chiyokawa_at_gmail.com&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Lithuanian</p>
-<blockquote>
-<div><ul class="simple">
-<li>Jur Kis &lt;atvejis_at_gmail.com&gt;</li>
-<li>Dovydas &lt;dovy.buz_at_gmail.com&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Norwegian Bokmål</p>
-<blockquote>
-<div><ul class="simple">
-<li>Tor Stokkan &lt;danorse_at_gmail.com&gt;</li>
-<li>Kurt Eilertsen &lt;kurt_at_kheds.com&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Portuguese (Brazil)</p>
-<blockquote>
-<div><ul class="simple">
-<li>Alexandre Moretti &lt;alemoretti2010_at_hotmail.com&gt;</li>
-<li>Douglas Rafael Morais Kollar &lt;douglas.kollar_at_pg.df.gov.br&gt;</li>
-<li>Guilherme Seibt &lt;gui_at_webseibt.net&gt;</li>
-<li>Helder Santana &lt;helder.bs.santana_at_gmail.com&gt;</li>
-<li>Michal Čihař &lt;michal_at_cihar.com&gt;</li>
-<li>Michel Souza &lt;michel.ekio_at_gmail.com&gt;</li>
-<li>Danilo Azevedo &lt;mrdaniloazevedo_at_gmail.com&gt;</li>
-<li>Thiago Casotti &lt;thiago.casotti_at_uol.com.br&gt;</li>
-<li>Vinícius Araújo &lt;vinipitta_at_gmail.com&gt;</li>
-<li>Yan Gabriel &lt;yansilvagabriel_at_gmail.com&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Slovak</p>
-<blockquote>
-<div><ul class="simple">
-<li>Martin Lacina &lt;martin_at_whistler.sk&gt;</li>
-<li>Michal Čihař &lt;michal_at_cihar.com&gt;</li>
-<li>Jozef Pistej &lt;pistej2_at_gmail.com&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Slovenian</p>
-<blockquote>
-<div><ul class="simple">
-<li>Domen &lt;mitenem_at_outlook.com&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Spanish</p>
-<blockquote>
-<div><ul class="simple">
-<li>Luis García Sevillano &lt;floss.dev_at_gmail.com&gt;</li>
-<li>Franco &lt;fulanodetal.github1_at_openaliasbox.org&gt;</li>
-<li>Matías Bellone &lt;matiasbellone+weblate_at_gmail.com&gt;</li>
-<li>Ronnie Simon &lt;ronniesimonf_at_gmail.com&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-<li><p class="first">Turkish</p>
-<blockquote>
-<div><ul class="simple">
-<li>Burak Yavuz &lt;hitowerdigit_at_hotmail.com&gt;</li>
-</ul>
-</div></blockquote>
-</li>
-</ul>
-</div>
-<div class="section" id="original-credits-of-version-2-1-0">
-<h2>Original Credits of Version 2.1.0<a class="headerlink" href="#original-credits-of-version-2-1-0" title="Permalink to this headline">¶</a></h2>
-<p>This work is based on Peter Kuppelwieser&#8217;s MySQL-Webadmin. It was his
-idea to create a web-based interface to MySQL using PHP3. Although I
-have not used any of his source-code, there are some concepts I&#8217;ve
-borrowed from him. phpMyAdmin was created because Peter told me he
-wasn&#8217;t going to further develop his (great) tool.</p>
-<p>Thanks go to</p>
-<ul class="simple">
-<li>Amalesh Kempf &lt;ak-lsml_at_living-source.com&gt; who contributed the
-code for the check when dropping a table or database. He also
-suggested that you should be able to specify the primary key on
-tbl_create.php3. To version 1.1.1 he contributed the ldi_*.php3-set
-(Import text-files) as well as a bug-report. Plus many smaller
-improvements.</li>
-<li>Jan Legenhausen &lt;jan_at_nrw.net&gt;: He made many of the changes that
-were introduced in 1.3.0 (including quite significant ones like the
-authentication). For 1.4.1 he enhanced the table-dump feature. Plus
-bug-fixes and help.</li>
-<li>Marc Delisle &lt;DelislMa_at_CollegeSherbrooke.qc.ca&gt; made phpMyAdmin
-language-independent by outsourcing the strings to a separate file. He
-also contributed the French translation.</li>
-<li>Alexandr Bravo &lt;abravo_at_hq.admiral.ru&gt; who contributed
-tbl_select.php3, a feature to display only some columns from a table.</li>
-<li>Chris Jackson &lt;chrisj_at_ctel.net&gt; added support for MySQL functions
-in tbl_change.php3. He also added the &#8220;Query by Example&#8221; feature in
-2.0.</li>
-<li>Dave Walton &lt;walton_at_nordicdms.com&gt; added support for multiple
-servers and is a regular contributor for bug-fixes.</li>
-<li>Gabriel Ash &lt;ga244_at_is8.nyu.edu&gt; contributed the random access
-features for 2.0.6.</li>
-</ul>
-<p>The following people have contributed minor changes, enhancements,
-bugfixes or support for a new language:</p>
-<p>Jim Kraai, Jordi Bruguera, Miquel Obrador, Geert Lund, Thomas
-Kleemann, Alexander Leidinger, Kiko Albiol, Daniel C. Chao, Pavel
-Piankov, Sascha Kettler, Joe Pruett, Renato Lins, Mark Kronsbein,
-Jannis Hermanns, G. Wieggers.</p>
-<p>And thanks to everyone else who sent me email with suggestions, bug-
-reports and or just some feedback.</p>
-</div>
-</div>
-
-
-          </div>
-        </div>
-      </div>
-      <div class="sphinxsidebar" role="navigation" aria-label="main navigation">
-        <div class="sphinxsidebarwrapper">
-  <h3><a href="index.html">Table Of Contents</a></h3>
-  <ul>
-<li><a class="reference internal" href="#">Credits</a><ul>
-<li><a class="reference internal" href="#credits-in-chronological-order">Credits, in chronological order</a></li>
-<li><a class="reference internal" href="#translators">Translators</a></li>
-<li><a class="reference internal" href="#documentation-translators">Documentation translators</a></li>
-<li><a class="reference internal" href="#original-credits-of-version-2-1-0">Original Credits of Version 2.1.0</a></li>
-</ul>
-</li>
-</ul>
-
-  <h4>Previous topic</h4>
-  <p class="topless"><a href="copyright.html"
-                        title="previous chapter">Copyright</a></p>
-  <h4>Next topic</h4>
-  <p class="topless"><a href="glossary.html"
-                        title="next chapter">Glossary</a></p>
-  <div role="note" aria-label="source link">
-    <h3>This Page</h3>
-    <ul class="this-page-menu">
-      <li><a href="_sources/credits.txt"
-            rel="nofollow">Show Source</a></li>
-    </ul>
-   </div>
-<div id="searchbox" style="display: none" role="search">
-  <h3>Quick search</h3>
-    <form class="search" action="search.html" method="get">
-      <div><input type="text" name="q" /></div>
-      <div><input type="submit" value="Go" /></div>
-      <input type="hidden" name="check_keywords" value="yes" />
-      <input type="hidden" name="area" value="default" />
-    </form>
-</div>
-<script type="text/javascript">$('#searchbox').show(0);</script>
-        </div>
-      </div>
-      <div class="clearer"></div>
-    </div>
-    <div class="related" role="navigation" aria-label="related navigation">
-      <h3>Navigation</h3>
-      <ul>
-        <li class="right" style="margin-right: 10px">
-          <a href="genindex.html" title="General Index"
-             >index</a></li>
-        <li class="right" >
-          <a href="glossary.html" title="Glossary"
-             >next</a> |</li>
-        <li class="right" >
-          <a href="copyright.html" title="Copyright"
-             >previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">phpMyAdmin 4.6.5.2 documentation</a> &#187;</li> 
-      </ul>
-    </div>
-    <div class="footer" role="contentinfo">
-        &#169; <a href="copyright.html">Copyright</a> 2012 - 2016, The phpMyAdmin devel team.
-      Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.4.6.
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/#pma/doc/html/developers.html b/#pma/doc/html/developers.html
deleted file mode 100644
index 5712a4bc..00000000
--- a/#pma/doc/html/developers.html
+++ /dev/null
@@ -1,115 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    
-    <title>Developers Information &#8212; phpMyAdmin 4.6.5.2 documentation</title>
-    
-    <link rel="stylesheet" href="_static/classic.css" type="text/css" />
-    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
-    
-    <script type="text/javascript">
-      var DOCUMENTATION_OPTIONS = {
-        URL_ROOT:    './',
-        VERSION:     '4.6.5.2',
-        COLLAPSE_INDEX: false,
-        FILE_SUFFIX: '.html',
-        HAS_SOURCE:  true
-      };
-    </script>
-    <script type="text/javascript" src="_static/jquery.js"></script>
-    <script type="text/javascript" src="_static/underscore.js"></script>
-    <script type="text/javascript" src="_static/doctools.js"></script>
-    <link rel="copyright" title="Copyright" href="copyright.html" />
-    <link rel="top" title="phpMyAdmin 4.6.5.2 documentation" href="index.html" />
-    <link rel="next" title="Distributing and packaging phpMyAdmin" href="vendors.html" />
-    <link rel="prev" title="FAQ - Frequently Asked Questions" href="faq.html" /> 
-  </head>
-  <body role="document">
-    <div class="related" role="navigation" aria-label="related navigation">
-      <h3>Navigation</h3>
-      <ul>
-        <li class="right" style="margin-right: 10px">
-          <a href="genindex.html" title="General Index"
-             accesskey="I">index</a></li>
-        <li class="right" >
-          <a href="vendors.html" title="Distributing and packaging phpMyAdmin"
-             accesskey="N">next</a> |</li>
-        <li class="right" >
-          <a href="faq.html" title="FAQ - Frequently Asked Questions"
-             accesskey="P">previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">phpMyAdmin 4.6.5.2 documentation</a> &#187;</li> 
-      </ul>
-    </div>  
-
-    <div class="document">
-      <div class="documentwrapper">
-        <div class="bodywrapper">
-          <div class="body" role="main">
-            
-  <div class="section" id="developers-information">
-<span id="developers"></span><h1>Developers Information<a class="headerlink" href="#developers-information" title="Permalink to this headline">¶</a></h1>
-<p>phpMyAdmin is Open Source, so you&#8217;re invited to contribute to it. Many
-great features have been written by other people and you too can help
-to make phpMyAdmin a useful tool.</p>
-<p>You can check out all the possibilities to contribute in the
-<a class="reference external" href="https://www.phpmyadmin.net/contribute/">contribute section on our website</a>.</p>
-</div>
-
-
-          </div>
-        </div>
-      </div>
-      <div class="sphinxsidebar" role="navigation" aria-label="main navigation">
-        <div class="sphinxsidebarwrapper">
-  <h4>Previous topic</h4>
-  <p class="topless"><a href="faq.html"
-                        title="previous chapter">FAQ - Frequently Asked Questions</a></p>
-  <h4>Next topic</h4>
-  <p class="topless"><a href="vendors.html"
-                        title="next chapter">Distributing and packaging phpMyAdmin</a></p>
-  <div role="note" aria-label="source link">
-    <h3>This Page</h3>
-    <ul class="this-page-menu">
-      <li><a href="_sources/developers.txt"
-            rel="nofollow">Show Source</a></li>
-    </ul>
-   </div>
-<div id="searchbox" style="display: none" role="search">
-  <h3>Quick search</h3>
-    <form class="search" action="search.html" method="get">
-      <div><input type="text" name="q" /></div>
-      <div><input type="submit" value="Go" /></div>
-      <input type="hidden" name="check_keywords" value="yes" />
-      <input type="hidden" name="area" value="default" />
-    </form>
-</div>
-<script type="text/javascript">$('#searchbox').show(0);</script>
-        </div>
-      </div>
-      <div class="clearer"></div>
-    </div>
-    <div class="related" role="navigation" aria-label="related navigation">
-      <h3>Navigation</h3>
-      <ul>
-        <li class="right" style="margin-right: 10px">
-          <a href="genindex.html" title="General Index"
-             >index</a></li>
-        <li class="right" >
-          <a href="vendors.html" title="Distributing and packaging phpMyAdmin"
-             >next</a> |</li>
-        <li class="right" >
-          <a href="faq.html" title="FAQ - Frequently Asked Questions"
-             >previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">phpMyAdmin 4.6.5.2 documentation</a> &#187;</li> 
-      </ul>
-    </div>
-    <div class="footer" role="contentinfo">
-        &#169; <a href="copyright.html">Copyright</a> 2012 - 2016, The phpMyAdmin devel team.
-      Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.4.6.
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/#pma/doc/html/faq.html b/#pma/doc/html/faq.html
deleted file mode 100644
index b72c2a32..00000000
--- a/#pma/doc/html/faq.html
+++ /dev/null
@@ -1,1955 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    
-    <title>FAQ - Frequently Asked Questions &#8212; phpMyAdmin 4.6.5.2 documentation</title>
-    
-    <link rel="stylesheet" href="_static/classic.css" type="text/css" />
-    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
-    
-    <script type="text/javascript">
-      var DOCUMENTATION_OPTIONS = {
-        URL_ROOT:    './',
-        VERSION:     '4.6.5.2',
-        COLLAPSE_INDEX: false,
-        FILE_SUFFIX: '.html',
-        HAS_SOURCE:  true
-      };
-    </script>
-    <script type="text/javascript" src="_static/jquery.js"></script>
-    <script type="text/javascript" src="_static/underscore.js"></script>
-    <script type="text/javascript" src="_static/doctools.js"></script>
-    <link rel="copyright" title="Copyright" href="copyright.html" />
-    <link rel="top" title="phpMyAdmin 4.6.5.2 documentation" href="index.html" />
-    <link rel="next" title="Developers Information" href="developers.html" />
-    <link rel="prev" title="Import and export" href="import_export.html" /> 
-  </head>
-  <body role="document">
-    <div class="related" role="navigation" aria-label="related navigation">
-      <h3>Navigation</h3>
-      <ul>
-        <li class="right" style="margin-right: 10px">
-          <a href="genindex.html" title="General Index"
-             accesskey="I">index</a></li>
-        <li class="right" >
-          <a href="developers.html" title="Developers Information"
-             accesskey="N">next</a> |</li>
-        <li class="right" >
-          <a href="import_export.html" title="Import and export"
-             accesskey="P">previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">phpMyAdmin 4.6.5.2 documentation</a> &#187;</li> 
-      </ul>
-    </div>  
-
-    <div class="document">
-      <div class="documentwrapper">
-        <div class="bodywrapper">
-          <div class="body" role="main">
-            
-  <div class="section" id="faq-frequently-asked-questions">
-<span id="faq"></span><h1>FAQ - Frequently Asked Questions<a class="headerlink" href="#faq-frequently-asked-questions" title="Permalink to this headline">¶</a></h1>
-<p>Please have a look at our <a class="reference external" href="https://www.phpmyadmin.net/docs/">Link section</a> on the official
-phpMyAdmin homepage for in-depth coverage of phpMyAdmin&#8217;s features and
-or interface.</p>
-<div class="section" id="server">
-<span id="faqserver"></span><h2>Server<a class="headerlink" href="#server" title="Permalink to this headline">¶</a></h2>
-<div class="section" id="my-server-is-crashing-each-time-a-specific-action-is-required-or-phpmyadmin-sends-a-blank-page-or-a-page-full-of-cryptic-characters-to-my-browser-what-can-i-do">
-<span id="faq1-1"></span><h3>1.1 My server is crashing each time a specific action is required or phpMyAdmin sends a blank page or a page full of cryptic characters to my browser, what can I do?<a class="headerlink" href="#my-server-is-crashing-each-time-a-specific-action-is-required-or-phpmyadmin-sends-a-blank-page-or-a-page-full-of-cryptic-characters-to-my-browser-what-can-i-do" title="Permalink to this headline">¶</a></h3>
-<p>Try to set the <span class="target" id="index-0"></span><a class="reference internal" href="config.html#cfg_OBGzip"><code class="xref config config-option docutils literal"><span class="pre">$cfg['OBGzip']</span></code></a>  directive to <code class="docutils literal"><span class="pre">false</span></code> in your
-<code class="file docutils literal"><span class="pre">config.inc.php</span></code> file and the <code class="docutils literal"><span class="pre">zlib.output_compression</span></code> directive to
-<code class="docutils literal"><span class="pre">Off</span></code> in your php configuration file.</p>
-</div>
-<div class="section" id="my-apache-server-crashes-when-using-phpmyadmin">
-<span id="faq1-2"></span><h3>1.2 My Apache server crashes when using phpMyAdmin.<a class="headerlink" href="#my-apache-server-crashes-when-using-phpmyadmin" title="Permalink to this headline">¶</a></h3>
-<p>You should first try the latest versions of Apache (and possibly MySQL). If
-your server keeps crashing, please ask for help in the various Apache support
-groups.</p>
-<div class="admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last"><a class="reference internal" href="#faq1-1"><span class="std std-ref">1.1 My server is crashing each time a specific action is required or phpMyAdmin sends a blank page or a page full of cryptic characters to my browser, what can I do?</span></a></p>
-</div>
-</div>
-<div class="section" id="withdrawn">
-<span id="faq1-3"></span><h3>1.3 (withdrawn).<a class="headerlink" href="#withdrawn" title="Permalink to this headline">¶</a></h3>
-</div>
-<div class="section" id="using-phpmyadmin-on-iis-i-m-displayed-the-error-message-the-specified-cgi-application-misbehaved-by-not-returning-a-complete-set-of-http-headers">
-<span id="faq1-4"></span><h3>1.4 Using phpMyAdmin on IIS, I&#8217;m displayed the error message: &#8220;The specified CGI application misbehaved by not returning a complete set of HTTP headers ...&#8221;.<a class="headerlink" href="#using-phpmyadmin-on-iis-i-m-displayed-the-error-message-the-specified-cgi-application-misbehaved-by-not-returning-a-complete-set-of-http-headers" title="Permalink to this headline">¶</a></h3>
-<p>You just forgot to read the <em>install.txt</em> file from the PHP
-distribution. Have a look at the last message in this <a class="reference external" href="https://bugs.php.net/bug.php?id=12061">PHP bug report #12061</a> from the official PHP bug
-database.</p>
-</div>
-<div class="section" id="using-phpmyadmin-on-iis-i-m-facing-crashes-and-or-many-error-messages-with-the-http">
-<span id="faq1-5"></span><h3>1.5 Using phpMyAdmin on IIS, I&#8217;m facing crashes and/or many error messages with the HTTP.<a class="headerlink" href="#using-phpmyadmin-on-iis-i-m-facing-crashes-and-or-many-error-messages-with-the-http" title="Permalink to this headline">¶</a></h3>
-<p>This is a known problem with the PHP <a class="reference internal" href="glossary.html#term-isapi"><span class="xref std std-term">ISAPI</span></a> filter: it&#8217;s not so stable.
-Please use instead the cookie authentication mode.</p>
-</div>
-<div class="section" id="i-can-t-use-phpmyadmin-on-pws-nothing-is-displayed">
-<span id="faq1-6"></span><h3>1.6 I can&#8217;t use phpMyAdmin on PWS: nothing is displayed!<a class="headerlink" href="#i-can-t-use-phpmyadmin-on-pws-nothing-is-displayed" title="Permalink to this headline">¶</a></h3>
-<p>This seems to be a PWS bug. Filippo Simoncini found a workaround (at
-this time there is no better fix): remove or comment the <code class="docutils literal"><span class="pre">DOCTYPE</span></code>
-declarations (2 lines) from the scripts <code class="file docutils literal"><span class="pre">libraries/Header.class.php</span></code>
-and <code class="file docutils literal"><span class="pre">index.php</span></code>.</p>
-</div>
-<div class="section" id="how-can-i-gzip-a-dump-or-a-csv-export-it-does-not-seem-to-work">
-<span id="faq1-7"></span><h3>1.7 How can I GZip a dump or a CSV export? It does not seem to work.<a class="headerlink" href="#how-can-i-gzip-a-dump-or-a-csv-export-it-does-not-seem-to-work" title="Permalink to this headline">¶</a></h3>
-<p>This feature is based on the <code class="docutils literal"><span class="pre">gzencode()</span></code>
-PHP function to be more independent of the platform (Unix/Windows,
-Safe Mode or not, and so on). So, you must have Zlib support
-(<code class="docutils literal"><span class="pre">--with-zlib</span></code>).</p>
-</div>
-<div class="section" id="i-cannot-insert-a-text-file-in-a-table-and-i-get-an-error-about-safe-mode-being-in-effect">
-<span id="faq1-8"></span><h3>1.8 I cannot insert a text file in a table, and I get an error about safe mode being in effect.<a class="headerlink" href="#i-cannot-insert-a-text-file-in-a-table-and-i-get-an-error-about-safe-mode-being-in-effect" title="Permalink to this headline">¶</a></h3>
-<p>Your uploaded file is saved by PHP in the &#8220;upload dir&#8221;, as defined in
-<code class="file docutils literal"><span class="pre">php.ini</span></code> by the variable <code class="docutils literal"><span class="pre">upload_tmp_dir</span></code> (usually the system
-default is <em>/tmp</em>). We recommend the following setup for Apache
-servers running in safe mode, to enable uploads of files while being
-reasonably secure:</p>
-<ul class="simple">
-<li>create a separate directory for uploads: <strong class="command">mkdir /tmp/php</strong></li>
-<li>give ownership to the Apache server&#8217;s user.group: <strong class="command">chown
-apache.apache /tmp/php</strong></li>
-<li>give proper permission: <strong class="command">chmod 600 /tmp/php</strong></li>
-<li>put <code class="docutils literal"><span class="pre">upload_tmp_dir</span> <span class="pre">=</span> <span class="pre">/tmp/php</span></code> in <code class="file docutils literal"><span class="pre">php.ini</span></code></li>
-<li>restart Apache</li>
-</ul>
-</div>
-<div class="section" id="faq1-9">
-<span id="id1"></span><h3>1.9 (withdrawn).<a class="headerlink" href="#faq1-9" title="Permalink to this headline">¶</a></h3>
-</div>
-<div class="section" id="i-m-having-troubles-when-uploading-files-with-phpmyadmin-running-on-a-secure-server-my-browser-is-internet-explorer-and-i-m-using-the-apache-server">
-<span id="faq1-10"></span><h3>1.10 I&#8217;m having troubles when uploading files with phpMyAdmin running on a secure server. My browser is Internet Explorer and I&#8217;m using the Apache server.<a class="headerlink" href="#i-m-having-troubles-when-uploading-files-with-phpmyadmin-running-on-a-secure-server-my-browser-is-internet-explorer-and-i-m-using-the-apache-server" title="Permalink to this headline">¶</a></h3>
-<p>As suggested by &#8220;Rob M&#8221; in the phpWizard forum, add this line to your
-<em>httpd.conf</em>:</p>
-<div class="highlight-apache"><div class="highlight"><pre><span class="nb">SetEnvIf</span> <span class="k">User</span>-Agent <span class="s2">&quot;.*MSIE.*&quot;</span> nokeepalive ssl-unclean-shutdown
-</pre></div>
-</div>
-<p>It seems to clear up many problems between Internet Explorer and SSL.</p>
-</div>
-<div class="section" id="i-get-an-open-basedir-restriction-while-uploading-a-file-from-the-query-box">
-<span id="faq1-11"></span><h3>1.11 I get an &#8216;open_basedir restriction&#8217; while uploading a file from the query box.<a class="headerlink" href="#i-get-an-open-basedir-restriction-while-uploading-a-file-from-the-query-box" title="Permalink to this headline">¶</a></h3>
-<p>Since version 2.2.4, phpMyAdmin supports servers with open_basedir
-restrictions. However you need to create temporary directory and configure it
-as <span class="target" id="index-1"></span><a class="reference internal" href="config.html#cfg_TempDir"><code class="xref config config-option docutils literal"><span class="pre">$cfg['TempDir']</span></code></a>. The uploaded files will be moved there,
-and after execution of your <a class="reference internal" href="glossary.html#term-sql"><span class="xref std std-term">SQL</span></a> commands, removed.</p>
-</div>
-<div class="section" id="i-have-lost-my-mysql-root-password-what-can-i-do">
-<span id="faq1-12"></span><h3>1.12 I have lost my MySQL root password, what can I do?<a class="headerlink" href="#i-have-lost-my-mysql-root-password-what-can-i-do" title="Permalink to this headline">¶</a></h3>
-<p>The MySQL manual explains how to <a class="reference external" href="https://dev.mysql.com/doc/mysql/en/resetting-permissions.html">reset the permissions</a>.</p>
-</div>
-<div class="section" id="faq1-13">
-<span id="id2"></span><h3>1.13 (withdrawn).<a class="headerlink" href="#faq1-13" title="Permalink to this headline">¶</a></h3>
-</div>
-<div class="section" id="faq1-14">
-<span id="id3"></span><h3>1.14 (withdrawn).<a class="headerlink" href="#faq1-14" title="Permalink to this headline">¶</a></h3>
-</div>
-<div class="section" id="i-have-problems-with-mysql-user-column-names">
-<span id="faq1-15"></span><h3>1.15 I have problems with <em>mysql.user</em> column names.<a class="headerlink" href="#i-have-problems-with-mysql-user-column-names" title="Permalink to this headline">¶</a></h3>
-<p>In previous MySQL versions, the <code class="docutils literal"><span class="pre">User</span></code> and <code class="docutils literal"><span class="pre">Password``columns</span> <span class="pre">were</span>
-<span class="pre">named</span> <span class="pre">``user</span></code> and <code class="docutils literal"><span class="pre">password</span></code>. Please modify your column names to
-align with current standards.</p>
-</div>
-<div class="section" id="i-cannot-upload-big-dump-files-memory-http-or-timeout-problems">
-<span id="faq1-16"></span><h3>1.16 I cannot upload big dump files (memory, HTTP or timeout problems).<a class="headerlink" href="#i-cannot-upload-big-dump-files-memory-http-or-timeout-problems" title="Permalink to this headline">¶</a></h3>
-<p>Starting with version 2.7.0, the import engine has been re–written and
-these problems should not occur. If possible, upgrade your phpMyAdmin
-to the latest version to take advantage of the new import features.</p>
-<p>The first things to check (or ask your host provider to check) are the
-values of <code class="docutils literal"><span class="pre">upload_max_filesize</span></code>, <code class="docutils literal"><span class="pre">memory_limit</span></code> and
-<code class="docutils literal"><span class="pre">post_max_size</span></code> in the <code class="file docutils literal"><span class="pre">php.ini</span></code> configuration file. All of these
-three settings limit the maximum size of data that can be submitted
-and handled by PHP. One user also said that <code class="docutils literal"><span class="pre">post_max_size</span></code> and
-<code class="docutils literal"><span class="pre">memory_limit</span></code> need to be larger than <code class="docutils literal"><span class="pre">upload_max_filesize</span></code>.
-There exist several workarounds if your upload is too big or your
-hosting provider is unwilling to change the settings:</p>
-<ul>
-<li><p class="first">Look at the <span class="target" id="index-2"></span><a class="reference internal" href="config.html#cfg_UploadDir"><code class="xref config config-option docutils literal"><span class="pre">$cfg['UploadDir']</span></code></a> feature. This allows one to upload a file to the server
-via scp, ftp, or your favorite file transfer method. PhpMyAdmin is
-then able to import the files from the temporary directory. More
-information is available in the <a class="reference internal" href="config.html#config"><span class="std std-ref">Configuration</span></a>  of this document.</p>
-</li>
-<li><p class="first">Using a utility (such as <a class="reference external" href="http://www.ozerov.de/bigdump/">BigDump</a>) to split the files before
-uploading. We cannot support this or any third party applications, but
-are aware of users having success with it.</p>
-</li>
-<li><p class="first">If you have shell (command line) access, use MySQL to import the files
-directly. You can do this by issuing the &#8220;source&#8221; command from within
-MySQL:</p>
-<div class="highlight-mysql"><div class="highlight"><pre><span class="n">source</span> <span class="n">filename</span><span class="p">.</span><span class="k">sql</span><span class="p">;</span>
-</pre></div>
-</div>
-</li>
-</ul>
-</div>
-<div class="section" id="which-database-versions-does-phpmyadmin-support">
-<span id="faq1-17"></span><h3>1.17 Which Database versions does phpMyAdmin support?<a class="headerlink" href="#which-database-versions-does-phpmyadmin-support" title="Permalink to this headline">¶</a></h3>
-<p>For <a class="reference external" href="https://www.mysql.com/">MySQL</a>, versions 5.5 and newer are supported.
-For older MySQL versions, our <a class="reference external" href="https://www.phpmyadmin.net/downloads/">Downloads</a> page offers older phpMyAdmin versions
-(which may have become unsupported).</p>
-<p>For <a class="reference external" href="https://mariadb.org/">MariaDB</a>, versions 5.5 and newer are supported.</p>
-</div>
-<div class="section" id="a-i-cannot-connect-to-the-mysql-server-it-always-returns-the-error-message-client-does-not-support-authentication-protocol-requested-by-server-consider-upgrading-mysql-client">
-<span id="faq1-17a"></span><h3>1.17a I cannot connect to the MySQL server. It always returns the error message, &#8220;Client does not support authentication protocol requested by server; consider upgrading MySQL client&#8221;<a class="headerlink" href="#a-i-cannot-connect-to-the-mysql-server-it-always-returns-the-error-message-client-does-not-support-authentication-protocol-requested-by-server-consider-upgrading-mysql-client" title="Permalink to this headline">¶</a></h3>
-<p>You tried to access MySQL with an old MySQL client library. The
-version of your MySQL client library can be checked in your phpinfo()
-output. In general, it should have at least the same minor version as
-your server - as mentioned in <a class="reference internal" href="#faq1-17"><span class="std std-ref">1.17 Which Database versions does phpMyAdmin support?</span></a>. This problem is
-generally caused by using MySQL version 4.1 or newer. MySQL changed
-the authentication hash and your PHP is trying to use the old method.
-The proper solution is to use the <a class="reference external" href="https://www.php.net/mysqli">mysqli extension</a> with the proper client library to match
-your MySQL installation. More
-information (and several workarounds) are located in the <a class="reference external" href="https://dev.mysql.com/doc/mysql/en/old-client.html">MySQL
-Documentation</a>.</p>
-</div>
-<div class="section" id="faq1-18">
-<span id="id4"></span><h3>1.18 (withdrawn).<a class="headerlink" href="#faq1-18" title="Permalink to this headline">¶</a></h3>
-</div>
-<div class="section" id="i-can-t-run-the-display-relations-feature-because-the-script-seems-not-to-know-the-font-face-i-m-using">
-<span id="faq1-19"></span><h3>1.19 I can&#8217;t run the &#8220;display relations&#8221; feature because the script seems not to know the font face I&#8217;m using!<a class="headerlink" href="#i-can-t-run-the-display-relations-feature-because-the-script-seems-not-to-know-the-font-face-i-m-using" title="Permalink to this headline">¶</a></h3>
-<p>The <a class="reference internal" href="glossary.html#term-tcpdf"><span class="xref std std-term">TCPDF</span></a> library we&#8217;re using for this feature requires some special
-files to use font faces. Please refers to the <a class="reference external" href="https://tcpdf.org/">TCPDF manual</a> to build these files.</p>
-</div>
-<div class="section" id="i-receive-an-error-about-missing-mysqli-and-mysql-extensions">
-<span id="faqmysql"></span><h3>1.20 I receive an error about missing mysqli and mysql extensions.<a class="headerlink" href="#i-receive-an-error-about-missing-mysqli-and-mysql-extensions" title="Permalink to this headline">¶</a></h3>
-<p>To connect to a MySQL server, PHP needs a set of MySQL functions
-called &#8220;MySQL extension&#8221;. This extension may be part of the PHP
-distribution (compiled-in), otherwise it needs to be loaded
-dynamically. Its name is probably <em>mysqli.so</em> or <em>php_mysqli.dll</em>.
-phpMyAdmin tried to load the extension but failed. Usually, the
-problem is solved by installing a software package called &#8220;PHP-MySQL&#8221;
-or something similar.</p>
-<p>There are currently two interfaces PHP provides as MySQL extensions - <code class="docutils literal"><span class="pre">mysql</span></code>
-and <code class="docutils literal"><span class="pre">mysqli</span></code>. The <code class="docutils literal"><span class="pre">mysqli</span></code> is tried first, because it&#8217;s the best one.</p>
-</div>
-<div class="section" id="i-am-running-the-cgi-version-of-php-under-unix-and-i-cannot-log-in-using-cookie-auth">
-<span id="faq1-21"></span><h3>1.21 I am running the CGI version of PHP under Unix, and I cannot log in using cookie auth.<a class="headerlink" href="#i-am-running-the-cgi-version-of-php-under-unix-and-i-cannot-log-in-using-cookie-auth" title="Permalink to this headline">¶</a></h3>
-<p>In <code class="file docutils literal"><span class="pre">php.ini</span></code>, set <code class="docutils literal"><span class="pre">mysql.max_links</span></code> higher than 1.</p>
-</div>
-<div class="section" id="i-don-t-see-the-location-of-text-file-field-so-i-cannot-upload">
-<span id="faq1-22"></span><h3>1.22 I don&#8217;t see the &#8220;Location of text file&#8221; field, so I cannot upload.<a class="headerlink" href="#i-don-t-see-the-location-of-text-file-field-so-i-cannot-upload" title="Permalink to this headline">¶</a></h3>
-<p>This is most likely because in <code class="file docutils literal"><span class="pre">php.ini</span></code>, your <code class="docutils literal"><span class="pre">file_uploads</span></code>
-parameter is not set to &#8220;on&#8221;.</p>
-</div>
-<div class="section" id="i-m-running-mysql-on-a-win32-machine-each-time-i-create-a-new-table-the-table-and-column-names-are-changed-to-lowercase">
-<span id="faq1-23"></span><h3>1.23 I&#8217;m running MySQL on a Win32 machine. Each time I create a new table the table and column names are changed to lowercase!<a class="headerlink" href="#i-m-running-mysql-on-a-win32-machine-each-time-i-create-a-new-table-the-table-and-column-names-are-changed-to-lowercase" title="Permalink to this headline">¶</a></h3>
-<p>This happens because the MySQL directive <code class="docutils literal"><span class="pre">lower_case_table_names</span></code>
-defaults to 1 (<code class="docutils literal"><span class="pre">ON</span></code>) in the Win32 version of MySQL. You can change
-this behavior by simply changing the directive to 0 (<code class="docutils literal"><span class="pre">OFF</span></code>): Just
-edit your <code class="docutils literal"><span class="pre">my.ini</span></code> file that should be located in your Windows
-directory and add the following line to the group [mysqld]:</p>
-<div class="highlight-ini"><div class="highlight"><pre><span class="na">set-variable</span> <span class="o">=</span> <span class="s">lower_case_table_names=0</span>
-</pre></div>
-</div>
-<p>Next, save the file and restart the MySQL service. You can always
-check the value of this directive using the query</p>
-<div class="highlight-mysql"><div class="highlight"><pre><span class="k">SHOW</span> <span class="n">VARIABLES</span> <span class="k">LIKE</span> <span class="s1">&#39;lower_case_table_names&#39;</span><span class="p">;</span>
-</pre></div>
-</div>
-</div>
-<div class="section" id="faq1-24">
-<span id="id5"></span><h3>1.24 (withdrawn).<a class="headerlink" href="#faq1-24" title="Permalink to this headline">¶</a></h3>
-</div>
-<div class="section" id="i-am-running-apache-with-mod-gzip-1-3-26-1a-on-windows-xp-and-i-get-problems-such-as-undefined-variables-when-i-run-a-sql-query">
-<span id="faq1-25"></span><h3>1.25 I am running Apache with mod_gzip-1.3.26.1a on Windows XP, and I get problems, such as undefined variables when I run a SQL query.<a class="headerlink" href="#i-am-running-apache-with-mod-gzip-1-3-26-1a-on-windows-xp-and-i-get-problems-such-as-undefined-variables-when-i-run-a-sql-query" title="Permalink to this headline">¶</a></h3>
-<p>A tip from Jose Fandos: put a comment on the following two lines in
-httpd.conf, like this:</p>
-<div class="highlight-apache"><div class="highlight"><pre><span class="c"># mod_gzip_item_include file \.php$</span>
-<span class="c"># mod_gzip_item_include mime &quot;application/x-httpd-php.*&quot;</span>
-</pre></div>
-</div>
-<p>as this version of mod_gzip on Apache (Windows) has problems handling
-PHP scripts. Of course you have to restart Apache.</p>
-</div>
-<div class="section" id="i-just-installed-phpmyadmin-in-my-document-root-of-iis-but-i-get-the-error-no-input-file-specified-when-trying-to-run-phpmyadmin">
-<span id="faq1-26"></span><h3>1.26 I just installed phpMyAdmin in my document root of IIS but I get the error &#8220;No input file specified&#8221; when trying to run phpMyAdmin.<a class="headerlink" href="#i-just-installed-phpmyadmin-in-my-document-root-of-iis-but-i-get-the-error-no-input-file-specified-when-trying-to-run-phpmyadmin" title="Permalink to this headline">¶</a></h3>
-<p>This is a permission problem. Right-click on the phpmyadmin folder and
-choose properties. Under the tab Security, click on &#8220;Add&#8221; and select
-the user &#8220;IUSR_machine&#8221; from the list. Now set his permissions and it
-should work.</p>
-</div>
-<div class="section" id="i-get-empty-page-when-i-want-to-view-huge-page-eg-db-structure-php-with-plenty-of-tables">
-<span id="faq1-27"></span><h3>1.27 I get empty page when I want to view huge page (eg. db_structure.php with plenty of tables).<a class="headerlink" href="#i-get-empty-page-when-i-want-to-view-huge-page-eg-db-structure-php-with-plenty-of-tables" title="Permalink to this headline">¶</a></h3>
-<p>This was caused by a <a class="reference external" href="https://bugs.php.net/21079">PHP bug</a> that occur when
-GZIP output buffering is enabled. If you turn off it (by
-<span class="target" id="index-3"></span><a class="reference internal" href="config.html#cfg_OBGzip"><code class="xref config config-option docutils literal"><span class="pre">$cfg['OBGzip']</span></code></a> in <code class="file docutils literal"><span class="pre">config.inc.php</span></code>), it should work.
-This bug will has been fixed in PHP 5.0.0.</p>
-</div>
-<div class="section" id="my-mysql-server-sometimes-refuses-queries-and-returns-the-message-errorcode-13-what-does-this-mean">
-<span id="faq1-28"></span><h3>1.28 My MySQL server sometimes refuses queries and returns the message &#8216;Errorcode: 13&#8217;. What does this mean?<a class="headerlink" href="#my-mysql-server-sometimes-refuses-queries-and-returns-the-message-errorcode-13-what-does-this-mean" title="Permalink to this headline">¶</a></h3>
-<p>This can happen due to a MySQL bug when having database / table names
-with upper case characters although <code class="docutils literal"><span class="pre">lower_case_table_names</span></code> is
-set to 1. To fix this, turn off this directive, convert all database
-and table names to lower case and turn it on again. Alternatively,
-there&#8217;s a bug-fix available starting with MySQL&nbsp;3.23.56 /
-4.0.11-gamma.</p>
-</div>
-<div class="section" id="when-i-create-a-table-or-modify-a-column-i-get-an-error-and-the-columns-are-duplicated">
-<span id="faq1-29"></span><h3>1.29 When I create a table or modify a column, I get an error and the columns are duplicated.<a class="headerlink" href="#when-i-create-a-table-or-modify-a-column-i-get-an-error-and-the-columns-are-duplicated" title="Permalink to this headline">¶</a></h3>
-<p>It is possible to configure Apache in such a way that PHP has problems
-interpreting .php files.</p>
-<p>The problems occur when two different (and conflicting) set of
-directives are used:</p>
-<div class="highlight-apache"><div class="highlight"><pre><span class="nb">SetOutputFilter</span> PHP
-<span class="nb">SetInputFilter</span> PHP
-</pre></div>
-</div>
-<p>and</p>
-<div class="highlight-apache"><div class="highlight"><pre><span class="nb">AddType</span> application/x-httpd-php .php
-</pre></div>
-</div>
-<p>In the case we saw, one set of directives was in
-<code class="docutils literal"><span class="pre">/etc/httpd/conf/httpd.conf</span></code>, while the other set was in
-<code class="docutils literal"><span class="pre">/etc/httpd/conf/addon-modules/php.conf</span></code>. The recommended way is
-with <code class="docutils literal"><span class="pre">AddType</span></code>, so just comment out the first set of lines and
-restart Apache:</p>
-<div class="highlight-apache"><div class="highlight"><pre><span class="c">#SetOutputFilter PHP</span>
-<span class="c">#SetInputFilter PHP</span>
-</pre></div>
-</div>
-</div>
-<div class="section" id="i-get-the-error-navigation-php-missing-hash">
-<span id="faq1-30"></span><h3>1.30 I get the error &#8220;navigation.php: Missing hash&#8221;.<a class="headerlink" href="#i-get-the-error-navigation-php-missing-hash" title="Permalink to this headline">¶</a></h3>
-<p>This problem is known to happen when the server is running Turck
-MMCache but upgrading MMCache to version 2.3.21 solves the problem.</p>
-</div>
-<div class="section" id="does-phpmyadmin-support-php-5">
-<span id="faq1-31"></span><h3>1.31 Does phpMyAdmin support PHP 5?<a class="headerlink" href="#does-phpmyadmin-support-php-5" title="Permalink to this headline">¶</a></h3>
-<p>Yes.</p>
-<p>Since release 4.5, phpMyAdmin supports only PHP 5.5 and newer. Since release 4.1 phpMyAdmin supports only PHP 5.3 and newer. For PHP 5.2 you can use 4.0.x releases.</p>
-</div>
-<div class="section" id="can-i-use-http-authentication-with-iis">
-<span id="faq1-32"></span><h3>1.32 Can I use HTTP authentication with IIS?<a class="headerlink" href="#can-i-use-http-authentication-with-iis" title="Permalink to this headline">¶</a></h3>
-<p>Yes. This procedure was tested with phpMyAdmin 2.6.1, PHP 4.3.9 in
-<a class="reference internal" href="glossary.html#term-isapi"><span class="xref std std-term">ISAPI</span></a> mode under <a class="reference internal" href="glossary.html#term-iis"><span class="xref std std-term">IIS</span></a> 5.1.</p>
-<ol class="arabic simple">
-<li>In your <code class="file docutils literal"><span class="pre">php.ini</span></code> file, set <code class="docutils literal"><span class="pre">cgi.rfc2616_headers</span> <span class="pre">=</span> <span class="pre">0</span></code></li>
-<li>In <code class="docutils literal"><span class="pre">Web</span> <span class="pre">Site</span> <span class="pre">Properties</span> <span class="pre">-&gt;</span> <span class="pre">File/Directory</span> <span class="pre">Security</span> <span class="pre">-&gt;</span> <span class="pre">Anonymous</span>
-<span class="pre">Access</span></code> dialog box, check the <code class="docutils literal"><span class="pre">Anonymous</span> <span class="pre">access</span></code> checkbox and
-uncheck any other checkboxes (i.e. uncheck <code class="docutils literal"><span class="pre">Basic</span> <span class="pre">authentication</span></code>,
-<code class="docutils literal"><span class="pre">Integrated</span> <span class="pre">Windows</span> <span class="pre">authentication</span></code>, and <code class="docutils literal"><span class="pre">Digest</span></code> if it&#8217;s
-enabled.) Click <code class="docutils literal"><span class="pre">OK</span></code>.</li>
-<li>In <code class="docutils literal"><span class="pre">Custom</span> <span class="pre">Errors</span></code>, select the range of <code class="docutils literal"><span class="pre">401;1</span></code> through <code class="docutils literal"><span class="pre">401;5</span></code>
-and click the <code class="docutils literal"><span class="pre">Set</span> <span class="pre">to</span> <span class="pre">Default</span></code> button.</li>
-</ol>
-<div class="admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last"><span class="target" id="index-4"></span><a class="rfc reference external" href="https://tools.ietf.org/html/rfc2616.html"><strong>RFC 2616</strong></a></p>
-</div>
-</div>
-<div class="section" id="faq1-33">
-<span id="id6"></span><h3>1.33 (withdrawn).<a class="headerlink" href="#faq1-33" title="Permalink to this headline">¶</a></h3>
-</div>
-<div class="section" id="can-i-access-directly-to-database-or-table-pages">
-<span id="faq1-34"></span><h3>1.34 Can I access directly to database or table pages?<a class="headerlink" href="#can-i-access-directly-to-database-or-table-pages" title="Permalink to this headline">¶</a></h3>
-<p>Yes. Out of the box, you can use <a class="reference internal" href="glossary.html#term-url"><span class="xref std std-term">URL</span></a> like
-<a class="reference external" href="https://example.com/phpMyAdmin/index.php?server=X&amp;db=database&amp;table=table&amp;target=script">https://example.com/phpMyAdmin/index.php?server=X&amp;db=database&amp;table=table&amp;target=script</a>.
-For <code class="docutils literal"><span class="pre">server</span></code> you use the server number
-which refers to the order of the server paragraph in
-<code class="file docutils literal"><span class="pre">config.inc.php</span></code>. Table and script parts are optional. If you want
-<a class="reference external" href="https://example.com/phpMyAdmin/database[/table][/script">https://example.com/phpMyAdmin/database[/table][/script</a>] <a class="reference internal" href="glossary.html#term-url"><span class="xref std std-term">URL</span></a>, you need to do some configuration. Following
-lines apply only for <a class="reference external" href="https://httpd.apache.org/">Apache</a> web server.
-First make sure, that you have enabled some features within global
-configuration. You need <code class="docutils literal"><span class="pre">Options</span> <span class="pre">SymLinksIfOwnerMatch</span></code> and <code class="docutils literal"><span class="pre">AllowOverride</span>
-<span class="pre">FileInfo</span></code> enabled for directory where phpMyAdmin is installed and you
-need mod_rewrite to be enabled. Then you just need to create
-following <a class="reference internal" href="glossary.html#term-htaccess"><span class="xref std std-term">.htaccess</span></a> file in root folder of phpMyAdmin installation (don&#8217;t
-forget to change directory name inside of it):</p>
-<div class="highlight-apache"><div class="highlight"><pre><span class="nb">RewriteEngine</span> <span class="k">On</span>
-<span class="nb">RewriteBase</span> <span class="sx">/path_to_phpMyAdmin</span>
-<span class="nb">RewriteRule</span> ^([a-zA-Z0-9_]+)/([a-zA-Z0-9_]+)/([a-z_]+\.php)$ index.php?db=$1&amp;table=$2&amp;target=$3 [R]
-<span class="nb">RewriteRule</span> ^([a-zA-Z0-9_]+)/([a-z_]+\.php)$ index.php?db=$1&amp;target=$2 [R]
-<span class="nb">RewriteRule</span> ^([a-zA-Z0-9_]+)/([a-zA-Z0-9_]+)$ index.php?db=$1&amp;table=$2 [R]
-<span class="nb">RewriteRule</span> ^([a-zA-Z0-9_]+)$ index.php?db=$1 [R]
-</pre></div>
-</div>
-</div>
-<div class="section" id="can-i-use-http-authentication-with-apache-cgi">
-<span id="faq1-35"></span><h3>1.35 Can I use HTTP authentication with Apache CGI?<a class="headerlink" href="#can-i-use-http-authentication-with-apache-cgi" title="Permalink to this headline">¶</a></h3>
-<p>Yes. However you need to pass authentication variable to <a class="reference internal" href="glossary.html#term-cgi"><span class="xref std std-term">CGI</span></a> using
-following rewrite rule:</p>
-<div class="highlight-apache"><div class="highlight"><pre><span class="nb">RewriteEngine</span> <span class="k">On</span>
-<span class="nb">RewriteRule</span> .* - [E=REMOTE_USER:%{HTTP:Authorization},L]
-</pre></div>
-</div>
-</div>
-<div class="section" id="i-get-an-error-500-internal-server-error">
-<span id="faq1-36"></span><h3>1.36 I get an error &#8220;500 Internal Server Error&#8221;.<a class="headerlink" href="#i-get-an-error-500-internal-server-error" title="Permalink to this headline">¶</a></h3>
-<p>There can be many explanations to this and a look at your server&#8217;s
-error log file might give a clue.</p>
-</div>
-<div class="section" id="i-run-phpmyadmin-on-cluster-of-different-machines-and-password-encryption-in-cookie-auth-doesn-t-work">
-<span id="faq1-37"></span><h3>1.37 I run phpMyAdmin on cluster of different machines and password encryption in cookie auth doesn&#8217;t work.<a class="headerlink" href="#i-run-phpmyadmin-on-cluster-of-different-machines-and-password-encryption-in-cookie-auth-doesn-t-work" title="Permalink to this headline">¶</a></h3>
-<p>If your cluster consist of different architectures, PHP code used for
-encryption/decryption won&#8217;t work correct. This is caused by use of
-pack/unpack functions in code. Only solution is to use mcrypt
-extension which works fine in this case.</p>
-</div>
-<div class="section" id="can-i-use-phpmyadmin-on-a-server-on-which-suhosin-is-enabled">
-<span id="faq1-38"></span><h3>1.38 Can I use phpMyAdmin on a server on which Suhosin is enabled?<a class="headerlink" href="#can-i-use-phpmyadmin-on-a-server-on-which-suhosin-is-enabled" title="Permalink to this headline">¶</a></h3>
-<p>Yes but the default configuration values of Suhosin are known to cause
-problems with some operations, for example editing a table with many
-columns and no primary key or with textual primary key.</p>
-<p>Suhosin configuration might lead to malfunction in some cases and it
-can not be fully avoided as phpMyAdmin is kind of application which
-needs to transfer big amounts of columns in single HTTP request, what
-is something what Suhosin tries to prevent. Generally all
-<code class="docutils literal"><span class="pre">suhosin.request.*</span></code>, <code class="docutils literal"><span class="pre">suhosin.post.*</span></code> and <code class="docutils literal"><span class="pre">suhosin.get.*</span></code>
-directives can have negative effect on phpMyAdmin usability. You can
-always find in your error logs which limit did cause dropping of
-variable, so you can diagnose the problem and adjust matching
-configuration variable.</p>
-<p>The default values for most Suhosin configuration options will work in
-most scenarios, however you might want to adjust at least following
-parameters:</p>
-<ul class="simple">
-<li><a class="reference external" href="http://www.hardened-php.net/suhosin/configuration.html#suhosin.request.max_vars">suhosin.request.max_vars</a> should
-be increased (eg. 2048)</li>
-<li><a class="reference external" href="http://www.hardened-php.net/suhosin/configuration.html#suhosin.post.max_vars">suhosin.post.max_vars</a> should be
-increased (eg. 2048)</li>
-<li><a class="reference external" href="http://www.hardened-php.net/suhosin/configuration.html#suhosin.request.max_array_index_length">suhosin.request.max_array_index_length</a>
-should be increased (eg. 256)</li>
-<li><a class="reference external" href="http://www.hardened-php.net/suhosin/configuration.html#suhosin.post.max_array_index_length">suhosin.post.max_array_index_length</a>
-should be increased (eg. 256)</li>
-<li><a class="reference external" href="http://www.hardened-php.net/suhosin/configuration.html#suhosin.request.max_totalname_length">suhosin.request.max_totalname_length</a>
-should be increased (eg. 8192)</li>
-<li><a class="reference external" href="http://www.hardened-php.net/suhosin/configuration.html#suhosin.post.max_totalname_length">suhosin.post.max_totalname_length</a> should be
-increased (eg. 8192)</li>
-<li><a class="reference external" href="http://www.hardened-php.net/suhosin/configuration.html#suhosin.get.max_value_length">suhosin.get.max_value_length</a>
-should be increased (eg. 1024)</li>
-<li><a class="reference external" href="http://www.hardened-php.net/suhosin/configuration.html#suhosin.sql.bailout_on_error">suhosin.sql.bailout_on_error</a>
-needs to be disabled (the default)</li>
-<li><a class="reference external" href="http://www.hardened-php.net/suhosin/configuration.html#logging_configuration">suhosin.log.*</a> should not
-include <a class="reference internal" href="glossary.html#term-sql"><span class="xref std std-term">SQL</span></a>, otherwise you get big
-slowdown</li>
-</ul>
-<p>You can also disable the warning using the <span class="target" id="index-5"></span><a class="reference internal" href="config.html#cfg_SuhosinDisableWarning"><code class="xref config config-option docutils literal"><span class="pre">$cfg['SuhosinDisableWarning']</span></code></a>.</p>
-</div>
-<div class="section" id="when-i-try-to-connect-via-https-i-can-log-in-but-then-my-connection-is-redirected-back-to-http-what-can-cause-this-behavior">
-<span id="faq1-39"></span><h3>1.39 When I try to connect via https, I can log in, but then my connection is redirected back to http. What can cause this behavior?<a class="headerlink" href="#when-i-try-to-connect-via-https-i-can-log-in-but-then-my-connection-is-redirected-back-to-http-what-can-cause-this-behavior" title="Permalink to this headline">¶</a></h3>
-<p>Be sure that you have enabled <code class="docutils literal"><span class="pre">SSLOptions</span></code> and <code class="docutils literal"><span class="pre">StdEnvVars</span></code> in
-your Apache configuration.</p>
-<div class="admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="http://httpd.apache.org/docs/2.0/mod/mod_ssl.html#ssloptions">http://httpd.apache.org/docs/2.0/mod/mod_ssl.html#ssloptions</a>&gt;</p>
-</div>
-</div>
-<div class="section" id="when-accessing-phpmyadmin-via-an-apache-reverse-proxy-cookie-login-does-not-work">
-<span id="faq1-40"></span><h3>1.40 When accessing phpMyAdmin via an Apache reverse proxy, cookie login does not work.<a class="headerlink" href="#when-accessing-phpmyadmin-via-an-apache-reverse-proxy-cookie-login-does-not-work" title="Permalink to this headline">¶</a></h3>
-<p>To be able to use cookie auth Apache must know that it has to rewrite
-the set-cookie headers. Example from the Apache 2.2 documentation:</p>
-<div class="highlight-apache"><div class="highlight"><pre><span class="nb">ProxyPass</span> <span class="sx">/mirror/foo/</span> http://backend.example.com/
-<span class="nb">ProxyPassReverse</span> <span class="sx">/mirror/foo/</span> http://backend.example.com/
-<span class="nb">ProxyPassReverseCookieDomain</span> backend.example.com public.example.com
-<span class="nb">ProxyPassReverseCookiePath</span> / <span class="sx">/mirror/foo/</span>
-</pre></div>
-</div>
-<p>Note: if the backend url looks like <a class="reference external" href="https://example.com/~user/phpmyadmin">https://example.com/~user/phpmyadmin</a>, the
-tilde (~) must be url encoded as %7E in the ProxyPassReverse* lines.
-This is not specific to phpmyadmin, it&#8217;s just the behavior of Apache.</p>
-<div class="highlight-apache"><div class="highlight"><pre><span class="nb">ProxyPass</span> <span class="sx">/mirror/foo/</span> http://backend.example.com/~user/phpmyadmin
-<span class="nb">ProxyPassReverse</span> <span class="sx">/mirror/foo/</span> http://backend.example.com/%7Euser/phpmyadmin
-<span class="nb">ProxyPassReverseCookiePath</span> /%7Euser/phpmyadmin <span class="sx">/mirror/foo</span>
-</pre></div>
-</div>
-<div class="admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="https://httpd.apache.org/docs/2.2/mod/mod_proxy.html">https://httpd.apache.org/docs/2.2/mod/mod_proxy.html</a>&gt;, <span class="target" id="index-6"></span><a class="reference internal" href="config.html#cfg_PmaAbsoluteUri"><code class="xref config config-option docutils literal"><span class="pre">$cfg['PmaAbsoluteUri']</span></code></a></p>
-</div>
-</div>
-<div class="section" id="when-i-view-a-database-and-ask-to-see-its-privileges-i-get-an-error-about-an-unknown-column">
-<span id="faq1-41"></span><h3>1.41 When I view a database and ask to see its privileges, I get an error about an unknown column.<a class="headerlink" href="#when-i-view-a-database-and-ask-to-see-its-privileges-i-get-an-error-about-an-unknown-column" title="Permalink to this headline">¶</a></h3>
-<p>The MySQL server&#8217;s privilege tables are not up to date, you need to
-run the <strong class="command">mysql_upgrade</strong> command on the server.</p>
-</div>
-<div class="section" id="how-can-i-prevent-robots-from-accessing-phpmyadmin">
-<span id="faq1-42"></span><h3>1.42 How can I prevent robots from accessing phpMyAdmin?<a class="headerlink" href="#how-can-i-prevent-robots-from-accessing-phpmyadmin" title="Permalink to this headline">¶</a></h3>
-<p>You can add various rules to <a class="reference internal" href="glossary.html#term-htaccess"><span class="xref std std-term">.htaccess</span></a> to filter access based on user agent
-field. This is quite easy to circumvent, but could prevent at least
-some robots accessing your installation.</p>
-<div class="highlight-apache"><div class="highlight"><pre><span class="nb">RewriteEngine</span> <span class="k">on</span>
-
-<span class="c"># Allow only GET and POST verbs</span>
-<span class="nb">RewriteCond</span> %{REQUEST_METHOD} !^(GET|POST)$ [NC,OR]
-
-<span class="c"># Ban Typical Vulnerability Scanners and others</span>
-<span class="c"># Kick out Script Kiddies</span>
-<span class="nb">RewriteCond</span> %{HTTP_USER_AGENT} ^(java|curl|wget).* [NC,OR]
-<span class="nb">RewriteCond</span> %{HTTP_USER_AGENT} ^.*(libwww-perl|curl|wget|python|nikto|wkito|pikto|scan|acunetix).* [NC,OR]
-<span class="nb">RewriteCond</span> %{HTTP_USER_AGENT} ^.*(winhttp|HTTrack|clshttp|archiver|loader|email|harvest|extract|grab|miner).* [NC,OR]
-
-<span class="c"># Ban Search Engines, Crawlers to your administrative panel</span>
-<span class="c"># No reasons to access from bots</span>
-<span class="c"># Ultimately Better than the useless robots.txt</span>
-<span class="c"># Did google respect robots.txt?</span>
-<span class="c"># Try google: intitle:phpMyAdmin intext:&quot;Welcome to phpMyAdmin *.*.*&quot; intext:&quot;Log in&quot; -wiki -forum -forums -questions intext:&quot;Cookies must be enabled&quot;</span>
-<span class="nb">RewriteCond</span> %{HTTP_USER_AGENT} ^.*(AdsBot-Google|ia_archiver|Scooter|Ask.Jeeves|Baiduspider|Exabot|FAST.Enterprise.Crawler|FAST-WebCrawler|www\.neomo\.de|Gigabot|Mediapartners-Google|Google.Desktop|Feedfetcher-Google|Googlebot|heise-IT-Markt-Crawler|heritrix|ibm.com\cs/crawler|ICCrawler|ichiro|MJ12bot|MetagerBot|msnbot-NewsBlogs|msnbot|msnbot-media|NG-Search|lucene.apache.org|NutchCVS|OmniExplorer_Bot|online.link.validator|psbot0|Seekbot|Sensis.Web.Crawler|SEO.search.Crawler|Seoma.\[SEO.Crawler\]|SEOsearch|Snappy|www.urltrends.com|www.tkl.iis.u-tokyo.ac.jp/~crawler|SynooBot|crawleradmin.t-info@telekom.de|TurnitinBot|voyager|W3.SiteSearch.Crawler|W3C-checklink|W3C_Validator|www.WISEnutbot.com|yacybot|Yahoo-MMCrawler|Yahoo\!.DE.Slurp|Yahoo\!.Slurp|YahooSeeker).* [NC]
-<span class="nb">RewriteRule</span> .* - [F]
-</pre></div>
-</div>
-</div>
-<div class="section" id="why-can-t-i-display-the-structure-of-my-table-containing-hundreds-of-columns">
-<span id="faq1-43"></span><h3>1.43 Why can&#8217;t I display the structure of my table containing hundreds of columns?<a class="headerlink" href="#why-can-t-i-display-the-structure-of-my-table-containing-hundreds-of-columns" title="Permalink to this headline">¶</a></h3>
-<p>Because your PHP&#8217;s <code class="docutils literal"><span class="pre">memory_limit</span></code> is too low; adjust it in <code class="file docutils literal"><span class="pre">php.ini</span></code>.</p>
-</div>
-<div class="section" id="how-can-i-reduce-the-installed-size-of-phpmyadmin-on-disk">
-<span id="faq1-44"></span><h3>1.44 How can I reduce the installed size of phpMyAdmin on disk?<a class="headerlink" href="#how-can-i-reduce-the-installed-size-of-phpmyadmin-on-disk" title="Permalink to this headline">¶</a></h3>
-<p>Some users have requested to be able to reduce the size of the phpMyAdmin installation.
-This is not recommended and could lead to confusion over missing features, but can be done.
-A list of files and corresponding functionality which degrade gracefully when removed include:</p>
-<ul class="simple">
-<li><code class="file docutils literal"><span class="pre">./libraries/tcpdf</span></code> folder (exporting to PDF)</li>
-<li><code class="file docutils literal"><span class="pre">./locale/</span></code> folder, or unused subfolders (interface translations)</li>
-<li>Any unused themes in <code class="file docutils literal"><span class="pre">./themes/</span></code></li>
-<li><code class="file docutils literal"><span class="pre">./js/jquery/src/</span></code> (included for licensing reasons)</li>
-<li><code class="file docutils literal"><span class="pre">./js/line_counts.php</span></code></li>
-<li><code class="file docutils literal"><span class="pre">./doc/</span></code> (documentation)</li>
-<li><code class="file docutils literal"><span class="pre">./setup/</span></code> (setup script)</li>
-<li><code class="file docutils literal"><span class="pre">./examples/</span></code></li>
-<li><code class="file docutils literal"><span class="pre">./sql/</span></code> (SQL scripts to configure advanced functionality)</li>
-</ul>
-</div>
-</div>
-<div class="section" id="configuration">
-<span id="faqconfig"></span><h2>Configuration<a class="headerlink" href="#configuration" title="Permalink to this headline">¶</a></h2>
-<div class="section" id="the-error-message-warning-cannot-add-header-information-headers-already-sent-by-is-displayed-what-s-the-problem">
-<span id="faq2-1"></span><h3>2.1 The error message &#8220;Warning: Cannot add header information - headers already sent by ...&#8221; is displayed, what&#8217;s the problem?<a class="headerlink" href="#the-error-message-warning-cannot-add-header-information-headers-already-sent-by-is-displayed-what-s-the-problem" title="Permalink to this headline">¶</a></h3>
-<p>Edit your <code class="file docutils literal"><span class="pre">config.inc.php</span></code> file and ensure there is nothing (I.E. no
-blank lines, no spaces, no characters...) neither before the <code class="docutils literal"><span class="pre">&lt;?php</span></code> tag at
-the beginning, neither after the <code class="docutils literal"><span class="pre">?&gt;</span></code> tag at the end. We also got a report
-from a user under <a class="reference internal" href="glossary.html#term-iis"><span class="xref std std-term">IIS</span></a>, that used a zipped distribution kit: the file
-<code class="file docutils literal"><span class="pre">libraries/Config.class.php</span></code> contained an end-of-line character (hex 0A)
-at the end; removing this character cleared his errors.</p>
-</div>
-<div class="section" id="phpmyadmin-can-t-connect-to-mysql-what-s-wrong">
-<span id="faq2-2"></span><h3>2.2 phpMyAdmin can&#8217;t connect to MySQL. What&#8217;s wrong?<a class="headerlink" href="#phpmyadmin-can-t-connect-to-mysql-what-s-wrong" title="Permalink to this headline">¶</a></h3>
-<p>Either there is an error with your PHP setup or your username/password
-is wrong. Try to make a small script which uses mysql_connect and see
-if it works. If it doesn&#8217;t, it may be you haven&#8217;t even compiled MySQL
-support into PHP.</p>
-</div>
-<div class="section" id="the-error-message-warning-mysql-connection-failed-can-t-connect-to-local-mysql-server-through-socket-tmp-mysql-sock-111-is-displayed-what-can-i-do">
-<span id="faq2-3"></span><h3>2.3 The error message &#8220;Warning: MySQL Connection Failed: Can&#8217;t connect to local MySQL server through socket &#8216;/tmp/mysql.sock&#8217; (111) ...&#8221; is displayed. What can I do?<a class="headerlink" href="#the-error-message-warning-mysql-connection-failed-can-t-connect-to-local-mysql-server-through-socket-tmp-mysql-sock-111-is-displayed-what-can-i-do" title="Permalink to this headline">¶</a></h3>
-<p>For RedHat users, Harald Legner suggests this on the mailing list:</p>
-<p>On my RedHat-Box the socket of MySQL is <em>/var/lib/mysql/mysql.sock</em>.
-In your <code class="file docutils literal"><span class="pre">php.ini</span></code> you will find a line</p>
-<div class="highlight-ini"><div class="highlight"><pre><span class="na">mysql.default_socket</span> <span class="o">=</span> <span class="s">/tmp/mysql.sock</span>
-</pre></div>
-</div>
-<p>change it to</p>
-<div class="highlight-ini"><div class="highlight"><pre><span class="na">mysql.default_socket</span> <span class="o">=</span> <span class="s">/var/lib/mysql/mysql.sock</span>
-</pre></div>
-</div>
-<p>Then restart apache and it will work.</p>
-<p>Here is a fix suggested by Brad Ummer:</p>
-<ul class="simple">
-<li>First, you need to determine what socket is being used by MySQL. To do
-this, telnet to your server and go to the MySQL bin directory. In this
-directory there should be a file named <em>mysqladmin</em>. Type
-<code class="docutils literal"><span class="pre">./mysqladmin</span> <span class="pre">variables</span></code>, and this should give you a bunch of info
-about your MySQL server, including the socket (<em>/tmp/mysql.sock</em>, for
-example).</li>
-<li>Then, you need to tell PHP to use this socket. To do this in
-phpMyAdmin, you need to complete the socket information in the
-<code class="file docutils literal"><span class="pre">config.inc.php</span></code>. For example:
-<span class="target" id="index-7"></span><a class="reference internal" href="config.html#cfg_Servers_socket"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['socket']</span></code></a>  Please also make sure that
-the permissions of this file allow to be readable by your webserver (i.e.
-&#8216;0755&#8217;).</li>
-</ul>
-<p>Have also a look at the <a class="reference external" href="https://dev.mysql.com/doc/en/can-not-connect-to-server.html">corresponding section of the MySQL
-documentation</a>.</p>
-</div>
-<div class="section" id="nothing-is-displayed-by-my-browser-when-i-try-to-run-phpmyadmin-what-can-i-do">
-<span id="faq2-4"></span><h3>2.4 Nothing is displayed by my browser when I try to run phpMyAdmin, what can I do?<a class="headerlink" href="#nothing-is-displayed-by-my-browser-when-i-try-to-run-phpmyadmin-what-can-i-do" title="Permalink to this headline">¶</a></h3>
-<p>Try to set the <span class="target" id="index-8"></span><a class="reference internal" href="config.html#cfg_OBGzip"><code class="xref config config-option docutils literal"><span class="pre">$cfg['OBGzip']</span></code></a> directive to <code class="docutils literal"><span class="pre">false</span></code> in the phpMyAdmin configuration
-file. It helps sometime. Also have a look at your PHP version number:
-if it contains &#8220;b&#8221; or &#8220;alpha&#8221; it means you&#8217;re running a testing
-version of PHP. That&#8217;s not a so good idea, please upgrade to a plain
-revision.</p>
-</div>
-<div class="section" id="each-time-i-want-to-insert-or-change-a-row-or-drop-a-database-or-a-table-an-error-404-page-not-found-is-displayed-or-with-http-or-cookie-authentication-i-m-asked-to-log-in-again-what-s-wrong">
-<span id="faq2-5"></span><h3>2.5 Each time I want to insert or change a row or drop a database or a table, an error 404 (page not found) is displayed or, with HTTP or cookie authentication, I&#8217;m asked to log in again. What&#8217;s wrong?<a class="headerlink" href="#each-time-i-want-to-insert-or-change-a-row-or-drop-a-database-or-a-table-an-error-404-page-not-found-is-displayed-or-with-http-or-cookie-authentication-i-m-asked-to-log-in-again-what-s-wrong" title="Permalink to this headline">¶</a></h3>
-<p>Check your webserver setup if it correctly fills in either PHP_SELF or REQUEST_URI variables.</p>
-<p>If you are running phpMyAdmin behind reverse proxy, please set the
-<span class="target" id="index-9"></span><a class="reference internal" href="config.html#cfg_PmaAbsoluteUri"><code class="xref config config-option docutils literal"><span class="pre">$cfg['PmaAbsoluteUri']</span></code></a> directive in the phpMyAdmin
-configuration file to match your setup.</p>
-</div>
-<div class="section" id="i-get-an-access-denied-for-user-root-localhost-using-password-yes-error-when-trying-to-access-a-mysql-server-on-a-host-which-is-port-forwarded-for-my-localhost">
-<span id="faq2-6"></span><h3>2.6 I get an &#8220;Access denied for user: <a class="reference external" href="mailto:'root&#37;&#52;&#48;localhost">'root<span>&#64;</span>localhost</a>&#8216; (Using password: YES)&#8221;-error when trying to access a MySQL-Server on a host which is port-forwarded for my localhost.<a class="headerlink" href="#i-get-an-access-denied-for-user-root-localhost-using-password-yes-error-when-trying-to-access-a-mysql-server-on-a-host-which-is-port-forwarded-for-my-localhost" title="Permalink to this headline">¶</a></h3>
-<p>When you are using a port on your localhost, which you redirect via
-port-forwarding to another host, MySQL is not resolving the localhost
-as expected. Erik Wasser explains: The solution is: if your host is
-&#8220;localhost&#8221; MySQL (the command line tool <strong class="command">mysql</strong> as well) always
-tries to use the socket connection for speeding up things. And that
-doesn&#8217;t work in this configuration with port forwarding. If you enter
-&#8220;127.0.0.1&#8221; as hostname, everything is right and MySQL uses the
-<a class="reference internal" href="glossary.html#term-tcp"><span class="xref std std-term">TCP</span></a> connection.</p>
-</div>
-<div class="section" id="using-and-creating-themes">
-<span id="faqthemes"></span><h3>2.7 Using and creating themes<a class="headerlink" href="#using-and-creating-themes" title="Permalink to this headline">¶</a></h3>
-<p>Themes are configured with <span class="target" id="index-10"></span><a class="reference internal" href="config.html#cfg_ThemePath"><code class="xref config config-option docutils literal"><span class="pre">$cfg['ThemePath']</span></code></a>,
-<span class="target" id="index-11"></span><a class="reference internal" href="config.html#cfg_ThemeManager"><code class="xref config config-option docutils literal"><span class="pre">$cfg['ThemeManager']</span></code></a> and <span class="target" id="index-12"></span><a class="reference internal" href="config.html#cfg_ThemeDefault"><code class="xref config config-option docutils literal"><span class="pre">$cfg['ThemeDefault']</span></code></a>.
-Under <span class="target" id="index-13"></span><a class="reference internal" href="config.html#cfg_ThemePath"><code class="xref config config-option docutils literal"><span class="pre">$cfg['ThemePath']</span></code></a>, you should not delete the
-directory <code class="docutils literal"><span class="pre">pmahomme</span></code> or its underlying structure, because this is the
-system theme used by phpMyAdmin. <code class="docutils literal"><span class="pre">pmahomme</span></code> contains all images and
-styles, for backwards compatibility and for all themes that would not
-include images or css-files.  If <span class="target" id="index-14"></span><a class="reference internal" href="config.html#cfg_ThemeManager"><code class="xref config config-option docutils literal"><span class="pre">$cfg['ThemeManager']</span></code></a>
-is enabled, you can select your favorite theme on the main page. Your selected
-theme will be stored in a cookie.</p>
-<p>To create a theme:</p>
-<ul class="simple">
-<li>make a new subdirectory (for example &#8220;your_theme_name&#8221;) under <span class="target" id="index-15"></span><a class="reference internal" href="config.html#cfg_ThemePath"><code class="xref config config-option docutils literal"><span class="pre">$cfg['ThemePath']</span></code></a> (by
-default <code class="docutils literal"><span class="pre">themes</span></code>)</li>
-<li>copy the files and directories from <code class="docutils literal"><span class="pre">pmahomme</span></code> to &#8220;your_theme_name&#8221;</li>
-<li>edit the css-files in &#8220;your_theme_name/css&#8221;</li>
-<li>put your new images in &#8220;your_theme_name/img&#8221;</li>
-<li>edit <code class="file docutils literal"><span class="pre">layout.inc.php</span></code> in &#8220;your_theme_name&#8221;</li>
-<li>edit <code class="file docutils literal"><span class="pre">info.inc.php</span></code> in &#8220;your_theme_name&#8221; to contain your chosen
-theme name, that will be visible in user interface</li>
-<li>make a new screenshot of your theme and save it under
-&#8220;your_theme_name/screen.png&#8221;</li>
-</ul>
-<p>In theme directory there is file <code class="file docutils literal"><span class="pre">info.inc.php</span></code> which contains theme
-verbose name, theme generation and theme version. These versions and
-generations are enumerated from 1 and do not have any direct
-dependence on phpMyAdmin version. Themes within same generation should
-be backwards compatible - theme with version 2 should work in
-phpMyAdmin requiring version 1. Themes with different generation are
-incompatible.</p>
-<p>If you do not want to use your own symbols and buttons, remove the
-directory &#8220;img&#8221; in &#8220;your_theme_name&#8221;. phpMyAdmin will use the
-default icons and buttons (from the system-theme <code class="docutils literal"><span class="pre">pmahomme</span></code>).</p>
-</div>
-<div class="section" id="i-get-missing-parameters-errors-what-can-i-do">
-<span id="faqmissingparameters"></span><h3>2.8 I get &#8220;Missing parameters&#8221; errors, what can I do?<a class="headerlink" href="#i-get-missing-parameters-errors-what-can-i-do" title="Permalink to this headline">¶</a></h3>
-<p>Here are a few points to check:</p>
-<ul class="simple">
-<li>In <code class="file docutils literal"><span class="pre">config.inc.php</span></code>, try to leave the <span class="target" id="index-16"></span><a class="reference internal" href="config.html#cfg_PmaAbsoluteUri"><code class="xref config config-option docutils literal"><span class="pre">$cfg['PmaAbsoluteUri']</span></code></a> directive empty. See also
-<a class="reference internal" href="#faq4-7"><span class="std std-ref">4.7 Authentication window is displayed more than once, why?</span></a>.</li>
-<li>Maybe you have a broken PHP installation or you need to upgrade your
-Zend Optimizer. See &lt;<a class="reference external" href="https://bugs.php.net/bug.php?id=31134">https://bugs.php.net/bug.php?id=31134</a>&gt;.</li>
-<li>If you are using Hardened PHP with the ini directive
-<code class="docutils literal"><span class="pre">varfilter.max_request_variables</span></code> set to the default (200) or
-another low value, you could get this error if your table has a high
-number of columns. Adjust this setting accordingly. (Thanks to Klaus
-Dorninger for the hint).</li>
-<li>In the <code class="file docutils literal"><span class="pre">php.ini</span></code> directive <code class="docutils literal"><span class="pre">arg_separator.input</span></code>, a value of &#8221;;&#8221;
-will cause this error. Replace it with &#8220;&amp;;&#8221;.</li>
-<li>If you are using <a class="reference external" href="http://www.hardened-php.net/">Hardened-PHP</a>, you
-might want to increase <a class="reference external" href="http://www.hardened-php.net/hphp/troubleshooting.html">request limits</a>.</li>
-<li>The directory specified in the <code class="file docutils literal"><span class="pre">php.ini</span></code> directive
-<code class="docutils literal"><span class="pre">session.save_path</span></code> does not exist or is read-only.</li>
-</ul>
-</div>
-<div class="section" id="seeing-an-upload-progress-bar">
-<span id="faq2-9"></span><h3>2.9 Seeing an upload progress bar<a class="headerlink" href="#seeing-an-upload-progress-bar" title="Permalink to this headline">¶</a></h3>
-<p>To be able to see a progress bar during your uploads, your server must
-have the <a class="reference external" href="https://php.net/manual/en/book.apc.php">APC</a> extension, the
-<a class="reference external" href="https://pecl.php.net/package/uploadprogress">uploadprogress</a> one, or
-you must be running PHP 5.4.0 or higher. Moreover, the JSON extension
-has to be enabled in your PHP.</p>
-<p>If using APC, you must set <code class="docutils literal"><span class="pre">apc.rfc1867</span></code> to <code class="docutils literal"><span class="pre">on</span></code> in your <code class="file docutils literal"><span class="pre">php.ini</span></code>.</p>
-<p>If using PHP 5.4.0 or higher, you must set
-<code class="docutils literal"><span class="pre">session.upload_progress.enabled</span></code> to <code class="docutils literal"><span class="pre">1</span></code> in your <code class="file docutils literal"><span class="pre">php.ini</span></code>. However,
-starting from phpMyAdmin version 4.0.4, session-based upload progress has
-been temporarily deactivated due to its problematic behavior.</p>
-<div class="admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last"><span class="target" id="index-17"></span><a class="rfc reference external" href="https://tools.ietf.org/html/rfc1867.html"><strong>RFC 1867</strong></a></p>
-</div>
-</div>
-</div>
-<div class="section" id="known-limitations">
-<span id="faqlimitations"></span><h2>Known limitations<a class="headerlink" href="#known-limitations" title="Permalink to this headline">¶</a></h2>
-<div class="section" id="when-using-http-authentication-a-user-who-logged-out-can-not-log-in-again-in-with-the-same-nick">
-<span id="login-bug"></span><h3>3.1 When using HTTP authentication, a user who logged out can not log in again in with the same nick.<a class="headerlink" href="#when-using-http-authentication-a-user-who-logged-out-can-not-log-in-again-in-with-the-same-nick" title="Permalink to this headline">¶</a></h3>
-<p>This is related to the authentication mechanism (protocol) used by
-phpMyAdmin. To bypass this problem: just close all the opened browser
-windows and then go back to phpMyAdmin. You should be able to log in
-again.</p>
-</div>
-<div class="section" id="when-dumping-a-large-table-in-compressed-mode-i-get-a-memory-limit-error-or-a-time-limit-error">
-<span id="faq3-2"></span><h3>3.2 When dumping a large table in compressed mode, I get a memory limit error or a time limit error.<a class="headerlink" href="#when-dumping-a-large-table-in-compressed-mode-i-get-a-memory-limit-error-or-a-time-limit-error" title="Permalink to this headline">¶</a></h3>
-<p>Compressed dumps are built in memory and because of this are limited
-to php&#8217;s memory limit. For GZip/BZip2 exports this can be overcome
-since 2.5.4 using <span class="target" id="index-18"></span><a class="reference internal" href="config.html#cfg_CompressOnFly"><code class="xref config config-option docutils literal"><span class="pre">$cfg['CompressOnFly']</span></code></a> (enabled by default).
-Zip exports can not be handled this way, so if you need Zip files for larger
-dump, you have to use another way.</p>
-</div>
-<div class="section" id="with-innodb-tables-i-lose-foreign-key-relationships-when-i-rename-a-table-or-a-column">
-<span id="faq3-3"></span><h3>3.3 With InnoDB tables, I lose foreign key relationships when I rename a table or a column.<a class="headerlink" href="#with-innodb-tables-i-lose-foreign-key-relationships-when-i-rename-a-table-or-a-column" title="Permalink to this headline">¶</a></h3>
-<p>This is an InnoDB bug, see &lt;<a class="reference external" href="https://bugs.mysql.com/bug.php?id=21704">https://bugs.mysql.com/bug.php?id=21704</a>&gt;.</p>
-</div>
-<div class="section" id="i-am-unable-to-import-dumps-i-created-with-the-mysqldump-tool-bundled-with-the-mysql-server-distribution">
-<span id="faq3-4"></span><h3>3.4 I am unable to import dumps I created with the mysqldump tool bundled with the MySQL server distribution.<a class="headerlink" href="#i-am-unable-to-import-dumps-i-created-with-the-mysqldump-tool-bundled-with-the-mysql-server-distribution" title="Permalink to this headline">¶</a></h3>
-<p>The problem is that older versions of <code class="docutils literal"><span class="pre">mysqldump</span></code> created invalid
-comments like this:</p>
-<div class="highlight-mysql"><div class="highlight"><pre><span class="c1">-- MySQL dump 8.22</span>
-<span class="c1">--</span>
-<span class="c1">-- Host: localhost Database: database</span>
-<span class="o">-------------------------------------------------------</span><span class="c1">--</span>
-<span class="c1">-- Server version 3.23.54</span>
-</pre></div>
-</div>
-<p>The invalid part of the code is the horizontal line made of dashes
-that appears once in every dump created with mysqldump. If you want to
-run your dump you have to turn it into valid MySQL. This means, you
-have to add a whitespace after the first two dashes of the line or add
-a # before it:  <code class="docutils literal"><span class="pre">--</span> <span class="pre">-------------------------------------------------------</span></code> or
-<code class="docutils literal"><span class="pre">#---------------------------------------------------------</span></code></p>
-</div>
-<div class="section" id="when-using-nested-folders-multiple-hierarchies-are-displayed-in-a-wrong-manner">
-<span id="faq3-5"></span><h3>3.5 When using nested folders, multiple hierarchies are displayed in a wrong manner.<a class="headerlink" href="#when-using-nested-folders-multiple-hierarchies-are-displayed-in-a-wrong-manner" title="Permalink to this headline">¶</a></h3>
-<p>Please note that you should not use the separating string multiple
-times without any characters between them, or at the beginning/end of
-your table name. If you have to, think about using another
-TableSeparator or disabling that feature.</p>
-<div class="admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last"><span class="target" id="index-19"></span><a class="reference internal" href="config.html#cfg_NavigationTreeTableSeparator"><code class="xref config config-option docutils literal"><span class="pre">$cfg['NavigationTreeTableSeparator']</span></code></a></p>
-</div>
-</div>
-<div class="section" id="faq3-6">
-<span id="id7"></span><h3>3.6 (withdrawn).<a class="headerlink" href="#faq3-6" title="Permalink to this headline">¶</a></h3>
-</div>
-<div class="section" id="i-have-table-with-many-100-columns-and-when-i-try-to-browse-table-i-get-series-of-errors-like-warning-unable-to-parse-url-how-can-this-be-fixed">
-<span id="faq3-7"></span><h3>3.7 I have table with many (100+) columns and when I try to browse table I get series of errors like &#8220;Warning: unable to parse url&#8221;. How can this be fixed?<a class="headerlink" href="#i-have-table-with-many-100-columns-and-when-i-try-to-browse-table-i-get-series-of-errors-like-warning-unable-to-parse-url-how-can-this-be-fixed" title="Permalink to this headline">¶</a></h3>
-<p>Your table neither have a primary key nor an unique one, so we must
-use a long expression to identify this row. This causes problems to
-parse_url function. The workaround is to create a primary or unique
-key.</p>
-</div>
-<div class="section" id="i-cannot-use-clickable-html-forms-in-columns-where-i-put-a-mime-transformation-onto">
-<span id="faq3-8"></span><h3>3.8 I cannot use (clickable) HTML-forms in columns where I put a MIME-Transformation onto!<a class="headerlink" href="#i-cannot-use-clickable-html-forms-in-columns-where-i-put-a-mime-transformation-onto" title="Permalink to this headline">¶</a></h3>
-<p>Due to a surrounding form-container (for multi-row delete checkboxes),
-no nested forms can be put inside the table where phpMyAdmin displays
-the results. You can, however, use any form inside of a table if keep
-the parent form-container with the target to tbl_row_delete.php and
-just put your own input-elements inside. If you use a custom submit
-input field, the form will submit itself to the displaying page again,
-where you can validate the $HTTP_POST_VARS in a transformation. For
-a tutorial on how to effectively use transformations, see our <a class="reference external" href="https://www.phpmyadmin.net/docs/">Link
-section</a> on the
-official phpMyAdmin-homepage.</p>
-</div>
-<div class="section" id="i-get-error-messages-when-using-sql-mode-ansi-for-the-mysql-server">
-<span id="faq3-9"></span><h3>3.9 I get error messages when using &#8220;&#8211;sql_mode=ANSI&#8221; for the MySQL server.<a class="headerlink" href="#i-get-error-messages-when-using-sql-mode-ansi-for-the-mysql-server" title="Permalink to this headline">¶</a></h3>
-<p>When MySQL is running in ANSI-compatibility mode, there are some major
-differences in how <a class="reference internal" href="glossary.html#term-sql"><span class="xref std std-term">SQL</span></a> is structured (see
-&lt;<a class="reference external" href="https://dev.mysql.com/doc/refman/5.7/en/sql-mode.html#sqlmode_ansi">https://dev.mysql.com/doc/refman/5.7/en/sql-mode.html#sqlmode_ansi</a>&gt;). Most important of all, the
-quote-character (&#8221;) is interpreted as an identifier quote character and not as
-a string quote character, which makes many internal phpMyAdmin operations into
-invalid <a class="reference internal" href="glossary.html#term-sql"><span class="xref std std-term">SQL</span></a> statements. There is no
-workaround to this behaviour.  News to this item will be posted in <a class="reference external" href="https://sourceforge.net/p/phpmyadmin/bugs/1013/">Bug report
-#1013</a>.</p>
-</div>
-<div class="section" id="homonyms-and-no-primary-key-when-the-results-of-a-select-display-more-that-one-column-with-the-same-value-for-example-select-lastname-from-employees-where-firstname-like-a-and-two-smith-values-are-displayed-if-i-click-edit-i-cannot-be-sure-that-i-am-editing-the-intended-row">
-<span id="faq3-10"></span><h3>3.10 Homonyms and no primary key: When the results of a SELECT display more that one column with the same value (for example <code class="docutils literal"><span class="pre">SELECT</span> <span class="pre">lastname</span> <span class="pre">from</span> <span class="pre">employees</span> <span class="pre">where</span> <span class="pre">firstname</span> <span class="pre">like</span> <span class="pre">'A%'</span></code> and two &#8220;Smith&#8221; values are displayed), if I click Edit I cannot be sure that I am editing the intended row.<a class="headerlink" href="#homonyms-and-no-primary-key-when-the-results-of-a-select-display-more-that-one-column-with-the-same-value-for-example-select-lastname-from-employees-where-firstname-like-a-and-two-smith-values-are-displayed-if-i-click-edit-i-cannot-be-sure-that-i-am-editing-the-intended-row" title="Permalink to this headline">¶</a></h3>
-<p>Please make sure that your table has a primary key, so that phpMyAdmin
-can use it for the Edit and Delete links.</p>
-</div>
-<div class="section" id="the-number-of-rows-for-innodb-tables-is-not-correct">
-<span id="faq3-11"></span><h3>3.11 The number of rows for InnoDB tables is not correct.<a class="headerlink" href="#the-number-of-rows-for-innodb-tables-is-not-correct" title="Permalink to this headline">¶</a></h3>
-<p>phpMyAdmin uses a quick method to get the row count, and this method only
-returns an approximate count in the case of InnoDB tables. See
-<span class="target" id="index-20"></span><a class="reference internal" href="config.html#cfg_MaxExactCount"><code class="xref config config-option docutils literal"><span class="pre">$cfg['MaxExactCount']</span></code></a> for a way to modify those results, but
-this could have a serious impact on performance.
-However, one can easily replace the approximate row count with exact count by
-simply clicking on the approximate count. This can also be done for all tables
-at once by clicking on the rows sum displayed at the bottom.</p>
-</div>
-<div class="section" id="faq3-12">
-<span id="id9"></span><h3>3.12 (withdrawn).<a class="headerlink" href="#faq3-12" title="Permalink to this headline">¶</a></h3>
-</div>
-<div class="section" id="i-get-an-error-when-entering-use-followed-by-a-db-name-containing-an-hyphen">
-<span id="faq3-13"></span><h3>3.13 I get an error when entering <code class="docutils literal"><span class="pre">USE</span></code> followed by a db name containing an hyphen.<a class="headerlink" href="#i-get-an-error-when-entering-use-followed-by-a-db-name-containing-an-hyphen" title="Permalink to this headline">¶</a></h3>
-<p>The tests I have made with MySQL 5.1.49 shows that the API does not
-accept this syntax for the USE command.</p>
-</div>
-<div class="section" id="i-am-not-able-to-browse-a-table-when-i-don-t-have-the-right-to-select-one-of-the-columns">
-<span id="faq3-14"></span><h3>3.14 I am not able to browse a table when I don&#8217;t have the right to SELECT one of the columns.<a class="headerlink" href="#i-am-not-able-to-browse-a-table-when-i-don-t-have-the-right-to-select-one-of-the-columns" title="Permalink to this headline">¶</a></h3>
-<p>This has been a known limitation of phpMyAdmin since the beginning and
-it&#8217;s not likely to be solved in the future.</p>
-</div>
-<div class="section" id="faq3-15">
-<span id="id10"></span><h3>3.15 (withdrawn).<a class="headerlink" href="#faq3-15" title="Permalink to this headline">¶</a></h3>
-</div>
-<div class="section" id="faq3-16">
-<span id="id11"></span><h3>3.16 (withdrawn).<a class="headerlink" href="#faq3-16" title="Permalink to this headline">¶</a></h3>
-</div>
-<div class="section" id="faq3-17">
-<span id="id12"></span><h3>3.17 (withdrawn).<a class="headerlink" href="#faq3-17" title="Permalink to this headline">¶</a></h3>
-</div>
-<div class="section" id="when-i-import-a-csv-file-that-contains-multiple-tables-they-are-lumped-together-into-a-single-table">
-<span id="faq3-18"></span><h3>3.18 When I import a CSV file that contains multiple tables, they are lumped together into a single table.<a class="headerlink" href="#when-i-import-a-csv-file-that-contains-multiple-tables-they-are-lumped-together-into-a-single-table" title="Permalink to this headline">¶</a></h3>
-<p>There is no reliable way to differentiate tables in <a class="reference internal" href="glossary.html#term-csv"><span class="xref std std-term">CSV</span></a> format. For the
-time being, you will have to break apart <a class="reference internal" href="glossary.html#term-csv"><span class="xref std std-term">CSV</span></a> files containing multiple
-tables.</p>
-</div>
-<div class="section" id="when-i-import-a-file-and-have-phpmyadmin-determine-the-appropriate-data-structure-it-only-uses-int-decimal-and-varchar-types">
-<span id="faq3-19"></span><h3>3.19 When I import a file and have phpMyAdmin determine the appropriate data structure it only uses int, decimal, and varchar types.<a class="headerlink" href="#when-i-import-a-file-and-have-phpmyadmin-determine-the-appropriate-data-structure-it-only-uses-int-decimal-and-varchar-types" title="Permalink to this headline">¶</a></h3>
-<p>Currently, the import type-detection system can only assign these
-MySQL types to columns. In future, more will likely be added but for
-the time being you will have to edit the structure to your liking
-post-import.  Also, you should note the fact that phpMyAdmin will use
-the size of the largest item in any given column as the column size
-for the appropriate type. If you know you will be adding larger items
-to that column then you should manually adjust the column sizes
-accordingly. This is done for the sake of efficiency.</p>
-</div>
-<div class="section" id="after-upgrading-some-bookmarks-are-gone-or-their-content-cannot-be-shown">
-<span id="faq3-20"></span><h3>3.20 After upgrading, some bookmarks are gone or their content cannot be shown.<a class="headerlink" href="#after-upgrading-some-bookmarks-are-gone-or-their-content-cannot-be-shown" title="Permalink to this headline">¶</a></h3>
-<p>At some point, the character set used to store bookmark content has changed.
-It&#8217;s better to recreate your bookmark from the newer phpMyAdmin version.</p>
-</div>
-</div>
-<div class="section" id="isps-multi-user-installations">
-<span id="faqmultiuser"></span><h2>ISPs, multi-user installations<a class="headerlink" href="#isps-multi-user-installations" title="Permalink to this headline">¶</a></h2>
-<div class="section" id="i-m-an-isp-can-i-setup-one-central-copy-of-phpmyadmin-or-do-i-need-to-install-it-for-each-customer">
-<span id="faq4-1"></span><h3>4.1 I&#8217;m an ISP. Can I setup one central copy of phpMyAdmin or do I need to install it for each customer?<a class="headerlink" href="#i-m-an-isp-can-i-setup-one-central-copy-of-phpmyadmin-or-do-i-need-to-install-it-for-each-customer" title="Permalink to this headline">¶</a></h3>
-<p>Since version 2.0.3, you can setup a central copy of phpMyAdmin for all your
-users. The development of this feature was kindly sponsored by NetCologne GmbH.
-This requires a properly setup MySQL user management and phpMyAdmin
-<a class="reference internal" href="glossary.html#term-http"><span class="xref std std-term">HTTP</span></a> or cookie authentication.</p>
-<div class="admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last"><a class="reference internal" href="setup.html#authentication-modes"><span class="std std-ref">Using authentication modes</span></a></p>
-</div>
-</div>
-<div class="section" id="what-s-the-preferred-way-of-making-phpmyadmin-secure-against-evil-access">
-<span id="faq4-2"></span><h3>4.2 What&#8217;s the preferred way of making phpMyAdmin secure against evil access?<a class="headerlink" href="#what-s-the-preferred-way-of-making-phpmyadmin-secure-against-evil-access" title="Permalink to this headline">¶</a></h3>
-<p>This depends on your system. If you&#8217;re running a server which cannot be
-accessed by other people, it&#8217;s sufficient to use the directory protection
-bundled with your webserver (with Apache you can use <a class="reference internal" href="glossary.html#term-htaccess"><span class="xref std std-term">.htaccess</span></a> files,
-for example). If other people have telnet access to your server, you should use
-phpMyAdmin&#8217;s <a class="reference internal" href="glossary.html#term-http"><span class="xref std std-term">HTTP</span></a> or cookie authentication features.</p>
-<p>Suggestions:</p>
-<ul class="simple">
-<li>Your <code class="file docutils literal"><span class="pre">config.inc.php</span></code> file should be <code class="docutils literal"><span class="pre">chmod</span> <span class="pre">660</span></code>.</li>
-<li>All your phpMyAdmin files should be chown -R phpmy.apache, where phpmy
-is a user whose password is only known to you, and apache is the group
-under which Apache runs.</li>
-<li>Follow security recommendations for PHP and your webserver.</li>
-</ul>
-</div>
-<div class="section" id="i-get-errors-about-not-being-able-to-include-a-file-in-lang-or-in-libraries">
-<span id="faq4-3"></span><h3>4.3 I get errors about not being able to include a file in <em>/lang</em> or in <em>/libraries</em>.<a class="headerlink" href="#i-get-errors-about-not-being-able-to-include-a-file-in-lang-or-in-libraries" title="Permalink to this headline">¶</a></h3>
-<p>Check <code class="file docutils literal"><span class="pre">php.ini</span></code>, or ask your sysadmin to check it. The
-<code class="docutils literal"><span class="pre">include_path</span></code> must contain &#8221;.&#8221; somewhere in it, and
-<code class="docutils literal"><span class="pre">open_basedir</span></code>, if used, must contain &#8221;.&#8221; and &#8221;./lang&#8221; to allow
-normal operation of phpMyAdmin.</p>
-</div>
-<div class="section" id="phpmyadmin-always-gives-access-denied-when-using-http-authentication">
-<span id="faq4-4"></span><h3>4.4 phpMyAdmin always gives &#8220;Access denied&#8221; when using HTTP authentication.<a class="headerlink" href="#phpmyadmin-always-gives-access-denied-when-using-http-authentication" title="Permalink to this headline">¶</a></h3>
-<p>This could happen for several reasons:</p>
-<ul class="simple">
-<li><span class="target" id="index-21"></span><a class="reference internal" href="config.html#cfg_Servers_controluser"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['controluser']</span></code></a> and/or <span class="target" id="index-22"></span><a class="reference internal" href="config.html#cfg_Servers_controlpass"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['controlpass']</span></code></a>  are wrong.</li>
-<li>The username/password you specify in the login dialog are invalid.</li>
-<li>You have already setup a security mechanism for the phpMyAdmin-
-directory, eg. a <a class="reference internal" href="glossary.html#term-htaccess"><span class="xref std std-term">.htaccess</span></a> file. This would interfere with phpMyAdmin&#8217;s
-authentication, so remove it.</li>
-</ul>
-</div>
-<div class="section" id="is-it-possible-to-let-users-create-their-own-databases">
-<span id="faq4-5"></span><h3>4.5 Is it possible to let users create their own databases?<a class="headerlink" href="#is-it-possible-to-let-users-create-their-own-databases" title="Permalink to this headline">¶</a></h3>
-<p>Starting with 2.2.5, in the user management page, you can enter a
-wildcard database name for a user (for example &#8220;joe%&#8221;), and put the
-privileges you want. For example, adding <code class="docutils literal"><span class="pre">SELECT,</span> <span class="pre">INSERT,</span> <span class="pre">UPDATE,</span>
-<span class="pre">DELETE,</span> <span class="pre">CREATE,</span> <span class="pre">DROP,</span> <span class="pre">INDEX,</span> <span class="pre">ALTER</span></code> would let a user create/manage
-his/her database(s).</p>
-</div>
-<div class="section" id="how-can-i-use-the-host-based-authentication-additions">
-<span id="faq4-6"></span><h3>4.6 How can I use the Host-based authentication additions?<a class="headerlink" href="#how-can-i-use-the-host-based-authentication-additions" title="Permalink to this headline">¶</a></h3>
-<p>If you have existing rules from an old <a class="reference internal" href="glossary.html#term-htaccess"><span class="xref std std-term">.htaccess</span></a> file, you can take them and
-add a username between the <code class="docutils literal"><span class="pre">'deny'</span></code>/<code class="docutils literal"><span class="pre">'allow'</span></code> and <code class="docutils literal"><span class="pre">'from'</span></code>
-strings. Using the username wildcard of <code class="docutils literal"><span class="pre">'%'</span></code> would be a major
-benefit here if your installation is suited to using it. Then you can
-just add those updated lines into the
-<span class="target" id="index-23"></span><a class="reference internal" href="config.html#cfg_Servers_AllowDeny_rules"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['AllowDeny']['rules']</span></code></a> array.</p>
-<p>If you want a pre-made sample, you can try this fragment. It stops the
-&#8216;root&#8217; user from logging in from any networks other than the private
-network <a class="reference internal" href="glossary.html#term-ip"><span class="xref std std-term">IP</span></a> blocks.</p>
-<div class="highlight-php"><div class="highlight"><pre><span class="c1">//block root from logging in except from the private networks</span>
-<span class="nv">$cfg</span><span class="p">[</span><span class="s1">&#39;Servers&#39;</span><span class="p">][</span><span class="nv">$i</span><span class="p">][</span><span class="s1">&#39;AllowDeny&#39;</span><span class="p">][</span><span class="s1">&#39;order&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="s1">&#39;deny,allow&#39;</span><span class="p">;</span>
-<span class="nv">$cfg</span><span class="p">[</span><span class="s1">&#39;Servers&#39;</span><span class="p">][</span><span class="nv">$i</span><span class="p">][</span><span class="s1">&#39;AllowDeny&#39;</span><span class="p">][</span><span class="s1">&#39;rules&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="k">array</span><span class="p">(</span>
-    <span class="s1">&#39;deny root from all&#39;</span><span class="p">,</span>
-    <span class="s1">&#39;allow root from localhost&#39;</span><span class="p">,</span>
-    <span class="s1">&#39;allow root from 10.0.0.0/8&#39;</span><span class="p">,</span>
-    <span class="s1">&#39;allow root from 192.168.0.0/16&#39;</span><span class="p">,</span>
-    <span class="s1">&#39;allow root from 172.16.0.0/12&#39;</span><span class="p">,</span>
-<span class="p">);</span>
-</pre></div>
-</div>
-</div>
-<div class="section" id="authentication-window-is-displayed-more-than-once-why">
-<span id="faq4-7"></span><h3>4.7 Authentication window is displayed more than once, why?<a class="headerlink" href="#authentication-window-is-displayed-more-than-once-why" title="Permalink to this headline">¶</a></h3>
-<p>This happens if you are using a <a class="reference internal" href="glossary.html#term-url"><span class="xref std std-term">URL</span></a> to start phpMyAdmin which is
-different than the one set in your <span class="target" id="index-24"></span><a class="reference internal" href="config.html#cfg_PmaAbsoluteUri"><code class="xref config config-option docutils literal"><span class="pre">$cfg['PmaAbsoluteUri']</span></code></a>. For
-example, a missing &#8220;www&#8221;, or entering with an <a class="reference internal" href="glossary.html#term-ip"><span class="xref std std-term">IP</span></a> address while a domain
-name is defined in the config file.</p>
-</div>
-<div class="section" id="which-parameters-can-i-use-in-the-url-that-starts-phpmyadmin">
-<span id="faq4-8"></span><h3>4.8 Which parameters can I use in the URL that starts phpMyAdmin?<a class="headerlink" href="#which-parameters-can-i-use-in-the-url-that-starts-phpmyadmin" title="Permalink to this headline">¶</a></h3>
-<p>When starting phpMyAdmin, you can use the <code class="docutils literal"><span class="pre">db</span></code>, <code class="docutils literal"><span class="pre">pma_username</span></code>,
-<code class="docutils literal"><span class="pre">pma_password</span></code> and <code class="docutils literal"><span class="pre">server</span></code> parameters. This last one can contain
-either the numeric host index (from <code class="docutils literal"><span class="pre">$i</span></code> of the configuration file)
-or one of the host names present in the configuration file. Using
-<code class="docutils literal"><span class="pre">pma_username</span></code> and <code class="docutils literal"><span class="pre">pma_password</span></code> has been tested along with the
-usage of &#8216;cookie&#8217; <code class="docutils literal"><span class="pre">auth_type</span></code>.</p>
-</div>
-</div>
-<div class="section" id="browsers-or-client-os">
-<span id="faqbrowsers"></span><h2>Browsers or client OS<a class="headerlink" href="#browsers-or-client-os" title="Permalink to this headline">¶</a></h2>
-<div class="section" id="i-get-an-out-of-memory-error-and-my-controls-are-non-functional-when-trying-to-create-a-table-with-more-than-14-columns">
-<span id="faq5-1"></span><h3>5.1 I get an out of memory error, and my controls are non-functional, when trying to create a table with more than 14 columns.<a class="headerlink" href="#i-get-an-out-of-memory-error-and-my-controls-are-non-functional-when-trying-to-create-a-table-with-more-than-14-columns" title="Permalink to this headline">¶</a></h3>
-<p>We could reproduce this problem only under Win98/98SE. Testing under
-WinNT4 or Win2K, we could easily create more than 60 columns.  A
-workaround is to create a smaller number of columns, then come back to
-your table properties and add the other columns.</p>
-</div>
-<div class="section" id="with-xitami-2-5b4-phpmyadmin-won-t-process-form-fields">
-<span id="faq5-2"></span><h3>5.2 With Xitami 2.5b4, phpMyAdmin won&#8217;t process form fields.<a class="headerlink" href="#with-xitami-2-5b4-phpmyadmin-won-t-process-form-fields" title="Permalink to this headline">¶</a></h3>
-<p>This is not a phpMyAdmin problem but a Xitami known bug: you&#8217;ll face
-it with each script/website that use forms. Upgrade or downgrade your
-Xitami server.</p>
-</div>
-<div class="section" id="i-have-problems-dumping-tables-with-konqueror-phpmyadmin-2-2-2">
-<span id="faq5-3"></span><h3>5.3 I have problems dumping tables with Konqueror (phpMyAdmin 2.2.2).<a class="headerlink" href="#i-have-problems-dumping-tables-with-konqueror-phpmyadmin-2-2-2" title="Permalink to this headline">¶</a></h3>
-<p>With Konqueror 2.1.1: plain dumps, zip and GZip dumps work ok, except
-that the proposed file name for the dump is always &#8216;tbl_dump.php&#8217;.
-Bzip2 dumps don&#8217;t seem to work. With Konqueror 2.2.1: plain dumps
-work; zip dumps are placed into the user&#8217;s temporary directory, so
-they must be moved before closing Konqueror, or else they disappear.
-GZip dumps give an error message. Testing needs to be done for
-Konqueror 2.2.2.</p>
-</div>
-<div class="section" id="i-can-t-use-the-cookie-authentication-mode-because-internet-explorer-never-stores-the-cookies">
-<span id="faq5-4"></span><h3>5.4 I can&#8217;t use the cookie authentication mode because Internet Explorer never stores the cookies.<a class="headerlink" href="#i-can-t-use-the-cookie-authentication-mode-because-internet-explorer-never-stores-the-cookies" title="Permalink to this headline">¶</a></h3>
-<p>MS Internet Explorer seems to be really buggy about cookies, at least
-till version 6.</p>
-</div>
-<div class="section" id="in-internet-explorer-5-0-i-get-javascript-errors-when-browsing-my-rows">
-<span id="faq5-5"></span><h3>5.5 In Internet Explorer 5.0, I get JavaScript errors when browsing my rows.<a class="headerlink" href="#in-internet-explorer-5-0-i-get-javascript-errors-when-browsing-my-rows" title="Permalink to this headline">¶</a></h3>
-<p>Upgrade to at least Internet Explorer 5.5 SP2.</p>
-</div>
-<div class="section" id="in-internet-explorer-5-0-5-5-or-6-0-i-get-an-error-like-page-not-found-when-trying-to-modify-a-row-in-a-table-with-many-columns-or-with-a-text-column">
-<span id="faq5-6"></span><h3>5.6 In Internet Explorer 5.0, 5.5 or 6.0, I get an error (like &#8220;Page not found&#8221;) when trying to modify a row in a table with many columns, or with a text column.<a class="headerlink" href="#in-internet-explorer-5-0-5-5-or-6-0-i-get-an-error-like-page-not-found-when-trying-to-modify-a-row-in-a-table-with-many-columns-or-with-a-text-column" title="Permalink to this headline">¶</a></h3>
-<p>Your table neither have a primary key nor an unique one, so we must use a long
-<a class="reference internal" href="glossary.html#term-url"><span class="xref std std-term">URL</span></a> to identify this row. There is a limit on the length of the
-<a class="reference internal" href="glossary.html#term-url"><span class="xref std std-term">URL</span></a> in those browsers, and this not happen in Netscape, for example.
-The workaround is to create a primary or unique key, or use another browser.</p>
-</div>
-<div class="section" id="i-refresh-reload-my-browser-and-come-back-to-the-welcome-page">
-<span id="faq5-7"></span><h3>5.7 I refresh (reload) my browser, and come back to the welcome page.<a class="headerlink" href="#i-refresh-reload-my-browser-and-come-back-to-the-welcome-page" title="Permalink to this headline">¶</a></h3>
-<p>Some browsers support right-clicking into the frame you want to
-refresh, just do this in the right frame.</p>
-</div>
-<div class="section" id="with-mozilla-0-9-7-i-have-problems-sending-a-query-modified-in-the-query-box">
-<span id="faq5-8"></span><h3>5.8 With Mozilla 0.9.7 I have problems sending a query modified in the query box.<a class="headerlink" href="#with-mozilla-0-9-7-i-have-problems-sending-a-query-modified-in-the-query-box" title="Permalink to this headline">¶</a></h3>
-<p>Looks like a Mozilla bug: 0.9.6 was OK. We will keep an eye on future
-Mozilla versions.</p>
-</div>
-<div class="section" id="with-mozilla-0-9-to-1-0-and-netscape-7-0-pr1-i-can-t-type-a-whitespace-in-the-sql-query-edit-area-the-page-scrolls-down">
-<span id="faq5-9"></span><h3>5.9 With Mozilla 0.9.? to 1.0 and Netscape 7.0-PR1 I can&#8217;t type a whitespace in the SQL-Query edit area: the page scrolls down.<a class="headerlink" href="#with-mozilla-0-9-to-1-0-and-netscape-7-0-pr1-i-can-t-type-a-whitespace-in-the-sql-query-edit-area-the-page-scrolls-down" title="Permalink to this headline">¶</a></h3>
-<p>This is a Mozilla bug (see bug #26882 at <a class="reference external" href="https://bugzilla.mozilla.org/">BugZilla</a>).</p>
-</div>
-<div class="section" id="with-netscape-4-75-i-get-empty-rows-between-each-row-of-data-in-a-csv-exported-file">
-<span id="faq5-10"></span><h3>5.10 With Netscape 4.75 I get empty rows between each row of data in a CSV exported file.<a class="headerlink" href="#with-netscape-4-75-i-get-empty-rows-between-each-row-of-data-in-a-csv-exported-file" title="Permalink to this headline">¶</a></h3>
-<p>This is a known Netscape 4.75 bug: it adds some line feeds when
-exporting data in octet-stream mode. Since we can&#8217;t detect the
-specific Netscape version, we cannot workaround this bug.</p>
-</div>
-<div class="section" id="extended-ascii-characters-like-german-umlauts-are-displayed-wrong">
-<span id="faq5-11"></span><h3>5.11 Extended-ASCII characters like German umlauts are displayed wrong.<a class="headerlink" href="#extended-ascii-characters-like-german-umlauts-are-displayed-wrong" title="Permalink to this headline">¶</a></h3>
-<p>Please ensure that you have set your browser&#8217;s character set to the
-one of the language file you have selected on phpMyAdmin&#8217;s start page.
-Alternatively, you can try the auto detection mode that is supported
-by the recent versions of the most browsers.</p>
-</div>
-<div class="section" id="mac-os-x-safari-browser-changes-special-characters-to">
-<span id="faq5-12"></span><h3>5.12 Mac OS X Safari browser changes special characters to &#8221;?&#8221;.<a class="headerlink" href="#mac-os-x-safari-browser-changes-special-characters-to" title="Permalink to this headline">¶</a></h3>
-<p>This issue has been reported by a <a class="reference internal" href="glossary.html#term-mac-os-x"><span class="xref std std-term">Mac OS X</span></a> user, who adds that Chimera,
-Netscape and Mozilla do not have this problem.</p>
-</div>
-<div class="section" id="with-internet-explorer-5-5-or-6-and-http-authentication-type-i-cannot-manage-two-servers-i-log-in-to-the-first-one-then-the-other-one-but-if-i-switch-back-to-the-first-i-have-to-log-in-on-each-operation">
-<span id="faq5-13"></span><h3>5.13 With Internet Explorer 5.5 or 6, and HTTP authentication type, I cannot manage two servers: I log in to the first one, then the other one, but if I switch back to the first, I have to log in on each operation.<a class="headerlink" href="#with-internet-explorer-5-5-or-6-and-http-authentication-type-i-cannot-manage-two-servers-i-log-in-to-the-first-one-then-the-other-one-but-if-i-switch-back-to-the-first-i-have-to-log-in-on-each-operation" title="Permalink to this headline">¶</a></h3>
-<p>This is a bug in Internet Explorer, other browsers do not behave this
-way.</p>
-</div>
-<div class="section" id="using-opera6-i-can-manage-to-get-to-the-authentication-but-nothing-happens-after-that-only-a-blank-screen">
-<span id="faq5-14"></span><h3>5.14 Using Opera6, I can manage to get to the authentication, but nothing happens after that, only a blank screen.<a class="headerlink" href="#using-opera6-i-can-manage-to-get-to-the-authentication-but-nothing-happens-after-that-only-a-blank-screen" title="Permalink to this headline">¶</a></h3>
-<p>Please upgrade to Opera7 at least.</p>
-</div>
-<div class="section" id="i-have-display-problems-with-safari">
-<span id="faq5-15"></span><h3>5.15 I have display problems with Safari.<a class="headerlink" href="#i-have-display-problems-with-safari" title="Permalink to this headline">¶</a></h3>
-<p>Please upgrade to at least version 1.2.3.</p>
-</div>
-<div class="section" id="with-internet-explorer-i-get-access-is-denied-javascript-errors-or-i-cannot-make-phpmyadmin-work-under-windows">
-<span id="faq5-16"></span><h3>5.16 With Internet Explorer, I get &#8220;Access is denied&#8221; Javascript errors. Or I cannot make phpMyAdmin work under Windows.<a class="headerlink" href="#with-internet-explorer-i-get-access-is-denied-javascript-errors-or-i-cannot-make-phpmyadmin-work-under-windows" title="Permalink to this headline">¶</a></h3>
-<p>Please check the following points:</p>
-<ul class="simple">
-<li>Maybe you have defined your <span class="target" id="index-25"></span><a class="reference internal" href="config.html#cfg_PmaAbsoluteUri"><code class="xref config config-option docutils literal"><span class="pre">$cfg['PmaAbsoluteUri']</span></code></a> setting in
-<code class="file docutils literal"><span class="pre">config.inc.php</span></code> to an <a class="reference internal" href="glossary.html#term-ip"><span class="xref std std-term">IP</span></a> address and you are starting phpMyAdmin
-with a <a class="reference internal" href="glossary.html#term-url"><span class="xref std std-term">URL</span></a> containing a domain name, or the reverse situation.</li>
-<li>Security settings in IE and/or Microsoft Security Center are too high,
-thus blocking scripts execution.</li>
-<li>The Windows Firewall is blocking Apache and MySQL. You must allow
-<a class="reference internal" href="glossary.html#term-http"><span class="xref std std-term">HTTP</span></a> ports (80 or 443) and MySQL
-port (usually 3306) in the &#8220;in&#8221; and &#8220;out&#8221; directions.</li>
-</ul>
-</div>
-<div class="section" id="with-firefox-i-cannot-delete-rows-of-data-or-drop-a-database">
-<span id="faq5-17"></span><h3>5.17 With Firefox, I cannot delete rows of data or drop a database.<a class="headerlink" href="#with-firefox-i-cannot-delete-rows-of-data-or-drop-a-database" title="Permalink to this headline">¶</a></h3>
-<p>Many users have confirmed that the Tabbrowser Extensions plugin they
-installed in their Firefox is causing the problem.</p>
-</div>
-<div class="section" id="with-konqueror-4-2-x-an-invalid-limit-clause-is-generated-when-i-browse-a-table">
-<span id="faq5-18"></span><h3>5.18 With Konqueror 4.2.x an invalid <code class="docutils literal"><span class="pre">LIMIT</span></code> clause is generated when I browse a table.<a class="headerlink" href="#with-konqueror-4-2-x-an-invalid-limit-clause-is-generated-when-i-browse-a-table" title="Permalink to this headline">¶</a></h3>
-<p>This happens only when both of these conditions are met: using the
-<code class="docutils literal"><span class="pre">http</span></code> authentication mode and <code class="docutils literal"><span class="pre">register_globals</span></code> being set to
-<code class="docutils literal"><span class="pre">On</span></code> on the server. It seems to be a browser-specific problem;
-meanwhile use the <code class="docutils literal"><span class="pre">cookie</span></code> authentication mode.</p>
-</div>
-<div class="section" id="i-get-javascript-errors-in-my-browser">
-<span id="faq5-19"></span><h3>5.19 I get JavaScript errors in my browser.<a class="headerlink" href="#i-get-javascript-errors-in-my-browser" title="Permalink to this headline">¶</a></h3>
-<p>Issues have been reported with some combinations of browser
-extensions. To troubleshoot, disable all extensions then clear your
-browser cache to see if the problem goes away.</p>
-</div>
-</div>
-<div class="section" id="using-phpmyadmin">
-<span id="faqusing"></span><h2>Using phpMyAdmin<a class="headerlink" href="#using-phpmyadmin" title="Permalink to this headline">¶</a></h2>
-<div class="section" id="i-can-t-insert-new-rows-into-a-table-i-can-t-create-a-table-mysql-brings-up-a-sql-error">
-<span id="faq6-1"></span><h3>6.1 I can&#8217;t insert new rows into a table / I can&#8217;t create a table - MySQL brings up a SQL error.<a class="headerlink" href="#i-can-t-insert-new-rows-into-a-table-i-can-t-create-a-table-mysql-brings-up-a-sql-error" title="Permalink to this headline">¶</a></h3>
-<p>Examine the <a class="reference internal" href="glossary.html#term-sql"><span class="xref std std-term">SQL</span></a> error with care.
-Often the problem is caused by specifying a wrong column-type. Common
-errors include:</p>
-<ul class="simple">
-<li>Using <code class="docutils literal"><span class="pre">VARCHAR</span></code> without a size argument</li>
-<li>Using <code class="docutils literal"><span class="pre">TEXT</span></code> or <code class="docutils literal"><span class="pre">BLOB</span></code> with a size argument</li>
-</ul>
-<p>Also, look at the syntax chapter in the MySQL manual to confirm that
-your syntax is correct.</p>
-</div>
-<div class="section" id="when-i-create-a-table-i-set-an-index-for-two-columns-and-phpmyadmin-generates-only-one-index-with-those-two-columns">
-<span id="faq6-2"></span><h3>6.2 When I create a table, I set an index for two columns and phpMyAdmin generates only one index with those two columns.<a class="headerlink" href="#when-i-create-a-table-i-set-an-index-for-two-columns-and-phpmyadmin-generates-only-one-index-with-those-two-columns" title="Permalink to this headline">¶</a></h3>
-<p>This is the way to create a multi-columns index. If you want two
-indexes, create the first one when creating the table, save, then
-display the table properties and click the Index link to create the
-other index.</p>
-</div>
-<div class="section" id="how-can-i-insert-a-null-value-into-my-table">
-<span id="faq6-3"></span><h3>6.3 How can I insert a null value into my table?<a class="headerlink" href="#how-can-i-insert-a-null-value-into-my-table" title="Permalink to this headline">¶</a></h3>
-<p>Since version 2.2.3, you have a checkbox for each column that can be
-null. Before 2.2.3, you had to enter &#8220;null&#8221;, without the quotes, as
-the column&#8217;s value. Since version 2.5.5, you have to use the checkbox
-to get a real NULL value, so if you enter &#8220;NULL&#8221; this means you want a
-literal NULL in the column, and not a NULL value (this works in PHP4).</p>
-</div>
-<div class="section" id="how-can-i-backup-my-database-or-table">
-<span id="faq6-4"></span><h3>6.4 How can I backup my database or table?<a class="headerlink" href="#how-can-i-backup-my-database-or-table" title="Permalink to this headline">¶</a></h3>
-<p>Click on a database or table name in the navigation panel, the properties will
-be displayed. Then on the menu, click &#8220;Export&#8221;, you can dump the structure, the
-data, or both. This will generate standard <a class="reference internal" href="glossary.html#term-sql"><span class="xref std std-term">SQL</span></a> statements that can be
-used to recreate your database/table.  You will need to choose &#8220;Save as file&#8221;,
-so that phpMyAdmin can transmit the resulting dump to your station.  Depending
-on your PHP configuration, you will see options to compress the dump. See also
-the <span class="target" id="index-26"></span><a class="reference internal" href="config.html#cfg_ExecTimeLimit"><code class="xref config config-option docutils literal"><span class="pre">$cfg['ExecTimeLimit']</span></code></a> configuration variable. For
-additional help on this subject, look for the word &#8220;dump&#8221; in this document.</p>
-</div>
-<div class="section" id="how-can-i-restore-upload-my-database-or-table-using-a-dump-how-can-i-run-a-sql-file">
-<span id="faq6-5"></span><h3>6.5 How can I restore (upload) my database or table using a dump? How can I run a &#8221;.sql&#8221; file?<a class="headerlink" href="#how-can-i-restore-upload-my-database-or-table-using-a-dump-how-can-i-run-a-sql-file" title="Permalink to this headline">¶</a></h3>
-<p>Click on a database name in the navigation panel, the properties will
-be displayed. Select &#8220;Import&#8221; from the list of tabs in the right–hand
-frame (or &#8220;<a class="reference internal" href="glossary.html#term-sql"><span class="xref std std-term">SQL</span></a>&#8221; if your phpMyAdmin
-version is previous to 2.7.0). In the &#8220;Location of the text file&#8221;
-section, type in the path to your dump filename, or use the Browse
-button. Then click Go.  With version 2.7.0, the import engine has been
-re–written, if possible it is suggested that you upgrade to take
-advantage of the new features.  For additional help on this subject,
-look for the word &#8220;upload&#8221; in this document.</p>
-<p>Note: For errors while importing of dumps exported from older MySQL versions to newer MySQL versions,
-please check <a class="reference internal" href="#faq6-41"><span class="std std-ref">6.41 I get import errors while importing the dumps exported from older MySQL versions (pre-5.7.6) into newer MySQL versions (5.7.7+), but they work fine when imported back on same older versions ?</span></a>.</p>
-</div>
-<div class="section" id="how-can-i-use-the-relation-table-in-query-by-example">
-<span id="faq6-6"></span><h3>6.6 How can I use the relation table in Query-by-example?<a class="headerlink" href="#how-can-i-use-the-relation-table-in-query-by-example" title="Permalink to this headline">¶</a></h3>
-<p>Here is an example with the tables persons, towns and countries, all
-located in the database &#8220;mydb&#8221;. If you don&#8217;t have a <code class="docutils literal"><span class="pre">pma__relation</span></code>
-table, create it as explained in the configuration section. Then
-create the example tables:</p>
-<div class="highlight-mysql"><div class="highlight"><pre><span class="k">CREATE</span> <span class="k">TABLE</span> <span class="nf">REL_countries</span> <span class="p">(</span>
-<span class="n">country_code</span> <span class="kt">char</span><span class="p">(</span><span class="mi">1</span><span class="p">)</span> <span class="k">NOT</span> <span class="no">NULL</span> <span class="k">default</span> <span class="s1">&#39;&#39;</span><span class="p">,</span>
-<span class="n">description</span> <span class="kt">varchar</span><span class="p">(</span><span class="mi">10</span><span class="p">)</span> <span class="k">NOT</span> <span class="no">NULL</span> <span class="k">default</span> <span class="s1">&#39;&#39;</span><span class="p">,</span>
-<span class="k">PRIMARY</span> <span class="k">KEY</span> <span class="p">(</span><span class="n">country_code</span><span class="p">)</span>
-<span class="p">)</span> <span class="n">TYPE</span><span class="o">=</span><span class="n">MyISAM</span><span class="p">;</span>
-
-<span class="k">INSERT</span> <span class="k">INTO</span> <span class="n">REL_countries</span> <span class="k">VALUES</span> <span class="p">(</span><span class="s1">&#39;C&#39;</span><span class="p">,</span> <span class="s1">&#39;Canada&#39;</span><span class="p">);</span>
-
-<span class="k">CREATE</span> <span class="k">TABLE</span> <span class="nf">REL_persons</span> <span class="p">(</span>
-<span class="n">id</span> <span class="kt">tinyint</span><span class="p">(</span><span class="mi">4</span><span class="p">)</span> <span class="k">NOT</span> <span class="no">NULL</span> <span class="kp">auto_increment</span><span class="p">,</span>
-<span class="n">person_name</span> <span class="kt">varchar</span><span class="p">(</span><span class="mi">32</span><span class="p">)</span> <span class="k">NOT</span> <span class="no">NULL</span> <span class="k">default</span> <span class="s1">&#39;&#39;</span><span class="p">,</span>
-<span class="n">town_code</span> <span class="kt">varchar</span><span class="p">(</span><span class="mi">5</span><span class="p">)</span> <span class="k">default</span> <span class="s1">&#39;0&#39;</span><span class="p">,</span>
-<span class="n">country_code</span> <span class="kt">char</span><span class="p">(</span><span class="mi">1</span><span class="p">)</span> <span class="k">NOT</span> <span class="no">NULL</span> <span class="k">default</span> <span class="s1">&#39;&#39;</span><span class="p">,</span>
-<span class="k">PRIMARY</span> <span class="k">KEY</span> <span class="p">(</span><span class="n">id</span><span class="p">)</span>
-<span class="p">)</span> <span class="n">TYPE</span><span class="o">=</span><span class="n">MyISAM</span><span class="p">;</span>
-
-<span class="k">INSERT</span> <span class="k">INTO</span> <span class="n">REL_persons</span> <span class="k">VALUES</span> <span class="p">(</span><span class="mi">11</span><span class="p">,</span> <span class="s1">&#39;Marc&#39;</span><span class="p">,</span> <span class="s1">&#39;S&#39;</span><span class="p">,</span> <span class="s1">&#39;&#39;</span><span class="p">);</span>
-<span class="k">INSERT</span> <span class="k">INTO</span> <span class="n">REL_persons</span> <span class="k">VALUES</span> <span class="p">(</span><span class="mi">15</span><span class="p">,</span> <span class="s1">&#39;Paul&#39;</span><span class="p">,</span> <span class="s1">&#39;S&#39;</span><span class="p">,</span> <span class="s1">&#39;C&#39;</span><span class="p">);</span>
-
-<span class="k">CREATE</span> <span class="k">TABLE</span> <span class="nf">REL_towns</span> <span class="p">(</span>
-<span class="n">town_code</span> <span class="kt">varchar</span><span class="p">(</span><span class="mi">5</span><span class="p">)</span> <span class="k">NOT</span> <span class="no">NULL</span> <span class="k">default</span> <span class="s1">&#39;0&#39;</span><span class="p">,</span>
-<span class="n">description</span> <span class="kt">varchar</span><span class="p">(</span><span class="mi">30</span><span class="p">)</span> <span class="k">NOT</span> <span class="no">NULL</span> <span class="k">default</span> <span class="s1">&#39;&#39;</span><span class="p">,</span>
-<span class="k">PRIMARY</span> <span class="k">KEY</span> <span class="p">(</span><span class="n">town_code</span><span class="p">)</span>
-<span class="p">)</span> <span class="n">TYPE</span><span class="o">=</span><span class="n">MyISAM</span><span class="p">;</span>
-
-<span class="k">INSERT</span> <span class="k">INTO</span> <span class="n">REL_towns</span> <span class="k">VALUES</span> <span class="p">(</span><span class="s1">&#39;S&#39;</span><span class="p">,</span> <span class="s1">&#39;Sherbrooke&#39;</span><span class="p">);</span>
-<span class="k">INSERT</span> <span class="k">INTO</span> <span class="n">REL_towns</span> <span class="k">VALUES</span> <span class="p">(</span><span class="s1">&#39;M&#39;</span><span class="p">,</span> <span class="s1">&#39;Montréal&#39;</span><span class="p">);</span>
-</pre></div>
-</div>
-<p>To setup appropriate links and display information:</p>
-<ul class="simple">
-<li>on table &#8220;REL_persons&#8221; click Structure, then Relation view</li>
-<li>for &#8220;town_code&#8221;, choose from dropdowns, &#8220;mydb&#8221;, &#8220;REL_towns&#8221;, &#8220;code&#8221;
-for foreign database, table and column respectively</li>
-<li>for &#8220;country_code&#8221;, choose  from dropdowns, &#8220;mydb&#8221;, &#8220;REL_countries&#8221;,
-&#8220;country_code&#8221; for foreign database, table and column respectively</li>
-<li>on table &#8220;REL_towns&#8221; click Structure, then Relation view</li>
-<li>in &#8220;Choose column to display&#8221;, choose &#8220;description&#8221;</li>
-<li>repeat the two previous steps for table &#8220;REL_countries&#8221;</li>
-</ul>
-<p>Then test like this:</p>
-<ul class="simple">
-<li>Click on your db name in the navigation panel</li>
-<li>Choose &#8220;Query&#8221;</li>
-<li>Use tables: persons, towns, countries</li>
-<li>Click &#8220;Update query&#8221;</li>
-<li>In the columns row, choose persons.person_name and click the &#8220;Show&#8221;
-tickbox</li>
-<li>Do the same for towns.description and countries.descriptions in the
-other 2 columns</li>
-<li>Click &#8220;Update query&#8221; and you will see in the query box that the
-correct joins have been generated</li>
-<li>Click &#8220;Submit query&#8221;</li>
-</ul>
-</div>
-<div class="section" id="how-can-i-use-the-display-column-feature">
-<span id="faqdisplay"></span><h3>6.7 How can I use the &#8220;display column&#8221; feature?<a class="headerlink" href="#how-can-i-use-the-display-column-feature" title="Permalink to this headline">¶</a></h3>
-<p>Starting from the previous example, create the <code class="docutils literal"><span class="pre">pma__table_info</span></code> as
-explained in the configuration section, then browse your persons
-table, and move the mouse over a town code or country code.  See also
-<a class="reference internal" href="#faq6-21"><span class="std std-ref">6.21 In edit/insert mode, how can I see a list of possible values for a column, based on some foreign table?</span></a> for an additional feature that &#8220;display column&#8221;
-enables: drop-down list of possible values.</p>
-</div>
-<div class="section" id="how-can-i-produce-a-pdf-schema-of-my-database">
-<span id="faqpdf"></span><h3>6.8 How can I produce a PDF schema of my database?<a class="headerlink" href="#how-can-i-produce-a-pdf-schema-of-my-database" title="Permalink to this headline">¶</a></h3>
-<p>First the configuration variables &#8220;relation&#8221;, &#8220;table_coords&#8221; and
-&#8220;pdf_pages&#8221; have to be filled in.  Then you need to think about your
-schema layout. Which tables will go on which pages?</p>
-<ul class="simple">
-<li>Select your database in the navigation panel.</li>
-<li>Choose &#8220;Operations&#8221; in the navigation bar at the top.</li>
-<li>Choose &#8220;Edit <a class="reference internal" href="glossary.html#term-pdf"><span class="xref std std-term">PDF</span></a> Pages&#8221; near the
-bottom of the page.</li>
-<li>Enter a name for the first <a class="reference internal" href="glossary.html#term-pdf"><span class="xref std std-term">PDF</span></a> page
-and click Go. If you like, you can use the &#8220;automatic layout,&#8221; which
-will put all your linked tables onto the new page.</li>
-<li>Select the name of the new page (making sure the Edit radio button is
-selected) and click Go.</li>
-<li>Select a table from the list, enter its coordinates and click Save.
-Coordinates are relative; your diagram will be automatically scaled to
-fit the page. When initially placing tables on the page, just pick any
-coordinates &#8211; say, 50x50. After clicking Save, you can then use the
-<a class="reference internal" href="#wysiwyg"><span class="std std-ref">6.28 How can I easily edit relational schema for export?</span></a> to position the element correctly.</li>
-<li>When you&#8217;d like to look at your <a class="reference internal" href="glossary.html#term-pdf"><span class="xref std std-term">PDF</span></a>, first be sure to click the Save
-button beneath the list of tables and coordinates, to save any changes you
-made there. Then scroll all the way down, select the <a class="reference internal" href="glossary.html#term-pdf"><span class="xref std std-term">PDF</span></a> options you
-want, and click Go.</li>
-<li>Internet Explorer for Windows may suggest an incorrect filename when
-you try to save a generated <a class="reference internal" href="glossary.html#term-pdf"><span class="xref std std-term">PDF</span></a>.
-When saving a generated <a class="reference internal" href="glossary.html#term-pdf"><span class="xref std std-term">PDF</span></a>, be
-sure that the filename ends in &#8221;.pdf&#8221;, for example &#8220;schema.pdf&#8221;.
-Browsers on other operating systems, and other browsers on Windows, do
-not have this problem.</li>
-</ul>
-</div>
-<div class="section" id="phpmyadmin-is-changing-the-type-of-one-of-my-columns">
-<span id="faq6-9"></span><h3>6.9 phpMyAdmin is changing the type of one of my columns!<a class="headerlink" href="#phpmyadmin-is-changing-the-type-of-one-of-my-columns" title="Permalink to this headline">¶</a></h3>
-<p>No, it&#8217;s MySQL that is doing <a class="reference external" href="https://dev.mysql.com/doc/en/silent-column-changes.html">silent column type changing</a>.</p>
-</div>
-<div class="section" id="when-creating-a-privilege-what-happens-with-underscores-in-the-database-name">
-<span id="underscore"></span><h3>6.10 When creating a privilege, what happens with underscores in the database name?<a class="headerlink" href="#when-creating-a-privilege-what-happens-with-underscores-in-the-database-name" title="Permalink to this headline">¶</a></h3>
-<p>If you do not put a backslash before the underscore, this is a
-wildcard grant, and the underscore means &#8220;any character&#8221;. So, if the
-database name is &#8220;john_db&#8221;, the user would get rights to john1db,
-john2db ... If you put a backslash before the underscore, it means
-that the database name will have a real underscore.</p>
-</div>
-<div class="section" id="what-is-the-curious-symbol-o-in-the-statistics-pages">
-<span id="faq6-11"></span><h3>6.11 What is the curious symbol ø in the statistics pages?<a class="headerlink" href="#what-is-the-curious-symbol-o-in-the-statistics-pages" title="Permalink to this headline">¶</a></h3>
-<p>It means &#8220;average&#8221;.</p>
-</div>
-<div class="section" id="i-want-to-understand-some-export-options">
-<span id="faqexport"></span><h3>6.12 I want to understand some Export options.<a class="headerlink" href="#i-want-to-understand-some-export-options" title="Permalink to this headline">¶</a></h3>
-<p><strong>Structure:</strong></p>
-<ul class="simple">
-<li>&#8220;Add DROP TABLE&#8221; will add a line telling MySQL to <a class="reference external" href="https://dev.mysql.com/doc/mysql/en/drop-table.html">drop the table</a>, if it already
-exists during the import. It does NOT drop the table after your
-export, it only affects the import file.</li>
-<li>&#8220;If Not Exists&#8221; will only create the table if it doesn&#8217;t exist.
-Otherwise, you may get an error if the table name exists but has a
-different structure.</li>
-<li>&#8220;Add AUTO_INCREMENT value&#8221; ensures that AUTO_INCREMENT value (if
-any) will be included in backup.</li>
-<li>&#8220;Enclose table and column names with backquotes&#8221; ensures that column
-and table names formed with special characters are protected.</li>
-<li>&#8220;Add into comments&#8221; includes column comments, relations, and MIME
-types set in the pmadb in the dump as <a class="reference internal" href="glossary.html#term-sql"><span class="xref std std-term">SQL</span></a> comments
-(<em>/* xxx */</em>).</li>
-</ul>
-<p><strong>Data:</strong></p>
-<ul class="simple">
-<li>&#8220;Complete inserts&#8221; adds the column names on every INSERT command, for
-better documentation (but resulting file is bigger).</li>
-<li>&#8220;Extended inserts&#8221; provides a shorter dump file by using only once the
-INSERT verb and the table name.</li>
-<li>&#8220;Delayed inserts&#8221; are best explained in the <a class="reference external" href="https://dev.mysql.com/doc/mysql/en/insert-delayed.html">MySQL manual - INSERT DELAYED Syntax</a>.</li>
-<li>&#8220;Ignore inserts&#8221; treats errors as a warning instead. Again, more info
-is provided in the <a class="reference external" href="https://dev.mysql.com/doc/mysql/en/insert.html">MySQL manual - INSERT Syntax</a>, but basically with
-this selected, invalid values are adjusted and inserted rather than
-causing the entire statement to fail.</li>
-</ul>
-</div>
-<div class="section" id="i-would-like-to-create-a-database-with-a-dot-in-its-name">
-<span id="faq6-13"></span><h3>6.13 I would like to create a database with a dot in its name.<a class="headerlink" href="#i-would-like-to-create-a-database-with-a-dot-in-its-name" title="Permalink to this headline">¶</a></h3>
-<p>This is a bad idea, because in MySQL the syntax &#8220;database.table&#8221; is
-the normal way to reference a database and table name. Worse, MySQL
-will usually let you create a database with a dot, but then you cannot
-work with it, nor delete it.</p>
-</div>
-<div class="section" id="faqsqlvalidator">
-<span id="id13"></span><h3>6.14 (withdrawn).<a class="headerlink" href="#faqsqlvalidator" title="Permalink to this headline">¶</a></h3>
-</div>
-<div class="section" id="i-want-to-add-a-blob-column-and-put-an-index-on-it-but-mysql-says-blob-column-used-in-key-specification-without-a-key-length">
-<span id="faq6-15"></span><h3>6.15 I want to add a BLOB column and put an index on it, but MySQL says &#8220;BLOB column &#8216;...&#8217; used in key specification without a key length&#8221;.<a class="headerlink" href="#i-want-to-add-a-blob-column-and-put-an-index-on-it-but-mysql-says-blob-column-used-in-key-specification-without-a-key-length" title="Permalink to this headline">¶</a></h3>
-<p>The right way to do this, is to create the column without any indexes,
-then display the table structure and use the &#8220;Create an index&#8221; dialog.
-On this page, you will be able to choose your BLOB column, and set a
-size to the index, which is the condition to create an index on a BLOB
-column.</p>
-</div>
-<div class="section" id="how-can-i-simply-move-in-page-with-plenty-editing-fields">
-<span id="faq6-16"></span><h3>6.16 How can I simply move in page with plenty editing fields?<a class="headerlink" href="#how-can-i-simply-move-in-page-with-plenty-editing-fields" title="Permalink to this headline">¶</a></h3>
-<p>You can use <code class="kbd docutils literal"><span class="pre">Ctrl+arrows</span></code> (<code class="kbd docutils literal"><span class="pre">Option+Arrows</span></code> in Safari) for moving on
-most pages with many editing fields (table structure changes, row editing,
-etc.).</p>
-</div>
-<div class="section" id="transformations-i-can-t-enter-my-own-mimetype-wtf-is-this-feature-then-useful-for">
-<span id="faq6-17"></span><h3>6.17 Transformations: I can&#8217;t enter my own mimetype! WTF is this feature then useful for?<a class="headerlink" href="#transformations-i-can-t-enter-my-own-mimetype-wtf-is-this-feature-then-useful-for" title="Permalink to this headline">¶</a></h3>
-<p>Slow down :). Defining mimetypes is of no use, if you can&#8217;t put
-transformations on them. Otherwise you could just put a comment on the
-column. Because entering your own mimetype will cause serious syntax
-checking issues and validation, this introduces a high-risk false-
-user-input situation. Instead you have to initialize mimetypes using
-functions or empty mimetype definitions.</p>
-<p>Plus, you have a whole overview of available mimetypes. Who knows all those
-mimetypes by heart so he/she can enter it at will?</p>
-</div>
-<div class="section" id="bookmarks-where-can-i-store-bookmarks-why-can-t-i-see-any-bookmarks-below-the-query-box-what-are-these-variables-for">
-<span id="faqbookmark"></span><h3>6.18 Bookmarks: Where can I store bookmarks? Why can&#8217;t I see any bookmarks below the query box? What are these variables for?<a class="headerlink" href="#bookmarks-where-can-i-store-bookmarks-why-can-t-i-see-any-bookmarks-below-the-query-box-what-are-these-variables-for" title="Permalink to this headline">¶</a></h3>
-<p>Any query you have executed can be stored as a bookmark on the page
-where the results are displayed. You will find a button labeled
-&#8216;Bookmark this query&#8217; just at the end of the page. As soon as you have
-stored a bookmark, it is related to the database you run the query on.
-You can now access a bookmark dropdown on each page, the query box
-appears on for that database.</p>
-<p>You can also have, inside the query, placeholders for variables.
-This is done by inserting into the query SQL comments between <code class="docutils literal"><span class="pre">/*</span></code> and
-<code class="docutils literal"><span class="pre">*/</span></code>. Inside the comments, the special strings <code class="docutils literal"><span class="pre">[VARIABLE{variable-number}]</span></code> is used.
-Be aware that the whole query minus the SQL comments must be
-valid by itself, otherwise you won&#8217;t be able to store it as a bookmark.</p>
-<p>When you execute the bookmark, everything typed into the <em>Variables</em>
-input boxes on the query box page will replace the strings <code class="docutils literal"><span class="pre">/*[VARIABLE{variable-number}]*/</span></code> in
-your stored query.</p>
-<p>Also remember, that everything else inside the <code class="docutils literal"><span class="pre">/*[VARIABLE{variable-number}]*/</span></code> string for
-your query will remain the way it is, but will be stripped of the <code class="docutils literal"><span class="pre">/**/</span></code>
-chars. So you can use:</p>
-<div class="highlight-mysql"><div class="highlight"><pre><span class="cm">/*, [VARIABLE1] AS myname */</span>
-</pre></div>
-</div>
-<p>which will be expanded to</p>
-<div class="highlight-mysql"><div class="highlight"><pre><span class="p">,</span> <span class="n">VARIABLE1</span> <span class="k">as</span> <span class="n">myname</span>
-</pre></div>
-</div>
-<p>in your query, where VARIABLE1 is the string you entered in the Variable 1 input box.</p>
-<p>A more complex example. Say you have stored
-this query:</p>
-<div class="highlight-mysql"><div class="highlight"><pre><span class="k">SELECT</span> <span class="n">Name</span><span class="p">,</span> <span class="n">Address</span> <span class="k">FROM</span> <span class="n">addresses</span> <span class="k">WHERE</span> <span class="mi">1</span> <span class="cm">/* AND Name LIKE &#39;%[VARIABLE1]%&#39; */</span>
-</pre></div>
-</div>
-<p>Say, you now enter &#8220;phpMyAdmin&#8221; as the variable for the stored query, the full
-query will be:</p>
-<div class="highlight-mysql"><div class="highlight"><pre><span class="k">SELECT</span> <span class="n">Name</span><span class="p">,</span> <span class="n">Address</span> <span class="k">FROM</span> <span class="n">addresses</span> <span class="k">WHERE</span> <span class="mi">1</span> <span class="k">AND</span> <span class="n">Name</span> <span class="k">LIKE</span> <span class="s1">&#39;%phpMyAdmin%&#39;</span>
-</pre></div>
-</div>
-<p><strong>NOTE THE ABSENCE OF SPACES</strong> inside the <code class="docutils literal"><span class="pre">/**/</span></code> construct. Any spaces
-inserted there will be later also inserted as spaces in your query and may lead
-to unexpected results especially when using the variable expansion inside of a
-&#8220;LIKE &#8216;&#8217;&#8221; expression.</p>
-</div>
-<div class="section" id="how-can-i-create-simple-latex-document-to-include-exported-table">
-<span id="faq6-19"></span><h3>6.19 How can I create simple LATEX document to include exported table?<a class="headerlink" href="#how-can-i-create-simple-latex-document-to-include-exported-table" title="Permalink to this headline">¶</a></h3>
-<p>You can simply include table in your LATEX documents,
-minimal sample document should look like following one (assuming you
-have table exported in file <code class="file docutils literal"><span class="pre">table.tex</span></code>):</p>
-<div class="highlight-latex"><div class="highlight"><pre><span class="k">\documentclass</span><span class="nb">{</span>article<span class="nb">}</span> <span class="c">% or any class you want</span>
-<span class="k">\usepackage</span><span class="nb">{</span>longtable<span class="nb">}</span>  <span class="c">% for displaying table</span>
-<span class="k">\begin</span><span class="nb">{</span>document<span class="nb">}</span>        <span class="c">% start of document</span>
-<span class="k">\include</span><span class="nb">{</span>table<span class="nb">}</span>         <span class="c">% including exported table</span>
-<span class="k">\end</span><span class="nb">{</span>document<span class="nb">}</span>          <span class="c">% end of document</span>
-</pre></div>
-</div>
-</div>
-<div class="section" id="i-see-a-lot-of-databases-which-are-not-mine-and-cannot-access-them">
-<span id="faq6-20"></span><h3>6.20 I see a lot of databases which are not mine, and cannot access them.<a class="headerlink" href="#i-see-a-lot-of-databases-which-are-not-mine-and-cannot-access-them" title="Permalink to this headline">¶</a></h3>
-<p>You have one of these global privileges: CREATE TEMPORARY TABLES, SHOW
-DATABASES, LOCK TABLES. Those privileges also enable users to see all the
-database names. So if your users do not need those privileges, you can remove
-them and their databases list will shorten.</p>
-<div class="admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="https://bugs.mysql.com/179">https://bugs.mysql.com/179</a>&gt;</p>
-</div>
-</div>
-<div class="section" id="in-edit-insert-mode-how-can-i-see-a-list-of-possible-values-for-a-column-based-on-some-foreign-table">
-<span id="faq6-21"></span><h3>6.21 In edit/insert mode, how can I see a list of possible values for a column, based on some foreign table?<a class="headerlink" href="#in-edit-insert-mode-how-can-i-see-a-list-of-possible-values-for-a-column-based-on-some-foreign-table" title="Permalink to this headline">¶</a></h3>
-<p>You have to setup appropriate links between the tables, and also setup
-the &#8220;display column&#8221; in the foreign table. See <a class="reference internal" href="#faq6-6"><span class="std std-ref">6.6 How can I use the relation table in Query-by-example?</span></a> for an
-example. Then, if there are 100 values or less in the foreign table, a
-drop-down list of values will be available. You will see two lists of
-values, the first list containing the key and the display column, the
-second list containing the display column and the key. The reason for
-this is to be able to type the first letter of either the key or the
-display column. For 100 values or more, a distinct window will appear,
-to browse foreign key values and choose one. To change the default
-limit of 100, see <span class="target" id="index-27"></span><a class="reference internal" href="config.html#cfg_ForeignKeyMaxLimit"><code class="xref config config-option docutils literal"><span class="pre">$cfg['ForeignKeyMaxLimit']</span></code></a>.</p>
-</div>
-<div class="section" id="bookmarks-can-i-execute-a-default-bookmark-automatically-when-entering-browse-mode-for-a-table">
-<span id="faq6-22"></span><h3>6.22 Bookmarks: Can I execute a default bookmark automatically when entering Browse mode for a table?<a class="headerlink" href="#bookmarks-can-i-execute-a-default-bookmark-automatically-when-entering-browse-mode-for-a-table" title="Permalink to this headline">¶</a></h3>
-<p>Yes. If a bookmark has the same label as a table name and it&#8217;s not a
-public bookmark, it will be executed.</p>
-</div>
-<div class="section" id="export-i-heard-phpmyadmin-can-export-microsoft-excel-files">
-<span id="faq6-23"></span><h3>6.23 Export: I heard phpMyAdmin can export Microsoft Excel files?<a class="headerlink" href="#export-i-heard-phpmyadmin-can-export-microsoft-excel-files" title="Permalink to this headline">¶</a></h3>
-<p>You can use <a class="reference internal" href="glossary.html#term-csv"><span class="xref std std-term">CSV</span></a> for Microsoft Excel,
-which works out of the box.</p>
-<div class="versionchanged">
-<p><span class="versionmodified">Changed in version 3.4.5: </span>Since phpMyAdmin 3.4.5 support for direct export to Microsoft Excel version
-97 and newer was dropped.</p>
-</div>
-</div>
-<div class="section" id="now-that-phpmyadmin-supports-native-mysql-4-1-x-column-comments-what-happens-to-my-column-comments-stored-in-pmadb">
-<span id="faq6-24"></span><h3>6.24 Now that phpMyAdmin supports native MySQL 4.1.x column comments, what happens to my column comments stored in pmadb?<a class="headerlink" href="#now-that-phpmyadmin-supports-native-mysql-4-1-x-column-comments-what-happens-to-my-column-comments-stored-in-pmadb" title="Permalink to this headline">¶</a></h3>
-<p>Automatic migration of a table&#8217;s pmadb-style column comments to the
-native ones is done whenever you enter Structure page for this table.</p>
-</div>
-<div class="section" id="faq6-25">
-<span id="id14"></span><h3>6.25 (withdrawn).<a class="headerlink" href="#faq6-25" title="Permalink to this headline">¶</a></h3>
-</div>
-<div class="section" id="how-can-i-select-a-range-of-rows">
-<span id="faq6-26"></span><h3>6.26 How can I select a range of rows?<a class="headerlink" href="#how-can-i-select-a-range-of-rows" title="Permalink to this headline">¶</a></h3>
-<p>Click the first row of the range, hold the shift key and click the
-last row of the range. This works everywhere you see rows, for example
-in Browse mode or on the Structure page.</p>
-</div>
-<div class="section" id="what-format-strings-can-i-use">
-<span id="faq6-27"></span><h3>6.27 What format strings can I use?<a class="headerlink" href="#what-format-strings-can-i-use" title="Permalink to this headline">¶</a></h3>
-<p>In all places where phpMyAdmin accepts format strings, you can use
-<code class="docutils literal"><span class="pre">&#64;VARIABLE&#64;</span></code> expansion and <a class="reference external" href="https://php.net/strftime">strftime</a>
-format strings. The expanded variables depend on a context (for
-example, if you haven&#8217;t chosen a table, you can not get the table
-name), but the following variables can be used:</p>
-<dl class="docutils">
-<dt><code class="docutils literal"><span class="pre">&#64;HTTP_HOST&#64;</span></code></dt>
-<dd>HTTP host that runs phpMyAdmin</dd>
-<dt><code class="docutils literal"><span class="pre">&#64;SERVER&#64;</span></code></dt>
-<dd>MySQL server name</dd>
-<dt><code class="docutils literal"><span class="pre">&#64;VERBOSE&#64;</span></code></dt>
-<dd>Verbose MySQL server name as defined in <span class="target" id="index-28"></span><a class="reference internal" href="config.html#cfg_Servers_verbose"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['verbose']</span></code></a></dd>
-<dt><code class="docutils literal"><span class="pre">&#64;VSERVER&#64;</span></code></dt>
-<dd>Verbose MySQL server name if set, otherwise normal</dd>
-<dt><code class="docutils literal"><span class="pre">&#64;DATABASE&#64;</span></code></dt>
-<dd>Currently opened database</dd>
-<dt><code class="docutils literal"><span class="pre">&#64;TABLE&#64;</span></code></dt>
-<dd>Currently opened table</dd>
-<dt><code class="docutils literal"><span class="pre">&#64;COLUMNS&#64;</span></code></dt>
-<dd>Columns of the currently opened table</dd>
-<dt><code class="docutils literal"><span class="pre">&#64;PHPMYADMIN&#64;</span></code></dt>
-<dd>phpMyAdmin with version</dd>
-</dl>
-</div>
-<div class="section" id="how-can-i-easily-edit-relational-schema-for-export">
-<span id="wysiwyg"></span><h3>6.28 How can I easily edit relational schema for export?<a class="headerlink" href="#how-can-i-easily-edit-relational-schema-for-export" title="Permalink to this headline">¶</a></h3>
-<p>By clicking on the button &#8216;toggle scratchboard&#8217; on the page where you
-edit x/y coordinates of those elements you can activate a scratchboard
-where all your elements are placed. By clicking on an element, you can
-move them around in the pre-defined area and the x/y coordinates will
-get updated dynamically. Likewise, when entering a new position
-directly into the input field, the new position in the scratchboard
-changes after your cursor leaves the input field.</p>
-<p>You have to click on the &#8216;OK&#8217;-button below the tables to save the new
-positions. If you want to place a new element, first add it to the
-table of elements and then you can drag the new element around.</p>
-<p>By changing the paper size and the orientation you can change the size
-of the scratchboard as well. You can do so by just changing the
-dropdown field below, and the scratchboard will resize automatically,
-without interfering with the current placement of the elements.</p>
-<p>If ever an element gets out of range you can either enlarge the paper
-size or click on the &#8216;reset&#8217; button to place all elements below each
-other.</p>
-</div>
-<div class="section" id="why-can-t-i-get-a-chart-from-my-query-result-table">
-<span id="faq6-29"></span><h3>6.29 Why can&#8217;t I get a chart from my query result table?<a class="headerlink" href="#why-can-t-i-get-a-chart-from-my-query-result-table" title="Permalink to this headline">¶</a></h3>
-<p>Not every table can be put to the chart. Only tables with one, two or
-three columns can be visualised as a chart. Moreover the table must be
-in a special format for chart script to understand it. Currently
-supported formats can be found in the <a class="reference external" href="https://wiki.phpmyadmin.net/pma/Charts#Data_formats_for_query_results_chart">wiki</a>.</p>
-</div>
-<div class="section" id="import-how-can-i-import-esri-shapefiles">
-<span id="faq6-30"></span><h3>6.30 Import: How can I import ESRI Shapefiles?<a class="headerlink" href="#import-how-can-i-import-esri-shapefiles" title="Permalink to this headline">¶</a></h3>
-<p>An ESRI Shapefile is actually a set of several files, where .shp file
-contains geometry data and .dbf file contains data related to those
-geometry data. To read data from .dbf file you need to have PHP
-compiled with the dBase extension (&#8211;enable-dbase). Otherwise only
-geometry data will be imported.</p>
-<p>To upload these set of files you can use either of the following
-methods:</p>
-<p>Configure upload directory with <span class="target" id="index-29"></span><a class="reference internal" href="config.html#cfg_UploadDir"><code class="xref config config-option docutils literal"><span class="pre">$cfg['UploadDir']</span></code></a>, upload both .shp and .dbf files with
-the same filename and chose the .shp file from the import page.</p>
-<p>Create a Zip archive with .shp and .dbf files and import it. For this
-to work, you need to set <span class="target" id="index-30"></span><a class="reference internal" href="config.html#cfg_TempDir"><code class="xref config config-option docutils literal"><span class="pre">$cfg['TempDir']</span></code></a> to a place where the web server user can
-write (for example <code class="docutils literal"><span class="pre">'./tmp'</span></code>).</p>
-<p>To create the temporary directory on a UNIX-based system, you can do:</p>
-<div class="highlight-sh"><div class="highlight"><pre><span class="nb">cd </span>phpMyAdmin
-mkdir tmp
-chmod o+rwx tmp
-</pre></div>
-</div>
-</div>
-<div class="section" id="how-do-i-create-a-relation-in-designer">
-<span id="faq6-31"></span><h3>6.31 How do I create a relation in designer?<a class="headerlink" href="#how-do-i-create-a-relation-in-designer" title="Permalink to this headline">¶</a></h3>
-<p>To select relation, click:  The display column is shown in pink. To
-set/unset a column as the display column, click the &#8220;Choose column to
-display&#8221; icon, then click on the appropriate column name.</p>
-</div>
-<div class="section" id="how-can-i-use-the-zoom-search-feature">
-<span id="faq6-32"></span><h3>6.32 How can I use the zoom search feature?<a class="headerlink" href="#how-can-i-use-the-zoom-search-feature" title="Permalink to this headline">¶</a></h3>
-<p>The Zoom search feature is an alternative to table search feature. It allows
-you to explore a table by representing its data in a scatter plot. You can
-locate this feature by selecting a table and clicking the <span class="guilabel">Search</span>
-tab. One of the sub-tabs in the <span class="guilabel">Table Search</span> page is
-<span class="guilabel">Zoom Search</span>.</p>
-<p>Consider the table REL_persons in <a class="reference internal" href="#faq6-6"><span class="std std-ref">6.6 How can I use the relation table in Query-by-example?</span></a> for
-an example. To use zoom search, two columns need to be selected, for
-example, id and town_code. The id values will be represented on one
-axis and town_code values on the other axis. Each row will be
-represented as a point in a scatter plot based on its id and
-town_code. You can include two additional search criteria apart from
-the two fields to display.</p>
-<p>You can choose which field should be
-displayed as label for each point. If a display column has been set
-for the table (see <a class="reference internal" href="#faqdisplay"><span class="std std-ref">6.7 How can I use the &#8220;display column&#8221; feature?</span></a>), it is taken as the label unless
-you specify otherwise. You can also select the maximum number of rows
-you want to be displayed in the plot by specifing it in the &#8216;Max rows
-to plot&#8217; field. Once you have decided over your criteria, click &#8216;Go&#8217;
-to display the plot.</p>
-<p>After the plot is generated, you can use the
-mousewheel to zoom in and out of the plot. In addition, panning
-feature is enabled to navigate through the plot. You can zoom-in to a
-certain level of detail and use panning to locate your area of
-interest. Clicking on a point opens a dialogue box, displaying field
-values of the data row represented by the point. You can edit the
-values if required and click on submit to issue an update query. Basic
-instructions on how to use can be viewed by clicking the &#8216;How to use?&#8217;
-link located just above the plot.</p>
-</div>
-<div class="section" id="when-browsing-a-table-how-can-i-copy-a-column-name">
-<span id="faq6-33"></span><h3>6.33 When browsing a table, how can I copy a column name?<a class="headerlink" href="#when-browsing-a-table-how-can-i-copy-a-column-name" title="Permalink to this headline">¶</a></h3>
-<p>Selecting the name of the column within the browse table header cell
-for copying is difficult, as the columns support reordering by
-dragging the header cells as well as sorting by clicking on the linked
-column name. To copy a column name, double-click on the empty area
-next to the column name, when the tooltip tells you to do so. This
-will show you an input box with the column name. You may right-click
-the column name within this input box to copy it to your clipboard.</p>
-</div>
-<div class="section" id="how-can-i-use-the-favorite-tables-feature">
-<span id="faq6-34"></span><h3>6.34 How can I use the Favorite Tables feature?<a class="headerlink" href="#how-can-i-use-the-favorite-tables-feature" title="Permalink to this headline">¶</a></h3>
-<p>Favorite Tables feature is very much similar to Recent Tables feature.
-It allows you to add a shortcut for the frequently used tables of any
-database in the navigation panel . You can easily navigate to any table
-in the list by simply choosing it from the list. These tables are stored
-in your browser&#8217;s local storage if you have not configured your
-<cite>phpMyAdmin Configuration Storage</cite>. Otherwise these entries are stored in
-<cite>phpMyAdmin Configuration Storage</cite>.</p>
-<p>IMPORTANT: In absence of <cite>phpMyAdmin Configuration Storage</cite>, your Favorite
-tables may be different in different browsers based on your different
-selections in them.</p>
-<p>To add a table to Favorite list simply click on the <cite>Gray</cite> star in front
-of a table name in the list of tables of a Database and wait until it
-turns to <cite>Yellow</cite>.
-To remove a table from list, simply click on the <cite>Yellow</cite> star and
-wait until it turns <cite>Gray</cite> again.</p>
-<p>Using <span class="target" id="index-31"></span><a class="reference internal" href="config.html#cfg_NumFavoriteTables"><code class="xref config config-option docutils literal"><span class="pre">$cfg['NumFavoriteTables']</span></code></a> in your <code class="file docutils literal"><span class="pre">config.inc.php</span></code>
-file, you can define the  maximum number of favorite tables shown in the
-navigation panel. Its default value is <cite>10</cite>.</p>
-</div>
-<div class="section" id="how-can-i-use-the-range-search-feature">
-<span id="faq6-35"></span><h3>6.35 How can I use the Range search feature?<a class="headerlink" href="#how-can-i-use-the-range-search-feature" title="Permalink to this headline">¶</a></h3>
-<p>With the help of range search feature, one can specify a range of values for
-particular column(s) while performing search operation on a table from the <cite>Search</cite>
-tab.</p>
-<p>To use this feature simply click on the <cite>BETWEEN</cite> or <cite>NOT BETWEEN</cite> operators
-from the operator select list in front of the column name. On choosing one of the
-above options, a dialog box will show up asking for the <cite>Minimum</cite> and <cite>Maximum</cite>
-value for that column. Only the specified range of values will be included
-in case of <cite>BETWEEN</cite> and excluded in case of <cite>NOT BETWEEN</cite> from the final results.</p>
-<p>Note: The Range search feature will work only <cite>Numeric</cite> and <cite>Date</cite> data type columns.</p>
-</div>
-<div class="section" id="what-is-central-columns-and-how-can-i-use-this-feature">
-<span id="faq6-36"></span><h3>6.36 What is Central columns and How can I use this feature?<a class="headerlink" href="#what-is-central-columns-and-how-can-i-use-this-feature" title="Permalink to this headline">¶</a></h3>
-<p>As the name suggests, the Central columns feature enables to maintain a central list of
-columns per database to avoid similar name for the same data element and bring consistency
-of data type for the same data element. You can use the central list of columns to
-add an element to any table structure in that database which will save from writing
-similar column name and column definition.</p>
-<p>To add a column to central list, go to table structure page, check the columns you want
-to include and then simply click on &#8220;Add to central columns&#8221;. If you want to add all
-unique columns from more than one table from a database then go to database structure page,
-check the tables you want to include and then select &#8220;Add columns to central list&#8221;.</p>
-<p>To remove a column from central list, go to Table structure page, check the columns you want
-to remove and then simply click on &#8220;Remove from central columns&#8221;. If you want to remove all
-columns from more than one tables from a database then go to database structure page,
-check the tables you want to include and then select &#8220;Remove columns from central list&#8221;.</p>
-<p>To view and manage the central list, select the database you want to manage central columns
-for then from the top menu click on &#8220;Central columns&#8221;. You will be taken to a page where
-you will have options to edit, delete or add new columns to central list.</p>
-</div>
-<div class="section" id="how-can-i-use-improve-table-structure-feature">
-<span id="faq6-37"></span><h3>6.37 How can I use Improve Table structure feature?<a class="headerlink" href="#how-can-i-use-improve-table-structure-feature" title="Permalink to this headline">¶</a></h3>
-<p>Improve table structure feature helps to bring the table structure upto
-Third Normal Form. A wizard is presented to user which asks questions about the
-elements during the various steps for normalization and a new structure is proposed
-accordingly to bring the table into the First/Second/Third Normal form.
-On startup of the wizard, user gets to select upto what normal form they want to
-normalize the table structure.</p>
-<p>Here is an example table which you can use to test all of the three First, Second and
-Third Normal Form.</p>
-<div class="highlight-mysql"><div class="highlight"><pre><span class="k">CREATE</span> <span class="k">TABLE</span> <span class="ss">`VetOffice`</span> <span class="p">(</span>
- <span class="ss">`petName`</span> <span class="kt">varchar</span><span class="p">(</span><span class="mi">64</span><span class="p">)</span> <span class="k">NOT</span> <span class="no">NULL</span><span class="p">,</span>
- <span class="ss">`petBreed`</span> <span class="kt">varchar</span><span class="p">(</span><span class="mi">64</span><span class="p">)</span> <span class="k">NOT</span> <span class="no">NULL</span><span class="p">,</span>
- <span class="ss">`petType`</span> <span class="kt">varchar</span><span class="p">(</span><span class="mi">64</span><span class="p">)</span> <span class="k">NOT</span> <span class="no">NULL</span><span class="p">,</span>
- <span class="ss">`petDOB`</span> <span class="kt">date</span> <span class="k">NOT</span> <span class="no">NULL</span><span class="p">,</span>
- <span class="ss">`ownerLastName`</span> <span class="kt">varchar</span><span class="p">(</span><span class="mi">64</span><span class="p">)</span> <span class="k">NOT</span> <span class="no">NULL</span><span class="p">,</span>
- <span class="ss">`ownerFirstName`</span> <span class="kt">varchar</span><span class="p">(</span><span class="mi">64</span><span class="p">)</span> <span class="k">NOT</span> <span class="no">NULL</span><span class="p">,</span>
- <span class="ss">`ownerPhone1`</span> <span class="kt">int</span><span class="p">(</span><span class="mi">12</span><span class="p">)</span> <span class="k">NOT</span> <span class="no">NULL</span><span class="p">,</span>
- <span class="ss">`ownerPhone2`</span> <span class="kt">int</span><span class="p">(</span><span class="mi">12</span><span class="p">)</span> <span class="k">NOT</span> <span class="no">NULL</span><span class="p">,</span>
- <span class="ss">`ownerEmail`</span> <span class="kt">varchar</span><span class="p">(</span><span class="mi">64</span><span class="p">)</span> <span class="k">NOT</span> <span class="no">NULL</span><span class="p">,</span>
-<span class="p">);</span>
-</pre></div>
-</div>
-<p>The above table is not in First normal Form as no primary key exists. Primary key
-is supposed to be (<cite>petName</cite>,`ownerLastName`,`ownerFirstName`) . If the primary key
-is chosen as suggested the resultant table won&#8217;t be in Second as well as Third Normal
-form as the following dependencies exists.</p>
-<div class="highlight-mysql"><div class="highlight"><pre><span class="p">(</span><span class="n">OwnerLastName</span><span class="p">,</span> <span class="n">OwnerFirstName</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="nf">OwnerEmail</span>
-<span class="p">(</span><span class="n">OwnerLastName</span><span class="p">,</span> <span class="n">OwnerFirstName</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="n">OwnerPhone</span>
-<span class="n">PetBreed</span> <span class="o">-&gt;</span> <span class="n">PetType</span>
-</pre></div>
-</div>
-<p>Which says, OwnerEmail depends on OwnerLastName and OwnerFirstName.
-OwnerPhone depends on OwnerLastName and OwnerFirstName.
-PetType depends on PetBreed.</p>
-</div>
-<div class="section" id="how-can-i-reassign-auto-incremented-values">
-<span id="faq6-38"></span><h3>6.38 How can I reassign auto-incremented values?<a class="headerlink" href="#how-can-i-reassign-auto-incremented-values" title="Permalink to this headline">¶</a></h3>
-<p>Some users prefer their AUTO_INCREMENT values to be consecutive; this is not
-always the case after row deletion.</p>
-<p>Here are the steps to accomplish this. These are manual steps because they
-involve a manual verification at one point.</p>
-<ul class="simple">
-<li>Ensure that you have exclusive access to the table to rearrange</li>
-<li>On your primary key column (i.e. id), remove the AUTO_INCREMENT setting</li>
-<li>Delete your primary key in Structure &gt; indexes</li>
-<li>Create a new column future_id as primary key, AUTO_INCREMENT</li>
-<li>Browse your table and verify that the new increments correspond to what
-you&#8217;re expecting</li>
-<li>Drop your old id column</li>
-<li>Rename the future_id column to id</li>
-<li>Move the new id column via Structure &gt; Move columns</li>
-</ul>
-</div>
-<div class="section" id="what-is-the-adjust-privileges-option-when-renaming-copying-or-moving-a-database-table-column-or-procedure">
-<span id="faq6-39"></span><h3>6.39 What is the &#8220;Adjust privileges&#8221; option when renaming, copying, or moving a database, table, column, or procedure?<a class="headerlink" href="#what-is-the-adjust-privileges-option-when-renaming-copying-or-moving-a-database-table-column-or-procedure" title="Permalink to this headline">¶</a></h3>
-<p>When renaming/copying/moving a database/table/column/procedure,
-MySQL does not adjust the original privileges relating to these objects
-on its own. By selecting this option, phpMyAdmin will adjust the privilege
-table so that users have the same privileges on the new items.</p>
-<p>For example: A user <a class="reference external" href="mailto:'bob'&#37;&#52;&#48;'localhost">'bob'<span>&#64;</span>'localhost</a>&#8216; has a &#8216;SELECT&#8217; privilege on a
-column named &#8216;id&#8217;. Now, if this column is renamed to &#8216;id_new&#8217;, MySQL,
-on its own, would <strong>not</strong> adjust the column privileges to the new column name.
-phpMyAdmin can make this adjustment for you automatically.</p>
-<p>Notes:</p>
-<ul class="simple">
-<li>While adjusting privileges for a database, the privileges of all
-database-related elements (tables, columns and procedures) are also adjusted
-to the database&#8217;s new name.</li>
-<li>Similarly, while adjusting privileges for a table, the privileges of all
-the columns inside the new table are also adjusted.</li>
-<li>While adjusting privileges, the user performing the operation <strong>must</strong> have the following
-privileges:<ul>
-<li>SELECT, INSERT, UPDATE, DELETE privileges on following tables:
-<cite>mysql</cite>.`db`, <cite>mysql</cite>.`columns_priv`, <cite>mysql</cite>.`tables_priv`, <cite>mysql</cite>.`procs_priv`</li>
-<li>FLUSH privilege (GLOBAL)</li>
-</ul>
-</li>
-</ul>
-<p>Thus, if you want to replicate the database/table/column/procedure as it is
-while renaming/copying/moving these objects, make sure you have checked this option.</p>
-</div>
-<div class="section" id="i-see-bind-parameters-checkbox-in-the-sql-page-how-do-i-write-parameterized-sql-queries">
-<span id="faq6-40"></span><h3>6.40 I see &#8220;Bind parameters&#8221; checkbox in the &#8220;SQL&#8221; page. How do I write parameterized SQL queries?<a class="headerlink" href="#i-see-bind-parameters-checkbox-in-the-sql-page-how-do-i-write-parameterized-sql-queries" title="Permalink to this headline">¶</a></h3>
-<p>From version 4.5, phpMyAdmin allows users to execute parameterized queries in the &#8220;SQL&#8221; page.
-Parameters should be prefixed with a colon(:) and when the &#8220;Bind parameters&#8221; checkbox is checked
-these parameters will be identified and input fields for these parameters will be presented.
-Values entered in these field will be substituted in the query before being executed.</p>
-</div>
-<div class="section" id="i-get-import-errors-while-importing-the-dumps-exported-from-older-mysql-versions-pre-5-7-6-into-newer-mysql-versions-5-7-7-but-they-work-fine-when-imported-back-on-same-older-versions">
-<span id="faq6-41"></span><h3>6.41 I get import errors while importing the dumps exported from older MySQL versions (pre-5.7.6) into newer MySQL versions (5.7.7+), but they work fine when imported back on same older versions ?<a class="headerlink" href="#i-get-import-errors-while-importing-the-dumps-exported-from-older-mysql-versions-pre-5-7-6-into-newer-mysql-versions-5-7-7-but-they-work-fine-when-imported-back-on-same-older-versions" title="Permalink to this headline">¶</a></h3>
-<p>If you get errors like <em>#1031 - Table storage engine for &#8216;table_name&#8217; doesn&#8217;t have this option</em>
-while importing the dumps exported from pre-5.7.7 MySQL servers into new MySQL server versions 5.7.7+,
-it might be because ROW_FORMAT=FIXED is not supported with InnoDB tables. Moreover, the value of
-<a class="reference external" href="http://dev.mysql.com/doc/refman/5.7/en/innodb-parameters.html#sysvar_innodb_strict_mode">innodb_strict_mode</a> would define if this would be reported as a warning or as an error.</p>
-<p>Since MySQL version 5.7.9, the default value for <cite>innodb_strict_mode</cite> is <cite>ON</cite> and thus would generate
-an error when such a CREATE TABLE or ALTER TABLE statement is encountered.</p>
-<p>There are two ways of preventing such errors while importing:</p>
-<ul class="simple">
-<li>Change the value of <cite>innodb_strict_mode</cite> to <cite>OFF</cite> before starting the import and turn it <cite>ON</cite> after
-the import is successfully completed.</li>
-<li>This can be achieved in two ways:<ul>
-<li>Go to &#8216;Variables&#8217; page and edit the value of <cite>innodb_strict_mode</cite></li>
-<li>Run the query : <cite>SET GLOBAL `innodb_strict_mode</cite> = &#8216;[value]&#8217;`</li>
-</ul>
-</li>
-</ul>
-<p>After the import is done, it is suggested that the value of <cite>innodb_strict_mode</cite> should be reset to the
-original value.</p>
-</div>
-</div>
-<div class="section" id="phpmyadmin-project">
-<span id="faqproject"></span><h2>phpMyAdmin project<a class="headerlink" href="#phpmyadmin-project" title="Permalink to this headline">¶</a></h2>
-<div class="section" id="i-have-found-a-bug-how-do-i-inform-developers">
-<span id="faq7-1"></span><h3>7.1 I have found a bug. How do I inform developers?<a class="headerlink" href="#i-have-found-a-bug-how-do-i-inform-developers" title="Permalink to this headline">¶</a></h3>
-<p>Our issues tracker is located at &lt;<a class="reference external" href="https://github.com/phpmyadmin/phpmyadmin/issues">https://github.com/phpmyadmin/phpmyadmin/issues</a>&gt;.</p>
-</div>
-<div class="section" id="i-want-to-translate-the-messages-to-a-new-language-or-upgrade-an-existing-language-where-do-i-start">
-<span id="faq7-2"></span><h3>7.2 I want to translate the messages to a new language or upgrade an existing language, where do I start?<a class="headerlink" href="#i-want-to-translate-the-messages-to-a-new-language-or-upgrade-an-existing-language-where-do-i-start" title="Permalink to this headline">¶</a></h3>
-<p>Translations are very welcome and all you need to have are the
-language skills. The easiest way is to use our <a class="reference external" href="https://hosted.weblate.org/projects/phpmyadmin/">online translation
-service</a>. You can check
-out all the possibilities to translate in the <a class="reference external" href="https://www.phpmyadmin.net/translate/">translate section on
-our website</a>.</p>
-</div>
-<div class="section" id="i-would-like-to-help-out-with-the-development-of-phpmyadmin-how-should-i-proceed">
-<span id="faq7-3"></span><h3>7.3 I would like to help out with the development of phpMyAdmin. How should I proceed?<a class="headerlink" href="#i-would-like-to-help-out-with-the-development-of-phpmyadmin-how-should-i-proceed" title="Permalink to this headline">¶</a></h3>
-<p>We welcome every contribution to the development of phpMyAdmin. You
-can check out all the possibilities to contribute in the <a class="reference external" href="https://www.phpmyadmin.net/contribute/">contribute
-section on our website</a>.</p>
-<div class="admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last"><a class="reference internal" href="developers.html#developers"><span class="std std-ref">Developers Information</span></a></p>
-</div>
-</div>
-</div>
-<div class="section" id="security">
-<span id="faqsecurity"></span><h2>Security<a class="headerlink" href="#security" title="Permalink to this headline">¶</a></h2>
-<div class="section" id="where-can-i-get-information-about-the-security-alerts-issued-for-phpmyadmin">
-<span id="faq8-1"></span><h3>8.1 Where can I get information about the security alerts issued for phpMyAdmin?<a class="headerlink" href="#where-can-i-get-information-about-the-security-alerts-issued-for-phpmyadmin" title="Permalink to this headline">¶</a></h3>
-<p>Please refer to &lt;<a class="reference external" href="https://www.phpmyadmin.net/security/">https://www.phpmyadmin.net/security/</a>&gt;.</p>
-</div>
-<div class="section" id="how-can-i-protect-phpmyadmin-against-brute-force-attacks">
-<span id="faq8-2"></span><h3>8.2 How can I protect phpMyAdmin against brute force attacks?<a class="headerlink" href="#how-can-i-protect-phpmyadmin-against-brute-force-attacks" title="Permalink to this headline">¶</a></h3>
-<p>If you use Apache web server, phpMyAdmin exports information about
-authentication to the Apache environment and it can be used in Apache
-logs. Currently there are two variables available:</p>
-<dl class="docutils">
-<dt><code class="docutils literal"><span class="pre">userID</span></code></dt>
-<dd>User name of currently active user (he does not have to be logged in).</dd>
-<dt><code class="docutils literal"><span class="pre">userStatus</span></code></dt>
-<dd>Status of currently active user, one of <code class="docutils literal"><span class="pre">ok</span></code> (user is logged in),
-<code class="docutils literal"><span class="pre">mysql-denied</span></code> (MySQL denied user login), <code class="docutils literal"><span class="pre">allow-denied</span></code> (user denied
-by allow/deny rules), <code class="docutils literal"><span class="pre">root-denied</span></code> (root is denied in configuration),
-<code class="docutils literal"><span class="pre">empty-denied</span></code> (empty password is denied).</dd>
-</dl>
-<p><code class="docutils literal"><span class="pre">LogFormat</span></code> directive for Apache can look like following:</p>
-<div class="highlight-apache"><div class="highlight"><pre><span class="nb">LogFormat</span> <span class="s2">&quot;%h %l %u %t \&quot;%r\&quot; %&gt;s %b \&quot;%{Referer}i\&quot; \&quot;%{User-Agent}i\&quot; %{userID}n %{userStatus}n&quot;</span>   pma_combined
-</pre></div>
-</div>
-<p>You can then use any log analyzing tools to detect possible break-in
-attempts.</p>
-</div>
-<div class="section" id="why-are-there-path-disclosures-when-directly-loading-certain-files">
-<span id="faq8-3"></span><h3>8.3 Why are there path disclosures when directly loading certain files?<a class="headerlink" href="#why-are-there-path-disclosures-when-directly-loading-certain-files" title="Permalink to this headline">¶</a></h3>
-<p>This is a server configuration problem. Never enable <code class="docutils literal"><span class="pre">display_errors</span></code> on a production site.</p>
-</div>
-</div>
-<div class="section" id="synchronization">
-<span id="faqsynchronization"></span><h2>Synchronization<a class="headerlink" href="#synchronization" title="Permalink to this headline">¶</a></h2>
-<div class="section" id="faq9-1">
-<span id="id15"></span><h3>9.1 (withdrawn).<a class="headerlink" href="#faq9-1" title="Permalink to this headline">¶</a></h3>
-</div>
-<div class="section" id="faq9-2">
-<span id="id16"></span><h3>9.2 (withdrawn).<a class="headerlink" href="#faq9-2" title="Permalink to this headline">¶</a></h3>
-</div>
-</div>
-</div>
-
-
-          </div>
-        </div>
-      </div>
-      <div class="sphinxsidebar" role="navigation" aria-label="main navigation">
-        <div class="sphinxsidebarwrapper">
-  <h3><a href="index.html">Table Of Contents</a></h3>
-  <ul>
-<li><a class="reference internal" href="#">FAQ - Frequently Asked Questions</a><ul>
-<li><a class="reference internal" href="#server">Server</a><ul>
-<li><a class="reference internal" href="#my-server-is-crashing-each-time-a-specific-action-is-required-or-phpmyadmin-sends-a-blank-page-or-a-page-full-of-cryptic-characters-to-my-browser-what-can-i-do">1.1 My server is crashing each time a specific action is required or phpMyAdmin sends a blank page or a page full of cryptic characters to my browser, what can I do?</a></li>
-<li><a class="reference internal" href="#my-apache-server-crashes-when-using-phpmyadmin">1.2 My Apache server crashes when using phpMyAdmin.</a></li>
-<li><a class="reference internal" href="#withdrawn">1.3 (withdrawn).</a></li>
-<li><a class="reference internal" href="#using-phpmyadmin-on-iis-i-m-displayed-the-error-message-the-specified-cgi-application-misbehaved-by-not-returning-a-complete-set-of-http-headers">1.4 Using phpMyAdmin on IIS, I&#8217;m displayed the error message: &#8220;The specified CGI application misbehaved by not returning a complete set of HTTP headers ...&#8221;.</a></li>
-<li><a class="reference internal" href="#using-phpmyadmin-on-iis-i-m-facing-crashes-and-or-many-error-messages-with-the-http">1.5 Using phpMyAdmin on IIS, I&#8217;m facing crashes and/or many error messages with the HTTP.</a></li>
-<li><a class="reference internal" href="#i-can-t-use-phpmyadmin-on-pws-nothing-is-displayed">1.6 I can&#8217;t use phpMyAdmin on PWS: nothing is displayed!</a></li>
-<li><a class="reference internal" href="#how-can-i-gzip-a-dump-or-a-csv-export-it-does-not-seem-to-work">1.7 How can I GZip a dump or a CSV export? It does not seem to work.</a></li>
-<li><a class="reference internal" href="#i-cannot-insert-a-text-file-in-a-table-and-i-get-an-error-about-safe-mode-being-in-effect">1.8 I cannot insert a text file in a table, and I get an error about safe mode being in effect.</a></li>
-<li><a class="reference internal" href="#faq1-9">1.9 (withdrawn).</a></li>
-<li><a class="reference internal" href="#i-m-having-troubles-when-uploading-files-with-phpmyadmin-running-on-a-secure-server-my-browser-is-internet-explorer-and-i-m-using-the-apache-server">1.10 I&#8217;m having troubles when uploading files with phpMyAdmin running on a secure server. My browser is Internet Explorer and I&#8217;m using the Apache server.</a></li>
-<li><a class="reference internal" href="#i-get-an-open-basedir-restriction-while-uploading-a-file-from-the-query-box">1.11 I get an &#8216;open_basedir restriction&#8217; while uploading a file from the query box.</a></li>
-<li><a class="reference internal" href="#i-have-lost-my-mysql-root-password-what-can-i-do">1.12 I have lost my MySQL root password, what can I do?</a></li>
-<li><a class="reference internal" href="#faq1-13">1.13 (withdrawn).</a></li>
-<li><a class="reference internal" href="#faq1-14">1.14 (withdrawn).</a></li>
-<li><a class="reference internal" href="#i-have-problems-with-mysql-user-column-names">1.15 I have problems with <em>mysql.user</em> column names.</a></li>
-<li><a class="reference internal" href="#i-cannot-upload-big-dump-files-memory-http-or-timeout-problems">1.16 I cannot upload big dump files (memory, HTTP or timeout problems).</a></li>
-<li><a class="reference internal" href="#which-database-versions-does-phpmyadmin-support">1.17 Which Database versions does phpMyAdmin support?</a></li>
-<li><a class="reference internal" href="#a-i-cannot-connect-to-the-mysql-server-it-always-returns-the-error-message-client-does-not-support-authentication-protocol-requested-by-server-consider-upgrading-mysql-client">1.17a I cannot connect to the MySQL server. It always returns the error message, &#8220;Client does not support authentication protocol requested by server; consider upgrading MySQL client&#8221;</a></li>
-<li><a class="reference internal" href="#faq1-18">1.18 (withdrawn).</a></li>
-<li><a class="reference internal" href="#i-can-t-run-the-display-relations-feature-because-the-script-seems-not-to-know-the-font-face-i-m-using">1.19 I can&#8217;t run the &#8220;display relations&#8221; feature because the script seems not to know the font face I&#8217;m using!</a></li>
-<li><a class="reference internal" href="#i-receive-an-error-about-missing-mysqli-and-mysql-extensions">1.20 I receive an error about missing mysqli and mysql extensions.</a></li>
-<li><a class="reference internal" href="#i-am-running-the-cgi-version-of-php-under-unix-and-i-cannot-log-in-using-cookie-auth">1.21 I am running the CGI version of PHP under Unix, and I cannot log in using cookie auth.</a></li>
-<li><a class="reference internal" href="#i-don-t-see-the-location-of-text-file-field-so-i-cannot-upload">1.22 I don&#8217;t see the &#8220;Location of text file&#8221; field, so I cannot upload.</a></li>
-<li><a class="reference internal" href="#i-m-running-mysql-on-a-win32-machine-each-time-i-create-a-new-table-the-table-and-column-names-are-changed-to-lowercase">1.23 I&#8217;m running MySQL on a Win32 machine. Each time I create a new table the table and column names are changed to lowercase!</a></li>
-<li><a class="reference internal" href="#faq1-24">1.24 (withdrawn).</a></li>
-<li><a class="reference internal" href="#i-am-running-apache-with-mod-gzip-1-3-26-1a-on-windows-xp-and-i-get-problems-such-as-undefined-variables-when-i-run-a-sql-query">1.25 I am running Apache with mod_gzip-1.3.26.1a on Windows XP, and I get problems, such as undefined variables when I run a SQL query.</a></li>
-<li><a class="reference internal" href="#i-just-installed-phpmyadmin-in-my-document-root-of-iis-but-i-get-the-error-no-input-file-specified-when-trying-to-run-phpmyadmin">1.26 I just installed phpMyAdmin in my document root of IIS but I get the error &#8220;No input file specified&#8221; when trying to run phpMyAdmin.</a></li>
-<li><a class="reference internal" href="#i-get-empty-page-when-i-want-to-view-huge-page-eg-db-structure-php-with-plenty-of-tables">1.27 I get empty page when I want to view huge page (eg. db_structure.php with plenty of tables).</a></li>
-<li><a class="reference internal" href="#my-mysql-server-sometimes-refuses-queries-and-returns-the-message-errorcode-13-what-does-this-mean">1.28 My MySQL server sometimes refuses queries and returns the message &#8216;Errorcode: 13&#8217;. What does this mean?</a></li>
-<li><a class="reference internal" href="#when-i-create-a-table-or-modify-a-column-i-get-an-error-and-the-columns-are-duplicated">1.29 When I create a table or modify a column, I get an error and the columns are duplicated.</a></li>
-<li><a class="reference internal" href="#i-get-the-error-navigation-php-missing-hash">1.30 I get the error &#8220;navigation.php: Missing hash&#8221;.</a></li>
-<li><a class="reference internal" href="#does-phpmyadmin-support-php-5">1.31 Does phpMyAdmin support PHP 5?</a></li>
-<li><a class="reference internal" href="#can-i-use-http-authentication-with-iis">1.32 Can I use HTTP authentication with IIS?</a></li>
-<li><a class="reference internal" href="#faq1-33">1.33 (withdrawn).</a></li>
-<li><a class="reference internal" href="#can-i-access-directly-to-database-or-table-pages">1.34 Can I access directly to database or table pages?</a></li>
-<li><a class="reference internal" href="#can-i-use-http-authentication-with-apache-cgi">1.35 Can I use HTTP authentication with Apache CGI?</a></li>
-<li><a class="reference internal" href="#i-get-an-error-500-internal-server-error">1.36 I get an error &#8220;500 Internal Server Error&#8221;.</a></li>
-<li><a class="reference internal" href="#i-run-phpmyadmin-on-cluster-of-different-machines-and-password-encryption-in-cookie-auth-doesn-t-work">1.37 I run phpMyAdmin on cluster of different machines and password encryption in cookie auth doesn&#8217;t work.</a></li>
-<li><a class="reference internal" href="#can-i-use-phpmyadmin-on-a-server-on-which-suhosin-is-enabled">1.38 Can I use phpMyAdmin on a server on which Suhosin is enabled?</a></li>
-<li><a class="reference internal" href="#when-i-try-to-connect-via-https-i-can-log-in-but-then-my-connection-is-redirected-back-to-http-what-can-cause-this-behavior">1.39 When I try to connect via https, I can log in, but then my connection is redirected back to http. What can cause this behavior?</a></li>
-<li><a class="reference internal" href="#when-accessing-phpmyadmin-via-an-apache-reverse-proxy-cookie-login-does-not-work">1.40 When accessing phpMyAdmin via an Apache reverse proxy, cookie login does not work.</a></li>
-<li><a class="reference internal" href="#when-i-view-a-database-and-ask-to-see-its-privileges-i-get-an-error-about-an-unknown-column">1.41 When I view a database and ask to see its privileges, I get an error about an unknown column.</a></li>
-<li><a class="reference internal" href="#how-can-i-prevent-robots-from-accessing-phpmyadmin">1.42 How can I prevent robots from accessing phpMyAdmin?</a></li>
-<li><a class="reference internal" href="#why-can-t-i-display-the-structure-of-my-table-containing-hundreds-of-columns">1.43 Why can&#8217;t I display the structure of my table containing hundreds of columns?</a></li>
-<li><a class="reference internal" href="#how-can-i-reduce-the-installed-size-of-phpmyadmin-on-disk">1.44 How can I reduce the installed size of phpMyAdmin on disk?</a></li>
-</ul>
-</li>
-<li><a class="reference internal" href="#configuration">Configuration</a><ul>
-<li><a class="reference internal" href="#the-error-message-warning-cannot-add-header-information-headers-already-sent-by-is-displayed-what-s-the-problem">2.1 The error message &#8220;Warning: Cannot add header information - headers already sent by ...&#8221; is displayed, what&#8217;s the problem?</a></li>
-<li><a class="reference internal" href="#phpmyadmin-can-t-connect-to-mysql-what-s-wrong">2.2 phpMyAdmin can&#8217;t connect to MySQL. What&#8217;s wrong?</a></li>
-<li><a class="reference internal" href="#the-error-message-warning-mysql-connection-failed-can-t-connect-to-local-mysql-server-through-socket-tmp-mysql-sock-111-is-displayed-what-can-i-do">2.3 The error message &#8220;Warning: MySQL Connection Failed: Can&#8217;t connect to local MySQL server through socket &#8216;/tmp/mysql.sock&#8217; (111) ...&#8221; is displayed. What can I do?</a></li>
-<li><a class="reference internal" href="#nothing-is-displayed-by-my-browser-when-i-try-to-run-phpmyadmin-what-can-i-do">2.4 Nothing is displayed by my browser when I try to run phpMyAdmin, what can I do?</a></li>
-<li><a class="reference internal" href="#each-time-i-want-to-insert-or-change-a-row-or-drop-a-database-or-a-table-an-error-404-page-not-found-is-displayed-or-with-http-or-cookie-authentication-i-m-asked-to-log-in-again-what-s-wrong">2.5 Each time I want to insert or change a row or drop a database or a table, an error 404 (page not found) is displayed or, with HTTP or cookie authentication, I&#8217;m asked to log in again. What&#8217;s wrong?</a></li>
-<li><a class="reference internal" href="#i-get-an-access-denied-for-user-root-localhost-using-password-yes-error-when-trying-to-access-a-mysql-server-on-a-host-which-is-port-forwarded-for-my-localhost">2.6 I get an &#8220;Access denied for user: &#8216;root&#64;localhost&#8216; (Using password: YES)&#8221;-error when trying to access a MySQL-Server on a host which is port-forwarded for my localhost.</a></li>
-<li><a class="reference internal" href="#using-and-creating-themes">2.7 Using and creating themes</a></li>
-<li><a class="reference internal" href="#i-get-missing-parameters-errors-what-can-i-do">2.8 I get &#8220;Missing parameters&#8221; errors, what can I do?</a></li>
-<li><a class="reference internal" href="#seeing-an-upload-progress-bar">2.9 Seeing an upload progress bar</a></li>
-</ul>
-</li>
-<li><a class="reference internal" href="#known-limitations">Known limitations</a><ul>
-<li><a class="reference internal" href="#when-using-http-authentication-a-user-who-logged-out-can-not-log-in-again-in-with-the-same-nick">3.1 When using HTTP authentication, a user who logged out can not log in again in with the same nick.</a></li>
-<li><a class="reference internal" href="#when-dumping-a-large-table-in-compressed-mode-i-get-a-memory-limit-error-or-a-time-limit-error">3.2 When dumping a large table in compressed mode, I get a memory limit error or a time limit error.</a></li>
-<li><a class="reference internal" href="#with-innodb-tables-i-lose-foreign-key-relationships-when-i-rename-a-table-or-a-column">3.3 With InnoDB tables, I lose foreign key relationships when I rename a table or a column.</a></li>
-<li><a class="reference internal" href="#i-am-unable-to-import-dumps-i-created-with-the-mysqldump-tool-bundled-with-the-mysql-server-distribution">3.4 I am unable to import dumps I created with the mysqldump tool bundled with the MySQL server distribution.</a></li>
-<li><a class="reference internal" href="#when-using-nested-folders-multiple-hierarchies-are-displayed-in-a-wrong-manner">3.5 When using nested folders, multiple hierarchies are displayed in a wrong manner.</a></li>
-<li><a class="reference internal" href="#faq3-6">3.6 (withdrawn).</a></li>
-<li><a class="reference internal" href="#i-have-table-with-many-100-columns-and-when-i-try-to-browse-table-i-get-series-of-errors-like-warning-unable-to-parse-url-how-can-this-be-fixed">3.7 I have table with many (100+) columns and when I try to browse table I get series of errors like &#8220;Warning: unable to parse url&#8221;. How can this be fixed?</a></li>
-<li><a class="reference internal" href="#i-cannot-use-clickable-html-forms-in-columns-where-i-put-a-mime-transformation-onto">3.8 I cannot use (clickable) HTML-forms in columns where I put a MIME-Transformation onto!</a></li>
-<li><a class="reference internal" href="#i-get-error-messages-when-using-sql-mode-ansi-for-the-mysql-server">3.9 I get error messages when using &#8220;&#8211;sql_mode=ANSI&#8221; for the MySQL server.</a></li>
-<li><a class="reference internal" href="#homonyms-and-no-primary-key-when-the-results-of-a-select-display-more-that-one-column-with-the-same-value-for-example-select-lastname-from-employees-where-firstname-like-a-and-two-smith-values-are-displayed-if-i-click-edit-i-cannot-be-sure-that-i-am-editing-the-intended-row">3.10 Homonyms and no primary key: When the results of a SELECT display more that one column with the same value (for example <code class="docutils literal"><span class="pre">SELECT</span> <span class="pre">lastname</span> <span class="pre">from</span> <span class="pre">employees</span> <span class="pre">where</span> <span class="pre">firstname</span> <span class="pre">like</span> <span class="pre">'A%'</span></code> and two &#8220;Smith&#8221; values are displayed), if I click Edit I cannot be sure that I am editing the intended row.</a></li>
-<li><a class="reference internal" href="#the-number-of-rows-for-innodb-tables-is-not-correct">3.11 The number of rows for InnoDB tables is not correct.</a></li>
-<li><a class="reference internal" href="#faq3-12">3.12 (withdrawn).</a></li>
-<li><a class="reference internal" href="#i-get-an-error-when-entering-use-followed-by-a-db-name-containing-an-hyphen">3.13 I get an error when entering <code class="docutils literal"><span class="pre">USE</span></code> followed by a db name containing an hyphen.</a></li>
-<li><a class="reference internal" href="#i-am-not-able-to-browse-a-table-when-i-don-t-have-the-right-to-select-one-of-the-columns">3.14 I am not able to browse a table when I don&#8217;t have the right to SELECT one of the columns.</a></li>
-<li><a class="reference internal" href="#faq3-15">3.15 (withdrawn).</a></li>
-<li><a class="reference internal" href="#faq3-16">3.16 (withdrawn).</a></li>
-<li><a class="reference internal" href="#faq3-17">3.17 (withdrawn).</a></li>
-<li><a class="reference internal" href="#when-i-import-a-csv-file-that-contains-multiple-tables-they-are-lumped-together-into-a-single-table">3.18 When I import a CSV file that contains multiple tables, they are lumped together into a single table.</a></li>
-<li><a class="reference internal" href="#when-i-import-a-file-and-have-phpmyadmin-determine-the-appropriate-data-structure-it-only-uses-int-decimal-and-varchar-types">3.19 When I import a file and have phpMyAdmin determine the appropriate data structure it only uses int, decimal, and varchar types.</a></li>
-<li><a class="reference internal" href="#after-upgrading-some-bookmarks-are-gone-or-their-content-cannot-be-shown">3.20 After upgrading, some bookmarks are gone or their content cannot be shown.</a></li>
-</ul>
-</li>
-<li><a class="reference internal" href="#isps-multi-user-installations">ISPs, multi-user installations</a><ul>
-<li><a class="reference internal" href="#i-m-an-isp-can-i-setup-one-central-copy-of-phpmyadmin-or-do-i-need-to-install-it-for-each-customer">4.1 I&#8217;m an ISP. Can I setup one central copy of phpMyAdmin or do I need to install it for each customer?</a></li>
-<li><a class="reference internal" href="#what-s-the-preferred-way-of-making-phpmyadmin-secure-against-evil-access">4.2 What&#8217;s the preferred way of making phpMyAdmin secure against evil access?</a></li>
-<li><a class="reference internal" href="#i-get-errors-about-not-being-able-to-include-a-file-in-lang-or-in-libraries">4.3 I get errors about not being able to include a file in <em>/lang</em> or in <em>/libraries</em>.</a></li>
-<li><a class="reference internal" href="#phpmyadmin-always-gives-access-denied-when-using-http-authentication">4.4 phpMyAdmin always gives &#8220;Access denied&#8221; when using HTTP authentication.</a></li>
-<li><a class="reference internal" href="#is-it-possible-to-let-users-create-their-own-databases">4.5 Is it possible to let users create their own databases?</a></li>
-<li><a class="reference internal" href="#how-can-i-use-the-host-based-authentication-additions">4.6 How can I use the Host-based authentication additions?</a></li>
-<li><a class="reference internal" href="#authentication-window-is-displayed-more-than-once-why">4.7 Authentication window is displayed more than once, why?</a></li>
-<li><a class="reference internal" href="#which-parameters-can-i-use-in-the-url-that-starts-phpmyadmin">4.8 Which parameters can I use in the URL that starts phpMyAdmin?</a></li>
-</ul>
-</li>
-<li><a class="reference internal" href="#browsers-or-client-os">Browsers or client OS</a><ul>
-<li><a class="reference internal" href="#i-get-an-out-of-memory-error-and-my-controls-are-non-functional-when-trying-to-create-a-table-with-more-than-14-columns">5.1 I get an out of memory error, and my controls are non-functional, when trying to create a table with more than 14 columns.</a></li>
-<li><a class="reference internal" href="#with-xitami-2-5b4-phpmyadmin-won-t-process-form-fields">5.2 With Xitami 2.5b4, phpMyAdmin won&#8217;t process form fields.</a></li>
-<li><a class="reference internal" href="#i-have-problems-dumping-tables-with-konqueror-phpmyadmin-2-2-2">5.3 I have problems dumping tables with Konqueror (phpMyAdmin 2.2.2).</a></li>
-<li><a class="reference internal" href="#i-can-t-use-the-cookie-authentication-mode-because-internet-explorer-never-stores-the-cookies">5.4 I can&#8217;t use the cookie authentication mode because Internet Explorer never stores the cookies.</a></li>
-<li><a class="reference internal" href="#in-internet-explorer-5-0-i-get-javascript-errors-when-browsing-my-rows">5.5 In Internet Explorer 5.0, I get JavaScript errors when browsing my rows.</a></li>
-<li><a class="reference internal" href="#in-internet-explorer-5-0-5-5-or-6-0-i-get-an-error-like-page-not-found-when-trying-to-modify-a-row-in-a-table-with-many-columns-or-with-a-text-column">5.6 In Internet Explorer 5.0, 5.5 or 6.0, I get an error (like &#8220;Page not found&#8221;) when trying to modify a row in a table with many columns, or with a text column.</a></li>
-<li><a class="reference internal" href="#i-refresh-reload-my-browser-and-come-back-to-the-welcome-page">5.7 I refresh (reload) my browser, and come back to the welcome page.</a></li>
-<li><a class="reference internal" href="#with-mozilla-0-9-7-i-have-problems-sending-a-query-modified-in-the-query-box">5.8 With Mozilla 0.9.7 I have problems sending a query modified in the query box.</a></li>
-<li><a class="reference internal" href="#with-mozilla-0-9-to-1-0-and-netscape-7-0-pr1-i-can-t-type-a-whitespace-in-the-sql-query-edit-area-the-page-scrolls-down">5.9 With Mozilla 0.9.? to 1.0 and Netscape 7.0-PR1 I can&#8217;t type a whitespace in the SQL-Query edit area: the page scrolls down.</a></li>
-<li><a class="reference internal" href="#with-netscape-4-75-i-get-empty-rows-between-each-row-of-data-in-a-csv-exported-file">5.10 With Netscape 4.75 I get empty rows between each row of data in a CSV exported file.</a></li>
-<li><a class="reference internal" href="#extended-ascii-characters-like-german-umlauts-are-displayed-wrong">5.11 Extended-ASCII characters like German umlauts are displayed wrong.</a></li>
-<li><a class="reference internal" href="#mac-os-x-safari-browser-changes-special-characters-to">5.12 Mac OS X Safari browser changes special characters to &#8221;?&#8221;.</a></li>
-<li><a class="reference internal" href="#with-internet-explorer-5-5-or-6-and-http-authentication-type-i-cannot-manage-two-servers-i-log-in-to-the-first-one-then-the-other-one-but-if-i-switch-back-to-the-first-i-have-to-log-in-on-each-operation">5.13 With Internet Explorer 5.5 or 6, and HTTP authentication type, I cannot manage two servers: I log in to the first one, then the other one, but if I switch back to the first, I have to log in on each operation.</a></li>
-<li><a class="reference internal" href="#using-opera6-i-can-manage-to-get-to-the-authentication-but-nothing-happens-after-that-only-a-blank-screen">5.14 Using Opera6, I can manage to get to the authentication, but nothing happens after that, only a blank screen.</a></li>
-<li><a class="reference internal" href="#i-have-display-problems-with-safari">5.15 I have display problems with Safari.</a></li>
-<li><a class="reference internal" href="#with-internet-explorer-i-get-access-is-denied-javascript-errors-or-i-cannot-make-phpmyadmin-work-under-windows">5.16 With Internet Explorer, I get &#8220;Access is denied&#8221; Javascript errors. Or I cannot make phpMyAdmin work under Windows.</a></li>
-<li><a class="reference internal" href="#with-firefox-i-cannot-delete-rows-of-data-or-drop-a-database">5.17 With Firefox, I cannot delete rows of data or drop a database.</a></li>
-<li><a class="reference internal" href="#with-konqueror-4-2-x-an-invalid-limit-clause-is-generated-when-i-browse-a-table">5.18 With Konqueror 4.2.x an invalid <code class="docutils literal"><span class="pre">LIMIT</span></code> clause is generated when I browse a table.</a></li>
-<li><a class="reference internal" href="#i-get-javascript-errors-in-my-browser">5.19 I get JavaScript errors in my browser.</a></li>
-</ul>
-</li>
-<li><a class="reference internal" href="#using-phpmyadmin">Using phpMyAdmin</a><ul>
-<li><a class="reference internal" href="#i-can-t-insert-new-rows-into-a-table-i-can-t-create-a-table-mysql-brings-up-a-sql-error">6.1 I can&#8217;t insert new rows into a table / I can&#8217;t create a table - MySQL brings up a SQL error.</a></li>
-<li><a class="reference internal" href="#when-i-create-a-table-i-set-an-index-for-two-columns-and-phpmyadmin-generates-only-one-index-with-those-two-columns">6.2 When I create a table, I set an index for two columns and phpMyAdmin generates only one index with those two columns.</a></li>
-<li><a class="reference internal" href="#how-can-i-insert-a-null-value-into-my-table">6.3 How can I insert a null value into my table?</a></li>
-<li><a class="reference internal" href="#how-can-i-backup-my-database-or-table">6.4 How can I backup my database or table?</a></li>
-<li><a class="reference internal" href="#how-can-i-restore-upload-my-database-or-table-using-a-dump-how-can-i-run-a-sql-file">6.5 How can I restore (upload) my database or table using a dump? How can I run a &#8221;.sql&#8221; file?</a></li>
-<li><a class="reference internal" href="#how-can-i-use-the-relation-table-in-query-by-example">6.6 How can I use the relation table in Query-by-example?</a></li>
-<li><a class="reference internal" href="#how-can-i-use-the-display-column-feature">6.7 How can I use the &#8220;display column&#8221; feature?</a></li>
-<li><a class="reference internal" href="#how-can-i-produce-a-pdf-schema-of-my-database">6.8 How can I produce a PDF schema of my database?</a></li>
-<li><a class="reference internal" href="#phpmyadmin-is-changing-the-type-of-one-of-my-columns">6.9 phpMyAdmin is changing the type of one of my columns!</a></li>
-<li><a class="reference internal" href="#when-creating-a-privilege-what-happens-with-underscores-in-the-database-name">6.10 When creating a privilege, what happens with underscores in the database name?</a></li>
-<li><a class="reference internal" href="#what-is-the-curious-symbol-o-in-the-statistics-pages">6.11 What is the curious symbol ø in the statistics pages?</a></li>
-<li><a class="reference internal" href="#i-want-to-understand-some-export-options">6.12 I want to understand some Export options.</a></li>
-<li><a class="reference internal" href="#i-would-like-to-create-a-database-with-a-dot-in-its-name">6.13 I would like to create a database with a dot in its name.</a></li>
-<li><a class="reference internal" href="#faqsqlvalidator">6.14 (withdrawn).</a></li>
-<li><a class="reference internal" href="#i-want-to-add-a-blob-column-and-put-an-index-on-it-but-mysql-says-blob-column-used-in-key-specification-without-a-key-length">6.15 I want to add a BLOB column and put an index on it, but MySQL says &#8220;BLOB column &#8216;...&#8217; used in key specification without a key length&#8221;.</a></li>
-<li><a class="reference internal" href="#how-can-i-simply-move-in-page-with-plenty-editing-fields">6.16 How can I simply move in page with plenty editing fields?</a></li>
-<li><a class="reference internal" href="#transformations-i-can-t-enter-my-own-mimetype-wtf-is-this-feature-then-useful-for">6.17 Transformations: I can&#8217;t enter my own mimetype! WTF is this feature then useful for?</a></li>
-<li><a class="reference internal" href="#bookmarks-where-can-i-store-bookmarks-why-can-t-i-see-any-bookmarks-below-the-query-box-what-are-these-variables-for">6.18 Bookmarks: Where can I store bookmarks? Why can&#8217;t I see any bookmarks below the query box? What are these variables for?</a></li>
-<li><a class="reference internal" href="#how-can-i-create-simple-latex-document-to-include-exported-table">6.19 How can I create simple LATEX document to include exported table?</a></li>
-<li><a class="reference internal" href="#i-see-a-lot-of-databases-which-are-not-mine-and-cannot-access-them">6.20 I see a lot of databases which are not mine, and cannot access them.</a></li>
-<li><a class="reference internal" href="#in-edit-insert-mode-how-can-i-see-a-list-of-possible-values-for-a-column-based-on-some-foreign-table">6.21 In edit/insert mode, how can I see a list of possible values for a column, based on some foreign table?</a></li>
-<li><a class="reference internal" href="#bookmarks-can-i-execute-a-default-bookmark-automatically-when-entering-browse-mode-for-a-table">6.22 Bookmarks: Can I execute a default bookmark automatically when entering Browse mode for a table?</a></li>
-<li><a class="reference internal" href="#export-i-heard-phpmyadmin-can-export-microsoft-excel-files">6.23 Export: I heard phpMyAdmin can export Microsoft Excel files?</a></li>
-<li><a class="reference internal" href="#now-that-phpmyadmin-supports-native-mysql-4-1-x-column-comments-what-happens-to-my-column-comments-stored-in-pmadb">6.24 Now that phpMyAdmin supports native MySQL 4.1.x column comments, what happens to my column comments stored in pmadb?</a></li>
-<li><a class="reference internal" href="#faq6-25">6.25 (withdrawn).</a></li>
-<li><a class="reference internal" href="#how-can-i-select-a-range-of-rows">6.26 How can I select a range of rows?</a></li>
-<li><a class="reference internal" href="#what-format-strings-can-i-use">6.27 What format strings can I use?</a></li>
-<li><a class="reference internal" href="#how-can-i-easily-edit-relational-schema-for-export">6.28 How can I easily edit relational schema for export?</a></li>
-<li><a class="reference internal" href="#why-can-t-i-get-a-chart-from-my-query-result-table">6.29 Why can&#8217;t I get a chart from my query result table?</a></li>
-<li><a class="reference internal" href="#import-how-can-i-import-esri-shapefiles">6.30 Import: How can I import ESRI Shapefiles?</a></li>
-<li><a class="reference internal" href="#how-do-i-create-a-relation-in-designer">6.31 How do I create a relation in designer?</a></li>
-<li><a class="reference internal" href="#how-can-i-use-the-zoom-search-feature">6.32 How can I use the zoom search feature?</a></li>
-<li><a class="reference internal" href="#when-browsing-a-table-how-can-i-copy-a-column-name">6.33 When browsing a table, how can I copy a column name?</a></li>
-<li><a class="reference internal" href="#how-can-i-use-the-favorite-tables-feature">6.34 How can I use the Favorite Tables feature?</a></li>
-<li><a class="reference internal" href="#how-can-i-use-the-range-search-feature">6.35 How can I use the Range search feature?</a></li>
-<li><a class="reference internal" href="#what-is-central-columns-and-how-can-i-use-this-feature">6.36 What is Central columns and How can I use this feature?</a></li>
-<li><a class="reference internal" href="#how-can-i-use-improve-table-structure-feature">6.37 How can I use Improve Table structure feature?</a></li>
-<li><a class="reference internal" href="#how-can-i-reassign-auto-incremented-values">6.38 How can I reassign auto-incremented values?</a></li>
-<li><a class="reference internal" href="#what-is-the-adjust-privileges-option-when-renaming-copying-or-moving-a-database-table-column-or-procedure">6.39 What is the &#8220;Adjust privileges&#8221; option when renaming, copying, or moving a database, table, column, or procedure?</a></li>
-<li><a class="reference internal" href="#i-see-bind-parameters-checkbox-in-the-sql-page-how-do-i-write-parameterized-sql-queries">6.40 I see &#8220;Bind parameters&#8221; checkbox in the &#8220;SQL&#8221; page. How do I write parameterized SQL queries?</a></li>
-<li><a class="reference internal" href="#i-get-import-errors-while-importing-the-dumps-exported-from-older-mysql-versions-pre-5-7-6-into-newer-mysql-versions-5-7-7-but-they-work-fine-when-imported-back-on-same-older-versions">6.41 I get import errors while importing the dumps exported from older MySQL versions (pre-5.7.6) into newer MySQL versions (5.7.7+), but they work fine when imported back on same older versions ?</a></li>
-</ul>
-</li>
-<li><a class="reference internal" href="#phpmyadmin-project">phpMyAdmin project</a><ul>
-<li><a class="reference internal" href="#i-have-found-a-bug-how-do-i-inform-developers">7.1 I have found a bug. How do I inform developers?</a></li>
-<li><a class="reference internal" href="#i-want-to-translate-the-messages-to-a-new-language-or-upgrade-an-existing-language-where-do-i-start">7.2 I want to translate the messages to a new language or upgrade an existing language, where do I start?</a></li>
-<li><a class="reference internal" href="#i-would-like-to-help-out-with-the-development-of-phpmyadmin-how-should-i-proceed">7.3 I would like to help out with the development of phpMyAdmin. How should I proceed?</a></li>
-</ul>
-</li>
-<li><a class="reference internal" href="#security">Security</a><ul>
-<li><a class="reference internal" href="#where-can-i-get-information-about-the-security-alerts-issued-for-phpmyadmin">8.1 Where can I get information about the security alerts issued for phpMyAdmin?</a></li>
-<li><a class="reference internal" href="#how-can-i-protect-phpmyadmin-against-brute-force-attacks">8.2 How can I protect phpMyAdmin against brute force attacks?</a></li>
-<li><a class="reference internal" href="#why-are-there-path-disclosures-when-directly-loading-certain-files">8.3 Why are there path disclosures when directly loading certain files?</a></li>
-</ul>
-</li>
-<li><a class="reference internal" href="#synchronization">Synchronization</a><ul>
-<li><a class="reference internal" href="#faq9-1">9.1 (withdrawn).</a></li>
-<li><a class="reference internal" href="#faq9-2">9.2 (withdrawn).</a></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-
-  <h4>Previous topic</h4>
-  <p class="topless"><a href="import_export.html"
-                        title="previous chapter">Import and export</a></p>
-  <h4>Next topic</h4>
-  <p class="topless"><a href="developers.html"
-                        title="next chapter">Developers Information</a></p>
-  <div role="note" aria-label="source link">
-    <h3>This Page</h3>
-    <ul class="this-page-menu">
-      <li><a href="_sources/faq.txt"
-            rel="nofollow">Show Source</a></li>
-    </ul>
-   </div>
-<div id="searchbox" style="display: none" role="search">
-  <h3>Quick search</h3>
-    <form class="search" action="search.html" method="get">
-      <div><input type="text" name="q" /></div>
-      <div><input type="submit" value="Go" /></div>
-      <input type="hidden" name="check_keywords" value="yes" />
-      <input type="hidden" name="area" value="default" />
-    </form>
-</div>
-<script type="text/javascript">$('#searchbox').show(0);</script>
-        </div>
-      </div>
-      <div class="clearer"></div>
-    </div>
-    <div class="related" role="navigation" aria-label="related navigation">
-      <h3>Navigation</h3>
-      <ul>
-        <li class="right" style="margin-right: 10px">
-          <a href="genindex.html" title="General Index"
-             >index</a></li>
-        <li class="right" >
-          <a href="developers.html" title="Developers Information"
-             >next</a> |</li>
-        <li class="right" >
-          <a href="import_export.html" title="Import and export"
-             >previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">phpMyAdmin 4.6.5.2 documentation</a> &#187;</li> 
-      </ul>
-    </div>
-    <div class="footer" role="contentinfo">
-        &#169; <a href="copyright.html">Copyright</a> 2012 - 2016, The phpMyAdmin devel team.
-      Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.4.6.
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/#pma/doc/html/genindex.html b/#pma/doc/html/genindex.html
deleted file mode 100644
index b501f565..00000000
--- a/#pma/doc/html/genindex.html
+++ /dev/null
@@ -1,3821 +0,0 @@
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    
-    <title>Index &#8212; phpMyAdmin 4.6.5.2 documentation</title>
-    
-    <link rel="stylesheet" href="_static/classic.css" type="text/css" />
-    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
-    
-    <script type="text/javascript">
-      var DOCUMENTATION_OPTIONS = {
-        URL_ROOT:    './',
-        VERSION:     '4.6.5.2',
-        COLLAPSE_INDEX: false,
-        FILE_SUFFIX: '.html',
-        HAS_SOURCE:  true
-      };
-    </script>
-    <script type="text/javascript" src="_static/jquery.js"></script>
-    <script type="text/javascript" src="_static/underscore.js"></script>
-    <script type="text/javascript" src="_static/doctools.js"></script>
-    <link rel="copyright" title="Copyright" href="copyright.html" />
-    <link rel="top" title="phpMyAdmin 4.6.5.2 documentation" href="index.html" /> 
-  </head>
-  <body role="document">
-    <div class="related" role="navigation" aria-label="related navigation">
-      <h3>Navigation</h3>
-      <ul>
-        <li class="right" style="margin-right: 10px">
-          <a href="#" title="General Index"
-             accesskey="I">index</a></li>
-        <li class="nav-item nav-item-0"><a href="index.html">phpMyAdmin 4.6.5.2 documentation</a> &#187;</li> 
-      </ul>
-    </div>  
-
-    <div class="document">
-      <div class="documentwrapper">
-        <div class="bodywrapper">
-          <div class="body" role="main">
-            
-
-<h1 id="index">Index</h1>
-
-<div class="genindex-jumpbox">
- <a href="#Symbols"><strong>Symbols</strong></a>
- | <a href="#A"><strong>A</strong></a>
- | <a href="#B"><strong>B</strong></a>
- | <a href="#C"><strong>C</strong></a>
- | <a href="#D"><strong>D</strong></a>
- | <a href="#E"><strong>E</strong></a>
- | <a href="#F"><strong>F</strong></a>
- | <a href="#G"><strong>G</strong></a>
- | <a href="#H"><strong>H</strong></a>
- | <a href="#I"><strong>I</strong></a>
- | <a href="#J"><strong>J</strong></a>
- | <a href="#K"><strong>K</strong></a>
- | <a href="#L"><strong>L</strong></a>
- | <a href="#M"><strong>M</strong></a>
- | <a href="#N"><strong>N</strong></a>
- | <a href="#O"><strong>O</strong></a>
- | <a href="#P"><strong>P</strong></a>
- | <a href="#Q"><strong>Q</strong></a>
- | <a href="#R"><strong>R</strong></a>
- | <a href="#S"><strong>S</strong></a>
- | <a href="#T"><strong>T</strong></a>
- | <a href="#U"><strong>U</strong></a>
- | <a href="#V"><strong>V</strong></a>
- | <a href="#W"><strong>W</strong></a>
- | <a href="#X"><strong>X</strong></a>
- | <a href="#Z"><strong>Z</strong></a>
- 
-</div>
-<h2 id="Symbols">Symbols</h2>
-<table style="width: 100%" class="indextable genindextable"><tr>
-  <td style="width: 33%" valign="top"><dl>
-      
-  <dt><a href="config.html#cfg_ActionLinksMode"><strong>$cfg[&#39;ActionLinksMode&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#index-71"><strong>$cfg[&#39;AllowArbitraryServer&#39;]</strong></a>, <a href="setup.html#index-0"><strong>[1]</strong></a>, <a href="setup.html#index-14"><strong>[2]</strong></a>, <a href="config.html#cfg_AllowArbitraryServer"><strong>[3]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_AllowThirdPartyFraming"><strong>$cfg[&#39;AllowThirdPartyFraming&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_AllowUserDropDatabase"><strong>$cfg[&#39;AllowUserDropDatabase&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#index-70"><strong>$cfg[&#39;ArbitraryServerRegexp&#39;]</strong></a>, <a href="config.html#cfg_ArbitraryServerRegexp"><strong>[1]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_AvailableCharsets"><strong>$cfg[&#39;AvailableCharsets&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#index-68"><strong>$cfg[&#39;blowfish_secret&#39;]</strong></a>, <a href="config.html#cfg_blowfish_secret"><strong>[1]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_BrowseMarkerEnable"><strong>$cfg[&#39;BrowseMarkerEnable&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_BrowseMIME"><strong>$cfg[&#39;BrowseMIME&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_BrowsePointerEnable"><strong>$cfg[&#39;BrowsePointerEnable&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_BZipDump"><strong>$cfg[&#39;BZipDump&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="setup.html#index-31"><strong>$cfg[&#39;CaptchaLoginPrivateKey&#39;]</strong></a>, <a href="config.html#cfg_CaptchaLoginPrivateKey"><strong>[1]</strong></a>
-  </dt>
-
-      
-  <dt><a href="setup.html#index-30"><strong>$cfg[&#39;CaptchaLoginPublicKey&#39;]</strong></a>, <a href="config.html#cfg_CaptchaLoginPublicKey"><strong>[1]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#index-81"><strong>$cfg[&#39;CharEditing&#39;]</strong></a>, <a href="config.html#cfg_CharEditing"><strong>[1]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_CharTextareaCols"><strong>$cfg[&#39;CharTextareaCols&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_CharTextareaRows"><strong>$cfg[&#39;CharTextareaRows&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_CheckConfigurationPermissions"><strong>$cfg[&#39;CheckConfigurationPermissions&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_CodemirrorEnable"><strong>$cfg[&#39;CodemirrorEnable&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="faq.html#index-18"><strong>$cfg[&#39;CompressOnFly&#39;]</strong></a>, <a href="config.html#cfg_CompressOnFly"><strong>[1]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Confirm"><strong>$cfg[&#39;Confirm&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_ConsoleEnterExecutes"><strong>$cfg[&#39;ConsoleEnterExecutes&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_CSPAllow"><strong>$cfg[&#39;CSPAllow&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_DBG"><strong>$cfg[&#39;DBG&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_DBG_demo"><strong>$cfg[&#39;DBG&#39;][&#39;demo&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_DBG_sql"><strong>$cfg[&#39;DBG&#39;][&#39;sql&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_DefaultConnectionCollation"><strong>$cfg[&#39;DefaultConnectionCollation&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_DefaultForeignKeyChecks"><strong>$cfg[&#39;DefaultForeignKeyChecks&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_DefaultFunctions"><strong>$cfg[&#39;DefaultFunctions&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_DefaultLang"><strong>$cfg[&#39;DefaultLang&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_DefaultQueryDatabase"><strong>$cfg[&#39;DefaultQueryDatabase&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_DefaultQueryTable"><strong>$cfg[&#39;DefaultQueryTable&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_DefaultTabDatabase"><strong>$cfg[&#39;DefaultTabDatabase&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_DefaultTabServer"><strong>$cfg[&#39;DefaultTabServer&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_DefaultTabTable"><strong>$cfg[&#39;DefaultTabTable&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_DisableMultiTableMaintenance"><strong>$cfg[&#39;DisableMultiTableMaintenance&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_DisplayServersList"><strong>$cfg[&#39;DisplayServersList&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_EnableAutocompleteForTablesAndColumns"><strong>$cfg[&#39;EnableAutocompleteForTablesAndColumns&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="faq.html#index-26"><strong>$cfg[&#39;ExecTimeLimit&#39;]</strong></a>, <a href="config.html#cfg_ExecTimeLimit"><strong>[1]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Export"><strong>$cfg[&#39;Export&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#index-77"><strong>$cfg[&#39;Export&#39;][&#39;charset&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Export_method"><strong>$cfg[&#39;Export&#39;][&#39;method&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_FilterLanguages"><strong>$cfg[&#39;FilterLanguages&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_FirstLevelNavigationItems"><strong>$cfg[&#39;FirstLevelNavigationItems&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_ForceSSL"><strong>$cfg[&#39;ForceSSL&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#index-75"><strong>$cfg[&#39;ForeignKeyDropdownOrder&#39;]</strong></a>, <a href="config.html#cfg_ForeignKeyDropdownOrder"><strong>[1]</strong></a>
-  </dt>
-
-      
-  <dt><a href="faq.html#index-27"><strong>$cfg[&#39;ForeignKeyMaxLimit&#39;]</strong></a>, <a href="config.html#cfg_ForeignKeyMaxLimit"><strong>[1]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_GD2Available"><strong>$cfg[&#39;GD2Available&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_GridEditing"><strong>$cfg[&#39;GridEditing&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_GZipDump"><strong>$cfg[&#39;GZipDump&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_HideStructureActions"><strong>$cfg[&#39;HideStructureActions&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_IconvExtraParams"><strong>$cfg[&#39;IconvExtraParams&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_IgnoreMultiSubmitErrors"><strong>$cfg[&#39;IgnoreMultiSubmitErrors&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Import"><strong>$cfg[&#39;Import&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#index-78"><strong>$cfg[&#39;Import&#39;][&#39;charset&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_InitialSlidersState"><strong>$cfg[&#39;InitialSlidersState&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_InsertRows"><strong>$cfg[&#39;InsertRows&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Lang"><strong>$cfg[&#39;Lang&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_LimitChars"><strong>$cfg[&#39;LimitChars&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_LinkLengthLimit"><strong>$cfg[&#39;LinkLengthLimit&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_LoginCookieDeleteAll"><strong>$cfg[&#39;LoginCookieDeleteAll&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_LoginCookieRecall"><strong>$cfg[&#39;LoginCookieRecall&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_LoginCookieStore"><strong>$cfg[&#39;LoginCookieStore&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#index-69"><strong>$cfg[&#39;LoginCookieValidity&#39;]</strong></a>, <a href="config.html#cfg_LoginCookieValidity"><strong>[1]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_LoginCookieValidityDisableWarning"><strong>$cfg[&#39;LoginCookieValidityDisableWarning&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_LongtextDoubleTextarea"><strong>$cfg[&#39;LongtextDoubleTextarea&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_MaxCharactersInDisplayedSQL"><strong>$cfg[&#39;MaxCharactersInDisplayedSQL&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_MaxDbList"><strong>$cfg[&#39;MaxDbList&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="faq.html#index-20"><strong>$cfg[&#39;MaxExactCount&#39;]</strong></a>, <a href="config.html#cfg_MaxExactCount"><strong>[1]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_MaxExactCountViews"><strong>$cfg[&#39;MaxExactCountViews&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_MaxNavigationItems"><strong>$cfg[&#39;MaxNavigationItems&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_MaxRows"><strong>$cfg[&#39;MaxRows&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_MaxSizeForInputField"><strong>$cfg[&#39;MaxSizeForInputField&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_MaxTableList"><strong>$cfg[&#39;MaxTableList&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_MemoryLimit"><strong>$cfg[&#39;MemoryLimit&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_MinSizeForInputField"><strong>$cfg[&#39;MinSizeForInputField&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_MysqlMinVersion"><strong>$cfg[&#39;MysqlMinVersion&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_NaturalOrder"><strong>$cfg[&#39;NaturalOrder&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_NavigationDisplayLogo"><strong>$cfg[&#39;NavigationDisplayLogo&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_NavigationDisplayServers"><strong>$cfg[&#39;NavigationDisplayServers&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_NavigationLinkWithMainPanel"><strong>$cfg[&#39;NavigationLinkWithMainPanel&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_NavigationLogoLink"><strong>$cfg[&#39;NavigationLogoLink&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_NavigationLogoLinkWindow"><strong>$cfg[&#39;NavigationLogoLinkWindow&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#index-72"><strong>$cfg[&#39;NavigationTreeDbSeparator&#39;]</strong></a>, <a href="config.html#cfg_NavigationTreeDbSeparator"><strong>[1]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#index-31"><strong>$cfg[&#39;NavigationTreeDefaultTabTable&#39;]</strong></a>, <a href="config.html#index-34"><strong>[1]</strong></a>, <a href="config.html#cfg_NavigationTreeDefaultTabTable"><strong>[2]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_NavigationTreeDefaultTabTable2"><strong>$cfg[&#39;NavigationTreeDefaultTabTable2&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_NavigationTreeDisplayDbFilterMinimum"><strong>$cfg[&#39;NavigationTreeDisplayDbFilterMinimum&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_NavigationTreeDisplayItemFilterMinimum"><strong>$cfg[&#39;NavigationTreeDisplayItemFilterMinimum&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_NavigationTreeEnableExpansion"><strong>$cfg[&#39;NavigationTreeEnableExpansion&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_NavigationTreeEnableGrouping"><strong>$cfg[&#39;NavigationTreeEnableGrouping&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_NavigationTreePointerEnable"><strong>$cfg[&#39;NavigationTreePointerEnable&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_NavigationTreeShowEvents"><strong>$cfg[&#39;NavigationTreeShowEvents&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_NavigationTreeShowFunctions"><strong>$cfg[&#39;NavigationTreeShowFunctions&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_NavigationTreeShowProcedures"><strong>$cfg[&#39;NavigationTreeShowProcedures&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_NavigationTreeShowTables"><strong>$cfg[&#39;NavigationTreeShowTables&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_NavigationTreeShowViews"><strong>$cfg[&#39;NavigationTreeShowViews&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_NavigationTreeTableLevel"><strong>$cfg[&#39;NavigationTreeTableLevel&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="faq.html#index-19"><strong>$cfg[&#39;NavigationTreeTableSeparator&#39;]</strong></a>, <a href="config.html#cfg_NavigationTreeTableSeparator"><strong>[1]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#index-35"><strong>$cfg[&#39;NumFavoriteTables&#39;]</strong></a>, <a href="faq.html#index-31"><strong>[1]</strong></a>, <a href="config.html#cfg_NumFavoriteTables"><strong>[2]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#index-30"><strong>$cfg[&#39;NumRecentTables&#39;]</strong></a>, <a href="config.html#cfg_NumRecentTables"><strong>[1]</strong></a>
-  </dt>
-
-      
-  <dt><a href="faq.html#index-0"><strong>$cfg[&#39;OBGzip&#39;]</strong></a>, <a href="faq.html#index-3"><strong>[1]</strong></a>, <a href="faq.html#index-8"><strong>[2]</strong></a>, <a href="config.html#cfg_OBGzip"><strong>[3]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Order"><strong>$cfg[&#39;Order&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_PDFDefaultPageSize"><strong>$cfg[&#39;PDFDefaultPageSize&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#index-76"><strong>$cfg[&#39;PDFPageSizes&#39;]</strong></a>, <a href="config.html#cfg_PDFPageSizes"><strong>[1]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_PersistentConnections"><strong>$cfg[&#39;PersistentConnections&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#index-1"><strong>$cfg[&#39;PmaAbsoluteUri&#39;]</strong></a>, <a href="config.html#index-67"><strong>[1]</strong></a>, <a href="faq.html#index-16"><strong>[2]</strong></a>, <a href="faq.html#index-24"><strong>[3]</strong></a>, <a href="faq.html#index-25"><strong>[4]</strong></a>, <a href="faq.html#index-6"><strong>[5]</strong></a>, <a href="faq.html#index-9"><strong>[6]</strong></a>, <a href="config.html#cfg_PmaAbsoluteUri"><strong>[7]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_PmaNoRelation_DisableWarning"><strong>$cfg[&#39;PmaNoRelation_DisableWarning&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_PropertiesNumColumns"><strong>$cfg[&#39;PropertiesNumColumns&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_ProtectBinary"><strong>$cfg[&#39;ProtectBinary&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_ProxyPass"><strong>$cfg[&#39;ProxyPass&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_ProxyUrl"><strong>$cfg[&#39;ProxyUrl&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_ProxyUser"><strong>$cfg[&#39;ProxyUser&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#index-82"><strong>$cfg[&#39;QueryHistoryDB&#39;]</strong></a>, <a href="config.html#index-84"><strong>[1]</strong></a>, <a href="config.html#cfg_QueryHistoryDB"><strong>[2]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#index-27"><strong>$cfg[&#39;QueryHistoryMax&#39;]</strong></a>, <a href="config.html#index-85"><strong>[1]</strong></a>, <a href="config.html#cfg_QueryHistoryMax"><strong>[2]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_RecodingEngine"><strong>$cfg[&#39;RecodingEngine&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_RelationalDisplay"><strong>$cfg[&#39;RelationalDisplay&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#index-38"><strong>$cfg[&#39;RememberSorting&#39;]</strong></a>, <a href="config.html#cfg_RememberSorting"><strong>[1]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_RepeatCells"><strong>$cfg[&#39;RepeatCells&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_ReservedWordDisableWarning"><strong>$cfg[&#39;ReservedWordDisableWarning&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_RetainQueryBox"><strong>$cfg[&#39;RetainQueryBox&#39;]</strong></a>
-  </dt>
-
-  </dl></td>
-  <td style="width: 33%" valign="top"><dl>
-      
-  <dt><a href="config.html#cfg_RowActionLinks"><strong>$cfg[&#39;RowActionLinks&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_RowActionLinksWithoutUnique"><strong>$cfg[&#39;RowActionLinksWithoutUnique&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_RowActionType"><strong>$cfg[&#39;RowActionType&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_SaveCellsAtOnce"><strong>$cfg[&#39;SaveCellsAtOnce&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_SaveDir"><strong>$cfg[&#39;SaveDir&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_SendErrorReports"><strong>$cfg[&#39;SendErrorReports&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#index-65"><strong>$cfg[&#39;ServerDefault&#39;]</strong></a>, <a href="config.html#index-66"><strong>[1]</strong></a>, <a href="config.html#cfg_ServerDefault"><strong>[2]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_ServerLibraryDifference_DisableWarning"><strong>$cfg[&#39;ServerLibraryDifference_DisableWarning&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#index-4"><strong>$cfg[&#39;Servers&#39;]</strong></a>, <a href="config.html#index-7"><strong>[1]</strong></a>, <a href="setup.html#index-11"><strong>[2]</strong></a>, <a href="config.html#cfg_Servers"><strong>[3]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#index-79"><strong>$cfg[&#39;Servers&#39;][$i][&#39;AllowDeny&#39;][&#39;order&#39;]</strong></a>, <a href="setup.html#index-27"><strong>[1]</strong></a>, <a href="config.html#cfg_Servers_AllowDeny_order"><strong>[2]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#index-62"><strong>$cfg[&#39;Servers&#39;][$i][&#39;AllowDeny&#39;][&#39;rules&#39;]</strong></a>, <a href="config.html#index-80"><strong>[1]</strong></a>, <a href="faq.html#index-23"><strong>[2]</strong></a>, <a href="setup.html#index-28"><strong>[3]</strong></a>, <a href="setup.html#index-29"><strong>[4]</strong></a>, <a href="config.html#cfg_Servers_AllowDeny_rules"><strong>[5]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_AllowNoPassword"><strong>$cfg[&#39;Servers&#39;][$i][&#39;AllowNoPassword&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_AllowRoot"><strong>$cfg[&#39;Servers&#39;][$i][&#39;AllowRoot&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_auth_http_realm"><strong>$cfg[&#39;Servers&#39;][$i][&#39;auth_http_realm&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#index-12"><strong>$cfg[&#39;Servers&#39;][$i][&#39;auth_type&#39;]</strong></a>, <a href="setup.html#index-20"><strong>[1]</strong></a>, <a href="config.html#cfg_Servers_auth_type"><strong>[2]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#index-15"><strong>$cfg[&#39;Servers&#39;][$i][&#39;bookmarktable&#39;]</strong></a>, <a href="config.html#cfg_Servers_bookmarktable"><strong>[1]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#index-47"><strong>$cfg[&#39;Servers&#39;][$i][&#39;central_columns&#39;]</strong></a>, <a href="config.html#cfg_Servers_central_columns"><strong>[1]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#index-25"><strong>$cfg[&#39;Servers&#39;][$i][&#39;column_comments&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#index-24"><strong>$cfg[&#39;Servers&#39;][$i][&#39;column_info&#39;]</strong></a>, <a href="config.html#index-26"><strong>[1]</strong></a>, <a href="config.html#cfg_Servers_column_info"><strong>[2]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_compress"><strong>$cfg[&#39;Servers&#39;][$i][&#39;compress&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_connect_type"><strong>$cfg[&#39;Servers&#39;][$i][&#39;connect_type&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_controlhost"><strong>$cfg[&#39;Servers&#39;][$i][&#39;controlhost&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="faq.html#index-22"><strong>$cfg[&#39;Servers&#39;][$i][&#39;controlpass&#39;]</strong></a>, <a href="setup.html#index-8"><strong>[1]</strong></a>, <a href="config.html#cfg_Servers_controlpass"><strong>[2]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_controlport"><strong>$cfg[&#39;Servers&#39;][$i][&#39;controlport&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="faq.html#index-21"><strong>$cfg[&#39;Servers&#39;][$i][&#39;controluser&#39;]</strong></a>, <a href="setup.html#index-10"><strong>[1]</strong></a>, <a href="setup.html#index-7"><strong>[2]</strong></a>, <a href="config.html#cfg_Servers_controluser"><strong>[3]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#index-49"><strong>$cfg[&#39;Servers&#39;][$i][&#39;designer_settings&#39;]</strong></a>, <a href="config.html#cfg_Servers_designer_settings"><strong>[1]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_DisableIS"><strong>$cfg[&#39;Servers&#39;][$i][&#39;DisableIS&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#index-53"><strong>$cfg[&#39;Servers&#39;][$i][&#39;export_templates&#39;]</strong></a>, <a href="config.html#cfg_Servers_export_templates"><strong>[1]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#index-37"><strong>$cfg[&#39;Servers&#39;][$i][&#39;favorite&#39;]</strong></a>, <a href="config.html#cfg_Servers_favorite"><strong>[1]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_hide_db"><strong>$cfg[&#39;Servers&#39;][$i][&#39;hide_db&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#index-29"><strong>$cfg[&#39;Servers&#39;][$i][&#39;history&#39;]</strong></a>, <a href="config.html#index-83"><strong>[1]</strong></a>, <a href="config.html#cfg_Servers_history"><strong>[2]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#index-11"><strong>$cfg[&#39;Servers&#39;][$i][&#39;host&#39;]</strong></a>, <a href="config.html#index-5"><strong>[1]</strong></a>, <a href="config.html#index-6"><strong>[2]</strong></a>, <a href="config.html#index-8"><strong>[3]</strong></a>, <a href="config.html#cfg_Servers_host"><strong>[4]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_LogoutURL"><strong>$cfg[&#39;Servers&#39;][$i][&#39;LogoutURL&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_MaxTableUiprefs"><strong>$cfg[&#39;Servers&#39;][$i][&#39;MaxTableUiprefs&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#index-45"><strong>$cfg[&#39;Servers&#39;][$i][&#39;navigationhiding&#39;]</strong></a>, <a href="config.html#cfg_Servers_navigationhiding"><strong>[1]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_nopassword"><strong>$cfg[&#39;Servers&#39;][$i][&#39;nopassword&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_only_db"><strong>$cfg[&#39;Servers&#39;][$i][&#39;only_db&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="setup.html#index-26"><strong>$cfg[&#39;Servers&#39;][$i][&#39;password&#39;]</strong></a>, <a href="config.html#cfg_Servers_password"><strong>[1]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#index-22"><strong>$cfg[&#39;Servers&#39;][$i][&#39;pdf_pages&#39;]</strong></a>, <a href="config.html#cfg_Servers_pdf_pages"><strong>[1]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#index-13"><strong>$cfg[&#39;Servers&#39;][$i][&#39;pmadb&#39;]</strong></a>, <a href="config.html#index-14"><strong>[1]</strong></a>, <a href="config.html#index-16"><strong>[2]</strong></a>, <a href="config.html#index-18"><strong>[3]</strong></a>, <a href="config.html#index-2"><strong>[4]</strong></a>, <a href="config.html#index-20"><strong>[5]</strong></a>, <a href="config.html#index-23"><strong>[6]</strong></a>, <a href="config.html#index-28"><strong>[7]</strong></a>, <a href="config.html#index-32"><strong>[8]</strong></a>, <a href="config.html#index-36"><strong>[9]</strong></a>, <a href="config.html#index-39"><strong>[10]</strong></a>, <a href="config.html#index-41"><strong>[11]</strong></a>, <a href="config.html#index-44"><strong>[12]</strong></a>, <a href="config.html#index-46"><strong>[13]</strong></a>, <a href="config.html#index-48"><strong>[14]</strong></a>, <a href="config.html#index-50"><strong>[15]</strong></a>, <a href="config.html#index-52"><strong>[16]</strong></a>, <a href="config.html#index-54"><strong>[17]</strong></a>, <a href="config.html#index-56"><strong>[18]</strong></a>, <a href="config.html#index-57"><strong>[19]</strong></a>, <a href="config.html#index-73"><strong>[20]</strong></a>, <a href="config.html#index-9"><strong>[21]</strong></a>, <a href="config.html#cfg_Servers_pmadb"><strong>[22]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_port"><strong>$cfg[&#39;Servers&#39;][$i][&#39;port&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#index-33"><strong>$cfg[&#39;Servers&#39;][$i][&#39;recent&#39;]</strong></a>, <a href="config.html#cfg_Servers_recent"><strong>[1]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#index-17"><strong>$cfg[&#39;Servers&#39;][$i][&#39;relation&#39;]</strong></a>, <a href="config.html#cfg_Servers_relation"><strong>[1]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#index-51"><strong>$cfg[&#39;Servers&#39;][$i][&#39;savedsearches&#39;]</strong></a>, <a href="config.html#cfg_Servers_savedsearches"><strong>[1]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_SessionTimeZone"><strong>$cfg[&#39;Servers&#39;][$i][&#39;SessionTimeZone&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#index-64"><strong>$cfg[&#39;Servers&#39;][$i][&#39;SignonScript&#39;]</strong></a>, <a href="setup.html#index-17"><strong>[1]</strong></a>, <a href="setup.html#index-19"><strong>[2]</strong></a>, <a href="setup.html#index-22"><strong>[3]</strong></a>, <a href="config.html#cfg_Servers_SignonScript"><strong>[4]</strong></a>
-  </dt>
-
-      
-  <dt><a href="setup.html#index-16"><strong>$cfg[&#39;Servers&#39;][$i][&#39;SignonSession&#39;]</strong></a>, <a href="setup.html#index-21"><strong>[1]</strong></a>, <a href="config.html#cfg_Servers_SignonSession"><strong>[2]</strong></a>
-  </dt>
-
-      
-  <dt><a href="setup.html#index-18"><strong>$cfg[&#39;Servers&#39;][$i][&#39;SignonURL&#39;]</strong></a>, <a href="setup.html#index-23"><strong>[1]</strong></a>, <a href="config.html#cfg_Servers_SignonURL"><strong>[2]</strong></a>
-  </dt>
-
-      
-  <dt><a href="faq.html#index-7"><strong>$cfg[&#39;Servers&#39;][$i][&#39;socket&#39;]</strong></a>, <a href="config.html#cfg_Servers_socket"><strong>[1]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#index-87"><strong>$cfg[&#39;Servers&#39;][$i][&#39;ssl&#39;]</strong></a>, <a href="config.html#cfg_Servers_ssl"><strong>[1]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#index-90"><strong>$cfg[&#39;Servers&#39;][$i][&#39;ssl_ca&#39;]</strong></a>, <a href="config.html#cfg_Servers_ssl_ca"><strong>[1]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_ssl_ca_path"><strong>$cfg[&#39;Servers&#39;][$i][&#39;ssl_ca_path&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#index-89"><strong>$cfg[&#39;Servers&#39;][$i][&#39;ssl_cert&#39;]</strong></a>, <a href="config.html#cfg_Servers_ssl_cert"><strong>[1]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_ssl_ciphers"><strong>$cfg[&#39;Servers&#39;][$i][&#39;ssl_ciphers&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#index-88"><strong>$cfg[&#39;Servers&#39;][$i][&#39;ssl_key&#39;]</strong></a>, <a href="config.html#cfg_Servers_ssl_key"><strong>[1]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#index-91"><strong>$cfg[&#39;Servers&#39;][$i][&#39;ssl_verify&#39;]</strong></a>, <a href="config.html#cfg_Servers_ssl_verify"><strong>[1]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#index-21"><strong>$cfg[&#39;Servers&#39;][$i][&#39;table_coords&#39;]</strong></a>, <a href="config.html#cfg_Servers_table_coords"><strong>[1]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#index-19"><strong>$cfg[&#39;Servers&#39;][$i][&#39;table_info&#39;]</strong></a>, <a href="config.html#cfg_Servers_table_info"><strong>[1]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#index-40"><strong>$cfg[&#39;Servers&#39;][$i][&#39;table_uiprefs&#39;]</strong></a>, <a href="config.html#index-59"><strong>[1]</strong></a>, <a href="config.html#index-60"><strong>[2]</strong></a>, <a href="config.html#index-61"><strong>[3]</strong></a>, <a href="config.html#cfg_Servers_table_uiprefs"><strong>[4]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#index-55"><strong>$cfg[&#39;Servers&#39;][$i][&#39;tracking&#39;]</strong></a>, <a href="config.html#cfg_Servers_tracking"><strong>[1]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_tracking_add_drop_database"><strong>$cfg[&#39;Servers&#39;][$i][&#39;tracking_add_drop_database&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_tracking_add_drop_table"><strong>$cfg[&#39;Servers&#39;][$i][&#39;tracking_add_drop_table&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_tracking_add_drop_view"><strong>$cfg[&#39;Servers&#39;][$i][&#39;tracking_add_drop_view&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_tracking_default_statements"><strong>$cfg[&#39;Servers&#39;][$i][&#39;tracking_default_statements&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_tracking_version_auto_create"><strong>$cfg[&#39;Servers&#39;][$i][&#39;tracking_version_auto_create&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="setup.html#index-25"><strong>$cfg[&#39;Servers&#39;][$i][&#39;user&#39;]</strong></a>, <a href="config.html#cfg_Servers_user"><strong>[1]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#index-58"><strong>$cfg[&#39;Servers&#39;][$i][&#39;userconfig&#39;]</strong></a>, <a href="config.html#cfg_Servers_userconfig"><strong>[1]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#index-43"><strong>$cfg[&#39;Servers&#39;][$i][&#39;usergroups&#39;]</strong></a>, <a href="privileges.html#index-0"><strong>[1]</strong></a>, <a href="privileges.html#index-1"><strong>[2]</strong></a>, <a href="config.html#cfg_Servers_usergroups"><strong>[3]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#index-42"><strong>$cfg[&#39;Servers&#39;][$i][&#39;users&#39;]</strong></a>, <a href="config.html#cfg_Servers_users"><strong>[1]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#index-10"><strong>$cfg[&#39;Servers&#39;][$i][&#39;verbose&#39;]</strong></a>, <a href="config.html#index-74"><strong>[1]</strong></a>, <a href="faq.html#index-28"><strong>[2]</strong></a>, <a href="config.html#cfg_Servers_verbose"><strong>[3]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_SessionSavePath"><strong>$cfg[&#39;SessionSavePath&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_ShowAll"><strong>$cfg[&#39;ShowAll&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_ShowBrowseComments"><strong>$cfg[&#39;ShowBrowseComments&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_ShowChgPassword"><strong>$cfg[&#39;ShowChgPassword&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_ShowCreateDb"><strong>$cfg[&#39;ShowCreateDb&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_ShowDatabasesNavigationAsTree"><strong>$cfg[&#39;ShowDatabasesNavigationAsTree&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_ShowDbStructureCreation"><strong>$cfg[&#39;ShowDbStructureCreation&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_ShowDbStructureLastCheck"><strong>$cfg[&#39;ShowDbStructureLastCheck&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_ShowDbStructureLastUpdate"><strong>$cfg[&#39;ShowDbStructureLastUpdate&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_ShowFieldTypesInDataEditView"><strong>$cfg[&#39;ShowFieldTypesInDataEditView&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_ShowFunctionFields"><strong>$cfg[&#39;ShowFunctionFields&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_ShowGitRevision"><strong>$cfg[&#39;ShowGitRevision&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_ShowHint"><strong>$cfg[&#39;ShowHint&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_ShowPropertyComments"><strong>$cfg[&#39;ShowPropertyComments&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_ShowServerInfo"><strong>$cfg[&#39;ShowServerInfo&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_ShowSQL"><strong>$cfg[&#39;ShowSQL&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_ShowStats"><strong>$cfg[&#39;ShowStats&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_SkipLockedTables"><strong>$cfg[&#39;SkipLockedTables&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_SQLQuery_Edit"><strong>$cfg[&#39;SQLQuery&#39;][&#39;Edit&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_SQLQuery_Explain"><strong>$cfg[&#39;SQLQuery&#39;][&#39;Explain&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_SQLQuery_Refresh"><strong>$cfg[&#39;SQLQuery&#39;][&#39;Refresh&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_SQLQuery_ShowAsPHP"><strong>$cfg[&#39;SQLQuery&#39;][&#39;ShowAsPHP&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="faq.html#index-5"><strong>$cfg[&#39;SuhosinDisableWarning&#39;]</strong></a>, <a href="config.html#cfg_SuhosinDisableWarning"><strong>[1]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_TableNavigationLinksMode"><strong>$cfg[&#39;TableNavigationLinksMode&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_TablePrimaryKeyOrder"><strong>$cfg[&#39;TablePrimaryKeyOrder&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_TabsMode"><strong>$cfg[&#39;TabsMode&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="faq.html#index-1"><strong>$cfg[&#39;TempDir&#39;]</strong></a>, <a href="faq.html#index-30"><strong>[1]</strong></a>, <a href="config.html#cfg_TempDir"><strong>[2]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_TextareaAutoSelect"><strong>$cfg[&#39;TextareaAutoSelect&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_TextareaCols"><strong>$cfg[&#39;TextareaCols&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_TextareaRows"><strong>$cfg[&#39;TextareaRows&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="faq.html#index-12"><strong>$cfg[&#39;ThemeDefault&#39;]</strong></a>, <a href="config.html#cfg_ThemeDefault"><strong>[1]</strong></a>
-  </dt>
-
-      
-  <dt><a href="faq.html#index-11"><strong>$cfg[&#39;ThemeManager&#39;]</strong></a>, <a href="faq.html#index-14"><strong>[1]</strong></a>, <a href="config.html#cfg_ThemeManager"><strong>[2]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#index-86"><strong>$cfg[&#39;ThemePath&#39;]</strong></a>, <a href="faq.html#index-10"><strong>[1]</strong></a>, <a href="faq.html#index-13"><strong>[2]</strong></a>, <a href="faq.html#index-15"><strong>[3]</strong></a>, <a href="config.html#cfg_ThemePath"><strong>[4]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_ThemePerServer"><strong>$cfg[&#39;ThemePerServer&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_TitleDatabase"><strong>$cfg[&#39;TitleDatabase&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_TitleDefault"><strong>$cfg[&#39;TitleDefault&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_TitleServer"><strong>$cfg[&#39;TitleServer&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_TitleTable"><strong>$cfg[&#39;TitleTable&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_TranslationWarningThreshold"><strong>$cfg[&#39;TranslationWarningThreshold&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#index-63"><strong>$cfg[&#39;TrustedProxies&#39;]</strong></a>, <a href="config.html#cfg_TrustedProxies"><strong>[1]</strong></a>
-  </dt>
-
-      
-  <dt><a href="faq.html#index-2"><strong>$cfg[&#39;UploadDir&#39;]</strong></a>, <a href="faq.html#index-29"><strong>[1]</strong></a>, <a href="config.html#cfg_UploadDir"><strong>[2]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_UseDbSearch"><strong>$cfg[&#39;UseDbSearch&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_UserprefsDeveloperTab"><strong>$cfg[&#39;UserprefsDeveloperTab&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#index-3"><strong>$cfg[&#39;UserprefsDisallow&#39;]</strong></a>, <a href="config.html#cfg_UserprefsDisallow"><strong>[1]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_VersionCheck"><strong>$cfg[&#39;VersionCheck&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="setup.html#index-6"><strong>$cfg[&#39;ZeroConf&#39;]</strong></a>, <a href="config.html#cfg_ZeroConf"><strong>[1]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_ZipDump"><strong>$cfg[&#39;ZipDump&#39;]</strong></a>
-  </dt>
-
-      
-  <dt><a href="glossary.html#term-htaccess"><strong>.htaccess</strong></a>
-  </dt>
-
-  </dl></td>
-</tr></table>
-
-<h2 id="A">A</h2>
-<table style="width: 100%" class="indextable genindextable"><tr>
-  <td style="width: 33%" valign="top"><dl>
-      
-  <dt><a href="glossary.html#term-acl"><strong>ACL</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_ActionLinksMode"><strong>ActionLinksMode</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_AllowArbitraryServer"><strong>AllowArbitraryServer</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_AllowDeny_order"><strong>AllowDeny, order</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_AllowDeny_rules"><strong>AllowDeny, rules</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_AllowNoPassword"><strong>AllowNoPassword</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_AllowRoot"><strong>AllowRoot</strong></a>
-  </dt>
-
-  </dl></td>
-  <td style="width: 33%" valign="top"><dl>
-      
-  <dt><a href="config.html#cfg_AllowThirdPartyFraming"><strong>AllowThirdPartyFraming</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_AllowUserDropDatabase"><strong>AllowUserDropDatabase</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_ArbitraryServerRegexp"><strong>ArbitraryServerRegexp</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_auth_http_realm"><strong>auth_http_realm</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_auth_type"><strong>auth_type</strong></a>
-  </dt>
-
-      
-  <dt><a href="setup.html#index-9">Authentication mode</a>
-  </dt>
-
-      <dd><dl>
-        
-  <dt><a href="setup.html#index-24">Config</a>
-  </dt>
-
-        
-  <dt><a href="setup.html#index-13">Cookie</a>
-  </dt>
-
-        
-  <dt><a href="setup.html#index-12">HTTP</a>
-  </dt>
-
-        
-  <dt><a href="setup.html#index-15">Signon</a>
-  </dt>
-
-      </dl></dd>
-      
-  <dt><a href="config.html#cfg_AvailableCharsets"><strong>AvailableCharsets</strong></a>
-  </dt>
-
-  </dl></td>
-</tr></table>
-
-<h2 id="B">B</h2>
-<table style="width: 100%" class="indextable genindextable"><tr>
-  <td style="width: 33%" valign="top"><dl>
-      
-  <dt><a href="glossary.html#term-blowfish"><strong>Blowfish</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_blowfish_secret"><strong>blowfish_secret</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_bookmarktable"><strong>bookmarktable</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_BrowseMarkerEnable"><strong>BrowseMarkerEnable</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_BrowseMIME"><strong>BrowseMIME</strong></a>
-  </dt>
-
-  </dl></td>
-  <td style="width: 33%" valign="top"><dl>
-      
-  <dt><a href="config.html#cfg_BrowsePointerEnable"><strong>BrowsePointerEnable</strong></a>
-  </dt>
-
-      
-  <dt><a href="glossary.html#term-browser"><strong>Browser</strong></a>
-  </dt>
-
-      
-  <dt><a href="glossary.html#term-bzip2"><strong>bzip2</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_BZipDump"><strong>BZipDump</strong></a>
-  </dt>
-
-  </dl></td>
-</tr></table>
-
-<h2 id="C">C</h2>
-<table style="width: 100%" class="indextable genindextable"><tr>
-  <td style="width: 33%" valign="top"><dl>
-      
-  <dt><a href="config.html#cfg_CaptchaLoginPrivateKey"><strong>CaptchaLoginPrivateKey</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_CaptchaLoginPublicKey"><strong>CaptchaLoginPublicKey</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_central_columns"><strong>central_columns</strong></a>
-  </dt>
-
-      
-  <dt><a href="glossary.html#term-cgi"><strong>CGI</strong></a>
-  </dt>
-
-      
-  <dt><a href="glossary.html#term-changelog"><strong>Changelog</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_CharEditing"><strong>CharEditing</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_CharTextareaCols"><strong>CharTextareaCols</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_CharTextareaRows"><strong>CharTextareaRows</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_CheckConfigurationPermissions"><strong>CheckConfigurationPermissions</strong></a>
-  </dt>
-
-      
-  <dt><a href="glossary.html#term-client"><strong>Client</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_CodemirrorEnable"><strong>CodemirrorEnable</strong></a>
-  </dt>
-
-      
-  <dt><a href="glossary.html#term-column"><strong>column</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_column_info"><strong>column_info</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_compress"><strong>compress</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_CompressOnFly"><strong>CompressOnFly</strong></a>
-  </dt>
-
-  </dl></td>
-  <td style="width: 33%" valign="top"><dl>
-      
-  <dt>
-    Config
-  </dt>
-
-      <dd><dl>
-        
-  <dt><a href="setup.html#index-24">Authentication mode</a>
-  </dt>
-
-      </dl></dd>
-      
-  <dt><a href="config.html#index-0">config.inc.php</a>
-  </dt>
-
-      
-  <dt>
-    configuration option
-  </dt>
-
-      <dd><dl>
-        
-  <dt><a href="config.html#cfg_ActionLinksMode"><strong>$cfg[&#39;ActionLinksMode&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#index-71"><strong>$cfg[&#39;AllowArbitraryServer&#39;]</strong></a>, <a href="setup.html#index-0"><strong>[1]</strong></a>, <a href="setup.html#index-14"><strong>[2]</strong></a>, <a href="config.html#cfg_AllowArbitraryServer"><strong>[3]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_AllowThirdPartyFraming"><strong>$cfg[&#39;AllowThirdPartyFraming&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_AllowUserDropDatabase"><strong>$cfg[&#39;AllowUserDropDatabase&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#index-70"><strong>$cfg[&#39;ArbitraryServerRegexp&#39;]</strong></a>, <a href="config.html#cfg_ArbitraryServerRegexp"><strong>[1]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_AvailableCharsets"><strong>$cfg[&#39;AvailableCharsets&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_BZipDump"><strong>$cfg[&#39;BZipDump&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_BrowseMIME"><strong>$cfg[&#39;BrowseMIME&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_BrowseMarkerEnable"><strong>$cfg[&#39;BrowseMarkerEnable&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_BrowsePointerEnable"><strong>$cfg[&#39;BrowsePointerEnable&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_CSPAllow"><strong>$cfg[&#39;CSPAllow&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="setup.html#index-31"><strong>$cfg[&#39;CaptchaLoginPrivateKey&#39;]</strong></a>, <a href="config.html#cfg_CaptchaLoginPrivateKey"><strong>[1]</strong></a>
-  </dt>
-
-        
-  <dt><a href="setup.html#index-30"><strong>$cfg[&#39;CaptchaLoginPublicKey&#39;]</strong></a>, <a href="config.html#cfg_CaptchaLoginPublicKey"><strong>[1]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#index-81"><strong>$cfg[&#39;CharEditing&#39;]</strong></a>, <a href="config.html#cfg_CharEditing"><strong>[1]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_CharTextareaCols"><strong>$cfg[&#39;CharTextareaCols&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_CharTextareaRows"><strong>$cfg[&#39;CharTextareaRows&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_CheckConfigurationPermissions"><strong>$cfg[&#39;CheckConfigurationPermissions&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_CodemirrorEnable"><strong>$cfg[&#39;CodemirrorEnable&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="faq.html#index-18"><strong>$cfg[&#39;CompressOnFly&#39;]</strong></a>, <a href="config.html#cfg_CompressOnFly"><strong>[1]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Confirm"><strong>$cfg[&#39;Confirm&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_ConsoleEnterExecutes"><strong>$cfg[&#39;ConsoleEnterExecutes&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_DBG"><strong>$cfg[&#39;DBG&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_DBG_demo"><strong>$cfg[&#39;DBG&#39;][&#39;demo&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_DBG_sql"><strong>$cfg[&#39;DBG&#39;][&#39;sql&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_DefaultConnectionCollation"><strong>$cfg[&#39;DefaultConnectionCollation&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_DefaultForeignKeyChecks"><strong>$cfg[&#39;DefaultForeignKeyChecks&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_DefaultFunctions"><strong>$cfg[&#39;DefaultFunctions&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_DefaultLang"><strong>$cfg[&#39;DefaultLang&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_DefaultQueryDatabase"><strong>$cfg[&#39;DefaultQueryDatabase&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_DefaultQueryTable"><strong>$cfg[&#39;DefaultQueryTable&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_DefaultTabDatabase"><strong>$cfg[&#39;DefaultTabDatabase&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_DefaultTabServer"><strong>$cfg[&#39;DefaultTabServer&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_DefaultTabTable"><strong>$cfg[&#39;DefaultTabTable&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_DisableMultiTableMaintenance"><strong>$cfg[&#39;DisableMultiTableMaintenance&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_DisplayServersList"><strong>$cfg[&#39;DisplayServersList&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_EnableAutocompleteForTablesAndColumns"><strong>$cfg[&#39;EnableAutocompleteForTablesAndColumns&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="faq.html#index-26"><strong>$cfg[&#39;ExecTimeLimit&#39;]</strong></a>, <a href="config.html#cfg_ExecTimeLimit"><strong>[1]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Export"><strong>$cfg[&#39;Export&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#index-77"><strong>$cfg[&#39;Export&#39;][&#39;charset&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Export_method"><strong>$cfg[&#39;Export&#39;][&#39;method&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_FilterLanguages"><strong>$cfg[&#39;FilterLanguages&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_FirstLevelNavigationItems"><strong>$cfg[&#39;FirstLevelNavigationItems&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_ForceSSL"><strong>$cfg[&#39;ForceSSL&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#index-75"><strong>$cfg[&#39;ForeignKeyDropdownOrder&#39;]</strong></a>, <a href="config.html#cfg_ForeignKeyDropdownOrder"><strong>[1]</strong></a>
-  </dt>
-
-        
-  <dt><a href="faq.html#index-27"><strong>$cfg[&#39;ForeignKeyMaxLimit&#39;]</strong></a>, <a href="config.html#cfg_ForeignKeyMaxLimit"><strong>[1]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_GD2Available"><strong>$cfg[&#39;GD2Available&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_GZipDump"><strong>$cfg[&#39;GZipDump&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_GridEditing"><strong>$cfg[&#39;GridEditing&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_HideStructureActions"><strong>$cfg[&#39;HideStructureActions&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_IconvExtraParams"><strong>$cfg[&#39;IconvExtraParams&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_IgnoreMultiSubmitErrors"><strong>$cfg[&#39;IgnoreMultiSubmitErrors&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Import"><strong>$cfg[&#39;Import&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#index-78"><strong>$cfg[&#39;Import&#39;][&#39;charset&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_InitialSlidersState"><strong>$cfg[&#39;InitialSlidersState&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_InsertRows"><strong>$cfg[&#39;InsertRows&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Lang"><strong>$cfg[&#39;Lang&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_LimitChars"><strong>$cfg[&#39;LimitChars&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_LinkLengthLimit"><strong>$cfg[&#39;LinkLengthLimit&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_LoginCookieDeleteAll"><strong>$cfg[&#39;LoginCookieDeleteAll&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_LoginCookieRecall"><strong>$cfg[&#39;LoginCookieRecall&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_LoginCookieStore"><strong>$cfg[&#39;LoginCookieStore&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#index-69"><strong>$cfg[&#39;LoginCookieValidity&#39;]</strong></a>, <a href="config.html#cfg_LoginCookieValidity"><strong>[1]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_LoginCookieValidityDisableWarning"><strong>$cfg[&#39;LoginCookieValidityDisableWarning&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_LongtextDoubleTextarea"><strong>$cfg[&#39;LongtextDoubleTextarea&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_MaxCharactersInDisplayedSQL"><strong>$cfg[&#39;MaxCharactersInDisplayedSQL&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_MaxDbList"><strong>$cfg[&#39;MaxDbList&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="faq.html#index-20"><strong>$cfg[&#39;MaxExactCount&#39;]</strong></a>, <a href="config.html#cfg_MaxExactCount"><strong>[1]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_MaxExactCountViews"><strong>$cfg[&#39;MaxExactCountViews&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_MaxNavigationItems"><strong>$cfg[&#39;MaxNavigationItems&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_MaxRows"><strong>$cfg[&#39;MaxRows&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_MaxSizeForInputField"><strong>$cfg[&#39;MaxSizeForInputField&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_MaxTableList"><strong>$cfg[&#39;MaxTableList&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_MemoryLimit"><strong>$cfg[&#39;MemoryLimit&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_MinSizeForInputField"><strong>$cfg[&#39;MinSizeForInputField&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_MysqlMinVersion"><strong>$cfg[&#39;MysqlMinVersion&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_NaturalOrder"><strong>$cfg[&#39;NaturalOrder&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_NavigationDisplayLogo"><strong>$cfg[&#39;NavigationDisplayLogo&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_NavigationDisplayServers"><strong>$cfg[&#39;NavigationDisplayServers&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_NavigationLinkWithMainPanel"><strong>$cfg[&#39;NavigationLinkWithMainPanel&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_NavigationLogoLink"><strong>$cfg[&#39;NavigationLogoLink&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_NavigationLogoLinkWindow"><strong>$cfg[&#39;NavigationLogoLinkWindow&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#index-72"><strong>$cfg[&#39;NavigationTreeDbSeparator&#39;]</strong></a>, <a href="config.html#cfg_NavigationTreeDbSeparator"><strong>[1]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#index-31"><strong>$cfg[&#39;NavigationTreeDefaultTabTable&#39;]</strong></a>, <a href="config.html#index-34"><strong>[1]</strong></a>, <a href="config.html#cfg_NavigationTreeDefaultTabTable"><strong>[2]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_NavigationTreeDefaultTabTable2"><strong>$cfg[&#39;NavigationTreeDefaultTabTable2&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_NavigationTreeDisplayDbFilterMinimum"><strong>$cfg[&#39;NavigationTreeDisplayDbFilterMinimum&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_NavigationTreeDisplayItemFilterMinimum"><strong>$cfg[&#39;NavigationTreeDisplayItemFilterMinimum&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_NavigationTreeEnableExpansion"><strong>$cfg[&#39;NavigationTreeEnableExpansion&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_NavigationTreeEnableGrouping"><strong>$cfg[&#39;NavigationTreeEnableGrouping&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_NavigationTreePointerEnable"><strong>$cfg[&#39;NavigationTreePointerEnable&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_NavigationTreeShowEvents"><strong>$cfg[&#39;NavigationTreeShowEvents&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_NavigationTreeShowFunctions"><strong>$cfg[&#39;NavigationTreeShowFunctions&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_NavigationTreeShowProcedures"><strong>$cfg[&#39;NavigationTreeShowProcedures&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_NavigationTreeShowTables"><strong>$cfg[&#39;NavigationTreeShowTables&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_NavigationTreeShowViews"><strong>$cfg[&#39;NavigationTreeShowViews&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_NavigationTreeTableLevel"><strong>$cfg[&#39;NavigationTreeTableLevel&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="faq.html#index-19"><strong>$cfg[&#39;NavigationTreeTableSeparator&#39;]</strong></a>, <a href="config.html#cfg_NavigationTreeTableSeparator"><strong>[1]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#index-35"><strong>$cfg[&#39;NumFavoriteTables&#39;]</strong></a>, <a href="faq.html#index-31"><strong>[1]</strong></a>, <a href="config.html#cfg_NumFavoriteTables"><strong>[2]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#index-30"><strong>$cfg[&#39;NumRecentTables&#39;]</strong></a>, <a href="config.html#cfg_NumRecentTables"><strong>[1]</strong></a>
-  </dt>
-
-        
-  <dt><a href="faq.html#index-0"><strong>$cfg[&#39;OBGzip&#39;]</strong></a>, <a href="faq.html#index-3"><strong>[1]</strong></a>, <a href="faq.html#index-8"><strong>[2]</strong></a>, <a href="config.html#cfg_OBGzip"><strong>[3]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Order"><strong>$cfg[&#39;Order&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_PDFDefaultPageSize"><strong>$cfg[&#39;PDFDefaultPageSize&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#index-76"><strong>$cfg[&#39;PDFPageSizes&#39;]</strong></a>, <a href="config.html#cfg_PDFPageSizes"><strong>[1]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_PersistentConnections"><strong>$cfg[&#39;PersistentConnections&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#index-1"><strong>$cfg[&#39;PmaAbsoluteUri&#39;]</strong></a>, <a href="config.html#index-67"><strong>[1]</strong></a>, <a href="faq.html#index-16"><strong>[2]</strong></a>, <a href="faq.html#index-24"><strong>[3]</strong></a>, <a href="faq.html#index-25"><strong>[4]</strong></a>, <a href="faq.html#index-6"><strong>[5]</strong></a>, <a href="faq.html#index-9"><strong>[6]</strong></a>, <a href="config.html#cfg_PmaAbsoluteUri"><strong>[7]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_PmaNoRelation_DisableWarning"><strong>$cfg[&#39;PmaNoRelation_DisableWarning&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_PropertiesNumColumns"><strong>$cfg[&#39;PropertiesNumColumns&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_ProtectBinary"><strong>$cfg[&#39;ProtectBinary&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_ProxyPass"><strong>$cfg[&#39;ProxyPass&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_ProxyUrl"><strong>$cfg[&#39;ProxyUrl&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_ProxyUser"><strong>$cfg[&#39;ProxyUser&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#index-82"><strong>$cfg[&#39;QueryHistoryDB&#39;]</strong></a>, <a href="config.html#index-84"><strong>[1]</strong></a>, <a href="config.html#cfg_QueryHistoryDB"><strong>[2]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#index-27"><strong>$cfg[&#39;QueryHistoryMax&#39;]</strong></a>, <a href="config.html#index-85"><strong>[1]</strong></a>, <a href="config.html#cfg_QueryHistoryMax"><strong>[2]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_RecodingEngine"><strong>$cfg[&#39;RecodingEngine&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_RelationalDisplay"><strong>$cfg[&#39;RelationalDisplay&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#index-38"><strong>$cfg[&#39;RememberSorting&#39;]</strong></a>, <a href="config.html#cfg_RememberSorting"><strong>[1]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_RepeatCells"><strong>$cfg[&#39;RepeatCells&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_ReservedWordDisableWarning"><strong>$cfg[&#39;ReservedWordDisableWarning&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_RetainQueryBox"><strong>$cfg[&#39;RetainQueryBox&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_RowActionLinks"><strong>$cfg[&#39;RowActionLinks&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_RowActionLinksWithoutUnique"><strong>$cfg[&#39;RowActionLinksWithoutUnique&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_RowActionType"><strong>$cfg[&#39;RowActionType&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_SQLQuery_Edit"><strong>$cfg[&#39;SQLQuery&#39;][&#39;Edit&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_SQLQuery_Explain"><strong>$cfg[&#39;SQLQuery&#39;][&#39;Explain&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_SQLQuery_Refresh"><strong>$cfg[&#39;SQLQuery&#39;][&#39;Refresh&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_SQLQuery_ShowAsPHP"><strong>$cfg[&#39;SQLQuery&#39;][&#39;ShowAsPHP&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_SaveCellsAtOnce"><strong>$cfg[&#39;SaveCellsAtOnce&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_SaveDir"><strong>$cfg[&#39;SaveDir&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_SendErrorReports"><strong>$cfg[&#39;SendErrorReports&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#index-65"><strong>$cfg[&#39;ServerDefault&#39;]</strong></a>, <a href="config.html#index-66"><strong>[1]</strong></a>, <a href="config.html#cfg_ServerDefault"><strong>[2]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_ServerLibraryDifference_DisableWarning"><strong>$cfg[&#39;ServerLibraryDifference_DisableWarning&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#index-4"><strong>$cfg[&#39;Servers&#39;]</strong></a>, <a href="config.html#index-7"><strong>[1]</strong></a>, <a href="setup.html#index-11"><strong>[2]</strong></a>, <a href="config.html#cfg_Servers"><strong>[3]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#index-79"><strong>$cfg[&#39;Servers&#39;][$i][&#39;AllowDeny&#39;][&#39;order&#39;]</strong></a>, <a href="setup.html#index-27"><strong>[1]</strong></a>, <a href="config.html#cfg_Servers_AllowDeny_order"><strong>[2]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#index-62"><strong>$cfg[&#39;Servers&#39;][$i][&#39;AllowDeny&#39;][&#39;rules&#39;]</strong></a>, <a href="config.html#index-80"><strong>[1]</strong></a>, <a href="faq.html#index-23"><strong>[2]</strong></a>, <a href="setup.html#index-28"><strong>[3]</strong></a>, <a href="setup.html#index-29"><strong>[4]</strong></a>, <a href="config.html#cfg_Servers_AllowDeny_rules"><strong>[5]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_AllowNoPassword"><strong>$cfg[&#39;Servers&#39;][$i][&#39;AllowNoPassword&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_AllowRoot"><strong>$cfg[&#39;Servers&#39;][$i][&#39;AllowRoot&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_DisableIS"><strong>$cfg[&#39;Servers&#39;][$i][&#39;DisableIS&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_LogoutURL"><strong>$cfg[&#39;Servers&#39;][$i][&#39;LogoutURL&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_MaxTableUiprefs"><strong>$cfg[&#39;Servers&#39;][$i][&#39;MaxTableUiprefs&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_SessionTimeZone"><strong>$cfg[&#39;Servers&#39;][$i][&#39;SessionTimeZone&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#index-64"><strong>$cfg[&#39;Servers&#39;][$i][&#39;SignonScript&#39;]</strong></a>, <a href="setup.html#index-17"><strong>[1]</strong></a>, <a href="setup.html#index-19"><strong>[2]</strong></a>, <a href="setup.html#index-22"><strong>[3]</strong></a>, <a href="config.html#cfg_Servers_SignonScript"><strong>[4]</strong></a>
-  </dt>
-
-        
-  <dt><a href="setup.html#index-16"><strong>$cfg[&#39;Servers&#39;][$i][&#39;SignonSession&#39;]</strong></a>, <a href="setup.html#index-21"><strong>[1]</strong></a>, <a href="config.html#cfg_Servers_SignonSession"><strong>[2]</strong></a>
-  </dt>
-
-        
-  <dt><a href="setup.html#index-18"><strong>$cfg[&#39;Servers&#39;][$i][&#39;SignonURL&#39;]</strong></a>, <a href="setup.html#index-23"><strong>[1]</strong></a>, <a href="config.html#cfg_Servers_SignonURL"><strong>[2]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_auth_http_realm"><strong>$cfg[&#39;Servers&#39;][$i][&#39;auth_http_realm&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#index-12"><strong>$cfg[&#39;Servers&#39;][$i][&#39;auth_type&#39;]</strong></a>, <a href="setup.html#index-20"><strong>[1]</strong></a>, <a href="config.html#cfg_Servers_auth_type"><strong>[2]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#index-15"><strong>$cfg[&#39;Servers&#39;][$i][&#39;bookmarktable&#39;]</strong></a>, <a href="config.html#cfg_Servers_bookmarktable"><strong>[1]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#index-47"><strong>$cfg[&#39;Servers&#39;][$i][&#39;central_columns&#39;]</strong></a>, <a href="config.html#cfg_Servers_central_columns"><strong>[1]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#index-25"><strong>$cfg[&#39;Servers&#39;][$i][&#39;column_comments&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#index-24"><strong>$cfg[&#39;Servers&#39;][$i][&#39;column_info&#39;]</strong></a>, <a href="config.html#index-26"><strong>[1]</strong></a>, <a href="config.html#cfg_Servers_column_info"><strong>[2]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_compress"><strong>$cfg[&#39;Servers&#39;][$i][&#39;compress&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_connect_type"><strong>$cfg[&#39;Servers&#39;][$i][&#39;connect_type&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_controlhost"><strong>$cfg[&#39;Servers&#39;][$i][&#39;controlhost&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="faq.html#index-22"><strong>$cfg[&#39;Servers&#39;][$i][&#39;controlpass&#39;]</strong></a>, <a href="setup.html#index-8"><strong>[1]</strong></a>, <a href="config.html#cfg_Servers_controlpass"><strong>[2]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_controlport"><strong>$cfg[&#39;Servers&#39;][$i][&#39;controlport&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="faq.html#index-21"><strong>$cfg[&#39;Servers&#39;][$i][&#39;controluser&#39;]</strong></a>, <a href="setup.html#index-10"><strong>[1]</strong></a>, <a href="setup.html#index-7"><strong>[2]</strong></a>, <a href="config.html#cfg_Servers_controluser"><strong>[3]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#index-49"><strong>$cfg[&#39;Servers&#39;][$i][&#39;designer_settings&#39;]</strong></a>, <a href="config.html#cfg_Servers_designer_settings"><strong>[1]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#index-53"><strong>$cfg[&#39;Servers&#39;][$i][&#39;export_templates&#39;]</strong></a>, <a href="config.html#cfg_Servers_export_templates"><strong>[1]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#index-37"><strong>$cfg[&#39;Servers&#39;][$i][&#39;favorite&#39;]</strong></a>, <a href="config.html#cfg_Servers_favorite"><strong>[1]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_hide_db"><strong>$cfg[&#39;Servers&#39;][$i][&#39;hide_db&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#index-29"><strong>$cfg[&#39;Servers&#39;][$i][&#39;history&#39;]</strong></a>, <a href="config.html#index-83"><strong>[1]</strong></a>, <a href="config.html#cfg_Servers_history"><strong>[2]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#index-11"><strong>$cfg[&#39;Servers&#39;][$i][&#39;host&#39;]</strong></a>, <a href="config.html#index-5"><strong>[1]</strong></a>, <a href="config.html#index-6"><strong>[2]</strong></a>, <a href="config.html#index-8"><strong>[3]</strong></a>, <a href="config.html#cfg_Servers_host"><strong>[4]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#index-45"><strong>$cfg[&#39;Servers&#39;][$i][&#39;navigationhiding&#39;]</strong></a>, <a href="config.html#cfg_Servers_navigationhiding"><strong>[1]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_nopassword"><strong>$cfg[&#39;Servers&#39;][$i][&#39;nopassword&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_only_db"><strong>$cfg[&#39;Servers&#39;][$i][&#39;only_db&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="setup.html#index-26"><strong>$cfg[&#39;Servers&#39;][$i][&#39;password&#39;]</strong></a>, <a href="config.html#cfg_Servers_password"><strong>[1]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#index-22"><strong>$cfg[&#39;Servers&#39;][$i][&#39;pdf_pages&#39;]</strong></a>, <a href="config.html#cfg_Servers_pdf_pages"><strong>[1]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#index-13"><strong>$cfg[&#39;Servers&#39;][$i][&#39;pmadb&#39;]</strong></a>, <a href="config.html#index-14"><strong>[1]</strong></a>, <a href="config.html#index-16"><strong>[2]</strong></a>, <a href="config.html#index-18"><strong>[3]</strong></a>, <a href="config.html#index-2"><strong>[4]</strong></a>, <a href="config.html#index-20"><strong>[5]</strong></a>, <a href="config.html#index-23"><strong>[6]</strong></a>, <a href="config.html#index-28"><strong>[7]</strong></a>, <a href="config.html#index-32"><strong>[8]</strong></a>, <a href="config.html#index-36"><strong>[9]</strong></a>, <a href="config.html#index-39"><strong>[10]</strong></a>, <a href="config.html#index-41"><strong>[11]</strong></a>, <a href="config.html#index-44"><strong>[12]</strong></a>, <a href="config.html#index-46"><strong>[13]</strong></a>, <a href="config.html#index-48"><strong>[14]</strong></a>, <a href="config.html#index-50"><strong>[15]</strong></a>, <a href="config.html#index-52"><strong>[16]</strong></a>, <a href="config.html#index-54"><strong>[17]</strong></a>, <a href="config.html#index-56"><strong>[18]</strong></a>, <a href="config.html#index-57"><strong>[19]</strong></a>, <a href="config.html#index-73"><strong>[20]</strong></a>, <a href="config.html#index-9"><strong>[21]</strong></a>, <a href="config.html#cfg_Servers_pmadb"><strong>[22]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_port"><strong>$cfg[&#39;Servers&#39;][$i][&#39;port&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#index-33"><strong>$cfg[&#39;Servers&#39;][$i][&#39;recent&#39;]</strong></a>, <a href="config.html#cfg_Servers_recent"><strong>[1]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#index-17"><strong>$cfg[&#39;Servers&#39;][$i][&#39;relation&#39;]</strong></a>, <a href="config.html#cfg_Servers_relation"><strong>[1]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#index-51"><strong>$cfg[&#39;Servers&#39;][$i][&#39;savedsearches&#39;]</strong></a>, <a href="config.html#cfg_Servers_savedsearches"><strong>[1]</strong></a>
-  </dt>
-
-        
-  <dt><a href="faq.html#index-7"><strong>$cfg[&#39;Servers&#39;][$i][&#39;socket&#39;]</strong></a>, <a href="config.html#cfg_Servers_socket"><strong>[1]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#index-87"><strong>$cfg[&#39;Servers&#39;][$i][&#39;ssl&#39;]</strong></a>, <a href="config.html#cfg_Servers_ssl"><strong>[1]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#index-90"><strong>$cfg[&#39;Servers&#39;][$i][&#39;ssl_ca&#39;]</strong></a>, <a href="config.html#cfg_Servers_ssl_ca"><strong>[1]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_ssl_ca_path"><strong>$cfg[&#39;Servers&#39;][$i][&#39;ssl_ca_path&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#index-89"><strong>$cfg[&#39;Servers&#39;][$i][&#39;ssl_cert&#39;]</strong></a>, <a href="config.html#cfg_Servers_ssl_cert"><strong>[1]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_ssl_ciphers"><strong>$cfg[&#39;Servers&#39;][$i][&#39;ssl_ciphers&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#index-88"><strong>$cfg[&#39;Servers&#39;][$i][&#39;ssl_key&#39;]</strong></a>, <a href="config.html#cfg_Servers_ssl_key"><strong>[1]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#index-91"><strong>$cfg[&#39;Servers&#39;][$i][&#39;ssl_verify&#39;]</strong></a>, <a href="config.html#cfg_Servers_ssl_verify"><strong>[1]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#index-21"><strong>$cfg[&#39;Servers&#39;][$i][&#39;table_coords&#39;]</strong></a>, <a href="config.html#cfg_Servers_table_coords"><strong>[1]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#index-19"><strong>$cfg[&#39;Servers&#39;][$i][&#39;table_info&#39;]</strong></a>, <a href="config.html#cfg_Servers_table_info"><strong>[1]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#index-40"><strong>$cfg[&#39;Servers&#39;][$i][&#39;table_uiprefs&#39;]</strong></a>, <a href="config.html#index-59"><strong>[1]</strong></a>, <a href="config.html#index-60"><strong>[2]</strong></a>, <a href="config.html#index-61"><strong>[3]</strong></a>, <a href="config.html#cfg_Servers_table_uiprefs"><strong>[4]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#index-55"><strong>$cfg[&#39;Servers&#39;][$i][&#39;tracking&#39;]</strong></a>, <a href="config.html#cfg_Servers_tracking"><strong>[1]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_tracking_add_drop_database"><strong>$cfg[&#39;Servers&#39;][$i][&#39;tracking_add_drop_database&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_tracking_add_drop_table"><strong>$cfg[&#39;Servers&#39;][$i][&#39;tracking_add_drop_table&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_tracking_add_drop_view"><strong>$cfg[&#39;Servers&#39;][$i][&#39;tracking_add_drop_view&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_tracking_default_statements"><strong>$cfg[&#39;Servers&#39;][$i][&#39;tracking_default_statements&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_tracking_version_auto_create"><strong>$cfg[&#39;Servers&#39;][$i][&#39;tracking_version_auto_create&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="setup.html#index-25"><strong>$cfg[&#39;Servers&#39;][$i][&#39;user&#39;]</strong></a>, <a href="config.html#cfg_Servers_user"><strong>[1]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#index-58"><strong>$cfg[&#39;Servers&#39;][$i][&#39;userconfig&#39;]</strong></a>, <a href="config.html#cfg_Servers_userconfig"><strong>[1]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#index-43"><strong>$cfg[&#39;Servers&#39;][$i][&#39;usergroups&#39;]</strong></a>, <a href="privileges.html#index-0"><strong>[1]</strong></a>, <a href="privileges.html#index-1"><strong>[2]</strong></a>, <a href="config.html#cfg_Servers_usergroups"><strong>[3]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#index-42"><strong>$cfg[&#39;Servers&#39;][$i][&#39;users&#39;]</strong></a>, <a href="config.html#cfg_Servers_users"><strong>[1]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#index-10"><strong>$cfg[&#39;Servers&#39;][$i][&#39;verbose&#39;]</strong></a>, <a href="config.html#index-74"><strong>[1]</strong></a>, <a href="faq.html#index-28"><strong>[2]</strong></a>, <a href="config.html#cfg_Servers_verbose"><strong>[3]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_SessionSavePath"><strong>$cfg[&#39;SessionSavePath&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_ShowAll"><strong>$cfg[&#39;ShowAll&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_ShowBrowseComments"><strong>$cfg[&#39;ShowBrowseComments&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_ShowChgPassword"><strong>$cfg[&#39;ShowChgPassword&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_ShowCreateDb"><strong>$cfg[&#39;ShowCreateDb&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_ShowDatabasesNavigationAsTree"><strong>$cfg[&#39;ShowDatabasesNavigationAsTree&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_ShowDbStructureCreation"><strong>$cfg[&#39;ShowDbStructureCreation&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_ShowDbStructureLastCheck"><strong>$cfg[&#39;ShowDbStructureLastCheck&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_ShowDbStructureLastUpdate"><strong>$cfg[&#39;ShowDbStructureLastUpdate&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_ShowFieldTypesInDataEditView"><strong>$cfg[&#39;ShowFieldTypesInDataEditView&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_ShowFunctionFields"><strong>$cfg[&#39;ShowFunctionFields&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_ShowGitRevision"><strong>$cfg[&#39;ShowGitRevision&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_ShowHint"><strong>$cfg[&#39;ShowHint&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_ShowPropertyComments"><strong>$cfg[&#39;ShowPropertyComments&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_ShowSQL"><strong>$cfg[&#39;ShowSQL&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_ShowServerInfo"><strong>$cfg[&#39;ShowServerInfo&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_ShowStats"><strong>$cfg[&#39;ShowStats&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_SkipLockedTables"><strong>$cfg[&#39;SkipLockedTables&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="faq.html#index-5"><strong>$cfg[&#39;SuhosinDisableWarning&#39;]</strong></a>, <a href="config.html#cfg_SuhosinDisableWarning"><strong>[1]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_TableNavigationLinksMode"><strong>$cfg[&#39;TableNavigationLinksMode&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_TablePrimaryKeyOrder"><strong>$cfg[&#39;TablePrimaryKeyOrder&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_TabsMode"><strong>$cfg[&#39;TabsMode&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="faq.html#index-1"><strong>$cfg[&#39;TempDir&#39;]</strong></a>, <a href="faq.html#index-30"><strong>[1]</strong></a>, <a href="config.html#cfg_TempDir"><strong>[2]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_TextareaAutoSelect"><strong>$cfg[&#39;TextareaAutoSelect&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_TextareaCols"><strong>$cfg[&#39;TextareaCols&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_TextareaRows"><strong>$cfg[&#39;TextareaRows&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="faq.html#index-12"><strong>$cfg[&#39;ThemeDefault&#39;]</strong></a>, <a href="config.html#cfg_ThemeDefault"><strong>[1]</strong></a>
-  </dt>
-
-        
-  <dt><a href="faq.html#index-11"><strong>$cfg[&#39;ThemeManager&#39;]</strong></a>, <a href="faq.html#index-14"><strong>[1]</strong></a>, <a href="config.html#cfg_ThemeManager"><strong>[2]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#index-86"><strong>$cfg[&#39;ThemePath&#39;]</strong></a>, <a href="faq.html#index-10"><strong>[1]</strong></a>, <a href="faq.html#index-13"><strong>[2]</strong></a>, <a href="faq.html#index-15"><strong>[3]</strong></a>, <a href="config.html#cfg_ThemePath"><strong>[4]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_ThemePerServer"><strong>$cfg[&#39;ThemePerServer&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_TitleDatabase"><strong>$cfg[&#39;TitleDatabase&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_TitleDefault"><strong>$cfg[&#39;TitleDefault&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_TitleServer"><strong>$cfg[&#39;TitleServer&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_TitleTable"><strong>$cfg[&#39;TitleTable&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_TranslationWarningThreshold"><strong>$cfg[&#39;TranslationWarningThreshold&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#index-63"><strong>$cfg[&#39;TrustedProxies&#39;]</strong></a>, <a href="config.html#cfg_TrustedProxies"><strong>[1]</strong></a>
-  </dt>
-
-        
-  <dt><a href="faq.html#index-2"><strong>$cfg[&#39;UploadDir&#39;]</strong></a>, <a href="faq.html#index-29"><strong>[1]</strong></a>, <a href="config.html#cfg_UploadDir"><strong>[2]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_UseDbSearch"><strong>$cfg[&#39;UseDbSearch&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_UserprefsDeveloperTab"><strong>$cfg[&#39;UserprefsDeveloperTab&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#index-3"><strong>$cfg[&#39;UserprefsDisallow&#39;]</strong></a>, <a href="config.html#cfg_UserprefsDisallow"><strong>[1]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_VersionCheck"><strong>$cfg[&#39;VersionCheck&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="setup.html#index-6"><strong>$cfg[&#39;ZeroConf&#39;]</strong></a>, <a href="config.html#cfg_ZeroConf"><strong>[1]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_ZipDump"><strong>$cfg[&#39;ZipDump&#39;]</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#index-68"><strong>$cfg[&#39;blowfish_secret&#39;]</strong></a>, <a href="config.html#cfg_blowfish_secret"><strong>[1]</strong></a>
-  </dt>
-
-      </dl></dd>
-      
-  <dt><a href="setup.html#index-5">Configuration storage</a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Confirm"><strong>Confirm</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_connect_type"><strong>connect_type</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_ConsoleEnterExecutes"><strong>ConsoleEnterExecutes</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_controlhost"><strong>controlhost</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_controlpass"><strong>controlpass</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_controlport"><strong>controlport</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_controluser"><strong>controluser</strong></a>
-  </dt>
-
-      
-  <dt><a href="glossary.html#term-cookie"><strong>Cookie</strong></a>
-  </dt>
-
-      <dd><dl>
-        
-  <dt><a href="setup.html#index-13">Authentication mode</a>
-  </dt>
-
-      </dl></dd>
-      
-  <dt><a href="config.html#cfg_CSPAllow"><strong>CSPAllow</strong></a>
-  </dt>
-
-      
-  <dt><a href="glossary.html#term-csv"><strong>CSV</strong></a>
-  </dt>
-
-  </dl></td>
-</tr></table>
-
-<h2 id="D">D</h2>
-<table style="width: 100%" class="indextable genindextable"><tr>
-  <td style="width: 33%" valign="top"><dl>
-      
-  <dt><a href="glossary.html#term-database"><strong>database</strong></a>
-  </dt>
-
-      
-  <dt><a href="glossary.html#term-db"><strong>DB</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_DBG"><strong>DBG</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_DBG_demo"><strong>DBG, demo</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_DBG_sql"><strong>DBG, sql</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_DefaultConnectionCollation"><strong>DefaultConnectionCollation</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_DefaultForeignKeyChecks"><strong>DefaultForeignKeyChecks</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_DefaultFunctions"><strong>DefaultFunctions</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_DefaultLang"><strong>DefaultLang</strong></a>
-  </dt>
-
-  </dl></td>
-  <td style="width: 33%" valign="top"><dl>
-      
-  <dt><a href="config.html#cfg_DefaultQueryDatabase"><strong>DefaultQueryDatabase</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_DefaultQueryTable"><strong>DefaultQueryTable</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_DefaultTabDatabase"><strong>DefaultTabDatabase</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_DefaultTabServer"><strong>DefaultTabServer</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_DefaultTabTable"><strong>DefaultTabTable</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_designer_settings"><strong>designer_settings</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_DisableIS"><strong>DisableIS</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_DisableMultiTableMaintenance"><strong>DisableMultiTableMaintenance</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_DisplayServersList"><strong>DisplayServersList</strong></a>
-  </dt>
-
-  </dl></td>
-</tr></table>
-
-<h2 id="E">E</h2>
-<table style="width: 100%" class="indextable genindextable"><tr>
-  <td style="width: 33%" valign="top"><dl>
-      
-  <dt><a href="config.html#cfg_EnableAutocompleteForTablesAndColumns"><strong>EnableAutocompleteForTablesAndColumns</strong></a>
-  </dt>
-
-      
-  <dt><a href="glossary.html#term-engine"><strong>Engine</strong></a>
-  </dt>
-
-      
-  <dt>
-    environment variable
-  </dt>
-
-      <dd><dl>
-        
-  <dt><a href="setup.html#index-3">MYSQL_ROOT_PASSWORD</a>
-  </dt>
-
-        
-  <dt><a href="setup.html#envvar-PMA_ABSOLUTE_URI">PMA_ABSOLUTE_URI</a>
-  </dt>
-
-        
-  <dt><a href="setup.html#envvar-PMA_ARBITRARY">PMA_ARBITRARY</a>
-  </dt>
-
-        
-  <dt><a href="setup.html#envvar-PMA_HOST">PMA_HOST</a>
-  </dt>
-
-        
-  <dt><a href="setup.html#envvar-PMA_HOSTS">PMA_HOSTS</a>
-  </dt>
-
-        
-  <dt><a href="setup.html#envvar-PMA_PASSWORD">PMA_PASSWORD</a>, <a href="setup.html#index-2">[1]</a>
-  </dt>
-
-        
-  <dt><a href="setup.html#envvar-PMA_PORT">PMA_PORT</a>
-  </dt>
-
-        
-  <dt><a href="setup.html#envvar-PMA_USER">PMA_USER</a>, <a href="setup.html#index-1">[1]</a>
-  </dt>
-
-      </dl></dd>
-      
-  <dt><a href="config.html#cfg_ExecTimeLimit"><strong>ExecTimeLimit</strong></a>
-  </dt>
-
-  </dl></td>
-  <td style="width: 33%" valign="top"><dl>
-      
-  <dt><a href="config.html#cfg_Export"><strong>Export</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Export_method"><strong>Export, method</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_export_templates"><strong>export_templates</strong></a>
-  </dt>
-
-      
-  <dt><a href="glossary.html#term-extension"><strong>extension</strong></a>
-  </dt>
-
-  </dl></td>
-</tr></table>
-
-<h2 id="F">F</h2>
-<table style="width: 100%" class="indextable genindextable"><tr>
-  <td style="width: 33%" valign="top"><dl>
-      
-  <dt><a href="glossary.html#term-faq"><strong>FAQ</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_favorite"><strong>favorite</strong></a>
-  </dt>
-
-      
-  <dt><a href="glossary.html#term-field"><strong>Field</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_FilterLanguages"><strong>FilterLanguages</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_FirstLevelNavigationItems"><strong>FirstLevelNavigationItems</strong></a>
-  </dt>
-
-  </dl></td>
-  <td style="width: 33%" valign="top"><dl>
-      
-  <dt><a href="config.html#cfg_ForceSSL"><strong>ForceSSL</strong></a>
-  </dt>
-
-      
-  <dt><a href="glossary.html#term-foreign-key"><strong>foreign key</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_ForeignKeyDropdownOrder"><strong>ForeignKeyDropdownOrder</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_ForeignKeyMaxLimit"><strong>ForeignKeyMaxLimit</strong></a>
-  </dt>
-
-      
-  <dt><a href="glossary.html#term-fpdf"><strong>FPDF</strong></a>
-  </dt>
-
-  </dl></td>
-</tr></table>
-
-<h2 id="G">G</h2>
-<table style="width: 100%" class="indextable genindextable"><tr>
-  <td style="width: 33%" valign="top"><dl>
-      
-  <dt><a href="glossary.html#term-gd"><strong>GD</strong></a>
-  </dt>
-
-      
-  <dt><a href="glossary.html#term-gd2"><strong>GD2</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_GD2Available"><strong>GD2Available</strong></a>
-  </dt>
-
-  </dl></td>
-  <td style="width: 33%" valign="top"><dl>
-      
-  <dt><a href="config.html#cfg_GridEditing"><strong>GridEditing</strong></a>
-  </dt>
-
-      
-  <dt><a href="glossary.html#term-gzip"><strong>gzip</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_GZipDump"><strong>GZipDump</strong></a>
-  </dt>
-
-  </dl></td>
-</tr></table>
-
-<h2 id="H">H</h2>
-<table style="width: 100%" class="indextable genindextable"><tr>
-  <td style="width: 33%" valign="top"><dl>
-      
-  <dt><a href="config.html#cfg_Servers_hide_db"><strong>hide_db</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_HideStructureActions"><strong>HideStructureActions</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_history"><strong>history</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_host"><strong>host</strong></a>, <a href="glossary.html#term-host"><strong>[1]</strong></a>
-  </dt>
-
-  </dl></td>
-  <td style="width: 33%" valign="top"><dl>
-      
-  <dt><a href="glossary.html#term-hostname"><strong>hostname</strong></a>
-  </dt>
-
-      
-  <dt><a href="glossary.html#term-http"><strong>HTTP</strong></a>
-  </dt>
-
-      <dd><dl>
-        
-  <dt><a href="setup.html#index-12">Authentication mode</a>
-  </dt>
-
-      </dl></dd>
-      
-  <dt><a href="glossary.html#term-https"><strong>https</strong></a>
-  </dt>
-
-  </dl></td>
-</tr></table>
-
-<h2 id="I">I</h2>
-<table style="width: 100%" class="indextable genindextable"><tr>
-  <td style="width: 33%" valign="top"><dl>
-      
-  <dt><a href="config.html#cfg_IconvExtraParams"><strong>IconvExtraParams</strong></a>
-  </dt>
-
-      
-  <dt><a href="glossary.html#term-iec"><strong>IEC</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_IgnoreMultiSubmitErrors"><strong>IgnoreMultiSubmitErrors</strong></a>
-  </dt>
-
-      
-  <dt><a href="glossary.html#term-iis"><strong>IIS</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Import"><strong>Import</strong></a>
-  </dt>
-
-      
-  <dt><a href="glossary.html#term-index"><strong>Index</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_InitialSlidersState"><strong>InitialSlidersState</strong></a>
-  </dt>
-
-  </dl></td>
-  <td style="width: 33%" valign="top"><dl>
-      
-  <dt><a href="config.html#cfg_InsertRows"><strong>InsertRows</strong></a>
-  </dt>
-
-      
-  <dt><a href="glossary.html#term-ip"><strong>IP</strong></a>
-  </dt>
-
-      
-  <dt><a href="glossary.html#term-ip-address"><strong>IP Address</strong></a>
-  </dt>
-
-      
-  <dt><a href="glossary.html#term-ipv6"><strong>IPv6</strong></a>
-  </dt>
-
-      
-  <dt><a href="glossary.html#term-isapi"><strong>ISAPI</strong></a>
-  </dt>
-
-      
-  <dt><a href="glossary.html#term-iso"><strong>ISO</strong></a>
-  </dt>
-
-      
-  <dt><a href="glossary.html#term-isp"><strong>ISP</strong></a>
-  </dt>
-
-  </dl></td>
-</tr></table>
-
-<h2 id="J">J</h2>
-<table style="width: 100%" class="indextable genindextable"><tr>
-  <td style="width: 33%" valign="top"><dl>
-      
-  <dt><a href="glossary.html#term-jpeg"><strong>JPEG</strong></a>
-  </dt>
-
-  </dl></td>
-  <td style="width: 33%" valign="top"><dl>
-      
-  <dt><a href="glossary.html#term-jpg"><strong>JPG</strong></a>
-  </dt>
-
-  </dl></td>
-</tr></table>
-
-<h2 id="K">K</h2>
-<table style="width: 100%" class="indextable genindextable"><tr>
-  <td style="width: 33%" valign="top"><dl>
-      
-  <dt><a href="glossary.html#term-key"><strong>Key</strong></a>
-  </dt>
-
-  </dl></td>
-</tr></table>
-
-<h2 id="L">L</h2>
-<table style="width: 100%" class="indextable genindextable"><tr>
-  <td style="width: 33%" valign="top"><dl>
-      
-  <dt><a href="config.html#cfg_Lang"><strong>Lang</strong></a>
-  </dt>
-
-      
-  <dt><a href="glossary.html#term-latex"><strong>LATEX</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_LimitChars"><strong>LimitChars</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_LinkLengthLimit"><strong>LinkLengthLimit</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_LoginCookieDeleteAll"><strong>LoginCookieDeleteAll</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_LoginCookieRecall"><strong>LoginCookieRecall</strong></a>
-  </dt>
-
-  </dl></td>
-  <td style="width: 33%" valign="top"><dl>
-      
-  <dt><a href="config.html#cfg_LoginCookieStore"><strong>LoginCookieStore</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_LoginCookieValidity"><strong>LoginCookieValidity</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_LoginCookieValidityDisableWarning"><strong>LoginCookieValidityDisableWarning</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_LogoutURL"><strong>LogoutURL</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_LongtextDoubleTextarea"><strong>LongtextDoubleTextarea</strong></a>
-  </dt>
-
-  </dl></td>
-</tr></table>
-
-<h2 id="M">M</h2>
-<table style="width: 100%" class="indextable genindextable"><tr>
-  <td style="width: 33%" valign="top"><dl>
-      
-  <dt><a href="glossary.html#term-mac"><strong>Mac</strong></a>
-  </dt>
-
-      
-  <dt><a href="glossary.html#term-mac-os-x"><strong>Mac OS X</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_MaxCharactersInDisplayedSQL"><strong>MaxCharactersInDisplayedSQL</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_MaxDbList"><strong>MaxDbList</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_MaxExactCount"><strong>MaxExactCount</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_MaxExactCountViews"><strong>MaxExactCountViews</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_MaxNavigationItems"><strong>MaxNavigationItems</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_MaxRows"><strong>MaxRows</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_MaxSizeForInputField"><strong>MaxSizeForInputField</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_MaxTableList"><strong>MaxTableList</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_MaxTableUiprefs"><strong>MaxTableUiprefs</strong></a>
-  </dt>
-
-      
-  <dt><a href="glossary.html#term-mcrypt"><strong>MCrypt</strong></a>
-  </dt>
-
-  </dl></td>
-  <td style="width: 33%" valign="top"><dl>
-      
-  <dt><a href="glossary.html#term-42"><strong>mcrypt</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_MemoryLimit"><strong>MemoryLimit</strong></a>
-  </dt>
-
-      
-  <dt><a href="glossary.html#term-mime"><strong>MIME</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_MinSizeForInputField"><strong>MinSizeForInputField</strong></a>
-  </dt>
-
-      
-  <dt><a href="glossary.html#term-mod-proxy-fcgi"><strong>mod_proxy_fcgi</strong></a>
-  </dt>
-
-      
-  <dt><a href="glossary.html#term-module"><strong>module</strong></a>
-  </dt>
-
-      
-  <dt><a href="glossary.html#term-mysql"><strong>MySQL</strong></a>
-  </dt>
-
-      
-  <dt><a href="glossary.html#term-48"><strong>mysql</strong></a>
-  </dt>
-
-      
-  <dt><a href="setup.html#index-3">MYSQL_ROOT_PASSWORD</a>
-  </dt>
-
-      
-  <dt><a href="glossary.html#term-mysqli"><strong>mysqli</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_MysqlMinVersion"><strong>MysqlMinVersion</strong></a>
-  </dt>
-
-  </dl></td>
-</tr></table>
-
-<h2 id="N">N</h2>
-<table style="width: 100%" class="indextable genindextable"><tr>
-  <td style="width: 33%" valign="top"><dl>
-      
-  <dt><a href="config.html#cfg_NaturalOrder"><strong>NaturalOrder</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_NavigationDisplayLogo"><strong>NavigationDisplayLogo</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_NavigationDisplayServers"><strong>NavigationDisplayServers</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_navigationhiding"><strong>navigationhiding</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_NavigationLinkWithMainPanel"><strong>NavigationLinkWithMainPanel</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_NavigationLogoLink"><strong>NavigationLogoLink</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_NavigationLogoLinkWindow"><strong>NavigationLogoLinkWindow</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_NavigationTreeDbSeparator"><strong>NavigationTreeDbSeparator</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_NavigationTreeDefaultTabTable"><strong>NavigationTreeDefaultTabTable</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_NavigationTreeDefaultTabTable2"><strong>NavigationTreeDefaultTabTable2</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_NavigationTreeDisplayDbFilterMinimum"><strong>NavigationTreeDisplayDbFilterMinimum</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_NavigationTreeDisplayItemFilterMinimum"><strong>NavigationTreeDisplayItemFilterMinimum</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_NavigationTreeEnableExpansion"><strong>NavigationTreeEnableExpansion</strong></a>
-  </dt>
-
-  </dl></td>
-  <td style="width: 33%" valign="top"><dl>
-      
-  <dt><a href="config.html#cfg_NavigationTreeEnableGrouping"><strong>NavigationTreeEnableGrouping</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_NavigationTreePointerEnable"><strong>NavigationTreePointerEnable</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_NavigationTreeShowEvents"><strong>NavigationTreeShowEvents</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_NavigationTreeShowFunctions"><strong>NavigationTreeShowFunctions</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_NavigationTreeShowProcedures"><strong>NavigationTreeShowProcedures</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_NavigationTreeShowTables"><strong>NavigationTreeShowTables</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_NavigationTreeShowViews"><strong>NavigationTreeShowViews</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_NavigationTreeTableLevel"><strong>NavigationTreeTableLevel</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_NavigationTreeTableSeparator"><strong>NavigationTreeTableSeparator</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_nopassword"><strong>nopassword</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_NumFavoriteTables"><strong>NumFavoriteTables</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_NumRecentTables"><strong>NumRecentTables</strong></a>
-  </dt>
-
-  </dl></td>
-</tr></table>
-
-<h2 id="O">O</h2>
-<table style="width: 100%" class="indextable genindextable"><tr>
-  <td style="width: 33%" valign="top"><dl>
-      
-  <dt><a href="config.html#cfg_OBGzip"><strong>OBGzip</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_only_db"><strong>only_db</strong></a>
-  </dt>
-
-      
-  <dt><a href="glossary.html#term-opendocument"><strong>OpenDocument</strong></a>
-  </dt>
-
-  </dl></td>
-  <td style="width: 33%" valign="top"><dl>
-      
-  <dt><a href="config.html#cfg_Order"><strong>Order</strong></a>
-  </dt>
-
-      
-  <dt><a href="glossary.html#term-os-x"><strong>OS X</strong></a>
-  </dt>
-
-  </dl></td>
-</tr></table>
-
-<h2 id="P">P</h2>
-<table style="width: 100%" class="indextable genindextable"><tr>
-  <td style="width: 33%" valign="top"><dl>
-      
-  <dt><a href="config.html#cfg_Servers_password"><strong>password</strong></a>
-  </dt>
-
-      
-  <dt><a href="glossary.html#term-pcre"><strong>PCRE</strong></a>
-  </dt>
-
-      
-  <dt><a href="glossary.html#term-pdf"><strong>PDF</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_pdf_pages"><strong>pdf_pages</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_PDFDefaultPageSize"><strong>PDFDefaultPageSize</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_PDFPageSizes"><strong>PDFPageSizes</strong></a>
-  </dt>
-
-      
-  <dt><a href="glossary.html#term-pear"><strong>PEAR</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_PersistentConnections"><strong>PersistentConnections</strong></a>
-  </dt>
-
-      
-  <dt><a href="glossary.html#term-php"><strong>PHP</strong></a>
-  </dt>
-
-      
-  <dt><a href="setup.html#index-5">phpMyAdmin configuration storage</a>
-  </dt>
-
-      
-  <dt><a href="setup.html#index-2">PMA_PASSWORD</a>
-  </dt>
-
-  </dl></td>
-  <td style="width: 33%" valign="top"><dl>
-      
-  <dt><a href="setup.html#index-1">PMA_USER</a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_PmaAbsoluteUri"><strong>PmaAbsoluteUri</strong></a>
-  </dt>
-
-      
-  <dt><a href="setup.html#index-5">pmadb</a>, <a href="config.html#cfg_Servers_pmadb"><strong>[1]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_PmaNoRelation_DisableWarning"><strong>PmaNoRelation_DisableWarning</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_port"><strong>port</strong></a>, <a href="glossary.html#term-port"><strong>[1]</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_PropertiesNumColumns"><strong>PropertiesNumColumns</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_ProtectBinary"><strong>ProtectBinary</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_ProxyPass"><strong>ProxyPass</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_ProxyUrl"><strong>ProxyUrl</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_ProxyUser"><strong>ProxyUser</strong></a>
-  </dt>
-
-  </dl></td>
-</tr></table>
-
-<h2 id="Q">Q</h2>
-<table style="width: 100%" class="indextable genindextable"><tr>
-  <td style="width: 33%" valign="top"><dl>
-      
-  <dt><a href="config.html#cfg_QueryHistoryDB"><strong>QueryHistoryDB</strong></a>
-  </dt>
-
-  </dl></td>
-  <td style="width: 33%" valign="top"><dl>
-      
-  <dt><a href="config.html#cfg_QueryHistoryMax"><strong>QueryHistoryMax</strong></a>
-  </dt>
-
-  </dl></td>
-</tr></table>
-
-<h2 id="R">R</h2>
-<table style="width: 100%" class="indextable genindextable"><tr>
-  <td style="width: 33%" valign="top"><dl>
-      
-  <dt><a href="config.html#cfg_Servers_recent"><strong>recent</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_RecodingEngine"><strong>RecodingEngine</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_relation"><strong>relation</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_RelationalDisplay"><strong>RelationalDisplay</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_RememberSorting"><strong>RememberSorting</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_RepeatCells"><strong>RepeatCells</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_ReservedWordDisableWarning"><strong>ReservedWordDisableWarning</strong></a>
-  </dt>
-
-  </dl></td>
-  <td style="width: 33%" valign="top"><dl>
-      
-  <dt><a href="config.html#cfg_RetainQueryBox"><strong>RetainQueryBox</strong></a>
-  </dt>
-
-      
-  <dt><a href="glossary.html#term-rfc"><strong>RFC</strong></a>
-  </dt>
-
-      <dd><dl>
-        
-  <dt><a href="faq.html#index-17">RFC 1867</a>
-  </dt>
-
-        
-  <dt><a href="glossary.html#index-0">RFC 1952</a>
-  </dt>
-
-        
-  <dt><a href="faq.html#index-4">RFC 2616</a>
-  </dt>
-
-      </dl></dd>
-      
-  <dt><a href="glossary.html#term-rfc-1952"><strong>RFC 1952</strong></a>
-  </dt>
-
-      
-  <dt><a href="glossary.html#term-row-record-tuple"><strong>Row (record, tuple)</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_RowActionLinks"><strong>RowActionLinks</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_RowActionLinksWithoutUnique"><strong>RowActionLinksWithoutUnique</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_RowActionType"><strong>RowActionType</strong></a>
-  </dt>
-
-  </dl></td>
-</tr></table>
-
-<h2 id="S">S</h2>
-<table style="width: 100%" class="indextable genindextable"><tr>
-  <td style="width: 33%" valign="top"><dl>
-      
-  <dt><a href="config.html#cfg_SaveCellsAtOnce"><strong>SaveCellsAtOnce</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_SaveDir"><strong>SaveDir</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_savedsearches"><strong>savedsearches</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_SendErrorReports"><strong>SendErrorReports</strong></a>
-  </dt>
-
-      
-  <dt><a href="glossary.html#term-server"><strong>Server</strong></a>
-  </dt>
-
-      
-  <dt>
-    server configuration
-  </dt>
-
-      <dd><dl>
-        
-  <dt><a href="config.html#cfg_Servers_AllowDeny_order"><strong>AllowDeny, order</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_AllowDeny_rules"><strong>AllowDeny, rules</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_AllowNoPassword"><strong>AllowNoPassword</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_AllowRoot"><strong>AllowRoot</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_DisableIS"><strong>DisableIS</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_LogoutURL"><strong>LogoutURL</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_MaxTableUiprefs"><strong>MaxTableUiprefs</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_SessionTimeZone"><strong>SessionTimeZone</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_SignonScript"><strong>SignonScript</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_SignonSession"><strong>SignonSession</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_SignonURL"><strong>SignonURL</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_auth_http_realm"><strong>auth_http_realm</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_auth_type"><strong>auth_type</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_bookmarktable"><strong>bookmarktable</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_central_columns"><strong>central_columns</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_column_info"><strong>column_info</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_compress"><strong>compress</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_connect_type"><strong>connect_type</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_controlhost"><strong>controlhost</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_controlpass"><strong>controlpass</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_controlport"><strong>controlport</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_controluser"><strong>controluser</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_designer_settings"><strong>designer_settings</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_export_templates"><strong>export_templates</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_favorite"><strong>favorite</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_hide_db"><strong>hide_db</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_history"><strong>history</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_host"><strong>host</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_navigationhiding"><strong>navigationhiding</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_nopassword"><strong>nopassword</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_only_db"><strong>only_db</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_password"><strong>password</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_pdf_pages"><strong>pdf_pages</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_pmadb"><strong>pmadb</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_port"><strong>port</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_recent"><strong>recent</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_relation"><strong>relation</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_savedsearches"><strong>savedsearches</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_socket"><strong>socket</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_ssl"><strong>ssl</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_ssl_ca"><strong>ssl_ca</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_ssl_ca_path"><strong>ssl_ca_path</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_ssl_cert"><strong>ssl_cert</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_ssl_ciphers"><strong>ssl_ciphers</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_ssl_key"><strong>ssl_key</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_ssl_verify"><strong>ssl_verify</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_table_coords"><strong>table_coords</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_table_info"><strong>table_info</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_table_uiprefs"><strong>table_uiprefs</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_tracking"><strong>tracking</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_tracking_add_drop_database"><strong>tracking_add_drop_database</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_tracking_add_drop_table"><strong>tracking_add_drop_table</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_tracking_add_drop_view"><strong>tracking_add_drop_view</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_tracking_default_statements"><strong>tracking_default_statements</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_tracking_version_auto_create"><strong>tracking_version_auto_create</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_user"><strong>user</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_userconfig"><strong>userconfig</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_usergroups"><strong>usergroups</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_users"><strong>users</strong></a>
-  </dt>
-
-        
-  <dt><a href="config.html#cfg_Servers_verbose"><strong>verbose</strong></a>
-  </dt>
-
-      </dl></dd>
-      
-  <dt><a href="config.html#cfg_ServerDefault"><strong>ServerDefault</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_ServerLibraryDifference_DisableWarning"><strong>ServerLibraryDifference_DisableWarning</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers"><strong>Servers</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_SessionSavePath"><strong>SessionSavePath</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_SessionTimeZone"><strong>SessionTimeZone</strong></a>
-  </dt>
-
-      
-  <dt><a href="setup.html#index-4">Setup script</a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_ShowAll"><strong>ShowAll</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_ShowBrowseComments"><strong>ShowBrowseComments</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_ShowChgPassword"><strong>ShowChgPassword</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_ShowCreateDb"><strong>ShowCreateDb</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_ShowDatabasesNavigationAsTree"><strong>ShowDatabasesNavigationAsTree</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_ShowDbStructureCreation"><strong>ShowDbStructureCreation</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_ShowDbStructureLastCheck"><strong>ShowDbStructureLastCheck</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_ShowDbStructureLastUpdate"><strong>ShowDbStructureLastUpdate</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_ShowFieldTypesInDataEditView"><strong>ShowFieldTypesInDataEditView</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_ShowFunctionFields"><strong>ShowFunctionFields</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_ShowGitRevision"><strong>ShowGitRevision</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_ShowHint"><strong>ShowHint</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_ShowPropertyComments"><strong>ShowPropertyComments</strong></a>
-  </dt>
-
-  </dl></td>
-  <td style="width: 33%" valign="top"><dl>
-      
-  <dt><a href="config.html#cfg_ShowServerInfo"><strong>ShowServerInfo</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_ShowSQL"><strong>ShowSQL</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_ShowStats"><strong>ShowStats</strong></a>
-  </dt>
-
-      
-  <dt>
-    Signon
-  </dt>
-
-      <dd><dl>
-        
-  <dt><a href="setup.html#index-15">Authentication mode</a>
-  </dt>
-
-      </dl></dd>
-      
-  <dt><a href="config.html#cfg_Servers_SignonScript"><strong>SignonScript</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_SignonSession"><strong>SignonSession</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_SignonURL"><strong>SignonURL</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_SkipLockedTables"><strong>SkipLockedTables</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_socket"><strong>socket</strong></a>, <a href="glossary.html#term-socket"><strong>[1]</strong></a>
-  </dt>
-
-      
-  <dt><a href="glossary.html#term-sql"><strong>SQL</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_SQLQuery_Edit"><strong>SQLQuery, Edit</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_SQLQuery_Explain"><strong>SQLQuery, Explain</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_SQLQuery_Refresh"><strong>SQLQuery, Refresh</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_SQLQuery_ShowAsPHP"><strong>SQLQuery, ShowAsPHP</strong></a>
-  </dt>
-
-      
-  <dt><a href="glossary.html#term-ssl"><strong>SSL</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_ssl"><strong>ssl</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_ssl_ca"><strong>ssl_ca</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_ssl_ca_path"><strong>ssl_ca_path</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_ssl_cert"><strong>ssl_cert</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_ssl_ciphers"><strong>ssl_ciphers</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_ssl_key"><strong>ssl_key</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_ssl_verify"><strong>ssl_verify</strong></a>
-  </dt>
-
-      
-  <dt><a href="glossary.html#term-storage-engines"><strong>Storage Engines</strong></a>
-  </dt>
-
-      
-  <dt><a href="glossary.html#term-stored-procedure"><strong>Stored procedure</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_SuhosinDisableWarning"><strong>SuhosinDisableWarning</strong></a>
-  </dt>
-
-  </dl></td>
-</tr></table>
-
-<h2 id="T">T</h2>
-<table style="width: 100%" class="indextable genindextable"><tr>
-  <td style="width: 33%" valign="top"><dl>
-      
-  <dt><a href="glossary.html#term-table"><strong>table</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_table_coords"><strong>table_coords</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_table_info"><strong>table_info</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_table_uiprefs"><strong>table_uiprefs</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_TableNavigationLinksMode"><strong>TableNavigationLinksMode</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_TablePrimaryKeyOrder"><strong>TablePrimaryKeyOrder</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_TabsMode"><strong>TabsMode</strong></a>
-  </dt>
-
-      
-  <dt><a href="glossary.html#term-tar"><strong>tar</strong></a>
-  </dt>
-
-      
-  <dt><a href="glossary.html#term-tcp"><strong>TCP</strong></a>
-  </dt>
-
-      
-  <dt><a href="glossary.html#term-tcpdf"><strong>TCPDF</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_TempDir"><strong>TempDir</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_TextareaAutoSelect"><strong>TextareaAutoSelect</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_TextareaCols"><strong>TextareaCols</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_TextareaRows"><strong>TextareaRows</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_ThemeDefault"><strong>ThemeDefault</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_ThemeManager"><strong>ThemeManager</strong></a>
-  </dt>
-
-  </dl></td>
-  <td style="width: 33%" valign="top"><dl>
-      
-  <dt><a href="config.html#cfg_ThemePath"><strong>ThemePath</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_ThemePerServer"><strong>ThemePerServer</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_TitleDatabase"><strong>TitleDatabase</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_TitleDefault"><strong>TitleDefault</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_TitleServer"><strong>TitleServer</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_TitleTable"><strong>TitleTable</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_tracking"><strong>tracking</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_tracking_add_drop_database"><strong>tracking_add_drop_database</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_tracking_add_drop_table"><strong>tracking_add_drop_table</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_tracking_add_drop_view"><strong>tracking_add_drop_view</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_tracking_default_statements"><strong>tracking_default_statements</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_tracking_version_auto_create"><strong>tracking_version_auto_create</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_TranslationWarningThreshold"><strong>TranslationWarningThreshold</strong></a>
-  </dt>
-
-      
-  <dt><a href="glossary.html#term-trigger"><strong>trigger</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_TrustedProxies"><strong>TrustedProxies</strong></a>
-  </dt>
-
-  </dl></td>
-</tr></table>
-
-<h2 id="U">U</h2>
-<table style="width: 100%" class="indextable genindextable"><tr>
-  <td style="width: 33%" valign="top"><dl>
-      
-  <dt><a href="glossary.html#term-ufpdf"><strong>UFPDF</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_UploadDir"><strong>UploadDir</strong></a>
-  </dt>
-
-      
-  <dt><a href="glossary.html#term-url"><strong>URL</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_UseDbSearch"><strong>UseDbSearch</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_user"><strong>user</strong></a>
-  </dt>
-
-  </dl></td>
-  <td style="width: 33%" valign="top"><dl>
-      
-  <dt><a href="config.html#cfg_Servers_userconfig"><strong>userconfig</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_usergroups"><strong>usergroups</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_UserprefsDeveloperTab"><strong>UserprefsDeveloperTab</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_UserprefsDisallow"><strong>UserprefsDisallow</strong></a>
-  </dt>
-
-      
-  <dt><a href="config.html#cfg_Servers_users"><strong>users</strong></a>
-  </dt>
-
-  </dl></td>
-</tr></table>
-
-<h2 id="V">V</h2>
-<table style="width: 100%" class="indextable genindextable"><tr>
-  <td style="width: 33%" valign="top"><dl>
-      
-  <dt><a href="config.html#cfg_Servers_verbose"><strong>verbose</strong></a>
-  </dt>
-
-  </dl></td>
-  <td style="width: 33%" valign="top"><dl>
-      
-  <dt><a href="config.html#cfg_VersionCheck"><strong>VersionCheck</strong></a>
-  </dt>
-
-  </dl></td>
-</tr></table>
-
-<h2 id="W">W</h2>
-<table style="width: 100%" class="indextable genindextable"><tr>
-  <td style="width: 33%" valign="top"><dl>
-      
-  <dt><a href="glossary.html#term-webserver"><strong>Webserver</strong></a>
-  </dt>
-
-  </dl></td>
-</tr></table>
-
-<h2 id="X">X</h2>
-<table style="width: 100%" class="indextable genindextable"><tr>
-  <td style="width: 33%" valign="top"><dl>
-      
-  <dt><a href="glossary.html#term-xml"><strong>XML</strong></a>
-  </dt>
-
-  </dl></td>
-</tr></table>
-
-<h2 id="Z">Z</h2>
-<table style="width: 100%" class="indextable genindextable"><tr>
-  <td style="width: 33%" valign="top"><dl>
-      
-  <dt><a href="config.html#cfg_ZeroConf"><strong>ZeroConf</strong></a>
-  </dt>
-
-      
-  <dt><a href="glossary.html#term-zip"><strong>ZIP</strong></a>
-  </dt>
-
-  </dl></td>
-  <td style="width: 33%" valign="top"><dl>
-      
-  <dt><a href="config.html#cfg_ZipDump"><strong>ZipDump</strong></a>
-  </dt>
-
-      
-  <dt><a href="glossary.html#term-zlib"><strong>zlib</strong></a>
-  </dt>
-
-  </dl></td>
-</tr></table>
-
-
-
-          </div>
-        </div>
-      </div>
-      <div class="sphinxsidebar" role="navigation" aria-label="main navigation">
-        <div class="sphinxsidebarwrapper">
-
-   
-
-<div id="searchbox" style="display: none" role="search">
-  <h3>Quick search</h3>
-    <form class="search" action="search.html" method="get">
-      <div><input type="text" name="q" /></div>
-      <div><input type="submit" value="Go" /></div>
-      <input type="hidden" name="check_keywords" value="yes" />
-      <input type="hidden" name="area" value="default" />
-    </form>
-</div>
-<script type="text/javascript">$('#searchbox').show(0);</script>
-        </div>
-      </div>
-      <div class="clearer"></div>
-    </div>
-    <div class="related" role="navigation" aria-label="related navigation">
-      <h3>Navigation</h3>
-      <ul>
-        <li class="right" style="margin-right: 10px">
-          <a href="#" title="General Index"
-             >index</a></li>
-        <li class="nav-item nav-item-0"><a href="index.html">phpMyAdmin 4.6.5.2 documentation</a> &#187;</li> 
-      </ul>
-    </div>
-    <div class="footer" role="contentinfo">
-        &#169; <a href="copyright.html">Copyright</a> 2012 - 2016, The phpMyAdmin devel team.
-      Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.4.6.
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/#pma/doc/html/glossary.html b/#pma/doc/html/glossary.html
deleted file mode 100644
index 32e3fd87..00000000
--- a/#pma/doc/html/glossary.html
+++ /dev/null
@@ -1,613 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    
-    <title>Glossary &#8212; phpMyAdmin 4.6.5.2 documentation</title>
-    
-    <link rel="stylesheet" href="_static/classic.css" type="text/css" />
-    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
-    
-    <script type="text/javascript">
-      var DOCUMENTATION_OPTIONS = {
-        URL_ROOT:    './',
-        VERSION:     '4.6.5.2',
-        COLLAPSE_INDEX: false,
-        FILE_SUFFIX: '.html',
-        HAS_SOURCE:  true
-      };
-    </script>
-    <script type="text/javascript" src="_static/jquery.js"></script>
-    <script type="text/javascript" src="_static/underscore.js"></script>
-    <script type="text/javascript" src="_static/doctools.js"></script>
-    <link rel="copyright" title="Copyright" href="copyright.html" />
-    <link rel="top" title="phpMyAdmin 4.6.5.2 documentation" href="index.html" />
-    <link rel="prev" title="Credits" href="credits.html" /> 
-  </head>
-  <body role="document">
-    <div class="related" role="navigation" aria-label="related navigation">
-      <h3>Navigation</h3>
-      <ul>
-        <li class="right" style="margin-right: 10px">
-          <a href="genindex.html" title="General Index"
-             accesskey="I">index</a></li>
-        <li class="right" >
-          <a href="credits.html" title="Credits"
-             accesskey="P">previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">phpMyAdmin 4.6.5.2 documentation</a> &#187;</li> 
-      </ul>
-    </div>  
-
-    <div class="document">
-      <div class="documentwrapper">
-        <div class="bodywrapper">
-          <div class="body" role="main">
-            
-  <div class="section" id="glossary">
-<span id="id1"></span><h1>Glossary<a class="headerlink" href="#glossary" title="Permalink to this headline">¶</a></h1>
-<p>From Wikipedia, the free encyclopedia</p>
-<dl class="glossary docutils">
-<dt id="term-htaccess">.htaccess</dt>
-<dd><p class="first">the default name of Apache&#8217;s directory-level configuration file.</p>
-<div class="last admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="https://www.wikipedia.org/wiki/.htaccess">https://www.wikipedia.org/wiki/.htaccess</a>&gt;</p>
-</div>
-</dd>
-<dt id="term-acl">ACL</dt>
-<dd>Access Contol List</dd>
-<dt id="term-blowfish">Blowfish</dt>
-<dd><p class="first">a keyed, symmetric block cipher, designed in 1993 by Bruce Schneier.</p>
-<div class="last admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="https://www.wikipedia.org/wiki/Blowfish_(cipher)">https://www.wikipedia.org/wiki/Blowfish_(cipher)</a>&gt;</p>
-</div>
-</dd>
-<dt id="term-browser">Browser</dt>
-<dd><p class="first">a software application that enables a user to display and interact with text, images, and other information typically located on a web page at a website on the World Wide Web.</p>
-<div class="last admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="https://en.wikipedia.org/wiki/Web_browser">https://en.wikipedia.org/wiki/Web_browser</a>&gt;</p>
-</div>
-</dd>
-<dt id="term-bzip2">bzip2</dt>
-<dd><p class="first">a free software/open source data compression algorithm and program developed by Julian Seward.</p>
-<div class="last admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="https://www.wikipedia.org/wiki/Bzip2">https://www.wikipedia.org/wiki/Bzip2</a>&gt;</p>
-</div>
-</dd>
-<dt id="term-cgi">CGI</dt>
-<dd><p class="first">Common Gateway Interface is an important World Wide Web technology that
-enables a client web browser to request data from a program executed on
-the Web server.</p>
-<div class="last admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="https://www.wikipedia.org/wiki/CGI">https://www.wikipedia.org/wiki/CGI</a>&gt;</p>
-</div>
-</dd>
-<dt id="term-changelog">Changelog</dt>
-<dd><p class="first">a log or record of changes made to a project.</p>
-<div class="last admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="https://www.wikipedia.org/wiki/Changelog">https://www.wikipedia.org/wiki/Changelog</a>&gt;</p>
-</div>
-</dd>
-<dt id="term-client">Client</dt>
-<dd><p class="first">a computer system that accesses a (remote) service on another computer by some kind of network.</p>
-<div class="last admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="https://www.wikipedia.org/wiki/Client_(computing)">https://www.wikipedia.org/wiki/Client_(computing)</a>&gt;</p>
-</div>
-</dd>
-<dt id="term-column">column</dt>
-<dd><p class="first">a set of data values of a particular simple type, one for each row of the table.</p>
-<div class="last admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="https://www.wikipedia.org/wiki/Column_(database)">https://www.wikipedia.org/wiki/Column_(database)</a>&gt;</p>
-</div>
-</dd>
-<dt id="term-cookie">Cookie</dt>
-<dd><p class="first">a packet of information sent by a server to a World Wide Web browser and then sent back by the browser each time it accesses that server.</p>
-<div class="last admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="https://www.wikipedia.org/wiki/HTTP_cookie">https://www.wikipedia.org/wiki/HTTP_cookie</a>&gt;</p>
-</div>
-</dd>
-<dt id="term-csv">CSV</dt>
-<dd><p class="first">Comma- separated values</p>
-<div class="last admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="https://www.wikipedia.org/wiki/Comma-separated_values">https://www.wikipedia.org/wiki/Comma-separated_values</a>&gt;</p>
-</div>
-</dd>
-<dt id="term-db">DB</dt>
-<dd>look at <a class="reference internal" href="#term-database"><span class="xref std std-term">database</span></a></dd>
-<dt id="term-database">database</dt>
-<dd><p class="first">an organized collection of data.</p>
-<div class="last admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="https://www.wikipedia.org/wiki/Database">https://www.wikipedia.org/wiki/Database</a>&gt;</p>
-</div>
-</dd>
-<dt id="term-engine">Engine</dt>
-<dd>look at <a class="reference internal" href="#term-storage-engines"><span class="xref std std-term">storage engines</span></a></dd>
-<dt id="term-extension">extension</dt>
-<dd><p class="first">a PHP module that extends PHP with additional functionality.</p>
-<div class="last admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="https://www.wikipedia.org/wiki/extension">https://www.wikipedia.org/wiki/extension</a>&gt;</p>
-</div>
-</dd>
-<dt id="term-faq">FAQ</dt>
-<dd><p class="first">Frequently Asked Questions is a list of commonly asked question and there
-answers.</p>
-<div class="last admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="https://www.wikipedia.org/wiki/FAQ">https://www.wikipedia.org/wiki/FAQ</a>&gt;</p>
-</div>
-</dd>
-<dt id="term-field">Field</dt>
-<dd><p class="first">one part of divided data/columns.</p>
-<div class="last admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="https://www.wikipedia.org/wiki/Field_(computer_science)">https://www.wikipedia.org/wiki/Field_(computer_science)</a>&gt;</p>
-</div>
-</dd>
-<dt id="term-foreign-key">foreign key</dt>
-<dd><p class="first">a column or group of columns in a database row that point to a key column
-or group of columns forming a key of another database row in some
-(usually different) table.</p>
-<div class="last admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="https://www.wikipedia.org/wiki/Foreign_key">https://www.wikipedia.org/wiki/Foreign_key</a>&gt;</p>
-</div>
-</dd>
-<dt id="term-fpdf">FPDF</dt>
-<dd><p class="first">the free <a class="reference internal" href="#term-pdf"><span class="xref std std-term">PDF</span></a> library</p>
-<div class="last admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="http://www.fpdf.org/">http://www.fpdf.org/</a>&gt;</p>
-</div>
-</dd>
-<dt id="term-gd">GD</dt>
-<dd><p class="first">Graphics Library by Thomas Boutell and others for dynamically manipulating images.</p>
-<div class="last admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="https://www.wikipedia.org/wiki/GD_Graphics_Library">https://www.wikipedia.org/wiki/GD_Graphics_Library</a>&gt;</p>
-</div>
-</dd>
-<dt id="term-gd2">GD2</dt>
-<dd>look at <a class="reference internal" href="#term-gd"><span class="xref std std-term">gd</span></a></dd>
-<dt id="term-gzip">gzip</dt>
-<dd><p class="first">gzip is short for GNU zip, a GNU free software file compression program.</p>
-<div class="last admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="https://www.wikipedia.org/wiki/Gzip">https://www.wikipedia.org/wiki/Gzip</a>&gt;</p>
-</div>
-</dd>
-<dt id="term-host">host</dt>
-<dd><p class="first">any machine connected to a computer network, a node that has a hostname.</p>
-<div class="last admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="https://www.wikipedia.org/wiki/Host">https://www.wikipedia.org/wiki/Host</a>&gt;</p>
-</div>
-</dd>
-<dt id="term-hostname">hostname</dt>
-<dd><p class="first">the unique name by which a network attached device is known on a network.</p>
-<div class="last admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="https://www.wikipedia.org/wiki/Hostname">https://www.wikipedia.org/wiki/Hostname</a>&gt;</p>
-</div>
-</dd>
-<dt id="term-http">HTTP</dt>
-<dd><p class="first">HyperText Transfer Protocol is the primary method used to transfer or
-convey information on the World Wide Web.</p>
-<div class="last admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="https://www.wikipedia.org/wiki/HyperText_Transfer_Protocol">https://www.wikipedia.org/wiki/HyperText_Transfer_Protocol</a>&gt;</p>
-</div>
-</dd>
-<dt id="term-https">https</dt>
-<dd><p class="first">a <a class="reference internal" href="#term-http"><span class="xref std std-term">HTTP</span></a>-connection with additional security measures.</p>
-<div class="last admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="https://www.wikipedia.org/wiki/Https:_URI_scheme">https://www.wikipedia.org/wiki/Https:_URI_scheme</a>&gt;</p>
-</div>
-</dd>
-<dt id="term-iec">IEC</dt>
-<dd>International Electrotechnical Commission</dd>
-<dt id="term-iis">IIS</dt>
-<dd><p class="first">Internet Information Services is a set of Internet-based services for
-servers using Microsoft Windows.</p>
-<div class="last admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="https://www.wikipedia.org/wiki/Internet_Information_Services">https://www.wikipedia.org/wiki/Internet_Information_Services</a>&gt;</p>
-</div>
-</dd>
-<dt id="term-index">Index</dt>
-<dd><p class="first">a feature that allows quick access to the rows in a table.</p>
-<div class="last admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="https://www.wikipedia.org/wiki/Index_(database)">https://www.wikipedia.org/wiki/Index_(database)</a>&gt;</p>
-</div>
-</dd>
-<dt id="term-ip">IP</dt>
-<dd><p class="first">Internet Protocol is a data-oriented protocol used by source and
-destination hosts for communicating data across a packet-switched
-internetwork.</p>
-<div class="last admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="https://www.wikipedia.org/wiki/Internet_Protocol">https://www.wikipedia.org/wiki/Internet_Protocol</a>&gt;</p>
-</div>
-</dd>
-<dt id="term-ip-address">IP Address</dt>
-<dd><p class="first">a unique number that devices use in order to identify and communicate with each other on a network utilizing the Internet Protocol standard.</p>
-<div class="last admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="https://www.wikipedia.org/wiki/IP_Address">https://www.wikipedia.org/wiki/IP_Address</a>&gt;</p>
-</div>
-</dd>
-<dt id="term-ipv6">IPv6</dt>
-<dd><p class="first">IPv6 (Internet Protocol version 6) is the latest revision of the
-Internet Protocol (<a class="reference internal" href="#term-ip"><span class="xref std std-term">IP</span></a>), designed to deal with the
-long-anticipated problem of its precedessor IPv4 running out of addresses.</p>
-<div class="last admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="https://www.wikipedia.org/wiki/IPv6">https://www.wikipedia.org/wiki/IPv6</a>&gt;</p>
-</div>
-</dd>
-<dt id="term-isapi">ISAPI</dt>
-<dd><p class="first">Internet Server Application Programming Interface is the API of Internet Information Services (IIS).</p>
-<div class="last admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="https://www.wikipedia.org/wiki/ISAPI">https://www.wikipedia.org/wiki/ISAPI</a>&gt;</p>
-</div>
-</dd>
-<dt id="term-isp">ISP</dt>
-<dd><p class="first">Internet service provider is a business or organization that offers users
-access to the Internet and related services.</p>
-<div class="last admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="https://www.wikipedia.org/wiki/ISP">https://www.wikipedia.org/wiki/ISP</a>&gt;</p>
-</div>
-</dd>
-<dt id="term-iso">ISO</dt>
-<dd>International Standards Organisation</dd>
-<dt id="term-jpeg">JPEG</dt>
-<dd><p class="first">a most commonly used standard method of lossy compression for photographic images.</p>
-<div class="last admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="https://www.wikipedia.org/wiki/JPEG">https://www.wikipedia.org/wiki/JPEG</a>&gt;</p>
-</div>
-</dd>
-<dt id="term-jpg">JPG</dt>
-<dd>look at <a class="reference internal" href="#term-jpeg"><span class="xref std std-term">jpeg</span></a></dd>
-<dt id="term-key">Key</dt>
-<dd>look at <a class="reference internal" href="#term-index"><span class="xref std std-term">index</span></a></dd>
-<dt id="term-latex">LATEX</dt>
-<dd><p class="first">a document preparation system for the TEX typesetting program.</p>
-<div class="last admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="https://www.wikipedia.org/wiki/LaTeX">https://www.wikipedia.org/wiki/LaTeX</a>&gt;</p>
-</div>
-</dd>
-<dt id="term-mac">Mac</dt>
-<dd><p class="first">Apple Macintosh is line of personal computers is designed, developed, manufactured, and marketed by Apple Computer.</p>
-<p class="last">. seealso:: &lt;<a class="reference external" href="https://www.wikipedia.org/wiki/Mac">https://www.wikipedia.org/wiki/Mac</a>&gt;</p>
-</dd>
-<dt id="term-mac-os-x">Mac OS X</dt>
-<dd><p class="first">the operating system which is included with all currently shipping Apple Macintosh computers in the consumer and professional markets.</p>
-<div class="last admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="https://www.wikipedia.org/wiki/Mac_OS_X">https://www.wikipedia.org/wiki/Mac_OS_X</a>&gt;</p>
-</div>
-</dd>
-<dt id="term-mcrypt">MCrypt</dt>
-<dd><p class="first">a cryptographic library.</p>
-<div class="last admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="https://www.wikipedia.org/wiki/MCrypt">https://www.wikipedia.org/wiki/MCrypt</a>&gt;</p>
-</div>
-</dd>
-<dt id="term-42">mcrypt</dt>
-<dd><p class="first">the MCrypt PHP extension.</p>
-<div class="last admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="https://php.net/mcrypt">https://php.net/mcrypt</a>&gt;</p>
-</div>
-</dd>
-<dt id="term-mime">MIME</dt>
-<dd><p class="first">Multipurpose Internet Mail Extensions is
-an Internet Standard for the format of e-mail.</p>
-<div class="last admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="https://www.wikipedia.org/wiki/MIME">https://www.wikipedia.org/wiki/MIME</a>&gt;</p>
-</div>
-</dd>
-<dt id="term-module">module</dt>
-<dd><p class="first">some sort of extension for the Apache Webserver.</p>
-<div class="last admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="https://www.wikipedia.org/wiki/module">https://www.wikipedia.org/wiki/module</a>&gt;</p>
-</div>
-</dd>
-<dt id="term-mod-proxy-fcgi">mod_proxy_fcgi</dt>
-<dd>an Apache module implmenting a Fast CGI interface; PHP can be run as a CGI module, FastCGI, or
-directly as an Apache module.</dd>
-<dt id="term-mysql">MySQL</dt>
-<dd><p class="first">a multithreaded, multi-user, SQL (Structured Query Language) Database Management System (DBMS).</p>
-<div class="last admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="https://www.wikipedia.org/wiki/MySQL">https://www.wikipedia.org/wiki/MySQL</a>&gt;</p>
-</div>
-</dd>
-<dt id="term-mysqli">mysqli</dt>
-<dd><p class="first">the improved MySQL client PHP extension.</p>
-<div class="last admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="https://php.net/mysqli">https://php.net/mysqli</a>&gt;</p>
-</div>
-</dd>
-<dt id="term-48">mysql</dt>
-<dd><p class="first">the MySQL client PHP extension.</p>
-<div class="last admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="https://php.net/mysql">https://php.net/mysql</a>&gt;</p>
-</div>
-</dd>
-<dt id="term-opendocument">OpenDocument</dt>
-<dd><p class="first">open standard for office documents.</p>
-<div class="last admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="https://www.wikipedia.org/wiki/OpenDocument">https://www.wikipedia.org/wiki/OpenDocument</a>&gt;</p>
-</div>
-</dd>
-<dt id="term-os-x">OS X</dt>
-<dd><p class="first">look at <a class="reference internal" href="#term-mac-os-x"><span class="xref std std-term">Mac OS X</span></a>.</p>
-<div class="last admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="https://www.wikipedia.org/wiki/OS_X">https://www.wikipedia.org/wiki/OS_X</a>&gt;</p>
-</div>
-</dd>
-<dt id="term-pdf">PDF</dt>
-<dd><p class="first">Portable Document Format is a file format developed by Adobe Systems for
-representing two dimensional documents in a device independent and
-resolution independent format.</p>
-<div class="last admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="https://www.wikipedia.org/wiki/Portable_Document_Format">https://www.wikipedia.org/wiki/Portable_Document_Format</a>&gt;</p>
-</div>
-</dd>
-<dt id="term-pear">PEAR</dt>
-<dd><p class="first">the PHP Extension and Application Repository.</p>
-<div class="last admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="https://pear.php.net/">https://pear.php.net/</a>&gt;</p>
-</div>
-</dd>
-<dt id="term-pcre">PCRE</dt>
-<dd><p class="first">Perl Compatible Regular Expressions is the perl-compatible regular
-expression functions for PHP</p>
-<div class="last admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="https://php.net/pcre">https://php.net/pcre</a>&gt;</p>
-</div>
-</dd>
-<dt id="term-php">PHP</dt>
-<dd><p class="first">short for &#8220;PHP: Hypertext Preprocessor&#8221;, is an open-source, reflective
-programming language used mainly for developing server-side applications
-and dynamic web content, and more recently, a broader range of software
-applications.</p>
-<div class="last admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="https://www.wikipedia.org/wiki/PHP">https://www.wikipedia.org/wiki/PHP</a>&gt;</p>
-</div>
-</dd>
-<dt id="term-port">port</dt>
-<dd><p class="first">a connection through which data is sent and received.</p>
-<div class="last admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="https://www.wikipedia.org/wiki/Port_(computing)">https://www.wikipedia.org/wiki/Port_(computing)</a>&gt;</p>
-</div>
-</dd>
-<dt id="term-rfc">RFC</dt>
-<dd><p class="first">Request for Comments (RFC) documents are a series of memoranda
-encompassing new research, innovations, and methodologies applicable to
-Internet technologies.</p>
-<div class="last admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="https://www.wikipedia.org/wiki/Request_for_Comments">https://www.wikipedia.org/wiki/Request_for_Comments</a>&gt;</p>
-</div>
-</dd>
-<dt id="term-rfc-1952">RFC 1952</dt>
-<dd><p class="first">GZIP file format specification version 4.3</p>
-<div class="last admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last"><span class="target" id="index-0"></span><a class="rfc reference external" href="https://tools.ietf.org/html/rfc1952.html"><strong>RFC 1952</strong></a></p>
-</div>
-</dd>
-<dt id="term-row-record-tuple">Row (record, tuple)</dt>
-<dd><p class="first">represents a single, implicitly structured data item in a table.</p>
-<div class="last admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="https://www.wikipedia.org/wiki/Row_(database)">https://www.wikipedia.org/wiki/Row_(database)</a>&gt;</p>
-</div>
-</dd>
-<dt id="term-server">Server</dt>
-<dd><p class="first">a computer system that provides services to other computing systems over a network.</p>
-<div class="last admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="https://www.wikipedia.org/wiki/Server_(computing)">https://www.wikipedia.org/wiki/Server_(computing)</a>&gt;</p>
-</div>
-</dd>
-<dt id="term-storage-engines">Storage Engines</dt>
-<dd><p class="first">handlers for different table types</p>
-<div class="last admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="https://dev.mysql.com/doc/en/storage-engines.html">https://dev.mysql.com/doc/en/storage-engines.html</a>&gt;</p>
-</div>
-</dd>
-<dt id="term-socket">socket</dt>
-<dd><p class="first">a form of inter-process communication.</p>
-<div class="last admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="https://www.wikipedia.org/wiki/Socket#Computer_sockets">https://www.wikipedia.org/wiki/Socket#Computer_sockets</a>&gt;</p>
-</div>
-</dd>
-<dt id="term-ssl">SSL</dt>
-<dd><p class="first">Secure Sockets Layer is a cryptographic protocol which provides secure
-communication on the Internet.</p>
-<div class="last admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="https://www.wikipedia.org/wiki/Secure_Sockets_Layer">https://www.wikipedia.org/wiki/Secure_Sockets_Layer</a>&gt;</p>
-</div>
-</dd>
-<dt id="term-stored-procedure">Stored procedure</dt>
-<dd><p class="first">a subroutine available to applications accessing a relational database system</p>
-<div class="last admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="https://en.wikipedia.org/wiki/Stored_procedure">https://en.wikipedia.org/wiki/Stored_procedure</a>&gt;</p>
-</div>
-</dd>
-<dt id="term-sql">SQL</dt>
-<dd><p class="first">Structured Query Language</p>
-<div class="last admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="https://www.wikipedia.org/wiki/SQL">https://www.wikipedia.org/wiki/SQL</a>&gt;</p>
-</div>
-</dd>
-<dt id="term-table">table</dt>
-<dd><p class="first">a set of data elements (cells) that is organized, defined and stored as
-horizontal rows and vertical columns where each item can be uniquely
-identified by a label or key or by it?s position in relation to other
-items.</p>
-<div class="last admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="https://www.wikipedia.org/wiki/Table_(database)">https://www.wikipedia.org/wiki/Table_(database)</a>&gt;</p>
-</div>
-</dd>
-<dt id="term-tar">tar</dt>
-<dd><p class="first">a type of archive file format: the Tape ARchive format.</p>
-<div class="last admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="https://www.wikipedia.org/wiki/Tar_(file_format)">https://www.wikipedia.org/wiki/Tar_(file_format)</a>&gt;</p>
-</div>
-</dd>
-<dt id="term-tcp">TCP</dt>
-<dd><p class="first">Transmission Control Protocol is one of the core protocols of the
-Internet protocol suite.</p>
-<div class="last admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="https://www.wikipedia.org/wiki/TCP">https://www.wikipedia.org/wiki/TCP</a>&gt;</p>
-</div>
-</dd>
-<dt id="term-tcpdf">TCPDF</dt>
-<dd><p class="first">Rewrite of <a class="reference internal" href="#term-ufpdf"><span class="xref std std-term">UFPDF</span></a> with various improvements.</p>
-<div class="last admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="https://tcpdf.org/">https://tcpdf.org/</a>&gt;</p>
-</div>
-</dd>
-<dt id="term-trigger">trigger</dt>
-<dd><p class="first">a procedural code that is automatically executed in response to certain events on a particular table or view in a database</p>
-<div class="last admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="https://en.wikipedia.org/wiki/Database_trigger">https://en.wikipedia.org/wiki/Database_trigger</a>&gt;</p>
-</div>
-</dd>
-<dt id="term-ufpdf">UFPDF</dt>
-<dd>Unicode/UTF-8 extension for <a class="reference internal" href="#term-fpdf"><span class="xref std std-term">FPDF</span></a></dd>
-<dt id="term-url">URL</dt>
-<dd><p class="first">Uniform Resource Locator is a sequence of characters, conforming to a
-standardized format, that is used for referring to resources, such as
-documents and images on the Internet, by their location.</p>
-<div class="last admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="https://www.wikipedia.org/wiki/URL">https://www.wikipedia.org/wiki/URL</a>&gt;</p>
-</div>
-</dd>
-<dt id="term-webserver">Webserver</dt>
-<dd><p class="first">A computer (program) that is responsible for accepting HTTP requests from clients and serving them Web pages.</p>
-<div class="last admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="https://www.wikipedia.org/wiki/Webserver">https://www.wikipedia.org/wiki/Webserver</a>&gt;</p>
-</div>
-</dd>
-<dt id="term-xml">XML</dt>
-<dd><p class="first">Extensible Markup Language is a W3C-recommended general- purpose markup
-language for creating special-purpose markup languages, capable of
-describing many different kinds of data.</p>
-<div class="last admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="https://www.wikipedia.org/wiki/XML">https://www.wikipedia.org/wiki/XML</a>&gt;</p>
-</div>
-</dd>
-<dt id="term-zip">ZIP</dt>
-<dd><p class="first">a popular data compression and archival format.</p>
-<div class="last admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="https://www.wikipedia.org/wiki/ZIP_(file_format)">https://www.wikipedia.org/wiki/ZIP_(file_format)</a>&gt;</p>
-</div>
-</dd>
-<dt id="term-zlib">zlib</dt>
-<dd><p class="first">an open-source, cross- platform data compression library by Jean-loup Gailly and Mark Adler.</p>
-<div class="last admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">&lt;<a class="reference external" href="https://www.wikipedia.org/wiki/Zlib">https://www.wikipedia.org/wiki/Zlib</a>&gt;</p>
-</div>
-</dd>
-</dl>
-</div>
-
-
-          </div>
-        </div>
-      </div>
-      <div class="sphinxsidebar" role="navigation" aria-label="main navigation">
-        <div class="sphinxsidebarwrapper">
-  <h4>Previous topic</h4>
-  <p class="topless"><a href="credits.html"
-                        title="previous chapter">Credits</a></p>
-  <div role="note" aria-label="source link">
-    <h3>This Page</h3>
-    <ul class="this-page-menu">
-      <li><a href="_sources/glossary.txt"
-            rel="nofollow">Show Source</a></li>
-    </ul>
-   </div>
-<div id="searchbox" style="display: none" role="search">
-  <h3>Quick search</h3>
-    <form class="search" action="search.html" method="get">
-      <div><input type="text" name="q" /></div>
-      <div><input type="submit" value="Go" /></div>
-      <input type="hidden" name="check_keywords" value="yes" />
-      <input type="hidden" name="area" value="default" />
-    </form>
-</div>
-<script type="text/javascript">$('#searchbox').show(0);</script>
-        </div>
-      </div>
-      <div class="clearer"></div>
-    </div>
-    <div class="related" role="navigation" aria-label="related navigation">
-      <h3>Navigation</h3>
-      <ul>
-        <li class="right" style="margin-right: 10px">
-          <a href="genindex.html" title="General Index"
-             >index</a></li>
-        <li class="right" >
-          <a href="credits.html" title="Credits"
-             >previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">phpMyAdmin 4.6.5.2 documentation</a> &#187;</li> 
-      </ul>
-    </div>
-    <div class="footer" role="contentinfo">
-        &#169; <a href="copyright.html">Copyright</a> 2012 - 2016, The phpMyAdmin devel team.
-      Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.4.6.
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/#pma/doc/html/import_export.html b/#pma/doc/html/import_export.html
deleted file mode 100644
index c5de2983..00000000
--- a/#pma/doc/html/import_export.html
+++ /dev/null
@@ -1,145 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    
-    <title>Import and export &#8212; phpMyAdmin 4.6.5.2 documentation</title>
-    
-    <link rel="stylesheet" href="_static/classic.css" type="text/css" />
-    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
-    
-    <script type="text/javascript">
-      var DOCUMENTATION_OPTIONS = {
-        URL_ROOT:    './',
-        VERSION:     '4.6.5.2',
-        COLLAPSE_INDEX: false,
-        FILE_SUFFIX: '.html',
-        HAS_SOURCE:  true
-      };
-    </script>
-    <script type="text/javascript" src="_static/jquery.js"></script>
-    <script type="text/javascript" src="_static/underscore.js"></script>
-    <script type="text/javascript" src="_static/doctools.js"></script>
-    <link rel="copyright" title="Copyright" href="copyright.html" />
-    <link rel="top" title="phpMyAdmin 4.6.5.2 documentation" href="index.html" />
-    <link rel="up" title="User Guide" href="user.html" />
-    <link rel="next" title="FAQ - Frequently Asked Questions" href="faq.html" />
-    <link rel="prev" title="Other sources of information" href="other.html" /> 
-  </head>
-  <body role="document">
-    <div class="related" role="navigation" aria-label="related navigation">
-      <h3>Navigation</h3>
-      <ul>
-        <li class="right" style="margin-right: 10px">
-          <a href="genindex.html" title="General Index"
-             accesskey="I">index</a></li>
-        <li class="right" >
-          <a href="faq.html" title="FAQ - Frequently Asked Questions"
-             accesskey="N">next</a> |</li>
-        <li class="right" >
-          <a href="other.html" title="Other sources of information"
-             accesskey="P">previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">phpMyAdmin 4.6.5.2 documentation</a> &#187;</li>
-          <li class="nav-item nav-item-1"><a href="user.html" accesskey="U">User Guide</a> &#187;</li> 
-      </ul>
-    </div>  
-
-    <div class="document">
-      <div class="documentwrapper">
-        <div class="bodywrapper">
-          <div class="body" role="main">
-            
-  <div class="section" id="import-and-export">
-<h1>Import and export<a class="headerlink" href="#import-and-export" title="Permalink to this headline">¶</a></h1>
-<p>In addition to the standard Import and Export tab, you can also import an SQL file directly by dragging and dropping
-it from your local file manager to the phpMyAdmin interface in your web browser.</p>
-<div class="section" id="open-document-spreadsheet">
-<h2>Open Document Spreadsheet<a class="headerlink" href="#open-document-spreadsheet" title="Permalink to this headline">¶</a></h2>
-<p>When importing an ODS speadsheet, the spreadsheet must be named in a specific way in order to make the
-import as simple as possible.</p>
-<div class="section" id="table-name">
-<h3>Table name<a class="headerlink" href="#table-name" title="Permalink to this headline">¶</a></h3>
-<p>During import, phpMyAdmin uses the sheet name as the table name; you should rename the
-sheet in your spreadsheet program in order to match your existing table name (or the table you wish to create,
-though this is less of a concern since you could quickly rename the new table from the Operations tab).</p>
-</div>
-<div class="section" id="column-names">
-<h3>Column names<a class="headerlink" href="#column-names" title="Permalink to this headline">¶</a></h3>
-<p>You should also make the first row of your spreadsheet a header with the names of the columns (this can be
-accomplished by inserting a new row at the top of your spreadsheet). When on the Import screen, select the
-checkbox for &#8220;The first line of the file contains the table column names;&#8221; this way your newly imported
-data will go to the proper columns.</p>
-</div>
-</div>
-</div>
-
-
-          </div>
-        </div>
-      </div>
-      <div class="sphinxsidebar" role="navigation" aria-label="main navigation">
-        <div class="sphinxsidebarwrapper">
-  <h3><a href="index.html">Table Of Contents</a></h3>
-  <ul>
-<li><a class="reference internal" href="#">Import and export</a><ul>
-<li><a class="reference internal" href="#open-document-spreadsheet">Open Document Spreadsheet</a><ul>
-<li><a class="reference internal" href="#table-name">Table name</a></li>
-<li><a class="reference internal" href="#column-names">Column names</a></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-
-  <h4>Previous topic</h4>
-  <p class="topless"><a href="other.html"
-                        title="previous chapter">Other sources of information</a></p>
-  <h4>Next topic</h4>
-  <p class="topless"><a href="faq.html"
-                        title="next chapter">FAQ - Frequently Asked Questions</a></p>
-  <div role="note" aria-label="source link">
-    <h3>This Page</h3>
-    <ul class="this-page-menu">
-      <li><a href="_sources/import_export.txt"
-            rel="nofollow">Show Source</a></li>
-    </ul>
-   </div>
-<div id="searchbox" style="display: none" role="search">
-  <h3>Quick search</h3>
-    <form class="search" action="search.html" method="get">
-      <div><input type="text" name="q" /></div>
-      <div><input type="submit" value="Go" /></div>
-      <input type="hidden" name="check_keywords" value="yes" />
-      <input type="hidden" name="area" value="default" />
-    </form>
-</div>
-<script type="text/javascript">$('#searchbox').show(0);</script>
-        </div>
-      </div>
-      <div class="clearer"></div>
-    </div>
-    <div class="related" role="navigation" aria-label="related navigation">
-      <h3>Navigation</h3>
-      <ul>
-        <li class="right" style="margin-right: 10px">
-          <a href="genindex.html" title="General Index"
-             >index</a></li>
-        <li class="right" >
-          <a href="faq.html" title="FAQ - Frequently Asked Questions"
-             >next</a> |</li>
-        <li class="right" >
-          <a href="other.html" title="Other sources of information"
-             >previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">phpMyAdmin 4.6.5.2 documentation</a> &#187;</li>
-          <li class="nav-item nav-item-1"><a href="user.html" >User Guide</a> &#187;</li> 
-      </ul>
-    </div>
-    <div class="footer" role="contentinfo">
-        &#169; <a href="copyright.html">Copyright</a> 2012 - 2016, The phpMyAdmin devel team.
-      Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.4.6.
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/#pma/doc/html/index.html b/#pma/doc/html/index.html
deleted file mode 100644
index c3e0ed02..00000000
--- a/#pma/doc/html/index.html
+++ /dev/null
@@ -1,210 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    
-    <title>Welcome to phpMyAdmin’s documentation! &#8212; phpMyAdmin 4.6.5.2 documentation</title>
-    
-    <link rel="stylesheet" href="_static/classic.css" type="text/css" />
-    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
-    
-    <script type="text/javascript">
-      var DOCUMENTATION_OPTIONS = {
-        URL_ROOT:    './',
-        VERSION:     '4.6.5.2',
-        COLLAPSE_INDEX: false,
-        FILE_SUFFIX: '.html',
-        HAS_SOURCE:  true
-      };
-    </script>
-    <script type="text/javascript" src="_static/jquery.js"></script>
-    <script type="text/javascript" src="_static/underscore.js"></script>
-    <script type="text/javascript" src="_static/doctools.js"></script>
-    <link rel="copyright" title="Copyright" href="copyright.html" />
-    <link rel="top" title="phpMyAdmin 4.6.5.2 documentation" href="#" />
-    <link rel="next" title="Introduction" href="intro.html" /> 
-  </head>
-  <body role="document">
-    <div class="related" role="navigation" aria-label="related navigation">
-      <h3>Navigation</h3>
-      <ul>
-        <li class="right" style="margin-right: 10px">
-          <a href="genindex.html" title="General Index"
-             accesskey="I">index</a></li>
-        <li class="right" >
-          <a href="intro.html" title="Introduction"
-             accesskey="N">next</a> |</li>
-        <li class="nav-item nav-item-0"><a href="#">phpMyAdmin 4.6.5.2 documentation</a> &#187;</li> 
-      </ul>
-    </div>  
-
-    <div class="document">
-      <div class="documentwrapper">
-        <div class="bodywrapper">
-          <div class="body" role="main">
-            
-  <div class="section" id="welcome-to-phpmyadmin-s-documentation">
-<h1>Welcome to phpMyAdmin&#8217;s documentation!<a class="headerlink" href="#welcome-to-phpmyadmin-s-documentation" title="Permalink to this headline">¶</a></h1>
-<p>Contents:</p>
-<div class="toctree-wrapper compound">
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="intro.html">Introduction</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="intro.html#supported-features">Supported features</a></li>
-<li class="toctree-l2"><a class="reference internal" href="intro.html#a-word-about-users">A word about users</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="require.html">Requirements</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="require.html#web-server">Web server</a></li>
-<li class="toctree-l2"><a class="reference internal" href="require.html#php">PHP</a></li>
-<li class="toctree-l2"><a class="reference internal" href="require.html#database">Database</a></li>
-<li class="toctree-l2"><a class="reference internal" href="require.html#web-browser">Web browser</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="setup.html">Installation</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="setup.html#linux-distributions">Linux distributions</a></li>
-<li class="toctree-l2"><a class="reference internal" href="setup.html#installing-on-windows">Installing on Windows</a></li>
-<li class="toctree-l2"><a class="reference internal" href="setup.html#installing-using-composer">Installing using Composer</a></li>
-<li class="toctree-l2"><a class="reference internal" href="setup.html#installing-using-docker">Installing using Docker</a></li>
-<li class="toctree-l2"><a class="reference internal" href="setup.html#quick-install">Quick Install</a></li>
-<li class="toctree-l2"><a class="reference internal" href="setup.html#verifying-phpmyadmin-releases">Verifying phpMyAdmin releases</a></li>
-<li class="toctree-l2"><a class="reference internal" href="setup.html#phpmyadmin-configuration-storage">phpMyAdmin configuration storage</a></li>
-<li class="toctree-l2"><a class="reference internal" href="setup.html#upgrading-from-an-older-version">Upgrading from an older version</a></li>
-<li class="toctree-l2"><a class="reference internal" href="setup.html#using-authentication-modes">Using authentication modes</a></li>
-<li class="toctree-l2"><a class="reference internal" href="setup.html#securing-your-phpmyadmin-installation">Securing your phpMyAdmin installation</a></li>
-<li class="toctree-l2"><a class="reference internal" href="setup.html#known-issues">Known issues</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="config.html">Configuration</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="config.html#basic-settings">Basic settings</a></li>
-<li class="toctree-l2"><a class="reference internal" href="config.html#server-connection-settings">Server connection settings</a></li>
-<li class="toctree-l2"><a class="reference internal" href="config.html#generic-settings">Generic settings</a></li>
-<li class="toctree-l2"><a class="reference internal" href="config.html#cookie-authentication-options">Cookie authentication options</a></li>
-<li class="toctree-l2"><a class="reference internal" href="config.html#navigation-panel-setup">Navigation panel setup</a></li>
-<li class="toctree-l2"><a class="reference internal" href="config.html#main-panel">Main panel</a></li>
-<li class="toctree-l2"><a class="reference internal" href="config.html#database-structure">Database structure</a></li>
-<li class="toctree-l2"><a class="reference internal" href="config.html#browse-mode">Browse mode</a></li>
-<li class="toctree-l2"><a class="reference internal" href="config.html#editing-mode">Editing mode</a></li>
-<li class="toctree-l2"><a class="reference internal" href="config.html#export-and-import-settings">Export and import settings</a></li>
-<li class="toctree-l2"><a class="reference internal" href="config.html#tabs-display-settings">Tabs display settings</a></li>
-<li class="toctree-l2"><a class="reference internal" href="config.html#pdf-options">PDF Options</a></li>
-<li class="toctree-l2"><a class="reference internal" href="config.html#languages">Languages</a></li>
-<li class="toctree-l2"><a class="reference internal" href="config.html#web-server-settings">Web server settings</a></li>
-<li class="toctree-l2"><a class="reference internal" href="config.html#theme-settings">Theme settings</a></li>
-<li class="toctree-l2"><a class="reference internal" href="config.html#design-customization">Design customization</a></li>
-<li class="toctree-l2"><a class="reference internal" href="config.html#text-fields">Text fields</a></li>
-<li class="toctree-l2"><a class="reference internal" href="config.html#sql-query-box-settings">SQL query box settings</a></li>
-<li class="toctree-l2"><a class="reference internal" href="config.html#web-server-upload-save-import-directories">Web server upload/save/import directories</a></li>
-<li class="toctree-l2"><a class="reference internal" href="config.html#various-display-setting">Various display setting</a></li>
-<li class="toctree-l2"><a class="reference internal" href="config.html#page-titles">Page titles</a></li>
-<li class="toctree-l2"><a class="reference internal" href="config.html#theme-manager-settings">Theme manager settings</a></li>
-<li class="toctree-l2"><a class="reference internal" href="config.html#default-queries">Default queries</a></li>
-<li class="toctree-l2"><a class="reference internal" href="config.html#mysql-settings">MySQL settings</a></li>
-<li class="toctree-l2"><a class="reference internal" href="config.html#developer">Developer</a></li>
-<li class="toctree-l2"><a class="reference internal" href="config.html#examples">Examples</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="user.html">User Guide</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="transformations.html">Transformations</a></li>
-<li class="toctree-l2"><a class="reference internal" href="privileges.html">User management</a></li>
-<li class="toctree-l2"><a class="reference internal" href="other.html">Other sources of information</a></li>
-<li class="toctree-l2"><a class="reference internal" href="import_export.html">Import and export</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="faq.html">FAQ - Frequently Asked Questions</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="faq.html#server">Server</a></li>
-<li class="toctree-l2"><a class="reference internal" href="faq.html#configuration">Configuration</a></li>
-<li class="toctree-l2"><a class="reference internal" href="faq.html#known-limitations">Known limitations</a></li>
-<li class="toctree-l2"><a class="reference internal" href="faq.html#isps-multi-user-installations">ISPs, multi-user installations</a></li>
-<li class="toctree-l2"><a class="reference internal" href="faq.html#browsers-or-client-os">Browsers or client OS</a></li>
-<li class="toctree-l2"><a class="reference internal" href="faq.html#using-phpmyadmin">Using phpMyAdmin</a></li>
-<li class="toctree-l2"><a class="reference internal" href="faq.html#phpmyadmin-project">phpMyAdmin project</a></li>
-<li class="toctree-l2"><a class="reference internal" href="faq.html#security">Security</a></li>
-<li class="toctree-l2"><a class="reference internal" href="faq.html#synchronization">Synchronization</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="developers.html">Developers Information</a></li>
-<li class="toctree-l1"><a class="reference internal" href="vendors.html">Distributing and packaging phpMyAdmin</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="vendors.html#external-libraries">External libraries</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="copyright.html">Copyright</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="copyright.html#third-party-licenses">Third party licenses</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="credits.html">Credits</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="credits.html#credits-in-chronological-order">Credits, in chronological order</a></li>
-<li class="toctree-l2"><a class="reference internal" href="credits.html#translators">Translators</a></li>
-<li class="toctree-l2"><a class="reference internal" href="credits.html#documentation-translators">Documentation translators</a></li>
-<li class="toctree-l2"><a class="reference internal" href="credits.html#original-credits-of-version-2-1-0">Original Credits of Version 2.1.0</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="glossary.html">Glossary</a></li>
-</ul>
-</div>
-</div>
-<div class="section" id="indices-and-tables">
-<h1>Indices and tables<a class="headerlink" href="#indices-and-tables" title="Permalink to this headline">¶</a></h1>
-<ul class="simple">
-<li><a class="reference internal" href="genindex.html"><span class="std std-ref">Index</span></a></li>
-<li><a class="reference internal" href="search.html"><span class="std std-ref">Search Page</span></a></li>
-<li><a class="reference internal" href="glossary.html#glossary"><span class="std std-ref">Glossary</span></a></li>
-</ul>
-</div>
-
-
-          </div>
-        </div>
-      </div>
-      <div class="sphinxsidebar" role="navigation" aria-label="main navigation">
-        <div class="sphinxsidebarwrapper">
-  <h3><a href="#">Table Of Contents</a></h3>
-  <ul>
-<li><a class="reference internal" href="#">Welcome to phpMyAdmin&#8217;s documentation!</a></li>
-<li><a class="reference internal" href="#indices-and-tables">Indices and tables</a></li>
-</ul>
-
-  <h4>Next topic</h4>
-  <p class="topless"><a href="intro.html"
-                        title="next chapter">Introduction</a></p>
-  <div role="note" aria-label="source link">
-    <h3>This Page</h3>
-    <ul class="this-page-menu">
-      <li><a href="_sources/index.txt"
-            rel="nofollow">Show Source</a></li>
-    </ul>
-   </div>
-<div id="searchbox" style="display: none" role="search">
-  <h3>Quick search</h3>
-    <form class="search" action="search.html" method="get">
-      <div><input type="text" name="q" /></div>
-      <div><input type="submit" value="Go" /></div>
-      <input type="hidden" name="check_keywords" value="yes" />
-      <input type="hidden" name="area" value="default" />
-    </form>
-</div>
-<script type="text/javascript">$('#searchbox').show(0);</script>
-        </div>
-      </div>
-      <div class="clearer"></div>
-    </div>
-    <div class="related" role="navigation" aria-label="related navigation">
-      <h3>Navigation</h3>
-      <ul>
-        <li class="right" style="margin-right: 10px">
-          <a href="genindex.html" title="General Index"
-             >index</a></li>
-        <li class="right" >
-          <a href="intro.html" title="Introduction"
-             >next</a> |</li>
-        <li class="nav-item nav-item-0"><a href="#">phpMyAdmin 4.6.5.2 documentation</a> &#187;</li> 
-      </ul>
-    </div>
-    <div class="footer" role="contentinfo">
-        &#169; <a href="copyright.html">Copyright</a> 2012 - 2016, The phpMyAdmin devel team.
-      Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.4.6.
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/#pma/doc/html/intro.html b/#pma/doc/html/intro.html
deleted file mode 100644
index d90b3abd..00000000
--- a/#pma/doc/html/intro.html
+++ /dev/null
@@ -1,179 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    
-    <title>Introduction &#8212; phpMyAdmin 4.6.5.2 documentation</title>
-    
-    <link rel="stylesheet" href="_static/classic.css" type="text/css" />
-    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
-    
-    <script type="text/javascript">
-      var DOCUMENTATION_OPTIONS = {
-        URL_ROOT:    './',
-        VERSION:     '4.6.5.2',
-        COLLAPSE_INDEX: false,
-        FILE_SUFFIX: '.html',
-        HAS_SOURCE:  true
-      };
-    </script>
-    <script type="text/javascript" src="_static/jquery.js"></script>
-    <script type="text/javascript" src="_static/underscore.js"></script>
-    <script type="text/javascript" src="_static/doctools.js"></script>
-    <link rel="copyright" title="Copyright" href="copyright.html" />
-    <link rel="top" title="phpMyAdmin 4.6.5.2 documentation" href="index.html" />
-    <link rel="next" title="Requirements" href="require.html" />
-    <link rel="prev" title="Welcome to phpMyAdmin’s documentation!" href="index.html" /> 
-  </head>
-  <body role="document">
-    <div class="related" role="navigation" aria-label="related navigation">
-      <h3>Navigation</h3>
-      <ul>
-        <li class="right" style="margin-right: 10px">
-          <a href="genindex.html" title="General Index"
-             accesskey="I">index</a></li>
-        <li class="right" >
-          <a href="require.html" title="Requirements"
-             accesskey="N">next</a> |</li>
-        <li class="right" >
-          <a href="index.html" title="Welcome to phpMyAdmin’s documentation!"
-             accesskey="P">previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">phpMyAdmin 4.6.5.2 documentation</a> &#187;</li> 
-      </ul>
-    </div>  
-
-    <div class="document">
-      <div class="documentwrapper">
-        <div class="bodywrapper">
-          <div class="body" role="main">
-            
-  <div class="section" id="introduction">
-<span id="intro"></span><h1>Introduction<a class="headerlink" href="#introduction" title="Permalink to this headline">¶</a></h1>
-<p>phpMyAdmin can manage a whole MySQL server (needs a super-user) as
-well as a single database. To accomplish the latter you&#8217;ll need a
-properly set up MySQL user who can read/write only the desired
-database. It&#8217;s up to you to look up the appropriate part in the MySQL
-manual.</p>
-<div class="section" id="supported-features">
-<h2>Supported features<a class="headerlink" href="#supported-features" title="Permalink to this headline">¶</a></h2>
-<p>Currently phpMyAdmin can:</p>
-<ul class="simple">
-<li>browse and drop databases, tables, views, columns and indexes</li>
-<li>display multiple results sets through stored procedures or queries</li>
-<li>create, copy, drop, rename and alter databases, tables, columns and
-indexes</li>
-<li>maintenance server, databases and tables, with proposals on server
-configuration</li>
-<li>execute, edit and bookmark any <a class="reference internal" href="glossary.html#term-sql"><span class="xref std std-term">SQL</span></a>-statement, even batch-queries</li>
-<li>load text files into tables</li>
-<li>create <a class="footnote-reference" href="#f1" id="id1">[1]</a> and read dumps of tables</li>
-<li>export <a class="footnote-reference" href="#f1" id="id2">[1]</a> data to various formats: <a class="reference internal" href="glossary.html#term-csv"><span class="xref std std-term">CSV</span></a>, <a class="reference internal" href="glossary.html#term-xml"><span class="xref std std-term">XML</span></a>, <a class="reference internal" href="glossary.html#term-pdf"><span class="xref std std-term">PDF</span></a>,
-<a class="reference internal" href="glossary.html#term-iso"><span class="xref std std-term">ISO</span></a>/<a class="reference internal" href="glossary.html#term-iec"><span class="xref std std-term">IEC</span></a> 26300 - <a class="reference internal" href="glossary.html#term-opendocument"><span class="xref std std-term">OpenDocument</span></a> Text and Spreadsheet, Microsoft
-Word 2000, and LATEX formats</li>
-<li>import data and <a class="reference internal" href="glossary.html#term-48"><span class="xref std std-term">MySQL</span></a> structures from <a class="reference internal" href="glossary.html#term-opendocument"><span class="xref std std-term">OpenDocument</span></a> spreadsheets, as
-well as <a class="reference internal" href="glossary.html#term-xml"><span class="xref std std-term">XML</span></a>, <a class="reference internal" href="glossary.html#term-csv"><span class="xref std std-term">CSV</span></a>, and <a class="reference internal" href="glossary.html#term-sql"><span class="xref std std-term">SQL</span></a> files</li>
-<li>administer multiple servers</li>
-<li>manage MySQL users and privileges</li>
-<li>check referential integrity in MyISAM tables</li>
-<li>using Query-by-example (QBE), create complex queries automatically
-connecting required tables</li>
-<li>create <a class="reference internal" href="glossary.html#term-pdf"><span class="xref std std-term">PDF</span></a> graphics of your
-database layout</li>
-<li>search globally in a database or a subset of it</li>
-<li>transform stored data into any format using a set of predefined
-functions, like displaying BLOB-data as image or download-link</li>
-<li>track changes on databases, tables and views</li>
-<li>support InnoDB tables and foreign keys</li>
-<li>support mysqli, the improved MySQL extension see <a class="reference internal" href="faq.html#faq1-17"><span class="std std-ref">1.17 Which Database versions does phpMyAdmin support?</span></a></li>
-<li>create, edit, call, export and drop stored procedures and functions</li>
-<li>create, edit, export and drop events and triggers</li>
-<li>communicate in <a class="reference external" href="https://www.phpmyadmin.net/translations/">80 different languages</a></li>
-</ul>
-</div>
-<div class="section" id="a-word-about-users">
-<h2>A word about users<a class="headerlink" href="#a-word-about-users" title="Permalink to this headline">¶</a></h2>
-<p>Many people have difficulty understanding the concept of user
-management with regards to phpMyAdmin. When a user logs in to
-phpMyAdmin, that username and password are passed directly to MySQL.
-phpMyAdmin does no account management on its own (other than allowing
-one to manipulate the MySQL user account information); all users must
-be valid MySQL users.</p>
-<p class="rubric">Footnotes</p>
-<table class="docutils footnote" frame="void" id="f1" rules="none">
-<colgroup><col class="label" /><col /></colgroup>
-<tbody valign="top">
-<tr><td class="label">[1]</td><td><em>(<a class="fn-backref" href="#id1">1</a>, <a class="fn-backref" href="#id2">2</a>)</em> phpMyAdmin can compress (<a class="reference internal" href="glossary.html#term-zip"><span class="xref std std-term">Zip</span></a>, <a class="reference internal" href="glossary.html#term-gzip"><span class="xref std std-term">GZip</span></a> or <a class="reference internal" href="glossary.html#term-rfc-1952"><span class="xref std std-term">RFC 1952</span></a>
-formats) dumps and <a class="reference internal" href="glossary.html#term-csv"><span class="xref std std-term">CSV</span></a> exports if you use PHP with
-<a class="reference internal" href="glossary.html#term-zlib"><span class="xref std std-term">Zlib</span></a> support (<code class="docutils literal"><span class="pre">--with-zlib</span></code>).
-Proper support may also need changes in <code class="file docutils literal"><span class="pre">php.ini</span></code>.</td></tr>
-</tbody>
-</table>
-</div>
-</div>
-
-
-          </div>
-        </div>
-      </div>
-      <div class="sphinxsidebar" role="navigation" aria-label="main navigation">
-        <div class="sphinxsidebarwrapper">
-  <h3><a href="index.html">Table Of Contents</a></h3>
-  <ul>
-<li><a class="reference internal" href="#">Introduction</a><ul>
-<li><a class="reference internal" href="#supported-features">Supported features</a></li>
-<li><a class="reference internal" href="#a-word-about-users">A word about users</a></li>
-</ul>
-</li>
-</ul>
-
-  <h4>Previous topic</h4>
-  <p class="topless"><a href="index.html"
-                        title="previous chapter">Welcome to phpMyAdmin&#8217;s documentation!</a></p>
-  <h4>Next topic</h4>
-  <p class="topless"><a href="require.html"
-                        title="next chapter">Requirements</a></p>
-  <div role="note" aria-label="source link">
-    <h3>This Page</h3>
-    <ul class="this-page-menu">
-      <li><a href="_sources/intro.txt"
-            rel="nofollow">Show Source</a></li>
-    </ul>
-   </div>
-<div id="searchbox" style="display: none" role="search">
-  <h3>Quick search</h3>
-    <form class="search" action="search.html" method="get">
-      <div><input type="text" name="q" /></div>
-      <div><input type="submit" value="Go" /></div>
-      <input type="hidden" name="check_keywords" value="yes" />
-      <input type="hidden" name="area" value="default" />
-    </form>
-</div>
-<script type="text/javascript">$('#searchbox').show(0);</script>
-        </div>
-      </div>
-      <div class="clearer"></div>
-    </div>
-    <div class="related" role="navigation" aria-label="related navigation">
-      <h3>Navigation</h3>
-      <ul>
-        <li class="right" style="margin-right: 10px">
-          <a href="genindex.html" title="General Index"
-             >index</a></li>
-        <li class="right" >
-          <a href="require.html" title="Requirements"
-             >next</a> |</li>
-        <li class="right" >
-          <a href="index.html" title="Welcome to phpMyAdmin’s documentation!"
-             >previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">phpMyAdmin 4.6.5.2 documentation</a> &#187;</li> 
-      </ul>
-    </div>
-    <div class="footer" role="contentinfo">
-        &#169; <a href="copyright.html">Copyright</a> 2012 - 2016, The phpMyAdmin devel team.
-      Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.4.6.
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/#pma/doc/html/objects.inv b/#pma/doc/html/objects.inv
deleted file mode 100644
index b8e0416b..00000000
Binary files a/#pma/doc/html/objects.inv and /dev/null differ
diff --git a/#pma/doc/html/other.html b/#pma/doc/html/other.html
deleted file mode 100644
index c2f333b2..00000000
--- a/#pma/doc/html/other.html
+++ /dev/null
@@ -1,132 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    
-    <title>Other sources of information &#8212; phpMyAdmin 4.6.5.2 documentation</title>
-    
-    <link rel="stylesheet" href="_static/classic.css" type="text/css" />
-    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
-    
-    <script type="text/javascript">
-      var DOCUMENTATION_OPTIONS = {
-        URL_ROOT:    './',
-        VERSION:     '4.6.5.2',
-        COLLAPSE_INDEX: false,
-        FILE_SUFFIX: '.html',
-        HAS_SOURCE:  true
-      };
-    </script>
-    <script type="text/javascript" src="_static/jquery.js"></script>
-    <script type="text/javascript" src="_static/underscore.js"></script>
-    <script type="text/javascript" src="_static/doctools.js"></script>
-    <link rel="copyright" title="Copyright" href="copyright.html" />
-    <link rel="top" title="phpMyAdmin 4.6.5.2 documentation" href="index.html" />
-    <link rel="up" title="User Guide" href="user.html" />
-    <link rel="next" title="Import and export" href="import_export.html" />
-    <link rel="prev" title="User management" href="privileges.html" /> 
-  </head>
-  <body role="document">
-    <div class="related" role="navigation" aria-label="related navigation">
-      <h3>Navigation</h3>
-      <ul>
-        <li class="right" style="margin-right: 10px">
-          <a href="genindex.html" title="General Index"
-             accesskey="I">index</a></li>
-        <li class="right" >
-          <a href="import_export.html" title="Import and export"
-             accesskey="N">next</a> |</li>
-        <li class="right" >
-          <a href="privileges.html" title="User management"
-             accesskey="P">previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">phpMyAdmin 4.6.5.2 documentation</a> &#187;</li>
-          <li class="nav-item nav-item-1"><a href="user.html" accesskey="U">User Guide</a> &#187;</li> 
-      </ul>
-    </div>  
-
-    <div class="document">
-      <div class="documentwrapper">
-        <div class="bodywrapper">
-          <div class="body" role="main">
-            
-  <div class="section" id="other-sources-of-information">
-<h1>Other sources of information<a class="headerlink" href="#other-sources-of-information" title="Permalink to this headline">¶</a></h1>
-<div class="section" id="printed-book">
-<h2>Printed Book<a class="headerlink" href="#printed-book" title="Permalink to this headline">¶</a></h2>
-<p>The definitive guide to using phpMyAdmin is the book Mastering phpMyAdmin for
-Effective MySQL Management by Marc Delisle. You can get information on that
-book and other officially endorsed <a class="reference external" href="https://www.phpmyadmin.net/docs/">books at the phpMyAdmin site</a>.</p>
-</div>
-<div class="section" id="tutorials">
-<h2>Tutorials<a class="headerlink" href="#tutorials" title="Permalink to this headline">¶</a></h2>
-<p>Third party tutorials and articles are listed on our <a class="reference external" href="https://wiki.phpmyadmin.net/pma/Articles">wiki page</a>.</p>
-</div>
-</div>
-
-
-          </div>
-        </div>
-      </div>
-      <div class="sphinxsidebar" role="navigation" aria-label="main navigation">
-        <div class="sphinxsidebarwrapper">
-  <h3><a href="index.html">Table Of Contents</a></h3>
-  <ul>
-<li><a class="reference internal" href="#">Other sources of information</a><ul>
-<li><a class="reference internal" href="#printed-book">Printed Book</a></li>
-<li><a class="reference internal" href="#tutorials">Tutorials</a></li>
-</ul>
-</li>
-</ul>
-
-  <h4>Previous topic</h4>
-  <p class="topless"><a href="privileges.html"
-                        title="previous chapter">User management</a></p>
-  <h4>Next topic</h4>
-  <p class="topless"><a href="import_export.html"
-                        title="next chapter">Import and export</a></p>
-  <div role="note" aria-label="source link">
-    <h3>This Page</h3>
-    <ul class="this-page-menu">
-      <li><a href="_sources/other.txt"
-            rel="nofollow">Show Source</a></li>
-    </ul>
-   </div>
-<div id="searchbox" style="display: none" role="search">
-  <h3>Quick search</h3>
-    <form class="search" action="search.html" method="get">
-      <div><input type="text" name="q" /></div>
-      <div><input type="submit" value="Go" /></div>
-      <input type="hidden" name="check_keywords" value="yes" />
-      <input type="hidden" name="area" value="default" />
-    </form>
-</div>
-<script type="text/javascript">$('#searchbox').show(0);</script>
-        </div>
-      </div>
-      <div class="clearer"></div>
-    </div>
-    <div class="related" role="navigation" aria-label="related navigation">
-      <h3>Navigation</h3>
-      <ul>
-        <li class="right" style="margin-right: 10px">
-          <a href="genindex.html" title="General Index"
-             >index</a></li>
-        <li class="right" >
-          <a href="import_export.html" title="Import and export"
-             >next</a> |</li>
-        <li class="right" >
-          <a href="privileges.html" title="User management"
-             >previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">phpMyAdmin 4.6.5.2 documentation</a> &#187;</li>
-          <li class="nav-item nav-item-1"><a href="user.html" >User Guide</a> &#187;</li> 
-      </ul>
-    </div>
-    <div class="footer" role="contentinfo">
-        &#169; <a href="copyright.html">Copyright</a> 2012 - 2016, The phpMyAdmin devel team.
-      Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.4.6.
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/#pma/doc/html/privileges.html b/#pma/doc/html/privileges.html
deleted file mode 100644
index ad54a5e4..00000000
--- a/#pma/doc/html/privileges.html
+++ /dev/null
@@ -1,186 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    
-    <title>User management &#8212; phpMyAdmin 4.6.5.2 documentation</title>
-    
-    <link rel="stylesheet" href="_static/classic.css" type="text/css" />
-    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
-    
-    <script type="text/javascript">
-      var DOCUMENTATION_OPTIONS = {
-        URL_ROOT:    './',
-        VERSION:     '4.6.5.2',
-        COLLAPSE_INDEX: false,
-        FILE_SUFFIX: '.html',
-        HAS_SOURCE:  true
-      };
-    </script>
-    <script type="text/javascript" src="_static/jquery.js"></script>
-    <script type="text/javascript" src="_static/underscore.js"></script>
-    <script type="text/javascript" src="_static/doctools.js"></script>
-    <link rel="copyright" title="Copyright" href="copyright.html" />
-    <link rel="top" title="phpMyAdmin 4.6.5.2 documentation" href="index.html" />
-    <link rel="up" title="User Guide" href="user.html" />
-    <link rel="next" title="Other sources of information" href="other.html" />
-    <link rel="prev" title="Transformations" href="transformations.html" /> 
-  </head>
-  <body role="document">
-    <div class="related" role="navigation" aria-label="related navigation">
-      <h3>Navigation</h3>
-      <ul>
-        <li class="right" style="margin-right: 10px">
-          <a href="genindex.html" title="General Index"
-             accesskey="I">index</a></li>
-        <li class="right" >
-          <a href="other.html" title="Other sources of information"
-             accesskey="N">next</a> |</li>
-        <li class="right" >
-          <a href="transformations.html" title="Transformations"
-             accesskey="P">previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">phpMyAdmin 4.6.5.2 documentation</a> &#187;</li>
-          <li class="nav-item nav-item-1"><a href="user.html" accesskey="U">User Guide</a> &#187;</li> 
-      </ul>
-    </div>  
-
-    <div class="document">
-      <div class="documentwrapper">
-        <div class="bodywrapper">
-          <div class="body" role="main">
-            
-  <div class="section" id="user-management">
-<h1>User management<a class="headerlink" href="#user-management" title="Permalink to this headline">¶</a></h1>
-<p>User management is the process of controlling which users are allowed to
-connect to the MySQL server and what permissions they have on each database.
-phpMyAdmin does not handle user management, rather it passes the username and
-password on to MySQL, which then determines whether a user is permitted to
-perform a particular action. Within phpMyAdmin, administrators have full
-control over creating users, viewing and editing privileges for existing users,
-and removing users.</p>
-<p>Within phpMyAdmin, user management is controlled via the <span class="guilabel">Users</span> link
-from the main page. Users can be created, edited, and removed.</p>
-<div class="section" id="creating-a-new-user">
-<h2>Creating a new user<a class="headerlink" href="#creating-a-new-user" title="Permalink to this headline">¶</a></h2>
-<p>To create a new user, click the <span class="guilabel">Add a new user</span> link near the bottom
-of the <span class="guilabel">Users</span> page (you must be a &#8220;superuser&#8221;, e.g., user &#8220;root&#8221;).
-Use the textboxes and drop-downs to configure the user to your particular
-needs. You can then select whether to create a database for that user and grant
-specific global privileges. Once you&#8217;ve created the user (by clicking Go), you
-can define that user&#8217;s permissions on a specific database (don&#8217;t grant global
-privileges in that case). In general, users do not need any global privileges
-(other than USAGE), only permissions for their specific database.</p>
-</div>
-<div class="section" id="editing-an-existing-user">
-<h2>Editing an existing user<a class="headerlink" href="#editing-an-existing-user" title="Permalink to this headline">¶</a></h2>
-<p>To edit an existing user, simply click the pencil icon to the right of that
-user in the <span class="guilabel">Users</span> page. You can then edit their global- and
-database-specific privileges, change their password, or even copy those
-privileges to a new user.</p>
-</div>
-<div class="section" id="deleting-a-user">
-<h2>Deleting a user<a class="headerlink" href="#deleting-a-user" title="Permalink to this headline">¶</a></h2>
-<p>From the <span class="guilabel">Users</span> page, check the checkbox for the user you wish to
-remove, select whether or not to also remove any databases of the same name (if
-they exist), and click Go.</p>
-</div>
-<div class="section" id="assigning-privileges-to-user-for-a-specific-database">
-<h2>Assigning privileges to user for a specific database<a class="headerlink" href="#assigning-privileges-to-user-for-a-specific-database" title="Permalink to this headline">¶</a></h2>
-<p>Users are assigned to databases by editing the user record (from the
-<span class="guilabel">Users</span> link on the home page) not from within the <span class="guilabel">Users</span>
-link under the table. If you are creating a user specifically for a given table
-you will have to create the user first (with no global privileges) and then go
-back and edit that user to add the table and privileges for the individual
-table.</p>
-</div>
-<div class="section" id="configurable-menus-and-user-groups">
-<span id="configurablemenus"></span><h2>Configurable menus and user groups<a class="headerlink" href="#configurable-menus-and-user-groups" title="Permalink to this headline">¶</a></h2>
-<p>By enabling <span class="target" id="index-0"></span><a class="reference internal" href="config.html#cfg_Servers_usergroups"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['usergroups']</span></code></a> and
-<span class="target" id="index-1"></span><a class="reference internal" href="config.html#cfg_Servers_usergroups"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['usergroups']</span></code></a> you can customize what users
-will see in the phpMyAdmin navigation.</p>
-<div class="admonition warning">
-<p class="first admonition-title">Warning</p>
-<p class="last">This feature only limits what a user sees, he is still able to use all the
-functions. So this can not be considered as a security limitation. Should
-you want to limit what users can do, use MySQL privileges to achieve that.</p>
-</div>
-<p>With this feature enabled, the <span class="guilabel">User accounts</span> management interface gains
-a second tab for managing <span class="guilabel">User groups</span>, where you can define what each
-group will view (see image below) and you can then assign each user to one of
-these groups. Users will be presented with a simplified user interface, which might be
-useful for inexperienced users who could be overwhelmed by all the features
-phpMyAdmin provides.</p>
-<img alt="_images/usergroups.png" src="_images/usergroups.png" />
-</div>
-</div>
-
-
-          </div>
-        </div>
-      </div>
-      <div class="sphinxsidebar" role="navigation" aria-label="main navigation">
-        <div class="sphinxsidebarwrapper">
-  <h3><a href="index.html">Table Of Contents</a></h3>
-  <ul>
-<li><a class="reference internal" href="#">User management</a><ul>
-<li><a class="reference internal" href="#creating-a-new-user">Creating a new user</a></li>
-<li><a class="reference internal" href="#editing-an-existing-user">Editing an existing user</a></li>
-<li><a class="reference internal" href="#deleting-a-user">Deleting a user</a></li>
-<li><a class="reference internal" href="#assigning-privileges-to-user-for-a-specific-database">Assigning privileges to user for a specific database</a></li>
-<li><a class="reference internal" href="#configurable-menus-and-user-groups">Configurable menus and user groups</a></li>
-</ul>
-</li>
-</ul>
-
-  <h4>Previous topic</h4>
-  <p class="topless"><a href="transformations.html"
-                        title="previous chapter">Transformations</a></p>
-  <h4>Next topic</h4>
-  <p class="topless"><a href="other.html"
-                        title="next chapter">Other sources of information</a></p>
-  <div role="note" aria-label="source link">
-    <h3>This Page</h3>
-    <ul class="this-page-menu">
-      <li><a href="_sources/privileges.txt"
-            rel="nofollow">Show Source</a></li>
-    </ul>
-   </div>
-<div id="searchbox" style="display: none" role="search">
-  <h3>Quick search</h3>
-    <form class="search" action="search.html" method="get">
-      <div><input type="text" name="q" /></div>
-      <div><input type="submit" value="Go" /></div>
-      <input type="hidden" name="check_keywords" value="yes" />
-      <input type="hidden" name="area" value="default" />
-    </form>
-</div>
-<script type="text/javascript">$('#searchbox').show(0);</script>
-        </div>
-      </div>
-      <div class="clearer"></div>
-    </div>
-    <div class="related" role="navigation" aria-label="related navigation">
-      <h3>Navigation</h3>
-      <ul>
-        <li class="right" style="margin-right: 10px">
-          <a href="genindex.html" title="General Index"
-             >index</a></li>
-        <li class="right" >
-          <a href="other.html" title="Other sources of information"
-             >next</a> |</li>
-        <li class="right" >
-          <a href="transformations.html" title="Transformations"
-             >previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">phpMyAdmin 4.6.5.2 documentation</a> &#187;</li>
-          <li class="nav-item nav-item-1"><a href="user.html" >User Guide</a> &#187;</li> 
-      </ul>
-    </div>
-    <div class="footer" role="contentinfo">
-        &#169; <a href="copyright.html">Copyright</a> 2012 - 2016, The phpMyAdmin devel team.
-      Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.4.6.
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/#pma/doc/html/require.html b/#pma/doc/html/require.html
deleted file mode 100644
index 2e9ad0ce..00000000
--- a/#pma/doc/html/require.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    
-    <title>Requirements &#8212; phpMyAdmin 4.6.5.2 documentation</title>
-    
-    <link rel="stylesheet" href="_static/classic.css" type="text/css" />
-    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
-    
-    <script type="text/javascript">
-      var DOCUMENTATION_OPTIONS = {
-        URL_ROOT:    './',
-        VERSION:     '4.6.5.2',
-        COLLAPSE_INDEX: false,
-        FILE_SUFFIX: '.html',
-        HAS_SOURCE:  true
-      };
-    </script>
-    <script type="text/javascript" src="_static/jquery.js"></script>
-    <script type="text/javascript" src="_static/underscore.js"></script>
-    <script type="text/javascript" src="_static/doctools.js"></script>
-    <link rel="copyright" title="Copyright" href="copyright.html" />
-    <link rel="top" title="phpMyAdmin 4.6.5.2 documentation" href="index.html" />
-    <link rel="next" title="Installation" href="setup.html" />
-    <link rel="prev" title="Introduction" href="intro.html" /> 
-  </head>
-  <body role="document">
-    <div class="related" role="navigation" aria-label="related navigation">
-      <h3>Navigation</h3>
-      <ul>
-        <li class="right" style="margin-right: 10px">
-          <a href="genindex.html" title="General Index"
-             accesskey="I">index</a></li>
-        <li class="right" >
-          <a href="setup.html" title="Installation"
-             accesskey="N">next</a> |</li>
-        <li class="right" >
-          <a href="intro.html" title="Introduction"
-             accesskey="P">previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">phpMyAdmin 4.6.5.2 documentation</a> &#187;</li> 
-      </ul>
-    </div>  
-
-    <div class="document">
-      <div class="documentwrapper">
-        <div class="bodywrapper">
-          <div class="body" role="main">
-            
-  <div class="section" id="requirements">
-<span id="require"></span><h1>Requirements<a class="headerlink" href="#requirements" title="Permalink to this headline">¶</a></h1>
-<div class="section" id="web-server">
-<h2>Web server<a class="headerlink" href="#web-server" title="Permalink to this headline">¶</a></h2>
-<p>Since phpMyAdmin&#8217;s interface is based entirely in your browser, you&#8217;ll need a
-web server (such as Apache, nginx, <a class="reference internal" href="glossary.html#term-iis"><span class="xref std std-term">IIS</span></a>) to install phpMyAdmin&#8217;s files into.</p>
-</div>
-<div class="section" id="php">
-<h2>PHP<a class="headerlink" href="#php" title="Permalink to this headline">¶</a></h2>
-<ul class="simple">
-<li>You need PHP 5.5.0 or newer, with <code class="docutils literal"><span class="pre">session</span></code> support, the Standard PHP Library
-(SPL) extension, JSON support, and the <code class="docutils literal"><span class="pre">mbstring</span></code> extension.</li>
-<li>To support uploading of ZIP files, you need the PHP <code class="docutils literal"><span class="pre">zip</span></code> extension.</li>
-<li>You need GD2 support in PHP to display inline thumbnails of JPEGs
-(&#8220;image/jpeg: inline&#8221;) with their original aspect ratio.</li>
-<li>When using the cookie authentication (the default), the <a class="reference external" href="https://www.php.net/openssl">openssl</a> extension is strongly suggested.</li>
-<li>To support upload progress bars, see <a class="reference internal" href="faq.html#faq2-9"><span class="std std-ref">2.9 Seeing an upload progress bar</span></a>.</li>
-<li>To support XML and Open Document Spreadsheet importing, you need the
-<a class="reference external" href="https://www.php.net/libxml">libxml</a> extension.</li>
-<li>To support reCAPTCHA on the login page, you need the
-<a class="reference external" href="https://www.php.net/openssl">openssl</a> extension.</li>
-<li>To support displaying phpMyAdmin&#8217;s latest version, you need to enable
-<code class="docutils literal"><span class="pre">allow_url_open</span></code> in your <code class="file docutils literal"><span class="pre">php.ini</span></code> or to have the
-<a class="reference external" href="https://www.php.net/curl">curl</a> extension.</li>
-<li>Performance suggestion: install the <code class="docutils literal"><span class="pre">ctype</span></code> extension.</li>
-</ul>
-<div class="admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last"><a class="reference internal" href="faq.html#faq1-31"><span class="std std-ref">1.31 Does phpMyAdmin support PHP 5?</span></a>, <a class="reference internal" href="setup.html#authentication-modes"><span class="std std-ref">Using authentication modes</span></a></p>
-</div>
-</div>
-<div class="section" id="database">
-<h2>Database<a class="headerlink" href="#database" title="Permalink to this headline">¶</a></h2>
-<p>phpMyAdmin supports MySQL-compatible databases.</p>
-<ul class="simple">
-<li>MySQL 5.5 or newer</li>
-<li>MariaDB 5.5 or newer</li>
-</ul>
-<div class="admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last"><a class="reference internal" href="faq.html#faq1-17"><span class="std std-ref">1.17 Which Database versions does phpMyAdmin support?</span></a></p>
-</div>
-</div>
-<div class="section" id="web-browser">
-<h2>Web browser<a class="headerlink" href="#web-browser" title="Permalink to this headline">¶</a></h2>
-<p>To access phpMyAdmin you need a web browser with cookies and JavaScript
-enabled.</p>
-<p>You need browser which is supported by jQuery 2.0, see
-&lt;<a class="reference external" href="https://jquery.com/browser-support/">https://jquery.com/browser-support/</a>&gt;.</p>
-</div>
-</div>
-
-
-          </div>
-        </div>
-      </div>
-      <div class="sphinxsidebar" role="navigation" aria-label="main navigation">
-        <div class="sphinxsidebarwrapper">
-  <h3><a href="index.html">Table Of Contents</a></h3>
-  <ul>
-<li><a class="reference internal" href="#">Requirements</a><ul>
-<li><a class="reference internal" href="#web-server">Web server</a></li>
-<li><a class="reference internal" href="#php">PHP</a></li>
-<li><a class="reference internal" href="#database">Database</a></li>
-<li><a class="reference internal" href="#web-browser">Web browser</a></li>
-</ul>
-</li>
-</ul>
-
-  <h4>Previous topic</h4>
-  <p class="topless"><a href="intro.html"
-                        title="previous chapter">Introduction</a></p>
-  <h4>Next topic</h4>
-  <p class="topless"><a href="setup.html"
-                        title="next chapter">Installation</a></p>
-  <div role="note" aria-label="source link">
-    <h3>This Page</h3>
-    <ul class="this-page-menu">
-      <li><a href="_sources/require.txt"
-            rel="nofollow">Show Source</a></li>
-    </ul>
-   </div>
-<div id="searchbox" style="display: none" role="search">
-  <h3>Quick search</h3>
-    <form class="search" action="search.html" method="get">
-      <div><input type="text" name="q" /></div>
-      <div><input type="submit" value="Go" /></div>
-      <input type="hidden" name="check_keywords" value="yes" />
-      <input type="hidden" name="area" value="default" />
-    </form>
-</div>
-<script type="text/javascript">$('#searchbox').show(0);</script>
-        </div>
-      </div>
-      <div class="clearer"></div>
-    </div>
-    <div class="related" role="navigation" aria-label="related navigation">
-      <h3>Navigation</h3>
-      <ul>
-        <li class="right" style="margin-right: 10px">
-          <a href="genindex.html" title="General Index"
-             >index</a></li>
-        <li class="right" >
-          <a href="setup.html" title="Installation"
-             >next</a> |</li>
-        <li class="right" >
-          <a href="intro.html" title="Introduction"
-             >previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">phpMyAdmin 4.6.5.2 documentation</a> &#187;</li> 
-      </ul>
-    </div>
-    <div class="footer" role="contentinfo">
-        &#169; <a href="copyright.html">Copyright</a> 2012 - 2016, The phpMyAdmin devel team.
-      Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.4.6.
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/#pma/doc/html/search.html b/#pma/doc/html/search.html
deleted file mode 100644
index 6d6ca2d0..00000000
--- a/#pma/doc/html/search.html
+++ /dev/null
@@ -1,100 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    
-    <title>Search &#8212; phpMyAdmin 4.6.5.2 documentation</title>
-    
-    <link rel="stylesheet" href="_static/classic.css" type="text/css" />
-    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
-    
-    <script type="text/javascript">
-      var DOCUMENTATION_OPTIONS = {
-        URL_ROOT:    './',
-        VERSION:     '4.6.5.2',
-        COLLAPSE_INDEX: false,
-        FILE_SUFFIX: '.html',
-        HAS_SOURCE:  true
-      };
-    </script>
-    <script type="text/javascript" src="_static/jquery.js"></script>
-    <script type="text/javascript" src="_static/underscore.js"></script>
-    <script type="text/javascript" src="_static/doctools.js"></script>
-    <script type="text/javascript" src="_static/searchtools.js"></script>
-    <link rel="copyright" title="Copyright" href="copyright.html" />
-    <link rel="top" title="phpMyAdmin 4.6.5.2 documentation" href="index.html" />
-  <script type="text/javascript">
-    jQuery(function() { Search.loadIndex("searchindex.js"); });
-  </script>
-  
-  <script type="text/javascript" id="searchindexloader"></script>
-   
-
-  </head>
-  <body role="document">
-    <div class="related" role="navigation" aria-label="related navigation">
-      <h3>Navigation</h3>
-      <ul>
-        <li class="right" style="margin-right: 10px">
-          <a href="genindex.html" title="General Index"
-             accesskey="I">index</a></li>
-        <li class="nav-item nav-item-0"><a href="index.html">phpMyAdmin 4.6.5.2 documentation</a> &#187;</li> 
-      </ul>
-    </div>  
-
-    <div class="document">
-      <div class="documentwrapper">
-        <div class="bodywrapper">
-          <div class="body" role="main">
-            
-  <h1 id="search-documentation">Search</h1>
-  <div id="fallback" class="admonition warning">
-  <script type="text/javascript">$('#fallback').hide();</script>
-  <p>
-    Please activate JavaScript to enable the search
-    functionality.
-  </p>
-  </div>
-  <p>
-    From here you can search these documents. Enter your search
-    words into the box below and click "search". Note that the search
-    function will automatically search for all of the words. Pages
-    containing fewer words won't appear in the result list.
-  </p>
-  <form action="" method="get">
-    <input type="text" name="q" value="" />
-    <input type="submit" value="search" />
-    <span id="search-progress" style="padding-left: 10px"></span>
-  </form>
-  
-  <div id="search-results">
-  
-  </div>
-
-          </div>
-        </div>
-      </div>
-      <div class="sphinxsidebar" role="navigation" aria-label="main navigation">
-        <div class="sphinxsidebarwrapper">
-        </div>
-      </div>
-      <div class="clearer"></div>
-    </div>
-    <div class="related" role="navigation" aria-label="related navigation">
-      <h3>Navigation</h3>
-      <ul>
-        <li class="right" style="margin-right: 10px">
-          <a href="genindex.html" title="General Index"
-             >index</a></li>
-        <li class="nav-item nav-item-0"><a href="index.html">phpMyAdmin 4.6.5.2 documentation</a> &#187;</li> 
-      </ul>
-    </div>
-    <div class="footer" role="contentinfo">
-        &#169; <a href="copyright.html">Copyright</a> 2012 - 2016, The phpMyAdmin devel team.
-      Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.4.6.
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/#pma/doc/html/searchindex.js b/#pma/doc/html/searchindex.js
deleted file mode 100644
index 4b017cc2..00000000
--- a/#pma/doc/html/searchindex.js
+++ /dev/null
@@ -1 +0,0 @@
-Search.setIndex({envversion:49,filenames:["config","copyright","credits","developers","faq","glossary","import_export","index","intro","other","privileges","require","setup","transformations","user","vendors"],objects:{"":{"$cfg['ActionLinksMode']":[0,0,1,"cfg_ActionLinksMode"],"$cfg['AllowArbitraryServer']":[0,0,1,"cfg_AllowArbitraryServer"],"$cfg['AllowThirdPartyFraming']":[0,0,1,"cfg_AllowThirdPartyFraming"],"$cfg['AllowUserDropDatabase']":[0,0,1,"cfg_AllowUserDropDatabase"],"$cfg['ArbitraryServerRegexp']":[0,0,1,"cfg_ArbitraryServerRegexp"],"$cfg['AvailableCharsets']":[0,0,1,"cfg_AvailableCharsets"],"$cfg['BZipDump']":[0,0,1,"cfg_BZipDump"],"$cfg['BrowseMIME']":[0,0,1,"cfg_BrowseMIME"],"$cfg['BrowseMarkerEnable']":[0,0,1,"cfg_BrowseMarkerEnable"],"$cfg['BrowsePointerEnable']":[0,0,1,"cfg_BrowsePointerEnable"],"$cfg['CSPAllow']":[0,0,1,"cfg_CSPAllow"],"$cfg['CaptchaLoginPrivateKey']":[0,0,1,"cfg_CaptchaLoginPrivateKey"],"$cfg['CaptchaLoginPublicKey']":[0,0,1,"cfg_CaptchaLoginPublicKey"],"$cfg['CharEditing']":[0,0,1,"cfg_CharEditing"],"$cfg['CharTextareaCols']":[0,0,1,"cfg_CharTextareaCols"],"$cfg['CharTextareaRows']":[0,0,1,"cfg_CharTextareaRows"],"$cfg['CheckConfigurationPermissions']":[0,0,1,"cfg_CheckConfigurationPermissions"],"$cfg['CodemirrorEnable']":[0,0,1,"cfg_CodemirrorEnable"],"$cfg['CompressOnFly']":[0,0,1,"cfg_CompressOnFly"],"$cfg['Confirm']":[0,0,1,"cfg_Confirm"],"$cfg['ConsoleEnterExecutes']":[0,0,1,"cfg_ConsoleEnterExecutes"],"$cfg['DBG']":[0,0,1,"cfg_DBG"],"$cfg['DBG']['demo']":[0,0,1,"cfg_DBG_demo"],"$cfg['DBG']['sql']":[0,0,1,"cfg_DBG_sql"],"$cfg['DefaultConnectionCollation']":[0,0,1,"cfg_DefaultConnectionCollation"],"$cfg['DefaultForeignKeyChecks']":[0,0,1,"cfg_DefaultForeignKeyChecks"],"$cfg['DefaultFunctions']":[0,0,1,"cfg_DefaultFunctions"],"$cfg['DefaultLang']":[0,0,1,"cfg_DefaultLang"],"$cfg['DefaultQueryDatabase']":[0,0,1,"cfg_DefaultQueryDatabase"],"$cfg['DefaultQueryTable']":[0,0,1,"cfg_DefaultQueryTable"],"$cfg['DefaultTabDatabase']":[0,0,1,"cfg_DefaultTabDatabase"],"$cfg['DefaultTabServer']":[0,0,1,"cfg_DefaultTabServer"],"$cfg['DefaultTabTable']":[0,0,1,"cfg_DefaultTabTable"],"$cfg['DisableMultiTableMaintenance']":[0,0,1,"cfg_DisableMultiTableMaintenance"],"$cfg['DisplayServersList']":[0,0,1,"cfg_DisplayServersList"],"$cfg['EnableAutocompleteForTablesAndColumns']":[0,0,1,"cfg_EnableAutocompleteForTablesAndColumns"],"$cfg['ExecTimeLimit']":[0,0,1,"cfg_ExecTimeLimit"],"$cfg['Export']":[0,0,1,"cfg_Export"],"$cfg['Export']['method']":[0,0,1,"cfg_Export_method"],"$cfg['FilterLanguages']":[0,0,1,"cfg_FilterLanguages"],"$cfg['FirstLevelNavigationItems']":[0,0,1,"cfg_FirstLevelNavigationItems"],"$cfg['ForceSSL']":[0,0,1,"cfg_ForceSSL"],"$cfg['ForeignKeyDropdownOrder']":[0,0,1,"cfg_ForeignKeyDropdownOrder"],"$cfg['ForeignKeyMaxLimit']":[0,0,1,"cfg_ForeignKeyMaxLimit"],"$cfg['GD2Available']":[0,0,1,"cfg_GD2Available"],"$cfg['GZipDump']":[0,0,1,"cfg_GZipDump"],"$cfg['GridEditing']":[0,0,1,"cfg_GridEditing"],"$cfg['HideStructureActions']":[0,0,1,"cfg_HideStructureActions"],"$cfg['IconvExtraParams']":[0,0,1,"cfg_IconvExtraParams"],"$cfg['IgnoreMultiSubmitErrors']":[0,0,1,"cfg_IgnoreMultiSubmitErrors"],"$cfg['Import']":[0,0,1,"cfg_Import"],"$cfg['InitialSlidersState']":[0,0,1,"cfg_InitialSlidersState"],"$cfg['InsertRows']":[0,0,1,"cfg_InsertRows"],"$cfg['Lang']":[0,0,1,"cfg_Lang"],"$cfg['LimitChars']":[0,0,1,"cfg_LimitChars"],"$cfg['LinkLengthLimit']":[0,0,1,"cfg_LinkLengthLimit"],"$cfg['LoginCookieDeleteAll']":[0,0,1,"cfg_LoginCookieDeleteAll"],"$cfg['LoginCookieRecall']":[0,0,1,"cfg_LoginCookieRecall"],"$cfg['LoginCookieStore']":[0,0,1,"cfg_LoginCookieStore"],"$cfg['LoginCookieValidity']":[0,0,1,"cfg_LoginCookieValidity"],"$cfg['LoginCookieValidityDisableWarning']":[0,0,1,"cfg_LoginCookieValidityDisableWarning"],"$cfg['LongtextDoubleTextarea']":[0,0,1,"cfg_LongtextDoubleTextarea"],"$cfg['MaxCharactersInDisplayedSQL']":[0,0,1,"cfg_MaxCharactersInDisplayedSQL"],"$cfg['MaxDbList']":[0,0,1,"cfg_MaxDbList"],"$cfg['MaxExactCount']":[0,0,1,"cfg_MaxExactCount"],"$cfg['MaxExactCountViews']":[0,0,1,"cfg_MaxExactCountViews"],"$cfg['MaxNavigationItems']":[0,0,1,"cfg_MaxNavigationItems"],"$cfg['MaxRows']":[0,0,1,"cfg_MaxRows"],"$cfg['MaxSizeForInputField']":[0,0,1,"cfg_MaxSizeForInputField"],"$cfg['MaxTableList']":[0,0,1,"cfg_MaxTableList"],"$cfg['MemoryLimit']":[0,0,1,"cfg_MemoryLimit"],"$cfg['MinSizeForInputField']":[0,0,1,"cfg_MinSizeForInputField"],"$cfg['MysqlMinVersion']":[0,0,1,"cfg_MysqlMinVersion"],"$cfg['NaturalOrder']":[0,0,1,"cfg_NaturalOrder"],"$cfg['NavigationDisplayLogo']":[0,0,1,"cfg_NavigationDisplayLogo"],"$cfg['NavigationDisplayServers']":[0,0,1,"cfg_NavigationDisplayServers"],"$cfg['NavigationLinkWithMainPanel']":[0,0,1,"cfg_NavigationLinkWithMainPanel"],"$cfg['NavigationLogoLink']":[0,0,1,"cfg_NavigationLogoLink"],"$cfg['NavigationLogoLinkWindow']":[0,0,1,"cfg_NavigationLogoLinkWindow"],"$cfg['NavigationTreeDbSeparator']":[0,0,1,"cfg_NavigationTreeDbSeparator"],"$cfg['NavigationTreeDefaultTabTable']":[0,0,1,"cfg_NavigationTreeDefaultTabTable"],"$cfg['NavigationTreeDefaultTabTable2']":[0,0,1,"cfg_NavigationTreeDefaultTabTable2"],"$cfg['NavigationTreeDisplayDbFilterMinimum']":[0,0,1,"cfg_NavigationTreeDisplayDbFilterMinimum"],"$cfg['NavigationTreeDisplayItemFilterMinimum']":[0,0,1,"cfg_NavigationTreeDisplayItemFilterMinimum"],"$cfg['NavigationTreeEnableExpansion']":[0,0,1,"cfg_NavigationTreeEnableExpansion"],"$cfg['NavigationTreeEnableGrouping']":[0,0,1,"cfg_NavigationTreeEnableGrouping"],"$cfg['NavigationTreePointerEnable']":[0,0,1,"cfg_NavigationTreePointerEnable"],"$cfg['NavigationTreeShowEvents']":[0,0,1,"cfg_NavigationTreeShowEvents"],"$cfg['NavigationTreeShowFunctions']":[0,0,1,"cfg_NavigationTreeShowFunctions"],"$cfg['NavigationTreeShowProcedures']":[0,0,1,"cfg_NavigationTreeShowProcedures"],"$cfg['NavigationTreeShowTables']":[0,0,1,"cfg_NavigationTreeShowTables"],"$cfg['NavigationTreeShowViews']":[0,0,1,"cfg_NavigationTreeShowViews"],"$cfg['NavigationTreeTableLevel']":[0,0,1,"cfg_NavigationTreeTableLevel"],"$cfg['NavigationTreeTableSeparator']":[0,0,1,"cfg_NavigationTreeTableSeparator"],"$cfg['NumFavoriteTables']":[0,0,1,"cfg_NumFavoriteTables"],"$cfg['NumRecentTables']":[0,0,1,"cfg_NumRecentTables"],"$cfg['OBGzip']":[0,0,1,"cfg_OBGzip"],"$cfg['Order']":[0,0,1,"cfg_Order"],"$cfg['PDFDefaultPageSize']":[0,0,1,"cfg_PDFDefaultPageSize"],"$cfg['PDFPageSizes']":[0,0,1,"cfg_PDFPageSizes"],"$cfg['PersistentConnections']":[0,0,1,"cfg_PersistentConnections"],"$cfg['PmaAbsoluteUri']":[0,0,1,"cfg_PmaAbsoluteUri"],"$cfg['PmaNoRelation_DisableWarning']":[0,0,1,"cfg_PmaNoRelation_DisableWarning"],"$cfg['PropertiesNumColumns']":[0,0,1,"cfg_PropertiesNumColumns"],"$cfg['ProtectBinary']":[0,0,1,"cfg_ProtectBinary"],"$cfg['ProxyPass']":[0,0,1,"cfg_ProxyPass"],"$cfg['ProxyUrl']":[0,0,1,"cfg_ProxyUrl"],"$cfg['ProxyUser']":[0,0,1,"cfg_ProxyUser"],"$cfg['QueryHistoryDB']":[0,0,1,"cfg_QueryHistoryDB"],"$cfg['QueryHistoryMax']":[0,0,1,"cfg_QueryHistoryMax"],"$cfg['RecodingEngine']":[0,0,1,"cfg_RecodingEngine"],"$cfg['RelationalDisplay']":[0,0,1,"cfg_RelationalDisplay"],"$cfg['RememberSorting']":[0,0,1,"cfg_RememberSorting"],"$cfg['RepeatCells']":[0,0,1,"cfg_RepeatCells"],"$cfg['ReservedWordDisableWarning']":[0,0,1,"cfg_ReservedWordDisableWarning"],"$cfg['RetainQueryBox']":[0,0,1,"cfg_RetainQueryBox"],"$cfg['RowActionLinks']":[0,0,1,"cfg_RowActionLinks"],"$cfg['RowActionLinksWithoutUnique']":[0,0,1,"cfg_RowActionLinksWithoutUnique"],"$cfg['RowActionType']":[0,0,1,"cfg_RowActionType"],"$cfg['SQLQuery']['Edit']":[0,0,1,"cfg_SQLQuery_Edit"],"$cfg['SQLQuery']['Explain']":[0,0,1,"cfg_SQLQuery_Explain"],"$cfg['SQLQuery']['Refresh']":[0,0,1,"cfg_SQLQuery_Refresh"],"$cfg['SQLQuery']['ShowAsPHP']":[0,0,1,"cfg_SQLQuery_ShowAsPHP"],"$cfg['SaveCellsAtOnce']":[0,0,1,"cfg_SaveCellsAtOnce"],"$cfg['SaveDir']":[0,0,1,"cfg_SaveDir"],"$cfg['SendErrorReports']":[0,0,1,"cfg_SendErrorReports"],"$cfg['ServerDefault']":[0,0,1,"cfg_ServerDefault"],"$cfg['ServerLibraryDifference_DisableWarning']":[0,0,1,"cfg_ServerLibraryDifference_DisableWarning"],"$cfg['Servers']":[0,0,1,"cfg_Servers"],"$cfg['Servers'][$i]['AllowDeny']['order']":[0,0,1,"cfg_Servers_AllowDeny_order"],"$cfg['Servers'][$i]['AllowDeny']['rules']":[0,0,1,"cfg_Servers_AllowDeny_rules"],"$cfg['Servers'][$i]['AllowNoPassword']":[0,0,1,"cfg_Servers_AllowNoPassword"],"$cfg['Servers'][$i]['AllowRoot']":[0,0,1,"cfg_Servers_AllowRoot"],"$cfg['Servers'][$i]['DisableIS']":[0,0,1,"cfg_Servers_DisableIS"],"$cfg['Servers'][$i]['LogoutURL']":[0,0,1,"cfg_Servers_LogoutURL"],"$cfg['Servers'][$i]['MaxTableUiprefs']":[0,0,1,"cfg_Servers_MaxTableUiprefs"],"$cfg['Servers'][$i]['SessionTimeZone']":[0,0,1,"cfg_Servers_SessionTimeZone"],"$cfg['Servers'][$i]['SignonScript']":[0,0,1,"cfg_Servers_SignonScript"],"$cfg['Servers'][$i]['SignonSession']":[0,0,1,"cfg_Servers_SignonSession"],"$cfg['Servers'][$i]['SignonURL']":[0,0,1,"cfg_Servers_SignonURL"],"$cfg['Servers'][$i]['auth_http_realm']":[0,0,1,"cfg_Servers_auth_http_realm"],"$cfg['Servers'][$i]['auth_type']":[0,0,1,"cfg_Servers_auth_type"],"$cfg['Servers'][$i]['bookmarktable']":[0,0,1,"cfg_Servers_bookmarktable"],"$cfg['Servers'][$i]['central_columns']":[0,0,1,"cfg_Servers_central_columns"],"$cfg['Servers'][$i]['column_info']":[0,0,1,"cfg_Servers_column_info"],"$cfg['Servers'][$i]['compress']":[0,0,1,"cfg_Servers_compress"],"$cfg['Servers'][$i]['connect_type']":[0,0,1,"cfg_Servers_connect_type"],"$cfg['Servers'][$i]['controlhost']":[0,0,1,"cfg_Servers_controlhost"],"$cfg['Servers'][$i]['controlpass']":[0,0,1,"cfg_Servers_controlpass"],"$cfg['Servers'][$i]['controlport']":[0,0,1,"cfg_Servers_controlport"],"$cfg['Servers'][$i]['controluser']":[0,0,1,"cfg_Servers_controluser"],"$cfg['Servers'][$i]['designer_settings']":[0,0,1,"cfg_Servers_designer_settings"],"$cfg['Servers'][$i]['export_templates']":[0,0,1,"cfg_Servers_export_templates"],"$cfg['Servers'][$i]['favorite']":[0,0,1,"cfg_Servers_favorite"],"$cfg['Servers'][$i]['hide_db']":[0,0,1,"cfg_Servers_hide_db"],"$cfg['Servers'][$i]['history']":[0,0,1,"cfg_Servers_history"],"$cfg['Servers'][$i]['host']":[0,0,1,"cfg_Servers_host"],"$cfg['Servers'][$i]['navigationhiding']":[0,0,1,"cfg_Servers_navigationhiding"],"$cfg['Servers'][$i]['nopassword']":[0,0,1,"cfg_Servers_nopassword"],"$cfg['Servers'][$i]['only_db']":[0,0,1,"cfg_Servers_only_db"],"$cfg['Servers'][$i]['password']":[0,0,1,"cfg_Servers_password"],"$cfg['Servers'][$i]['pdf_pages']":[0,0,1,"cfg_Servers_pdf_pages"],"$cfg['Servers'][$i]['pmadb']":[0,0,1,"cfg_Servers_pmadb"],"$cfg['Servers'][$i]['port']":[0,0,1,"cfg_Servers_port"],"$cfg['Servers'][$i]['recent']":[0,0,1,"cfg_Servers_recent"],"$cfg['Servers'][$i]['relation']":[0,0,1,"cfg_Servers_relation"],"$cfg['Servers'][$i]['savedsearches']":[0,0,1,"cfg_Servers_savedsearches"],"$cfg['Servers'][$i]['socket']":[0,0,1,"cfg_Servers_socket"],"$cfg['Servers'][$i]['ssl']":[0,0,1,"cfg_Servers_ssl"],"$cfg['Servers'][$i]['ssl_ca']":[0,0,1,"cfg_Servers_ssl_ca"],"$cfg['Servers'][$i]['ssl_ca_path']":[0,0,1,"cfg_Servers_ssl_ca_path"],"$cfg['Servers'][$i]['ssl_cert']":[0,0,1,"cfg_Servers_ssl_cert"],"$cfg['Servers'][$i]['ssl_ciphers']":[0,0,1,"cfg_Servers_ssl_ciphers"],"$cfg['Servers'][$i]['ssl_key']":[0,0,1,"cfg_Servers_ssl_key"],"$cfg['Servers'][$i]['ssl_verify']":[0,0,1,"cfg_Servers_ssl_verify"],"$cfg['Servers'][$i]['table_coords']":[0,0,1,"cfg_Servers_table_coords"],"$cfg['Servers'][$i]['table_info']":[0,0,1,"cfg_Servers_table_info"],"$cfg['Servers'][$i]['table_uiprefs']":[0,0,1,"cfg_Servers_table_uiprefs"],"$cfg['Servers'][$i]['tracking']":[0,0,1,"cfg_Servers_tracking"],"$cfg['Servers'][$i]['tracking_add_drop_database']":[0,0,1,"cfg_Servers_tracking_add_drop_database"],"$cfg['Servers'][$i]['tracking_add_drop_table']":[0,0,1,"cfg_Servers_tracking_add_drop_table"],"$cfg['Servers'][$i]['tracking_add_drop_view']":[0,0,1,"cfg_Servers_tracking_add_drop_view"],"$cfg['Servers'][$i]['tracking_default_statements']":[0,0,1,"cfg_Servers_tracking_default_statements"],"$cfg['Servers'][$i]['tracking_version_auto_create']":[0,0,1,"cfg_Servers_tracking_version_auto_create"],"$cfg['Servers'][$i]['user']":[0,0,1,"cfg_Servers_user"],"$cfg['Servers'][$i]['userconfig']":[0,0,1,"cfg_Servers_userconfig"],"$cfg['Servers'][$i]['usergroups']":[0,0,1,"cfg_Servers_usergroups"],"$cfg['Servers'][$i]['users']":[0,0,1,"cfg_Servers_users"],"$cfg['Servers'][$i]['verbose']":[0,0,1,"cfg_Servers_verbose"],"$cfg['SessionSavePath']":[0,0,1,"cfg_SessionSavePath"],"$cfg['ShowAll']":[0,0,1,"cfg_ShowAll"],"$cfg['ShowBrowseComments']":[0,0,1,"cfg_ShowBrowseComments"],"$cfg['ShowChgPassword']":[0,0,1,"cfg_ShowChgPassword"],"$cfg['ShowCreateDb']":[0,0,1,"cfg_ShowCreateDb"],"$cfg['ShowDatabasesNavigationAsTree']":[0,0,1,"cfg_ShowDatabasesNavigationAsTree"],"$cfg['ShowDbStructureCreation']":[0,0,1,"cfg_ShowDbStructureCreation"],"$cfg['ShowDbStructureLastCheck']":[0,0,1,"cfg_ShowDbStructureLastCheck"],"$cfg['ShowDbStructureLastUpdate']":[0,0,1,"cfg_ShowDbStructureLastUpdate"],"$cfg['ShowFieldTypesInDataEditView']":[0,0,1,"cfg_ShowFieldTypesInDataEditView"],"$cfg['ShowFunctionFields']":[0,0,1,"cfg_ShowFunctionFields"],"$cfg['ShowGitRevision']":[0,0,1,"cfg_ShowGitRevision"],"$cfg['ShowHint']":[0,0,1,"cfg_ShowHint"],"$cfg['ShowPropertyComments']":[0,0,1,"cfg_ShowPropertyComments"],"$cfg['ShowSQL']":[0,0,1,"cfg_ShowSQL"],"$cfg['ShowServerInfo']":[0,0,1,"cfg_ShowServerInfo"],"$cfg['ShowStats']":[0,0,1,"cfg_ShowStats"],"$cfg['SkipLockedTables']":[0,0,1,"cfg_SkipLockedTables"],"$cfg['SuhosinDisableWarning']":[0,0,1,"cfg_SuhosinDisableWarning"],"$cfg['TableNavigationLinksMode']":[0,0,1,"cfg_TableNavigationLinksMode"],"$cfg['TablePrimaryKeyOrder']":[0,0,1,"cfg_TablePrimaryKeyOrder"],"$cfg['TabsMode']":[0,0,1,"cfg_TabsMode"],"$cfg['TempDir']":[0,0,1,"cfg_TempDir"],"$cfg['TextareaAutoSelect']":[0,0,1,"cfg_TextareaAutoSelect"],"$cfg['TextareaCols']":[0,0,1,"cfg_TextareaCols"],"$cfg['TextareaRows']":[0,0,1,"cfg_TextareaRows"],"$cfg['ThemeDefault']":[0,0,1,"cfg_ThemeDefault"],"$cfg['ThemeManager']":[0,0,1,"cfg_ThemeManager"],"$cfg['ThemePath']":[0,0,1,"cfg_ThemePath"],"$cfg['ThemePerServer']":[0,0,1,"cfg_ThemePerServer"],"$cfg['TitleDatabase']":[0,0,1,"cfg_TitleDatabase"],"$cfg['TitleDefault']":[0,0,1,"cfg_TitleDefault"],"$cfg['TitleServer']":[0,0,1,"cfg_TitleServer"],"$cfg['TitleTable']":[0,0,1,"cfg_TitleTable"],"$cfg['TranslationWarningThreshold']":[0,0,1,"cfg_TranslationWarningThreshold"],"$cfg['TrustedProxies']":[0,0,1,"cfg_TrustedProxies"],"$cfg['UploadDir']":[0,0,1,"cfg_UploadDir"],"$cfg['UseDbSearch']":[0,0,1,"cfg_UseDbSearch"],"$cfg['UserprefsDeveloperTab']":[0,0,1,"cfg_UserprefsDeveloperTab"],"$cfg['UserprefsDisallow']":[0,0,1,"cfg_UserprefsDisallow"],"$cfg['VersionCheck']":[0,0,1,"cfg_VersionCheck"],"$cfg['ZeroConf']":[0,0,1,"cfg_ZeroConf"],"$cfg['ZipDump']":[0,0,1,"cfg_ZipDump"],"$cfg['blowfish_secret']":[0,0,1,"cfg_blowfish_secret"],PMA_ABSOLUTE_URI:[12,1,1,"-"],PMA_ARBITRARY:[12,1,1,"-"],PMA_HOST:[12,1,1,"-"],PMA_HOSTS:[12,1,1,"-"],PMA_PASSWORD:[12,1,1,"-"],PMA_PORT:[12,1,1,"-"],PMA_USER:[12,1,1,"-"]}},objnames:{"0":["config","option","Config config option"],"1":["std","envvar","environment variable"]},objtypes:{"0":"config:option","1":"std:envvar"},terms:{"01youknowme_at_gmail":2,"0c3f":12,"0d79":12,"0eb7":12,"0x9c27b31342b7511d":12,"0xce752f178259bd92":12,"0xfefc65d181af644a":12,"16m":0,"1b51":12,"1c17":12,"1df1":12,"2f17":12,"3092849_at_qq":2,"3d06":12,"3d06a59ece730eb71b511c17ce752f178259bd92":12,"42b7":12,"436f":12,"4b1a":12,"50x50":4,"511d":12,"5a32":12,"5xp_":12,"6375lpd_at_gmail":2,"63cb":12,"644a":12,"65d1":12,"7euser":4,"81af":12,"8259bd92":12,"98se":4,"999_at_yahoo":2,"9c27":12,"\u00e7okaj":2,"\u00e9tienn":2,"\u010diha\u0159":[1,2,12],"\u0161ime\u010dek":2,"\u03c0\u03b1\u03bd\u03b1\u03b3\u03b9\u03ce\u03c4\u03b7\u03c2":2,"\u03c0\u03b1\u03c0\u03ac\u03b6\u03bf\u03b3\u03bb\u03bf\u03c5":2,"\u0438\u0432\u0430\u043d":2,"\u043a\u0430\u0440\u043f\u043e\u0432":2,"\u043e\u043b\u0435\u0433":2,"\u043f\u0435\u0434\u044c\u043a\u043e":2,"\u0441\u0435\u0440\u0433\u0435\u0435\u0432\u0438\u0447":2,"\u0441\u0435\u0440\u0433\u0456\u0439":2,"\u0445\u043e\u043c\u0443\u0442\u043e\u0432":2,"\u0b95":2,"\u0b95\u0ba3":2,"\u0bae":2,"\u0bb0":2,"\u0bb7":2,"\u7f57\u6500\u767b":2,"\uc774\uacbd\uc900":2,"abstract":[2,13],"ale\u0161":2,"aputsia\u0138":2,"ara\u00fajo":2,"b\u00f8rge":2,"bal\u00e1z":2,"bokm\u00e5l":2,"boolean":0,"break":4,"byte":0,"c\u00e9dric":2,"case":[0,4,10,12],"catch":12,"char":[0,4,12],"class":[4,12,13],"d\u00e1niel":2,"delete":[0,4,12],"enum":[2,13],"final":4,"fr\u00f8yshov":2,"function":[0,2],"garc\u00eda":2,"gesch\u00e9":2,"j\u00fanio":2,"jo\u00e3o":2,"kate\u0159i\u0148\u00e1k":2,"kl\u00e4ger":2,"landh\u00e4u\u00df":2,"lo\u00efc":2,"long":[0,4,5,12,13],"lu\u00ed":2,"m\u00fcller":[1,2],"mat\u00eda":2,"micha\u0142":2,"mickevi\u010diu":2,"mirc\u0259lal":2,"montan\u00e9":2,"montr\u00e9al":4,"new":[0,2],"null":0,"p\u00e9ter":2,"public":[0,1,4,12],"r\u00e4t":2,"return":0,"short":5,"super":8,"sz\u00e1sz":2,"t\u00f3th":2,"tom\u00e1\u0161":2,"toma\u0161t\u00edk":2,"true":[0,12],"try":0,"var":[4,15],"vin\u00edciu":2,"void":12,"while":0,"xos\u00e9":2,_db:0,_get:12,_post:12,_server:12,_session:12,_uri_scheme:5,a59e:12,aaleksanyants_at_yahoo:2,abd:2,abdulla:2,abeyrathna:2,abl:[0,2],abort:0,about:0,abov:[0,4,12],abram:2,abravo_at_hq:2,absenc:[0,4],absence:4,absolut:[0,12],abtract:13,accept:[0,4,5],acceptabl:0,access:[0,2],accident:0,accompani:12,accomplish:[4,6,8,12],accord:0,accordingli:[4,13],account:[0,8,10],achch1990_at_gmail:2,achchuthan:2,achiev:[0,4,10,12],acl:[0,5],acokaj_at_shkod:2,across:[0,5],action:0,actionlinksmod:0,activ:[0,4],activat:0,actual:[4,12,13],acunetix:4,adam:2,add:0,addit:[0,2],addition:[0,12],addon:4,address:[0,4,5,12],addtype:4,adjust:0,adler:5,administ:8,administr:[0,2,4,10,12],admir:2,adnan:2,adobe:5,adriaenssen:2,adrian:2,adsbot:4,advanc:[4,12],advantag:4,advic:15,advis:0,aes:[0,12],affect:[0,4],afraid:12,after:0,again:0,agent:4,agre:0,ahmed:2,ahmedtek1993_at_gmail:2,aj_at_isit:2,ajax:2,ajaxifi:2,ajaxific:2,aka:12,ako:2,alan:2,albanian:2,albb0920_at_gmail:2,albert:2,alberti:2,alberty_at_neptunlab:2,albiol:2,aleksany:2,alemoretti2010_at_hotmail:2,ales_at_hakl:2,alessandro:2,alex:2,alexalex:2,alexand:[1,2],alexandr:2,alexei:2,alexi:2,alexrohleder96_at_outlook:2,algeri:2,algi:2,algorithm:[0,5,12],alia:2,align:4,alioglu:2,all:[0,3,4,5,8,10,12,13,15],alloc:0,allow:[0,2,4,5,8,10,12],allow_url_open:11,allowarbitraryserv:[0,12],allowdeni:[0,4,12],allownopassword:0,allowoverrid:4,allowroot:0,allowthirdpartyfram:0,allowuserdropdatabas:0,almost:0,along:[1,4,12],alpha:4,alreadi:0,also:[0,2,4,6,8,10,12,13,15],alter:[0,4,8],altern:[0,4,12],although:[0,2,4],alvar:2,alwai:0,amalesh:2,amaral:2,amihaita_at_yahoo:2,amir:2,ammar:2,among:0,amount:[0,4,13],analys:2,analyz:[0,2,4],ander:2,andersen:2,andika:2,andika_at_gmail:2,andrea:2,andrei:2,andrzej:2,andrzej_at_kynu:2,angular:0,ani:[0,2],ankit:2,ann:2,anonym:[0,4],anonynuin:2,anoth:[0,4,5,12],answer:5,anticip:5,any:[0,1,4],anybodi:12,anyon:12,anyth:12,apach:0,apart:4,apc:4,api:[0,4,5],appear:[0,4],append:[0,13],apple:5,appli:[0,4,12,13],applic:0,applicat:5,applytransform:13,approach:0,approxim:[0,4],arabic:2,arben:2,arbitrari:[0,12],arbitraryserverregexp:0,architectur:4,archiv:[4,5,12],archive:5,area:0,arg_separ:4,argument:4,ari:2,arifianto:2,armel:2,armenian:2,around:[0,4,12],arrai:[0,4,12,13],arrow:4,articl:[4,9],artyom:2,asc:[0,12],ascend:0,ascii:0,ash:2,ashkan:2,ashraf:2,ashutosh:2,ask:0,aso:2,aspect:[11,15],assign:[0,4],assum:[4,12],astarita:2,asuni:2,attach:[0,5],attack:0,attempt:[0,4],attent:12,attila:2,atul:2,atulpratapsingh05_at_gmail:2,atvejis_at_gmail:2,auth:0,auth_http_realm:0,auth_map:12,auth_typ:[0,4,12],authnam:12,author:[0,2,4,12],authrequest:12,authtyp:12,authuserfil:12,auto:0,auto_incr:4,auto_increment:4,autocomplet:0,autoconnect:0,autodetect:0,autom:[2,12],automat:[0,2],avail:[0,1,4,5,12,13,15],availabl:0,availablecharset:0,averag:4,avoid:[0,4],awai:4,awar:[4,12],axel:2,axi:4,ayush:2,azerbaijani:2,azevedo:2,azzabi:2,b313:12,backend:4,background:0,backquot:4,backslash:4,backward:[0,4],bad:[4,12],badalo:2,badalo_at_sapo:2,baiduspid:4,bailout_on_error:4,bakondi:2,balanc:0,ban:4,bansod:2,bao:2,baophan94_at_icloud:2,bar:0,barri:2,base:[0,2],batch:8,bbedit:12,bd92:12,becaus:[0,2],beck:2,beck_at_web:2,becom:4,been:[0,3,4,12],befor:[0,4,12],begin:[0,4,12],behav:4,behavior:0,behaviour:[0,4],behind:[0,4,12],belarusian:2,bellon:2,belong:12,below:0,beneath:4,benefit:[0,4],benjamin:2,bennetch:12,benni:2,berkelei:0,bernard:2,best:[4,12],better:4,between:0,beyond:12,biesaga:2,big:0,bigdump:4,bigger:4,bimal:2,bin:[2,4],binary:0,bit:[0,12],bits_at_gmail:2,bkehayov_at_gmail:2,blagynchy_at_gmail:2,blank:0,blanks:13,blob:0,blobs:0,blobstream:2,block:[0,4,5],blowfish:[0,2,5],blowfish_:5,blowfish_secret:[0,12],bluthardt:2,bob:4,bodi:12,bogor_at_gmail:2,bookmark:[0,2],bookmarkt:0,bora:2,borg:2,borge947_at_gmail:2,borggrev:2,borrow:2,bot:4,botelho:2,both:[0,4,12],bottom:[4,10],bound:13,boutel:5,boyan:2,brad:4,branch:12,braschi_at_outlook:2,bravo:2,brazil:2,breakag:12,broader:5,broken:4,browsemarkeren:0,browsemime:0,browsepointeren:0,browser:0,bruce:5,bruguera:2,bruno:2,brunomendax_at_gmail:2,bskim45_at_gmail:2,buddika:2,buffer:[0,4,13],bug:[0,2],bugfix:2,buggi:[4,12],bugzilla:4,build:[0,4,12,13],builder:2,built:[2,4],bulgarian:2,bum:2,bumsoo:2,bunch:4,burak:2,busi:5,bussier:2,button:[0,4,12],buz_at_gmail:2,bypass:[0,4],bz2:0,bzip2:[0,4,5],bzipdump:0,c0ee:12,cach:[4,12],call:[0,4,8,12,13],calvo:2,can:[0,1,3],canada:4,cannot:0,capabl:5,captcha:12,captchaloginprivatekei:[0,12],captchaloginpublickei:[0,12],care:[4,13],carefulli:0,casotti:2,casotti_at_uol:2,cat:2,catalan:2,caus:0,cav:2,cbb74bc:12,cdac1234_at_gmail:2,ce73:12,ce75:12,cedric:2,cell:[0,4,5],center:[4,12],centos:12,central:[0,2],central_column:0,cert:0,certain:0,certfic:0,certif:0,certifi:12,cf2a:12,cfg:[0,4,10,12],chanaka:2,chanc:0,chang:[0,2],changelog:5,chao:2,chaovavanich:2,chapeaux:2,chapter:[0,4,12],charact:0,charanyogeshwar_at_gmail:2,charedit:0,charg:0,charset:[0,2,12,13],chart:2,chartextareacol:0,chartextarearow:0,chathuranga:2,chaudhari:2,check:[0,1,2,3,4,8,10,12,13,15],checkbox:0,checkconfigurationpermiss:0,checklink:4,chee:2,cheng:2,chien:2,chimera:4,china:2,chines:2,chirayu:2,chirip:2,chiyokawa:2,chiyokawa_at_gmail:2,chmod:[0,4,12],choic:[0,12],choos:[0,4,12,13],chose:[4,12],chosen:[0,4],chown:[0,4],chri:2,chrisj_at_ctel:2,christoff:2,christoph:2,cidr:0,cipher:[0,5],circumv:[0,4],cj_at_gmail:2,claimed_id:12,clanboy_at_163:2,classless:0,clau:2,claus:0,clear:[4,12],click:0,clickabl:0,clickjack:0,client:0,client_:5,clipboard:[0,4],close:[0,4,12],clshttp:4,clue:4,cma:2,cocerhan:2,cochran:2,code:[0,2,4,5,12],codemirror:0,codemirroren:0,collat:0,collect:5,colognian:2,colon:4,color:0,column:[0,2],column_:5,column_com:0,column_info:[0,13],columns:4,columns_priv:4,com:[0,1,2,4,5,11,12,13],combin:[0,4],come:[0,1],comma:[5,12],command:[0,4,12],comment:[0,2],commiss:5,common:[0,4,5,12],commonli:5,commun:[5,8],compat:[0,2,4,5,11,12,15],compil:4,complain:12,complet:[0,2],complex:[4,8],compliant:2,complic:0,compos:[0,7],compress:0,compressonfli:[0,4],comput:5,computer_sci:5,computer_socket:5,concept:[2,8],concern:6,concurr:0,condit:4,conf:4,confer:2,config:[0,4],configr:12,configuraiton:12,confirm:[0,4],conflict:4,conform:5,confus:4,connect_typ:0,consecut:4,consequ:0,consider:12,consist:4,consol:[0,2],consoleenterexecut:0,constanti:2,construct:4,consult:13,consum:5,contain:0,content:[0,2],context:4,continu:[0,12],contol:5,contrib:12,contribut:[2,3,4],contributor:2,control:[0,2],controlhost:0,controlpass:[0,4,12],controlport:0,controlus:[0,4,12],convei:5,conveni:12,convent:13,convers:[0,2],convert:4,coordin:[0,4],copi:[0,1],corazza:2,corazza_at_wanadoo:2,core:5,correct:0,correctli:[0,4],correspond:[0,4,13],corrupt:0,costa1988sv_at_gmail:2,costel:2,could:[0,4,6,10,12],count:[0,4,12],countri:4,country_cod:4,cours:[0,4],cover:12,coverag:4,crawler:4,crawleradmin:4,creat:[0,2],create:[0,4],create_t:12,creation:[0,2],creator:2,credenti:[0,12],credit:1,criteria:4,cross:[0,5,12],cryptograph:[5,12],cspallow:0,css2:2,css:[0,2,4],ctrl:[0,4],ctype:11,curl:[4,11],current:[0,2,4,5,8,12,15],cursor:[0,4],customis:12,cut:0,cvs:2,cwlin0416_at_gmail:2,cybot_tm_at_us:[1,2],czech:[0,2],d3xter_at_us:2,da2n_s_at_yahoo:2,dadan:2,dalibor:2,dan:2,daniel:2,danilo:2,danish:2,danorse_at_gmail:2,darlow:2,dash:[0,4],data:0,database:[0,4],database_trigg:5,databases:4,databs:12,date:[0,4],datetime:0,dave:2,david:2,davidson:2,db1:0,db2:0,dbase:4,dbf:4,dbg:0,dbhost1:12,dbhost2:12,dbhost3:12,dbhost:12,dbms:5,dcbf:12,dckyoung_at_gmail:2,dd0:12,ddrmoscow_at_gmail:2,deactiv:[0,4],deal:5,debian:0,debug:[0,2],decemb:2,decid:4,declar:[4,13],decrypt:4,default_socket:4,defaultconnectioncol:0,defaultforeignkeycheck:0,defaultfunct:0,defaultlang:0,defaultquerydatabas:0,defaultqueryt:0,defaulttabdatabas:0,defaulttabserv:0,defaulttabt:0,defin:[0,4,5,10,13],definit:[0,4,9],degrad:4,dejavu:1,deki:2,deky40_at_gmail:2,delai:4,delayed:4,delet:[0,2],delimit:0,delisl:[1,2,9,12],delislma_at_collegesherbrook:2,delorm:2,demo:0,den:2,deni:[0,2],denni:2,depend:[4,12],deploi:12,deprec:0,depth:4,der:2,derek:2,deriv:12,desc:0,descend:0,describ:[0,5,13],descript:[4,12,13],designer_set:0,desir:8,desktop:4,destin:5,detail:[0,1,4,12],detect:[0,2,4,12],determin:0,dev:[0,4,5,12],dev_at_gmail:2,deven:2,devenbansod:2,devic:5,dhananjai:2,dhima:2,dhtml:2,dhundhara:2,diagnos:4,diagram:4,dialog:[4,12],dialogu:4,did:[0,4],didn:0,die_error:12,dieter:2,differ:[0,2],differenti:4,difficult:4,difficulti:8,digest:4,dimension:5,dingo13_at_gmail:2,dingo:2,diprofinfin:2,dir:[4,12,13],direct:[0,4,12,13],directli:0,dirnam:12,disabl:[0,4,12],disableis:0,disablemultitablemainten:0,disallow:[0,12],disappear:[0,4],discov:12,disorderman:2,disorderman_at_qq:2,display_error:4,displayserverslist:0,distinct:[0,4],distribut:[0,1,2],disturb:12,div:12,divid:5,djh1017555_at_126:2,dll:4,dnighttv_at_gmail:2,doc:[0,4,5],docker:7,doctype:[4,12],document:[0,1],documentclass:4,doe:0,doesn:0,dom:2,domain:[0,4],domen:2,don:0,donavan_at_hotmail:2,donavan_martin:2,done:[0,4,12],dongyoung:2,dorning:4,dot:0,doubl:[0,4],dougla:2,douglaseccker_at_hotmail:2,dovi:2,dovyda:2,down:0,downgrad:[4,12],download:[0,4,8,12],drag:[4,6],drawn:13,dri:2,driven:12,driver:0,drizzl:2,drop:[0,2],dropdown:4,due:[0,4,12],duguying2008_at_gmail:2,dump:[0,2],dure:[4,6,12],dutch:2,dynam:[2,4,5],each:[0,1],eas:[0,13],easi:[0,4,13],easiest:[4,12],easili:0,eccker:2,echo:12,edgar:2,edgarsneims5092_at_inbox:2,edit:0,editor:[0,2,12],edjacobjunior_at_gmail:2,edlund:2,edlund_at_upright:2,edu:[2,12],eduardo:2,edward:2,edwin:2,edwin_at_yohanesedwin:2,eecyh:12,ef12:12,effect:0,effectiv:9,effici:[0,4],efroys_at_gmail:2,egbrave_at_hotmail:2,egorov:2,eilertsen:2,either:[0,4],ek_at_luna:2,ekio_at_gmail:2,electrotechn:5,element:[4,5,13],eliovir:2,eliovir_at_gmail:2,els:[0,2,4,12],email:[2,4],embed:0,emerg:12,emphas:0,empti:0,enabl:0,enableautocompletefortablesandcolumn:0,enclos:0,enclose:4,encod:[0,2,4,12],encompass:5,encount:4,encrypt:0,encyclopedia:5,end:[0,4,12,13],endors:9,eng_at_globomail:2,engin:[4,5],engine:[4,5],english:[0,2,12],engstrom:2,enhanc:2,enlarg:4,ensur:[0,4,12],ensure:[0,4,12],enter:0,enterpris:4,entir:[4,11,12],entri:[0,4,12],enumer:4,environ:[0,4,12],epel:12,equival:0,erik:[2,4],ero:2,erosakos02_at_gmail:2,error:[0,2],escap:0,eshin:2,especi:[0,4,12],espen:2,esperanto:2,esri:0,essam:2,est:12,estonian:2,esy_vb_at_yahoo:2,etc:[0,4,12,13],etienn:2,even:[0,1,4,8,10,12],event:[0,2,5,8],ever:4,everi:[0,4,12],everyon:2,everyth:4,everytim:0,everywher:4,exabot:4,exact:[0,4],examin:4,exce:0,except:[0,4,12],exception:12,exchang:12,exclud:4,exclus:4,exectimelimit:[0,4],execut:0,exist:[0,2],exists:0,exit:12,expand:4,expandtab:[0,12],expans:[0,4],expect:[0,4],experiment:0,explain:[0,4,12],explan:[4,12],explicit:0,explicitli:[0,12],explod:12,explor:4,explorer:0,export_templ:0,exposur:12,express:[0,4,5],expression:5,extens:[0,2],extensibl:5,extension:[4,5],extern:[0,15],external:7,extra:12,extract:[4,12],eyal:2,f188:12,fact:[0,4,12],fadhiil:2,fadhiilrachman_at_gmail:2,fail:0,fallback:0,fals:[0,4,12,15],famma:2,fando:4,fashion:0,fast:[4,5],fastcgi:5,fathi:2,fauveau:2,fauveau_at_globali:2,favicon:12,favorit:0,fcgi:12,featur:[0,2,3],feed:4,feedback:2,feedfetch:4,fefc:12,feryanto:2,few:[0,4,12],fewer:0,field_:5,file:[0,1,2],file_format:5,file_get_cont:12,file_upload:4,fileinfo:4,filenam:[0,4,13],filesystem:0,filippo:4,fill:[0,4,12],filter:[0,4],filterlanguag:0,find:[0,4,12],fingerprint:12,finnish:2,firewal:[0,4,12],first:0,first__second__third:0,first_timestamp:0,firstlevelnavigationitem:0,fit:[0,2,4],fitness:1,fix:2,fixed:4,flag:0,flemish:2,floss:2,flush:4,fly:0,focu:0,follow:[0,2],font:1,foo:4,foobar:12,footer:0,footnot:8,forc:0,forcessl:0,foreign:0,foreign_db:0,foreign_kei:5,foreign_key_checks:0,foreignkeydropdownord:0,foreignkeymaxlimit:[0,4],forget:[0,4,12],forgot:4,form:[0,2],format:[0,2],format_http:12,former:2,forth:13,forum:[2,4],forward:0,found:0,foundat:1,fpdf:[2,5],fpm:12,fragment:4,frame:[0,2,4],framework:15,francesco:2,francisco:2,franco:2,free:[1,5,13],french:2,frequent:0,fri:12,frisian:2,from:[0,2],front:4,ftp:[0,4,12],fujifilm:2,fulanodet:2,full:0,fulli:[4,12],func_char:0,func_date:0,func_number:0,func_spatial:0,func_uuid:0,fundawang_at_gmail:2,further:[0,2],furthermor:0,futur:[0,4],future_id:4,ga244_at_is8:2,gabriel:2,gailli:5,gain:10,galician:2,gamma:4,gandon:2,gandon_at_isia:2,ganeshtheone_at_gmail:2,garvin:[1,2],gatewai:5,gc_maxlifetim:0,gd2:[5,11],gd2availabl:0,gd_graphics_librari:5,geert:2,genuin:12,geometri:4,georgiev:2,geral_at_jonil:2,german:2,get:0,get_login_credenti:[0,12],getauthorizeurl:12,getinfo:13,getmessag:12,getmimesubtyp:13,getmimetyp:13,getnam:13,gettext:[1,15],ghimir:2,giacobazzi:2,giacobazzi_at_ferrania:2,gigabot:4,gilli:2,gilli_at_gmail:2,giovanni:2,girish:2,git:0,github1_at_openaliasbox:2,github:[2,4,12],given:[0,4,10,12],global:[4,8,10,12,13],glund_at_silversoft:2,gmail:12,gmbh:4,gnauk89_at_googlemail:2,gnu:[1,5,12],goe:[0,4],goerick:2,good:[0,4,12,13],goodlinuxuser_at_chmail:2,googlebot:4,got:[1,4],gov:2,gpg:12,gpl:1,grab:[4,12],gracefulli:4,grai:4,grant:[0,4,10,12],graphic:[5,8,12],great:[2,3],greatymh_at_gmail:2,greek:2,grid:0,gridedit:0,group:[0,4,5],grow:13,gryniuk:2,guarante:0,guess:0,gui_at_webseibt:2,guia:2,guid:[7,9],guilherm:2,gupta:2,gzencod:4,gzip:[0,2],gzipdump:0,haa:2,had:[4,12],hakl:2,hamann:2,hamzah:2,han:2,hand:[4,12],handbook:12,handl:[0,4,10,12,13],handler:[2,5],harald:4,hard:[0,12],harden:4,harm:0,harush:2,harvest:4,hassan:2,hate:12,haugom:2,hauk:2,have:[0,1,2,3],haven:4,head:12,header:0,heart:4,hebrew:2,heis:4,helder:2,hello:2,help:[0,2,3],henningsen:2,her:4,here:[0,4,12,13],heritrix:4,hermann:2,hex:4,hexadecim:0,hick:[1,2],hidden:0,hide:[0,12],hide_db:0,hidestructureact:0,hierarch:2,hierarchi:0,high:[0,4],higher:4,highlight:0,hilal94_at_gmail:2,hilal:2,him:2,hindi:2,hint:[0,4],hiroshi:2,hisakawa:2,histor:0,histori:[0,2,12],hitowerdigit_at_hotmail:2,hkp:12,hofman:2,hofman_at_gmail:2,hold:[0,4],hole:0,holm:2,home:10,homepag:[4,13],hope:1,hopefulli:13,hord:2,horizont:[4,5],host:[0,2],hostnam:[0,4,5,12],hover:0,how:0,howev:[0,4,12,13],href:12,hsts:12,htaccess:[0,4,5,12],html:[0,2],htmlspecialchar:12,htpasswd:12,http:[0,1,2],http_authorization:12,http_cooki:5,http_host:[0,4],http_post_vars:4,http_user_agent:4,http_x_forwarded_for:0,httpd:4,https:12,httrack:4,hudsonvsm_at_gmail:2,huge:0,hugu:2,human:2,hung:2,hungarian:2,hungdx_at_gmail:2,huseyn:2,huseyn_esgerov_at_mail:2,hypertext:5,hypertext_transfer_protocol:5,ia_archiv:4,ian:2,ibennetch:12,ibm:4,iccrawler:4,ichiro:4,ico:12,icon:[0,2,4,10,12,13],iconv:0,iconvextraparam:0,id_new:4,idea:[0,2,4,12,13],identif:12,identifi:[0,4,5,12],identified:12,ie6:0,iec:[5,8],ignacio:2,ignor:0,ignore:4,ignoremultisubmiterror:0,igor:2,iis:0,imag:[0,4,5,8,10,11,12,13],img:4,impact:[0,4,12],implement:[0,12,13],impli:1,implic:12,implicitli:5,implment:5,important:4,impos:0,imposs:[0,12],improv:[0,2,5,8,12],improve:2,improvement:2,inact:[12,13],inc:[0,4,12,15],includ:[0,1,2],include_onc:12,include_path:4,incom:12,incompat:4,incomplet:0,incorrect:4,increas:[0,4],increment:0,independ:[2,4,5],index:[0,2],index_:5,indic:12,individu:10,indonesian:2,indrajith:2,inexperienc:10,info:[0,1,2,4],info_at_opsbielani:2,info_at_robinvandervliet:2,inform:0,information_schema:0,infrastructur:12,ini:[0,4,8,11],initi:[0,4,12],initialslidersst:0,inlin:11,innodb:0,innodb_strict_mod:4,innov:5,input:[0,2],insert:[0,2],insertrow:0,insid:[0,4,12,13,15],inside:4,instal:0,install:7,installat:[0,7],instanc:0,instead:[0,4,12],instruct:[0,4],integ:0,integr:[0,2,8,12],integrat:4,intend:0,inter:[0,5],interact:5,interest:4,interf:4,interfac:[0,2,4,5,6,10,11],interfer:4,interlingua:2,intern:[0,4,13],internat:5,internet:0,internet_information_servic:5,internet_protocol:5,internetwork:5,interpret:[0,4],intext:4,intitl:4,introduc:[0,2,4],introduct:7,invalid:0,invit:3,invok:12,involv:4,ion:2,ionut:2,ip_address:5,ipmask:0,ipv4:5,ipv6:[0,5],ironpotts_at_gmail:2,is_str:12,isa:2,isaac:12,isapi:[4,5,12],ismae:2,ismael_at_gmail:2,iso:[5,8],isp:0,isset:12,issu:0,issue:[4,12],italian:2,item:[0,4,5],itself:[0,4,12],itxiaopang:2,iusr_machin:4,ivan:2,ivan_at_mail:2,ivanlanin_at_us:2,jackson:2,jafar:2,jakobsen:2,jakobsen_at_gmail:2,jakub:2,jan:[2,12],jan_at_nrw:2,janhenrikm_at_yahoo:2,janni:2,januari:12,janussen:2,japanes:2,java:4,javascript:[0,2],jayaratn:2,jconstanti_at_yahoo:2,jean:5,jedermann:2,jeev:4,jhaveri:2,jim:2,joan:2,joan_at_montan:2,job:12,joe:[2,4],john1db:4,john2db:4,john_at_panevo:2,john_db:4,johnson:[1,2],join:[0,2,4],jona:2,jong:2,jongdeok:2,jonsson:2,jonsson_at_norsjovallen:2,jordi:2,jose:4,josep:2,jozef:2,jpeg:[5,11,13],jpg:5,jqueri:[1,4,11,15],jremes_at_outlook:2,jrzancan_at_hotmail:2,json:[4,11,12],juha:2,juli:12,julian:[2,5],jump:0,june:2,junior:2,jur:2,just:[0,2],k725:2,kang:2,kanji:2,kankanamg:2,kannada:2,kasun:2,katerinak_at_gmail:2,kaushalya:2,kawada:2,kawada_at_den:2,kazi:2,keck:[1,2],keep:[0,4,12],kehayov:2,kei:[0,2],kelli:2,kempf:2,kept:[0,13],kettler:2,key:4,keybas:12,keyr:12,keyserv:12,khomutov:2,kick:4,kid:2,kiddi:4,kidsmart33_at_gmail:2,kiko:2,kim:2,kim_at_nhn:2,kind:[0,4,5],kindli:4,kingdom:2,kirillov:2,kissu:2,kit:[4,12],klau:4,kleemann:2,klokner:2,known:0,kobayashi_at_gmail:2,koch:2,koch_at_enough:2,kollar:2,kollar_at_pg:2,kollmann:2,koo:2,koolen:2,korakot:2,korakot_at_inam:2,korean:2,kosit:2,kr_at_gmail:2,kraai:2,krasimir:2,kristjan:2,kristjanrats_at_gmail:2,kristof:2,kronsbein:2,krystian4842_at_gmail:2,krystian:2,kumari:2,kunishima:2,kuppelwies:2,kurdish:2,kurt:2,kurt_at_kh:2,kushagra4296_at_gmail:2,kushagra:2,kyeong:2,kyungjun2_at_gmail:2,label:[4,5],lacina:2,ladisch:2,lang:0,languagetool_at_gmail:2,lanin:2,larg:0,larger:[0,4],largest:4,lari:2,lari_at_oesch:2,lass:2,lasse_at_mydom:2,last:[0,4,13],later:[0,4,12],latest:[0,4,5,11],latter:[0,8],latvian:2,lau:2,launchpad:12,laureano:2,laureano_at_gmail:2,laurent:2,layer:5,layout:[0,4,8],lc_messages:0,ldi_:2,lead:[0,4],least:[0,4,12],leav:[0,4,12,13],lee:2,leedermeister_at_gmail:2,left:[0,2],legal:0,legenhausen:2,legner:4,leiding:2,lem9:12,length:0,lesli:2,less:[0,4,6,12],let:0,letter:[0,4],level:[0,4,5,12],lib:[4,12,13,15],libiconv:0,librari:[0,1,2],libwww:4,libxml:11,license:1,like:[0,2],likewis:4,lima:2,limburgish:2,limit:0,limitchar:0,lin:2,line:[0,4,5,6,12,13],line_count:4,link:[0,2,4,8,10,12,13],linklengthlimit:0,linu:12,linux:[0,7],list:[0,2],liter:[0,4],lithuanian:2,lnddyl:2,lnddyl_at_outlook:2,load:[0,2],loader:4,local:0,localhost:0,localneta:0,localnetb:0,localnetc:0,locat:1,lock:[0,4],log:0,logformat:4,login:0,logincookiedeleteal:0,logincookierecal:0,logincookiestor:0,logincookievalid:0,logincookievaliditydisablewarn:0,logo:[0,2],logout:[0,12],logouturl:0,lolo_at_phpheaven:2,longer:[0,12],longtabl:4,longtext:0,longtextdoubletextarea:0,look:[0,4,5,8,12,13],lori:2,lose:0,lossi:5,lost:0,lot:0,loup:5,low:[0,4],lower:[0,4],lower_case_table_nam:4,lsml_at_liv:2,ltr:12,lubo:2,lucen:4,lui:2,luisan00_at_hotmail:2,lund:2,m42:2,m_at_gmail:2,mac:0,mac_os_x:5,machin:0,maciej:2,maciejka45_at_gmail:2,macintosh:5,macof:2,made:[0,2,4,5,12],madhura:2,madlen:2,mai:[0,4,8,12,13],mail:[4,5],mainli:5,maintain:[2,4,12],mainten:[0,2,8],major:4,make:[0,3],malai:2,malfunct:4,malgeri_at_gmail:2,man:0,mani:[0,2,3],manipul:[0,5,8],manual:[0,4,8],manufactur:5,manuzhai:2,map:12,marc:[1,2,4,9,12],marc_at_infomarc:[1,2],marcel:2,march:2,marco:2,marconcini:2,marek:2,mariadb:[4,11,12],marin:2,mark:[0,2,5],market:5,markt:4,markup:5,mart:2,martijn:2,martin:2,martin_at_vidn:2,martin_at_whistl:2,martinelli:2,martinelli_at_gmail:2,martyna:2,masahiko:2,master:[0,9],master_db:0,mat:2,match:[0,4,6,12],mathia:2,matiasbellon:2,matthia:2,matthias_at_bluthardt:2,max:4,max_array_index_length:4,max_link:4,max_request_vari:4,max_totalname_length:4,max_value_length:4,max_var:4,maxcharactersindisplayedsql:0,maxdblist:0,maxexactcount:[0,4],maxexactcountview:0,maxim:2,maxime_at_fre:2,maximum:[0,4],maxnavigationitem:0,maxrow:0,maxsizeforinputfield:0,maxtablelist:0,maxtableuipref:0,mayb:4,mb_strlen:12,mbstring:[0,11],mcrypt:[4,5,12],me_at_derrabu:[1,2],me_at_supergarv:[1,2],mean:0,meanwhil:4,measur:[0,5,12],mechan:[0,2,4,12],media:4,mediapartn:4,medios:2,meet:12,memoranda:5,memori:0,memory_limit:[0,4],memorylimit:0,memoword_at_163:2,mendax:2,mendel:[1,2],mention:[4,12],menu:[0,4],merchantability:1,messag:0,met:[4,12],meta:[0,12,13],metagerbot:4,method:[0,4,5,12,13],methodolog:5,michael:[1,2],michal:[1,2,12],michal_at_cihar:[1,2],michel:2,middl:0,might:[0,4,10,12,15],migrat:4,mike:2,mike_at_graftonhal:2,miko:2,mime:[0,2],mimetyp:0,mind:12,miner:4,minh:2,minim:[4,12],minimum:[0,4],minor:[2,4],minsizeforinputfield:0,minu:4,miquel:2,mirror:4,miss:0,missing:13,mit:[1,12],mitenem_at_outlook:2,mj12bot:4,mkdir:[4,12],mkkeck_at_us:[1,2],mladenov:2,mmcach:4,mmcrawler:4,mmh15_at_windowsl:2,mod:4,mod_gzip_item_includ:4,mod_proxi:4,mod_proxy_fcgi:[5,12],mod_rewrit:4,mod_ssl:4,moder:2,modifi:[0,1],modul:[4,5],moham:2,mokhtari:2,molnar:2,morai:2,more:[0,1],moreov:4,moretti:2,mosh:2,most:[0,2,4,5,12,13],motuza:2,motuzas_at_gmail:2,mount:0,mous:[0,4],mousewheel:4,move:0,mrdaniloazevedo_at_gmail:2,msie:4,msnbot:4,much:[4,13],muhammad:2,mulla:2,multi:[0,2],multipl:[0,2],multipurpos:5,multithread:5,murariu:2,murariu_at_yahoo:2,must:[0,4,6,8,10,12],my_db:0,myadmin:12,mydatabas:0,mydb:[0,4],myisam:[4,8],mynam:4,mysql_connect:4,mysql_db_serv:12,mysql_fetch_field:13,mysql_pconnect:0,mysql_root_password:12,mysql_upgrad:4,mysqladmin:4,mysqld:4,mysqli:[0,2],mysqlminvers:0,mysqlnd:0,myung:2,n8falke_at_us:2,nabin:2,naderi:2,naderi_at_gmail:2,naeem:2,nair:2,nakandala:2,nakrani:2,name:[0,2],nast3zz_at_gmail:2,nativ:0,natur:0,naturalord:0,navarro:2,navigationdisplaylogo:0,navigationdisplayserv:0,navigationhid:0,navigationlinkwithmainpanel:0,navigationlogolink:0,navigationlogolinkwindow:0,navigationtreedbsepar:0,navigationtreedefaulttabt:0,navigationtreedefaulttabtable2:0,navigationtreedisplaydbfilterminimum:0,navigationtreedisplayitemfilterminimum:0,navigationtreeenableexpans:0,navigationtreeenablegroup:0,navigationtreepointeren:0,navigationtreeshowev:0,navigationtreeshowfunct:0,navigationtreeshowprocedur:0,navigationtreeshowt:0,navigationtreeshowview:0,navigationtreetablelevel:0,navigationtreetablesepar:[0,4],ne0x_at_us:2,nearli:0,necessari:[0,13],need:0,neg:4,neil:2,neimani:2,neither:[0,4],neomo:4,nepali:2,nest:[0,2],net:[0,1,2,4,5,12],netcologn:4,network:[4,5],never:0,nevertheless:12,newer:0,newest:0,newli:[6,12],newlin:0,newsblog:4,next:[0,4,12],nginx:11,nicola:2,niel:2,niemand:2,nijel:12,niko:2,niko_at_gmail:2,nikto:4,ninad:2,nisarg:2,nisargjhaveri_at_gmail:2,nitrotoll_at_gmail:2,nix:0,nnabinn_at_hotmail:2,noblob:0,nobody_at_gmail:2,node:5,nokeepal:4,non:0,none:0,nontawat39_at_gmail:2,nopassword:0,nor:4,nordenberg:2,noreply_at_webl:2,normal:[0,2,4,12,13],norwegian:2,not_nul:13,note:[0,4,12,13,15],noticias:2,now:0,nowher:0,ntfs:0,number:0,numer:[0,4],numfavoritet:[0,4],numrecentt:0,nutchcvs:4,nyu:2,obgzip:[0,4],object:[4,12,13],obrador:2,obtain:0,occur:[4,12],octet:4,ods:6,oesch:2,off:[0,4],offer:[0,4,5,12],offic:5,offici:[4,9,12,13],oficial_at_gmail:2,often:[0,4,12],okai:12,old:[0,4,12],older:0,olivier:[1,2],olof:2,om_at_omni:[1,2],omar:2,omar_2412_at_l:2,omit:0,omniexplorer_bot:4,onc:0,once:[4,10,12],ondra:2,ondrasek:2,one:4,onli:[0,2],onlin:4,only:[0,4],only_db:0,open:[0,3,4,5],open_basedir:0,opendocu:[5,8],opengis:2,openid:12,openid_messag:12,openid_relyingparti:12,openssl:11,oper:0,opera7:4,operat:[4,6,12],opposit:0,optim:[0,2],optimiz:4,optional:[0,12],order:0,ordinari:12,org:[0,1,2,4,5,12],organ:5,organis:5,orient:[0,4,5],origin:0,orion1979_at_yandex:2,orzkun_at_ageag:2,os_x:5,other:[0,2,3],otherwis:[0,4],our:[0,2,3,4,9,12,13],out:[0,3],output:[0,2,4,13],output_compress:4,outsid:[0,13],outsourc:2,over:[0,4,5,10,12],overcom:4,overlord666_at_gmail:2,overrid:12,overview:[4,13],overwhelm:10,overwrit:0,overwritten:0,own:0,owner:[0,12],owneremail:4,ownerfirstnam:4,ownerlastnam:4,ownerphon:4,ownerphone1:4,ownerphone2:4,ownership:4,pack:4,packag:[0,4,7,12],packagist:12,packet:5,pai:12,pair:[0,12],palid:2,palider_at_seznam:2,palstsiuk:2,pan:4,pandei:2,pandithawatta:2,pantola:2,papaz_p_at_yahoo:2,paper:[0,4],paragraph:4,param:[0,12],paramet:0,parent:[4,12],parkourpotex_at_gmail:2,parse_url:4,parser:2,part:[0,4,5,8],partial:0,particular:[1,4,5,10,12],particularli:12,pass:[0,4,8,10,12,13],passphras:0,passwd:12,password:0,past:0,patch:[0,2],path:0,path_to_phpmyadmin:4,path_to_your_phpmyadmin_directori:0,patrik:2,pattern:0,paul:4,paulei:2,pavel:2,pbms:2,pcre:[0,5],pdf_page:[0,4],pdfdefaultpages:0,pdfpages:0,pear:[2,5,12],peccatt:2,pedro:2,peer:0,pem:0,pencil:10,peopl:[2,3,4,8,15],per:[0,4],perekupka:2,perfect:[0,12],perform:[0,4,10,11],perhap:12,period:12,perkontevs_at_gmail:2,perl:[4,5],permiss:[0,4,10,12],permit:[0,10],persian:2,persist:0,persiste1_at_gmail:2,persistentconnect:0,person:[0,4,5,12],person_nam:4,petbre:4,petdob:4,pete:2,peter:2,petnam:4,petr:2,pettyp:4,pgp:12,ph3n1x:2,phan:2,phillip:2,photograph:5,php3:2,php4:[2,4],php:[0,1,2],php_mysqli:4,php_self:[4,12],phpinfo:4,phpmy:4,phpmyadmin:[0,1,2,3],phpmyadmin_at_zweisteinsoft:2,phpmyadmin_x:12,phpmysqlformgen:2,phpseclib:[2,15],phpwizard:[2,4],piankov:2,pick:4,pikto:4,piller:2,pin:0,pink:4,piotr:2,pipe:0,pistej2_at_gmail:2,pistej:2,place:[0,4],placehold:4,placella:2,placement:4,plai:12,plain:[0,4,12,13],plamen_mbx_at_yahoo:2,platform:[0,4,5,12],plathei:2,pleas:[0,4,12,13,15],plesk:0,plot:4,plu:[2,4],plug:13,plugin:[2,4,13],pma:12,pma__central_column:0,pma__column_com:0,pma__column_info:0,pma__designer_set:0,pma__export_templ:0,pma__favorit:0,pma__histori:0,pma__navigationhid:0,pma__rec:0,pma__rel:4,pma__savedsearch:0,pma__table_info:[0,4],pma__table_uipref:0,pma__track:0,pma__us:0,pma__usergroup:0,pma_absolute_uri:12,pma_arbitrary:12,pma_at_sebastianmendel:2,pma_combin:4,pma_db:12,pma_dbi:2,pma_host:12,pma_hosts:12,pma_password:[4,12],pma_port:12,pma_single_signon_cfgupd:12,pma_single_signon_error_messag:12,pma_single_signon_host:12,pma_single_signon_messag:12,pma_single_signon_password:12,pma_single_signon_port:12,pma_single_signon_us:12,pma_user:12,pma_usernam:4,pmaabsoluteuri:[0,4],pmadb:0,pmahomm:[0,4],pmanorelation_disablewarn:0,pmapass:12,pmatest:0,png:4,point:[0,4,5,12],polici:0,polish:2,popcorn:2,popular:5,port:0,port_:5,portabl:5,portable_document_format:5,portion:[0,15],portnumb:0,portugues:2,posit:[4,5],possibl:[0,3],post:[0,4,12],post_max_s:4,potenti:0,pozzato:2,ppa:12,practic:0,pratap:2,pre:0,precedessor:5,predatorix_at_web:2,predefin:8,prefer:[0,2],prefix:[0,4],prepar:[0,5,12],prepend:13,preprocessor:5,present:[0,4,10,12],press:0,pretti:2,prevent:0,previou:[0,4,12],primari:[0,2],primary:4,print:2,printer:2,printview:[0,2],prior:12,privaci:12,privat:[0,4],privileg:[0,2],privileges:12,probabl:[4,12,15],problem:0,problemat:4,procedur:0,procs_priv:4,produc:0,product:[4,12],profession:5,program:[0,1,5,6],prohibit:0,project:[0,2],prompt:[0,12],proper:[0,4,6,8,12,13],properli:[0,4,8,12],properti:[0,2,4,13],propertiesnumcolumn:0,propos:[4,8],protect:0,protectbinari:0,protocol:0,provid:[0,4,5,10,12,13,15],proxi:0,proxypass:[0,4],proxypassrevers:4,proxypassreversecookiedomain:4,proxypassreversecookiepath:4,proxyurl:0,proxyus:0,pruett:2,przemo:2,przybylski:2,psbot0:4,publi_at_web:2,publish:[0,1],pull:[0,12],pundalik:2,punjabi:2,purodha:2,purpos:[0,5],purpose:1,put:0,python:4,qbe:[2,8],qiang:2,qualifi:12,queryhistorydb:0,queryhistorymax:0,querystr:12,quick:[0,4,5,7],quickli:6,quit:[0,2,4],quot:4,qyz:2,r9uk:12,ra4_at_openmailbox:2,rachim:2,rachman:2,radio:4,rafael:2,rai:2,raj:2,rajandran:2,random:[0,2],rang:0,raouf:2,rather:[0,4,10,12],ratio:11,ratschil:[1,2],raul:2,raul_at_wservic:2,ray_at_datahui:2,reach:[12,13],reachabl:0,read:[0,4,8,12],readabl:4,readi:12,real:[0,4],real_password:12,real_us:12,realli:[0,4,12],realm:[0,12],rearrang:4,reason:[0,4],recal:0,recaptcha:[0,11],receiv:1,recent:[0,4,5,12],recod:0,recode_str:0,recodingengin:0,recommend:[0,4,5,12],record:[5,10],recreat:4,recv:12,redesign:2,redhat:4,redirect:0,redistribut:[1,15],refactor:2,refer:[0,4,5],referenti:[0,8],reflect:5,refman:[0,4],refresh:0,regard:[0,8,13],regardless:12,register_glob:4,regular:[0,2,5],regullar:0,reject:0,rel:[4,12],rel_countri:4,rel_person:4,rel_town:4,relat:[0,2],relationaldisplai:0,releas:[0,1,2,4,7],relev:0,reli:12,reliabl:[4,12],relyingparti:12,relyingparty_result:12,remain:[0,4],rememb:[0,4],remembersort:0,remot:5,remote_user:4,remov:[0,2,4,10,12],renam:0,rename:0,renato:2,renatomdd_at_yahoo:2,reorder:4,repeat:[0,4],repeatcel:0,replac:[0,4,15],replace:0,repli:12,replic:[2,4],report:[0,2,4],repositori:[1,5,12],repres:[0,4,5],represent:2,reproduc:4,request:0,request_for_com:5,request_method:4,request_uri:[4,12],requir:0,resav:12,research:5,reserv:0,reservedworddisablewarn:0,reset:[4,12],resiz:4,resolut:5,resolv:4,resourc:5,respect:[1,4],respons:5,restart:4,restrict:0,result:0,retainquerybox:0,retriev:[0,12],return_to:12,returnto:12,revers:0,review:12,revis:[0,4,5],revistafammatvmus:2,revok:0,rewrit:[4,5],rewritebas:4,rewritecond:4,rewriteengin:4,rewriterul:4,rewrot:2,rex:2,rfc1867:4,rfc2616_header:4,rfc:[4,5,8],ribeiro:2,ribeiro_at_gmail:2,ricardo:2,rifthi:2,rifthy456_at_gmail:2,right:0,risk:[0,4],rob:4,robbat2_at_us:[1,2],robin:[1,2],rocha:2,rocha_at_zoho:2,rodrigo:2,rodrigu:2,rohled:2,rohmberg:2,rohmberger_at_hotmail:2,romanian:2,ronni:2,ronniesimonf_at_gmail:2,roohan:2,roohan_cena_at_yahoo:2,root:0,roszatycki:2,rouslan:2,rout:0,router:12,routin:[0,2],row:[0,2],row_:5,row_format:4,rowactionlink:0,rowactionlinkswithoutuniqu:0,rowactiontyp:0,rsa:12,rubinov:2,ruiz:2,rule:[0,4,12,13],ruleant_at_us:2,run:0,russian:2,rutkowski:2,rwx:[0,4],saad:2,safe:0,said:4,sailboat:2,sakamoto:2,sake:4,saleh:2,salvadoporjc_at_gmail:2,sam_at_gmail:2,same:0,sampl:[4,12],sander:2,sandro123iv_at_gmail:2,sandro:2,santana:2,santana_at_gmail:2,sarna:2,sascha:2,save_path:4,savecellsatonc:0,savedir:0,savedsearch:0,saverio:2,saw:4,sbin:12,scale:4,scan:4,scanner:4,scatter:4,scenario:[4,12],schaefer:2,schema:[0,2],scheme:0,schneier:5,scooter:4,scope:12,scorpio_at_gmail:2,scp:4,scratchboard:[2,4],screenshot:4,script:[0,2],search:[0,2],searchabl:12,sebastian:[1,2],sebastian_at_sgundersen:2,second:[0,4,10,13],secret:0,section:[0,3,4,12,13],secur:0,secure_sockets_lay:5,securer:2,see:[0,1,2],seealso:5,seekbot:4,seem:0,seen:0,segment:0,seibt:2,select:[0,2],selector:0,self:0,send:0,senderrorreport:0,sens:13,sensi:4,sensit:0,sent:[0,2],seo:4,seoma:4,seongki:2,seosearch:4,separ:[0,2,4,5,12],separated_valu:5,sequenc:5,serbian:2,seriou:4,serv:[5,12],server_:5,server_address:0,server_at_gmail:2,server_name:12,server_port:12,serverdefault:0,serverlibrarydifference_disablewarn:0,servic:[0,4,5,12],session:[0,4,11,12],session_id:12,session_nam:12,session_save_path:[0,12],session_set_cookie_param:12,session_start:12,session_write_clos:12,sessionsavepath:[0,12],sessiontimezon:0,set_magic_quotes_runtim:12,setenvif:[4,12],setfacl:0,setia:2,setia_at_gmail:2,setinputfilt:4,setoutputfilt:4,setup_config_file:15,setup_dir_writable:15,sevdimali:2,sevdimaliisayev_at_mail:2,sever:[0,1,4,12,13,15],sevillano:2,seward:5,shahrabani:2,shameem:2,shapefil:0,share:12,sharifov_at_programm:2,she:4,sheet:6,shell:4,sherbrook:4,shift:[0,4],shin:2,ship:[5,12,15],shirian:2,shirian_at_gmail:2,shortcut:[0,4,12],shorten:4,shorter:[0,4],should:[0,1,2],shouldn:12,show:[0,4,12],show_pag:12,showall:0,showasphp:0,showbrowsecom:0,showchgpassword:0,showcreatedb:0,showdatabasesnavigationastre:0,showdbstructurecr:0,showdbstructurelastcheck:0,showdbstructurelastupd:0,showfieldtypesindataeditview:0,showfunctionfield:0,showgitrevis:0,showhint:0,shown:0,showpropertycom:0,showserverinfo:0,showsql:0,showstat:0,shp:4,shutdown:4,side:[0,5,12],sign:[0,12],signatur:12,signific:2,signon:0,signonscript:[0,12],signonsess:[0,12],signonurl:[0,12],silent:4,silva:2,simecek_at_gmail:2,similar:[0,4,12],similarli:4,simon:2,simoncini:4,simpli:0,simplifi:[2,10,12],sinc:[0,2,4,6,11,12],singh:2,singl:0,sinhala:2,site:[0,4,9,12],sitesearch:4,situat:[4,12],siu:2,size:0,skill:4,skip:15,skiplockedt:0,skshin_at_gmail:2,slash:0,slider:0,slovak:2,slovenian:2,slow:[0,4],slowdown:4,slurp:4,small:[0,4],smaller:[0,2,4],smart:[0,2],smarte_at_gmail:2,smita:2,smtp:2,snap:0,snappi:4,snapshot:0,snippet:0,socket:0,softwar:[1,4,5,12,15],solut:[4,12],solv:4,some:[0,2],someth:[0,4],somewher:4,somthanat:2,somthanat_at_gmail:2,song:2,soom:2,soon:4,sora:2,sora_at_tiscali:2,sorani:2,sort:[0,4,5],soulard:2,sourc:[0,2,3,4,5,7],sourceforg:[1,2],souza:2,sp2:4,space:[0,4],spaces:4,spanish:2,speadsheet:6,special:0,specif:0,specifi:[0,2],speed:[0,4,12],spl:11,split:[0,4,13],sponsor:4,sqlmode_ansi:4,sqlqueri:0,sqrt_at_entless:2,src:4,srnka:2,ssl_ca:0,ssl_ca_path:0,ssl_cert:0,ssl_cipher:0,ssl_kei:0,ssl_verifi:0,ssloption:4,sta:2,stabl:4,standard:[0,2,4,5,6,11],star:[0,4],start:[0,2],startup:4,state:0,statement:[0,4,8,12],station:4,statist:[0,2],statu:[0,2,4],status:0,stdenvvar:4,stdpass:0,stduser:0,ste:2,stefan:2,stefano:2,step:[4,12],steve:2,steven:2,still:[0,10,12],stock:12,stokkan:2,stop:[0,4],storag:[0,4,5,7],store:[0,2],stored_procedur:5,straka3_at_gmail:2,straka:2,stream:4,strftime:4,strict:0,strijbol:2,string:[0,2],strip:[0,4,15],strongli:[0,11],stuff:2,stuffit:12,style:[0,4,12],sub:4,subdirectori:[0,4,12],subfold:[4,12],subject:[0,4],sublevel:0,submiss:0,submit:[0,4,12],subpackag:[0,12],subroutin:5,subset:8,substitut:4,subtyp:13,success:4,successfulli:4,suffic:12,suffici:4,suffix:[0,12],suggest:[2,4,11,12],suhardi:2,suhosin:0,suhosindisablewarn:[0,4],suit:[4,5,12],sum:4,summer:2,sun:2,superus:[10,12],suppli:0,support:[0,2],suppos:4,suppress:0,supun:2,surbakti:2,sure:0,surround:4,svalekja:2,svec:2,sven:2,swedish:2,symbol:0,symlinksifownermatch:4,symmetr:5,sync:2,synchron:2,synoobot:4,syntax:[0,4],sysadmin:[0,4],system:[0,2,4,5,12,15],szsilva_at_gmail:2,t10:0,t3if_at_ladisch:2,tabbrows:4,tabl:[0,2],table:[0,4],table_:5,table_coord:[0,4],table_info:0,table_nam:4,table_uipref:0,tablenavigationlinksmod:0,tableprimarykeyord:0,tables:4,tables_priv:4,tablesepar:4,tablettws_at_gmail:2,tabsmod:0,taceloski:2,tag:4,taiwan:2,take:[0,4,13],taken:4,tamil:2,tamsjadi:2,tape:5,tar:[5,12],tar_:5,target:4,tarzq28_at_gmail:2,tbl_chang:2,tbl_creat:2,tbl_dump:4,tbl_row_delet:4,tbl_select:2,tbl_structur:13,tcp:[0,4,5],tcpdf:[1,2,4,5,15],tczzjin_at_gmail:2,team:[0,12],technic:12,technolog:5,tecnick:2,telekom:4,tell:[0,4],telnet:4,tempdir:[0,4],templat:0,template:13,template_abstract:13,temporari:[0,4,12],temporarili:[0,4],temporary:4,term:1,terri:2,test:[0,2,4,12,15],tex:[4,5],textarea:0,textareaautoselect:0,textareacol:0,textarearow:0,textbox:10,textfield:13,textual:4,thai:2,than:[0,2],thank:[2,4],thei:[0,2],them:0,themedefault:[0,4],thememanag:[0,4],themenam:0,themepath:[0,4],themeperserv:0,themselv:0,therefor:0,thi:[0,1,2],thiago:2,thilanka:2,thilina:2,thing:[0,4],think:4,third:0,thirteen:2,thoma:[2,5],those:0,though:[0,6,12],three:[0,4,12,13],threshold:0,through:0,thu:[4,12],thumbnail:11,tickbox:4,tild:4,till:[4,12],time:0,timeout:0,timestamp:0,tinyint:4,tip:[0,4],titledatabas:0,titledefault:0,titleserv:0,titlet:0,tkl:4,tmp:0,tobia:[1,2],tobias_at_ratschil:[1,2],togeth:0,toggl:[0,4],tokyo:4,told:2,tom:2,toma:2,tomas_at_tomasruud:2,tomastik:2,tommi:2,tommy_at_surbakti:2,ton:0,too:[0,3,4],tool:[0,2,3],tooltip:4,top:[0,4,6,12],topic:12,tor:2,total:12,town:4,town_cod:4,track:[0,2,8,12],tracker:[0,4],tracking_add_drop_databas:0,tracking_add_drop_t:0,tracking_add_drop_view:0,tracking_default_stat:0,tracking_version_auto_cr:0,tradition:12,traffic:0,trail:0,transfer:[0,4,5,12],transform:[0,2],transformation_opt:[0,13],transformation_overview:13,transformations_generator_main_class:13,transformations_generator_plugin:13,transformationsplugin:13,transit:12,translat:0,translationwarningthreshold:0,translit:0,transliter:0,transmiss:5,transmit:4,travel:12,treat:4,tree:[0,2],tri:[0,4,12],trigger:[0,2,5,8],trinh:2,trinhminhbao_at_gmail:2,triwidada:2,troubl:0,troubleshoot:4,truli:12,truncate:0,trust:[0,12],trustedproxi:0,tschopp:2,ttf:1,tune:12,tunnel213:2,tunnel213_at_aliyun:2,tupl:5,turck:4,turek:[1,2],turkish:2,turn:[0,4],turnitinbot:4,tutori:4,tweak:12,two:0,tws:2,txt:[1,4,12],type:[0,2],typeset:5,typic:[4,5],tyron:2,ubuntu:0,ufpdf:[2,5],ukko:2,ukrainian:2,ultim:12,ultimat:4,ummer:4,unavail:0,uncheck:[0,4],unclean:4,uncomment:12,under:[0,1],underli:[4,12],undernetangel_at_gmail:2,unexpect:4,ungureanu:2,unicod:5,uniform:5,unintend:0,uniqu:[0,4,5],unite:2,unless:[4,12],unlike:12,unlucky_at_inbox:2,unpack:[4,12],unprivileg:0,unset:[4,12],unsign:13,unstuff:12,unsupport:4,untar:12,until:[0,2,4,12],unus:4,unwil:4,unzip:12,updat:[0,2,4,12],update:[0,4,12],upgrad:0,upgrade:[4,7],upgrade_column_info_4_3_0:[0,12],upgrade_tables_mysql_4_1_2:12,upload_max_files:4,upload_progress:4,upload_tmp_dir:4,uploaddir:[0,4],uploadprogress:4,upper:4,upto:4,urbalazs_at_gmail:2,url:0,urltrend:4,uro:2,usabl:4,usag:[0,4],usage:10,use:[0,2],usedbsearch:0,useless:4,usepackag:4,user:[0,2],user_bas:12,user_prefer:0,userconfig:0,usergroup:[0,10],userid:4,usernam:[0,4,8,10,12],userprefsdevelopertab:0,userprefsdisallow:0,userstatu:4,using:0,usr:12,usual:[0,4,5,12,13],usualli:[4,13],usw:12,utf8_general_ci:0,utf:[5,12],util:[0,4,5,12],vainauska:2,valentin:2,valia:2,valid:[0,2,4,8,12],valter:2,valu:0,values:4,van:2,varchar:0,varfilt:4,variabl:0,variable1:4,variable:4,variables:4,vazquez:2,vendor:0,vendor_config:15,verb:4,verbos:[0,4,12],verbose:4,verfic:0,veri:[4,12],verif:[0,4],verifi:[0,4,7],verschuer:2,verschuere_at_outlook:2,version:[0,1],version_check:0,versioncheck:0,vertic:[2,5],vetoffic:4,via:0,victor:2,vidner:2,vietnames:2,view:[0,2],viktar:2,viliu:2,villanueva:2,vim:[0,12],vinai:2,vincent:2,vinipitta_at_gmail:2,vip_at_krasio:2,vipals_at_gmail:2,virusyoon_at_gmail:2,visibl:[0,4,12],visit:12,visok:2,visokereyal_at_gmail:2,visual:[0,2],visualis:4,vitalii:2,vliet:2,vmta_at_yahoo:2,vonflyne:2,vonflynee_at_gmail:2,voogt:2,voogt_at_hccnet:2,voyag:4,vperekupka_at_gmail:2,vserver:[0,4],vulner:[4,12],vytauta:2,w3c:[4,5],w3c_valid:4,wai:[0,2],wait:4,walton:2,walton_at_nordicdm:2,want:0,warn:0,warning:12,warranti:1,warranty:1,washington:2,washingtonbruno_at_msn:2,wasn:2,wasser:4,waw:2,weaker:0,web_brows:5,webadmin:2,webapp:12,webcrawl:4,weblate_at_gmail:2,webmaster_at_trafficg:2,webserv:[0,4,5,12],websit:[2,3,4,5],wei:2,welcom:0,well:[0,2,4,8,12],weng:2,wengshiyu_at_gmail:2,wennberg:2,were:[0,2,4],west:2,wget:4,what:0,when:[0,2],whenev:[0,4],where:[0,1],whether:[0,10,15],whh:2,whhlcj_at_126:2,which:[0,1],who:[0,2],whole:[0,4,8,12],whose:[4,12],why:0,wide:5,wiegger:2,wigginton:2,wiki:[4,5,9],wikipedia:[5,12],wildcard:[0,4],wilk:2,wilson:2,win2k:4,win98:4,window:[0,2],winhttp:4,winningham:2,winnt4:4,wisenutbot:4,wish:[0,6,10,12],withdrawn:2,within:[0,4,10],without:[0,1],witten:2,wizard:[4,12],wkito:4,won:0,word:[0,4,7],work:[0,2],workaround:[4,12],world:[0,5,12],worldwideski:2,worldwideskier_at_yahoo:2,wors:4,would:0,wrap:0,wrapper:12,writabl:[0,12,15],write:0,written:[3,4],wrong:0,www:[0,1,2,4,5,12,13],wysiwyg:2,xampp:12,xavier:2,xhtml1:2,xml:[2,5,8,11,12],xosecalvo_at_gmail:2,xs910203_at_gmail:2,xuan:2,xvnavarro_at_gmail:2,xxx:[0,4,13],xxxx:0,xzvf:12,yacybot:4,yahoo:4,yahooseek:4,yan:2,yansilvagabriel_at_gmail:2,yaron:2,yaron_at_gmail:2,yashodha:2,yasir:2,yasitha:2,yavuz:2,yellow:4,yetdiffer:0,yizhou:2,yml:12,yogarajah:2,yogeshwar:2,yohan:2,yong:2,yoon:2,you:[0,1,2,3,4,6,8,9,10,11,12,13,15],youngmin:2,youngminz:2,your:[0,4,6,7,8,10,11],your_theme_nam:4,yswy_at_hotmail:2,yug:2,yugal:2,yukihiro:2,yuval:2,yyi:0,yyyi:0,zahra:2,zancan:2,zarubin:2,zassenhau:2,zassenhaus_at_jgerman:2,zend:4,zero:0,zeroconf:[0,12],zerofil:13,zheng:2,zhyarabdulla94_at_gmail:2,zigmanta:2,zion_at_gmail:2,zip:[0,2,4,5,8,11,12],zip_:5,zipdump:0,zlib:[4,5,8],zone:0,zoom:2,zrng:2,zufar:2,zzz:0,zzzz:0},titles:["Configuration","Copyright","Credits","Developers Information","FAQ - Frequently Asked Questions","Glossary","Import and export","Welcome to phpMyAdmin&#8217;s documentation!","Introduction","Other sources of information","User management","Requirements","Installation","Transformations","User Guide","Distributing and packaging phpMyAdmin"],titleterms:{"17a":4,"5b4":4,"default":[0,4],"export":[0,4,6],"function":4,"import":[0,4,6],"int":4,"new":[4,10],"null":4,"return":4,"switch":4,"try":4,"while":4,abl:4,about:[4,8],access:4,action:4,add:4,addit:4,adjust:4,after:[4,12],again:4,against:4,alert:4,alreadi:4,alwai:4,ani:4,ansi:4,apach:4,applic:4,appropri:4,area:4,ascii:4,ask:4,asked:4,assign:10,attack:4,auth:4,authent:[0,4,12],auto:4,automat:4,back:[4,12],backup:4,bar:4,base:4,basic:0,becaus:4,behavior:4,below:4,between:4,big:4,bind:4,blank:4,blob:4,book:9,bookmark:4,box:[0,4],bring:4,brows:[0,4,12],browser:[4,11],brute:4,bug:4,bundl:4,can:4,cannot:4,caus:4,central:4,certain:4,cgi:4,chang:4,charact:4,chart:4,checkbox:4,chronolog:2,claus:4,click:4,clickabl:4,client:4,cloud:0,cluster:4,column:[4,6,12],come:4,comment:4,complet:4,compos:12,compress:4,config:12,configur:[0,4,10,12],connect:[0,4],consid:4,contain:4,content:4,control:4,cooki:[0,4,12],copi:4,copyright:1,correct:4,crash:4,creat:[4,10,12],credit:2,cryptic:4,csv:4,curiou:4,custom:[0,4],data:4,databas:[0,4,10,11],db_structur:4,debian:12,decim:4,delet:[4,10],deni:4,design:[0,4],determin:4,develop:[0,3,4],differ:4,directli:4,directori:0,disclosur:4,disk:4,displai:[0,4],distribut:[4,12,15],docker:12,document:[2,4,6,7],doe:4,doesn:4,don:4,dot:4,down:4,drop:4,dump:4,duplic:4,each:4,easili:4,edit:4,edite:[0,10],effect:4,employe:4,empti:4,enabl:4,encrypt:4,enter:4,enterpris:12,error:4,errorcod:4,esri:4,evil:4,exampl:[0,4,12],excel:4,execut:4,exist:[4,10],explorer:4,extend:4,extens:4,external:15,face:4,fail:4,faq:4,favorit:4,featur:[4,8],fedora:12,field:[0,4],file:[4,12,13],fine:4,firefox:4,first:4,firstnam:4,fix:4,folder:4,follow:4,font:4,forc:4,foreign:4,form:4,format:4,forward:4,found:4,frequent:4,from:[4,12],full:4,gener:[0,4],gentoo:12,german:4,get:4,give:4,glossari:5,gone:4,googl:0,group:10,guid:14,gzip:4,happen:4,hash:4,hat:12,have:4,header:4,heard:4,help:4,hierarchi:4,homonym:4,host:4,how:4,html:4,http:[4,12],huge:4,hundr:4,hyphen:4,iis:4,improve:4,includ:4,increment:4,index:4,indice:7,inform:[4,9],informat:3,innodb:4,input:4,insert:4,instal:[4,12],install:12,installat:12,intend:4,internal:4,internet:4,introduct:[8,13],invalid:4,isp:4,issu:[4,12],javascript:4,just:4,kei:4,know:4,known:[4,12],konqueror:4,lang:4,languag:[0,4],larg:4,lastnam:4,latex:4,length:4,let:4,librari:[4,15],licens:1,like:4,limit:4,linux:12,list:4,load:4,local:4,localhost:4,locat:4,log:[4,12],login:4,lose:4,lost:4,lot:4,lowercas:4,lump:4,mac:4,machin:4,main:0,make:4,manag:[0,4,10],mandriva:12,mani:4,manner:4,manual:12,mean:4,memori:4,menu:10,messag:4,microsoft:4,mime:4,mimetyp:4,mine:4,misbehav:4,miss:4,mod_gzip:4,mode:[0,4,12],modifi:4,more:4,move:4,mozilla:4,multi:4,multipl:4,mysql:[0,4],mysqldump:4,mysqli:4,name:[4,6],nativ:4,navig:[0,4],need:4,nest:4,netscap:4,never:4,newer:4,nick:4,non:4,noth:4,now:4,number:4,older:[4,12],onc:4,onli:4,onto:4,open:6,open_basedir:4,opensuse:12,oper:4,opera6:4,option:[0,4],order:2,origin:2,other:[4,9],out:[4,12],own:4,packag:15,page:[0,4],panel:0,paramet:4,parameter:4,pars:4,parti:1,password:4,path:4,pdf:[0,4],php:[4,11],phpmyadmin:[4,7,12,15],plenti:4,pmadb:4,port:4,possibl:4,pr1:4,pre:4,prefer:4,prevent:4,primari:4,print:9,privileg:[4,10,12],problem:4,proce:4,procedur:4,process:4,produc:4,progress:4,project:4,protect:4,protocol:4,proxi:4,put:4,pws:4,queri:[0,4],question:4,quick:12,rang:4,reassign:4,receiv:4,red:12,redirect:4,reduc:4,refresh:4,refus:4,relat:4,relationship:4,releas:12,reload:4,renam:4,request:4,requir:[4,11],restor:4,restrict:4,result:4,revers:4,right:4,robot:4,root:4,row:4,run:4,safari:4,safe:4,sai:4,same:4,save:0,schema:4,screen:4,script:[4,12],scroll:4,search:4,secur:[4,12],see:4,seem:4,select:4,send:4,sent:4,seri:4,server:[0,4,11],set:[0,4],setup:[0,4,12],shapefil:4,should:4,shown:4,signon:12,simpl:4,simpli:4,singl:4,size:4,smith:4,sock:4,socket:4,some:4,sometim:4,sourc:9,special:4,specif:[4,10,12],specifi:4,spreadsheet:6,sql:[0,4],sql_mode:4,ssl:0,start:4,statist:4,storag:12,store:4,string:4,structur:[0,4,13],suhosin:4,support:[4,8],sure:4,symbol:4,synchron:4,tab:0,tabl:[4,6,7],text:[0,4],than:4,thei:4,them:4,theme:[0,4],thi:4,third:1,those:4,through:4,time:4,timeout:4,titl:0,tmp:4,togeth:4,tool:4,transform:[4,13],translat:[2,4],troubl:[4,12],tutori:9,two:4,type:4,ubuntu:12,umlaut:4,unabl:[4,12],undefin:4,under:4,underscor:4,understand:4,unix:4,unknown:4,upgrad:4,upgrade:12,upload:[0,4],url:4,usage:13,use:4,user:[4,8,10,12,14],using:[4,12],valu:4,varchar:4,variabl:4,variou:0,verifi:12,version:[2,4,12],via:4,view:4,volum:12,wai:4,want:4,warn:4,web:[0,11],welcom:[4,7],what:4,when:4,where:4,which:4,whitespac:4,who:4,why:4,win32:4,window:[4,12],withdrawn:4,without:4,won:4,word:8,work:4,would:4,write:4,wrong:4,wtf:4,xitami:4,yes:4,your:12,zero:12,zoom:4}})
\ No newline at end of file
diff --git a/#pma/doc/html/setup.html b/#pma/doc/html/setup.html
deleted file mode 100644
index e8715266..00000000
--- a/#pma/doc/html/setup.html
+++ /dev/null
@@ -1,1122 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    
-    <title>Installation &#8212; phpMyAdmin 4.6.5.2 documentation</title>
-    
-    <link rel="stylesheet" href="_static/classic.css" type="text/css" />
-    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
-    
-    <script type="text/javascript">
-      var DOCUMENTATION_OPTIONS = {
-        URL_ROOT:    './',
-        VERSION:     '4.6.5.2',
-        COLLAPSE_INDEX: false,
-        FILE_SUFFIX: '.html',
-        HAS_SOURCE:  true
-      };
-    </script>
-    <script type="text/javascript" src="_static/jquery.js"></script>
-    <script type="text/javascript" src="_static/underscore.js"></script>
-    <script type="text/javascript" src="_static/doctools.js"></script>
-    <link rel="copyright" title="Copyright" href="copyright.html" />
-    <link rel="top" title="phpMyAdmin 4.6.5.2 documentation" href="index.html" />
-    <link rel="next" title="Configuration" href="config.html" />
-    <link rel="prev" title="Requirements" href="require.html" /> 
-  </head>
-  <body role="document">
-    <div class="related" role="navigation" aria-label="related navigation">
-      <h3>Navigation</h3>
-      <ul>
-        <li class="right" style="margin-right: 10px">
-          <a href="genindex.html" title="General Index"
-             accesskey="I">index</a></li>
-        <li class="right" >
-          <a href="config.html" title="Configuration"
-             accesskey="N">next</a> |</li>
-        <li class="right" >
-          <a href="require.html" title="Requirements"
-             accesskey="P">previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">phpMyAdmin 4.6.5.2 documentation</a> &#187;</li> 
-      </ul>
-    </div>  
-
-    <div class="document">
-      <div class="documentwrapper">
-        <div class="bodywrapper">
-          <div class="body" role="main">
-            
-  <div class="section" id="installation">
-<span id="setup"></span><h1>Installation<a class="headerlink" href="#installation" title="Permalink to this headline">¶</a></h1>
-<p>phpMyAdmin does not apply any special security methods to the MySQL
-database server. It is still the system administrator&#8217;s job to grant
-permissions on the MySQL databases properly. phpMyAdmin&#8217;s <span class="guilabel">Users</span>
-page can be used for this.</p>
-<div class="admonition warning">
-<p class="first admonition-title">Warning</p>
-<p class="last"><a class="reference internal" href="glossary.html#term-mac"><span class="xref std std-term">Mac</span></a> users should note that if you are on a version before
-<a class="reference internal" href="glossary.html#term-mac-os-x"><span class="xref std std-term">Mac OS X</span></a>, StuffIt unstuffs with <a class="reference internal" href="glossary.html#term-mac"><span class="xref std std-term">Mac</span></a> formats. So you&#8217;ll have
-to resave as in BBEdit to Unix style ALL phpMyAdmin scripts before
-uploading them to your server, as PHP seems not to like <a class="reference internal" href="glossary.html#term-mac"><span class="xref std std-term">Mac</span></a>-style
-end of lines character (&#8220;<code class="docutils literal"><span class="pre">\r</span></code>&#8221;).</p>
-</div>
-<div class="section" id="linux-distributions">
-<h2>Linux distributions<a class="headerlink" href="#linux-distributions" title="Permalink to this headline">¶</a></h2>
-<p>phpMyAdmin is included in most Linux distributions. It is recommended to use
-distribution packages when possible - they usually provide integration to your
-distribution and you will automatically get security updates from your distribution.</p>
-<div class="section" id="debian">
-<h3>Debian<a class="headerlink" href="#debian" title="Permalink to this headline">¶</a></h3>
-<p>Debian&#8217;s package repositories include a phpMyAdmin package, but be aware that
-the configuration file is maintained in <code class="docutils literal"><span class="pre">/etc/phpmyadmin</span></code> and may differ in
-some ways from the official phpMyAdmin documentation.</p>
-</div>
-<div class="section" id="opensuse">
-<h3>OpenSUSE<a class="headerlink" href="#opensuse" title="Permalink to this headline">¶</a></h3>
-<p>OpenSUSE already comes with phpMyAdmin package, just install packages from
-the <a class="reference external" href="https://software.opensuse.org/package/phpMyAdmin">openSUSE Build Service</a>.</p>
-</div>
-<div class="section" id="ubuntu">
-<h3>Ubuntu<a class="headerlink" href="#ubuntu" title="Permalink to this headline">¶</a></h3>
-<p>Ubuntu ships phpMyAdmin package, however if you want to use recent version, you
-can use packages from
-<a class="reference external" href="https://launchpad.net/~nijel/+archive/phpmyadmin">PPA for Michal Čihař</a>.</p>
-</div>
-<div class="section" id="gentoo">
-<h3>Gentoo<a class="headerlink" href="#gentoo" title="Permalink to this headline">¶</a></h3>
-<p>Gentoo ships the phpMyAdmin package, both in a near stock configuration as well
-as in a <code class="docutils literal"><span class="pre">webapp-config</span></code> configuration. Use <code class="docutils literal"><span class="pre">emerge</span> <span class="pre">dev-db/phpmyadmin</span></code> to
-install.</p>
-</div>
-<div class="section" id="mandriva">
-<h3>Mandriva<a class="headerlink" href="#mandriva" title="Permalink to this headline">¶</a></h3>
-<p>Mandriva ships the phpMyAdmin package in their <code class="docutils literal"><span class="pre">contrib</span></code> branch and can be
-installed via the usual Control Center.</p>
-</div>
-<div class="section" id="fedora">
-<h3>Fedora<a class="headerlink" href="#fedora" title="Permalink to this headline">¶</a></h3>
-<p>Fedora ships the phpMyAdmin package, but be aware that the configuration file
-is maintained in <code class="docutils literal"><span class="pre">/etc/phpMyAdmin/</span></code> and may differ in some ways from the
-official phpMyAdmin documentation.</p>
-</div>
-<div class="section" id="red-hat-enterprise-linux">
-<h3>Red Hat Enterprise Linux<a class="headerlink" href="#red-hat-enterprise-linux" title="Permalink to this headline">¶</a></h3>
-<p>Red Hat Enterprise Linux itself and thus derivatives like CentOS don&#8217;t
-ship phpMyAdmin, but the Fedora-driven repository
-<a class="reference external" href="https://fedoraproject.org/wiki/EPEL">Extra Packages for Enterprise Linux (EPEL)</a>
-is doing so, if it&#8217;s
-<a class="reference external" href="https://fedoraproject.org/wiki/EPEL/FAQ#howtouse">enabled</a>.
-But be aware that the configuration file is maintained in
-<code class="docutils literal"><span class="pre">/etc/phpMyAdmin/</span></code> and may differ in some ways from the
-official phpMyAdmin documentation.</p>
-</div>
-</div>
-<div class="section" id="installing-on-windows">
-<h2>Installing on Windows<a class="headerlink" href="#installing-on-windows" title="Permalink to this headline">¶</a></h2>
-<p>The easiest way to get phpMyAdmin on Windows is using third party products
-which include phpMyAdmin together with a database and web server such as
-<a class="reference external" href="https://www.apachefriends.org/">XAMPP</a>.</p>
-<p>You can find more of such options at <a class="reference external" href="https://en.wikipedia.org/wiki/List_of_AMP_packages">Wikipedia</a>.</p>
-</div>
-<div class="section" id="installing-using-composer">
-<h2>Installing using Composer<a class="headerlink" href="#installing-using-composer" title="Permalink to this headline">¶</a></h2>
-<p>You can install phpMyAdmin using <a class="reference external" href="https://getcomposer.org/">Composer</a>,
-however it&#8217;s currently not available in the default
-<a class="reference external" href="https://packagist.org/">Packagist</a> repository due to its technical
-limitations.</p>
-<p>The installation is possible by adding our own repository
-&lt;<a class="reference external" href="https://www.phpmyadmin.net/packages.json">https://www.phpmyadmin.net/packages.json</a>&gt;:</p>
-<div class="highlight-sh"><div class="highlight"><pre>composer create-project phpmyadmin/phpmyadmin --repository-url<span class="o">=</span>https://www.phpmyadmin.net/packages.json --no-dev
-</pre></div>
-</div>
-</div>
-<div class="section" id="installing-using-docker">
-<h2>Installing using Docker<a class="headerlink" href="#installing-using-docker" title="Permalink to this headline">¶</a></h2>
-<p>phpMyAdmin comes with a Docker image, which you can easily deploy. You can
-download it using:</p>
-<div class="highlight-sh"><div class="highlight"><pre>docker pull phpmyadmin/phpmyadmin
-</pre></div>
-</div>
-<p>The phpMyAdmin server will be executed on port 80. It supports several ways of
-configuring the link to the database server, which you can manage using
-environment variables:</p>
-<dl class="envvar">
-<dt id="envvar-PMA_ARBITRARY">
-<code class="descname">PMA_ARBITRARY</code><a class="headerlink" href="#envvar-PMA_ARBITRARY" title="Permalink to this definition">¶</a></dt>
-<dd><p>Allows you to enter database server hostname on login form (see
-<span class="target" id="index-0"></span><a class="reference internal" href="config.html#cfg_AllowArbitraryServer"><code class="xref config config-option docutils literal"><span class="pre">$cfg['AllowArbitraryServer']</span></code></a>).</p>
-</dd></dl>
-
-<dl class="envvar">
-<dt id="envvar-PMA_HOST">
-<code class="descname">PMA_HOST</code><a class="headerlink" href="#envvar-PMA_HOST" title="Permalink to this definition">¶</a></dt>
-<dd><p>Host name or IP address of the database server to use.</p>
-</dd></dl>
-
-<dl class="envvar">
-<dt id="envvar-PMA_HOSTS">
-<code class="descname">PMA_HOSTS</code><a class="headerlink" href="#envvar-PMA_HOSTS" title="Permalink to this definition">¶</a></dt>
-<dd><p>Comma separated host names or IP addresses of the database servers to use.</p>
-</dd></dl>
-
-<dl class="envvar">
-<dt id="envvar-PMA_USER">
-<code class="descname">PMA_USER</code><a class="headerlink" href="#envvar-PMA_USER" title="Permalink to this definition">¶</a></dt>
-<dd><p>User name to use for <a class="reference internal" href="#auth-config"><span class="std std-ref">Config authentication mode</span></a>.</p>
-</dd></dl>
-
-<dl class="envvar">
-<dt id="envvar-PMA_PASSWORD">
-<code class="descname">PMA_PASSWORD</code><a class="headerlink" href="#envvar-PMA_PASSWORD" title="Permalink to this definition">¶</a></dt>
-<dd><p>Password to use for <a class="reference internal" href="#auth-config"><span class="std std-ref">Config authentication mode</span></a>.</p>
-</dd></dl>
-
-<dl class="envvar">
-<dt id="envvar-PMA_PORT">
-<code class="descname">PMA_PORT</code><a class="headerlink" href="#envvar-PMA_PORT" title="Permalink to this definition">¶</a></dt>
-<dd><p>Port of the databse server to use.</p>
-</dd></dl>
-
-<dl class="envvar">
-<dt id="envvar-PMA_ABSOLUTE_URI">
-<code class="descname">PMA_ABSOLUTE_URI</code><a class="headerlink" href="#envvar-PMA_ABSOLUTE_URI" title="Permalink to this definition">¶</a></dt>
-<dd><p>The fully-qualified path (<code class="docutils literal"><span class="pre">https://pma.example.net/</span></code>) where the reverse
-proxy makes phpMyAdmin available.</p>
-</dd></dl>
-
-<p>By default, <a class="reference internal" href="#cookie"><span class="std std-ref">Cookie authentication mode</span></a> is used, but if <span class="target" id="index-1"></span><a class="reference internal" href="#envvar-PMA_USER"><code class="xref std std-envvar docutils literal"><span class="pre">PMA_USER</span></code></a> and
-<span class="target" id="index-2"></span><a class="reference internal" href="#envvar-PMA_PASSWORD"><code class="xref std std-envvar docutils literal"><span class="pre">PMA_PASSWORD</span></code></a> are set, it is switched to <a class="reference internal" href="#auth-config"><span class="std std-ref">Config authentication mode</span></a>.</p>
-<div class="admonition note">
-<p class="first admonition-title">Note</p>
-<p class="last">The credentials you need to login are stored in the MySQL server, in case
-of Docker image there are various ways to set it (for example
-<span class="target" id="index-3"></span><code class="xref std std-envvar docutils literal"><span class="pre">MYSQL_ROOT_PASSWORD</span></code> when starting MySQL container). Please check
-documentation for <a class="reference external" href="https://hub.docker.com/r/_/mariadb/">MariaDB container</a>
-or <a class="reference external" href="https://hub.docker.com/r/_/mysql/">MySQL container</a>.</p>
-</div>
-<p>Additionally configuration can be tweaked by <code class="file docutils literal"><span class="pre">/www/config.user.inc.php</span></code>. If
-this file exists, it will be loaded after configuration generated from above
-environment variables, so you can override any configuration variable. This
-configuraiton can be added as a volume when invoking docker using
-<cite>-v /some/local/directory/config.user.inc.php:/www/config.user.inc.php</cite> parameters.</p>
-<div class="admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last">See <a class="reference internal" href="config.html#config"><span class="std std-ref">Configuration</span></a> for detailed description of configuration options.</p>
-</div>
-<div class="section" id="docker-volumes">
-<h3>Docker Volumes<a class="headerlink" href="#docker-volumes" title="Permalink to this headline">¶</a></h3>
-<p>You can use following volumes to customise image behavior:</p>
-<p><code class="file docutils literal"><span class="pre">/www/config.user.inc.php</span></code></p>
-<blockquote>
-<div>Can be used for additional settings, see previous chapter for more details.</div></blockquote>
-<p><code class="file docutils literal"><span class="pre">/sessions/</span></code></p>
-<blockquote>
-<div>Directory where PHP sessions are stored. You might want to share this
-for example when uswing <a class="reference internal" href="#auth-signon"><span class="std std-ref">Signon authentication mode</span></a>.</div></blockquote>
-</div>
-<div class="section" id="docker-examples">
-<h3>Docker Examples<a class="headerlink" href="#docker-examples" title="Permalink to this headline">¶</a></h3>
-<p>To connect phpMyAdmin to given server use:</p>
-<div class="highlight-sh"><div class="highlight"><pre>docker run --name myadmin -d -e <span class="nv">PMA_HOST</span><span class="o">=</span>dbhost -p 8080:80 phpmyadmin/phpmyadmin
-</pre></div>
-</div>
-<p>To connect phpMyAdmin to more servers use:</p>
-<div class="highlight-sh"><div class="highlight"><pre>docker run --name myadmin -d -e <span class="nv">PMA_HOSTS</span><span class="o">=</span>dbhost1,dbhost2,dbhost3 -p 8080:80 phpmyadmin/phpmyadmin
-</pre></div>
-</div>
-<p>To use arbitrary server option:</p>
-<div class="highlight-sh"><div class="highlight"><pre>docker run --name myadmin -d --link mysql_db_server:db -p 8080:80 -e <span class="nv">PMA_ARBITRARY</span><span class="o">=</span><span class="m">1</span> phpmyadmin/phpmyadmin
-</pre></div>
-</div>
-<p>You can also link the database container using Docker:</p>
-<div class="highlight-sh"><div class="highlight"><pre>docker run --name phpmyadmin -d --link mysql_db_server:db -p 8080:80 phpmyadmin/phpmyadmin
-</pre></div>
-</div>
-<p>Running with additional configration:</p>
-<div class="highlight-sh"><div class="highlight"><pre>docker run --name phpmyadmin -d --link mysql_db_server:db -p 8080:80 -v /some/local/directory/config.user.inc.php:/config.user.inc.php phpmyadmin/phpmyadmin
-</pre></div>
-</div>
-</div>
-<div class="section" id="using-docker-compose">
-<h3>Using docker-compose<a class="headerlink" href="#using-docker-compose" title="Permalink to this headline">¶</a></h3>
-<p>Alternatively you can also use docker-compose with the docker-compose.yml from
-&lt;<a class="reference external" href="https://github.com/phpmyadmin/docker">https://github.com/phpmyadmin/docker</a>&gt;.  This will run phpMyAdmin with
-arbitrary server - allowing you to specify MySQL/MariaDB server on login page.</p>
-<div class="highlight-sh"><div class="highlight"><pre>docker-compose up -d
-</pre></div>
-</div>
-</div>
-</div>
-<div class="section" id="quick-install">
-<span id="id1"></span><h2>Quick Install<a class="headerlink" href="#quick-install" title="Permalink to this headline">¶</a></h2>
-<ol class="arabic simple">
-<li>Choose an appropriate distribution kit from the phpmyadmin.net
-Downloads page. Some kits contain only the English messages, others
-contain all languages. We&#8217;ll assume you chose a kit whose name
-looks like <code class="docutils literal"><span class="pre">phpMyAdmin-x.x.x</span> <span class="pre">-all-languages.tar.gz</span></code>.</li>
-<li>Ensure you have downloaded a genuine archive, see <a class="reference internal" href="#verify"><span class="std std-ref">Verifying phpMyAdmin releases</span></a>.</li>
-<li>Untar or unzip the distribution (be sure to unzip the subdirectories):
-<code class="docutils literal"><span class="pre">tar</span> <span class="pre">-xzvf</span> <span class="pre">phpMyAdmin_x.x.x-all-languages.tar.gz</span></code> in your
-webserver&#8217;s document root. If you don&#8217;t have direct access to your
-document root, put the files in a directory on your local machine,
-and, after step 4, transfer the directory on your web server using,
-for example, ftp.</li>
-<li>Ensure that all the scripts have the appropriate owner (if PHP is
-running in safe mode, having some scripts with an owner different from
-the owner of other scripts will be a problem). See <a class="reference internal" href="faq.html#faq4-2"><span class="std std-ref">4.2 What&#8217;s the preferred way of making phpMyAdmin secure against evil access?</span></a> and
-<a class="reference internal" href="faq.html#faq1-26"><span class="std std-ref">1.26 I just installed phpMyAdmin in my document root of IIS but I get the error &#8220;No input file specified&#8221; when trying to run phpMyAdmin.</span></a> for suggestions.</li>
-<li>Now you must configure your installation. There are two methods that
-can be used. Traditionally, users have hand-edited a copy of
-<code class="file docutils literal"><span class="pre">config.inc.php</span></code>, but now a wizard-style setup script is provided
-for those who prefer a graphical installation. Creating a
-<code class="file docutils literal"><span class="pre">config.inc.php</span></code> is still a quick way to get started and needed for
-some advanced features.</li>
-</ol>
-<div class="section" id="manually-creating-the-file">
-<h3>Manually creating the file<a class="headerlink" href="#manually-creating-the-file" title="Permalink to this headline">¶</a></h3>
-<p>To manually create the file, simply use your text editor to create the
-file <code class="file docutils literal"><span class="pre">config.inc.php</span></code> (you can copy <code class="file docutils literal"><span class="pre">config.sample.inc.php</span></code> to get
-a minimal configuration file) in the main (top-level) phpMyAdmin
-directory (the one that contains <code class="file docutils literal"><span class="pre">index.php</span></code>). phpMyAdmin first
-loads <code class="file docutils literal"><span class="pre">libraries/config.default.php</span></code> and then overrides those values
-with anything found in <code class="file docutils literal"><span class="pre">config.inc.php</span></code>. If the default value is
-okay for a particular setting, there is no need to include it in
-<code class="file docutils literal"><span class="pre">config.inc.php</span></code>. You&#8217;ll probably need only a few directives to get going; a
-simple configuration may look like this:</p>
-<div class="highlight-xml+php"><div class="highlight"><pre><span class="cp">&lt;?php</span>
-<span class="c1">// use here a value of your choice at least 32 chars long</span>
-<span class="nv">$cfg</span><span class="p">[</span><span class="s1">&#39;blowfish_secret&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="s1">&#39;1{dd0`&lt;Q),5XP_:R9UK%%8\&quot;EEcyH#{o&#39;</span><span class="p">;</span>
-
-<span class="nv">$i</span><span class="o">=</span><span class="mi">0</span><span class="p">;</span>
-<span class="nv">$i</span><span class="o">++</span><span class="p">;</span>
-<span class="nv">$cfg</span><span class="p">[</span><span class="s1">&#39;Servers&#39;</span><span class="p">][</span><span class="nv">$i</span><span class="p">][</span><span class="s1">&#39;auth_type&#39;</span><span class="p">]</span>     <span class="o">=</span> <span class="s1">&#39;cookie&#39;</span><span class="p">;</span>
-<span class="cp">?&gt;</span>
-</pre></div>
-</div>
-<p>Or, if you prefer to not be prompted every time you log in:</p>
-<div class="highlight-xml+php"><div class="highlight"><pre><span class="cp">&lt;?php</span>
-
-<span class="nv">$i</span><span class="o">=</span><span class="mi">0</span><span class="p">;</span>
-<span class="nv">$i</span><span class="o">++</span><span class="p">;</span>
-<span class="nv">$cfg</span><span class="p">[</span><span class="s1">&#39;Servers&#39;</span><span class="p">][</span><span class="nv">$i</span><span class="p">][</span><span class="s1">&#39;user&#39;</span><span class="p">]</span>          <span class="o">=</span> <span class="s1">&#39;root&#39;</span><span class="p">;</span>
-<span class="nv">$cfg</span><span class="p">[</span><span class="s1">&#39;Servers&#39;</span><span class="p">][</span><span class="nv">$i</span><span class="p">][</span><span class="s1">&#39;password&#39;</span><span class="p">]</span>      <span class="o">=</span> <span class="s1">&#39;cbb74bc&#39;</span><span class="p">;</span> <span class="c1">// use here your password</span>
-<span class="nv">$cfg</span><span class="p">[</span><span class="s1">&#39;Servers&#39;</span><span class="p">][</span><span class="nv">$i</span><span class="p">][</span><span class="s1">&#39;auth_type&#39;</span><span class="p">]</span>     <span class="o">=</span> <span class="s1">&#39;config&#39;</span><span class="p">;</span>
-<span class="cp">?&gt;</span>
-</pre></div>
-</div>
-<p>For a full explanation of possible configuration values, see the
-<a class="reference internal" href="config.html#config"><span class="std std-ref">Configuration</span></a> of this document.</p>
-</div>
-<div class="section" id="using-setup-script">
-<span id="setup-script"></span><span id="index-4"></span><h3>Using Setup script<a class="headerlink" href="#using-setup-script" title="Permalink to this headline">¶</a></h3>
-<p>Instead of manually editing <code class="file docutils literal"><span class="pre">config.inc.php</span></code>, you can use phpMyAdmin&#8217;s
-setup feature. First you must manually create a folder <code class="docutils literal"><span class="pre">config</span></code>
-in the phpMyAdmin directory. This is a security measure. On a
-Linux/Unix system you can use the following commands:</p>
-<div class="highlight-sh"><div class="highlight"><pre><span class="nb">cd </span>phpMyAdmin
-mkdir config                        <span class="c"># create directory for saving</span>
-chmod o+rw config                   <span class="c"># give it world writable permissions</span>
-</pre></div>
-</div>
-<p>And to edit an existing configuration, copy it over first:</p>
-<div class="highlight-sh"><div class="highlight"><pre>cp config.inc.php config/           <span class="c"># copy current configuration for editing</span>
-chmod o+w config/config.inc.php     <span class="c"># give it world writable permissions</span>
-</pre></div>
-</div>
-<div class="admonition note">
-<p class="first admonition-title">Note</p>
-<p class="last">Debian and Ubuntu have simplified this setup and all you need to do is to
-execute <strong class="program">/usr/sbin/pma-configure</strong>.</p>
-</div>
-<p>On other platforms, simply create the folder and ensure that your web
-server has read and write access to it. <a class="reference internal" href="faq.html#faq1-26"><span class="std std-ref">1.26 I just installed phpMyAdmin in my document root of IIS but I get the error &#8220;No input file specified&#8221; when trying to run phpMyAdmin.</span></a> can help with
-this.</p>
-<p>Next, open your browser and visit the location where you installed phpMyAdmin, with the <code class="docutils literal"><span class="pre">/setup</span></code> suffix. If you have an existing configuration,
-use the <code class="docutils literal"><span class="pre">Load</span></code> button to bring its content inside the setup panel.
-Note that <strong>changes are not saved to disk until you explicitly choose ``Save``</strong>
-from the <em>Configuration</em> area of the screen. Normally the script saves the new
-<code class="file docutils literal"><span class="pre">config.inc.php</span></code> to the <code class="docutils literal"><span class="pre">config/</span></code> directory, but if the webserver does
-not have the proper permissions you may see the error &#8220;Cannot load or
-save configuration.&#8221; Ensure that the <code class="docutils literal"><span class="pre">config/</span></code> directory exists and
-has the proper permissions - or use the <code class="docutils literal"><span class="pre">Download</span></code> link to save the
-config file locally and upload it (via FTP or some similar means) to the
-proper location.</p>
-<p>Once the file has been saved, it must be moved out of the <code class="docutils literal"><span class="pre">config/</span></code>
-directory and the permissions must be reset, again as a security
-measure:</p>
-<div class="highlight-sh"><div class="highlight"><pre>mv config/config.inc.php .         <span class="c"># move file to current directory</span>
-chmod o-rw config.inc.php          <span class="c"># remove world read and write permissions</span>
-rm -rf config                      <span class="c"># remove not needed directory</span>
-</pre></div>
-</div>
-<div class="admonition note">
-<p class="first admonition-title">Note</p>
-<p class="last">Debian and Ubuntu have simplified this setup and all you need to do is to
-execute <strong class="program">/usr/sbin/pma-secure</strong>.</p>
-</div>
-<p>Now the file is ready to be used. You can choose to review or edit the
-file with your favorite editor, if you prefer to set some advanced
-options which the setup script does not provide.</p>
-<ol class="arabic simple">
-<li>If you are using the <code class="docutils literal"><span class="pre">auth_type</span></code> &#8220;config&#8221;, it is suggested that you
-protect the phpMyAdmin installation directory because using config
-does not require a user to enter a password to access the phpMyAdmin
-installation. Use of an alternate authentication method is
-recommended, for example with HTTP–AUTH in a <a class="reference internal" href="glossary.html#term-htaccess"><span class="xref std std-term">.htaccess</span></a> file or switch to using
-<code class="docutils literal"><span class="pre">auth_type</span></code> cookie or http. See the <a class="reference internal" href="faq.html#faqmultiuser"><span class="std std-ref">ISPs, multi-user installations</span></a>
-for additional information, especially <a class="reference internal" href="faq.html#faq4-4"><span class="std std-ref">4.4 phpMyAdmin always gives &#8220;Access denied&#8221; when using HTTP authentication.</span></a>.</li>
-<li>Open the <a class="reference external" href="index.php">main phpMyAdmin directory</a> in your browser.
-phpMyAdmin should now display a welcome screen and your databases, or
-a login dialog if using <a class="reference internal" href="glossary.html#term-http"><span class="xref std std-term">HTTP</span></a> or
-cookie authentication mode.</li>
-<li>You should deny access to the <code class="docutils literal"><span class="pre">./libraries</span></code> and <code class="docutils literal"><span class="pre">./setup/lib</span></code>
-subfolders in your webserver configuration.
-Such configuration prevents from possible
-path exposure and cross side scripting vulnerabilities that might
-happen to be found in that code. For the Apache webserver, this is
-often accomplished with a <a class="reference internal" href="glossary.html#term-htaccess"><span class="xref std std-term">.htaccess</span></a> file in those directories.</li>
-<li>It is generally a good idea to protect a public phpMyAdmin installation
-against access by robots as they usually can not do anything good
-there. You can do this using <code class="docutils literal"><span class="pre">robots.txt</span></code> file in root of your
-webserver or limit access by web server configuration, see
-<a class="reference internal" href="faq.html#faq1-42"><span class="std std-ref">1.42 How can I prevent robots from accessing phpMyAdmin?</span></a>.</li>
-</ol>
-</div>
-</div>
-<div class="section" id="verifying-phpmyadmin-releases">
-<span id="verify"></span><h2>Verifying phpMyAdmin releases<a class="headerlink" href="#verifying-phpmyadmin-releases" title="Permalink to this headline">¶</a></h2>
-<p>Since July 2015 all phpMyAdmin releases are cryptographically signed by the
-releasing developer, who through January 2016 was Marc Delisle. His key id is
-0xFEFC65D181AF644A, his PGP fingerprint is:</p>
-<div class="highlight-console"><div class="highlight"><pre><span class="go">436F F188 4B1A 0C3F DCBF 0D79 FEFC 65D1 81AF 644A</span>
-</pre></div>
-</div>
-<p>and you can get more identification information from &lt;<a class="reference external" href="https://keybase.io/lem9">https://keybase.io/lem9</a>&gt;.</p>
-<p>Beginning in January 2016, the release manager is Isaac Bennetch. His key id is
-0xCE752F178259BD92, and his PGP fingerprint is:</p>
-<div class="highlight-console"><div class="highlight"><pre><span class="go">3D06 A59E CE73 0EB7 1B51 1C17 CE75 2F17 8259 BD92</span>
-</pre></div>
-</div>
-<p>and you can get more identification information from &lt;<a class="reference external" href="https://keybase.io/ibennetch">https://keybase.io/ibennetch</a>&gt;.</p>
-<p>Some additional downloads (for example themes) might be signed by Michal Čihař. His key id is
-0x9C27B31342B7511D, and his PGP fingerprint is:</p>
-<div class="highlight-console"><div class="highlight"><pre><span class="go">63CB 1DF1 EF12 CF2A C0EE 5A32 9C27 B313 42B7 511D</span>
-</pre></div>
-</div>
-<p>and you can get more identification information from &lt;<a class="reference external" href="https://keybase.io/nijel">https://keybase.io/nijel</a>&gt;.</p>
-<p>You should verify that the signature matches
-the archive you have downloaded. This way you can be sure that you are using
-the same code that was released.</p>
-<p>Each archive is accompanied with <code class="docutils literal"><span class="pre">.asc</span></code> files which contains the PGP signature
-for it. Once you have both of them in the same folder, you can verify the signature:</p>
-<div class="highlight-console"><div class="highlight"><pre><span class="gp">$</span> gpg --verify phpMyAdmin-4.5.4.1-all-languages.zip.asc
-<span class="go">gpg: Signature made Fri 29 Jan 2016 08:59:37 AM EST using RSA key ID 8259BD92</span>
-<span class="go">gpg: Can&#39;t check signature: public key not found</span>
-</pre></div>
-</div>
-<p>As you can see gpg complains that it does not know the public key. At this
-point you should do one of the following steps:</p>
-<ul class="simple">
-<li>Download the keyring from <a class="reference external" href="https://files.phpmyadmin.net/phpmyadmin.keyring">our download server</a>, then import it with:</li>
-</ul>
-<div class="highlight-console"><div class="highlight"><pre><span class="gp">$</span> gpg --import phpmyadmin.keyring
-</pre></div>
-</div>
-<ul class="simple">
-<li>Download and import the key from one of the key servers:</li>
-</ul>
-<div class="highlight-console"><div class="highlight"><pre><span class="gp">$</span> gpg --keyserver hkp://pgp.mit.edu --recv-keys 3D06A59ECE730EB71B511C17CE752F178259BD92
-<span class="go">gpg: requesting key 8259BD92 from hkp server pgp.mit.edu</span>
-<span class="go">gpg: key 8259BD92: public key &quot;Isaac Bennetch &lt;bennetch@gmail.com&gt;&quot; imported</span>
-<span class="go">gpg: no ultimately trusted keys found</span>
-<span class="go">gpg: Total number processed: 1</span>
-<span class="go">gpg:               imported: 1  (RSA: 1)</span>
-</pre></div>
-</div>
-<p>This will improve the situation a bit - at this point you can verify that the
-signature from the given key is correct but you still can not trust the name used
-in the key:</p>
-<div class="highlight-console"><div class="highlight"><pre><span class="gp">$</span> gpg --verify phpMyAdmin-4.5.4.1-all-languages.zip.asc
-<span class="go">gpg: Signature made Fri 29 Jan 2016 08:59:37 AM EST using RSA key ID 8259BD92</span>
-<span class="go">gpg: Good signature from &quot;Isaac Bennetch &lt;bennetch@gmail.com&gt;&quot;</span>
-<span class="go">gpg:                 aka &quot;Isaac Bennetch &lt;isaac@bennetch.org&gt;&quot;</span>
-<span class="go">gpg: WARNING: This key is not certified with a trusted signature!</span>
-<span class="go">gpg:          There is no indication that the signature belongs to the owner.</span>
-<span class="go">Primary key fingerprint: 3D06 A59E CE73 0EB7 1B51  1C17 CE75 2F17 8259 BD92</span>
-</pre></div>
-</div>
-<p>The problem here is that anybody could issue the key with this name.  You need to
-ensure that the key is actually owned by the mentioned person.  The GNU Privacy
-Handbook covers this topic in the chapter <a class="reference external" href="https://www.gnupg.org/gph/en/manual.html#AEN335">Validating other keys on your public
-keyring</a>. The most reliable method is to meet the developer in person and
-exchange key fingerprints, however you can also rely on the web of trust. This way
-you can trust the key transitively though signatures of others, who have met
-the developer in person. For example you can see how <a class="reference external" href="https://pgp.cs.uu.nl/mk_path.cgi?FROM=ABAF11C65A2970B130ABE3C479BE3E4300411886&amp;TO=3D06A59ECE730EB71B511C17CE752F178259BD92">Isaac&#8217;s key links to
-Linus&#8217;s key</a>.</p>
-<p>Once the key is trusted, the warning will not occur:</p>
-<div class="highlight-console"><div class="highlight"><pre><span class="gp">$</span> gpg --verify phpMyAdmin-4.5.4.1-all-languages.zip.asc
-<span class="go">gpg: Signature made Fri 29 Jan 2016 08:59:37 AM EST using RSA key ID 8259BD92</span>
-<span class="go">gpg: Good signature from &quot;Isaac Bennetch &lt;bennetch@gmail.com&gt;&quot; [full]</span>
-</pre></div>
-</div>
-<p>Should the signature be invalid (the archive has been changed), you would get a
-clear error regardless of the fact that the key is trusted or not:</p>
-<div class="highlight-console"><div class="highlight"><pre><span class="gp">$</span> gpg --verify phpMyAdmin-4.5.4.1-all-languages.zip.asc
-<span class="go">gpg: Signature made Fri 29 Jan 2016 08:59:37 AM EST using RSA key ID 8259BD92</span>
-<span class="go">gpg: BAD signature from &quot;Isaac Bennetch &lt;bennetch@gmail.com&gt;&quot; [unknown]</span>
-</pre></div>
-</div>
-</div>
-<div class="section" id="phpmyadmin-configuration-storage">
-<span id="linked-tables"></span><span id="index-5"></span><h2>phpMyAdmin configuration storage<a class="headerlink" href="#phpmyadmin-configuration-storage" title="Permalink to this headline">¶</a></h2>
-<p>For a whole set of additional features (bookmarks, comments, <a class="reference internal" href="glossary.html#term-sql"><span class="xref std std-term">SQL</span></a>-history,
-tracking mechanism, <a class="reference internal" href="glossary.html#term-pdf"><span class="xref std std-term">PDF</span></a>-generation, column contents transformation,
-etc.) you need to create a set of special tables.  Those tables can be located
-in your own database, or in a central database for a multi-user installation
-(this database would then be accessed by the controluser, so no other user
-should have rights to it).</p>
-<div class="section" id="zero-configuration">
-<h3>Zero configuration<a class="headerlink" href="#zero-configuration" title="Permalink to this headline">¶</a></h3>
-<p>In many cases, this database structure can be automatically created and
-configured. This is called “Zero Configuration” mode and can be particularly
-useful in shared hosting situations. “Zeroconf” mode is on by default, to
-disable set <span class="target" id="index-6"></span><a class="reference internal" href="config.html#cfg_ZeroConf"><code class="xref config config-option docutils literal"><span class="pre">$cfg['ZeroConf']</span></code></a> to false.</p>
-<p>The following three scenarios are covered by the Zero Configuration mode:</p>
-<ul class="simple">
-<li>When entering a database where the configuration storage tables are not
-present, phpMyAdmin offers to create them from the Operations tab.</li>
-<li>When entering a database where the tables do already exist, the software
-automatically detects this and begins using them. This is the most common
-situation; after the tables are initially created automatically they are
-continually used without disturbing the user; this is also most useful on
-shared hosting where the user is not able to edit <code class="file docutils literal"><span class="pre">config.inc.php</span></code> and
-usually the user only has access to one database.</li>
-<li>When having access to multiple databases, if the user first enters the
-database containing the configuration storage tables then switches to
-another database,
-phpMyAdmin continues to use the tables from the first database; the user is
-not prompted to create more tables in the new database.</li>
-</ul>
-</div>
-<div class="section" id="manual-configuration">
-<h3>Manual configuration<a class="headerlink" href="#manual-configuration" title="Permalink to this headline">¶</a></h3>
-<p>Please look at your <code class="docutils literal"><span class="pre">./sql/</span></code> directory, where you should find a
-file called <em>create_tables.sql</em>. (If you are using a Windows server,
-pay special attention to <a class="reference internal" href="faq.html#faq1-23"><span class="std std-ref">1.23 I&#8217;m running MySQL on a Win32 machine. Each time I create a new table the table and column names are changed to lowercase!</span></a>).</p>
-<p>If you already had this infrastructure and:</p>
-<ul class="simple">
-<li>upgraded to MySQL 4.1.2 or newer, please use
-<code class="file docutils literal"><span class="pre">sql/upgrade_tables_mysql_4_1_2+.sql</span></code>.</li>
-<li>upgraded to phpMyAdmin 4.3.0 or newer from 2.5.0 or newer (&lt;= 4.2.x),
-please use <code class="file docutils literal"><span class="pre">sql/upgrade_column_info_4_3_0+.sql</span></code>.</li>
-</ul>
-<p>and then create new tables by importing <code class="file docutils literal"><span class="pre">sql/create_tables.sql</span></code>.</p>
-<p>You can use your phpMyAdmin to create the tables for you. Please be
-aware that you may need special (administrator) privileges to create
-the database and tables, and that the script may need some tuning,
-depending on the database name.</p>
-<p>After having imported the <code class="file docutils literal"><span class="pre">sql/create_tables.sql</span></code> file, you
-should specify the table names in your <code class="file docutils literal"><span class="pre">config.inc.php</span></code> file. The
-directives used for that can be found in the <a class="reference internal" href="config.html#config"><span class="std std-ref">Configuration</span></a>.</p>
-<p>You will also need to have a controluser
-(<span class="target" id="index-7"></span><a class="reference internal" href="config.html#cfg_Servers_controluser"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['controluser']</span></code></a> and
-<span class="target" id="index-8"></span><a class="reference internal" href="config.html#cfg_Servers_controlpass"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['controlpass']</span></code></a> settings)
-with the proper rights to those tables. For example you can create it
-using following statement:</p>
-<div class="highlight-mysql"><div class="highlight"><pre><span class="k">GRANT</span> <span class="k">SELECT</span><span class="p">,</span> <span class="k">INSERT</span><span class="p">,</span> <span class="k">UPDATE</span><span class="p">,</span> <span class="k">DELETE</span> <span class="k">ON</span> <span class="o">&lt;</span><span class="n">pma_db</span><span class="o">&gt;</span><span class="p">.</span><span class="o">*</span> <span class="k">TO</span> <span class="s1">&#39;pma&#39;</span><span class="o">@</span><span class="s1">&#39;localhost&#39;</span>  <span class="n">IDENTIFIED</span> <span class="k">BY</span> <span class="s1">&#39;pmapass&#39;</span><span class="p">;</span>
-</pre></div>
-</div>
-</div>
-</div>
-<div class="section" id="upgrading-from-an-older-version">
-<span id="upgrading"></span><h2>Upgrading from an older version<a class="headerlink" href="#upgrading-from-an-older-version" title="Permalink to this headline">¶</a></h2>
-<div class="admonition warning">
-<p class="first admonition-title">Warning</p>
-<p><strong>Never</strong> extract the new version over an existing installation of
-phpMyAdmin, always first remove the old files keeping just the
-configuration.</p>
-<p class="last">This way you will not leave old no longer working code in the directory,
-which can have severe security implications or can cause various breakages.</p>
-</div>
-<p>Simply copy <code class="file docutils literal"><span class="pre">config.inc.php</span></code> from your previous installation into
-the newly unpacked one. Configuration files from old versions may
-require some tweaking as some options have been changed or removed.
-For compatibility with PHP 5.3 and later, remove a
-<code class="docutils literal"><span class="pre">set_magic_quotes_runtime(0);</span></code> statement that you might find near
-the end of your configuration file.</p>
-<p>You should <strong>not</strong> copy <code class="file docutils literal"><span class="pre">libraries/config.default.php</span></code> over
-<code class="file docutils literal"><span class="pre">config.inc.php</span></code> because the default configuration file is version-
-specific.</p>
-<p>If you have upgraded your MySQL server from a version previous to 4.1.2 to
-version 5.x or newer and if you use the phpMyAdmin configuration storage, you
-should run the <a class="reference internal" href="glossary.html#term-sql"><span class="xref std std-term">SQL</span></a> script found in
-<code class="file docutils literal"><span class="pre">sql/upgrade_tables_mysql_4_1_2+.sql</span></code>.</p>
-<p>If you have upgraded your phpMyAdmin to 4.3.0 or newer from 2.5.0 or
-newer (&lt;= 4.2.x) and if you use the phpMyAdmin configuration storage, you
-should run the <a class="reference internal" href="glossary.html#term-sql"><span class="xref std std-term">SQL</span></a> script found in
-<code class="file docutils literal"><span class="pre">sql/upgrade_column_info_4_3_0+.sql</span></code>.</p>
-<p>Do not forget to clear the browser cache and to empty the old session by
-logging out and logging in again.</p>
-</div>
-<div class="section" id="using-authentication-modes">
-<span id="authentication-modes"></span><span id="index-9"></span><h2>Using authentication modes<a class="headerlink" href="#using-authentication-modes" title="Permalink to this headline">¶</a></h2>
-<p><a class="reference internal" href="glossary.html#term-http"><span class="xref std std-term">HTTP</span></a> and cookie authentication modes are recommended in a <strong>multi-user
-environment</strong> where you want to give users access to their own database and
-don&#8217;t want them to play around with others. Nevertheless be aware that MS
-Internet Explorer seems to be really buggy about cookies, at least till version
-6. Even in a <strong>single-user environment</strong>, you might prefer to use <a class="reference internal" href="glossary.html#term-http"><span class="xref std std-term">HTTP</span></a>
-or cookie mode so that your user/password pair are not in clear in the
-configuration file.</p>
-<p><a class="reference internal" href="glossary.html#term-http"><span class="xref std std-term">HTTP</span></a> and cookie authentication
-modes are more secure: the MySQL login information does not need to be
-set in the phpMyAdmin configuration file (except possibly for the
-<span class="target" id="index-10"></span><a class="reference internal" href="config.html#cfg_Servers_controluser"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['controluser']</span></code></a>).
-However, keep in mind that the password travels in plain text, unless
-you are using the HTTPS protocol. In cookie mode, the password is
-stored, encrypted with the AES algorithm, in a temporary cookie.</p>
-<p>Then each of the <em>true</em> users should be granted a set of privileges
-on a set of particular databases. Normally you shouldn&#8217;t give global
-privileges to an ordinary user, unless you understand the impact of those
-privileges (for example, you are creating a superuser).
-For example, to grant the user <em>real_user</em> with all privileges on
-the database <em>user_base</em>:</p>
-<div class="highlight-mysql"><div class="highlight"><pre><span class="k">GRANT</span> <span class="k">ALL</span> <span class="n">PRIVILEGES</span> <span class="k">ON</span> <span class="n">user_base</span><span class="p">.</span><span class="o">*</span> <span class="k">TO</span> <span class="s1">&#39;real_user&#39;</span><span class="o">@</span><span class="n">localhost</span> <span class="n">IDENTIFIED</span> <span class="k">BY</span> <span class="s1">&#39;real_password&#39;</span><span class="p">;</span>
-</pre></div>
-</div>
-<p>What the user may now do is controlled entirely by the MySQL user management
-system. With HTTP or cookie authentication mode, you don&#8217;t need to fill the
-user/password fields inside the <span class="target" id="index-11"></span><a class="reference internal" href="config.html#cfg_Servers"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers']</span></code></a>.</p>
-<div class="section" id="http-authentication-mode">
-<span id="index-12"></span><h3>HTTP authentication mode<a class="headerlink" href="#http-authentication-mode" title="Permalink to this headline">¶</a></h3>
-<ul>
-<li><p class="first">Uses <a class="reference internal" href="glossary.html#term-http"><span class="xref std std-term">HTTP</span></a> Basic authentication
-method and allows you to log in as any valid MySQL user.</p>
-</li>
-<li><p class="first">Is supported with most PHP configurations. For <a class="reference internal" href="glossary.html#term-iis"><span class="xref std std-term">IIS</span></a> (<a class="reference internal" href="glossary.html#term-isapi"><span class="xref std std-term">ISAPI</span></a>)
-support using <a class="reference internal" href="glossary.html#term-cgi"><span class="xref std std-term">CGI</span></a> PHP see <a class="reference internal" href="faq.html#faq1-32"><span class="std std-ref">1.32 Can I use HTTP authentication with IIS?</span></a>, for using with Apache
-<a class="reference internal" href="glossary.html#term-cgi"><span class="xref std std-term">CGI</span></a> see <a class="reference internal" href="faq.html#faq1-35"><span class="std std-ref">1.35 Can I use HTTP authentication with Apache CGI?</span></a>.</p>
-</li>
-<li><p class="first">When PHP is running under Apache&#8217;s <a class="reference internal" href="glossary.html#term-mod-proxy-fcgi"><span class="xref std std-term">mod_proxy_fcgi</span></a> (e.g. with PHP-FPM),
-<code class="docutils literal"><span class="pre">Authorization</span></code> headers are not passed to the underlying FCGI application,
-such that your credentials will not reach the application. In this case, you can
-add the following configuration directive:</p>
-<div class="highlight-apache"><div class="highlight"><pre><span class="nb">SetEnvIf</span> Authorization <span class="s2">&quot;(.*)&quot;</span> HTTP_AUTHORIZATION=$1
-</pre></div>
-</div>
-</li>
-<li><p class="first">See also <a class="reference internal" href="faq.html#faq4-4"><span class="std std-ref">4.4 phpMyAdmin always gives &#8220;Access denied&#8221; when using HTTP authentication.</span></a> about not using the <a class="reference internal" href="glossary.html#term-htaccess"><span class="xref std std-term">.htaccess</span></a> mechanism along with
-&#8216;<a class="reference internal" href="glossary.html#term-http"><span class="xref std std-term">HTTP</span></a>&#8216; authentication mode.</p>
-</li>
-</ul>
-</div>
-<div class="section" id="cookie-authentication-mode">
-<span id="cookie"></span><span id="index-13"></span><h3>Cookie authentication mode<a class="headerlink" href="#cookie-authentication-mode" title="Permalink to this headline">¶</a></h3>
-<ul class="simple">
-<li>Username and password are stored in cookies during the session and password
-is deleted when it ends.</li>
-<li>With this mode, the user can truly log out of phpMyAdmin and log
-back in with the same username.</li>
-<li>If you want to allow users to enter any hostname to connect (rather than only
-servers that are configured in <code class="file docutils literal"><span class="pre">config.inc.php</span></code>),
-see the <span class="target" id="index-14"></span><a class="reference internal" href="config.html#cfg_AllowArbitraryServer"><code class="xref config config-option docutils literal"><span class="pre">$cfg['AllowArbitraryServer']</span></code></a> directive.</li>
-<li>As mentioned in the <a class="reference internal" href="require.html#require"><span class="std std-ref">Requirements</span></a> section, having the <code class="docutils literal"><span class="pre">mcrypt</span></code> extension will
-speed up access considerably, but is not required.</li>
-</ul>
-</div>
-<div class="section" id="signon-authentication-mode">
-<span id="auth-signon"></span><span id="index-15"></span><h3>Signon authentication mode<a class="headerlink" href="#signon-authentication-mode" title="Permalink to this headline">¶</a></h3>
-<ul class="simple">
-<li>This mode is a convenient way of using credentials from another
-application to authenticate to phpMyAdmin to implement single signon
-solution.</li>
-<li>The other application has to store login information into session
-data (see <span class="target" id="index-16"></span><a class="reference internal" href="config.html#cfg_Servers_SignonSession"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['SignonSession']</span></code></a>) or you
-need to implement script to return the credentials (see
-<span class="target" id="index-17"></span><a class="reference internal" href="config.html#cfg_Servers_SignonScript"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['SignonScript']</span></code></a>).</li>
-<li>When no credentials are available, the user is being redirected to
-<span class="target" id="index-18"></span><a class="reference internal" href="config.html#cfg_Servers_SignonURL"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['SignonURL']</span></code></a>, where you should handle
-the login process.</li>
-</ul>
-<p>The very basic example of saving credentials in a session is available as
-<code class="file docutils literal"><span class="pre">examples/signon.php</span></code>:</p>
-<div class="highlight-php"><div class="highlight"><pre><span class="o">&lt;?</span><span class="nx">php</span>
-<span class="cm">/* vim: set expandtab sw=4 ts=4 sts=4: */</span>
-<span class="sd">/**</span>
-<span class="sd"> * Single signon for phpMyAdmin</span>
-<span class="sd"> *</span>
-<span class="sd"> * This is just example how to use session based single signon with</span>
-<span class="sd"> * phpMyAdmin, it is not intended to be perfect code and look, only</span>
-<span class="sd"> * shows how you can integrate this functionality in your application.</span>
-<span class="sd"> *</span>
-<span class="sd"> * @package    PhpMyAdmin</span>
-<span class="sd"> * @subpackage Example</span>
-<span class="sd"> */</span>
-
-<span class="cm">/* Need to have cookie visible from parent directory */</span>
-<span class="nb">session_set_cookie_params</span><span class="p">(</span><span class="mi">0</span><span class="p">,</span> <span class="s1">&#39;/&#39;</span><span class="p">,</span> <span class="s1">&#39;&#39;</span><span class="p">,</span> <span class="k">true</span><span class="p">,</span> <span class="k">true</span><span class="p">);</span>
-<span class="cm">/* Create signon session */</span>
-<span class="nv">$session_name</span> <span class="o">=</span> <span class="s1">&#39;SignonSession&#39;</span><span class="p">;</span>
-<span class="nb">session_name</span><span class="p">(</span><span class="nv">$session_name</span><span class="p">);</span>
-<span class="c1">// Uncomment and change the following line to match your $cfg[&#39;SessionSavePath&#39;]</span>
-<span class="c1">//session_save_path(&#39;/foobar&#39;);</span>
-<span class="o">@</span><span class="nb">session_start</span><span class="p">();</span>
-
-<span class="cm">/* Was data posted? */</span>
-<span class="k">if</span> <span class="p">(</span><span class="nb">isset</span><span class="p">(</span><span class="nv">$_POST</span><span class="p">[</span><span class="s1">&#39;user&#39;</span><span class="p">]))</span> <span class="p">{</span>
-    <span class="cm">/* Store there credentials */</span>
-    <span class="nv">$_SESSION</span><span class="p">[</span><span class="s1">&#39;PMA_single_signon_user&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="nv">$_POST</span><span class="p">[</span><span class="s1">&#39;user&#39;</span><span class="p">];</span>
-    <span class="nv">$_SESSION</span><span class="p">[</span><span class="s1">&#39;PMA_single_signon_password&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="nv">$_POST</span><span class="p">[</span><span class="s1">&#39;password&#39;</span><span class="p">];</span>
-    <span class="nv">$_SESSION</span><span class="p">[</span><span class="s1">&#39;PMA_single_signon_host&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="nv">$_POST</span><span class="p">[</span><span class="s1">&#39;host&#39;</span><span class="p">];</span>
-    <span class="nv">$_SESSION</span><span class="p">[</span><span class="s1">&#39;PMA_single_signon_port&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="nv">$_POST</span><span class="p">[</span><span class="s1">&#39;port&#39;</span><span class="p">];</span>
-    <span class="cm">/* Update another field of server configuration */</span>
-    <span class="nv">$_SESSION</span><span class="p">[</span><span class="s1">&#39;PMA_single_signon_cfgupdate&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="k">array</span><span class="p">(</span><span class="s1">&#39;verbose&#39;</span> <span class="o">=&gt;</span> <span class="s1">&#39;Signon test&#39;</span><span class="p">);</span>
-    <span class="nv">$id</span> <span class="o">=</span> <span class="nb">session_id</span><span class="p">();</span>
-    <span class="cm">/* Close that session */</span>
-    <span class="o">@</span><span class="nb">session_write_close</span><span class="p">();</span>
-    <span class="cm">/* Redirect to phpMyAdmin (should use absolute URL here!) */</span>
-    <span class="nb">header</span><span class="p">(</span><span class="s1">&#39;Location: ../index.php&#39;</span><span class="p">);</span>
-<span class="p">}</span> <span class="k">else</span> <span class="p">{</span>
-    <span class="cm">/* Show simple form */</span>
-    <span class="nb">header</span><span class="p">(</span><span class="s1">&#39;Content-Type: text/html; charset=utf-8&#39;</span><span class="p">);</span>
-    <span class="k">echo</span> <span class="s1">&#39;&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;&#39;</span> <span class="p">,</span> <span class="s2">&quot;</span><span class="se">\n</span><span class="s2">&quot;</span><span class="p">;</span>
-    <span class="cp">?&gt;</span><span class="x"></span>
-<span class="x">    &lt;!DOCTYPE HTML&gt;</span>
-<span class="x">    &lt;html lang=&quot;en&quot; dir=&quot;ltr&quot;&gt;</span>
-<span class="x">    &lt;head&gt;</span>
-<span class="x">    &lt;link rel=&quot;icon&quot; href=&quot;../favicon.ico&quot; type=&quot;image/x-icon&quot; /&gt;</span>
-<span class="x">    &lt;link rel=&quot;shortcut icon&quot; href=&quot;../favicon.ico&quot; type=&quot;image/x-icon&quot; /&gt;</span>
-<span class="x">    &lt;meta charset=&quot;utf-8&quot; /&gt;</span>
-<span class="x">    &lt;title&gt;phpMyAdmin single signon example&lt;/title&gt;</span>
-<span class="x">    &lt;/head&gt;</span>
-<span class="x">    &lt;body&gt;</span>
-<span class="x">    </span><span class="cp">&lt;?php</span>
-    <span class="k">if</span> <span class="p">(</span><span class="nb">isset</span><span class="p">(</span><span class="nv">$_SESSION</span><span class="p">[</span><span class="s1">&#39;PMA_single_signon_error_message&#39;</span><span class="p">]))</span> <span class="p">{</span>
-        <span class="k">echo</span> <span class="s1">&#39;&lt;p class=&quot;error&quot;&gt;&#39;</span><span class="p">;</span>
-        <span class="k">echo</span> <span class="nv">$_SESSION</span><span class="p">[</span><span class="s1">&#39;PMA_single_signon_error_message&#39;</span><span class="p">];</span>
-        <span class="k">echo</span> <span class="s1">&#39;&lt;/p&gt;&#39;</span><span class="p">;</span>
-    <span class="p">}</span>
-    <span class="cp">?&gt;</span><span class="x"></span>
-<span class="x">    &lt;form action=&quot;signon.php&quot; method=&quot;post&quot;&gt;</span>
-<span class="x">    Username: &lt;input type=&quot;text&quot; name=&quot;user&quot; /&gt;&lt;br /&gt;</span>
-<span class="x">    Password: &lt;input type=&quot;password&quot; name=&quot;password&quot; /&gt;&lt;br /&gt;</span>
-<span class="x">    Host: (will use the one from config.inc.php by default)</span>
-<span class="x">    &lt;input type=&quot;text&quot; name=&quot;host&quot; /&gt;&lt;br /&gt;</span>
-<span class="x">    Port: (will use the one from config.inc.php by default)</span>
-<span class="x">    &lt;input type=&quot;text&quot; name=&quot;port&quot; /&gt;&lt;br /&gt;</span>
-<span class="x">    &lt;input type=&quot;submit&quot; /&gt;</span>
-<span class="x">    &lt;/form&gt;</span>
-<span class="x">    &lt;/body&gt;</span>
-<span class="x">    &lt;/html&gt;</span>
-<span class="x">    </span><span class="cp">&lt;?php</span>
-<span class="p">}</span>
-<span class="cp">?&gt;</span><span class="x"></span>
-</pre></div>
-</div>
-<p>Alternatively you can also use this way to integrate with OpenID as shown
-in <code class="file docutils literal"><span class="pre">examples/openid.php</span></code>:</p>
-<div class="highlight-php"><div class="highlight"><pre><span class="o">&lt;?</span><span class="nx">php</span>
-<span class="cm">/* vim: set expandtab sw=4 ts=4 sts=4: */</span>
-<span class="sd">/**</span>
-<span class="sd"> * Single signon for phpMyAdmin using OpenID</span>
-<span class="sd"> *</span>
-<span class="sd"> * This is just example how to use single signon with phpMyAdmin, it is</span>
-<span class="sd"> * not intended to be perfect code and look, only shows how you can</span>
-<span class="sd"> * integrate this functionality in your application.</span>
-<span class="sd"> *</span>
-<span class="sd"> * It uses OpenID pear package, see https://pear.php.net/package/OpenID</span>
-<span class="sd"> *</span>
-<span class="sd"> * User first authenticates using OpenID and based on content of $AUTH_MAP</span>
-<span class="sd"> * the login information is passed to phpMyAdmin in session data.</span>
-<span class="sd"> *</span>
-<span class="sd"> * @package    PhpMyAdmin</span>
-<span class="sd"> * @subpackage Example</span>
-<span class="sd"> */</span>
-
-<span class="k">if</span> <span class="p">(</span><span class="k">false</span> <span class="o">===</span> <span class="o">@</span><span class="k">include_once</span> <span class="s1">&#39;OpenID/RelyingParty.php&#39;</span><span class="p">)</span> <span class="p">{</span>
-    <span class="k">exit</span><span class="p">;</span>
-<span class="p">}</span>
-
-<span class="sd">/**</span>
-<span class="sd"> * Map of authenticated users to MySQL user/password pairs.</span>
-<span class="sd"> */</span>
-<span class="nv">$AUTH_MAP</span> <span class="o">=</span> <span class="k">array</span><span class="p">(</span>
-    <span class="s1">&#39;https://launchpad.net/~username&#39;</span> <span class="o">=&gt;</span> <span class="k">array</span><span class="p">(</span>
-        <span class="s1">&#39;user&#39;</span> <span class="o">=&gt;</span> <span class="s1">&#39;root&#39;</span><span class="p">,</span>
-        <span class="s1">&#39;password&#39;</span> <span class="o">=&gt;</span> <span class="s1">&#39;&#39;</span><span class="p">,</span>
-        <span class="p">),</span>
-    <span class="p">);</span>
-
-<span class="sd">/**</span>
-<span class="sd"> * Simple function to show HTML page with given content.</span>
-<span class="sd"> *</span>
-<span class="sd"> * @param string $contents Content to include in page</span>
-<span class="sd"> *</span>
-<span class="sd"> * @return void</span>
-<span class="sd"> */</span>
-<span class="k">function</span> <span class="nf">Show_page</span><span class="p">(</span><span class="nv">$contents</span><span class="p">)</span>
-<span class="p">{</span>
-    <span class="nb">header</span><span class="p">(</span><span class="s1">&#39;Content-Type: text/html; charset=utf-8&#39;</span><span class="p">);</span>
-    <span class="k">echo</span> <span class="s1">&#39;&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;&#39;</span> <span class="p">,</span> <span class="s2">&quot;</span><span class="se">\n</span><span class="s2">&quot;</span><span class="p">;</span>
-    <span class="cp">?&gt;</span><span class="x"></span>
-<span class="x">    &lt;!DOCTYPE HTML&gt;</span>
-<span class="x">    &lt;html lang=&quot;en&quot; dir=&quot;ltr&quot;&gt;</span>
-<span class="x">    &lt;head&gt;</span>
-<span class="x">    &lt;link rel=&quot;icon&quot; href=&quot;../favicon.ico&quot; type=&quot;image/x-icon&quot; /&gt;</span>
-<span class="x">    &lt;link rel=&quot;shortcut icon&quot; href=&quot;../favicon.ico&quot; type=&quot;image/x-icon&quot; /&gt;</span>
-<span class="x">    &lt;meta charset=&quot;utf-8&quot; /&gt;</span>
-<span class="x">    &lt;title&gt;phpMyAdmin OpenID signon example&lt;/title&gt;</span>
-<span class="x">    &lt;/head&gt;</span>
-<span class="x">    &lt;body&gt;</span>
-<span class="x">    </span><span class="cp">&lt;?php</span>
-    <span class="k">if</span> <span class="p">(</span><span class="nb">isset</span><span class="p">(</span><span class="nv">$_SESSION</span><span class="p">)</span> <span class="o">&amp;&amp;</span> <span class="nb">isset</span><span class="p">(</span><span class="nv">$_SESSION</span><span class="p">[</span><span class="s1">&#39;PMA_single_signon_error_message&#39;</span><span class="p">]))</span> <span class="p">{</span>
-        <span class="k">echo</span> <span class="s1">&#39;&lt;p class=&quot;error&quot;&gt;&#39;</span> <span class="p">,</span> <span class="nv">$_SESSION</span><span class="p">[</span><span class="s1">&#39;PMA_single_signon_message&#39;</span><span class="p">]</span> <span class="p">,</span> <span class="s1">&#39;&lt;/p&gt;&#39;</span><span class="p">;</span>
-        <span class="nb">unset</span><span class="p">(</span><span class="nv">$_SESSION</span><span class="p">[</span><span class="s1">&#39;PMA_single_signon_message&#39;</span><span class="p">]);</span>
-    <span class="p">}</span>
-    <span class="k">echo</span> <span class="nv">$contents</span><span class="p">;</span>
-    <span class="cp">?&gt;</span><span class="x"></span>
-<span class="x">    &lt;/body&gt;</span>
-<span class="x">    &lt;/html&gt;</span>
-<span class="x">    </span><span class="cp">&lt;?php</span>
-<span class="p">}</span>
-
-<span class="k">function</span> <span class="nf">Die_error</span><span class="p">(</span><span class="nv">$e</span><span class="p">)</span>
-<span class="p">{</span>
-    <span class="nv">$contents</span> <span class="o">=</span> <span class="s2">&quot;&lt;div class=&#39;relyingparty_results&#39;&gt;</span><span class="se">\n</span><span class="s2">&quot;</span><span class="p">;</span>
-    <span class="nv">$contents</span> <span class="o">.=</span> <span class="s2">&quot;&lt;pre&gt;&quot;</span> <span class="o">.</span> <span class="nb">htmlspecialchars</span><span class="p">(</span><span class="nv">$e</span><span class="o">-&gt;</span><span class="na">getMessage</span><span class="p">())</span> <span class="o">.</span> <span class="s2">&quot;&lt;/pre&gt;</span><span class="se">\n</span><span class="s2">&quot;</span><span class="p">;</span>
-    <span class="nv">$contents</span> <span class="o">.=</span> <span class="s2">&quot;&lt;/div class=&#39;relyingparty_results&#39;&gt;&quot;</span><span class="p">;</span>
-    <span class="nx">Show_page</span><span class="p">(</span><span class="nv">$contents</span><span class="p">);</span>
-    <span class="k">exit</span><span class="p">;</span>
-<span class="p">}</span>
-
-
-<span class="cm">/* Need to have cookie visible from parent directory */</span>
-<span class="nb">session_set_cookie_params</span><span class="p">(</span><span class="mi">0</span><span class="p">,</span> <span class="s1">&#39;/&#39;</span><span class="p">,</span> <span class="s1">&#39;&#39;</span><span class="p">,</span> <span class="k">true</span><span class="p">,</span> <span class="k">true</span><span class="p">);</span>
-<span class="cm">/* Create signon session */</span>
-<span class="nv">$session_name</span> <span class="o">=</span> <span class="s1">&#39;SignonSession&#39;</span><span class="p">;</span>
-<span class="nb">session_name</span><span class="p">(</span><span class="nv">$session_name</span><span class="p">);</span>
-<span class="o">@</span><span class="nb">session_start</span><span class="p">();</span>
-
-<span class="c1">// Determine realm and return_to</span>
-<span class="nv">$base</span> <span class="o">=</span> <span class="s1">&#39;http&#39;</span><span class="p">;</span>
-<span class="k">if</span> <span class="p">(</span><span class="nb">isset</span><span class="p">(</span><span class="nv">$_SERVER</span><span class="p">[</span><span class="s1">&#39;HTTPS&#39;</span><span class="p">])</span> <span class="o">&amp;&amp;</span> <span class="nv">$_SERVER</span><span class="p">[</span><span class="s1">&#39;HTTPS&#39;</span><span class="p">]</span> <span class="o">==</span> <span class="s1">&#39;on&#39;</span><span class="p">)</span> <span class="p">{</span>
-    <span class="nv">$base</span> <span class="o">.=</span> <span class="s1">&#39;s&#39;</span><span class="p">;</span>
-<span class="p">}</span>
-<span class="nv">$base</span> <span class="o">.=</span> <span class="s1">&#39;://&#39;</span> <span class="o">.</span> <span class="nv">$_SERVER</span><span class="p">[</span><span class="s1">&#39;SERVER_NAME&#39;</span><span class="p">]</span> <span class="o">.</span> <span class="s1">&#39;:&#39;</span> <span class="o">.</span> <span class="nv">$_SERVER</span><span class="p">[</span><span class="s1">&#39;SERVER_PORT&#39;</span><span class="p">];</span>
-
-<span class="nv">$realm</span> <span class="o">=</span> <span class="nv">$base</span> <span class="o">.</span> <span class="s1">&#39;/&#39;</span><span class="p">;</span>
-<span class="nv">$returnTo</span> <span class="o">=</span> <span class="nv">$base</span> <span class="o">.</span> <span class="nb">dirname</span><span class="p">(</span><span class="nv">$_SERVER</span><span class="p">[</span><span class="s1">&#39;PHP_SELF&#39;</span><span class="p">]);</span>
-<span class="k">if</span> <span class="p">(</span><span class="nv">$returnTo</span><span class="p">[</span><span class="nb">mb_strlen</span><span class="p">(</span><span class="nv">$returnTo</span><span class="p">)</span> <span class="o">-</span> <span class="mi">1</span><span class="p">]</span> <span class="o">!=</span> <span class="s1">&#39;/&#39;</span><span class="p">)</span> <span class="p">{</span>
-    <span class="nv">$returnTo</span> <span class="o">.=</span> <span class="s1">&#39;/&#39;</span><span class="p">;</span>
-<span class="p">}</span>
-<span class="nv">$returnTo</span> <span class="o">.=</span> <span class="s1">&#39;openid.php&#39;</span><span class="p">;</span>
-
-<span class="cm">/* Display form */</span>
-<span class="k">if</span> <span class="p">(</span><span class="o">!</span><span class="nb">count</span><span class="p">(</span><span class="nv">$_GET</span><span class="p">)</span> <span class="o">&amp;&amp;</span> <span class="o">!</span><span class="nb">count</span><span class="p">(</span><span class="nv">$_POST</span><span class="p">)</span> <span class="o">||</span> <span class="nb">isset</span><span class="p">(</span><span class="nv">$_GET</span><span class="p">[</span><span class="s1">&#39;phpMyAdmin&#39;</span><span class="p">]))</span> <span class="p">{</span>
-    <span class="cm">/* Show simple form */</span>
-    <span class="nv">$content</span> <span class="o">=</span> <span class="s1">&#39;&lt;form action=&quot;openid.php&quot; method=&quot;post&quot;&gt;</span>
-<span class="s1">OpenID: &lt;input type=&quot;text&quot; name=&quot;identifier&quot; /&gt;&lt;br /&gt;</span>
-<span class="s1">&lt;input type=&quot;submit&quot; name=&quot;start&quot; /&gt;</span>
-<span class="s1">&lt;/form&gt;</span>
-<span class="s1">&lt;/body&gt;</span>
-<span class="s1">&lt;/html&gt;&#39;</span><span class="p">;</span>
-    <span class="nx">Show_page</span><span class="p">(</span><span class="nv">$content</span><span class="p">);</span>
-    <span class="k">exit</span><span class="p">;</span>
-<span class="p">}</span>
-
-<span class="cm">/* Grab identifier */</span>
-<span class="k">if</span> <span class="p">(</span><span class="nb">isset</span><span class="p">(</span><span class="nv">$_POST</span><span class="p">[</span><span class="s1">&#39;identifier&#39;</span><span class="p">])</span> <span class="o">&amp;&amp;</span> <span class="nb">is_string</span><span class="p">(</span><span class="nv">$_POST</span><span class="p">[</span><span class="s1">&#39;identifier&#39;</span><span class="p">]))</span> <span class="p">{</span>
-    <span class="nv">$identifier</span> <span class="o">=</span> <span class="nv">$_POST</span><span class="p">[</span><span class="s1">&#39;identifier&#39;</span><span class="p">];</span>
-<span class="p">}</span> <span class="k">else</span> <span class="k">if</span> <span class="p">(</span><span class="nb">isset</span><span class="p">(</span><span class="nv">$_SESSION</span><span class="p">[</span><span class="s1">&#39;identifier&#39;</span><span class="p">])</span> <span class="o">&amp;&amp;</span> <span class="nb">is_string</span><span class="p">(</span><span class="nv">$_SESSION</span><span class="p">[</span><span class="s1">&#39;identifier&#39;</span><span class="p">]))</span> <span class="p">{</span>
-    <span class="nv">$identifier</span> <span class="o">=</span> <span class="nv">$_SESSION</span><span class="p">[</span><span class="s1">&#39;identifier&#39;</span><span class="p">];</span>
-<span class="p">}</span> <span class="k">else</span> <span class="p">{</span>
-    <span class="nv">$identifier</span> <span class="o">=</span> <span class="k">null</span><span class="p">;</span>
-<span class="p">}</span>
-
-<span class="cm">/* Create OpenID object */</span>
-<span class="k">try</span> <span class="p">{</span>
-    <span class="nv">$o</span> <span class="o">=</span> <span class="k">new</span> <span class="nx">OpenID_RelyingParty</span><span class="p">(</span><span class="nv">$returnTo</span><span class="p">,</span> <span class="nv">$realm</span><span class="p">,</span> <span class="nv">$identifier</span><span class="p">);</span>
-<span class="p">}</span> <span class="k">catch</span> <span class="p">(</span><span class="nx">Exception</span> <span class="nv">$e</span><span class="p">)</span> <span class="p">{</span>
-    <span class="nx">Die_error</span><span class="p">(</span><span class="nv">$e</span><span class="p">);</span>
-<span class="p">}</span>
-
-<span class="cm">/* Redirect to OpenID provider */</span>
-<span class="k">if</span> <span class="p">(</span><span class="nb">isset</span><span class="p">(</span><span class="nv">$_POST</span><span class="p">[</span><span class="s1">&#39;start&#39;</span><span class="p">]))</span> <span class="p">{</span>
-    <span class="k">try</span> <span class="p">{</span>
-        <span class="nv">$authRequest</span> <span class="o">=</span> <span class="nv">$o</span><span class="o">-&gt;</span><span class="na">prepare</span><span class="p">();</span>
-    <span class="p">}</span> <span class="k">catch</span> <span class="p">(</span><span class="nx">Exception</span> <span class="nv">$e</span><span class="p">)</span> <span class="p">{</span>
-        <span class="nx">Die_error</span><span class="p">(</span><span class="nv">$e</span><span class="p">);</span>
-    <span class="p">}</span>
-
-    <span class="nv">$url</span> <span class="o">=</span> <span class="nv">$authRequest</span><span class="o">-&gt;</span><span class="na">getAuthorizeURL</span><span class="p">();</span>
-
-    <span class="nb">header</span><span class="p">(</span><span class="s2">&quot;Location: </span><span class="si">$url</span><span class="s2">&quot;</span><span class="p">);</span>
-    <span class="k">exit</span><span class="p">;</span>
-<span class="p">}</span> <span class="k">else</span> <span class="p">{</span>
-    <span class="cm">/* Grab query string */</span>
-    <span class="k">if</span> <span class="p">(</span><span class="o">!</span><span class="nb">count</span><span class="p">(</span><span class="nv">$_POST</span><span class="p">))</span> <span class="p">{</span>
-        <span class="k">list</span><span class="p">(,</span> <span class="nv">$queryString</span><span class="p">)</span> <span class="o">=</span> <span class="nb">explode</span><span class="p">(</span><span class="s1">&#39;?&#39;</span><span class="p">,</span> <span class="nv">$_SERVER</span><span class="p">[</span><span class="s1">&#39;REQUEST_URI&#39;</span><span class="p">]);</span>
-    <span class="p">}</span> <span class="k">else</span> <span class="p">{</span>
-        <span class="c1">// I hate php sometimes</span>
-        <span class="nv">$queryString</span> <span class="o">=</span> <span class="nb">file_get_contents</span><span class="p">(</span><span class="s1">&#39;php://input&#39;</span><span class="p">);</span>
-    <span class="p">}</span>
-
-    <span class="cm">/* Check reply */</span>
-    <span class="k">try</span> <span class="p">{</span>
-        <span class="nv">$message</span> <span class="o">=</span> <span class="k">new</span> <span class="nx">OpenID_Message</span><span class="p">(</span><span class="nv">$queryString</span><span class="p">,</span> <span class="nx">OpenID_Message</span><span class="o">::</span><span class="na">FORMAT_HTTP</span><span class="p">);</span>
-    <span class="p">}</span> <span class="k">catch</span> <span class="p">(</span><span class="nx">Exception</span> <span class="nv">$e</span><span class="p">)</span> <span class="p">{</span>
-        <span class="nx">Die_error</span><span class="p">(</span><span class="nv">$e</span><span class="p">);</span>
-    <span class="p">}</span>
-
-    <span class="nv">$id</span> <span class="o">=</span> <span class="nv">$message</span><span class="o">-&gt;</span><span class="na">get</span><span class="p">(</span><span class="s1">&#39;openid.claimed_id&#39;</span><span class="p">);</span>
-
-    <span class="k">if</span> <span class="p">(</span><span class="o">!</span><span class="k">empty</span><span class="p">(</span><span class="nv">$id</span><span class="p">)</span> <span class="o">&amp;&amp;</span> <span class="nb">isset</span><span class="p">(</span><span class="nv">$AUTH_MAP</span><span class="p">[</span><span class="nv">$id</span><span class="p">]))</span> <span class="p">{</span>
-        <span class="nv">$_SESSION</span><span class="p">[</span><span class="s1">&#39;PMA_single_signon_user&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="nv">$AUTH_MAP</span><span class="p">[</span><span class="nv">$id</span><span class="p">][</span><span class="s1">&#39;user&#39;</span><span class="p">];</span>
-        <span class="nv">$_SESSION</span><span class="p">[</span><span class="s1">&#39;PMA_single_signon_password&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="nv">$AUTH_MAP</span><span class="p">[</span><span class="nv">$id</span><span class="p">][</span><span class="s1">&#39;password&#39;</span><span class="p">];</span>
-        <span class="nb">session_write_close</span><span class="p">();</span>
-        <span class="cm">/* Redirect to phpMyAdmin (should use absolute URL here!) */</span>
-        <span class="nb">header</span><span class="p">(</span><span class="s1">&#39;Location: ../index.php&#39;</span><span class="p">);</span>
-    <span class="p">}</span> <span class="k">else</span> <span class="p">{</span>
-        <span class="nx">Show_page</span><span class="p">(</span><span class="s1">&#39;&lt;p&gt;User not allowed!&lt;/p&gt;&#39;</span><span class="p">);</span>
-        <span class="k">exit</span><span class="p">;</span>
-    <span class="p">}</span>
-<span class="p">}</span>
-</pre></div>
-</div>
-<p>If you intend to pass the credentials using some other means than, you have to
-implement wrapper in PHP to get that data and set it to
-<span class="target" id="index-19"></span><a class="reference internal" href="config.html#cfg_Servers_SignonScript"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['SignonScript']</span></code></a>. There is very minimal example
-in <code class="file docutils literal"><span class="pre">examples/signon-script.php</span></code>:</p>
-<div class="highlight-php"><div class="highlight"><pre><span class="o">&lt;?</span><span class="nx">php</span>
-<span class="cm">/* vim: set expandtab sw=4 ts=4 sts=4: */</span>
-<span class="sd">/**</span>
-<span class="sd"> * Single signon for phpMyAdmin</span>
-<span class="sd"> *</span>
-<span class="sd"> * This is just example how to use script based single signon with</span>
-<span class="sd"> * phpMyAdmin, it is not intended to be perfect code and look, only</span>
-<span class="sd"> * shows how you can integrate this functionality in your application.</span>
-<span class="sd"> *</span>
-<span class="sd"> * @package    PhpMyAdmin</span>
-<span class="sd"> * @subpackage Example</span>
-<span class="sd"> */</span>
-
-
-<span class="sd">/**</span>
-<span class="sd"> * This function returns username and password.</span>
-<span class="sd"> *</span>
-<span class="sd"> * It can optionally use configured username as parameter.</span>
-<span class="sd"> *</span>
-<span class="sd"> * @param string $user User name</span>
-<span class="sd"> *</span>
-<span class="sd"> * @return array</span>
-<span class="sd"> */</span>
-<span class="k">function</span> <span class="nf">get_login_credentials</span><span class="p">(</span><span class="nv">$user</span><span class="p">)</span>
-<span class="p">{</span>
-    <span class="cm">/* Optionally we can use passed username */</span>
-    <span class="k">if</span> <span class="p">(</span><span class="o">!</span><span class="k">empty</span><span class="p">(</span><span class="nv">$user</span><span class="p">))</span> <span class="p">{</span>
-        <span class="k">return</span> <span class="k">array</span><span class="p">(</span><span class="nv">$user</span><span class="p">,</span> <span class="s1">&#39;password&#39;</span><span class="p">);</span>
-    <span class="p">}</span>
-
-    <span class="cm">/* Here we would retrieve the credentials */</span>
-    <span class="nv">$credentials</span> <span class="o">=</span> <span class="k">array</span><span class="p">(</span><span class="s1">&#39;root&#39;</span><span class="p">,</span> <span class="s1">&#39;&#39;</span><span class="p">);</span>
-
-    <span class="k">return</span> <span class="nv">$credentials</span><span class="p">;</span>
-<span class="p">}</span>
-</pre></div>
-</div>
-<div class="admonition seealso">
-<p class="first admonition-title">See also</p>
-<p class="last"><span class="target" id="index-20"></span><a class="reference internal" href="config.html#cfg_Servers_auth_type"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['auth_type']</span></code></a>,
-<span class="target" id="index-21"></span><a class="reference internal" href="config.html#cfg_Servers_SignonSession"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['SignonSession']</span></code></a>,
-<span class="target" id="index-22"></span><a class="reference internal" href="config.html#cfg_Servers_SignonScript"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['SignonScript']</span></code></a>,
-<span class="target" id="index-23"></span><a class="reference internal" href="config.html#cfg_Servers_SignonURL"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['SignonURL']</span></code></a></p>
-</div>
-</div>
-<div class="section" id="config-authentication-mode">
-<span id="auth-config"></span><span id="index-24"></span><h3>Config authentication mode<a class="headerlink" href="#config-authentication-mode" title="Permalink to this headline">¶</a></h3>
-<ul class="simple">
-<li>This mode is sometimes the less secure one because it requires you to fill the
-<span class="target" id="index-25"></span><a class="reference internal" href="config.html#cfg_Servers_user"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['user']</span></code></a> and
-<span class="target" id="index-26"></span><a class="reference internal" href="config.html#cfg_Servers_password"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['password']</span></code></a>
-fields (and as a result, anyone who can read your <code class="file docutils literal"><span class="pre">config.inc.php</span></code>
-can discover your username and password).</li>
-<li>In the <a class="reference internal" href="faq.html#faqmultiuser"><span class="std std-ref">ISPs, multi-user installations</span></a> section, there is an entry explaining how
-to protect your configuration file.</li>
-<li>For additional security in this mode, you may wish to consider the
-Host authentication <span class="target" id="index-27"></span><a class="reference internal" href="config.html#cfg_Servers_AllowDeny_order"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['AllowDeny']['order']</span></code></a>
-and <span class="target" id="index-28"></span><a class="reference internal" href="config.html#cfg_Servers_AllowDeny_rules"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['AllowDeny']['rules']</span></code></a> configuration directives.</li>
-<li>Unlike cookie and http, does not require a user to log in when first
-loading the phpMyAdmin site. This is by design but could allow any
-user to access your installation. Use of some restriction method is
-suggested, perhaps a <a class="reference internal" href="glossary.html#term-htaccess"><span class="xref std std-term">.htaccess</span></a> file with the HTTP-AUTH directive or disallowing
-incoming HTTP requests at one’s router or firewall will suffice (both
-of which are beyond the scope of this manual but easily searchable
-with Google).</li>
-</ul>
-</div>
-</div>
-<div class="section" id="securing-your-phpmyadmin-installation">
-<h2>Securing your phpMyAdmin installation<a class="headerlink" href="#securing-your-phpmyadmin-installation" title="Permalink to this headline">¶</a></h2>
-<p>The phpMyAdmin team tries hard to make the application secure, however there
-are always ways to make your installation more secure:</p>
-<ul>
-<li><p class="first">Serve phpMyAdmin on HTTPS only. Preferably, you should use HSTS as well, so that
-you&#8217;re protected from protocol downgrade attacks.</p>
-</li>
-<li><p class="first">Remove the <code class="docutils literal"><span class="pre">test</span></code> directory from phpMyAdmin, unless you are developing and need test suite.</p>
-</li>
-<li><p class="first">Remove the <code class="docutils literal"><span class="pre">setup</span></code> directory from phpMyAdmin, you will probably not
-use it after the initial setup.</p>
-</li>
-<li><p class="first">Properly choose an authentication method - <a class="reference internal" href="#cookie"><span class="std std-ref">Cookie authentication mode</span></a>
-is probably the best choice for shared hosting.</p>
-</li>
-<li><p class="first">In case you don&#8217;t want all MySQL users to be able to access
-phpMyAdmin, you can use <span class="target" id="index-29"></span><a class="reference internal" href="config.html#cfg_Servers_AllowDeny_rules"><code class="xref config config-option docutils literal"><span class="pre">$cfg['Servers'][$i]['AllowDeny']['rules']</span></code></a> to limit them.</p>
-</li>
-<li><p class="first">Consider hiding phpMyAdmin behind an authentication proxy, so that
-users need to authenticate prior to providing MySQL credentials
-to phpMyAdmin. You can achieve this by configuring your web server to request
-HTTP authentication. For example in Apache this can be done with:</p>
-<div class="highlight-apache"><div class="highlight"><pre><span class="nb">AuthType</span> Basic
-<span class="nb">AuthName</span> <span class="s2">&quot;Restricted Access&quot;</span>
-<span class="nb">AuthUserFile</span> <span class="sx">/usr/share/phpmyadmin/passwd</span>
-<span class="nb">Require</span> valid-user
-</pre></div>
-</div>
-<p>Once you have changed the configuration, you need to create a list of users which
-can authenticate. This can be done using the <strong class="program">htpasswd</strong> utility:</p>
-<div class="highlight-sh"><div class="highlight"><pre>htpasswd -c /usr/share/phpmyadmin/passwd username
-</pre></div>
-</div>
-</li>
-<li><p class="first">If you are afraid of automated attacks, enabling Captcha by
-<span class="target" id="index-30"></span><a class="reference internal" href="config.html#cfg_CaptchaLoginPublicKey"><code class="xref config config-option docutils literal"><span class="pre">$cfg['CaptchaLoginPublicKey']</span></code></a> and
-<span class="target" id="index-31"></span><a class="reference internal" href="config.html#cfg_CaptchaLoginPrivateKey"><code class="xref config config-option docutils literal"><span class="pre">$cfg['CaptchaLoginPrivateKey']</span></code></a> might be an option.</p>
-</li>
-</ul>
-</div>
-<div class="section" id="known-issues">
-<h2>Known issues<a class="headerlink" href="#known-issues" title="Permalink to this headline">¶</a></h2>
-<div class="section" id="users-with-column-specific-privileges-are-unable-to-browse">
-<h3>Users with column-specific privileges are unable to &#8220;Browse&#8221;<a class="headerlink" href="#users-with-column-specific-privileges-are-unable-to-browse" title="Permalink to this headline">¶</a></h3>
-<p>If a user has only column-specific privileges on some (but not all) columns in a table, &#8220;Browse&#8221;
-will fail with an error message.</p>
-<p>As a workaround, a bookmarked query with the same name as the table can be created, this will
-run when using the &#8220;Browse&#8221; link instead. <a class="reference external" href="https://github.com/phpmyadmin/phpmyadmin/issues/11922">Issue 11922</a>.</p>
-</div>
-<div class="section" id="trouble-logging-back-in-after-logging-out-using-http-authentication">
-<h3>Trouble logging back in after logging out using &#8216;http&#8217; authentication<a class="headerlink" href="#trouble-logging-back-in-after-logging-out-using-http-authentication" title="Permalink to this headline">¶</a></h3>
-<p>When using the &#8216;http&#8217; <code class="docutils literal"><span class="pre">auth_type</span></code>, it can be impossible to log back in (when the logout comes
-manually or after a period of inactivity). <a class="reference external" href="https://github.com/phpmyadmin/phpmyadmin/issues/11898">Issue 11898</a>.</p>
-</div>
-</div>
-</div>
-
-
-          </div>
-        </div>
-      </div>
-      <div class="sphinxsidebar" role="navigation" aria-label="main navigation">
-        <div class="sphinxsidebarwrapper">
-  <h3><a href="index.html">Table Of Contents</a></h3>
-  <ul>
-<li><a class="reference internal" href="#">Installation</a><ul>
-<li><a class="reference internal" href="#linux-distributions">Linux distributions</a><ul>
-<li><a class="reference internal" href="#debian">Debian</a></li>
-<li><a class="reference internal" href="#opensuse">OpenSUSE</a></li>
-<li><a class="reference internal" href="#ubuntu">Ubuntu</a></li>
-<li><a class="reference internal" href="#gentoo">Gentoo</a></li>
-<li><a class="reference internal" href="#mandriva">Mandriva</a></li>
-<li><a class="reference internal" href="#fedora">Fedora</a></li>
-<li><a class="reference internal" href="#red-hat-enterprise-linux">Red Hat Enterprise Linux</a></li>
-</ul>
-</li>
-<li><a class="reference internal" href="#installing-on-windows">Installing on Windows</a></li>
-<li><a class="reference internal" href="#installing-using-composer">Installing using Composer</a></li>
-<li><a class="reference internal" href="#installing-using-docker">Installing using Docker</a><ul>
-<li><a class="reference internal" href="#docker-volumes">Docker Volumes</a></li>
-<li><a class="reference internal" href="#docker-examples">Docker Examples</a></li>
-<li><a class="reference internal" href="#using-docker-compose">Using docker-compose</a></li>
-</ul>
-</li>
-<li><a class="reference internal" href="#quick-install">Quick Install</a><ul>
-<li><a class="reference internal" href="#manually-creating-the-file">Manually creating the file</a></li>
-<li><a class="reference internal" href="#using-setup-script">Using Setup script</a></li>
-</ul>
-</li>
-<li><a class="reference internal" href="#verifying-phpmyadmin-releases">Verifying phpMyAdmin releases</a></li>
-<li><a class="reference internal" href="#phpmyadmin-configuration-storage">phpMyAdmin configuration storage</a><ul>
-<li><a class="reference internal" href="#zero-configuration">Zero configuration</a></li>
-<li><a class="reference internal" href="#manual-configuration">Manual configuration</a></li>
-</ul>
-</li>
-<li><a class="reference internal" href="#upgrading-from-an-older-version">Upgrading from an older version</a></li>
-<li><a class="reference internal" href="#using-authentication-modes">Using authentication modes</a><ul>
-<li><a class="reference internal" href="#http-authentication-mode">HTTP authentication mode</a></li>
-<li><a class="reference internal" href="#cookie-authentication-mode">Cookie authentication mode</a></li>
-<li><a class="reference internal" href="#signon-authentication-mode">Signon authentication mode</a></li>
-<li><a class="reference internal" href="#config-authentication-mode">Config authentication mode</a></li>
-</ul>
-</li>
-<li><a class="reference internal" href="#securing-your-phpmyadmin-installation">Securing your phpMyAdmin installation</a></li>
-<li><a class="reference internal" href="#known-issues">Known issues</a><ul>
-<li><a class="reference internal" href="#users-with-column-specific-privileges-are-unable-to-browse">Users with column-specific privileges are unable to &#8220;Browse&#8221;</a></li>
-<li><a class="reference internal" href="#trouble-logging-back-in-after-logging-out-using-http-authentication">Trouble logging back in after logging out using &#8216;http&#8217; authentication</a></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-
-  <h4>Previous topic</h4>
-  <p class="topless"><a href="require.html"
-                        title="previous chapter">Requirements</a></p>
-  <h4>Next topic</h4>
-  <p class="topless"><a href="config.html"
-                        title="next chapter">Configuration</a></p>
-  <div role="note" aria-label="source link">
-    <h3>This Page</h3>
-    <ul class="this-page-menu">
-      <li><a href="_sources/setup.txt"
-            rel="nofollow">Show Source</a></li>
-    </ul>
-   </div>
-<div id="searchbox" style="display: none" role="search">
-  <h3>Quick search</h3>
-    <form class="search" action="search.html" method="get">
-      <div><input type="text" name="q" /></div>
-      <div><input type="submit" value="Go" /></div>
-      <input type="hidden" name="check_keywords" value="yes" />
-      <input type="hidden" name="area" value="default" />
-    </form>
-</div>
-<script type="text/javascript">$('#searchbox').show(0);</script>
-        </div>
-      </div>
-      <div class="clearer"></div>
-    </div>
-    <div class="related" role="navigation" aria-label="related navigation">
-      <h3>Navigation</h3>
-      <ul>
-        <li class="right" style="margin-right: 10px">
-          <a href="genindex.html" title="General Index"
-             >index</a></li>
-        <li class="right" >
-          <a href="config.html" title="Configuration"
-             >next</a> |</li>
-        <li class="right" >
-          <a href="require.html" title="Requirements"
-             >previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">phpMyAdmin 4.6.5.2 documentation</a> &#187;</li> 
-      </ul>
-    </div>
-    <div class="footer" role="contentinfo">
-        &#169; <a href="copyright.html">Copyright</a> 2012 - 2016, The phpMyAdmin devel team.
-      Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.4.6.
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/#pma/doc/html/transformations.html b/#pma/doc/html/transformations.html
deleted file mode 100644
index 2665f242..00000000
--- a/#pma/doc/html/transformations.html
+++ /dev/null
@@ -1,237 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    
-    <title>Transformations &#8212; phpMyAdmin 4.6.5.2 documentation</title>
-    
-    <link rel="stylesheet" href="_static/classic.css" type="text/css" />
-    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
-    
-    <script type="text/javascript">
-      var DOCUMENTATION_OPTIONS = {
-        URL_ROOT:    './',
-        VERSION:     '4.6.5.2',
-        COLLAPSE_INDEX: false,
-        FILE_SUFFIX: '.html',
-        HAS_SOURCE:  true
-      };
-    </script>
-    <script type="text/javascript" src="_static/jquery.js"></script>
-    <script type="text/javascript" src="_static/underscore.js"></script>
-    <script type="text/javascript" src="_static/doctools.js"></script>
-    <link rel="copyright" title="Copyright" href="copyright.html" />
-    <link rel="top" title="phpMyAdmin 4.6.5.2 documentation" href="index.html" />
-    <link rel="up" title="User Guide" href="user.html" />
-    <link rel="next" title="User management" href="privileges.html" />
-    <link rel="prev" title="User Guide" href="user.html" /> 
-  </head>
-  <body role="document">
-    <div class="related" role="navigation" aria-label="related navigation">
-      <h3>Navigation</h3>
-      <ul>
-        <li class="right" style="margin-right: 10px">
-          <a href="genindex.html" title="General Index"
-             accesskey="I">index</a></li>
-        <li class="right" >
-          <a href="privileges.html" title="User management"
-             accesskey="N">next</a> |</li>
-        <li class="right" >
-          <a href="user.html" title="User Guide"
-             accesskey="P">previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">phpMyAdmin 4.6.5.2 documentation</a> &#187;</li>
-          <li class="nav-item nav-item-1"><a href="user.html" accesskey="U">User Guide</a> &#187;</li> 
-      </ul>
-    </div>  
-
-    <div class="document">
-      <div class="documentwrapper">
-        <div class="bodywrapper">
-          <div class="body" role="main">
-            
-  <div class="section" id="transformations">
-<span id="id1"></span><h1>Transformations<a class="headerlink" href="#transformations" title="Permalink to this headline">¶</a></h1>
-<div class="section" id="introduction">
-<span id="transformationsintro"></span><h2>Introduction<a class="headerlink" href="#introduction" title="Permalink to this headline">¶</a></h2>
-<p>To enable transformations, you have to setup the <code class="docutils literal"><span class="pre">column_info</span></code>
-table and the proper directives. Please see the <a class="reference internal" href="config.html#config"><span class="std std-ref">Configuration</span></a> on how to do so.</p>
-<p>You can apply different transformations to the contents of each
-column. The transformation will take the content of each column and
-transform it with certain rules defined in the selected
-transformation.</p>
-<p>Say you have a column &#8216;filename&#8217; which contains a filename. Normally
-you would see in phpMyAdmin only this filename. Using transformations
-you can transform that filename into a HTML link, so you can click
-inside of the phpMyAdmin structure on the column&#8217;s link and will see
-the file displayed in a new browser window. Using transformation
-options you can also specify strings to append/prepend to a string or
-the format you want the output stored in.</p>
-<p>For a general overview of all available transformations and their
-options, you can consult your <em>&lt;www.your-host.com&gt;/&lt;your-install-
-dir&gt;/transformation_overview.php</em> installation.</p>
-<p>For a tutorial on how to effectively use transformations, see our
-<a class="reference external" href="https://www.phpmyadmin.net/home_page/docs.php">Link section</a> on the
-official phpMyAdmin homepage.</p>
-</div>
-<div class="section" id="usage">
-<span id="transformationshowto"></span><h2>Usage<a class="headerlink" href="#usage" title="Permalink to this headline">¶</a></h2>
-<p>Go to your <em>tbl_structure.php</em> page (i.e. reached through clicking on
-the &#8216;Structure&#8217; link for a table). There click on &#8220;Change&#8221; (or change
-icon) and there you will see three new fields at the end of the line.
-They are called &#8216;MIME-type&#8217;, &#8216;Browser transformation&#8217; and
-&#8216;Transformation options&#8217;.</p>
-<ul class="simple">
-<li>The field &#8216;MIME-type&#8217; is a drop-down field. Select the MIME-type that
-corresponds to the column&#8217;s contents. Please note that transformations
-are inactive as long as no MIME-type is selected.</li>
-<li>The field &#8216;Browser transformation&#8217; is a drop-down field. You can
-choose from a hopefully growing amount of pre-defined transformations.
-See below for information on how to build your own transformation.
-There are global transformations and mimetype-bound transformations.
-Global transformations can be used for any mimetype. They will take
-the mimetype, if necessary, into regard. Mimetype-bound
-transformations usually only operate on a certain mimetype. There are
-transformations which operate on the main mimetype (like &#8216;image&#8217;),
-which will most likely take the subtype into regard, and those who
-only operate on a specific subtype (like &#8216;image/jpeg&#8217;). You can use
-transformations on mimetypes for which the function was not defined
-for. There is no security check for you selected the right
-transformation, so take care of what the output will be like.</li>
-<li>The field &#8216;Transformation options&#8217; is a free-type textfield. You have
-to enter transform-function specific options here. Usually the
-transforms can operate with default options, but it is generally a
-good idea to look up the overview to see which options are necessary.
-Much like the ENUM/SET-Fields, you have to split up several options
-using the format &#8216;a&#8217;,&#8217;b&#8217;,&#8217;c&#8217;,...(NOTE THE MISSING BLANKS). This is
-because internally the options will be parsed as an array, leaving the
-first value the first element in the array, and so forth. If you want
-to specify a MIME character set you can define it in the
-transformation_options. You have to put that outside of the pre-
-defined options of the specific mime-transform, as the last value of
-the set. Use the format &#8220;&#8217;; charset=XXX&#8217;&#8221;. If you use a transform, for
-which you can specify 2 options and you want to append a character
-set, enter &#8220;&#8216;first parameter&#8217;,&#8217;second parameter&#8217;,&#8217;charset=us-ascii&#8217;&#8221;.
-You can, however use the defaults for the parameters: &#8220;&#8217;&#8216;,&#8217;&#8216;,&#8217;charset
-=us-ascii&#8217;&#8221;.</li>
-</ul>
-</div>
-<div class="section" id="file-structure">
-<span id="transformationsfiles"></span><h2>File structure<a class="headerlink" href="#file-structure" title="Permalink to this headline">¶</a></h2>
-<p>All specific transformations for mimetypes are defined through class
-files in the directory &#8216;libraries/plugins/transformations/&#8217;. Each of
-them extends a certain transformation abstract class declared in
-libraries/plugins/transformations/abstract.</p>
-<p>They are stored in files to ease up customization and easy adding of
-new transformations.</p>
-<p>Because the user cannot enter own mimetypes, it is kept sure that
-transformations always work. It makes no sense to apply a
-transformation to a mimetype the transform-function doesn&#8217;t know to
-handle.</p>
-<p>There is a file called &#8216;<em>transformations.lib.php</em>&#8216; that provides some
-basic functions which can be included by any other transform function.</p>
-<p>The file name convention is <code class="docutils literal"><span class="pre">[Mimetype]_[Subtype]_[Transformation</span>
-<span class="pre">Name].class.php</span></code>, while the abtract class that it extends has the
-name <code class="docutils literal"><span class="pre">[Transformation</span> <span class="pre">Name]TransformationsPlugin</span></code>. All of the
-methods that have to be implemented by a transformations plug-in are:</p>
-<ol class="arabic simple">
-<li>getMIMEType() and getMIMESubtype() in the main class;</li>
-<li>getName(), getInfo() and applyTransformation() in the abstract class
-it extends.</li>
-</ol>
-<p>The getMIMEType(), getMIMESubtype() and getName() methods return the
-name of the MIME type, MIME Subtype and transformation accordingly.
-getInfo() returns the transformation&#8217;s description and possible
-options it may receive and applyTransformation() is the method that
-does the actual work of the transformation plug-in.</p>
-<p>Please see the libraries/plugins/transformations/TEMPLATE and
-libraries/plugins/transformations/TEMPLATE_ABSTRACT files for adding
-your own transformation plug-in. You can also generate a new
-transformation plug-in (with or without the abstract transformation
-class), by using
-<code class="file docutils literal"><span class="pre">scripts/transformations_generator_plugin.sh</span></code> or
-<code class="file docutils literal"><span class="pre">scripts/transformations_generator_main_class.sh</span></code>.</p>
-<p>The applyTransformation() method always gets passed three variables:</p>
-<ol class="arabic simple">
-<li><strong>$buffer</strong> - Contains the text inside of the column. This is the
-text, you want to transform.</li>
-<li><strong>$options</strong> - Contains any user-passed options to a transform
-function as an array.</li>
-<li><strong>$meta</strong> - Contains an object with information about your column. The
-data is drawn from the output of the <a class="reference external" href="https://www.php.net/mysql_fetch_field">mysql_fetch_field()</a> function. This means, all
-object properties described on the <a class="reference external" href="https://www.php.net/mysql_fetch_field">manual page</a> are available in this
-variable and can be used to transform a column accordingly to
-unsigned/zerofill/not_null/... properties. The $meta-&gt;mimetype
-variable contains the original MIME-type of the column (i.e.
-&#8216;text/plain&#8217;, &#8216;image/jpeg&#8217; etc.)</li>
-</ol>
-</div>
-</div>
-
-
-          </div>
-        </div>
-      </div>
-      <div class="sphinxsidebar" role="navigation" aria-label="main navigation">
-        <div class="sphinxsidebarwrapper">
-  <h3><a href="index.html">Table Of Contents</a></h3>
-  <ul>
-<li><a class="reference internal" href="#">Transformations</a><ul>
-<li><a class="reference internal" href="#introduction">Introduction</a></li>
-<li><a class="reference internal" href="#usage">Usage</a></li>
-<li><a class="reference internal" href="#file-structure">File structure</a></li>
-</ul>
-</li>
-</ul>
-
-  <h4>Previous topic</h4>
-  <p class="topless"><a href="user.html"
-                        title="previous chapter">User Guide</a></p>
-  <h4>Next topic</h4>
-  <p class="topless"><a href="privileges.html"
-                        title="next chapter">User management</a></p>
-  <div role="note" aria-label="source link">
-    <h3>This Page</h3>
-    <ul class="this-page-menu">
-      <li><a href="_sources/transformations.txt"
-            rel="nofollow">Show Source</a></li>
-    </ul>
-   </div>
-<div id="searchbox" style="display: none" role="search">
-  <h3>Quick search</h3>
-    <form class="search" action="search.html" method="get">
-      <div><input type="text" name="q" /></div>
-      <div><input type="submit" value="Go" /></div>
-      <input type="hidden" name="check_keywords" value="yes" />
-      <input type="hidden" name="area" value="default" />
-    </form>
-</div>
-<script type="text/javascript">$('#searchbox').show(0);</script>
-        </div>
-      </div>
-      <div class="clearer"></div>
-    </div>
-    <div class="related" role="navigation" aria-label="related navigation">
-      <h3>Navigation</h3>
-      <ul>
-        <li class="right" style="margin-right: 10px">
-          <a href="genindex.html" title="General Index"
-             >index</a></li>
-        <li class="right" >
-          <a href="privileges.html" title="User management"
-             >next</a> |</li>
-        <li class="right" >
-          <a href="user.html" title="User Guide"
-             >previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">phpMyAdmin 4.6.5.2 documentation</a> &#187;</li>
-          <li class="nav-item nav-item-1"><a href="user.html" >User Guide</a> &#187;</li> 
-      </ul>
-    </div>
-    <div class="footer" role="contentinfo">
-        &#169; <a href="copyright.html">Copyright</a> 2012 - 2016, The phpMyAdmin devel team.
-      Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.4.6.
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/#pma/doc/html/user.html b/#pma/doc/html/user.html
deleted file mode 100644
index 3158d06d..00000000
--- a/#pma/doc/html/user.html
+++ /dev/null
@@ -1,137 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    
-    <title>User Guide &#8212; phpMyAdmin 4.6.5.2 documentation</title>
-    
-    <link rel="stylesheet" href="_static/classic.css" type="text/css" />
-    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
-    
-    <script type="text/javascript">
-      var DOCUMENTATION_OPTIONS = {
-        URL_ROOT:    './',
-        VERSION:     '4.6.5.2',
-        COLLAPSE_INDEX: false,
-        FILE_SUFFIX: '.html',
-        HAS_SOURCE:  true
-      };
-    </script>
-    <script type="text/javascript" src="_static/jquery.js"></script>
-    <script type="text/javascript" src="_static/underscore.js"></script>
-    <script type="text/javascript" src="_static/doctools.js"></script>
-    <link rel="copyright" title="Copyright" href="copyright.html" />
-    <link rel="top" title="phpMyAdmin 4.6.5.2 documentation" href="index.html" />
-    <link rel="next" title="Transformations" href="transformations.html" />
-    <link rel="prev" title="Configuration" href="config.html" /> 
-  </head>
-  <body role="document">
-    <div class="related" role="navigation" aria-label="related navigation">
-      <h3>Navigation</h3>
-      <ul>
-        <li class="right" style="margin-right: 10px">
-          <a href="genindex.html" title="General Index"
-             accesskey="I">index</a></li>
-        <li class="right" >
-          <a href="transformations.html" title="Transformations"
-             accesskey="N">next</a> |</li>
-        <li class="right" >
-          <a href="config.html" title="Configuration"
-             accesskey="P">previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">phpMyAdmin 4.6.5.2 documentation</a> &#187;</li> 
-      </ul>
-    </div>  
-
-    <div class="document">
-      <div class="documentwrapper">
-        <div class="bodywrapper">
-          <div class="body" role="main">
-            
-  <div class="section" id="user-guide">
-<h1>User Guide<a class="headerlink" href="#user-guide" title="Permalink to this headline">¶</a></h1>
-<div class="toctree-wrapper compound">
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="transformations.html">Transformations</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="transformations.html#introduction">Introduction</a></li>
-<li class="toctree-l2"><a class="reference internal" href="transformations.html#usage">Usage</a></li>
-<li class="toctree-l2"><a class="reference internal" href="transformations.html#file-structure">File structure</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="privileges.html">User management</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="privileges.html#creating-a-new-user">Creating a new user</a></li>
-<li class="toctree-l2"><a class="reference internal" href="privileges.html#editing-an-existing-user">Editing an existing user</a></li>
-<li class="toctree-l2"><a class="reference internal" href="privileges.html#deleting-a-user">Deleting a user</a></li>
-<li class="toctree-l2"><a class="reference internal" href="privileges.html#assigning-privileges-to-user-for-a-specific-database">Assigning privileges to user for a specific database</a></li>
-<li class="toctree-l2"><a class="reference internal" href="privileges.html#configurable-menus-and-user-groups">Configurable menus and user groups</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="other.html">Other sources of information</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="other.html#printed-book">Printed Book</a></li>
-<li class="toctree-l2"><a class="reference internal" href="other.html#tutorials">Tutorials</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="import_export.html">Import and export</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="import_export.html#open-document-spreadsheet">Open Document Spreadsheet</a></li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-
-
-          </div>
-        </div>
-      </div>
-      <div class="sphinxsidebar" role="navigation" aria-label="main navigation">
-        <div class="sphinxsidebarwrapper">
-  <h4>Previous topic</h4>
-  <p class="topless"><a href="config.html"
-                        title="previous chapter">Configuration</a></p>
-  <h4>Next topic</h4>
-  <p class="topless"><a href="transformations.html"
-                        title="next chapter">Transformations</a></p>
-  <div role="note" aria-label="source link">
-    <h3>This Page</h3>
-    <ul class="this-page-menu">
-      <li><a href="_sources/user.txt"
-            rel="nofollow">Show Source</a></li>
-    </ul>
-   </div>
-<div id="searchbox" style="display: none" role="search">
-  <h3>Quick search</h3>
-    <form class="search" action="search.html" method="get">
-      <div><input type="text" name="q" /></div>
-      <div><input type="submit" value="Go" /></div>
-      <input type="hidden" name="check_keywords" value="yes" />
-      <input type="hidden" name="area" value="default" />
-    </form>
-</div>
-<script type="text/javascript">$('#searchbox').show(0);</script>
-        </div>
-      </div>
-      <div class="clearer"></div>
-    </div>
-    <div class="related" role="navigation" aria-label="related navigation">
-      <h3>Navigation</h3>
-      <ul>
-        <li class="right" style="margin-right: 10px">
-          <a href="genindex.html" title="General Index"
-             >index</a></li>
-        <li class="right" >
-          <a href="transformations.html" title="Transformations"
-             >next</a> |</li>
-        <li class="right" >
-          <a href="config.html" title="Configuration"
-             >previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">phpMyAdmin 4.6.5.2 documentation</a> &#187;</li> 
-      </ul>
-    </div>
-    <div class="footer" role="contentinfo">
-        &#169; <a href="copyright.html">Copyright</a> 2012 - 2016, The phpMyAdmin devel team.
-      Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.4.6.
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/#pma/doc/html/vendors.html b/#pma/doc/html/vendors.html
deleted file mode 100644
index 679e140a..00000000
--- a/#pma/doc/html/vendors.html
+++ /dev/null
@@ -1,146 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    
-    <title>Distributing and packaging phpMyAdmin &#8212; phpMyAdmin 4.6.5.2 documentation</title>
-    
-    <link rel="stylesheet" href="_static/classic.css" type="text/css" />
-    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
-    
-    <script type="text/javascript">
-      var DOCUMENTATION_OPTIONS = {
-        URL_ROOT:    './',
-        VERSION:     '4.6.5.2',
-        COLLAPSE_INDEX: false,
-        FILE_SUFFIX: '.html',
-        HAS_SOURCE:  true
-      };
-    </script>
-    <script type="text/javascript" src="_static/jquery.js"></script>
-    <script type="text/javascript" src="_static/underscore.js"></script>
-    <script type="text/javascript" src="_static/doctools.js"></script>
-    <link rel="copyright" title="Copyright" href="copyright.html" />
-    <link rel="top" title="phpMyAdmin 4.6.5.2 documentation" href="index.html" />
-    <link rel="next" title="Copyright" href="copyright.html" />
-    <link rel="prev" title="Developers Information" href="developers.html" /> 
-  </head>
-  <body role="document">
-    <div class="related" role="navigation" aria-label="related navigation">
-      <h3>Navigation</h3>
-      <ul>
-        <li class="right" style="margin-right: 10px">
-          <a href="genindex.html" title="General Index"
-             accesskey="I">index</a></li>
-        <li class="right" >
-          <a href="copyright.html" title="Copyright"
-             accesskey="N">next</a> |</li>
-        <li class="right" >
-          <a href="developers.html" title="Developers Information"
-             accesskey="P">previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">phpMyAdmin 4.6.5.2 documentation</a> &#187;</li> 
-      </ul>
-    </div>  
-
-    <div class="document">
-      <div class="documentwrapper">
-        <div class="bodywrapper">
-          <div class="body" role="main">
-            
-  <div class="section" id="distributing-and-packaging-phpmyadmin">
-<h1>Distributing and packaging phpMyAdmin<a class="headerlink" href="#distributing-and-packaging-phpmyadmin" title="Permalink to this headline">¶</a></h1>
-<p>This document is intended to give advices to people who want to
-redistribute phpMyAdmin inside other software package such as Linux
-distribution or some all in one package including web server and MySQL
-server.</p>
-<p>Generally you can customize some basic aspects (paths to some files and
-behavior) in <code class="file docutils literal"><span class="pre">libraries/vendor_config.php</span></code>.</p>
-<p>For example if you want setup script to generate config file in var, change
-<code class="docutils literal"><span class="pre">SETUP_CONFIG_FILE</span></code> to <code class="file docutils literal"><span class="pre">/var/lib/phpmyadmin/config.inc.php</span></code> and you
-will also probably want to skip directory writable check, so set
-<code class="docutils literal"><span class="pre">SETUP_DIR_WRITABLE</span></code> to false.</p>
-<div class="section" id="external-libraries">
-<h2>External libraries<a class="headerlink" href="#external-libraries" title="Permalink to this headline">¶</a></h2>
-<p>phpMyAdmin includes several external libraries, you might want to
-replace them with system ones if they are available, but please note
-that you should test whether version you provide is compatible with the
-one we ship.</p>
-<p>Currently known list of external libraries:</p>
-<dl class="docutils">
-<dt>js/jquery</dt>
-<dd>jQuery js framework and various jQuery based libraries.</dd>
-<dt>libraries/php-gettext</dt>
-<dd>php-gettext library</dd>
-<dt>libraries/tcpdf</dt>
-<dd>tcpdf library, stripped down of not needed files</dd>
-<dt>libraries/phpseclib</dt>
-<dd>portions of phpseclib library</dd>
-</dl>
-</div>
-</div>
-
-
-          </div>
-        </div>
-      </div>
-      <div class="sphinxsidebar" role="navigation" aria-label="main navigation">
-        <div class="sphinxsidebarwrapper">
-  <h3><a href="index.html">Table Of Contents</a></h3>
-  <ul>
-<li><a class="reference internal" href="#">Distributing and packaging phpMyAdmin</a><ul>
-<li><a class="reference internal" href="#external-libraries">External libraries</a></li>
-</ul>
-</li>
-</ul>
-
-  <h4>Previous topic</h4>
-  <p class="topless"><a href="developers.html"
-                        title="previous chapter">Developers Information</a></p>
-  <h4>Next topic</h4>
-  <p class="topless"><a href="copyright.html"
-                        title="next chapter">Copyright</a></p>
-  <div role="note" aria-label="source link">
-    <h3>This Page</h3>
-    <ul class="this-page-menu">
-      <li><a href="_sources/vendors.txt"
-            rel="nofollow">Show Source</a></li>
-    </ul>
-   </div>
-<div id="searchbox" style="display: none" role="search">
-  <h3>Quick search</h3>
-    <form class="search" action="search.html" method="get">
-      <div><input type="text" name="q" /></div>
-      <div><input type="submit" value="Go" /></div>
-      <input type="hidden" name="check_keywords" value="yes" />
-      <input type="hidden" name="area" value="default" />
-    </form>
-</div>
-<script type="text/javascript">$('#searchbox').show(0);</script>
-        </div>
-      </div>
-      <div class="clearer"></div>
-    </div>
-    <div class="related" role="navigation" aria-label="related navigation">
-      <h3>Navigation</h3>
-      <ul>
-        <li class="right" style="margin-right: 10px">
-          <a href="genindex.html" title="General Index"
-             >index</a></li>
-        <li class="right" >
-          <a href="copyright.html" title="Copyright"
-             >next</a> |</li>
-        <li class="right" >
-          <a href="developers.html" title="Developers Information"
-             >previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">phpMyAdmin 4.6.5.2 documentation</a> &#187;</li> 
-      </ul>
-    </div>
-    <div class="footer" role="contentinfo">
-        &#169; <a href="copyright.html">Copyright</a> 2012 - 2016, The phpMyAdmin devel team.
-      Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.4.6.
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/#pma/doc/images/usergroups.png b/#pma/doc/images/usergroups.png
deleted file mode 100644
index bd8efdcc..00000000
Binary files a/#pma/doc/images/usergroups.png and /dev/null differ
diff --git a/#pma/doc/import_export.rst b/#pma/doc/import_export.rst
deleted file mode 100644
index 5921cd5c..00000000
--- a/#pma/doc/import_export.rst
+++ /dev/null
@@ -1,27 +0,0 @@
-Import and export
-=================
-
-In addition to the standard Import and Export tab, you can also import an SQL file directly by dragging and dropping
-it from your local file manager to the phpMyAdmin interface in your web browser.
-
-Open Document Spreadsheet
--------------------------
-
-When importing an ODS speadsheet, the spreadsheet must be named in a specific way in order to make the
-import as simple as possible.
-
-Table name
-~~~~~~~~~~
-
-During import, phpMyAdmin uses the sheet name as the table name; you should rename the
-sheet in your spreadsheet program in order to match your existing table name (or the table you wish to create,
-though this is less of a concern since you could quickly rename the new table from the Operations tab).
-
-Column names
-~~~~~~~~~~~~
-
-You should also make the first row of your spreadsheet a header with the names of the columns (this can be
-accomplished by inserting a new row at the top of your spreadsheet). When on the Import screen, select the
-checkbox for "The first line of the file contains the table column names;" this way your newly imported
-data will go to the proper columns.
-
diff --git a/#pma/doc/index.rst b/#pma/doc/index.rst
deleted file mode 100644
index 917ddf81..00000000
--- a/#pma/doc/index.rst
+++ /dev/null
@@ -1,32 +0,0 @@
-.. phpMyAdmin documentation master file, created by
-   sphinx-quickstart on Wed Sep 26 14:04:48 2012.
-   You can adapt this file completely to your liking, but it should at least
-   contain the root `toctree` directive.
-
-Welcome to phpMyAdmin's documentation!
-======================================
-
-Contents:
-
-.. toctree::
-    :maxdepth: 2
-
-    intro
-    require
-    setup
-    config
-    user
-    faq
-    developers
-    vendors
-    copyright
-    credits
-    glossary
-
-
-Indices and tables
-==================
-
-* :ref:`genindex`
-* :ref:`search`
-* :ref:`glossary`
diff --git a/#pma/doc/intro.rst b/#pma/doc/intro.rst
deleted file mode 100644
index b8c348df..00000000
--- a/#pma/doc/intro.rst
+++ /dev/null
@@ -1,68 +0,0 @@
-.. _intro:
-
-Introduction
-============
-
-phpMyAdmin can manage a whole MySQL server (needs a super-user) as
-well as a single database. To accomplish the latter you'll need a
-properly set up MySQL user who can read/write only the desired
-database. It's up to you to look up the appropriate part in the MySQL
-manual.
-
-
-Supported features
-------------------
-
-Currently phpMyAdmin can:
-
-* browse and drop databases, tables, views, columns and indexes
-* display multiple results sets through stored procedures or queries
-* create, copy, drop, rename and alter databases, tables, columns and
-  indexes
-* maintenance server, databases and tables, with proposals on server
-  configuration
-* execute, edit and bookmark any :term:`SQL`-statement, even batch-queries
-* load text files into tables
-* create [#f1]_ and read dumps of tables
-* export [#f1]_ data to various formats: :term:`CSV`, :term:`XML`, :term:`PDF`,
-  :term:`ISO`/:term:`IEC` 26300 - :term:`OpenDocument` Text and Spreadsheet, Microsoft
-  Word 2000, and LATEX formats
-* import data and :term:`MySQL` structures from :term:`OpenDocument` spreadsheets, as
-  well as :term:`XML`, :term:`CSV`, and :term:`SQL` files
-* administer multiple servers
-* manage MySQL users and privileges
-* check referential integrity in MyISAM tables
-* using Query-by-example (QBE), create complex queries automatically
-  connecting required tables
-* create :term:`PDF` graphics of your
-  database layout
-* search globally in a database or a subset of it
-* transform stored data into any format using a set of predefined
-  functions, like displaying BLOB-data as image or download-link
-* track changes on databases, tables and views
-* support InnoDB tables and foreign keys
-* support mysqli, the improved MySQL extension see :ref:`faq1_17`
-* create, edit, call, export and drop stored procedures and functions
-* create, edit, export and drop events and triggers
-* communicate in `80 different languages
-  <https://www.phpmyadmin.net/translations/>`_
-
-
-A word about users
-------------------
-
-Many people have difficulty understanding the concept of user
-management with regards to phpMyAdmin. When a user logs in to
-phpMyAdmin, that username and password are passed directly to MySQL.
-phpMyAdmin does no account management on its own (other than allowing
-one to manipulate the MySQL user account information); all users must
-be valid MySQL users.
-
-.. rubric:: Footnotes
-
-.. [#f1]
-
-    phpMyAdmin can compress (:term:`Zip`, :term:`GZip` or :term:`RFC 1952`
-    formats) dumps and :term:`CSV` exports if you use PHP with
-    :term:`Zlib` support (``--with-zlib``).
-    Proper support may also need changes in :file:`php.ini`.
diff --git a/#pma/doc/make.bat b/#pma/doc/make.bat
deleted file mode 100644
index c4007118..00000000
--- a/#pma/doc/make.bat
+++ /dev/null
@@ -1,242 +0,0 @@
-@ECHO OFF
-
-REM Command file for Sphinx documentation
-
-if "%SPHINXBUILD%" == "" (
-	set SPHINXBUILD=sphinx-build
-)
-set BUILDDIR=_build
-set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% .
-set I18NSPHINXOPTS=%SPHINXOPTS% .
-if NOT "%PAPER%" == "" (
-	set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS%
-	set I18NSPHINXOPTS=-D latex_paper_size=%PAPER% %I18NSPHINXOPTS%
-)
-
-if "%1" == "" goto help
-
-if "%1" == "help" (
-	:help
-	echo.Please use `make ^<target^>` where ^<target^> is one of
-	echo.  html       to make standalone HTML files
-	echo.  dirhtml    to make HTML files named index.html in directories
-	echo.  singlehtml to make a single large HTML file
-	echo.  pickle     to make pickle files
-	echo.  json       to make JSON files
-	echo.  htmlhelp   to make HTML files and a HTML help project
-	echo.  qthelp     to make HTML files and a qthelp project
-	echo.  devhelp    to make HTML files and a Devhelp project
-	echo.  epub       to make an epub
-	echo.  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter
-	echo.  text       to make text files
-	echo.  man        to make manual pages
-	echo.  texinfo    to make Texinfo files
-	echo.  gettext    to make PO message catalogs
-	echo.  changes    to make an overview over all changed/added/deprecated items
-	echo.  xml        to make Docutils-native XML files
-	echo.  pseudoxml  to make pseudoxml-XML files for display purposes
-	echo.  linkcheck  to check all external links for integrity
-	echo.  doctest    to run all doctests embedded in the documentation if enabled
-	goto end
-)
-
-if "%1" == "clean" (
-	for /d %%i in (%BUILDDIR%\*) do rmdir /q /s %%i
-	del /q /s %BUILDDIR%\*
-	goto end
-)
-
-
-%SPHINXBUILD% 2> nul
-if errorlevel 9009 (
-	echo.
-	echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
-	echo.installed, then set the SPHINXBUILD environment variable to point
-	echo.to the full path of the 'sphinx-build' executable. Alternatively you
-	echo.may add the Sphinx directory to PATH.
-	echo.
-	echo.If you don't have Sphinx installed, grab it from
-	echo.http://sphinx-doc.org/
-	exit /b 1
-)
-
-if "%1" == "html" (
-	%SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The HTML pages are in %BUILDDIR%/html.
-	goto end
-)
-
-if "%1" == "dirhtml" (
-	%SPHINXBUILD% -b dirhtml %ALLSPHINXOPTS% %BUILDDIR%/dirhtml
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The HTML pages are in %BUILDDIR%/dirhtml.
-	goto end
-)
-
-if "%1" == "singlehtml" (
-	%SPHINXBUILD% -b singlehtml %ALLSPHINXOPTS% %BUILDDIR%/singlehtml
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The HTML pages are in %BUILDDIR%/singlehtml.
-	goto end
-)
-
-if "%1" == "pickle" (
-	%SPHINXBUILD% -b pickle %ALLSPHINXOPTS% %BUILDDIR%/pickle
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished; now you can process the pickle files.
-	goto end
-)
-
-if "%1" == "json" (
-	%SPHINXBUILD% -b json %ALLSPHINXOPTS% %BUILDDIR%/json
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished; now you can process the JSON files.
-	goto end
-)
-
-if "%1" == "htmlhelp" (
-	%SPHINXBUILD% -b htmlhelp %ALLSPHINXOPTS% %BUILDDIR%/htmlhelp
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished; now you can run HTML Help Workshop with the ^
-.hhp project file in %BUILDDIR%/htmlhelp.
-	goto end
-)
-
-if "%1" == "qthelp" (
-	%SPHINXBUILD% -b qthelp %ALLSPHINXOPTS% %BUILDDIR%/qthelp
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished; now you can run "qcollectiongenerator" with the ^
-.qhcp project file in %BUILDDIR%/qthelp, like this:
-	echo.^> qcollectiongenerator %BUILDDIR%\qthelp\phpMyAdmin.qhcp
-	echo.To view the help file:
-	echo.^> assistant -collectionFile %BUILDDIR%\qthelp\phpMyAdmin.ghc
-	goto end
-)
-
-if "%1" == "devhelp" (
-	%SPHINXBUILD% -b devhelp %ALLSPHINXOPTS% %BUILDDIR%/devhelp
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished.
-	goto end
-)
-
-if "%1" == "epub" (
-	%SPHINXBUILD% -b epub %ALLSPHINXOPTS% %BUILDDIR%/epub
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The epub file is in %BUILDDIR%/epub.
-	goto end
-)
-
-if "%1" == "latex" (
-	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished; the LaTeX files are in %BUILDDIR%/latex.
-	goto end
-)
-
-if "%1" == "latexpdf" (
-	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
-	cd %BUILDDIR%/latex
-	make all-pdf
-	cd %BUILDDIR%/..
-	echo.
-	echo.Build finished; the PDF files are in %BUILDDIR%/latex.
-	goto end
-)
-
-if "%1" == "latexpdfja" (
-	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
-	cd %BUILDDIR%/latex
-	make all-pdf-ja
-	cd %BUILDDIR%/..
-	echo.
-	echo.Build finished; the PDF files are in %BUILDDIR%/latex.
-	goto end
-)
-
-if "%1" == "text" (
-	%SPHINXBUILD% -b text %ALLSPHINXOPTS% %BUILDDIR%/text
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The text files are in %BUILDDIR%/text.
-	goto end
-)
-
-if "%1" == "man" (
-	%SPHINXBUILD% -b man %ALLSPHINXOPTS% %BUILDDIR%/man
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The manual pages are in %BUILDDIR%/man.
-	goto end
-)
-
-if "%1" == "texinfo" (
-	%SPHINXBUILD% -b texinfo %ALLSPHINXOPTS% %BUILDDIR%/texinfo
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The Texinfo files are in %BUILDDIR%/texinfo.
-	goto end
-)
-
-if "%1" == "gettext" (
-	%SPHINXBUILD% -b gettext %I18NSPHINXOPTS% %BUILDDIR%/locale
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The message catalogs are in %BUILDDIR%/locale.
-	goto end
-)
-
-if "%1" == "changes" (
-	%SPHINXBUILD% -b changes %ALLSPHINXOPTS% %BUILDDIR%/changes
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.The overview file is in %BUILDDIR%/changes.
-	goto end
-)
-
-if "%1" == "linkcheck" (
-	%SPHINXBUILD% -b linkcheck %ALLSPHINXOPTS% %BUILDDIR%/linkcheck
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Link check complete; look for any errors in the above output ^
-or in %BUILDDIR%/linkcheck/output.txt.
-	goto end
-)
-
-if "%1" == "doctest" (
-	%SPHINXBUILD% -b doctest %ALLSPHINXOPTS% %BUILDDIR%/doctest
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Testing of doctests in the sources finished, look at the ^
-results in %BUILDDIR%/doctest/output.txt.
-	goto end
-)
-
-if "%1" == "xml" (
-	%SPHINXBUILD% -b xml %ALLSPHINXOPTS% %BUILDDIR%/xml
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The XML files are in %BUILDDIR%/xml.
-	goto end
-)
-
-if "%1" == "pseudoxml" (
-	%SPHINXBUILD% -b pseudoxml %ALLSPHINXOPTS% %BUILDDIR%/pseudoxml
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The pseudo-XML files are in %BUILDDIR%/pseudoxml.
-	goto end
-)
-
-:end
diff --git a/#pma/doc/other.rst b/#pma/doc/other.rst
deleted file mode 100644
index 61e83acc..00000000
--- a/#pma/doc/other.rst
+++ /dev/null
@@ -1,18 +0,0 @@
-Other sources of information
-============================
-
-Printed Book
-------------
-
-The definitive guide to using phpMyAdmin is the book Mastering phpMyAdmin for
-Effective MySQL Management by Marc Delisle. You can get information on that
-book and other officially endorsed `books at the phpMyAdmin site`_.
-
-.. _books at the phpMyAdmin site: https://www.phpmyadmin.net/docs/
-
-Tutorials
----------
-
-Third party tutorials and articles are listed on our `wiki page`_.
-
-.. _wiki page: https://wiki.phpmyadmin.net/pma/Articles
diff --git a/#pma/doc/privileges.rst b/#pma/doc/privileges.rst
deleted file mode 100644
index 6a7b8c37..00000000
--- a/#pma/doc/privileges.rst
+++ /dev/null
@@ -1,74 +0,0 @@
-User management
-===============
-
-User management is the process of controlling which users are allowed to
-connect to the MySQL server and what permissions they have on each database.
-phpMyAdmin does not handle user management, rather it passes the username and
-password on to MySQL, which then determines whether a user is permitted to
-perform a particular action. Within phpMyAdmin, administrators have full
-control over creating users, viewing and editing privileges for existing users,
-and removing users.
-
-Within phpMyAdmin, user management is controlled via the :guilabel:`Users` link
-from the main page. Users can be created, edited, and removed.
-
-Creating a new user
--------------------
-
-To create a new user, click the :guilabel:`Add a new user` link near the bottom
-of the :guilabel:`Users` page (you must be a "superuser", e.g., user "root").
-Use the textboxes and drop-downs to configure the user to your particular
-needs. You can then select whether to create a database for that user and grant
-specific global privileges. Once you've created the user (by clicking Go), you
-can define that user's permissions on a specific database (don't grant global
-privileges in that case). In general, users do not need any global privileges
-(other than USAGE), only permissions for their specific database.
-
-Editing an existing user
-------------------------
-
-To edit an existing user, simply click the pencil icon to the right of that
-user in the :guilabel:`Users` page. You can then edit their global- and
-database-specific privileges, change their password, or even copy those
-privileges to a new user.
-
-Deleting a user
----------------
-
-From the :guilabel:`Users` page, check the checkbox for the user you wish to
-remove, select whether or not to also remove any databases of the same name (if
-they exist), and click Go.
-
-Assigning privileges to user for a specific database
-----------------------------------------------------
-
-Users are assigned to databases by editing the user record (from the
-:guilabel:`Users` link on the home page) not from within the :guilabel:`Users`
-link under the table. If you are creating a user specifically for a given table
-you will have to create the user first (with no global privileges) and then go
-back and edit that user to add the table and privileges for the individual
-table.
-
-.. _configurablemenus:
-
-Configurable menus and user groups
-----------------------------------
-
-By enabling :config:option:`$cfg['Servers'][$i]['usergroups']` and
-:config:option:`$cfg['Servers'][$i]['usergroups']` you can customize what users
-will see in the phpMyAdmin navigation.
-
-.. warning::
-
-    This feature only limits what a user sees, he is still able to use all the
-    functions. So this can not be considered as a security limitation. Should
-    you want to limit what users can do, use MySQL privileges to achieve that.
-
-With this feature enabled, the :guilabel:`User accounts` management interface gains 
-a second tab for managing :guilabel:`User groups`, where you can define what each
-group will view (see image below) and you can then assign each user to one of
-these groups. Users will be presented with a simplified user interface, which might be
-useful for inexperienced users who could be overwhelmed by all the features
-phpMyAdmin provides.
-
-.. image:: images/usergroups.png
diff --git a/#pma/doc/require.rst b/#pma/doc/require.rst
deleted file mode 100644
index 4e3c7ec7..00000000
--- a/#pma/doc/require.rst
+++ /dev/null
@@ -1,59 +0,0 @@
-.. _require:
-
-Requirements
-============
-
-Web server
-----------
-
-Since phpMyAdmin's interface is based entirely in your browser, you'll need a
-web server (such as Apache, nginx, :term:`IIS`) to install phpMyAdmin's files into.
-
-PHP
----
-
-* You need PHP 5.5.0 or newer, with ``session`` support, the Standard PHP Library
-  (SPL) extension, JSON support, and the ``mbstring`` extension.
-
-* To support uploading of ZIP files, you need the PHP ``zip`` extension.
-
-* You need GD2 support in PHP to display inline thumbnails of JPEGs
-  ("image/jpeg: inline") with their original aspect ratio.
-
-* When using the cookie authentication (the default), the `openssl
-  <https://www.php.net/openssl>`_ extension is strongly suggested.
-
-* To support upload progress bars, see :ref:`faq2_9`.
-
-* To support XML and Open Document Spreadsheet importing, you need the
-  `libxml <https://www.php.net/libxml>`_ extension.
-
-* To support reCAPTCHA on the login page, you need the
-  `openssl <https://www.php.net/openssl>`_ extension.
-
-* To support displaying phpMyAdmin's latest version, you need to enable
-  ``allow_url_open`` in your :file:`php.ini` or to have the
-  `curl <https://www.php.net/curl>`_ extension.
-
-* Performance suggestion: install the ``ctype`` extension.
-
-.. seealso:: :ref:`faq1_31`, :ref:`authentication_modes`
-
-Database
---------
-
-phpMyAdmin supports MySQL-compatible databases.
-
-* MySQL 5.5 or newer
-* MariaDB 5.5 or newer
-
-.. seealso:: :ref:`faq1_17`
-
-Web browser
------------
-
-To access phpMyAdmin you need a web browser with cookies and JavaScript
-enabled.
-
-You need browser which is supported by jQuery 2.0, see
-<https://jquery.com/browser-support/>.
diff --git a/#pma/doc/setup.rst b/#pma/doc/setup.rst
deleted file mode 100644
index 0d812542..00000000
--- a/#pma/doc/setup.rst
+++ /dev/null
@@ -1,819 +0,0 @@
-.. _setup:
-
-Installation
-============
-
-phpMyAdmin does not apply any special security methods to the MySQL
-database server. It is still the system administrator's job to grant
-permissions on the MySQL databases properly. phpMyAdmin's :guilabel:`Users`
-page can be used for this.
-
-.. warning::
-
-    :term:`Mac` users should note that if you are on a version before
-    :term:`Mac OS X`, StuffIt unstuffs with :term:`Mac` formats. So you'll have
-    to resave as in BBEdit to Unix style ALL phpMyAdmin scripts before
-    uploading them to your server, as PHP seems not to like :term:`Mac`-style
-    end of lines character ("``\r``").
-
-Linux distributions
-+++++++++++++++++++
-
-phpMyAdmin is included in most Linux distributions. It is recommended to use
-distribution packages when possible - they usually provide integration to your
-distribution and you will automatically get security updates from your distribution.
-
-
-Debian
-------
-
-Debian's package repositories include a phpMyAdmin package, but be aware that
-the configuration file is maintained in ``/etc/phpmyadmin`` and may differ in
-some ways from the official phpMyAdmin documentation.
-
-OpenSUSE
---------
-
-OpenSUSE already comes with phpMyAdmin package, just install packages from
-the `openSUSE Build Service <https://software.opensuse.org/package/phpMyAdmin>`_.
-
-Ubuntu
-------
-
-Ubuntu ships phpMyAdmin package, however if you want to use recent version, you
-can use packages from
-`PPA for Michal Čihař <https://launchpad.net/~nijel/+archive/phpmyadmin>`_.
-
-Gentoo
-------
-
-Gentoo ships the phpMyAdmin package, both in a near stock configuration as well
-as in a ``webapp-config`` configuration. Use ``emerge dev-db/phpmyadmin`` to
-install.
-
-Mandriva
---------
-
-Mandriva ships the phpMyAdmin package in their ``contrib`` branch and can be
-installed via the usual Control Center.
-
-Fedora
-------
-
-Fedora ships the phpMyAdmin package, but be aware that the configuration file
-is maintained in ``/etc/phpMyAdmin/`` and may differ in some ways from the
-official phpMyAdmin documentation.
-
-Red Hat Enterprise Linux
-------------------------
-
-Red Hat Enterprise Linux itself and thus derivatives like CentOS don't
-ship phpMyAdmin, but the Fedora-driven repository
-`Extra Packages for Enterprise Linux (EPEL) <https://fedoraproject.org/wiki/EPEL>`_
-is doing so, if it's
-`enabled <https://fedoraproject.org/wiki/EPEL/FAQ#howtouse>`_.
-But be aware that the configuration file is maintained in
-``/etc/phpMyAdmin/`` and may differ in some ways from the
-official phpMyAdmin documentation.
-
-
-Installing on Windows
-+++++++++++++++++++++
-
-The easiest way to get phpMyAdmin on Windows is using third party products
-which include phpMyAdmin together with a database and web server such as
-`XAMPP <https://www.apachefriends.org/>`_.
-
-You can find more of such options at `Wikipedia <https://en.wikipedia.org/wiki/List_of_AMP_packages>`_.
-
-
-Installing using Composer
-+++++++++++++++++++++++++
-
-You can install phpMyAdmin using `Composer <https://getcomposer.org/>`_,
-however it's currently not available in the default
-`Packagist <https://packagist.org/>`_ repository due to its technical
-limitations.
-
-The installation is possible by adding our own repository
-<https://www.phpmyadmin.net/packages.json>:
-
-.. code-block:: sh
-
-    composer create-project phpmyadmin/phpmyadmin --repository-url=https://www.phpmyadmin.net/packages.json --no-dev
-
-Installing using Docker
-+++++++++++++++++++++++
-
-phpMyAdmin comes with a Docker image, which you can easily deploy. You can
-download it using:
-
-.. code-block:: sh
-
-    docker pull phpmyadmin/phpmyadmin
-
-The phpMyAdmin server will be executed on port 80. It supports several ways of
-configuring the link to the database server, which you can manage using
-environment variables:
-
-.. envvar:: PMA_ARBITRARY
-
-    Allows you to enter database server hostname on login form (see
-    :config:option:`$cfg['AllowArbitraryServer']`).
-
-.. envvar:: PMA_HOST
-    
-    Host name or IP address of the database server to use.
-
-.. envvar:: PMA_HOSTS
-    
-    Comma separated host names or IP addresses of the database servers to use.
-
-.. envvar:: PMA_USER
-    
-    User name to use for :ref:`auth_config`.
-
-.. envvar:: PMA_PASSWORD
-    
-    Password to use for :ref:`auth_config`.
-
-.. envvar:: PMA_PORT
-    
-    Port of the databse server to use.
-
-.. envvar:: PMA_ABSOLUTE_URI
-   
-    The fully-qualified path (``https://pma.example.net/``) where the reverse
-    proxy makes phpMyAdmin available.
-
-By default, :ref:`cookie` is used, but if :envvar:`PMA_USER` and
-:envvar:`PMA_PASSWORD` are set, it is switched to :ref:`auth_config`.
-
-.. note::
-
-    The credentials you need to login are stored in the MySQL server, in case
-    of Docker image there are various ways to set it (for example
-    :envvar:`MYSQL_ROOT_PASSWORD` when starting MySQL container). Please check 
-    documentation for `MariaDB container <https://hub.docker.com/r/_/mariadb/>`_
-    or `MySQL container <https://hub.docker.com/r/_/mysql/>`_.
-
-Additionally configuration can be tweaked by :file:`/www/config.user.inc.php`. If
-this file exists, it will be loaded after configuration generated from above
-environment variables, so you can override any configuration variable. This
-configuraiton can be added as a volume when invoking docker using 
-`-v /some/local/directory/config.user.inc.php:/www/config.user.inc.php` parameters.
-
-.. seealso:: 
-   
-    See :ref:`config` for detailed description of configuration options.
-
-Docker Volumes
---------------
-
-You can use following volumes to customise image behavior:
-
-:file:`/www/config.user.inc.php`
-
-    Can be used for additional settings, see previous chapter for more details.
-
-:file:`/sessions/`
-
-    Directory where PHP sessions are stored. You might want to share this 
-    for example when uswing :ref:`auth_signon`.
-
-Docker Examples
----------------
-
-To connect phpMyAdmin to given server use:
-
-.. code-block:: sh
-
-    docker run --name myadmin -d -e PMA_HOST=dbhost -p 8080:80 phpmyadmin/phpmyadmin
-
-To connect phpMyAdmin to more servers use:
-
-.. code-block:: sh
-
-    docker run --name myadmin -d -e PMA_HOSTS=dbhost1,dbhost2,dbhost3 -p 8080:80 phpmyadmin/phpmyadmin
-
-To use arbitrary server option:
-
-.. code-block:: sh
-
-    docker run --name myadmin -d --link mysql_db_server:db -p 8080:80 -e PMA_ARBITRARY=1 phpmyadmin/phpmyadmin
-
-You can also link the database container using Docker:
-
-.. code-block:: sh
-
-    docker run --name phpmyadmin -d --link mysql_db_server:db -p 8080:80 phpmyadmin/phpmyadmin
-
-Running with additional configration:
-
-.. code-block:: sh
-
-    docker run --name phpmyadmin -d --link mysql_db_server:db -p 8080:80 -v /some/local/directory/config.user.inc.php:/config.user.inc.php phpmyadmin/phpmyadmin
-
-Using docker-compose
---------------------
-
-Alternatively you can also use docker-compose with the docker-compose.yml from
-<https://github.com/phpmyadmin/docker>.  This will run phpMyAdmin with
-arbitrary server - allowing you to specify MySQL/MariaDB server on login page.
-
-.. code-block:: sh
-
-    docker-compose up -d
-
-.. _quick_install:
-
-Quick Install
-+++++++++++++
-
-#. Choose an appropriate distribution kit from the phpmyadmin.net
-   Downloads page. Some kits contain only the English messages, others
-   contain all languages. We'll assume you chose a kit whose name
-   looks like ``phpMyAdmin-x.x.x -all-languages.tar.gz``.
-#. Ensure you have downloaded a genuine archive, see :ref:`verify`.
-#. Untar or unzip the distribution (be sure to unzip the subdirectories):
-   ``tar -xzvf phpMyAdmin_x.x.x-all-languages.tar.gz`` in your
-   webserver's document root. If you don't have direct access to your
-   document root, put the files in a directory on your local machine,
-   and, after step 4, transfer the directory on your web server using,
-   for example, ftp.
-#. Ensure that all the scripts have the appropriate owner (if PHP is
-   running in safe mode, having some scripts with an owner different from
-   the owner of other scripts will be a problem). See :ref:`faq4_2` and
-   :ref:`faq1_26` for suggestions.
-#. Now you must configure your installation. There are two methods that
-   can be used. Traditionally, users have hand-edited a copy of
-   :file:`config.inc.php`, but now a wizard-style setup script is provided
-   for those who prefer a graphical installation. Creating a
-   :file:`config.inc.php` is still a quick way to get started and needed for
-   some advanced features.
-
-
-Manually creating the file
---------------------------
-
-To manually create the file, simply use your text editor to create the
-file :file:`config.inc.php` (you can copy :file:`config.sample.inc.php` to get
-a minimal configuration file) in the main (top-level) phpMyAdmin
-directory (the one that contains :file:`index.php`). phpMyAdmin first
-loads :file:`libraries/config.default.php` and then overrides those values
-with anything found in :file:`config.inc.php`. If the default value is
-okay for a particular setting, there is no need to include it in
-:file:`config.inc.php`. You'll probably need only a few directives to get going; a
-simple configuration may look like this:
-
-.. code-block:: xml+php
-
-
-    <?php
-    // use here a value of your choice at least 32 chars long
-    $cfg['blowfish_secret'] = '1{dd0`<Q),5XP_:R9UK%%8\"EEcyH#{o';
-
-    $i=0;
-    $i++;
-    $cfg['Servers'][$i]['auth_type']     = 'cookie';
-    ?>
-
-Or, if you prefer to not be prompted every time you log in:
-
-.. code-block:: xml+php
-
-
-    <?php
-
-    $i=0;
-    $i++;
-    $cfg['Servers'][$i]['user']          = 'root';
-    $cfg['Servers'][$i]['password']      = 'cbb74bc'; // use here your password
-    $cfg['Servers'][$i]['auth_type']     = 'config';
-    ?>
-
-For a full explanation of possible configuration values, see the
-:ref:`config` of this document.
-
-.. index:: Setup script
-
-.. _setup_script:
-
-Using Setup script
-------------------
-
-Instead of manually editing :file:`config.inc.php`, you can use phpMyAdmin's 
-setup feature. First you must manually create a folder ``config``
-in the phpMyAdmin directory. This is a security measure. On a
-Linux/Unix system you can use the following commands:
-
-.. code-block:: sh
-
-
-    cd phpMyAdmin
-    mkdir config                        # create directory for saving
-    chmod o+rw config                   # give it world writable permissions
-
-And to edit an existing configuration, copy it over first:
-
-.. code-block:: sh
-
-
-    cp config.inc.php config/           # copy current configuration for editing
-    chmod o+w config/config.inc.php     # give it world writable permissions
-
-.. note::
-
-    Debian and Ubuntu have simplified this setup and all you need to do is to
-    execute :program:`/usr/sbin/pma-configure`.
-
-On other platforms, simply create the folder and ensure that your web
-server has read and write access to it. :ref:`faq1_26` can help with
-this.
-
-Next, open your browser and visit the location where you installed phpMyAdmin, with the ``/setup`` suffix. If you have an existing configuration,
-use the ``Load`` button to bring its content inside the setup panel.
-Note that **changes are not saved to disk until you explicitly choose ``Save``**
-from the *Configuration* area of the screen. Normally the script saves the new
-:file:`config.inc.php` to the ``config/`` directory, but if the webserver does
-not have the proper permissions you may see the error "Cannot load or
-save configuration." Ensure that the ``config/`` directory exists and
-has the proper permissions - or use the ``Download`` link to save the
-config file locally and upload it (via FTP or some similar means) to the
-proper location.
-
-Once the file has been saved, it must be moved out of the ``config/``
-directory and the permissions must be reset, again as a security
-measure:
-
-.. code-block:: sh
-
-
-    mv config/config.inc.php .         # move file to current directory
-    chmod o-rw config.inc.php          # remove world read and write permissions
-    rm -rf config                      # remove not needed directory
-
-.. note::
-
-    Debian and Ubuntu have simplified this setup and all you need to do is to
-    execute :program:`/usr/sbin/pma-secure`.
-
-Now the file is ready to be used. You can choose to review or edit the
-file with your favorite editor, if you prefer to set some advanced
-options which the setup script does not provide.
-
-#. If you are using the ``auth_type`` "config", it is suggested that you
-   protect the phpMyAdmin installation directory because using config
-   does not require a user to enter a password to access the phpMyAdmin
-   installation. Use of an alternate authentication method is
-   recommended, for example with HTTP–AUTH in a :term:`.htaccess` file or switch to using
-   ``auth_type`` cookie or http. See the :ref:`faqmultiuser`
-   for additional information, especially :ref:`faq4_4`.
-#. Open the `main phpMyAdmin directory <index.php>`_ in your browser.
-   phpMyAdmin should now display a welcome screen and your databases, or
-   a login dialog if using :term:`HTTP` or
-   cookie authentication mode.
-#. You should deny access to the ``./libraries`` and ``./setup/lib``
-   subfolders in your webserver configuration.
-   Such configuration prevents from possible
-   path exposure and cross side scripting vulnerabilities that might
-   happen to be found in that code. For the Apache webserver, this is
-   often accomplished with a :term:`.htaccess` file in those directories.
-#. It is generally a good idea to protect a public phpMyAdmin installation
-   against access by robots as they usually can not do anything good
-   there. You can do this using ``robots.txt`` file in root of your
-   webserver or limit access by web server configuration, see
-   :ref:`faq1_42`.
-
-
-.. _verify:
-
-Verifying phpMyAdmin releases
-+++++++++++++++++++++++++++++
-
-Since July 2015 all phpMyAdmin releases are cryptographically signed by the
-releasing developer, who through January 2016 was Marc Delisle. His key id is
-0xFEFC65D181AF644A, his PGP fingerprint is:
-
-.. code-block:: console
-
-    436F F188 4B1A 0C3F DCBF 0D79 FEFC 65D1 81AF 644A
-
-and you can get more identification information from <https://keybase.io/lem9>.
-
-Beginning in January 2016, the release manager is Isaac Bennetch. His key id is
-0xCE752F178259BD92, and his PGP fingerprint is:
-
-.. code-block:: console
-
-    3D06 A59E CE73 0EB7 1B51 1C17 CE75 2F17 8259 BD92
-
-and you can get more identification information from <https://keybase.io/ibennetch>.
-
-Some additional downloads (for example themes) might be signed by Michal Čihař. His key id is
-0x9C27B31342B7511D, and his PGP fingerprint is:
-
-.. code-block:: console
-
-    63CB 1DF1 EF12 CF2A C0EE 5A32 9C27 B313 42B7 511D
-
-and you can get more identification information from <https://keybase.io/nijel>.
-
-You should verify that the signature matches
-the archive you have downloaded. This way you can be sure that you are using
-the same code that was released.
-
-Each archive is accompanied with ``.asc`` files which contains the PGP signature
-for it. Once you have both of them in the same folder, you can verify the signature:
-
-.. code-block:: console
-
-    $ gpg --verify phpMyAdmin-4.5.4.1-all-languages.zip.asc
-    gpg: Signature made Fri 29 Jan 2016 08:59:37 AM EST using RSA key ID 8259BD92
-    gpg: Can't check signature: public key not found
-
-As you can see gpg complains that it does not know the public key. At this
-point you should do one of the following steps:
-
-* Download the keyring from `our download server <https://files.phpmyadmin.net/phpmyadmin.keyring>`_, then import it with:
-
-.. code-block:: console
-
-   $ gpg --import phpmyadmin.keyring
-
-* Download and import the key from one of the key servers:
-
-.. code-block:: console
-
-    $ gpg --keyserver hkp://pgp.mit.edu --recv-keys 3D06A59ECE730EB71B511C17CE752F178259BD92
-    gpg: requesting key 8259BD92 from hkp server pgp.mit.edu
-    gpg: key 8259BD92: public key "Isaac Bennetch <bennetch@gmail.com>" imported
-    gpg: no ultimately trusted keys found
-    gpg: Total number processed: 1
-    gpg:               imported: 1  (RSA: 1)
-
-This will improve the situation a bit - at this point you can verify that the
-signature from the given key is correct but you still can not trust the name used
-in the key:
-
-.. code-block:: console
-
-    $ gpg --verify phpMyAdmin-4.5.4.1-all-languages.zip.asc
-    gpg: Signature made Fri 29 Jan 2016 08:59:37 AM EST using RSA key ID 8259BD92
-    gpg: Good signature from "Isaac Bennetch <bennetch@gmail.com>"
-    gpg:                 aka "Isaac Bennetch <isaac@bennetch.org>"
-    gpg: WARNING: This key is not certified with a trusted signature!
-    gpg:          There is no indication that the signature belongs to the owner.
-    Primary key fingerprint: 3D06 A59E CE73 0EB7 1B51  1C17 CE75 2F17 8259 BD92
-
-The problem here is that anybody could issue the key with this name.  You need to
-ensure that the key is actually owned by the mentioned person.  The GNU Privacy
-Handbook covers this topic in the chapter `Validating other keys on your public
-keyring`_. The most reliable method is to meet the developer in person and
-exchange key fingerprints, however you can also rely on the web of trust. This way
-you can trust the key transitively though signatures of others, who have met
-the developer in person. For example you can see how `Isaac's key links to
-Linus's key`_.
-
-Once the key is trusted, the warning will not occur:
-
-.. code-block:: console
-
-    $ gpg --verify phpMyAdmin-4.5.4.1-all-languages.zip.asc
-    gpg: Signature made Fri 29 Jan 2016 08:59:37 AM EST using RSA key ID 8259BD92
-    gpg: Good signature from "Isaac Bennetch <bennetch@gmail.com>" [full]
-
-Should the signature be invalid (the archive has been changed), you would get a
-clear error regardless of the fact that the key is trusted or not:
-
-.. code-block:: console
-
-    $ gpg --verify phpMyAdmin-4.5.4.1-all-languages.zip.asc
-    gpg: Signature made Fri 29 Jan 2016 08:59:37 AM EST using RSA key ID 8259BD92
-    gpg: BAD signature from "Isaac Bennetch <bennetch@gmail.com>" [unknown]
-
-.. _Validating other keys on your public keyring: https://www.gnupg.org/gph/en/manual.html#AEN335
-
-.. _Isaac's key links to Linus's key: https://pgp.cs.uu.nl/mk_path.cgi?FROM=ABAF11C65A2970B130ABE3C479BE3E4300411886&TO=3D06A59ECE730EB71B511C17CE752F178259BD92
-
-
-.. index::
-    single: Configuration storage
-    single: phpMyAdmin configuration storage
-    single: pmadb
-
-.. _linked-tables:
-
-phpMyAdmin configuration storage
-++++++++++++++++++++++++++++++++
-
-For a whole set of additional features (bookmarks, comments, :term:`SQL`-history,
-tracking mechanism, :term:`PDF`-generation, column contents transformation,
-etc.) you need to create a set of special tables.  Those tables can be located
-in your own database, or in a central database for a multi-user installation
-(this database would then be accessed by the controluser, so no other user
-should have rights to it).
-
-Zero configuration
-------------------
-
-In many cases, this database structure can be automatically created and
-configured. This is called “Zero Configuration” mode and can be particularly
-useful in shared hosting situations. “Zeroconf” mode is on by default, to
-disable set :config:option:`$cfg['ZeroConf']` to false.
-
-The following three scenarios are covered by the Zero Configuration mode:
-
-* When entering a database where the configuration storage tables are not
-  present, phpMyAdmin offers to create them from the Operations tab.
-* When entering a database where the tables do already exist, the software
-  automatically detects this and begins using them. This is the most common
-  situation; after the tables are initially created automatically they are
-  continually used without disturbing the user; this is also most useful on
-  shared hosting where the user is not able to edit :file:`config.inc.php` and
-  usually the user only has access to one database.
-* When having access to multiple databases, if the user first enters the
-  database containing the configuration storage tables then switches to
-  another database,
-  phpMyAdmin continues to use the tables from the first database; the user is
-  not prompted to create more tables in the new database.
-
-
-Manual configuration
---------------------
-
-Please look at your ``./sql/`` directory, where you should find a
-file called *create\_tables.sql*. (If you are using a Windows server,
-pay special attention to :ref:`faq1_23`).
-
-If you already had this infrastructure and:
-
-* upgraded to MySQL 4.1.2 or newer, please use
-  :file:`sql/upgrade_tables_mysql_4_1_2+.sql`.
-* upgraded to phpMyAdmin 4.3.0 or newer from 2.5.0 or newer (<= 4.2.x),
-  please use :file:`sql/upgrade_column_info_4_3_0+.sql`.
-
-and then create new tables by importing :file:`sql/create_tables.sql`.
-
-You can use your phpMyAdmin to create the tables for you. Please be
-aware that you may need special (administrator) privileges to create
-the database and tables, and that the script may need some tuning,
-depending on the database name.
-
-After having imported the :file:`sql/create_tables.sql` file, you
-should specify the table names in your :file:`config.inc.php` file. The
-directives used for that can be found in the :ref:`config`.
-
-You will also need to have a controluser
-(:config:option:`$cfg['Servers'][$i]['controluser']` and
-:config:option:`$cfg['Servers'][$i]['controlpass']` settings)
-with the proper rights to those tables. For example you can create it
-using following statement:
-
-.. code-block:: mysql
-
-   GRANT SELECT, INSERT, UPDATE, DELETE ON <pma_db>.* TO 'pma'@'localhost'  IDENTIFIED BY 'pmapass';
-
-.. _upgrading:
-
-Upgrading from an older version
-+++++++++++++++++++++++++++++++
-
-.. warning::
-
-    **Never** extract the new version over an existing installation of
-    phpMyAdmin, always first remove the old files keeping just the
-    configuration.
-
-    This way you will not leave old no longer working code in the directory,
-    which can have severe security implications or can cause various breakages.
-
-
-Simply copy :file:`config.inc.php` from your previous installation into
-the newly unpacked one. Configuration files from old versions may
-require some tweaking as some options have been changed or removed.
-For compatibility with PHP 5.3 and later, remove a
-``set_magic_quotes_runtime(0);`` statement that you might find near
-the end of your configuration file.
-
-You should **not** copy :file:`libraries/config.default.php` over
-:file:`config.inc.php` because the default configuration file is version-
-specific.
-
-If you have upgraded your MySQL server from a version previous to 4.1.2 to
-version 5.x or newer and if you use the phpMyAdmin configuration storage, you
-should run the :term:`SQL` script found in
-:file:`sql/upgrade_tables_mysql_4_1_2+.sql`.
-
-If you have upgraded your phpMyAdmin to 4.3.0 or newer from 2.5.0 or
-newer (<= 4.2.x) and if you use the phpMyAdmin configuration storage, you
-should run the :term:`SQL` script found in
-:file:`sql/upgrade_column_info_4_3_0+.sql`.
-
-Do not forget to clear the browser cache and to empty the old session by
-logging out and logging in again.
-
-.. index:: Authentication mode
-
-.. _authentication_modes:
-
-Using authentication modes
-++++++++++++++++++++++++++
-
-:term:`HTTP` and cookie authentication modes are recommended in a **multi-user
-environment** where you want to give users access to their own database and
-don't want them to play around with others. Nevertheless be aware that MS
-Internet Explorer seems to be really buggy about cookies, at least till version
-6. Even in a **single-user environment**, you might prefer to use :term:`HTTP`
-or cookie mode so that your user/password pair are not in clear in the
-configuration file.
-
-:term:`HTTP` and cookie authentication
-modes are more secure: the MySQL login information does not need to be
-set in the phpMyAdmin configuration file (except possibly for the
-:config:option:`$cfg['Servers'][$i]['controluser']`).
-However, keep in mind that the password travels in plain text, unless
-you are using the HTTPS protocol. In cookie mode, the password is
-stored, encrypted with the AES algorithm, in a temporary cookie.
-
-Then each of the *true* users should be granted a set of privileges
-on a set of particular databases. Normally you shouldn't give global
-privileges to an ordinary user, unless you understand the impact of those
-privileges (for example, you are creating a superuser).
-For example, to grant the user *real_user* with all privileges on
-the database *user_base*:
-
-.. code-block:: mysql
-
-   GRANT ALL PRIVILEGES ON user_base.* TO 'real_user'@localhost IDENTIFIED BY 'real_password';
-
-
-What the user may now do is controlled entirely by the MySQL user management
-system. With HTTP or cookie authentication mode, you don't need to fill the
-user/password fields inside the :config:option:`$cfg['Servers']`.
-
-.. index:: pair: HTTP; Authentication mode
-
-HTTP authentication mode
-------------------------
-
-* Uses :term:`HTTP` Basic authentication
-  method and allows you to log in as any valid MySQL user.
-* Is supported with most PHP configurations. For :term:`IIS` (:term:`ISAPI`)
-  support using :term:`CGI` PHP see :ref:`faq1_32`, for using with Apache
-  :term:`CGI` see :ref:`faq1_35`.
-* When PHP is running under Apache's :term:`mod_proxy_fcgi` (e.g. with PHP-FPM),
-  ``Authorization`` headers are not passed to the underlying FCGI application,
-  such that your credentials will not reach the application. In this case, you can
-  add the following configuration directive:
-
-  .. code-block:: apache
-
-     SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1
-
-* See also :ref:`faq4_4` about not using the :term:`.htaccess` mechanism along with
-  ':term:`HTTP`' authentication mode.
-
-.. index:: pair: Cookie; Authentication mode
-
-.. _cookie:
-
-Cookie authentication mode
---------------------------
-
-* Username and password are stored in cookies during the session and password
-  is deleted when it ends.
-* With this mode, the user can truly log out of phpMyAdmin and log
-  back in with the same username.
-* If you want to allow users to enter any hostname to connect (rather than only
-  servers that are configured in :file:`config.inc.php`),
-  see the :config:option:`$cfg['AllowArbitraryServer']` directive.
-* As mentioned in the :ref:`require` section, having the ``mcrypt`` extension will
-  speed up access considerably, but is not required.
-
-.. index:: pair: Signon; Authentication mode
-
-.. _auth_signon:
-
-Signon authentication mode
---------------------------
-
-* This mode is a convenient way of using credentials from another
-  application to authenticate to phpMyAdmin to implement single signon
-  solution.
-* The other application has to store login information into session
-  data (see :config:option:`$cfg['Servers'][$i]['SignonSession']`) or you
-  need to implement script to return the credentials (see
-  :config:option:`$cfg['Servers'][$i]['SignonScript']`).
-* When no credentials are available, the user is being redirected to
-  :config:option:`$cfg['Servers'][$i]['SignonURL']`, where you should handle
-  the login process.
-
-The very basic example of saving credentials in a session is available as
-:file:`examples/signon.php`:
-
-.. literalinclude:: ../examples/signon.php
-    :language: php
-
-Alternatively you can also use this way to integrate with OpenID as shown
-in :file:`examples/openid.php`:
-
-.. literalinclude:: ../examples/openid.php
-    :language: php
-
-If you intend to pass the credentials using some other means than, you have to
-implement wrapper in PHP to get that data and set it to
-:config:option:`$cfg['Servers'][$i]['SignonScript']`. There is very minimal example
-in :file:`examples/signon-script.php`:
-
-.. literalinclude:: ../examples/signon-script.php
-    :language: php
-
-.. seealso::
-    :config:option:`$cfg['Servers'][$i]['auth_type']`,
-    :config:option:`$cfg['Servers'][$i]['SignonSession']`,
-    :config:option:`$cfg['Servers'][$i]['SignonScript']`,
-    :config:option:`$cfg['Servers'][$i]['SignonURL']`
-
-
-.. index:: pair: Config; Authentication mode
-
-.. _auth_config:
-
-Config authentication mode
---------------------------
-
-* This mode is sometimes the less secure one because it requires you to fill the
-  :config:option:`$cfg['Servers'][$i]['user']` and
-  :config:option:`$cfg['Servers'][$i]['password']`
-  fields (and as a result, anyone who can read your :file:`config.inc.php`
-  can discover your username and password).
-* In the :ref:`faqmultiuser` section, there is an entry explaining how
-  to protect your configuration file.
-* For additional security in this mode, you may wish to consider the
-  Host authentication :config:option:`$cfg['Servers'][$i]['AllowDeny']['order']`
-  and :config:option:`$cfg['Servers'][$i]['AllowDeny']['rules']` configuration directives.
-* Unlike cookie and http, does not require a user to log in when first
-  loading the phpMyAdmin site. This is by design but could allow any
-  user to access your installation. Use of some restriction method is
-  suggested, perhaps a :term:`.htaccess` file with the HTTP-AUTH directive or disallowing
-  incoming HTTP requests at one’s router or firewall will suffice (both
-  of which are beyond the scope of this manual but easily searchable
-  with Google).
-
-
-Securing your phpMyAdmin installation
-+++++++++++++++++++++++++++++++++++++
-
-The phpMyAdmin team tries hard to make the application secure, however there
-are always ways to make your installation more secure:
-
-* Serve phpMyAdmin on HTTPS only. Preferably, you should use HSTS as well, so that
-  you're protected from protocol downgrade attacks.
-* Remove the ``test`` directory from phpMyAdmin, unless you are developing and need test suite.
-* Remove the ``setup`` directory from phpMyAdmin, you will probably not
-  use it after the initial setup.
-* Properly choose an authentication method - :ref:`cookie`
-  is probably the best choice for shared hosting.
-* In case you don't want all MySQL users to be able to access
-  phpMyAdmin, you can use :config:option:`$cfg['Servers'][$i]['AllowDeny']['rules']` to limit them.
-* Consider hiding phpMyAdmin behind an authentication proxy, so that
-  users need to authenticate prior to providing MySQL credentials
-  to phpMyAdmin. You can achieve this by configuring your web server to request
-  HTTP authentication. For example in Apache this can be done with:
-    
-  .. code-block:: apache
-
-     AuthType Basic
-     AuthName "Restricted Access"
-     AuthUserFile /usr/share/phpmyadmin/passwd
-     Require valid-user
-
-  Once you have changed the configuration, you need to create a list of users which
-  can authenticate. This can be done using the :program:`htpasswd` utility:
-
-  .. code-block:: sh
-
-     htpasswd -c /usr/share/phpmyadmin/passwd username
-
-* If you are afraid of automated attacks, enabling Captcha by
-  :config:option:`$cfg['CaptchaLoginPublicKey']` and
-  :config:option:`$cfg['CaptchaLoginPrivateKey']` might be an option.
-
-Known issues
-++++++++++++
-
-Users with column-specific privileges are unable to "Browse"
-------------------------------------------------------------
-
-If a user has only column-specific privileges on some (but not all) columns in a table, "Browse"
-will fail with an error message.
-
-As a workaround, a bookmarked query with the same name as the table can be created, this will
-run when using the "Browse" link instead. `Issue 11922 <https://github.com/phpmyadmin/phpmyadmin/issues/11922>`_.
-
-Trouble logging back in after logging out using 'http' authentication
-----------------------------------------------------------------------
-
-When using the 'http' ``auth_type``, it can be impossible to log back in (when the logout comes
-manually or after a period of inactivity). `Issue 11898 <https://github.com/phpmyadmin/phpmyadmin/issues/11898>`_.
diff --git a/#pma/doc/transformations.rst b/#pma/doc/transformations.rst
deleted file mode 100644
index 7b5f1a00..00000000
--- a/#pma/doc/transformations.rst
+++ /dev/null
@@ -1,138 +0,0 @@
-.. _transformations:
-
-Transformations
-===============
-
-.. _transformationsintro:
-
-Introduction
-++++++++++++
-
-To enable transformations, you have to setup the ``column_info``
-table and the proper directives. Please see the :ref:`config` on how to do so.
-
-You can apply different transformations to the contents of each
-column. The transformation will take the content of each column and
-transform it with certain rules defined in the selected
-transformation.
-
-Say you have a column 'filename' which contains a filename. Normally
-you would see in phpMyAdmin only this filename. Using transformations
-you can transform that filename into a HTML link, so you can click
-inside of the phpMyAdmin structure on the column's link and will see
-the file displayed in a new browser window. Using transformation
-options you can also specify strings to append/prepend to a string or
-the format you want the output stored in.
-
-For a general overview of all available transformations and their
-options, you can consult your *<www.your-host.com>/<your-install-
-dir>/transformation\_overview.php* installation.
-
-For a tutorial on how to effectively use transformations, see our
-`Link section <https://www.phpmyadmin.net/home_page/docs.php>`_ on the
-official phpMyAdmin homepage.
-
-.. _transformationshowto:
-
-Usage
-+++++
-
-Go to your *tbl\_structure.php* page (i.e. reached through clicking on
-the 'Structure' link for a table). There click on "Change" (or change
-icon) and there you will see three new fields at the end of the line.
-They are called 'MIME-type', 'Browser transformation' and
-'Transformation options'.
-
-* The field 'MIME-type' is a drop-down field. Select the MIME-type that
-  corresponds to the column's contents. Please note that transformations
-  are inactive as long as no MIME-type is selected.
-* The field 'Browser transformation' is a drop-down field. You can
-  choose from a hopefully growing amount of pre-defined transformations.
-  See below for information on how to build your own transformation.
-  There are global transformations and mimetype-bound transformations.
-  Global transformations can be used for any mimetype. They will take
-  the mimetype, if necessary, into regard. Mimetype-bound
-  transformations usually only operate on a certain mimetype. There are
-  transformations which operate on the main mimetype (like 'image'),
-  which will most likely take the subtype into regard, and those who
-  only operate on a specific subtype (like 'image/jpeg'). You can use
-  transformations on mimetypes for which the function was not defined
-  for. There is no security check for you selected the right
-  transformation, so take care of what the output will be like.
-* The field 'Transformation options' is a free-type textfield. You have
-  to enter transform-function specific options here. Usually the
-  transforms can operate with default options, but it is generally a
-  good idea to look up the overview to see which options are necessary.
-  Much like the ENUM/SET-Fields, you have to split up several options
-  using the format 'a','b','c',...(NOTE THE MISSING BLANKS). This is
-  because internally the options will be parsed as an array, leaving the
-  first value the first element in the array, and so forth. If you want
-  to specify a MIME character set you can define it in the
-  transformation\_options. You have to put that outside of the pre-
-  defined options of the specific mime-transform, as the last value of
-  the set. Use the format "'; charset=XXX'". If you use a transform, for
-  which you can specify 2 options and you want to append a character
-  set, enter "'first parameter','second parameter','charset=us-ascii'".
-  You can, however use the defaults for the parameters: "'','','charset
-  =us-ascii'".
-
-.. _transformationsfiles:
-
-File structure
-++++++++++++++
-
-All specific transformations for mimetypes are defined through class
-files in the directory 'libraries/plugins/transformations/'. Each of
-them extends a certain transformation abstract class declared in
-libraries/plugins/transformations/abstract.
-
-They are stored in files to ease up customization and easy adding of
-new transformations.
-
-Because the user cannot enter own mimetypes, it is kept sure that
-transformations always work. It makes no sense to apply a
-transformation to a mimetype the transform-function doesn't know to
-handle.
-
-There is a file called '*transformations.lib.php*' that provides some
-basic functions which can be included by any other transform function.
-
-The file name convention is ``[Mimetype]_[Subtype]_[Transformation
-Name].class.php``, while the abtract class that it extends has the
-name ``[Transformation Name]TransformationsPlugin``. All of the
-methods that have to be implemented by a transformations plug-in are:
-
-#. getMIMEType() and getMIMESubtype() in the main class;
-#. getName(), getInfo() and applyTransformation() in the abstract class
-   it extends.
-
-The getMIMEType(), getMIMESubtype() and getName() methods return the
-name of the MIME type, MIME Subtype and transformation accordingly.
-getInfo() returns the transformation's description and possible
-options it may receive and applyTransformation() is the method that
-does the actual work of the transformation plug-in.
-
-Please see the libraries/plugins/transformations/TEMPLATE and
-libraries/plugins/transformations/TEMPLATE\_ABSTRACT files for adding
-your own transformation plug-in. You can also generate a new
-transformation plug-in (with or without the abstract transformation
-class), by using
-:file:`scripts/transformations_generator_plugin.sh` or
-:file:`scripts/transformations_generator_main_class.sh`.
-
-The applyTransformation() method always gets passed three variables:
-
-#. **$buffer** - Contains the text inside of the column. This is the
-   text, you want to transform.
-#. **$options** - Contains any user-passed options to a transform
-   function as an array.
-#. **$meta** - Contains an object with information about your column. The
-   data is drawn from the output of the `mysql\_fetch\_field()
-   <https://www.php.net/mysql_fetch_field>`_ function. This means, all
-   object properties described on the `manual page
-   <https://www.php.net/mysql_fetch_field>`_ are available in this
-   variable and can be used to transform a column accordingly to
-   unsigned/zerofill/not\_null/... properties. The $meta->mimetype
-   variable contains the original MIME-type of the column (i.e.
-   'text/plain', 'image/jpeg' etc.)
-
diff --git a/#pma/doc/user.rst b/#pma/doc/user.rst
deleted file mode 100644
index 06a3c9c4..00000000
--- a/#pma/doc/user.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-User Guide
-==========
-
-.. toctree::
-    :maxdepth: 2
-
-    transformations
-    privileges
-    other
-    import_export
diff --git a/#pma/doc/vendors.rst b/#pma/doc/vendors.rst
deleted file mode 100644
index e24f23c6..00000000
--- a/#pma/doc/vendors.rst
+++ /dev/null
@@ -1,35 +0,0 @@
-Distributing and packaging phpMyAdmin
-=====================================
-
-This document is intended to give advices to people who want to
-redistribute phpMyAdmin inside other software package such as Linux
-distribution or some all in one package including web server and MySQL
-server.
-
-Generally you can customize some basic aspects (paths to some files and
-behavior) in :file:`libraries/vendor_config.php`.
-
-For example if you want setup script to generate config file in var, change
-``SETUP_CONFIG_FILE`` to :file:`/var/lib/phpmyadmin/config.inc.php` and you
-will also probably want to skip directory writable check, so set
-``SETUP_DIR_WRITABLE`` to false.
-
-External libraries
-------------------
-
-phpMyAdmin includes several external libraries, you might want to
-replace them with system ones if they are available, but please note
-that you should test whether version you provide is compatible with the
-one we ship.
-
-Currently known list of external libraries:
-
-js/jquery
-    jQuery js framework and various jQuery based libraries.
-
-libraries/php-gettext
-    php-gettext library
-libraries/tcpdf
-    tcpdf library, stripped down of not needed files
-libraries/phpseclib
-    portions of phpseclib library
diff --git a/#pma/error_report.php b/#pma/error_report.php
deleted file mode 100644
index eb77022c..00000000
--- a/#pma/error_report.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Handle error report submission
- *
- * @package PhpMyAdmin
- */
-require_once 'libraries/common.inc.php';
-require_once 'libraries/error_report.lib.php';
-require_once 'libraries/user_preferences.lib.php';
-
-if (!isset($_REQUEST['exception_type'])
-    ||!in_array($_REQUEST['exception_type'], array('js', 'php'))
-) {
-    die('Oops, something went wrong!!');
-}
-
-$response = PMA\libraries\Response::getInstance();
-
-if (isset($_REQUEST['send_error_report'])
-    && ($_REQUEST['send_error_report'] == true
-    || $_REQUEST['send_error_report'] == '1')
-) {
-    if ($_REQUEST['exception_type'] == 'php') {
-        /**
-         * Prevent infinite error submission.
-         * Happens in case error submissions fails.
-         * If reporting is done in some time interval,
-         *  just clear them & clear json data too.
-         */
-        if (isset($_SESSION['prev_error_subm_time'])
-            && isset($_SESSION['error_subm_count'])
-            && $_SESSION['error_subm_count'] >= 3
-            && ($_SESSION['prev_error_subm_time']-time()) <= 3000
-        ) {
-            $_SESSION['error_subm_count'] = 0;
-            $_SESSION['prev_errors'] = '';
-             $response = PMA\libraries\Response::getInstance();
-            $response->addJSON('_stopErrorReportLoop', '1');
-        } else {
-            $_SESSION['prev_error_subm_time'] = time();
-            $_SESSION['error_subm_count'] = (
-                (isset($_SESSION['error_subm_count']))
-                    ? ($_SESSION['error_subm_count']+1)
-                    : (0)
-            );
-        }
-    }
-    $reportData = PMA_getReportData($_REQUEST['exception_type']);
-    // report if and only if there were 'actual' errors.
-    if (count($reportData) > 0) {
-        $server_response = PMA_sendErrorReport($reportData);
-        if ($server_response === false) {
-            $success = false;
-        } else {
-            $decoded_response = json_decode($server_response, true);
-            $success = !empty($decoded_response) ?
-                $decoded_response["success"] : false;
-        }
-
-        /* Message to show to the user */
-        if ($success) {
-            if ((isset($_REQUEST['automatic'])
-                && $_REQUEST['automatic'] === "true")
-                || $GLOBALS['cfg']['SendErrorReports'] == 'always'
-            ) {
-                $msg = __(
-                    'An error has been detected and an error report has been '
-                    . 'automatically submitted based on your settings.'
-                );
-            } else {
-                $msg = __('Thank you for submitting this report.');
-            }
-        } else {
-            $msg = __(
-                'An error has been detected and an error report has been '
-                . 'generated but failed to be sent.'
-            )
-            . ' '
-            . __(
-                'If you experience any '
-                . 'problems please submit a bug report manually.'
-            );
-        }
-        $msg .= ' ' . __('You may want to refresh the page.');
-
-        /* Create message object */
-        if ($success) {
-            $msg = PMA\libraries\Message::notice($msg);
-        } else {
-            $msg = PMA\libraries\Message::error($msg);
-        }
-
-        /* Add message to response */
-        if ($response->isAjax()) {
-            if ($_REQUEST['exception_type'] == 'js') {
-                $response->addJSON('message', $msg);
-            } else {
-                $response->addJSON('_errSubmitMsg', $msg);
-            }
-        } elseif ($_REQUEST['exception_type'] == 'php') {
-            $jsCode = 'PMA_ajaxShowMessage("<div class=\"error\">'
-                    . $msg
-                    . '</div>", false);';
-            $response->getFooter()->getScripts()->addCode($jsCode);
-        }
-
-        if ($_REQUEST['exception_type'] == 'php') {
-            // clear previous errors & save new ones.
-            $GLOBALS['error_handler']->savePreviousErrors();
-        }
-
-        /* Persist always send settings */
-        if (isset($_REQUEST['always_send'])
-            && $_REQUEST['always_send'] === "true"
-        ) {
-            PMA_persistOption("SendErrorReports", "always", "ask");
-        }
-    }
-} elseif (! empty($_REQUEST['get_settings'])) {
-    $response->addJSON('report_setting', $GLOBALS['cfg']['SendErrorReports']);
-} else {
-    if ($_REQUEST['exception_type'] == 'js') {
-        $response->addHTML(PMA_getErrorReportForm());
-    } else {
-        // clear previous errors & save new ones.
-        $GLOBALS['error_handler']->savePreviousErrors();
-    }
-}
diff --git a/#pma/examples/config.manyhosts.inc.php b/#pma/examples/config.manyhosts.inc.php
deleted file mode 100644
index df14e20e..00000000
--- a/#pma/examples/config.manyhosts.inc.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
- * This example configuration shows how to configure phpMyAdmin for
- * many hosts that all have identical configuration otherwise. To add
- * a new host, just drop it into $hosts below. Contributed by
- * Matthew Hawkins.
- *
- * @package    PhpMyAdmin
- * @subpackage Example
- */
-
-$i=0;
-$hosts = array (
-    "foo.example.com",
-    "bar.example.com",
-    "baz.example.com",
-    "quux.example.com",
-);
-
-foreach ($hosts as $host) {
-    $i++;
-    $cfg['Servers'][$i]['host']     = $host;
-    $cfg['Servers'][$i]['port']     = '';
-    $cfg['Servers'][$i]['socket']   = '';
-    $cfg['Servers'][$i]['connect_type']     = 'tcp';
-    $cfg['Servers'][$i]['compress'] = false;
-    $cfg['Servers'][$i]['controluser']      = 'pma';
-    $cfg['Servers'][$i]['controlpass']      = 'pmapass';
-    $cfg['Servers'][$i]['auth_type']        = 'cookie';
-    $cfg['Servers'][$i]['user']     = '';
-    $cfg['Servers'][$i]['password'] = '';
-    $cfg['Servers'][$i]['only_db']  = '';
-    $cfg['Servers'][$i]['verbose']  = '';
-    $cfg['Servers'][$i]['pmadb']    = 'phpmyadmin';
-    $cfg['Servers'][$i]['bookmarktable'] = 'pma__bookmark';
-    $cfg['Servers'][$i]['relation'] = 'pma__relation';
-    $cfg['Servers'][$i]['table_info'] = 'pma__table_info';
-    $cfg['Servers'][$i]['table_coords'] = 'pma__table_coords';
-    $cfg['Servers'][$i]['pdf_pages'] = 'pma__pdf_pages';
-    $cfg['Servers'][$i]['column_info'] = 'pma__column_info';
-    $cfg['Servers'][$i]['history'] = 'pma__history';
-    $cfg['Servers'][$i]['table_uiprefs'] = 'pma__table_uiprefs';
-    $cfg['Servers'][$i]['tracking'] = 'pma__tracking';
-    $cfg['Servers'][$i]['userconfig'] = 'pma__userconfig';
-    $cfg['Servers'][$i]['recent'] = 'pma__recent';
-    $cfg['Servers'][$i]['users'] = 'pma__users';
-    $cfg['Servers'][$i]['usergroups'] = 'pma__usergroups';
-    $cfg['Servers'][$i]['navigationhiding'] = 'pma__navigationhiding';
-    $cfg['Servers'][$i]['savedsearches'] = 'pma__savedsearches';
-    $cfg['Servers'][$i]['central_columns'] = 'pma__central_columns';
-    $cfg['Servers'][$i]['designer_settings'] = 'pma__designer_settings';
-    $cfg['Servers'][$i]['export_templates'] = 'pma__export_templates';
-}
diff --git a/#pma/examples/openid.php b/#pma/examples/openid.php
deleted file mode 100644
index 0db0a466..00000000
--- a/#pma/examples/openid.php
+++ /dev/null
@@ -1,166 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Single signon for phpMyAdmin using OpenID
- *
- * This is just example how to use single signon with phpMyAdmin, it is
- * not intended to be perfect code and look, only shows how you can
- * integrate this functionality in your application.
- *
- * It uses OpenID pear package, see https://pear.php.net/package/OpenID
- *
- * User first authenticates using OpenID and based on content of $AUTH_MAP
- * the login information is passed to phpMyAdmin in session data.
- *
- * @package    PhpMyAdmin
- * @subpackage Example
- */
-
-if (false === @include_once 'OpenID/RelyingParty.php') {
-    exit;
-}
-
-/**
- * Map of authenticated users to MySQL user/password pairs.
- */
-$AUTH_MAP = array(
-    'https://launchpad.net/~username' => array(
-        'user' => 'root',
-        'password' => '',
-        ),
-    );
-
-/**
- * Simple function to show HTML page with given content.
- *
- * @param string $contents Content to include in page
- *
- * @return void
- */
-function Show_page($contents)
-{
-    header('Content-Type: text/html; charset=utf-8');
-    echo '<?xml version="1.0" encoding="utf-8"?>' , "\n";
-    ?>
-    <!DOCTYPE HTML>
-    <html lang="en" dir="ltr">
-    <head>
-    <link rel="icon" href="../favicon.ico" type="image/x-icon" />
-    <link rel="shortcut icon" href="../favicon.ico" type="image/x-icon" />
-    <meta charset="utf-8" />
-    <title>phpMyAdmin OpenID signon example</title>
-    </head>
-    <body>
-    <?php
-    if (isset($_SESSION) && isset($_SESSION['PMA_single_signon_error_message'])) {
-        echo '<p class="error">' , $_SESSION['PMA_single_signon_message'] , '</p>';
-        unset($_SESSION['PMA_single_signon_message']);
-    }
-    echo $contents;
-    ?>
-    </body>
-    </html>
-    <?php
-}
-
-function Die_error($e)
-{
-    $contents = "<div class='relyingparty_results'>\n";
-    $contents .= "<pre>" . htmlspecialchars($e->getMessage()) . "</pre>\n";
-    $contents .= "</div class='relyingparty_results'>";
-    Show_page($contents);
-    exit;
-}
-
-
-/* Need to have cookie visible from parent directory */
-session_set_cookie_params(0, '/', '', true, true);
-/* Create signon session */
-$session_name = 'SignonSession';
-session_name($session_name);
-@session_start();
-
-// Determine realm and return_to
-$base = 'http';
-if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') {
-    $base .= 's';
-}
-$base .= '://' . $_SERVER['SERVER_NAME'] . ':' . $_SERVER['SERVER_PORT'];
-
-$realm = $base . '/';
-$returnTo = $base . dirname($_SERVER['PHP_SELF']);
-if ($returnTo[mb_strlen($returnTo) - 1] != '/') {
-    $returnTo .= '/';
-}
-$returnTo .= 'openid.php';
-
-/* Display form */
-if (!count($_GET) && !count($_POST) || isset($_GET['phpMyAdmin'])) {
-    /* Show simple form */
-    $content = '<form action="openid.php" method="post">
-OpenID: <input type="text" name="identifier" /><br />
-<input type="submit" name="start" />
-</form>
-</body>
-</html>';
-    Show_page($content);
-    exit;
-}
-
-/* Grab identifier */
-if (isset($_POST['identifier']) && is_string($_POST['identifier'])) {
-    $identifier = $_POST['identifier'];
-} else if (isset($_SESSION['identifier']) && is_string($_SESSION['identifier'])) {
-    $identifier = $_SESSION['identifier'];
-} else {
-    $identifier = null;
-}
-
-/* Create OpenID object */
-try {
-    $o = new OpenID_RelyingParty($returnTo, $realm, $identifier);
-} catch (Exception $e) {
-    Die_error($e);
-}
-
-/* Redirect to OpenID provider */
-if (isset($_POST['start'])) {
-    try {
-        $authRequest = $o->prepare();
-    } catch (Exception $e) {
-        Die_error($e);
-    }
-
-    $url = $authRequest->getAuthorizeURL();
-
-    header("Location: $url");
-    exit;
-} else {
-    /* Grab query string */
-    if (!count($_POST)) {
-        list(, $queryString) = explode('?', $_SERVER['REQUEST_URI']);
-    } else {
-        // I hate php sometimes
-        $queryString = file_get_contents('php://input');
-    }
-
-    /* Check reply */
-    try {
-        $message = new OpenID_Message($queryString, OpenID_Message::FORMAT_HTTP);
-    } catch (Exception $e) {
-        Die_error($e);
-    }
-
-    $id = $message->get('openid.claimed_id');
-
-    if (!empty($id) && isset($AUTH_MAP[$id])) {
-        $_SESSION['PMA_single_signon_user'] = $AUTH_MAP[$id]['user'];
-        $_SESSION['PMA_single_signon_password'] = $AUTH_MAP[$id]['password'];
-        session_write_close();
-        /* Redirect to phpMyAdmin (should use absolute URL here!) */
-        header('Location: ../index.php');
-    } else {
-        Show_page('<p>User not allowed!</p>');
-        exit;
-    }
-}
diff --git a/#pma/examples/signon-script.php b/#pma/examples/signon-script.php
deleted file mode 100644
index 7a2b8aa2..00000000
--- a/#pma/examples/signon-script.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Single signon for phpMyAdmin
- *
- * This is just example how to use script based single signon with
- * phpMyAdmin, it is not intended to be perfect code and look, only
- * shows how you can integrate this functionality in your application.
- *
- * @package    PhpMyAdmin
- * @subpackage Example
- */
-
-
-/**
- * This function returns username and password.
- *
- * It can optionally use configured username as parameter.
- *
- * @param string $user User name
- *
- * @return array
- */
-function get_login_credentials($user)
-{
-    /* Optionally we can use passed username */
-    if (!empty($user)) {
-        return array($user, 'password');
-    }
-
-    /* Here we would retrieve the credentials */
-    $credentials = array('root', '');
-
-    return $credentials;
-}
diff --git a/#pma/examples/signon.php b/#pma/examples/signon.php
deleted file mode 100644
index da9fadfa..00000000
--- a/#pma/examples/signon.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Single signon for phpMyAdmin
- *
- * This is just example how to use session based single signon with
- * phpMyAdmin, it is not intended to be perfect code and look, only
- * shows how you can integrate this functionality in your application.
- *
- * @package    PhpMyAdmin
- * @subpackage Example
- */
-
-/* Need to have cookie visible from parent directory */
-session_set_cookie_params(0, '/', '', true, true);
-/* Create signon session */
-$session_name = 'SignonSession';
-session_name($session_name);
-// Uncomment and change the following line to match your $cfg['SessionSavePath']
-//session_save_path('/foobar');
-@session_start();
-
-/* Was data posted? */
-if (isset($_POST['user'])) {
-    /* Store there credentials */
-    $_SESSION['PMA_single_signon_user'] = $_POST['user'];
-    $_SESSION['PMA_single_signon_password'] = $_POST['password'];
-    $_SESSION['PMA_single_signon_host'] = $_POST['host'];
-    $_SESSION['PMA_single_signon_port'] = $_POST['port'];
-    /* Update another field of server configuration */
-    $_SESSION['PMA_single_signon_cfgupdate'] = array('verbose' => 'Signon test');
-    $id = session_id();
-    /* Close that session */
-    @session_write_close();
-    /* Redirect to phpMyAdmin (should use absolute URL here!) */
-    header('Location: ../index.php');
-} else {
-    /* Show simple form */
-    header('Content-Type: text/html; charset=utf-8');
-    echo '<?xml version="1.0" encoding="utf-8"?>' , "\n";
-    ?>
-    <!DOCTYPE HTML>
-    <html lang="en" dir="ltr">
-    <head>
-    <link rel="icon" href="../favicon.ico" type="image/x-icon" />
-    <link rel="shortcut icon" href="../favicon.ico" type="image/x-icon" />
-    <meta charset="utf-8" />
-    <title>phpMyAdmin single signon example</title>
-    </head>
-    <body>
-    <?php
-    if (isset($_SESSION['PMA_single_signon_error_message'])) {
-        echo '<p class="error">';
-        echo $_SESSION['PMA_single_signon_error_message'];
-        echo '</p>';
-    }
-    ?>
-    <form action="signon.php" method="post">
-    Username: <input type="text" name="user" /><br />
-    Password: <input type="password" name="password" /><br />
-    Host: (will use the one from config.inc.php by default)
-    <input type="text" name="host" /><br />
-    Port: (will use the one from config.inc.php by default)
-    <input type="text" name="port" /><br />
-    <input type="submit" />
-    </form>
-    </body>
-    </html>
-    <?php
-}
-?>
diff --git a/#pma/export.php b/#pma/export.php
deleted file mode 100644
index 785972b7..00000000
--- a/#pma/export.php
+++ /dev/null
@@ -1,546 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Main export handling code
- *
- * @package PhpMyAdmin
- */
-use PMA\libraries\plugins\ExportPlugin;
-
-/**
- * Get the variables sent or posted to this script and a core script
- */
-if (!defined('TESTSUITE')) {
-    /**
-     * If we are sending the export file (as opposed to just displaying it
-     * as text), we have to bypass the usual PMA\libraries\Response mechanism
-     */
-    if (isset($_POST['output_format']) && $_POST['output_format'] == 'sendit') {
-        define('PMA_BYPASS_GET_INSTANCE', 1);
-    }
-    include_once 'libraries/common.inc.php';
-    include_once 'libraries/plugin_interface.lib.php';
-    include_once 'libraries/export.lib.php';
-
-    //check if it's the GET request to check export time out
-    if (isset($_GET['check_time_out'])) {
-        if (isset($_SESSION['pma_export_error'])) {
-            $err = $_SESSION['pma_export_error'];
-            unset($_SESSION['pma_export_error']);
-            echo "timeout";
-        } else {
-            echo "success";
-        }
-        exit;
-    }
-    /**
-     * Sets globals from $_POST
-     *
-     * - Please keep the parameters in order of their appearance in the form
-     * - Some of these parameters are not used, as the code below directly
-     *   verifies from the superglobal $_POST or $_REQUEST
-     */
-    $post_params = array(
-            'db',
-            'table',
-            'what',
-            'single_table',
-            'export_type',
-            'export_method',
-            'quick_or_custom',
-            'db_select',
-            'table_select',
-            'table_structure',
-            'table_data',
-            'limit_to',
-            'limit_from',
-            'allrows',
-            'lock_tables',
-            'output_format',
-            'filename_template',
-            'maxsize',
-            'remember_template',
-            'charset',
-            'compression',
-            'as_separate_files',
-            'knjenc',
-            'xkana',
-            'htmlword_structure_or_data',
-            'htmlword_null',
-            'htmlword_columns',
-            'mediawiki_headers',
-            'mediawiki_structure_or_data',
-            'mediawiki_caption',
-            'pdf_structure_or_data',
-            'odt_structure_or_data',
-            'odt_relation',
-            'odt_comments',
-            'odt_mime',
-            'odt_columns',
-            'odt_null',
-            'codegen_structure_or_data',
-            'codegen_format',
-            'excel_null',
-            'excel_removeCRLF',
-            'excel_columns',
-            'excel_edition',
-            'excel_structure_or_data',
-            'yaml_structure_or_data',
-            'ods_null',
-            'ods_structure_or_data',
-            'ods_columns',
-            'json_structure_or_data',
-            'json_pretty_print',
-            'xml_structure_or_data',
-            'xml_export_events',
-            'xml_export_functions',
-            'xml_export_procedures',
-            'xml_export_tables',
-            'xml_export_triggers',
-            'xml_export_views',
-            'xml_export_contents',
-            'texytext_structure_or_data',
-            'texytext_columns',
-            'texytext_null',
-            'phparray_structure_or_data',
-            'sql_include_comments',
-            'sql_header_comment',
-            'sql_dates',
-            'sql_relation',
-            'sql_mime',
-            'sql_use_transaction',
-            'sql_disable_fk',
-            'sql_compatibility',
-            'sql_structure_or_data',
-            'sql_create_database',
-            'sql_drop_table',
-            'sql_procedure_function',
-            'sql_create_table',
-            'sql_create_view',
-            'sql_create_trigger',
-            'sql_if_not_exists',
-            'sql_auto_increment',
-            'sql_backquotes',
-            'sql_truncate',
-            'sql_delayed',
-            'sql_ignore',
-            'sql_type',
-            'sql_insert_syntax',
-            'sql_max_query_size',
-            'sql_hex_for_binary',
-            'sql_utc_time',
-            'sql_drop_database',
-            'sql_views_as_tables',
-            'sql_metadata',
-            'csv_separator',
-            'csv_enclosed',
-            'csv_escaped',
-            'csv_terminated',
-            'csv_null',
-            'csv_removeCRLF',
-            'csv_columns',
-            'csv_structure_or_data',
-            // csv_replace should have been here but we use it directly from $_POST
-            'latex_caption',
-            'latex_structure_or_data',
-            'latex_structure_caption',
-            'latex_structure_continued_caption',
-            'latex_structure_label',
-            'latex_relation',
-            'latex_comments',
-            'latex_mime',
-            'latex_columns',
-            'latex_data_caption',
-            'latex_data_continued_caption',
-            'latex_data_label',
-            'latex_null',
-            'aliases'
-    );
-
-    foreach ($post_params as $one_post_param) {
-        if (isset($_POST[$one_post_param])) {
-            $GLOBALS[$one_post_param] = $_POST[$one_post_param];
-        }
-    }
-
-    $table = $GLOBALS['table'];
-
-    PMA\libraries\Util::checkParameters(array('what', 'export_type'));
-
-    // sanitize this parameter which will be used below in a file inclusion
-    $what = PMA_securePath($_POST['what']);
-
-    // export class instance, not array of properties, as before
-    /* @var $export_plugin ExportPlugin */
-    $export_plugin = PMA_getPlugin(
-        "export",
-        $what,
-        'libraries/plugins/export/',
-        array(
-            'export_type' => $export_type,
-            'single_table' => isset($single_table)
-        )
-    );
-
-    // Backward compatibility
-    $type = $what;
-
-    // Check export type
-    if (empty($export_plugin)) {
-        PMA_fatalError(__('Bad type!'));
-    }
-
-    /**
-     * valid compression methods
-     */
-    $compression_methods = array(
-        'zip',
-        'gzip'
-    );
-
-    /**
-     * init and variable checking
-     */
-    $compression = false;
-    $onserver = false;
-    $save_on_server = false;
-    $buffer_needed = false;
-    $back_button = '';
-    $save_filename = '';
-    $file_handle = '';
-    $err_url = '';
-    $filename = '';
-    $separate_files = '';
-
-    // Is it a quick or custom export?
-    if (isset($_REQUEST['quick_or_custom'])
-        && $_REQUEST['quick_or_custom'] == 'quick'
-    ) {
-        $quick_export = true;
-    } else {
-        $quick_export = false;
-    }
-
-    if ($_REQUEST['output_format'] == 'astext') {
-        $asfile = false;
-    } else {
-        $asfile = true;
-        if (isset($_REQUEST['as_separate_files'])
-            && ! empty($_REQUEST['as_separate_files'])
-        ) {
-            if (isset($_REQUEST['compression'])
-                && ! empty($_REQUEST['compression'])
-                && $_REQUEST['compression'] == 'zip'
-            ) {
-                $separate_files = $_REQUEST['as_separate_files'];
-            }
-        }
-        if (in_array($_REQUEST['compression'], $compression_methods)) {
-            $compression = $_REQUEST['compression'];
-            $buffer_needed = true;
-        }
-        if (($quick_export && ! empty($_REQUEST['quick_export_onserver']))
-            || (! $quick_export && ! empty($_REQUEST['onserver']))
-        ) {
-            if ($quick_export) {
-                $onserver = $_REQUEST['quick_export_onserver'];
-            } else {
-                $onserver = $_REQUEST['onserver'];
-            }
-            // Will we save dump on server?
-            $save_on_server = ! empty($cfg['SaveDir']) && $onserver;
-        }
-    }
-
-    // Generate error url and check for needed variables
-    if ($export_type == 'server') {
-        $err_url = 'server_export.php' . PMA_URL_getCommon();
-    } elseif ($export_type == 'database'
-        && mb_strlen($db)
-    ) {
-        $err_url = 'db_export.php' . PMA_URL_getCommon(array('db' => $db));
-        // Check if we have something to export
-        if (isset($table_select)) {
-            $tables = $table_select;
-        } else {
-            $tables = array();
-        }
-    } elseif ($export_type == 'table' && mb_strlen($db)
-        && mb_strlen($table)
-    ) {
-        $err_url = 'tbl_export.php' . PMA_URL_getCommon(
-            array(
-                'db' => $db, 'table' => $table
-            )
-        );
-    } else {
-        PMA_fatalError(__('Bad parameters!'));
-    }
-
-    // Merge SQL Query aliases with Export aliases from
-    // export page, Export page aliases are given more
-    // preference over SQL Query aliases.
-    $parser = new SqlParser\Parser($sql_query);
-    $aliases = array();
-    if ((!empty($parser->statements[0]))
-        && ($parser->statements[0] instanceof SqlParser\Statements\SelectStatement)
-    ) {
-        $aliases = SqlParser\Utils\Misc::getAliases($parser->statements[0], $db);
-    }
-    if (!empty($_REQUEST['aliases'])) {
-        $aliases = PMA_mergeAliases($aliases, $_REQUEST['aliases']);
-        $_SESSION['tmpval']['aliases'] = $_REQUEST['aliases'];
-    }
-
-    /**
-     * Increase time limit for script execution and initializes some variables
-     */
-    @set_time_limit($cfg['ExecTimeLimit']);
-    if (! empty($cfg['MemoryLimit'])) {
-        @ini_set('memory_limit', $cfg['MemoryLimit']);
-    }
-    register_shutdown_function('PMA_shutdownDuringExport');
-    // Start with empty buffer
-    $dump_buffer = '';
-    $dump_buffer_len = 0;
-
-    // Array of dump_buffers - used in separate file exports
-    $dump_buffer_objects = array();
-
-    // We send fake headers to avoid browser timeout when buffering
-    $time_start = time();
-
-    // Defines the default <CR><LF> format.
-    // For SQL always use \n as MySQL wants this on all platforms.
-    if ($what == 'sql') {
-        $crlf = "\n";
-    } else {
-        $crlf = PMA\libraries\Util::whichCrlf();
-    }
-
-    $output_kanji_conversion = function_exists('PMA_Kanji_strConv')
-        && $type != 'xls';
-
-    // Do we need to convert charset?
-    $output_charset_conversion = $asfile
-        && $GLOBALS['PMA_recoding_engine'] != PMA_CHARSET_NONE
-        && isset($charset) && $charset != 'utf-8'
-        && $type != 'xls';
-
-    // Use on the fly compression?
-    $GLOBALS['onfly_compression'] = $GLOBALS['cfg']['CompressOnFly']
-        && $compression == 'gzip';
-    if ($GLOBALS['onfly_compression']) {
-        $GLOBALS['memory_limit'] = PMA_getMemoryLimitForExport();
-    }
-
-    // Generate filename and mime type if needed
-    if ($asfile) {
-        if (empty($remember_template)) {
-            $remember_template = '';
-        }
-        list($filename, $mime_type) = PMA_getExportFilenameAndMimetype(
-            $export_type, $remember_template, $export_plugin, $compression,
-            $filename_template
-        );
-    } else {
-        $mime_type = '';
-    }
-
-    // Open file on server if needed
-    if ($save_on_server) {
-        list($save_filename, $message, $file_handle) = PMA_openExportFile(
-            $filename, $quick_export
-        );
-
-        // problem opening export file on server?
-        if (! empty($message)) {
-            PMA_showExportPage($db, $table, $export_type);
-        }
-    } else {
-        /**
-         * Send headers depending on whether the user chose to download a dump file
-         * or not
-         */
-        if ($asfile) {
-            // Download
-            // (avoid rewriting data containing HTML with anchors and forms;
-            // this was reported to happen under Plesk)
-            @ini_set('url_rewriter.tags', '');
-            $filename = PMA_sanitizeFilename($filename);
-
-            PMA_downloadHeader($filename, $mime_type);
-        } else {
-            // HTML
-            if ($export_type == 'database') {
-                $num_tables = count($tables);
-                if ($num_tables == 0) {
-                    $message = PMA\libraries\Message::error(
-                        __('No tables found in database.')
-                    );
-                    $active_page = 'db_export.php';
-                    include 'db_export.php';
-                    exit();
-                }
-            }
-            list($html, $back_button) = PMA_getHtmlForDisplayedExportHeader(
-                $export_type, $db, $table
-            );
-            echo $html;
-            unset($html);
-        } // end download
-    }
-
-    // Fake loop just to allow skip of remain of this code by break, I'd really
-    // need exceptions here :-)
-    do {
-        // Re - initialize
-        $dump_buffer = '';
-        $dump_buffer_len = 0;
-
-        // Add possibly some comments to export
-        if (! $export_plugin->exportHeader()) {
-            break;
-        }
-
-        // Will we need relation & co. setup?
-        $do_relation = isset($GLOBALS[$what . '_relation']);
-        $do_comments = isset($GLOBALS[$what . '_include_comments'])
-            || isset($GLOBALS[$what . '_comments']);
-        $do_mime     = isset($GLOBALS[$what . '_mime']);
-        if ($do_relation || $do_comments || $do_mime) {
-            $cfgRelation = PMA_getRelationsParam();
-        }
-        if ($do_mime) {
-            include_once 'libraries/transformations.lib.php';
-        }
-
-        // Include dates in export?
-        $do_dates = isset($GLOBALS[$what . '_dates']);
-
-        $whatStrucOrData = $GLOBALS[$what . '_structure_or_data'];
-
-        /**
-         * Builds the dump
-         */
-        if ($export_type == 'server') {
-            if (! isset($db_select)) {
-                $db_select = '';
-            }
-            PMA_exportServer(
-                $db_select, $whatStrucOrData, $export_plugin, $crlf, $err_url,
-                $export_type, $do_relation, $do_comments, $do_mime, $do_dates,
-                $aliases, $separate_files
-            );
-        } elseif ($export_type == 'database') {
-            if (!isset($table_structure) || !is_array($table_structure)) {
-                $table_structure = array();
-            }
-            if (!isset($table_data) || !is_array($table_data)) {
-                $table_data = array();
-            }
-            if (!empty($_REQUEST['structure_or_data_forced'])) {
-                $table_structure = $tables;
-                $table_data = $tables;
-            }
-            if (isset($lock_tables)) {
-                PMA_lockTables($db, $tables, "READ");
-                try {
-                    PMA_exportDatabase(
-                        $db, $tables, $whatStrucOrData, $table_structure,
-                        $table_data, $export_plugin, $crlf, $err_url, $export_type,
-                        $do_relation, $do_comments, $do_mime, $do_dates, $aliases,
-                        $separate_files
-                    );
-                } finally {
-                    PMA_unlockTables();
-                }
-            } else {
-                PMA_exportDatabase(
-                    $db, $tables, $whatStrucOrData, $table_structure, $table_data,
-                    $export_plugin, $crlf, $err_url, $export_type, $do_relation,
-                    $do_comments, $do_mime, $do_dates, $aliases, $separate_files
-                );
-            }
-        } else {
-            // We export just one table
-            // $allrows comes from the form when "Dump all rows" has been selected
-            if (! isset($allrows)) {
-                $allrows = '';
-            }
-            if (! isset($limit_to)) {
-                $limit_to = 0;
-            }
-            if (! isset($limit_from)) {
-                $limit_from = 0;
-            }
-            if (isset($lock_tables)) {
-                try {
-                    PMA_lockTables($db, array($table), "READ");
-                    PMA_exportTable(
-                        $db, $table, $whatStrucOrData, $export_plugin, $crlf,
-                        $err_url, $export_type, $do_relation, $do_comments,
-                        $do_mime, $do_dates, $allrows, $limit_to, $limit_from,
-                        $sql_query, $aliases
-                    );
-                } finally {
-                    PMA_unlockTables();
-                }
-            } else {
-                PMA_exportTable(
-                    $db, $table, $whatStrucOrData, $export_plugin, $crlf, $err_url,
-                    $export_type, $do_relation, $do_comments, $do_mime, $do_dates,
-                    $allrows, $limit_to, $limit_from, $sql_query, $aliases
-                );
-            }
-        }
-        if (! $export_plugin->exportFooter()) {
-            break;
-        }
-
-    } while (false);
-    // End of fake loop
-
-    if ($save_on_server && ! empty($message)) {
-        PMA_showExportPage($db, $table, $export_type);
-    }
-
-    /**
-     * Send the dump as a file...
-     */
-    if (empty($asfile)) {
-        echo PMA_getHtmlForDisplayedExportFooter($back_button);
-        return;
-    } // end if
-
-    // Convert the charset if required.
-    if ($output_charset_conversion) {
-        $dump_buffer = PMA_convertString(
-            'utf-8',
-            $GLOBALS['charset'],
-            $dump_buffer
-        );
-    }
-
-    // Compression needed?
-    if ($compression) {
-        if (! empty($separate_files)) {
-            $dump_buffer = PMA_compressExport(
-                $dump_buffer_objects, $compression, $filename
-            );
-        } else {
-            $dump_buffer = PMA_compressExport($dump_buffer, $compression, $filename);
-        }
-
-    }
-
-    /* If we saved on server, we have to close file now */
-    if ($save_on_server) {
-        $message = PMA_closeExportFile(
-            $file_handle, $dump_buffer, $save_filename
-        );
-        PMA_showExportPage($db, $table, $export_type);
-    } else {
-        echo $dump_buffer;
-    }
-}
diff --git a/#pma/favicon.ico b/#pma/favicon.ico
deleted file mode 100644
index fb156b22..00000000
Binary files a/#pma/favicon.ico and /dev/null differ
diff --git a/#pma/file_echo.php b/#pma/file_echo.php
deleted file mode 100644
index b7d53167..00000000
--- a/#pma/file_echo.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * "Echo" service to allow force downloading of exported charts (png or svg)
- * and server status monitor settings
- *
- * @package PhpMyAdmin
- */
-
-define('PMA_MINIMUM_COMMON', true);
-require_once 'libraries/common.inc.php';
-
-if (isset($_REQUEST['monitorconfig'])) {
-    /* For monitor chart config export */
-    PMA_downloadHeader('monitor.cfg', 'application/json; charset=UTF-8');
-    header('X-Content-Type-Options: nosniff');
-
-    echo urldecode($_REQUEST['monitorconfig']);
-
-} else if (isset($_REQUEST['import'])) {
-    /* For monitor chart config import */
-    header('Content-Type: application/json; charset=UTF-8');
-    header('X-Content-Type-Options: nosniff');
-
-    if (!file_exists($_FILES['file']['tmp_name'])) {
-        exit();
-    }
-    echo file_get_contents($_FILES['file']['tmp_name']);
-}
diff --git a/#pma/gis_data_editor.php b/#pma/gis_data_editor.php
deleted file mode 100644
index 7f9ab8a6..00000000
--- a/#pma/gis_data_editor.php
+++ /dev/null
@@ -1,430 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Editor for Geometry data types.
- *
- * @package PhpMyAdmin
- */
-use PMA\libraries\gis\GISFactory;
-use PMA\libraries\gis\GISVisualization;
-
-/**
- * Escapes special characters if the variable is set.
- * Returns an empty string otherwise.
- *
- * @param string $variable variable to be escaped
- *
- * @return string escaped variable
- */
-function escape($variable)
-{
-    return isset($variable) ? htmlspecialchars($variable) : '';
-}
-
-require_once 'libraries/common.inc.php';
-
-if (! isset($_REQUEST['field'])) {
-    PMA\libraries\Util::checkParameters(array('field'));
-}
-
-// Get data if any posted
-$gis_data = array();
-if (PMA_isValid($_REQUEST['gis_data'], 'array')) {
-    $gis_data = $_REQUEST['gis_data'];
-}
-
-$gis_types = array(
-    'POINT',
-    'MULTIPOINT',
-    'LINESTRING',
-    'MULTILINESTRING',
-    'POLYGON',
-    'MULTIPOLYGON',
-    'GEOMETRYCOLLECTION'
-);
-
-// Extract type from the initial call and make sure that it's a valid one.
-// Extract from field's values if available, if not use the column type passed.
-if (! isset($gis_data['gis_type'])) {
-    if (isset($_REQUEST['type']) && $_REQUEST['type'] != '') {
-        $gis_data['gis_type'] = mb_strtoupper($_REQUEST['type']);
-    }
-    if (isset($_REQUEST['value']) && trim($_REQUEST['value']) != '') {
-        $start = (substr($_REQUEST['value'], 0, 1) == "'") ? 1 : 0;
-        $gis_data['gis_type'] = mb_substr(
-            $_REQUEST['value'],
-            $start,
-            mb_strpos($_REQUEST['value'], "(") - $start
-        );
-    }
-    if ((! isset($gis_data['gis_type']))
-        || (! in_array($gis_data['gis_type'], $gis_types))
-    ) {
-        $gis_data['gis_type'] = $gis_types[0];
-    }
-}
-$geom_type = htmlspecialchars($gis_data['gis_type']);
-
-// Generate parameters from value passed.
-$gis_obj = GISFactory::factory($geom_type);
-if (isset($_REQUEST['value'])) {
-    $gis_data = array_merge(
-        $gis_data, $gis_obj->generateParams($_REQUEST['value'])
-    );
-}
-
-// Generate Well Known Text
-$srid = (isset($gis_data['srid']) && $gis_data['srid'] != '')
-    ? htmlspecialchars($gis_data['srid']) : 0;
-$wkt = $gis_obj->generateWkt($gis_data, 0);
-$wkt_with_zero = $gis_obj->generateWkt($gis_data, 0, '0');
-$result = "'" . $wkt . "'," . $srid;
-
-// Generate SVG based visualization
-$visualizationSettings = array(
-    'width' => 450,
-    'height' => 300,
-    'spatialColumn' => 'wkt'
-);
-$data = array(array('wkt' => $wkt_with_zero, 'srid' => $srid));
-$visualization = GISVisualization::getByData($data, $visualizationSettings)
-    ->toImage('svg');
-
-$open_layers = GISVisualization::getByData($data, $visualizationSettings)
-    ->asOl();
-
-// If the call is to update the WKT and visualization make an AJAX response
-if (isset($_REQUEST['generate']) && $_REQUEST['generate'] == true) {
-    $extra_data = array(
-        'result'        => $result,
-        'visualization' => $visualization,
-        'openLayers'    => $open_layers,
-    );
-    $response = PMA\libraries\Response::getInstance();
-    $response->addJSON($extra_data);
-    exit;
-}
-
-ob_start();
-
-echo '<form id="gis_data_editor_form" action="gis_data_editor.php" method="post">';
-echo '<input type="hidden" id="pmaThemeImage"'
-    , ' value="' , $GLOBALS['pmaThemeImage'] , '" />';
-echo '<div id="gis_data_editor">';
-
-echo '<h3>';
-printf(
-    __('Value for the column "%s"'),
-    htmlspecialchars($_REQUEST['field'])
-);
-echo '</h3>';
-
-echo '<input type="hidden" name="field" value="'
-    , htmlspecialchars($_REQUEST['field']) , '" />';
-// The input field to which the final result should be added
-// and corresponding null checkbox
-if (isset($_REQUEST['input_name'])) {
-    echo '<input type="hidden" name="input_name" value="'
-        , htmlspecialchars($_REQUEST['input_name']) , '" />';
-}
-echo PMA_URL_getHiddenInputs();
-
-echo '<!-- Visualization section -->';
-echo '<div id="placeholder" style="width:450px;height:300px;'
-    , ($srid != 0 ? 'display:none;' : '') , '">';
-echo $visualization;
-echo '</div>';
-
-echo '<div id="openlayersmap" style="width:450px;height:300px;'
-    , ($srid == 0 ? 'display:none;' : '') , '">';
-echo '</div>';
-
-echo '<div class="choice" style="float:right;clear:right;">';
-echo '<input type="checkbox" id="choice" value="useBaseLayer"'
-    , ($srid != 0 ? ' checked="checked"' : '') , '/>';
-echo '<label for="choice">' ,  __("Use OpenStreetMaps as Base Layer") , '</label>';
-echo '</div>';
-
-echo '<script language="javascript" type="text/javascript">';
-echo $open_layers;
-echo '</script>';
-echo '<!-- End of visualization section -->';
-
-
-echo '<!-- Header section - Inclueds GIS type selector and input field for SRID -->';
-echo '<div id="gis_data_header">';
-echo '<select name="gis_data[gis_type]" class="gis_type">';
-foreach ($gis_types as $gis_type) {
-    echo '<option value="' , $gis_type , '"';
-    if ($geom_type == $gis_type) {
-        echo ' selected="selected"';
-    }
-    echo '>' , $gis_type , '</option>';
-}
-echo '</select>';
-echo '&nbsp;&nbsp;&nbsp;&nbsp;';
-/* l10n: Spatial Reference System Identifier */
-echo '<label for="srid">' ,  __('SRID:') , '</label>';
-echo '<input name="gis_data[srid]" type="text" value="' , $srid , '" />';
-echo '</div>';
-echo '<!-- End of header section -->';
-
-echo '<!-- Data section -->';
-echo '<div id="gis_data">';
-
-$geom_count = 1;
-if ($geom_type == 'GEOMETRYCOLLECTION') {
-    $geom_count = (isset($gis_data[$geom_type]['geom_count']))
-        ? intval($gis_data[$geom_type]['geom_count']) : 1;
-    if (isset($gis_data[$geom_type]['add_geom'])) {
-        $geom_count++;
-    }
-    echo '<input type="hidden" name="gis_data[GEOMETRYCOLLECTION][geom_count]"'
-        , ' value="' , $geom_count , '" />';
-}
-
-for ($a = 0; $a < $geom_count; $a++) {
-    if (! isset($gis_data[$a])) {
-        continue;
-    }
-
-    if ($geom_type == 'GEOMETRYCOLLECTION') {
-        echo '<br/><br/>';
-        printf(__('Geometry %d:'), $a + 1);
-        echo '<br/>';
-        if (isset($gis_data[$a]['gis_type'])) {
-            $type = htmlspecialchars($gis_data[$a]['gis_type']);
-        } else {
-            $type = $gis_types[0];
-        }
-        echo '<select name="gis_data[' , $a , '][gis_type]" class="gis_type">';
-        foreach (array_slice($gis_types, 0, 6) as $gis_type) {
-            echo '<option value="' , $gis_type , '"';
-            if ($type == $gis_type) {
-                echo ' selected="selected"';
-            }
-            echo '>' , $gis_type , '</option>';
-        }
-        echo '</select>';
-    } else {
-        $type = $geom_type;
-    }
-
-    if ($type == 'POINT') {
-        echo '<br/>';
-        echo __('Point:');
-        echo '<label for="x">' , __("X") , '</label>';
-        echo '<input name="gis_data[' , $a , '][POINT][x]" type="text"'
-            , ' value="' , escape($gis_data[$a]['POINT']['x']) , '" />';
-        echo '<label for="y">' , __("Y") , '</label>';
-        echo '<input name="gis_data[' , $a , '][POINT][y]" type="text"'
-            , ' value="' , escape($gis_data[$a]['POINT']['y']) , '" />';
-
-    } elseif ($type == 'MULTIPOINT' || $type == 'LINESTRING') {
-        $no_of_points = isset($gis_data[$a][$type]['no_of_points'])
-            ? intval($gis_data[$a][$type]['no_of_points']) : 1;
-        if ($type == 'LINESTRING' && $no_of_points < 2) {
-            $no_of_points = 2;
-        }
-        if ($type == 'MULTIPOINT' && $no_of_points < 1) {
-            $no_of_points = 1;
-        }
-
-        if (isset($gis_data[$a][$type]['add_point'])) {
-            $no_of_points++;
-        }
-        echo '<input type="hidden" value="' , $no_of_points , '"'
-            , ' name="gis_data[' , $a , '][' , $type , '][no_of_points]" />';
-
-        for ($i = 0; $i < $no_of_points; $i++) {
-            echo '<br/>';
-            printf(__('Point %d'), $i + 1);
-            echo ': ';
-            echo '<label for="x">' ,  __("X") , '</label>';
-            echo '<input type="text"'
-                , ' name="gis_data[' , $a , '][' , $type , '][' , $i , '][x]"'
-                , ' value="' , escape($gis_data[$a][$type][$i]['x']) , '" />';
-            echo '<label for="y">' , __("Y") , '</label>';
-            echo '<input type="text"'
-                , ' name="gis_data[' , $a , '][' , $type , '][' , $i , '][y]"'
-                , ' value="' , escape($gis_data[$a][$type][$i]['y']) , '" />';
-        }
-        echo '<input type="submit"'
-            , ' name="gis_data[' , $a , '][' , $type , '][add_point]"'
-            , ' class="add addPoint" value="' , __("Add a point") , '" />';
-
-    } elseif ($type == 'MULTILINESTRING' || $type == 'POLYGON') {
-        $no_of_lines = isset($gis_data[$a][$type]['no_of_lines'])
-            ? intval($gis_data[$a][$type]['no_of_lines']) : 1;
-        if ($no_of_lines < 1) {
-            $no_of_lines = 1;
-        }
-        if (isset($gis_data[$a][$type]['add_line'])) {
-            $no_of_lines++;
-        }
-        echo '<input type="hidden" value="' , $no_of_lines , '"'
-            , ' name="gis_data[' , $a , '][' , $type , '][no_of_lines]" />';
-
-        for ($i = 0; $i < $no_of_lines; $i++) {
-            echo '<br/>';
-            if ($type == 'MULTILINESTRING') {
-                printf(__('Linestring %d:'), $i + 1);
-            } else {
-                if ($i == 0) {
-                    echo __('Outer ring:');
-                } else {
-                    printf(__('Inner ring %d:'), $i);
-                }
-            }
-
-            $no_of_points = isset($gis_data[$a][$type][$i]['no_of_points'])
-                ? intval($gis_data[$a][$type][$i]['no_of_points']) : 2;
-            if ($type == 'MULTILINESTRING' && $no_of_points < 2) {
-                $no_of_points = 2;
-            }
-            if ($type == 'POLYGON' && $no_of_points < 4) {
-                $no_of_points = 4;
-            }
-            if (isset($gis_data[$a][$type][$i]['add_point'])) {
-                $no_of_points++;
-            }
-            echo '<input type="hidden" value="' , $no_of_points , '"'
-                , ' name="gis_data[' , $a , '][' , $type , '][' , $i
-                , '][no_of_points]" />';
-
-            for ($j = 0; $j < $no_of_points; $j++) {
-                echo('<br/>');
-                printf(__('Point %d'), $j + 1);
-                echo ': ';
-                echo '<label for="x">' ,  __("X") , '</label>';
-                echo '<input type="text" name="gis_data[' , $a , '][' , $type . ']['
-                    , $i , '][' , $j , '][x]" value="'
-                    , escape($gis_data[$a][$type][$i][$j]['x']) , '" />';
-                echo '<label for="y">' , __("Y") , '</label>';
-                echo '<input type="text" name="gis_data[' , $a , '][' , $type , ']['
-                    , $i , '][' , $j , '][y]"' , ' value="'
-                    , escape($gis_data[$a][$type][$i][$j]['y']) , '" />';
-            }
-            echo '<input type="submit" name="gis_data[' , $a , '][' , $type , ']['
-                , $i , '][add_point]"'
-                , ' class="add addPoint" value="' , __("Add a point") , '" />';
-        }
-        $caption = ($type == 'MULTILINESTRING')
-            ? __('Add a linestring')
-            : __('Add an inner ring');
-        echo '<br/>';
-        echo '<input type="submit"'
-            , ' name="gis_data[' , $a , '][' , $type , '][add_line]"'
-            , ' class="add addLine" value="' , $caption , '" />';
-
-    } elseif ($type == 'MULTIPOLYGON') {
-        $no_of_polygons = isset($gis_data[$a][$type]['no_of_polygons'])
-            ? intval($gis_data[$a][$type]['no_of_polygons']) : 1;
-        if ($no_of_polygons < 1) {
-            $no_of_polygons = 1;
-        }
-        if (isset($gis_data[$a][$type]['add_polygon'])) {
-            $no_of_polygons++;
-        }
-        echo '<input type="hidden"'
-            , ' name="gis_data[' , $a , '][' , $type , '][no_of_polygons]"'
-            , ' value="' , $no_of_polygons , '" />';
-
-        for ($k = 0; $k < $no_of_polygons; $k++) {
-            echo '<br/>';
-            printf(__('Polygon %d:'), $k + 1);
-            $no_of_lines = isset($gis_data[$a][$type][$k]['no_of_lines'])
-                ? intval($gis_data[$a][$type][$k]['no_of_lines']) : 1;
-            if ($no_of_lines < 1) {
-                $no_of_lines = 1;
-            }
-            if (isset($gis_data[$a][$type][$k]['add_line'])) {
-                $no_of_lines++;
-            }
-            echo '<input type="hidden"'
-                , ' name="gis_data[' , $a , '][' , $type , '][' , $k
-                , '][no_of_lines]"' , ' value="' , $no_of_lines , '" />';
-
-            for ($i = 0; $i < $no_of_lines; $i++) {
-                echo '<br/><br/>';
-                if ($i == 0) {
-                    echo __('Outer ring:');
-                } else {
-                    printf(__('Inner ring %d:'), $i);
-                }
-
-                $no_of_points = isset($gis_data[$a][$type][$k][$i]['no_of_points'])
-                    ? intval($gis_data[$a][$type][$k][$i]['no_of_points']) : 4;
-                if ($no_of_points < 4) {
-                    $no_of_points = 4;
-                }
-                if (isset($gis_data[$a][$type][$k][$i]['add_point'])) {
-                    $no_of_points++;
-                }
-                echo '<input type="hidden"'
-                    , ' name="gis_data[' , $a , '][' , $type , '][' , $k , '][' , $i
-                    , '][no_of_points]"' , ' value="' , $no_of_points , '" />';
-
-                for ($j = 0; $j < $no_of_points; $j++) {
-                    echo '<br/>';
-                    printf(__('Point %d'), $j + 1);
-                    echo ': ';
-                    echo '<label for="x">' ,  __("X") , '</label>';
-                    echo '<input type="text"'
-                        , ' name="gis_data[' , $a , '][' , $type , '][' , $k , ']['
-                        , $i , '][' , $j , '][x]"'
-                        , ' value="' , escape($gis_data[$a][$type][$k][$i][$j]['x'])
-                        , '" />';
-                    echo '<label for="y">' , __("Y") , '</label>';
-                    echo '<input type="text"'
-                        , ' name="gis_data[' , $a , '][' , $type , '][' , $k , ']['
-                        , $i , '][' , $j , '][y]"'
-                        , ' value="' , escape($gis_data[$a][$type][$k][$i][$j]['y'])
-                        , '" />';
-                }
-                echo '<input type="submit"'
-                    , ' name="gis_data[' , $a , '][' , $type , '][' , $k , '][' , $i
-                    , '][add_point]"'
-                    , ' class="add addPoint" value="' , __("Add a point") , '" />';
-            }
-            echo '<br/>';
-            echo '<input type="submit"'
-                , ' name="gis_data[' , $a , '][' , $type , '][' , $k , '][add_line]"'
-                , ' class="add addLine" value="' , __('Add an inner ring') , '" />';
-            echo '<br/>';
-        }
-        echo '<br/>';
-        echo '<input type="submit"'
-            , ' name="gis_data[' , $a , '][' , $type , '][add_polygon]"'
-            , ' class="add addPolygon" value="' ,  __('Add a polygon') , '" />';
-    }
-}
-if ($geom_type == 'GEOMETRYCOLLECTION') {
-    echo '<br/><br/>';
-    echo '<input type="submit" name="gis_data[GEOMETRYCOLLECTION][add_geom]"'
-        , 'class="add addGeom" value="' , __("Add geometry") , '" />';
-}
-echo '</div>';
-echo '<!-- End of data section -->';
-
-echo '<br/>';
-echo '<input type="submit" name="gis_data[save]" value="' , __('Go') , '" />';
-
-echo '<div id="gis_data_output">';
-echo '<h3>' , __('Output') , '</h3>';
-echo '<p>';
-echo __(
-    'Choose "GeomFromText" from the "Function" column and paste the'
-    . ' string below into the "Value" field.'
-);
-echo '</p>';
-echo '<textarea id="gis_data_textarea" cols="95" rows="5">';
-echo htmlspecialchars($result);
-echo '</textarea>';
-echo '</div>';
-
-echo '</div>';
-echo '</form>';
-
-PMA\libraries\Response::getInstance()->addJSON('gis_editor', ob_get_contents());
-ob_end_clean();
diff --git a/#pma/import.php b/#pma/import.php
deleted file mode 100644
index 9f413897..00000000
--- a/#pma/import.php
+++ /dev/null
@@ -1,890 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Core script for import, this is just the glue around all other stuff
- *
- * @package PhpMyAdmin
- */
-use PMA\libraries\plugins\ImportPlugin;
-
-/* Enable LOAD DATA LOCAL INFILE for LDI plugin */
-if (isset($_POST['format']) && $_POST['format'] == 'ldi') {
-    define('PMA_ENABLE_LDI', 1);
-}
-
-/**
- * Get the variables sent or posted to this script and a core script
- */
-require_once 'libraries/common.inc.php';
-require_once 'libraries/sql.lib.php';
-require_once 'libraries/bookmark.lib.php';
-//require_once 'libraries/display_import_functions.lib.php';
-
-if (isset($_REQUEST['show_as_php'])) {
-    $GLOBALS['show_as_php'] = $_REQUEST['show_as_php'];
-}
-
-// Import functions.
-require_once 'libraries/import.lib.php';
-
-// If there is a request to 'Simulate DML'.
-if (isset($_REQUEST['simulate_dml'])) {
-    PMA_handleSimulateDMLRequest();
-    exit;
-}
-
-// If it's a refresh console bookmarks request
-if (isset($_REQUEST['console_bookmark_refresh'])) {
-    $response = PMA\libraries\Response::getInstance();
-    $response->addJSON(
-        'console_message_bookmark', PMA\libraries\Console::getBookmarkContent()
-    );
-    exit;
-}
-// If it's a console bookmark add request
-if (isset($_REQUEST['console_bookmark_add'])) {
-    $response = PMA\libraries\Response::getInstance();
-    if (isset($_REQUEST['label']) && isset($_REQUEST['db'])
-        && isset($_REQUEST['bookmark_query']) && isset($_REQUEST['shared'])
-    ) {
-        $cfgBookmark = PMA_Bookmark_getParams();
-        $bookmarkFields = array(
-            'bkm_database' => $_REQUEST['db'],
-            'bkm_user'  => $cfgBookmark['user'],
-            'bkm_sql_query' => $_REQUEST['bookmark_query'],
-            'bkm_label' => $_REQUEST['label']
-        );
-        $isShared = ($_REQUEST['shared'] == 'true' ? true : false);
-        if (PMA_Bookmark_save($bookmarkFields, $isShared)) {
-            $response->addJSON('message', __('Succeeded'));
-            $response->addJSON('data', $bookmarkFields);
-            $response->addJSON('isShared', $isShared);
-        } else {
-            $response->addJSON('message', __('Failed'));
-        }
-        die();
-    } else {
-        $response->addJSON('message', __('Incomplete params'));
-        die();
-    }
-}
-
-$format = '';
-
-/**
- * Sets globals from $_POST
- */
-$post_params = array(
-    'charset_of_file',
-    'format',
-    'import_type',
-    'is_js_confirmed',
-    'MAX_FILE_SIZE',
-    'message_to_show',
-    'noplugin',
-    'skip_queries',
-    'local_import_file'
-);
-
-// TODO: adapt full list of allowed parameters, as in export.php
-foreach ($post_params as $one_post_param) {
-    if (isset($_POST[$one_post_param])) {
-        $GLOBALS[$one_post_param] = $_POST[$one_post_param];
-    }
-}
-
-// reset import messages for ajax request
-$_SESSION['Import_message']['message'] = null;
-$_SESSION['Import_message']['go_back_url'] = null;
-// default values
-$GLOBALS['reload'] = false;
-
-// Use to identify current cycle is executing
-// a multiquery statement or stored routine
-if (!isset($_SESSION['is_multi_query'])) {
-    $_SESSION['is_multi_query'] = false;
-}
-
-$ajax_reload = array();
-// Are we just executing plain query or sql file?
-// (eg. non import, but query box/window run)
-if (! empty($sql_query)) {
-
-    // apply values for parameters
-    if (! empty($_REQUEST['parameterized'])
-        && ! empty($_REQUEST['parameters'])
-        && is_array($_REQUEST['parameters'])) {
-        $parameters = $_REQUEST['parameters'];
-        foreach ($parameters as $parameter => $replacement) {
-            $quoted = preg_quote($parameter, '/');
-            // making sure that :param does not apply values to :param1
-            $sql_query = preg_replace(
-                '/' . $quoted . '([^a-zA-Z0-9_])/',
-                $GLOBALS['dbi']->escapeString($replacement) . '${1}',
-                $sql_query
-            );
-            // for parameters the appear at the end of the string
-            $sql_query = preg_replace(
-                '/' . $quoted . '$/',
-                $GLOBALS['dbi']->escapeString($replacement),
-                $sql_query
-            );
-        }
-    }
-
-    // run SQL query
-    $import_text = $sql_query;
-    $import_type = 'query';
-    $format = 'sql';
-    $_SESSION['sql_from_query_box'] = true;
-
-    // If there is a request to ROLLBACK when finished.
-    if (isset($_REQUEST['rollback_query'])) {
-        PMA_handleRollbackRequest($import_text);
-    }
-
-    // refresh navigation and main panels
-    if (preg_match('/^(DROP)\s+(VIEW|TABLE|DATABASE|SCHEMA)\s+/i', $sql_query)) {
-        $GLOBALS['reload'] = true;
-        $ajax_reload['reload'] = true;
-    }
-
-    // refresh navigation panel only
-    if (preg_match(
-        '/^(CREATE|ALTER)\s+(VIEW|TABLE|DATABASE|SCHEMA)\s+/i',
-        $sql_query
-    )) {
-        $ajax_reload['reload'] = true;
-    }
-
-    // do a dynamic reload if table is RENAMED
-    // (by sending the instruction to the AJAX response handler)
-    if (preg_match(
-        '/^RENAME\s+TABLE\s+(.*?)\s+TO\s+(.*?)($|;|\s)/i',
-        $sql_query,
-        $rename_table_names
-    )) {
-        $ajax_reload['reload'] = true;
-        $ajax_reload['table_name'] = PMA\libraries\Util::unQuote(
-            $rename_table_names[2]
-        );
-    }
-
-    $sql_query = '';
-} elseif (! empty($sql_file)) {
-    // run uploaded SQL file
-    $import_file = $sql_file;
-    $import_type = 'queryfile';
-    $format = 'sql';
-    unset($sql_file);
-} elseif (! empty($_REQUEST['id_bookmark'])) {
-    // run bookmark
-    $import_type = 'query';
-    $format = 'sql';
-}
-
-// If we didn't get any parameters, either user called this directly, or
-// upload limit has been reached, let's assume the second possibility.
-if ($_POST == array() && $_GET == array()) {
-    $message = PMA\libraries\Message::error(
-        __(
-            'You probably tried to upload a file that is too large. Please refer ' .
-            'to %sdocumentation%s for a workaround for this limit.'
-        )
-    );
-    $message->addParam('[doc@faq1-16]');
-    $message->addParam('[/doc]');
-
-    // so we can obtain the message
-    $_SESSION['Import_message']['message'] = $message->getDisplay();
-    $_SESSION['Import_message']['go_back_url'] = $GLOBALS['goto'];
-
-    $response = PMA\libraries\Response::getInstance();
-    $response->setRequestStatus(false);
-    $response->addJSON('message', $message);
-
-    exit; // the footer is displayed automatically
-}
-
-// Add console message id to response output
-if (isset($_POST['console_message_id'])) {
-    $response = PMA\libraries\Response::getInstance();
-    $response->addJSON('console_message_id', $_POST['console_message_id']);
-}
-
-/**
- * Sets globals from $_POST patterns, for import plugins
- * We only need to load the selected plugin
- */
-
-if (! in_array(
-    $format,
-    array(
-        'csv',
-        'ldi',
-        'mediawiki',
-        'ods',
-        'shp',
-        'sql',
-        'xml'
-    )
-)
-) {
-    // this should not happen for a normal user
-    // but only during an attack
-    PMA_fatalError('Incorrect format parameter');
-}
-
-$post_patterns = array(
-    '/^force_file_/',
-    '/^' . $format . '_/'
-);
-
-PMA_setPostAsGlobal($post_patterns);
-
-// Check needed parameters
-PMA\libraries\Util::checkParameters(array('import_type', 'format'));
-
-// We don't want anything special in format
-$format = PMA_securePath($format);
-
-// Create error and goto url
-if ($import_type == 'table') {
-    $err_url = 'tbl_import.php' . PMA_URL_getCommon(
-        array(
-            'db' => $db, 'table' => $table
-        )
-    );
-    $_SESSION['Import_message']['go_back_url'] = $err_url;
-    $goto = 'tbl_import.php';
-} elseif ($import_type == 'database') {
-    $err_url = 'db_import.php' . PMA_URL_getCommon(array('db' => $db));
-    $_SESSION['Import_message']['go_back_url'] = $err_url;
-    $goto = 'db_import.php';
-} elseif ($import_type == 'server') {
-    $err_url = 'server_import.php' . PMA_URL_getCommon();
-    $_SESSION['Import_message']['go_back_url'] = $err_url;
-    $goto = 'server_import.php';
-} else {
-    if (empty($goto) || !preg_match('@^(server|db|tbl)(_[a-z]*)*\.php$@i', $goto)) {
-        if (mb_strlen($table) && mb_strlen($db)) {
-            $goto = 'tbl_structure.php';
-        } elseif (mb_strlen($db)) {
-            $goto = 'db_structure.php';
-        } else {
-            $goto = 'server_sql.php';
-        }
-    }
-    if (mb_strlen($table) && mb_strlen($db)) {
-        $common = PMA_URL_getCommon(array('db' => $db, 'table' => $table));
-    } elseif (mb_strlen($db)) {
-        $common = PMA_URL_getCommon(array('db' => $db));
-    } else {
-        $common = PMA_URL_getCommon();
-    }
-    $err_url  = $goto . $common
-        . (preg_match('@^tbl_[a-z]*\.php$@', $goto)
-            ? '&amp;table=' . htmlspecialchars($table)
-            : '');
-    $_SESSION['Import_message']['go_back_url'] = $err_url;
-}
-// Avoid setting selflink to 'import.php'
-// problem similar to bug 4276
-if (basename($_SERVER['SCRIPT_NAME']) === 'import.php') {
-    $_SERVER['SCRIPT_NAME'] = $goto;
-}
-
-
-if (mb_strlen($db)) {
-    $GLOBALS['dbi']->selectDb($db);
-}
-
-@set_time_limit($cfg['ExecTimeLimit']);
-if (! empty($cfg['MemoryLimit'])) {
-    @ini_set('memory_limit', $cfg['MemoryLimit']);
-}
-
-$timestamp = time();
-if (isset($_REQUEST['allow_interrupt'])) {
-    $maximum_time = ini_get('max_execution_time');
-} else {
-    $maximum_time = 0;
-}
-
-// set default values
-$timeout_passed = false;
-$error = false;
-$read_multiply = 1;
-$finished = false;
-$offset = 0;
-$max_sql_len = 0;
-$file_to_unlink = '';
-$sql_query = '';
-$sql_query_disabled = false;
-$go_sql = false;
-$executed_queries = 0;
-$run_query = true;
-$charset_conversion = false;
-$reset_charset = false;
-$bookmark_created = false;
-
-// Bookmark Support: get a query back from bookmark if required
-if (! empty($_REQUEST['id_bookmark'])) {
-    $id_bookmark = (int)$_REQUEST['id_bookmark'];
-    include_once 'libraries/bookmark.lib.php';
-    switch ($_REQUEST['action_bookmark']) {
-    case 0: // bookmarked query that have to be run
-        $import_text = PMA_Bookmark_get(
-            $db,
-            $id_bookmark,
-            'id',
-            isset($_REQUEST['action_bookmark_all'])
-        );
-        if (! empty($_REQUEST['bookmark_variable'])) {
-            $import_text = PMA_Bookmark_applyVariables(
-                $import_text
-            );
-        }
-
-        // refresh navigation and main panels
-        if (preg_match(
-            '/^(DROP)\s+(VIEW|TABLE|DATABASE|SCHEMA)\s+/i',
-            $import_text
-        )) {
-            $GLOBALS['reload'] = true;
-            $ajax_reload['reload'] = true;
-        }
-
-        // refresh navigation panel only
-        if (preg_match(
-            '/^(CREATE|ALTER)\s+(VIEW|TABLE|DATABASE|SCHEMA)\s+/i',
-            $import_text
-        )
-        ) {
-            $ajax_reload['reload'] = true;
-        }
-        break;
-    case 1: // bookmarked query that have to be displayed
-        $import_text = PMA_Bookmark_get($db, $id_bookmark);
-        if ($GLOBALS['is_ajax_request'] == true) {
-            $message = PMA\libraries\Message::success(__('Showing bookmark'));
-            $response = PMA\libraries\Response::getInstance();
-            $response->setRequestStatus($message->isSuccess());
-            $response->addJSON('message', $message);
-            $response->addJSON('sql_query', $import_text);
-            $response->addJSON('action_bookmark', $_REQUEST['action_bookmark']);
-            exit;
-        } else {
-            $run_query = false;
-        }
-        break;
-    case 2: // bookmarked query that have to be deleted
-        $import_text = PMA_Bookmark_get($db, $id_bookmark);
-        PMA_Bookmark_delete($id_bookmark);
-        if ($GLOBALS['is_ajax_request'] == true) {
-            $message = PMA\libraries\Message::success(
-                __('The bookmark has been deleted.')
-            );
-            $response = PMA\libraries\Response::getInstance();
-            $response->setRequestStatus($message->isSuccess());
-            $response->addJSON('message', $message);
-            $response->addJSON('action_bookmark', $_REQUEST['action_bookmark']);
-            $response->addJSON('id_bookmark', $id_bookmark);
-            exit;
-        } else {
-            $run_query = false;
-            $error = true; // this is kind of hack to skip processing the query
-        }
-        break;
-    }
-} // end bookmarks reading
-
-// Do no run query if we show PHP code
-if (isset($GLOBALS['show_as_php'])) {
-    $run_query = false;
-    $go_sql = true;
-}
-
-// We can not read all at once, otherwise we can run out of memory
-$memory_limit = trim(@ini_get('memory_limit'));
-// 2 MB as default
-if (empty($memory_limit)) {
-    $memory_limit = 2 * 1024 * 1024;
-}
-// In case no memory limit we work on 10MB chunks
-if ($memory_limit == -1) {
-    $memory_limit = 10 * 1024 * 1024;
-}
-
-// Calculate value of the limit
-$memoryUnit = mb_strtolower(substr($memory_limit, -1));
-if ('m' == $memoryUnit) {
-    $memory_limit = (int)substr($memory_limit, 0, -1) * 1024 * 1024;
-} elseif ('k' == $memoryUnit) {
-    $memory_limit = (int)substr($memory_limit, 0, -1) * 1024;
-} elseif ('g' == $memoryUnit) {
-    $memory_limit = (int)substr($memory_limit, 0, -1) * 1024 * 1024 * 1024;
-} else {
-    $memory_limit = (int)$memory_limit;
-}
-
-// Just to be sure, there might be lot of memory needed for uncompression
-$read_limit = $memory_limit / 8;
-
-// handle filenames
-if (isset($_FILES['import_file'])) {
-    $import_file = $_FILES['import_file']['tmp_name'];
-}
-if (! empty($local_import_file) && ! empty($cfg['UploadDir'])) {
-
-    // sanitize $local_import_file as it comes from a POST
-    $local_import_file = PMA_securePath($local_import_file);
-
-    $import_file = PMA\libraries\Util::userDir($cfg['UploadDir'])
-        . $local_import_file;
-
-    /*
-     * Do not allow symlinks to avoid security issues
-     * (user can create symlink to file he can not access,
-     * but phpMyAdmin can).
-     */
-    if (@is_link($import_file)) {
-        $import_file  = 'none';
-    }
-
-} elseif (empty($import_file) || ! is_uploaded_file($import_file)) {
-    $import_file  = 'none';
-}
-
-// Do we have file to import?
-
-if ($import_file != 'none' && ! $error) {
-    // work around open_basedir and other limitations
-    $open_basedir = @ini_get('open_basedir');
-
-    // If we are on a server with open_basedir, we must move the file
-    // before opening it.
-
-    if (! empty($open_basedir)) {
-        $tmp_subdir = ini_get('upload_tmp_dir');
-        if (empty($tmp_subdir)) {
-            $tmp_subdir = sys_get_temp_dir();
-        }
-        $tmp_subdir = rtrim($tmp_subdir, DIRECTORY_SEPARATOR);
-        if (@is_writable($tmp_subdir)) {
-            $import_file_new = $tmp_subdir . DIRECTORY_SEPARATOR
-                . basename($import_file) . uniqid();
-            if (move_uploaded_file($import_file, $import_file_new)) {
-                $import_file = $import_file_new;
-                $file_to_unlink = $import_file_new;
-            }
-
-            $size = filesize($import_file);
-        } else {
-
-            // If the php.ini is misconfigured (eg. there is no /tmp access defined
-            // with open_basedir), $tmp_subdir won't be writable and the user gets
-            // a 'File could not be read!' error (at PMA_detectCompression), which
-            // is not too meaningful. Show a meaningful error message to the user
-            // instead.
-
-            $message = PMA\libraries\Message::error(
-                __(
-                    'Uploaded file cannot be moved, because the server has ' .
-                    'open_basedir enabled without access to the %s directory ' .
-                    '(for temporary files).'
-                )
-            );
-            $message->addParam($tmp_subdir);
-            PMA_stopImport($message);
-        }
-    }
-
-    /**
-     *  Handle file compression
-     * @todo duplicate code exists in File.php
-     */
-    $compression = PMA_detectCompression($import_file);
-    if ($compression === false) {
-        $message = PMA\libraries\Message::error(__('File could not be read!'));
-        PMA_stopImport($message); //Contains an 'exit'
-    }
-
-    switch ($compression) {
-    case 'application/bzip2':
-        if ($cfg['BZipDump'] && @function_exists('bzopen')) {
-            $import_handle = @bzopen($import_file, 'r');
-        } else {
-            $message = PMA\libraries\Message::error(
-                __(
-                    'You attempted to load file with unsupported compression ' .
-                    '(%s). Either support for it is not implemented or disabled ' .
-                    'by your configuration.'
-                )
-            );
-            $message->addParam($compression);
-            PMA_stopImport($message);
-        }
-        break;
-    case 'application/gzip':
-        if ($cfg['GZipDump'] && @function_exists('gzopen')) {
-            $import_handle = @gzopen($import_file, 'r');
-        } else {
-            $message = PMA\libraries\Message::error(
-                __(
-                    'You attempted to load file with unsupported compression ' .
-                    '(%s). Either support for it is not implemented or disabled ' .
-                    'by your configuration.'
-                )
-            );
-            $message->addParam($compression);
-            PMA_stopImport($message);
-        }
-        break;
-    case 'application/zip':
-        if ($cfg['ZipDump'] && @function_exists('zip_open')) {
-            /**
-             * Load interface for zip extension.
-             */
-            include_once 'libraries/zip_extension.lib.php';
-            $zipResult = PMA_getZipContents($import_file);
-            if (! empty($zipResult['error'])) {
-                $message = PMA\libraries\Message::rawError($zipResult['error']);
-                PMA_stopImport($message);
-            } else {
-                $import_text = $zipResult['data'];
-            }
-        } else {
-            $message = PMA\libraries\Message::error(
-                __(
-                    'You attempted to load file with unsupported compression ' .
-                    '(%s). Either support for it is not implemented or disabled ' .
-                    'by your configuration.'
-                )
-            );
-            $message->addParam($compression);
-            PMA_stopImport($message);
-        }
-        break;
-    case 'none':
-        $import_handle = @fopen($import_file, 'r');
-        break;
-    default:
-        $message = PMA\libraries\Message::error(
-            __(
-                'You attempted to load file with unsupported compression (%s). ' .
-                'Either support for it is not implemented or disabled by your ' .
-                'configuration.'
-            )
-        );
-        $message->addParam($compression);
-        PMA_stopImport($message);
-        // the previous function exits
-    }
-    // use isset() because zip compression type does not use a handle
-    if (! $error && isset($import_handle) && $import_handle === false) {
-        $message = PMA\libraries\Message::error(__('File could not be read!'));
-        PMA_stopImport($message);
-    }
-} elseif (! $error) {
-    if (! isset($import_text) || empty($import_text)) {
-        $message = PMA\libraries\Message::error(
-            __(
-                'No data was received to import. Either no file name was ' .
-                'submitted, or the file size exceeded the maximum size permitted ' .
-                'by your PHP configuration. See [doc@faq1-16]FAQ 1.16[/doc].'
-            )
-        );
-        PMA_stopImport($message);
-    }
-}
-
-// so we can obtain the message
-//$_SESSION['Import_message'] = $message->getDisplay();
-
-// Convert the file's charset if necessary
-if ($GLOBALS['PMA_recoding_engine'] != PMA_CHARSET_NONE && isset($charset_of_file)) {
-    if ($charset_of_file != 'utf-8') {
-        $charset_conversion = true;
-    }
-} elseif (isset($charset_of_file) && $charset_of_file != 'utf-8') {
-    $GLOBALS['dbi']->query('SET NAMES \'' . $charset_of_file . '\'');
-    // We can not show query in this case, it is in different charset
-    $sql_query_disabled = true;
-    $reset_charset = true;
-}
-
-// Something to skip? (because timeout has passed)
-if (! $error && isset($_POST['skip'])) {
-    $original_skip = $skip = intval($_POST['skip']);
-    while ($skip > 0 && ! $finished) {
-        PMA_importGetNextChunk($skip < $read_limit ? $skip : $read_limit);
-        // Disable read progressivity, otherwise we eat all memory!
-        $read_multiply = 1;
-        $skip -= $read_limit;
-    }
-    unset($skip);
-}
-
-// This array contain the data like numberof valid sql queries in the statement
-// and complete valid sql statement (which affected for rows)
-$sql_data = array('valid_sql' => array(), 'valid_queries' => 0);
-
-if (! $error) {
-    // Check for file existence
-    include_once "libraries/plugin_interface.lib.php";
-    /* @var $import_plugin ImportPlugin */
-    $import_plugin = PMA_getPlugin(
-        "import",
-        $format,
-        'libraries/plugins/import/',
-        $import_type
-    );
-    if ($import_plugin == null) {
-        $message = PMA\libraries\Message::error(
-            __('Could not load import plugins, please check your installation!')
-        );
-        PMA_stopImport($message);
-    } else {
-        // Do the real import
-        try {
-            $default_fk_check = PMA\libraries\Util::handleDisableFKCheckInit();
-            $import_plugin->doImport($sql_data);
-            PMA\libraries\Util::handleDisableFKCheckCleanup($default_fk_check);
-        } catch (Exception $e) {
-            PMA\libraries\Util::handleDisableFKCheckCleanup($default_fk_check);
-            throw $e;
-        }
-    }
-}
-
-if (! empty($import_handle)) {
-    fclose($import_handle);
-}
-
-// Cleanup temporary file
-if ($file_to_unlink != '') {
-    unlink($file_to_unlink);
-}
-
-// Reset charset back, if we did some changes
-if ($reset_charset) {
-    $GLOBALS['dbi']->query('SET CHARACTER SET utf8');
-    $GLOBALS['dbi']->query(
-        'SET SESSION collation_connection =\'' . $collation_connection . '\''
-    );
-}
-
-// Show correct message
-if (! empty($id_bookmark) && $_REQUEST['action_bookmark'] == 2) {
-    $message = PMA\libraries\Message::success(__('The bookmark has been deleted.'));
-    $display_query = $import_text;
-    $error = false; // unset error marker, it was used just to skip processing
-} elseif (! empty($id_bookmark) && $_REQUEST['action_bookmark'] == 1) {
-    $message = PMA\libraries\Message::notice(__('Showing bookmark'));
-} elseif ($bookmark_created) {
-    $special_message = '[br]'  . sprintf(
-        __('Bookmark %s has been created.'),
-        htmlspecialchars($_POST['bkm_label'])
-    );
-} elseif ($finished && ! $error) {
-    // Do not display the query with message, we do it separately
-    $display_query = ';';
-    if ($import_type != 'query') {
-        $message = PMA\libraries\Message::success(
-            '<em>'
-            . _ngettext(
-                'Import has been successfully finished, %d query executed.',
-                'Import has been successfully finished, %d queries executed.',
-                $executed_queries
-            )
-            . '</em>'
-        );
-        $message->addParam($executed_queries);
-
-        if ($import_notice) {
-            $message->addString($import_notice);
-        }
-        if (! empty($local_import_file)) {
-            $message->addString('(' . htmlspecialchars($local_import_file) . ')');
-        } else {
-            $message->addString(
-                '(' . htmlspecialchars($_FILES['import_file']['name']) . ')'
-            );
-        }
-    }
-}
-
-// Did we hit timeout? Tell it user.
-if ($timeout_passed) {
-    $importUrl = $err_url .= '&timeout_passed=1&offset=' . urlencode(
-        $GLOBALS['offset']
-    );
-    if (isset($local_import_file)) {
-        $importUrl .= '&local_import_file=' . urlencode($local_import_file);
-    }
-    $message = PMA\libraries\Message::error(
-        __(
-            'Script timeout passed, if you want to finish import,'
-            . ' please %sresubmit the same file%s and import will resume.'
-        )
-    );
-    $message->addParam('<a href="' . $importUrl . '">', false);
-    $message->addParam('</a>', false);
-
-    if ($offset == 0 || (isset($original_skip) && $original_skip == $offset)) {
-        $message->addString(
-            __(
-                'However on last run no data has been parsed,'
-                . ' this usually means phpMyAdmin won\'t be able to'
-                . ' finish this import unless you increase php time limits.'
-            )
-        );
-    }
-}
-
-// if there is any message, copy it into $_SESSION as well,
-// so we can obtain it by AJAX call
-if (isset($message)) {
-    $_SESSION['Import_message']['message'] = $message->getDisplay();
-}
-// Parse and analyze the query, for correct db and table name
-// in case of a query typed in the query window
-// (but if the query is too large, in case of an imported file, the parser
-//  can choke on it so avoid parsing)
-$sqlLength = mb_strlen($sql_query);
-if ($sqlLength <= $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) {
-    include_once 'libraries/parse_analyze.lib.php';
-
-    list(
-        $analyzed_sql_results,
-        $db,
-        $table_from_sql
-    ) = PMA_parseAnalyze($sql_query, $db);
-    // @todo: possibly refactor
-    extract($analyzed_sql_results);
-
-    if ($table != $table_from_sql && !empty($table_from_sql)) {
-        $table = $table_from_sql;
-    }
-}
-
-// There was an error?
-if (isset($my_die)) {
-    foreach ($my_die as $key => $die) {
-        PMA\libraries\Util::mysqlDie(
-            $die['error'], $die['sql'], false, $err_url, $error
-        );
-    }
-}
-
-if ($go_sql) {
-
-    if (! empty($sql_data) && ($sql_data['valid_queries'] > 1)) {
-        $_SESSION['is_multi_query'] = true;
-        $sql_queries = $sql_data['valid_sql'];
-    } else {
-        $sql_queries = array($sql_query);
-    }
-
-    $html_output = '';
-
-    foreach ($sql_queries as $sql_query) {
-
-        // parse sql query
-        include_once 'libraries/parse_analyze.lib.php';
-        list(
-            $analyzed_sql_results,
-            $db,
-            $table_from_sql
-        ) = PMA_parseAnalyze($sql_query, $db);
-        // @todo: possibly refactor
-        extract($analyzed_sql_results);
-
-        // Check if User is allowed to issue a 'DROP DATABASE' Statement
-        if (PMA_hasNoRightsToDropDatabase(
-            $analyzed_sql_results, $cfg['AllowUserDropDatabase'], $GLOBALS['is_superuser']
-        )) {
-            PMA\libraries\Util::mysqlDie(
-                __('"DROP DATABASE" statements are disabled.'),
-                '',
-                false,
-                $_SESSION['Import_message']['go_back_url']
-            );
-            return;
-        } // end if
-
-        if ($table != $table_from_sql && !empty($table_from_sql)) {
-            $table = $table_from_sql;
-        }
-
-        $html_output .= PMA_executeQueryAndGetQueryResponse(
-            $analyzed_sql_results, // analyzed_sql_results
-            false, // is_gotofile
-            $db, // db
-            $table, // table
-            null, // find_real_end
-            null, // sql_query_for_bookmark - see below
-            null, // extra_data
-            null, // message_to_show
-            null, // message
-            null, // sql_data
-            $goto, // goto
-            $pmaThemeImage, // pmaThemeImage
-            null, // disp_query
-            null, // disp_message
-            null, // query_type
-            $sql_query, // sql_query
-            null, // selectedTables
-            null // complete_query
-        );
-    }
-
-    // sql_query_for_bookmark is not included in PMA_executeQueryAndGetQueryResponse
-    // since only one bookmark has to be added for all the queries submitted through
-    // the SQL tab
-    if (! empty($_POST['bkm_label']) && ! empty($import_text)) {
-        $cfgBookmark = PMA_Bookmark_getParams();
-        PMA_storeTheQueryAsBookmark(
-            $db, $cfgBookmark['user'],
-            $_REQUEST['sql_query'], $_POST['bkm_label'],
-            isset($_POST['bkm_replace']) ? $_POST['bkm_replace'] : null
-        );
-    }
-
-    $response = PMA\libraries\Response::getInstance();
-    $response->addJSON('ajax_reload', $ajax_reload);
-    $response->addHTML($html_output);
-    exit();
-
-} else if ($result) {
-    // Save a Bookmark with more than one queries (if Bookmark label given).
-    if (! empty($_POST['bkm_label']) && ! empty($import_text)) {
-        $cfgBookmark = PMA_Bookmark_getParams();
-        PMA_storeTheQueryAsBookmark(
-            $db, $cfgBookmark['user'],
-            $_REQUEST['sql_query'], $_POST['bkm_label'],
-            isset($_POST['bkm_replace']) ? $_POST['bkm_replace'] : null
-        );
-    }
-
-    $response = PMA\libraries\Response::getInstance();
-    $response->setRequestStatus(true);
-    $response->addJSON('message', PMA\libraries\Message::success($msg));
-    $response->addJSON(
-        'sql_query',
-        PMA\libraries\Util::getMessage($msg, $sql_query, 'success')
-    );
-} else if ($result == false) {
-    $response = PMA\libraries\Response::getInstance();
-    $response->setRequestStatus(false);
-    $response->addJSON('message', PMA\libraries\Message::error($msg));
-} else {
-    $active_page = $goto;
-    include '' . $goto;
-}
-
-// If there is request for ROLLBACK in the end.
-if (isset($_REQUEST['rollback_query'])) {
-    $GLOBALS['dbi']->query('ROLLBACK');
-}
diff --git a/#pma/import_status.php b/#pma/import_status.php
deleted file mode 100644
index 8c2449b2..00000000
--- a/#pma/import_status.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Import progress bar backend
- *
- * @package PhpMyAdmin
- */
-
-/* PHP 5.4 stores upload progress data only in the default session.
- * After calling session_name(), we won't find the progress data anymore.
- *
- * https://bugs.php.net/bug.php?id=64075
- *
- * The bug should be somewhere in
- * https://github.com/php/php-src/blob/master/ext/session/session.c#L2342
- *
- * Until this is fixed, we need to load the default session to load the data,
- * export the upload progress information from there,
- * and re-import after switching to our session.
- *
- * However, since https://github.com/phpmyadmin/phpmyadmin/commit/063a2d99
- * we have deactivated this feature, so the corresponding code is now
- * commented out.
- */
-
-/*
-if (version_compare(PHP_VERSION, '5.4.0', '>=')
-    && ini_get('session.upload_progress.enabled')
-) {
-
-    $sessionupload = array();
-    define('UPLOAD_PREFIX', ini_get('session.upload_progress.prefix'));
-
-    session_start();
-    foreach ($_SESSION as $key => $value) {
-        // only copy session-prefixed data
-        if (mb_substr($key, 0, mb_strlen(UPLOAD_PREFIX))
-            == UPLOAD_PREFIX) {
-            $sessionupload[$key] = $value;
-        }
-    }
-    // PMA will kill all variables, so let's use a constant
-    define('SESSIONUPLOAD', serialize($sessionupload));
-    session_write_close();
-
-    session_name('phpMyAdmin');
-    session_id($_COOKIE['phpMyAdmin']);
-}
- */
-
-define('PMA_MINIMUM_COMMON', 1);
-
-require_once 'libraries/common.inc.php';
-require_once 'libraries/display_import_ajax.lib.php';
-list(
-    $SESSION_KEY,
-    $upload_id,
-    $plugins
-) = PMA_uploadProgressSetup();
-
-/*
-if (defined('SESSIONUPLOAD')) {
-    // write sessionupload back into the loaded PMA session
-
-    $sessionupload = unserialize(SESSIONUPLOAD);
-    foreach ($sessionupload as $key => $value) {
-        $_SESSION[$key] = $value;
-    }
-
-    // remove session upload data that are not set anymore
-    foreach ($_SESSION as $key => $value) {
-        if (mb_substr($key, 0, mb_strlen(UPLOAD_PREFIX))
-            == UPLOAD_PREFIX
-            && ! isset($sessionupload[$key])
-        ) {
-            unset($_SESSION[$key]);
-        }
-    }
-}
- */
-
-// $_GET["message"] is used for asking for an import message
-if (isset($_GET["message"]) && $_GET["message"]) {
-
-    // AJAX requests can't be cached!
-    PMA_noCacheHeader();
-
-    header('Content-type: text/html');
-
-    // wait 0.3 sec before we check for $_SESSION variable,
-    // which is set inside import.php
-    usleep(300000);
-
-    $maximumTime = ini_get('max_execution_time');
-    $timestamp = time();
-    // wait until message is available
-    while ($_SESSION['Import_message']['message'] == null) {
-        // close session before sleeping
-        session_write_close();
-        // sleep
-        usleep(250000); // 0.25 sec
-        // reopen session
-        session_start();
-
-        if ((time() - $timestamp) > $maximumTime) {
-            $_SESSION['Import_message']['message'] = PMA\libraries\Message::error(
-                __('Could not load the progress of the import.')
-            )->getDisplay();
-            break;
-        }
-    }
-
-    echo $_SESSION['Import_message']['message'];
-    echo '<fieldset class="tblFooters">' , "\n";
-    echo '    [ <a href="' , $_SESSION['Import_message']['go_back_url']
-        . '">' , __('Back') , '</a> ]' , "\n";
-    echo '</fieldset>' , "\n";
-
-} else {
-    PMA_importAjaxStatus($_GET["id"]);
-}
diff --git a/#pma/index.php b/#pma/index.php
deleted file mode 100644
index 00b7dc1a..00000000
--- a/#pma/index.php
+++ /dev/null
@@ -1,703 +0,0 @@
-<?php
-$user_admin=$_COOKIE["user_admin"];
-require_once("../config/datenbankanbindung.php");     // f&uuml;gt die Datenbankanbindung ein: Sys:\php\includes\kurs\datenbankanbindung.php
-
-// Rechte�berpr�fung
-$db = dbconnect();
-if ($user_admin == ""){ require("index.php"); exit;} //Wenn man nicht angemeldet ist, darf man nicht auf die Seite
-$result = $db->query("SELECT DISTINCT 1
-                         FROM admin_rolle a, admin b, admin_rechte c, admin_rollen_user_zuord d, admin_rollen_rechte_zuord e
-                        WHERE a.rid = d.rid
-                          AND b.VAID = d.VAID
-                          AND a.rid = e.rid
-                          AND c.admin_rolle = e.admin_rolle
-                          AND b.user = '$user_admin'
-                          AND e.admin_rolle = 'a_pma'");
-$row = $result->fetch_array();
-if ($row[0] != 1){ require("../lib/rechte_subdir.php"); exit;}
-// Rechte�berpr�fung ende
-
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Main loader script
- *
- * @package PhpMyAdmin
- */
-use PMA\libraries\RecentFavoriteTable;
-
-/**
- * Gets some core libraries and displays a top message if required
- */
-require_once 'libraries/common.inc.php';
-
-/**
- * display Git revision if requested
- */
-require_once 'libraries/display_git_revision.lib.php';
-
-/**
- * pass variables to child pages
- */
-$drops = array(
-    'lang',
-    'server',
-    'collation_connection',
-    'db',
-    'table'
-);
-foreach ($drops as $each_drop) {
-    if (array_key_exists($each_drop, $_GET)) {
-        unset($_GET[$each_drop]);
-    }
-}
-unset($drops, $each_drop);
-
-/*
- * Black list of all scripts to which front-end must submit data.
- * Such scripts must not be loaded on home page.
- *
- */
-$target_blacklist = array (
-    'import.php', 'export.php'
-);
-
-// If we have a valid target, let's load that script instead
-if (! empty($_REQUEST['target'])
-    && is_string($_REQUEST['target'])
-    && ! preg_match('/^index/', $_REQUEST['target'])
-    && ! in_array($_REQUEST['target'], $target_blacklist)
-    && in_array($_REQUEST['target'], $goto_whitelist)
-) {
-    include $_REQUEST['target'];
-    exit;
-}
-
-if (isset($_REQUEST['ajax_request']) && ! empty($_REQUEST['access_time'])) {
-    exit;
-}
-
-// See FAQ 1.34
-if (! empty($_REQUEST['db'])) {
-    $page = null;
-    if (! empty($_REQUEST['table'])) {
-        $page = PMA\libraries\Util::getScriptNameForOption(
-            $GLOBALS['cfg']['DefaultTabTable'], 'table'
-        );
-    } else {
-        $page = PMA\libraries\Util::getScriptNameForOption(
-            $GLOBALS['cfg']['DefaultTabDatabase'], 'database'
-        );
-    }
-    include $page;
-    exit;
-}
-
-/**
- * Check if it is an ajax request to reload the recent tables list.
- */
-if ($GLOBALS['is_ajax_request'] && ! empty($_REQUEST['recent_table'])) {
-    $response = PMA\libraries\Response::getInstance();
-    $response->addJSON(
-        'list',
-        RecentFavoriteTable::getInstance('recent')->getHtmlList()
-    );
-    exit;
-}
-
-if ($GLOBALS['PMA_Config']->isGitRevision()) {
-    if (isset($_REQUEST['git_revision']) && $GLOBALS['is_ajax_request'] == true) {
-        PMA_printGitRevision();
-        exit;
-    }
-    echo '<div id="is_git_revision"></div>';
-}
-
-// Handles some variables that may have been sent by the calling script
-$GLOBALS['db'] = '';
-$GLOBALS['table'] = '';
-$show_query = '1';
-
-// Any message to display?
-if (! empty($message)) {
-    echo PMA\libraries\Util::getMessage($message);
-    unset($message);
-}
-
-$common_url_query =  PMA_URL_getCommon();
-$mysql_cur_user_and_host = '';
-
-// when $server > 0, a server has been chosen so we can display
-// all MySQL-related information
-if ($server > 0) {
-    include 'libraries/server_common.inc.php';
-
-    // Use the verbose name of the server instead of the hostname
-    // if a value is set
-    $server_info = '';
-    if (! empty($cfg['Server']['verbose'])) {
-        $server_info .= htmlspecialchars($cfg['Server']['verbose']);
-        if ($GLOBALS['cfg']['ShowServerInfo']) {
-            $server_info .= ' (';
-        }
-    }
-    if ($GLOBALS['cfg']['ShowServerInfo'] || empty($cfg['Server']['verbose'])) {
-        $server_info .= $GLOBALS['dbi']->getHostInfo();
-    }
-    if (! empty($cfg['Server']['verbose']) && $GLOBALS['cfg']['ShowServerInfo']) {
-        $server_info .= ')';
-    }
-    $mysql_cur_user_and_host = $GLOBALS['dbi']->fetchValue('SELECT USER();');
-
-    // should we add the port info here?
-    $short_server_info = (!empty($GLOBALS['cfg']['Server']['verbose'])
-                ? $GLOBALS['cfg']['Server']['verbose']
-                : $GLOBALS['cfg']['Server']['host']);
-}
-
-echo '<div id="maincontainer">' , "\n";
-// Anchor for favorite tables synchronization.
-echo RecentFavoriteTable::getInstance('favorite')->getHtmlSyncFavoriteTables();
-echo '<div id="main_pane_left">';
-if ($server > 0 || count($cfg['Servers']) > 1
-) {
-    if ($cfg['DBG']['demo']) {
-        echo '<div class="group">';
-        echo '<h2>' , __('phpMyAdmin Demo Server') , '</h2>';
-        echo '<p style="margin: 0.5em 1em 0.5em 1em">';
-        printf(
-            __(
-                'You are using the demo server. You can do anything here, but '
-                . 'please do not change root, debian-sys-maint and pma users. '
-                . 'More information is available at %s.'
-            ),
-            '<a href="url.php?url=https://demo.phpmyadmin.net/" target="_blank" rel="noopener noreferrer">demo.phpmyadmin.net</a>'
-        );
-        echo '</p>';
-        echo '</div>';
-    }
-    echo '<div class="group">';
-    echo '<h2>' , __('General settings') , '</h2>';
-    echo '<ul>';
-
-    /**
-     * Displays the MySQL servers choice form
-     */
-    if ($cfg['ServerDefault'] == 0
-        || (! $cfg['NavigationDisplayServers']
-        && (count($cfg['Servers']) > 1
-        || ($server == 0 && count($cfg['Servers']) == 1)))
-    ) {
-        echo '<li id="li_select_server" class="no_bullets" >';
-        include_once 'libraries/select_server.lib.php';
-        echo PMA\libraries\Util::getImage('s_host.png') , " "
-            , PMA_selectServer(true, true);
-        echo '</li>';
-    }
-
-    /**
-     * Displays the mysql server related links
-     */
-    if ($server > 0) {
-        include_once 'libraries/check_user_privileges.lib.php';
-
-        // Logout for advanced authentication
-        if ($cfg['Server']['auth_type'] != 'config') {
-            if ($cfg['ShowChgPassword']) {
-                $conditional_class = 'ajax';
-                PMA_printListItem(
-                    PMA\libraries\Util::getImage('s_passwd.png') . "&nbsp;" . __(
-                        'Change password'
-                    ),
-                    'li_change_password',
-                    'user_password.php' . $common_url_query,
-                    null,
-                    null,
-                    'change_password_anchor',
-                    "no_bullets",
-                    $conditional_class
-                );
-            }
-        } // end if
-        echo '    <li id="li_select_mysql_collation" class="no_bullets" >';
-        echo '        <form method="post" action="index.php">' , "\n"
-           . PMA_URL_getHiddenInputs(null, null, 4, 'collation_connection')
-           . '            <label for="select_collation_connection">' . "\n"
-           . '                ' . PMA\libraries\Util::getImage('s_asci.png')
-            . "&nbsp;" . __('Server connection collation') . "\n"
-           // put the doc link in the form so that it appears on the same line
-           . PMA\libraries\Util::showMySQLDocu('Charset-connection')
-           . ': ' .  "\n"
-           . '            </label>' . "\n"
-
-           . PMA_generateCharsetDropdownBox(
-               PMA_CSDROPDOWN_COLLATION,
-               'collation_connection',
-               'select_collation_connection',
-               $collation_connection,
-               true,
-               true
-           )
-           . '        </form>' . "\n"
-           . '    </li>' . "\n";
-    } // end of if ($server > 0)
-    echo '</ul>';
-    echo '</div>';
-}
-
-echo '<div class="group">';
-echo '<h2>' , __('Appearance settings') , '</h2>';
-echo '  <ul>';
-
-// Displays language selection combo
-if (empty($cfg['Lang'])) {
-    echo '<li id="li_select_lang" class="no_bullets">';
-    include_once 'libraries/display_select_lang.lib.php';
-    echo PMA\libraries\Util::getImage('s_lang.png') , " "
-        , PMA_getLanguageSelectorHtml();
-    echo '</li>';
-}
-
-// ThemeManager if available
-
-if ($GLOBALS['cfg']['ThemeManager']) {
-    echo '<li id="li_select_theme" class="no_bullets">';
-    echo PMA\libraries\Util::getImage('s_theme.png') , " "
-            ,  $_SESSION['PMA_Theme_Manager']->getHtmlSelectBox();
-    echo '</li>';
-}
-echo '<li id="li_select_fontsize">';
-echo PMA\libraries\Config::getFontsizeForm();
-echo '</li>';
-
-echo '</ul>';
-
-// User preferences
-
-if ($server > 0) {
-    echo '<ul>';
-    PMA_printListItem(
-        PMA\libraries\Util::getImage('b_tblops.png') . "&nbsp;" . __(
-            'More settings'
-        ),
-        'li_user_preferences',
-        'prefs_manage.php' . $common_url_query,
-        null,
-        null,
-        null,
-        "no_bullets"
-    );
-    echo '</ul>';
-}
-
-echo '</div>';
-
-
-echo '</div>';
-echo '<div id="main_pane_right">';
-
-
-if ($server > 0 && $GLOBALS['cfg']['ShowServerInfo']) {
-
-    echo '<div class="group">';
-    echo '<h2>' , __('Database server') , '</h2>';
-    echo '<ul>' , "\n";
-    PMA_printListItem(
-        __('Server:') . ' ' . $server_info,
-        'li_server_info'
-    );
-    PMA_printListItem(
-        __('Server type:') . ' ' . PMA\libraries\Util::getServerType(),
-        'li_server_type'
-    );
-    PMA_printListItem(
-        __('Server version:')
-        . ' '
-        . PMA_MYSQL_STR_VERSION . ' - ' . PMA_MYSQL_VERSION_COMMENT,
-        'li_server_version'
-    );
-    PMA_printListItem(
-        __('Protocol version:') . ' ' . $GLOBALS['dbi']->getProtoInfo(),
-        'li_mysql_proto'
-    );
-    PMA_printListItem(
-        __('User:') . ' ' . htmlspecialchars($mysql_cur_user_and_host),
-        'li_user_info'
-    );
-
-    echo '    <li id="li_select_mysql_charset">';
-    echo '        ' , __('Server charset:') , ' '
-       . '        <span lang="en" dir="ltr">';
-    echo '           ' , $mysql_charsets_descriptions[$mysql_charset_map['utf-8']];
-    echo '           (' , $mysql_charset_map['utf-8'] , ')'
-       . '        </span>'
-       . '    </li>'
-       . '  </ul>'
-       . ' </div>';
-}
-
-if ($GLOBALS['cfg']['ShowServerInfo']) {
-    echo '<div class="group">';
-    echo '<h2>' , __('Web server') , '</h2>';
-    echo '<ul>';
-    if ($GLOBALS['cfg']['ShowServerInfo']) {
-        PMA_printListItem($_SERVER['SERVER_SOFTWARE'], 'li_web_server_software');
-
-        if ($server > 0) {
-            $client_version_str = $GLOBALS['dbi']->getClientInfo();
-            if (preg_match('#\d+\.\d+\.\d+#', $client_version_str)) {
-                $client_version_str = 'libmysql - ' . $client_version_str;
-            }
-            PMA_printListItem(
-                __('Database client version:') . ' ' . $client_version_str,
-                'li_mysql_client_version'
-            );
-
-            $php_ext_string = __('PHP extension:') . ' ';
-
-            $extensions = PMA\libraries\Util::listPHPExtensions();
-
-            foreach ($extensions as $extension) {
-                $php_ext_string  .= '  ' . $extension
-                    . PMA\libraries\Util::showPHPDocu('book.' . $extension . '.php');
-            }
-
-            PMA_printListItem(
-                $php_ext_string,
-                'li_used_php_extension'
-            );
-
-            $php_version_string = __('PHP version:') . ' ' . phpversion();
-
-            PMA_printListItem(
-                $php_version_string,
-                'li_used_php_version'
-            );
-        }
-    }
-
-    echo '  </ul>';
-    echo ' </div>';
-}
-
-echo '<div class="group pmagroup">';
-echo '<h2>phpMyAdmin</h2>';
-echo '<ul>';
-$class = null;
-if ($GLOBALS['cfg']['VersionCheck']) {
-    $class = 'jsversioncheck';
-}
-PMA_printListItem(
-    __('Version information:') . ' <span class="version">' . PMA_VERSION . '</span>',
-    'li_pma_version',
-    null,
-    null,
-    null,
-    null,
-    $class
-);
-PMA_printListItem(
-    __('Documentation'),
-    'li_pma_docs',
-    PMA\libraries\Util::getDocuLink('index'),
-    null,
-    '_blank'
-);
-
-// does not work if no target specified, don't know why
-PMA_printListItem(
-    __('Official Homepage'),
-    'li_pma_homepage',
-    PMA_linkURL('https://www.phpmyadmin.net/'),
-    null,
-    '_blank'
-);
-PMA_printListItem(
-    __('Contribute'),
-    'li_pma_contribute',
-    PMA_linkURL('https://www.phpmyadmin.net/contribute/'),
-    null,
-    '_blank'
-);
-PMA_printListItem(
-    __('Get support'),
-    'li_pma_support',
-    PMA_linkURL('https://www.phpmyadmin.net/support/'),
-    null,
-    '_blank'
-);
-PMA_printListItem(
-    __('List of changes'),
-    'li_pma_changes',
-    'changelog.php' . PMA_URL_getCommon(),
-    null,
-    '_blank'
-);
-PMA_printListItem(
-    __('License'),
-    'li_pma_license',
-    'license.php' . PMA_URL_getCommon(),
-    null,
-    '_blank'
-);
-echo '    </ul>';
-echo ' </div>';
-
-echo '</div>';
-
-echo '</div>';
-
-/**
- * mbstring is used for handling multibytes inside parser, so it is good
- * to tell user something might be broken without it, see bug #1063149.
- */
-if (! @extension_loaded('mbstring')) {
-    trigger_error(
-        __(
-            'The mbstring PHP extension was not found and you seem to be using'
-            . ' a multibyte charset. Without the mbstring extension phpMyAdmin'
-            . ' is unable to split strings correctly and it may result in'
-            . ' unexpected results.'
-        ),
-        E_USER_WARNING
-    );
-}
-
-/**
- * Missing functionality
- */
-if (! extension_loaded('curl') && ! ini_get('allow_url_fopen')) {
-    trigger_error(
-        __(
-            'The curl extension was not found and allow_url_fopen is '
-            . 'disabled. Due to this some features such as error reporting '
-            . 'or version check are disabled.'
-        )
-    );
-}
-
-if ($cfg['LoginCookieValidityDisableWarning'] == false) {
-    /**
-     * Check whether session.gc_maxlifetime limits session validity.
-     */
-    $gc_time = (int)@ini_get('session.gc_maxlifetime');
-    if ($gc_time < $GLOBALS['cfg']['LoginCookieValidity'] ) {
-        trigger_error(
-            __(
-                'Your PHP parameter [a@https://php.net/manual/en/session.' .
-                'configuration.php#ini.session.gc-maxlifetime@_blank]session.' .
-                'gc_maxlifetime[/a] is lower than cookie validity configured ' .
-                'in phpMyAdmin, because of this, your login might expire sooner ' .
-                'than configured in phpMyAdmin.'
-            ),
-            E_USER_WARNING
-        );
-    }
-}
-
-/**
- * Check whether LoginCookieValidity is limited by LoginCookieStore.
- */
-if ($GLOBALS['cfg']['LoginCookieStore'] != 0
-    && $GLOBALS['cfg']['LoginCookieStore'] < $GLOBALS['cfg']['LoginCookieValidity']
-) {
-    trigger_error(
-        __(
-            'Login cookie store is lower than cookie validity configured in ' .
-            'phpMyAdmin, because of this, your login will expire sooner than ' .
-            'configured in phpMyAdmin.'
-        ),
-        E_USER_WARNING
-    );
-}
-
-/**
- * Check if user does not have defined blowfish secret and it is being used.
- */
-if (! empty($_SESSION['encryption_key'])) {
-    if (empty($GLOBALS['cfg']['blowfish_secret'])) {
-        trigger_error(
-            __(
-                'The configuration file now needs a secret passphrase (blowfish_secret).'
-            ),
-            E_USER_WARNING
-        );
-    } elseif (strlen($GLOBALS['cfg']['blowfish_secret']) < 32) {
-        trigger_error(
-            __(
-                'The secret passphrase in configuration (blowfish_secret) is too short.'
-            ),
-            E_USER_WARNING
-        );
-    }
-}
-
-/**
- * Check for existence of config directory which should not exist in
- * production environment.
- */
-if (@file_exists('config')) {
-    trigger_error(
-        __(
-            'Directory [code]config[/code], which is used by the setup script, ' .
-            'still exists in your phpMyAdmin directory. It is strongly ' .
-            'recommended to remove it once phpMyAdmin has been configured. ' .
-            'Otherwise the security of your server may be compromised by ' .
-            'unauthorized people downloading your configuration.'
-        ),
-        E_USER_WARNING
-    );
-}
-
-if ($server > 0) {
-    $cfgRelation = PMA_getRelationsParam();
-    if (! $cfgRelation['allworks']
-        && $cfg['PmaNoRelation_DisableWarning'] == false
-    ) {
-        $msg_text = __(
-            'The phpMyAdmin configuration storage is not completely '
-            . 'configured, some extended features have been deactivated. '
-            . '%sFind out why%s. '
-        );
-        if ($cfg['ZeroConf'] == true) {
-            $msg_text .= '<br>' .
-                __(
-                    'Or alternately go to \'Operations\' tab of any database '
-                    . 'to set it up there.'
-                );
-        }
-        $msg = PMA\libraries\Message::notice($msg_text);
-        $msg->addParam(
-            '<a href="./chk_rel.php'
-            . $common_url_query . '">',
-            false
-        );
-        $msg->addParam('</a>', false);
-        /* Show error if user has configured something, notice elsewhere */
-        if (!empty($cfg['Servers'][$server]['pmadb'])) {
-            $msg->isError(true);
-        }
-        $msg->display();
-    } // end if
-}
-
-/**
- * Warning about different MySQL library and server version
- * (a difference on the third digit does not count).
- * If someday there is a constant that we can check about mysqlnd,
- * we can use it instead of strpos().
- * If no default server is set, $GLOBALS['dbi'] is not defined yet.
- * We also do not warn if MariaDB is detected, as it has its own version
- * numbering.
- */
-if (isset($GLOBALS['dbi'])
-    && $cfg['ServerLibraryDifference_DisableWarning'] == false
-) {
-    $_client_info = $GLOBALS['dbi']->getClientInfo();
-    if ($server > 0
-        && mb_strpos($_client_info, 'mysqlnd') === false
-        && mb_strpos(PMA_MYSQL_STR_VERSION, 'MariaDB') === false
-        && substr(PMA_MYSQL_CLIENT_API, 0, 3) != substr(
-            PMA_MYSQL_INT_VERSION, 0, 3
-        )
-    ) {
-        trigger_error(
-            PMA_sanitize(
-                sprintf(
-                    __(
-                        'Your PHP MySQL library version %s differs from your ' .
-                        'MySQL server version %s. This may cause unpredictable ' .
-                        'behavior.'
-                    ),
-                    $_client_info,
-                    substr(
-                        PMA_MYSQL_STR_VERSION,
-                        0,
-                        strpos(PMA_MYSQL_STR_VERSION . '-', '-')
-                    )
-                )
-            ),
-            E_USER_NOTICE
-        );
-    }
-    unset($_client_info);
-}
-
-/**
- * Warning about Suhosin only if its simulation mode is not enabled
- */
-if ($cfg['SuhosinDisableWarning'] == false
-    && @ini_get('suhosin.request.max_value_length')
-    && @ini_get('suhosin.simulation') == '0'
-) {
-    trigger_error(
-        sprintf(
-            __(
-                'Server running with Suhosin. Please refer to %sdocumentation%s ' .
-                'for possible issues.'
-            ),
-            '[doc@faq1-38]',
-            '[/doc]'
-        ),
-        E_USER_WARNING
-    );
-}
-
-/**
- * Warning about incomplete translations.
- *
- * The data file is created while creating release by ./scripts/remove-incomplete-mo
- */
-if (@file_exists('libraries/language_stats.inc.php')) {
-    include 'libraries/language_stats.inc.php';
-    /*
-     * This message is intentionally not translated, because we're
-     * handling incomplete translations here and focus on english
-     * speaking users.
-     */
-    if (isset($GLOBALS['language_stats'][$lang])
-        && $GLOBALS['language_stats'][$lang] < $cfg['TranslationWarningThreshold']
-    ) {
-        trigger_error(
-            'You are using an incomplete translation, please help to make it '
-            . 'better by [a@https://www.phpmyadmin.net/translate/'
-            . '@_blank]contributing[/a].',
-            E_USER_NOTICE
-        );
-    }
-}
-
-/**
- * prints list item for main page
- *
- * @param string $name            displayed text
- * @param string $listId          id, used for css styles
- * @param string $url             make item as link with $url as target
- * @param string $mysql_help_page display a link to MySQL's manual
- * @param string $target          special target for $url
- * @param string $a_id            id for the anchor,
- *                                used for jQuery to hook in functions
- * @param string $class           class for the li element
- * @param string $a_class         class for the anchor element
- *
- * @return void
- */
-function PMA_printListItem($name, $listId = null, $url = null,
-    $mysql_help_page = null, $target = null, $a_id = null, $class = null,
-    $a_class = null
-) {
-    echo PMA\libraries\Template::get('list/item')
-        ->render(
-            array(
-                'content' => $name,
-                'id' => $listId,
-                'class' => $class,
-                'url' => array(
-                    'href' => $url,
-                    'target' => $target,
-                    'id' => $a_id,
-                    'class' => $a_class,
-                ),
-                'mysql_help_page' => $mysql_help_page,
-            )
-        );
-}
diff --git a/#pma/js/ajax.js b/#pma/js/ajax.js
deleted file mode 100644
index 04ea4050..00000000
--- a/#pma/js/ajax.js
+++ /dev/null
@@ -1,797 +0,0 @@
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * This object handles ajax requests for pages. It also
- * handles the reloading of the main menu and scripts.
- */
-var AJAX = {
-    /**
-     * @var bool active Whether we are busy
-     */
-    active: false,
-    /**
-     * @var object source The object whose event initialized the request
-     */
-    source: null,
-    /**
-     * @var object xhr A reference to the ajax request that is currently running
-     */
-    xhr: null,
-    /**
-     * @var object lockedTargets, list of locked targets
-     */
-    lockedTargets: {},
-    /**
-     * @var function Callback to execute after a successful request
-     *               Used by PMA_commonFunctions from common.js
-     */
-    _callback: function () {},
-    /**
-     * @var bool _debug Makes noise in your Firebug console
-     */
-    _debug: false,
-    /**
-     * @var object $msgbox A reference to a jQuery object that links to a message
-     *                     box that is generated by PMA_ajaxShowMessage()
-     */
-    $msgbox: null,
-    /**
-     * Given the filename of a script, returns a hash to be
-     * used to refer to all the events registered for the file
-     *
-     * @param key string key The filename for which to get the event name
-     *
-     * @return int
-     */
-    hash: function (key) {
-        /* http://burtleburtle.net/bob/hash/doobs.html#one */
-        key += "";
-        var len = key.length, hash = 0, i = 0;
-        for (; i < len; ++i) {
-            hash += key.charCodeAt(i);
-            hash += (hash << 10);
-            hash ^= (hash >> 6);
-        }
-        hash += (hash << 3);
-        hash ^= (hash >> 11);
-        hash += (hash << 15);
-        return Math.abs(hash);
-    },
-    /**
-     * Registers an onload event for a file
-     *
-     * @param file string   file The filename for which to register the event
-     * @param func function func The function to execute when the page is ready
-     *
-     * @return self For chaining
-     */
-    registerOnload: function (file, func) {
-        var eventName = 'onload_' + AJAX.hash(file);
-        $(document).bind(eventName, func);
-        if (this._debug) {
-            console.log(
-                // no need to translate
-                "Registered event " + eventName + " for file " + file
-            );
-        }
-        return this;
-    },
-    /**
-     * Registers a teardown event for a file. This is useful to execute functions
-     * that unbind events for page elements that are about to be removed.
-     *
-     * @param string   file The filename for which to register the event
-     * @param function func The function to execute when
-     *                      the page is about to be torn down
-     *
-     * @return self For chaining
-     */
-    registerTeardown: function (file, func) {
-        var eventName = 'teardown_' + AJAX.hash(file);
-        $(document).bind(eventName, func);
-        if (this._debug) {
-            console.log(
-                // no need to translate
-                "Registered event " + eventName + " for file " + file
-            );
-        }
-        return this;
-    },
-    /**
-     * Called when a page has finished loading, once for every
-     * file that registered to the onload event of that file.
-     *
-     * @param string file The filename for which to fire the event
-     *
-     * @return void
-     */
-    fireOnload: function (file) {
-        var eventName = 'onload_' + AJAX.hash(file);
-        $(document).trigger(eventName);
-        if (this._debug) {
-            console.log(
-                // no need to translate
-                "Fired event " + eventName + " for file " + file
-            );
-        }
-    },
-    /**
-     * Called just before a page is torn down, once for every
-     * file that registered to the teardown event of that file.
-     *
-     * @param string file The filename for which to fire the event
-     *
-     * @return void
-     */
-    fireTeardown: function (file) {
-        var eventName = 'teardown_' + AJAX.hash(file);
-        $(document).triggerHandler(eventName);
-        if (this._debug) {
-            console.log(
-                // no need to translate
-                "Fired event " + eventName + " for file " + file
-            );
-        }
-    },
-    /**
-     * function to handle lock page mechanism
-     *
-     * @param event the event object
-     *
-     * @return void
-     */
-    lockPageHandler: function(event) {
-        //Don't lock on enter.
-        if (0 === event.charCode) {
-            return;
-        }
-
-        var lockId = $(this).data('lock-id');
-        if (typeof lockId === 'undefined') {
-            return;
-        }
-        /*
-         * @todo Fix Code mirror does not give correct full value (query)
-         * in textarea, it returns only the change in content.
-         */
-        var newHash = null;
-        if (event.data.value == 1) {
-            newHash = AJAX.hash($(this).val());
-        } else {
-            newHash = AJAX.hash($(this).is(":checked"));
-        }
-        var oldHash = $(this).data('val-hash');
-        // Set lock if old value != new value
-        // otherwise release lock
-        if (oldHash !== newHash) {
-            AJAX.lockedTargets[lockId] = true;
-        } else {
-            delete AJAX.lockedTargets[lockId];
-        }
-        // Show lock icon if locked targets is not empty.
-        // otherwise remove lock icon
-        if (!jQuery.isEmptyObject(AJAX.lockedTargets)) {
-            $('#lock_page_icon').html(PMA_getImage('s_lock.png',PMA_messages.strLockToolTip).toString());
-        } else {
-            $('#lock_page_icon').html('');
-        }
-    },
-    /**
-     * resets the lock
-     *
-     * @return void
-     */
-    resetLock: function() {
-        AJAX.lockedTargets = {};
-        $('#lock_page_icon').html('');
-    },
-    handleMenu: {
-        replace: function (content) {
-            $('#floating_menubar').html(content)
-                // Remove duplicate wrapper
-                // TODO: don't send it in the response
-                .children().first().remove();
-            $('#topmenu').menuResizer(PMA_mainMenuResizerCallback);
-        }
-    },
-    /**
-     * Event handler for clicks on links and form submissions
-     *
-     * @param object e Event data
-     *
-     * @return void
-     */
-    requestHandler: function (event) {
-        // In some cases we don't want to handle the request here and either
-        // leave the browser deal with it natively (e.g: file download)
-        // or leave an existing ajax event handler present elsewhere deal with it
-        var href = $(this).attr('href');
-        if (typeof event != 'undefined' && (event.shiftKey || event.ctrlKey)) {
-            return true;
-        } else if ($(this).attr('target')) {
-            return true;
-        } else if ($(this).hasClass('ajax') || $(this).hasClass('disableAjax')) {
-            //reset the lockedTargets object, as specified AJAX operation has finished
-            AJAX.resetLock();
-            return true;
-        } else if (href && href.match(/^#/)) {
-            return true;
-        } else if (href && href.match(/^mailto/)) {
-            return true;
-        } else if ($(this).hasClass('ui-datepicker-next') ||
-            $(this).hasClass('ui-datepicker-prev')
-        ) {
-            return true;
-        }
-
-        if (typeof event != 'undefined') {
-            event.preventDefault();
-            event.stopImmediatePropagation();
-        }
-
-        //triggers a confirm dialog if:
-        //the user has performed some operations on loaded page
-        //the user clicks on some link, (won't trigger for buttons)
-        //the click event is not triggered by script
-        if (typeof event !== 'undefined' && event.type === 'click' &&
-            event.isTrigger !== true &&
-            !jQuery.isEmptyObject(AJAX.lockedTargets) &&
-            confirm(PMA_messages.strConfirmNavigation) === false
-        ) {
-            return false;
-        }
-        AJAX.resetLock();
-        var isLink = !! href || false;
-        var previousLinkAborted = false;
-
-        if (AJAX.active === true) {
-            // Cancel the old request if abortable, when the user requests
-            // something else. Otherwise silently bail out, as there is already
-            // a request well in progress.
-            if (AJAX.xhr) {
-                //In case of a link request, attempt aborting
-                AJAX.xhr.abort();
-                if(AJAX.xhr.status === 0 && AJAX.xhr.statusText === 'abort') {
-                    //If aborted
-                    AJAX.$msgbox = PMA_ajaxShowMessage(PMA_messages.strAbortedRequest);
-                    AJAX.active = false;
-                    AJAX.xhr = null;
-                    previousLinkAborted = true;
-                } else {
-                    //If can't abort
-                    return false;
-                }
-            } else {
-                //In case submitting a form, don't attempt aborting
-                return false;
-            }
-        }
-
-        AJAX.source = $(this);
-
-        $('html, body').animate({scrollTop: 0}, 'fast');
-
-        var url = isLink ? href : $(this).attr('action');
-        var params = 'ajax_request=true&ajax_page_request=true';
-        if (! isLink) {
-            params += '&' + $(this).serialize();
-        }
-        if (! (history && history.pushState)) {
-            // Add a list of menu hashes that we have in the cache to the request
-            params += PMA_MicroHistory.menus.getRequestParam();
-        }
-
-        if (AJAX._debug) {
-            console.log("Loading: " + url); // no need to translate
-        }
-
-        if (isLink) {
-            AJAX.active = true;
-            AJAX.$msgbox = PMA_ajaxShowMessage();
-            //Save reference for the new link request
-            AJAX.xhr = $.get(url, params, AJAX.responseHandler);
-            if (history && history.pushState) {
-                var state = {
-                    url : href
-                };
-                if (previousLinkAborted) {
-                    //hack: there is already an aborted entry on stack
-                    //so just modify the aborted one
-                    history.replaceState(state, null, href);
-                } else {
-                    history.pushState(state, null, href);
-                }
-            }
-        } else {
-            /**
-             * Manually fire the onsubmit event for the form, if any.
-             * The event was saved in the jQuery data object by an onload
-             * handler defined below. Workaround for bug #3583316
-             */
-            var onsubmit = $(this).data('onsubmit');
-            // Submit the request if there is no onsubmit handler
-            // or if it returns a value that evaluates to true
-            if (typeof onsubmit !== 'function' || onsubmit.apply(this, [event])) {
-                AJAX.active = true;
-                AJAX.$msgbox = PMA_ajaxShowMessage();
-                $.post(url, params, AJAX.responseHandler);
-            }
-        }
-    },
-    /**
-     * Called after the request that was initiated by this.requestHandler()
-     * has completed successfully or with a caught error. For completely
-     * failed requests or requests with uncaught errors, see the .ajaxError
-     * handler at the bottom of this file.
-     *
-     * To refer to self use 'AJAX', instead of 'this' as this function
-     * is called in the jQuery context.
-     *
-     * @param object e Event data
-     *
-     * @return void
-     */
-    responseHandler: function (data) {
-        if (typeof data === 'undefined' || data === null) {
-            return;
-        }
-        if (typeof data.success != 'undefined' && data.success) {
-            $('html, body').animate({scrollTop: 0}, 'fast');
-            PMA_ajaxRemoveMessage(AJAX.$msgbox);
-
-            if (data._redirect) {
-                PMA_ajaxShowMessage(data._redirect, false);
-                AJAX.active = false;
-                AJAX.xhr = null;
-                return;
-            }
-
-            AJAX.scriptHandler.reset(function () {
-                if (data._reloadNavigation) {
-                    PMA_reloadNavigation();
-                }
-                if (data._title) {
-                    $('title').replaceWith(data._title);
-                }
-                if (data._menu) {
-                    if (history && history.pushState) {
-                        var state = {
-                            url : data._selflink,
-                            menu : data._menu
-                        };
-                        history.replaceState(state, null);
-                        AJAX.handleMenu.replace(data._menu);
-                    } else {
-                        PMA_MicroHistory.menus.replace(data._menu);
-                        PMA_MicroHistory.menus.add(data._menuHash, data._menu);
-                    }
-                } else if (data._menuHash) {
-                    if (! (history && history.pushState)) {
-                        PMA_MicroHistory.menus.replace(PMA_MicroHistory.menus.get(data._menuHash));
-                    }
-                }
-                if (data._disableNaviSettings) {
-                    PMA_disableNaviSettings();
-                }
-                else {
-                    PMA_ensureNaviSettings(data._selflink);
-                }
-
-                // Remove all containers that may have
-                // been added outside of #page_content
-                $('body').children()
-                    .not('#pma_navigation')
-                    .not('#floating_menubar')
-                    .not('#page_nav_icons')
-                    .not('#page_content')
-                    .not('#selflink')
-                    .not('#pma_header')
-                    .not('#pma_footer')
-                    .not('#pma_demo')
-                    .not('#pma_console_container')
-                    .not('#prefs_autoload')
-                    .remove();
-                // Replace #page_content with new content
-                if (data.message && data.message.length > 0) {
-                    $('#page_content').replaceWith(
-                        "<div id='page_content'>" + data.message + "</div>"
-                    );
-                    PMA_highlightSQL($('#page_content'));
-                    checkNumberOfFields();
-                }
-
-                if (data._selflink) {
-                    var source = data._selflink.split('?')[0];
-                    //Check for faulty links
-                    $selflink_replace = {
-                        "import.php": "tbl_sql.php",
-                        "tbl_chart.php": "sql.php",
-                        "tbl_gis_visualization.php": "sql.php"
-                    };
-                    if ($selflink_replace[source]) {
-                        var replacement = $selflink_replace[source];
-                        data._selflink = data._selflink.replace(source, replacement);
-                    }
-                    $('#selflink').find('> a').attr('href', data._selflink);
-                }
-                if (data._params) {
-                    PMA_commonParams.setAll(data._params);
-                }
-                if (data._scripts) {
-                    AJAX.scriptHandler.load(data._scripts);
-                }
-                if (data._selflink && data._scripts && data._menuHash && data._params) {
-                    if (! (history && history.pushState)) {
-                        PMA_MicroHistory.add(
-                            data._selflink,
-                            data._scripts,
-                            data._menuHash,
-                            data._params,
-                            AJAX.source.attr('rel')
-                        );
-                    }
-                }
-                if (data._displayMessage) {
-                    $('#page_content').prepend(data._displayMessage);
-                    PMA_highlightSQL($('#page_content'));
-                }
-
-                $('#pma_errors').remove();
-
-                var msg = '';
-                if(data._errSubmitMsg){
-                    msg = data._errSubmitMsg;
-                }
-                if (data._errors) {
-                    $('<div/>', {id : 'pma_errors', class : 'clearfloat'})
-                        .insertAfter('#selflink')
-                        .append(data._errors);
-                    // bind for php error reporting forms (bottom)
-                    $("#pma_ignore_errors_bottom").bind("click", function(e) {
-                        e.preventDefault();
-                        PMA_ignorePhpErrors();
-                    });
-                    $("#pma_ignore_all_errors_bottom").bind("click", function(e) {
-                        e.preventDefault();
-                        PMA_ignorePhpErrors(false);
-                    });
-                    // In case of 'sendErrorReport'='always'
-                    // submit the hidden error reporting form.
-                    if (data._sendErrorAlways == '1' &&
-                        data._stopErrorReportLoop != '1'
-                    ) {
-                        $("#pma_report_errors_form").submit();
-                        PMA_ajaxShowMessage(PMA_messages.phpErrorsBeingSubmitted, false);
-                        $('html, body').animate({scrollTop:$(document).height()}, 'slow');
-                    } else if (data._promptPhpErrors) {
-                        // otherwise just prompt user if it is set so.
-                        msg = msg + PMA_messages.phpErrorsFound;
-                        // scroll to bottom where all the errors are displayed.
-                        $('html, body').animate({scrollTop:$(document).height()}, 'slow');
-                    }
-                }
-                PMA_ajaxShowMessage(msg, false);
-                // bind for php error reporting forms (popup)
-                $("#pma_ignore_errors_popup").bind("click", function() {
-                    PMA_ignorePhpErrors();
-                });
-                $("#pma_ignore_all_errors_popup").bind("click", function() {
-                    PMA_ignorePhpErrors(false);
-                });
-
-                if (typeof AJAX._callback === 'function') {
-                    AJAX._callback.call();
-                }
-                AJAX._callback = function () {};
-            });
-
-        } else {
-            PMA_ajaxShowMessage(data.error, false);
-            AJAX.active = false;
-            AJAX.xhr = null;
-            PMA_handleRedirectAndReload(data);
-            if (data.fieldWithError) {
-                $(':input.error').removeClass("error");
-                $('#'+data.fieldWithError).addClass("error");
-            }
-        }
-    },
-    /**
-     * This object is in charge of downloading scripts,
-     * keeping track of what's downloaded and firing
-     * the onload event for them when the page is ready.
-     */
-    scriptHandler: {
-        /**
-         * @var array _scripts The list of files already downloaded
-         */
-        _scripts: [],
-        /**
-         * @var string _scriptsVersion version of phpMyAdmin from which the
-         *                             scripts have been loaded
-         */
-        _scriptsVersion: null,
-        /**
-         * @var array _scriptsToBeLoaded The list of files that
-         *                               need to be downloaded
-         */
-        _scriptsToBeLoaded: [],
-        /**
-         * @var array _scriptsToBeFired The list of files for which
-         *                              to fire the onload event
-         */
-        _scriptsToBeFired: [],
-        /**
-         * Records that a file has been downloaded
-         *
-         * @param string file The filename
-         * @param string fire Whether this file will be registering
-         *                    onload/teardown events
-         *
-         * @return self For chaining
-         */
-        add: function (file, fire) {
-            this._scripts.push(file);
-            if (fire) {
-                // Record whether to fire any events for the file
-                // This is necessary to correctly tear down the initial page
-                this._scriptsToBeFired.push(file);
-            }
-            return this;
-        },
-        /**
-         * Download a list of js files in one request
-         *
-         * @param array files An array of filenames and flags
-         *
-         * @return void
-         */
-        load: function (files, callback) {
-            var self = this;
-            // Clear loaded scripts if they are from another version of phpMyAdmin.
-            // Depends on common params being set before loading scripts in responseHandler
-            if (self._scriptsVersion === null) {
-                self._scriptsVersion = PMA_commonParams.get('PMA_VERSION');
-            } else if (self._scriptsVersion != PMA_commonParams.get('PMA_VERSION')) {
-                self._scripts = [];
-                self._scriptsVersion = PMA_commonParams.get('PMA_VERSION');
-            }
-            self._scriptsToBeLoaded = [];
-            self._scriptsToBeFired = [];
-            for (var i in files) {
-                self._scriptsToBeLoaded.push(files[i].name);
-                if (files[i].fire) {
-                    self._scriptsToBeFired.push(files[i].name);
-                }
-            }
-            // Generate a request string
-            var request = [];
-            var needRequest = false;
-            for (var index in self._scriptsToBeLoaded) {
-                var script = self._scriptsToBeLoaded[index];
-                // Only for scripts that we don't already have
-                if ($.inArray(script, self._scripts) == -1) {
-                    needRequest = true;
-                    this.add(script);
-                    request.push("scripts%5B%5D=" + script);
-                }
-            }
-            request.push("call_done=1");
-            request.push("v=" + encodeURIComponent(PMA_commonParams.get('PMA_VERSION')));
-            // Download the composite js file, if necessary
-            if (needRequest) {
-                this.appendScript("js/get_scripts.js.php?" + request.join("&"));
-            } else {
-                self.done(callback);
-            }
-        },
-        /**
-         * Called whenever all files are loaded
-         *
-         * @return void
-         */
-        done: function (callback) {
-            if($.isFunction(callback)) {
-                callback();
-            }
-            if (typeof ErrorReport !== 'undefined') {
-                ErrorReport.wrap_global_functions();
-            }
-            for (var i in this._scriptsToBeFired) {
-                AJAX.fireOnload(this._scriptsToBeFired[i]);
-            }
-            AJAX.active = false;
-        },
-        /**
-         * Appends a script element to the head to load the scripts
-         *
-         * @return void
-         */
-        appendScript: function (url) {
-            var head = document.head || document.getElementsByTagName('head')[0];
-            var script = document.createElement('script');
-            script.type = 'text/javascript';
-            script.src = url;
-            script.async = false;
-            head.appendChild(script);
-        },
-        /**
-         * Fires all the teardown event handlers for the current page
-         * and rebinds all forms and links to the request handler
-         *
-         * @param function callback The callback to call after resetting
-         *
-         * @return void
-         */
-        reset: function (callback) {
-            for (var i in this._scriptsToBeFired) {
-                AJAX.fireTeardown(this._scriptsToBeFired[i]);
-            }
-            this._scriptsToBeFired = [];
-            /**
-             * Re-attach a generic event handler to clicks
-             * on pages and submissions of forms
-             */
-            $(document).off('click', 'a').on('click', 'a', AJAX.requestHandler);
-            $(document).off('submit', 'form').on('submit', 'form', AJAX.requestHandler);
-            if (! (history && history.pushState)) {
-                PMA_MicroHistory.update();
-            }
-            callback();
-        }
-    }
-};
-
-/**
- * Here we register a function that will remove the onsubmit event from all
- * forms that will be handled by the generic page loader. We then save this
- * event handler in the "jQuery data", so that we can fire it up later in
- * AJAX.requestHandler().
- *
- * See bug #3583316
- */
-AJAX.registerOnload('functions.js', function () {
-    // Registering the onload event for functions.js
-    // ensures that it will be fired for all pages
-    $('form').not('.ajax').not('.disableAjax').each(function () {
-        if ($(this).attr('onsubmit')) {
-            $(this).data('onsubmit', this.onsubmit).attr('onsubmit', '');
-        }
-    });
-
-    var $page_content = $('#page_content');
-    /**
-     * Workaround for passing submit button name,value on ajax form submit
-     * by appending hidden element with submit button name and value.
-     */
-    $page_content.on('click', 'form input[type=submit]', function() {
-        var buttonName = $(this).attr('name');
-        if (typeof buttonName === 'undefined') {
-            return;
-        }
-        $(this).closest('form').append($('<input/>', {
-            'type' : 'hidden',
-            'name' : buttonName,
-            'value': $(this).val()
-        }));
-    });
-
-    /**
-     * Attach event listener to events when user modify visible
-     * Input,Textarea and select fields to make changes in forms
-     */
-    $page_content.on(
-        'keyup change',
-        'form.lock-page textarea, ' +
-        'form.lock-page input[type="text"], ' +
-        'form.lock-page input[type="number"], ' +
-        'form.lock-page select',
-        {value:1},
-        AJAX.lockPageHandler
-    );
-    $page_content.on(
-        'change',
-        'form.lock-page input[type="checkbox"], ' +
-        'form.lock-page input[type="radio"]',
-        {value:2},
-        AJAX.lockPageHandler
-    );
-    /**
-     * Reset lock when lock-page form reset event is fired
-     * Note: reset does not bubble in all browser so attach to
-     * form directly.
-     */
-    $('form.lock-page').on('reset', function(event){
-        AJAX.resetLock();
-    });
-});
-
-/**
- * Page load event handler
- */
-$(function () {
-    var menuContent = $('<div></div>')
-        .append($('#serverinfo').clone())
-        .append($('#topmenucontainer').clone())
-        .html();
-    if (history && history.pushState) {
-        //set initial state reload
-        var initState = ('state' in window.history && window.history.state !== null);
-        var initURL = $('#selflink').find('> a').attr('href') || location.href;
-        var state = {
-            url : initURL,
-            menu : menuContent
-        };
-        history.replaceState(state, null);
-
-        $(window).on('popstate', function(event) {
-            var initPop = (! initState && location.href == initURL);
-            initState = true;
-            //check if popstate fired on first page itself
-            if (initPop) {
-                return;
-            }
-            var state = event.originalEvent.state;
-            if (state && state.menu) {
-                AJAX.$msgbox = PMA_ajaxShowMessage();
-                var params = 'ajax_request=true&ajax_page_request=true';
-                var url = state.url || location.href;
-                $.get(url, params, AJAX.responseHandler);
-                //TODO: Check if sometimes menu is not retrieved from server,
-                // Not sure but it seems menu was missing only for printview which
-                // been removed lately, so if it's right some dead menu checks/fallbacks
-                // may need to be removed from this file and Header.php
-                //AJAX.handleMenu.replace(event.originalEvent.state.menu);
-            }
-        });
-    } else {
-        // Fallback to microhistory mechanism
-        AJAX.scriptHandler
-            .load([{'name' : 'microhistory.js', 'fire' : 1}], function () {
-                // The cache primer is set by the footer class
-                if (PMA_MicroHistory.primer.url) {
-                    PMA_MicroHistory.menus.add(
-                        PMA_MicroHistory.primer.menuHash,
-                        menuContent
-                    );
-                }
-                $(function () {
-                    // Queue up this event twice to make sure that we get a copy
-                    // of the page after all other onload events have been fired
-                    if (PMA_MicroHistory.primer.url) {
-                        PMA_MicroHistory.add(
-                            PMA_MicroHistory.primer.url,
-                            PMA_MicroHistory.primer.scripts,
-                            PMA_MicroHistory.primer.menuHash
-                        );
-                    }
-                });
-            });
-    }
-});
-
-/**
- * Attach a generic event handler to clicks
- * on pages and submissions of forms
- */
-$(document).on('click', 'a', AJAX.requestHandler);
-$(document).on('submit', 'form', AJAX.requestHandler);
-
-/**
- * Gracefully handle fatal server errors
- * (e.g: 500 - Internal server error)
- */
-$(document).ajaxError(function (event, request, settings) {
-    if (request.status !== 0) { // Don't handle aborted requests
-        var errorCode = PMA_sprintf(PMA_messages.strErrorCode, request.status);
-        var errorText = PMA_sprintf(PMA_messages.strErrorText, request.statusText);
-        PMA_ajaxShowMessage(
-            '<div class="error">' +
-            PMA_messages.strErrorProcessingRequest +
-            '<div>' + escapeHtml(errorCode) + '</div>' +
-            '<div>' + escapeHtml(errorText) + '</div>' +
-            '</div>',
-            false
-        );
-        AJAX.active = false;
-    }
-});
diff --git a/#pma/js/big_ints.js b/#pma/js/big_ints.js
deleted file mode 100644
index f50cefb3..00000000
--- a/#pma/js/big_ints.js
+++ /dev/null
@@ -1,67 +0,0 @@
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * phpMyAdmin's BigInts library
- */
-
-/**
- * @var BigInts object to handle big integers (in string)
- *      as JS can handle upto 53 bits of precision only.
- */
-var BigInts = {
-
-    /**
-     * Compares two integer strings
-     *
-     * @param int1 the string representation of 1st integer
-     * @param int2 the string representation of 2nd integer
-     *
-     * @return int 0 if equal, < 0 if int1 < int2, else > 0
-     */
-    compare: function(int1, int2) {
-        // trim integers
-        int1 = int1.trim();
-        int2 = int2.trim();
-        // length of integer strings
-        var len1 = int1.length;
-        var len2 = int2.length;
-        // integer is -ve or not
-        var isNeg1 = (int1[0] === '-');
-        var isNeg2 = (int2[0] === '-');
-        // Sign of int1 != int2 then no actual comparison
-        // is needed we can return result directly
-        if (isNeg1 !== isNeg2) {
-            return (isNeg1 === true ? -1 : 1);
-        }
-        // replace - sign with 0
-        int1[0] = isNeg1 ? '0' : int1[0];
-        int2[0] = isNeg2 ? '0' : int2[0];
-        // pad integers with 0 to make them
-        // equal length
-        int1 = BigInts.lpad(int1, len2);
-        int2 = BigInts.lpad(int2, len1);
-        // Now they are good to compare as strings
-        if (int1 !== int2) {
-            return (int1 < int2 ? -1 : 1);
-        }
-        return 0;
-    },
-
-    /**
-     * Adds leading zeros to a integer given a total length
-     *
-     * @param int   the string representation of the integer
-     * @param total the total length required
-     *
-     * @return int the integer of length given with added leading
-     *             zeros if necessary
-     */
-    lpad: function(int, total){
-        var len = int.length;
-        var pad = '';
-        while(len < total) {
-            pad += '0';
-            len++;
-        }
-        return (pad + int);
-    }
-};
diff --git a/#pma/js/chart.js b/#pma/js/chart.js
deleted file mode 100644
index 93153add..00000000
--- a/#pma/js/chart.js
+++ /dev/null
@@ -1,664 +0,0 @@
-/**
- * Chart type enumerations
- */
-var ChartType = {
-    LINE : 'line',
-    SPLINE : 'spline',
-    AREA : 'area',
-    BAR : 'bar',
-    COLUMN : 'column',
-    PIE : 'pie',
-    TIMELINE: 'timeline',
-    SCATTER: 'scatter'
-};
-
-/**
- * Column type enumeration
- */
-var ColumnType = {
-    STRING : 'string',
-    NUMBER : 'number',
-    BOOLEAN : 'boolean',
-    DATE : 'date'
-};
-
-/**
- * Abstract chart factory which defines the contract for chart factories
- */
-var ChartFactory = function () {
-};
-ChartFactory.prototype = {
-    createChart : function (type, options) {
-        throw new Error("createChart must be implemented by a subclass");
-    }
-};
-
-/**
- * Abstract chart which defines the contract for charts
- *
- * @param elementId
- *            id of the div element the chart is drawn in
- */
-var Chart = function (elementId) {
-    this.elementId = elementId;
-};
-Chart.prototype = {
-    draw : function (data, options) {
-        throw new Error("draw must be implemented by a subclass");
-    },
-    redraw : function (options) {
-        throw new Error("redraw must be implemented by a subclass");
-    },
-    destroy : function () {
-        throw new Error("destroy must be implemented by a subclass");
-    },
-    toImageString : function() {
-        throw new Error("toImageString must be implemented by a subclass");
-    }
-};
-
-/**
- * Abstract representation of charts that operates on DataTable where,<br />
- * <ul>
- * <li>First column provides index to the data.</li>
- * <li>Each subsequent columns are of type
- * <code>ColumnType.NUMBER<code> and represents a data series.</li>
- * </ul>
- * Line chart, area chart, bar chart, column chart are typical examples.
- *
- * @param elementId
- *            id of the div element the chart is drawn in
- */
-var BaseChart = function (elementId) {
-    Chart.call(this, elementId);
-};
-BaseChart.prototype = new Chart();
-BaseChart.prototype.constructor = BaseChart;
-BaseChart.prototype.validateColumns = function (dataTable) {
-    var columns = dataTable.getColumns();
-    if (columns.length < 2) {
-        throw new Error("Minimum of two columns are required for this chart");
-    }
-    for (var i = 1; i < columns.length; i++) {
-        if (columns[i].type != ColumnType.NUMBER) {
-            throw new Error("Column " + (i + 1) + " should be of type 'Number'");
-        }
-    }
-    return true;
-};
-
-/**
- * Abstract pie chart
- *
- * @param elementId
- *            id of the div element the chart is drawn in
- */
-var PieChart = function (elementId) {
-    BaseChart.call(this, elementId);
-};
-PieChart.prototype = new BaseChart();
-PieChart.prototype.constructor = PieChart;
-PieChart.prototype.validateColumns = function (dataTable) {
-    var columns = dataTable.getColumns();
-    if (columns.length > 2) {
-        throw new Error("Pie charts can draw only one series");
-    }
-    return BaseChart.prototype.validateColumns.call(this, dataTable);
-};
-
-/**
- * Abstract timeline chart
- *
- * @param elementId
- *            id of the div element the chart is drawn in
- */
-var TimelineChart = function (elementId) {
-    BaseChart.call(this, elementId);
-};
-TimelineChart.prototype = new BaseChart();
-TimelineChart.prototype.constructor = TimelineChart;
-TimelineChart.prototype.validateColumns = function (dataTable) {
-    var result = BaseChart.prototype.validateColumns.call(this, dataTable);
-    if (result) {
-        var columns = dataTable.getColumns();
-        if (columns[0].type != ColumnType.DATE) {
-            throw new Error("First column of timeline chart need to be a date column");
-        }
-    }
-    return result;
-};
-
-/**
- * Abstract scatter chart
- *
- * @param elementId
- *            id of the div element the chart is drawn in
- */
-var ScatterChart = function(elementId) {
-    BaseChart.call(this, elementId);
-};
-ScatterChart.prototype = new BaseChart();
-ScatterChart.prototype.constructor = ScatterChart;
-ScatterChart.prototype.validateColumns = function (dataTable) {
-    var result = BaseChart.prototype.validateColumns.call(this, dataTable);
-    if (result) {
-        var columns = dataTable.getColumns();
-        if (columns[0].type != ColumnType.NUMBER) {
-            throw new Error("First column of scatter chart need to be a numeric column");
-        }
-    }
-    return result;
-};
-
-/**
- * The data table contains column information and data for the chart.
- */
-var DataTable = function () {
-    var columns = [];
-    var data = null;
-
-    this.addColumn = function (type, name) {
-        columns.push({
-            'type' : type,
-            'name' : name
-        });
-    };
-
-    this.getColumns = function () {
-        return columns;
-    };
-
-    this.setData = function (rows) {
-        data = rows;
-        fillMissingValues();
-    };
-
-    this.getData = function () {
-        return data;
-    };
-
-    var fillMissingValues = function () {
-        if (columns.length === 0) {
-            throw new Error("Set columns first");
-        }
-        var row;
-        for (var i = 0; i < data.length; i++) {
-            row = data[i];
-            if (row.length > columns.length) {
-                row.splice(columns.length - 1, row.length - columns.length);
-            } else if (row.length < columns.length) {
-                for (var j = row.length; j < columns.length; j++) {
-                    row.push(null);
-                }
-            }
-        }
-    };
-};
-
-/*******************************************************************************
- * JQPlot specific code
- ******************************************************************************/
-
-/**
- * Abstract JQplot chart
- *
- * @param elementId
- *            id of the div element the chart is drawn in
- */
-var JQPlotChart = function (elementId) {
-    Chart.call(this, elementId);
-    this.plot = null;
-    this.validator = null;
-};
-JQPlotChart.prototype = new Chart();
-JQPlotChart.prototype.constructor = JQPlotChart;
-JQPlotChart.prototype.draw = function (data, options) {
-    if (this.validator.validateColumns(data)) {
-        this.plot = $.jqplot(this.elementId, this.prepareData(data), this
-                .populateOptions(data, options));
-    }
-};
-JQPlotChart.prototype.destroy = function () {
-    if (this.plot !== null) {
-        this.plot.destroy();
-    }
-};
-JQPlotChart.prototype.redraw = function (options) {
-    if (this.plot !== null) {
-        this.plot.replot(options);
-    }
-};
-JQPlotChart.prototype.toImageString = function (options) {
-    if (this.plot !== null) {
-        return $('#' + this.elementId).jqplotToImageStr({});
-    }
-};
-JQPlotChart.prototype.populateOptions = function (dataTable, options) {
-    throw new Error("populateOptions must be implemented by a subclass");
-};
-JQPlotChart.prototype.prepareData = function (dataTable) {
-    throw new Error("prepareData must be implemented by a subclass");
-};
-
-/**
- * JQPlot line chart
- *
- * @param elementId
- *            id of the div element the chart is drawn in
- */
-var JQPlotLineChart = function (elementId) {
-    JQPlotChart.call(this, elementId);
-    this.validator = BaseChart.prototype;
-};
-JQPlotLineChart.prototype = new JQPlotChart();
-JQPlotLineChart.prototype.constructor = JQPlotLineChart;
-
-JQPlotLineChart.prototype.populateOptions = function (dataTable, options) {
-    var columns = dataTable.getColumns();
-    var optional = {
-        axes : {
-            xaxis : {
-                label : columns[0].name,
-                renderer : $.jqplot.CategoryAxisRenderer,
-                ticks : []
-            },
-            yaxis : {
-                label : (columns.length == 2 ? columns[1].name : 'Values'),
-                labelRenderer : $.jqplot.CanvasAxisLabelRenderer
-            }
-        },
-        highlighter: {
-            show: true,
-            tooltipAxes: 'y',
-            formatString:'%d'
-        },
-        series : []
-    };
-    $.extend(true, optional, options);
-
-    if (optional.series.length === 0) {
-        for (var i = 1; i < columns.length; i++) {
-            optional.series.push({
-                label : columns[i].name.toString()
-            });
-        }
-    }
-    if (optional.axes.xaxis.ticks.length === 0) {
-        var data = dataTable.getData();
-        for (var j = 0; j < data.length; j++) {
-            optional.axes.xaxis.ticks.push(data[j][0].toString());
-        }
-    }
-    return optional;
-};
-
-JQPlotLineChart.prototype.prepareData = function (dataTable) {
-    var data = dataTable.getData(), row;
-    var retData = [], retRow;
-    for (var i = 0; i < data.length; i++) {
-        row = data[i];
-        for (var j = 1; j < row.length; j++) {
-            retRow = retData[j - 1];
-            if (retRow === undefined) {
-                retRow = [];
-                retData[j - 1] = retRow;
-            }
-            retRow.push(row[j]);
-        }
-    }
-    return retData;
-};
-
-/**
- * JQPlot spline chart
- *
- * @param elementId
- *            id of the div element the chart is drawn in
- */
-var JQPlotSplineChart = function (elementId) {
-    JQPlotLineChart.call(this, elementId);
-};
-JQPlotSplineChart.prototype = new JQPlotLineChart();
-JQPlotSplineChart.prototype.constructor = JQPlotSplineChart;
-
-JQPlotSplineChart.prototype.populateOptions = function (dataTable, options) {
-    var optional = {};
-    var opt = JQPlotLineChart.prototype.populateOptions.call(this, dataTable,
-            options);
-    var compulsory = {
-        seriesDefaults : {
-            rendererOptions : {
-                smooth : true
-            }
-        }
-    };
-    $.extend(true, optional, opt, compulsory);
-    return optional;
-};
-
-/**
- * JQPlot scatter chart
- *
- * @param elementId
- *            id of the div element the chart is drawn in
- */
-var JQPlotScatterChart = function (elementId) {
-    JQPlotChart.call(this, elementId);
-    this.validator = ScatterChart.prototype;
-};
-JQPlotScatterChart.prototype = new JQPlotChart();
-JQPlotScatterChart.prototype.constructor = JQPlotScatterChart;
-
-JQPlotScatterChart.prototype.populateOptions = function (dataTable, options) {
-    var columns = dataTable.getColumns();
-    var optional = {
-        axes : {
-            xaxis : {
-                label : columns[0].name
-            },
-            yaxis : {
-                label : (columns.length == 2 ? columns[1].name : 'Values'),
-                labelRenderer : $.jqplot.CanvasAxisLabelRenderer
-            }
-        },
-        highlighter: {
-            show: true,
-            tooltipAxes: 'xy',
-            formatString:'%d, %d'
-        },
-        series : []
-    };
-    for (var i = 1; i < columns.length; i++) {
-        optional.series.push({
-            label : columns[i].name.toString()
-        });
-    }
-
-    var compulsory = {
-        seriesDefaults : {
-            showLine: false,
-            markerOptions: {
-                size: 7,
-                style: "x"
-            }
-        }
-    };
-
-    $.extend(true, optional, options, compulsory);
-    return optional;
-};
-
-JQPlotScatterChart.prototype.prepareData = function (dataTable) {
-    var data = dataTable.getData(), row;
-    var retData = [], retRow;
-    for (var i = 0; i < data.length; i++) {
-        row = data[i];
-        if (row[0]) {
-            for (var j = 1; j < row.length; j++) {
-                retRow = retData[j - 1];
-                if (retRow === undefined) {
-                    retRow = [];
-                    retData[j - 1] = retRow;
-                }
-                retRow.push([row[0], row[j]]);
-            }
-        }
-    }
-    return retData;
-};
-
-/**
- * JQPlot timeline chart
- *
- * @param elementId
- *            id of the div element the chart is drawn in
- */
-var JQPlotTimelineChart = function (elementId) {
-    JQPlotLineChart.call(this, elementId);
-    this.validator = TimelineChart.prototype;
-};
-JQPlotTimelineChart.prototype = new JQPlotLineChart();
-JQPlotTimelineChart.prototype.constructor = JQPlotTimelineChart;
-
-JQPlotTimelineChart.prototype.populateOptions = function (dataTable, options) {
-    var optional = {
-        axes : {
-            xaxis : {
-                tickOptions : {
-                    formatString: '%b %#d, %y'
-                }
-            }
-        }
-    };
-    var opt = JQPlotLineChart.prototype.populateOptions.call(this, dataTable, options);
-    var compulsory = {
-        axes : {
-            xaxis : {
-                renderer : $.jqplot.DateAxisRenderer
-            }
-        }
-    };
-    $.extend(true, optional, opt, compulsory);
-    return optional;
-};
-
-JQPlotTimelineChart.prototype.prepareData = function (dataTable) {
-    var data = dataTable.getData(), row, d;
-    var retData = [], retRow;
-    for (var i = 0; i < data.length; i++) {
-        row = data[i];
-        d = row[0];
-        for (var j = 1; j < row.length; j++) {
-            retRow = retData[j - 1];
-            if (retRow === undefined) {
-                retRow = [];
-                retData[j - 1] = retRow;
-            }
-            if (d !== null) {
-                retRow.push([d.getTime(), row[j]]);
-            }
-        }
-    }
-    return retData;
-};
-
-/**
- * JQPlot area chart
- *
- * @param elementId
- *            id of the div element the chart is drawn in
- */
-var JQPlotAreaChart = function (elementId) {
-    JQPlotLineChart.call(this, elementId);
-};
-JQPlotAreaChart.prototype = new JQPlotLineChart();
-JQPlotAreaChart.prototype.constructor = JQPlotAreaChart;
-
-JQPlotAreaChart.prototype.populateOptions = function (dataTable, options) {
-    var optional = {
-        seriesDefaults : {
-            fillToZero : true
-        }
-    };
-    var opt = JQPlotLineChart.prototype.populateOptions.call(this, dataTable,
-            options);
-    var compulsory = {
-        seriesDefaults : {
-            fill : true
-        }
-    };
-    $.extend(true, optional, opt, compulsory);
-    return optional;
-};
-
-/**
- * JQPlot column chart
- *
- * @param elementId
- *            id of the div element the chart is drawn in
- */
-var JQPlotColumnChart = function (elementId) {
-    JQPlotLineChart.call(this, elementId);
-};
-JQPlotColumnChart.prototype = new JQPlotLineChart();
-JQPlotColumnChart.prototype.constructor = JQPlotColumnChart;
-
-JQPlotColumnChart.prototype.populateOptions = function (dataTable, options) {
-    var optional = {
-        seriesDefaults : {
-            fillToZero : true
-        }
-    };
-    var opt = JQPlotLineChart.prototype.populateOptions.call(this, dataTable,
-            options);
-    var compulsory = {
-        seriesDefaults : {
-            renderer : $.jqplot.BarRenderer
-        }
-    };
-    $.extend(true, optional, opt, compulsory);
-    return optional;
-};
-
-/**
- * JQPlot bar chart
- *
- * @param elementId
- *            id of the div element the chart is drawn in
- */
-var JQPlotBarChart = function (elementId) {
-    JQPlotLineChart.call(this, elementId);
-};
-JQPlotBarChart.prototype = new JQPlotLineChart();
-JQPlotBarChart.prototype.constructor = JQPlotBarChart;
-
-JQPlotBarChart.prototype.populateOptions = function (dataTable, options) {
-    var columns = dataTable.getColumns();
-    var optional = {
-        axes : {
-            yaxis : {
-                label : columns[0].name,
-                labelRenderer : $.jqplot.CanvasAxisLabelRenderer,
-                renderer : $.jqplot.CategoryAxisRenderer,
-                ticks : []
-            },
-            xaxis : {
-                label : (columns.length == 2 ? columns[1].name : 'Values'),
-                labelRenderer : $.jqplot.CanvasAxisLabelRenderer
-            }
-        },
-        highlighter: {
-            show: true,
-            tooltipAxes: 'x',
-            formatString:'%d'
-        },
-        series : [],
-        seriesDefaults : {
-            fillToZero : true
-        }
-    };
-    var compulsory = {
-        seriesDefaults : {
-            renderer : $.jqplot.BarRenderer,
-            rendererOptions : {
-                barDirection : 'horizontal'
-            }
-        }
-    };
-    $.extend(true, optional, options, compulsory);
-
-    if (optional.axes.yaxis.ticks.length === 0) {
-        var data = dataTable.getData();
-        for (var i = 0; i < data.length; i++) {
-            optional.axes.yaxis.ticks.push(data[i][0].toString());
-        }
-    }
-    if (optional.series.length === 0) {
-        for (var j = 1; j < columns.length; j++) {
-            optional.series.push({
-                label : columns[j].name.toString()
-            });
-        }
-    }
-    return optional;
-};
-
-/**
- * JQPlot pie chart
- *
- * @param elementId
- *            id of the div element the chart is drawn in
- */
-var JQPlotPieChart = function (elementId) {
-    JQPlotChart.call(this, elementId);
-    this.validator = PieChart.prototype;
-};
-JQPlotPieChart.prototype = new JQPlotChart();
-JQPlotPieChart.prototype.constructor = JQPlotPieChart;
-
-JQPlotPieChart.prototype.populateOptions = function (dataTable, options) {
-    var optional = {
-        highlighter: {
-            show: true,
-            tooltipAxes: 'xy',
-            formatString:'%s, %d',
-            useAxesFormatters: false
-        }
-    };
-    var compulsory = {
-        seriesDefaults : {
-            renderer : $.jqplot.PieRenderer
-        }
-    };
-    $.extend(true, optional, options, compulsory);
-    return optional;
-};
-
-JQPlotPieChart.prototype.prepareData = function (dataTable) {
-    var data = dataTable.getData(), row;
-    var retData = [];
-    for (var i = 0; i < data.length; i++) {
-        row = data[i];
-        retData.push([ row[0], row[1] ]);
-    }
-    return [ retData ];
-};
-
-/**
- * Chart factory that returns JQPlotCharts
- */
-var JQPlotChartFactory = function () {
-};
-JQPlotChartFactory.prototype = new ChartFactory();
-JQPlotChartFactory.prototype.createChart = function (type, elementId) {
-    var chart = null;
-    switch (type) {
-    case ChartType.LINE:
-        chart = new JQPlotLineChart(elementId);
-        break;
-    case ChartType.SPLINE:
-        chart = new JQPlotSplineChart(elementId);
-        break;
-    case ChartType.TIMELINE:
-        chart = new JQPlotTimelineChart(elementId);
-        break;
-    case ChartType.AREA:
-        chart = new JQPlotAreaChart(elementId);
-        break;
-    case ChartType.BAR:
-        chart = new JQPlotBarChart(elementId);
-        break;
-    case ChartType.COLUMN:
-        chart = new JQPlotColumnChart(elementId);
-        break;
-    case ChartType.PIE:
-        chart = new JQPlotPieChart(elementId);
-        break;
-    case ChartType.SCATTER:
-        chart = new JQPlotScatterChart(elementId);
-        break;
-    }
-
-    return chart;
-};
-
diff --git a/#pma/js/codemirror/LICENSE b/#pma/js/codemirror/LICENSE
deleted file mode 100644
index f4a5a4a2..00000000
--- a/#pma/js/codemirror/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (C) 2015 by Marijn Haverbeke <marijnh@gmail.com> and others
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/#pma/js/codemirror/addon/hint/show-hint.css b/#pma/js/codemirror/addon/hint/show-hint.css
deleted file mode 100644
index 924e638f..00000000
--- a/#pma/js/codemirror/addon/hint/show-hint.css
+++ /dev/null
@@ -1,38 +0,0 @@
-.CodeMirror-hints {
-  position: absolute;
-  z-index: 10;
-  overflow: hidden;
-  list-style: none;
-
-  margin: 0;
-  padding: 2px;
-
-  -webkit-box-shadow: 2px 3px 5px rgba(0,0,0,.2);
-  -moz-box-shadow: 2px 3px 5px rgba(0,0,0,.2);
-  box-shadow: 2px 3px 5px rgba(0,0,0,.2);
-  border-radius: 3px;
-  border: 1px solid silver;
-
-  background: white;
-  font-size: 90%;
-  font-family: monospace;
-
-  max-height: 20em;
-  overflow-y: auto;
-}
-
-.CodeMirror-hint {
-  margin: 0;
-  padding: 0 4px;
-  border-radius: 2px;
-  max-width: 19em;
-  overflow: hidden;
-  white-space: pre;
-  color: black;
-  cursor: pointer;
-}
-
-li.CodeMirror-hint-active {
-  background: #08f;
-  color: white;
-}
diff --git a/#pma/js/codemirror/addon/hint/show-hint.js b/#pma/js/codemirror/addon/hint/show-hint.js
deleted file mode 100644
index d228fc88..00000000
--- a/#pma/js/codemirror/addon/hint/show-hint.js
+++ /dev/null
@@ -1,383 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-
-  var HINT_ELEMENT_CLASS        = "CodeMirror-hint";
-  var ACTIVE_HINT_ELEMENT_CLASS = "CodeMirror-hint-active";
-
-  // This is the old interface, kept around for now to stay
-  // backwards-compatible.
-  CodeMirror.showHint = function(cm, getHints, options) {
-    if (!getHints) return cm.showHint(options);
-    if (options && options.async) getHints.async = true;
-    var newOpts = {hint: getHints};
-    if (options) for (var prop in options) newOpts[prop] = options[prop];
-    return cm.showHint(newOpts);
-  };
-
-  CodeMirror.defineExtension("showHint", function(options) {
-    // We want a single cursor position.
-    if (this.listSelections().length > 1 || this.somethingSelected()) return;
-
-    if (this.state.completionActive) this.state.completionActive.close();
-    var completion = this.state.completionActive = new Completion(this, options);
-    if (!completion.options.hint) return;
-
-    CodeMirror.signal(this, "startCompletion", this);
-    completion.update(true);
-  });
-
-  function Completion(cm, options) {
-    this.cm = cm;
-    this.options = this.buildOptions(options);
-    this.widget = null;
-    this.debounce = 0;
-    this.tick = 0;
-    this.startPos = this.cm.getCursor();
-    this.startLen = this.cm.getLine(this.startPos.line).length;
-
-    var self = this;
-    cm.on("cursorActivity", this.activityFunc = function() { self.cursorActivity(); });
-  }
-
-  var requestAnimationFrame = window.requestAnimationFrame || function(fn) {
-    return setTimeout(fn, 1000/60);
-  };
-  var cancelAnimationFrame = window.cancelAnimationFrame || clearTimeout;
-
-  Completion.prototype = {
-    close: function() {
-      if (!this.active()) return;
-      this.cm.state.completionActive = null;
-      this.tick = null;
-      this.cm.off("cursorActivity", this.activityFunc);
-
-      if (this.widget && this.data) CodeMirror.signal(this.data, "close");
-      if (this.widget) this.widget.close();
-      CodeMirror.signal(this.cm, "endCompletion", this.cm);
-    },
-
-    active: function() {
-      return this.cm.state.completionActive == this;
-    },
-
-    pick: function(data, i) {
-      var completion = data.list[i];
-      if (completion.hint) completion.hint(this.cm, data, completion);
-      else this.cm.replaceRange(getText(completion), completion.from || data.from,
-                                completion.to || data.to, "complete");
-      CodeMirror.signal(data, "pick", completion);
-      this.close();
-    },
-
-    cursorActivity: function() {
-      if (this.debounce) {
-        cancelAnimationFrame(this.debounce);
-        this.debounce = 0;
-      }
-
-      var pos = this.cm.getCursor(), line = this.cm.getLine(pos.line);
-      if (pos.line != this.startPos.line || line.length - pos.ch != this.startLen - this.startPos.ch ||
-          pos.ch < this.startPos.ch || this.cm.somethingSelected() ||
-          (pos.ch && this.options.closeCharacters.test(line.charAt(pos.ch - 1)))) {
-        this.close();
-      } else {
-        var self = this;
-        this.debounce = requestAnimationFrame(function() {self.update();});
-        if (this.widget) this.widget.disable();
-      }
-    },
-
-    update: function(first) {
-      if (this.tick == null) return;
-      if (this.data) CodeMirror.signal(this.data, "update");
-      if (!this.options.hint.async) {
-        this.finishUpdate(this.options.hint(this.cm, this.options), first);
-      } else {
-        var myTick = ++this.tick, self = this;
-        this.options.hint(this.cm, function(data) {
-          if (self.tick == myTick) self.finishUpdate(data, first);
-        }, this.options);
-      }
-    },
-
-    finishUpdate: function(data, first) {
-      this.data = data;
-
-      var picked = (this.widget && this.widget.picked) || (first && this.options.completeSingle);
-      if (this.widget) this.widget.close();
-      if (data && data.list.length) {
-        if (picked && data.list.length == 1) {
-          this.pick(data, 0);
-        } else {
-          this.widget = new Widget(this, data);
-          CodeMirror.signal(data, "shown");
-        }
-      }
-    },
-
-    buildOptions: function(options) {
-      var editor = this.cm.options.hintOptions;
-      var out = {};
-      for (var prop in defaultOptions) out[prop] = defaultOptions[prop];
-      if (editor) for (var prop in editor)
-        if (editor[prop] !== undefined) out[prop] = editor[prop];
-      if (options) for (var prop in options)
-        if (options[prop] !== undefined) out[prop] = options[prop];
-      return out;
-    }
-  };
-
-  function getText(completion) {
-    if (typeof completion == "string") return completion;
-    else return completion.text;
-  }
-
-  function buildKeyMap(completion, handle) {
-    var baseMap = {
-      Up: function() {handle.moveFocus(-1);},
-      Down: function() {handle.moveFocus(1);},
-      PageUp: function() {handle.moveFocus(-handle.menuSize() + 1, true);},
-      PageDown: function() {handle.moveFocus(handle.menuSize() - 1, true);},
-      Home: function() {handle.setFocus(0);},
-      End: function() {handle.setFocus(handle.length - 1);},
-      Enter: handle.pick,
-      Tab: handle.pick,
-      Esc: handle.close
-    };
-    var custom = completion.options.customKeys;
-    var ourMap = custom ? {} : baseMap;
-    function addBinding(key, val) {
-      var bound;
-      if (typeof val != "string")
-        bound = function(cm) { return val(cm, handle); };
-      // This mechanism is deprecated
-      else if (baseMap.hasOwnProperty(val))
-        bound = baseMap[val];
-      else
-        bound = val;
-      ourMap[key] = bound;
-    }
-    if (custom)
-      for (var key in custom) if (custom.hasOwnProperty(key))
-        addBinding(key, custom[key]);
-    var extra = completion.options.extraKeys;
-    if (extra)
-      for (var key in extra) if (extra.hasOwnProperty(key))
-        addBinding(key, extra[key]);
-    return ourMap;
-  }
-
-  function getHintElement(hintsElement, el) {
-    while (el && el != hintsElement) {
-      if (el.nodeName.toUpperCase() === "LI" && el.parentNode == hintsElement) return el;
-      el = el.parentNode;
-    }
-  }
-
-  function Widget(completion, data) {
-    this.completion = completion;
-    this.data = data;
-    this.picked = false;
-    var widget = this, cm = completion.cm;
-
-    var hints = this.hints = document.createElement("ul");
-    hints.className = "CodeMirror-hints";
-    this.selectedHint = data.selectedHint || 0;
-
-    var completions = data.list;
-    for (var i = 0; i < completions.length; ++i) {
-      var elt = hints.appendChild(document.createElement("li")), cur = completions[i];
-      var className = HINT_ELEMENT_CLASS + (i != this.selectedHint ? "" : " " + ACTIVE_HINT_ELEMENT_CLASS);
-      if (cur.className != null) className = cur.className + " " + className;
-      elt.className = className;
-      if (cur.render) cur.render(elt, data, cur);
-      else elt.appendChild(document.createTextNode(cur.displayText || getText(cur)));
-      elt.hintId = i;
-    }
-
-    var pos = cm.cursorCoords(completion.options.alignWithWord ? data.from : null);
-    var left = pos.left, top = pos.bottom, below = true;
-    hints.style.left = left + "px";
-    hints.style.top = top + "px";
-    // If we're at the edge of the screen, then we want the menu to appear on the left of the cursor.
-    var winW = window.innerWidth || Math.max(document.body.offsetWidth, document.documentElement.offsetWidth);
-    var winH = window.innerHeight || Math.max(document.body.offsetHeight, document.documentElement.offsetHeight);
-    (completion.options.container || document.body).appendChild(hints);
-    var box = hints.getBoundingClientRect(), overlapY = box.bottom - winH;
-    if (overlapY > 0) {
-      var height = box.bottom - box.top, curTop = pos.top - (pos.bottom - box.top);
-      if (curTop - height > 0) { // Fits above cursor
-        hints.style.top = (top = pos.top - height) + "px";
-        below = false;
-      } else if (height > winH) {
-        hints.style.height = (winH - 5) + "px";
-        hints.style.top = (top = pos.bottom - box.top) + "px";
-        var cursor = cm.getCursor();
-        if (data.from.ch != cursor.ch) {
-          pos = cm.cursorCoords(cursor);
-          hints.style.left = (left = pos.left) + "px";
-          box = hints.getBoundingClientRect();
-        }
-      }
-    }
-    var overlapX = box.right - winW;
-    if (overlapX > 0) {
-      if (box.right - box.left > winW) {
-        hints.style.width = (winW - 5) + "px";
-        overlapX -= (box.right - box.left) - winW;
-      }
-      hints.style.left = (left = pos.left - overlapX) + "px";
-    }
-
-    cm.addKeyMap(this.keyMap = buildKeyMap(completion, {
-      moveFocus: function(n, avoidWrap) { widget.changeActive(widget.selectedHint + n, avoidWrap); },
-      setFocus: function(n) { widget.changeActive(n); },
-      menuSize: function() { return widget.screenAmount(); },
-      length: completions.length,
-      close: function() { completion.close(); },
-      pick: function() { widget.pick(); },
-      data: data
-    }));
-
-    if (completion.options.closeOnUnfocus) {
-      var closingOnBlur;
-      cm.on("blur", this.onBlur = function() { closingOnBlur = setTimeout(function() { completion.close(); }, 100); });
-      cm.on("focus", this.onFocus = function() { clearTimeout(closingOnBlur); });
-    }
-
-    var startScroll = cm.getScrollInfo();
-    cm.on("scroll", this.onScroll = function() {
-      var curScroll = cm.getScrollInfo(), editor = cm.getWrapperElement().getBoundingClientRect();
-      var newTop = top + startScroll.top - curScroll.top;
-      var point = newTop - (window.pageYOffset || (document.documentElement || document.body).scrollTop);
-      if (!below) point += hints.offsetHeight;
-      if (point <= editor.top || point >= editor.bottom) return completion.close();
-      hints.style.top = newTop + "px";
-      hints.style.left = (left + startScroll.left - curScroll.left) + "px";
-    });
-
-    CodeMirror.on(hints, "dblclick", function(e) {
-      var t = getHintElement(hints, e.target || e.srcElement);
-      if (t && t.hintId != null) {widget.changeActive(t.hintId); widget.pick();}
-    });
-
-    CodeMirror.on(hints, "click", function(e) {
-      var t = getHintElement(hints, e.target || e.srcElement);
-      if (t && t.hintId != null) {
-        widget.changeActive(t.hintId);
-        if (completion.options.completeOnSingleClick) widget.pick();
-      }
-    });
-
-    CodeMirror.on(hints, "mousedown", function() {
-      setTimeout(function(){cm.focus();}, 20);
-    });
-
-    CodeMirror.signal(data, "select", completions[0], hints.firstChild);
-    return true;
-  }
-
-  Widget.prototype = {
-    close: function() {
-      if (this.completion.widget != this) return;
-      this.completion.widget = null;
-      this.hints.parentNode.removeChild(this.hints);
-      this.completion.cm.removeKeyMap(this.keyMap);
-
-      var cm = this.completion.cm;
-      if (this.completion.options.closeOnUnfocus) {
-        cm.off("blur", this.onBlur);
-        cm.off("focus", this.onFocus);
-      }
-      cm.off("scroll", this.onScroll);
-    },
-
-    disable: function() {
-      this.completion.cm.removeKeyMap(this.keyMap);
-      var widget = this;
-      this.keyMap = {Enter: function() { widget.picked = true; }};
-      this.completion.cm.addKeyMap(this.keyMap);
-    },
-
-    pick: function() {
-      this.completion.pick(this.data, this.selectedHint);
-    },
-
-    changeActive: function(i, avoidWrap) {
-      if (i >= this.data.list.length)
-        i = avoidWrap ? this.data.list.length - 1 : 0;
-      else if (i < 0)
-        i = avoidWrap ? 0  : this.data.list.length - 1;
-      if (this.selectedHint == i) return;
-      var node = this.hints.childNodes[this.selectedHint];
-      node.className = node.className.replace(" " + ACTIVE_HINT_ELEMENT_CLASS, "");
-      node = this.hints.childNodes[this.selectedHint = i];
-      node.className += " " + ACTIVE_HINT_ELEMENT_CLASS;
-      if (node.offsetTop < this.hints.scrollTop)
-        this.hints.scrollTop = node.offsetTop - 3;
-      else if (node.offsetTop + node.offsetHeight > this.hints.scrollTop + this.hints.clientHeight)
-        this.hints.scrollTop = node.offsetTop + node.offsetHeight - this.hints.clientHeight + 3;
-      CodeMirror.signal(this.data, "select", this.data.list[this.selectedHint], node);
-    },
-
-    screenAmount: function() {
-      return Math.floor(this.hints.clientHeight / this.hints.firstChild.offsetHeight) || 1;
-    }
-  };
-
-  CodeMirror.registerHelper("hint", "auto", function(cm, options) {
-    var helpers = cm.getHelpers(cm.getCursor(), "hint"), words;
-    if (helpers.length) {
-      for (var i = 0; i < helpers.length; i++) {
-        var cur = helpers[i](cm, options);
-        if (cur && cur.list.length) return cur;
-      }
-    } else if (words = cm.getHelper(cm.getCursor(), "hintWords")) {
-      if (words) return CodeMirror.hint.fromList(cm, {words: words});
-    } else if (CodeMirror.hint.anyword) {
-      return CodeMirror.hint.anyword(cm, options);
-    }
-  });
-
-  CodeMirror.registerHelper("hint", "fromList", function(cm, options) {
-    var cur = cm.getCursor(), token = cm.getTokenAt(cur);
-    var found = [];
-    for (var i = 0; i < options.words.length; i++) {
-      var word = options.words[i];
-      if (word.slice(0, token.string.length) == token.string)
-        found.push(word);
-    }
-
-    if (found.length) return {
-      list: found,
-      from: CodeMirror.Pos(cur.line, token.start),
-            to: CodeMirror.Pos(cur.line, token.end)
-    };
-  });
-
-  CodeMirror.commands.autocomplete = CodeMirror.showHint;
-
-  var defaultOptions = {
-    hint: CodeMirror.hint.auto,
-    completeSingle: true,
-    alignWithWord: true,
-    closeCharacters: /[\s()\[\]{};:>,]/,
-    closeOnUnfocus: true,
-    completeOnSingleClick: false,
-    container: null,
-    customKeys: null,
-    extraKeys: null
-  };
-
-  CodeMirror.defineOption("hintOptions", null);
-});
diff --git a/#pma/js/codemirror/addon/hint/sql-hint.js b/#pma/js/codemirror/addon/hint/sql-hint.js
deleted file mode 100644
index 22124b58..00000000
--- a/#pma/js/codemirror/addon/hint/sql-hint.js
+++ /dev/null
@@ -1,254 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"), require("../../mode/sql/sql"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror", "../../mode/sql/sql"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-
-  var tables;
-  var defaultTable;
-  var keywords;
-  var CONS = {
-    QUERY_DIV: ";",
-    ALIAS_KEYWORD: "AS"
-  };
-  var Pos = CodeMirror.Pos;
-
-  function getKeywords(editor) {
-    var mode = editor.doc.modeOption;
-    if (mode === "sql") mode = "text/x-sql";
-    return CodeMirror.resolveMode(mode).keywords;
-  }
-
-  function getText(item) {
-    return typeof item == "string" ? item : item.text;
-  }
-
-  function getItem(list, item) {
-    if (!list.slice) return list[item];
-    for (var i = list.length - 1; i >= 0; i--) if (getText(list[i]) == item)
-      return list[i];
-  }
-
-  function shallowClone(object) {
-    var result = {};
-    for (var key in object) if (object.hasOwnProperty(key))
-      result[key] = object[key];
-    return result;
-  }
-
-  function match(string, word) {
-    var len = string.length;
-    var sub = getText(word).substr(0, len);
-    return string.toUpperCase() === sub.toUpperCase();
-  }
-
-  function addMatches(result, search, wordlist, formatter) {
-    for (var word in wordlist) {
-      if (!wordlist.hasOwnProperty(word)) continue;
-      if (wordlist.slice) word = wordlist[word];
-
-      if (match(search, word)) result.push(formatter(word));
-    }
-  }
-
-  function cleanName(name) {
-    // Get rid name from backticks(`) and preceding dot(.)
-    if (name.charAt(0) == ".") {
-      name = name.substr(1);
-    }
-    return name.replace(/`/g, "");
-  }
-
-  function insertBackticks(name) {
-    var nameParts = getText(name).split(".");
-    for (var i = 0; i < nameParts.length; i++)
-      nameParts[i] = "`" + nameParts[i] + "`";
-    var escaped = nameParts.join(".");
-    if (typeof name == "string") return escaped;
-    name = shallowClone(name);
-    name.text = escaped;
-    return name;
-  }
-
-  function nameCompletion(cur, token, result, editor) {
-    // Try to complete table, colunm names and return start position of completion
-    var useBacktick = false;
-    var nameParts = [];
-    var start = token.start;
-    var cont = true;
-    while (cont) {
-      cont = (token.string.charAt(0) == ".");
-      useBacktick = useBacktick || (token.string.charAt(0) == "`");
-
-      start = token.start;
-      nameParts.unshift(cleanName(token.string));
-
-      token = editor.getTokenAt(Pos(cur.line, token.start));
-      if (token.string == ".") {
-        cont = true;
-        token = editor.getTokenAt(Pos(cur.line, token.start));
-      }
-    }
-
-    // Try to complete table names
-    var string = nameParts.join(".");
-    addMatches(result, string, tables, function(w) {
-      return useBacktick ? insertBackticks(w) : w;
-    });
-
-    // Try to complete columns from defaultTable
-    addMatches(result, string, defaultTable, function(w) {
-      return useBacktick ? insertBackticks(w) : w;
-    });
-
-    // Try to complete columns
-    string = nameParts.pop();
-    var table = nameParts.join(".");
-
-    var alias = false;
-    var aliasTable = table;
-    // Check if table is available. If not, find table by Alias
-    if (!getItem(tables, table)) {
-      var oldTable = table;
-      table = findTableByAlias(table, editor);
-      if (table !== oldTable) alias = true;
-    }
-
-    var columns = getItem(tables, table);
-    if (columns && columns.columns)
-      columns = columns.columns;
-
-    if (columns) {
-      addMatches(result, string, columns, function(w) {
-        var tableInsert = table;
-        if (alias == true) tableInsert = aliasTable;
-        if (typeof w == "string") {
-          w = tableInsert + "." + w;
-        } else {
-          w = shallowClone(w);
-          w.text = tableInsert + "." + w.text;
-        }
-        return useBacktick ? insertBackticks(w) : w;
-      });
-    }
-
-    return start;
-  }
-
-  function eachWord(lineText, f) {
-    if (!lineText) return;
-    var excepted = /[,;]/g;
-    var words = lineText.split(" ");
-    for (var i = 0; i < words.length; i++) {
-      f(words[i]?words[i].replace(excepted, '') : '');
-    }
-  }
-
-  function convertCurToNumber(cur) {
-    // max characters of a line is 999,999.
-    return cur.line + cur.ch / Math.pow(10, 6);
-  }
-
-  function convertNumberToCur(num) {
-    return Pos(Math.floor(num), +num.toString().split('.').pop());
-  }
-
-  function findTableByAlias(alias, editor) {
-    var doc = editor.doc;
-    var fullQuery = doc.getValue();
-    var aliasUpperCase = alias.toUpperCase();
-    var previousWord = "";
-    var table = "";
-    var separator = [];
-    var validRange = {
-      start: Pos(0, 0),
-      end: Pos(editor.lastLine(), editor.getLineHandle(editor.lastLine()).length)
-    };
-
-    //add separator
-    var indexOfSeparator = fullQuery.indexOf(CONS.QUERY_DIV);
-    while(indexOfSeparator != -1) {
-      separator.push(doc.posFromIndex(indexOfSeparator));
-      indexOfSeparator = fullQuery.indexOf(CONS.QUERY_DIV, indexOfSeparator+1);
-    }
-    separator.unshift(Pos(0, 0));
-    separator.push(Pos(editor.lastLine(), editor.getLineHandle(editor.lastLine()).text.length));
-
-    //find valid range
-    var prevItem = 0;
-    var current = convertCurToNumber(editor.getCursor());
-    for (var i=0; i< separator.length; i++) {
-      var _v = convertCurToNumber(separator[i]);
-      if (current > prevItem && current <= _v) {
-        validRange = { start: convertNumberToCur(prevItem), end: convertNumberToCur(_v) };
-        break;
-      }
-      prevItem = _v;
-    }
-
-    var query = doc.getRange(validRange.start, validRange.end, false);
-
-    for (var i = 0; i < query.length; i++) {
-      var lineText = query[i];
-      eachWord(lineText, function(word) {
-        var wordUpperCase = word.toUpperCase();
-        if (wordUpperCase === aliasUpperCase && getItem(tables, previousWord))
-          table = previousWord;
-        if (wordUpperCase !== CONS.ALIAS_KEYWORD)
-          previousWord = word;
-      });
-      if (table) break;
-    }
-    return table;
-  }
-
-  CodeMirror.registerHelper("hint", "sql", function(editor, options) {
-    tables = (options && options.tables) || {};
-    var defaultTableName = options && options.defaultTable;
-    var disableKeywords = options && options.disableKeywords;
-    defaultTable = defaultTableName && getItem(tables, defaultTableName);
-    keywords = keywords || getKeywords(editor);
-
-    if (defaultTableName && !defaultTable)
-      defaultTable = findTableByAlias(defaultTableName, editor);
-
-    defaultTable = defaultTable || [];
-
-    if (defaultTable.columns)
-      defaultTable = defaultTable.columns;
-
-    var cur = editor.getCursor();
-    var result = [];
-    var token = editor.getTokenAt(cur), start, end, search;
-    if (token.end > cur.ch) {
-      token.end = cur.ch;
-      token.string = token.string.slice(0, cur.ch - token.start);
-    }
-
-    if (token.string.match(/^[.`\w@]\w*$/)) {
-      search = token.string;
-      start = token.start;
-      end = token.end;
-    } else {
-      start = end = cur.ch;
-      search = "";
-    }
-    if (search.charAt(0) == "." || search.charAt(0) == "`") {
-      start = nameCompletion(cur, token, result, editor);
-    } else {
-      addMatches(result, search, tables, function(w) {return w;});
-      addMatches(result, search, defaultTable, function(w) {return w;});
-      if (!disableKeywords)
-        addMatches(result, search, keywords, function(w) {return w.toUpperCase();});
-    }
-
-    return {list: result, from: Pos(cur.line, start), to: Pos(cur.line, end)};
-  });
-});
diff --git a/#pma/js/codemirror/addon/lint/lint.css b/#pma/js/codemirror/addon/lint/lint.css
deleted file mode 100644
index ca59a6f1..00000000
--- a/#pma/js/codemirror/addon/lint/lint.css
+++ /dev/null
@@ -1,77 +0,0 @@
-/* The lint marker gutter */
-.CodeMirror-lint-markers {
-  width: 16px;
-}
-
-.CodeMirror-lint-tooltip {
-  background-color: infobackground;
-  border: 1px solid black;
-  border-radius: 4px 4px 4px 4px;
-  color: infotext;
-  font-size: 10pt;
-  overflow: hidden;
-  padding: 2px 5px;
-  position: fixed;
-  white-space: pre;
-  white-space: pre-wrap;
-  z-index: 100;
-  max-width: 600px;
-  opacity: 0;
-  transition: opacity .4s;
-  -moz-transition: opacity .4s;
-  -webkit-transition: opacity .4s;
-  -o-transition: opacity .4s;
-  -ms-transition: opacity .4s;
-}
-
-.CodeMirror-lint-tooltip code {
-  font-family: monospace;
-  font-weight: bold;
-}
-
-.CodeMirror-lint-mark-error, .CodeMirror-lint-mark-warning {
-  background-position: left bottom;
-  background-repeat: repeat-x;
-}
-
-.CodeMirror-lint-mark-error {
-  background-image:
-  url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAADCAYAAAC09K7GAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9sJDw4cOCW1/KIAAAAZdEVYdENvbW1lbnQAQ3JlYXRlZCB3aXRoIEdJTVBXgQ4XAAAAHElEQVQI12NggIL/DAz/GdA5/xkY/qPKMDAwAADLZwf5rvm+LQAAAABJRU5ErkJggg==")
-  ;
-}
-
-.CodeMirror-lint-mark-warning {
-  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAADCAYAAAC09K7GAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9sJFhQXEbhTg7YAAAAZdEVYdENvbW1lbnQAQ3JlYXRlZCB3aXRoIEdJTVBXgQ4XAAAAMklEQVQI12NkgIIvJ3QXMjAwdDN+OaEbysDA4MPAwNDNwMCwiOHLCd1zX07o6kBVGQEAKBANtobskNMAAAAASUVORK5CYII=");
-}
-
-.CodeMirror-lint-marker-error, .CodeMirror-lint-marker-warning {
-  background-position: center center;
-  background-repeat: no-repeat;
-  cursor: pointer;
-  display: inline-block;
-  height: 16px;
-  width: 16px;
-  vertical-align: middle;
-  position: relative;
-}
-
-.CodeMirror-lint-message-error, .CodeMirror-lint-message-warning {
-  padding-left: 18px;
-  background-position: top left;
-  background-repeat: no-repeat;
-}
-
-.CodeMirror-lint-marker-error, .CodeMirror-lint-message-error {
-  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAAHlBMVEW7AAC7AACxAAC7AAC7AAAAAAC4AAC5AAD///+7AAAUdclpAAAABnRSTlMXnORSiwCK0ZKSAAAATUlEQVR42mWPOQ7AQAgDuQLx/z8csYRmPRIFIwRGnosRrpamvkKi0FTIiMASR3hhKW+hAN6/tIWhu9PDWiTGNEkTtIOucA5Oyr9ckPgAWm0GPBog6v4AAAAASUVORK5CYII=");
-}
-
-.CodeMirror-lint-marker-warning, .CodeMirror-lint-message-warning {
-  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAANlBMVEX/uwDvrwD/uwD/uwD/uwD/uwD/uwD/uwD/uwD6twD/uwAAAADurwD2tQD7uAD+ugAAAAD/uwDhmeTRAAAADHRSTlMJ8mN1EYcbmiixgACm7WbuAAAAVklEQVR42n3PUQqAIBBFUU1LLc3u/jdbOJoW1P08DA9Gba8+YWJ6gNJoNYIBzAA2chBth5kLmG9YUoG0NHAUwFXwO9LuBQL1giCQb8gC9Oro2vp5rncCIY8L8uEx5ZkAAAAASUVORK5CYII=");
-}
-
-.CodeMirror-lint-marker-multiple {
-  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAHCAMAAADzjKfhAAAACVBMVEUAAAAAAAC/v7914kyHAAAAAXRSTlMAQObYZgAAACNJREFUeNo1ioEJAAAIwmz/H90iFFSGJgFMe3gaLZ0od+9/AQZ0ADosbYraAAAAAElFTkSuQmCC");
-  background-repeat: no-repeat;
-  background-position: right bottom;
-  width: 100%; height: 100%;
-}
diff --git a/#pma/js/codemirror/addon/lint/lint.js b/#pma/js/codemirror/addon/lint/lint.js
deleted file mode 100644
index fc4a6363..00000000
--- a/#pma/js/codemirror/addon/lint/lint.js
+++ /dev/null
@@ -1,209 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-  var GUTTER_ID = "CodeMirror-lint-markers";
-
-  function showTooltip(e, content) {
-    var tt = document.createElement("div");
-    tt.className = "CodeMirror-lint-tooltip";
-    tt.appendChild(content.cloneNode(true));
-    document.body.appendChild(tt);
-
-    function position(e) {
-      if (!tt.parentNode) return CodeMirror.off(document, "mousemove", position);
-      tt.style.top = Math.max(0, e.clientY - tt.offsetHeight - 5) + "px";
-      tt.style.left = (e.clientX + 5) + "px";
-    }
-    CodeMirror.on(document, "mousemove", position);
-    position(e);
-    if (tt.style.opacity != null) tt.style.opacity = 1;
-    return tt;
-  }
-  function rm(elt) {
-    if (elt.parentNode) elt.parentNode.removeChild(elt);
-  }
-  function hideTooltip(tt) {
-    if (!tt.parentNode) return;
-    if (tt.style.opacity == null) rm(tt);
-    tt.style.opacity = 0;
-    setTimeout(function() { rm(tt); }, 600);
-  }
-
-  function showTooltipFor(e, content, node) {
-    var tooltip = showTooltip(e, content);
-    function hide() {
-      CodeMirror.off(node, "mouseout", hide);
-      if (tooltip) { hideTooltip(tooltip); tooltip = null; }
-    }
-    var poll = setInterval(function() {
-      if (tooltip) for (var n = node;; n = n.parentNode) {
-        if (n && n.nodeType == 11) n = n.host;
-        if (n == document.body) return;
-        if (!n) { hide(); break; }
-      }
-      if (!tooltip) return clearInterval(poll);
-    }, 400);
-    CodeMirror.on(node, "mouseout", hide);
-  }
-
-  function LintState(cm, options, hasGutter) {
-    this.marked = [];
-    this.options = options;
-    this.timeout = null;
-    this.hasGutter = hasGutter;
-    this.onMouseOver = function(e) { onMouseOver(cm, e); };
-  }
-
-  function parseOptions(_cm, options) {
-    if (options instanceof Function) return {getAnnotations: options};
-    if (!options || options === true) options = {};
-    return options;
-  }
-
-  function clearMarks(cm) {
-    var state = cm.state.lint;
-    if (state.hasGutter) cm.clearGutter(GUTTER_ID);
-    for (var i = 0; i < state.marked.length; ++i)
-      state.marked[i].clear();
-    state.marked.length = 0;
-  }
-
-  function makeMarker(labels, severity, multiple, tooltips) {
-    var marker = document.createElement("div"), inner = marker;
-    marker.className = "CodeMirror-lint-marker-" + severity;
-    if (multiple) {
-      inner = marker.appendChild(document.createElement("div"));
-      inner.className = "CodeMirror-lint-marker-multiple";
-    }
-
-    if (tooltips != false) CodeMirror.on(inner, "mouseover", function(e) {
-      showTooltipFor(e, labels, inner);
-    });
-
-    return marker;
-  }
-
-  function getMaxSeverity(a, b) {
-    if (a == "error") return a;
-    else return b;
-  }
-
-  function groupByLine(annotations) {
-    var lines = [];
-    for (var i = 0; i < annotations.length; ++i) {
-      var ann = annotations[i], line = ann.from.line;
-      (lines[line] || (lines[line] = [])).push(ann);
-    }
-    return lines;
-  }
-
-  function annotationTooltip(ann) {
-    var severity = ann.severity;
-    if (!severity) severity = "error";
-    var tip = document.createElement("div");
-    tip.className = "CodeMirror-lint-message-" + severity;
-    tip.appendChild(document.createTextNode(ann.message));
-    // Unescaping only the <code> tag.
-    tip.innerHTML = tip.innerHTML.replace("&lt;code&gt;", "<code>")
-      .replace("&lt;/code&gt;", "</code>");
-    return tip;
-  }
-
-  function startLinting(cm) {
-    var state = cm.state.lint, options = state.options;
-    var passOptions = options.options || options; // Support deprecated passing of `options` property in options
-    var getAnnotations = options.getAnnotations || cm.getHelper(CodeMirror.Pos(0, 0), "lint");
-    if (!getAnnotations) return;
-    if (options.async || getAnnotations.async)
-      getAnnotations(cm.getValue(), updateLinting, passOptions, cm);
-    else
-      updateLinting(cm, getAnnotations(cm.getValue(), passOptions, cm));
-  }
-
-  function updateLinting(cm, annotationsNotSorted) {
-    clearMarks(cm);
-    var state = cm.state.lint, options = state.options;
-
-    var annotations = groupByLine(annotationsNotSorted);
-
-    for (var line = 0; line < annotations.length; ++line) {
-      var anns = annotations[line];
-      if (!anns) continue;
-
-      var maxSeverity = null;
-      var tipLabel = state.hasGutter && document.createDocumentFragment();
-
-      for (var i = 0; i < anns.length; ++i) {
-        var ann = anns[i];
-        var severity = ann.severity;
-        if (!severity) severity = "error";
-        maxSeverity = getMaxSeverity(maxSeverity, severity);
-
-        if (options.formatAnnotation) ann = options.formatAnnotation(ann);
-        if (state.hasGutter) tipLabel.appendChild(annotationTooltip(ann));
-
-        if (ann.to) state.marked.push(cm.markText(ann.from, ann.to, {
-          className: "CodeMirror-lint-mark-" + severity,
-          __annotation: ann
-        }));
-      }
-
-      if (state.hasGutter)
-        cm.setGutterMarker(line, GUTTER_ID, makeMarker(tipLabel, maxSeverity, anns.length > 1,
-                                                       state.options.tooltips));
-    }
-    if (options.onUpdateLinting) options.onUpdateLinting(annotationsNotSorted, annotations, cm);
-  }
-
-  function onChange(cm) {
-    var state = cm.state.lint;
-    if (!state) return;
-    clearTimeout(state.timeout);
-    state.timeout = setTimeout(function(){startLinting(cm);}, state.options.delay || 500);
-  }
-
-  function popupSpanTooltip(ann, e) {
-    var target = e.target || e.srcElement;
-    showTooltipFor(e, annotationTooltip(ann), target);
-  }
-
-  function onMouseOver(cm, e) {
-    var target = e.target || e.srcElement;
-    if (!/\bCodeMirror-lint-mark-/.test(target.className)) return;
-    var box = target.getBoundingClientRect(), x = (box.left + box.right) / 2, y = (box.top + box.bottom) / 2;
-    var spans = cm.findMarksAt(cm.coordsChar({left: x, top: y}, "client"));
-    for (var i = 0; i < spans.length; ++i) {
-      var ann = spans[i].__annotation;
-      if (ann) return popupSpanTooltip(ann, e);
-    }
-  }
-
-  CodeMirror.defineOption("lint", false, function(cm, val, old) {
-    if (old && old != CodeMirror.Init) {
-      clearMarks(cm);
-      cm.off("change", onChange);
-      CodeMirror.off(cm.getWrapperElement(), "mouseover", cm.state.lint.onMouseOver);
-      clearTimeout(cm.state.lint.timeout);
-      delete cm.state.lint;
-    }
-
-    if (val) {
-      var gutters = cm.getOption("gutters"), hasLintGutter = false;
-      for (var i = 0; i < gutters.length; ++i) if (gutters[i] == GUTTER_ID) hasLintGutter = true;
-      var state = cm.state.lint = new LintState(cm, parseOptions(cm, val), hasLintGutter);
-      cm.on("change", onChange);
-      if (state.options.tooltips != false)
-        CodeMirror.on(cm.getWrapperElement(), "mouseover", state.onMouseOver);
-
-      startLinting(cm);
-    }
-  });
-});
diff --git a/#pma/js/codemirror/addon/lint/sql-lint.js b/#pma/js/codemirror/addon/lint/sql-lint.js
deleted file mode 100644
index 0afa9c49..00000000
--- a/#pma/js/codemirror/addon/lint/sql-lint.js
+++ /dev/null
@@ -1,40 +0,0 @@
-CodeMirror.sqlLint = function(text, updateLinting, options, cm) {
-
-    // Skipping check if text box is empty.
-    if(text.trim() == "") {
-        updateLinting(cm, []);
-        return;
-    }
-
-    function handleResponse(response) {
-        var found = [];
-        for (var idx in response) {
-            found.push({
-                from: CodeMirror.Pos(
-                    response[idx].fromLine, response[idx].fromColumn
-                ),
-                to: CodeMirror.Pos(
-                    response[idx].toLine, response[idx].toColumn
-                ),
-                message: response[idx].message,
-                severity : response[idx].severity
-            });
-        }
-
-        updateLinting(cm, found);
-    }
-
-    $.ajax({
-        method: "POST",
-        url: "lint.php",
-        dataType: 'json',
-        data: {
-            sql_query: text,
-            token: PMA_commonParams.get('token'),
-            server: PMA_commonParams.get('server'),
-            options: options.lintOptions,
-            no_history: true,
-        },
-        success: handleResponse
-    });
-}
diff --git a/#pma/js/codemirror/addon/runmode/runmode.js b/#pma/js/codemirror/addon/runmode/runmode.js
deleted file mode 100644
index 07d2279f..00000000
--- a/#pma/js/codemirror/addon/runmode/runmode.js
+++ /dev/null
@@ -1,72 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.runMode = function(string, modespec, callback, options) {
-  var mode = CodeMirror.getMode(CodeMirror.defaults, modespec);
-  var ie = /MSIE \d/.test(navigator.userAgent);
-  var ie_lt9 = ie && (document.documentMode == null || document.documentMode < 9);
-
-  if (callback.nodeType == 1) {
-    var tabSize = (options && options.tabSize) || CodeMirror.defaults.tabSize;
-    var node = callback, col = 0;
-    node.innerHTML = "";
-    callback = function(text, style) {
-      if (text == "\n") {
-        // Emitting LF or CRLF on IE8 or earlier results in an incorrect display.
-        // Emitting a carriage return makes everything ok.
-        node.appendChild(document.createTextNode(ie_lt9 ? '\r' : text));
-        col = 0;
-        return;
-      }
-      var content = "";
-      // replace tabs
-      for (var pos = 0;;) {
-        var idx = text.indexOf("\t", pos);
-        if (idx == -1) {
-          content += text.slice(pos);
-          col += text.length - pos;
-          break;
-        } else {
-          col += idx - pos;
-          content += text.slice(pos, idx);
-          var size = tabSize - col % tabSize;
-          col += size;
-          for (var i = 0; i < size; ++i) content += " ";
-          pos = idx + 1;
-        }
-      }
-
-      if (style) {
-        var sp = node.appendChild(document.createElement("span"));
-        sp.className = "cm-" + style.replace(/ +/g, " cm-");
-        sp.appendChild(document.createTextNode(content));
-      } else {
-        node.appendChild(document.createTextNode(content));
-      }
-    };
-  }
-
-  var lines = CodeMirror.splitLines(string), state = (options && options.state) || CodeMirror.startState(mode);
-  for (var i = 0, e = lines.length; i < e; ++i) {
-    if (i) callback("\n");
-    var stream = new CodeMirror.StringStream(lines[i]);
-    if (!stream.string && mode.blankLine) mode.blankLine(state);
-    while (!stream.eol()) {
-      var style = mode.token(stream, state);
-      callback(stream.current(), style, i, stream.start, state);
-      stream.start = stream.pos;
-    }
-  }
-};
-
-});
diff --git a/#pma/js/codemirror/lib/codemirror.css b/#pma/js/codemirror/lib/codemirror.css
deleted file mode 100644
index b313b61c..00000000
--- a/#pma/js/codemirror/lib/codemirror.css
+++ /dev/null
@@ -1,325 +0,0 @@
-/* BASICS */
-
-.CodeMirror {
-  /* Set height, width, borders, and global font properties here */
-  font-family: monospace;
-  height: 300px;
-  color: black;
-}
-
-/* PADDING */
-
-.CodeMirror-lines {
-  padding: 4px 0; /* Vertical padding around content */
-}
-.CodeMirror pre {
-  padding: 0 4px; /* Horizontal padding of content */
-}
-
-.CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {
-  background-color: white; /* The little square between H and V scrollbars */
-}
-
-/* GUTTER */
-
-.CodeMirror-gutters {
-  border-right: 1px solid #ddd;
-  background-color: #f7f7f7;
-  white-space: nowrap;
-}
-.CodeMirror-linenumbers {}
-.CodeMirror-linenumber {
-  padding: 0 3px 0 5px;
-  min-width: 20px;
-  text-align: right;
-  color: #999;
-  white-space: nowrap;
-}
-
-.CodeMirror-guttermarker { color: black; }
-.CodeMirror-guttermarker-subtle { color: #999; }
-
-/* CURSOR */
-
-.CodeMirror div.CodeMirror-cursor {
-  border-left: 1px solid black;
-}
-/* Shown when moving in bi-directional text */
-.CodeMirror div.CodeMirror-secondarycursor {
-  border-left: 1px solid silver;
-}
-.CodeMirror.cm-fat-cursor div.CodeMirror-cursor {
-  width: auto;
-  border: 0;
-  background: #7e7;
-}
-.CodeMirror.cm-fat-cursor div.CodeMirror-cursors {
-  z-index: 1;
-}
-
-.cm-animate-fat-cursor {
-  width: auto;
-  border: 0;
-  -webkit-animation: blink 1.06s steps(1) infinite;
-  -moz-animation: blink 1.06s steps(1) infinite;
-  animation: blink 1.06s steps(1) infinite;
-}
-@-moz-keyframes blink {
-  0% { background: #7e7; }
-  50% { background: none; }
-  100% { background: #7e7; }
-}
-@-webkit-keyframes blink {
-  0% { background: #7e7; }
-  50% { background: none; }
-  100% { background: #7e7; }
-}
-@keyframes blink {
-  0% { background: #7e7; }
-  50% { background: none; }
-  100% { background: #7e7; }
-}
-
-/* Can style cursor different in overwrite (non-insert) mode */
-div.CodeMirror-overwrite div.CodeMirror-cursor {}
-
-.cm-tab { display: inline-block; text-decoration: inherit; }
-
-.CodeMirror-ruler {
-  border-left: 1px solid #ccc;
-  position: absolute;
-}
-
-/* DEFAULT THEME */
-
-.cm-s-default .cm-header {color: blue;}
-.cm-s-default .cm-quote {color: #090;}
-.cm-negative {color: #d44;}
-.cm-positive {color: #292;}
-.cm-header, .cm-strong {font-weight: bold;}
-.cm-em {font-style: italic;}
-.cm-link {text-decoration: underline;}
-.cm-strikethrough {text-decoration: line-through;}
-
-.cm-s-default .cm-keyword {color: #708;}
-.cm-s-default .cm-atom {color: #219;}
-.cm-s-default .cm-number {color: #164;}
-.cm-s-default .cm-def {color: #00f;}
-.cm-s-default .cm-variable,
-.cm-s-default .cm-punctuation,
-.cm-s-default .cm-property,
-.cm-s-default .cm-operator {}
-.cm-s-default .cm-variable-2 {color: #05a;}
-.cm-s-default .cm-variable-3 {color: #085;}
-.cm-s-default .cm-comment {color: #a50;}
-.cm-s-default .cm-string {color: #a11;}
-.cm-s-default .cm-string-2 {color: #f50;}
-.cm-s-default .cm-meta {color: #555;}
-.cm-s-default .cm-qualifier {color: #555;}
-.cm-s-default .cm-builtin {color: #30a;}
-.cm-s-default .cm-bracket {color: #997;}
-.cm-s-default .cm-tag {color: #170;}
-.cm-s-default .cm-attribute {color: #00c;}
-.cm-s-default .cm-hr {color: #999;}
-.cm-s-default .cm-link {color: #00c;}
-
-.cm-s-default .cm-error {color: #f00;}
-.cm-invalidchar {color: #f00;}
-
-.CodeMirror-composing { border-bottom: 2px solid; }
-
-/* Default styles for common addons */
-
-div.CodeMirror span.CodeMirror-matchingbracket {color: #0f0;}
-div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
-.CodeMirror-matchingtag { background: rgba(255, 150, 0, .3); }
-.CodeMirror-activeline-background {background: #e8f2ff;}
-
-/* STOP */
-
-/* The rest of this file contains styles related to the mechanics of
-   the editor. You probably shouldn't touch them. */
-
-.CodeMirror {
-  position: relative;
-  overflow: hidden;
-  background: white;
-}
-
-.CodeMirror-scroll {
-  overflow: scroll !important; /* Things will break if this is overridden */
-  /* 30px is the magic margin used to hide the element's real scrollbars */
-  /* See overflow: hidden in .CodeMirror */
-  margin-bottom: -30px; margin-right: -30px;
-  padding-bottom: 30px;
-  height: 100%;
-  outline: none; /* Prevent dragging from highlighting the element */
-  position: relative;
-}
-.CodeMirror-sizer {
-  position: relative;
-  border-right: 30px solid transparent;
-}
-
-/* The fake, visible scrollbars. Used to force redraw during scrolling
-   before actuall scrolling happens, thus preventing shaking and
-   flickering artifacts. */
-.CodeMirror-vscrollbar, .CodeMirror-hscrollbar, .CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {
-  position: absolute;
-  z-index: 6;
-  display: none;
-}
-.CodeMirror-vscrollbar {
-  right: 0; top: 0;
-  overflow-x: hidden;
-  overflow-y: scroll;
-}
-.CodeMirror-hscrollbar {
-  bottom: 0; left: 0;
-  overflow-y: hidden;
-  overflow-x: scroll;
-}
-.CodeMirror-scrollbar-filler {
-  right: 0; bottom: 0;
-}
-.CodeMirror-gutter-filler {
-  left: 0; bottom: 0;
-}
-
-.CodeMirror-gutters {
-  position: absolute; left: 0; top: 0;
-  z-index: 3;
-}
-.CodeMirror-gutter {
-  white-space: normal;
-  height: 100%;
-  display: inline-block;
-  margin-bottom: -30px;
-  /* Hack to make IE7 behave */
-  *zoom:1;
-  *display:inline;
-}
-.CodeMirror-gutter-wrapper {
-  position: absolute;
-  z-index: 4;
-  height: 100%;
-}
-.CodeMirror-gutter-elt {
-  position: absolute;
-  cursor: default;
-  z-index: 4;
-}
-.CodeMirror-gutter-wrapper {
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  user-select: none;
-}
-
-.CodeMirror-lines {
-  cursor: text;
-  min-height: 1px; /* prevents collapsing before first draw */
-}
-.CodeMirror pre {
-  /* Reset some styles that the rest of the page might have set */
-  -moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0;
-  border-width: 0;
-  background: transparent;
-  font-family: inherit;
-  font-size: inherit;
-  margin: 0;
-  white-space: pre;
-  word-wrap: normal;
-  line-height: inherit;
-  color: inherit;
-  z-index: 2;
-  position: relative;
-  overflow: visible;
-  -webkit-tap-highlight-color: transparent;
-}
-.CodeMirror-wrap pre {
-  word-wrap: break-word;
-  white-space: pre-wrap;
-  word-break: normal;
-}
-
-.CodeMirror-linebackground {
-  position: absolute;
-  left: 0; right: 0; top: 0; bottom: 0;
-  z-index: 0;
-}
-
-.CodeMirror-linewidget {
-  position: relative;
-  z-index: 2;
-  overflow: auto;
-}
-
-.CodeMirror-widget {}
-
-.CodeMirror-code {
-  outline: none;
-}
-
-/* Force content-box sizing for the elements where we expect it */
-.CodeMirror-scroll,
-.CodeMirror-sizer,
-.CodeMirror-gutter,
-.CodeMirror-gutters,
-.CodeMirror-linenumber {
-  -moz-box-sizing: content-box;
-  box-sizing: content-box;
-}
-
-.CodeMirror-measure {
-  position: absolute;
-  width: 100%;
-  height: 0;
-  overflow: hidden;
-  visibility: hidden;
-}
-.CodeMirror-measure pre { position: static; }
-
-.CodeMirror div.CodeMirror-cursor {
-  position: absolute;
-  border-right: none;
-  width: 0;
-}
-
-div.CodeMirror-cursors {
-  visibility: hidden;
-  position: relative;
-  z-index: 3;
-}
-.CodeMirror-focused div.CodeMirror-cursors {
-  visibility: visible;
-}
-
-.CodeMirror-selected { background: #d9d9d9; }
-.CodeMirror-focused .CodeMirror-selected { background: #d7d4f0; }
-.CodeMirror-crosshair { cursor: crosshair; }
-.CodeMirror ::selection { background: #d7d4f0; }
-.CodeMirror ::-moz-selection { background: #d7d4f0; }
-
-.cm-searching {
-  background: #ffa;
-  background: rgba(255, 255, 0, .4);
-}
-
-/* IE7 hack to prevent it from returning funny offsetTops on the spans */
-.CodeMirror span { *vertical-align: text-bottom; }
-
-/* Used to force a border model for a node */
-.cm-force-border { padding-right: .1px; }
-
-@media print {
-  /* Hide the cursor when printing */
-  .CodeMirror div.CodeMirror-cursors {
-    visibility: hidden;
-  }
-}
-
-/* See issue #2901 */
-.cm-tab-wrap-hack:after { content: ''; }
-
-/* Help users use markselection to safely style text background */
-span.CodeMirror-selectedtext { background: none; }
diff --git a/#pma/js/codemirror/lib/codemirror.js b/#pma/js/codemirror/lib/codemirror.js
deleted file mode 100644
index 283fc09f..00000000
--- a/#pma/js/codemirror/lib/codemirror.js
+++ /dev/null
@@ -1,8735 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-// This is CodeMirror (http://codemirror.net), a code editor
-// implemented in JavaScript on top of the browser's DOM.
-//
-// You can find some technical background for some of the code below
-// at http://marijnhaverbeke.nl/blog/#cm-internals .
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    module.exports = mod();
-  else if (typeof define == "function" && define.amd) // AMD
-    return define([], mod);
-  else // Plain browser env
-    this.CodeMirror = mod();
-})(function() {
-  "use strict";
-
-  // BROWSER SNIFFING
-
-  // Kludges for bugs and behavior differences that can't be feature
-  // detected are enabled based on userAgent etc sniffing.
-
-  var gecko = /gecko\/\d/i.test(navigator.userAgent);
-  var ie_upto10 = /MSIE \d/.test(navigator.userAgent);
-  var ie_11up = /Trident\/(?:[7-9]|\d{2,})\..*rv:(\d+)/.exec(navigator.userAgent);
-  var ie = ie_upto10 || ie_11up;
-  var ie_version = ie && (ie_upto10 ? document.documentMode || 6 : ie_11up[1]);
-  var webkit = /WebKit\//.test(navigator.userAgent);
-  var qtwebkit = webkit && /Qt\/\d+\.\d+/.test(navigator.userAgent);
-  var chrome = /Chrome\//.test(navigator.userAgent);
-  var presto = /Opera\//.test(navigator.userAgent);
-  var safari = /Apple Computer/.test(navigator.vendor);
-  var mac_geMountainLion = /Mac OS X 1\d\D([8-9]|\d\d)\D/.test(navigator.userAgent);
-  var phantom = /PhantomJS/.test(navigator.userAgent);
-
-  var ios = /AppleWebKit/.test(navigator.userAgent) && /Mobile\/\w+/.test(navigator.userAgent);
-  // This is woefully incomplete. Suggestions for alternative methods welcome.
-  var mobile = ios || /Android|webOS|BlackBerry|Opera Mini|Opera Mobi|IEMobile/i.test(navigator.userAgent);
-  var mac = ios || /Mac/.test(navigator.platform);
-  var windows = /win/i.test(navigator.platform);
-
-  var presto_version = presto && navigator.userAgent.match(/Version\/(\d*\.\d*)/);
-  if (presto_version) presto_version = Number(presto_version[1]);
-  if (presto_version && presto_version >= 15) { presto = false; webkit = true; }
-  // Some browsers use the wrong event properties to signal cmd/ctrl on OS X
-  var flipCtrlCmd = mac && (qtwebkit || presto && (presto_version == null || presto_version < 12.11));
-  var captureRightClick = gecko || (ie && ie_version >= 9);
-
-  // Optimize some code when these features are not used.
-  var sawReadOnlySpans = false, sawCollapsedSpans = false;
-
-  // EDITOR CONSTRUCTOR
-
-  // A CodeMirror instance represents an editor. This is the object
-  // that user code is usually dealing with.
-
-  function CodeMirror(place, options) {
-    if (!(this instanceof CodeMirror)) return new CodeMirror(place, options);
-
-    this.options = options = options ? copyObj(options) : {};
-    // Determine effective options based on given values and defaults.
-    copyObj(defaults, options, false);
-    setGuttersForLineNumbers(options);
-
-    var doc = options.value;
-    if (typeof doc == "string") doc = new Doc(doc, options.mode);
-    this.doc = doc;
-
-    var input = new CodeMirror.inputStyles[options.inputStyle](this);
-    var display = this.display = new Display(place, doc, input);
-    display.wrapper.CodeMirror = this;
-    updateGutters(this);
-    themeChanged(this);
-    if (options.lineWrapping)
-      this.display.wrapper.className += " CodeMirror-wrap";
-    if (options.autofocus && !mobile) display.input.focus();
-    initScrollbars(this);
-
-    this.state = {
-      keyMaps: [],  // stores maps added by addKeyMap
-      overlays: [], // highlighting overlays, as added by addOverlay
-      modeGen: 0,   // bumped when mode/overlay changes, used to invalidate highlighting info
-      overwrite: false,
-      delayingBlurEvent: false,
-      focused: false,
-      suppressEdits: false, // used to disable editing during key handlers when in readOnly mode
-      pasteIncoming: false, cutIncoming: false, // help recognize paste/cut edits in input.poll
-      draggingText: false,
-      highlight: new Delayed(), // stores highlight worker timeout
-      keySeq: null,  // Unfinished key sequence
-      specialChars: null
-    };
-
-    var cm = this;
-
-    // Override magic textarea content restore that IE sometimes does
-    // on our hidden textarea on reload
-    if (ie && ie_version < 11) setTimeout(function() { cm.display.input.reset(true); }, 20);
-
-    registerEventHandlers(this);
-    ensureGlobalHandlers();
-
-    startOperation(this);
-    this.curOp.forceUpdate = true;
-    attachDoc(this, doc);
-
-    if ((options.autofocus && !mobile) || cm.hasFocus())
-      setTimeout(bind(onFocus, this), 20);
-    else
-      onBlur(this);
-
-    for (var opt in optionHandlers) if (optionHandlers.hasOwnProperty(opt))
-      optionHandlers[opt](this, options[opt], Init);
-    maybeUpdateLineNumberWidth(this);
-    if (options.finishInit) options.finishInit(this);
-    for (var i = 0; i < initHooks.length; ++i) initHooks[i](this);
-    endOperation(this);
-    // Suppress optimizelegibility in Webkit, since it breaks text
-    // measuring on line wrapping boundaries.
-    if (webkit && options.lineWrapping &&
-        getComputedStyle(display.lineDiv).textRendering == "optimizelegibility")
-      display.lineDiv.style.textRendering = "auto";
-  }
-
-  // DISPLAY CONSTRUCTOR
-
-  // The display handles the DOM integration, both for input reading
-  // and content drawing. It holds references to DOM nodes and
-  // display-related state.
-
-  function Display(place, doc, input) {
-    var d = this;
-    this.input = input;
-
-    // Covers bottom-right square when both scrollbars are present.
-    d.scrollbarFiller = elt("div", null, "CodeMirror-scrollbar-filler");
-    d.scrollbarFiller.setAttribute("cm-not-content", "true");
-    // Covers bottom of gutter when coverGutterNextToScrollbar is on
-    // and h scrollbar is present.
-    d.gutterFiller = elt("div", null, "CodeMirror-gutter-filler");
-    d.gutterFiller.setAttribute("cm-not-content", "true");
-    // Will contain the actual code, positioned to cover the viewport.
-    d.lineDiv = elt("div", null, "CodeMirror-code");
-    // Elements are added to these to represent selection and cursors.
-    d.selectionDiv = elt("div", null, null, "position: relative; z-index: 1");
-    d.cursorDiv = elt("div", null, "CodeMirror-cursors");
-    // A visibility: hidden element used to find the size of things.
-    d.measure = elt("div", null, "CodeMirror-measure");
-    // When lines outside of the viewport are measured, they are drawn in this.
-    d.lineMeasure = elt("div", null, "CodeMirror-measure");
-    // Wraps everything that needs to exist inside the vertically-padded coordinate system
-    d.lineSpace = elt("div", [d.measure, d.lineMeasure, d.selectionDiv, d.cursorDiv, d.lineDiv],
-                      null, "position: relative; outline: none");
-    // Moved around its parent to cover visible view.
-    d.mover = elt("div", [elt("div", [d.lineSpace], "CodeMirror-lines")], null, "position: relative");
-    // Set to the height of the document, allowing scrolling.
-    d.sizer = elt("div", [d.mover], "CodeMirror-sizer");
-    d.sizerWidth = null;
-    // Behavior of elts with overflow: auto and padding is
-    // inconsistent across browsers. This is used to ensure the
-    // scrollable area is big enough.
-    d.heightForcer = elt("div", null, null, "position: absolute; height: " + scrollerGap + "px; width: 1px;");
-    // Will contain the gutters, if any.
-    d.gutters = elt("div", null, "CodeMirror-gutters");
-    d.lineGutter = null;
-    // Actual scrollable element.
-    d.scroller = elt("div", [d.sizer, d.heightForcer, d.gutters], "CodeMirror-scroll");
-    d.scroller.setAttribute("tabIndex", "-1");
-    // The element in which the editor lives.
-    d.wrapper = elt("div", [d.scrollbarFiller, d.gutterFiller, d.scroller], "CodeMirror");
-
-    // Work around IE7 z-index bug (not perfect, hence IE7 not really being supported)
-    if (ie && ie_version < 8) { d.gutters.style.zIndex = -1; d.scroller.style.paddingRight = 0; }
-    if (!webkit && !(gecko && mobile)) d.scroller.draggable = true;
-
-    if (place) {
-      if (place.appendChild) place.appendChild(d.wrapper);
-      else place(d.wrapper);
-    }
-
-    // Current rendered range (may be bigger than the view window).
-    d.viewFrom = d.viewTo = doc.first;
-    d.reportedViewFrom = d.reportedViewTo = doc.first;
-    // Information about the rendered lines.
-    d.view = [];
-    d.renderedView = null;
-    // Holds info about a single rendered line when it was rendered
-    // for measurement, while not in view.
-    d.externalMeasured = null;
-    // Empty space (in pixels) above the view
-    d.viewOffset = 0;
-    d.lastWrapHeight = d.lastWrapWidth = 0;
-    d.updateLineNumbers = null;
-
-    d.nativeBarWidth = d.barHeight = d.barWidth = 0;
-    d.scrollbarsClipped = false;
-
-    // Used to only resize the line number gutter when necessary (when
-    // the amount of lines crosses a boundary that makes its width change)
-    d.lineNumWidth = d.lineNumInnerWidth = d.lineNumChars = null;
-    // Set to true when a non-horizontal-scrolling line widget is
-    // added. As an optimization, line widget aligning is skipped when
-    // this is false.
-    d.alignWidgets = false;
-
-    d.cachedCharWidth = d.cachedTextHeight = d.cachedPaddingH = null;
-
-    // Tracks the maximum line length so that the horizontal scrollbar
-    // can be kept static when scrolling.
-    d.maxLine = null;
-    d.maxLineLength = 0;
-    d.maxLineChanged = false;
-
-    // Used for measuring wheel scrolling granularity
-    d.wheelDX = d.wheelDY = d.wheelStartX = d.wheelStartY = null;
-
-    // True when shift is held down.
-    d.shift = false;
-
-    // Used to track whether anything happened since the context menu
-    // was opened.
-    d.selForContextMenu = null;
-
-    d.activeTouch = null;
-
-    input.init(d);
-  }
-
-  // STATE UPDATES
-
-  // Used to get the editor into a consistent state again when options change.
-
-  function loadMode(cm) {
-    cm.doc.mode = CodeMirror.getMode(cm.options, cm.doc.modeOption);
-    resetModeState(cm);
-  }
-
-  function resetModeState(cm) {
-    cm.doc.iter(function(line) {
-      if (line.stateAfter) line.stateAfter = null;
-      if (line.styles) line.styles = null;
-    });
-    cm.doc.frontier = cm.doc.first;
-    startWorker(cm, 100);
-    cm.state.modeGen++;
-    if (cm.curOp) regChange(cm);
-  }
-
-  function wrappingChanged(cm) {
-    if (cm.options.lineWrapping) {
-      addClass(cm.display.wrapper, "CodeMirror-wrap");
-      cm.display.sizer.style.minWidth = "";
-      cm.display.sizerWidth = null;
-    } else {
-      rmClass(cm.display.wrapper, "CodeMirror-wrap");
-      findMaxLine(cm);
-    }
-    estimateLineHeights(cm);
-    regChange(cm);
-    clearCaches(cm);
-    setTimeout(function(){updateScrollbars(cm);}, 100);
-  }
-
-  // Returns a function that estimates the height of a line, to use as
-  // first approximation until the line becomes visible (and is thus
-  // properly measurable).
-  function estimateHeight(cm) {
-    var th = textHeight(cm.display), wrapping = cm.options.lineWrapping;
-    var perLine = wrapping && Math.max(5, cm.display.scroller.clientWidth / charWidth(cm.display) - 3);
-    return function(line) {
-      if (lineIsHidden(cm.doc, line)) return 0;
-
-      var widgetsHeight = 0;
-      if (line.widgets) for (var i = 0; i < line.widgets.length; i++) {
-        if (line.widgets[i].height) widgetsHeight += line.widgets[i].height;
-      }
-
-      if (wrapping)
-        return widgetsHeight + (Math.ceil(line.text.length / perLine) || 1) * th;
-      else
-        return widgetsHeight + th;
-    };
-  }
-
-  function estimateLineHeights(cm) {
-    var doc = cm.doc, est = estimateHeight(cm);
-    doc.iter(function(line) {
-      var estHeight = est(line);
-      if (estHeight != line.height) updateLineHeight(line, estHeight);
-    });
-  }
-
-  function themeChanged(cm) {
-    cm.display.wrapper.className = cm.display.wrapper.className.replace(/\s*cm-s-\S+/g, "") +
-      cm.options.theme.replace(/(^|\s)\s*/g, " cm-s-");
-    clearCaches(cm);
-  }
-
-  function guttersChanged(cm) {
-    updateGutters(cm);
-    regChange(cm);
-    setTimeout(function(){alignHorizontally(cm);}, 20);
-  }
-
-  // Rebuild the gutter elements, ensure the margin to the left of the
-  // code matches their width.
-  function updateGutters(cm) {
-    var gutters = cm.display.gutters, specs = cm.options.gutters;
-    removeChildren(gutters);
-    for (var i = 0; i < specs.length; ++i) {
-      var gutterClass = specs[i];
-      var gElt = gutters.appendChild(elt("div", null, "CodeMirror-gutter " + gutterClass));
-      if (gutterClass == "CodeMirror-linenumbers") {
-        cm.display.lineGutter = gElt;
-        gElt.style.width = (cm.display.lineNumWidth || 1) + "px";
-      }
-    }
-    gutters.style.display = i ? "" : "none";
-    updateGutterSpace(cm);
-  }
-
-  function updateGutterSpace(cm) {
-    var width = cm.display.gutters.offsetWidth;
-    cm.display.sizer.style.marginLeft = width + "px";
-  }
-
-  // Compute the character length of a line, taking into account
-  // collapsed ranges (see markText) that might hide parts, and join
-  // other lines onto it.
-  function lineLength(line) {
-    if (line.height == 0) return 0;
-    var len = line.text.length, merged, cur = line;
-    while (merged = collapsedSpanAtStart(cur)) {
-      var found = merged.find(0, true);
-      cur = found.from.line;
-      len += found.from.ch - found.to.ch;
-    }
-    cur = line;
-    while (merged = collapsedSpanAtEnd(cur)) {
-      var found = merged.find(0, true);
-      len -= cur.text.length - found.from.ch;
-      cur = found.to.line;
-      len += cur.text.length - found.to.ch;
-    }
-    return len;
-  }
-
-  // Find the longest line in the document.
-  function findMaxLine(cm) {
-    var d = cm.display, doc = cm.doc;
-    d.maxLine = getLine(doc, doc.first);
-    d.maxLineLength = lineLength(d.maxLine);
-    d.maxLineChanged = true;
-    doc.iter(function(line) {
-      var len = lineLength(line);
-      if (len > d.maxLineLength) {
-        d.maxLineLength = len;
-        d.maxLine = line;
-      }
-    });
-  }
-
-  // Make sure the gutters options contains the element
-  // "CodeMirror-linenumbers" when the lineNumbers option is true.
-  function setGuttersForLineNumbers(options) {
-    var found = indexOf(options.gutters, "CodeMirror-linenumbers");
-    if (found == -1 && options.lineNumbers) {
-      options.gutters = options.gutters.concat(["CodeMirror-linenumbers"]);
-    } else if (found > -1 && !options.lineNumbers) {
-      options.gutters = options.gutters.slice(0);
-      options.gutters.splice(found, 1);
-    }
-  }
-
-  // SCROLLBARS
-
-  // Prepare DOM reads needed to update the scrollbars. Done in one
-  // shot to minimize update/measure roundtrips.
-  function measureForScrollbars(cm) {
-    var d = cm.display, gutterW = d.gutters.offsetWidth;
-    var docH = Math.round(cm.doc.height + paddingVert(cm.display));
-    return {
-      clientHeight: d.scroller.clientHeight,
-      viewHeight: d.wrapper.clientHeight,
-      scrollWidth: d.scroller.scrollWidth, clientWidth: d.scroller.clientWidth,
-      viewWidth: d.wrapper.clientWidth,
-      barLeft: cm.options.fixedGutter ? gutterW : 0,
-      docHeight: docH,
-      scrollHeight: docH + scrollGap(cm) + d.barHeight,
-      nativeBarWidth: d.nativeBarWidth,
-      gutterWidth: gutterW
-    };
-  }
-
-  function NativeScrollbars(place, scroll, cm) {
-    this.cm = cm;
-    var vert = this.vert = elt("div", [elt("div", null, null, "min-width: 1px")], "CodeMirror-vscrollbar");
-    var horiz = this.horiz = elt("div", [elt("div", null, null, "height: 100%; min-height: 1px")], "CodeMirror-hscrollbar");
-    place(vert); place(horiz);
-
-    on(vert, "scroll", function() {
-      if (vert.clientHeight) scroll(vert.scrollTop, "vertical");
-    });
-    on(horiz, "scroll", function() {
-      if (horiz.clientWidth) scroll(horiz.scrollLeft, "horizontal");
-    });
-
-    this.checkedOverlay = false;
-    // Need to set a minimum width to see the scrollbar on IE7 (but must not set it on IE8).
-    if (ie && ie_version < 8) this.horiz.style.minHeight = this.vert.style.minWidth = "18px";
-  }
-
-  NativeScrollbars.prototype = copyObj({
-    update: function(measure) {
-      var needsH = measure.scrollWidth > measure.clientWidth + 1;
-      var needsV = measure.scrollHeight > measure.clientHeight + 1;
-      var sWidth = measure.nativeBarWidth;
-
-      if (needsV) {
-        this.vert.style.display = "block";
-        this.vert.style.bottom = needsH ? sWidth + "px" : "0";
-        var totalHeight = measure.viewHeight - (needsH ? sWidth : 0);
-        // A bug in IE8 can cause this value to be negative, so guard it.
-        this.vert.firstChild.style.height =
-          Math.max(0, measure.scrollHeight - measure.clientHeight + totalHeight) + "px";
-      } else {
-        this.vert.style.display = "";
-        this.vert.firstChild.style.height = "0";
-      }
-
-      if (needsH) {
-        this.horiz.style.display = "block";
-        this.horiz.style.right = needsV ? sWidth + "px" : "0";
-        this.horiz.style.left = measure.barLeft + "px";
-        var totalWidth = measure.viewWidth - measure.barLeft - (needsV ? sWidth : 0);
-        this.horiz.firstChild.style.width =
-          (measure.scrollWidth - measure.clientWidth + totalWidth) + "px";
-      } else {
-        this.horiz.style.display = "";
-        this.horiz.firstChild.style.width = "0";
-      }
-
-      if (!this.checkedOverlay && measure.clientHeight > 0) {
-        if (sWidth == 0) this.overlayHack();
-        this.checkedOverlay = true;
-      }
-
-      return {right: needsV ? sWidth : 0, bottom: needsH ? sWidth : 0};
-    },
-    setScrollLeft: function(pos) {
-      if (this.horiz.scrollLeft != pos) this.horiz.scrollLeft = pos;
-    },
-    setScrollTop: function(pos) {
-      if (this.vert.scrollTop != pos) this.vert.scrollTop = pos;
-    },
-    overlayHack: function() {
-      var w = mac && !mac_geMountainLion ? "12px" : "18px";
-      this.horiz.style.minHeight = this.vert.style.minWidth = w;
-      var self = this;
-      var barMouseDown = function(e) {
-        if (e_target(e) != self.vert && e_target(e) != self.horiz)
-          operation(self.cm, onMouseDown)(e);
-      };
-      on(this.vert, "mousedown", barMouseDown);
-      on(this.horiz, "mousedown", barMouseDown);
-    },
-    clear: function() {
-      var parent = this.horiz.parentNode;
-      parent.removeChild(this.horiz);
-      parent.removeChild(this.vert);
-    }
-  }, NativeScrollbars.prototype);
-
-  function NullScrollbars() {}
-
-  NullScrollbars.prototype = copyObj({
-    update: function() { return {bottom: 0, right: 0}; },
-    setScrollLeft: function() {},
-    setScrollTop: function() {},
-    clear: function() {}
-  }, NullScrollbars.prototype);
-
-  CodeMirror.scrollbarModel = {"native": NativeScrollbars, "null": NullScrollbars};
-
-  function initScrollbars(cm) {
-    if (cm.display.scrollbars) {
-      cm.display.scrollbars.clear();
-      if (cm.display.scrollbars.addClass)
-        rmClass(cm.display.wrapper, cm.display.scrollbars.addClass);
-    }
-
-    cm.display.scrollbars = new CodeMirror.scrollbarModel[cm.options.scrollbarStyle](function(node) {
-      cm.display.wrapper.insertBefore(node, cm.display.scrollbarFiller);
-      // Prevent clicks in the scrollbars from killing focus
-      on(node, "mousedown", function() {
-        if (cm.state.focused) setTimeout(function() { cm.display.input.focus(); }, 0);
-      });
-      node.setAttribute("cm-not-content", "true");
-    }, function(pos, axis) {
-      if (axis == "horizontal") setScrollLeft(cm, pos);
-      else setScrollTop(cm, pos);
-    }, cm);
-    if (cm.display.scrollbars.addClass)
-      addClass(cm.display.wrapper, cm.display.scrollbars.addClass);
-  }
-
-  function updateScrollbars(cm, measure) {
-    if (!measure) measure = measureForScrollbars(cm);
-    var startWidth = cm.display.barWidth, startHeight = cm.display.barHeight;
-    updateScrollbarsInner(cm, measure);
-    for (var i = 0; i < 4 && startWidth != cm.display.barWidth || startHeight != cm.display.barHeight; i++) {
-      if (startWidth != cm.display.barWidth && cm.options.lineWrapping)
-        updateHeightsInViewport(cm);
-      updateScrollbarsInner(cm, measureForScrollbars(cm));
-      startWidth = cm.display.barWidth; startHeight = cm.display.barHeight;
-    }
-  }
-
-  // Re-synchronize the fake scrollbars with the actual size of the
-  // content.
-  function updateScrollbarsInner(cm, measure) {
-    var d = cm.display;
-    var sizes = d.scrollbars.update(measure);
-
-    d.sizer.style.paddingRight = (d.barWidth = sizes.right) + "px";
-    d.sizer.style.paddingBottom = (d.barHeight = sizes.bottom) + "px";
-
-    if (sizes.right && sizes.bottom) {
-      d.scrollbarFiller.style.display = "block";
-      d.scrollbarFiller.style.height = sizes.bottom + "px";
-      d.scrollbarFiller.style.width = sizes.right + "px";
-    } else d.scrollbarFiller.style.display = "";
-    if (sizes.bottom && cm.options.coverGutterNextToScrollbar && cm.options.fixedGutter) {
-      d.gutterFiller.style.display = "block";
-      d.gutterFiller.style.height = sizes.bottom + "px";
-      d.gutterFiller.style.width = measure.gutterWidth + "px";
-    } else d.gutterFiller.style.display = "";
-  }
-
-  // Compute the lines that are visible in a given viewport (defaults
-  // the the current scroll position). viewport may contain top,
-  // height, and ensure (see op.scrollToPos) properties.
-  function visibleLines(display, doc, viewport) {
-    var top = viewport && viewport.top != null ? Math.max(0, viewport.top) : display.scroller.scrollTop;
-    top = Math.floor(top - paddingTop(display));
-    var bottom = viewport && viewport.bottom != null ? viewport.bottom : top + display.wrapper.clientHeight;
-
-    var from = lineAtHeight(doc, top), to = lineAtHeight(doc, bottom);
-    // Ensure is a {from: {line, ch}, to: {line, ch}} object, and
-    // forces those lines into the viewport (if possible).
-    if (viewport && viewport.ensure) {
-      var ensureFrom = viewport.ensure.from.line, ensureTo = viewport.ensure.to.line;
-      if (ensureFrom < from) {
-        from = ensureFrom;
-        to = lineAtHeight(doc, heightAtLine(getLine(doc, ensureFrom)) + display.wrapper.clientHeight);
-      } else if (Math.min(ensureTo, doc.lastLine()) >= to) {
-        from = lineAtHeight(doc, heightAtLine(getLine(doc, ensureTo)) - display.wrapper.clientHeight);
-        to = ensureTo;
-      }
-    }
-    return {from: from, to: Math.max(to, from + 1)};
-  }
-
-  // LINE NUMBERS
-
-  // Re-align line numbers and gutter marks to compensate for
-  // horizontal scrolling.
-  function alignHorizontally(cm) {
-    var display = cm.display, view = display.view;
-    if (!display.alignWidgets && (!display.gutters.firstChild || !cm.options.fixedGutter)) return;
-    var comp = compensateForHScroll(display) - display.scroller.scrollLeft + cm.doc.scrollLeft;
-    var gutterW = display.gutters.offsetWidth, left = comp + "px";
-    for (var i = 0; i < view.length; i++) if (!view[i].hidden) {
-      if (cm.options.fixedGutter && view[i].gutter)
-        view[i].gutter.style.left = left;
-      var align = view[i].alignable;
-      if (align) for (var j = 0; j < align.length; j++)
-        align[j].style.left = left;
-    }
-    if (cm.options.fixedGutter)
-      display.gutters.style.left = (comp + gutterW) + "px";
-  }
-
-  // Used to ensure that the line number gutter is still the right
-  // size for the current document size. Returns true when an update
-  // is needed.
-  function maybeUpdateLineNumberWidth(cm) {
-    if (!cm.options.lineNumbers) return false;
-    var doc = cm.doc, last = lineNumberFor(cm.options, doc.first + doc.size - 1), display = cm.display;
-    if (last.length != display.lineNumChars) {
-      var test = display.measure.appendChild(elt("div", [elt("div", last)],
-                                                 "CodeMirror-linenumber CodeMirror-gutter-elt"));
-      var innerW = test.firstChild.offsetWidth, padding = test.offsetWidth - innerW;
-      display.lineGutter.style.width = "";
-      display.lineNumInnerWidth = Math.max(innerW, display.lineGutter.offsetWidth - padding) + 1;
-      display.lineNumWidth = display.lineNumInnerWidth + padding;
-      display.lineNumChars = display.lineNumInnerWidth ? last.length : -1;
-      display.lineGutter.style.width = display.lineNumWidth + "px";
-      updateGutterSpace(cm);
-      return true;
-    }
-    return false;
-  }
-
-  function lineNumberFor(options, i) {
-    return String(options.lineNumberFormatter(i + options.firstLineNumber));
-  }
-
-  // Computes display.scroller.scrollLeft + display.gutters.offsetWidth,
-  // but using getBoundingClientRect to get a sub-pixel-accurate
-  // result.
-  function compensateForHScroll(display) {
-    return display.scroller.getBoundingClientRect().left - display.sizer.getBoundingClientRect().left;
-  }
-
-  // DISPLAY DRAWING
-
-  function DisplayUpdate(cm, viewport, force) {
-    var display = cm.display;
-
-    this.viewport = viewport;
-    // Store some values that we'll need later (but don't want to force a relayout for)
-    this.visible = visibleLines(display, cm.doc, viewport);
-    this.editorIsHidden = !display.wrapper.offsetWidth;
-    this.wrapperHeight = display.wrapper.clientHeight;
-    this.wrapperWidth = display.wrapper.clientWidth;
-    this.oldDisplayWidth = displayWidth(cm);
-    this.force = force;
-    this.dims = getDimensions(cm);
-    this.events = [];
-  }
-
-  DisplayUpdate.prototype.signal = function(emitter, type) {
-    if (hasHandler(emitter, type))
-      this.events.push(arguments);
-  };
-  DisplayUpdate.prototype.finish = function() {
-    for (var i = 0; i < this.events.length; i++)
-      signal.apply(null, this.events[i]);
-  };
-
-  function maybeClipScrollbars(cm) {
-    var display = cm.display;
-    if (!display.scrollbarsClipped && display.scroller.offsetWidth) {
-      display.nativeBarWidth = display.scroller.offsetWidth - display.scroller.clientWidth;
-      display.heightForcer.style.height = scrollGap(cm) + "px";
-      display.sizer.style.marginBottom = -display.nativeBarWidth + "px";
-      display.sizer.style.borderRightWidth = scrollGap(cm) + "px";
-      display.scrollbarsClipped = true;
-    }
-  }
-
-  // Does the actual updating of the line display. Bails out
-  // (returning false) when there is nothing to be done and forced is
-  // false.
-  function updateDisplayIfNeeded(cm, update) {
-    var display = cm.display, doc = cm.doc;
-
-    if (update.editorIsHidden) {
-      resetView(cm);
-      return false;
-    }
-
-    // Bail out if the visible area is already rendered and nothing changed.
-    if (!update.force &&
-        update.visible.from >= display.viewFrom && update.visible.to <= display.viewTo &&
-        (display.updateLineNumbers == null || display.updateLineNumbers >= display.viewTo) &&
-        display.renderedView == display.view && countDirtyView(cm) == 0)
-      return false;
-
-    if (maybeUpdateLineNumberWidth(cm)) {
-      resetView(cm);
-      update.dims = getDimensions(cm);
-    }
-
-    // Compute a suitable new viewport (from & to)
-    var end = doc.first + doc.size;
-    var from = Math.max(update.visible.from - cm.options.viewportMargin, doc.first);
-    var to = Math.min(end, update.visible.to + cm.options.viewportMargin);
-    if (display.viewFrom < from && from - display.viewFrom < 20) from = Math.max(doc.first, display.viewFrom);
-    if (display.viewTo > to && display.viewTo - to < 20) to = Math.min(end, display.viewTo);
-    if (sawCollapsedSpans) {
-      from = visualLineNo(cm.doc, from);
-      to = visualLineEndNo(cm.doc, to);
-    }
-
-    var different = from != display.viewFrom || to != display.viewTo ||
-      display.lastWrapHeight != update.wrapperHeight || display.lastWrapWidth != update.wrapperWidth;
-    adjustView(cm, from, to);
-
-    display.viewOffset = heightAtLine(getLine(cm.doc, display.viewFrom));
-    // Position the mover div to align with the current scroll position
-    cm.display.mover.style.top = display.viewOffset + "px";
-
-    var toUpdate = countDirtyView(cm);
-    if (!different && toUpdate == 0 && !update.force && display.renderedView == display.view &&
-        (display.updateLineNumbers == null || display.updateLineNumbers >= display.viewTo))
-      return false;
-
-    // For big changes, we hide the enclosing element during the
-    // update, since that speeds up the operations on most browsers.
-    var focused = activeElt();
-    if (toUpdate > 4) display.lineDiv.style.display = "none";
-    patchDisplay(cm, display.updateLineNumbers, update.dims);
-    if (toUpdate > 4) display.lineDiv.style.display = "";
-    display.renderedView = display.view;
-    // There might have been a widget with a focused element that got
-    // hidden or updated, if so re-focus it.
-    if (focused && activeElt() != focused && focused.offsetHeight) focused.focus();
-
-    // Prevent selection and cursors from interfering with the scroll
-    // width and height.
-    removeChildren(display.cursorDiv);
-    removeChildren(display.selectionDiv);
-    display.gutters.style.height = 0;
-
-    if (different) {
-      display.lastWrapHeight = update.wrapperHeight;
-      display.lastWrapWidth = update.wrapperWidth;
-      startWorker(cm, 400);
-    }
-
-    display.updateLineNumbers = null;
-
-    return true;
-  }
-
-  function postUpdateDisplay(cm, update) {
-    var viewport = update.viewport;
-    for (var first = true;; first = false) {
-      if (!first || !cm.options.lineWrapping || update.oldDisplayWidth == displayWidth(cm)) {
-        // Clip forced viewport to actual scrollable area.
-        if (viewport && viewport.top != null)
-          viewport = {top: Math.min(cm.doc.height + paddingVert(cm.display) - displayHeight(cm), viewport.top)};
-        // Updated line heights might result in the drawn area not
-        // actually covering the viewport. Keep looping until it does.
-        update.visible = visibleLines(cm.display, cm.doc, viewport);
-        if (update.visible.from >= cm.display.viewFrom && update.visible.to <= cm.display.viewTo)
-          break;
-      }
-      if (!updateDisplayIfNeeded(cm, update)) break;
-      updateHeightsInViewport(cm);
-      var barMeasure = measureForScrollbars(cm);
-      updateSelection(cm);
-      setDocumentHeight(cm, barMeasure);
-      updateScrollbars(cm, barMeasure);
-    }
-
-    update.signal(cm, "update", cm);
-    if (cm.display.viewFrom != cm.display.reportedViewFrom || cm.display.viewTo != cm.display.reportedViewTo) {
-      update.signal(cm, "viewportChange", cm, cm.display.viewFrom, cm.display.viewTo);
-      cm.display.reportedViewFrom = cm.display.viewFrom; cm.display.reportedViewTo = cm.display.viewTo;
-    }
-  }
-
-  function updateDisplaySimple(cm, viewport) {
-    var update = new DisplayUpdate(cm, viewport);
-    if (updateDisplayIfNeeded(cm, update)) {
-      updateHeightsInViewport(cm);
-      postUpdateDisplay(cm, update);
-      var barMeasure = measureForScrollbars(cm);
-      updateSelection(cm);
-      setDocumentHeight(cm, barMeasure);
-      updateScrollbars(cm, barMeasure);
-      update.finish();
-    }
-  }
-
-  function setDocumentHeight(cm, measure) {
-    cm.display.sizer.style.minHeight = measure.docHeight + "px";
-    var total = measure.docHeight + cm.display.barHeight;
-    cm.display.heightForcer.style.top = total + "px";
-    cm.display.gutters.style.height = Math.max(total + scrollGap(cm), measure.clientHeight) + "px";
-  }
-
-  // Read the actual heights of the rendered lines, and update their
-  // stored heights to match.
-  function updateHeightsInViewport(cm) {
-    var display = cm.display;
-    var prevBottom = display.lineDiv.offsetTop;
-    for (var i = 0; i < display.view.length; i++) {
-      var cur = display.view[i], height;
-      if (cur.hidden) continue;
-      if (ie && ie_version < 8) {
-        var bot = cur.node.offsetTop + cur.node.offsetHeight;
-        height = bot - prevBottom;
-        prevBottom = bot;
-      } else {
-        var box = cur.node.getBoundingClientRect();
-        height = box.bottom - box.top;
-      }
-      var diff = cur.line.height - height;
-      if (height < 2) height = textHeight(display);
-      if (diff > .001 || diff < -.001) {
-        updateLineHeight(cur.line, height);
-        updateWidgetHeight(cur.line);
-        if (cur.rest) for (var j = 0; j < cur.rest.length; j++)
-          updateWidgetHeight(cur.rest[j]);
-      }
-    }
-  }
-
-  // Read and store the height of line widgets associated with the
-  // given line.
-  function updateWidgetHeight(line) {
-    if (line.widgets) for (var i = 0; i < line.widgets.length; ++i)
-      line.widgets[i].height = line.widgets[i].node.offsetHeight;
-  }
-
-  // Do a bulk-read of the DOM positions and sizes needed to draw the
-  // view, so that we don't interleave reading and writing to the DOM.
-  function getDimensions(cm) {
-    var d = cm.display, left = {}, width = {};
-    var gutterLeft = d.gutters.clientLeft;
-    for (var n = d.gutters.firstChild, i = 0; n; n = n.nextSibling, ++i) {
-      left[cm.options.gutters[i]] = n.offsetLeft + n.clientLeft + gutterLeft;
-      width[cm.options.gutters[i]] = n.clientWidth;
-    }
-    return {fixedPos: compensateForHScroll(d),
-            gutterTotalWidth: d.gutters.offsetWidth,
-            gutterLeft: left,
-            gutterWidth: width,
-            wrapperWidth: d.wrapper.clientWidth};
-  }
-
-  // Sync the actual display DOM structure with display.view, removing
-  // nodes for lines that are no longer in view, and creating the ones
-  // that are not there yet, and updating the ones that are out of
-  // date.
-  function patchDisplay(cm, updateNumbersFrom, dims) {
-    var display = cm.display, lineNumbers = cm.options.lineNumbers;
-    var container = display.lineDiv, cur = container.firstChild;
-
-    function rm(node) {
-      var next = node.nextSibling;
-      // Works around a throw-scroll bug in OS X Webkit
-      if (webkit && mac && cm.display.currentWheelTarget == node)
-        node.style.display = "none";
-      else
-        node.parentNode.removeChild(node);
-      return next;
-    }
-
-    var view = display.view, lineN = display.viewFrom;
-    // Loop over the elements in the view, syncing cur (the DOM nodes
-    // in display.lineDiv) with the view as we go.
-    for (var i = 0; i < view.length; i++) {
-      var lineView = view[i];
-      if (lineView.hidden) {
-      } else if (!lineView.node || lineView.node.parentNode != container) { // Not drawn yet
-        var node = buildLineElement(cm, lineView, lineN, dims);
-        container.insertBefore(node, cur);
-      } else { // Already drawn
-        while (cur != lineView.node) cur = rm(cur);
-        var updateNumber = lineNumbers && updateNumbersFrom != null &&
-          updateNumbersFrom <= lineN && lineView.lineNumber;
-        if (lineView.changes) {
-          if (indexOf(lineView.changes, "gutter") > -1) updateNumber = false;
-          updateLineForChanges(cm, lineView, lineN, dims);
-        }
-        if (updateNumber) {
-          removeChildren(lineView.lineNumber);
-          lineView.lineNumber.appendChild(document.createTextNode(lineNumberFor(cm.options, lineN)));
-        }
-        cur = lineView.node.nextSibling;
-      }
-      lineN += lineView.size;
-    }
-    while (cur) cur = rm(cur);
-  }
-
-  // When an aspect of a line changes, a string is added to
-  // lineView.changes. This updates the relevant part of the line's
-  // DOM structure.
-  function updateLineForChanges(cm, lineView, lineN, dims) {
-    for (var j = 0; j < lineView.changes.length; j++) {
-      var type = lineView.changes[j];
-      if (type == "text") updateLineText(cm, lineView);
-      else if (type == "gutter") updateLineGutter(cm, lineView, lineN, dims);
-      else if (type == "class") updateLineClasses(lineView);
-      else if (type == "widget") updateLineWidgets(cm, lineView, dims);
-    }
-    lineView.changes = null;
-  }
-
-  // Lines with gutter elements, widgets or a background class need to
-  // be wrapped, and have the extra elements added to the wrapper div
-  function ensureLineWrapped(lineView) {
-    if (lineView.node == lineView.text) {
-      lineView.node = elt("div", null, null, "position: relative");
-      if (lineView.text.parentNode)
-        lineView.text.parentNode.replaceChild(lineView.node, lineView.text);
-      lineView.node.appendChild(lineView.text);
-      if (ie && ie_version < 8) lineView.node.style.zIndex = 2;
-    }
-    return lineView.node;
-  }
-
-  function updateLineBackground(lineView) {
-    var cls = lineView.bgClass ? lineView.bgClass + " " + (lineView.line.bgClass || "") : lineView.line.bgClass;
-    if (cls) cls += " CodeMirror-linebackground";
-    if (lineView.background) {
-      if (cls) lineView.background.className = cls;
-      else { lineView.background.parentNode.removeChild(lineView.background); lineView.background = null; }
-    } else if (cls) {
-      var wrap = ensureLineWrapped(lineView);
-      lineView.background = wrap.insertBefore(elt("div", null, cls), wrap.firstChild);
-    }
-  }
-
-  // Wrapper around buildLineContent which will reuse the structure
-  // in display.externalMeasured when possible.
-  function getLineContent(cm, lineView) {
-    var ext = cm.display.externalMeasured;
-    if (ext && ext.line == lineView.line) {
-      cm.display.externalMeasured = null;
-      lineView.measure = ext.measure;
-      return ext.built;
-    }
-    return buildLineContent(cm, lineView);
-  }
-
-  // Redraw the line's text. Interacts with the background and text
-  // classes because the mode may output tokens that influence these
-  // classes.
-  function updateLineText(cm, lineView) {
-    var cls = lineView.text.className;
-    var built = getLineContent(cm, lineView);
-    if (lineView.text == lineView.node) lineView.node = built.pre;
-    lineView.text.parentNode.replaceChild(built.pre, lineView.text);
-    lineView.text = built.pre;
-    if (built.bgClass != lineView.bgClass || built.textClass != lineView.textClass) {
-      lineView.bgClass = built.bgClass;
-      lineView.textClass = built.textClass;
-      updateLineClasses(lineView);
-    } else if (cls) {
-      lineView.text.className = cls;
-    }
-  }
-
-  function updateLineClasses(lineView) {
-    updateLineBackground(lineView);
-    if (lineView.line.wrapClass)
-      ensureLineWrapped(lineView).className = lineView.line.wrapClass;
-    else if (lineView.node != lineView.text)
-      lineView.node.className = "";
-    var textClass = lineView.textClass ? lineView.textClass + " " + (lineView.line.textClass || "") : lineView.line.textClass;
-    lineView.text.className = textClass || "";
-  }
-
-  function updateLineGutter(cm, lineView, lineN, dims) {
-    if (lineView.gutter) {
-      lineView.node.removeChild(lineView.gutter);
-      lineView.gutter = null;
-    }
-    var markers = lineView.line.gutterMarkers;
-    if (cm.options.lineNumbers || markers) {
-      var wrap = ensureLineWrapped(lineView);
-      var gutterWrap = lineView.gutter = elt("div", null, "CodeMirror-gutter-wrapper", "left: " +
-                                             (cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth) +
-                                             "px; width: " + dims.gutterTotalWidth + "px");
-      cm.display.input.setUneditable(gutterWrap);
-      wrap.insertBefore(gutterWrap, lineView.text);
-      if (lineView.line.gutterClass)
-        gutterWrap.className += " " + lineView.line.gutterClass;
-      if (cm.options.lineNumbers && (!markers || !markers["CodeMirror-linenumbers"]))
-        lineView.lineNumber = gutterWrap.appendChild(
-          elt("div", lineNumberFor(cm.options, lineN),
-              "CodeMirror-linenumber CodeMirror-gutter-elt",
-              "left: " + dims.gutterLeft["CodeMirror-linenumbers"] + "px; width: "
-              + cm.display.lineNumInnerWidth + "px"));
-      if (markers) for (var k = 0; k < cm.options.gutters.length; ++k) {
-        var id = cm.options.gutters[k], found = markers.hasOwnProperty(id) && markers[id];
-        if (found)
-          gutterWrap.appendChild(elt("div", [found], "CodeMirror-gutter-elt", "left: " +
-                                     dims.gutterLeft[id] + "px; width: " + dims.gutterWidth[id] + "px"));
-      }
-    }
-  }
-
-  function updateLineWidgets(cm, lineView, dims) {
-    if (lineView.alignable) lineView.alignable = null;
-    for (var node = lineView.node.firstChild, next; node; node = next) {
-      var next = node.nextSibling;
-      if (node.className == "CodeMirror-linewidget")
-        lineView.node.removeChild(node);
-    }
-    insertLineWidgets(cm, lineView, dims);
-  }
-
-  // Build a line's DOM representation from scratch
-  function buildLineElement(cm, lineView, lineN, dims) {
-    var built = getLineContent(cm, lineView);
-    lineView.text = lineView.node = built.pre;
-    if (built.bgClass) lineView.bgClass = built.bgClass;
-    if (built.textClass) lineView.textClass = built.textClass;
-
-    updateLineClasses(lineView);
-    updateLineGutter(cm, lineView, lineN, dims);
-    insertLineWidgets(cm, lineView, dims);
-    return lineView.node;
-  }
-
-  // A lineView may contain multiple logical lines (when merged by
-  // collapsed spans). The widgets for all of them need to be drawn.
-  function insertLineWidgets(cm, lineView, dims) {
-    insertLineWidgetsFor(cm, lineView.line, lineView, dims, true);
-    if (lineView.rest) for (var i = 0; i < lineView.rest.length; i++)
-      insertLineWidgetsFor(cm, lineView.rest[i], lineView, dims, false);
-  }
-
-  function insertLineWidgetsFor(cm, line, lineView, dims, allowAbove) {
-    if (!line.widgets) return;
-    var wrap = ensureLineWrapped(lineView);
-    for (var i = 0, ws = line.widgets; i < ws.length; ++i) {
-      var widget = ws[i], node = elt("div", [widget.node], "CodeMirror-linewidget");
-      if (!widget.handleMouseEvents) node.setAttribute("cm-ignore-events", "true");
-      positionLineWidget(widget, node, lineView, dims);
-      cm.display.input.setUneditable(node);
-      if (allowAbove && widget.above)
-        wrap.insertBefore(node, lineView.gutter || lineView.text);
-      else
-        wrap.appendChild(node);
-      signalLater(widget, "redraw");
-    }
-  }
-
-  function positionLineWidget(widget, node, lineView, dims) {
-    if (widget.noHScroll) {
-      (lineView.alignable || (lineView.alignable = [])).push(node);
-      var width = dims.wrapperWidth;
-      node.style.left = dims.fixedPos + "px";
-      if (!widget.coverGutter) {
-        width -= dims.gutterTotalWidth;
-        node.style.paddingLeft = dims.gutterTotalWidth + "px";
-      }
-      node.style.width = width + "px";
-    }
-    if (widget.coverGutter) {
-      node.style.zIndex = 5;
-      node.style.position = "relative";
-      if (!widget.noHScroll) node.style.marginLeft = -dims.gutterTotalWidth + "px";
-    }
-  }
-
-  // POSITION OBJECT
-
-  // A Pos instance represents a position within the text.
-  var Pos = CodeMirror.Pos = function(line, ch) {
-    if (!(this instanceof Pos)) return new Pos(line, ch);
-    this.line = line; this.ch = ch;
-  };
-
-  // Compare two positions, return 0 if they are the same, a negative
-  // number when a is less, and a positive number otherwise.
-  var cmp = CodeMirror.cmpPos = function(a, b) { return a.line - b.line || a.ch - b.ch; };
-
-  function copyPos(x) {return Pos(x.line, x.ch);}
-  function maxPos(a, b) { return cmp(a, b) < 0 ? b : a; }
-  function minPos(a, b) { return cmp(a, b) < 0 ? a : b; }
-
-  // INPUT HANDLING
-
-  function ensureFocus(cm) {
-    if (!cm.state.focused) { cm.display.input.focus(); onFocus(cm); }
-  }
-
-  function isReadOnly(cm) {
-    return cm.options.readOnly || cm.doc.cantEdit;
-  }
-
-  // This will be set to an array of strings when copying, so that,
-  // when pasting, we know what kind of selections the copied text
-  // was made out of.
-  var lastCopied = null;
-
-  function applyTextInput(cm, inserted, deleted, sel, origin) {
-    var doc = cm.doc;
-    cm.display.shift = false;
-    if (!sel) sel = doc.sel;
-
-    var paste = cm.state.pasteIncoming || origin == "paste";
-    var textLines = splitLines(inserted), multiPaste = null;
-    // When pasing N lines into N selections, insert one line per selection
-    if (paste && sel.ranges.length > 1) {
-      if (lastCopied && lastCopied.join("\n") == inserted)
-        multiPaste = sel.ranges.length % lastCopied.length == 0 && map(lastCopied, splitLines);
-      else if (textLines.length == sel.ranges.length)
-        multiPaste = map(textLines, function(l) { return [l]; });
-    }
-
-    // Normal behavior is to insert the new text into every selection
-    for (var i = sel.ranges.length - 1; i >= 0; i--) {
-      var range = sel.ranges[i];
-      var from = range.from(), to = range.to();
-      if (range.empty()) {
-        if (deleted && deleted > 0) // Handle deletion
-          from = Pos(from.line, from.ch - deleted);
-        else if (cm.state.overwrite && !paste) // Handle overwrite
-          to = Pos(to.line, Math.min(getLine(doc, to.line).text.length, to.ch + lst(textLines).length));
-      }
-      var updateInput = cm.curOp.updateInput;
-      var changeEvent = {from: from, to: to, text: multiPaste ? multiPaste[i % multiPaste.length] : textLines,
-                         origin: origin || (paste ? "paste" : cm.state.cutIncoming ? "cut" : "+input")};
-      makeChange(cm.doc, changeEvent);
-      signalLater(cm, "inputRead", cm, changeEvent);
-    }
-    if (inserted && !paste)
-      triggerElectric(cm, inserted);
-
-    ensureCursorVisible(cm);
-    cm.curOp.updateInput = updateInput;
-    cm.curOp.typing = true;
-    cm.state.pasteIncoming = cm.state.cutIncoming = false;
-  }
-
-  function handlePaste(e, cm) {
-    var pasted = e.clipboardData && e.clipboardData.getData("text/plain");
-    if (pasted) {
-      e.preventDefault();
-      runInOp(cm, function() { applyTextInput(cm, pasted, 0, null, "paste"); });
-      return true;
-    }
-  }
-
-  function triggerElectric(cm, inserted) {
-    // When an 'electric' character is inserted, immediately trigger a reindent
-    if (!cm.options.electricChars || !cm.options.smartIndent) return;
-    var sel = cm.doc.sel;
-
-    for (var i = sel.ranges.length - 1; i >= 0; i--) {
-      var range = sel.ranges[i];
-      if (range.head.ch > 100 || (i && sel.ranges[i - 1].head.line == range.head.line)) continue;
-      var mode = cm.getModeAt(range.head);
-      var indented = false;
-      if (mode.electricChars) {
-        for (var j = 0; j < mode.electricChars.length; j++)
-          if (inserted.indexOf(mode.electricChars.charAt(j)) > -1) {
-            indented = indentLine(cm, range.head.line, "smart");
-            break;
-          }
-      } else if (mode.electricInput) {
-        if (mode.electricInput.test(getLine(cm.doc, range.head.line).text.slice(0, range.head.ch)))
-          indented = indentLine(cm, range.head.line, "smart");
-      }
-      if (indented) signalLater(cm, "electricInput", cm, range.head.line);
-    }
-  }
-
-  function copyableRanges(cm) {
-    var text = [], ranges = [];
-    for (var i = 0; i < cm.doc.sel.ranges.length; i++) {
-      var line = cm.doc.sel.ranges[i].head.line;
-      var lineRange = {anchor: Pos(line, 0), head: Pos(line + 1, 0)};
-      ranges.push(lineRange);
-      text.push(cm.getRange(lineRange.anchor, lineRange.head));
-    }
-    return {text: text, ranges: ranges};
-  }
-
-  function disableBrowserMagic(field) {
-    field.setAttribute("autocorrect", "off");
-    field.setAttribute("autocapitalize", "off");
-    field.setAttribute("spellcheck", "false");
-  }
-
-  // TEXTAREA INPUT STYLE
-
-  function TextareaInput(cm) {
-    this.cm = cm;
-    // See input.poll and input.reset
-    this.prevInput = "";
-
-    // Flag that indicates whether we expect input to appear real soon
-    // now (after some event like 'keypress' or 'input') and are
-    // polling intensively.
-    this.pollingFast = false;
-    // Self-resetting timeout for the poller
-    this.polling = new Delayed();
-    // Tracks when input.reset has punted to just putting a short
-    // string into the textarea instead of the full selection.
-    this.inaccurateSelection = false;
-    // Used to work around IE issue with selection being forgotten when focus moves away from textarea
-    this.hasSelection = false;
-    this.composing = null;
-  };
-
-  function hiddenTextarea() {
-    var te = elt("textarea", null, null, "position: absolute; padding: 0; width: 1px; height: 1em; outline: none");
-    var div = elt("div", [te], null, "overflow: hidden; position: relative; width: 3px; height: 0px;");
-    // The textarea is kept positioned near the cursor to prevent the
-    // fact that it'll be scrolled into view on input from scrolling
-    // our fake cursor out of view. On webkit, when wrap=off, paste is
-    // very slow. So make the area wide instead.
-    if (webkit) te.style.width = "1000px";
-    else te.setAttribute("wrap", "off");
-    // If border: 0; -- iOS fails to open keyboard (issue #1287)
-    if (ios) te.style.border = "1px solid black";
-    disableBrowserMagic(te);
-    return div;
-  }
-
-  TextareaInput.prototype = copyObj({
-    init: function(display) {
-      var input = this, cm = this.cm;
-
-      // Wraps and hides input textarea
-      var div = this.wrapper = hiddenTextarea();
-      // The semihidden textarea that is focused when the editor is
-      // focused, and receives input.
-      var te = this.textarea = div.firstChild;
-      display.wrapper.insertBefore(div, display.wrapper.firstChild);
-
-      // Needed to hide big blue blinking cursor on Mobile Safari (doesn't seem to work in iOS 8 anymore)
-      if (ios) te.style.width = "0px";
-
-      on(te, "input", function() {
-        if (ie && ie_version >= 9 && input.hasSelection) input.hasSelection = null;
-        input.poll();
-      });
-
-      on(te, "paste", function(e) {
-        if (handlePaste(e, cm)) return true;
-
-        cm.state.pasteIncoming = true;
-        input.fastPoll();
-      });
-
-      function prepareCopyCut(e) {
-        if (cm.somethingSelected()) {
-          lastCopied = cm.getSelections();
-          if (input.inaccurateSelection) {
-            input.prevInput = "";
-            input.inaccurateSelection = false;
-            te.value = lastCopied.join("\n");
-            selectInput(te);
-          }
-        } else if (!cm.options.lineWiseCopyCut) {
-          return;
-        } else {
-          var ranges = copyableRanges(cm);
-          lastCopied = ranges.text;
-          if (e.type == "cut") {
-            cm.setSelections(ranges.ranges, null, sel_dontScroll);
-          } else {
-            input.prevInput = "";
-            te.value = ranges.text.join("\n");
-            selectInput(te);
-          }
-        }
-        if (e.type == "cut") cm.state.cutIncoming = true;
-      }
-      on(te, "cut", prepareCopyCut);
-      on(te, "copy", prepareCopyCut);
-
-      on(display.scroller, "paste", function(e) {
-        if (eventInWidget(display, e)) return;
-        cm.state.pasteIncoming = true;
-        input.focus();
-      });
-
-      // Prevent normal selection in the editor (we handle our own)
-      on(display.lineSpace, "selectstart", function(e) {
-        if (!eventInWidget(display, e)) e_preventDefault(e);
-      });
-
-      on(te, "compositionstart", function() {
-        var start = cm.getCursor("from");
-        input.composing = {
-          start: start,
-          range: cm.markText(start, cm.getCursor("to"), {className: "CodeMirror-composing"})
-        };
-      });
-      on(te, "compositionend", function() {
-        if (input.composing) {
-          input.poll();
-          input.composing.range.clear();
-          input.composing = null;
-        }
-      });
-    },
-
-    prepareSelection: function() {
-      // Redraw the selection and/or cursor
-      var cm = this.cm, display = cm.display, doc = cm.doc;
-      var result = prepareSelection(cm);
-
-      // Move the hidden textarea near the cursor to prevent scrolling artifacts
-      if (cm.options.moveInputWithCursor) {
-        var headPos = cursorCoords(cm, doc.sel.primary().head, "div");
-        var wrapOff = display.wrapper.getBoundingClientRect(), lineOff = display.lineDiv.getBoundingClientRect();
-        result.teTop = Math.max(0, Math.min(display.wrapper.clientHeight - 10,
-                                            headPos.top + lineOff.top - wrapOff.top));
-        result.teLeft = Math.max(0, Math.min(display.wrapper.clientWidth - 10,
-                                             headPos.left + lineOff.left - wrapOff.left));
-      }
-
-      return result;
-    },
-
-    showSelection: function(drawn) {
-      var cm = this.cm, display = cm.display;
-      removeChildrenAndAdd(display.cursorDiv, drawn.cursors);
-      removeChildrenAndAdd(display.selectionDiv, drawn.selection);
-      if (drawn.teTop != null) {
-        this.wrapper.style.top = drawn.teTop + "px";
-        this.wrapper.style.left = drawn.teLeft + "px";
-      }
-    },
-
-    // Reset the input to correspond to the selection (or to be empty,
-    // when not typing and nothing is selected)
-    reset: function(typing) {
-      if (this.contextMenuPending) return;
-      var minimal, selected, cm = this.cm, doc = cm.doc;
-      if (cm.somethingSelected()) {
-        this.prevInput = "";
-        var range = doc.sel.primary();
-        minimal = hasCopyEvent &&
-          (range.to().line - range.from().line > 100 || (selected = cm.getSelection()).length > 1000);
-        var content = minimal ? "-" : selected || cm.getSelection();
-        this.textarea.value = content;
-        if (cm.state.focused) selectInput(this.textarea);
-        if (ie && ie_version >= 9) this.hasSelection = content;
-      } else if (!typing) {
-        this.prevInput = this.textarea.value = "";
-        if (ie && ie_version >= 9) this.hasSelection = null;
-      }
-      this.inaccurateSelection = minimal;
-    },
-
-    getField: function() { return this.textarea; },
-
-    supportsTouch: function() { return false; },
-
-    focus: function() {
-      if (this.cm.options.readOnly != "nocursor" && (!mobile || activeElt() != this.textarea)) {
-        try { this.textarea.focus(); }
-        catch (e) {} // IE8 will throw if the textarea is display: none or not in DOM
-      }
-    },
-
-    blur: function() { this.textarea.blur(); },
-
-    resetPosition: function() {
-      this.wrapper.style.top = this.wrapper.style.left = 0;
-    },
-
-    receivedFocus: function() { this.slowPoll(); },
-
-    // Poll for input changes, using the normal rate of polling. This
-    // runs as long as the editor is focused.
-    slowPoll: function() {
-      var input = this;
-      if (input.pollingFast) return;
-      input.polling.set(this.cm.options.pollInterval, function() {
-        input.poll();
-        if (input.cm.state.focused) input.slowPoll();
-      });
-    },
-
-    // When an event has just come in that is likely to add or change
-    // something in the input textarea, we poll faster, to ensure that
-    // the change appears on the screen quickly.
-    fastPoll: function() {
-      var missed = false, input = this;
-      input.pollingFast = true;
-      function p() {
-        var changed = input.poll();
-        if (!changed && !missed) {missed = true; input.polling.set(60, p);}
-        else {input.pollingFast = false; input.slowPoll();}
-      }
-      input.polling.set(20, p);
-    },
-
-    // Read input from the textarea, and update the document to match.
-    // When something is selected, it is present in the textarea, and
-    // selected (unless it is huge, in which case a placeholder is
-    // used). When nothing is selected, the cursor sits after previously
-    // seen text (can be empty), which is stored in prevInput (we must
-    // not reset the textarea when typing, because that breaks IME).
-    poll: function() {
-      var cm = this.cm, input = this.textarea, prevInput = this.prevInput;
-      // Since this is called a *lot*, try to bail out as cheaply as
-      // possible when it is clear that nothing happened. hasSelection
-      // will be the case when there is a lot of text in the textarea,
-      // in which case reading its value would be expensive.
-      if (this.contextMenuPending || !cm.state.focused ||
-          (hasSelection(input) && !prevInput) ||
-          isReadOnly(cm) || cm.options.disableInput || cm.state.keySeq)
-        return false;
-
-      var text = input.value;
-      // If nothing changed, bail.
-      if (text == prevInput && !cm.somethingSelected()) return false;
-      // Work around nonsensical selection resetting in IE9/10, and
-      // inexplicable appearance of private area unicode characters on
-      // some key combos in Mac (#2689).
-      if (ie && ie_version >= 9 && this.hasSelection === text ||
-          mac && /[\uf700-\uf7ff]/.test(text)) {
-        cm.display.input.reset();
-        return false;
-      }
-
-      if (cm.doc.sel == cm.display.selForContextMenu) {
-        var first = text.charCodeAt(0);
-        if (first == 0x200b && !prevInput) prevInput = "\u200b";
-        if (first == 0x21da) { this.reset(); return this.cm.execCommand("undo"); }
-      }
-      // Find the part of the input that is actually new
-      var same = 0, l = Math.min(prevInput.length, text.length);
-      while (same < l && prevInput.charCodeAt(same) == text.charCodeAt(same)) ++same;
-
-      var self = this;
-      runInOp(cm, function() {
-        applyTextInput(cm, text.slice(same), prevInput.length - same,
-                       null, self.composing ? "*compose" : null);
-
-        // Don't leave long text in the textarea, since it makes further polling slow
-        if (text.length > 1000 || text.indexOf("\n") > -1) input.value = self.prevInput = "";
-        else self.prevInput = text;
-
-        if (self.composing) {
-          self.composing.range.clear();
-          self.composing.range = cm.markText(self.composing.start, cm.getCursor("to"),
-                                             {className: "CodeMirror-composing"});
-        }
-      });
-      return true;
-    },
-
-    ensurePolled: function() {
-      if (this.pollingFast && this.poll()) this.pollingFast = false;
-    },
-
-    onKeyPress: function() {
-      if (ie && ie_version >= 9) this.hasSelection = null;
-      this.fastPoll();
-    },
-
-    onContextMenu: function(e) {
-      var input = this, cm = input.cm, display = cm.display, te = input.textarea;
-      var pos = posFromMouse(cm, e), scrollPos = display.scroller.scrollTop;
-      if (!pos || presto) return; // Opera is difficult.
-
-      // Reset the current text selection only if the click is done outside of the selection
-      // and 'resetSelectionOnContextMenu' option is true.
-      var reset = cm.options.resetSelectionOnContextMenu;
-      if (reset && cm.doc.sel.contains(pos) == -1)
-        operation(cm, setSelection)(cm.doc, simpleSelection(pos), sel_dontScroll);
-
-      var oldCSS = te.style.cssText;
-      input.wrapper.style.position = "absolute";
-      te.style.cssText = "position: fixed; width: 30px; height: 30px; top: " + (e.clientY - 5) +
-        "px; left: " + (e.clientX - 5) + "px; z-index: 1000; background: " +
-        (ie ? "rgba(255, 255, 255, .05)" : "transparent") +
-        "; outline: none; border-width: 0; outline: none; overflow: hidden; opacity: .05; filter: alpha(opacity=5);";
-      if (webkit) var oldScrollY = window.scrollY; // Work around Chrome issue (#2712)
-      display.input.focus();
-      if (webkit) window.scrollTo(null, oldScrollY);
-      display.input.reset();
-      // Adds "Select all" to context menu in FF
-      if (!cm.somethingSelected()) te.value = input.prevInput = " ";
-      input.contextMenuPending = true;
-      display.selForContextMenu = cm.doc.sel;
-      clearTimeout(display.detectingSelectAll);
-
-      // Select-all will be greyed out if there's nothing to select, so
-      // this adds a zero-width space so that we can later check whether
-      // it got selected.
-      function prepareSelectAllHack() {
-        if (te.selectionStart != null) {
-          var selected = cm.somethingSelected();
-          var extval = "\u200b" + (selected ? te.value : "");
-          te.value = "\u21da"; // Used to catch context-menu undo
-          te.value = extval;
-          input.prevInput = selected ? "" : "\u200b";
-          te.selectionStart = 1; te.selectionEnd = extval.length;
-          // Re-set this, in case some other handler touched the
-          // selection in the meantime.
-          display.selForContextMenu = cm.doc.sel;
-        }
-      }
-      function rehide() {
-        input.contextMenuPending = false;
-        input.wrapper.style.position = "relative";
-        te.style.cssText = oldCSS;
-        if (ie && ie_version < 9) display.scrollbars.setScrollTop(display.scroller.scrollTop = scrollPos);
-
-        // Try to detect the user choosing select-all
-        if (te.selectionStart != null) {
-          if (!ie || (ie && ie_version < 9)) prepareSelectAllHack();
-          var i = 0, poll = function() {
-            if (display.selForContextMenu == cm.doc.sel && te.selectionStart == 0 &&
-                te.selectionEnd > 0 && input.prevInput == "\u200b")
-              operation(cm, commands.selectAll)(cm);
-            else if (i++ < 10) display.detectingSelectAll = setTimeout(poll, 500);
-            else display.input.reset();
-          };
-          display.detectingSelectAll = setTimeout(poll, 200);
-        }
-      }
-
-      if (ie && ie_version >= 9) prepareSelectAllHack();
-      if (captureRightClick) {
-        e_stop(e);
-        var mouseup = function() {
-          off(window, "mouseup", mouseup);
-          setTimeout(rehide, 20);
-        };
-        on(window, "mouseup", mouseup);
-      } else {
-        setTimeout(rehide, 50);
-      }
-    },
-
-    setUneditable: nothing,
-
-    needsContentAttribute: false
-  }, TextareaInput.prototype);
-
-  // CONTENTEDITABLE INPUT STYLE
-
-  function ContentEditableInput(cm) {
-    this.cm = cm;
-    this.lastAnchorNode = this.lastAnchorOffset = this.lastFocusNode = this.lastFocusOffset = null;
-    this.polling = new Delayed();
-    this.gracePeriod = false;
-  }
-
-  ContentEditableInput.prototype = copyObj({
-    init: function(display) {
-      var input = this, cm = input.cm;
-      var div = input.div = display.lineDiv;
-      div.contentEditable = "true";
-      disableBrowserMagic(div);
-
-      on(div, "paste", function(e) { handlePaste(e, cm); })
-
-      on(div, "compositionstart", function(e) {
-        var data = e.data;
-        input.composing = {sel: cm.doc.sel, data: data, startData: data};
-        if (!data) return;
-        var prim = cm.doc.sel.primary();
-        var line = cm.getLine(prim.head.line);
-        var found = line.indexOf(data, Math.max(0, prim.head.ch - data.length));
-        if (found > -1 && found <= prim.head.ch)
-          input.composing.sel = simpleSelection(Pos(prim.head.line, found),
-                                                Pos(prim.head.line, found + data.length));
-      });
-      on(div, "compositionupdate", function(e) {
-        input.composing.data = e.data;
-      });
-      on(div, "compositionend", function(e) {
-        var ours = input.composing;
-        if (!ours) return;
-        if (e.data != ours.startData && !/\u200b/.test(e.data))
-          ours.data = e.data;
-        // Need a small delay to prevent other code (input event,
-        // selection polling) from doing damage when fired right after
-        // compositionend.
-        setTimeout(function() {
-          if (!ours.handled)
-            input.applyComposition(ours);
-          if (input.composing == ours)
-            input.composing = null;
-        }, 50);
-      });
-
-      on(div, "touchstart", function() {
-        input.forceCompositionEnd();
-      });
-
-      on(div, "input", function() {
-        if (input.composing) return;
-        if (!input.pollContent())
-          runInOp(input.cm, function() {regChange(cm);});
-      });
-
-      function onCopyCut(e) {
-        if (cm.somethingSelected()) {
-          lastCopied = cm.getSelections();
-          if (e.type == "cut") cm.replaceSelection("", null, "cut");
-        } else if (!cm.options.lineWiseCopyCut) {
-          return;
-        } else {
-          var ranges = copyableRanges(cm);
-          lastCopied = ranges.text;
-          if (e.type == "cut") {
-            cm.operation(function() {
-              cm.setSelections(ranges.ranges, 0, sel_dontScroll);
-              cm.replaceSelection("", null, "cut");
-            });
-          }
-        }
-        // iOS exposes the clipboard API, but seems to discard content inserted into it
-        if (e.clipboardData && !ios) {
-          e.preventDefault();
-          e.clipboardData.clearData();
-          e.clipboardData.setData("text/plain", lastCopied.join("\n"));
-        } else {
-          // Old-fashioned briefly-focus-a-textarea hack
-          var kludge = hiddenTextarea(), te = kludge.firstChild;
-          cm.display.lineSpace.insertBefore(kludge, cm.display.lineSpace.firstChild);
-          te.value = lastCopied.join("\n");
-          var hadFocus = document.activeElement;
-          selectInput(te);
-          setTimeout(function() {
-            cm.display.lineSpace.removeChild(kludge);
-            hadFocus.focus();
-          }, 50);
-        }
-      }
-      on(div, "copy", onCopyCut);
-      on(div, "cut", onCopyCut);
-    },
-
-    prepareSelection: function() {
-      var result = prepareSelection(this.cm, false);
-      result.focus = this.cm.state.focused;
-      return result;
-    },
-
-    showSelection: function(info) {
-      if (!info || !this.cm.display.view.length) return;
-      if (info.focus) this.showPrimarySelection();
-      this.showMultipleSelections(info);
-    },
-
-    showPrimarySelection: function() {
-      var sel = window.getSelection(), prim = this.cm.doc.sel.primary();
-      var curAnchor = domToPos(this.cm, sel.anchorNode, sel.anchorOffset);
-      var curFocus = domToPos(this.cm, sel.focusNode, sel.focusOffset);
-      if (curAnchor && !curAnchor.bad && curFocus && !curFocus.bad &&
-          cmp(minPos(curAnchor, curFocus), prim.from()) == 0 &&
-          cmp(maxPos(curAnchor, curFocus), prim.to()) == 0)
-        return;
-
-      var start = posToDOM(this.cm, prim.from());
-      var end = posToDOM(this.cm, prim.to());
-      if (!start && !end) return;
-
-      var view = this.cm.display.view;
-      var old = sel.rangeCount && sel.getRangeAt(0);
-      if (!start) {
-        start = {node: view[0].measure.map[2], offset: 0};
-      } else if (!end) { // FIXME dangerously hacky
-        var measure = view[view.length - 1].measure;
-        var map = measure.maps ? measure.maps[measure.maps.length - 1] : measure.map;
-        end = {node: map[map.length - 1], offset: map[map.length - 2] - map[map.length - 3]};
-      }
-
-      try { var rng = range(start.node, start.offset, end.offset, end.node); }
-      catch(e) {} // Our model of the DOM might be outdated, in which case the range we try to set can be impossible
-      if (rng) {
-        sel.removeAllRanges();
-        sel.addRange(rng);
-        if (old && sel.anchorNode == null) sel.addRange(old);
-        else if (gecko) this.startGracePeriod();
-      }
-      this.rememberSelection();
-    },
-
-    startGracePeriod: function() {
-      var input = this;
-      clearTimeout(this.gracePeriod);
-      this.gracePeriod = setTimeout(function() {
-        input.gracePeriod = false;
-        if (input.selectionChanged())
-          input.cm.operation(function() { input.cm.curOp.selectionChanged = true; });
-      }, 20);
-    },
-
-    showMultipleSelections: function(info) {
-      removeChildrenAndAdd(this.cm.display.cursorDiv, info.cursors);
-      removeChildrenAndAdd(this.cm.display.selectionDiv, info.selection);
-    },
-
-    rememberSelection: function() {
-      var sel = window.getSelection();
-      this.lastAnchorNode = sel.anchorNode; this.lastAnchorOffset = sel.anchorOffset;
-      this.lastFocusNode = sel.focusNode; this.lastFocusOffset = sel.focusOffset;
-    },
-
-    selectionInEditor: function() {
-      var sel = window.getSelection();
-      if (!sel.rangeCount) return false;
-      var node = sel.getRangeAt(0).commonAncestorContainer;
-      return contains(this.div, node);
-    },
-
-    focus: function() {
-      if (this.cm.options.readOnly != "nocursor") this.div.focus();
-    },
-    blur: function() { this.div.blur(); },
-    getField: function() { return this.div; },
-
-    supportsTouch: function() { return true; },
-
-    receivedFocus: function() {
-      var input = this;
-      if (this.selectionInEditor())
-        this.pollSelection();
-      else
-        runInOp(this.cm, function() { input.cm.curOp.selectionChanged = true; });
-
-      function poll() {
-        if (input.cm.state.focused) {
-          input.pollSelection();
-          input.polling.set(input.cm.options.pollInterval, poll);
-        }
-      }
-      this.polling.set(this.cm.options.pollInterval, poll);
-    },
-
-    selectionChanged: function() {
-      var sel = window.getSelection();
-      return sel.anchorNode != this.lastAnchorNode || sel.anchorOffset != this.lastAnchorOffset ||
-        sel.focusNode != this.lastFocusNode || sel.focusOffset != this.lastFocusOffset;
-    },
-
-    pollSelection: function() {
-      if (!this.composing && !this.gracePeriod && this.selectionChanged()) {
-        var sel = window.getSelection(), cm = this.cm;
-        this.rememberSelection();
-        var anchor = domToPos(cm, sel.anchorNode, sel.anchorOffset);
-        var head = domToPos(cm, sel.focusNode, sel.focusOffset);
-        if (anchor && head) runInOp(cm, function() {
-          setSelection(cm.doc, simpleSelection(anchor, head), sel_dontScroll);
-          if (anchor.bad || head.bad) cm.curOp.selectionChanged = true;
-        });
-      }
-    },
-
-    pollContent: function() {
-      var cm = this.cm, display = cm.display, sel = cm.doc.sel.primary();
-      var from = sel.from(), to = sel.to();
-      if (from.line < display.viewFrom || to.line > display.viewTo - 1) return false;
-
-      var fromIndex;
-      if (from.line == display.viewFrom || (fromIndex = findViewIndex(cm, from.line)) == 0) {
-        var fromLine = lineNo(display.view[0].line);
-        var fromNode = display.view[0].node;
-      } else {
-        var fromLine = lineNo(display.view[fromIndex].line);
-        var fromNode = display.view[fromIndex - 1].node.nextSibling;
-      }
-      var toIndex = findViewIndex(cm, to.line);
-      if (toIndex == display.view.length - 1) {
-        var toLine = display.viewTo - 1;
-        var toNode = display.lineDiv.lastChild;
-      } else {
-        var toLine = lineNo(display.view[toIndex + 1].line) - 1;
-        var toNode = display.view[toIndex + 1].node.previousSibling;
-      }
-
-      var newText = splitLines(domTextBetween(cm, fromNode, toNode, fromLine, toLine));
-      var oldText = getBetween(cm.doc, Pos(fromLine, 0), Pos(toLine, getLine(cm.doc, toLine).text.length));
-      while (newText.length > 1 && oldText.length > 1) {
-        if (lst(newText) == lst(oldText)) { newText.pop(); oldText.pop(); toLine--; }
-        else if (newText[0] == oldText[0]) { newText.shift(); oldText.shift(); fromLine++; }
-        else break;
-      }
-
-      var cutFront = 0, cutEnd = 0;
-      var newTop = newText[0], oldTop = oldText[0], maxCutFront = Math.min(newTop.length, oldTop.length);
-      while (cutFront < maxCutFront && newTop.charCodeAt(cutFront) == oldTop.charCodeAt(cutFront))
-        ++cutFront;
-      var newBot = lst(newText), oldBot = lst(oldText);
-      var maxCutEnd = Math.min(newBot.length - (newText.length == 1 ? cutFront : 0),
-                               oldBot.length - (oldText.length == 1 ? cutFront : 0));
-      while (cutEnd < maxCutEnd &&
-             newBot.charCodeAt(newBot.length - cutEnd - 1) == oldBot.charCodeAt(oldBot.length - cutEnd - 1))
-        ++cutEnd;
-
-      newText[newText.length - 1] = newBot.slice(0, newBot.length - cutEnd);
-      newText[0] = newText[0].slice(cutFront);
-
-      var chFrom = Pos(fromLine, cutFront);
-      var chTo = Pos(toLine, oldText.length ? lst(oldText).length - cutEnd : 0);
-      if (newText.length > 1 || newText[0] || cmp(chFrom, chTo)) {
-        replaceRange(cm.doc, newText, chFrom, chTo, "+input");
-        return true;
-      }
-    },
-
-    ensurePolled: function() {
-      this.forceCompositionEnd();
-    },
-    reset: function() {
-      this.forceCompositionEnd();
-    },
-    forceCompositionEnd: function() {
-      if (!this.composing || this.composing.handled) return;
-      this.applyComposition(this.composing);
-      this.composing.handled = true;
-      this.div.blur();
-      this.div.focus();
-    },
-    applyComposition: function(composing) {
-      if (composing.data && composing.data != composing.startData)
-        operation(this.cm, applyTextInput)(this.cm, composing.data, 0, composing.sel);
-    },
-
-    setUneditable: function(node) {
-      node.setAttribute("contenteditable", "false");
-    },
-
-    onKeyPress: function(e) {
-      e.preventDefault();
-      operation(this.cm, applyTextInput)(this.cm, String.fromCharCode(e.charCode == null ? e.keyCode : e.charCode), 0);
-    },
-
-    onContextMenu: nothing,
-    resetPosition: nothing,
-
-    needsContentAttribute: true
-  }, ContentEditableInput.prototype);
-
-  function posToDOM(cm, pos) {
-    var view = findViewForLine(cm, pos.line);
-    if (!view || view.hidden) return null;
-    var line = getLine(cm.doc, pos.line);
-    var info = mapFromLineView(view, line, pos.line);
-
-    var order = getOrder(line), side = "left";
-    if (order) {
-      var partPos = getBidiPartAt(order, pos.ch);
-      side = partPos % 2 ? "right" : "left";
-    }
-    var result = nodeAndOffsetInLineMap(info.map, pos.ch, side);
-    result.offset = result.collapse == "right" ? result.end : result.start;
-    return result;
-  }
-
-  function badPos(pos, bad) { if (bad) pos.bad = true; return pos; }
-
-  function domToPos(cm, node, offset) {
-    var lineNode;
-    if (node == cm.display.lineDiv) {
-      lineNode = cm.display.lineDiv.childNodes[offset];
-      if (!lineNode) return badPos(cm.clipPos(Pos(cm.display.viewTo - 1)), true);
-      node = null; offset = 0;
-    } else {
-      for (lineNode = node;; lineNode = lineNode.parentNode) {
-        if (!lineNode || lineNode == cm.display.lineDiv) return null;
-        if (lineNode.parentNode && lineNode.parentNode == cm.display.lineDiv) break;
-      }
-    }
-    for (var i = 0; i < cm.display.view.length; i++) {
-      var lineView = cm.display.view[i];
-      if (lineView.node == lineNode)
-        return locateNodeInLineView(lineView, node, offset);
-    }
-  }
-
-  function locateNodeInLineView(lineView, node, offset) {
-    var wrapper = lineView.text.firstChild, bad = false;
-    if (!node || !contains(wrapper, node)) return badPos(Pos(lineNo(lineView.line), 0), true);
-    if (node == wrapper) {
-      bad = true;
-      node = wrapper.childNodes[offset];
-      offset = 0;
-      if (!node) {
-        var line = lineView.rest ? lst(lineView.rest) : lineView.line;
-        return badPos(Pos(lineNo(line), line.text.length), bad);
-      }
-    }
-
-    var textNode = node.nodeType == 3 ? node : null, topNode = node;
-    if (!textNode && node.childNodes.length == 1 && node.firstChild.nodeType == 3) {
-      textNode = node.firstChild;
-      if (offset) offset = textNode.nodeValue.length;
-    }
-    while (topNode.parentNode != wrapper) topNode = topNode.parentNode;
-    var measure = lineView.measure, maps = measure.maps;
-
-    function find(textNode, topNode, offset) {
-      for (var i = -1; i < (maps ? maps.length : 0); i++) {
-        var map = i < 0 ? measure.map : maps[i];
-        for (var j = 0; j < map.length; j += 3) {
-          var curNode = map[j + 2];
-          if (curNode == textNode || curNode == topNode) {
-            var line = lineNo(i < 0 ? lineView.line : lineView.rest[i]);
-            var ch = map[j] + offset;
-            if (offset < 0 || curNode != textNode) ch = map[j + (offset ? 1 : 0)];
-            return Pos(line, ch);
-          }
-        }
-      }
-    }
-    var found = find(textNode, topNode, offset);
-    if (found) return badPos(found, bad);
-
-    // FIXME this is all really shaky. might handle the few cases it needs to handle, but likely to cause problems
-    for (var after = topNode.nextSibling, dist = textNode ? textNode.nodeValue.length - offset : 0; after; after = after.nextSibling) {
-      found = find(after, after.firstChild, 0);
-      if (found)
-        return badPos(Pos(found.line, found.ch - dist), bad);
-      else
-        dist += after.textContent.length;
-    }
-    for (var before = topNode.previousSibling, dist = offset; before; before = before.previousSibling) {
-      found = find(before, before.firstChild, -1);
-      if (found)
-        return badPos(Pos(found.line, found.ch + dist), bad);
-      else
-        dist += after.textContent.length;
-    }
-  }
-
-  function domTextBetween(cm, from, to, fromLine, toLine) {
-    var text = "", closing = false;
-    function recognizeMarker(id) { return function(marker) { return marker.id == id; }; }
-    function walk(node) {
-      if (node.nodeType == 1) {
-        var cmText = node.getAttribute("cm-text");
-        if (cmText != null) {
-          if (cmText == "") cmText = node.textContent.replace(/\u200b/g, "");
-          text += cmText;
-          return;
-        }
-        var markerID = node.getAttribute("cm-marker"), range;
-        if (markerID) {
-          var found = cm.findMarks(Pos(fromLine, 0), Pos(toLine + 1, 0), recognizeMarker(+markerID));
-          if (found.length && (range = found[0].find()))
-            text += getBetween(cm.doc, range.from, range.to).join("\n");
-          return;
-        }
-        if (node.getAttribute("contenteditable") == "false") return;
-        for (var i = 0; i < node.childNodes.length; i++)
-          walk(node.childNodes[i]);
-        if (/^(pre|div|p)$/i.test(node.nodeName))
-          closing = true;
-      } else if (node.nodeType == 3) {
-        var val = node.nodeValue;
-        if (!val) return;
-        if (closing) {
-          text += "\n";
-          closing = false;
-        }
-        text += val;
-      }
-    }
-    for (;;) {
-      walk(from);
-      if (from == to) break;
-      from = from.nextSibling;
-    }
-    return text;
-  }
-
-  CodeMirror.inputStyles = {"textarea": TextareaInput, "contenteditable": ContentEditableInput};
-
-  // SELECTION / CURSOR
-
-  // Selection objects are immutable. A new one is created every time
-  // the selection changes. A selection is one or more non-overlapping
-  // (and non-touching) ranges, sorted, and an integer that indicates
-  // which one is the primary selection (the one that's scrolled into
-  // view, that getCursor returns, etc).
-  function Selection(ranges, primIndex) {
-    this.ranges = ranges;
-    this.primIndex = primIndex;
-  }
-
-  Selection.prototype = {
-    primary: function() { return this.ranges[this.primIndex]; },
-    equals: function(other) {
-      if (other == this) return true;
-      if (other.primIndex != this.primIndex || other.ranges.length != this.ranges.length) return false;
-      for (var i = 0; i < this.ranges.length; i++) {
-        var here = this.ranges[i], there = other.ranges[i];
-        if (cmp(here.anchor, there.anchor) != 0 || cmp(here.head, there.head) != 0) return false;
-      }
-      return true;
-    },
-    deepCopy: function() {
-      for (var out = [], i = 0; i < this.ranges.length; i++)
-        out[i] = new Range(copyPos(this.ranges[i].anchor), copyPos(this.ranges[i].head));
-      return new Selection(out, this.primIndex);
-    },
-    somethingSelected: function() {
-      for (var i = 0; i < this.ranges.length; i++)
-        if (!this.ranges[i].empty()) return true;
-      return false;
-    },
-    contains: function(pos, end) {
-      if (!end) end = pos;
-      for (var i = 0; i < this.ranges.length; i++) {
-        var range = this.ranges[i];
-        if (cmp(end, range.from()) >= 0 && cmp(pos, range.to()) <= 0)
-          return i;
-      }
-      return -1;
-    }
-  };
-
-  function Range(anchor, head) {
-    this.anchor = anchor; this.head = head;
-  }
-
-  Range.prototype = {
-    from: function() { return minPos(this.anchor, this.head); },
-    to: function() { return maxPos(this.anchor, this.head); },
-    empty: function() {
-      return this.head.line == this.anchor.line && this.head.ch == this.anchor.ch;
-    }
-  };
-
-  // Take an unsorted, potentially overlapping set of ranges, and
-  // build a selection out of it. 'Consumes' ranges array (modifying
-  // it).
-  function normalizeSelection(ranges, primIndex) {
-    var prim = ranges[primIndex];
-    ranges.sort(function(a, b) { return cmp(a.from(), b.from()); });
-    primIndex = indexOf(ranges, prim);
-    for (var i = 1; i < ranges.length; i++) {
-      var cur = ranges[i], prev = ranges[i - 1];
-      if (cmp(prev.to(), cur.from()) >= 0) {
-        var from = minPos(prev.from(), cur.from()), to = maxPos(prev.to(), cur.to());
-        var inv = prev.empty() ? cur.from() == cur.head : prev.from() == prev.head;
-        if (i <= primIndex) --primIndex;
-        ranges.splice(--i, 2, new Range(inv ? to : from, inv ? from : to));
-      }
-    }
-    return new Selection(ranges, primIndex);
-  }
-
-  function simpleSelection(anchor, head) {
-    return new Selection([new Range(anchor, head || anchor)], 0);
-  }
-
-  // Most of the external API clips given positions to make sure they
-  // actually exist within the document.
-  function clipLine(doc, n) {return Math.max(doc.first, Math.min(n, doc.first + doc.size - 1));}
-  function clipPos(doc, pos) {
-    if (pos.line < doc.first) return Pos(doc.first, 0);
-    var last = doc.first + doc.size - 1;
-    if (pos.line > last) return Pos(last, getLine(doc, last).text.length);
-    return clipToLen(pos, getLine(doc, pos.line).text.length);
-  }
-  function clipToLen(pos, linelen) {
-    var ch = pos.ch;
-    if (ch == null || ch > linelen) return Pos(pos.line, linelen);
-    else if (ch < 0) return Pos(pos.line, 0);
-    else return pos;
-  }
-  function isLine(doc, l) {return l >= doc.first && l < doc.first + doc.size;}
-  function clipPosArray(doc, array) {
-    for (var out = [], i = 0; i < array.length; i++) out[i] = clipPos(doc, array[i]);
-    return out;
-  }
-
-  // SELECTION UPDATES
-
-  // The 'scroll' parameter given to many of these indicated whether
-  // the new cursor position should be scrolled into view after
-  // modifying the selection.
-
-  // If shift is held or the extend flag is set, extends a range to
-  // include a given position (and optionally a second position).
-  // Otherwise, simply returns the range between the given positions.
-  // Used for cursor motion and such.
-  function extendRange(doc, range, head, other) {
-    if (doc.cm && doc.cm.display.shift || doc.extend) {
-      var anchor = range.anchor;
-      if (other) {
-        var posBefore = cmp(head, anchor) < 0;
-        if (posBefore != (cmp(other, anchor) < 0)) {
-          anchor = head;
-          head = other;
-        } else if (posBefore != (cmp(head, other) < 0)) {
-          head = other;
-        }
-      }
-      return new Range(anchor, head);
-    } else {
-      return new Range(other || head, head);
-    }
-  }
-
-  // Extend the primary selection range, discard the rest.
-  function extendSelection(doc, head, other, options) {
-    setSelection(doc, new Selection([extendRange(doc, doc.sel.primary(), head, other)], 0), options);
-  }
-
-  // Extend all selections (pos is an array of selections with length
-  // equal the number of selections)
-  function extendSelections(doc, heads, options) {
-    for (var out = [], i = 0; i < doc.sel.ranges.length; i++)
-      out[i] = extendRange(doc, doc.sel.ranges[i], heads[i], null);
-    var newSel = normalizeSelection(out, doc.sel.primIndex);
-    setSelection(doc, newSel, options);
-  }
-
-  // Updates a single range in the selection.
-  function replaceOneSelection(doc, i, range, options) {
-    var ranges = doc.sel.ranges.slice(0);
-    ranges[i] = range;
-    setSelection(doc, normalizeSelection(ranges, doc.sel.primIndex), options);
-  }
-
-  // Reset the selection to a single range.
-  function setSimpleSelection(doc, anchor, head, options) {
-    setSelection(doc, simpleSelection(anchor, head), options);
-  }
-
-  // Give beforeSelectionChange handlers a change to influence a
-  // selection update.
-  function filterSelectionChange(doc, sel) {
-    var obj = {
-      ranges: sel.ranges,
-      update: function(ranges) {
-        this.ranges = [];
-        for (var i = 0; i < ranges.length; i++)
-          this.ranges[i] = new Range(clipPos(doc, ranges[i].anchor),
-                                     clipPos(doc, ranges[i].head));
-      }
-    };
-    signal(doc, "beforeSelectionChange", doc, obj);
-    if (doc.cm) signal(doc.cm, "beforeSelectionChange", doc.cm, obj);
-    if (obj.ranges != sel.ranges) return normalizeSelection(obj.ranges, obj.ranges.length - 1);
-    else return sel;
-  }
-
-  function setSelectionReplaceHistory(doc, sel, options) {
-    var done = doc.history.done, last = lst(done);
-    if (last && last.ranges) {
-      done[done.length - 1] = sel;
-      setSelectionNoUndo(doc, sel, options);
-    } else {
-      setSelection(doc, sel, options);
-    }
-  }
-
-  // Set a new selection.
-  function setSelection(doc, sel, options) {
-    setSelectionNoUndo(doc, sel, options);
-    addSelectionToHistory(doc, doc.sel, doc.cm ? doc.cm.curOp.id : NaN, options);
-  }
-
-  function setSelectionNoUndo(doc, sel, options) {
-    if (hasHandler(doc, "beforeSelectionChange") || doc.cm && hasHandler(doc.cm, "beforeSelectionChange"))
-      sel = filterSelectionChange(doc, sel);
-
-    var bias = options && options.bias ||
-      (cmp(sel.primary().head, doc.sel.primary().head) < 0 ? -1 : 1);
-    setSelectionInner(doc, skipAtomicInSelection(doc, sel, bias, true));
-
-    if (!(options && options.scroll === false) && doc.cm)
-      ensureCursorVisible(doc.cm);
-  }
-
-  function setSelectionInner(doc, sel) {
-    if (sel.equals(doc.sel)) return;
-
-    doc.sel = sel;
-
-    if (doc.cm) {
-      doc.cm.curOp.updateInput = doc.cm.curOp.selectionChanged = true;
-      signalCursorActivity(doc.cm);
-    }
-    signalLater(doc, "cursorActivity", doc);
-  }
-
-  // Verify that the selection does not partially select any atomic
-  // marked ranges.
-  function reCheckSelection(doc) {
-    setSelectionInner(doc, skipAtomicInSelection(doc, doc.sel, null, false), sel_dontScroll);
-  }
-
-  // Return a selection that does not partially select any atomic
-  // ranges.
-  function skipAtomicInSelection(doc, sel, bias, mayClear) {
-    var out;
-    for (var i = 0; i < sel.ranges.length; i++) {
-      var range = sel.ranges[i];
-      var newAnchor = skipAtomic(doc, range.anchor, bias, mayClear);
-      var newHead = skipAtomic(doc, range.head, bias, mayClear);
-      if (out || newAnchor != range.anchor || newHead != range.head) {
-        if (!out) out = sel.ranges.slice(0, i);
-        out[i] = new Range(newAnchor, newHead);
-      }
-    }
-    return out ? normalizeSelection(out, sel.primIndex) : sel;
-  }
-
-  // Ensure a given position is not inside an atomic range.
-  function skipAtomic(doc, pos, bias, mayClear) {
-    var flipped = false, curPos = pos;
-    var dir = bias || 1;
-    doc.cantEdit = false;
-    search: for (;;) {
-      var line = getLine(doc, curPos.line);
-      if (line.markedSpans) {
-        for (var i = 0; i < line.markedSpans.length; ++i) {
-          var sp = line.markedSpans[i], m = sp.marker;
-          if ((sp.from == null || (m.inclusiveLeft ? sp.from <= curPos.ch : sp.from < curPos.ch)) &&
-              (sp.to == null || (m.inclusiveRight ? sp.to >= curPos.ch : sp.to > curPos.ch))) {
-            if (mayClear) {
-              signal(m, "beforeCursorEnter");
-              if (m.explicitlyCleared) {
-                if (!line.markedSpans) break;
-                else {--i; continue;}
-              }
-            }
-            if (!m.atomic) continue;
-            var newPos = m.find(dir < 0 ? -1 : 1);
-            if (cmp(newPos, curPos) == 0) {
-              newPos.ch += dir;
-              if (newPos.ch < 0) {
-                if (newPos.line > doc.first) newPos = clipPos(doc, Pos(newPos.line - 1));
-                else newPos = null;
-              } else if (newPos.ch > line.text.length) {
-                if (newPos.line < doc.first + doc.size - 1) newPos = Pos(newPos.line + 1, 0);
-                else newPos = null;
-              }
-              if (!newPos) {
-                if (flipped) {
-                  // Driven in a corner -- no valid cursor position found at all
-                  // -- try again *with* clearing, if we didn't already
-                  if (!mayClear) return skipAtomic(doc, pos, bias, true);
-                  // Otherwise, turn off editing until further notice, and return the start of the doc
-                  doc.cantEdit = true;
-                  return Pos(doc.first, 0);
-                }
-                flipped = true; newPos = pos; dir = -dir;
-              }
-            }
-            curPos = newPos;
-            continue search;
-          }
-        }
-      }
-      return curPos;
-    }
-  }
-
-  // SELECTION DRAWING
-
-  function updateSelection(cm) {
-    cm.display.input.showSelection(cm.display.input.prepareSelection());
-  }
-
-  function prepareSelection(cm, primary) {
-    var doc = cm.doc, result = {};
-    var curFragment = result.cursors = document.createDocumentFragment();
-    var selFragment = result.selection = document.createDocumentFragment();
-
-    for (var i = 0; i < doc.sel.ranges.length; i++) {
-      if (primary === false && i == doc.sel.primIndex) continue;
-      var range = doc.sel.ranges[i];
-      var collapsed = range.empty();
-      if (collapsed || cm.options.showCursorWhenSelecting)
-        drawSelectionCursor(cm, range, curFragment);
-      if (!collapsed)
-        drawSelectionRange(cm, range, selFragment);
-    }
-    return result;
-  }
-
-  // Draws a cursor for the given range
-  function drawSelectionCursor(cm, range, output) {
-    var pos = cursorCoords(cm, range.head, "div", null, null, !cm.options.singleCursorHeightPerLine);
-
-    var cursor = output.appendChild(elt("div", "\u00a0", "CodeMirror-cursor"));
-    cursor.style.left = pos.left + "px";
-    cursor.style.top = pos.top + "px";
-    cursor.style.height = Math.max(0, pos.bottom - pos.top) * cm.options.cursorHeight + "px";
-
-    if (pos.other) {
-      // Secondary cursor, shown when on a 'jump' in bi-directional text
-      var otherCursor = output.appendChild(elt("div", "\u00a0", "CodeMirror-cursor CodeMirror-secondarycursor"));
-      otherCursor.style.display = "";
-      otherCursor.style.left = pos.other.left + "px";
-      otherCursor.style.top = pos.other.top + "px";
-      otherCursor.style.height = (pos.other.bottom - pos.other.top) * .85 + "px";
-    }
-  }
-
-  // Draws the given range as a highlighted selection
-  function drawSelectionRange(cm, range, output) {
-    var display = cm.display, doc = cm.doc;
-    var fragment = document.createDocumentFragment();
-    var padding = paddingH(cm.display), leftSide = padding.left;
-    var rightSide = Math.max(display.sizerWidth, displayWidth(cm) - display.sizer.offsetLeft) - padding.right;
-
-    function add(left, top, width, bottom) {
-      if (top < 0) top = 0;
-      top = Math.round(top);
-      bottom = Math.round(bottom);
-      fragment.appendChild(elt("div", null, "CodeMirror-selected", "position: absolute; left: " + left +
-                               "px; top: " + top + "px; width: " + (width == null ? rightSide - left : width) +
-                               "px; height: " + (bottom - top) + "px"));
-    }
-
-    function drawForLine(line, fromArg, toArg) {
-      var lineObj = getLine(doc, line);
-      var lineLen = lineObj.text.length;
-      var start, end;
-      function coords(ch, bias) {
-        return charCoords(cm, Pos(line, ch), "div", lineObj, bias);
-      }
-
-      iterateBidiSections(getOrder(lineObj), fromArg || 0, toArg == null ? lineLen : toArg, function(from, to, dir) {
-        var leftPos = coords(from, "left"), rightPos, left, right;
-        if (from == to) {
-          rightPos = leftPos;
-          left = right = leftPos.left;
-        } else {
-          rightPos = coords(to - 1, "right");
-          if (dir == "rtl") { var tmp = leftPos; leftPos = rightPos; rightPos = tmp; }
-          left = leftPos.left;
-          right = rightPos.right;
-        }
-        if (fromArg == null && from == 0) left = leftSide;
-        if (rightPos.top - leftPos.top > 3) { // Different lines, draw top part
-          add(left, leftPos.top, null, leftPos.bottom);
-          left = leftSide;
-          if (leftPos.bottom < rightPos.top) add(left, leftPos.bottom, null, rightPos.top);
-        }
-        if (toArg == null && to == lineLen) right = rightSide;
-        if (!start || leftPos.top < start.top || leftPos.top == start.top && leftPos.left < start.left)
-          start = leftPos;
-        if (!end || rightPos.bottom > end.bottom || rightPos.bottom == end.bottom && rightPos.right > end.right)
-          end = rightPos;
-        if (left < leftSide + 1) left = leftSide;
-        add(left, rightPos.top, right - left, rightPos.bottom);
-      });
-      return {start: start, end: end};
-    }
-
-    var sFrom = range.from(), sTo = range.to();
-    if (sFrom.line == sTo.line) {
-      drawForLine(sFrom.line, sFrom.ch, sTo.ch);
-    } else {
-      var fromLine = getLine(doc, sFrom.line), toLine = getLine(doc, sTo.line);
-      var singleVLine = visualLine(fromLine) == visualLine(toLine);
-      var leftEnd = drawForLine(sFrom.line, sFrom.ch, singleVLine ? fromLine.text.length + 1 : null).end;
-      var rightStart = drawForLine(sTo.line, singleVLine ? 0 : null, sTo.ch).start;
-      if (singleVLine) {
-        if (leftEnd.top < rightStart.top - 2) {
-          add(leftEnd.right, leftEnd.top, null, leftEnd.bottom);
-          add(leftSide, rightStart.top, rightStart.left, rightStart.bottom);
-        } else {
-          add(leftEnd.right, leftEnd.top, rightStart.left - leftEnd.right, leftEnd.bottom);
-        }
-      }
-      if (leftEnd.bottom < rightStart.top)
-        add(leftSide, leftEnd.bottom, null, rightStart.top);
-    }
-
-    output.appendChild(fragment);
-  }
-
-  // Cursor-blinking
-  function restartBlink(cm) {
-    if (!cm.state.focused) return;
-    var display = cm.display;
-    clearInterval(display.blinker);
-    var on = true;
-    display.cursorDiv.style.visibility = "";
-    if (cm.options.cursorBlinkRate > 0)
-      display.blinker = setInterval(function() {
-        display.cursorDiv.style.visibility = (on = !on) ? "" : "hidden";
-      }, cm.options.cursorBlinkRate);
-    else if (cm.options.cursorBlinkRate < 0)
-      display.cursorDiv.style.visibility = "hidden";
-  }
-
-  // HIGHLIGHT WORKER
-
-  function startWorker(cm, time) {
-    if (cm.doc.mode.startState && cm.doc.frontier < cm.display.viewTo)
-      cm.state.highlight.set(time, bind(highlightWorker, cm));
-  }
-
-  function highlightWorker(cm) {
-    var doc = cm.doc;
-    if (doc.frontier < doc.first) doc.frontier = doc.first;
-    if (doc.frontier >= cm.display.viewTo) return;
-    var end = +new Date + cm.options.workTime;
-    var state = copyState(doc.mode, getStateBefore(cm, doc.frontier));
-    var changedLines = [];
-
-    doc.iter(doc.frontier, Math.min(doc.first + doc.size, cm.display.viewTo + 500), function(line) {
-      if (doc.frontier >= cm.display.viewFrom) { // Visible
-        var oldStyles = line.styles;
-        var highlighted = highlightLine(cm, line, state, true);
-        line.styles = highlighted.styles;
-        var oldCls = line.styleClasses, newCls = highlighted.classes;
-        if (newCls) line.styleClasses = newCls;
-        else if (oldCls) line.styleClasses = null;
-        var ischange = !oldStyles || oldStyles.length != line.styles.length ||
-          oldCls != newCls && (!oldCls || !newCls || oldCls.bgClass != newCls.bgClass || oldCls.textClass != newCls.textClass);
-        for (var i = 0; !ischange && i < oldStyles.length; ++i) ischange = oldStyles[i] != line.styles[i];
-        if (ischange) changedLines.push(doc.frontier);
-        line.stateAfter = copyState(doc.mode, state);
-      } else {
-        processLine(cm, line.text, state);
-        line.stateAfter = doc.frontier % 5 == 0 ? copyState(doc.mode, state) : null;
-      }
-      ++doc.frontier;
-      if (+new Date > end) {
-        startWorker(cm, cm.options.workDelay);
-        return true;
-      }
-    });
-    if (changedLines.length) runInOp(cm, function() {
-      for (var i = 0; i < changedLines.length; i++)
-        regLineChange(cm, changedLines[i], "text");
-    });
-  }
-
-  // Finds the line to start with when starting a parse. Tries to
-  // find a line with a stateAfter, so that it can start with a
-  // valid state. If that fails, it returns the line with the
-  // smallest indentation, which tends to need the least context to
-  // parse correctly.
-  function findStartLine(cm, n, precise) {
-    var minindent, minline, doc = cm.doc;
-    var lim = precise ? -1 : n - (cm.doc.mode.innerMode ? 1000 : 100);
-    for (var search = n; search > lim; --search) {
-      if (search <= doc.first) return doc.first;
-      var line = getLine(doc, search - 1);
-      if (line.stateAfter && (!precise || search <= doc.frontier)) return search;
-      var indented = countColumn(line.text, null, cm.options.tabSize);
-      if (minline == null || minindent > indented) {
-        minline = search - 1;
-        minindent = indented;
-      }
-    }
-    return minline;
-  }
-
-  function getStateBefore(cm, n, precise) {
-    var doc = cm.doc, display = cm.display;
-    if (!doc.mode.startState) return true;
-    var pos = findStartLine(cm, n, precise), state = pos > doc.first && getLine(doc, pos-1).stateAfter;
-    if (!state) state = startState(doc.mode);
-    else state = copyState(doc.mode, state);
-    doc.iter(pos, n, function(line) {
-      processLine(cm, line.text, state);
-      var save = pos == n - 1 || pos % 5 == 0 || pos >= display.viewFrom && pos < display.viewTo;
-      line.stateAfter = save ? copyState(doc.mode, state) : null;
-      ++pos;
-    });
-    if (precise) doc.frontier = pos;
-    return state;
-  }
-
-  // POSITION MEASUREMENT
-
-  function paddingTop(display) {return display.lineSpace.offsetTop;}
-  function paddingVert(display) {return display.mover.offsetHeight - display.lineSpace.offsetHeight;}
-  function paddingH(display) {
-    if (display.cachedPaddingH) return display.cachedPaddingH;
-    var e = removeChildrenAndAdd(display.measure, elt("pre", "x"));
-    var style = window.getComputedStyle ? window.getComputedStyle(e) : e.currentStyle;
-    var data = {left: parseInt(style.paddingLeft), right: parseInt(style.paddingRight)};
-    if (!isNaN(data.left) && !isNaN(data.right)) display.cachedPaddingH = data;
-    return data;
-  }
-
-  function scrollGap(cm) { return scrollerGap - cm.display.nativeBarWidth; }
-  function displayWidth(cm) {
-    return cm.display.scroller.clientWidth - scrollGap(cm) - cm.display.barWidth;
-  }
-  function displayHeight(cm) {
-    return cm.display.scroller.clientHeight - scrollGap(cm) - cm.display.barHeight;
-  }
-
-  // Ensure the lineView.wrapping.heights array is populated. This is
-  // an array of bottom offsets for the lines that make up a drawn
-  // line. When lineWrapping is on, there might be more than one
-  // height.
-  function ensureLineHeights(cm, lineView, rect) {
-    var wrapping = cm.options.lineWrapping;
-    var curWidth = wrapping && displayWidth(cm);
-    if (!lineView.measure.heights || wrapping && lineView.measure.width != curWidth) {
-      var heights = lineView.measure.heights = [];
-      if (wrapping) {
-        lineView.measure.width = curWidth;
-        var rects = lineView.text.firstChild.getClientRects();
-        for (var i = 0; i < rects.length - 1; i++) {
-          var cur = rects[i], next = rects[i + 1];
-          if (Math.abs(cur.bottom - next.bottom) > 2)
-            heights.push((cur.bottom + next.top) / 2 - rect.top);
-        }
-      }
-      heights.push(rect.bottom - rect.top);
-    }
-  }
-
-  // Find a line map (mapping character offsets to text nodes) and a
-  // measurement cache for the given line number. (A line view might
-  // contain multiple lines when collapsed ranges are present.)
-  function mapFromLineView(lineView, line, lineN) {
-    if (lineView.line == line)
-      return {map: lineView.measure.map, cache: lineView.measure.cache};
-    for (var i = 0; i < lineView.rest.length; i++)
-      if (lineView.rest[i] == line)
-        return {map: lineView.measure.maps[i], cache: lineView.measure.caches[i]};
-    for (var i = 0; i < lineView.rest.length; i++)
-      if (lineNo(lineView.rest[i]) > lineN)
-        return {map: lineView.measure.maps[i], cache: lineView.measure.caches[i], before: true};
-  }
-
-  // Render a line into the hidden node display.externalMeasured. Used
-  // when measurement is needed for a line that's not in the viewport.
-  function updateExternalMeasurement(cm, line) {
-    line = visualLine(line);
-    var lineN = lineNo(line);
-    var view = cm.display.externalMeasured = new LineView(cm.doc, line, lineN);
-    view.lineN = lineN;
-    var built = view.built = buildLineContent(cm, view);
-    view.text = built.pre;
-    removeChildrenAndAdd(cm.display.lineMeasure, built.pre);
-    return view;
-  }
-
-  // Get a {top, bottom, left, right} box (in line-local coordinates)
-  // for a given character.
-  function measureChar(cm, line, ch, bias) {
-    return measureCharPrepared(cm, prepareMeasureForLine(cm, line), ch, bias);
-  }
-
-  // Find a line view that corresponds to the given line number.
-  function findViewForLine(cm, lineN) {
-    if (lineN >= cm.display.viewFrom && lineN < cm.display.viewTo)
-      return cm.display.view[findViewIndex(cm, lineN)];
-    var ext = cm.display.externalMeasured;
-    if (ext && lineN >= ext.lineN && lineN < ext.lineN + ext.size)
-      return ext;
-  }
-
-  // Measurement can be split in two steps, the set-up work that
-  // applies to the whole line, and the measurement of the actual
-  // character. Functions like coordsChar, that need to do a lot of
-  // measurements in a row, can thus ensure that the set-up work is
-  // only done once.
-  function prepareMeasureForLine(cm, line) {
-    var lineN = lineNo(line);
-    var view = findViewForLine(cm, lineN);
-    if (view && !view.text)
-      view = null;
-    else if (view && view.changes)
-      updateLineForChanges(cm, view, lineN, getDimensions(cm));
-    if (!view)
-      view = updateExternalMeasurement(cm, line);
-
-    var info = mapFromLineView(view, line, lineN);
-    return {
-      line: line, view: view, rect: null,
-      map: info.map, cache: info.cache, before: info.before,
-      hasHeights: false
-    };
-  }
-
-  // Given a prepared measurement object, measures the position of an
-  // actual character (or fetches it from the cache).
-  function measureCharPrepared(cm, prepared, ch, bias, varHeight) {
-    if (prepared.before) ch = -1;
-    var key = ch + (bias || ""), found;
-    if (prepared.cache.hasOwnProperty(key)) {
-      found = prepared.cache[key];
-    } else {
-      if (!prepared.rect)
-        prepared.rect = prepared.view.text.getBoundingClientRect();
-      if (!prepared.hasHeights) {
-        ensureLineHeights(cm, prepared.view, prepared.rect);
-        prepared.hasHeights = true;
-      }
-      found = measureCharInner(cm, prepared, ch, bias);
-      if (!found.bogus) prepared.cache[key] = found;
-    }
-    return {left: found.left, right: found.right,
-            top: varHeight ? found.rtop : found.top,
-            bottom: varHeight ? found.rbottom : found.bottom};
-  }
-
-  var nullRect = {left: 0, right: 0, top: 0, bottom: 0};
-
-  function nodeAndOffsetInLineMap(map, ch, bias) {
-    var node, start, end, collapse;
-    // First, search the line map for the text node corresponding to,
-    // or closest to, the target character.
-    for (var i = 0; i < map.length; i += 3) {
-      var mStart = map[i], mEnd = map[i + 1];
-      if (ch < mStart) {
-        start = 0; end = 1;
-        collapse = "left";
-      } else if (ch < mEnd) {
-        start = ch - mStart;
-        end = start + 1;
-      } else if (i == map.length - 3 || ch == mEnd && map[i + 3] > ch) {
-        end = mEnd - mStart;
-        start = end - 1;
-        if (ch >= mEnd) collapse = "right";
-      }
-      if (start != null) {
-        node = map[i + 2];
-        if (mStart == mEnd && bias == (node.insertLeft ? "left" : "right"))
-          collapse = bias;
-        if (bias == "left" && start == 0)
-          while (i && map[i - 2] == map[i - 3] && map[i - 1].insertLeft) {
-            node = map[(i -= 3) + 2];
-            collapse = "left";
-          }
-        if (bias == "right" && start == mEnd - mStart)
-          while (i < map.length - 3 && map[i + 3] == map[i + 4] && !map[i + 5].insertLeft) {
-            node = map[(i += 3) + 2];
-            collapse = "right";
-          }
-        break;
-      }
-    }
-    return {node: node, start: start, end: end, collapse: collapse, coverStart: mStart, coverEnd: mEnd};
-  }
-
-  function measureCharInner(cm, prepared, ch, bias) {
-    var place = nodeAndOffsetInLineMap(prepared.map, ch, bias);
-    var node = place.node, start = place.start, end = place.end, collapse = place.collapse;
-
-    var rect;
-    if (node.nodeType == 3) { // If it is a text node, use a range to retrieve the coordinates.
-      for (var i = 0; i < 4; i++) { // Retry a maximum of 4 times when nonsense rectangles are returned
-        while (start && isExtendingChar(prepared.line.text.charAt(place.coverStart + start))) --start;
-        while (place.coverStart + end < place.coverEnd && isExtendingChar(prepared.line.text.charAt(place.coverStart + end))) ++end;
-        if (ie && ie_version < 9 && start == 0 && end == place.coverEnd - place.coverStart) {
-          rect = node.parentNode.getBoundingClientRect();
-        } else if (ie && cm.options.lineWrapping) {
-          var rects = range(node, start, end).getClientRects();
-          if (rects.length)
-            rect = rects[bias == "right" ? rects.length - 1 : 0];
-          else
-            rect = nullRect;
-        } else {
-          rect = range(node, start, end).getBoundingClientRect() || nullRect;
-        }
-        if (rect.left || rect.right || start == 0) break;
-        end = start;
-        start = start - 1;
-        collapse = "right";
-      }
-      if (ie && ie_version < 11) rect = maybeUpdateRectForZooming(cm.display.measure, rect);
-    } else { // If it is a widget, simply get the box for the whole widget.
-      if (start > 0) collapse = bias = "right";
-      var rects;
-      if (cm.options.lineWrapping && (rects = node.getClientRects()).length > 1)
-        rect = rects[bias == "right" ? rects.length - 1 : 0];
-      else
-        rect = node.getBoundingClientRect();
-    }
-    if (ie && ie_version < 9 && !start && (!rect || !rect.left && !rect.right)) {
-      var rSpan = node.parentNode.getClientRects()[0];
-      if (rSpan)
-        rect = {left: rSpan.left, right: rSpan.left + charWidth(cm.display), top: rSpan.top, bottom: rSpan.bottom};
-      else
-        rect = nullRect;
-    }
-
-    var rtop = rect.top - prepared.rect.top, rbot = rect.bottom - prepared.rect.top;
-    var mid = (rtop + rbot) / 2;
-    var heights = prepared.view.measure.heights;
-    for (var i = 0; i < heights.length - 1; i++)
-      if (mid < heights[i]) break;
-    var top = i ? heights[i - 1] : 0, bot = heights[i];
-    var result = {left: (collapse == "right" ? rect.right : rect.left) - prepared.rect.left,
-                  right: (collapse == "left" ? rect.left : rect.right) - prepared.rect.left,
-                  top: top, bottom: bot};
-    if (!rect.left && !rect.right) result.bogus = true;
-    if (!cm.options.singleCursorHeightPerLine) { result.rtop = rtop; result.rbottom = rbot; }
-
-    return result;
-  }
-
-  // Work around problem with bounding client rects on ranges being
-  // returned incorrectly when zoomed on IE10 and below.
-  function maybeUpdateRectForZooming(measure, rect) {
-    if (!window.screen || screen.logicalXDPI == null ||
-        screen.logicalXDPI == screen.deviceXDPI || !hasBadZoomedRects(measure))
-      return rect;
-    var scaleX = screen.logicalXDPI / screen.deviceXDPI;
-    var scaleY = screen.logicalYDPI / screen.deviceYDPI;
-    return {left: rect.left * scaleX, right: rect.right * scaleX,
-            top: rect.top * scaleY, bottom: rect.bottom * scaleY};
-  }
-
-  function clearLineMeasurementCacheFor(lineView) {
-    if (lineView.measure) {
-      lineView.measure.cache = {};
-      lineView.measure.heights = null;
-      if (lineView.rest) for (var i = 0; i < lineView.rest.length; i++)
-        lineView.measure.caches[i] = {};
-    }
-  }
-
-  function clearLineMeasurementCache(cm) {
-    cm.display.externalMeasure = null;
-    removeChildren(cm.display.lineMeasure);
-    for (var i = 0; i < cm.display.view.length; i++)
-      clearLineMeasurementCacheFor(cm.display.view[i]);
-  }
-
-  function clearCaches(cm) {
-    clearLineMeasurementCache(cm);
-    cm.display.cachedCharWidth = cm.display.cachedTextHeight = cm.display.cachedPaddingH = null;
-    if (!cm.options.lineWrapping) cm.display.maxLineChanged = true;
-    cm.display.lineNumChars = null;
-  }
-
-  function pageScrollX() { return window.pageXOffset || (document.documentElement || document.body).scrollLeft; }
-  function pageScrollY() { return window.pageYOffset || (document.documentElement || document.body).scrollTop; }
-
-  // Converts a {top, bottom, left, right} box from line-local
-  // coordinates into another coordinate system. Context may be one of
-  // "line", "div" (display.lineDiv), "local"/null (editor), "window",
-  // or "page".
-  function intoCoordSystem(cm, lineObj, rect, context) {
-    if (lineObj.widgets) for (var i = 0; i < lineObj.widgets.length; ++i) if (lineObj.widgets[i].above) {
-      var size = widgetHeight(lineObj.widgets[i]);
-      rect.top += size; rect.bottom += size;
-    }
-    if (context == "line") return rect;
-    if (!context) context = "local";
-    var yOff = heightAtLine(lineObj);
-    if (context == "local") yOff += paddingTop(cm.display);
-    else yOff -= cm.display.viewOffset;
-    if (context == "page" || context == "window") {
-      var lOff = cm.display.lineSpace.getBoundingClientRect();
-      yOff += lOff.top + (context == "window" ? 0 : pageScrollY());
-      var xOff = lOff.left + (context == "window" ? 0 : pageScrollX());
-      rect.left += xOff; rect.right += xOff;
-    }
-    rect.top += yOff; rect.bottom += yOff;
-    return rect;
-  }
-
-  // Coverts a box from "div" coords to another coordinate system.
-  // Context may be "window", "page", "div", or "local"/null.
-  function fromCoordSystem(cm, coords, context) {
-    if (context == "div") return coords;
-    var left = coords.left, top = coords.top;
-    // First move into "page" coordinate system
-    if (context == "page") {
-      left -= pageScrollX();
-      top -= pageScrollY();
-    } else if (context == "local" || !context) {
-      var localBox = cm.display.sizer.getBoundingClientRect();
-      left += localBox.left;
-      top += localBox.top;
-    }
-
-    var lineSpaceBox = cm.display.lineSpace.getBoundingClientRect();
-    return {left: left - lineSpaceBox.left, top: top - lineSpaceBox.top};
-  }
-
-  function charCoords(cm, pos, context, lineObj, bias) {
-    if (!lineObj) lineObj = getLine(cm.doc, pos.line);
-    return intoCoordSystem(cm, lineObj, measureChar(cm, lineObj, pos.ch, bias), context);
-  }
-
-  // Returns a box for a given cursor position, which may have an
-  // 'other' property containing the position of the secondary cursor
-  // on a bidi boundary.
-  function cursorCoords(cm, pos, context, lineObj, preparedMeasure, varHeight) {
-    lineObj = lineObj || getLine(cm.doc, pos.line);
-    if (!preparedMeasure) preparedMeasure = prepareMeasureForLine(cm, lineObj);
-    function get(ch, right) {
-      var m = measureCharPrepared(cm, preparedMeasure, ch, right ? "right" : "left", varHeight);
-      if (right) m.left = m.right; else m.right = m.left;
-      return intoCoordSystem(cm, lineObj, m, context);
-    }
-    function getBidi(ch, partPos) {
-      var part = order[partPos], right = part.level % 2;
-      if (ch == bidiLeft(part) && partPos && part.level < order[partPos - 1].level) {
-        part = order[--partPos];
-        ch = bidiRight(part) - (part.level % 2 ? 0 : 1);
-        right = true;
-      } else if (ch == bidiRight(part) && partPos < order.length - 1 && part.level < order[partPos + 1].level) {
-        part = order[++partPos];
-        ch = bidiLeft(part) - part.level % 2;
-        right = false;
-      }
-      if (right && ch == part.to && ch > part.from) return get(ch - 1);
-      return get(ch, right);
-    }
-    var order = getOrder(lineObj), ch = pos.ch;
-    if (!order) return get(ch);
-    var partPos = getBidiPartAt(order, ch);
-    var val = getBidi(ch, partPos);
-    if (bidiOther != null) val.other = getBidi(ch, bidiOther);
-    return val;
-  }
-
-  // Used to cheaply estimate the coordinates for a position. Used for
-  // intermediate scroll updates.
-  function estimateCoords(cm, pos) {
-    var left = 0, pos = clipPos(cm.doc, pos);
-    if (!cm.options.lineWrapping) left = charWidth(cm.display) * pos.ch;
-    var lineObj = getLine(cm.doc, pos.line);
-    var top = heightAtLine(lineObj) + paddingTop(cm.display);
-    return {left: left, right: left, top: top, bottom: top + lineObj.height};
-  }
-
-  // Positions returned by coordsChar contain some extra information.
-  // xRel is the relative x position of the input coordinates compared
-  // to the found position (so xRel > 0 means the coordinates are to
-  // the right of the character position, for example). When outside
-  // is true, that means the coordinates lie outside the line's
-  // vertical range.
-  function PosWithInfo(line, ch, outside, xRel) {
-    var pos = Pos(line, ch);
-    pos.xRel = xRel;
-    if (outside) pos.outside = true;
-    return pos;
-  }
-
-  // Compute the character position closest to the given coordinates.
-  // Input must be lineSpace-local ("div" coordinate system).
-  function coordsChar(cm, x, y) {
-    var doc = cm.doc;
-    y += cm.display.viewOffset;
-    if (y < 0) return PosWithInfo(doc.first, 0, true, -1);
-    var lineN = lineAtHeight(doc, y), last = doc.first + doc.size - 1;
-    if (lineN > last)
-      return PosWithInfo(doc.first + doc.size - 1, getLine(doc, last).text.length, true, 1);
-    if (x < 0) x = 0;
-
-    var lineObj = getLine(doc, lineN);
-    for (;;) {
-      var found = coordsCharInner(cm, lineObj, lineN, x, y);
-      var merged = collapsedSpanAtEnd(lineObj);
-      var mergedPos = merged && merged.find(0, true);
-      if (merged && (found.ch > mergedPos.from.ch || found.ch == mergedPos.from.ch && found.xRel > 0))
-        lineN = lineNo(lineObj = mergedPos.to.line);
-      else
-        return found;
-    }
-  }
-
-  function coordsCharInner(cm, lineObj, lineNo, x, y) {
-    var innerOff = y - heightAtLine(lineObj);
-    var wrongLine = false, adjust = 2 * cm.display.wrapper.clientWidth;
-    var preparedMeasure = prepareMeasureForLine(cm, lineObj);
-
-    function getX(ch) {
-      var sp = cursorCoords(cm, Pos(lineNo, ch), "line", lineObj, preparedMeasure);
-      wrongLine = true;
-      if (innerOff > sp.bottom) return sp.left - adjust;
-      else if (innerOff < sp.top) return sp.left + adjust;
-      else wrongLine = false;
-      return sp.left;
-    }
-
-    var bidi = getOrder(lineObj), dist = lineObj.text.length;
-    var from = lineLeft(lineObj), to = lineRight(lineObj);
-    var fromX = getX(from), fromOutside = wrongLine, toX = getX(to), toOutside = wrongLine;
-
-    if (x > toX) return PosWithInfo(lineNo, to, toOutside, 1);
-    // Do a binary search between these bounds.
-    for (;;) {
-      if (bidi ? to == from || to == moveVisually(lineObj, from, 1) : to - from <= 1) {
-        var ch = x < fromX || x - fromX <= toX - x ? from : to;
-        var xDiff = x - (ch == from ? fromX : toX);
-        while (isExtendingChar(lineObj.text.charAt(ch))) ++ch;
-        var pos = PosWithInfo(lineNo, ch, ch == from ? fromOutside : toOutside,
-                              xDiff < -1 ? -1 : xDiff > 1 ? 1 : 0);
-        return pos;
-      }
-      var step = Math.ceil(dist / 2), middle = from + step;
-      if (bidi) {
-        middle = from;
-        for (var i = 0; i < step; ++i) middle = moveVisually(lineObj, middle, 1);
-      }
-      var middleX = getX(middle);
-      if (middleX > x) {to = middle; toX = middleX; if (toOutside = wrongLine) toX += 1000; dist = step;}
-      else {from = middle; fromX = middleX; fromOutside = wrongLine; dist -= step;}
-    }
-  }
-
-  var measureText;
-  // Compute the default text height.
-  function textHeight(display) {
-    if (display.cachedTextHeight != null) return display.cachedTextHeight;
-    if (measureText == null) {
-      measureText = elt("pre");
-      // Measure a bunch of lines, for browsers that compute
-      // fractional heights.
-      for (var i = 0; i < 49; ++i) {
-        measureText.appendChild(document.createTextNode("x"));
-        measureText.appendChild(elt("br"));
-      }
-      measureText.appendChild(document.createTextNode("x"));
-    }
-    removeChildrenAndAdd(display.measure, measureText);
-    var height = measureText.offsetHeight / 50;
-    if (height > 3) display.cachedTextHeight = height;
-    removeChildren(display.measure);
-    return height || 1;
-  }
-
-  // Compute the default character width.
-  function charWidth(display) {
-    if (display.cachedCharWidth != null) return display.cachedCharWidth;
-    var anchor = elt("span", "xxxxxxxxxx");
-    var pre = elt("pre", [anchor]);
-    removeChildrenAndAdd(display.measure, pre);
-    var rect = anchor.getBoundingClientRect(), width = (rect.right - rect.left) / 10;
-    if (width > 2) display.cachedCharWidth = width;
-    return width || 10;
-  }
-
-  // OPERATIONS
-
-  // Operations are used to wrap a series of changes to the editor
-  // state in such a way that each change won't have to update the
-  // cursor and display (which would be awkward, slow, and
-  // error-prone). Instead, display updates are batched and then all
-  // combined and executed at once.
-
-  var operationGroup = null;
-
-  var nextOpId = 0;
-  // Start a new operation.
-  function startOperation(cm) {
-    cm.curOp = {
-      cm: cm,
-      viewChanged: false,      // Flag that indicates that lines might need to be redrawn
-      startHeight: cm.doc.height, // Used to detect need to update scrollbar
-      forceUpdate: false,      // Used to force a redraw
-      updateInput: null,       // Whether to reset the input textarea
-      typing: false,           // Whether this reset should be careful to leave existing text (for compositing)
-      changeObjs: null,        // Accumulated changes, for firing change events
-      cursorActivityHandlers: null, // Set of handlers to fire cursorActivity on
-      cursorActivityCalled: 0, // Tracks which cursorActivity handlers have been called already
-      selectionChanged: false, // Whether the selection needs to be redrawn
-      updateMaxLine: false,    // Set when the widest line needs to be determined anew
-      scrollLeft: null, scrollTop: null, // Intermediate scroll position, not pushed to DOM yet
-      scrollToPos: null,       // Used to scroll to a specific position
-      focus: false,
-      id: ++nextOpId           // Unique ID
-    };
-    if (operationGroup) {
-      operationGroup.ops.push(cm.curOp);
-    } else {
-      cm.curOp.ownsGroup = operationGroup = {
-        ops: [cm.curOp],
-        delayedCallbacks: []
-      };
-    }
-  }
-
-  function fireCallbacksForOps(group) {
-    // Calls delayed callbacks and cursorActivity handlers until no
-    // new ones appear
-    var callbacks = group.delayedCallbacks, i = 0;
-    do {
-      for (; i < callbacks.length; i++)
-        callbacks[i]();
-      for (var j = 0; j < group.ops.length; j++) {
-        var op = group.ops[j];
-        if (op.cursorActivityHandlers)
-          while (op.cursorActivityCalled < op.cursorActivityHandlers.length)
-            op.cursorActivityHandlers[op.cursorActivityCalled++](op.cm);
-      }
-    } while (i < callbacks.length);
-  }
-
-  // Finish an operation, updating the display and signalling delayed events
-  function endOperation(cm) {
-    var op = cm.curOp, group = op.ownsGroup;
-    if (!group) return;
-
-    try { fireCallbacksForOps(group); }
-    finally {
-      operationGroup = null;
-      for (var i = 0; i < group.ops.length; i++)
-        group.ops[i].cm.curOp = null;
-      endOperations(group);
-    }
-  }
-
-  // The DOM updates done when an operation finishes are batched so
-  // that the minimum number of relayouts are required.
-  function endOperations(group) {
-    var ops = group.ops;
-    for (var i = 0; i < ops.length; i++) // Read DOM
-      endOperation_R1(ops[i]);
-    for (var i = 0; i < ops.length; i++) // Write DOM (maybe)
-      endOperation_W1(ops[i]);
-    for (var i = 0; i < ops.length; i++) // Read DOM
-      endOperation_R2(ops[i]);
-    for (var i = 0; i < ops.length; i++) // Write DOM (maybe)
-      endOperation_W2(ops[i]);
-    for (var i = 0; i < ops.length; i++) // Read DOM
-      endOperation_finish(ops[i]);
-  }
-
-  function endOperation_R1(op) {
-    var cm = op.cm, display = cm.display;
-    maybeClipScrollbars(cm);
-    if (op.updateMaxLine) findMaxLine(cm);
-
-    op.mustUpdate = op.viewChanged || op.forceUpdate || op.scrollTop != null ||
-      op.scrollToPos && (op.scrollToPos.from.line < display.viewFrom ||
-                         op.scrollToPos.to.line >= display.viewTo) ||
-      display.maxLineChanged && cm.options.lineWrapping;
-    op.update = op.mustUpdate &&
-      new DisplayUpdate(cm, op.mustUpdate && {top: op.scrollTop, ensure: op.scrollToPos}, op.forceUpdate);
-  }
-
-  function endOperation_W1(op) {
-    op.updatedDisplay = op.mustUpdate && updateDisplayIfNeeded(op.cm, op.update);
-  }
-
-  function endOperation_R2(op) {
-    var cm = op.cm, display = cm.display;
-    if (op.updatedDisplay) updateHeightsInViewport(cm);
-
-    op.barMeasure = measureForScrollbars(cm);
-
-    // If the max line changed since it was last measured, measure it,
-    // and ensure the document's width matches it.
-    // updateDisplay_W2 will use these properties to do the actual resizing
-    if (display.maxLineChanged && !cm.options.lineWrapping) {
-      op.adjustWidthTo = measureChar(cm, display.maxLine, display.maxLine.text.length).left + 3;
-      cm.display.sizerWidth = op.adjustWidthTo;
-      op.barMeasure.scrollWidth =
-        Math.max(display.scroller.clientWidth, display.sizer.offsetLeft + op.adjustWidthTo + scrollGap(cm) + cm.display.barWidth);
-      op.maxScrollLeft = Math.max(0, display.sizer.offsetLeft + op.adjustWidthTo - displayWidth(cm));
-    }
-
-    if (op.updatedDisplay || op.selectionChanged)
-      op.preparedSelection = display.input.prepareSelection();
-  }
-
-  function endOperation_W2(op) {
-    var cm = op.cm;
-
-    if (op.adjustWidthTo != null) {
-      cm.display.sizer.style.minWidth = op.adjustWidthTo + "px";
-      if (op.maxScrollLeft < cm.doc.scrollLeft)
-        setScrollLeft(cm, Math.min(cm.display.scroller.scrollLeft, op.maxScrollLeft), true);
-      cm.display.maxLineChanged = false;
-    }
-
-    if (op.preparedSelection)
-      cm.display.input.showSelection(op.preparedSelection);
-    if (op.updatedDisplay)
-      setDocumentHeight(cm, op.barMeasure);
-    if (op.updatedDisplay || op.startHeight != cm.doc.height)
-      updateScrollbars(cm, op.barMeasure);
-
-    if (op.selectionChanged) restartBlink(cm);
-
-    if (cm.state.focused && op.updateInput)
-      cm.display.input.reset(op.typing);
-    if (op.focus && op.focus == activeElt()) ensureFocus(op.cm);
-  }
-
-  function endOperation_finish(op) {
-    var cm = op.cm, display = cm.display, doc = cm.doc;
-
-    if (op.updatedDisplay) postUpdateDisplay(cm, op.update);
-
-    // Abort mouse wheel delta measurement, when scrolling explicitly
-    if (display.wheelStartX != null && (op.scrollTop != null || op.scrollLeft != null || op.scrollToPos))
-      display.wheelStartX = display.wheelStartY = null;
-
-    // Propagate the scroll position to the actual DOM scroller
-    if (op.scrollTop != null && (display.scroller.scrollTop != op.scrollTop || op.forceScroll)) {
-      doc.scrollTop = Math.max(0, Math.min(display.scroller.scrollHeight - display.scroller.clientHeight, op.scrollTop));
-      display.scrollbars.setScrollTop(doc.scrollTop);
-      display.scroller.scrollTop = doc.scrollTop;
-    }
-    if (op.scrollLeft != null && (display.scroller.scrollLeft != op.scrollLeft || op.forceScroll)) {
-      doc.scrollLeft = Math.max(0, Math.min(display.scroller.scrollWidth - displayWidth(cm), op.scrollLeft));
-      display.scrollbars.setScrollLeft(doc.scrollLeft);
-      display.scroller.scrollLeft = doc.scrollLeft;
-      alignHorizontally(cm);
-    }
-    // If we need to scroll a specific position into view, do so.
-    if (op.scrollToPos) {
-      var coords = scrollPosIntoView(cm, clipPos(doc, op.scrollToPos.from),
-                                     clipPos(doc, op.scrollToPos.to), op.scrollToPos.margin);
-      if (op.scrollToPos.isCursor && cm.state.focused) maybeScrollWindow(cm, coords);
-    }
-
-    // Fire events for markers that are hidden/unidden by editing or
-    // undoing
-    var hidden = op.maybeHiddenMarkers, unhidden = op.maybeUnhiddenMarkers;
-    if (hidden) for (var i = 0; i < hidden.length; ++i)
-      if (!hidden[i].lines.length) signal(hidden[i], "hide");
-    if (unhidden) for (var i = 0; i < unhidden.length; ++i)
-      if (unhidden[i].lines.length) signal(unhidden[i], "unhide");
-
-    if (display.wrapper.offsetHeight)
-      doc.scrollTop = cm.display.scroller.scrollTop;
-
-    // Fire change events, and delayed event handlers
-    if (op.changeObjs)
-      signal(cm, "changes", cm, op.changeObjs);
-    if (op.update)
-      op.update.finish();
-  }
-
-  // Run the given function in an operation
-  function runInOp(cm, f) {
-    if (cm.curOp) return f();
-    startOperation(cm);
-    try { return f(); }
-    finally { endOperation(cm); }
-  }
-  // Wraps a function in an operation. Returns the wrapped function.
-  function operation(cm, f) {
-    return function() {
-      if (cm.curOp) return f.apply(cm, arguments);
-      startOperation(cm);
-      try { return f.apply(cm, arguments); }
-      finally { endOperation(cm); }
-    };
-  }
-  // Used to add methods to editor and doc instances, wrapping them in
-  // operations.
-  function methodOp(f) {
-    return function() {
-      if (this.curOp) return f.apply(this, arguments);
-      startOperation(this);
-      try { return f.apply(this, arguments); }
-      finally { endOperation(this); }
-    };
-  }
-  function docMethodOp(f) {
-    return function() {
-      var cm = this.cm;
-      if (!cm || cm.curOp) return f.apply(this, arguments);
-      startOperation(cm);
-      try { return f.apply(this, arguments); }
-      finally { endOperation(cm); }
-    };
-  }
-
-  // VIEW TRACKING
-
-  // These objects are used to represent the visible (currently drawn)
-  // part of the document. A LineView may correspond to multiple
-  // logical lines, if those are connected by collapsed ranges.
-  function LineView(doc, line, lineN) {
-    // The starting line
-    this.line = line;
-    // Continuing lines, if any
-    this.rest = visualLineContinued(line);
-    // Number of logical lines in this visual line
-    this.size = this.rest ? lineNo(lst(this.rest)) - lineN + 1 : 1;
-    this.node = this.text = null;
-    this.hidden = lineIsHidden(doc, line);
-  }
-
-  // Create a range of LineView objects for the given lines.
-  function buildViewArray(cm, from, to) {
-    var array = [], nextPos;
-    for (var pos = from; pos < to; pos = nextPos) {
-      var view = new LineView(cm.doc, getLine(cm.doc, pos), pos);
-      nextPos = pos + view.size;
-      array.push(view);
-    }
-    return array;
-  }
-
-  // Updates the display.view data structure for a given change to the
-  // document. From and to are in pre-change coordinates. Lendiff is
-  // the amount of lines added or subtracted by the change. This is
-  // used for changes that span multiple lines, or change the way
-  // lines are divided into visual lines. regLineChange (below)
-  // registers single-line changes.
-  function regChange(cm, from, to, lendiff) {
-    if (from == null) from = cm.doc.first;
-    if (to == null) to = cm.doc.first + cm.doc.size;
-    if (!lendiff) lendiff = 0;
-
-    var display = cm.display;
-    if (lendiff && to < display.viewTo &&
-        (display.updateLineNumbers == null || display.updateLineNumbers > from))
-      display.updateLineNumbers = from;
-
-    cm.curOp.viewChanged = true;
-
-    if (from >= display.viewTo) { // Change after
-      if (sawCollapsedSpans && visualLineNo(cm.doc, from) < display.viewTo)
-        resetView(cm);
-    } else if (to <= display.viewFrom) { // Change before
-      if (sawCollapsedSpans && visualLineEndNo(cm.doc, to + lendiff) > display.viewFrom) {
-        resetView(cm);
-      } else {
-        display.viewFrom += lendiff;
-        display.viewTo += lendiff;
-      }
-    } else if (from <= display.viewFrom && to >= display.viewTo) { // Full overlap
-      resetView(cm);
-    } else if (from <= display.viewFrom) { // Top overlap
-      var cut = viewCuttingPoint(cm, to, to + lendiff, 1);
-      if (cut) {
-        display.view = display.view.slice(cut.index);
-        display.viewFrom = cut.lineN;
-        display.viewTo += lendiff;
-      } else {
-        resetView(cm);
-      }
-    } else if (to >= display.viewTo) { // Bottom overlap
-      var cut = viewCuttingPoint(cm, from, from, -1);
-      if (cut) {
-        display.view = display.view.slice(0, cut.index);
-        display.viewTo = cut.lineN;
-      } else {
-        resetView(cm);
-      }
-    } else { // Gap in the middle
-      var cutTop = viewCuttingPoint(cm, from, from, -1);
-      var cutBot = viewCuttingPoint(cm, to, to + lendiff, 1);
-      if (cutTop && cutBot) {
-        display.view = display.view.slice(0, cutTop.index)
-          .concat(buildViewArray(cm, cutTop.lineN, cutBot.lineN))
-          .concat(display.view.slice(cutBot.index));
-        display.viewTo += lendiff;
-      } else {
-        resetView(cm);
-      }
-    }
-
-    var ext = display.externalMeasured;
-    if (ext) {
-      if (to < ext.lineN)
-        ext.lineN += lendiff;
-      else if (from < ext.lineN + ext.size)
-        display.externalMeasured = null;
-    }
-  }
-
-  // Register a change to a single line. Type must be one of "text",
-  // "gutter", "class", "widget"
-  function regLineChange(cm, line, type) {
-    cm.curOp.viewChanged = true;
-    var display = cm.display, ext = cm.display.externalMeasured;
-    if (ext && line >= ext.lineN && line < ext.lineN + ext.size)
-      display.externalMeasured = null;
-
-    if (line < display.viewFrom || line >= display.viewTo) return;
-    var lineView = display.view[findViewIndex(cm, line)];
-    if (lineView.node == null) return;
-    var arr = lineView.changes || (lineView.changes = []);
-    if (indexOf(arr, type) == -1) arr.push(type);
-  }
-
-  // Clear the view.
-  function resetView(cm) {
-    cm.display.viewFrom = cm.display.viewTo = cm.doc.first;
-    cm.display.view = [];
-    cm.display.viewOffset = 0;
-  }
-
-  // Find the view element corresponding to a given line. Return null
-  // when the line isn't visible.
-  function findViewIndex(cm, n) {
-    if (n >= cm.display.viewTo) return null;
-    n -= cm.display.viewFrom;
-    if (n < 0) return null;
-    var view = cm.display.view;
-    for (var i = 0; i < view.length; i++) {
-      n -= view[i].size;
-      if (n < 0) return i;
-    }
-  }
-
-  function viewCuttingPoint(cm, oldN, newN, dir) {
-    var index = findViewIndex(cm, oldN), diff, view = cm.display.view;
-    if (!sawCollapsedSpans || newN == cm.doc.first + cm.doc.size)
-      return {index: index, lineN: newN};
-    for (var i = 0, n = cm.display.viewFrom; i < index; i++)
-      n += view[i].size;
-    if (n != oldN) {
-      if (dir > 0) {
-        if (index == view.length - 1) return null;
-        diff = (n + view[index].size) - oldN;
-        index++;
-      } else {
-        diff = n - oldN;
-      }
-      oldN += diff; newN += diff;
-    }
-    while (visualLineNo(cm.doc, newN) != newN) {
-      if (index == (dir < 0 ? 0 : view.length - 1)) return null;
-      newN += dir * view[index - (dir < 0 ? 1 : 0)].size;
-      index += dir;
-    }
-    return {index: index, lineN: newN};
-  }
-
-  // Force the view to cover a given range, adding empty view element
-  // or clipping off existing ones as needed.
-  function adjustView(cm, from, to) {
-    var display = cm.display, view = display.view;
-    if (view.length == 0 || from >= display.viewTo || to <= display.viewFrom) {
-      display.view = buildViewArray(cm, from, to);
-      display.viewFrom = from;
-    } else {
-      if (display.viewFrom > from)
-        display.view = buildViewArray(cm, from, display.viewFrom).concat(display.view);
-      else if (display.viewFrom < from)
-        display.view = display.view.slice(findViewIndex(cm, from));
-      display.viewFrom = from;
-      if (display.viewTo < to)
-        display.view = display.view.concat(buildViewArray(cm, display.viewTo, to));
-      else if (display.viewTo > to)
-        display.view = display.view.slice(0, findViewIndex(cm, to));
-    }
-    display.viewTo = to;
-  }
-
-  // Count the number of lines in the view whose DOM representation is
-  // out of date (or nonexistent).
-  function countDirtyView(cm) {
-    var view = cm.display.view, dirty = 0;
-    for (var i = 0; i < view.length; i++) {
-      var lineView = view[i];
-      if (!lineView.hidden && (!lineView.node || lineView.changes)) ++dirty;
-    }
-    return dirty;
-  }
-
-  // EVENT HANDLERS
-
-  // Attach the necessary event handlers when initializing the editor
-  function registerEventHandlers(cm) {
-    var d = cm.display;
-    on(d.scroller, "mousedown", operation(cm, onMouseDown));
-    // Older IE's will not fire a second mousedown for a double click
-    if (ie && ie_version < 11)
-      on(d.scroller, "dblclick", operation(cm, function(e) {
-        if (signalDOMEvent(cm, e)) return;
-        var pos = posFromMouse(cm, e);
-        if (!pos || clickInGutter(cm, e) || eventInWidget(cm.display, e)) return;
-        e_preventDefault(e);
-        var word = cm.findWordAt(pos);
-        extendSelection(cm.doc, word.anchor, word.head);
-      }));
-    else
-      on(d.scroller, "dblclick", function(e) { signalDOMEvent(cm, e) || e_preventDefault(e); });
-    // Some browsers fire contextmenu *after* opening the menu, at
-    // which point we can't mess with it anymore. Context menu is
-    // handled in onMouseDown for these browsers.
-    if (!captureRightClick) on(d.scroller, "contextmenu", function(e) {onContextMenu(cm, e);});
-
-    // Used to suppress mouse event handling when a touch happens
-    var touchFinished, prevTouch = {end: 0};
-    function finishTouch() {
-      if (d.activeTouch) {
-        touchFinished = setTimeout(function() {d.activeTouch = null;}, 1000);
-        prevTouch = d.activeTouch;
-        prevTouch.end = +new Date;
-      }
-    };
-    function isMouseLikeTouchEvent(e) {
-      if (e.touches.length != 1) return false;
-      var touch = e.touches[0];
-      return touch.radiusX <= 1 && touch.radiusY <= 1;
-    }
-    function farAway(touch, other) {
-      if (other.left == null) return true;
-      var dx = other.left - touch.left, dy = other.top - touch.top;
-      return dx * dx + dy * dy > 20 * 20;
-    }
-    on(d.scroller, "touchstart", function(e) {
-      if (!isMouseLikeTouchEvent(e)) {
-        clearTimeout(touchFinished);
-        var now = +new Date;
-        d.activeTouch = {start: now, moved: false,
-                         prev: now - prevTouch.end <= 300 ? prevTouch : null};
-        if (e.touches.length == 1) {
-          d.activeTouch.left = e.touches[0].pageX;
-          d.activeTouch.top = e.touches[0].pageY;
-        }
-      }
-    });
-    on(d.scroller, "touchmove", function() {
-      if (d.activeTouch) d.activeTouch.moved = true;
-    });
-    on(d.scroller, "touchend", function(e) {
-      var touch = d.activeTouch;
-      if (touch && !eventInWidget(d, e) && touch.left != null &&
-          !touch.moved && new Date - touch.start < 300) {
-        var pos = cm.coordsChar(d.activeTouch, "page"), range;
-        if (!touch.prev || farAway(touch, touch.prev)) // Single tap
-          range = new Range(pos, pos);
-        else if (!touch.prev.prev || farAway(touch, touch.prev.prev)) // Double tap
-          range = cm.findWordAt(pos);
-        else // Triple tap
-          range = new Range(Pos(pos.line, 0), clipPos(cm.doc, Pos(pos.line + 1, 0)));
-        cm.setSelection(range.anchor, range.head);
-        cm.focus();
-        e_preventDefault(e);
-      }
-      finishTouch();
-    });
-    on(d.scroller, "touchcancel", finishTouch);
-
-    // Sync scrolling between fake scrollbars and real scrollable
-    // area, ensure viewport is updated when scrolling.
-    on(d.scroller, "scroll", function() {
-      if (d.scroller.clientHeight) {
-        setScrollTop(cm, d.scroller.scrollTop);
-        setScrollLeft(cm, d.scroller.scrollLeft, true);
-        signal(cm, "scroll", cm);
-      }
-    });
-
-    // Listen to wheel events in order to try and update the viewport on time.
-    on(d.scroller, "mousewheel", function(e){onScrollWheel(cm, e);});
-    on(d.scroller, "DOMMouseScroll", function(e){onScrollWheel(cm, e);});
-
-    // Prevent wrapper from ever scrolling
-    on(d.wrapper, "scroll", function() { d.wrapper.scrollTop = d.wrapper.scrollLeft = 0; });
-
-    d.dragFunctions = {
-      simple: function(e) {if (!signalDOMEvent(cm, e)) e_stop(e);},
-      start: function(e){onDragStart(cm, e);},
-      drop: operation(cm, onDrop)
-    };
-
-    var inp = d.input.getField();
-    on(inp, "keyup", function(e) { onKeyUp.call(cm, e); });
-    on(inp, "keydown", operation(cm, onKeyDown));
-    on(inp, "keypress", operation(cm, onKeyPress));
-    on(inp, "focus", bind(onFocus, cm));
-    on(inp, "blur", bind(onBlur, cm));
-  }
-
-  function dragDropChanged(cm, value, old) {
-    var wasOn = old && old != CodeMirror.Init;
-    if (!value != !wasOn) {
-      var funcs = cm.display.dragFunctions;
-      var toggle = value ? on : off;
-      toggle(cm.display.scroller, "dragstart", funcs.start);
-      toggle(cm.display.scroller, "dragenter", funcs.simple);
-      toggle(cm.display.scroller, "dragover", funcs.simple);
-      toggle(cm.display.scroller, "drop", funcs.drop);
-    }
-  }
-
-  // Called when the window resizes
-  function onResize(cm) {
-    var d = cm.display;
-    if (d.lastWrapHeight == d.wrapper.clientHeight && d.lastWrapWidth == d.wrapper.clientWidth)
-      return;
-    // Might be a text scaling operation, clear size caches.
-    d.cachedCharWidth = d.cachedTextHeight = d.cachedPaddingH = null;
-    d.scrollbarsClipped = false;
-    cm.setSize();
-  }
-
-  // MOUSE EVENTS
-
-  // Return true when the given mouse event happened in a widget
-  function eventInWidget(display, e) {
-    for (var n = e_target(e); n != display.wrapper; n = n.parentNode) {
-      if (!n || (n.nodeType == 1 && n.getAttribute("cm-ignore-events") == "true") ||
-          (n.parentNode == display.sizer && n != display.mover))
-        return true;
-    }
-  }
-
-  // Given a mouse event, find the corresponding position. If liberal
-  // is false, it checks whether a gutter or scrollbar was clicked,
-  // and returns null if it was. forRect is used by rectangular
-  // selections, and tries to estimate a character position even for
-  // coordinates beyond the right of the text.
-  function posFromMouse(cm, e, liberal, forRect) {
-    var display = cm.display;
-    if (!liberal && e_target(e).getAttribute("cm-not-content") == "true") return null;
-
-    var x, y, space = display.lineSpace.getBoundingClientRect();
-    // Fails unpredictably on IE[67] when mouse is dragged around quickly.
-    try { x = e.clientX - space.left; y = e.clientY - space.top; }
-    catch (e) { return null; }
-    var coords = coordsChar(cm, x, y), line;
-    if (forRect && coords.xRel == 1 && (line = getLine(cm.doc, coords.line).text).length == coords.ch) {
-      var colDiff = countColumn(line, line.length, cm.options.tabSize) - line.length;
-      coords = Pos(coords.line, Math.max(0, Math.round((x - paddingH(cm.display).left) / charWidth(cm.display)) - colDiff));
-    }
-    return coords;
-  }
-
-  // A mouse down can be a single click, double click, triple click,
-  // start of selection drag, start of text drag, new cursor
-  // (ctrl-click), rectangle drag (alt-drag), or xwin
-  // middle-click-paste. Or it might be a click on something we should
-  // not interfere with, such as a scrollbar or widget.
-  function onMouseDown(e) {
-    var cm = this, display = cm.display;
-    if (display.activeTouch && display.input.supportsTouch() || signalDOMEvent(cm, e)) return;
-    display.shift = e.shiftKey;
-
-    if (eventInWidget(display, e)) {
-      if (!webkit) {
-        // Briefly turn off draggability, to allow widgets to do
-        // normal dragging things.
-        display.scroller.draggable = false;
-        setTimeout(function(){display.scroller.draggable = true;}, 100);
-      }
-      return;
-    }
-    if (clickInGutter(cm, e)) return;
-    var start = posFromMouse(cm, e);
-    window.focus();
-
-    switch (e_button(e)) {
-    case 1:
-      if (start)
-        leftButtonDown(cm, e, start);
-      else if (e_target(e) == display.scroller)
-        e_preventDefault(e);
-      break;
-    case 2:
-      if (webkit) cm.state.lastMiddleDown = +new Date;
-      if (start) extendSelection(cm.doc, start);
-      setTimeout(function() {display.input.focus();}, 20);
-      e_preventDefault(e);
-      break;
-    case 3:
-      if (captureRightClick) onContextMenu(cm, e);
-      else delayBlurEvent(cm);
-      break;
-    }
-  }
-
-  var lastClick, lastDoubleClick;
-  function leftButtonDown(cm, e, start) {
-    if (ie) setTimeout(bind(ensureFocus, cm), 0);
-    else cm.curOp.focus = activeElt();
-
-    var now = +new Date, type;
-    if (lastDoubleClick && lastDoubleClick.time > now - 400 && cmp(lastDoubleClick.pos, start) == 0) {
-      type = "triple";
-    } else if (lastClick && lastClick.time > now - 400 && cmp(lastClick.pos, start) == 0) {
-      type = "double";
-      lastDoubleClick = {time: now, pos: start};
-    } else {
-      type = "single";
-      lastClick = {time: now, pos: start};
-    }
-
-    var sel = cm.doc.sel, modifier = mac ? e.metaKey : e.ctrlKey, contained;
-    if (cm.options.dragDrop && dragAndDrop && !isReadOnly(cm) &&
-        type == "single" && (contained = sel.contains(start)) > -1 &&
-        (cmp((contained = sel.ranges[contained]).from(), start) < 0 || start.xRel > 0) &&
-        (cmp(contained.to(), start) > 0 || start.xRel < 0))
-      leftButtonStartDrag(cm, e, start, modifier);
-    else
-      leftButtonSelect(cm, e, start, type, modifier);
-  }
-
-  // Start a text drag. When it ends, see if any dragging actually
-  // happen, and treat as a click if it didn't.
-  function leftButtonStartDrag(cm, e, start, modifier) {
-    var display = cm.display, startTime = +new Date;
-    var dragEnd = operation(cm, function(e2) {
-      if (webkit) display.scroller.draggable = false;
-      cm.state.draggingText = false;
-      off(document, "mouseup", dragEnd);
-      off(display.scroller, "drop", dragEnd);
-      if (Math.abs(e.clientX - e2.clientX) + Math.abs(e.clientY - e2.clientY) < 10) {
-        e_preventDefault(e2);
-        if (!modifier && +new Date - 200 < startTime)
-          extendSelection(cm.doc, start);
-        // Work around unexplainable focus problem in IE9 (#2127) and Chrome (#3081)
-        if (webkit || ie && ie_version == 9)
-          setTimeout(function() {document.body.focus(); display.input.focus();}, 20);
-        else
-          display.input.focus();
-      }
-    });
-    // Let the drag handler handle this.
-    if (webkit) display.scroller.draggable = true;
-    cm.state.draggingText = dragEnd;
-    // IE's approach to draggable
-    if (display.scroller.dragDrop) display.scroller.dragDrop();
-    on(document, "mouseup", dragEnd);
-    on(display.scroller, "drop", dragEnd);
-  }
-
-  // Normal selection, as opposed to text dragging.
-  function leftButtonSelect(cm, e, start, type, addNew) {
-    var display = cm.display, doc = cm.doc;
-    e_preventDefault(e);
-
-    var ourRange, ourIndex, startSel = doc.sel, ranges = startSel.ranges;
-    if (addNew && !e.shiftKey) {
-      ourIndex = doc.sel.contains(start);
-      if (ourIndex > -1)
-        ourRange = ranges[ourIndex];
-      else
-        ourRange = new Range(start, start);
-    } else {
-      ourRange = doc.sel.primary();
-      ourIndex = doc.sel.primIndex;
-    }
-
-    if (e.altKey) {
-      type = "rect";
-      if (!addNew) ourRange = new Range(start, start);
-      start = posFromMouse(cm, e, true, true);
-      ourIndex = -1;
-    } else if (type == "double") {
-      var word = cm.findWordAt(start);
-      if (cm.display.shift || doc.extend)
-        ourRange = extendRange(doc, ourRange, word.anchor, word.head);
-      else
-        ourRange = word;
-    } else if (type == "triple") {
-      var line = new Range(Pos(start.line, 0), clipPos(doc, Pos(start.line + 1, 0)));
-      if (cm.display.shift || doc.extend)
-        ourRange = extendRange(doc, ourRange, line.anchor, line.head);
-      else
-        ourRange = line;
-    } else {
-      ourRange = extendRange(doc, ourRange, start);
-    }
-
-    if (!addNew) {
-      ourIndex = 0;
-      setSelection(doc, new Selection([ourRange], 0), sel_mouse);
-      startSel = doc.sel;
-    } else if (ourIndex == -1) {
-      ourIndex = ranges.length;
-      setSelection(doc, normalizeSelection(ranges.concat([ourRange]), ourIndex),
-                   {scroll: false, origin: "*mouse"});
-    } else if (ranges.length > 1 && ranges[ourIndex].empty() && type == "single" && !e.shiftKey) {
-      setSelection(doc, normalizeSelection(ranges.slice(0, ourIndex).concat(ranges.slice(ourIndex + 1)), 0));
-      startSel = doc.sel;
-    } else {
-      replaceOneSelection(doc, ourIndex, ourRange, sel_mouse);
-    }
-
-    var lastPos = start;
-    function extendTo(pos) {
-      if (cmp(lastPos, pos) == 0) return;
-      lastPos = pos;
-
-      if (type == "rect") {
-        var ranges = [], tabSize = cm.options.tabSize;
-        var startCol = countColumn(getLine(doc, start.line).text, start.ch, tabSize);
-        var posCol = countColumn(getLine(doc, pos.line).text, pos.ch, tabSize);
-        var left = Math.min(startCol, posCol), right = Math.max(startCol, posCol);
-        for (var line = Math.min(start.line, pos.line), end = Math.min(cm.lastLine(), Math.max(start.line, pos.line));
-             line <= end; line++) {
-          var text = getLine(doc, line).text, leftPos = findColumn(text, left, tabSize);
-          if (left == right)
-            ranges.push(new Range(Pos(line, leftPos), Pos(line, leftPos)));
-          else if (text.length > leftPos)
-            ranges.push(new Range(Pos(line, leftPos), Pos(line, findColumn(text, right, tabSize))));
-        }
-        if (!ranges.length) ranges.push(new Range(start, start));
-        setSelection(doc, normalizeSelection(startSel.ranges.slice(0, ourIndex).concat(ranges), ourIndex),
-                     {origin: "*mouse", scroll: false});
-        cm.scrollIntoView(pos);
-      } else {
-        var oldRange = ourRange;
-        var anchor = oldRange.anchor, head = pos;
-        if (type != "single") {
-          if (type == "double")
-            var range = cm.findWordAt(pos);
-          else
-            var range = new Range(Pos(pos.line, 0), clipPos(doc, Pos(pos.line + 1, 0)));
-          if (cmp(range.anchor, anchor) > 0) {
-            head = range.head;
-            anchor = minPos(oldRange.from(), range.anchor);
-          } else {
-            head = range.anchor;
-            anchor = maxPos(oldRange.to(), range.head);
-          }
-        }
-        var ranges = startSel.ranges.slice(0);
-        ranges[ourIndex] = new Range(clipPos(doc, anchor), head);
-        setSelection(doc, normalizeSelection(ranges, ourIndex), sel_mouse);
-      }
-    }
-
-    var editorSize = display.wrapper.getBoundingClientRect();
-    // Used to ensure timeout re-tries don't fire when another extend
-    // happened in the meantime (clearTimeout isn't reliable -- at
-    // least on Chrome, the timeouts still happen even when cleared,
-    // if the clear happens after their scheduled firing time).
-    var counter = 0;
-
-    function extend(e) {
-      var curCount = ++counter;
-      var cur = posFromMouse(cm, e, true, type == "rect");
-      if (!cur) return;
-      if (cmp(cur, lastPos) != 0) {
-        cm.curOp.focus = activeElt();
-        extendTo(cur);
-        var visible = visibleLines(display, doc);
-        if (cur.line >= visible.to || cur.line < visible.from)
-          setTimeout(operation(cm, function(){if (counter == curCount) extend(e);}), 150);
-      } else {
-        var outside = e.clientY < editorSize.top ? -20 : e.clientY > editorSize.bottom ? 20 : 0;
-        if (outside) setTimeout(operation(cm, function() {
-          if (counter != curCount) return;
-          display.scroller.scrollTop += outside;
-          extend(e);
-        }), 50);
-      }
-    }
-
-    function done(e) {
-      counter = Infinity;
-      e_preventDefault(e);
-      display.input.focus();
-      off(document, "mousemove", move);
-      off(document, "mouseup", up);
-      doc.history.lastSelOrigin = null;
-    }
-
-    var move = operation(cm, function(e) {
-      if (!e_button(e)) done(e);
-      else extend(e);
-    });
-    var up = operation(cm, done);
-    on(document, "mousemove", move);
-    on(document, "mouseup", up);
-  }
-
-  // Determines whether an event happened in the gutter, and fires the
-  // handlers for the corresponding event.
-  function gutterEvent(cm, e, type, prevent, signalfn) {
-    try { var mX = e.clientX, mY = e.clientY; }
-    catch(e) { return false; }
-    if (mX >= Math.floor(cm.display.gutters.getBoundingClientRect().right)) return false;
-    if (prevent) e_preventDefault(e);
-
-    var display = cm.display;
-    var lineBox = display.lineDiv.getBoundingClientRect();
-
-    if (mY > lineBox.bottom || !hasHandler(cm, type)) return e_defaultPrevented(e);
-    mY -= lineBox.top - display.viewOffset;
-
-    for (var i = 0; i < cm.options.gutters.length; ++i) {
-      var g = display.gutters.childNodes[i];
-      if (g && g.getBoundingClientRect().right >= mX) {
-        var line = lineAtHeight(cm.doc, mY);
-        var gutter = cm.options.gutters[i];
-        signalfn(cm, type, cm, line, gutter, e);
-        return e_defaultPrevented(e);
-      }
-    }
-  }
-
-  function clickInGutter(cm, e) {
-    return gutterEvent(cm, e, "gutterClick", true, signalLater);
-  }
-
-  // Kludge to work around strange IE behavior where it'll sometimes
-  // re-fire a series of drag-related events right after the drop (#1551)
-  var lastDrop = 0;
-
-  function onDrop(e) {
-    var cm = this;
-    if (signalDOMEvent(cm, e) || eventInWidget(cm.display, e))
-      return;
-    e_preventDefault(e);
-    if (ie) lastDrop = +new Date;
-    var pos = posFromMouse(cm, e, true), files = e.dataTransfer.files;
-    if (!pos || isReadOnly(cm)) return;
-    // Might be a file drop, in which case we simply extract the text
-    // and insert it.
-    if (files && files.length && window.FileReader && window.File) {
-      var n = files.length, text = Array(n), read = 0;
-      var loadFile = function(file, i) {
-        var reader = new FileReader;
-        reader.onload = operation(cm, function() {
-          text[i] = reader.result;
-          if (++read == n) {
-            pos = clipPos(cm.doc, pos);
-            var change = {from: pos, to: pos, text: splitLines(text.join("\n")), origin: "paste"};
-            makeChange(cm.doc, change);
-            setSelectionReplaceHistory(cm.doc, simpleSelection(pos, changeEnd(change)));
-          }
-        });
-        reader.readAsText(file);
-      };
-      for (var i = 0; i < n; ++i) loadFile(files[i], i);
-    } else { // Normal drop
-      // Don't do a replace if the drop happened inside of the selected text.
-      if (cm.state.draggingText && cm.doc.sel.contains(pos) > -1) {
-        cm.state.draggingText(e);
-        // Ensure the editor is re-focused
-        setTimeout(function() {cm.display.input.focus();}, 20);
-        return;
-      }
-      try {
-        var text = e.dataTransfer.getData("Text");
-        if (text) {
-          if (cm.state.draggingText && !(mac ? e.altKey : e.ctrlKey))
-            var selected = cm.listSelections();
-          setSelectionNoUndo(cm.doc, simpleSelection(pos, pos));
-          if (selected) for (var i = 0; i < selected.length; ++i)
-            replaceRange(cm.doc, "", selected[i].anchor, selected[i].head, "drag");
-          cm.replaceSelection(text, "around", "paste");
-          cm.display.input.focus();
-        }
-      }
-      catch(e){}
-    }
-  }
-
-  function onDragStart(cm, e) {
-    if (ie && (!cm.state.draggingText || +new Date - lastDrop < 100)) { e_stop(e); return; }
-    if (signalDOMEvent(cm, e) || eventInWidget(cm.display, e)) return;
-
-    e.dataTransfer.setData("Text", cm.getSelection());
-
-    // Use dummy image instead of default browsers image.
-    // Recent Safari (~6.0.2) have a tendency to segfault when this happens, so we don't do it there.
-    if (e.dataTransfer.setDragImage && !safari) {
-      var img = elt("img", null, null, "position: fixed; left: 0; top: 0;");
-      img.src = "data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==";
-      if (presto) {
-        img.width = img.height = 1;
-        cm.display.wrapper.appendChild(img);
-        // Force a relayout, or Opera won't use our image for some obscure reason
-        img._top = img.offsetTop;
-      }
-      e.dataTransfer.setDragImage(img, 0, 0);
-      if (presto) img.parentNode.removeChild(img);
-    }
-  }
-
-  // SCROLL EVENTS
-
-  // Sync the scrollable area and scrollbars, ensure the viewport
-  // covers the visible area.
-  function setScrollTop(cm, val) {
-    if (Math.abs(cm.doc.scrollTop - val) < 2) return;
-    cm.doc.scrollTop = val;
-    if (!gecko) updateDisplaySimple(cm, {top: val});
-    if (cm.display.scroller.scrollTop != val) cm.display.scroller.scrollTop = val;
-    cm.display.scrollbars.setScrollTop(val);
-    if (gecko) updateDisplaySimple(cm);
-    startWorker(cm, 100);
-  }
-  // Sync scroller and scrollbar, ensure the gutter elements are
-  // aligned.
-  function setScrollLeft(cm, val, isScroller) {
-    if (isScroller ? val == cm.doc.scrollLeft : Math.abs(cm.doc.scrollLeft - val) < 2) return;
-    val = Math.min(val, cm.display.scroller.scrollWidth - cm.display.scroller.clientWidth);
-    cm.doc.scrollLeft = val;
-    alignHorizontally(cm);
-    if (cm.display.scroller.scrollLeft != val) cm.display.scroller.scrollLeft = val;
-    cm.display.scrollbars.setScrollLeft(val);
-  }
-
-  // Since the delta values reported on mouse wheel events are
-  // unstandardized between browsers and even browser versions, and
-  // generally horribly unpredictable, this code starts by measuring
-  // the scroll effect that the first few mouse wheel events have,
-  // and, from that, detects the way it can convert deltas to pixel
-  // offsets afterwards.
-  //
-  // The reason we want to know the amount a wheel event will scroll
-  // is that it gives us a chance to update the display before the
-  // actual scrolling happens, reducing flickering.
-
-  var wheelSamples = 0, wheelPixelsPerUnit = null;
-  // Fill in a browser-detected starting value on browsers where we
-  // know one. These don't have to be accurate -- the result of them
-  // being wrong would just be a slight flicker on the first wheel
-  // scroll (if it is large enough).
-  if (ie) wheelPixelsPerUnit = -.53;
-  else if (gecko) wheelPixelsPerUnit = 15;
-  else if (chrome) wheelPixelsPerUnit = -.7;
-  else if (safari) wheelPixelsPerUnit = -1/3;
-
-  var wheelEventDelta = function(e) {
-    var dx = e.wheelDeltaX, dy = e.wheelDeltaY;
-    if (dx == null && e.detail && e.axis == e.HORIZONTAL_AXIS) dx = e.detail;
-    if (dy == null && e.detail && e.axis == e.VERTICAL_AXIS) dy = e.detail;
-    else if (dy == null) dy = e.wheelDelta;
-    return {x: dx, y: dy};
-  };
-  CodeMirror.wheelEventPixels = function(e) {
-    var delta = wheelEventDelta(e);
-    delta.x *= wheelPixelsPerUnit;
-    delta.y *= wheelPixelsPerUnit;
-    return delta;
-  };
-
-  function onScrollWheel(cm, e) {
-    var delta = wheelEventDelta(e), dx = delta.x, dy = delta.y;
-
-    var display = cm.display, scroll = display.scroller;
-    // Quit if there's nothing to scroll here
-    if (!(dx && scroll.scrollWidth > scroll.clientWidth ||
-          dy && scroll.scrollHeight > scroll.clientHeight)) return;
-
-    // Webkit browsers on OS X abort momentum scrolls when the target
-    // of the scroll event is removed from the scrollable element.
-    // This hack (see related code in patchDisplay) makes sure the
-    // element is kept around.
-    if (dy && mac && webkit) {
-      outer: for (var cur = e.target, view = display.view; cur != scroll; cur = cur.parentNode) {
-        for (var i = 0; i < view.length; i++) {
-          if (view[i].node == cur) {
-            cm.display.currentWheelTarget = cur;
-            break outer;
-          }
-        }
-      }
-    }
-
-    // On some browsers, horizontal scrolling will cause redraws to
-    // happen before the gutter has been realigned, causing it to
-    // wriggle around in a most unseemly way. When we have an
-    // estimated pixels/delta value, we just handle horizontal
-    // scrolling entirely here. It'll be slightly off from native, but
-    // better than glitching out.
-    if (dx && !gecko && !presto && wheelPixelsPerUnit != null) {
-      if (dy)
-        setScrollTop(cm, Math.max(0, Math.min(scroll.scrollTop + dy * wheelPixelsPerUnit, scroll.scrollHeight - scroll.clientHeight)));
-      setScrollLeft(cm, Math.max(0, Math.min(scroll.scrollLeft + dx * wheelPixelsPerUnit, scroll.scrollWidth - scroll.clientWidth)));
-      e_preventDefault(e);
-      display.wheelStartX = null; // Abort measurement, if in progress
-      return;
-    }
-
-    // 'Project' the visible viewport to cover the area that is being
-    // scrolled into view (if we know enough to estimate it).
-    if (dy && wheelPixelsPerUnit != null) {
-      var pixels = dy * wheelPixelsPerUnit;
-      var top = cm.doc.scrollTop, bot = top + display.wrapper.clientHeight;
-      if (pixels < 0) top = Math.max(0, top + pixels - 50);
-      else bot = Math.min(cm.doc.height, bot + pixels + 50);
-      updateDisplaySimple(cm, {top: top, bottom: bot});
-    }
-
-    if (wheelSamples < 20) {
-      if (display.wheelStartX == null) {
-        display.wheelStartX = scroll.scrollLeft; display.wheelStartY = scroll.scrollTop;
-        display.wheelDX = dx; display.wheelDY = dy;
-        setTimeout(function() {
-          if (display.wheelStartX == null) return;
-          var movedX = scroll.scrollLeft - display.wheelStartX;
-          var movedY = scroll.scrollTop - display.wheelStartY;
-          var sample = (movedY && display.wheelDY && movedY / display.wheelDY) ||
-            (movedX && display.wheelDX && movedX / display.wheelDX);
-          display.wheelStartX = display.wheelStartY = null;
-          if (!sample) return;
-          wheelPixelsPerUnit = (wheelPixelsPerUnit * wheelSamples + sample) / (wheelSamples + 1);
-          ++wheelSamples;
-        }, 200);
-      } else {
-        display.wheelDX += dx; display.wheelDY += dy;
-      }
-    }
-  }
-
-  // KEY EVENTS
-
-  // Run a handler that was bound to a key.
-  function doHandleBinding(cm, bound, dropShift) {
-    if (typeof bound == "string") {
-      bound = commands[bound];
-      if (!bound) return false;
-    }
-    // Ensure previous input has been read, so that the handler sees a
-    // consistent view of the document
-    cm.display.input.ensurePolled();
-    var prevShift = cm.display.shift, done = false;
-    try {
-      if (isReadOnly(cm)) cm.state.suppressEdits = true;
-      if (dropShift) cm.display.shift = false;
-      done = bound(cm) != Pass;
-    } finally {
-      cm.display.shift = prevShift;
-      cm.state.suppressEdits = false;
-    }
-    return done;
-  }
-
-  function lookupKeyForEditor(cm, name, handle) {
-    for (var i = 0; i < cm.state.keyMaps.length; i++) {
-      var result = lookupKey(name, cm.state.keyMaps[i], handle, cm);
-      if (result) return result;
-    }
-    return (cm.options.extraKeys && lookupKey(name, cm.options.extraKeys, handle, cm))
-      || lookupKey(name, cm.options.keyMap, handle, cm);
-  }
-
-  var stopSeq = new Delayed;
-  function dispatchKey(cm, name, e, handle) {
-    var seq = cm.state.keySeq;
-    if (seq) {
-      if (isModifierKey(name)) return "handled";
-      stopSeq.set(50, function() {
-        if (cm.state.keySeq == seq) {
-          cm.state.keySeq = null;
-          cm.display.input.reset();
-        }
-      });
-      name = seq + " " + name;
-    }
-    var result = lookupKeyForEditor(cm, name, handle);
-
-    if (result == "multi")
-      cm.state.keySeq = name;
-    if (result == "handled")
-      signalLater(cm, "keyHandled", cm, name, e);
-
-    if (result == "handled" || result == "multi") {
-      e_preventDefault(e);
-      restartBlink(cm);
-    }
-
-    if (seq && !result && /\'$/.test(name)) {
-      e_preventDefault(e);
-      return true;
-    }
-    return !!result;
-  }
-
-  // Handle a key from the keydown event.
-  function handleKeyBinding(cm, e) {
-    var name = keyName(e, true);
-    if (!name) return false;
-
-    if (e.shiftKey && !cm.state.keySeq) {
-      // First try to resolve full name (including 'Shift-'). Failing
-      // that, see if there is a cursor-motion command (starting with
-      // 'go') bound to the keyname without 'Shift-'.
-      return dispatchKey(cm, "Shift-" + name, e, function(b) {return doHandleBinding(cm, b, true);})
-          || dispatchKey(cm, name, e, function(b) {
-               if (typeof b == "string" ? /^go[A-Z]/.test(b) : b.motion)
-                 return doHandleBinding(cm, b);
-             });
-    } else {
-      return dispatchKey(cm, name, e, function(b) { return doHandleBinding(cm, b); });
-    }
-  }
-
-  // Handle a key from the keypress event
-  function handleCharBinding(cm, e, ch) {
-    return dispatchKey(cm, "'" + ch + "'", e,
-                       function(b) { return doHandleBinding(cm, b, true); });
-  }
-
-  var lastStoppedKey = null;
-  function onKeyDown(e) {
-    var cm = this;
-    cm.curOp.focus = activeElt();
-    if (signalDOMEvent(cm, e)) return;
-    // IE does strange things with escape.
-    if (ie && ie_version < 11 && e.keyCode == 27) e.returnValue = false;
-    var code = e.keyCode;
-    cm.display.shift = code == 16 || e.shiftKey;
-    var handled = handleKeyBinding(cm, e);
-    if (presto) {
-      lastStoppedKey = handled ? code : null;
-      // Opera has no cut event... we try to at least catch the key combo
-      if (!handled && code == 88 && !hasCopyEvent && (mac ? e.metaKey : e.ctrlKey))
-        cm.replaceSelection("", null, "cut");
-    }
-
-    // Turn mouse into crosshair when Alt is held on Mac.
-    if (code == 18 && !/\bCodeMirror-crosshair\b/.test(cm.display.lineDiv.className))
-      showCrossHair(cm);
-  }
-
-  function showCrossHair(cm) {
-    var lineDiv = cm.display.lineDiv;
-    addClass(lineDiv, "CodeMirror-crosshair");
-
-    function up(e) {
-      if (e.keyCode == 18 || !e.altKey) {
-        rmClass(lineDiv, "CodeMirror-crosshair");
-        off(document, "keyup", up);
-        off(document, "mouseover", up);
-      }
-    }
-    on(document, "keyup", up);
-    on(document, "mouseover", up);
-  }
-
-  function onKeyUp(e) {
-    if (e.keyCode == 16) this.doc.sel.shift = false;
-    signalDOMEvent(this, e);
-  }
-
-  function onKeyPress(e) {
-    var cm = this;
-    if (eventInWidget(cm.display, e) || signalDOMEvent(cm, e) || e.ctrlKey && !e.altKey || mac && e.metaKey) return;
-    var keyCode = e.keyCode, charCode = e.charCode;
-    if (presto && keyCode == lastStoppedKey) {lastStoppedKey = null; e_preventDefault(e); return;}
-    if ((presto && (!e.which || e.which < 10)) && handleKeyBinding(cm, e)) return;
-    var ch = String.fromCharCode(charCode == null ? keyCode : charCode);
-    if (handleCharBinding(cm, e, ch)) return;
-    cm.display.input.onKeyPress(e);
-  }
-
-  // FOCUS/BLUR EVENTS
-
-  function delayBlurEvent(cm) {
-    cm.state.delayingBlurEvent = true;
-    setTimeout(function() {
-      if (cm.state.delayingBlurEvent) {
-        cm.state.delayingBlurEvent = false;
-        onBlur(cm);
-      }
-    }, 100);
-  }
-
-  function onFocus(cm) {
-    if (cm.state.delayingBlurEvent) cm.state.delayingBlurEvent = false;
-
-    if (cm.options.readOnly == "nocursor") return;
-    if (!cm.state.focused) {
-      signal(cm, "focus", cm);
-      cm.state.focused = true;
-      addClass(cm.display.wrapper, "CodeMirror-focused");
-      // This test prevents this from firing when a context
-      // menu is closed (since the input reset would kill the
-      // select-all detection hack)
-      if (!cm.curOp && cm.display.selForContextMenu != cm.doc.sel) {
-        cm.display.input.reset();
-        if (webkit) setTimeout(function() { cm.display.input.reset(true); }, 20); // Issue #1730
-      }
-      cm.display.input.receivedFocus();
-    }
-    restartBlink(cm);
-  }
-  function onBlur(cm) {
-    if (cm.state.delayingBlurEvent) return;
-
-    if (cm.state.focused) {
-      signal(cm, "blur", cm);
-      cm.state.focused = false;
-      rmClass(cm.display.wrapper, "CodeMirror-focused");
-    }
-    clearInterval(cm.display.blinker);
-    setTimeout(function() {if (!cm.state.focused) cm.display.shift = false;}, 150);
-  }
-
-  // CONTEXT MENU HANDLING
-
-  // To make the context menu work, we need to briefly unhide the
-  // textarea (making it as unobtrusive as possible) to let the
-  // right-click take effect on it.
-  function onContextMenu(cm, e) {
-    if (eventInWidget(cm.display, e) || contextMenuInGutter(cm, e)) return;
-    cm.display.input.onContextMenu(e);
-  }
-
-  function contextMenuInGutter(cm, e) {
-    if (!hasHandler(cm, "gutterContextMenu")) return false;
-    return gutterEvent(cm, e, "gutterContextMenu", false, signal);
-  }
-
-  // UPDATING
-
-  // Compute the position of the end of a change (its 'to' property
-  // refers to the pre-change end).
-  var changeEnd = CodeMirror.changeEnd = function(change) {
-    if (!change.text) return change.to;
-    return Pos(change.from.line + change.text.length - 1,
-               lst(change.text).length + (change.text.length == 1 ? change.from.ch : 0));
-  };
-
-  // Adjust a position to refer to the post-change position of the
-  // same text, or the end of the change if the change covers it.
-  function adjustForChange(pos, change) {
-    if (cmp(pos, change.from) < 0) return pos;
-    if (cmp(pos, change.to) <= 0) return changeEnd(change);
-
-    var line = pos.line + change.text.length - (change.to.line - change.from.line) - 1, ch = pos.ch;
-    if (pos.line == change.to.line) ch += changeEnd(change).ch - change.to.ch;
-    return Pos(line, ch);
-  }
-
-  function computeSelAfterChange(doc, change) {
-    var out = [];
-    for (var i = 0; i < doc.sel.ranges.length; i++) {
-      var range = doc.sel.ranges[i];
-      out.push(new Range(adjustForChange(range.anchor, change),
-                         adjustForChange(range.head, change)));
-    }
-    return normalizeSelection(out, doc.sel.primIndex);
-  }
-
-  function offsetPos(pos, old, nw) {
-    if (pos.line == old.line)
-      return Pos(nw.line, pos.ch - old.ch + nw.ch);
-    else
-      return Pos(nw.line + (pos.line - old.line), pos.ch);
-  }
-
-  // Used by replaceSelections to allow moving the selection to the
-  // start or around the replaced test. Hint may be "start" or "around".
-  function computeReplacedSel(doc, changes, hint) {
-    var out = [];
-    var oldPrev = Pos(doc.first, 0), newPrev = oldPrev;
-    for (var i = 0; i < changes.length; i++) {
-      var change = changes[i];
-      var from = offsetPos(change.from, oldPrev, newPrev);
-      var to = offsetPos(changeEnd(change), oldPrev, newPrev);
-      oldPrev = change.to;
-      newPrev = to;
-      if (hint == "around") {
-        var range = doc.sel.ranges[i], inv = cmp(range.head, range.anchor) < 0;
-        out[i] = new Range(inv ? to : from, inv ? from : to);
-      } else {
-        out[i] = new Range(from, from);
-      }
-    }
-    return new Selection(out, doc.sel.primIndex);
-  }
-
-  // Allow "beforeChange" event handlers to influence a change
-  function filterChange(doc, change, update) {
-    var obj = {
-      canceled: false,
-      from: change.from,
-      to: change.to,
-      text: change.text,
-      origin: change.origin,
-      cancel: function() { this.canceled = true; }
-    };
-    if (update) obj.update = function(from, to, text, origin) {
-      if (from) this.from = clipPos(doc, from);
-      if (to) this.to = clipPos(doc, to);
-      if (text) this.text = text;
-      if (origin !== undefined) this.origin = origin;
-    };
-    signal(doc, "beforeChange", doc, obj);
-    if (doc.cm) signal(doc.cm, "beforeChange", doc.cm, obj);
-
-    if (obj.canceled) return null;
-    return {from: obj.from, to: obj.to, text: obj.text, origin: obj.origin};
-  }
-
-  // Apply a change to a document, and add it to the document's
-  // history, and propagating it to all linked documents.
-  function makeChange(doc, change, ignoreReadOnly) {
-    if (doc.cm) {
-      if (!doc.cm.curOp) return operation(doc.cm, makeChange)(doc, change, ignoreReadOnly);
-      if (doc.cm.state.suppressEdits) return;
-    }
-
-    if (hasHandler(doc, "beforeChange") || doc.cm && hasHandler(doc.cm, "beforeChange")) {
-      change = filterChange(doc, change, true);
-      if (!change) return;
-    }
-
-    // Possibly split or suppress the update based on the presence
-    // of read-only spans in its range.
-    var split = sawReadOnlySpans && !ignoreReadOnly && removeReadOnlyRanges(doc, change.from, change.to);
-    if (split) {
-      for (var i = split.length - 1; i >= 0; --i)
-        makeChangeInner(doc, {from: split[i].from, to: split[i].to, text: i ? [""] : change.text});
-    } else {
-      makeChangeInner(doc, change);
-    }
-  }
-
-  function makeChangeInner(doc, change) {
-    if (change.text.length == 1 && change.text[0] == "" && cmp(change.from, change.to) == 0) return;
-    var selAfter = computeSelAfterChange(doc, change);
-    addChangeToHistory(doc, change, selAfter, doc.cm ? doc.cm.curOp.id : NaN);
-
-    makeChangeSingleDoc(doc, change, selAfter, stretchSpansOverChange(doc, change));
-    var rebased = [];
-
-    linkedDocs(doc, function(doc, sharedHist) {
-      if (!sharedHist && indexOf(rebased, doc.history) == -1) {
-        rebaseHist(doc.history, change);
-        rebased.push(doc.history);
-      }
-      makeChangeSingleDoc(doc, change, null, stretchSpansOverChange(doc, change));
-    });
-  }
-
-  // Revert a change stored in a document's history.
-  function makeChangeFromHistory(doc, type, allowSelectionOnly) {
-    if (doc.cm && doc.cm.state.suppressEdits) return;
-
-    var hist = doc.history, event, selAfter = doc.sel;
-    var source = type == "undo" ? hist.done : hist.undone, dest = type == "undo" ? hist.undone : hist.done;
-
-    // Verify that there is a useable event (so that ctrl-z won't
-    // needlessly clear selection events)
-    for (var i = 0; i < source.length; i++) {
-      event = source[i];
-      if (allowSelectionOnly ? event.ranges && !event.equals(doc.sel) : !event.ranges)
-        break;
-    }
-    if (i == source.length) return;
-    hist.lastOrigin = hist.lastSelOrigin = null;
-
-    for (;;) {
-      event = source.pop();
-      if (event.ranges) {
-        pushSelectionToHistory(event, dest);
-        if (allowSelectionOnly && !event.equals(doc.sel)) {
-          setSelection(doc, event, {clearRedo: false});
-          return;
-        }
-        selAfter = event;
-      }
-      else break;
-    }
-
-    // Build up a reverse change object to add to the opposite history
-    // stack (redo when undoing, and vice versa).
-    var antiChanges = [];
-    pushSelectionToHistory(selAfter, dest);
-    dest.push({changes: antiChanges, generation: hist.generation});
-    hist.generation = event.generation || ++hist.maxGeneration;
-
-    var filter = hasHandler(doc, "beforeChange") || doc.cm && hasHandler(doc.cm, "beforeChange");
-
-    for (var i = event.changes.length - 1; i >= 0; --i) {
-      var change = event.changes[i];
-      change.origin = type;
-      if (filter && !filterChange(doc, change, false)) {
-        source.length = 0;
-        return;
-      }
-
-      antiChanges.push(historyChangeFromChange(doc, change));
-
-      var after = i ? computeSelAfterChange(doc, change) : lst(source);
-      makeChangeSingleDoc(doc, change, after, mergeOldSpans(doc, change));
-      if (!i && doc.cm) doc.cm.scrollIntoView({from: change.from, to: changeEnd(change)});
-      var rebased = [];
-
-      // Propagate to the linked documents
-      linkedDocs(doc, function(doc, sharedHist) {
-        if (!sharedHist && indexOf(rebased, doc.history) == -1) {
-          rebaseHist(doc.history, change);
-          rebased.push(doc.history);
-        }
-        makeChangeSingleDoc(doc, change, null, mergeOldSpans(doc, change));
-      });
-    }
-  }
-
-  // Sub-views need their line numbers shifted when text is added
-  // above or below them in the parent document.
-  function shiftDoc(doc, distance) {
-    if (distance == 0) return;
-    doc.first += distance;
-    doc.sel = new Selection(map(doc.sel.ranges, function(range) {
-      return new Range(Pos(range.anchor.line + distance, range.anchor.ch),
-                       Pos(range.head.line + distance, range.head.ch));
-    }), doc.sel.primIndex);
-    if (doc.cm) {
-      regChange(doc.cm, doc.first, doc.first - distance, distance);
-      for (var d = doc.cm.display, l = d.viewFrom; l < d.viewTo; l++)
-        regLineChange(doc.cm, l, "gutter");
-    }
-  }
-
-  // More lower-level change function, handling only a single document
-  // (not linked ones).
-  function makeChangeSingleDoc(doc, change, selAfter, spans) {
-    if (doc.cm && !doc.cm.curOp)
-      return operation(doc.cm, makeChangeSingleDoc)(doc, change, selAfter, spans);
-
-    if (change.to.line < doc.first) {
-      shiftDoc(doc, change.text.length - 1 - (change.to.line - change.from.line));
-      return;
-    }
-    if (change.from.line > doc.lastLine()) return;
-
-    // Clip the change to the size of this doc
-    if (change.from.line < doc.first) {
-      var shift = change.text.length - 1 - (doc.first - change.from.line);
-      shiftDoc(doc, shift);
-      change = {from: Pos(doc.first, 0), to: Pos(change.to.line + shift, change.to.ch),
-                text: [lst(change.text)], origin: change.origin};
-    }
-    var last = doc.lastLine();
-    if (change.to.line > last) {
-      change = {from: change.from, to: Pos(last, getLine(doc, last).text.length),
-                text: [change.text[0]], origin: change.origin};
-    }
-
-    change.removed = getBetween(doc, change.from, change.to);
-
-    if (!selAfter) selAfter = computeSelAfterChange(doc, change);
-    if (doc.cm) makeChangeSingleDocInEditor(doc.cm, change, spans);
-    else updateDoc(doc, change, spans);
-    setSelectionNoUndo(doc, selAfter, sel_dontScroll);
-  }
-
-  // Handle the interaction of a change to a document with the editor
-  // that this document is part of.
-  function makeChangeSingleDocInEditor(cm, change, spans) {
-    var doc = cm.doc, display = cm.display, from = change.from, to = change.to;
-
-    var recomputeMaxLength = false, checkWidthStart = from.line;
-    if (!cm.options.lineWrapping) {
-      checkWidthStart = lineNo(visualLine(getLine(doc, from.line)));
-      doc.iter(checkWidthStart, to.line + 1, function(line) {
-        if (line == display.maxLine) {
-          recomputeMaxLength = true;
-          return true;
-        }
-      });
-    }
-
-    if (doc.sel.contains(change.from, change.to) > -1)
-      signalCursorActivity(cm);
-
-    updateDoc(doc, change, spans, estimateHeight(cm));
-
-    if (!cm.options.lineWrapping) {
-      doc.iter(checkWidthStart, from.line + change.text.length, function(line) {
-        var len = lineLength(line);
-        if (len > display.maxLineLength) {
-          display.maxLine = line;
-          display.maxLineLength = len;
-          display.maxLineChanged = true;
-          recomputeMaxLength = false;
-        }
-      });
-      if (recomputeMaxLength) cm.curOp.updateMaxLine = true;
-    }
-
-    // Adjust frontier, schedule worker
-    doc.frontier = Math.min(doc.frontier, from.line);
-    startWorker(cm, 400);
-
-    var lendiff = change.text.length - (to.line - from.line) - 1;
-    // Remember that these lines changed, for updating the display
-    if (change.full)
-      regChange(cm);
-    else if (from.line == to.line && change.text.length == 1 && !isWholeLineUpdate(cm.doc, change))
-      regLineChange(cm, from.line, "text");
-    else
-      regChange(cm, from.line, to.line + 1, lendiff);
-
-    var changesHandler = hasHandler(cm, "changes"), changeHandler = hasHandler(cm, "change");
-    if (changeHandler || changesHandler) {
-      var obj = {
-        from: from, to: to,
-        text: change.text,
-        removed: change.removed,
-        origin: change.origin
-      };
-      if (changeHandler) signalLater(cm, "change", cm, obj);
-      if (changesHandler) (cm.curOp.changeObjs || (cm.curOp.changeObjs = [])).push(obj);
-    }
-    cm.display.selForContextMenu = null;
-  }
-
-  function replaceRange(doc, code, from, to, origin) {
-    if (!to) to = from;
-    if (cmp(to, from) < 0) { var tmp = to; to = from; from = tmp; }
-    if (typeof code == "string") code = splitLines(code);
-    makeChange(doc, {from: from, to: to, text: code, origin: origin});
-  }
-
-  // SCROLLING THINGS INTO VIEW
-
-  // If an editor sits on the top or bottom of the window, partially
-  // scrolled out of view, this ensures that the cursor is visible.
-  function maybeScrollWindow(cm, coords) {
-    if (signalDOMEvent(cm, "scrollCursorIntoView")) return;
-
-    var display = cm.display, box = display.sizer.getBoundingClientRect(), doScroll = null;
-    if (coords.top + box.top < 0) doScroll = true;
-    else if (coords.bottom + box.top > (window.innerHeight || document.documentElement.clientHeight)) doScroll = false;
-    if (doScroll != null && !phantom) {
-      var scrollNode = elt("div", "\u200b", null, "position: absolute; top: " +
-                           (coords.top - display.viewOffset - paddingTop(cm.display)) + "px; height: " +
-                           (coords.bottom - coords.top + scrollGap(cm) + display.barHeight) + "px; left: " +
-                           coords.left + "px; width: 2px;");
-      cm.display.lineSpace.appendChild(scrollNode);
-      scrollNode.scrollIntoView(doScroll);
-      cm.display.lineSpace.removeChild(scrollNode);
-    }
-  }
-
-  // Scroll a given position into view (immediately), verifying that
-  // it actually became visible (as line heights are accurately
-  // measured, the position of something may 'drift' during drawing).
-  function scrollPosIntoView(cm, pos, end, margin) {
-    if (margin == null) margin = 0;
-    for (var limit = 0; limit < 5; limit++) {
-      var changed = false, coords = cursorCoords(cm, pos);
-      var endCoords = !end || end == pos ? coords : cursorCoords(cm, end);
-      var scrollPos = calculateScrollPos(cm, Math.min(coords.left, endCoords.left),
-                                         Math.min(coords.top, endCoords.top) - margin,
-                                         Math.max(coords.left, endCoords.left),
-                                         Math.max(coords.bottom, endCoords.bottom) + margin);
-      var startTop = cm.doc.scrollTop, startLeft = cm.doc.scrollLeft;
-      if (scrollPos.scrollTop != null) {
-        setScrollTop(cm, scrollPos.scrollTop);
-        if (Math.abs(cm.doc.scrollTop - startTop) > 1) changed = true;
-      }
-      if (scrollPos.scrollLeft != null) {
-        setScrollLeft(cm, scrollPos.scrollLeft);
-        if (Math.abs(cm.doc.scrollLeft - startLeft) > 1) changed = true;
-      }
-      if (!changed) break;
-    }
-    return coords;
-  }
-
-  // Scroll a given set of coordinates into view (immediately).
-  function scrollIntoView(cm, x1, y1, x2, y2) {
-    var scrollPos = calculateScrollPos(cm, x1, y1, x2, y2);
-    if (scrollPos.scrollTop != null) setScrollTop(cm, scrollPos.scrollTop);
-    if (scrollPos.scrollLeft != null) setScrollLeft(cm, scrollPos.scrollLeft);
-  }
-
-  // Calculate a new scroll position needed to scroll the given
-  // rectangle into view. Returns an object with scrollTop and
-  // scrollLeft properties. When these are undefined, the
-  // vertical/horizontal position does not need to be adjusted.
-  function calculateScrollPos(cm, x1, y1, x2, y2) {
-    var display = cm.display, snapMargin = textHeight(cm.display);
-    if (y1 < 0) y1 = 0;
-    var screentop = cm.curOp && cm.curOp.scrollTop != null ? cm.curOp.scrollTop : display.scroller.scrollTop;
-    var screen = displayHeight(cm), result = {};
-    if (y2 - y1 > screen) y2 = y1 + screen;
-    var docBottom = cm.doc.height + paddingVert(display);
-    var atTop = y1 < snapMargin, atBottom = y2 > docBottom - snapMargin;
-    if (y1 < screentop) {
-      result.scrollTop = atTop ? 0 : y1;
-    } else if (y2 > screentop + screen) {
-      var newTop = Math.min(y1, (atBottom ? docBottom : y2) - screen);
-      if (newTop != screentop) result.scrollTop = newTop;
-    }
-
-    var screenleft = cm.curOp && cm.curOp.scrollLeft != null ? cm.curOp.scrollLeft : display.scroller.scrollLeft;
-    var screenw = displayWidth(cm) - (cm.options.fixedGutter ? display.gutters.offsetWidth : 0);
-    var tooWide = x2 - x1 > screenw;
-    if (tooWide) x2 = x1 + screenw;
-    if (x1 < 10)
-      result.scrollLeft = 0;
-    else if (x1 < screenleft)
-      result.scrollLeft = Math.max(0, x1 - (tooWide ? 0 : 10));
-    else if (x2 > screenw + screenleft - 3)
-      result.scrollLeft = x2 + (tooWide ? 0 : 10) - screenw;
-    return result;
-  }
-
-  // Store a relative adjustment to the scroll position in the current
-  // operation (to be applied when the operation finishes).
-  function addToScrollPos(cm, left, top) {
-    if (left != null || top != null) resolveScrollToPos(cm);
-    if (left != null)
-      cm.curOp.scrollLeft = (cm.curOp.scrollLeft == null ? cm.doc.scrollLeft : cm.curOp.scrollLeft) + left;
-    if (top != null)
-      cm.curOp.scrollTop = (cm.curOp.scrollTop == null ? cm.doc.scrollTop : cm.curOp.scrollTop) + top;
-  }
-
-  // Make sure that at the end of the operation the current cursor is
-  // shown.
-  function ensureCursorVisible(cm) {
-    resolveScrollToPos(cm);
-    var cur = cm.getCursor(), from = cur, to = cur;
-    if (!cm.options.lineWrapping) {
-      from = cur.ch ? Pos(cur.line, cur.ch - 1) : cur;
-      to = Pos(cur.line, cur.ch + 1);
-    }
-    cm.curOp.scrollToPos = {from: from, to: to, margin: cm.options.cursorScrollMargin, isCursor: true};
-  }
-
-  // When an operation has its scrollToPos property set, and another
-  // scroll action is applied before the end of the operation, this
-  // 'simulates' scrolling that position into view in a cheap way, so
-  // that the effect of intermediate scroll commands is not ignored.
-  function resolveScrollToPos(cm) {
-    var range = cm.curOp.scrollToPos;
-    if (range) {
-      cm.curOp.scrollToPos = null;
-      var from = estimateCoords(cm, range.from), to = estimateCoords(cm, range.to);
-      var sPos = calculateScrollPos(cm, Math.min(from.left, to.left),
-                                    Math.min(from.top, to.top) - range.margin,
-                                    Math.max(from.right, to.right),
-                                    Math.max(from.bottom, to.bottom) + range.margin);
-      cm.scrollTo(sPos.scrollLeft, sPos.scrollTop);
-    }
-  }
-
-  // API UTILITIES
-
-  // Indent the given line. The how parameter can be "smart",
-  // "add"/null, "subtract", or "prev". When aggressive is false
-  // (typically set to true for forced single-line indents), empty
-  // lines are not indented, and places where the mode returns Pass
-  // are left alone.
-  function indentLine(cm, n, how, aggressive) {
-    var doc = cm.doc, state;
-    if (how == null) how = "add";
-    if (how == "smart") {
-      // Fall back to "prev" when the mode doesn't have an indentation
-      // method.
-      if (!doc.mode.indent) how = "prev";
-      else state = getStateBefore(cm, n);
-    }
-
-    var tabSize = cm.options.tabSize;
-    var line = getLine(doc, n), curSpace = countColumn(line.text, null, tabSize);
-    if (line.stateAfter) line.stateAfter = null;
-    var curSpaceString = line.text.match(/^\s*/)[0], indentation;
-    if (!aggressive && !/\S/.test(line.text)) {
-      indentation = 0;
-      how = "not";
-    } else if (how == "smart") {
-      indentation = doc.mode.indent(state, line.text.slice(curSpaceString.length), line.text);
-      if (indentation == Pass || indentation > 150) {
-        if (!aggressive) return;
-        how = "prev";
-      }
-    }
-    if (how == "prev") {
-      if (n > doc.first) indentation = countColumn(getLine(doc, n-1).text, null, tabSize);
-      else indentation = 0;
-    } else if (how == "add") {
-      indentation = curSpace + cm.options.indentUnit;
-    } else if (how == "subtract") {
-      indentation = curSpace - cm.options.indentUnit;
-    } else if (typeof how == "number") {
-      indentation = curSpace + how;
-    }
-    indentation = Math.max(0, indentation);
-
-    var indentString = "", pos = 0;
-    if (cm.options.indentWithTabs)
-      for (var i = Math.floor(indentation / tabSize); i; --i) {pos += tabSize; indentString += "\t";}
-    if (pos < indentation) indentString += spaceStr(indentation - pos);
-
-    if (indentString != curSpaceString) {
-      replaceRange(doc, indentString, Pos(n, 0), Pos(n, curSpaceString.length), "+input");
-      line.stateAfter = null;
-      return true;
-    } else {
-      // Ensure that, if the cursor was in the whitespace at the start
-      // of the line, it is moved to the end of that space.
-      for (var i = 0; i < doc.sel.ranges.length; i++) {
-        var range = doc.sel.ranges[i];
-        if (range.head.line == n && range.head.ch < curSpaceString.length) {
-          var pos = Pos(n, curSpaceString.length);
-          replaceOneSelection(doc, i, new Range(pos, pos));
-          break;
-        }
-      }
-    }
-  }
-
-  // Utility for applying a change to a line by handle or number,
-  // returning the number and optionally registering the line as
-  // changed.
-  function changeLine(doc, handle, changeType, op) {
-    var no = handle, line = handle;
-    if (typeof handle == "number") line = getLine(doc, clipLine(doc, handle));
-    else no = lineNo(handle);
-    if (no == null) return null;
-    if (op(line, no) && doc.cm) regLineChange(doc.cm, no, changeType);
-    return line;
-  }
-
-  // Helper for deleting text near the selection(s), used to implement
-  // backspace, delete, and similar functionality.
-  function deleteNearSelection(cm, compute) {
-    var ranges = cm.doc.sel.ranges, kill = [];
-    // Build up a set of ranges to kill first, merging overlapping
-    // ranges.
-    for (var i = 0; i < ranges.length; i++) {
-      var toKill = compute(ranges[i]);
-      while (kill.length && cmp(toKill.from, lst(kill).to) <= 0) {
-        var replaced = kill.pop();
-        if (cmp(replaced.from, toKill.from) < 0) {
-          toKill.from = replaced.from;
-          break;
-        }
-      }
-      kill.push(toKill);
-    }
-    // Next, remove those actual ranges.
-    runInOp(cm, function() {
-      for (var i = kill.length - 1; i >= 0; i--)
-        replaceRange(cm.doc, "", kill[i].from, kill[i].to, "+delete");
-      ensureCursorVisible(cm);
-    });
-  }
-
-  // Used for horizontal relative motion. Dir is -1 or 1 (left or
-  // right), unit can be "char", "column" (like char, but doesn't
-  // cross line boundaries), "word" (across next word), or "group" (to
-  // the start of next group of word or non-word-non-whitespace
-  // chars). The visually param controls whether, in right-to-left
-  // text, direction 1 means to move towards the next index in the
-  // string, or towards the character to the right of the current
-  // position. The resulting position will have a hitSide=true
-  // property if it reached the end of the document.
-  function findPosH(doc, pos, dir, unit, visually) {
-    var line = pos.line, ch = pos.ch, origDir = dir;
-    var lineObj = getLine(doc, line);
-    var possible = true;
-    function findNextLine() {
-      var l = line + dir;
-      if (l < doc.first || l >= doc.first + doc.size) return (possible = false);
-      line = l;
-      return lineObj = getLine(doc, l);
-    }
-    function moveOnce(boundToLine) {
-      var next = (visually ? moveVisually : moveLogically)(lineObj, ch, dir, true);
-      if (next == null) {
-        if (!boundToLine && findNextLine()) {
-          if (visually) ch = (dir < 0 ? lineRight : lineLeft)(lineObj);
-          else ch = dir < 0 ? lineObj.text.length : 0;
-        } else return (possible = false);
-      } else ch = next;
-      return true;
-    }
-
-    if (unit == "char") moveOnce();
-    else if (unit == "column") moveOnce(true);
-    else if (unit == "word" || unit == "group") {
-      var sawType = null, group = unit == "group";
-      var helper = doc.cm && doc.cm.getHelper(pos, "wordChars");
-      for (var first = true;; first = false) {
-        if (dir < 0 && !moveOnce(!first)) break;
-        var cur = lineObj.text.charAt(ch) || "\n";
-        var type = isWordChar(cur, helper) ? "w"
-          : group && cur == "\n" ? "n"
-          : !group || /\s/.test(cur) ? null
-          : "p";
-        if (group && !first && !type) type = "s";
-        if (sawType && sawType != type) {
-          if (dir < 0) {dir = 1; moveOnce();}
-          break;
-        }
-
-        if (type) sawType = type;
-        if (dir > 0 && !moveOnce(!first)) break;
-      }
-    }
-    var result = skipAtomic(doc, Pos(line, ch), origDir, true);
-    if (!possible) result.hitSide = true;
-    return result;
-  }
-
-  // For relative vertical movement. Dir may be -1 or 1. Unit can be
-  // "page" or "line". The resulting position will have a hitSide=true
-  // property if it reached the end of the document.
-  function findPosV(cm, pos, dir, unit) {
-    var doc = cm.doc, x = pos.left, y;
-    if (unit == "page") {
-      var pageSize = Math.min(cm.display.wrapper.clientHeight, window.innerHeight || document.documentElement.clientHeight);
-      y = pos.top + dir * (pageSize - (dir < 0 ? 1.5 : .5) * textHeight(cm.display));
-    } else if (unit == "line") {
-      y = dir > 0 ? pos.bottom + 3 : pos.top - 3;
-    }
-    for (;;) {
-      var target = coordsChar(cm, x, y);
-      if (!target.outside) break;
-      if (dir < 0 ? y <= 0 : y >= doc.height) { target.hitSide = true; break; }
-      y += dir * 5;
-    }
-    return target;
-  }
-
-  // EDITOR METHODS
-
-  // The publicly visible API. Note that methodOp(f) means
-  // 'wrap f in an operation, performed on its `this` parameter'.
-
-  // This is not the complete set of editor methods. Most of the
-  // methods defined on the Doc type are also injected into
-  // CodeMirror.prototype, for backwards compatibility and
-  // convenience.
-
-  CodeMirror.prototype = {
-    constructor: CodeMirror,
-    focus: function(){window.focus(); this.display.input.focus();},
-
-    setOption: function(option, value) {
-      var options = this.options, old = options[option];
-      if (options[option] == value && option != "mode") return;
-      options[option] = value;
-      if (optionHandlers.hasOwnProperty(option))
-        operation(this, optionHandlers[option])(this, value, old);
-    },
-
-    getOption: function(option) {return this.options[option];},
-    getDoc: function() {return this.doc;},
-
-    addKeyMap: function(map, bottom) {
-      this.state.keyMaps[bottom ? "push" : "unshift"](getKeyMap(map));
-    },
-    removeKeyMap: function(map) {
-      var maps = this.state.keyMaps;
-      for (var i = 0; i < maps.length; ++i)
-        if (maps[i] == map || maps[i].name == map) {
-          maps.splice(i, 1);
-          return true;
-        }
-    },
-
-    addOverlay: methodOp(function(spec, options) {
-      var mode = spec.token ? spec : CodeMirror.getMode(this.options, spec);
-      if (mode.startState) throw new Error("Overlays may not be stateful.");
-      this.state.overlays.push({mode: mode, modeSpec: spec, opaque: options && options.opaque});
-      this.state.modeGen++;
-      regChange(this);
-    }),
-    removeOverlay: methodOp(function(spec) {
-      var overlays = this.state.overlays;
-      for (var i = 0; i < overlays.length; ++i) {
-        var cur = overlays[i].modeSpec;
-        if (cur == spec || typeof spec == "string" && cur.name == spec) {
-          overlays.splice(i, 1);
-          this.state.modeGen++;
-          regChange(this);
-          return;
-        }
-      }
-    }),
-
-    indentLine: methodOp(function(n, dir, aggressive) {
-      if (typeof dir != "string" && typeof dir != "number") {
-        if (dir == null) dir = this.options.smartIndent ? "smart" : "prev";
-        else dir = dir ? "add" : "subtract";
-      }
-      if (isLine(this.doc, n)) indentLine(this, n, dir, aggressive);
-    }),
-    indentSelection: methodOp(function(how) {
-      var ranges = this.doc.sel.ranges, end = -1;
-      for (var i = 0; i < ranges.length; i++) {
-        var range = ranges[i];
-        if (!range.empty()) {
-          var from = range.from(), to = range.to();
-          var start = Math.max(end, from.line);
-          end = Math.min(this.lastLine(), to.line - (to.ch ? 0 : 1)) + 1;
-          for (var j = start; j < end; ++j)
-            indentLine(this, j, how);
-          var newRanges = this.doc.sel.ranges;
-          if (from.ch == 0 && ranges.length == newRanges.length && newRanges[i].from().ch > 0)
-            replaceOneSelection(this.doc, i, new Range(from, newRanges[i].to()), sel_dontScroll);
-        } else if (range.head.line > end) {
-          indentLine(this, range.head.line, how, true);
-          end = range.head.line;
-          if (i == this.doc.sel.primIndex) ensureCursorVisible(this);
-        }
-      }
-    }),
-
-    // Fetch the parser token for a given character. Useful for hacks
-    // that want to inspect the mode state (say, for completion).
-    getTokenAt: function(pos, precise) {
-      return takeToken(this, pos, precise);
-    },
-
-    getLineTokens: function(line, precise) {
-      return takeToken(this, Pos(line), precise, true);
-    },
-
-    getTokenTypeAt: function(pos) {
-      pos = clipPos(this.doc, pos);
-      var styles = getLineStyles(this, getLine(this.doc, pos.line));
-      var before = 0, after = (styles.length - 1) / 2, ch = pos.ch;
-      var type;
-      if (ch == 0) type = styles[2];
-      else for (;;) {
-        var mid = (before + after) >> 1;
-        if ((mid ? styles[mid * 2 - 1] : 0) >= ch) after = mid;
-        else if (styles[mid * 2 + 1] < ch) before = mid + 1;
-        else { type = styles[mid * 2 + 2]; break; }
-      }
-      var cut = type ? type.indexOf("cm-overlay ") : -1;
-      return cut < 0 ? type : cut == 0 ? null : type.slice(0, cut - 1);
-    },
-
-    getModeAt: function(pos) {
-      var mode = this.doc.mode;
-      if (!mode.innerMode) return mode;
-      return CodeMirror.innerMode(mode, this.getTokenAt(pos).state).mode;
-    },
-
-    getHelper: function(pos, type) {
-      return this.getHelpers(pos, type)[0];
-    },
-
-    getHelpers: function(pos, type) {
-      var found = [];
-      if (!helpers.hasOwnProperty(type)) return found;
-      var help = helpers[type], mode = this.getModeAt(pos);
-      if (typeof mode[type] == "string") {
-        if (help[mode[type]]) found.push(help[mode[type]]);
-      } else if (mode[type]) {
-        for (var i = 0; i < mode[type].length; i++) {
-          var val = help[mode[type][i]];
-          if (val) found.push(val);
-        }
-      } else if (mode.helperType && help[mode.helperType]) {
-        found.push(help[mode.helperType]);
-      } else if (help[mode.name]) {
-        found.push(help[mode.name]);
-      }
-      for (var i = 0; i < help._global.length; i++) {
-        var cur = help._global[i];
-        if (cur.pred(mode, this) && indexOf(found, cur.val) == -1)
-          found.push(cur.val);
-      }
-      return found;
-    },
-
-    getStateAfter: function(line, precise) {
-      var doc = this.doc;
-      line = clipLine(doc, line == null ? doc.first + doc.size - 1: line);
-      return getStateBefore(this, line + 1, precise);
-    },
-
-    cursorCoords: function(start, mode) {
-      var pos, range = this.doc.sel.primary();
-      if (start == null) pos = range.head;
-      else if (typeof start == "object") pos = clipPos(this.doc, start);
-      else pos = start ? range.from() : range.to();
-      return cursorCoords(this, pos, mode || "page");
-    },
-
-    charCoords: function(pos, mode) {
-      return charCoords(this, clipPos(this.doc, pos), mode || "page");
-    },
-
-    coordsChar: function(coords, mode) {
-      coords = fromCoordSystem(this, coords, mode || "page");
-      return coordsChar(this, coords.left, coords.top);
-    },
-
-    lineAtHeight: function(height, mode) {
-      height = fromCoordSystem(this, {top: height, left: 0}, mode || "page").top;
-      return lineAtHeight(this.doc, height + this.display.viewOffset);
-    },
-    heightAtLine: function(line, mode) {
-      var end = false, lineObj;
-      if (typeof line == "number") {
-        var last = this.doc.first + this.doc.size - 1;
-        if (line < this.doc.first) line = this.doc.first;
-        else if (line > last) { line = last; end = true; }
-        lineObj = getLine(this.doc, line);
-      } else {
-        lineObj = line;
-      }
-      return intoCoordSystem(this, lineObj, {top: 0, left: 0}, mode || "page").top +
-        (end ? this.doc.height - heightAtLine(lineObj) : 0);
-    },
-
-    defaultTextHeight: function() { return textHeight(this.display); },
-    defaultCharWidth: function() { return charWidth(this.display); },
-
-    setGutterMarker: methodOp(function(line, gutterID, value) {
-      return changeLine(this.doc, line, "gutter", function(line) {
-        var markers = line.gutterMarkers || (line.gutterMarkers = {});
-        markers[gutterID] = value;
-        if (!value && isEmpty(markers)) line.gutterMarkers = null;
-        return true;
-      });
-    }),
-
-    clearGutter: methodOp(function(gutterID) {
-      var cm = this, doc = cm.doc, i = doc.first;
-      doc.iter(function(line) {
-        if (line.gutterMarkers && line.gutterMarkers[gutterID]) {
-          line.gutterMarkers[gutterID] = null;
-          regLineChange(cm, i, "gutter");
-          if (isEmpty(line.gutterMarkers)) line.gutterMarkers = null;
-        }
-        ++i;
-      });
-    }),
-
-    lineInfo: function(line) {
-      if (typeof line == "number") {
-        if (!isLine(this.doc, line)) return null;
-        var n = line;
-        line = getLine(this.doc, line);
-        if (!line) return null;
-      } else {
-        var n = lineNo(line);
-        if (n == null) return null;
-      }
-      return {line: n, handle: line, text: line.text, gutterMarkers: line.gutterMarkers,
-              textClass: line.textClass, bgClass: line.bgClass, wrapClass: line.wrapClass,
-              widgets: line.widgets};
-    },
-
-    getViewport: function() { return {from: this.display.viewFrom, to: this.display.viewTo};},
-
-    addWidget: function(pos, node, scroll, vert, horiz) {
-      var display = this.display;
-      pos = cursorCoords(this, clipPos(this.doc, pos));
-      var top = pos.bottom, left = pos.left;
-      node.style.position = "absolute";
-      node.setAttribute("cm-ignore-events", "true");
-      this.display.input.setUneditable(node);
-      display.sizer.appendChild(node);
-      if (vert == "over") {
-        top = pos.top;
-      } else if (vert == "above" || vert == "near") {
-        var vspace = Math.max(display.wrapper.clientHeight, this.doc.height),
-        hspace = Math.max(display.sizer.clientWidth, display.lineSpace.clientWidth);
-        // Default to positioning above (if specified and possible); otherwise default to positioning below
-        if ((vert == 'above' || pos.bottom + node.offsetHeight > vspace) && pos.top > node.offsetHeight)
-          top = pos.top - node.offsetHeight;
-        else if (pos.bottom + node.offsetHeight <= vspace)
-          top = pos.bottom;
-        if (left + node.offsetWidth > hspace)
-          left = hspace - node.offsetWidth;
-      }
-      node.style.top = top + "px";
-      node.style.left = node.style.right = "";
-      if (horiz == "right") {
-        left = display.sizer.clientWidth - node.offsetWidth;
-        node.style.right = "0px";
-      } else {
-        if (horiz == "left") left = 0;
-        else if (horiz == "middle") left = (display.sizer.clientWidth - node.offsetWidth) / 2;
-        node.style.left = left + "px";
-      }
-      if (scroll)
-        scrollIntoView(this, left, top, left + node.offsetWidth, top + node.offsetHeight);
-    },
-
-    triggerOnKeyDown: methodOp(onKeyDown),
-    triggerOnKeyPress: methodOp(onKeyPress),
-    triggerOnKeyUp: onKeyUp,
-
-    execCommand: function(cmd) {
-      if (commands.hasOwnProperty(cmd))
-        return commands[cmd](this);
-    },
-
-    triggerElectric: methodOp(function(text) { triggerElectric(this, text); }),
-
-    findPosH: function(from, amount, unit, visually) {
-      var dir = 1;
-      if (amount < 0) { dir = -1; amount = -amount; }
-      for (var i = 0, cur = clipPos(this.doc, from); i < amount; ++i) {
-        cur = findPosH(this.doc, cur, dir, unit, visually);
-        if (cur.hitSide) break;
-      }
-      return cur;
-    },
-
-    moveH: methodOp(function(dir, unit) {
-      var cm = this;
-      cm.extendSelectionsBy(function(range) {
-        if (cm.display.shift || cm.doc.extend || range.empty())
-          return findPosH(cm.doc, range.head, dir, unit, cm.options.rtlMoveVisually);
-        else
-          return dir < 0 ? range.from() : range.to();
-      }, sel_move);
-    }),
-
-    deleteH: methodOp(function(dir, unit) {
-      var sel = this.doc.sel, doc = this.doc;
-      if (sel.somethingSelected())
-        doc.replaceSelection("", null, "+delete");
-      else
-        deleteNearSelection(this, function(range) {
-          var other = findPosH(doc, range.head, dir, unit, false);
-          return dir < 0 ? {from: other, to: range.head} : {from: range.head, to: other};
-        });
-    }),
-
-    findPosV: function(from, amount, unit, goalColumn) {
-      var dir = 1, x = goalColumn;
-      if (amount < 0) { dir = -1; amount = -amount; }
-      for (var i = 0, cur = clipPos(this.doc, from); i < amount; ++i) {
-        var coords = cursorCoords(this, cur, "div");
-        if (x == null) x = coords.left;
-        else coords.left = x;
-        cur = findPosV(this, coords, dir, unit);
-        if (cur.hitSide) break;
-      }
-      return cur;
-    },
-
-    moveV: methodOp(function(dir, unit) {
-      var cm = this, doc = this.doc, goals = [];
-      var collapse = !cm.display.shift && !doc.extend && doc.sel.somethingSelected();
-      doc.extendSelectionsBy(function(range) {
-        if (collapse)
-          return dir < 0 ? range.from() : range.to();
-        var headPos = cursorCoords(cm, range.head, "div");
-        if (range.goalColumn != null) headPos.left = range.goalColumn;
-        goals.push(headPos.left);
-        var pos = findPosV(cm, headPos, dir, unit);
-        if (unit == "page" && range == doc.sel.primary())
-          addToScrollPos(cm, null, charCoords(cm, pos, "div").top - headPos.top);
-        return pos;
-      }, sel_move);
-      if (goals.length) for (var i = 0; i < doc.sel.ranges.length; i++)
-        doc.sel.ranges[i].goalColumn = goals[i];
-    }),
-
-    // Find the word at the given position (as returned by coordsChar).
-    findWordAt: function(pos) {
-      var doc = this.doc, line = getLine(doc, pos.line).text;
-      var start = pos.ch, end = pos.ch;
-      if (line) {
-        var helper = this.getHelper(pos, "wordChars");
-        if ((pos.xRel < 0 || end == line.length) && start) --start; else ++end;
-        var startChar = line.charAt(start);
-        var check = isWordChar(startChar, helper)
-          ? function(ch) { return isWordChar(ch, helper); }
-          : /\s/.test(startChar) ? function(ch) {return /\s/.test(ch);}
-          : function(ch) {return !/\s/.test(ch) && !isWordChar(ch);};
-        while (start > 0 && check(line.charAt(start - 1))) --start;
-        while (end < line.length && check(line.charAt(end))) ++end;
-      }
-      return new Range(Pos(pos.line, start), Pos(pos.line, end));
-    },
-
-    toggleOverwrite: function(value) {
-      if (value != null && value == this.state.overwrite) return;
-      if (this.state.overwrite = !this.state.overwrite)
-        addClass(this.display.cursorDiv, "CodeMirror-overwrite");
-      else
-        rmClass(this.display.cursorDiv, "CodeMirror-overwrite");
-
-      signal(this, "overwriteToggle", this, this.state.overwrite);
-    },
-    hasFocus: function() { return this.display.input.getField() == activeElt(); },
-
-    scrollTo: methodOp(function(x, y) {
-      if (x != null || y != null) resolveScrollToPos(this);
-      if (x != null) this.curOp.scrollLeft = x;
-      if (y != null) this.curOp.scrollTop = y;
-    }),
-    getScrollInfo: function() {
-      var scroller = this.display.scroller;
-      return {left: scroller.scrollLeft, top: scroller.scrollTop,
-              height: scroller.scrollHeight - scrollGap(this) - this.display.barHeight,
-              width: scroller.scrollWidth - scrollGap(this) - this.display.barWidth,
-              clientHeight: displayHeight(this), clientWidth: displayWidth(this)};
-    },
-
-    scrollIntoView: methodOp(function(range, margin) {
-      if (range == null) {
-        range = {from: this.doc.sel.primary().head, to: null};
-        if (margin == null) margin = this.options.cursorScrollMargin;
-      } else if (typeof range == "number") {
-        range = {from: Pos(range, 0), to: null};
-      } else if (range.from == null) {
-        range = {from: range, to: null};
-      }
-      if (!range.to) range.to = range.from;
-      range.margin = margin || 0;
-
-      if (range.from.line != null) {
-        resolveScrollToPos(this);
-        this.curOp.scrollToPos = range;
-      } else {
-        var sPos = calculateScrollPos(this, Math.min(range.from.left, range.to.left),
-                                      Math.min(range.from.top, range.to.top) - range.margin,
-                                      Math.max(range.from.right, range.to.right),
-                                      Math.max(range.from.bottom, range.to.bottom) + range.margin);
-        this.scrollTo(sPos.scrollLeft, sPos.scrollTop);
-      }
-    }),
-
-    setSize: methodOp(function(width, height) {
-      var cm = this;
-      function interpret(val) {
-        return typeof val == "number" || /^\d+$/.test(String(val)) ? val + "px" : val;
-      }
-      if (width != null) cm.display.wrapper.style.width = interpret(width);
-      if (height != null) cm.display.wrapper.style.height = interpret(height);
-      if (cm.options.lineWrapping) clearLineMeasurementCache(this);
-      var lineNo = cm.display.viewFrom;
-      cm.doc.iter(lineNo, cm.display.viewTo, function(line) {
-        if (line.widgets) for (var i = 0; i < line.widgets.length; i++)
-          if (line.widgets[i].noHScroll) { regLineChange(cm, lineNo, "widget"); break; }
-        ++lineNo;
-      });
-      cm.curOp.forceUpdate = true;
-      signal(cm, "refresh", this);
-    }),
-
-    operation: function(f){return runInOp(this, f);},
-
-    refresh: methodOp(function() {
-      var oldHeight = this.display.cachedTextHeight;
-      regChange(this);
-      this.curOp.forceUpdate = true;
-      clearCaches(this);
-      this.scrollTo(this.doc.scrollLeft, this.doc.scrollTop);
-      updateGutterSpace(this);
-      if (oldHeight == null || Math.abs(oldHeight - textHeight(this.display)) > .5)
-        estimateLineHeights(this);
-      signal(this, "refresh", this);
-    }),
-
-    swapDoc: methodOp(function(doc) {
-      var old = this.doc;
-      old.cm = null;
-      attachDoc(this, doc);
-      clearCaches(this);
-      this.display.input.reset();
-      this.scrollTo(doc.scrollLeft, doc.scrollTop);
-      this.curOp.forceScroll = true;
-      signalLater(this, "swapDoc", this, old);
-      return old;
-    }),
-
-    getInputField: function(){return this.display.input.getField();},
-    getWrapperElement: function(){return this.display.wrapper;},
-    getScrollerElement: function(){return this.display.scroller;},
-    getGutterElement: function(){return this.display.gutters;}
-  };
-  eventMixin(CodeMirror);
-
-  // OPTION DEFAULTS
-
-  // The default configuration options.
-  var defaults = CodeMirror.defaults = {};
-  // Functions to run when options are changed.
-  var optionHandlers = CodeMirror.optionHandlers = {};
-
-  function option(name, deflt, handle, notOnInit) {
-    CodeMirror.defaults[name] = deflt;
-    if (handle) optionHandlers[name] =
-      notOnInit ? function(cm, val, old) {if (old != Init) handle(cm, val, old);} : handle;
-  }
-
-  // Passed to option handlers when there is no old value.
-  var Init = CodeMirror.Init = {toString: function(){return "CodeMirror.Init";}};
-
-  // These two are, on init, called from the constructor because they
-  // have to be initialized before the editor can start at all.
-  option("value", "", function(cm, val) {
-    cm.setValue(val);
-  }, true);
-  option("mode", null, function(cm, val) {
-    cm.doc.modeOption = val;
-    loadMode(cm);
-  }, true);
-
-  option("indentUnit", 2, loadMode, true);
-  option("indentWithTabs", false);
-  option("smartIndent", true);
-  option("tabSize", 4, function(cm) {
-    resetModeState(cm);
-    clearCaches(cm);
-    regChange(cm);
-  }, true);
-  option("specialChars", /[\t\u0000-\u0019\u00ad\u200b-\u200f\u2028\u2029\ufeff]/g, function(cm, val, old) {
-    cm.state.specialChars = new RegExp(val.source + (val.test("\t") ? "" : "|\t"), "g");
-    if (old != CodeMirror.Init) cm.refresh();
-  });
-  option("specialCharPlaceholder", defaultSpecialCharPlaceholder, function(cm) {cm.refresh();}, true);
-  option("electricChars", true);
-  option("inputStyle", mobile ? "contenteditable" : "textarea", function() {
-    throw new Error("inputStyle can not (yet) be changed in a running editor"); // FIXME
-  }, true);
-  option("rtlMoveVisually", !windows);
-  option("wholeLineUpdateBefore", true);
-
-  option("theme", "default", function(cm) {
-    themeChanged(cm);
-    guttersChanged(cm);
-  }, true);
-  option("keyMap", "default", function(cm, val, old) {
-    var next = getKeyMap(val);
-    var prev = old != CodeMirror.Init && getKeyMap(old);
-    if (prev && prev.detach) prev.detach(cm, next);
-    if (next.attach) next.attach(cm, prev || null);
-  });
-  option("extraKeys", null);
-
-  option("lineWrapping", false, wrappingChanged, true);
-  option("gutters", [], function(cm) {
-    setGuttersForLineNumbers(cm.options);
-    guttersChanged(cm);
-  }, true);
-  option("fixedGutter", true, function(cm, val) {
-    cm.display.gutters.style.left = val ? compensateForHScroll(cm.display) + "px" : "0";
-    cm.refresh();
-  }, true);
-  option("coverGutterNextToScrollbar", false, function(cm) {updateScrollbars(cm);}, true);
-  option("scrollbarStyle", "native", function(cm) {
-    initScrollbars(cm);
-    updateScrollbars(cm);
-    cm.display.scrollbars.setScrollTop(cm.doc.scrollTop);
-    cm.display.scrollbars.setScrollLeft(cm.doc.scrollLeft);
-  }, true);
-  option("lineNumbers", false, function(cm) {
-    setGuttersForLineNumbers(cm.options);
-    guttersChanged(cm);
-  }, true);
-  option("firstLineNumber", 1, guttersChanged, true);
-  option("lineNumberFormatter", function(integer) {return integer;}, guttersChanged, true);
-  option("showCursorWhenSelecting", false, updateSelection, true);
-
-  option("resetSelectionOnContextMenu", true);
-  option("lineWiseCopyCut", true);
-
-  option("readOnly", false, function(cm, val) {
-    if (val == "nocursor") {
-      onBlur(cm);
-      cm.display.input.blur();
-      cm.display.disabled = true;
-    } else {
-      cm.display.disabled = false;
-      if (!val) cm.display.input.reset();
-    }
-  });
-  option("disableInput", false, function(cm, val) {if (!val) cm.display.input.reset();}, true);
-  option("dragDrop", true, dragDropChanged);
-
-  option("cursorBlinkRate", 530);
-  option("cursorScrollMargin", 0);
-  option("cursorHeight", 1, updateSelection, true);
-  option("singleCursorHeightPerLine", true, updateSelection, true);
-  option("workTime", 100);
-  option("workDelay", 100);
-  option("flattenSpans", true, resetModeState, true);
-  option("addModeClass", false, resetModeState, true);
-  option("pollInterval", 100);
-  option("undoDepth", 200, function(cm, val){cm.doc.history.undoDepth = val;});
-  option("historyEventDelay", 1250);
-  option("viewportMargin", 10, function(cm){cm.refresh();}, true);
-  option("maxHighlightLength", 10000, resetModeState, true);
-  option("moveInputWithCursor", true, function(cm, val) {
-    if (!val) cm.display.input.resetPosition();
-  });
-
-  option("tabindex", null, function(cm, val) {
-    cm.display.input.getField().tabIndex = val || "";
-  });
-  option("autofocus", null);
-
-  // MODE DEFINITION AND QUERYING
-
-  // Known modes, by name and by MIME
-  var modes = CodeMirror.modes = {}, mimeModes = CodeMirror.mimeModes = {};
-
-  // Extra arguments are stored as the mode's dependencies, which is
-  // used by (legacy) mechanisms like loadmode.js to automatically
-  // load a mode. (Preferred mechanism is the require/define calls.)
-  CodeMirror.defineMode = function(name, mode) {
-    if (!CodeMirror.defaults.mode && name != "null") CodeMirror.defaults.mode = name;
-    if (arguments.length > 2)
-      mode.dependencies = Array.prototype.slice.call(arguments, 2);
-    modes[name] = mode;
-  };
-
-  CodeMirror.defineMIME = function(mime, spec) {
-    mimeModes[mime] = spec;
-  };
-
-  // Given a MIME type, a {name, ...options} config object, or a name
-  // string, return a mode config object.
-  CodeMirror.resolveMode = function(spec) {
-    if (typeof spec == "string" && mimeModes.hasOwnProperty(spec)) {
-      spec = mimeModes[spec];
-    } else if (spec && typeof spec.name == "string" && mimeModes.hasOwnProperty(spec.name)) {
-      var found = mimeModes[spec.name];
-      if (typeof found == "string") found = {name: found};
-      spec = createObj(found, spec);
-      spec.name = found.name;
-    } else if (typeof spec == "string" && /^[\w\-]+\/[\w\-]+\+xml$/.test(spec)) {
-      return CodeMirror.resolveMode("application/xml");
-    }
-    if (typeof spec == "string") return {name: spec};
-    else return spec || {name: "null"};
-  };
-
-  // Given a mode spec (anything that resolveMode accepts), find and
-  // initialize an actual mode object.
-  CodeMirror.getMode = function(options, spec) {
-    var spec = CodeMirror.resolveMode(spec);
-    var mfactory = modes[spec.name];
-    if (!mfactory) return CodeMirror.getMode(options, "text/plain");
-    var modeObj = mfactory(options, spec);
-    if (modeExtensions.hasOwnProperty(spec.name)) {
-      var exts = modeExtensions[spec.name];
-      for (var prop in exts) {
-        if (!exts.hasOwnProperty(prop)) continue;
-        if (modeObj.hasOwnProperty(prop)) modeObj["_" + prop] = modeObj[prop];
-        modeObj[prop] = exts[prop];
-      }
-    }
-    modeObj.name = spec.name;
-    if (spec.helperType) modeObj.helperType = spec.helperType;
-    if (spec.modeProps) for (var prop in spec.modeProps)
-      modeObj[prop] = spec.modeProps[prop];
-
-    return modeObj;
-  };
-
-  // Minimal default mode.
-  CodeMirror.defineMode("null", function() {
-    return {token: function(stream) {stream.skipToEnd();}};
-  });
-  CodeMirror.defineMIME("text/plain", "null");
-
-  // This can be used to attach properties to mode objects from
-  // outside the actual mode definition.
-  var modeExtensions = CodeMirror.modeExtensions = {};
-  CodeMirror.extendMode = function(mode, properties) {
-    var exts = modeExtensions.hasOwnProperty(mode) ? modeExtensions[mode] : (modeExtensions[mode] = {});
-    copyObj(properties, exts);
-  };
-
-  // EXTENSIONS
-
-  CodeMirror.defineExtension = function(name, func) {
-    CodeMirror.prototype[name] = func;
-  };
-  CodeMirror.defineDocExtension = function(name, func) {
-    Doc.prototype[name] = func;
-  };
-  CodeMirror.defineOption = option;
-
-  var initHooks = [];
-  CodeMirror.defineInitHook = function(f) {initHooks.push(f);};
-
-  var helpers = CodeMirror.helpers = {};
-  CodeMirror.registerHelper = function(type, name, value) {
-    if (!helpers.hasOwnProperty(type)) helpers[type] = CodeMirror[type] = {_global: []};
-    helpers[type][name] = value;
-  };
-  CodeMirror.registerGlobalHelper = function(type, name, predicate, value) {
-    CodeMirror.registerHelper(type, name, value);
-    helpers[type]._global.push({pred: predicate, val: value});
-  };
-
-  // MODE STATE HANDLING
-
-  // Utility functions for working with state. Exported because nested
-  // modes need to do this for their inner modes.
-
-  var copyState = CodeMirror.copyState = function(mode, state) {
-    if (state === true) return state;
-    if (mode.copyState) return mode.copyState(state);
-    var nstate = {};
-    for (var n in state) {
-      var val = state[n];
-      if (val instanceof Array) val = val.concat([]);
-      nstate[n] = val;
-    }
-    return nstate;
-  };
-
-  var startState = CodeMirror.startState = function(mode, a1, a2) {
-    return mode.startState ? mode.startState(a1, a2) : true;
-  };
-
-  // Given a mode and a state (for that mode), find the inner mode and
-  // state at the position that the state refers to.
-  CodeMirror.innerMode = function(mode, state) {
-    while (mode.innerMode) {
-      var info = mode.innerMode(state);
-      if (!info || info.mode == mode) break;
-      state = info.state;
-      mode = info.mode;
-    }
-    return info || {mode: mode, state: state};
-  };
-
-  // STANDARD COMMANDS
-
-  // Commands are parameter-less actions that can be performed on an
-  // editor, mostly used for keybindings.
-  var commands = CodeMirror.commands = {
-    selectAll: function(cm) {cm.setSelection(Pos(cm.firstLine(), 0), Pos(cm.lastLine()), sel_dontScroll);},
-    singleSelection: function(cm) {
-      cm.setSelection(cm.getCursor("anchor"), cm.getCursor("head"), sel_dontScroll);
-    },
-    killLine: function(cm) {
-      deleteNearSelection(cm, function(range) {
-        if (range.empty()) {
-          var len = getLine(cm.doc, range.head.line).text.length;
-          if (range.head.ch == len && range.head.line < cm.lastLine())
-            return {from: range.head, to: Pos(range.head.line + 1, 0)};
-          else
-            return {from: range.head, to: Pos(range.head.line, len)};
-        } else {
-          return {from: range.from(), to: range.to()};
-        }
-      });
-    },
-    deleteLine: function(cm) {
-      deleteNearSelection(cm, function(range) {
-        return {from: Pos(range.from().line, 0),
-                to: clipPos(cm.doc, Pos(range.to().line + 1, 0))};
-      });
-    },
-    delLineLeft: function(cm) {
-      deleteNearSelection(cm, function(range) {
-        return {from: Pos(range.from().line, 0), to: range.from()};
-      });
-    },
-    delWrappedLineLeft: function(cm) {
-      deleteNearSelection(cm, function(range) {
-        var top = cm.charCoords(range.head, "div").top + 5;
-        var leftPos = cm.coordsChar({left: 0, top: top}, "div");
-        return {from: leftPos, to: range.from()};
-      });
-    },
-    delWrappedLineRight: function(cm) {
-      deleteNearSelection(cm, function(range) {
-        var top = cm.charCoords(range.head, "div").top + 5;
-        var rightPos = cm.coordsChar({left: cm.display.lineDiv.offsetWidth + 100, top: top}, "div");
-        return {from: range.from(), to: rightPos };
-      });
-    },
-    undo: function(cm) {cm.undo();},
-    redo: function(cm) {cm.redo();},
-    undoSelection: function(cm) {cm.undoSelection();},
-    redoSelection: function(cm) {cm.redoSelection();},
-    goDocStart: function(cm) {cm.extendSelection(Pos(cm.firstLine(), 0));},
-    goDocEnd: function(cm) {cm.extendSelection(Pos(cm.lastLine()));},
-    goLineStart: function(cm) {
-      cm.extendSelectionsBy(function(range) { return lineStart(cm, range.head.line); },
-                            {origin: "+move", bias: 1});
-    },
-    goLineStartSmart: function(cm) {
-      cm.extendSelectionsBy(function(range) {
-        return lineStartSmart(cm, range.head);
-      }, {origin: "+move", bias: 1});
-    },
-    goLineEnd: function(cm) {
-      cm.extendSelectionsBy(function(range) { return lineEnd(cm, range.head.line); },
-                            {origin: "+move", bias: -1});
-    },
-    goLineRight: function(cm) {
-      cm.extendSelectionsBy(function(range) {
-        var top = cm.charCoords(range.head, "div").top + 5;
-        return cm.coordsChar({left: cm.display.lineDiv.offsetWidth + 100, top: top}, "div");
-      }, sel_move);
-    },
-    goLineLeft: function(cm) {
-      cm.extendSelectionsBy(function(range) {
-        var top = cm.charCoords(range.head, "div").top + 5;
-        return cm.coordsChar({left: 0, top: top}, "div");
-      }, sel_move);
-    },
-    goLineLeftSmart: function(cm) {
-      cm.extendSelectionsBy(function(range) {
-        var top = cm.charCoords(range.head, "div").top + 5;
-        var pos = cm.coordsChar({left: 0, top: top}, "div");
-        if (pos.ch < cm.getLine(pos.line).search(/\S/)) return lineStartSmart(cm, range.head);
-        return pos;
-      }, sel_move);
-    },
-    goLineUp: function(cm) {cm.moveV(-1, "line");},
-    goLineDown: function(cm) {cm.moveV(1, "line");},
-    goPageUp: function(cm) {cm.moveV(-1, "page");},
-    goPageDown: function(cm) {cm.moveV(1, "page");},
-    goCharLeft: function(cm) {cm.moveH(-1, "char");},
-    goCharRight: function(cm) {cm.moveH(1, "char");},
-    goColumnLeft: function(cm) {cm.moveH(-1, "column");},
-    goColumnRight: function(cm) {cm.moveH(1, "column");},
-    goWordLeft: function(cm) {cm.moveH(-1, "word");},
-    goGroupRight: function(cm) {cm.moveH(1, "group");},
-    goGroupLeft: function(cm) {cm.moveH(-1, "group");},
-    goWordRight: function(cm) {cm.moveH(1, "word");},
-    delCharBefore: function(cm) {cm.deleteH(-1, "char");},
-    delCharAfter: function(cm) {cm.deleteH(1, "char");},
-    delWordBefore: function(cm) {cm.deleteH(-1, "word");},
-    delWordAfter: function(cm) {cm.deleteH(1, "word");},
-    delGroupBefore: function(cm) {cm.deleteH(-1, "group");},
-    delGroupAfter: function(cm) {cm.deleteH(1, "group");},
-    indentAuto: function(cm) {cm.indentSelection("smart");},
-    indentMore: function(cm) {cm.indentSelection("add");},
-    indentLess: function(cm) {cm.indentSelection("subtract");},
-    insertTab: function(cm) {cm.replaceSelection("\t");},
-    insertSoftTab: function(cm) {
-      var spaces = [], ranges = cm.listSelections(), tabSize = cm.options.tabSize;
-      for (var i = 0; i < ranges.length; i++) {
-        var pos = ranges[i].from();
-        var col = countColumn(cm.getLine(pos.line), pos.ch, tabSize);
-        spaces.push(new Array(tabSize - col % tabSize + 1).join(" "));
-      }
-      cm.replaceSelections(spaces);
-    },
-    defaultTab: function(cm) {
-      if (cm.somethingSelected()) cm.indentSelection("add");
-      else cm.execCommand("insertTab");
-    },
-    transposeChars: function(cm) {
-      runInOp(cm, function() {
-        var ranges = cm.listSelections(), newSel = [];
-        for (var i = 0; i < ranges.length; i++) {
-          var cur = ranges[i].head, line = getLine(cm.doc, cur.line).text;
-          if (line) {
-            if (cur.ch == line.length) cur = new Pos(cur.line, cur.ch - 1);
-            if (cur.ch > 0) {
-              cur = new Pos(cur.line, cur.ch + 1);
-              cm.replaceRange(line.charAt(cur.ch - 1) + line.charAt(cur.ch - 2),
-                              Pos(cur.line, cur.ch - 2), cur, "+transpose");
-            } else if (cur.line > cm.doc.first) {
-              var prev = getLine(cm.doc, cur.line - 1).text;
-              if (prev)
-                cm.replaceRange(line.charAt(0) + "\n" + prev.charAt(prev.length - 1),
-                                Pos(cur.line - 1, prev.length - 1), Pos(cur.line, 1), "+transpose");
-            }
-          }
-          newSel.push(new Range(cur, cur));
-        }
-        cm.setSelections(newSel);
-      });
-    },
-    newlineAndIndent: function(cm) {
-      runInOp(cm, function() {
-        var len = cm.listSelections().length;
-        for (var i = 0; i < len; i++) {
-          var range = cm.listSelections()[i];
-          cm.replaceRange("\n", range.anchor, range.head, "+input");
-          cm.indentLine(range.from().line + 1, null, true);
-          ensureCursorVisible(cm);
-        }
-      });
-    },
-    toggleOverwrite: function(cm) {cm.toggleOverwrite();}
-  };
-
-
-  // STANDARD KEYMAPS
-
-  var keyMap = CodeMirror.keyMap = {};
-
-  keyMap.basic = {
-    "Left": "goCharLeft", "Right": "goCharRight", "Up": "goLineUp", "Down": "goLineDown",
-    "End": "goLineEnd", "Home": "goLineStartSmart", "PageUp": "goPageUp", "PageDown": "goPageDown",
-    "Delete": "delCharAfter", "Backspace": "delCharBefore", "Shift-Backspace": "delCharBefore",
-    "Tab": "defaultTab", "Shift-Tab": "indentAuto",
-    "Enter": "newlineAndIndent", "Insert": "toggleOverwrite",
-    "Esc": "singleSelection"
-  };
-  // Note that the save and find-related commands aren't defined by
-  // default. User code or addons can define them. Unknown commands
-  // are simply ignored.
-  keyMap.pcDefault = {
-    "Ctrl-A": "selectAll", "Ctrl-D": "deleteLine", "Ctrl-Z": "undo", "Shift-Ctrl-Z": "redo", "Ctrl-Y": "redo",
-    "Ctrl-Home": "goDocStart", "Ctrl-End": "goDocEnd", "Ctrl-Up": "goLineUp", "Ctrl-Down": "goLineDown",
-    "Ctrl-Left": "goGroupLeft", "Ctrl-Right": "goGroupRight", "Alt-Left": "goLineStart", "Alt-Right": "goLineEnd",
-    "Ctrl-Backspace": "delGroupBefore", "Ctrl-Delete": "delGroupAfter", "Ctrl-S": "save", "Ctrl-F": "find",
-    "Ctrl-G": "findNext", "Shift-Ctrl-G": "findPrev", "Shift-Ctrl-F": "replace", "Shift-Ctrl-R": "replaceAll",
-    "Ctrl-[": "indentLess", "Ctrl-]": "indentMore",
-    "Ctrl-U": "undoSelection", "Shift-Ctrl-U": "redoSelection", "Alt-U": "redoSelection",
-    fallthrough: "basic"
-  };
-  // Very basic readline/emacs-style bindings, which are standard on Mac.
-  keyMap.emacsy = {
-    "Ctrl-F": "goCharRight", "Ctrl-B": "goCharLeft", "Ctrl-P": "goLineUp", "Ctrl-N": "goLineDown",
-    "Alt-F": "goWordRight", "Alt-B": "goWordLeft", "Ctrl-A": "goLineStart", "Ctrl-E": "goLineEnd",
-    "Ctrl-V": "goPageDown", "Shift-Ctrl-V": "goPageUp", "Ctrl-D": "delCharAfter", "Ctrl-H": "delCharBefore",
-    "Alt-D": "delWordAfter", "Alt-Backspace": "delWordBefore", "Ctrl-K": "killLine", "Ctrl-T": "transposeChars"
-  };
-  keyMap.macDefault = {
-    "Cmd-A": "selectAll", "Cmd-D": "deleteLine", "Cmd-Z": "undo", "Shift-Cmd-Z": "redo", "Cmd-Y": "redo",
-    "Cmd-Home": "goDocStart", "Cmd-Up": "goDocStart", "Cmd-End": "goDocEnd", "Cmd-Down": "goDocEnd", "Alt-Left": "goGroupLeft",
-    "Alt-Right": "goGroupRight", "Cmd-Left": "goLineLeft", "Cmd-Right": "goLineRight", "Alt-Backspace": "delGroupBefore",
-    "Ctrl-Alt-Backspace": "delGroupAfter", "Alt-Delete": "delGroupAfter", "Cmd-S": "save", "Cmd-F": "find",
-    "Cmd-G": "findNext", "Shift-Cmd-G": "findPrev", "Cmd-Alt-F": "replace", "Shift-Cmd-Alt-F": "replaceAll",
-    "Cmd-[": "indentLess", "Cmd-]": "indentMore", "Cmd-Backspace": "delWrappedLineLeft", "Cmd-Delete": "delWrappedLineRight",
-    "Cmd-U": "undoSelection", "Shift-Cmd-U": "redoSelection", "Ctrl-Up": "goDocStart", "Ctrl-Down": "goDocEnd",
-    fallthrough: ["basic", "emacsy"]
-  };
-  keyMap["default"] = mac ? keyMap.macDefault : keyMap.pcDefault;
-
-  // KEYMAP DISPATCH
-
-  function normalizeKeyName(name) {
-    var parts = name.split(/-(?!$)/), name = parts[parts.length - 1];
-    var alt, ctrl, shift, cmd;
-    for (var i = 0; i < parts.length - 1; i++) {
-      var mod = parts[i];
-      if (/^(cmd|meta|m)$/i.test(mod)) cmd = true;
-      else if (/^a(lt)?$/i.test(mod)) alt = true;
-      else if (/^(c|ctrl|control)$/i.test(mod)) ctrl = true;
-      else if (/^s(hift)$/i.test(mod)) shift = true;
-      else throw new Error("Unrecognized modifier name: " + mod);
-    }
-    if (alt) name = "Alt-" + name;
-    if (ctrl) name = "Ctrl-" + name;
-    if (cmd) name = "Cmd-" + name;
-    if (shift) name = "Shift-" + name;
-    return name;
-  }
-
-  // This is a kludge to keep keymaps mostly working as raw objects
-  // (backwards compatibility) while at the same time support features
-  // like normalization and multi-stroke key bindings. It compiles a
-  // new normalized keymap, and then updates the old object to reflect
-  // this.
-  CodeMirror.normalizeKeyMap = function(keymap) {
-    var copy = {};
-    for (var keyname in keymap) if (keymap.hasOwnProperty(keyname)) {
-      var value = keymap[keyname];
-      if (/^(name|fallthrough|(de|at)tach)$/.test(keyname)) continue;
-      if (value == "...") { delete keymap[keyname]; continue; }
-
-      var keys = map(keyname.split(" "), normalizeKeyName);
-      for (var i = 0; i < keys.length; i++) {
-        var val, name;
-        if (i == keys.length - 1) {
-          name = keys.join(" ");
-          val = value;
-        } else {
-          name = keys.slice(0, i + 1).join(" ");
-          val = "...";
-        }
-        var prev = copy[name];
-        if (!prev) copy[name] = val;
-        else if (prev != val) throw new Error("Inconsistent bindings for " + name);
-      }
-      delete keymap[keyname];
-    }
-    for (var prop in copy) keymap[prop] = copy[prop];
-    return keymap;
-  };
-
-  var lookupKey = CodeMirror.lookupKey = function(key, map, handle, context) {
-    map = getKeyMap(map);
-    var found = map.call ? map.call(key, context) : map[key];
-    if (found === false) return "nothing";
-    if (found === "...") return "multi";
-    if (found != null && handle(found)) return "handled";
-
-    if (map.fallthrough) {
-      if (Object.prototype.toString.call(map.fallthrough) != "[object Array]")
-        return lookupKey(key, map.fallthrough, handle, context);
-      for (var i = 0; i < map.fallthrough.length; i++) {
-        var result = lookupKey(key, map.fallthrough[i], handle, context);
-        if (result) return result;
-      }
-    }
-  };
-
-  // Modifier key presses don't count as 'real' key presses for the
-  // purpose of keymap fallthrough.
-  var isModifierKey = CodeMirror.isModifierKey = function(value) {
-    var name = typeof value == "string" ? value : keyNames[value.keyCode];
-    return name == "Ctrl" || name == "Alt" || name == "Shift" || name == "Mod";
-  };
-
-  // Look up the name of a key as indicated by an event object.
-  var keyName = CodeMirror.keyName = function(event, noShift) {
-    if (presto && event.keyCode == 34 && event["char"]) return false;
-    var base = keyNames[event.keyCode], name = base;
-    if (name == null || event.altGraphKey) return false;
-    if (event.altKey && base != "Alt") name = "Alt-" + name;
-    if ((flipCtrlCmd ? event.metaKey : event.ctrlKey) && base != "Ctrl") name = "Ctrl-" + name;
-    if ((flipCtrlCmd ? event.ctrlKey : event.metaKey) && base != "Cmd") name = "Cmd-" + name;
-    if (!noShift && event.shiftKey && base != "Shift") name = "Shift-" + name;
-    return name;
-  };
-
-  function getKeyMap(val) {
-    return typeof val == "string" ? keyMap[val] : val;
-  }
-
-  // FROMTEXTAREA
-
-  CodeMirror.fromTextArea = function(textarea, options) {
-    options = options ? copyObj(options) : {};
-    options.value = textarea.value;
-    if (!options.tabindex && textarea.tabIndex)
-      options.tabindex = textarea.tabIndex;
-    if (!options.placeholder && textarea.placeholder)
-      options.placeholder = textarea.placeholder;
-    // Set autofocus to true if this textarea is focused, or if it has
-    // autofocus and no other element is focused.
-    if (options.autofocus == null) {
-      var hasFocus = activeElt();
-      options.autofocus = hasFocus == textarea ||
-        textarea.getAttribute("autofocus") != null && hasFocus == document.body;
-    }
-
-    function save() {textarea.value = cm.getValue();}
-    if (textarea.form) {
-      on(textarea.form, "submit", save);
-      // Deplorable hack to make the submit method do the right thing.
-      if (!options.leaveSubmitMethodAlone) {
-        var form = textarea.form, realSubmit = form.submit;
-        try {
-          var wrappedSubmit = form.submit = function() {
-            save();
-            form.submit = realSubmit;
-            form.submit();
-            form.submit = wrappedSubmit;
-          };
-        } catch(e) {}
-      }
-    }
-
-    options.finishInit = function(cm) {
-      cm.save = save;
-      cm.getTextArea = function() { return textarea; };
-      cm.toTextArea = function() {
-        cm.toTextArea = isNaN; // Prevent this from being ran twice
-        save();
-        textarea.parentNode.removeChild(cm.getWrapperElement());
-        textarea.style.display = "";
-        if (textarea.form) {
-          off(textarea.form, "submit", save);
-          if (typeof textarea.form.submit == "function")
-            textarea.form.submit = realSubmit;
-        }
-      };
-    };
-
-    textarea.style.display = "none";
-    var cm = CodeMirror(function(node) {
-      textarea.parentNode.insertBefore(node, textarea.nextSibling);
-    }, options);
-    return cm;
-  };
-
-  // STRING STREAM
-
-  // Fed to the mode parsers, provides helper functions to make
-  // parsers more succinct.
-
-  var StringStream = CodeMirror.StringStream = function(string, tabSize) {
-    this.pos = this.start = 0;
-    this.string = string;
-    this.tabSize = tabSize || 8;
-    this.lastColumnPos = this.lastColumnValue = 0;
-    this.lineStart = 0;
-  };
-
-  StringStream.prototype = {
-    eol: function() {return this.pos >= this.string.length;},
-    sol: function() {return this.pos == this.lineStart;},
-    peek: function() {return this.string.charAt(this.pos) || undefined;},
-    next: function() {
-      if (this.pos < this.string.length)
-        return this.string.charAt(this.pos++);
-    },
-    eat: function(match) {
-      var ch = this.string.charAt(this.pos);
-      if (typeof match == "string") var ok = ch == match;
-      else var ok = ch && (match.test ? match.test(ch) : match(ch));
-      if (ok) {++this.pos; return ch;}
-    },
-    eatWhile: function(match) {
-      var start = this.pos;
-      while (this.eat(match)){}
-      return this.pos > start;
-    },
-    eatSpace: function() {
-      var start = this.pos;
-      while (/[\s\u00a0]/.test(this.string.charAt(this.pos))) ++this.pos;
-      return this.pos > start;
-    },
-    skipToEnd: function() {this.pos = this.string.length;},
-    skipTo: function(ch) {
-      var found = this.string.indexOf(ch, this.pos);
-      if (found > -1) {this.pos = found; return true;}
-    },
-    backUp: function(n) {this.pos -= n;},
-    column: function() {
-      if (this.lastColumnPos < this.start) {
-        this.lastColumnValue = countColumn(this.string, this.start, this.tabSize, this.lastColumnPos, this.lastColumnValue);
-        this.lastColumnPos = this.start;
-      }
-      return this.lastColumnValue - (this.lineStart ? countColumn(this.string, this.lineStart, this.tabSize) : 0);
-    },
-    indentation: function() {
-      return countColumn(this.string, null, this.tabSize) -
-        (this.lineStart ? countColumn(this.string, this.lineStart, this.tabSize) : 0);
-    },
-    match: function(pattern, consume, caseInsensitive) {
-      if (typeof pattern == "string") {
-        var cased = function(str) {return caseInsensitive ? str.toLowerCase() : str;};
-        var substr = this.string.substr(this.pos, pattern.length);
-        if (cased(substr) == cased(pattern)) {
-          if (consume !== false) this.pos += pattern.length;
-          return true;
-        }
-      } else {
-        var match = this.string.slice(this.pos).match(pattern);
-        if (match && match.index > 0) return null;
-        if (match && consume !== false) this.pos += match[0].length;
-        return match;
-      }
-    },
-    current: function(){return this.string.slice(this.start, this.pos);},
-    hideFirstChars: function(n, inner) {
-      this.lineStart += n;
-      try { return inner(); }
-      finally { this.lineStart -= n; }
-    }
-  };
-
-  // TEXTMARKERS
-
-  // Created with markText and setBookmark methods. A TextMarker is a
-  // handle that can be used to clear or find a marked position in the
-  // document. Line objects hold arrays (markedSpans) containing
-  // {from, to, marker} object pointing to such marker objects, and
-  // indicating that such a marker is present on that line. Multiple
-  // lines may point to the same marker when it spans across lines.
-  // The spans will have null for their from/to properties when the
-  // marker continues beyond the start/end of the line. Markers have
-  // links back to the lines they currently touch.
-
-  var nextMarkerId = 0;
-
-  var TextMarker = CodeMirror.TextMarker = function(doc, type) {
-    this.lines = [];
-    this.type = type;
-    this.doc = doc;
-    this.id = ++nextMarkerId;
-  };
-  eventMixin(TextMarker);
-
-  // Clear the marker.
-  TextMarker.prototype.clear = function() {
-    if (this.explicitlyCleared) return;
-    var cm = this.doc.cm, withOp = cm && !cm.curOp;
-    if (withOp) startOperation(cm);
-    if (hasHandler(this, "clear")) {
-      var found = this.find();
-      if (found) signalLater(this, "clear", found.from, found.to);
-    }
-    var min = null, max = null;
-    for (var i = 0; i < this.lines.length; ++i) {
-      var line = this.lines[i];
-      var span = getMarkedSpanFor(line.markedSpans, this);
-      if (cm && !this.collapsed) regLineChange(cm, lineNo(line), "text");
-      else if (cm) {
-        if (span.to != null) max = lineNo(line);
-        if (span.from != null) min = lineNo(line);
-      }
-      line.markedSpans = removeMarkedSpan(line.markedSpans, span);
-      if (span.from == null && this.collapsed && !lineIsHidden(this.doc, line) && cm)
-        updateLineHeight(line, textHeight(cm.display));
-    }
-    if (cm && this.collapsed && !cm.options.lineWrapping) for (var i = 0; i < this.lines.length; ++i) {
-      var visual = visualLine(this.lines[i]), len = lineLength(visual);
-      if (len > cm.display.maxLineLength) {
-        cm.display.maxLine = visual;
-        cm.display.maxLineLength = len;
-        cm.display.maxLineChanged = true;
-      }
-    }
-
-    if (min != null && cm && this.collapsed) regChange(cm, min, max + 1);
-    this.lines.length = 0;
-    this.explicitlyCleared = true;
-    if (this.atomic && this.doc.cantEdit) {
-      this.doc.cantEdit = false;
-      if (cm) reCheckSelection(cm.doc);
-    }
-    if (cm) signalLater(cm, "markerCleared", cm, this);
-    if (withOp) endOperation(cm);
-    if (this.parent) this.parent.clear();
-  };
-
-  // Find the position of the marker in the document. Returns a {from,
-  // to} object by default. Side can be passed to get a specific side
-  // -- 0 (both), -1 (left), or 1 (right). When lineObj is true, the
-  // Pos objects returned contain a line object, rather than a line
-  // number (used to prevent looking up the same line twice).
-  TextMarker.prototype.find = function(side, lineObj) {
-    if (side == null && this.type == "bookmark") side = 1;
-    var from, to;
-    for (var i = 0; i < this.lines.length; ++i) {
-      var line = this.lines[i];
-      var span = getMarkedSpanFor(line.markedSpans, this);
-      if (span.from != null) {
-        from = Pos(lineObj ? line : lineNo(line), span.from);
-        if (side == -1) return from;
-      }
-      if (span.to != null) {
-        to = Pos(lineObj ? line : lineNo(line), span.to);
-        if (side == 1) return to;
-      }
-    }
-    return from && {from: from, to: to};
-  };
-
-  // Signals that the marker's widget changed, and surrounding layout
-  // should be recomputed.
-  TextMarker.prototype.changed = function() {
-    var pos = this.find(-1, true), widget = this, cm = this.doc.cm;
-    if (!pos || !cm) return;
-    runInOp(cm, function() {
-      var line = pos.line, lineN = lineNo(pos.line);
-      var view = findViewForLine(cm, lineN);
-      if (view) {
-        clearLineMeasurementCacheFor(view);
-        cm.curOp.selectionChanged = cm.curOp.forceUpdate = true;
-      }
-      cm.curOp.updateMaxLine = true;
-      if (!lineIsHidden(widget.doc, line) && widget.height != null) {
-        var oldHeight = widget.height;
-        widget.height = null;
-        var dHeight = widgetHeight(widget) - oldHeight;
-        if (dHeight)
-          updateLineHeight(line, line.height + dHeight);
-      }
-    });
-  };
-
-  TextMarker.prototype.attachLine = function(line) {
-    if (!this.lines.length && this.doc.cm) {
-      var op = this.doc.cm.curOp;
-      if (!op.maybeHiddenMarkers || indexOf(op.maybeHiddenMarkers, this) == -1)
-        (op.maybeUnhiddenMarkers || (op.maybeUnhiddenMarkers = [])).push(this);
-    }
-    this.lines.push(line);
-  };
-  TextMarker.prototype.detachLine = function(line) {
-    this.lines.splice(indexOf(this.lines, line), 1);
-    if (!this.lines.length && this.doc.cm) {
-      var op = this.doc.cm.curOp;
-      (op.maybeHiddenMarkers || (op.maybeHiddenMarkers = [])).push(this);
-    }
-  };
-
-  // Collapsed markers have unique ids, in order to be able to order
-  // them, which is needed for uniquely determining an outer marker
-  // when they overlap (they may nest, but not partially overlap).
-  var nextMarkerId = 0;
-
-  // Create a marker, wire it up to the right lines, and
-  function markText(doc, from, to, options, type) {
-    // Shared markers (across linked documents) are handled separately
-    // (markTextShared will call out to this again, once per
-    // document).
-    if (options && options.shared) return markTextShared(doc, from, to, options, type);
-    // Ensure we are in an operation.
-    if (doc.cm && !doc.cm.curOp) return operation(doc.cm, markText)(doc, from, to, options, type);
-
-    var marker = new TextMarker(doc, type), diff = cmp(from, to);
-    if (options) copyObj(options, marker, false);
-    // Don't connect empty markers unless clearWhenEmpty is false
-    if (diff > 0 || diff == 0 && marker.clearWhenEmpty !== false)
-      return marker;
-    if (marker.replacedWith) {
-      // Showing up as a widget implies collapsed (widget replaces text)
-      marker.collapsed = true;
-      marker.widgetNode = elt("span", [marker.replacedWith], "CodeMirror-widget");
-      if (!options.handleMouseEvents) marker.widgetNode.setAttribute("cm-ignore-events", "true");
-      if (options.insertLeft) marker.widgetNode.insertLeft = true;
-    }
-    if (marker.collapsed) {
-      if (conflictingCollapsedRange(doc, from.line, from, to, marker) ||
-          from.line != to.line && conflictingCollapsedRange(doc, to.line, from, to, marker))
-        throw new Error("Inserting collapsed marker partially overlapping an existing one");
-      sawCollapsedSpans = true;
-    }
-
-    if (marker.addToHistory)
-      addChangeToHistory(doc, {from: from, to: to, origin: "markText"}, doc.sel, NaN);
-
-    var curLine = from.line, cm = doc.cm, updateMaxLine;
-    doc.iter(curLine, to.line + 1, function(line) {
-      if (cm && marker.collapsed && !cm.options.lineWrapping && visualLine(line) == cm.display.maxLine)
-        updateMaxLine = true;
-      if (marker.collapsed && curLine != from.line) updateLineHeight(line, 0);
-      addMarkedSpan(line, new MarkedSpan(marker,
-                                         curLine == from.line ? from.ch : null,
-                                         curLine == to.line ? to.ch : null));
-      ++curLine;
-    });
-    // lineIsHidden depends on the presence of the spans, so needs a second pass
-    if (marker.collapsed) doc.iter(from.line, to.line + 1, function(line) {
-      if (lineIsHidden(doc, line)) updateLineHeight(line, 0);
-    });
-
-    if (marker.clearOnEnter) on(marker, "beforeCursorEnter", function() { marker.clear(); });
-
-    if (marker.readOnly) {
-      sawReadOnlySpans = true;
-      if (doc.history.done.length || doc.history.undone.length)
-        doc.clearHistory();
-    }
-    if (marker.collapsed) {
-      marker.id = ++nextMarkerId;
-      marker.atomic = true;
-    }
-    if (cm) {
-      // Sync editor state
-      if (updateMaxLine) cm.curOp.updateMaxLine = true;
-      if (marker.collapsed)
-        regChange(cm, from.line, to.line + 1);
-      else if (marker.className || marker.title || marker.startStyle || marker.endStyle || marker.css)
-        for (var i = from.line; i <= to.line; i++) regLineChange(cm, i, "text");
-      if (marker.atomic) reCheckSelection(cm.doc);
-      signalLater(cm, "markerAdded", cm, marker);
-    }
-    return marker;
-  }
-
-  // SHARED TEXTMARKERS
-
-  // A shared marker spans multiple linked documents. It is
-  // implemented as a meta-marker-object controlling multiple normal
-  // markers.
-  var SharedTextMarker = CodeMirror.SharedTextMarker = function(markers, primary) {
-    this.markers = markers;
-    this.primary = primary;
-    for (var i = 0; i < markers.length; ++i)
-      markers[i].parent = this;
-  };
-  eventMixin(SharedTextMarker);
-
-  SharedTextMarker.prototype.clear = function() {
-    if (this.explicitlyCleared) return;
-    this.explicitlyCleared = true;
-    for (var i = 0; i < this.markers.length; ++i)
-      this.markers[i].clear();
-    signalLater(this, "clear");
-  };
-  SharedTextMarker.prototype.find = function(side, lineObj) {
-    return this.primary.find(side, lineObj);
-  };
-
-  function markTextShared(doc, from, to, options, type) {
-    options = copyObj(options);
-    options.shared = false;
-    var markers = [markText(doc, from, to, options, type)], primary = markers[0];
-    var widget = options.widgetNode;
-    linkedDocs(doc, function(doc) {
-      if (widget) options.widgetNode = widget.cloneNode(true);
-      markers.push(markText(doc, clipPos(doc, from), clipPos(doc, to), options, type));
-      for (var i = 0; i < doc.linked.length; ++i)
-        if (doc.linked[i].isParent) return;
-      primary = lst(markers);
-    });
-    return new SharedTextMarker(markers, primary);
-  }
-
-  function findSharedMarkers(doc) {
-    return doc.findMarks(Pos(doc.first, 0), doc.clipPos(Pos(doc.lastLine())),
-                         function(m) { return m.parent; });
-  }
-
-  function copySharedMarkers(doc, markers) {
-    for (var i = 0; i < markers.length; i++) {
-      var marker = markers[i], pos = marker.find();
-      var mFrom = doc.clipPos(pos.from), mTo = doc.clipPos(pos.to);
-      if (cmp(mFrom, mTo)) {
-        var subMark = markText(doc, mFrom, mTo, marker.primary, marker.primary.type);
-        marker.markers.push(subMark);
-        subMark.parent = marker;
-      }
-    }
-  }
-
-  function detachSharedMarkers(markers) {
-    for (var i = 0; i < markers.length; i++) {
-      var marker = markers[i], linked = [marker.primary.doc];;
-      linkedDocs(marker.primary.doc, function(d) { linked.push(d); });
-      for (var j = 0; j < marker.markers.length; j++) {
-        var subMarker = marker.markers[j];
-        if (indexOf(linked, subMarker.doc) == -1) {
-          subMarker.parent = null;
-          marker.markers.splice(j--, 1);
-        }
-      }
-    }
-  }
-
-  // TEXTMARKER SPANS
-
-  function MarkedSpan(marker, from, to) {
-    this.marker = marker;
-    this.from = from; this.to = to;
-  }
-
-  // Search an array of spans for a span matching the given marker.
-  function getMarkedSpanFor(spans, marker) {
-    if (spans) for (var i = 0; i < spans.length; ++i) {
-      var span = spans[i];
-      if (span.marker == marker) return span;
-    }
-  }
-  // Remove a span from an array, returning undefined if no spans are
-  // left (we don't store arrays for lines without spans).
-  function removeMarkedSpan(spans, span) {
-    for (var r, i = 0; i < spans.length; ++i)
-      if (spans[i] != span) (r || (r = [])).push(spans[i]);
-    return r;
-  }
-  // Add a span to a line.
-  function addMarkedSpan(line, span) {
-    line.markedSpans = line.markedSpans ? line.markedSpans.concat([span]) : [span];
-    span.marker.attachLine(line);
-  }
-
-  // Used for the algorithm that adjusts markers for a change in the
-  // document. These functions cut an array of spans at a given
-  // character position, returning an array of remaining chunks (or
-  // undefined if nothing remains).
-  function markedSpansBefore(old, startCh, isInsert) {
-    if (old) for (var i = 0, nw; i < old.length; ++i) {
-      var span = old[i], marker = span.marker;
-      var startsBefore = span.from == null || (marker.inclusiveLeft ? span.from <= startCh : span.from < startCh);
-      if (startsBefore || span.from == startCh && marker.type == "bookmark" && (!isInsert || !span.marker.insertLeft)) {
-        var endsAfter = span.to == null || (marker.inclusiveRight ? span.to >= startCh : span.to > startCh);
-        (nw || (nw = [])).push(new MarkedSpan(marker, span.from, endsAfter ? null : span.to));
-      }
-    }
-    return nw;
-  }
-  function markedSpansAfter(old, endCh, isInsert) {
-    if (old) for (var i = 0, nw; i < old.length; ++i) {
-      var span = old[i], marker = span.marker;
-      var endsAfter = span.to == null || (marker.inclusiveRight ? span.to >= endCh : span.to > endCh);
-      if (endsAfter || span.from == endCh && marker.type == "bookmark" && (!isInsert || span.marker.insertLeft)) {
-        var startsBefore = span.from == null || (marker.inclusiveLeft ? span.from <= endCh : span.from < endCh);
-        (nw || (nw = [])).push(new MarkedSpan(marker, startsBefore ? null : span.from - endCh,
-                                              span.to == null ? null : span.to - endCh));
-      }
-    }
-    return nw;
-  }
-
-  // Given a change object, compute the new set of marker spans that
-  // cover the line in which the change took place. Removes spans
-  // entirely within the change, reconnects spans belonging to the
-  // same marker that appear on both sides of the change, and cuts off
-  // spans partially within the change. Returns an array of span
-  // arrays with one element for each line in (after) the change.
-  function stretchSpansOverChange(doc, change) {
-    if (change.full) return null;
-    var oldFirst = isLine(doc, change.from.line) && getLine(doc, change.from.line).markedSpans;
-    var oldLast = isLine(doc, change.to.line) && getLine(doc, change.to.line).markedSpans;
-    if (!oldFirst && !oldLast) return null;
-
-    var startCh = change.from.ch, endCh = change.to.ch, isInsert = cmp(change.from, change.to) == 0;
-    // Get the spans that 'stick out' on both sides
-    var first = markedSpansBefore(oldFirst, startCh, isInsert);
-    var last = markedSpansAfter(oldLast, endCh, isInsert);
-
-    // Next, merge those two ends
-    var sameLine = change.text.length == 1, offset = lst(change.text).length + (sameLine ? startCh : 0);
-    if (first) {
-      // Fix up .to properties of first
-      for (var i = 0; i < first.length; ++i) {
-        var span = first[i];
-        if (span.to == null) {
-          var found = getMarkedSpanFor(last, span.marker);
-          if (!found) span.to = startCh;
-          else if (sameLine) span.to = found.to == null ? null : found.to + offset;
-        }
-      }
-    }
-    if (last) {
-      // Fix up .from in last (or move them into first in case of sameLine)
-      for (var i = 0; i < last.length; ++i) {
-        var span = last[i];
-        if (span.to != null) span.to += offset;
-        if (span.from == null) {
-          var found = getMarkedSpanFor(first, span.marker);
-          if (!found) {
-            span.from = offset;
-            if (sameLine) (first || (first = [])).push(span);
-          }
-        } else {
-          span.from += offset;
-          if (sameLine) (first || (first = [])).push(span);
-        }
-      }
-    }
-    // Make sure we didn't create any zero-length spans
-    if (first) first = clearEmptySpans(first);
-    if (last && last != first) last = clearEmptySpans(last);
-
-    var newMarkers = [first];
-    if (!sameLine) {
-      // Fill gap with whole-line-spans
-      var gap = change.text.length - 2, gapMarkers;
-      if (gap > 0 && first)
-        for (var i = 0; i < first.length; ++i)
-          if (first[i].to == null)
-            (gapMarkers || (gapMarkers = [])).push(new MarkedSpan(first[i].marker, null, null));
-      for (var i = 0; i < gap; ++i)
-        newMarkers.push(gapMarkers);
-      newMarkers.push(last);
-    }
-    return newMarkers;
-  }
-
-  // Remove spans that are empty and don't have a clearWhenEmpty
-  // option of false.
-  function clearEmptySpans(spans) {
-    for (var i = 0; i < spans.length; ++i) {
-      var span = spans[i];
-      if (span.from != null && span.from == span.to && span.marker.clearWhenEmpty !== false)
-        spans.splice(i--, 1);
-    }
-    if (!spans.length) return null;
-    return spans;
-  }
-
-  // Used for un/re-doing changes from the history. Combines the
-  // result of computing the existing spans with the set of spans that
-  // existed in the history (so that deleting around a span and then
-  // undoing brings back the span).
-  function mergeOldSpans(doc, change) {
-    var old = getOldSpans(doc, change);
-    var stretched = stretchSpansOverChange(doc, change);
-    if (!old) return stretched;
-    if (!stretched) return old;
-
-    for (var i = 0; i < old.length; ++i) {
-      var oldCur = old[i], stretchCur = stretched[i];
-      if (oldCur && stretchCur) {
-        spans: for (var j = 0; j < stretchCur.length; ++j) {
-          var span = stretchCur[j];
-          for (var k = 0; k < oldCur.length; ++k)
-            if (oldCur[k].marker == span.marker) continue spans;
-          oldCur.push(span);
-        }
-      } else if (stretchCur) {
-        old[i] = stretchCur;
-      }
-    }
-    return old;
-  }
-
-  // Used to 'clip' out readOnly ranges when making a change.
-  function removeReadOnlyRanges(doc, from, to) {
-    var markers = null;
-    doc.iter(from.line, to.line + 1, function(line) {
-      if (line.markedSpans) for (var i = 0; i < line.markedSpans.length; ++i) {
-        var mark = line.markedSpans[i].marker;
-        if (mark.readOnly && (!markers || indexOf(markers, mark) == -1))
-          (markers || (markers = [])).push(mark);
-      }
-    });
-    if (!markers) return null;
-    var parts = [{from: from, to: to}];
-    for (var i = 0; i < markers.length; ++i) {
-      var mk = markers[i], m = mk.find(0);
-      for (var j = 0; j < parts.length; ++j) {
-        var p = parts[j];
-        if (cmp(p.to, m.from) < 0 || cmp(p.from, m.to) > 0) continue;
-        var newParts = [j, 1], dfrom = cmp(p.from, m.from), dto = cmp(p.to, m.to);
-        if (dfrom < 0 || !mk.inclusiveLeft && !dfrom)
-          newParts.push({from: p.from, to: m.from});
-        if (dto > 0 || !mk.inclusiveRight && !dto)
-          newParts.push({from: m.to, to: p.to});
-        parts.splice.apply(parts, newParts);
-        j += newParts.length - 1;
-      }
-    }
-    return parts;
-  }
-
-  // Connect or disconnect spans from a line.
-  function detachMarkedSpans(line) {
-    var spans = line.markedSpans;
-    if (!spans) return;
-    for (var i = 0; i < spans.length; ++i)
-      spans[i].marker.detachLine(line);
-    line.markedSpans = null;
-  }
-  function attachMarkedSpans(line, spans) {
-    if (!spans) return;
-    for (var i = 0; i < spans.length; ++i)
-      spans[i].marker.attachLine(line);
-    line.markedSpans = spans;
-  }
-
-  // Helpers used when computing which overlapping collapsed span
-  // counts as the larger one.
-  function extraLeft(marker) { return marker.inclusiveLeft ? -1 : 0; }
-  function extraRight(marker) { return marker.inclusiveRight ? 1 : 0; }
-
-  // Returns a number indicating which of two overlapping collapsed
-  // spans is larger (and thus includes the other). Falls back to
-  // comparing ids when the spans cover exactly the same range.
-  function compareCollapsedMarkers(a, b) {
-    var lenDiff = a.lines.length - b.lines.length;
-    if (lenDiff != 0) return lenDiff;
-    var aPos = a.find(), bPos = b.find();
-    var fromCmp = cmp(aPos.from, bPos.from) || extraLeft(a) - extraLeft(b);
-    if (fromCmp) return -fromCmp;
-    var toCmp = cmp(aPos.to, bPos.to) || extraRight(a) - extraRight(b);
-    if (toCmp) return toCmp;
-    return b.id - a.id;
-  }
-
-  // Find out whether a line ends or starts in a collapsed span. If
-  // so, return the marker for that span.
-  function collapsedSpanAtSide(line, start) {
-    var sps = sawCollapsedSpans && line.markedSpans, found;
-    if (sps) for (var sp, i = 0; i < sps.length; ++i) {
-      sp = sps[i];
-      if (sp.marker.collapsed && (start ? sp.from : sp.to) == null &&
-          (!found || compareCollapsedMarkers(found, sp.marker) < 0))
-        found = sp.marker;
-    }
-    return found;
-  }
-  function collapsedSpanAtStart(line) { return collapsedSpanAtSide(line, true); }
-  function collapsedSpanAtEnd(line) { return collapsedSpanAtSide(line, false); }
-
-  // Test whether there exists a collapsed span that partially
-  // overlaps (covers the start or end, but not both) of a new span.
-  // Such overlap is not allowed.
-  function conflictingCollapsedRange(doc, lineNo, from, to, marker) {
-    var line = getLine(doc, lineNo);
-    var sps = sawCollapsedSpans && line.markedSpans;
-    if (sps) for (var i = 0; i < sps.length; ++i) {
-      var sp = sps[i];
-      if (!sp.marker.collapsed) continue;
-      var found = sp.marker.find(0);
-      var fromCmp = cmp(found.from, from) || extraLeft(sp.marker) - extraLeft(marker);
-      var toCmp = cmp(found.to, to) || extraRight(sp.marker) - extraRight(marker);
-      if (fromCmp >= 0 && toCmp <= 0 || fromCmp <= 0 && toCmp >= 0) continue;
-      if (fromCmp <= 0 && (cmp(found.to, from) > 0 || (sp.marker.inclusiveRight && marker.inclusiveLeft)) ||
-          fromCmp >= 0 && (cmp(found.from, to) < 0 || (sp.marker.inclusiveLeft && marker.inclusiveRight)))
-        return true;
-    }
-  }
-
-  // A visual line is a line as drawn on the screen. Folding, for
-  // example, can cause multiple logical lines to appear on the same
-  // visual line. This finds the start of the visual line that the
-  // given line is part of (usually that is the line itself).
-  function visualLine(line) {
-    var merged;
-    while (merged = collapsedSpanAtStart(line))
-      line = merged.find(-1, true).line;
-    return line;
-  }
-
-  // Returns an array of logical lines that continue the visual line
-  // started by the argument, or undefined if there are no such lines.
-  function visualLineContinued(line) {
-    var merged, lines;
-    while (merged = collapsedSpanAtEnd(line)) {
-      line = merged.find(1, true).line;
-      (lines || (lines = [])).push(line);
-    }
-    return lines;
-  }
-
-  // Get the line number of the start of the visual line that the
-  // given line number is part of.
-  function visualLineNo(doc, lineN) {
-    var line = getLine(doc, lineN), vis = visualLine(line);
-    if (line == vis) return lineN;
-    return lineNo(vis);
-  }
-  // Get the line number of the start of the next visual line after
-  // the given line.
-  function visualLineEndNo(doc, lineN) {
-    if (lineN > doc.lastLine()) return lineN;
-    var line = getLine(doc, lineN), merged;
-    if (!lineIsHidden(doc, line)) return lineN;
-    while (merged = collapsedSpanAtEnd(line))
-      line = merged.find(1, true).line;
-    return lineNo(line) + 1;
-  }
-
-  // Compute whether a line is hidden. Lines count as hidden when they
-  // are part of a visual line that starts with another line, or when
-  // they are entirely covered by collapsed, non-widget span.
-  function lineIsHidden(doc, line) {
-    var sps = sawCollapsedSpans && line.markedSpans;
-    if (sps) for (var sp, i = 0; i < sps.length; ++i) {
-      sp = sps[i];
-      if (!sp.marker.collapsed) continue;
-      if (sp.from == null) return true;
-      if (sp.marker.widgetNode) continue;
-      if (sp.from == 0 && sp.marker.inclusiveLeft && lineIsHiddenInner(doc, line, sp))
-        return true;
-    }
-  }
-  function lineIsHiddenInner(doc, line, span) {
-    if (span.to == null) {
-      var end = span.marker.find(1, true);
-      return lineIsHiddenInner(doc, end.line, getMarkedSpanFor(end.line.markedSpans, span.marker));
-    }
-    if (span.marker.inclusiveRight && span.to == line.text.length)
-      return true;
-    for (var sp, i = 0; i < line.markedSpans.length; ++i) {
-      sp = line.markedSpans[i];
-      if (sp.marker.collapsed && !sp.marker.widgetNode && sp.from == span.to &&
-          (sp.to == null || sp.to != span.from) &&
-          (sp.marker.inclusiveLeft || span.marker.inclusiveRight) &&
-          lineIsHiddenInner(doc, line, sp)) return true;
-    }
-  }
-
-  // LINE WIDGETS
-
-  // Line widgets are block elements displayed above or below a line.
-
-  var LineWidget = CodeMirror.LineWidget = function(doc, node, options) {
-    if (options) for (var opt in options) if (options.hasOwnProperty(opt))
-      this[opt] = options[opt];
-    this.doc = doc;
-    this.node = node;
-  };
-  eventMixin(LineWidget);
-
-  function adjustScrollWhenAboveVisible(cm, line, diff) {
-    if (heightAtLine(line) < ((cm.curOp && cm.curOp.scrollTop) || cm.doc.scrollTop))
-      addToScrollPos(cm, null, diff);
-  }
-
-  LineWidget.prototype.clear = function() {
-    var cm = this.doc.cm, ws = this.line.widgets, line = this.line, no = lineNo(line);
-    if (no == null || !ws) return;
-    for (var i = 0; i < ws.length; ++i) if (ws[i] == this) ws.splice(i--, 1);
-    if (!ws.length) line.widgets = null;
-    var height = widgetHeight(this);
-    updateLineHeight(line, Math.max(0, line.height - height));
-    if (cm) runInOp(cm, function() {
-      adjustScrollWhenAboveVisible(cm, line, -height);
-      regLineChange(cm, no, "widget");
-    });
-  };
-  LineWidget.prototype.changed = function() {
-    var oldH = this.height, cm = this.doc.cm, line = this.line;
-    this.height = null;
-    var diff = widgetHeight(this) - oldH;
-    if (!diff) return;
-    updateLineHeight(line, line.height + diff);
-    if (cm) runInOp(cm, function() {
-      cm.curOp.forceUpdate = true;
-      adjustScrollWhenAboveVisible(cm, line, diff);
-    });
-  };
-
-  function widgetHeight(widget) {
-    if (widget.height != null) return widget.height;
-    var cm = widget.doc.cm;
-    if (!cm) return 0;
-    if (!contains(document.body, widget.node)) {
-      var parentStyle = "position: relative;";
-      if (widget.coverGutter)
-        parentStyle += "margin-left: -" + cm.display.gutters.offsetWidth + "px;";
-      if (widget.noHScroll)
-        parentStyle += "width: " + cm.display.wrapper.clientWidth + "px;";
-      removeChildrenAndAdd(cm.display.measure, elt("div", [widget.node], null, parentStyle));
-    }
-    return widget.height = widget.node.offsetHeight;
-  }
-
-  function addLineWidget(doc, handle, node, options) {
-    var widget = new LineWidget(doc, node, options);
-    var cm = doc.cm;
-    if (cm && widget.noHScroll) cm.display.alignWidgets = true;
-    changeLine(doc, handle, "widget", function(line) {
-      var widgets = line.widgets || (line.widgets = []);
-      if (widget.insertAt == null) widgets.push(widget);
-      else widgets.splice(Math.min(widgets.length - 1, Math.max(0, widget.insertAt)), 0, widget);
-      widget.line = line;
-      if (cm && !lineIsHidden(doc, line)) {
-        var aboveVisible = heightAtLine(line) < doc.scrollTop;
-        updateLineHeight(line, line.height + widgetHeight(widget));
-        if (aboveVisible) addToScrollPos(cm, null, widget.height);
-        cm.curOp.forceUpdate = true;
-      }
-      return true;
-    });
-    return widget;
-  }
-
-  // LINE DATA STRUCTURE
-
-  // Line objects. These hold state related to a line, including
-  // highlighting info (the styles array).
-  var Line = CodeMirror.Line = function(text, markedSpans, estimateHeight) {
-    this.text = text;
-    attachMarkedSpans(this, markedSpans);
-    this.height = estimateHeight ? estimateHeight(this) : 1;
-  };
-  eventMixin(Line);
-  Line.prototype.lineNo = function() { return lineNo(this); };
-
-  // Change the content (text, markers) of a line. Automatically
-  // invalidates cached information and tries to re-estimate the
-  // line's height.
-  function updateLine(line, text, markedSpans, estimateHeight) {
-    line.text = text;
-    if (line.stateAfter) line.stateAfter = null;
-    if (line.styles) line.styles = null;
-    if (line.order != null) line.order = null;
-    detachMarkedSpans(line);
-    attachMarkedSpans(line, markedSpans);
-    var estHeight = estimateHeight ? estimateHeight(line) : 1;
-    if (estHeight != line.height) updateLineHeight(line, estHeight);
-  }
-
-  // Detach a line from the document tree and its markers.
-  function cleanUpLine(line) {
-    line.parent = null;
-    detachMarkedSpans(line);
-  }
-
-  function extractLineClasses(type, output) {
-    if (type) for (;;) {
-      var lineClass = type.match(/(?:^|\s+)line-(background-)?(\S+)/);
-      if (!lineClass) break;
-      type = type.slice(0, lineClass.index) + type.slice(lineClass.index + lineClass[0].length);
-      var prop = lineClass[1] ? "bgClass" : "textClass";
-      if (output[prop] == null)
-        output[prop] = lineClass[2];
-      else if (!(new RegExp("(?:^|\s)" + lineClass[2] + "(?:$|\s)")).test(output[prop]))
-        output[prop] += " " + lineClass[2];
-    }
-    return type;
-  }
-
-  function callBlankLine(mode, state) {
-    if (mode.blankLine) return mode.blankLine(state);
-    if (!mode.innerMode) return;
-    var inner = CodeMirror.innerMode(mode, state);
-    if (inner.mode.blankLine) return inner.mode.blankLine(inner.state);
-  }
-
-  function readToken(mode, stream, state, inner) {
-    for (var i = 0; i < 10; i++) {
-      if (inner) inner[0] = CodeMirror.innerMode(mode, state).mode;
-      var style = mode.token(stream, state);
-      if (stream.pos > stream.start) return style;
-    }
-    throw new Error("Mode " + mode.name + " failed to advance stream.");
-  }
-
-  // Utility for getTokenAt and getLineTokens
-  function takeToken(cm, pos, precise, asArray) {
-    function getObj(copy) {
-      return {start: stream.start, end: stream.pos,
-              string: stream.current(),
-              type: style || null,
-              state: copy ? copyState(doc.mode, state) : state};
-    }
-
-    var doc = cm.doc, mode = doc.mode, style;
-    pos = clipPos(doc, pos);
-    var line = getLine(doc, pos.line), state = getStateBefore(cm, pos.line, precise);
-    var stream = new StringStream(line.text, cm.options.tabSize), tokens;
-    if (asArray) tokens = [];
-    while ((asArray || stream.pos < pos.ch) && !stream.eol()) {
-      stream.start = stream.pos;
-      style = readToken(mode, stream, state);
-      if (asArray) tokens.push(getObj(true));
-    }
-    return asArray ? tokens : getObj();
-  }
-
-  // Run the given mode's parser over a line, calling f for each token.
-  function runMode(cm, text, mode, state, f, lineClasses, forceToEnd) {
-    var flattenSpans = mode.flattenSpans;
-    if (flattenSpans == null) flattenSpans = cm.options.flattenSpans;
-    var curStart = 0, curStyle = null;
-    var stream = new StringStream(text, cm.options.tabSize), style;
-    var inner = cm.options.addModeClass && [null];
-    if (text == "") extractLineClasses(callBlankLine(mode, state), lineClasses);
-    while (!stream.eol()) {
-      if (stream.pos > cm.options.maxHighlightLength) {
-        flattenSpans = false;
-        if (forceToEnd) processLine(cm, text, state, stream.pos);
-        stream.pos = text.length;
-        style = null;
-      } else {
-        style = extractLineClasses(readToken(mode, stream, state, inner), lineClasses);
-      }
-      if (inner) {
-        var mName = inner[0].name;
-        if (mName) style = "m-" + (style ? mName + " " + style : mName);
-      }
-      if (!flattenSpans || curStyle != style) {
-        while (curStart < stream.start) {
-          curStart = Math.min(stream.start, curStart + 50000);
-          f(curStart, curStyle);
-        }
-        curStyle = style;
-      }
-      stream.start = stream.pos;
-    }
-    while (curStart < stream.pos) {
-      // Webkit seems to refuse to render text nodes longer than 57444 characters
-      var pos = Math.min(stream.pos, curStart + 50000);
-      f(pos, curStyle);
-      curStart = pos;
-    }
-  }
-
-  // Compute a style array (an array starting with a mode generation
-  // -- for invalidation -- followed by pairs of end positions and
-  // style strings), which is used to highlight the tokens on the
-  // line.
-  function highlightLine(cm, line, state, forceToEnd) {
-    // A styles array always starts with a number identifying the
-    // mode/overlays that it is based on (for easy invalidation).
-    var st = [cm.state.modeGen], lineClasses = {};
-    // Compute the base array of styles
-    runMode(cm, line.text, cm.doc.mode, state, function(end, style) {
-      st.push(end, style);
-    }, lineClasses, forceToEnd);
-
-    // Run overlays, adjust style array.
-    for (var o = 0; o < cm.state.overlays.length; ++o) {
-      var overlay = cm.state.overlays[o], i = 1, at = 0;
-      runMode(cm, line.text, overlay.mode, true, function(end, style) {
-        var start = i;
-        // Ensure there's a token end at the current position, and that i points at it
-        while (at < end) {
-          var i_end = st[i];
-          if (i_end > end)
-            st.splice(i, 1, end, st[i+1], i_end);
-          i += 2;
-          at = Math.min(end, i_end);
-        }
-        if (!style) return;
-        if (overlay.opaque) {
-          st.splice(start, i - start, end, "cm-overlay " + style);
-          i = start + 2;
-        } else {
-          for (; start < i; start += 2) {
-            var cur = st[start+1];
-            st[start+1] = (cur ? cur + " " : "") + "cm-overlay " + style;
-          }
-        }
-      }, lineClasses);
-    }
-
-    return {styles: st, classes: lineClasses.bgClass || lineClasses.textClass ? lineClasses : null};
-  }
-
-  function getLineStyles(cm, line, updateFrontier) {
-    if (!line.styles || line.styles[0] != cm.state.modeGen) {
-      var result = highlightLine(cm, line, line.stateAfter = getStateBefore(cm, lineNo(line)));
-      line.styles = result.styles;
-      if (result.classes) line.styleClasses = result.classes;
-      else if (line.styleClasses) line.styleClasses = null;
-      if (updateFrontier === cm.doc.frontier) cm.doc.frontier++;
-    }
-    return line.styles;
-  }
-
-  // Lightweight form of highlight -- proceed over this line and
-  // update state, but don't save a style array. Used for lines that
-  // aren't currently visible.
-  function processLine(cm, text, state, startAt) {
-    var mode = cm.doc.mode;
-    var stream = new StringStream(text, cm.options.tabSize);
-    stream.start = stream.pos = startAt || 0;
-    if (text == "") callBlankLine(mode, state);
-    while (!stream.eol() && stream.pos <= cm.options.maxHighlightLength) {
-      readToken(mode, stream, state);
-      stream.start = stream.pos;
-    }
-  }
-
-  // Convert a style as returned by a mode (either null, or a string
-  // containing one or more styles) to a CSS style. This is cached,
-  // and also looks for line-wide styles.
-  var styleToClassCache = {}, styleToClassCacheWithMode = {};
-  function interpretTokenStyle(style, options) {
-    if (!style || /^\s*$/.test(style)) return null;
-    var cache = options.addModeClass ? styleToClassCacheWithMode : styleToClassCache;
-    return cache[style] ||
-      (cache[style] = style.replace(/\S+/g, "cm-$&"));
-  }
-
-  // Render the DOM representation of the text of a line. Also builds
-  // up a 'line map', which points at the DOM nodes that represent
-  // specific stretches of text, and is used by the measuring code.
-  // The returned object contains the DOM node, this map, and
-  // information about line-wide styles that were set by the mode.
-  function buildLineContent(cm, lineView) {
-    // The padding-right forces the element to have a 'border', which
-    // is needed on Webkit to be able to get line-level bounding
-    // rectangles for it (in measureChar).
-    var content = elt("span", null, null, webkit ? "padding-right: .1px" : null);
-    var builder = {pre: elt("pre", [content]), content: content,
-                   col: 0, pos: 0, cm: cm,
-                   splitSpaces: (ie || webkit) && cm.getOption("lineWrapping")};
-    lineView.measure = {};
-
-    // Iterate over the logical lines that make up this visual line.
-    for (var i = 0; i <= (lineView.rest ? lineView.rest.length : 0); i++) {
-      var line = i ? lineView.rest[i - 1] : lineView.line, order;
-      builder.pos = 0;
-      builder.addToken = buildToken;
-      // Optionally wire in some hacks into the token-rendering
-      // algorithm, to deal with browser quirks.
-      if (hasBadBidiRects(cm.display.measure) && (order = getOrder(line)))
-        builder.addToken = buildTokenBadBidi(builder.addToken, order);
-      builder.map = [];
-      var allowFrontierUpdate = lineView != cm.display.externalMeasured && lineNo(line);
-      insertLineContent(line, builder, getLineStyles(cm, line, allowFrontierUpdate));
-      if (line.styleClasses) {
-        if (line.styleClasses.bgClass)
-          builder.bgClass = joinClasses(line.styleClasses.bgClass, builder.bgClass || "");
-        if (line.styleClasses.textClass)
-          builder.textClass = joinClasses(line.styleClasses.textClass, builder.textClass || "");
-      }
-
-      // Ensure at least a single node is present, for measuring.
-      if (builder.map.length == 0)
-        builder.map.push(0, 0, builder.content.appendChild(zeroWidthElement(cm.display.measure)));
-
-      // Store the map and a cache object for the current logical line
-      if (i == 0) {
-        lineView.measure.map = builder.map;
-        lineView.measure.cache = {};
-      } else {
-        (lineView.measure.maps || (lineView.measure.maps = [])).push(builder.map);
-        (lineView.measure.caches || (lineView.measure.caches = [])).push({});
-      }
-    }
-
-    // See issue #2901
-    if (webkit && /\bcm-tab\b/.test(builder.content.lastChild.className))
-      builder.content.className = "cm-tab-wrap-hack";
-
-    signal(cm, "renderLine", cm, lineView.line, builder.pre);
-    if (builder.pre.className)
-      builder.textClass = joinClasses(builder.pre.className, builder.textClass || "");
-
-    return builder;
-  }
-
-  function defaultSpecialCharPlaceholder(ch) {
-    var token = elt("span", "\u2022", "cm-invalidchar");
-    token.title = "\\u" + ch.charCodeAt(0).toString(16);
-    token.setAttribute("aria-label", token.title);
-    return token;
-  }
-
-  // Build up the DOM representation for a single token, and add it to
-  // the line map. Takes care to render special characters separately.
-  function buildToken(builder, text, style, startStyle, endStyle, title, css) {
-    if (!text) return;
-    var displayText = builder.splitSpaces ? text.replace(/ {3,}/g, splitSpaces) : text;
-    var special = builder.cm.state.specialChars, mustWrap = false;
-    if (!special.test(text)) {
-      builder.col += text.length;
-      var content = document.createTextNode(displayText);
-      builder.map.push(builder.pos, builder.pos + text.length, content);
-      if (ie && ie_version < 9) mustWrap = true;
-      builder.pos += text.length;
-    } else {
-      var content = document.createDocumentFragment(), pos = 0;
-      while (true) {
-        special.lastIndex = pos;
-        var m = special.exec(text);
-        var skipped = m ? m.index - pos : text.length - pos;
-        if (skipped) {
-          var txt = document.createTextNode(displayText.slice(pos, pos + skipped));
-          if (ie && ie_version < 9) content.appendChild(elt("span", [txt]));
-          else content.appendChild(txt);
-          builder.map.push(builder.pos, builder.pos + skipped, txt);
-          builder.col += skipped;
-          builder.pos += skipped;
-        }
-        if (!m) break;
-        pos += skipped + 1;
-        if (m[0] == "\t") {
-          var tabSize = builder.cm.options.tabSize, tabWidth = tabSize - builder.col % tabSize;
-          var txt = content.appendChild(elt("span", spaceStr(tabWidth), "cm-tab"));
-          txt.setAttribute("role", "presentation");
-          txt.setAttribute("cm-text", "\t");
-          builder.col += tabWidth;
-        } else {
-          var txt = builder.cm.options.specialCharPlaceholder(m[0]);
-          txt.setAttribute("cm-text", m[0]);
-          if (ie && ie_version < 9) content.appendChild(elt("span", [txt]));
-          else content.appendChild(txt);
-          builder.col += 1;
-        }
-        builder.map.push(builder.pos, builder.pos + 1, txt);
-        builder.pos++;
-      }
-    }
-    if (style || startStyle || endStyle || mustWrap || css) {
-      var fullStyle = style || "";
-      if (startStyle) fullStyle += startStyle;
-      if (endStyle) fullStyle += endStyle;
-      var token = elt("span", [content], fullStyle, css);
-      if (title) token.title = title;
-      return builder.content.appendChild(token);
-    }
-    builder.content.appendChild(content);
-  }
-
-  function splitSpaces(old) {
-    var out = " ";
-    for (var i = 0; i < old.length - 2; ++i) out += i % 2 ? " " : "\u00a0";
-    out += " ";
-    return out;
-  }
-
-  // Work around nonsense dimensions being reported for stretches of
-  // right-to-left text.
-  function buildTokenBadBidi(inner, order) {
-    return function(builder, text, style, startStyle, endStyle, title, css) {
-      style = style ? style + " cm-force-border" : "cm-force-border";
-      var start = builder.pos, end = start + text.length;
-      for (;;) {
-        // Find the part that overlaps with the start of this text
-        for (var i = 0; i < order.length; i++) {
-          var part = order[i];
-          if (part.to > start && part.from <= start) break;
-        }
-        if (part.to >= end) return inner(builder, text, style, startStyle, endStyle, title, css);
-        inner(builder, text.slice(0, part.to - start), style, startStyle, null, title, css);
-        startStyle = null;
-        text = text.slice(part.to - start);
-        start = part.to;
-      }
-    };
-  }
-
-  function buildCollapsedSpan(builder, size, marker, ignoreWidget) {
-    var widget = !ignoreWidget && marker.widgetNode;
-    if (widget) builder.map.push(builder.pos, builder.pos + size, widget);
-    if (!ignoreWidget && builder.cm.display.input.needsContentAttribute) {
-      if (!widget)
-        widget = builder.content.appendChild(document.createElement("span"));
-      widget.setAttribute("cm-marker", marker.id);
-    }
-    if (widget) {
-      builder.cm.display.input.setUneditable(widget);
-      builder.content.appendChild(widget);
-    }
-    builder.pos += size;
-  }
-
-  // Outputs a number of spans to make up a line, taking highlighting
-  // and marked text into account.
-  function insertLineContent(line, builder, styles) {
-    var spans = line.markedSpans, allText = line.text, at = 0;
-    if (!spans) {
-      for (var i = 1; i < styles.length; i+=2)
-        builder.addToken(builder, allText.slice(at, at = styles[i]), interpretTokenStyle(styles[i+1], builder.cm.options));
-      return;
-    }
-
-    var len = allText.length, pos = 0, i = 1, text = "", style, css;
-    var nextChange = 0, spanStyle, spanEndStyle, spanStartStyle, title, collapsed;
-    for (;;) {
-      if (nextChange == pos) { // Update current marker set
-        spanStyle = spanEndStyle = spanStartStyle = title = css = "";
-        collapsed = null; nextChange = Infinity;
-        var foundBookmarks = [];
-        for (var j = 0; j < spans.length; ++j) {
-          var sp = spans[j], m = sp.marker;
-          if (m.type == "bookmark" && sp.from == pos && m.widgetNode) {
-            foundBookmarks.push(m);
-          } else if (sp.from <= pos && (sp.to == null || sp.to > pos || m.collapsed && sp.to == pos && sp.from == pos)) {
-            if (sp.to != null && sp.to != pos && nextChange > sp.to) {
-              nextChange = sp.to;
-              spanEndStyle = "";
-            }
-            if (m.className) spanStyle += " " + m.className;
-            if (m.css) css = m.css;
-            if (m.startStyle && sp.from == pos) spanStartStyle += " " + m.startStyle;
-            if (m.endStyle && sp.to == nextChange) spanEndStyle += " " + m.endStyle;
-            if (m.title && !title) title = m.title;
-            if (m.collapsed && (!collapsed || compareCollapsedMarkers(collapsed.marker, m) < 0))
-              collapsed = sp;
-          } else if (sp.from > pos && nextChange > sp.from) {
-            nextChange = sp.from;
-          }
-        }
-        if (collapsed && (collapsed.from || 0) == pos) {
-          buildCollapsedSpan(builder, (collapsed.to == null ? len + 1 : collapsed.to) - pos,
-                             collapsed.marker, collapsed.from == null);
-          if (collapsed.to == null) return;
-          if (collapsed.to == pos) collapsed = false;
-        }
-        if (!collapsed && foundBookmarks.length) for (var j = 0; j < foundBookmarks.length; ++j)
-          buildCollapsedSpan(builder, 0, foundBookmarks[j]);
-      }
-      if (pos >= len) break;
-
-      var upto = Math.min(len, nextChange);
-      while (true) {
-        if (text) {
-          var end = pos + text.length;
-          if (!collapsed) {
-            var tokenText = end > upto ? text.slice(0, upto - pos) : text;
-            builder.addToken(builder, tokenText, style ? style + spanStyle : spanStyle,
-                             spanStartStyle, pos + tokenText.length == nextChange ? spanEndStyle : "", title, css);
-          }
-          if (end >= upto) {text = text.slice(upto - pos); pos = upto; break;}
-          pos = end;
-          spanStartStyle = "";
-        }
-        text = allText.slice(at, at = styles[i++]);
-        style = interpretTokenStyle(styles[i++], builder.cm.options);
-      }
-    }
-  }
-
-  // DOCUMENT DATA STRUCTURE
-
-  // By default, updates that start and end at the beginning of a line
-  // are treated specially, in order to make the association of line
-  // widgets and marker elements with the text behave more intuitive.
-  function isWholeLineUpdate(doc, change) {
-    return change.from.ch == 0 && change.to.ch == 0 && lst(change.text) == "" &&
-      (!doc.cm || doc.cm.options.wholeLineUpdateBefore);
-  }
-
-  // Perform a change on the document data structure.
-  function updateDoc(doc, change, markedSpans, estimateHeight) {
-    function spansFor(n) {return markedSpans ? markedSpans[n] : null;}
-    function update(line, text, spans) {
-      updateLine(line, text, spans, estimateHeight);
-      signalLater(line, "change", line, change);
-    }
-    function linesFor(start, end) {
-      for (var i = start, result = []; i < end; ++i)
-        result.push(new Line(text[i], spansFor(i), estimateHeight));
-      return result;
-    }
-
-    var from = change.from, to = change.to, text = change.text;
-    var firstLine = getLine(doc, from.line), lastLine = getLine(doc, to.line);
-    var lastText = lst(text), lastSpans = spansFor(text.length - 1), nlines = to.line - from.line;
-
-    // Adjust the line structure
-    if (change.full) {
-      doc.insert(0, linesFor(0, text.length));
-      doc.remove(text.length, doc.size - text.length);
-    } else if (isWholeLineUpdate(doc, change)) {
-      // This is a whole-line replace. Treated specially to make
-      // sure line objects move the way they are supposed to.
-      var added = linesFor(0, text.length - 1);
-      update(lastLine, lastLine.text, lastSpans);
-      if (nlines) doc.remove(from.line, nlines);
-      if (added.length) doc.insert(from.line, added);
-    } else if (firstLine == lastLine) {
-      if (text.length == 1) {
-        update(firstLine, firstLine.text.slice(0, from.ch) + lastText + firstLine.text.slice(to.ch), lastSpans);
-      } else {
-        var added = linesFor(1, text.length - 1);
-        added.push(new Line(lastText + firstLine.text.slice(to.ch), lastSpans, estimateHeight));
-        update(firstLine, firstLine.text.slice(0, from.ch) + text[0], spansFor(0));
-        doc.insert(from.line + 1, added);
-      }
-    } else if (text.length == 1) {
-      update(firstLine, firstLine.text.slice(0, from.ch) + text[0] + lastLine.text.slice(to.ch), spansFor(0));
-      doc.remove(from.line + 1, nlines);
-    } else {
-      update(firstLine, firstLine.text.slice(0, from.ch) + text[0], spansFor(0));
-      update(lastLine, lastText + lastLine.text.slice(to.ch), lastSpans);
-      var added = linesFor(1, text.length - 1);
-      if (nlines > 1) doc.remove(from.line + 1, nlines - 1);
-      doc.insert(from.line + 1, added);
-    }
-
-    signalLater(doc, "change", doc, change);
-  }
-
-  // The document is represented as a BTree consisting of leaves, with
-  // chunk of lines in them, and branches, with up to ten leaves or
-  // other branch nodes below them. The top node is always a branch
-  // node, and is the document object itself (meaning it has
-  // additional methods and properties).
-  //
-  // All nodes have parent links. The tree is used both to go from
-  // line numbers to line objects, and to go from objects to numbers.
-  // It also indexes by height, and is used to convert between height
-  // and line object, and to find the total height of the document.
-  //
-  // See also http://marijnhaverbeke.nl/blog/codemirror-line-tree.html
-
-  function LeafChunk(lines) {
-    this.lines = lines;
-    this.parent = null;
-    for (var i = 0, height = 0; i < lines.length; ++i) {
-      lines[i].parent = this;
-      height += lines[i].height;
-    }
-    this.height = height;
-  }
-
-  LeafChunk.prototype = {
-    chunkSize: function() { return this.lines.length; },
-    // Remove the n lines at offset 'at'.
-    removeInner: function(at, n) {
-      for (var i = at, e = at + n; i < e; ++i) {
-        var line = this.lines[i];
-        this.height -= line.height;
-        cleanUpLine(line);
-        signalLater(line, "delete");
-      }
-      this.lines.splice(at, n);
-    },
-    // Helper used to collapse a small branch into a single leaf.
-    collapse: function(lines) {
-      lines.push.apply(lines, this.lines);
-    },
-    // Insert the given array of lines at offset 'at', count them as
-    // having the given height.
-    insertInner: function(at, lines, height) {
-      this.height += height;
-      this.lines = this.lines.slice(0, at).concat(lines).concat(this.lines.slice(at));
-      for (var i = 0; i < lines.length; ++i) lines[i].parent = this;
-    },
-    // Used to iterate over a part of the tree.
-    iterN: function(at, n, op) {
-      for (var e = at + n; at < e; ++at)
-        if (op(this.lines[at])) return true;
-    }
-  };
-
-  function BranchChunk(children) {
-    this.children = children;
-    var size = 0, height = 0;
-    for (var i = 0; i < children.length; ++i) {
-      var ch = children[i];
-      size += ch.chunkSize(); height += ch.height;
-      ch.parent = this;
-    }
-    this.size = size;
-    this.height = height;
-    this.parent = null;
-  }
-
-  BranchChunk.prototype = {
-    chunkSize: function() { return this.size; },
-    removeInner: function(at, n) {
-      this.size -= n;
-      for (var i = 0; i < this.children.length; ++i) {
-        var child = this.children[i], sz = child.chunkSize();
-        if (at < sz) {
-          var rm = Math.min(n, sz - at), oldHeight = child.height;
-          child.removeInner(at, rm);
-          this.height -= oldHeight - child.height;
-          if (sz == rm) { this.children.splice(i--, 1); child.parent = null; }
-          if ((n -= rm) == 0) break;
-          at = 0;
-        } else at -= sz;
-      }
-      // If the result is smaller than 25 lines, ensure that it is a
-      // single leaf node.
-      if (this.size - n < 25 &&
-          (this.children.length > 1 || !(this.children[0] instanceof LeafChunk))) {
-        var lines = [];
-        this.collapse(lines);
-        this.children = [new LeafChunk(lines)];
-        this.children[0].parent = this;
-      }
-    },
-    collapse: function(lines) {
-      for (var i = 0; i < this.children.length; ++i) this.children[i].collapse(lines);
-    },
-    insertInner: function(at, lines, height) {
-      this.size += lines.length;
-      this.height += height;
-      for (var i = 0; i < this.children.length; ++i) {
-        var child = this.children[i], sz = child.chunkSize();
-        if (at <= sz) {
-          child.insertInner(at, lines, height);
-          if (child.lines && child.lines.length > 50) {
-            while (child.lines.length > 50) {
-              var spilled = child.lines.splice(child.lines.length - 25, 25);
-              var newleaf = new LeafChunk(spilled);
-              child.height -= newleaf.height;
-              this.children.splice(i + 1, 0, newleaf);
-              newleaf.parent = this;
-            }
-            this.maybeSpill();
-          }
-          break;
-        }
-        at -= sz;
-      }
-    },
-    // When a node has grown, check whether it should be split.
-    maybeSpill: function() {
-      if (this.children.length <= 10) return;
-      var me = this;
-      do {
-        var spilled = me.children.splice(me.children.length - 5, 5);
-        var sibling = new BranchChunk(spilled);
-        if (!me.parent) { // Become the parent node
-          var copy = new BranchChunk(me.children);
-          copy.parent = me;
-          me.children = [copy, sibling];
-          me = copy;
-        } else {
-          me.size -= sibling.size;
-          me.height -= sibling.height;
-          var myIndex = indexOf(me.parent.children, me);
-          me.parent.children.splice(myIndex + 1, 0, sibling);
-        }
-        sibling.parent = me.parent;
-      } while (me.children.length > 10);
-      me.parent.maybeSpill();
-    },
-    iterN: function(at, n, op) {
-      for (var i = 0; i < this.children.length; ++i) {
-        var child = this.children[i], sz = child.chunkSize();
-        if (at < sz) {
-          var used = Math.min(n, sz - at);
-          if (child.iterN(at, used, op)) return true;
-          if ((n -= used) == 0) break;
-          at = 0;
-        } else at -= sz;
-      }
-    }
-  };
-
-  var nextDocId = 0;
-  var Doc = CodeMirror.Doc = function(text, mode, firstLine) {
-    if (!(this instanceof Doc)) return new Doc(text, mode, firstLine);
-    if (firstLine == null) firstLine = 0;
-
-    BranchChunk.call(this, [new LeafChunk([new Line("", null)])]);
-    this.first = firstLine;
-    this.scrollTop = this.scrollLeft = 0;
-    this.cantEdit = false;
-    this.cleanGeneration = 1;
-    this.frontier = firstLine;
-    var start = Pos(firstLine, 0);
-    this.sel = simpleSelection(start);
-    this.history = new History(null);
-    this.id = ++nextDocId;
-    this.modeOption = mode;
-
-    if (typeof text == "string") text = splitLines(text);
-    updateDoc(this, {from: start, to: start, text: text});
-    setSelection(this, simpleSelection(start), sel_dontScroll);
-  };
-
-  Doc.prototype = createObj(BranchChunk.prototype, {
-    constructor: Doc,
-    // Iterate over the document. Supports two forms -- with only one
-    // argument, it calls that for each line in the document. With
-    // three, it iterates over the range given by the first two (with
-    // the second being non-inclusive).
-    iter: function(from, to, op) {
-      if (op) this.iterN(from - this.first, to - from, op);
-      else this.iterN(this.first, this.first + this.size, from);
-    },
-
-    // Non-public interface for adding and removing lines.
-    insert: function(at, lines) {
-      var height = 0;
-      for (var i = 0; i < lines.length; ++i) height += lines[i].height;
-      this.insertInner(at - this.first, lines, height);
-    },
-    remove: function(at, n) { this.removeInner(at - this.first, n); },
-
-    // From here, the methods are part of the public interface. Most
-    // are also available from CodeMirror (editor) instances.
-
-    getValue: function(lineSep) {
-      var lines = getLines(this, this.first, this.first + this.size);
-      if (lineSep === false) return lines;
-      return lines.join(lineSep || "\n");
-    },
-    setValue: docMethodOp(function(code) {
-      var top = Pos(this.first, 0), last = this.first + this.size - 1;
-      makeChange(this, {from: top, to: Pos(last, getLine(this, last).text.length),
-                        text: splitLines(code), origin: "setValue", full: true}, true);
-      setSelection(this, simpleSelection(top));
-    }),
-    replaceRange: function(code, from, to, origin) {
-      from = clipPos(this, from);
-      to = to ? clipPos(this, to) : from;
-      replaceRange(this, code, from, to, origin);
-    },
-    getRange: function(from, to, lineSep) {
-      var lines = getBetween(this, clipPos(this, from), clipPos(this, to));
-      if (lineSep === false) return lines;
-      return lines.join(lineSep || "\n");
-    },
-
-    getLine: function(line) {var l = this.getLineHandle(line); return l && l.text;},
-
-    getLineHandle: function(line) {if (isLine(this, line)) return getLine(this, line);},
-    getLineNumber: function(line) {return lineNo(line);},
-
-    getLineHandleVisualStart: function(line) {
-      if (typeof line == "number") line = getLine(this, line);
-      return visualLine(line);
-    },
-
-    lineCount: function() {return this.size;},
-    firstLine: function() {return this.first;},
-    lastLine: function() {return this.first + this.size - 1;},
-
-    clipPos: function(pos) {return clipPos(this, pos);},
-
-    getCursor: function(start) {
-      var range = this.sel.primary(), pos;
-      if (start == null || start == "head") pos = range.head;
-      else if (start == "anchor") pos = range.anchor;
-      else if (start == "end" || start == "to" || start === false) pos = range.to();
-      else pos = range.from();
-      return pos;
-    },
-    listSelections: function() { return this.sel.ranges; },
-    somethingSelected: function() {return this.sel.somethingSelected();},
-
-    setCursor: docMethodOp(function(line, ch, options) {
-      setSimpleSelection(this, clipPos(this, typeof line == "number" ? Pos(line, ch || 0) : line), null, options);
-    }),
-    setSelection: docMethodOp(function(anchor, head, options) {
-      setSimpleSelection(this, clipPos(this, anchor), clipPos(this, head || anchor), options);
-    }),
-    extendSelection: docMethodOp(function(head, other, options) {
-      extendSelection(this, clipPos(this, head), other && clipPos(this, other), options);
-    }),
-    extendSelections: docMethodOp(function(heads, options) {
-      extendSelections(this, clipPosArray(this, heads, options));
-    }),
-    extendSelectionsBy: docMethodOp(function(f, options) {
-      extendSelections(this, map(this.sel.ranges, f), options);
-    }),
-    setSelections: docMethodOp(function(ranges, primary, options) {
-      if (!ranges.length) return;
-      for (var i = 0, out = []; i < ranges.length; i++)
-        out[i] = new Range(clipPos(this, ranges[i].anchor),
-                           clipPos(this, ranges[i].head));
-      if (primary == null) primary = Math.min(ranges.length - 1, this.sel.primIndex);
-      setSelection(this, normalizeSelection(out, primary), options);
-    }),
-    addSelection: docMethodOp(function(anchor, head, options) {
-      var ranges = this.sel.ranges.slice(0);
-      ranges.push(new Range(clipPos(this, anchor), clipPos(this, head || anchor)));
-      setSelection(this, normalizeSelection(ranges, ranges.length - 1), options);
-    }),
-
-    getSelection: function(lineSep) {
-      var ranges = this.sel.ranges, lines;
-      for (var i = 0; i < ranges.length; i++) {
-        var sel = getBetween(this, ranges[i].from(), ranges[i].to());
-        lines = lines ? lines.concat(sel) : sel;
-      }
-      if (lineSep === false) return lines;
-      else return lines.join(lineSep || "\n");
-    },
-    getSelections: function(lineSep) {
-      var parts = [], ranges = this.sel.ranges;
-      for (var i = 0; i < ranges.length; i++) {
-        var sel = getBetween(this, ranges[i].from(), ranges[i].to());
-        if (lineSep !== false) sel = sel.join(lineSep || "\n");
-        parts[i] = sel;
-      }
-      return parts;
-    },
-    replaceSelection: function(code, collapse, origin) {
-      var dup = [];
-      for (var i = 0; i < this.sel.ranges.length; i++)
-        dup[i] = code;
-      this.replaceSelections(dup, collapse, origin || "+input");
-    },
-    replaceSelections: docMethodOp(function(code, collapse, origin) {
-      var changes = [], sel = this.sel;
-      for (var i = 0; i < sel.ranges.length; i++) {
-        var range = sel.ranges[i];
-        changes[i] = {from: range.from(), to: range.to(), text: splitLines(code[i]), origin: origin};
-      }
-      var newSel = collapse && collapse != "end" && computeReplacedSel(this, changes, collapse);
-      for (var i = changes.length - 1; i >= 0; i--)
-        makeChange(this, changes[i]);
-      if (newSel) setSelectionReplaceHistory(this, newSel);
-      else if (this.cm) ensureCursorVisible(this.cm);
-    }),
-    undo: docMethodOp(function() {makeChangeFromHistory(this, "undo");}),
-    redo: docMethodOp(function() {makeChangeFromHistory(this, "redo");}),
-    undoSelection: docMethodOp(function() {makeChangeFromHistory(this, "undo", true);}),
-    redoSelection: docMethodOp(function() {makeChangeFromHistory(this, "redo", true);}),
-
-    setExtending: function(val) {this.extend = val;},
-    getExtending: function() {return this.extend;},
-
-    historySize: function() {
-      var hist = this.history, done = 0, undone = 0;
-      for (var i = 0; i < hist.done.length; i++) if (!hist.done[i].ranges) ++done;
-      for (var i = 0; i < hist.undone.length; i++) if (!hist.undone[i].ranges) ++undone;
-      return {undo: done, redo: undone};
-    },
-    clearHistory: function() {this.history = new History(this.history.maxGeneration);},
-
-    markClean: function() {
-      this.cleanGeneration = this.changeGeneration(true);
-    },
-    changeGeneration: function(forceSplit) {
-      if (forceSplit)
-        this.history.lastOp = this.history.lastSelOp = this.history.lastOrigin = null;
-      return this.history.generation;
-    },
-    isClean: function (gen) {
-      return this.history.generation == (gen || this.cleanGeneration);
-    },
-
-    getHistory: function() {
-      return {done: copyHistoryArray(this.history.done),
-              undone: copyHistoryArray(this.history.undone)};
-    },
-    setHistory: function(histData) {
-      var hist = this.history = new History(this.history.maxGeneration);
-      hist.done = copyHistoryArray(histData.done.slice(0), null, true);
-      hist.undone = copyHistoryArray(histData.undone.slice(0), null, true);
-    },
-
-    addLineClass: docMethodOp(function(handle, where, cls) {
-      return changeLine(this, handle, where == "gutter" ? "gutter" : "class", function(line) {
-        var prop = where == "text" ? "textClass"
-                 : where == "background" ? "bgClass"
-                 : where == "gutter" ? "gutterClass" : "wrapClass";
-        if (!line[prop]) line[prop] = cls;
-        else if (classTest(cls).test(line[prop])) return false;
-        else line[prop] += " " + cls;
-        return true;
-      });
-    }),
-    removeLineClass: docMethodOp(function(handle, where, cls) {
-      return changeLine(this, handle, where == "gutter" ? "gutter" : "class", function(line) {
-        var prop = where == "text" ? "textClass"
-                 : where == "background" ? "bgClass"
-                 : where == "gutter" ? "gutterClass" : "wrapClass";
-        var cur = line[prop];
-        if (!cur) return false;
-        else if (cls == null) line[prop] = null;
-        else {
-          var found = cur.match(classTest(cls));
-          if (!found) return false;
-          var end = found.index + found[0].length;
-          line[prop] = cur.slice(0, found.index) + (!found.index || end == cur.length ? "" : " ") + cur.slice(end) || null;
-        }
-        return true;
-      });
-    }),
-
-    addLineWidget: docMethodOp(function(handle, node, options) {
-      return addLineWidget(this, handle, node, options);
-    }),
-    removeLineWidget: function(widget) { widget.clear(); },
-
-    markText: function(from, to, options) {
-      return markText(this, clipPos(this, from), clipPos(this, to), options, "range");
-    },
-    setBookmark: function(pos, options) {
-      var realOpts = {replacedWith: options && (options.nodeType == null ? options.widget : options),
-                      insertLeft: options && options.insertLeft,
-                      clearWhenEmpty: false, shared: options && options.shared,
-                      handleMouseEvents: options && options.handleMouseEvents};
-      pos = clipPos(this, pos);
-      return markText(this, pos, pos, realOpts, "bookmark");
-    },
-    findMarksAt: function(pos) {
-      pos = clipPos(this, pos);
-      var markers = [], spans = getLine(this, pos.line).markedSpans;
-      if (spans) for (var i = 0; i < spans.length; ++i) {
-        var span = spans[i];
-        if ((span.from == null || span.from <= pos.ch) &&
-            (span.to == null || span.to >= pos.ch))
-          markers.push(span.marker.parent || span.marker);
-      }
-      return markers;
-    },
-    findMarks: function(from, to, filter) {
-      from = clipPos(this, from); to = clipPos(this, to);
-      var found = [], lineNo = from.line;
-      this.iter(from.line, to.line + 1, function(line) {
-        var spans = line.markedSpans;
-        if (spans) for (var i = 0; i < spans.length; i++) {
-          var span = spans[i];
-          if (!(lineNo == from.line && from.ch > span.to ||
-                span.from == null && lineNo != from.line||
-                lineNo == to.line && span.from > to.ch) &&
-              (!filter || filter(span.marker)))
-            found.push(span.marker.parent || span.marker);
-        }
-        ++lineNo;
-      });
-      return found;
-    },
-    getAllMarks: function() {
-      var markers = [];
-      this.iter(function(line) {
-        var sps = line.markedSpans;
-        if (sps) for (var i = 0; i < sps.length; ++i)
-          if (sps[i].from != null) markers.push(sps[i].marker);
-      });
-      return markers;
-    },
-
-    posFromIndex: function(off) {
-      var ch, lineNo = this.first;
-      this.iter(function(line) {
-        var sz = line.text.length + 1;
-        if (sz > off) { ch = off; return true; }
-        off -= sz;
-        ++lineNo;
-      });
-      return clipPos(this, Pos(lineNo, ch));
-    },
-    indexFromPos: function (coords) {
-      coords = clipPos(this, coords);
-      var index = coords.ch;
-      if (coords.line < this.first || coords.ch < 0) return 0;
-      this.iter(this.first, coords.line, function (line) {
-        index += line.text.length + 1;
-      });
-      return index;
-    },
-
-    copy: function(copyHistory) {
-      var doc = new Doc(getLines(this, this.first, this.first + this.size), this.modeOption, this.first);
-      doc.scrollTop = this.scrollTop; doc.scrollLeft = this.scrollLeft;
-      doc.sel = this.sel;
-      doc.extend = false;
-      if (copyHistory) {
-        doc.history.undoDepth = this.history.undoDepth;
-        doc.setHistory(this.getHistory());
-      }
-      return doc;
-    },
-
-    linkedDoc: function(options) {
-      if (!options) options = {};
-      var from = this.first, to = this.first + this.size;
-      if (options.from != null && options.from > from) from = options.from;
-      if (options.to != null && options.to < to) to = options.to;
-      var copy = new Doc(getLines(this, from, to), options.mode || this.modeOption, from);
-      if (options.sharedHist) copy.history = this.history;
-      (this.linked || (this.linked = [])).push({doc: copy, sharedHist: options.sharedHist});
-      copy.linked = [{doc: this, isParent: true, sharedHist: options.sharedHist}];
-      copySharedMarkers(copy, findSharedMarkers(this));
-      return copy;
-    },
-    unlinkDoc: function(other) {
-      if (other instanceof CodeMirror) other = other.doc;
-      if (this.linked) for (var i = 0; i < this.linked.length; ++i) {
-        var link = this.linked[i];
-        if (link.doc != other) continue;
-        this.linked.splice(i, 1);
-        other.unlinkDoc(this);
-        detachSharedMarkers(findSharedMarkers(this));
-        break;
-      }
-      // If the histories were shared, split them again
-      if (other.history == this.history) {
-        var splitIds = [other.id];
-        linkedDocs(other, function(doc) {splitIds.push(doc.id);}, true);
-        other.history = new History(null);
-        other.history.done = copyHistoryArray(this.history.done, splitIds);
-        other.history.undone = copyHistoryArray(this.history.undone, splitIds);
-      }
-    },
-    iterLinkedDocs: function(f) {linkedDocs(this, f);},
-
-    getMode: function() {return this.mode;},
-    getEditor: function() {return this.cm;}
-  });
-
-  // Public alias.
-  Doc.prototype.eachLine = Doc.prototype.iter;
-
-  // Set up methods on CodeMirror's prototype to redirect to the editor's document.
-  var dontDelegate = "iter insert remove copy getEditor constructor".split(" ");
-  for (var prop in Doc.prototype) if (Doc.prototype.hasOwnProperty(prop) && indexOf(dontDelegate, prop) < 0)
-    CodeMirror.prototype[prop] = (function(method) {
-      return function() {return method.apply(this.doc, arguments);};
-    })(Doc.prototype[prop]);
-
-  eventMixin(Doc);
-
-  // Call f for all linked documents.
-  function linkedDocs(doc, f, sharedHistOnly) {
-    function propagate(doc, skip, sharedHist) {
-      if (doc.linked) for (var i = 0; i < doc.linked.length; ++i) {
-        var rel = doc.linked[i];
-        if (rel.doc == skip) continue;
-        var shared = sharedHist && rel.sharedHist;
-        if (sharedHistOnly && !shared) continue;
-        f(rel.doc, shared);
-        propagate(rel.doc, doc, shared);
-      }
-    }
-    propagate(doc, null, true);
-  }
-
-  // Attach a document to an editor.
-  function attachDoc(cm, doc) {
-    if (doc.cm) throw new Error("This document is already in use.");
-    cm.doc = doc;
-    doc.cm = cm;
-    estimateLineHeights(cm);
-    loadMode(cm);
-    if (!cm.options.lineWrapping) findMaxLine(cm);
-    cm.options.mode = doc.modeOption;
-    regChange(cm);
-  }
-
-  // LINE UTILITIES
-
-  // Find the line object corresponding to the given line number.
-  function getLine(doc, n) {
-    n -= doc.first;
-    if (n < 0 || n >= doc.size) throw new Error("There is no line " + (n + doc.first) + " in the document.");
-    for (var chunk = doc; !chunk.lines;) {
-      for (var i = 0;; ++i) {
-        var child = chunk.children[i], sz = child.chunkSize();
-        if (n < sz) { chunk = child; break; }
-        n -= sz;
-      }
-    }
-    return chunk.lines[n];
-  }
-
-  // Get the part of a document between two positions, as an array of
-  // strings.
-  function getBetween(doc, start, end) {
-    var out = [], n = start.line;
-    doc.iter(start.line, end.line + 1, function(line) {
-      var text = line.text;
-      if (n == end.line) text = text.slice(0, end.ch);
-      if (n == start.line) text = text.slice(start.ch);
-      out.push(text);
-      ++n;
-    });
-    return out;
-  }
-  // Get the lines between from and to, as array of strings.
-  function getLines(doc, from, to) {
-    var out = [];
-    doc.iter(from, to, function(line) { out.push(line.text); });
-    return out;
-  }
-
-  // Update the height of a line, propagating the height change
-  // upwards to parent nodes.
-  function updateLineHeight(line, height) {
-    var diff = height - line.height;
-    if (diff) for (var n = line; n; n = n.parent) n.height += diff;
-  }
-
-  // Given a line object, find its line number by walking up through
-  // its parent links.
-  function lineNo(line) {
-    if (line.parent == null) return null;
-    var cur = line.parent, no = indexOf(cur.lines, line);
-    for (var chunk = cur.parent; chunk; cur = chunk, chunk = chunk.parent) {
-      for (var i = 0;; ++i) {
-        if (chunk.children[i] == cur) break;
-        no += chunk.children[i].chunkSize();
-      }
-    }
-    return no + cur.first;
-  }
-
-  // Find the line at the given vertical position, using the height
-  // information in the document tree.
-  function lineAtHeight(chunk, h) {
-    var n = chunk.first;
-    outer: do {
-      for (var i = 0; i < chunk.children.length; ++i) {
-        var child = chunk.children[i], ch = child.height;
-        if (h < ch) { chunk = child; continue outer; }
-        h -= ch;
-        n += child.chunkSize();
-      }
-      return n;
-    } while (!chunk.lines);
-    for (var i = 0; i < chunk.lines.length; ++i) {
-      var line = chunk.lines[i], lh = line.height;
-      if (h < lh) break;
-      h -= lh;
-    }
-    return n + i;
-  }
-
-
-  // Find the height above the given line.
-  function heightAtLine(lineObj) {
-    lineObj = visualLine(lineObj);
-
-    var h = 0, chunk = lineObj.parent;
-    for (var i = 0; i < chunk.lines.length; ++i) {
-      var line = chunk.lines[i];
-      if (line == lineObj) break;
-      else h += line.height;
-    }
-    for (var p = chunk.parent; p; chunk = p, p = chunk.parent) {
-      for (var i = 0; i < p.children.length; ++i) {
-        var cur = p.children[i];
-        if (cur == chunk) break;
-        else h += cur.height;
-      }
-    }
-    return h;
-  }
-
-  // Get the bidi ordering for the given line (and cache it). Returns
-  // false for lines that are fully left-to-right, and an array of
-  // BidiSpan objects otherwise.
-  function getOrder(line) {
-    var order = line.order;
-    if (order == null) order = line.order = bidiOrdering(line.text);
-    return order;
-  }
-
-  // HISTORY
-
-  function History(startGen) {
-    // Arrays of change events and selections. Doing something adds an
-    // event to done and clears undo. Undoing moves events from done
-    // to undone, redoing moves them in the other direction.
-    this.done = []; this.undone = [];
-    this.undoDepth = Infinity;
-    // Used to track when changes can be merged into a single undo
-    // event
-    this.lastModTime = this.lastSelTime = 0;
-    this.lastOp = this.lastSelOp = null;
-    this.lastOrigin = this.lastSelOrigin = null;
-    // Used by the isClean() method
-    this.generation = this.maxGeneration = startGen || 1;
-  }
-
-  // Create a history change event from an updateDoc-style change
-  // object.
-  function historyChangeFromChange(doc, change) {
-    var histChange = {from: copyPos(change.from), to: changeEnd(change), text: getBetween(doc, change.from, change.to)};
-    attachLocalSpans(doc, histChange, change.from.line, change.to.line + 1);
-    linkedDocs(doc, function(doc) {attachLocalSpans(doc, histChange, change.from.line, change.to.line + 1);}, true);
-    return histChange;
-  }
-
-  // Pop all selection events off the end of a history array. Stop at
-  // a change event.
-  function clearSelectionEvents(array) {
-    while (array.length) {
-      var last = lst(array);
-      if (last.ranges) array.pop();
-      else break;
-    }
-  }
-
-  // Find the top change event in the history. Pop off selection
-  // events that are in the way.
-  function lastChangeEvent(hist, force) {
-    if (force) {
-      clearSelectionEvents(hist.done);
-      return lst(hist.done);
-    } else if (hist.done.length && !lst(hist.done).ranges) {
-      return lst(hist.done);
-    } else if (hist.done.length > 1 && !hist.done[hist.done.length - 2].ranges) {
-      hist.done.pop();
-      return lst(hist.done);
-    }
-  }
-
-  // Register a change in the history. Merges changes that are within
-  // a single operation, ore are close together with an origin that
-  // allows merging (starting with "+") into a single event.
-  function addChangeToHistory(doc, change, selAfter, opId) {
-    var hist = doc.history;
-    hist.undone.length = 0;
-    var time = +new Date, cur;
-
-    if ((hist.lastOp == opId ||
-         hist.lastOrigin == change.origin && change.origin &&
-         ((change.origin.charAt(0) == "+" && doc.cm && hist.lastModTime > time - doc.cm.options.historyEventDelay) ||
-          change.origin.charAt(0) == "*")) &&
-        (cur = lastChangeEvent(hist, hist.lastOp == opId))) {
-      // Merge this change into the last event
-      var last = lst(cur.changes);
-      if (cmp(change.from, change.to) == 0 && cmp(change.from, last.to) == 0) {
-        // Optimized case for simple insertion -- don't want to add
-        // new changesets for every character typed
-        last.to = changeEnd(change);
-      } else {
-        // Add new sub-event
-        cur.changes.push(historyChangeFromChange(doc, change));
-      }
-    } else {
-      // Can not be merged, start a new event.
-      var before = lst(hist.done);
-      if (!before || !before.ranges)
-        pushSelectionToHistory(doc.sel, hist.done);
-      cur = {changes: [historyChangeFromChange(doc, change)],
-             generation: hist.generation};
-      hist.done.push(cur);
-      while (hist.done.length > hist.undoDepth) {
-        hist.done.shift();
-        if (!hist.done[0].ranges) hist.done.shift();
-      }
-    }
-    hist.done.push(selAfter);
-    hist.generation = ++hist.maxGeneration;
-    hist.lastModTime = hist.lastSelTime = time;
-    hist.lastOp = hist.lastSelOp = opId;
-    hist.lastOrigin = hist.lastSelOrigin = change.origin;
-
-    if (!last) signal(doc, "historyAdded");
-  }
-
-  function selectionEventCanBeMerged(doc, origin, prev, sel) {
-    var ch = origin.charAt(0);
-    return ch == "*" ||
-      ch == "+" &&
-      prev.ranges.length == sel.ranges.length &&
-      prev.somethingSelected() == sel.somethingSelected() &&
-      new Date - doc.history.lastSelTime <= (doc.cm ? doc.cm.options.historyEventDelay : 500);
-  }
-
-  // Called whenever the selection changes, sets the new selection as
-  // the pending selection in the history, and pushes the old pending
-  // selection into the 'done' array when it was significantly
-  // different (in number of selected ranges, emptiness, or time).
-  function addSelectionToHistory(doc, sel, opId, options) {
-    var hist = doc.history, origin = options && options.origin;
-
-    // A new event is started when the previous origin does not match
-    // the current, or the origins don't allow matching. Origins
-    // starting with * are always merged, those starting with + are
-    // merged when similar and close together in time.
-    if (opId == hist.lastSelOp ||
-        (origin && hist.lastSelOrigin == origin &&
-         (hist.lastModTime == hist.lastSelTime && hist.lastOrigin == origin ||
-          selectionEventCanBeMerged(doc, origin, lst(hist.done), sel))))
-      hist.done[hist.done.length - 1] = sel;
-    else
-      pushSelectionToHistory(sel, hist.done);
-
-    hist.lastSelTime = +new Date;
-    hist.lastSelOrigin = origin;
-    hist.lastSelOp = opId;
-    if (options && options.clearRedo !== false)
-      clearSelectionEvents(hist.undone);
-  }
-
-  function pushSelectionToHistory(sel, dest) {
-    var top = lst(dest);
-    if (!(top && top.ranges && top.equals(sel)))
-      dest.push(sel);
-  }
-
-  // Used to store marked span information in the history.
-  function attachLocalSpans(doc, change, from, to) {
-    var existing = change["spans_" + doc.id], n = 0;
-    doc.iter(Math.max(doc.first, from), Math.min(doc.first + doc.size, to), function(line) {
-      if (line.markedSpans)
-        (existing || (existing = change["spans_" + doc.id] = {}))[n] = line.markedSpans;
-      ++n;
-    });
-  }
-
-  // When un/re-doing restores text containing marked spans, those
-  // that have been explicitly cleared should not be restored.
-  function removeClearedSpans(spans) {
-    if (!spans) return null;
-    for (var i = 0, out; i < spans.length; ++i) {
-      if (spans[i].marker.explicitlyCleared) { if (!out) out = spans.slice(0, i); }
-      else if (out) out.push(spans[i]);
-    }
-    return !out ? spans : out.length ? out : null;
-  }
-
-  // Retrieve and filter the old marked spans stored in a change event.
-  function getOldSpans(doc, change) {
-    var found = change["spans_" + doc.id];
-    if (!found) return null;
-    for (var i = 0, nw = []; i < change.text.length; ++i)
-      nw.push(removeClearedSpans(found[i]));
-    return nw;
-  }
-
-  // Used both to provide a JSON-safe object in .getHistory, and, when
-  // detaching a document, to split the history in two
-  function copyHistoryArray(events, newGroup, instantiateSel) {
-    for (var i = 0, copy = []; i < events.length; ++i) {
-      var event = events[i];
-      if (event.ranges) {
-        copy.push(instantiateSel ? Selection.prototype.deepCopy.call(event) : event);
-        continue;
-      }
-      var changes = event.changes, newChanges = [];
-      copy.push({changes: newChanges});
-      for (var j = 0; j < changes.length; ++j) {
-        var change = changes[j], m;
-        newChanges.push({from: change.from, to: change.to, text: change.text});
-        if (newGroup) for (var prop in change) if (m = prop.match(/^spans_(\d+)$/)) {
-          if (indexOf(newGroup, Number(m[1])) > -1) {
-            lst(newChanges)[prop] = change[prop];
-            delete change[prop];
-          }
-        }
-      }
-    }
-    return copy;
-  }
-
-  // Rebasing/resetting history to deal with externally-sourced changes
-
-  function rebaseHistSelSingle(pos, from, to, diff) {
-    if (to < pos.line) {
-      pos.line += diff;
-    } else if (from < pos.line) {
-      pos.line = from;
-      pos.ch = 0;
-    }
-  }
-
-  // Tries to rebase an array of history events given a change in the
-  // document. If the change touches the same lines as the event, the
-  // event, and everything 'behind' it, is discarded. If the change is
-  // before the event, the event's positions are updated. Uses a
-  // copy-on-write scheme for the positions, to avoid having to
-  // reallocate them all on every rebase, but also avoid problems with
-  // shared position objects being unsafely updated.
-  function rebaseHistArray(array, from, to, diff) {
-    for (var i = 0; i < array.length; ++i) {
-      var sub = array[i], ok = true;
-      if (sub.ranges) {
-        if (!sub.copied) { sub = array[i] = sub.deepCopy(); sub.copied = true; }
-        for (var j = 0; j < sub.ranges.length; j++) {
-          rebaseHistSelSingle(sub.ranges[j].anchor, from, to, diff);
-          rebaseHistSelSingle(sub.ranges[j].head, from, to, diff);
-        }
-        continue;
-      }
-      for (var j = 0; j < sub.changes.length; ++j) {
-        var cur = sub.changes[j];
-        if (to < cur.from.line) {
-          cur.from = Pos(cur.from.line + diff, cur.from.ch);
-          cur.to = Pos(cur.to.line + diff, cur.to.ch);
-        } else if (from <= cur.to.line) {
-          ok = false;
-          break;
-        }
-      }
-      if (!ok) {
-        array.splice(0, i + 1);
-        i = 0;
-      }
-    }
-  }
-
-  function rebaseHist(hist, change) {
-    var from = change.from.line, to = change.to.line, diff = change.text.length - (to - from) - 1;
-    rebaseHistArray(hist.done, from, to, diff);
-    rebaseHistArray(hist.undone, from, to, diff);
-  }
-
-  // EVENT UTILITIES
-
-  // Due to the fact that we still support jurassic IE versions, some
-  // compatibility wrappers are needed.
-
-  var e_preventDefault = CodeMirror.e_preventDefault = function(e) {
-    if (e.preventDefault) e.preventDefault();
-    else e.returnValue = false;
-  };
-  var e_stopPropagation = CodeMirror.e_stopPropagation = function(e) {
-    if (e.stopPropagation) e.stopPropagation();
-    else e.cancelBubble = true;
-  };
-  function e_defaultPrevented(e) {
-    return e.defaultPrevented != null ? e.defaultPrevented : e.returnValue == false;
-  }
-  var e_stop = CodeMirror.e_stop = function(e) {e_preventDefault(e); e_stopPropagation(e);};
-
-  function e_target(e) {return e.target || e.srcElement;}
-  function e_button(e) {
-    var b = e.which;
-    if (b == null) {
-      if (e.button & 1) b = 1;
-      else if (e.button & 2) b = 3;
-      else if (e.button & 4) b = 2;
-    }
-    if (mac && e.ctrlKey && b == 1) b = 3;
-    return b;
-  }
-
-  // EVENT HANDLING
-
-  // Lightweight event framework. on/off also work on DOM nodes,
-  // registering native DOM handlers.
-
-  var on = CodeMirror.on = function(emitter, type, f) {
-    if (emitter.addEventListener)
-      emitter.addEventListener(type, f, false);
-    else if (emitter.attachEvent)
-      emitter.attachEvent("on" + type, f);
-    else {
-      var map = emitter._handlers || (emitter._handlers = {});
-      var arr = map[type] || (map[type] = []);
-      arr.push(f);
-    }
-  };
-
-  var off = CodeMirror.off = function(emitter, type, f) {
-    if (emitter.removeEventListener)
-      emitter.removeEventListener(type, f, false);
-    else if (emitter.detachEvent)
-      emitter.detachEvent("on" + type, f);
-    else {
-      var arr = emitter._handlers && emitter._handlers[type];
-      if (!arr) return;
-      for (var i = 0; i < arr.length; ++i)
-        if (arr[i] == f) { arr.splice(i, 1); break; }
-    }
-  };
-
-  var signal = CodeMirror.signal = function(emitter, type /*, values...*/) {
-    var arr = emitter._handlers && emitter._handlers[type];
-    if (!arr) return;
-    var args = Array.prototype.slice.call(arguments, 2);
-    for (var i = 0; i < arr.length; ++i) arr[i].apply(null, args);
-  };
-
-  var orphanDelayedCallbacks = null;
-
-  // Often, we want to signal events at a point where we are in the
-  // middle of some work, but don't want the handler to start calling
-  // other methods on the editor, which might be in an inconsistent
-  // state or simply not expect any other events to happen.
-  // signalLater looks whether there are any handlers, and schedules
-  // them to be executed when the last operation ends, or, if no
-  // operation is active, when a timeout fires.
-  function signalLater(emitter, type /*, values...*/) {
-    var arr = emitter._handlers && emitter._handlers[type];
-    if (!arr) return;
-    var args = Array.prototype.slice.call(arguments, 2), list;
-    if (operationGroup) {
-      list = operationGroup.delayedCallbacks;
-    } else if (orphanDelayedCallbacks) {
-      list = orphanDelayedCallbacks;
-    } else {
-      list = orphanDelayedCallbacks = [];
-      setTimeout(fireOrphanDelayed, 0);
-    }
-    function bnd(f) {return function(){f.apply(null, args);};};
-    for (var i = 0; i < arr.length; ++i)
-      list.push(bnd(arr[i]));
-  }
-
-  function fireOrphanDelayed() {
-    var delayed = orphanDelayedCallbacks;
-    orphanDelayedCallbacks = null;
-    for (var i = 0; i < delayed.length; ++i) delayed[i]();
-  }
-
-  // The DOM events that CodeMirror handles can be overridden by
-  // registering a (non-DOM) handler on the editor for the event name,
-  // and preventDefault-ing the event in that handler.
-  function signalDOMEvent(cm, e, override) {
-    if (typeof e == "string")
-      e = {type: e, preventDefault: function() { this.defaultPrevented = true; }};
-    signal(cm, override || e.type, cm, e);
-    return e_defaultPrevented(e) || e.codemirrorIgnore;
-  }
-
-  function signalCursorActivity(cm) {
-    var arr = cm._handlers && cm._handlers.cursorActivity;
-    if (!arr) return;
-    var set = cm.curOp.cursorActivityHandlers || (cm.curOp.cursorActivityHandlers = []);
-    for (var i = 0; i < arr.length; ++i) if (indexOf(set, arr[i]) == -1)
-      set.push(arr[i]);
-  }
-
-  function hasHandler(emitter, type) {
-    var arr = emitter._handlers && emitter._handlers[type];
-    return arr && arr.length > 0;
-  }
-
-  // Add on and off methods to a constructor's prototype, to make
-  // registering events on such objects more convenient.
-  function eventMixin(ctor) {
-    ctor.prototype.on = function(type, f) {on(this, type, f);};
-    ctor.prototype.off = function(type, f) {off(this, type, f);};
-  }
-
-  // MISC UTILITIES
-
-  // Number of pixels added to scroller and sizer to hide scrollbar
-  var scrollerGap = 30;
-
-  // Returned or thrown by various protocols to signal 'I'm not
-  // handling this'.
-  var Pass = CodeMirror.Pass = {toString: function(){return "CodeMirror.Pass";}};
-
-  // Reused option objects for setSelection & friends
-  var sel_dontScroll = {scroll: false}, sel_mouse = {origin: "*mouse"}, sel_move = {origin: "+move"};
-
-  function Delayed() {this.id = null;}
-  Delayed.prototype.set = function(ms, f) {
-    clearTimeout(this.id);
-    this.id = setTimeout(f, ms);
-  };
-
-  // Counts the column offset in a string, taking tabs into account.
-  // Used mostly to find indentation.
-  var countColumn = CodeMirror.countColumn = function(string, end, tabSize, startIndex, startValue) {
-    if (end == null) {
-      end = string.search(/[^\s\u00a0]/);
-      if (end == -1) end = string.length;
-    }
-    for (var i = startIndex || 0, n = startValue || 0;;) {
-      var nextTab = string.indexOf("\t", i);
-      if (nextTab < 0 || nextTab >= end)
-        return n + (end - i);
-      n += nextTab - i;
-      n += tabSize - (n % tabSize);
-      i = nextTab + 1;
-    }
-  };
-
-  // The inverse of countColumn -- find the offset that corresponds to
-  // a particular column.
-  function findColumn(string, goal, tabSize) {
-    for (var pos = 0, col = 0;;) {
-      var nextTab = string.indexOf("\t", pos);
-      if (nextTab == -1) nextTab = string.length;
-      var skipped = nextTab - pos;
-      if (nextTab == string.length || col + skipped >= goal)
-        return pos + Math.min(skipped, goal - col);
-      col += nextTab - pos;
-      col += tabSize - (col % tabSize);
-      pos = nextTab + 1;
-      if (col >= goal) return pos;
-    }
-  }
-
-  var spaceStrs = [""];
-  function spaceStr(n) {
-    while (spaceStrs.length <= n)
-      spaceStrs.push(lst(spaceStrs) + " ");
-    return spaceStrs[n];
-  }
-
-  function lst(arr) { return arr[arr.length-1]; }
-
-  var selectInput = function(node) { node.select(); };
-  if (ios) // Mobile Safari apparently has a bug where select() is broken.
-    selectInput = function(node) { node.selectionStart = 0; node.selectionEnd = node.value.length; };
-  else if (ie) // Suppress mysterious IE10 errors
-    selectInput = function(node) { try { node.select(); } catch(_e) {} };
-
-  function indexOf(array, elt) {
-    for (var i = 0; i < array.length; ++i)
-      if (array[i] == elt) return i;
-    return -1;
-  }
-  function map(array, f) {
-    var out = [];
-    for (var i = 0; i < array.length; i++) out[i] = f(array[i], i);
-    return out;
-  }
-
-  function nothing() {}
-
-  function createObj(base, props) {
-    var inst;
-    if (Object.create) {
-      inst = Object.create(base);
-    } else {
-      nothing.prototype = base;
-      inst = new nothing();
-    }
-    if (props) copyObj(props, inst);
-    return inst;
-  };
-
-  function copyObj(obj, target, overwrite) {
-    if (!target) target = {};
-    for (var prop in obj)
-      if (obj.hasOwnProperty(prop) && (overwrite !== false || !target.hasOwnProperty(prop)))
-        target[prop] = obj[prop];
-    return target;
-  }
-
-  function bind(f) {
-    var args = Array.prototype.slice.call(arguments, 1);
-    return function(){return f.apply(null, args);};
-  }
-
-  var nonASCIISingleCaseWordChar = /[\u00df\u0587\u0590-\u05f4\u0600-\u06ff\u3040-\u309f\u30a0-\u30ff\u3400-\u4db5\u4e00-\u9fcc\uac00-\ud7af]/;
-  var isWordCharBasic = CodeMirror.isWordChar = function(ch) {
-    return /\w/.test(ch) || ch > "\x80" &&
-      (ch.toUpperCase() != ch.toLowerCase() || nonASCIISingleCaseWordChar.test(ch));
-  };
-  function isWordChar(ch, helper) {
-    if (!helper) return isWordCharBasic(ch);
-    if (helper.source.indexOf("\\w") > -1 && isWordCharBasic(ch)) return true;
-    return helper.test(ch);
-  }
-
-  function isEmpty(obj) {
-    for (var n in obj) if (obj.hasOwnProperty(n) && obj[n]) return false;
-    return true;
-  }
-
-  // Extending unicode characters. A series of a non-extending char +
-  // any number of extending chars is treated as a single unit as far
-  // as editing and measuring is concerned. This is not fully correct,
-  // since some scripts/fonts/browsers also treat other configurations
-  // of code points as a group.
-  var extendingChars = /[\u0300-\u036f\u0483-\u0489\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u065e\u0670\u06d6-\u06dc\u06de-\u06e4\u06e7\u06e8\u06ea-\u06ed\u0711\u0730-\u074a\u07a6-\u07b0\u07eb-\u07f3\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0900-\u0902\u093c\u0941-\u0948\u094d\u0951-\u0955\u0962\u0963\u0981\u09bc\u09be\u09c1-\u09c4\u09cd\u09d7\u09e2\u09e3\u0a01\u0a02\u0a3c\u0a41\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a70\u0a71\u0a75\u0a81\u0a82\u0abc\u0ac1-\u0ac5\u0ac7\u0ac8\u0acd\u0ae2\u0ae3\u0b01\u0b3c\u0b3e\u0b3f\u0b41-\u0b44\u0b4d\u0b56\u0b57\u0b62\u0b63\u0b82\u0bbe\u0bc0\u0bcd\u0bd7\u0c3e-\u0c40\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0cbc\u0cbf\u0cc2\u0cc6\u0ccc\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0d3e\u0d41-\u0d44\u0d4d\u0d57\u0d62\u0d63\u0dca\u0dcf\u0dd2-\u0dd4\u0dd6\u0ddf\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0eb1\u0eb4-\u0eb9\u0ebb\u0ebc\u0ec8-\u0ecd\u0f18\u0f19\u0f35\u0f37\u0f39\u0f71-\u0f7e\u0f80-\u0f84\u0f86\u0f87\u0f90-\u0f97\u0f99-\u0fbc\u0fc6\u102d-\u1030\u1032-\u1037\u1039\u103a\u103d\u103e\u1058\u1059\u105e-\u1060\u1071-\u1074\u1082\u1085\u1086\u108d\u109d\u135f\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b7-\u17bd\u17c6\u17c9-\u17d3\u17dd\u180b-\u180d\u18a9\u1920-\u1922\u1927\u1928\u1932\u1939-\u193b\u1a17\u1a18\u1a56\u1a58-\u1a5e\u1a60\u1a62\u1a65-\u1a6c\u1a73-\u1a7c\u1a7f\u1b00-\u1b03\u1b34\u1b36-\u1b3a\u1b3c\u1b42\u1b6b-\u1b73\u1b80\u1b81\u1ba2-\u1ba5\u1ba8\u1ba9\u1c2c-\u1c33\u1c36\u1c37\u1cd0-\u1cd2\u1cd4-\u1ce0\u1ce2-\u1ce8\u1ced\u1dc0-\u1de6\u1dfd-\u1dff\u200c\u200d\u20d0-\u20f0\u2cef-\u2cf1\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua66f-\ua672\ua67c\ua67d\ua6f0\ua6f1\ua802\ua806\ua80b\ua825\ua826\ua8c4\ua8e0-\ua8f1\ua926-\ua92d\ua947-\ua951\ua980-\ua982\ua9b3\ua9b6-\ua9b9\ua9bc\uaa29-\uaa2e\uaa31\uaa32\uaa35\uaa36\uaa43\uaa4c\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uabe5\uabe8\uabed\udc00-\udfff\ufb1e\ufe00-\ufe0f\ufe20-\ufe26\uff9e\uff9f]/;
-  function isExtendingChar(ch) { return ch.charCodeAt(0) >= 768 && extendingChars.test(ch); }
-
-  // DOM UTILITIES
-
-  function elt(tag, content, className, style) {
-    var e = document.createElement(tag);
-    if (className) e.className = className;
-    if (style) e.style.cssText = style;
-    if (typeof content == "string") e.appendChild(document.createTextNode(content));
-    else if (content) for (var i = 0; i < content.length; ++i) e.appendChild(content[i]);
-    return e;
-  }
-
-  var range;
-  if (document.createRange) range = function(node, start, end, endNode) {
-    var r = document.createRange();
-    r.setEnd(endNode || node, end);
-    r.setStart(node, start);
-    return r;
-  };
-  else range = function(node, start, end) {
-    var r = document.body.createTextRange();
-    try { r.moveToElementText(node.parentNode); }
-    catch(e) { return r; }
-    r.collapse(true);
-    r.moveEnd("character", end);
-    r.moveStart("character", start);
-    return r;
-  };
-
-  function removeChildren(e) {
-    for (var count = e.childNodes.length; count > 0; --count)
-      e.removeChild(e.firstChild);
-    return e;
-  }
-
-  function removeChildrenAndAdd(parent, e) {
-    return removeChildren(parent).appendChild(e);
-  }
-
-  var contains = CodeMirror.contains = function(parent, child) {
-    if (child.nodeType == 3) // Android browser always returns false when child is a textnode
-      child = child.parentNode;
-    if (parent.contains)
-      return parent.contains(child);
-    do {
-      if (child.nodeType == 11) child = child.host;
-      if (child == parent) return true;
-    } while (child = child.parentNode);
-  };
-
-  function activeElt() { return document.activeElement; }
-  // Older versions of IE throws unspecified error when touching
-  // document.activeElement in some cases (during loading, in iframe)
-  if (ie && ie_version < 11) activeElt = function() {
-    try { return document.activeElement; }
-    catch(e) { return document.body; }
-  };
-
-  function classTest(cls) { return new RegExp("(^|\\s)" + cls + "(?:$|\\s)\\s*"); }
-  var rmClass = CodeMirror.rmClass = function(node, cls) {
-    var current = node.className;
-    var match = classTest(cls).exec(current);
-    if (match) {
-      var after = current.slice(match.index + match[0].length);
-      node.className = current.slice(0, match.index) + (after ? match[1] + after : "");
-    }
-  };
-  var addClass = CodeMirror.addClass = function(node, cls) {
-    var current = node.className;
-    if (!classTest(cls).test(current)) node.className += (current ? " " : "") + cls;
-  };
-  function joinClasses(a, b) {
-    var as = a.split(" ");
-    for (var i = 0; i < as.length; i++)
-      if (as[i] && !classTest(as[i]).test(b)) b += " " + as[i];
-    return b;
-  }
-
-  // WINDOW-WIDE EVENTS
-
-  // These must be handled carefully, because naively registering a
-  // handler for each editor will cause the editors to never be
-  // garbage collected.
-
-  function forEachCodeMirror(f) {
-    if (!document.body.getElementsByClassName) return;
-    var byClass = document.body.getElementsByClassName("CodeMirror");
-    for (var i = 0; i < byClass.length; i++) {
-      var cm = byClass[i].CodeMirror;
-      if (cm) f(cm);
-    }
-  }
-
-  var globalsRegistered = false;
-  function ensureGlobalHandlers() {
-    if (globalsRegistered) return;
-    registerGlobalHandlers();
-    globalsRegistered = true;
-  }
-  function registerGlobalHandlers() {
-    // When the window resizes, we need to refresh active editors.
-    var resizeTimer;
-    on(window, "resize", function() {
-      if (resizeTimer == null) resizeTimer = setTimeout(function() {
-        resizeTimer = null;
-        forEachCodeMirror(onResize);
-      }, 100);
-    });
-    // When the window loses focus, we want to show the editor as blurred
-    on(window, "blur", function() {
-      forEachCodeMirror(onBlur);
-    });
-  }
-
-  // FEATURE DETECTION
-
-  // Detect drag-and-drop
-  var dragAndDrop = function() {
-    // There is *some* kind of drag-and-drop support in IE6-8, but I
-    // couldn't get it to work yet.
-    if (ie && ie_version < 9) return false;
-    var div = elt('div');
-    return "draggable" in div || "dragDrop" in div;
-  }();
-
-  var zwspSupported;
-  function zeroWidthElement(measure) {
-    if (zwspSupported == null) {
-      var test = elt("span", "\u200b");
-      removeChildrenAndAdd(measure, elt("span", [test, document.createTextNode("x")]));
-      if (measure.firstChild.offsetHeight != 0)
-        zwspSupported = test.offsetWidth <= 1 && test.offsetHeight > 2 && !(ie && ie_version < 8);
-    }
-    var node = zwspSupported ? elt("span", "\u200b") :
-      elt("span", "\u00a0", null, "display: inline-block; width: 1px; margin-right: -1px");
-    node.setAttribute("cm-text", "");
-    return node;
-  }
-
-  // Feature-detect IE's crummy client rect reporting for bidi text
-  var badBidiRects;
-  function hasBadBidiRects(measure) {
-    if (badBidiRects != null) return badBidiRects;
-    var txt = removeChildrenAndAdd(measure, document.createTextNode("A\u062eA"));
-    var r0 = range(txt, 0, 1).getBoundingClientRect();
-    if (!r0 || r0.left == r0.right) return false; // Safari returns null in some cases (#2780)
-    var r1 = range(txt, 1, 2).getBoundingClientRect();
-    return badBidiRects = (r1.right - r0.right < 3);
-  }
-
-  // See if "".split is the broken IE version, if so, provide an
-  // alternative way to split lines.
-  var splitLines = CodeMirror.splitLines = "\n\nb".split(/\n/).length != 3 ? function(string) {
-    var pos = 0, result = [], l = string.length;
-    while (pos <= l) {
-      var nl = string.indexOf("\n", pos);
-      if (nl == -1) nl = string.length;
-      var line = string.slice(pos, string.charAt(nl - 1) == "\r" ? nl - 1 : nl);
-      var rt = line.indexOf("\r");
-      if (rt != -1) {
-        result.push(line.slice(0, rt));
-        pos += rt + 1;
-      } else {
-        result.push(line);
-        pos = nl + 1;
-      }
-    }
-    return result;
-  } : function(string){return string.split(/\r\n?|\n/);};
-
-  var hasSelection = window.getSelection ? function(te) {
-    try { return te.selectionStart != te.selectionEnd; }
-    catch(e) { return false; }
-  } : function(te) {
-    try {var range = te.ownerDocument.selection.createRange();}
-    catch(e) {}
-    if (!range || range.parentElement() != te) return false;
-    return range.compareEndPoints("StartToEnd", range) != 0;
-  };
-
-  var hasCopyEvent = (function() {
-    var e = elt("div");
-    if ("oncopy" in e) return true;
-    e.setAttribute("oncopy", "return;");
-    return typeof e.oncopy == "function";
-  })();
-
-  var badZoomedRects = null;
-  function hasBadZoomedRects(measure) {
-    if (badZoomedRects != null) return badZoomedRects;
-    var node = removeChildrenAndAdd(measure, elt("span", "x"));
-    var normal = node.getBoundingClientRect();
-    var fromRange = range(node, 0, 1).getBoundingClientRect();
-    return badZoomedRects = Math.abs(normal.left - fromRange.left) > 1;
-  }
-
-  // KEY NAMES
-
-  var keyNames = {3: "Enter", 8: "Backspace", 9: "Tab", 13: "Enter", 16: "Shift", 17: "Ctrl", 18: "Alt",
-                  19: "Pause", 20: "CapsLock", 27: "Esc", 32: "Space", 33: "PageUp", 34: "PageDown", 35: "End",
-                  36: "Home", 37: "Left", 38: "Up", 39: "Right", 40: "Down", 44: "PrintScrn", 45: "Insert",
-                  46: "Delete", 59: ";", 61: "=", 91: "Mod", 92: "Mod", 93: "Mod", 107: "=", 109: "-", 127: "Delete",
-                  173: "-", 186: ";", 187: "=", 188: ",", 189: "-", 190: ".", 191: "/", 192: "`", 219: "[", 220: "\\",
-                  221: "]", 222: "'", 63232: "Up", 63233: "Down", 63234: "Left", 63235: "Right", 63272: "Delete",
-                  63273: "Home", 63275: "End", 63276: "PageUp", 63277: "PageDown", 63302: "Insert"};
-  CodeMirror.keyNames = keyNames;
-  (function() {
-    // Number keys
-    for (var i = 0; i < 10; i++) keyNames[i + 48] = keyNames[i + 96] = String(i);
-    // Alphabetic keys
-    for (var i = 65; i <= 90; i++) keyNames[i] = String.fromCharCode(i);
-    // Function keys
-    for (var i = 1; i <= 12; i++) keyNames[i + 111] = keyNames[i + 63235] = "F" + i;
-  })();
-
-  // BIDI HELPERS
-
-  function iterateBidiSections(order, from, to, f) {
-    if (!order) return f(from, to, "ltr");
-    var found = false;
-    for (var i = 0; i < order.length; ++i) {
-      var part = order[i];
-      if (part.from < to && part.to > from || from == to && part.to == from) {
-        f(Math.max(part.from, from), Math.min(part.to, to), part.level == 1 ? "rtl" : "ltr");
-        found = true;
-      }
-    }
-    if (!found) f(from, to, "ltr");
-  }
-
-  function bidiLeft(part) { return part.level % 2 ? part.to : part.from; }
-  function bidiRight(part) { return part.level % 2 ? part.from : part.to; }
-
-  function lineLeft(line) { var order = getOrder(line); return order ? bidiLeft(order[0]) : 0; }
-  function lineRight(line) {
-    var order = getOrder(line);
-    if (!order) return line.text.length;
-    return bidiRight(lst(order));
-  }
-
-  function lineStart(cm, lineN) {
-    var line = getLine(cm.doc, lineN);
-    var visual = visualLine(line);
-    if (visual != line) lineN = lineNo(visual);
-    var order = getOrder(visual);
-    var ch = !order ? 0 : order[0].level % 2 ? lineRight(visual) : lineLeft(visual);
-    return Pos(lineN, ch);
-  }
-  function lineEnd(cm, lineN) {
-    var merged, line = getLine(cm.doc, lineN);
-    while (merged = collapsedSpanAtEnd(line)) {
-      line = merged.find(1, true).line;
-      lineN = null;
-    }
-    var order = getOrder(line);
-    var ch = !order ? line.text.length : order[0].level % 2 ? lineLeft(line) : lineRight(line);
-    return Pos(lineN == null ? lineNo(line) : lineN, ch);
-  }
-  function lineStartSmart(cm, pos) {
-    var start = lineStart(cm, pos.line);
-    var line = getLine(cm.doc, start.line);
-    var order = getOrder(line);
-    if (!order || order[0].level == 0) {
-      var firstNonWS = Math.max(0, line.text.search(/\S/));
-      var inWS = pos.line == start.line && pos.ch <= firstNonWS && pos.ch;
-      return Pos(start.line, inWS ? 0 : firstNonWS);
-    }
-    return start;
-  }
-
-  function compareBidiLevel(order, a, b) {
-    var linedir = order[0].level;
-    if (a == linedir) return true;
-    if (b == linedir) return false;
-    return a < b;
-  }
-  var bidiOther;
-  function getBidiPartAt(order, pos) {
-    bidiOther = null;
-    for (var i = 0, found; i < order.length; ++i) {
-      var cur = order[i];
-      if (cur.from < pos && cur.to > pos) return i;
-      if ((cur.from == pos || cur.to == pos)) {
-        if (found == null) {
-          found = i;
-        } else if (compareBidiLevel(order, cur.level, order[found].level)) {
-          if (cur.from != cur.to) bidiOther = found;
-          return i;
-        } else {
-          if (cur.from != cur.to) bidiOther = i;
-          return found;
-        }
-      }
-    }
-    return found;
-  }
-
-  function moveInLine(line, pos, dir, byUnit) {
-    if (!byUnit) return pos + dir;
-    do pos += dir;
-    while (pos > 0 && isExtendingChar(line.text.charAt(pos)));
-    return pos;
-  }
-
-  // This is needed in order to move 'visually' through bi-directional
-  // text -- i.e., pressing left should make the cursor go left, even
-  // when in RTL text. The tricky part is the 'jumps', where RTL and
-  // LTR text touch each other. This often requires the cursor offset
-  // to move more than one unit, in order to visually move one unit.
-  function moveVisually(line, start, dir, byUnit) {
-    var bidi = getOrder(line);
-    if (!bidi) return moveLogically(line, start, dir, byUnit);
-    var pos = getBidiPartAt(bidi, start), part = bidi[pos];
-    var target = moveInLine(line, start, part.level % 2 ? -dir : dir, byUnit);
-
-    for (;;) {
-      if (target > part.from && target < part.to) return target;
-      if (target == part.from || target == part.to) {
-        if (getBidiPartAt(bidi, target) == pos) return target;
-        part = bidi[pos += dir];
-        return (dir > 0) == part.level % 2 ? part.to : part.from;
-      } else {
-        part = bidi[pos += dir];
-        if (!part) return null;
-        if ((dir > 0) == part.level % 2)
-          target = moveInLine(line, part.to, -1, byUnit);
-        else
-          target = moveInLine(line, part.from, 1, byUnit);
-      }
-    }
-  }
-
-  function moveLogically(line, start, dir, byUnit) {
-    var target = start + dir;
-    if (byUnit) while (target > 0 && isExtendingChar(line.text.charAt(target))) target += dir;
-    return target < 0 || target > line.text.length ? null : target;
-  }
-
-  // Bidirectional ordering algorithm
-  // See http://unicode.org/reports/tr9/tr9-13.html for the algorithm
-  // that this (partially) implements.
-
-  // One-char codes used for character types:
-  // L (L):   Left-to-Right
-  // R (R):   Right-to-Left
-  // r (AL):  Right-to-Left Arabic
-  // 1 (EN):  European Number
-  // + (ES):  European Number Separator
-  // % (ET):  European Number Terminator
-  // n (AN):  Arabic Number
-  // , (CS):  Common Number Separator
-  // m (NSM): Non-Spacing Mark
-  // b (BN):  Boundary Neutral
-  // s (B):   Paragraph Separator
-  // t (S):   Segment Separator
-  // w (WS):  Whitespace
-  // N (ON):  Other Neutrals
-
-  // Returns null if characters are ordered as they appear
-  // (left-to-right), or an array of sections ({from, to, level}
-  // objects) in the order in which they occur visually.
-  var bidiOrdering = (function() {
-    // Character types for codepoints 0 to 0xff
-    var lowTypes = "bbbbbbbbbtstwsbbbbbbbbbbbbbbssstwNN%%%NNNNNN,N,N1111111111NNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNbbbbbbsbbbbbbbbbbbbbbbbbbbbbbbbbb,N%%%%NNNNLNNNNN%%11NLNNN1LNNNNNLLLLLLLLLLLLLLLLLLLLLLLNLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLN";
-    // Character types for codepoints 0x600 to 0x6ff
-    var arabicTypes = "rrrrrrrrrrrr,rNNmmmmmmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmrrrrrrrnnnnnnnnnn%nnrrrmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmmmmmmNmmmm";
-    function charType(code) {
-      if (code <= 0xf7) return lowTypes.charAt(code);
-      else if (0x590 <= code && code <= 0x5f4) return "R";
-      else if (0x600 <= code && code <= 0x6ed) return arabicTypes.charAt(code - 0x600);
-      else if (0x6ee <= code && code <= 0x8ac) return "r";
-      else if (0x2000 <= code && code <= 0x200b) return "w";
-      else if (code == 0x200c) return "b";
-      else return "L";
-    }
-
-    var bidiRE = /[\u0590-\u05f4\u0600-\u06ff\u0700-\u08ac]/;
-    var isNeutral = /[stwN]/, isStrong = /[LRr]/, countsAsLeft = /[Lb1n]/, countsAsNum = /[1n]/;
-    // Browsers seem to always treat the boundaries of block elements as being L.
-    var outerType = "L";
-
-    function BidiSpan(level, from, to) {
-      this.level = level;
-      this.from = from; this.to = to;
-    }
-
-    return function(str) {
-      if (!bidiRE.test(str)) return false;
-      var len = str.length, types = [];
-      for (var i = 0, type; i < len; ++i)
-        types.push(type = charType(str.charCodeAt(i)));
-
-      // W1. Examine each non-spacing mark (NSM) in the level run, and
-      // change the type of the NSM to the type of the previous
-      // character. If the NSM is at the start of the level run, it will
-      // get the type of sor.
-      for (var i = 0, prev = outerType; i < len; ++i) {
-        var type = types[i];
-        if (type == "m") types[i] = prev;
-        else prev = type;
-      }
-
-      // W2. Search backwards from each instance of a European number
-      // until the first strong type (R, L, AL, or sor) is found. If an
-      // AL is found, change the type of the European number to Arabic
-      // number.
-      // W3. Change all ALs to R.
-      for (var i = 0, cur = outerType; i < len; ++i) {
-        var type = types[i];
-        if (type == "1" && cur == "r") types[i] = "n";
-        else if (isStrong.test(type)) { cur = type; if (type == "r") types[i] = "R"; }
-      }
-
-      // W4. A single European separator between two European numbers
-      // changes to a European number. A single common separator between
-      // two numbers of the same type changes to that type.
-      for (var i = 1, prev = types[0]; i < len - 1; ++i) {
-        var type = types[i];
-        if (type == "+" && prev == "1" && types[i+1] == "1") types[i] = "1";
-        else if (type == "," && prev == types[i+1] &&
-                 (prev == "1" || prev == "n")) types[i] = prev;
-        prev = type;
-      }
-
-      // W5. A sequence of European terminators adjacent to European
-      // numbers changes to all European numbers.
-      // W6. Otherwise, separators and terminators change to Other
-      // Neutral.
-      for (var i = 0; i < len; ++i) {
-        var type = types[i];
-        if (type == ",") types[i] = "N";
-        else if (type == "%") {
-          for (var end = i + 1; end < len && types[end] == "%"; ++end) {}
-          var replace = (i && types[i-1] == "!") || (end < len && types[end] == "1") ? "1" : "N";
-          for (var j = i; j < end; ++j) types[j] = replace;
-          i = end - 1;
-        }
-      }
-
-      // W7. Search backwards from each instance of a European number
-      // until the first strong type (R, L, or sor) is found. If an L is
-      // found, then change the type of the European number to L.
-      for (var i = 0, cur = outerType; i < len; ++i) {
-        var type = types[i];
-        if (cur == "L" && type == "1") types[i] = "L";
-        else if (isStrong.test(type)) cur = type;
-      }
-
-      // N1. A sequence of neutrals takes the direction of the
-      // surrounding strong text if the text on both sides has the same
-      // direction. European and Arabic numbers act as if they were R in
-      // terms of their influence on neutrals. Start-of-level-run (sor)
-      // and end-of-level-run (eor) are used at level run boundaries.
-      // N2. Any remaining neutrals take the embedding direction.
-      for (var i = 0; i < len; ++i) {
-        if (isNeutral.test(types[i])) {
-          for (var end = i + 1; end < len && isNeutral.test(types[end]); ++end) {}
-          var before = (i ? types[i-1] : outerType) == "L";
-          var after = (end < len ? types[end] : outerType) == "L";
-          var replace = before || after ? "L" : "R";
-          for (var j = i; j < end; ++j) types[j] = replace;
-          i = end - 1;
-        }
-      }
-
-      // Here we depart from the documented algorithm, in order to avoid
-      // building up an actual levels array. Since there are only three
-      // levels (0, 1, 2) in an implementation that doesn't take
-      // explicit embedding into account, we can build up the order on
-      // the fly, without following the level-based algorithm.
-      var order = [], m;
-      for (var i = 0; i < len;) {
-        if (countsAsLeft.test(types[i])) {
-          var start = i;
-          for (++i; i < len && countsAsLeft.test(types[i]); ++i) {}
-          order.push(new BidiSpan(0, start, i));
-        } else {
-          var pos = i, at = order.length;
-          for (++i; i < len && types[i] != "L"; ++i) {}
-          for (var j = pos; j < i;) {
-            if (countsAsNum.test(types[j])) {
-              if (pos < j) order.splice(at, 0, new BidiSpan(1, pos, j));
-              var nstart = j;
-              for (++j; j < i && countsAsNum.test(types[j]); ++j) {}
-              order.splice(at, 0, new BidiSpan(2, nstart, j));
-              pos = j;
-            } else ++j;
-          }
-          if (pos < i) order.splice(at, 0, new BidiSpan(1, pos, i));
-        }
-      }
-      if (order[0].level == 1 && (m = str.match(/^\s+/))) {
-        order[0].from = m[0].length;
-        order.unshift(new BidiSpan(0, 0, m[0].length));
-      }
-      if (lst(order).level == 1 && (m = str.match(/\s+$/))) {
-        lst(order).to -= m[0].length;
-        order.push(new BidiSpan(0, len - m[0].length, len));
-      }
-      if (order[0].level == 2)
-        order.unshift(new BidiSpan(1, order[0].to, order[0].to));
-      if (order[0].level != lst(order).level)
-        order.push(new BidiSpan(order[0].level, len, len));
-
-      return order;
-    };
-  })();
-
-  // THE END
-
-  CodeMirror.version = "5.4.0";
-
-  return CodeMirror;
-});
diff --git a/#pma/js/codemirror/mode/javascript/javascript.js b/#pma/js/codemirror/mode/javascript/javascript.js
deleted file mode 100644
index c86f49e1..00000000
--- a/#pma/js/codemirror/mode/javascript/javascript.js
+++ /dev/null
@@ -1,704 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-// TODO actually recognize syntax of TypeScript constructs
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("javascript", function(config, parserConfig) {
-  var indentUnit = config.indentUnit;
-  var statementIndent = parserConfig.statementIndent;
-  var jsonldMode = parserConfig.jsonld;
-  var jsonMode = parserConfig.json || jsonldMode;
-  var isTS = parserConfig.typescript;
-  var wordRE = parserConfig.wordCharacters || /[\w$\xa1-\uffff]/;
-
-  // Tokenizer
-
-  var keywords = function(){
-    function kw(type) {return {type: type, style: "keyword"};}
-    var A = kw("keyword a"), B = kw("keyword b"), C = kw("keyword c");
-    var operator = kw("operator"), atom = {type: "atom", style: "atom"};
-
-    var jsKeywords = {
-      "if": kw("if"), "while": A, "with": A, "else": B, "do": B, "try": B, "finally": B,
-      "return": C, "break": C, "continue": C, "new": C, "delete": C, "throw": C, "debugger": C,
-      "var": kw("var"), "const": kw("var"), "let": kw("var"),
-      "function": kw("function"), "catch": kw("catch"),
-      "for": kw("for"), "switch": kw("switch"), "case": kw("case"), "default": kw("default"),
-      "in": operator, "typeof": operator, "instanceof": operator,
-      "true": atom, "false": atom, "null": atom, "undefined": atom, "NaN": atom, "Infinity": atom,
-      "this": kw("this"), "module": kw("module"), "class": kw("class"), "super": kw("atom"),
-      "yield": C, "export": kw("export"), "import": kw("import"), "extends": C
-    };
-
-    // Extend the 'normal' keywords with the TypeScript language extensions
-    if (isTS) {
-      var type = {type: "variable", style: "variable-3"};
-      var tsKeywords = {
-        // object-like things
-        "interface": kw("interface"),
-        "extends": kw("extends"),
-        "constructor": kw("constructor"),
-
-        // scope modifiers
-        "public": kw("public"),
-        "private": kw("private"),
-        "protected": kw("protected"),
-        "static": kw("static"),
-
-        // types
-        "string": type, "number": type, "bool": type, "any": type
-      };
-
-      for (var attr in tsKeywords) {
-        jsKeywords[attr] = tsKeywords[attr];
-      }
-    }
-
-    return jsKeywords;
-  }();
-
-  var isOperatorChar = /[+\-*&%=<>!?|~^]/;
-  var isJsonldKeyword = /^@(context|id|value|language|type|container|list|set|reverse|index|base|vocab|graph)"/;
-
-  function readRegexp(stream) {
-    var escaped = false, next, inSet = false;
-    while ((next = stream.next()) != null) {
-      if (!escaped) {
-        if (next == "/" && !inSet) return;
-        if (next == "[") inSet = true;
-        else if (inSet && next == "]") inSet = false;
-      }
-      escaped = !escaped && next == "\\";
-    }
-  }
-
-  // Used as scratch variables to communicate multiple values without
-  // consing up tons of objects.
-  var type, content;
-  function ret(tp, style, cont) {
-    type = tp; content = cont;
-    return style;
-  }
-  function tokenBase(stream, state) {
-    var ch = stream.next();
-    if (ch == '"' || ch == "'") {
-      state.tokenize = tokenString(ch);
-      return state.tokenize(stream, state);
-    } else if (ch == "." && stream.match(/^\d+(?:[eE][+\-]?\d+)?/)) {
-      return ret("number", "number");
-    } else if (ch == "." && stream.match("..")) {
-      return ret("spread", "meta");
-    } else if (/[\[\]{}\(\),;\:\.]/.test(ch)) {
-      return ret(ch);
-    } else if (ch == "=" && stream.eat(">")) {
-      return ret("=>", "operator");
-    } else if (ch == "0" && stream.eat(/x/i)) {
-      stream.eatWhile(/[\da-f]/i);
-      return ret("number", "number");
-    } else if (/\d/.test(ch)) {
-      stream.match(/^\d*(?:\.\d*)?(?:[eE][+\-]?\d+)?/);
-      return ret("number", "number");
-    } else if (ch == "/") {
-      if (stream.eat("*")) {
-        state.tokenize = tokenComment;
-        return tokenComment(stream, state);
-      } else if (stream.eat("/")) {
-        stream.skipToEnd();
-        return ret("comment", "comment");
-      } else if (state.lastType == "operator" || state.lastType == "keyword c" ||
-               state.lastType == "sof" || /^[\[{}\(,;:]$/.test(state.lastType)) {
-        readRegexp(stream);
-        stream.match(/^\b(([gimyu])(?![gimyu]*\2))+\b/);
-        return ret("regexp", "string-2");
-      } else {
-        stream.eatWhile(isOperatorChar);
-        return ret("operator", "operator", stream.current());
-      }
-    } else if (ch == "`") {
-      state.tokenize = tokenQuasi;
-      return tokenQuasi(stream, state);
-    } else if (ch == "#") {
-      stream.skipToEnd();
-      return ret("error", "error");
-    } else if (isOperatorChar.test(ch)) {
-      stream.eatWhile(isOperatorChar);
-      return ret("operator", "operator", stream.current());
-    } else if (wordRE.test(ch)) {
-      stream.eatWhile(wordRE);
-      var word = stream.current(), known = keywords.propertyIsEnumerable(word) && keywords[word];
-      return (known && state.lastType != ".") ? ret(known.type, known.style, word) :
-                     ret("variable", "variable", word);
-    }
-  }
-
-  function tokenString(quote) {
-    return function(stream, state) {
-      var escaped = false, next;
-      if (jsonldMode && stream.peek() == "@" && stream.match(isJsonldKeyword)){
-        state.tokenize = tokenBase;
-        return ret("jsonld-keyword", "meta");
-      }
-      while ((next = stream.next()) != null) {
-        if (next == quote && !escaped) break;
-        escaped = !escaped && next == "\\";
-      }
-      if (!escaped) state.tokenize = tokenBase;
-      return ret("string", "string");
-    };
-  }
-
-  function tokenComment(stream, state) {
-    var maybeEnd = false, ch;
-    while (ch = stream.next()) {
-      if (ch == "/" && maybeEnd) {
-        state.tokenize = tokenBase;
-        break;
-      }
-      maybeEnd = (ch == "*");
-    }
-    return ret("comment", "comment");
-  }
-
-  function tokenQuasi(stream, state) {
-    var escaped = false, next;
-    while ((next = stream.next()) != null) {
-      if (!escaped && (next == "`" || next == "$" && stream.eat("{"))) {
-        state.tokenize = tokenBase;
-        break;
-      }
-      escaped = !escaped && next == "\\";
-    }
-    return ret("quasi", "string-2", stream.current());
-  }
-
-  var brackets = "([{}])";
-  // This is a crude lookahead trick to try and notice that we're
-  // parsing the argument patterns for a fat-arrow function before we
-  // actually hit the arrow token. It only works if the arrow is on
-  // the same line as the arguments and there's no strange noise
-  // (comments) in between. Fallback is to only notice when we hit the
-  // arrow, and not declare the arguments as locals for the arrow
-  // body.
-  function findFatArrow(stream, state) {
-    if (state.fatArrowAt) state.fatArrowAt = null;
-    var arrow = stream.string.indexOf("=>", stream.start);
-    if (arrow < 0) return;
-
-    var depth = 0, sawSomething = false;
-    for (var pos = arrow - 1; pos >= 0; --pos) {
-      var ch = stream.string.charAt(pos);
-      var bracket = brackets.indexOf(ch);
-      if (bracket >= 0 && bracket < 3) {
-        if (!depth) { ++pos; break; }
-        if (--depth == 0) break;
-      } else if (bracket >= 3 && bracket < 6) {
-        ++depth;
-      } else if (wordRE.test(ch)) {
-        sawSomething = true;
-      } else if (/["'\/]/.test(ch)) {
-        return;
-      } else if (sawSomething && !depth) {
-        ++pos;
-        break;
-      }
-    }
-    if (sawSomething && !depth) state.fatArrowAt = pos;
-  }
-
-  // Parser
-
-  var atomicTypes = {"atom": true, "number": true, "variable": true, "string": true, "regexp": true, "this": true, "jsonld-keyword": true};
-
-  function JSLexical(indented, column, type, align, prev, info) {
-    this.indented = indented;
-    this.column = column;
-    this.type = type;
-    this.prev = prev;
-    this.info = info;
-    if (align != null) this.align = align;
-  }
-
-  function inScope(state, varname) {
-    for (var v = state.localVars; v; v = v.next)
-      if (v.name == varname) return true;
-    for (var cx = state.context; cx; cx = cx.prev) {
-      for (var v = cx.vars; v; v = v.next)
-        if (v.name == varname) return true;
-    }
-  }
-
-  function parseJS(state, style, type, content, stream) {
-    var cc = state.cc;
-    // Communicate our context to the combinators.
-    // (Less wasteful than consing up a hundred closures on every call.)
-    cx.state = state; cx.stream = stream; cx.marked = null, cx.cc = cc; cx.style = style;
-
-    if (!state.lexical.hasOwnProperty("align"))
-      state.lexical.align = true;
-
-    while(true) {
-      var combinator = cc.length ? cc.pop() : jsonMode ? expression : statement;
-      if (combinator(type, content)) {
-        while(cc.length && cc[cc.length - 1].lex)
-          cc.pop()();
-        if (cx.marked) return cx.marked;
-        if (type == "variable" && inScope(state, content)) return "variable-2";
-        return style;
-      }
-    }
-  }
-
-  // Combinator utils
-
-  var cx = {state: null, column: null, marked: null, cc: null};
-  function pass() {
-    for (var i = arguments.length - 1; i >= 0; i--) cx.cc.push(arguments[i]);
-  }
-  function cont() {
-    pass.apply(null, arguments);
-    return true;
-  }
-  function register(varname) {
-    function inList(list) {
-      for (var v = list; v; v = v.next)
-        if (v.name == varname) return true;
-      return false;
-    }
-    var state = cx.state;
-    if (state.context) {
-      cx.marked = "def";
-      if (inList(state.localVars)) return;
-      state.localVars = {name: varname, next: state.localVars};
-    } else {
-      if (inList(state.globalVars)) return;
-      if (parserConfig.globalVars)
-        state.globalVars = {name: varname, next: state.globalVars};
-    }
-  }
-
-  // Combinators
-
-  var defaultVars = {name: "this", next: {name: "arguments"}};
-  function pushcontext() {
-    cx.state.context = {prev: cx.state.context, vars: cx.state.localVars};
-    cx.state.localVars = defaultVars;
-  }
-  function popcontext() {
-    cx.state.localVars = cx.state.context.vars;
-    cx.state.context = cx.state.context.prev;
-  }
-  function pushlex(type, info) {
-    var result = function() {
-      var state = cx.state, indent = state.indented;
-      if (state.lexical.type == "stat") indent = state.lexical.indented;
-      else for (var outer = state.lexical; outer && outer.type == ")" && outer.align; outer = outer.prev)
-        indent = outer.indented;
-      state.lexical = new JSLexical(indent, cx.stream.column(), type, null, state.lexical, info);
-    };
-    result.lex = true;
-    return result;
-  }
-  function poplex() {
-    var state = cx.state;
-    if (state.lexical.prev) {
-      if (state.lexical.type == ")")
-        state.indented = state.lexical.indented;
-      state.lexical = state.lexical.prev;
-    }
-  }
-  poplex.lex = true;
-
-  function expect(wanted) {
-    function exp(type) {
-      if (type == wanted) return cont();
-      else if (wanted == ";") return pass();
-      else return cont(exp);
-    };
-    return exp;
-  }
-
-  function statement(type, value) {
-    if (type == "var") return cont(pushlex("vardef", value.length), vardef, expect(";"), poplex);
-    if (type == "keyword a") return cont(pushlex("form"), expression, statement, poplex);
-    if (type == "keyword b") return cont(pushlex("form"), statement, poplex);
-    if (type == "{") return cont(pushlex("}"), block, poplex);
-    if (type == ";") return cont();
-    if (type == "if") {
-      if (cx.state.lexical.info == "else" && cx.state.cc[cx.state.cc.length - 1] == poplex)
-        cx.state.cc.pop()();
-      return cont(pushlex("form"), expression, statement, poplex, maybeelse);
-    }
-    if (type == "function") return cont(functiondef);
-    if (type == "for") return cont(pushlex("form"), forspec, statement, poplex);
-    if (type == "variable") return cont(pushlex("stat"), maybelabel);
-    if (type == "switch") return cont(pushlex("form"), expression, pushlex("}", "switch"), expect("{"),
-                                      block, poplex, poplex);
-    if (type == "case") return cont(expression, expect(":"));
-    if (type == "default") return cont(expect(":"));
-    if (type == "catch") return cont(pushlex("form"), pushcontext, expect("("), funarg, expect(")"),
-                                     statement, poplex, popcontext);
-    if (type == "module") return cont(pushlex("form"), pushcontext, afterModule, popcontext, poplex);
-    if (type == "class") return cont(pushlex("form"), className, poplex);
-    if (type == "export") return cont(pushlex("form"), afterExport, poplex);
-    if (type == "import") return cont(pushlex("form"), afterImport, poplex);
-    return pass(pushlex("stat"), expression, expect(";"), poplex);
-  }
-  function expression(type) {
-    return expressionInner(type, false);
-  }
-  function expressionNoComma(type) {
-    return expressionInner(type, true);
-  }
-  function expressionInner(type, noComma) {
-    if (cx.state.fatArrowAt == cx.stream.start) {
-      var body = noComma ? arrowBodyNoComma : arrowBody;
-      if (type == "(") return cont(pushcontext, pushlex(")"), commasep(pattern, ")"), poplex, expect("=>"), body, popcontext);
-      else if (type == "variable") return pass(pushcontext, pattern, expect("=>"), body, popcontext);
-    }
-
-    var maybeop = noComma ? maybeoperatorNoComma : maybeoperatorComma;
-    if (atomicTypes.hasOwnProperty(type)) return cont(maybeop);
-    if (type == "function") return cont(functiondef, maybeop);
-    if (type == "keyword c") return cont(noComma ? maybeexpressionNoComma : maybeexpression);
-    if (type == "(") return cont(pushlex(")"), maybeexpression, comprehension, expect(")"), poplex, maybeop);
-    if (type == "operator" || type == "spread") return cont(noComma ? expressionNoComma : expression);
-    if (type == "[") return cont(pushlex("]"), arrayLiteral, poplex, maybeop);
-    if (type == "{") return contCommasep(objprop, "}", null, maybeop);
-    if (type == "quasi") { return pass(quasi, maybeop); }
-    return cont();
-  }
-  function maybeexpression(type) {
-    if (type.match(/[;\}\)\],]/)) return pass();
-    return pass(expression);
-  }
-  function maybeexpressionNoComma(type) {
-    if (type.match(/[;\}\)\],]/)) return pass();
-    return pass(expressionNoComma);
-  }
-
-  function maybeoperatorComma(type, value) {
-    if (type == ",") return cont(expression);
-    return maybeoperatorNoComma(type, value, false);
-  }
-  function maybeoperatorNoComma(type, value, noComma) {
-    var me = noComma == false ? maybeoperatorComma : maybeoperatorNoComma;
-    var expr = noComma == false ? expression : expressionNoComma;
-    if (type == "=>") return cont(pushcontext, noComma ? arrowBodyNoComma : arrowBody, popcontext);
-    if (type == "operator") {
-      if (/\+\+|--/.test(value)) return cont(me);
-      if (value == "?") return cont(expression, expect(":"), expr);
-      return cont(expr);
-    }
-    if (type == "quasi") { return pass(quasi, me); }
-    if (type == ";") return;
-    if (type == "(") return contCommasep(expressionNoComma, ")", "call", me);
-    if (type == ".") return cont(property, me);
-    if (type == "[") return cont(pushlex("]"), maybeexpression, expect("]"), poplex, me);
-  }
-  function quasi(type, value) {
-    if (type != "quasi") return pass();
-    if (value.slice(value.length - 2) != "${") return cont(quasi);
-    return cont(expression, continueQuasi);
-  }
-  function continueQuasi(type) {
-    if (type == "}") {
-      cx.marked = "string-2";
-      cx.state.tokenize = tokenQuasi;
-      return cont(quasi);
-    }
-  }
-  function arrowBody(type) {
-    findFatArrow(cx.stream, cx.state);
-    return pass(type == "{" ? statement : expression);
-  }
-  function arrowBodyNoComma(type) {
-    findFatArrow(cx.stream, cx.state);
-    return pass(type == "{" ? statement : expressionNoComma);
-  }
-  function maybelabel(type) {
-    if (type == ":") return cont(poplex, statement);
-    return pass(maybeoperatorComma, expect(";"), poplex);
-  }
-  function property(type) {
-    if (type == "variable") {cx.marked = "property"; return cont();}
-  }
-  function objprop(type, value) {
-    if (type == "variable" || cx.style == "keyword") {
-      cx.marked = "property";
-      if (value == "get" || value == "set") return cont(getterSetter);
-      return cont(afterprop);
-    } else if (type == "number" || type == "string") {
-      cx.marked = jsonldMode ? "property" : (cx.style + " property");
-      return cont(afterprop);
-    } else if (type == "jsonld-keyword") {
-      return cont(afterprop);
-    } else if (type == "[") {
-      return cont(expression, expect("]"), afterprop);
-    }
-  }
-  function getterSetter(type) {
-    if (type != "variable") return pass(afterprop);
-    cx.marked = "property";
-    return cont(functiondef);
-  }
-  function afterprop(type) {
-    if (type == ":") return cont(expressionNoComma);
-    if (type == "(") return pass(functiondef);
-  }
-  function commasep(what, end) {
-    function proceed(type) {
-      if (type == ",") {
-        var lex = cx.state.lexical;
-        if (lex.info == "call") lex.pos = (lex.pos || 0) + 1;
-        return cont(what, proceed);
-      }
-      if (type == end) return cont();
-      return cont(expect(end));
-    }
-    return function(type) {
-      if (type == end) return cont();
-      return pass(what, proceed);
-    };
-  }
-  function contCommasep(what, end, info) {
-    for (var i = 3; i < arguments.length; i++)
-      cx.cc.push(arguments[i]);
-    return cont(pushlex(end, info), commasep(what, end), poplex);
-  }
-  function block(type) {
-    if (type == "}") return cont();
-    return pass(statement, block);
-  }
-  function maybetype(type) {
-    if (isTS && type == ":") return cont(typedef);
-  }
-  function maybedefault(_, value) {
-    if (value == "=") return cont(expressionNoComma);
-  }
-  function typedef(type) {
-    if (type == "variable") {cx.marked = "variable-3"; return cont();}
-  }
-  function vardef() {
-    return pass(pattern, maybetype, maybeAssign, vardefCont);
-  }
-  function pattern(type, value) {
-    if (type == "variable") { register(value); return cont(); }
-    if (type == "[") return contCommasep(pattern, "]");
-    if (type == "{") return contCommasep(proppattern, "}");
-  }
-  function proppattern(type, value) {
-    if (type == "variable" && !cx.stream.match(/^\s*:/, false)) {
-      register(value);
-      return cont(maybeAssign);
-    }
-    if (type == "variable") cx.marked = "property";
-    return cont(expect(":"), pattern, maybeAssign);
-  }
-  function maybeAssign(_type, value) {
-    if (value == "=") return cont(expressionNoComma);
-  }
-  function vardefCont(type) {
-    if (type == ",") return cont(vardef);
-  }
-  function maybeelse(type, value) {
-    if (type == "keyword b" && value == "else") return cont(pushlex("form", "else"), statement, poplex);
-  }
-  function forspec(type) {
-    if (type == "(") return cont(pushlex(")"), forspec1, expect(")"), poplex);
-  }
-  function forspec1(type) {
-    if (type == "var") return cont(vardef, expect(";"), forspec2);
-    if (type == ";") return cont(forspec2);
-    if (type == "variable") return cont(formaybeinof);
-    return pass(expression, expect(";"), forspec2);
-  }
-  function formaybeinof(_type, value) {
-    if (value == "in" || value == "of") { cx.marked = "keyword"; return cont(expression); }
-    return cont(maybeoperatorComma, forspec2);
-  }
-  function forspec2(type, value) {
-    if (type == ";") return cont(forspec3);
-    if (value == "in" || value == "of") { cx.marked = "keyword"; return cont(expression); }
-    return pass(expression, expect(";"), forspec3);
-  }
-  function forspec3(type) {
-    if (type != ")") cont(expression);
-  }
-  function functiondef(type, value) {
-    if (value == "*") {cx.marked = "keyword"; return cont(functiondef);}
-    if (type == "variable") {register(value); return cont(functiondef);}
-    if (type == "(") return cont(pushcontext, pushlex(")"), commasep(funarg, ")"), poplex, statement, popcontext);
-  }
-  function funarg(type) {
-    if (type == "spread") return cont(funarg);
-    return pass(pattern, maybetype, maybedefault);
-  }
-  function className(type, value) {
-    if (type == "variable") {register(value); return cont(classNameAfter);}
-  }
-  function classNameAfter(type, value) {
-    if (value == "extends") return cont(expression, classNameAfter);
-    if (type == "{") return cont(pushlex("}"), classBody, poplex);
-  }
-  function classBody(type, value) {
-    if (type == "variable" || cx.style == "keyword") {
-      if (value == "static") {
-        cx.marked = "keyword";
-        return cont(classBody);
-      }
-      cx.marked = "property";
-      if (value == "get" || value == "set") return cont(classGetterSetter, functiondef, classBody);
-      return cont(functiondef, classBody);
-    }
-    if (value == "*") {
-      cx.marked = "keyword";
-      return cont(classBody);
-    }
-    if (type == ";") return cont(classBody);
-    if (type == "}") return cont();
-  }
-  function classGetterSetter(type) {
-    if (type != "variable") return pass();
-    cx.marked = "property";
-    return cont();
-  }
-  function afterModule(type, value) {
-    if (type == "string") return cont(statement);
-    if (type == "variable") { register(value); return cont(maybeFrom); }
-  }
-  function afterExport(_type, value) {
-    if (value == "*") { cx.marked = "keyword"; return cont(maybeFrom, expect(";")); }
-    if (value == "default") { cx.marked = "keyword"; return cont(expression, expect(";")); }
-    return pass(statement);
-  }
-  function afterImport(type) {
-    if (type == "string") return cont();
-    return pass(importSpec, maybeFrom);
-  }
-  function importSpec(type, value) {
-    if (type == "{") return contCommasep(importSpec, "}");
-    if (type == "variable") register(value);
-    if (value == "*") cx.marked = "keyword";
-    return cont(maybeAs);
-  }
-  function maybeAs(_type, value) {
-    if (value == "as") { cx.marked = "keyword"; return cont(importSpec); }
-  }
-  function maybeFrom(_type, value) {
-    if (value == "from") { cx.marked = "keyword"; return cont(expression); }
-  }
-  function arrayLiteral(type) {
-    if (type == "]") return cont();
-    return pass(expressionNoComma, maybeArrayComprehension);
-  }
-  function maybeArrayComprehension(type) {
-    if (type == "for") return pass(comprehension, expect("]"));
-    if (type == ",") return cont(commasep(maybeexpressionNoComma, "]"));
-    return pass(commasep(expressionNoComma, "]"));
-  }
-  function comprehension(type) {
-    if (type == "for") return cont(forspec, comprehension);
-    if (type == "if") return cont(expression, comprehension);
-  }
-
-  function isContinuedStatement(state, textAfter) {
-    return state.lastType == "operator" || state.lastType == "," ||
-      isOperatorChar.test(textAfter.charAt(0)) ||
-      /[,.]/.test(textAfter.charAt(0));
-  }
-
-  // Interface
-
-  return {
-    startState: function(basecolumn) {
-      var state = {
-        tokenize: tokenBase,
-        lastType: "sof",
-        cc: [],
-        lexical: new JSLexical((basecolumn || 0) - indentUnit, 0, "block", false),
-        localVars: parserConfig.localVars,
-        context: parserConfig.localVars && {vars: parserConfig.localVars},
-        indented: 0
-      };
-      if (parserConfig.globalVars && typeof parserConfig.globalVars == "object")
-        state.globalVars = parserConfig.globalVars;
-      return state;
-    },
-
-    token: function(stream, state) {
-      if (stream.sol()) {
-        if (!state.lexical.hasOwnProperty("align"))
-          state.lexical.align = false;
-        state.indented = stream.indentation();
-        findFatArrow(stream, state);
-      }
-      if (state.tokenize != tokenComment && stream.eatSpace()) return null;
-      var style = state.tokenize(stream, state);
-      if (type == "comment") return style;
-      state.lastType = type == "operator" && (content == "++" || content == "--") ? "incdec" : type;
-      return parseJS(state, style, type, content, stream);
-    },
-
-    indent: function(state, textAfter) {
-      if (state.tokenize == tokenComment) return CodeMirror.Pass;
-      if (state.tokenize != tokenBase) return 0;
-      var firstChar = textAfter && textAfter.charAt(0), lexical = state.lexical;
-      // Kludge to prevent 'maybelse' from blocking lexical scope pops
-      if (!/^\s*else\b/.test(textAfter)) for (var i = state.cc.length - 1; i >= 0; --i) {
-        var c = state.cc[i];
-        if (c == poplex) lexical = lexical.prev;
-        else if (c != maybeelse) break;
-      }
-      if (lexical.type == "stat" && firstChar == "}") lexical = lexical.prev;
-      if (statementIndent && lexical.type == ")" && lexical.prev.type == "stat")
-        lexical = lexical.prev;
-      var type = lexical.type, closing = firstChar == type;
-
-      if (type == "vardef") return lexical.indented + (state.lastType == "operator" || state.lastType == "," ? lexical.info + 1 : 0);
-      else if (type == "form" && firstChar == "{") return lexical.indented;
-      else if (type == "form") return lexical.indented + indentUnit;
-      else if (type == "stat")
-        return lexical.indented + (isContinuedStatement(state, textAfter) ? statementIndent || indentUnit : 0);
-      else if (lexical.info == "switch" && !closing && parserConfig.doubleIndentSwitch != false)
-        return lexical.indented + (/^(?:case|default)\b/.test(textAfter) ? indentUnit : 2 * indentUnit);
-      else if (lexical.align) return lexical.column + (closing ? 0 : 1);
-      else return lexical.indented + (closing ? 0 : indentUnit);
-    },
-
-    electricInput: /^\s*(?:case .*?:|default:|\{|\})$/,
-    blockCommentStart: jsonMode ? null : "/*",
-    blockCommentEnd: jsonMode ? null : "*/",
-    lineComment: jsonMode ? null : "//",
-    fold: "brace",
-    closeBrackets: "()[]{}''\"\"``",
-
-    helperType: jsonMode ? "json" : "javascript",
-    jsonldMode: jsonldMode,
-    jsonMode: jsonMode
-  };
-});
-
-CodeMirror.registerHelper("wordChars", "javascript", /[\w$]/);
-
-CodeMirror.defineMIME("text/javascript", "javascript");
-CodeMirror.defineMIME("text/ecmascript", "javascript");
-CodeMirror.defineMIME("application/javascript", "javascript");
-CodeMirror.defineMIME("application/x-javascript", "javascript");
-CodeMirror.defineMIME("application/ecmascript", "javascript");
-CodeMirror.defineMIME("application/json", {name: "javascript", json: true});
-CodeMirror.defineMIME("application/x-json", {name: "javascript", json: true});
-CodeMirror.defineMIME("application/ld+json", {name: "javascript", jsonld: true});
-CodeMirror.defineMIME("text/typescript", { name: "javascript", typescript: true });
-CodeMirror.defineMIME("application/typescript", { name: "javascript", typescript: true });
-
-});
diff --git a/#pma/js/codemirror/mode/sql/sql.js b/#pma/js/codemirror/mode/sql/sql.js
deleted file mode 100644
index a9082771..00000000
--- a/#pma/js/codemirror/mode/sql/sql.js
+++ /dev/null
@@ -1,391 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("sql", function(config, parserConfig) {
-  "use strict";
-
-  var client         = parserConfig.client || {},
-      atoms          = parserConfig.atoms || {"false": true, "true": true, "null": true},
-      builtin        = parserConfig.builtin || {},
-      keywords       = parserConfig.keywords || {},
-      operatorChars  = parserConfig.operatorChars || /^[*+\-%<>!=&|~^]/,
-      support        = parserConfig.support || {},
-      hooks          = parserConfig.hooks || {},
-      dateSQL        = parserConfig.dateSQL || {"date" : true, "time" : true, "timestamp" : true};
-
-  function tokenBase(stream, state) {
-    var ch = stream.next();
-
-    // call hooks from the mime type
-    if (hooks[ch]) {
-      var result = hooks[ch](stream, state);
-      if (result !== false) return result;
-    }
-
-    if (support.hexNumber == true &&
-      ((ch == "0" && stream.match(/^[xX][0-9a-fA-F]+/))
-      || (ch == "x" || ch == "X") && stream.match(/^'[0-9a-fA-F]+'/))) {
-      // hex
-      // ref: http://dev.mysql.com/doc/refman/5.5/en/hexadecimal-literals.html
-      return "number";
-    } else if (support.binaryNumber == true &&
-      (((ch == "b" || ch == "B") && stream.match(/^'[01]+'/))
-      || (ch == "0" && stream.match(/^b[01]+/)))) {
-      // bitstring
-      // ref: http://dev.mysql.com/doc/refman/5.5/en/bit-field-literals.html
-      return "number";
-    } else if (ch.charCodeAt(0) > 47 && ch.charCodeAt(0) < 58) {
-      // numbers
-      // ref: http://dev.mysql.com/doc/refman/5.5/en/number-literals.html
-          stream.match(/^[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?/);
-      support.decimallessFloat == true && stream.eat('.');
-      return "number";
-    } else if (ch == "?" && (stream.eatSpace() || stream.eol() || stream.eat(";"))) {
-      // placeholders
-      return "variable-3";
-    } else if (ch == "'" || (ch == '"' && support.doubleQuote)) {
-      // strings
-      // ref: http://dev.mysql.com/doc/refman/5.5/en/string-literals.html
-      state.tokenize = tokenLiteral(ch);
-      return state.tokenize(stream, state);
-    } else if ((((support.nCharCast == true && (ch == "n" || ch == "N"))
-        || (support.charsetCast == true && ch == "_" && stream.match(/[a-z][a-z0-9]*/i)))
-        && (stream.peek() == "'" || stream.peek() == '"'))) {
-      // charset casting: _utf8'str', N'str', n'str'
-      // ref: http://dev.mysql.com/doc/refman/5.5/en/string-literals.html
-      return "keyword";
-    } else if (/^[\(\),\;\[\]]/.test(ch)) {
-      // no highlightning
-      return null;
-    } else if (support.commentSlashSlash && ch == "/" && stream.eat("/")) {
-      // 1-line comment
-      stream.skipToEnd();
-      return "comment";
-    } else if ((support.commentHash && ch == "#")
-        || (ch == "-" && stream.eat("-") && (!support.commentSpaceRequired || stream.eat(" ")))) {
-      // 1-line comments
-      // ref: https://kb.askmonty.org/en/comment-syntax/
-      stream.skipToEnd();
-      return "comment";
-    } else if (ch == "/" && stream.eat("*")) {
-      // multi-line comments
-      // ref: https://kb.askmonty.org/en/comment-syntax/
-      state.tokenize = tokenComment;
-      return state.tokenize(stream, state);
-    } else if (ch == ".") {
-      // .1 for 0.1
-      if (support.zerolessFloat == true && stream.match(/^(?:\d+(?:e[+-]?\d+)?)/i)) {
-        return "number";
-      }
-      // .table_name (ODBC)
-      // // ref: http://dev.mysql.com/doc/refman/5.6/en/identifier-qualifiers.html
-      if (support.ODBCdotTable == true && stream.match(/^[a-zA-Z_]+/)) {
-        return "variable-2";
-      }
-    } else if (operatorChars.test(ch)) {
-      // operators
-      stream.eatWhile(operatorChars);
-      return null;
-    } else if (ch == '{' &&
-        (stream.match(/^( )*(d|D|t|T|ts|TS)( )*'[^']*'( )*}/) || stream.match(/^( )*(d|D|t|T|ts|TS)( )*"[^"]*"( )*}/))) {
-      // dates (weird ODBC syntax)
-      // ref: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-literals.html
-      return "number";
-    } else {
-      stream.eatWhile(/^[_\w\d]/);
-      var word = stream.current().toLowerCase();
-      // dates (standard SQL syntax)
-      // ref: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-literals.html
-      if (dateSQL.hasOwnProperty(word) && (stream.match(/^( )+'[^']*'/) || stream.match(/^( )+"[^"]*"/)))
-        return "number";
-      if (atoms.hasOwnProperty(word)) return "atom";
-      if (builtin.hasOwnProperty(word)) return "builtin";
-      if (keywords.hasOwnProperty(word)) return "keyword";
-      if (client.hasOwnProperty(word)) return "string-2";
-      return null;
-    }
-  }
-
-  // 'string', with char specified in quote escaped by '\'
-  function tokenLiteral(quote) {
-    return function(stream, state) {
-      var escaped = false, ch;
-      while ((ch = stream.next()) != null) {
-        if (ch == quote && !escaped) {
-          state.tokenize = tokenBase;
-          break;
-        }
-        escaped = !escaped && ch == "\\";
-      }
-      return "string";
-    };
-  }
-  function tokenComment(stream, state) {
-    while (true) {
-      if (stream.skipTo("*")) {
-        stream.next();
-        if (stream.eat("/")) {
-          state.tokenize = tokenBase;
-          break;
-        }
-      } else {
-        stream.skipToEnd();
-        break;
-      }
-    }
-    return "comment";
-  }
-
-  function pushContext(stream, state, type) {
-    state.context = {
-      prev: state.context,
-      indent: stream.indentation(),
-      col: stream.column(),
-      type: type
-    };
-  }
-
-  function popContext(state) {
-    state.indent = state.context.indent;
-    state.context = state.context.prev;
-  }
-
-  return {
-    startState: function() {
-      return {tokenize: tokenBase, context: null};
-    },
-
-    token: function(stream, state) {
-      if (stream.sol()) {
-        if (state.context && state.context.align == null)
-          state.context.align = false;
-      }
-      if (stream.eatSpace()) return null;
-
-      var style = state.tokenize(stream, state);
-      if (style == "comment") return style;
-
-      if (state.context && state.context.align == null)
-        state.context.align = true;
-
-      var tok = stream.current();
-      if (tok == "(")
-        pushContext(stream, state, ")");
-      else if (tok == "[")
-        pushContext(stream, state, "]");
-      else if (state.context && state.context.type == tok)
-        popContext(state);
-      return style;
-    },
-
-    indent: function(state, textAfter) {
-      var cx = state.context;
-      if (!cx) return CodeMirror.Pass;
-      var closing = textAfter.charAt(0) == cx.type;
-      if (cx.align) return cx.col + (closing ? 0 : 1);
-      else return cx.indent + (closing ? 0 : config.indentUnit);
-    },
-
-    blockCommentStart: "/*",
-    blockCommentEnd: "*/",
-    lineComment: support.commentSlashSlash ? "//" : support.commentHash ? "#" : null
-  };
-});
-
-(function() {
-  "use strict";
-
-  // `identifier`
-  function hookIdentifier(stream) {
-    // MySQL/MariaDB identifiers
-    // ref: http://dev.mysql.com/doc/refman/5.6/en/identifier-qualifiers.html
-    var ch;
-    while ((ch = stream.next()) != null) {
-      if (ch == "`" && !stream.eat("`")) return "variable-2";
-    }
-    stream.backUp(stream.current().length - 1);
-    return stream.eatWhile(/\w/) ? "variable-2" : null;
-  }
-
-  // variable token
-  function hookVar(stream) {
-    // variables
-    // @@prefix.varName @varName
-    // varName can be quoted with ` or ' or "
-    // ref: http://dev.mysql.com/doc/refman/5.5/en/user-variables.html
-    if (stream.eat("@")) {
-      stream.match(/^session\./);
-      stream.match(/^local\./);
-      stream.match(/^global\./);
-    }
-
-    if (stream.eat("'")) {
-      stream.match(/^.*'/);
-      return "variable-2";
-    } else if (stream.eat('"')) {
-      stream.match(/^.*"/);
-      return "variable-2";
-    } else if (stream.eat("`")) {
-      stream.match(/^.*`/);
-      return "variable-2";
-    } else if (stream.match(/^[0-9a-zA-Z$\.\_]+/)) {
-      return "variable-2";
-    }
-    return null;
-  };
-
-  // short client keyword token
-  function hookClient(stream) {
-    // \N means NULL
-    // ref: http://dev.mysql.com/doc/refman/5.5/en/null-values.html
-    if (stream.eat("N")) {
-        return "atom";
-    }
-    // \g, etc
-    // ref: http://dev.mysql.com/doc/refman/5.5/en/mysql-commands.html
-    return stream.match(/^[a-zA-Z.#!?]/) ? "variable-2" : null;
-  }
-
-  // these keywords are used by all SQL dialects (however, a mode can still overwrite it)
-  var sqlKeywords = "alter and as asc between by count create delete desc distinct drop from group having in insert into is join like not on or order select set table union update values where ";
-
-  // turn a space-separated list into an array
-  function set(str) {
-    var obj = {}, words = str.split(" ");
-    for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
-    return obj;
-  }
-
-  // A generic SQL Mode. It's not a standard, it just try to support what is generally supported
-  CodeMirror.defineMIME("text/x-sql", {
-    name: "sql",
-    keywords: set(sqlKeywords + "begin"),
-    builtin: set("bool boolean bit blob enum long longblob longtext medium mediumblob mediumint mediumtext time timestamp tinyblob tinyint tinytext text bigint int int1 int2 int3 int4 int8 integer float float4 float8 double char varbinary varchar varcharacter precision real date datetime year unsigned signed decimal numeric"),
-    atoms: set("false true null unknown"),
-    operatorChars: /^[*+\-%<>!=]/,
-    dateSQL: set("date time timestamp"),
-    support: set("ODBCdotTable doubleQuote binaryNumber hexNumber")
-  });
-
-  CodeMirror.defineMIME("text/x-mssql", {
-    name: "sql",
-    client: set("charset clear connect edit ego exit go help nopager notee nowarning pager print prompt quit rehash source status system tee"),
-    keywords: set(sqlKeywords + "begin trigger proc view index for add constraint key primary foreign collate clustered nonclustered declare"),
-    builtin: set("bigint numeric bit smallint decimal smallmoney int tinyint money float real char varchar text nchar nvarchar ntext binary varbinary image cursor timestamp hierarchyid uniqueidentifier sql_variant xml table "),
-    atoms: set("false true null unknown"),
-    operatorChars: /^[*+\-%<>!=]/,
-    dateSQL: set("date datetimeoffset datetime2 smalldatetime datetime time"),
-    hooks: {
-      "@":   hookVar
-    }
-  });
-
-  CodeMirror.defineMIME("text/x-mysql", {
-    name: "sql",
-    client: set("charset clear connect edit ego exit go help nopager notee nowarning pager print prompt quit rehash source status system tee"),
-    keywords: set(sqlKeywords + "accessible action add after algorithm all analyze asensitive at authors auto_increment autocommit avg avg_row_length before binary binlog both btree cache call cascade cascaded case catalog_name chain change changed character check checkpoint checksum class_origin client_statistics close coalesce code collate collation collations column columns comment commit committed completion concurrent condition connection consistent constraint contains continue contributors convert cross current current_date current_time current_timestamp current_user cursor data database databases day_hour day_microsecond day_minute day_second deallocate dec declare default delay_key_write delayed delimiter des_key_file describe deterministic dev_pop dev_samp deviance diagnostics directory disable discard distinctrow div dual dumpfile each elseif enable enclosed end ends engine engines enum errors escape escaped even event events every execute exists exit explain extended fast fetch field fields first flush for force foreign found_rows full fulltext function general get global grant grants group group_concat handler hash help high_priority hosts hour_microsecond hour_minute hour_second if ignore ignore_server_ids import index index_statistics infile inner innodb inout insensitive insert_method install interval invoker isolation iterate key keys kill language last leading leave left level limit linear lines list load local localtime localtimestamp lock logs low_priority master master_heartbeat_period master_ssl_verify_server_cert masters match max max_rows maxvalue message_text middleint migrate min min_rows minute_microsecond minute_second mod mode modifies modify mutex mysql_errno natural next no no_write_to_binlog offline offset one online open optimize option optionally out outer outfile pack_keys parser partition partitions password phase plugin plugins prepare preserve prev primary privileges procedure processlist profile profiles purge query quick range read read_write reads real rebuild recover references regexp relaylog release remove rename reorganize repair repeatable replace require resignal restrict resume return returns revoke right rlike rollback rollup row row_format rtree savepoint schedule schema schema_name schemas second_microsecond security sensitive separator serializable server session share show signal slave slow smallint snapshot soname spatial specific sql sql_big_result sql_buffer_result sql_cache sql_calc_found_rows sql_no_cache sql_small_result sqlexception sqlstate sqlwarning ssl start starting starts status std stddev stddev_pop stddev_samp storage straight_join subclass_origin sum suspend table_name table_statistics tables tablespace temporary terminated to trailing transaction trigger triggers truncate uncommitted undo uninstall unique unlock upgrade usage use use_frm user user_resources user_statistics using utc_date utc_time utc_timestamp value variables varying view views warnings when while with work write xa xor year_month zerofill begin do then else loop repeat"),
-    builtin: set("bool boolean bit blob decimal double float long longblob longtext medium mediumblob mediumint mediumtext time timestamp tinyblob tinyint tinytext text bigint int int1 int2 int3 int4 int8 integer float float4 float8 double char varbinary varchar varcharacter precision date datetime year unsigned signed numeric"),
-    atoms: set("false true null unknown"),
-    operatorChars: /^[*+\-%<>!=&|^]/,
-    dateSQL: set("date time timestamp"),
-    support: set("ODBCdotTable decimallessFloat zerolessFloat binaryNumber hexNumber doubleQuote nCharCast charsetCast commentHash commentSpaceRequired"),
-    hooks: {
-      "@":   hookVar,
-      "`":   hookIdentifier,
-      "\\":  hookClient
-    }
-  });
-
-  CodeMirror.defineMIME("text/x-mariadb", {
-    name: "sql",
-    client: set("charset clear connect edit ego exit go help nopager notee nowarning pager print prompt quit rehash source status system tee"),
-    keywords: set(sqlKeywords + "accessible action add after algorithm all always analyze asensitive at authors auto_increment autocommit avg avg_row_length before binary binlog both btree cache call cascade cascaded case catalog_name chain change changed character check checkpoint checksum class_origin client_statistics close coalesce code collate collation collations column columns comment commit committed completion concurrent condition connection consistent constraint contains continue contributors convert cross current current_date current_time current_timestamp current_user cursor data database databases day_hour day_microsecond day_minute day_second deallocate dec declare default delay_key_write delayed delimiter des_key_file describe deterministic dev_pop dev_samp deviance diagnostics directory disable discard distinctrow div dual dumpfile each elseif enable enclosed end ends engine engines enum errors escape escaped even event events every execute exists exit explain extended fast fetch field fields first flush for force foreign found_rows full fulltext function general generated get global grant grants group groupby_concat handler hard hash help high_priority hosts hour_microsecond hour_minute hour_second if ignore ignore_server_ids import index index_statistics infile inner innodb inout insensitive insert_method install interval invoker isolation iterate key keys kill language last leading leave left level limit linear lines list load local localtime localtimestamp lock logs low_priority master master_heartbeat_period master_ssl_verify_server_cert masters match max max_rows maxvalue message_text middleint migrate min min_rows minute_microsecond minute_second mod mode modifies modify mutex mysql_errno natural next no no_write_to_binlog offline offset one online open optimize option optionally out outer outfile pack_keys parser partition partitions password persistent phase plugin plugins prepare preserve prev primary privileges procedure processlist profile profiles purge query quick range read read_write reads real rebuild recover references regexp relaylog release remove rename reorganize repair repeatable replace require resignal restrict resume return returns revoke right rlike rollback rollup row row_format rtree savepoint schedule schema schema_name schemas second_microsecond security sensitive separator serializable server session share show shutdown signal slave slow smallint snapshot soft soname spatial specific sql sql_big_result sql_buffer_result sql_cache sql_calc_found_rows sql_no_cache sql_small_result sqlexception sqlstate sqlwarning ssl start starting starts status std stddev stddev_pop stddev_samp storage straight_join subclass_origin sum suspend table_name table_statistics tables tablespace temporary terminated to trailing transaction trigger triggers truncate uncommitted undo uninstall unique unlock upgrade usage use use_frm user user_resources user_statistics using utc_date utc_time utc_timestamp value variables varying view views virtual warnings when while with work write xa xor year_month zerofill begin do then else loop repeat"),
-    builtin: set("bool boolean bit blob decimal double float long longblob longtext medium mediumblob mediumint mediumtext time timestamp tinyblob tinyint tinytext text bigint int int1 int2 int3 int4 int8 integer float float4 float8 double char varbinary varchar varcharacter precision date datetime year unsigned signed numeric"),
-    atoms: set("false true null unknown"),
-    operatorChars: /^[*+\-%<>!=&|^]/,
-    dateSQL: set("date time timestamp"),
-    support: set("ODBCdotTable decimallessFloat zerolessFloat binaryNumber hexNumber doubleQuote nCharCast charsetCast commentHash commentSpaceRequired"),
-    hooks: {
-      "@":   hookVar,
-      "`":   hookIdentifier,
-      "\\":  hookClient
-    }
-  });
-
-  // the query language used by Apache Cassandra is called CQL, but this mime type
-  // is called Cassandra to avoid confusion with Contextual Query Language
-  CodeMirror.defineMIME("text/x-cassandra", {
-    name: "sql",
-    client: { },
-    keywords: set("add all allow alter and any apply as asc authorize batch begin by clustering columnfamily compact consistency count create custom delete desc distinct drop each_quorum exists filtering from grant if in index insert into key keyspace keyspaces level limit local_one local_quorum modify nan norecursive nosuperuser not of on one order password permission permissions primary quorum rename revoke schema select set storage superuser table three to token truncate ttl two type unlogged update use user users using values where with writetime"),
-    builtin: set("ascii bigint blob boolean counter decimal double float frozen inet int list map static text timestamp timeuuid tuple uuid varchar varint"),
-    atoms: set("false true infinity NaN"),
-    operatorChars: /^[<>=]/,
-    dateSQL: { },
-    support: set("commentSlashSlash decimallessFloat"),
-    hooks: { }
-  });
-
-  // this is based on Peter Raganitsch's 'plsql' mode
-  CodeMirror.defineMIME("text/x-plsql", {
-    name:       "sql",
-    client:     set("appinfo arraysize autocommit autoprint autorecovery autotrace blockterminator break btitle cmdsep colsep compatibility compute concat copycommit copytypecheck define describe echo editfile embedded escape exec execute feedback flagger flush heading headsep instance linesize lno loboffset logsource long longchunksize markup native newpage numformat numwidth pagesize pause pno recsep recsepchar release repfooter repheader serveroutput shiftinout show showmode size spool sqlblanklines sqlcase sqlcode sqlcontinue sqlnumber sqlpluscompatibility sqlprefix sqlprompt sqlterminator suffix tab term termout time timing trimout trimspool ttitle underline verify version wrap"),
-    keywords:   set("abort accept access add all alter and any array arraylen as asc assert assign at attributes audit authorization avg base_table begin between binary_integer body boolean by case cast char char_base check close cluster clusters colauth column comment commit compress connect connected constant constraint crash create current currval cursor data_base database date dba deallocate debugoff debugon decimal declare default definition delay delete desc digits dispose distinct do drop else elseif elsif enable end entry escape exception exception_init exchange exclusive exists exit external fast fetch file for force form from function generic goto grant group having identified if immediate in increment index indexes indicator initial initrans insert interface intersect into is key level library like limited local lock log logging long loop master maxextents maxtrans member minextents minus mislabel mode modify multiset new next no noaudit nocompress nologging noparallel not nowait number_base object of off offline on online only open option or order out package parallel partition pctfree pctincrease pctused pls_integer positive positiven pragma primary prior private privileges procedure public raise range raw read rebuild record ref references refresh release rename replace resource restrict return returning returns reverse revoke rollback row rowid rowlabel rownum rows run savepoint schema segment select separate session set share snapshot some space split sql start statement storage subtype successful synonym tabauth table tables tablespace task terminate then to trigger truncate type union unique unlimited unrecoverable unusable update use using validate value values variable view views when whenever where while with work"),
-    builtin:    set("abs acos add_months ascii asin atan atan2 average bfile bfilename bigserial bit blob ceil character chartorowid chr clob concat convert cos cosh count dec decode deref dual dump dup_val_on_index empty error exp false float floor found glb greatest hextoraw initcap instr instrb int integer isopen last_day least lenght lenghtb ln lower lpad ltrim lub make_ref max min mlslabel mod months_between natural naturaln nchar nclob new_time next_day nextval nls_charset_decl_len nls_charset_id nls_charset_name nls_initcap nls_lower nls_sort nls_upper nlssort no_data_found notfound null number numeric nvarchar2 nvl others power rawtohex real reftohex round rowcount rowidtochar rowtype rpad rtrim serial sign signtype sin sinh smallint soundex sqlcode sqlerrm sqrt stddev string substr substrb sum sysdate tan tanh to_char text to_date to_label to_multi_byte to_number to_single_byte translate true trunc uid unlogged upper user userenv varchar varchar2 variance varying vsize xml"),
-    operatorChars: /^[*+\-%<>!=~]/,
-    dateSQL:    set("date time timestamp"),
-    support:    set("doubleQuote nCharCast zerolessFloat binaryNumber hexNumber")
-  });
-
-  // Created to support specific hive keywords
-  CodeMirror.defineMIME("text/x-hive", {
-    name: "sql",
-    keywords: set("select alter $elem$ $key$ $value$ add after all analyze and archive as asc before between binary both bucket buckets by cascade case cast change cluster clustered clusterstatus collection column columns comment compute concatenate continue create cross cursor data database databases dbproperties deferred delete delimited desc describe directory disable distinct distribute drop else enable end escaped exclusive exists explain export extended external false fetch fields fileformat first format formatted from full function functions grant group having hold_ddltime idxproperties if import in index indexes inpath inputdriver inputformat insert intersect into is items join keys lateral left like limit lines load local location lock locks mapjoin materialized minus msck no_drop nocompress not of offline on option or order out outer outputdriver outputformat overwrite partition partitioned partitions percent plus preserve procedure purge range rcfile read readonly reads rebuild recordreader recordwriter recover reduce regexp rename repair replace restrict revoke right rlike row schema schemas semi sequencefile serde serdeproperties set shared show show_database sort sorted ssl statistics stored streamtable table tables tablesample tblproperties temporary terminated textfile then tmp to touch transform trigger true unarchive undo union uniquejoin unlock update use using utc utc_tmestamp view when where while with"),
-    builtin: set("bool boolean long timestamp tinyint smallint bigint int float double date datetime unsigned string array struct map uniontype"),
-    atoms: set("false true null unknown"),
-    operatorChars: /^[*+\-%<>!=]/,
-    dateSQL: set("date timestamp"),
-    support: set("ODBCdotTable doubleQuote binaryNumber hexNumber")
-  });
-}());
-
-});
-
-/*
-  How Properties of Mime Types are used by SQL Mode
-  =================================================
-
-  keywords:
-    A list of keywords you want to be highlighted.
-  builtin:
-    A list of builtin types you want to be highlighted (if you want types to be of class "builtin" instead of "keyword").
-  operatorChars:
-    All characters that must be handled as operators.
-  client:
-    Commands parsed and executed by the client (not the server).
-  support:
-    A list of supported syntaxes which are not common, but are supported by more than 1 DBMS.
-    * ODBCdotTable: .tableName
-    * zerolessFloat: .1
-    * doubleQuote
-    * nCharCast: N'string'
-    * charsetCast: _utf8'string'
-    * commentHash: use # char for comments
-    * commentSlashSlash: use // for comments
-    * commentSpaceRequired: require a space after -- for comments
-  atoms:
-    Keywords that must be highlighted as atoms,. Some DBMS's support more atoms than others:
-    UNKNOWN, INFINITY, UNDERFLOW, NaN...
-  dateSQL:
-    Used for date/time SQL standard syntax, because not all DBMS's support same temporal types.
-*/
diff --git a/#pma/js/codemirror/mode/xml/xml.js b/#pma/js/codemirror/mode/xml/xml.js
deleted file mode 100644
index 2f3b8f87..00000000
--- a/#pma/js/codemirror/mode/xml/xml.js
+++ /dev/null
@@ -1,384 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("xml", function(config, parserConfig) {
-  var indentUnit = config.indentUnit;
-  var multilineTagIndentFactor = parserConfig.multilineTagIndentFactor || 1;
-  var multilineTagIndentPastTag = parserConfig.multilineTagIndentPastTag;
-  if (multilineTagIndentPastTag == null) multilineTagIndentPastTag = true;
-
-  var Kludges = parserConfig.htmlMode ? {
-    autoSelfClosers: {'area': true, 'base': true, 'br': true, 'col': true, 'command': true,
-                      'embed': true, 'frame': true, 'hr': true, 'img': true, 'input': true,
-                      'keygen': true, 'link': true, 'meta': true, 'param': true, 'source': true,
-                      'track': true, 'wbr': true, 'menuitem': true},
-    implicitlyClosed: {'dd': true, 'li': true, 'optgroup': true, 'option': true, 'p': true,
-                       'rp': true, 'rt': true, 'tbody': true, 'td': true, 'tfoot': true,
-                       'th': true, 'tr': true},
-    contextGrabbers: {
-      'dd': {'dd': true, 'dt': true},
-      'dt': {'dd': true, 'dt': true},
-      'li': {'li': true},
-      'option': {'option': true, 'optgroup': true},
-      'optgroup': {'optgroup': true},
-      'p': {'address': true, 'article': true, 'aside': true, 'blockquote': true, 'dir': true,
-            'div': true, 'dl': true, 'fieldset': true, 'footer': true, 'form': true,
-            'h1': true, 'h2': true, 'h3': true, 'h4': true, 'h5': true, 'h6': true,
-            'header': true, 'hgroup': true, 'hr': true, 'menu': true, 'nav': true, 'ol': true,
-            'p': true, 'pre': true, 'section': true, 'table': true, 'ul': true},
-      'rp': {'rp': true, 'rt': true},
-      'rt': {'rp': true, 'rt': true},
-      'tbody': {'tbody': true, 'tfoot': true},
-      'td': {'td': true, 'th': true},
-      'tfoot': {'tbody': true},
-      'th': {'td': true, 'th': true},
-      'thead': {'tbody': true, 'tfoot': true},
-      'tr': {'tr': true}
-    },
-    doNotIndent: {"pre": true},
-    allowUnquoted: true,
-    allowMissing: true,
-    caseFold: true
-  } : {
-    autoSelfClosers: {},
-    implicitlyClosed: {},
-    contextGrabbers: {},
-    doNotIndent: {},
-    allowUnquoted: false,
-    allowMissing: false,
-    caseFold: false
-  };
-  var alignCDATA = parserConfig.alignCDATA;
-
-  // Return variables for tokenizers
-  var type, setStyle;
-
-  function inText(stream, state) {
-    function chain(parser) {
-      state.tokenize = parser;
-      return parser(stream, state);
-    }
-
-    var ch = stream.next();
-    if (ch == "<") {
-      if (stream.eat("!")) {
-        if (stream.eat("[")) {
-          if (stream.match("CDATA[")) return chain(inBlock("atom", "]]>"));
-          else return null;
-        } else if (stream.match("--")) {
-          return chain(inBlock("comment", "-->"));
-        } else if (stream.match("DOCTYPE", true, true)) {
-          stream.eatWhile(/[\w\._\-]/);
-          return chain(doctype(1));
-        } else {
-          return null;
-        }
-      } else if (stream.eat("?")) {
-        stream.eatWhile(/[\w\._\-]/);
-        state.tokenize = inBlock("meta", "?>");
-        return "meta";
-      } else {
-        type = stream.eat("/") ? "closeTag" : "openTag";
-        state.tokenize = inTag;
-        return "tag bracket";
-      }
-    } else if (ch == "&") {
-      var ok;
-      if (stream.eat("#")) {
-        if (stream.eat("x")) {
-          ok = stream.eatWhile(/[a-fA-F\d]/) && stream.eat(";");
-        } else {
-          ok = stream.eatWhile(/[\d]/) && stream.eat(";");
-        }
-      } else {
-        ok = stream.eatWhile(/[\w\.\-:]/) && stream.eat(";");
-      }
-      return ok ? "atom" : "error";
-    } else {
-      stream.eatWhile(/[^&<]/);
-      return null;
-    }
-  }
-
-  function inTag(stream, state) {
-    var ch = stream.next();
-    if (ch == ">" || (ch == "/" && stream.eat(">"))) {
-      state.tokenize = inText;
-      type = ch == ">" ? "endTag" : "selfcloseTag";
-      return "tag bracket";
-    } else if (ch == "=") {
-      type = "equals";
-      return null;
-    } else if (ch == "<") {
-      state.tokenize = inText;
-      state.state = baseState;
-      state.tagName = state.tagStart = null;
-      var next = state.tokenize(stream, state);
-      return next ? next + " tag error" : "tag error";
-    } else if (/[\'\"]/.test(ch)) {
-      state.tokenize = inAttribute(ch);
-      state.stringStartCol = stream.column();
-      return state.tokenize(stream, state);
-    } else {
-      stream.match(/^[^\s\u00a0=<>\"\']*[^\s\u00a0=<>\"\'\/]/);
-      return "word";
-    }
-  }
-
-  function inAttribute(quote) {
-    var closure = function(stream, state) {
-      while (!stream.eol()) {
-        if (stream.next() == quote) {
-          state.tokenize = inTag;
-          break;
-        }
-      }
-      return "string";
-    };
-    closure.isInAttribute = true;
-    return closure;
-  }
-
-  function inBlock(style, terminator) {
-    return function(stream, state) {
-      while (!stream.eol()) {
-        if (stream.match(terminator)) {
-          state.tokenize = inText;
-          break;
-        }
-        stream.next();
-      }
-      return style;
-    };
-  }
-  function doctype(depth) {
-    return function(stream, state) {
-      var ch;
-      while ((ch = stream.next()) != null) {
-        if (ch == "<") {
-          state.tokenize = doctype(depth + 1);
-          return state.tokenize(stream, state);
-        } else if (ch == ">") {
-          if (depth == 1) {
-            state.tokenize = inText;
-            break;
-          } else {
-            state.tokenize = doctype(depth - 1);
-            return state.tokenize(stream, state);
-          }
-        }
-      }
-      return "meta";
-    };
-  }
-
-  function Context(state, tagName, startOfLine) {
-    this.prev = state.context;
-    this.tagName = tagName;
-    this.indent = state.indented;
-    this.startOfLine = startOfLine;
-    if (Kludges.doNotIndent.hasOwnProperty(tagName) || (state.context && state.context.noIndent))
-      this.noIndent = true;
-  }
-  function popContext(state) {
-    if (state.context) state.context = state.context.prev;
-  }
-  function maybePopContext(state, nextTagName) {
-    var parentTagName;
-    while (true) {
-      if (!state.context) {
-        return;
-      }
-      parentTagName = state.context.tagName;
-      if (!Kludges.contextGrabbers.hasOwnProperty(parentTagName) ||
-          !Kludges.contextGrabbers[parentTagName].hasOwnProperty(nextTagName)) {
-        return;
-      }
-      popContext(state);
-    }
-  }
-
-  function baseState(type, stream, state) {
-    if (type == "openTag") {
-      state.tagStart = stream.column();
-      return tagNameState;
-    } else if (type == "closeTag") {
-      return closeTagNameState;
-    } else {
-      return baseState;
-    }
-  }
-  function tagNameState(type, stream, state) {
-    if (type == "word") {
-      state.tagName = stream.current();
-      setStyle = "tag";
-      return attrState;
-    } else {
-      setStyle = "error";
-      return tagNameState;
-    }
-  }
-  function closeTagNameState(type, stream, state) {
-    if (type == "word") {
-      var tagName = stream.current();
-      if (state.context && state.context.tagName != tagName &&
-          Kludges.implicitlyClosed.hasOwnProperty(state.context.tagName))
-        popContext(state);
-      if (state.context && state.context.tagName == tagName) {
-        setStyle = "tag";
-        return closeState;
-      } else {
-        setStyle = "tag error";
-        return closeStateErr;
-      }
-    } else {
-      setStyle = "error";
-      return closeStateErr;
-    }
-  }
-
-  function closeState(type, _stream, state) {
-    if (type != "endTag") {
-      setStyle = "error";
-      return closeState;
-    }
-    popContext(state);
-    return baseState;
-  }
-  function closeStateErr(type, stream, state) {
-    setStyle = "error";
-    return closeState(type, stream, state);
-  }
-
-  function attrState(type, _stream, state) {
-    if (type == "word") {
-      setStyle = "attribute";
-      return attrEqState;
-    } else if (type == "endTag" || type == "selfcloseTag") {
-      var tagName = state.tagName, tagStart = state.tagStart;
-      state.tagName = state.tagStart = null;
-      if (type == "selfcloseTag" ||
-          Kludges.autoSelfClosers.hasOwnProperty(tagName)) {
-        maybePopContext(state, tagName);
-      } else {
-        maybePopContext(state, tagName);
-        state.context = new Context(state, tagName, tagStart == state.indented);
-      }
-      return baseState;
-    }
-    setStyle = "error";
-    return attrState;
-  }
-  function attrEqState(type, stream, state) {
-    if (type == "equals") return attrValueState;
-    if (!Kludges.allowMissing) setStyle = "error";
-    return attrState(type, stream, state);
-  }
-  function attrValueState(type, stream, state) {
-    if (type == "string") return attrContinuedState;
-    if (type == "word" && Kludges.allowUnquoted) {setStyle = "string"; return attrState;}
-    setStyle = "error";
-    return attrState(type, stream, state);
-  }
-  function attrContinuedState(type, stream, state) {
-    if (type == "string") return attrContinuedState;
-    return attrState(type, stream, state);
-  }
-
-  return {
-    startState: function() {
-      return {tokenize: inText,
-              state: baseState,
-              indented: 0,
-              tagName: null, tagStart: null,
-              context: null};
-    },
-
-    token: function(stream, state) {
-      if (!state.tagName && stream.sol())
-        state.indented = stream.indentation();
-
-      if (stream.eatSpace()) return null;
-      type = null;
-      var style = state.tokenize(stream, state);
-      if ((style || type) && style != "comment") {
-        setStyle = null;
-        state.state = state.state(type || style, stream, state);
-        if (setStyle)
-          style = setStyle == "error" ? style + " error" : setStyle;
-      }
-      return style;
-    },
-
-    indent: function(state, textAfter, fullLine) {
-      var context = state.context;
-      // Indent multi-line strings (e.g. css).
-      if (state.tokenize.isInAttribute) {
-        if (state.tagStart == state.indented)
-          return state.stringStartCol + 1;
-        else
-          return state.indented + indentUnit;
-      }
-      if (context && context.noIndent) return CodeMirror.Pass;
-      if (state.tokenize != inTag && state.tokenize != inText)
-        return fullLine ? fullLine.match(/^(\s*)/)[0].length : 0;
-      // Indent the starts of attribute names.
-      if (state.tagName) {
-        if (multilineTagIndentPastTag)
-          return state.tagStart + state.tagName.length + 2;
-        else
-          return state.tagStart + indentUnit * multilineTagIndentFactor;
-      }
-      if (alignCDATA && /<!\[CDATA\[/.test(textAfter)) return 0;
-      var tagAfter = textAfter && /^<(\/)?([\w_:\.-]*)/.exec(textAfter);
-      if (tagAfter && tagAfter[1]) { // Closing tag spotted
-        while (context) {
-          if (context.tagName == tagAfter[2]) {
-            context = context.prev;
-            break;
-          } else if (Kludges.implicitlyClosed.hasOwnProperty(context.tagName)) {
-            context = context.prev;
-          } else {
-            break;
-          }
-        }
-      } else if (tagAfter) { // Opening tag spotted
-        while (context) {
-          var grabbers = Kludges.contextGrabbers[context.tagName];
-          if (grabbers && grabbers.hasOwnProperty(tagAfter[2]))
-            context = context.prev;
-          else
-            break;
-        }
-      }
-      while (context && !context.startOfLine)
-        context = context.prev;
-      if (context) return context.indent + indentUnit;
-      else return 0;
-    },
-
-    electricInput: /<\/[\s\w:]+>$/,
-    blockCommentStart: "<!--",
-    blockCommentEnd: "-->",
-
-    configuration: parserConfig.htmlMode ? "html" : "xml",
-    helperType: parserConfig.htmlMode ? "html" : "xml"
-  };
-});
-
-CodeMirror.defineMIME("text/xml", "xml");
-CodeMirror.defineMIME("application/xml", "xml");
-if (!CodeMirror.mimeModes.hasOwnProperty("text/html"))
-  CodeMirror.defineMIME("text/html", {name: "xml", htmlMode: true});
-
-});
diff --git a/#pma/js/common.js b/#pma/js/common.js
deleted file mode 100644
index c4331627..00000000
--- a/#pma/js/common.js
+++ /dev/null
@@ -1,544 +0,0 @@
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-
-$(function () {
-    checkNumberOfFields();
-});
-
-/**
- * Holds common parameters such as server, db, table, etc
- *
- * The content for this is normally loaded from Header.php or
- * Response.php and executed by ajax.js
- */
-var PMA_commonParams = (function () {
-    /**
-     * @var hash params An associative array of key value pairs
-     * @access private
-     */
-    var params = {};
-    // The returned object is the public part of the module
-    return {
-        /**
-         * Saves all the key value pair that
-         * are provided in the input array
-         *
-         * @param obj hash The input array
-         *
-         * @return void
-         */
-        setAll: function (obj) {
-            var reload = false;
-            var updateNavigation = false;
-            for (var i in obj) {
-                if (params[i] !== undefined && params[i] !== obj[i]) {
-                    if (i == 'db' || i == 'table') {
-                        updateNavigation = true;
-                    }
-                    reload = true;
-                }
-                params[i] = obj[i];
-            }
-            if (updateNavigation &&
-                    $('#pma_navigation_tree').hasClass('synced')
-            ) {
-                PMA_showCurrentNavigation();
-            }
-        },
-        /**
-         * Retrieves a value given its key
-         * Returns empty string for undefined values
-         *
-         * @param name string The key
-         *
-         * @return string
-         */
-        get: function (name) {
-            return params[name] || '';
-        },
-        /**
-         * Saves a single key value pair
-         *
-         * @param name  string The key
-         * @param value string The value
-         *
-         * @return self For chainability
-         */
-        set: function (name, value) {
-            var updateNavigation = false;
-            if (name == 'db' || name == 'table' &&
-                params[name] !== value
-            ) {
-                updateNavigation = true;
-            }
-            params[name] = value;
-            if (updateNavigation &&
-                    $('#pma_navigation_tree').hasClass('synced')
-            ) {
-                PMA_showCurrentNavigation();
-            }
-            return this;
-        },
-        /**
-         * Returns the url query string using the saved parameters
-         *
-         * @return string
-         */
-        getUrlQuery: function () {
-            return PMA_sprintf(
-                '%s&server=%s&db=%s&table=%s',
-                this.get('common_query'),
-                encodeURIComponent(this.get('server')),
-                encodeURIComponent(this.get('db')),
-                encodeURIComponent(this.get('table'))
-            );
-        }
-    };
-})();
-
-/**
- * Holds common parameters such as server, db, table, etc
- *
- * The content for this is normally loaded from Header.php or
- * Response.php and executed by ajax.js
- */
-var PMA_commonActions = {
-    /**
-     * Saves the database name when it's changed
-     * and reloads the query window, if necessary
-     *
-     * @param new_db string new_db The name of the new database
-     *
-     * @return void
-     */
-    setDb: function (new_db) {
-        if (new_db != PMA_commonParams.get('db')) {
-            PMA_commonParams.setAll({'db': new_db, 'table': ''});
-        }
-    },
-    /**
-     * Opens a database in the main part of the page
-     *
-     * @param new_db string The name of the new database
-     *
-     * @return void
-     */
-    openDb: function (new_db) {
-        PMA_commonParams
-            .set('db', new_db)
-            .set('table', '');
-        this.refreshMain(
-            PMA_commonParams.get('opendb_url')
-        );
-    },
-    /**
-     * Refreshes the main frame
-     *
-     * @param mixed url Undefined to refresh to the same page
-     *                  String to go to a different page, e.g: 'index.php'
-     *
-     * @return void
-     */
-    refreshMain: function (url, callback) {
-        if (! url) {
-            url = $('#selflink').find('a').attr('href');
-            url = url.substring(0, url.indexOf('?'));
-        }
-        url += PMA_commonParams.getUrlQuery();
-        $('<a />', {href: url})
-            .appendTo('body')
-            .click()
-            .remove();
-        AJAX._callback = callback;
-    }
-};
-
-/**
- * Class to handle PMA Drag and Drop Import
- *      feature
- */
-PMA_DROP_IMPORT = {
-    /**
-     * @var int, count of total uploads in this view
-     */
-    uploadCount: 0,
-    /**
-     * @var int, count of live uploads
-     */
-    liveUploadCount: 0,
-    /**
-     * @var  string array, allowed extensions
-     */
-    allowedExtensions: ['sql', 'xml', 'ldi', 'mediawiki', 'shp'],
-    /**
-     * @var  string array, allowed extensions for compressed files
-     */
-    allowedCompressedExtensions: ['gz', 'bz2', 'zip'],
-    /**
-     * @var obj array to store message returned by import_status.php
-     */
-    importStatus: [],
-    /**
-     * Checks if any dropped file has valid extension or not
-     *
-     * @param file filename
-     *
-     * @return string, extension for valid extension, '' otherwise
-     */
-    _getExtension: function(file) {
-        var arr = file.split('.');
-        ext = arr[arr.length - 1];
-
-        //check if compressed
-        if (jQuery.inArray(ext.toLowerCase(),
-            PMA_DROP_IMPORT.allowedCompressedExtensions) !== -1) {
-            ext = arr[arr.length - 2];
-        }
-
-        //Now check for extension
-        if (jQuery.inArray(ext.toLowerCase(),
-            PMA_DROP_IMPORT.allowedExtensions) !== -1) {
-            return ext;
-        }
-        return '';
-    },
-    /**
-     * Shows upload progress for different sql uploads
-     *
-     * @param: hash (string), hash for specific file upload
-     * @param: percent (float), file upload percentage
-     *
-     * @return void
-     */
-    _setProgress: function(hash, percent) {
-        $('.pma_sql_import_status div li[data-hash="' +hash +'"]')
-            .children('progress').val(percent);
-    },
-    /**
-     * Function to upload the file asynchronously
-     *
-     * @param formData FormData object for a specific file
-     * @param hash hash of the current file upload
-     *
-     * @return void
-     */
-    _sendFileToServer: function(formData, hash) {
-        var uploadURL ="./import.php"; //Upload URL
-        var extraData ={};
-        var jqXHR = $.ajax({
-            xhr: function() {
-                var xhrobj = $.ajaxSettings.xhr();
-                if (xhrobj.upload) {
-                    xhrobj.upload.addEventListener('progress', function(event) {
-                        var percent = 0;
-                        var position = event.loaded || event.position;
-                        var total = event.total;
-                        if (event.lengthComputable) {
-                            percent = Math.ceil(position / total * 100);
-                        }
-                        //Set progress
-                        PMA_DROP_IMPORT._setProgress(hash, percent);
-                    }, false);
-                }
-                return xhrobj;
-            },
-            url: uploadURL,
-            type: "POST",
-            contentType:false,
-            processData: false,
-            cache: false,
-            data: formData,
-            success: function(data){
-                PMA_DROP_IMPORT._importFinished(hash, false, data.success);
-                if (!data.success) {
-                    PMA_DROP_IMPORT.importStatus[PMA_DROP_IMPORT.importStatus.length] = {
-                        hash: hash,
-                        message: data.error
-                    };
-                }
-            }
-        });
-
-        // -- provide link to cancel the upload
-        $('.pma_sql_import_status div li[data-hash="' + hash +
-            '"] span.filesize').html('<span hash="' +
-            hash + '" class="pma_drop_file_status" task="cancel">' +
-            PMA_messages.dropImportMessageCancel + '</span>');
-
-        // -- add event listener to this link to abort upload operation
-        $('.pma_sql_import_status div li[data-hash="' + hash +
-            '"] span.filesize span.pma_drop_file_status')
-            .on('click', function() {
-                if ($(this).attr('task') === 'cancel') {
-                    jqXHR.abort();
-                    $(this).html('<span>' +PMA_messages.dropImportMessageAborted +'</span>');
-                    PMA_DROP_IMPORT._importFinished(hash, true, false);
-                } else if ($(this).children("span").html() ===
-                    PMA_messages.dropImportMessageFailed) {
-                    // -- view information
-                    var $this = $(this);
-                    $.each( PMA_DROP_IMPORT.importStatus,
-                    function( key, value ) {
-                        if (value.hash === hash) {
-                            $(".pma_drop_result:visible").remove();
-                            var filename = $this.parent('span').attr('data-filename');
-                            $("body").append('<div class="pma_drop_result"><h2>' +
-                                PMA_messages.dropImportImportResultHeader + ' - ' +
-                                filename +'<span class="close">x</span></h2>' +value.message +'</div>');
-                            $(".pma_drop_result").draggable();  //to make this dialog draggable
-                        }
-                    });
-                }
-            });
-    },
-    /**
-     * Triggered when an object is dragged into the PMA UI
-     *
-     * @param event obj
-     *
-     * @return void
-     */
-    _dragenter : function (event) {
-
-        // We don't want to prevent users from using
-        // browser's default drag-drop feature on some page(s)
-        if ($(".noDragDrop").length !== 0) {
-            return;
-        }
-
-        event.stopPropagation();
-        event.preventDefault();
-        if (!PMA_DROP_IMPORT._hasFiles(event)) {
-            return;
-        }
-        if (PMA_commonParams.get('db') === '') {
-            $(".pma_drop_handler").html(PMA_messages.dropImportSelectDB);
-        } else {
-            $(".pma_drop_handler").html(PMA_messages.dropImportDropFiles);
-        }
-        $(".pma_drop_handler").fadeIn();
-    },
-    /**
-     * Check if dragged element contains Files
-     *
-     * @param event the event object
-     *
-     * @return bool
-     */
-    _hasFiles: function (event) {
-        return !(typeof event.originalEvent.dataTransfer.types === 'undefined' ||
-            $.inArray('Files', event.originalEvent.dataTransfer.types) < 0 ||
-            $.inArray(
-                'application/x-moz-nativeimage',
-                event.originalEvent.dataTransfer.types
-            ) >= 0);
-    },
-    /**
-     * Triggered when dragged file is being dragged over PMA UI
-     *
-     * @param event obj
-     *
-     * @return void
-     */
-    _dragover: function (event) {
-        // We don't want to prevent users from using
-        // browser's default drag-drop feature on some page(s)
-        if ($(".noDragDrop").length !== 0) {
-            return;
-        }
-
-        event.stopPropagation();
-        event.preventDefault();
-        if (!PMA_DROP_IMPORT._hasFiles(event)) {
-            return;
-        }
-        $(".pma_drop_handler").fadeIn();
-    },
-    /**
-     * Triggered when dragged objects are left
-     *
-     * @param event obj
-     *
-     * @return void
-     */
-    _dragleave: function (event) {
-        // We don't want to prevent users from using
-        // browser's default drag-drop feature on some page(s)
-        if ($(".noDragDrop").length !== 0) {
-            return;
-        }
-        event.stopPropagation();
-        event.preventDefault();
-        var $pma_drop_handler = $(".pma_drop_handler");
-        $pma_drop_handler.clearQueue().stop();
-        $pma_drop_handler.fadeOut();
-        $pma_drop_handler.html(PMA_messages.dropImportDropFiles);
-    },
-    /**
-     * Called when upload has finished
-     *
-     * @param string, unique hash for a certain upload
-     * @param bool, true if upload was aborted
-     * @param bool, status of sql upload, as sent by server
-     *
-     * @return void
-     */
-    _importFinished: function(hash, aborted, status) {
-        $('.pma_sql_import_status div li[data-hash="' +hash +'"]')
-            .children("progress").hide();
-        var icon = 'icon ic_s_success';
-        // -- provide link to view upload status
-        if (!aborted) {
-            if (status) {
-                $('.pma_sql_import_status div li[data-hash="' + hash +
-                   '"] span.filesize span.pma_drop_file_status')
-                   .html('<span>' +PMA_messages.dropImportMessageSuccess +'</a>');
-            } else {
-                $('.pma_sql_import_status div li[data-hash="' + hash +
-                   '"] span.filesize span.pma_drop_file_status')
-                   .html('<span class="underline">' + PMA_messages.dropImportMessageFailed +
-                   '</a>');
-                icon = 'icon ic_s_error';
-            }
-        } else {
-            icon = 'icon ic_s_notice';
-        }
-        $('.pma_sql_import_status div li[data-hash="' + hash +
-            '"] span.filesize span.pma_drop_file_status')
-            .attr('task', 'info');
-
-        // Set icon
-        $('.pma_sql_import_status div li[data-hash="' +hash +'"]')
-            .prepend('<img src="./themes/dot.gif" title="finished" class="' +
-            icon +'"> ');
-
-        // Decrease liveUploadCount by one
-        $('.pma_import_count').html(--PMA_DROP_IMPORT.liveUploadCount);
-        if (!PMA_DROP_IMPORT.liveUploadCount) {
-            $('.pma_sql_import_status h2 .close').fadeIn();
-        }
-    },
-    /**
-     * Triggered when dragged objects are dropped to UI
-     * From this function, the AJAX Upload operation is initiated
-     *
-     * @param event object
-     *
-     * @return void
-     */
-    _drop: function (event) {
-        // We don't want to prevent users from using
-        // browser's default drag-drop feature on some page(s)
-        if ($(".noDragDrop").length !== 0) {
-            return;
-        }
-
-        var dbname = PMA_commonParams.get('db');
-        var server = PMA_commonParams.get('server');
-
-        //if no database is selected -- no
-        if (dbname !== '') {
-            var files = event.originalEvent.dataTransfer.files;
-            if (!files || files.length === 0) {
-                // No files actually transferred
-                $(".pma_drop_handler").fadeOut();
-                event.stopPropagation();
-                event.preventDefault();
-                return;
-            }
-            $(".pma_sql_import_status").slideDown();
-            for (var i = 0; i < files.length; i++) {
-                var ext  = (PMA_DROP_IMPORT._getExtension(files[i].name));
-                var hash = AJAX.hash(++PMA_DROP_IMPORT.uploadCount);
-
-                var $pma_sql_import_status_div = $(".pma_sql_import_status div");
-                $pma_sql_import_status_div.append('<li data-hash="' +hash +'">' +
-                    ((ext !== '') ? '' : '<img src="./themes/dot.gif" title="invalid format" class="icon ic_s_notice"> ') +
-                    escapeHtml(files[i].name) + '<span class="filesize" data-filename="' +
-                    escapeHtml(files[i].name) +'">' +(files[i].size/1024).toFixed(2) +
-                    ' kb</span></li>');
-
-                //scroll the UI to bottom
-                $pma_sql_import_status_div.scrollTop(
-                    $pma_sql_import_status_div.scrollTop() + 50
-                );  //50 hardcoded for now
-
-                if (ext !== '') {
-                    // Increment liveUploadCount by one
-                    $('.pma_import_count').html(++PMA_DROP_IMPORT.liveUploadCount);
-                    $('.pma_sql_import_status h2 .close').fadeOut();
-
-                    $('.pma_sql_import_status div li[data-hash="' +hash +'"]')
-                        .append('<br><progress max="100" value="2"></progress>');
-
-                    //uploading
-                    var fd = new FormData();
-                    fd.append('import_file', files[i]);
-                    fd.append('noplugin', Math.random().toString(36).substring(2, 12));
-                    fd.append('db', dbname);
-                    fd.append('server', server);
-                    fd.append('token', PMA_commonParams.get('token'));
-                    fd.append('import_type', 'database');
-                    // todo: method to find the value below
-                    fd.append('MAX_FILE_SIZE', '4194304');
-                    // todo: method to find the value below
-                    fd.append('charset_of_file','utf-8');
-                    // todo: method to find the value below
-                    fd.append('allow_interrupt', 'yes');
-                    fd.append('skip_queries', '0');
-                    fd.append('format',ext);
-                    fd.append('sql_compatibility','NONE');
-                    fd.append('sql_no_auto_value_on_zero','something');
-                    fd.append('ajax_request','true');
-                    fd.append('hash', hash);
-
-                    // init uploading
-                    PMA_DROP_IMPORT._sendFileToServer(fd, hash);
-                } else if (!PMA_DROP_IMPORT.liveUploadCount) {
-                    $('.pma_sql_import_status h2 .close').fadeIn();
-                }
-            }
-        }
-        $(".pma_drop_handler").fadeOut();
-        event.stopPropagation();
-        event.preventDefault();
-    }
-};
-
-/**
- * Called when some user drags, dragover, leave
- *       a file to the PMA UI
- * @param object Event data
- * @return void
- */
-$(document).on('dragenter', PMA_DROP_IMPORT._dragenter);
-$(document).on('dragover', PMA_DROP_IMPORT._dragover);
-$(document).on('dragleave', '.pma_drop_handler', PMA_DROP_IMPORT._dragleave);
-
-//when file is dropped to PMA UI
-$(document).on('drop', 'body', PMA_DROP_IMPORT._drop);
-
-// minimizing-maximising the sql ajax upload status
-$(document).on('click', '.pma_sql_import_status h2 .minimize', function() {
-    if ($(this).attr('toggle') === 'off') {
-        $('.pma_sql_import_status div').css('height','270px');
-        $(this).attr('toggle','on');
-        $(this).html('-');  // to minimize
-    } else {
-        $('.pma_sql_import_status div').css("height","0px");
-        $(this).attr('toggle','off');
-        $(this).html('+');  // to maximise
-    }
-});
-
-// closing sql ajax upload status
-$(document).on('click', '.pma_sql_import_status h2 .close', function() {
-    $('.pma_sql_import_status').fadeOut(function() {
-        $('.pma_sql_import_status div').html('');
-        PMA_DROP_IMPORT.importStatus = [];  //clear the message array
-    });
-});
-
-// Closing the import result box
-$(document).on('click', '.pma_drop_result h2 .close', function(){
-    $(this).parent('h2').parent('div').remove();
-});
diff --git a/#pma/js/config.js b/#pma/js/config.js
deleted file mode 100644
index 7a0f4bf5..00000000
--- a/#pma/js/config.js
+++ /dev/null
@@ -1,867 +0,0 @@
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Functions used in configuration forms and on user preferences pages
- */
-
-/**
- * checks whether browser supports web storage
- *
- * @param type the type of storage i.e. localStorage or sessionStorage
- *
- * @returns bool
- */
-function isStorageSupported(type)
-{
-    try {
-        window[type].setItem('PMATest', 'test');
-        // Check whether key-value pair was set successfully
-        if (window[type].getItem('PMATest') === 'test') {
-            // Supported, remove test variable from storage
-            window[type].removeItem('PMATest');
-            return true;
-        }
-    } catch(error) {
-        // Not supported
-        PMA_ajaxShowMessage(PMA_messages.strNoLocalStorage, false);
-    }
-    return false;
-}
-
-/**
- * Unbind all event handlers before tearing down a page
- */
-AJAX.registerTeardown('config.js', function () {
-    $('.optbox input[id], .optbox select[id], .optbox textarea[id]').unbind('change').unbind('keyup');
-    $('.optbox input[type=button][name=submit_reset]').unbind('click');
-    $('div.tabs_contents').undelegate();
-    $('#import_local_storage, #export_local_storage').unbind('click');
-    $('form.prefs-form').unbind('change').unbind('submit');
-    $(document).off('click', 'div.click-hide-message');
-    $('#prefs_autoload').find('a').unbind('click');
-});
-
-AJAX.registerOnload('config.js', function () {
-    var $topmenu_upt = $('#topmenu2.user_prefs_tabs');
-    $topmenu_upt.find('li.active a').attr('rel', 'samepage');
-    $topmenu_upt.find('li:not(.active) a').attr('rel', 'newpage');
-});
-
-// default values for fields
-var defaultValues = {};
-
-/**
- * Returns field type
- *
- * @param {Element} field
- */
-function getFieldType(field)
-{
-    var $field = $(field);
-    var tagName = $field.prop('tagName');
-    if (tagName == 'INPUT') {
-        return $field.attr('type');
-    } else if (tagName == 'SELECT') {
-        return 'select';
-    } else if (tagName == 'TEXTAREA') {
-        return 'text';
-    }
-    return '';
-}
-
-/**
- * Enables or disables the "restore default value" button
- *
- * @param {Element} field
- * @param {boolean} display
- */
-function setRestoreDefaultBtn(field, display)
-{
-    var $el = $(field).closest('td').find('.restore-default img');
-    $el[display ? 'show' : 'hide']();
-}
-
-/**
- * Marks field depending on its value (system default or custom)
- *
- * @param {Element} field
- */
-function markField(field)
-{
-    var $field = $(field);
-    var type = getFieldType($field);
-    var isDefault = checkFieldDefault($field, type);
-
-    // checkboxes uses parent <span> for marking
-    var $fieldMarker = (type == 'checkbox') ? $field.parent() : $field;
-    setRestoreDefaultBtn($field, !isDefault);
-    $fieldMarker[isDefault ? 'removeClass' : 'addClass']('custom');
-}
-
-/**
- * Sets field value
- *
- * value must be of type:
- * o undefined (omitted) - restore default value (form default, not PMA default)
- * o String - if field_type is 'text'
- * o boolean - if field_type is 'checkbox'
- * o Array of values - if field_type is 'select'
- *
- * @param {Element} field
- * @param {String}  field_type  see {@link #getFieldType}
- * @param {String|Boolean}  [value]
- */
-function setFieldValue(field, field_type, value)
-{
-    var $field = $(field);
-    switch (field_type) {
-    case 'text':
-    case 'number':
-        $field.val(value !== undefined ? value : $field.attr('defaultValue'));
-        break;
-    case 'checkbox':
-        $field.prop('checked', (value !== undefined ? value : $field.attr('defaultChecked')));
-        break;
-    case 'select':
-        var options = $field.prop('options');
-        var i, imax = options.length;
-        if (value === undefined) {
-            for (i = 0; i < imax; i++) {
-                options[i].selected = options[i].defaultSelected;
-            }
-        } else {
-            for (i = 0; i < imax; i++) {
-                options[i].selected = (value.indexOf(options[i].value) != -1);
-            }
-        }
-        break;
-    }
-    markField($field);
-}
-
-/**
- * Gets field value
- *
- * Will return one of:
- * o String - if type is 'text'
- * o boolean - if type is 'checkbox'
- * o Array of values - if type is 'select'
- *
- * @param {Element} field
- * @param {String}  field_type returned by {@link #getFieldType}
- * @type Boolean|String|String[]
- */
-function getFieldValue(field, field_type)
-{
-    var $field = $(field);
-    switch (field_type) {
-    case 'text':
-    case 'number':
-        return $field.prop('value');
-    case 'checkbox':
-        return $field.prop('checked');
-    case 'select':
-        var options = $field.prop('options');
-        var i, imax = options.length, items = [];
-        for (i = 0; i < imax; i++) {
-            if (options[i].selected) {
-                items.push(options[i].value);
-            }
-        }
-        return items;
-    }
-    return null;
-}
-
-/**
- * Returns values for all fields in fieldsets
- */
-function getAllValues()
-{
-    var $elements = $('fieldset input, fieldset select, fieldset textarea');
-    var values = {};
-    var type, value;
-    for (var i = 0; i < $elements.length; i++) {
-        type = getFieldType($elements[i]);
-        value = getFieldValue($elements[i], type);
-        if (typeof value != 'undefined') {
-            // we only have single selects, fatten array
-            if (type == 'select') {
-                value = value[0];
-            }
-            values[$elements[i].name] = value;
-        }
-    }
-    return values;
-}
-
-/**
- * Checks whether field has its default value
- *
- * @param {Element} field
- * @param {String}  type
- * @return boolean
- */
-function checkFieldDefault(field, type)
-{
-    var $field = $(field);
-    var field_id = $field.attr('id');
-    if (typeof defaultValues[field_id] == 'undefined') {
-        return true;
-    }
-    var isDefault = true;
-    var currentValue = getFieldValue($field, type);
-    if (type != 'select') {
-        isDefault = currentValue == defaultValues[field_id];
-    } else {
-        // compare arrays, will work for our representation of select values
-        if (currentValue.length != defaultValues[field_id].length) {
-            isDefault = false;
-        }
-        else {
-            for (var i = 0; i < currentValue.length; i++) {
-                if (currentValue[i] != defaultValues[field_id][i]) {
-                    isDefault = false;
-                    break;
-                }
-            }
-        }
-    }
-    return isDefault;
-}
-
-/**
- * Returns element's id prefix
- * @param {Element} element
- */
-function getIdPrefix(element)
-{
-    return $(element).attr('id').replace(/[^-]+$/, '');
-}
-
-// ------------------------------------------------------------------
-// Form validation and field operations
-//
-
-// form validator assignments
-var validate = {};
-
-// form validator list
-var validators = {
-    // regexp: numeric value
-    _regexp_numeric: /^[0-9]+$/,
-    // regexp: extract parts from PCRE expression
-    _regexp_pcre_extract: /(.)(.*)\1(.*)?/,
-    /**
-     * Validates positive number
-     *
-     * @param {boolean} isKeyUp
-     */
-    PMA_validatePositiveNumber: function (isKeyUp) {
-        if (isKeyUp && this.value === '') {
-            return true;
-        }
-        var result = this.value != '0' && validators._regexp_numeric.test(this.value);
-        return result ? true : PMA_messages.error_nan_p;
-    },
-    /**
-     * Validates non-negative number
-     *
-     * @param {boolean} isKeyUp
-     */
-    PMA_validateNonNegativeNumber: function (isKeyUp) {
-        if (isKeyUp && this.value === '') {
-            return true;
-        }
-        var result = validators._regexp_numeric.test(this.value);
-        return result ? true : PMA_messages.error_nan_nneg;
-    },
-    /**
-     * Validates port number
-     *
-     * @param {boolean} isKeyUp
-     */
-    PMA_validatePortNumber: function (isKeyUp) {
-        if (this.value === '') {
-            return true;
-        }
-        var result = validators._regexp_numeric.test(this.value) && this.value != '0';
-        return result && this.value <= 65535 ? true : PMA_messages.error_incorrect_port;
-    },
-    /**
-     * Validates value according to given regular expression
-     *
-     * @param {boolean} isKeyUp
-     * @param {string}  regexp
-     */
-    PMA_validateByRegex: function (isKeyUp, regexp) {
-        if (isKeyUp && this.value === '') {
-            return true;
-        }
-        // convert PCRE regexp
-        var parts = regexp.match(validators._regexp_pcre_extract);
-        var valid = this.value.match(new RegExp(parts[2], parts[3])) !== null;
-        return valid ? true : PMA_messages.error_invalid_value;
-    },
-    /**
-     * Validates upper bound for numeric inputs
-     *
-     * @param {boolean} isKeyUp
-     * @param {int} max_value
-     */
-    PMA_validateUpperBound: function (isKeyUp, max_value) {
-        var val = parseInt(this.value, 10);
-        if (isNaN(val)) {
-            return true;
-        }
-        return val <= max_value ? true : PMA_sprintf(PMA_messages.error_value_lte, max_value);
-    },
-    // field validators
-    _field: {
-    },
-    // fieldset validators
-    _fieldset: {
-    }
-};
-
-/**
- * Registers validator for given field
- *
- * @param {String}  id       field id
- * @param {String}  type     validator (key in validators object)
- * @param {boolean} onKeyUp  whether fire on key up
- * @param {Array}   params   validation function parameters
- */
-function validateField(id, type, onKeyUp, params)
-{
-    if (typeof validators[type] == 'undefined') {
-        return;
-    }
-    if (typeof validate[id] == 'undefined') {
-        validate[id] = [];
-    }
-    validate[id].push([type, params, onKeyUp]);
-}
-
-/**
- * Returns validation functions associated with form field
- *
- * @param {String}  field_id     form field id
- * @param {boolean} onKeyUpOnly  see validateField
- * @type Array
- * @return array of [function, parameters to be passed to function]
- */
-function getFieldValidators(field_id, onKeyUpOnly)
-{
-    // look for field bound validator
-    var name = field_id && field_id.match(/[^-]+$/)[0];
-    if (typeof validators._field[name] != 'undefined') {
-        return [[validators._field[name], null]];
-    }
-
-    // look for registered validators
-    var functions = [];
-    if (typeof validate[field_id] != 'undefined') {
-        // validate[field_id]: array of [type, params, onKeyUp]
-        for (var i = 0, imax = validate[field_id].length; i < imax; i++) {
-            if (onKeyUpOnly && !validate[field_id][i][2]) {
-                continue;
-            }
-            functions.push([validators[validate[field_id][i][0]], validate[field_id][i][1]]);
-        }
-    }
-
-    return functions;
-}
-
-/**
- * Displays errors for given form fields
- *
- * WARNING: created DOM elements must be identical with the ones made by
- * display_input() in FormDisplay.tpl.php!
- *
- * @param {Object} error_list list of errors in the form {field id: error array}
- */
-function displayErrors(error_list)
-{
-    var tempIsEmpty = function (item) {
-        return item !== '';
-    };
-
-    for (var field_id in error_list) {
-        var errors = error_list[field_id];
-        var $field = $('#' + field_id);
-        var isFieldset = $field.attr('tagName') == 'FIELDSET';
-        var $errorCnt;
-        if (isFieldset) {
-            $errorCnt = $field.find('dl.errors');
-        } else {
-            $errorCnt = $field.siblings('.inline_errors');
-        }
-
-        // remove empty errors (used to clear error list)
-        errors = $.grep(errors, tempIsEmpty);
-
-        // CSS error class
-        if (!isFieldset) {
-            // checkboxes uses parent <span> for marking
-            var $fieldMarker = ($field.attr('type') == 'checkbox') ? $field.parent() : $field;
-            $fieldMarker[errors.length ? 'addClass' : 'removeClass']('field-error');
-        }
-
-        if (errors.length) {
-            // if error container doesn't exist, create it
-            if ($errorCnt.length === 0) {
-                if (isFieldset) {
-                    $errorCnt = $('<dl class="errors" />');
-                    $field.find('table').before($errorCnt);
-                } else {
-                    $errorCnt = $('<dl class="inline_errors" />');
-                    $field.closest('td').append($errorCnt);
-                }
-            }
-
-            var html = '';
-            for (var i = 0, imax = errors.length; i < imax; i++) {
-                html += '<dd>' + errors[i] + '</dd>';
-            }
-            $errorCnt.html(html);
-        } else if ($errorCnt !== null) {
-            // remove useless error container
-            $errorCnt.remove();
-        }
-    }
-}
-
-/**
- * Validates fieldset and puts errors in 'errors' object
- *
- * @param {Element} fieldset
- * @param {boolean} isKeyUp
- * @param {Object}  errors
- */
-function validate_fieldset(fieldset, isKeyUp, errors)
-{
-    var $fieldset = $(fieldset);
-    if ($fieldset.length && typeof validators._fieldset[$fieldset.attr('id')] != 'undefined') {
-        var fieldset_errors = validators._fieldset[$fieldset.attr('id')].apply($fieldset[0], [isKeyUp]);
-        for (var field_id in fieldset_errors) {
-            if (typeof errors[field_id] == 'undefined') {
-                errors[field_id] = [];
-            }
-            if (typeof fieldset_errors[field_id] == 'string') {
-                fieldset_errors[field_id] = [fieldset_errors[field_id]];
-            }
-            $.merge(errors[field_id], fieldset_errors[field_id]);
-        }
-    }
-}
-
-/**
- * Validates form field and puts errors in 'errors' object
- *
- * @param {Element} field
- * @param {boolean} isKeyUp
- * @param {Object}  errors
- */
-function validate_field(field, isKeyUp, errors)
-{
-    var args, result;
-    var $field = $(field);
-    var field_id = $field.attr('id');
-    errors[field_id] = [];
-    var functions = getFieldValidators(field_id, isKeyUp);
-    for (var i = 0; i < functions.length; i++) {
-        if (typeof functions[i][1] !== 'undefined' && functions[i][1] !== null) {
-            args = functions[i][1].slice(0);
-        } else {
-            args = [];
-        }
-        args.unshift(isKeyUp);
-        result = functions[i][0].apply($field[0], args);
-        if (result !== true) {
-            if (typeof result == 'string') {
-                result = [result];
-            }
-            $.merge(errors[field_id], result);
-        }
-    }
-}
-
-/**
- * Validates form field and parent fieldset
- *
- * @param {Element} field
- * @param {boolean} isKeyUp
- */
-function validate_field_and_fieldset(field, isKeyUp)
-{
-    var $field = $(field);
-    var errors = {};
-    validate_field($field, isKeyUp, errors);
-    validate_fieldset($field.closest('fieldset.optbox'), isKeyUp, errors);
-    displayErrors(errors);
-}
-
-function loadInlineConfig() {
-    if (!Array.isArray(configInlineParams)) {
-        return;
-    }
-    for (var i = 0; i < configInlineParams.length; ++i) {
-        if (typeof configInlineParams[i] === 'function') {
-            configInlineParams[i]();
-        }
-    }
-}
-
-function setupValidation() {
-    validate = {};
-    configScriptLoaded = true;
-    if (configScriptLoaded && typeof configInlineParams !== "undefined") {
-        loadInlineConfig();
-    }
-    // register validators and mark custom values
-    var $elements = $('.optbox input[id], .optbox select[id], .optbox textarea[id]');
-    $elements.each(function () {
-        markField(this);
-        var $el = $(this);
-        $el.bind('change', function () {
-            validate_field_and_fieldset(this, false);
-            markField(this);
-        });
-        var tagName = $el.attr('tagName');
-        // text fields can be validated after each change
-        if (tagName == 'INPUT' && $el.attr('type') == 'text') {
-            $el.keyup(function () {
-                validate_field_and_fieldset($el, true);
-                markField($el);
-            });
-        }
-        // disable textarea spellcheck
-        if (tagName == 'TEXTAREA') {
-            $el.attr('spellcheck', false);
-        }
-    });
-
-    // check whether we've refreshed a page and browser remembered modified
-    // form values
-    var $check_page_refresh = $('#check_page_refresh');
-    if ($check_page_refresh.length === 0 || $check_page_refresh.val() == '1') {
-        // run all field validators
-        var errors = {};
-        for (var i = 0; i < $elements.length; i++) {
-            validate_field($elements[i], false, errors);
-        }
-        // run all fieldset validators
-        $('fieldset.optbox').each(function () {
-            validate_fieldset(this, false, errors);
-        });
-
-        displayErrors(errors);
-    } else if ($check_page_refresh) {
-        $check_page_refresh.val('1');
-    }
-}
-
-AJAX.registerOnload('config.js', function () {
-    setupValidation();
-});
-
-//
-// END: Form validation and field operations
-// ------------------------------------------------------------------
-
-// ------------------------------------------------------------------
-// Tabbed forms
-//
-
-/**
- * Sets active tab
- *
- * @param {String} tab_id
- */
-function setTab(tab_id)
-{
-    $('ul.tabs').each(function() {
-        var $this = $(this);
-        if (!$this.find('li a[href=#' + tab_id + ']').length) {
-            return;
-        }
-        $this.find('li').removeClass('active').find('a[href=#' + tab_id + ']').parent().addClass('active');
-        $this.parent().find('div.tabs_contents fieldset').hide().filter('#' + tab_id).show();
-        var hashValue = 'tab_' + tab_id;
-        location.hash = hashValue;
-        $this.parent().find('input[name=tab_hash]').val(hashValue);
-    });
-}
-
-function setupConfigTabs() {
-    var forms = $('form.config-form');
-    forms.each(function() {
-        var $this = $(this);
-        var $tabs = $this.find('ul.tabs');
-        if (!$tabs.length) {
-            return;
-        }
-        // add tabs events and activate one tab (the first one or indicated by location hash)
-        $tabs.find('li').removeClass('active');
-        $tabs.find('a')
-            .click(function (e) {
-                e.preventDefault();
-                setTab($(this).attr('href').substr(1));
-            })
-            .filter(':first')
-            .parent()
-            .addClass('active');
-        $this.find('div.tabs_contents fieldset').hide().filter(':first').show();
-    });
-}
-
-AJAX.registerOnload('config.js', function () {
-    setupConfigTabs();
-
-    // tab links handling, check each 200ms
-    // (works with history in FF, further browser support here would be an overkill)
-    var prev_hash;
-    var tab_check_fnc = function () {
-        if (location.hash != prev_hash) {
-            prev_hash = location.hash;
-            if (prev_hash.match(/^#tab_[a-zA-Z0-9_]+$/)) {
-                // session ID is sometimes appended here
-                var hash = prev_hash.substr(5).split('&')[0];
-                if ($('#' + hash).length) {
-                    setTab(hash);
-                }
-            }
-        }
-    };
-    tab_check_fnc();
-    setInterval(tab_check_fnc, 200);
-});
-
-//
-// END: Tabbed forms
-// ------------------------------------------------------------------
-
-// ------------------------------------------------------------------
-// Form reset buttons
-//
-
-AJAX.registerOnload('config.js', function () {
-    $('.optbox input[type=button][name=submit_reset]').click(function () {
-        var fields = $(this).closest('fieldset').find('input, select, textarea');
-        for (var i = 0, imax = fields.length; i < imax; i++) {
-            setFieldValue(fields[i], getFieldType(fields[i]));
-        }
-    });
-});
-
-//
-// END: Form reset buttons
-// ------------------------------------------------------------------
-
-// ------------------------------------------------------------------
-// "Restore default" and "set value" buttons
-//
-
-/**
- * Restores field's default value
- *
- * @param {String} field_id
- */
-function restoreField(field_id)
-{
-    var $field = $('#' + field_id);
-    if ($field.length === 0 || defaultValues[field_id] === undefined) {
-        return;
-    }
-    setFieldValue($field, getFieldType($field), defaultValues[field_id]);
-}
-
-function setupRestoreField() {
-    $('div.tabs_contents')
-        .delegate('.restore-default, .set-value', 'mouseenter', function () {
-            $(this).css('opacity', 1);
-        })
-        .delegate('.restore-default, .set-value', 'mouseleave', function () {
-            $(this).css('opacity', 0.25);
-        })
-        .delegate('.restore-default, .set-value', 'click', function (e) {
-            e.preventDefault();
-            var href = $(this).attr('href');
-            var field_sel;
-            if ($(this).hasClass('restore-default')) {
-                field_sel = href;
-                restoreField(field_sel.substr(1));
-            } else {
-                field_sel = href.match(/^[^=]+/)[0];
-                var value = href.match(/\=(.+)$/)[1];
-                setFieldValue($(field_sel), 'text', value);
-            }
-            $(field_sel).trigger('change');
-        })
-        .find('.restore-default, .set-value')
-        // inline-block for IE so opacity inheritance works
-        .css({display: 'inline-block', opacity: 0.25});
-}
-
-AJAX.registerOnload('config.js', function () {
-    setupRestoreField();
-});
-
-//
-// END: "Restore default" and "set value" buttons
-// ------------------------------------------------------------------
-
-// ------------------------------------------------------------------
-// User preferences import/export
-//
-
-AJAX.registerOnload('config.js', function () {
-    offerPrefsAutoimport();
-    var $radios = $('#import_local_storage, #export_local_storage');
-    if (!$radios.length) {
-        return;
-    }
-
-    // enable JavaScript dependent fields
-    $radios
-        .prop('disabled', false)
-        .add('#export_text_file, #import_text_file')
-        .click(function () {
-            var enable_id = $(this).attr('id');
-            var disable_id;
-            if (enable_id.match(/local_storage$/)) {
-                disable_id = enable_id.replace(/local_storage$/, 'text_file');
-            } else {
-                disable_id = enable_id.replace(/text_file$/, 'local_storage');
-            }
-            $('#opts_' + disable_id).addClass('disabled').find('input').prop('disabled', true);
-            $('#opts_' + enable_id).removeClass('disabled').find('input').prop('disabled', false);
-        });
-
-    // detect localStorage state
-    var ls_supported = isStorageSupported('localStorage');
-    var ls_exists = ls_supported ? (window.localStorage.config || false) : false;
-    $('div.localStorage-' + (ls_supported ? 'un' : '') + 'supported').hide();
-    $('div.localStorage-' + (ls_exists ? 'empty' : 'exists')).hide();
-    if (ls_exists) {
-        updatePrefsDate();
-    }
-    $('form.prefs-form').change(function () {
-        var $form = $(this);
-        var disabled = false;
-        if (!ls_supported) {
-            disabled = $form.find('input[type=radio][value$=local_storage]').prop('checked');
-        } else if (!ls_exists && $form.attr('name') == 'prefs_import' &&
-            $('#import_local_storage')[0].checked
-            ) {
-            disabled = true;
-        }
-        $form.find('input[type=submit]').prop('disabled', disabled);
-    }).submit(function (e) {
-        var $form = $(this);
-        if ($form.attr('name') == 'prefs_export' && $('#export_local_storage')[0].checked) {
-            e.preventDefault();
-            // use AJAX to read JSON settings and save them
-            savePrefsToLocalStorage($form);
-        } else if ($form.attr('name') == 'prefs_import' && $('#import_local_storage')[0].checked) {
-            // set 'json' input and submit form
-            $form.find('input[name=json]').val(window.localStorage.config);
-        }
-    });
-
-    $(document).on('click', 'div.click-hide-message', function () {
-        $(this)
-        .hide()
-        .parent('.group')
-        .css('height', '')
-        .next('form')
-        .show();
-    });
-});
-
-/**
- * Saves user preferences to localStorage
- *
- * @param {Element} form
- */
-function savePrefsToLocalStorage(form)
-{
-    $form = $(form);
-    var submit = $form.find('input[type=submit]');
-    submit.prop('disabled', true);
-    $.ajax({
-        url: 'prefs_manage.php',
-        cache: false,
-        type: 'POST',
-        data: {
-            ajax_request: true,
-            server: $form.find('input[name=server]').val(),
-            token: $form.find('input[name=token]').val(),
-            submit_get_json: true
-        },
-        success: function (data) {
-            if (typeof data !== 'undefined' && data.success === true) {
-                window.localStorage.config = data.prefs;
-                window.localStorage.config_mtime = data.mtime;
-                window.localStorage.config_mtime_local = (new Date()).toUTCString();
-                updatePrefsDate();
-                $('div.localStorage-empty').hide();
-                $('div.localStorage-exists').show();
-                var group = $form.parent('.group');
-                group.css('height', group.height() + 'px');
-                $form.hide('fast');
-                $form.prev('.click-hide-message').show('fast');
-            } else {
-                PMA_ajaxShowMessage(data.error);
-            }
-        },
-        complete: function () {
-            submit.prop('disabled', false);
-        }
-    });
-}
-
-/**
- * Updates preferences timestamp in Import form
- */
-function updatePrefsDate()
-{
-    var d = new Date(window.localStorage.config_mtime_local);
-    var msg = PMA_messages.strSavedOn.replace(
-        '@DATE@',
-        PMA_formatDateTime(d)
-    );
-    $('#opts_import_local_storage').find('div.localStorage-exists').html(msg);
-}
-
-/**
- * Prepares message which informs that localStorage preferences are available and can be imported
- */
-function offerPrefsAutoimport()
-{
-    var has_config = (isStorageSupported('localStorage')) && (window.localStorage.config || false);
-    var $cnt = $('#prefs_autoload');
-    if (!$cnt.length || !has_config) {
-        return;
-    }
-    $cnt.find('a').click(function (e) {
-        e.preventDefault();
-        var $a = $(this);
-        if ($a.attr('href') == '#no') {
-            $cnt.remove();
-            $.post('index.php', {
-                token: $cnt.find('input[name=token]').val(),
-                prefs_autoload: 'hide'
-            }, null, 'html');
-            return;
-        }
-        $cnt.find('input[name=json]').val(window.localStorage.config);
-        $cnt.find('form').submit();
-    });
-    $cnt.show();
-}
-
-//
-// END: User preferences import/export
-// ------------------------------------------------------------------
diff --git a/#pma/js/console.js b/#pma/js/console.js
deleted file mode 100644
index 8950086c..00000000
--- a/#pma/js/console.js
+++ /dev/null
@@ -1,1539 +0,0 @@
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Used in or for console
- *
- * @package phpMyAdmin-Console
- */
-
-/**
- * Console object
- */
-var PMA_console = {
-    /**
-     * @var object, jQuery object, selector is '#pma_console>.content'
-     * @access private
-     */
-    $consoleContent: null,
-    /**
-     * @var object, jQuery object, selector is '#pma_console .content',
-     *  used for resizer
-     * @access private
-     */
-    $consoleAllContents: null,
-    /**
-     * @var object, jQuery object, selector is '#pma_console .toolbar'
-     * @access private
-     */
-    $consoleToolbar: null,
-    /**
-     * @var object, jQuery object, selector is '#pma_console .template'
-     * @access private
-     */
-    $consoleTemplates: null,
-    /**
-     * @var object, jQuery object, form for submit
-     * @access private
-     */
-    $requestForm: null,
-    /**
-     * @var object, contain console config
-     * @access private
-     */
-    config: null,
-    /**
-     * @var bool, if console element exist, it'll be true
-     * @access public
-     */
-    isEnabled: false,
-    /**
-     * @var bool, make sure console events bind only once
-     * @access private
-     */
-    isInitialized: false,
-    /**
-     * Used for console initialize, reinit is ok, just some variable assignment
-     *
-     * @return void
-     */
-    initialize: function() {
-
-        if ($('#pma_console').length === 0) {
-            return;
-        }
-
-        PMA_console.isEnabled = true;
-
-        // Cookie var checks and init
-        if (! $.cookie('pma_console_height')) {
-            $.cookie('pma_console_height', 92);
-        }
-        if (! $.cookie('pma_console_mode')) {
-            $.cookie('pma_console_mode', 'info');
-        }
-
-        // Vars init
-        PMA_console.$consoleToolbar = $("#pma_console").find(">.toolbar");
-        PMA_console.$consoleContent = $("#pma_console").find(">.content");
-        PMA_console.$consoleAllContents = $('#pma_console').find('.content');
-        PMA_console.$consoleTemplates = $('#pma_console').find('>.templates');
-
-        // Generate a from for post
-        PMA_console.$requestForm = $('<form method="post" action="import.php">' +
-            '<input name="is_js_confirmed" value="0">' +
-            '<textarea name="sql_query"></textarea>' +
-            '<input name="console_message_id" value="0">' +
-            '<input name="server" value="">' +
-            '<input name="db" value="">' +
-            '<input name="table" value="">' +
-            '<input name="token" value="' +
-            PMA_commonParams.get('token') +
-            '">' +
-            '</form>'
-        );
-        PMA_console.$requestForm.bind('submit', AJAX.requestHandler);
-
-        // Event binds shouldn't run again
-        if (PMA_console.isInitialized === false) {
-
-            // Load config first
-            var tempConfig = JSON.parse($.cookie('pma_console_config'));
-            if (tempConfig) {
-                if (tempConfig.alwaysExpand === true) {
-                    $('#pma_console_options input[name=always_expand]').prop('checked', true);
-                }
-                if (tempConfig.startHistory === true) {
-                    $('#pma_console_options').find('input[name=start_history]').prop('checked', true);
-                }
-                if (tempConfig.currentQuery === true) {
-                    $('#pma_console_options').find('input[name=current_query]').prop('checked', true);
-                }
-                if (ConsoleEnterExecutes === true) {
-                    $('#pma_console_options').find('input[name=enter_executes]').prop('checked', true);
-                }
-                if (tempConfig.darkTheme === true) {
-                    $('#pma_console_options').find('input[name=dark_theme]').prop('checked', true);
-                    $('#pma_console').find('>.content').addClass('console_dark_theme');
-                }
-            } else {
-                $('#pma_console_options').find('input[name=current_query]').prop('checked', true);
-            }
-
-            PMA_console.updateConfig();
-
-            PMA_consoleResizer.initialize();
-            PMA_consoleInput.initialize();
-            PMA_consoleMessages.initialize();
-            PMA_consoleBookmarks.initialize();
-            PMA_consoleDebug.initialize();
-
-            PMA_console.$consoleToolbar.children('.console_switch').click(PMA_console.toggle);
-            $(document).keydown(function(event) {
-                // Ctrl + Alt + C
-                if (event.ctrlKey && event.altKey && event.keyCode === 67) {
-                    PMA_console.toggle();
-                }
-            });
-
-            $('#pma_console').find('.toolbar').children().mousedown(function(event) {
-                event.preventDefault();
-                event.stopImmediatePropagation();
-            });
-
-            $('#pma_console').find('.button.clear').click(function() {
-                PMA_consoleMessages.clear();
-            });
-
-            $('#pma_console').find('.button.history').click(function() {
-                PMA_consoleMessages.showHistory();
-            });
-
-            $('#pma_console').find('.button.options').click(function() {
-                PMA_console.showCard('#pma_console_options');
-            });
-
-            $('#pma_console').find('.button.debug').click(function() {
-                PMA_console.showCard('#debug_console');
-            });
-
-            PMA_console.$consoleContent.click(function(event) {
-                if (event.target == this) {
-                    PMA_consoleInput.focus();
-                }
-            });
-
-            $('#pma_console').find('.mid_layer').click(function() {
-                PMA_console.hideCard($(this).parent().children('.card'));
-            });
-            $('#debug_console').find('.switch_button').click(function() {
-                PMA_console.hideCard($(this).closest('.card'));
-            });
-            $('#pma_bookmarks').find('.switch_button').click(function() {
-                PMA_console.hideCard($(this).closest('.card'));
-            });
-            $('#pma_console_options').find('.switch_button').click(function() {
-                PMA_console.hideCard($(this).closest('.card'));
-            });
-
-            $('#pma_console_options').find('input[type=checkbox]').change(function() {
-                PMA_console.updateConfig();
-            });
-
-            $('#pma_console_options').find('.button.default').click(function() {
-                $('#pma_console_options input[name=always_expand]').prop('checked', false);
-                $('#pma_console_options').find('input[name=start_history]').prop('checked', false);
-                $('#pma_console_options').find('input[name=current_query]').prop('checked', true);
-                $('#pma_console_options').find('input[name=enter_executes]').prop('checked', false);
-                $('#pma_console_options').find('input[name=dark_theme]').prop('checked', false);
-                PMA_console.updateConfig();
-            });
-
-            $('#pma_console_options').find('input[name=enter_executes]').change(function() {
-                PMA_consoleMessages.showInstructions(PMA_console.config.enterExecutes);
-            });
-
-            $(document).ajaxComplete(function (event, xhr, ajaxOptions) {
-                if (ajaxOptions.dataType && ajaxOptions.dataType.indexOf('json') != -1) {
-                    return;
-                }
-                try {
-                    var data = $.parseJSON(xhr.responseText);
-                    PMA_console.ajaxCallback(data);
-                } catch (e) {
-                    console.log("Invalid JSON!" + e.message);
-                    if (AJAX.xhr && AJAX.xhr.status === 0 && AJAX.xhr.statusText !== 'abort') {
-                        PMA_ajaxShowMessage($('<div />',{'class':'error','html':PMA_messages.strRequestFailed+' ( '+escapeHtml(AJAX.xhr.statusText)+' )'}));
-                        AJAX.active = false;
-                        AJAX.xhr = null;
-                    }
-                }
-            });
-
-            PMA_console.isInitialized = true;
-        }
-
-        // Change console mode from cookie
-        switch($.cookie('pma_console_mode')) {
-            case 'collapse':
-                PMA_console.collapse();
-                break;
-            /* jshint -W086 */// no break needed in default section
-            default:
-                $.cookie('pma_console_mode', 'info');
-            case 'info':
-            /* jshint +W086 */
-                PMA_console.info();
-                break;
-            case 'show':
-                PMA_console.show(true);
-                PMA_console.scrollBottom();
-                break;
-        }
-    },
-    /**
-     * Execute query and show results in console
-     *
-     * @return void
-     */
-    execute: function(queryString, options) {
-        if (typeof(queryString) != 'string' || ! /[a-z]|[A-Z]/.test(queryString)) {
-            return;
-        }
-        PMA_console.$requestForm.children('textarea').val(queryString);
-        PMA_console.$requestForm.children('[name=server]').attr('value', PMA_commonParams.get('server'));
-        if (options && options.db) {
-            PMA_console.$requestForm.children('[name=db]').val(options.db);
-            if (options.table) {
-                PMA_console.$requestForm.children('[name=table]').val(options.table);
-            } else {
-                PMA_console.$requestForm.children('[name=table]').val('');
-            }
-        } else {
-            PMA_console.$requestForm.children('[name=db]').val(
-                (PMA_commonParams.get('db').length > 0 ? PMA_commonParams.get('db') : ''));
-        }
-        PMA_console.$requestForm.find('[name=profiling]').remove();
-        if (options && options.profiling === true) {
-            PMA_console.$requestForm.append('<input name="profiling" value="on">');
-        }
-        if (! confirmQuery(PMA_console.$requestForm[0], PMA_console.$requestForm.children('textarea')[0])) {
-            return;
-        }
-        PMA_console.$requestForm.children('[name=console_message_id]')
-            .val(PMA_consoleMessages.appendQuery({sql_query: queryString}).message_id);
-        PMA_console.$requestForm.trigger('submit');
-        PMA_consoleInput.clear();
-        PMA_reloadNavigation();
-    },
-    ajaxCallback: function(data) {
-        if (data && data.console_message_id) {
-            PMA_consoleMessages.updateQuery(data.console_message_id, data.success,
-                (data._reloadQuerywindow ? data._reloadQuerywindow : false));
-        } else if ( data && data._reloadQuerywindow) {
-            if (data._reloadQuerywindow.sql_query.length > 0) {
-                PMA_consoleMessages.appendQuery(data._reloadQuerywindow, 'successed')
-                    .$message.addClass(PMA_console.config.currentQuery ? '' : 'hide');
-            }
-        }
-    },
-    /**
-     * Change console to collapse mode
-     *
-     * @return void
-     */
-    collapse: function() {
-        $.cookie('pma_console_mode', 'collapse');
-        var pmaConsoleHeight = $.cookie('pma_console_height');
-
-        if (pmaConsoleHeight < 32) {
-            $.cookie('pma_console_height', 92);
-        }
-        PMA_console.$consoleToolbar.addClass('collapsed');
-        PMA_console.$consoleAllContents.height(pmaConsoleHeight);
-        PMA_console.$consoleContent.stop();
-        PMA_console.$consoleContent.animate({'margin-bottom': -1 * PMA_console.$consoleContent.outerHeight() + 'px'},
-            'fast', 'easeOutQuart', function() {
-                PMA_console.$consoleContent.css({display:'none'});
-                $(window).trigger('resize');
-            });
-        PMA_console.hideCard();
-    },
-    /**
-     * Show console
-     *
-     * @param bool inputFocus If true, focus the input line after show()
-     * @return void
-     */
-    show: function(inputFocus) {
-        $.cookie('pma_console_mode', 'show');
-
-        var pmaConsoleHeight = $.cookie('pma_console_height');
-
-        if (pmaConsoleHeight < 32) {
-            $.cookie('pma_console_height', 32);
-            PMA_console.collapse();
-            return;
-        }
-        PMA_console.$consoleContent.css({display:'block'});
-        if (PMA_console.$consoleToolbar.hasClass('collapsed')) {
-            PMA_console.$consoleToolbar.removeClass('collapsed');
-        }
-        PMA_console.$consoleAllContents.height(pmaConsoleHeight);
-        PMA_console.$consoleContent.stop();
-        PMA_console.$consoleContent.animate({'margin-bottom': 0},
-            'fast', 'easeOutQuart', function() {
-                $(window).trigger('resize');
-                if (inputFocus) {
-                    PMA_consoleInput.focus();
-                }
-            });
-    },
-    /**
-     * Change console to SQL information mode
-     * this mode shows current SQL query
-     * This mode is the default mode
-     *
-     * @return void
-     */
-    info: function() {
-        // Under construction
-        PMA_console.collapse();
-    },
-    /**
-     * Toggle console mode between collapse/show
-     * Used for toggle buttons and shortcuts
-     *
-     * @return void
-     */
-    toggle: function() {
-        switch($.cookie('pma_console_mode')) {
-            case 'collapse':
-            case 'info':
-                PMA_console.show(true);
-                break;
-            case 'show':
-                PMA_console.collapse();
-                break;
-            default:
-                PMA_consoleInitialize();
-        }
-    },
-    /**
-     * Scroll console to bottom
-     *
-     * @return void
-     */
-    scrollBottom: function() {
-        PMA_console.$consoleContent.scrollTop(PMA_console.$consoleContent.prop("scrollHeight"));
-    },
-    /**
-     * Show card
-     *
-     * @param string cardSelector Selector, select string will be "#pma_console " + cardSelector
-     * this param also can be JQuery object, if you need.
-     *
-     * @return void
-     */
-    showCard: function(cardSelector) {
-        var $card = null;
-        if (typeof(cardSelector) !== 'string') {
-            if (cardSelector.length > 0) {
-                $card = cardSelector;
-            } else {
-                return;
-            }
-        } else {
-            $card = $("#pma_console " + cardSelector);
-        }
-        if ($card.length === 0) {
-            return;
-        }
-        $card.parent().children('.mid_layer').show().fadeTo(0, 0.15);
-        $card.addClass('show');
-        PMA_consoleInput.blur();
-        if ($card.parents('.card').length > 0) {
-            PMA_console.showCard($card.parents('.card'));
-        }
-    },
-    /**
-     * Scroll console to bottom
-     *
-     * @param object $targetCard Target card JQuery object, if it's empty, function will hide all cards
-     * @return void
-     */
-    hideCard: function($targetCard) {
-        if (! $targetCard) {
-            $('#pma_console').find('.mid_layer').fadeOut(140);
-            $('#pma_console').find('.card').removeClass('show');
-        } else if ($targetCard.length > 0) {
-            $targetCard.parent().find('.mid_layer').fadeOut(140);
-            $targetCard.find('.card').removeClass('show');
-            $targetCard.removeClass('show');
-        }
-    },
-    /**
-     * Used for update console config
-     *
-     * @return void
-     */
-    updateConfig: function() {
-        PMA_console.config = {
-            alwaysExpand: $('#pma_console_options input[name=always_expand]').prop('checked'),
-            startHistory: $('#pma_console_options').find('input[name=start_history]').prop('checked'),
-            currentQuery: $('#pma_console_options').find('input[name=current_query]').prop('checked'),
-            enterExecutes: $('#pma_console_options').find('input[name=enter_executes]').prop('checked'),
-            darkTheme: $('#pma_console_options').find('input[name=dark_theme]').prop('checked')
-        };
-        $.cookie('pma_console_config', JSON.stringify(PMA_console.config));
-        /*Setting the dark theme of the console*/
-        if (PMA_console.config.darkTheme) {
-            $('#pma_console').find('>.content').addClass('console_dark_theme');
-        } else {
-            $('#pma_console').find('>.content').removeClass('console_dark_theme');
-        }
-    },
-    isSelect: function (queryString) {
-        var reg_exp = /^SELECT\s+/i;
-        return reg_exp.test(queryString);
-    }
-};
-
-/**
- * Resizer object
- * Careful: this object UI logics highly related with functions under PMA_console
- * Resizing min-height is 32, if small than it, console will collapse
- */
-var PMA_consoleResizer = {
-    _posY: 0,
-    _height: 0,
-    _resultHeight: 0,
-    /**
-     * Mousedown event handler for bind to resizer
-     *
-     * @return void
-     */
-    _mousedown: function(event) {
-        if ($.cookie('pma_console_mode') !== 'show') {
-            return;
-        }
-        PMA_consoleResizer._posY = event.pageY;
-        PMA_consoleResizer._height = PMA_console.$consoleContent.height();
-        $(document).mousemove(PMA_consoleResizer._mousemove);
-        $(document).mouseup(PMA_consoleResizer._mouseup);
-        // Disable text selection while resizing
-        $(document).bind('selectstart', function() { return false; });
-    },
-    /**
-     * Mousemove event handler for bind to resizer
-     *
-     * @return void
-     */
-    _mousemove: function(event) {
-        if (event.pageY < 35) {
-            event.pageY = 35
-        }
-        PMA_consoleResizer._resultHeight = PMA_consoleResizer._height + (PMA_consoleResizer._posY -event.pageY);
-        // Content min-height is 32, if adjusting height small than it we'll move it out of the page
-        if (PMA_consoleResizer._resultHeight <= 32) {
-            PMA_console.$consoleAllContents.height(32);
-            PMA_console.$consoleContent.css('margin-bottom', PMA_consoleResizer._resultHeight - 32);
-        }
-        else {
-            // Logic below makes viewable area always at bottom when adjusting height and content already at bottom
-            if (PMA_console.$consoleContent.scrollTop() + PMA_console.$consoleContent.innerHeight() + 16
-                >= PMA_console.$consoleContent.prop('scrollHeight')) {
-                PMA_console.$consoleAllContents.height(PMA_consoleResizer._resultHeight);
-                PMA_console.scrollBottom();
-            } else {
-                PMA_console.$consoleAllContents.height(PMA_consoleResizer._resultHeight);
-            }
-        }
-    },
-    /**
-     * Mouseup event handler for bind to resizer
-     *
-     * @return void
-     */
-    _mouseup: function() {
-        $.cookie('pma_console_height', PMA_consoleResizer._resultHeight);
-        PMA_console.show();
-        $(document).unbind('mousemove');
-        $(document).unbind('mouseup');
-        $(document).unbind('selectstart');
-    },
-    /**
-     * Used for console resizer initialize
-     *
-     * @return void
-     */
-    initialize: function() {
-        $('#pma_console').find('.toolbar').unbind('mousedown');
-        $('#pma_console').find('.toolbar').mousedown(PMA_consoleResizer._mousedown);
-    }
-};
-
-
-/**
- * Console input object
- */
-var PMA_consoleInput = {
-    /**
-     * @var array, contains Codemirror objects or input jQuery objects
-     * @access private
-     */
-    _inputs: null,
-    /**
-     * @var bool, if codemirror enabled
-     * @access private
-     */
-    _codemirror: false,
-    /**
-     * @var int, count for history navigation, 0 for current input
-     * @access private
-     */
-    _historyCount: 0,
-    /**
-     * @var string, current input when navigating through history
-     * @access private
-     */
-    _historyPreserveCurrent: null,
-    /**
-     * Used for console input initialize
-     *
-     * @return void
-     */
-    initialize: function() {
-        // _cm object can't be reinitialize
-        if (PMA_consoleInput._inputs !== null) {
-            return;
-        }
-        if (typeof CodeMirror !== 'undefined') {
-            PMA_consoleInput._codemirror = true;
-        }
-        PMA_consoleInput._inputs = [];
-        if (PMA_consoleInput._codemirror) {
-            PMA_consoleInput._inputs.console = CodeMirror($('#pma_console').find('.console_query_input')[0], {
-                theme: 'pma',
-                mode: 'text/x-sql',
-                lineWrapping: true,
-                extraKeys: {"Ctrl-Space": "autocomplete"},
-                hintOptions: {"completeSingle": false, "completeOnSingleClick": true},
-                gutters: ["CodeMirror-lint-markers"],
-                lint: {
-                    "getAnnotations": CodeMirror.sqlLint,
-                    "async": true,
-                }
-            });
-            PMA_consoleInput._inputs.console.on("inputRead", codemirrorAutocompleteOnInputRead);
-            PMA_consoleInput._inputs.console.on("keydown", function(instance, event) {
-                PMA_consoleInput._historyNavigate(event);
-            });
-            if ($('#pma_bookmarks').length !== 0) {
-                PMA_consoleInput._inputs.bookmark = CodeMirror($('#pma_console').find('.bookmark_add_input')[0], {
-                    theme: 'pma',
-                    mode: 'text/x-sql',
-                    lineWrapping: true,
-                    extraKeys: {"Ctrl-Space": "autocomplete"},
-                    hintOptions: {"completeSingle": false, "completeOnSingleClick": true},
-                    gutters: ["CodeMirror-lint-markers"],
-                    lint: {
-                        "getAnnotations": CodeMirror.sqlLint,
-                        "async": true,
-                    }
-                });
-                PMA_consoleInput._inputs.bookmark.on("inputRead", codemirrorAutocompleteOnInputRead);
-            }
-        } else {
-            PMA_consoleInput._inputs.console =
-                $('<textarea>').appendTo('#pma_console .console_query_input')
-                    .on('keydown', PMA_consoleInput._historyNavigate);
-            if ($('#pma_bookmarks').length !== 0) {
-                PMA_consoleInput._inputs.bookmark =
-                    $('<textarea>').appendTo('#pma_console .bookmark_add_input');
-            }
-        }
-        $('#pma_console').find('.console_query_input').keydown(PMA_consoleInput._keydown);
-    },
-    _historyNavigate: function(event) {
-        if (event.keyCode == 38 || event.keyCode == 40) {
-            var upPermitted = false;
-            var downPermitted = false;
-            var editor = PMA_consoleInput._inputs.console;
-            var cursorLine;
-            var totalLine;
-            if (PMA_consoleInput._codemirror) {
-                cursorLine = editor.getCursor().line;
-                totalLine = editor.lineCount();
-            } else {
-                // Get cursor position from textarea
-                var text = PMA_consoleInput.getText();
-                cursorLine = text.substr(0, editor.prop("selectionStart")).split("\n").length - 1;
-                totalLine = text.split(/\r*\n/).length;
-            }
-            if (cursorLine === 0) {
-                upPermitted = true;
-            }
-            if (cursorLine == totalLine - 1) {
-                downPermitted = true;
-            }
-            var nextCount;
-            var queryString = false;
-            if (upPermitted && event.keyCode == 38) {
-                // Navigate up in history
-                if (PMA_consoleInput._historyCount === 0) {
-                    PMA_consoleInput._historyPreserveCurrent = PMA_consoleInput.getText();
-                }
-                nextCount = PMA_consoleInput._historyCount + 1;
-                queryString = PMA_consoleMessages.getHistory(nextCount);
-            } else if (downPermitted && event.keyCode == 40) {
-                // Navigate down in history
-                if (PMA_consoleInput._historyCount === 0) {
-                    return;
-                }
-                nextCount = PMA_consoleInput._historyCount - 1;
-                if (nextCount === 0) {
-                    queryString = PMA_consoleInput._historyPreserveCurrent;
-                } else {
-                    queryString = PMA_consoleMessages.getHistory(nextCount);
-                }
-            }
-            if (queryString !== false) {
-                PMA_consoleInput._historyCount = nextCount;
-                PMA_consoleInput.setText(queryString, 'console');
-                if (PMA_consoleInput._codemirror) {
-                    editor.setCursor(editor.lineCount(), 0);
-                }
-                event.preventDefault();
-            }
-        }
-    },
-    /**
-     * Mousedown event handler for bind to input
-     * Shortcut is Ctrl+Enter key or just ENTER, depending on console's
-     * configuration.
-     *
-     * @return void
-     */
-    _keydown: function(event) {
-        if (PMA_console.config.enterExecutes) {
-            // Enter, but not in combination with Shift (which writes a new line).
-            if (!event.shiftKey && event.keyCode === 13) {
-                PMA_consoleInput.execute();
-            }
-        } else {
-            // Ctrl+Enter
-            if (event.ctrlKey && event.keyCode === 13) {
-                PMA_consoleInput.execute();
-            }
-        }
-    },
-    /**
-     * Used for send text to PMA_console.execute()
-     *
-     * @return void
-     */
-    execute: function() {
-        if (PMA_consoleInput._codemirror) {
-            PMA_console.execute(PMA_consoleInput._inputs.console.getValue());
-        } else {
-            PMA_console.execute(PMA_consoleInput._inputs.console.val());
-        }
-    },
-    /**
-     * Used for clear the input
-     *
-     * @param string target, default target is console input
-     * @return void
-     */
-    clear: function(target) {
-        PMA_consoleInput.setText('', target);
-    },
-    /**
-     * Used for set focus to input
-     *
-     * @return void
-     */
-    focus: function() {
-        PMA_consoleInput._inputs.console.focus();
-    },
-    /**
-     * Used for blur input
-     *
-     * @return void
-     */
-    blur: function() {
-        if (PMA_consoleInput._codemirror) {
-            PMA_consoleInput._inputs.console.getInputField().blur();
-        } else {
-            PMA_consoleInput._inputs.console.blur();
-        }
-    },
-    /**
-     * Used for set text in input
-     *
-     * @param string text
-     * @param string target
-     * @return void
-     */
-    setText: function(text, target) {
-        if (PMA_consoleInput._codemirror) {
-            switch(target) {
-                case 'bookmark':
-                    PMA_console.execute(PMA_consoleInput._inputs.bookmark.setValue(text));
-                    break;
-                default:
-                case 'console':
-                    PMA_console.execute(PMA_consoleInput._inputs.console.setValue(text));
-            }
-        } else {
-            switch(target) {
-                case 'bookmark':
-                    PMA_console.execute(PMA_consoleInput._inputs.bookmark.val(text));
-                    break;
-                default:
-                case 'console':
-                    PMA_console.execute(PMA_consoleInput._inputs.console.val(text));
-            }
-        }
-    },
-    getText: function(target) {
-        if (PMA_consoleInput._codemirror) {
-            switch(target) {
-                case 'bookmark':
-                    return PMA_consoleInput._inputs.bookmark.getValue();
-                default:
-                case 'console':
-                    return PMA_consoleInput._inputs.console.getValue();
-            }
-        } else {
-            switch(target) {
-                case 'bookmark':
-                    return PMA_consoleInput._inputs.bookmark.val();
-                default:
-                case 'console':
-                    return PMA_consoleInput._inputs.console.val();
-            }
-        }
-    }
-
-};
-
-
-/**
- * Console messages, and message items management object
- */
-var PMA_consoleMessages = {
-    /**
-     * Used for clear the messages
-     *
-     * @return void
-     */
-    clear: function() {
-        $('#pma_console').find('.content .console_message_container .message:not(.welcome)').addClass('hide');
-        $('#pma_console').find('.content .console_message_container .message.failed').remove();
-        $('#pma_console').find('.content .console_message_container .message.expanded').find('.action.collapse').click();
-    },
-    /**
-     * Used for show history messages
-     *
-     * @return void
-     */
-    showHistory: function() {
-        $('#pma_console').find('.content .console_message_container .message.hide').removeClass('hide');
-    },
-    /**
-     * Used for getting a perticular history query
-     *
-     * @param int nthLast get nth query message from latest, i.e 1st is last
-     * @return string message
-     */
-    getHistory: function(nthLast) {
-        var $queries = $('#pma_console').find('.content .console_message_container .query');
-        var length = $queries.length;
-        var $query = $queries.eq(length - nthLast);
-        if (!$query || (length - nthLast) < 0) {
-            return false;
-        } else {
-            return $query.text();
-        }
-    },
-    /**
-     * Used to show the correct message depending on which key
-     * combination executes the query (Ctrl+Enter or Enter).
-     *
-     * @param bool enterExecutes Only Enter has to be pressed to execute query.
-     * @return void
-     */
-    showInstructions: function(enterExecutes) {
-        enterExecutes = +enterExecutes || 0; // conversion to int
-        var $welcomeMsg = $('#pma_console').find('.content .console_message_container .message.welcome span');
-        $welcomeMsg.children('[id^=instructions]').hide();
-        $welcomeMsg.children('#instructions-' + enterExecutes).show();
-    },
-    /**
-     * Used for log new message
-     *
-     * @param string msgString Message to show
-     * @param string msgType Message type
-     * @return object, {message_id, $message}
-     */
-    append: function(msgString, msgType) {
-        if (typeof(msgString) !== 'string') {
-            return false;
-        }
-        // Generate an ID for each message, we can find them later
-        var msgId = Math.round(Math.random()*(899999999999)+100000000000);
-        var now = new Date();
-        var $newMessage =
-            $('<div class="message ' +
-                (PMA_console.config.alwaysExpand ? 'expanded' : 'collapsed') +
-                '" msgid="' + msgId + '"><div class="action_content"></div></div>');
-        switch(msgType) {
-            case 'query':
-                $newMessage.append('<div class="query highlighted"></div>');
-                if (PMA_consoleInput._codemirror) {
-                    CodeMirror.runMode(msgString,
-                        'text/x-sql', $newMessage.children('.query')[0]);
-                } else {
-                    $newMessage.children('.query').text(msgString);
-                }
-                $newMessage.children('.action_content')
-                    .append(PMA_console.$consoleTemplates.children('.query_actions').html());
-                break;
-            default:
-            case 'normal':
-                $newMessage.append('<div>' + msgString + '</div>');
-        }
-        PMA_consoleMessages._msgEventBinds($newMessage);
-        $newMessage.find('span.text.query_time span')
-            .text(now.getHours() + ':' + now.getMinutes() + ':' + now.getSeconds())
-            .parent().attr('title', now);
-        return {message_id: msgId,
-                $message: $newMessage.appendTo('#pma_console .content .console_message_container')};
-    },
-    /**
-     * Used for log new query
-     *
-     * @param string queryData Struct should be
-     * {sql_query: "Query string", db: "Target DB", table: "Target Table"}
-     * @param string state Message state
-     * @return object, {message_id: string message id, $message: JQuery object}
-     */
-    appendQuery: function(queryData, state) {
-        var targetMessage = PMA_consoleMessages.append(queryData.sql_query, 'query');
-        if (! targetMessage) {
-            return false;
-        }
-        if (queryData.db && queryData.table) {
-            targetMessage.$message.attr('targetdb', queryData.db);
-            targetMessage.$message.attr('targettable', queryData.table);
-            targetMessage.$message.find('.text.targetdb span').text(queryData.db);
-        }
-        if (PMA_console.isSelect(queryData.sql_query)) {
-            targetMessage.$message.addClass('select');
-        }
-        switch(state) {
-            case 'failed':
-                targetMessage.$message.addClass('failed');
-                break;
-            case 'successed':
-                targetMessage.$message.addClass('successed');
-                break;
-            default:
-            case 'pending':
-                targetMessage.$message.addClass('pending');
-        }
-        return targetMessage;
-    },
-    _msgEventBinds: function($targetMessage) {
-        // Leave unbinded elements, remove binded.
-        $targetMessage = $targetMessage.filter(':not(.binded)');
-        if ($targetMessage.length === 0) {
-            return;
-        }
-        $targetMessage.addClass('binded');
-
-        $targetMessage.find('.action.expand').click(function () {
-            $(this).closest('.message').removeClass('collapsed');
-            $(this).closest('.message').addClass('expanded');
-        });
-        $targetMessage.find('.action.collapse').click(function () {
-            $(this).closest('.message').addClass('collapsed');
-            $(this).closest('.message').removeClass('expanded');
-        });
-        $targetMessage.find('.action.edit').click(function () {
-            PMA_consoleInput.setText($(this).parent().siblings('.query').text());
-            PMA_consoleInput.focus();
-        });
-        $targetMessage.find('.action.requery').click(function () {
-            var query = $(this).parent().siblings('.query').text();
-            var $message = $(this).closest('.message');
-            if (confirm(PMA_messages.strConsoleRequeryConfirm + '\n' +
-                (query.length<100 ? query : query.slice(0, 100) + '...'))
-            ) {
-                PMA_console.execute(query, {db: $message.attr('targetdb'), table: $message.attr('targettable')});
-            }
-        });
-        $targetMessage.find('.action.bookmark').click(function () {
-            var query = $(this).parent().siblings('.query').text();
-            var $message = $(this).closest('.message');
-            PMA_consoleBookmarks.addBookmark(query, $message.attr('targetdb'));
-            PMA_console.showCard('#pma_bookmarks .card.add');
-        });
-        $targetMessage.find('.action.edit_bookmark').click(function () {
-            var query = $(this).parent().siblings('.query').text();
-            var $message = $(this).closest('.message');
-            var isShared = $message.find('span.bookmark_label').hasClass('shared');
-            var label = $message.find('span.bookmark_label').text();
-            PMA_consoleBookmarks.addBookmark(query, $message.attr('targetdb'), label, isShared);
-            PMA_console.showCard('#pma_bookmarks .card.add');
-        });
-        $targetMessage.find('.action.delete_bookmark').click(function () {
-            var $message = $(this).closest('.message');
-            if (confirm(PMA_messages.strConsoleDeleteBookmarkConfirm + '\n' + $message.find('.bookmark_label').text())) {
-                $.post('import.php',
-                    {token: PMA_commonParams.get('token'),
-                    server: PMA_commonParams.get('server'),
-                    action_bookmark: 2,
-                    ajax_request: true,
-                    id_bookmark: $message.attr('bookmarkid')},
-                    function () {
-                        PMA_consoleBookmarks.refresh();
-                    });
-            }
-        });
-        $targetMessage.find('.action.profiling').click(function () {
-            var $message = $(this).closest('.message');
-            PMA_console.execute($(this).parent().siblings('.query').text(),
-                {db: $message.attr('targetdb'),
-                table: $message.attr('targettable'),
-                profiling: true});
-        });
-        $targetMessage.find('.action.explain').click(function () {
-            var $message = $(this).closest('.message');
-            PMA_console.execute('EXPLAIN ' + $(this).parent().siblings('.query').text(),
-                {db: $message.attr('targetdb'),
-                table: $message.attr('targettable')});
-        });
-        $targetMessage.find('.action.dbg_show_trace').click(function () {
-            var $message = $(this).closest('.message');
-            if (!$message.find('.trace').length) {
-                PMA_consoleDebug.getQueryDetails(
-                    $message.data('queryInfo'),
-                    $message.data('totalTime'),
-                    $message
-                );
-                PMA_consoleMessages._msgEventBinds($message.find('.message:not(.binded)'));
-            }
-            $message.addClass('show_trace');
-            $message.removeClass('hide_trace');
-        });
-        $targetMessage.find('.action.dbg_hide_trace').click(function () {
-            var $message = $(this).closest('.message');
-            $message.addClass('hide_trace');
-            $message.removeClass('show_trace');
-        });
-        $targetMessage.find('.action.dbg_show_args').click(function () {
-            var $message = $(this).closest('.message');
-            $message.addClass('show_args expanded');
-            $message.removeClass('hide_args collapsed');
-        });
-        $targetMessage.find('.action.dbg_hide_args').click(function () {
-            var $message = $(this).closest('.message');
-            $message.addClass('hide_args collapsed');
-            $message.removeClass('show_args expanded');
-        });
-        if (PMA_consoleInput._codemirror) {
-            $targetMessage.find('.query:not(.highlighted)').each(function(index, elem) {
-                    CodeMirror.runMode($(elem).text(),
-                        'text/x-sql', elem);
-                    $(this).addClass('highlighted');
-                });
-        }
-    },
-    msgAppend: function(msgId, msgString, msgType) {
-        var $targetMessage = $('#pma_console').find('.content .console_message_container .message[msgid=' + msgId +']');
-        if ($targetMessage.length === 0 || isNaN(parseInt(msgId)) || typeof(msgString) !== 'string') {
-            return false;
-        }
-        $targetMessage.append('<div>' + msgString + '</div>');
-    },
-    updateQuery: function(msgId, isSuccessed, queryData) {
-        var $targetMessage = $('#pma_console').find('.console_message_container .message[msgid=' + parseInt(msgId) +']');
-        if ($targetMessage.length === 0 || isNaN(parseInt(msgId))) {
-            return false;
-        }
-        $targetMessage.removeClass('pending failed successed');
-        if (isSuccessed) {
-            $targetMessage.addClass('successed');
-            if (queryData) {
-                $targetMessage.children('.query').text('');
-                $targetMessage.removeClass('select');
-                if (PMA_console.isSelect(queryData.sql_query)) {
-                    $targetMessage.addClass('select');
-                }
-                if (PMA_consoleInput._codemirror) {
-                    CodeMirror.runMode(queryData.sql_query, 'text/x-sql', $targetMessage.children('.query')[0]);
-                } else {
-                    $targetMessage.children('.query').text(queryData.sql_query);
-                }
-                $targetMessage.attr('targetdb', queryData.db);
-                $targetMessage.attr('targettable', queryData.table);
-                $targetMessage.find('.text.targetdb span').text(queryData.db);
-            }
-        } else {
-            $targetMessage.addClass('failed');
-        }
-    },
-    /**
-     * Used for console messages initialize
-     *
-     * @return void
-     */
-    initialize: function() {
-        PMA_consoleMessages._msgEventBinds($('#pma_console').find('.message:not(.binded)'));
-        if (PMA_console.config.startHistory) {
-            PMA_consoleMessages.showHistory();
-        }
-        PMA_consoleMessages.showInstructions(PMA_console.config.enterExecutes);
-    }
-};
-
-
-/**
- * Console bookmarks card, and bookmarks items management object
- */
-var PMA_consoleBookmarks = {
-    _bookmarks: [],
-    addBookmark: function (queryString, targetDb, label, isShared, id) {
-        $('#pma_bookmarks').find('.add [name=shared]').prop('checked', false);
-        $('#pma_bookmarks').find('.add [name=label]').val('');
-        $('#pma_bookmarks').find('.add [name=targetdb]').val('');
-        $('#pma_bookmarks').find('.add [name=id_bookmark]').val('');
-        PMA_consoleInput.setText('', 'bookmark');
-
-        switch(arguments.length) {
-            case 4:
-                $('#pma_bookmarks').find('.add [name=shared]').prop('checked', isShared);
-            case 3:
-                $('#pma_bookmarks').find('.add [name=label]').val(label);
-            case 2:
-                $('#pma_bookmarks').find('.add [name=targetdb]').val(targetDb);
-            case 1:
-                PMA_consoleInput.setText(queryString, 'bookmark');
-            default:
-                break;
-        }
-    },
-    refresh: function () {
-        $.get('import.php',
-            {ajax_request: true,
-            token: PMA_commonParams.get('token'),
-            server: PMA_commonParams.get('server'),
-            console_bookmark_refresh: 'refresh'},
-            function(data) {
-                if (data.console_message_bookmark) {
-                    $('#pma_bookmarks').find('.content.bookmark').html(data.console_message_bookmark);
-                    PMA_consoleMessages._msgEventBinds($('#pma_bookmarks').find('.message:not(.binded)'));
-                }
-            });
-    },
-    /**
-     * Used for console bookmarks initialize
-     * message events are already binded by PMA_consoleMsg._msgEventBinds
-     *
-     * @return void
-     */
-    initialize: function() {
-        if ($('#pma_bookmarks').length === 0) {
-            return;
-        }
-        $('#pma_console').find('.button.bookmarks').click(function() {
-            PMA_console.showCard('#pma_bookmarks');
-        });
-        $('#pma_bookmarks').find('.button.add').click(function() {
-            PMA_console.showCard('#pma_bookmarks .card.add');
-        });
-        $('#pma_bookmarks').find('.card.add [name=submit]').click(function () {
-            if ($('#pma_bookmarks').find('.card.add [name=label]').val().length === 0
-                || PMA_consoleInput.getText('bookmark').length === 0)
-            {
-                alert(PMA_messages.strFormEmpty);
-                return;
-            }
-            $(this).prop('disabled', true);
-            $.post('import.php',
-                {token: PMA_commonParams.get('token'),
-                ajax_request: true,
-                console_bookmark_add: 'true',
-                label: $('#pma_bookmarks').find('.card.add [name=label]').val(),
-                server: PMA_commonParams.get('server'),
-                db: $('#pma_bookmarks').find('.card.add [name=targetdb]').val(),
-                bookmark_query: PMA_consoleInput.getText('bookmark'),
-                shared: $('#pma_bookmarks').find('.card.add [name=shared]').prop('checked')},
-                function () {
-                    PMA_consoleBookmarks.refresh();
-                    $('#pma_bookmarks').find('.card.add [name=submit]').prop('disabled', false);
-                    PMA_console.hideCard($('#pma_bookmarks').find('.card.add'));
-                });
-        });
-        $('#pma_console').find('.button.refresh').click(function() {
-            PMA_consoleBookmarks.refresh();
-        });
-    }
-};
-
-var PMA_consoleDebug;
-PMA_consoleDebug = {
-    _config: {
-        groupQueries: false,
-        orderBy: 'exec', // Possible 'exec' => Execution order, 'time' => Time taken, 'count'
-        order: 'asc' // Possible 'asc', 'desc'
-    },
-    _lastDebugInfo: {
-        debugInfo: null,
-        url: null
-    },
-    initialize: function () {
-        // Try to get debug info after every AJAX request
-        $(document).ajaxSuccess(function (event, xhr, settings, data) {
-            if (data._debug) {
-                PMA_consoleDebug.showLog(data._debug, settings.url);
-            }
-        });
-
-        // Initialize config
-        this._initConfig();
-
-        if (this.configParam('groupQueries')) {
-            $('#debug_console').addClass('grouped');
-        } else {
-            $('#debug_console').addClass('ungrouped');
-            if (PMA_consoleDebug.configParam('orderBy') == 'count') {
-                $('#debug_console').find('.button.order_by.sort_exec').addClass('active');
-            }
-        }
-        var orderBy = this.configParam('orderBy');
-        var order = this.configParam('order');
-        $('#debug_console').find('.button.order_by.sort_' + orderBy).addClass('active');
-        $('#debug_console').find('.button.order.order_' + order).addClass('active');
-
-        // Initialize actions in toolbar
-        $('#debug_console').find('.button.group_queries').click(function () {
-            $('#debug_console').addClass('grouped');
-            $('#debug_console').removeClass('ungrouped');
-            PMA_consoleDebug.configParam('groupQueries', true);
-            PMA_consoleDebug.refresh();
-            if (PMA_consoleDebug.configParam('orderBy') == 'count') {
-                $('#debug_console').find('.button.order_by.sort_exec').removeClass('active');
-            }
-        });
-        $('#debug_console').find('.button.ungroup_queries').click(function () {
-            $('#debug_console').addClass('ungrouped');
-            $('#debug_console').removeClass('grouped');
-            PMA_consoleDebug.configParam('groupQueries', false);
-            PMA_consoleDebug.refresh();
-            if (PMA_consoleDebug.configParam('orderBy') == 'count') {
-                $('#debug_console').find('.button.order_by.sort_exec').addClass('active');
-            }
-        });
-        $('#debug_console').find('.button.order_by').click(function () {
-            var $this = $(this);
-            $('#debug_console').find('.button.order_by').removeClass('active');
-            $this.addClass('active');
-            if ($this.hasClass('sort_time')) {
-                PMA_consoleDebug.configParam('orderBy', 'time');
-            } else if ($this.hasClass('sort_exec')) {
-                PMA_consoleDebug.configParam('orderBy', 'exec');
-            } else if ($this.hasClass('sort_count')) {
-                PMA_consoleDebug.configParam('orderBy', 'count');
-            }
-            PMA_consoleDebug.refresh();
-        });
-        $('#debug_console').find('.button.order').click(function () {
-            var $this = $(this);
-            $('#debug_console').find('.button.order').removeClass('active');
-            $this.addClass('active');
-            if ($this.hasClass('order_asc')) {
-                PMA_consoleDebug.configParam('order', 'asc');
-            } else if ($this.hasClass('order_desc')) {
-                PMA_consoleDebug.configParam('order', 'desc');
-            }
-            PMA_consoleDebug.refresh();
-        });
-
-        // Show SQL debug info for first page load
-        if (typeof debugSQLInfo !== 'undefined' && debugSQLInfo !== 'null') {
-            $('#pma_console').find('.button.debug').removeClass('hide');
-        }
-        else {
-            return;
-        }
-        PMA_consoleDebug.showLog(debugSQLInfo);
-    },
-    _initConfig: function () {
-        var config = JSON.parse($.cookie('pma_console_dbg_config'));
-        if (config) {
-            for (var name in config) {
-                if (config.hasOwnProperty(name)) {
-                    this._config[name] = config[name];
-                }
-            }
-        }
-    },
-    configParam: function (name, value) {
-        if (typeof value === 'undefined') {
-            return this._config[name];
-        }
-        this._config[name] = value;
-        $.cookie('pma_console_dbg_config', JSON.stringify(this._config));
-        return value;
-    },
-    _formatFunctionCall: function (dbgStep) {
-        var functionName = '';
-        if ('class' in dbgStep) {
-            functionName += dbgStep.class;
-            functionName += dbgStep.type;
-        }
-        functionName += dbgStep.function;
-        if (dbgStep.args && dbgStep.args.length) {
-            functionName += '(...)';
-        } else {
-            functionName += '()';
-        }
-        return functionName;
-    },
-    _formatFunctionArgs: function (dbgStep) {
-        var $args = $('<div>');
-        if (dbgStep.args.length) {
-            $args.append('<div class="message welcome">')
-                .append(
-                $('<div class="message welcome">')
-                    .text(
-                    PMA_sprintf(
-                        PMA_messages.strConsoleDebugArgsSummary,
-                        dbgStep.args.length
-                    )
-                )
-            );
-            for (var i = 0; i < dbgStep.args.length; i++) {
-                $args.append(
-                    $('<div class="message">')
-                        .html(
-                        '<pre>' +
-                        escapeHtml(JSON.stringify(dbgStep.args[i], null, "  ")) +
-                        '</pre>'
-                    )
-                );
-            }
-        }
-        return $args;
-    },
-    _formatFileName: function (dbgStep) {
-        var fileName = '';
-        if ('file' in dbgStep) {
-            fileName += dbgStep.file;
-            fileName += '#' + dbgStep.line;
-        }
-        return fileName;
-    },
-    _formatBackTrace: function (dbgTrace) {
-        var $traceElem = $('<div class="trace">');
-        $traceElem.append(
-            $('<div class="message welcome">')
-        );
-        var step, $stepElem;
-        for (var stepId in dbgTrace) {
-            if (dbgTrace.hasOwnProperty(stepId)) {
-                step = dbgTrace[stepId];
-                if (!Array.isArray(step) && typeof step !== 'object') {
-                    $stepElem =
-                        $('<div class="message traceStep collapsed hide_args">')
-                            .append(
-                            $('<span>').text(step)
-                        );
-                } else {
-                    if (typeof step.args === 'string' && step.args) {
-                        step.args = [step.args];
-                    }
-                    $stepElem =
-                        $('<div class="message traceStep collapsed hide_args">')
-                            .append(
-                            $('<span class="function">').text(this._formatFunctionCall(step))
-                        )
-                            .append(
-                            $('<span class="file">').text(this._formatFileName(step))
-                        );
-                    if (step.args && step.args.length) {
-                        $stepElem
-                            .append(
-                            $('<span class="args">').html(this._formatFunctionArgs(step))
-                        )
-                            .prepend(
-                            $('<div class="action_content">')
-                                .append(
-                                '<span class="action dbg_show_args">' +
-                                PMA_messages.strConsoleDebugShowArgs +
-                                '</span> '
-                            )
-                                .append(
-                                '<span class="action dbg_hide_args">' +
-                                PMA_messages.strConsoleDebugHideArgs +
-                                '</span> '
-                            )
-                        );
-                    }
-                }
-                $traceElem.append($stepElem);
-            }
-        }
-        return $traceElem;
-    },
-    _formatQueryOrGroup: function (queryInfo, totalTime) {
-        var grouped, queryText, queryTime, count, i;
-        if (Array.isArray(queryInfo)) {
-            // It is grouped
-            grouped = true;
-
-            queryText = queryInfo[0].query;
-
-            queryTime = 0;
-            for (i in queryInfo) {
-                queryTime += queryInfo[i].time;
-            }
-
-            count = queryInfo.length;
-        } else {
-            queryText = queryInfo.query;
-            queryTime = queryInfo.time;
-        }
-
-        var $query = $('<div class="message collapsed hide_trace">')
-            .append(
-            $('#debug_console').find('.templates .debug_query').clone()
-        )
-            .append(
-            $('<div class="query">')
-                .text(queryText)
-        )
-            .data('queryInfo', queryInfo)
-            .data('totalTime', totalTime);
-        if (grouped) {
-            $query.find('.text.count').removeClass('hide');
-            $query.find('.text.count span').text(count);
-        }
-        $query.find('.text.time span').text(queryTime + 's (' + ((queryTime * 100) / totalTime).toFixed(3) + '%)');
-
-        return $query;
-    },
-    _appendQueryExtraInfo: function (query, $elem) {
-        if ('error' in query) {
-            $elem.append(
-                $('<div>').html(query.error)
-            );
-        }
-        $elem.append(this._formatBackTrace(query.trace));
-    },
-    getQueryDetails: function (queryInfo, totalTime, $query) {
-        if (Array.isArray(queryInfo)) {
-            var $singleQuery;
-            for (var i in queryInfo) {
-                $singleQuery = $('<div class="message welcome trace">')
-                    .text((parseInt(i) + 1) + '.')
-                    .append(
-                    $('<span class="time">').text(
-                        PMA_messages.strConsoleDebugTimeTaken +
-                        ' ' + queryInfo[i].time + 's' +
-                        ' (' + ((queryInfo[i].time * 100) / totalTime).toFixed(3) + '%)'
-                    )
-                );
-                this._appendQueryExtraInfo(queryInfo[i], $singleQuery);
-                $query
-                    .append('<div class="message welcome trace">')
-                    .append($singleQuery);
-            }
-        } else {
-            this._appendQueryExtraInfo(queryInfo, $query);
-        }
-    },
-    showLog: function (debugInfo, url) {
-        this._lastDebugInfo.debugInfo = debugInfo;
-        this._lastDebugInfo.url = url;
-
-        $('#debug_console').find('.debugLog').empty();
-        $("#debug_console").find(".debug>.welcome").empty();
-
-        var debugJson = false, i;
-        if (typeof debugInfo === "object" && 'queries' in debugInfo) {
-            // Copy it to debugJson, so that it doesn't get changed
-            if (!('queries' in debugInfo)) {
-                debugJson = false;
-            } else {
-                debugJson = {queries: []};
-                for (i in debugInfo.queries) {
-                    debugJson.queries[i] = debugInfo.queries[i];
-                }
-            }
-        } else if (typeof debugInfo === "string") {
-            try {
-                debugJson = JSON.parse(debugInfo);
-            } catch (e) {
-                debugJson = false;
-            }
-            if (debugJson && !('queries' in debugJson)) {
-                debugJson = false;
-            }
-        }
-        if (debugJson === false) {
-            $("#debug_console").find(".debug>.welcome").text(
-                PMA_messages.strConsoleDebugError
-            );
-            return;
-        }
-        var allQueries = debugJson.queries;
-        var uniqueQueries = {};
-
-        var totalExec = allQueries.length;
-
-        // Calculate total time and make unique query array
-        var totalTime = 0;
-        for (i = 0; i < totalExec; ++i) {
-            totalTime += allQueries[i].time;
-            if (!(allQueries[i].hash in uniqueQueries)) {
-                uniqueQueries[allQueries[i].hash] = [];
-            }
-            uniqueQueries[allQueries[i].hash].push(allQueries[i]);
-        }
-        // Count total unique queries, convert uniqueQueries to Array
-        var totalUnique = 0, uniqueArray = [];
-        for (var hash in uniqueQueries) {
-            if (uniqueQueries.hasOwnProperty(hash)) {
-                ++totalUnique;
-                uniqueArray.push(uniqueQueries[hash]);
-            }
-        }
-        uniqueQueries = uniqueArray;
-        // Show summary
-        $("#debug_console").find(".debug>.welcome").append(
-            $('<span class="debug_summary">').text(
-                PMA_sprintf(
-                    PMA_messages.strConsoleDebugSummary,
-                    totalUnique,
-                    totalExec,
-                    totalTime
-                )
-            )
-        );
-        if (url) {
-            $("#debug_console").find(".debug>.welcome").append(
-                $('<span class="script_name">').text(url.split('?')[0])
-            );
-        }
-
-        // For sorting queries
-        function sortByTime(a, b) {
-            var order = ((PMA_consoleDebug.configParam('order') == 'asc') ? 1 : -1);
-            if (Array.isArray(a) && Array.isArray(b)) {
-                // It is grouped
-                var timeA = 0, timeB = 0, i;
-                for (i in a) {
-                    timeA += a[i].time;
-                }
-                for (i in b) {
-                    timeB += b[i].time;
-                }
-                return (timeA - timeB) * order;
-            } else {
-                return (a.time - b.time) * order;
-            }
-        }
-
-        function sortByCount(a, b) {
-            var order = ((PMA_consoleDebug.configParam('order') == 'asc') ? 1 : -1);
-            return (a.length - b.length) * order;
-        }
-
-        var orderBy = this.configParam('orderBy');
-        var order = PMA_consoleDebug.configParam('order');
-
-        if (this.configParam('groupQueries')) {
-            // Sort queries
-            if (orderBy == 'time') {
-                uniqueQueries.sort(sortByTime);
-            } else if (orderBy == 'count') {
-                uniqueQueries.sort(sortByCount);
-            } else if (orderBy == 'exec' && order == 'desc') {
-                uniqueQueries.reverse();
-            }
-            for (i in uniqueQueries) {
-                if (orderBy == 'time') {
-                    uniqueQueries[i].sort(sortByTime);
-                } else if (orderBy == 'exec' && order == 'desc') {
-                    uniqueQueries[i].reverse();
-                }
-                $('#debug_console').find('.debugLog').append(this._formatQueryOrGroup(uniqueQueries[i], totalTime));
-            }
-        } else {
-            if (orderBy == 'time') {
-                allQueries.sort(sortByTime);
-            } else if (order == 'desc') {
-                allQueries.reverse();
-            }
-            for (i = 0; i < totalExec; ++i) {
-                $('#debug_console').find('.debugLog').append(this._formatQueryOrGroup(allQueries[i], totalTime));
-            }
-        }
-
-        PMA_consoleMessages._msgEventBinds($('#debug_console').find('.message:not(.binded)'));
-    },
-    refresh: function () {
-        var last = this._lastDebugInfo;
-        PMA_consoleDebug.showLog(last.debugInfo, last.url);
-    }
-};
-
-/**s
- * Executed on page load
- */
-$(function () {
-    PMA_console.initialize();
-});
diff --git a/#pma/js/cross_framing_protection.js b/#pma/js/cross_framing_protection.js
deleted file mode 100644
index 91e9aa9e..00000000
--- a/#pma/js/cross_framing_protection.js
+++ /dev/null
@@ -1,14 +0,0 @@
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Conditionally included if framing is not allowed
- */
-if (self == top) {
-    var style_element = document.getElementById("cfs-style");
-    // check if style_element has already been removed
-    // to avoid frequently reported js error
-    if (typeof(style_element) != 'undefined' && style_element != null) {
-        style_element.parentNode.removeChild(style_element);
-    }
-} else {
-    top.location = self.location;
-}
diff --git a/#pma/js/db_central_columns.js b/#pma/js/db_central_columns.js
deleted file mode 100644
index 258eb0c8..00000000
--- a/#pma/js/db_central_columns.js
+++ /dev/null
@@ -1,239 +0,0 @@
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * @fileoverview   events handling from central columns page
- * @name            Central columns
- *
- * @requires    jQuery
- */
-
-/**
- * AJAX scripts for db_central_columns.php
- *
- * Actions ajaxified here:
- * Inline Edit and save of a result row
- * Delete a row
- * Multiple edit and delete option
- *
- */
-
-AJAX.registerTeardown('db_central_columns.js', function () {
-    $(".edit").unbind('click');
-    $(".edit_save_form").unbind('click');
-    $('.edit_cancel_form').unbind('click');
-    $(".del_row").unbind('click');
-    $(document).off("keyup", ".filter_rows");
-    $('.edit_cancel_form').unbind('click');
-    $('#table-select').unbind('change');
-    $('#column-select').unbind('change');
-    $("#add_col_div").find(">a").unbind('click');
-    $('#add_new').unbind('submit');
-    $('#multi_edit_central_columns').unbind('submit');
-    $("select.default_type").unbind('change');
-    $("button[name='delete_central_columns']").unbind('click');
-    $("button[name='edit_central_columns']").unbind('click');
-});
-
-AJAX.registerOnload('db_central_columns.js', function () {
-    $('#tableslistcontainer input,#tableslistcontainer select,#tableslistcontainer .default_value,#tableslistcontainer .open_enum_editor').hide();
-    $('#tableslistcontainer').find('.checkall').show();
-    $('#tableslistcontainer').find('.checkall_box').show();
-    if ($('#table_columns').find('tbody tr').length > 0) {
-        $("#table_columns").tablesorter({
-            headers: {
-                0: {sorter: false},
-                1: {sorter: false}, // hidden column
-                4: {sorter: "integer"}
-            }
-        });
-    }
-    $('#tableslistcontainer').find('button[name="delete_central_columns"]').click(function(event){
-        event.preventDefault();
-        var multi_delete_columns = $('.checkall:checkbox:checked').serialize();
-        if(multi_delete_columns === ''){
-            PMA_ajaxShowMessage(PMA_messages.strRadioUnchecked);
-            return false;
-        }
-        PMA_ajaxShowMessage();
-        $("#del_col_name").val(multi_delete_columns);
-        $("#del_form").submit();
-    });
-    $('#tableslistcontainer').find('button[name="edit_central_columns"]').click(function(event){
-        event.preventDefault();
-        var editColumnList = $('.checkall:checkbox:checked').serialize();
-        if(editColumnList === ''){
-            PMA_ajaxShowMessage(PMA_messages.strRadioUnchecked);
-            return false;
-        }
-        var editColumnData = editColumnList+ '&edit_central_columns_page=true&ajax_request=true&ajax_page_request=true&token='+PMA_commonParams.get('token')+'&db='+PMA_commonParams.get('db');
-        PMA_ajaxShowMessage();
-        AJAX.source = $(this);
-        $.get('db_central_columns.php', editColumnData, AJAX.responseHandler);
-    });
-    $('#multi_edit_central_columns').submit(function(event){
-        event.preventDefault();
-        event.stopPropagation();
-        var multi_column_edit_data = $("#multi_edit_central_columns").serialize()+'&multi_edit_central_column_save=true&ajax_request=true&ajax_page_request=true&token='+PMA_commonParams.get('token')+'&db='+PMA_commonParams.get('db');
-        PMA_ajaxShowMessage();
-        AJAX.source = $(this);
-        $.post('db_central_columns.php', multi_column_edit_data, AJAX.responseHandler);
-    });
-    $('#add_new').find('td').each(function(){
-        if ($(this).attr('name') !== 'undefined') {
-            $(this).find('input,select:first').attr('name', $(this).attr('name'));
-        }
-    });
-    $("#field_0_0").attr('required','required');
-    $('#add_new input[type="text"], #add_new input[type="number"], #add_new select')
-        .css({
-            'width' : '10em',
-            '-moz-box-sizing' : 'border-box'
-        });
-    window.scrollTo(0, 0);
-    $(document).on("keyup", ".filter_rows", function () {
-        // get the column names
-        var cols = $('th.column_heading').map(function () {
-            return $.trim($(this).text());
-        }).get();
-        $.uiTableFilter($("#table_columns"), $(this).val(), cols, null, "td span");
-    });
-    $('.edit').click(function() {
-        var rownum = $(this).parent().data('rownum');
-        $('#save_' + rownum).show();
-        $(this).hide();
-        $('#f_' + rownum + ' td span').hide();
-        $('#f_' + rownum + ' input, #f_' + rownum + ' select, #f_' + rownum + ' .open_enum_editor').show();
-        var attribute_val = $('#f_' + rownum + ' td[name=col_attribute] span').html();
-        $('#f_' + rownum + ' select[name=field_attribute\\['+ rownum +'\\] ] option[value="' + attribute_val + '"]').attr("selected","selected");
-        if($('#f_' + rownum + ' .default_type').val() === 'USER_DEFINED') {
-            $('#f_' + rownum + ' .default_type').siblings('.default_value').show();
-        } else {
-            $('#f_' + rownum + ' .default_type').siblings('.default_value').hide();
-        }
-    });
-    $(".del_row").click(function (event) {
-        event.preventDefault();
-        event.stopPropagation();
-        var $td = $(this);
-        var question = PMA_messages.strDeleteCentralColumnWarning;
-        $td.PMA_confirm(question, null, function (url) {
-            var rownum = $td.data('rownum');
-            $("#del_col_name").val("selected_fld%5B%5D="+$('#checkbox_row_' + rownum ).val());
-            $("#del_form").submit();
-        });
-    });
-    $('.edit_cancel_form').click(function(event) {
-        event.preventDefault();
-        event.stopPropagation();
-        var rownum = $(this).data('rownum');
-        $('#save_' + rownum).hide();
-        $('#edit_' + rownum).show();
-        $('#f_' + rownum + ' td span').show();
-        $('#f_' + rownum + ' input, #f_' + rownum + ' select,#f_'+rownum+' .default_value, #f_' + rownum + ' .open_enum_editor').hide();
-        $('#tableslistcontainer').find('.checkall').show();
-    });
-    $('.edit_save_form').click(function(event) {
-        //alert(1);
-        event.preventDefault();
-        event.stopPropagation();
-        var rownum = $(this).data('rownum');
-        $('#f_' + rownum + ' td').each(function() {
-            if ($(this).attr('name') !== 'undefined') {
-                $(this).find(':input[type!="hidden"],select:first')
-                       .attr('name', $(this).attr('name'));
-            }
-        });
-        if($('#f_' + rownum + ' .default_type').val() === 'USER_DEFINED') {
-            $('#f_' + rownum + ' .default_type').attr('name','col_default_sel');
-        } else {
-            $('#f_' + rownum + ' .default_value').attr('name','col_default_val');
-        }
-       // alert(rownum);
-        var datastring = $('#f_' + rownum + ' :input').serialize();
-        //console.log(datastring);
-        $.ajax({
-            type: "POST",
-            url: "db_central_columns.php",
-            data: datastring+'&ajax_request=true',
-            dataType: "json",
-            success: function(data) {
-                if (data.message !== '1') {
-                    PMA_ajaxShowMessage(
-                        '<div class="error">' +
-                        data.message +
-                        '</div>',
-                        false
-                    );
-                } else {
-                    $('#f_' + rownum + ' td[name=col_name] span').text($('#f_' + rownum + ' input[name=col_name]').val()).html();
-                    $('#f_' + rownum + ' td[name=col_type] span').text($('#f_' + rownum + ' select[name=col_type]').val()).html();
-                    $('#f_' + rownum + ' td[name=col_length] span').text($('#f_' + rownum + ' input[name=col_length]').val()).html();
-                    $('#f_' + rownum + ' td[name=collation] span').text($('#f_' + rownum + ' select[name=collation]').val()).html();
-                    $('#f_' + rownum + ' td[name=col_attribute] span').text($('#f_' + rownum + ' select[name=col_attribute]').val()).html();
-                    $('#f_' + rownum + ' td[name=col_isNull] span').text($('#f_' + rownum +' input[name=col_isNull]').is(":checked")?"Yes":"No").html();
-                    $('#f_' + rownum + ' td[name=col_extra] span').text($('#f_' + rownum + ' input[name=col_extra]').is(":checked") ? "auto_increment" : "").html();
-                    $('#f_' + rownum + ' td[name=col_default] span').text($('#f_' + rownum + ' :input[name=col_default]').val()).html();
-                }
-                $('#save_' + rownum).hide();
-                $('#edit_' + rownum).show();
-                $('#f_' + rownum + ' td span').show();
-                $('#f_' + rownum + ' input, #f_' + rownum + ' select,#f_' + rownum + ' .default_value, #f_' + rownum + ' .open_enum_editor').hide();
-                $('#tableslistcontainer').find('.checkall').show();
-            },
-            error: function() {
-                    PMA_ajaxShowMessage(
-                        '<div class="error">' +
-                        PMA_messages.strErrorProcessingRequest +
-                        '</div>',
-                        false
-                    );
-                }
-        });
-    });
-    $('#table-select').change(function(e) {
-        var selectvalue = $(this).val();
-        var default_column_select = $('#column-select').find('option:first');
-        var href = "db_central_columns.php";
-        var params = {
-            'ajax_request' : true,
-            'token' : PMA_commonParams.get('token'),
-            'server' : PMA_commonParams.get('server'),
-            'db' : PMA_commonParams.get('db'),
-            'selectedTable' : selectvalue,
-            'populateColumns' : true
-        };
-        $('#column-select').html('<option value="">' + PMA_messages.strLoading + '</option>');
-        if (selectvalue !== "") {
-            $.post(href, params, function (data) {
-                $('#column-select').empty().append(default_column_select);
-                $('#column-select').append(data.message);
-            });
-        }
-    });
-    $('#column-select').change(function(e) {
-        var selectvalue = $(this).val();
-        if (selectvalue !== "") {
-            $("#add_column").submit();
-        }
-    });
-    $("#add_col_div").find(">a").click(function(event){
-        $('#add_new').slideToggle("slow");
-        var $addColDivLinkSpan = $("#add_col_div").find(">a span");
-        if($addColDivLinkSpan.html() === '+') {
-            $addColDivLinkSpan.html('-');
-        } else {
-            $addColDivLinkSpan.html('+');
-        }
-    });
-    $('#add_new').submit(function(event){
-        $('#add_new').toggle();
-    });
-    $("#tableslistcontainer").find("select.default_type").change(function () {
-        if ($(this).val() === 'USER_DEFINED') {
-            $(this).siblings('.default_value').attr('name','col_default');
-            $(this).attr('name','col_default_sel');
-        } else {
-            $(this).attr('name','col_default');
-            $(this).siblings('.default_value').attr('name','col_default_val');
-        }
-    });
-});
diff --git a/#pma/js/db_operations.js b/#pma/js/db_operations.js
deleted file mode 100644
index d0843eba..00000000
--- a/#pma/js/db_operations.js
+++ /dev/null
@@ -1,157 +0,0 @@
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * @fileoverview    function used in server privilege pages
- * @name            Database Operations
- *
- * @requires    jQuery
- * @requires    jQueryUI
- * @requires    js/functions.js
- *
- */
-
-/**
- * Ajax event handlers here for db_operations.php
- *
- * Actions Ajaxified here:
- * Rename Database
- * Copy Database
- * Change Charset
- * Drop Database
- */
-
-/**
- * Unbind all event handlers before tearing down a page
- */
-AJAX.registerTeardown('db_operations.js', function () {
-    $(document).off('submit', "#rename_db_form.ajax");
-    $(document).off('submit', "#copy_db_form.ajax");
-    $(document).off('submit', "#change_db_charset_form.ajax");
-    $(document).off('click', "#drop_db_anchor.ajax");
-});
-
-AJAX.registerOnload('db_operations.js', function () {
-
-    /**
-     * Ajax event handlers for 'Rename Database'
-     */
-    $(document).on('submit', "#rename_db_form.ajax", function (event) {
-        event.preventDefault();
-
-        var old_db_name = PMA_commonParams.get('db');
-        var new_db_name = $('#new_db_name').val();
-
-        if (new_db_name == old_db_name) {
-            PMA_ajaxShowMessage(PMA_messages.strDropDatabaseStrongWarning);
-            return false;
-        }
-
-        var $form = $(this);
-
-        var question = escapeHtml('CREATE DATABASE ' + new_db_name + ' / DROP DATABASE ' + old_db_name);
-
-        PMA_prepareForAjaxRequest($form);
-
-        $form.PMA_confirm(question, $form.attr('action'), function (url) {
-            PMA_ajaxShowMessage(PMA_messages.strRenamingDatabases, false);
-            $.post(url, $("#rename_db_form").serialize() + '&is_js_confirmed=1', function (data) {
-                if (typeof data !== 'undefined' && data.success === true) {
-                    PMA_ajaxShowMessage(data.message);
-                    PMA_commonParams.set('db', data.newname);
-
-                    PMA_reloadNavigation(function () {
-                        $('#pma_navigation_tree')
-                            .find("a:not('.expander')")
-                            .each(function (index) {
-                                var $thisAnchor = $(this);
-                                if ($thisAnchor.text() == data.newname) {
-                                    // simulate a click on the new db name
-                                    // in navigation
-                                    $thisAnchor.trigger('click');
-                                }
-                            });
-                    });
-                } else {
-                    PMA_ajaxShowMessage(data.error, false);
-                }
-            }); // end $.post()
-        });
-    }); // end Rename Database
-
-    /**
-     * Ajax Event Handler for 'Copy Database'
-     */
-    $(document).on('submit', "#copy_db_form.ajax", function (event) {
-        event.preventDefault();
-        PMA_ajaxShowMessage(PMA_messages.strCopyingDatabase, false);
-        var $form = $(this);
-        PMA_prepareForAjaxRequest($form);
-        $.post($form.attr('action'), $form.serialize(), function (data) {
-            // use messages that stay on screen
-            $('div.success, div.error').fadeOut();
-            if (typeof data !== 'undefined' && data.success === true) {
-                if ($("#checkbox_switch").is(":checked")) {
-                    PMA_commonParams.set('db', data.newname);
-                    PMA_commonActions.refreshMain(false, function () {
-                        PMA_ajaxShowMessage(data.message);
-                    });
-                } else {
-                    PMA_commonParams.set('db', data.db);
-                    PMA_ajaxShowMessage(data.message);
-                }
-                PMA_reloadNavigation();
-            } else {
-                PMA_ajaxShowMessage(data.error, false);
-            }
-        }); // end $.post()
-    }); // end copy database
-
-    /**
-     * Ajax Event handler for 'Change Charset' of the database
-     */
-    $(document).on('submit', "#change_db_charset_form.ajax", function (event) {
-        event.preventDefault();
-        var $form = $(this);
-        PMA_prepareForAjaxRequest($form);
-        PMA_ajaxShowMessage(PMA_messages.strChangingCharset);
-        $.post($form.attr('action'), $form.serialize() + "&submitcollation=1", function (data) {
-            if (typeof data !== 'undefined' && data.success === true) {
-                PMA_ajaxShowMessage(data.message);
-            } else {
-                PMA_ajaxShowMessage(data.error, false);
-            }
-        }); // end $.post()
-    }); // end change charset
-
-    /**
-     * Ajax event handlers for Drop Database
-     */
-    $(document).on('click', "#drop_db_anchor.ajax", function (event) {
-        event.preventDefault();
-        /**
-         * @var question    String containing the question to be asked for confirmation
-         */
-        var question = PMA_messages.strDropDatabaseStrongWarning + ' ';
-        question += PMA_sprintf(
-            PMA_messages.strDoYouReally,
-            'DROP DATABASE ' + escapeHtml(PMA_commonParams.get('db'))
-        );
-        $(this).PMA_confirm(question, $(this).attr('href'), function (url) {
-            PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
-            $.post(url, {'is_js_confirmed': '1', 'ajax_request': true}, function (data) {
-                if (typeof data !== 'undefined' && data.success) {
-                    //Database deleted successfully, refresh both the frames
-                    PMA_reloadNavigation();
-                    PMA_commonParams.set('db', '');
-                    PMA_commonActions.refreshMain(
-                        'server_databases.php',
-                        function () {
-                            PMA_ajaxShowMessage(data.message);
-                        }
-                    );
-                } else {
-                    PMA_ajaxShowMessage(data.error, false);
-                }
-            });
-        });
-    });
-});
diff --git a/#pma/js/db_qbe.js b/#pma/js/db_qbe.js
deleted file mode 100644
index 4b685491..00000000
--- a/#pma/js/db_qbe.js
+++ /dev/null
@@ -1,77 +0,0 @@
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * @fileoverview    function used in QBE for DB
- * @name            Database Operations
- *
- * @requires    jQuery
- * @requires    jQueryUI
- * @requires    js/functions.js
- *
- */
-
-/**
- * Ajax event handlers here for db_qbe.php
- *
- * Actions Ajaxified here:
- * Select saved search
- */
-
-/**
- * Unbind all event handlers before tearing down a page
- */
-AJAX.registerTeardown('db_qbe.js', function () {
-    $(document).off('change', 'select[name^=criteriaColumn]');
-    $(document).off('change', "#searchId");
-    $(document).off('click', "#saveSearch");
-    $(document).off('click', "#updateSearch");
-    $(document).off('click', "#deleteSearch");
-});
-
-AJAX.registerOnload('db_qbe.js', function () {
-
-    PMA_getSQLEditor($('#textSqlquery'), {}, 'both');
-
-    /**
-     * Ajax handler to check the corresponding 'show' checkbox when column is selected
-     */
-    $(document).on('change', 'select[name^=criteriaColumn]', function (event) {
-        if ($(this).val()) {
-            var index = (/\d+/).exec($(this).attr('name'));
-            $('input[name=criteriaShow\\[' + index + '\\]]').prop('checked', true);
-        }
-    });
-
-    /**
-     * Ajax event handlers for 'Select saved search'
-     */
-    $(document).on('change', "#searchId", function (event) {
-        $('#action').val('load');
-        $('#formQBE').submit();
-    });
-
-    /**
-     * Ajax event handlers for 'Create bookmark'
-     */
-    $(document).on('click', "#saveSearch", function () {
-        $('#action').val('create');
-    });
-
-    /**
-     * Ajax event handlers for 'Update bookmark'
-     */
-    $(document).on('click', "#updateSearch", function (event) {
-        $('#action').val('update');
-    });
-
-    /**
-     * Ajax event handlers for 'Delete bookmark'
-     */
-    $(document).on('click', "#deleteSearch", function (event) {
-        var question = PMA_sprintf(PMA_messages.strConfirmDeleteQBESearch, $("#searchId").find("option:selected").text());
-        if (!confirm(question)) {
-            return false;
-        }
-
-        $('#action').val('delete');
-    });
-});
\ No newline at end of file
diff --git a/#pma/js/db_search.js b/#pma/js/db_search.js
deleted file mode 100644
index 157cfc80..00000000
--- a/#pma/js/db_search.js
+++ /dev/null
@@ -1,246 +0,0 @@
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * JavaScript functions used on Database Search page
- *
- * @requires    jQuery
- * @requires    js/functions.js
- *
- * @package PhpMyAdmin
- */
-
-/**
- * AJAX script for the Database Search page.
- *
- * Actions ajaxified here:
- * Retrieve result of SQL query
- */
-
-/**
- * Unbind all event handlers before tearing down a page
- */
-AJAX.registerTeardown('db_search.js', function () {
-    $('a.browse_results').unbind('click');
-    $('a.delete_results').unbind('click');
-    $('#buttonGo').unbind('click');
-    $('#togglesearchresultlink').unbind('click');
-    $("#togglequerybox").unbind('click');
-    $('#togglesearchformlink').unbind('click');
-    $(document).off('submit', "#db_search_form.ajax");
-});
-
-AJAX.registerOnload('db_search.js', function () {
-    /** Hide the table link in the initial search result */
-    var icon = PMA_getImage('s_tbl.png', '', {'id': 'table-image'}).toString();
-    $("#table-info").prepend(icon).hide();
-
-    /** Hide the browse and deleted results in the new search criteria */
-    $('#buttonGo').click(function () {
-        $("#table-info").hide();
-        $('#browse-results').hide();
-        $('#sqlqueryform').hide();
-        $('#togglequerybox').hide();
-    });
-    /**
-     * Prepare a div containing a link for toggle the search results
-     */
-    $('#togglesearchresultsdiv')
-    /** don't show it until we have results on-screen */
-    .hide();
-
-    /**
-     * Changing the displayed text according to
-     * the hide/show criteria in search result forms
-     */
-    $('#togglesearchresultlink')
-    .html(PMA_messages.strHideSearchResults)
-    .bind('click', function () {
-        var $link = $(this);
-        $('#searchresults').slideToggle();
-        if ($link.text() == PMA_messages.strHideSearchResults) {
-            $link.text(PMA_messages.strShowSearchResults);
-        } else {
-            $link.text(PMA_messages.strHideSearchResults);
-        }
-        /** avoid default click action */
-        return false;
-    });
-
-    /**
-     * Prepare a div containing a link for toggle the search form,
-     * otherwise it's incorrectly displayed after a couple of clicks
-     */
-    $('#togglesearchformdiv')
-    .hide(); // don't show it until we have results on-screen
-
-    /**
-     * Changing the displayed text according to
-     * the hide/show criteria in search form
-     */
-    $("#togglequerybox")
-    .hide()
-    .bind('click', function () {
-        var $link = $(this);
-        $('#sqlqueryform').slideToggle("medium");
-        if ($link.text() == PMA_messages.strHideQueryBox) {
-            $link.text(PMA_messages.strShowQueryBox);
-        } else {
-            $link.text(PMA_messages.strHideQueryBox);
-        }
-        /** avoid default click action */
-        return false;
-    });
-
-    /** don't show it until we have results on-screen */
-
-    /**
-     * Changing the displayed text according to
-     * the hide/show criteria in search criteria form
-     */
-    $('#togglesearchformlink')
-       .html(PMA_messages.strShowSearchCriteria)
-       .bind('click', function () {
-            var $link = $(this);
-            $('#db_search_form').slideToggle();
-            if ($link.text() == PMA_messages.strHideSearchCriteria) {
-                $link.text(PMA_messages.strShowSearchCriteria);
-            } else {
-                $link.text(PMA_messages.strHideSearchCriteria);
-            }
-            /** avoid default click action */
-            return false;
-        });
-
-    /*
-     * Ajax Event handler for retrieving the results from a table
-     */
-    $(document).on('click', 'a.browse_results', function(e){
-        e.preventDefault();
-        /**   Hides the results shown by the delete criteria */
-        var $msg = PMA_ajaxShowMessage(PMA_messages.strBrowsing, false);
-        $('#sqlqueryform').hide();
-        $('#togglequerybox').hide();
-        /**  Load the browse results to the page */
-        $("#table-info").show();
-        var table_name = $(this).data('table-name');
-        $('#table-link').attr({"href" : $(this).attr('href')}).text(table_name);
-
-        var url = $(this).attr('href') + "#searchresults";
-        var browse_sql = $(this).data('browse-sql');
-        var params = {
-            'ajax_request': true,
-            'is_js_confirmed': true,
-            'sql_query' : browse_sql
-        };
-        $.post(url, params, function (data) {
-            if (typeof data !== 'undefined' && data.success) {
-                $('#browse-results').html(data.message);
-                PMA_ajaxRemoveMessage($msg);
-                $('.table_results').each(function () {
-                    PMA_makegrid(this, true, true, true, true);
-                });
-                $('#browse-results').show();
-                PMA_highlightSQL($('#browse-results'));
-                $('html, body')
-                    .animate({
-                        scrollTop: $("#browse-results").offset().top
-                    }, 1000);
-            } else {
-                PMA_ajaxShowMessage(data.error, false);
-            }
-        });
-    });
-
-    /*
-     * Ajax Event handler for deleting the results from a table
-     */
-    $(document).on('click', 'a.delete_results', function(e){
-        e.preventDefault();
-        /**  Hides the results shown by the browse criteria */
-        $("#table-info").hide();
-        $('#sqlqueryform').hide();
-        $('#togglequerybox').hide();
-        /** Conformation message for deletion */
-        var msg = PMA_sprintf(
-            PMA_messages.strConfirmDeleteResults,
-            $(this).data('table-name')
-        );
-        if (confirm(msg)) {
-            var $msg = PMA_ajaxShowMessage(PMA_messages.strDeleting, false);
-            /** Load the deleted option to the page*/
-            $('#sqlqueryform').html('');
-            var params = {
-                'ajax_request': true,
-                'is_js_confirmed': true,
-                'sql_query': $(this).data('delete-sql')
-            };
-            var url = $(this).attr('href');
-
-            $.post(url, params, function (data) {
-                if (typeof data === 'undefined' || !data.success) {
-                    PMA_ajaxShowMessage(data.error, false);
-                    return;
-                }
-
-                $('#sqlqueryform').html(data.sql_query);
-                /** Refresh the search results after the deletion */
-                document.getElementById('buttonGo').click();
-                $('#togglequerybox').html(PMA_messages.strHideQueryBox);
-                /** Show the results of the deletion option */
-                $('#browse-results').hide();
-                $('#sqlqueryform').show();
-                $('#togglequerybox').show();
-                $('html, body')
-                    .animate({
-                        scrollTop: $("#browse-results").offset().top
-                    }, 1000);
-                PMA_ajaxRemoveMessage($msg);
-            });
-        }
-    });
-
-    /**
-     * Ajax Event handler for retrieving the result of an SQL Query
-     */
-    $(document).on('submit', "#db_search_form.ajax", function (event) {
-        event.preventDefault();
-
-        var $msgbox = PMA_ajaxShowMessage(PMA_messages.strSearching, false);
-        // jQuery object to reuse
-        var $form = $(this);
-
-        PMA_prepareForAjaxRequest($form);
-
-        var url = $form.serialize() + "&submit_search=" + $("#buttonGo").val();
-        $.post($form.attr('action'), url, function (data) {
-            if (typeof data !== 'undefined' && data.success === true) {
-                // found results
-                $("#searchresults").html(data.message);
-
-                $('#togglesearchresultlink')
-                // always start with the Show message
-                .text(PMA_messages.strHideSearchResults);
-                $('#togglesearchresultsdiv')
-                // now it's time to show the div containing the link
-                .show();
-                $('#searchresults').show();
-
-
-                $('#db_search_form')
-                    // workaround for Chrome problem (bug #3168569)
-                    .slideToggle()
-                    .hide();
-                $('#togglesearchformlink')
-                    // always start with the Show message
-                    .text(PMA_messages.strShowSearchCriteria);
-                $('#togglesearchformdiv')
-                    // now it's time to show the div containing the link
-                    .show();
-            } else {
-                // error message (zero rows)
-                $("#searchresults").html(data.error).show();
-            }
-
-            PMA_ajaxRemoveMessage($msgbox);
-        });
-    });
-}); // end $()
diff --git a/#pma/js/db_structure.js b/#pma/js/db_structure.js
deleted file mode 100644
index a5cb4315..00000000
--- a/#pma/js/db_structure.js
+++ /dev/null
@@ -1,433 +0,0 @@
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * @fileoverview    functions used on the database structure page
- * @name            Database Structure
- *
- * @requires    jQuery
- * @requires    jQueryUI
- * @required    js/functions.js
- */
-
-/**
- * AJAX scripts for db_structure.php
- *
- * Actions ajaxified here:
- * Drop Database
- * Truncate Table
- * Drop Table
- *
- */
-
-/**
- * Unbind all event handlers before tearing down a page
- */
-AJAX.registerTeardown('db_structure.js', function () {
-    $(document).off('click', "a.truncate_table_anchor.ajax");
-    $(document).off('click', "a.drop_table_anchor.ajax");
-    $(document).off('click', '#real_end_input');
-    $(document).off('click', "a.favorite_table_anchor.ajax");
-    $(document).off('click', '#printView');
-    $('a.real_row_count').off('click');
-    $('a.row_count_sum').off('click');
-    $('select[name=submit_mult]').unbind('change');
-});
-
-/**
- * Adjust number of rows and total size in the summary
- * when truncating, creating, dropping or inserting into a table
- */
-function PMA_adjustTotals() {
-    var byteUnits = [
-        PMA_messages.strB,
-        PMA_messages.strKiB,
-        PMA_messages.strMiB,
-        PMA_messages.strGiB,
-        PMA_messages.strTiB,
-        PMA_messages.strPiB,
-        PMA_messages.strEiB
-    ];
-    /**
-     * @var $allTr jQuery object that references all the rows in the list of tables
-     */
-    var $allTr = $("#tablesForm").find("table.data tbody:first tr");
-    // New summary values for the table
-    var tableSum = $allTr.size();
-    var rowsSum = 0;
-    var sizeSum = 0;
-    var overheadSum = 0;
-    var rowSumApproximated = false;
-
-    $allTr.each(function () {
-        var $this = $(this);
-        var i, tmpVal;
-        // Get the number of rows for this SQL table
-        var strRows = $this.find('.tbl_rows').text();
-        // If the value is approximated
-        if (strRows.indexOf('~') === 0) {
-            rowSumApproximated = true;
-            // The approximated value contains a preceding ~ (Eg 100 --> ~100)
-            strRows = strRows.substring(1, strRows.length);
-        }
-        strRows = strRows.replace(/[,.]/g, '');
-        var intRow = parseInt(strRows, 10);
-        if (! isNaN(intRow)) {
-            rowsSum += intRow;
-        }
-        // Extract the size and overhead
-        var valSize         = 0;
-        var valOverhead     = 0;
-        var strSize         = $.trim($this.find('.tbl_size span:not(.unit)').text());
-        var strSizeUnit     = $.trim($this.find('.tbl_size span.unit').text());
-        var strOverhead     = $.trim($this.find('.tbl_overhead span:not(.unit)').text());
-        var strOverheadUnit = $.trim($this.find('.tbl_overhead span.unit').text());
-        // Given a value and a unit, such as 100 and KiB, for the table size
-        // and overhead calculate their numeric values in bytes, such as 102400
-        for (i = 0; i < byteUnits.length; i++) {
-            if (strSizeUnit == byteUnits[i]) {
-                tmpVal = parseFloat(strSize);
-                valSize = tmpVal * Math.pow(1024, i);
-                break;
-            }
-        }
-        for (i = 0; i < byteUnits.length; i++) {
-            if (strOverheadUnit == byteUnits[i]) {
-                tmpVal = parseFloat(strOverhead);
-                valOverhead = tmpVal * Math.pow(1024, i);
-                break;
-            }
-        }
-        sizeSum += valSize;
-        overheadSum += valOverhead;
-    });
-    // Add some commas for readability:
-    // 1000000 becomes 1,000,000
-    var strRowSum = rowsSum + "";
-    var regex = /(\d+)(\d{3})/;
-    while (regex.test(strRowSum)) {
-        strRowSum = strRowSum.replace(regex, '$1' + ',' + '$2');
-    }
-    // If approximated total value add ~ in front
-    if (rowSumApproximated) {
-        strRowSum = "~" + strRowSum;
-    }
-    // Calculate the magnitude for the size and overhead values
-    var size_magnitude = 0, overhead_magnitude = 0;
-    while (sizeSum >= 1024) {
-        sizeSum /= 1024;
-        size_magnitude++;
-    }
-    while (overheadSum >= 1024) {
-        overheadSum /= 1024;
-        overhead_magnitude++;
-    }
-
-    sizeSum = Math.round(sizeSum * 10) / 10;
-    overheadSum = Math.round(overheadSum * 10) / 10;
-
-    // Update summary with new data
-    var $summary = $("#tbl_summary_row");
-    $summary.find('.tbl_num').text(PMA_sprintf(PMA_messages.strNTables, tableSum));
-    if (rowSumApproximated) {
-        $summary.find('.row_count_sum').text(strRowSum);
-    } else {
-        $summary.find('.tbl_rows').text(strRowSum);
-    }
-    $summary.find('.tbl_size').text(sizeSum + " " + byteUnits[size_magnitude]);
-    $summary.find('.tbl_overhead').text(overheadSum + " " + byteUnits[overhead_magnitude]);
-}
-
-/**
- * Gets the real row count for a table or DB.
- * @param object $target Target for appending the real count value.
- */
-function PMA_fetchRealRowCount($target)
-{
-    var $throbber = $('#pma_navigation').find('.throbber')
-        .first()
-        .clone()
-        .css({visibility: 'visible', display: 'inline-block'})
-        .click(false);
-    $target.html($throbber);
-    $.ajax({
-        type: 'GET',
-        url: $target.attr('href'),
-        cache: false,
-        dataType: 'json',
-        success: function (response) {
-            if (response.success) {
-                // If to update all row counts for a DB.
-                if (response.real_row_count_all) {
-                    $.each(JSON.parse(response.real_row_count_all),
-                        function (index, table) {
-                            // Update each table row count.
-                            $('table.data td[data-table*="' + table.table + '"]')
-                            .text(table.row_count);
-                        }
-                    );
-                }
-                // If to update a particular table's row count.
-                if (response.real_row_count) {
-                    // Append the parent cell with real row count.
-                    $target.parent().text(response.real_row_count);
-                }
-                // Adjust the 'Sum' displayed at the bottom.
-                PMA_adjustTotals();
-            } else {
-                PMA_ajaxShowMessage(PMA_messages.strErrorRealRowCount);
-            }
-        },
-        error: function () {
-            PMA_ajaxShowMessage(PMA_messages.strErrorRealRowCount);
-        }
-    });
-}
-
-AJAX.registerOnload('db_structure.js', function () {
-/**
- * function to open the confirmation dialog for making table consistent with central list
- *
- * @param string   msg     message text to be displayed to user
- * @param function success function to be called on success
- *
- */
-    var jqConfirm = function(msg, success) {
-        var dialogObj = $("<div style='display:none'>"+msg+"</div>");
-        $('body').append(dialogObj);
-        var buttonOptions = {};
-        buttonOptions[PMA_messages.strContinue] = function () {
-            success();
-            $( this ).dialog( "close" );
-        };
-        buttonOptions[PMA_messages.strCancel] = function () {
-            $( this ).dialog( "close" );
-            $('#tablesForm')[0].reset();
-        };
-        $(dialogObj).dialog({
-            resizable: false,
-            modal: true,
-            title: PMA_messages.confirmTitle,
-            buttons: buttonOptions
-        });
-    };
-
-/**
- *  Event handler on select of "Make consistent with central list"
- */
-    $('select[name=submit_mult]').change(function(event) {
-        if ($(this).val() === 'make_consistent_with_central_list') {
-            event.preventDefault();
-            event.stopPropagation();
-            jqConfirm(PMA_messages.makeConsistentMessage, function(){
-                        $('#tablesForm').submit();
-                    });
-            return false;
-        }
-        else if ($(this).val() === 'copy_tbl' || $(this).val() === 'add_prefix_tbl' || $(this).val() === 'replace_prefix_tbl' || $(this).val() === 'copy_tbl_change_prefix') {
-            event.preventDefault();
-            event.stopPropagation();
-            if ($('input[name="selected_tbl[]"]:checked').length === 0) {
-                return false;
-            }
-            var formData = $('#tablesForm').serialize();
-            var modalTitle = '';
-            if ($(this).val() === 'copy_tbl') {
-                modalTitle = PMA_messages.strCopyTablesTo;
-            }
-            else if ($(this).val() === 'add_prefix_tbl') {
-                modalTitle = PMA_messages.strAddPrefix;
-            }
-            else if ($(this).val() === 'replace_prefix_tbl') {
-                modalTitle = PMA_messages.strReplacePrefix;
-            }
-            else if ($(this).val() === 'copy_tbl_change_prefix') {
-                modalTitle = PMA_messages.strCopyPrefix;
-            }
-            $.ajax({
-                type: 'POST',
-                url: 'db_structure.php',
-                dataType: 'html',
-                data: formData
-
-            }).done(function(data) {
-
-                var dialogObj = $("<div style='display:none'>"+data+"</div>");
-                $('body').append(dialogObj);
-                var buttonOptions = {};
-                buttonOptions[PMA_messages.strContinue] = function () {
-                    $('#ajax_form').submit();
-                    $( this ).dialog( "close" );
-                };
-                buttonOptions[PMA_messages.strCancel] = function () {
-                    $( this ).dialog( "close" );
-                    $('#tablesForm')[0].reset();
-                };
-                $(dialogObj).dialog({
-                    minWidth: 500,
-                    resizable: false,
-                    modal: true,
-                    title: modalTitle,
-                    buttons: buttonOptions
-                });
-            });
-        }
-        else {
-            $('#tablesForm').submit();
-        }
-    });
-
-    /**
-     * Ajax Event handler for 'Truncate Table'
-     */
-    $(document).on('click', "a.truncate_table_anchor.ajax", function (event) {
-        event.preventDefault();
-
-        /**
-         * @var $this_anchor Object  referring to the anchor clicked
-         */
-        var $this_anchor = $(this);
-
-        //extract current table name and build the question string
-        /**
-         * @var curr_table_name String containing the name of the table to be truncated
-         */
-        var curr_table_name = $this_anchor.parents('tr').children('th').children('a').text();
-        /**
-         * @var question    String containing the question to be asked for confirmation
-         */
-        var question = PMA_messages.strTruncateTableStrongWarning + ' ' +
-            PMA_sprintf(PMA_messages.strDoYouReally, 'TRUNCATE ' + escapeHtml(curr_table_name)) +
-            getForeignKeyCheckboxLoader();
-
-        $this_anchor.PMA_confirm(question, $this_anchor.attr('href'), function (url) {
-
-            PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
-
-            var params = getJSConfirmCommonParam(this);
-
-            $.post(url, params, function (data) {
-                if (typeof data !== 'undefined' && data.success === true) {
-                    PMA_ajaxShowMessage(data.message);
-                    // Adjust table statistics
-                    var $tr = $this_anchor.closest('tr');
-                    $tr.find('.tbl_rows').text('0');
-                    $tr.find('.tbl_size, .tbl_overhead').text('-');
-                    //Fetch inner span of this anchor
-                    //and replace the icon with its disabled version
-                    var span = $this_anchor.html().replace(/b_empty/, 'bd_empty');
-                    //To disable further attempts to truncate the table,
-                    //replace the a element with its inner span (modified)
-                    $this_anchor
-                        .replaceWith(span)
-                        .removeClass('truncate_table_anchor');
-                    PMA_adjustTotals();
-                } else {
-                    PMA_ajaxShowMessage(PMA_messages.strErrorProcessingRequest + " : " + data.error, false);
-                }
-            }); // end $.post()
-        }, loadForeignKeyCheckbox); //end $.PMA_confirm()
-    }); //end of Truncate Table Ajax action
-
-    /**
-     * Ajax Event handler for 'Drop Table' or 'Drop View'
-     */
-    $(document).on('click', "a.drop_table_anchor.ajax", function (event) {
-        event.preventDefault();
-
-        var $this_anchor = $(this);
-
-        //extract current table name and build the question string
-        /**
-         * @var $curr_row    Object containing reference to the current row
-         */
-        var $curr_row = $this_anchor.parents('tr');
-        /**
-         * @var curr_table_name String containing the name of the table to be truncated
-         */
-        var curr_table_name = $curr_row.children('th').children('a').text();
-        /**
-         * @var is_view Boolean telling if we have a view
-         */
-        var is_view = $curr_row.hasClass('is_view') || $this_anchor.hasClass('view');
-        /**
-         * @var question    String containing the question to be asked for confirmation
-         */
-        var question;
-        if (! is_view) {
-            question = PMA_messages.strDropTableStrongWarning + ' ' +
-                PMA_sprintf(PMA_messages.strDoYouReally, 'DROP TABLE ' + escapeHtml(curr_table_name));
-        } else {
-            question =
-                PMA_sprintf(PMA_messages.strDoYouReally, 'DROP VIEW ' + escapeHtml(curr_table_name));
-        }
-        question += getForeignKeyCheckboxLoader();
-
-        $this_anchor.PMA_confirm(question, $this_anchor.attr('href'), function (url) {
-
-            var $msg = PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
-
-            var params = getJSConfirmCommonParam(this);
-
-            $.post(url, params, function (data) {
-                if (typeof data !== 'undefined' && data.success === true) {
-                    PMA_ajaxShowMessage(data.message);
-                    toggleRowColors($curr_row.next());
-                    $curr_row.hide("medium").remove();
-                    PMA_adjustTotals();
-                    PMA_reloadNavigation();
-                    PMA_ajaxRemoveMessage($msg);
-                } else {
-                    PMA_ajaxShowMessage(PMA_messages.strErrorProcessingRequest + " : " + data.error, false);
-                }
-            }); // end $.post()
-        }, loadForeignKeyCheckbox); // end $.PMA_confirm()
-    }); //end of Drop Table Ajax action
-
-    /**
-     * Attach Event Handler for 'Print' link
-     */
-    $(document).on('click', "#printView", function (event) {
-        event.preventDefault();
-
-        // Take to preview mode
-        printPreview();
-    }); //end of Print View action
-
-    //Calculate Real End for InnoDB
-    /**
-     * Ajax Event handler for calculating the real end for a InnoDB table
-     *
-     */
-    $(document).on('click', '#real_end_input', function (event) {
-        event.preventDefault();
-
-        /**
-         * @var question    String containing the question to be asked for confirmation
-         */
-        var question = PMA_messages.strOperationTakesLongTime;
-
-        $(this).PMA_confirm(question, '', function () {
-            return true;
-        });
-        return false;
-    }); //end Calculate Real End for InnoDB
-
-    // Add tooltip to favorite icons.
-    $(".favorite_table_anchor").each(function () {
-        PMA_tooltip(
-            $(this),
-            'a',
-            $(this).attr("title")
-        );
-    });
-
-    // Get real row count via Ajax.
-    $('a.real_row_count').on('click', function (event) {
-        event.preventDefault();
-        PMA_fetchRealRowCount($(this));
-    });
-    // Get all real row count.
-    $('a.row_count_sum').on('click', function (event) {
-        event.preventDefault();
-        PMA_fetchRealRowCount($(this));
-    });
-}); // end $()
diff --git a/#pma/js/db_tracking.js b/#pma/js/db_tracking.js
deleted file mode 100644
index 9c7a84a1..00000000
--- a/#pma/js/db_tracking.js
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
- * Unbind all event handlers before tearing down the page
- */
-AJAX.registerTeardown('db_tracking.js', function () {
-    $('body').off('click', '#trackedForm.ajax button[name="submit_mult"], #trackedForm.ajax input[name="submit_mult"]');
-    $('body').off('click', '#untrackedForm.ajax button[name="submit_mult"], #untrackedForm.ajax input[name="submit_mult"]');
-    $('body').off('click', 'a.delete_tracking_anchor.ajax');
-});
-
-/**
- * Bind event handlers
- */
-AJAX.registerOnload('db_tracking.js', function () {
-
-    var $versions = $('#versions');
-    $versions.find('tr:first th').append($('<div class="sorticon"></div>'));
-    $versions.tablesorter({
-        sortList: [[1, 0]],
-        headers: {
-            0: {sorter: false},
-            2: {sorter: "integer"},
-            5: {sorter: false},
-            6: {sorter: false},
-            7: {sorter: false}
-        }
-    });
-
-    var $noVersions = $('#noversions');
-    $noVersions.find('tr:first th').append($('<div class="sorticon"></div>'));
-    $noVersions.tablesorter({
-        sortList: [[1, 0]],
-        headers: {
-            0: {sorter: false},
-            2: {sorter: false}
-        }
-    });
-
-    var $body = $('body');
-
-    /**
-     * Handles multi submit for tracked tables
-     */
-    $body.on('click', '#trackedForm.ajax button[name="submit_mult"], #trackedForm.ajax input[name="submit_mult"]', function (e) {
-        e.preventDefault();
-        var $button = $(this);
-        var $form = $button.parent('form');
-        var submitData = $form.serialize() + '&ajax_request=true&ajax_page_request=true&submit_mult=' + $button.val();
-
-        if ($button.val() == 'delete_tracking') {
-            var question = PMA_messages.strDeleteTrackingDataMultiple;
-            $button.PMA_confirm(question, $form.attr('action'), function (url) {
-                PMA_ajaxShowMessage(PMA_messages.strDeletingTrackingData);
-                AJAX.source = $form;
-                $.post(url, submitData, AJAX.responseHandler);
-            });
-        } else {
-            PMA_ajaxShowMessage();
-            AJAX.source = $form;
-            $.post($form.attr('action'), submitData, AJAX.responseHandler);
-        }
-    });
-
-    /**
-     * Handles multi submit for untracked tables
-     */
-    $body.on('click', '#untrackedForm.ajax button[name="submit_mult"], #untrackedForm.ajax input[name="submit_mult"]', function (e) {
-        e.preventDefault();
-        var $button = $(this);
-        var $form = $button.parent('form');
-        var submitData = $form.serialize() + '&ajax_request=true&ajax_page_request=true&submit_mult=' + $button.val();
-        PMA_ajaxShowMessage();
-        AJAX.source = $form;
-        $.post($form.attr('action'), submitData, AJAX.responseHandler);
-    });
-
-    /**
-     * Ajax Event handler for 'Delete tracking'
-     */
-    $body.on('click', 'a.delete_tracking_anchor.ajax', function (e) {
-        e.preventDefault();
-        var $anchor = $(this);
-        var question = PMA_messages.strDeleteTrackingData;
-        $anchor.PMA_confirm(question, $anchor.attr('href'), function (url) {
-            PMA_ajaxShowMessage(PMA_messages.strDeletingTrackingData);
-            AJAX.source = $anchor;
-            $.post(url, {'ajax_page_request': true, 'ajax_request': true}, AJAX.responseHandler);
-        });
-    });
-});
\ No newline at end of file
diff --git a/#pma/js/doclinks.js b/#pma/js/doclinks.js
deleted file mode 100644
index 678e7e88..00000000
--- a/#pma/js/doclinks.js
+++ /dev/null
@@ -1,365 +0,0 @@
-/**
- * Definition of links to MySQL documentation.
- */
-
-var mysql_doc_keyword = {
-    /* Multi word */
-    'CHARACTER SET': Array('charset'),
-    'SHOW AUTHORS': Array('show-authors'),
-    'SHOW BINARY LOGS': Array('show-binary-logs'),
-    'SHOW BINLOG EVENTS': Array('show-binlog-events'),
-    'SHOW CHARACTER SET': Array('show-character-set'),
-    'SHOW COLLATION': Array('show-collation'),
-    'SHOW COLUMNS': Array('show-columns'),
-    'SHOW CONTRIBUTORS': Array('show-contributors'),
-    'SHOW CREATE DATABASE': Array('show-create-database'),
-    'SHOW CREATE EVENT': Array('show-create-event'),
-    'SHOW CREATE FUNCTION': Array('show-create-function'),
-    'SHOW CREATE PROCEDURE': Array('show-create-procedure'),
-    'SHOW CREATE TABLE': Array('show-create-table'),
-    'SHOW CREATE TRIGGER': Array('show-create-trigger'),
-    'SHOW CREATE VIEW': Array('show-create-view'),
-    'SHOW DATABASES': Array('show-databases'),
-    'SHOW ENGINE': Array('show-engine'),
-    'SHOW ENGINES': Array('show-engines'),
-    'SHOW ERRORS': Array('show-errors'),
-    'SHOW EVENTS': Array('show-events'),
-    'SHOW FUNCTION CODE': Array('show-function-code'),
-    'SHOW FUNCTION STATUS': Array('show-function-status'),
-    'SHOW GRANTS': Array('show-grants'),
-    'SHOW INDEX': Array('show-index'),
-    'SHOW MASTER STATUS': Array('show-master-status'),
-    'SHOW OPEN TABLES': Array('show-open-tables'),
-    'SHOW PLUGINS': Array('show-plugins'),
-    'SHOW PRIVILEGES': Array('show-privileges'),
-    'SHOW PROCEDURE CODE': Array('show-procedure-code'),
-    'SHOW PROCEDURE STATUS': Array('show-procedure-status'),
-    'SHOW PROCESSLIST': Array('show-processlist'),
-    'SHOW PROFILE': Array('show-profile'),
-    'SHOW PROFILES': Array('show-profiles'),
-    'SHOW RELAYLOG EVENTS': Array('show-relaylog-events'),
-    'SHOW SLAVE HOSTS': Array('show-slave-hosts'),
-    'SHOW SLAVE STATUS': Array('show-slave-status'),
-    'SHOW STATUS': Array('show-status'),
-    'SHOW TABLE STATUS': Array('show-table-status'),
-    'SHOW TABLES': Array('show-tables'),
-    'SHOW TRIGGERS': Array('show-triggers'),
-    'SHOW VARIABLES': Array('show-variables'),
-    'SHOW WARNINGS': Array('show-warnings'),
-    'LOAD DATA INFILE': Array('load-data'),
-    'LOAD XML': Array('load-xml'),
-    'LOCK TABLES': Array('lock-tables'),
-    'UNLOCK TABLES': Array('lock-tables'),
-    'ALTER DATABASE': Array('alter-database'),
-    'ALTER EVENT': Array('alter-event'),
-    'ALTER LOGFILE GROUP': Array('alter-logfile-group'),
-    'ALTER FUNCTION': Array('alter-function'),
-    'ALTER PROCEDURE': Array('alter-procedure'),
-    'ALTER SERVER': Array('alter-server'),
-    'ALTER TABLE': Array('alter-table'),
-    'ALTER TABLESPACE': Array('alter-tablespace'),
-    'ALTER VIEW': Array('alter-view'),
-    'CREATE DATABASE': Array('create-database'),
-    'CREATE EVENT': Array('create-event'),
-    'CREATE FUNCTION': Array('create-function'),
-    'CREATE INDEX': Array('create-index'),
-    'CREATE LOGFILE GROUP': Array('create-logfile-group'),
-    'CREATE PROCEDURE': Array('create-procedure'),
-    'CREATE SERVER': Array('create-server'),
-    'CREATE TABLE': Array('create-table'),
-    'CREATE TABLESPACE': Array('create-tablespace'),
-    'CREATE TRIGGER': Array('create-trigger'),
-    'CREATE VIEW': Array('create-view'),
-    'DROP DATABASE': Array('drop-database'),
-    'DROP EVENT': Array('drop-event'),
-    'DROP FUNCTION': Array('drop-function'),
-    'DROP INDEX': Array('drop-index'),
-    'DROP LOGFILE GROUP': Array('drop-logfile-group'),
-    'DROP PROCEDURE': Array('drop-procedure'),
-    'DROP SERVER': Array('drop-server'),
-    'DROP TABLE': Array('drop-table'),
-    'DROP TABLESPACE': Array('drop-tablespace'),
-    'DROP TRIGGER': Array('drop-trigger'),
-    'DROP VIEW': Array('drop-view'),
-    'RENAME TABLE': Array('rename-table'),
-    'TRUNCATE TABLE': Array('truncate-table'),
-
-    /* Statements */
-    'SELECT': Array('select'),
-    'SET': Array('set'),
-    'EXPLAIN': Array('explain'),
-    'DESCRIBE': Array('describe'),
-    'DELETE': Array('delete'),
-    'SHOW': Array('show'),
-    'UPDATE': Array('update'),
-    'INSERT': Array('insert'),
-    'REPLACE': Array('replace'),
-    'CALL': Array('call'),
-    'DO': Array('do'),
-    'HANDLER': Array('handler'),
-    'COLLATE': Array('charset-collations'),
-
-    /* Functions */
-    'ABS': Array('mathematical-functions', 'function_abs'),
-    'ACOS': Array('mathematical-functions', 'function_acos'),
-    'ADDDATE': Array('date-and-time-functions', 'function_adddate'),
-    'ADDTIME': Array('date-and-time-functions', 'function_addtime'),
-    'AES_DECRYPT': Array('encryption-functions', 'function_aes_decrypt'),
-    'AES_ENCRYPT': Array('encryption-functions', 'function_aes_encrypt'),
-    'AND': Array('logical-operators', 'operator_and'),
-    'ASCII': Array('string-functions', 'function_ascii'),
-    'ASIN': Array('mathematical-functions', 'function_asin'),
-    'ATAN2': Array('mathematical-functions', 'function_atan2'),
-    'ATAN': Array('mathematical-functions', 'function_atan'),
-    'AVG': Array('group-by-functions', 'function_avg'),
-    'BENCHMARK': Array('information-functions', 'function_benchmark'),
-    'BIN': Array('string-functions', 'function_bin'),
-    'BINARY': Array('cast-functions', 'operator_binary'),
-    'BIT_AND': Array('group-by-functions', 'function_bit_and'),
-    'BIT_COUNT': Array('bit-functions', 'function_bit_count'),
-    'BIT_LENGTH': Array('string-functions', 'function_bit_length'),
-    'BIT_OR': Array('group-by-functions', 'function_bit_or'),
-    'BIT_XOR': Array('group-by-functions', 'function_bit_xor'),
-    'CASE': Array('control-flow-functions', 'operator_case'),
-    'CAST': Array('cast-functions', 'function_cast'),
-    'CEIL': Array('mathematical-functions', 'function_ceil'),
-    'CEILING': Array('mathematical-functions', 'function_ceiling'),
-    'CHAR_LENGTH': Array('string-functions', 'function_char_length'),
-    'CHAR': Array('string-functions', 'function_char'),
-    'CHARACTER_LENGTH': Array('string-functions', 'function_character_length'),
-    'CHARSET': Array('information-functions', 'function_charset'),
-    'COALESCE': Array('comparison-operators', 'function_coalesce'),
-    'COERCIBILITY': Array('information-functions', 'function_coercibility'),
-    'COLLATION': Array('information-functions', 'function_collation'),
-    'COMPRESS': Array('encryption-functions', 'function_compress'),
-    'CONCAT_WS': Array('string-functions', 'function_concat_ws'),
-    'CONCAT': Array('string-functions', 'function_concat'),
-    'CONNECTION_ID': Array('information-functions', 'function_connection_id'),
-    'CONV': Array('mathematical-functions', 'function_conv'),
-    'CONVERT_TZ': Array('date-and-time-functions', 'function_convert_tz'),
-    'Convert': Array('cast-functions', 'function_convert'),
-    'COS': Array('mathematical-functions', 'function_cos'),
-    'COT': Array('mathematical-functions', 'function_cot'),
-    'COUNT': Array('group-by-functions', 'function_count'),
-    'CRC32': Array('mathematical-functions', 'function_crc32'),
-    'CURDATE': Array('date-and-time-functions', 'function_curdate'),
-    'CURRENT_DATE': Array('date-and-time-functions', 'function_current_date'),
-    'CURRENT_TIME': Array('date-and-time-functions', 'function_current_time'),
-    'CURRENT_TIMESTAMP': Array('date-and-time-functions', 'function_current_timestamp'),
-    'CURRENT_USER': Array('information-functions', 'function_current_user'),
-    'CURTIME': Array('date-and-time-functions', 'function_curtime'),
-    'DATABASE': Array('information-functions', 'function_database'),
-    'DATE_ADD': Array('date-and-time-functions', 'function_date_add'),
-    'DATE_FORMAT': Array('date-and-time-functions', 'function_date_format'),
-    'DATE_SUB': Array('date-and-time-functions', 'function_date_sub'),
-    'DATE': Array('date-and-time-functions', 'function_date'),
-    'DATEDIFF': Array('date-and-time-functions', 'function_datediff'),
-    'DAY': Array('date-and-time-functions', 'function_day'),
-    'DAYNAME': Array('date-and-time-functions', 'function_dayname'),
-    'DAYOFMONTH': Array('date-and-time-functions', 'function_dayofmonth'),
-    'DAYOFWEEK': Array('date-and-time-functions', 'function_dayofweek'),
-    'DAYOFYEAR': Array('date-and-time-functions', 'function_dayofyear'),
-    'DECLARE': Array('declare', 'declare'),
-    'DECODE': Array('encryption-functions', 'function_decode'),
-    'DEFAULT': Array('miscellaneous-functions', 'function_default'),
-    'DEGREES': Array('mathematical-functions', 'function_degrees'),
-    'DES_DECRYPT': Array('encryption-functions', 'function_des_decrypt'),
-    'DES_ENCRYPT': Array('encryption-functions', 'function_des_encrypt'),
-    'DIV': Array('arithmetic-functions', 'operator_div'),
-    'ELT': Array('string-functions', 'function_elt'),
-    'ENCODE': Array('encryption-functions', 'function_encode'),
-    'ENCRYPT': Array('encryption-functions', 'function_encrypt'),
-    'EXP': Array('mathematical-functions', 'function_exp'),
-    'EXPORT_SET': Array('string-functions', 'function_export_set'),
-    'EXTRACT': Array('date-and-time-functions', 'function_extract'),
-    'ExtractValue': Array('xml-functions', 'function_extractvalue'),
-    'FIELD': Array('string-functions', 'function_field'),
-    'FIND_IN_SET': Array('string-functions', 'function_find_in_set'),
-    'FLOOR': Array('mathematical-functions', 'function_floor'),
-    'FORMAT': Array('string-functions', 'function_format'),
-    'FOUND_ROWS': Array('information-functions', 'function_found_rows'),
-    'FROM_DAYS': Array('date-and-time-functions', 'function_from_days'),
-    'FROM_UNIXTIME': Array('date-and-time-functions', 'function_from_unixtime'),
-    'GET_FORMAT': Array('date-and-time-functions', 'function_get_format'),
-    'GET_LOCK': Array('miscellaneous-functions', 'function_get_lock'),
-    'GREATEST': Array('comparison-operators', 'function_greatest'),
-    'GROUP_CONCAT': Array('group-by-functions', 'function_group_concat'),
-    'HEX': Array('string-functions', 'function_hex'),
-    'HOUR': Array('date-and-time-functions', 'function_hour'),
-    'IF': Array('control-flow-functions', 'function_if'),
-    'IFNULL': Array('control-flow-functions', 'function_ifnull'),
-    'IN': Array('comparison-operators', 'function_in'),
-    'INET_ATON': Array('miscellaneous-functions', 'function_inet_aton'),
-    'INET_NTOA': Array('miscellaneous-functions', 'function_inet_ntoa'),
-    'INSTR': Array('string-functions', 'function_instr'),
-    'INTERVAL': Array('comparison-operators', 'function_interval'),
-    'IS_FREE_LOCK': Array('miscellaneous-functions', 'function_is_free_lock'),
-    'IS_USED_LOCK': Array('miscellaneous-functions', 'function_is_used_lock'),
-    'IS': Array('comparison-operators', 'operator_is'),
-    'ISNULL': Array('comparison-operators', 'function_isnull'),
-    'LAST_DAY': Array('date-and-time-functions', 'function_last_day'),
-    'LAST_INSERT_ID': Array('information-functions', 'function_last_insert_id'),
-    'LCASE': Array('string-functions', 'function_lcase'),
-    'LEAST': Array('comparison-operators', 'function_least'),
-    'LEFT': Array('string-functions', 'function_left'),
-    'LENGTH': Array('string-functions', 'function_length'),
-    'LIKE': Array('string-comparison-functions', 'operator_like'),
-    'LN': Array('mathematical-functions', 'function_ln'),
-    'LOAD_FILE': Array('string-functions', 'function_load_file'),
-    'LOCALTIME': Array('date-and-time-functions', 'function_localtime'),
-    'LOCALTIMESTAMP': Array('date-and-time-functions', 'function_localtimestamp'),
-    'LOCATE': Array('string-functions', 'function_locate'),
-    'LOG10': Array('mathematical-functions', 'function_log10'),
-    'LOG2': Array('mathematical-functions', 'function_log2'),
-    'LOG': Array('mathematical-functions', 'function_log'),
-    'LOWER': Array('string-functions', 'function_lower'),
-    'LPAD': Array('string-functions', 'function_lpad'),
-    'LTRIM': Array('string-functions', 'function_ltrim'),
-    'MAKE_SET': Array('string-functions', 'function_make_set'),
-    'MAKEDATE': Array('date-and-time-functions', 'function_makedate'),
-    'MAKETIME': Array('date-and-time-functions', 'function_maketime'),
-    'MASTER_POS_WAIT': Array('miscellaneous-functions', 'function_master_pos_wait'),
-    'MATCH': Array('fulltext-search', 'function_match'),
-    'MAX': Array('group-by-functions', 'function_max'),
-    'MD5': Array('encryption-functions', 'function_md5'),
-    'MICROSECOND': Array('date-and-time-functions', 'function_microsecond'),
-    'MID': Array('string-functions', 'function_mid'),
-    'MIN': Array('group-by-functions', 'function_min'),
-    'MINUTE': Array('date-and-time-functions', 'function_minute'),
-    'MOD': Array('mathematical-functions', 'function_mod'),
-    'MONTH': Array('date-and-time-functions', 'function_month'),
-    'MONTHNAME': Array('date-and-time-functions', 'function_monthname'),
-    'NAME_CONST': Array('miscellaneous-functions', 'function_name_const'),
-    'NOT': Array('logical-operators', 'operator_not'),
-    'NOW': Array('date-and-time-functions', 'function_now'),
-    'NULLIF': Array('control-flow-functions', 'function_nullif'),
-    'OCT': Array('mathematical-functions', 'function_oct'),
-    'OCTET_LENGTH': Array('string-functions', 'function_octet_length'),
-    'OLD_PASSWORD': Array('encryption-functions', 'function_old_password'),
-    'OR': Array('logical-operators', 'operator_or'),
-    'ORD': Array('string-functions', 'function_ord'),
-    'PASSWORD': Array('encryption-functions', 'function_password'),
-    'PERIOD_ADD': Array('date-and-time-functions', 'function_period_add'),
-    'PERIOD_DIFF': Array('date-and-time-functions', 'function_period_diff'),
-    'PI': Array('mathematical-functions', 'function_pi'),
-    'POSITION': Array('string-functions', 'function_position'),
-    'POW': Array('mathematical-functions', 'function_pow'),
-    'POWER': Array('mathematical-functions', 'function_power'),
-    'QUARTER': Array('date-and-time-functions', 'function_quarter'),
-    'QUOTE': Array('string-functions', 'function_quote'),
-    'RADIANS': Array('mathematical-functions', 'function_radians'),
-    'RAND': Array('mathematical-functions', 'function_rand'),
-    'REGEXP': Array('regexp', 'operator_regexp'),
-    'RELEASE_LOCK': Array('miscellaneous-functions', 'function_release_lock'),
-    'REPEAT': Array('string-functions', 'function_repeat'),
-    'REVERSE': Array('string-functions', 'function_reverse'),
-    'RIGHT': Array('string-functions', 'function_right'),
-    'RLIKE': Array('regexp', 'operator_rlike'),
-    'ROUND': Array('mathematical-functions', 'function_round'),
-    'ROW_COUNT': Array('information-functions', 'function_row_count'),
-    'RPAD': Array('string-functions', 'function_rpad'),
-    'RTRIM': Array('string-functions', 'function_rtrim'),
-    'SCHEMA': Array('information-functions', 'function_schema'),
-    'SEC_TO_TIME': Array('date-and-time-functions', 'function_sec_to_time'),
-    'SECOND': Array('date-and-time-functions', 'function_second'),
-    'SESSION_USER': Array('information-functions', 'function_session_user'),
-    'SHA': Array('encryption-functions', 'function_sha1'),
-    'SHA1': Array('encryption-functions', 'function_sha1'),
-    'SIGN': Array('mathematical-functions', 'function_sign'),
-    'SIN': Array('mathematical-functions', 'function_sin'),
-    'SLEEP': Array('miscellaneous-functions', 'function_sleep'),
-    'SOUNDEX': Array('string-functions', 'function_soundex'),
-    'SPACE': Array('string-functions', 'function_space'),
-    'SQRT': Array('mathematical-functions', 'function_sqrt'),
-    'STD': Array('group-by-functions', 'function_std'),
-    'STDDEV_POP': Array('group-by-functions', 'function_stddev_pop'),
-    'STDDEV_SAMP': Array('group-by-functions', 'function_stddev_samp'),
-    'STDDEV': Array('group-by-functions', 'function_stddev'),
-    'STR_TO_DATE': Array('date-and-time-functions', 'function_str_to_date'),
-    'STRCMP': Array('string-comparison-functions', 'function_strcmp'),
-    'SUBDATE': Array('date-and-time-functions', 'function_subdate'),
-    'SUBSTR': Array('string-functions', 'function_substr'),
-    'SUBSTRING_INDEX': Array('string-functions', 'function_substring_index'),
-    'SUBSTRING': Array('string-functions', 'function_substring'),
-    'SUBTIME': Array('date-and-time-functions', 'function_subtime'),
-    'SUM': Array('group-by-functions', 'function_sum'),
-    'SYSDATE': Array('date-and-time-functions', 'function_sysdate'),
-    'SYSTEM_USER': Array('information-functions', 'function_system_user'),
-    'TAN': Array('mathematical-functions', 'function_tan'),
-    'TIME_FORMAT': Array('date-and-time-functions', 'function_time_format'),
-    'TIME_TO_SEC': Array('date-and-time-functions', 'function_time_to_sec'),
-    'TIME': Array('date-and-time-functions', 'function_time'),
-    'TIMEDIFF': Array('date-and-time-functions', 'function_timediff'),
-    'TIMESTAMP': Array('date-and-time-functions', 'function_timestamp'),
-    'TIMESTAMPADD': Array('date-and-time-functions', 'function_timestampadd'),
-    'TIMESTAMPDIFF': Array('date-and-time-functions', 'function_timestampdiff'),
-    'TO_DAYS': Array('date-and-time-functions', 'function_to_days'),
-    'TRIM': Array('string-functions', 'function_trim'),
-    'TRUNCATE': Array('mathematical-functions', 'function_truncate'),
-    'UCASE': Array('string-functions', 'function_ucase'),
-    'UNCOMPRESS': Array('encryption-functions', 'function_uncompress'),
-    'UNCOMPRESSED_LENGTH': Array('encryption-functions', 'function_uncompressed_length'),
-    'UNHEX': Array('string-functions', 'function_unhex'),
-    'UNIX_TIMESTAMP': Array('date-and-time-functions', 'function_unix_timestamp'),
-    'UpdateXML': Array('xml-functions', 'function_updatexml'),
-    'UPPER': Array('string-functions', 'function_upper'),
-    'USER': Array('information-functions', 'function_user'),
-    'UTC_DATE': Array('date-and-time-functions', 'function_utc_date'),
-    'UTC_TIME': Array('date-and-time-functions', 'function_utc_time'),
-    'UTC_TIMESTAMP': Array('date-and-time-functions', 'function_utc_timestamp'),
-    'UUID_SHORT': Array('miscellaneous-functions', 'function_uuid_short'),
-    'UUID': Array('miscellaneous-functions', 'function_uuid'),
-    'VALUES': Array('miscellaneous-functions', 'function_values'),
-    'VAR_POP': Array('group-by-functions', 'function_var_pop'),
-    'VAR_SAMP': Array('group-by-functions', 'function_var_samp'),
-    'VARIANCE': Array('group-by-functions', 'function_variance'),
-    'VERSION': Array('information-functions', 'function_version'),
-    'WEEK': Array('date-and-time-functions', 'function_week'),
-    'WEEKDAY': Array('date-and-time-functions', 'function_weekday'),
-    'WEEKOFYEAR': Array('date-and-time-functions', 'function_weekofyear'),
-    'XOR': Array('logical-operators', 'operator_xor'),
-    'YEAR': Array('date-and-time-functions', 'function_year'),
-    'YEARWEEK': Array('date-and-time-functions', 'function_yearweek'),
-    'SOUNDS_LIKE': Array('string-functions', 'operator_sounds-like'),
-    'IS_NOT_NULL': Array('comparison-operators', 'operator_is-not-null'),
-    'IS_NOT': Array('comparison-operators', 'operator_is-not'),
-    'IS_NULL': Array('comparison-operators', 'operator_is-null'),
-    'NOT_LIKE': Array('string-comparison-functions', 'operator_not-like'),
-    'NOT_REGEXP': Array('regexp', 'operator_not-regexp'),
-    'COUNT_DISTINCT': Array('group-by-functions', 'function_count-distinct'),
-    'NOT_IN': Array('comparison-operators', 'function_not-in')
-};
-
-var mysql_doc_builtin = {
-    'TINYINT': Array('numeric-types'),
-    'SMALLINT': Array('numeric-types'),
-    'MEDIUMINT': Array('numeric-types'),
-    'INT': Array('numeric-types'),
-    'BIGINT': Array('numeric-types'),
-    'DECIMAL': Array('numeric-types'),
-    'FLOAT': Array('numeric-types'),
-    'DOUBLE': Array('numeric-types'),
-    'REAL': Array('numeric-types'),
-    'BIT': Array('numeric-types'),
-    'BOOLEAN': Array('numeric-types'),
-    'SERIAL': Array('numeric-types'),
-    'DATE': Array('date-and-time-types'),
-    'DATETIME': Array('date-and-time-types'),
-    'TIMESTAMP': Array('date-and-time-types'),
-    'TIME': Array('date-and-time-types'),
-    'YEAR': Array('date-and-time-types'),
-    'CHAR': Array('string-types'),
-    'VARCHAR': Array('string-types'),
-    'TINYTEXT': Array('string-types'),
-    'TEXT': Array('string-types'),
-    'MEDIUMTEXT': Array('string-types'),
-    'LONGTEXT': Array('string-types'),
-    'BINARY': Array('string-types'),
-    'VARBINARY': Array('string-types'),
-    'TINYBLOB': Array('string-types'),
-    'MEDIUMBLOB': Array('string-types'),
-    'BLOB': Array('string-types'),
-    'LONGBLOB': Array('string-types'),
-    'ENUM': Array('string-types'),
-    'SET': Array('string-types')
-};
diff --git a/#pma/js/error_report.js b/#pma/js/error_report.js
deleted file mode 100644
index 3198ce53..00000000
--- a/#pma/js/error_report.js
+++ /dev/null
@@ -1,310 +0,0 @@
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * general function, usually for data manipulation pages
- *
- */
-
-var ErrorReport = {
-    /**
-     * @var object stores the last exception info
-     */
-    _last_exception: null,
-    /**
-     * handles thrown error exceptions based on user preferences
-     *
-     * @return void
-     */
-    error_handler: function (exception) {
-        if (exception.name === null || typeof(exception.name) == "undefined") {
-            exception.name = ErrorReport._extractExceptionName(exception);
-        }
-        ErrorReport._last_exception = exception;
-        $.get("error_report.php", {
-            ajax_request: true,
-            server: PMA_commonParams.get('server'),
-            token: PMA_commonParams.get('token'),
-            get_settings: true,
-            exception_type: 'js'
-        }, function (data) {
-            if (data.success !== true) {
-                PMA_ajaxShowMessage(data.error, false);
-                return;
-            }
-            if (data.report_setting == "ask") {
-                ErrorReport._showErrorNotification();
-            } else if (data.report_setting == "always") {
-                report_data = ErrorReport._get_report_data(exception);
-                post_data = $.extend(report_data, {
-                    send_error_report: true,
-                    automatic: true
-                });
-                $.post("error_report.php", post_data, function (data) {
-                    if (data.success === false) {
-                        //in the case of an error, show the error message returned.
-                        PMA_ajaxShowMessage(data.error, false);
-                    } else {
-                        PMA_ajaxShowMessage(data.message, false);
-                    }
-                });
-            }
-        });
-    },
-    /**
-     * Shows the modal dialog previewing the report
-     *
-     * @param exception object error report info
-     *
-     * @return void
-     */
-    _showReportDialog: function (exception) {
-        var report_data = ErrorReport._get_report_data(exception);
-
-        /*Remove the hidden dialogs if there are*/
-        if ($('#error_report_dialog').length !== 0) {
-            $('#error_report_dialog').remove();
-        }
-        var $div = $('<div id="error_report_dialog"></div>');
-
-        var button_options = {};
-
-        button_options[PMA_messages.strSendErrorReport] = function () {
-            var $dialog = $(this);
-            var post_data = $.extend(report_data, {
-                send_error_report: true,
-                description: $("#report_description").val(),
-                always_send: $("#always_send_checkbox")[0].checked
-            });
-            $.post("error_report.php", post_data, function (data) {
-                $dialog.dialog('close');
-                if (data.success === false) {
-                    //in the case of an error, show the error message returned.
-                    PMA_ajaxShowMessage(data.error, false);
-                } else {
-                    PMA_ajaxShowMessage(data.message, 3000);
-                }
-            });
-        };
-
-        button_options[PMA_messages.strCancel] = function () {
-            $(this).dialog('close');
-        };
-
-        $.post("error_report.php", report_data, function (data) {
-            if (data.success === false) {
-                //in the case of an error, show the error message returned.
-                PMA_ajaxShowMessage(data.error, false);
-            } else {
-                // Show dialog if the request was successful
-                $div
-                .append(data.message)
-                .dialog({
-                    title: PMA_messages.strSubmitErrorReport,
-                    width: 650,
-                    modal: true,
-                    buttons: button_options,
-                    close: function () {
-                        $(this).remove();
-                    }
-                });
-            }
-        }); // end $.get()
-    },
-    /**
-     * Shows the small notification that asks for user permission
-     *
-     * @return void
-     */
-    _showErrorNotification: function () {
-        ErrorReport._removeErrorNotification();
-
-        var $div = $(
-            '<div style="position:fixed;bottom:0;left:0;right:0;margin:0;' +
-            'z-index:1000" class="error" id="error_notification"></div>'
-        ).append(
-            PMA_getImage("s_error.png") + PMA_messages.strErrorOccurred
-        );
-
-        var $buttons = $('<div class="floatright"></div>');
-
-        var button_html  = '<button id="show_error_report">';
-        button_html += PMA_messages.strShowReportDetails;
-        button_html += '</button>';
-
-        button_html += '<a id="change_error_settings">';
-        button_html += PMA_getImage('s_cog.png', PMA_messages.strChangeReportSettings);
-        button_html += '</a>';
-
-        button_html += '<a href="#" id="ignore_error">';
-        button_html += PMA_getImage('b_close.png', PMA_messages.strIgnore);
-        button_html += '</a>';
-
-        $buttons.html(button_html);
-
-        $div.append($buttons);
-        $div.appendTo(document.body);
-        $("#change_error_settings").on("click", ErrorReport._redirect_to_settings);
-        $("#show_error_report").on("click", ErrorReport._createReportDialog);
-        $("#ignore_error").on("click", ErrorReport._removeErrorNotification);
-    },
-    /**
-     * Removes the notification if it was displayed before
-     *
-     * @return void
-     */
-    _removeErrorNotification: function (e) {
-        if (e) {
-            // don't remove the hash fragment by navigating to #
-            e.preventDefault();
-        }
-        $("#error_notification").fadeOut(function () {
-            $(this).remove();
-        });
-    },
-    /**
-     * Extracts Exception name from message if it exists
-     *
-     * @return String
-     */
-    _extractExceptionName: function (exception) {
-        if (exception.message === null || typeof(exception.message) == "undefined") {
-            return "";
-        }
-
-        var reg = /([a-zA-Z]+):/;
-        var regex_result = reg.exec(exception.message);
-        if (regex_result && regex_result.length == 2) {
-            return regex_result[1];
-        }
-
-        return "";
-    },
-    /**
-     * Shows the modal dialog previewing the report
-     *
-     * @return void
-     */
-    _createReportDialog: function () {
-        ErrorReport._removeErrorNotification();
-        ErrorReport._showReportDialog(ErrorReport._last_exception);
-    },
-    /**
-     * Redirects to the settings page containing error report
-     * preferences
-     *
-     * @return void
-     */
-    _redirect_to_settings: function () {
-        window.location.href = "prefs_forms.php?token=" + PMA_commonParams.get('token');
-    },
-    /**
-     * Returns the report data to send to the server
-     *
-     * @param exception object exception info
-     *
-     * @return object
-     */
-    _get_report_data: function (exception) {
-        var report_data = {
-            "ajax_request": true,
-            "token": PMA_commonParams.get('token'),
-            "exception": exception,
-            "current_url": window.location.href,
-            "exception_type": 'js'
-        };
-        if (AJAX.scriptHandler._scripts.length > 0) {
-            report_data.scripts = AJAX.scriptHandler._scripts.map(
-                function (script) {
-                    return script.name;
-                }
-            );
-        }
-        return report_data;
-    },
-    /**
-     * Wraps all global functions that start with PMA_
-     *
-     * @return void
-     */
-    wrap_global_functions: function () {
-        for (var key in window) {
-            if (key.indexOf("PMA_") === 0) {
-                var global = window[key];
-                if (typeof(global) === "function") {
-                    window[key] = ErrorReport.wrap_function(global);
-                }
-            }
-        }
-    },
-    /**
-     * Wraps given function in error reporting code and returns wrapped function
-     *
-     * @param func function to be wrapped
-     *
-     * @return function
-     */
-    wrap_function: function (func) {
-        if (!func.wrapped) {
-            var new_func = function () {
-                try {
-                    return func.apply(this, arguments);
-                } catch (x) {
-                    TraceKit.report(x);
-                }
-            };
-            new_func.wrapped = true;
-            //Set guid of wrapped function same as original function, so it can be removed
-            //See bug#4146 (problem with jquery draggable and sortable)
-            new_func.guid = func.guid = func.guid || new_func.guid || jQuery.guid++;
-            return new_func;
-        } else {
-            return func;
-        }
-    },
-    /**
-     * Automatically wraps the callback in AJAX.registerOnload
-     *
-     * @return void
-     */
-    _wrap_ajax_onload_callback: function () {
-        var oldOnload = AJAX.registerOnload;
-        AJAX.registerOnload = function (file, func) {
-            func = ErrorReport.wrap_function(func);
-            oldOnload.call(this, file, func);
-        };
-    },
-    /**
-     * Automatically wraps the callback in $.fn.on
-     *
-     * @return void
-     */
-    _wrap_$_on_callback: function () {
-        var oldOn = $.fn.on;
-        $.fn.on = function () {
-            for (var i = 1; i <= 3; i++) {
-                if (typeof(arguments[i]) === "function") {
-                    arguments[i] = ErrorReport.wrap_function(arguments[i]);
-                    break;
-                }
-            }
-            return oldOn.apply(this, arguments);
-        };
-    },
-    /**
-     * Wraps all global functions that start with PMA_
-     * also automatically wraps the callback in AJAX.registerOnload
-     *
-     * @return void
-     */
-    set_up_error_reporting: function () {
-        ErrorReport.wrap_global_functions();
-        ErrorReport._wrap_ajax_onload_callback();
-        ErrorReport._wrap_$_on_callback();
-    }
-
-};
-
-TraceKit.report.subscribe(ErrorReport.error_handler);
-ErrorReport.set_up_error_reporting();
-$(function () {
-    ErrorReport.wrap_global_functions();
-});
diff --git a/#pma/js/export.js b/#pma/js/export.js
deleted file mode 100644
index 09fedd2a..00000000
--- a/#pma/js/export.js
+++ /dev/null
@@ -1,858 +0,0 @@
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Functions used in the export tab
- *
- */
-
-/**
- * Disables the "Dump some row(s)" sub-options
- */
-function disable_dump_some_rows_sub_options()
-{
-    $("label[for='limit_to']").fadeTo('fast', 0.4);
-    $("label[for='limit_from']").fadeTo('fast', 0.4);
-    $("input[type='text'][name='limit_to']").prop('disabled', 'disabled');
-    $("input[type='text'][name='limit_from']").prop('disabled', 'disabled');
-}
-
-/**
- * Enables the "Dump some row(s)" sub-options
- */
-function enable_dump_some_rows_sub_options()
-{
-    $("label[for='limit_to']").fadeTo('fast', 1);
-    $("label[for='limit_from']").fadeTo('fast', 1);
-    $("input[type='text'][name='limit_to']").prop('disabled', '');
-    $("input[type='text'][name='limit_from']").prop('disabled', '');
-}
-
-/**
- * Return template data as a json object
- *
- * @returns template data
- */
-function getTemplateData()
-{
-    var $form = $('form[name="dump"]');
-    var blacklist = ['token', 'server', 'db', 'table', 'single_table',
-        'export_type', 'export_method', 'sql_query', 'template_id'];
-    var obj = {};
-    var arr = $form.serializeArray();
-    $.each(arr, function () {
-        if ($.inArray(this.name, blacklist) < 0) {
-            if (obj[this.name] !== undefined) {
-                if (! obj[this.name].push) {
-                    obj[this.name] = [obj[this.name]];
-                }
-                obj[this.name].push(this.value || '');
-            } else {
-                obj[this.name] = this.value || '';
-            }
-        }
-    });
-    // include unchecked checboxes (which are ignored by serializeArray()) with null
-    // to uncheck them when loading the template
-    $form.find('input[type="checkbox"]:not(:checked)').each(function () {
-        if (obj[this.name] === undefined) {
-            obj[this.name] = null;
-        }
-    });
-    // include empty multiselects
-    $form.find('select').each(function () {
-        if ($(this).find('option:selected').length == 0) {
-            obj[this.name] = [];
-        }
-    });
-    return obj;
-}
-
-/**
- * Create a template with selected options
- *
- * @param name name of the template
- */
-function createTemplate(name)
-{
-    var templateData = getTemplateData();
-
-    var params = {
-        ajax_request : true,
-        token : PMA_commonParams.get('token'),
-        server : PMA_commonParams.get('server'),
-        db : PMA_commonParams.get('db'),
-        table : PMA_commonParams.get('table'),
-        exportType : $('input[name="export_type"]').val(),
-        templateAction : 'create',
-        templateName : name,
-        templateData : JSON.stringify(templateData)
-    };
-
-    PMA_ajaxShowMessage();
-    $.post('tbl_export.php', params, function (response) {
-        if (response.success === true) {
-            $('#templateName').val('');
-            $('#template').html(response.data);
-            $("#template").find("option").each(function() {
-                if ($(this).text() == name) {
-                    $(this).prop('selected', true);
-                }
-            });
-            PMA_ajaxShowMessage(PMA_messages.strTemplateCreated);
-        } else {
-            PMA_ajaxShowMessage(response.error, false);
-        }
-    });
-}
-
-/**
- * Loads a template
- *
- * @param id ID of the template to load
- */
-function loadTemplate(id)
-{
-    var params = {
-        ajax_request : true,
-        token : PMA_commonParams.get('token'),
-        server : PMA_commonParams.get('server'),
-        db : PMA_commonParams.get('db'),
-        table : PMA_commonParams.get('table'),
-        exportType : $('input[name="export_type"]').val(),
-        templateAction : 'load',
-        templateId : id,
-    };
-
-    PMA_ajaxShowMessage();
-    $.post('tbl_export.php', params, function (response) {
-        if (response.success === true) {
-            var $form = $('form[name="dump"]');
-            var options = $.parseJSON(response.data);
-            $.each(options, function (key, value) {
-                var $element = $form.find('[name="' + key + '"]');
-                if ($element.length) {
-                    if (($element.is('input') && $element.attr('type') == 'checkbox') && value === null) {
-                        $element.prop('checked', false);
-                    } else {
-                        if (($element.is('input') && $element.attr('type') == 'checkbox') ||
-                            ($element.is('input') && $element.attr('type') == 'radio') ||
-                            ($element.is('select') && $element.attr('multiple') == 'multiple')) {
-                            if (! value.push) {
-                                value = [value];
-                            }
-                        }
-                        $element.val(value);
-                    }
-                    $element.trigger('change');
-                }
-            });
-            $('input[name="template_id"]').val(id);
-            PMA_ajaxShowMessage(PMA_messages.strTemplateLoaded);
-        } else {
-            PMA_ajaxShowMessage(response.error, false);
-        }
-    });
-}
-
-/**
- * Updates an existing template with current options
- *
- * @param id ID of the template to update
- */
-function updateTemplate(id)
-{
-    var templateData = getTemplateData();
-
-    var params = {
-        ajax_request : true,
-        token : PMA_commonParams.get('token'),
-        server : PMA_commonParams.get('server'),
-        db : PMA_commonParams.get('db'),
-        table : PMA_commonParams.get('table'),
-        exportType : $('input[name="export_type"]').val(),
-        templateAction : 'update',
-        templateId : id,
-        templateData : JSON.stringify(templateData)
-    };
-
-    PMA_ajaxShowMessage();
-    $.post('tbl_export.php', params, function (response) {
-        if (response.success === true) {
-            PMA_ajaxShowMessage(PMA_messages.strTemplateUpdated);
-        } else {
-            PMA_ajaxShowMessage(response.error, false);
-        }
-    });
-}
-
-/**
- * Delete a template
- *
- * @param id ID of the template to delete
- */
-function deleteTemplate(id)
-{
-    var params = {
-        ajax_request : true,
-        token : PMA_commonParams.get('token'),
-        server : PMA_commonParams.get('server'),
-        db : PMA_commonParams.get('db'),
-        table : PMA_commonParams.get('table'),
-        exportType : $('input[name="export_type"]').val(),
-        templateAction : 'delete',
-        templateId : id,
-    };
-
-    PMA_ajaxShowMessage();
-    $.post('tbl_export.php', params, function (response) {
-        if (response.success === true) {
-            $('#template').find('option[value="' + id + '"]').remove();
-            PMA_ajaxShowMessage(PMA_messages.strTemplateDeleted);
-        } else {
-            PMA_ajaxShowMessage(response.error, false);
-        }
-    });
-}
-
-/**
- * Unbind all event handlers before tearing down a page
- */
-AJAX.registerTeardown('export.js', function () {
-    $("#plugins").unbind('change');
-    $("input[type='radio'][name='sql_structure_or_data']").unbind('change');
-    $("input[type='radio'][name$='_structure_or_data']").off('change');
-    $("input[type='radio'][name='output_format']").unbind('change');
-    $("#checkbox_sql_include_comments").unbind('change');
-    $("input[type='radio'][name='quick_or_custom']").unbind('change');
-    $("input[type='radio'][name='allrows']").unbind('change');
-    $('#btn_alias_config').off('click');
-    $('#db_alias_select').off('change');
-    $('.table_alias_select').off('change');
-    $('input[name="table_select[]"]').off('change');
-    $('input[name="table_structure[]"]').off('change');
-    $('input[name="table_data[]"]').off('change');
-    $('#table_structure_all').off('change');
-    $('#table_data_all').off('change');
-    $('input[name="createTemplate"]').off('click');
-    $('select[name="template"]').off('change');
-    $('input[name="updateTemplate"]').off('click');
-    $('input[name="deleteTemplate"]').off('click');
-});
-
-AJAX.registerOnload('export.js', function () {
-
-    /**
-     * Export template handling code
-     */
-    // create a new template
-    $('input[name="createTemplate"]').on('click', function (e) {
-        e.preventDefault();
-        var name = $('input[name="templateName"]').val();
-        if (name.length) {
-            createTemplate(name);
-        }
-    });
-
-    // load an existing template
-    $('select[name="template"]').on('change', function (e) {
-        e.preventDefault();
-        var id = $(this).val();
-        if (id.length) {
-            loadTemplate(id);
-        }
-    });
-
-    // udpate an existing template with new criteria
-    $('input[name="updateTemplate"]').on('click', function (e) {
-        e.preventDefault();
-        var id = $('select[name="template"]').val();
-        if (id.length) {
-            updateTemplate(id);
-        }
-    });
-
-    // delete an existing template
-    $('input[name="deleteTemplate"]').on('click', function (e) {
-        e.preventDefault();
-        var id = $('select[name="template"]').val();
-        if (id.length) {
-            deleteTemplate(id);
-        }
-    });
-
-    /**
-     * Toggles the hiding and showing of each plugin's options
-     * according to the currently selected plugin from the dropdown list
-     */
-    $("#plugins").change(function () {
-        $("#format_specific_opts").find("div.format_specific_options").hide();
-        var selected_plugin_name = $("#plugins").find("option:selected").val();
-        $("#" + selected_plugin_name + "_options").show();
-    });
-
-    /**
-     * Toggles the enabling and disabling of the SQL plugin's comment options that apply only when exporting structure
-     */
-    $("input[type='radio'][name='sql_structure_or_data']").change(function () {
-        var comments_are_present = $("#checkbox_sql_include_comments").prop("checked");
-        var show = $("input[type='radio'][name='sql_structure_or_data']:checked").val();
-        if (show == 'data') {
-            // disable the SQL comment options
-            if (comments_are_present) {
-                $("#checkbox_sql_dates").prop('disabled', true).parent().fadeTo('fast', 0.4);
-            }
-            $("#checkbox_sql_relation").prop('disabled', true).parent().fadeTo('fast', 0.4);
-            $("#checkbox_sql_mime").prop('disabled', true).parent().fadeTo('fast', 0.4);
-        } else {
-            // enable the SQL comment options
-            if (comments_are_present) {
-                $("#checkbox_sql_dates").prop('disabled', false).parent().fadeTo('fast', 1);
-            }
-            $("#checkbox_sql_relation").prop('disabled', false).parent().fadeTo('fast', 1);
-            $("#checkbox_sql_mime").prop('disabled', false).parent().fadeTo('fast', 1);
-        }
-
-        if (show == 'structure') {
-            $('#checkbox_sql_auto_increment').prop('disabled', true).parent().fadeTo('fast', 0.4);
-        } else {
-            $("#checkbox_sql_auto_increment").prop('disabled', false).parent().fadeTo('fast', 1);
-        }
-    });
-
-    // For separate-file exports only ZIP compression is allowed
-    $('input[type="checkbox"][name="as_separate_files"]').change(function(){
-        if ($(this).is(':checked')) {
-            $('#compression').val('zip');
-        }
-    });
-
-    $('#compression').change(function(){
-        if ($('option:selected').val() !== 'zip') {
-            $('input[type="checkbox"][name="as_separate_files"]').prop('checked', false);
-        }
-    });
-
-});
-
-function setup_table_structure_or_data() {
-    if ($("input[name='export_type']").val() != 'database') {
-        return;
-    }
-    var pluginName = $("#plugins").find("option:selected").val();
-    var formElemName = pluginName + "_structure_or_data";
-    var force_structure_or_data = !($("input[name='" + formElemName + "_default']").length);
-
-    if (force_structure_or_data === true) {
-        $('input[name="structure_or_data_forced"]').val(1);
-        $('.export_structure input[type="checkbox"], .export_data input[type="checkbox"]')
-            .prop('disabled', true);
-        $('.export_structure, .export_data').fadeTo('fast', 0.4);
-    } else {
-        $('input[name="structure_or_data_forced"]').val(0);
-        $('.export_structure input[type="checkbox"], .export_data input[type="checkbox"]')
-            .prop('disabled', false);
-        $('.export_structure, .export_data').fadeTo('fast', 1);
-
-        var structure_or_data = $('input[name="' + formElemName + '_default"]').val();
-
-        if (structure_or_data == 'structure') {
-            $('.export_data input[type="checkbox"]')
-                .prop('checked', false);
-        } else if (structure_or_data == 'data') {
-            $('.export_structure input[type="checkbox"]')
-                .prop('checked', false);
-        }
-        if (structure_or_data == 'structure' || structure_or_data == 'structure_and_data') {
-            if (!$('.export_structure input[type="checkbox"]:checked').length) {
-                $('input[name="table_select[]"]:checked')
-                    .closest('tr')
-                    .find('.export_structure input[type="checkbox"]')
-                    .prop('checked', true);
-            }
-        }
-        if (structure_or_data == 'data' || structure_or_data == 'structure_and_data') {
-            if (!$('.export_data input[type="checkbox"]:checked').length) {
-                $('input[name="table_select[]"]:checked')
-                    .closest('tr')
-                    .find('.export_data input[type="checkbox"]')
-                    .prop('checked', true);
-            }
-        }
-
-        check_selected_tables();
-        check_table_select_all();
-    }
-}
-
-/**
- * Toggles the hiding and showing of plugin structure-specific and data-specific
- * options
- */
-function toggle_structure_data_opts()
-{
-    var pluginName = $("select#plugins").val();
-    var radioFormName = pluginName + "_structure_or_data";
-    var dataDiv = "#" + pluginName + "_data";
-    var structureDiv = "#" + pluginName + "_structure";
-    var show = $("input[type='radio'][name='" + radioFormName + "']:checked").val();
-    if (show == 'data') {
-        $(dataDiv).slideDown('slow');
-        $(structureDiv).slideUp('slow');
-    } else {
-        $(structureDiv).slideDown('slow');
-        if (show == 'structure') {
-            $(dataDiv).slideUp('slow');
-        } else {
-            $(dataDiv).slideDown('slow');
-        }
-    }
-}
-
-/**
- * Toggles the disabling of the "save to file" options
- */
-function toggle_save_to_file()
-{
-    var $ulSaveAsfile = $("#ul_save_asfile");
-    if (!$("#radio_dump_asfile").prop("checked")) {
-        $ulSaveAsfile.find("> li").fadeTo('fast', 0.4);
-        $ulSaveAsfile.find("> li > input").prop('disabled', true);
-        $ulSaveAsfile.find("> li > select").prop('disabled', true);
-    } else {
-        $ulSaveAsfile.find("> li").fadeTo('fast', 1);
-        $ulSaveAsfile.find("> li > input").prop('disabled', false);
-        $ulSaveAsfile.find("> li > select").prop('disabled', false);
-    }
-}
-
-AJAX.registerOnload('export.js', function () {
-    toggle_save_to_file();
-    $("input[type='radio'][name='output_format']").change(toggle_save_to_file);
-});
-
-/**
- * For SQL plugin, toggles the disabling of the "display comments" options
- */
-function toggle_sql_include_comments()
-{
-    $("#checkbox_sql_include_comments").change(function () {
-        var $ulIncludeComments = $("#ul_include_comments");
-        if (!$("#checkbox_sql_include_comments").prop("checked")) {
-            $ulIncludeComments.find("> li").fadeTo('fast', 0.4);
-            $ulIncludeComments.find("> li > input").prop('disabled', true);
-        } else {
-            // If structure is not being exported, the comment options for structure should not be enabled
-            if ($("#radio_sql_structure_or_data_data").prop("checked")) {
-                $("#text_sql_header_comment").prop('disabled', false).parent("li").fadeTo('fast', 1);
-            } else {
-                $ulIncludeComments.find("> li").fadeTo('fast', 1);
-                $ulIncludeComments.find("> li > input").prop('disabled', false);
-            }
-        }
-    });
-}
-
-function check_table_select_all() {
-    var total = $('input[name="table_select[]"]').length;
-    var str_checked = $('input[name="table_structure[]"]:checked').length;
-    var data_checked = $('input[name="table_data[]"]:checked').length;
-    var str_all = $('#table_structure_all');
-    var data_all = $('#table_data_all');
-
-    if (str_checked == total) {
-        str_all
-            .prop("indeterminate", false)
-            .prop('checked', true);
-    } else if (str_checked === 0) {
-        str_all
-            .prop("indeterminate", false)
-            .prop('checked', false);
-    } else {
-        str_all
-            .prop("indeterminate", true)
-            .prop('checked', false);
-    }
-
-    if (data_checked == total) {
-        data_all
-            .prop("indeterminate", false)
-            .prop('checked', true);
-    } else if (data_checked === 0) {
-        data_all
-            .prop("indeterminate", false)
-            .prop('checked', false);
-    } else {
-        data_all
-            .prop("indeterminate", true)
-            .prop('checked', false);
-    }
-}
-
-function toggle_table_select_all_str() {
-    var str_all = $('#table_structure_all').is(':checked');
-    if (str_all) {
-        $('input[name="table_structure[]"]').prop('checked', true);
-    } else {
-        $('input[name="table_structure[]"]').prop('checked', false);
-    }
-}
-
-function toggle_table_select_all_data() {
-    var data_all = $('#table_data_all').is(':checked');
-    if (data_all) {
-        $('input[name="table_data[]"]').prop('checked', true);
-    } else {
-        $('input[name="table_data[]"]').prop('checked', false);
-    }
-}
-
-function check_selected_tables(argument) {
-    $('.export_table_select tbody tr').each(function() {
-        check_table_selected(this);
-    });
-}
-
-function check_table_selected(row) {
-    var $row = $(row);
-    var table_select = $row.find('input[name="table_select[]"]');
-    var str_check = $row.find('input[name="table_structure[]"]');
-    var data_check = $row.find('input[name="table_data[]"]');
-
-    var data = data_check.is(':checked:not(:disabled)');
-    var structure = str_check.is(':checked:not(:disabled)');
-
-    if (data && structure) {
-        table_select.prop({checked: true, indeterminate: false});
-    } else if (data || structure) {
-        table_select.prop({checked: true, indeterminate: true});
-    } else {
-        table_select.prop({checked: false, indeterminate: false});
-    }
-}
-
-function toggle_table_select(row) {
-    var $row = $(row);
-    var table_selected = $row.find('input[name="table_select[]"]').is(':checked');
-
-    if (table_selected) {
-        $row.find('input[type="checkbox"]:not(:disabled)').prop('checked', true);
-    } else {
-        $row.find('input[type="checkbox"]:not(:disabled)').prop('checked', false);
-    }
-}
-
-function handleAddProcCheckbox() {
-    if ($('#table_structure_all').is(':checked') === true
-        && $('#table_data_all').is(':checked') === true
-    ) {
-        $('#checkbox_sql_procedure_function').prop('checked', true);
-    } else {
-        $('#checkbox_sql_procedure_function').prop('checked', false);
-    }
-}
-
-AJAX.registerOnload('export.js', function () {
-    /**
-     * For SQL plugin, if "CREATE TABLE options" is checked/unchecked, check/uncheck each of its sub-options
-     */
-    var $create = $("#checkbox_sql_create_table_statements");
-    var $create_options = $("#ul_create_table_statements").find("input");
-    $create.change(function () {
-        $create_options.prop('checked', $(this).prop("checked"));
-    });
-    $create_options.change(function () {
-        if ($create_options.is(":checked")) {
-            $create.prop('checked', true);
-        }
-    });
-
-    /**
-     * Disables the view output as text option if the output must be saved as a file
-     */
-    $("#plugins").change(function () {
-        var active_plugin = $("#plugins").find("option:selected").val();
-        var force_file = $("#force_file_" + active_plugin).val();
-        if (force_file == "true") {
-            if ($("#radio_dump_asfile").prop('checked') !== true) {
-                $("#radio_dump_asfile").prop('checked', true);
-                toggle_save_to_file();
-            }
-            $("#radio_view_as_text").prop('disabled', true).parent().fadeTo('fast', 0.4);
-        } else {
-            $("#radio_view_as_text").prop('disabled', false).parent().fadeTo('fast', 1);
-        }
-    });
-
-    $("input[type='radio'][name$='_structure_or_data']").on('change', function () {
-        toggle_structure_data_opts();
-    });
-
-    $('input[name="table_select[]"]').on('change', function() {
-        toggle_table_select($(this).closest('tr'));
-        check_table_select_all();
-        handleAddProcCheckbox();
-    });
-
-    $('input[name="table_structure[]"]').on('change', function() {
-        check_table_selected($(this).closest('tr'));
-        check_table_select_all();
-        handleAddProcCheckbox();
-    });
-
-    $('input[name="table_data[]"]').on('change', function() {
-        check_table_selected($(this).closest('tr'));
-        check_table_select_all();
-        handleAddProcCheckbox();
-    });
-
-    $('#table_structure_all').on('change', function() {
-        toggle_table_select_all_str();
-        check_selected_tables();
-        handleAddProcCheckbox();
-    });
-
-    $('#table_data_all').on('change', function() {
-        toggle_table_select_all_data();
-        check_selected_tables();
-        handleAddProcCheckbox();
-    });
-
-    if ($("input[name='export_type']").val() == 'database') {
-        // Hide structure or data radio buttons
-        $("input[type='radio'][name$='_structure_or_data']").each(function() {
-            var $this = $(this);
-            var name = $this.prop('name');
-            var val = $('input[name="' + name + '"]:checked').val();
-            var name_default = name + '_default';
-            if (!$('input[name="' + name_default + '"]').length) {
-                $this
-                    .after(
-                        $('<input type="hidden" name="' + name_default + '" value="' + val + '" disabled>')
-                    )
-                    .after(
-                        $('<input type="hidden" name="' + name + '" value="structure_and_data">')
-                    );
-                $this.parent().find('label').remove();
-            } else {
-                $this.parent().remove();
-            }
-        });
-        $("input[type='radio'][name$='_structure_or_data']").remove();
-
-        // Disable CREATE table checkbox for sql
-        var createTableCheckbox = $('#checkbox_sql_create_table');
-        createTableCheckbox.prop('checked', true);
-        var dummyCreateTable = $('#checkbox_sql_create_table')
-            .clone()
-            .removeAttr('id')
-            .attr('type', 'hidden');
-        createTableCheckbox
-            .prop('disabled', true)
-            .after(dummyCreateTable)
-            .parent()
-            .fadeTo('fast', 0.4);
-
-        setup_table_structure_or_data();
-    }
-
-    /**
-     * Handle force structure_or_data
-     */
-    $("#plugins").change(setup_table_structure_or_data);
-});
-
-/**
- * Toggles display of options when quick and custom export are selected
- */
-function toggle_quick_or_custom()
-{
-    if ($("input[name='quick_or_custom']").length === 0 // custom_no_form option
-        || $("#radio_custom_export").prop("checked") // custom
-    ) {
-        $("#databases_and_tables").show();
-        $("#rows").show();
-        $("#output").show();
-        $("#format_specific_opts").show();
-        $("#output_quick_export").hide();
-        var selected_plugin_name = $("#plugins").find("option:selected").val();
-        $("#" + selected_plugin_name + "_options").show();
-    } else { // quick
-        $("#databases_and_tables").hide();
-        $("#rows").hide();
-        $("#output").hide();
-        $("#format_specific_opts").hide();
-        $("#output_quick_export").show();
-    }
-}
-var time_out;
-function check_time_out(time_limit)
-{
-    if (typeof time_limit === 'undefined' || time_limit === 0) {
-        return true;
-    }
-    //margin of one second to avoid race condition to set/access session variable
-    time_limit = time_limit + 1;
-    var href = "export.php";
-    var params = {
-        'ajax_request' : true,
-        'token' : PMA_commonParams.get('token'),
-        'check_time_out' : true
-    };
-    clearTimeout(time_out);
-    time_out = setTimeout(function(){
-        $.get(href, params, function (data) {
-            if (data.message === 'timeout') {
-                PMA_ajaxShowMessage(
-                    '<div class="error">' +
-                    PMA_messages.strTimeOutError +
-                    '</div>',
-                    false
-                );
-            }
-        });
-    }, time_limit * 1000);
-
-}
-
-/**
- * Handler for Database/table alias select
- *
- * @param event object the event object
- *
- * @return void
- */
-function aliasSelectHandler(event) {
-    var sel = event.data.sel;
-    var type = event.data.type;
-    var inputId = $(this).val();
-    var $label = $(this).next('label');
-    $('input#' + $label.attr('for')).addClass('hide');
-    $('input#' + inputId).removeClass('hide');
-    $label.attr('for', inputId);
-    $('#alias_modal ' + sel + '[id$=' + type + ']:visible').addClass('hide');
-    var $inputWrapper = $('#alias_modal ' + sel + '#' + inputId + type);
-    $inputWrapper.removeClass('hide');
-    if (type === '_cols' && $inputWrapper.length > 0) {
-        var outer = $inputWrapper[0].outerHTML;
-        // Replace opening tags
-        var regex = /<dummy_inp/gi;
-        if (outer.match(regex)) {
-            var newTag = outer.replace(regex, '<input');
-            // Replace closing tags
-            regex = /<\/dummy_inp/gi;
-            newTag = newTag.replace(regex, '</input');
-            // Assign replacement
-            $inputWrapper.replaceWith(newTag);
-        }
-    } else if (type === '_tables') {
-        $('.table_alias_select:visible').change();
-    }
-    $("#alias_modal").dialog("option", "position", "center");
-}
-
-/**
- * Handler for Alias dialog box
- *
- * @param event object the event object
- *
- * @return void
- */
-function createAliasModal(event) {
-    event.preventDefault();
-    var dlgButtons = {};
-    dlgButtons[PMA_messages.strResetAll] = function() {
-        $(this).find('input[type="text"]').val('');
-    };
-    dlgButtons[PMA_messages.strReset] = function() {
-        $(this).find('input[type="text"]:visible').val('');
-    };
-    dlgButtons[PMA_messages.strSaveAndClose] = function() {
-        $(this).dialog("close");
-        // do not fillup form submission with empty values
-        $.each($(this).find('input[type="text"]'), function (i, e) {
-            if ($(e).val().trim().length == 0) {
-                $(e).prop('disabled', true);
-            }
-        });
-        $('#alias_modal').parent().appendTo($('form[name="dump"]'));
-    };
-    $('#alias_modal').find('input[type="text"]').prop('disabled', false);
-    $('#alias_modal').dialog({
-        width: Math.min($(window).width() - 100, 700),
-        maxHeight: $(window).height(),
-        modal: true,
-        dialogClass: "alias-dialog",
-        buttons: dlgButtons,
-        create: function() {
-            $(this).css('maxHeight', $(window).height() - 150);
-            $('.alias-dialog .ui-dialog-titlebar-close').remove();
-        },
-        close: function() {
-            var isEmpty = true;
-            $(this).find('input[type="text"]').each(function() {
-                // trim input fields on close
-                $(this).val($(this).val().trim());
-                // check if non empty field present
-                if ($(this).val()) {
-                    isEmpty = false;
-                }
-            });
-            $('input#btn_alias_config').prop('checked', !isEmpty);
-        },
-        position: { my: "center top", at: "center top", of: window }
-    });
-    // Call change event of .table_alias_select
-    $('.table_alias_select:visible').trigger('change');
-}
-
-AJAX.registerOnload('export.js', function () {
-    $("input[type='radio'][name='quick_or_custom']").change(toggle_quick_or_custom);
-
-    $("#scroll_to_options_msg").hide();
-    $("#format_specific_opts").find("div.format_specific_options")
-        .hide()
-        .css({
-            "border": 0,
-            "margin": 0,
-            "padding": 0
-        })
-        .find("h3")
-        .remove();
-    toggle_quick_or_custom();
-    toggle_structure_data_opts();
-    toggle_sql_include_comments();
-    check_table_select_all();
-    handleAddProcCheckbox();
-
-    /**
-     * Initially disables the "Dump some row(s)" sub-options
-     */
-    disable_dump_some_rows_sub_options();
-
-    /**
-     * Disables the "Dump some row(s)" sub-options when it is not selected
-     */
-    $("input[type='radio'][name='allrows']").change(function () {
-        if ($("input[type='radio'][name='allrows']").prop("checked")) {
-            enable_dump_some_rows_sub_options();
-        } else {
-            disable_dump_some_rows_sub_options();
-        }
-    });
-
-    // Open Alias Modal Dialog on click
-    $('#btn_alias_config').on('click', createAliasModal);
-
-    // Database alias select on change event
-    $('#db_alias_select').on(
-        'change',
-        {sel: 'span', type: '_tables'},
-        aliasSelectHandler
-    );
-
-    // Table alias select on change event
-    $('.table_alias_select').on(
-        'change',
-        {sel: 'table', type: '_cols'},
-        aliasSelectHandler
-    );
-});
diff --git a/#pma/js/functions.js b/#pma/js/functions.js
deleted file mode 100644
index 91233ca2..00000000
--- a/#pma/js/functions.js
+++ /dev/null
@@ -1,5013 +0,0 @@
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * general function, usually for data manipulation pages
- *
- */
-
-/**
- * @var sql_box_locked lock for the sqlbox textarea in the querybox
- */
-var sql_box_locked = false;
-
-/**
- * @var array holds elements which content should only selected once
- */
-var only_once_elements = [];
-
-/**
- * @var   int   ajax_message_count   Number of AJAX messages shown since page load
- */
-var ajax_message_count = 0;
-
-/**
- * @var codemirror_editor object containing CodeMirror editor of the query editor in SQL tab
- */
-var codemirror_editor = false;
-
-/**
- * @var codemirror_editor object containing CodeMirror editor of the inline query editor
- */
-var codemirror_inline_editor = false;
-
-/**
- * @var sql_autocomplete_in_progress bool shows if Table/Column name autocomplete AJAX is in progress
- */
-var sql_autocomplete_in_progress = false;
-
-/**
- * @var sql_autocomplete object containing list of columns in each table
- */
-var sql_autocomplete = false;
-
-/**
- * @var sql_autocomplete_default_table string containing default table to autocomplete columns
- */
-var sql_autocomplete_default_table = '';
-
-/**
- * @var central_column_list array to hold the columns in central list per db.
- */
-var central_column_list = [];
-
-/**
- * @var primary_indexes array to hold 'Primary' index columns.
- */
-var primary_indexes = [];
-
-/**
- * @var unique_indexes array to hold 'Unique' index columns.
- */
-var unique_indexes = [];
-
-/**
- * @var indexes array to hold 'Index' columns.
- */
-var indexes = [];
-
-/**
- * @var fulltext_indexes array to hold 'Fulltext' columns.
- */
-var fulltext_indexes = [];
-
-/**
- * @var spatial_indexes array to hold 'Spatial' columns.
- */
-var spatial_indexes = [];
-
-/**
- * Make sure that ajax requests will not be cached
- * by appending a random variable to their parameters
- */
-$.ajaxPrefilter(function (options, originalOptions, jqXHR) {
-    var nocache = new Date().getTime() + "" + Math.floor(Math.random() * 1000000);
-    if (typeof options.data == "string") {
-        options.data += "&_nocache=" + nocache;
-    } else if (typeof options.data == "object") {
-        options.data = $.extend(originalOptions.data, {'_nocache' : nocache});
-    }
-});
-
-/*
- * Adds a date/time picker to an element
- *
- * @param object  $this_element   a jQuery object pointing to the element
- */
-function PMA_addDatepicker($this_element, type, options)
-{
-    var showTimepicker = true;
-    if (type=="date") {
-        showTimepicker = false;
-    }
-
-    var defaultOptions = {
-        showOn: 'button',
-        buttonImage: themeCalendarImage, // defined in js/messages.php
-        buttonImageOnly: true,
-        stepMinutes: 1,
-        stepHours: 1,
-        showSecond: true,
-        showMillisec: true,
-        showMicrosec: true,
-        showTimepicker: showTimepicker,
-        showButtonPanel: false,
-        dateFormat: 'yy-mm-dd', // yy means year with four digits
-        timeFormat: 'HH:mm:ss.lc',
-        constrainInput: false,
-        altFieldTimeOnly: false,
-        showAnim: '',
-        beforeShow: function (input, inst) {
-            // Remember that we came from the datepicker; this is used
-            // in tbl_change.js by verificationsAfterFieldChange()
-            $this_element.data('comes_from', 'datepicker');
-            if ($(input).closest('.cEdit').length > 0) {
-                setTimeout(function () {
-                    inst.dpDiv.css({
-                        top: 0,
-                        left: 0,
-                        position: 'relative'
-                    });
-                }, 0);
-            }
-            // Fix wrong timepicker z-index, doesn't work without timeout
-            setTimeout(function () {
-                $('#ui-timepicker-div').css('z-index', $('#ui-datepicker-div').css('z-index'));
-            }, 0);
-        },
-        onSelect: function() {
-            $this_element.data('datepicker').inline = true;
-        },
-        onClose: function (dateText, dp_inst) {
-            // The value is no more from the date picker
-            $this_element.data('comes_from', '');
-            if (typeof $this_element.data('datepicker') !== 'undefined') {
-                $this_element.data('datepicker').inline = false;
-            }
-        }
-    };
-    if (type == "datetime" || type == "timestamp") {
-        $this_element.datetimepicker($.extend(defaultOptions, options));
-    }
-    else if (type == "date") {
-        $this_element.datetimepicker($.extend(defaultOptions, options));
-    }
-    else if (type == "time") {
-        $this_element.timepicker($.extend(defaultOptions, options));
-        // Add a tip regarding entering MySQL allowed-values for TIME data-type
-        PMA_tooltip($this_element, 'input', PMA_messages.strMysqlAllowedValuesTip);
-    }
-}
-
-/**
- * Add a date/time picker to each element that needs it
- * (only when jquery-ui-timepicker-addon.js is loaded)
- */
-function addDateTimePicker() {
-    if ($.timepicker !== undefined) {
-        $('input.timefield, input.datefield, input.datetimefield').each(function () {
-
-            var decimals = $(this).parent().attr('data-decimals');
-            var type = $(this).parent().attr('data-type');
-
-            var showMillisec = false;
-            var showMicrosec = false;
-            var timeFormat = 'HH:mm:ss';
-            // check for decimal places of seconds
-            if (decimals > 0 && type.indexOf('time') != -1){
-                if (decimals > 3) {
-                    showMillisec = true;
-                    showMicrosec = true;
-                    timeFormat = 'HH:mm:ss.lc';
-                } else {
-                    showMillisec = true;
-                    timeFormat = 'HH:mm:ss.l';
-                }
-            }
-            PMA_addDatepicker($(this), type, {
-                showMillisec: showMillisec,
-                showMicrosec: showMicrosec,
-                timeFormat: timeFormat
-            });
-
-            // Add a tip regarding entering MySQL allowed-values
-            // for TIME and DATE data-type
-            if ($(this).hasClass('timefield')) {
-                PMA_tooltip($(this), 'input', PMA_messages.strMysqlAllowedValuesTipTime);
-            } else if ($(this).hasClass('datefield')) {
-                PMA_tooltip($(this), 'input', PMA_messages.strMysqlAllowedValuesTipDate);
-            }
-        });
-    }
-}
-
-/**
- * Handle redirect and reload flags sent as part of AJAX requests
- *
- * @param data ajax response data
- */
-function PMA_handleRedirectAndReload(data) {
-    if (parseInt(data.redirect_flag) == 1) {
-        // add one more GET param to display session expiry msg
-        if (window.location.href.indexOf('?') === -1) {
-            window.location.href += '?session_expired=1';
-        } else {
-            window.location.href += '&session_expired=1';
-        }
-        window.location.reload();
-    } else if (parseInt(data.reload_flag) == 1) {
-        // remove the token param and reload
-        window.location.href = window.location.href.replace(/&?token=[^&#]*/g, "");
-        window.location.reload();
-    }
-}
-
-/**
- * Creates an SQL editor which supports auto completing etc.
- *
- * @param $textarea   jQuery object wrapping the textarea to be made the editor
- * @param options     optional options for CodeMirror
- * @param resize      optional resizing ('vertical', 'horizontal', 'both')
- * @param lintOptions additional options for lint
- */
-function PMA_getSQLEditor($textarea, options, resize, lintOptions) {
-    if ($textarea.length > 0 && typeof CodeMirror !== 'undefined') {
-
-        // merge options for CodeMirror
-        var defaults = {
-            lineNumbers: true,
-            matchBrackets: true,
-            extraKeys: {"Ctrl-Space": "autocomplete"},
-            hintOptions: {"completeSingle": false, "completeOnSingleClick": true},
-            indentUnit: 4,
-            mode: "text/x-mysql",
-            lineWrapping: true
-        };
-
-        if (CodeMirror.sqlLint) {
-            $.extend(defaults, {
-                gutters: ["CodeMirror-lint-markers"],
-                lint: {
-                    "getAnnotations": CodeMirror.sqlLint,
-                    "async": true,
-                    "lintOptions": lintOptions
-                }
-            });
-        }
-
-        $.extend(true, defaults, options);
-
-        // create CodeMirror editor
-        var codemirrorEditor = CodeMirror.fromTextArea($textarea[0], defaults);
-        // allow resizing
-        if (! resize) {
-            resize = 'vertical';
-        }
-        var handles = '';
-        if (resize == 'vertical') {
-            handles = 's';
-        }
-        if (resize == 'both') {
-            handles = 'all';
-        }
-        if (resize == 'horizontal') {
-            handles = 'e, w';
-        }
-        $(codemirrorEditor.getWrapperElement())
-            .css('resize', resize)
-            .resizable({
-                handles: handles,
-                resize: function() {
-                    codemirrorEditor.setSize($(this).width(), $(this).height());
-                }
-            });
-        // enable autocomplete
-        codemirrorEditor.on("inputRead", codemirrorAutocompleteOnInputRead);
-
-        return codemirrorEditor;
-    }
-    return null;
-}
-
-/**
- * Clear text selection
- */
-function PMA_clearSelection() {
-    if (document.selection && document.selection.empty) {
-        document.selection.empty();
-    } else if (window.getSelection) {
-        var sel = window.getSelection();
-        if (sel.empty) {
-            sel.empty();
-        }
-        if (sel.removeAllRanges) {
-            sel.removeAllRanges();
-        }
-    }
-}
-
-/**
- * Create a jQuery UI tooltip
- *
- * @param $elements     jQuery object representing the elements
- * @param item          the item
- *                      (see https://api.jqueryui.com/tooltip/#option-items)
- * @param myContent     content of the tooltip
- * @param additionalOptions to override the default options
- *
- */
-function PMA_tooltip($elements, item, myContent, additionalOptions)
-{
-    if ($('#no_hint').length > 0) {
-        return;
-    }
-
-    var defaultOptions = {
-        content: myContent,
-        items:  item,
-        tooltipClass: "tooltip",
-        track: true,
-        show: false,
-        hide: false
-    };
-
-    $elements.tooltip($.extend(true, defaultOptions, additionalOptions));
-}
-
-/**
- * HTML escaping
- */
-
-function escapeHtml(unsafe) {
-    if (typeof(unsafe) != 'undefined') {
-        return unsafe
-            .toString()
-            .replace(/&/g, "&amp;")
-            .replace(/</g, "&lt;")
-            .replace(/>/g, "&gt;")
-            .replace(/"/g, "&quot;")
-            .replace(/'/g, "&#039;");
-    } else {
-        return false;
-    }
-}
-
-function escapeJsString(unsafe) {
-    if (typeof(unsafe) != 'undefined') {
-        return unsafe
-            .toString()
-            .replace("\000", '')
-            .replace('\\', '\\\\')
-            .replace('\'', '\\\'')
-            .replace("&#039;", "\\\&#039;")
-            .replace('"', '\"')
-            .replace("&quot;", "\&quot;")
-            .replace("\n", '\n')
-            .replace("\r", '\r')
-            .replace(/<\/script/gi, '</\' + \'script')
-    } else {
-        return false;
-    }
-}
-
-function PMA_sprintf() {
-    return sprintf.apply(this, arguments);
-}
-
-/**
- * Hides/shows the default value input field, depending on the default type
- * Ticks the NULL checkbox if NULL is chosen as default value.
- */
-function PMA_hideShowDefaultValue($default_type)
-{
-    if ($default_type.val() == 'USER_DEFINED') {
-        $default_type.siblings('.default_value').show().focus();
-    } else {
-        $default_type.siblings('.default_value').hide();
-        if ($default_type.val() == 'NULL') {
-            var $null_checkbox = $default_type.closest('tr').find('.allow_null');
-            $null_checkbox.prop('checked', true);
-        }
-    }
-}
-
-/**
- * Hides/shows the input field for column expression based on whether
- * VIRTUAL/PERSISTENT is selected
- *
- * @param $virtuality virtuality dropdown
- */
-function PMA_hideShowExpression($virtuality)
-{
-    if ($virtuality.val() === '') {
-        $virtuality.siblings('.expression').hide();
-    } else {
-        $virtuality.siblings('.expression').show();
-    }
-}
-
-/**
- * Show notices for ENUM columns; add/hide the default value
- *
- */
-function PMA_verifyColumnsProperties()
-{
-    $("select.column_type").each(function () {
-        PMA_showNoticeForEnum($(this));
-    });
-    $("select.default_type").each(function () {
-        PMA_hideShowDefaultValue($(this));
-    });
-    $('select.virtuality').each(function () {
-        PMA_hideShowExpression($(this));
-    });
-}
-
-/**
- * Add a hidden field to the form to indicate that this will be an
- * Ajax request (only if this hidden field does not exist)
- *
- * @param $form object   the form
- */
-function PMA_prepareForAjaxRequest($form)
-{
-    if (! $form.find('input:hidden').is('#ajax_request_hidden')) {
-        $form.append('<input type="hidden" id="ajax_request_hidden" name="ajax_request" value="true" />');
-    }
-}
-
-/**
- * Generate a new password and copy it to the password input areas
- *
- * @param passwd_form object   the form that holds the password fields
- *
- * @return boolean  always true
- */
-function suggestPassword(passwd_form)
-{
-    // restrict the password to just letters and numbers to avoid problems:
-    // "editors and viewers regard the password as multiple words and
-    // things like double click no longer work"
-    var pwchars = "abcdefghijklmnopqrstuvwxyz0123456789ABCDEFGHIJKLMNOPQRSTUVWYXZ";
-    var passwordlength = 16;    // do we want that to be dynamic?  no, keep it simple :)
-    var passwd = passwd_form.generated_pw;
-    var randomWords = new Int32Array(passwordlength);
-
-    passwd.value = '';
-
-    // First we're going to try to use a built-in CSPRNG
-    if (window.crypto && window.crypto.getRandomValues) {
-        window.crypto.getRandomValues(randomWords);
-    }
-    // Because of course IE calls it msCrypto instead of being standard
-    else if (window.msCrypto && window.msCrypto.getRandomValues) {
-        window.msCrypto.getRandomValues(randomWords);
-    } else {
-        // Fallback to Math.random
-        for (var i = 0; i < passwordlength; i++) {
-            randomWords[i] = Math.floor(Math.random() * pwchars.length);
-        }
-    }
-
-    for (var i = 0; i < passwordlength; i++) {
-        passwd.value += pwchars.charAt(Math.abs(randomWords[i]) % pwchars.length);
-    }
-
-    passwd_form.text_pma_pw.value = passwd.value;
-    passwd_form.text_pma_pw2.value = passwd.value;
-    return true;
-}
-
-/**
- * Version string to integer conversion.
- */
-function parseVersionString(str)
-{
-    if (typeof(str) != 'string') { return false; }
-    var add = 0;
-    // Parse possible alpha/beta/rc/
-    var state = str.split('-');
-    if (state.length >= 2) {
-        if (state[1].substr(0, 2) == 'rc') {
-            add = - 20 - parseInt(state[1].substr(2), 10);
-        } else if (state[1].substr(0, 4) == 'beta') {
-            add =  - 40 - parseInt(state[1].substr(4), 10);
-        } else if (state[1].substr(0, 5) == 'alpha') {
-            add =  - 60 - parseInt(state[1].substr(5), 10);
-        } else if (state[1].substr(0, 3) == 'dev') {
-            /* We don't handle dev, it's git snapshot */
-            add = 0;
-        }
-    }
-    // Parse version
-    var x = str.split('.');
-    // Use 0 for non existing parts
-    var maj = parseInt(x[0], 10) || 0;
-    var min = parseInt(x[1], 10) || 0;
-    var pat = parseInt(x[2], 10) || 0;
-    var hotfix = parseInt(x[3], 10) || 0;
-    return  maj * 100000000 + min * 1000000 + pat * 10000 + hotfix * 100 + add;
-}
-
-/**
- * Indicates current available version on main page.
- */
-function PMA_current_version(data)
-{
-    if (data && data.version && data.date) {
-        var current = parseVersionString($('span.version').text());
-        var latest = parseVersionString(data.version);
-        var url = 'https://web.phpmyadmin.net/files/' + escapeHtml(data.version) + '/';
-        var version_information_message = '<span class="latest">' +
-            PMA_messages.strLatestAvailable +
-            ' <a href="' + url + '">' + escapeHtml(data.version) + '</a>' +
-            '</span>';
-        if (latest > current) {
-            var message = PMA_sprintf(
-                PMA_messages.strNewerVersion,
-                escapeHtml(data.version),
-                escapeHtml(data.date)
-            );
-            var htmlClass = 'notice';
-            if (Math.floor(latest / 10000) === Math.floor(current / 10000)) {
-                /* Security update */
-                htmlClass = 'error';
-            }
-            $('#newer_version_notice').remove();
-            $('#maincontainer').after('<div id="newer_version_notice" class="' + htmlClass + '"><a href="' + url + '">' + message + '</a></div>');
-        }
-        if (latest === current) {
-            version_information_message = ' (' + PMA_messages.strUpToDate + ')';
-        }
-        var $liPmaVersion = $('#li_pma_version');
-        $liPmaVersion.find('span.latest').remove();
-        $liPmaVersion.append(version_information_message);
-    }
-}
-
-/**
- * Loads Git revision data from ajax for index.php
- */
-function PMA_display_git_revision()
-{
-    $('#is_git_revision').remove();
-    $('#li_pma_version_git').remove();
-    $.get(
-        "index.php",
-        {
-            "server": PMA_commonParams.get('server'),
-            "token": PMA_commonParams.get('token'),
-            "git_revision": true,
-            "ajax_request": true,
-            "no_debug": true
-        },
-        function (data) {
-            if (typeof data !== 'undefined' && data.success === true) {
-                $(data.message).insertAfter('#li_pma_version');
-            }
-        }
-    );
-}
-
-/**
- * for libraries/display_change_password.lib.php
- *     libraries/user_password.php
- *
- */
-
-function displayPasswordGenerateButton()
-{
-    $('#tr_element_before_generate_password').parent().append('<tr class="vmiddle"><td>' + PMA_messages.strGeneratePassword + '</td><td><input type="button" class="button" id="button_generate_password" value="' + PMA_messages.strGenerate + '" onclick="suggestPassword(this.form)" /><input type="text" name="generated_pw" id="generated_pw" /></td></tr>');
-    $('#div_element_before_generate_password').parent().append('<div class="item"><label for="button_generate_password">' + PMA_messages.strGeneratePassword + ':</label><span class="options"><input type="button" class="button" id="button_generate_password" value="' + PMA_messages.strGenerate + '" onclick="suggestPassword(this.form)" /></span><input type="text" name="generated_pw" id="generated_pw" /></div>');
-}
-
-/**
- * selects the content of a given object, f.e. a textarea
- *
- * @param element     object  element of which the content will be selected
- * @param lock        var     variable which holds the lock for this element
- *                              or true, if no lock exists
- * @param only_once   boolean if true this is only done once
- *                              f.e. only on first focus
- */
-function selectContent(element, lock, only_once)
-{
-    if (only_once && only_once_elements[element.name]) {
-        return;
-    }
-
-    only_once_elements[element.name] = true;
-
-    if (lock) {
-        return;
-    }
-
-    element.select();
-}
-
-/**
- * Displays a confirmation box before submitting a "DROP/DELETE/ALTER" query.
- * This function is called while clicking links
- *
- * @param theLink     object the link
- * @param theSqlQuery object the sql query to submit
- *
- * @return boolean  whether to run the query or not
- */
-function confirmLink(theLink, theSqlQuery)
-{
-    // Confirmation is not required in the configuration file
-    // or browser is Opera (crappy js implementation)
-    if (PMA_messages.strDoYouReally === '' || typeof(window.opera) != 'undefined') {
-        return true;
-    }
-
-    var is_confirmed = confirm(PMA_sprintf(PMA_messages.strDoYouReally, theSqlQuery));
-    if (is_confirmed) {
-        if ($(theLink).hasClass('formLinkSubmit')) {
-            var name = 'is_js_confirmed';
-
-            if ($(theLink).attr('href').indexOf('usesubform') != -1) {
-                var matches = $(theLink).attr('href').substr('#').match(/usesubform\[(\d+)\]/i);
-                if (matches != null) {
-                    name = 'subform[' + matches[1] + '][is_js_confirmed]';
-                }
-            }
-
-            $(theLink).parents('form').append('<input type="hidden" name="' + name + '" value="1" />');
-        } else if (typeof(theLink.href) != 'undefined') {
-            theLink.href += '&is_js_confirmed=1';
-        } else if (typeof(theLink.form) != 'undefined') {
-            theLink.form.action += '?is_js_confirmed=1';
-        }
-    }
-
-    return is_confirmed;
-} // end of the 'confirmLink()' function
-
-/**
- * Confirms a "DROP/DELETE/ALTER" query before
- * submitting it if required.
- * This function is called by the 'checkSqlQuery()' js function.
- *
- * @param theForm1 object   the form
- * @param sqlQuery1 object  the sql query textarea
- *
- * @return boolean  whether to run the query or not
- *
- * @see     checkSqlQuery()
- */
-function confirmQuery(theForm1, sqlQuery1)
-{
-    // Confirmation is not required in the configuration file
-    if (PMA_messages.strDoYouReally === '') {
-        return true;
-    }
-
-    // Confirms a "DROP/DELETE/ALTER/TRUNCATE" statement
-    //
-    // TODO: find a way (if possible) to use the parser-analyser
-    // for this kind of verification
-    // For now, I just added a ^ to check for the statement at
-    // beginning of expression
-
-    var do_confirm_re_0 = new RegExp('^\\s*DROP\\s+(IF EXISTS\\s+)?(TABLE|PROCEDURE)\\s', 'i');
-    var do_confirm_re_1 = new RegExp('^\\s*ALTER\\s+TABLE\\s+((`[^`]+`)|([A-Za-z0-9_$]+))\\s+DROP\\s', 'i');
-    var do_confirm_re_2 = new RegExp('^\\s*DELETE\\s+FROM\\s', 'i');
-    var do_confirm_re_3 = new RegExp('^\\s*TRUNCATE\\s', 'i');
-
-    if (do_confirm_re_0.test(sqlQuery1.value) ||
-        do_confirm_re_1.test(sqlQuery1.value) ||
-        do_confirm_re_2.test(sqlQuery1.value) ||
-        do_confirm_re_3.test(sqlQuery1.value)) {
-        var message;
-        if (sqlQuery1.value.length > 100) {
-            message = sqlQuery1.value.substr(0, 100) + '\n    ...';
-        } else {
-            message = sqlQuery1.value;
-        }
-        var is_confirmed = confirm(PMA_sprintf(PMA_messages.strDoYouReally, message));
-        // statement is confirmed -> update the
-        // "is_js_confirmed" form field so the confirm test won't be
-        // run on the server side and allows to submit the form
-        if (is_confirmed) {
-            theForm1.elements.is_js_confirmed.value = 1;
-            return true;
-        }
-        // statement is rejected -> do not submit the form
-        else {
-            window.focus();
-            sqlQuery1.focus();
-            return false;
-        } // end if (handle confirm box result)
-    } // end if (display confirm box)
-
-    return true;
-} // end of the 'confirmQuery()' function
-
-/**
- * Displays an error message if the user submitted the sql query form with no
- * sql query, else checks for "DROP/DELETE/ALTER" statements
- *
- * @param theForm object the form
- *
- * @return boolean  always false
- *
- * @see     confirmQuery()
- */
-function checkSqlQuery(theForm)
-{
-    // get the textarea element containing the query
-    var sqlQuery;
-    if (codemirror_editor) {
-        codemirror_editor.save();
-        sqlQuery = codemirror_editor.getValue();
-    } else {
-        sqlQuery = theForm.elements.sql_query.value;
-    }
-    var isEmpty  = 1;
-    var space_re = new RegExp('\\s+');
-    if (typeof(theForm.elements.sql_file) != 'undefined' &&
-            theForm.elements.sql_file.value.replace(space_re, '') !== '') {
-        return true;
-    }
-    if (isEmpty && typeof(theForm.elements.id_bookmark) != 'undefined' &&
-            (theForm.elements.id_bookmark.value !== null || theForm.elements.id_bookmark.value !== '') &&
-            theForm.elements.id_bookmark.selectedIndex !== 0) {
-        return true;
-    }
-    // Checks for "DROP/DELETE/ALTER" statements
-    if (sqlQuery.replace(space_re, '') !== '') {
-        return confirmQuery(theForm, sqlQuery);
-    }
-    theForm.reset();
-    isEmpty = 1;
-
-    if (isEmpty) {
-        alert(PMA_messages.strFormEmpty);
-        codemirror_editor.focus();
-        return false;
-    }
-
-    return true;
-} // end of the 'checkSqlQuery()' function
-
-/**
- * Check if a form's element is empty.
- * An element containing only spaces is also considered empty
- *
- * @param object   the form
- * @param string   the name of the form field to put the focus on
- *
- * @return boolean  whether the form field is empty or not
- */
-function emptyCheckTheField(theForm, theFieldName)
-{
-    var theField = theForm.elements[theFieldName];
-    var space_re = new RegExp('\\s+');
-    return theField.value.replace(space_re, '') === '';
-} // end of the 'emptyCheckTheField()' function
-
-/**
- * Ensures a value submitted in a form is numeric and is in a range
- *
- * @param object   the form
- * @param string   the name of the form field to check
- * @param integer  the minimum authorized value
- * @param integer  the maximum authorized value
- *
- * @return boolean  whether a valid number has been submitted or not
- */
-function checkFormElementInRange(theForm, theFieldName, message, min, max)
-{
-    var theField         = theForm.elements[theFieldName];
-    var val              = parseInt(theField.value, 10);
-
-    if (typeof(min) == 'undefined') {
-        min = 0;
-    }
-    if (typeof(max) == 'undefined') {
-        max = Number.MAX_VALUE;
-    }
-
-    // It's not a number
-    if (isNaN(val)) {
-        theField.select();
-        alert(PMA_messages.strEnterValidNumber);
-        theField.focus();
-        return false;
-    }
-    // It's a number but it is not between min and max
-    else if (val < min || val > max) {
-        theField.select();
-        alert(PMA_sprintf(message, val));
-        theField.focus();
-        return false;
-    }
-    // It's a valid number
-    else {
-        theField.value = val;
-    }
-    return true;
-
-} // end of the 'checkFormElementInRange()' function
-
-
-function checkTableEditForm(theForm, fieldsCnt)
-{
-    // TODO: avoid sending a message if user just wants to add a line
-    // on the form but has not completed at least one field name
-
-    var atLeastOneField = 0;
-    var i, elm, elm2, elm3, val, id;
-
-    for (i = 0; i < fieldsCnt; i++) {
-        id = "#field_" + i + "_2";
-        elm = $(id);
-        val = elm.val();
-        if (val == 'VARCHAR' || val == 'CHAR' || val == 'BIT' || val == 'VARBINARY' || val == 'BINARY') {
-            elm2 = $("#field_" + i + "_3");
-            val = parseInt(elm2.val(), 10);
-            elm3 = $("#field_" + i + "_1");
-            if (isNaN(val) && elm3.val() !== "") {
-                elm2.select();
-                alert(PMA_messages.strEnterValidLength);
-                elm2.focus();
-                return false;
-            }
-        }
-
-        if (atLeastOneField === 0) {
-            id = "field_" + i + "_1";
-            if (!emptyCheckTheField(theForm, id)) {
-                atLeastOneField = 1;
-            }
-        }
-    }
-    if (atLeastOneField === 0) {
-        var theField = theForm.elements.field_0_1;
-        alert(PMA_messages.strFormEmpty);
-        theField.focus();
-        return false;
-    }
-
-    // at least this section is under jQuery
-    var $input = $("input.textfield[name='table']");
-    if ($input.val() === "") {
-        alert(PMA_messages.strFormEmpty);
-        $input.focus();
-        return false;
-    }
-
-    return true;
-} // enf of the 'checkTableEditForm()' function
-
-/**
- * True if last click is to check a row.
- */
-var last_click_checked = false;
-
-/**
- * Zero-based index of last clicked row.
- * Used to handle the shift + click event in the code above.
- */
-var last_clicked_row = -1;
-
-/**
- * Zero-based index of last shift clicked row.
- */
-var last_shift_clicked_row = -1;
-
-var _idleSecondsCounter = 0;
-var IncInterval;
-var updateTimeout;
-AJAX.registerTeardown('functions.js', function () {
-    clearTimeout(updateTimeout);
-    clearInterval(IncInterval);
-    $(document).off('mousemove');
-});
-
-AJAX.registerOnload('functions.js', function () {
-    document.onclick = function() {
-        _idleSecondsCounter = 0;
-    };
-    $(document).on('mousemove',function() {
-        _idleSecondsCounter = 0;
-    });
-    document.onkeypress = function() {
-        _idleSecondsCounter = 0;
-    };
-
-    function SetIdleTime() {
-        _idleSecondsCounter++;
-    }
-    function UpdateIdleTime() {
-        var href = 'index.php';
-        var params = {
-                'ajax_request' : true,
-                'token' : PMA_commonParams.get('token'),
-                'server' : PMA_commonParams.get('server'),
-                'db' : PMA_commonParams.get('db'),
-                'access_time':_idleSecondsCounter
-            };
-        $.ajax({
-                type: 'POST',
-                url: href,
-                data: params,
-                success: function (data) {
-                    if (data.success) {
-                        var remaining = PMA_commonParams.get('LoginCookieValidity') - _idleSecondsCounter;
-                        if (remaining > 5) {
-                            // max value for setInterval() function
-                            var interval = Math.min(remaining * 1000, Math.pow(2, 31) - 1);
-                            updateTimeout = window.setTimeout(UpdateIdleTime, interval);
-                        } else if (remaining > 0) {
-                            // We're close to session expiry
-                            updateTimeout = window.setTimeout(UpdateIdleTime, 2000);
-                        }
-                    } else { //timeout occurred
-                        if(isStorageSupported('sessionStorage')){
-                            window.sessionStorage.clear();
-                        }
-                        window.location.reload(true);
-                        clearInterval(IncInterval);
-                    }
-                }
-            });
-    }
-    if (PMA_commonParams.get('logged_in') && PMA_commonParams.get('auth_type') == 'cookie') {
-        IncInterval = window.setInterval(SetIdleTime, 1000);
-        var interval = (PMA_commonParams.get('LoginCookieValidity') - 5) * 1000;
-        if (interval > Math.pow(2, 31) - 1) { // max value for setInterval() function
-            interval = Math.pow(2, 31) - 1;
-        }
-        updateTimeout = window.setTimeout(UpdateIdleTime, interval);
-    }
-});
-/**
- * Unbind all event handlers before tearing down a page
- */
-AJAX.registerTeardown('functions.js', function () {
-    $(document).off('click', 'input:checkbox.checkall');
-});
-AJAX.registerOnload('functions.js', function () {
-    /**
-     * Row marking in horizontal mode (use "on" so that it works also for
-     * next pages reached via AJAX); a tr may have the class noclick to remove
-     * this behavior.
-     */
-
-    $(document).on('click', 'input:checkbox.checkall', function (e) {
-        $this = $(this);
-        var $tr = $this.closest('tr');
-        var $table = $this.closest('table');
-
-        if (!e.shiftKey || last_clicked_row == -1) {
-            // usual click
-
-            var $checkbox = $tr.find(':checkbox.checkall');
-            var checked = $this.prop('checked');
-            $checkbox.prop('checked', checked).trigger('change');
-            if (checked) {
-                $tr.addClass('marked');
-            } else {
-                $tr.removeClass('marked');
-            }
-            last_click_checked = checked;
-
-            // remember the last clicked row
-            last_clicked_row = last_click_checked ? $table.find('tr.odd:not(.noclick), tr.even:not(.noclick)').index($tr) : -1;
-            last_shift_clicked_row = -1;
-        } else {
-            // handle the shift click
-            PMA_clearSelection();
-            var start, end;
-
-            // clear last shift click result
-            if (last_shift_clicked_row >= 0) {
-                if (last_shift_clicked_row >= last_clicked_row) {
-                    start = last_clicked_row;
-                    end = last_shift_clicked_row;
-                } else {
-                    start = last_shift_clicked_row;
-                    end = last_clicked_row;
-                }
-                $tr.parent().find('tr.odd:not(.noclick), tr.even:not(.noclick)')
-                    .slice(start, end + 1)
-                    .removeClass('marked')
-                    .find(':checkbox')
-                    .prop('checked', false)
-                    .trigger('change');
-            }
-
-            // handle new shift click
-            var curr_row = $table.find('tr.odd:not(.noclick), tr.even:not(.noclick)').index($tr);
-            if (curr_row >= last_clicked_row) {
-                start = last_clicked_row;
-                end = curr_row;
-            } else {
-                start = curr_row;
-                end = last_clicked_row;
-            }
-            $tr.parent().find('tr.odd:not(.noclick), tr.even:not(.noclick)')
-                .slice(start, end + 1)
-                .addClass('marked')
-                .find(':checkbox')
-                .prop('checked', true)
-                .trigger('change');
-
-            // remember the last shift clicked row
-            last_shift_clicked_row = curr_row;
-        }
-    });
-
-    addDateTimePicker();
-
-    /**
-     * Add attribute to text boxes for iOS devices (based on bugID: 3508912)
-     */
-    if (navigator.userAgent.match(/(iphone|ipod|ipad)/i)) {
-        $('input[type=text]').attr('autocapitalize', 'off').attr('autocorrect', 'off');
-    }
-});
-
-/**
- * Row highlighting in horizontal mode (use "on"
- * so that it works also for pages reached via AJAX)
- */
-/*AJAX.registerOnload('functions.js', function () {
-    $(document).on('hover', 'tr.odd, tr.even',function (event) {
-        var $tr = $(this);
-        $tr.toggleClass('hover',event.type=='mouseover');
-        $tr.children().toggleClass('hover',event.type=='mouseover');
-    });
-})*/
-
-/**
- * marks all rows and selects its first checkbox inside the given element
- * the given element is usually a table or a div containing the table or tables
- *
- * @param container    DOM element
- */
-function markAllRows(container_id)
-{
-
-    $("#" + container_id).find("input:checkbox:enabled").prop('checked', true)
-    .trigger("change")
-    .parents("tr").addClass("marked");
-    return true;
-}
-
-/**
- * marks all rows and selects its first checkbox inside the given element
- * the given element is usually a table or a div containing the table or tables
- *
- * @param container    DOM element
- */
-function unMarkAllRows(container_id)
-{
-
-    $("#" + container_id).find("input:checkbox:enabled").prop('checked', false)
-    .trigger("change")
-    .parents("tr").removeClass("marked");
-    return true;
-}
-
-/**
-  * Checks/unchecks all options of a <select> element
-  *
-  * @param string   the form name
-  * @param string   the element name
-  * @param boolean  whether to check or to uncheck options
-  *
-  * @return boolean  always true
-  */
-function setSelectOptions(the_form, the_select, do_check)
-{
-    $("form[name='" + the_form + "'] select[name='" + the_select + "']").find("option").prop('selected', do_check);
-    return true;
-} // end of the 'setSelectOptions()' function
-
-/**
- * Sets current value for query box.
- */
-function setQuery(query)
-{
-    if (codemirror_editor) {
-        codemirror_editor.setValue(query);
-        codemirror_editor.focus();
-    } else {
-        document.sqlform.sql_query.value = query;
-        document.sqlform.sql_query.focus();
-    }
-}
-
-/**
- * Handles 'Simulate query' button on SQL query box.
- *
- * @return void
- */
-function PMA_handleSimulateQueryButton()
-{
-    var update_re = new RegExp('^\\s*UPDATE\\s+((`[^`]+`)|([A-Za-z0-9_$]+))\\s+SET\\s', 'i');
-    var delete_re = new RegExp('^\\s*DELETE\\s+FROM\\s', 'i');
-    var query = '';
-
-    if (codemirror_editor) {
-        query = codemirror_editor.getValue();
-    } else {
-        query = $('#sqlquery').val();
-    }
-
-    var $simulateDml = $('#simulate_dml');
-    if (update_re.test(query) || delete_re.test(query)) {
-        if (! $simulateDml.length) {
-            $('#button_submit_query')
-            .before('<input type="button" id="simulate_dml"' +
-                'tabindex="199" value="' +
-                PMA_messages.strSimulateDML +
-                '" />');
-        }
-    } else {
-        if ($simulateDml.length) {
-            $simulateDml.remove();
-        }
-    }
-}
-
-/**
-  * Create quick sql statements.
-  *
-  */
-function insertQuery(queryType)
-{
-    if (queryType == "clear") {
-        setQuery('');
-        return;
-    } else if (queryType == "format") {
-        if (codemirror_editor) {
-            $('#querymessage').html(PMA_messages.strFormatting +
-                '&nbsp;<img class="ajaxIcon" src="' +
-                pmaThemeImage + 'ajax_clock_small.gif" alt="">');
-            var href = 'db_sql_format.php';
-            var params = {
-                'ajax_request': true,
-                'token': PMA_commonParams.get('token'),
-                'sql': codemirror_editor.getValue()
-            };
-            $.ajax({
-                type: 'POST',
-                url: href,
-                data: params,
-                success: function (data) {
-                    if (data.success) {
-                        codemirror_editor.setValue(data.sql);
-                    }
-                    $('#querymessage').html('');
-                }
-            });
-        }
-        return;
-    } else if (queryType == "saved") {
-        if (isStorageSupported('localStorage') && typeof window.localStorage.auto_saved_sql != 'undefined') {
-            setQuery(window.localStorage.auto_saved_sql);
-        } else if ($.cookie('auto_saved_sql')) {
-            setQuery($.cookie('auto_saved_sql'));
-        } else {
-            PMA_ajaxShowMessage(PMA_messages.strNoAutoSavedQuery);
-        }
-        return;
-    }
-
-    var query = "";
-    var myListBox = document.sqlform.dummy;
-    var table = document.sqlform.table.value;
-
-    if (myListBox.options.length > 0) {
-        sql_box_locked = true;
-        var columnsList = "";
-        var valDis = "";
-        var editDis = "";
-        var NbSelect = 0;
-        for (var i = 0; i < myListBox.options.length; i++) {
-            NbSelect++;
-            if (NbSelect > 1) {
-                columnsList += ", ";
-                valDis += ",";
-                editDis += ",";
-            }
-            columnsList += myListBox.options[i].value;
-            valDis += "[value-" + NbSelect + "]";
-            editDis += myListBox.options[i].value + "=[value-" + NbSelect + "]";
-        }
-        if (queryType == "selectall") {
-            query = "SELECT * FROM `" + table + "` WHERE 1";
-        } else if (queryType == "select") {
-            query = "SELECT " + columnsList + " FROM `" + table + "` WHERE 1";
-        } else if (queryType == "insert") {
-            query = "INSERT INTO `" + table + "`(" + columnsList + ") VALUES (" + valDis + ")";
-        } else if (queryType == "update") {
-            query = "UPDATE `" + table + "` SET " + editDis + " WHERE 1";
-        } else if (queryType == "delete") {
-            query = "DELETE FROM `" + table + "` WHERE 1";
-        }
-        setQuery(query);
-        sql_box_locked = false;
-    }
-}
-
-
-/**
-  * Inserts multiple fields.
-  *
-  */
-function insertValueQuery()
-{
-    var myQuery = document.sqlform.sql_query;
-    var myListBox = document.sqlform.dummy;
-
-    if (myListBox.options.length > 0) {
-        sql_box_locked = true;
-        var columnsList = "";
-        var NbSelect = 0;
-        for (var i = 0; i < myListBox.options.length; i++) {
-            if (myListBox.options[i].selected) {
-                NbSelect++;
-                if (NbSelect > 1) {
-                    columnsList += ", ";
-                }
-                columnsList += myListBox.options[i].value;
-            }
-        }
-
-        /* CodeMirror support */
-        if (codemirror_editor) {
-            codemirror_editor.replaceSelection(columnsList);
-        //IE support
-        } else if (document.selection) {
-            myQuery.focus();
-            var sel = document.selection.createRange();
-            sel.text = columnsList;
-            document.sqlform.insert.focus();
-        }
-        //MOZILLA/NETSCAPE support
-        else if (document.sqlform.sql_query.selectionStart || document.sqlform.sql_query.selectionStart == "0") {
-            var startPos = document.sqlform.sql_query.selectionStart;
-            var endPos = document.sqlform.sql_query.selectionEnd;
-            var SqlString = document.sqlform.sql_query.value;
-
-            myQuery.value = SqlString.substring(0, startPos) + columnsList + SqlString.substring(endPos, SqlString.length);
-        } else {
-            myQuery.value += columnsList;
-        }
-        sql_box_locked = false;
-    }
-}
-
-/**
- * Updates the input fields for the parameters based on the query
- */
-function updateQueryParameters() {
-
-    if ($('#parameterized').is(':checked')) {
-        var query = codemirror_editor ? codemirror_editor.getValue() : $('#sqlquery').val();
-
-        var allParameters = query.match(/:[a-zA-Z0-9_]+/g);
-        var parameters = [];
-        // get unique parameters
-        if (allParameters) {
-            $.each(allParameters, function(i, parameter){
-                if ($.inArray(parameter, parameters) === -1) {
-                    parameters.push(parameter);
-                }
-            });
-        } else {
-            $('#parametersDiv').text(PMA_messages.strNoParam);
-            return;
-        }
-
-        var $temp = $('<div />');
-        $temp.append($('#parametersDiv').children());
-        $('#parametersDiv').empty();
-
-        $.each(parameters, function (i, parameter) {
-            var paramName = parameter.substring(1);
-            var $param = $temp.find('#paramSpan_' + paramName );
-            if (! $param.length) {
-                $param = $('<span class="parameter" id="paramSpan_' + paramName + '" />');
-                $('<label for="param_' + paramName + '" />').text(parameter).appendTo($param);
-                $('<input type="text" name="parameters[' + parameter + ']" id="param_' + paramName + '" />').appendTo($param);
-            }
-            $('#parametersDiv').append($param);
-        });
-    } else {
-        $('#parametersDiv').empty();
-    }
-}
-
-/**
-  * Refresh/resize the WYSIWYG scratchboard
-  */
-function refreshLayout()
-{
-    var $elm = $('#pdflayout');
-    var orientation = $('#orientation_opt').val();
-    var paper = 'A4';
-    var $paperOpt = $('#paper_opt');
-    if ($paperOpt.length == 1) {
-        paper = $paperOpt.val();
-    }
-    var posa = 'y';
-    var posb = 'x';
-    if (orientation == 'P') {
-        posa = 'x';
-        posb = 'y';
-    }
-    $elm.css('width', pdfPaperSize(paper, posa) + 'px');
-    $elm.css('height', pdfPaperSize(paper, posb) + 'px');
-}
-
-/**
- * Initializes positions of elements.
- */
-function TableDragInit() {
-    $('.pdflayout_table').each(function () {
-        var $this = $(this);
-        var number = $this.data('number');
-        var x = $('#c_table_' + number + '_x').val();
-        var y = $('#c_table_' + number + '_y').val();
-        $this.css('left', x + 'px');
-        $this.css('top', y + 'px');
-        /* Make elements draggable */
-        $this.draggable({
-            containment: "parent",
-            drag: function (evt, ui) {
-                var number = $this.data('number');
-                $('#c_table_' + number + '_x').val(parseInt(ui.position.left, 10));
-                $('#c_table_' + number + '_y').val(parseInt(ui.position.top, 10));
-            }
-        });
-    });
-}
-
-/**
- * Resets drag and drop positions.
- */
-function resetDrag() {
-    $('.pdflayout_table').each(function () {
-        var $this = $(this);
-        var x = $this.data('x');
-        var y = $this.data('y');
-        $this.css('left', x + 'px');
-        $this.css('top', y + 'px');
-    });
-}
-
-/**
- * User schema handlers.
- */
-$(function () {
-    /* Move in scratchboard on manual change */
-    $(document).on('change', '.position-change', function () {
-        var $this = $(this);
-        var $elm = $('#table_' + $this.data('number'));
-        $elm.css($this.data('axis'), $this.val() + 'px');
-    });
-    /* Refresh on paper size/orientation change */
-    $(document).on('change', '.paper-change', function () {
-        var $elm = $('#pdflayout');
-        if ($elm.css('visibility') == 'visible') {
-            refreshLayout();
-            TableDragInit();
-        }
-    });
-    /* Show/hide the WYSIWYG scratchboard */
-    $(document).on('click', '#toggle-dragdrop', function () {
-        var $elm = $('#pdflayout');
-        if ($elm.css('visibility') == 'hidden') {
-            refreshLayout();
-            TableDragInit();
-            $elm.css('visibility', 'visible');
-            $elm.css('display', 'block');
-            $('#showwysiwyg').val('1');
-        } else {
-            $elm.css('visibility', 'hidden');
-            $elm.css('display', 'none');
-            $('#showwysiwyg').val('0');
-        }
-    });
-    /* Reset scratchboard */
-    $(document).on('click', '#reset-dragdrop', function () {
-        resetDrag();
-    });
-});
-
-/**
- * Returns paper sizes for a given format
- */
-function pdfPaperSize(format, axis)
-{
-    switch (format.toUpperCase()) {
-    case '4A0':
-        if (axis == 'x') {
-            return 4767.87;
-        } else {
-            return 6740.79;
-        }
-        break;
-    case '2A0':
-        if (axis == 'x') {
-            return 3370.39;
-        } else {
-            return 4767.87;
-        }
-        break;
-    case 'A0':
-        if (axis == 'x') {
-            return 2383.94;
-        } else {
-            return 3370.39;
-        }
-        break;
-    case 'A1':
-        if (axis == 'x') {
-            return 1683.78;
-        } else {
-            return 2383.94;
-        }
-        break;
-    case 'A2':
-        if (axis == 'x') {
-            return 1190.55;
-        } else {
-            return 1683.78;
-        }
-        break;
-    case 'A3':
-        if (axis == 'x') {
-            return 841.89;
-        } else {
-            return 1190.55;
-        }
-        break;
-    case 'A4':
-        if (axis == 'x') {
-            return 595.28;
-        } else {
-            return 841.89;
-        }
-        break;
-    case 'A5':
-        if (axis == 'x') {
-            return 419.53;
-        } else {
-            return 595.28;
-        }
-        break;
-    case 'A6':
-        if (axis == 'x') {
-            return 297.64;
-        } else {
-            return 419.53;
-        }
-        break;
-    case 'A7':
-        if (axis == 'x') {
-            return 209.76;
-        } else {
-            return 297.64;
-        }
-        break;
-    case 'A8':
-        if (axis == 'x') {
-            return 147.40;
-        } else {
-            return 209.76;
-        }
-        break;
-    case 'A9':
-        if (axis == 'x') {
-            return 104.88;
-        } else {
-            return 147.40;
-        }
-        break;
-    case 'A10':
-        if (axis == 'x') {
-            return 73.70;
-        } else {
-            return 104.88;
-        }
-        break;
-    case 'B0':
-        if (axis == 'x') {
-            return 2834.65;
-        } else {
-            return 4008.19;
-        }
-        break;
-    case 'B1':
-        if (axis == 'x') {
-            return 2004.09;
-        } else {
-            return 2834.65;
-        }
-        break;
-    case 'B2':
-        if (axis == 'x') {
-            return 1417.32;
-        } else {
-            return 2004.09;
-        }
-        break;
-    case 'B3':
-        if (axis == 'x') {
-            return 1000.63;
-        } else {
-            return 1417.32;
-        }
-        break;
-    case 'B4':
-        if (axis == 'x') {
-            return 708.66;
-        } else {
-            return 1000.63;
-        }
-        break;
-    case 'B5':
-        if (axis == 'x') {
-            return 498.90;
-        } else {
-            return 708.66;
-        }
-        break;
-    case 'B6':
-        if (axis == 'x') {
-            return 354.33;
-        } else {
-            return 498.90;
-        }
-        break;
-    case 'B7':
-        if (axis == 'x') {
-            return 249.45;
-        } else {
-            return 354.33;
-        }
-        break;
-    case 'B8':
-        if (axis == 'x') {
-            return 175.75;
-        } else {
-            return 249.45;
-        }
-        break;
-    case 'B9':
-        if (axis == 'x') {
-            return 124.72;
-        } else {
-            return 175.75;
-        }
-        break;
-    case 'B10':
-        if (axis == 'x') {
-            return 87.87;
-        } else {
-            return 124.72;
-        }
-        break;
-    case 'C0':
-        if (axis == 'x') {
-            return 2599.37;
-        } else {
-            return 3676.54;
-        }
-        break;
-    case 'C1':
-        if (axis == 'x') {
-            return 1836.85;
-        } else {
-            return 2599.37;
-        }
-        break;
-    case 'C2':
-        if (axis == 'x') {
-            return 1298.27;
-        } else {
-            return 1836.85;
-        }
-        break;
-    case 'C3':
-        if (axis == 'x') {
-            return 918.43;
-        } else {
-            return 1298.27;
-        }
-        break;
-    case 'C4':
-        if (axis == 'x') {
-            return 649.13;
-        } else {
-            return 918.43;
-        }
-        break;
-    case 'C5':
-        if (axis == 'x') {
-            return 459.21;
-        } else {
-            return 649.13;
-        }
-        break;
-    case 'C6':
-        if (axis == 'x') {
-            return 323.15;
-        } else {
-            return 459.21;
-        }
-        break;
-    case 'C7':
-        if (axis == 'x') {
-            return 229.61;
-        } else {
-            return 323.15;
-        }
-        break;
-    case 'C8':
-        if (axis == 'x') {
-            return 161.57;
-        } else {
-            return 229.61;
-        }
-        break;
-    case 'C9':
-        if (axis == 'x') {
-            return 113.39;
-        } else {
-            return 161.57;
-        }
-        break;
-    case 'C10':
-        if (axis == 'x') {
-            return 79.37;
-        } else {
-            return 113.39;
-        }
-        break;
-    case 'RA0':
-        if (axis == 'x') {
-            return 2437.80;
-        } else {
-            return 3458.27;
-        }
-        break;
-    case 'RA1':
-        if (axis == 'x') {
-            return 1729.13;
-        } else {
-            return 2437.80;
-        }
-        break;
-    case 'RA2':
-        if (axis == 'x') {
-            return 1218.90;
-        } else {
-            return 1729.13;
-        }
-        break;
-    case 'RA3':
-        if (axis == 'x') {
-            return 864.57;
-        } else {
-            return 1218.90;
-        }
-        break;
-    case 'RA4':
-        if (axis == 'x') {
-            return 609.45;
-        } else {
-            return 864.57;
-        }
-        break;
-    case 'SRA0':
-        if (axis == 'x') {
-            return 2551.18;
-        } else {
-            return 3628.35;
-        }
-        break;
-    case 'SRA1':
-        if (axis == 'x') {
-            return 1814.17;
-        } else {
-            return 2551.18;
-        }
-        break;
-    case 'SRA2':
-        if (axis == 'x') {
-            return 1275.59;
-        } else {
-            return 1814.17;
-        }
-        break;
-    case 'SRA3':
-        if (axis == 'x') {
-            return 907.09;
-        } else {
-            return 1275.59;
-        }
-        break;
-    case 'SRA4':
-        if (axis == 'x') {
-            return 637.80;
-        } else {
-            return 907.09;
-        }
-        break;
-    case 'LETTER':
-        if (axis == 'x') {
-            return 612.00;
-        } else {
-            return 792.00;
-        }
-        break;
-    case 'LEGAL':
-        if (axis == 'x') {
-            return 612.00;
-        } else {
-            return 1008.00;
-        }
-        break;
-    case 'EXECUTIVE':
-        if (axis == 'x') {
-            return 521.86;
-        } else {
-            return 756.00;
-        }
-        break;
-    case 'FOLIO':
-        if (axis == 'x') {
-            return 612.00;
-        } else {
-            return 936.00;
-        }
-        break;
-    } // end switch
-
-    return 0;
-}
-
-/**
- * Get checkbox for foreign key checks
- *
- * @return string
- */
-function getForeignKeyCheckboxLoader() {
-    var html = '';
-    html    += '<div>';
-    html    += '<div class="load-default-fk-check-value">';
-    html    += PMA_getImage('ajax_clock_small.gif');
-    html    += '</div>';
-    html    += '</div>';
-    return html;
-}
-
-function loadForeignKeyCheckbox() {
-    // Load default foreign key check value
-    var params = {
-        'ajax_request': true,
-        'token': PMA_commonParams.get('token'),
-        'server': PMA_commonParams.get('server'),
-        'get_default_fk_check_value': true
-    };
-    $.get('sql.php', params, function (data) {
-        var html = '<input type="hidden" name="fk_checks" value="0" />' +
-            '<input type="checkbox" name="fk_checks" id="fk_checks"' +
-            (data.default_fk_check_value ? ' checked="checked"' : '') + ' />' +
-            '<label for="fk_checks">' + PMA_messages.strForeignKeyCheck + '</label>';
-        $('.load-default-fk-check-value').replaceWith(html);
-    });
-}
-
-function getJSConfirmCommonParam(elem) {
-    return {
-        'is_js_confirmed' : 1,
-        'ajax_request' : true,
-        'fk_checks': $(elem).find('#fk_checks').is(':checked') ? 1 : 0
-    };
-}
-
-/**
- * Unbind all event handlers before tearing down a page
- */
-AJAX.registerTeardown('functions.js', function () {
-    $(document).off('click', "a.inline_edit_sql");
-    $(document).off('click', "input#sql_query_edit_save");
-    $(document).off('click', "input#sql_query_edit_discard");
-    $('input.sqlbutton').unbind('click');
-    if (codemirror_editor) {
-        codemirror_editor.off('blur');
-    } else {
-        $(document).off('blur', '#sqlquery');
-    }
-    $(document).off('change', '#parameterized');
-    $('#sqlquery').unbind('keydown');
-    $('#sql_query_edit').unbind('keydown');
-
-    if (codemirror_inline_editor) {
-        // Copy the sql query to the text area to preserve it.
-        $('#sql_query_edit').text(codemirror_inline_editor.getValue());
-        $(codemirror_inline_editor.getWrapperElement()).unbind('keydown');
-        codemirror_inline_editor.toTextArea();
-        codemirror_inline_editor = false;
-    }
-    if (codemirror_editor) {
-        $(codemirror_editor.getWrapperElement()).unbind('keydown');
-    }
-});
-
-/**
- * Jquery Coding for inline editing SQL_QUERY
- */
-AJAX.registerOnload('functions.js', function () {
-    // If we are coming back to the page by clicking forward button
-    // of the browser, bind the code mirror to inline query editor.
-    bindCodeMirrorToInlineEditor();
-    $(document).on('click', "a.inline_edit_sql", function () {
-        if ($('#sql_query_edit').length) {
-            // An inline query editor is already open,
-            // we don't want another copy of it
-            return false;
-        }
-
-        var $form = $(this).prev('form');
-        var sql_query  = $form.find("input[name='sql_query']").val().trim();
-        var $inner_sql = $(this).parent().prev().find('code.sql');
-        var old_text   = $inner_sql.html();
-
-        var new_content = "<textarea name=\"sql_query_edit\" id=\"sql_query_edit\">" + escapeHtml(sql_query) + "</textarea>\n";
-        new_content    += getForeignKeyCheckboxLoader();
-        new_content    += "<input type=\"submit\" id=\"sql_query_edit_save\" class=\"button btnSave\" value=\"" + PMA_messages.strGo + "\"/>\n";
-        new_content    += "<input type=\"button\" id=\"sql_query_edit_discard\" class=\"button btnDiscard\" value=\"" + PMA_messages.strCancel + "\"/>\n";
-        var $editor_area = $('div#inline_editor');
-        if ($editor_area.length === 0) {
-            $editor_area = $('<div id="inline_editor_outer"></div>');
-            $editor_area.insertBefore($inner_sql);
-        }
-        $editor_area.html(new_content);
-        loadForeignKeyCheckbox();
-        $inner_sql.hide();
-
-        bindCodeMirrorToInlineEditor();
-        return false;
-    });
-
-    $(document).on('click', "input#sql_query_edit_save", function () {
-        $(".success").hide();
-        //hide already existing success message
-        var sql_query;
-        if (codemirror_inline_editor) {
-            codemirror_inline_editor.save();
-            sql_query = codemirror_inline_editor.getValue();
-        } else {
-            sql_query = $(this).parent().find('#sql_query_edit').val();
-        }
-        var fk_check = $(this).parent().find('#fk_checks').is(':checked');
-
-        var $form = $("a.inline_edit_sql").prev('form');
-        var $fake_form = $('<form>', {action: 'import.php', method: 'post'})
-                .append($form.find("input[name=server], input[name=db], input[name=table], input[name=token]").clone())
-                .append($('<input/>', {type: 'hidden', name: 'show_query', value: 1}))
-                .append($('<input/>', {type: 'hidden', name: 'is_js_confirmed', value: 0}))
-                .append($('<input/>', {type: 'hidden', name: 'sql_query', value: sql_query}))
-                .append($('<input/>', {type: 'hidden', name: 'fk_checks', value: fk_check ? 1 : 0}));
-        if (! checkSqlQuery($fake_form[0])) {
-            return false;
-        }
-        $fake_form.appendTo($('body')).submit();
-    });
-
-    $(document).on('click', "input#sql_query_edit_discard", function () {
-        var $divEditor = $('div#inline_editor_outer');
-        $divEditor.siblings('code.sql').show();
-        $divEditor.remove();
-    });
-
-    $('input.sqlbutton').click(function (evt) {
-        insertQuery(evt.target.id);
-        PMA_handleSimulateQueryButton();
-        return false;
-    });
-
-    $(document).on('change', '#parameterized', updateQueryParameters);
-
-    var $inputUsername = $('#input_username');
-    if ($inputUsername) {
-        if ($inputUsername.val() === '') {
-            $inputUsername.focus();
-        } else {
-            $('#input_password').focus();
-        }
-    }
-});
-
-/**
- * "inputRead" event handler for CodeMirror SQL query editors for autocompletion
- */
-function codemirrorAutocompleteOnInputRead(instance) {
-    if (!sql_autocomplete_in_progress
-        && (!instance.options.hintOptions.tables || !sql_autocomplete)) {
-
-        if (!sql_autocomplete) {
-            // Reset after teardown
-            instance.options.hintOptions.tables = false;
-            instance.options.hintOptions.defaultTable = '';
-
-            sql_autocomplete_in_progress = true;
-
-            var href = 'db_sql_autocomplete.php';
-            var params = {
-                'ajax_request': true,
-                'token': PMA_commonParams.get('token'),
-                'server': PMA_commonParams.get('server'),
-                'db': PMA_commonParams.get('db'),
-                'no_debug': true
-            };
-
-            var columnHintRender = function(elem, self, data) {
-                $('<div class="autocomplete-column-name">')
-                    .text(data.columnName)
-                    .appendTo(elem);
-                $('<div class="autocomplete-column-hint">')
-                    .text(data.columnHint)
-                    .appendTo(elem);
-            };
-
-            $.ajax({
-                type: 'POST',
-                url: href,
-                data: params,
-                success: function (data) {
-                    if (data.success) {
-                        var tables = $.parseJSON(data.tables);
-                        sql_autocomplete_default_table = PMA_commonParams.get('table');
-                        sql_autocomplete = [];
-                        for (var table in tables) {
-                            if (tables.hasOwnProperty(table)) {
-                                var columns = tables[table];
-                                table = {
-                                    text: table,
-                                    columns: []
-                                };
-                                for (var column in columns) {
-                                    if (columns.hasOwnProperty(column)) {
-                                        var displayText = columns[column].Type;
-                                        if (columns[column].Key == 'PRI') {
-                                            displayText += ' | Primary';
-                                        } else if (columns[column].Key == 'UNI') {
-                                            displayText += ' | Unique';
-                                        }
-                                        table.columns.push({
-                                            text: column,
-                                            displayText: column + " | " +  displayText,
-                                            columnName: column,
-                                            columnHint: displayText,
-                                            render: columnHintRender
-                                        });
-                                    }
-                                }
-                            }
-                            sql_autocomplete.push(table);
-                        }
-                        instance.options.hintOptions.tables = sql_autocomplete;
-                        instance.options.hintOptions.defaultTable = sql_autocomplete_default_table;
-                    }
-                },
-                complete: function () {
-                    sql_autocomplete_in_progress = false;
-                }
-            });
-        }
-        else {
-            instance.options.hintOptions.tables = sql_autocomplete;
-            instance.options.hintOptions.defaultTable = sql_autocomplete_default_table;
-        }
-    }
-    if (instance.state.completionActive) {
-        return;
-    }
-    var cur = instance.getCursor();
-    var token = instance.getTokenAt(cur);
-    var string = '';
-    if (token.string.match(/^[.`\w@]\w*$/)) {
-        string = token.string;
-    }
-    if (string.length > 0) {
-        CodeMirror.commands.autocomplete(instance);
-    }
-}
-
-/**
- * Remove autocomplete information before tearing down a page
- */
-AJAX.registerTeardown('functions.js', function () {
-    sql_autocomplete = false;
-    sql_autocomplete_default_table = '';
-});
-
-/**
- * Binds the CodeMirror to the text area used to inline edit a query.
- */
-function bindCodeMirrorToInlineEditor() {
-    var $inline_editor = $('#sql_query_edit');
-    if ($inline_editor.length > 0) {
-        if (typeof CodeMirror !== 'undefined') {
-            var height = $inline_editor.css('height');
-            codemirror_inline_editor = PMA_getSQLEditor($inline_editor);
-            codemirror_inline_editor.getWrapperElement().style.height = height;
-            codemirror_inline_editor.refresh();
-            codemirror_inline_editor.focus();
-            $(codemirror_inline_editor.getWrapperElement())
-                .bind('keydown', catchKeypressesFromSqlInlineEdit);
-        } else {
-            $inline_editor
-                .focus()
-                .bind('keydown', catchKeypressesFromSqlInlineEdit);
-        }
-    }
-}
-
-function catchKeypressesFromSqlInlineEdit(event) {
-    // ctrl-enter is 10 in chrome and ie, but 13 in ff
-    if (event.ctrlKey && (event.keyCode == 13 || event.keyCode == 10)) {
-        $("#sql_query_edit_save").trigger('click');
-    }
-}
-
-/**
- * Adds doc link to single highlighted SQL element
- */
-function PMA_doc_add($elm, params)
-{
-    if (typeof mysql_doc_template == 'undefined') {
-        return;
-    }
-
-    var url = PMA_sprintf(
-        decodeURIComponent(mysql_doc_template),
-        params[0]
-    );
-    if (params.length > 1) {
-        url += '#' + params[1];
-    }
-    var content = $elm.text();
-    $elm.text('');
-    $elm.append('<a target="mysql_doc" class="cm-sql-doc" href="' + url + '">' + content + '</a>');
-}
-
-/**
- * Generates doc links for keywords inside highlighted SQL
- */
-function PMA_doc_keyword(idx, elm)
-{
-    var $elm = $(elm);
-    /* Skip already processed ones */
-    if ($elm.find('a').length > 0) {
-        return;
-    }
-    var keyword = $elm.text().toUpperCase();
-    var $next = $elm.next('.cm-keyword');
-    if ($next) {
-        var next_keyword = $next.text().toUpperCase();
-        var full = keyword + ' ' + next_keyword;
-
-        var $next2 = $next.next('.cm-keyword');
-        if ($next2) {
-            var next2_keyword = $next2.text().toUpperCase();
-            var full2 = full + ' ' + next2_keyword;
-            if (full2 in mysql_doc_keyword) {
-                PMA_doc_add($elm, mysql_doc_keyword[full2]);
-                PMA_doc_add($next, mysql_doc_keyword[full2]);
-                PMA_doc_add($next2, mysql_doc_keyword[full2]);
-                return;
-            }
-        }
-        if (full in mysql_doc_keyword) {
-            PMA_doc_add($elm, mysql_doc_keyword[full]);
-            PMA_doc_add($next, mysql_doc_keyword[full]);
-            return;
-        }
-    }
-    if (keyword in mysql_doc_keyword) {
-        PMA_doc_add($elm, mysql_doc_keyword[keyword]);
-    }
-}
-
-/**
- * Generates doc links for builtins inside highlighted SQL
- */
-function PMA_doc_builtin(idx, elm)
-{
-    var $elm = $(elm);
-    var builtin = $elm.text().toUpperCase();
-    if (builtin in mysql_doc_builtin) {
-        PMA_doc_add($elm, mysql_doc_builtin[builtin]);
-    }
-}
-
-/**
- * Higlights SQL using CodeMirror.
- */
-function PMA_highlightSQL($base)
-{
-    var $elm = $base.find('code.sql');
-    $elm.each(function () {
-        var $sql = $(this);
-        var $pre = $sql.find('pre');
-        /* We only care about visible elements to avoid double processing */
-        if ($pre.is(":visible")) {
-            var $highlight = $('<div class="sql-highlight cm-s-default"></div>');
-            $sql.append($highlight);
-            if (typeof CodeMirror != 'undefined') {
-                CodeMirror.runMode($sql.text(), 'text/x-mysql', $highlight[0]);
-                $pre.hide();
-                $highlight.find('.cm-keyword').each(PMA_doc_keyword);
-                $highlight.find('.cm-builtin').each(PMA_doc_builtin);
-            }
-        }
-    });
-}
-
-/**
- * Updates an element containing code.
- *
- * @param jQuery Object $base base element which contains the raw and the
- *                            highlighted code.
- *
- * @param string htmlValue    code in HTML format, displayed if code cannot be
- *                            highlighted
- *
- * @param string rawValue     raw code, used as a parameter for highlighter
- *
- * @return bool               whether content was updated or not
- */
-function PMA_updateCode($base, htmlValue, rawValue)
-{
-    var $code = $base.find('code');
-    if ($code.length === 0) {
-        return false;
-    }
-
-    // Determines the type of the content and appropriate CodeMirror mode.
-    var type = '', mode = '';
-    if  ($code.hasClass('json')) {
-        type = 'json';
-        mode = 'application/json';
-    } else if ($code.hasClass('sql')) {
-        type = 'sql';
-        mode = 'text/x-mysql';
-    } else if ($code.hasClass('xml')) {
-        type = 'xml';
-        mode = 'application/xml';
-    } else {
-        return false;
-    }
-
-    // Element used to display unhighlighted code.
-    var $notHighlighted = $('<pre>' + htmlValue + '</pre>');
-
-    // Tries to highlight code using CodeMirror.
-    if (typeof CodeMirror != 'undefined') {
-        var $highlighted = $('<div class="' + type + '-highlight cm-s-default"></div>');
-        CodeMirror.runMode(rawValue, mode, $highlighted[0]);
-        $notHighlighted.hide();
-        $code.html('').append($notHighlighted, $highlighted[0]);
-    } else {
-        $code.html('').append($notHighlighted);
-    }
-
-    return true;
-}
-
-/**
- * Show a message on the top of the page for an Ajax request
- *
- * Sample usage:
- *
- * 1) var $msg = PMA_ajaxShowMessage();
- * This will show a message that reads "Loading...". Such a message will not
- * disappear automatically and cannot be dismissed by the user. To remove this
- * message either the PMA_ajaxRemoveMessage($msg) function must be called or
- * another message must be show with PMA_ajaxShowMessage() function.
- *
- * 2) var $msg = PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
- * This is a special case. The behaviour is same as above,
- * just with a different message
- *
- * 3) var $msg = PMA_ajaxShowMessage('The operation was successful');
- * This will show a message that will disappear automatically and it can also
- * be dismissed by the user.
- *
- * 4) var $msg = PMA_ajaxShowMessage('Some error', false);
- * This will show a message that will not disappear automatically, but it
- * can be dismissed by the user after he has finished reading it.
- *
- * @param string  message     string containing the message to be shown.
- *                              optional, defaults to 'Loading...'
- * @param mixed   timeout     number of milliseconds for the message to be visible
- *                              optional, defaults to 5000. If set to 'false', the
- *                              notification will never disappear
- * @return jQuery object       jQuery Element that holds the message div
- *                              this object can be passed to PMA_ajaxRemoveMessage()
- *                              to remove the notification
- */
-function PMA_ajaxShowMessage(message, timeout)
-{
-    /**
-     * @var self_closing Whether the notification will automatically disappear
-     */
-    var self_closing = true;
-    /**
-     * @var dismissable Whether the user will be able to remove
-     *                  the notification by clicking on it
-     */
-    var dismissable = true;
-    // Handle the case when a empty data.message is passed.
-    // We don't want the empty message
-    if (message === '') {
-        return true;
-    } else if (! message) {
-        // If the message is undefined, show the default
-        message = PMA_messages.strLoading;
-        dismissable = false;
-        self_closing = false;
-    } else if (message == PMA_messages.strProcessingRequest) {
-        // This is another case where the message should not disappear
-        dismissable = false;
-        self_closing = false;
-    }
-    // Figure out whether (or after how long) to remove the notification
-    if (timeout === undefined) {
-        timeout = 5000;
-    } else if (timeout === false) {
-        self_closing = false;
-    }
-    // Create a parent element for the AJAX messages, if necessary
-    if ($('#loading_parent').length === 0) {
-        $('<div id="loading_parent"></div>')
-        .prependTo("#page_content");
-    }
-    // Update message count to create distinct message elements every time
-    ajax_message_count++;
-    // Remove all old messages, if any
-    $("span.ajax_notification[id^=ajax_message_num]").remove();
-    /**
-     * @var    $retval    a jQuery object containing the reference
-     *                    to the created AJAX message
-     */
-    var $retval = $(
-            '<span class="ajax_notification" id="ajax_message_num_' +
-            ajax_message_count +
-            '"></span>'
-    )
-    .hide()
-    .appendTo("#loading_parent")
-    .html(message)
-    .show();
-    // If the notification is self-closing we should create a callback to remove it
-    if (self_closing) {
-        $retval
-        .delay(timeout)
-        .fadeOut('medium', function () {
-            if ($(this).is(':data(tooltip)')) {
-                $(this).tooltip('destroy');
-            }
-            // Remove the notification
-            $(this).remove();
-        });
-    }
-    // If the notification is dismissable we need to add the relevant class to it
-    // and add a tooltip so that the users know that it can be removed
-    if (dismissable) {
-        $retval.addClass('dismissable').css('cursor', 'pointer');
-        /**
-         * Add a tooltip to the notification to let the user know that (s)he
-         * can dismiss the ajax notification by clicking on it.
-         */
-        PMA_tooltip(
-            $retval,
-            'span',
-            PMA_messages.strDismiss
-        );
-    }
-    PMA_highlightSQL($retval);
-
-    return $retval;
-}
-
-/**
- * Removes the message shown for an Ajax operation when it's completed
- *
- * @param jQuery object   jQuery Element that holds the notification
- *
- * @return nothing
- */
-function PMA_ajaxRemoveMessage($this_msgbox)
-{
-    if ($this_msgbox !== undefined && $this_msgbox instanceof jQuery) {
-        $this_msgbox
-        .stop(true, true)
-        .fadeOut('medium');
-        if ($this_msgbox.is(':data(tooltip)')) {
-            $this_msgbox.tooltip('destroy');
-        } else {
-            $this_msgbox.remove();
-        }
-    }
-}
-
-/**
- * Requests SQL for previewing before executing.
- *
- * @param jQuery Object $form Form containing query data
- *
- * @return void
- */
-function PMA_previewSQL($form)
-{
-    var form_url = $form.attr('action');
-    var form_data = $form.serialize() +
-        '&do_save_data=1' +
-        '&preview_sql=1' +
-        '&ajax_request=1';
-    var $msgbox = PMA_ajaxShowMessage();
-    $.ajax({
-        type: 'POST',
-        url: form_url,
-        data: form_data,
-        success: function (response) {
-            PMA_ajaxRemoveMessage($msgbox);
-            if (response.success) {
-                var $dialog_content = $('<div/>')
-                    .append(response.sql_data);
-                var button_options = {};
-                button_options[PMA_messages.strClose] = function () {
-                    $(this).dialog('close');
-                };
-                var $response_dialog = $dialog_content.dialog({
-                    minWidth: 550,
-                    maxHeight: 400,
-                    modal: true,
-                    buttons: button_options,
-                    title: PMA_messages.strPreviewSQL,
-                    close: function () {
-                        $(this).remove();
-                    },
-                    open: function () {
-                        // Pretty SQL printing.
-                        PMA_highlightSQL($(this));
-                    }
-                });
-            } else {
-                PMA_ajaxShowMessage(response.message);
-            }
-        },
-        error: function () {
-            PMA_ajaxShowMessage(PMA_messages.strErrorProcessingRequest);
-        }
-    });
-}
-
-/**
- * check for reserved keyword column name
- *
- * @param jQuery Object $form Form
- *
- * @returns true|false
- */
-
-function PMA_checkReservedWordColumns($form) {
-    var is_confirmed = true;
-    $.ajax({
-        type: 'POST',
-        url: "tbl_structure.php",
-        data: $form.serialize() + '&reserved_word_check=1',
-        success: function (data) {
-            if (typeof data.success != 'undefined' && data.success === true) {
-                is_confirmed = confirm(data.message);
-            }
-        },
-        async:false
-    });
-    return is_confirmed;
-}
-
-// This event only need to be fired once after the initial page load
-$(function () {
-    /**
-     * Allows the user to dismiss a notification
-     * created with PMA_ajaxShowMessage()
-     */
-    $(document).on('click', 'span.ajax_notification.dismissable', function () {
-        PMA_ajaxRemoveMessage($(this));
-    });
-    /**
-     * The below two functions hide the "Dismiss notification" tooltip when a user
-     * is hovering a link or button that is inside an ajax message
-     */
-    $(document).on('mouseover', 'span.ajax_notification a, span.ajax_notification button, span.ajax_notification input', function () {
-        if ($(this).parents('span.ajax_notification').is(':data(tooltip)')) {
-            $(this).parents('span.ajax_notification').tooltip('disable');
-        }
-    });
-    $(document).on('mouseout', 'span.ajax_notification a, span.ajax_notification button, span.ajax_notification input', function () {
-        if ($(this).parents('span.ajax_notification').is(':data(tooltip)')) {
-            $(this).parents('span.ajax_notification').tooltip('enable');
-        }
-    });
-});
-
-/**
- * Hides/shows the "Open in ENUM/SET editor" message, depending on the data type of the column currently selected
- */
-function PMA_showNoticeForEnum(selectElement)
-{
-    var enum_notice_id = selectElement.attr("id").split("_")[1];
-    enum_notice_id += "_" + (parseInt(selectElement.attr("id").split("_")[2], 10) + 1);
-    var selectedType = selectElement.val();
-    if (selectedType == "ENUM" || selectedType == "SET") {
-        $("p#enum_notice_" + enum_notice_id).show();
-    } else {
-        $("p#enum_notice_" + enum_notice_id).hide();
-    }
-}
-
-/**
- * Creates a Profiling Chart. Used in sql.js
- * and in server_status_monitor.js
- */
-function PMA_createProfilingChart(target, data)
-{
-    // create the chart
-    var factory = new JQPlotChartFactory();
-    var chart = factory.createChart(ChartType.PIE, target);
-
-    // create the data table and add columns
-    var dataTable = new DataTable();
-    dataTable.addColumn(ColumnType.STRING, '');
-    dataTable.addColumn(ColumnType.NUMBER, '');
-    dataTable.setData(data);
-
-    // draw the chart and return the chart object
-    chart.draw(dataTable, {
-        seriesDefaults: {
-            rendererOptions: {
-                showDataLabels:  true
-            }
-        },
-        highlighter: {
-            tooltipLocation: 'se',
-            sizeAdjust: 0,
-            tooltipAxes: 'pieref',
-            formatString: '%s, %.9Ps'
-        },
-        legend: {
-            show: true,
-            location: 'e',
-            rendererOptions: {
-                numberColumns: 2
-            }
-        },
-        // from http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines#Color_Palette
-        seriesColors: [
-            '#fce94f',
-            '#fcaf3e',
-            '#e9b96e',
-            '#8ae234',
-            '#729fcf',
-            '#ad7fa8',
-            '#ef2929',
-            '#eeeeec',
-            '#888a85',
-            '#c4a000',
-            '#ce5c00',
-            '#8f5902',
-            '#4e9a06',
-            '#204a87',
-            '#5c3566',
-            '#a40000',
-            '#babdb6',
-            '#2e3436'
-        ]
-    });
-    return chart;
-}
-
-/**
- * Formats a profiling duration nicely (in us and ms time).
- * Used in server_status_monitor.js
- *
- * @param  integer    Number to be formatted, should be in the range of microsecond to second
- * @param  integer    Accuracy, how many numbers right to the comma should be
- * @return string     The formatted number
- */
-function PMA_prettyProfilingNum(num, acc)
-{
-    if (!acc) {
-        acc = 2;
-    }
-    acc = Math.pow(10, acc);
-    if (num * 1000 < 0.1) {
-        num = Math.round(acc * (num * 1000 * 1000)) / acc + 'µ';
-    } else if (num < 0.1) {
-        num = Math.round(acc * (num * 1000)) / acc + 'm';
-    } else {
-        num = Math.round(acc * num) / acc;
-    }
-
-    return num + 's';
-}
-
-
-/**
- * Formats a SQL Query nicely with newlines and indentation. Depends on Codemirror and MySQL Mode!
- *
- * @param string      Query to be formatted
- * @return string      The formatted query
- */
-function PMA_SQLPrettyPrint(string)
-{
-    if (typeof CodeMirror == 'undefined') {
-        return string;
-    }
-
-    var mode = CodeMirror.getMode({}, "text/x-mysql");
-    var stream = new CodeMirror.StringStream(string);
-    var state = mode.startState();
-    var token, tokens = [];
-    var output = '';
-    var tabs = function (cnt) {
-        var ret = '';
-        for (var i = 0; i < 4 * cnt; i++) {
-            ret += " ";
-        }
-        return ret;
-    };
-
-    // "root-level" statements
-    var statements = {
-        'select': ['select', 'from', 'on', 'where', 'having', 'limit', 'order by', 'group by'],
-        'update': ['update', 'set', 'where'],
-        'insert into': ['insert into', 'values']
-    };
-    // don't put spaces before these tokens
-    var spaceExceptionsBefore = {';': true, ',': true, '.': true, '(': true};
-    // don't put spaces after these tokens
-    var spaceExceptionsAfter = {'.': true};
-
-    // Populate tokens array
-    var str = '';
-    while (! stream.eol()) {
-        stream.start = stream.pos;
-        token = mode.token(stream, state);
-        if (token !== null) {
-            tokens.push([token, stream.current().toLowerCase()]);
-        }
-    }
-
-    var currentStatement = tokens[0][1];
-
-    if (! statements[currentStatement]) {
-        return string;
-    }
-    // Holds all currently opened code blocks (statement, function or generic)
-    var blockStack = [];
-    // Holds the type of block from last iteration (the current is in blockStack[0])
-    var previousBlock;
-    // If a new code block is found, newBlock contains its type for one iteration and vice versa for endBlock
-    var newBlock, endBlock;
-    // How much to indent in the current line
-    var indentLevel = 0;
-    // Holds the "root-level" statements
-    var statementPart, lastStatementPart = statements[currentStatement][0];
-
-    blockStack.unshift('statement');
-
-    // Iterate through every token and format accordingly
-    for (var i = 0; i < tokens.length; i++) {
-        previousBlock = blockStack[0];
-
-        // New block => push to stack
-        if (tokens[i][1] == '(') {
-            if (i < tokens.length - 1 && tokens[i + 1][0] == 'statement-verb') {
-                blockStack.unshift(newBlock = 'statement');
-            } else if (i > 0 && tokens[i - 1][0] == 'builtin') {
-                blockStack.unshift(newBlock = 'function');
-            } else {
-                blockStack.unshift(newBlock = 'generic');
-            }
-        } else {
-            newBlock = null;
-        }
-
-        // Block end => pop from stack
-        if (tokens[i][1] == ')') {
-            endBlock = blockStack[0];
-            blockStack.shift();
-        } else {
-            endBlock = null;
-        }
-
-        // A subquery is starting
-        if (i > 0 && newBlock == 'statement') {
-            indentLevel++;
-            output += "\n" + tabs(indentLevel) + tokens[i][1] + ' ' + tokens[i + 1][1].toUpperCase() + "\n" + tabs(indentLevel + 1);
-            currentStatement = tokens[i + 1][1];
-            i++;
-            continue;
-        }
-
-        // A subquery is ending
-        if (endBlock == 'statement' && indentLevel > 0) {
-            output += "\n" + tabs(indentLevel);
-            indentLevel--;
-        }
-
-        // One less indentation for statement parts (from, where, order by, etc.) and a newline
-        statementPart = statements[currentStatement].indexOf(tokens[i][1]);
-        if (statementPart != -1) {
-            if (i > 0) {
-                output += "\n";
-            }
-            output += tabs(indentLevel) + tokens[i][1].toUpperCase();
-            output += "\n" + tabs(indentLevel + 1);
-            lastStatementPart = tokens[i][1];
-        }
-        // Normal indentation and spaces for everything else
-        else {
-            if (! spaceExceptionsBefore[tokens[i][1]] &&
-               ! (i > 0 && spaceExceptionsAfter[tokens[i - 1][1]]) &&
-               output.charAt(output.length - 1) != ' ') {
-                output += " ";
-            }
-            if (tokens[i][0] == 'keyword') {
-                output += tokens[i][1].toUpperCase();
-            } else {
-                output += tokens[i][1];
-            }
-        }
-
-        // split columns in select and 'update set' clauses, but only inside statements blocks
-        if ((lastStatementPart == 'select' || lastStatementPart == 'where'  || lastStatementPart == 'set') &&
-            tokens[i][1] == ',' && blockStack[0] == 'statement') {
-
-            output += "\n" + tabs(indentLevel + 1);
-        }
-
-        // split conditions in where clauses, but only inside statements blocks
-        if (lastStatementPart == 'where' &&
-            (tokens[i][1] == 'and' || tokens[i][1] == 'or' || tokens[i][1] == 'xor')) {
-
-            if (blockStack[0] == 'statement') {
-                output += "\n" + tabs(indentLevel + 1);
-            }
-            // Todo: Also split and or blocks in newlines & indentation++
-            //if (blockStack[0] == 'generic')
-             //   output += ...
-        }
-    }
-    return output;
-}
-
-/**
- * jQuery function that uses jQueryUI's dialogs to confirm with user. Does not
- *  return a jQuery object yet and hence cannot be chained
- *
- * @param string      question
- * @param string      url           URL to be passed to the callbackFn to make
- *                                  an Ajax call to
- * @param function    callbackFn    callback to execute after user clicks on OK
- * @param function    openCallback  optional callback to run when dialog is shown
- */
-
-jQuery.fn.PMA_confirm = function (question, url, callbackFn, openCallback) {
-    var confirmState = PMA_commonParams.get('confirm');
-    if (! confirmState) {
-        // user does not want to confirm
-        if ($.isFunction(callbackFn)) {
-            callbackFn.call(this, url);
-            return true;
-        }
-    }
-    if (PMA_messages.strDoYouReally === '') {
-        return true;
-    }
-
-    /**
-     * @var    button_options  Object that stores the options passed to jQueryUI
-     *                          dialog
-     */
-    var button_options = [
-        {
-            text: PMA_messages.strOK,
-            'class': 'submitOK',
-            click: function () {
-                $(this).dialog("close");
-                if ($.isFunction(callbackFn)) {
-                    callbackFn.call(this, url);
-                }
-            }
-        },
-        {
-            text: PMA_messages.strCancel,
-            'class': 'submitCancel',
-            click: function () {
-                $(this).dialog("close");
-            }
-        }
-    ];
-
-    $('<div/>', {'id': 'confirm_dialog', 'title': PMA_messages.strConfirm})
-    .prepend(question)
-    .dialog({
-        buttons: button_options,
-        close: function () {
-            $(this).remove();
-        },
-        open: openCallback,
-        modal: true
-    });
-};
-
-/**
- * jQuery function to sort a table's body after a new row has been appended to it.
- * Also fixes the even/odd classes of the table rows at the end.
- *
- * @param string      text_selector   string to select the sortKey's text
- *
- * @return jQuery Object for chaining purposes
- */
-jQuery.fn.PMA_sort_table = function (text_selector) {
-    return this.each(function () {
-
-        /**
-         * @var table_body  Object referring to the table's <tbody> element
-         */
-        var table_body = $(this);
-        /**
-         * @var rows    Object referring to the collection of rows in {@link table_body}
-         */
-        var rows = $(this).find('tr').get();
-
-        //get the text of the field that we will sort by
-        $.each(rows, function (index, row) {
-            row.sortKey = $.trim($(row).find(text_selector).text().toLowerCase());
-        });
-
-        //get the sorted order
-        rows.sort(function (a, b) {
-            if (a.sortKey < b.sortKey) {
-                return -1;
-            }
-            if (a.sortKey > b.sortKey) {
-                return 1;
-            }
-            return 0;
-        });
-
-        //pull out each row from the table and then append it according to it's order
-        $.each(rows, function (index, row) {
-            $(table_body).append(row);
-            row.sortKey = null;
-        });
-
-        //Re-check the classes of each row
-        $(this).find('tr:odd')
-        .removeClass('even').addClass('odd')
-        .end()
-        .find('tr:even')
-        .removeClass('odd').addClass('even');
-    });
-};
-
-/**
- * Unbind all event handlers before tearing down a page
- */
-AJAX.registerTeardown('functions.js', function () {
-    $(document).off('submit', "#create_table_form_minimal.ajax");
-    $(document).off('submit', "form.create_table_form.ajax");
-    $(document).off('click', "form.create_table_form.ajax input[name=submit_num_fields]");
-    $(document).off('keyup', "form.create_table_form.ajax input");
-    $(document).off('change', "input[name=partition_count],input[name=subpartition_count],select[name=partition_by]");
-});
-
-/**
- * jQuery coding for 'Create Table'.  Used on db_operations.php,
- * db_structure.php and db_tracking.php (i.e., wherever
- * libraries/display_create_table.lib.php is used)
- *
- * Attach Ajax Event handlers for Create Table
- */
-AJAX.registerOnload('functions.js', function () {
-    /**
-     * Attach event handler for submission of create table form (save)
-     */
-    $(document).on('submit', "form.create_table_form.ajax", function (event) {
-        event.preventDefault();
-
-        /**
-         * @var    the_form    object referring to the create table form
-         */
-        var $form = $(this);
-
-        /*
-         * First validate the form; if there is a problem, avoid submitting it
-         *
-         * checkTableEditForm() needs a pure element and not a jQuery object,
-         * this is why we pass $form[0] as a parameter (the jQuery object
-         * is actually an array of DOM elements)
-         */
-
-        if (checkTableEditForm($form[0], $form.find('input[name=orig_num_fields]').val())) {
-            PMA_prepareForAjaxRequest($form);
-            if (PMA_checkReservedWordColumns($form)) {
-                PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
-                //User wants to submit the form
-                $.post($form.attr('action'), $form.serialize() + "&do_save_data=1", function (data) {
-                    if (typeof data !== 'undefined' && data.success === true) {
-                        $('#properties_message')
-                         .removeClass('error')
-                         .html('');
-                        PMA_ajaxShowMessage(data.message);
-                        // Only if the create table dialog (distinct panel) exists
-                        var $createTableDialog = $("#create_table_dialog");
-                        if ($createTableDialog.length > 0) {
-                            $createTableDialog.dialog("close").remove();
-                        }
-                        $('#tableslistcontainer').before(data.formatted_sql);
-
-                        /**
-                         * @var tables_table    Object referring to the <tbody> element that holds the list of tables
-                         */
-                        var tables_table = $("#tablesForm").find("tbody").not("#tbl_summary_row");
-                        // this is the first table created in this db
-                        if (tables_table.length === 0) {
-                            PMA_commonActions.refreshMain(
-                                PMA_commonParams.get('opendb_url')
-                            );
-                        } else {
-                            /**
-                             * @var curr_last_row   Object referring to the last <tr> element in {@link tables_table}
-                             */
-                            var curr_last_row = $(tables_table).find('tr:last');
-                            /**
-                             * @var curr_last_row_index_string   String containing the index of {@link curr_last_row}
-                             */
-                            var curr_last_row_index_string = $(curr_last_row).find('input:checkbox').attr('id').match(/\d+/)[0];
-                            /**
-                             * @var curr_last_row_index Index of {@link curr_last_row}
-                             */
-                            var curr_last_row_index = parseFloat(curr_last_row_index_string);
-                            /**
-                             * @var new_last_row_index   Index of the new row to be appended to {@link tables_table}
-                             */
-                            var new_last_row_index = curr_last_row_index + 1;
-                            /**
-                             * @var new_last_row_id String containing the id of the row to be appended to {@link tables_table}
-                             */
-                            var new_last_row_id = 'checkbox_tbl_' + new_last_row_index;
-
-                            data.new_table_string = data.new_table_string.replace(/checkbox_tbl_/, new_last_row_id);
-                            //append to table
-                            $(data.new_table_string)
-                             .appendTo(tables_table);
-
-                            //Sort the table
-                            $(tables_table).PMA_sort_table('th');
-
-                            // Adjust summary row
-                            PMA_adjustTotals();
-                        }
-
-                        //Refresh navigation as a new table has been added
-                        PMA_reloadNavigation();
-                        // Redirect to table structure page on creation of new table
-                        var params_12 = 'ajax_request=true&ajax_page_request=true';
-                        if (! (history && history.pushState)) {
-                            params_12 += PMA_MicroHistory.menus.getRequestParam();
-                        }
-                        tblStruct_url = 'tbl_structure.php?server=' + data._params.server +
-                            '&db='+ data._params.db + '&token=' + data._params.token +
-                            '&goto=db_structure.php&table=' + data._params.table + '';
-                        $.get(tblStruct_url, params_12, AJAX.responseHandler);
-                    } else {
-                        PMA_ajaxShowMessage(
-                            '<div class="error">' + data.error + '</div>',
-                            false
-                        );
-                    }
-                }); // end $.post()
-            }
-        } // end if (checkTableEditForm() )
-    }); // end create table form (save)
-
-    /**
-     * Submits the intermediate changes in the table creation form
-     * to refresh the UI accordingly
-     */
-    function submitChangesInCreateTableForm (actionParam) {
-
-        /**
-         * @var    the_form    object referring to the create table form
-         */
-        var $form = $('form.create_table_form.ajax');
-
-        var $msgbox = PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
-        PMA_prepareForAjaxRequest($form);
-
-        //User wants to add more fields to the table
-        $.post($form.attr('action'), $form.serialize() + "&" + actionParam, function (data) {
-            if (typeof data !== 'undefined' && data.success) {
-                var $pageContent = $("#page_content");
-                $pageContent.html(data.message);
-                PMA_highlightSQL($pageContent);
-                PMA_verifyColumnsProperties();
-                PMA_hideShowConnection($('.create_table_form select[name=tbl_storage_engine]'));
-                PMA_ajaxRemoveMessage($msgbox);
-            } else {
-                PMA_ajaxShowMessage(data.error);
-            }
-        }); //end $.post()
-    }
-
-    /**
-     * Attach event handler for create table form (add fields)
-     */
-    $(document).on('click', "form.create_table_form.ajax input[name=submit_num_fields]", function (event) {
-        event.preventDefault();
-
-        if (!checkFormElementInRange(this.form, 'added_fields', PMA_messages.strLeastColumnError, 1)) {
-            return;
-        }
-
-        submitChangesInCreateTableForm('submit_num_fields=1');
-    }); // end create table form (add fields)
-
-    $(document).on('keydown', "form.create_table_form.ajax input[name=added_fields]", function (event) {
-        if (event.keyCode == 13) {
-            event.preventDefault();
-            event.stopImmediatePropagation();
-            $(this)
-                .closest('form')
-                .find('input[name=submit_num_fields]')
-                .click();
-        }
-    });
-
-    /**
-     * Attach event handler to manage changes in number of partitions and subpartitions
-     */
-    $(document).on('change', "input[name=partition_count],input[name=subpartition_count],select[name=partition_by]", function (event) {
-        $this = $(this);
-        $form = $this.parents('form');
-        if ($form.is(".create_table_form.ajax")) {
-            submitChangesInCreateTableForm('submit_partition_change=1');
-        } else {
-            $form.submit();
-        }
-    });
-
-    $("input[value=AUTO_INCREMENT]").change(function(){
-        if (this.checked) {
-            var col = /\d/.exec($(this).attr('name'));
-            col = col[0];
-            var $selectFieldKey = $('select[name="field_key[' + col + ']"]');
-            if ($selectFieldKey.val() === 'none_'+col) {
-                $selectFieldKey.val('primary_'+col).change();
-            }
-        }
-    });
-    $('body')
-    .off('click', 'input.preview_sql')
-    .on('click', 'input.preview_sql', function () {
-        var $form = $(this).closest('form');
-        PMA_previewSQL($form);
-    });
-});
-
-
-/**
- * Validates the password field in a form
- *
- * @see    PMA_messages.strPasswordEmpty
- * @see    PMA_messages.strPasswordNotSame
- * @param  object $the_form The form to be validated
- * @return bool
- */
-function PMA_checkPassword($the_form)
-{
-    // Did the user select 'no password'?
-    if ($the_form.find('#nopass_1').is(':checked')) {
-        return true;
-    } else {
-        var $pred = $the_form.find('#select_pred_password');
-        if ($pred.length && ($pred.val() == 'none' || $pred.val() == 'keep')) {
-            return true;
-        }
-    }
-
-    var $password = $the_form.find('input[name=pma_pw]');
-    var $password_repeat = $the_form.find('input[name=pma_pw2]');
-    var alert_msg = false;
-
-    if ($password.val() === '') {
-        alert_msg = PMA_messages.strPasswordEmpty;
-    } else if ($password.val() != $password_repeat.val()) {
-        alert_msg = PMA_messages.strPasswordNotSame;
-    }
-
-    if (alert_msg) {
-        alert(alert_msg);
-        $password.val('');
-        $password_repeat.val('');
-        $password.focus();
-        return false;
-    }
-    return true;
-}
-
-/**
- * Unbind all event handlers before tearing down a page
- */
-AJAX.registerTeardown('functions.js', function () {
-    $(document).off('click', '#change_password_anchor.ajax');
-});
-/**
- * Attach Ajax event handlers for 'Change Password' on index.php
- */
-AJAX.registerOnload('functions.js', function () {
-
-    /* Handler for hostname type */
-    $(document).on('change', '#select_pred_hostname', function () {
-        var hostname = $('#pma_hostname');
-        if (this.value == 'any') {
-            hostname.val('%');
-        } else if (this.value == 'localhost') {
-            hostname.val('localhost');
-        } else if (this.value == 'thishost' && $(this).data('thishost')) {
-            hostname.val($(this).data('thishost'));
-        } else if (this.value == 'hosttable') {
-            hostname.val('').prop('required', false);
-        } else if (this.value == 'userdefined') {
-            hostname.focus().select().prop('required', true);
-        }
-    });
-
-    /* Handler for editing hostname */
-    $(document).on('change', '#pma_hostname', function () {
-        $('#select_pred_hostname').val('userdefined');
-        $('#pma_hostname').prop('required', true);
-    });
-
-    /* Handler for username type */
-    $(document).on('change', '#select_pred_username', function () {
-        if (this.value == 'any') {
-            $('#pma_username').val('').prop('required', false);
-            $('#user_exists_warning').css('display', 'none');
-        } else if (this.value == 'userdefined') {
-            $('#pma_username').focus().select().prop('required', true);
-        }
-    });
-
-    /* Handler for editing username */
-    $(document).on('change', '#pma_username', function () {
-        $('#select_pred_username').val('userdefined');
-        $('#pma_username').prop('required', true);
-    });
-
-    /* Handler for password type */
-    $(document).on('change', '#select_pred_password', function () {
-        if (this.value == 'none') {
-            $('#text_pma_pw2').prop('required', false).val('');
-            $('#text_pma_pw').prop('required', false).val('');
-        } else if (this.value == 'userdefined') {
-            $('#text_pma_pw2').prop('required', true);
-            $('#text_pma_pw').prop('required', true).focus().select();
-        } else {
-            $('#text_pma_pw2').prop('required', false);
-            $('#text_pma_pw').prop('required', false);
-        }
-    });
-
-    /* Handler for editing password */
-    $(document).on('change', '#text_pma_pw,#text_pma_pw2', function () {
-        $('#select_pred_password').val('userdefined');
-        $('#text_pma_pw2').prop('required', true);
-        $('#text_pma_pw').prop('required', true);
-    });
-
-    /**
-     * Attach Ajax event handler on the change password anchor
-     */
-    $(document).on('click', '#change_password_anchor.ajax', function (event) {
-        event.preventDefault();
-
-        var $msgbox = PMA_ajaxShowMessage();
-
-        /**
-         * @var button_options  Object containing options to be passed to jQueryUI's dialog
-         */
-        var button_options = {};
-        button_options[PMA_messages.strGo] = function () {
-
-            event.preventDefault();
-
-            /**
-             * @var $the_form    Object referring to the change password form
-             */
-            var $the_form = $("#change_password_form");
-
-            if (! PMA_checkPassword($the_form)) {
-                return false;
-            }
-
-            /**
-             * @var this_value  String containing the value of the submit button.
-             * Need to append this for the change password form on Server Privileges
-             * page to work
-             */
-            var this_value = $(this).val();
-
-            var $msgbox = PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
-            $the_form.append('<input type="hidden" name="ajax_request" value="true" />');
-
-            $.post($the_form.attr('action'), $the_form.serialize() + '&change_pw=' + this_value, function (data) {
-                if (typeof data === 'undefined' || data.success !== true) {
-                    PMA_ajaxShowMessage(data.error, false);
-                    return;
-                }
-
-                var $pageContent = $("#page_content");
-                $pageContent.prepend(data.message);
-                PMA_highlightSQL($pageContent);
-                $("#change_password_dialog").hide().remove();
-                $("#edit_user_dialog").dialog("close").remove();
-                PMA_ajaxRemoveMessage($msgbox);
-            }); // end $.post()
-        };
-
-        button_options[PMA_messages.strCancel] = function () {
-            $(this).dialog('close');
-        };
-        $.get($(this).attr('href'), {'ajax_request': true}, function (data) {
-            if (typeof data === 'undefined' || !data.success) {
-                PMA_ajaxShowMessage(data.error, false);
-                return;
-            }
-
-            $('<div id="change_password_dialog"></div>')
-                .dialog({
-                    title: PMA_messages.strChangePassword,
-                    width: 600,
-                    close: function (ev, ui) {
-                        $(this).remove();
-                    },
-                    buttons: button_options,
-                    modal: true
-                })
-                .append(data.message);
-            // for this dialog, we remove the fieldset wrapping due to double headings
-            $("fieldset#fieldset_change_password")
-                .find("legend").remove().end()
-                .find("table.noclick").unwrap().addClass("some-margin")
-                .find("input#text_pma_pw").focus();
-            displayPasswordGenerateButton();
-            $('#fieldset_change_password_footer').hide();
-            PMA_ajaxRemoveMessage($msgbox);
-            $('#change_password_form').bind('submit', function (e) {
-                e.preventDefault();
-                $(this)
-                    .closest('.ui-dialog')
-                    .find('.ui-dialog-buttonpane .ui-button')
-                    .first()
-                    .click();
-            });
-        }); // end $.get()
-    }); // end handler for change password anchor
-}); // end $() for Change Password
-
-/**
- * Unbind all event handlers before tearing down a page
- */
-AJAX.registerTeardown('functions.js', function () {
-    $(document).off('change', "select.column_type");
-    $(document).off('change', "select.default_type");
-    $(document).off('change', "select.virtuality");
-    $(document).off('change', 'input.allow_null');
-    $(document).off('change', '.create_table_form select[name=tbl_storage_engine]');
-});
-/**
- * Toggle the hiding/showing of the "Open in ENUM/SET editor" message when
- * the page loads and when the selected data type changes
- */
-AJAX.registerOnload('functions.js', function () {
-    // is called here for normal page loads and also when opening
-    // the Create table dialog
-    PMA_verifyColumnsProperties();
-    //
-    // needs on() to work also in the Create Table dialog
-    $(document).on('change', "select.column_type", function () {
-        PMA_showNoticeForEnum($(this));
-    });
-    $(document).on('change', "select.default_type", function () {
-        PMA_hideShowDefaultValue($(this));
-    });
-    $(document).on('change', "select.virtuality", function () {
-        PMA_hideShowExpression($(this));
-    });
-    $(document).on('change', 'input.allow_null', function () {
-        PMA_validateDefaultValue($(this));
-    });
-    $(document).on('change', '.create_table_form select[name=tbl_storage_engine]', function () {
-        PMA_hideShowConnection($(this));
-    });
-});
-
-/**
- * If the chosen storage engine is FEDERATED show connection field. Hide otherwise
- *
- * @param $engine_selector storage engine selector
- */
-function PMA_hideShowConnection($engine_selector)
-{
-    var $connection = $('.create_table_form input[name=connection]');
-    var index = $connection.parent('td').index() + 1;
-    var $labelTh = $connection.parents('tr').prev('tr').children('th:nth-child(' + index + ')');
-    if ($engine_selector.val() != 'FEDERATED') {
-        $connection
-            .prop('disabled', true)
-            .parent('td').hide();
-        $labelTh.hide();
-    } else {
-        $connection
-            .prop('disabled', false)
-            .parent('td').show();
-        $labelTh.show();
-    }
-}
-
-/**
- * If the column does not allow NULL values, makes sure that default is not NULL
- */
-function PMA_validateDefaultValue($null_checkbox)
-{
-    if (! $null_checkbox.prop('checked')) {
-        var $default = $null_checkbox.closest('tr').find('.default_type');
-        if ($default.val() == 'NULL') {
-            $default.val('NONE');
-        }
-    }
-}
-
-/**
- * function to populate the input fields on picking a column from central list
- *
- * @param string  input_id input id of the name field for the column to be populated
- * @param integer offset of the selected column in central list of columns
- */
-function autoPopulate(input_id, offset)
-{
-    var db = PMA_commonParams.get('db');
-    var table = PMA_commonParams.get('table');
-    input_id = input_id.substring(0, input_id.length - 1);
-    $('#' + input_id + '1').val(central_column_list[db + '_' + table][offset].col_name);
-    var col_type = central_column_list[db + '_' + table][offset].col_type.toUpperCase();
-    $('#' + input_id + '2').val(col_type);
-    var $input3 = $('#' + input_id + '3');
-    $input3.val(central_column_list[db + '_' + table][offset].col_length);
-    if(col_type === 'ENUM' || col_type === 'SET') {
-        $input3.next().show();
-    } else {
-        $input3.next().hide();
-    }
-    var col_default = central_column_list[db + '_' + table][offset].col_default.toUpperCase();
-    var $input4 = $('#' + input_id + '4');
-    if (col_default !== '' && col_default !== 'NULL' && col_default !== 'CURRENT_TIMESTAMP') {
-        $input4.val("USER_DEFINED");
-        $input4.next().next().show();
-        $input4.next().next().val(central_column_list[db + '_' + table][offset].col_default);
-    } else {
-        $input4.val(central_column_list[db + '_' + table][offset].col_default);
-        $input4.next().next().hide();
-    }
-    $('#' + input_id + '5').val(central_column_list[db + '_' + table][offset].col_collation);
-    var $input6 = $('#' + input_id + '6');
-    $input6.val(central_column_list[db + '_' + table][offset].col_attribute);
-    if(central_column_list[db + '_' + table][offset].col_extra === 'on update CURRENT_TIMESTAMP') {
-        $input6.val(central_column_list[db + '_' + table][offset].col_extra);
-    }
-    if(central_column_list[db + '_' + table][offset].col_extra.toUpperCase() === 'AUTO_INCREMENT') {
-        $('#' + input_id + '9').prop("checked",true).change();
-    } else {
-        $('#' + input_id + '9').prop("checked",false);
-    }
-    if(central_column_list[db + '_' + table][offset].col_isNull !== '0') {
-        $('#' + input_id + '7').prop("checked",true);
-    } else {
-        $('#' + input_id + '7').prop("checked",false);
-    }
-}
-
-/**
- * Unbind all event handlers before tearing down a page
- */
-AJAX.registerTeardown('functions.js', function () {
-    $(document).off('click', "a.open_enum_editor");
-    $(document).off('click', "input.add_value");
-    $(document).off('click', "#enum_editor td.drop");
-    $(document).off('click', 'a.central_columns_dialog');
-});
-/**
- * @var $enum_editor_dialog An object that points to the jQuery
- *                          dialog of the ENUM/SET editor
- */
-var $enum_editor_dialog = null;
-/**
- * Opens the ENUM/SET editor and controls its functions
- */
-AJAX.registerOnload('functions.js', function () {
-    $(document).on('click', "a.open_enum_editor", function () {
-        // Get the name of the column that is being edited
-        var colname = $(this).closest('tr').find('input:first').val();
-        var title;
-        var i;
-        // And use it to make up a title for the page
-        if (colname.length < 1) {
-            title = PMA_messages.enum_newColumnVals;
-        } else {
-            title = PMA_messages.enum_columnVals.replace(
-                /%s/,
-                '"' + escapeHtml(decodeURIComponent(colname)) + '"'
-            );
-        }
-        // Get the values as a string
-        var inputstring = $(this)
-            .closest('td')
-            .find("input")
-            .val();
-        // Escape html entities
-        inputstring = $('<div/>')
-            .text(inputstring)
-            .html();
-        // Parse the values, escaping quotes and
-        // slashes on the fly, into an array
-        var values = [];
-        var in_string = false;
-        var curr, next, buffer = '';
-        for (i = 0; i < inputstring.length; i++) {
-            curr = inputstring.charAt(i);
-            next = i == inputstring.length ? '' : inputstring.charAt(i + 1);
-            if (! in_string && curr == "'") {
-                in_string = true;
-            } else if (in_string && curr == "\\" && next == "\\") {
-                buffer += "&#92;";
-                i++;
-            } else if (in_string && next == "'" && (curr == "'" || curr == "\\")) {
-                buffer += "&#39;";
-                i++;
-            } else if (in_string && curr == "'") {
-                in_string = false;
-                values.push(buffer);
-                buffer = '';
-            } else if (in_string) {
-                buffer += curr;
-            }
-        }
-        if (buffer.length > 0) {
-            // The leftovers in the buffer are the last value (if any)
-            values.push(buffer);
-        }
-        var fields = '';
-        // If there are no values, maybe the user is about to make a
-        // new list so we add a few for him/her to get started with.
-        if (values.length === 0) {
-            values.push('', '', '', '');
-        }
-        // Add the parsed values to the editor
-        var drop_icon = PMA_getImage('b_drop.png');
-        for (i = 0; i < values.length; i++) {
-            fields += "<tr><td>" +
-                   "<input type='text' value='" + values[i] + "'/>" +
-                   "</td><td class='drop'>" +
-                   drop_icon +
-                   "</td></tr>";
-        }
-        /**
-         * @var dialog HTML code for the ENUM/SET dialog
-         */
-        var dialog = "<div id='enum_editor'>" +
-                   "<fieldset>" +
-                    "<legend>" + title + "</legend>" +
-                    "<p>" + PMA_getImage('s_notice.png') +
-                    PMA_messages.enum_hint + "</p>" +
-                    "<table class='values'>" + fields + "</table>" +
-                    "</fieldset><fieldset class='tblFooters'>" +
-                    "<table class='add'><tr><td>" +
-                    "<div class='slider'></div>" +
-                    "</td><td>" +
-                    "<form><div><input type='submit' class='add_value' value='" +
-                    PMA_sprintf(PMA_messages.enum_addValue, 1) +
-                    "'/></div></form>" +
-                    "</td></tr></table>" +
-                    "<input type='hidden' value='" + // So we know which column's data is being edited
-                    $(this).closest('td').find("input").attr("id") +
-                    "' />" +
-                    "</fieldset>" +
-                    "</div>";
-        /**
-         * @var  Defines functions to be called when the buttons in
-         * the buttonOptions jQuery dialog bar are pressed
-         */
-        var buttonOptions = {};
-        buttonOptions[PMA_messages.strGo] = function () {
-            // When the submit button is clicked,
-            // put the data back into the original form
-            var value_array = [];
-            $(this).find(".values input").each(function (index, elm) {
-                var val = elm.value.replace(/\\/g, '\\\\').replace(/'/g, "''");
-                value_array.push("'" + val + "'");
-            });
-            // get the Length/Values text field where this value belongs
-            var values_id = $(this).find("input[type='hidden']").val();
-            $("input#" + values_id).val(value_array.join(","));
-            $(this).dialog("close");
-        };
-        buttonOptions[PMA_messages.strClose] = function () {
-            $(this).dialog("close");
-        };
-        // Show the dialog
-        var width = parseInt(
-            (parseInt($('html').css('font-size'), 10) / 13) * 340,
-            10
-        );
-        if (! width) {
-            width = 340;
-        }
-        $enum_editor_dialog = $(dialog).dialog({
-            minWidth: width,
-            maxHeight: 450,
-            modal: true,
-            title: PMA_messages.enum_editor,
-            buttons: buttonOptions,
-            open: function () {
-                // Focus the "Go" button after opening the dialog
-                $(this).closest('.ui-dialog').find('.ui-dialog-buttonpane button:first').focus();
-            },
-            close: function () {
-                $(this).remove();
-            }
-        });
-        // slider for choosing how many fields to add
-        $enum_editor_dialog.find(".slider").slider({
-            animate: true,
-            range: "min",
-            value: 1,
-            min: 1,
-            max: 9,
-            slide: function (event, ui) {
-                $(this).closest('table').find('input[type=submit]').val(
-                    PMA_sprintf(PMA_messages.enum_addValue, ui.value)
-                );
-            }
-        });
-        // Focus the slider, otherwise it looks nearly transparent
-        $('a.ui-slider-handle').addClass('ui-state-focus');
-        return false;
-    });
-
-    $(document).on('click', 'a.central_columns_dialog', function (e) {
-        var href = "db_central_columns.php";
-        var db = PMA_commonParams.get('db');
-        var table = PMA_commonParams.get('table');
-        var maxRows = $(this).data('maxrows');
-        var pick = $(this).data('pick');
-        if (pick !== false) {
-            pick = true;
-        }
-        var params = {
-            'ajax_request' : true,
-            'token' : PMA_commonParams.get('token'),
-            'server' : PMA_commonParams.get('server'),
-            'db' : PMA_commonParams.get('db'),
-            'cur_table' : PMA_commonParams.get('table'),
-            'getColumnList':true
-        };
-        var colid = $(this).closest('td').find("input").attr("id");
-        var fields = '';
-        if (! (db + '_' + table in central_column_list)) {
-            central_column_list.push(db + '_' + table);
-            $.ajax({
-                type: 'POST',
-                url: href,
-                data: params,
-                success: function (data) {
-                    central_column_list[db + '_' + table] = $.parseJSON(data.message);
-                },
-                async:false
-            });
-        }
-        var i = 0;
-        var list_size = central_column_list[db + '_' + table].length;
-        var min = (list_size <= maxRows) ? list_size : maxRows;
-        for (i = 0; i < min; i++) {
-
-            fields += '<tr><td><div><span style="font-weight:bold">' +
-                escapeHtml(central_column_list[db + '_' + table][i].col_name) +
-                '</span><br><span style="color:gray">' + central_column_list[db + '_' + table][i].col_type;
-
-            if (central_column_list[db + '_' + table][i].col_attribute !== '') {
-                fields += '(' + escapeHtml(central_column_list[db + '_' + table][i].col_attribute) + ') ';
-            }
-            if (central_column_list[db + '_' + table][i].col_length !== '') {
-                fields += '(' + escapeHtml(central_column_list[db + '_' + table][i].col_length) +') ';
-            }
-            fields += escapeHtml(central_column_list[db + '_' + table][i].col_extra) + '</span>' +
-                '</div></td>';
-            if (pick) {
-                fields += '<td><input class="pick" style="width:100%" type="submit" value="' +
-                    PMA_messages.pickColumn + '" onclick="autoPopulate(\'' + colid + '\',' + i + ')"/></td>';
-            }
-            fields += '</tr>';
-        }
-        var result_pointer = i;
-        var search_in = '<input type="text" class="filter_rows" placeholder="' + PMA_messages.searchList + '">';
-        if (fields === '') {
-            fields = PMA_sprintf(PMA_messages.strEmptyCentralList, "'" + escapeHtml(db) + "'");
-            search_in = '';
-        }
-        var seeMore = '';
-        if (list_size > maxRows) {
-            seeMore = "<fieldset class='tblFooters' style='text-align:center;font-weight:bold'>" +
-                "<a href='#' id='seeMore'>" + PMA_messages.seeMore + "</a></fieldset>";
-        }
-        var central_columns_dialog = "<div style='max-height:400px'>" +
-            "<fieldset>" +
-            search_in +
-            "<table id='col_list' style='width:100%' class='values'>" + fields + "</table>" +
-            "</fieldset>" +
-            seeMore +
-            "</div>";
-
-        var width = parseInt(
-            (parseInt($('html').css('font-size'), 10) / 13) * 500,
-            10
-        );
-        if (! width) {
-            width = 500;
-        }
-        var buttonOptions = {};
-        var $central_columns_dialog = $(central_columns_dialog).dialog({
-            minWidth: width,
-            maxHeight: 450,
-            modal: true,
-            title: PMA_messages.pickColumnTitle,
-            buttons: buttonOptions,
-            open: function () {
-                $('#col_list').on("click", ".pick", function (){
-                    $central_columns_dialog.remove();
-                });
-                $(".filter_rows").on("keyup", function () {
-                    $.uiTableFilter($("#col_list"), $(this).val());
-                });
-                $("#seeMore").click(function() {
-                    fields = '';
-                    min = (list_size <= maxRows + result_pointer) ? list_size : maxRows + result_pointer;
-                    for (i = result_pointer; i < min; i++) {
-
-                        fields += '<tr><td><div><span style="font-weight:bold">' +
-                            central_column_list[db + '_' + table][i].col_name +
-                            '</span><br><span style="color:gray">' +
-                            central_column_list[db + '_' + table][i].col_type;
-
-                        if (central_column_list[db + '_' + table][i].col_attribute !== '') {
-                            fields += '(' + central_column_list[db + '_' + table][i].col_attribute + ') ';
-                        }
-                        if (central_column_list[db + '_' + table][i].col_length !== '') {
-                            fields += '(' + central_column_list[db + '_' + table][i].col_length + ') ';
-                        }
-                        fields += central_column_list[db + '_' + table][i].col_extra + '</span>' +
-                            '</div></td>';
-                        if (pick) {
-                            fields += '<td><input class="pick" style="width:100%" type="submit" value="' +
-                                PMA_messages.pickColumn + '" onclick="autoPopulate(\'' + colid + '\',' + i + ')"/></td>';
-                        }
-                        fields += '</tr>';
-                    }
-                    $("#col_list").append(fields);
-                    result_pointer = i;
-                    if (result_pointer === list_size) {
-                        $('.tblFooters').hide();
-                    }
-                    return false;
-                });
-                $(this).closest('.ui-dialog').find('.ui-dialog-buttonpane button:first').focus();
-            },
-            close: function () {
-                $('#col_list').off("click", ".pick");
-                $(".filter_rows").off("keyup");
-                $(this).remove();
-            }
-        });
-        return false;
-    });
-
-   // $(document).on('click', 'a.show_central_list',function(e) {
-
-   // });
-    // When "add a new value" is clicked, append an empty text field
-    $(document).on('click', "input.add_value", function (e) {
-        e.preventDefault();
-        var num_new_rows = $enum_editor_dialog.find("div.slider").slider('value');
-        while (num_new_rows--) {
-            $enum_editor_dialog.find('.values')
-                .append(
-                    "<tr style='display: none;'><td>" +
-                    "<input type='text' />" +
-                    "</td><td class='drop'>" +
-                    PMA_getImage('b_drop.png') +
-                    "</td></tr>"
-                )
-                .find('tr:last')
-                .show('fast');
-        }
-    });
-
-    // Removes the specified row from the enum editor
-    $(document).on('click', "#enum_editor td.drop", function () {
-        $(this).closest('tr').hide('fast', function () {
-            $(this).remove();
-        });
-    });
-});
-
-/**
- * Ensures indexes names are valid according to their type and, for a primary
- * key, lock index name to 'PRIMARY'
- * @param string   form_id  Variable which parses the form name as
- *                            the input
- * @return boolean  false    if there is no index form, true else
- */
-function checkIndexName(form_id)
-{
-    if ($("#" + form_id).length === 0) {
-        return false;
-    }
-
-    // Gets the elements pointers
-    var $the_idx_name = $("#input_index_name");
-    var $the_idx_choice = $("#select_index_choice");
-
-    // Index is a primary key
-    if ($the_idx_choice.find("option:selected").val() == 'PRIMARY') {
-        $the_idx_name.val('PRIMARY');
-        $the_idx_name.prop("disabled", true);
-    }
-
-    // Other cases
-    else {
-        if ($the_idx_name.val() == 'PRIMARY') {
-            $the_idx_name.val("");
-        }
-        $the_idx_name.prop("disabled", false);
-    }
-
-    return true;
-} // end of the 'checkIndexName()' function
-
-AJAX.registerTeardown('functions.js', function () {
-    $(document).off('click', '#index_frm input[type=submit]');
-});
-AJAX.registerOnload('functions.js', function () {
-    /**
-     * Handler for adding more columns to an index in the editor
-     */
-    $(document).on('click', '#index_frm input[type=submit]', function (event) {
-        event.preventDefault();
-        var rows_to_add = $(this)
-            .closest('fieldset')
-            .find('.slider')
-            .slider('value');
-
-        var tempEmptyVal = function () {
-            $(this).val('');
-        };
-
-        var tempSetFocus = function () {
-            if ($(this).find("option:selected").val() === '') {
-                return true;
-            }
-            $(this).closest("tr").find("input").focus();
-        };
-
-        while (rows_to_add--) {
-            var $indexColumns = $('#index_columns');
-            var $newrow = $indexColumns
-                .find('tbody > tr:first')
-                .clone()
-                .appendTo(
-                    $indexColumns.find('tbody')
-                );
-            $newrow.find(':input').each(tempEmptyVal);
-            // focus index size input on column picked
-            $newrow.find('select').change(tempSetFocus);
-        }
-    });
-});
-
-function indexEditorDialog(url, title, callback_success, callback_failure)
-{
-    /*Remove the hidden dialogs if there are*/
-    var $editIndexDialog = $('#edit_index_dialog');
-    if ($editIndexDialog.length !== 0) {
-        $editIndexDialog.remove();
-    }
-    var $div = $('<div id="edit_index_dialog"></div>');
-
-    /**
-     * @var button_options Object that stores the options
-     *                     passed to jQueryUI dialog
-     */
-    var button_options = {};
-    button_options[PMA_messages.strGo] = function () {
-        /**
-         * @var    the_form    object referring to the export form
-         */
-        var $form = $("#index_frm");
-        var $msgbox = PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
-        PMA_prepareForAjaxRequest($form);
-        //User wants to submit the form
-        $.post($form.attr('action'), $form.serialize() + "&do_save_data=1", function (data) {
-            var $sqlqueryresults = $(".sqlqueryresults");
-            if ($sqlqueryresults.length !== 0) {
-                $sqlqueryresults.remove();
-            }
-            if (typeof data !== 'undefined' && data.success === true) {
-                PMA_ajaxShowMessage(data.message);
-                var $resultQuery = $('.result_query');
-                if ($resultQuery.length) {
-                    $resultQuery.remove();
-                }
-                if (data.sql_query) {
-                    $('<div class="result_query"></div>')
-                        .html(data.sql_query)
-                        .prependTo('#page_content');
-                    PMA_highlightSQL($('#page_content'));
-                }
-                $(".result_query .notice").remove();
-                $resultQuery.prepend(data.message);
-                /*Reload the field form*/
-                $("#table_index").remove();
-                $("<div id='temp_div'><div>")
-                    .append(data.index_table)
-                    .find("#table_index")
-                    .insertAfter("#index_header");
-                var $editIndexDialog = $("#edit_index_dialog");
-                if ($editIndexDialog.length > 0) {
-                    $editIndexDialog.dialog("close");
-                }
-                $('div.no_indexes_defined').hide();
-                if (callback_success) {
-                    callback_success();
-                }
-                PMA_reloadNavigation();
-            } else {
-                var $temp_div = $("<div id='temp_div'><div>").append(data.error);
-                var $error;
-                if ($temp_div.find(".error code").length !== 0) {
-                    $error = $temp_div.find(".error code").addClass("error");
-                } else {
-                    $error = $temp_div;
-                }
-                if (callback_failure) {
-                    callback_failure();
-                }
-                PMA_ajaxShowMessage($error, false);
-            }
-        }); // end $.post()
-    };
-    button_options[PMA_messages.strPreviewSQL] = function () {
-        // Function for Previewing SQL
-        var $form = $('#index_frm');
-        PMA_previewSQL($form);
-    };
-    button_options[PMA_messages.strCancel] = function () {
-        $(this).dialog('close');
-    };
-    var $msgbox = PMA_ajaxShowMessage();
-    $.get("tbl_indexes.php", url, function (data) {
-        if (typeof data !== 'undefined' && data.success === false) {
-            //in the case of an error, show the error message returned.
-            PMA_ajaxShowMessage(data.error, false);
-        } else {
-            PMA_ajaxRemoveMessage($msgbox);
-            // Show dialog if the request was successful
-            $div
-            .append(data.message)
-            .dialog({
-                title: title,
-                width: 450,
-                height: 350,
-                open: PMA_verifyColumnsProperties,
-                modal: true,
-                buttons: button_options,
-                close: function () {
-                    $(this).remove();
-                }
-            });
-            $div.find('.tblFooters').remove();
-            showIndexEditDialog($div);
-        }
-    }); // end $.get()
-}
-
-function showIndexEditDialog($outer)
-{
-    checkIndexType();
-    checkIndexName("index_frm");
-    var $indexColumns = $('#index_columns');
-    $indexColumns.find('td').each(function () {
-        $(this).css("width", $(this).width() + 'px');
-    });
-    $indexColumns.find('tbody').sortable({
-        axis: 'y',
-        containment: $indexColumns.find("tbody"),
-        tolerance: 'pointer'
-    });
-    PMA_showHints($outer);
-    PMA_init_slider();
-    // Add a slider for selecting how many columns to add to the index
-    $outer.find('.slider').slider({
-        animate: true,
-        value: 1,
-        min: 1,
-        max: 16,
-        slide: function (event, ui) {
-            $(this).closest('fieldset').find('input[type=submit]').val(
-                PMA_sprintf(PMA_messages.strAddToIndex, ui.value)
-            );
-        }
-    });
-    $('div.add_fields').removeClass('hide');
-    // focus index size input on column picked
-    $outer.find('table#index_columns select').change(function () {
-        if ($(this).find("option:selected").val() === '') {
-            return true;
-        }
-        $(this).closest("tr").find("input").focus();
-    });
-    // Focus the slider, otherwise it looks nearly transparent
-    $('a.ui-slider-handle').addClass('ui-state-focus');
-    // set focus on index name input, if empty
-    var input = $outer.find('input#input_index_name');
-    if (! input.val()) {
-        input.focus();
-    }
-}
-
-/**
- * Function to display tooltips that were
- * generated on the PHP side by PMA\libraries\Util::showHint()
- *
- * @param object $div a div jquery object which specifies the
- *                    domain for searching for tooltips. If we
- *                    omit this parameter the function searches
- *                    in the whole body
- **/
-function PMA_showHints($div)
-{
-    if ($div === undefined || ! $div instanceof jQuery || $div.length === 0) {
-        $div = $("body");
-    }
-    $div.find('.pma_hint').each(function () {
-        PMA_tooltip(
-            $(this).children('img'),
-            'img',
-            $(this).children('span').html()
-        );
-    });
-}
-
-AJAX.registerOnload('functions.js', function () {
-    PMA_showHints();
-});
-
-function PMA_mainMenuResizerCallback() {
-    // 5 px margin for jumping menu in Chrome
-    return $(document.body).width() - 5;
-}
-// This must be fired only once after the initial page load
-$(function () {
-    // Initialise the menu resize plugin
-    $('#topmenu').menuResizer(PMA_mainMenuResizerCallback);
-    // register resize event
-    $(window).resize(function () {
-        $('#topmenu').menuResizer('resize');
-    });
-});
-
-/**
- * Get the row number from the classlist (for example, row_1)
- */
-function PMA_getRowNumber(classlist)
-{
-    return parseInt(classlist.split(/\s+row_/)[1], 10);
-}
-
-/**
- * Changes status of slider
- */
-function PMA_set_status_label($element)
-{
-    var text;
-    if ($element.css('display') == 'none') {
-        text = '+ ';
-    } else {
-        text = '- ';
-    }
-    $element.closest('.slide-wrapper').prev().find('span').text(text);
-}
-
-/**
- * var  toggleButton  This is a function that creates a toggle
- *                    sliding button given a jQuery reference
- *                    to the correct DOM element
- */
-var toggleButton = function ($obj) {
-    // In rtl mode the toggle switch is flipped horizontally
-    // so we need to take that into account
-    var right;
-    if ($('span.text_direction', $obj).text() == 'ltr') {
-        right = 'right';
-    } else {
-        right = 'left';
-    }
-    /**
-     *  var  h  Height of the button, used to scale the
-     *          background image and position the layers
-     */
-    var h = $obj.height();
-    $('img', $obj).height(h);
-    $('table', $obj).css('bottom', h - 1);
-    /**
-     *  var  on   Width of the "ON" part of the toggle switch
-     *  var  off  Width of the "OFF" part of the toggle switch
-     */
-    var on  = $('td.toggleOn', $obj).width();
-    var off = $('td.toggleOff', $obj).width();
-    // Make the "ON" and "OFF" parts of the switch the same size
-    // + 2 pixels to avoid overflowed
-    $('td.toggleOn > div', $obj).width(Math.max(on, off) + 2);
-    $('td.toggleOff > div', $obj).width(Math.max(on, off) + 2);
-    /**
-     *  var  w  Width of the central part of the switch
-     */
-    var w = parseInt(($('img', $obj).height() / 16) * 22, 10);
-    // Resize the central part of the switch on the top
-    // layer to match the background
-    $('table td:nth-child(2) > div', $obj).width(w);
-    /**
-     *  var  imgw    Width of the background image
-     *  var  tblw    Width of the foreground layer
-     *  var  offset  By how many pixels to move the background
-     *               image, so that it matches the top layer
-     */
-    var imgw = $('img', $obj).width();
-    var tblw = $('table', $obj).width();
-    var offset = parseInt(((imgw - tblw) / 2), 10);
-    // Move the background to match the layout of the top layer
-    $obj.find('img').css(right, offset);
-    /**
-     *  var  offw    Outer width of the "ON" part of the toggle switch
-     *  var  btnw    Outer width of the central part of the switch
-     */
-    var offw = $('td.toggleOff', $obj).outerWidth();
-    var btnw = $('table td:nth-child(2)', $obj).outerWidth();
-    // Resize the main div so that exactly one side of
-    // the switch plus the central part fit into it.
-    $obj.width(offw + btnw + 2);
-    /**
-     *  var  move  How many pixels to move the
-     *             switch by when toggling
-     */
-    var move = $('td.toggleOff', $obj).outerWidth();
-    // If the switch is initialized to the
-    // OFF state we need to move it now.
-    if ($('div.container', $obj).hasClass('off')) {
-        if (right == 'right') {
-            $('div.container', $obj).animate({'left': '-=' + move + 'px'}, 0);
-        } else {
-            $('div.container', $obj).animate({'left': '+=' + move + 'px'}, 0);
-        }
-    }
-    // Attach an 'onclick' event to the switch
-    $('div.container', $obj).click(function () {
-        if ($(this).hasClass('isActive')) {
-            return false;
-        } else {
-            $(this).addClass('isActive');
-        }
-        var $msg = PMA_ajaxShowMessage();
-        var $container = $(this);
-        var callback = $('span.callback', this).text();
-        var operator, url, removeClass, addClass;
-        // Perform the actual toggle
-        if ($(this).hasClass('on')) {
-            if (right == 'right') {
-                operator = '-=';
-            } else {
-                operator = '+=';
-            }
-            url = $(this).find('td.toggleOff > span').text();
-            removeClass = 'on';
-            addClass = 'off';
-        } else {
-            if (right == 'right') {
-                operator = '+=';
-            } else {
-                operator = '-=';
-            }
-            url = $(this).find('td.toggleOn > span').text();
-            removeClass = 'off';
-            addClass = 'on';
-        }
-        $.post(url, {'ajax_request': true}, function (data) {
-            if (typeof data !== 'undefined' && data.success === true) {
-                PMA_ajaxRemoveMessage($msg);
-                $container
-                .removeClass(removeClass)
-                .addClass(addClass)
-                .animate({'left': operator + move + 'px'}, function () {
-                    $container.removeClass('isActive');
-                });
-                eval(callback);
-            } else {
-                PMA_ajaxShowMessage(data.error, false);
-                $container.removeClass('isActive');
-            }
-        });
-    });
-};
-
-/**
- * Unbind all event handlers before tearing down a page
- */
-AJAX.registerTeardown('functions.js', function () {
-    $('div.container').unbind('click');
-});
-/**
- * Initialise all toggle buttons
- */
-AJAX.registerOnload('functions.js', function () {
-    $('div.toggleAjax').each(function () {
-        var $button = $(this).show();
-        $button.find('img').each(function () {
-            if (this.complete) {
-                toggleButton($button);
-            } else {
-                $(this).load(function () {
-                    toggleButton($button);
-                });
-            }
-        });
-    });
-});
-
-/**
- * Unbind all event handlers before tearing down a page
- */
-AJAX.registerTeardown('functions.js', function () {
-    $(document).off('change', 'select.pageselector');
-    $(document).off('click', 'a.formLinkSubmit');
-    $('#update_recent_tables').unbind('ready');
-    $('#sync_favorite_tables').unbind('ready');
-});
-
-AJAX.registerOnload('functions.js', function () {
-
-    /**
-     * Autosubmit page selector
-     */
-    $(document).on('change', 'select.pageselector', function (event) {
-        event.stopPropagation();
-        // Check where to load the new content
-        if ($(this).closest("#pma_navigation").length === 0) {
-            // For the main page we don't need to do anything,
-            $(this).closest("form").submit();
-        } else {
-            // but for the navigation we need to manually replace the content
-            PMA_navigationTreePagination($(this));
-        }
-    });
-
-    /**
-     * Load version information asynchronously.
-     */
-    if ($('li.jsversioncheck').length > 0) {
-        $.ajax({
-            dataType: "json",
-            url: 'version_check.php',
-            method: "POST",
-            data: {
-                "server": PMA_commonParams.get('server'),
-                "token": PMA_commonParams.get('token'),
-            },
-            success: PMA_current_version
-        });
-    }
-
-    if ($('#is_git_revision').length > 0) {
-        setTimeout(PMA_display_git_revision, 10);
-    }
-
-    /**
-     * Slider effect.
-     */
-    PMA_init_slider();
-
-    /**
-     * Enables the text generated by PMA\libraries\Util::linkOrButton() to be clickable
-     */
-    $(document).on('click', 'a.formLinkSubmit', function (e) {
-        if (! $(this).hasClass('requireConfirm')) {
-            submitFormLink($(this));
-            return false;
-        }
-    });
-
-    var $updateRecentTables = $('#update_recent_tables');
-    if ($updateRecentTables.length) {
-        $.get(
-            $updateRecentTables.attr('href'),
-            {no_debug: true},
-            function (data) {
-                if (typeof data !== 'undefined' && data.success === true) {
-                    $('#pma_recent_list').html(data.list);
-                }
-            }
-        );
-    }
-
-    // Sync favorite tables from localStorage to pmadb.
-    if ($('#sync_favorite_tables').length) {
-        $.ajax({
-            url: $('#sync_favorite_tables').attr("href"),
-            cache: false,
-            type: 'POST',
-            data: {
-                favorite_tables: (isStorageSupported('localStorage') && typeof window.localStorage.favorite_tables !== 'undefined')
-                    ? window.localStorage.favorite_tables
-                    : '',
-                no_debug: true
-            },
-            success: function (data) {
-                // Update localStorage.
-                if (isStorageSupported('localStorage')) {
-                    window.localStorage.favorite_tables = data.favorite_tables;
-                }
-                $('#pma_favorite_list').html(data.list);
-            }
-        });
-    }
-}); // end of $()
-
-/**
- * Submits the form placed in place of a link due to the excessive url length
- *
- * @param $link anchor
- * @returns {Boolean}
- */
-function submitFormLink($link)
-{
-    if ($link.attr('href').indexOf('=') != -1) {
-        var data = $link.attr('href').substr($link.attr('href').indexOf('#') + 1).split('=', 2);
-        $link.parents('form').append('<input type="hidden" name="' + data[0] + '" value="' + data[1] + '"/>');
-    }
-    $link.parents('form').submit();
-}
-
-/**
- * Initializes slider effect.
- */
-function PMA_init_slider()
-{
-    $('div.pma_auto_slider').each(function () {
-        var $this = $(this);
-        if ($this.data('slider_init_done')) {
-            return;
-        }
-        var $wrapper = $('<div>', {'class': 'slide-wrapper'});
-        $wrapper.toggle($this.is(':visible'));
-        $('<a>', {href: '#' + this.id, "class": 'ajax'})
-            .text($this.attr('title'))
-            .prepend($('<span>'))
-            .insertBefore($this)
-            .click(function () {
-                var $wrapper = $this.closest('.slide-wrapper');
-                var visible = $this.is(':visible');
-                if (!visible) {
-                    $wrapper.show();
-                }
-                $this[visible ? 'hide' : 'show']('blind', function () {
-                    $wrapper.toggle(!visible);
-                    $wrapper.parent().toggleClass("print_ignore", visible);
-                    PMA_set_status_label($this);
-                });
-                return false;
-            });
-        $this.wrap($wrapper);
-        $this.removeAttr('title');
-        PMA_set_status_label($this);
-        $this.data('slider_init_done', 1);
-    });
-}
-
-/**
- * Initializes slider effect.
- */
-AJAX.registerOnload('functions.js', function () {
-    PMA_init_slider();
-});
-
-/**
- * Restores sliders to the state they were in before initialisation.
- */
-AJAX.registerTeardown('functions.js', function () {
-    $('div.pma_auto_slider').each(function () {
-        var $this = $(this);
-        $this.removeData();
-        $this.parent().replaceWith($this);
-        $this.parent().children('a').remove();
-    });
-});
-
-/**
- * Creates a message inside an object with a sliding effect
- *
- * @param msg    A string containing the text to display
- * @param $obj   a jQuery object containing the reference
- *                 to the element where to put the message
- *                 This is optional, if no element is
- *                 provided, one will be created below the
- *                 navigation links at the top of the page
- *
- * @return bool   True on success, false on failure
- */
-function PMA_slidingMessage(msg, $obj)
-{
-    if (msg === undefined || msg.length === 0) {
-        // Don't show an empty message
-        return false;
-    }
-    if ($obj === undefined || ! $obj instanceof jQuery || $obj.length === 0) {
-        // If the second argument was not supplied,
-        // we might have to create a new DOM node.
-        if ($('#PMA_slidingMessage').length === 0) {
-            $('#page_content').prepend(
-                '<span id="PMA_slidingMessage" ' +
-                'style="display: inline-block;"></span>'
-            );
-        }
-        $obj = $('#PMA_slidingMessage');
-    }
-    if ($obj.has('div').length > 0) {
-        // If there already is a message inside the
-        // target object, we must get rid of it
-        $obj
-        .find('div')
-        .first()
-        .fadeOut(function () {
-            $obj
-            .children()
-            .remove();
-            $obj
-            .append('<div>' + msg + '</div>');
-            // highlight any sql before taking height;
-            PMA_highlightSQL($obj);
-            $obj.find('div')
-                .first()
-                .hide();
-            $obj
-            .animate({
-                height: $obj.find('div').first().height()
-            })
-            .find('div')
-            .first()
-            .fadeIn();
-        });
-    } else {
-        // Object does not already have a message
-        // inside it, so we simply slide it down
-        $obj.width('100%')
-            .html('<div>' + msg + '</div>');
-        // highlight any sql before taking height;
-        PMA_highlightSQL($obj);
-        var h = $obj
-            .find('div')
-            .first()
-            .hide()
-            .height();
-        $obj
-        .find('div')
-        .first()
-        .css('height', 0)
-        .show()
-        .animate({
-                height: h
-            }, function () {
-            // Set the height of the parent
-            // to the height of the child
-                $obj
-                .height(
-                    $obj
-                    .find('div')
-                    .first()
-                    .height()
-                );
-            });
-    }
-    return true;
-} // end PMA_slidingMessage()
-
-/**
- * Attach CodeMirror2 editor to SQL edit area.
- */
-AJAX.registerOnload('functions.js', function () {
-    var $elm = $('#sqlquery');
-    if ($elm.length > 0) {
-        if (typeof CodeMirror != 'undefined') {
-            codemirror_editor = PMA_getSQLEditor($elm);
-            codemirror_editor.focus();
-            codemirror_editor.on("blur", updateQueryParameters);
-        } else {
-            // without codemirror
-            $elm.focus()
-                .bind('blur', updateQueryParameters);
-        }
-    }
-    PMA_highlightSQL($('body'));
-});
-AJAX.registerTeardown('functions.js', function () {
-    if (codemirror_editor) {
-        $('#sqlquery').text(codemirror_editor.getValue());
-        codemirror_editor.toTextArea();
-        codemirror_editor = false;
-    }
-});
-AJAX.registerOnload('functions.js', function () {
-    // initializes all lock-page elements lock-id and
-    // val-hash data property
-    $('#page_content form.lock-page textarea, ' +
-            '#page_content form.lock-page input[type="text"], '+
-            '#page_content form.lock-page input[type="number"], '+
-            '#page_content form.lock-page select').each(function (i) {
-        $(this).data('lock-id', i);
-        // val-hash is the hash of default value of the field
-        // so that it can be compared with new value hash
-        // to check whether field was modified or not.
-        $(this).data('val-hash', AJAX.hash($(this).val()));
-    });
-
-    // initializes lock-page elements (input types checkbox and radio buttons)
-    // lock-id and val-hash data property
-    $('#page_content form.lock-page input[type="checkbox"], ' +
-            '#page_content form.lock-page input[type="radio"]').each(function (i) {
-        $(this).data('lock-id', i);
-        $(this).data('val-hash', AJAX.hash($(this).is(":checked")));
-    });
-});
-
-/**
- * jQuery plugin to correctly filter input fields by value, needed
- * because some nasty values may break selector syntax
- */
-(function ($) {
-    $.fn.filterByValue = function (value) {
-        return this.filter(function () {
-            return $(this).val() === value;
-        });
-    };
-})(jQuery);
-
-/**
- * Return value of a cell in a table.
- */
-function PMA_getCellValue(td) {
-    var $td = $(td);
-    if ($td.is('.null')) {
-        return '';
-    } else if ((! $td.is('.to_be_saved')
-        || $td.is('.set'))
-        && $td.data('original_data')
-    ) {
-        return $td.data('original_data');
-    } else {
-        return $td.text();
-    }
-}
-
-$(window).on('popstate', function (event, data) {
-    $('#printcss').attr('media','print');
-    return true;
-});
-
-/**
- * Unbind all event handlers before tearing down a page
- */
-AJAX.registerTeardown('functions.js', function () {
-    $(document).off('click', 'a.themeselect');
-    $(document).off('change', '.autosubmit');
-    $('a.take_theme').unbind('click');
-});
-
-AJAX.registerOnload('functions.js', function () {
-    /**
-     * Theme selector.
-     */
-    $(document).on('click', 'a.themeselect', function (e) {
-        window.open(
-            e.target,
-            'themes',
-            'left=10,top=20,width=510,height=350,scrollbars=yes,status=yes,resizable=yes'
-            );
-        return false;
-    });
-
-    /**
-     * Automatic form submission on change.
-     */
-    $(document).on('change', '.autosubmit', function (e) {
-        $(this).closest('form').submit();
-    });
-
-    /**
-     * Theme changer.
-     */
-    $('a.take_theme').click(function (e) {
-        var what = this.name;
-        if (window.opener && window.opener.document.forms.setTheme.elements.set_theme) {
-            window.opener.document.forms.setTheme.elements.set_theme.value = what;
-            window.opener.document.forms.setTheme.submit();
-            window.close();
-            return false;
-        }
-        return true;
-    });
-});
-
-/**
- * Produce print preview
- */
-function printPreview()
-{
-    $('#printcss').attr('media','all');
-    createPrintAndBackButtons();
-}
-
-/**
- * Create print and back buttons in preview page
- */
-function createPrintAndBackButtons() {
-
-    var back_button = $("<input/>",{
-        type: 'button',
-        value: PMA_messages.back,
-        id: 'back_button_print_view'
-    });
-    back_button.click(removePrintAndBackButton);
-    back_button.appendTo('#page_content');
-    var print_button = $("<input/>",{
-        type: 'button',
-        value: PMA_messages.print,
-        id: 'print_button_print_view'
-    });
-    print_button.click(printPage);
-    print_button.appendTo('#page_content');
-}
-
-/**
- * Remove print and back buttons and revert to normal view
- */
-function removePrintAndBackButton(){
-    $('#printcss').attr('media','print');
-    $('#back_button_print_view').remove();
-    $('#print_button_print_view').remove();
-}
-
-/**
- * Print page
- */
-function printPage(){
-    if (typeof(window.print) != 'undefined') {
-        window.print();
-    }
-}
-
-/**
- * Print button
- */
-function copyToClipboard()
-{
-    var textArea = document.createElement("textarea");
-
-    //
-    // *** This styling is an extra step which is likely not required. ***
-    //
-    // Why is it here? To ensure:
-    // 1. the element is able to have focus and selection.
-    // 2. if element was to flash render it has minimal visual impact.
-    // 3. less flakyness with selection and copying which **might** occur if
-    //    the textarea element is not visible.
-    //
-    // The likelihood is the element won't even render, not even a flash,
-    // so some of these are just precautions. However in IE the element
-    // is visible whilst the popup box asking the user for permission for
-    // the web page to copy to the clipboard.
-    //
-
-    // Place in top-left corner of screen regardless of scroll position.
-    textArea.style.position = 'fixed';
-    textArea.style.top = 0;
-    textArea.style.left = 0;
-
-    // Ensure it has a small width and height. Setting to 1px / 1em
-    // doesn't work as this gives a negative w/h on some browsers.
-    textArea.style.width = '2em';
-    textArea.style.height = '2em';
-
-    // We don't need padding, reducing the size if it does flash render.
-    textArea.style.padding = 0;
-
-    // Clean up any borders.
-    textArea.style.border = 'none';
-    textArea.style.outline = 'none';
-    textArea.style.boxShadow = 'none';
-
-    // Avoid flash of white box if rendered for any reason.
-    textArea.style.background = 'transparent';
-
-    textArea.value = '';
-
-    var elementList = $('#serverinfo a');
-
-    elementList.each(function(){
-        textArea.value += $(this).text().split(':')[1].trim() + '/';
-    });
-    textArea.value += '\t\t' + window.location.href;
-    textArea.value += '\n';
-
-    elementList = $('.notice,.success');
-
-    elementList.each(function(){
-        textArea.value += $(this).clone().children().remove().end().text() + '\n\n';
-    });
-
-    elementList = $('.sql pre');
-
-    elementList.each(function() {
-        textArea.value += $(this).text() + '\n\n';
-    });
-
-    elementList = $('.table_results .column_heading a');
-
-    elementList.each(function() {
-        textArea.value += $(this).clone().children().remove().end().text() + '\t';
-    });
-
-    textArea.value += '\n';
-    elementList = $('tbody .odd,tbody .even');
-    elementList.each(function() {
-        var childElementList = $(this).find('.data span');
-        childElementList.each(function(){
-            textArea.value += $(this).clone().children().remove().end().text() + '\t';
-        });
-        textArea.value += '\n';
-    });
-
-    document.body.appendChild(textArea);
-
-    textArea.select();
-
-    try {
-        document.execCommand('copy');
-    } catch (err) {
-        alert('Sorry! Unable to copy');
-    }
-
-    document.body.removeChild(textArea);
-}
-
-/**
- * Unbind all event handlers before tearing down a page
- */
-AJAX.registerTeardown('functions.js', function () {
-    $('input#print').unbind('click');
-    $(document).off('click', 'a.create_view.ajax');
-    $(document).off('keydown', '#createViewDialog input, #createViewDialog select');
-    $(document).off('change', '#fkc_checkbox');
-});
-
-AJAX.registerOnload('functions.js', function () {
-    $('input#print').click(printPage);
-    /**
-     * Ajaxification for the "Create View" action
-     */
-    $(document).on('click', 'a.create_view.ajax', function (e) {
-        e.preventDefault();
-        PMA_createViewDialog($(this));
-    });
-    /**
-     * Attach Ajax event handlers for input fields in the editor
-     * and used to submit the Ajax request when the ENTER key is pressed.
-     */
-    if ($('#createViewDialog').length !== 0) {
-        $(document).on('keydown', '#createViewDialog input, #createViewDialog select', function (e) {
-            if (e.which === 13) { // 13 is the ENTER key
-                e.preventDefault();
-
-                // with preventing default, selection by <select> tag
-                // was also prevented in IE
-                $(this).blur();
-
-                $(this).closest('.ui-dialog').find('.ui-button:first').click();
-            }
-        }); // end $(document).on()
-    }
-
-    syntaxHighlighter = PMA_getSQLEditor($('textarea[name="view[as]"]'));
-
-});
-
-function PMA_createViewDialog($this)
-{
-    var $msg = PMA_ajaxShowMessage();
-    var syntaxHighlighter = null;
-    $.get($this.attr('href') + '&ajax_request=1&ajax_dialog=1', function (data) {
-        if (typeof data !== 'undefined' && data.success === true) {
-            PMA_ajaxRemoveMessage($msg);
-            var buttonOptions = {};
-            buttonOptions[PMA_messages.strGo] = function () {
-                if (typeof CodeMirror !== 'undefined') {
-                    syntaxHighlighter.save();
-                }
-                $msg = PMA_ajaxShowMessage();
-                $.post('view_create.php', $('#createViewDialog').find('form').serialize(), function (data) {
-                    PMA_ajaxRemoveMessage($msg);
-                    if (typeof data !== 'undefined' && data.success === true) {
-                        $('#createViewDialog').dialog("close");
-                        $('.result_query').html(data.message);
-                        PMA_reloadNavigation();
-                    } else {
-                        PMA_ajaxShowMessage(data.error, false);
-                    }
-                });
-            };
-            buttonOptions[PMA_messages.strClose] = function () {
-                $(this).dialog("close");
-            };
-            var $dialog = $('<div/>').attr('id', 'createViewDialog').append(data.message).dialog({
-                width: 600,
-                minWidth: 400,
-                modal: true,
-                buttons: buttonOptions,
-                title: PMA_messages.strCreateView,
-                close: function () {
-                    $(this).remove();
-                }
-            });
-            // Attach syntax highlighted editor
-            syntaxHighlighter = PMA_getSQLEditor($dialog.find('textarea'));
-            $('input:visible[type=text]', $dialog).first().focus();
-        } else {
-            PMA_ajaxShowMessage(data.error);
-        }
-    });
-}
-
-/**
- * Makes the breadcrumbs and the menu bar float at the top of the viewport
- */
-$(function () {
-    if ($("#floating_menubar").length && $('#PMA_disable_floating_menubar').length === 0) {
-        var left = $('html').attr('dir') == 'ltr' ? 'left' : 'right';
-        $("#floating_menubar")
-            .css('margin-' + left, $('#pma_navigation').width() + $('#pma_navigation_resizer').width())
-            .css(left, 0)
-            .css({
-                'position': 'fixed',
-                'top': 0,
-                'width': '100%',
-                'z-index': 99
-            })
-            .append($('#serverinfo'))
-            .append($('#topmenucontainer'));
-        // Allow the DOM to render, then adjust the padding on the body
-        setTimeout(function () {
-            $('body').css(
-                'padding-top',
-                $('#floating_menubar').outerHeight(true)
-            );
-            $('#topmenu').menuResizer('resize');
-        }, 4);
-    }
-});
-
-/**
- * Scrolls the page to the top if clicking the serverinfo bar
- */
-$(function () {
-    $(document).delegate("#serverinfo, #goto_pagetop", "click", function (event) {
-        event.preventDefault();
-        $('html, body').animate({scrollTop: 0}, 'fast');
-    });
-});
-
-var checkboxes_sel = "input.checkall:checkbox:enabled";
-/**
- * Watches checkboxes in a form to set the checkall box accordingly
- */
-var checkboxes_changed = function () {
-    var $form = $(this.form);
-    // total number of checkboxes in current form
-    var total_boxes = $form.find(checkboxes_sel).length;
-    // number of checkboxes checked in current form
-    var checked_boxes = $form.find(checkboxes_sel + ":checked").length;
-    var $checkall = $form.find("input.checkall_box");
-    if (total_boxes == checked_boxes) {
-        $checkall.prop({checked: true, indeterminate: false});
-    }
-    else if (checked_boxes > 0) {
-        $checkall.prop({checked: true, indeterminate: true});
-    }
-    else {
-        $checkall.prop({checked: false, indeterminate: false});
-    }
-};
-$(document).on("change", checkboxes_sel, checkboxes_changed);
-
-$(document).on("change", "input.checkall_box", function () {
-    var is_checked = $(this).is(":checked");
-    $(this.form).find(checkboxes_sel).prop("checked", is_checked)
-    .parents("tr").toggleClass("marked", is_checked);
-});
-
-/**
- * Watches checkboxes in a sub form to set the sub checkall box accordingly
- */
-var sub_checkboxes_changed = function () {
-    var $form = $(this).parent().parent();
-    // total number of checkboxes in current sub form
-    var total_boxes = $form.find(checkboxes_sel).length;
-    // number of checkboxes checked in current sub form
-    var checked_boxes = $form.find(checkboxes_sel + ":checked").length;
-    var $checkall = $form.find("input.sub_checkall_box");
-    if (total_boxes == checked_boxes) {
-        $checkall.prop({checked: true, indeterminate: false});
-    }
-    else if (checked_boxes > 0) {
-        $checkall.prop({checked: true, indeterminate: true});
-    }
-    else {
-        $checkall.prop({checked: false, indeterminate: false});
-    }
-};
-$(document).on("change", checkboxes_sel + ", input.checkall_box:checkbox:enabled", sub_checkboxes_changed);
-
-$(document).on("change", "input.sub_checkall_box", function () {
-    var is_checked = $(this).is(":checked");
-    var $form = $(this).parent().parent();
-    $form.find(checkboxes_sel).prop("checked", is_checked)
-    .parents("tr").toggleClass("marked", is_checked);
-});
-
-/**
- * Toggles row colors of a set of 'tr' elements starting from a given element
- *
- * @param $start Starting element
- */
-function toggleRowColors($start)
-{
-    for (var $curr_row = $start; $curr_row.length > 0; $curr_row = $curr_row.next()) {
-        if ($curr_row.hasClass('odd')) {
-            $curr_row.removeClass('odd').addClass('even');
-        } else if ($curr_row.hasClass('even')) {
-            $curr_row.removeClass('even').addClass('odd');
-        }
-    }
-}
-
-/**
- * Formats a byte number to human-readable form
- *
- * @param bytes the bytes to format
- * @param optional subdecimals the number of digits after the point
- * @param optional pointchar the char to use as decimal point
- */
-function formatBytes(bytes, subdecimals, pointchar) {
-    if (!subdecimals) {
-        subdecimals = 0;
-    }
-    if (!pointchar) {
-        pointchar = '.';
-    }
-    var units = ['B', 'KiB', 'MiB', 'GiB'];
-    for (var i = 0; bytes > 1024 && i < units.length; i++) {
-        bytes /= 1024;
-    }
-    var factor = Math.pow(10, subdecimals);
-    bytes = Math.round(bytes * factor) / factor;
-    bytes = bytes.toString().split('.').join(pointchar);
-    return bytes + ' ' + units[i];
-}
-
-AJAX.registerOnload('functions.js', function () {
-    /**
-     * Reveal the login form to users with JS enabled
-     * and focus the appropriate input field
-     */
-    var $loginform = $('#loginform');
-    if ($loginform.length) {
-        $loginform.find('.js-show').show();
-        if ($('#input_username').val()) {
-            $('#input_password').focus();
-        } else {
-            $('#input_username').focus();
-        }
-    }
-});
-
-/**
- * Dynamically adjust the width of the boxes
- * on the table and db operations pages
- */
-(function () {
-    function DynamicBoxes() {
-        var $boxContainer = $('#boxContainer');
-        if ($boxContainer.length) {
-            var minWidth = $boxContainer.data('box-width');
-            var viewport = $(window).width() - $('#pma_navigation').width();
-            var slots = Math.floor(viewport / minWidth);
-            $boxContainer.children()
-            .each(function () {
-                if (viewport < minWidth) {
-                    $(this).width(minWidth);
-                } else {
-                    $(this).css('width', ((1 /  slots) * 100) + "%");
-                }
-            })
-            .removeClass('clearfloat')
-            .filter(':nth-child(' + slots + 'n+1)')
-            .addClass('clearfloat');
-        }
-    }
-    AJAX.registerOnload('functions.js', function () {
-        DynamicBoxes();
-    });
-    $(function () {
-        $(window).resize(DynamicBoxes);
-    });
-})();
-
-/**
- * Formats timestamp for display
- */
-function PMA_formatDateTime(date, seconds) {
-    var result = $.datepicker.formatDate('yy-mm-dd', date);
-    var timefmt = 'HH:mm';
-    if (seconds) {
-        timefmt = 'HH:mm:ss';
-    }
-    return result + ' ' + $.datepicker.formatTime(
-        timefmt, {
-            hour: date.getHours(),
-            minute: date.getMinutes(),
-            second: date.getSeconds()
-        }
-    );
-}
-
-/**
- * Check than forms have less fields than max allowed by PHP.
- */
-function checkNumberOfFields() {
-    if (typeof maxInputVars === 'undefined') {
-        return false;
-    }
-    if (false === maxInputVars) {
-        return false;
-    }
-    $('form').each(function() {
-        var nbInputs = $(this).find(':input').length;
-        if (nbInputs > maxInputVars) {
-            var warning = PMA_sprintf(PMA_messages.strTooManyInputs, maxInputVars);
-            PMA_ajaxShowMessage(warning);
-            return false;
-        }
-        return true;
-    });
-
-    return true;
-}
-
-/**
- * Ignore the displayed php errors.
- * Simply removes the displayed errors.
- *
- * @param  clearPrevErrors whether to clear errors stored
- *             in $_SESSION['prev_errors'] at server
- *
- */
-function PMA_ignorePhpErrors(clearPrevErrors){
-    if (typeof(clearPrevErrors) === "undefined" ||
-        clearPrevErrors === null
-    ) {
-        str = false;
-    }
-    // send AJAX request to error_report.php with send_error_report=0, exception_type=php & token.
-    // It clears the prev_errors stored in session.
-    if(clearPrevErrors){
-        var $pmaReportErrorsForm = $('#pma_report_errors_form');
-        $pmaReportErrorsForm.find('input[name="send_error_report"]').val(0); // change send_error_report to '0'
-        $pmaReportErrorsForm.submit();
-    }
-
-    // remove displayed errors
-    var $pmaErrors = $('#pma_errors');
-    $pmaErrors.fadeOut( "slow");
-    $pmaErrors.remove();
-}
-
-/**
- * Toggle the Datetimepicker UI if the date value entered
- * by the user in the 'text box' is not going to be accepted
- * by the Datetimepicker plugin (but is accepted by MySQL)
- */
-function toggleDatepickerIfInvalid($td, $input_field) {
-    // Regex allowed by the Datetimepicker UI
-    var dtexpDate = new RegExp(['^([0-9]{4})',
-        '-(((01|03|05|07|08|10|12)-((0[1-9])|([1-2][0-9])|(3[0-1])))|((02|04|06|09|11)',
-        '-((0[1-9])|([1-2][0-9])|30)))$'].join(''));
-    var dtexpTime = new RegExp(['^(([0-1][0-9])|(2[0-3]))',
-        ':((0[0-9])|([1-5][0-9]))',
-        ':((0[0-9])|([1-5][0-9]))(\.[0-9]{1,6}){0,1}$'].join(''));
-
-    // If key-ed in Time or Date values are unsupported by the UI, close it
-    if ($td.attr('data-type') === 'date' && ! dtexpDate.test($input_field.val())) {
-        $input_field.datepicker('hide');
-    } else if ($td.attr('data-type') === 'time' && ! dtexpTime.test($input_field.val())) {
-        $input_field.datepicker('hide');
-    } else {
-        $input_field.datepicker('show');
-    }
-}
-
-/**
- * Unbind all event handlers before tearing down a page
- */
-AJAX.registerTeardown('functions.js', function(){
-    $(document).off('keydown', 'form input, form textarea, form select');
-});
-
-AJAX.registerOnload('functions.js', function () {
-    /**
-     * Handle 'Ctrl/Alt + Enter' form submits
-     */
-    $('form input, form textarea, form select').on('keydown', function(e){
-        if((e.ctrlKey && e.which == 13) || (e.altKey && e.which == 13)) {
-            $form = $(this).closest('form');
-            if (! $form.find('input[type="submit"]') ||
-                ! $form.find('input[type="submit"]').click()
-            ) {
-                $form.submit();
-            }
-        }
-    });
-});
-
-/**
- * Unbind all event handlers before tearing down a page
- */
-AJAX.registerTeardown('functions.js', function(){
-    $(document).off('change', 'input[type=radio][name="pw_hash"]');
-});
-
-AJAX.registerOnload('functions.js', function(){
-    /*
-     * Display warning regarding SSL when sha256_password
-     * method is selected
-     * Used in user_password.php (Change Password link on index.php)
-     */
-    $(document).on("change", 'select#select_authentication_plugin_cp', function() {
-        if (this.value === 'sha256_password') {
-            $('#ssl_reqd_warning_cp').show();
-        } else {
-            $('#ssl_reqd_warning_cp').hide();
-        }
-    });
-});
diff --git a/#pma/js/get_image.js.php b/#pma/js/get_image.js.php
deleted file mode 100644
index 6c74deb9..00000000
--- a/#pma/js/get_image.js.php
+++ /dev/null
@@ -1,152 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Provides the functionality for retreiving images
- * which may be actual images or an icon from a sprite
- *
- * @package PhpMyAdmin
- */
-chdir('..');
-
-// Send correct type:
-header('Content-Type: text/javascript; charset=UTF-8');
-header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 3600) . ' GMT');
-
-// Avoid loading the full common.inc.php because this would add many
-// non-js-compatible stuff like DOCTYPE
-define('PMA_MINIMUM_COMMON', true);
-define('PMA_PATH_TO_BASEDIR', '../');
-require_once './libraries/common.inc.php';
-
-$buffer = PMA\libraries\OutputBuffering::getInstance();
-$buffer->start();
-register_shutdown_function(
-    function () {
-        echo PMA\libraries\OutputBuffering::getInstance()->getContents();
-    }
-);
-
-// Get the data for the sprites, if it's available
-if (is_readable($_SESSION['PMA_Theme']->getPath() . '/sprites.lib.php')) {
-    include $_SESSION['PMA_Theme']->getPath() . '/sprites.lib.php';
-}
-$sprites = array();
-if (function_exists('PMA_sprites')) {
-    $sprites = PMA_sprites();
-}
-// We only need the keys from the array of sprites data,
-// since they contain the (partial) class names
-$keys = array();
-foreach ($sprites as $key => $value) {
-    $keys[] = "'$key'";
-}
-
-?>
-/**
- * Returns an HTML IMG tag for a particular image from a theme,
- * which may be an actual file or an icon from a sprite
- *
- * @param string image      The name of the file to get
- * @param string alternate  Used to set 'alt' and 'title' attributes of the image
- * @param object attributes An associative array of other attributes
- *
- * @return Object The requested image, this object has two methods:
- *                  .toString()        - Returns the IMG tag for the requested image
- *                  .attr(name)        - Returns a particular attribute of the IMG
- *                                       tag given it's name
- *                  .attr(name, value) - Sets a particular attribute of the IMG
- *                                       tag to the given value
- *                And one property:
- *                  .isSprite          - Whether the image is a sprite or not
- */
-function PMA_getImage(image, alternate, attributes) {
-    var in_array = function (needle, haystack) {
-        for (var i in haystack) {
-            if (haystack[i] == needle) {
-                return true;
-            }
-        }
-        return false;
-    };
-    var sprites = [
-        <?php echo implode($keys, ",\n        ") , "\n"; ?>
-    ];
-    // custom image object, it will eventually be returned by this functions
-    var retval = {
-        data: {
-            // this is private
-            alt: '',
-            title: '',
-            src: (typeof PMA_TEST_THEME == 'undefined' ? '' : '../')
-                + 'themes/dot.gif'
-        },
-        isSprite: true,
-        attr: function (name, value) {
-            if (value == undefined) {
-                if (this.data[name] == undefined) {
-                    return '';
-                } else {
-                    return this.data[name];
-                }
-            } else {
-                this.data[name] = value;
-            }
-        },
-        toString: function () {
-            var retval = '<' + 'img';
-            for (var i in this.data) {
-                retval += ' ' + i + '="' + this.data[i] + '"';
-            }
-            retval += ' /' + '>';
-            return retval;
-        }
-    };
-    // initialise missing parameters
-    if (attributes == undefined) {
-        attributes = {};
-    }
-    if (alternate == undefined) {
-        alternate = '';
-    }
-    // set alt
-    if (attributes.alt != undefined) {
-        retval.attr('alt', escapeHtml(attributes.alt));
-    } else {
-        retval.attr('alt', escapeHtml(alternate));
-    }
-    // set title
-    if (attributes.title != undefined) {
-        retval.attr('title', escapeHtml(attributes.title));
-    } else {
-        retval.attr('title', escapeHtml(alternate));
-    }
-    // set src
-    var klass = image.replace('.gif', '').replace('.png', '');
-    if (in_array(klass, sprites)) {
-        // it's an icon from a sprite
-        retval.attr('class', 'icon ic_' + klass);
-    } else {
-        // it's an image file
-        retval.isSprite = false;
-        retval.attr(
-            'src',
-            "<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>" + image
-        );
-    }
-    // set all other attrubutes
-    for (var i in attributes) {
-        if (i == 'src') {
-            // do not allow to override the 'src' attribute
-            continue;
-        }
-
-        if (i == 'class') {
-            retval.attr(i, retval.attr('class') + ' ' + attributes[i]);
-        } else {
-            retval.attr(i, attributes[i]);
-        }
-    }
-
-    return retval;
-}
-//
diff --git a/#pma/js/get_scripts.js.php b/#pma/js/get_scripts.js.php
deleted file mode 100644
index fe2f8a29..00000000
--- a/#pma/js/get_scripts.js.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Concatenates several js files to reduce the number of
- * http requests sent to the server
- *
- * @package PhpMyAdmin
- */
-
-chdir('..');
-
-// Close session early as we won't write anything there
-session_write_close();
-
-// Send correct type
-header('Content-Type: text/javascript; charset=UTF-8');
-// Enable browser cache for 1 hour
-header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 3600) . ' GMT');
-
-// When a token is not presented, even though whitelisted arrays are removed
-// in PMA_removeRequestVars(). This is a workaround for that.
-$_GET['scripts'] = json_encode($_GET['scripts']);
-
-// Avoid loading the full common.inc.php because this would add many
-// non-js-compatible stuff like DOCTYPE
-define('PMA_MINIMUM_COMMON', true);
-define('PMA_PATH_TO_BASEDIR', '../');
-require_once './libraries/common.inc.php';
-
-$buffer = PMA\libraries\OutputBuffering::getInstance();
-$buffer->start();
-register_shutdown_function(
-    function () {
-        echo PMA\libraries\OutputBuffering::getInstance()->getContents();
-    }
-);
-
-$_GET['scripts'] = json_decode($_GET['scripts']);
-if (! empty($_GET['scripts']) && is_array($_GET['scripts'])) {
-    // Only up to 10 scripts as this is what we generate
-    foreach (array_slice($_GET['scripts'], 0, 10) as $script) {
-        // Sanitise filename
-        $script_name = 'js';
-
-        $path = explode("/", $script);
-        foreach ($path as $index => $filename) {
-            // Allow alphanumeric, "." and "-" chars only, no files starting
-            // with .
-            if (preg_match("@^[\w][\w\.-]+$@", $filename)) {
-                $script_name .= DIRECTORY_SEPARATOR . $filename;
-            }
-        }
-
-        // Output file contents
-        if (preg_match("@\.js$@", $script_name) && is_readable($script_name)) {
-            readfile($script_name);
-            echo ";\n\n";
-        }
-    }
-}
-
-if (isset($_GET['call_done'])) {
-    echo "AJAX.scriptHandler.done();";
-}
diff --git a/#pma/js/gis_data_editor.js b/#pma/js/gis_data_editor.js
deleted file mode 100644
index 35238db7..00000000
--- a/#pma/js/gis_data_editor.js
+++ /dev/null
@@ -1,399 +0,0 @@
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * @fileoverview    functions used in GIS data editor
- *
- * @requires    jQuery
- *
- */
-
-var gisEditorLoaded = false;
-
-/**
- * Closes the GIS data editor and perform necessary clean up work.
- */
-function closeGISEditor() {
-    $("#popup_background").fadeOut("fast");
-    $("#gis_editor").fadeOut("fast", function () {
-        $(this).empty();
-    });
-}
-
-/**
- * Prepares the HTML received via AJAX.
- */
-function prepareJSVersion() {
-    // Change the text on the submit button
-    $("#gis_editor").find("input[name='gis_data[save]']")
-        .val(PMA_messages.strCopy)
-        .insertAfter($('#gis_data_textarea'))
-        .before('<br/><br/>');
-
-    // Add close and cancel links
-    $('#gis_data_editor').prepend('<a class="close_gis_editor" href="#">' + PMA_messages.strClose + '</a>');
-    $('<a class="cancel_gis_editor" href="#"> ' + PMA_messages.strCancel + '</a>')
-        .insertAfter($("input[name='gis_data[save]']"));
-
-    // Remove the unnecessary text
-    $('div#gis_data_output p').remove();
-
-    // Remove 'add' buttons and add links
-    $('#gis_editor').find('input.add').each(function (e) {
-        var $button = $(this);
-        $button.addClass('addJs').removeClass('add');
-        var classes = $button.attr('class');
-        $button.replaceWith(
-            '<a class="' + classes +
-            '" name="' + $button.attr('name') +
-            '" href="#">+ ' + $button.val() + '</a>'
-        );
-    });
-}
-
-/**
- * Returns the HTML for a data point.
- *
- * @param pointNumber point number
- * @param prefix      prefix of the name
- * @returns the HTML for a data point
- */
-function addDataPoint(pointNumber, prefix) {
-    return '<br/>' +
-        PMA_sprintf(PMA_messages.strPointN, (pointNumber + 1)) + ': ' +
-        '<label for="x">' + PMA_messages.strX + '</label>' +
-        '<input type="text" name="' + prefix + '[' + pointNumber + '][x]" value=""/>' +
-        '<label for="y">' + PMA_messages.strY + '</label>' +
-        '<input type="text" name="' + prefix + '[' + pointNumber + '][y]" value=""/>';
-}
-
-/**
- * Initialize the visualization in the GIS data editor.
- */
-function initGISEditorVisualization() {
-    // Loads either SVG or OSM visualization based on the choice
-    selectVisualization();
-    // Adds necessary styles to the div that coontains the openStreetMap
-    styleOSM();
-    // Loads the SVG element and make a reference to it
-    loadSVG();
-    // Adds controllers for zooming and panning
-    addZoomPanControllers();
-    zoomAndPan();
-}
-
-/**
- * Loads JavaScript files and the GIS editor.
- *
- * @param value      current value of the geometry field
- * @param field      field name
- * @param type       geometry type
- * @param input_name name of the input field
- * @param token      token
- */
-function loadJSAndGISEditor(value, field, type, input_name, token) {
-    var head = document.getElementsByTagName('head')[0];
-    var script;
-
-    // Loads a set of small JS file needed for the GIS editor
-    var smallScripts = [ 'js/jquery/jquery.svg.js',
-                     'js/jquery/jquery.mousewheel.js',
-                     'js/jquery/jquery.event.drag-2.2.js',
-                     'js/tbl_gis_visualization.js' ];
-
-    for (var i = 0; i < smallScripts.length; i++) {
-        script = document.createElement('script');
-        script.type = 'text/javascript';
-        script.src = smallScripts[i];
-        head.appendChild(script);
-    }
-
-    // OpenLayers.js is BIG and takes time. So asynchronous loading would not work.
-    // Load the JS and do a callback to load the content for the GIS Editor.
-    script = document.createElement('script');
-    script.type = 'text/javascript';
-
-    script.onreadystatechange = function () {
-        if (this.readyState == 'complete') {
-            loadGISEditor(value, field, type, input_name, token);
-        }
-    };
-    script.onload = function () {
-        loadGISEditor(value, field, type, input_name, token);
-    };
-    script.onerror = function() {
-        loadGISEditor(value, field, type, input_name, token);
-    }
-
-    script.src = 'js/openlayers/OpenLayers.js';
-    head.appendChild(script);
-
-    gisEditorLoaded = true;
-}
-
-/**
- * Loads the GIS editor via AJAX
- *
- * @param value      current value of the geometry field
- * @param field      field name
- * @param type       geometry type
- * @param input_name name of the input field
- * @param token      token
- */
-function loadGISEditor(value, field, type, input_name, token) {
-
-    var $gis_editor = $("#gis_editor");
-    $.post('gis_data_editor.php', {
-        'field' : field,
-        'value' : value,
-        'type' : type,
-        'input_name' : input_name,
-        'get_gis_editor' : true,
-        'token' : token,
-        'ajax_request': true
-    }, function (data) {
-        if (typeof data !== 'undefined' && data.success === true) {
-            $gis_editor.html(data.gis_editor);
-            initGISEditorVisualization();
-            prepareJSVersion();
-        } else {
-            PMA_ajaxShowMessage(data.error, false);
-        }
-    }, 'json');
-}
-
-/**
- * Opens up the dialog for the GIS data editor.
- */
-function openGISEditor() {
-
-    // Center the popup
-    var windowWidth = document.documentElement.clientWidth;
-    var windowHeight = document.documentElement.clientHeight;
-    var popupWidth = windowWidth * 0.9;
-    var popupHeight = windowHeight * 0.9;
-    var popupOffsetTop = windowHeight / 2 - popupHeight / 2;
-    var popupOffsetLeft = windowWidth / 2 - popupWidth / 2;
-
-    var $gis_editor = $("#gis_editor");
-    var $backgrouond = $("#popup_background");
-
-    $gis_editor.css({"top": popupOffsetTop, "left": popupOffsetLeft, "width": popupWidth, "height": popupHeight});
-    $backgrouond.css({"opacity" : "0.7"});
-
-    $gis_editor.append(
-        '<div id="gis_data_editor">' +
-        '<img class="ajaxIcon" id="loadingMonitorIcon" src="' +
-        pmaThemeImage + 'ajax_clock_small.gif" alt=""/>' +
-        '</div>'
-    );
-
-    // Make it appear
-    $backgrouond.fadeIn("fast");
-    $gis_editor.fadeIn("fast");
-}
-
-/**
- * Prepare and insert the GIS data in Well Known Text format
- * to the input field.
- */
-function insertDataAndClose() {
-    var $form = $('form#gis_data_editor_form');
-    var input_name = $form.find("input[name='input_name']").val();
-
-    $.post('gis_data_editor.php', $form.serialize() + "&generate=true&ajax_request=true", function (data) {
-        if (typeof data !== 'undefined' && data.success === true) {
-            $("input[name='" + input_name + "']").val(data.result);
-        } else {
-            PMA_ajaxShowMessage(data.error, false);
-        }
-    }, 'json');
-    closeGISEditor();
-}
-
-/**
- * Unbind all event handlers before tearing down a page
- */
-AJAX.registerTeardown('gis_data_editor.js', function () {
-    $(document).off('click', "#gis_editor input[name='gis_data[save]']");
-    $(document).off('submit', '#gis_editor');
-    $(document).off('change', "#gis_editor input[type='text']");
-    $(document).off('change', "#gis_editor select.gis_type");
-    $(document).off('click', '#gis_editor a.close_gis_editor, #gis_editor a.cancel_gis_editor');
-    $(document).off('click', '#gis_editor a.addJs.addPoint');
-    $(document).off('click', '#gis_editor a.addLine.addJs');
-    $(document).off('click', '#gis_editor a.addJs.addPolygon');
-    $(document).off('click', '#gis_editor a.addJs.addGeom');
-});
-
-AJAX.registerOnload('gis_data_editor.js', function () {
-
-    // Remove the class that is added due to the URL being too long.
-    $('span.open_gis_editor a').removeClass('formLinkSubmit');
-
-    /**
-     * Prepares and insert the GIS data to the input field on clicking 'copy'.
-     */
-    $(document).on('click', "#gis_editor input[name='gis_data[save]']", function (event) {
-        event.preventDefault();
-        insertDataAndClose();
-    });
-
-    /**
-     * Prepares and insert the GIS data to the input field on pressing 'enter'.
-     */
-    $(document).on('submit', '#gis_editor', function (event) {
-        event.preventDefault();
-        insertDataAndClose();
-    });
-
-    /**
-     * Trigger asynchronous calls on data change and update the output.
-     */
-    $(document).on('change', "#gis_editor input[type='text']", function () {
-        var $form = $('form#gis_data_editor_form');
-        $.post('gis_data_editor.php', $form.serialize() + "&generate=true&ajax_request=true", function (data) {
-            if (typeof data !== 'undefined' && data.success === true) {
-                $('#gis_data_textarea').val(data.result);
-                $('#placeholder').empty().removeClass('hasSVG').html(data.visualization);
-                $('#openlayersmap').empty();
-                /* TODO: the gis_data_editor should rather return JSON than JS code to eval */
-                eval(data.openLayers);
-                initGISEditorVisualization();
-            } else {
-                PMA_ajaxShowMessage(data.error, false);
-            }
-        }, 'json');
-    });
-
-    /**
-     * Update the form on change of the GIS type.
-     */
-    $(document).on('change', "#gis_editor select.gis_type", function (event) {
-        var $gis_editor = $("#gis_editor");
-        var $form = $('form#gis_data_editor_form');
-
-        $.post('gis_data_editor.php', $form.serialize() + "&get_gis_editor=true&ajax_request=true", function (data) {
-            if (typeof data !== 'undefined' && data.success === true) {
-                $gis_editor.html(data.gis_editor);
-                initGISEditorVisualization();
-                prepareJSVersion();
-            } else {
-                PMA_ajaxShowMessage(data.error, false);
-            }
-        }, 'json');
-    });
-
-    /**
-     * Handles closing of the GIS data editor.
-     */
-    $(document).on('click', '#gis_editor a.close_gis_editor, #gis_editor a.cancel_gis_editor', function () {
-        closeGISEditor();
-    });
-
-    /**
-     * Handles adding data points
-     */
-    $(document).on('click', '#gis_editor a.addJs.addPoint', function () {
-        var $a = $(this);
-        var name = $a.attr('name');
-        // Eg. name = gis_data[0][MULTIPOINT][add_point] => prefix = gis_data[0][MULTIPOINT]
-        var prefix = name.substr(0, name.length - 11);
-        // Find the number of points
-        var $noOfPointsInput = $("input[name='" + prefix + "[no_of_points]" + "']");
-        var noOfPoints = parseInt($noOfPointsInput.val(), 10);
-        // Add the new data point
-        var html = addDataPoint(noOfPoints, prefix);
-        $a.before(html);
-        $noOfPointsInput.val(noOfPoints + 1);
-    });
-
-    /**
-     * Handles adding linestrings and inner rings
-     */
-    $(document).on('click', '#gis_editor a.addLine.addJs', function () {
-        var $a = $(this);
-        var name = $a.attr('name');
-
-        // Eg. name = gis_data[0][MULTILINESTRING][add_line] => prefix = gis_data[0][MULTILINESTRING]
-        var prefix = name.substr(0, name.length - 10);
-        var type = prefix.slice(prefix.lastIndexOf('[') + 1, prefix.lastIndexOf(']'));
-
-        // Find the number of lines
-        var $noOfLinesInput = $("input[name='" + prefix + "[no_of_lines]" + "']");
-        var noOfLines = parseInt($noOfLinesInput.val(), 10);
-
-        // Add the new linesting of inner ring based on the type
-        var html = '<br/>';
-        var noOfPoints;
-        if (type == 'MULTILINESTRING') {
-            html += PMA_messages.strLineString + ' ' + (noOfLines + 1) + ':';
-            noOfPoints = 2;
-        } else {
-            html += PMA_messages.strInnerRing + ' ' + noOfLines + ':';
-            noOfPoints = 4;
-        }
-        html += '<input type="hidden" name="' + prefix + '[' + noOfLines + '][no_of_points]" value="' + noOfPoints + '"/>';
-        for (var i = 0; i < noOfPoints; i++) {
-            html += addDataPoint(i, (prefix + '[' + noOfLines + ']'));
-        }
-        html += '<a class="addPoint addJs" name="' + prefix + '[' + noOfLines + '][add_point]" href="#">+ ' +
-            PMA_messages.strAddPoint + '</a><br/>';
-
-        $a.before(html);
-        $noOfLinesInput.val(noOfLines + 1);
-    });
-
-    /**
-     * Handles adding polygons
-     */
-    $(document).on('click', '#gis_editor a.addJs.addPolygon', function () {
-        var $a = $(this);
-        var name = $a.attr('name');
-        // Eg. name = gis_data[0][MULTIPOLYGON][add_polygon] => prefix = gis_data[0][MULTIPOLYGON]
-        var prefix = name.substr(0, name.length - 13);
-        // Find the number of polygons
-        var $noOfPolygonsInput = $("input[name='" + prefix + "[no_of_polygons]" + "']");
-        var noOfPolygons = parseInt($noOfPolygonsInput.val(), 10);
-
-        // Add the new polygon
-        var html = PMA_messages.strPolygon + ' ' + (noOfPolygons + 1) + ':<br/>';
-        html += '<input type="hidden" name="' + prefix + '[' + noOfPolygons + '][no_of_lines]" value="1"/>' +
-            '<br/>' + PMA_messages.strOuterRing + ':' +
-            '<input type="hidden" name="' + prefix + '[' + noOfPolygons + '][0][no_of_points]" value="4"/>';
-        for (var i = 0; i < 4; i++) {
-            html += addDataPoint(i, (prefix + '[' + noOfPolygons + '][0]'));
-        }
-        html += '<a class="addPoint addJs" name="' + prefix + '[' + noOfPolygons + '][0][add_point]" href="#">+ ' +
-            PMA_messages.strAddPoint + '</a><br/>' +
-            '<a class="addLine addJs" name="' + prefix + '[' + noOfPolygons + '][add_line]" href="#">+ ' +
-            PMA_messages.strAddInnerRing + '</a><br/><br/>';
-
-        $a.before(html);
-        $noOfPolygonsInput.val(noOfPolygons + 1);
-    });
-
-    /**
-     * Handles adding geoms
-     */
-    $(document).on('click', '#gis_editor a.addJs.addGeom', function () {
-        var $a = $(this);
-        var prefix = 'gis_data[GEOMETRYCOLLECTION]';
-        // Find the number of geoms
-        var $noOfGeomsInput = $("input[name='" + prefix + "[geom_count]" + "']");
-        var noOfGeoms = parseInt($noOfGeomsInput.val(), 10);
-
-        var html1 = PMA_messages.strGeometry + ' ' + (noOfGeoms + 1) + ':<br/>';
-        var $geomType = $("select[name='gis_data[" + (noOfGeoms - 1) + "][gis_type]']").clone();
-        $geomType.attr('name', 'gis_data[' + noOfGeoms + '][gis_type]').val('POINT');
-        var html2 = '<br/>' + PMA_messages.strPoint + ' :' +
-            '<label for="x"> ' + PMA_messages.strX + ' </label>' +
-            '<input type="text" name="gis_data[' + noOfGeoms + '][POINT][x]" value=""/>' +
-            '<label for="y"> ' + PMA_messages.strY + ' </label>' +
-            '<input type="text" name="gis_data[' + noOfGeoms + '][POINT][y]" value=""/>' +
-            '<br/><br/>';
-
-        $a.before(html1);
-        $geomType.insertBefore($a);
-        $a.before(html2);
-        $noOfGeomsInput.val(noOfGeoms + 1);
-    });
-});
diff --git a/#pma/js/import.js b/#pma/js/import.js
deleted file mode 100644
index 570810d8..00000000
--- a/#pma/js/import.js
+++ /dev/null
@@ -1,158 +0,0 @@
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Functions used in the import tab
- *
- */
-
-
-/**
- * Toggles the hiding and showing of each plugin's options
- * according to the currently selected plugin from the dropdown list
- */
-function changePluginOpts()
-{
-    $("#format_specific_opts").find("div.format_specific_options").each(function () {
-        $(this).hide();
-    });
-    var selected_plugin_name = $("#plugins").find("option:selected").val();
-    $("#" + selected_plugin_name + "_options").fadeIn('slow');
-    if (selected_plugin_name == "csv") {
-        $("#import_notification").text(PMA_messages.strImportCSV);
-    } else {
-        $("#import_notification").text("");
-    }
-}
-
-/**
- * Toggles the hiding and showing of each plugin's options and sets the selected value
- * in the plugin dropdown list according to the format of the selected file
- */
-function matchFile(fname)
-{
-    var fname_array = fname.toLowerCase().split(".");
-    var len = fname_array.length;
-    if (len !== 0) {
-        var extension = fname_array[len - 1];
-        if (extension == "gz" || extension == "bz2" || extension == "zip") {
-            len--;
-        }
-        // Only toggle if the format of the file can be imported
-        if ($("select[name='format'] option").filterByValue(fname_array[len - 1]).length == 1) {
-            $("select[name='format'] option").filterByValue(fname_array[len - 1]).prop('selected', true);
-            changePluginOpts();
-        }
-    }
-}
-
-/**
- * Unbind all event handlers before tearing down a page
- */
-AJAX.registerTeardown('import.js', function () {
-    $("#plugins").unbind('change');
-    $("#input_import_file").unbind('change');
-    $("#select_local_import_file").unbind('change');
-    $("#input_import_file").unbind('change').unbind('focus');
-    $("#select_local_import_file").unbind('focus');
-    $("#text_csv_enclosed").add("#text_csv_escaped").unbind('keyup');
-});
-
-AJAX.registerOnload('import.js', function () {
-    // import_file_form validation.
-    $(document).on('submit', '#import_file_form', function (event) {
-        var radioLocalImport = $("#radio_local_import_file");
-        var radioImport = $("#radio_import_file");
-        var fileMsg = '<div class="error"><img src="themes/dot.gif" title="" alt="" class="icon ic_s_error" /> ' + PMA_messages.strImportDialogMessage + '</div>';
-
-        if (radioLocalImport.length !== 0) {
-            // remote upload.
-
-            if (radioImport.is(":checked") && $("#input_import_file").val() === '') {
-                $("#input_import_file").focus();
-                PMA_ajaxShowMessage(fileMsg, false);
-                return false;
-            }
-
-            if (radioLocalImport.is(":checked")) {
-                if ($("#select_local_import_file").length === 0) {
-                    PMA_ajaxShowMessage('<div class="error"><img src="themes/dot.gif" title="" alt="" class="icon ic_s_error" /> ' + PMA_messages.strNoImportFile + ' </div>', false);
-                    return false;
-                }
-
-                if ($("#select_local_import_file").val() === '') {
-                    $("#select_local_import_file").focus();
-                    PMA_ajaxShowMessage(fileMsg, false);
-                    return false;
-                }
-            }
-        } else {
-            // local upload.
-            if ($("#input_import_file").val() === '') {
-                $("#input_import_file").focus();
-                PMA_ajaxShowMessage(fileMsg, false);
-                return false;
-            }
-        }
-
-        // show progress bar.
-        $("#upload_form_status").css("display", "inline");
-        $("#upload_form_status_info").css("display", "inline");
-    });
-
-    // Initially display the options for the selected plugin
-    changePluginOpts();
-
-   // Whenever the selected plugin changes, change the options displayed
-    $("#plugins").change(function () {
-        changePluginOpts();
-    });
-
-    $("#input_import_file").change(function () {
-        matchFile($(this).val());
-    });
-
-    $("#select_local_import_file").change(function () {
-        matchFile($(this).val());
-    });
-
-    /*
-     * When the "Browse the server" form is clicked or the "Select from the web server upload directory"
-     * form is clicked, the radio button beside it becomes selected and the other form becomes disabled.
-     */
-    $("#input_import_file").bind("focus change", function () {
-        $("#radio_import_file").prop('checked', true);
-        $("#radio_local_import_file").prop('checked', false);
-    });
-    $("#select_local_import_file").focus(function () {
-        $("#radio_local_import_file").prop('checked', true);
-        $("#radio_import_file").prop('checked', false);
-    });
-
-    /**
-     * Set up the interface for Javascript-enabled browsers since the default is for
-     *  Javascript-disabled browsers
-     */
-    $("#scroll_to_options_msg").hide();
-    $("#format_specific_opts").find("div.format_specific_options")
-    .css({
-        "border": 0,
-        "margin": 0,
-        "padding": 0
-    })
-    .find("h3")
-    .remove();
-    //$("form[name=import] *").unwrap();
-
-    /**
-     * for input element text_csv_enclosed and text_csv_escaped allow just one character to enter.
-     * as mysql allows just one character for these fields,
-     * if first character is escape then allow two including escape character.
-     */
-    $("#text_csv_enclosed").add("#text_csv_escaped").bind('keyup', function() {
-        if($(this).val().length === 2 && $(this).val().charAt(0) !== "\\") {
-            $(this).val($(this).val().substring(0, 1));
-            return false;
-        }
-        return true;
-    });
-
-});
diff --git a/#pma/js/indexes.js b/#pma/js/indexes.js
deleted file mode 100644
index 6a5c77e8..00000000
--- a/#pma/js/indexes.js
+++ /dev/null
@@ -1,756 +0,0 @@
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * @fileoverview    function used for index manipulation pages
- * @name            Table Structure
- *
- * @requires    jQuery
- * @requires    jQueryUI
- * @required    js/functions.js
- */
-
-/**
- * Returns the array of indexes based on the index choice
- *
- * @param index_choice index choice
- */
-function PMA_getIndexArray(index_choice)
-{
-    var source_array = null;
-
-    switch (index_choice.toLowerCase()) {
-    case 'primary':
-        source_array = primary_indexes;
-        break;
-    case 'unique':
-        source_array = unique_indexes;
-        break;
-    case 'index':
-        source_array = indexes;
-        break;
-    case 'fulltext':
-        source_array = fulltext_indexes;
-        break;
-    case 'spatial':
-        source_array = spatial_indexes;
-        break;
-    default:
-        return null;
-    }
-    return source_array;
-}
-
-/**
- * Hides/shows the inputs and submits appropriately depending
- * on whether the index type chosen is 'SPATIAL' or not.
- */
-function checkIndexType()
-{
-    /**
-     * @var Object Dropdown to select the index choice.
-     */
-    var $select_index_choice = $('#select_index_choice');
-    /**
-     * @var Object Dropdown to select the index type.
-     */
-    var $select_index_type = $('#select_index_type');
-    /**
-     * @var Object Table header for the size column.
-     */
-    var $size_header = $('#index_columns').find('thead tr th:nth-child(2)');
-    /**
-     * @var Object Inputs to specify the columns for the index.
-     */
-    var $column_inputs = $('select[name="index[columns][names][]"]');
-    /**
-     * @var Object Inputs to specify sizes for columns of the index.
-     */
-    var $size_inputs = $('input[name="index[columns][sub_parts][]"]');
-    /**
-     * @var Object Footer containg the controllers to add more columns
-     */
-    var $add_more = $('#index_frm').find('.add_more');
-
-    if ($select_index_choice.val() == 'SPATIAL') {
-        // Disable and hide the size column
-        $size_header.hide();
-        $size_inputs.each(function () {
-            $(this)
-                .prop('disabled', true)
-                .parent('td').hide();
-        });
-
-        // Disable and hide the columns of the index other than the first one
-        var initial = true;
-        $column_inputs.each(function () {
-            $column_input = $(this);
-            if (! initial) {
-                $column_input
-                    .prop('disabled', true)
-                    .parent('td').hide();
-            } else {
-                initial = false;
-            }
-        });
-
-        // Hide controllers to add more columns
-        $add_more.hide();
-    } else {
-        // Enable and show the size column
-        $size_header.show();
-        $size_inputs.each(function () {
-            $(this)
-                .prop('disabled', false)
-                .parent('td').show();
-        });
-
-        // Enable and show the columns of the index
-        $column_inputs.each(function () {
-            $(this)
-                .prop('disabled', false)
-                .parent('td').show();
-        });
-
-        // Show controllers to add more columns
-        $add_more.show();
-    }
-
-    if ($select_index_choice.val() == 'SPATIAL' ||
-            $select_index_choice.val() == 'FULLTEXT') {
-        $select_index_type.val('').prop('disabled', true);
-    } else {
-        $select_index_type.prop('disabled', false)
-    }
-}
-
-/**
- * Sets current index information into form parameters.
- *
- * @param array  source_array Array containing index columns
- * @param string index_choice Choice of index
- *
- * @return void
- */
-function PMA_setIndexFormParameters(source_array, index_choice)
-{
-    if (index_choice == 'index') {
-        $('input[name="indexes"]').val(JSON.stringify(source_array));
-    } else {
-        $('input[name="' + index_choice + '_indexes"]').val(JSON.stringify(source_array));
-    }
-}
-
-/**
- * Removes a column from an Index.
- *
- * @param string col_index Index of column in form
- *
- * @return void
- */
-function PMA_removeColumnFromIndex(col_index)
-{
-    // Get previous index details.
-    var previous_index = $('select[name="field_key[' + col_index + ']"]')
-        .attr('data-index');
-    if (previous_index.length) {
-        previous_index = previous_index.split(',');
-        var source_array = PMA_getIndexArray(previous_index[0]);
-        if (source_array == null) {
-            return;
-        }
-
-        // Remove column from index array.
-        var source_length = source_array[previous_index[1]].columns.length;
-        for (var i=0; i<source_length; i++) {
-            if (source_array[previous_index[1]].columns[i].col_index == col_index) {
-                source_array[previous_index[1]].columns.splice(i, 1);
-            }
-        }
-
-        // Remove index completely if no columns left.
-        if (source_array[previous_index[1]].columns.length === 0) {
-            source_array.splice(previous_index[1], 1);
-        }
-
-        // Update current index details.
-        $('select[name="field_key[' + col_index + ']"]').attr('data-index', '');
-        // Update form index parameters.
-        PMA_setIndexFormParameters(source_array, previous_index[0].toLowerCase());
-    }
-}
-
-/**
- * Adds a column to an Index.
- *
- * @param array  source_array Array holding corresponding indexes
- * @param string array_index  Index of an INDEX in array
- * @param string index_choice Choice of Index
- * @param string col_index    Index of column on form
- *
- * @return void
- */
-function PMA_addColumnToIndex(source_array, array_index, index_choice, col_index)
-{
-    if (col_index >= 0) {
-        // Remove column from other indexes (if any).
-        PMA_removeColumnFromIndex(col_index);
-    }
-    var index_name = $('input[name="index[Key_name]"]').val();
-    var index_comment = $('input[name="index[Index_comment]"]').val();
-    var key_block_size = $('input[name="index[Key_block_size]"]').val();
-    var parser = $('input[name="index[Parser]"]').val();
-    var index_type = $('select[name="index[Index_type]"]').val();
-    var columns = [];
-    $('#index_columns').find('tbody').find('tr').each(function () {
-        // Get columns in particular order.
-        var col_index = $(this).find('select[name="index[columns][names][]"]').val();
-        var size = $(this).find('input[name="index[columns][sub_parts][]"]').val();
-        columns.push({
-            'col_index': col_index,
-            'size': size
-        });
-    });
-
-    // Update or create an index.
-    source_array[array_index] = {
-        'Key_name': index_name,
-        'Index_comment': index_comment,
-        'Index_choice': index_choice.toUpperCase(),
-        'Key_block_size': key_block_size,
-        'Parser': parser,
-        'Index_type': index_type,
-        'columns': columns
-    };
-
-    // Display index name (or column list)
-    var displayName = index_name;
-    if (displayName == '') {
-        var columnNames = [];
-        $.each(columns, function () {
-            columnNames.push($('input[name="field_name[' +  this.col_index + ']"]').val());
-        });
-        displayName = '[' + columnNames.join(', ') + ']';
-    }
-    $.each(columns, function () {
-        var id = 'index_name_' + this.col_index + '_8';
-        var $name = $('#' + id);
-        if ($name.length == 0) {
-            $name = $('<a id="' + id + '" href="#" class="ajax show_index_dialog"></a>');
-            $name.insertAfter($('select[name="field_key[' + this.col_index + ']"]'));
-        }
-        var $text = $('<small>').text(displayName);
-        $name.html($text);
-    });
-
-    if (col_index >= 0) {
-        // Update index details on form.
-        $('select[name="field_key[' + col_index + ']"]')
-            .attr('data-index', index_choice + ',' + array_index);
-    }
-    PMA_setIndexFormParameters(source_array, index_choice.toLowerCase());
-}
-
-/**
- * Get choices list for a column to create a composite index with.
- *
- * @param string index_choice Choice of index
- * @param array  source_array Array hodling columns for particular index
- *
- * @return jQuery Object
- */
-function PMA_getCompositeIndexList(source_array, col_index)
-{
-    // Remove any previous list.
-    if ($('#composite_index_list').length) {
-        $('#composite_index_list').remove();
-    }
-
-    // Html list.
-    var $composite_index_list = $(
-        '<ul id="composite_index_list">' +
-        '<div>' + PMA_messages.strCompositeWith + '</div>' +
-        '</ul>'
-    );
-
-    // Add each column to list available for composite index.
-    var source_length = source_array.length;
-    var already_present = false;
-    for (var i=0; i<source_length; i++) {
-        var sub_array_len = source_array[i].columns.length;
-        var column_names = [];
-        for (var j=0; j<sub_array_len; j++) {
-            column_names.push(
-                $('input[name="field_name[' + source_array[i].columns[j].col_index + ']"]').val()
-            );
-
-            if (col_index == source_array[i].columns[j].col_index) {
-                already_present = true;
-            }
-        }
-
-        $composite_index_list.append(
-            '<li>' +
-            '<input type="radio" name="composite_with" ' +
-            (already_present ? 'checked="checked"' : '') +
-            ' id="composite_index_' + i + '" value="' + i + '">' +
-            '<label for="composite_index_' + i + '">' + column_names.join(', ') +
-            '</lablel>' +
-            '</li>'
-        );
-    }
-
-    return $composite_index_list;
-}
-
-/**
- * Shows 'Add Index' dialog.
- *
- * @param array  source_array   Array holding particluar index
- * @param string array_index    Index of an INDEX in array
- * @param array  target_columns Columns for an INDEX
- * @param string col_index      Index of column on form
- * @param object index          Index detail object
- *
- * @return void
- */
-function PMA_showAddIndexDialog(source_array, array_index, target_columns, col_index, index)
-{
-    // Prepare post-data.
-    var $table = $('input[name="table"]');
-    var table = $table.length > 0 ? $table.val() : '';
-    var post_data = {
-        token: $('input[name="token"]').val(),
-        server:  $('input[name="server"]').val(),
-        db: $('input[name="db"]').val(),
-        table: table,
-        ajax_request: 1,
-        create_edit_table: 1,
-        index: index
-    };
-
-    var columns = {};
-    for (var i=0; i<target_columns.length; i++) {
-        var column_name = $('input[name="field_name[' + target_columns[i] + ']"]').val();
-        var column_type = $('select[name="field_type[' + target_columns[i] + ']"]').val().toLowerCase();
-        columns[column_name] = [column_type, target_columns[i]];
-    }
-    post_data.columns = JSON.stringify(columns);
-
-    var button_options = {};
-    button_options[PMA_messages.strGo] = function () {
-        var is_missing_value = false;
-        $('select[name="index[columns][names][]"]').each(function () {
-            if ($(this).val() === '') {
-                is_missing_value = true;
-            }
-        });
-
-        if (! is_missing_value) {
-            PMA_addColumnToIndex(
-                source_array,
-                array_index,
-                index.Index_choice,
-                col_index
-            );
-        } else {
-            PMA_ajaxShowMessage(
-                '<div class="error"><img src="themes/dot.gif" title="" alt=""' +
-                ' class="icon ic_s_error" /> ' + PMA_messages.strMissingColumn +
-                ' </div>', false
-            );
-
-            return false;
-        }
-
-        $(this).dialog('close');
-    };
-    button_options[PMA_messages.strCancel] = function () {
-        if (col_index >= 0) {
-            // Handle state on 'Cancel'.
-            var $select_list = $('select[name="field_key[' + col_index + ']"]');
-            if (! $select_list.attr('data-index').length) {
-                $select_list.find('option[value*="none"]').attr('selected', 'selected');
-            } else {
-                var previous_index = $select_list.attr('data-index').split(',');
-                $select_list.find('option[value*="' + previous_index[0].toLowerCase() + '"]')
-                    .attr('selected', 'selected');
-            }
-        }
-        $(this).dialog('close');
-    };
-    var $msgbox = PMA_ajaxShowMessage();
-    $.post("tbl_indexes.php", post_data, function (data) {
-        if (data.success === false) {
-            //in the case of an error, show the error message returned.
-            PMA_ajaxShowMessage(data.error, false);
-        } else {
-            PMA_ajaxRemoveMessage($msgbox);
-            // Show dialog if the request was successful
-            var $div = $('<div/>');
-            $div
-            .append(data.message)
-            .dialog({
-                title: PMA_messages.strAddIndex,
-                width: 450,
-                minHeight: 250,
-                open: function () {
-                    checkIndexName("index_frm");
-                    PMA_showHints($div);
-                    PMA_init_slider();
-                    $('#index_columns').find('td').each(function () {
-                        $(this).css("width", $(this).width() + 'px');
-                    });
-                    $('#index_columns').find('tbody').sortable({
-                        axis: 'y',
-                        containment: $("#index_columns").find("tbody"),
-                        tolerance: 'pointer'
-                    });
-                    // We dont need the slider at this moment.
-                    $(this).find('fieldset.tblFooters').remove();
-                },
-                modal: true,
-                buttons: button_options,
-                close: function () {
-                    $(this).remove();
-                }
-            });
-        }
-    });
-}
-
-/**
- * Creates a advanced index type selection dialog.
- *
- * @param array  source_array Array holding a particular type of indexes
- * @param string index_choice Choice of index
- * @param string col_index    Index of new column on form
- *
- * @return void
- */
-function PMA_indexTypeSelectionDialog(source_array, index_choice, col_index)
-{
-    var $single_column_radio = $('<input type="radio" id="single_column" name="index_choice"' +
-        ' checked="checked">' +
-        '<label for="single_column">' + PMA_messages.strCreateSingleColumnIndex + '</label>');
-    var $composite_index_radio = $('<input type="radio" id="composite_index"' +
-        ' name="index_choice">' +
-        '<label for="composite_index">' + PMA_messages.strCreateCompositeIndex + '</label>');
-    var $dialog_content = $('<fieldset id="advance_index_creator"></fieldset>');
-    $dialog_content.append('<legend>' + index_choice.toUpperCase() + '</legend>');
-
-
-    // For UNIQUE/INDEX type, show choice for single-column and composite index.
-    $dialog_content.append($single_column_radio);
-    $dialog_content.append($composite_index_radio);
-
-    var button_options = {};
-    // 'OK' operation.
-    button_options[PMA_messages.strGo] = function () {
-        if ($('#single_column').is(':checked')) {
-            var index = {
-                'Key_name': (index_choice == 'primary' ? 'PRIMARY' : ''),
-                'Index_choice': index_choice.toUpperCase()
-            };
-            PMA_showAddIndexDialog(source_array, (source_array.length), [col_index], col_index, index);
-        }
-
-        if ($('#composite_index').is(':checked')) {
-            if ($('input[name="composite_with"]').length !== 0 && $('input[name="composite_with"]:checked').length === 0
-            ) {
-                PMA_ajaxShowMessage(
-                    '<div class="error"><img src="themes/dot.gif" title=""' +
-                    ' alt="" class="icon ic_s_error" /> ' +
-                    PMA_messages.strFormEmpty +
-                    ' </div>',
-                    false
-                );
-                return false;
-            }
-
-            var array_index = $('input[name="composite_with"]:checked').val();
-            var source_length = source_array[array_index].columns.length;
-            var target_columns = [];
-            for (var i=0; i<source_length; i++) {
-                target_columns.push(source_array[array_index].columns[i].col_index);
-            }
-            target_columns.push(col_index);
-
-            PMA_showAddIndexDialog(source_array, array_index, target_columns, col_index,
-             source_array[array_index]);
-        }
-
-        $(this).remove();
-    };
-    button_options[PMA_messages.strCancel] = function () {
-        // Handle state on 'Cancel'.
-        var $select_list = $('select[name="field_key[' + col_index + ']"]');
-        if (! $select_list.attr('data-index').length) {
-            $select_list.find('option[value*="none"]').attr('selected', 'selected');
-        } else {
-            var previous_index = $select_list.attr('data-index').split(',');
-            $select_list.find('option[value*="' + previous_index[0].toLowerCase() + '"]')
-                .attr('selected', 'selected');
-        }
-        $(this).remove();
-    };
-    var $dialog = $('<div/>').append($dialog_content).dialog({
-        minWidth: 525,
-        minHeight: 200,
-        modal: true,
-        title: PMA_messages.strAddIndex,
-        resizable: false,
-        buttons: button_options,
-        open: function () {
-            $('#composite_index').on('change', function () {
-                if ($(this).is(':checked')) {
-                    $dialog_content.append(PMA_getCompositeIndexList(source_array, col_index));
-                }
-            });
-            $('#single_column').on('change', function () {
-                if ($(this).is(':checked')) {
-                    if ($('#composite_index_list').length) {
-                        $('#composite_index_list').remove();
-                    }
-                }
-            });
-        },
-        close: function () {
-            $('#composite_index').off('change');
-            $('#single_column').off('change');
-            $(this).remove();
-        }
-    });
-}
-
-/**
- * Unbind all event handlers before tearing down a page
- */
-AJAX.registerTeardown('indexes.js', function () {
-    $(document).off('click', '#save_index_frm');
-    $(document).off('click', '#preview_index_frm');
-    $(document).off('change', '#select_index_choice');
-    $(document).off('click', 'a.drop_primary_key_index_anchor.ajax');
-    $(document).off('click', "#table_index tbody tr td.edit_index.ajax, #indexes .add_index.ajax");
-    $(document).off('click', '#index_frm input[type=submit]');
-    $('body').off('change', 'select[name*="field_key"]');
-    $(document).off('click', '.show_index_dialog');
-});
-
-/**
- * @description <p>Ajax scripts for table index page</p>
- *
- * Actions ajaxified here:
- * <ul>
- * <li>Showing/hiding inputs depending on the index type chosen</li>
- * <li>create/edit/drop indexes</li>
- * </ul>
- */
-AJAX.registerOnload('indexes.js', function () {
-    // Re-initialize variables.
-    primary_indexes = [];
-    unique_indexes = [];
-    indexes = [];
-    fulltext_indexes = [];
-    spatial_indexes = [];
-
-    // for table creation form
-    var $engine_selector = $('.create_table_form select[name=tbl_storage_engine]');
-    if ($engine_selector.length) {
-        PMA_hideShowConnection($engine_selector);
-    }
-
-    var $form = $("#index_frm");
-    if ($form.length > 0) {
-        showIndexEditDialog($form);
-    }
-
-    $(document).on('click', '#save_index_frm', function (event) {
-        event.preventDefault();
-        var $form = $("#index_frm");
-        var submitData = $form.serialize() + '&do_save_data=1&ajax_request=true&ajax_page_request=true';
-        var $msgbox = PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
-        AJAX.source = $form;
-        $.post($form.attr('action'), submitData, AJAX.responseHandler);
-    });
-
-    $(document).on('click', '#preview_index_frm', function (event) {
-        event.preventDefault();
-        PMA_previewSQL($('#index_frm'));
-    });
-
-    $(document).on('change', '#select_index_choice', function (event) {
-        event.preventDefault();
-        checkIndexType();
-        checkIndexName("index_frm");
-    });
-
-    /**
-     * Ajax Event handler for 'Drop Index'
-     */
-    $(document).on('click', 'a.drop_primary_key_index_anchor.ajax', function (event) {
-        event.preventDefault();
-        var $anchor = $(this);
-        /**
-         * @var $curr_row    Object containing reference to the current field's row
-         */
-        var $curr_row = $anchor.parents('tr');
-        /** @var    Number of columns in the key */
-        var rows = $anchor.parents('td').attr('rowspan') || 1;
-        /** @var    Rows that should be hidden */
-        var $rows_to_hide = $curr_row;
-        for (var i = 1, $last_row = $curr_row.next(); i < rows; i++, $last_row = $last_row.next()) {
-            $rows_to_hide = $rows_to_hide.add($last_row);
-        }
-
-        var question = escapeHtml(
-            $curr_row.children('td')
-                .children('.drop_primary_key_index_msg')
-                .val()
-        );
-
-        $anchor.PMA_confirm(question, $anchor.attr('href'), function (url) {
-            var $msg = PMA_ajaxShowMessage(PMA_messages.strDroppingPrimaryKeyIndex, false);
-            $.post(url, {'is_js_confirmed': 1, 'ajax_request': true}, function (data) {
-                if (typeof data !== 'undefined' && data.success === true) {
-                    PMA_ajaxRemoveMessage($msg);
-                    var $table_ref = $rows_to_hide.closest('table');
-                    if ($rows_to_hide.length == $table_ref.find('tbody > tr').length) {
-                        // We are about to remove all rows from the table
-                        $table_ref.hide('medium', function () {
-                            $('div.no_indexes_defined').show('medium');
-                            $rows_to_hide.remove();
-                        });
-                        $table_ref.siblings('div.notice').hide('medium');
-                    } else {
-                        // We are removing some of the rows only
-                        toggleRowColors($rows_to_hide.last().next());
-                        $rows_to_hide.hide("medium", function () {
-                            $(this).remove();
-                        });
-                    }
-                    if ($('.result_query').length) {
-                        $('.result_query').remove();
-                    }
-                    if (data.sql_query) {
-                        $('<div class="result_query"></div>')
-                            .html(data.sql_query)
-                            .prependTo('#structure_content');
-                        PMA_highlightSQL($('#page_content'));
-                    }
-                    PMA_commonActions.refreshMain(false, function () {
-                        $("a.ajax[href^=#indexes]").click();
-                    });
-                    PMA_reloadNavigation();
-                } else {
-                    PMA_ajaxShowMessage(PMA_messages.strErrorProcessingRequest + " : " + data.error, false);
-                }
-            }); // end $.post()
-        }); // end $.PMA_confirm()
-    }); //end Drop Primary Key/Index
-
-    /**
-     *Ajax event handler for index edit
-    **/
-    $(document).on('click', "#table_index tbody tr td.edit_index.ajax, #indexes .add_index.ajax", function (event) {
-        event.preventDefault();
-        var url, title;
-        if ($(this).find("a").length === 0) {
-            // Add index
-            var valid = checkFormElementInRange(
-                $(this).closest('form')[0],
-                'added_fields',
-                'Column count has to be larger than zero.'
-            );
-            if (! valid) {
-                return;
-            }
-            url = $(this).closest('form').serialize();
-            title = PMA_messages.strAddIndex;
-        } else {
-            // Edit index
-            url = $(this).find("a").attr("href");
-            if (url.substring(0, 16) == "tbl_indexes.php?") {
-                url = url.substring(16, url.length);
-            }
-            title = PMA_messages.strEditIndex;
-        }
-        url += "&ajax_request=true";
-        indexEditorDialog(url, title, function () {
-            // refresh the page using ajax
-            PMA_commonActions.refreshMain(false, function () {
-                $("a.ajax[href^=#indexes]").click();
-            });
-        });
-    });
-
-    /**
-     * Ajax event handler for advanced index creation during table creation
-     * and column addition.
-     */
-    $('body').on('change', 'select[name*="field_key"]', function () {
-        // Index of column on Table edit and create page.
-        var col_index = /\d+/.exec($(this).attr('name'));
-        col_index = col_index[0];
-        // Choice of selected index.
-        var index_choice = /[a-z]+/.exec($(this).val());
-        index_choice = index_choice[0];
-        // Array containing corresponding indexes.
-        var source_array = null;
-
-        if (index_choice == 'none') {
-            PMA_removeColumnFromIndex(col_index);
-            return false;
-        }
-
-        // Select a source array.
-        source_array = PMA_getIndexArray(index_choice);
-        if (source_array == null) {
-            return;
-        }
-
-        if (source_array.length === 0) {
-            var index = {
-                'Key_name': (index_choice == 'primary' ? 'PRIMARY' : ''),
-                'Index_choice': index_choice.toUpperCase()
-            };
-            PMA_showAddIndexDialog(source_array, 0, [col_index], col_index, index);
-        } else {
-            if (index_choice == 'primary') {
-                var array_index = 0;
-                var source_length = source_array[array_index].columns.length;
-                var target_columns = [];
-                for (var i=0; i<source_length; i++) {
-                    target_columns.push(source_array[array_index].columns[i].col_index);
-                }
-                target_columns.push(col_index);
-
-                PMA_showAddIndexDialog(source_array, array_index, target_columns, col_index,
-                 source_array[array_index]);
-            } else {
-                // If there are multiple columns selected for an index, show advanced dialog.
-                PMA_indexTypeSelectionDialog(source_array, index_choice, col_index);
-            }
-        }
-    });
-
-    $(document).on('click', '.show_index_dialog', function (e) {
-        e.preventDefault();
-
-        // Get index details.
-        var previous_index = $(this).prev('select')
-            .attr('data-index')
-            .split(',');
-
-        var index_choice = previous_index[0];
-        var array_index  = previous_index[1];
-
-        var source_array = PMA_getIndexArray(index_choice);
-        var source_length = source_array[array_index].columns.length;
-
-        var target_columns = [];
-        for (var i = 0; i < source_length; i++) {
-            target_columns.push(source_array[array_index].columns[i].col_index);
-        }
-
-        PMA_showAddIndexDialog(source_array, array_index, target_columns, -1, source_array[array_index]);
-    })
-});
diff --git a/#pma/js/jqplot/jquery.jqplot.js b/#pma/js/jqplot/jquery.jqplot.js
deleted file mode 100644
index fc4f8b74..00000000
--- a/#pma/js/jqplot/jquery.jqplot.js
+++ /dev/null
@@ -1,11411 +0,0 @@
-/**
- * Title: jqPlot Charts
- * 
- * Pure JavaScript plotting plugin for jQuery.
- * 
- * About: Version
- * 
- * version: 1.0.8 
- * revision: 1250
- * 
- * About: Copyright & License
- * 
- * Copyright (c) 2009-2013 Chris Leonello
- * jqPlot is currently available for use in all personal or commercial projects 
- * under both the MIT and GPL version 2.0 licenses. This means that you can 
- * choose the license that best suits your project and use it accordingly.
- * 
- * See <GPL Version 2> and <MIT License> contained within this distribution for further information. 
- *
- * The author would appreciate an email letting him know of any substantial
- * use of jqPlot.  You can reach the author at: chris at jqplot dot com 
- * or see http://www.jqplot.com/info.php.  This is, of course, not required.
- *
- * If you are feeling kind and generous, consider supporting the project by
- * making a donation at: http://www.jqplot.com/donate.php.
- *
- * sprintf functions contained in jqplot.sprintf.js by Ash Searle:
- * 
- *     version 2007.04.27
- *     author Ash Searle
- *     http://hexmen.com/blog/2007/03/printf-sprintf/
- *     http://hexmen.com/js/sprintf.js
- *     The author (Ash Searle) has placed this code in the public domain:
- *     "This code is unrestricted: you are free to use it however you like."
- * 
- * 
- * About: Introduction
- * 
- * jqPlot requires jQuery (1.4+ required for certain features). jQuery 1.4.2 is included in the distribution.  
- * To use jqPlot include jQuery, the jqPlot jQuery plugin, the jqPlot css file and optionally 
- * the excanvas script for IE support in your web page:
- * 
- * > <!--[if lt IE 9]><script language="javascript" type="text/javascript" src="excanvas.js"></script><![endif]-->
- * > <script language="javascript" type="text/javascript" src="jquery-1.4.4.min.js"></script>
- * > <script language="javascript" type="text/javascript" src="jquery.jqplot.min.js"></script>
- * > <link rel="stylesheet" type="text/css" href="jquery.jqplot.css" />
- * 
- * jqPlot can be customized by overriding the defaults of any of the objects which make
- * up the plot. The general usage of jqplot is:
- * 
- * > chart = $.jqplot('targetElemId', [dataArray,...], {optionsObject});
- * 
- * The options available to jqplot are detailed in <jqPlot Options> in the jqPlotOptions.txt file.
- * 
- * An actual call to $.jqplot() may look like the 
- * examples below:
- * 
- * > chart = $.jqplot('chartdiv',  [[[1, 2],[3,5.12],[5,13.1],[7,33.6],[9,85.9],[11,219.9]]]);
- * 
- * or
- * 
- * > dataArray = [34,12,43,55,77];
- * > chart = $.jqplot('targetElemId', [dataArray, ...], {title:'My Plot', axes:{yaxis:{min:20, max:100}}});
- * 
- * For more inforrmation, see <jqPlot Usage>.
- * 
- * About: Usage
- * 
- * See <jqPlot Usage>
- * 
- * About: Available Options 
- * 
- * See <jqPlot Options> for a list of options available thorugh the options object (not complete yet!)
- * 
- * About: Options Usage
- * 
- * See <Options Tutorial>
- * 
- * About: Changes
- * 
- * See <Change Log>
- * 
- */
-
-(function($) {
-    // make sure undefined is undefined
-    var undefined;
-    
-    $.fn.emptyForce = function() {
-      for ( var i = 0, elem; (elem = $(this)[i]) != null; i++ ) {
-        // Remove element nodes and prevent memory leaks
-        if ( elem.nodeType === 1 ) {
-          $.cleanData( elem.getElementsByTagName("*") );
-        }
-  
-        // Remove any remaining nodes
-        if ($.jqplot.use_excanvas) {
-          elem.outerHTML = "";
-        }
-        else {
-          while ( elem.firstChild ) {
-            elem.removeChild( elem.firstChild );
-          }
-        }
-
-        elem = null;
-      }
-  
-      return $(this);
-    };
-  
-    $.fn.removeChildForce = function(parent) {
-      while ( parent.firstChild ) {
-        this.removeChildForce( parent.firstChild );
-        parent.removeChild( parent.firstChild );
-      }
-    };
-
-    $.fn.jqplot = function() {
-        var datas = [];
-        var options = [];
-        // see how many data arrays we have
-        for (var i=0, l=arguments.length; i<l; i++) {
-            if ($.isArray(arguments[i])) {
-                datas.push(arguments[i]);
-            }
-            else if ($.isPlainObject(arguments[i])) {
-                options.push(arguments[i]);
-            }
-        }
-
-        return this.each(function(index) {
-            var tid, 
-                plot, 
-                $this = $(this),
-                dl = datas.length,
-                ol = options.length,
-                data, 
-                opts;
-
-            if (index < dl) {
-                data = datas[index];
-            }
-            else {
-                data = dl ? datas[dl-1] : null;
-            }
-
-            if (index < ol) {
-                opts = options[index];
-            }
-            else {
-                opts = ol ? options[ol-1] : null;
-            }
-
-            // does el have an id?
-            // if not assign it one.
-            tid = $this.attr('id');
-            if (tid === undefined) {
-                tid = 'jqplot_target_' + $.jqplot.targetCounter++;
-                $this.attr('id', tid);
-            }
-
-            plot = $.jqplot(tid, data, opts);
-
-            $this.data('jqplot', plot);
-        });
-    };
-
-
-    /**
-     * Namespace: $.jqplot
-     * jQuery function called by the user to create a plot.
-     *  
-     * Parameters:
-     * target - ID of target element to render the plot into.
-     * data - an array of data series.
-     * options - user defined options object.  See the individual classes for available options.
-     * 
-     * Properties:
-     * config - object to hold configuration information for jqPlot plot object.
-     * 
-     * attributes:
-     * enablePlugins - False to disable plugins by default.  Plugins must then be explicitly 
-     *   enabled in the individual plot options.  Default: false.
-     *   This property sets the "show" property of certain plugins to true or false.
-     *   Only plugins that can be immediately active upon loading are affected.  This includes
-     *   non-renderer plugins like cursor, dragable, highlighter, and trendline.
-     * defaultHeight - Default height for plots where no css height specification exists.  This
-     *   is a jqplot wide default.
-     * defaultWidth - Default height for plots where no css height specification exists.  This
-     *   is a jqplot wide default.
-     */
-
-    $.jqplot = function(target, data, options) {
-        var _data = null, _options = null;
-
-        if (arguments.length === 3) {
-            _data = data;
-            _options = options;
-        }
-
-        else if (arguments.length === 2) {
-            if ($.isArray(data)) {
-                _data = data;
-            }
-
-            else if ($.isPlainObject(data)) {
-                _options = data;
-            }
-        }
-
-        if (_data === null && _options !== null && _options.data) {
-            _data = _options.data;
-        }
-
-        var plot = new jqPlot();
-        // remove any error class that may be stuck on target.
-        $('#'+target).removeClass('jqplot-error');
-        
-        if ($.jqplot.config.catchErrors) {
-            try {
-                plot.init(target, _data, _options);
-                plot.draw();
-                plot.themeEngine.init.call(plot);
-                return plot;
-            }
-            catch(e) {
-                var msg = $.jqplot.config.errorMessage || e.message;
-                $('#'+target).append('<div class="jqplot-error-message">'+msg+'</div>');
-                $('#'+target).addClass('jqplot-error');
-                document.getElementById(target).style.background = $.jqplot.config.errorBackground;
-                document.getElementById(target).style.border = $.jqplot.config.errorBorder;
-                document.getElementById(target).style.fontFamily = $.jqplot.config.errorFontFamily;
-                document.getElementById(target).style.fontSize = $.jqplot.config.errorFontSize;
-                document.getElementById(target).style.fontStyle = $.jqplot.config.errorFontStyle;
-                document.getElementById(target).style.fontWeight = $.jqplot.config.errorFontWeight;
-            }
-        }
-        else {        
-            plot.init(target, _data, _options);
-            plot.draw();
-            plot.themeEngine.init.call(plot);
-            return plot;
-        }
-    };
-
-    $.jqplot.version = "1.0.8";
-    $.jqplot.revision = "1250";
-
-    $.jqplot.targetCounter = 1;
-
-    // canvas manager to reuse canvases on the plot.
-    // Should help solve problem of canvases not being freed and
-    // problem of waiting forever for firefox to decide to free memory.
-    $.jqplot.CanvasManager = function() {
-        // canvases are managed globally so that they can be reused
-        // across plots after they have been freed
-        if (typeof $.jqplot.CanvasManager.canvases == 'undefined') {
-            $.jqplot.CanvasManager.canvases = [];
-            $.jqplot.CanvasManager.free = [];
-        }
-        
-        var myCanvases = [];
-        
-        this.getCanvas = function() {
-            var canvas;
-            var makeNew = true;
-            
-            if (!$.jqplot.use_excanvas) {
-                for (var i = 0, l = $.jqplot.CanvasManager.canvases.length; i < l; i++) {
-                    if ($.jqplot.CanvasManager.free[i] === true) {
-                        makeNew = false;
-                        canvas = $.jqplot.CanvasManager.canvases[i];
-                        // $(canvas).removeClass('jqplot-canvasManager-free').addClass('jqplot-canvasManager-inuse');
-                        $.jqplot.CanvasManager.free[i] = false;
-                        myCanvases.push(i);
-                        break;
-                    }
-                }
-            }
-
-            if (makeNew) {
-                canvas = document.createElement('canvas');
-                myCanvases.push($.jqplot.CanvasManager.canvases.length);
-                $.jqplot.CanvasManager.canvases.push(canvas);
-                $.jqplot.CanvasManager.free.push(false);
-            }   
-            
-            return canvas;
-        };
-        
-        // this method has to be used after settings the dimesions
-        // on the element returned by getCanvas()
-        this.initCanvas = function(canvas) {
-            if ($.jqplot.use_excanvas) {
-                return window.G_vmlCanvasManager.initElement(canvas);
-            }
-            return canvas;
-        };
-
-        this.freeAllCanvases = function() {
-            for (var i = 0, l=myCanvases.length; i < l; i++) {
-                this.freeCanvas(myCanvases[i]);
-            }
-            myCanvases = [];
-        };
-
-        this.freeCanvas = function(idx) {
-            if ($.jqplot.use_excanvas && window.G_vmlCanvasManager.uninitElement !== undefined) {
-                // excanvas can't be reused, but properly unset
-                window.G_vmlCanvasManager.uninitElement($.jqplot.CanvasManager.canvases[idx]);
-                $.jqplot.CanvasManager.canvases[idx] = null;
-            } 
-            else {
-                var canvas = $.jqplot.CanvasManager.canvases[idx];
-                canvas.getContext('2d').clearRect(0, 0, canvas.width, canvas.height);
-                $(canvas).unbind().removeAttr('class').removeAttr('style');
-                // Style attributes seemed to be still hanging around.  wierd.  Some ticks
-                // still retained a left: 0px attribute after reusing a canvas.
-                $(canvas).css({left: '', top: '', position: ''});
-                // setting size to 0 may save memory of unused canvases?
-                canvas.width = 0;
-                canvas.height = 0;
-                $.jqplot.CanvasManager.free[idx] = true;
-            }
-        };
-        
-    };
-
-            
-    // Convienence function that won't hang IE or FF without FireBug.
-    $.jqplot.log = function() {
-        if (window.console) {
-            window.console.log.apply(window.console, arguments);
-        }
-    };
-        
-    $.jqplot.config = {
-        addDomReference: false,
-        enablePlugins:false,
-        defaultHeight:300,
-        defaultWidth:400,
-        UTCAdjust:false,
-        timezoneOffset: new Date(new Date().getTimezoneOffset() * 60000),
-        errorMessage: '',
-        errorBackground: '',
-        errorBorder: '',
-        errorFontFamily: '',
-        errorFontSize: '',
-        errorFontStyle: '',
-        errorFontWeight: '',
-        catchErrors: false,
-        defaultTickFormatString: "%.1f",
-        defaultColors: [ "#4bb2c5", "#EAA228", "#c5b47f", "#579575", "#839557", "#958c12", "#953579", "#4b5de4", "#d8b83f", "#ff5800", "#0085cc", "#c747a3", "#cddf54", "#FBD178", "#26B4E3", "#bd70c7"],
-        defaultNegativeColors: [ "#498991", "#C08840", "#9F9274", "#546D61", "#646C4A", "#6F6621", "#6E3F5F", "#4F64B0", "#A89050", "#C45923", "#187399", "#945381", "#959E5C", "#C7AF7B", "#478396", "#907294"],
-        dashLength: 4,
-        gapLength: 4,
-        dotGapLength: 2.5,
-        srcLocation: 'jqplot/src/',
-        pluginLocation: 'jqplot/src/plugins/'
-    };
-    
-    
-    $.jqplot.arrayMax = function( array ){
-        return Math.max.apply( Math, array );
-    };
-    
-    $.jqplot.arrayMin = function( array ){
-        return Math.min.apply( Math, array );
-    };
-    
-    $.jqplot.enablePlugins = $.jqplot.config.enablePlugins;
-    
-    // canvas related tests taken from modernizer:
-    // Copyright (c) 2009 - 2010 Faruk Ates.
-    // http://www.modernizr.com
-    
-    $.jqplot.support_canvas = function() {
-        if (typeof $.jqplot.support_canvas.result == 'undefined') {
-            $.jqplot.support_canvas.result = !!document.createElement('canvas').getContext; 
-        }
-        return $.jqplot.support_canvas.result;
-    };
-            
-    $.jqplot.support_canvas_text = function() {
-        if (typeof $.jqplot.support_canvas_text.result == 'undefined') {
-            if (window.G_vmlCanvasManager !== undefined && window.G_vmlCanvasManager._version > 887) {
-                $.jqplot.support_canvas_text.result = true;
-            }
-            else {
-                $.jqplot.support_canvas_text.result = !!(document.createElement('canvas').getContext && typeof document.createElement('canvas').getContext('2d').fillText == 'function');
-            }
-             
-        }
-        return $.jqplot.support_canvas_text.result;
-    };
-    
-    $.jqplot.use_excanvas = ((!$.support.boxModel || !$.support.objectAll || !$support.leadingWhitespace) && !$.jqplot.support_canvas()) ? true : false;
-    
-    /**
-     * 
-     * Hooks: jqPlot Pugin Hooks
-     * 
-     * $.jqplot.preInitHooks - called before initialization.
-     * $.jqplot.postInitHooks - called after initialization.
-     * $.jqplot.preParseOptionsHooks - called before user options are parsed.
-     * $.jqplot.postParseOptionsHooks - called after user options are parsed.
-     * $.jqplot.preDrawHooks - called before plot draw.
-     * $.jqplot.postDrawHooks - called after plot draw.
-     * $.jqplot.preDrawSeriesHooks - called before each series is drawn.
-     * $.jqplot.postDrawSeriesHooks - called after each series is drawn.
-     * $.jqplot.preDrawLegendHooks - called before the legend is drawn.
-     * $.jqplot.addLegendRowHooks - called at the end of legend draw, so plugins
-     *     can add rows to the legend table.
-     * $.jqplot.preSeriesInitHooks - called before series is initialized.
-     * $.jqplot.postSeriesInitHooks - called after series is initialized.
-     * $.jqplot.preParseSeriesOptionsHooks - called before series related options
-     *     are parsed.
-     * $.jqplot.postParseSeriesOptionsHooks - called after series related options
-     *     are parsed.
-     * $.jqplot.eventListenerHooks - called at the end of plot drawing, binds
-     *     listeners to the event canvas which lays on top of the grid area.
-     * $.jqplot.preDrawSeriesShadowHooks - called before series shadows are drawn.
-     * $.jqplot.postDrawSeriesShadowHooks - called after series shadows are drawn.
-     * 
-     */
-    
-    $.jqplot.preInitHooks = [];
-    $.jqplot.postInitHooks = [];
-    $.jqplot.preParseOptionsHooks = [];
-    $.jqplot.postParseOptionsHooks = [];
-    $.jqplot.preDrawHooks = [];
-    $.jqplot.postDrawHooks = [];
-    $.jqplot.preDrawSeriesHooks = [];
-    $.jqplot.postDrawSeriesHooks = [];
-    $.jqplot.preDrawLegendHooks = [];
-    $.jqplot.addLegendRowHooks = [];
-    $.jqplot.preSeriesInitHooks = [];
-    $.jqplot.postSeriesInitHooks = [];
-    $.jqplot.preParseSeriesOptionsHooks = [];
-    $.jqplot.postParseSeriesOptionsHooks = [];
-    $.jqplot.eventListenerHooks = [];
-    $.jqplot.preDrawSeriesShadowHooks = [];
-    $.jqplot.postDrawSeriesShadowHooks = [];
-
-    // A superclass holding some common properties and methods.
-    $.jqplot.ElemContainer = function() {
-        this._elem;
-        this._plotWidth;
-        this._plotHeight;
-        this._plotDimensions = {height:null, width:null};
-    };
-    
-    $.jqplot.ElemContainer.prototype.createElement = function(el, offsets, clss, cssopts, attrib) {
-        this._offsets = offsets;
-        var klass = clss || 'jqplot';
-        var elem = document.createElement(el);
-        this._elem = $(elem);
-        this._elem.addClass(klass);
-        this._elem.css(cssopts);
-        this._elem.attr(attrib);
-        // avoid memory leak;
-        elem = null;
-        return this._elem;
-    };
-    
-    $.jqplot.ElemContainer.prototype.getWidth = function() {
-        if (this._elem) {
-            return this._elem.outerWidth(true);
-        }
-        else {
-            return null;
-        }
-    };
-    
-    $.jqplot.ElemContainer.prototype.getHeight = function() {
-        if (this._elem) {
-            return this._elem.outerHeight(true);
-        }
-        else {
-            return null;
-        }
-    };
-    
-    $.jqplot.ElemContainer.prototype.getPosition = function() {
-        if (this._elem) {
-            return this._elem.position();
-        }
-        else {
-            return {top:null, left:null, bottom:null, right:null};
-        }
-    };
-    
-    $.jqplot.ElemContainer.prototype.getTop = function() {
-        return this.getPosition().top;
-    };
-    
-    $.jqplot.ElemContainer.prototype.getLeft = function() {
-        return this.getPosition().left;
-    };
-    
-    $.jqplot.ElemContainer.prototype.getBottom = function() {
-        return this._elem.css('bottom');
-    };
-    
-    $.jqplot.ElemContainer.prototype.getRight = function() {
-        return this._elem.css('right');
-    };
-    
-
-    /**
-     * Class: Axis
-     * An individual axis object.  Cannot be instantiated directly, but created
-     * by the Plot object.  Axis properties can be set or overridden by the 
-     * options passed in from the user.
-     * 
-     */
-    function Axis(name) {
-        $.jqplot.ElemContainer.call(this);
-        // Group: Properties
-        //
-        // Axes options are specified within an axes object at the top level of the 
-        // plot options like so:
-        // > {
-        // >    axes: {
-        // >        xaxis: {min: 5},
-        // >        yaxis: {min: 2, max: 8, numberTicks:4},
-        // >        x2axis: {pad: 1.5},
-        // >        y2axis: {ticks:[22, 44, 66, 88]}
-        // >        }
-        // > }
-        // There are 2 x axes, 'xaxis' and 'x2axis', and 
-        // 9 yaxes, 'yaxis', 'y2axis'. 'y3axis', ...  Any or all of which may be specified.
-        this.name = name;
-        this._series = [];
-        // prop: show
-        // Wether to display the axis on the graph.
-        this.show = false;
-        // prop: tickRenderer
-        // A class of a rendering engine for creating the ticks labels displayed on the plot, 
-        // See <$.jqplot.AxisTickRenderer>.
-        this.tickRenderer = $.jqplot.AxisTickRenderer;
-        // prop: tickOptions
-        // Options that will be passed to the tickRenderer, see <$.jqplot.AxisTickRenderer> options.
-        this.tickOptions = {};
-        // prop: labelRenderer
-        // A class of a rendering engine for creating an axis label.
-        this.labelRenderer = $.jqplot.AxisLabelRenderer;
-        // prop: labelOptions
-        // Options passed to the label renderer.
-        this.labelOptions = {};
-        // prop: label
-        // Label for the axis
-        this.label = null;
-        // prop: showLabel
-        // true to show the axis label.
-        this.showLabel = true;
-        // prop: min
-        // minimum value of the axis (in data units, not pixels).
-        this.min = null;
-        // prop: max
-        // maximum value of the axis (in data units, not pixels).
-        this.max = null;
-        // prop: autoscale
-        // DEPRECATED
-        // the default scaling algorithm produces superior results.
-        this.autoscale = false;
-        // prop: pad
-        // Padding to extend the range above and below the data bounds.
-        // The data range is multiplied by this factor to determine minimum and maximum axis bounds.
-        // A value of 0 will be interpreted to mean no padding, and pad will be set to 1.0.
-        this.pad = 1.2;
-        // prop: padMax
-        // Padding to extend the range above data bounds.
-        // The top of the data range is multiplied by this factor to determine maximum axis bounds.
-        // A value of 0 will be interpreted to mean no padding, and padMax will be set to 1.0.
-        this.padMax = null;
-        // prop: padMin
-        // Padding to extend the range below data bounds.
-        // The bottom of the data range is multiplied by this factor to determine minimum axis bounds.
-        // A value of 0 will be interpreted to mean no padding, and padMin will be set to 1.0.
-        this.padMin = null;
-        // prop: ticks
-        // 1D [val, val, ...] or 2D [[val, label], [val, label], ...] array of ticks for the axis.
-        // If no label is specified, the value is formatted into an appropriate label.
-        this.ticks = [];
-        // prop: numberTicks
-        // Desired number of ticks.  Default is to compute automatically.
-        this.numberTicks;
-        // prop: tickInterval
-        // number of units between ticks.  Mutually exclusive with numberTicks.
-        this.tickInterval;
-        // prop: renderer
-        // A class of a rendering engine that handles tick generation, 
-        // scaling input data to pixel grid units and drawing the axis element.
-        this.renderer = $.jqplot.LinearAxisRenderer;
-        // prop: rendererOptions
-        // renderer specific options.  See <$.jqplot.LinearAxisRenderer> for options.
-        this.rendererOptions = {};
-        // prop: showTicks
-        // Wether to show the ticks (both marks and labels) or not.
-        // Will not override showMark and showLabel options if specified on the ticks themselves.
-        this.showTicks = true;
-        // prop: showTickMarks
-        // Wether to show the tick marks (line crossing grid) or not.
-        // Overridden by showTicks and showMark option of tick itself.
-        this.showTickMarks = true;
-        // prop: showMinorTicks
-        // Wether or not to show minor ticks.  This is renderer dependent.
-        this.showMinorTicks = true;
-        // prop: drawMajorGridlines
-        // True to draw gridlines for major axis ticks.
-        this.drawMajorGridlines = true;
-        // prop: drawMinorGridlines
-        // True to draw gridlines for minor ticks.
-        this.drawMinorGridlines = false;
-        // prop: drawMajorTickMarks
-        // True to draw tick marks for major axis ticks.
-        this.drawMajorTickMarks = true;
-        // prop: drawMinorTickMarks
-        // True to draw tick marks for minor ticks.  This is renderer dependent.
-        this.drawMinorTickMarks = true;
-        // prop: useSeriesColor
-        // Use the color of the first series associated with this axis for the
-        // tick marks and line bordering this axis.
-        this.useSeriesColor = false;
-        // prop: borderWidth
-        // width of line stroked at the border of the axis.  Defaults
-        // to the width of the grid boarder.
-        this.borderWidth = null;
-        // prop: borderColor
-        // color of the border adjacent to the axis.  Defaults to grid border color.
-        this.borderColor = null;
-        // prop: scaleToHiddenSeries
-        // True to include hidden series when computing axes bounds and scaling.
-        this.scaleToHiddenSeries = false;
-        // minimum and maximum values on the axis.
-        this._dataBounds = {min:null, max:null};
-        // statistics (min, max, mean) as well as actual data intervals for each series attached to axis.
-        // holds collection of {intervals:[], min:, max:, mean: } objects for each series on axis.
-        this._intervalStats = [];
-        // pixel position from the top left of the min value and max value on the axis.
-        this._offsets = {min:null, max:null};
-        this._ticks=[];
-        this._label = null;
-        // prop: syncTicks
-        // true to try and synchronize tick spacing across multiple axes so that ticks and
-        // grid lines line up.  This has an impact on autoscaling algorithm, however.
-        // In general, autoscaling an individual axis will work better if it does not
-        // have to sync ticks.
-        this.syncTicks = null;
-        // prop: tickSpacing
-        // Approximate pixel spacing between ticks on graph.  Used during autoscaling.
-        // This number will be an upper bound, actual spacing will be less.
-        this.tickSpacing = 75;
-        // Properties to hold the original values for min, max, ticks, tickInterval and numberTicks
-        // so they can be restored if altered by plugins.
-        this._min = null;
-        this._max = null;
-        this._tickInterval = null;
-        this._numberTicks = null;
-        this.__ticks = null;
-        // hold original user options.
-        this._options = {};
-    }
-    
-    Axis.prototype = new $.jqplot.ElemContainer();
-    Axis.prototype.constructor = Axis;
-    
-    Axis.prototype.init = function() {
-        if ($.isFunction(this.renderer)) {
-            this.renderer = new this.renderer();  
-        }
-        // set the axis name
-        this.tickOptions.axis = this.name;
-        // if showMark or showLabel tick options not specified, use value of axis option.
-        // showTicks overrides showTickMarks.
-        if (this.tickOptions.showMark == null) {
-            this.tickOptions.showMark = this.showTicks;
-        }
-        if (this.tickOptions.showMark == null) {
-            this.tickOptions.showMark = this.showTickMarks;
-        }
-        if (this.tickOptions.showLabel == null) {
-            this.tickOptions.showLabel = this.showTicks;
-        }
-        
-        if (this.label == null || this.label == '') {
-            this.showLabel = false;
-        }
-        else {
-            this.labelOptions.label = this.label;
-        }
-        if (this.showLabel == false) {
-            this.labelOptions.show = false;
-        }
-        // set the default padMax, padMin if not specified
-        // special check, if no padding desired, padding
-        // should be set to 1.0
-        if (this.pad == 0) {
-            this.pad = 1.0;
-        }
-        if (this.padMax == 0) {
-            this.padMax = 1.0;
-        }
-        if (this.padMin == 0) {
-            this.padMin = 1.0;
-        }
-        if (this.padMax == null) {
-            this.padMax = (this.pad-1)/2 + 1;
-        }
-        if (this.padMin == null) {
-            this.padMin = (this.pad-1)/2 + 1;
-        }
-        // now that padMin and padMax are correctly set, reset pad in case user has supplied 
-        // padMin and/or padMax
-        this.pad = this.padMax + this.padMin - 1;
-        if (this.min != null || this.max != null) {
-            this.autoscale = false;
-        }
-        // if not set, sync ticks for y axes but not x by default.
-        if (this.syncTicks == null && this.name.indexOf('y') > -1) {
-            this.syncTicks = true;
-        }
-        else if (this.syncTicks == null){
-            this.syncTicks = false;
-        }
-        this.renderer.init.call(this, this.rendererOptions);
-        
-    };
-    
-    Axis.prototype.draw = function(ctx, plot) {
-        // Memory Leaks patch
-        if (this.__ticks) {
-          this.__ticks = null;
-        }
-
-        return this.renderer.draw.call(this, ctx, plot);
-        
-    };
-    
-    Axis.prototype.set = function() {
-        this.renderer.set.call(this);
-    };
-    
-    Axis.prototype.pack = function(pos, offsets) {
-        if (this.show) {
-            this.renderer.pack.call(this, pos, offsets);
-        }
-        // these properties should all be available now.
-        if (this._min == null) {
-            this._min = this.min;
-            this._max = this.max;
-            this._tickInterval = this.tickInterval;
-            this._numberTicks = this.numberTicks;
-            this.__ticks = this._ticks;
-        }
-    };
-    
-    // reset the axis back to original values if it has been scaled, zoomed, etc.
-    Axis.prototype.reset = function() {
-        this.renderer.reset.call(this);
-    };
-    
-    Axis.prototype.resetScale = function(opts) {
-        $.extend(true, this, {min: null, max: null, numberTicks: null, tickInterval: null, _ticks: [], ticks: []}, opts);
-        this.resetDataBounds();
-    };
-    
-    Axis.prototype.resetDataBounds = function() {
-        // Go through all the series attached to this axis and find
-        // the min/max bounds for this axis.
-        var db = this._dataBounds;
-        db.min = null;
-        db.max = null;
-        var l, s, d;
-        // check for when to force min 0 on bar series plots.
-        var doforce = (this.show) ? true : false;
-        for (var i=0; i<this._series.length; i++) {
-            s = this._series[i];
-            if (s.show || this.scaleToHiddenSeries) {
-                d = s._plotData;
-                if (s._type === 'line' && s.renderer.bands.show && this.name.charAt(0) !== 'x') {
-                    d = [[0, s.renderer.bands._min], [1, s.renderer.bands._max]];
-                }
-
-                var minyidx = 1, maxyidx = 1;
-
-                if (s._type != null && s._type == 'ohlc') {
-                    minyidx = 3;
-                    maxyidx = 2;
-                }
-                
-                for (var j=0, l=d.length; j<l; j++) { 
-                    if (this.name == 'xaxis' || this.name == 'x2axis') {
-                        if ((d[j][0] != null && d[j][0] < db.min) || db.min == null) {
-                            db.min = d[j][0];
-                        }
-                        if ((d[j][0] != null && d[j][0] > db.max) || db.max == null) {
-                            db.max = d[j][0];
-                        }
-                    }              
-                    else {
-                        if ((d[j][minyidx] != null && d[j][minyidx] < db.min) || db.min == null) {
-                            db.min = d[j][minyidx];
-                        }
-                        if ((d[j][maxyidx] != null && d[j][maxyidx] > db.max) || db.max == null) {
-                            db.max = d[j][maxyidx];
-                        }
-                    }              
-                }
-
-                // Hack to not pad out bottom of bar plots unless user has specified a padding.
-                // every series will have a chance to set doforce to false.  once it is set to 
-                // false, it cannot be reset to true.
-                // If any series attached to axis is not a bar, wont force 0.
-                if (doforce && s.renderer.constructor !== $.jqplot.BarRenderer) {
-                    doforce = false;
-                }
-
-                else if (doforce && this._options.hasOwnProperty('forceTickAt0') && this._options.forceTickAt0 == false) {
-                    doforce = false;
-                }
-
-                else if (doforce && s.renderer.constructor === $.jqplot.BarRenderer) {
-                    if (s.barDirection == 'vertical' && this.name != 'xaxis' && this.name != 'x2axis') { 
-                        if (this._options.pad != null || this._options.padMin != null) {
-                            doforce = false;
-                        }
-                    }
-
-                    else if (s.barDirection == 'horizontal' && (this.name == 'xaxis' || this.name == 'x2axis')) {
-                        if (this._options.pad != null || this._options.padMin != null) {
-                            doforce = false;
-                        }
-                    }
-
-                }
-            }
-        }
-
-        if (doforce && this.renderer.constructor === $.jqplot.LinearAxisRenderer && db.min >= 0) {
-            this.padMin = 1.0;
-            this.forceTickAt0 = true;
-        }
-    };
-
-    /**
-     * Class: Legend
-     * Legend object.  Cannot be instantiated directly, but created
-     * by the Plot object.  Legend properties can be set or overridden by the 
-     * options passed in from the user.
-     */
-    function Legend(options) {
-        $.jqplot.ElemContainer.call(this);
-        // Group: Properties
-        
-        // prop: show
-        // Wether to display the legend on the graph.
-        this.show = false;
-        // prop: location
-        // Placement of the legend.  one of the compass directions: nw, n, ne, e, se, s, sw, w
-        this.location = 'ne';
-        // prop: labels
-        // Array of labels to use.  By default the renderer will look for labels on the series.
-        // Labels specified in this array will override labels specified on the series.
-        this.labels = [];
-        // prop: showLabels
-        // true to show the label text on the  legend.
-        this.showLabels = true;
-        // prop: showSwatch
-        // true to show the color swatches on the legend.
-        this.showSwatches = true;
-        // prop: placement
-        // "insideGrid" places legend inside the grid area of the plot.
-        // "outsideGrid" places the legend outside the grid but inside the plot container, 
-        // shrinking the grid to accomodate the legend.
-        // "inside" synonym for "insideGrid", 
-        // "outside" places the legend ouside the grid area, but does not shrink the grid which
-        // can cause the legend to overflow the plot container.
-        this.placement = "insideGrid";
-        // prop: xoffset
-        // DEPRECATED.  Set the margins on the legend using the marginTop, marginLeft, etc. 
-        // properties or via CSS margin styling of the .jqplot-table-legend class.
-        this.xoffset = 0;
-        // prop: yoffset
-        // DEPRECATED.  Set the margins on the legend using the marginTop, marginLeft, etc. 
-        // properties or via CSS margin styling of the .jqplot-table-legend class.
-        this.yoffset = 0;
-        // prop: border
-        // css spec for the border around the legend box.
-        this.border;
-        // prop: background
-        // css spec for the background of the legend box.
-        this.background;
-        // prop: textColor
-        // css color spec for the legend text.
-        this.textColor;
-        // prop: fontFamily
-        // css font-family spec for the legend text.
-        this.fontFamily; 
-        // prop: fontSize
-        // css font-size spec for the legend text.
-        this.fontSize ;
-        // prop: rowSpacing
-        // css padding-top spec for the rows in the legend.
-        this.rowSpacing = '0.5em';
-        // renderer
-        // A class that will create a DOM object for the legend,
-        // see <$.jqplot.TableLegendRenderer>.
-        this.renderer = $.jqplot.TableLegendRenderer;
-        // prop: rendererOptions
-        // renderer specific options passed to the renderer.
-        this.rendererOptions = {};
-        // prop: predraw
-        // Wether to draw the legend before the series or not.
-        // Used with series specific legend renderers for pie, donut, mekko charts, etc.
-        this.preDraw = false;
-        // prop: marginTop
-        // CSS margin for the legend DOM element. This will set an element 
-        // CSS style for the margin which will override any style sheet setting.
-        // The default will be taken from the stylesheet.
-        this.marginTop = null;
-        // prop: marginRight
-        // CSS margin for the legend DOM element. This will set an element 
-        // CSS style for the margin which will override any style sheet setting.
-        // The default will be taken from the stylesheet.
-        this.marginRight = null;
-        // prop: marginBottom
-        // CSS margin for the legend DOM element. This will set an element 
-        // CSS style for the margin which will override any style sheet setting.
-        // The default will be taken from the stylesheet.
-        this.marginBottom = null;
-        // prop: marginLeft
-        // CSS margin for the legend DOM element. This will set an element 
-        // CSS style for the margin which will override any style sheet setting.
-        // The default will be taken from the stylesheet.
-        this.marginLeft = null;
-        // prop: escapeHtml
-        // True to escape special characters with their html entity equivalents
-        // in legend text.  "<" becomes &lt; and so on, so html tags are not rendered.
-        this.escapeHtml = false;
-        this._series = [];
-        
-        $.extend(true, this, options);
-    }
-    
-    Legend.prototype = new $.jqplot.ElemContainer();
-    Legend.prototype.constructor = Legend;
-    
-    Legend.prototype.setOptions = function(options) {
-        $.extend(true, this, options);
-        
-        // Try to emulate deprecated behaviour
-        // if user has specified xoffset or yoffset, copy these to
-        // the margin properties.
-        
-        if (this.placement ==  'inside') {
-            this.placement = 'insideGrid';
-        }
-        
-        if (this.xoffset >0) {
-            if (this.placement == 'insideGrid') {
-                switch (this.location) {
-                    case 'nw':
-                    case 'w':
-                    case 'sw':
-                        if (this.marginLeft == null) {
-                            this.marginLeft = this.xoffset + 'px';
-                        }
-                        this.marginRight = '0px';
-                        break;
-                    case 'ne':
-                    case 'e':
-                    case 'se':
-                    default:
-                        if (this.marginRight == null) {
-                            this.marginRight = this.xoffset + 'px';
-                        }
-                        this.marginLeft = '0px';
-                        break;
-                }
-            }
-            else if (this.placement == 'outside') {
-                switch (this.location) {
-                    case 'nw':
-                    case 'w':
-                    case 'sw':
-                        if (this.marginRight == null) {
-                            this.marginRight = this.xoffset + 'px';
-                        }
-                        this.marginLeft = '0px';
-                        break;
-                    case 'ne':
-                    case 'e':
-                    case 'se':
-                    default:
-                        if (this.marginLeft == null) {
-                            this.marginLeft = this.xoffset + 'px';
-                        }
-                        this.marginRight = '0px';
-                        break;
-                }
-            }
-            this.xoffset = 0;
-        }
-        
-        if (this.yoffset >0) {
-            if (this.placement == 'outside') {
-                switch (this.location) {
-                    case 'sw':
-                    case 's':
-                    case 'se':
-                        if (this.marginTop == null) {
-                            this.marginTop = this.yoffset + 'px';
-                        }
-                        this.marginBottom = '0px';
-                        break;
-                    case 'ne':
-                    case 'n':
-                    case 'nw':
-                    default:
-                        if (this.marginBottom == null) {
-                            this.marginBottom = this.yoffset + 'px';
-                        }
-                        this.marginTop = '0px';
-                        break;
-                }
-            }
-            else if (this.placement == 'insideGrid') {
-                switch (this.location) {
-                    case 'sw':
-                    case 's':
-                    case 'se':
-                        if (this.marginBottom == null) {
-                            this.marginBottom = this.yoffset + 'px';
-                        }
-                        this.marginTop = '0px';
-                        break;
-                    case 'ne':
-                    case 'n':
-                    case 'nw':
-                    default:
-                        if (this.marginTop == null) {
-                            this.marginTop = this.yoffset + 'px';
-                        }
-                        this.marginBottom = '0px';
-                        break;
-                }
-            }
-            this.yoffset = 0;
-        }
-        
-        // TO-DO:
-        // Handle case where offsets are < 0.
-        //
-    };
-    
-    Legend.prototype.init = function() {
-        if ($.isFunction(this.renderer)) {
-            this.renderer = new this.renderer();  
-        }
-        this.renderer.init.call(this, this.rendererOptions);
-    };
-    
-    Legend.prototype.draw = function(offsets, plot) {
-        for (var i=0; i<$.jqplot.preDrawLegendHooks.length; i++){
-            $.jqplot.preDrawLegendHooks[i].call(this, offsets);
-        }
-        return this.renderer.draw.call(this, offsets, plot);
-    };
-    
-    Legend.prototype.pack = function(offsets) {
-        this.renderer.pack.call(this, offsets);
-    };
-
-    /**
-     * Class: Title
-     * Plot Title object.  Cannot be instantiated directly, but created
-     * by the Plot object.  Title properties can be set or overridden by the 
-     * options passed in from the user.
-     * 
-     * Parameters:
-     * text - text of the title.
-     */
-    function Title(text) {
-        $.jqplot.ElemContainer.call(this);
-        // Group: Properties
-        
-        // prop: text
-        // text of the title;
-        this.text = text;
-        // prop: show
-        // whether or not to show the title
-        this.show = true;
-        // prop: fontFamily
-        // css font-family spec for the text.
-        this.fontFamily;
-        // prop: fontSize
-        // css font-size spec for the text.
-        this.fontSize ;
-        // prop: textAlign
-        // css text-align spec for the text.
-        this.textAlign;
-        // prop: textColor
-        // css color spec for the text.
-        this.textColor;
-        // prop: renderer
-        // A class for creating a DOM element for the title,
-        // see <$.jqplot.DivTitleRenderer>.
-        this.renderer = $.jqplot.DivTitleRenderer;
-        // prop: rendererOptions
-        // renderer specific options passed to the renderer.
-        this.rendererOptions = {};   
-        // prop: escapeHtml
-        // True to escape special characters with their html entity equivalents
-        // in title text.  "<" becomes &lt; and so on, so html tags are not rendered.
-        this.escapeHtml = false;
-    }
-    
-    Title.prototype = new $.jqplot.ElemContainer();
-    Title.prototype.constructor = Title;
-    
-    Title.prototype.init = function() {
-        if ($.isFunction(this.renderer)) {
-            this.renderer = new this.renderer();  
-        }
-        this.renderer.init.call(this, this.rendererOptions);
-    };
-    
-    Title.prototype.draw = function(width) {
-        return this.renderer.draw.call(this, width);
-    };
-    
-    Title.prototype.pack = function() {
-        this.renderer.pack.call(this);
-    };
-
-
-    /**
-     * Class: Series
-     * An individual data series object.  Cannot be instantiated directly, but created
-     * by the Plot object.  Series properties can be set or overridden by the 
-     * options passed in from the user.
-     */
-    function Series(options) {
-        options = options || {};
-        $.jqplot.ElemContainer.call(this);
-        // Group: Properties
-        // Properties will be assigned from a series array at the top level of the
-        // options.  If you had two series and wanted to change the color and line
-        // width of the first and set the second to use the secondary y axis with
-        // no shadow and supply custom labels for each:
-        // > {
-        // >    series:[
-        // >        {color: '#ff4466', lineWidth: 5, label:'good line'},
-        // >        {yaxis: 'y2axis', shadow: false, label:'bad line'}
-        // >    ]
-        // > }
-
-        // prop: show
-        // whether or not to draw the series.
-        this.show = true;
-        // prop: xaxis
-        // which x axis to use with this series, either 'xaxis' or 'x2axis'.
-        this.xaxis = 'xaxis';
-        this._xaxis;
-        // prop: yaxis
-        // which y axis to use with this series, either 'yaxis' or 'y2axis'.
-        this.yaxis = 'yaxis';
-        this._yaxis;
-        this.gridBorderWidth = 2.0;
-        // prop: renderer
-        // A class of a renderer which will draw the series, 
-        // see <$.jqplot.LineRenderer>.
-        this.renderer = $.jqplot.LineRenderer;
-        // prop: rendererOptions
-        // Options to pass on to the renderer.
-        this.rendererOptions = {};
-        this.data = [];
-        this.gridData = [];
-        // prop: label
-        // Line label to use in the legend.
-        this.label = '';
-        // prop: showLabel
-        // true to show label for this series in the legend.
-        this.showLabel = true;
-        // prop: color
-        // css color spec for the series
-        this.color;
-        // prop: negativeColor
-        // css color spec used for filled (area) plots that are filled to zero and
-        // the "useNegativeColors" option is true.
-        this.negativeColor;
-        // prop: lineWidth
-        // width of the line in pixels.  May have different meanings depending on renderer.
-        this.lineWidth = 2.5;
-        // prop: lineJoin
-        // Canvas lineJoin style between segments of series.
-        this.lineJoin = 'round';
-        // prop: lineCap
-        // Canvas lineCap style at ends of line.
-        this.lineCap = 'round';
-        // prop: linePattern
-        // line pattern 'dashed', 'dotted', 'solid', some combination
-        // of '-' and '.' characters such as '.-.' or a numerical array like 
-        // [draw, skip, draw, skip, ...] such as [1, 10] to draw a dotted line, 
-        // [1, 10, 20, 10] to draw a dot-dash line, and so on.
-        this.linePattern = 'solid';
-        this.shadow = true;
-        // prop: shadowAngle
-        // Shadow angle in degrees
-        this.shadowAngle = 45;
-        // prop: shadowOffset
-        // Shadow offset from line in pixels
-        this.shadowOffset = 1.25;
-        // prop: shadowDepth
-        // Number of times shadow is stroked, each stroke offset shadowOffset from the last.
-        this.shadowDepth = 3;
-        // prop: shadowAlpha
-        // Alpha channel transparency of shadow.  0 = transparent.
-        this.shadowAlpha = '0.1';
-        // prop: breakOnNull
-        // Wether line segments should be be broken at null value.
-        // False will join point on either side of line.
-        this.breakOnNull = false;
-        // prop: markerRenderer
-        // A class of a renderer which will draw marker (e.g. circle, square, ...) at the data points,
-        // see <$.jqplot.MarkerRenderer>.
-        this.markerRenderer = $.jqplot.MarkerRenderer;
-        // prop: markerOptions
-        // renderer specific options to pass to the markerRenderer,
-        // see <$.jqplot.MarkerRenderer>.
-        this.markerOptions = {};
-        // prop: showLine
-        // whether to actually draw the line or not.  Series will still be renderered, even if no line is drawn.
-        this.showLine = true;
-        // prop: showMarker
-        // whether or not to show the markers at the data points.
-        this.showMarker = true;
-        // prop: index
-        // 0 based index of this series in the plot series array.
-        this.index;
-        // prop: fill
-        // true or false, whether to fill under lines or in bars.
-        // May not be implemented in all renderers.
-        this.fill = false;
-        // prop: fillColor
-        // CSS color spec to use for fill under line.  Defaults to line color.
-        this.fillColor;
-        // prop: fillAlpha
-        // Alpha transparency to apply to the fill under the line.
-        // Use this to adjust alpha separate from fill color.
-        this.fillAlpha;
-        // prop: fillAndStroke
-        // If true will stroke the line (with color this.color) as well as fill under it.
-        // Applies only when fill is true.
-        this.fillAndStroke = false;
-        // prop: disableStack
-        // true to not stack this series with other series in the plot.
-        // To render properly, non-stacked series must come after any stacked series
-        // in the plot's data series array.  So, the plot's data series array would look like:
-        // > [stackedSeries1, stackedSeries2, ..., nonStackedSeries1, nonStackedSeries2, ...]
-        // disableStack will put a gap in the stacking order of series, and subsequent
-        // stacked series will not fill down through the non-stacked series and will
-        // most likely not stack properly on top of the non-stacked series.
-        this.disableStack = false;
-        // _stack is set by the Plot if the plot is a stacked chart.
-        // will stack lines or bars on top of one another to build a "mountain" style chart.
-        // May not be implemented in all renderers.
-        this._stack = false;
-        // prop: neighborThreshold
-        // how close or far (in pixels) the cursor must be from a point marker to detect the point.
-        this.neighborThreshold = 4;
-        // prop: fillToZero
-        // true will force bar and filled series to fill toward zero on the fill Axis.
-        this.fillToZero = false;
-        // prop: fillToValue
-        // fill a filled series to this value on the fill axis.
-        // Works in conjunction with fillToZero, so that must be true.
-        this.fillToValue = 0;
-        // prop: fillAxis
-        // Either 'x' or 'y'.  Which axis to fill the line toward if fillToZero is true.
-        // 'y' means fill up/down to 0 on the y axis for this series.
-        this.fillAxis = 'y';
-        // prop: useNegativeColors
-        // true to color negative values differently in filled and bar charts.
-        this.useNegativeColors = true;
-        this._stackData = [];
-        // _plotData accounts for stacking.  If plots not stacked, _plotData and data are same.  If
-        // stacked, _plotData is accumulation of stacking data.
-        this._plotData = [];
-        // _plotValues hold the individual x and y values that will be plotted for this series.
-        this._plotValues = {x:[], y:[]};
-        // statistics about the intervals between data points.  Used for auto scaling.
-        this._intervals = {x:{}, y:{}};
-        // data from the previous series, for stacked charts.
-        this._prevPlotData = [];
-        this._prevGridData = [];
-        this._stackAxis = 'y';
-        this._primaryAxis = '_xaxis';
-        // give each series a canvas to draw on.  This should allow for redrawing speedups.
-        this.canvas = new $.jqplot.GenericCanvas();
-        this.shadowCanvas = new $.jqplot.GenericCanvas();
-        this.plugins = {};
-        // sum of y values in this series.
-        this._sumy = 0;
-        this._sumx = 0;
-        this._type = '';
-    }
-    
-    Series.prototype = new $.jqplot.ElemContainer();
-    Series.prototype.constructor = Series;
-    
-    Series.prototype.init = function(index, gridbw, plot) {
-        // weed out any null values in the data.
-        this.index = index;
-        this.gridBorderWidth = gridbw;
-        var d = this.data;
-        var temp = [], i, l;
-        for (i=0, l=d.length; i<l; i++) {
-            if (! this.breakOnNull) {
-                if (d[i] == null || d[i][0] == null || d[i][1] == null) {
-                    continue;
-                }
-                else {
-                    temp.push(d[i]);
-                }
-            }
-            else {
-                // TODO: figure out what to do with null values
-                // probably involve keeping nulls in data array
-                // and then updating renderers to break line
-                // when it hits null value.
-                // For now, just keep value.
-                temp.push(d[i]);
-            }
-        }
-        this.data = temp;
-
-        // parse the renderer options and apply default colors if not provided
-        // Set color even if not shown, so series don't change colors when other
-        // series on plot shown/hidden.
-        if (!this.color) {
-            this.color = plot.colorGenerator.get(this.index);
-        }
-        if (!this.negativeColor) {
-            this.negativeColor = plot.negativeColorGenerator.get(this.index);
-        }
-
-
-        if (!this.fillColor) {
-            this.fillColor = this.color;
-        }
-        if (this.fillAlpha) {
-            var comp = $.jqplot.normalize2rgb(this.fillColor);
-            var comp = $.jqplot.getColorComponents(comp);
-            this.fillColor = 'rgba('+comp[0]+','+comp[1]+','+comp[2]+','+this.fillAlpha+')';
-        }
-        if ($.isFunction(this.renderer)) {
-            this.renderer = new this.renderer();  
-        }
-        this.renderer.init.call(this, this.rendererOptions, plot);
-        this.markerRenderer = new this.markerRenderer();
-        if (!this.markerOptions.color) {
-            this.markerOptions.color = this.color;
-        }
-        if (this.markerOptions.show == null) {
-            this.markerOptions.show = this.showMarker;
-        }
-        this.showMarker = this.markerOptions.show;
-        // the markerRenderer is called within its own scope, don't want to overwrite series options!!
-        this.markerRenderer.init(this.markerOptions);
-    };
-    
-    // data - optional data point array to draw using this series renderer
-    // gridData - optional grid data point array to draw using this series renderer
-    // stackData - array of cumulative data for stacked plots.
-    Series.prototype.draw = function(sctx, opts, plot) {
-        var options = (opts == undefined) ? {} : opts;
-        sctx = (sctx == undefined) ? this.canvas._ctx : sctx;
-        
-        var j, data, gridData;
-        
-        // hooks get called even if series not shown
-        // we don't clear canvas here, it would wipe out all other series as well.
-        for (j=0; j<$.jqplot.preDrawSeriesHooks.length; j++) {
-            $.jqplot.preDrawSeriesHooks[j].call(this, sctx, options);
-        }
-        if (this.show) {
-            this.renderer.setGridData.call(this, plot);
-            if (!options.preventJqPlotSeriesDrawTrigger) {
-                $(sctx.canvas).trigger('jqplotSeriesDraw', [this.data, this.gridData]);
-            }
-            data = [];
-            if (options.data) {
-                data = options.data;
-            }
-            else if (!this._stack) {
-                data = this.data;
-            }
-            else {
-                data = this._plotData;
-            }
-            gridData = options.gridData || this.renderer.makeGridData.call(this, data, plot);
-
-            if (this._type === 'line' && this.renderer.smooth && this.renderer._smoothedData.length) {
-                gridData = this.renderer._smoothedData;
-            }
-
-            this.renderer.draw.call(this, sctx, gridData, options, plot);
-        }
-        
-        for (j=0; j<$.jqplot.postDrawSeriesHooks.length; j++) {
-            $.jqplot.postDrawSeriesHooks[j].call(this, sctx, options, plot);
-        }
-        
-        sctx = opts = plot = j = data = gridData = null;
-    };
-    
-    Series.prototype.drawShadow = function(sctx, opts, plot) {
-        var options = (opts == undefined) ? {} : opts;
-        sctx = (sctx == undefined) ? this.shadowCanvas._ctx : sctx;
-        
-        var j, data, gridData;
-        
-        // hooks get called even if series not shown
-        // we don't clear canvas here, it would wipe out all other series as well.
-        for (j=0; j<$.jqplot.preDrawSeriesShadowHooks.length; j++) {
-            $.jqplot.preDrawSeriesShadowHooks[j].call(this, sctx, options);
-        }
-        if (this.shadow) {
-            this.renderer.setGridData.call(this, plot);
-
-            data = [];
-            if (options.data) {
-                data = options.data;
-            }
-            else if (!this._stack) {
-                data = this.data;
-            }
-            else {
-                data = this._plotData;
-            }
-            gridData = options.gridData || this.renderer.makeGridData.call(this, data, plot);
-        
-            this.renderer.drawShadow.call(this, sctx, gridData, options, plot);
-        }
-        
-        for (j=0; j<$.jqplot.postDrawSeriesShadowHooks.length; j++) {
-            $.jqplot.postDrawSeriesShadowHooks[j].call(this, sctx, options);
-        }
-        
-        sctx = opts = plot = j = data = gridData = null;
-        
-    };
-    
-    // toggles series display on plot, e.g. show/hide series
-    Series.prototype.toggleDisplay = function(ev, callback) {
-        var s, speed;
-        if (ev.data.series) {
-            s = ev.data.series;
-        }
-        else {
-            s = this;
-        }
-
-        if (ev.data.speed) {
-            speed = ev.data.speed;
-        }
-        if (speed) {
-            // this can be tricky because series may not have a canvas element if replotting.
-            if (s.canvas._elem.is(':hidden') || !s.show) {
-                s.show = true;
-
-                s.canvas._elem.removeClass('jqplot-series-hidden');
-                if (s.shadowCanvas._elem) {
-                    s.shadowCanvas._elem.fadeIn(speed);
-                }
-                s.canvas._elem.fadeIn(speed, callback);
-                s.canvas._elem.nextAll('.jqplot-point-label.jqplot-series-'+s.index).fadeIn(speed);
-            }
-            else {
-                s.show = false;
-
-                s.canvas._elem.addClass('jqplot-series-hidden');
-                if (s.shadowCanvas._elem) {
-                    s.shadowCanvas._elem.fadeOut(speed);
-                }
-                s.canvas._elem.fadeOut(speed, callback);
-                s.canvas._elem.nextAll('.jqplot-point-label.jqplot-series-'+s.index).fadeOut(speed);
-            }
-        }
-        else {
-            // this can be tricky because series may not have a canvas element if replotting.
-            if (s.canvas._elem.is(':hidden') || !s.show) {
-                s.show = true;
-
-                s.canvas._elem.removeClass('jqplot-series-hidden');
-                if (s.shadowCanvas._elem) {
-                    s.shadowCanvas._elem.show();
-                }
-                s.canvas._elem.show(0, callback);
-                s.canvas._elem.nextAll('.jqplot-point-label.jqplot-series-'+s.index).show();
-            }
-            else {
-                s.show = false;
-
-                s.canvas._elem.addClass('jqplot-series-hidden');
-                if (s.shadowCanvas._elem) {
-                    s.shadowCanvas._elem.hide();
-                }
-                s.canvas._elem.hide(0, callback);
-                s.canvas._elem.nextAll('.jqplot-point-label.jqplot-series-'+s.index).hide();
-            }
-        }
-    };
-    
-
-
-    /**
-     * Class: Grid
-     * 
-     * Object representing the grid on which the plot is drawn.  The grid in this
-     * context is the area bounded by the axes, the area which will contain the series.
-     * Note, the series are drawn on their own canvas.
-     * The Grid object cannot be instantiated directly, but is created by the Plot object.  
-     * Grid properties can be set or overridden by the options passed in from the user.
-     */
-    function Grid() {
-        $.jqplot.ElemContainer.call(this);
-        // Group: Properties
-        
-        // prop: drawGridlines
-        // whether to draw the gridlines on the plot.
-        this.drawGridlines = true;
-        // prop: gridLineColor
-        // color of the grid lines.
-        this.gridLineColor = '#cccccc';
-        // prop: gridLineWidth
-        // width of the grid lines.
-        this.gridLineWidth = 1.0;
-        // prop: background
-        // css spec for the background color.
-        this.background = '#fffdf6';
-        // prop: borderColor
-        // css spec for the color of the grid border.
-        this.borderColor = '#999999';
-        // prop: borderWidth
-        // width of the border in pixels.
-        this.borderWidth = 2.0;
-        // prop: drawBorder
-        // True to draw border around grid.
-        this.drawBorder = true;
-        // prop: shadow
-        // whether to show a shadow behind the grid.
-        this.shadow = true;
-        // prop: shadowAngle
-        // shadow angle in degrees
-        this.shadowAngle = 45;
-        // prop: shadowOffset
-        // Offset of each shadow stroke from the border in pixels
-        this.shadowOffset = 1.5;
-        // prop: shadowWidth
-        // width of the stoke for the shadow
-        this.shadowWidth = 3;
-        // prop: shadowDepth
-        // Number of times shadow is stroked, each stroke offset shadowOffset from the last.
-        this.shadowDepth = 3;
-        // prop: shadowColor
-        // an optional css color spec for the shadow in 'rgba(n, n, n, n)' form
-        this.shadowColor = null;
-        // prop: shadowAlpha
-        // Alpha channel transparency of shadow.  0 = transparent.
-        this.shadowAlpha = '0.07';
-        this._left;
-        this._top;
-        this._right;
-        this._bottom;
-        this._width;
-        this._height;
-        this._axes = [];
-        // prop: renderer
-        // Instance of a renderer which will actually render the grid,
-        // see <$.jqplot.CanvasGridRenderer>.
-        this.renderer = $.jqplot.CanvasGridRenderer;
-        // prop: rendererOptions
-        // Options to pass on to the renderer,
-        // see <$.jqplot.CanvasGridRenderer>.
-        this.rendererOptions = {};
-        this._offsets = {top:null, bottom:null, left:null, right:null};
-    }
-    
-    Grid.prototype = new $.jqplot.ElemContainer();
-    Grid.prototype.constructor = Grid;
-    
-    Grid.prototype.init = function() {
-        if ($.isFunction(this.renderer)) {
-            this.renderer = new this.renderer();  
-        }
-        this.renderer.init.call(this, this.rendererOptions);
-    };
-    
-    Grid.prototype.createElement = function(offsets,plot) {
-        this._offsets = offsets;
-        return this.renderer.createElement.call(this, plot);
-    };
-    
-    Grid.prototype.draw = function() {
-        this.renderer.draw.call(this);
-    };
-    
-    $.jqplot.GenericCanvas = function() {
-        $.jqplot.ElemContainer.call(this);
-        this._ctx;  
-    };
-    
-    $.jqplot.GenericCanvas.prototype = new $.jqplot.ElemContainer();
-    $.jqplot.GenericCanvas.prototype.constructor = $.jqplot.GenericCanvas;
-    
-    $.jqplot.GenericCanvas.prototype.createElement = function(offsets, clss, plotDimensions, plot) {
-        this._offsets = offsets;
-        var klass = 'jqplot';
-        if (clss != undefined) {
-            klass = clss;
-        }
-        var elem;
-
-        elem = plot.canvasManager.getCanvas();
-        
-        // if new plotDimensions supplied, use them.
-        if (plotDimensions != null) {
-            this._plotDimensions = plotDimensions;
-        }
-        
-        elem.width = this._plotDimensions.width - this._offsets.left - this._offsets.right;
-        elem.height = this._plotDimensions.height - this._offsets.top - this._offsets.bottom;
-        this._elem = $(elem);
-        this._elem.css({ position: 'absolute', left: this._offsets.left, top: this._offsets.top });
-        
-        this._elem.addClass(klass);
-        
-        elem = plot.canvasManager.initCanvas(elem);
-        
-        elem = null;
-        return this._elem;
-    };
-    
-    $.jqplot.GenericCanvas.prototype.setContext = function() {
-        this._ctx = this._elem.get(0).getContext("2d");
-        return this._ctx;
-    };
-    
-    // Memory Leaks patch
-    $.jqplot.GenericCanvas.prototype.resetCanvas = function() {
-      if (this._elem) {
-        if ($.jqplot.use_excanvas && window.G_vmlCanvasManager.uninitElement !== undefined) {
-           window.G_vmlCanvasManager.uninitElement(this._elem.get(0));
-        }
-        
-        //this._elem.remove();
-        this._elem.emptyForce();
-      }
-      
-      this._ctx = null;
-    };
-    
-    $.jqplot.HooksManager = function () {
-        this.hooks =[];
-        this.args = [];
-    };
-    
-    $.jqplot.HooksManager.prototype.addOnce = function(fn, args) {
-        args = args || [];
-        var havehook = false;
-        for (var i=0, l=this.hooks.length; i<l; i++) {
-            if (this.hooks[i] == fn) {
-                havehook = true;
-            }
-        }
-        if (!havehook) {
-            this.hooks.push(fn);
-            this.args.push(args);
-        }
-    };
-    
-    $.jqplot.HooksManager.prototype.add = function(fn, args) {
-        args = args || [];
-        this.hooks.push(fn);
-        this.args.push(args);
-    };
-    
-    $.jqplot.EventListenerManager = function () {
-        this.hooks =[];
-    };
-    
-    $.jqplot.EventListenerManager.prototype.addOnce = function(ev, fn) {
-        var havehook = false, h, i;
-        for (var i=0, l=this.hooks.length; i<l; i++) {
-            h = this.hooks[i];
-            if (h[0] == ev && h[1] == fn) {
-                havehook = true;
-            }
-        }
-        if (!havehook) {
-            this.hooks.push([ev, fn]);
-        }
-    };
-    
-    $.jqplot.EventListenerManager.prototype.add = function(ev, fn) {
-        this.hooks.push([ev, fn]);
-    };
-
-
-    var _axisNames = ['yMidAxis', 'xaxis', 'yaxis', 'x2axis', 'y2axis', 'y3axis', 'y4axis', 'y5axis', 'y6axis', 'y7axis', 'y8axis', 'y9axis'];
-
-    /**
-     * Class: jqPlot
-     * Plot object returned by call to $.jqplot.  Handles parsing user options,
-     * creating sub objects (Axes, legend, title, series) and rendering the plot.
-     */
-    function jqPlot() {
-        // Group: Properties
-        // These properties are specified at the top of the options object
-        // like so:
-        // > {
-        // >     axesDefaults:{min:0},
-        // >     series:[{color:'#6633dd'}],
-        // >     title: 'A Plot'
-        // > }
-        //
-
-        // prop: animate
-        // True to animate the series on initial plot draw (renderer dependent).
-        // Actual animation functionality must be supported in the renderer.
-        this.animate = false;
-        // prop: animateReplot
-        // True to animate series after a call to the replot() method.
-        // Use with caution!  Replots can happen very frequently under
-        // certain circumstances (e.g. resizing, dragging points) and
-        // animation in these situations can cause problems.
-        this.animateReplot = false;
-        // prop: axes
-        // up to 4 axes are supported, each with its own options, 
-        // See <Axis> for axis specific options.
-        this.axes = {xaxis: new Axis('xaxis'), yaxis: new Axis('yaxis'), x2axis: new Axis('x2axis'), y2axis: new Axis('y2axis'), y3axis: new Axis('y3axis'), y4axis: new Axis('y4axis'), y5axis: new Axis('y5axis'), y6axis: new Axis('y6axis'), y7axis: new Axis('y7axis'), y8axis: new Axis('y8axis'), y9axis: new Axis('y9axis'), yMidAxis: new Axis('yMidAxis')};
-        this.baseCanvas = new $.jqplot.GenericCanvas();
-        // true to intercept right click events and fire a 'jqplotRightClick' event.
-        // this will also block the context menu.
-        this.captureRightClick = false;
-        // prop: data
-        // user's data.  Data should *NOT* be specified in the options object,
-        // but be passed in as the second argument to the $.jqplot() function.
-        // The data property is described here soley for reference. 
-        // The data should be in the form of an array of 2D or 1D arrays like
-        // > [ [[x1, y1], [x2, y2],...], [y1, y2, ...] ].
-        this.data = [];
-        // prop: dataRenderer
-        // A callable which can be used to preprocess data passed into the plot.
-        // Will be called with 3 arguments: the plot data, a reference to the plot,
-        // and the value of dataRendererOptions.
-        this.dataRenderer;
-        // prop: dataRendererOptions
-        // Options that will be passed to the dataRenderer.
-        // Can be of any type.
-        this.dataRendererOptions;
-        this.defaults = {
-            // prop: axesDefaults
-            // default options that will be applied to all axes.
-            // see <Axis> for axes options.
-            axesDefaults: {},
-            axes: {xaxis:{}, yaxis:{}, x2axis:{}, y2axis:{}, y3axis:{}, y4axis:{}, y5axis:{}, y6axis:{}, y7axis:{}, y8axis:{}, y9axis:{}, yMidAxis:{}},
-            // prop: seriesDefaults
-            // default options that will be applied to all series.
-            // see <Series> for series options.
-            seriesDefaults: {},
-            series:[]
-        };
-        // prop: defaultAxisStart
-        // 1-D data series are internally converted into 2-D [x,y] data point arrays
-        // by jqPlot.  This is the default starting value for the missing x or y value.
-        // The added data will be a monotonically increasing series (e.g. [1, 2, 3, ...])
-        // starting at this value.
-        this.defaultAxisStart = 1;
-        // this.doCustomEventBinding = true;
-        // prop: drawIfHidden
-        // True to execute the draw method even if the plot target is hidden.
-        // Generally, this should be false.  Most plot elements will not be sized/
-        // positioned correclty if renderered into a hidden container.  To render into
-        // a hidden container, call the replot method when the container is shown.
-        this.drawIfHidden = false;
-        this.eventCanvas = new $.jqplot.GenericCanvas();
-        // prop: fillBetween
-        // Fill between 2 line series in a plot.
-        // Options object:
-        // {
-        //    series1: first index (0 based) of series in fill
-        //    series2: second index (0 based) of series in fill
-        //    color: color of fill [default fillColor of series1]
-        //    baseSeries:  fill will be drawn below this series (0 based index)
-        //    fill: false to turn off fill [default true].
-        //  }
-        this.fillBetween = {
-            series1: null,
-            series2: null,
-            color: null,
-            baseSeries: 0,
-            fill: true
-        };
-        // prop; fontFamily
-        // css spec for the font-family attribute.  Default for the entire plot.
-        this.fontFamily;
-        // prop: fontSize
-        // css spec for the font-size attribute.  Default for the entire plot.
-        this.fontSize;
-        // prop: grid
-        // See <Grid> for grid specific options.
-        this.grid = new Grid();
-        // prop: legend
-        // see <$.jqplot.TableLegendRenderer>
-        this.legend = new Legend();
-        // prop: noDataIndicator
-        // Options to set up a mock plot with a data loading indicator if no data is specified.
-        this.noDataIndicator = {    
-            show: false,
-            indicator: 'Loading Data...',
-            axes: {
-                xaxis: {
-                    min: 0,
-                    max: 10,
-                    tickInterval: 2,
-                    show: true
-                },
-                yaxis: {
-                    min: 0,
-                    max: 12,
-                    tickInterval: 3,
-                    show: true
-                }
-            }
-        };
-        // prop: negativeSeriesColors 
-        // colors to use for portions of the line below zero.
-        this.negativeSeriesColors = $.jqplot.config.defaultNegativeColors;
-        // container to hold all of the merged options.  Convienence for plugins.
-        this.options = {};
-        this.previousSeriesStack = [];
-        // Namespace to hold plugins.  Generally non-renderer plugins add themselves to here.
-        this.plugins = {};
-        // prop: series
-        // Array of series object options.
-        // see <Series> for series specific options.
-        this.series = [];
-        // array of series indices. Keep track of order
-        // which series canvases are displayed, lowest
-        // to highest, back to front.
-        this.seriesStack = [];
-        // prop: seriesColors
-        // Ann array of CSS color specifications that will be applied, in order,
-        // to the series in the plot.  Colors will wrap around so, if their
-        // are more series than colors, colors will be reused starting at the
-        // beginning.  For pie charts, this specifies the colors of the slices.
-        this.seriesColors = $.jqplot.config.defaultColors;
-        // prop: sortData
-        // false to not sort the data passed in by the user.
-        // Many bar, stacked and other graphs as well as many plugins depend on
-        // having sorted data.
-        this.sortData = true;
-        // prop: stackSeries
-        // true or false, creates a stack or "mountain" plot.
-        // Not all series renderers may implement this option.
-        this.stackSeries = false;
-        // a shortcut for axis syncTicks options.  Not implemented yet.
-        this.syncXTicks = true;
-        // a shortcut for axis syncTicks options.  Not implemented yet.
-        this.syncYTicks = true;
-        // the jquery object for the dom target.
-        this.target = null; 
-        // The id of the dom element to render the plot into
-        this.targetId = null;
-        // prop textColor
-        // css spec for the css color attribute.  Default for the entire plot.
-        this.textColor;
-        // prop: title
-        // Title object.  See <Title> for specific options.  As a shortcut, you
-        // can specify the title option as just a string like: title: 'My Plot'
-        // and this will create a new title object with the specified text.
-        this.title = new Title();
-        // Count how many times the draw method has been called while the plot is visible.
-        // Mostly used to test if plot has never been dran (=0), has been successfully drawn
-        // into a visible container once (=1) or draw more than once into a visible container.
-        // Can use this in tests to see if plot has been visibly drawn at least one time.
-        // After plot has been visibly drawn once, it generally doesn't need redrawing if its
-        // container is hidden and shown.
-        this._drawCount = 0;
-        // sum of y values for all series in plot.
-        // used in mekko chart.
-        this._sumy = 0;
-        this._sumx = 0;
-        // array to hold the cumulative stacked series data.
-        // used to ajust the individual series data, which won't have access to other
-        // series data.
-        this._stackData = [];
-        // array that holds the data to be plotted. This will be the series data
-        // merged with the the appropriate data from _stackData according to the stackAxis.
-        this._plotData = [];
-        this._width = null;
-        this._height = null; 
-        this._plotDimensions = {height:null, width:null};
-        this._gridPadding = {top:null, right:null, bottom:null, left:null};
-        this._defaultGridPadding = {top:10, right:10, bottom:23, left:10};
-
-        this._addDomReference = $.jqplot.config.addDomReference;
-
-        this.preInitHooks = new $.jqplot.HooksManager();
-        this.postInitHooks = new $.jqplot.HooksManager();
-        this.preParseOptionsHooks = new $.jqplot.HooksManager();
-        this.postParseOptionsHooks = new $.jqplot.HooksManager();
-        this.preDrawHooks = new $.jqplot.HooksManager();
-        this.postDrawHooks = new $.jqplot.HooksManager();
-        this.preDrawSeriesHooks = new $.jqplot.HooksManager();
-        this.postDrawSeriesHooks = new $.jqplot.HooksManager();
-        this.preDrawLegendHooks = new $.jqplot.HooksManager();
-        this.addLegendRowHooks = new $.jqplot.HooksManager();
-        this.preSeriesInitHooks = new $.jqplot.HooksManager();
-        this.postSeriesInitHooks = new $.jqplot.HooksManager();
-        this.preParseSeriesOptionsHooks = new $.jqplot.HooksManager();
-        this.postParseSeriesOptionsHooks = new $.jqplot.HooksManager();
-        this.eventListenerHooks = new $.jqplot.EventListenerManager();
-        this.preDrawSeriesShadowHooks = new $.jqplot.HooksManager();
-        this.postDrawSeriesShadowHooks = new $.jqplot.HooksManager();
-        
-        this.colorGenerator = new $.jqplot.ColorGenerator();
-        this.negativeColorGenerator = new $.jqplot.ColorGenerator();
-
-        this.canvasManager = new $.jqplot.CanvasManager();
-
-        this.themeEngine = new $.jqplot.ThemeEngine();
-        
-        var seriesColorsIndex = 0;
-
-        // Group: methods
-        //
-        // method: init
-        // sets the plot target, checks data and applies user
-        // options to plot.
-        this.init = function(target, data, options) {
-            options = options || {};
-            for (var i=0; i<$.jqplot.preInitHooks.length; i++) {
-                $.jqplot.preInitHooks[i].call(this, target, data, options);
-            }
-
-            for (var i=0; i<this.preInitHooks.hooks.length; i++) {
-                this.preInitHooks.hooks[i].call(this, target, data, options);
-            }
-            
-            this.targetId = '#'+target;
-            this.target = $('#'+target);
-
-            //////
-            // Add a reference to plot
-            //////
-            if (this._addDomReference) {
-                this.target.data('jqplot', this);
-            }
-            // remove any error class that may be stuck on target.
-            this.target.removeClass('jqplot-error');
-            if (!this.target.get(0)) {
-                throw new Error("No plot target specified");
-            }
-            
-            // make sure the target is positioned by some means and set css
-            if (this.target.css('position') == 'static') {
-                this.target.css('position', 'relative');
-            }
-            if (!this.target.hasClass('jqplot-target')) {
-                this.target.addClass('jqplot-target');
-            }
-            
-            // if no height or width specified, use a default.
-            if (!this.target.height()) {
-                var h;
-                if (options && options.height) {
-                    h = parseInt(options.height, 10);
-                }
-                else if (this.target.attr('data-height')) {
-                    h = parseInt(this.target.attr('data-height'), 10);
-                }
-                else {
-                    h = parseInt($.jqplot.config.defaultHeight, 10);
-                }
-                this._height = h;
-                this.target.css('height', h+'px');
-            }
-            else {
-                this._height = h = this.target.height();
-            }
-            if (!this.target.width()) {
-                var w;
-                if (options && options.width) {
-                    w = parseInt(options.width, 10);
-                }
-                else if (this.target.attr('data-width')) {
-                    w = parseInt(this.target.attr('data-width'), 10);
-                }
-                else {
-                    w = parseInt($.jqplot.config.defaultWidth, 10);
-                }
-                this._width = w;
-                this.target.css('width', w+'px');
-            }
-            else {
-                this._width = w = this.target.width();
-            }
-
-            for (var i=0, l=_axisNames.length; i<l; i++) {
-                this.axes[_axisNames[i]] = new Axis(_axisNames[i]);
-            }
-            
-            this._plotDimensions.height = this._height;
-            this._plotDimensions.width = this._width;
-            this.grid._plotDimensions = this._plotDimensions;
-            this.title._plotDimensions = this._plotDimensions;
-            this.baseCanvas._plotDimensions = this._plotDimensions;
-            this.eventCanvas._plotDimensions = this._plotDimensions;
-            this.legend._plotDimensions = this._plotDimensions;
-            if (this._height <=0 || this._width <=0 || !this._height || !this._width) {
-                throw new Error("Canvas dimension not set");
-            }
-            
-            if (options.dataRenderer && $.isFunction(options.dataRenderer)) {
-                if (options.dataRendererOptions) {
-                    this.dataRendererOptions = options.dataRendererOptions;
-                }
-                this.dataRenderer = options.dataRenderer;
-                data = this.dataRenderer(data, this, this.dataRendererOptions);
-            }
-            
-            if (options.noDataIndicator && $.isPlainObject(options.noDataIndicator)) {
-                $.extend(true, this.noDataIndicator, options.noDataIndicator);
-            }
-            
-            if (data == null || $.isArray(data) == false || data.length == 0 || $.isArray(data[0]) == false || data[0].length == 0) {
-                
-                if (this.noDataIndicator.show == false) {
-                    throw new Error("No data specified");
-                }
-                
-                else {
-                    // have to be descructive here in order for plot to not try and render series.
-                    // This means that $.jqplot() will have to be called again when there is data.
-                    //delete options.series;
-                    
-                    for (var ax in this.noDataIndicator.axes) {
-                        for (var prop in this.noDataIndicator.axes[ax]) {
-                            this.axes[ax][prop] = this.noDataIndicator.axes[ax][prop];
-                        }
-                    }
-                    
-                    this.postDrawHooks.add(function() {
-                        var eh = this.eventCanvas.getHeight();
-                        var ew = this.eventCanvas.getWidth();
-                        var temp = $('<div class="jqplot-noData-container" style="position:absolute;"></div>');
-                        this.target.append(temp);
-                        temp.height(eh);
-                        temp.width(ew);
-                        temp.css('top', this.eventCanvas._offsets.top);
-                        temp.css('left', this.eventCanvas._offsets.left);
-                        
-                        var temp2 = $('<div class="jqplot-noData-contents" style="text-align:center; position:relative; margin-left:auto; margin-right:auto;"></div>');
-                        temp.append(temp2);
-                        temp2.html(this.noDataIndicator.indicator);
-                        var th = temp2.height();
-                        var tw = temp2.width();
-                        temp2.height(th);
-                        temp2.width(tw);
-                        temp2.css('top', (eh - th)/2 + 'px');
-                    });
-
-                }
-            }
-            
-            // make a copy of the data
-            this.data = $.extend(true, [], data);
-            
-            this.parseOptions(options);
-            
-            if (this.textColor) {
-                this.target.css('color', this.textColor);
-            }
-            if (this.fontFamily) {
-                this.target.css('font-family', this.fontFamily);
-            }
-            if (this.fontSize) {
-                this.target.css('font-size', this.fontSize);
-            }
-            
-            this.title.init();
-            this.legend.init();
-            this._sumy = 0;
-            this._sumx = 0;
-            this.computePlotData();
-            for (var i=0; i<this.series.length; i++) {
-                // set default stacking order for series canvases
-                this.seriesStack.push(i);
-                this.previousSeriesStack.push(i);
-                this.series[i].shadowCanvas._plotDimensions = this._plotDimensions;
-                this.series[i].canvas._plotDimensions = this._plotDimensions;
-                for (var j=0; j<$.jqplot.preSeriesInitHooks.length; j++) {
-                    $.jqplot.preSeriesInitHooks[j].call(this.series[i], target, this.data, this.options.seriesDefaults, this.options.series[i], this);
-                }
-                for (var j=0; j<this.preSeriesInitHooks.hooks.length; j++) {
-                    this.preSeriesInitHooks.hooks[j].call(this.series[i], target, this.data, this.options.seriesDefaults, this.options.series[i], this);
-                }
-                // this.populatePlotData(this.series[i], i);
-                this.series[i]._plotDimensions = this._plotDimensions;
-                this.series[i].init(i, this.grid.borderWidth, this);
-                for (var j=0; j<$.jqplot.postSeriesInitHooks.length; j++) {
-                    $.jqplot.postSeriesInitHooks[j].call(this.series[i], target, this.data, this.options.seriesDefaults, this.options.series[i], this);
-                }
-                for (var j=0; j<this.postSeriesInitHooks.hooks.length; j++) {
-                    this.postSeriesInitHooks.hooks[j].call(this.series[i], target, this.data, this.options.seriesDefaults, this.options.series[i], this);
-                }
-                this._sumy += this.series[i]._sumy;
-                this._sumx += this.series[i]._sumx;
-            }
-
-            var name,
-                axis;
-            for (var i=0, l=_axisNames.length; i<l; i++) {
-                name = _axisNames[i];
-                axis = this.axes[name];
-                axis._plotDimensions = this._plotDimensions;
-                axis.init();
-                if (this.axes[name].borderColor == null) {
-                    if (name.charAt(0) !== 'x' && axis.useSeriesColor === true && axis.show) {
-                        axis.borderColor = axis._series[0].color;
-                    }
-                    else {
-                        axis.borderColor = this.grid.borderColor;
-                    }
-                }
-            }
-            
-            if (this.sortData) {
-                sortData(this.series);
-            }
-            this.grid.init();
-            this.grid._axes = this.axes;
-            
-            this.legend._series = this.series;
-
-            for (var i=0; i<$.jqplot.postInitHooks.length; i++) {
-                $.jqplot.postInitHooks[i].call(this, target, this.data, options);
-            }
-
-            for (var i=0; i<this.postInitHooks.hooks.length; i++) {
-                this.postInitHooks.hooks[i].call(this, target, this.data, options);
-            }
-        };  
-        
-        // method: resetAxesScale
-        // Reset the specified axes min, max, numberTicks and tickInterval properties to null
-        // or reset these properties on all axes if no list of axes is provided.
-        //
-        // Parameters:
-        // axes - Boolean to reset or not reset all axes or an array or object of axis names to reset.
-        this.resetAxesScale = function(axes, options) {
-            var opts = options || {};
-            var ax = axes || this.axes;
-            if (ax === true) {
-                ax = this.axes;
-            }
-            if ($.isArray(ax)) {
-                for (var i = 0; i < ax.length; i++) {
-                    this.axes[ax[i]].resetScale(opts[ax[i]]);
-                }
-            }
-            else if (typeof(ax) === 'object') {
-                for (var name in ax) {
-                    this.axes[name].resetScale(opts[name]);
-                }
-            }
-        };
-        // method: reInitialize
-        // reinitialize plot for replotting.
-        // not called directly.
-        this.reInitialize = function (data, opts) {
-            // Plot should be visible and have a height and width.
-            // If plot doesn't have height and width for some
-            // reason, set it by other means.  Plot must not have
-            // a display:none attribute, however.
-
-            var options = $.extend(true, {}, this.options, opts);
-
-            var target = this.targetId.substr(1);
-            var tdata = (data == null) ? this.data : data;
-
-            for (var i=0; i<$.jqplot.preInitHooks.length; i++) {
-                $.jqplot.preInitHooks[i].call(this, target, tdata, options);
-            }
-
-            for (var i=0; i<this.preInitHooks.hooks.length; i++) {
-                this.preInitHooks.hooks[i].call(this, target, tdata, options);
-            }
-            
-            this._height = this.target.height();
-            this._width = this.target.width();
-            
-            if (this._height <=0 || this._width <=0 || !this._height || !this._width) {
-                throw new Error("Target dimension not set");
-            }
-            
-            this._plotDimensions.height = this._height;
-            this._plotDimensions.width = this._width;
-            this.grid._plotDimensions = this._plotDimensions;
-            this.title._plotDimensions = this._plotDimensions;
-            this.baseCanvas._plotDimensions = this._plotDimensions;
-            this.eventCanvas._plotDimensions = this._plotDimensions;
-            this.legend._plotDimensions = this._plotDimensions;
-
-            var name,
-                t, 
-                j, 
-                axis;
-
-            for (var i=0, l=_axisNames.length; i<l; i++) {
-                name = _axisNames[i];
-                axis = this.axes[name];
-
-                // Memory Leaks patch : clear ticks elements
-                t = axis._ticks;
-                for (var j = 0, tlen = t.length; j < tlen; j++) {
-                  var el = t[j]._elem;
-                  if (el) {
-                    // if canvas renderer
-                    if ($.jqplot.use_excanvas && window.G_vmlCanvasManager.uninitElement !== undefined) {
-                      window.G_vmlCanvasManager.uninitElement(el.get(0));
-                    }
-                    el.emptyForce();
-                    el = null;
-                    t._elem = null;
-                  }
-                }
-                t = null;
-
-                delete axis.ticks;
-                delete axis._ticks;
-                this.axes[name] = new Axis(name);
-                this.axes[name]._plotWidth = this._width;
-                this.axes[name]._plotHeight = this._height;
-            }
-            
-            if (data) {
-                if (options.dataRenderer && $.isFunction(options.dataRenderer)) {
-                    if (options.dataRendererOptions) {
-                        this.dataRendererOptions = options.dataRendererOptions;
-                    }
-                    this.dataRenderer = options.dataRenderer;
-                    data = this.dataRenderer(data, this, this.dataRendererOptions);
-                }
-                
-                // make a copy of the data
-                this.data = $.extend(true, [], data);
-            }
-
-            if (opts) {
-                this.parseOptions(options);
-            }
-            
-            this.title._plotWidth = this._width;
-            
-            if (this.textColor) {
-                this.target.css('color', this.textColor);
-            }
-            if (this.fontFamily) {
-                this.target.css('font-family', this.fontFamily);
-            }
-            if (this.fontSize) {
-                this.target.css('font-size', this.fontSize);
-            }
-
-            this.title.init();
-            this.legend.init();
-            this._sumy = 0;
-            this._sumx = 0;
-
-            this.seriesStack = [];
-            this.previousSeriesStack = [];
-
-            this.computePlotData();
-            for (var i=0, l=this.series.length; i<l; i++) {
-                // set default stacking order for series canvases
-                this.seriesStack.push(i);
-                this.previousSeriesStack.push(i);
-                this.series[i].shadowCanvas._plotDimensions = this._plotDimensions;
-                this.series[i].canvas._plotDimensions = this._plotDimensions;
-                for (var j=0; j<$.jqplot.preSeriesInitHooks.length; j++) {
-                    $.jqplot.preSeriesInitHooks[j].call(this.series[i], target, this.data, this.options.seriesDefaults, this.options.series[i], this);
-                }
-                for (var j=0; j<this.preSeriesInitHooks.hooks.length; j++) {
-                    this.preSeriesInitHooks.hooks[j].call(this.series[i], target, this.data, this.options.seriesDefaults, this.options.series[i], this);
-                }
-                // this.populatePlotData(this.series[i], i);
-                this.series[i]._plotDimensions = this._plotDimensions;
-                this.series[i].init(i, this.grid.borderWidth, this);
-                for (var j=0; j<$.jqplot.postSeriesInitHooks.length; j++) {
-                    $.jqplot.postSeriesInitHooks[j].call(this.series[i], target, this.data, this.options.seriesDefaults, this.options.series[i], this);
-                }
-                for (var j=0; j<this.postSeriesInitHooks.hooks.length; j++) {
-                    this.postSeriesInitHooks.hooks[j].call(this.series[i], target, this.data, this.options.seriesDefaults, this.options.series[i], this);
-                }
-                this._sumy += this.series[i]._sumy;
-                this._sumx += this.series[i]._sumx;
-            }
-
-            for (var i=0, l=_axisNames.length; i<l; i++) {
-                name = _axisNames[i];
-                axis = this.axes[name];
-
-                axis._plotDimensions = this._plotDimensions;
-                axis.init();
-                if (axis.borderColor == null) {
-                    if (name.charAt(0) !== 'x' && axis.useSeriesColor === true && axis.show) {
-                        axis.borderColor = axis._series[0].color;
-                    }
-                    else {
-                        axis.borderColor = this.grid.borderColor;
-                    }
-                }
-            }
-            
-            if (this.sortData) {
-                sortData(this.series);
-            }
-            this.grid.init();
-            this.grid._axes = this.axes;
-            
-            this.legend._series = this.series;
-
-            for (var i=0, l=$.jqplot.postInitHooks.length; i<l; i++) {
-                $.jqplot.postInitHooks[i].call(this, target, this.data, options);
-            }
-
-            for (var i=0, l=this.postInitHooks.hooks.length; i<l; i++) {
-                this.postInitHooks.hooks[i].call(this, target, this.data, options);
-            }
-        };
-
-
-
-        // method: quickInit
-        // 
-        // Quick reinitialization plot for replotting.
-        // Does not parse options ore recreate axes and series.
-        // not called directly.
-        this.quickInit = function () {
-            // Plot should be visible and have a height and width.
-            // If plot doesn't have height and width for some
-            // reason, set it by other means.  Plot must not have
-            // a display:none attribute, however.
-            
-            this._height = this.target.height();
-            this._width = this.target.width();
-            
-            if (this._height <=0 || this._width <=0 || !this._height || !this._width) {
-                throw new Error("Target dimension not set");
-            }
-            
-            this._plotDimensions.height = this._height;
-            this._plotDimensions.width = this._width;
-            this.grid._plotDimensions = this._plotDimensions;
-            this.title._plotDimensions = this._plotDimensions;
-            this.baseCanvas._plotDimensions = this._plotDimensions;
-            this.eventCanvas._plotDimensions = this._plotDimensions;
-            this.legend._plotDimensions = this._plotDimensions;
-            
-            for (var n in this.axes) {
-                this.axes[n]._plotWidth = this._width;
-                this.axes[n]._plotHeight = this._height;
-            }
-            
-            this.title._plotWidth = this._width;
-            
-            if (this.textColor) {
-                this.target.css('color', this.textColor);
-            }
-            if (this.fontFamily) {
-                this.target.css('font-family', this.fontFamily);
-            }
-            if (this.fontSize) {
-                this.target.css('font-size', this.fontSize);
-            }
-            
-            this._sumy = 0;
-            this._sumx = 0;
-            this.computePlotData();
-            for (var i=0; i<this.series.length; i++) {
-                // this.populatePlotData(this.series[i], i);
-                if (this.series[i]._type === 'line' && this.series[i].renderer.bands.show) {
-                    this.series[i].renderer.initBands.call(this.series[i], this.series[i].renderer.options, this);
-                }
-                this.series[i]._plotDimensions = this._plotDimensions;
-                this.series[i].canvas._plotDimensions = this._plotDimensions;
-                //this.series[i].init(i, this.grid.borderWidth);
-                this._sumy += this.series[i]._sumy;
-                this._sumx += this.series[i]._sumx;
-            }
-
-            var name;
-            
-            for (var j=0; j<12; j++) {
-                name = _axisNames[j];
-                // Memory Leaks patch : clear ticks elements
-                var t = this.axes[name]._ticks;
-                for (var i = 0; i < t.length; i++) {
-                  var el = t[i]._elem;
-                  if (el) {
-                    // if canvas renderer
-                    if ($.jqplot.use_excanvas && window.G_vmlCanvasManager.uninitElement !== undefined) {
-                      window.G_vmlCanvasManager.uninitElement(el.get(0));
-                    }
-                    el.emptyForce();
-                    el = null;
-                    t._elem = null;
-                  }
-                }
-                t = null;
-                
-                this.axes[name]._plotDimensions = this._plotDimensions;
-                this.axes[name]._ticks = [];
-                // this.axes[name].renderer.init.call(this.axes[name], {});
-            }
-            
-            if (this.sortData) {
-                sortData(this.series);
-            }
-            
-            this.grid._axes = this.axes;
-            
-            this.legend._series = this.series;
-        };
-        
-        // sort the series data in increasing order.
-        function sortData(series) {
-            var d, sd, pd, ppd, ret;
-            for (var i=0; i<series.length; i++) {
-                var check;
-                var bat = [series[i].data, series[i]._stackData, series[i]._plotData, series[i]._prevPlotData];
-                for (var n=0; n<4; n++) {
-                    check = true;
-                    d = bat[n];
-                    if (series[i]._stackAxis == 'x') {
-                        for (var j = 0; j < d.length; j++) {
-                            if (typeof(d[j][1]) != "number") {
-                                check = false;
-                                break;
-                            }
-                        }
-                        if (check) {
-                            d.sort(function(a,b) { return a[1] - b[1]; });
-                        }
-                    }
-                    else {
-                        for (var j = 0; j < d.length; j++) {
-                            if (typeof(d[j][0]) != "number") {
-                                check = false;
-                                break;
-                            }
-                        }
-                        if (check) {
-                            d.sort(function(a,b) { return a[0] - b[0]; });
-                        }
-                    }
-                }
-               
-            }
-        }
-
-        this.computePlotData = function() {
-            this._plotData = [];
-            this._stackData = [];
-            var series,
-                index,
-                l;
-
-
-            for (index=0, l=this.series.length; index<l; index++) {
-                series = this.series[index];
-                this._plotData.push([]);
-                this._stackData.push([]);
-                var cd = series.data;
-                this._plotData[index] = $.extend(true, [], cd);
-                this._stackData[index] = $.extend(true, [], cd);
-                series._plotData = this._plotData[index];
-                series._stackData = this._stackData[index];
-                var plotValues = {x:[], y:[]};
-
-                if (this.stackSeries && !series.disableStack) {
-                    series._stack = true;
-                    ///////////////////////////
-                    // have to check for nulls
-                    ///////////////////////////
-                    var sidx = (series._stackAxis === 'x') ? 0 : 1;
-
-                    for (var k=0, cdl=cd.length; k<cdl; k++) {
-                        var temp = cd[k][sidx];
-                        if (temp == null) {
-                            temp = 0;
-                        }
-                        this._plotData[index][k][sidx] = temp;
-                        this._stackData[index][k][sidx] = temp;
-
-                        if (index > 0) {
-                            for (var j=index; j--;) {
-                                var prevval = this._plotData[j][k][sidx];
-                                // only need to sum up the stack axis column of data
-                                // and only sum if it is of same sign.
-                                // if previous series isn't same sign, keep looking
-                                // at earlier series untill we find one of same sign.
-                                if (temp * prevval >= 0) {
-                                    this._plotData[index][k][sidx] += prevval;
-                                    this._stackData[index][k][sidx] += prevval;
-                                    break;
-                                } 
-                            }
-                        }
-                    }
-
-                }
-                else {
-                    for (var i=0; i<series.data.length; i++) {
-                        plotValues.x.push(series.data[i][0]);
-                        plotValues.y.push(series.data[i][1]);
-                    }
-                    this._stackData.push(series.data);
-                    this.series[index]._stackData = series.data;
-                    this._plotData.push(series.data);
-                    series._plotData = series.data;
-                    series._plotValues = plotValues;
-                }
-                if (index>0) {
-                    series._prevPlotData = this.series[index-1]._plotData;
-                }
-                series._sumy = 0;
-                series._sumx = 0;
-                for (i=series.data.length-1; i>-1; i--) {
-                    series._sumy += series.data[i][1];
-                    series._sumx += series.data[i][0];
-                }
-            }
-
-        };
-        
-        // populate the _stackData and _plotData arrays for the plot and the series.
-        this.populatePlotData = function(series, index) {
-            // if a stacked chart, compute the stacked data
-            this._plotData = [];
-            this._stackData = [];
-            series._stackData = [];
-            series._plotData = [];
-            var plotValues = {x:[], y:[]};
-            if (this.stackSeries && !series.disableStack) {
-                series._stack = true;
-                var sidx = (series._stackAxis === 'x') ? 0 : 1;
-                // var idx = sidx ? 0 : 1;
-                // push the current data into stackData
-                //this._stackData.push(this.series[i].data);
-                var temp = $.extend(true, [], series.data);
-                // create the data that will be plotted for this series
-                var plotdata = $.extend(true, [], series.data);
-                var tempx, tempy, dval, stackval, comparator;
-                // for first series, nothing to add to stackData.
-                for (var j=0; j<index; j++) {
-                    var cd = this.series[j].data;
-                    for (var k=0; k<cd.length; k++) {
-                        dval = cd[k];
-                        tempx = (dval[0] != null) ? dval[0] : 0;
-                        tempy = (dval[1] != null) ? dval[1] : 0;
-                        temp[k][0] += tempx;
-                        temp[k][1] += tempy;
-                        stackval = (sidx) ? tempy : tempx;
-                        // only need to sum up the stack axis column of data
-                        // and only sum if it is of same sign.
-                        if (series.data[k][sidx] * stackval >= 0) {
-                            plotdata[k][sidx] += stackval;
-                        }
-                    }
-                }
-                for (var i=0; i<plotdata.length; i++) {
-                    plotValues.x.push(plotdata[i][0]);
-                    plotValues.y.push(plotdata[i][1]);
-                }
-                this._plotData.push(plotdata);
-                this._stackData.push(temp);
-                series._stackData = temp;
-                series._plotData = plotdata;
-                series._plotValues = plotValues;
-            }
-            else {
-                for (var i=0; i<series.data.length; i++) {
-                    plotValues.x.push(series.data[i][0]);
-                    plotValues.y.push(series.data[i][1]);
-                }
-                this._stackData.push(series.data);
-                this.series[index]._stackData = series.data;
-                this._plotData.push(series.data);
-                series._plotData = series.data;
-                series._plotValues = plotValues;
-            }
-            if (index>0) {
-                series._prevPlotData = this.series[index-1]._plotData;
-            }
-            series._sumy = 0;
-            series._sumx = 0;
-            for (i=series.data.length-1; i>-1; i--) {
-                series._sumy += series.data[i][1];
-                series._sumx += series.data[i][0];
-            }
-        };
-        
-        // function to safely return colors from the color array and wrap around at the end.
-        this.getNextSeriesColor = (function(t) {
-            var idx = 0;
-            var sc = t.seriesColors;
-            
-            return function () { 
-                if (idx < sc.length) {
-                    return sc[idx++];
-                }
-                else {
-                    idx = 0;
-                    return sc[idx++];
-                }
-            };
-        })(this);
-    
-        this.parseOptions = function(options){
-            for (var i=0; i<this.preParseOptionsHooks.hooks.length; i++) {
-                this.preParseOptionsHooks.hooks[i].call(this, options);
-            }
-            for (var i=0; i<$.jqplot.preParseOptionsHooks.length; i++) {
-                $.jqplot.preParseOptionsHooks[i].call(this, options);
-            }
-            this.options = $.extend(true, {}, this.defaults, options);
-            var opts = this.options;
-            this.animate = opts.animate;
-            this.animateReplot = opts.animateReplot;
-            this.stackSeries = opts.stackSeries;
-            if ($.isPlainObject(opts.fillBetween)) {
-
-                var temp = ['series1', 'series2', 'color', 'baseSeries', 'fill'], 
-                    tempi;
-
-                for (var i=0, l=temp.length; i<l; i++) {
-                    tempi = temp[i];
-                    if (opts.fillBetween[tempi] != null) {
-                        this.fillBetween[tempi] = opts.fillBetween[tempi];
-                    }
-                }
-            }
-
-            if (opts.seriesColors) {
-                this.seriesColors = opts.seriesColors;
-            }
-            if (opts.negativeSeriesColors) {
-                this.negativeSeriesColors = opts.negativeSeriesColors;
-            }
-            if (opts.captureRightClick) {
-                this.captureRightClick = opts.captureRightClick;
-            }
-            this.defaultAxisStart = (options && options.defaultAxisStart != null) ? options.defaultAxisStart : this.defaultAxisStart;
-            this.colorGenerator.setColors(this.seriesColors);
-            this.negativeColorGenerator.setColors(this.negativeSeriesColors);
-            // var cg = new this.colorGenerator(this.seriesColors);
-            // var ncg = new this.colorGenerator(this.negativeSeriesColors);
-            // this._gridPadding = this.options.gridPadding;
-            $.extend(true, this._gridPadding, opts.gridPadding);
-            this.sortData = (opts.sortData != null) ? opts.sortData : this.sortData;
-            for (var i=0; i<12; i++) {
-                var n = _axisNames[i];
-                var axis = this.axes[n];
-                axis._options = $.extend(true, {}, opts.axesDefaults, opts.axes[n]);
-                $.extend(true, axis, opts.axesDefaults, opts.axes[n]);
-                axis._plotWidth = this._width;
-                axis._plotHeight = this._height;
-            }
-            // if (this.data.length == 0) {
-            //     this.data = [];
-            //     for (var i=0; i<this.options.series.length; i++) {
-            //         this.data.push(this.options.series.data);
-            //     }    
-            // }
-                
-            var normalizeData = function(data, dir, start) {
-                // return data as an array of point arrays,
-                // in form [[x1,y1...], [x2,y2...], ...]
-                var temp = [];
-                var i, l;
-                dir = dir || 'vertical';
-                if (!$.isArray(data[0])) {
-                    // we have a series of scalars.  One line with just y values.
-                    // turn the scalar list of data into a data array of form:
-                    // [[1, data[0]], [2, data[1]], ...]
-                    for (i=0, l=data.length; i<l; i++) {
-                        if (dir == 'vertical') {
-                            temp.push([start + i, data[i]]);   
-                        }
-                        else {
-                            temp.push([data[i], start+i]);
-                        }
-                    }
-                }            
-                else {
-                    // we have a properly formatted data series, copy it.
-                    $.extend(true, temp, data);
-                }
-                return temp;
-            };
-
-            var colorIndex = 0;
-            this.series = [];
-            for (var i=0; i<this.data.length; i++) {
-                var sopts = $.extend(true, {index: i}, {seriesColors:this.seriesColors, negativeSeriesColors:this.negativeSeriesColors}, this.options.seriesDefaults, this.options.series[i], {rendererOptions:{animation:{show: this.animate}}});
-                // pass in options in case something needs set prior to initialization.
-                var temp = new Series(sopts);
-                for (var j=0; j<$.jqplot.preParseSeriesOptionsHooks.length; j++) {
-                    $.jqplot.preParseSeriesOptionsHooks[j].call(temp, this.options.seriesDefaults, this.options.series[i]);
-                }
-                for (var j=0; j<this.preParseSeriesOptionsHooks.hooks.length; j++) {
-                    this.preParseSeriesOptionsHooks.hooks[j].call(temp, this.options.seriesDefaults, this.options.series[i]);
-                }
-                // Now go back and apply the options to the series.  Really should just do this during initializaiton, but don't want to
-                // mess up preParseSeriesOptionsHooks at this point.
-                $.extend(true, temp, sopts);
-                var dir = 'vertical';
-                if (temp.renderer === $.jqplot.BarRenderer && temp.rendererOptions && temp.rendererOptions.barDirection == 'horizontal') {
-                    dir = 'horizontal';
-                    temp._stackAxis = 'x';
-                    temp._primaryAxis = '_yaxis';
-                }
-                temp.data = normalizeData(this.data[i], dir, this.defaultAxisStart);
-                switch (temp.xaxis) {
-                    case 'xaxis':
-                        temp._xaxis = this.axes.xaxis;
-                        break;
-                    case 'x2axis':
-                        temp._xaxis = this.axes.x2axis;
-                        break;
-                    default:
-                        break;
-                }
-                temp._yaxis = this.axes[temp.yaxis];
-                temp._xaxis._series.push(temp);
-                temp._yaxis._series.push(temp);
-                if (temp.show) {
-                    temp._xaxis.show = true;
-                    temp._yaxis.show = true;
-                }
-                else {
-                    if (temp._xaxis.scaleToHiddenSeries) {
-                        temp._xaxis.show = true;
-                    }
-                    if (temp._yaxis.scaleToHiddenSeries) {
-                        temp._yaxis.show = true;
-                    }
-                }
-
-                // // parse the renderer options and apply default colors if not provided
-                // if (!temp.color && temp.show != false) {
-                //     temp.color = cg.next();
-                //     colorIndex = cg.getIndex() - 1;;
-                // }
-                // if (!temp.negativeColor && temp.show != false) {
-                //     temp.negativeColor = ncg.get(colorIndex);
-                //     ncg.setIndex(colorIndex);
-                // }
-                if (!temp.label) {
-                    temp.label = 'Series '+ (i+1).toString();
-                }
-                // temp.rendererOptions.show = temp.show;
-                // $.extend(true, temp.renderer, {color:this.seriesColors[i]}, this.rendererOptions);
-                this.series.push(temp);  
-                for (var j=0; j<$.jqplot.postParseSeriesOptionsHooks.length; j++) {
-                    $.jqplot.postParseSeriesOptionsHooks[j].call(this.series[i], this.options.seriesDefaults, this.options.series[i]);
-                }
-                for (var j=0; j<this.postParseSeriesOptionsHooks.hooks.length; j++) {
-                    this.postParseSeriesOptionsHooks.hooks[j].call(this.series[i], this.options.seriesDefaults, this.options.series[i]);
-                }
-            }
-            
-            // copy the grid and title options into this object.
-            $.extend(true, this.grid, this.options.grid);
-            // if axis border properties aren't set, set default.
-            for (var i=0, l=_axisNames.length; i<l; i++) {
-                var n = _axisNames[i];
-                var axis = this.axes[n];
-                if (axis.borderWidth == null) {
-                    axis.borderWidth =this.grid.borderWidth;
-                }
-            }
-            
-            if (typeof this.options.title == 'string') {
-                this.title.text = this.options.title;
-            }
-            else if (typeof this.options.title == 'object') {
-                $.extend(true, this.title, this.options.title);
-            }
-            this.title._plotWidth = this._width;
-            this.legend.setOptions(this.options.legend);
-            
-            for (var i=0; i<$.jqplot.postParseOptionsHooks.length; i++) {
-                $.jqplot.postParseOptionsHooks[i].call(this, options);
-            }
-            for (var i=0; i<this.postParseOptionsHooks.hooks.length; i++) {
-                this.postParseOptionsHooks.hooks[i].call(this, options);
-            }
-        };
-        
-        // method: destroy
-        // Releases all resources occupied by the plot
-        this.destroy = function() {
-            this.canvasManager.freeAllCanvases();
-            if (this.eventCanvas && this.eventCanvas._elem) {
-                this.eventCanvas._elem.unbind();
-            }
-            // Couple of posts on Stack Overflow indicate that empty() doesn't
-            // always cear up the dom and release memory.  Sometimes setting
-            // innerHTML property to null is needed.  Particularly on IE, may 
-            // have to directly set it to null, bypassing $.
-            this.target.empty();
-
-            this.target[0].innerHTML = '';
-        };
-        
-        // method: replot
-        // Does a reinitialization of the plot followed by
-        // a redraw.  Method could be used to interactively
-        // change plot characteristics and then replot.
-        //
-        // Parameters:
-        // options - Options used for replotting.
-        //
-        // Properties:
-        // clear - false to not clear (empty) the plot container before replotting (default: true).
-        // resetAxes - true to reset all axes min, max, numberTicks and tickInterval setting so axes will rescale themselves.
-        //             optionally pass in list of axes to reset (e.g. ['xaxis', 'y2axis']) (default: false).
-        this.replot = function(options) {
-            var opts =  options || {};
-            var data = opts.data || null;
-            var clear = (opts.clear === false) ? false : true;
-            var resetAxes = opts.resetAxes || false;
-            delete opts.data;
-            delete opts.clear;
-            delete opts.resetAxes;
-
-            this.target.trigger('jqplotPreReplot');
-            
-            if (clear) {
-                this.destroy();
-            }
-            // if have data or other options, full reinit.
-            // otherwise, quickinit.
-            if (data || !$.isEmptyObject(opts)) {
-                this.reInitialize(data, opts);
-            }
-            else {
-                this.quickInit();
-            }
-
-            if (resetAxes) {
-                this.resetAxesScale(resetAxes, opts.axes);
-            }
-            this.draw();
-            this.target.trigger('jqplotPostReplot');
-        };
-        
-        // method: redraw
-        // Empties the plot target div and redraws the plot.
-        // This enables plot data and properties to be changed
-        // and then to comletely clear the plot and redraw.
-        // redraw *will not* reinitialize any plot elements.
-        // That is, axes will not be autoscaled and defaults
-        // will not be reapplied to any plot elements.  redraw
-        // is used primarily with zooming. 
-        //
-        // Parameters:
-        // clear - false to not clear (empty) the plot container before redrawing (default: true).
-        this.redraw = function(clear) {
-            clear = (clear != null) ? clear : true;
-            this.target.trigger('jqplotPreRedraw');
-            if (clear) {
-                this.canvasManager.freeAllCanvases();
-                this.eventCanvas._elem.unbind();
-                // Dont think I bind any events to the target, this shouldn't be necessary.
-                // It will remove user's events.
-                // this.target.unbind();
-                this.target.empty();
-            }
-             for (var ax in this.axes) {
-                this.axes[ax]._ticks = [];
-            }
-            this.computePlotData();
-            // for (var i=0; i<this.series.length; i++) {
-            //     this.populatePlotData(this.series[i], i);
-            // }
-            this._sumy = 0;
-            this._sumx = 0;
-            for (var i=0, tsl = this.series.length; i<tsl; i++) {
-                this._sumy += this.series[i]._sumy;
-                this._sumx += this.series[i]._sumx;
-            }
-            this.draw();
-            this.target.trigger('jqplotPostRedraw');
-        };
-        
-        // method: draw
-        // Draws all elements of the plot into the container.
-        // Does not clear the container before drawing.
-        this.draw = function(){
-            if (this.drawIfHidden || this.target.is(':visible')) {
-                this.target.trigger('jqplotPreDraw');
-                var i,
-                    j,
-                    l,
-                    tempseries;
-                for (i=0, l=$.jqplot.preDrawHooks.length; i<l; i++) {
-                    $.jqplot.preDrawHooks[i].call(this);
-                }
-                for (i=0, l=this.preDrawHooks.hooks.length; i<l; i++) {
-                    this.preDrawHooks.hooks[i].apply(this, this.preDrawSeriesHooks.args[i]);
-                }
-                // create an underlying canvas to be used for special features.
-                this.target.append(this.baseCanvas.createElement({left:0, right:0, top:0, bottom:0}, 'jqplot-base-canvas', null, this));
-                this.baseCanvas.setContext();
-                this.target.append(this.title.draw());
-                this.title.pack({top:0, left:0});
-                
-                // make room  for the legend between the grid and the edge.
-                // pass a dummy offsets object and a reference to the plot.
-                var legendElem = this.legend.draw({}, this);
-                
-                var gridPadding = {top:0, left:0, bottom:0, right:0};
-                
-                if (this.legend.placement == "outsideGrid") {
-                    // temporarily append the legend to get dimensions
-                    this.target.append(legendElem);
-                    switch (this.legend.location) {
-                        case 'n':
-                            gridPadding.top += this.legend.getHeight();
-                            break;
-                        case 's':
-                            gridPadding.bottom += this.legend.getHeight();
-                            break;
-                        case 'ne':
-                        case 'e':
-                        case 'se':
-                            gridPadding.right += this.legend.getWidth();
-                            break;
-                        case 'nw':
-                        case 'w':
-                        case 'sw':
-                            gridPadding.left += this.legend.getWidth();
-                            break;
-                        default:  // same as 'ne'
-                            gridPadding.right += this.legend.getWidth();
-                            break;
-                    }
-                    legendElem = legendElem.detach();
-                }
-                
-                var ax = this.axes;
-                var name;
-                // draw the yMidAxis first, so xaxis of pyramid chart can adjust itself if needed.
-                for (i=0; i<12; i++) {
-                    name = _axisNames[i];
-                    this.target.append(ax[name].draw(this.baseCanvas._ctx, this));
-                    ax[name].set();
-                }
-                if (ax.yaxis.show) {
-                    gridPadding.left += ax.yaxis.getWidth();
-                }
-                var ra = ['y2axis', 'y3axis', 'y4axis', 'y5axis', 'y6axis', 'y7axis', 'y8axis', 'y9axis'];
-                var rapad = [0, 0, 0, 0, 0, 0, 0, 0];
-                var gpr = 0;
-                var n;
-                for (n=0; n<8; n++) {
-                    if (ax[ra[n]].show) {
-                        gpr += ax[ra[n]].getWidth();
-                        rapad[n] = gpr;
-                    }
-                }
-                gridPadding.right += gpr;
-                if (ax.x2axis.show) {
-                    gridPadding.top += ax.x2axis.getHeight();
-                }
-                if (this.title.show) {
-                    gridPadding.top += this.title.getHeight();
-                }
-                if (ax.xaxis.show) {
-                    gridPadding.bottom += ax.xaxis.getHeight();
-                }
-                
-                // end of gridPadding adjustments.
-
-                // if user passed in gridDimensions option, check against calculated gridPadding
-                if (this.options.gridDimensions && $.isPlainObject(this.options.gridDimensions)) {
-                    var gdw = parseInt(this.options.gridDimensions.width, 10) || 0;
-                    var gdh = parseInt(this.options.gridDimensions.height, 10) || 0;
-                    var widthAdj = (this._width - gridPadding.left - gridPadding.right - gdw)/2;
-                    var heightAdj = (this._height - gridPadding.top - gridPadding.bottom - gdh)/2;
-
-                    if (heightAdj >= 0 && widthAdj >= 0) {
-                        gridPadding.top += heightAdj;
-                        gridPadding.bottom += heightAdj;
-                        gridPadding.left += widthAdj;
-                        gridPadding.right += widthAdj;
-                    }
-                }
-                var arr = ['top', 'bottom', 'left', 'right'];
-                for (var n in arr) {
-                    if (this._gridPadding[arr[n]] == null && gridPadding[arr[n]] > 0) {
-                        this._gridPadding[arr[n]] = gridPadding[arr[n]];
-                    }
-                    else if (this._gridPadding[arr[n]] == null) {
-                        this._gridPadding[arr[n]] = this._defaultGridPadding[arr[n]];
-                    }
-                }
-                
-                var legendPadding = this._gridPadding;
-                
-                if (this.legend.placement === 'outsideGrid') {
-                    legendPadding = {top:this.title.getHeight(), left: 0, right: 0, bottom: 0};
-                    if (this.legend.location === 's') {
-                        legendPadding.left = this._gridPadding.left;
-                        legendPadding.right = this._gridPadding.right;
-                    }
-                }
-                
-                ax.xaxis.pack({position:'absolute', bottom:this._gridPadding.bottom - ax.xaxis.getHeight(), left:0, width:this._width}, {min:this._gridPadding.left, max:this._width - this._gridPadding.right});
-                ax.yaxis.pack({position:'absolute', top:0, left:this._gridPadding.left - ax.yaxis.getWidth(), height:this._height}, {min:this._height - this._gridPadding.bottom, max: this._gridPadding.top});
-                ax.x2axis.pack({position:'absolute', top:this._gridPadding.top - ax.x2axis.getHeight(), left:0, width:this._width}, {min:this._gridPadding.left, max:this._width - this._gridPadding.right});
-                for (i=8; i>0; i--) {
-                    ax[ra[i-1]].pack({position:'absolute', top:0, right:this._gridPadding.right - rapad[i-1]}, {min:this._height - this._gridPadding.bottom, max: this._gridPadding.top});
-                }
-                var ltemp = (this._width - this._gridPadding.left - this._gridPadding.right)/2.0 + this._gridPadding.left - ax.yMidAxis.getWidth()/2.0;
-                ax.yMidAxis.pack({position:'absolute', top:0, left:ltemp, zIndex:9, textAlign: 'center'}, {min:this._height - this._gridPadding.bottom, max: this._gridPadding.top});
-            
-                this.target.append(this.grid.createElement(this._gridPadding, this));
-                this.grid.draw();
-                
-                var series = this.series;
-                var seriesLength = series.length;
-                // put the shadow canvases behind the series canvases so shadows don't overlap on stacked bars.
-                for (i=0, l=seriesLength; i<l; i++) {
-                    // draw series in order of stacking.  This affects only
-                    // order in which canvases are added to dom.
-                    j = this.seriesStack[i];
-                    this.target.append(series[j].shadowCanvas.createElement(this._gridPadding, 'jqplot-series-shadowCanvas', null, this));
-                    series[j].shadowCanvas.setContext();
-                    series[j].shadowCanvas._elem.data('seriesIndex', j);
-                }
-                
-                for (i=0, l=seriesLength; i<l; i++) {
-                    // draw series in order of stacking.  This affects only
-                    // order in which canvases are added to dom.
-                    j = this.seriesStack[i];
-                    this.target.append(series[j].canvas.createElement(this._gridPadding, 'jqplot-series-canvas', null, this));
-                    series[j].canvas.setContext();
-                    series[j].canvas._elem.data('seriesIndex', j);
-                }
-                // Need to use filled canvas to capture events in IE.
-                // Also, canvas seems to block selection of other elements in document on FF.
-                this.target.append(this.eventCanvas.createElement(this._gridPadding, 'jqplot-event-canvas', null, this));
-                this.eventCanvas.setContext();
-                this.eventCanvas._ctx.fillStyle = 'rgba(0,0,0,0)';
-                this.eventCanvas._ctx.fillRect(0,0,this.eventCanvas._ctx.canvas.width, this.eventCanvas._ctx.canvas.height);
-            
-                // bind custom event handlers to regular events.
-                this.bindCustomEvents();
-            
-                // draw legend before series if the series needs to know the legend dimensions.
-                if (this.legend.preDraw) {  
-                    this.eventCanvas._elem.before(legendElem);
-                    this.legend.pack(legendPadding);
-                    if (this.legend._elem) {
-                        this.drawSeries({legendInfo:{location:this.legend.location, placement:this.legend.placement, width:this.legend.getWidth(), height:this.legend.getHeight(), xoffset:this.legend.xoffset, yoffset:this.legend.yoffset}});
-                    }
-                    else {
-                        this.drawSeries();
-                    }
-                }
-                else {  // draw series before legend
-                    this.drawSeries();
-                    if (seriesLength) {
-                        $(series[seriesLength-1].canvas._elem).after(legendElem);
-                    }
-                    this.legend.pack(legendPadding);                
-                }
-            
-                // register event listeners on the overlay canvas
-                for (var i=0, l=$.jqplot.eventListenerHooks.length; i<l; i++) {
-                    // in the handler, this will refer to the eventCanvas dom element.
-                    // make sure there are references back into plot objects.
-                    this.eventCanvas._elem.bind($.jqplot.eventListenerHooks[i][0], {plot:this}, $.jqplot.eventListenerHooks[i][1]);
-                }
-            
-                // register event listeners on the overlay canvas
-                for (var i=0, l=this.eventListenerHooks.hooks.length; i<l; i++) {
-                    // in the handler, this will refer to the eventCanvas dom element.
-                    // make sure there are references back into plot objects.
-                    this.eventCanvas._elem.bind(this.eventListenerHooks.hooks[i][0], {plot:this}, this.eventListenerHooks.hooks[i][1]);
-                }
-
-                var fb = this.fillBetween;
-                if (fb.fill && fb.series1 !== fb.series2 && fb.series1 < seriesLength && fb.series2 < seriesLength && series[fb.series1]._type === 'line' && series[fb.series2]._type === 'line') {
-                    this.doFillBetweenLines();
-                }
-
-                for (var i=0, l=$.jqplot.postDrawHooks.length; i<l; i++) {
-                    $.jqplot.postDrawHooks[i].call(this);
-                }
-
-                for (var i=0, l=this.postDrawHooks.hooks.length; i<l; i++) {
-                    this.postDrawHooks.hooks[i].apply(this, this.postDrawHooks.args[i]);
-                }
-            
-                if (this.target.is(':visible')) {
-                    this._drawCount += 1;
-                }
-
-                var temps, 
-                    tempr,
-                    sel,
-                    _els;
-                // ughh.  ideally would hide all series then show them.
-                for (i=0, l=seriesLength; i<l; i++) {
-                    temps = series[i];
-                    tempr = temps.renderer;
-                    sel = '.jqplot-point-label.jqplot-series-'+i;
-                    if (tempr.animation && tempr.animation._supported && tempr.animation.show && (this._drawCount < 2 || this.animateReplot)) {
-                        _els = this.target.find(sel);
-                        _els.stop(true, true).hide();
-                        temps.canvas._elem.stop(true, true).hide();
-                        temps.shadowCanvas._elem.stop(true, true).hide();
-                        temps.canvas._elem.jqplotEffect('blind', {mode: 'show', direction: tempr.animation.direction}, tempr.animation.speed);
-                        temps.shadowCanvas._elem.jqplotEffect('blind', {mode: 'show', direction: tempr.animation.direction}, tempr.animation.speed);
-                        _els.fadeIn(tempr.animation.speed*0.8);
-                    }
-                }
-                _els = null;
-            
-                this.target.trigger('jqplotPostDraw', [this]);
-            }
-        };
-
-        jqPlot.prototype.doFillBetweenLines = function () {
-            var fb = this.fillBetween;
-            var sid1 = fb.series1;
-            var sid2 = fb.series2;
-            // first series should always be lowest index
-            var id1 = (sid1 < sid2) ? sid1 : sid2;
-            var id2 = (sid2 >  sid1) ? sid2 : sid1;
-
-            var series1 = this.series[id1];
-            var series2 = this.series[id2];
-
-            if (series2.renderer.smooth) {
-                var tempgd = series2.renderer._smoothedData.slice(0).reverse();
-            }
-            else {
-                var tempgd = series2.gridData.slice(0).reverse();
-            }
-
-            if (series1.renderer.smooth) {
-                var gd = series1.renderer._smoothedData.concat(tempgd);
-            }
-            else {
-                var gd = series1.gridData.concat(tempgd);
-            }
-
-            var color = (fb.color !== null) ? fb.color : this.series[sid1].fillColor;
-            var baseSeries = (fb.baseSeries !== null) ? fb.baseSeries : id1;
-
-            // now apply a fill to the shape on the lower series shadow canvas,
-            // so it is behind both series.
-            var sr = this.series[baseSeries].renderer.shapeRenderer;
-            var opts = {fillStyle: color, fill: true, closePath: true};
-            sr.draw(series1.shadowCanvas._ctx, gd, opts);
-        };
-        
-        this.bindCustomEvents = function() {
-            this.eventCanvas._elem.bind('click', {plot:this}, this.onClick);
-            this.eventCanvas._elem.bind('dblclick', {plot:this}, this.onDblClick);
-            this.eventCanvas._elem.bind('mousedown', {plot:this}, this.onMouseDown);
-            this.eventCanvas._elem.bind('mousemove', {plot:this}, this.onMouseMove);
-            this.eventCanvas._elem.bind('mouseenter', {plot:this}, this.onMouseEnter);
-            this.eventCanvas._elem.bind('mouseleave', {plot:this}, this.onMouseLeave);
-            if (this.captureRightClick) {
-                this.eventCanvas._elem.bind('mouseup', {plot:this}, this.onRightClick);
-                this.eventCanvas._elem.get(0).oncontextmenu = function() {
-                    return false;
-                };
-            }
-            else {
-                this.eventCanvas._elem.bind('mouseup', {plot:this}, this.onMouseUp);
-            }
-        };
-        
-        function getEventPosition(ev) {
-            var plot = ev.data.plot;
-            var go = plot.eventCanvas._elem.offset();
-            var gridPos = {x:ev.pageX - go.left, y:ev.pageY - go.top};
-            var dataPos = {xaxis:null, yaxis:null, x2axis:null, y2axis:null, y3axis:null, y4axis:null, y5axis:null, y6axis:null, y7axis:null, y8axis:null, y9axis:null, yMidAxis:null};
-            var an = ['xaxis', 'yaxis', 'x2axis', 'y2axis', 'y3axis', 'y4axis', 'y5axis', 'y6axis', 'y7axis', 'y8axis', 'y9axis', 'yMidAxis'];
-            var ax = plot.axes;
-            var n, axis;
-            for (n=11; n>0; n--) {
-                axis = an[n-1];
-                if (ax[axis].show) {
-                    dataPos[axis] = ax[axis].series_p2u(gridPos[axis.charAt(0)]);
-                }
-            }
-
-            return {offsets:go, gridPos:gridPos, dataPos:dataPos};
-        }
-        
-        
-        // function to check if event location is over a area area
-        function checkIntersection(gridpos, plot) {
-            var series = plot.series;
-            var i, j, k, s, r, x, y, theta, sm, sa, minang, maxang;
-            var d0, d, p, pp, points, bw, hp;
-            var threshold, t;
-            for (k=plot.seriesStack.length-1; k>=0; k--) {
-                i = plot.seriesStack[k];
-                s = series[i];
-                hp = s._highlightThreshold;
-                switch (s.renderer.constructor) {
-                    case $.jqplot.BarRenderer:
-                        x = gridpos.x;
-                        y = gridpos.y;
-                        for (j=0; j<s._barPoints.length; j++) {
-                            points = s._barPoints[j];
-                            p = s.gridData[j];
-                            if (x>points[0][0] && x<points[2][0] && y>points[2][1] && y<points[0][1]) {
-                                return {seriesIndex:s.index, pointIndex:j, gridData:p, data:s.data[j], points:s._barPoints[j]};
-                            }
-                        }
-                        break;
-                    case $.jqplot.PyramidRenderer:
-                        x = gridpos.x;
-                        y = gridpos.y;
-                        for (j=0; j<s._barPoints.length; j++) {
-                            points = s._barPoints[j];
-                            p = s.gridData[j];
-                            if (x > points[0][0] + hp[0][0] && x < points[2][0] + hp[2][0] && y > points[2][1] && y < points[0][1]) {
-                                return {seriesIndex:s.index, pointIndex:j, gridData:p, data:s.data[j], points:s._barPoints[j]};
-                            }
-                        }
-                        break;
-                    
-                    case $.jqplot.DonutRenderer:
-                        sa = s.startAngle/180*Math.PI;
-                        x = gridpos.x - s._center[0];
-                        y = gridpos.y - s._center[1];
-                        r = Math.sqrt(Math.pow(x, 2) + Math.pow(y, 2));
-                        if (x > 0 && -y >= 0) {
-                            theta = 2*Math.PI - Math.atan(-y/x);
-                        }
-                        else if (x > 0 && -y < 0) {
-                            theta = -Math.atan(-y/x);
-                        }
-                        else if (x < 0) {
-                            theta = Math.PI - Math.atan(-y/x);
-                        }
-                        else if (x == 0 && -y > 0) {
-                            theta = 3*Math.PI/2;
-                        }
-                        else if (x == 0 && -y < 0) {
-                            theta = Math.PI/2;
-                        }
-                        else if (x == 0 && y == 0) {
-                            theta = 0;
-                        }
-                        if (sa) {
-                            theta -= sa;
-                            if (theta < 0) {
-                                theta += 2*Math.PI;
-                            }
-                            else if (theta > 2*Math.PI) {
-                                theta -= 2*Math.PI;
-                            }
-                        }
-            
-                        sm = s.sliceMargin/180*Math.PI;
-                        if (r < s._radius && r > s._innerRadius) {
-                            for (j=0; j<s.gridData.length; j++) {
-                                minang = (j>0) ? s.gridData[j-1][1]+sm : sm;
-                                maxang = s.gridData[j][1];
-                                if (theta > minang && theta < maxang) {
-                                    return {seriesIndex:s.index, pointIndex:j, gridData:[gridpos.x,gridpos.y], data:s.data[j]};
-                                }
-                            }
-                        }
-                        break;
-                        
-                    case $.jqplot.PieRenderer:
-                        sa = s.startAngle/180*Math.PI;
-                        x = gridpos.x - s._center[0];
-                        y = gridpos.y - s._center[1];
-                        r = Math.sqrt(Math.pow(x, 2) + Math.pow(y, 2));
-                        if (x > 0 && -y >= 0) {
-                            theta = 2*Math.PI - Math.atan(-y/x);
-                        }
-                        else if (x > 0 && -y < 0) {
-                            theta = -Math.atan(-y/x);
-                        }
-                        else if (x < 0) {
-                            theta = Math.PI - Math.atan(-y/x);
-                        }
-                        else if (x == 0 && -y > 0) {
-                            theta = 3*Math.PI/2;
-                        }
-                        else if (x == 0 && -y < 0) {
-                            theta = Math.PI/2;
-                        }
-                        else if (x == 0 && y == 0) {
-                            theta = 0;
-                        }
-                        if (sa) {
-                            theta -= sa;
-                            if (theta < 0) {
-                                theta += 2*Math.PI;
-                            }
-                            else if (theta > 2*Math.PI) {
-                                theta -= 2*Math.PI;
-                            }
-                        }
-            
-                        sm = s.sliceMargin/180*Math.PI;
-                        if (r < s._radius) {
-                            for (j=0; j<s.gridData.length; j++) {
-                                minang = (j>0) ? s.gridData[j-1][1]+sm : sm;
-                                maxang = s.gridData[j][1];
-                                if (theta > minang && theta < maxang) {
-                                    return {seriesIndex:s.index, pointIndex:j, gridData:[gridpos.x,gridpos.y], data:s.data[j]};
-                                }
-                            }
-                        }
-                        break;
-                        
-                    case $.jqplot.BubbleRenderer:
-                        x = gridpos.x;
-                        y = gridpos.y;
-                        var ret = null;
-                        
-                        if (s.show) {
-                            for (var j=0; j<s.gridData.length; j++) {
-                                p = s.gridData[j];
-                                d = Math.sqrt( (x-p[0]) * (x-p[0]) + (y-p[1]) * (y-p[1]) );
-                                if (d <= p[2] && (d <= d0 || d0 == null)) {
-                                   d0 = d;
-                                   ret = {seriesIndex: i, pointIndex:j, gridData:p, data:s.data[j]};
-                                }
-                            }
-                            if (ret != null) {
-                                return ret;
-                            }
-                        }
-                        break;
-                        
-                    case $.jqplot.FunnelRenderer:
-                        x = gridpos.x;
-                        y = gridpos.y;
-                        var v = s._vertices,
-                            vfirst = v[0],
-                            vlast = v[v.length-1],
-                            lex,
-                            rex,
-                            cv;
-    
-                        // equations of right and left sides, returns x, y values given height of section (y value and 2 points)
-    
-                        function findedge (l, p1 , p2) {
-                            var m = (p1[1] - p2[1])/(p1[0] - p2[0]);
-                            var b = p1[1] - m*p1[0];
-                            var y = l + p1[1];
-        
-                            return [(y - b)/m, y];
-                        }
-    
-                        // check each section
-                        lex = findedge(y, vfirst[0], vlast[3]);
-                        rex = findedge(y, vfirst[1], vlast[2]);
-                        for (j=0; j<v.length; j++) {
-                            cv = v[j];
-                            if (y >= cv[0][1] && y <= cv[3][1] && x >= lex[0] && x <= rex[0]) {
-                                return {seriesIndex:s.index, pointIndex:j, gridData:null, data:s.data[j]};
-                            }
-                        }         
-                        break;           
-                    
-                    case $.jqplot.LineRenderer:
-                        x = gridpos.x;
-                        y = gridpos.y;
-                        r = s.renderer;
-                        if (s.show) {
-                            if ((s.fill || (s.renderer.bands.show && s.renderer.bands.fill)) && (!plot.plugins.highlighter || !plot.plugins.highlighter.show)) {
-                                // first check if it is in bounding box
-                                var inside = false;
-                                if (x>s._boundingBox[0][0] && x<s._boundingBox[1][0] && y>s._boundingBox[1][1] && y<s._boundingBox[0][1]) { 
-                                    // now check the crossing number   
-                                    
-                                    var numPoints = s._areaPoints.length;
-                                    var ii;
-                                    var j = numPoints-1;
-
-                                    for(var ii=0; ii < numPoints; ii++) { 
-                                        var vertex1 = [s._areaPoints[ii][0], s._areaPoints[ii][1]];
-                                        var vertex2 = [s._areaPoints[j][0], s._areaPoints[j][1]];
-
-                                        if (vertex1[1] < y && vertex2[1] >= y || vertex2[1] < y && vertex1[1] >= y)     {
-                                            if (vertex1[0] + (y - vertex1[1]) / (vertex2[1] - vertex1[1]) * (vertex2[0] - vertex1[0]) < x) {
-                                                inside = !inside;
-                                            }
-                                        }
-
-                                        j = ii;
-                                    }        
-                                }
-                                if (inside) {
-                                    return {seriesIndex:i, pointIndex:null, gridData:s.gridData, data:s.data, points:s._areaPoints};
-                                }
-                                break;
-                                
-                            }
-
-                            else {
-                                t = s.markerRenderer.size/2+s.neighborThreshold;
-                                threshold = (t > 0) ? t : 0;
-                                for (var j=0; j<s.gridData.length; j++) {
-                                    p = s.gridData[j];
-                                    // neighbor looks different to OHLC chart.
-                                    if (r.constructor == $.jqplot.OHLCRenderer) {
-                                        if (r.candleStick) {
-                                            var yp = s._yaxis.series_u2p;
-                                            if (x >= p[0]-r._bodyWidth/2 && x <= p[0]+r._bodyWidth/2 && y >= yp(s.data[j][2]) && y <= yp(s.data[j][3])) {
-                                                return {seriesIndex: i, pointIndex:j, gridData:p, data:s.data[j]};
-                                            }
-                                        }
-                                        // if an open hi low close chart
-                                        else if (!r.hlc){
-                                            var yp = s._yaxis.series_u2p;
-                                            if (x >= p[0]-r._tickLength && x <= p[0]+r._tickLength && y >= yp(s.data[j][2]) && y <= yp(s.data[j][3])) {
-                                                return {seriesIndex: i, pointIndex:j, gridData:p, data:s.data[j]};
-                                            }
-                                        }
-                                        // a hi low close chart
-                                        else {
-                                            var yp = s._yaxis.series_u2p;
-                                            if (x >= p[0]-r._tickLength && x <= p[0]+r._tickLength && y >= yp(s.data[j][1]) && y <= yp(s.data[j][2])) {
-                                                return {seriesIndex: i, pointIndex:j, gridData:p, data:s.data[j]};
-                                            }
-                                        }
-                            
-                                    }
-                                    else if (p[0] != null && p[1] != null){
-                                        d = Math.sqrt( (x-p[0]) * (x-p[0]) + (y-p[1]) * (y-p[1]) );
-                                        if (d <= threshold && (d <= d0 || d0 == null)) {
-                                           d0 = d;
-                                           return {seriesIndex: i, pointIndex:j, gridData:p, data:s.data[j]};
-                                        }
-                                    }
-                                } 
-                            }
-                        }
-                        break;
-                        
-                    default:
-                        x = gridpos.x;
-                        y = gridpos.y;
-                        r = s.renderer;
-                        if (s.show) {
-                            t = s.markerRenderer.size/2+s.neighborThreshold;
-                            threshold = (t > 0) ? t : 0;
-                            for (var j=0; j<s.gridData.length; j++) {
-                                p = s.gridData[j];
-                                // neighbor looks different to OHLC chart.
-                                if (r.constructor == $.jqplot.OHLCRenderer) {
-                                    if (r.candleStick) {
-                                        var yp = s._yaxis.series_u2p;
-                                        if (x >= p[0]-r._bodyWidth/2 && x <= p[0]+r._bodyWidth/2 && y >= yp(s.data[j][2]) && y <= yp(s.data[j][3])) {
-                                            return {seriesIndex: i, pointIndex:j, gridData:p, data:s.data[j]};
-                                        }
-                                    }
-                                    // if an open hi low close chart
-                                    else if (!r.hlc){
-                                        var yp = s._yaxis.series_u2p;
-                                        if (x >= p[0]-r._tickLength && x <= p[0]+r._tickLength && y >= yp(s.data[j][2]) && y <= yp(s.data[j][3])) {
-                                            return {seriesIndex: i, pointIndex:j, gridData:p, data:s.data[j]};
-                                        }
-                                    }
-                                    // a hi low close chart
-                                    else {
-                                        var yp = s._yaxis.series_u2p;
-                                        if (x >= p[0]-r._tickLength && x <= p[0]+r._tickLength && y >= yp(s.data[j][1]) && y <= yp(s.data[j][2])) {
-                                            return {seriesIndex: i, pointIndex:j, gridData:p, data:s.data[j]};
-                                        }
-                                    }
-                            
-                                }
-                                else {
-                                    d = Math.sqrt( (x-p[0]) * (x-p[0]) + (y-p[1]) * (y-p[1]) );
-                                    if (d <= threshold && (d <= d0 || d0 == null)) {
-                                       d0 = d;
-                                       return {seriesIndex: i, pointIndex:j, gridData:p, data:s.data[j]};
-                                    }
-                                }
-                            } 
-                        }
-                        break;
-                }
-            }
-            
-            return null;
-        }
-        
-        
-        
-        this.onClick = function(ev) {
-            // Event passed in is normalized and will have data attribute.
-            // Event passed out is unnormalized.
-            var positions = getEventPosition(ev);
-            var p = ev.data.plot;
-            var neighbor = checkIntersection(positions.gridPos, p);
-            var evt = $.Event('jqplotClick');
-            evt.pageX = ev.pageX;
-            evt.pageY = ev.pageY;
-            $(this).trigger(evt, [positions.gridPos, positions.dataPos, neighbor, p]);
-        };
-        
-        this.onDblClick = function(ev) {
-            // Event passed in is normalized and will have data attribute.
-            // Event passed out is unnormalized.
-            var positions = getEventPosition(ev);
-            var p = ev.data.plot;
-            var neighbor = checkIntersection(positions.gridPos, p);
-            var evt = $.Event('jqplotDblClick');
-            evt.pageX = ev.pageX;
-            evt.pageY = ev.pageY;
-            $(this).trigger(evt, [positions.gridPos, positions.dataPos, neighbor, p]);
-        };
-        
-        this.onMouseDown = function(ev) {
-            var positions = getEventPosition(ev);
-            var p = ev.data.plot;
-            var neighbor = checkIntersection(positions.gridPos, p);
-            var evt = $.Event('jqplotMouseDown');
-            evt.pageX = ev.pageX;
-            evt.pageY = ev.pageY;
-            $(this).trigger(evt, [positions.gridPos, positions.dataPos, neighbor, p]);
-        };
-        
-        this.onMouseUp = function(ev) {
-            var positions = getEventPosition(ev);
-            var evt = $.Event('jqplotMouseUp');
-            evt.pageX = ev.pageX;
-            evt.pageY = ev.pageY;
-            $(this).trigger(evt, [positions.gridPos, positions.dataPos, null, ev.data.plot]);
-        };
-        
-        this.onRightClick = function(ev) {
-            var positions = getEventPosition(ev);
-            var p = ev.data.plot;
-            var neighbor = checkIntersection(positions.gridPos, p);
-            if (p.captureRightClick) {
-                if (ev.which == 3) {
-                var evt = $.Event('jqplotRightClick');
-                evt.pageX = ev.pageX;
-                evt.pageY = ev.pageY;
-                    $(this).trigger(evt, [positions.gridPos, positions.dataPos, neighbor, p]);
-                }
-                else {
-                var evt = $.Event('jqplotMouseUp');
-                evt.pageX = ev.pageX;
-                evt.pageY = ev.pageY;
-                    $(this).trigger(evt, [positions.gridPos, positions.dataPos, neighbor, p]);
-                }
-            }
-        };
-        
-        this.onMouseMove = function(ev) {
-            var positions = getEventPosition(ev);
-            var p = ev.data.plot;
-            var neighbor = checkIntersection(positions.gridPos, p);
-            var evt = $.Event('jqplotMouseMove');
-            evt.pageX = ev.pageX;
-            evt.pageY = ev.pageY;
-            $(this).trigger(evt, [positions.gridPos, positions.dataPos, neighbor, p]);
-        };
-        
-        this.onMouseEnter = function(ev) {
-            var positions = getEventPosition(ev);
-            var p = ev.data.plot;
-            var evt = $.Event('jqplotMouseEnter');
-            evt.pageX = ev.pageX;
-            evt.pageY = ev.pageY;
-            evt.relatedTarget = ev.relatedTarget;
-            $(this).trigger(evt, [positions.gridPos, positions.dataPos, null, p]);
-        };
-        
-        this.onMouseLeave = function(ev) {
-            var positions = getEventPosition(ev);
-            var p = ev.data.plot;
-            var evt = $.Event('jqplotMouseLeave');
-            evt.pageX = ev.pageX;
-            evt.pageY = ev.pageY;
-            evt.relatedTarget = ev.relatedTarget;
-            $(this).trigger(evt, [positions.gridPos, positions.dataPos, null, p]);
-        };
-        
-        // method: drawSeries
-        // Redraws all or just one series on the plot.  No axis scaling
-        // is performed and no other elements on the plot are redrawn.
-        // options is an options object to pass on to the series renderers.
-        // It can be an empty object {}.  idx is the series index
-        // to redraw if only one series is to be redrawn.
-        this.drawSeries = function(options, idx){
-            var i, series, ctx;
-            // if only one argument passed in and it is a number, use it ad idx.
-            idx = (typeof(options) === "number" && idx == null) ? options : idx;
-            options = (typeof(options) === "object") ? options : {};
-            // draw specified series
-            if (idx != undefined) {
-                series = this.series[idx];
-                ctx = series.shadowCanvas._ctx;
-                ctx.clearRect(0, 0, ctx.canvas.width, ctx.canvas.height);
-                series.drawShadow(ctx, options, this);
-                ctx = series.canvas._ctx;
-                ctx.clearRect(0, 0, ctx.canvas.width, ctx.canvas.height);
-                series.draw(ctx, options, this);
-                if (series.renderer.constructor == $.jqplot.BezierCurveRenderer) {
-                    if (idx < this.series.length - 1) {
-                        this.drawSeries(idx+1); 
-                    }
-                }
-            }
-            
-            else {
-                // if call series drawShadow method first, in case all series shadows
-                // should be drawn before any series.  This will ensure, like for 
-                // stacked bar plots, that shadows don't overlap series.
-                for (i=0; i<this.series.length; i++) {
-                    // first clear the canvas
-                    series = this.series[i];
-                    ctx = series.shadowCanvas._ctx;
-                    ctx.clearRect(0, 0, ctx.canvas.width, ctx.canvas.height);
-                    series.drawShadow(ctx, options, this);
-                    ctx = series.canvas._ctx;
-                    ctx.clearRect(0, 0, ctx.canvas.width, ctx.canvas.height);
-                    series.draw(ctx, options, this);
-                }
-            }
-            options = idx = i = series = ctx = null;
-        };
-        
-        // method: moveSeriesToFront
-        // This method requires jQuery 1.4+
-        // Moves the specified series canvas in front of all other series canvases.
-        // This effectively "draws" the specified series on top of all other series,
-        // although it is performed through DOM manipulation, no redrawing is performed.
-        //
-        // Parameters:
-        // idx - 0 based index of the series to move.  This will be the index of the series
-        // as it was first passed into the jqplot function.
-        this.moveSeriesToFront = function (idx) { 
-            idx = parseInt(idx, 10);
-            var stackIndex = $.inArray(idx, this.seriesStack);
-            // if already in front, return
-            if (stackIndex == -1) {
-                return;
-            }
-            if (stackIndex == this.seriesStack.length -1) {
-                this.previousSeriesStack = this.seriesStack.slice(0);
-                return;
-            }
-            var opidx = this.seriesStack[this.seriesStack.length -1];
-            var serelem = this.series[idx].canvas._elem.detach();
-            var shadelem = this.series[idx].shadowCanvas._elem.detach();
-            this.series[opidx].shadowCanvas._elem.after(shadelem);
-            this.series[opidx].canvas._elem.after(serelem);
-            this.previousSeriesStack = this.seriesStack.slice(0);
-            this.seriesStack.splice(stackIndex, 1);
-            this.seriesStack.push(idx);
-        };
-        
-        // method: moveSeriesToBack
-        // This method requires jQuery 1.4+
-        // Moves the specified series canvas behind all other series canvases.
-        //
-        // Parameters:
-        // idx - 0 based index of the series to move.  This will be the index of the series
-        // as it was first passed into the jqplot function.
-        this.moveSeriesToBack = function (idx) {
-            idx = parseInt(idx, 10);
-            var stackIndex = $.inArray(idx, this.seriesStack);
-            // if already in back, return
-            if (stackIndex == 0 || stackIndex == -1) {
-                return;
-            }
-            var opidx = this.seriesStack[0];
-            var serelem = this.series[idx].canvas._elem.detach();
-            var shadelem = this.series[idx].shadowCanvas._elem.detach();
-            this.series[opidx].shadowCanvas._elem.before(shadelem);
-            this.series[opidx].canvas._elem.before(serelem);
-            this.previousSeriesStack = this.seriesStack.slice(0);
-            this.seriesStack.splice(stackIndex, 1);
-            this.seriesStack.unshift(idx);
-        };
-        
-        // method: restorePreviousSeriesOrder
-        // This method requires jQuery 1.4+
-        // Restore the series canvas order to its previous state.
-        // Useful to put a series back where it belongs after moving
-        // it to the front.
-        this.restorePreviousSeriesOrder = function () {
-            var i, j, serelem, shadelem, temp, move, keep;
-            // if no change, return.
-            if (this.seriesStack == this.previousSeriesStack) {
-                return;
-            }
-            for (i=1; i<this.previousSeriesStack.length; i++) {
-                move = this.previousSeriesStack[i];
-                keep = this.previousSeriesStack[i-1];
-                serelem = this.series[move].canvas._elem.detach();
-                shadelem = this.series[move].shadowCanvas._elem.detach();
-                this.series[keep].shadowCanvas._elem.after(shadelem);
-                this.series[keep].canvas._elem.after(serelem);
-            }
-            temp = this.seriesStack.slice(0);
-            this.seriesStack = this.previousSeriesStack.slice(0);
-            this.previousSeriesStack = temp;
-        };
-        
-        // method: restoreOriginalSeriesOrder
-        // This method requires jQuery 1.4+
-        // Restore the series canvas order to its original order
-        // when the plot was created.
-        this.restoreOriginalSeriesOrder = function () {
-            var i, j, arr=[], serelem, shadelem;
-            for (i=0; i<this.series.length; i++) {
-                arr.push(i);
-            }
-            if (this.seriesStack == arr) {
-                return;
-            }
-            this.previousSeriesStack = this.seriesStack.slice(0);
-            this.seriesStack = arr;
-            for (i=1; i<this.seriesStack.length; i++) {
-                serelem = this.series[i].canvas._elem.detach();
-                shadelem = this.series[i].shadowCanvas._elem.detach();
-                this.series[i-1].shadowCanvas._elem.after(shadelem);
-                this.series[i-1].canvas._elem.after(serelem);
-            }
-        };
-        
-        this.activateTheme = function (name) {
-            this.themeEngine.activate(this, name);
-        };
-    }
-    
-    
-    // conpute a highlight color or array of highlight colors from given colors.
-    $.jqplot.computeHighlightColors  = function(colors) {
-        var ret;
-        if ($.isArray(colors)) {
-            ret = [];
-            for (var i=0; i<colors.length; i++){
-                var rgba = $.jqplot.getColorComponents(colors[i]);
-                var newrgb = [rgba[0], rgba[1], rgba[2]];
-                var sum = newrgb[0] + newrgb[1] + newrgb[2];
-                for (var j=0; j<3; j++) {
-                    // when darkening, lowest color component can be is 60.
-                    newrgb[j] = (sum > 660) ?  newrgb[j] * 0.85 : 0.73 * newrgb[j] + 90;
-                    newrgb[j] = parseInt(newrgb[j], 10);
-                    (newrgb[j] > 255) ? 255 : newrgb[j];
-                }
-                // newrgb[3] = (rgba[3] > 0.4) ? rgba[3] * 0.4 : rgba[3] * 1.5;
-                // newrgb[3] = (rgba[3] > 0.5) ? 0.8 * rgba[3] - .1 : rgba[3] + 0.2;
-                newrgb[3] = 0.3 + 0.35 * rgba[3];
-                ret.push('rgba('+newrgb[0]+','+newrgb[1]+','+newrgb[2]+','+newrgb[3]+')');
-            }
-        }
-        else {
-            var rgba = $.jqplot.getColorComponents(colors);
-            var newrgb = [rgba[0], rgba[1], rgba[2]];
-            var sum = newrgb[0] + newrgb[1] + newrgb[2];
-            for (var j=0; j<3; j++) {
-                // when darkening, lowest color component can be is 60.
-                // newrgb[j] = (sum > 570) ?  newrgb[j] * 0.8 : newrgb[j] + 0.3 * (255 - newrgb[j]);
-                // newrgb[j] = parseInt(newrgb[j], 10);
-                newrgb[j] = (sum > 660) ?  newrgb[j] * 0.85 : 0.73 * newrgb[j] + 90;
-                newrgb[j] = parseInt(newrgb[j], 10);
-                (newrgb[j] > 255) ? 255 : newrgb[j];
-            }
-            // newrgb[3] = (rgba[3] > 0.4) ? rgba[3] * 0.4 : rgba[3] * 1.5;
-            // newrgb[3] = (rgba[3] > 0.5) ? 0.8 * rgba[3] - .1 : rgba[3] + 0.2;
-            newrgb[3] = 0.3 + 0.35 * rgba[3];
-            ret = 'rgba('+newrgb[0]+','+newrgb[1]+','+newrgb[2]+','+newrgb[3]+')';
-        }
-        return ret;
-    };
-        
-   $.jqplot.ColorGenerator = function(colors) {
-        colors = colors || $.jqplot.config.defaultColors;
-        var idx = 0;
-        
-        this.next = function () { 
-            if (idx < colors.length) {
-                return colors[idx++];
-            }
-            else {
-                idx = 0;
-                return colors[idx++];
-            }
-        };
-        
-        this.previous = function () { 
-            if (idx > 0) {
-                return colors[idx--];
-            }
-            else {
-                idx = colors.length-1;
-                return colors[idx];
-            }
-        };
-        
-        // get a color by index without advancing pointer.
-        this.get = function(i) {
-            var idx = i - colors.length * Math.floor(i/colors.length);
-            return colors[idx];
-        };
-        
-        this.setColors = function(c) {
-            colors = c;
-        };
-        
-        this.reset = function() {
-            idx = 0;
-        };
-
-        this.getIndex = function() {
-            return idx;
-        };
-
-        this.setIndex = function(index) {
-            idx = index;
-        };
-    };
-
-    // convert a hex color string to rgb string.
-    // h - 3 or 6 character hex string, with or without leading #
-    // a - optional alpha
-    $.jqplot.hex2rgb = function(h, a) {
-        h = h.replace('#', '');
-        if (h.length == 3) {
-            h = h.charAt(0)+h.charAt(0)+h.charAt(1)+h.charAt(1)+h.charAt(2)+h.charAt(2);
-        }
-        var rgb;
-        rgb = 'rgba('+parseInt(h.slice(0,2), 16)+', '+parseInt(h.slice(2,4), 16)+', '+parseInt(h.slice(4,6), 16);
-        if (a) {
-            rgb += ', '+a;
-        }
-        rgb += ')';
-        return rgb;
-    };
-    
-    // convert an rgb color spec to a hex spec.  ignore any alpha specification.
-    $.jqplot.rgb2hex = function(s) {
-        var pat = /rgba?\( *([0-9]{1,3}\.?[0-9]*%?) *, *([0-9]{1,3}\.?[0-9]*%?) *, *([0-9]{1,3}\.?[0-9]*%?) *(?:, *[0-9.]*)?\)/;
-        var m = s.match(pat);
-        var h = '#';
-        for (var i=1; i<4; i++) {
-            var temp;
-            if (m[i].search(/%/) != -1) {
-                temp = parseInt(255*m[i]/100, 10).toString(16);
-                if (temp.length == 1) {
-                    temp = '0'+temp;
-                }
-            }
-            else {
-                temp = parseInt(m[i], 10).toString(16);
-                if (temp.length == 1) {
-                    temp = '0'+temp;
-                }
-            }
-            h += temp;
-        }
-        return h;
-    };
-    
-    // given a css color spec, return an rgb css color spec
-    $.jqplot.normalize2rgb = function(s, a) {
-        if (s.search(/^ *rgba?\(/) != -1) {
-            return s; 
-        }
-        else if (s.search(/^ *#?[0-9a-fA-F]?[0-9a-fA-F]/) != -1) {
-            return $.jqplot.hex2rgb(s, a);
-        }
-        else {
-            throw new Error('Invalid color spec');
-        }
-    };
-    
-    // extract the r, g, b, a color components out of a css color spec.
-    $.jqplot.getColorComponents = function(s) {
-        // check to see if a color keyword.
-        s = $.jqplot.colorKeywordMap[s] || s;
-        var rgb = $.jqplot.normalize2rgb(s);
-        var pat = /rgba?\( *([0-9]{1,3}\.?[0-9]*%?) *, *([0-9]{1,3}\.?[0-9]*%?) *, *([0-9]{1,3}\.?[0-9]*%?) *,? *([0-9.]* *)?\)/;
-        var m = rgb.match(pat);
-        var ret = [];
-        for (var i=1; i<4; i++) {
-            if (m[i].search(/%/) != -1) {
-                ret[i-1] = parseInt(255*m[i]/100, 10);
-            }
-            else {
-                ret[i-1] = parseInt(m[i], 10);
-            }
-        }
-        ret[3] = parseFloat(m[4]) ? parseFloat(m[4]) : 1.0;
-        return ret;
-    };
-    
-    $.jqplot.colorKeywordMap = {
-        aliceblue: 'rgb(240, 248, 255)',
-        antiquewhite: 'rgb(250, 235, 215)',
-        aqua: 'rgb( 0, 255, 255)',
-        aquamarine: 'rgb(127, 255, 212)',
-        azure: 'rgb(240, 255, 255)',
-        beige: 'rgb(245, 245, 220)',
-        bisque: 'rgb(255, 228, 196)',
-        black: 'rgb( 0, 0, 0)',
-        blanchedalmond: 'rgb(255, 235, 205)',
-        blue: 'rgb( 0, 0, 255)',
-        blueviolet: 'rgb(138, 43, 226)',
-        brown: 'rgb(165, 42, 42)',
-        burlywood: 'rgb(222, 184, 135)',
-        cadetblue: 'rgb( 95, 158, 160)',
-        chartreuse: 'rgb(127, 255, 0)',
-        chocolate: 'rgb(210, 105, 30)',
-        coral: 'rgb(255, 127, 80)',
-        cornflowerblue: 'rgb(100, 149, 237)',
-        cornsilk: 'rgb(255, 248, 220)',
-        crimson: 'rgb(220, 20, 60)',
-        cyan: 'rgb( 0, 255, 255)',
-        darkblue: 'rgb( 0, 0, 139)',
-        darkcyan: 'rgb( 0, 139, 139)',
-        darkgoldenrod: 'rgb(184, 134, 11)',
-        darkgray: 'rgb(169, 169, 169)',
-        darkgreen: 'rgb( 0, 100, 0)',
-        darkgrey: 'rgb(169, 169, 169)',
-        darkkhaki: 'rgb(189, 183, 107)',
-        darkmagenta: 'rgb(139, 0, 139)',
-        darkolivegreen: 'rgb( 85, 107, 47)',
-        darkorange: 'rgb(255, 140, 0)',
-        darkorchid: 'rgb(153, 50, 204)',
-        darkred: 'rgb(139, 0, 0)',
-        darksalmon: 'rgb(233, 150, 122)',
-        darkseagreen: 'rgb(143, 188, 143)',
-        darkslateblue: 'rgb( 72, 61, 139)',
-        darkslategray: 'rgb( 47, 79, 79)',
-        darkslategrey: 'rgb( 47, 79, 79)',
-        darkturquoise: 'rgb( 0, 206, 209)',
-        darkviolet: 'rgb(148, 0, 211)',
-        deeppink: 'rgb(255, 20, 147)',
-        deepskyblue: 'rgb( 0, 191, 255)',
-        dimgray: 'rgb(105, 105, 105)',
-        dimgrey: 'rgb(105, 105, 105)',
-        dodgerblue: 'rgb( 30, 144, 255)',
-        firebrick: 'rgb(178, 34, 34)',
-        floralwhite: 'rgb(255, 250, 240)',
-        forestgreen: 'rgb( 34, 139, 34)',
-        fuchsia: 'rgb(255, 0, 255)',
-        gainsboro: 'rgb(220, 220, 220)',
-        ghostwhite: 'rgb(248, 248, 255)',
-        gold: 'rgb(255, 215, 0)',
-        goldenrod: 'rgb(218, 165, 32)',
-        gray: 'rgb(128, 128, 128)',
-        grey: 'rgb(128, 128, 128)',
-        green: 'rgb( 0, 128, 0)',
-        greenyellow: 'rgb(173, 255, 47)',
-        honeydew: 'rgb(240, 255, 240)',
-        hotpink: 'rgb(255, 105, 180)',
-        indianred: 'rgb(205, 92, 92)',
-        indigo: 'rgb( 75, 0, 130)',
-        ivory: 'rgb(255, 255, 240)',
-        khaki: 'rgb(240, 230, 140)',
-        lavender: 'rgb(230, 230, 250)',
-        lavenderblush: 'rgb(255, 240, 245)',
-        lawngreen: 'rgb(124, 252, 0)',
-        lemonchiffon: 'rgb(255, 250, 205)',
-        lightblue: 'rgb(173, 216, 230)',
-        lightcoral: 'rgb(240, 128, 128)',
-        lightcyan: 'rgb(224, 255, 255)',
-        lightgoldenrodyellow: 'rgb(250, 250, 210)',
-        lightgray: 'rgb(211, 211, 211)',
-        lightgreen: 'rgb(144, 238, 144)',
-        lightgrey: 'rgb(211, 211, 211)',
-        lightpink: 'rgb(255, 182, 193)',
-        lightsalmon: 'rgb(255, 160, 122)',
-        lightseagreen: 'rgb( 32, 178, 170)',
-        lightskyblue: 'rgb(135, 206, 250)',
-        lightslategray: 'rgb(119, 136, 153)',
-        lightslategrey: 'rgb(119, 136, 153)',
-        lightsteelblue: 'rgb(176, 196, 222)',
-        lightyellow: 'rgb(255, 255, 224)',
-        lime: 'rgb( 0, 255, 0)',
-        limegreen: 'rgb( 50, 205, 50)',
-        linen: 'rgb(250, 240, 230)',
-        magenta: 'rgb(255, 0, 255)',
-        maroon: 'rgb(128, 0, 0)',
-        mediumaquamarine: 'rgb(102, 205, 170)',
-        mediumblue: 'rgb( 0, 0, 205)',
-        mediumorchid: 'rgb(186, 85, 211)',
-        mediumpurple: 'rgb(147, 112, 219)',
-        mediumseagreen: 'rgb( 60, 179, 113)',
-        mediumslateblue: 'rgb(123, 104, 238)',
-        mediumspringgreen: 'rgb( 0, 250, 154)',
-        mediumturquoise: 'rgb( 72, 209, 204)',
-        mediumvioletred: 'rgb(199, 21, 133)',
-        midnightblue: 'rgb( 25, 25, 112)',
-        mintcream: 'rgb(245, 255, 250)',
-        mistyrose: 'rgb(255, 228, 225)',
-        moccasin: 'rgb(255, 228, 181)',
-        navajowhite: 'rgb(255, 222, 173)',
-        navy: 'rgb( 0, 0, 128)',
-        oldlace: 'rgb(253, 245, 230)',
-        olive: 'rgb(128, 128, 0)',
-        olivedrab: 'rgb(107, 142, 35)',
-        orange: 'rgb(255, 165, 0)',
-        orangered: 'rgb(255, 69, 0)',
-        orchid: 'rgb(218, 112, 214)',
-        palegoldenrod: 'rgb(238, 232, 170)',
-        palegreen: 'rgb(152, 251, 152)',
-        paleturquoise: 'rgb(175, 238, 238)',
-        palevioletred: 'rgb(219, 112, 147)',
-        papayawhip: 'rgb(255, 239, 213)',
-        peachpuff: 'rgb(255, 218, 185)',
-        peru: 'rgb(205, 133, 63)',
-        pink: 'rgb(255, 192, 203)',
-        plum: 'rgb(221, 160, 221)',
-        powderblue: 'rgb(176, 224, 230)',
-        purple: 'rgb(128, 0, 128)',
-        red: 'rgb(255, 0, 0)',
-        rosybrown: 'rgb(188, 143, 143)',
-        royalblue: 'rgb( 65, 105, 225)',
-        saddlebrown: 'rgb(139, 69, 19)',
-        salmon: 'rgb(250, 128, 114)',
-        sandybrown: 'rgb(244, 164, 96)',
-        seagreen: 'rgb( 46, 139, 87)',
-        seashell: 'rgb(255, 245, 238)',
-        sienna: 'rgb(160, 82, 45)',
-        silver: 'rgb(192, 192, 192)',
-        skyblue: 'rgb(135, 206, 235)',
-        slateblue: 'rgb(106, 90, 205)',
-        slategray: 'rgb(112, 128, 144)',
-        slategrey: 'rgb(112, 128, 144)',
-        snow: 'rgb(255, 250, 250)',
-        springgreen: 'rgb( 0, 255, 127)',
-        steelblue: 'rgb( 70, 130, 180)',
-        tan: 'rgb(210, 180, 140)',
-        teal: 'rgb( 0, 128, 128)',
-        thistle: 'rgb(216, 191, 216)',
-        tomato: 'rgb(255, 99, 71)',
-        turquoise: 'rgb( 64, 224, 208)',
-        violet: 'rgb(238, 130, 238)',
-        wheat: 'rgb(245, 222, 179)',
-        white: 'rgb(255, 255, 255)',
-        whitesmoke: 'rgb(245, 245, 245)',
-        yellow: 'rgb(255, 255, 0)',
-        yellowgreen: 'rgb(154, 205, 50)'
-    };
-
-    
-
-
-    // class: $.jqplot.AxisLabelRenderer
-    // Renderer to place labels on the axes.
-    $.jqplot.AxisLabelRenderer = function(options) {
-        // Group: Properties
-        $.jqplot.ElemContainer.call(this);
-        // name of the axis associated with this tick
-        this.axis;
-        // prop: show
-        // whether or not to show the tick (mark and label).
-        this.show = true;
-        // prop: label
-        // The text or html for the label.
-        this.label = '';
-        this.fontFamily = null;
-        this.fontSize = null;
-        this.textColor = null;
-        this._elem;
-        // prop: escapeHTML
-        // true to escape HTML entities in the label.
-        this.escapeHTML = false;
-        
-        $.extend(true, this, options);
-    };
-    
-    $.jqplot.AxisLabelRenderer.prototype = new $.jqplot.ElemContainer();
-    $.jqplot.AxisLabelRenderer.prototype.constructor = $.jqplot.AxisLabelRenderer;
-    
-    $.jqplot.AxisLabelRenderer.prototype.init = function(options) {
-        $.extend(true, this, options);
-    };
-    
-    $.jqplot.AxisLabelRenderer.prototype.draw = function(ctx, plot) {
-        // Memory Leaks patch
-        if (this._elem) {
-            this._elem.emptyForce();
-            this._elem = null;
-        }
-
-        this._elem = $('<div style="position:absolute;" class="jqplot-'+this.axis+'-label"></div>');
-        
-        if (Number(this.label)) {
-            this._elem.css('white-space', 'nowrap');
-        }
-        
-        if (!this.escapeHTML) {
-            this._elem.html(this.label);
-        }
-        else {
-            this._elem.text(this.label);
-        }
-        if (this.fontFamily) {
-            this._elem.css('font-family', this.fontFamily);
-        }
-        if (this.fontSize) {
-            this._elem.css('font-size', this.fontSize);
-        }
-        if (this.textColor) {
-            this._elem.css('color', this.textColor);
-        }
-        
-        return this._elem;
-    };
-    
-    $.jqplot.AxisLabelRenderer.prototype.pack = function() {
-    };
-
-    // class: $.jqplot.AxisTickRenderer
-    // A "tick" object showing the value of a tick/gridline on the plot.
-    $.jqplot.AxisTickRenderer = function(options) {
-        // Group: Properties
-        $.jqplot.ElemContainer.call(this);
-        // prop: mark
-        // tick mark on the axis.  One of 'inside', 'outside', 'cross', '' or null.
-        this.mark = 'outside';
-        // name of the axis associated with this tick
-        this.axis;
-        // prop: showMark
-        // whether or not to show the mark on the axis.
-        this.showMark = true;
-        // prop: showGridline
-        // whether or not to draw the gridline on the grid at this tick.
-        this.showGridline = true;
-        // prop: isMinorTick
-        // if this is a minor tick.
-        this.isMinorTick = false;
-        // prop: size
-        // Length of the tick beyond the grid in pixels.
-        // DEPRECATED: This has been superceeded by markSize
-        this.size = 4;
-        // prop:  markSize
-        // Length of the tick marks in pixels.  For 'cross' style, length
-        // will be stoked above and below axis, so total length will be twice this.
-        this.markSize = 6;
-        // prop: show
-        // whether or not to show the tick (mark and label).
-        // Setting this to false requires more testing.  It is recommended
-        // to set showLabel and showMark to false instead.
-        this.show = true;
-        // prop: showLabel
-        // whether or not to show the label.
-        this.showLabel = true;
-        this.label = null;
-        this.value = null;
-        this._styles = {};
-        // prop: formatter
-        // A class of a formatter for the tick text.  sprintf by default.
-        this.formatter = $.jqplot.DefaultTickFormatter;
-        // prop: prefix
-        // String to prepend to the tick label.
-        // Prefix is prepended to the formatted tick label.
-        this.prefix = '';
-        // prop: suffix
-        // String to append to the tick label.
-        // Suffix is appended to the formatted tick label.
-        this.suffix = '';
-        // prop: formatString
-        // string passed to the formatter.
-        this.formatString = '';
-        // prop: fontFamily
-        // css spec for the font-family css attribute.
-        this.fontFamily;
-        // prop: fontSize
-        // css spec for the font-size css attribute.
-        this.fontSize;
-        // prop: textColor
-        // css spec for the color attribute.
-        this.textColor;
-        // prop: escapeHTML
-        // true to escape HTML entities in the label.
-        this.escapeHTML = false;
-        this._elem;
-        this._breakTick = false;
-        
-        $.extend(true, this, options);
-    };
-    
-    $.jqplot.AxisTickRenderer.prototype.init = function(options) {
-        $.extend(true, this, options);
-    };
-    
-    $.jqplot.AxisTickRenderer.prototype = new $.jqplot.ElemContainer();
-    $.jqplot.AxisTickRenderer.prototype.constructor = $.jqplot.AxisTickRenderer;
-    
-    $.jqplot.AxisTickRenderer.prototype.setTick = function(value, axisName, isMinor) {
-        this.value = value;
-        this.axis = axisName;
-        if (isMinor) {
-            this.isMinorTick = true;
-        }
-        return this;
-    };
-    
-    $.jqplot.AxisTickRenderer.prototype.draw = function() {
-        if (this.label === null) {
-            this.label = this.prefix + this.formatter(this.formatString, this.value) + this.suffix;
-        }
-        var style = {position: 'absolute'};
-        if (Number(this.label)) {
-            style['whitSpace'] = 'nowrap';
-        }
-        
-        // Memory Leaks patch
-        if (this._elem) {
-            this._elem.emptyForce();
-            this._elem = null;
-        }
-
-        this._elem = $(document.createElement('div'));
-        this._elem.addClass("jqplot-"+this.axis+"-tick");
-        
-        if (!this.escapeHTML) {
-            this._elem.html(this.label);
-        }
-        else {
-            this._elem.text(this.label);
-        }
-        
-        this._elem.css(style);
-
-        for (var s in this._styles) {
-            this._elem.css(s, this._styles[s]);
-        }
-        if (this.fontFamily) {
-            this._elem.css('font-family', this.fontFamily);
-        }
-        if (this.fontSize) {
-            this._elem.css('font-size', this.fontSize);
-        }
-        if (this.textColor) {
-            this._elem.css('color', this.textColor);
-        }
-        if (this._breakTick) {
-          this._elem.addClass('jqplot-breakTick');
-        }
-        
-        return this._elem;
-    };
-        
-    $.jqplot.DefaultTickFormatter = function (format, val) {
-        if (typeof val == 'number') {
-            if (!format) {
-                format = $.jqplot.config.defaultTickFormatString;
-            }
-            return $.jqplot.sprintf(format, val);
-        }
-        else {
-            return String(val);
-        }
-    };
-        
-    $.jqplot.PercentTickFormatter = function (format, val) {
-        if (typeof val == 'number') {
-            val = 100 * val;
-            if (!format) {
-                format = $.jqplot.config.defaultTickFormatString;
-            }
-            return $.jqplot.sprintf(format, val);
-        }
-        else {
-            return String(val);
-        }
-    };
-    
-    $.jqplot.AxisTickRenderer.prototype.pack = function() {
-    };
-     
-    // Class: $.jqplot.CanvasGridRenderer
-    // The default jqPlot grid renderer, creating a grid on a canvas element.
-    // The renderer has no additional options beyond the <Grid> class.
-    $.jqplot.CanvasGridRenderer = function(){
-        this.shadowRenderer = new $.jqplot.ShadowRenderer();
-    };
-    
-    // called with context of Grid object
-    $.jqplot.CanvasGridRenderer.prototype.init = function(options) {
-        this._ctx;
-        $.extend(true, this, options);
-        // set the shadow renderer options
-        var sopts = {lineJoin:'miter', lineCap:'round', fill:false, isarc:false, angle:this.shadowAngle, offset:this.shadowOffset, alpha:this.shadowAlpha, depth:this.shadowDepth, lineWidth:this.shadowWidth, closePath:false, strokeStyle:this.shadowColor};
-        this.renderer.shadowRenderer.init(sopts);
-    };
-    
-    // called with context of Grid.
-    $.jqplot.CanvasGridRenderer.prototype.createElement = function(plot) {
-        var elem;
-        // Memory Leaks patch
-        if (this._elem) {
-          if ($.jqplot.use_excanvas && window.G_vmlCanvasManager.uninitElement !== undefined) {
-            elem = this._elem.get(0);
-            window.G_vmlCanvasManager.uninitElement(elem);
-            elem = null;
-          }
-          
-          this._elem.emptyForce();
-          this._elem = null;
-        }
-      
-        elem = plot.canvasManager.getCanvas();
-
-        var w = this._plotDimensions.width;
-        var h = this._plotDimensions.height;
-        elem.width = w;
-        elem.height = h;
-        this._elem = $(elem);
-        this._elem.addClass('jqplot-grid-canvas');
-        this._elem.css({ position: 'absolute', left: 0, top: 0 });
-        
-        elem = plot.canvasManager.initCanvas(elem);
-
-        this._top = this._offsets.top;
-        this._bottom = h - this._offsets.bottom;
-        this._left = this._offsets.left;
-        this._right = w - this._offsets.right;
-        this._width = this._right - this._left;
-        this._height = this._bottom - this._top;
-        // avoid memory leak
-        elem = null;
-        return this._elem;
-    };
-    
-    $.jqplot.CanvasGridRenderer.prototype.draw = function() {
-        this._ctx = this._elem.get(0).getContext("2d");
-        var ctx = this._ctx;
-        var axes = this._axes;
-        // Add the grid onto the grid canvas.  This is the bottom most layer.
-        ctx.save();
-        ctx.clearRect(0, 0, this._plotDimensions.width, this._plotDimensions.height);
-        ctx.fillStyle = this.backgroundColor || this.background;
-        ctx.fillRect(this._left, this._top, this._width, this._height);
-        
-        ctx.save();
-        ctx.lineJoin = 'miter';
-        ctx.lineCap = 'butt';
-        ctx.lineWidth = this.gridLineWidth;
-        ctx.strokeStyle = this.gridLineColor;
-        var b, e, s, m;
-        var ax = ['xaxis', 'yaxis', 'x2axis', 'y2axis'];
-        for (var i=4; i>0; i--) {
-            var name = ax[i-1];
-            var axis = axes[name];
-            var ticks = axis._ticks;
-            var numticks = ticks.length;
-            if (axis.show) {
-                if (axis.drawBaseline) {
-                    var bopts = {};
-                    if (axis.baselineWidth !== null) {
-                        bopts.lineWidth = axis.baselineWidth;
-                    }
-                    if (axis.baselineColor !== null) {
-                        bopts.strokeStyle = axis.baselineColor;
-                    }
-                    switch (name) {
-                        case 'xaxis':
-                            drawLine (this._left, this._bottom, this._right, this._bottom, bopts);
-                            break;
-                        case 'yaxis':
-                            drawLine (this._left, this._bottom, this._left, this._top, bopts);
-                            break;
-                        case 'x2axis':
-                            drawLine (this._left, this._bottom, this._right, this._bottom, bopts);
-                            break;
-                        case 'y2axis':
-                            drawLine (this._right, this._bottom, this._right, this._top, bopts);
-                            break;
-                    }
-                }
-                for (var j=numticks; j>0; j--) {
-                    var t = ticks[j-1];
-                    if (t.show) {
-                        var pos = Math.round(axis.u2p(t.value)) + 0.5;
-                        switch (name) {
-                            case 'xaxis':
-                                // draw the grid line if we should
-                                if (t.showGridline && this.drawGridlines && ((!t.isMinorTick && axis.drawMajorGridlines) || (t.isMinorTick && axis.drawMinorGridlines)) ) {
-                                    drawLine(pos, this._top, pos, this._bottom);
-                                }
-                                // draw the mark
-                                if (t.showMark && t.mark && ((!t.isMinorTick && axis.drawMajorTickMarks) || (t.isMinorTick && axis.drawMinorTickMarks)) ) {
-                                    s = t.markSize;
-                                    m = t.mark;
-                                    var pos = Math.round(axis.u2p(t.value)) + 0.5;
-                                    switch (m) {
-                                        case 'outside':
-                                            b = this._bottom;
-                                            e = this._bottom+s;
-                                            break;
-                                        case 'inside':
-                                            b = this._bottom-s;
-                                            e = this._bottom;
-                                            break;
-                                        case 'cross':
-                                            b = this._bottom-s;
-                                            e = this._bottom+s;
-                                            break;
-                                        default:
-                                            b = this._bottom;
-                                            e = this._bottom+s;
-                                            break;
-                                    }
-                                    // draw the shadow
-                                    if (this.shadow) {
-                                        this.renderer.shadowRenderer.draw(ctx, [[pos,b],[pos,e]], {lineCap:'butt', lineWidth:this.gridLineWidth, offset:this.gridLineWidth*0.75, depth:2, fill:false, closePath:false});
-                                    }
-                                    // draw the line
-                                    drawLine(pos, b, pos, e);
-                                }
-                                break;
-                            case 'yaxis':
-                                // draw the grid line
-                                if (t.showGridline && this.drawGridlines && ((!t.isMinorTick && axis.drawMajorGridlines) || (t.isMinorTick && axis.drawMinorGridlines)) ) {
-                                    drawLine(this._right, pos, this._left, pos);
-                                }
-                                // draw the mark
-                                if (t.showMark && t.mark && ((!t.isMinorTick && axis.drawMajorTickMarks) || (t.isMinorTick && axis.drawMinorTickMarks)) ) {
-                                    s = t.markSize;
-                                    m = t.mark;
-                                    var pos = Math.round(axis.u2p(t.value)) + 0.5;
-                                    switch (m) {
-                                        case 'outside':
-                                            b = this._left-s;
-                                            e = this._left;
-                                            break;
-                                        case 'inside':
-                                            b = this._left;
-                                            e = this._left+s;
-                                            break;
-                                        case 'cross':
-                                            b = this._left-s;
-                                            e = this._left+s;
-                                            break;
-                                        default:
-                                            b = this._left-s;
-                                            e = this._left;
-                                            break;
-                                            }
-                                    // draw the shadow
-                                    if (this.shadow) {
-                                        this.renderer.shadowRenderer.draw(ctx, [[b, pos], [e, pos]], {lineCap:'butt', lineWidth:this.gridLineWidth*1.5, offset:this.gridLineWidth*0.75, fill:false, closePath:false});
-                                    }
-                                    drawLine(b, pos, e, pos, {strokeStyle:axis.borderColor});
-                                }
-                                break;
-                            case 'x2axis':
-                                // draw the grid line
-                                if (t.showGridline && this.drawGridlines && ((!t.isMinorTick && axis.drawMajorGridlines) || (t.isMinorTick && axis.drawMinorGridlines)) ) {
-                                    drawLine(pos, this._bottom, pos, this._top);
-                                }
-                                // draw the mark
-                                if (t.showMark && t.mark && ((!t.isMinorTick && axis.drawMajorTickMarks) || (t.isMinorTick && axis.drawMinorTickMarks)) ) {
-                                    s = t.markSize;
-                                    m = t.mark;
-                                    var pos = Math.round(axis.u2p(t.value)) + 0.5;
-                                    switch (m) {
-                                        case 'outside':
-                                            b = this._top-s;
-                                            e = this._top;
-                                            break;
-                                        case 'inside':
-                                            b = this._top;
-                                            e = this._top+s;
-                                            break;
-                                        case 'cross':
-                                            b = this._top-s;
-                                            e = this._top+s;
-                                            break;
-                                        default:
-                                            b = this._top-s;
-                                            e = this._top;
-                                            break;
-                                            }
-                                    // draw the shadow
-                                    if (this.shadow) {
-                                        this.renderer.shadowRenderer.draw(ctx, [[pos,b],[pos,e]], {lineCap:'butt', lineWidth:this.gridLineWidth, offset:this.gridLineWidth*0.75, depth:2, fill:false, closePath:false});
-                                    }
-                                    drawLine(pos, b, pos, e);
-                                }
-                                break;
-                            case 'y2axis':
-                                // draw the grid line
-                                if (t.showGridline && this.drawGridlines && ((!t.isMinorTick && axis.drawMajorGridlines) || (t.isMinorTick && axis.drawMinorGridlines)) ) {
-                                    drawLine(this._left, pos, this._right, pos);
-                                }
-                                // draw the mark
-                                if (t.showMark && t.mark && ((!t.isMinorTick && axis.drawMajorTickMarks) || (t.isMinorTick && axis.drawMinorTickMarks)) ) {
-                                    s = t.markSize;
-                                    m = t.mark;
-                                    var pos = Math.round(axis.u2p(t.value)) + 0.5;
-                                    switch (m) {
-                                        case 'outside':
-                                            b = this._right;
-                                            e = this._right+s;
-                                            break;
-                                        case 'inside':
-                                            b = this._right-s;
-                                            e = this._right;
-                                            break;
-                                        case 'cross':
-                                            b = this._right-s;
-                                            e = this._right+s;
-                                            break;
-                                        default:
-                                            b = this._right;
-                                            e = this._right+s;
-                                            break;
-                                            }
-                                    // draw the shadow
-                                    if (this.shadow) {
-                                        this.renderer.shadowRenderer.draw(ctx, [[b, pos], [e, pos]], {lineCap:'butt', lineWidth:this.gridLineWidth*1.5, offset:this.gridLineWidth*0.75, fill:false, closePath:false});
-                                    }
-                                    drawLine(b, pos, e, pos, {strokeStyle:axis.borderColor});
-                                }
-                                break;
-                            default:
-                                break;
-                        }
-                    }
-                }
-                t = null;
-            }
-            axis = null;
-            ticks = null;
-        }
-        // Now draw grid lines for additional y axes
-        //////
-        // TO DO: handle yMidAxis
-        //////
-        ax = ['y3axis', 'y4axis', 'y5axis', 'y6axis', 'y7axis', 'y8axis', 'y9axis', 'yMidAxis'];
-        for (var i=7; i>0; i--) {
-            var axis = axes[ax[i-1]];
-            var ticks = axis._ticks;
-            if (axis.show) {
-                var tn = ticks[axis.numberTicks-1];
-                var t0 = ticks[0];
-                var left = axis.getLeft();
-                var points = [[left, tn.getTop() + tn.getHeight()/2], [left, t0.getTop() + t0.getHeight()/2 + 1.0]];
-                // draw the shadow
-                if (this.shadow) {
-                    this.renderer.shadowRenderer.draw(ctx, points, {lineCap:'butt', fill:false, closePath:false});
-                }
-                // draw the line
-                drawLine(points[0][0], points[0][1], points[1][0], points[1][1], {lineCap:'butt', strokeStyle:axis.borderColor, lineWidth:axis.borderWidth});
-                // draw the tick marks
-                for (var j=ticks.length; j>0; j--) {
-                    var t = ticks[j-1];
-                    s = t.markSize;
-                    m = t.mark;
-                    var pos = Math.round(axis.u2p(t.value)) + 0.5;
-                    if (t.showMark && t.mark) {
-                        switch (m) {
-                            case 'outside':
-                                b = left;
-                                e = left+s;
-                                break;
-                            case 'inside':
-                                b = left-s;
-                                e = left;
-                                break;
-                            case 'cross':
-                                b = left-s;
-                                e = left+s;
-                                break;
-                            default:
-                                b = left;
-                                e = left+s;
-                                break;
-                        }
-                        points = [[b,pos], [e,pos]];
-                        // draw the shadow
-                        if (this.shadow) {
-                            this.renderer.shadowRenderer.draw(ctx, points, {lineCap:'butt', lineWidth:this.gridLineWidth*1.5, offset:this.gridLineWidth*0.75, fill:false, closePath:false});
-                        }
-                        // draw the line
-                        drawLine(b, pos, e, pos, {strokeStyle:axis.borderColor});
-                    }
-                    t = null;
-                }
-                t0 = null;
-            }
-            axis = null;
-            ticks =  null;
-        }
-        
-        ctx.restore();
-        
-        function drawLine(bx, by, ex, ey, opts) {
-            ctx.save();
-            opts = opts || {};
-            if (opts.lineWidth == null || opts.lineWidth != 0){
-                $.extend(true, ctx, opts);
-                ctx.beginPath();
-                ctx.moveTo(bx, by);
-                ctx.lineTo(ex, ey);
-                ctx.stroke();
-                ctx.restore();
-            }
-        }
-        
-        if (this.shadow) {
-            var points = [[this._left, this._bottom], [this._right, this._bottom], [this._right, this._top]];
-            this.renderer.shadowRenderer.draw(ctx, points);
-        }
-        // Now draw border around grid.  Use axis border definitions. start at
-        // upper left and go clockwise.
-        if (this.borderWidth != 0 && this.drawBorder) {
-            drawLine (this._left, this._top, this._right, this._top, {lineCap:'round', strokeStyle:axes.x2axis.borderColor, lineWidth:axes.x2axis.borderWidth});
-            drawLine (this._right, this._top, this._right, this._bottom, {lineCap:'round', strokeStyle:axes.y2axis.borderColor, lineWidth:axes.y2axis.borderWidth});
-            drawLine (this._right, this._bottom, this._left, this._bottom, {lineCap:'round', strokeStyle:axes.xaxis.borderColor, lineWidth:axes.xaxis.borderWidth});
-            drawLine (this._left, this._bottom, this._left, this._top, {lineCap:'round', strokeStyle:axes.yaxis.borderColor, lineWidth:axes.yaxis.borderWidth});
-        }
-        // ctx.lineWidth = this.borderWidth;
-        // ctx.strokeStyle = this.borderColor;
-        // ctx.strokeRect(this._left, this._top, this._width, this._height);
-        
-        ctx.restore();
-        ctx =  null;
-        axes = null;
-    };
- 
-    // Class: $.jqplot.DivTitleRenderer
-    // The default title renderer for jqPlot.  This class has no options beyond the <Title> class. 
-    $.jqplot.DivTitleRenderer = function() {
-    };
-    
-    $.jqplot.DivTitleRenderer.prototype.init = function(options) {
-        $.extend(true, this, options);
-    };
-    
-    $.jqplot.DivTitleRenderer.prototype.draw = function() {
-        // Memory Leaks patch
-        if (this._elem) {
-            this._elem.emptyForce();
-            this._elem = null;
-        }
-
-        var r = this.renderer;
-        var elem = document.createElement('div');
-        this._elem = $(elem);
-        this._elem.addClass('jqplot-title');
-
-        if (!this.text) {
-            this.show = false;
-            this._elem.height(0);
-            this._elem.width(0);
-        }
-        else if (this.text) {
-            var color;
-            if (this.color) {
-                color = this.color;
-            }
-            else if (this.textColor) {
-                color = this.textColor;
-            }
-
-            // don't trust that a stylesheet is present, set the position.
-            var styles = {position:'absolute', top:'0px', left:'0px'};
-
-            if (this._plotWidth) {
-                styles['width'] = this._plotWidth+'px';
-            }
-            if (this.fontSize) {
-                styles['fontSize'] = this.fontSize;
-            }
-            if (typeof this.textAlign === 'string') {
-                styles['textAlign'] = this.textAlign;
-            }
-            else {
-                styles['textAlign'] = 'center';
-            }
-            if (color) {
-                styles['color'] = color;
-            }
-            if (this.paddingBottom) {
-                styles['paddingBottom'] = this.paddingBottom;
-            }
-            if (this.fontFamily) {
-                styles['fontFamily'] = this.fontFamily;
-            }
-
-            this._elem.css(styles);
-            if (this.escapeHtml) {
-                this._elem.text(this.text);
-            }
-            else {
-                this._elem.html(this.text);
-            }
-
-
-            // styletext += (this._plotWidth) ? 'width:'+this._plotWidth+'px;' : '';
-            // styletext += (this.fontSize) ? 'font-size:'+this.fontSize+';' : '';
-            // styletext += (this.textAlign) ? 'text-align:'+this.textAlign+';' : 'text-align:center;';
-            // styletext += (color) ? 'color:'+color+';' : '';
-            // styletext += (this.paddingBottom) ? 'padding-bottom:'+this.paddingBottom+';' : '';
-            // this._elem = $('<div class="jqplot-title" style="'+styletext+'">'+this.text+'</div>');
-            // if (this.fontFamily) {
-            //     this._elem.css('font-family', this.fontFamily);
-            // }
-        }
-
-        elem = null;
-        
-        return this._elem;
-    };
-    
-    $.jqplot.DivTitleRenderer.prototype.pack = function() {
-        // nothing to do here
-    };
-  
-
-    var dotlen = 0.1;
-
-    $.jqplot.LinePattern = function (ctx, pattern) {
-
-        var defaultLinePatterns = {
-            dotted: [ dotlen, $.jqplot.config.dotGapLength ],
-            dashed: [ $.jqplot.config.dashLength, $.jqplot.config.gapLength ],
-            solid: null
-        };
-
-        if (typeof pattern === 'string') {
-            if (pattern[0] === '.' || pattern[0] === '-') {
-                var s = pattern;
-                pattern = [];
-                for (var i=0, imax=s.length; i<imax; i++) {
-                    if (s[i] === '.') {
-                        pattern.push( dotlen );
-                    }
-                    else if (s[i] === '-') {
-                        pattern.push( $.jqplot.config.dashLength );
-                    }
-                    else {
-                        continue;
-                    }
-                    pattern.push( $.jqplot.config.gapLength );
-                }
-            }
-            else {
-                pattern = defaultLinePatterns[pattern];
-            }
-        }
-
-        if (!(pattern && pattern.length)) {
-            return ctx;
-        }
-
-        var patternIndex = 0;
-        var patternDistance = pattern[0];
-        var px = 0;
-        var py = 0;
-        var pathx0 = 0;
-        var pathy0 = 0;
-
-        var moveTo = function (x, y) {
-            ctx.moveTo( x, y );
-            px = x;
-            py = y;
-            pathx0 = x;
-            pathy0 = y;
-        };
-
-        var lineTo = function (x, y) {
-            var scale = ctx.lineWidth;
-            var dx = x - px;
-            var dy = y - py;
-            var dist = Math.sqrt(dx*dx+dy*dy);
-            if ((dist > 0) && (scale > 0)) {
-                dx /= dist;
-                dy /= dist;
-                while (true) {
-                    var dp = scale * patternDistance;
-                    if (dp < dist) {
-                        px += dp * dx;
-                        py += dp * dy;
-                        if ((patternIndex & 1) == 0) {
-                            ctx.lineTo( px, py );
-                        }
-                        else {
-                            ctx.moveTo( px, py );
-                        }
-                        dist -= dp;
-                        patternIndex++;
-                        if (patternIndex >= pattern.length) {
-                            patternIndex = 0;
-                        }
-                        patternDistance = pattern[patternIndex];
-                    }
-                    else {
-                        px = x;
-                        py = y;
-                        if ((patternIndex & 1) == 0) {
-                            ctx.lineTo( px, py );
-                        }
-                        else {
-                            ctx.moveTo( px, py );
-                        }
-                        patternDistance -= dist / scale;
-                        break;
-                    }
-                }
-            }
-        };
-
-        var beginPath = function () {
-            ctx.beginPath();
-        };
-
-        var closePath = function () {
-            lineTo( pathx0, pathy0 );
-        };
-
-        return {
-            moveTo: moveTo,
-            lineTo: lineTo,
-            beginPath: beginPath,
-            closePath: closePath
-        };
-    };
-
-    // Class: $.jqplot.LineRenderer
-    // The default line renderer for jqPlot, this class has no options beyond the <Series> class.
-    // Draws series as a line.
-    $.jqplot.LineRenderer = function(){
-        this.shapeRenderer = new $.jqplot.ShapeRenderer();
-        this.shadowRenderer = new $.jqplot.ShadowRenderer();
-    };
-    
-    // called with scope of series.
-    $.jqplot.LineRenderer.prototype.init = function(options, plot) {
-        // Group: Properties
-        //
-        options = options || {};
-        this._type='line';
-        this.renderer.animation = {
-            show: false,
-            direction: 'left',
-            speed: 2500,
-            _supported: true
-        };
-        // prop: smooth
-        // True to draw a smoothed (interpolated) line through the data points
-        // with automatically computed number of smoothing points.
-        // Set to an integer number > 2 to specify number of smoothing points
-        // to use between each data point.
-        this.renderer.smooth = false;  // true or a number > 2 for smoothing.
-        this.renderer.tension = null; // null to auto compute or a number typically > 6.  Fewer points requires higher tension.
-        // prop: constrainSmoothing
-        // True to use a more accurate smoothing algorithm that will
-        // not overshoot any data points.  False to allow overshoot but
-        // produce a smoother looking line.
-        this.renderer.constrainSmoothing = true;
-        // this is smoothed data in grid coordinates, like gridData
-        this.renderer._smoothedData = [];
-        // this is smoothed data in plot units (plot coordinates), like plotData.
-        this.renderer._smoothedPlotData = [];
-        this.renderer._hiBandGridData = [];
-        this.renderer._lowBandGridData = [];
-        this.renderer._hiBandSmoothedData = [];
-        this.renderer._lowBandSmoothedData = [];
-
-        // prop: bandData
-        // Data used to draw error bands or confidence intervals above/below a line.
-        //
-        // bandData can be input in 3 forms.  jqPlot will figure out which is the
-        // low band line and which is the high band line for all forms:
-        // 
-        // A 2 dimensional array like [[yl1, yl2, ...], [yu1, yu2, ...]] where
-        // [yl1, yl2, ...] are y values of the lower line and
-        // [yu1, yu2, ...] are y values of the upper line.
-        // In this case there must be the same number of y data points as data points
-        // in the series and the bands will inherit the x values of the series.
-        //
-        // A 2 dimensional array like [[[xl1, yl1], [xl2, yl2], ...], [[xh1, yh1], [xh2, yh2], ...]]
-        // where [xl1, yl1] are x,y data points for the lower line and
-        // [xh1, yh1] are x,y data points for the high line.
-        // x values do not have to correspond to the x values of the series and can
-        // be of any arbitrary length.
-        //
-        // Can be of form [[yl1, yu1], [yl2, yu2], [yl3, yu3], ...] where
-        // there must be 3 or more arrays and there must be the same number of arrays
-        // as there are data points in the series.  In this case, 
-        // [yl1, yu1] specifies the lower and upper y values for the 1st
-        // data point and so on.  The bands will inherit the x
-        // values from the series.
-        this.renderer.bandData = [];
-
-        // Group: bands
-        // Banding around line, e.g error bands or confidence intervals.
-        this.renderer.bands = {
-            // prop: show
-            // true to show the bands.  If bandData or interval is
-            // supplied, show will be set to true by default.
-            show: false,
-            hiData: [],
-            lowData: [],
-            // prop: color
-            // color of lines at top and bottom of bands [default: series color].
-            color: this.color,
-            // prop: showLines
-            // True to show lines at top and bottom of bands [default: false].
-            showLines: false,
-            // prop: fill
-            // True to fill area between bands [default: true].
-            fill: true,
-            // prop: fillColor
-            // css color spec for filled area.  [default: series color].
-            fillColor: null,
-            _min: null,
-            _max: null,
-            // prop: interval
-            // User specified interval above and below line for bands [default: '3%''].
-            // Can be a value like 3 or a string like '3%' 
-            // or an upper/lower array like [1, -2] or ['2%', '-1.5%']
-            interval: '3%'
-        };
-
-
-        var lopts = {highlightMouseOver: options.highlightMouseOver, highlightMouseDown: options.highlightMouseDown, highlightColor: options.highlightColor};
-        
-        delete (options.highlightMouseOver);
-        delete (options.highlightMouseDown);
-        delete (options.highlightColor);
-        
-        $.extend(true, this.renderer, options);
-
-        this.renderer.options = options;
-
-        // if we are given some band data, and bands aren't explicity set to false in options, turn them on.
-        if (this.renderer.bandData.length > 1 && (!options.bands || options.bands.show == null)) {
-            this.renderer.bands.show = true;
-        }
-
-        // if we are given an interval, and bands aren't explicity set to false in options, turn them on.
-        else if (options.bands && options.bands.show == null && options.bands.interval != null) {
-            this.renderer.bands.show = true;
-        }
-
-        // if plot is filled, turn off bands.
-        if (this.fill) {
-            this.renderer.bands.show = false;
-        }
-
-        if (this.renderer.bands.show) {
-            this.renderer.initBands.call(this, this.renderer.options, plot);
-        }
-
-
-        // smoothing is not compatible with stacked lines, disable
-        if (this._stack) {
-            this.renderer.smooth = false;
-        }
-
-        // set the shape renderer options
-        var opts = {lineJoin:this.lineJoin, lineCap:this.lineCap, fill:this.fill, isarc:false, strokeStyle:this.color, fillStyle:this.fillColor, lineWidth:this.lineWidth, linePattern:this.linePattern, closePath:this.fill};
-        this.renderer.shapeRenderer.init(opts);
-
-        var shadow_offset = options.shadowOffset;
-        // set the shadow renderer options
-        if (shadow_offset == null) {
-            // scale the shadowOffset to the width of the line.
-            if (this.lineWidth > 2.5) {
-                shadow_offset = 1.25 * (1 + (Math.atan((this.lineWidth/2.5))/0.785398163 - 1)*0.6);
-                // var shadow_offset = this.shadowOffset;
-            }
-            // for skinny lines, don't make such a big shadow.
-            else {
-                shadow_offset = 1.25 * Math.atan((this.lineWidth/2.5))/0.785398163;
-            }
-        }
-        
-        var sopts = {lineJoin:this.lineJoin, lineCap:this.lineCap, fill:this.fill, isarc:false, angle:this.shadowAngle, offset:shadow_offset, alpha:this.shadowAlpha, depth:this.shadowDepth, lineWidth:this.lineWidth, linePattern:this.linePattern, closePath:this.fill};
-        this.renderer.shadowRenderer.init(sopts);
-        this._areaPoints = [];
-        this._boundingBox = [[],[]];
-        
-        if (!this.isTrendline && this.fill || this.renderer.bands.show) {
-            // Group: Properties
-            //        
-            // prop: highlightMouseOver
-            // True to highlight area on a filled plot when moused over.
-            // This must be false to enable highlightMouseDown to highlight when clicking on an area on a filled plot.
-            this.highlightMouseOver = true;
-            // prop: highlightMouseDown
-            // True to highlight when a mouse button is pressed over an area on a filled plot.
-            // This will be disabled if highlightMouseOver is true.
-            this.highlightMouseDown = false;
-            // prop: highlightColor
-            // color to use when highlighting an area on a filled plot.
-            this.highlightColor = null;
-            // if user has passed in highlightMouseDown option and not set highlightMouseOver, disable highlightMouseOver
-            if (lopts.highlightMouseDown && lopts.highlightMouseOver == null) {
-                lopts.highlightMouseOver = false;
-            }
-        
-            $.extend(true, this, {highlightMouseOver: lopts.highlightMouseOver, highlightMouseDown: lopts.highlightMouseDown, highlightColor: lopts.highlightColor});
-            
-            if (!this.highlightColor) {
-                var fc = (this.renderer.bands.show) ? this.renderer.bands.fillColor : this.fillColor;
-                this.highlightColor = $.jqplot.computeHighlightColors(fc);
-            }
-            // turn off (disable) the highlighter plugin
-            if (this.highlighter) {
-                this.highlighter.show = false;
-            }
-        }
-        
-        if (!this.isTrendline && plot) {
-            plot.plugins.lineRenderer = {};
-            plot.postInitHooks.addOnce(postInit);
-            plot.postDrawHooks.addOnce(postPlotDraw);
-            plot.eventListenerHooks.addOnce('jqplotMouseMove', handleMove);
-            plot.eventListenerHooks.addOnce('jqplotMouseDown', handleMouseDown);
-            plot.eventListenerHooks.addOnce('jqplotMouseUp', handleMouseUp);
-            plot.eventListenerHooks.addOnce('jqplotClick', handleClick);
-            plot.eventListenerHooks.addOnce('jqplotRightClick', handleRightClick);
-        }
-
-    };
-
-    $.jqplot.LineRenderer.prototype.initBands = function(options, plot) {
-        // use bandData if no data specified in bands option
-        //var bd = this.renderer.bandData;
-        var bd = options.bandData || [];
-        var bands = this.renderer.bands;
-        bands.hiData = [];
-        bands.lowData = [];
-        var data = this.data;
-        bands._max = null;
-        bands._min = null;
-        // If 2 arrays, and each array greater than 2 elements, assume it is hi and low data bands of y values.
-        if (bd.length == 2) {
-            // Do we have an array of x,y values?
-            // like [[[1,1], [2,4], [3,3]], [[1,3], [2,6], [3,5]]]
-            if ($.isArray(bd[0][0])) {
-                // since an arbitrary array of points, spin through all of them to determine max and min lines.
-
-                var p;
-                var bdminidx = 0, bdmaxidx = 0;
-                for (var i = 0, l = bd[0].length; i<l; i++) {
-                    p = bd[0][i];
-                    if ((p[1] != null && p[1] > bands._max) || bands._max == null) {
-                        bands._max = p[1];
-                    }
-                    if ((p[1] != null && p[1] < bands._min) || bands._min == null) {
-                        bands._min = p[1];
-                    }
-                }
-                for (var i = 0, l = bd[1].length; i<l; i++) {
-                    p = bd[1][i];
-                    if ((p[1] != null && p[1] > bands._max) || bands._max == null) {
-                        bands._max = p[1];
-                        bdmaxidx = 1;
-                    }
-                    if ((p[1] != null && p[1] < bands._min) || bands._min == null) {
-                        bands._min = p[1];
-                        bdminidx = 1;
-                    }
-                }
-
-                if (bdmaxidx === bdminidx) {
-                    bands.show = false;
-                }
-
-                bands.hiData = bd[bdmaxidx];
-                bands.lowData = bd[bdminidx];
-            }
-            // else data is arrays of y values
-            // like [[1,4,3], [3,6,5]]
-            // must have same number of band data points as points in series
-            else if (bd[0].length === data.length && bd[1].length === data.length) {
-                var hi = (bd[0][0] > bd[1][0]) ? 0 : 1;
-                var low = (hi) ? 0 : 1;
-                for (var i=0, l=data.length; i < l; i++) {
-                    bands.hiData.push([data[i][0], bd[hi][i]]);
-                    bands.lowData.push([data[i][0], bd[low][i]]);
-                }
-            }
-
-            // we don't have proper data array, don't show bands.
-            else {
-                bands.show = false;
-            }
-        }
-
-        // if more than 2 arrays, have arrays of [ylow, yhi] values.
-        // note, can't distinguish case of [[ylow, yhi], [ylow, yhi]] from [[ylow, ylow], [yhi, yhi]]
-        // this is assumed to be of the latter form.
-        else if (bd.length > 2 && !$.isArray(bd[0][0])) {
-            var hi = (bd[0][0] > bd[0][1]) ? 0 : 1;
-            var low = (hi) ? 0 : 1;
-            for (var i=0, l=bd.length; i<l; i++) {
-                bands.hiData.push([data[i][0], bd[i][hi]]);
-                bands.lowData.push([data[i][0], bd[i][low]]);
-            }
-        }
-
-        // don't have proper data, auto calculate
-        else {
-            var intrv = bands.interval;
-            var a = null;
-            var b = null;
-            var afunc = null;
-            var bfunc = null;
-
-            if ($.isArray(intrv)) {
-                a = intrv[0];
-                b = intrv[1];
-            }
-            else {
-                a = intrv;
-            }
-
-            if (isNaN(a)) {
-                // we have a string
-                if (a.charAt(a.length - 1) === '%') {
-                    afunc = 'multiply';
-                    a = parseFloat(a)/100 + 1;
-                }
-            }
-
-            else {
-                a = parseFloat(a);
-                afunc = 'add';
-            }
-
-            if (b !== null && isNaN(b)) {
-                // we have a string
-                if (b.charAt(b.length - 1) === '%') {
-                    bfunc = 'multiply';
-                    b = parseFloat(b)/100 + 1;
-                }
-            }
-
-            else if (b !== null) {
-                b = parseFloat(b);
-                bfunc = 'add';
-            }
-
-            if (a !== null) {
-                if (b === null) {
-                    b = -a;
-                    bfunc = afunc;
-                    if (bfunc === 'multiply') {
-                        b += 2;
-                    }
-                }
-
-                // make sure a always applies to hi band.
-                if (a < b) {
-                    var temp = a;
-                    a = b;
-                    b = temp;
-                    temp = afunc;
-                    afunc = bfunc;
-                    bfunc = temp;
-                }
-
-                for (var i=0, l = data.length; i < l; i++) {
-                    switch (afunc) {
-                        case 'add':
-                            bands.hiData.push([data[i][0], data[i][1] + a]);
-                            break;
-                        case 'multiply':
-                            bands.hiData.push([data[i][0], data[i][1] * a]);
-                            break;
-                    }
-                    switch (bfunc) {
-                        case 'add':
-                            bands.lowData.push([data[i][0], data[i][1] + b]);
-                            break;
-                        case 'multiply':
-                            bands.lowData.push([data[i][0], data[i][1] * b]);
-                            break;
-                    }
-                }
-            }
-
-            else {
-                bands.show = false;
-            }
-        }
-
-        var hd = bands.hiData;
-        var ld = bands.lowData;
-        for (var i = 0, l = hd.length; i<l; i++) {
-            if ((hd[i][1] != null && hd[i][1] > bands._max) || bands._max == null) {
-                bands._max = hd[i][1];
-            }
-        }
-        for (var i = 0, l = ld.length; i<l; i++) {
-            if ((ld[i][1] != null && ld[i][1] < bands._min) || bands._min == null) {
-                bands._min = ld[i][1];
-            }
-        }
-
-        // one last check for proper data
-        // these don't apply any more since allowing arbitrary x,y values
-        // if (bands.hiData.length != bands.lowData.length) {
-        //     bands.show = false;
-        // }
-
-        // if (bands.hiData.length != this.data.length) {
-        //     bands.show = false;
-        // }
-
-        if (bands.fillColor === null) {
-            var c = $.jqplot.getColorComponents(bands.color);
-            // now adjust alpha to differentiate fill
-            c[3] = c[3] * 0.5;
-            bands.fillColor = 'rgba(' + c[0] +', '+ c[1] +', '+ c[2] +', '+ c[3] + ')';
-        }
-    };
-
-    function getSteps (d, f) {
-        return (3.4182054+f) * Math.pow(d, -0.3534992);
-    }
-
-    function computeSteps (d1, d2) {
-        var s = Math.sqrt(Math.pow((d2[0]- d1[0]), 2) + Math.pow ((d2[1] - d1[1]), 2));
-        return 5.7648 * Math.log(s) + 7.4456;
-    }
-
-    function tanh (x) {
-        var a = (Math.exp(2*x) - 1) / (Math.exp(2*x) + 1);
-        return a;
-    }
-
-    //////////
-    // computeConstrainedSmoothedData
-    // An implementation of the constrained cubic spline interpolation
-    // method as presented in:
-    //
-    // Kruger, CJC, Constrained Cubic Spine Interpolation for Chemical Engineering Applications
-    // http://www.korf.co.uk/spline.pdf
-    //
-    // The implementation below borrows heavily from the sample Visual Basic
-    // implementation by CJC Kruger found in http://www.korf.co.uk/spline.xls
-    //
-    /////////
-
-    // called with scope of series
-    function computeConstrainedSmoothedData (gd) {
-        var smooth = this.renderer.smooth;
-        var dim = this.canvas.getWidth();
-        var xp = this._xaxis.series_p2u;
-        var yp = this._yaxis.series_p2u; 
-        var steps =null;
-        var _steps = null;
-        var dist = gd.length/dim;
-        var _smoothedData = [];
-        var _smoothedPlotData = [];
-
-        if (!isNaN(parseFloat(smooth))) {
-            steps = parseFloat(smooth);
-        }
-        else {
-            steps = getSteps(dist, 0.5);
-        }
-
-        var yy = [];
-        var xx = [];
-
-        for (var i=0, l = gd.length; i<l; i++) {
-            yy.push(gd[i][1]);
-            xx.push(gd[i][0]);
-        }
-
-        function dxx(x1, x0) {
-            if (x1 - x0 == 0) {
-                return Math.pow(10,10);
-            }
-            else {
-                return x1 - x0;
-            }
-        }
-
-        var A, B, C, D;
-        // loop through each line segment.  Have # points - 1 line segments.  Nmber segments starting at 1.
-        var nmax = gd.length - 1;
-        for (var num = 1, gdl = gd.length; num<gdl; num++) {
-            var gxx = [];
-            var ggxx = [];
-            // point at each end of segment.
-            for (var j = 0; j < 2; j++) {
-                var i = num - 1 + j; // point number, 0 to # points.
-
-                if (i == 0 || i == nmax) {
-                    gxx[j] = Math.pow(10, 10);
-                }
-                else if (yy[i+1] - yy[i] == 0 || yy[i] - yy[i-1] == 0) {
-                    gxx[j] = 0;
-                }
-                else if (((xx[i+1] - xx[i]) / (yy[i+1] - yy[i]) + (xx[i] - xx[i-1]) / (yy[i] - yy[i-1])) == 0 ) {
-                    gxx[j] = 0;
-                }
-                else if ( (yy[i+1] - yy[i]) * (yy[i] - yy[i-1]) < 0 ) {
-                    gxx[j] = 0;
-                }
-
-                else {
-                    gxx[j] = 2 / (dxx(xx[i + 1], xx[i]) / (yy[i + 1] - yy[i]) + dxx(xx[i], xx[i - 1]) / (yy[i] - yy[i - 1]));
-                }
-            }
-
-            // Reset first derivative (slope) at first and last point
-            if (num == 1) {
-                // First point has 0 2nd derivative
-                gxx[0] = 3 / 2 * (yy[1] - yy[0]) / dxx(xx[1], xx[0]) - gxx[1] / 2;
-            }
-            else if (num == nmax) {
-                // Last point has 0 2nd derivative
-                gxx[1] = 3 / 2 * (yy[nmax] - yy[nmax - 1]) / dxx(xx[nmax], xx[nmax - 1]) - gxx[0] / 2;
-            }   
-
-            // Calc second derivative at points
-            ggxx[0] = -2 * (gxx[1] + 2 * gxx[0]) / dxx(xx[num], xx[num - 1]) + 6 * (yy[num] - yy[num - 1]) / Math.pow(dxx(xx[num], xx[num - 1]), 2);
-            ggxx[1] = 2 * (2 * gxx[1] + gxx[0]) / dxx(xx[num], xx[num - 1]) - 6 * (yy[num] - yy[num - 1]) / Math.pow(dxx(xx[num], xx[num - 1]), 2);
-
-            // Calc constants for cubic interpolation
-            D = 1 / 6 * (ggxx[1] - ggxx[0]) / dxx(xx[num], xx[num - 1]);
-            C = 1 / 2 * (xx[num] * ggxx[0] - xx[num - 1] * ggxx[1]) / dxx(xx[num], xx[num - 1]);
-            B = (yy[num] - yy[num - 1] - C * (Math.pow(xx[num], 2) - Math.pow(xx[num - 1], 2)) - D * (Math.pow(xx[num], 3) - Math.pow(xx[num - 1], 3))) / dxx(xx[num], xx[num - 1]);
-            A = yy[num - 1] - B * xx[num - 1] - C * Math.pow(xx[num - 1], 2) - D * Math.pow(xx[num - 1], 3);
-
-            var increment = (xx[num] - xx[num - 1]) / steps;
-            var temp, tempx;
-
-            for (var j = 0, l = steps; j < l; j++) {
-                temp = [];
-                tempx = xx[num - 1] + j * increment;
-                temp.push(tempx);
-                temp.push(A + B * tempx + C * Math.pow(tempx, 2) + D * Math.pow(tempx, 3));
-                _smoothedData.push(temp);
-                _smoothedPlotData.push([xp(temp[0]), yp(temp[1])]);
-            }
-        }
-
-        _smoothedData.push(gd[i]);
-        _smoothedPlotData.push([xp(gd[i][0]), yp(gd[i][1])]);
-
-        return [_smoothedData, _smoothedPlotData];
-    }
-
-    ///////
-    // computeHermiteSmoothedData
-    // A hermite spline smoothing of the plot data.
-    // This implementation is derived from the one posted
-    // by krypin on the jqplot-users mailing list:
-    //
-    // http://groups.google.com/group/jqplot-users/browse_thread/thread/748be6a445723cea?pli=1
-    //
-    // with a blog post:
-    //
-    // http://blog.statscollector.com/a-plugin-renderer-for-jqplot-to-draw-a-hermite-spline/
-    //
-    // and download of the original plugin:
-    //
-    // http://blog.statscollector.com/wp-content/uploads/2010/02/jqplot.hermiteSplineRenderer.js
-    //////////
-
-    // called with scope of series
-    function computeHermiteSmoothedData (gd) {
-        var smooth = this.renderer.smooth;
-        var tension = this.renderer.tension;
-        var dim = this.canvas.getWidth();
-        var xp = this._xaxis.series_p2u;
-        var yp = this._yaxis.series_p2u; 
-        var steps =null;
-        var _steps = null;
-        var a = null;
-        var a1 = null;
-        var a2 = null;
-        var slope = null;
-        var slope2 = null;
-        var temp = null;
-        var t, s, h1, h2, h3, h4;
-        var TiX, TiY, Ti1X, Ti1Y;
-        var pX, pY, p;
-        var sd = [];
-        var spd = [];
-        var dist = gd.length/dim;
-        var min, max, stretch, scale, shift;
-        var _smoothedData = [];
-        var _smoothedPlotData = [];
-        if (!isNaN(parseFloat(smooth))) {
-            steps = parseFloat(smooth);
-        }
-        else {
-            steps = getSteps(dist, 0.5);
-        }
-        if (!isNaN(parseFloat(tension))) {
-            tension = parseFloat(tension);
-        }
-
-        for (var i=0, l = gd.length-1; i < l; i++) {
-
-            if (tension === null) {
-                slope = Math.abs((gd[i+1][1] - gd[i][1]) / (gd[i+1][0] - gd[i][0]));
-
-                min = 0.3;
-                max = 0.6;
-                stretch = (max - min)/2.0;
-                scale = 2.5;
-                shift = -1.4;
-
-                temp = slope/scale + shift;
-
-                a1 = stretch * tanh(temp) - stretch * tanh(shift) + min;
-
-                // if have both left and right line segments, will use  minimum tension. 
-                if (i > 0) {
-                    slope2 = Math.abs((gd[i][1] - gd[i-1][1]) / (gd[i][0] - gd[i-1][0]));
-                }
-                temp = slope2/scale + shift;
-
-                a2 = stretch * tanh(temp) - stretch * tanh(shift) + min;
-
-                a = (a1 + a2)/2.0;
-
-            }
-            else {
-                a = tension;
-            }
-            for (t=0; t < steps; t++) {
-                s = t / steps;
-                h1 = (1 + 2*s)*Math.pow((1-s),2);
-                h2 = s*Math.pow((1-s),2);
-                h3 = Math.pow(s,2)*(3-2*s);
-                h4 = Math.pow(s,2)*(s-1);     
-                
-                if (gd[i-1]) {  
-                    TiX = a * (gd[i+1][0] - gd[i-1][0]); 
-                    TiY = a * (gd[i+1][1] - gd[i-1][1]);
-                } else {
-                    TiX = a * (gd[i+1][0] - gd[i][0]); 
-                    TiY = a * (gd[i+1][1] - gd[i][1]);                                  
-                }
-                if (gd[i+2]) {  
-                    Ti1X = a * (gd[i+2][0] - gd[i][0]); 
-                    Ti1Y = a * (gd[i+2][1] - gd[i][1]);
-                } else {
-                    Ti1X = a * (gd[i+1][0] - gd[i][0]); 
-                    Ti1Y = a * (gd[i+1][1] - gd[i][1]);                                 
-                }
-                
-                pX = h1*gd[i][0] + h3*gd[i+1][0] + h2*TiX + h4*Ti1X;
-                pY = h1*gd[i][1] + h3*gd[i+1][1] + h2*TiY + h4*Ti1Y;
-                p = [pX, pY];
-
-                _smoothedData.push(p);
-                _smoothedPlotData.push([xp(pX), yp(pY)]);
-            }
-        }
-        _smoothedData.push(gd[l]);
-        _smoothedPlotData.push([xp(gd[l][0]), yp(gd[l][1])]);
-
-        return [_smoothedData, _smoothedPlotData];
-    }
-    
-    // setGridData
-    // converts the user data values to grid coordinates and stores them
-    // in the gridData array.
-    // Called with scope of a series.
-    $.jqplot.LineRenderer.prototype.setGridData = function(plot) {
-        // recalculate the grid data
-        var xp = this._xaxis.series_u2p;
-        var yp = this._yaxis.series_u2p;
-        var data = this._plotData;
-        var pdata = this._prevPlotData;
-        this.gridData = [];
-        this._prevGridData = [];
-        this.renderer._smoothedData = [];
-        this.renderer._smoothedPlotData = [];
-        this.renderer._hiBandGridData = [];
-        this.renderer._lowBandGridData = [];
-        this.renderer._hiBandSmoothedData = [];
-        this.renderer._lowBandSmoothedData = [];
-        var bands = this.renderer.bands;
-        var hasNull = false;
-        for (var i=0, l=data.length; i < l; i++) {
-            // if not a line series or if no nulls in data, push the converted point onto the array.
-            if (data[i][0] != null && data[i][1] != null) {
-                this.gridData.push([xp.call(this._xaxis, data[i][0]), yp.call(this._yaxis, data[i][1])]);
-            }
-            // else if there is a null, preserve it.
-            else if (data[i][0] == null) {
-                hasNull = true;
-                this.gridData.push([null, yp.call(this._yaxis, data[i][1])]);
-            }
-            else if (data[i][1] == null) {
-                hasNull = true;
-                this.gridData.push([xp.call(this._xaxis, data[i][0]), null]);
-            }
-            // if not a line series or if no nulls in data, push the converted point onto the array.
-            if (pdata[i] != null && pdata[i][0] != null && pdata[i][1] != null) {
-                this._prevGridData.push([xp.call(this._xaxis, pdata[i][0]), yp.call(this._yaxis, pdata[i][1])]);
-            }
-            // else if there is a null, preserve it.
-            else if (pdata[i] != null && pdata[i][0] == null) {
-                this._prevGridData.push([null, yp.call(this._yaxis, pdata[i][1])]);
-            }  
-            else if (pdata[i] != null && pdata[i][0] != null && pdata[i][1] == null) {
-                this._prevGridData.push([xp.call(this._xaxis, pdata[i][0]), null]);
-            }
-        }
-
-        // don't do smoothing or bands on broken lines.
-        if (hasNull) {
-            this.renderer.smooth = false;
-            if (this._type === 'line') {
-                bands.show = false;
-            }
-        }
-
-        if (this._type === 'line' && bands.show) {
-            for (var i=0, l=bands.hiData.length; i<l; i++) {
-                this.renderer._hiBandGridData.push([xp.call(this._xaxis, bands.hiData[i][0]), yp.call(this._yaxis, bands.hiData[i][1])]);
-            }
-            for (var i=0, l=bands.lowData.length; i<l; i++) {
-                this.renderer._lowBandGridData.push([xp.call(this._xaxis, bands.lowData[i][0]), yp.call(this._yaxis, bands.lowData[i][1])]);
-            }
-        }
-
-        // calculate smoothed data if enough points and no nulls
-        if (this._type === 'line' && this.renderer.smooth && this.gridData.length > 2) {
-            var ret;
-            if (this.renderer.constrainSmoothing) {
-                ret = computeConstrainedSmoothedData.call(this, this.gridData);
-                this.renderer._smoothedData = ret[0];
-                this.renderer._smoothedPlotData = ret[1];
-
-                if (bands.show) {
-                    ret = computeConstrainedSmoothedData.call(this, this.renderer._hiBandGridData);
-                    this.renderer._hiBandSmoothedData = ret[0];
-                    ret = computeConstrainedSmoothedData.call(this, this.renderer._lowBandGridData);
-                    this.renderer._lowBandSmoothedData = ret[0];
-                }
-
-                ret = null;
-            }
-            else {
-                ret = computeHermiteSmoothedData.call(this, this.gridData);
-                this.renderer._smoothedData = ret[0];
-                this.renderer._smoothedPlotData = ret[1];
-
-                if (bands.show) {
-                    ret = computeHermiteSmoothedData.call(this, this.renderer._hiBandGridData);
-                    this.renderer._hiBandSmoothedData = ret[0];
-                    ret = computeHermiteSmoothedData.call(this, this.renderer._lowBandGridData);
-                    this.renderer._lowBandSmoothedData = ret[0];
-                }
-
-                ret = null;
-            }
-        }
-    };
-    
-    // makeGridData
-    // converts any arbitrary data values to grid coordinates and
-    // returns them.  This method exists so that plugins can use a series'
-    // linerenderer to generate grid data points without overwriting the
-    // grid data associated with that series.
-    // Called with scope of a series.
-    $.jqplot.LineRenderer.prototype.makeGridData = function(data, plot) {
-        // recalculate the grid data
-        var xp = this._xaxis.series_u2p;
-        var yp = this._yaxis.series_u2p;
-        var gd = [];
-        var pgd = [];
-        this.renderer._smoothedData = [];
-        this.renderer._smoothedPlotData = [];
-        this.renderer._hiBandGridData = [];
-        this.renderer._lowBandGridData = [];
-        this.renderer._hiBandSmoothedData = [];
-        this.renderer._lowBandSmoothedData = [];
-        var bands = this.renderer.bands;
-        var hasNull = false;
-        for (var i=0; i<data.length; i++) {
-            // if not a line series or if no nulls in data, push the converted point onto the array.
-            if (data[i][0] != null && data[i][1] != null) {
-                gd.push([xp.call(this._xaxis, data[i][0]), yp.call(this._yaxis, data[i][1])]);
-            }
-            // else if there is a null, preserve it.
-            else if (data[i][0] == null) {
-                hasNull = true;
-                gd.push([null, yp.call(this._yaxis, data[i][1])]);
-            }
-            else if (data[i][1] == null) {
-                hasNull = true;
-                gd.push([xp.call(this._xaxis, data[i][0]), null]);
-            }
-        }
-
-        // don't do smoothing or bands on broken lines.
-        if (hasNull) {
-            this.renderer.smooth = false;
-            if (this._type === 'line') {
-                bands.show = false;
-            }
-        }
-
-        if (this._type === 'line' && bands.show) {
-            for (var i=0, l=bands.hiData.length; i<l; i++) {
-                this.renderer._hiBandGridData.push([xp.call(this._xaxis, bands.hiData[i][0]), yp.call(this._yaxis, bands.hiData[i][1])]);
-            }
-            for (var i=0, l=bands.lowData.length; i<l; i++) {
-                this.renderer._lowBandGridData.push([xp.call(this._xaxis, bands.lowData[i][0]), yp.call(this._yaxis, bands.lowData[i][1])]);
-            }
-        }
-
-        if (this._type === 'line' && this.renderer.smooth && gd.length > 2) {
-            var ret;
-            if (this.renderer.constrainSmoothing) {
-                ret = computeConstrainedSmoothedData.call(this, gd);
-                this.renderer._smoothedData = ret[0];
-                this.renderer._smoothedPlotData = ret[1];
-
-                if (bands.show) {
-                    ret = computeConstrainedSmoothedData.call(this, this.renderer._hiBandGridData);
-                    this.renderer._hiBandSmoothedData = ret[0];
-                    ret = computeConstrainedSmoothedData.call(this, this.renderer._lowBandGridData);
-                    this.renderer._lowBandSmoothedData = ret[0];
-                }
-
-                ret = null;
-            }
-            else {
-                ret = computeHermiteSmoothedData.call(this, gd);
-                this.renderer._smoothedData = ret[0];
-                this.renderer._smoothedPlotData = ret[1];
-
-                if (bands.show) {
-                    ret = computeHermiteSmoothedData.call(this, this.renderer._hiBandGridData);
-                    this.renderer._hiBandSmoothedData = ret[0];
-                    ret = computeHermiteSmoothedData.call(this, this.renderer._lowBandGridData);
-                    this.renderer._lowBandSmoothedData = ret[0];
-                }
-
-                ret = null;
-            }
-        }
-        return gd;
-    };
-    
-
-    // called within scope of series.
-    $.jqplot.LineRenderer.prototype.draw = function(ctx, gd, options, plot) {
-        var i;
-        // get a copy of the options, so we don't modify the original object.
-        var opts = $.extend(true, {}, options);
-        var shadow = (opts.shadow != undefined) ? opts.shadow : this.shadow;
-        var showLine = (opts.showLine != undefined) ? opts.showLine : this.showLine;
-        var fill = (opts.fill != undefined) ? opts.fill : this.fill;
-        var fillAndStroke = (opts.fillAndStroke != undefined) ? opts.fillAndStroke : this.fillAndStroke;
-        var xmin, ymin, xmax, ymax;
-        ctx.save();
-        if (gd.length) {
-            if (showLine) {
-                // if we fill, we'll have to add points to close the curve.
-                if (fill) {
-                    if (this.fillToZero) { 
-                        // have to break line up into shapes at axis crossings
-                        var negativeColor = this.negativeColor;
-                        if (! this.useNegativeColors) {
-                            negativeColor = opts.fillStyle;
-                        }
-                        var isnegative = false;
-                        var posfs = opts.fillStyle;
-                    
-                        // if stoking line as well as filling, get a copy of line data.
-                        if (fillAndStroke) {
-                            var fasgd = gd.slice(0);
-                        }
-                        // if not stacked, fill down to axis
-                        if (this.index == 0 || !this._stack) {
-                        
-                            var tempgd = [];
-                            var pd = (this.renderer.smooth) ? this.renderer._smoothedPlotData : this._plotData;
-                            this._areaPoints = [];
-                            var pyzero = this._yaxis.series_u2p(this.fillToValue);
-                            var pxzero = this._xaxis.series_u2p(this.fillToValue);
-
-                            opts.closePath = true;
-                            
-                            if (this.fillAxis == 'y') {
-                                tempgd.push([gd[0][0], pyzero]);
-                                this._areaPoints.push([gd[0][0], pyzero]);
-                                
-                                for (var i=0; i<gd.length-1; i++) {
-                                    tempgd.push(gd[i]);
-                                    this._areaPoints.push(gd[i]);
-                                    // do we have an axis crossing?
-                                    if (pd[i][1] * pd[i+1][1] <= 0) {
-                                        if (pd[i][1] < 0) {
-                                            isnegative = true;
-                                            opts.fillStyle = negativeColor;
-                                        }
-                                        else {
-                                            isnegative = false;
-                                            opts.fillStyle = posfs;
-                                        }
-                                        
-                                        var xintercept = gd[i][0] + (gd[i+1][0] - gd[i][0]) * (pyzero-gd[i][1])/(gd[i+1][1] - gd[i][1]);
-                                        tempgd.push([xintercept, pyzero]);
-                                        this._areaPoints.push([xintercept, pyzero]);
-                                        // now draw this shape and shadow.
-                                        if (shadow) {
-                                            this.renderer.shadowRenderer.draw(ctx, tempgd, opts);
-                                        }
-                                        this.renderer.shapeRenderer.draw(ctx, tempgd, opts);
-                                        // now empty temp array and continue
-                                        tempgd = [[xintercept, pyzero]];
-                                        // this._areaPoints = [[xintercept, pyzero]];
-                                    }   
-                                }
-                                if (pd[gd.length-1][1] < 0) {
-                                    isnegative = true;
-                                    opts.fillStyle = negativeColor;
-                                }
-                                else {
-                                    isnegative = false;
-                                    opts.fillStyle = posfs;
-                                }
-                                tempgd.push(gd[gd.length-1]);
-                                this._areaPoints.push(gd[gd.length-1]);
-                                tempgd.push([gd[gd.length-1][0], pyzero]); 
-                                this._areaPoints.push([gd[gd.length-1][0], pyzero]); 
-                            }
-                            // now draw the last area.
-                            if (shadow) {
-                                this.renderer.shadowRenderer.draw(ctx, tempgd, opts);
-                            }
-                            this.renderer.shapeRenderer.draw(ctx, tempgd, opts);
-                            
-                            
-                            // var gridymin = this._yaxis.series_u2p(0);
-                            // // IE doesn't return new length on unshift
-                            // gd.unshift([gd[0][0], gridymin]);
-                            // len = gd.length;
-                            // gd.push([gd[len - 1][0], gridymin]);                   
-                        }
-                        // if stacked, fill to line below 
-                        else {
-                            var prev = this._prevGridData;
-                            for (var i=prev.length; i>0; i--) {
-                                gd.push(prev[i-1]);
-                                // this._areaPoints.push(prev[i-1]);
-                            }
-                            if (shadow) {
-                                this.renderer.shadowRenderer.draw(ctx, gd, opts);
-                            }
-                            this._areaPoints = gd;
-                            this.renderer.shapeRenderer.draw(ctx, gd, opts);
-                        }
-                    }
-                    /////////////////////////
-                    // Not filled to zero
-                    ////////////////////////
-                    else {                    
-                        // if stoking line as well as filling, get a copy of line data.
-                        if (fillAndStroke) {
-                            var fasgd = gd.slice(0);
-                        }
-                        // if not stacked, fill down to axis
-                        if (this.index == 0 || !this._stack) {
-                            // var gridymin = this._yaxis.series_u2p(this._yaxis.min) - this.gridBorderWidth / 2;
-                            var gridymin = ctx.canvas.height;
-                            // IE doesn't return new length on unshift
-                            gd.unshift([gd[0][0], gridymin]);
-                            var len = gd.length;
-                            gd.push([gd[len - 1][0], gridymin]);                   
-                        }
-                        // if stacked, fill to line below 
-                        else {
-                            var prev = this._prevGridData;
-                            for (var i=prev.length; i>0; i--) {
-                                gd.push(prev[i-1]);
-                            }
-                        }
-                        this._areaPoints = gd;
-                        
-                        if (shadow) {
-                            this.renderer.shadowRenderer.draw(ctx, gd, opts);
-                        }
-            
-                        this.renderer.shapeRenderer.draw(ctx, gd, opts);                        
-                    }
-                    if (fillAndStroke) {
-                        var fasopts = $.extend(true, {}, opts, {fill:false, closePath:false});
-                        this.renderer.shapeRenderer.draw(ctx, fasgd, fasopts);
-                        //////////
-                        // TODO: figure out some way to do shadows nicely
-                        // if (shadow) {
-                        //     this.renderer.shadowRenderer.draw(ctx, fasgd, fasopts);
-                        // }
-                        // now draw the markers
-                        if (this.markerRenderer.show) {
-                            if (this.renderer.smooth) {
-                                fasgd = this.gridData;
-                            }
-                            for (i=0; i<fasgd.length; i++) {
-                                this.markerRenderer.draw(fasgd[i][0], fasgd[i][1], ctx, opts.markerOptions);
-                            }
-                        }
-                    }
-                }
-                else {
-
-                    if (this.renderer.bands.show) {
-                        var bdat;
-                        var bopts = $.extend(true, {}, opts);
-                        if (this.renderer.bands.showLines) {
-                            bdat = (this.renderer.smooth) ? this.renderer._hiBandSmoothedData : this.renderer._hiBandGridData;
-                            this.renderer.shapeRenderer.draw(ctx, bdat, opts);
-                            bdat = (this.renderer.smooth) ? this.renderer._lowBandSmoothedData : this.renderer._lowBandGridData;
-                            this.renderer.shapeRenderer.draw(ctx, bdat, bopts);
-                        }
-
-                        if (this.renderer.bands.fill) {
-                            if (this.renderer.smooth) {
-                                bdat = this.renderer._hiBandSmoothedData.concat(this.renderer._lowBandSmoothedData.reverse());
-                            }
-                            else {
-                                bdat = this.renderer._hiBandGridData.concat(this.renderer._lowBandGridData.reverse());
-                            }
-                            this._areaPoints = bdat;
-                            bopts.closePath = true;
-                            bopts.fill = true;
-                            bopts.fillStyle = this.renderer.bands.fillColor;
-                            this.renderer.shapeRenderer.draw(ctx, bdat, bopts);
-                        }
-                    }
-
-                    if (shadow) {
-                        this.renderer.shadowRenderer.draw(ctx, gd, opts);
-                    }
-    
-                    this.renderer.shapeRenderer.draw(ctx, gd, opts);
-                }
-            }
-            // calculate the bounding box
-            var xmin = xmax = ymin = ymax = null;
-            for (i=0; i<this._areaPoints.length; i++) {
-                var p = this._areaPoints[i];
-                if (xmin > p[0] || xmin == null) {
-                    xmin = p[0];
-                }
-                if (ymax < p[1] || ymax == null) {
-                    ymax = p[1];
-                }
-                if (xmax < p[0] || xmax == null) {
-                    xmax = p[0];
-                }
-                if (ymin > p[1] || ymin == null) {
-                    ymin = p[1];
-                }
-            }
-
-            if (this.type === 'line' && this.renderer.bands.show) {
-                ymax = this._yaxis.series_u2p(this.renderer.bands._min);
-                ymin = this._yaxis.series_u2p(this.renderer.bands._max);
-            }
-
-            this._boundingBox = [[xmin, ymax], [xmax, ymin]];
-        
-            // now draw the markers
-            if (this.markerRenderer.show && !fill) {
-                if (this.renderer.smooth) {
-                    gd = this.gridData;
-                }
-                for (i=0; i<gd.length; i++) {
-                    if (gd[i][0] != null && gd[i][1] != null) {
-                        this.markerRenderer.draw(gd[i][0], gd[i][1], ctx, opts.markerOptions);
-                    }
-                }
-            }
-        }
-        
-        ctx.restore();
-    };  
-    
-    $.jqplot.LineRenderer.prototype.drawShadow = function(ctx, gd, options) {
-        // This is a no-op, shadows drawn with lines.
-    };
-    
-    // called with scope of plot.
-    // make sure to not leave anything highlighted.
-    function postInit(target, data, options) {
-        for (var i=0; i<this.series.length; i++) {
-            if (this.series[i].renderer.constructor == $.jqplot.LineRenderer) {
-                // don't allow mouseover and mousedown at same time.
-                if (this.series[i].highlightMouseOver) {
-                    this.series[i].highlightMouseDown = false;
-                }
-            }
-        }
-    }  
-    
-    // called within context of plot
-    // create a canvas which we can draw on.
-    // insert it before the eventCanvas, so eventCanvas will still capture events.
-    function postPlotDraw() {
-        // Memory Leaks patch    
-        if (this.plugins.lineRenderer && this.plugins.lineRenderer.highlightCanvas) {
-          this.plugins.lineRenderer.highlightCanvas.resetCanvas();
-          this.plugins.lineRenderer.highlightCanvas = null;
-        }
-        
-        this.plugins.lineRenderer.highlightedSeriesIndex = null;
-        this.plugins.lineRenderer.highlightCanvas = new $.jqplot.GenericCanvas();
-        
-        this.eventCanvas._elem.before(this.plugins.lineRenderer.highlightCanvas.createElement(this._gridPadding, 'jqplot-lineRenderer-highlight-canvas', this._plotDimensions, this));
-        this.plugins.lineRenderer.highlightCanvas.setContext();
-        this.eventCanvas._elem.bind('mouseleave', {plot:this}, function (ev) { unhighlight(ev.data.plot); });
-    } 
-    
-    function highlight (plot, sidx, pidx, points) {
-        var s = plot.series[sidx];
-        var canvas = plot.plugins.lineRenderer.highlightCanvas;
-        canvas._ctx.clearRect(0,0,canvas._ctx.canvas.width, canvas._ctx.canvas.height);
-        s._highlightedPoint = pidx;
-        plot.plugins.lineRenderer.highlightedSeriesIndex = sidx;
-        var opts = {fillStyle: s.highlightColor};
-        if (s.type === 'line' && s.renderer.bands.show) {
-            opts.fill = true;
-            opts.closePath = true;
-        }
-        s.renderer.shapeRenderer.draw(canvas._ctx, points, opts);
-        canvas = null;
-    }
-    
-    function unhighlight (plot) {
-        var canvas = plot.plugins.lineRenderer.highlightCanvas;
-        canvas._ctx.clearRect(0,0, canvas._ctx.canvas.width, canvas._ctx.canvas.height);
-        for (var i=0; i<plot.series.length; i++) {
-            plot.series[i]._highlightedPoint = null;
-        }
-        plot.plugins.lineRenderer.highlightedSeriesIndex = null;
-        plot.target.trigger('jqplotDataUnhighlight');
-        canvas = null;
-    }
-    
-    
-    function handleMove(ev, gridpos, datapos, neighbor, plot) {
-        if (neighbor) {
-            var ins = [neighbor.seriesIndex, neighbor.pointIndex, neighbor.data];
-            var evt1 = jQuery.Event('jqplotDataMouseOver');
-            evt1.pageX = ev.pageX;
-            evt1.pageY = ev.pageY;
-            plot.target.trigger(evt1, ins);
-            if (plot.series[ins[0]].highlightMouseOver && !(ins[0] == plot.plugins.lineRenderer.highlightedSeriesIndex)) {
-                var evt = jQuery.Event('jqplotDataHighlight');
-                evt.which = ev.which;
-                evt.pageX = ev.pageX;
-                evt.pageY = ev.pageY;
-                plot.target.trigger(evt, ins);
-                highlight (plot, neighbor.seriesIndex, neighbor.pointIndex, neighbor.points);
-            }
-        }
-        else if (neighbor == null) {
-            unhighlight (plot);
-        }
-    }
-    
-    function handleMouseDown(ev, gridpos, datapos, neighbor, plot) {
-        if (neighbor) {
-            var ins = [neighbor.seriesIndex, neighbor.pointIndex, neighbor.data];
-            if (plot.series[ins[0]].highlightMouseDown && !(ins[0] == plot.plugins.lineRenderer.highlightedSeriesIndex)) {
-                var evt = jQuery.Event('jqplotDataHighlight');
-                evt.which = ev.which;
-                evt.pageX = ev.pageX;
-                evt.pageY = ev.pageY;
-                plot.target.trigger(evt, ins);
-                highlight (plot, neighbor.seriesIndex, neighbor.pointIndex, neighbor.points);
-            }
-        }
-        else if (neighbor == null) {
-            unhighlight (plot);
-        }
-    }
-    
-    function handleMouseUp(ev, gridpos, datapos, neighbor, plot) {
-        var idx = plot.plugins.lineRenderer.highlightedSeriesIndex;
-        if (idx != null && plot.series[idx].highlightMouseDown) {
-            unhighlight(plot);
-        }
-    }
-    
-    function handleClick(ev, gridpos, datapos, neighbor, plot) {
-        if (neighbor) {
-            var ins = [neighbor.seriesIndex, neighbor.pointIndex, neighbor.data];
-            var evt = jQuery.Event('jqplotDataClick');
-            evt.which = ev.which;
-            evt.pageX = ev.pageX;
-            evt.pageY = ev.pageY;
-            plot.target.trigger(evt, ins);
-        }
-    }
-    
-    function handleRightClick(ev, gridpos, datapos, neighbor, plot) {
-        if (neighbor) {
-            var ins = [neighbor.seriesIndex, neighbor.pointIndex, neighbor.data];
-            var idx = plot.plugins.lineRenderer.highlightedSeriesIndex;
-            if (idx != null && plot.series[idx].highlightMouseDown) {
-                unhighlight(plot);
-            }
-            var evt = jQuery.Event('jqplotDataRightClick');
-            evt.which = ev.which;
-            evt.pageX = ev.pageX;
-            evt.pageY = ev.pageY;
-            plot.target.trigger(evt, ins);
-        }
-    }
-    
-    
-    // class: $.jqplot.LinearAxisRenderer
-    // The default jqPlot axis renderer, creating a numeric axis.
-    $.jqplot.LinearAxisRenderer = function() {
-    };
-    
-    // called with scope of axis object.
-    $.jqplot.LinearAxisRenderer.prototype.init = function(options){
-        // prop: breakPoints
-        // EXPERIMENTAL!! Use at your own risk!
-        // Works only with linear axes and the default tick renderer.
-        // Array of [start, stop] points to create a broken axis.
-        // Broken axes have a "jump" in them, which is an immediate 
-        // transition from a smaller value to a larger value.
-        // Currently, axis ticks MUST be manually assigned if using breakPoints
-        // by using the axis ticks array option.
-        this.breakPoints = null;
-        // prop: breakTickLabel
-        // Label to use at the axis break if breakPoints are specified.
-        this.breakTickLabel = "&asymp;";
-        // prop: drawBaseline
-        // True to draw the axis baseline.
-        this.drawBaseline = true;
-        // prop: baselineWidth
-        // width of the baseline in pixels.
-        this.baselineWidth = null;
-        // prop: baselineColor
-        // CSS color spec for the baseline.
-        this.baselineColor = null;
-        // prop: forceTickAt0
-        // This will ensure that there is always a tick mark at 0.
-        // If data range is strictly positive or negative,
-        // this will force 0 to be inside the axis bounds unless
-        // the appropriate axis pad (pad, padMin or padMax) is set
-        // to 0, then this will force an axis min or max value at 0.
-        // This has know effect when any of the following options
-        // are set:  autoscale, min, max, numberTicks or tickInterval.
-        this.forceTickAt0 = false;
-        // prop: forceTickAt100
-        // This will ensure that there is always a tick mark at 100.
-        // If data range is strictly above or below 100,
-        // this will force 100 to be inside the axis bounds unless
-        // the appropriate axis pad (pad, padMin or padMax) is set
-        // to 0, then this will force an axis min or max value at 100.
-        // This has know effect when any of the following options
-        // are set:  autoscale, min, max, numberTicks or tickInterval.
-        this.forceTickAt100 = false;
-        // prop: tickInset
-        // Controls the amount to inset the first and last ticks from 
-        // the edges of the grid, in multiples of the tick interval.
-        // 0 is no inset, 0.5 is one half a tick interval, 1 is a full
-        // tick interval, etc.
-        this.tickInset = 0;
-        // prop: minorTicks
-        // Number of ticks to add between "major" ticks.
-        // Major ticks are ticks supplied by user or auto computed.
-        // Minor ticks cannot be created by user.
-        this.minorTicks = 0;
-        // prop: alignTicks
-        // true to align tick marks across opposed axes
-        // such as from the y2axis to yaxis.
-        this.alignTicks = false;
-        this._autoFormatString = '';
-        this._overrideFormatString = false;
-        this._scalefact = 1.0;
-        $.extend(true, this, options);
-        if (this.breakPoints) {
-            if (!$.isArray(this.breakPoints)) {
-                this.breakPoints = null;
-            }
-            else if (this.breakPoints.length < 2 || this.breakPoints[1] <= this.breakPoints[0]) {
-                this.breakPoints = null;
-            }
-        }
-        if (this.numberTicks != null && this.numberTicks < 2) {
-            this.numberTicks = 2;
-        }
-        this.resetDataBounds();
-    };
-    
-    // called with scope of axis
-    $.jqplot.LinearAxisRenderer.prototype.draw = function(ctx, plot) {
-        if (this.show) {
-            // populate the axis label and value properties.
-            // createTicks is a method on the renderer, but
-            // call it within the scope of the axis.
-            this.renderer.createTicks.call(this, plot);
-            // fill a div with axes labels in the right direction.
-            // Need to pregenerate each axis to get its bounds and
-            // position it and the labels correctly on the plot.
-            var dim=0;
-            var temp;
-            // Added for theming.
-            if (this._elem) {
-                // Memory Leaks patch
-                //this._elem.empty();
-                this._elem.emptyForce();
-                this._elem = null;
-            }
-            
-            this._elem = $(document.createElement('div'));
-            this._elem.addClass('jqplot-axis jqplot-'+this.name);
-            this._elem.css('position', 'absolute');
-
-            
-            if (this.name == 'xaxis' || this.name == 'x2axis') {
-                this._elem.width(this._plotDimensions.width);
-            }
-            else {
-                this._elem.height(this._plotDimensions.height);
-            }
-            
-            // create a _label object.
-            this.labelOptions.axis = this.name;
-            this._label = new this.labelRenderer(this.labelOptions);
-            if (this._label.show) {
-                var elem = this._label.draw(ctx, plot);
-                elem.appendTo(this._elem);
-                elem = null;
-            }
-    
-            var t = this._ticks;
-            var tick;
-            for (var i=0; i<t.length; i++) {
-                tick = t[i];
-                if (tick.show && tick.showLabel && (!tick.isMinorTick || this.showMinorTicks)) {
-                    this._elem.append(tick.draw(ctx, plot));
-                }
-            }
-            tick = null;
-            t = null;
-        }
-        return this._elem;
-    };
-    
-    // called with scope of an axis
-    $.jqplot.LinearAxisRenderer.prototype.reset = function() {
-        this.min = this._options.min;
-        this.max = this._options.max;
-        this.tickInterval = this._options.tickInterval;
-        this.numberTicks = this._options.numberTicks;
-        this._autoFormatString = '';
-        if (this._overrideFormatString && this.tickOptions && this.tickOptions.formatString) {
-            this.tickOptions.formatString = '';
-        }
-
-        // this._ticks = this.__ticks;
-    };
-    
-    // called with scope of axis
-    $.jqplot.LinearAxisRenderer.prototype.set = function() { 
-        var dim = 0;
-        var temp;
-        var w = 0;
-        var h = 0;
-        var lshow = (this._label == null) ? false : this._label.show;
-        if (this.show) {
-            var t = this._ticks;
-            var tick;
-            for (var i=0; i<t.length; i++) {
-                tick = t[i];
-                if (!tick._breakTick && tick.show && tick.showLabel && (!tick.isMinorTick || this.showMinorTicks)) {
-                    if (this.name == 'xaxis' || this.name == 'x2axis') {
-                        temp = tick._elem.outerHeight(true);
-                    }
-                    else {
-                        temp = tick._elem.outerWidth(true);
-                    }
-                    if (temp > dim) {
-                        dim = temp;
-                    }
-                }
-            }
-            tick = null;
-            t = null;
-            
-            if (lshow) {
-                w = this._label._elem.outerWidth(true);
-                h = this._label._elem.outerHeight(true); 
-            }
-            if (this.name == 'xaxis') {
-                dim = dim + h;
-                this._elem.css({'height':dim+'px', left:'0px', bottom:'0px'});
-            }
-            else if (this.name == 'x2axis') {
-                dim = dim + h;
-                this._elem.css({'height':dim+'px', left:'0px', top:'0px'});
-            }
-            else if (this.name == 'yaxis') {
-                dim = dim + w;
-                this._elem.css({'width':dim+'px', left:'0px', top:'0px'});
-                if (lshow && this._label.constructor == $.jqplot.AxisLabelRenderer) {
-                    this._label._elem.css('width', w+'px');
-                }
-            }
-            else {
-                dim = dim + w;
-                this._elem.css({'width':dim+'px', right:'0px', top:'0px'});
-                if (lshow && this._label.constructor == $.jqplot.AxisLabelRenderer) {
-                    this._label._elem.css('width', w+'px');
-                }
-            }
-        }  
-    };    
-    
-    // called with scope of axis
-    $.jqplot.LinearAxisRenderer.prototype.createTicks = function(plot) {
-        // we're are operating on an axis here
-        var ticks = this._ticks;
-        var userTicks = this.ticks;
-        var name = this.name;
-        // databounds were set on axis initialization.
-        var db = this._dataBounds;
-        var dim = (this.name.charAt(0) === 'x') ? this._plotDimensions.width : this._plotDimensions.height;
-        var interval;
-        var min, max;
-        var pos1, pos2;
-        var tt, i;
-        // get a copy of user's settings for min/max.
-        var userMin = this.min;
-        var userMax = this.max;
-        var userNT = this.numberTicks;
-        var userTI = this.tickInterval;
-
-        var threshold = 30;
-        this._scalefact =  (Math.max(dim, threshold+1) - threshold)/300.0;
-        
-        // if we already have ticks, use them.
-        // ticks must be in order of increasing value.
-        
-        if (userTicks.length) {
-            // ticks could be 1D or 2D array of [val, val, ,,,] or [[val, label], [val, label], ...] or mixed
-            for (i=0; i<userTicks.length; i++){
-                var ut = userTicks[i];
-                var t = new this.tickRenderer(this.tickOptions);
-                if ($.isArray(ut)) {
-                    t.value = ut[0];
-                    if (this.breakPoints) {
-                        if (ut[0] == this.breakPoints[0]) {
-                            t.label = this.breakTickLabel;
-                            t._breakTick = true;
-                            t.showGridline = false;
-                            t.showMark = false;
-                        }
-                        else if (ut[0] > this.breakPoints[0] && ut[0] <= this.breakPoints[1]) {
-                            t.show = false;
-                            t.showGridline = false;
-                            t.label = ut[1];
-                        }
-                        else {
-                            t.label = ut[1];
-                        }
-                    }
-                    else {
-                        t.label = ut[1];
-                    }
-                    t.setTick(ut[0], this.name);
-                    this._ticks.push(t);
-                }
-
-                else if ($.isPlainObject(ut)) {
-                    $.extend(true, t, ut);
-                    t.axis = this.name;
-                    this._ticks.push(t);
-                }
-                
-                else {
-                    t.value = ut;
-                    if (this.breakPoints) {
-                        if (ut == this.breakPoints[0]) {
-                            t.label = this.breakTickLabel;
-                            t._breakTick = true;
-                            t.showGridline = false;
-                            t.showMark = false;
-                        }
-                        else if (ut > this.breakPoints[0] && ut <= this.breakPoints[1]) {
-                            t.show = false;
-                            t.showGridline = false;
-                        }
-                    }
-                    t.setTick(ut, this.name);
-                    this._ticks.push(t);
-                }
-            }
-            this.numberTicks = userTicks.length;
-            this.min = this._ticks[0].value;
-            this.max = this._ticks[this.numberTicks-1].value;
-            this.tickInterval = (this.max - this.min) / (this.numberTicks - 1);
-        }
-        
-        // we don't have any ticks yet, let's make some!
-        else {
-            if (name == 'xaxis' || name == 'x2axis') {
-                dim = this._plotDimensions.width;
-            }
-            else {
-                dim = this._plotDimensions.height;
-            }
-
-            var _numberTicks = this.numberTicks;
-
-            // if aligning this axis, use number of ticks from previous axis.
-            // Do I need to reset somehow if alignTicks is changed and then graph is replotted??
-            if (this.alignTicks) {
-                if (this.name === 'x2axis' && plot.axes.xaxis.show) {
-                    _numberTicks = plot.axes.xaxis.numberTicks;
-                }
-                else if (this.name.charAt(0) === 'y' && this.name !== 'yaxis' && this.name !== 'yMidAxis' && plot.axes.yaxis.show) {
-                    _numberTicks = plot.axes.yaxis.numberTicks;
-                }
-            }
-        
-            min = ((this.min != null) ? this.min : db.min);
-            max = ((this.max != null) ? this.max : db.max);
-
-            var range = max - min;
-            var rmin, rmax;
-            var temp;
-
-            if (this.tickOptions == null || !this.tickOptions.formatString) {
-                this._overrideFormatString = true;
-            }
-
-            // Doing complete autoscaling
-            if (this.min == null || this.max == null && this.tickInterval == null && !this.autoscale) {
-                // Check if user must have tick at 0 or 100 and ensure they are in range.
-                // The autoscaling algorithm will always place ticks at 0 and 100 if they are in range.
-                if (this.forceTickAt0) {
-                    if (min > 0) {
-                        min = 0;
-                    }
-                    if (max < 0) {
-                        max = 0;
-                    }
-                }
-
-                if (this.forceTickAt100) {
-                    if (min > 100) {
-                        min = 100;
-                    }
-                    if (max < 100) {
-                        max = 100;
-                    }
-                }
-
-                var keepMin = false,
-                    keepMax = false;
-
-                if (this.min != null) {
-                    keepMin = true;
-                }
-
-                else if (this.max != null) {
-                    keepMax = true;
-                }
-
-                // var threshold = 30;
-                // var tdim = Math.max(dim, threshold+1);
-                // this._scalefact =  (tdim-threshold)/300.0;
-                var ret = $.jqplot.LinearTickGenerator(min, max, this._scalefact, _numberTicks, keepMin, keepMax); 
-                // calculate a padded max and min, points should be less than these
-                // so that they aren't too close to the edges of the plot.
-                // User can adjust how much padding is allowed with pad, padMin and PadMax options. 
-                // If min or max is set, don't pad that end of axis.
-                var tumin = (this.min != null) ? min : min + range*(this.padMin - 1);
-                var tumax = (this.max != null) ? max : max - range*(this.padMax - 1);
-
-                // if they're equal, we shouldn't have to do anything, right?
-                // if (min <=tumin || max >= tumax) {
-                if (min <tumin || max > tumax) {
-                    tumin = (this.min != null) ? min : min - range*(this.padMin - 1);
-                    tumax = (this.max != null) ? max : max + range*(this.padMax - 1);
-                    ret = $.jqplot.LinearTickGenerator(tumin, tumax, this._scalefact, _numberTicks, keepMin, keepMax);
-                }
-
-                this.min = ret[0];
-                this.max = ret[1];
-                // if numberTicks specified, it should return the same.
-                this.numberTicks = ret[2];
-                this._autoFormatString = ret[3];
-                this.tickInterval = ret[4];
-            }
-
-            // User has specified some axis scale related option, can use auto algorithm
-            else {
-                
-                // if min and max are same, space them out a bit
-                if (min == max) {
-                    var adj = 0.05;
-                    if (min > 0) {
-                        adj = Math.max(Math.log(min)/Math.LN10, 0.05);
-                    }
-                    min -= adj;
-                    max += adj;
-                }
-                
-                // autoscale.  Can't autoscale if min or max is supplied.
-                // Will use numberTicks and tickInterval if supplied.  Ticks
-                // across multiple axes may not line up depending on how
-                // bars are to be plotted.
-                if (this.autoscale && this.min == null && this.max == null) {
-                    var rrange, ti, margin;
-                    var forceMinZero = false;
-                    var forceZeroLine = false;
-                    var intervals = {min:null, max:null, average:null, stddev:null};
-                    // if any series are bars, or if any are fill to zero, and if this
-                    // is the axis to fill toward, check to see if we can start axis at zero.
-                    for (var i=0; i<this._series.length; i++) {
-                        var s = this._series[i];
-                        var faname = (s.fillAxis == 'x') ? s._xaxis.name : s._yaxis.name;
-                        // check to see if this is the fill axis
-                        if (this.name == faname) {
-                            var vals = s._plotValues[s.fillAxis];
-                            var vmin = vals[0];
-                            var vmax = vals[0];
-                            for (var j=1; j<vals.length; j++) {
-                                if (vals[j] < vmin) {
-                                    vmin = vals[j];
-                                }
-                                else if (vals[j] > vmax) {
-                                    vmax = vals[j];
-                                }
-                            }
-                            var dp = (vmax - vmin) / vmax;
-                            // is this sries a bar?
-                            if (s.renderer.constructor == $.jqplot.BarRenderer) {
-                                // if no negative values and could also check range.
-                                if (vmin >= 0 && (s.fillToZero || dp > 0.1)) {
-                                    forceMinZero = true;
-                                }
-                                else {
-                                    forceMinZero = false;
-                                    if (s.fill && s.fillToZero && vmin < 0 && vmax > 0) {
-                                        forceZeroLine = true;
-                                    }
-                                    else {
-                                        forceZeroLine = false;
-                                    }
-                                }
-                            }
-                            
-                            // if not a bar and filling, use appropriate method.
-                            else if (s.fill) {
-                                if (vmin >= 0 && (s.fillToZero || dp > 0.1)) {
-                                    forceMinZero = true;
-                                }
-                                else if (vmin < 0 && vmax > 0 && s.fillToZero) {
-                                    forceMinZero = false;
-                                    forceZeroLine = true;
-                                }
-                                else {
-                                    forceMinZero = false;
-                                    forceZeroLine = false;
-                                }
-                            }
-                            
-                            // if not a bar and not filling, only change existing state
-                            // if it doesn't make sense
-                            else if (vmin < 0) {
-                                forceMinZero = false;
-                            }
-                        }
-                    }
-                    
-                    // check if we need make axis min at 0.
-                    if (forceMinZero) {
-                        // compute number of ticks
-                        this.numberTicks = 2 + Math.ceil((dim-(this.tickSpacing-1))/this.tickSpacing);
-                        this.min = 0;
-                        userMin = 0;
-                        // what order is this range?
-                        // what tick interval does that give us?
-                        ti = max/(this.numberTicks-1);
-                        temp = Math.pow(10, Math.abs(Math.floor(Math.log(ti)/Math.LN10)));
-                        if (ti/temp == parseInt(ti/temp, 10)) {
-                            ti += temp;
-                        }
-                        this.tickInterval = Math.ceil(ti/temp) * temp;
-                        this.max = this.tickInterval * (this.numberTicks - 1);
-                    }
-                    
-                    // check if we need to make sure there is a tick at 0.
-                    else if (forceZeroLine) {
-                        // compute number of ticks
-                        this.numberTicks = 2 + Math.ceil((dim-(this.tickSpacing-1))/this.tickSpacing);
-                        var ntmin = Math.ceil(Math.abs(min)/range*(this.numberTicks-1));
-                        var ntmax = this.numberTicks - 1  - ntmin;
-                        ti = Math.max(Math.abs(min/ntmin), Math.abs(max/ntmax));
-                        temp = Math.pow(10, Math.abs(Math.floor(Math.log(ti)/Math.LN10)));
-                        this.tickInterval = Math.ceil(ti/temp) * temp;
-                        this.max = this.tickInterval * ntmax;
-                        this.min = -this.tickInterval * ntmin;
-                    }
-                    
-                    // if nothing else, do autoscaling which will try to line up ticks across axes.
-                    else {  
-                        if (this.numberTicks == null){
-                            if (this.tickInterval) {
-                                this.numberTicks = 3 + Math.ceil(range / this.tickInterval);
-                            }
-                            else {
-                                this.numberTicks = 2 + Math.ceil((dim-(this.tickSpacing-1))/this.tickSpacing);
-                            }
-                        }
-                
-                        if (this.tickInterval == null) {
-                            // get a tick interval
-                            ti = range/(this.numberTicks - 1);
-
-                            if (ti < 1) {
-                                temp = Math.pow(10, Math.abs(Math.floor(Math.log(ti)/Math.LN10)));
-                            }
-                            else {
-                                temp = 1;
-                            }
-                            this.tickInterval = Math.ceil(ti*temp*this.pad)/temp;
-                        }
-                        else {
-                            temp = 1 / this.tickInterval;
-                        }
-                        
-                        // try to compute a nicer, more even tick interval
-                        // temp = Math.pow(10, Math.floor(Math.log(ti)/Math.LN10));
-                        // this.tickInterval = Math.ceil(ti/temp) * temp;
-                        rrange = this.tickInterval * (this.numberTicks - 1);
-                        margin = (rrange - range)/2;
-           
-                        if (this.min == null) {
-                            this.min = Math.floor(temp*(min-margin))/temp;
-                        }
-                        if (this.max == null) {
-                            this.max = this.min + rrange;
-                        }
-                    }
-
-                    // Compute a somewhat decent format string if it is needed.
-                    // get precision of interval and determine a format string.
-                    var sf = $.jqplot.getSignificantFigures(this.tickInterval);
-
-                    var fstr;
-
-                    // if we have only a whole number, use integer formatting
-                    if (sf.digitsLeft >= sf.significantDigits) {
-                        fstr = '%d';
-                    }
-
-                    else {
-                        var temp = Math.max(0, 5 - sf.digitsLeft);
-                        temp = Math.min(temp, sf.digitsRight);
-                        fstr = '%.'+ temp + 'f';
-                    }
-
-                    this._autoFormatString = fstr;
-                }
-                
-                // Use the default algorithm which pads each axis to make the chart
-                // centered nicely on the grid.
-                else {
-
-                    rmin = (this.min != null) ? this.min : min - range*(this.padMin - 1);
-                    rmax = (this.max != null) ? this.max : max + range*(this.padMax - 1);
-                    range = rmax - rmin;
-        
-                    if (this.numberTicks == null){
-                        // if tickInterval is specified by user, we will ignore computed maximum.
-                        // max will be equal or greater to fit even # of ticks.
-                        if (this.tickInterval != null) {
-                            this.numberTicks = Math.ceil((rmax - rmin)/this.tickInterval)+1;
-                        }
-                        else if (dim > 100) {
-                            this.numberTicks = parseInt(3+(dim-100)/75, 10);
-                        }
-                        else {
-                            this.numberTicks = 2;
-                        }
-                    }
-                
-                    if (this.tickInterval == null) {
-                        this.tickInterval = range / (this.numberTicks-1);
-                    }
-                    
-                    if (this.max == null) {
-                        rmax = rmin + this.tickInterval*(this.numberTicks - 1);
-                    }        
-                    if (this.min == null) {
-                        rmin = rmax - this.tickInterval*(this.numberTicks - 1);
-                    }
-
-                    // get precision of interval and determine a format string.
-                    var sf = $.jqplot.getSignificantFigures(this.tickInterval);
-
-                    var fstr;
-
-                    // if we have only a whole number, use integer formatting
-                    if (sf.digitsLeft >= sf.significantDigits) {
-                        fstr = '%d';
-                    }
-
-                    else {
-                        var temp = Math.max(0, 5 - sf.digitsLeft);
-                        temp = Math.min(temp, sf.digitsRight);
-                        fstr = '%.'+ temp + 'f';
-                    }
-
-
-                    this._autoFormatString = fstr;
-
-                    this.min = rmin;
-                    this.max = rmax;
-                }
-                
-                if (this.renderer.constructor == $.jqplot.LinearAxisRenderer && this._autoFormatString == '') {
-                    // fix for misleading tick display with small range and low precision.
-                    range = this.max - this.min;
-                    // figure out precision
-                    var temptick = new this.tickRenderer(this.tickOptions);
-                    // use the tick formatString or, the default.
-                    var fs = temptick.formatString || $.jqplot.config.defaultTickFormatString; 
-                    var fs = fs.match($.jqplot.sprintf.regex)[0];
-                    var precision = 0;
-                    if (fs) {
-                        if (fs.search(/[fFeEgGpP]/) > -1) {
-                            var m = fs.match(/\%\.(\d{0,})?[eEfFgGpP]/);
-                            if (m) {
-                                precision = parseInt(m[1], 10);
-                            }
-                            else {
-                                precision = 6;
-                            }
-                        }
-                        else if (fs.search(/[di]/) > -1) {
-                            precision = 0;
-                        }
-                        // fact will be <= 1;
-                        var fact = Math.pow(10, -precision);
-                        if (this.tickInterval < fact) {
-                            // need to correct underrange
-                            if (userNT == null && userTI == null) {
-                                this.tickInterval = fact;
-                                if (userMax == null && userMin == null) {
-                                    // this.min = Math.floor((this._dataBounds.min - this.tickInterval)/fact) * fact;
-                                    this.min = Math.floor(this._dataBounds.min/fact) * fact;
-                                    if (this.min == this._dataBounds.min) {
-                                        this.min = this._dataBounds.min - this.tickInterval;
-                                    }
-                                    // this.max = Math.ceil((this._dataBounds.max + this.tickInterval)/fact) * fact;
-                                    this.max = Math.ceil(this._dataBounds.max/fact) * fact;
-                                    if (this.max == this._dataBounds.max) {
-                                        this.max = this._dataBounds.max + this.tickInterval;
-                                    }
-                                    var n = (this.max - this.min)/this.tickInterval;
-                                    n = n.toFixed(11);
-                                    n = Math.ceil(n);
-                                    this.numberTicks = n + 1;
-                                }
-                                else if (userMax == null) {
-                                    // add one tick for top of range.
-                                    var n = (this._dataBounds.max - this.min) / this.tickInterval;
-                                    n = n.toFixed(11);
-                                    this.numberTicks = Math.ceil(n) + 2;
-                                    this.max = this.min + this.tickInterval * (this.numberTicks-1);
-                                }
-                                else if (userMin == null) {
-                                    // add one tick for bottom of range.
-                                    var n = (this.max - this._dataBounds.min) / this.tickInterval;
-                                    n = n.toFixed(11);
-                                    this.numberTicks = Math.ceil(n) + 2;
-                                    this.min = this.max - this.tickInterval * (this.numberTicks-1);
-                                }
-                                else {
-                                    // calculate a number of ticks so max is within axis scale
-                                    this.numberTicks = Math.ceil((userMax - userMin)/this.tickInterval) + 1;
-                                    // if user's min and max don't fit evenly in ticks, adjust.
-                                    // This takes care of cases such as user min set to 0, max set to 3.5 but tick
-                                    // format string set to %d (integer ticks)
-                                    this.min =  Math.floor(userMin*Math.pow(10, precision))/Math.pow(10, precision);
-                                    this.max =  Math.ceil(userMax*Math.pow(10, precision))/Math.pow(10, precision);
-                                    // this.max = this.min + this.tickInterval*(this.numberTicks-1);
-                                    this.numberTicks = Math.ceil((this.max - this.min)/this.tickInterval) + 1;
-                                }
-                            }
-                        }
-                    }
-                }
-                
-            }
-            
-            if (this._overrideFormatString && this._autoFormatString != '') {
-                this.tickOptions = this.tickOptions || {};
-                this.tickOptions.formatString = this._autoFormatString;
-            }
-
-            var t, to;
-            for (var i=0; i<this.numberTicks; i++){
-                tt = this.min + i * this.tickInterval;
-                t = new this.tickRenderer(this.tickOptions);
-                // var t = new $.jqplot.AxisTickRenderer(this.tickOptions);
-
-                t.setTick(tt, this.name);
-                this._ticks.push(t);
-
-                if (i < this.numberTicks - 1) {
-                    for (var j=0; j<this.minorTicks; j++) {
-                        tt += this.tickInterval/(this.minorTicks+1);
-                        to = $.extend(true, {}, this.tickOptions, {name:this.name, value:tt, label:'', isMinorTick:true});
-                        t = new this.tickRenderer(to);
-                        this._ticks.push(t);
-                    }
-                }
-                t = null;
-            }
-        }
-
-        if (this.tickInset) {
-            this.min = this.min - this.tickInset * this.tickInterval;
-            this.max = this.max + this.tickInset * this.tickInterval;
-        }
-
-        ticks = null;
-    };
-    
-    // Used to reset just the values of the ticks and then repack, which will
-    // recalculate the positioning functions.  It is assuemd that the 
-    // number of ticks is the same and the values of the new array are at the
-    // proper interval.
-    // This method needs to be called with the scope of an axis object, like:
-    //
-    // > plot.axes.yaxis.renderer.resetTickValues.call(plot.axes.yaxis, yarr);
-    //
-    $.jqplot.LinearAxisRenderer.prototype.resetTickValues = function(opts) {
-        if ($.isArray(opts) && opts.length == this._ticks.length) {
-            var t;
-            for (var i=0; i<opts.length; i++) {
-                t = this._ticks[i];
-                t.value = opts[i];
-                t.label = t.formatter(t.formatString, opts[i]);
-                t.label = t.prefix + t.label;
-                t._elem.html(t.label);
-            }
-            t = null;
-            this.min = $.jqplot.arrayMin(opts);
-            this.max = $.jqplot.arrayMax(opts);
-            this.pack();
-        }
-        // Not implemented yet.
-        // else if ($.isPlainObject(opts)) {
-        // 
-        // }
-    };
-    
-    // called with scope of axis
-    $.jqplot.LinearAxisRenderer.prototype.pack = function(pos, offsets) {
-        // Add defaults for repacking from resetTickValues function.
-        pos = pos || {};
-        offsets = offsets || this._offsets;
-        
-        var ticks = this._ticks;
-        var max = this.max;
-        var min = this.min;
-        var offmax = offsets.max;
-        var offmin = offsets.min;
-        var lshow = (this._label == null) ? false : this._label.show;
-        
-        for (var p in pos) {
-            this._elem.css(p, pos[p]);
-        }
-        
-        this._offsets = offsets;
-        // pixellength will be + for x axes and - for y axes becasue pixels always measured from top left.
-        var pixellength = offmax - offmin;
-        var unitlength = max - min;
-        
-        // point to unit and unit to point conversions references to Plot DOM element top left corner.
-        if (this.breakPoints) {
-            unitlength = unitlength - this.breakPoints[1] + this.breakPoints[0];
-            
-            this.p2u = function(p){
-                return (p - offmin) * unitlength / pixellength + min;
-            };
-        
-            this.u2p = function(u){
-                if (u > this.breakPoints[0] && u < this.breakPoints[1]){
-                    u = this.breakPoints[0];
-                }
-                if (u <= this.breakPoints[0]) {
-                    return (u - min) * pixellength / unitlength + offmin;
-                }
-                else {
-                    return (u - this.breakPoints[1] + this.breakPoints[0] - min) * pixellength / unitlength + offmin;
-                }
-            };
-                
-            if (this.name.charAt(0) == 'x'){
-                this.series_u2p = function(u){
-                    if (u > this.breakPoints[0] && u < this.breakPoints[1]){
-                        u = this.breakPoints[0];
-                    }
-                    if (u <= this.breakPoints[0]) {
-                        return (u - min) * pixellength / unitlength;
-                    }
-                    else {
-                        return (u - this.breakPoints[1] + this.breakPoints[0] - min) * pixellength / unitlength;
-                    }
-                };
-                this.series_p2u = function(p){
-                    return p * unitlength / pixellength + min;
-                };
-            }
-        
-            else {
-                this.series_u2p = function(u){
-                    if (u > this.breakPoints[0] && u < this.breakPoints[1]){
-                        u = this.breakPoints[0];
-                    }
-                    if (u >= this.breakPoints[1]) {
-                        return (u - max) * pixellength / unitlength;
-                    }
-                    else {
-                        return (u + this.breakPoints[1] - this.breakPoints[0] - max) * pixellength / unitlength;
-                    }
-                };
-                this.series_p2u = function(p){
-                    return p * unitlength / pixellength + max;
-                };
-            }
-        }
-        else {
-            this.p2u = function(p){
-                return (p - offmin) * unitlength / pixellength + min;
-            };
-        
-            this.u2p = function(u){
-                return (u - min) * pixellength / unitlength + offmin;
-            };
-                
-            if (this.name == 'xaxis' || this.name == 'x2axis'){
-                this.series_u2p = function(u){
-                    return (u - min) * pixellength / unitlength;
-                };
-                this.series_p2u = function(p){
-                    return p * unitlength / pixellength + min;
-                };
-            }
-        
-            else {
-                this.series_u2p = function(u){
-                    return (u - max) * pixellength / unitlength;
-                };
-                this.series_p2u = function(p){
-                    return p * unitlength / pixellength + max;
-                };
-            }
-        }
-        
-        if (this.show) {
-            if (this.name == 'xaxis' || this.name == 'x2axis') {
-                for (var i=0; i<ticks.length; i++) {
-                    var t = ticks[i];
-                    if (t.show && t.showLabel) {
-                        var shim;
-                        
-                        if (t.constructor == $.jqplot.CanvasAxisTickRenderer && t.angle) {
-                            // will need to adjust auto positioning based on which axis this is.
-                            var temp = (this.name == 'xaxis') ? 1 : -1;
-                            switch (t.labelPosition) {
-                                case 'auto':
-                                    // position at end
-                                    if (temp * t.angle < 0) {
-                                        shim = -t.getWidth() + t._textRenderer.height * Math.sin(-t._textRenderer.angle) / 2;
-                                    }
-                                    // position at start
-                                    else {
-                                        shim = -t._textRenderer.height * Math.sin(t._textRenderer.angle) / 2;
-                                    }
-                                    break;
-                                case 'end':
-                                    shim = -t.getWidth() + t._textRenderer.height * Math.sin(-t._textRenderer.angle) / 2;
-                                    break;
-                                case 'start':
-                                    shim = -t._textRenderer.height * Math.sin(t._textRenderer.angle) / 2;
-                                    break;
-                                case 'middle':
-                                    shim = -t.getWidth()/2 + t._textRenderer.height * Math.sin(-t._textRenderer.angle) / 2;
-                                    break;
-                                default:
-                                    shim = -t.getWidth()/2 + t._textRenderer.height * Math.sin(-t._textRenderer.angle) / 2;
-                                    break;
-                            }
-                        }
-                        else {
-                            shim = -t.getWidth()/2;
-                        }
-                        var val = this.u2p(t.value) + shim + 'px';
-                        t._elem.css('left', val);
-                        t.pack();
-                    }
-                }
-                if (lshow) {
-                    var w = this._label._elem.outerWidth(true);
-                    this._label._elem.css('left', offmin + pixellength/2 - w/2 + 'px');
-                    if (this.name == 'xaxis') {
-                        this._label._elem.css('bottom', '0px');
-                    }
-                    else {
-                        this._label._elem.css('top', '0px');
-                    }
-                    this._label.pack();
-                }
-            }
-            else {
-                for (var i=0; i<ticks.length; i++) {
-                    var t = ticks[i];
-                    if (t.show && t.showLabel) {                        
-                        var shim;
-                        if (t.constructor == $.jqplot.CanvasAxisTickRenderer && t.angle) {
-                            // will need to adjust auto positioning based on which axis this is.
-                            var temp = (this.name == 'yaxis') ? 1 : -1;
-                            switch (t.labelPosition) {
-                                case 'auto':
-                                    // position at end
-                                case 'end':
-                                    if (temp * t.angle < 0) {
-                                        shim = -t._textRenderer.height * Math.cos(-t._textRenderer.angle) / 2;
-                                    }
-                                    else {
-                                        shim = -t.getHeight() + t._textRenderer.height * Math.cos(t._textRenderer.angle) / 2;
-                                    }
-                                    break;
-                                case 'start':
-                                    if (t.angle > 0) {
-                                        shim = -t._textRenderer.height * Math.cos(-t._textRenderer.angle) / 2;
-                                    }
-                                    else {
-                                        shim = -t.getHeight() + t._textRenderer.height * Math.cos(t._textRenderer.angle) / 2;
-                                    }
-                                    break;
-                                case 'middle':
-                                    // if (t.angle > 0) {
-                                    //     shim = -t.getHeight()/2 + t._textRenderer.height * Math.sin(-t._textRenderer.angle) / 2;
-                                    // }
-                                    // else {
-                                    //     shim = -t.getHeight()/2 - t._textRenderer.height * Math.sin(t._textRenderer.angle) / 2;
-                                    // }
-                                    shim = -t.getHeight()/2;
-                                    break;
-                                default:
-                                    shim = -t.getHeight()/2;
-                                    break;
-                            }
-                        }
-                        else {
-                            shim = -t.getHeight()/2;
-                        }
-                        
-                        var val = this.u2p(t.value) + shim + 'px';
-                        t._elem.css('top', val);
-                        t.pack();
-                    }
-                }
-                if (lshow) {
-                    var h = this._label._elem.outerHeight(true);
-                    this._label._elem.css('top', offmax - pixellength/2 - h/2 + 'px');
-                    if (this.name == 'yaxis') {
-                        this._label._elem.css('left', '0px');
-                    }
-                    else {
-                        this._label._elem.css('right', '0px');
-                    }   
-                    this._label.pack();
-                }
-            }
-        }
-
-        ticks = null;
-    };
-
-
-    /**
-    * The following code was generaously given to me a while back by Scott Prahl.
-    * He did a good job at computing axes min, max and number of ticks for the 
-    * case where the user has not set any scale related parameters (tickInterval,
-    * numberTicks, min or max).  I had ignored this use case for a long time,
-    * focusing on the more difficult case where user has set some option controlling
-    * tick generation.  Anyway, about time I got this into jqPlot.
-    * Thanks Scott!!
-    */
-    
-    /**
-    * Copyright (c) 2010 Scott Prahl
-    * The next three routines are currently available for use in all personal 
-    * or commercial projects under both the MIT and GPL version 2.0 licenses. 
-    * This means that you can choose the license that best suits your project 
-    * and use it accordingly. 
-    */
-
-    // A good format string depends on the interval. If the interval is greater 
-    // than 1 then there is no need to show any decimal digits. If it is < 1.0, then
-    // use the magnitude of the interval to determine the number of digits to show.
-    function bestFormatString (interval)
-    {
-        var fstr;
-        interval = Math.abs(interval);
-        if (interval >= 10) {
-            fstr = '%d';
-        }
-
-        else if (interval > 1) {
-            if (interval === parseInt(interval, 10)) {
-                fstr = '%d';
-            }
-            else {
-                fstr = '%.1f';
-            }
-        }
-
-        else {
-            var expv = -Math.floor(Math.log(interval)/Math.LN10);
-            fstr = '%.' + expv + 'f';
-        }
-        
-        return fstr; 
-    }
-
-    var _factors = [0.1, 0.2, 0.3, 0.4, 0.5, 0.8, 1, 2, 3, 4, 5];
-
-    var _getLowerFactor = function(f) {
-        var i = _factors.indexOf(f);
-        if (i > 0) {
-            return _factors[i-1];
-        }
-        else {
-            return _factors[_factors.length - 1] / 100;
-        }
-    };
-
-    var _getHigherFactor = function(f) {
-        var i = _factors.indexOf(f);
-        if (i < _factors.length-1) {
-            return _factors[i+1];
-        }
-        else {
-            return _factors[0] * 100;
-        }
-    };
-
-    // Given a fixed minimum and maximum and a target number ot ticks
-    // figure out the best interval and 
-    // return min, max, number ticks, format string and tick interval
-    function bestConstrainedInterval(min, max, nttarget) {
-        // run through possible number to ticks and see which interval is best
-        var low = Math.floor(nttarget/2);
-        var hi = Math.ceil(nttarget*1.5);
-        var badness = Number.MAX_VALUE;
-        var r = (max - min);
-        var temp;
-        var sd;
-        var bestNT;
-        var gsf = $.jqplot.getSignificantFigures;
-        var fsd;
-        var fs;
-        var currentNT;
-        var bestPrec;
-
-        for (var i=0, l=hi-low+1; i<l; i++) {
-            currentNT = low + i;
-            temp = r/(currentNT-1);
-            sd = gsf(temp);
-
-            temp = Math.abs(nttarget - currentNT) + sd.digitsRight;
-            if (temp < badness) {
-                badness = temp;
-                bestNT = currentNT;
-                bestPrec = sd.digitsRight;
-            }
-            else if (temp === badness) {
-                // let nicer ticks trump number ot ticks
-                if (sd.digitsRight < bestPrec) {
-                    bestNT = currentNT;
-                    bestPrec = sd.digitsRight;
-                }
-            }
-
-        }
-
-        fsd = Math.max(bestPrec, Math.max(gsf(min).digitsRight, gsf(max).digitsRight));
-        if (fsd === 0) {
-            fs = '%d';
-        }
-        else {
-            fs = '%.' + fsd + 'f';
-        }
-        temp = r / (bestNT - 1);
-        // min, max, number ticks, format string, tick interval
-        return [min, max, bestNT, fs, temp];
-    }
-
-    // This will return an interval of form 2 * 10^n, 5 * 10^n or 10 * 10^n
-    // it is based soley on the range and number of ticks.  So if user specifies
-    // number of ticks, use this.
-    function bestInterval(range, numberTicks) {
-        numberTicks = numberTicks || 7;
-        var minimum = range / (numberTicks - 1);
-        var magnitude = Math.pow(10, Math.floor(Math.log(minimum) / Math.LN10));
-        var residual = minimum / magnitude;
-        var interval;
-        // "nicest" ranges are 1, 2, 5 or powers of these.
-        // for magnitudes below 1, only allow these. 
-        if (magnitude < 1) {
-            if (residual > 5) {
-                interval = 10 * magnitude;
-            }
-            else if (residual > 2) {
-                interval = 5 * magnitude;
-            }
-            else if (residual > 1) {
-                interval = 2 * magnitude;
-            }
-            else {
-                interval = magnitude;
-            }
-        }
-        // for large ranges (whole integers), allow intervals like 3, 4 or powers of these.
-        // this helps a lot with poor choices for number of ticks. 
-        else {
-            if (residual > 5) {
-                interval = 10 * magnitude;
-            }
-            else if (residual > 4) {
-                interval = 5 * magnitude;
-            }
-            else if (residual > 3) {
-                interval = 4 * magnitude;
-            }
-            else if (residual > 2) {
-                interval = 3 * magnitude;
-            }
-            else if (residual > 1) {
-                interval = 2 * magnitude;
-            }
-            else {
-                interval = magnitude;
-            }
-        }
-
-        return interval;
-    }
-
-    // This will return an interval of form 2 * 10^n, 5 * 10^n or 10 * 10^n
-    // it is based soley on the range of data, number of ticks must be computed later.
-    function bestLinearInterval(range, scalefact) {
-        scalefact = scalefact || 1;
-        var expv = Math.floor(Math.log(range)/Math.LN10);
-        var magnitude = Math.pow(10, expv);
-        // 0 < f < 10
-        var f = range / magnitude;
-        var fact;
-        // for large plots, scalefact will decrease f and increase number of ticks.
-        // for small plots, scalefact will increase f and decrease number of ticks.
-        f = f/scalefact;
-
-        // for large plots, smaller interval, more ticks.
-        if (f<=0.38) {
-            fact = 0.1;
-        }
-        else if (f<=1.6) {
-            fact = 0.2;
-        }
-        else if (f<=4.0) {
-            fact = 0.5;
-        }
-        else if (f<=8.0) {
-            fact = 1.0;
-        }
-        // for very small plots, larger interval, less ticks in number ticks
-        else if (f<=16.0) {
-            fact = 2;
-        }
-        else {
-            fact = 5;
-        } 
-
-        return fact*magnitude; 
-    }
-
-    function bestLinearComponents(range, scalefact) {
-        var expv = Math.floor(Math.log(range)/Math.LN10);
-        var magnitude = Math.pow(10, expv);
-        // 0 < f < 10
-        var f = range / magnitude;
-        var interval;
-        var fact;
-        // for large plots, scalefact will decrease f and increase number of ticks.
-        // for small plots, scalefact will increase f and decrease number of ticks.
-        f = f/scalefact;
-
-        // for large plots, smaller interval, more ticks.
-        if (f<=0.38) {
-            fact = 0.1;
-        }
-        else if (f<=1.6) {
-            fact = 0.2;
-        }
-        else if (f<=4.0) {
-            fact = 0.5;
-        }
-        else if (f<=8.0) {
-            fact = 1.0;
-        }
-        // for very small plots, larger interval, less ticks in number ticks
-        else if (f<=16.0) {
-            fact = 2;
-        }
-        // else if (f<=20.0) {
-        //     fact = 3;
-        // }
-        // else if (f<=24.0) {
-        //     fact = 4;
-        // }
-        else {
-            fact = 5;
-        } 
-
-        interval = fact * magnitude;
-
-        return [interval, fact, magnitude];
-    }
-
-    // Given the min and max for a dataset, return suitable endpoints
-    // for the graphing, a good number for the number of ticks, and a
-    // format string so that extraneous digits are not displayed.
-    // returned is an array containing [min, max, nTicks, format]
-    $.jqplot.LinearTickGenerator = function(axis_min, axis_max, scalefact, numberTicks, keepMin, keepMax) {
-        // Set to preserve EITHER min OR max.
-        // If min is preserved, max must be free.
-        keepMin = (keepMin === null) ? false : keepMin;
-        keepMax = (keepMax === null || keepMin) ? false : keepMax;
-        // if endpoints are equal try to include zero otherwise include one
-        if (axis_min === axis_max) {
-            axis_max = (axis_max) ? 0 : 1;
-        }
-
-        scalefact = scalefact || 1.0;
-
-        // make sure range is positive
-        if (axis_max < axis_min) {
-            var a = axis_max;
-            axis_max = axis_min;
-            axis_min = a;
-        }
-
-        var r = [];
-        var ss = bestLinearInterval(axis_max - axis_min, scalefact);
-
-        var gsf = $.jqplot.getSignificantFigures;
-        
-        if (numberTicks == null) {
-
-            // Figure out the axis min, max and number of ticks
-            // the min and max will be some multiple of the tick interval,
-            // 1*10^n, 2*10^n or 5*10^n.  This gaurantees that, if the
-            // axis min is negative, 0 will be a tick.
-            if (!keepMin && !keepMax) {
-                r[0] = Math.floor(axis_min / ss) * ss;  // min
-                r[1] = Math.ceil(axis_max / ss) * ss;   // max
-                r[2] = Math.round((r[1]-r[0])/ss+1.0);  // number of ticks
-                r[3] = bestFormatString(ss);            // format string
-                r[4] = ss;                              // tick Interval
-            }
-
-            else if (keepMin) {
-                r[0] = axis_min;                                        // min
-                r[2] = Math.ceil((axis_max - axis_min) / ss + 1.0);     // number of ticks
-                r[1] = axis_min + (r[2] - 1) * ss;                      // max
-                var digitsMin = gsf(axis_min).digitsRight;
-                var digitsSS = gsf(ss).digitsRight;
-                if (digitsMin < digitsSS) {
-                    r[3] = bestFormatString(ss);                        // format string
-                }
-                else {
-                    r[3] = '%.' + digitsMin + 'f';
-                }
-                r[4] = ss;                                              // tick Interval
-            }
-
-            else if (keepMax) {
-                r[1] = axis_max;                                        // max
-                r[2] = Math.ceil((axis_max - axis_min) / ss + 1.0);     // number of ticks
-                r[0] = axis_max - (r[2] - 1) * ss;                      // min
-                var digitsMax = gsf(axis_max).digitsRight;
-                var digitsSS = gsf(ss).digitsRight;
-                if (digitsMax < digitsSS) {
-                    r[3] = bestFormatString(ss);                        // format string
-                }
-                else {
-                    r[3] = '%.' + digitsMax + 'f';
-                }
-                r[4] = ss;                                              // tick Interval
-            }
-        }
-
-        else {
-            var tempr = [];
-
-            // Figure out the axis min, max and number of ticks
-            // the min and max will be some multiple of the tick interval,
-            // 1*10^n, 2*10^n or 5*10^n.  This gaurantees that, if the
-            // axis min is negative, 0 will be a tick.
-            tempr[0] = Math.floor(axis_min / ss) * ss;  // min
-            tempr[1] = Math.ceil(axis_max / ss) * ss;   // max
-            tempr[2] = Math.round((tempr[1]-tempr[0])/ss+1.0);    // number of ticks
-            tempr[3] = bestFormatString(ss);            // format string
-            tempr[4] = ss;                              // tick Interval
-
-            // first, see if we happen to get the right number of ticks
-            if (tempr[2] === numberTicks) {
-                r = tempr;
-            }
-
-            else {
-
-                var newti = bestInterval(tempr[1] - tempr[0], numberTicks);
-
-                r[0] = tempr[0];                        // min
-                r[2] = numberTicks;                     // number of ticks
-                r[4] = newti;                           // tick interval
-                r[3] = bestFormatString(newti);         // format string
-                r[1] = r[0] + (r[2] - 1) * r[4];        // max
-            }
-        }
-
-        return r;
-    };
-
-    $.jqplot.LinearTickGenerator.bestLinearInterval = bestLinearInterval;
-    $.jqplot.LinearTickGenerator.bestInterval = bestInterval;
-    $.jqplot.LinearTickGenerator.bestLinearComponents = bestLinearComponents;
-    $.jqplot.LinearTickGenerator.bestConstrainedInterval = bestConstrainedInterval;
-
-
-    // class: $.jqplot.MarkerRenderer
-    // The default jqPlot marker renderer, rendering the points on the line.
-    $.jqplot.MarkerRenderer = function(options){
-        // Group: Properties
-        
-        // prop: show
-        // whether or not to show the marker.
-        this.show = true;
-        // prop: style
-        // One of diamond, circle, square, x, plus, dash, filledDiamond, filledCircle, filledSquare
-        this.style = 'filledCircle';
-        // prop: lineWidth
-        // size of the line for non-filled markers.
-        this.lineWidth = 2;
-        // prop: size
-        // Size of the marker (diameter or circle, length of edge of square, etc.)
-        this.size = 9.0;
-        // prop: color
-        // color of marker.  Will be set to color of series by default on init.
-        this.color = '#666666';
-        // prop: shadow
-        // whether or not to draw a shadow on the line
-        this.shadow = true;
-        // prop: shadowAngle
-        // Shadow angle in degrees
-        this.shadowAngle = 45;
-        // prop: shadowOffset
-        // Shadow offset from line in pixels
-        this.shadowOffset = 1;
-        // prop: shadowDepth
-        // Number of times shadow is stroked, each stroke offset shadowOffset from the last.
-        this.shadowDepth = 3;
-        // prop: shadowAlpha
-        // Alpha channel transparency of shadow.  0 = transparent.
-        this.shadowAlpha = '0.07';
-        // prop: shadowRenderer
-        // Renderer that will draws the shadows on the marker.
-        this.shadowRenderer = new $.jqplot.ShadowRenderer();
-        // prop: shapeRenderer
-        // Renderer that will draw the marker.
-        this.shapeRenderer = new $.jqplot.ShapeRenderer();
-        
-        $.extend(true, this, options);
-    };
-    
-    $.jqplot.MarkerRenderer.prototype.init = function(options) {
-        $.extend(true, this, options);
-        var sdopt = {angle:this.shadowAngle, offset:this.shadowOffset, alpha:this.shadowAlpha, lineWidth:this.lineWidth, depth:this.shadowDepth, closePath:true};
-        if (this.style.indexOf('filled') != -1) {
-            sdopt.fill = true;
-        }
-        if (this.style.indexOf('ircle') != -1) {
-            sdopt.isarc = true;
-            sdopt.closePath = false;
-        }
-        this.shadowRenderer.init(sdopt);
-        
-        var shopt = {fill:false, isarc:false, strokeStyle:this.color, fillStyle:this.color, lineWidth:this.lineWidth, closePath:true};
-        if (this.style.indexOf('filled') != -1) {
-            shopt.fill = true;
-        }
-        if (this.style.indexOf('ircle') != -1) {
-            shopt.isarc = true;
-            shopt.closePath = false;
-        }
-        this.shapeRenderer.init(shopt);
-    };
-    
-    $.jqplot.MarkerRenderer.prototype.drawDiamond = function(x, y, ctx, fill, options) {
-        var stretch = 1.2;
-        var dx = this.size/2/stretch;
-        var dy = this.size/2*stretch;
-        var points = [[x-dx, y], [x, y+dy], [x+dx, y], [x, y-dy]];
-        if (this.shadow) {
-            this.shadowRenderer.draw(ctx, points);
-        }
-        this.shapeRenderer.draw(ctx, points, options);
-    };
-    
-    $.jqplot.MarkerRenderer.prototype.drawPlus = function(x, y, ctx, fill, options) {
-        var stretch = 1.0;
-        var dx = this.size/2*stretch;
-        var dy = this.size/2*stretch;
-        var points1 = [[x, y-dy], [x, y+dy]];
-        var points2 = [[x+dx, y], [x-dx, y]];
-        var opts = $.extend(true, {}, this.options, {closePath:false});
-        if (this.shadow) {
-            this.shadowRenderer.draw(ctx, points1, {closePath:false});
-            this.shadowRenderer.draw(ctx, points2, {closePath:false});
-        }
-        this.shapeRenderer.draw(ctx, points1, opts);
-        this.shapeRenderer.draw(ctx, points2, opts);
-    };
-    
-    $.jqplot.MarkerRenderer.prototype.drawX = function(x, y, ctx, fill, options) {
-        var stretch = 1.0;
-        var dx = this.size/2*stretch;
-        var dy = this.size/2*stretch;
-        var opts = $.extend(true, {}, this.options, {closePath:false});
-        var points1 = [[x-dx, y-dy], [x+dx, y+dy]];
-        var points2 = [[x-dx, y+dy], [x+dx, y-dy]];
-        if (this.shadow) {
-            this.shadowRenderer.draw(ctx, points1, {closePath:false});
-            this.shadowRenderer.draw(ctx, points2, {closePath:false});
-        }
-        this.shapeRenderer.draw(ctx, points1, opts);
-        this.shapeRenderer.draw(ctx, points2, opts);
-    };
-    
-    $.jqplot.MarkerRenderer.prototype.drawDash = function(x, y, ctx, fill, options) {
-        var stretch = 1.0;
-        var dx = this.size/2*stretch;
-        var dy = this.size/2*stretch;
-        var points = [[x-dx, y], [x+dx, y]];
-        if (this.shadow) {
-            this.shadowRenderer.draw(ctx, points);
-        }
-        this.shapeRenderer.draw(ctx, points, options);
-    };
-    
-    $.jqplot.MarkerRenderer.prototype.drawLine = function(p1, p2, ctx, fill, options) {
-        var points = [p1, p2];
-        if (this.shadow) {
-            this.shadowRenderer.draw(ctx, points);
-        }
-        this.shapeRenderer.draw(ctx, points, options);
-    };
-    
-    $.jqplot.MarkerRenderer.prototype.drawSquare = function(x, y, ctx, fill, options) {
-        var stretch = 1.0;
-        var dx = this.size/2/stretch;
-        var dy = this.size/2*stretch;
-        var points = [[x-dx, y-dy], [x-dx, y+dy], [x+dx, y+dy], [x+dx, y-dy]];
-        if (this.shadow) {
-            this.shadowRenderer.draw(ctx, points);
-        }
-        this.shapeRenderer.draw(ctx, points, options);
-    };
-    
-    $.jqplot.MarkerRenderer.prototype.drawCircle = function(x, y, ctx, fill, options) {
-        var radius = this.size/2;
-        var end = 2*Math.PI;
-        var points = [x, y, radius, 0, end, true];
-        if (this.shadow) {
-            this.shadowRenderer.draw(ctx, points);
-        }
-        this.shapeRenderer.draw(ctx, points, options);
-    };
-    
-    $.jqplot.MarkerRenderer.prototype.draw = function(x, y, ctx, options) {
-        options = options || {};
-        // hack here b/c shape renderer uses canvas based color style options
-        // and marker uses css style names.
-        if (options.show == null || options.show != false) {
-            if (options.color && !options.fillStyle) {
-                options.fillStyle = options.color;
-            }
-            if (options.color && !options.strokeStyle) {
-                options.strokeStyle = options.color;
-            }
-            switch (this.style) {
-                case 'diamond':
-                    this.drawDiamond(x,y,ctx, false, options);
-                    break;
-                case 'filledDiamond':
-                    this.drawDiamond(x,y,ctx, true, options);
-                    break;
-                case 'circle':
-                    this.drawCircle(x,y,ctx, false, options);
-                    break;
-                case 'filledCircle':
-                    this.drawCircle(x,y,ctx, true, options);
-                    break;
-                case 'square':
-                    this.drawSquare(x,y,ctx, false, options);
-                    break;
-                case 'filledSquare':
-                    this.drawSquare(x,y,ctx, true, options);
-                    break;
-                case 'x':
-                    this.drawX(x,y,ctx, true, options);
-                    break;
-                case 'plus':
-                    this.drawPlus(x,y,ctx, true, options);
-                    break;
-                case 'dash':
-                    this.drawDash(x,y,ctx, true, options);
-                    break;
-                case 'line':
-                    this.drawLine(x, y, ctx, false, options);
-                    break;
-                default:
-                    this.drawDiamond(x,y,ctx, false, options);
-                    break;
-            }
-        }
-    };
-    
-    // class: $.jqplot.shadowRenderer
-    // The default jqPlot shadow renderer, rendering shadows behind shapes.
-    $.jqplot.ShadowRenderer = function(options){ 
-        // Group: Properties
-        
-        // prop: angle
-        // Angle of the shadow in degrees.  Measured counter-clockwise from the x axis.
-        this.angle = 45;
-        // prop: offset
-        // Pixel offset at the given shadow angle of each shadow stroke from the last stroke.
-        this.offset = 1;
-        // prop: alpha
-        // alpha transparency of shadow stroke.
-        this.alpha = 0.07;
-        // prop: lineWidth
-        // width of the shadow line stroke.
-        this.lineWidth = 1.5;
-        // prop: lineJoin
-        // How line segments of the shadow are joined.
-        this.lineJoin = 'miter';
-        // prop: lineCap
-        // how ends of the shadow line are rendered.
-        this.lineCap = 'round';
-        // prop; closePath
-        // whether line path segment is closed upon itself.
-        this.closePath = false;
-        // prop: fill
-        // whether to fill the shape.
-        this.fill = false;
-        // prop: depth
-        // how many times the shadow is stroked.  Each stroke will be offset by offset at angle degrees.
-        this.depth = 3;
-        this.strokeStyle = 'rgba(0,0,0,0.1)';
-        // prop: isarc
-        // whether the shadow is an arc or not.
-        this.isarc = false;
-        
-        $.extend(true, this, options);
-    };
-    
-    $.jqplot.ShadowRenderer.prototype.init = function(options) {
-        $.extend(true, this, options);
-    };
-    
-    // function: draw
-    // draws an transparent black (i.e. gray) shadow.
-    //
-    // ctx - canvas drawing context
-    // points - array of points or [x, y, radius, start angle (rad), end angle (rad)]
-    $.jqplot.ShadowRenderer.prototype.draw = function(ctx, points, options) {
-        ctx.save();
-        var opts = (options != null) ? options : {};
-        var fill = (opts.fill != null) ? opts.fill : this.fill;
-        var fillRect = (opts.fillRect != null) ? opts.fillRect : this.fillRect;
-        var closePath = (opts.closePath != null) ? opts.closePath : this.closePath;
-        var offset = (opts.offset != null) ? opts.offset : this.offset;
-        var alpha = (opts.alpha != null) ? opts.alpha : this.alpha;
-        var depth = (opts.depth != null) ? opts.depth : this.depth;
-        var isarc = (opts.isarc != null) ? opts.isarc : this.isarc;
-        var linePattern = (opts.linePattern != null) ? opts.linePattern : this.linePattern;
-        ctx.lineWidth = (opts.lineWidth != null) ? opts.lineWidth : this.lineWidth;
-        ctx.lineJoin = (opts.lineJoin != null) ? opts.lineJoin : this.lineJoin;
-        ctx.lineCap = (opts.lineCap != null) ? opts.lineCap : this.lineCap;
-        ctx.strokeStyle = opts.strokeStyle || this.strokeStyle || 'rgba(0,0,0,'+alpha+')';
-        ctx.fillStyle = opts.fillStyle || this.fillStyle || 'rgba(0,0,0,'+alpha+')';
-        for (var j=0; j<depth; j++) {
-            var ctxPattern = $.jqplot.LinePattern(ctx, linePattern);
-            ctx.translate(Math.cos(this.angle*Math.PI/180)*offset, Math.sin(this.angle*Math.PI/180)*offset);
-            ctxPattern.beginPath();
-            if (isarc) {
-                ctx.arc(points[0], points[1], points[2], points[3], points[4], true);                
-            }
-            else if (fillRect) {
-                if (fillRect) {
-                    ctx.fillRect(points[0], points[1], points[2], points[3]);
-                }
-            }
-            else if (points && points.length){
-                var move = true;
-                for (var i=0; i<points.length; i++) {
-                    // skip to the first non-null point and move to it.
-                    if (points[i][0] != null && points[i][1] != null) {
-                        if (move) {
-                            ctxPattern.moveTo(points[i][0], points[i][1]);
-                            move = false;
-                        }
-                        else {
-                            ctxPattern.lineTo(points[i][0], points[i][1]);
-                        }
-                    }
-                    else {
-                        move = true;
-                    }
-                }
-                
-            }
-            if (closePath) {
-                ctxPattern.closePath();
-            }
-            if (fill) {
-                ctx.fill();
-            }
-            else {
-                ctx.stroke();
-            }
-        }
-        ctx.restore();
-    };
-    
-    // class: $.jqplot.shapeRenderer
-    // The default jqPlot shape renderer.  Given a set of points will
-    // plot them and either stroke a line (fill = false) or fill them (fill = true).
-    // If a filled shape is desired, closePath = true must also be set to close
-    // the shape.
-    $.jqplot.ShapeRenderer = function(options){
-        
-        this.lineWidth = 1.5;
-        // prop: linePattern
-        // line pattern 'dashed', 'dotted', 'solid', some combination
-        // of '-' and '.' characters such as '.-.' or a numerical array like 
-        // [draw, skip, draw, skip, ...] such as [1, 10] to draw a dotted line, 
-        // [1, 10, 20, 10] to draw a dot-dash line, and so on.
-        this.linePattern = 'solid';
-        // prop: lineJoin
-        // How line segments of the shadow are joined.
-        this.lineJoin = 'miter';
-        // prop: lineCap
-        // how ends of the shadow line are rendered.
-        this.lineCap = 'round';
-        // prop; closePath
-        // whether line path segment is closed upon itself.
-        this.closePath = false;
-        // prop: fill
-        // whether to fill the shape.
-        this.fill = false;
-        // prop: isarc
-        // whether the shadow is an arc or not.
-        this.isarc = false;
-        // prop: fillRect
-        // true to draw shape as a filled rectangle.
-        this.fillRect = false;
-        // prop: strokeRect
-        // true to draw shape as a stroked rectangle.
-        this.strokeRect = false;
-        // prop: clearRect
-        // true to cear a rectangle.
-        this.clearRect = false;
-        // prop: strokeStyle
-        // css color spec for the stoke style
-        this.strokeStyle = '#999999';
-        // prop: fillStyle
-        // css color spec for the fill style.
-        this.fillStyle = '#999999'; 
-        
-        $.extend(true, this, options);
-    };
-    
-    $.jqplot.ShapeRenderer.prototype.init = function(options) {
-        $.extend(true, this, options);
-    };
-    
-    // function: draw
-    // draws the shape.
-    //
-    // ctx - canvas drawing context
-    // points - array of points for shapes or 
-    // [x, y, width, height] for rectangles or
-    // [x, y, radius, start angle (rad), end angle (rad)] for circles and arcs.
-    $.jqplot.ShapeRenderer.prototype.draw = function(ctx, points, options) {
-        ctx.save();
-        var opts = (options != null) ? options : {};
-        var fill = (opts.fill != null) ? opts.fill : this.fill;
-        var closePath = (opts.closePath != null) ? opts.closePath : this.closePath;
-        var fillRect = (opts.fillRect != null) ? opts.fillRect : this.fillRect;
-        var strokeRect = (opts.strokeRect != null) ? opts.strokeRect : this.strokeRect;
-        var clearRect = (opts.clearRect != null) ? opts.clearRect : this.clearRect;
-        var isarc = (opts.isarc != null) ? opts.isarc : this.isarc;
-        var linePattern = (opts.linePattern != null) ? opts.linePattern : this.linePattern;
-        var ctxPattern = $.jqplot.LinePattern(ctx, linePattern);
-        ctx.lineWidth = opts.lineWidth || this.lineWidth;
-        ctx.lineJoin = opts.lineJoin || this.lineJoin;
-        ctx.lineCap = opts.lineCap || this.lineCap;
-        ctx.strokeStyle = (opts.strokeStyle || opts.color) || this.strokeStyle;
-        ctx.fillStyle = opts.fillStyle || this.fillStyle;
-        ctx.beginPath();
-        if (isarc) {
-            ctx.arc(points[0], points[1], points[2], points[3], points[4], true);   
-            if (closePath) {
-                ctx.closePath();
-            }
-            if (fill) {
-                ctx.fill();
-            }
-            else {
-                ctx.stroke();
-            }
-            ctx.restore();
-            return;
-        }
-        else if (clearRect) {
-            ctx.clearRect(points[0], points[1], points[2], points[3]);
-            ctx.restore();
-            return;
-        }
-        else if (fillRect || strokeRect) {
-            if (fillRect) {
-                ctx.fillRect(points[0], points[1], points[2], points[3]);
-            }
-            if (strokeRect) {
-                ctx.strokeRect(points[0], points[1], points[2], points[3]);
-                ctx.restore();
-                return;
-            }
-        }
-        else if (points && points.length){
-            var move = true;
-            for (var i=0; i<points.length; i++) {
-                // skip to the first non-null point and move to it.
-                if (points[i][0] != null && points[i][1] != null) {
-                    if (move) {
-                        ctxPattern.moveTo(points[i][0], points[i][1]);
-                        move = false;
-                    }
-                    else {
-                        ctxPattern.lineTo(points[i][0], points[i][1]);
-                    }
-                }
-                else {
-                    move = true;
-                }
-            }
-            if (closePath) {
-                ctxPattern.closePath();
-            }
-            if (fill) {
-                ctx.fill();
-            }
-            else {
-                ctx.stroke();
-            }
-        }
-        ctx.restore();
-    };
-    
-    // class $.jqplot.TableLegendRenderer
-    // The default legend renderer for jqPlot.
-    $.jqplot.TableLegendRenderer = function(){
-        //
-    };
-    
-    $.jqplot.TableLegendRenderer.prototype.init = function(options) {
-        $.extend(true, this, options);
-    };
-        
-    $.jqplot.TableLegendRenderer.prototype.addrow = function (label, color, pad, reverse) {
-        var rs = (pad) ? this.rowSpacing+'px' : '0px';
-        var tr;
-        var td;
-        var elem;
-        var div0;
-        var div1;
-        elem = document.createElement('tr');
-        tr = $(elem);
-        tr.addClass('jqplot-table-legend');
-        elem = null;
-
-        if (reverse){
-            tr.prependTo(this._elem);
-        }
-
-        else{
-            tr.appendTo(this._elem);
-        }
-
-        if (this.showSwatches) {
-            td = $(document.createElement('td'));
-            td.addClass('jqplot-table-legend jqplot-table-legend-swatch');
-            td.css({textAlign: 'center', paddingTop: rs});
-
-            div0 = $(document.createElement('div'));
-            div0.addClass('jqplot-table-legend-swatch-outline');
-            div1 = $(document.createElement('div'));
-            div1.addClass('jqplot-table-legend-swatch');
-            div1.css({backgroundColor: color, borderColor: color});
-
-            tr.append(td.append(div0.append(div1)));
-
-            // $('<td class="jqplot-table-legend" style="text-align:center;padding-top:'+rs+';">'+
-            // '<div><div class="jqplot-table-legend-swatch" style="background-color:'+color+';border-color:'+color+';"></div>'+
-            // '</div></td>').appendTo(tr);
-        }
-        if (this.showLabels) {
-            td = $(document.createElement('td'));
-            td.addClass('jqplot-table-legend jqplot-table-legend-label');
-            td.css('paddingTop', rs);
-            tr.append(td);
-
-            // elem = $('<td class="jqplot-table-legend" style="padding-top:'+rs+';"></td>');
-            // elem.appendTo(tr);
-            if (this.escapeHtml) {
-                td.text(label);
-            }
-            else {
-                td.html(label);
-            }
-        }
-        td = null;
-        div0 = null;
-        div1 = null;
-        tr = null;
-        elem = null;
-    };
-    
-    // called with scope of legend
-    $.jqplot.TableLegendRenderer.prototype.draw = function() {
-        if (this._elem) {
-            this._elem.emptyForce();
-            this._elem = null;
-        }
-
-        if (this.show) {
-            var series = this._series;
-            // make a table.  one line label per row.
-            var elem = document.createElement('table');
-            this._elem = $(elem);
-            this._elem.addClass('jqplot-table-legend');
-
-            var ss = {position:'absolute'};
-            if (this.background) {
-                ss['background'] = this.background;
-            }
-            if (this.border) {
-                ss['border'] = this.border;
-            }
-            if (this.fontSize) {
-                ss['fontSize'] = this.fontSize;
-            }
-            if (this.fontFamily) {
-                ss['fontFamily'] = this.fontFamily;
-            }
-            if (this.textColor) {
-                ss['textColor'] = this.textColor;
-            }
-            if (this.marginTop != null) {
-                ss['marginTop'] = this.marginTop;
-            }
-            if (this.marginBottom != null) {
-                ss['marginBottom'] = this.marginBottom;
-            }
-            if (this.marginLeft != null) {
-                ss['marginLeft'] = this.marginLeft;
-            }
-            if (this.marginRight != null) {
-                ss['marginRight'] = this.marginRight;
-            }
-            
-        
-            var pad = false, 
-                reverse = false,
-                s;
-            for (var i = 0; i< series.length; i++) {
-                s = series[i];
-                if (s._stack || s.renderer.constructor == $.jqplot.BezierCurveRenderer){
-                    reverse = true;
-                }
-                if (s.show && s.showLabel) {
-                    var lt = this.labels[i] || s.label.toString();
-                    if (lt) {
-                        var color = s.color;
-                        if (reverse && i < series.length - 1){
-                            pad = true;
-                        }
-                        else if (reverse && i == series.length - 1){
-                            pad = false;
-                        }
-                        this.renderer.addrow.call(this, lt, color, pad, reverse);
-                        pad = true;
-                    }
-                    // let plugins add more rows to legend.  Used by trend line plugin.
-                    for (var j=0; j<$.jqplot.addLegendRowHooks.length; j++) {
-                        var item = $.jqplot.addLegendRowHooks[j].call(this, s);
-                        if (item) {
-                            this.renderer.addrow.call(this, item.label, item.color, pad);
-                            pad = true;
-                        } 
-                    }
-                    lt = null;
-                }
-            }
-        }
-        return this._elem;
-    };
-    
-    $.jqplot.TableLegendRenderer.prototype.pack = function(offsets) {
-        if (this.show) {       
-            if (this.placement == 'insideGrid') {
-                switch (this.location) {
-                    case 'nw':
-                        var a = offsets.left;
-                        var b = offsets.top;
-                        this._elem.css('left', a);
-                        this._elem.css('top', b);
-                        break;
-                    case 'n':
-                        var a = (offsets.left + (this._plotDimensions.width - offsets.right))/2 - this.getWidth()/2;
-                        var b = offsets.top;
-                        this._elem.css('left', a);
-                        this._elem.css('top', b);
-                        break;
-                    case 'ne':
-                        var a = offsets.right;
-                        var b = offsets.top;
-                        this._elem.css({right:a, top:b});
-                        break;
-                    case 'e':
-                        var a = offsets.right;
-                        var b = (offsets.top + (this._plotDimensions.height - offsets.bottom))/2 - this.getHeight()/2;
-                        this._elem.css({right:a, top:b});
-                        break;
-                    case 'se':
-                        var a = offsets.right;
-                        var b = offsets.bottom;
-                        this._elem.css({right:a, bottom:b});
-                        break;
-                    case 's':
-                        var a = (offsets.left + (this._plotDimensions.width - offsets.right))/2 - this.getWidth()/2;
-                        var b = offsets.bottom;
-                        this._elem.css({left:a, bottom:b});
-                        break;
-                    case 'sw':
-                        var a = offsets.left;
-                        var b = offsets.bottom;
-                        this._elem.css({left:a, bottom:b});
-                        break;
-                    case 'w':
-                        var a = offsets.left;
-                        var b = (offsets.top + (this._plotDimensions.height - offsets.bottom))/2 - this.getHeight()/2;
-                        this._elem.css({left:a, top:b});
-                        break;
-                    default:  // same as 'se'
-                        var a = offsets.right;
-                        var b = offsets.bottom;
-                        this._elem.css({right:a, bottom:b});
-                        break;
-                }
-                
-            }
-            else if (this.placement == 'outside'){
-                switch (this.location) {
-                    case 'nw':
-                        var a = this._plotDimensions.width - offsets.left;
-                        var b = offsets.top;
-                        this._elem.css('right', a);
-                        this._elem.css('top', b);
-                        break;
-                    case 'n':
-                        var a = (offsets.left + (this._plotDimensions.width - offsets.right))/2 - this.getWidth()/2;
-                        var b = this._plotDimensions.height - offsets.top;
-                        this._elem.css('left', a);
-                        this._elem.css('bottom', b);
-                        break;
-                    case 'ne':
-                        var a = this._plotDimensions.width - offsets.right;
-                        var b = offsets.top;
-                        this._elem.css({left:a, top:b});
-                        break;
-                    case 'e':
-                        var a = this._plotDimensions.width - offsets.right;
-                        var b = (offsets.top + (this._plotDimensions.height - offsets.bottom))/2 - this.getHeight()/2;
-                        this._elem.css({left:a, top:b});
-                        break;
-                    case 'se':
-                        var a = this._plotDimensions.width - offsets.right;
-                        var b = offsets.bottom;
-                        this._elem.css({left:a, bottom:b});
-                        break;
-                    case 's':
-                        var a = (offsets.left + (this._plotDimensions.width - offsets.right))/2 - this.getWidth()/2;
-                        var b = this._plotDimensions.height - offsets.bottom;
-                        this._elem.css({left:a, top:b});
-                        break;
-                    case 'sw':
-                        var a = this._plotDimensions.width - offsets.left;
-                        var b = offsets.bottom;
-                        this._elem.css({right:a, bottom:b});
-                        break;
-                    case 'w':
-                        var a = this._plotDimensions.width - offsets.left;
-                        var b = (offsets.top + (this._plotDimensions.height - offsets.bottom))/2 - this.getHeight()/2;
-                        this._elem.css({right:a, top:b});
-                        break;
-                    default:  // same as 'se'
-                        var a = offsets.right;
-                        var b = offsets.bottom;
-                        this._elem.css({right:a, bottom:b});
-                        break;
-                }
-            }
-            else {
-                switch (this.location) {
-                    case 'nw':
-                        this._elem.css({left:0, top:offsets.top});
-                        break;
-                    case 'n':
-                        var a = (offsets.left + (this._plotDimensions.width - offsets.right))/2 - this.getWidth()/2;
-                        this._elem.css({left: a, top:offsets.top});
-                        break;
-                    case 'ne':
-                        this._elem.css({right:0, top:offsets.top});
-                        break;
-                    case 'e':
-                        var b = (offsets.top + (this._plotDimensions.height - offsets.bottom))/2 - this.getHeight()/2;
-                        this._elem.css({right:offsets.right, top:b});
-                        break;
-                    case 'se':
-                        this._elem.css({right:offsets.right, bottom:offsets.bottom});
-                        break;
-                    case 's':
-                        var a = (offsets.left + (this._plotDimensions.width - offsets.right))/2 - this.getWidth()/2;
-                        this._elem.css({left: a, bottom:offsets.bottom});
-                        break;
-                    case 'sw':
-                        this._elem.css({left:offsets.left, bottom:offsets.bottom});
-                        break;
-                    case 'w':
-                        var b = (offsets.top + (this._plotDimensions.height - offsets.bottom))/2 - this.getHeight()/2;
-                        this._elem.css({left:offsets.left, top:b});
-                        break;
-                    default:  // same as 'se'
-                        this._elem.css({right:offsets.right, bottom:offsets.bottom});
-                        break;
-                }
-            }
-        } 
-    };
-
-    /**
-     * Class: $.jqplot.ThemeEngine
-     * Theme Engine provides a programatic way to change some of the  more
-     * common jqplot styling options such as fonts, colors and grid options.
-     * A theme engine instance is created with each plot.  The theme engine
-     * manages a collection of themes which can be modified, added to, or 
-     * applied to the plot.
-     * 
-     * The themeEngine class is not instantiated directly.
-     * When a plot is initialized, the current plot options are scanned
-     * an a default theme named "Default" is created.  This theme is
-     * used as the basis for other themes added to the theme engine and
-     * is always available.
-     * 
-     * A theme is a simple javascript object with styling parameters for
-     * various entities of the plot.  A theme has the form:
-     * 
-     * 
-     * > {
-     * >     _name:f "Default",
-     * >     target: {
-     * >         backgroundColor: "transparent"
-     * >     },
-     * >     legend: {
-     * >         textColor: null,
-     * >         fontFamily: null,
-     * >         fontSize: null,
-     * >         border: null,
-     * >         background: null
-     * >     },
-     * >     title: {
-     * >         textColor: "rgb(102, 102, 102)",
-     * >         fontFamily: "'Trebuchet MS',Arial,Helvetica,sans-serif",
-     * >         fontSize: "19.2px",
-     * >         textAlign: "center"
-     * >     },
-     * >     seriesStyles: {},
-     * >     series: [{
-     * >         color: "#4bb2c5",
-     * >         lineWidth: 2.5,
-     * >         linePattern: "solid",
-     * >         shadow: true,
-     * >         fillColor: "#4bb2c5",
-     * >         showMarker: true,
-     * >         markerOptions: {
-     * >             color: "#4bb2c5",
-     * >             show: true,
-     * >             style: 'filledCircle',
-     * >             lineWidth: 1.5,
-     * >             size: 4,
-     * >             shadow: true
-     * >         }
-     * >     }],
-     * >     grid: {
-     * >         drawGridlines: true,
-     * >         gridLineColor: "#cccccc",
-     * >         gridLineWidth: 1,
-     * >         backgroundColor: "#fffdf6",
-     * >         borderColor: "#999999",
-     * >         borderWidth: 2,
-     * >         shadow: true
-     * >     },
-     * >     axesStyles: {
-     * >         label: {},
-     * >         ticks: {}
-     * >     },
-     * >     axes: {
-     * >         xaxis: {
-     * >             borderColor: "#999999",
-     * >             borderWidth: 2,
-     * >             ticks: {
-     * >                 show: true,
-     * >                 showGridline: true,
-     * >                 showLabel: true,
-     * >                 showMark: true,
-     * >                 size: 4,
-     * >                 textColor: "",
-     * >                 whiteSpace: "nowrap",
-     * >                 fontSize: "12px",
-     * >                 fontFamily: "'Trebuchet MS',Arial,Helvetica,sans-serif"
-     * >             },
-     * >             label: {
-     * >                 textColor: "rgb(102, 102, 102)",
-     * >                 whiteSpace: "normal",
-     * >                 fontSize: "14.6667px",
-     * >                 fontFamily: "'Trebuchet MS',Arial,Helvetica,sans-serif",
-     * >                 fontWeight: "400"
-     * >             }
-     * >         },
-     * >         yaxis: {
-     * >             borderColor: "#999999",
-     * >             borderWidth: 2,
-     * >             ticks: {
-     * >                 show: true,
-     * >                 showGridline: true,
-     * >                 showLabel: true,
-     * >                 showMark: true,
-     * >                 size: 4,
-     * >                 textColor: "",
-     * >                 whiteSpace: "nowrap",
-     * >                 fontSize: "12px",
-     * >                 fontFamily: "'Trebuchet MS',Arial,Helvetica,sans-serif"
-     * >             },
-     * >             label: {
-     * >                 textColor: null,
-     * >                 whiteSpace: null,
-     * >                 fontSize: null,
-     * >                 fontFamily: null,
-     * >                 fontWeight: null
-     * >             }
-     * >         },
-     * >         x2axis: {...
-     * >         },
-     * >         ...
-     * >         y9axis: {...
-     * >         }
-     * >     }
-     * > }
-     * 
-     * "seriesStyles" is a style object that will be applied to all series in the plot.
-     * It will forcibly override any styles applied on the individual series.  "axesStyles" is
-     * a style object that will be applied to all axes in the plot.  It will also forcibly
-     * override any styles on the individual axes.
-     * 
-     * The example shown above has series options for a line series.  Options for other
-     * series types are shown below:
-     * 
-     * Bar Series:
-     * 
-     * > {
-     * >     color: "#4bb2c5",
-     * >     seriesColors: ["#4bb2c5", "#EAA228", "#c5b47f", "#579575", "#839557", "#958c12", "#953579", "#4b5de4", "#d8b83f", "#ff5800", "#0085cc", "#c747a3", "#cddf54", "#FBD178", "#26B4E3", "#bd70c7"],
-     * >     lineWidth: 2.5,
-     * >     shadow: true,
-     * >     barPadding: 2,
-     * >     barMargin: 10,
-     * >     barWidth: 15.09375,
-     * >     highlightColors: ["rgb(129,201,214)", "rgb(129,201,214)", "rgb(129,201,214)", "rgb(129,201,214)", "rgb(129,201,214)", "rgb(129,201,214)", "rgb(129,201,214)", "rgb(129,201,214)"]
-     * > }
-     * 
-     * Pie Series:
-     * 
-     * > {
-     * >     seriesColors: ["#4bb2c5", "#EAA228", "#c5b47f", "#579575", "#839557", "#958c12", "#953579", "#4b5de4", "#d8b83f", "#ff5800", "#0085cc", "#c747a3", "#cddf54", "#FBD178", "#26B4E3", "#bd70c7"],
-     * >     padding: 20,
-     * >     sliceMargin: 0,
-     * >     fill: true,
-     * >     shadow: true,
-     * >     startAngle: 0,
-     * >     lineWidth: 2.5,
-     * >     highlightColors: ["rgb(129,201,214)", "rgb(240,189,104)", "rgb(214,202,165)", "rgb(137,180,158)", "rgb(168,180,137)", "rgb(180,174,89)", "rgb(180,113,161)", "rgb(129,141,236)", "rgb(227,205,120)", "rgb(255,138,76)", "rgb(76,169,219)", "rgb(215,126,190)", "rgb(220,232,135)", "rgb(200,167,96)", "rgb(103,202,235)", "rgb(208,154,215)"]
-     * > }
-     * 
-     * Funnel Series:
-     * 
-     * > {
-     * >     color: "#4bb2c5",
-     * >     lineWidth: 2,
-     * >     shadow: true,
-     * >     padding: {
-     * >         top: 20,
-     * >         right: 20,
-     * >         bottom: 20,
-     * >         left: 20
-     * >     },
-     * >     sectionMargin: 6,
-     * >     seriesColors: ["#4bb2c5", "#EAA228", "#c5b47f", "#579575", "#839557", "#958c12", "#953579", "#4b5de4", "#d8b83f", "#ff5800", "#0085cc", "#c747a3", "#cddf54", "#FBD178", "#26B4E3", "#bd70c7"],
-     * >     highlightColors: ["rgb(147,208,220)", "rgb(242,199,126)", "rgb(220,210,178)", "rgb(154,191,172)", "rgb(180,191,154)", "rgb(191,186,112)", "rgb(191,133,174)", "rgb(147,157,238)", "rgb(231,212,139)", "rgb(255,154,102)", "rgb(102,181,224)", "rgb(221,144,199)", "rgb(225,235,152)", "rgb(200,167,96)", "rgb(124,210,238)", "rgb(215,169,221)"]
-     * > }
-     * 
-     */
-    $.jqplot.ThemeEngine = function(){
-        // Group: Properties
-        //
-        // prop: themes
-        // hash of themes managed by the theme engine.  
-        // Indexed by theme name.
-        this.themes = {};
-        // prop: activeTheme
-        // Pointer to currently active theme
-        this.activeTheme=null;
-        
-    };
-    
-    // called with scope of plot
-    $.jqplot.ThemeEngine.prototype.init = function() {
-        // get the Default theme from the current plot settings.
-        var th = new $.jqplot.Theme({_name:'Default'});
-        var n, i, nn;
-        
-        for (n in th.target) {
-            if (n == "textColor") {
-                th.target[n] = this.target.css('color');
-            }
-            else {
-                th.target[n] = this.target.css(n);
-            }
-        }
-        
-        if (this.title.show && this.title._elem) {
-            for (n in th.title) {
-                if (n == "textColor") {
-                    th.title[n] = this.title._elem.css('color');
-                }
-                else {
-                    th.title[n] = this.title._elem.css(n);
-                }
-            }
-        }
-        
-        for (n in th.grid) {
-            th.grid[n] = this.grid[n];
-        }
-        if (th.grid.backgroundColor == null && this.grid.background != null) {
-            th.grid.backgroundColor = this.grid.background;
-        }
-        if (this.legend.show && this.legend._elem) {
-            for (n in th.legend) {
-                if (n == 'textColor') {
-                    th.legend[n] = this.legend._elem.css('color');
-                }
-                else {
-                    th.legend[n] = this.legend._elem.css(n);
-                }
-            }
-        }
-        var s;
-        
-        for (i=0; i<this.series.length; i++) {
-            s = this.series[i];
-            if (s.renderer.constructor == $.jqplot.LineRenderer) {
-                th.series.push(new LineSeriesProperties());
-            }
-            else if (s.renderer.constructor == $.jqplot.BarRenderer) {
-                th.series.push(new BarSeriesProperties());
-            }
-            else if (s.renderer.constructor == $.jqplot.PieRenderer) {
-                th.series.push(new PieSeriesProperties());
-            }
-            else if (s.renderer.constructor == $.jqplot.DonutRenderer) {
-                th.series.push(new DonutSeriesProperties());
-            }
-            else if (s.renderer.constructor == $.jqplot.FunnelRenderer) {
-                th.series.push(new FunnelSeriesProperties());
-            }
-            else if (s.renderer.constructor == $.jqplot.MeterGaugeRenderer) {
-                th.series.push(new MeterSeriesProperties());
-            }
-            else {
-                th.series.push({});
-            }
-            for (n in th.series[i]) {
-                th.series[i][n] = s[n];
-            }
-        }
-        var a, ax;
-        for (n in this.axes) {
-            ax = this.axes[n];
-            a = th.axes[n] = new AxisProperties();
-            a.borderColor = ax.borderColor;
-            a.borderWidth = ax.borderWidth;
-            if (ax._ticks && ax._ticks[0]) {
-                for (nn in a.ticks) {
-                    if (ax._ticks[0].hasOwnProperty(nn)) {
-                        a.ticks[nn] = ax._ticks[0][nn];
-                    }
-                    else if (ax._ticks[0]._elem){
-                        a.ticks[nn] = ax._ticks[0]._elem.css(nn);
-                    }
-                }
-            }
-            if (ax._label && ax._label.show) {
-                for (nn in a.label) {
-                    // a.label[nn] = ax._label._elem.css(nn);
-                    if (ax._label[nn]) {
-                        a.label[nn] = ax._label[nn];
-                    }
-                    else if (ax._label._elem){
-                        if (nn == 'textColor') {
-                            a.label[nn] = ax._label._elem.css('color');
-                        }
-                        else {
-                            a.label[nn] = ax._label._elem.css(nn);
-                        }
-                    }
-                }
-            }
-        }
-        this.themeEngine._add(th);
-        this.themeEngine.activeTheme  = this.themeEngine.themes[th._name];
-    };
-    /**
-     * Group: methods
-     * 
-     * method: get
-     * 
-     * Get and return the named theme or the active theme if no name given.
-     * 
-     * parameter:
-     * 
-     * name - name of theme to get.
-     * 
-     * returns:
-     * 
-     * Theme instance of given name.
-     */   
-    $.jqplot.ThemeEngine.prototype.get = function(name) {
-        if (!name) {
-            // return the active theme
-            return this.activeTheme;
-        }
-        else {
-            return this.themes[name];
-        }
-    };
-    
-    function numericalOrder(a,b) { return a-b; }
-    
-    /**
-     * method: getThemeNames
-     * 
-     * Return the list of theme names in this manager in alpha-numerical order.
-     * 
-     * parameter:
-     * 
-     * None
-     * 
-     * returns:
-     * 
-     * A the list of theme names in this manager in alpha-numerical order.
-     */       
-    $.jqplot.ThemeEngine.prototype.getThemeNames = function() {
-        var tn = [];
-        for (var n in this.themes) {
-            tn.push(n);
-        }
-        return tn.sort(numericalOrder);
-    };
-
-    /**
-     * method: getThemes
-     * 
-     * Return a list of themes in alpha-numerical order by name.
-     * 
-     * parameter:
-     * 
-     * None
-     * 
-     * returns:
-     * 
-     * A list of themes in alpha-numerical order by name.
-     */ 
-    $.jqplot.ThemeEngine.prototype.getThemes = function() {
-        var tn = [];
-        var themes = [];
-        for (var n in this.themes) {
-            tn.push(n);
-        }
-        tn.sort(numericalOrder);
-        for (var i=0; i<tn.length; i++) {
-            themes.push(this.themes[tn[i]]);
-        }
-        return themes;
-    };
-    
-    $.jqplot.ThemeEngine.prototype.activate = function(plot, name) {
-        // sometimes need to redraw whole plot.
-        var redrawPlot = false;
-        if (!name && this.activeTheme && this.activeTheme._name) {
-            name = this.activeTheme._name;
-        }
-        if (!this.themes.hasOwnProperty(name)) {
-            throw new Error("No theme of that name");
-        }
-        else {
-            var th = this.themes[name];
-            this.activeTheme = th;
-            var val, checkBorderColor = false, checkBorderWidth = false;
-            var arr = ['xaxis', 'x2axis', 'yaxis', 'y2axis'];
-            
-            for (i=0; i<arr.length; i++) {
-                var ax = arr[i];
-                if (th.axesStyles.borderColor != null) {
-                    plot.axes[ax].borderColor = th.axesStyles.borderColor;
-                }
-                if (th.axesStyles.borderWidth != null) {
-                    plot.axes[ax].borderWidth = th.axesStyles.borderWidth;
-                }
-            }
-            
-            for (var axname in plot.axes) {
-                var axis = plot.axes[axname];
-                if (axis.show) {
-                    var thaxis = th.axes[axname] || {};
-                    var thaxstyle = th.axesStyles;
-                    var thax = $.jqplot.extend(true, {}, thaxis, thaxstyle);
-                    val = (th.axesStyles.borderColor != null) ? th.axesStyles.borderColor : thax.borderColor;
-                    if (thax.borderColor != null) {
-                        axis.borderColor = thax.borderColor;
-                        redrawPlot = true;
-                    }
-                    val = (th.axesStyles.borderWidth != null) ? th.axesStyles.borderWidth : thax.borderWidth;
-                    if (thax.borderWidth != null) {
-                        axis.borderWidth = thax.borderWidth;
-                        redrawPlot = true;
-                    }
-                    if (axis._ticks && axis._ticks[0]) {
-                        for (var nn in thax.ticks) {
-                            // val = null;
-                            // if (th.axesStyles.ticks && th.axesStyles.ticks[nn] != null) {
-                            //     val = th.axesStyles.ticks[nn];
-                            // }
-                            // else if (thax.ticks[nn] != null){
-                            //     val = thax.ticks[nn]
-                            // }
-                            val = thax.ticks[nn];
-                            if (val != null) {
-                                axis.tickOptions[nn] = val;
-                                axis._ticks = [];
-                                redrawPlot = true;
-                            }
-                        }
-                    }
-                    if (axis._label && axis._label.show) {
-                        for (var nn in thax.label) {
-                            // val = null;
-                            // if (th.axesStyles.label && th.axesStyles.label[nn] != null) {
-                            //     val = th.axesStyles.label[nn];
-                            // }
-                            // else if (thax.label && thax.label[nn] != null){
-                            //     val = thax.label[nn]
-                            // }
-                            val = thax.label[nn];
-                            if (val != null) {
-                                axis.labelOptions[nn] = val;
-                                redrawPlot = true;
-                            }
-                        }
-                    }
-                    
-                }
-            }            
-            
-            for (var n in th.grid) {
-                if (th.grid[n] != null) {
-                    plot.grid[n] = th.grid[n];
-                }
-            }
-            if (!redrawPlot) {
-                plot.grid.draw();
-            }
-            
-            if (plot.legend.show) { 
-                for (n in th.legend) {
-                    if (th.legend[n] != null) {
-                        plot.legend[n] = th.legend[n];
-                    }
-                }
-            }
-            if (plot.title.show) {
-                for (n in th.title) {
-                    if (th.title[n] != null) {
-                        plot.title[n] = th.title[n];
-                    }
-                }
-            }
-            
-            var i;
-            for (i=0; i<th.series.length; i++) {
-                var opts = {};
-                var redrawSeries = false;
-                for (n in th.series[i]) {
-                    val = (th.seriesStyles[n] != null) ? th.seriesStyles[n] : th.series[i][n];
-                    if (val != null) {
-                        opts[n] = val;
-                        if (n == 'color') {
-                            plot.series[i].renderer.shapeRenderer.fillStyle = val;
-                            plot.series[i].renderer.shapeRenderer.strokeStyle = val;
-                            plot.series[i][n] = val;
-                        }
-                        else if ((n == 'lineWidth') || (n == 'linePattern')) {
-                            plot.series[i].renderer.shapeRenderer[n] = val;
-                            plot.series[i][n] = val;
-                        }
-                        else if (n == 'markerOptions') {
-                            merge (plot.series[i].markerOptions, val);
-                            merge (plot.series[i].markerRenderer, val);
-                        }
-                        else {
-                            plot.series[i][n] = val;
-                        }
-                        redrawPlot = true;
-                    }
-                }
-            }
-            
-            if (redrawPlot) {
-                plot.target.empty();
-                plot.draw();
-            }
-            
-            for (n in th.target) {
-                if (th.target[n] != null) {
-                    plot.target.css(n, th.target[n]);
-                }
-            }
-        }
-        
-    };
-    
-    $.jqplot.ThemeEngine.prototype._add = function(theme, name) {
-        if (name) {
-            theme._name = name;
-        }
-        if (!theme._name) {
-            theme._name = Date.parse(new Date());
-        }
-        if (!this.themes.hasOwnProperty(theme._name)) {
-            this.themes[theme._name] = theme;
-        }
-        else {
-            throw new Error("jqplot.ThemeEngine Error: Theme already in use");
-        }
-    };
-    
-    // method remove
-    // Delete the named theme, return true on success, false on failure.
-    
-
-    /**
-     * method: remove
-     * 
-     * Remove the given theme from the themeEngine.
-     * 
-     * parameters:
-     * 
-     * name - name of the theme to remove.
-     * 
-     * returns:
-     * 
-     * true on success, false on failure.
-     */
-    $.jqplot.ThemeEngine.prototype.remove = function(name) {
-        if (name == 'Default') {
-            return false;
-        }
-        return delete this.themes[name];
-    };
-
-    /**
-     * method: newTheme
-     * 
-     * Create a new theme based on the default theme, adding it the themeEngine.
-     * 
-     * parameters:
-     * 
-     * name - name of the new theme.
-     * obj - optional object of styles to be applied to this new theme.
-     * 
-     * returns:
-     * 
-     * new Theme object.
-     */
-    $.jqplot.ThemeEngine.prototype.newTheme = function(name, obj) {
-        if (typeof(name) == 'object') {
-            obj = obj || name;
-            name = null;
-        }
-        if (obj && obj._name) {
-            name = obj._name;
-        }
-        else {
-            name = name || Date.parse(new Date());
-        }
-        // var th = new $.jqplot.Theme(name);
-        var th = this.copy(this.themes['Default']._name, name);
-        $.jqplot.extend(th, obj);
-        return th;
-    };
-    
-    // function clone(obj) {
-    //     return eval(obj.toSource());
-    // }
-    
-    function clone(obj){
-        if(obj == null || typeof(obj) != 'object'){
-            return obj;
-        }
-    
-        var temp = new obj.constructor();
-        for(var key in obj){
-            temp[key] = clone(obj[key]);
-        }   
-        return temp;
-    }
-    
-    $.jqplot.clone = clone;
-    
-    function merge(obj1, obj2) {
-        if (obj2 ==  null || typeof(obj2) != 'object') {
-            return;
-        }
-        for (var key in obj2) {
-            if (key == 'highlightColors') {
-                obj1[key] = clone(obj2[key]);
-            }
-            if (obj2[key] != null && typeof(obj2[key]) == 'object') {
-                if (!obj1.hasOwnProperty(key)) {
-                    obj1[key] = {};
-                }
-                merge(obj1[key], obj2[key]);
-            }
-            else {
-                obj1[key] = obj2[key];
-            }
-        }
-    }
-    
-    $.jqplot.merge = merge;
-    
-        // Use the jQuery 1.3.2 extend function since behaviour in jQuery 1.4 seems problematic
-    $.jqplot.extend = function() {
-        // copy reference to target object
-        var target = arguments[0] || {}, i = 1, length = arguments.length, deep = false, options;
-
-        // Handle a deep copy situation
-        if ( typeof target === "boolean" ) {
-            deep = target;
-            target = arguments[1] || {};
-            // skip the boolean and the target
-            i = 2;
-        }
-
-        // Handle case when target is a string or something (possible in deep copy)
-        if ( typeof target !== "object" && !toString.call(target) === "[object Function]" ) {
-            target = {};
-        }
-
-        for ( ; i < length; i++ ){
-            // Only deal with non-null/undefined values
-            if ( (options = arguments[ i ]) != null ) {
-                // Extend the base object
-                for ( var name in options ) {
-                    var src = target[ name ], copy = options[ name ];
-
-                    // Prevent never-ending loop
-                    if ( target === copy ) {
-                        continue;
-                    }
-
-                    // Recurse if we're merging object values
-                    if ( deep && copy && typeof copy === "object" && !copy.nodeType ) {
-                        target[ name ] = $.jqplot.extend( deep, 
-                            // Never move original objects, clone them
-                            src || ( copy.length != null ? [ ] : { } )
-                        , copy );
-                    }
-                    // Don't bring in undefined values
-                    else if ( copy !== undefined ) {
-                        target[ name ] = copy;
-                    }
-                }
-            }
-        }
-        // Return the modified object
-        return target;
-    };
-
-    /**
-     * method: rename
-     * 
-     * Rename a theme.
-     * 
-     * parameters:
-     * 
-     * oldName - current name of the theme.
-     * newName - desired name of the theme.
-     * 
-     * returns:
-     * 
-     * new Theme object.
-     */
-    $.jqplot.ThemeEngine.prototype.rename = function (oldName, newName) {
-        if (oldName == 'Default' || newName == 'Default') {
-            throw new Error ("jqplot.ThemeEngine Error: Cannot rename from/to Default");
-        }
-        if (this.themes.hasOwnProperty(newName)) {
-            throw new Error ("jqplot.ThemeEngine Error: New name already in use.");
-        }
-        else if (this.themes.hasOwnProperty(oldName)) {
-            var th = this.copy (oldName, newName);
-            this.remove(oldName);
-            return th;
-        }
-        throw new Error("jqplot.ThemeEngine Error: Old name or new name invalid");
-    };
-
-    /**
-     * method: copy
-     * 
-     * Create a copy of an existing theme in the themeEngine, adding it the themeEngine.
-     * 
-     * parameters:
-     * 
-     * sourceName - name of the existing theme.
-     * targetName - name of the copy.
-     * obj - optional object of style parameter to apply to the new theme.
-     * 
-     * returns:
-     * 
-     * new Theme object.
-     */
-    $.jqplot.ThemeEngine.prototype.copy = function (sourceName, targetName, obj) {
-        if (targetName == 'Default') {
-            throw new Error ("jqplot.ThemeEngine Error: Cannot copy over Default theme");
-        }
-        if (!this.themes.hasOwnProperty(sourceName)) {
-            var s = "jqplot.ThemeEngine Error: Source name invalid";
-            throw new Error(s);
-        }
-        if (this.themes.hasOwnProperty(targetName)) {
-            var s = "jqplot.ThemeEngine Error: Target name invalid";
-            throw new Error(s);
-        }
-        else {
-            var th = clone(this.themes[sourceName]);
-            th._name = targetName;
-            $.jqplot.extend(true, th, obj);
-            this._add(th);
-            return th;
-        }
-    };
-    
-    
-    $.jqplot.Theme = function(name, obj) {
-        if (typeof(name) == 'object') {
-            obj = obj || name;
-            name = null;
-        }
-        name = name || Date.parse(new Date());
-        this._name = name;
-        this.target = {
-            backgroundColor: null
-        };
-        this.legend = {
-            textColor: null,
-            fontFamily: null,
-            fontSize: null,
-            border: null,
-            background: null
-        };
-        this.title = {
-            textColor: null,
-            fontFamily: null,
-            fontSize: null,
-            textAlign: null
-        };
-        this.seriesStyles = {};
-        this.series = [];
-        this.grid = {
-            drawGridlines: null,
-            gridLineColor: null,
-            gridLineWidth: null,
-            backgroundColor: null,
-            borderColor: null,
-            borderWidth: null,
-            shadow: null
-        };
-        this.axesStyles = {label:{}, ticks:{}};
-        this.axes = {};
-        if (typeof(obj) == 'string') {
-            this._name = obj;
-        }
-        else if(typeof(obj) == 'object') {
-            $.jqplot.extend(true, this, obj);
-        }
-    };
-    
-    var AxisProperties = function() {
-        this.borderColor = null;
-        this.borderWidth = null;
-        this.ticks = new AxisTicks();
-        this.label = new AxisLabel();
-    };
-    
-    var AxisTicks = function() {
-        this.show = null;
-        this.showGridline = null;
-        this.showLabel = null;
-        this.showMark = null;
-        this.size = null;
-        this.textColor = null;
-        this.whiteSpace = null;
-        this.fontSize = null;
-        this.fontFamily = null;
-    };
-    
-    var AxisLabel = function() {
-        this.textColor = null;
-        this.whiteSpace = null;
-        this.fontSize = null;
-        this.fontFamily = null;
-        this.fontWeight = null;
-    };
-    
-    var LineSeriesProperties = function() {
-        this.color=null;
-        this.lineWidth=null;
-        this.linePattern=null;
-        this.shadow=null;
-        this.fillColor=null;
-        this.showMarker=null;
-        this.markerOptions = new MarkerOptions();
-    };
-    
-    var MarkerOptions = function() {
-        this.show = null;
-        this.style = null;
-        this.lineWidth = null;
-        this.size = null;
-        this.color = null;
-        this.shadow = null;
-    };
-    
-    var BarSeriesProperties = function() {
-        this.color=null;
-        this.seriesColors=null;
-        this.lineWidth=null;
-        this.shadow=null;
-        this.barPadding=null;
-        this.barMargin=null;
-        this.barWidth=null;
-        this.highlightColors=null;
-    };
-    
-    var PieSeriesProperties = function() {
-        this.seriesColors=null;
-        this.padding=null;
-        this.sliceMargin=null;
-        this.fill=null;
-        this.shadow=null;
-        this.startAngle=null;
-        this.lineWidth=null;
-        this.highlightColors=null;
-    };
-    
-    var DonutSeriesProperties = function() {
-        this.seriesColors=null;
-        this.padding=null;
-        this.sliceMargin=null;
-        this.fill=null;
-        this.shadow=null;
-        this.startAngle=null;
-        this.lineWidth=null;
-        this.innerDiameter=null;
-        this.thickness=null;
-        this.ringMargin=null;
-        this.highlightColors=null;
-    };
-    
-    var FunnelSeriesProperties = function() {
-        this.color=null;
-        this.lineWidth=null;
-        this.shadow=null;
-        this.padding=null;
-        this.sectionMargin=null;
-        this.seriesColors=null;
-        this.highlightColors=null;
-    };
-    
-    var MeterSeriesProperties = function() {
-        this.padding=null;
-        this.backgroundColor=null;
-        this.ringColor=null;
-        this.tickColor=null;
-        this.ringWidth=null;
-        this.intervalColors=null;
-        this.intervalInnerRadius=null;
-        this.intervalOuterRadius=null;
-        this.hubRadius=null;
-        this.needleThickness=null;
-        this.needlePad=null;
-    };
-        
-
-
-
-    $.fn.jqplotChildText = function() {
-        return $(this).contents().filter(function() {
-            return this.nodeType == 3;  // Node.TEXT_NODE not defined in I7
-        }).text();
-    };
-
-    // Returns font style as abbreviation for "font" property.
-    $.fn.jqplotGetComputedFontStyle = function() {
-        var css = window.getComputedStyle ?  window.getComputedStyle(this[0], "") : this[0].currentStyle;
-        var attrs = css['font-style'] ? ['font-style', 'font-weight', 'font-size', 'font-family'] : ['fontStyle', 'fontWeight', 'fontSize', 'fontFamily'];
-        var style = [];
-
-        for (var i=0 ; i < attrs.length; ++i) {
-            var attr = String(css[attrs[i]]);
-
-            if (attr && attr != 'normal') {
-                style.push(attr);
-            }
-        }
-        return style.join(' ');
-    };
-
-    /**
-     * Namespace: $.fn
-     * jQuery namespace to attach functions to jQuery elements.
-     *  
-     */
-
-    $.fn.jqplotToImageCanvas = function(options) {
-
-        options = options || {};
-        var x_offset = (options.x_offset == null) ? 0 : options.x_offset;
-        var y_offset = (options.y_offset == null) ? 0 : options.y_offset;
-        var backgroundColor = (options.backgroundColor == null) ? 'rgb(255,255,255)' : options.backgroundColor;
-
-        if ($(this).width() == 0 || $(this).height() == 0) {
-            return null;
-        }
-
-        // excanvas and hence IE < 9 do not support toDataURL and cannot export images.
-        if ($.jqplot.use_excanvas) {
-            return null;
-        }
-        
-        var newCanvas = document.createElement("canvas");
-        var h = $(this).outerHeight(true);
-        var w = $(this).outerWidth(true);
-        var offs = $(this).offset();
-        var plotleft = offs.left;
-        var plottop = offs.top;
-        var transx = 0, transy = 0;
-
-        // have to check if any elements are hanging outside of plot area before rendering,
-        // since changing width of canvas will erase canvas.
-
-        var clses = ['jqplot-table-legend', 'jqplot-xaxis-tick', 'jqplot-x2axis-tick', 'jqplot-yaxis-tick', 'jqplot-y2axis-tick', 'jqplot-y3axis-tick', 
-        'jqplot-y4axis-tick', 'jqplot-y5axis-tick', 'jqplot-y6axis-tick', 'jqplot-y7axis-tick', 'jqplot-y8axis-tick', 'jqplot-y9axis-tick',
-        'jqplot-xaxis-label', 'jqplot-x2axis-label', 'jqplot-yaxis-label', 'jqplot-y2axis-label', 'jqplot-y3axis-label', 'jqplot-y4axis-label', 
-        'jqplot-y5axis-label', 'jqplot-y6axis-label', 'jqplot-y7axis-label', 'jqplot-y8axis-label', 'jqplot-y9axis-label' ];
-
-        var temptop, templeft, tempbottom, tempright;
-
-        for (var i = 0; i < clses.length; i++) {
-            $(this).find('.'+clses[i]).each(function() {
-                temptop = $(this).offset().top - plottop;
-                templeft = $(this).offset().left - plotleft;
-                tempright = templeft + $(this).outerWidth(true) + transx;
-                tempbottom = temptop + $(this).outerHeight(true) + transy;
-                if (templeft < -transx) {
-                    w = w - transx - templeft;
-                    transx = -templeft;
-                }
-                if (temptop < -transy) {
-                    h = h - transy - temptop;
-                    transy = - temptop;
-                }
-                if (tempright > w) {
-                    w = tempright;
-                }
-                if (tempbottom > h) {
-                    h =  tempbottom;
-                }
-            });
-        }
-
-        newCanvas.width = w + Number(x_offset);
-        newCanvas.height = h + Number(y_offset);
-
-        var newContext = newCanvas.getContext("2d"); 
-
-        newContext.save();
-        newContext.fillStyle = backgroundColor;
-        newContext.fillRect(0,0, newCanvas.width, newCanvas.height);
-        newContext.restore();
-
-        newContext.translate(transx, transy);
-        newContext.textAlign = 'left';
-        newContext.textBaseline = 'top';
-
-        function getLineheight(el) {
-            var lineheight = parseInt($(el).css('line-height'), 10);
-
-            if (isNaN(lineheight)) {
-                lineheight = parseInt($(el).css('font-size'), 10) * 1.2;
-            }
-            return lineheight;
-        }
-
-        function writeWrappedText (el, context, text, left, top, canvasWidth) {
-            var lineheight = getLineheight(el);
-            var tagwidth = $(el).innerWidth();
-            var tagheight = $(el).innerHeight();
-            var words = text.split(/\s+/);
-            var wl = words.length;
-            var w = '';
-            var breaks = [];
-            var temptop = top;
-            var templeft = left;
-
-            for (var i=0; i<wl; i++) {
-                w += words[i];
-                if (context.measureText(w).width > tagwidth && w.length > words[i].length) {
-                    breaks.push(i);
-                    w = '';
-                    i--;
-                }   
-            }
-            if (breaks.length === 0) {
-                // center text if necessary
-                if ($(el).css('textAlign') === 'center') {
-                    templeft = left + (canvasWidth - context.measureText(w).width)/2  - transx;
-                }
-                context.fillText(text, templeft, top);
-            }
-            else {
-                w = words.slice(0, breaks[0]).join(' ');
-                // center text if necessary
-                if ($(el).css('textAlign') === 'center') {
-                    templeft = left + (canvasWidth - context.measureText(w).width)/2  - transx;
-                }
-                context.fillText(w, templeft, temptop);
-                temptop += lineheight;
-                for (var i=1, l=breaks.length; i<l; i++) {
-                    w = words.slice(breaks[i-1], breaks[i]).join(' ');
-                    // center text if necessary
-                    if ($(el).css('textAlign') === 'center') {
-                        templeft = left + (canvasWidth - context.measureText(w).width)/2  - transx;
-                    }
-                    context.fillText(w, templeft, temptop);
-                    temptop += lineheight;
-                }
-                w = words.slice(breaks[i-1], words.length).join(' ');
-                // center text if necessary
-                if ($(el).css('textAlign') === 'center') {
-                    templeft = left + (canvasWidth - context.measureText(w).width)/2  - transx;
-                }
-                context.fillText(w, templeft, temptop);
-            }
-
-        }
-
-        function _jqpToImage(el, x_offset, y_offset) {
-            var tagname = el.tagName.toLowerCase();
-            var p = $(el).position();
-            var css = window.getComputedStyle ?  window.getComputedStyle(el, "") : el.currentStyle; // for IE < 9
-            var left = x_offset + p.left + parseInt(css.marginLeft, 10) + parseInt(css.borderLeftWidth, 10) + parseInt(css.paddingLeft, 10);
-            var top = y_offset + p.top + parseInt(css.marginTop, 10) + parseInt(css.borderTopWidth, 10)+ parseInt(css.paddingTop, 10);
-            var w = newCanvas.width;
-            // var left = x_offset + p.left + $(el).css('marginLeft') + $(el).css('borderLeftWidth') 
-
-            // somehow in here, for divs within divs, the width of the inner div should be used instead of the canvas.
-
-            if ((tagname == 'div' || tagname == 'span') && !$(el).hasClass('jqplot-highlighter-tooltip')) {
-                $(el).children().each(function() {
-                    _jqpToImage(this, left, top);
-                });
-                var text = $(el).jqplotChildText();
-
-                if (text) {
-                    newContext.font = $(el).jqplotGetComputedFontStyle();
-                    newContext.fillStyle = $(el).css('color');
-
-                    writeWrappedText(el, newContext, text, left, top, w);
-                }
-            }
-
-            // handle the standard table legend
-
-            else if (tagname === 'table' && $(el).hasClass('jqplot-table-legend')) {
-                newContext.strokeStyle = $(el).css('border-top-color');
-                newContext.fillStyle = $(el).css('background-color');
-                newContext.fillRect(left, top, $(el).innerWidth(), $(el).innerHeight());
-                if (parseInt($(el).css('border-top-width'), 10) > 0) {
-                    newContext.strokeRect(left, top, $(el).innerWidth(), $(el).innerHeight());
-                }
-
-                // find all the swatches
-                $(el).find('div.jqplot-table-legend-swatch-outline').each(function() {
-                    // get the first div and stroke it
-                    var elem = $(this);
-                    newContext.strokeStyle = elem.css('border-top-color');
-                    var l = left + elem.position().left;
-                    var t = top + elem.position().top;
-                    newContext.strokeRect(l, t, elem.innerWidth(), elem.innerHeight());
-
-                    // now fill the swatch
-                    
-                    l += parseInt(elem.css('padding-left'), 10);
-                    t += parseInt(elem.css('padding-top'), 10);
-                    var h = elem.innerHeight() - 2 * parseInt(elem.css('padding-top'), 10);
-                    var w = elem.innerWidth() - 2 * parseInt(elem.css('padding-left'), 10);
-
-                    var swatch = elem.children('div.jqplot-table-legend-swatch');
-                    newContext.fillStyle = swatch.css('background-color');
-                    newContext.fillRect(l, t, w, h);
-                });
-
-                // now add text
-
-                $(el).find('td.jqplot-table-legend-label').each(function(){
-                    var elem = $(this);
-                    var l = left + elem.position().left;
-                    var t = top + elem.position().top + parseInt(elem.css('padding-top'), 10);
-                    newContext.font = elem.jqplotGetComputedFontStyle();
-                    newContext.fillStyle = elem.css('color');
-                    writeWrappedText(elem, newContext, elem.text(), l, t, w);
-                });
-
-                var elem = null;
-            }
-
-            else if (tagname == 'canvas') {
-                newContext.drawImage(el, left, top);
-            }
-        }
-        $(this).children().each(function() {
-            _jqpToImage(this, x_offset, y_offset);
-        });
-        return newCanvas;
-    };
-
-    // return the raw image data string.
-    // Should work on canvas supporting browsers.
-    $.fn.jqplotToImageStr = function(options) {
-        var imgCanvas = $(this).jqplotToImageCanvas(options);
-        if (imgCanvas) {
-            return imgCanvas.toDataURL("image/png");
-        }
-        else {
-            return null;
-        }
-    };
-
-    // return a DOM <img> element and return it.
-    // Should work on canvas supporting browsers.
-    $.fn.jqplotToImageElem = function(options) {
-        var elem = document.createElement("img");
-        var str = $(this).jqplotToImageStr(options);
-        elem.src = str;
-        return elem;
-    };
-
-    // return a string for an <img> element and return it.
-    // Should work on canvas supporting browsers.
-    $.fn.jqplotToImageElemStr = function(options) {
-        var str = '<img src='+$(this).jqplotToImageStr(options)+' />';
-        return str;
-    };
-
-    // Not guaranteed to work, even on canvas supporting browsers due to 
-    // limitations with location.href and browser support.
-    $.fn.jqplotSaveImage = function() {
-        var imgData = $(this).jqplotToImageStr({});
-        if (imgData) {
-            window.location.href = imgData.replace("image/png", "image/octet-stream");
-        }
-
-    };
-
-    // Not guaranteed to work, even on canvas supporting browsers due to
-    // limitations with window.open and arbitrary data.
-    $.fn.jqplotViewImage = function() {
-        var imgStr = $(this).jqplotToImageElemStr({});
-        var imgData = $(this).jqplotToImageStr({});
-        if (imgStr) {
-            var w = window.open('');
-            w.document.open("image/png");
-            w.document.write(imgStr);
-            w.document.close();
-            w = null;
-        }
-    };
-    
-
-
-
-    /** 
-     * @description
-     * <p>Object with extended date parsing and formatting capabilities.
-     * This library borrows many concepts and ideas from the Date Instance 
-     * Methods by Ken Snyder along with some parts of Ken's actual code.</p>
-     *
-     * <p>jsDate takes a different approach by not extending the built-in 
-     * Date Object, improving date parsing, allowing for multiple formatting 
-     * syntaxes and multiple and more easily expandable localization.</p>
-     * 
-     * @author Chris Leonello
-     * @date #date#
-     * @version #VERSION#
-     * @copyright (c) 2010-2013 Chris Leonello
-     * jsDate is currently available for use in all personal or commercial projects 
-     * under both the MIT and GPL version 2.0 licenses. This means that you can 
-     * choose the license that best suits your project and use it accordingly.
-     * 
-     * <p>Ken's original Date Instance Methods and copyright notice:</p>
-     * <pre>
-     * Ken Snyder (ken d snyder at gmail dot com)
-     * 2008-09-10
-     * version 2.0.2 (http://kendsnyder.com/sandbox/date/)     
-     * Creative Commons Attribution License 3.0 (http://creativecommons.org/licenses/by/3.0/)
-     * </pre>
-     * 
-     * @class
-     * @name jsDate
-     * @param  {String | Number | Array | Date&nbsp;Object | Options&nbsp;Object} arguments Optional arguments, either a parsable date/time string,
-     * a JavaScript timestamp, an array of numbers of form [year, month, day, hours, minutes, seconds, milliseconds],
-     * a Date object, or an options object of form {syntax: "perl", date:some Date} where all options are optional.
-     */
-     
-    var jsDate = function () {
-    
-        this.syntax = jsDate.config.syntax;
-        this._type = "jsDate";
-        this.proxy = new Date();
-        this.options = {};
-        this.locale = jsDate.regional.getLocale();
-        this.formatString = '';
-        this.defaultCentury = jsDate.config.defaultCentury;
-
-        switch ( arguments.length ) {
-            case 0:
-                break;
-            case 1:
-                // other objects either won't have a _type property or,
-                // if they do, it shouldn't be set to "jsDate", so
-                // assume it is an options argument.
-                if (get_type(arguments[0]) == "[object Object]" && arguments[0]._type != "jsDate") {
-                    var opts = this.options = arguments[0];
-                    this.syntax = opts.syntax || this.syntax;
-                    this.defaultCentury = opts.defaultCentury || this.defaultCentury;
-                    this.proxy = jsDate.createDate(opts.date);
-                }
-                else {
-                    this.proxy = jsDate.createDate(arguments[0]);
-                }
-                break;
-            default:
-                var a = [];
-                for ( var i=0; i<arguments.length; i++ ) {
-                    a.push(arguments[i]);
-                }
-                // this should be the current date/time?
-                this.proxy = new Date();
-                this.proxy.setFullYear.apply( this.proxy, a.slice(0,3) );
-                if ( a.slice(3).length ) {
-                    this.proxy.setHours.apply( this.proxy, a.slice(3) );
-                }
-                break;
-        }
-    };
-    
-    /**
-     * @namespace Configuration options that will be used as defaults for all instances on the page.
-     * @property {String} defaultLocale The default locale to use [en].
-     * @property {String} syntax The default syntax to use [perl].
-     * @property {Number} defaultCentury The default centry for 2 digit dates.
-     */
-    jsDate.config = {
-        defaultLocale: 'en',
-        syntax: 'perl',
-        defaultCentury: 1900
-    };
-        
-    /**
-     * Add an arbitrary amount to the currently stored date
-     * 
-     * @param {Number} number      
-     * @param {String} unit
-     * @returns {jsDate}       
-     */
-     
-    jsDate.prototype.add = function(number, unit) {
-        var factor = multipliers[unit] || multipliers.day;
-        if (typeof factor == 'number') {
-            this.proxy.setTime(this.proxy.getTime() + (factor * number));
-        } else {
-            factor.add(this, number);
-        }
-        return this;
-    };
-        
-    /**
-     * Create a new jqplot.date object with the same date
-     * 
-     * @returns {jsDate}
-     */  
-     
-    jsDate.prototype.clone = function() {
-            return new jsDate(this.proxy.getTime());
-    };
-
-    /**
-     * Get the UTC TimeZone Offset of this date in milliseconds.
-     *
-     * @returns {Number}
-     */
-
-    jsDate.prototype.getUtcOffset = function() {
-        return this.proxy.getTimezoneOffset() * 60000;
-    };
-
-    /**
-     * Find the difference between this jsDate and another date.
-     * 
-     * @param {String| Number| Array| jsDate&nbsp;Object| Date&nbsp;Object} dateObj
-     * @param {String} unit
-     * @param {Boolean} allowDecimal
-     * @returns {Number} Number of units difference between dates.
-     */
-     
-    jsDate.prototype.diff = function(dateObj, unit, allowDecimal) {
-        // ensure we have a Date object
-        dateObj = new jsDate(dateObj);
-        if (dateObj === null) {
-            return null;
-        }
-        // get the multiplying factor integer or factor function
-        var factor = multipliers[unit] || multipliers.day;
-        if (typeof factor == 'number') {
-            // multiply
-            var unitDiff = (this.proxy.getTime() - dateObj.proxy.getTime()) / factor;
-        } else {
-            // run function
-            var unitDiff = factor.diff(this.proxy, dateObj.proxy);
-        }
-        // if decimals are not allowed, round toward zero
-        return (allowDecimal ? unitDiff : Math[unitDiff > 0 ? 'floor' : 'ceil'](unitDiff));          
-    };
-    
-    /**
-     * Get the abbreviated name of the current week day
-     * 
-     * @returns {String}
-     */   
-     
-    jsDate.prototype.getAbbrDayName = function() {
-        return jsDate.regional[this.locale]["dayNamesShort"][this.proxy.getDay()];
-    };
-    
-    /**
-     * Get the abbreviated name of the current month
-     * 
-     * @returns {String}
-     */
-     
-    jsDate.prototype.getAbbrMonthName = function() {
-        return jsDate.regional[this.locale]["monthNamesShort"][this.proxy.getMonth()];
-    };
-    
-    /**
-     * Get UPPER CASE AM or PM for the current time
-     * 
-     * @returns {String}
-     */
-     
-    jsDate.prototype.getAMPM = function() {
-        return this.proxy.getHours() >= 12 ? 'PM' : 'AM';
-    };
-    
-    /**
-     * Get lower case am or pm for the current time
-     * 
-     * @returns {String}
-     */
-     
-    jsDate.prototype.getAmPm = function() {
-        return this.proxy.getHours() >= 12 ? 'pm' : 'am';
-    };
-    
-    /**
-     * Get the century (19 for 20th Century)
-     *
-     * @returns {Integer} Century (19 for 20th century).
-     */
-    jsDate.prototype.getCentury = function() { 
-        return parseInt(this.proxy.getFullYear()/100, 10);
-    };
-    
-    /**
-     * Implements Date functionality
-     */
-    jsDate.prototype.getDate = function() {
-        return this.proxy.getDate();
-    };
-    
-    /**
-     * Implements Date functionality
-     */
-    jsDate.prototype.getDay = function() {
-        return this.proxy.getDay();
-    };
-    
-    /**
-     * Get the Day of week 1 (Monday) thru 7 (Sunday)
-     * 
-     * @returns {Integer} Day of week 1 (Monday) thru 7 (Sunday)
-     */
-    jsDate.prototype.getDayOfWeek = function() { 
-        var dow = this.proxy.getDay(); 
-        return dow===0?7:dow; 
-    };
-    
-    /**
-     * Get the day of the year
-     * 
-     * @returns {Integer} 1 - 366, day of the year
-     */
-    jsDate.prototype.getDayOfYear = function() {
-        var d = this.proxy;
-        var ms = d - new Date('' + d.getFullYear() + '/1/1 GMT');
-        ms += d.getTimezoneOffset()*60000;
-        d = null;
-        return parseInt(ms/60000/60/24, 10)+1;
-    };
-    
-    /**
-     * Get the name of the current week day
-     * 
-     * @returns {String}
-     */  
-     
-    jsDate.prototype.getDayName = function() {
-        return jsDate.regional[this.locale]["dayNames"][this.proxy.getDay()];
-    };
-    
-    /**
-     * Get the week number of the given year, starting with the first Sunday as the first week
-     * @returns {Integer} Week number (13 for the 13th full week of the year).
-     */
-    jsDate.prototype.getFullWeekOfYear = function() {
-        var d = this.proxy;
-        var doy = this.getDayOfYear();
-        var rdow = 6-d.getDay();
-        var woy = parseInt((doy+rdow)/7, 10);
-        return woy;
-    };
-    
-    /**
-     * Implements Date functionality
-     */
-    jsDate.prototype.getFullYear = function() {
-        return this.proxy.getFullYear();
-    };
-    
-    /**
-     * Get the GMT offset in hours and minutes (e.g. +06:30)
-     * 
-     * @returns {String}
-     */
-     
-    jsDate.prototype.getGmtOffset = function() {
-        // divide the minutes offset by 60
-        var hours = this.proxy.getTimezoneOffset() / 60;
-        // decide if we are ahead of or behind GMT
-        var prefix = hours < 0 ? '+' : '-';
-        // remove the negative sign if any
-        hours = Math.abs(hours);
-        // add the +/- to the padded number of hours to : to the padded minutes
-        return prefix + addZeros(Math.floor(hours), 2) + ':' + addZeros((hours % 1) * 60, 2);
-    };
-    
-    /**
-     * Implements Date functionality
-     */
-    jsDate.prototype.getHours = function() {
-        return this.proxy.getHours();
-    };
-    
-    /**
-     * Get the current hour on a 12-hour scheme
-     * 
-     * @returns {Integer}
-     */
-     
-    jsDate.prototype.getHours12  = function() {
-        var hours = this.proxy.getHours();
-        return hours > 12 ? hours - 12 : (hours == 0 ? 12 : hours);
-    };
-    
-    
-    jsDate.prototype.getIsoWeek = function() {
-        var d = this.proxy;
-        var woy = this.getWeekOfYear();
-        var dow1_1 = (new Date('' + d.getFullYear() + '/1/1')).getDay();
-        // First week is 01 and not 00 as in the case of %U and %W,
-        // so we add 1 to the final result except if day 1 of the year
-        // is a Monday (then %W returns 01).
-        // We also need to subtract 1 if the day 1 of the year is 
-        // Friday-Sunday, so the resulting equation becomes:
-        var idow = woy + (dow1_1 > 4 || dow1_1 <= 1 ? 0 : 1);
-        if(idow == 53 && (new Date('' + d.getFullYear() + '/12/31')).getDay() < 4)
-        {
-            idow = 1;
-        }
-        else if(idow === 0)
-        {
-            d = new jsDate(new Date('' + (d.getFullYear()-1) + '/12/31'));
-            idow = d.getIsoWeek();
-        }
-        d = null;
-        return idow;
-    };
-    
-    /**
-     * Implements Date functionality
-     */
-    jsDate.prototype.getMilliseconds = function() {
-        return this.proxy.getMilliseconds();
-    };
-    
-    /**
-     * Implements Date functionality
-     */
-    jsDate.prototype.getMinutes = function() {
-        return this.proxy.getMinutes();
-    };
-    
-    /**
-     * Implements Date functionality
-     */
-    jsDate.prototype.getMonth = function() {
-        return this.proxy.getMonth();
-    };
-    
-    /**
-     * Get the name of the current month
-     * 
-     * @returns {String}
-     */
-     
-    jsDate.prototype.getMonthName = function() {
-        return jsDate.regional[this.locale]["monthNames"][this.proxy.getMonth()];
-    };
-    
-    /**
-     * Get the number of the current month, 1-12
-     * 
-     * @returns {Integer}
-     */
-     
-    jsDate.prototype.getMonthNumber = function() {
-        return this.proxy.getMonth() + 1;
-    };
-    
-    /**
-     * Implements Date functionality
-     */
-    jsDate.prototype.getSeconds = function() {
-        return this.proxy.getSeconds();
-    };
-    
-    /**
-     * Return a proper two-digit year integer
-     * 
-     * @returns {Integer}
-     */
-     
-    jsDate.prototype.getShortYear = function() {
-        return this.proxy.getYear() % 100;
-    };
-    
-    /**
-     * Implements Date functionality
-     */
-    jsDate.prototype.getTime = function() {
-        return this.proxy.getTime();
-    };
-    
-    /**
-     * Get the timezone abbreviation
-     *
-     * @returns {String} Abbreviation for the timezone
-     */
-    jsDate.prototype.getTimezoneAbbr = function() {
-        return this.proxy.toString().replace(/^.*\(([^)]+)\)$/, '$1'); 
-    };
-    
-    /**
-     * Get the browser-reported name for the current timezone (e.g. MDT, Mountain Daylight Time)
-     * 
-     * @returns {String}
-     */
-    jsDate.prototype.getTimezoneName = function() {
-        var match = /(?:\((.+)\)$| ([A-Z]{3}) )/.exec(this.toString());
-        return match[1] || match[2] || 'GMT' + this.getGmtOffset();
-    }; 
-    
-    /**
-     * Implements Date functionality
-     */
-    jsDate.prototype.getTimezoneOffset = function() {
-        return this.proxy.getTimezoneOffset();
-    };
-    
-    
-    /**
-     * Get the week number of the given year, starting with the first Monday as the first week
-     * @returns {Integer} Week number (13 for the 13th week of the year).
-     */
-    jsDate.prototype.getWeekOfYear = function() {
-        var doy = this.getDayOfYear();
-        var rdow = 7 - this.getDayOfWeek();
-        var woy = parseInt((doy+rdow)/7, 10);
-        return woy;
-    };
-    
-    /**
-     * Get the current date as a Unix timestamp
-     * 
-     * @returns {Integer}
-     */
-     
-    jsDate.prototype.getUnix = function() {
-        return Math.round(this.proxy.getTime() / 1000, 0);
-    }; 
-    
-    /**
-     * Implements Date functionality
-     */
-    jsDate.prototype.getYear = function() {
-        return this.proxy.getYear();
-    };
-    
-    /**
-     * Return a date one day ahead (or any other unit)
-     * 
-     * @param {String} unit Optional, year | month | day | week | hour | minute | second | millisecond
-     * @returns {jsDate}
-     */
-     
-    jsDate.prototype.next = function(unit) {
-        unit = unit || 'day';
-        return this.clone().add(1, unit);
-    };
-    
-    /**
-     * Set the jsDate instance to a new date.
-     *
-     * @param  {String | Number | Array | Date Object | jsDate Object | Options Object} arguments Optional arguments, 
-     * either a parsable date/time string,
-     * a JavaScript timestamp, an array of numbers of form [year, month, day, hours, minutes, seconds, milliseconds],
-     * a Date object, jsDate Object or an options object of form {syntax: "perl", date:some Date} where all options are optional.
-     */
-    jsDate.prototype.set = function() {
-        switch ( arguments.length ) {
-            case 0:
-                this.proxy = new Date();
-                break;
-            case 1:
-                // other objects either won't have a _type property or,
-                // if they do, it shouldn't be set to "jsDate", so
-                // assume it is an options argument.
-                if (get_type(arguments[0]) == "[object Object]" && arguments[0]._type != "jsDate") {
-                    var opts = this.options = arguments[0];
-                    this.syntax = opts.syntax || this.syntax;
-                    this.defaultCentury = opts.defaultCentury || this.defaultCentury;
-                    this.proxy = jsDate.createDate(opts.date);
-                }
-                else {
-                    this.proxy = jsDate.createDate(arguments[0]);
-                }
-                break;
-            default:
-                var a = [];
-                for ( var i=0; i<arguments.length; i++ ) {
-                    a.push(arguments[i]);
-                }
-                // this should be the current date/time
-                this.proxy = new Date();
-                this.proxy.setFullYear.apply( this.proxy, a.slice(0,3) );
-                if ( a.slice(3).length ) {
-                    this.proxy.setHours.apply( this.proxy, a.slice(3) );
-                }
-                break;
-        }
-        return this;
-    };
-    
-    /**
-     * Sets the day of the month for a specified date according to local time.
-     * @param {Integer} dayValue An integer from 1 to 31, representing the day of the month. 
-     */
-    jsDate.prototype.setDate = function(n) {
-        this.proxy.setDate(n);
-        return this;
-    };
-    
-    /**
-     * Sets the full year for a specified date according to local time.
-     * @param {Integer} yearValue The numeric value of the year, for example, 1995.  
-     * @param {Integer} monthValue Optional, between 0 and 11 representing the months January through December.  
-     * @param {Integer} dayValue Optional, between 1 and 31 representing the day of the month. If you specify the dayValue parameter, you must also specify the monthValue. 
-     */
-    jsDate.prototype.setFullYear = function() {
-        this.proxy.setFullYear.apply(this.proxy, arguments);
-        return this;
-    };
-    
-    /**
-     * Sets the hours for a specified date according to local time.
-     * 
-     * @param {Integer} hoursValue An integer between 0 and 23, representing the hour.  
-     * @param {Integer} minutesValue Optional, An integer between 0 and 59, representing the minutes.  
-     * @param {Integer} secondsValue Optional, An integer between 0 and 59, representing the seconds. 
-     * If you specify the secondsValue parameter, you must also specify the minutesValue.  
-     * @param {Integer} msValue Optional, A number between 0 and 999, representing the milliseconds. 
-     * If you specify the msValue parameter, you must also specify the minutesValue and secondsValue. 
-     */
-    jsDate.prototype.setHours = function() {
-        this.proxy.setHours.apply(this.proxy, arguments);
-        return this;
-    };
-    
-    /**
-     * Implements Date functionality
-     */ 
-    jsDate.prototype.setMilliseconds = function(n) {
-        this.proxy.setMilliseconds(n);
-        return this;
-    };
-    
-    /**
-     * Implements Date functionality
-     */ 
-    jsDate.prototype.setMinutes = function() {
-        this.proxy.setMinutes.apply(this.proxy, arguments);
-        return this;
-    };
-    
-    /**
-     * Implements Date functionality
-     */ 
-    jsDate.prototype.setMonth = function() {
-        this.proxy.setMonth.apply(this.proxy, arguments);
-        return this;
-    };
-    
-    /**
-     * Implements Date functionality
-     */ 
-    jsDate.prototype.setSeconds = function() {
-        this.proxy.setSeconds.apply(this.proxy, arguments);
-        return this;
-    };
-    
-    /**
-     * Implements Date functionality
-     */ 
-    jsDate.prototype.setTime = function(n) {
-        this.proxy.setTime(n);
-        return this;
-    };
-    
-    /**
-     * Implements Date functionality
-     */ 
-    jsDate.prototype.setYear = function() {
-        this.proxy.setYear.apply(this.proxy, arguments);
-        return this;
-    };
-    
-    /**
-     * Provide a formatted string representation of this date.
-     * 
-     * @param {String} formatString A format string.  
-     * See: {@link jsDate.formats}.
-     * @returns {String} Date String.
-     */
-            
-    jsDate.prototype.strftime = function(formatString) {
-        formatString = formatString || this.formatString || jsDate.regional[this.locale]['formatString'];
-        return jsDate.strftime(this, formatString, this.syntax);
-    };
-        
-    /**
-     * Return a String representation of this jsDate object.
-     * @returns {String} Date string.
-     */
-    
-    jsDate.prototype.toString = function() {
-        return this.proxy.toString();
-    };
-        
-    /**
-     * Convert the current date to an 8-digit integer (%Y%m%d)
-     * 
-     * @returns {Integer}
-     */
-     
-    jsDate.prototype.toYmdInt = function() {
-        return (this.proxy.getFullYear() * 10000) + (this.getMonthNumber() * 100) + this.proxy.getDate();
-    };
-    
-    /**
-     * @namespace Holds localizations for month/day names.
-     * <p>jsDate attempts to detect locale when loaded and defaults to 'en'.
-     * If a localization is detected which is not available, jsDate defaults to 'en'.
-     * Additional localizations can be added after jsDate loads.  After adding a localization,
-     * call the jsDate.regional.getLocale() method.  Currently, en, fr and de are defined.</p>
-     * 
-     * <p>Localizations must be an object and have the following properties defined:  monthNames, monthNamesShort, dayNames, dayNamesShort and Localizations are added like:</p>
-     * <pre class="code">
-     * jsDate.regional['en'] = {
-     * monthNames      : 'January February March April May June July August September October November December'.split(' '),
-     * monthNamesShort : 'Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec'.split(' '),
-     * dayNames        : 'Sunday Monday Tuesday Wednesday Thursday Friday Saturday'.split(' '),
-     * dayNamesShort   : 'Sun Mon Tue Wed Thu Fri Sat'.split(' ')
-     * };
-     * </pre>
-     * <p>After adding localizations, call <code>jsDate.regional.getLocale();</code> to update the locale setting with the
-     * new localizations.</p>
-     */
-     
-    jsDate.regional = {
-        'en': {
-            monthNames: ['January','February','March','April','May','June','July','August','September','October','November','December'],
-            monthNamesShort: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun','Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
-            dayNames: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'],
-            dayNamesShort: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'],
-            formatString: '%Y-%m-%d %H:%M:%S'
-        },
-        
-        'fr': {
-            monthNames: ['Janvier','Février','Mars','Avril','Mai','Juin','Juillet','Août','Septembre','Octobre','Novembre','Décembre'],
-            monthNamesShort: ['Jan','Fév','Mar','Avr','Mai','Jun','Jul','Aoû','Sep','Oct','Nov','Déc'],
-            dayNames: ['Dimanche','Lundi','Mardi','Mercredi','Jeudi','Vendredi','Samedi'],
-            dayNamesShort: ['Dim','Lun','Mar','Mer','Jeu','Ven','Sam'],
-            formatString: '%Y-%m-%d %H:%M:%S'
-        },
-        
-        'de': {
-            monthNames: ['Januar','Februar','März','April','Mai','Juni','Juli','August','September','Oktober','November','Dezember'],
-            monthNamesShort: ['Jan','Feb','Mär','Apr','Mai','Jun','Jul','Aug','Sep','Okt','Nov','Dez'],
-            dayNames: ['Sonntag','Montag','Dienstag','Mittwoch','Donnerstag','Freitag','Samstag'],
-            dayNamesShort: ['So','Mo','Di','Mi','Do','Fr','Sa'],
-            formatString: '%Y-%m-%d %H:%M:%S'
-        },
-        
-        'es': {
-            monthNames: ['Enero','Febrero','Marzo','Abril','Mayo','Junio', 'Julio','Agosto','Septiembre','Octubre','Noviembre','Diciembre'],
-            monthNamesShort: ['Ene','Feb','Mar','Abr','May','Jun', 'Jul','Ago','Sep','Oct','Nov','Dic'],
-            dayNames: ['Domingo','Lunes','Martes','Mi&eacute;rcoles','Jueves','Viernes','S&aacute;bado'],
-            dayNamesShort: ['Dom','Lun','Mar','Mi&eacute;','Juv','Vie','S&aacute;b'],
-            formatString: '%Y-%m-%d %H:%M:%S'
-        },
-        
-        'ru': {
-            monthNames: ['Январь','Февраль','Март','Апрель','Май','Июнь','Июль','Август','Сентябрь','Октябрь','Ноябрь','Декабрь'],
-            monthNamesShort: ['Янв','Фев','Мар','Апр','Май','Июн','Июл','Авг','Сен','Окт','Ноя','Дек'],
-            dayNames: ['воскресенье','понедельник','вторник','среда','четверг','пятница','суббота'],
-            dayNamesShort: ['вск','пнд','втр','срд','чтв','птн','сбт'],
-            formatString: '%Y-%m-%d %H:%M:%S'
-        },
-        
-        'ar': {
-            monthNames: ['كانون الثاني', 'شباط', 'آذار', 'نيسان', 'آذار', 'حزيران','تموز', 'آب', 'أيلول',   'تشرين الأول', 'تشرين الثاني', 'كانون الأول'],
-            monthNamesShort: ['1','2','3','4','5','6','7','8','9','10','11','12'],
-            dayNames: ['السبت', 'الأحد', 'الاثنين', 'الثلاثاء', 'الأربعاء', 'الخميس', 'الجمعة'],
-            dayNamesShort: ['سبت', 'أحد', 'اثنين', 'ثلاثاء', 'أربعاء', 'خميس', 'جمعة'],
-            formatString: '%Y-%m-%d %H:%M:%S'
-        },
-        
-        'pt': {
-            monthNames: ['Janeiro','Fevereiro','Mar&ccedil;o','Abril','Maio','Junho','Julho','Agosto','Setembro','Outubro','Novembro','Dezembro'],
-            monthNamesShort: ['Jan','Fev','Mar','Abr','Mai','Jun','Jul','Ago','Set','Out','Nov','Dez'],
-            dayNames: ['Domingo','Segunda-feira','Ter&ccedil;a-feira','Quarta-feira','Quinta-feira','Sexta-feira','S&aacute;bado'],
-            dayNamesShort: ['Dom','Seg','Ter','Qua','Qui','Sex','S&aacute;b'],
-            formatString: '%Y-%m-%d %H:%M:%S'   
-        },
-        
-        'pt-BR': {
-            monthNames: ['Janeiro','Fevereiro','Mar&ccedil;o','Abril','Maio','Junho', 'Julho','Agosto','Setembro','Outubro','Novembro','Dezembro'],
-            monthNamesShort: ['Jan','Fev','Mar','Abr','Mai','Jun','Jul','Ago','Set','Out','Nov','Dez'],
-            dayNames: ['Domingo','Segunda-feira','Ter&ccedil;a-feira','Quarta-feira','Quinta-feira','Sexta-feira','S&aacute;bado'],
-            dayNamesShort: ['Dom','Seg','Ter','Qua','Qui','Sex','S&aacute;b'],
-            formatString: '%Y-%m-%d %H:%M:%S'
-        },
-        
-        'pl': {
-            monthNames: ['Styczeń','Luty','Marzec','Kwiecień','Maj','Czerwiec','Lipiec','Sierpień','Wrzesień','Październik','Listopad','Grudzień'],
-            monthNamesShort: ['Sty', 'Lut', 'Mar', 'Kwi', 'Maj', 'Cze','Lip', 'Sie', 'Wrz', 'Paź', 'Lis', 'Gru'],
-            dayNames: ['Niedziela', 'Poniedziałek', 'Wtorek', 'Środa', 'Czwartek', 'Piątek', 'Sobota'],
-            dayNamesShort: ['Ni', 'Pn', 'Wt', 'Śr', 'Cz', 'Pt', 'Sb'],
-            formatString: '%Y-%m-%d %H:%M:%S'
-        },
-
-        'nl': {
-            monthNames: ['Januari','Februari','Maart','April','Mei','Juni','July','Augustus','September','Oktober','November','December'],
-            monthNamesShort: ['Jan','Feb','Mar','Apr','Mei','Jun','Jul','Aug','Sep','Okt','Nov','Dec'],
-            dayNames:','['Zondag','Maandag','Dinsdag','Woensdag','Donderdag','Vrijdag','Zaterdag'],
-            dayNamesShort: ['Zo','Ma','Di','Wo','Do','Vr','Za'],
-            formatString: '%Y-%m-%d %H:%M:%S'
-        },
-
-        'sv': {
-            monthNames: ['januari','februari','mars','april','maj','juni','juli','augusti','september','oktober','november','december'],
-          monthNamesShort: ['jan','feb','mar','apr','maj','jun','jul','aug','sep','okt','nov','dec'],
-            dayNames: ['söndag','måndag','tisdag','onsdag','torsdag','fredag','lördag'],
-            dayNamesShort: ['sön','mån','tis','ons','tor','fre','lör'],
-            formatString: '%Y-%m-%d %H:%M:%S'
-        }
-    
-    };
-    
-    // Set english variants to 'en'
-    jsDate.regional['en-US'] = jsDate.regional['en-GB'] = jsDate.regional['en'];
-    
-    /**
-     * Try to determine the users locale based on the lang attribute of the html page.  Defaults to 'en'
-     * if it cannot figure out a locale of if the locale does not have a localization defined.
-     * @returns {String} locale
-     */
-     
-    jsDate.regional.getLocale = function () {
-        var l = jsDate.config.defaultLocale;
-        
-        if ( document && document.getElementsByTagName('html') && document.getElementsByTagName('html')[0].lang ) {
-            l = document.getElementsByTagName('html')[0].lang;
-            if (!jsDate.regional.hasOwnProperty(l)) {
-                l = jsDate.config.defaultLocale;
-            }
-        }
-        
-        return l;
-    };
-    
-    // ms in day
-    var day = 24 * 60 * 60 * 1000;
-    
-    // padd a number with zeros
-    var addZeros = function(num, digits) {
-        num = String(num);
-        var i = digits - num.length;
-        var s = String(Math.pow(10, i)).slice(1);
-        return s.concat(num);
-    };
-
-    // representations used for calculating differences between dates.
-    // This borrows heavily from Ken Snyder's work.
-    var multipliers = {
-        millisecond: 1,
-        second: 1000,
-        minute: 60 * 1000,
-        hour: 60 * 60 * 1000,
-        day: day,
-        week: 7 * day,
-        month: {
-            // add a number of months
-            add: function(d, number) {
-                // add any years needed (increments of 12)
-                multipliers.year.add(d, Math[number > 0 ? 'floor' : 'ceil'](number / 12));
-                // ensure that we properly wrap betwen December and January
-                // 11 % 12 = 11
-                // 12 % 12 = 0
-                var prevMonth = d.getMonth() + (number % 12);
-                if (prevMonth == 12) {
-                    prevMonth = 0;
-                    d.setYear(d.getFullYear() + 1);
-                } else if (prevMonth == -1) {
-                    prevMonth = 11;
-                    d.setYear(d.getFullYear() - 1);
-                }
-                d.setMonth(prevMonth);
-            },
-            // get the number of months between two Date objects (decimal to the nearest day)
-            diff: function(d1, d2) {
-                // get the number of years
-                var diffYears = d1.getFullYear() - d2.getFullYear();
-                // get the number of remaining months
-                var diffMonths = d1.getMonth() - d2.getMonth() + (diffYears * 12);
-                // get the number of remaining days
-                var diffDays = d1.getDate() - d2.getDate();
-                // return the month difference with the days difference as a decimal
-                return diffMonths + (diffDays / 30);
-            }
-        },
-        year: {
-            // add a number of years
-            add: function(d, number) {
-                d.setYear(d.getFullYear() + Math[number > 0 ? 'floor' : 'ceil'](number));
-            },
-            // get the number of years between two Date objects (decimal to the nearest day)
-            diff: function(d1, d2) {
-                return multipliers.month.diff(d1, d2) / 12;
-            }
-        }        
-    };
-    //
-    // Alias each multiplier with an 's' to allow 'year' and 'years' for example.
-    // This comes from Ken Snyders work.
-    //
-    for (var unit in multipliers) {
-        if (unit.substring(unit.length - 1) != 's') { // IE will iterate newly added properties :|
-            multipliers[unit + 's'] = multipliers[unit];
-        }
-    }
-    
-    //
-    // take a jsDate instance and a format code and return the formatted value.
-    // This is a somewhat modified version of Ken Snyder's method.
-    //
-    var format = function(d, code, syntax) {
-        // if shorcut codes are used, recursively expand those.
-        if (jsDate.formats[syntax]["shortcuts"][code]) {
-            return jsDate.strftime(d, jsDate.formats[syntax]["shortcuts"][code], syntax);
-        } else {
-            // get the format code function and addZeros() argument
-            var getter = (jsDate.formats[syntax]["codes"][code] || '').split('.');
-            var nbr = d['get' + getter[0]] ? d['get' + getter[0]]() : '';
-            if (getter[1]) {
-                nbr = addZeros(nbr, getter[1]);
-            }
-            return nbr;
-        }       
-    };
-    
-    /**
-     * @static
-     * Static function for convert a date to a string according to a given format.  Also acts as namespace for strftime format codes.
-     * <p>strftime formatting can be accomplished without creating a jsDate object by calling jsDate.strftime():</p>
-     * <pre class="code">
-     * var formattedDate = jsDate.strftime('Feb 8, 2006 8:48:32', '%Y-%m-%d %H:%M:%S');
-     * </pre>
-     * @param {String | Number | Array | jsDate&nbsp;Object | Date&nbsp;Object} date A parsable date string, JavaScript time stamp, Array of form [year, month, day, hours, minutes, seconds, milliseconds], jsDate Object or Date object.
-     * @param {String} formatString String with embedded date formatting codes.  
-     * See: {@link jsDate.formats}. 
-     * @param {String} syntax Optional syntax to use [default perl].
-     * @param {String} locale Optional locale to use.
-     * @returns {String} Formatted representation of the date.
-    */
-    //
-    // Logic as implemented here is very similar to Ken Snyder's Date Instance Methods.
-    //
-    jsDate.strftime = function(d, formatString, syntax, locale) {
-        var syn = 'perl';
-        var loc = jsDate.regional.getLocale();
-        
-        // check if syntax and locale are available or reversed
-        if (syntax && jsDate.formats.hasOwnProperty(syntax)) {
-            syn = syntax;
-        }
-        else if (syntax && jsDate.regional.hasOwnProperty(syntax)) {
-            loc = syntax;
-        }
-        
-        if (locale && jsDate.formats.hasOwnProperty(locale)) {
-            syn = locale;
-        }
-        else if (locale && jsDate.regional.hasOwnProperty(locale)) {
-            loc = locale;
-        }
-        
-        if (get_type(d) != "[object Object]" || d._type != "jsDate") {
-            d = new jsDate(d);
-            d.locale = loc;
-        }
-        if (!formatString) {
-            formatString = d.formatString || jsDate.regional[loc]['formatString'];
-        }
-        // default the format string to year-month-day
-        var source = formatString || '%Y-%m-%d', 
-            result = '', 
-            match;
-        // replace each format code
-        while (source.length > 0) {
-            if (match = source.match(jsDate.formats[syn].codes.matcher)) {
-                result += source.slice(0, match.index);
-                result += (match[1] || '') + format(d, match[2], syn);
-                source = source.slice(match.index + match[0].length);
-            } else {
-                result += source;
-                source = '';
-            }
-        }
-        return result;
-    };
-    
-    /**
-     * @namespace
-     * Namespace to hold format codes and format shortcuts.  "perl" and "php" format codes 
-     * and shortcuts are defined by default.  Additional codes and shortcuts can be
-     * added like:
-     * 
-     * <pre class="code">
-     * jsDate.formats["perl"] = {
-     *     "codes": {
-     *         matcher: /someregex/,
-     *         Y: "fullYear",  // name of "get" method without the "get",
-     *         ...,            // more codes
-     *     },
-     *     "shortcuts": {
-     *         F: '%Y-%m-%d',
-     *         ...,            // more shortcuts
-     *     }
-     * };
-     * </pre>
-     * 
-     * <p>Additionally, ISO and SQL shortcuts are defined and can be accesses via:
-     * <code>jsDate.formats.ISO</code> and <code>jsDate.formats.SQL</code>
-     */
-    
-    jsDate.formats = {
-        ISO:'%Y-%m-%dT%H:%M:%S.%N%G',
-        SQL:'%Y-%m-%d %H:%M:%S'
-    };
-    
-    /**
-     * Perl format codes and shortcuts for strftime.
-     * 
-     * A hash (object) of codes where each code must be an array where the first member is 
-     * the name of a Date.prototype or jsDate.prototype function to call
-     * and optionally a second member indicating the number to pass to addZeros()
-     * 
-     * <p>The following format codes are defined:</p>
-     * 
-     * <pre class="code">
-     * Code    Result                    Description
-     * == Years ==           
-     * %Y      2008                      Four-digit year
-     * %y      08                        Two-digit year
-     * 
-     * == Months ==          
-     * %m      09                        Two-digit month
-     * %#m     9                         One or two-digit month
-     * %B      September                 Full month name
-     * %b      Sep                       Abbreviated month name
-     * 
-     * == Days ==            
-     * %d      05                        Two-digit day of month
-     * %#d     5                         One or two-digit day of month
-     * %e      5                         One or two-digit day of month
-     * %A      Sunday                    Full name of the day of the week
-     * %a      Sun                       Abbreviated name of the day of the week
-     * %w      0                         Number of the day of the week (0 = Sunday, 6 = Saturday)
-     * 
-     * == Hours ==           
-     * %H      23                        Hours in 24-hour format (two digits)
-     * %#H     3                         Hours in 24-hour integer format (one or two digits)
-     * %I      11                        Hours in 12-hour format (two digits)
-     * %#I     3                         Hours in 12-hour integer format (one or two digits)
-     * %p      PM                        AM or PM
-     * 
-     * == Minutes ==         
-     * %M      09                        Minutes (two digits)
-     * %#M     9                         Minutes (one or two digits)
-     * 
-     * == Seconds ==         
-     * %S      02                        Seconds (two digits)
-     * %#S     2                         Seconds (one or two digits)
-     * %s      1206567625723             Unix timestamp (Seconds past 1970-01-01 00:00:00)
-     * 
-     * == Milliseconds ==    
-     * %N      008                       Milliseconds (three digits)
-     * %#N     8                         Milliseconds (one to three digits)
-     * 
-     * == Timezone ==        
-     * %O      360                       difference in minutes between local time and GMT
-     * %Z      Mountain Standard Time    Name of timezone as reported by browser
-     * %G      06:00                     Hours and minutes between GMT
-     * 
-     * == Shortcuts ==       
-     * %F      2008-03-26                %Y-%m-%d
-     * %T      05:06:30                  %H:%M:%S
-     * %X      05:06:30                  %H:%M:%S
-     * %x      03/26/08                  %m/%d/%y
-     * %D      03/26/08                  %m/%d/%y
-     * %#c     Wed Mar 26 15:31:00 2008  %a %b %e %H:%M:%S %Y
-     * %v      3-Sep-2008                %e-%b-%Y
-     * %R      15:31                     %H:%M
-     * %r      03:31:00 PM               %I:%M:%S %p
-     * 
-     * == Characters ==      
-     * %n      \n                        Newline
-     * %t      \t                        Tab
-     * %%      %                         Percent Symbol
-     * </pre>
-     * 
-     * <p>Formatting shortcuts that will be translated into their longer version.
-     * Be sure that format shortcuts do not refer to themselves: this will cause an infinite loop.</p>
-     * 
-     * <p>Format codes and format shortcuts can be redefined after the jsDate
-     * module is imported.</p>
-     * 
-     * <p>Note that if you redefine the whole hash (object), you must supply a "matcher"
-     * regex for the parser.  The default matcher is:</p>
-     * 
-     * <code>/()%(#?(%|[a-z]))/i</code>
-     * 
-     * <p>which corresponds to the Perl syntax used by default.</p>
-     * 
-     * <p>By customizing the matcher and format codes, nearly any strftime functionality is possible.</p>
-     */
-     
-    jsDate.formats.perl = {
-        codes: {
-            //
-            // 2-part regex matcher for format codes
-            //
-            // first match must be the character before the code (to account for escaping)
-            // second match must be the format code character(s)
-            //
-            matcher: /()%(#?(%|[a-z]))/i,
-            // year
-            Y: 'FullYear',
-            y: 'ShortYear.2',
-            // month
-            m: 'MonthNumber.2',
-            '#m': 'MonthNumber',
-            B: 'MonthName',
-            b: 'AbbrMonthName',
-            // day
-            d: 'Date.2',
-            '#d': 'Date',
-            e: 'Date',
-            A: 'DayName',
-            a: 'AbbrDayName',
-            w: 'Day',
-            // hours
-            H: 'Hours.2',
-            '#H': 'Hours',
-            I: 'Hours12.2',
-            '#I': 'Hours12',
-            p: 'AMPM',
-            // minutes
-            M: 'Minutes.2',
-            '#M': 'Minutes',
-            // seconds
-            S: 'Seconds.2',
-            '#S': 'Seconds',
-            s: 'Unix',
-            // milliseconds
-            N: 'Milliseconds.3',
-            '#N': 'Milliseconds',
-            // timezone
-            O: 'TimezoneOffset',
-            Z: 'TimezoneName',
-            G: 'GmtOffset'  
-        },
-        
-        shortcuts: {
-            // date
-            F: '%Y-%m-%d',
-            // time
-            T: '%H:%M:%S',
-            X: '%H:%M:%S',
-            // local format date
-            x: '%m/%d/%y',
-            D: '%m/%d/%y',
-            // local format extended
-            '#c': '%a %b %e %H:%M:%S %Y',
-            // local format short
-            v: '%e-%b-%Y',
-            R: '%H:%M',
-            r: '%I:%M:%S %p',
-            // tab and newline
-            t: '\t',
-            n: '\n',
-            '%': '%'
-        }
-    };
-    
-    /**
-     * PHP format codes and shortcuts for strftime.
-     * 
-     * A hash (object) of codes where each code must be an array where the first member is 
-     * the name of a Date.prototype or jsDate.prototype function to call
-     * and optionally a second member indicating the number to pass to addZeros()
-     * 
-     * <p>The following format codes are defined:</p>
-     * 
-     * <pre class="code">
-     * Code    Result                    Description
-     * === Days ===        
-     * %a      Sun through Sat           An abbreviated textual representation of the day
-     * %A      Sunday - Saturday         A full textual representation of the day
-     * %d      01 to 31                  Two-digit day of the month (with leading zeros)
-     * %e      1 to 31                   Day of the month, with a space preceding single digits.
-     * %j      001 to 366                Day of the year, 3 digits with leading zeros
-     * %u      1 - 7 (Mon - Sun)         ISO-8601 numeric representation of the day of the week
-     * %w      0 - 6 (Sun - Sat)         Numeric representation of the day of the week
-     *                                  
-     * === Week ===                     
-     * %U      13                        Full Week number, starting with the first Sunday as the first week
-     * %V      01 through 53             ISO-8601:1988 week number, starting with the first week of the year 
-     *                                   with at least 4 weekdays, with Monday being the start of the week
-     * %W      46                        A numeric representation of the week of the year, 
-     *                                   starting with the first Monday as the first week
-     * === Month ===                    
-     * %b      Jan through Dec           Abbreviated month name, based on the locale
-     * %B      January - December        Full month name, based on the locale
-     * %h      Jan through Dec           Abbreviated month name, based on the locale (an alias of %b)
-     * %m      01 - 12 (Jan - Dec)       Two digit representation of the month
-     * 
-     * === Year ===                     
-     * %C      19                        Two digit century (year/100, truncated to an integer)
-     * %y      09 for 2009               Two digit year
-     * %Y      2038                      Four digit year
-     * 
-     * === Time ===                     
-     * %H      00 through 23             Two digit representation of the hour in 24-hour format
-     * %I      01 through 12             Two digit representation of the hour in 12-hour format
-     * %l      1 through 12              Hour in 12-hour format, with a space preceeding single digits
-     * %M      00 through 59             Two digit representation of the minute
-     * %p      AM/PM                     UPPER-CASE 'AM' or 'PM' based on the given time
-     * %P      am/pm                     lower-case 'am' or 'pm' based on the given time
-     * %r      09:34:17 PM               Same as %I:%M:%S %p
-     * %R      00:35                     Same as %H:%M
-     * %S      00 through 59             Two digit representation of the second
-     * %T      21:34:17                  Same as %H:%M:%S
-     * %X      03:59:16                  Preferred time representation based on locale, without the date
-     * %z      -0500 or EST              Either the time zone offset from UTC or the abbreviation
-     * %Z      -0500 or EST              The time zone offset/abbreviation option NOT given by %z
-     * 
-     * === Time and Date ===            
-     * %D      02/05/09                  Same as %m/%d/%y
-     * %F      2009-02-05                Same as %Y-%m-%d (commonly used in database datestamps)
-     * %s      305815200                 Unix Epoch Time timestamp (same as the time() function)
-     * %x      02/05/09                  Preferred date representation, without the time
-     * 
-     * === Miscellaneous ===            
-     * %n        ---                     A newline character (\n)
-     * %t        ---                     A Tab character (\t)
-     * %%        ---                     A literal percentage character (%)
-     * </pre>
-     */
- 
-    jsDate.formats.php = {
-        codes: {
-            //
-            // 2-part regex matcher for format codes
-            //
-            // first match must be the character before the code (to account for escaping)
-            // second match must be the format code character(s)
-            //
-            matcher: /()%((%|[a-z]))/i,
-            // day
-            a: 'AbbrDayName',
-            A: 'DayName',
-            d: 'Date.2',
-            e: 'Date',
-            j: 'DayOfYear.3',
-            u: 'DayOfWeek',
-            w: 'Day',
-            // week
-            U: 'FullWeekOfYear.2',
-            V: 'IsoWeek.2',
-            W: 'WeekOfYear.2',
-            // month
-            b: 'AbbrMonthName',
-            B: 'MonthName',
-            m: 'MonthNumber.2',
-            h: 'AbbrMonthName',
-            // year
-            C: 'Century.2',
-            y: 'ShortYear.2',
-            Y: 'FullYear',
-            // time
-            H: 'Hours.2',
-            I: 'Hours12.2',
-            l: 'Hours12',
-            p: 'AMPM',
-            P: 'AmPm',
-            M: 'Minutes.2',
-            S: 'Seconds.2',
-            s: 'Unix',
-            O: 'TimezoneOffset',
-            z: 'GmtOffset',
-            Z: 'TimezoneAbbr'
-        },
-        
-        shortcuts: {
-            D: '%m/%d/%y',
-            F: '%Y-%m-%d',
-            T: '%H:%M:%S',
-            X: '%H:%M:%S',
-            x: '%m/%d/%y',
-            R: '%H:%M',
-            r: '%I:%M:%S %p',
-            t: '\t',
-            n: '\n',
-            '%': '%'
-        }
-    };   
-    //
-    // Conceptually, the logic implemented here is similar to Ken Snyder's Date Instance Methods.
-    // I use his idea of a set of parsers which can be regular expressions or functions,
-    // iterating through those, and then seeing if Date.parse() will create a date.
-    // The parser expressions and functions are a little different and some bugs have been
-    // worked out.  Also, a lot of "pre-parsing" is done to fix implementation
-    // variations of Date.parse() between browsers.
-    //
-    jsDate.createDate = function(date) {
-        // if passing in multiple arguments, try Date constructor
-        if (date == null) {
-            return new Date();
-        }
-        // If the passed value is already a date object, return it
-        if (date instanceof Date) {
-            return date;
-        }
-        // if (typeof date == 'number') return new Date(date * 1000);
-        // If the passed value is an integer, interpret it as a javascript timestamp
-        if (typeof date == 'number') {
-            return new Date(date);
-        }
-        
-        // Before passing strings into Date.parse(), have to normalize them for certain conditions.
-        // If strings are not formatted staccording to the EcmaScript spec, results from Date parse will be implementation dependent.  
-        // 
-        // For example: 
-        //  * FF and Opera assume 2 digit dates are pre y2k, Chome assumes <50 is pre y2k, 50+ is 21st century.  
-        //  * Chrome will correctly parse '1984-1-25' into localtime, FF and Opera will not parse.
-        //  * Both FF, Chrome and Opera will parse '1984/1/25' into localtime.
-        
-        // remove leading and trailing spaces
-        var parsable = String(date).replace(/^\s*(.+)\s*$/g, '$1');
-        
-        // replace dahses (-) with slashes (/) in dates like n[nnn]/n[n]/n[nnn]
-        parsable = parsable.replace(/^([0-9]{1,4})-([0-9]{1,2})-([0-9]{1,4})/, "$1/$2/$3");
-        
-        /////////
-        // Need to check for '15-Dec-09' also.
-        // FF will not parse, but Chrome will.
-        // Chrome will set date to 2009 as well.
-        /////////
-        
-        // first check for 'dd-mmm-yyyy' or 'dd/mmm/yyyy' like '15-Dec-2010'
-        parsable = parsable.replace(/^(3[01]|[0-2]?\d)[-\/]([a-z]{3,})[-\/](\d{4})/i, "$1 $2 $3");
-        
-        // Now check for 'dd-mmm-yy' or 'dd/mmm/yy' and normalize years to default century.
-        var match = parsable.match(/^(3[01]|[0-2]?\d)[-\/]([a-z]{3,})[-\/](\d{2})\D*/i);
-        if (match && match.length > 3) {
-            var m3 = parseFloat(match[3]);
-            var ny = jsDate.config.defaultCentury + m3;
-            ny = String(ny);
-            
-            // now replace 2 digit year with 4 digit year
-            parsable = parsable.replace(/^(3[01]|[0-2]?\d)[-\/]([a-z]{3,})[-\/](\d{2})\D*/i, match[1] +' '+ match[2] +' '+ ny);
-            
-        }
-        
-        // Check for '1/19/70 8:14PM'
-        // where starts with mm/dd/yy or yy/mm/dd and have something after
-        // Check if 1st postiion is greater than 31, assume it is year.
-        // Assme all 2 digit years are 1900's.
-        // Finally, change them into US style mm/dd/yyyy representations.
-        match = parsable.match(/^([0-9]{1,2})[-\/]([0-9]{1,2})[-\/]([0-9]{1,2})[^0-9]/);
-        
-        function h1(parsable, match) {
-            var m1 = parseFloat(match[1]);
-            var m2 = parseFloat(match[2]);
-            var m3 = parseFloat(match[3]);
-            var cent = jsDate.config.defaultCentury;
-            var ny, nd, nm, str;
-            
-            if (m1 > 31) { // first number is a year
-                nd = m3;
-                nm = m2;
-                ny = cent + m1;
-            }
-            
-            else { // last number is the year
-                nd = m2;
-                nm = m1;
-                ny = cent + m3;
-            }
-            
-            str = nm+'/'+nd+'/'+ny;
-            
-            // now replace 2 digit year with 4 digit year
-            return  parsable.replace(/^([0-9]{1,2})[-\/]([0-9]{1,2})[-\/]([0-9]{1,2})/, str);
-        
-        }
-        
-        if (match && match.length > 3) {
-            parsable = h1(parsable, match);
-        }
-        
-        // Now check for '1/19/70' with nothing after and do as above
-        var match = parsable.match(/^([0-9]{1,2})[-\/]([0-9]{1,2})[-\/]([0-9]{1,2})$/);
-        
-        if (match && match.length > 3) {
-            parsable = h1(parsable, match);
-        }
-                
-        
-        var i = 0;
-        var length = jsDate.matchers.length;
-        var pattern,
-            ms,
-            current = parsable,
-            obj;
-        while (i < length) {
-            ms = Date.parse(current);
-            if (!isNaN(ms)) {
-                return new Date(ms);
-            }
-            pattern = jsDate.matchers[i];
-            if (typeof pattern == 'function') {
-                obj = pattern.call(jsDate, current);
-                if (obj instanceof Date) {
-                    return obj;
-                }
-            } else {
-                current = parsable.replace(pattern[0], pattern[1]);
-            }
-            i++;
-        }
-        return NaN;
-    };
-    
-
-    /**
-     * @static
-     * Handy static utility function to return the number of days in a given month.
-     * @param {Integer} year Year
-     * @param {Integer} month Month (1-12)
-     * @returns {Integer} Number of days in the month.
-    */
-    //
-    // handy utility method Borrowed right from Ken Snyder's Date Instance Mehtods.
-    // 
-    jsDate.daysInMonth = function(year, month) {
-        if (month == 2) {
-            return new Date(year, 1, 29).getDate() == 29 ? 29 : 28;
-        }
-        return [undefined,31,undefined,31,30,31,30,31,31,30,31,30,31][month];
-    };
-
-
-    //
-    // An Array of regular expressions or functions that will attempt to match the date string.
-    // Functions are called with scope of a jsDate instance.
-    //
-    jsDate.matchers = [
-        // convert dd.mmm.yyyy to mm/dd/yyyy (world date to US date).
-        [/(3[01]|[0-2]\d)\s*\.\s*(1[0-2]|0\d)\s*\.\s*([1-9]\d{3})/, '$2/$1/$3'],
-        // convert yyyy-mm-dd to mm/dd/yyyy (ISO date to US date).
-        [/([1-9]\d{3})\s*-\s*(1[0-2]|0\d)\s*-\s*(3[01]|[0-2]\d)/, '$2/$3/$1'],
-        // Handle 12 hour or 24 hour time with milliseconds am/pm and optional date part.
-        function(str) { 
-            var match = str.match(/^(?:(.+)\s+)?([012]?\d)(?:\s*\:\s*(\d\d))?(?:\s*\:\s*(\d\d(\.\d*)?))?\s*(am|pm)?\s*$/i);
-            //                   opt. date      hour       opt. minute     opt. second       opt. msec   opt. am or pm
-            if (match) {
-                if (match[1]) {
-                    var d = this.createDate(match[1]);
-                    if (isNaN(d)) {
-                        return;
-                    }
-                } else {
-                    var d = new Date();
-                    d.setMilliseconds(0);
-                }
-                var hour = parseFloat(match[2]);
-                if (match[6]) {
-                    hour = match[6].toLowerCase() == 'am' ? (hour == 12 ? 0 : hour) : (hour == 12 ? 12 : hour + 12);
-                }
-                d.setHours(hour, parseInt(match[3] || 0, 10), parseInt(match[4] || 0, 10), ((parseFloat(match[5] || 0)) || 0)*1000);
-                return d;
-            }
-            else {
-                return str;
-            }
-        },
-        // Handle ISO timestamp with time zone.
-        function(str) {
-            var match = str.match(/^(?:(.+))[T|\s+]([012]\d)(?:\:(\d\d))(?:\:(\d\d))(?:\.\d+)([\+\-]\d\d\:\d\d)$/i);
-            if (match) {
-                if (match[1]) {
-                    var d = this.createDate(match[1]);
-                    if (isNaN(d)) {
-                        return;
-                    }
-                } else {
-                    var d = new Date();
-                    d.setMilliseconds(0);
-                }
-                var hour = parseFloat(match[2]);
-                d.setHours(hour, parseInt(match[3], 10), parseInt(match[4], 10), parseFloat(match[5])*1000);
-                return d;
-            }
-            else {
-                    return str;
-            }
-        },
-        // Try to match ambiguous strings like 12/8/22.
-        // Use FF date assumption that 2 digit years are 20th century (i.e. 1900's).
-        // This may be redundant with pre processing of date already performed.
-        function(str) {
-            var match = str.match(/^([0-3]?\d)\s*[-\/.\s]{1}\s*([a-zA-Z]{3,9})\s*[-\/.\s]{1}\s*([0-3]?\d)$/);
-            if (match) {
-                var d = new Date();
-                var cent = jsDate.config.defaultCentury;
-                var m1 = parseFloat(match[1]);
-                var m3 = parseFloat(match[3]);
-                var ny, nd, nm;
-                if (m1 > 31) { // first number is a year
-                    nd = m3;
-                    ny = cent + m1;
-                }
-                
-                else { // last number is the year
-                    nd = m1;
-                    ny = cent + m3;
-                }
-                
-                var nm = inArray(match[2], jsDate.regional[jsDate.regional.getLocale()]["monthNamesShort"]);
-                
-                if (nm == -1) {
-                    nm = inArray(match[2], jsDate.regional[jsDate.regional.getLocale()]["monthNames"]);
-                }
-            
-                d.setFullYear(ny, nm, nd);
-                d.setHours(0,0,0,0);
-                return d;
-            }
-            
-            else {
-                return str;
-            }
-        }      
-    ];
-
-    //
-    // I think John Reisig published this method on his blog, ejohn.
-    //
-    function inArray( elem, array ) {
-        if ( array.indexOf ) {
-            return array.indexOf( elem );
-        }
-
-        for ( var i = 0, length = array.length; i < length; i++ ) {
-            if ( array[ i ] === elem ) {
-                return i;
-            }
-        }
-
-        return -1;
-    }
-    
-    //
-    // Thanks to Kangax, Christian Sciberras and Stack Overflow for this method.
-    //
-    function get_type(thing){
-        if(thing===null) return "[object Null]"; // special case
-        return Object.prototype.toString.call(thing);
-    }
-    
-    $.jsDate = jsDate;
-
-      
-    /**
-     * JavaScript printf/sprintf functions.
-     * 
-     * This code has been adapted from the publicly available sprintf methods
-     * by Ash Searle. His original header follows:
-     *
-     *     This code is unrestricted: you are free to use it however you like.
-     *     
-     *     The functions should work as expected, performing left or right alignment,
-     *     truncating strings, outputting numbers with a required precision etc.
-     *
-     *     For complex cases, these functions follow the Perl implementations of
-     *     (s)printf, allowing arguments to be passed out-of-order, and to set the
-     *     precision or length of the output based on arguments instead of fixed
-     *     numbers.
-     *
-     *     See http://perldoc.perl.org/functions/sprintf.html for more information.
-     *
-     *     Implemented:
-     *     - zero and space-padding
-     *     - right and left-alignment,
-     *     - base X prefix (binary, octal and hex)
-     *     - positive number prefix
-     *     - (minimum) width
-     *     - precision / truncation / maximum width
-     *     - out of order arguments
-     *
-     *     Not implemented (yet):
-     *     - vector flag
-     *     - size (bytes, words, long-words etc.)
-     *     
-     *     Will not implement:
-     *     - %n or %p (no pass-by-reference in JavaScript)
-     *
-     *     @version 2007.04.27
-     *     @author Ash Searle 
-     * 
-     * You can see the original work and comments on his blog:
-     * http://hexmen.com/blog/2007/03/printf-sprintf/
-     * http://hexmen.com/js/sprintf.js
-     */
-     
-     /**
-      * @Modifications 2009.05.26
-      * @author Chris Leonello
-      * 
-      * Added %p %P specifier
-      * Acts like %g or %G but will not add more significant digits to the output than present in the input.
-      * Example:
-      * Format: '%.3p', Input: 0.012, Output: 0.012
-      * Format: '%.3g', Input: 0.012, Output: 0.0120
-      * Format: '%.4p', Input: 12.0, Output: 12.0
-      * Format: '%.4g', Input: 12.0, Output: 12.00
-      * Format: '%.4p', Input: 4.321e-5, Output: 4.321e-5
-      * Format: '%.4g', Input: 4.321e-5, Output: 4.3210e-5
-      * 
-      * Example:
-      * >>> $.jqplot.sprintf('%.2f, %d', 23.3452, 43.23)
-      * "23.35, 43"
-      * >>> $.jqplot.sprintf("no value: %n, decimal with thousands separator: %'d", 23.3452, 433524)
-      * "no value: , decimal with thousands separator: 433,524"
-      */
-    $.jqplot.sprintf = function() {
-        function pad(str, len, chr, leftJustify) {
-            var padding = (str.length >= len) ? '' : Array(1 + len - str.length >>> 0).join(chr);
-            return leftJustify ? str + padding : padding + str;
-
-        }
-
-        function thousand_separate(value) {
-            var value_str = new String(value);
-            for (var i=10; i>0; i--) {
-                if (value_str == (value_str = value_str.replace(/^(\d+)(\d{3})/, "$1"+$.jqplot.sprintf.thousandsSeparator+"$2"))) break;
-            }
-            return value_str; 
-        }
-
-        function justify(value, prefix, leftJustify, minWidth, zeroPad, htmlSpace) {
-            var diff = minWidth - value.length;
-            if (diff > 0) {
-                var spchar = ' ';
-                if (htmlSpace) { spchar = '&nbsp;'; }
-                if (leftJustify || !zeroPad) {
-                    value = pad(value, minWidth, spchar, leftJustify);
-                } else {
-                    value = value.slice(0, prefix.length) + pad('', diff, '0', true) + value.slice(prefix.length);
-                }
-            }
-            return value;
-        }
-
-        function formatBaseX(value, base, prefix, leftJustify, minWidth, precision, zeroPad, htmlSpace) {
-            // Note: casts negative numbers to positive ones
-            var number = value >>> 0;
-            prefix = prefix && number && {'2': '0b', '8': '0', '16': '0x'}[base] || '';
-            value = prefix + pad(number.toString(base), precision || 0, '0', false);
-            return justify(value, prefix, leftJustify, minWidth, zeroPad, htmlSpace);
-        }
-
-        function formatString(value, leftJustify, minWidth, precision, zeroPad, htmlSpace) {
-            if (precision != null) {
-                value = value.slice(0, precision);
-            }
-            return justify(value, '', leftJustify, minWidth, zeroPad, htmlSpace);
-        }
-
-        var a = arguments, i = 0, format = a[i++];
-
-        return format.replace($.jqplot.sprintf.regex, function(substring, valueIndex, flags, minWidth, _, precision, type) {
-            if (substring == '%%') { return '%'; }
-
-            // parse flags
-            var leftJustify = false, positivePrefix = '', zeroPad = false, prefixBaseX = false, htmlSpace = false, thousandSeparation = false;
-            for (var j = 0; flags && j < flags.length; j++) switch (flags.charAt(j)) {
-                case ' ': positivePrefix = ' '; break;
-                case '+': positivePrefix = '+'; break;
-                case '-': leftJustify = true; break;
-                case '0': zeroPad = true; break;
-                case '#': prefixBaseX = true; break;
-                case '&': htmlSpace = true; break;
-                case '\'': thousandSeparation = true; break;
-            }
-
-            // parameters may be null, undefined, empty-string or real valued
-            // we want to ignore null, undefined and empty-string values
-
-            if (!minWidth) {
-                minWidth = 0;
-            } 
-            else if (minWidth == '*') {
-                minWidth = +a[i++];
-            } 
-            else if (minWidth.charAt(0) == '*') {
-                minWidth = +a[minWidth.slice(1, -1)];
-            } 
-            else {
-                minWidth = +minWidth;
-            }
-
-            // Note: undocumented perl feature:
-            if (minWidth < 0) {
-                minWidth = -minWidth;
-                leftJustify = true;
-            }
-
-            if (!isFinite(minWidth)) {
-                throw new Error('$.jqplot.sprintf: (minimum-)width must be finite');
-            }
-
-            if (!precision) {
-                precision = 'fFeE'.indexOf(type) > -1 ? 6 : (type == 'd') ? 0 : void(0);
-            } 
-            else if (precision == '*') {
-                precision = +a[i++];
-            } 
-            else if (precision.charAt(0) == '*') {
-                precision = +a[precision.slice(1, -1)];
-            } 
-            else {
-                precision = +precision;
-            }
-
-            // grab value using valueIndex if required?
-            var value = valueIndex ? a[valueIndex.slice(0, -1)] : a[i++];
-
-            switch (type) {
-            case 's': {
-                if (value == null) {
-                    return '';
-                }
-                return formatString(String(value), leftJustify, minWidth, precision, zeroPad, htmlSpace);
-            }
-            case 'c': return formatString(String.fromCharCode(+value), leftJustify, minWidth, precision, zeroPad, htmlSpace);
-            case 'b': return formatBaseX(value, 2, prefixBaseX, leftJustify, minWidth, precision, zeroPad,htmlSpace);
-            case 'o': return formatBaseX(value, 8, prefixBaseX, leftJustify, minWidth, precision, zeroPad, htmlSpace);
-            case 'x': return formatBaseX(value, 16, prefixBaseX, leftJustify, minWidth, precision, zeroPad, htmlSpace);
-            case 'X': return formatBaseX(value, 16, prefixBaseX, leftJustify, minWidth, precision, zeroPad, htmlSpace).toUpperCase();
-            case 'u': return formatBaseX(value, 10, prefixBaseX, leftJustify, minWidth, precision, zeroPad, htmlSpace);
-            case 'i': {
-              var number = parseInt(+value, 10);
-              if (isNaN(number)) {
-                return '';
-              }
-              var prefix = number < 0 ? '-' : positivePrefix;
-              var number_str = thousandSeparation ? thousand_separate(String(Math.abs(number))): String(Math.abs(number));
-              value = prefix + pad(number_str, precision, '0', false);
-              //value = prefix + pad(String(Math.abs(number)), precision, '0', false);
-              return justify(value, prefix, leftJustify, minWidth, zeroPad, htmlSpace);
-                  }
-            case 'd': {
-              var number = Math.round(+value);
-              if (isNaN(number)) {
-                return '';
-              }
-              var prefix = number < 0 ? '-' : positivePrefix;
-              var number_str = thousandSeparation ? thousand_separate(String(Math.abs(number))): String(Math.abs(number));
-              value = prefix + pad(number_str, precision, '0', false);
-              return justify(value, prefix, leftJustify, minWidth, zeroPad, htmlSpace);
-                  }
-            case 'e':
-            case 'E':
-            case 'f':
-            case 'F':
-            case 'g':
-            case 'G':
-                      {
-                      var number = +value;
-                      if (isNaN(number)) {
-                          return '';
-                      }
-                      var prefix = number < 0 ? '-' : positivePrefix;
-                      var method = ['toExponential', 'toFixed', 'toPrecision']['efg'.indexOf(type.toLowerCase())];
-                      var textTransform = ['toString', 'toUpperCase']['eEfFgG'.indexOf(type) % 2];
-                      var number_str = Math.abs(number)[method](precision);
-                      
-                      // Apply the decimal mark properly by splitting the number by the
-                      //   decimalMark, applying thousands separator, and then placing it
-                      //   back in.
-                      var parts = number_str.toString().split('.');
-                      parts[0] = thousandSeparation ? thousand_separate(parts[0]) : parts[0];
-                      number_str = parts.join($.jqplot.sprintf.decimalMark);
-                      
-                      value = prefix + number_str;
-                      var justified = justify(value, prefix, leftJustify, minWidth, zeroPad, htmlSpace)[textTransform]();
-                      
-                      return justified;
-                  }
-            case 'p':
-            case 'P':
-            {
-                // make sure number is a number
-                var number = +value;
-                if (isNaN(number)) {
-                    return '';
-                }
-                var prefix = number < 0 ? '-' : positivePrefix;
-
-                var parts = String(Number(Math.abs(number)).toExponential()).split(/e|E/);
-                var sd = (parts[0].indexOf('.') != -1) ? parts[0].length - 1 : String(number).length;
-                var zeros = (parts[1] < 0) ? -parts[1] - 1 : 0;
-                
-                if (Math.abs(number) < 1) {
-                    if (sd + zeros  <= precision) {
-                        value = prefix + Math.abs(number).toPrecision(sd);
-                    }
-                    else {
-                        if (sd  <= precision - 1) {
-                            value = prefix + Math.abs(number).toExponential(sd-1);
-                        }
-                        else {
-                            value = prefix + Math.abs(number).toExponential(precision-1);
-                        }
-                    }
-                }
-                else {
-                    var prec = (sd <= precision) ? sd : precision;
-                    value = prefix + Math.abs(number).toPrecision(prec);
-                }
-                var textTransform = ['toString', 'toUpperCase']['pP'.indexOf(type) % 2];
-                return justify(value, prefix, leftJustify, minWidth, zeroPad, htmlSpace)[textTransform]();
-            }
-            case 'n': return '';
-            default: return substring;
-            }
-        });
-    };
-
-    $.jqplot.sprintf.thousandsSeparator = ',';
-    // Specifies the decimal mark for floating point values. By default a period '.'
-    // is used. If you change this value to for example a comma be sure to also
-    // change the thousands separator or else this won't work since a simple String
-    // replace is used (replacing all periods with the mark specified here).
-    $.jqplot.sprintf.decimalMark = '.';
-    
-    $.jqplot.sprintf.regex = /%%|%(\d+\$)?([-+#0&\' ]*)(\*\d+\$|\*|\d+)?(\.(\*\d+\$|\*|\d+))?([nAscboxXuidfegpEGP])/g;
-
-    $.jqplot.getSignificantFigures = function(number) {
-        var parts = String(Number(Math.abs(number)).toExponential()).split(/e|E/);
-        // total significant digits
-        var sd = (parts[0].indexOf('.') != -1) ? parts[0].length - 1 : parts[0].length;
-        var zeros = (parts[1] < 0) ? -parts[1] - 1 : 0;
-        // exponent
-        var expn = parseInt(parts[1], 10);
-        // digits to the left of the decimal place
-        var dleft = (expn + 1 > 0) ? expn + 1 : 0;
-        // digits to the right of the decimal place
-        var dright = (sd <= dleft) ? 0 : sd - expn - 1;
-        return {significantDigits: sd, digitsLeft: dleft, digitsRight: dright, zeros: zeros, exponent: expn} ;
-    };
-
-    $.jqplot.getPrecision = function(number) {
-        return $.jqplot.getSignificantFigures(number).digitsRight;
-    };
-
-  
-
-
-    var backCompat = $.uiBackCompat !== false;
-
-    $.jqplot.effects = {
-        effect: {}
-    };
-
-    // prefix used for storing data on .data()
-    var dataSpace = "jqplot.storage.";
-
-    /******************************************************************************/
-    /*********************************** EFFECTS **********************************/
-    /******************************************************************************/
-
-    $.extend( $.jqplot.effects, {
-        version: "1.9pre",
-
-        // Saves a set of properties in a data storage
-        save: function( element, set ) {
-            for( var i=0; i < set.length; i++ ) {
-                if ( set[ i ] !== null ) {
-                    element.data( dataSpace + set[ i ], element[ 0 ].style[ set[ i ] ] );
-                }
-            }
-        },
-
-        // Restores a set of previously saved properties from a data storage
-        restore: function( element, set ) {
-            for( var i=0; i < set.length; i++ ) {
-                if ( set[ i ] !== null ) {
-                    element.css( set[ i ], element.data( dataSpace + set[ i ] ) );
-                }
-            }
-        },
-
-        setMode: function( el, mode ) {
-            if (mode === "toggle") {
-                mode = el.is( ":hidden" ) ? "show" : "hide";
-            }
-            return mode;
-        },
-
-        // Wraps the element around a wrapper that copies position properties
-        createWrapper: function( element ) {
-
-            // if the element is already wrapped, return it
-            if ( element.parent().is( ".ui-effects-wrapper" )) {
-                return element.parent();
-            }
-
-            // wrap the element
-            var props = {
-                    width: element.outerWidth(true),
-                    height: element.outerHeight(true),
-                    "float": element.css( "float" )
-                },
-                wrapper = $( "<div></div>" )
-                    .addClass( "ui-effects-wrapper" )
-                    .css({
-                        fontSize: "100%",
-                        background: "transparent",
-                        border: "none",
-                        margin: 0,
-                        padding: 0
-                    }),
-                // Store the size in case width/height are defined in % - Fixes #5245
-                size = {
-                    width: element.width(),
-                    height: element.height()
-                },
-                active = document.activeElement;
-
-            element.wrap( wrapper );
-
-            // Fixes #7595 - Elements lose focus when wrapped.
-            if ( element[ 0 ] === active || $.contains( element[ 0 ], active ) ) {
-                $( active ).focus();
-            }
-
-            wrapper = element.parent(); //Hotfix for jQuery 1.4 since some change in wrap() seems to actually loose the reference to the wrapped element
-
-            // transfer positioning properties to the wrapper
-            if ( element.css( "position" ) === "static" ) {
-                wrapper.css({ position: "relative" });
-                element.css({ position: "relative" });
-            } else {
-                $.extend( props, {
-                    position: element.css( "position" ),
-                    zIndex: element.css( "z-index" )
-                });
-                $.each([ "top", "left", "bottom", "right" ], function(i, pos) {
-                    props[ pos ] = element.css( pos );
-                    if ( isNaN( parseInt( props[ pos ], 10 ) ) ) {
-                        props[ pos ] = "auto";
-                    }
-                });
-                element.css({
-                    position: "relative",
-                    top: 0,
-                    left: 0,
-                    right: "auto",
-                    bottom: "auto"
-                });
-            }
-            element.css(size);
-
-            return wrapper.css( props ).show();
-        },
-
-        removeWrapper: function( element ) {
-            var active = document.activeElement;
-
-            if ( element.parent().is( ".ui-effects-wrapper" ) ) {
-                element.parent().replaceWith( element );
-
-                // Fixes #7595 - Elements lose focus when wrapped.
-                if ( element[ 0 ] === active || $.contains( element[ 0 ], active ) ) {
-                    $( active ).focus();
-                }
-            }
-
-
-            return element;
-        }
-    });
-
-    // return an effect options object for the given parameters:
-    function _normalizeArguments( effect, options, speed, callback ) {
-
-        // short path for passing an effect options object:
-        if ( $.isPlainObject( effect ) ) {
-            return effect;
-        }
-
-        // convert to an object
-        effect = { effect: effect };
-
-        // catch (effect)
-        if ( options === undefined ) {
-            options = {};
-        }
-
-        // catch (effect, callback)
-        if ( $.isFunction( options ) ) {
-            callback = options;
-            speed = null;
-            options = {};
-        }
-
-        // catch (effect, speed, ?)
-        if ( $.type( options ) === "number" || $.fx.speeds[ options ]) {
-            callback = speed;
-            speed = options;
-            options = {};
-        }
-
-        // catch (effect, options, callback)
-        if ( $.isFunction( speed ) ) {
-            callback = speed;
-            speed = null;
-        }
-
-        // add options to effect
-        if ( options ) {
-            $.extend( effect, options );
-        }
-
-        speed = speed || options.duration;
-        effect.duration = $.fx.off ? 0 : typeof speed === "number"
-            ? speed : speed in $.fx.speeds ? $.fx.speeds[ speed ] : $.fx.speeds._default;
-
-        effect.complete = callback || options.complete;
-
-        return effect;
-    }
-
-    function standardSpeed( speed ) {
-        // valid standard speeds
-        if ( !speed || typeof speed === "number" || $.fx.speeds[ speed ] ) {
-            return true;
-        }
-
-        // invalid strings - treat as "normal" speed
-        if ( typeof speed === "string" && !$.jqplot.effects.effect[ speed ] ) {
-            // TODO: remove in 2.0 (#7115)
-            if ( backCompat && $.jqplot.effects[ speed ] ) {
-                return false;
-            }
-            return true;
-        }
-
-        return false;
-    }
-
-    $.fn.extend({
-        jqplotEffect: function( effect, options, speed, callback ) {
-            var args = _normalizeArguments.apply( this, arguments ),
-                mode = args.mode,
-                queue = args.queue,
-                effectMethod = $.jqplot.effects.effect[ args.effect ],
-
-                // DEPRECATED: remove in 2.0 (#7115)
-                oldEffectMethod = !effectMethod && backCompat && $.jqplot.effects[ args.effect ];
-
-            if ( $.fx.off || !( effectMethod || oldEffectMethod ) ) {
-                // delegate to the original method (e.g., .show()) if possible
-                if ( mode ) {
-                    return this[ mode ]( args.duration, args.complete );
-                } else {
-                    return this.each( function() {
-                        if ( args.complete ) {
-                            args.complete.call( this );
-                        }
-                    });
-                }
-            }
-
-            function run( next ) {
-                var elem = $( this ),
-                    complete = args.complete,
-                    mode = args.mode;
-
-                function done() {
-                    if ( $.isFunction( complete ) ) {
-                        complete.call( elem[0] );
-                    }
-                    if ( $.isFunction( next ) ) {
-                        next();
-                    }
-                }
-
-                // if the element is hiddden and mode is hide,
-                // or element is visible and mode is show
-                if ( elem.is( ":hidden" ) ? mode === "hide" : mode === "show" ) {
-                    done();
-                } else {
-                    effectMethod.call( elem[0], args, done );
-                }
-            }
-
-            // TODO: remove this check in 2.0, effectMethod will always be true
-            if ( effectMethod ) {
-                return queue === false ? this.each( run ) : this.queue( queue || "fx", run );
-            } else {
-                // DEPRECATED: remove in 2.0 (#7115)
-                return oldEffectMethod.call(this, {
-                    options: args,
-                    duration: args.duration,
-                    callback: args.complete,
-                    mode: args.mode
-                });
-            }
-        }
-    });
-
-
-
-
-    var rvertical = /up|down|vertical/,
-        rpositivemotion = /up|left|vertical|horizontal/;
-
-    $.jqplot.effects.effect.blind = function( o, done ) {
-        // Create element
-        var el = $( this ),
-            props = [ "position", "top", "bottom", "left", "right", "height", "width" ],
-            mode = $.jqplot.effects.setMode( el, o.mode || "hide" ),
-            direction = o.direction || "up",
-            vertical = rvertical.test( direction ),
-            ref = vertical ? "height" : "width",
-            ref2 = vertical ? "top" : "left",
-            motion = rpositivemotion.test( direction ),
-            animation = {},
-            show = mode === "show",
-            wrapper, distance, top;
-
-        // // if already wrapped, the wrapper's properties are my property. #6245
-        if ( el.parent().is( ".ui-effects-wrapper" ) ) {
-            $.jqplot.effects.save( el.parent(), props );
-        } else {
-            $.jqplot.effects.save( el, props );
-        }
-        el.show();
-        top = parseInt(el.css('top'), 10);
-        wrapper = $.jqplot.effects.createWrapper( el ).css({
-            overflow: "hidden"
-        });
-
-        distance = vertical ? wrapper[ ref ]() + top : wrapper[ ref ]();
-
-        animation[ ref ] = show ? String(distance) : '0';
-        if ( !motion ) {
-            el
-                .css( vertical ? "bottom" : "right", 0 )
-                .css( vertical ? "top" : "left", "" )
-                .css({ position: "absolute" });
-            animation[ ref2 ] = show ? '0' : String(distance);
-        }
-
-        // // start at 0 if we are showing
-        if ( show ) {
-            wrapper.css( ref, 0 );
-            if ( ! motion ) {
-                wrapper.css( ref2, distance );
-            }
-        }
-
-        // // Animate
-        wrapper.animate( animation, {
-            duration: o.duration,
-            easing: o.easing,
-            queue: false,
-            complete: function() {
-                if ( mode === "hide" ) {
-                    el.hide();
-                }
-                $.jqplot.effects.restore( el, props );
-                $.jqplot.effects.removeWrapper( el );
-                done();
-            }
-        });
-
-    };
-
-})(jQuery);
diff --git a/#pma/js/jqplot/plugins/jqplot.barRenderer.js b/#pma/js/jqplot/plugins/jqplot.barRenderer.js
deleted file mode 100644
index 9b714e9c..00000000
--- a/#pma/js/jqplot/plugins/jqplot.barRenderer.js
+++ /dev/null
@@ -1,801 +0,0 @@
-/**
- * jqPlot
- * Pure JavaScript plotting plugin using jQuery
- *
- * Version: 1.0.8
- * Revision: 1250
- *
- * Copyright (c) 2009-2013 Chris Leonello
- * jqPlot is currently available for use in all personal or commercial projects 
- * under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL 
- * version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can 
- * choose the license that best suits your project and use it accordingly. 
- *
- * Although not required, the author would appreciate an email letting him 
- * know of any substantial use of jqPlot.  You can reach the author at: 
- * chris at jqplot dot com or see http://www.jqplot.com/info.php .
- *
- * If you are feeling kind and generous, consider supporting the project by
- * making a donation at: http://www.jqplot.com/donate.php .
- *
- * sprintf functions contained in jqplot.sprintf.js by Ash Searle:
- *
- *     version 2007.04.27
- *     author Ash Searle
- *     http://hexmen.com/blog/2007/03/printf-sprintf/
- *     http://hexmen.com/js/sprintf.js
- *     The author (Ash Searle) has placed this code in the public domain:
- *     "This code is unrestricted: you are free to use it however you like."
- * 
- */
-(function($) {
-    
-    // Class: $.jqplot.BarRenderer
-    // A plugin renderer for jqPlot to draw a bar plot.
-    // Draws series as a line.
-    
-    $.jqplot.BarRenderer = function(){
-        $.jqplot.LineRenderer.call(this);
-    };
-    
-    $.jqplot.BarRenderer.prototype = new $.jqplot.LineRenderer();
-    $.jqplot.BarRenderer.prototype.constructor = $.jqplot.BarRenderer;
-    
-    // called with scope of series.
-    $.jqplot.BarRenderer.prototype.init = function(options, plot) {
-        // Group: Properties
-        //
-        // prop: barPadding
-        // Number of pixels between adjacent bars at the same axis value.
-        this.barPadding = 8;
-        // prop: barMargin
-        // Number of pixels between groups of bars at adjacent axis values.
-        this.barMargin = 10;
-        // prop: barDirection
-        // 'vertical' = up and down bars, 'horizontal' = side to side bars
-        this.barDirection = 'vertical';
-        // prop: barWidth
-        // Width of the bar in pixels (auto by devaul).  null = calculated automatically.
-        this.barWidth = null;
-        // prop: shadowOffset
-        // offset of the shadow from the slice and offset of 
-        // each succesive stroke of the shadow from the last.
-        this.shadowOffset = 2;
-        // prop: shadowDepth
-        // number of strokes to apply to the shadow, 
-        // each stroke offset shadowOffset from the last.
-        this.shadowDepth = 5;
-        // prop: shadowAlpha
-        // transparency of the shadow (0 = transparent, 1 = opaque)
-        this.shadowAlpha = 0.08;
-        // prop: waterfall
-        // true to enable waterfall plot.
-        this.waterfall = false;
-        // prop: groups
-        // group bars into this many groups
-        this.groups = 1;
-        // prop: varyBarColor
-        // true to color each bar of a series separately rather than
-        // have every bar of a given series the same color.
-        // If used for non-stacked multiple series bar plots, user should
-        // specify a separate 'seriesColors' array for each series.
-        // Otherwise, each series will set their bars to the same color array.
-        // This option has no Effect for stacked bar charts and is disabled.
-        this.varyBarColor = false;
-        // prop: highlightMouseOver
-        // True to highlight slice when moused over.
-        // This must be false to enable highlightMouseDown to highlight when clicking on a slice.
-        this.highlightMouseOver = true;
-        // prop: highlightMouseDown
-        // True to highlight when a mouse button is pressed over a slice.
-        // This will be disabled if highlightMouseOver is true.
-        this.highlightMouseDown = false;
-        // prop: highlightColors
-        // an array of colors to use when highlighting a bar.
-        this.highlightColors = [];
-        // prop: transposedData
-        // NOT IMPLEMENTED YET.  True if this is a horizontal bar plot and 
-        // x and y values are "transposed".  Tranposed, or "swapped", data is 
-        // required prior to rev. 894 builds of jqPlot with horizontal bars. 
-        // Allows backward compatability of bar renderer horizontal bars with 
-        // old style data sets.
-        this.transposedData = true;
-        this.renderer.animation = {
-            show: false,
-            direction: 'down',
-            speed: 3000,
-            _supported: true
-        };
-        this._type = 'bar';
-        
-        // if user has passed in highlightMouseDown option and not set highlightMouseOver, disable highlightMouseOver
-        if (options.highlightMouseDown && options.highlightMouseOver == null) {
-            options.highlightMouseOver = false;
-        }
-        
-        //////
-        // This is probably wrong here.
-        // After going back and forth on whether renderer should be the thing
-        // or extend the thing, it seems that it it best if it is a property
-        // on the thing.  This should be something that is commonized 
-        // among series renderers in the future.
-        //////
-        $.extend(true, this, options);
-
-        // really should probably do this
-        $.extend(true, this.renderer, options);
-        // fill is still needed to properly draw the legend.
-        // bars have to be filled.
-        this.fill = true;
-
-        // if horizontal bar and animating, reset the default direction
-        if (this.barDirection === 'horizontal' && this.rendererOptions.animation && this.rendererOptions.animation.direction == null) {
-            this.renderer.animation.direction = 'left';
-        }
-        
-        if (this.waterfall) {
-            this.fillToZero = false;
-            this.disableStack = true;
-        }
-        
-        if (this.barDirection == 'vertical' ) {
-            this._primaryAxis = '_xaxis';
-            this._stackAxis = 'y';
-            this.fillAxis = 'y';
-        }
-        else {
-            this._primaryAxis = '_yaxis';
-            this._stackAxis = 'x';
-            this.fillAxis = 'x';
-        }
-        // index of the currenty highlighted point, if any
-        this._highlightedPoint = null;
-        // total number of values for all bar series, total number of bar series, and position of this series
-        this._plotSeriesInfo = null;
-        // Array of actual data colors used for each data point.
-        this._dataColors = [];
-        this._barPoints = [];
-        
-        // set the shape renderer options
-        var opts = {lineJoin:'miter', lineCap:'round', fill:true, isarc:false, strokeStyle:this.color, fillStyle:this.color, closePath:this.fill};
-        this.renderer.shapeRenderer.init(opts);
-        // set the shadow renderer options
-        var sopts = {lineJoin:'miter', lineCap:'round', fill:true, isarc:false, angle:this.shadowAngle, offset:this.shadowOffset, alpha:this.shadowAlpha, depth:this.shadowDepth, closePath:this.fill};
-        this.renderer.shadowRenderer.init(sopts);
-        
-        plot.postInitHooks.addOnce(postInit);
-        plot.postDrawHooks.addOnce(postPlotDraw);
-        plot.eventListenerHooks.addOnce('jqplotMouseMove', handleMove);
-        plot.eventListenerHooks.addOnce('jqplotMouseDown', handleMouseDown);
-        plot.eventListenerHooks.addOnce('jqplotMouseUp', handleMouseUp);
-        plot.eventListenerHooks.addOnce('jqplotClick', handleClick);
-        plot.eventListenerHooks.addOnce('jqplotRightClick', handleRightClick); 
-    };
-    
-    // called with scope of series
-    function barPreInit(target, data, seriesDefaults, options) {
-        if (this.rendererOptions.barDirection == 'horizontal') {
-            this._stackAxis = 'x';
-            this._primaryAxis = '_yaxis';
-        }
-        if (this.rendererOptions.waterfall == true) {
-            this._data = $.extend(true, [], this.data);
-            var sum = 0;
-            var pos = (!this.rendererOptions.barDirection || this.rendererOptions.barDirection === 'vertical' || this.transposedData === false) ? 1 : 0;
-            for(var i=0; i<this.data.length; i++) {
-                sum += this.data[i][pos];
-                if (i>0) {
-                    this.data[i][pos] += this.data[i-1][pos];
-                }
-            }
-            this.data[this.data.length] = (pos == 1) ? [this.data.length+1, sum] : [sum, this.data.length+1];
-            this._data[this._data.length] = (pos == 1) ? [this._data.length+1, sum] : [sum, this._data.length+1];
-        }
-        if (this.rendererOptions.groups > 1) {
-            this.breakOnNull = true;
-            var l = this.data.length;
-            var skip = parseInt(l/this.rendererOptions.groups, 10);
-            var count = 0;
-            for (var i=skip; i<l; i+=skip) {
-                this.data.splice(i+count, 0, [null, null]);
-                this._plotData.splice(i+count, 0, [null, null]);
-                this._stackData.splice(i+count, 0, [null, null]);
-                count++;
-            }
-            for (i=0; i<this.data.length; i++) {
-                if (this._primaryAxis == '_xaxis') {
-                    this.data[i][0] = i+1;
-                    this._plotData[i][0] = i+1;
-                    this._stackData[i][0] = i+1;
-                }
-                else {
-                    this.data[i][1] = i+1;
-                    this._plotData[i][1] = i+1;
-                    this._stackData[i][1] = i+1;
-                }
-            }
-        }
-    }
-    
-    $.jqplot.preSeriesInitHooks.push(barPreInit);
-    
-    // needs to be called with scope of series, not renderer.
-    $.jqplot.BarRenderer.prototype.calcSeriesNumbers = function() {
-        var nvals = 0;
-        var nseries = 0;
-        var paxis = this[this._primaryAxis];
-        var s, series, pos;
-        // loop through all series on this axis
-        for (var i=0; i < paxis._series.length; i++) {
-            series = paxis._series[i];
-            if (series === this) {
-                pos = i;
-            }
-            // is the series rendered as a bar?
-            if (series.renderer.constructor == $.jqplot.BarRenderer) {
-                // gridData may not be computed yet, use data length insted
-                nvals += series.data.length;
-                nseries += 1;
-            }
-        }
-        // return total number of values for all bar series, total number of bar series, and position of this series
-        return [nvals, nseries, pos];
-    };
-
-    $.jqplot.BarRenderer.prototype.setBarWidth = function() {
-        // need to know how many data values we have on the approprate axis and figure it out.
-        var i;
-        var nvals = 0;
-        var nseries = 0;
-        var paxis = this[this._primaryAxis];
-        var s, series, pos;
-        var temp = this._plotSeriesInfo = this.renderer.calcSeriesNumbers.call(this);
-        nvals = temp[0];
-        nseries = temp[1];
-        var nticks = paxis.numberTicks;
-        var nbins = (nticks-1)/2;
-        // so, now we have total number of axis values.
-        if (paxis.name == 'xaxis' || paxis.name == 'x2axis') {
-            if (this._stack) {
-                this.barWidth = (paxis._offsets.max - paxis._offsets.min) / nvals * nseries - this.barMargin;
-            }
-            else {
-                this.barWidth = ((paxis._offsets.max - paxis._offsets.min)/nbins  - this.barPadding * (nseries-1) - this.barMargin*2)/nseries;
-                // this.barWidth = (paxis._offsets.max - paxis._offsets.min) / nvals - this.barPadding - this.barMargin/nseries;
-            }
-        }
-        else {
-            if (this._stack) {
-                this.barWidth = (paxis._offsets.min - paxis._offsets.max) / nvals * nseries - this.barMargin;
-            }
-            else {
-                this.barWidth = ((paxis._offsets.min - paxis._offsets.max)/nbins  - this.barPadding * (nseries-1) - this.barMargin*2)/nseries;
-                // this.barWidth = (paxis._offsets.min - paxis._offsets.max) / nvals - this.barPadding - this.barMargin/nseries;
-            }
-        }
-        return [nvals, nseries];
-    };
-
-    function computeHighlightColors (colors) {
-        var ret = [];
-        for (var i=0; i<colors.length; i++){
-            var rgba = $.jqplot.getColorComponents(colors[i]);
-            var newrgb = [rgba[0], rgba[1], rgba[2]];
-            var sum = newrgb[0] + newrgb[1] + newrgb[2];
-            for (var j=0; j<3; j++) {
-                // when darkening, lowest color component can be is 60.
-                newrgb[j] = (sum > 570) ?  newrgb[j] * 0.8 : newrgb[j] + 0.3 * (255 - newrgb[j]);
-                newrgb[j] = parseInt(newrgb[j], 10);
-            }
-            ret.push('rgb('+newrgb[0]+','+newrgb[1]+','+newrgb[2]+')');
-        }
-        return ret;
-    }
-
-    function getStart(sidx, didx, comp, plot, axis) {
-        // check if sign change
-        var seriesIndex = sidx,
-            prevSeriesIndex = sidx - 1,
-            start,
-            prevVal,
-            aidx = (axis === 'x') ? 0 : 1;
-
-        // is this not the first series?
-        if (seriesIndex > 0) {
-            prevVal = plot.series[prevSeriesIndex]._plotData[didx][aidx];
-
-            // is there a sign change
-            if ((comp * prevVal) < 0) {
-                start = getStart(prevSeriesIndex, didx, comp, plot, axis);
-            }
-
-            // no sign change.
-            else {
-                start = plot.series[prevSeriesIndex].gridData[didx][aidx];
-            }
-
-        }
-
-        // if first series, return value at 0
-        else {
-
-            start = (aidx === 0) ? plot.series[seriesIndex]._xaxis.series_u2p(0) : plot.series[seriesIndex]._yaxis.series_u2p(0);
-        }
-
-        return start;
-    }
-
-    
-    $.jqplot.BarRenderer.prototype.draw = function(ctx, gridData, options, plot) {
-        var i;
-        // Ughhh, have to make a copy of options b/c it may be modified later.
-        var opts = $.extend({}, options);
-        var shadow = (opts.shadow != undefined) ? opts.shadow : this.shadow;
-        var showLine = (opts.showLine != undefined) ? opts.showLine : this.showLine;
-        var fill = (opts.fill != undefined) ? opts.fill : this.fill;
-        var xaxis = this.xaxis;
-        var yaxis = this.yaxis;
-        var xp = this._xaxis.series_u2p;
-        var yp = this._yaxis.series_u2p;
-        var pointx, pointy;
-        // clear out data colors.
-        this._dataColors = [];
-        this._barPoints = [];
-        
-        if (this.barWidth == null) {
-            this.renderer.setBarWidth.call(this);
-        }
-        
-        var temp = this._plotSeriesInfo = this.renderer.calcSeriesNumbers.call(this);
-        var nvals = temp[0];
-        var nseries = temp[1];
-        var pos = temp[2];
-        var points = [];
-        
-        if (this._stack) {
-            this._barNudge = 0;
-        }
-        else {
-            this._barNudge = (-Math.abs(nseries/2 - 0.5) + pos) * (this.barWidth + this.barPadding);
-        }
-        if (showLine) {
-            var negativeColors = new $.jqplot.ColorGenerator(this.negativeSeriesColors);
-            var positiveColors = new $.jqplot.ColorGenerator(this.seriesColors);
-            var negativeColor = negativeColors.get(this.index);
-            if (! this.useNegativeColors) {
-                negativeColor = opts.fillStyle;
-            }
-            var positiveColor = opts.fillStyle;
-            var base;
-            var xstart; 
-            var ystart;
-            
-            if (this.barDirection == 'vertical') {
-                for (var i=0; i<gridData.length; i++) {
-                    if (!this._stack && this.data[i][1] == null) {
-                        continue;
-                    }
-                    points = [];
-                    base = gridData[i][0] + this._barNudge;
-                    
-                    // stacked
-                    if (this._stack && this._prevGridData.length) {
-                        ystart = getStart(this.index, i, this._plotData[i][1], plot, 'y');
-                    }
-
-                    // not stacked
-                    else {
-                        if (this.fillToZero) {
-                            ystart = this._yaxis.series_u2p(0);
-                        }
-                        else if (this.waterfall && i > 0 && i < this.gridData.length-1) {
-                            ystart = this.gridData[i-1][1];
-                        }
-                        else if (this.waterfall && i == 0 && i < this.gridData.length-1) {
-                            if (this._yaxis.min <= 0 && this._yaxis.max >= 0) {
-                                ystart = this._yaxis.series_u2p(0);
-                            }
-                            else if (this._yaxis.min > 0) {
-                                ystart = ctx.canvas.height;
-                            }
-                            else {
-                                ystart = 0;
-                            }
-                        }
-                        else if (this.waterfall && i == this.gridData.length - 1) {
-                            if (this._yaxis.min <= 0 && this._yaxis.max >= 0) {
-                                ystart = this._yaxis.series_u2p(0);
-                            }
-                            else if (this._yaxis.min > 0) {
-                                ystart = ctx.canvas.height;
-                            }
-                            else {
-                                ystart = 0;
-                            }
-                        }
-                        else {
-                            ystart = ctx.canvas.height;
-                        }
-                    }
-                    if ((this.fillToZero && this._plotData[i][1] < 0) || (this.waterfall && this._data[i][1] < 0)) {
-                        if (this.varyBarColor && !this._stack) {
-                            if (this.useNegativeColors) {
-                                opts.fillStyle = negativeColors.next();
-                            }
-                            else {
-                                opts.fillStyle = positiveColors.next();
-                            }
-                        }
-                        else {
-                            opts.fillStyle = negativeColor;
-                        }
-                    }
-                    else {
-                        if (this.varyBarColor && !this._stack) {
-                            opts.fillStyle = positiveColors.next();
-                        }
-                        else {
-                            opts.fillStyle = positiveColor;
-                        }
-                    }
-                    
-                    if (!this.fillToZero || this._plotData[i][1] >= 0) { 
-                        points.push([base-this.barWidth/2, ystart]);
-                        points.push([base-this.barWidth/2, gridData[i][1]]);
-                        points.push([base+this.barWidth/2, gridData[i][1]]);
-                        points.push([base+this.barWidth/2, ystart]);
-                    }
-                    // for negative bars make sure points are always ordered clockwise
-                    else {              
-                        points.push([base-this.barWidth/2, gridData[i][1]]);
-                        points.push([base-this.barWidth/2, ystart]);
-                        points.push([base+this.barWidth/2, ystart]);
-                        points.push([base+this.barWidth/2, gridData[i][1]]);
-                    }
-                    this._barPoints.push(points);
-                    // now draw the shadows if not stacked.
-                    // for stacked plots, they are predrawn by drawShadow
-                    if (shadow && !this._stack) {
-                        var sopts = $.extend(true, {}, opts);
-                        // need to get rid of fillStyle on shadow.
-                        delete sopts.fillStyle;
-                        this.renderer.shadowRenderer.draw(ctx, points, sopts);
-                    }
-                    var clr = opts.fillStyle || this.color;
-                    this._dataColors.push(clr);
-                    this.renderer.shapeRenderer.draw(ctx, points, opts); 
-                }
-            }
-            
-            else if (this.barDirection == 'horizontal'){
-                for (var i=0; i<gridData.length; i++) {
-                    if (!this._stack && this.data[i][0] == null) {
-                        continue;
-                    }
-                    points = [];
-                    base = gridData[i][1] - this._barNudge;
-                    xstart;
-                    
-                    if (this._stack && this._prevGridData.length) {
-                        xstart = getStart(this.index, i, this._plotData[i][0], plot, 'x');
-                    }
-                    // not stacked
-                    else {
-                        if (this.fillToZero) {
-                            xstart = this._xaxis.series_u2p(0);
-                        }
-                        else if (this.waterfall && i > 0 && i < this.gridData.length-1) {
-                            xstart = this.gridData[i-1][0];
-                        }
-                        else if (this.waterfall && i == 0 && i < this.gridData.length-1) {
-                            if (this._xaxis.min <= 0 && this._xaxis.max >= 0) {
-                                xstart = this._xaxis.series_u2p(0);
-                            }
-                            else if (this._xaxis.min > 0) {
-                                xstart = 0;
-                            }
-                            else {
-                                xstart = 0;
-                            }
-                        }
-                        else if (this.waterfall && i == this.gridData.length - 1) {
-                            if (this._xaxis.min <= 0 && this._xaxis.max >= 0) {
-                                xstart = this._xaxis.series_u2p(0);
-                            }
-                            else if (this._xaxis.min > 0) {
-                                xstart = 0;
-                            }
-                            else {
-                                xstart = ctx.canvas.width;
-                            }
-                        }
-                        else {
-                            xstart = 0;
-                        }
-                    }
-                    if ((this.fillToZero && this._plotData[i][0] < 0) || (this.waterfall && this._data[i][0] < 0)) {
-                        if (this.varyBarColor && !this._stack) {
-                            if (this.useNegativeColors) {
-                                opts.fillStyle = negativeColors.next();
-                            }
-                            else {
-                                opts.fillStyle = positiveColors.next();
-                            }
-                        }
-                        else {
-                            opts.fillStyle = negativeColor;
-                        }
-                    }
-                    else {
-                        if (this.varyBarColor && !this._stack) {
-                            opts.fillStyle = positiveColors.next();
-                        }
-                        else {
-                            opts.fillStyle = positiveColor;
-                        }                    
-                    }
-                    
-
-                    if (!this.fillToZero || this._plotData[i][0] >= 0) {
-                        points.push([xstart, base + this.barWidth / 2]);
-                        points.push([xstart, base - this.barWidth / 2]);
-                        points.push([gridData[i][0], base - this.barWidth / 2]);
-                        points.push([gridData[i][0], base + this.barWidth / 2]);
-                    }
-                    else {
-                        points.push([gridData[i][0], base + this.barWidth / 2]);
-                        points.push([gridData[i][0], base - this.barWidth / 2]);
-                        points.push([xstart, base - this.barWidth / 2]);
-                        points.push([xstart, base + this.barWidth / 2]);
-                    }
-
-                    this._barPoints.push(points);
-                    // now draw the shadows if not stacked.
-                    // for stacked plots, they are predrawn by drawShadow
-                    if (shadow && !this._stack) {
-                        var sopts = $.extend(true, {}, opts);
-                        delete sopts.fillStyle;
-                        this.renderer.shadowRenderer.draw(ctx, points, sopts);
-                    }
-                    var clr = opts.fillStyle || this.color;
-                    this._dataColors.push(clr);
-                    this.renderer.shapeRenderer.draw(ctx, points, opts);
-                } 
-            }
-        }                
-        
-        if (this.highlightColors.length == 0) {
-            this.highlightColors = $.jqplot.computeHighlightColors(this._dataColors);
-        }
-        
-        else if (typeof(this.highlightColors) == 'string') {
-            var temp = this.highlightColors;
-            this.highlightColors = [];
-            for (var i=0; i<this._dataColors.length; i++) {
-                this.highlightColors.push(temp);
-            }
-        }
-        
-    };
-    
-     
-    // for stacked plots, shadows will be pre drawn by drawShadow.
-    $.jqplot.BarRenderer.prototype.drawShadow = function(ctx, gridData, options, plot) {
-        var i;
-        var opts = (options != undefined) ? options : {};
-        var shadow = (opts.shadow != undefined) ? opts.shadow : this.shadow;
-        var showLine = (opts.showLine != undefined) ? opts.showLine : this.showLine;
-        var fill = (opts.fill != undefined) ? opts.fill : this.fill;
-        var xaxis = this.xaxis;
-        var yaxis = this.yaxis;
-        var xp = this._xaxis.series_u2p;
-        var yp = this._yaxis.series_u2p;
-        var pointx, points, pointy, nvals, nseries, pos;
-        
-        if (this._stack && this.shadow) {
-            if (this.barWidth == null) {
-                this.renderer.setBarWidth.call(this);
-            }
-        
-            var temp = this._plotSeriesInfo = this.renderer.calcSeriesNumbers.call(this);
-            nvals = temp[0];
-            nseries = temp[1];
-            pos = temp[2];
-        
-            if (this._stack) {
-                this._barNudge = 0;
-            }
-            else {
-                this._barNudge = (-Math.abs(nseries/2 - 0.5) + pos) * (this.barWidth + this.barPadding);
-            }
-            if (showLine) {
-            
-                if (this.barDirection == 'vertical') {
-                    for (var i=0; i<gridData.length; i++) {
-                        if (this.data[i][1] == null) {
-                            continue;
-                        }
-                        points = [];
-                        var base = gridData[i][0] + this._barNudge;
-                        var ystart;
-                    
-                        if (this._stack && this._prevGridData.length) {
-                            ystart = getStart(this.index, i, this._plotData[i][1], plot, 'y');
-                        }
-                        else {
-                            if (this.fillToZero) {
-                                ystart = this._yaxis.series_u2p(0);
-                            }
-                            else {
-                                ystart = ctx.canvas.height;
-                            }
-                        }
-                    
-                        points.push([base-this.barWidth/2, ystart]);
-                        points.push([base-this.barWidth/2, gridData[i][1]]);
-                        points.push([base+this.barWidth/2, gridData[i][1]]);
-                        points.push([base+this.barWidth/2, ystart]);
-                        this.renderer.shadowRenderer.draw(ctx, points, opts);
-                    }
-                }
-            
-                else if (this.barDirection == 'horizontal'){
-                    for (var i=0; i<gridData.length; i++) {
-                        if (this.data[i][0] == null) {
-                            continue;
-                        }
-                        points = [];
-                        var base = gridData[i][1] - this._barNudge;
-                        var xstart;
-                    
-                        if (this._stack && this._prevGridData.length) {
-                            xstart = getStart(this.index, i, this._plotData[i][0], plot, 'x');
-                        }
-                        else {
-                            if (this.fillToZero) {
-                                xstart = this._xaxis.series_u2p(0);
-                            }
-                            else {
-                                xstart = 0;
-                            }
-                        }
-                    
-                        points.push([xstart, base+this.barWidth/2]);
-                        points.push([gridData[i][0], base+this.barWidth/2]);
-                        points.push([gridData[i][0], base-this.barWidth/2]);
-                        points.push([xstart, base-this.barWidth/2]);
-                        this.renderer.shadowRenderer.draw(ctx, points, opts);
-                    }  
-                }
-            }   
-            
-        }
-    };
-    
-    function postInit(target, data, options) {
-        for (var i=0; i<this.series.length; i++) {
-            if (this.series[i].renderer.constructor == $.jqplot.BarRenderer) {
-                // don't allow mouseover and mousedown at same time.
-                if (this.series[i].highlightMouseOver) {
-                    this.series[i].highlightMouseDown = false;
-                }
-            }
-        }
-    }
-    
-    // called within context of plot
-    // create a canvas which we can draw on.
-    // insert it before the eventCanvas, so eventCanvas will still capture events.
-    function postPlotDraw() {
-        // Memory Leaks patch    
-        if (this.plugins.barRenderer && this.plugins.barRenderer.highlightCanvas) {
-
-            this.plugins.barRenderer.highlightCanvas.resetCanvas();
-            this.plugins.barRenderer.highlightCanvas = null;
-        }
-         
-        this.plugins.barRenderer = {highlightedSeriesIndex:null};
-        this.plugins.barRenderer.highlightCanvas = new $.jqplot.GenericCanvas();
-        
-        this.eventCanvas._elem.before(this.plugins.barRenderer.highlightCanvas.createElement(this._gridPadding, 'jqplot-barRenderer-highlight-canvas', this._plotDimensions, this));
-        this.plugins.barRenderer.highlightCanvas.setContext();
-        this.eventCanvas._elem.bind('mouseleave', {plot:this}, function (ev) { unhighlight(ev.data.plot); });
-    }   
-    
-    function highlight (plot, sidx, pidx, points) {
-        var s = plot.series[sidx];
-        var canvas = plot.plugins.barRenderer.highlightCanvas;
-        canvas._ctx.clearRect(0,0,canvas._ctx.canvas.width, canvas._ctx.canvas.height);
-        s._highlightedPoint = pidx;
-        plot.plugins.barRenderer.highlightedSeriesIndex = sidx;
-        var opts = {fillStyle: s.highlightColors[pidx]};
-        s.renderer.shapeRenderer.draw(canvas._ctx, points, opts);
-        canvas = null;
-    }
-    
-    function unhighlight (plot) {
-        var canvas = plot.plugins.barRenderer.highlightCanvas;
-        canvas._ctx.clearRect(0,0, canvas._ctx.canvas.width, canvas._ctx.canvas.height);
-        for (var i=0; i<plot.series.length; i++) {
-            plot.series[i]._highlightedPoint = null;
-        }
-        plot.plugins.barRenderer.highlightedSeriesIndex = null;
-        plot.target.trigger('jqplotDataUnhighlight');
-        canvas =  null;
-    }
-    
-    
-    function handleMove(ev, gridpos, datapos, neighbor, plot) {
-        if (neighbor) {
-            var ins = [neighbor.seriesIndex, neighbor.pointIndex, neighbor.data];
-            var evt1 = jQuery.Event('jqplotDataMouseOver');
-            evt1.pageX = ev.pageX;
-            evt1.pageY = ev.pageY;
-            plot.target.trigger(evt1, ins);
-            if (plot.series[ins[0]].show && plot.series[ins[0]].highlightMouseOver &&
-                !(ins[0] == plot.plugins.barRenderer.highlightedSeriesIndex && ins[1] == plot.series[ins[0]]._highlightedPoint)) {
-                var evt = jQuery.Event('jqplotDataHighlight');
-                evt.which = ev.which;
-                evt.pageX = ev.pageX;
-                evt.pageY = ev.pageY;
-                plot.target.trigger(evt, ins);
-                highlight (plot, neighbor.seriesIndex, neighbor.pointIndex, neighbor.points);
-            }
-        }
-        else if (neighbor == null) {
-            unhighlight (plot);
-        }
-    }
-    
-    function handleMouseDown(ev, gridpos, datapos, neighbor, plot) {
-        if (neighbor) {
-            var ins = [neighbor.seriesIndex, neighbor.pointIndex, neighbor.data];
-            if (plot.series[ins[0]].highlightMouseDown && !(ins[0] == plot.plugins.barRenderer.highlightedSeriesIndex && ins[1] == plot.series[ins[0]]._highlightedPoint)) {
-                var evt = jQuery.Event('jqplotDataHighlight');
-                evt.which = ev.which;
-                evt.pageX = ev.pageX;
-                evt.pageY = ev.pageY;
-                plot.target.trigger(evt, ins);
-                highlight (plot, neighbor.seriesIndex, neighbor.pointIndex, neighbor.points);
-            }
-        }
-        else if (neighbor == null) {
-            unhighlight (plot);
-        }
-    }
-    
-    function handleMouseUp(ev, gridpos, datapos, neighbor, plot) {
-        var idx = plot.plugins.barRenderer.highlightedSeriesIndex;
-        if (idx != null && plot.series[idx].highlightMouseDown) {
-            unhighlight(plot);
-        }
-    }
-    
-    function handleClick(ev, gridpos, datapos, neighbor, plot) {
-        if (neighbor) {
-            var ins = [neighbor.seriesIndex, neighbor.pointIndex, neighbor.data];
-            var evt = jQuery.Event('jqplotDataClick');
-            evt.which = ev.which;
-            evt.pageX = ev.pageX;
-            evt.pageY = ev.pageY;
-            plot.target.trigger(evt, ins);
-        }
-    }
-    
-    function handleRightClick(ev, gridpos, datapos, neighbor, plot) {
-        if (neighbor) {
-            var ins = [neighbor.seriesIndex, neighbor.pointIndex, neighbor.data];
-            var idx = plot.plugins.barRenderer.highlightedSeriesIndex;
-            if (idx != null && plot.series[idx].highlightMouseDown) {
-                unhighlight(plot);
-            }
-            var evt = jQuery.Event('jqplotDataRightClick');
-            evt.which = ev.which;
-            evt.pageX = ev.pageX;
-            evt.pageY = ev.pageY;
-            plot.target.trigger(evt, ins);
-        }
-    }
-    
-    
-})(jQuery);
\ No newline at end of file
diff --git a/#pma/js/jqplot/plugins/jqplot.byteFormatter.js b/#pma/js/jqplot/plugins/jqplot.byteFormatter.js
deleted file mode 100644
index 7a18370a..00000000
--- a/#pma/js/jqplot/plugins/jqplot.byteFormatter.js
+++ /dev/null
@@ -1,46 +0,0 @@
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * jqplot formatter for byte values
- *
- * @package phpMyAdmin
- */
-(function($) {
-    "use strict";
-    var formatByte = function (val, index) {
-        var units = [
-            PMA_messages.strB,
-            PMA_messages.strKiB,
-            PMA_messages.strMiB,
-            PMA_messages.strGiB,
-            PMA_messages.strTiB,
-            PMA_messages.strPiB,
-            PMA_messages.strEiB
-        ];
-        while (val >= 1024 && index <= 6) {
-            val /= 1024;
-            index++;
-        }
-        var format = '%.1f';
-        if (Math.floor(val) === val) {
-            format = '%.0f';
-        }
-        return $.jqplot.sprintf(
-            format + ' ' + units[index], val
-        );
-    };
-    /**
-     * The index indicates what unit the incoming data will be in.
-     * 0 for bytes, 1 for kilobytes and so on...
-     */
-    $.jqplot.byteFormatter = function (index) {
-        index = index || 0;
-        return function (format, val) {
-            if (typeof val === 'number') {
-                val = parseFloat(val) || 0;
-                return formatByte(val, index);
-            } else {
-                return String(val);
-            }
-        };
-    };
-})(jQuery);
diff --git a/#pma/js/jqplot/plugins/jqplot.canvasAxisLabelRenderer.js b/#pma/js/jqplot/plugins/jqplot.canvasAxisLabelRenderer.js
deleted file mode 100644
index 6313dc13..00000000
--- a/#pma/js/jqplot/plugins/jqplot.canvasAxisLabelRenderer.js
+++ /dev/null
@@ -1,203 +0,0 @@
-/**
- * jqPlot
- * Pure JavaScript plotting plugin using jQuery
- *
- * Version: 1.0.8
- * Revision: 1250
- *
- * Copyright (c) 2009-2013 Chris Leonello
- * jqPlot is currently available for use in all personal or commercial projects 
- * under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL 
- * version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can 
- * choose the license that best suits your project and use it accordingly. 
- *
- * Although not required, the author would appreciate an email letting him 
- * know of any substantial use of jqPlot.  You can reach the author at: 
- * chris at jqplot dot com or see http://www.jqplot.com/info.php .
- *
- * If you are feeling kind and generous, consider supporting the project by
- * making a donation at: http://www.jqplot.com/donate.php .
- *
- * sprintf functions contained in jqplot.sprintf.js by Ash Searle:
- *
- *     version 2007.04.27
- *     author Ash Searle
- *     http://hexmen.com/blog/2007/03/printf-sprintf/
- *     http://hexmen.com/js/sprintf.js
- *     The author (Ash Searle) has placed this code in the public domain:
- *     "This code is unrestricted: you are free to use it however you like."
- * 
- */
-(function($) {
-    /**
-    * Class: $.jqplot.CanvasAxisLabelRenderer
-    * Renderer to draw axis labels with a canvas element to support advanced
-    * featrues such as rotated text.  This renderer uses a separate rendering engine
-    * to draw the text on the canvas.  Two modes of rendering the text are available.
-    * If the browser has native font support for canvas fonts (currently Mozila 3.5
-    * and Safari 4), you can enable text rendering with the canvas fillText method.
-    * You do so by setting the "enableFontSupport" option to true. 
-    * 
-    * Browsers lacking native font support will have the text drawn on the canvas
-    * using the Hershey font metrics.  Even if the "enableFontSupport" option is true
-    * non-supporting browsers will still render with the Hershey font.
-    * 
-    */
-    $.jqplot.CanvasAxisLabelRenderer = function(options) {
-        // Group: Properties
-        
-        // prop: angle
-        // angle of text, measured clockwise from x axis.
-        this.angle = 0;
-        // name of the axis associated with this tick
-        this.axis;
-        // prop: show
-        // whether or not to show the tick (mark and label).
-        this.show = true;
-        // prop: showLabel
-        // whether or not to show the label.
-        this.showLabel = true;
-        // prop: label
-        // label for the axis.
-        this.label = '';
-        // prop: fontFamily
-        // CSS spec for the font-family css attribute.
-        // Applies only to browsers supporting native font rendering in the
-        // canvas tag.  Currently Mozilla 3.5 and Safari 4.
-        this.fontFamily = '"Trebuchet MS", Arial, Helvetica, sans-serif';
-        // prop: fontSize
-        // CSS spec for font size.
-        this.fontSize = '11pt';
-        // prop: fontWeight
-        // CSS spec for fontWeight:  normal, bold, bolder, lighter or a number 100 - 900
-        this.fontWeight = 'normal';
-        // prop: fontStretch
-        // Multiplier to condense or expand font width.  
-        // Applies only to browsers which don't support canvas native font rendering.
-        this.fontStretch = 1.0;
-        // prop: textColor
-        // css spec for the color attribute.
-        this.textColor = '#666666';
-        // prop: enableFontSupport
-        // true to turn on native canvas font support in Mozilla 3.5+ and Safari 4+.
-        // If true, label will be drawn with canvas tag native support for fonts.
-        // If false, label will be drawn with Hershey font metrics.
-        this.enableFontSupport = true;
-        // prop: pt2px
-        // Point to pixel scaling factor, used for computing height of bounding box
-        // around a label.  The labels text renderer has a default setting of 1.4, which 
-        // should be suitable for most fonts.  Leave as null to use default.  If tops of
-        // letters appear clipped, increase this.  If bounding box seems too big, decrease.
-        // This is an issue only with the native font renderering capabilities of Mozilla
-        // 3.5 and Safari 4 since they do not provide a method to determine the font height.
-        this.pt2px = null;
-        
-        this._elem;
-        this._ctx;
-        this._plotWidth;
-        this._plotHeight;
-        this._plotDimensions = {height:null, width:null};
-        
-        $.extend(true, this, options);
-        
-        if (options.angle == null && this.axis != 'xaxis' && this.axis != 'x2axis') {
-            this.angle = -90;
-        }
-        
-        var ropts = {fontSize:this.fontSize, fontWeight:this.fontWeight, fontStretch:this.fontStretch, fillStyle:this.textColor, angle:this.getAngleRad(), fontFamily:this.fontFamily};
-        if (this.pt2px) {
-            ropts.pt2px = this.pt2px;
-        }
-        
-        if (this.enableFontSupport) {
-            if ($.jqplot.support_canvas_text()) {
-                this._textRenderer = new $.jqplot.CanvasFontRenderer(ropts);
-            }
-            
-            else {
-                this._textRenderer = new $.jqplot.CanvasTextRenderer(ropts); 
-            }
-        }
-        else {
-            this._textRenderer = new $.jqplot.CanvasTextRenderer(ropts); 
-        }
-    };
-    
-    $.jqplot.CanvasAxisLabelRenderer.prototype.init = function(options) {
-        $.extend(true, this, options);
-        this._textRenderer.init({fontSize:this.fontSize, fontWeight:this.fontWeight, fontStretch:this.fontStretch, fillStyle:this.textColor, angle:this.getAngleRad(), fontFamily:this.fontFamily});
-    };
-    
-    // return width along the x axis
-    // will check first to see if an element exists.
-    // if not, will return the computed text box width.
-    $.jqplot.CanvasAxisLabelRenderer.prototype.getWidth = function(ctx) {
-        if (this._elem) {
-         return this._elem.outerWidth(true);
-        }
-        else {
-            var tr = this._textRenderer;
-            var l = tr.getWidth(ctx);
-            var h = tr.getHeight(ctx);
-            var w = Math.abs(Math.sin(tr.angle)*h) + Math.abs(Math.cos(tr.angle)*l);
-            return w;
-        }
-    };
-    
-    // return height along the y axis.
-    $.jqplot.CanvasAxisLabelRenderer.prototype.getHeight = function(ctx) {
-        if (this._elem) {
-         return this._elem.outerHeight(true);
-        }
-        else {
-            var tr = this._textRenderer;
-            var l = tr.getWidth(ctx);
-            var h = tr.getHeight(ctx);
-            var w = Math.abs(Math.cos(tr.angle)*h) + Math.abs(Math.sin(tr.angle)*l);
-            return w;
-        }
-    };
-    
-    $.jqplot.CanvasAxisLabelRenderer.prototype.getAngleRad = function() {
-        var a = this.angle * Math.PI/180;
-        return a;
-    };
-    
-    $.jqplot.CanvasAxisLabelRenderer.prototype.draw = function(ctx, plot) {
-          // Memory Leaks patch
-          if (this._elem) {
-              if ($.jqplot.use_excanvas && window.G_vmlCanvasManager.uninitElement !== undefined) {
-                  window.G_vmlCanvasManager.uninitElement(this._elem.get(0));
-              }
-            
-              this._elem.emptyForce();
-              this._elem = null;
-          }
-
-        // create a canvas here, but can't draw on it untill it is appended
-        // to dom for IE compatability.
-        var elem = plot.canvasManager.getCanvas();
-
-        this._textRenderer.setText(this.label, ctx);
-        var w = this.getWidth(ctx);
-        var h = this.getHeight(ctx);
-        elem.width = w;
-        elem.height = h;
-        elem.style.width = w;
-        elem.style.height = h;
-        
-        elem = plot.canvasManager.initCanvas(elem);
-
-        this._elem = $(elem);
-        this._elem.css({ position: 'absolute'});
-        this._elem.addClass('jqplot-'+this.axis+'-label');
-        
-        elem = null;
-        return this._elem;
-    };
-    
-    $.jqplot.CanvasAxisLabelRenderer.prototype.pack = function() {
-        this._textRenderer.draw(this._elem.get(0).getContext("2d"), this.label);
-    };
-    
-})(jQuery);
\ No newline at end of file
diff --git a/#pma/js/jqplot/plugins/jqplot.canvasTextRenderer.js b/#pma/js/jqplot/plugins/jqplot.canvasTextRenderer.js
deleted file mode 100644
index dc8434ee..00000000
--- a/#pma/js/jqplot/plugins/jqplot.canvasTextRenderer.js
+++ /dev/null
@@ -1,449 +0,0 @@
-/**
- * jqPlot
- * Pure JavaScript plotting plugin using jQuery
- *
- * Version: 1.0.8
- * Revision: 1250
- *
- * Copyright (c) 2009-2013 Chris Leonello
- * jqPlot is currently available for use in all personal or commercial projects 
- * under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL 
- * version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can 
- * choose the license that best suits your project and use it accordingly. 
- *
- * Although not required, the author would appreciate an email letting him 
- * know of any substantial use of jqPlot.  You can reach the author at: 
- * chris at jqplot dot com or see http://www.jqplot.com/info.php .
- *
- * If you are feeling kind and generous, consider supporting the project by
- * making a donation at: http://www.jqplot.com/donate.php .
- *
- * sprintf functions contained in jqplot.sprintf.js by Ash Searle:
- *
- *     version 2007.04.27
- *     author Ash Searle
- *     http://hexmen.com/blog/2007/03/printf-sprintf/
- *     http://hexmen.com/js/sprintf.js
- *     The author (Ash Searle) has placed this code in the public domain:
- *     "This code is unrestricted: you are free to use it however you like."
- *
- * included jsDate library by Chris Leonello:
- *
- * Copyright (c) 2010-2013 Chris Leonello
- *
- * jsDate is currently available for use in all personal or commercial projects 
- * under both the MIT and GPL version 2.0 licenses. This means that you can 
- * choose the license that best suits your project and use it accordingly.
- *
- * jsDate borrows many concepts and ideas from the Date Instance 
- * Methods by Ken Snyder along with some parts of Ken's actual code.
- * 
- * Ken's original Date Instance Methods and copyright notice:
- * 
- * Ken Snyder (ken d snyder at gmail dot com)
- * 2008-09-10
- * version 2.0.2 (http://kendsnyder.com/sandbox/date/)     
- * Creative Commons Attribution License 3.0 (http://creativecommons.org/licenses/by/3.0/)
- *
- * jqplotToImage function based on Larry Siden's export-jqplot-to-png.js.
- * Larry has generously given permission to adapt his code for inclusion
- * into jqPlot.
- *
- * Larry's original code can be found here:
- *
- * https://github.com/lsiden/export-jqplot-to-png
- * 
- * 
- */
-
-(function($) {    
-    // This code is a modified version of the canvastext.js code, copyright below:
-    //
-    // This code is released to the public domain by Jim Studt, 2007.
-    // He may keep some sort of up to date copy at http://www.federated.com/~jim/canvastext/
-    //
-    $.jqplot.CanvasTextRenderer = function(options){
-        this.fontStyle = 'normal';  // normal, italic, oblique [not implemented]
-        this.fontVariant = 'normal';    // normal, small caps [not implemented]
-        this.fontWeight = 'normal'; // normal, bold, bolder, lighter, 100 - 900
-        this.fontSize = '10px'; 
-        this.fontFamily = 'sans-serif';
-        this.fontStretch = 1.0;
-        this.fillStyle = '#666666';
-        this.angle = 0;
-        this.textAlign = 'start';
-        this.textBaseline = 'alphabetic';
-        this.text;
-        this.width;
-        this.height;
-        this.pt2px = 1.28;
-
-        $.extend(true, this, options);
-        this.normalizedFontSize = this.normalizeFontSize(this.fontSize);
-        this.setHeight();
-    };
-    
-    $.jqplot.CanvasTextRenderer.prototype.init = function(options) {
-        $.extend(true, this, options);
-        this.normalizedFontSize = this.normalizeFontSize(this.fontSize);
-        this.setHeight();
-    };
-    
-    // convert css spec into point size
-    // returns float
-    $.jqplot.CanvasTextRenderer.prototype.normalizeFontSize = function(sz) {
-        sz = String(sz);
-        var n = parseFloat(sz);
-        if (sz.indexOf('px') > -1) {
-            return n/this.pt2px;
-        }
-        else if (sz.indexOf('pt') > -1) {
-            return n;
-        }
-        else if (sz.indexOf('em') > -1) {
-            return n*12;
-        }
-        else if (sz.indexOf('%') > -1) {
-            return n*12/100;
-        }
-        // default to pixels;
-        else {
-            return n/this.pt2px;
-        }
-    };
-    
-    
-    $.jqplot.CanvasTextRenderer.prototype.fontWeight2Float = function(w) {
-        // w = normal | bold | bolder | lighter | 100 | 200 | 300 | 400 | 500 | 600 | 700 | 800 | 900
-        // return values adjusted for Hershey font.
-        if (Number(w)) {
-            return w/400;
-        }
-        else {
-            switch (w) {
-                case 'normal':
-                    return 1;
-                    break;
-                case 'bold':
-                    return 1.75;
-                    break;
-                case 'bolder':
-                    return 2.25;
-                    break;
-                case 'lighter':
-                    return 0.75;
-                    break;
-                default:
-                    return 1;
-                    break;
-             }   
-        }
-    };
-    
-    $.jqplot.CanvasTextRenderer.prototype.getText = function() {
-        return this.text;
-    };
-    
-    $.jqplot.CanvasTextRenderer.prototype.setText = function(t, ctx) {
-        this.text = t;
-        this.setWidth(ctx);
-        return this;
-    };
-    
-    $.jqplot.CanvasTextRenderer.prototype.getWidth = function(ctx) {
-        return this.width;
-    };
-    
-    $.jqplot.CanvasTextRenderer.prototype.setWidth = function(ctx, w) {
-        if (!w) {
-            this.width = this.measure(ctx, this.text);
-        }
-        else {
-            this.width = w;   
-        }
-        return this;
-    };
-    
-    // return height in pixels.
-    $.jqplot.CanvasTextRenderer.prototype.getHeight = function(ctx) {
-        return this.height;
-    };
-    
-    // w - height in pt
-    // set heigh in px
-    $.jqplot.CanvasTextRenderer.prototype.setHeight = function(w) {
-        if (!w) {
-            //height = this.fontSize /0.75;
-            this.height = this.normalizedFontSize * this.pt2px;
-        }
-        else {
-            this.height = w;   
-        }
-        return this;
-    };
-
-    $.jqplot.CanvasTextRenderer.prototype.letter = function (ch)
-    {
-        return this.letters[ch];
-    };
-
-    $.jqplot.CanvasTextRenderer.prototype.ascent = function()
-    {
-        return this.normalizedFontSize;
-    };
-
-    $.jqplot.CanvasTextRenderer.prototype.descent = function()
-    {
-        return 7.0*this.normalizedFontSize/25.0;
-    };
-
-    $.jqplot.CanvasTextRenderer.prototype.measure = function(ctx, str)
-    {
-        var total = 0;
-        var len = str.length;
- 
-        for (var i = 0; i < len; i++) {
-            var c = this.letter(str.charAt(i));
-            if (c) {
-                total += c.width * this.normalizedFontSize / 25.0 * this.fontStretch;
-            }
-        }
-        return total;
-    };
-
-    $.jqplot.CanvasTextRenderer.prototype.draw = function(ctx,str)
-    {
-        var x = 0;
-        // leave room at bottom for descenders.
-        var y = this.height*0.72;
-         var total = 0;
-         var len = str.length;
-         var mag = this.normalizedFontSize / 25.0;
-
-         ctx.save();
-         var tx, ty;
-         
-         // 1st quadrant
-         if ((-Math.PI/2 <= this.angle && this.angle <= 0) || (Math.PI*3/2 <= this.angle && this.angle <= Math.PI*2)) {
-             tx = 0;
-             ty = -Math.sin(this.angle) * this.width;
-         }
-         // 4th quadrant
-         else if ((0 < this.angle && this.angle <= Math.PI/2) || (-Math.PI*2 <= this.angle && this.angle <= -Math.PI*3/2)) {
-             tx = Math.sin(this.angle) * this.height;
-             ty = 0;
-         }
-         // 2nd quadrant
-         else if ((-Math.PI < this.angle && this.angle < -Math.PI/2) || (Math.PI <= this.angle && this.angle <= Math.PI*3/2)) {
-             tx = -Math.cos(this.angle) * this.width;
-             ty = -Math.sin(this.angle) * this.width - Math.cos(this.angle) * this.height;
-         }
-         // 3rd quadrant
-         else if ((-Math.PI*3/2 < this.angle && this.angle < Math.PI) || (Math.PI/2 < this.angle && this.angle < Math.PI)) {
-             tx = Math.sin(this.angle) * this.height - Math.cos(this.angle)*this.width;
-             ty = -Math.cos(this.angle) * this.height;
-         }
-         
-         ctx.strokeStyle = this.fillStyle;
-         ctx.fillStyle = this.fillStyle;
-         ctx.translate(tx, ty);
-         ctx.rotate(this.angle);
-         ctx.lineCap = "round";
-         // multiplier was 2.0
-         var fact = (this.normalizedFontSize > 30) ? 2.0 : 2 + (30 - this.normalizedFontSize)/20;
-         ctx.lineWidth = fact * mag * this.fontWeight2Float(this.fontWeight);
-         
-         for ( var i = 0; i < len; i++) {
-            var c = this.letter( str.charAt(i));
-            if ( !c) {
-                continue;
-            }
-
-            ctx.beginPath();
-
-            var penUp = 1;
-            var needStroke = 0;
-            for ( var j = 0; j < c.points.length; j++) {
-              var a = c.points[j];
-              if ( a[0] == -1 && a[1] == -1) {
-                  penUp = 1;
-                  continue;
-              }
-              if ( penUp) {
-                  ctx.moveTo( x + a[0]*mag*this.fontStretch, y - a[1]*mag);
-                  penUp = false;
-              } else {
-                  ctx.lineTo( x + a[0]*mag*this.fontStretch, y - a[1]*mag);
-              }
-            }
-            ctx.stroke();
-            x += c.width*mag*this.fontStretch;
-         }
-         ctx.restore();
-         return total;
-    };
-
-    $.jqplot.CanvasTextRenderer.prototype.letters = {
-         ' ': { width: 16, points: [] },
-         '!': { width: 10, points: [[5,21],[5,7],[-1,-1],[5,2],[4,1],[5,0],[6,1],[5,2]] },
-         '"': { width: 16, points: [[4,21],[4,14],[-1,-1],[12,21],[12,14]] },
-         '#': { width: 21, points: [[11,25],[4,-7],[-1,-1],[17,25],[10,-7],[-1,-1],[4,12],[18,12],[-1,-1],[3,6],[17,6]] },
-         '$': { width: 20, points: [[8,25],[8,-4],[-1,-1],[12,25],[12,-4],[-1,-1],[17,18],[15,20],[12,21],[8,21],[5,20],[3,18],[3,16],[4,14],[5,13],[7,12],[13,10],[15,9],[16,8],[17,6],[17,3],[15,1],[12,0],[8,0],[5,1],[3,3]] },
-         '%': { width: 24, points: [[21,21],[3,0],[-1,-1],[8,21],[10,19],[10,17],[9,15],[7,14],[5,14],[3,16],[3,18],[4,20],[6,21],[8,21],[10,20],[13,19],[16,19],[19,20],[21,21],[-1,-1],[17,7],[15,6],[14,4],[14,2],[16,0],[18,0],[20,1],[21,3],[21,5],[19,7],[17,7]] },
-         '&': { width: 26, points: [[23,12],[23,13],[22,14],[21,14],[20,13],[19,11],[17,6],[15,3],[13,1],[11,0],[7,0],[5,1],[4,2],[3,4],[3,6],[4,8],[5,9],[12,13],[13,14],[14,16],[14,18],[13,20],[11,21],[9,20],[8,18],[8,16],[9,13],[11,10],[16,3],[18,1],[20,0],[22,0],[23,1],[23,2]] },
-         '\'': { width: 10, points: [[5,19],[4,20],[5,21],[6,20],[6,18],[5,16],[4,15]] },
-         '(': { width: 14, points: [[11,25],[9,23],[7,20],[5,16],[4,11],[4,7],[5,2],[7,-2],[9,-5],[11,-7]] },
-         ')': { width: 14, points: [[3,25],[5,23],[7,20],[9,16],[10,11],[10,7],[9,2],[7,-2],[5,-5],[3,-7]] },
-         '*': { width: 16, points: [[8,21],[8,9],[-1,-1],[3,18],[13,12],[-1,-1],[13,18],[3,12]] },
-         '+': { width: 26, points: [[13,18],[13,0],[-1,-1],[4,9],[22,9]] },
-         ',': { width: 10, points: [[6,1],[5,0],[4,1],[5,2],[6,1],[6,-1],[5,-3],[4,-4]] },
-         '-': { width: 18, points: [[6,9],[12,9]] },
-         '.': { width: 10, points: [[5,2],[4,1],[5,0],[6,1],[5,2]] },
-         '/': { width: 22, points: [[20,25],[2,-7]] },
-         '0': { width: 20, points: [[9,21],[6,20],[4,17],[3,12],[3,9],[4,4],[6,1],[9,0],[11,0],[14,1],[16,4],[17,9],[17,12],[16,17],[14,20],[11,21],[9,21]] },
-         '1': { width: 20, points: [[6,17],[8,18],[11,21],[11,0]] },
-         '2': { width: 20, points: [[4,16],[4,17],[5,19],[6,20],[8,21],[12,21],[14,20],[15,19],[16,17],[16,15],[15,13],[13,10],[3,0],[17,0]] },
-         '3': { width: 20, points: [[5,21],[16,21],[10,13],[13,13],[15,12],[16,11],[17,8],[17,6],[16,3],[14,1],[11,0],[8,0],[5,1],[4,2],[3,4]] },
-         '4': { width: 20, points: [[13,21],[3,7],[18,7],[-1,-1],[13,21],[13,0]] },
-         '5': { width: 20, points: [[15,21],[5,21],[4,12],[5,13],[8,14],[11,14],[14,13],[16,11],[17,8],[17,6],[16,3],[14,1],[11,0],[8,0],[5,1],[4,2],[3,4]] },
-         '6': { width: 20, points: [[16,18],[15,20],[12,21],[10,21],[7,20],[5,17],[4,12],[4,7],[5,3],[7,1],[10,0],[11,0],[14,1],[16,3],[17,6],[17,7],[16,10],[14,12],[11,13],[10,13],[7,12],[5,10],[4,7]] },
-         '7': { width: 20, points: [[17,21],[7,0],[-1,-1],[3,21],[17,21]] },
-         '8': { width: 20, points: [[8,21],[5,20],[4,18],[4,16],[5,14],[7,13],[11,12],[14,11],[16,9],[17,7],[17,4],[16,2],[15,1],[12,0],[8,0],[5,1],[4,2],[3,4],[3,7],[4,9],[6,11],[9,12],[13,13],[15,14],[16,16],[16,18],[15,20],[12,21],[8,21]] },
-         '9': { width: 20, points: [[16,14],[15,11],[13,9],[10,8],[9,8],[6,9],[4,11],[3,14],[3,15],[4,18],[6,20],[9,21],[10,21],[13,20],[15,18],[16,14],[16,9],[15,4],[13,1],[10,0],[8,0],[5,1],[4,3]] },
-         ':': { width: 10, points: [[5,14],[4,13],[5,12],[6,13],[5,14],[-1,-1],[5,2],[4,1],[5,0],[6,1],[5,2]] },
-         ';': { width: 10, points: [[5,14],[4,13],[5,12],[6,13],[5,14],[-1,-1],[6,1],[5,0],[4,1],[5,2],[6,1],[6,-1],[5,-3],[4,-4]] },
-         '<': { width: 24, points: [[20,18],[4,9],[20,0]] },
-         '=': { width: 26, points: [[4,12],[22,12],[-1,-1],[4,6],[22,6]] },
-         '>': { width: 24, points: [[4,18],[20,9],[4,0]] },
-         '?': { width: 18, points: [[3,16],[3,17],[4,19],[5,20],[7,21],[11,21],[13,20],[14,19],[15,17],[15,15],[14,13],[13,12],[9,10],[9,7],[-1,-1],[9,2],[8,1],[9,0],[10,1],[9,2]] },
-         '@': { width: 27, points: [[18,13],[17,15],[15,16],[12,16],[10,15],[9,14],[8,11],[8,8],[9,6],[11,5],[14,5],[16,6],[17,8],[-1,-1],[12,16],[10,14],[9,11],[9,8],[10,6],[11,5],[-1,-1],[18,16],[17,8],[17,6],[19,5],[21,5],[23,7],[24,10],[24,12],[23,15],[22,17],[20,19],[18,20],[15,21],[12,21],[9,20],[7,19],[5,17],[4,15],[3,12],[3,9],[4,6],[5,4],[7,2],[9,1],[12,0],[15,0],[18,1],[20,2],[21,3],[-1,-1],[19,16],[18,8],[18,6],[19,5]] },
-         'A': { width: 18, points: [[9,21],[1,0],[-1,-1],[9,21],[17,0],[-1,-1],[4,7],[14,7]] },
-         'B': { width: 21, points: [[4,21],[4,0],[-1,-1],[4,21],[13,21],[16,20],[17,19],[18,17],[18,15],[17,13],[16,12],[13,11],[-1,-1],[4,11],[13,11],[16,10],[17,9],[18,7],[18,4],[17,2],[16,1],[13,0],[4,0]] },
-         'C': { width: 21, points: [[18,16],[17,18],[15,20],[13,21],[9,21],[7,20],[5,18],[4,16],[3,13],[3,8],[4,5],[5,3],[7,1],[9,0],[13,0],[15,1],[17,3],[18,5]] },
-         'D': { width: 21, points: [[4,21],[4,0],[-1,-1],[4,21],[11,21],[14,20],[16,18],[17,16],[18,13],[18,8],[17,5],[16,3],[14,1],[11,0],[4,0]] },
-         'E': { width: 19, points: [[4,21],[4,0],[-1,-1],[4,21],[17,21],[-1,-1],[4,11],[12,11],[-1,-1],[4,0],[17,0]] },
-         'F': { width: 18, points: [[4,21],[4,0],[-1,-1],[4,21],[17,21],[-1,-1],[4,11],[12,11]] },
-         'G': { width: 21, points: [[18,16],[17,18],[15,20],[13,21],[9,21],[7,20],[5,18],[4,16],[3,13],[3,8],[4,5],[5,3],[7,1],[9,0],[13,0],[15,1],[17,3],[18,5],[18,8],[-1,-1],[13,8],[18,8]] },
-         'H': { width: 22, points: [[4,21],[4,0],[-1,-1],[18,21],[18,0],[-1,-1],[4,11],[18,11]] },
-         'I': { width: 8, points: [[4,21],[4,0]] },
-         'J': { width: 16, points: [[12,21],[12,5],[11,2],[10,1],[8,0],[6,0],[4,1],[3,2],[2,5],[2,7]] },
-         'K': { width: 21, points: [[4,21],[4,0],[-1,-1],[18,21],[4,7],[-1,-1],[9,12],[18,0]] },
-         'L': { width: 17, points: [[4,21],[4,0],[-1,-1],[4,0],[16,0]] },
-         'M': { width: 24, points: [[4,21],[4,0],[-1,-1],[4,21],[12,0],[-1,-1],[20,21],[12,0],[-1,-1],[20,21],[20,0]] },
-         'N': { width: 22, points: [[4,21],[4,0],[-1,-1],[4,21],[18,0],[-1,-1],[18,21],[18,0]] },
-         'O': { width: 22, points: [[9,21],[7,20],[5,18],[4,16],[3,13],[3,8],[4,5],[5,3],[7,1],[9,0],[13,0],[15,1],[17,3],[18,5],[19,8],[19,13],[18,16],[17,18],[15,20],[13,21],[9,21]] },
-         'P': { width: 21, points: [[4,21],[4,0],[-1,-1],[4,21],[13,21],[16,20],[17,19],[18,17],[18,14],[17,12],[16,11],[13,10],[4,10]] },
-         'Q': { width: 22, points: [[9,21],[7,20],[5,18],[4,16],[3,13],[3,8],[4,5],[5,3],[7,1],[9,0],[13,0],[15,1],[17,3],[18,5],[19,8],[19,13],[18,16],[17,18],[15,20],[13,21],[9,21],[-1,-1],[12,4],[18,-2]] },
-         'R': { width: 21, points: [[4,21],[4,0],[-1,-1],[4,21],[13,21],[16,20],[17,19],[18,17],[18,15],[17,13],[16,12],[13,11],[4,11],[-1,-1],[11,11],[18,0]] },
-         'S': { width: 20, points: [[17,18],[15,20],[12,21],[8,21],[5,20],[3,18],[3,16],[4,14],[5,13],[7,12],[13,10],[15,9],[16,8],[17,6],[17,3],[15,1],[12,0],[8,0],[5,1],[3,3]] },
-         'T': { width: 16, points: [[8,21],[8,0],[-1,-1],[1,21],[15,21]] },
-         'U': { width: 22, points: [[4,21],[4,6],[5,3],[7,1],[10,0],[12,0],[15,1],[17,3],[18,6],[18,21]] },
-         'V': { width: 18, points: [[1,21],[9,0],[-1,-1],[17,21],[9,0]] },
-         'W': { width: 24, points: [[2,21],[7,0],[-1,-1],[12,21],[7,0],[-1,-1],[12,21],[17,0],[-1,-1],[22,21],[17,0]] },
-         'X': { width: 20, points: [[3,21],[17,0],[-1,-1],[17,21],[3,0]] },
-         'Y': { width: 18, points: [[1,21],[9,11],[9,0],[-1,-1],[17,21],[9,11]] },
-         'Z': { width: 20, points: [[17,21],[3,0],[-1,-1],[3,21],[17,21],[-1,-1],[3,0],[17,0]] },
-         '[': { width: 14, points: [[4,25],[4,-7],[-1,-1],[5,25],[5,-7],[-1,-1],[4,25],[11,25],[-1,-1],[4,-7],[11,-7]] },
-         '\\': { width: 14, points: [[0,21],[14,-3]] },
-         ']': { width: 14, points: [[9,25],[9,-7],[-1,-1],[10,25],[10,-7],[-1,-1],[3,25],[10,25],[-1,-1],[3,-7],[10,-7]] },
-         '^': { width: 16, points: [[6,15],[8,18],[10,15],[-1,-1],[3,12],[8,17],[13,12],[-1,-1],[8,17],[8,0]] },
-         '_': { width: 16, points: [[0,-2],[16,-2]] },
-         '`': { width: 10, points: [[6,21],[5,20],[4,18],[4,16],[5,15],[6,16],[5,17]] },
-         'a': { width: 19, points: [[15,14],[15,0],[-1,-1],[15,11],[13,13],[11,14],[8,14],[6,13],[4,11],[3,8],[3,6],[4,3],[6,1],[8,0],[11,0],[13,1],[15,3]] },
-         'b': { width: 19, points: [[4,21],[4,0],[-1,-1],[4,11],[6,13],[8,14],[11,14],[13,13],[15,11],[16,8],[16,6],[15,3],[13,1],[11,0],[8,0],[6,1],[4,3]] },
-         'c': { width: 18, points: [[15,11],[13,13],[11,14],[8,14],[6,13],[4,11],[3,8],[3,6],[4,3],[6,1],[8,0],[11,0],[13,1],[15,3]] },
-         'd': { width: 19, points: [[15,21],[15,0],[-1,-1],[15,11],[13,13],[11,14],[8,14],[6,13],[4,11],[3,8],[3,6],[4,3],[6,1],[8,0],[11,0],[13,1],[15,3]] },
-         'e': { width: 18, points: [[3,8],[15,8],[15,10],[14,12],[13,13],[11,14],[8,14],[6,13],[4,11],[3,8],[3,6],[4,3],[6,1],[8,0],[11,0],[13,1],[15,3]] },
-         'f': { width: 12, points: [[10,21],[8,21],[6,20],[5,17],[5,0],[-1,-1],[2,14],[9,14]] },
-         'g': { width: 19, points: [[15,14],[15,-2],[14,-5],[13,-6],[11,-7],[8,-7],[6,-6],[-1,-1],[15,11],[13,13],[11,14],[8,14],[6,13],[4,11],[3,8],[3,6],[4,3],[6,1],[8,0],[11,0],[13,1],[15,3]] },
-         'h': { width: 19, points: [[4,21],[4,0],[-1,-1],[4,10],[7,13],[9,14],[12,14],[14,13],[15,10],[15,0]] },
-         'i': { width: 8, points: [[3,21],[4,20],[5,21],[4,22],[3,21],[-1,-1],[4,14],[4,0]] },
-         'j': { width: 10, points: [[5,21],[6,20],[7,21],[6,22],[5,21],[-1,-1],[6,14],[6,-3],[5,-6],[3,-7],[1,-7]] },
-         'k': { width: 17, points: [[4,21],[4,0],[-1,-1],[14,14],[4,4],[-1,-1],[8,8],[15,0]] },
-         'l': { width: 8, points: [[4,21],[4,0]] },
-         'm': { width: 30, points: [[4,14],[4,0],[-1,-1],[4,10],[7,13],[9,14],[12,14],[14,13],[15,10],[15,0],[-1,-1],[15,10],[18,13],[20,14],[23,14],[25,13],[26,10],[26,0]] },
-         'n': { width: 19, points: [[4,14],[4,0],[-1,-1],[4,10],[7,13],[9,14],[12,14],[14,13],[15,10],[15,0]] },
-         'o': { width: 19, points: [[8,14],[6,13],[4,11],[3,8],[3,6],[4,3],[6,1],[8,0],[11,0],[13,1],[15,3],[16,6],[16,8],[15,11],[13,13],[11,14],[8,14]] },
-         'p': { width: 19, points: [[4,14],[4,-7],[-1,-1],[4,11],[6,13],[8,14],[11,14],[13,13],[15,11],[16,8],[16,6],[15,3],[13,1],[11,0],[8,0],[6,1],[4,3]] },
-         'q': { width: 19, points: [[15,14],[15,-7],[-1,-1],[15,11],[13,13],[11,14],[8,14],[6,13],[4,11],[3,8],[3,6],[4,3],[6,1],[8,0],[11,0],[13,1],[15,3]] },
-         'r': { width: 13, points: [[4,14],[4,0],[-1,-1],[4,8],[5,11],[7,13],[9,14],[12,14]] },
-         's': { width: 17, points: [[14,11],[13,13],[10,14],[7,14],[4,13],[3,11],[4,9],[6,8],[11,7],[13,6],[14,4],[14,3],[13,1],[10,0],[7,0],[4,1],[3,3]] },
-         't': { width: 12, points: [[5,21],[5,4],[6,1],[8,0],[10,0],[-1,-1],[2,14],[9,14]] },
-         'u': { width: 19, points: [[4,14],[4,4],[5,1],[7,0],[10,0],[12,1],[15,4],[-1,-1],[15,14],[15,0]] },
-         'v': { width: 16, points: [[2,14],[8,0],[-1,-1],[14,14],[8,0]] },
-         'w': { width: 22, points: [[3,14],[7,0],[-1,-1],[11,14],[7,0],[-1,-1],[11,14],[15,0],[-1,-1],[19,14],[15,0]] },
-         'x': { width: 17, points: [[3,14],[14,0],[-1,-1],[14,14],[3,0]] },
-         'y': { width: 16, points: [[2,14],[8,0],[-1,-1],[14,14],[8,0],[6,-4],[4,-6],[2,-7],[1,-7]] },
-         'z': { width: 17, points: [[14,14],[3,0],[-1,-1],[3,14],[14,14],[-1,-1],[3,0],[14,0]] },
-         '{': { width: 14, points: [[9,25],[7,24],[6,23],[5,21],[5,19],[6,17],[7,16],[8,14],[8,12],[6,10],[-1,-1],[7,24],[6,22],[6,20],[7,18],[8,17],[9,15],[9,13],[8,11],[4,9],[8,7],[9,5],[9,3],[8,1],[7,0],[6,-2],[6,-4],[7,-6],[-1,-1],[6,8],[8,6],[8,4],[7,2],[6,1],[5,-1],[5,-3],[6,-5],[7,-6],[9,-7]] },
-         '|': { width: 8, points: [[4,25],[4,-7]] },
-         '}': { width: 14, points: [[5,25],[7,24],[8,23],[9,21],[9,19],[8,17],[7,16],[6,14],[6,12],[8,10],[-1,-1],[7,24],[8,22],[8,20],[7,18],[6,17],[5,15],[5,13],[6,11],[10,9],[6,7],[5,5],[5,3],[6,1],[7,0],[8,-2],[8,-4],[7,-6],[-1,-1],[8,8],[6,6],[6,4],[7,2],[8,1],[9,-1],[9,-3],[8,-5],[7,-6],[5,-7]] },
-         '~': { width: 24, points: [[3,6],[3,8],[4,11],[6,12],[8,12],[10,11],[14,8],[16,7],[18,7],[20,8],[21,10],[-1,-1],[3,8],[4,10],[6,11],[8,11],[10,10],[14,7],[16,6],[18,6],[20,7],[21,10],[21,12]] }
-     };
-     
-    $.jqplot.CanvasFontRenderer = function(options) {
-        options = options || {};
-        if (!options.pt2px) {
-            options.pt2px = 1.5;
-        }
-        $.jqplot.CanvasTextRenderer.call(this, options);
-    };
-    
-    $.jqplot.CanvasFontRenderer.prototype = new $.jqplot.CanvasTextRenderer({});
-    $.jqplot.CanvasFontRenderer.prototype.constructor = $.jqplot.CanvasFontRenderer;
-
-    $.jqplot.CanvasFontRenderer.prototype.measure = function(ctx, str)
-    {
-        // var fstyle = this.fontStyle+' '+this.fontVariant+' '+this.fontWeight+' '+this.fontSize+' '+this.fontFamily;
-        var fstyle = this.fontSize+' '+this.fontFamily;
-        ctx.save();
-        ctx.font = fstyle;
-        var w = ctx.measureText(str).width;
-        ctx.restore();
-        return w;
-    };
-
-    $.jqplot.CanvasFontRenderer.prototype.draw = function(ctx, str)
-    {
-        var x = 0;
-        // leave room at bottom for descenders.
-        var y = this.height*0.72;
-        //var y = 12;
-
-         ctx.save();
-         var tx, ty;
-         
-         // 1st quadrant
-         if ((-Math.PI/2 <= this.angle && this.angle <= 0) || (Math.PI*3/2 <= this.angle && this.angle <= Math.PI*2)) {
-             tx = 0;
-             ty = -Math.sin(this.angle) * this.width;
-         }
-         // 4th quadrant
-         else if ((0 < this.angle && this.angle <= Math.PI/2) || (-Math.PI*2 <= this.angle && this.angle <= -Math.PI*3/2)) {
-             tx = Math.sin(this.angle) * this.height;
-             ty = 0;
-         }
-         // 2nd quadrant
-         else if ((-Math.PI < this.angle && this.angle < -Math.PI/2) || (Math.PI <= this.angle && this.angle <= Math.PI*3/2)) {
-             tx = -Math.cos(this.angle) * this.width;
-             ty = -Math.sin(this.angle) * this.width - Math.cos(this.angle) * this.height;
-         }
-         // 3rd quadrant
-         else if ((-Math.PI*3/2 < this.angle && this.angle < Math.PI) || (Math.PI/2 < this.angle && this.angle < Math.PI)) {
-             tx = Math.sin(this.angle) * this.height - Math.cos(this.angle)*this.width;
-             ty = -Math.cos(this.angle) * this.height;
-         }
-         ctx.strokeStyle = this.fillStyle;
-         ctx.fillStyle = this.fillStyle;
-        // var fstyle = this.fontStyle+' '+this.fontVariant+' '+this.fontWeight+' '+this.fontSize+' '+this.fontFamily;
-        var fstyle = this.fontSize+' '+this.fontFamily;
-         ctx.font = fstyle;
-         ctx.translate(tx, ty);
-         ctx.rotate(this.angle);
-         ctx.fillText(str, x, y);
-         // ctx.strokeText(str, x, y);
-
-         ctx.restore();
-    };
-    
-})(jQuery);
\ No newline at end of file
diff --git a/#pma/js/jqplot/plugins/jqplot.categoryAxisRenderer.js b/#pma/js/jqplot/plugins/jqplot.categoryAxisRenderer.js
deleted file mode 100644
index aa771203..00000000
--- a/#pma/js/jqplot/plugins/jqplot.categoryAxisRenderer.js
+++ /dev/null
@@ -1,679 +0,0 @@
-/**
- * jqPlot
- * Pure JavaScript plotting plugin using jQuery
- *
- * Version: 1.0.8
- * Revision: 1250
- *
- * Copyright (c) 2009-2013 Chris Leonello
- * jqPlot is currently available for use in all personal or commercial projects 
- * under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL 
- * version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can 
- * choose the license that best suits your project and use it accordingly. 
- *
- * Although not required, the author would appreciate an email letting him 
- * know of any substantial use of jqPlot.  You can reach the author at: 
- * chris at jqplot dot com or see http://www.jqplot.com/info.php .
- *
- * If you are feeling kind and generous, consider supporting the project by
- * making a donation at: http://www.jqplot.com/donate.php .
- *
- * sprintf functions contained in jqplot.sprintf.js by Ash Searle:
- *
- *     version 2007.04.27
- *     author Ash Searle
- *     http://hexmen.com/blog/2007/03/printf-sprintf/
- *     http://hexmen.com/js/sprintf.js
- *     The author (Ash Searle) has placed this code in the public domain:
- *     "This code is unrestricted: you are free to use it however you like."
- * 
- */
-(function($) {   
-    /**
-    *  class: $.jqplot.CategoryAxisRenderer
-    *  A plugin for jqPlot to render a category style axis, with equal pixel spacing between y data values of a series.
-    *  
-    *  To use this renderer, include the plugin in your source
-    *  > <script type="text/javascript" language="javascript" src="plugins/jqplot.categoryAxisRenderer.js"></script>
-    *  
-    *  and supply the appropriate options to your plot
-    *  
-    *  > {axes:{xaxis:{renderer:$.jqplot.CategoryAxisRenderer}}}
-    **/
-    $.jqplot.CategoryAxisRenderer = function(options) {
-        $.jqplot.LinearAxisRenderer.call(this);
-        // prop: sortMergedLabels
-        // True to sort tick labels when labels are created by merging
-        // x axis values from multiple series.  That is, say you have
-        // two series like:
-        // > line1 = [[2006, 4],            [2008, 9], [2009, 16]];
-        // > line2 = [[2006, 3], [2007, 7], [2008, 6]];
-        // If no label array is specified, tick labels will be collected
-        // from the x values of the series.  With sortMergedLabels
-        // set to true, tick labels will be:
-        // > [2006, 2007, 2008, 2009]
-        // With sortMergedLabels set to false, tick labels will be:
-        // > [2006, 2008, 2009, 2007]
-        //
-        // Note, this property is specified on the renderOptions for the 
-        // axes when creating a plot:
-        // > axes:{xaxis:{renderer:$.jqplot.CategoryAxisRenderer, rendererOptions:{sortMergedLabels:true}}}
-        this.sortMergedLabels = false;
-    };
-    
-    $.jqplot.CategoryAxisRenderer.prototype = new $.jqplot.LinearAxisRenderer();
-    $.jqplot.CategoryAxisRenderer.prototype.constructor = $.jqplot.CategoryAxisRenderer;
-    
-    $.jqplot.CategoryAxisRenderer.prototype.init = function(options){
-        this.groups = 1;
-        this.groupLabels = [];
-        this._groupLabels = [];
-        this._grouped = false;
-        this._barsPerGroup = null;
-        this.reverse = false;
-        // prop: tickRenderer
-        // A class of a rendering engine for creating the ticks labels displayed on the plot, 
-        // See <$.jqplot.AxisTickRenderer>.
-        // this.tickRenderer = $.jqplot.AxisTickRenderer;
-        // this.labelRenderer = $.jqplot.AxisLabelRenderer;
-        $.extend(true, this, {tickOptions:{formatString:'%d'}}, options);
-        var db = this._dataBounds;
-        // Go through all the series attached to this axis and find
-        // the min/max bounds for this axis.
-        for (var i=0; i<this._series.length; i++) {
-            var s = this._series[i];
-            if (s.groups) {
-                this.groups = s.groups;
-            }
-            var d = s.data;
-            
-            for (var j=0; j<d.length; j++) { 
-                if (this.name == 'xaxis' || this.name == 'x2axis') {
-                    if (d[j][0] < db.min || db.min == null) {
-                        db.min = d[j][0];
-                    }
-                    if (d[j][0] > db.max || db.max == null) {
-                        db.max = d[j][0];
-                    }
-                }              
-                else {
-                    if (d[j][1] < db.min || db.min == null) {
-                        db.min = d[j][1];
-                    }
-                    if (d[j][1] > db.max || db.max == null) {
-                        db.max = d[j][1];
-                    }
-                }              
-            }
-        }
-        
-        if (this.groupLabels.length) {
-            this.groups = this.groupLabels.length;
-        }
-    };
- 
-
-    $.jqplot.CategoryAxisRenderer.prototype.createTicks = function() {
-        // we're are operating on an axis here
-        var ticks = this._ticks;
-        var userTicks = this.ticks;
-        var name = this.name;
-        // databounds were set on axis initialization.
-        var db = this._dataBounds;
-        var dim, interval;
-        var min, max;
-        var pos1, pos2;
-        var tt, i;
-
-        // if we already have ticks, use them.
-        if (userTicks.length) {
-            // adjust with blanks if we have groups
-            if (this.groups > 1 && !this._grouped) {
-                var l = userTicks.length;
-                var skip = parseInt(l/this.groups, 10);
-                var count = 0;
-                for (var i=skip; i<l; i+=skip) {
-                    userTicks.splice(i+count, 0, ' ');
-                    count++;
-                }
-                this._grouped = true;
-            }
-            this.min = 0.5;
-            this.max = userTicks.length + 0.5;
-            var range = this.max - this.min;
-            this.numberTicks = 2*userTicks.length + 1;
-            for (i=0; i<userTicks.length; i++){
-                tt = this.min + 2 * i * range / (this.numberTicks-1);
-                // need a marker before and after the tick
-                var t = new this.tickRenderer(this.tickOptions);
-                t.showLabel = false;
-                // t.showMark = true;
-                t.setTick(tt, this.name);
-                this._ticks.push(t);
-                var t = new this.tickRenderer(this.tickOptions);
-                t.label = userTicks[i];
-                // t.showLabel = true;
-                t.showMark = false;
-                t.showGridline = false;
-                t.setTick(tt+0.5, this.name);
-                this._ticks.push(t);
-            }
-            // now add the last tick at the end
-            var t = new this.tickRenderer(this.tickOptions);
-            t.showLabel = false;
-            // t.showMark = true;
-            t.setTick(tt+1, this.name);
-            this._ticks.push(t);
-        }
-
-        // we don't have any ticks yet, let's make some!
-        else {
-            if (name == 'xaxis' || name == 'x2axis') {
-                dim = this._plotDimensions.width;
-            }
-            else {
-                dim = this._plotDimensions.height;
-            }
-            
-            // if min, max and number of ticks specified, user can't specify interval.
-            if (this.min != null && this.max != null && this.numberTicks != null) {
-                this.tickInterval = null;
-            }
-            
-            // if max, min, and interval specified and interval won't fit, ignore interval.
-            if (this.min != null && this.max != null && this.tickInterval != null) {
-                if (parseInt((this.max-this.min)/this.tickInterval, 10) != (this.max-this.min)/this.tickInterval) {
-                    this.tickInterval = null;
-                }
-            }
-        
-            // find out how many categories are in the lines and collect labels
-            var labels = [];
-            var numcats = 0;
-            var min = 0.5;
-            var max, val;
-            var isMerged = false;
-            for (var i=0; i<this._series.length; i++) {
-                var s = this._series[i];
-                for (var j=0; j<s.data.length; j++) {
-                    if (this.name == 'xaxis' || this.name == 'x2axis') {
-                        val = s.data[j][0];
-                    }
-                    else {
-                        val = s.data[j][1];
-                    }
-                    if ($.inArray(val, labels) == -1) {
-                        isMerged = true;
-                        numcats += 1;      
-                        labels.push(val);
-                    }
-                }
-            }
-            
-            if (isMerged && this.sortMergedLabels) {
-                if (typeof labels[0] == "string") {
-                    labels.sort();
-                } else {
-                    labels.sort(function(a,b) { return a - b; });
-                }
-            }
-            
-            // keep a reference to these tick labels to use for redrawing plot (see bug #57)
-            this.ticks = labels;
-            
-            // now bin the data values to the right lables.
-            for (var i=0; i<this._series.length; i++) {
-                var s = this._series[i];
-                for (var j=0; j<s.data.length; j++) {
-                    if (this.name == 'xaxis' || this.name == 'x2axis') {
-                        val = s.data[j][0];
-                    }
-                    else {
-                        val = s.data[j][1];
-                    }
-                    // for category axis, force the values into category bins.
-                    // we should have the value in the label array now.
-                    var idx = $.inArray(val, labels)+1;
-                    if (this.name == 'xaxis' || this.name == 'x2axis') {
-                        s.data[j][0] = idx;
-                    }
-                    else {
-                        s.data[j][1] = idx;
-                    }
-                }
-            }
-            
-            // adjust with blanks if we have groups
-            if (this.groups > 1 && !this._grouped) {
-                var l = labels.length;
-                var skip = parseInt(l/this.groups, 10);
-                var count = 0;
-                for (var i=skip; i<l; i+=skip+1) {
-                    labels[i] = ' ';
-                }
-                this._grouped = true;
-            }
-        
-            max = numcats + 0.5;
-            if (this.numberTicks == null) {
-                this.numberTicks = 2*numcats + 1;
-            }
-
-            var range = max - min;
-            this.min = min;
-            this.max = max;
-            var track = 0;
-            
-            // todo: adjust this so more ticks displayed.
-            var maxVisibleTicks = parseInt(3+dim/10, 10);
-            var skip = parseInt(numcats/maxVisibleTicks, 10);
-
-            if (this.tickInterval == null) {
-
-                this.tickInterval = range / (this.numberTicks-1);
-
-            }
-            // if tickInterval is specified, we will ignore any computed maximum.
-            for (var i=0; i<this.numberTicks; i++){
-                tt = this.min + i * this.tickInterval;
-                var t = new this.tickRenderer(this.tickOptions);
-                // if even tick, it isn't a category, it's a divider
-                if (i/2 == parseInt(i/2, 10)) {
-                    t.showLabel = false;
-                    t.showMark = true;
-                }
-                else {
-                    if (skip>0 && track<skip) {
-                        t.showLabel = false;
-                        track += 1;
-                    }
-                    else {
-                        t.showLabel = true;
-                        track = 0;
-                    } 
-                    t.label = t.formatter(t.formatString, labels[(i-1)/2]);
-                    t.showMark = false;
-                    t.showGridline = false;
-                }
-                t.setTick(tt, this.name);
-                this._ticks.push(t);
-            }
-        }
-        
-    };
-    
-    // called with scope of axis
-    $.jqplot.CategoryAxisRenderer.prototype.draw = function(ctx, plot) {
-        if (this.show) {
-            // populate the axis label and value properties.
-            // createTicks is a method on the renderer, but
-            // call it within the scope of the axis.
-            this.renderer.createTicks.call(this);
-            // fill a div with axes labels in the right direction.
-            // Need to pregenerate each axis to get its bounds and
-            // position it and the labels correctly on the plot.
-            var dim=0;
-            var temp;
-            // Added for theming.
-            if (this._elem) {
-                // this._elem.empty();
-                // Memory Leaks patch
-                this._elem.emptyForce();
-            }
-
-            this._elem = this._elem || $('<div class="jqplot-axis jqplot-'+this.name+'" style="position:absolute;"></div>');
-            
-            if (this.name == 'xaxis' || this.name == 'x2axis') {
-                this._elem.width(this._plotDimensions.width);
-            }
-            else {
-                this._elem.height(this._plotDimensions.height);
-            }
-            
-            // create a _label object.
-            this.labelOptions.axis = this.name;
-            this._label = new this.labelRenderer(this.labelOptions);
-            if (this._label.show) {
-                var elem = this._label.draw(ctx, plot);
-                elem.appendTo(this._elem);
-            }
-    
-            var t = this._ticks;
-            for (var i=0; i<t.length; i++) {
-                var tick = t[i];
-                if (tick.showLabel && (!tick.isMinorTick || this.showMinorTicks)) {
-                    var elem = tick.draw(ctx, plot);
-                    elem.appendTo(this._elem);
-                }
-            }
-        
-            this._groupLabels = [];
-            // now make group labels
-            for (var i=0; i<this.groupLabels.length; i++)
-            {
-                var elem = $('<div style="position:absolute;" class="jqplot-'+this.name+'-groupLabel"></div>');
-                elem.html(this.groupLabels[i]);
-                this._groupLabels.push(elem);
-                elem.appendTo(this._elem);
-            }
-        }
-        return this._elem;
-    };
-    
-    // called with scope of axis
-    $.jqplot.CategoryAxisRenderer.prototype.set = function() { 
-        var dim = 0;
-        var temp;
-        var w = 0;
-        var h = 0;
-        var lshow = (this._label == null) ? false : this._label.show;
-        if (this.show) {
-            var t = this._ticks;
-            for (var i=0; i<t.length; i++) {
-                var tick = t[i];
-                if (tick.showLabel && (!tick.isMinorTick || this.showMinorTicks)) {
-                    if (this.name == 'xaxis' || this.name == 'x2axis') {
-                        temp = tick._elem.outerHeight(true);
-                    }
-                    else {
-                        temp = tick._elem.outerWidth(true);
-                    }
-                    if (temp > dim) {
-                        dim = temp;
-                    }
-                }
-            }
-            
-            var dim2 = 0;
-            for (var i=0; i<this._groupLabels.length; i++) {
-                var l = this._groupLabels[i];
-                if (this.name == 'xaxis' || this.name == 'x2axis') {
-                    temp = l.outerHeight(true);
-                }
-                else {
-                    temp = l.outerWidth(true);
-                }
-                if (temp > dim2) {
-                    dim2 = temp;
-                }
-            }
-            
-            if (lshow) {
-                w = this._label._elem.outerWidth(true);
-                h = this._label._elem.outerHeight(true); 
-            }
-            if (this.name == 'xaxis') {
-                dim += dim2 + h;
-                this._elem.css({'height':dim+'px', left:'0px', bottom:'0px'});
-            }
-            else if (this.name == 'x2axis') {
-                dim += dim2 + h;
-                this._elem.css({'height':dim+'px', left:'0px', top:'0px'});
-            }
-            else if (this.name == 'yaxis') {
-                dim += dim2 + w;
-                this._elem.css({'width':dim+'px', left:'0px', top:'0px'});
-                if (lshow && this._label.constructor == $.jqplot.AxisLabelRenderer) {
-                    this._label._elem.css('width', w+'px');
-                }
-            }
-            else {
-                dim += dim2 + w;
-                this._elem.css({'width':dim+'px', right:'0px', top:'0px'});
-                if (lshow && this._label.constructor == $.jqplot.AxisLabelRenderer) {
-                    this._label._elem.css('width', w+'px');
-                }
-            }
-        }  
-    };
-    
-    // called with scope of axis
-    $.jqplot.CategoryAxisRenderer.prototype.pack = function(pos, offsets) {
-        var ticks = this._ticks;
-        var max = this.max;
-        var min = this.min;
-        var offmax = offsets.max;
-        var offmin = offsets.min;
-        var lshow = (this._label == null) ? false : this._label.show;
-        var i;
-
-        for (var p in pos) {
-            this._elem.css(p, pos[p]);
-        }
-        
-        this._offsets = offsets;
-        // pixellength will be + for x axes and - for y axes becasue pixels always measured from top left.
-        var pixellength = offmax - offmin;
-        var unitlength = max - min;
-        
-        if (!this.reverse) {
-            // point to unit and unit to point conversions references to Plot DOM element top left corner.
-            
-            this.u2p = function(u){
-                return (u - min) * pixellength / unitlength + offmin;
-            };
-
-            this.p2u = function(p){
-                return (p - offmin) * unitlength / pixellength + min;
-            };
-                    
-            if (this.name == 'xaxis' || this.name == 'x2axis'){
-                this.series_u2p = function(u){
-                    return (u - min) * pixellength / unitlength;
-                };
-                this.series_p2u = function(p){
-                    return p * unitlength / pixellength + min;
-                };
-            }
-            
-            else {
-                this.series_u2p = function(u){
-                    return (u - max) * pixellength / unitlength;
-                };
-                this.series_p2u = function(p){
-                    return p * unitlength / pixellength + max;
-                };
-            }
-        }
-
-        else {
-            // point to unit and unit to point conversions references to Plot DOM element top left corner.
-            
-            this.u2p = function(u){
-                return offmin + (max - u) * pixellength / unitlength;
-            };
-
-            this.p2u = function(p){
-                return min + (p - offmin) * unitlength / pixellength;
-            };
-                    
-            if (this.name == 'xaxis' || this.name == 'x2axis'){
-                this.series_u2p = function(u){
-                    return (max - u) * pixellength / unitlength;
-                };
-                this.series_p2u = function(p){
-                    return p * unitlength / pixellength + max;
-                };
-            }
-            
-            else {
-                this.series_u2p = function(u){
-                    return (min - u) * pixellength / unitlength;
-                };
-                this.series_p2u = function(p){
-                    return p * unitlength / pixellength + min;
-                };
-            }
-
-        }
-            
-        
-        if (this.show) {
-            if (this.name == 'xaxis' || this.name == 'x2axis') {
-                for (i=0; i<ticks.length; i++) {
-                    var t = ticks[i];
-                    if (t.show && t.showLabel) {
-                        var shim;
-                        
-                        if (t.constructor == $.jqplot.CanvasAxisTickRenderer && t.angle) {
-                            // will need to adjust auto positioning based on which axis this is.
-                            var temp = (this.name == 'xaxis') ? 1 : -1;
-                            switch (t.labelPosition) {
-                                case 'auto':
-                                    // position at end
-                                    if (temp * t.angle < 0) {
-                                        shim = -t.getWidth() + t._textRenderer.height * Math.sin(-t._textRenderer.angle) / 2;
-                                    }
-                                    // position at start
-                                    else {
-                                        shim = -t._textRenderer.height * Math.sin(t._textRenderer.angle) / 2;
-                                    }
-                                    break;
-                                case 'end':
-                                    shim = -t.getWidth() + t._textRenderer.height * Math.sin(-t._textRenderer.angle) / 2;
-                                    break;
-                                case 'start':
-                                    shim = -t._textRenderer.height * Math.sin(t._textRenderer.angle) / 2;
-                                    break;
-                                case 'middle':
-                                    shim = -t.getWidth()/2 + t._textRenderer.height * Math.sin(-t._textRenderer.angle) / 2;
-                                    break;
-                                default:
-                                    shim = -t.getWidth()/2 + t._textRenderer.height * Math.sin(-t._textRenderer.angle) / 2;
-                                    break;
-                            }
-                        }
-                        else {
-                            shim = -t.getWidth()/2;
-                        }
-                        var val = this.u2p(t.value) + shim + 'px';
-                        t._elem.css('left', val);
-                        t.pack();
-                    }
-                }
-                
-                var labeledge=['bottom', 0];
-                if (lshow) {
-                    var w = this._label._elem.outerWidth(true);
-                    this._label._elem.css('left', offmin + pixellength/2 - w/2 + 'px');
-                    if (this.name == 'xaxis') {
-                        this._label._elem.css('bottom', '0px');
-                        labeledge = ['bottom', this._label._elem.outerHeight(true)];
-                    }
-                    else {
-                        this._label._elem.css('top', '0px');
-                        labeledge = ['top', this._label._elem.outerHeight(true)];
-                    }
-                    this._label.pack();
-                }
-                
-                // draw the group labels
-                var step = parseInt(this._ticks.length/this.groups, 10) + 1;
-                for (i=0; i<this._groupLabels.length; i++) {
-                    var mid = 0;
-                    var count = 0;
-                    for (var j=i*step; j<(i+1)*step; j++) {
-                        if (j >= this._ticks.length-1) continue; // the last tick does not exist as there is no other group in order to have an empty one.
-                        if (this._ticks[j]._elem && this._ticks[j].label != " ") {
-                            var t = this._ticks[j]._elem;
-                            var p = t.position();
-                            mid += p.left + t.outerWidth(true)/2;
-                            count++;
-                        }
-                    }
-                    mid = mid/count;
-                    this._groupLabels[i].css({'left':(mid - this._groupLabels[i].outerWidth(true)/2)});
-                    this._groupLabels[i].css(labeledge[0], labeledge[1]);
-                }
-            }
-            else {
-                for (i=0; i<ticks.length; i++) {
-                    var t = ticks[i];
-                    if (t.show && t.showLabel) {                        
-                        var shim;
-                        if (t.constructor == $.jqplot.CanvasAxisTickRenderer && t.angle) {
-                            // will need to adjust auto positioning based on which axis this is.
-                            var temp = (this.name == 'yaxis') ? 1 : -1;
-                            switch (t.labelPosition) {
-                                case 'auto':
-                                    // position at end
-                                case 'end':
-                                    if (temp * t.angle < 0) {
-                                        shim = -t._textRenderer.height * Math.cos(-t._textRenderer.angle) / 2;
-                                    }
-                                    else {
-                                        shim = -t.getHeight() + t._textRenderer.height * Math.cos(t._textRenderer.angle) / 2;
-                                    }
-                                    break;
-                                case 'start':
-                                    if (t.angle > 0) {
-                                        shim = -t._textRenderer.height * Math.cos(-t._textRenderer.angle) / 2;
-                                    }
-                                    else {
-                                        shim = -t.getHeight() + t._textRenderer.height * Math.cos(t._textRenderer.angle) / 2;
-                                    }
-                                    break;
-                                case 'middle':
-                                    // if (t.angle > 0) {
-                                    //     shim = -t.getHeight()/2 + t._textRenderer.height * Math.sin(-t._textRenderer.angle) / 2;
-                                    // }
-                                    // else {
-                                    //     shim = -t.getHeight()/2 - t._textRenderer.height * Math.sin(t._textRenderer.angle) / 2;
-                                    // }
-                                    shim = -t.getHeight()/2;
-                                    break;
-                                default:
-                                    shim = -t.getHeight()/2;
-                                    break;
-                            }
-                        }
-                        else {
-                            shim = -t.getHeight()/2;
-                        }
-                        
-                        var val = this.u2p(t.value) + shim + 'px';
-                        t._elem.css('top', val);
-                        t.pack();
-                    }
-                }
-                
-                var labeledge=['left', 0];
-                if (lshow) {
-                    var h = this._label._elem.outerHeight(true);
-                    this._label._elem.css('top', offmax - pixellength/2 - h/2 + 'px');
-                    if (this.name == 'yaxis') {
-                        this._label._elem.css('left', '0px');
-                        labeledge = ['left', this._label._elem.outerWidth(true)];
-                    }
-                    else {
-                        this._label._elem.css('right', '0px');
-                        labeledge = ['right', this._label._elem.outerWidth(true)];
-                    }   
-                    this._label.pack();
-                }
-                
-                // draw the group labels, position top here, do left after label position.
-                var step = parseInt(this._ticks.length/this.groups, 10) + 1; // step is one more than before as we don't want to have overlaps in loops
-                for (i=0; i<this._groupLabels.length; i++) {
-                    var mid = 0;
-                    var count = 0;
-                    for (var j=i*step; j<(i+1)*step; j++) { // j must never reach (i+1)*step as we don't want to have overlap between loops
-                        if (j >= this._ticks.length-1) continue; // the last tick does not exist as there is no other group in order to have an empty one.
-                        if (this._ticks[j]._elem && this._ticks[j].label != " ") {
-                            var t = this._ticks[j]._elem;
-                            var p = t.position();
-                            mid += p.top + t.outerHeight()/2;
-                            count++;
-                        }
-                    }
-                    mid = mid/count;
-                    this._groupLabels[i].css({'top':mid - this._groupLabels[i].outerHeight()/2});
-                    this._groupLabels[i].css(labeledge[0], labeledge[1]);
-                    
-                }
-            }
-        }
-    };    
-    
-    
-})(jQuery);
diff --git a/#pma/js/jqplot/plugins/jqplot.cursor.js b/#pma/js/jqplot/plugins/jqplot.cursor.js
deleted file mode 100644
index bf1c36f2..00000000
--- a/#pma/js/jqplot/plugins/jqplot.cursor.js
+++ /dev/null
@@ -1,1108 +0,0 @@
-/**
- * jqPlot
- * Pure JavaScript plotting plugin using jQuery
- *
- * Version: 1.0.8
- * Revision: 1250
- *
- * Copyright (c) 2009-2013 Chris Leonello
- * jqPlot is currently available for use in all personal or commercial projects 
- * under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL 
- * version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can 
- * choose the license that best suits your project and use it accordingly. 
- *
- * Although not required, the author would appreciate an email letting him 
- * know of any substantial use of jqPlot.  You can reach the author at: 
- * chris at jqplot dot com or see http://www.jqplot.com/info.php .
- *
- * If you are feeling kind and generous, consider supporting the project by
- * making a donation at: http://www.jqplot.com/donate.php .
- *
- * sprintf functions contained in jqplot.sprintf.js by Ash Searle:
- *
- *     version 2007.04.27
- *     author Ash Searle
- *     http://hexmen.com/blog/2007/03/printf-sprintf/
- *     http://hexmen.com/js/sprintf.js
- *     The author (Ash Searle) has placed this code in the public domain:
- *     "This code is unrestricted: you are free to use it however you like."
- * 
- */
-(function($) {
-    
-    /**
-     * Class: $.jqplot.Cursor
-     * Plugin class representing the cursor as displayed on the plot.
-     */
-    $.jqplot.Cursor = function(options) {
-        // Group: Properties
-        //
-        // prop: style
-        // CSS spec for cursor style
-        this.style = 'crosshair';
-        this.previousCursor = 'auto';
-        // prop: show
-        // whether to show the cursor or not.
-        this.show = $.jqplot.config.enablePlugins;
-        // prop: showTooltip
-        // show a cursor position tooltip.  Location of the tooltip
-        // will be controlled by followMouse and tooltipLocation.
-        this.showTooltip = true;
-        // prop: followMouse
-        // Tooltip follows the mouse, it is not at a fixed location.
-        // Tooltip will show on the grid at the location given by
-        // tooltipLocation, offset from the grid edge by tooltipOffset.
-        this.followMouse = false;
-        // prop: tooltipLocation
-        // Where to position tooltip.  If followMouse is true, this is
-        // relative to the cursor, otherwise, it is relative to the grid.
-        // One of 'n', 'ne', 'e', 'se', 's', 'sw', 'w', 'nw'
-        this.tooltipLocation = 'se';
-        // prop: tooltipOffset
-        // Pixel offset of tooltip from the grid boudaries or cursor center.
-        this.tooltipOffset = 6;
-        // prop: showTooltipGridPosition
-        // show the grid pixel coordinates of the mouse.
-        this.showTooltipGridPosition = false;
-        // prop: showTooltipUnitPosition
-        // show the unit (data) coordinates of the mouse.
-        this.showTooltipUnitPosition = true;
-        // prop: showTooltipDataPosition
-        // Used with showVerticalLine to show intersecting data points in the tooltip.
-        this.showTooltipDataPosition = false;
-        // prop: tooltipFormatString
-        // sprintf format string for the tooltip.
-        // Uses Ash Searle's javascript sprintf implementation
-        // found here: http://hexmen.com/blog/2007/03/printf-sprintf/
-        // See http://perldoc.perl.org/functions/sprintf.html for reference
-        // Note, if showTooltipDataPosition is true, the default tooltipFormatString
-        // will be set to the cursorLegendFormatString, not the default given here.
-        this.tooltipFormatString = '%.4P, %.4P';
-        // prop: useAxesFormatters
-        // Use the x and y axes formatters to format the text in the tooltip.
-        this.useAxesFormatters = true;
-        // prop: tooltipAxisGroups
-        // Show position for the specified axes.
-        // This is an array like [['xaxis', 'yaxis'], ['xaxis', 'y2axis']]
-        // Default is to compute automatically for all visible axes.
-        this.tooltipAxisGroups = [];
-        // prop: zoom
-        // Enable plot zooming.
-        this.zoom = false;
-        // zoomProxy and zoomTarget properties are not directly set by user.  
-        // They Will be set through call to zoomProxy method.
-        this.zoomProxy = false;
-        this.zoomTarget = false;
-        // prop: looseZoom
-        // Will expand zoom range to provide more rounded tick values.
-        // Works only with linear, log and date axes.
-        this.looseZoom = true;
-        // prop: clickReset
-        // Will reset plot zoom if single click on plot without drag.
-        this.clickReset = false;
-        // prop: dblClickReset
-        // Will reset plot zoom if double click on plot without drag.
-        this.dblClickReset = true;
-        // prop: showVerticalLine
-        // draw a vertical line across the plot which follows the cursor.
-        // When the line is near a data point, a special legend and/or tooltip can
-        // be updated with the data values.
-        this.showVerticalLine = false;
-        // prop: showHorizontalLine
-        // draw a horizontal line across the plot which follows the cursor.
-        this.showHorizontalLine = false;
-        // prop: constrainZoomTo
-        // 'none', 'x' or 'y'
-        this.constrainZoomTo = 'none';
-        // // prop: autoscaleConstraint
-        // // when a constrained axis is specified, true will
-        // // auatoscale the adjacent axis.
-        // this.autoscaleConstraint = true;
-        this.shapeRenderer = new $.jqplot.ShapeRenderer();
-        this._zoom = {start:[], end:[], started: false, zooming:false, isZoomed:false, axes:{start:{}, end:{}}, gridpos:{}, datapos:{}};
-        this._tooltipElem;
-        this.zoomCanvas;
-        this.cursorCanvas;
-        // prop: intersectionThreshold
-        // pixel distance from data point or marker to consider cursor lines intersecting with point.
-        // If data point markers are not shown, this should be >= 1 or will often miss point intersections.
-        this.intersectionThreshold = 2;
-        // prop: showCursorLegend
-        // Replace the plot legend with an enhanced legend displaying intersection information.
-        this.showCursorLegend = false;
-        // prop: cursorLegendFormatString
-        // Format string used in the cursor legend.  If showTooltipDataPosition is true,
-        // this will also be the default format string used by tooltipFormatString.
-        this.cursorLegendFormatString = $.jqplot.Cursor.cursorLegendFormatString;
-        // whether the cursor is over the grid or not.
-        this._oldHandlers = {onselectstart: null, ondrag: null, onmousedown: null};
-        // prop: constrainOutsideZoom
-        // True to limit actual zoom area to edges of grid, even when zooming
-        // outside of plot area.  That is, can't zoom out by mousing outside plot.
-        this.constrainOutsideZoom = true;
-        // prop: showTooltipOutsideZoom
-        // True will keep updating the tooltip when zooming of the grid.
-        this.showTooltipOutsideZoom = false;
-        // true if mouse is over grid, false if not.
-        this.onGrid = false;
-        $.extend(true, this, options);
-    };
-    
-    $.jqplot.Cursor.cursorLegendFormatString = '%s x:%s, y:%s';
-    
-    // called with scope of plot
-    $.jqplot.Cursor.init = function (target, data, opts){
-        // add a cursor attribute to the plot
-        var options = opts || {};
-        this.plugins.cursor = new $.jqplot.Cursor(options.cursor);
-        var c = this.plugins.cursor;
-
-        if (c.show) {
-            $.jqplot.eventListenerHooks.push(['jqplotMouseEnter', handleMouseEnter]);
-            $.jqplot.eventListenerHooks.push(['jqplotMouseLeave', handleMouseLeave]);
-            $.jqplot.eventListenerHooks.push(['jqplotMouseMove', handleMouseMove]);
-            
-            if (c.showCursorLegend) {              
-                opts.legend = opts.legend || {};
-                opts.legend.renderer =  $.jqplot.CursorLegendRenderer;
-                opts.legend.formatString = this.plugins.cursor.cursorLegendFormatString;
-                opts.legend.show = true;
-            }
-            
-            if (c.zoom) {
-                $.jqplot.eventListenerHooks.push(['jqplotMouseDown', handleMouseDown]);
-                
-                if (c.clickReset) {
-                    $.jqplot.eventListenerHooks.push(['jqplotClick', handleClick]);
-                }
-                
-                if (c.dblClickReset) {
-                    $.jqplot.eventListenerHooks.push(['jqplotDblClick', handleDblClick]);
-                }             
-            }
-    
-            this.resetZoom = function() {
-                var axes = this.axes;
-                if (!c.zoomProxy) {
-                    for (var ax in axes) {
-                        axes[ax].reset();
-                        axes[ax]._ticks = [];
-                        // fake out tick creation algorithm to make sure original auto
-                        // computed format string is used if _overrideFormatString is true
-                        if (c._zoom.axes[ax] !== undefined) {
-                            axes[ax]._autoFormatString = c._zoom.axes[ax].tickFormatString;
-                        }
-                    }
-                    this.redraw();
-                }
-                else {
-                    var ctx = this.plugins.cursor.zoomCanvas._ctx;
-                    ctx.clearRect(0,0,ctx.canvas.width, ctx.canvas.height);
-                    ctx = null;
-                }
-                this.plugins.cursor._zoom.isZoomed = false;
-                this.target.trigger('jqplotResetZoom', [this, this.plugins.cursor]);
-            };
-            
-
-            if (c.showTooltipDataPosition) {
-                c.showTooltipUnitPosition = false;
-                c.showTooltipGridPosition = false;
-                if (options.cursor.tooltipFormatString == undefined) {
-                    c.tooltipFormatString = $.jqplot.Cursor.cursorLegendFormatString;
-                }
-            }
-        }
-    };
-    
-    // called with context of plot
-    $.jqplot.Cursor.postDraw = function() {
-        var c = this.plugins.cursor;
-        
-        // Memory Leaks patch
-        if (c.zoomCanvas) {
-            c.zoomCanvas.resetCanvas();
-            c.zoomCanvas = null;
-        }
-        
-        if (c.cursorCanvas) {
-            c.cursorCanvas.resetCanvas();
-            c.cursorCanvas = null;
-        }
-        
-        if (c._tooltipElem) {
-            c._tooltipElem.emptyForce();
-            c._tooltipElem = null;
-        }
-
-        
-        if (c.zoom) {
-            c.zoomCanvas = new $.jqplot.GenericCanvas();
-            this.eventCanvas._elem.before(c.zoomCanvas.createElement(this._gridPadding, 'jqplot-zoom-canvas', this._plotDimensions, this));
-            c.zoomCanvas.setContext();
-        }
-
-        var elem = document.createElement('div');
-        c._tooltipElem = $(elem);
-        elem = null;
-        c._tooltipElem.addClass('jqplot-cursor-tooltip');
-        c._tooltipElem.css({position:'absolute', display:'none'});
-        
-        
-        if (c.zoomCanvas) {
-            c.zoomCanvas._elem.before(c._tooltipElem);
-        }
-
-        else {
-            this.eventCanvas._elem.before(c._tooltipElem);
-        }
-
-        if (c.showVerticalLine || c.showHorizontalLine) {
-            c.cursorCanvas = new $.jqplot.GenericCanvas();
-            this.eventCanvas._elem.before(c.cursorCanvas.createElement(this._gridPadding, 'jqplot-cursor-canvas', this._plotDimensions, this));
-            c.cursorCanvas.setContext();
-        }
-
-        // if we are showing the positions in unit coordinates, and no axes groups
-        // were specified, create a default set.
-        if (c.showTooltipUnitPosition){
-            if (c.tooltipAxisGroups.length === 0) {
-                var series = this.series;
-                var s;
-                var temp = [];
-                for (var i=0; i<series.length; i++) {
-                    s = series[i];
-                    var ax = s.xaxis+','+s.yaxis;
-                    if ($.inArray(ax, temp) == -1) {
-                        temp.push(ax);
-                    }
-                }
-                for (var i=0; i<temp.length; i++) {
-                    c.tooltipAxisGroups.push(temp[i].split(','));
-                }
-            }
-        }
-    };
-    
-    // Group: methods
-    //
-    // method: $.jqplot.Cursor.zoomProxy
-    // links targetPlot to controllerPlot so that plot zooming of
-    // targetPlot will be controlled by zooming on the controllerPlot.
-    // controllerPlot will not actually zoom, but acts as an
-    // overview plot.  Note, the zoom options must be set to true for
-    // zoomProxy to work.
-    $.jqplot.Cursor.zoomProxy = function(targetPlot, controllerPlot) {
-        var tc = targetPlot.plugins.cursor;
-        var cc = controllerPlot.plugins.cursor;
-        tc.zoomTarget = true;
-        tc.zoom = true;
-        tc.style = 'auto';
-        tc.dblClickReset = false;
-        cc.zoom = true;
-        cc.zoomProxy = true;
-              
-        controllerPlot.target.bind('jqplotZoom', plotZoom);
-        controllerPlot.target.bind('jqplotResetZoom', plotReset);
-
-        function plotZoom(ev, gridpos, datapos, plot, cursor) {
-            tc.doZoom(gridpos, datapos, targetPlot, cursor);
-        } 
-
-        function plotReset(ev, plot, cursor) {
-            targetPlot.resetZoom();
-        }
-    };
-    
-    $.jqplot.Cursor.prototype.resetZoom = function(plot, cursor) {
-        var axes = plot.axes;
-        var cax = cursor._zoom.axes;
-        if (!plot.plugins.cursor.zoomProxy && cursor._zoom.isZoomed) {
-            for (var ax in axes) {
-                // axes[ax]._ticks = [];
-                // axes[ax].min = cax[ax].min;
-                // axes[ax].max = cax[ax].max;
-                // axes[ax].numberTicks = cax[ax].numberTicks; 
-                // axes[ax].tickInterval = cax[ax].tickInterval;
-                // // for date axes
-                // axes[ax].daTickInterval = cax[ax].daTickInterval;
-                axes[ax].reset();
-                axes[ax]._ticks = [];
-                // fake out tick creation algorithm to make sure original auto
-                // computed format string is used if _overrideFormatString is true
-                axes[ax]._autoFormatString = cax[ax].tickFormatString;
-            }
-            plot.redraw();
-            cursor._zoom.isZoomed = false;
-        }
-        else {
-            var ctx = cursor.zoomCanvas._ctx;
-            ctx.clearRect(0,0,ctx.canvas.width, ctx.canvas.height);
-            ctx = null;
-        }
-        plot.target.trigger('jqplotResetZoom', [plot, cursor]);
-    };
-    
-    $.jqplot.Cursor.resetZoom = function(plot) {
-        plot.resetZoom();
-    };
-    
-    $.jqplot.Cursor.prototype.doZoom = function (gridpos, datapos, plot, cursor) {
-        var c = cursor;
-        var axes = plot.axes;
-        var zaxes = c._zoom.axes;
-        var start = zaxes.start;
-        var end = zaxes.end;
-        var min, max, dp, span,
-            newmin, newmax, curax, _numberTicks, ret;
-        var ctx = plot.plugins.cursor.zoomCanvas._ctx;
-        // don't zoom if zoom area is too small (in pixels)
-        if ((c.constrainZoomTo == 'none' && Math.abs(gridpos.x - c._zoom.start[0]) > 6 && Math.abs(gridpos.y - c._zoom.start[1]) > 6) || (c.constrainZoomTo == 'x' && Math.abs(gridpos.x - c._zoom.start[0]) > 6) ||  (c.constrainZoomTo == 'y' && Math.abs(gridpos.y - c._zoom.start[1]) > 6)) {
-            if (!plot.plugins.cursor.zoomProxy) {
-                for (var ax in datapos) {
-                    // make a copy of the original axes to revert back.
-                    if (c._zoom.axes[ax] == undefined) {
-                        c._zoom.axes[ax] = {};
-                        c._zoom.axes[ax].numberTicks = axes[ax].numberTicks;
-                        c._zoom.axes[ax].tickInterval = axes[ax].tickInterval;
-                        // for date axes...
-                        c._zoom.axes[ax].daTickInterval = axes[ax].daTickInterval;
-                        c._zoom.axes[ax].min = axes[ax].min;
-                        c._zoom.axes[ax].max = axes[ax].max;
-                        c._zoom.axes[ax].tickFormatString = (axes[ax].tickOptions != null) ? axes[ax].tickOptions.formatString :  '';
-                    }
-
-
-                    if ((c.constrainZoomTo == 'none') || (c.constrainZoomTo == 'x' && ax.charAt(0) == 'x') || (c.constrainZoomTo == 'y' && ax.charAt(0) == 'y')) {   
-                        dp = datapos[ax];
-                        if (dp != null) {           
-                            if (dp > start[ax]) { 
-                                newmin = start[ax];
-                                newmax = dp;
-                            }
-                            else {
-                                span = start[ax] - dp;
-                                newmin = dp;
-                                newmax = start[ax];
-                            }
-
-                            curax = axes[ax];
-
-                            _numberTicks = null;
-
-                            // if aligning this axis, use number of ticks from previous axis.
-                            // Do I need to reset somehow if alignTicks is changed and then graph is replotted??
-                            if (curax.alignTicks) {
-                                if (curax.name === 'x2axis' && plot.axes.xaxis.show) {
-                                    _numberTicks = plot.axes.xaxis.numberTicks;
-                                }
-                                else if (curax.name.charAt(0) === 'y' && curax.name !== 'yaxis' && curax.name !== 'yMidAxis' && plot.axes.yaxis.show) {
-                                    _numberTicks = plot.axes.yaxis.numberTicks;
-                                }
-                            }
-                            
-                            if (this.looseZoom && (axes[ax].renderer.constructor === $.jqplot.LinearAxisRenderer || axes[ax].renderer.constructor === $.jqplot.LogAxisRenderer )) { //} || axes[ax].renderer.constructor === $.jqplot.DateAxisRenderer)) {
-
-                                ret = $.jqplot.LinearTickGenerator(newmin, newmax, curax._scalefact, _numberTicks);
-
-                                // if new minimum is less than "true" minimum of axis display, adjust it
-                                if (axes[ax].tickInset && ret[0] < axes[ax].min + axes[ax].tickInset * axes[ax].tickInterval) {
-                                    ret[0] += ret[4];
-                                    ret[2] -= 1;
-                                }
-
-                                // if new maximum is greater than "true" max of axis display, adjust it
-                                if (axes[ax].tickInset && ret[1] > axes[ax].max - axes[ax].tickInset * axes[ax].tickInterval) {
-                                    ret[1] -= ret[4];
-                                    ret[2] -= 1;
-                                }
-
-                                // for log axes, don't fall below current minimum, this will look bad and can't have 0 in range anyway.
-                                if (axes[ax].renderer.constructor === $.jqplot.LogAxisRenderer && ret[0] < axes[ax].min) {
-                                    // remove a tick and shift min up
-                                    ret[0] += ret[4];
-                                    ret[2] -= 1;
-                                }
-
-                                axes[ax].min = ret[0];
-                                axes[ax].max = ret[1];
-                                axes[ax]._autoFormatString = ret[3];
-                                axes[ax].numberTicks = ret[2];
-                                axes[ax].tickInterval = ret[4];
-                                // for date axes...
-                                axes[ax].daTickInterval = [ret[4]/1000, 'seconds'];
-                            }
-                            else {
-                                axes[ax].min = newmin;
-                                axes[ax].max = newmax;
-                                axes[ax].tickInterval = null;
-                                axes[ax].numberTicks = null;
-                                // for date axes...
-                                axes[ax].daTickInterval = null;
-                            }
-
-                            axes[ax]._ticks = [];
-                        }
-                    }
-                            
-                    // if ((c.constrainZoomTo == 'x' && ax.charAt(0) == 'y' && c.autoscaleConstraint) || (c.constrainZoomTo == 'y' && ax.charAt(0) == 'x' && c.autoscaleConstraint)) {
-                    //     dp = datapos[ax];
-                    //     if (dp != null) {
-                    //         axes[ax].max == null;
-                    //         axes[ax].min = null;
-                    //     }
-                    // }
-                }
-                ctx.clearRect(0,0,ctx.canvas.width, ctx.canvas.height);
-                plot.redraw();
-                c._zoom.isZoomed = true;
-                ctx = null;
-            }
-            plot.target.trigger('jqplotZoom', [gridpos, datapos, plot, cursor]);
-        }
-    };
-    
-    $.jqplot.preInitHooks.push($.jqplot.Cursor.init);
-    $.jqplot.postDrawHooks.push($.jqplot.Cursor.postDraw);
-    
-    function updateTooltip(gridpos, datapos, plot) {
-        var c = plot.plugins.cursor;
-        var s = '';
-        var addbr = false;
-        if (c.showTooltipGridPosition) {
-            s = gridpos.x+', '+gridpos.y;
-            addbr = true;
-        }
-        if (c.showTooltipUnitPosition) {
-            var g;
-            for (var i=0; i<c.tooltipAxisGroups.length; i++) {
-                g = c.tooltipAxisGroups[i];
-                if (addbr) {
-                    s += '<br />';
-                }
-                if (c.useAxesFormatters) {
-                    for (var j=0; j<g.length; j++) {
-                        if (j) {
-                            s += ', ';
-                        }
-                        var af = plot.axes[g[j]]._ticks[0].formatter;
-                        var afstr = plot.axes[g[j]]._ticks[0].formatString;
-                        s += af(afstr, datapos[g[j]]);
-                    }
-                }
-                else {
-                    s += $.jqplot.sprintf(c.tooltipFormatString, datapos[g[0]], datapos[g[1]]);
-                }
-                addbr = true;
-            }
-        }
-        
-        if (c.showTooltipDataPosition) {
-            var series = plot.series; 
-            var ret = getIntersectingPoints(plot, gridpos.x, gridpos.y);
-            var addbr = false;
-        
-            for (var i = 0; i< series.length; i++) {
-                if (series[i].show) {
-                    var idx = series[i].index;
-                    var label = series[i].label.toString();
-                    var cellid = $.inArray(idx, ret.indices);
-                    var sx = undefined;
-                    var sy = undefined;
-                    if (cellid != -1) {
-                        var data = ret.data[cellid].data;
-                        if (c.useAxesFormatters) {
-                            var xf = series[i]._xaxis._ticks[0].formatter;
-                            var yf = series[i]._yaxis._ticks[0].formatter;
-                            var xfstr = series[i]._xaxis._ticks[0].formatString;
-                            var yfstr = series[i]._yaxis._ticks[0].formatString;
-                            sx = xf(xfstr, data[0]);
-                            sy = yf(yfstr, data[1]);
-                        }
-                        else {
-                            sx = data[0];
-                            sy = data[1];
-                        }
-                        if (addbr) {
-                            s += '<br />';
-                        }
-                        s += $.jqplot.sprintf(c.tooltipFormatString, label, sx, sy);
-                        addbr = true;
-                    }
-                }
-            }
-            
-        }
-        c._tooltipElem.html(s);
-    }
-    
-    function moveLine(gridpos, plot) {
-        var c = plot.plugins.cursor;
-        var ctx = c.cursorCanvas._ctx;
-        ctx.clearRect(0,0,ctx.canvas.width, ctx.canvas.height);
-        if (c.showVerticalLine) {
-            c.shapeRenderer.draw(ctx, [[gridpos.x, 0], [gridpos.x, ctx.canvas.height]]);
-        }
-        if (c.showHorizontalLine) {
-            c.shapeRenderer.draw(ctx, [[0, gridpos.y], [ctx.canvas.width, gridpos.y]]);
-        }
-        var ret = getIntersectingPoints(plot, gridpos.x, gridpos.y);
-        if (c.showCursorLegend) {
-            var cells = $(plot.targetId + ' td.jqplot-cursor-legend-label');
-            for (var i=0; i<cells.length; i++) {
-                var idx = $(cells[i]).data('seriesIndex');
-                var series = plot.series[idx];
-                var label = series.label.toString();
-                var cellid = $.inArray(idx, ret.indices);
-                var sx = undefined;
-                var sy = undefined;
-                if (cellid != -1) {
-                    var data = ret.data[cellid].data;
-                    if (c.useAxesFormatters) {
-                        var xf = series._xaxis._ticks[0].formatter;
-                        var yf = series._yaxis._ticks[0].formatter;
-                        var xfstr = series._xaxis._ticks[0].formatString;
-                        var yfstr = series._yaxis._ticks[0].formatString;
-                        sx = xf(xfstr, data[0]);
-                        sy = yf(yfstr, data[1]);
-                    }
-                    else {
-                        sx = data[0];
-                        sy = data[1];
-                    }
-                }
-                if (plot.legend.escapeHtml) {
-                    $(cells[i]).text($.jqplot.sprintf(c.cursorLegendFormatString, label, sx, sy));
-                }
-                else {
-                    $(cells[i]).html($.jqplot.sprintf(c.cursorLegendFormatString, label, sx, sy));
-                }
-            }        
-        }
-        ctx = null;
-    }
-        
-    function getIntersectingPoints(plot, x, y) {
-        var ret = {indices:[], data:[]};
-        var s, i, d0, d, j, r, p;
-        var threshold;
-        var c = plot.plugins.cursor;
-        for (var i=0; i<plot.series.length; i++) {
-            s = plot.series[i];
-            r = s.renderer;
-            if (s.show) {
-                threshold = c.intersectionThreshold;
-                if (s.showMarker) {
-                    threshold += s.markerRenderer.size/2;
-                }
-                for (var j=0; j<s.gridData.length; j++) {
-                    p = s.gridData[j];
-                    // check vertical line
-                    if (c.showVerticalLine) {
-                        if (Math.abs(x-p[0]) <= threshold) {
-                            ret.indices.push(i);
-                            ret.data.push({seriesIndex: i, pointIndex:j, gridData:p, data:s.data[j]});
-                        }
-                    }
-                } 
-            }
-        }
-        return ret;
-    }
-    
-    function moveTooltip(gridpos, plot) {
-        var c = plot.plugins.cursor;  
-        var elem = c._tooltipElem;
-        switch (c.tooltipLocation) {
-            case 'nw':
-                var x = gridpos.x + plot._gridPadding.left - elem.outerWidth(true) - c.tooltipOffset;
-                var y = gridpos.y + plot._gridPadding.top - c.tooltipOffset - elem.outerHeight(true);
-                break;
-            case 'n':
-                var x = gridpos.x + plot._gridPadding.left - elem.outerWidth(true)/2;
-                var y = gridpos.y + plot._gridPadding.top - c.tooltipOffset - elem.outerHeight(true);
-                break;
-            case 'ne':
-                var x = gridpos.x + plot._gridPadding.left + c.tooltipOffset;
-                var y = gridpos.y + plot._gridPadding.top - c.tooltipOffset - elem.outerHeight(true);
-                break;
-            case 'e':
-                var x = gridpos.x + plot._gridPadding.left + c.tooltipOffset;
-                var y = gridpos.y + plot._gridPadding.top - elem.outerHeight(true)/2;
-                break;
-            case 'se':
-                var x = gridpos.x + plot._gridPadding.left + c.tooltipOffset;
-                var y = gridpos.y + plot._gridPadding.top + c.tooltipOffset;
-                break;
-            case 's':
-                var x = gridpos.x + plot._gridPadding.left - elem.outerWidth(true)/2;
-                var y = gridpos.y + plot._gridPadding.top + c.tooltipOffset;
-                break;
-            case 'sw':
-                var x = gridpos.x + plot._gridPadding.left - elem.outerWidth(true) - c.tooltipOffset;
-                var y = gridpos.y + plot._gridPadding.top + c.tooltipOffset;
-                break;
-            case 'w':
-                var x = gridpos.x + plot._gridPadding.left - elem.outerWidth(true) - c.tooltipOffset;
-                var y = gridpos.y + plot._gridPadding.top - elem.outerHeight(true)/2;
-                break;
-            default:
-                var x = gridpos.x + plot._gridPadding.left + c.tooltipOffset;
-                var y = gridpos.y + plot._gridPadding.top + c.tooltipOffset;
-                break;
-        }
-            
-        elem.css('left', x);
-        elem.css('top', y);
-        elem = null;
-    }
-    
-    function positionTooltip(plot) { 
-        // fake a grid for positioning
-        var grid = plot._gridPadding; 
-        var c = plot.plugins.cursor;
-        var elem = c._tooltipElem;  
-        switch (c.tooltipLocation) {
-            case 'nw':
-                var a = grid.left + c.tooltipOffset;
-                var b = grid.top + c.tooltipOffset;
-                elem.css('left', a);
-                elem.css('top', b);
-                break;
-            case 'n':
-                var a = (grid.left + (plot._plotDimensions.width - grid.right))/2 - elem.outerWidth(true)/2;
-                var b = grid.top + c.tooltipOffset;
-                elem.css('left', a);
-                elem.css('top', b);
-                break;
-            case 'ne':
-                var a = grid.right + c.tooltipOffset;
-                var b = grid.top + c.tooltipOffset;
-                elem.css({right:a, top:b});
-                break;
-            case 'e':
-                var a = grid.right + c.tooltipOffset;
-                var b = (grid.top + (plot._plotDimensions.height - grid.bottom))/2 - elem.outerHeight(true)/2;
-                elem.css({right:a, top:b});
-                break;
-            case 'se':
-                var a = grid.right + c.tooltipOffset;
-                var b = grid.bottom + c.tooltipOffset;
-                elem.css({right:a, bottom:b});
-                break;
-            case 's':
-                var a = (grid.left + (plot._plotDimensions.width - grid.right))/2 - elem.outerWidth(true)/2;
-                var b = grid.bottom + c.tooltipOffset;
-                elem.css({left:a, bottom:b});
-                break;
-            case 'sw':
-                var a = grid.left + c.tooltipOffset;
-                var b = grid.bottom + c.tooltipOffset;
-                elem.css({left:a, bottom:b});
-                break;
-            case 'w':
-                var a = grid.left + c.tooltipOffset;
-                var b = (grid.top + (plot._plotDimensions.height - grid.bottom))/2 - elem.outerHeight(true)/2;
-                elem.css({left:a, top:b});
-                break;
-            default:  // same as 'se'
-                var a = grid.right - c.tooltipOffset;
-                var b = grid.bottom + c.tooltipOffset;
-                elem.css({right:a, bottom:b});
-                break;
-        }
-        elem = null;
-    }
-    
-    function handleClick (ev, gridpos, datapos, neighbor, plot) {
-        ev.preventDefault();
-        ev.stopImmediatePropagation();
-        var c = plot.plugins.cursor;
-        if (c.clickReset) {
-            c.resetZoom(plot, c);
-        }
-        var sel = window.getSelection;
-        if (document.selection && document.selection.empty)
-        {
-            document.selection.empty();
-        }
-        else if (sel && !sel().isCollapsed) {
-            sel().collapse();
-        }
-        return false;
-    }
-    
-    function handleDblClick (ev, gridpos, datapos, neighbor, plot) {
-        ev.preventDefault();
-        ev.stopImmediatePropagation();
-        var c = plot.plugins.cursor;
-        if (c.dblClickReset) {
-            c.resetZoom(plot, c);
-        }
-        var sel = window.getSelection;
-        if (document.selection && document.selection.empty)
-        {
-            document.selection.empty();
-        }
-        else if (sel && !sel().isCollapsed) {
-            sel().collapse();
-        }
-        return false;
-    }
-    
-    function handleMouseLeave(ev, gridpos, datapos, neighbor, plot) {
-        var c = plot.plugins.cursor;
-        c.onGrid = false;
-        if (c.show) {
-            $(ev.target).css('cursor', c.previousCursor);
-            if (c.showTooltip && !(c._zoom.zooming && c.showTooltipOutsideZoom && !c.constrainOutsideZoom)) {
-                c._tooltipElem.empty();
-                c._tooltipElem.hide();
-            }
-            if (c.zoom) {
-                c._zoom.gridpos = gridpos;
-                c._zoom.datapos = datapos;
-            }
-            if (c.showVerticalLine || c.showHorizontalLine) {
-                var ctx = c.cursorCanvas._ctx;
-                ctx.clearRect(0,0,ctx.canvas.width, ctx.canvas.height);
-                ctx = null;
-            }
-            if (c.showCursorLegend) {
-                var cells = $(plot.targetId + ' td.jqplot-cursor-legend-label');
-                for (var i=0; i<cells.length; i++) {
-                    var idx = $(cells[i]).data('seriesIndex');
-                    var series = plot.series[idx];
-                    var label = series.label.toString();
-                    if (plot.legend.escapeHtml) {
-                        $(cells[i]).text($.jqplot.sprintf(c.cursorLegendFormatString, label, undefined, undefined));
-                    }
-                    else {
-                        $(cells[i]).html($.jqplot.sprintf(c.cursorLegendFormatString, label, undefined, undefined));
-                    }
-                
-                }        
-            }
-        }
-    }
-    
-    function handleMouseEnter(ev, gridpos, datapos, neighbor, plot) {
-        var c = plot.plugins.cursor;
-        c.onGrid = true;
-        if (c.show) {
-            c.previousCursor = ev.target.style.cursor;
-            ev.target.style.cursor = c.style;
-            if (c.showTooltip) {
-                updateTooltip(gridpos, datapos, plot);
-                if (c.followMouse) {
-                    moveTooltip(gridpos, plot);
-                }
-                else {
-                    positionTooltip(plot);
-                }
-                c._tooltipElem.show();
-            }
-            if (c.showVerticalLine || c.showHorizontalLine) {
-                moveLine(gridpos, plot);
-            }
-        }
-
-    }    
-    
-    function handleMouseMove(ev, gridpos, datapos, neighbor, plot) {
-        var c = plot.plugins.cursor;
-        if (c.show) {
-            if (c.showTooltip) {
-                updateTooltip(gridpos, datapos, plot);
-                if (c.followMouse) {
-                    moveTooltip(gridpos, plot);
-                }
-            }
-            if (c.showVerticalLine || c.showHorizontalLine) {
-                moveLine(gridpos, plot);
-            }
-        }
-    }
-            
-    function getEventPosition(ev) {
-        var plot = ev.data.plot;
-        var go = plot.eventCanvas._elem.offset();
-        var gridPos = {x:ev.pageX - go.left, y:ev.pageY - go.top};
-        //////
-        // TO DO: handle yMidAxis
-        //////
-        var dataPos = {xaxis:null, yaxis:null, x2axis:null, y2axis:null, y3axis:null, y4axis:null, y5axis:null, y6axis:null, y7axis:null, y8axis:null, y9axis:null, yMidAxis:null};
-        var an = ['xaxis', 'yaxis', 'x2axis', 'y2axis', 'y3axis', 'y4axis', 'y5axis', 'y6axis', 'y7axis', 'y8axis', 'y9axis', 'yMidAxis'];
-        var ax = plot.axes;
-        var n, axis;
-        for (n=11; n>0; n--) {
-            axis = an[n-1];
-            if (ax[axis].show) {
-                dataPos[axis] = ax[axis].series_p2u(gridPos[axis.charAt(0)]);
-            }
-        }
-
-        return {offsets:go, gridPos:gridPos, dataPos:dataPos};
-    }    
-    
-    function handleZoomMove(ev) {
-        var plot = ev.data.plot;
-        var c = plot.plugins.cursor;
-        // don't do anything if not on grid.
-        if (c.show && c.zoom && c._zoom.started && !c.zoomTarget) {
-            ev.preventDefault();
-            var ctx = c.zoomCanvas._ctx;
-            var positions = getEventPosition(ev);
-            var gridpos = positions.gridPos;
-            var datapos = positions.dataPos;
-            c._zoom.gridpos = gridpos;
-            c._zoom.datapos = datapos;
-            c._zoom.zooming = true;
-            var xpos = gridpos.x;
-            var ypos = gridpos.y;
-            var height = ctx.canvas.height;
-            var width = ctx.canvas.width;
-            if (c.showTooltip && !c.onGrid && c.showTooltipOutsideZoom) {
-                updateTooltip(gridpos, datapos, plot);
-                if (c.followMouse) {
-                    moveTooltip(gridpos, plot);
-                }
-            }
-            if (c.constrainZoomTo == 'x') {
-                c._zoom.end = [xpos, height];
-            }
-            else if (c.constrainZoomTo == 'y') {
-                c._zoom.end = [width, ypos];
-            }
-            else {
-                c._zoom.end = [xpos, ypos];
-            }
-            var sel = window.getSelection;
-            if (document.selection && document.selection.empty)
-            {
-                document.selection.empty();
-            }
-            else if (sel && !sel().isCollapsed) {
-                sel().collapse();
-            }
-            drawZoomBox.call(c);
-            ctx = null;
-        }
-    }
-    
-    function handleMouseDown(ev, gridpos, datapos, neighbor, plot) {
-        var c = plot.plugins.cursor;
-        if(plot.plugins.mobile){
-            $(document).one('vmouseup.jqplot_cursor', {plot:plot}, handleMouseUp);
-        } else {
-            $(document).one('mouseup.jqplot_cursor', {plot:plot}, handleMouseUp);
-        }
-        var axes = plot.axes;
-        if (document.onselectstart != undefined) {
-            c._oldHandlers.onselectstart = document.onselectstart;
-            document.onselectstart = function () { return false; };
-        }
-        if (document.ondrag != undefined) {
-            c._oldHandlers.ondrag = document.ondrag;
-            document.ondrag = function () { return false; };
-        }
-        if (document.onmousedown != undefined) {
-            c._oldHandlers.onmousedown = document.onmousedown;
-            document.onmousedown = function () { return false; };
-        }
-        if (c.zoom) {
-            if (!c.zoomProxy) {
-                var ctx = c.zoomCanvas._ctx;
-                ctx.clearRect(0,0,ctx.canvas.width, ctx.canvas.height);
-                ctx = null;
-            }
-            if (c.constrainZoomTo == 'x') {
-                c._zoom.start = [gridpos.x, 0];
-            }
-            else if (c.constrainZoomTo == 'y') {
-                c._zoom.start = [0, gridpos.y];
-            }
-            else {
-                c._zoom.start = [gridpos.x, gridpos.y];
-            }
-            c._zoom.started = true;
-            for (var ax in datapos) {
-                // get zoom starting position.
-                c._zoom.axes.start[ax] = datapos[ax];
-            }  
-           if(plot.plugins.mobile){
-                $(document).bind('vmousemove.jqplotCursor', {plot:plot}, handleZoomMove);              
-            } else {
-                $(document).bind('mousemove.jqplotCursor', {plot:plot}, handleZoomMove);              
-            }
-
-        }
-    }
-    
-    function handleMouseUp(ev) {
-        var plot = ev.data.plot;
-        var c = plot.plugins.cursor;
-        if (c.zoom && c._zoom.zooming && !c.zoomTarget) {
-            var xpos = c._zoom.gridpos.x;
-            var ypos = c._zoom.gridpos.y;
-            var datapos = c._zoom.datapos;
-            var height = c.zoomCanvas._ctx.canvas.height;
-            var width = c.zoomCanvas._ctx.canvas.width;
-            var axes = plot.axes;
-            
-            if (c.constrainOutsideZoom && !c.onGrid) {
-                if (xpos < 0) { xpos = 0; }
-                else if (xpos > width) { xpos = width; }
-                if (ypos < 0) { ypos = 0; }
-                else if (ypos > height) { ypos = height; }
-                
-                for (var axis in datapos) {
-                    if (datapos[axis]) {
-                        if (axis.charAt(0) == 'x') {
-                            datapos[axis] = axes[axis].series_p2u(xpos);
-                        }
-                        else {
-                            datapos[axis] = axes[axis].series_p2u(ypos);
-                        }
-                    }
-                }
-            }
-            
-            if (c.constrainZoomTo == 'x') {
-                ypos = height;
-            }
-            else if (c.constrainZoomTo == 'y') {
-                xpos = width;
-            }
-            c._zoom.end = [xpos, ypos];
-            c._zoom.gridpos = {x:xpos, y:ypos};
-            
-            c.doZoom(c._zoom.gridpos, datapos, plot, c);
-        }
-        c._zoom.started = false;
-        c._zoom.zooming = false;
-        
-        $(document).unbind('mousemove.jqplotCursor', handleZoomMove);
-        
-        if (document.onselectstart != undefined && c._oldHandlers.onselectstart != null){
-            document.onselectstart = c._oldHandlers.onselectstart;
-            c._oldHandlers.onselectstart = null;
-        }
-        if (document.ondrag != undefined && c._oldHandlers.ondrag != null){
-            document.ondrag = c._oldHandlers.ondrag;
-            c._oldHandlers.ondrag = null;
-        }
-        if (document.onmousedown != undefined && c._oldHandlers.onmousedown != null){
-            document.onmousedown = c._oldHandlers.onmousedown;
-            c._oldHandlers.onmousedown = null;
-        }
-
-    }
-    
-    function drawZoomBox() {
-        var start = this._zoom.start;
-        var end = this._zoom.end;
-        var ctx = this.zoomCanvas._ctx;
-        var l, t, h, w;
-        if (end[0] > start[0]) {
-            l = start[0];
-            w = end[0] - start[0];
-        }
-        else {
-            l = end[0];
-            w = start[0] - end[0];
-        }
-        if (end[1] > start[1]) {
-            t = start[1];
-            h = end[1] - start[1];
-        }
-        else {
-            t = end[1];
-            h = start[1] - end[1];
-        }
-        ctx.fillStyle = 'rgba(0,0,0,0.2)';
-        ctx.strokeStyle = '#999999';
-        ctx.lineWidth = 1.0;
-        ctx.clearRect(0,0,ctx.canvas.width, ctx.canvas.height);
-        ctx.fillRect(0,0,ctx.canvas.width, ctx.canvas.height);
-        ctx.clearRect(l, t, w, h);
-        // IE won't show transparent fill rect, so stroke a rect also.
-        ctx.strokeRect(l,t,w,h);
-        ctx = null;
-    }
-    
-    $.jqplot.CursorLegendRenderer = function(options) {
-        $.jqplot.TableLegendRenderer.call(this, options);
-        this.formatString = '%s';
-    };
-    
-    $.jqplot.CursorLegendRenderer.prototype = new $.jqplot.TableLegendRenderer();
-    $.jqplot.CursorLegendRenderer.prototype.constructor = $.jqplot.CursorLegendRenderer;
-    
-    // called in context of a Legend
-    $.jqplot.CursorLegendRenderer.prototype.draw = function() {
-        if (this._elem) {
-            this._elem.emptyForce();
-            this._elem = null;
-        }
-        if (this.show) {
-            var series = this._series, s;
-            // make a table.  one line label per row.
-            var elem = document.createElement('table');
-            this._elem = $(elem);
-            elem = null;
-            this._elem.addClass('jqplot-legend jqplot-cursor-legend');
-            this._elem.css('position', 'absolute');
-        
-            var pad = false;
-            for (var i = 0; i< series.length; i++) {
-                s = series[i];
-                if (s.show && s.showLabel) {
-                    var lt = $.jqplot.sprintf(this.formatString, s.label.toString());
-                    if (lt) {
-                        var color = s.color;
-                        if (s._stack && !s.fill) {
-                            color = '';
-                        }
-                        addrow.call(this, lt, color, pad, i);
-                        pad = true;
-                    }
-                    // let plugins add more rows to legend.  Used by trend line plugin.
-                    for (var j=0; j<$.jqplot.addLegendRowHooks.length; j++) {
-                        var item = $.jqplot.addLegendRowHooks[j].call(this, s);
-                        if (item) {
-                            addrow.call(this, item.label, item.color, pad);
-                            pad = true;
-                        } 
-                    }
-                }
-            }
-            series = s = null;
-            delete series;
-            delete s;
-        }
-        
-        function addrow(label, color, pad, idx) {
-            var rs = (pad) ? this.rowSpacing : '0';
-            var tr = $('<tr class="jqplot-legend jqplot-cursor-legend"></tr>').appendTo(this._elem);
-            tr.data('seriesIndex', idx);
-            $('<td class="jqplot-legend jqplot-cursor-legend-swatch" style="padding-top:'+rs+';">'+
-                '<div style="border:1px solid #cccccc;padding:0.2em;">'+
-                '<div class="jqplot-cursor-legend-swatch" style="background-color:'+color+';"></div>'+
-                '</div></td>').appendTo(tr);
-            var td = $('<td class="jqplot-legend jqplot-cursor-legend-label" style="vertical-align:middle;padding-top:'+rs+';"></td>');
-            td.appendTo(tr);
-            td.data('seriesIndex', idx);
-            if (this.escapeHtml) {
-                td.text(label);
-            }
-            else {
-                td.html(label);
-            }
-            tr = null;
-            td = null;
-        }
-        return this._elem;
-    };
-    
-})(jQuery);
diff --git a/#pma/js/jqplot/plugins/jqplot.dateAxisRenderer.js b/#pma/js/jqplot/plugins/jqplot.dateAxisRenderer.js
deleted file mode 100644
index e371a28d..00000000
--- a/#pma/js/jqplot/plugins/jqplot.dateAxisRenderer.js
+++ /dev/null
@@ -1,741 +0,0 @@
-/**
- * jqPlot
- * Pure JavaScript plotting plugin using jQuery
- *
- * Version: 1.0.8
- * Revision: 1250
- *
- * Copyright (c) 2009-2013 Chris Leonello
- * jqPlot is currently available for use in all personal or commercial projects 
- * under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL 
- * version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can 
- * choose the license that best suits your project and use it accordingly. 
- *
- * Although not required, the author would appreciate an email letting him 
- * know of any substantial use of jqPlot.  You can reach the author at: 
- * chris at jqplot dot com or see http://www.jqplot.com/info.php .
- *
- * If you are feeling kind and generous, consider supporting the project by
- * making a donation at: http://www.jqplot.com/donate.php .
- *
- * sprintf functions contained in jqplot.sprintf.js by Ash Searle:
- *
- *     version 2007.04.27
- *     author Ash Searle
- *     http://hexmen.com/blog/2007/03/printf-sprintf/
- *     http://hexmen.com/js/sprintf.js
- *     The author (Ash Searle) has placed this code in the public domain:
- *     "This code is unrestricted: you are free to use it however you like."
- * 
- */
-(function($) {  
-    /**
-     * Class: $.jqplot.DateAxisRenderer
-     * A plugin for a jqPlot to render an axis as a series of date values.
-     * This renderer has no options beyond those supplied by the <Axis> class.
-     * It supplies its own tick formatter, so the tickOptions.formatter option
-     * should not be overridden.
-     * 
-     * Thanks to Ken Synder for his enhanced Date instance methods which are
-     * included with this code <http://kendsnyder.com/sandbox/date/>.
-     * 
-     * To use this renderer, include the plugin in your source
-     * > <script type="text/javascript" language="javascript" src="plugins/jqplot.dateAxisRenderer.js"></script>
-     * 
-     * and supply the appropriate options to your plot
-     * 
-     * > {axes:{xaxis:{renderer:$.jqplot.DateAxisRenderer}}}
-     * 
-     * Dates can be passed into the axis in almost any recognizable value and 
-     * will be parsed.  They will be rendered on the axis in the format
-     * specified by tickOptions.formatString.  e.g. tickOptions.formatString = '%Y-%m-%d'.
-     * 
-     * Accecptable format codes 
-     * are:
-     * 
-     * > Code    Result                  Description
-     * >             == Years ==
-     * > %Y      2008                Four-digit year
-     * > %y      08                  Two-digit year
-     * >             == Months ==
-     * > %m      09                  Two-digit month
-     * > %#m     9                   One or two-digit month
-     * > %B      September           Full month name
-     * > %b      Sep                 Abbreviated month name
-     * >             == Days ==
-     * > %d      05                  Two-digit day of month
-     * > %#d     5                   One or two-digit day of month
-     * > %e      5                   One or two-digit day of month
-     * > %A      Sunday              Full name of the day of the week
-     * > %a      Sun                 Abbreviated name of the day of the week
-     * > %w      0                   Number of the day of the week (0 = Sunday, 6 = Saturday)
-     * > %o      th                  The ordinal suffix string following the day of the month
-     * >             == Hours ==
-     * > %H      23                  Hours in 24-hour format (two digits)
-     * > %#H     3                   Hours in 24-hour integer format (one or two digits)
-     * > %I      11                  Hours in 12-hour format (two digits)
-     * > %#I     3                   Hours in 12-hour integer format (one or two digits)
-     * > %p      PM                  AM or PM
-     * >             == Minutes ==
-     * > %M      09                  Minutes (two digits)
-     * > %#M     9                   Minutes (one or two digits)
-     * >             == Seconds ==
-     * > %S      02                  Seconds (two digits)
-     * > %#S     2                   Seconds (one or two digits)
-     * > %s      1206567625723       Unix timestamp (Seconds past 1970-01-01 00:00:00)
-     * >             == Milliseconds ==
-     * > %N      008                 Milliseconds (three digits)
-     * > %#N     8                   Milliseconds (one to three digits)
-     * >             == Timezone ==
-     * > %O      360                 difference in minutes between local time and GMT
-     * > %Z      Mountain Standard Time  Name of timezone as reported by browser
-     * > %G      -06:00              Hours and minutes between GMT
-     * >             == Shortcuts ==
-     * > %F      2008-03-26          %Y-%m-%d
-     * > %T      05:06:30            %H:%M:%S
-     * > %X      05:06:30            %H:%M:%S
-     * > %x      03/26/08            %m/%d/%y
-     * > %D      03/26/08            %m/%d/%y
-     * > %#c     Wed Mar 26 15:31:00 2008  %a %b %e %H:%M:%S %Y
-     * > %v      3-Sep-2008          %e-%b-%Y
-     * > %R      15:31               %H:%M
-     * > %r      3:31:00 PM          %I:%M:%S %p
-     * >             == Characters ==
-     * > %n      \n                  Newline
-     * > %t      \t                  Tab
-     * > %%      %                   Percent Symbol 
-     */
-    $.jqplot.DateAxisRenderer = function() {
-        $.jqplot.LinearAxisRenderer.call(this);
-        this.date = new $.jsDate();
-    };
-
-    var second = 1000;
-    var minute = 60 * second;
-    var hour = 60 * minute;
-    var day = 24 * hour;
-    var week = 7 * day;
-
-    // these are less definitive
-    var month = 30.4368499 * day;
-    var year = 365.242199 * day;
-
-    var daysInMonths = [31,28,31,30,31,30,31,30,31,30,31,30];
-    // array of consistent nice intervals.  Longer intervals
-    // will depend on days in month, days in year, etc.
-    var niceFormatStrings = ['%M:%S.%#N', '%M:%S.%#N', '%M:%S.%#N', '%M:%S', '%M:%S', '%M:%S', '%M:%S', '%H:%M:%S', '%H:%M:%S', '%H:%M', '%H:%M', '%H:%M', '%H:%M', '%H:%M', '%H:%M', '%a %H:%M', '%a %H:%M', '%b %e %H:%M', '%b %e %H:%M', '%b %e %H:%M', '%b %e %H:%M', '%v', '%v', '%v', '%v', '%v', '%v', '%v'];
-    var niceIntervals = [0.1*second, 0.2*second, 0.5*second, second, 2*second, 5*second, 10*second, 15*second, 30*second, minute, 2*minute, 5*minute, 10*minute, 15*minute, 30*minute, hour, 2*hour, 4*hour, 6*hour, 8*hour, 12*hour, day, 2*day, 3*day, 4*day, 5*day, week, 2*week];
-
-    var niceMonthlyIntervals = [];
-
-    function bestDateInterval(min, max, titarget) {
-        // iterate through niceIntervals to find one closest to titarget
-        var badness = Number.MAX_VALUE;
-        var temp, bestTi, bestfmt;
-        for (var i=0, l=niceIntervals.length; i < l; i++) {
-            temp = Math.abs(titarget - niceIntervals[i]);
-            if (temp < badness) {
-                badness = temp;
-                bestTi = niceIntervals[i];
-                bestfmt = niceFormatStrings[i];
-            }
-        }
-
-        return [bestTi, bestfmt];
-    }
-    
-    $.jqplot.DateAxisRenderer.prototype = new $.jqplot.LinearAxisRenderer();
-    $.jqplot.DateAxisRenderer.prototype.constructor = $.jqplot.DateAxisRenderer;
-    
-    $.jqplot.DateTickFormatter = function(format, val) {
-        if (!format) {
-            format = '%Y/%m/%d';
-        }
-        return $.jsDate.strftime(val, format);
-    };
-    
-    $.jqplot.DateAxisRenderer.prototype.init = function(options){
-        // prop: tickRenderer
-        // A class of a rendering engine for creating the ticks labels displayed on the plot, 
-        // See <$.jqplot.AxisTickRenderer>.
-        // this.tickRenderer = $.jqplot.AxisTickRenderer;
-        // this.labelRenderer = $.jqplot.AxisLabelRenderer;
-        this.tickOptions.formatter = $.jqplot.DateTickFormatter;
-        // prop: tickInset
-        // Controls the amount to inset the first and last ticks from 
-        // the edges of the grid, in multiples of the tick interval.
-        // 0 is no inset, 0.5 is one half a tick interval, 1 is a full
-        // tick interval, etc.
-        this.tickInset = 0;
-        // prop: drawBaseline
-        // True to draw the axis baseline.
-        this.drawBaseline = true;
-        // prop: baselineWidth
-        // width of the baseline in pixels.
-        this.baselineWidth = null;
-        // prop: baselineColor
-        // CSS color spec for the baseline.
-        this.baselineColor = null;
-        this.daTickInterval = null;
-        this._daTickInterval = null;
-        
-        $.extend(true, this, options);
-        
-        var db = this._dataBounds,
-            stats, 
-            sum,
-            s,
-            d,
-            pd,
-            sd,
-            intv;
-        
-        // Go through all the series attached to this axis and find
-        // the min/max bounds for this axis.
-        for (var i=0; i<this._series.length; i++) {
-            stats = {intervals:[], frequencies:{}, sortedIntervals:[], min:null, max:null, mean:null};
-            sum = 0;
-            s = this._series[i];
-            d = s.data;
-            pd = s._plotData;
-            sd = s._stackData;
-            intv = 0;
-            
-            for (var j=0; j<d.length; j++) { 
-                if (this.name == 'xaxis' || this.name == 'x2axis') {
-                    d[j][0] = new $.jsDate(d[j][0]).getTime();
-                    pd[j][0] = new $.jsDate(d[j][0]).getTime();
-                    sd[j][0] = new $.jsDate(d[j][0]).getTime();
-                    if ((d[j][0] != null && d[j][0] < db.min) || db.min == null) {
-                        db.min = d[j][0];
-                    }
-                    if ((d[j][0] != null && d[j][0] > db.max) || db.max == null) {
-                        db.max = d[j][0];
-                    }
-                    if (j>0) {
-                        intv = Math.abs(d[j][0] - d[j-1][0]);
-                        stats.intervals.push(intv);
-                        if (stats.frequencies.hasOwnProperty(intv)) {
-                            stats.frequencies[intv] += 1;
-                        }
-                        else {
-                            stats.frequencies[intv] = 1;
-                        }
-                    }
-                    sum += intv;
-                    
-                }              
-                else {
-                    d[j][1] = new $.jsDate(d[j][1]).getTime();
-                    pd[j][1] = new $.jsDate(d[j][1]).getTime();
-                    sd[j][1] = new $.jsDate(d[j][1]).getTime();
-                    if ((d[j][1] != null && d[j][1] < db.min) || db.min == null) {
-                        db.min = d[j][1];
-                    }
-                    if ((d[j][1] != null && d[j][1] > db.max) || db.max == null) {
-                        db.max = d[j][1];
-                    }
-                    if (j>0) {
-                        intv = Math.abs(d[j][1] - d[j-1][1]);
-                        stats.intervals.push(intv);
-                        if (stats.frequencies.hasOwnProperty(intv)) {
-                            stats.frequencies[intv] += 1;
-                        }
-                        else {
-                            stats.frequencies[intv] = 1;
-                        }
-                    }
-                }
-                sum += intv;              
-            }
-
-            if (s.renderer.bands) {
-                if (s.renderer.bands.hiData.length) {
-                    var bd = s.renderer.bands.hiData;
-                    for (var j=0, l=bd.length; j < l; j++) {
-                        if (this.name === 'xaxis' || this.name === 'x2axis') {
-                            bd[j][0] = new $.jsDate(bd[j][0]).getTime();
-                            if ((bd[j][0] != null && bd[j][0] > db.max) || db.max == null) {
-                                db.max = bd[j][0];
-                            }                        
-                        }              
-                        else {
-                            bd[j][1] = new $.jsDate(bd[j][1]).getTime();
-                            if ((bd[j][1] != null && bd[j][1] > db.max) || db.max == null) {
-                                db.max = bd[j][1];
-                            }
-                        }
-                    }
-                }
-                if (s.renderer.bands.lowData.length) {
-                    var bd = s.renderer.bands.lowData;
-                    for (var j=0, l=bd.length; j < l; j++) {
-                        if (this.name === 'xaxis' || this.name === 'x2axis') {
-                            bd[j][0] = new $.jsDate(bd[j][0]).getTime();
-                            if ((bd[j][0] != null && bd[j][0] < db.min) || db.min == null) {
-                                db.min = bd[j][0];
-                            }                       
-                        }              
-                        else {
-                            bd[j][1] = new $.jsDate(bd[j][1]).getTime();
-                            if ((bd[j][1] != null && bd[j][1] < db.min) || db.min == null) {
-                                db.min = bd[j][1];
-                            }
-                        }
-                    }
-                }
-            }
-            
-            var tempf = 0,
-                tempn=0;
-            for (var n in stats.frequencies) {
-                stats.sortedIntervals.push({interval:n, frequency:stats.frequencies[n]});
-            }
-            stats.sortedIntervals.sort(function(a, b){
-                return b.frequency - a.frequency;
-            });
-            
-            stats.min = $.jqplot.arrayMin(stats.intervals);
-            stats.max = $.jqplot.arrayMax(stats.intervals);
-            stats.mean = sum/d.length;
-            this._intervalStats.push(stats);
-            stats = sum = s = d = pd = sd = null;
-        }
-        db = null;
-        
-    };
-    
-    // called with scope of an axis
-    $.jqplot.DateAxisRenderer.prototype.reset = function() {
-        this.min = this._options.min;
-        this.max = this._options.max;
-        this.tickInterval = this._options.tickInterval;
-        this.numberTicks = this._options.numberTicks;
-        this._autoFormatString = '';
-        if (this._overrideFormatString && this.tickOptions && this.tickOptions.formatString) {
-            this.tickOptions.formatString = '';
-        }
-        this.daTickInterval = this._daTickInterval;
-        // this._ticks = this.__ticks;
-    };
-    
-    $.jqplot.DateAxisRenderer.prototype.createTicks = function(plot) {
-        // we're are operating on an axis here
-        var ticks = this._ticks;
-        var userTicks = this.ticks;
-        var name = this.name;
-        // databounds were set on axis initialization.
-        var db = this._dataBounds;
-        var iv = this._intervalStats;
-        var dim = (this.name.charAt(0) === 'x') ? this._plotDimensions.width : this._plotDimensions.height;
-        var interval;
-        var min, max;
-        var pos1, pos2;
-        var tt, i;
-        var threshold = 30;
-        var insetMult = 1;
-        var daTickInterval = null;
-        
-        // if user specified a tick interval, convert to usable.
-        if (this.tickInterval != null)
-        {
-            // if interval is a number or can be converted to one, use it.
-            // Assume it is in SECONDS!!!
-            if (Number(this.tickInterval)) {
-                daTickInterval = [Number(this.tickInterval), 'seconds'];
-            }
-            // else, parse out something we can build from.
-            else if (typeof this.tickInterval == "string") {
-                var parts = this.tickInterval.split(' ');
-                if (parts.length == 1) {
-                    daTickInterval = [1, parts[0]];
-                }
-                else if (parts.length == 2) {
-                    daTickInterval = [parts[0], parts[1]];
-                }
-            }
-        }
-
-        var tickInterval = this.tickInterval;
-        
-        // if we already have ticks, use them.
-        // ticks must be in order of increasing value.
-        
-        min = new $.jsDate((this.min != null) ? this.min : db.min).getTime();
-        max = new $.jsDate((this.max != null) ? this.max : db.max).getTime();
-
-        // see if we're zooming.  if we are, don't use the min and max we're given,
-        // but compute some nice ones.  They will be reset later.
-
-        var cursor = plot.plugins.cursor;
-
-        if (cursor && cursor._zoom && cursor._zoom.zooming) {
-            this.min = null;
-            this.max = null;
-        }
-
-        var range = max - min;
-
-        if (this.tickOptions == null || !this.tickOptions.formatString) {
-            this._overrideFormatString = true;
-        }
-        
-        if (userTicks.length) {
-            // ticks could be 1D or 2D array of [val, val, ,,,] or [[val, label], [val, label], ...] or mixed
-            for (i=0; i<userTicks.length; i++){
-                var ut = userTicks[i];
-                var t = new this.tickRenderer(this.tickOptions);
-                if (ut.constructor == Array) {
-                    t.value = new $.jsDate(ut[0]).getTime();
-                    t.label = ut[1];
-                    if (!this.showTicks) {
-                        t.showLabel = false;
-                        t.showMark = false;
-                    }
-                    else if (!this.showTickMarks) {
-                        t.showMark = false;
-                    }
-                    t.setTick(t.value, this.name);
-                    this._ticks.push(t);
-                }
-                
-                else {
-                    t.value = new $.jsDate(ut).getTime();
-                    if (!this.showTicks) {
-                        t.showLabel = false;
-                        t.showMark = false;
-                    }
-                    else if (!this.showTickMarks) {
-                        t.showMark = false;
-                    }
-                    t.setTick(t.value, this.name);
-                    this._ticks.push(t);
-                }
-            }
-            this.numberTicks = userTicks.length;
-            this.min = this._ticks[0].value;
-            this.max = this._ticks[this.numberTicks-1].value;
-            this.daTickInterval = [(this.max - this.min) / (this.numberTicks - 1)/1000, 'seconds'];
-        }
-
-        ////////
-        // We don't have any ticks yet, let's make some!
-        ////////
-
-        // special case when there is only one point, make three tick marks to center the point
-        else if (this.min == null && this.max == null && db.min == db.max)
-        {
-             var onePointOpts = $.extend(true, {}, this.tickOptions, {name: this.name, value: null});
-             var delta = 300000;
-             this.min = db.min - delta;
-             this.max = db.max + delta;
-             this.numberTicks = 3;
-
-             for(var i=this.min;i<=this.max;i+= delta)
-             {
-                 onePointOpts.value = i;
-
-                 var t = new this.tickRenderer(onePointOpts);
-
-                 if (this._overrideFormatString && this._autoFormatString != '') {
-                    t.formatString = this._autoFormatString;
-                 }
-
-                 t.showLabel = false;
-                 t.showMark = false;
-
-                 this._ticks.push(t);
-             }
-
-             if(this.showTicks) {
-                 this._ticks[1].showLabel = true;
-             }
-             if(this.showTickMarks) {
-                 this._ticks[1].showTickMarks = true;
-             }                   
-        }
-        // if user specified min and max are null, we set those to make best ticks.
-        else if (this.min == null && this.max == null) {
-
-            var opts = $.extend(true, {}, this.tickOptions, {name: this.name, value: null});
-
-            // want to find a nice interval 
-            var nttarget,
-                titarget;
-
-            // if no tickInterval or numberTicks options specified,  make a good guess.
-            if (!this.tickInterval && !this.numberTicks) {
-                var tdim = Math.max(dim, threshold+1);
-                // how many ticks to put on the axis?
-                // date labels tend to be long.  If ticks not rotated,
-                // don't use too many and have a high spacing factor.
-                // If we are rotating ticks, use a lower factor.
-                var spacingFactor = 115;
-                if (this.tickRenderer === $.jqplot.CanvasAxisTickRenderer && this.tickOptions.angle) {
-                    spacingFactor = 115 - 40 * Math.abs(Math.sin(this.tickOptions.angle/180*Math.PI));
-                }
-
-                nttarget =  Math.ceil((tdim-threshold)/spacingFactor + 1);
-                titarget = (max - min) / (nttarget - 1);
-            }
-
-            // If tickInterval is specified, we'll try to honor it.
-            // Not guaranteed to get this interval, but we'll get as close as
-            // we can.
-            // tickInterval will be used before numberTicks, that is if
-            // both are specified, numberTicks will be ignored.
-            else if (this.tickInterval) {
-                titarget = new $.jsDate(0).add(daTickInterval[0], daTickInterval[1]).getTime();
-            }
-
-            // if numberTicks specified, try to honor it.
-            // Not guaranteed, but will try to get close.
-            else if (this.numberTicks) {
-                nttarget = this.numberTicks;
-                titarget = (max - min) / (nttarget - 1);
-            }
-
-            // If we can use an interval of 2 weeks or less, pick best one
-            if (titarget <= 19*day) {
-                var ret = bestDateInterval(min, max, titarget);
-                var tempti = ret[0];
-                this._autoFormatString = ret[1];
-
-                min = new $.jsDate(min);
-                min = Math.floor((min.getTime() - min.getUtcOffset())/tempti) * tempti + min.getUtcOffset();
-
-                nttarget = Math.ceil((max - min) / tempti) + 1;
-                this.min = min;
-                this.max = min + (nttarget - 1) * tempti;
-
-                // if max is less than max, add an interval
-                if (this.max < max) {
-                    this.max += tempti;
-                    nttarget += 1;
-                }
-                this.tickInterval = tempti;
-                this.numberTicks = nttarget;
-
-                for (var i=0; i<nttarget; i++) {
-                    opts.value = this.min + i * tempti;
-                    t = new this.tickRenderer(opts);
-                    
-                    if (this._overrideFormatString && this._autoFormatString != '') {
-                        t.formatString = this._autoFormatString;
-                    }
-                    if (!this.showTicks) {
-                        t.showLabel = false;
-                        t.showMark = false;
-                    }
-                    else if (!this.showTickMarks) {
-                        t.showMark = false;
-                    }
-                    this._ticks.push(t);
-                }
-
-                insetMult = this.tickInterval;
-            }
-
-            // should we use a monthly interval?
-            else if (titarget <= 9 * month) {
-
-                this._autoFormatString = '%v';
-
-                // how many months in an interval?
-                var intv = Math.round(titarget/month);
-                if (intv < 1) {
-                    intv = 1;
-                }
-                else if (intv > 6) {
-                    intv = 6;
-                }
-
-                // figure out the starting month and ending month.
-                var mstart = new $.jsDate(min).setDate(1).setHours(0,0,0,0);
-
-                // See if max ends exactly on a month
-                var tempmend = new $.jsDate(max);
-                var mend = new $.jsDate(max).setDate(1).setHours(0,0,0,0);
-
-                if (tempmend.getTime() !== mend.getTime()) {
-                    mend = mend.add(1, 'month');
-                }
-
-                var nmonths = mend.diff(mstart, 'month');
-
-                nttarget = Math.ceil(nmonths/intv) + 1;
-
-                this.min = mstart.getTime();
-                this.max = mstart.clone().add((nttarget - 1) * intv, 'month').getTime();
-                this.numberTicks = nttarget;
-
-                for (var i=0; i<nttarget; i++) {
-                    if (i === 0) {
-                        opts.value = mstart.getTime();
-                    }
-                    else {
-                        opts.value = mstart.add(intv, 'month').getTime();
-                    }
-                    t = new this.tickRenderer(opts);
-                    
-                    if (this._overrideFormatString && this._autoFormatString != '') {
-                        t.formatString = this._autoFormatString;
-                    }
-                    if (!this.showTicks) {
-                        t.showLabel = false;
-                        t.showMark = false;
-                    }
-                    else if (!this.showTickMarks) {
-                        t.showMark = false;
-                    }
-                    this._ticks.push(t);
-                }
-
-                insetMult = intv * month;
-            }
-
-            // use yearly intervals
-            else {
-
-                this._autoFormatString = '%v';
-
-                // how many years in an interval?
-                var intv = Math.round(titarget/year);
-                if (intv < 1) {
-                    intv = 1;
-                }
-
-                // figure out the starting and ending years.
-                var mstart = new $.jsDate(min).setMonth(0, 1).setHours(0,0,0,0);
-                var mend = new $.jsDate(max).add(1, 'year').setMonth(0, 1).setHours(0,0,0,0);
-
-                var nyears = mend.diff(mstart, 'year');
-
-                nttarget = Math.ceil(nyears/intv) + 1;
-
-                this.min = mstart.getTime();
-                this.max = mstart.clone().add((nttarget - 1) * intv, 'year').getTime();
-                this.numberTicks = nttarget;
-
-                for (var i=0; i<nttarget; i++) {
-                    if (i === 0) {
-                        opts.value = mstart.getTime();
-                    }
-                    else {
-                        opts.value = mstart.add(intv, 'year').getTime();
-                    }
-                    t = new this.tickRenderer(opts);
-                    
-                    if (this._overrideFormatString && this._autoFormatString != '') {
-                        t.formatString = this._autoFormatString;
-                    }
-                    if (!this.showTicks) {
-                        t.showLabel = false;
-                        t.showMark = false;
-                    }
-                    else if (!this.showTickMarks) {
-                        t.showMark = false;
-                    }
-                    this._ticks.push(t);
-                }
-
-                insetMult = intv * year;
-            }
-        }
-
-        ////////
-        // Some option(s) specified, work around that.
-        ////////
-        
-        else {      
-            if (name == 'xaxis' || name == 'x2axis') {
-                dim = this._plotDimensions.width;
-            }
-            else {
-                dim = this._plotDimensions.height;
-            }
-            
-            // if min, max and number of ticks specified, user can't specify interval.
-            if (this.min != null && this.max != null && this.numberTicks != null) {
-                this.tickInterval = null;
-            }
-            
-            if (this.tickInterval != null && daTickInterval != null) {
-                this.daTickInterval = daTickInterval;
-            }
-            
-            // if min and max are same, space them out a bit
-            if (min == max) {
-                var adj = 24*60*60*500;  // 1/2 day
-                min -= adj;
-                max += adj;
-            }
-
-            range = max - min;
-            
-            var optNumTicks = 2 + parseInt(Math.max(0, dim-100)/100, 10);
-            
-            
-            var rmin, rmax;
-            
-            rmin = (this.min != null) ? new $.jsDate(this.min).getTime() : min - range/2*(this.padMin - 1);
-            rmax = (this.max != null) ? new $.jsDate(this.max).getTime() : max + range/2*(this.padMax - 1);
-            this.min = rmin;
-            this.max = rmax;
-            range = this.max - this.min;
-            
-            if (this.numberTicks == null){
-                // if tickInterval is specified by user, we will ignore computed maximum.
-                // max will be equal or greater to fit even # of ticks.
-                if (this.daTickInterval != null) {
-                    var nc = new $.jsDate(this.max).diff(this.min, this.daTickInterval[1], true);
-                    this.numberTicks = Math.ceil(nc/this.daTickInterval[0]) +1;
-                    // this.max = new $.jsDate(this.min).add(this.numberTicks-1, this.daTickInterval[1]).getTime();
-                    this.max = new $.jsDate(this.min).add((this.numberTicks-1) * this.daTickInterval[0], this.daTickInterval[1]).getTime();
-                }
-                else if (dim > 200) {
-                    this.numberTicks = parseInt(3+(dim-200)/100, 10);
-                }
-                else {
-                    this.numberTicks = 2;
-                }
-            }
-            
-            insetMult = range / (this.numberTicks-1)/1000;
-
-            if (this.daTickInterval == null) {
-                this.daTickInterval = [insetMult, 'seconds'];
-            }
-
-
-            for (var i=0; i<this.numberTicks; i++){
-                var min = new $.jsDate(this.min);
-                tt = min.add(i*this.daTickInterval[0], this.daTickInterval[1]).getTime();
-                var t = new this.tickRenderer(this.tickOptions);
-                // var t = new $.jqplot.AxisTickRenderer(this.tickOptions);
-                if (!this.showTicks) {
-                    t.showLabel = false;
-                    t.showMark = false;
-                }
-                else if (!this.showTickMarks) {
-                    t.showMark = false;
-                }
-                t.setTick(tt, this.name);
-                this._ticks.push(t);
-            }
-        }
-
-        if (this.tickInset) {
-            this.min = this.min - this.tickInset * insetMult;
-            this.max = this.max + this.tickInset * insetMult;
-        }
-
-        if (this._daTickInterval == null) {
-            this._daTickInterval = this.daTickInterval;    
-        }
-
-        ticks = null;
-    };
-   
-})(jQuery);
-
diff --git a/#pma/js/jqplot/plugins/jqplot.highlighter.js b/#pma/js/jqplot/plugins/jqplot.highlighter.js
deleted file mode 100644
index 3105c859..00000000
--- a/#pma/js/jqplot/plugins/jqplot.highlighter.js
+++ /dev/null
@@ -1,465 +0,0 @@
-/**
- * jqPlot
- * Pure JavaScript plotting plugin using jQuery
- *
- * Version: 1.0.8
- * Revision: 1250
- *
- * Copyright (c) 2009-2013 Chris Leonello
- * jqPlot is currently available for use in all personal or commercial projects 
- * under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL 
- * version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can 
- * choose the license that best suits your project and use it accordingly. 
- *
- * Although not required, the author would appreciate an email letting him 
- * know of any substantial use of jqPlot.  You can reach the author at: 
- * chris at jqplot dot com or see http://www.jqplot.com/info.php .
- *
- * If you are feeling kind and generous, consider supporting the project by
- * making a donation at: http://www.jqplot.com/donate.php .
- *
- * sprintf functions contained in jqplot.sprintf.js by Ash Searle:
- *
- *     version 2007.04.27
- *     author Ash Searle
- *     http://hexmen.com/blog/2007/03/printf-sprintf/
- *     http://hexmen.com/js/sprintf.js
- *     The author (Ash Searle) has placed this code in the public domain:
- *     "This code is unrestricted: you are free to use it however you like."
- * 
- */
-(function($) {
-    $.jqplot.eventListenerHooks.push(['jqplotMouseMove', handleMove]);
-    
-    /**
-     * Class: $.jqplot.Highlighter
-     * Plugin which will highlight data points when they are moused over.
-     * 
-     * To use this plugin, include the js
-     * file in your source:
-     * 
-     * > <script type="text/javascript" src="plugins/jqplot.highlighter.js"></script>
-     * 
-     * A tooltip providing information about the data point is enabled by default.
-     * To disable the tooltip, set "showTooltip" to false.
-     * 
-     * You can control what data is displayed in the tooltip with various
-     * options.  The "tooltipAxes" option controls whether the x, y or both
-     * data values are displayed.
-     * 
-     * Some chart types (e.g. hi-low-close) have more than one y value per
-     * data point. To display the additional values in the tooltip, set the
-     * "yvalues" option to the desired number of y values present (3 for a hlc chart).
-     * 
-     * By default, data values will be formatted with the same formatting
-     * specifiers as used to format the axis ticks.  A custom format code
-     * can be supplied with the tooltipFormatString option.  This will apply 
-     * to all values in the tooltip.  
-     * 
-     * For more complete control, the "formatString" option can be set.  This
-     * Allows conplete control over tooltip formatting.  Values are passed to
-     * the format string in an order determined by the "tooltipAxes" and "yvalues"
-     * options.  So, if you have a hi-low-close chart and you just want to display 
-     * the hi-low-close values in the tooltip, you could set a formatString like:
-     * 
-     * > highlighter: {
-     * >     tooltipAxes: 'y',
-     * >     yvalues: 3,
-     * >     formatString:'<table class="jqplot-highlighter">
-     * >         <tr><td>hi:</td><td>%s</td></tr>
-     * >         <tr><td>low:</td><td>%s</td></tr>
-     * >         <tr><td>close:</td><td>%s</td></tr></table>'
-     * > }
-     * 
-     */
-    $.jqplot.Highlighter = function(options) {
-        // Group: Properties
-        //
-        //prop: show
-        // true to show the highlight.
-        this.show = $.jqplot.config.enablePlugins;
-        // prop: markerRenderer
-        // Renderer used to draw the marker of the highlighted point.
-        // Renderer will assimilate attributes from the data point being highlighted,
-        // so no attributes need set on the renderer directly.
-        // Default is to turn off shadow drawing on the highlighted point.
-        this.markerRenderer = new $.jqplot.MarkerRenderer({shadow:false});
-        // prop: showMarker
-        // true to show the marker
-        this.showMarker  = true;
-        // prop: lineWidthAdjust
-        // Pixels to add to the lineWidth of the highlight.
-        this.lineWidthAdjust = 2.5;
-        // prop: sizeAdjust
-        // Pixels to add to the overall size of the highlight.
-        this.sizeAdjust = 5;
-        // prop: showTooltip
-        // Show a tooltip with data point values.
-        this.showTooltip = true;
-        // prop: tooltipLocation
-        // Where to position tooltip, 'n', 'ne', 'e', 'se', 's', 'sw', 'w', 'nw'
-        this.tooltipLocation = 'nw';
-        // prop: fadeTooltip
-        // true = fade in/out tooltip, flase = show/hide tooltip
-        this.fadeTooltip = true;
-        // prop: tooltipFadeSpeed
-        // 'slow', 'def', 'fast', or number of milliseconds.
-        this.tooltipFadeSpeed = "fast";
-        // prop: tooltipOffset
-        // Pixel offset of tooltip from the highlight.
-        this.tooltipOffset = 2;
-        // prop: tooltipAxes
-        // Which axes to display in tooltip, 'x', 'y' or 'both', 'xy' or 'yx'
-        // 'both' and 'xy' are equivalent, 'yx' reverses order of labels.
-        this.tooltipAxes = 'both';
-        // prop; tooltipSeparator
-        // String to use to separate x and y axes in tooltip.
-        this.tooltipSeparator = ', ';
-        // prop; tooltipContentEditor
-        // Function used to edit/augment/replace the formatted tooltip contents.
-        // Called as str = tooltipContentEditor(str, seriesIndex, pointIndex)
-        // where str is the generated tooltip html and seriesIndex and pointIndex identify
-        // the data point being highlighted. Should return the html for the tooltip contents.
-        this.tooltipContentEditor = null;
-        // prop: useAxesFormatters
-        // Use the x and y axes formatters to format the text in the tooltip.
-        this.useAxesFormatters = true;
-        // prop: tooltipFormatString
-        // sprintf format string for the tooltip.
-        // Uses Ash Searle's javascript sprintf implementation
-        // found here: http://hexmen.com/blog/2007/03/printf-sprintf/
-        // See http://perldoc.perl.org/functions/sprintf.html for reference.
-        // Additional "p" and "P" format specifiers added by Chris Leonello.
-        this.tooltipFormatString = '%.5P';
-        // prop: formatString
-        // alternative to tooltipFormatString
-        // will format the whole tooltip text, populating with x, y values as
-        // indicated by tooltipAxes option.  So, you could have a tooltip like:
-        // 'Date: %s, number of cats: %d' to format the whole tooltip at one go.
-        // If useAxesFormatters is true, values will be formatted according to
-        // Axes formatters and you can populate your tooltip string with 
-        // %s placeholders.
-        this.formatString = null;
-        // prop: yvalues
-        // Number of y values to expect in the data point array.
-        // Typically this is 1.  Certain plots, like OHLC, will
-        // have more y values in each data point array.
-        this.yvalues = 1;
-        // prop: bringSeriesToFront
-        // This option requires jQuery 1.4+
-        // True to bring the series of the highlighted point to the front
-        // of other series.
-        this.bringSeriesToFront = false;
-        this._tooltipElem;
-        this.isHighlighting = false;
-        this.currentNeighbor = null;
-
-        $.extend(true, this, options);
-    };
-    
-    var locations = ['nw', 'n', 'ne', 'e', 'se', 's', 'sw', 'w'];
-    var locationIndicies = {'nw':0, 'n':1, 'ne':2, 'e':3, 'se':4, 's':5, 'sw':6, 'w':7};
-    var oppositeLocations = ['se', 's', 'sw', 'w', 'nw', 'n', 'ne', 'e'];
-    
-    // axis.renderer.tickrenderer.formatter
-    
-    // called with scope of plot
-    $.jqplot.Highlighter.init = function (target, data, opts){
-        var options = opts || {};
-        // add a highlighter attribute to the plot
-        this.plugins.highlighter = new $.jqplot.Highlighter(options.highlighter);
-    };
-    
-    // called within scope of series
-    $.jqplot.Highlighter.parseOptions = function (defaults, options) {
-        // Add a showHighlight option to the series 
-        // and set it to true by default.
-        this.showHighlight = true;
-    };
-    
-    // called within context of plot
-    // create a canvas which we can draw on.
-    // insert it before the eventCanvas, so eventCanvas will still capture events.
-    $.jqplot.Highlighter.postPlotDraw = function() {
-        // Memory Leaks patch    
-        if (this.plugins.highlighter && this.plugins.highlighter.highlightCanvas) {
-            this.plugins.highlighter.highlightCanvas.resetCanvas();
-            this.plugins.highlighter.highlightCanvas = null;
-        }
-
-        if (this.plugins.highlighter && this.plugins.highlighter._tooltipElem) {
-            this.plugins.highlighter._tooltipElem.emptyForce();
-            this.plugins.highlighter._tooltipElem = null;
-        }
-
-        this.plugins.highlighter.highlightCanvas = new $.jqplot.GenericCanvas();
-        
-        this.eventCanvas._elem.before(this.plugins.highlighter.highlightCanvas.createElement(this._gridPadding, 'jqplot-highlight-canvas', this._plotDimensions, this));
-        this.plugins.highlighter.highlightCanvas.setContext();
-
-        var elem = document.createElement('div');
-        this.plugins.highlighter._tooltipElem = $(elem);
-        elem = null;
-        this.plugins.highlighter._tooltipElem.addClass('jqplot-highlighter-tooltip');
-        this.plugins.highlighter._tooltipElem.css({position:'absolute', display:'none'});
-        
-        this.eventCanvas._elem.before(this.plugins.highlighter._tooltipElem);
-    };
-    
-    $.jqplot.preInitHooks.push($.jqplot.Highlighter.init);
-    $.jqplot.preParseSeriesOptionsHooks.push($.jqplot.Highlighter.parseOptions);
-    $.jqplot.postDrawHooks.push($.jqplot.Highlighter.postPlotDraw);
-    
-    function draw(plot, neighbor) {
-        var hl = plot.plugins.highlighter;
-        var s = plot.series[neighbor.seriesIndex];
-        var smr = s.markerRenderer;
-        var mr = hl.markerRenderer;
-        mr.style = smr.style;
-        mr.lineWidth = smr.lineWidth + hl.lineWidthAdjust;
-        mr.size = smr.size + hl.sizeAdjust;
-        var rgba = $.jqplot.getColorComponents(smr.color);
-        var newrgb = [rgba[0], rgba[1], rgba[2]];
-        var alpha = (rgba[3] >= 0.6) ? rgba[3]*0.6 : rgba[3]*(2-rgba[3]);
-        mr.color = 'rgba('+newrgb[0]+','+newrgb[1]+','+newrgb[2]+','+alpha+')';
-        mr.init();
-        mr.draw(s.gridData[neighbor.pointIndex][0], s.gridData[neighbor.pointIndex][1], hl.highlightCanvas._ctx);
-    }
-    
-    function showTooltip(plot, series, neighbor) {
-        // neighbor looks like: {seriesIndex: i, pointIndex:j, gridData:p, data:s.data[j]}
-        // gridData should be x,y pixel coords on the grid.
-        // add the plot._gridPadding to that to get x,y in the target.
-        var hl = plot.plugins.highlighter;
-        var elem = hl._tooltipElem;
-        var serieshl = series.highlighter || {};
-
-        var opts = $.extend(true, {}, hl, serieshl);
-
-        if (opts.useAxesFormatters) {
-            var xf = series._xaxis._ticks[0].formatter;
-            var yf = series._yaxis._ticks[0].formatter;
-            var xfstr = series._xaxis._ticks[0].formatString;
-            var yfstr = series._yaxis._ticks[0].formatString;
-            var str;
-            var xstr = xf(xfstr, neighbor.data[0]);
-            var ystrs = [];
-            for (var i=1; i<opts.yvalues+1; i++) {
-                ystrs.push(yf(yfstr, neighbor.data[i]));
-            }
-            if (typeof opts.formatString === 'string') {
-                switch (opts.tooltipAxes) {
-                    case 'both':
-                    case 'xy':
-                        ystrs.unshift(xstr);
-                        ystrs.unshift(opts.formatString);
-                        str = $.jqplot.sprintf.apply($.jqplot.sprintf, ystrs);
-                        break;
-                    case 'yx':
-                        ystrs.push(xstr);
-                        ystrs.unshift(opts.formatString);
-                        str = $.jqplot.sprintf.apply($.jqplot.sprintf, ystrs);
-                        break;
-                    case 'x':
-                        str = $.jqplot.sprintf.apply($.jqplot.sprintf, [opts.formatString, xstr]);
-                        break;
-                    case 'y':
-                        ystrs.unshift(opts.formatString);
-                        str = $.jqplot.sprintf.apply($.jqplot.sprintf, ystrs);
-                        break;
-                    default: // same as xy
-                        ystrs.unshift(xstr);
-                        ystrs.unshift(opts.formatString);
-                        str = $.jqplot.sprintf.apply($.jqplot.sprintf, ystrs);
-                        break;
-                } 
-            }
-            else {
-                switch (opts.tooltipAxes) {
-                    case 'both':
-                    case 'xy':
-                        str = xstr;
-                        for (var i=0; i<ystrs.length; i++) {
-                            str += opts.tooltipSeparator + ystrs[i];
-                        }
-                        break;
-                    case 'yx':
-                        str = '';
-                        for (var i=0; i<ystrs.length; i++) {
-                            str += ystrs[i] + opts.tooltipSeparator;
-                        }
-                        str += xstr;
-                        break;
-                    case 'x':
-                        str = xstr;
-                        break;
-                    case 'y':
-                        str = ystrs.join(opts.tooltipSeparator);
-                        break;
-                    default: // same as 'xy'
-                        str = xstr;
-                        for (var i=0; i<ystrs.length; i++) {
-                            str += opts.tooltipSeparator + ystrs[i];
-                        }
-                        break;
-                    
-                }                
-            }
-        }
-        else {
-            var str;
-            if (typeof opts.formatString ===  'string') {
-                str = $.jqplot.sprintf.apply($.jqplot.sprintf, [opts.formatString].concat(neighbor.data));
-            }
-
-            else {
-                if (opts.tooltipAxes == 'both' || opts.tooltipAxes == 'xy') {
-                    str = $.jqplot.sprintf(opts.tooltipFormatString, neighbor.data[0]) + opts.tooltipSeparator + $.jqplot.sprintf(opts.tooltipFormatString, neighbor.data[1]);
-                }
-                else if (opts.tooltipAxes == 'yx') {
-                    str = $.jqplot.sprintf(opts.tooltipFormatString, neighbor.data[1]) + opts.tooltipSeparator + $.jqplot.sprintf(opts.tooltipFormatString, neighbor.data[0]);
-                }
-                else if (opts.tooltipAxes == 'x') {
-                    str = $.jqplot.sprintf(opts.tooltipFormatString, neighbor.data[0]);
-                }
-                else if (opts.tooltipAxes == 'y') {
-                    str = $.jqplot.sprintf(opts.tooltipFormatString, neighbor.data[1]);
-                } 
-            }
-        }
-        if ($.isFunction(opts.tooltipContentEditor)) {
-            // args str, seriesIndex, pointIndex are essential so the hook can look up
-            // extra data for the point.
-            str = opts.tooltipContentEditor(str, neighbor.seriesIndex, neighbor.pointIndex, plot);
-        }
-        elem.html(str);
-        var gridpos = {x:neighbor.gridData[0], y:neighbor.gridData[1]};
-        var ms = 0;
-        var fact = 0.707;
-        if (series.markerRenderer.show == true) { 
-            ms = (series.markerRenderer.size + opts.sizeAdjust)/2;
-        }
-
-        var loc = locations;
-        if (series.fillToZero && series.fill && neighbor.data[1] < 0) {
-          loc = oppositeLocations;
-        }
-
-        switch (loc[locationIndicies[opts.tooltipLocation]]) {
-            case 'nw':
-                var x = gridpos.x + plot._gridPadding.left - elem.outerWidth(true) - opts.tooltipOffset - fact * ms;
-                var y = gridpos.y + plot._gridPadding.top - opts.tooltipOffset - elem.outerHeight(true) - fact * ms;
-                break;
-            case 'n':
-                var x = gridpos.x + plot._gridPadding.left - elem.outerWidth(true)/2;
-                var y = gridpos.y + plot._gridPadding.top - opts.tooltipOffset - elem.outerHeight(true) - ms;
-                break;
-            case 'ne':
-                var x = gridpos.x + plot._gridPadding.left + opts.tooltipOffset + fact * ms;
-                var y = gridpos.y + plot._gridPadding.top - opts.tooltipOffset - elem.outerHeight(true) - fact * ms;
-                break;
-            case 'e':
-                var x = gridpos.x + plot._gridPadding.left + opts.tooltipOffset + ms;
-                var y = gridpos.y + plot._gridPadding.top - elem.outerHeight(true)/2;
-                break;
-            case 'se':
-                var x = gridpos.x + plot._gridPadding.left + opts.tooltipOffset + fact * ms;
-                var y = gridpos.y + plot._gridPadding.top + opts.tooltipOffset + fact * ms;
-                break;
-            case 's':
-                var x = gridpos.x + plot._gridPadding.left - elem.outerWidth(true)/2;
-                var y = gridpos.y + plot._gridPadding.top + opts.tooltipOffset + ms;
-                break;
-            case 'sw':
-                var x = gridpos.x + plot._gridPadding.left - elem.outerWidth(true) - opts.tooltipOffset - fact * ms;
-                var y = gridpos.y + plot._gridPadding.top + opts.tooltipOffset + fact * ms;
-                break;
-            case 'w':
-                var x = gridpos.x + plot._gridPadding.left - elem.outerWidth(true) - opts.tooltipOffset - ms;
-                var y = gridpos.y + plot._gridPadding.top - elem.outerHeight(true)/2;
-                break;
-            default: // same as 'nw'
-                var x = gridpos.x + plot._gridPadding.left - elem.outerWidth(true) - opts.tooltipOffset - fact * ms;
-                var y = gridpos.y + plot._gridPadding.top - opts.tooltipOffset - elem.outerHeight(true) - fact * ms;
-                break;
-        }
-        elem.css('left', x);
-        elem.css('top', y);
-        if (opts.fadeTooltip) {
-            // Fix for stacked up animations.  Thnanks Trevor!
-            elem.stop(true,true).fadeIn(opts.tooltipFadeSpeed);
-        }
-        else {
-            elem.show();
-        }
-        elem = null;
-        
-    }
-    
-    function handleMove(ev, gridpos, datapos, neighbor, plot) {
-        var hl = plot.plugins.highlighter;
-        var c = plot.plugins.cursor;
-        if (hl.show) {
-            if (neighbor == null && hl.isHighlighting) {
-                var evt = jQuery.Event('jqplotHighlighterUnhighlight');
-                plot.target.trigger(evt);
-
-                var ctx = hl.highlightCanvas._ctx;
-                ctx.clearRect(0, 0, ctx.canvas.width, ctx.canvas.height);
-                if (hl.fadeTooltip) {
-                    hl._tooltipElem.fadeOut(hl.tooltipFadeSpeed);
-                }
-                else {
-                    hl._tooltipElem.hide();
-                }
-                if (hl.bringSeriesToFront) {
-                    plot.restorePreviousSeriesOrder();
-                }
-                hl.isHighlighting = false;
-                hl.currentNeighbor = null;
-                ctx = null;
-            }
-            else if (neighbor != null && plot.series[neighbor.seriesIndex].showHighlight && !hl.isHighlighting) {
-                var evt = jQuery.Event('jqplotHighlighterHighlight');
-                evt.which = ev.which;
-                evt.pageX = ev.pageX;
-                evt.pageY = ev.pageY;
-                var ins = [neighbor.seriesIndex, neighbor.pointIndex, neighbor.data, plot];
-                plot.target.trigger(evt, ins);
-
-                hl.isHighlighting = true;
-                hl.currentNeighbor = neighbor;
-                if (hl.showMarker) {
-                    draw(plot, neighbor);
-                }
-                if (plot.series[neighbor.seriesIndex].show && hl.showTooltip && (!c || !c._zoom.started)) {
-                    showTooltip(plot, plot.series[neighbor.seriesIndex], neighbor);
-                }
-                if (hl.bringSeriesToFront) {
-                    plot.moveSeriesToFront(neighbor.seriesIndex);
-                }
-            }
-            // check to see if we're highlighting the wrong point.
-            else if (neighbor != null && hl.isHighlighting && hl.currentNeighbor != neighbor) {
-                // highlighting the wrong point.
-
-                // if new series allows highlighting, highlight new point.
-                if (plot.series[neighbor.seriesIndex].showHighlight) {
-                    var ctx = hl.highlightCanvas._ctx;
-                    ctx.clearRect(0, 0, ctx.canvas.width, ctx.canvas.height);
-                    hl.isHighlighting = true;
-                    hl.currentNeighbor = neighbor;
-                    if (hl.showMarker) {
-                        draw(plot, neighbor);
-                    }
-                    if (plot.series[neighbor.seriesIndex].show && hl.showTooltip && (!c || !c._zoom.started)) {
-                        showTooltip(plot, plot.series[neighbor.seriesIndex], neighbor);
-                    }
-                    if (hl.bringSeriesToFront) {
-                        plot.moveSeriesToFront(neighbor.seriesIndex);
-                    }                    
-                }                
-            }
-        }
-    }
-})(jQuery);
\ No newline at end of file
diff --git a/#pma/js/jqplot/plugins/jqplot.pieRenderer.js b/#pma/js/jqplot/plugins/jqplot.pieRenderer.js
deleted file mode 100644
index 1d508bd6..00000000
--- a/#pma/js/jqplot/plugins/jqplot.pieRenderer.js
+++ /dev/null
@@ -1,904 +0,0 @@
-/**
- * jqPlot
- * Pure JavaScript plotting plugin using jQuery
- *
- * Version: 1.0.8
- * Revision: 1250
- *
- * Copyright (c) 2009-2013 Chris Leonello
- * jqPlot is currently available for use in all personal or commercial projects 
- * under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL 
- * version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can 
- * choose the license that best suits your project and use it accordingly. 
- *
- * Although not required, the author would appreciate an email letting him 
- * know of any substantial use of jqPlot.  You can reach the author at: 
- * chris at jqplot dot com or see http://www.jqplot.com/info.php .
- *
- * If you are feeling kind and generous, consider supporting the project by
- * making a donation at: http://www.jqplot.com/donate.php .
- *
- * sprintf functions contained in jqplot.sprintf.js by Ash Searle:
- *
- *     version 2007.04.27
- *     author Ash Searle
- *     http://hexmen.com/blog/2007/03/printf-sprintf/
- *     http://hexmen.com/js/sprintf.js
- *     The author (Ash Searle) has placed this code in the public domain:
- *     "This code is unrestricted: you are free to use it however you like."
- * 
- */
-(function($) {
-    /**
-     * Class: $.jqplot.PieRenderer
-     * Plugin renderer to draw a pie chart.
-     * x values, if present, will be used as slice labels.
-     * y values give slice size.
-     * 
-     * To use this renderer, you need to include the 
-     * pie renderer plugin, for example:
-     * 
-     * > <script type="text/javascript" src="plugins/jqplot.pieRenderer.js"></script>
-     * 
-     * Properties described here are passed into the $.jqplot function
-     * as options on the series renderer.  For example:
-     * 
-     * > plot2 = $.jqplot('chart2', [s1, s2], {
-     * >     seriesDefaults: {
-     * >         renderer:$.jqplot.PieRenderer,
-     * >         rendererOptions:{
-     * >              sliceMargin: 2,
-     * >              startAngle: -90
-     * >          }
-     * >      }
-     * > });
-     * 
-     * A pie plot will trigger events on the plot target
-     * according to user interaction.  All events return the event object,
-     * the series index, the point (slice) index, and the point data for 
-     * the appropriate slice.
-     * 
-     * 'jqplotDataMouseOver' - triggered when user mouseing over a slice.
-     * 'jqplotDataHighlight' - triggered the first time user mouses over a slice,
-     * if highlighting is enabled.
-     * 'jqplotDataUnhighlight' - triggered when a user moves the mouse out of
-     * a highlighted slice.
-     * 'jqplotDataClick' - triggered when the user clicks on a slice.
-     * 'jqplotDataRightClick' - tiggered when the user right clicks on a slice if
-     * the "captureRightClick" option is set to true on the plot.
-     */
-    $.jqplot.PieRenderer = function(){
-        $.jqplot.LineRenderer.call(this);
-    };
-    
-    $.jqplot.PieRenderer.prototype = new $.jqplot.LineRenderer();
-    $.jqplot.PieRenderer.prototype.constructor = $.jqplot.PieRenderer;
-    
-    // called with scope of a series
-    $.jqplot.PieRenderer.prototype.init = function(options, plot) {
-        // Group: Properties
-        //
-        // prop: diameter
-        // Outer diameter of the pie, auto computed by default
-        this.diameter = null;
-        // prop: padding
-        // padding between the pie and plot edges, legend, etc.
-        this.padding = 20;
-        // prop: sliceMargin
-        // angular spacing between pie slices in degrees.
-        this.sliceMargin = 0;
-        // prop: fill
-        // true or false, whether to fil the slices.
-        this.fill = true;
-        // prop: shadowOffset
-        // offset of the shadow from the slice and offset of 
-        // each succesive stroke of the shadow from the last.
-        this.shadowOffset = 2;
-        // prop: shadowAlpha
-        // transparency of the shadow (0 = transparent, 1 = opaque)
-        this.shadowAlpha = 0.07;
-        // prop: shadowDepth
-        // number of strokes to apply to the shadow, 
-        // each stroke offset shadowOffset from the last.
-        this.shadowDepth = 5;
-        // prop: highlightMouseOver
-        // True to highlight slice when moused over.
-        // This must be false to enable highlightMouseDown to highlight when clicking on a slice.
-        this.highlightMouseOver = true;
-        // prop: highlightMouseDown
-        // True to highlight when a mouse button is pressed over a slice.
-        // This will be disabled if highlightMouseOver is true.
-        this.highlightMouseDown = false;
-        // prop: highlightColors
-        // an array of colors to use when highlighting a slice.
-        this.highlightColors = [];
-        // prop: dataLabels
-        // Either 'label', 'value', 'percent' or an array of labels to place on the pie slices.
-        // Defaults to percentage of each pie slice.
-        this.dataLabels = 'percent';
-        // prop: showDataLabels
-        // true to show data labels on slices.
-        this.showDataLabels = false;
-        // prop: dataLabelFormatString
-        // Format string for data labels.  If none, '%s' is used for "label" and for arrays, '%d' for value and '%d%%' for percentage.
-        this.dataLabelFormatString = null;
-        // prop: dataLabelThreshold
-        // Threshhold in percentage (0-100) of pie area, below which no label will be displayed.
-        // This applies to all label types, not just to percentage labels.
-        this.dataLabelThreshold = 3;
-        // prop: dataLabelPositionFactor
-        // A Multiplier (0-1) of the pie radius which controls position of label on slice.
-        // Increasing will slide label toward edge of pie, decreasing will slide label toward center of pie.
-        this.dataLabelPositionFactor = 0.52;
-        // prop: dataLabelNudge
-        // Number of pixels to slide the label away from (+) or toward (-) the center of the pie.
-        this.dataLabelNudge = 2;
-        // prop: dataLabelCenterOn
-        // True to center the data label at its position.
-        // False to set the inside facing edge of the label at its position.
-        this.dataLabelCenterOn = true;
-        // prop: startAngle
-        // Angle to start drawing pie in degrees.  
-        // According to orientation of canvas coordinate system:
-        // 0 = on the positive x axis
-        // -90 = on the positive y axis.
-        // 90 = on the negaive y axis.
-        // 180 or - 180 = on the negative x axis.
-        this.startAngle = 0;
-        this.tickRenderer = $.jqplot.PieTickRenderer;
-        // Used as check for conditions where pie shouldn't be drawn.
-        this._drawData = true;
-        this._type = 'pie';
-        
-        // if user has passed in highlightMouseDown option and not set highlightMouseOver, disable highlightMouseOver
-        if (options.highlightMouseDown && options.highlightMouseOver == null) {
-            options.highlightMouseOver = false;
-        }
-        
-        $.extend(true, this, options);
-
-        if (this.sliceMargin < 0) {
-            this.sliceMargin = 0;
-        }
-
-        this._diameter = null;
-        this._radius = null;
-        // array of [start,end] angles arrays, one for each slice.  In radians.
-        this._sliceAngles = [];
-        // index of the currenty highlighted point, if any
-        this._highlightedPoint = null;
-        
-        // set highlight colors if none provided
-        if (this.highlightColors.length == 0) {
-            for (var i=0; i<this.seriesColors.length; i++){
-                var rgba = $.jqplot.getColorComponents(this.seriesColors[i]);
-                var newrgb = [rgba[0], rgba[1], rgba[2]];
-                var sum = newrgb[0] + newrgb[1] + newrgb[2];
-                for (var j=0; j<3; j++) {
-                    // when darkening, lowest color component can be is 60.
-                    newrgb[j] = (sum > 570) ?  newrgb[j] * 0.8 : newrgb[j] + 0.3 * (255 - newrgb[j]);
-                    newrgb[j] = parseInt(newrgb[j], 10);
-                }
-                this.highlightColors.push('rgb('+newrgb[0]+','+newrgb[1]+','+newrgb[2]+')');
-            }
-        }
-        
-        this.highlightColorGenerator = new $.jqplot.ColorGenerator(this.highlightColors);
-        
-        plot.postParseOptionsHooks.addOnce(postParseOptions);
-        plot.postInitHooks.addOnce(postInit);
-        plot.eventListenerHooks.addOnce('jqplotMouseMove', handleMove);
-        plot.eventListenerHooks.addOnce('jqplotMouseDown', handleMouseDown);
-        plot.eventListenerHooks.addOnce('jqplotMouseUp', handleMouseUp);
-        plot.eventListenerHooks.addOnce('jqplotClick', handleClick);
-        plot.eventListenerHooks.addOnce('jqplotRightClick', handleRightClick);
-        plot.postDrawHooks.addOnce(postPlotDraw);
-    };
-    
-    $.jqplot.PieRenderer.prototype.setGridData = function(plot) {
-        // set gridData property.  This will hold angle in radians of each data point.
-        var stack = [];
-        var td = [];
-        var sa = this.startAngle/180*Math.PI;
-        var tot = 0;
-        // don't know if we have any valid data yet, so set plot to not draw.
-        this._drawData = false;
-        for (var i=0; i<this.data.length; i++){
-            if (this.data[i][1] != 0) {
-                // we have data, O.K. to draw.
-                this._drawData = true;
-            }
-            stack.push(this.data[i][1]);
-            td.push([this.data[i][0]]);
-            if (i>0) {
-                stack[i] += stack[i-1];
-            }
-            tot += this.data[i][1];
-        }
-        var fact = Math.PI*2/stack[stack.length - 1];
-        
-        for (var i=0; i<stack.length; i++) {
-            td[i][1] = stack[i] * fact;
-            td[i][2] = this.data[i][1]/tot;
-        }
-        this.gridData = td;
-    };
-    
-    $.jqplot.PieRenderer.prototype.makeGridData = function(data, plot) {
-        var stack = [];
-        var td = [];
-        var tot = 0;
-        var sa = this.startAngle/180*Math.PI;
-        // don't know if we have any valid data yet, so set plot to not draw.
-        this._drawData = false;
-        for (var i=0; i<data.length; i++){
-            if (this.data[i][1] != 0) {
-                // we have data, O.K. to draw.
-                this._drawData = true;
-            }
-            stack.push(data[i][1]);
-            td.push([data[i][0]]);
-            if (i>0) {
-                stack[i] += stack[i-1];
-            }
-            tot += data[i][1];
-        }
-        var fact = Math.PI*2/stack[stack.length - 1];
-        
-        for (var i=0; i<stack.length; i++) {
-            td[i][1] = stack[i] * fact;
-            td[i][2] = data[i][1]/tot;
-        }
-        return td;
-    };
-
-    function calcRadiusAdjustment(ang) {
-        return Math.sin((ang - (ang-Math.PI) / 8 / Math.PI )/2.0);
-    }
-
-    function calcRPrime(ang1, ang2, sliceMargin, fill, lineWidth) {
-        var rprime = 0;
-        var ang = ang2 - ang1;
-        var absang = Math.abs(ang);
-        var sm = sliceMargin;
-        if (fill == false) {
-            sm += lineWidth;
-        }
-
-        if (sm > 0 && absang > 0.01 && absang < 6.282) {
-            rprime = parseFloat(sm) / 2.0 / calcRadiusAdjustment(ang);
-        }
-
-        return rprime;
-    }
-    
-    $.jqplot.PieRenderer.prototype.drawSlice = function (ctx, ang1, ang2, color, isShadow) {
-        if (this._drawData) {
-            var r = this._radius;
-            var fill = this.fill;
-            var lineWidth = this.lineWidth;
-            var sm = this.sliceMargin;
-            if (this.fill == false) {
-                sm += this.lineWidth;
-            }
-            ctx.save();
-            ctx.translate(this._center[0], this._center[1]);
-            
-            var rprime = calcRPrime(ang1, ang2, this.sliceMargin, this.fill, this.lineWidth);
-
-            var transx = rprime * Math.cos((ang1 + ang2) / 2.0);
-            var transy = rprime * Math.sin((ang1 + ang2) / 2.0);
-
-            if ((ang2 - ang1) <= Math.PI) {
-                r -= rprime;  
-            }
-            else {
-                r += rprime;
-            }
-
-            ctx.translate(transx, transy);
-            
-            if (isShadow) {
-                for (var i=0, l=this.shadowDepth; i<l; i++) {
-                    ctx.save();
-                    ctx.translate(this.shadowOffset*Math.cos(this.shadowAngle/180*Math.PI), this.shadowOffset*Math.sin(this.shadowAngle/180*Math.PI));
-                    doDraw(r);
-                }
-                for (var i=0, l=this.shadowDepth; i<l; i++) {
-                    ctx.restore();
-                }
-            }
-    
-            else {
-                doDraw(r);
-            }
-            ctx.restore();
-        }
-    
-        function doDraw (rad) {
-            // Fix for IE and Chrome that can't seem to draw circles correctly.
-            // ang2 should always be <= 2 pi since that is the way the data is converted.
-            // 2Pi = 6.2831853, Pi = 3.1415927
-             if (ang2 > 6.282 + this.startAngle) {
-                ang2 = 6.282 + this.startAngle;
-                if (ang1 > ang2) {
-                    ang1 = 6.281 + this.startAngle;
-                }
-            }
-            // Fix for IE, where it can't seem to handle 0 degree angles.  Also avoids
-            // ugly line on unfilled pies.
-            if (ang1 >= ang2) {
-                return;
-            }            
-        
-            ctx.beginPath();  
-            ctx.fillStyle = color;
-            ctx.strokeStyle = color;
-            ctx.lineWidth = lineWidth;
-            ctx.arc(0, 0, rad, ang1, ang2, false);
-            ctx.lineTo(0,0);
-            ctx.closePath();
-        
-            if (fill) {
-                ctx.fill();
-            }
-            else {
-                ctx.stroke();
-            }
-        }
-    };
-    
-    // called with scope of series
-    $.jqplot.PieRenderer.prototype.draw = function (ctx, gd, options, plot) {
-        var i;
-        var opts = (options != undefined) ? options : {};
-        // offset and direction of offset due to legend placement
-        var offx = 0;
-        var offy = 0;
-        var trans = 1;
-        var colorGenerator = new $.jqplot.ColorGenerator(this.seriesColors);
-        if (options.legendInfo && options.legendInfo.placement == 'insideGrid') {
-            var li = options.legendInfo;
-            switch (li.location) {
-                case 'nw':
-                    offx = li.width + li.xoffset;
-                    break;
-                case 'w':
-                    offx = li.width + li.xoffset;
-                    break;
-                case 'sw':
-                    offx = li.width + li.xoffset;
-                    break;
-                case 'ne':
-                    offx = li.width + li.xoffset;
-                    trans = -1;
-                    break;
-                case 'e':
-                    offx = li.width + li.xoffset;
-                    trans = -1;
-                    break;
-                case 'se':
-                    offx = li.width + li.xoffset;
-                    trans = -1;
-                    break;
-                case 'n':
-                    offy = li.height + li.yoffset;
-                    break;
-                case 's':
-                    offy = li.height + li.yoffset;
-                    trans = -1;
-                    break;
-                default:
-                    break;
-            }
-        }
-        
-        var shadow = (opts.shadow != undefined) ? opts.shadow : this.shadow;
-        var fill = (opts.fill != undefined) ? opts.fill : this.fill;
-        var cw = ctx.canvas.width;
-        var ch = ctx.canvas.height;
-        var w = cw - offx - 2 * this.padding;
-        var h = ch - offy - 2 * this.padding;
-        var mindim = Math.min(w,h);
-        var d = mindim;
-        
-        // Fixes issue #272.  Thanks hugwijst!
-        // reset slice angles array.
-        this._sliceAngles = [];
-
-        var sm = this.sliceMargin;
-        if (this.fill == false) {
-            sm += this.lineWidth;
-        }
-        
-        var rprime;
-        var maxrprime = 0;
-
-        var ang, ang1, ang2, shadowColor;
-        var sa = this.startAngle / 180 * Math.PI;
-
-        // have to pre-draw shadows, so loop throgh here and calculate some values also.
-        for (var i=0, l=gd.length; i<l; i++) {
-            ang1 = (i == 0) ? sa : gd[i-1][1] + sa;
-            ang2 = gd[i][1] + sa;
-
-            this._sliceAngles.push([ang1, ang2]);
-
-            rprime = calcRPrime(ang1, ang2, this.sliceMargin, this.fill, this.lineWidth);
-
-            if (Math.abs(ang2-ang1) > Math.PI) {
-                maxrprime = Math.max(rprime, maxrprime);  
-            }
-        }
-
-        if (this.diameter != null && this.diameter > 0) {
-            this._diameter = this.diameter - 2*maxrprime;
-        }
-        else {
-            this._diameter = d - 2*maxrprime;
-        }
-
-        // Need to check for undersized pie.  This can happen if
-        // plot area too small and legend is too big.
-        if (this._diameter < 6) {
-            $.jqplot.log('Diameter of pie too small, not rendering.');
-            return;
-        }
-
-        var r = this._radius = this._diameter/2;
-
-        this._center = [(cw - trans * offx)/2 + trans * offx + maxrprime * Math.cos(sa), (ch - trans*offy)/2 + trans * offy + maxrprime * Math.sin(sa)];
-
-        if (this.shadow) {
-            for (var i=0, l=gd.length; i<l; i++) {
-                shadowColor = 'rgba(0,0,0,'+this.shadowAlpha+')';
-                this.renderer.drawSlice.call (this, ctx, this._sliceAngles[i][0], this._sliceAngles[i][1], shadowColor, true);
-            }
-        }
-        
-        for (var i=0; i<gd.length; i++) {
-                      
-            this.renderer.drawSlice.call (this, ctx, this._sliceAngles[i][0], this._sliceAngles[i][1], colorGenerator.next(), false);
-        
-            if (this.showDataLabels && gd[i][2]*100 >= this.dataLabelThreshold) {
-                var fstr, avgang = (this._sliceAngles[i][0] + this._sliceAngles[i][1])/2, label;
-            
-                if (this.dataLabels == 'label') {
-                    fstr = this.dataLabelFormatString || '%s';
-                    label = $.jqplot.sprintf(fstr, gd[i][0]);
-                }
-                else if (this.dataLabels == 'value') {
-                    fstr = this.dataLabelFormatString || '%d';
-                    label = $.jqplot.sprintf(fstr, this.data[i][1]);
-                }
-                else if (this.dataLabels == 'percent') {
-                    fstr = this.dataLabelFormatString || '%d%%';
-                    label = $.jqplot.sprintf(fstr, gd[i][2]*100);
-                }
-                else if (this.dataLabels.constructor == Array) {
-                    fstr = this.dataLabelFormatString || '%s';
-                    label = $.jqplot.sprintf(fstr, this.dataLabels[i]);
-                }
-            
-                var fact = (this._radius ) * this.dataLabelPositionFactor + this.sliceMargin + this.dataLabelNudge;
-            
-                var x = this._center[0] + Math.cos(avgang) * fact + this.canvas._offsets.left;
-                var y = this._center[1] + Math.sin(avgang) * fact + this.canvas._offsets.top;
-            
-                var labelelem = $('<div class="jqplot-pie-series jqplot-data-label" style="position:absolute;">' + label + '</div>').insertBefore(plot.eventCanvas._elem);
-                if (this.dataLabelCenterOn) {
-                    x -= labelelem.width()/2;
-                    y -= labelelem.height()/2;
-                }
-                else {
-                    x -= labelelem.width() * Math.sin(avgang/2);
-                    y -= labelelem.height()/2;
-                }
-                x = Math.round(x);
-                y = Math.round(y);
-                labelelem.css({left: x, top: y});
-            }
-        }            
-    };
-    
-    $.jqplot.PieAxisRenderer = function() {
-        $.jqplot.LinearAxisRenderer.call(this);
-    };
-    
-    $.jqplot.PieAxisRenderer.prototype = new $.jqplot.LinearAxisRenderer();
-    $.jqplot.PieAxisRenderer.prototype.constructor = $.jqplot.PieAxisRenderer;
-        
-    
-    // There are no traditional axes on a pie chart.  We just need to provide
-    // dummy objects with properties so the plot will render.
-    // called with scope of axis object.
-    $.jqplot.PieAxisRenderer.prototype.init = function(options){
-        //
-        this.tickRenderer = $.jqplot.PieTickRenderer;
-        $.extend(true, this, options);
-        // I don't think I'm going to need _dataBounds here.
-        // have to go Axis scaling in a way to fit chart onto plot area
-        // and provide u2p and p2u functionality for mouse cursor, etc.
-        // for convienence set _dataBounds to 0 and 100 and
-        // set min/max to 0 and 100.
-        this._dataBounds = {min:0, max:100};
-        this.min = 0;
-        this.max = 100;
-        this.showTicks = false;
-        this.ticks = [];
-        this.showMark = false;
-        this.show = false; 
-    };
-    
-    
-    
-    
-    $.jqplot.PieLegendRenderer = function(){
-        $.jqplot.TableLegendRenderer.call(this);
-    };
-    
-    $.jqplot.PieLegendRenderer.prototype = new $.jqplot.TableLegendRenderer();
-    $.jqplot.PieLegendRenderer.prototype.constructor = $.jqplot.PieLegendRenderer;
-    
-    /**
-     * Class: $.jqplot.PieLegendRenderer
-     * Legend Renderer specific to pie plots.  Set by default
-     * when user creates a pie plot.
-     */
-    $.jqplot.PieLegendRenderer.prototype.init = function(options) {
-        // Group: Properties
-        //
-        // prop: numberRows
-        // Maximum number of rows in the legend.  0 or null for unlimited.
-        this.numberRows = null;
-        // prop: numberColumns
-        // Maximum number of columns in the legend.  0 or null for unlimited.
-        this.numberColumns = null;
-        $.extend(true, this, options);
-    };
-    
-    // called with context of legend
-    $.jqplot.PieLegendRenderer.prototype.draw = function() {
-        var legend = this;
-        if (this.show) {
-            var series = this._series;
-
-
-            this._elem = $(document.createElement('table'));
-            this._elem.addClass('jqplot-table-legend');
-
-            var ss = {position:'absolute'};
-            if (this.background) {
-                ss['background'] = this.background;
-            }
-            if (this.border) {
-                ss['border'] = this.border;
-            }
-            if (this.fontSize) {
-                ss['fontSize'] = this.fontSize;
-            }
-            if (this.fontFamily) {
-                ss['fontFamily'] = this.fontFamily;
-            }
-            if (this.textColor) {
-                ss['textColor'] = this.textColor;
-            }
-            if (this.marginTop != null) {
-                ss['marginTop'] = this.marginTop;
-            }
-            if (this.marginBottom != null) {
-                ss['marginBottom'] = this.marginBottom;
-            }
-            if (this.marginLeft != null) {
-                ss['marginLeft'] = this.marginLeft;
-            }
-            if (this.marginRight != null) {
-                ss['marginRight'] = this.marginRight;
-            }
-
-            this._elem.css(ss);
-
-            // Pie charts legends don't go by number of series, but by number of data points
-            // in the series.  Refactor things here for that.
-            
-            var pad = false, 
-                reverse = false,
-                nr, 
-                nc;
-            var s = series[0];
-            var colorGenerator = new $.jqplot.ColorGenerator(s.seriesColors);
-            
-            if (s.show) {
-                var pd = s.data;
-                if (this.numberRows) {
-                    nr = this.numberRows;
-                    if (!this.numberColumns){
-                        nc = Math.ceil(pd.length/nr);
-                    }
-                    else{
-                        nc = this.numberColumns;
-                    }
-                }
-                else if (this.numberColumns) {
-                    nc = this.numberColumns;
-                    nr = Math.ceil(pd.length/this.numberColumns);
-                }
-                else {
-                    nr = pd.length;
-                    nc = 1;
-                }
-                
-                var i, j;
-                var tr, td1, td2; 
-                var lt, rs, color;
-                var idx = 0; 
-                var div0, div1;   
-                
-                for (i=0; i<nr; i++) {
-                    tr = $(document.createElement('tr'));
-                    tr.addClass('jqplot-table-legend');
-                    
-                    if (reverse){
-                        tr.prependTo(this._elem);
-                    }
-                    
-                    else{
-                        tr.appendTo(this._elem);
-                    }
-                    
-                    for (j=0; j<nc; j++) {
-                        if (idx < pd.length){
-                            lt = this.labels[idx] || pd[idx][0].toString();
-                            color = colorGenerator.next();
-                            if (!reverse){
-                                if (i>0){
-                                    pad = true;
-                                }
-                                else{
-                                    pad = false;
-                                }
-                            }
-                            else{
-                                if (i == nr -1){
-                                    pad = false;
-                                }
-                                else{
-                                    pad = true;
-                                }
-                            }
-                            rs = (pad) ? this.rowSpacing : '0';
-
-
-
-                            td1 = $(document.createElement('td'));
-                            td1.addClass('jqplot-table-legend jqplot-table-legend-swatch');
-                            td1.css({textAlign: 'center', paddingTop: rs});
-
-                            div0 = $(document.createElement('div'));
-                            div0.addClass('jqplot-table-legend-swatch-outline');
-                            div1 = $(document.createElement('div'));
-                            div1.addClass('jqplot-table-legend-swatch');
-                            div1.css({backgroundColor: color, borderColor: color});
-                            td1.append(div0.append(div1));
-
-                            td2 = $(document.createElement('td'));
-                            td2.addClass('jqplot-table-legend jqplot-table-legend-label');
-                            td2.css('paddingTop', rs);
-
-                            if (this.escapeHtml){
-                                td2.text(lt);
-                            }
-                            else {
-                                td2.html(lt);
-                            }
-                            if (reverse) {
-                                td2.prependTo(tr);
-                                td1.prependTo(tr);
-                            }
-                            else {
-                                td1.appendTo(tr);
-                                td2.appendTo(tr);
-                            }
-                            pad = true;
-                        }
-                        idx++;
-                    }   
-                }
-            }
-        }
-        return this._elem;                
-    };
-    
-    $.jqplot.PieRenderer.prototype.handleMove = function(ev, gridpos, datapos, neighbor, plot) {
-        if (neighbor) {
-            var ins = [neighbor.seriesIndex, neighbor.pointIndex, neighbor.data];
-            plot.target.trigger('jqplotDataMouseOver', ins);
-            if (plot.series[ins[0]].highlightMouseOver && !(ins[0] == plot.plugins.pieRenderer.highlightedSeriesIndex && ins[1] == plot.series[ins[0]]._highlightedPoint)) {
-                plot.target.trigger('jqplotDataHighlight', ins);
-                highlight (plot, ins[0], ins[1]);
-            }
-        }
-        else if (neighbor == null) {
-            unhighlight (plot);
-        }
-    };
-    
-    
-    // this.eventCanvas._elem.bind($.jqplot.eventListenerHooks[i][0], {plot:this}, $.jqplot.eventListenerHooks[i][1]);
-    
-    // setup default renderers for axes and legend so user doesn't have to
-    // called with scope of plot
-    function preInit(target, data, options) {
-        options = options || {};
-        options.axesDefaults = options.axesDefaults || {};
-        options.legend = options.legend || {};
-        options.seriesDefaults = options.seriesDefaults || {};
-        // only set these if there is a pie series
-        var setopts = false;
-        if (options.seriesDefaults.renderer == $.jqplot.PieRenderer) {
-            setopts = true;
-        }
-        else if (options.series) {
-            for (var i=0; i < options.series.length; i++) {
-                if (options.series[i].renderer == $.jqplot.PieRenderer) {
-                    setopts = true;
-                }
-            }
-        }
-        
-        if (setopts) {
-            options.axesDefaults.renderer = $.jqplot.PieAxisRenderer;
-            options.legend.renderer = $.jqplot.PieLegendRenderer;
-            options.legend.preDraw = true;
-            options.seriesDefaults.pointLabels = {show: false};
-        }
-    }
-    
-    function postInit(target, data, options) {
-        for (var i=0; i<this.series.length; i++) {
-            if (this.series[i].renderer.constructor == $.jqplot.PieRenderer) {
-                // don't allow mouseover and mousedown at same time.
-                if (this.series[i].highlightMouseOver) {
-                    this.series[i].highlightMouseDown = false;
-                }
-            }
-        }
-    }
-    
-    // called with scope of plot
-    function postParseOptions(options) {
-        for (var i=0; i<this.series.length; i++) {
-            this.series[i].seriesColors = this.seriesColors;
-            this.series[i].colorGenerator = $.jqplot.colorGenerator;
-        }
-    }
-    
-    function highlight (plot, sidx, pidx) {
-        var s = plot.series[sidx];
-        var canvas = plot.plugins.pieRenderer.highlightCanvas;
-        canvas._ctx.clearRect(0,0,canvas._ctx.canvas.width, canvas._ctx.canvas.height);
-        s._highlightedPoint = pidx;
-        plot.plugins.pieRenderer.highlightedSeriesIndex = sidx;
-        s.renderer.drawSlice.call(s, canvas._ctx, s._sliceAngles[pidx][0], s._sliceAngles[pidx][1], s.highlightColorGenerator.get(pidx), false);
-    }
-    
-    function unhighlight (plot) {
-        var canvas = plot.plugins.pieRenderer.highlightCanvas;
-        canvas._ctx.clearRect(0,0, canvas._ctx.canvas.width, canvas._ctx.canvas.height);
-        for (var i=0; i<plot.series.length; i++) {
-            plot.series[i]._highlightedPoint = null;
-        }
-        plot.plugins.pieRenderer.highlightedSeriesIndex = null;
-        plot.target.trigger('jqplotDataUnhighlight');
-    }
- 
-    function handleMove(ev, gridpos, datapos, neighbor, plot) {
-        if (neighbor) {
-            var ins = [neighbor.seriesIndex, neighbor.pointIndex, neighbor.data];
-            var evt1 = jQuery.Event('jqplotDataMouseOver');
-            evt1.pageX = ev.pageX;
-            evt1.pageY = ev.pageY;
-            plot.target.trigger(evt1, ins);
-            if (plot.series[ins[0]].highlightMouseOver && !(ins[0] == plot.plugins.pieRenderer.highlightedSeriesIndex && ins[1] == plot.series[ins[0]]._highlightedPoint)) {
-                var evt = jQuery.Event('jqplotDataHighlight');
-                evt.which = ev.which;
-                evt.pageX = ev.pageX;
-                evt.pageY = ev.pageY;
-                plot.target.trigger(evt, ins);
-                highlight (plot, ins[0], ins[1]);
-            }
-        }
-        else if (neighbor == null) {
-            unhighlight (plot);
-        }
-    } 
-    
-    function handleMouseDown(ev, gridpos, datapos, neighbor, plot) {
-        if (neighbor) {
-            var ins = [neighbor.seriesIndex, neighbor.pointIndex, neighbor.data];
-            if (plot.series[ins[0]].highlightMouseDown && !(ins[0] == plot.plugins.pieRenderer.highlightedSeriesIndex && ins[1] == plot.series[ins[0]]._highlightedPoint)) {
-                var evt = jQuery.Event('jqplotDataHighlight');
-                evt.which = ev.which;
-                evt.pageX = ev.pageX;
-                evt.pageY = ev.pageY;
-                plot.target.trigger(evt, ins);
-                highlight (plot, ins[0], ins[1]);
-            }
-        }
-        else if (neighbor == null) {
-            unhighlight (plot);
-        }
-    }
-    
-    function handleMouseUp(ev, gridpos, datapos, neighbor, plot) {
-        var idx = plot.plugins.pieRenderer.highlightedSeriesIndex;
-        if (idx != null && plot.series[idx].highlightMouseDown) {
-            unhighlight(plot);
-        }
-    }
-    
-    function handleClick(ev, gridpos, datapos, neighbor, plot) {
-        if (neighbor) {
-            var ins = [neighbor.seriesIndex, neighbor.pointIndex, neighbor.data];
-            var evt = jQuery.Event('jqplotDataClick');
-            evt.which = ev.which;
-            evt.pageX = ev.pageX;
-            evt.pageY = ev.pageY;
-            plot.target.trigger(evt, ins);
-        }
-    }
-    
-    function handleRightClick(ev, gridpos, datapos, neighbor, plot) {
-        if (neighbor) {
-            var ins = [neighbor.seriesIndex, neighbor.pointIndex, neighbor.data];
-            var idx = plot.plugins.pieRenderer.highlightedSeriesIndex;
-            if (idx != null && plot.series[idx].highlightMouseDown) {
-                unhighlight(plot);
-            }
-            var evt = jQuery.Event('jqplotDataRightClick');
-            evt.which = ev.which;
-            evt.pageX = ev.pageX;
-            evt.pageY = ev.pageY;
-            plot.target.trigger(evt, ins);
-        }
-    }    
-    
-    // called within context of plot
-    // create a canvas which we can draw on.
-    // insert it before the eventCanvas, so eventCanvas will still capture events.
-    function postPlotDraw() {
-        // Memory Leaks patch    
-        if (this.plugins.pieRenderer && this.plugins.pieRenderer.highlightCanvas) {
-            this.plugins.pieRenderer.highlightCanvas.resetCanvas();
-            this.plugins.pieRenderer.highlightCanvas = null;
-        }
-
-        this.plugins.pieRenderer = {highlightedSeriesIndex:null};
-        this.plugins.pieRenderer.highlightCanvas = new $.jqplot.GenericCanvas();
-        
-        // do we have any data labels?  if so, put highlight canvas before those
-        var labels = $(this.targetId+' .jqplot-data-label');
-        if (labels.length) {
-            $(labels[0]).before(this.plugins.pieRenderer.highlightCanvas.createElement(this._gridPadding, 'jqplot-pieRenderer-highlight-canvas', this._plotDimensions, this));
-        }
-        // else put highlight canvas before event canvas.
-        else {
-            this.eventCanvas._elem.before(this.plugins.pieRenderer.highlightCanvas.createElement(this._gridPadding, 'jqplot-pieRenderer-highlight-canvas', this._plotDimensions, this));
-        }
-        
-        var hctx = this.plugins.pieRenderer.highlightCanvas.setContext();
-        this.eventCanvas._elem.bind('mouseleave', {plot:this}, function (ev) { unhighlight(ev.data.plot); });
-    }
-    
-    $.jqplot.preInitHooks.push(preInit);
-    
-    $.jqplot.PieTickRenderer = function() {
-        $.jqplot.AxisTickRenderer.call(this);
-    };
-    
-    $.jqplot.PieTickRenderer.prototype = new $.jqplot.AxisTickRenderer();
-    $.jqplot.PieTickRenderer.prototype.constructor = $.jqplot.PieTickRenderer;
-    
-})(jQuery);
-    
-    
\ No newline at end of file
diff --git a/#pma/js/jqplot/plugins/jqplot.pointLabels.js b/#pma/js/jqplot/plugins/jqplot.pointLabels.js
deleted file mode 100644
index 4edc69e4..00000000
--- a/#pma/js/jqplot/plugins/jqplot.pointLabels.js
+++ /dev/null
@@ -1,377 +0,0 @@
-/**
- * jqPlot
- * Pure JavaScript plotting plugin using jQuery
- *
- * Version: 1.0.8
- * Revision: 1250
- *
- * Copyright (c) 2009-2013 Chris Leonello
- * jqPlot is currently available for use in all personal or commercial projects 
- * under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL 
- * version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can 
- * choose the license that best suits your project and use it accordingly. 
- *
- * Although not required, the author would appreciate an email letting him 
- * know of any substantial use of jqPlot.  You can reach the author at: 
- * chris at jqplot dot com or see http://www.jqplot.com/info.php .
- *
- * If you are feeling kind and generous, consider supporting the project by
- * making a donation at: http://www.jqplot.com/donate.php .
- *
- * sprintf functions contained in jqplot.sprintf.js by Ash Searle:
- *
- *     version 2007.04.27
- *     author Ash Searle
- *     http://hexmen.com/blog/2007/03/printf-sprintf/
- *     http://hexmen.com/js/sprintf.js
- *     The author (Ash Searle) has placed this code in the public domain:
- *     "This code is unrestricted: you are free to use it however you like."
- * 
- */
-(function($) {
-    
-    /**
-     * Class: $.jqplot.PointLabels
-     * Plugin for putting labels at the data points.
-     * 
-     * To use this plugin, include the js
-     * file in your source:
-     * 
-     * > <script type="text/javascript" src="plugins/jqplot.pointLabels.js"></script>
-     * 
-     * By default, the last value in the data ponit array in the data series is used
-     * for the label.  For most series renderers, extra data can be added to the 
-     * data point arrays and the last value will be used as the label.
-     * 
-     * For instance, 
-     * this series:
-     * 
-     * > [[1,4], [3,5], [7,2]]
-     * 
-     * Would, by default, use the y values in the labels.
-     * Extra data can be added to the series like so:
-     * 
-     * > [[1,4,'mid'], [3 5,'hi'], [7,2,'low']]
-     * 
-     * And now the point labels would be 'mid', 'low', and 'hi'.
-     * 
-     * Options to the point labels and a custom labels array can be passed into the
-     * "pointLabels" option on the series option like so:
-     * 
-     * > series:[{pointLabels:{
-     * >    labels:['mid', 'hi', 'low'],
-     * >    location:'se',
-     * >    ypadding: 12
-     * >    }
-     * > }]
-     * 
-     * A custom labels array in the options takes precendence over any labels
-     * in the series data.  If you have a custom labels array in the options,
-     * but still want to use values from the series array as labels, set the
-     * "labelsFromSeries" option to true.
-     * 
-     * By default, html entities (<, >, etc.) are escaped in point labels.  
-     * If you want to include actual html markup in the labels, 
-     * set the "escapeHTML" option to false.
-     * 
-     */
-    $.jqplot.PointLabels = function(options) {
-        // Group: Properties
-        //
-        // prop: show
-        // show the labels or not.
-        this.show = $.jqplot.config.enablePlugins;
-        // prop: location
-        // compass location where to position the label around the point.
-        // 'n', 'ne', 'e', 'se', 's', 'sw', 'w', 'nw'
-        this.location = 'n';
-        // prop: labelsFromSeries
-        // true to use labels within data point arrays.
-        this.labelsFromSeries = false;
-        // prop: seriesLabelIndex
-        // array index for location of labels within data point arrays.
-        // if null, will use the last element of the data point array.
-        this.seriesLabelIndex = null;
-        // prop: labels
-        // array of arrays of labels, one array for each series.
-        this.labels = [];
-        // actual labels that will get displayed.
-        // needed to preserve user specified labels in labels array.
-        this._labels = [];
-        // prop: stackedValue
-        // true to display value as stacked in a stacked plot.
-        // no effect if labels is specified.
-        this.stackedValue = false;
-        // prop: ypadding
-        // vertical padding in pixels between point and label
-        this.ypadding = 6;
-        // prop: xpadding
-        // horizontal padding in pixels between point and label
-        this.xpadding = 6;
-        // prop: escapeHTML
-        // true to escape html entities in the labels.
-        // If you want to include markup in the labels, set to false.
-        this.escapeHTML = true;
-        // prop: edgeTolerance
-        // Number of pixels that the label must be away from an axis
-        // boundary in order to be drawn.  Negative values will allow overlap
-        // with the grid boundaries.
-        this.edgeTolerance = -5;
-        // prop: formatter
-        // A class of a formatter for the tick text.  sprintf by default.
-        this.formatter = $.jqplot.DefaultTickFormatter;
-        // prop: formatString
-        // string passed to the formatter.
-        this.formatString = '';
-        // prop: hideZeros
-        // true to not show a label for a value which is 0.
-        this.hideZeros = false;
-        this._elems = [];
-        
-        $.extend(true, this, options);
-    };
-    
-    var locations = ['nw', 'n', 'ne', 'e', 'se', 's', 'sw', 'w'];
-    var locationIndicies = {'nw':0, 'n':1, 'ne':2, 'e':3, 'se':4, 's':5, 'sw':6, 'w':7};
-    var oppositeLocations = ['se', 's', 'sw', 'w', 'nw', 'n', 'ne', 'e'];
-    
-    // called with scope of a series
-    $.jqplot.PointLabels.init = function (target, data, seriesDefaults, opts, plot){
-        var options = $.extend(true, {}, seriesDefaults, opts);
-        options.pointLabels = options.pointLabels || {};
-        if (this.renderer.constructor === $.jqplot.BarRenderer && this.barDirection === 'horizontal' && !options.pointLabels.location) {
-            options.pointLabels.location = 'e';
-        }
-        // add a pointLabels attribute to the series plugins
-        this.plugins.pointLabels = new $.jqplot.PointLabels(options.pointLabels);
-        this.plugins.pointLabels.setLabels.call(this);
-    };
-    
-    // called with scope of series
-    $.jqplot.PointLabels.prototype.setLabels = function() {   
-        var p = this.plugins.pointLabels; 
-        var labelIdx;
-        if (p.seriesLabelIndex != null) {
-            labelIdx = p.seriesLabelIndex;
-        }
-        else if (this.renderer.constructor === $.jqplot.BarRenderer && this.barDirection === 'horizontal') {
-           labelIdx = (this._plotData[0].length < 3) ? 0 : this._plotData[0].length -1;
-        }
-        else {
-            labelIdx = (this._plotData.length === 0) ? 0 : this._plotData[0].length -1;
-        }
-        p._labels = [];
-        if (p.labels.length === 0 || p.labelsFromSeries) {    
-            if (p.stackedValue) {
-                if (this._plotData.length && this._plotData[0].length){
-                    // var idx = p.seriesLabelIndex || this._plotData[0].length -1;
-                    for (var i=0; i<this._plotData.length; i++) {
-                        p._labels.push(this._plotData[i][labelIdx]);
-                    }
-                }
-            }
-            else {
-                // var d = this._plotData;
-                var d = this.data;
-                if (this.renderer.constructor === $.jqplot.BarRenderer && this.waterfall) {
-                    d = this._data;
-                }
-                if (d.length && d[0].length) {
-                    // var idx = p.seriesLabelIndex || d[0].length -1;
-                    for (var i=0; i<d.length; i++) {
-                        p._labels.push(d[i][labelIdx]);
-                    }
-                }
-                d = null;
-            }
-        }
-        else if (p.labels.length){
-            p._labels = p.labels;
-        }
-    };
-    
-    $.jqplot.PointLabels.prototype.xOffset = function(elem, location, padding) {
-        location = location || this.location;
-        padding = padding || this.xpadding;
-        var offset;
-        
-        switch (location) {
-            case 'nw':
-                offset = -elem.outerWidth(true) - this.xpadding;
-                break;
-            case 'n':
-                offset = -elem.outerWidth(true)/2;
-                break;
-            case 'ne':
-                offset =  this.xpadding;
-                break;
-            case 'e':
-                offset = this.xpadding;
-                break;
-            case 'se':
-                offset = this.xpadding;
-                break;
-            case 's':
-                offset = -elem.outerWidth(true)/2;
-                break;
-            case 'sw':
-                offset = -elem.outerWidth(true) - this.xpadding;
-                break;
-            case 'w':
-                offset = -elem.outerWidth(true) - this.xpadding;
-                break;
-            default: // same as 'nw'
-                offset = -elem.outerWidth(true) - this.xpadding;
-                break;
-        }
-        return offset; 
-    };
-    
-    $.jqplot.PointLabels.prototype.yOffset = function(elem, location, padding) {
-        location = location || this.location;
-        padding = padding || this.xpadding;
-        var offset;
-        
-        switch (location) {
-            case 'nw':
-                offset = -elem.outerHeight(true) - this.ypadding;
-                break;
-            case 'n':
-                offset = -elem.outerHeight(true) - this.ypadding;
-                break;
-            case 'ne':
-                offset = -elem.outerHeight(true) - this.ypadding;
-                break;
-            case 'e':
-                offset = -elem.outerHeight(true)/2;
-                break;
-            case 'se':
-                offset = this.ypadding;
-                break;
-            case 's':
-                offset = this.ypadding;
-                break;
-            case 'sw':
-                offset = this.ypadding;
-                break;
-            case 'w':
-                offset = -elem.outerHeight(true)/2;
-                break;
-            default: // same as 'nw'
-                offset = -elem.outerHeight(true) - this.ypadding;
-                break;
-        }
-        return offset; 
-    };
-    
-    // called with scope of series
-    $.jqplot.PointLabels.draw = function (sctx, options, plot) {
-        var p = this.plugins.pointLabels;
-        // set labels again in case they have changed.
-        p.setLabels.call(this);
-        // remove any previous labels
-        for (var i=0; i<p._elems.length; i++) {
-            // Memory Leaks patch
-            // p._elems[i].remove();
-            p._elems[i].emptyForce();
-        }
-        p._elems.splice(0, p._elems.length);
-
-        if (p.show) {
-            var ax = '_'+this._stackAxis+'axis';
-        
-            if (!p.formatString) {
-                p.formatString = this[ax]._ticks[0].formatString;
-                p.formatter = this[ax]._ticks[0].formatter;
-            }
-        
-            var pd = this._plotData;
-            var ppd = this._prevPlotData;
-            var xax = this._xaxis;
-            var yax = this._yaxis;
-            var elem, helem;
-
-            for (var i=0, l=p._labels.length; i < l; i++) {
-                var label = p._labels[i];
-                
-                if (label == null || (p.hideZeros && parseInt(label, 10) == 0)) {
-                    continue;
-                }
-                
-                label = p.formatter(p.formatString, label);
-
-                helem = document.createElement('div');
-                p._elems[i] = $(helem);
-
-                elem = p._elems[i];
-
-
-                elem.addClass('jqplot-point-label jqplot-series-'+this.index+' jqplot-point-'+i);
-                elem.css('position', 'absolute');
-                elem.insertAfter(sctx.canvas);
-
-                if (p.escapeHTML) {
-                    elem.text(label);
-                }
-                else {
-                    elem.html(label);
-                }
-                var location = p.location;
-                if ((this.fillToZero && pd[i][1] < 0) || (this.fillToZero && this._type === 'bar' && this.barDirection === 'horizontal' && pd[i][0] < 0) || (this.waterfall && parseInt(label, 10)) < 0) {
-                    location = oppositeLocations[locationIndicies[location]];
-                }
-
-
-                var ell = xax.u2p(pd[i][0]) + p.xOffset(elem, location);
-                var elt = yax.u2p(pd[i][1]) + p.yOffset(elem, location);
-
-                // we have stacked chart but are not showing stacked values,
-                // place labels in center.
-                if (this._stack && !p.stackedValue) {
-                    if (this.barDirection === "vertical") {
-                        elt = (this._barPoints[i][0][1] + this._barPoints[i][1][1]) / 2 + plot._gridPadding.top - 0.5 * elem.outerHeight(true);
-                    }
-                    else {
-                        ell = (this._barPoints[i][2][0] + this._barPoints[i][0][0]) / 2 + plot._gridPadding.left - 0.5 * elem.outerWidth(true);
-                    }
-                }
-
-                if (this.renderer.constructor == $.jqplot.BarRenderer) {
-                    if (this.barDirection == "vertical") {
-                        ell += this._barNudge;
-                    }
-                    else {
-                        elt -= this._barNudge;
-                    }
-                }
-                elem.css('left', ell);
-                elem.css('top', elt);
-                var elr = ell + elem.width();
-                var elb = elt + elem.height();
-                var et = p.edgeTolerance;
-                var scl = $(sctx.canvas).position().left;
-                var sct = $(sctx.canvas).position().top;
-                var scr = sctx.canvas.width + scl;
-                var scb = sctx.canvas.height + sct;
-                // if label is outside of allowed area, remove it
-                if (ell - et < scl || elt - et < sct || elr + et > scr || elb + et > scb) {
-                    elem.remove();
-                }
-
-                elem = null;
-                helem = null;
-            }
-
-            // finally, animate them if the series is animated
-            // if (this.renderer.animation && this.renderer.animation._supported && this.renderer.animation.show && plot._drawCount < 2) {
-            //     var sel = '.jqplot-point-label.jqplot-series-'+this.index;
-            //     $(sel).hide();
-            //     $(sel).fadeIn(1000);
-            // }
-
-        }
-    };
-    
-    $.jqplot.postSeriesInitHooks.push($.jqplot.PointLabels.init);
-    $.jqplot.postDrawSeriesHooks.push($.jqplot.PointLabels.draw);
-})(jQuery);
\ No newline at end of file
diff --git a/#pma/js/jquery/MIT-LICENSE.txt b/#pma/js/jquery/MIT-LICENSE.txt
deleted file mode 100644
index 957f26d3..00000000
--- a/#pma/js/jquery/MIT-LICENSE.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-Copyright 2013 jQuery Foundation and other contributors
-http://jquery.com/
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/#pma/js/jquery/additional-methods.js b/#pma/js/jquery/additional-methods.js
deleted file mode 100644
index fc254b7d..00000000
--- a/#pma/js/jquery/additional-methods.js
+++ /dev/null
@@ -1,940 +0,0 @@
-/*!
- * jQuery Validation Plugin v1.13.1
- *
- * http://jqueryvalidation.org/
- *
- * Copyright (c) 2014 Jörn Zaefferer
- * Released under the MIT license
- */
-(function( factory ) {
-    if ( typeof define === "function" && define.amd ) {
-        define( ["jquery", "./jquery.validate"], factory );
-    } else {
-        factory( jQuery );
-    }
-}(function( $ ) {
-
-(function() {
-
-    function stripHtml(value) {
-        // remove html tags and space chars
-        return value.replace(/<.[^<>]*?>/g, " ").replace(/&nbsp;|&#160;/gi, " ")
-        // remove punctuation
-        .replace(/[.(),;:!?%#$'\"_+=\/\-“”’]*/g, "");
-    }
-
-    $.validator.addMethod("maxWords", function(value, element, params) {
-        return this.optional(element) || stripHtml(value).match(/\b\w+\b/g).length <= params;
-    }, $.validator.format("Please enter {0} words or less."));
-
-    $.validator.addMethod("minWords", function(value, element, params) {
-        return this.optional(element) || stripHtml(value).match(/\b\w+\b/g).length >= params;
-    }, $.validator.format("Please enter at least {0} words."));
-
-    $.validator.addMethod("rangeWords", function(value, element, params) {
-        var valueStripped = stripHtml(value),
-            regex = /\b\w+\b/g;
-        return this.optional(element) || valueStripped.match(regex).length >= params[0] && valueStripped.match(regex).length <= params[1];
-    }, $.validator.format("Please enter between {0} and {1} words."));
-
-}());
-
-// Accept a value from a file input based on a required mimetype
-$.validator.addMethod("accept", function(value, element, param) {
-    // Split mime on commas in case we have multiple types we can accept
-    var typeParam = typeof param === "string" ? param.replace(/\s/g, "").replace(/,/g, "|") : "image/*",
-    optionalValue = this.optional(element),
-    i, file;
-
-    // Element is optional
-    if (optionalValue) {
-        return optionalValue;
-    }
-
-    if ($(element).attr("type") === "file") {
-        // If we are using a wildcard, make it regex friendly
-        typeParam = typeParam.replace(/\*/g, ".*");
-
-        // Check if the element has a FileList before checking each file
-        if (element.files && element.files.length) {
-            for (i = 0; i < element.files.length; i++) {
-                file = element.files[i];
-
-                // Grab the mimetype from the loaded file, verify it matches
-                if (!file.type.match(new RegExp( ".?(" + typeParam + ")$", "i"))) {
-                    return false;
-                }
-            }
-        }
-    }
-
-    // Either return true because we've validated each file, or because the
-    // browser does not support element.files and the FileList feature
-    return true;
-}, $.validator.format("Please enter a value with a valid mimetype."));
-
-$.validator.addMethod("alphanumeric", function(value, element) {
-    return this.optional(element) || /^\w+$/i.test(value);
-}, "Letters, numbers, and underscores only please");
-
-/*
- * Dutch bank account numbers (not 'giro' numbers) have 9 digits
- * and pass the '11 check'.
- * We accept the notation with spaces, as that is common.
- * acceptable: 123456789 or 12 34 56 789
- */
-$.validator.addMethod("bankaccountNL", function(value, element) {
-    if (this.optional(element)) {
-        return true;
-    }
-    if (!(/^[0-9]{9}|([0-9]{2} ){3}[0-9]{3}$/.test(value))) {
-        return false;
-    }
-    // now '11 check'
-    var account = value.replace(/ /g, ""), // remove spaces
-        sum = 0,
-        len = account.length,
-        pos, factor, digit;
-    for ( pos = 0; pos < len; pos++ ) {
-        factor = len - pos;
-        digit = account.substring(pos, pos + 1);
-        sum = sum + factor * digit;
-    }
-    return sum % 11 === 0;
-}, "Please specify a valid bank account number");
-
-$.validator.addMethod("bankorgiroaccountNL", function(value, element) {
-    return this.optional(element) ||
-            ($.validator.methods.bankaccountNL.call(this, value, element)) ||
-            ($.validator.methods.giroaccountNL.call(this, value, element));
-}, "Please specify a valid bank or giro account number");
-
-/**
- * BIC is the business identifier code (ISO 9362). This BIC check is not a guarantee for authenticity.
- *
- * BIC pattern: BBBBCCLLbbb (8 or 11 characters long; bbb is optional)
- *
- * BIC definition in detail:
- * - First 4 characters - bank code (only letters)
- * - Next 2 characters - ISO 3166-1 alpha-2 country code (only letters)
- * - Next 2 characters - location code (letters and digits)
- *   a. shall not start with '0' or '1'
- *   b. second character must be a letter ('O' is not allowed) or one of the following digits ('0' for test (therefore not allowed), '1' for passive participant and '2' for active participant)
- * - Last 3 characters - branch code, optional (shall not start with 'X' except in case of 'XXX' for primary office) (letters and digits)
- */
-$.validator.addMethod("bic", function(value, element) {
-    return this.optional( element ) || /^([A-Z]{6}[A-Z2-9][A-NP-Z1-2])(X{3}|[A-WY-Z0-9][A-Z0-9]{2})?$/.test( value );
-}, "Please specify a valid BIC code");
-
-/*
- * Código de identificación fiscal ( CIF ) is the tax identification code for Spanish legal entities
- * Further rules can be found in Spanish on http://es.wikipedia.org/wiki/C%C3%B3digo_de_identificaci%C3%B3n_fiscal
- */
-$.validator.addMethod( "cifES", function( value ) {
-    "use strict";
-
-    var num = [],
-        controlDigit, sum, i, count, tmp, secondDigit;
-
-    value = value.toUpperCase();
-
-    // Quick format test
-    if ( !value.match( "((^[A-Z]{1}[0-9]{7}[A-Z0-9]{1}$|^[T]{1}[A-Z0-9]{8}$)|^[0-9]{8}[A-Z]{1}$)" ) ) {
-        return false;
-    }
-
-    for ( i = 0; i < 9; i++ ) {
-        num[ i ] = parseInt( value.charAt( i ), 10 );
-    }
-
-    // Algorithm for checking CIF codes
-    sum = num[ 2 ] + num[ 4 ] + num[ 6 ];
-    for ( count = 1; count < 8; count += 2 ) {
-        tmp = ( 2 * num[ count ] ).toString();
-        secondDigit = tmp.charAt( 1 );
-
-        sum += parseInt( tmp.charAt( 0 ), 10 ) + ( secondDigit === "" ? 0 : parseInt( secondDigit, 10 ) );
-    }
-
-    /* The first (position 1) is a letter following the following criteria:
-     *    A. Corporations
-     *    B. LLCs
-     *    C. General partnerships
-     *    D. Companies limited partnerships
-     *    E. Communities of goods
-     *    F. Cooperative Societies
-     *    G. Associations
-     *    H. Communities of homeowners in horizontal property regime
-     *    J. Civil Societies
-     *    K. Old format
-     *    L. Old format
-     *    M. Old format
-     *    N. Nonresident entities
-     *    P. Local authorities
-     *    Q. Autonomous bodies, state or not, and the like, and congregations and religious institutions
-     *    R. Congregations and religious institutions (since 2008 ORDER EHA/451/2008)
-     *    S. Organs of State Administration and regions
-     *    V. Agrarian Transformation
-     *    W. Permanent establishments of non-resident in Spain
-     */
-    if ( /^[ABCDEFGHJNPQRSUVW]{1}/.test( value ) ) {
-        sum += "";
-        controlDigit = 10 - parseInt( sum.charAt( sum.length - 1 ), 10 );
-        value += controlDigit;
-        return ( num[ 8 ].toString() === String.fromCharCode( 64 + controlDigit ) || num[ 8 ].toString() === value.charAt( value.length - 1 ) );
-    }
-
-    return false;
-
-}, "Please specify a valid CIF number." );
-
-/* NOTICE: Modified version of Castle.Components.Validator.CreditCardValidator
- * Redistributed under the the Apache License 2.0 at http://www.apache.org/licenses/LICENSE-2.0
- * Valid Types: mastercard, visa, amex, dinersclub, enroute, discover, jcb, unknown, all (overrides all other settings)
- */
-$.validator.addMethod("creditcardtypes", function(value, element, param) {
-    if (/[^0-9\-]+/.test(value)) {
-        return false;
-    }
-
-    value = value.replace(/\D/g, "");
-
-    var validTypes = 0x0000;
-
-    if (param.mastercard) {
-        validTypes |= 0x0001;
-    }
-    if (param.visa) {
-        validTypes |= 0x0002;
-    }
-    if (param.amex) {
-        validTypes |= 0x0004;
-    }
-    if (param.dinersclub) {
-        validTypes |= 0x0008;
-    }
-    if (param.enroute) {
-        validTypes |= 0x0010;
-    }
-    if (param.discover) {
-        validTypes |= 0x0020;
-    }
-    if (param.jcb) {
-        validTypes |= 0x0040;
-    }
-    if (param.unknown) {
-        validTypes |= 0x0080;
-    }
-    if (param.all) {
-        validTypes = 0x0001 | 0x0002 | 0x0004 | 0x0008 | 0x0010 | 0x0020 | 0x0040 | 0x0080;
-    }
-    if (validTypes & 0x0001 && /^(5[12345])/.test(value)) { //mastercard
-        return value.length === 16;
-    }
-    if (validTypes & 0x0002 && /^(4)/.test(value)) { //visa
-        return value.length === 16;
-    }
-    if (validTypes & 0x0004 && /^(3[47])/.test(value)) { //amex
-        return value.length === 15;
-    }
-    if (validTypes & 0x0008 && /^(3(0[012345]|[68]))/.test(value)) { //dinersclub
-        return value.length === 14;
-    }
-    if (validTypes & 0x0010 && /^(2(014|149))/.test(value)) { //enroute
-        return value.length === 15;
-    }
-    if (validTypes & 0x0020 && /^(6011)/.test(value)) { //discover
-        return value.length === 16;
-    }
-    if (validTypes & 0x0040 && /^(3)/.test(value)) { //jcb
-        return value.length === 16;
-    }
-    if (validTypes & 0x0040 && /^(2131|1800)/.test(value)) { //jcb
-        return value.length === 15;
-    }
-    if (validTypes & 0x0080) { //unknown
-        return true;
-    }
-    return false;
-}, "Please enter a valid credit card number.");
-
-/**
- * Validates currencies with any given symbols by @jameslouiz
- * Symbols can be optional or required. Symbols required by default
- *
- * Usage examples:
- *  currency: ["£", false] - Use false for soft currency validation
- *  currency: ["$", false]
- *  currency: ["RM", false] - also works with text based symbols such as "RM" - Malaysia Ringgit etc
- *
- *  <input class="currencyInput" name="currencyInput">
- *
- * Soft symbol checking
- *  currencyInput: {
- *     currency: ["$", false]
- *  }
- *
- * Strict symbol checking (default)
- *  currencyInput: {
- *     currency: "$"
- *     //OR
- *     currency: ["$", true]
- *  }
- *
- * Multiple Symbols
- *  currencyInput: {
- *     currency: "$,£,¢"
- *  }
- */
-$.validator.addMethod("currency", function(value, element, param) {
-    var isParamString = typeof param === "string",
-        symbol = isParamString ? param : param[0],
-        soft = isParamString ? true : param[1],
-        regex;
-
-    symbol = symbol.replace(/,/g, "");
-    symbol = soft ? symbol + "]" : symbol + "]?";
-    regex = "^[" + symbol + "([1-9]{1}[0-9]{0,2}(\\,[0-9]{3})*(\\.[0-9]{0,2})?|[1-9]{1}[0-9]{0,}(\\.[0-9]{0,2})?|0(\\.[0-9]{0,2})?|(\\.[0-9]{1,2})?)$";
-    regex = new RegExp(regex);
-    return this.optional(element) || regex.test(value);
-
-}, "Please specify a valid currency");
-
-$.validator.addMethod("dateFA", function(value, element) {
-    return this.optional(element) || /^[1-4]\d{3}\/((0?[1-6]\/((3[0-1])|([1-2][0-9])|(0?[1-9])))|((1[0-2]|(0?[7-9]))\/(30|([1-2][0-9])|(0?[1-9]))))$/.test(value);
-}, "Please enter a correct date");
-
-/**
- * Return true, if the value is a valid date, also making this formal check dd/mm/yyyy.
- *
- * @example $.validator.methods.date("01/01/1900")
- * @result true
- *
- * @example $.validator.methods.date("01/13/1990")
- * @result false
- *
- * @example $.validator.methods.date("01.01.1900")
- * @result false
- *
- * @example <input name="pippo" class="{dateITA:true}" />
- * @desc Declares an optional input element whose value must be a valid date.
- *
- * @name $.validator.methods.dateITA
- * @type Boolean
- * @cat Plugins/Validate/Methods
- */
-$.validator.addMethod("dateITA", function(value, element) {
-    var check = false,
-        re = /^\d{1,2}\/\d{1,2}\/\d{4}$/,
-        adata, gg, mm, aaaa, xdata;
-    if ( re.test(value)) {
-        adata = value.split("/");
-        gg = parseInt(adata[0], 10);
-        mm = parseInt(adata[1], 10);
-        aaaa = parseInt(adata[2], 10);
-        xdata = new Date(aaaa, mm - 1, gg, 12, 0, 0, 0);
-        if ( ( xdata.getUTCFullYear() === aaaa ) && ( xdata.getUTCMonth () === mm - 1 ) && ( xdata.getUTCDate() === gg ) ) {
-            check = true;
-        } else {
-            check = false;
-        }
-    } else {
-        check = false;
-    }
-    return this.optional(element) || check;
-}, "Please enter a correct date");
-
-$.validator.addMethod("dateNL", function(value, element) {
-    return this.optional(element) || /^(0?[1-9]|[12]\d|3[01])[\.\/\-](0?[1-9]|1[012])[\.\/\-]([12]\d)?(\d\d)$/.test(value);
-}, "Please enter a correct date");
-
-// Older "accept" file extension method. Old docs: http://docs.jquery.com/Plugins/Validation/Methods/accept
-$.validator.addMethod("extension", function(value, element, param) {
-    param = typeof param === "string" ? param.replace(/,/g, "|") : "png|jpe?g|gif";
-    return this.optional(element) || value.match(new RegExp(".(" + param + ")$", "i"));
-}, $.validator.format("Please enter a value with a valid extension."));
-
-/**
- * Dutch giro account numbers (not bank numbers) have max 7 digits
- */
-$.validator.addMethod("giroaccountNL", function(value, element) {
-    return this.optional(element) || /^[0-9]{1,7}$/.test(value);
-}, "Please specify a valid giro account number");
-
-/**
- * IBAN is the international bank account number.
- * It has a country - specific format, that is checked here too
- */
-$.validator.addMethod("iban", function(value, element) {
-    // some quick simple tests to prevent needless work
-    if (this.optional(element)) {
-        return true;
-    }
-
-    // remove spaces and to upper case
-    var iban = value.replace(/ /g, "").toUpperCase(),
-        ibancheckdigits = "",
-        leadingZeroes = true,
-        cRest = "",
-        cOperator = "",
-        countrycode, ibancheck, charAt, cChar, bbanpattern, bbancountrypatterns, ibanregexp, i, p;
-
-    if (!(/^([a-zA-Z0-9]{4} ){2,8}[a-zA-Z0-9]{1,4}|[a-zA-Z0-9]{12,34}$/.test(iban))) {
-        return false;
-    }
-
-    // check the country code and find the country specific format
-    countrycode = iban.substring(0, 2);
-    bbancountrypatterns = {
-        "AL": "\\d{8}[\\dA-Z]{16}",
-        "AD": "\\d{8}[\\dA-Z]{12}",
-        "AT": "\\d{16}",
-        "AZ": "[\\dA-Z]{4}\\d{20}",
-        "BE": "\\d{12}",
-        "BH": "[A-Z]{4}[\\dA-Z]{14}",
-        "BA": "\\d{16}",
-        "BR": "\\d{23}[A-Z][\\dA-Z]",
-        "BG": "[A-Z]{4}\\d{6}[\\dA-Z]{8}",
-        "CR": "\\d{17}",
-        "HR": "\\d{17}",
-        "CY": "\\d{8}[\\dA-Z]{16}",
-        "CZ": "\\d{20}",
-        "DK": "\\d{14}",
-        "DO": "[A-Z]{4}\\d{20}",
-        "EE": "\\d{16}",
-        "FO": "\\d{14}",
-        "FI": "\\d{14}",
-        "FR": "\\d{10}[\\dA-Z]{11}\\d{2}",
-        "GE": "[\\dA-Z]{2}\\d{16}",
-        "DE": "\\d{18}",
-        "GI": "[A-Z]{4}[\\dA-Z]{15}",
-        "GR": "\\d{7}[\\dA-Z]{16}",
-        "GL": "\\d{14}",
-        "GT": "[\\dA-Z]{4}[\\dA-Z]{20}",
-        "HU": "\\d{24}",
-        "IS": "\\d{22}",
-        "IE": "[\\dA-Z]{4}\\d{14}",
-        "IL": "\\d{19}",
-        "IT": "[A-Z]\\d{10}[\\dA-Z]{12}",
-        "KZ": "\\d{3}[\\dA-Z]{13}",
-        "KW": "[A-Z]{4}[\\dA-Z]{22}",
-        "LV": "[A-Z]{4}[\\dA-Z]{13}",
-        "LB": "\\d{4}[\\dA-Z]{20}",
-        "LI": "\\d{5}[\\dA-Z]{12}",
-        "LT": "\\d{16}",
-        "LU": "\\d{3}[\\dA-Z]{13}",
-        "MK": "\\d{3}[\\dA-Z]{10}\\d{2}",
-        "MT": "[A-Z]{4}\\d{5}[\\dA-Z]{18}",
-        "MR": "\\d{23}",
-        "MU": "[A-Z]{4}\\d{19}[A-Z]{3}",
-        "MC": "\\d{10}[\\dA-Z]{11}\\d{2}",
-        "MD": "[\\dA-Z]{2}\\d{18}",
-        "ME": "\\d{18}",
-        "NL": "[A-Z]{4}\\d{10}",
-        "NO": "\\d{11}",
-        "PK": "[\\dA-Z]{4}\\d{16}",
-        "PS": "[\\dA-Z]{4}\\d{21}",
-        "PL": "\\d{24}",
-        "PT": "\\d{21}",
-        "RO": "[A-Z]{4}[\\dA-Z]{16}",
-        "SM": "[A-Z]\\d{10}[\\dA-Z]{12}",
-        "SA": "\\d{2}[\\dA-Z]{18}",
-        "RS": "\\d{18}",
-        "SK": "\\d{20}",
-        "SI": "\\d{15}",
-        "ES": "\\d{20}",
-        "SE": "\\d{20}",
-        "CH": "\\d{5}[\\dA-Z]{12}",
-        "TN": "\\d{20}",
-        "TR": "\\d{5}[\\dA-Z]{17}",
-        "AE": "\\d{3}\\d{16}",
-        "GB": "[A-Z]{4}\\d{14}",
-        "VG": "[\\dA-Z]{4}\\d{16}"
-    };
-
-    bbanpattern = bbancountrypatterns[countrycode];
-    // As new countries will start using IBAN in the
-    // future, we only check if the countrycode is known.
-    // This prevents false negatives, while almost all
-    // false positives introduced by this, will be caught
-    // by the checksum validation below anyway.
-    // Strict checking should return FALSE for unknown
-    // countries.
-    if (typeof bbanpattern !== "undefined") {
-        ibanregexp = new RegExp("^[A-Z]{2}\\d{2}" + bbanpattern + "$", "");
-        if (!(ibanregexp.test(iban))) {
-            return false; // invalid country specific format
-        }
-    }
-
-    // now check the checksum, first convert to digits
-    ibancheck = iban.substring(4, iban.length) + iban.substring(0, 4);
-    for (i = 0; i < ibancheck.length; i++) {
-        charAt = ibancheck.charAt(i);
-        if (charAt !== "0") {
-            leadingZeroes = false;
-        }
-        if (!leadingZeroes) {
-            ibancheckdigits += "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ".indexOf(charAt);
-        }
-    }
-
-    // calculate the result of: ibancheckdigits % 97
-    for (p = 0; p < ibancheckdigits.length; p++) {
-        cChar = ibancheckdigits.charAt(p);
-        cOperator = "" + cRest + "" + cChar;
-        cRest = cOperator % 97;
-    }
-    return cRest === 1;
-}, "Please specify a valid IBAN");
-
-$.validator.addMethod("integer", function(value, element) {
-    return this.optional(element) || /^-?\d+$/.test(value);
-}, "A positive or negative non-decimal number please");
-
-$.validator.addMethod("ipv4", function(value, element) {
-    return this.optional(element) || /^(25[0-5]|2[0-4]\d|[01]?\d\d?)\.(25[0-5]|2[0-4]\d|[01]?\d\d?)\.(25[0-5]|2[0-4]\d|[01]?\d\d?)\.(25[0-5]|2[0-4]\d|[01]?\d\d?)$/i.test(value);
-}, "Please enter a valid IP v4 address.");
-
-$.validator.addMethod("ipv6", function(value, element) {
-    return this.optional(element) || /^((([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}:([0-9A-Fa-f]{1,4}:)?[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){4}:([0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){3}:([0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){2}:([0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(([0-9A-Fa-f]{1,4}:){0,5}:((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(::([0-9A-Fa-f]{1,4}:){0,5}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|([0-9A-Fa-f]{1,4}::([0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})|(::([0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:))$/i.test(value);
-}, "Please enter a valid IP v6 address.");
-
-$.validator.addMethod("lettersonly", function(value, element) {
-    return this.optional(element) || /^[a-z]+$/i.test(value);
-}, "Letters only please");
-
-$.validator.addMethod("letterswithbasicpunc", function(value, element) {
-    return this.optional(element) || /^[a-z\-.,()'"\s]+$/i.test(value);
-}, "Letters or punctuation only please");
-
-$.validator.addMethod("mobileNL", function(value, element) {
-    return this.optional(element) || /^((\+|00(\s|\s?\-\s?)?)31(\s|\s?\-\s?)?(\(0\)[\-\s]?)?|0)6((\s|\s?\-\s?)?[0-9]){8}$/.test(value);
-}, "Please specify a valid mobile number");
-
-/* For UK phone functions, do the following server side processing:
- * Compare original input with this RegEx pattern:
- * ^\(?(?:(?:00\)?[\s\-]?\(?|\+)(44)\)?[\s\-]?\(?(?:0\)?[\s\-]?\(?)?|0)([1-9]\d{1,4}\)?[\s\d\-]+)$
- * Extract $1 and set $prefix to '+44<space>' if $1 is '44', otherwise set $prefix to '0'
- * Extract $2 and remove hyphens, spaces and parentheses. Phone number is combined $prefix and $2.
- * A number of very detailed GB telephone number RegEx patterns can also be found at:
- * http://www.aa-asterisk.org.uk/index.php/Regular_Expressions_for_Validating_and_Formatting_GB_Telephone_Numbers
- */
-$.validator.addMethod("mobileUK", function(phone_number, element) {
-    phone_number = phone_number.replace(/\(|\)|\s+|-/g, "");
-    return this.optional(element) || phone_number.length > 9 &&
-        phone_number.match(/^(?:(?:(?:00\s?|\+)44\s?|0)7(?:[1345789]\d{2}|624)\s?\d{3}\s?\d{3})$/);
-}, "Please specify a valid mobile number");
-
-/*
- * The número de identidad de extranjero ( NIE )is a code used to identify the non-nationals in Spain
- */
-$.validator.addMethod( "nieES", function( value ) {
-    "use strict";
-
-    value = value.toUpperCase();
-
-    // Basic format test
-    if ( !value.match( "((^[A-Z]{1}[0-9]{7}[A-Z0-9]{1}$|^[T]{1}[A-Z0-9]{8}$)|^[0-9]{8}[A-Z]{1}$)" ) ) {
-        return false;
-    }
-
-    // Test NIE
-    //T
-    if ( /^[T]{1}/.test( value ) ) {
-        return ( value[ 8 ] === /^[T]{1}[A-Z0-9]{8}$/.test( value ) );
-    }
-
-    //XYZ
-    if ( /^[XYZ]{1}/.test( value ) ) {
-        return (
-            value[ 8 ] === "TRWAGMYFPDXBNJZSQVHLCKE".charAt(
-                value.replace( "X", "0" )
-                    .replace( "Y", "1" )
-                    .replace( "Z", "2" )
-                    .substring( 0, 8 ) % 23
-            )
-        );
-    }
-
-    return false;
-
-}, "Please specify a valid NIE number." );
-
-/*
- * The Número de Identificación Fiscal ( NIF ) is the way tax identification used in Spain for individuals
- */
-$.validator.addMethod( "nifES", function( value ) {
-    "use strict";
-
-    value = value.toUpperCase();
-
-    // Basic format test
-    if ( !value.match("((^[A-Z]{1}[0-9]{7}[A-Z0-9]{1}$|^[T]{1}[A-Z0-9]{8}$)|^[0-9]{8}[A-Z]{1}$)") ) {
-        return false;
-    }
-
-    // Test NIF
-    if ( /^[0-9]{8}[A-Z]{1}$/.test( value ) ) {
-        return ( "TRWAGMYFPDXBNJZSQVHLCKE".charAt( value.substring( 8, 0 ) % 23 ) === value.charAt( 8 ) );
-    }
-    // Test specials NIF (starts with K, L or M)
-    if ( /^[KLM]{1}/.test( value ) ) {
-        return ( value[ 8 ] === String.fromCharCode( 64 ) );
-    }
-
-    return false;
-
-}, "Please specify a valid NIF number." );
-
-$.validator.addMethod("nowhitespace", function(value, element) {
-    return this.optional(element) || /^\S+$/i.test(value);
-}, "No white space please");
-
-/**
-* Return true if the field value matches the given format RegExp
-*
-* @example $.validator.methods.pattern("AR1004",element,/^AR\d{4}$/)
-* @result true
-*
-* @example $.validator.methods.pattern("BR1004",element,/^AR\d{4}$/)
-* @result false
-*
-* @name $.validator.methods.pattern
-* @type Boolean
-* @cat Plugins/Validate/Methods
-*/
-$.validator.addMethod("pattern", function(value, element, param) {
-    if (this.optional(element)) {
-        return true;
-    }
-    if (typeof param === "string") {
-        param = new RegExp("^(?:" + param + ")$");
-    }
-    return param.test(value);
-}, "Invalid format.");
-
-/**
- * Dutch phone numbers have 10 digits (or 11 and start with +31).
- */
-$.validator.addMethod("phoneNL", function(value, element) {
-    return this.optional(element) || /^((\+|00(\s|\s?\-\s?)?)31(\s|\s?\-\s?)?(\(0\)[\-\s]?)?|0)[1-9]((\s|\s?\-\s?)?[0-9]){8}$/.test(value);
-}, "Please specify a valid phone number.");
-
-/* For UK phone functions, do the following server side processing:
- * Compare original input with this RegEx pattern:
- * ^\(?(?:(?:00\)?[\s\-]?\(?|\+)(44)\)?[\s\-]?\(?(?:0\)?[\s\-]?\(?)?|0)([1-9]\d{1,4}\)?[\s\d\-]+)$
- * Extract $1 and set $prefix to '+44<space>' if $1 is '44', otherwise set $prefix to '0'
- * Extract $2 and remove hyphens, spaces and parentheses. Phone number is combined $prefix and $2.
- * A number of very detailed GB telephone number RegEx patterns can also be found at:
- * http://www.aa-asterisk.org.uk/index.php/Regular_Expressions_for_Validating_and_Formatting_GB_Telephone_Numbers
- */
-$.validator.addMethod("phoneUK", function(phone_number, element) {
-    phone_number = phone_number.replace(/\(|\)|\s+|-/g, "");
-    return this.optional(element) || phone_number.length > 9 &&
-        phone_number.match(/^(?:(?:(?:00\s?|\+)44\s?)|(?:\(?0))(?:\d{2}\)?\s?\d{4}\s?\d{4}|\d{3}\)?\s?\d{3}\s?\d{3,4}|\d{4}\)?\s?(?:\d{5}|\d{3}\s?\d{3})|\d{5}\)?\s?\d{4,5})$/);
-}, "Please specify a valid phone number");
-
-/**
- * matches US phone number format
- *
- * where the area code may not start with 1 and the prefix may not start with 1
- * allows '-' or ' ' as a separator and allows parens around area code
- * some people may want to put a '1' in front of their number
- *
- * 1(212)-999-2345 or
- * 212 999 2344 or
- * 212-999-0983
- *
- * but not
- * 111-123-5434
- * and not
- * 212 123 4567
- */
-$.validator.addMethod("phoneUS", function(phone_number, element) {
-    phone_number = phone_number.replace(/\s+/g, "");
-    return this.optional(element) || phone_number.length > 9 &&
-        phone_number.match(/^(\+?1-?)?(\([2-9]([02-9]\d|1[02-9])\)|[2-9]([02-9]\d|1[02-9]))-?[2-9]([02-9]\d|1[02-9])-?\d{4}$/);
-}, "Please specify a valid phone number");
-
-/* For UK phone functions, do the following server side processing:
- * Compare original input with this RegEx pattern:
- * ^\(?(?:(?:00\)?[\s\-]?\(?|\+)(44)\)?[\s\-]?\(?(?:0\)?[\s\-]?\(?)?|0)([1-9]\d{1,4}\)?[\s\d\-]+)$
- * Extract $1 and set $prefix to '+44<space>' if $1 is '44', otherwise set $prefix to '0'
- * Extract $2 and remove hyphens, spaces and parentheses. Phone number is combined $prefix and $2.
- * A number of very detailed GB telephone number RegEx patterns can also be found at:
- * http://www.aa-asterisk.org.uk/index.php/Regular_Expressions_for_Validating_and_Formatting_GB_Telephone_Numbers
- */
-//Matches UK landline + mobile, accepting only 01-3 for landline or 07 for mobile to exclude many premium numbers
-$.validator.addMethod("phonesUK", function(phone_number, element) {
-    phone_number = phone_number.replace(/\(|\)|\s+|-/g, "");
-    return this.optional(element) || phone_number.length > 9 &&
-        phone_number.match(/^(?:(?:(?:00\s?|\+)44\s?|0)(?:1\d{8,9}|[23]\d{9}|7(?:[1345789]\d{8}|624\d{6})))$/);
-}, "Please specify a valid uk phone number");
-
-/**
- * Matches a valid Canadian Postal Code
- *
- * @example jQuery.validator.methods.postalCodeCA( "H0H 0H0", element )
- * @result true
- *
- * @example jQuery.validator.methods.postalCodeCA( "H0H0H0", element )
- * @result false
- *
- * @name jQuery.validator.methods.postalCodeCA
- * @type Boolean
- * @cat Plugins/Validate/Methods
- */
-$.validator.addMethod( "postalCodeCA", function( value, element ) {
-    return this.optional( element ) || /^[ABCEGHJKLMNPRSTVXY]\d[A-Z] \d[A-Z]\d$/.test( value );
-}, "Please specify a valid postal code" );
-
-/*
-* Valida CEPs do brasileiros:
-*
-* Formatos aceitos:
-* 99999-999
-* 99.999-999
-* 99999999
-*/
-$.validator.addMethod("postalcodeBR", function(cep_value, element) {
-    return this.optional(element) || /^\d{2}.\d{3}-\d{3}?$|^\d{5}-?\d{3}?$/.test( cep_value );
-}, "Informe um CEP válido.");
-
-/* Matches Italian postcode (CAP) */
-$.validator.addMethod("postalcodeIT", function(value, element) {
-    return this.optional(element) || /^\d{5}$/.test(value);
-}, "Please specify a valid postal code");
-
-$.validator.addMethod("postalcodeNL", function(value, element) {
-    return this.optional(element) || /^[1-9][0-9]{3}\s?[a-zA-Z]{2}$/.test(value);
-}, "Please specify a valid postal code");
-
-// Matches UK postcode. Does not match to UK Channel Islands that have their own postcodes (non standard UK)
-$.validator.addMethod("postcodeUK", function(value, element) {
-    return this.optional(element) || /^((([A-PR-UWYZ][0-9])|([A-PR-UWYZ][0-9][0-9])|([A-PR-UWYZ][A-HK-Y][0-9])|([A-PR-UWYZ][A-HK-Y][0-9][0-9])|([A-PR-UWYZ][0-9][A-HJKSTUW])|([A-PR-UWYZ][A-HK-Y][0-9][ABEHMNPRVWXY]))\s?([0-9][ABD-HJLNP-UW-Z]{2})|(GIR)\s?(0AA))$/i.test(value);
-}, "Please specify a valid UK postcode");
-
-/*
- * Lets you say "at least X inputs that match selector Y must be filled."
- *
- * The end result is that neither of these inputs:
- *
- *    <input class="productinfo" name="partnumber">
- *    <input class="productinfo" name="description">
- *
- *    ...will validate unless at least one of them is filled.
- *
- * partnumber:    {require_from_group: [1,".productinfo"]},
- * description: {require_from_group: [1,".productinfo"]}
- *
- * options[0]: number of fields that must be filled in the group
- * options[1]: CSS selector that defines the group of conditionally required fields
- */
-$.validator.addMethod("require_from_group", function(value, element, options) {
-    var $fields = $(options[1], element.form),
-        $fieldsFirst = $fields.eq(0),
-        validator = $fieldsFirst.data("valid_req_grp") ? $fieldsFirst.data("valid_req_grp") : $.extend({}, this),
-        isValid = $fields.filter(function() {
-            return validator.elementValue(this);
-        }).length >= options[0];
-
-    // Store the cloned validator for future validation
-    $fieldsFirst.data("valid_req_grp", validator);
-
-    // If element isn't being validated, run each require_from_group field's validation rules
-    if (!$(element).data("being_validated")) {
-        $fields.data("being_validated", true);
-        $fields.each(function() {
-            validator.element(this);
-        });
-        $fields.data("being_validated", false);
-    }
-    return isValid;
-}, $.validator.format("Please fill at least {0} of these fields."));
-
-/*
- * Lets you say "either at least X inputs that match selector Y must be filled,
- * OR they must all be skipped (left blank)."
- *
- * The end result, is that none of these inputs:
- *
- *    <input class="productinfo" name="partnumber">
- *    <input class="productinfo" name="description">
- *    <input class="productinfo" name="color">
- *
- *    ...will validate unless either at least two of them are filled,
- *    OR none of them are.
- *
- * partnumber:    {skip_or_fill_minimum: [2,".productinfo"]},
- * description: {skip_or_fill_minimum: [2,".productinfo"]},
- * color:        {skip_or_fill_minimum: [2,".productinfo"]}
- *
- * options[0]: number of fields that must be filled in the group
- * options[1]: CSS selector that defines the group of conditionally required fields
- *
- */
-$.validator.addMethod("skip_or_fill_minimum", function(value, element, options) {
-    var $fields = $(options[1], element.form),
-        $fieldsFirst = $fields.eq(0),
-        validator = $fieldsFirst.data("valid_skip") ? $fieldsFirst.data("valid_skip") : $.extend({}, this),
-        numberFilled = $fields.filter(function() {
-            return validator.elementValue(this);
-        }).length,
-        isValid = numberFilled === 0 || numberFilled >= options[0];
-
-    // Store the cloned validator for future validation
-    $fieldsFirst.data("valid_skip", validator);
-
-    // If element isn't being validated, run each skip_or_fill_minimum field's validation rules
-    if (!$(element).data("being_validated")) {
-        $fields.data("being_validated", true);
-        $fields.each(function() {
-            validator.element(this);
-        });
-        $fields.data("being_validated", false);
-    }
-    return isValid;
-}, $.validator.format("Please either skip these fields or fill at least {0} of them."));
-
-/* Validates US States and/or Territories by @jdforsythe
- * Can be case insensitive or require capitalization - default is case insensitive
- * Can include US Territories or not - default does not
- * Can include US Military postal abbreviations (AA, AE, AP) - default does not
- *
- * Note: "States" always includes DC (District of Colombia)
- *
- * Usage examples:
- *
- *  This is the default - case insensitive, no territories, no military zones
- *  stateInput: {
- *     caseSensitive: false,
- *     includeTerritories: false,
- *     includeMilitary: false
- *  }
- *
- *  Only allow capital letters, no territories, no military zones
- *  stateInput: {
- *     caseSensitive: false
- *  }
- *
- *  Case insensitive, include territories but not military zones
- *  stateInput: {
- *     includeTerritories: true
- *  }
- *
- *  Only allow capital letters, include territories and military zones
- *  stateInput: {
- *     caseSensitive: true,
- *     includeTerritories: true,
- *     includeMilitary: true
- *  }
- *
- *
- *
- */
-
-jQuery.validator.addMethod("stateUS", function(value, element, options) {
-    var isDefault = typeof options === "undefined",
-        caseSensitive = ( isDefault || typeof options.caseSensitive === "undefined" ) ? false : options.caseSensitive,
-        includeTerritories = ( isDefault || typeof options.includeTerritories === "undefined" ) ? false : options.includeTerritories,
-        includeMilitary = ( isDefault || typeof options.includeMilitary === "undefined" ) ? false : options.includeMilitary,
-        regex;
-
-    if (!includeTerritories && !includeMilitary) {
-        regex = "^(A[KLRZ]|C[AOT]|D[CE]|FL|GA|HI|I[ADLN]|K[SY]|LA|M[ADEINOST]|N[CDEHJMVY]|O[HKR]|PA|RI|S[CD]|T[NX]|UT|V[AT]|W[AIVY])$";
-    } else if (includeTerritories && includeMilitary) {
-        regex = "^(A[AEKLPRSZ]|C[AOT]|D[CE]|FL|G[AU]|HI|I[ADLN]|K[SY]|LA|M[ADEINOPST]|N[CDEHJMVY]|O[HKR]|P[AR]|RI|S[CD]|T[NX]|UT|V[AIT]|W[AIVY])$";
-    } else if (includeTerritories) {
-        regex = "^(A[KLRSZ]|C[AOT]|D[CE]|FL|G[AU]|HI|I[ADLN]|K[SY]|LA|M[ADEINOPST]|N[CDEHJMVY]|O[HKR]|P[AR]|RI|S[CD]|T[NX]|UT|V[AIT]|W[AIVY])$";
-    } else {
-        regex = "^(A[AEKLPRZ]|C[AOT]|D[CE]|FL|GA|HI|I[ADLN]|K[SY]|LA|M[ADEINOST]|N[CDEHJMVY]|O[HKR]|PA|RI|S[CD]|T[NX]|UT|V[AT]|W[AIVY])$";
-    }
-
-    regex = caseSensitive ? new RegExp(regex) : new RegExp(regex, "i");
-    return this.optional(element) || regex.test(value);
-},
-"Please specify a valid state");
-
-// TODO check if value starts with <, otherwise don't try stripping anything
-$.validator.addMethod("strippedminlength", function(value, element, param) {
-    return $(value).text().length >= param;
-}, $.validator.format("Please enter at least {0} characters"));
-
-$.validator.addMethod("time", function(value, element) {
-    return this.optional(element) || /^([01]\d|2[0-3])(:[0-5]\d){1,2}$/.test(value);
-}, "Please enter a valid time, between 00:00 and 23:59");
-
-$.validator.addMethod("time12h", function(value, element) {
-    return this.optional(element) || /^((0?[1-9]|1[012])(:[0-5]\d){1,2}(\ ?[AP]M))$/i.test(value);
-}, "Please enter a valid time in 12-hour am/pm format");
-
-// same as url, but TLD is optional
-$.validator.addMethod("url2", function(value, element) {
-    return this.optional(element) || /^(https?|ftp):\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?(((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)*(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)(:\d*)?)(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)?(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?$/i.test(value);
-}, $.validator.messages.url);
-
-/**
- * Return true, if the value is a valid vehicle identification number (VIN).
- *
- * Works with all kind of text inputs.
- *
- * @example <input type="text" size="20" name="VehicleID" class="{required:true,vinUS:true}" />
- * @desc Declares a required input element whose value must be a valid vehicle identification number.
- *
- * @name $.validator.methods.vinUS
- * @type Boolean
- * @cat Plugins/Validate/Methods
- */
-$.validator.addMethod("vinUS", function(v) {
-    if (v.length !== 17) {
-        return false;
-    }
-
-    var LL = [ "A", "B", "C", "D", "E", "F", "G", "H", "J", "K", "L", "M", "N", "P", "R", "S", "T", "U", "V", "W", "X", "Y", "Z" ],
-        VL = [ 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 3, 4, 5, 7, 9, 2, 3, 4, 5, 6, 7, 8, 9 ],
-        FL = [ 8, 7, 6, 5, 4, 3, 2, 10, 0, 9, 8, 7, 6, 5, 4, 3, 2 ],
-        rs = 0,
-        i, n, d, f, cd, cdv;
-
-    for (i = 0; i < 17; i++) {
-        f = FL[i];
-        d = v.slice(i, i + 1);
-        if (i === 8) {
-            cdv = d;
-        }
-        if (!isNaN(d)) {
-            d *= f;
-        } else {
-            for (n = 0; n < LL.length; n++) {
-                if (d.toUpperCase() === LL[n]) {
-                    d = VL[n];
-                    d *= f;
-                    if (isNaN(cdv) && n === 8) {
-                        cdv = LL[n];
-                    }
-                    break;
-                }
-            }
-        }
-        rs += d;
-    }
-    cd = rs % 11;
-    if (cd === 10) {
-        cd = "X";
-    }
-    if (cd === cdv) {
-        return true;
-    }
-    return false;
-}, "The specified vehicle identification number (VIN) is invalid.");
-
-$.validator.addMethod("zipcodeUS", function(value, element) {
-    return this.optional(element) || /^\d{5}(-\d{4})?$/.test(value);
-}, "The specified US ZIP Code is invalid");
-
-$.validator.addMethod("ziprange", function(value, element) {
-    return this.optional(element) || /^90[2-5]\d\{2\}-\d{4}$/.test(value);
-}, "Your ZIP-code must be in the range 902xx-xxxx to 905xx-xxxx");
-
-}));
\ No newline at end of file
diff --git a/#pma/js/jquery/jquery-2.1.4.min.js b/#pma/js/jquery/jquery-2.1.4.min.js
deleted file mode 100644
index 49990d6e..00000000
--- a/#pma/js/jquery/jquery-2.1.4.min.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/*! jQuery v2.1.4 | (c) 2005, 2015 jQuery Foundation, Inc. | jquery.org/license */
-!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k={},l=a.document,m="2.1.4",n=function(a,b){return new n.fn.init(a,b)},o=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,p=/^-ms-/,q=/-([\da-z])/gi,r=function(a,b){return b.toUpperCase()};n.fn=n.prototype={jquery:m,constructor:n,selector:"",length:0,toArray:function(){return d.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:d.call(this)},pushStack:function(a){var b=n.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return n.each(this,a,b)},map:function(a){return this.pushStack(n.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:c.sort,splice:c.splice},n.extend=n.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||n.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(a=arguments[h]))for(b in a)c=g[b],d=a[b],g!==d&&(j&&d&&(n.isPlainObject(d)||(e=n.isArray(d)))?(e?(e=!1,f=c&&n.isArray(c)?c:[]):f=c&&n.isPlainObject(c)?c:{},g[b]=n.extend(j,f,d)):void 0!==d&&(g[b]=d));return g},n.extend({expando:"jQuery"+(m+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===n.type(a)},isArray:Array.isArray,isWindow:function(a){return null!=a&&a===a.window},isNumeric:function(a){return!n.isArray(a)&&a-parseFloat(a)+1>=0},isPlainObject:function(a){return"object"!==n.type(a)||a.nodeType||n.isWindow(a)?!1:a.constructor&&!j.call(a.constructor.prototype,"isPrototypeOf")?!1:!0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?h[i.call(a)]||"object":typeof a},globalEval:function(a){var b,c=eval;a=n.trim(a),a&&(1===a.indexOf("use strict")?(b=l.createElement("script"),b.text=a,l.head.appendChild(b).parentNode.removeChild(b)):c(a))},camelCase:function(a){return a.replace(p,"ms-").replace(q,r)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,c){var d,e=0,f=a.length,g=s(a);if(c){if(g){for(;f>e;e++)if(d=b.apply(a[e],c),d===!1)break}else for(e in a)if(d=b.apply(a[e],c),d===!1)break}else if(g){for(;f>e;e++)if(d=b.call(a[e],e,a[e]),d===!1)break}else for(e in a)if(d=b.call(a[e],e,a[e]),d===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(o,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(s(Object(a))?n.merge(c,"string"==typeof a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){return null==b?-1:g.call(b,a,c)},merge:function(a,b){for(var c=+b.length,d=0,e=a.length;c>d;d++)a[e++]=b[d];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,f=0,g=a.length,h=s(a),i=[];if(h)for(;g>f;f++)d=b(a[f],f,c),null!=d&&i.push(d);else for(f in a)d=b(a[f],f,c),null!=d&&i.push(d);return e.apply([],i)},guid:1,proxy:function(a,b){var c,e,f;return"string"==typeof b&&(c=a[b],b=a,a=c),n.isFunction(a)?(e=d.call(arguments,2),f=function(){return a.apply(b||this,e.concat(d.call(arguments)))},f.guid=a.guid=a.guid||n.guid++,f):void 0},now:Date.now,support:k}),n.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(a,b){h["[object "+b+"]"]=b.toLowerCase()});function s(a){var b="length"in a&&a.length,c=n.type(a);return"function"===c||n.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var t=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+1*new Date,v=a.document,w=0,x=0,y=ha(),z=ha(),A=ha(),B=function(a,b){return a===b&&(l=!0),0},C=1<<31,D={}.hasOwnProperty,E=[],F=E.pop,G=E.push,H=E.push,I=E.slice,J=function(a,b){for(var c=0,d=a.length;d>c;c++)if(a[c]===b)return c;return-1},K="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",L="[\\x20\\t\\r\\n\\f]",M="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",N=M.replace("w","w#"),O="\\["+L+"*("+M+")(?:"+L+"*([*^$|!~]?=)"+L+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+N+"))|)"+L+"*\\]",P=":("+M+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+O+")*)|.*)\\)|)",Q=new RegExp(L+"+","g"),R=new RegExp("^"+L+"+|((?:^|[^\\\\])(?:\\\\.)*)"+L+"+$","g"),S=new RegExp("^"+L+"*,"+L+"*"),T=new RegExp("^"+L+"*([>+~]|"+L+")"+L+"*"),U=new RegExp("="+L+"*([^\\]'\"]*?)"+L+"*\\]","g"),V=new RegExp(P),W=new RegExp("^"+N+"$"),X={ID:new RegExp("^#("+M+")"),CLASS:new RegExp("^\\.("+M+")"),TAG:new RegExp("^("+M.replace("w","w*")+")"),ATTR:new RegExp("^"+O),PSEUDO:new RegExp("^"+P),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+L+"*(even|odd|(([+-]|)(\\d*)n|)"+L+"*(?:([+-]|)"+L+"*(\\d+)|))"+L+"*\\)|)","i"),bool:new RegExp("^(?:"+K+")$","i"),needsContext:new RegExp("^"+L+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+L+"*((?:-\\d)?\\d*)"+L+"*\\)|)(?=[^-]|$)","i")},Y=/^(?:input|select|textarea|button)$/i,Z=/^h\d$/i,$=/^[^{]+\{\s*\[native \w/,_=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,aa=/[+~]/,ba=/'|\\/g,ca=new RegExp("\\\\([\\da-f]{1,6}"+L+"?|("+L+")|.)","ig"),da=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)},ea=function(){m()};try{H.apply(E=I.call(v.childNodes),v.childNodes),E[v.childNodes.length].nodeType}catch(fa){H={apply:E.length?function(a,b){G.apply(a,I.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function ga(a,b,d,e){var f,h,j,k,l,o,r,s,w,x;if((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,d=d||[],k=b.nodeType,"string"!=typeof a||!a||1!==k&&9!==k&&11!==k)return d;if(!e&&p){if(11!==k&&(f=_.exec(a)))if(j=f[1]){if(9===k){if(h=b.getElementById(j),!h||!h.parentNode)return d;if(h.id===j)return d.push(h),d}else if(b.ownerDocument&&(h=b.ownerDocument.getElementById(j))&&t(b,h)&&h.id===j)return d.push(h),d}else{if(f[2])return H.apply(d,b.getElementsByTagName(a)),d;if((j=f[3])&&c.getElementsByClassName)return H.apply(d,b.getElementsByClassName(j)),d}if(c.qsa&&(!q||!q.test(a))){if(s=r=u,w=b,x=1!==k&&a,1===k&&"object"!==b.nodeName.toLowerCase()){o=g(a),(r=b.getAttribute("id"))?s=r.replace(ba,"\\$&"):b.setAttribute("id",s),s="[id='"+s+"'] ",l=o.length;while(l--)o[l]=s+ra(o[l]);w=aa.test(a)&&pa(b.parentNode)||b,x=o.join(",")}if(x)try{return H.apply(d,w.querySelectorAll(x)),d}catch(y){}finally{r||b.removeAttribute("id")}}}return i(a.replace(R,"$1"),b,d,e)}function ha(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function ia(a){return a[u]=!0,a}function ja(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function ka(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function la(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||C)-(~a.sourceIndex||C);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function ma(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function na(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function oa(a){return ia(function(b){return b=+b,ia(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function pa(a){return a&&"undefined"!=typeof a.getElementsByTagName&&a}c=ga.support={},f=ga.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=ga.setDocument=function(a){var b,e,g=a?a.ownerDocument||a:v;return g!==n&&9===g.nodeType&&g.documentElement?(n=g,o=g.documentElement,e=g.defaultView,e&&e!==e.top&&(e.addEventListener?e.addEventListener("unload",ea,!1):e.attachEvent&&e.attachEvent("onunload",ea)),p=!f(g),c.attributes=ja(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ja(function(a){return a.appendChild(g.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=$.test(g.getElementsByClassName),c.getById=ja(function(a){return o.appendChild(a).id=u,!g.getElementsByName||!g.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},d.filter.ID=function(a){var b=a.replace(ca,da);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(ca,da);return function(a){var c="undefined"!=typeof a.getAttributeNode&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return"undefined"!=typeof b.getElementsByTagName?b.getElementsByTagName(a):c.qsa?b.querySelectorAll(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=$.test(g.querySelectorAll))&&(ja(function(a){o.appendChild(a).innerHTML="<a id='"+u+"'></a><select id='"+u+"-\f]' msallowcapture=''><option selected=''></option></select>",a.querySelectorAll("[msallowcapture^='']").length&&q.push("[*^$]="+L+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+L+"*(?:value|"+K+")"),a.querySelectorAll("[id~="+u+"-]").length||q.push("~="),a.querySelectorAll(":checked").length||q.push(":checked"),a.querySelectorAll("a#"+u+"+*").length||q.push(".#.+[+~]")}),ja(function(a){var b=g.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+L+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=$.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ja(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",P)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=$.test(o.compareDocumentPosition),t=b||$.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===g||a.ownerDocument===v&&t(v,a)?-1:b===g||b.ownerDocument===v&&t(v,b)?1:k?J(k,a)-J(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,e=a.parentNode,f=b.parentNode,h=[a],i=[b];if(!e||!f)return a===g?-1:b===g?1:e?-1:f?1:k?J(k,a)-J(k,b):0;if(e===f)return la(a,b);c=a;while(c=c.parentNode)h.unshift(c);c=b;while(c=c.parentNode)i.unshift(c);while(h[d]===i[d])d++;return d?la(h[d],i[d]):h[d]===v?-1:i[d]===v?1:0},g):n},ga.matches=function(a,b){return ga(a,null,null,b)},ga.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(U,"='$1']"),!(!c.matchesSelector||!p||r&&r.test(b)||q&&q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return ga(b,n,null,[a]).length>0},ga.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},ga.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&D.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},ga.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},ga.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=ga.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=ga.selectors={cacheLength:50,createPseudo:ia,match:X,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(ca,da),a[3]=(a[3]||a[4]||a[5]||"").replace(ca,da),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||ga.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&ga.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return X.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&V.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(ca,da).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+L+")"+a+"("+L+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||"undefined"!=typeof a.getAttribute&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=ga.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e.replace(Q," ")+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h;if(q){if(f){while(p){l=b;while(l=l[p])if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){k=q[u]||(q[u]={}),j=k[a]||[],n=j[0]===w&&j[1],m=j[0]===w&&j[2],l=n&&q.childNodes[n];while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if(1===l.nodeType&&++m&&l===b){k[a]=[w,n,m];break}}else if(s&&(j=(b[u]||(b[u]={}))[a])&&j[0]===w)m=j[1];else while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if((h?l.nodeName.toLowerCase()===r:1===l.nodeType)&&++m&&(s&&((l[u]||(l[u]={}))[a]=[w,m]),l===b))break;return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||ga.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ia(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=J(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:ia(function(a){var b=[],c=[],d=h(a.replace(R,"$1"));return d[u]?ia(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),b[0]=null,!c.pop()}}),has:ia(function(a){return function(b){return ga(a,b).length>0}}),contains:ia(function(a){return a=a.replace(ca,da),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ia(function(a){return W.test(a||"")||ga.error("unsupported lang: "+a),a=a.replace(ca,da).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Z.test(a.nodeName)},input:function(a){return Y.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:oa(function(){return[0]}),last:oa(function(a,b){return[b-1]}),eq:oa(function(a,b,c){return[0>c?c+b:c]}),even:oa(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:oa(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:oa(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:oa(function(a,b,c){for(var d=0>c?c+b:c;++d<b;)a.push(d);return a})}},d.pseudos.nth=d.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})d.pseudos[b]=ma(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=na(b);function qa(){}qa.prototype=d.filters=d.pseudos,d.setFilters=new qa,g=ga.tokenize=function(a,b){var c,e,f,g,h,i,j,k=z[a+" "];if(k)return b?0:k.slice(0);h=a,i=[],j=d.preFilter;while(h){(!c||(e=S.exec(h)))&&(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=T.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(R," ")}),h=h.slice(c.length));for(g in d.filter)!(e=X[g].exec(h))||j[g]&&!(e=j[g](e))||(c=e.shift(),f.push({value:c,type:g,matches:e}),h=h.slice(c.length));if(!c)break}return b?h.length:h?ga.error(a):z(a,i).slice(0)};function ra(a){for(var b=0,c=a.length,d="";c>b;b++)d+=a[b].value;return d}function sa(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(i=b[u]||(b[u]={}),(h=i[d])&&h[0]===w&&h[1]===f)return j[2]=h[2];if(i[d]=j,j[2]=a(b,c,g))return!0}}}function ta(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function ua(a,b,c){for(var d=0,e=b.length;e>d;d++)ga(a,b[d],c);return c}function va(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function wa(a,b,c,d,e,f){return d&&!d[u]&&(d=wa(d)),e&&!e[u]&&(e=wa(e,f)),ia(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||ua(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:va(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=va(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?J(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=va(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):H.apply(g,r)})}function xa(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=sa(function(a){return a===b},h,!0),l=sa(function(a){return J(b,a)>-1},h,!0),m=[function(a,c,d){var e=!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d));return b=null,e}];f>i;i++)if(c=d.relative[a[i].type])m=[sa(ta(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return wa(i>1&&ta(m),i>1&&ra(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(R,"$1"),c,e>i&&xa(a.slice(i,e)),f>e&&xa(a=a.slice(e)),f>e&&ra(a))}m.push(c)}return ta(m)}function ya(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,m,o,p=0,q="0",r=f&&[],s=[],t=j,u=f||e&&d.find.TAG("*",k),v=w+=null==t?1:Math.random()||.1,x=u.length;for(k&&(j=g!==n&&g);q!==x&&null!=(l=u[q]);q++){if(e&&l){m=0;while(o=a[m++])if(o(l,g,h)){i.push(l);break}k&&(w=v)}c&&((l=!o&&l)&&p--,f&&r.push(l))}if(p+=q,c&&q!==p){m=0;while(o=b[m++])o(r,s,g,h);if(f){if(p>0)while(q--)r[q]||s[q]||(s[q]=F.call(i));s=va(s)}H.apply(i,s),k&&!f&&s.length>0&&p+b.length>1&&ga.uniqueSort(i)}return k&&(w=v,j=t),r};return c?ia(f):f}return h=ga.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=xa(b[c]),f[u]?d.push(f):e.push(f);f=A(a,ya(e,d)),f.selector=a}return f},i=ga.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(ca,da),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=X.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(ca,da),aa.test(j[0].type)&&pa(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&ra(j),!a)return H.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,aa.test(a)&&pa(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ja(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ja(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||ka("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ja(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||ka("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ja(function(a){return null==a.getAttribute("disabled")})||ka(K,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),ga}(a);n.find=t,n.expr=t.selectors,n.expr[":"]=n.expr.pseudos,n.unique=t.uniqueSort,n.text=t.getText,n.isXMLDoc=t.isXML,n.contains=t.contains;var u=n.expr.match.needsContext,v=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,w=/^.[^:#\[\.,]*$/;function x(a,b,c){if(n.isFunction(b))return n.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return n.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(w.test(b))return n.filter(b,a,c);b=n.filter(b,a)}return n.grep(a,function(a){return g.call(b,a)>=0!==c})}n.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?n.find.matchesSelector(d,a)?[d]:[]:n.find.matches(a,n.grep(b,function(a){return 1===a.nodeType}))},n.fn.extend({find:function(a){var b,c=this.length,d=[],e=this;if("string"!=typeof a)return this.pushStack(n(a).filter(function(){for(b=0;c>b;b++)if(n.contains(e[b],this))return!0}));for(b=0;c>b;b++)n.find(a,e[b],d);return d=this.pushStack(c>1?n.unique(d):d),d.selector=this.selector?this.selector+" "+a:a,d},filter:function(a){return this.pushStack(x(this,a||[],!1))},not:function(a){return this.pushStack(x(this,a||[],!0))},is:function(a){return!!x(this,"string"==typeof a&&u.test(a)?n(a):a||[],!1).length}});var y,z=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,A=n.fn.init=function(a,b){var c,d;if(!a)return this;if("string"==typeof a){if(c="<"===a[0]&&">"===a[a.length-1]&&a.length>=3?[null,a,null]:z.exec(a),!c||!c[1]&&b)return!b||b.jquery?(b||y).find(a):this.constructor(b).find(a);if(c[1]){if(b=b instanceof n?b[0]:b,n.merge(this,n.parseHTML(c[1],b&&b.nodeType?b.ownerDocument||b:l,!0)),v.test(c[1])&&n.isPlainObject(b))for(c in b)n.isFunction(this[c])?this[c](b[c]):this.attr(c,b[c]);return this}return d=l.getElementById(c[2]),d&&d.parentNode&&(this.length=1,this[0]=d),this.context=l,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):n.isFunction(a)?"undefined"!=typeof y.ready?y.ready(a):a(n):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),n.makeArray(a,this))};A.prototype=n.fn,y=n(l);var B=/^(?:parents|prev(?:Until|All))/,C={children:!0,contents:!0,next:!0,prev:!0};n.extend({dir:function(a,b,c){var d=[],e=void 0!==c;while((a=a[b])&&9!==a.nodeType)if(1===a.nodeType){if(e&&n(a).is(c))break;d.push(a)}return d},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}}),n.fn.extend({has:function(a){var b=n(a,this),c=b.length;return this.filter(function(){for(var a=0;c>a;a++)if(n.contains(this,b[a]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=u.test(a)||"string"!=typeof a?n(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&n.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?n.unique(f):f)},index:function(a){return a?"string"==typeof a?g.call(n(a),this[0]):g.call(this,a.jquery?a[0]:a):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(n.unique(n.merge(this.get(),n(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function D(a,b){while((a=a[b])&&1!==a.nodeType);return a}n.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return n.dir(a,"parentNode")},parentsUntil:function(a,b,c){return n.dir(a,"parentNode",c)},next:function(a){return D(a,"nextSibling")},prev:function(a){return D(a,"previousSibling")},nextAll:function(a){return n.dir(a,"nextSibling")},prevAll:function(a){return n.dir(a,"previousSibling")},nextUntil:function(a,b,c){return n.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return n.dir(a,"previousSibling",c)},siblings:function(a){return n.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return n.sibling(a.firstChild)},contents:function(a){return a.contentDocument||n.merge([],a.childNodes)}},function(a,b){n.fn[a]=function(c,d){var e=n.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=n.filter(d,e)),this.length>1&&(C[a]||n.unique(e),B.test(a)&&e.reverse()),this.pushStack(e)}});var E=/\S+/g,F={};function G(a){var b=F[a]={};return n.each(a.match(E)||[],function(a,c){b[c]=!0}),b}n.Callbacks=function(a){a="string"==typeof a?F[a]||G(a):n.extend({},a);var b,c,d,e,f,g,h=[],i=!a.once&&[],j=function(l){for(b=a.memory&&l,c=!0,g=e||0,e=0,f=h.length,d=!0;h&&f>g;g++)if(h[g].apply(l[0],l[1])===!1&&a.stopOnFalse){b=!1;break}d=!1,h&&(i?i.length&&j(i.shift()):b?h=[]:k.disable())},k={add:function(){if(h){var c=h.length;!function g(b){n.each(b,function(b,c){var d=n.type(c);"function"===d?a.unique&&k.has(c)||h.push(c):c&&c.length&&"string"!==d&&g(c)})}(arguments),d?f=h.length:b&&(e=c,j(b))}return this},remove:function(){return h&&n.each(arguments,function(a,b){var c;while((c=n.inArray(b,h,c))>-1)h.splice(c,1),d&&(f>=c&&f--,g>=c&&g--)}),this},has:function(a){return a?n.inArray(a,h)>-1:!(!h||!h.length)},empty:function(){return h=[],f=0,this},disable:function(){return h=i=b=void 0,this},disabled:function(){return!h},lock:function(){return i=void 0,b||k.disable(),this},locked:function(){return!i},fireWith:function(a,b){return!h||c&&!i||(b=b||[],b=[a,b.slice?b.slice():b],d?i.push(b):j(b)),this},fire:function(){return k.fireWith(this,arguments),this},fired:function(){return!!c}};return k},n.extend({Deferred:function(a){var b=[["resolve","done",n.Callbacks("once memory"),"resolved"],["reject","fail",n.Callbacks("once memory"),"rejected"],["notify","progress",n.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return n.Deferred(function(c){n.each(b,function(b,f){var g=n.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&n.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?n.extend(a,d):d}},e={};return d.pipe=d.then,n.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=d.call(arguments),e=c.length,f=1!==e||a&&n.isFunction(a.promise)?e:0,g=1===f?a:n.Deferred(),h=function(a,b,c){return function(e){b[a]=this,c[a]=arguments.length>1?d.call(arguments):e,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(e>1)for(i=new Array(e),j=new Array(e),k=new Array(e);e>b;b++)c[b]&&n.isFunction(c[b].promise)?c[b].promise().done(h(b,k,c)).fail(g.reject).progress(h(b,j,i)):--f;return f||g.resolveWith(k,c),g.promise()}});var H;n.fn.ready=function(a){return n.ready.promise().done(a),this},n.extend({isReady:!1,readyWait:1,holdReady:function(a){a?n.readyWait++:n.ready(!0)},ready:function(a){(a===!0?--n.readyWait:n.isReady)||(n.isReady=!0,a!==!0&&--n.readyWait>0||(H.resolveWith(l,[n]),n.fn.triggerHandler&&(n(l).triggerHandler("ready"),n(l).off("ready"))))}});function I(){l.removeEventListener("DOMContentLoaded",I,!1),a.removeEventListener("load",I,!1),n.ready()}n.ready.promise=function(b){return H||(H=n.Deferred(),"complete"===l.readyState?setTimeout(n.ready):(l.addEventListener("DOMContentLoaded",I,!1),a.addEventListener("load",I,!1))),H.promise(b)},n.ready.promise();var J=n.access=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===n.type(c)){e=!0;for(h in c)n.access(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,n.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(n(a),c)})),b))for(;i>h;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f};n.acceptData=function(a){return 1===a.nodeType||9===a.nodeType||!+a.nodeType};function K(){Object.defineProperty(this.cache={},0,{get:function(){return{}}}),this.expando=n.expando+K.uid++}K.uid=1,K.accepts=n.acceptData,K.prototype={key:function(a){if(!K.accepts(a))return 0;var b={},c=a[this.expando];if(!c){c=K.uid++;try{b[this.expando]={value:c},Object.defineProperties(a,b)}catch(d){b[this.expando]=c,n.extend(a,b)}}return this.cache[c]||(this.cache[c]={}),c},set:function(a,b,c){var d,e=this.key(a),f=this.cache[e];if("string"==typeof b)f[b]=c;else if(n.isEmptyObject(f))n.extend(this.cache[e],b);else for(d in b)f[d]=b[d];return f},get:function(a,b){var c=this.cache[this.key(a)];return void 0===b?c:c[b]},access:function(a,b,c){var d;return void 0===b||b&&"string"==typeof b&&void 0===c?(d=this.get(a,b),void 0!==d?d:this.get(a,n.camelCase(b))):(this.set(a,b,c),void 0!==c?c:b)},remove:function(a,b){var c,d,e,f=this.key(a),g=this.cache[f];if(void 0===b)this.cache[f]={};else{n.isArray(b)?d=b.concat(b.map(n.camelCase)):(e=n.camelCase(b),b in g?d=[b,e]:(d=e,d=d in g?[d]:d.match(E)||[])),c=d.length;while(c--)delete g[d[c]]}},hasData:function(a){return!n.isEmptyObject(this.cache[a[this.expando]]||{})},discard:function(a){a[this.expando]&&delete this.cache[a[this.expando]]}};var L=new K,M=new K,N=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,O=/([A-Z])/g;function P(a,b,c){var d;if(void 0===c&&1===a.nodeType)if(d="data-"+b.replace(O,"-$1").toLowerCase(),c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:N.test(c)?n.parseJSON(c):c}catch(e){}M.set(a,b,c)}else c=void 0;return c}n.extend({hasData:function(a){return M.hasData(a)||L.hasData(a)},data:function(a,b,c){
-return M.access(a,b,c)},removeData:function(a,b){M.remove(a,b)},_data:function(a,b,c){return L.access(a,b,c)},_removeData:function(a,b){L.remove(a,b)}}),n.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=M.get(f),1===f.nodeType&&!L.get(f,"hasDataAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=n.camelCase(d.slice(5)),P(f,d,e[d])));L.set(f,"hasDataAttrs",!0)}return e}return"object"==typeof a?this.each(function(){M.set(this,a)}):J(this,function(b){var c,d=n.camelCase(a);if(f&&void 0===b){if(c=M.get(f,a),void 0!==c)return c;if(c=M.get(f,d),void 0!==c)return c;if(c=P(f,d,void 0),void 0!==c)return c}else this.each(function(){var c=M.get(this,d);M.set(this,d,b),-1!==a.indexOf("-")&&void 0!==c&&M.set(this,a,b)})},null,b,arguments.length>1,null,!0)},removeData:function(a){return this.each(function(){M.remove(this,a)})}}),n.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=L.get(a,b),c&&(!d||n.isArray(c)?d=L.access(a,b,n.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=n.queue(a,b),d=c.length,e=c.shift(),f=n._queueHooks(a,b),g=function(){n.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return L.get(a,c)||L.access(a,c,{empty:n.Callbacks("once memory").add(function(){L.remove(a,[b+"queue",c])})})}}),n.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length<c?n.queue(this[0],a):void 0===b?this:this.each(function(){var c=n.queue(this,a,b);n._queueHooks(this,a),"fx"===a&&"inprogress"!==c[0]&&n.dequeue(this,a)})},dequeue:function(a){return this.each(function(){n.dequeue(this,a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,b){var c,d=1,e=n.Deferred(),f=this,g=this.length,h=function(){--d||e.resolveWith(f,[f])};"string"!=typeof a&&(b=a,a=void 0),a=a||"fx";while(g--)c=L.get(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}});var Q=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,R=["Top","Right","Bottom","Left"],S=function(a,b){return a=b||a,"none"===n.css(a,"display")||!n.contains(a.ownerDocument,a)},T=/^(?:checkbox|radio)$/i;!function(){var a=l.createDocumentFragment(),b=a.appendChild(l.createElement("div")),c=l.createElement("input");c.setAttribute("type","radio"),c.setAttribute("checked","checked"),c.setAttribute("name","t"),b.appendChild(c),k.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,b.innerHTML="<textarea>x</textarea>",k.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue}();var U="undefined";k.focusinBubbles="onfocusin"in a;var V=/^key/,W=/^(?:mouse|pointer|contextmenu)|click/,X=/^(?:focusinfocus|focusoutblur)$/,Y=/^([^.]*)(?:\.(.+)|)$/;function Z(){return!0}function $(){return!1}function _(){try{return l.activeElement}catch(a){}}n.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=L.get(a);if(r){c.handler&&(f=c,c=f.handler,e=f.selector),c.guid||(c.guid=n.guid++),(i=r.events)||(i=r.events={}),(g=r.handle)||(g=r.handle=function(b){return typeof n!==U&&n.event.triggered!==b.type?n.event.dispatch.apply(a,arguments):void 0}),b=(b||"").match(E)||[""],j=b.length;while(j--)h=Y.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o&&(l=n.event.special[o]||{},o=(e?l.delegateType:l.bindType)||o,l=n.event.special[o]||{},k=n.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&n.expr.match.needsContext.test(e),namespace:p.join(".")},f),(m=i[o])||(m=i[o]=[],m.delegateCount=0,l.setup&&l.setup.call(a,d,p,g)!==!1||a.addEventListener&&a.addEventListener(o,g,!1)),l.add&&(l.add.call(a,k),k.handler.guid||(k.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,k):m.push(k),n.event.global[o]=!0)}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=L.hasData(a)&&L.get(a);if(r&&(i=r.events)){b=(b||"").match(E)||[""],j=b.length;while(j--)if(h=Y.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=n.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,m=i[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),g=f=m.length;while(f--)k=m[f],!e&&q!==k.origType||c&&c.guid!==k.guid||h&&!h.test(k.namespace)||d&&d!==k.selector&&("**"!==d||!k.selector)||(m.splice(f,1),k.selector&&m.delegateCount--,l.remove&&l.remove.call(a,k));g&&!m.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||n.removeEvent(a,o,r.handle),delete i[o])}else for(o in i)n.event.remove(a,o+b[j],c,d,!0);n.isEmptyObject(i)&&(delete r.handle,L.remove(a,"events"))}},trigger:function(b,c,d,e){var f,g,h,i,k,m,o,p=[d||l],q=j.call(b,"type")?b.type:b,r=j.call(b,"namespace")?b.namespace.split("."):[];if(g=h=d=d||l,3!==d.nodeType&&8!==d.nodeType&&!X.test(q+n.event.triggered)&&(q.indexOf(".")>=0&&(r=q.split("."),q=r.shift(),r.sort()),k=q.indexOf(":")<0&&"on"+q,b=b[n.expando]?b:new n.Event(q,"object"==typeof b&&b),b.isTrigger=e?2:3,b.namespace=r.join("."),b.namespace_re=b.namespace?new RegExp("(^|\\.)"+r.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=d),c=null==c?[b]:n.makeArray(c,[b]),o=n.event.special[q]||{},e||!o.trigger||o.trigger.apply(d,c)!==!1)){if(!e&&!o.noBubble&&!n.isWindow(d)){for(i=o.delegateType||q,X.test(i+q)||(g=g.parentNode);g;g=g.parentNode)p.push(g),h=g;h===(d.ownerDocument||l)&&p.push(h.defaultView||h.parentWindow||a)}f=0;while((g=p[f++])&&!b.isPropagationStopped())b.type=f>1?i:o.bindType||q,m=(L.get(g,"events")||{})[b.type]&&L.get(g,"handle"),m&&m.apply(g,c),m=k&&g[k],m&&m.apply&&n.acceptData(g)&&(b.result=m.apply(g,c),b.result===!1&&b.preventDefault());return b.type=q,e||b.isDefaultPrevented()||o._default&&o._default.apply(p.pop(),c)!==!1||!n.acceptData(d)||k&&n.isFunction(d[q])&&!n.isWindow(d)&&(h=d[k],h&&(d[k]=null),n.event.triggered=q,d[q](),n.event.triggered=void 0,h&&(d[k]=h)),b.result}},dispatch:function(a){a=n.event.fix(a);var b,c,e,f,g,h=[],i=d.call(arguments),j=(L.get(this,"events")||{})[a.type]||[],k=n.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=n.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,c=0;while((g=f.handlers[c++])&&!a.isImmediatePropagationStopped())(!a.namespace_re||a.namespace_re.test(g.namespace))&&(a.handleObj=g,a.data=g.data,e=((n.event.special[g.origType]||{}).handle||g.handler).apply(f.elem,i),void 0!==e&&(a.result=e)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&(!a.button||"click"!==a.type))for(;i!==this;i=i.parentNode||this)if(i.disabled!==!0||"click"!==a.type){for(d=[],c=0;h>c;c++)f=b[c],e=f.selector+" ",void 0===d[e]&&(d[e]=f.needsContext?n(e,this).index(i)>=0:n.find(e,this,null,[i]).length),d[e]&&d.push(f);d.length&&g.push({elem:i,handlers:d})}return h<b.length&&g.push({elem:this,handlers:b.slice(h)}),g},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){return null==a.which&&(a.which=null!=b.charCode?b.charCode:b.keyCode),a}},mouseHooks:{props:"button buttons clientX clientY offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,b){var c,d,e,f=b.button;return null==a.pageX&&null!=b.clientX&&(c=a.target.ownerDocument||l,d=c.documentElement,e=c.body,a.pageX=b.clientX+(d&&d.scrollLeft||e&&e.scrollLeft||0)-(d&&d.clientLeft||e&&e.clientLeft||0),a.pageY=b.clientY+(d&&d.scrollTop||e&&e.scrollTop||0)-(d&&d.clientTop||e&&e.clientTop||0)),a.which||void 0===f||(a.which=1&f?1:2&f?3:4&f?2:0),a}},fix:function(a){if(a[n.expando])return a;var b,c,d,e=a.type,f=a,g=this.fixHooks[e];g||(this.fixHooks[e]=g=W.test(e)?this.mouseHooks:V.test(e)?this.keyHooks:{}),d=g.props?this.props.concat(g.props):this.props,a=new n.Event(f),b=d.length;while(b--)c=d[b],a[c]=f[c];return a.target||(a.target=l),3===a.target.nodeType&&(a.target=a.target.parentNode),g.filter?g.filter(a,f):a},special:{load:{noBubble:!0},focus:{trigger:function(){return this!==_()&&this.focus?(this.focus(),!1):void 0},delegateType:"focusin"},blur:{trigger:function(){return this===_()&&this.blur?(this.blur(),!1):void 0},delegateType:"focusout"},click:{trigger:function(){return"checkbox"===this.type&&this.click&&n.nodeName(this,"input")?(this.click(),!1):void 0},_default:function(a){return n.nodeName(a.target,"a")}},beforeunload:{postDispatch:function(a){void 0!==a.result&&a.originalEvent&&(a.originalEvent.returnValue=a.result)}}},simulate:function(a,b,c,d){var e=n.extend(new n.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?n.event.trigger(e,null,b):n.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},n.removeEvent=function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)},n.Event=function(a,b){return this instanceof n.Event?(a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||void 0===a.defaultPrevented&&a.returnValue===!1?Z:$):this.type=a,b&&n.extend(this,b),this.timeStamp=a&&a.timeStamp||n.now(),void(this[n.expando]=!0)):new n.Event(a,b)},n.Event.prototype={isDefaultPrevented:$,isPropagationStopped:$,isImmediatePropagationStopped:$,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=Z,a&&a.preventDefault&&a.preventDefault()},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=Z,a&&a.stopPropagation&&a.stopPropagation()},stopImmediatePropagation:function(){var a=this.originalEvent;this.isImmediatePropagationStopped=Z,a&&a.stopImmediatePropagation&&a.stopImmediatePropagation(),this.stopPropagation()}},n.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(a,b){n.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj;return(!e||e!==d&&!n.contains(d,e))&&(a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b),c}}}),k.focusinBubbles||n.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){n.event.simulate(b,a.target,n.event.fix(a),!0)};n.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=L.access(d,b);e||d.addEventListener(a,c,!0),L.access(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=L.access(d,b)-1;e?L.access(d,b,e):(d.removeEventListener(a,c,!0),L.remove(d,b))}}}),n.fn.extend({on:function(a,b,c,d,e){var f,g;if("object"==typeof a){"string"!=typeof b&&(c=c||b,b=void 0);for(g in a)this.on(g,b,c,a[g],e);return this}if(null==c&&null==d?(d=b,c=b=void 0):null==d&&("string"==typeof b?(d=c,c=void 0):(d=c,c=b,b=void 0)),d===!1)d=$;else if(!d)return this;return 1===e&&(f=d,d=function(a){return n().off(a),f.apply(this,arguments)},d.guid=f.guid||(f.guid=n.guid++)),this.each(function(){n.event.add(this,a,d,c,b)})},one:function(a,b,c,d){return this.on(a,b,c,d,1)},off:function(a,b,c){var d,e;if(a&&a.preventDefault&&a.handleObj)return d=a.handleObj,n(a.delegateTarget).off(d.namespace?d.origType+"."+d.namespace:d.origType,d.selector,d.handler),this;if("object"==typeof a){for(e in a)this.off(e,b,a[e]);return this}return(b===!1||"function"==typeof b)&&(c=b,b=void 0),c===!1&&(c=$),this.each(function(){n.event.remove(this,a,c,b)})},trigger:function(a,b){return this.each(function(){n.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];return c?n.event.trigger(a,b,c,!0):void 0}});var aa=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,ba=/<([\w:]+)/,ca=/<|&#?\w+;/,da=/<(?:script|style|link)/i,ea=/checked\s*(?:[^=]|=\s*.checked.)/i,fa=/^$|\/(?:java|ecma)script/i,ga=/^true\/(.*)/,ha=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,ia={option:[1,"<select multiple='multiple'>","</select>"],thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};ia.optgroup=ia.option,ia.tbody=ia.tfoot=ia.colgroup=ia.caption=ia.thead,ia.th=ia.td;function ja(a,b){return n.nodeName(a,"table")&&n.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function ka(a){return a.type=(null!==a.getAttribute("type"))+"/"+a.type,a}function la(a){var b=ga.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function ma(a,b){for(var c=0,d=a.length;d>c;c++)L.set(a[c],"globalEval",!b||L.get(b[c],"globalEval"))}function na(a,b){var c,d,e,f,g,h,i,j;if(1===b.nodeType){if(L.hasData(a)&&(f=L.access(a),g=L.set(b,f),j=f.events)){delete g.handle,g.events={};for(e in j)for(c=0,d=j[e].length;d>c;c++)n.event.add(b,e,j[e][c])}M.hasData(a)&&(h=M.access(a),i=n.extend({},h),M.set(b,i))}}function oa(a,b){var c=a.getElementsByTagName?a.getElementsByTagName(b||"*"):a.querySelectorAll?a.querySelectorAll(b||"*"):[];return void 0===b||b&&n.nodeName(a,b)?n.merge([a],c):c}function pa(a,b){var c=b.nodeName.toLowerCase();"input"===c&&T.test(a.type)?b.checked=a.checked:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}n.extend({clone:function(a,b,c){var d,e,f,g,h=a.cloneNode(!0),i=n.contains(a.ownerDocument,a);if(!(k.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||n.isXMLDoc(a)))for(g=oa(h),f=oa(a),d=0,e=f.length;e>d;d++)pa(f[d],g[d]);if(b)if(c)for(f=f||oa(a),g=g||oa(h),d=0,e=f.length;e>d;d++)na(f[d],g[d]);else na(a,h);return g=oa(h,"script"),g.length>0&&ma(g,!i&&oa(a,"script")),h},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,k=b.createDocumentFragment(),l=[],m=0,o=a.length;o>m;m++)if(e=a[m],e||0===e)if("object"===n.type(e))n.merge(l,e.nodeType?[e]:e);else if(ca.test(e)){f=f||k.appendChild(b.createElement("div")),g=(ba.exec(e)||["",""])[1].toLowerCase(),h=ia[g]||ia._default,f.innerHTML=h[1]+e.replace(aa,"<$1></$2>")+h[2],j=h[0];while(j--)f=f.lastChild;n.merge(l,f.childNodes),f=k.firstChild,f.textContent=""}else l.push(b.createTextNode(e));k.textContent="",m=0;while(e=l[m++])if((!d||-1===n.inArray(e,d))&&(i=n.contains(e.ownerDocument,e),f=oa(k.appendChild(e),"script"),i&&ma(f),c)){j=0;while(e=f[j++])fa.test(e.type||"")&&c.push(e)}return k},cleanData:function(a){for(var b,c,d,e,f=n.event.special,g=0;void 0!==(c=a[g]);g++){if(n.acceptData(c)&&(e=c[L.expando],e&&(b=L.cache[e]))){if(b.events)for(d in b.events)f[d]?n.event.remove(c,d):n.removeEvent(c,d,b.handle);L.cache[e]&&delete L.cache[e]}delete M.cache[c[M.expando]]}}}),n.fn.extend({text:function(a){return J(this,function(a){return void 0===a?n.text(this):this.empty().each(function(){(1===this.nodeType||11===this.nodeType||9===this.nodeType)&&(this.textContent=a)})},null,a,arguments.length)},append:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=ja(this,a);b.appendChild(a)}})},prepend:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=ja(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},remove:function(a,b){for(var c,d=a?n.filter(a,this):this,e=0;null!=(c=d[e]);e++)b||1!==c.nodeType||n.cleanData(oa(c)),c.parentNode&&(b&&n.contains(c.ownerDocument,c)&&ma(oa(c,"script")),c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++)1===a.nodeType&&(n.cleanData(oa(a,!1)),a.textContent="");return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return n.clone(this,a,b)})},html:function(a){return J(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a&&1===b.nodeType)return b.innerHTML;if("string"==typeof a&&!da.test(a)&&!ia[(ba.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(aa,"<$1></$2>");try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(n.cleanData(oa(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=arguments[0];return this.domManip(arguments,function(b){a=this.parentNode,n.cleanData(oa(this)),a&&a.replaceChild(b,this)}),a&&(a.length||a.nodeType)?this:this.remove()},detach:function(a){return this.remove(a,!0)},domManip:function(a,b){a=e.apply([],a);var c,d,f,g,h,i,j=0,l=this.length,m=this,o=l-1,p=a[0],q=n.isFunction(p);if(q||l>1&&"string"==typeof p&&!k.checkClone&&ea.test(p))return this.each(function(c){var d=m.eq(c);q&&(a[0]=p.call(this,c,d.html())),d.domManip(a,b)});if(l&&(c=n.buildFragment(a,this[0].ownerDocument,!1,this),d=c.firstChild,1===c.childNodes.length&&(c=d),d)){for(f=n.map(oa(c,"script"),ka),g=f.length;l>j;j++)h=c,j!==o&&(h=n.clone(h,!0,!0),g&&n.merge(f,oa(h,"script"))),b.call(this[j],h,j);if(g)for(i=f[f.length-1].ownerDocument,n.map(f,la),j=0;g>j;j++)h=f[j],fa.test(h.type||"")&&!L.access(h,"globalEval")&&n.contains(i,h)&&(h.src?n._evalUrl&&n._evalUrl(h.src):n.globalEval(h.textContent.replace(ha,"")))}return this}}),n.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){n.fn[a]=function(a){for(var c,d=[],e=n(a),g=e.length-1,h=0;g>=h;h++)c=h===g?this:this.clone(!0),n(e[h])[b](c),f.apply(d,c.get());return this.pushStack(d)}});var qa,ra={};function sa(b,c){var d,e=n(c.createElement(b)).appendTo(c.body),f=a.getDefaultComputedStyle&&(d=a.getDefaultComputedStyle(e[0]))?d.display:n.css(e[0],"display");return e.detach(),f}function ta(a){var b=l,c=ra[a];return c||(c=sa(a,b),"none"!==c&&c||(qa=(qa||n("<iframe frameborder='0' width='0' height='0'/>")).appendTo(b.documentElement),b=qa[0].contentDocument,b.write(),b.close(),c=sa(a,b),qa.detach()),ra[a]=c),c}var ua=/^margin/,va=new RegExp("^("+Q+")(?!px)[a-z%]+$","i"),wa=function(b){return b.ownerDocument.defaultView.opener?b.ownerDocument.defaultView.getComputedStyle(b,null):a.getComputedStyle(b,null)};function xa(a,b,c){var d,e,f,g,h=a.style;return c=c||wa(a),c&&(g=c.getPropertyValue(b)||c[b]),c&&(""!==g||n.contains(a.ownerDocument,a)||(g=n.style(a,b)),va.test(g)&&ua.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=g,g=c.width,h.width=d,h.minWidth=e,h.maxWidth=f)),void 0!==g?g+"":g}function ya(a,b){return{get:function(){return a()?void delete this.get:(this.get=b).apply(this,arguments)}}}!function(){var b,c,d=l.documentElement,e=l.createElement("div"),f=l.createElement("div");if(f.style){f.style.backgroundClip="content-box",f.cloneNode(!0).style.backgroundClip="",k.clearCloneStyle="content-box"===f.style.backgroundClip,e.style.cssText="border:0;width:0;height:0;top:0;left:-9999px;margin-top:1px;position:absolute",e.appendChild(f);function g(){f.style.cssText="-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;display:block;margin-top:1%;top:1%;border:1px;padding:1px;width:4px;position:absolute",f.innerHTML="",d.appendChild(e);var g=a.getComputedStyle(f,null);b="1%"!==g.top,c="4px"===g.width,d.removeChild(e)}a.getComputedStyle&&n.extend(k,{pixelPosition:function(){return g(),b},boxSizingReliable:function(){return null==c&&g(),c},reliableMarginRight:function(){var b,c=f.appendChild(l.createElement("div"));return c.style.cssText=f.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:0",c.style.marginRight=c.style.width="0",f.style.width="1px",d.appendChild(e),b=!parseFloat(a.getComputedStyle(c,null).marginRight),d.removeChild(e),f.removeChild(c),b}})}}(),n.swap=function(a,b,c,d){var e,f,g={};for(f in b)g[f]=a.style[f],a.style[f]=b[f];e=c.apply(a,d||[]);for(f in b)a.style[f]=g[f];return e};var za=/^(none|table(?!-c[ea]).+)/,Aa=new RegExp("^("+Q+")(.*)$","i"),Ba=new RegExp("^([+-])=("+Q+")","i"),Ca={position:"absolute",visibility:"hidden",display:"block"},Da={letterSpacing:"0",fontWeight:"400"},Ea=["Webkit","O","Moz","ms"];function Fa(a,b){if(b in a)return b;var c=b[0].toUpperCase()+b.slice(1),d=b,e=Ea.length;while(e--)if(b=Ea[e]+c,b in a)return b;return d}function Ga(a,b,c){var d=Aa.exec(b);return d?Math.max(0,d[1]-(c||0))+(d[2]||"px"):b}function Ha(a,b,c,d,e){for(var f=c===(d?"border":"content")?4:"width"===b?1:0,g=0;4>f;f+=2)"margin"===c&&(g+=n.css(a,c+R[f],!0,e)),d?("content"===c&&(g-=n.css(a,"padding"+R[f],!0,e)),"margin"!==c&&(g-=n.css(a,"border"+R[f]+"Width",!0,e))):(g+=n.css(a,"padding"+R[f],!0,e),"padding"!==c&&(g+=n.css(a,"border"+R[f]+"Width",!0,e)));return g}function Ia(a,b,c){var d=!0,e="width"===b?a.offsetWidth:a.offsetHeight,f=wa(a),g="border-box"===n.css(a,"boxSizing",!1,f);if(0>=e||null==e){if(e=xa(a,b,f),(0>e||null==e)&&(e=a.style[b]),va.test(e))return e;d=g&&(k.boxSizingReliable()||e===a.style[b]),e=parseFloat(e)||0}return e+Ha(a,b,c||(g?"border":"content"),d,f)+"px"}function Ja(a,b){for(var c,d,e,f=[],g=0,h=a.length;h>g;g++)d=a[g],d.style&&(f[g]=L.get(d,"olddisplay"),c=d.style.display,b?(f[g]||"none"!==c||(d.style.display=""),""===d.style.display&&S(d)&&(f[g]=L.access(d,"olddisplay",ta(d.nodeName)))):(e=S(d),"none"===c&&e||L.set(d,"olddisplay",e?c:n.css(d,"display"))));for(g=0;h>g;g++)d=a[g],d.style&&(b&&"none"!==d.style.display&&""!==d.style.display||(d.style.display=b?f[g]||"":"none"));return a}n.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=xa(a,"opacity");return""===c?"1":c}}}},cssNumber:{columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":"cssFloat"},style:function(a,b,c,d){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var e,f,g,h=n.camelCase(b),i=a.style;return b=n.cssProps[h]||(n.cssProps[h]=Fa(i,h)),g=n.cssHooks[b]||n.cssHooks[h],void 0===c?g&&"get"in g&&void 0!==(e=g.get(a,!1,d))?e:i[b]:(f=typeof c,"string"===f&&(e=Ba.exec(c))&&(c=(e[1]+1)*e[2]+parseFloat(n.css(a,b)),f="number"),null!=c&&c===c&&("number"!==f||n.cssNumber[h]||(c+="px"),k.clearCloneStyle||""!==c||0!==b.indexOf("background")||(i[b]="inherit"),g&&"set"in g&&void 0===(c=g.set(a,c,d))||(i[b]=c)),void 0)}},css:function(a,b,c,d){var e,f,g,h=n.camelCase(b);return b=n.cssProps[h]||(n.cssProps[h]=Fa(a.style,h)),g=n.cssHooks[b]||n.cssHooks[h],g&&"get"in g&&(e=g.get(a,!0,c)),void 0===e&&(e=xa(a,b,d)),"normal"===e&&b in Da&&(e=Da[b]),""===c||c?(f=parseFloat(e),c===!0||n.isNumeric(f)?f||0:e):e}}),n.each(["height","width"],function(a,b){n.cssHooks[b]={get:function(a,c,d){return c?za.test(n.css(a,"display"))&&0===a.offsetWidth?n.swap(a,Ca,function(){return Ia(a,b,d)}):Ia(a,b,d):void 0},set:function(a,c,d){var e=d&&wa(a);return Ga(a,c,d?Ha(a,b,d,"border-box"===n.css(a,"boxSizing",!1,e),e):0)}}}),n.cssHooks.marginRight=ya(k.reliableMarginRight,function(a,b){return b?n.swap(a,{display:"inline-block"},xa,[a,"marginRight"]):void 0}),n.each({margin:"",padding:"",border:"Width"},function(a,b){n.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];4>d;d++)e[a+R[d]+b]=f[d]||f[d-2]||f[0];return e}},ua.test(a)||(n.cssHooks[a+b].set=Ga)}),n.fn.extend({css:function(a,b){return J(this,function(a,b,c){var d,e,f={},g=0;if(n.isArray(b)){for(d=wa(a),e=b.length;e>g;g++)f[b[g]]=n.css(a,b[g],!1,d);return f}return void 0!==c?n.style(a,b,c):n.css(a,b)},a,b,arguments.length>1)},show:function(){return Ja(this,!0)},hide:function(){return Ja(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){S(this)?n(this).show():n(this).hide()})}});function Ka(a,b,c,d,e){return new Ka.prototype.init(a,b,c,d,e)}n.Tween=Ka,Ka.prototype={constructor:Ka,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||"swing",this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(n.cssNumber[c]?"":"px")},cur:function(){var a=Ka.propHooks[this.prop];return a&&a.get?a.get(this):Ka.propHooks._default.get(this)},run:function(a){var b,c=Ka.propHooks[this.prop];return this.options.duration?this.pos=b=n.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):this.pos=b=a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):Ka.propHooks._default.set(this),this}},Ka.prototype.init.prototype=Ka.prototype,Ka.propHooks={_default:{get:function(a){var b;return null==a.elem[a.prop]||a.elem.style&&null!=a.elem.style[a.prop]?(b=n.css(a.elem,a.prop,""),b&&"auto"!==b?b:0):a.elem[a.prop]},set:function(a){n.fx.step[a.prop]?n.fx.step[a.prop](a):a.elem.style&&(null!=a.elem.style[n.cssProps[a.prop]]||n.cssHooks[a.prop])?n.style(a.elem,a.prop,a.now+a.unit):a.elem[a.prop]=a.now}}},Ka.propHooks.scrollTop=Ka.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},n.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2}},n.fx=Ka.prototype.init,n.fx.step={};var La,Ma,Na=/^(?:toggle|show|hide)$/,Oa=new RegExp("^(?:([+-])=|)("+Q+")([a-z%]*)$","i"),Pa=/queueHooks$/,Qa=[Va],Ra={"*":[function(a,b){var c=this.createTween(a,b),d=c.cur(),e=Oa.exec(b),f=e&&e[3]||(n.cssNumber[a]?"":"px"),g=(n.cssNumber[a]||"px"!==f&&+d)&&Oa.exec(n.css(c.elem,a)),h=1,i=20;if(g&&g[3]!==f){f=f||g[3],e=e||[],g=+d||1;do h=h||".5",g/=h,n.style(c.elem,a,g+f);while(h!==(h=c.cur()/d)&&1!==h&&--i)}return e&&(g=c.start=+g||+d||0,c.unit=f,c.end=e[1]?g+(e[1]+1)*e[2]:+e[2]),c}]};function Sa(){return setTimeout(function(){La=void 0}),La=n.now()}function Ta(a,b){var c,d=0,e={height:a};for(b=b?1:0;4>d;d+=2-b)c=R[d],e["margin"+c]=e["padding"+c]=a;return b&&(e.opacity=e.width=a),e}function Ua(a,b,c){for(var d,e=(Ra[b]||[]).concat(Ra["*"]),f=0,g=e.length;g>f;f++)if(d=e[f].call(c,b,a))return d}function Va(a,b,c){var d,e,f,g,h,i,j,k,l=this,m={},o=a.style,p=a.nodeType&&S(a),q=L.get(a,"fxshow");c.queue||(h=n._queueHooks(a,"fx"),null==h.unqueued&&(h.unqueued=0,i=h.empty.fire,h.empty.fire=function(){h.unqueued||i()}),h.unqueued++,l.always(function(){l.always(function(){h.unqueued--,n.queue(a,"fx").length||h.empty.fire()})})),1===a.nodeType&&("height"in b||"width"in b)&&(c.overflow=[o.overflow,o.overflowX,o.overflowY],j=n.css(a,"display"),k="none"===j?L.get(a,"olddisplay")||ta(a.nodeName):j,"inline"===k&&"none"===n.css(a,"float")&&(o.display="inline-block")),c.overflow&&(o.overflow="hidden",l.always(function(){o.overflow=c.overflow[0],o.overflowX=c.overflow[1],o.overflowY=c.overflow[2]}));for(d in b)if(e=b[d],Na.exec(e)){if(delete b[d],f=f||"toggle"===e,e===(p?"hide":"show")){if("show"!==e||!q||void 0===q[d])continue;p=!0}m[d]=q&&q[d]||n.style(a,d)}else j=void 0;if(n.isEmptyObject(m))"inline"===("none"===j?ta(a.nodeName):j)&&(o.display=j);else{q?"hidden"in q&&(p=q.hidden):q=L.access(a,"fxshow",{}),f&&(q.hidden=!p),p?n(a).show():l.done(function(){n(a).hide()}),l.done(function(){var b;L.remove(a,"fxshow");for(b in m)n.style(a,b,m[b])});for(d in m)g=Ua(p?q[d]:0,d,l),d in q||(q[d]=g.start,p&&(g.end=g.start,g.start="width"===d||"height"===d?1:0))}}function Wa(a,b){var c,d,e,f,g;for(c in a)if(d=n.camelCase(c),e=b[d],f=a[c],n.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=n.cssHooks[d],g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}function Xa(a,b,c){var d,e,f=0,g=Qa.length,h=n.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=La||Sa(),c=Math.max(0,j.startTime+j.duration-b),d=c/j.duration||0,f=1-d,g=0,i=j.tweens.length;i>g;g++)j.tweens[g].run(f);return h.notifyWith(a,[j,f,c]),1>f&&i?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:n.extend({},b),opts:n.extend(!0,{specialEasing:{}},c),originalProperties:b,originalOptions:c,startTime:La||Sa(),duration:c.duration,tweens:[],createTween:function(b,c){var d=n.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(d),d},stop:function(b){var c=0,d=b?j.tweens.length:0;if(e)return this;for(e=!0;d>c;c++)j.tweens[c].run(1);return b?h.resolveWith(a,[j,b]):h.rejectWith(a,[j,b]),this}}),k=j.props;for(Wa(k,j.opts.specialEasing);g>f;f++)if(d=Qa[f].call(j,a,k,j.opts))return d;return n.map(k,Ua,j),n.isFunction(j.opts.start)&&j.opts.start.call(a,j),n.fx.timer(n.extend(i,{elem:a,anim:j,queue:j.opts.queue})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}n.Animation=n.extend(Xa,{tweener:function(a,b){n.isFunction(a)?(b=a,a=["*"]):a=a.split(" ");for(var c,d=0,e=a.length;e>d;d++)c=a[d],Ra[c]=Ra[c]||[],Ra[c].unshift(b)},prefilter:function(a,b){b?Qa.unshift(a):Qa.push(a)}}),n.speed=function(a,b,c){var d=a&&"object"==typeof a?n.extend({},a):{complete:c||!c&&b||n.isFunction(a)&&a,duration:a,easing:c&&b||b&&!n.isFunction(b)&&b};return d.duration=n.fx.off?0:"number"==typeof d.duration?d.duration:d.duration in n.fx.speeds?n.fx.speeds[d.duration]:n.fx.speeds._default,(null==d.queue||d.queue===!0)&&(d.queue="fx"),d.old=d.complete,d.complete=function(){n.isFunction(d.old)&&d.old.call(this),d.queue&&n.dequeue(this,d.queue)},d},n.fn.extend({fadeTo:function(a,b,c,d){return this.filter(S).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=n.isEmptyObject(a),f=n.speed(b,c,d),g=function(){var b=Xa(this,n.extend({},a),f);(e||L.get(this,"finish"))&&b.stop(!0)};return g.finish=g,e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,b,c){var d=function(a){var b=a.stop;delete a.stop,b(c)};return"string"!=typeof a&&(c=b,b=a,a=void 0),b&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,e=null!=a&&a+"queueHooks",f=n.timers,g=L.get(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&Pa.test(e)&&d(g[e]);for(e=f.length;e--;)f[e].elem!==this||null!=a&&f[e].queue!==a||(f[e].anim.stop(c),b=!1,f.splice(e,1));(b||!c)&&n.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||"fx"),this.each(function(){var b,c=L.get(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=n.timers,g=d?d.length:0;for(c.finish=!0,n.queue(this,a,[]),e&&e.stop&&e.stop.call(this,!0),b=f.length;b--;)f[b].elem===this&&f[b].queue===a&&(f[b].anim.stop(!0),f.splice(b,1));for(b=0;g>b;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),n.each(["toggle","show","hide"],function(a,b){var c=n.fn[b];n.fn[b]=function(a,d,e){return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(Ta(b,!0),a,d,e)}}),n.each({slideDown:Ta("show"),slideUp:Ta("hide"),slideToggle:Ta("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){n.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),n.timers=[],n.fx.tick=function(){var a,b=0,c=n.timers;for(La=n.now();b<c.length;b++)a=c[b],a()||c[b]!==a||c.splice(b--,1);c.length||n.fx.stop(),La=void 0},n.fx.timer=function(a){n.timers.push(a),a()?n.fx.start():n.timers.pop()},n.fx.interval=13,n.fx.start=function(){Ma||(Ma=setInterval(n.fx.tick,n.fx.interval))},n.fx.stop=function(){clearInterval(Ma),Ma=null},n.fx.speeds={slow:600,fast:200,_default:400},n.fn.delay=function(a,b){return a=n.fx?n.fx.speeds[a]||a:a,b=b||"fx",this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},function(){var a=l.createElement("input"),b=l.createElement("select"),c=b.appendChild(l.createElement("option"));a.type="checkbox",k.checkOn=""!==a.value,k.optSelected=c.selected,b.disabled=!0,k.optDisabled=!c.disabled,a=l.createElement("input"),a.value="t",a.type="radio",k.radioValue="t"===a.value}();var Ya,Za,$a=n.expr.attrHandle;n.fn.extend({attr:function(a,b){return J(this,n.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){n.removeAttr(this,a)})}}),n.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(a&&3!==f&&8!==f&&2!==f)return typeof a.getAttribute===U?n.prop(a,b,c):(1===f&&n.isXMLDoc(a)||(b=b.toLowerCase(),d=n.attrHooks[b]||(n.expr.match.bool.test(b)?Za:Ya)),
-void 0===c?d&&"get"in d&&null!==(e=d.get(a,b))?e:(e=n.find.attr(a,b),null==e?void 0:e):null!==c?d&&"set"in d&&void 0!==(e=d.set(a,c,b))?e:(a.setAttribute(b,c+""),c):void n.removeAttr(a,b))},removeAttr:function(a,b){var c,d,e=0,f=b&&b.match(E);if(f&&1===a.nodeType)while(c=f[e++])d=n.propFix[c]||c,n.expr.match.bool.test(c)&&(a[d]=!1),a.removeAttribute(c)},attrHooks:{type:{set:function(a,b){if(!k.radioValue&&"radio"===b&&n.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}}}),Za={set:function(a,b,c){return b===!1?n.removeAttr(a,c):a.setAttribute(c,c),c}},n.each(n.expr.match.bool.source.match(/\w+/g),function(a,b){var c=$a[b]||n.find.attr;$a[b]=function(a,b,d){var e,f;return d||(f=$a[b],$a[b]=e,e=null!=c(a,b,d)?b.toLowerCase():null,$a[b]=f),e}});var _a=/^(?:input|select|textarea|button)$/i;n.fn.extend({prop:function(a,b){return J(this,n.prop,a,b,arguments.length>1)},removeProp:function(a){return this.each(function(){delete this[n.propFix[a]||a]})}}),n.extend({propFix:{"for":"htmlFor","class":"className"},prop:function(a,b,c){var d,e,f,g=a.nodeType;if(a&&3!==g&&8!==g&&2!==g)return f=1!==g||!n.isXMLDoc(a),f&&(b=n.propFix[b]||b,e=n.propHooks[b]),void 0!==c?e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&"get"in e&&null!==(d=e.get(a,b))?d:a[b]},propHooks:{tabIndex:{get:function(a){return a.hasAttribute("tabindex")||_a.test(a.nodeName)||a.href?a.tabIndex:-1}}}}),k.optSelected||(n.propHooks.selected={get:function(a){var b=a.parentNode;return b&&b.parentNode&&b.parentNode.selectedIndex,null}}),n.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){n.propFix[this.toLowerCase()]=this});var ab=/[\t\r\n\f]/g;n.fn.extend({addClass:function(a){var b,c,d,e,f,g,h="string"==typeof a&&a,i=0,j=this.length;if(n.isFunction(a))return this.each(function(b){n(this).addClass(a.call(this,b,this.className))});if(h)for(b=(a||"").match(E)||[];j>i;i++)if(c=this[i],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(ab," "):" ")){f=0;while(e=b[f++])d.indexOf(" "+e+" ")<0&&(d+=e+" ");g=n.trim(d),c.className!==g&&(c.className=g)}return this},removeClass:function(a){var b,c,d,e,f,g,h=0===arguments.length||"string"==typeof a&&a,i=0,j=this.length;if(n.isFunction(a))return this.each(function(b){n(this).removeClass(a.call(this,b,this.className))});if(h)for(b=(a||"").match(E)||[];j>i;i++)if(c=this[i],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(ab," "):"")){f=0;while(e=b[f++])while(d.indexOf(" "+e+" ")>=0)d=d.replace(" "+e+" "," ");g=a?n.trim(d):"",c.className!==g&&(c.className=g)}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):this.each(n.isFunction(a)?function(c){n(this).toggleClass(a.call(this,c,this.className,b),b)}:function(){if("string"===c){var b,d=0,e=n(this),f=a.match(E)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else(c===U||"boolean"===c)&&(this.className&&L.set(this,"__className__",this.className),this.className=this.className||a===!1?"":L.get(this,"__className__")||"")})},hasClass:function(a){for(var b=" "+a+" ",c=0,d=this.length;d>c;c++)if(1===this[c].nodeType&&(" "+this[c].className+" ").replace(ab," ").indexOf(b)>=0)return!0;return!1}});var bb=/\r/g;n.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=n.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,n(this).val()):a,null==e?e="":"number"==typeof e?e+="":n.isArray(e)&&(e=n.map(e,function(a){return null==a?"":a+""})),b=n.valHooks[this.type]||n.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=n.valHooks[e.type]||n.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(bb,""):null==c?"":c)}}}),n.extend({valHooks:{option:{get:function(a){var b=n.find.attr(a,"value");return null!=b?b:n.trim(n.text(a))}},select:{get:function(a){for(var b,c,d=a.options,e=a.selectedIndex,f="select-one"===a.type||0>e,g=f?null:[],h=f?e+1:d.length,i=0>e?h:f?e:0;h>i;i++)if(c=d[i],!(!c.selected&&i!==e||(k.optDisabled?c.disabled:null!==c.getAttribute("disabled"))||c.parentNode.disabled&&n.nodeName(c.parentNode,"optgroup"))){if(b=n(c).val(),f)return b;g.push(b)}return g},set:function(a,b){var c,d,e=a.options,f=n.makeArray(b),g=e.length;while(g--)d=e[g],(d.selected=n.inArray(d.value,f)>=0)&&(c=!0);return c||(a.selectedIndex=-1),f}}}}),n.each(["radio","checkbox"],function(){n.valHooks[this]={set:function(a,b){return n.isArray(b)?a.checked=n.inArray(n(a).val(),b)>=0:void 0}},k.checkOn||(n.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})}),n.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){n.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),n.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)}});var cb=n.now(),db=/\?/;n.parseJSON=function(a){return JSON.parse(a+"")},n.parseXML=function(a){var b,c;if(!a||"string"!=typeof a)return null;try{c=new DOMParser,b=c.parseFromString(a,"text/xml")}catch(d){b=void 0}return(!b||b.getElementsByTagName("parsererror").length)&&n.error("Invalid XML: "+a),b};var eb=/#.*$/,fb=/([?&])_=[^&]*/,gb=/^(.*?):[ \t]*([^\r\n]*)$/gm,hb=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,ib=/^(?:GET|HEAD)$/,jb=/^\/\//,kb=/^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,lb={},mb={},nb="*/".concat("*"),ob=a.location.href,pb=kb.exec(ob.toLowerCase())||[];function qb(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(E)||[];if(n.isFunction(c))while(d=f[e++])"+"===d[0]?(d=d.slice(1)||"*",(a[d]=a[d]||[]).unshift(c)):(a[d]=a[d]||[]).push(c)}}function rb(a,b,c,d){var e={},f=a===mb;function g(h){var i;return e[h]=!0,n.each(a[h]||[],function(a,h){var j=h(b,c,d);return"string"!=typeof j||f||e[j]?f?!(i=j):void 0:(b.dataTypes.unshift(j),g(j),!1)}),i}return g(b.dataTypes[0])||!e["*"]&&g("*")}function sb(a,b){var c,d,e=n.ajaxSettings.flatOptions||{};for(c in b)void 0!==b[c]&&((e[c]?a:d||(d={}))[c]=b[c]);return d&&n.extend(!0,a,d),a}function tb(a,b,c){var d,e,f,g,h=a.contents,i=a.dataTypes;while("*"===i[0])i.shift(),void 0===d&&(d=a.mimeType||b.getResponseHeader("Content-Type"));if(d)for(e in h)if(h[e]&&h[e].test(d)){i.unshift(e);break}if(i[0]in c)f=i[0];else{for(e in c){if(!i[0]||a.converters[e+" "+i[0]]){f=e;break}g||(g=e)}f=f||g}return f?(f!==i[0]&&i.unshift(f),c[f]):void 0}function ub(a,b,c,d){var e,f,g,h,i,j={},k=a.dataTypes.slice();if(k[1])for(g in a.converters)j[g.toLowerCase()]=a.converters[g];f=k.shift();while(f)if(a.responseFields[f]&&(c[a.responseFields[f]]=b),!i&&d&&a.dataFilter&&(b=a.dataFilter(b,a.dataType)),i=f,f=k.shift())if("*"===f)f=i;else if("*"!==i&&i!==f){if(g=j[i+" "+f]||j["* "+f],!g)for(e in j)if(h=e.split(" "),h[1]===f&&(g=j[i+" "+h[0]]||j["* "+h[0]])){g===!0?g=j[e]:j[e]!==!0&&(f=h[0],k.unshift(h[1]));break}if(g!==!0)if(g&&a["throws"])b=g(b);else try{b=g(b)}catch(l){return{state:"parsererror",error:g?l:"No conversion from "+i+" to "+f}}}return{state:"success",data:b}}n.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:ob,type:"GET",isLocal:hb.test(pb[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":nb,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":n.parseJSON,"text xml":n.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?sb(sb(a,n.ajaxSettings),b):sb(n.ajaxSettings,a)},ajaxPrefilter:qb(lb),ajaxTransport:qb(mb),ajax:function(a,b){"object"==typeof a&&(b=a,a=void 0),b=b||{};var c,d,e,f,g,h,i,j,k=n.ajaxSetup({},b),l=k.context||k,m=k.context&&(l.nodeType||l.jquery)?n(l):n.event,o=n.Deferred(),p=n.Callbacks("once memory"),q=k.statusCode||{},r={},s={},t=0,u="canceled",v={readyState:0,getResponseHeader:function(a){var b;if(2===t){if(!f){f={};while(b=gb.exec(e))f[b[1].toLowerCase()]=b[2]}b=f[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return 2===t?e:null},setRequestHeader:function(a,b){var c=a.toLowerCase();return t||(a=s[c]=s[c]||a,r[a]=b),this},overrideMimeType:function(a){return t||(k.mimeType=a),this},statusCode:function(a){var b;if(a)if(2>t)for(b in a)q[b]=[q[b],a[b]];else v.always(a[v.status]);return this},abort:function(a){var b=a||u;return c&&c.abort(b),x(0,b),this}};if(o.promise(v).complete=p.add,v.success=v.done,v.error=v.fail,k.url=((a||k.url||ob)+"").replace(eb,"").replace(jb,pb[1]+"//"),k.type=b.method||b.type||k.method||k.type,k.dataTypes=n.trim(k.dataType||"*").toLowerCase().match(E)||[""],null==k.crossDomain&&(h=kb.exec(k.url.toLowerCase()),k.crossDomain=!(!h||h[1]===pb[1]&&h[2]===pb[2]&&(h[3]||("http:"===h[1]?"80":"443"))===(pb[3]||("http:"===pb[1]?"80":"443")))),k.data&&k.processData&&"string"!=typeof k.data&&(k.data=n.param(k.data,k.traditional)),rb(lb,k,b,v),2===t)return v;i=n.event&&k.global,i&&0===n.active++&&n.event.trigger("ajaxStart"),k.type=k.type.toUpperCase(),k.hasContent=!ib.test(k.type),d=k.url,k.hasContent||(k.data&&(d=k.url+=(db.test(d)?"&":"?")+k.data,delete k.data),k.cache===!1&&(k.url=fb.test(d)?d.replace(fb,"$1_="+cb++):d+(db.test(d)?"&":"?")+"_="+cb++)),k.ifModified&&(n.lastModified[d]&&v.setRequestHeader("If-Modified-Since",n.lastModified[d]),n.etag[d]&&v.setRequestHeader("If-None-Match",n.etag[d])),(k.data&&k.hasContent&&k.contentType!==!1||b.contentType)&&v.setRequestHeader("Content-Type",k.contentType),v.setRequestHeader("Accept",k.dataTypes[0]&&k.accepts[k.dataTypes[0]]?k.accepts[k.dataTypes[0]]+("*"!==k.dataTypes[0]?", "+nb+"; q=0.01":""):k.accepts["*"]);for(j in k.headers)v.setRequestHeader(j,k.headers[j]);if(k.beforeSend&&(k.beforeSend.call(l,v,k)===!1||2===t))return v.abort();u="abort";for(j in{success:1,error:1,complete:1})v[j](k[j]);if(c=rb(mb,k,b,v)){v.readyState=1,i&&m.trigger("ajaxSend",[v,k]),k.async&&k.timeout>0&&(g=setTimeout(function(){v.abort("timeout")},k.timeout));try{t=1,c.send(r,x)}catch(w){if(!(2>t))throw w;x(-1,w)}}else x(-1,"No Transport");function x(a,b,f,h){var j,r,s,u,w,x=b;2!==t&&(t=2,g&&clearTimeout(g),c=void 0,e=h||"",v.readyState=a>0?4:0,j=a>=200&&300>a||304===a,f&&(u=tb(k,v,f)),u=ub(k,u,v,j),j?(k.ifModified&&(w=v.getResponseHeader("Last-Modified"),w&&(n.lastModified[d]=w),w=v.getResponseHeader("etag"),w&&(n.etag[d]=w)),204===a||"HEAD"===k.type?x="nocontent":304===a?x="notmodified":(x=u.state,r=u.data,s=u.error,j=!s)):(s=x,(a||!x)&&(x="error",0>a&&(a=0))),v.status=a,v.statusText=(b||x)+"",j?o.resolveWith(l,[r,x,v]):o.rejectWith(l,[v,x,s]),v.statusCode(q),q=void 0,i&&m.trigger(j?"ajaxSuccess":"ajaxError",[v,k,j?r:s]),p.fireWith(l,[v,x]),i&&(m.trigger("ajaxComplete",[v,k]),--n.active||n.event.trigger("ajaxStop")))}return v},getJSON:function(a,b,c){return n.get(a,b,c,"json")},getScript:function(a,b){return n.get(a,void 0,b,"script")}}),n.each(["get","post"],function(a,b){n[b]=function(a,c,d,e){return n.isFunction(c)&&(e=e||d,d=c,c=void 0),n.ajax({url:a,type:b,dataType:e,data:c,success:d})}}),n._evalUrl=function(a){return n.ajax({url:a,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})},n.fn.extend({wrapAll:function(a){var b;return n.isFunction(a)?this.each(function(b){n(this).wrapAll(a.call(this,b))}):(this[0]&&(b=n(a,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstElementChild)a=a.firstElementChild;return a}).append(this)),this)},wrapInner:function(a){return this.each(n.isFunction(a)?function(b){n(this).wrapInner(a.call(this,b))}:function(){var b=n(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=n.isFunction(a);return this.each(function(c){n(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){n.nodeName(this,"body")||n(this).replaceWith(this.childNodes)}).end()}}),n.expr.filters.hidden=function(a){return a.offsetWidth<=0&&a.offsetHeight<=0},n.expr.filters.visible=function(a){return!n.expr.filters.hidden(a)};var vb=/%20/g,wb=/\[\]$/,xb=/\r?\n/g,yb=/^(?:submit|button|image|reset|file)$/i,zb=/^(?:input|select|textarea|keygen)/i;function Ab(a,b,c,d){var e;if(n.isArray(b))n.each(b,function(b,e){c||wb.test(a)?d(a,e):Ab(a+"["+("object"==typeof e?b:"")+"]",e,c,d)});else if(c||"object"!==n.type(b))d(a,b);else for(e in b)Ab(a+"["+e+"]",b[e],c,d)}n.param=function(a,b){var c,d=[],e=function(a,b){b=n.isFunction(b)?b():null==b?"":b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};if(void 0===b&&(b=n.ajaxSettings&&n.ajaxSettings.traditional),n.isArray(a)||a.jquery&&!n.isPlainObject(a))n.each(a,function(){e(this.name,this.value)});else for(c in a)Ab(c,a[c],b,e);return d.join("&").replace(vb,"+")},n.fn.extend({serialize:function(){return n.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=n.prop(this,"elements");return a?n.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!n(this).is(":disabled")&&zb.test(this.nodeName)&&!yb.test(a)&&(this.checked||!T.test(a))}).map(function(a,b){var c=n(this).val();return null==c?null:n.isArray(c)?n.map(c,function(a){return{name:b.name,value:a.replace(xb,"\r\n")}}):{name:b.name,value:c.replace(xb,"\r\n")}}).get()}}),n.ajaxSettings.xhr=function(){try{return new XMLHttpRequest}catch(a){}};var Bb=0,Cb={},Db={0:200,1223:204},Eb=n.ajaxSettings.xhr();a.attachEvent&&a.attachEvent("onunload",function(){for(var a in Cb)Cb[a]()}),k.cors=!!Eb&&"withCredentials"in Eb,k.ajax=Eb=!!Eb,n.ajaxTransport(function(a){var b;return k.cors||Eb&&!a.crossDomain?{send:function(c,d){var e,f=a.xhr(),g=++Bb;if(f.open(a.type,a.url,a.async,a.username,a.password),a.xhrFields)for(e in a.xhrFields)f[e]=a.xhrFields[e];a.mimeType&&f.overrideMimeType&&f.overrideMimeType(a.mimeType),a.crossDomain||c["X-Requested-With"]||(c["X-Requested-With"]="XMLHttpRequest");for(e in c)f.setRequestHeader(e,c[e]);b=function(a){return function(){b&&(delete Cb[g],b=f.onload=f.onerror=null,"abort"===a?f.abort():"error"===a?d(f.status,f.statusText):d(Db[f.status]||f.status,f.statusText,"string"==typeof f.responseText?{text:f.responseText}:void 0,f.getAllResponseHeaders()))}},f.onload=b(),f.onerror=b("error"),b=Cb[g]=b("abort");try{f.send(a.hasContent&&a.data||null)}catch(h){if(b)throw h}},abort:function(){b&&b()}}:void 0}),n.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(a){return n.globalEval(a),a}}}),n.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET")}),n.ajaxTransport("script",function(a){if(a.crossDomain){var b,c;return{send:function(d,e){b=n("<script>").prop({async:!0,charset:a.scriptCharset,src:a.url}).on("load error",c=function(a){b.remove(),c=null,a&&e("error"===a.type?404:200,a.type)}),l.head.appendChild(b[0])},abort:function(){c&&c()}}}});var Fb=[],Gb=/(=)\?(?=&|$)|\?\?/;n.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=Fb.pop()||n.expando+"_"+cb++;return this[a]=!0,a}}),n.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(Gb.test(b.url)?"url":"string"==typeof b.data&&!(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&Gb.test(b.data)&&"data");return h||"jsonp"===b.dataTypes[0]?(e=b.jsonpCallback=n.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,h?b[h]=b[h].replace(Gb,"$1"+e):b.jsonp!==!1&&(b.url+=(db.test(b.url)?"&":"?")+b.jsonp+"="+e),b.converters["script json"]=function(){return g||n.error(e+" was not called"),g[0]},b.dataTypes[0]="json",f=a[e],a[e]=function(){g=arguments},d.always(function(){a[e]=f,b[e]&&(b.jsonpCallback=c.jsonpCallback,Fb.push(e)),g&&n.isFunction(f)&&f(g[0]),g=f=void 0}),"script"):void 0}),n.parseHTML=function(a,b,c){if(!a||"string"!=typeof a)return null;"boolean"==typeof b&&(c=b,b=!1),b=b||l;var d=v.exec(a),e=!c&&[];return d?[b.createElement(d[1])]:(d=n.buildFragment([a],b,e),e&&e.length&&n(e).remove(),n.merge([],d.childNodes))};var Hb=n.fn.load;n.fn.load=function(a,b,c){if("string"!=typeof a&&Hb)return Hb.apply(this,arguments);var d,e,f,g=this,h=a.indexOf(" ");return h>=0&&(d=n.trim(a.slice(h)),a=a.slice(0,h)),n.isFunction(b)?(c=b,b=void 0):b&&"object"==typeof b&&(e="POST"),g.length>0&&n.ajax({url:a,type:e,dataType:"html",data:b}).done(function(a){f=arguments,g.html(d?n("<div>").append(n.parseHTML(a)).find(d):a)}).complete(c&&function(a,b){g.each(c,f||[a.responseText,b,a])}),this},n.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){n.fn[b]=function(a){return this.on(b,a)}}),n.expr.filters.animated=function(a){return n.grep(n.timers,function(b){return a===b.elem}).length};var Ib=a.document.documentElement;function Jb(a){return n.isWindow(a)?a:9===a.nodeType&&a.defaultView}n.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=n.css(a,"position"),l=n(a),m={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=n.css(a,"top"),i=n.css(a,"left"),j=("absolute"===k||"fixed"===k)&&(f+i).indexOf("auto")>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),n.isFunction(b)&&(b=b.call(a,c,h)),null!=b.top&&(m.top=b.top-h.top+g),null!=b.left&&(m.left=b.left-h.left+e),"using"in b?b.using.call(a,m):l.css(m)}},n.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){n.offset.setOffset(this,a,b)});var b,c,d=this[0],e={top:0,left:0},f=d&&d.ownerDocument;if(f)return b=f.documentElement,n.contains(b,d)?(typeof d.getBoundingClientRect!==U&&(e=d.getBoundingClientRect()),c=Jb(f),{top:e.top+c.pageYOffset-b.clientTop,left:e.left+c.pageXOffset-b.clientLeft}):e},position:function(){if(this[0]){var a,b,c=this[0],d={top:0,left:0};return"fixed"===n.css(c,"position")?b=c.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),n.nodeName(a[0],"html")||(d=a.offset()),d.top+=n.css(a[0],"borderTopWidth",!0),d.left+=n.css(a[0],"borderLeftWidth",!0)),{top:b.top-d.top-n.css(c,"marginTop",!0),left:b.left-d.left-n.css(c,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||Ib;while(a&&!n.nodeName(a,"html")&&"static"===n.css(a,"position"))a=a.offsetParent;return a||Ib})}}),n.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(b,c){var d="pageYOffset"===c;n.fn[b]=function(e){return J(this,function(b,e,f){var g=Jb(b);return void 0===f?g?g[c]:b[e]:void(g?g.scrollTo(d?a.pageXOffset:f,d?f:a.pageYOffset):b[e]=f)},b,e,arguments.length,null)}}),n.each(["top","left"],function(a,b){n.cssHooks[b]=ya(k.pixelPosition,function(a,c){return c?(c=xa(a,b),va.test(c)?n(a).position()[b]+"px":c):void 0})}),n.each({Height:"height",Width:"width"},function(a,b){n.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){n.fn[d]=function(d,e){var f=arguments.length&&(c||"boolean"!=typeof d),g=c||(d===!0||e===!0?"margin":"border");return J(this,function(b,c,d){var e;return n.isWindow(b)?b.document.documentElement["client"+a]:9===b.nodeType?(e=b.documentElement,Math.max(b.body["scroll"+a],e["scroll"+a],b.body["offset"+a],e["offset"+a],e["client"+a])):void 0===d?n.css(b,c,g):n.style(b,c,d,g)},b,f?d:void 0,f,null)}})}),n.fn.size=function(){return this.length},n.fn.andSelf=n.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return n});var Kb=a.jQuery,Lb=a.$;return n.noConflict=function(b){return a.$===n&&(a.$=Lb),b&&a.jQuery===n&&(a.jQuery=Kb),n},typeof b===U&&(a.jQuery=a.$=n),n});
diff --git a/#pma/js/jquery/jquery-ui-1.11.4.min.js b/#pma/js/jquery/jquery-ui-1.11.4.min.js
deleted file mode 100644
index 9baf7409..00000000
--- a/#pma/js/jquery/jquery-ui-1.11.4.min.js
+++ /dev/null
@@ -1,13 +0,0 @@
-/*! jQuery UI - v1.11.4 - 2016-01-03
-* http://jqueryui.com
-* Includes: core.js, widget.js, mouse.js, position.js, draggable.js, droppable.js, resizable.js, selectable.js, sortable.js, accordion.js, autocomplete.js, button.js, datepicker.js, dialog.js, menu.js, progressbar.js, selectmenu.js, slider.js, spinner.js, tabs.js, tooltip.js, effect.js, effect-blind.js, effect-bounce.js, effect-clip.js, effect-drop.js, effect-explode.js, effect-fade.js, effect-fold.js, effect-highlight.js, effect-puff.js, effect-pulsate.js, effect-scale.js, effect-shake.js, effect-size.js, effect-slide.js, effect-transfer.js
-* Copyright jQuery Foundation and other contributors; Licensed MIT */
-
-(function(e){"function"==typeof define&&define.amd?define(["jquery"],e):e(jQuery)})(function(e){function t(t,s){var n,a,o,r=t.nodeName.toLowerCase();return"area"===r?(n=t.parentNode,a=n.name,t.href&&a&&"map"===n.nodeName.toLowerCase()?(o=e("img[usemap='#"+a+"']")[0],!!o&&i(o)):!1):(/^(input|select|textarea|button|object)$/.test(r)?!t.disabled:"a"===r?t.href||s:s)&&i(t)}function i(t){return e.expr.filters.visible(t)&&!e(t).parents().addBack().filter(function(){return"hidden"===e.css(this,"visibility")}).length}function s(e){for(var t,i;e.length&&e[0]!==document;){if(t=e.css("position"),("absolute"===t||"relative"===t||"fixed"===t)&&(i=parseInt(e.css("zIndex"),10),!isNaN(i)&&0!==i))return i;e=e.parent()}return 0}function n(){this._curInst=null,this._keyEvent=!1,this._disabledInputs=[],this._datepickerShowing=!1,this._inDialog=!1,this._mainDivId="ui-datepicker-div",this._inlineClass="ui-datepicker-inline",this._appendClass="ui-datepicker-append",this._triggerClass="ui-datepicker-trigger",this._dialogClass="ui-datepicker-dialog",this._disableClass="ui-datepicker-disabled",this._unselectableClass="ui-datepicker-unselectable",this._currentClass="ui-datepicker-current-day",this._dayOverClass="ui-datepicker-days-cell-over",this.regional=[],this.regional[""]={closeText:"Done",prevText:"Prev",nextText:"Next",currentText:"Today",monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayNamesMin:["Su","Mo","Tu","We","Th","Fr","Sa"],weekHeader:"Wk",dateFormat:"mm/dd/yy",firstDay:0,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""},this._defaults={showOn:"focus",showAnim:"fadeIn",showOptions:{},defaultDate:null,appendText:"",buttonText:"...",buttonImage:"",buttonImageOnly:!1,hideIfNoPrevNext:!1,navigationAsDateFormat:!1,gotoCurrent:!1,changeMonth:!1,changeYear:!1,yearRange:"c-10:c+10",showOtherMonths:!1,selectOtherMonths:!1,showWeek:!1,calculateWeek:this.iso8601Week,shortYearCutoff:"+10",minDate:null,maxDate:null,duration:"fast",beforeShowDay:null,beforeShow:null,onSelect:null,onChangeMonthYear:null,onClose:null,numberOfMonths:1,showCurrentAtPos:0,stepMonths:1,stepBigMonths:12,altField:"",altFormat:"",constrainInput:!0,showButtonPanel:!1,autoSize:!1,disabled:!1},e.extend(this._defaults,this.regional[""]),this.regional.en=e.extend(!0,{},this.regional[""]),this.regional["en-US"]=e.extend(!0,{},this.regional.en),this.dpDiv=a(e("<div id='"+this._mainDivId+"' class='ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>"))}function a(t){var i="button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a";return t.delegate(i,"mouseout",function(){e(this).removeClass("ui-state-hover"),-1!==this.className.indexOf("ui-datepicker-prev")&&e(this).removeClass("ui-datepicker-prev-hover"),-1!==this.className.indexOf("ui-datepicker-next")&&e(this).removeClass("ui-datepicker-next-hover")}).delegate(i,"mouseover",o)}function o(){e.datepicker._isDisabledDatepicker(v.inline?v.dpDiv.parent()[0]:v.input[0])||(e(this).parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover"),e(this).addClass("ui-state-hover"),-1!==this.className.indexOf("ui-datepicker-prev")&&e(this).addClass("ui-datepicker-prev-hover"),-1!==this.className.indexOf("ui-datepicker-next")&&e(this).addClass("ui-datepicker-next-hover"))}function r(t,i){e.extend(t,i);for(var s in i)null==i[s]&&(t[s]=i[s]);return t}function h(e){return function(){var t=this.element.val();e.apply(this,arguments),this._refresh(),t!==this.element.val()&&this._trigger("change")}}e.ui=e.ui||{},e.extend(e.ui,{version:"1.11.4",keyCode:{BACKSPACE:8,COMMA:188,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,LEFT:37,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SPACE:32,TAB:9,UP:38}}),e.fn.extend({scrollParent:function(t){var i=this.css("position"),s="absolute"===i,n=t?/(auto|scroll|hidden)/:/(auto|scroll)/,a=this.parents().filter(function(){var t=e(this);return s&&"static"===t.css("position")?!1:n.test(t.css("overflow")+t.css("overflow-y")+t.css("overflow-x"))}).eq(0);return"fixed"!==i&&a.length?a:e(this[0].ownerDocument||document)},uniqueId:function(){var e=0;return function(){return this.each(function(){this.id||(this.id="ui-id-"+ ++e)})}}(),removeUniqueId:function(){return this.each(function(){/^ui-id-\d+$/.test(this.id)&&e(this).removeAttr("id")})}}),e.extend(e.expr[":"],{data:e.expr.createPseudo?e.expr.createPseudo(function(t){return function(i){return!!e.data(i,t)}}):function(t,i,s){return!!e.data(t,s[3])},focusable:function(i){return t(i,!isNaN(e.attr(i,"tabindex")))},tabbable:function(i){var s=e.attr(i,"tabindex"),n=isNaN(s);return(n||s>=0)&&t(i,!n)}}),e("<a>").outerWidth(1).jquery||e.each(["Width","Height"],function(t,i){function s(t,i,s,a){return e.each(n,function(){i-=parseFloat(e.css(t,"padding"+this))||0,s&&(i-=parseFloat(e.css(t,"border"+this+"Width"))||0),a&&(i-=parseFloat(e.css(t,"margin"+this))||0)}),i}var n="Width"===i?["Left","Right"]:["Top","Bottom"],a=i.toLowerCase(),o={innerWidth:e.fn.innerWidth,innerHeight:e.fn.innerHeight,outerWidth:e.fn.outerWidth,outerHeight:e.fn.outerHeight};e.fn["inner"+i]=function(t){return void 0===t?o["inner"+i].call(this):this.each(function(){e(this).css(a,s(this,t)+"px")})},e.fn["outer"+i]=function(t,n){return"number"!=typeof t?o["outer"+i].call(this,t):this.each(function(){e(this).css(a,s(this,t,!0,n)+"px")})}}),e.fn.addBack||(e.fn.addBack=function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}),e("<a>").data("a-b","a").removeData("a-b").data("a-b")&&(e.fn.removeData=function(t){return function(i){return arguments.length?t.call(this,e.camelCase(i)):t.call(this)}}(e.fn.removeData)),e.ui.ie=!!/msie [\w.]+/.exec(navigator.userAgent.toLowerCase()),e.fn.extend({focus:function(t){return function(i,s){return"number"==typeof i?this.each(function(){var t=this;setTimeout(function(){e(t).focus(),s&&s.call(t)},i)}):t.apply(this,arguments)}}(e.fn.focus),disableSelection:function(){var e="onselectstart"in document.createElement("div")?"selectstart":"mousedown";return function(){return this.bind(e+".ui-disableSelection",function(e){e.preventDefault()})}}(),enableSelection:function(){return this.unbind(".ui-disableSelection")},zIndex:function(t){if(void 0!==t)return this.css("zIndex",t);if(this.length)for(var i,s,n=e(this[0]);n.length&&n[0]!==document;){if(i=n.css("position"),("absolute"===i||"relative"===i||"fixed"===i)&&(s=parseInt(n.css("zIndex"),10),!isNaN(s)&&0!==s))return s;n=n.parent()}return 0}}),e.ui.plugin={add:function(t,i,s){var n,a=e.ui[t].prototype;for(n in s)a.plugins[n]=a.plugins[n]||[],a.plugins[n].push([i,s[n]])},call:function(e,t,i,s){var n,a=e.plugins[t];if(a&&(s||e.element[0].parentNode&&11!==e.element[0].parentNode.nodeType))for(n=0;a.length>n;n++)e.options[a[n][0]]&&a[n][1].apply(e.element,i)}};var l=0,u=Array.prototype.slice;e.cleanData=function(t){return function(i){var s,n,a;for(a=0;null!=(n=i[a]);a++)try{s=e._data(n,"events"),s&&s.remove&&e(n).triggerHandler("remove")}catch(o){}t(i)}}(e.cleanData),e.widget=function(t,i,s){var n,a,o,r,h={},l=t.split(".")[0];return t=t.split(".")[1],n=l+"-"+t,s||(s=i,i=e.Widget),e.expr[":"][n.toLowerCase()]=function(t){return!!e.data(t,n)},e[l]=e[l]||{},a=e[l][t],o=e[l][t]=function(e,t){return this._createWidget?(arguments.length&&this._createWidget(e,t),void 0):new o(e,t)},e.extend(o,a,{version:s.version,_proto:e.extend({},s),_childConstructors:[]}),r=new i,r.options=e.widget.extend({},r.options),e.each(s,function(t,s){return e.isFunction(s)?(h[t]=function(){var e=function(){return i.prototype[t].apply(this,arguments)},n=function(e){return i.prototype[t].apply(this,e)};return function(){var t,i=this._super,a=this._superApply;return this._super=e,this._superApply=n,t=s.apply(this,arguments),this._super=i,this._superApply=a,t}}(),void 0):(h[t]=s,void 0)}),o.prototype=e.widget.extend(r,{widgetEventPrefix:a?r.widgetEventPrefix||t:t},h,{constructor:o,namespace:l,widgetName:t,widgetFullName:n}),a?(e.each(a._childConstructors,function(t,i){var s=i.prototype;e.widget(s.namespace+"."+s.widgetName,o,i._proto)}),delete a._childConstructors):i._childConstructors.push(o),e.widget.bridge(t,o),o},e.widget.extend=function(t){for(var i,s,n=u.call(arguments,1),a=0,o=n.length;o>a;a++)for(i in n[a])s=n[a][i],n[a].hasOwnProperty(i)&&void 0!==s&&(t[i]=e.isPlainObject(s)?e.isPlainObject(t[i])?e.widget.extend({},t[i],s):e.widget.extend({},s):s);return t},e.widget.bridge=function(t,i){var s=i.prototype.widgetFullName||t;e.fn[t]=function(n){var a="string"==typeof n,o=u.call(arguments,1),r=this;return a?this.each(function(){var i,a=e.data(this,s);return"instance"===n?(r=a,!1):a?e.isFunction(a[n])&&"_"!==n.charAt(0)?(i=a[n].apply(a,o),i!==a&&void 0!==i?(r=i&&i.jquery?r.pushStack(i.get()):i,!1):void 0):e.error("no such method '"+n+"' for "+t+" widget instance"):e.error("cannot call methods on "+t+" prior to initialization; "+"attempted to call method '"+n+"'")}):(o.length&&(n=e.widget.extend.apply(null,[n].concat(o))),this.each(function(){var t=e.data(this,s);t?(t.option(n||{}),t._init&&t._init()):e.data(this,s,new i(n,this))})),r}},e.Widget=function(){},e.Widget._childConstructors=[],e.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",defaultElement:"<div>",options:{disabled:!1,create:null},_createWidget:function(t,i){i=e(i||this.defaultElement||this)[0],this.element=e(i),this.uuid=l++,this.eventNamespace="."+this.widgetName+this.uuid,this.bindings=e(),this.hoverable=e(),this.focusable=e(),i!==this&&(e.data(i,this.widgetFullName,this),this._on(!0,this.element,{remove:function(e){e.target===i&&this.destroy()}}),this.document=e(i.style?i.ownerDocument:i.document||i),this.window=e(this.document[0].defaultView||this.document[0].parentWindow)),this.options=e.widget.extend({},this.options,this._getCreateOptions(),t),this._create(),this._trigger("create",null,this._getCreateEventData()),this._init()},_getCreateOptions:e.noop,_getCreateEventData:e.noop,_create:e.noop,_init:e.noop,destroy:function(){this._destroy(),this.element.unbind(this.eventNamespace).removeData(this.widgetFullName).removeData(e.camelCase(this.widgetFullName)),this.widget().unbind(this.eventNamespace).removeAttr("aria-disabled").removeClass(this.widgetFullName+"-disabled "+"ui-state-disabled"),this.bindings.unbind(this.eventNamespace),this.hoverable.removeClass("ui-state-hover"),this.focusable.removeClass("ui-state-focus")},_destroy:e.noop,widget:function(){return this.element},option:function(t,i){var s,n,a,o=t;if(0===arguments.length)return e.widget.extend({},this.options);if("string"==typeof t)if(o={},s=t.split("."),t=s.shift(),s.length){for(n=o[t]=e.widget.extend({},this.options[t]),a=0;s.length-1>a;a++)n[s[a]]=n[s[a]]||{},n=n[s[a]];if(t=s.pop(),1===arguments.length)return void 0===n[t]?null:n[t];n[t]=i}else{if(1===arguments.length)return void 0===this.options[t]?null:this.options[t];o[t]=i}return this._setOptions(o),this},_setOptions:function(e){var t;for(t in e)this._setOption(t,e[t]);return this},_setOption:function(e,t){return this.options[e]=t,"disabled"===e&&(this.widget().toggleClass(this.widgetFullName+"-disabled",!!t),t&&(this.hoverable.removeClass("ui-state-hover"),this.focusable.removeClass("ui-state-focus"))),this},enable:function(){return this._setOptions({disabled:!1})},disable:function(){return this._setOptions({disabled:!0})},_on:function(t,i,s){var n,a=this;"boolean"!=typeof t&&(s=i,i=t,t=!1),s?(i=n=e(i),this.bindings=this.bindings.add(i)):(s=i,i=this.element,n=this.widget()),e.each(s,function(s,o){function r(){return t||a.options.disabled!==!0&&!e(this).hasClass("ui-state-disabled")?("string"==typeof o?a[o]:o).apply(a,arguments):void 0}"string"!=typeof o&&(r.guid=o.guid=o.guid||r.guid||e.guid++);var h=s.match(/^([\w:-]*)\s*(.*)$/),l=h[1]+a.eventNamespace,u=h[2];u?n.delegate(u,l,r):i.bind(l,r)})},_off:function(t,i){i=(i||"").split(" ").join(this.eventNamespace+" ")+this.eventNamespace,t.unbind(i).undelegate(i),this.bindings=e(this.bindings.not(t).get()),this.focusable=e(this.focusable.not(t).get()),this.hoverable=e(this.hoverable.not(t).get())},_delay:function(e,t){function i(){return("string"==typeof e?s[e]:e).apply(s,arguments)}var s=this;return setTimeout(i,t||0)},_hoverable:function(t){this.hoverable=this.hoverable.add(t),this._on(t,{mouseenter:function(t){e(t.currentTarget).addClass("ui-state-hover")},mouseleave:function(t){e(t.currentTarget).removeClass("ui-state-hover")}})},_focusable:function(t){this.focusable=this.focusable.add(t),this._on(t,{focusin:function(t){e(t.currentTarget).addClass("ui-state-focus")},focusout:function(t){e(t.currentTarget).removeClass("ui-state-focus")}})},_trigger:function(t,i,s){var n,a,o=this.options[t];if(s=s||{},i=e.Event(i),i.type=(t===this.widgetEventPrefix?t:this.widgetEventPrefix+t).toLowerCase(),i.target=this.element[0],a=i.originalEvent)for(n in a)n in i||(i[n]=a[n]);return this.element.trigger(i,s),!(e.isFunction(o)&&o.apply(this.element[0],[i].concat(s))===!1||i.isDefaultPrevented())}},e.each({show:"fadeIn",hide:"fadeOut"},function(t,i){e.Widget.prototype["_"+t]=function(s,n,a){"string"==typeof n&&(n={effect:n});var o,r=n?n===!0||"number"==typeof n?i:n.effect||i:t;n=n||{},"number"==typeof n&&(n={duration:n}),o=!e.isEmptyObject(n),n.complete=a,n.delay&&s.delay(n.delay),o&&e.effects&&e.effects.effect[r]?s[t](n):r!==t&&s[r]?s[r](n.duration,n.easing,a):s.queue(function(i){e(this)[t](),a&&a.call(s[0]),i()})}}),e.widget;var d=!1;e(document).mouseup(function(){d=!1}),e.widget("ui.mouse",{version:"1.11.4",options:{cancel:"input,textarea,button,select,option",distance:1,delay:0},_mouseInit:function(){var t=this;this.element.bind("mousedown."+this.widgetName,function(e){return t._mouseDown(e)}).bind("click."+this.widgetName,function(i){return!0===e.data(i.target,t.widgetName+".preventClickEvent")?(e.removeData(i.target,t.widgetName+".preventClickEvent"),i.stopImmediatePropagation(),!1):void 0}),this.started=!1},_mouseDestroy:function(){this.element.unbind("."+this.widgetName),this._mouseMoveDelegate&&this.document.unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate)},_mouseDown:function(t){if(!d){this._mouseMoved=!1,this._mouseStarted&&this._mouseUp(t),this._mouseDownEvent=t;var i=this,s=1===t.which,n="string"==typeof this.options.cancel&&t.target.nodeName?e(t.target).closest(this.options.cancel).length:!1;return s&&!n&&this._mouseCapture(t)?(this.mouseDelayMet=!this.options.delay,this.mouseDelayMet||(this._mouseDelayTimer=setTimeout(function(){i.mouseDelayMet=!0},this.options.delay)),this._mouseDistanceMet(t)&&this._mouseDelayMet(t)&&(this._mouseStarted=this._mouseStart(t)!==!1,!this._mouseStarted)?(t.preventDefault(),!0):(!0===e.data(t.target,this.widgetName+".preventClickEvent")&&e.removeData(t.target,this.widgetName+".preventClickEvent"),this._mouseMoveDelegate=function(e){return i._mouseMove(e)},this._mouseUpDelegate=function(e){return i._mouseUp(e)},this.document.bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate),t.preventDefault(),d=!0,!0)):!0}},_mouseMove:function(t){if(this._mouseMoved){if(e.ui.ie&&(!document.documentMode||9>document.documentMode)&&!t.button)return this._mouseUp(t);if(!t.which)return this._mouseUp(t)}return(t.which||t.button)&&(this._mouseMoved=!0),this._mouseStarted?(this._mouseDrag(t),t.preventDefault()):(this._mouseDistanceMet(t)&&this._mouseDelayMet(t)&&(this._mouseStarted=this._mouseStart(this._mouseDownEvent,t)!==!1,this._mouseStarted?this._mouseDrag(t):this._mouseUp(t)),!this._mouseStarted)},_mouseUp:function(t){return this.document.unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate),this._mouseStarted&&(this._mouseStarted=!1,t.target===this._mouseDownEvent.target&&e.data(t.target,this.widgetName+".preventClickEvent",!0),this._mouseStop(t)),d=!1,!1},_mouseDistanceMet:function(e){return Math.max(Math.abs(this._mouseDownEvent.pageX-e.pageX),Math.abs(this._mouseDownEvent.pageY-e.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return!0}}),function(){function t(e,t,i){return[parseFloat(e[0])*(p.test(e[0])?t/100:1),parseFloat(e[1])*(p.test(e[1])?i/100:1)]}function i(t,i){return parseInt(e.css(t,i),10)||0}function s(t){var i=t[0];return 9===i.nodeType?{width:t.width(),height:t.height(),offset:{top:0,left:0}}:e.isWindow(i)?{width:t.width(),height:t.height(),offset:{top:t.scrollTop(),left:t.scrollLeft()}}:i.preventDefault?{width:0,height:0,offset:{top:i.pageY,left:i.pageX}}:{width:t.outerWidth(),height:t.outerHeight(),offset:t.offset()}}e.ui=e.ui||{};var n,a,o=Math.max,r=Math.abs,h=Math.round,l=/left|center|right/,u=/top|center|bottom/,d=/[\+\-]\d+(\.[\d]+)?%?/,c=/^\w+/,p=/%$/,f=e.fn.position;e.position={scrollbarWidth:function(){if(void 0!==n)return n;var t,i,s=e("<div style='display:block;position:absolute;width:50px;height:50px;overflow:hidden;'><div style='height:100px;width:auto;'></div></div>"),a=s.children()[0];return e("body").append(s),t=a.offsetWidth,s.css("overflow","scroll"),i=a.offsetWidth,t===i&&(i=s[0].clientWidth),s.remove(),n=t-i},getScrollInfo:function(t){var i=t.isWindow||t.isDocument?"":t.element.css("overflow-x"),s=t.isWindow||t.isDocument?"":t.element.css("overflow-y"),n="scroll"===i||"auto"===i&&t.width<t.element[0].scrollWidth,a="scroll"===s||"auto"===s&&t.height<t.element[0].scrollHeight;return{width:a?e.position.scrollbarWidth():0,height:n?e.position.scrollbarWidth():0}},getWithinInfo:function(t){var i=e(t||window),s=e.isWindow(i[0]),n=!!i[0]&&9===i[0].nodeType;return{element:i,isWindow:s,isDocument:n,offset:i.offset()||{left:0,top:0},scrollLeft:i.scrollLeft(),scrollTop:i.scrollTop(),width:s||n?i.width():i.outerWidth(),height:s||n?i.height():i.outerHeight()}}},e.fn.position=function(n){if(!n||!n.of)return f.apply(this,arguments);n=e.extend({},n);var p,m,g,v,y,b,_=e(n.of),x=e.position.getWithinInfo(n.within),w=e.position.getScrollInfo(x),k=(n.collision||"flip").split(" "),T={};return b=s(_),_[0].preventDefault&&(n.at="left top"),m=b.width,g=b.height,v=b.offset,y=e.extend({},v),e.each(["my","at"],function(){var e,t,i=(n[this]||"").split(" ");1===i.length&&(i=l.test(i[0])?i.concat(["center"]):u.test(i[0])?["center"].concat(i):["center","center"]),i[0]=l.test(i[0])?i[0]:"center",i[1]=u.test(i[1])?i[1]:"center",e=d.exec(i[0]),t=d.exec(i[1]),T[this]=[e?e[0]:0,t?t[0]:0],n[this]=[c.exec(i[0])[0],c.exec(i[1])[0]]}),1===k.length&&(k[1]=k[0]),"right"===n.at[0]?y.left+=m:"center"===n.at[0]&&(y.left+=m/2),"bottom"===n.at[1]?y.top+=g:"center"===n.at[1]&&(y.top+=g/2),p=t(T.at,m,g),y.left+=p[0],y.top+=p[1],this.each(function(){var s,l,u=e(this),d=u.outerWidth(),c=u.outerHeight(),f=i(this,"marginLeft"),b=i(this,"marginTop"),D=d+f+i(this,"marginRight")+w.width,S=c+b+i(this,"marginBottom")+w.height,M=e.extend({},y),C=t(T.my,u.outerWidth(),u.outerHeight());"right"===n.my[0]?M.left-=d:"center"===n.my[0]&&(M.left-=d/2),"bottom"===n.my[1]?M.top-=c:"center"===n.my[1]&&(M.top-=c/2),M.left+=C[0],M.top+=C[1],a||(M.left=h(M.left),M.top=h(M.top)),s={marginLeft:f,marginTop:b},e.each(["left","top"],function(t,i){e.ui.position[k[t]]&&e.ui.position[k[t]][i](M,{targetWidth:m,targetHeight:g,elemWidth:d,elemHeight:c,collisionPosition:s,collisionWidth:D,collisionHeight:S,offset:[p[0]+C[0],p[1]+C[1]],my:n.my,at:n.at,within:x,elem:u})}),n.using&&(l=function(e){var t=v.left-M.left,i=t+m-d,s=v.top-M.top,a=s+g-c,h={target:{element:_,left:v.left,top:v.top,width:m,height:g},element:{element:u,left:M.left,top:M.top,width:d,height:c},horizontal:0>i?"left":t>0?"right":"center",vertical:0>a?"top":s>0?"bottom":"middle"};d>m&&m>r(t+i)&&(h.horizontal="center"),c>g&&g>r(s+a)&&(h.vertical="middle"),h.important=o(r(t),r(i))>o(r(s),r(a))?"horizontal":"vertical",n.using.call(this,e,h)}),u.offset(e.extend(M,{using:l}))})},e.ui.position={fit:{left:function(e,t){var i,s=t.within,n=s.isWindow?s.scrollLeft:s.offset.left,a=s.width,r=e.left-t.collisionPosition.marginLeft,h=n-r,l=r+t.collisionWidth-a-n;t.collisionWidth>a?h>0&&0>=l?(i=e.left+h+t.collisionWidth-a-n,e.left+=h-i):e.left=l>0&&0>=h?n:h>l?n+a-t.collisionWidth:n:h>0?e.left+=h:l>0?e.left-=l:e.left=o(e.left-r,e.left)},top:function(e,t){var i,s=t.within,n=s.isWindow?s.scrollTop:s.offset.top,a=t.within.height,r=e.top-t.collisionPosition.marginTop,h=n-r,l=r+t.collisionHeight-a-n;t.collisionHeight>a?h>0&&0>=l?(i=e.top+h+t.collisionHeight-a-n,e.top+=h-i):e.top=l>0&&0>=h?n:h>l?n+a-t.collisionHeight:n:h>0?e.top+=h:l>0?e.top-=l:e.top=o(e.top-r,e.top)}},flip:{left:function(e,t){var i,s,n=t.within,a=n.offset.left+n.scrollLeft,o=n.width,h=n.isWindow?n.scrollLeft:n.offset.left,l=e.left-t.collisionPosition.marginLeft,u=l-h,d=l+t.collisionWidth-o-h,c="left"===t.my[0]?-t.elemWidth:"right"===t.my[0]?t.elemWidth:0,p="left"===t.at[0]?t.targetWidth:"right"===t.at[0]?-t.targetWidth:0,f=-2*t.offset[0];0>u?(i=e.left+c+p+f+t.collisionWidth-o-a,(0>i||r(u)>i)&&(e.left+=c+p+f)):d>0&&(s=e.left-t.collisionPosition.marginLeft+c+p+f-h,(s>0||d>r(s))&&(e.left+=c+p+f))},top:function(e,t){var i,s,n=t.within,a=n.offset.top+n.scrollTop,o=n.height,h=n.isWindow?n.scrollTop:n.offset.top,l=e.top-t.collisionPosition.marginTop,u=l-h,d=l+t.collisionHeight-o-h,c="top"===t.my[1],p=c?-t.elemHeight:"bottom"===t.my[1]?t.elemHeight:0,f="top"===t.at[1]?t.targetHeight:"bottom"===t.at[1]?-t.targetHeight:0,m=-2*t.offset[1];0>u?(s=e.top+p+f+m+t.collisionHeight-o-a,(0>s||r(u)>s)&&(e.top+=p+f+m)):d>0&&(i=e.top-t.collisionPosition.marginTop+p+f+m-h,(i>0||d>r(i))&&(e.top+=p+f+m))}},flipfit:{left:function(){e.ui.position.flip.left.apply(this,arguments),e.ui.position.fit.left.apply(this,arguments)},top:function(){e.ui.position.flip.top.apply(this,arguments),e.ui.position.fit.top.apply(this,arguments)}}},function(){var t,i,s,n,o,r=document.getElementsByTagName("body")[0],h=document.createElement("div");t=document.createElement(r?"div":"body"),s={visibility:"hidden",width:0,height:0,border:0,margin:0,background:"none"},r&&e.extend(s,{position:"absolute",left:"-1000px",top:"-1000px"});for(o in s)t.style[o]=s[o];t.appendChild(h),i=r||document.documentElement,i.insertBefore(t,i.firstChild),h.style.cssText="position: absolute; left: 10.7432222px;",n=e(h).offset().left,a=n>10&&11>n,t.innerHTML="",i.removeChild(t)}()}(),e.ui.position,e.widget("ui.draggable",e.ui.mouse,{version:"1.11.4",widgetEventPrefix:"drag",options:{addClasses:!0,appendTo:"parent",axis:!1,connectToSortable:!1,containment:!1,cursor:"auto",cursorAt:!1,grid:!1,handle:!1,helper:"original",iframeFix:!1,opacity:!1,refreshPositions:!1,revert:!1,revertDuration:500,scope:"default",scroll:!0,scrollSensitivity:20,scrollSpeed:20,snap:!1,snapMode:"both",snapTolerance:20,stack:!1,zIndex:!1,drag:null,start:null,stop:null},_create:function(){"original"===this.options.helper&&this._setPositionRelative(),this.options.addClasses&&this.element.addClass("ui-draggable"),this.options.disabled&&this.element.addClass("ui-draggable-disabled"),this._setHandleClassName(),this._mouseInit()},_setOption:function(e,t){this._super(e,t),"handle"===e&&(this._removeHandleClassName(),this._setHandleClassName())},_destroy:function(){return(this.helper||this.element).is(".ui-draggable-dragging")?(this.destroyOnClear=!0,void 0):(this.element.removeClass("ui-draggable ui-draggable-dragging ui-draggable-disabled"),this._removeHandleClassName(),this._mouseDestroy(),void 0)},_mouseCapture:function(t){var i=this.options;return this._blurActiveElement(t),this.helper||i.disabled||e(t.target).closest(".ui-resizable-handle").length>0?!1:(this.handle=this._getHandle(t),this.handle?(this._blockFrames(i.iframeFix===!0?"iframe":i.iframeFix),!0):!1)},_blockFrames:function(t){this.iframeBlocks=this.document.find(t).map(function(){var t=e(this);return e("<div>").css("position","absolute").appendTo(t.parent()).outerWidth(t.outerWidth()).outerHeight(t.outerHeight()).offset(t.offset())[0]})},_unblockFrames:function(){this.iframeBlocks&&(this.iframeBlocks.remove(),delete this.iframeBlocks)},_blurActiveElement:function(t){var i=this.document[0];if(this.handleElement.is(t.target))try{i.activeElement&&"body"!==i.activeElement.nodeName.toLowerCase()&&e(i.activeElement).blur()}catch(s){}},_mouseStart:function(t){var i=this.options;return this.helper=this._createHelper(t),this.helper.addClass("ui-draggable-dragging"),this._cacheHelperProportions(),e.ui.ddmanager&&(e.ui.ddmanager.current=this),this._cacheMargins(),this.cssPosition=this.helper.css("position"),this.scrollParent=this.helper.scrollParent(!0),this.offsetParent=this.helper.offsetParent(),this.hasFixedAncestor=this.helper.parents().filter(function(){return"fixed"===e(this).css("position")}).length>0,this.positionAbs=this.element.offset(),this._refreshOffsets(t),this.originalPosition=this.position=this._generatePosition(t,!1),this.originalPageX=t.pageX,this.originalPageY=t.pageY,i.cursorAt&&this._adjustOffsetFromHelper(i.cursorAt),this._setContainment(),this._trigger("start",t)===!1?(this._clear(),!1):(this._cacheHelperProportions(),e.ui.ddmanager&&!i.dropBehaviour&&e.ui.ddmanager.prepareOffsets(this,t),this._normalizeRightBottom(),this._mouseDrag(t,!0),e.ui.ddmanager&&e.ui.ddmanager.dragStart(this,t),!0)},_refreshOffsets:function(e){this.offset={top:this.positionAbs.top-this.margins.top,left:this.positionAbs.left-this.margins.left,scroll:!1,parent:this._getParentOffset(),relative:this._getRelativeOffset()},this.offset.click={left:e.pageX-this.offset.left,top:e.pageY-this.offset.top}},_mouseDrag:function(t,i){if(this.hasFixedAncestor&&(this.offset.parent=this._getParentOffset()),this.position=this._generatePosition(t,!0),this.positionAbs=this._convertPositionTo("absolute"),!i){var s=this._uiHash();if(this._trigger("drag",t,s)===!1)return this._mouseUp({}),!1;this.position=s.position}return this.helper[0].style.left=this.position.left+"px",this.helper[0].style.top=this.position.top+"px",e.ui.ddmanager&&e.ui.ddmanager.drag(this,t),!1},_mouseStop:function(t){var i=this,s=!1;return e.ui.ddmanager&&!this.options.dropBehaviour&&(s=e.ui.ddmanager.drop(this,t)),this.dropped&&(s=this.dropped,this.dropped=!1),"invalid"===this.options.revert&&!s||"valid"===this.options.revert&&s||this.options.revert===!0||e.isFunction(this.options.revert)&&this.options.revert.call(this.element,s)?e(this.helper).animate(this.originalPosition,parseInt(this.options.revertDuration,10),function(){i._trigger("stop",t)!==!1&&i._clear()}):this._trigger("stop",t)!==!1&&this._clear(),!1},_mouseUp:function(t){return this._unblockFrames(),e.ui.ddmanager&&e.ui.ddmanager.dragStop(this,t),this.handleElement.is(t.target)&&this.element.focus(),e.ui.mouse.prototype._mouseUp.call(this,t)},cancel:function(){return this.helper.is(".ui-draggable-dragging")?this._mouseUp({}):this._clear(),this},_getHandle:function(t){return this.options.handle?!!e(t.target).closest(this.element.find(this.options.handle)).length:!0},_setHandleClassName:function(){this.handleElement=this.options.handle?this.element.find(this.options.handle):this.element,this.handleElement.addClass("ui-draggable-handle")},_removeHandleClassName:function(){this.handleElement.removeClass("ui-draggable-handle")},_createHelper:function(t){var i=this.options,s=e.isFunction(i.helper),n=s?e(i.helper.apply(this.element[0],[t])):"clone"===i.helper?this.element.clone().removeAttr("id"):this.element;return n.parents("body").length||n.appendTo("parent"===i.appendTo?this.element[0].parentNode:i.appendTo),s&&n[0]===this.element[0]&&this._setPositionRelative(),n[0]===this.element[0]||/(fixed|absolute)/.test(n.css("position"))||n.css("position","absolute"),n},_setPositionRelative:function(){/^(?:r|a|f)/.test(this.element.css("position"))||(this.element[0].style.position="relative")},_adjustOffsetFromHelper:function(t){"string"==typeof t&&(t=t.split(" ")),e.isArray(t)&&(t={left:+t[0],top:+t[1]||0}),"left"in t&&(this.offset.click.left=t.left+this.margins.left),"right"in t&&(this.offset.click.left=this.helperProportions.width-t.right+this.margins.left),"top"in t&&(this.offset.click.top=t.top+this.margins.top),"bottom"in t&&(this.offset.click.top=this.helperProportions.height-t.bottom+this.margins.top)},_isRootNode:function(e){return/(html|body)/i.test(e.tagName)||e===this.document[0]},_getParentOffset:function(){var t=this.offsetParent.offset(),i=this.document[0];return"absolute"===this.cssPosition&&this.scrollParent[0]!==i&&e.contains(this.scrollParent[0],this.offsetParent[0])&&(t.left+=this.scrollParent.scrollLeft(),t.top+=this.scrollParent.scrollTop()),this._isRootNode(this.offsetParent[0])&&(t={top:0,left:0}),{top:t.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:t.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if("relative"!==this.cssPosition)return{top:0,left:0};var e=this.element.position(),t=this._isRootNode(this.scrollParent[0]);return{top:e.top-(parseInt(this.helper.css("top"),10)||0)+(t?0:this.scrollParent.scrollTop()),left:e.left-(parseInt(this.helper.css("left"),10)||0)+(t?0:this.scrollParent.scrollLeft())}},_cacheMargins:function(){this.margins={left:parseInt(this.element.css("marginLeft"),10)||0,top:parseInt(this.element.css("marginTop"),10)||0,right:parseInt(this.element.css("marginRight"),10)||0,bottom:parseInt(this.element.css("marginBottom"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var t,i,s,n=this.options,a=this.document[0];return this.relativeContainer=null,n.containment?"window"===n.containment?(this.containment=[e(window).scrollLeft()-this.offset.relative.left-this.offset.parent.left,e(window).scrollTop()-this.offset.relative.top-this.offset.parent.top,e(window).scrollLeft()+e(window).width()-this.helperProportions.width-this.margins.left,e(window).scrollTop()+(e(window).height()||a.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top],void 0):"document"===n.containment?(this.containment=[0,0,e(a).width()-this.helperProportions.width-this.margins.left,(e(a).height()||a.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top],void 0):n.containment.constructor===Array?(this.containment=n.containment,void 0):("parent"===n.containment&&(n.containment=this.helper[0].parentNode),i=e(n.containment),s=i[0],s&&(t=/(scroll|auto)/.test(i.css("overflow")),this.containment=[(parseInt(i.css("borderLeftWidth"),10)||0)+(parseInt(i.css("paddingLeft"),10)||0),(parseInt(i.css("borderTopWidth"),10)||0)+(parseInt(i.css("paddingTop"),10)||0),(t?Math.max(s.scrollWidth,s.offsetWidth):s.offsetWidth)-(parseInt(i.css("borderRightWidth"),10)||0)-(parseInt(i.css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left-this.margins.right,(t?Math.max(s.scrollHeight,s.offsetHeight):s.offsetHeight)-(parseInt(i.css("borderBottomWidth"),10)||0)-(parseInt(i.css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top-this.margins.bottom],this.relativeContainer=i),void 0):(this.containment=null,void 0)},_convertPositionTo:function(e,t){t||(t=this.position);var i="absolute"===e?1:-1,s=this._isRootNode(this.scrollParent[0]);return{top:t.top+this.offset.relative.top*i+this.offset.parent.top*i-("fixed"===this.cssPosition?-this.offset.scroll.top:s?0:this.offset.scroll.top)*i,left:t.left+this.offset.relative.left*i+this.offset.parent.left*i-("fixed"===this.cssPosition?-this.offset.scroll.left:s?0:this.offset.scroll.left)*i}},_generatePosition:function(e,t){var i,s,n,a,o=this.options,r=this._isRootNode(this.scrollParent[0]),h=e.pageX,l=e.pageY;return r&&this.offset.scroll||(this.offset.scroll={top:this.scrollParent.scrollTop(),left:this.scrollParent.scrollLeft()}),t&&(this.containment&&(this.relativeContainer?(s=this.relativeContainer.offset(),i=[this.containment[0]+s.left,this.containment[1]+s.top,this.containment[2]+s.left,this.containment[3]+s.top]):i=this.containment,e.pageX-this.offset.click.left<i[0]&&(h=i[0]+this.offset.click.left),e.pageY-this.offset.click.top<i[1]&&(l=i[1]+this.offset.click.top),e.pageX-this.offset.click.left>i[2]&&(h=i[2]+this.offset.click.left),e.pageY-this.offset.click.top>i[3]&&(l=i[3]+this.offset.click.top)),o.grid&&(n=o.grid[1]?this.originalPageY+Math.round((l-this.originalPageY)/o.grid[1])*o.grid[1]:this.originalPageY,l=i?n-this.offset.click.top>=i[1]||n-this.offset.click.top>i[3]?n:n-this.offset.click.top>=i[1]?n-o.grid[1]:n+o.grid[1]:n,a=o.grid[0]?this.originalPageX+Math.round((h-this.originalPageX)/o.grid[0])*o.grid[0]:this.originalPageX,h=i?a-this.offset.click.left>=i[0]||a-this.offset.click.left>i[2]?a:a-this.offset.click.left>=i[0]?a-o.grid[0]:a+o.grid[0]:a),"y"===o.axis&&(h=this.originalPageX),"x"===o.axis&&(l=this.originalPageY)),{top:l-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+("fixed"===this.cssPosition?-this.offset.scroll.top:r?0:this.offset.scroll.top),left:h-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+("fixed"===this.cssPosition?-this.offset.scroll.left:r?0:this.offset.scroll.left)}
-},_clear:function(){this.helper.removeClass("ui-draggable-dragging"),this.helper[0]===this.element[0]||this.cancelHelperRemoval||this.helper.remove(),this.helper=null,this.cancelHelperRemoval=!1,this.destroyOnClear&&this.destroy()},_normalizeRightBottom:function(){"y"!==this.options.axis&&"auto"!==this.helper.css("right")&&(this.helper.width(this.helper.width()),this.helper.css("right","auto")),"x"!==this.options.axis&&"auto"!==this.helper.css("bottom")&&(this.helper.height(this.helper.height()),this.helper.css("bottom","auto"))},_trigger:function(t,i,s){return s=s||this._uiHash(),e.ui.plugin.call(this,t,[i,s,this],!0),/^(drag|start|stop)/.test(t)&&(this.positionAbs=this._convertPositionTo("absolute"),s.offset=this.positionAbs),e.Widget.prototype._trigger.call(this,t,i,s)},plugins:{},_uiHash:function(){return{helper:this.helper,position:this.position,originalPosition:this.originalPosition,offset:this.positionAbs}}}),e.ui.plugin.add("draggable","connectToSortable",{start:function(t,i,s){var n=e.extend({},i,{item:s.element});s.sortables=[],e(s.options.connectToSortable).each(function(){var i=e(this).sortable("instance");i&&!i.options.disabled&&(s.sortables.push(i),i.refreshPositions(),i._trigger("activate",t,n))})},stop:function(t,i,s){var n=e.extend({},i,{item:s.element});s.cancelHelperRemoval=!1,e.each(s.sortables,function(){var e=this;e.isOver?(e.isOver=0,s.cancelHelperRemoval=!0,e.cancelHelperRemoval=!1,e._storedCSS={position:e.placeholder.css("position"),top:e.placeholder.css("top"),left:e.placeholder.css("left")},e._mouseStop(t),e.options.helper=e.options._helper):(e.cancelHelperRemoval=!0,e._trigger("deactivate",t,n))})},drag:function(t,i,s){e.each(s.sortables,function(){var n=!1,a=this;a.positionAbs=s.positionAbs,a.helperProportions=s.helperProportions,a.offset.click=s.offset.click,a._intersectsWith(a.containerCache)&&(n=!0,e.each(s.sortables,function(){return this.positionAbs=s.positionAbs,this.helperProportions=s.helperProportions,this.offset.click=s.offset.click,this!==a&&this._intersectsWith(this.containerCache)&&e.contains(a.element[0],this.element[0])&&(n=!1),n})),n?(a.isOver||(a.isOver=1,s._parent=i.helper.parent(),a.currentItem=i.helper.appendTo(a.element).data("ui-sortable-item",!0),a.options._helper=a.options.helper,a.options.helper=function(){return i.helper[0]},t.target=a.currentItem[0],a._mouseCapture(t,!0),a._mouseStart(t,!0,!0),a.offset.click.top=s.offset.click.top,a.offset.click.left=s.offset.click.left,a.offset.parent.left-=s.offset.parent.left-a.offset.parent.left,a.offset.parent.top-=s.offset.parent.top-a.offset.parent.top,s._trigger("toSortable",t),s.dropped=a.element,e.each(s.sortables,function(){this.refreshPositions()}),s.currentItem=s.element,a.fromOutside=s),a.currentItem&&(a._mouseDrag(t),i.position=a.position)):a.isOver&&(a.isOver=0,a.cancelHelperRemoval=!0,a.options._revert=a.options.revert,a.options.revert=!1,a._trigger("out",t,a._uiHash(a)),a._mouseStop(t,!0),a.options.revert=a.options._revert,a.options.helper=a.options._helper,a.placeholder&&a.placeholder.remove(),i.helper.appendTo(s._parent),s._refreshOffsets(t),i.position=s._generatePosition(t,!0),s._trigger("fromSortable",t),s.dropped=!1,e.each(s.sortables,function(){this.refreshPositions()}))})}}),e.ui.plugin.add("draggable","cursor",{start:function(t,i,s){var n=e("body"),a=s.options;n.css("cursor")&&(a._cursor=n.css("cursor")),n.css("cursor",a.cursor)},stop:function(t,i,s){var n=s.options;n._cursor&&e("body").css("cursor",n._cursor)}}),e.ui.plugin.add("draggable","opacity",{start:function(t,i,s){var n=e(i.helper),a=s.options;n.css("opacity")&&(a._opacity=n.css("opacity")),n.css("opacity",a.opacity)},stop:function(t,i,s){var n=s.options;n._opacity&&e(i.helper).css("opacity",n._opacity)}}),e.ui.plugin.add("draggable","scroll",{start:function(e,t,i){i.scrollParentNotHidden||(i.scrollParentNotHidden=i.helper.scrollParent(!1)),i.scrollParentNotHidden[0]!==i.document[0]&&"HTML"!==i.scrollParentNotHidden[0].tagName&&(i.overflowOffset=i.scrollParentNotHidden.offset())},drag:function(t,i,s){var n=s.options,a=!1,o=s.scrollParentNotHidden[0],r=s.document[0];o!==r&&"HTML"!==o.tagName?(n.axis&&"x"===n.axis||(s.overflowOffset.top+o.offsetHeight-t.pageY<n.scrollSensitivity?o.scrollTop=a=o.scrollTop+n.scrollSpeed:t.pageY-s.overflowOffset.top<n.scrollSensitivity&&(o.scrollTop=a=o.scrollTop-n.scrollSpeed)),n.axis&&"y"===n.axis||(s.overflowOffset.left+o.offsetWidth-t.pageX<n.scrollSensitivity?o.scrollLeft=a=o.scrollLeft+n.scrollSpeed:t.pageX-s.overflowOffset.left<n.scrollSensitivity&&(o.scrollLeft=a=o.scrollLeft-n.scrollSpeed))):(n.axis&&"x"===n.axis||(t.pageY-e(r).scrollTop()<n.scrollSensitivity?a=e(r).scrollTop(e(r).scrollTop()-n.scrollSpeed):e(window).height()-(t.pageY-e(r).scrollTop())<n.scrollSensitivity&&(a=e(r).scrollTop(e(r).scrollTop()+n.scrollSpeed))),n.axis&&"y"===n.axis||(t.pageX-e(r).scrollLeft()<n.scrollSensitivity?a=e(r).scrollLeft(e(r).scrollLeft()-n.scrollSpeed):e(window).width()-(t.pageX-e(r).scrollLeft())<n.scrollSensitivity&&(a=e(r).scrollLeft(e(r).scrollLeft()+n.scrollSpeed)))),a!==!1&&e.ui.ddmanager&&!n.dropBehaviour&&e.ui.ddmanager.prepareOffsets(s,t)}}),e.ui.plugin.add("draggable","snap",{start:function(t,i,s){var n=s.options;s.snapElements=[],e(n.snap.constructor!==String?n.snap.items||":data(ui-draggable)":n.snap).each(function(){var t=e(this),i=t.offset();this!==s.element[0]&&s.snapElements.push({item:this,width:t.outerWidth(),height:t.outerHeight(),top:i.top,left:i.left})})},drag:function(t,i,s){var n,a,o,r,h,l,u,d,c,p,f=s.options,m=f.snapTolerance,g=i.offset.left,v=g+s.helperProportions.width,y=i.offset.top,b=y+s.helperProportions.height;for(c=s.snapElements.length-1;c>=0;c--)h=s.snapElements[c].left-s.margins.left,l=h+s.snapElements[c].width,u=s.snapElements[c].top-s.margins.top,d=u+s.snapElements[c].height,h-m>v||g>l+m||u-m>b||y>d+m||!e.contains(s.snapElements[c].item.ownerDocument,s.snapElements[c].item)?(s.snapElements[c].snapping&&s.options.snap.release&&s.options.snap.release.call(s.element,t,e.extend(s._uiHash(),{snapItem:s.snapElements[c].item})),s.snapElements[c].snapping=!1):("inner"!==f.snapMode&&(n=m>=Math.abs(u-b),a=m>=Math.abs(d-y),o=m>=Math.abs(h-v),r=m>=Math.abs(l-g),n&&(i.position.top=s._convertPositionTo("relative",{top:u-s.helperProportions.height,left:0}).top),a&&(i.position.top=s._convertPositionTo("relative",{top:d,left:0}).top),o&&(i.position.left=s._convertPositionTo("relative",{top:0,left:h-s.helperProportions.width}).left),r&&(i.position.left=s._convertPositionTo("relative",{top:0,left:l}).left)),p=n||a||o||r,"outer"!==f.snapMode&&(n=m>=Math.abs(u-y),a=m>=Math.abs(d-b),o=m>=Math.abs(h-g),r=m>=Math.abs(l-v),n&&(i.position.top=s._convertPositionTo("relative",{top:u,left:0}).top),a&&(i.position.top=s._convertPositionTo("relative",{top:d-s.helperProportions.height,left:0}).top),o&&(i.position.left=s._convertPositionTo("relative",{top:0,left:h}).left),r&&(i.position.left=s._convertPositionTo("relative",{top:0,left:l-s.helperProportions.width}).left)),!s.snapElements[c].snapping&&(n||a||o||r||p)&&s.options.snap.snap&&s.options.snap.snap.call(s.element,t,e.extend(s._uiHash(),{snapItem:s.snapElements[c].item})),s.snapElements[c].snapping=n||a||o||r||p)}}),e.ui.plugin.add("draggable","stack",{start:function(t,i,s){var n,a=s.options,o=e.makeArray(e(a.stack)).sort(function(t,i){return(parseInt(e(t).css("zIndex"),10)||0)-(parseInt(e(i).css("zIndex"),10)||0)});o.length&&(n=parseInt(e(o[0]).css("zIndex"),10)||0,e(o).each(function(t){e(this).css("zIndex",n+t)}),this.css("zIndex",n+o.length))}}),e.ui.plugin.add("draggable","zIndex",{start:function(t,i,s){var n=e(i.helper),a=s.options;n.css("zIndex")&&(a._zIndex=n.css("zIndex")),n.css("zIndex",a.zIndex)},stop:function(t,i,s){var n=s.options;n._zIndex&&e(i.helper).css("zIndex",n._zIndex)}}),e.ui.draggable,e.widget("ui.droppable",{version:"1.11.4",widgetEventPrefix:"drop",options:{accept:"*",activeClass:!1,addClasses:!0,greedy:!1,hoverClass:!1,scope:"default",tolerance:"intersect",activate:null,deactivate:null,drop:null,out:null,over:null},_create:function(){var t,i=this.options,s=i.accept;this.isover=!1,this.isout=!0,this.accept=e.isFunction(s)?s:function(e){return e.is(s)},this.proportions=function(){return arguments.length?(t=arguments[0],void 0):t?t:t={width:this.element[0].offsetWidth,height:this.element[0].offsetHeight}},this._addToManager(i.scope),i.addClasses&&this.element.addClass("ui-droppable")},_addToManager:function(t){e.ui.ddmanager.droppables[t]=e.ui.ddmanager.droppables[t]||[],e.ui.ddmanager.droppables[t].push(this)},_splice:function(e){for(var t=0;e.length>t;t++)e[t]===this&&e.splice(t,1)},_destroy:function(){var t=e.ui.ddmanager.droppables[this.options.scope];this._splice(t),this.element.removeClass("ui-droppable ui-droppable-disabled")},_setOption:function(t,i){if("accept"===t)this.accept=e.isFunction(i)?i:function(e){return e.is(i)};else if("scope"===t){var s=e.ui.ddmanager.droppables[this.options.scope];this._splice(s),this._addToManager(i)}this._super(t,i)},_activate:function(t){var i=e.ui.ddmanager.current;this.options.activeClass&&this.element.addClass(this.options.activeClass),i&&this._trigger("activate",t,this.ui(i))},_deactivate:function(t){var i=e.ui.ddmanager.current;this.options.activeClass&&this.element.removeClass(this.options.activeClass),i&&this._trigger("deactivate",t,this.ui(i))},_over:function(t){var i=e.ui.ddmanager.current;i&&(i.currentItem||i.element)[0]!==this.element[0]&&this.accept.call(this.element[0],i.currentItem||i.element)&&(this.options.hoverClass&&this.element.addClass(this.options.hoverClass),this._trigger("over",t,this.ui(i)))},_out:function(t){var i=e.ui.ddmanager.current;i&&(i.currentItem||i.element)[0]!==this.element[0]&&this.accept.call(this.element[0],i.currentItem||i.element)&&(this.options.hoverClass&&this.element.removeClass(this.options.hoverClass),this._trigger("out",t,this.ui(i)))},_drop:function(t,i){var s=i||e.ui.ddmanager.current,n=!1;return s&&(s.currentItem||s.element)[0]!==this.element[0]?(this.element.find(":data(ui-droppable)").not(".ui-draggable-dragging").each(function(){var i=e(this).droppable("instance");return i.options.greedy&&!i.options.disabled&&i.options.scope===s.options.scope&&i.accept.call(i.element[0],s.currentItem||s.element)&&e.ui.intersect(s,e.extend(i,{offset:i.element.offset()}),i.options.tolerance,t)?(n=!0,!1):void 0}),n?!1:this.accept.call(this.element[0],s.currentItem||s.element)?(this.options.activeClass&&this.element.removeClass(this.options.activeClass),this.options.hoverClass&&this.element.removeClass(this.options.hoverClass),this._trigger("drop",t,this.ui(s)),this.element):!1):!1},ui:function(e){return{draggable:e.currentItem||e.element,helper:e.helper,position:e.position,offset:e.positionAbs}}}),e.ui.intersect=function(){function e(e,t,i){return e>=t&&t+i>e}return function(t,i,s,n){if(!i.offset)return!1;var a=(t.positionAbs||t.position.absolute).left+t.margins.left,o=(t.positionAbs||t.position.absolute).top+t.margins.top,r=a+t.helperProportions.width,h=o+t.helperProportions.height,l=i.offset.left,u=i.offset.top,d=l+i.proportions().width,c=u+i.proportions().height;switch(s){case"fit":return a>=l&&d>=r&&o>=u&&c>=h;case"intersect":return a+t.helperProportions.width/2>l&&d>r-t.helperProportions.width/2&&o+t.helperProportions.height/2>u&&c>h-t.helperProportions.height/2;case"pointer":return e(n.pageY,u,i.proportions().height)&&e(n.pageX,l,i.proportions().width);case"touch":return(o>=u&&c>=o||h>=u&&c>=h||u>o&&h>c)&&(a>=l&&d>=a||r>=l&&d>=r||l>a&&r>d);default:return!1}}}(),e.ui.ddmanager={current:null,droppables:{"default":[]},prepareOffsets:function(t,i){var s,n,a=e.ui.ddmanager.droppables[t.options.scope]||[],o=i?i.type:null,r=(t.currentItem||t.element).find(":data(ui-droppable)").addBack();e:for(s=0;a.length>s;s++)if(!(a[s].options.disabled||t&&!a[s].accept.call(a[s].element[0],t.currentItem||t.element))){for(n=0;r.length>n;n++)if(r[n]===a[s].element[0]){a[s].proportions().height=0;continue e}a[s].visible="none"!==a[s].element.css("display"),a[s].visible&&("mousedown"===o&&a[s]._activate.call(a[s],i),a[s].offset=a[s].element.offset(),a[s].proportions({width:a[s].element[0].offsetWidth,height:a[s].element[0].offsetHeight}))}},drop:function(t,i){var s=!1;return e.each((e.ui.ddmanager.droppables[t.options.scope]||[]).slice(),function(){this.options&&(!this.options.disabled&&this.visible&&e.ui.intersect(t,this,this.options.tolerance,i)&&(s=this._drop.call(this,i)||s),!this.options.disabled&&this.visible&&this.accept.call(this.element[0],t.currentItem||t.element)&&(this.isout=!0,this.isover=!1,this._deactivate.call(this,i)))}),s},dragStart:function(t,i){t.element.parentsUntil("body").bind("scroll.droppable",function(){t.options.refreshPositions||e.ui.ddmanager.prepareOffsets(t,i)})},drag:function(t,i){t.options.refreshPositions&&e.ui.ddmanager.prepareOffsets(t,i),e.each(e.ui.ddmanager.droppables[t.options.scope]||[],function(){if(!this.options.disabled&&!this.greedyChild&&this.visible){var s,n,a,o=e.ui.intersect(t,this,this.options.tolerance,i),r=!o&&this.isover?"isout":o&&!this.isover?"isover":null;r&&(this.options.greedy&&(n=this.options.scope,a=this.element.parents(":data(ui-droppable)").filter(function(){return e(this).droppable("instance").options.scope===n}),a.length&&(s=e(a[0]).droppable("instance"),s.greedyChild="isover"===r)),s&&"isover"===r&&(s.isover=!1,s.isout=!0,s._out.call(s,i)),this[r]=!0,this["isout"===r?"isover":"isout"]=!1,this["isover"===r?"_over":"_out"].call(this,i),s&&"isout"===r&&(s.isout=!1,s.isover=!0,s._over.call(s,i)))}})},dragStop:function(t,i){t.element.parentsUntil("body").unbind("scroll.droppable"),t.options.refreshPositions||e.ui.ddmanager.prepareOffsets(t,i)}},e.ui.droppable,e.widget("ui.resizable",e.ui.mouse,{version:"1.11.4",widgetEventPrefix:"resize",options:{alsoResize:!1,animate:!1,animateDuration:"slow",animateEasing:"swing",aspectRatio:!1,autoHide:!1,containment:!1,ghost:!1,grid:!1,handles:"e,s,se",helper:!1,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:90,resize:null,start:null,stop:null},_num:function(e){return parseInt(e,10)||0},_isNumber:function(e){return!isNaN(parseInt(e,10))},_hasScroll:function(t,i){if("hidden"===e(t).css("overflow"))return!1;var s=i&&"left"===i?"scrollLeft":"scrollTop",n=!1;return t[s]>0?!0:(t[s]=1,n=t[s]>0,t[s]=0,n)},_create:function(){var t,i,s,n,a,o=this,r=this.options;if(this.element.addClass("ui-resizable"),e.extend(this,{_aspectRatio:!!r.aspectRatio,aspectRatio:r.aspectRatio,originalElement:this.element,_proportionallyResizeElements:[],_helper:r.helper||r.ghost||r.animate?r.helper||"ui-resizable-helper":null}),this.element[0].nodeName.match(/^(canvas|textarea|input|select|button|img)$/i)&&(this.element.wrap(e("<div class='ui-wrapper' style='overflow: hidden;'></div>").css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),top:this.element.css("top"),left:this.element.css("left")})),this.element=this.element.parent().data("ui-resizable",this.element.resizable("instance")),this.elementIsWrapper=!0,this.element.css({marginLeft:this.originalElement.css("marginLeft"),marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom")}),this.originalElement.css({marginLeft:0,marginTop:0,marginRight:0,marginBottom:0}),this.originalResizeStyle=this.originalElement.css("resize"),this.originalElement.css("resize","none"),this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"})),this.originalElement.css({margin:this.originalElement.css("margin")}),this._proportionallyResize()),this.handles=r.handles||(e(".ui-resizable-handle",this.element).length?{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",nw:".ui-resizable-nw"}:"e,s,se"),this._handles=e(),this.handles.constructor===String)for("all"===this.handles&&(this.handles="n,e,s,w,se,sw,ne,nw"),t=this.handles.split(","),this.handles={},i=0;t.length>i;i++)s=e.trim(t[i]),a="ui-resizable-"+s,n=e("<div class='ui-resizable-handle "+a+"'></div>"),n.css({zIndex:r.zIndex}),"se"===s&&n.addClass("ui-icon ui-icon-gripsmall-diagonal-se"),this.handles[s]=".ui-resizable-"+s,this.element.append(n);this._renderAxis=function(t){var i,s,n,a;t=t||this.element;for(i in this.handles)this.handles[i].constructor===String?this.handles[i]=this.element.children(this.handles[i]).first().show():(this.handles[i].jquery||this.handles[i].nodeType)&&(this.handles[i]=e(this.handles[i]),this._on(this.handles[i],{mousedown:o._mouseDown})),this.elementIsWrapper&&this.originalElement[0].nodeName.match(/^(textarea|input|select|button)$/i)&&(s=e(this.handles[i],this.element),a=/sw|ne|nw|se|n|s/.test(i)?s.outerHeight():s.outerWidth(),n=["padding",/ne|nw|n/.test(i)?"Top":/se|sw|s/.test(i)?"Bottom":/^e$/.test(i)?"Right":"Left"].join(""),t.css(n,a),this._proportionallyResize()),this._handles=this._handles.add(this.handles[i])},this._renderAxis(this.element),this._handles=this._handles.add(this.element.find(".ui-resizable-handle")),this._handles.disableSelection(),this._handles.mouseover(function(){o.resizing||(this.className&&(n=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i)),o.axis=n&&n[1]?n[1]:"se")}),r.autoHide&&(this._handles.hide(),e(this.element).addClass("ui-resizable-autohide").mouseenter(function(){r.disabled||(e(this).removeClass("ui-resizable-autohide"),o._handles.show())}).mouseleave(function(){r.disabled||o.resizing||(e(this).addClass("ui-resizable-autohide"),o._handles.hide())})),this._mouseInit()},_destroy:function(){this._mouseDestroy();var t,i=function(t){e(t).removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing").removeData("resizable").removeData("ui-resizable").unbind(".resizable").find(".ui-resizable-handle").remove()};return this.elementIsWrapper&&(i(this.element),t=this.element,this.originalElement.css({position:t.css("position"),width:t.outerWidth(),height:t.outerHeight(),top:t.css("top"),left:t.css("left")}).insertAfter(t),t.remove()),this.originalElement.css("resize",this.originalResizeStyle),i(this.originalElement),this},_mouseCapture:function(t){var i,s,n=!1;for(i in this.handles)s=e(this.handles[i])[0],(s===t.target||e.contains(s,t.target))&&(n=!0);return!this.options.disabled&&n},_mouseStart:function(t){var i,s,n,a=this.options,o=this.element;return this.resizing=!0,this._renderProxy(),i=this._num(this.helper.css("left")),s=this._num(this.helper.css("top")),a.containment&&(i+=e(a.containment).scrollLeft()||0,s+=e(a.containment).scrollTop()||0),this.offset=this.helper.offset(),this.position={left:i,top:s},this.size=this._helper?{width:this.helper.width(),height:this.helper.height()}:{width:o.width(),height:o.height()},this.originalSize=this._helper?{width:o.outerWidth(),height:o.outerHeight()}:{width:o.width(),height:o.height()},this.sizeDiff={width:o.outerWidth()-o.width(),height:o.outerHeight()-o.height()},this.originalPosition={left:i,top:s},this.originalMousePosition={left:t.pageX,top:t.pageY},this.aspectRatio="number"==typeof a.aspectRatio?a.aspectRatio:this.originalSize.width/this.originalSize.height||1,n=e(".ui-resizable-"+this.axis).css("cursor"),e("body").css("cursor","auto"===n?this.axis+"-resize":n),o.addClass("ui-resizable-resizing"),this._propagate("start",t),!0},_mouseDrag:function(t){var i,s,n=this.originalMousePosition,a=this.axis,o=t.pageX-n.left||0,r=t.pageY-n.top||0,h=this._change[a];return this._updatePrevProperties(),h?(i=h.apply(this,[t,o,r]),this._updateVirtualBoundaries(t.shiftKey),(this._aspectRatio||t.shiftKey)&&(i=this._updateRatio(i,t)),i=this._respectSize(i,t),this._updateCache(i),this._propagate("resize",t),s=this._applyChanges(),!this._helper&&this._proportionallyResizeElements.length&&this._proportionallyResize(),e.isEmptyObject(s)||(this._updatePrevProperties(),this._trigger("resize",t,this.ui()),this._applyChanges()),!1):!1},_mouseStop:function(t){this.resizing=!1;var i,s,n,a,o,r,h,l=this.options,u=this;return this._helper&&(i=this._proportionallyResizeElements,s=i.length&&/textarea/i.test(i[0].nodeName),n=s&&this._hasScroll(i[0],"left")?0:u.sizeDiff.height,a=s?0:u.sizeDiff.width,o={width:u.helper.width()-a,height:u.helper.height()-n},r=parseInt(u.element.css("left"),10)+(u.position.left-u.originalPosition.left)||null,h=parseInt(u.element.css("top"),10)+(u.position.top-u.originalPosition.top)||null,l.animate||this.element.css(e.extend(o,{top:h,left:r})),u.helper.height(u.size.height),u.helper.width(u.size.width),this._helper&&!l.animate&&this._proportionallyResize()),e("body").css("cursor","auto"),this.element.removeClass("ui-resizable-resizing"),this._propagate("stop",t),this._helper&&this.helper.remove(),!1},_updatePrevProperties:function(){this.prevPosition={top:this.position.top,left:this.position.left},this.prevSize={width:this.size.width,height:this.size.height}},_applyChanges:function(){var e={};return this.position.top!==this.prevPosition.top&&(e.top=this.position.top+"px"),this.position.left!==this.prevPosition.left&&(e.left=this.position.left+"px"),this.size.width!==this.prevSize.width&&(e.width=this.size.width+"px"),this.size.height!==this.prevSize.height&&(e.height=this.size.height+"px"),this.helper.css(e),e},_updateVirtualBoundaries:function(e){var t,i,s,n,a,o=this.options;a={minWidth:this._isNumber(o.minWidth)?o.minWidth:0,maxWidth:this._isNumber(o.maxWidth)?o.maxWidth:1/0,minHeight:this._isNumber(o.minHeight)?o.minHeight:0,maxHeight:this._isNumber(o.maxHeight)?o.maxHeight:1/0},(this._aspectRatio||e)&&(t=a.minHeight*this.aspectRatio,s=a.minWidth/this.aspectRatio,i=a.maxHeight*this.aspectRatio,n=a.maxWidth/this.aspectRatio,t>a.minWidth&&(a.minWidth=t),s>a.minHeight&&(a.minHeight=s),a.maxWidth>i&&(a.maxWidth=i),a.maxHeight>n&&(a.maxHeight=n)),this._vBoundaries=a},_updateCache:function(e){this.offset=this.helper.offset(),this._isNumber(e.left)&&(this.position.left=e.left),this._isNumber(e.top)&&(this.position.top=e.top),this._isNumber(e.height)&&(this.size.height=e.height),this._isNumber(e.width)&&(this.size.width=e.width)},_updateRatio:function(e){var t=this.position,i=this.size,s=this.axis;return this._isNumber(e.height)?e.width=e.height*this.aspectRatio:this._isNumber(e.width)&&(e.height=e.width/this.aspectRatio),"sw"===s&&(e.left=t.left+(i.width-e.width),e.top=null),"nw"===s&&(e.top=t.top+(i.height-e.height),e.left=t.left+(i.width-e.width)),e},_respectSize:function(e){var t=this._vBoundaries,i=this.axis,s=this._isNumber(e.width)&&t.maxWidth&&t.maxWidth<e.width,n=this._isNumber(e.height)&&t.maxHeight&&t.maxHeight<e.height,a=this._isNumber(e.width)&&t.minWidth&&t.minWidth>e.width,o=this._isNumber(e.height)&&t.minHeight&&t.minHeight>e.height,r=this.originalPosition.left+this.originalSize.width,h=this.position.top+this.size.height,l=/sw|nw|w/.test(i),u=/nw|ne|n/.test(i);return a&&(e.width=t.minWidth),o&&(e.height=t.minHeight),s&&(e.width=t.maxWidth),n&&(e.height=t.maxHeight),a&&l&&(e.left=r-t.minWidth),s&&l&&(e.left=r-t.maxWidth),o&&u&&(e.top=h-t.minHeight),n&&u&&(e.top=h-t.maxHeight),e.width||e.height||e.left||!e.top?e.width||e.height||e.top||!e.left||(e.left=null):e.top=null,e},_getPaddingPlusBorderDimensions:function(e){for(var t=0,i=[],s=[e.css("borderTopWidth"),e.css("borderRightWidth"),e.css("borderBottomWidth"),e.css("borderLeftWidth")],n=[e.css("paddingTop"),e.css("paddingRight"),e.css("paddingBottom"),e.css("paddingLeft")];4>t;t++)i[t]=parseInt(s[t],10)||0,i[t]+=parseInt(n[t],10)||0;return{height:i[0]+i[2],width:i[1]+i[3]}},_proportionallyResize:function(){if(this._proportionallyResizeElements.length)for(var e,t=0,i=this.helper||this.element;this._proportionallyResizeElements.length>t;t++)e=this._proportionallyResizeElements[t],this.outerDimensions||(this.outerDimensions=this._getPaddingPlusBorderDimensions(e)),e.css({height:i.height()-this.outerDimensions.height||0,width:i.width()-this.outerDimensions.width||0})},_renderProxy:function(){var t=this.element,i=this.options;this.elementOffset=t.offset(),this._helper?(this.helper=this.helper||e("<div style='overflow:hidden;'></div>"),this.helper.addClass(this._helper).css({width:this.element.outerWidth()-1,height:this.element.outerHeight()-1,position:"absolute",left:this.elementOffset.left+"px",top:this.elementOffset.top+"px",zIndex:++i.zIndex}),this.helper.appendTo("body").disableSelection()):this.helper=this.element},_change:{e:function(e,t){return{width:this.originalSize.width+t}},w:function(e,t){var i=this.originalSize,s=this.originalPosition;return{left:s.left+t,width:i.width-t}},n:function(e,t,i){var s=this.originalSize,n=this.originalPosition;return{top:n.top+i,height:s.height-i}},s:function(e,t,i){return{height:this.originalSize.height+i}},se:function(t,i,s){return e.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[t,i,s]))},sw:function(t,i,s){return e.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[t,i,s]))},ne:function(t,i,s){return e.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[t,i,s]))},nw:function(t,i,s){return e.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[t,i,s]))}},_propagate:function(t,i){e.ui.plugin.call(this,t,[i,this.ui()]),"resize"!==t&&this._trigger(t,i,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}}),e.ui.plugin.add("resizable","animate",{stop:function(t){var i=e(this).resizable("instance"),s=i.options,n=i._proportionallyResizeElements,a=n.length&&/textarea/i.test(n[0].nodeName),o=a&&i._hasScroll(n[0],"left")?0:i.sizeDiff.height,r=a?0:i.sizeDiff.width,h={width:i.size.width-r,height:i.size.height-o},l=parseInt(i.element.css("left"),10)+(i.position.left-i.originalPosition.left)||null,u=parseInt(i.element.css("top"),10)+(i.position.top-i.originalPosition.top)||null;i.element.animate(e.extend(h,u&&l?{top:u,left:l}:{}),{duration:s.animateDuration,easing:s.animateEasing,step:function(){var s={width:parseInt(i.element.css("width"),10),height:parseInt(i.element.css("height"),10),top:parseInt(i.element.css("top"),10),left:parseInt(i.element.css("left"),10)};n&&n.length&&e(n[0]).css({width:s.width,height:s.height}),i._updateCache(s),i._propagate("resize",t)}})}}),e.ui.plugin.add("resizable","containment",{start:function(){var t,i,s,n,a,o,r,h=e(this).resizable("instance"),l=h.options,u=h.element,d=l.containment,c=d instanceof e?d.get(0):/parent/.test(d)?u.parent().get(0):d;c&&(h.containerElement=e(c),/document/.test(d)||d===document?(h.containerOffset={left:0,top:0},h.containerPosition={left:0,top:0},h.parentData={element:e(document),left:0,top:0,width:e(document).width(),height:e(document).height()||document.body.parentNode.scrollHeight}):(t=e(c),i=[],e(["Top","Right","Left","Bottom"]).each(function(e,s){i[e]=h._num(t.css("padding"+s))}),h.containerOffset=t.offset(),h.containerPosition=t.position(),h.containerSize={height:t.innerHeight()-i[3],width:t.innerWidth()-i[1]},s=h.containerOffset,n=h.containerSize.height,a=h.containerSize.width,o=h._hasScroll(c,"left")?c.scrollWidth:a,r=h._hasScroll(c)?c.scrollHeight:n,h.parentData={element:c,left:s.left,top:s.top,width:o,height:r}))},resize:function(t){var i,s,n,a,o=e(this).resizable("instance"),r=o.options,h=o.containerOffset,l=o.position,u=o._aspectRatio||t.shiftKey,d={top:0,left:0},c=o.containerElement,p=!0;c[0]!==document&&/static/.test(c.css("position"))&&(d=h),l.left<(o._helper?h.left:0)&&(o.size.width=o.size.width+(o._helper?o.position.left-h.left:o.position.left-d.left),u&&(o.size.height=o.size.width/o.aspectRatio,p=!1),o.position.left=r.helper?h.left:0),l.top<(o._helper?h.top:0)&&(o.size.height=o.size.height+(o._helper?o.position.top-h.top:o.position.top),u&&(o.size.width=o.size.height*o.aspectRatio,p=!1),o.position.top=o._helper?h.top:0),n=o.containerElement.get(0)===o.element.parent().get(0),a=/relative|absolute/.test(o.containerElement.css("position")),n&&a?(o.offset.left=o.parentData.left+o.position.left,o.offset.top=o.parentData.top+o.position.top):(o.offset.left=o.element.offset().left,o.offset.top=o.element.offset().top),i=Math.abs(o.sizeDiff.width+(o._helper?o.offset.left-d.left:o.offset.left-h.left)),s=Math.abs(o.sizeDiff.height+(o._helper?o.offset.top-d.top:o.offset.top-h.top)),i+o.size.width>=o.parentData.width&&(o.size.width=o.parentData.width-i,u&&(o.size.height=o.size.width/o.aspectRatio,p=!1)),s+o.size.height>=o.parentData.height&&(o.size.height=o.parentData.height-s,u&&(o.size.width=o.size.height*o.aspectRatio,p=!1)),p||(o.position.left=o.prevPosition.left,o.position.top=o.prevPosition.top,o.size.width=o.prevSize.width,o.size.height=o.prevSize.height)},stop:function(){var t=e(this).resizable("instance"),i=t.options,s=t.containerOffset,n=t.containerPosition,a=t.containerElement,o=e(t.helper),r=o.offset(),h=o.outerWidth()-t.sizeDiff.width,l=o.outerHeight()-t.sizeDiff.height;t._helper&&!i.animate&&/relative/.test(a.css("position"))&&e(this).css({left:r.left-n.left-s.left,width:h,height:l}),t._helper&&!i.animate&&/static/.test(a.css("position"))&&e(this).css({left:r.left-n.left-s.left,width:h,height:l})}}),e.ui.plugin.add("resizable","alsoResize",{start:function(){var t=e(this).resizable("instance"),i=t.options;e(i.alsoResize).each(function(){var t=e(this);t.data("ui-resizable-alsoresize",{width:parseInt(t.width(),10),height:parseInt(t.height(),10),left:parseInt(t.css("left"),10),top:parseInt(t.css("top"),10)})})},resize:function(t,i){var s=e(this).resizable("instance"),n=s.options,a=s.originalSize,o=s.originalPosition,r={height:s.size.height-a.height||0,width:s.size.width-a.width||0,top:s.position.top-o.top||0,left:s.position.left-o.left||0};e(n.alsoResize).each(function(){var t=e(this),s=e(this).data("ui-resizable-alsoresize"),n={},a=t.parents(i.originalElement[0]).length?["width","height"]:["width","height","top","left"];e.each(a,function(e,t){var i=(s[t]||0)+(r[t]||0);i&&i>=0&&(n[t]=i||null)}),t.css(n)})},stop:function(){e(this).removeData("resizable-alsoresize")}}),e.ui.plugin.add("resizable","ghost",{start:function(){var t=e(this).resizable("instance"),i=t.options,s=t.size;t.ghost=t.originalElement.clone(),t.ghost.css({opacity:.25,display:"block",position:"relative",height:s.height,width:s.width,margin:0,left:0,top:0}).addClass("ui-resizable-ghost").addClass("string"==typeof i.ghost?i.ghost:""),t.ghost.appendTo(t.helper)},resize:function(){var t=e(this).resizable("instance");t.ghost&&t.ghost.css({position:"relative",height:t.size.height,width:t.size.width})},stop:function(){var t=e(this).resizable("instance");t.ghost&&t.helper&&t.helper.get(0).removeChild(t.ghost.get(0))}}),e.ui.plugin.add("resizable","grid",{resize:function(){var t,i=e(this).resizable("instance"),s=i.options,n=i.size,a=i.originalSize,o=i.originalPosition,r=i.axis,h="number"==typeof s.grid?[s.grid,s.grid]:s.grid,l=h[0]||1,u=h[1]||1,d=Math.round((n.width-a.width)/l)*l,c=Math.round((n.height-a.height)/u)*u,p=a.width+d,f=a.height+c,m=s.maxWidth&&p>s.maxWidth,g=s.maxHeight&&f>s.maxHeight,v=s.minWidth&&s.minWidth>p,y=s.minHeight&&s.minHeight>f;s.grid=h,v&&(p+=l),y&&(f+=u),m&&(p-=l),g&&(f-=u),/^(se|s|e)$/.test(r)?(i.size.width=p,i.size.height=f):/^(ne)$/.test(r)?(i.size.width=p,i.size.height=f,i.position.top=o.top-c):/^(sw)$/.test(r)?(i.size.width=p,i.size.height=f,i.position.left=o.left-d):((0>=f-u||0>=p-l)&&(t=i._getPaddingPlusBorderDimensions(this)),f-u>0?(i.size.height=f,i.position.top=o.top-c):(f=u-t.height,i.size.height=f,i.position.top=o.top+a.height-f),p-l>0?(i.size.width=p,i.position.left=o.left-d):(p=l-t.width,i.size.width=p,i.position.left=o.left+a.width-p))}}),e.ui.resizable,e.widget("ui.selectable",e.ui.mouse,{version:"1.11.4",options:{appendTo:"body",autoRefresh:!0,distance:0,filter:"*",tolerance:"touch",selected:null,selecting:null,start:null,stop:null,unselected:null,unselecting:null},_create:function(){var t,i=this;
-this.element.addClass("ui-selectable"),this.dragged=!1,this.refresh=function(){t=e(i.options.filter,i.element[0]),t.addClass("ui-selectee"),t.each(function(){var t=e(this),i=t.offset();e.data(this,"selectable-item",{element:this,$element:t,left:i.left,top:i.top,right:i.left+t.outerWidth(),bottom:i.top+t.outerHeight(),startselected:!1,selected:t.hasClass("ui-selected"),selecting:t.hasClass("ui-selecting"),unselecting:t.hasClass("ui-unselecting")})})},this.refresh(),this.selectees=t.addClass("ui-selectee"),this._mouseInit(),this.helper=e("<div class='ui-selectable-helper'></div>")},_destroy:function(){this.selectees.removeClass("ui-selectee").removeData("selectable-item"),this.element.removeClass("ui-selectable ui-selectable-disabled"),this._mouseDestroy()},_mouseStart:function(t){var i=this,s=this.options;this.opos=[t.pageX,t.pageY],this.options.disabled||(this.selectees=e(s.filter,this.element[0]),this._trigger("start",t),e(s.appendTo).append(this.helper),this.helper.css({left:t.pageX,top:t.pageY,width:0,height:0}),s.autoRefresh&&this.refresh(),this.selectees.filter(".ui-selected").each(function(){var s=e.data(this,"selectable-item");s.startselected=!0,t.metaKey||t.ctrlKey||(s.$element.removeClass("ui-selected"),s.selected=!1,s.$element.addClass("ui-unselecting"),s.unselecting=!0,i._trigger("unselecting",t,{unselecting:s.element}))}),e(t.target).parents().addBack().each(function(){var s,n=e.data(this,"selectable-item");return n?(s=!t.metaKey&&!t.ctrlKey||!n.$element.hasClass("ui-selected"),n.$element.removeClass(s?"ui-unselecting":"ui-selected").addClass(s?"ui-selecting":"ui-unselecting"),n.unselecting=!s,n.selecting=s,n.selected=s,s?i._trigger("selecting",t,{selecting:n.element}):i._trigger("unselecting",t,{unselecting:n.element}),!1):void 0}))},_mouseDrag:function(t){if(this.dragged=!0,!this.options.disabled){var i,s=this,n=this.options,a=this.opos[0],o=this.opos[1],r=t.pageX,h=t.pageY;return a>r&&(i=r,r=a,a=i),o>h&&(i=h,h=o,o=i),this.helper.css({left:a,top:o,width:r-a,height:h-o}),this.selectees.each(function(){var i=e.data(this,"selectable-item"),l=!1;i&&i.element!==s.element[0]&&("touch"===n.tolerance?l=!(i.left>r||a>i.right||i.top>h||o>i.bottom):"fit"===n.tolerance&&(l=i.left>a&&r>i.right&&i.top>o&&h>i.bottom),l?(i.selected&&(i.$element.removeClass("ui-selected"),i.selected=!1),i.unselecting&&(i.$element.removeClass("ui-unselecting"),i.unselecting=!1),i.selecting||(i.$element.addClass("ui-selecting"),i.selecting=!0,s._trigger("selecting",t,{selecting:i.element}))):(i.selecting&&((t.metaKey||t.ctrlKey)&&i.startselected?(i.$element.removeClass("ui-selecting"),i.selecting=!1,i.$element.addClass("ui-selected"),i.selected=!0):(i.$element.removeClass("ui-selecting"),i.selecting=!1,i.startselected&&(i.$element.addClass("ui-unselecting"),i.unselecting=!0),s._trigger("unselecting",t,{unselecting:i.element}))),i.selected&&(t.metaKey||t.ctrlKey||i.startselected||(i.$element.removeClass("ui-selected"),i.selected=!1,i.$element.addClass("ui-unselecting"),i.unselecting=!0,s._trigger("unselecting",t,{unselecting:i.element})))))}),!1}},_mouseStop:function(t){var i=this;return this.dragged=!1,e(".ui-unselecting",this.element[0]).each(function(){var s=e.data(this,"selectable-item");s.$element.removeClass("ui-unselecting"),s.unselecting=!1,s.startselected=!1,i._trigger("unselected",t,{unselected:s.element})}),e(".ui-selecting",this.element[0]).each(function(){var s=e.data(this,"selectable-item");s.$element.removeClass("ui-selecting").addClass("ui-selected"),s.selecting=!1,s.selected=!0,s.startselected=!0,i._trigger("selected",t,{selected:s.element})}),this._trigger("stop",t),this.helper.remove(),!1}}),e.widget("ui.sortable",e.ui.mouse,{version:"1.11.4",widgetEventPrefix:"sort",ready:!1,options:{appendTo:"parent",axis:!1,connectWith:!1,containment:!1,cursor:"auto",cursorAt:!1,dropOnEmpty:!0,forcePlaceholderSize:!1,forceHelperSize:!1,grid:!1,handle:!1,helper:"original",items:"> *",opacity:!1,placeholder:!1,revert:!1,scroll:!0,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1e3,activate:null,beforeStop:null,change:null,deactivate:null,out:null,over:null,receive:null,remove:null,sort:null,start:null,stop:null,update:null},_isOverAxis:function(e,t,i){return e>=t&&t+i>e},_isFloating:function(e){return/left|right/.test(e.css("float"))||/inline|table-cell/.test(e.css("display"))},_create:function(){this.containerCache={},this.element.addClass("ui-sortable"),this.refresh(),this.offset=this.element.offset(),this._mouseInit(),this._setHandleClassName(),this.ready=!0},_setOption:function(e,t){this._super(e,t),"handle"===e&&this._setHandleClassName()},_setHandleClassName:function(){this.element.find(".ui-sortable-handle").removeClass("ui-sortable-handle"),e.each(this.items,function(){(this.instance.options.handle?this.item.find(this.instance.options.handle):this.item).addClass("ui-sortable-handle")})},_destroy:function(){this.element.removeClass("ui-sortable ui-sortable-disabled").find(".ui-sortable-handle").removeClass("ui-sortable-handle"),this._mouseDestroy();for(var e=this.items.length-1;e>=0;e--)this.items[e].item.removeData(this.widgetName+"-item");return this},_mouseCapture:function(t,i){var s=null,n=!1,a=this;return this.reverting?!1:this.options.disabled||"static"===this.options.type?!1:(this._refreshItems(t),e(t.target).parents().each(function(){return e.data(this,a.widgetName+"-item")===a?(s=e(this),!1):void 0}),e.data(t.target,a.widgetName+"-item")===a&&(s=e(t.target)),s?!this.options.handle||i||(e(this.options.handle,s).find("*").addBack().each(function(){this===t.target&&(n=!0)}),n)?(this.currentItem=s,this._removeCurrentsFromItems(),!0):!1:!1)},_mouseStart:function(t,i,s){var n,a,o=this.options;if(this.currentContainer=this,this.refreshPositions(),this.helper=this._createHelper(t),this._cacheHelperProportions(),this._cacheMargins(),this.scrollParent=this.helper.scrollParent(),this.offset=this.currentItem.offset(),this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left},e.extend(this.offset,{click:{left:t.pageX-this.offset.left,top:t.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()}),this.helper.css("position","absolute"),this.cssPosition=this.helper.css("position"),this.originalPosition=this._generatePosition(t),this.originalPageX=t.pageX,this.originalPageY=t.pageY,o.cursorAt&&this._adjustOffsetFromHelper(o.cursorAt),this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]},this.helper[0]!==this.currentItem[0]&&this.currentItem.hide(),this._createPlaceholder(),o.containment&&this._setContainment(),o.cursor&&"auto"!==o.cursor&&(a=this.document.find("body"),this.storedCursor=a.css("cursor"),a.css("cursor",o.cursor),this.storedStylesheet=e("<style>*{ cursor: "+o.cursor+" !important; }</style>").appendTo(a)),o.opacity&&(this.helper.css("opacity")&&(this._storedOpacity=this.helper.css("opacity")),this.helper.css("opacity",o.opacity)),o.zIndex&&(this.helper.css("zIndex")&&(this._storedZIndex=this.helper.css("zIndex")),this.helper.css("zIndex",o.zIndex)),this.scrollParent[0]!==this.document[0]&&"HTML"!==this.scrollParent[0].tagName&&(this.overflowOffset=this.scrollParent.offset()),this._trigger("start",t,this._uiHash()),this._preserveHelperProportions||this._cacheHelperProportions(),!s)for(n=this.containers.length-1;n>=0;n--)this.containers[n]._trigger("activate",t,this._uiHash(this));return e.ui.ddmanager&&(e.ui.ddmanager.current=this),e.ui.ddmanager&&!o.dropBehaviour&&e.ui.ddmanager.prepareOffsets(this,t),this.dragging=!0,this.helper.addClass("ui-sortable-helper"),this._mouseDrag(t),!0},_mouseDrag:function(t){var i,s,n,a,o=this.options,r=!1;for(this.position=this._generatePosition(t),this.positionAbs=this._convertPositionTo("absolute"),this.lastPositionAbs||(this.lastPositionAbs=this.positionAbs),this.options.scroll&&(this.scrollParent[0]!==this.document[0]&&"HTML"!==this.scrollParent[0].tagName?(this.overflowOffset.top+this.scrollParent[0].offsetHeight-t.pageY<o.scrollSensitivity?this.scrollParent[0].scrollTop=r=this.scrollParent[0].scrollTop+o.scrollSpeed:t.pageY-this.overflowOffset.top<o.scrollSensitivity&&(this.scrollParent[0].scrollTop=r=this.scrollParent[0].scrollTop-o.scrollSpeed),this.overflowOffset.left+this.scrollParent[0].offsetWidth-t.pageX<o.scrollSensitivity?this.scrollParent[0].scrollLeft=r=this.scrollParent[0].scrollLeft+o.scrollSpeed:t.pageX-this.overflowOffset.left<o.scrollSensitivity&&(this.scrollParent[0].scrollLeft=r=this.scrollParent[0].scrollLeft-o.scrollSpeed)):(t.pageY-this.document.scrollTop()<o.scrollSensitivity?r=this.document.scrollTop(this.document.scrollTop()-o.scrollSpeed):this.window.height()-(t.pageY-this.document.scrollTop())<o.scrollSensitivity&&(r=this.document.scrollTop(this.document.scrollTop()+o.scrollSpeed)),t.pageX-this.document.scrollLeft()<o.scrollSensitivity?r=this.document.scrollLeft(this.document.scrollLeft()-o.scrollSpeed):this.window.width()-(t.pageX-this.document.scrollLeft())<o.scrollSensitivity&&(r=this.document.scrollLeft(this.document.scrollLeft()+o.scrollSpeed))),r!==!1&&e.ui.ddmanager&&!o.dropBehaviour&&e.ui.ddmanager.prepareOffsets(this,t)),this.positionAbs=this._convertPositionTo("absolute"),this.options.axis&&"y"===this.options.axis||(this.helper[0].style.left=this.position.left+"px"),this.options.axis&&"x"===this.options.axis||(this.helper[0].style.top=this.position.top+"px"),i=this.items.length-1;i>=0;i--)if(s=this.items[i],n=s.item[0],a=this._intersectsWithPointer(s),a&&s.instance===this.currentContainer&&n!==this.currentItem[0]&&this.placeholder[1===a?"next":"prev"]()[0]!==n&&!e.contains(this.placeholder[0],n)&&("semi-dynamic"===this.options.type?!e.contains(this.element[0],n):!0)){if(this.direction=1===a?"down":"up","pointer"!==this.options.tolerance&&!this._intersectsWithSides(s))break;this._rearrange(t,s),this._trigger("change",t,this._uiHash());break}return this._contactContainers(t),e.ui.ddmanager&&e.ui.ddmanager.drag(this,t),this._trigger("sort",t,this._uiHash()),this.lastPositionAbs=this.positionAbs,!1},_mouseStop:function(t,i){if(t){if(e.ui.ddmanager&&!this.options.dropBehaviour&&e.ui.ddmanager.drop(this,t),this.options.revert){var s=this,n=this.placeholder.offset(),a=this.options.axis,o={};a&&"x"!==a||(o.left=n.left-this.offset.parent.left-this.margins.left+(this.offsetParent[0]===this.document[0].body?0:this.offsetParent[0].scrollLeft)),a&&"y"!==a||(o.top=n.top-this.offset.parent.top-this.margins.top+(this.offsetParent[0]===this.document[0].body?0:this.offsetParent[0].scrollTop)),this.reverting=!0,e(this.helper).animate(o,parseInt(this.options.revert,10)||500,function(){s._clear(t)})}else this._clear(t,i);return!1}},cancel:function(){if(this.dragging){this._mouseUp({target:null}),"original"===this.options.helper?this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper"):this.currentItem.show();for(var t=this.containers.length-1;t>=0;t--)this.containers[t]._trigger("deactivate",null,this._uiHash(this)),this.containers[t].containerCache.over&&(this.containers[t]._trigger("out",null,this._uiHash(this)),this.containers[t].containerCache.over=0)}return this.placeholder&&(this.placeholder[0].parentNode&&this.placeholder[0].parentNode.removeChild(this.placeholder[0]),"original"!==this.options.helper&&this.helper&&this.helper[0].parentNode&&this.helper.remove(),e.extend(this,{helper:null,dragging:!1,reverting:!1,_noFinalSort:null}),this.domPosition.prev?e(this.domPosition.prev).after(this.currentItem):e(this.domPosition.parent).prepend(this.currentItem)),this},serialize:function(t){var i=this._getItemsAsjQuery(t&&t.connected),s=[];return t=t||{},e(i).each(function(){var i=(e(t.item||this).attr(t.attribute||"id")||"").match(t.expression||/(.+)[\-=_](.+)/);i&&s.push((t.key||i[1]+"[]")+"="+(t.key&&t.expression?i[1]:i[2]))}),!s.length&&t.key&&s.push(t.key+"="),s.join("&")},toArray:function(t){var i=this._getItemsAsjQuery(t&&t.connected),s=[];return t=t||{},i.each(function(){s.push(e(t.item||this).attr(t.attribute||"id")||"")}),s},_intersectsWith:function(e){var t=this.positionAbs.left,i=t+this.helperProportions.width,s=this.positionAbs.top,n=s+this.helperProportions.height,a=e.left,o=a+e.width,r=e.top,h=r+e.height,l=this.offset.click.top,u=this.offset.click.left,d="x"===this.options.axis||s+l>r&&h>s+l,c="y"===this.options.axis||t+u>a&&o>t+u,p=d&&c;return"pointer"===this.options.tolerance||this.options.forcePointerForContainers||"pointer"!==this.options.tolerance&&this.helperProportions[this.floating?"width":"height"]>e[this.floating?"width":"height"]?p:t+this.helperProportions.width/2>a&&o>i-this.helperProportions.width/2&&s+this.helperProportions.height/2>r&&h>n-this.helperProportions.height/2},_intersectsWithPointer:function(e){var t="x"===this.options.axis||this._isOverAxis(this.positionAbs.top+this.offset.click.top,e.top,e.height),i="y"===this.options.axis||this._isOverAxis(this.positionAbs.left+this.offset.click.left,e.left,e.width),s=t&&i,n=this._getDragVerticalDirection(),a=this._getDragHorizontalDirection();return s?this.floating?a&&"right"===a||"down"===n?2:1:n&&("down"===n?2:1):!1},_intersectsWithSides:function(e){var t=this._isOverAxis(this.positionAbs.top+this.offset.click.top,e.top+e.height/2,e.height),i=this._isOverAxis(this.positionAbs.left+this.offset.click.left,e.left+e.width/2,e.width),s=this._getDragVerticalDirection(),n=this._getDragHorizontalDirection();return this.floating&&n?"right"===n&&i||"left"===n&&!i:s&&("down"===s&&t||"up"===s&&!t)},_getDragVerticalDirection:function(){var e=this.positionAbs.top-this.lastPositionAbs.top;return 0!==e&&(e>0?"down":"up")},_getDragHorizontalDirection:function(){var e=this.positionAbs.left-this.lastPositionAbs.left;return 0!==e&&(e>0?"right":"left")},refresh:function(e){return this._refreshItems(e),this._setHandleClassName(),this.refreshPositions(),this},_connectWith:function(){var e=this.options;return e.connectWith.constructor===String?[e.connectWith]:e.connectWith},_getItemsAsjQuery:function(t){function i(){r.push(this)}var s,n,a,o,r=[],h=[],l=this._connectWith();if(l&&t)for(s=l.length-1;s>=0;s--)for(a=e(l[s],this.document[0]),n=a.length-1;n>=0;n--)o=e.data(a[n],this.widgetFullName),o&&o!==this&&!o.options.disabled&&h.push([e.isFunction(o.options.items)?o.options.items.call(o.element):e(o.options.items,o.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),o]);for(h.push([e.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):e(this.options.items,this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),this]),s=h.length-1;s>=0;s--)h[s][0].each(i);return e(r)},_removeCurrentsFromItems:function(){var t=this.currentItem.find(":data("+this.widgetName+"-item)");this.items=e.grep(this.items,function(e){for(var i=0;t.length>i;i++)if(t[i]===e.item[0])return!1;return!0})},_refreshItems:function(t){this.items=[],this.containers=[this];var i,s,n,a,o,r,h,l,u=this.items,d=[[e.isFunction(this.options.items)?this.options.items.call(this.element[0],t,{item:this.currentItem}):e(this.options.items,this.element),this]],c=this._connectWith();if(c&&this.ready)for(i=c.length-1;i>=0;i--)for(n=e(c[i],this.document[0]),s=n.length-1;s>=0;s--)a=e.data(n[s],this.widgetFullName),a&&a!==this&&!a.options.disabled&&(d.push([e.isFunction(a.options.items)?a.options.items.call(a.element[0],t,{item:this.currentItem}):e(a.options.items,a.element),a]),this.containers.push(a));for(i=d.length-1;i>=0;i--)for(o=d[i][1],r=d[i][0],s=0,l=r.length;l>s;s++)h=e(r[s]),h.data(this.widgetName+"-item",o),u.push({item:h,instance:o,width:0,height:0,left:0,top:0})},refreshPositions:function(t){this.floating=this.items.length?"x"===this.options.axis||this._isFloating(this.items[0].item):!1,this.offsetParent&&this.helper&&(this.offset.parent=this._getParentOffset());var i,s,n,a;for(i=this.items.length-1;i>=0;i--)s=this.items[i],s.instance!==this.currentContainer&&this.currentContainer&&s.item[0]!==this.currentItem[0]||(n=this.options.toleranceElement?e(this.options.toleranceElement,s.item):s.item,t||(s.width=n.outerWidth(),s.height=n.outerHeight()),a=n.offset(),s.left=a.left,s.top=a.top);if(this.options.custom&&this.options.custom.refreshContainers)this.options.custom.refreshContainers.call(this);else for(i=this.containers.length-1;i>=0;i--)a=this.containers[i].element.offset(),this.containers[i].containerCache.left=a.left,this.containers[i].containerCache.top=a.top,this.containers[i].containerCache.width=this.containers[i].element.outerWidth(),this.containers[i].containerCache.height=this.containers[i].element.outerHeight();return this},_createPlaceholder:function(t){t=t||this;var i,s=t.options;s.placeholder&&s.placeholder.constructor!==String||(i=s.placeholder,s.placeholder={element:function(){var s=t.currentItem[0].nodeName.toLowerCase(),n=e("<"+s+">",t.document[0]).addClass(i||t.currentItem[0].className+" ui-sortable-placeholder").removeClass("ui-sortable-helper");return"tbody"===s?t._createTrPlaceholder(t.currentItem.find("tr").eq(0),e("<tr>",t.document[0]).appendTo(n)):"tr"===s?t._createTrPlaceholder(t.currentItem,n):"img"===s&&n.attr("src",t.currentItem.attr("src")),i||n.css("visibility","hidden"),n},update:function(e,n){(!i||s.forcePlaceholderSize)&&(n.height()||n.height(t.currentItem.innerHeight()-parseInt(t.currentItem.css("paddingTop")||0,10)-parseInt(t.currentItem.css("paddingBottom")||0,10)),n.width()||n.width(t.currentItem.innerWidth()-parseInt(t.currentItem.css("paddingLeft")||0,10)-parseInt(t.currentItem.css("paddingRight")||0,10)))}}),t.placeholder=e(s.placeholder.element.call(t.element,t.currentItem)),t.currentItem.after(t.placeholder),s.placeholder.update(t,t.placeholder)},_createTrPlaceholder:function(t,i){var s=this;t.children().each(function(){e("<td>&#160;</td>",s.document[0]).attr("colspan",e(this).attr("colspan")||1).appendTo(i)})},_contactContainers:function(t){var i,s,n,a,o,r,h,l,u,d,c=null,p=null;for(i=this.containers.length-1;i>=0;i--)if(!e.contains(this.currentItem[0],this.containers[i].element[0]))if(this._intersectsWith(this.containers[i].containerCache)){if(c&&e.contains(this.containers[i].element[0],c.element[0]))continue;c=this.containers[i],p=i}else this.containers[i].containerCache.over&&(this.containers[i]._trigger("out",t,this._uiHash(this)),this.containers[i].containerCache.over=0);if(c)if(1===this.containers.length)this.containers[p].containerCache.over||(this.containers[p]._trigger("over",t,this._uiHash(this)),this.containers[p].containerCache.over=1);else{for(n=1e4,a=null,u=c.floating||this._isFloating(this.currentItem),o=u?"left":"top",r=u?"width":"height",d=u?"clientX":"clientY",s=this.items.length-1;s>=0;s--)e.contains(this.containers[p].element[0],this.items[s].item[0])&&this.items[s].item[0]!==this.currentItem[0]&&(h=this.items[s].item.offset()[o],l=!1,t[d]-h>this.items[s][r]/2&&(l=!0),n>Math.abs(t[d]-h)&&(n=Math.abs(t[d]-h),a=this.items[s],this.direction=l?"up":"down"));if(!a&&!this.options.dropOnEmpty)return;if(this.currentContainer===this.containers[p])return this.currentContainer.containerCache.over||(this.containers[p]._trigger("over",t,this._uiHash()),this.currentContainer.containerCache.over=1),void 0;a?this._rearrange(t,a,null,!0):this._rearrange(t,null,this.containers[p].element,!0),this._trigger("change",t,this._uiHash()),this.containers[p]._trigger("change",t,this._uiHash(this)),this.currentContainer=this.containers[p],this.options.placeholder.update(this.currentContainer,this.placeholder),this.containers[p]._trigger("over",t,this._uiHash(this)),this.containers[p].containerCache.over=1}},_createHelper:function(t){var i=this.options,s=e.isFunction(i.helper)?e(i.helper.apply(this.element[0],[t,this.currentItem])):"clone"===i.helper?this.currentItem.clone():this.currentItem;return s.parents("body").length||e("parent"!==i.appendTo?i.appendTo:this.currentItem[0].parentNode)[0].appendChild(s[0]),s[0]===this.currentItem[0]&&(this._storedCSS={width:this.currentItem[0].style.width,height:this.currentItem[0].style.height,position:this.currentItem.css("position"),top:this.currentItem.css("top"),left:this.currentItem.css("left")}),(!s[0].style.width||i.forceHelperSize)&&s.width(this.currentItem.width()),(!s[0].style.height||i.forceHelperSize)&&s.height(this.currentItem.height()),s},_adjustOffsetFromHelper:function(t){"string"==typeof t&&(t=t.split(" ")),e.isArray(t)&&(t={left:+t[0],top:+t[1]||0}),"left"in t&&(this.offset.click.left=t.left+this.margins.left),"right"in t&&(this.offset.click.left=this.helperProportions.width-t.right+this.margins.left),"top"in t&&(this.offset.click.top=t.top+this.margins.top),"bottom"in t&&(this.offset.click.top=this.helperProportions.height-t.bottom+this.margins.top)},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var t=this.offsetParent.offset();return"absolute"===this.cssPosition&&this.scrollParent[0]!==this.document[0]&&e.contains(this.scrollParent[0],this.offsetParent[0])&&(t.left+=this.scrollParent.scrollLeft(),t.top+=this.scrollParent.scrollTop()),(this.offsetParent[0]===this.document[0].body||this.offsetParent[0].tagName&&"html"===this.offsetParent[0].tagName.toLowerCase()&&e.ui.ie)&&(t={top:0,left:0}),{top:t.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:t.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if("relative"===this.cssPosition){var e=this.currentItem.position();return{top:e.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:e.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.currentItem.css("marginLeft"),10)||0,top:parseInt(this.currentItem.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var t,i,s,n=this.options;"parent"===n.containment&&(n.containment=this.helper[0].parentNode),("document"===n.containment||"window"===n.containment)&&(this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,"document"===n.containment?this.document.width():this.window.width()-this.helperProportions.width-this.margins.left,("document"===n.containment?this.document.width():this.window.height()||this.document[0].body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top]),/^(document|window|parent)$/.test(n.containment)||(t=e(n.containment)[0],i=e(n.containment).offset(),s="hidden"!==e(t).css("overflow"),this.containment=[i.left+(parseInt(e(t).css("borderLeftWidth"),10)||0)+(parseInt(e(t).css("paddingLeft"),10)||0)-this.margins.left,i.top+(parseInt(e(t).css("borderTopWidth"),10)||0)+(parseInt(e(t).css("paddingTop"),10)||0)-this.margins.top,i.left+(s?Math.max(t.scrollWidth,t.offsetWidth):t.offsetWidth)-(parseInt(e(t).css("borderLeftWidth"),10)||0)-(parseInt(e(t).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,i.top+(s?Math.max(t.scrollHeight,t.offsetHeight):t.offsetHeight)-(parseInt(e(t).css("borderTopWidth"),10)||0)-(parseInt(e(t).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top])},_convertPositionTo:function(t,i){i||(i=this.position);var s="absolute"===t?1:-1,n="absolute"!==this.cssPosition||this.scrollParent[0]!==this.document[0]&&e.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,a=/(html|body)/i.test(n[0].tagName);return{top:i.top+this.offset.relative.top*s+this.offset.parent.top*s-("fixed"===this.cssPosition?-this.scrollParent.scrollTop():a?0:n.scrollTop())*s,left:i.left+this.offset.relative.left*s+this.offset.parent.left*s-("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():a?0:n.scrollLeft())*s}},_generatePosition:function(t){var i,s,n=this.options,a=t.pageX,o=t.pageY,r="absolute"!==this.cssPosition||this.scrollParent[0]!==this.document[0]&&e.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,h=/(html|body)/i.test(r[0].tagName);return"relative"!==this.cssPosition||this.scrollParent[0]!==this.document[0]&&this.scrollParent[0]!==this.offsetParent[0]||(this.offset.relative=this._getRelativeOffset()),this.originalPosition&&(this.containment&&(t.pageX-this.offset.click.left<this.containment[0]&&(a=this.containment[0]+this.offset.click.left),t.pageY-this.offset.click.top<this.containment[1]&&(o=this.containment[1]+this.offset.click.top),t.pageX-this.offset.click.left>this.containment[2]&&(a=this.containment[2]+this.offset.click.left),t.pageY-this.offset.click.top>this.containment[3]&&(o=this.containment[3]+this.offset.click.top)),n.grid&&(i=this.originalPageY+Math.round((o-this.originalPageY)/n.grid[1])*n.grid[1],o=this.containment?i-this.offset.click.top>=this.containment[1]&&i-this.offset.click.top<=this.containment[3]?i:i-this.offset.click.top>=this.containment[1]?i-n.grid[1]:i+n.grid[1]:i,s=this.originalPageX+Math.round((a-this.originalPageX)/n.grid[0])*n.grid[0],a=this.containment?s-this.offset.click.left>=this.containment[0]&&s-this.offset.click.left<=this.containment[2]?s:s-this.offset.click.left>=this.containment[0]?s-n.grid[0]:s+n.grid[0]:s)),{top:o-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+("fixed"===this.cssPosition?-this.scrollParent.scrollTop():h?0:r.scrollTop()),left:a-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():h?0:r.scrollLeft())}},_rearrange:function(e,t,i,s){i?i[0].appendChild(this.placeholder[0]):t.item[0].parentNode.insertBefore(this.placeholder[0],"down"===this.direction?t.item[0]:t.item[0].nextSibling),this.counter=this.counter?++this.counter:1;var n=this.counter;this._delay(function(){n===this.counter&&this.refreshPositions(!s)})},_clear:function(e,t){function i(e,t,i){return function(s){i._trigger(e,s,t._uiHash(t))}}this.reverting=!1;var s,n=[];if(!this._noFinalSort&&this.currentItem.parent().length&&this.placeholder.before(this.currentItem),this._noFinalSort=null,this.helper[0]===this.currentItem[0]){for(s in this._storedCSS)("auto"===this._storedCSS[s]||"static"===this._storedCSS[s])&&(this._storedCSS[s]="");this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper")}else this.currentItem.show();for(this.fromOutside&&!t&&n.push(function(e){this._trigger("receive",e,this._uiHash(this.fromOutside))}),!this.fromOutside&&this.domPosition.prev===this.currentItem.prev().not(".ui-sortable-helper")[0]&&this.domPosition.parent===this.currentItem.parent()[0]||t||n.push(function(e){this._trigger("update",e,this._uiHash())}),this!==this.currentContainer&&(t||(n.push(function(e){this._trigger("remove",e,this._uiHash())}),n.push(function(e){return function(t){e._trigger("receive",t,this._uiHash(this))}}.call(this,this.currentContainer)),n.push(function(e){return function(t){e._trigger("update",t,this._uiHash(this))}}.call(this,this.currentContainer)))),s=this.containers.length-1;s>=0;s--)t||n.push(i("deactivate",this,this.containers[s])),this.containers[s].containerCache.over&&(n.push(i("out",this,this.containers[s])),this.containers[s].containerCache.over=0);if(this.storedCursor&&(this.document.find("body").css("cursor",this.storedCursor),this.storedStylesheet.remove()),this._storedOpacity&&this.helper.css("opacity",this._storedOpacity),this._storedZIndex&&this.helper.css("zIndex","auto"===this._storedZIndex?"":this._storedZIndex),this.dragging=!1,t||this._trigger("beforeStop",e,this._uiHash()),this.placeholder[0].parentNode.removeChild(this.placeholder[0]),this.cancelHelperRemoval||(this.helper[0]!==this.currentItem[0]&&this.helper.remove(),this.helper=null),!t){for(s=0;n.length>s;s++)n[s].call(this,e);this._trigger("stop",e,this._uiHash())}return this.fromOutside=!1,!this.cancelHelperRemoval},_trigger:function(){e.Widget.prototype._trigger.apply(this,arguments)===!1&&this.cancel()},_uiHash:function(t){var i=t||this;return{helper:i.helper,placeholder:i.placeholder||e([]),position:i.position,originalPosition:i.originalPosition,offset:i.positionAbs,item:i.currentItem,sender:t?t.element:null}}}),e.widget("ui.accordion",{version:"1.11.4",options:{active:0,animate:{},collapsible:!1,event:"click",header:"> li > :first-child,> :not(li):even",heightStyle:"auto",icons:{activeHeader:"ui-icon-triangle-1-s",header:"ui-icon-triangle-1-e"},activate:null,beforeActivate:null},hideProps:{borderTopWidth:"hide",borderBottomWidth:"hide",paddingTop:"hide",paddingBottom:"hide",height:"hide"},showProps:{borderTopWidth:"show",borderBottomWidth:"show",paddingTop:"show",paddingBottom:"show",height:"show"},_create:function(){var t=this.options;this.prevShow=this.prevHide=e(),this.element.addClass("ui-accordion ui-widget ui-helper-reset").attr("role","tablist"),t.collapsible||t.active!==!1&&null!=t.active||(t.active=0),this._processPanels(),0>t.active&&(t.active+=this.headers.length),this._refresh()},_getCreateEventData:function(){return{header:this.active,panel:this.active.length?this.active.next():e()}},_createIcons:function(){var t=this.options.icons;t&&(e("<span>").addClass("ui-accordion-header-icon ui-icon "+t.header).prependTo(this.headers),this.active.children(".ui-accordion-header-icon").removeClass(t.header).addClass(t.activeHeader),this.headers.addClass("ui-accordion-icons"))},_destroyIcons:function(){this.headers.removeClass("ui-accordion-icons").children(".ui-accordion-header-icon").remove()},_destroy:function(){var e;this.element.removeClass("ui-accordion ui-widget ui-helper-reset").removeAttr("role"),this.headers.removeClass("ui-accordion-header ui-accordion-header-active ui-state-default ui-corner-all ui-state-active ui-state-disabled ui-corner-top").removeAttr("role").removeAttr("aria-expanded").removeAttr("aria-selected").removeAttr("aria-controls").removeAttr("tabIndex").removeUniqueId(),this._destroyIcons(),e=this.headers.next().removeClass("ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content ui-accordion-content-active ui-state-disabled").css("display","").removeAttr("role").removeAttr("aria-hidden").removeAttr("aria-labelledby").removeUniqueId(),"content"!==this.options.heightStyle&&e.css("height","")},_setOption:function(e,t){return"active"===e?(this._activate(t),void 0):("event"===e&&(this.options.event&&this._off(this.headers,this.options.event),this._setupEvents(t)),this._super(e,t),"collapsible"!==e||t||this.options.active!==!1||this._activate(0),"icons"===e&&(this._destroyIcons(),t&&this._createIcons()),"disabled"===e&&(this.element.toggleClass("ui-state-disabled",!!t).attr("aria-disabled",t),this.headers.add(this.headers.next()).toggleClass("ui-state-disabled",!!t)),void 0)},_keydown:function(t){if(!t.altKey&&!t.ctrlKey){var i=e.ui.keyCode,s=this.headers.length,n=this.headers.index(t.target),a=!1;switch(t.keyCode){case i.RIGHT:case i.DOWN:a=this.headers[(n+1)%s];break;case i.LEFT:case i.UP:a=this.headers[(n-1+s)%s];break;case i.SPACE:case i.ENTER:this._eventHandler(t);break;case i.HOME:a=this.headers[0];break;case i.END:a=this.headers[s-1]}a&&(e(t.target).attr("tabIndex",-1),e(a).attr("tabIndex",0),a.focus(),t.preventDefault())}},_panelKeyDown:function(t){t.keyCode===e.ui.keyCode.UP&&t.ctrlKey&&e(t.currentTarget).prev().focus()},refresh:function(){var t=this.options;this._processPanels(),t.active===!1&&t.collapsible===!0||!this.headers.length?(t.active=!1,this.active=e()):t.active===!1?this._activate(0):this.active.length&&!e.contains(this.element[0],this.active[0])?this.headers.length===this.headers.find(".ui-state-disabled").length?(t.active=!1,this.active=e()):this._activate(Math.max(0,t.active-1)):t.active=this.headers.index(this.active),this._destroyIcons(),this._refresh()},_processPanels:function(){var e=this.headers,t=this.panels;this.headers=this.element.find(this.options.header).addClass("ui-accordion-header ui-state-default ui-corner-all"),this.panels=this.headers.next().addClass("ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom").filter(":not(.ui-accordion-content-active)").hide(),t&&(this._off(e.not(this.headers)),this._off(t.not(this.panels)))
-},_refresh:function(){var t,i=this.options,s=i.heightStyle,n=this.element.parent();this.active=this._findActive(i.active).addClass("ui-accordion-header-active ui-state-active ui-corner-top").removeClass("ui-corner-all"),this.active.next().addClass("ui-accordion-content-active").show(),this.headers.attr("role","tab").each(function(){var t=e(this),i=t.uniqueId().attr("id"),s=t.next(),n=s.uniqueId().attr("id");t.attr("aria-controls",n),s.attr("aria-labelledby",i)}).next().attr("role","tabpanel"),this.headers.not(this.active).attr({"aria-selected":"false","aria-expanded":"false",tabIndex:-1}).next().attr({"aria-hidden":"true"}).hide(),this.active.length?this.active.attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0}).next().attr({"aria-hidden":"false"}):this.headers.eq(0).attr("tabIndex",0),this._createIcons(),this._setupEvents(i.event),"fill"===s?(t=n.height(),this.element.siblings(":visible").each(function(){var i=e(this),s=i.css("position");"absolute"!==s&&"fixed"!==s&&(t-=i.outerHeight(!0))}),this.headers.each(function(){t-=e(this).outerHeight(!0)}),this.headers.next().each(function(){e(this).height(Math.max(0,t-e(this).innerHeight()+e(this).height()))}).css("overflow","auto")):"auto"===s&&(t=0,this.headers.next().each(function(){t=Math.max(t,e(this).css("height","").height())}).height(t))},_activate:function(t){var i=this._findActive(t)[0];i!==this.active[0]&&(i=i||this.active[0],this._eventHandler({target:i,currentTarget:i,preventDefault:e.noop}))},_findActive:function(t){return"number"==typeof t?this.headers.eq(t):e()},_setupEvents:function(t){var i={keydown:"_keydown"};t&&e.each(t.split(" "),function(e,t){i[t]="_eventHandler"}),this._off(this.headers.add(this.headers.next())),this._on(this.headers,i),this._on(this.headers.next(),{keydown:"_panelKeyDown"}),this._hoverable(this.headers),this._focusable(this.headers)},_eventHandler:function(t){var i=this.options,s=this.active,n=e(t.currentTarget),a=n[0]===s[0],o=a&&i.collapsible,r=o?e():n.next(),h=s.next(),l={oldHeader:s,oldPanel:h,newHeader:o?e():n,newPanel:r};t.preventDefault(),a&&!i.collapsible||this._trigger("beforeActivate",t,l)===!1||(i.active=o?!1:this.headers.index(n),this.active=a?e():n,this._toggle(l),s.removeClass("ui-accordion-header-active ui-state-active"),i.icons&&s.children(".ui-accordion-header-icon").removeClass(i.icons.activeHeader).addClass(i.icons.header),a||(n.removeClass("ui-corner-all").addClass("ui-accordion-header-active ui-state-active ui-corner-top"),i.icons&&n.children(".ui-accordion-header-icon").removeClass(i.icons.header).addClass(i.icons.activeHeader),n.next().addClass("ui-accordion-content-active")))},_toggle:function(t){var i=t.newPanel,s=this.prevShow.length?this.prevShow:t.oldPanel;this.prevShow.add(this.prevHide).stop(!0,!0),this.prevShow=i,this.prevHide=s,this.options.animate?this._animate(i,s,t):(s.hide(),i.show(),this._toggleComplete(t)),s.attr({"aria-hidden":"true"}),s.prev().attr({"aria-selected":"false","aria-expanded":"false"}),i.length&&s.length?s.prev().attr({tabIndex:-1,"aria-expanded":"false"}):i.length&&this.headers.filter(function(){return 0===parseInt(e(this).attr("tabIndex"),10)}).attr("tabIndex",-1),i.attr("aria-hidden","false").prev().attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0})},_animate:function(e,t,i){var s,n,a,o=this,r=0,h=e.css("box-sizing"),l=e.length&&(!t.length||e.index()<t.index()),u=this.options.animate||{},d=l&&u.down||u,c=function(){o._toggleComplete(i)};return"number"==typeof d&&(a=d),"string"==typeof d&&(n=d),n=n||d.easing||u.easing,a=a||d.duration||u.duration,t.length?e.length?(s=e.show().outerHeight(),t.animate(this.hideProps,{duration:a,easing:n,step:function(e,t){t.now=Math.round(e)}}),e.hide().animate(this.showProps,{duration:a,easing:n,complete:c,step:function(e,i){i.now=Math.round(e),"height"!==i.prop?"content-box"===h&&(r+=i.now):"content"!==o.options.heightStyle&&(i.now=Math.round(s-t.outerHeight()-r),r=0)}}),void 0):t.animate(this.hideProps,a,n,c):e.animate(this.showProps,a,n,c)},_toggleComplete:function(e){var t=e.oldPanel;t.removeClass("ui-accordion-content-active").prev().removeClass("ui-corner-top").addClass("ui-corner-all"),t.length&&(t.parent()[0].className=t.parent()[0].className),this._trigger("activate",null,e)}}),e.widget("ui.menu",{version:"1.11.4",defaultElement:"<ul>",delay:300,options:{icons:{submenu:"ui-icon-carat-1-e"},items:"> *",menus:"ul",position:{my:"left-1 top",at:"right top"},role:"menu",blur:null,focus:null,select:null},_create:function(){this.activeMenu=this.element,this.mouseHandled=!1,this.element.uniqueId().addClass("ui-menu ui-widget ui-widget-content").toggleClass("ui-menu-icons",!!this.element.find(".ui-icon").length).attr({role:this.options.role,tabIndex:0}),this.options.disabled&&this.element.addClass("ui-state-disabled").attr("aria-disabled","true"),this._on({"mousedown .ui-menu-item":function(e){e.preventDefault()},"click .ui-menu-item":function(t){var i=e(t.target);!this.mouseHandled&&i.not(".ui-state-disabled").length&&(this.select(t),t.isPropagationStopped()||(this.mouseHandled=!0),i.has(".ui-menu").length?this.expand(t):!this.element.is(":focus")&&e(this.document[0].activeElement).closest(".ui-menu").length&&(this.element.trigger("focus",[!0]),this.active&&1===this.active.parents(".ui-menu").length&&clearTimeout(this.timer)))},"mouseenter .ui-menu-item":function(t){if(!this.previousFilter){var i=e(t.currentTarget);i.siblings(".ui-state-active").removeClass("ui-state-active"),this.focus(t,i)}},mouseleave:"collapseAll","mouseleave .ui-menu":"collapseAll",focus:function(e,t){var i=this.active||this.element.find(this.options.items).eq(0);t||this.focus(e,i)},blur:function(t){this._delay(function(){e.contains(this.element[0],this.document[0].activeElement)||this.collapseAll(t)})},keydown:"_keydown"}),this.refresh(),this._on(this.document,{click:function(e){this._closeOnDocumentClick(e)&&this.collapseAll(e),this.mouseHandled=!1}})},_destroy:function(){this.element.removeAttr("aria-activedescendant").find(".ui-menu").addBack().removeClass("ui-menu ui-widget ui-widget-content ui-menu-icons ui-front").removeAttr("role").removeAttr("tabIndex").removeAttr("aria-labelledby").removeAttr("aria-expanded").removeAttr("aria-hidden").removeAttr("aria-disabled").removeUniqueId().show(),this.element.find(".ui-menu-item").removeClass("ui-menu-item").removeAttr("role").removeAttr("aria-disabled").removeUniqueId().removeClass("ui-state-hover").removeAttr("tabIndex").removeAttr("role").removeAttr("aria-haspopup").children().each(function(){var t=e(this);t.data("ui-menu-submenu-carat")&&t.remove()}),this.element.find(".ui-menu-divider").removeClass("ui-menu-divider ui-widget-content")},_keydown:function(t){var i,s,n,a,o=!0;switch(t.keyCode){case e.ui.keyCode.PAGE_UP:this.previousPage(t);break;case e.ui.keyCode.PAGE_DOWN:this.nextPage(t);break;case e.ui.keyCode.HOME:this._move("first","first",t);break;case e.ui.keyCode.END:this._move("last","last",t);break;case e.ui.keyCode.UP:this.previous(t);break;case e.ui.keyCode.DOWN:this.next(t);break;case e.ui.keyCode.LEFT:this.collapse(t);break;case e.ui.keyCode.RIGHT:this.active&&!this.active.is(".ui-state-disabled")&&this.expand(t);break;case e.ui.keyCode.ENTER:case e.ui.keyCode.SPACE:this._activate(t);break;case e.ui.keyCode.ESCAPE:this.collapse(t);break;default:o=!1,s=this.previousFilter||"",n=String.fromCharCode(t.keyCode),a=!1,clearTimeout(this.filterTimer),n===s?a=!0:n=s+n,i=this._filterMenuItems(n),i=a&&-1!==i.index(this.active.next())?this.active.nextAll(".ui-menu-item"):i,i.length||(n=String.fromCharCode(t.keyCode),i=this._filterMenuItems(n)),i.length?(this.focus(t,i),this.previousFilter=n,this.filterTimer=this._delay(function(){delete this.previousFilter},1e3)):delete this.previousFilter}o&&t.preventDefault()},_activate:function(e){this.active.is(".ui-state-disabled")||(this.active.is("[aria-haspopup='true']")?this.expand(e):this.select(e))},refresh:function(){var t,i,s=this,n=this.options.icons.submenu,a=this.element.find(this.options.menus);this.element.toggleClass("ui-menu-icons",!!this.element.find(".ui-icon").length),a.filter(":not(.ui-menu)").addClass("ui-menu ui-widget ui-widget-content ui-front").hide().attr({role:this.options.role,"aria-hidden":"true","aria-expanded":"false"}).each(function(){var t=e(this),i=t.parent(),s=e("<span>").addClass("ui-menu-icon ui-icon "+n).data("ui-menu-submenu-carat",!0);i.attr("aria-haspopup","true").prepend(s),t.attr("aria-labelledby",i.attr("id"))}),t=a.add(this.element),i=t.find(this.options.items),i.not(".ui-menu-item").each(function(){var t=e(this);s._isDivider(t)&&t.addClass("ui-widget-content ui-menu-divider")}),i.not(".ui-menu-item, .ui-menu-divider").addClass("ui-menu-item").uniqueId().attr({tabIndex:-1,role:this._itemRole()}),i.filter(".ui-state-disabled").attr("aria-disabled","true"),this.active&&!e.contains(this.element[0],this.active[0])&&this.blur()},_itemRole:function(){return{menu:"menuitem",listbox:"option"}[this.options.role]},_setOption:function(e,t){"icons"===e&&this.element.find(".ui-menu-icon").removeClass(this.options.icons.submenu).addClass(t.submenu),"disabled"===e&&this.element.toggleClass("ui-state-disabled",!!t).attr("aria-disabled",t),this._super(e,t)},focus:function(e,t){var i,s;this.blur(e,e&&"focus"===e.type),this._scrollIntoView(t),this.active=t.first(),s=this.active.addClass("ui-state-focus").removeClass("ui-state-active"),this.options.role&&this.element.attr("aria-activedescendant",s.attr("id")),this.active.parent().closest(".ui-menu-item").addClass("ui-state-active"),e&&"keydown"===e.type?this._close():this.timer=this._delay(function(){this._close()},this.delay),i=t.children(".ui-menu"),i.length&&e&&/^mouse/.test(e.type)&&this._startOpening(i),this.activeMenu=t.parent(),this._trigger("focus",e,{item:t})},_scrollIntoView:function(t){var i,s,n,a,o,r;this._hasScroll()&&(i=parseFloat(e.css(this.activeMenu[0],"borderTopWidth"))||0,s=parseFloat(e.css(this.activeMenu[0],"paddingTop"))||0,n=t.offset().top-this.activeMenu.offset().top-i-s,a=this.activeMenu.scrollTop(),o=this.activeMenu.height(),r=t.outerHeight(),0>n?this.activeMenu.scrollTop(a+n):n+r>o&&this.activeMenu.scrollTop(a+n-o+r))},blur:function(e,t){t||clearTimeout(this.timer),this.active&&(this.active.removeClass("ui-state-focus"),this.active=null,this._trigger("blur",e,{item:this.active}))},_startOpening:function(e){clearTimeout(this.timer),"true"===e.attr("aria-hidden")&&(this.timer=this._delay(function(){this._close(),this._open(e)},this.delay))},_open:function(t){var i=e.extend({of:this.active},this.options.position);clearTimeout(this.timer),this.element.find(".ui-menu").not(t.parents(".ui-menu")).hide().attr("aria-hidden","true"),t.show().removeAttr("aria-hidden").attr("aria-expanded","true").position(i)},collapseAll:function(t,i){clearTimeout(this.timer),this.timer=this._delay(function(){var s=i?this.element:e(t&&t.target).closest(this.element.find(".ui-menu"));s.length||(s=this.element),this._close(s),this.blur(t),this.activeMenu=s},this.delay)},_close:function(e){e||(e=this.active?this.active.parent():this.element),e.find(".ui-menu").hide().attr("aria-hidden","true").attr("aria-expanded","false").end().find(".ui-state-active").not(".ui-state-focus").removeClass("ui-state-active")},_closeOnDocumentClick:function(t){return!e(t.target).closest(".ui-menu").length},_isDivider:function(e){return!/[^\-\u2014\u2013\s]/.test(e.text())},collapse:function(e){var t=this.active&&this.active.parent().closest(".ui-menu-item",this.element);t&&t.length&&(this._close(),this.focus(e,t))},expand:function(e){var t=this.active&&this.active.children(".ui-menu ").find(this.options.items).first();t&&t.length&&(this._open(t.parent()),this._delay(function(){this.focus(e,t)}))},next:function(e){this._move("next","first",e)},previous:function(e){this._move("prev","last",e)},isFirstItem:function(){return this.active&&!this.active.prevAll(".ui-menu-item").length},isLastItem:function(){return this.active&&!this.active.nextAll(".ui-menu-item").length},_move:function(e,t,i){var s;this.active&&(s="first"===e||"last"===e?this.active["first"===e?"prevAll":"nextAll"](".ui-menu-item").eq(-1):this.active[e+"All"](".ui-menu-item").eq(0)),s&&s.length&&this.active||(s=this.activeMenu.find(this.options.items)[t]()),this.focus(i,s)},nextPage:function(t){var i,s,n;return this.active?(this.isLastItem()||(this._hasScroll()?(s=this.active.offset().top,n=this.element.height(),this.active.nextAll(".ui-menu-item").each(function(){return i=e(this),0>i.offset().top-s-n}),this.focus(t,i)):this.focus(t,this.activeMenu.find(this.options.items)[this.active?"last":"first"]())),void 0):(this.next(t),void 0)},previousPage:function(t){var i,s,n;return this.active?(this.isFirstItem()||(this._hasScroll()?(s=this.active.offset().top,n=this.element.height(),this.active.prevAll(".ui-menu-item").each(function(){return i=e(this),i.offset().top-s+n>0}),this.focus(t,i)):this.focus(t,this.activeMenu.find(this.options.items).first())),void 0):(this.next(t),void 0)},_hasScroll:function(){return this.element.outerHeight()<this.element.prop("scrollHeight")},select:function(t){this.active=this.active||e(t.target).closest(".ui-menu-item");var i={item:this.active};this.active.has(".ui-menu").length||this.collapseAll(t,!0),this._trigger("select",t,i)},_filterMenuItems:function(t){var i=t.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&"),s=RegExp("^"+i,"i");return this.activeMenu.find(this.options.items).filter(".ui-menu-item").filter(function(){return s.test(e.trim(e(this).text()))})}}),e.widget("ui.autocomplete",{version:"1.11.4",defaultElement:"<input>",options:{appendTo:null,autoFocus:!1,delay:300,minLength:1,position:{my:"left top",at:"left bottom",collision:"none"},source:null,change:null,close:null,focus:null,open:null,response:null,search:null,select:null},requestIndex:0,pending:0,_create:function(){var t,i,s,n=this.element[0].nodeName.toLowerCase(),a="textarea"===n,o="input"===n;this.isMultiLine=a?!0:o?!1:this.element.prop("isContentEditable"),this.valueMethod=this.element[a||o?"val":"text"],this.isNewMenu=!0,this.element.addClass("ui-autocomplete-input").attr("autocomplete","off"),this._on(this.element,{keydown:function(n){if(this.element.prop("readOnly"))return t=!0,s=!0,i=!0,void 0;t=!1,s=!1,i=!1;var a=e.ui.keyCode;switch(n.keyCode){case a.PAGE_UP:t=!0,this._move("previousPage",n);break;case a.PAGE_DOWN:t=!0,this._move("nextPage",n);break;case a.UP:t=!0,this._keyEvent("previous",n);break;case a.DOWN:t=!0,this._keyEvent("next",n);break;case a.ENTER:this.menu.active&&(t=!0,n.preventDefault(),this.menu.select(n));break;case a.TAB:this.menu.active&&this.menu.select(n);break;case a.ESCAPE:this.menu.element.is(":visible")&&(this.isMultiLine||this._value(this.term),this.close(n),n.preventDefault());break;default:i=!0,this._searchTimeout(n)}},keypress:function(s){if(t)return t=!1,(!this.isMultiLine||this.menu.element.is(":visible"))&&s.preventDefault(),void 0;if(!i){var n=e.ui.keyCode;switch(s.keyCode){case n.PAGE_UP:this._move("previousPage",s);break;case n.PAGE_DOWN:this._move("nextPage",s);break;case n.UP:this._keyEvent("previous",s);break;case n.DOWN:this._keyEvent("next",s)}}},input:function(e){return s?(s=!1,e.preventDefault(),void 0):(this._searchTimeout(e),void 0)},focus:function(){this.selectedItem=null,this.previous=this._value()},blur:function(e){return this.cancelBlur?(delete this.cancelBlur,void 0):(clearTimeout(this.searching),this.close(e),this._change(e),void 0)}}),this._initSource(),this.menu=e("<ul>").addClass("ui-autocomplete ui-front").appendTo(this._appendTo()).menu({role:null}).hide().menu("instance"),this._on(this.menu.element,{mousedown:function(t){t.preventDefault(),this.cancelBlur=!0,this._delay(function(){delete this.cancelBlur});var i=this.menu.element[0];e(t.target).closest(".ui-menu-item").length||this._delay(function(){var t=this;this.document.one("mousedown",function(s){s.target===t.element[0]||s.target===i||e.contains(i,s.target)||t.close()})})},menufocus:function(t,i){var s,n;return this.isNewMenu&&(this.isNewMenu=!1,t.originalEvent&&/^mouse/.test(t.originalEvent.type))?(this.menu.blur(),this.document.one("mousemove",function(){e(t.target).trigger(t.originalEvent)}),void 0):(n=i.item.data("ui-autocomplete-item"),!1!==this._trigger("focus",t,{item:n})&&t.originalEvent&&/^key/.test(t.originalEvent.type)&&this._value(n.value),s=i.item.attr("aria-label")||n.value,s&&e.trim(s).length&&(this.liveRegion.children().hide(),e("<div>").text(s).appendTo(this.liveRegion)),void 0)},menuselect:function(e,t){var i=t.item.data("ui-autocomplete-item"),s=this.previous;this.element[0]!==this.document[0].activeElement&&(this.element.focus(),this.previous=s,this._delay(function(){this.previous=s,this.selectedItem=i})),!1!==this._trigger("select",e,{item:i})&&this._value(i.value),this.term=this._value(),this.close(e),this.selectedItem=i}}),this.liveRegion=e("<span>",{role:"status","aria-live":"assertive","aria-relevant":"additions"}).addClass("ui-helper-hidden-accessible").appendTo(this.document[0].body),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_destroy:function(){clearTimeout(this.searching),this.element.removeClass("ui-autocomplete-input").removeAttr("autocomplete"),this.menu.element.remove(),this.liveRegion.remove()},_setOption:function(e,t){this._super(e,t),"source"===e&&this._initSource(),"appendTo"===e&&this.menu.element.appendTo(this._appendTo()),"disabled"===e&&t&&this.xhr&&this.xhr.abort()},_appendTo:function(){var t=this.options.appendTo;return t&&(t=t.jquery||t.nodeType?e(t):this.document.find(t).eq(0)),t&&t[0]||(t=this.element.closest(".ui-front")),t.length||(t=this.document[0].body),t},_initSource:function(){var t,i,s=this;e.isArray(this.options.source)?(t=this.options.source,this.source=function(i,s){s(e.ui.autocomplete.filter(t,i.term))}):"string"==typeof this.options.source?(i=this.options.source,this.source=function(t,n){s.xhr&&s.xhr.abort(),s.xhr=e.ajax({url:i,data:t,dataType:"json",success:function(e){n(e)},error:function(){n([])}})}):this.source=this.options.source},_searchTimeout:function(e){clearTimeout(this.searching),this.searching=this._delay(function(){var t=this.term===this._value(),i=this.menu.element.is(":visible"),s=e.altKey||e.ctrlKey||e.metaKey||e.shiftKey;(!t||t&&!i&&!s)&&(this.selectedItem=null,this.search(null,e))},this.options.delay)},search:function(e,t){return e=null!=e?e:this._value(),this.term=this._value(),e.length<this.options.minLength?this.close(t):this._trigger("search",t)!==!1?this._search(e):void 0},_search:function(e){this.pending++,this.element.addClass("ui-autocomplete-loading"),this.cancelSearch=!1,this.source({term:e},this._response())},_response:function(){var t=++this.requestIndex;return e.proxy(function(e){t===this.requestIndex&&this.__response(e),this.pending--,this.pending||this.element.removeClass("ui-autocomplete-loading")},this)},__response:function(e){e&&(e=this._normalize(e)),this._trigger("response",null,{content:e}),!this.options.disabled&&e&&e.length&&!this.cancelSearch?(this._suggest(e),this._trigger("open")):this._close()},close:function(e){this.cancelSearch=!0,this._close(e)},_close:function(e){this.menu.element.is(":visible")&&(this.menu.element.hide(),this.menu.blur(),this.isNewMenu=!0,this._trigger("close",e))},_change:function(e){this.previous!==this._value()&&this._trigger("change",e,{item:this.selectedItem})},_normalize:function(t){return t.length&&t[0].label&&t[0].value?t:e.map(t,function(t){return"string"==typeof t?{label:t,value:t}:e.extend({},t,{label:t.label||t.value,value:t.value||t.label})})},_suggest:function(t){var i=this.menu.element.empty();this._renderMenu(i,t),this.isNewMenu=!0,this.menu.refresh(),i.show(),this._resizeMenu(),i.position(e.extend({of:this.element},this.options.position)),this.options.autoFocus&&this.menu.next()},_resizeMenu:function(){var e=this.menu.element;e.outerWidth(Math.max(e.width("").outerWidth()+1,this.element.outerWidth()))},_renderMenu:function(t,i){var s=this;e.each(i,function(e,i){s._renderItemData(t,i)})},_renderItemData:function(e,t){return this._renderItem(e,t).data("ui-autocomplete-item",t)},_renderItem:function(t,i){return e("<li>").text(i.label).appendTo(t)},_move:function(e,t){return this.menu.element.is(":visible")?this.menu.isFirstItem()&&/^previous/.test(e)||this.menu.isLastItem()&&/^next/.test(e)?(this.isMultiLine||this._value(this.term),this.menu.blur(),void 0):(this.menu[e](t),void 0):(this.search(null,t),void 0)},widget:function(){return this.menu.element},_value:function(){return this.valueMethod.apply(this.element,arguments)},_keyEvent:function(e,t){(!this.isMultiLine||this.menu.element.is(":visible"))&&(this._move(e,t),t.preventDefault())}}),e.extend(e.ui.autocomplete,{escapeRegex:function(e){return e.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")},filter:function(t,i){var s=RegExp(e.ui.autocomplete.escapeRegex(i),"i");return e.grep(t,function(e){return s.test(e.label||e.value||e)})}}),e.widget("ui.autocomplete",e.ui.autocomplete,{options:{messages:{noResults:"No search results.",results:function(e){return e+(e>1?" results are":" result is")+" available, use up and down arrow keys to navigate."}}},__response:function(t){var i;this._superApply(arguments),this.options.disabled||this.cancelSearch||(i=t&&t.length?this.options.messages.results(t.length):this.options.messages.noResults,this.liveRegion.children().hide(),e("<div>").text(i).appendTo(this.liveRegion))}}),e.ui.autocomplete;var c,p="ui-button ui-widget ui-state-default ui-corner-all",f="ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary ui-button-text-only",m=function(){var t=e(this);setTimeout(function(){t.find(":ui-button").button("refresh")},1)},g=function(t){var i=t.name,s=t.form,n=e([]);return i&&(i=i.replace(/'/g,"\\'"),n=s?e(s).find("[name='"+i+"'][type=radio]"):e("[name='"+i+"'][type=radio]",t.ownerDocument).filter(function(){return!this.form})),n};e.widget("ui.button",{version:"1.11.4",defaultElement:"<button>",options:{disabled:null,text:!0,label:null,icons:{primary:null,secondary:null}},_create:function(){this.element.closest("form").unbind("reset"+this.eventNamespace).bind("reset"+this.eventNamespace,m),"boolean"!=typeof this.options.disabled?this.options.disabled=!!this.element.prop("disabled"):this.element.prop("disabled",this.options.disabled),this._determineButtonType(),this.hasTitle=!!this.buttonElement.attr("title");var t=this,i=this.options,s="checkbox"===this.type||"radio"===this.type,n=s?"":"ui-state-active";null===i.label&&(i.label="input"===this.type?this.buttonElement.val():this.buttonElement.html()),this._hoverable(this.buttonElement),this.buttonElement.addClass(p).attr("role","button").bind("mouseenter"+this.eventNamespace,function(){i.disabled||this===c&&e(this).addClass("ui-state-active")}).bind("mouseleave"+this.eventNamespace,function(){i.disabled||e(this).removeClass(n)}).bind("click"+this.eventNamespace,function(e){i.disabled&&(e.preventDefault(),e.stopImmediatePropagation())}),this._on({focus:function(){this.buttonElement.addClass("ui-state-focus")},blur:function(){this.buttonElement.removeClass("ui-state-focus")}}),s&&this.element.bind("change"+this.eventNamespace,function(){t.refresh()}),"checkbox"===this.type?this.buttonElement.bind("click"+this.eventNamespace,function(){return i.disabled?!1:void 0}):"radio"===this.type?this.buttonElement.bind("click"+this.eventNamespace,function(){if(i.disabled)return!1;e(this).addClass("ui-state-active"),t.buttonElement.attr("aria-pressed","true");var s=t.element[0];g(s).not(s).map(function(){return e(this).button("widget")[0]}).removeClass("ui-state-active").attr("aria-pressed","false")}):(this.buttonElement.bind("mousedown"+this.eventNamespace,function(){return i.disabled?!1:(e(this).addClass("ui-state-active"),c=this,t.document.one("mouseup",function(){c=null}),void 0)}).bind("mouseup"+this.eventNamespace,function(){return i.disabled?!1:(e(this).removeClass("ui-state-active"),void 0)}).bind("keydown"+this.eventNamespace,function(t){return i.disabled?!1:((t.keyCode===e.ui.keyCode.SPACE||t.keyCode===e.ui.keyCode.ENTER)&&e(this).addClass("ui-state-active"),void 0)}).bind("keyup"+this.eventNamespace+" blur"+this.eventNamespace,function(){e(this).removeClass("ui-state-active")}),this.buttonElement.is("a")&&this.buttonElement.keyup(function(t){t.keyCode===e.ui.keyCode.SPACE&&e(this).click()})),this._setOption("disabled",i.disabled),this._resetButton()},_determineButtonType:function(){var e,t,i;this.type=this.element.is("[type=checkbox]")?"checkbox":this.element.is("[type=radio]")?"radio":this.element.is("input")?"input":"button","checkbox"===this.type||"radio"===this.type?(e=this.element.parents().last(),t="label[for='"+this.element.attr("id")+"']",this.buttonElement=e.find(t),this.buttonElement.length||(e=e.length?e.siblings():this.element.siblings(),this.buttonElement=e.filter(t),this.buttonElement.length||(this.buttonElement=e.find(t))),this.element.addClass("ui-helper-hidden-accessible"),i=this.element.is(":checked"),i&&this.buttonElement.addClass("ui-state-active"),this.buttonElement.prop("aria-pressed",i)):this.buttonElement=this.element},widget:function(){return this.buttonElement},_destroy:function(){this.element.removeClass("ui-helper-hidden-accessible"),this.buttonElement.removeClass(p+" ui-state-active "+f).removeAttr("role").removeAttr("aria-pressed").html(this.buttonElement.find(".ui-button-text").html()),this.hasTitle||this.buttonElement.removeAttr("title")},_setOption:function(e,t){return this._super(e,t),"disabled"===e?(this.widget().toggleClass("ui-state-disabled",!!t),this.element.prop("disabled",!!t),t&&("checkbox"===this.type||"radio"===this.type?this.buttonElement.removeClass("ui-state-focus"):this.buttonElement.removeClass("ui-state-focus ui-state-active")),void 0):(this._resetButton(),void 0)},refresh:function(){var t=this.element.is("input, button")?this.element.is(":disabled"):this.element.hasClass("ui-button-disabled");t!==this.options.disabled&&this._setOption("disabled",t),"radio"===this.type?g(this.element[0]).each(function(){e(this).is(":checked")?e(this).button("widget").addClass("ui-state-active").attr("aria-pressed","true"):e(this).button("widget").removeClass("ui-state-active").attr("aria-pressed","false")}):"checkbox"===this.type&&(this.element.is(":checked")?this.buttonElement.addClass("ui-state-active").attr("aria-pressed","true"):this.buttonElement.removeClass("ui-state-active").attr("aria-pressed","false"))},_resetButton:function(){if("input"===this.type)return this.options.label&&this.element.val(this.options.label),void 0;var t=this.buttonElement.removeClass(f),i=e("<span></span>",this.document[0]).addClass("ui-button-text").html(this.options.label).appendTo(t.empty()).text(),s=this.options.icons,n=s.primary&&s.secondary,a=[];s.primary||s.secondary?(this.options.text&&a.push("ui-button-text-icon"+(n?"s":s.primary?"-primary":"-secondary")),s.primary&&t.prepend("<span class='ui-button-icon-primary ui-icon "+s.primary+"'></span>"),s.secondary&&t.append("<span class='ui-button-icon-secondary ui-icon "+s.secondary+"'></span>"),this.options.text||(a.push(n?"ui-button-icons-only":"ui-button-icon-only"),this.hasTitle||t.attr("title",e.trim(i)))):a.push("ui-button-text-only"),t.addClass(a.join(" "))}}),e.widget("ui.buttonset",{version:"1.11.4",options:{items:"button, input[type=button], input[type=submit], input[type=reset], input[type=checkbox], input[type=radio], a, :data(ui-button)"},_create:function(){this.element.addClass("ui-buttonset")},_init:function(){this.refresh()},_setOption:function(e,t){"disabled"===e&&this.buttons.button("option",e,t),this._super(e,t)},refresh:function(){var t="rtl"===this.element.css("direction"),i=this.element.find(this.options.items),s=i.filter(":ui-button");i.not(":ui-button").button(),s.button("refresh"),this.buttons=i.map(function(){return e(this).button("widget")[0]}).removeClass("ui-corner-all ui-corner-left ui-corner-right").filter(":first").addClass(t?"ui-corner-right":"ui-corner-left").end().filter(":last").addClass(t?"ui-corner-left":"ui-corner-right").end().end()},_destroy:function(){this.element.removeClass("ui-buttonset"),this.buttons.map(function(){return e(this).button("widget")[0]}).removeClass("ui-corner-left ui-corner-right").end().button("destroy")}}),e.ui.button,e.extend(e.ui,{datepicker:{version:"1.11.4"}});var v;e.extend(n.prototype,{markerClassName:"hasDatepicker",maxRows:4,_widgetDatepicker:function(){return this.dpDiv},setDefaults:function(e){return r(this._defaults,e||{}),this},_attachDatepicker:function(t,i){var s,n,a;s=t.nodeName.toLowerCase(),n="div"===s||"span"===s,t.id||(this.uuid+=1,t.id="dp"+this.uuid),a=this._newInst(e(t),n),a.settings=e.extend({},i||{}),"input"===s?this._connectDatepicker(t,a):n&&this._inlineDatepicker(t,a)},_newInst:function(t,i){var s=t[0].id.replace(/([^A-Za-z0-9_\-])/g,"\\\\$1");return{id:s,input:t,selectedDay:0,selectedMonth:0,selectedYear:0,drawMonth:0,drawYear:0,inline:i,dpDiv:i?a(e("<div class='"+this._inlineClass+" ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>")):this.dpDiv}},_connectDatepicker:function(t,i){var s=e(t);i.append=e([]),i.trigger=e([]),s.hasClass(this.markerClassName)||(this._attachments(s,i),s.addClass(this.markerClassName).keydown(this._doKeyDown).keypress(this._doKeyPress).keyup(this._doKeyUp),this._autoSize(i),e.data(t,"datepicker",i),i.settings.disabled&&this._disableDatepicker(t))},_attachments:function(t,i){var s,n,a,o=this._get(i,"appendText"),r=this._get(i,"isRTL");i.append&&i.append.remove(),o&&(i.append=e("<span class='"+this._appendClass+"'>"+o+"</span>"),t[r?"before":"after"](i.append)),t.unbind("focus",this._showDatepicker),i.trigger&&i.trigger.remove(),s=this._get(i,"showOn"),("focus"===s||"both"===s)&&t.focus(this._showDatepicker),("button"===s||"both"===s)&&(n=this._get(i,"buttonText"),a=this._get(i,"buttonImage"),i.trigger=e(this._get(i,"buttonImageOnly")?e("<img/>").addClass(this._triggerClass).attr({src:a,alt:n,title:n}):e("<button type='button'></button>").addClass(this._triggerClass).html(a?e("<img/>").attr({src:a,alt:n,title:n}):n)),t[r?"before":"after"](i.trigger),i.trigger.click(function(){return e.datepicker._datepickerShowing&&e.datepicker._lastInput===t[0]?e.datepicker._hideDatepicker():e.datepicker._datepickerShowing&&e.datepicker._lastInput!==t[0]?(e.datepicker._hideDatepicker(),e.datepicker._showDatepicker(t[0])):e.datepicker._showDatepicker(t[0]),!1}))},_autoSize:function(e){if(this._get(e,"autoSize")&&!e.inline){var t,i,s,n,a=new Date(2009,11,20),o=this._get(e,"dateFormat");o.match(/[DM]/)&&(t=function(e){for(i=0,s=0,n=0;e.length>n;n++)e[n].length>i&&(i=e[n].length,s=n);return s},a.setMonth(t(this._get(e,o.match(/MM/)?"monthNames":"monthNamesShort"))),a.setDate(t(this._get(e,o.match(/DD/)?"dayNames":"dayNamesShort"))+20-a.getDay())),e.input.attr("size",this._formatDate(e,a).length)}},_inlineDatepicker:function(t,i){var s=e(t);s.hasClass(this.markerClassName)||(s.addClass(this.markerClassName).append(i.dpDiv),e.data(t,"datepicker",i),this._setDate(i,this._getDefaultDate(i),!0),this._updateDatepicker(i),this._updateAlternate(i),i.settings.disabled&&this._disableDatepicker(t),i.dpDiv.css("display","block"))},_dialogDatepicker:function(t,i,s,n,a){var o,h,l,u,d,c=this._dialogInst;return c||(this.uuid+=1,o="dp"+this.uuid,this._dialogInput=e("<input type='text' id='"+o+"' style='position: absolute; top: -100px; width: 0px;'/>"),this._dialogInput.keydown(this._doKeyDown),e("body").append(this._dialogInput),c=this._dialogInst=this._newInst(this._dialogInput,!1),c.settings={},e.data(this._dialogInput[0],"datepicker",c)),r(c.settings,n||{}),i=i&&i.constructor===Date?this._formatDate(c,i):i,this._dialogInput.val(i),this._pos=a?a.length?a:[a.pageX,a.pageY]:null,this._pos||(h=document.documentElement.clientWidth,l=document.documentElement.clientHeight,u=document.documentElement.scrollLeft||document.body.scrollLeft,d=document.documentElement.scrollTop||document.body.scrollTop,this._pos=[h/2-100+u,l/2-150+d]),this._dialogInput.css("left",this._pos[0]+20+"px").css("top",this._pos[1]+"px"),c.settings.onSelect=s,this._inDialog=!0,this.dpDiv.addClass(this._dialogClass),this._showDatepicker(this._dialogInput[0]),e.blockUI&&e.blockUI(this.dpDiv),e.data(this._dialogInput[0],"datepicker",c),this
-},_destroyDatepicker:function(t){var i,s=e(t),n=e.data(t,"datepicker");s.hasClass(this.markerClassName)&&(i=t.nodeName.toLowerCase(),e.removeData(t,"datepicker"),"input"===i?(n.append.remove(),n.trigger.remove(),s.removeClass(this.markerClassName).unbind("focus",this._showDatepicker).unbind("keydown",this._doKeyDown).unbind("keypress",this._doKeyPress).unbind("keyup",this._doKeyUp)):("div"===i||"span"===i)&&s.removeClass(this.markerClassName).empty(),v===n&&(v=null))},_enableDatepicker:function(t){var i,s,n=e(t),a=e.data(t,"datepicker");n.hasClass(this.markerClassName)&&(i=t.nodeName.toLowerCase(),"input"===i?(t.disabled=!1,a.trigger.filter("button").each(function(){this.disabled=!1}).end().filter("img").css({opacity:"1.0",cursor:""})):("div"===i||"span"===i)&&(s=n.children("."+this._inlineClass),s.children().removeClass("ui-state-disabled"),s.find("select.ui-datepicker-month, select.ui-datepicker-year").prop("disabled",!1)),this._disabledInputs=e.map(this._disabledInputs,function(e){return e===t?null:e}))},_disableDatepicker:function(t){var i,s,n=e(t),a=e.data(t,"datepicker");n.hasClass(this.markerClassName)&&(i=t.nodeName.toLowerCase(),"input"===i?(t.disabled=!0,a.trigger.filter("button").each(function(){this.disabled=!0}).end().filter("img").css({opacity:"0.5",cursor:"default"})):("div"===i||"span"===i)&&(s=n.children("."+this._inlineClass),s.children().addClass("ui-state-disabled"),s.find("select.ui-datepicker-month, select.ui-datepicker-year").prop("disabled",!0)),this._disabledInputs=e.map(this._disabledInputs,function(e){return e===t?null:e}),this._disabledInputs[this._disabledInputs.length]=t)},_isDisabledDatepicker:function(e){if(!e)return!1;for(var t=0;this._disabledInputs.length>t;t++)if(this._disabledInputs[t]===e)return!0;return!1},_getInst:function(t){try{return e.data(t,"datepicker")}catch(i){throw"Missing instance data for this datepicker"}},_optionDatepicker:function(t,i,s){var n,a,o,h,l=this._getInst(t);return 2===arguments.length&&"string"==typeof i?"defaults"===i?e.extend({},e.datepicker._defaults):l?"all"===i?e.extend({},l.settings):this._get(l,i):null:(n=i||{},"string"==typeof i&&(n={},n[i]=s),l&&(this._curInst===l&&this._hideDatepicker(),a=this._getDateDatepicker(t,!0),o=this._getMinMaxDate(l,"min"),h=this._getMinMaxDate(l,"max"),r(l.settings,n),null!==o&&void 0!==n.dateFormat&&void 0===n.minDate&&(l.settings.minDate=this._formatDate(l,o)),null!==h&&void 0!==n.dateFormat&&void 0===n.maxDate&&(l.settings.maxDate=this._formatDate(l,h)),"disabled"in n&&(n.disabled?this._disableDatepicker(t):this._enableDatepicker(t)),this._attachments(e(t),l),this._autoSize(l),this._setDate(l,a),this._updateAlternate(l),this._updateDatepicker(l)),void 0)},_changeDatepicker:function(e,t,i){this._optionDatepicker(e,t,i)},_refreshDatepicker:function(e){var t=this._getInst(e);t&&this._updateDatepicker(t)},_setDateDatepicker:function(e,t){var i=this._getInst(e);i&&(this._setDate(i,t),this._updateDatepicker(i),this._updateAlternate(i))},_getDateDatepicker:function(e,t){var i=this._getInst(e);return i&&!i.inline&&this._setDateFromField(i,t),i?this._getDate(i):null},_doKeyDown:function(t){var i,s,n,a=e.datepicker._getInst(t.target),o=!0,r=a.dpDiv.is(".ui-datepicker-rtl");if(a._keyEvent=!0,e.datepicker._datepickerShowing)switch(t.keyCode){case 9:e.datepicker._hideDatepicker(),o=!1;break;case 13:return n=e("td."+e.datepicker._dayOverClass+":not(."+e.datepicker._currentClass+")",a.dpDiv),n[0]&&e.datepicker._selectDay(t.target,a.selectedMonth,a.selectedYear,n[0]),i=e.datepicker._get(a,"onSelect"),i?(s=e.datepicker._formatDate(a),i.apply(a.input?a.input[0]:null,[s,a])):e.datepicker._hideDatepicker(),!1;case 27:e.datepicker._hideDatepicker();break;case 33:e.datepicker._adjustDate(t.target,t.ctrlKey?-e.datepicker._get(a,"stepBigMonths"):-e.datepicker._get(a,"stepMonths"),"M");break;case 34:e.datepicker._adjustDate(t.target,t.ctrlKey?+e.datepicker._get(a,"stepBigMonths"):+e.datepicker._get(a,"stepMonths"),"M");break;case 35:(t.ctrlKey||t.metaKey)&&e.datepicker._clearDate(t.target),o=t.ctrlKey||t.metaKey;break;case 36:(t.ctrlKey||t.metaKey)&&e.datepicker._gotoToday(t.target),o=t.ctrlKey||t.metaKey;break;case 37:(t.ctrlKey||t.metaKey)&&e.datepicker._adjustDate(t.target,r?1:-1,"D"),o=t.ctrlKey||t.metaKey,t.originalEvent.altKey&&e.datepicker._adjustDate(t.target,t.ctrlKey?-e.datepicker._get(a,"stepBigMonths"):-e.datepicker._get(a,"stepMonths"),"M");break;case 38:(t.ctrlKey||t.metaKey)&&e.datepicker._adjustDate(t.target,-7,"D"),o=t.ctrlKey||t.metaKey;break;case 39:(t.ctrlKey||t.metaKey)&&e.datepicker._adjustDate(t.target,r?-1:1,"D"),o=t.ctrlKey||t.metaKey,t.originalEvent.altKey&&e.datepicker._adjustDate(t.target,t.ctrlKey?+e.datepicker._get(a,"stepBigMonths"):+e.datepicker._get(a,"stepMonths"),"M");break;case 40:(t.ctrlKey||t.metaKey)&&e.datepicker._adjustDate(t.target,7,"D"),o=t.ctrlKey||t.metaKey;break;default:o=!1}else 36===t.keyCode&&t.ctrlKey?e.datepicker._showDatepicker(this):o=!1;o&&(t.preventDefault(),t.stopPropagation())},_doKeyPress:function(t){var i,s,n=e.datepicker._getInst(t.target);return e.datepicker._get(n,"constrainInput")?(i=e.datepicker._possibleChars(e.datepicker._get(n,"dateFormat")),s=String.fromCharCode(null==t.charCode?t.keyCode:t.charCode),t.ctrlKey||t.metaKey||" ">s||!i||i.indexOf(s)>-1):void 0},_doKeyUp:function(t){var i,s=e.datepicker._getInst(t.target);if(s.input.val()!==s.lastVal)try{i=e.datepicker.parseDate(e.datepicker._get(s,"dateFormat"),s.input?s.input.val():null,e.datepicker._getFormatConfig(s)),i&&(e.datepicker._setDateFromField(s),e.datepicker._updateAlternate(s),e.datepicker._updateDatepicker(s))}catch(n){}return!0},_showDatepicker:function(t){if(t=t.target||t,"input"!==t.nodeName.toLowerCase()&&(t=e("input",t.parentNode)[0]),!e.datepicker._isDisabledDatepicker(t)&&e.datepicker._lastInput!==t){var i,n,a,o,h,l,u;i=e.datepicker._getInst(t),e.datepicker._curInst&&e.datepicker._curInst!==i&&(e.datepicker._curInst.dpDiv.stop(!0,!0),i&&e.datepicker._datepickerShowing&&e.datepicker._hideDatepicker(e.datepicker._curInst.input[0])),n=e.datepicker._get(i,"beforeShow"),a=n?n.apply(t,[t,i]):{},a!==!1&&(r(i.settings,a),i.lastVal=null,e.datepicker._lastInput=t,e.datepicker._setDateFromField(i),e.datepicker._inDialog&&(t.value=""),e.datepicker._pos||(e.datepicker._pos=e.datepicker._findPos(t),e.datepicker._pos[1]+=t.offsetHeight),o=!1,e(t).parents().each(function(){return o|="fixed"===e(this).css("position"),!o}),h={left:e.datepicker._pos[0],top:e.datepicker._pos[1]},e.datepicker._pos=null,i.dpDiv.empty(),i.dpDiv.css({position:"absolute",display:"block",top:"-1000px"}),e.datepicker._updateDatepicker(i),h=e.datepicker._checkOffset(i,h,o),i.dpDiv.css({position:e.datepicker._inDialog&&e.blockUI?"static":o?"fixed":"absolute",display:"none",left:h.left+"px",top:h.top+"px"}),i.inline||(l=e.datepicker._get(i,"showAnim"),u=e.datepicker._get(i,"duration"),i.dpDiv.css("z-index",s(e(t))+1),e.datepicker._datepickerShowing=!0,e.effects&&e.effects.effect[l]?i.dpDiv.show(l,e.datepicker._get(i,"showOptions"),u):i.dpDiv[l||"show"](l?u:null),e.datepicker._shouldFocusInput(i)&&i.input.focus(),e.datepicker._curInst=i))}},_updateDatepicker:function(t){this.maxRows=4,v=t,t.dpDiv.empty().append(this._generateHTML(t)),this._attachHandlers(t);var i,s=this._getNumberOfMonths(t),n=s[1],a=17,r=t.dpDiv.find("."+this._dayOverClass+" a");r.length>0&&o.apply(r.get(0)),t.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width(""),n>1&&t.dpDiv.addClass("ui-datepicker-multi-"+n).css("width",a*n+"em"),t.dpDiv[(1!==s[0]||1!==s[1]?"add":"remove")+"Class"]("ui-datepicker-multi"),t.dpDiv[(this._get(t,"isRTL")?"add":"remove")+"Class"]("ui-datepicker-rtl"),t===e.datepicker._curInst&&e.datepicker._datepickerShowing&&e.datepicker._shouldFocusInput(t)&&t.input.focus(),t.yearshtml&&(i=t.yearshtml,setTimeout(function(){i===t.yearshtml&&t.yearshtml&&t.dpDiv.find("select.ui-datepicker-year:first").replaceWith(t.yearshtml),i=t.yearshtml=null},0))},_shouldFocusInput:function(e){return e.input&&e.input.is(":visible")&&!e.input.is(":disabled")&&!e.input.is(":focus")},_checkOffset:function(t,i,s){var n=t.dpDiv.outerWidth(),a=t.dpDiv.outerHeight(),o=t.input?t.input.outerWidth():0,r=t.input?t.input.outerHeight():0,h=document.documentElement.clientWidth+(s?0:e(document).scrollLeft()),l=document.documentElement.clientHeight+(s?0:e(document).scrollTop());return i.left-=this._get(t,"isRTL")?n-o:0,i.left-=s&&i.left===t.input.offset().left?e(document).scrollLeft():0,i.top-=s&&i.top===t.input.offset().top+r?e(document).scrollTop():0,i.left-=Math.min(i.left,i.left+n>h&&h>n?Math.abs(i.left+n-h):0),i.top-=Math.min(i.top,i.top+a>l&&l>a?Math.abs(a+r):0),i},_findPos:function(t){for(var i,s=this._getInst(t),n=this._get(s,"isRTL");t&&("hidden"===t.type||1!==t.nodeType||e.expr.filters.hidden(t));)t=t[n?"previousSibling":"nextSibling"];return i=e(t).offset(),[i.left,i.top]},_hideDatepicker:function(t){var i,s,n,a,o=this._curInst;!o||t&&o!==e.data(t,"datepicker")||this._datepickerShowing&&(i=this._get(o,"showAnim"),s=this._get(o,"duration"),n=function(){e.datepicker._tidyDialog(o)},e.effects&&(e.effects.effect[i]||e.effects[i])?o.dpDiv.hide(i,e.datepicker._get(o,"showOptions"),s,n):o.dpDiv["slideDown"===i?"slideUp":"fadeIn"===i?"fadeOut":"hide"](i?s:null,n),i||n(),this._datepickerShowing=!1,a=this._get(o,"onClose"),a&&a.apply(o.input?o.input[0]:null,[o.input?o.input.val():"",o]),this._lastInput=null,this._inDialog&&(this._dialogInput.css({position:"absolute",left:"0",top:"-100px"}),e.blockUI&&(e.unblockUI(),e("body").append(this.dpDiv))),this._inDialog=!1)},_tidyDialog:function(e){e.dpDiv.removeClass(this._dialogClass).unbind(".ui-datepicker-calendar")},_checkExternalClick:function(t){if(e.datepicker._curInst){var i=e(t.target),s=e.datepicker._getInst(i[0]);(i[0].id!==e.datepicker._mainDivId&&0===i.parents("#"+e.datepicker._mainDivId).length&&!i.hasClass(e.datepicker.markerClassName)&&!i.closest("."+e.datepicker._triggerClass).length&&e.datepicker._datepickerShowing&&(!e.datepicker._inDialog||!e.blockUI)||i.hasClass(e.datepicker.markerClassName)&&e.datepicker._curInst!==s)&&e.datepicker._hideDatepicker()}},_adjustDate:function(t,i,s){var n=e(t),a=this._getInst(n[0]);this._isDisabledDatepicker(n[0])||(this._adjustInstDate(a,i+("M"===s?this._get(a,"showCurrentAtPos"):0),s),this._updateDatepicker(a))},_gotoToday:function(t){var i,s=e(t),n=this._getInst(s[0]);this._get(n,"gotoCurrent")&&n.currentDay?(n.selectedDay=n.currentDay,n.drawMonth=n.selectedMonth=n.currentMonth,n.drawYear=n.selectedYear=n.currentYear):(i=new Date,n.selectedDay=i.getDate(),n.drawMonth=n.selectedMonth=i.getMonth(),n.drawYear=n.selectedYear=i.getFullYear()),this._notifyChange(n),this._adjustDate(s)},_selectMonthYear:function(t,i,s){var n=e(t),a=this._getInst(n[0]);a["selected"+("M"===s?"Month":"Year")]=a["draw"+("M"===s?"Month":"Year")]=parseInt(i.options[i.selectedIndex].value,10),this._notifyChange(a),this._adjustDate(n)},_selectDay:function(t,i,s,n){var a,o=e(t);e(n).hasClass(this._unselectableClass)||this._isDisabledDatepicker(o[0])||(a=this._getInst(o[0]),a.selectedDay=a.currentDay=e("a",n).html(),a.selectedMonth=a.currentMonth=i,a.selectedYear=a.currentYear=s,this._selectDate(t,this._formatDate(a,a.currentDay,a.currentMonth,a.currentYear)))},_clearDate:function(t){var i=e(t);this._selectDate(i,"")},_selectDate:function(t,i){var s,n=e(t),a=this._getInst(n[0]);i=null!=i?i:this._formatDate(a),a.input&&a.input.val(i),this._updateAlternate(a),s=this._get(a,"onSelect"),s?s.apply(a.input?a.input[0]:null,[i,a]):a.input&&a.input.trigger("change"),a.inline?this._updateDatepicker(a):(this._hideDatepicker(),this._lastInput=a.input[0],"object"!=typeof a.input[0]&&a.input.focus(),this._lastInput=null)},_updateAlternate:function(t){var i,s,n,a=this._get(t,"altField");a&&(i=this._get(t,"altFormat")||this._get(t,"dateFormat"),s=this._getDate(t),n=this.formatDate(i,s,this._getFormatConfig(t)),e(a).each(function(){e(this).val(n)}))},noWeekends:function(e){var t=e.getDay();return[t>0&&6>t,""]},iso8601Week:function(e){var t,i=new Date(e.getTime());return i.setDate(i.getDate()+4-(i.getDay()||7)),t=i.getTime(),i.setMonth(0),i.setDate(1),Math.floor(Math.round((t-i)/864e5)/7)+1},parseDate:function(t,i,s){if(null==t||null==i)throw"Invalid arguments";if(i="object"==typeof i?""+i:i+"",""===i)return null;var n,a,o,r,h=0,l=(s?s.shortYearCutoff:null)||this._defaults.shortYearCutoff,u="string"!=typeof l?l:(new Date).getFullYear()%100+parseInt(l,10),d=(s?s.dayNamesShort:null)||this._defaults.dayNamesShort,c=(s?s.dayNames:null)||this._defaults.dayNames,p=(s?s.monthNamesShort:null)||this._defaults.monthNamesShort,f=(s?s.monthNames:null)||this._defaults.monthNames,m=-1,g=-1,v=-1,y=-1,b=!1,_=function(e){var i=t.length>n+1&&t.charAt(n+1)===e;return i&&n++,i},x=function(e){var t=_(e),s="@"===e?14:"!"===e?20:"y"===e&&t?4:"o"===e?3:2,n="y"===e?s:1,a=RegExp("^\\d{"+n+","+s+"}"),o=i.substring(h).match(a);if(!o)throw"Missing number at position "+h;return h+=o[0].length,parseInt(o[0],10)},w=function(t,s,n){var a=-1,o=e.map(_(t)?n:s,function(e,t){return[[t,e]]}).sort(function(e,t){return-(e[1].length-t[1].length)});if(e.each(o,function(e,t){var s=t[1];return i.substr(h,s.length).toLowerCase()===s.toLowerCase()?(a=t[0],h+=s.length,!1):void 0}),-1!==a)return a+1;throw"Unknown name at position "+h},k=function(){if(i.charAt(h)!==t.charAt(n))throw"Unexpected literal at position "+h;h++};for(n=0;t.length>n;n++)if(b)"'"!==t.charAt(n)||_("'")?k():b=!1;else switch(t.charAt(n)){case"d":v=x("d");break;case"D":w("D",d,c);break;case"o":y=x("o");break;case"m":g=x("m");break;case"M":g=w("M",p,f);break;case"y":m=x("y");break;case"@":r=new Date(x("@")),m=r.getFullYear(),g=r.getMonth()+1,v=r.getDate();break;case"!":r=new Date((x("!")-this._ticksTo1970)/1e4),m=r.getFullYear(),g=r.getMonth()+1,v=r.getDate();break;case"'":_("'")?k():b=!0;break;default:k()}if(i.length>h&&(o=i.substr(h),!/^\s+/.test(o)))throw"Extra/unparsed characters found in date: "+o;if(-1===m?m=(new Date).getFullYear():100>m&&(m+=(new Date).getFullYear()-(new Date).getFullYear()%100+(u>=m?0:-100)),y>-1)for(g=1,v=y;;){if(a=this._getDaysInMonth(m,g-1),a>=v)break;g++,v-=a}if(r=this._daylightSavingAdjust(new Date(m,g-1,v)),r.getFullYear()!==m||r.getMonth()+1!==g||r.getDate()!==v)throw"Invalid date";return r},ATOM:"yy-mm-dd",COOKIE:"D, dd M yy",ISO_8601:"yy-mm-dd",RFC_822:"D, d M y",RFC_850:"DD, dd-M-y",RFC_1036:"D, d M y",RFC_1123:"D, d M yy",RFC_2822:"D, d M yy",RSS:"D, d M y",TICKS:"!",TIMESTAMP:"@",W3C:"yy-mm-dd",_ticksTo1970:1e7*60*60*24*(718685+Math.floor(492.5)-Math.floor(19.7)+Math.floor(4.925)),formatDate:function(e,t,i){if(!t)return"";var s,n=(i?i.dayNamesShort:null)||this._defaults.dayNamesShort,a=(i?i.dayNames:null)||this._defaults.dayNames,o=(i?i.monthNamesShort:null)||this._defaults.monthNamesShort,r=(i?i.monthNames:null)||this._defaults.monthNames,h=function(t){var i=e.length>s+1&&e.charAt(s+1)===t;return i&&s++,i},l=function(e,t,i){var s=""+t;if(h(e))for(;i>s.length;)s="0"+s;return s},u=function(e,t,i,s){return h(e)?s[t]:i[t]},d="",c=!1;if(t)for(s=0;e.length>s;s++)if(c)"'"!==e.charAt(s)||h("'")?d+=e.charAt(s):c=!1;else switch(e.charAt(s)){case"d":d+=l("d",t.getDate(),2);break;case"D":d+=u("D",t.getDay(),n,a);break;case"o":d+=l("o",Math.round((new Date(t.getFullYear(),t.getMonth(),t.getDate()).getTime()-new Date(t.getFullYear(),0,0).getTime())/864e5),3);break;case"m":d+=l("m",t.getMonth()+1,2);break;case"M":d+=u("M",t.getMonth(),o,r);break;case"y":d+=h("y")?t.getFullYear():(10>t.getYear()%100?"0":"")+t.getYear()%100;break;case"@":d+=t.getTime();break;case"!":d+=1e4*t.getTime()+this._ticksTo1970;break;case"'":h("'")?d+="'":c=!0;break;default:d+=e.charAt(s)}return d},_possibleChars:function(e){var t,i="",s=!1,n=function(i){var s=e.length>t+1&&e.charAt(t+1)===i;return s&&t++,s};for(t=0;e.length>t;t++)if(s)"'"!==e.charAt(t)||n("'")?i+=e.charAt(t):s=!1;else switch(e.charAt(t)){case"d":case"m":case"y":case"@":i+="0123456789";break;case"D":case"M":return null;case"'":n("'")?i+="'":s=!0;break;default:i+=e.charAt(t)}return i},_get:function(e,t){return void 0!==e.settings[t]?e.settings[t]:this._defaults[t]},_setDateFromField:function(e,t){if(e.input.val()!==e.lastVal){var i=this._get(e,"dateFormat"),s=e.lastVal=e.input?e.input.val():null,n=this._getDefaultDate(e),a=n,o=this._getFormatConfig(e);try{a=this.parseDate(i,s,o)||n}catch(r){s=t?"":s}e.selectedDay=a.getDate(),e.drawMonth=e.selectedMonth=a.getMonth(),e.drawYear=e.selectedYear=a.getFullYear(),e.currentDay=s?a.getDate():0,e.currentMonth=s?a.getMonth():0,e.currentYear=s?a.getFullYear():0,this._adjustInstDate(e)}},_getDefaultDate:function(e){return this._restrictMinMax(e,this._determineDate(e,this._get(e,"defaultDate"),new Date))},_determineDate:function(t,i,s){var n=function(e){var t=new Date;return t.setDate(t.getDate()+e),t},a=function(i){try{return e.datepicker.parseDate(e.datepicker._get(t,"dateFormat"),i,e.datepicker._getFormatConfig(t))}catch(s){}for(var n=(i.toLowerCase().match(/^c/)?e.datepicker._getDate(t):null)||new Date,a=n.getFullYear(),o=n.getMonth(),r=n.getDate(),h=/([+\-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g,l=h.exec(i);l;){switch(l[2]||"d"){case"d":case"D":r+=parseInt(l[1],10);break;case"w":case"W":r+=7*parseInt(l[1],10);break;case"m":case"M":o+=parseInt(l[1],10),r=Math.min(r,e.datepicker._getDaysInMonth(a,o));break;case"y":case"Y":a+=parseInt(l[1],10),r=Math.min(r,e.datepicker._getDaysInMonth(a,o))}l=h.exec(i)}return new Date(a,o,r)},o=null==i||""===i?s:"string"==typeof i?a(i):"number"==typeof i?isNaN(i)?s:n(i):new Date(i.getTime());return o=o&&"Invalid Date"==""+o?s:o,o&&(o.setHours(0),o.setMinutes(0),o.setSeconds(0),o.setMilliseconds(0)),this._daylightSavingAdjust(o)},_daylightSavingAdjust:function(e){return e?(e.setHours(e.getHours()>12?e.getHours()+2:0),e):null},_setDate:function(e,t,i){var s=!t,n=e.selectedMonth,a=e.selectedYear,o=this._restrictMinMax(e,this._determineDate(e,t,new Date));e.selectedDay=e.currentDay=o.getDate(),e.drawMonth=e.selectedMonth=e.currentMonth=o.getMonth(),e.drawYear=e.selectedYear=e.currentYear=o.getFullYear(),n===e.selectedMonth&&a===e.selectedYear||i||this._notifyChange(e),this._adjustInstDate(e),e.input&&e.input.val(s?"":this._formatDate(e))},_getDate:function(e){var t=!e.currentYear||e.input&&""===e.input.val()?null:this._daylightSavingAdjust(new Date(e.currentYear,e.currentMonth,e.currentDay));return t},_attachHandlers:function(t){var i=this._get(t,"stepMonths"),s="#"+t.id.replace(/\\\\/g,"\\");t.dpDiv.find("[data-handler]").map(function(){var t={prev:function(){e.datepicker._adjustDate(s,-i,"M")},next:function(){e.datepicker._adjustDate(s,+i,"M")},hide:function(){e.datepicker._hideDatepicker()},today:function(){e.datepicker._gotoToday(s)},selectDay:function(){return e.datepicker._selectDay(s,+this.getAttribute("data-month"),+this.getAttribute("data-year"),this),!1},selectMonth:function(){return e.datepicker._selectMonthYear(s,this,"M"),!1},selectYear:function(){return e.datepicker._selectMonthYear(s,this,"Y"),!1}};e(this).bind(this.getAttribute("data-event"),t[this.getAttribute("data-handler")])})},_generateHTML:function(e){var t,i,s,n,a,o,r,h,l,u,d,c,p,f,m,g,v,y,b,_,x,w,k,T,D,S,M,C,N,A,P,I,H,z,F,E,O,j,W,L=new Date,R=this._daylightSavingAdjust(new Date(L.getFullYear(),L.getMonth(),L.getDate())),Y=this._get(e,"isRTL"),B=this._get(e,"showButtonPanel"),J=this._get(e,"hideIfNoPrevNext"),q=this._get(e,"navigationAsDateFormat"),K=this._getNumberOfMonths(e),V=this._get(e,"showCurrentAtPos"),U=this._get(e,"stepMonths"),Q=1!==K[0]||1!==K[1],G=this._daylightSavingAdjust(e.currentDay?new Date(e.currentYear,e.currentMonth,e.currentDay):new Date(9999,9,9)),X=this._getMinMaxDate(e,"min"),$=this._getMinMaxDate(e,"max"),Z=e.drawMonth-V,et=e.drawYear;if(0>Z&&(Z+=12,et--),$)for(t=this._daylightSavingAdjust(new Date($.getFullYear(),$.getMonth()-K[0]*K[1]+1,$.getDate())),t=X&&X>t?X:t;this._daylightSavingAdjust(new Date(et,Z,1))>t;)Z--,0>Z&&(Z=11,et--);for(e.drawMonth=Z,e.drawYear=et,i=this._get(e,"prevText"),i=q?this.formatDate(i,this._daylightSavingAdjust(new Date(et,Z-U,1)),this._getFormatConfig(e)):i,s=this._canAdjustMonth(e,-1,et,Z)?"<a class='ui-datepicker-prev ui-corner-all' data-handler='prev' data-event='click' title='"+i+"'><span class='ui-icon ui-icon-circle-triangle-"+(Y?"e":"w")+"'>"+i+"</span></a>":J?"":"<a class='ui-datepicker-prev ui-corner-all ui-state-disabled' title='"+i+"'><span class='ui-icon ui-icon-circle-triangle-"+(Y?"e":"w")+"'>"+i+"</span></a>",n=this._get(e,"nextText"),n=q?this.formatDate(n,this._daylightSavingAdjust(new Date(et,Z+U,1)),this._getFormatConfig(e)):n,a=this._canAdjustMonth(e,1,et,Z)?"<a class='ui-datepicker-next ui-corner-all' data-handler='next' data-event='click' title='"+n+"'><span class='ui-icon ui-icon-circle-triangle-"+(Y?"w":"e")+"'>"+n+"</span></a>":J?"":"<a class='ui-datepicker-next ui-corner-all ui-state-disabled' title='"+n+"'><span class='ui-icon ui-icon-circle-triangle-"+(Y?"w":"e")+"'>"+n+"</span></a>",o=this._get(e,"currentText"),r=this._get(e,"gotoCurrent")&&e.currentDay?G:R,o=q?this.formatDate(o,r,this._getFormatConfig(e)):o,h=e.inline?"":"<button type='button' class='ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all' data-handler='hide' data-event='click'>"+this._get(e,"closeText")+"</button>",l=B?"<div class='ui-datepicker-buttonpane ui-widget-content'>"+(Y?h:"")+(this._isInRange(e,r)?"<button type='button' class='ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all' data-handler='today' data-event='click'>"+o+"</button>":"")+(Y?"":h)+"</div>":"",u=parseInt(this._get(e,"firstDay"),10),u=isNaN(u)?0:u,d=this._get(e,"showWeek"),c=this._get(e,"dayNames"),p=this._get(e,"dayNamesMin"),f=this._get(e,"monthNames"),m=this._get(e,"monthNamesShort"),g=this._get(e,"beforeShowDay"),v=this._get(e,"showOtherMonths"),y=this._get(e,"selectOtherMonths"),b=this._getDefaultDate(e),_="",w=0;K[0]>w;w++){for(k="",this.maxRows=4,T=0;K[1]>T;T++){if(D=this._daylightSavingAdjust(new Date(et,Z,e.selectedDay)),S=" ui-corner-all",M="",Q){if(M+="<div class='ui-datepicker-group",K[1]>1)switch(T){case 0:M+=" ui-datepicker-group-first",S=" ui-corner-"+(Y?"right":"left");break;case K[1]-1:M+=" ui-datepicker-group-last",S=" ui-corner-"+(Y?"left":"right");break;default:M+=" ui-datepicker-group-middle",S=""}M+="'>"}for(M+="<div class='ui-datepicker-header ui-widget-header ui-helper-clearfix"+S+"'>"+(/all|left/.test(S)&&0===w?Y?a:s:"")+(/all|right/.test(S)&&0===w?Y?s:a:"")+this._generateMonthYearHeader(e,Z,et,X,$,w>0||T>0,f,m)+"</div><table class='ui-datepicker-calendar'><thead>"+"<tr>",C=d?"<th class='ui-datepicker-week-col'>"+this._get(e,"weekHeader")+"</th>":"",x=0;7>x;x++)N=(x+u)%7,C+="<th scope='col'"+((x+u+6)%7>=5?" class='ui-datepicker-week-end'":"")+">"+"<span title='"+c[N]+"'>"+p[N]+"</span></th>";for(M+=C+"</tr></thead><tbody>",A=this._getDaysInMonth(et,Z),et===e.selectedYear&&Z===e.selectedMonth&&(e.selectedDay=Math.min(e.selectedDay,A)),P=(this._getFirstDayOfMonth(et,Z)-u+7)%7,I=Math.ceil((P+A)/7),H=Q?this.maxRows>I?this.maxRows:I:I,this.maxRows=H,z=this._daylightSavingAdjust(new Date(et,Z,1-P)),F=0;H>F;F++){for(M+="<tr>",E=d?"<td class='ui-datepicker-week-col'>"+this._get(e,"calculateWeek")(z)+"</td>":"",x=0;7>x;x++)O=g?g.apply(e.input?e.input[0]:null,[z]):[!0,""],j=z.getMonth()!==Z,W=j&&!y||!O[0]||X&&X>z||$&&z>$,E+="<td class='"+((x+u+6)%7>=5?" ui-datepicker-week-end":"")+(j?" ui-datepicker-other-month":"")+(z.getTime()===D.getTime()&&Z===e.selectedMonth&&e._keyEvent||b.getTime()===z.getTime()&&b.getTime()===D.getTime()?" "+this._dayOverClass:"")+(W?" "+this._unselectableClass+" ui-state-disabled":"")+(j&&!v?"":" "+O[1]+(z.getTime()===G.getTime()?" "+this._currentClass:"")+(z.getTime()===R.getTime()?" ui-datepicker-today":""))+"'"+(j&&!v||!O[2]?"":" title='"+O[2].replace(/'/g,"&#39;")+"'")+(W?"":" data-handler='selectDay' data-event='click' data-month='"+z.getMonth()+"' data-year='"+z.getFullYear()+"'")+">"+(j&&!v?"&#xa0;":W?"<span class='ui-state-default'>"+z.getDate()+"</span>":"<a class='ui-state-default"+(z.getTime()===R.getTime()?" ui-state-highlight":"")+(z.getTime()===G.getTime()?" ui-state-active":"")+(j?" ui-priority-secondary":"")+"' href='#'>"+z.getDate()+"</a>")+"</td>",z.setDate(z.getDate()+1),z=this._daylightSavingAdjust(z);M+=E+"</tr>"}Z++,Z>11&&(Z=0,et++),M+="</tbody></table>"+(Q?"</div>"+(K[0]>0&&T===K[1]-1?"<div class='ui-datepicker-row-break'></div>":""):""),k+=M}_+=k}return _+=l,e._keyEvent=!1,_},_generateMonthYearHeader:function(e,t,i,s,n,a,o,r){var h,l,u,d,c,p,f,m,g=this._get(e,"changeMonth"),v=this._get(e,"changeYear"),y=this._get(e,"showMonthAfterYear"),b="<div class='ui-datepicker-title'>",_="";if(a||!g)_+="<span class='ui-datepicker-month'>"+o[t]+"</span>";else{for(h=s&&s.getFullYear()===i,l=n&&n.getFullYear()===i,_+="<select class='ui-datepicker-month' data-handler='selectMonth' data-event='change'>",u=0;12>u;u++)(!h||u>=s.getMonth())&&(!l||n.getMonth()>=u)&&(_+="<option value='"+u+"'"+(u===t?" selected='selected'":"")+">"+r[u]+"</option>");_+="</select>"}if(y||(b+=_+(!a&&g&&v?"":"&#xa0;")),!e.yearshtml)if(e.yearshtml="",a||!v)b+="<span class='ui-datepicker-year'>"+i+"</span>";else{for(d=this._get(e,"yearRange").split(":"),c=(new Date).getFullYear(),p=function(e){var t=e.match(/c[+\-].*/)?i+parseInt(e.substring(1),10):e.match(/[+\-].*/)?c+parseInt(e,10):parseInt(e,10);return isNaN(t)?c:t},f=p(d[0]),m=Math.max(f,p(d[1]||"")),f=s?Math.max(f,s.getFullYear()):f,m=n?Math.min(m,n.getFullYear()):m,e.yearshtml+="<select class='ui-datepicker-year' data-handler='selectYear' data-event='change'>";m>=f;f++)e.yearshtml+="<option value='"+f+"'"+(f===i?" selected='selected'":"")+">"+f+"</option>";e.yearshtml+="</select>",b+=e.yearshtml,e.yearshtml=null}return b+=this._get(e,"yearSuffix"),y&&(b+=(!a&&g&&v?"":"&#xa0;")+_),b+="</div>"},_adjustInstDate:function(e,t,i){var s=e.drawYear+("Y"===i?t:0),n=e.drawMonth+("M"===i?t:0),a=Math.min(e.selectedDay,this._getDaysInMonth(s,n))+("D"===i?t:0),o=this._restrictMinMax(e,this._daylightSavingAdjust(new Date(s,n,a)));e.selectedDay=o.getDate(),e.drawMonth=e.selectedMonth=o.getMonth(),e.drawYear=e.selectedYear=o.getFullYear(),("M"===i||"Y"===i)&&this._notifyChange(e)},_restrictMinMax:function(e,t){var i=this._getMinMaxDate(e,"min"),s=this._getMinMaxDate(e,"max"),n=i&&i>t?i:t;return s&&n>s?s:n},_notifyChange:function(e){var t=this._get(e,"onChangeMonthYear");t&&t.apply(e.input?e.input[0]:null,[e.selectedYear,e.selectedMonth+1,e])},_getNumberOfMonths:function(e){var t=this._get(e,"numberOfMonths");return null==t?[1,1]:"number"==typeof t?[1,t]:t},_getMinMaxDate:function(e,t){return this._determineDate(e,this._get(e,t+"Date"),null)},_getDaysInMonth:function(e,t){return 32-this._daylightSavingAdjust(new Date(e,t,32)).getDate()},_getFirstDayOfMonth:function(e,t){return new Date(e,t,1).getDay()},_canAdjustMonth:function(e,t,i,s){var n=this._getNumberOfMonths(e),a=this._daylightSavingAdjust(new Date(i,s+(0>t?t:n[0]*n[1]),1));return 0>t&&a.setDate(this._getDaysInMonth(a.getFullYear(),a.getMonth())),this._isInRange(e,a)},_isInRange:function(e,t){var i,s,n=this._getMinMaxDate(e,"min"),a=this._getMinMaxDate(e,"max"),o=null,r=null,h=this._get(e,"yearRange");return h&&(i=h.split(":"),s=(new Date).getFullYear(),o=parseInt(i[0],10),r=parseInt(i[1],10),i[0].match(/[+\-].*/)&&(o+=s),i[1].match(/[+\-].*/)&&(r+=s)),(!n||t.getTime()>=n.getTime())&&(!a||t.getTime()<=a.getTime())&&(!o||t.getFullYear()>=o)&&(!r||r>=t.getFullYear())},_getFormatConfig:function(e){var t=this._get(e,"shortYearCutoff");return t="string"!=typeof t?t:(new Date).getFullYear()%100+parseInt(t,10),{shortYearCutoff:t,dayNamesShort:this._get(e,"dayNamesShort"),dayNames:this._get(e,"dayNames"),monthNamesShort:this._get(e,"monthNamesShort"),monthNames:this._get(e,"monthNames")}},_formatDate:function(e,t,i,s){t||(e.currentDay=e.selectedDay,e.currentMonth=e.selectedMonth,e.currentYear=e.selectedYear);var n=t?"object"==typeof t?t:this._daylightSavingAdjust(new Date(s,i,t)):this._daylightSavingAdjust(new Date(e.currentYear,e.currentMonth,e.currentDay));return this.formatDate(this._get(e,"dateFormat"),n,this._getFormatConfig(e))}}),e.fn.datepicker=function(t){if(!this.length)return this;e.datepicker.initialized||(e(document).mousedown(e.datepicker._checkExternalClick),e.datepicker.initialized=!0),0===e("#"+e.datepicker._mainDivId).length&&e("body").append(e.datepicker.dpDiv);var i=Array.prototype.slice.call(arguments,1);return"string"!=typeof t||"isDisabled"!==t&&"getDate"!==t&&"widget"!==t?"option"===t&&2===arguments.length&&"string"==typeof arguments[1]?e.datepicker["_"+t+"Datepicker"].apply(e.datepicker,[this[0]].concat(i)):this.each(function(){"string"==typeof t?e.datepicker["_"+t+"Datepicker"].apply(e.datepicker,[this].concat(i)):e.datepicker._attachDatepicker(this,t)}):e.datepicker["_"+t+"Datepicker"].apply(e.datepicker,[this[0]].concat(i))},e.datepicker=new n,e.datepicker.initialized=!1,e.datepicker.uuid=(new Date).getTime(),e.datepicker.version="1.11.4",e.datepicker,e.widget("ui.dialog",{version:"1.11.4",options:{appendTo:"body",autoOpen:!0,buttons:[],closeOnEscape:!0,closeText:"Close",dialogClass:"",draggable:!0,hide:null,height:"auto",maxHeight:null,maxWidth:null,minHeight:150,minWidth:150,modal:!1,position:{my:"center",at:"center",of:window,collision:"fit",using:function(t){var i=e(this).css(t).offset().top;0>i&&e(this).css("top",t.top-i)}},resizable:!0,show:null,title:null,width:300,beforeClose:null,close:null,drag:null,dragStart:null,dragStop:null,focus:null,open:null,resize:null,resizeStart:null,resizeStop:null},sizeRelatedOptions:{buttons:!0,height:!0,maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0,width:!0},resizableRelatedOptions:{maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0},_create:function(){this.originalCss={display:this.element[0].style.display,width:this.element[0].style.width,minHeight:this.element[0].style.minHeight,maxHeight:this.element[0].style.maxHeight,height:this.element[0].style.height},this.originalPosition={parent:this.element.parent(),index:this.element.parent().children().index(this.element)},this.originalTitle=this.element.attr("title"),this.options.title=this.options.title||this.originalTitle,this._createWrapper(),this.element.show().removeAttr("title").addClass("ui-dialog-content ui-widget-content").appendTo(this.uiDialog),this._createTitlebar(),this._createButtonPane(),this.options.draggable&&e.fn.draggable&&this._makeDraggable(),this.options.resizable&&e.fn.resizable&&this._makeResizable(),this._isOpen=!1,this._trackFocus()},_init:function(){this.options.autoOpen&&this.open()},_appendTo:function(){var t=this.options.appendTo;return t&&(t.jquery||t.nodeType)?e(t):this.document.find(t||"body").eq(0)},_destroy:function(){var e,t=this.originalPosition;this._untrackInstance(),this._destroyOverlay(),this.element.removeUniqueId().removeClass("ui-dialog-content ui-widget-content").css(this.originalCss).detach(),this.uiDialog.stop(!0,!0).remove(),this.originalTitle&&this.element.attr("title",this.originalTitle),e=t.parent.children().eq(t.index),e.length&&e[0]!==this.element[0]?e.before(this.element):t.parent.append(this.element)},widget:function(){return this.uiDialog},disable:e.noop,enable:e.noop,close:function(t){var i,s=this;if(this._isOpen&&this._trigger("beforeClose",t)!==!1){if(this._isOpen=!1,this._focusedElement=null,this._destroyOverlay(),this._untrackInstance(),!this.opener.filter(":focusable").focus().length)try{i=this.document[0].activeElement,i&&"body"!==i.nodeName.toLowerCase()&&e(i).blur()}catch(n){}this._hide(this.uiDialog,this.options.hide,function(){s._trigger("close",t)})}},isOpen:function(){return this._isOpen},moveToTop:function(){this._moveToTop()},_moveToTop:function(t,i){var s=!1,n=this.uiDialog.siblings(".ui-front:visible").map(function(){return+e(this).css("z-index")}).get(),a=Math.max.apply(null,n);return a>=+this.uiDialog.css("z-index")&&(this.uiDialog.css("z-index",a+1),s=!0),s&&!i&&this._trigger("focus",t),s},open:function(){var t=this;
-return this._isOpen?(this._moveToTop()&&this._focusTabbable(),void 0):(this._isOpen=!0,this.opener=e(this.document[0].activeElement),this._size(),this._position(),this._createOverlay(),this._moveToTop(null,!0),this.overlay&&this.overlay.css("z-index",this.uiDialog.css("z-index")-1),this._show(this.uiDialog,this.options.show,function(){t._focusTabbable(),t._trigger("focus")}),this._makeFocusTarget(),this._trigger("open"),void 0)},_focusTabbable:function(){var e=this._focusedElement;e||(e=this.element.find("[autofocus]")),e.length||(e=this.element.find(":tabbable")),e.length||(e=this.uiDialogButtonPane.find(":tabbable")),e.length||(e=this.uiDialogTitlebarClose.filter(":tabbable")),e.length||(e=this.uiDialog),e.eq(0).focus()},_keepFocus:function(t){function i(){var t=this.document[0].activeElement,i=this.uiDialog[0]===t||e.contains(this.uiDialog[0],t);i||this._focusTabbable()}t.preventDefault(),i.call(this),this._delay(i)},_createWrapper:function(){this.uiDialog=e("<div>").addClass("ui-dialog ui-widget ui-widget-content ui-corner-all ui-front "+this.options.dialogClass).hide().attr({tabIndex:-1,role:"dialog"}).appendTo(this._appendTo()),this._on(this.uiDialog,{keydown:function(t){if(this.options.closeOnEscape&&!t.isDefaultPrevented()&&t.keyCode&&t.keyCode===e.ui.keyCode.ESCAPE)return t.preventDefault(),this.close(t),void 0;if(t.keyCode===e.ui.keyCode.TAB&&!t.isDefaultPrevented()){var i=this.uiDialog.find(":tabbable"),s=i.filter(":first"),n=i.filter(":last");t.target!==n[0]&&t.target!==this.uiDialog[0]||t.shiftKey?t.target!==s[0]&&t.target!==this.uiDialog[0]||!t.shiftKey||(this._delay(function(){n.focus()}),t.preventDefault()):(this._delay(function(){s.focus()}),t.preventDefault())}},mousedown:function(e){this._moveToTop(e)&&this._focusTabbable()}}),this.element.find("[aria-describedby]").length||this.uiDialog.attr({"aria-describedby":this.element.uniqueId().attr("id")})},_createTitlebar:function(){var t;this.uiDialogTitlebar=e("<div>").addClass("ui-dialog-titlebar ui-widget-header ui-corner-all ui-helper-clearfix").prependTo(this.uiDialog),this._on(this.uiDialogTitlebar,{mousedown:function(t){e(t.target).closest(".ui-dialog-titlebar-close")||this.uiDialog.focus()}}),this.uiDialogTitlebarClose=e("<button type='button'></button>").button({label:this.options.closeText,icons:{primary:"ui-icon-closethick"},text:!1}).addClass("ui-dialog-titlebar-close").appendTo(this.uiDialogTitlebar),this._on(this.uiDialogTitlebarClose,{click:function(e){e.preventDefault(),this.close(e)}}),t=e("<span>").uniqueId().addClass("ui-dialog-title").prependTo(this.uiDialogTitlebar),this._title(t),this.uiDialog.attr({"aria-labelledby":t.attr("id")})},_title:function(e){this.options.title||e.html("&#160;"),e.text(this.options.title)},_createButtonPane:function(){this.uiDialogButtonPane=e("<div>").addClass("ui-dialog-buttonpane ui-widget-content ui-helper-clearfix"),this.uiButtonSet=e("<div>").addClass("ui-dialog-buttonset").appendTo(this.uiDialogButtonPane),this._createButtons()},_createButtons:function(){var t=this,i=this.options.buttons;return this.uiDialogButtonPane.remove(),this.uiButtonSet.empty(),e.isEmptyObject(i)||e.isArray(i)&&!i.length?(this.uiDialog.removeClass("ui-dialog-buttons"),void 0):(e.each(i,function(i,s){var n,a;s=e.isFunction(s)?{click:s,text:i}:s,s=e.extend({type:"button"},s),n=s.click,s.click=function(){n.apply(t.element[0],arguments)},a={icons:s.icons,text:s.showText},delete s.icons,delete s.showText,e("<button></button>",s).button(a).appendTo(t.uiButtonSet)}),this.uiDialog.addClass("ui-dialog-buttons"),this.uiDialogButtonPane.appendTo(this.uiDialog),void 0)},_makeDraggable:function(){function t(e){return{position:e.position,offset:e.offset}}var i=this,s=this.options;this.uiDialog.draggable({cancel:".ui-dialog-content, .ui-dialog-titlebar-close",handle:".ui-dialog-titlebar",containment:"document",start:function(s,n){e(this).addClass("ui-dialog-dragging"),i._blockFrames(),i._trigger("dragStart",s,t(n))},drag:function(e,s){i._trigger("drag",e,t(s))},stop:function(n,a){var o=a.offset.left-i.document.scrollLeft(),r=a.offset.top-i.document.scrollTop();s.position={my:"left top",at:"left"+(o>=0?"+":"")+o+" "+"top"+(r>=0?"+":"")+r,of:i.window},e(this).removeClass("ui-dialog-dragging"),i._unblockFrames(),i._trigger("dragStop",n,t(a))}})},_makeResizable:function(){function t(e){return{originalPosition:e.originalPosition,originalSize:e.originalSize,position:e.position,size:e.size}}var i=this,s=this.options,n=s.resizable,a=this.uiDialog.css("position"),o="string"==typeof n?n:"n,e,s,w,se,sw,ne,nw";this.uiDialog.resizable({cancel:".ui-dialog-content",containment:"document",alsoResize:this.element,maxWidth:s.maxWidth,maxHeight:s.maxHeight,minWidth:s.minWidth,minHeight:this._minHeight(),handles:o,start:function(s,n){e(this).addClass("ui-dialog-resizing"),i._blockFrames(),i._trigger("resizeStart",s,t(n))},resize:function(e,s){i._trigger("resize",e,t(s))},stop:function(n,a){var o=i.uiDialog.offset(),r=o.left-i.document.scrollLeft(),h=o.top-i.document.scrollTop();s.height=i.uiDialog.height(),s.width=i.uiDialog.width(),s.position={my:"left top",at:"left"+(r>=0?"+":"")+r+" "+"top"+(h>=0?"+":"")+h,of:i.window},e(this).removeClass("ui-dialog-resizing"),i._unblockFrames(),i._trigger("resizeStop",n,t(a))}}).css("position",a)},_trackFocus:function(){this._on(this.widget(),{focusin:function(t){this._makeFocusTarget(),this._focusedElement=e(t.target)}})},_makeFocusTarget:function(){this._untrackInstance(),this._trackingInstances().unshift(this)},_untrackInstance:function(){var t=this._trackingInstances(),i=e.inArray(this,t);-1!==i&&t.splice(i,1)},_trackingInstances:function(){var e=this.document.data("ui-dialog-instances");return e||(e=[],this.document.data("ui-dialog-instances",e)),e},_minHeight:function(){var e=this.options;return"auto"===e.height?e.minHeight:Math.min(e.minHeight,e.height)},_position:function(){var e=this.uiDialog.is(":visible");e||this.uiDialog.show(),this.uiDialog.position(this.options.position),e||this.uiDialog.hide()},_setOptions:function(t){var i=this,s=!1,n={};e.each(t,function(e,t){i._setOption(e,t),e in i.sizeRelatedOptions&&(s=!0),e in i.resizableRelatedOptions&&(n[e]=t)}),s&&(this._size(),this._position()),this.uiDialog.is(":data(ui-resizable)")&&this.uiDialog.resizable("option",n)},_setOption:function(e,t){var i,s,n=this.uiDialog;"dialogClass"===e&&n.removeClass(this.options.dialogClass).addClass(t),"disabled"!==e&&(this._super(e,t),"appendTo"===e&&this.uiDialog.appendTo(this._appendTo()),"buttons"===e&&this._createButtons(),"closeText"===e&&this.uiDialogTitlebarClose.button({label:""+t}),"draggable"===e&&(i=n.is(":data(ui-draggable)"),i&&!t&&n.draggable("destroy"),!i&&t&&this._makeDraggable()),"position"===e&&this._position(),"resizable"===e&&(s=n.is(":data(ui-resizable)"),s&&!t&&n.resizable("destroy"),s&&"string"==typeof t&&n.resizable("option","handles",t),s||t===!1||this._makeResizable()),"title"===e&&this._title(this.uiDialogTitlebar.find(".ui-dialog-title")))},_size:function(){var e,t,i,s=this.options;this.element.show().css({width:"auto",minHeight:0,maxHeight:"none",height:0}),s.minWidth>s.width&&(s.width=s.minWidth),e=this.uiDialog.css({height:"auto",width:s.width}).outerHeight(),t=Math.max(0,s.minHeight-e),i="number"==typeof s.maxHeight?Math.max(0,s.maxHeight-e):"none","auto"===s.height?this.element.css({minHeight:t,maxHeight:i,height:"auto"}):this.element.height(Math.max(0,s.height-e)),this.uiDialog.is(":data(ui-resizable)")&&this.uiDialog.resizable("option","minHeight",this._minHeight())},_blockFrames:function(){this.iframeBlocks=this.document.find("iframe").map(function(){var t=e(this);return e("<div>").css({position:"absolute",width:t.outerWidth(),height:t.outerHeight()}).appendTo(t.parent()).offset(t.offset())[0]})},_unblockFrames:function(){this.iframeBlocks&&(this.iframeBlocks.remove(),delete this.iframeBlocks)},_allowInteraction:function(t){return e(t.target).closest(".ui-dialog").length?!0:!!e(t.target).closest(".ui-datepicker").length},_createOverlay:function(){if(this.options.modal){var t=!0;this._delay(function(){t=!1}),this.document.data("ui-dialog-overlays")||this._on(this.document,{focusin:function(e){t||this._allowInteraction(e)||(e.preventDefault(),this._trackingInstances()[0]._focusTabbable())}}),this.overlay=e("<div>").addClass("ui-widget-overlay ui-front").appendTo(this._appendTo()),this._on(this.overlay,{mousedown:"_keepFocus"}),this.document.data("ui-dialog-overlays",(this.document.data("ui-dialog-overlays")||0)+1)}},_destroyOverlay:function(){if(this.options.modal&&this.overlay){var e=this.document.data("ui-dialog-overlays")-1;e?this.document.data("ui-dialog-overlays",e):this.document.unbind("focusin").removeData("ui-dialog-overlays"),this.overlay.remove(),this.overlay=null}}}),e.widget("ui.progressbar",{version:"1.11.4",options:{max:100,value:0,change:null,complete:null},min:0,_create:function(){this.oldValue=this.options.value=this._constrainedValue(),this.element.addClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").attr({role:"progressbar","aria-valuemin":this.min}),this.valueDiv=e("<div class='ui-progressbar-value ui-widget-header ui-corner-left'></div>").appendTo(this.element),this._refreshValue()},_destroy:function(){this.element.removeClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").removeAttr("role").removeAttr("aria-valuemin").removeAttr("aria-valuemax").removeAttr("aria-valuenow"),this.valueDiv.remove()},value:function(e){return void 0===e?this.options.value:(this.options.value=this._constrainedValue(e),this._refreshValue(),void 0)},_constrainedValue:function(e){return void 0===e&&(e=this.options.value),this.indeterminate=e===!1,"number"!=typeof e&&(e=0),this.indeterminate?!1:Math.min(this.options.max,Math.max(this.min,e))},_setOptions:function(e){var t=e.value;delete e.value,this._super(e),this.options.value=this._constrainedValue(t),this._refreshValue()},_setOption:function(e,t){"max"===e&&(t=Math.max(this.min,t)),"disabled"===e&&this.element.toggleClass("ui-state-disabled",!!t).attr("aria-disabled",t),this._super(e,t)},_percentage:function(){return this.indeterminate?100:100*(this.options.value-this.min)/(this.options.max-this.min)},_refreshValue:function(){var t=this.options.value,i=this._percentage();this.valueDiv.toggle(this.indeterminate||t>this.min).toggleClass("ui-corner-right",t===this.options.max).width(i.toFixed(0)+"%"),this.element.toggleClass("ui-progressbar-indeterminate",this.indeterminate),this.indeterminate?(this.element.removeAttr("aria-valuenow"),this.overlayDiv||(this.overlayDiv=e("<div class='ui-progressbar-overlay'></div>").appendTo(this.valueDiv))):(this.element.attr({"aria-valuemax":this.options.max,"aria-valuenow":t}),this.overlayDiv&&(this.overlayDiv.remove(),this.overlayDiv=null)),this.oldValue!==t&&(this.oldValue=t,this._trigger("change")),t===this.options.max&&this._trigger("complete")}}),e.widget("ui.selectmenu",{version:"1.11.4",defaultElement:"<select>",options:{appendTo:null,disabled:null,icons:{button:"ui-icon-triangle-1-s"},position:{my:"left top",at:"left bottom",collision:"none"},width:null,change:null,close:null,focus:null,open:null,select:null},_create:function(){var e=this.element.uniqueId().attr("id");this.ids={element:e,button:e+"-button",menu:e+"-menu"},this._drawButton(),this._drawMenu(),this.options.disabled&&this.disable()},_drawButton:function(){var t=this;this.label=e("label[for='"+this.ids.element+"']").attr("for",this.ids.button),this._on(this.label,{click:function(e){this.button.focus(),e.preventDefault()}}),this.element.hide(),this.button=e("<span>",{"class":"ui-selectmenu-button ui-widget ui-state-default ui-corner-all",tabindex:this.options.disabled?-1:0,id:this.ids.button,role:"combobox","aria-expanded":"false","aria-autocomplete":"list","aria-owns":this.ids.menu,"aria-haspopup":"true"}).insertAfter(this.element),e("<span>",{"class":"ui-icon "+this.options.icons.button}).prependTo(this.button),this.buttonText=e("<span>",{"class":"ui-selectmenu-text"}).appendTo(this.button),this._setText(this.buttonText,this.element.find("option:selected").text()),this._resizeButton(),this._on(this.button,this._buttonEvents),this.button.one("focusin",function(){t.menuItems||t._refreshMenu()}),this._hoverable(this.button),this._focusable(this.button)},_drawMenu:function(){var t=this;this.menu=e("<ul>",{"aria-hidden":"true","aria-labelledby":this.ids.button,id:this.ids.menu}),this.menuWrap=e("<div>",{"class":"ui-selectmenu-menu ui-front"}).append(this.menu).appendTo(this._appendTo()),this.menuInstance=this.menu.menu({role:"listbox",select:function(e,i){e.preventDefault(),t._setSelection(),t._select(i.item.data("ui-selectmenu-item"),e)},focus:function(e,i){var s=i.item.data("ui-selectmenu-item");null!=t.focusIndex&&s.index!==t.focusIndex&&(t._trigger("focus",e,{item:s}),t.isOpen||t._select(s,e)),t.focusIndex=s.index,t.button.attr("aria-activedescendant",t.menuItems.eq(s.index).attr("id"))}}).menu("instance"),this.menu.addClass("ui-corner-bottom").removeClass("ui-corner-all"),this.menuInstance._off(this.menu,"mouseleave"),this.menuInstance._closeOnDocumentClick=function(){return!1},this.menuInstance._isDivider=function(){return!1}},refresh:function(){this._refreshMenu(),this._setText(this.buttonText,this._getSelectedItem().text()),this.options.width||this._resizeButton()},_refreshMenu:function(){this.menu.empty();var e,t=this.element.find("option");t.length&&(this._parseOptions(t),this._renderMenu(this.menu,this.items),this.menuInstance.refresh(),this.menuItems=this.menu.find("li").not(".ui-selectmenu-optgroup"),e=this._getSelectedItem(),this.menuInstance.focus(null,e),this._setAria(e.data("ui-selectmenu-item")),this._setOption("disabled",this.element.prop("disabled")))},open:function(e){this.options.disabled||(this.menuItems?(this.menu.find(".ui-state-focus").removeClass("ui-state-focus"),this.menuInstance.focus(null,this._getSelectedItem())):this._refreshMenu(),this.isOpen=!0,this._toggleAttr(),this._resizeMenu(),this._position(),this._on(this.document,this._documentClick),this._trigger("open",e))},_position:function(){this.menuWrap.position(e.extend({of:this.button},this.options.position))},close:function(e){this.isOpen&&(this.isOpen=!1,this._toggleAttr(),this.range=null,this._off(this.document),this._trigger("close",e))},widget:function(){return this.button},menuWidget:function(){return this.menu},_renderMenu:function(t,i){var s=this,n="";e.each(i,function(i,a){a.optgroup!==n&&(e("<li>",{"class":"ui-selectmenu-optgroup ui-menu-divider"+(a.element.parent("optgroup").prop("disabled")?" ui-state-disabled":""),text:a.optgroup}).appendTo(t),n=a.optgroup),s._renderItemData(t,a)})},_renderItemData:function(e,t){return this._renderItem(e,t).data("ui-selectmenu-item",t)},_renderItem:function(t,i){var s=e("<li>");return i.disabled&&s.addClass("ui-state-disabled"),this._setText(s,i.label),s.appendTo(t)},_setText:function(e,t){t?e.text(t):e.html("&#160;")},_move:function(e,t){var i,s,n=".ui-menu-item";this.isOpen?i=this.menuItems.eq(this.focusIndex):(i=this.menuItems.eq(this.element[0].selectedIndex),n+=":not(.ui-state-disabled)"),s="first"===e||"last"===e?i["first"===e?"prevAll":"nextAll"](n).eq(-1):i[e+"All"](n).eq(0),s.length&&this.menuInstance.focus(t,s)},_getSelectedItem:function(){return this.menuItems.eq(this.element[0].selectedIndex)},_toggle:function(e){this[this.isOpen?"close":"open"](e)},_setSelection:function(){var e;this.range&&(window.getSelection?(e=window.getSelection(),e.removeAllRanges(),e.addRange(this.range)):this.range.select(),this.button.focus())},_documentClick:{mousedown:function(t){this.isOpen&&(e(t.target).closest(".ui-selectmenu-menu, #"+this.ids.button).length||this.close(t))}},_buttonEvents:{mousedown:function(){var e;window.getSelection?(e=window.getSelection(),e.rangeCount&&(this.range=e.getRangeAt(0))):this.range=document.selection.createRange()},click:function(e){this._setSelection(),this._toggle(e)},keydown:function(t){var i=!0;switch(t.keyCode){case e.ui.keyCode.TAB:case e.ui.keyCode.ESCAPE:this.close(t),i=!1;break;case e.ui.keyCode.ENTER:this.isOpen&&this._selectFocusedItem(t);break;case e.ui.keyCode.UP:t.altKey?this._toggle(t):this._move("prev",t);break;case e.ui.keyCode.DOWN:t.altKey?this._toggle(t):this._move("next",t);break;case e.ui.keyCode.SPACE:this.isOpen?this._selectFocusedItem(t):this._toggle(t);break;case e.ui.keyCode.LEFT:this._move("prev",t);break;case e.ui.keyCode.RIGHT:this._move("next",t);break;case e.ui.keyCode.HOME:case e.ui.keyCode.PAGE_UP:this._move("first",t);break;case e.ui.keyCode.END:case e.ui.keyCode.PAGE_DOWN:this._move("last",t);break;default:this.menu.trigger(t),i=!1}i&&t.preventDefault()}},_selectFocusedItem:function(e){var t=this.menuItems.eq(this.focusIndex);t.hasClass("ui-state-disabled")||this._select(t.data("ui-selectmenu-item"),e)},_select:function(e,t){var i=this.element[0].selectedIndex;this.element[0].selectedIndex=e.index,this._setText(this.buttonText,e.label),this._setAria(e),this._trigger("select",t,{item:e}),e.index!==i&&this._trigger("change",t,{item:e}),this.close(t)},_setAria:function(e){var t=this.menuItems.eq(e.index).attr("id");this.button.attr({"aria-labelledby":t,"aria-activedescendant":t}),this.menu.attr("aria-activedescendant",t)},_setOption:function(e,t){"icons"===e&&this.button.find("span.ui-icon").removeClass(this.options.icons.button).addClass(t.button),this._super(e,t),"appendTo"===e&&this.menuWrap.appendTo(this._appendTo()),"disabled"===e&&(this.menuInstance.option("disabled",t),this.button.toggleClass("ui-state-disabled",t).attr("aria-disabled",t),this.element.prop("disabled",t),t?(this.button.attr("tabindex",-1),this.close()):this.button.attr("tabindex",0)),"width"===e&&this._resizeButton()},_appendTo:function(){var t=this.options.appendTo;return t&&(t=t.jquery||t.nodeType?e(t):this.document.find(t).eq(0)),t&&t[0]||(t=this.element.closest(".ui-front")),t.length||(t=this.document[0].body),t},_toggleAttr:function(){this.button.toggleClass("ui-corner-top",this.isOpen).toggleClass("ui-corner-all",!this.isOpen).attr("aria-expanded",this.isOpen),this.menuWrap.toggleClass("ui-selectmenu-open",this.isOpen),this.menu.attr("aria-hidden",!this.isOpen)},_resizeButton:function(){var e=this.options.width;e||(e=this.element.show().outerWidth(),this.element.hide()),this.button.outerWidth(e)},_resizeMenu:function(){this.menu.outerWidth(Math.max(this.button.outerWidth(),this.menu.width("").outerWidth()+1))},_getCreateOptions:function(){return{disabled:this.element.prop("disabled")}},_parseOptions:function(t){var i=[];t.each(function(t,s){var n=e(s),a=n.parent("optgroup");i.push({element:n,index:t,value:n.val(),label:n.text(),optgroup:a.attr("label")||"",disabled:a.prop("disabled")||n.prop("disabled")})}),this.items=i},_destroy:function(){this.menuWrap.remove(),this.button.remove(),this.element.show(),this.element.removeUniqueId(),this.label.attr("for",this.ids.element)}}),e.widget("ui.slider",e.ui.mouse,{version:"1.11.4",widgetEventPrefix:"slide",options:{animate:!1,distance:0,max:100,min:0,orientation:"horizontal",range:!1,step:1,value:0,values:null,change:null,slide:null,start:null,stop:null},numPages:5,_create:function(){this._keySliding=!1,this._mouseSliding=!1,this._animateOff=!0,this._handleIndex=null,this._detectOrientation(),this._mouseInit(),this._calculateNewMax(),this.element.addClass("ui-slider ui-slider-"+this.orientation+" ui-widget"+" ui-widget-content"+" ui-corner-all"),this._refresh(),this._setOption("disabled",this.options.disabled),this._animateOff=!1},_refresh:function(){this._createRange(),this._createHandles(),this._setupEvents(),this._refreshValue()},_createHandles:function(){var t,i,s=this.options,n=this.element.find(".ui-slider-handle").addClass("ui-state-default ui-corner-all"),a="<span class='ui-slider-handle ui-state-default ui-corner-all' tabindex='0'></span>",o=[];for(i=s.values&&s.values.length||1,n.length>i&&(n.slice(i).remove(),n=n.slice(0,i)),t=n.length;i>t;t++)o.push(a);this.handles=n.add(e(o.join("")).appendTo(this.element)),this.handle=this.handles.eq(0),this.handles.each(function(t){e(this).data("ui-slider-handle-index",t)})},_createRange:function(){var t=this.options,i="";t.range?(t.range===!0&&(t.values?t.values.length&&2!==t.values.length?t.values=[t.values[0],t.values[0]]:e.isArray(t.values)&&(t.values=t.values.slice(0)):t.values=[this._valueMin(),this._valueMin()]),this.range&&this.range.length?this.range.removeClass("ui-slider-range-min ui-slider-range-max").css({left:"",bottom:""}):(this.range=e("<div></div>").appendTo(this.element),i="ui-slider-range ui-widget-header ui-corner-all"),this.range.addClass(i+("min"===t.range||"max"===t.range?" ui-slider-range-"+t.range:""))):(this.range&&this.range.remove(),this.range=null)},_setupEvents:function(){this._off(this.handles),this._on(this.handles,this._handleEvents),this._hoverable(this.handles),this._focusable(this.handles)},_destroy:function(){this.handles.remove(),this.range&&this.range.remove(),this.element.removeClass("ui-slider ui-slider-horizontal ui-slider-vertical ui-widget ui-widget-content ui-corner-all"),this._mouseDestroy()},_mouseCapture:function(t){var i,s,n,a,o,r,h,l,u=this,d=this.options;return d.disabled?!1:(this.elementSize={width:this.element.outerWidth(),height:this.element.outerHeight()},this.elementOffset=this.element.offset(),i={x:t.pageX,y:t.pageY},s=this._normValueFromMouse(i),n=this._valueMax()-this._valueMin()+1,this.handles.each(function(t){var i=Math.abs(s-u.values(t));(n>i||n===i&&(t===u._lastChangedValue||u.values(t)===d.min))&&(n=i,a=e(this),o=t)}),r=this._start(t,o),r===!1?!1:(this._mouseSliding=!0,this._handleIndex=o,a.addClass("ui-state-active").focus(),h=a.offset(),l=!e(t.target).parents().addBack().is(".ui-slider-handle"),this._clickOffset=l?{left:0,top:0}:{left:t.pageX-h.left-a.width()/2,top:t.pageY-h.top-a.height()/2-(parseInt(a.css("borderTopWidth"),10)||0)-(parseInt(a.css("borderBottomWidth"),10)||0)+(parseInt(a.css("marginTop"),10)||0)},this.handles.hasClass("ui-state-hover")||this._slide(t,o,s),this._animateOff=!0,!0))},_mouseStart:function(){return!0},_mouseDrag:function(e){var t={x:e.pageX,y:e.pageY},i=this._normValueFromMouse(t);return this._slide(e,this._handleIndex,i),!1},_mouseStop:function(e){return this.handles.removeClass("ui-state-active"),this._mouseSliding=!1,this._stop(e,this._handleIndex),this._change(e,this._handleIndex),this._handleIndex=null,this._clickOffset=null,this._animateOff=!1,!1},_detectOrientation:function(){this.orientation="vertical"===this.options.orientation?"vertical":"horizontal"},_normValueFromMouse:function(e){var t,i,s,n,a;return"horizontal"===this.orientation?(t=this.elementSize.width,i=e.x-this.elementOffset.left-(this._clickOffset?this._clickOffset.left:0)):(t=this.elementSize.height,i=e.y-this.elementOffset.top-(this._clickOffset?this._clickOffset.top:0)),s=i/t,s>1&&(s=1),0>s&&(s=0),"vertical"===this.orientation&&(s=1-s),n=this._valueMax()-this._valueMin(),a=this._valueMin()+s*n,this._trimAlignValue(a)},_start:function(e,t){var i={handle:this.handles[t],value:this.value()};return this.options.values&&this.options.values.length&&(i.value=this.values(t),i.values=this.values()),this._trigger("start",e,i)},_slide:function(e,t,i){var s,n,a;this.options.values&&this.options.values.length?(s=this.values(t?0:1),2===this.options.values.length&&this.options.range===!0&&(0===t&&i>s||1===t&&s>i)&&(i=s),i!==this.values(t)&&(n=this.values(),n[t]=i,a=this._trigger("slide",e,{handle:this.handles[t],value:i,values:n}),s=this.values(t?0:1),a!==!1&&this.values(t,i))):i!==this.value()&&(a=this._trigger("slide",e,{handle:this.handles[t],value:i}),a!==!1&&this.value(i))},_stop:function(e,t){var i={handle:this.handles[t],value:this.value()};this.options.values&&this.options.values.length&&(i.value=this.values(t),i.values=this.values()),this._trigger("stop",e,i)},_change:function(e,t){if(!this._keySliding&&!this._mouseSliding){var i={handle:this.handles[t],value:this.value()};this.options.values&&this.options.values.length&&(i.value=this.values(t),i.values=this.values()),this._lastChangedValue=t,this._trigger("change",e,i)}},value:function(e){return arguments.length?(this.options.value=this._trimAlignValue(e),this._refreshValue(),this._change(null,0),void 0):this._value()},values:function(t,i){var s,n,a;if(arguments.length>1)return this.options.values[t]=this._trimAlignValue(i),this._refreshValue(),this._change(null,t),void 0;if(!arguments.length)return this._values();if(!e.isArray(arguments[0]))return this.options.values&&this.options.values.length?this._values(t):this.value();for(s=this.options.values,n=arguments[0],a=0;s.length>a;a+=1)s[a]=this._trimAlignValue(n[a]),this._change(null,a);this._refreshValue()},_setOption:function(t,i){var s,n=0;switch("range"===t&&this.options.range===!0&&("min"===i?(this.options.value=this._values(0),this.options.values=null):"max"===i&&(this.options.value=this._values(this.options.values.length-1),this.options.values=null)),e.isArray(this.options.values)&&(n=this.options.values.length),"disabled"===t&&this.element.toggleClass("ui-state-disabled",!!i),this._super(t,i),t){case"orientation":this._detectOrientation(),this.element.removeClass("ui-slider-horizontal ui-slider-vertical").addClass("ui-slider-"+this.orientation),this._refreshValue(),this.handles.css("horizontal"===i?"bottom":"left","");break;case"value":this._animateOff=!0,this._refreshValue(),this._change(null,0),this._animateOff=!1;break;case"values":for(this._animateOff=!0,this._refreshValue(),s=0;n>s;s+=1)this._change(null,s);this._animateOff=!1;break;case"step":case"min":case"max":this._animateOff=!0,this._calculateNewMax(),this._refreshValue(),this._animateOff=!1;break;case"range":this._animateOff=!0,this._refresh(),this._animateOff=!1}},_value:function(){var e=this.options.value;return e=this._trimAlignValue(e)},_values:function(e){var t,i,s;if(arguments.length)return t=this.options.values[e],t=this._trimAlignValue(t);if(this.options.values&&this.options.values.length){for(i=this.options.values.slice(),s=0;i.length>s;s+=1)i[s]=this._trimAlignValue(i[s]);return i}return[]},_trimAlignValue:function(e){if(this._valueMin()>=e)return this._valueMin();if(e>=this._valueMax())return this._valueMax();var t=this.options.step>0?this.options.step:1,i=(e-this._valueMin())%t,s=e-i;return 2*Math.abs(i)>=t&&(s+=i>0?t:-t),parseFloat(s.toFixed(5))},_calculateNewMax:function(){var e=this.options.max,t=this._valueMin(),i=this.options.step,s=Math.floor(+(e-t).toFixed(this._precision())/i)*i;e=s+t,this.max=parseFloat(e.toFixed(this._precision()))},_precision:function(){var e=this._precisionOf(this.options.step);return null!==this.options.min&&(e=Math.max(e,this._precisionOf(this.options.min))),e},_precisionOf:function(e){var t=""+e,i=t.indexOf(".");return-1===i?0:t.length-i-1},_valueMin:function(){return this.options.min},_valueMax:function(){return this.max},_refreshValue:function(){var t,i,s,n,a,o=this.options.range,r=this.options,h=this,l=this._animateOff?!1:r.animate,u={};this.options.values&&this.options.values.length?this.handles.each(function(s){i=100*((h.values(s)-h._valueMin())/(h._valueMax()-h._valueMin())),u["horizontal"===h.orientation?"left":"bottom"]=i+"%",e(this).stop(1,1)[l?"animate":"css"](u,r.animate),h.options.range===!0&&("horizontal"===h.orientation?(0===s&&h.range.stop(1,1)[l?"animate":"css"]({left:i+"%"},r.animate),1===s&&h.range[l?"animate":"css"]({width:i-t+"%"},{queue:!1,duration:r.animate})):(0===s&&h.range.stop(1,1)[l?"animate":"css"]({bottom:i+"%"},r.animate),1===s&&h.range[l?"animate":"css"]({height:i-t+"%"},{queue:!1,duration:r.animate}))),t=i}):(s=this.value(),n=this._valueMin(),a=this._valueMax(),i=a!==n?100*((s-n)/(a-n)):0,u["horizontal"===this.orientation?"left":"bottom"]=i+"%",this.handle.stop(1,1)[l?"animate":"css"](u,r.animate),"min"===o&&"horizontal"===this.orientation&&this.range.stop(1,1)[l?"animate":"css"]({width:i+"%"},r.animate),"max"===o&&"horizontal"===this.orientation&&this.range[l?"animate":"css"]({width:100-i+"%"},{queue:!1,duration:r.animate}),"min"===o&&"vertical"===this.orientation&&this.range.stop(1,1)[l?"animate":"css"]({height:i+"%"},r.animate),"max"===o&&"vertical"===this.orientation&&this.range[l?"animate":"css"]({height:100-i+"%"},{queue:!1,duration:r.animate}))},_handleEvents:{keydown:function(t){var i,s,n,a,o=e(t.target).data("ui-slider-handle-index");switch(t.keyCode){case e.ui.keyCode.HOME:case e.ui.keyCode.END:case e.ui.keyCode.PAGE_UP:case e.ui.keyCode.PAGE_DOWN:case e.ui.keyCode.UP:case e.ui.keyCode.RIGHT:case e.ui.keyCode.DOWN:case e.ui.keyCode.LEFT:if(t.preventDefault(),!this._keySliding&&(this._keySliding=!0,e(t.target).addClass("ui-state-active"),i=this._start(t,o),i===!1))return}switch(a=this.options.step,s=n=this.options.values&&this.options.values.length?this.values(o):this.value(),t.keyCode){case e.ui.keyCode.HOME:n=this._valueMin();break;case e.ui.keyCode.END:n=this._valueMax();break;case e.ui.keyCode.PAGE_UP:n=this._trimAlignValue(s+(this._valueMax()-this._valueMin())/this.numPages);break;case e.ui.keyCode.PAGE_DOWN:n=this._trimAlignValue(s-(this._valueMax()-this._valueMin())/this.numPages);break;case e.ui.keyCode.UP:case e.ui.keyCode.RIGHT:if(s===this._valueMax())return;n=this._trimAlignValue(s+a);break;case e.ui.keyCode.DOWN:case e.ui.keyCode.LEFT:if(s===this._valueMin())return;n=this._trimAlignValue(s-a)}this._slide(t,o,n)},keyup:function(t){var i=e(t.target).data("ui-slider-handle-index");this._keySliding&&(this._keySliding=!1,this._stop(t,i),this._change(t,i),e(t.target).removeClass("ui-state-active"))}}}),e.widget("ui.spinner",{version:"1.11.4",defaultElement:"<input>",widgetEventPrefix:"spin",options:{culture:null,icons:{down:"ui-icon-triangle-1-s",up:"ui-icon-triangle-1-n"},incremental:!0,max:null,min:null,numberFormat:null,page:10,step:1,change:null,spin:null,start:null,stop:null},_create:function(){this._setOption("max",this.options.max),this._setOption("min",this.options.min),this._setOption("step",this.options.step),""!==this.value()&&this._value(this.element.val(),!0),this._draw(),this._on(this._events),this._refresh(),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_getCreateOptions:function(){var t={},i=this.element;return e.each(["min","max","step"],function(e,s){var n=i.attr(s);void 0!==n&&n.length&&(t[s]=n)}),t},_events:{keydown:function(e){this._start(e)&&this._keydown(e)&&e.preventDefault()},keyup:"_stop",focus:function(){this.previous=this.element.val()},blur:function(e){return this.cancelBlur?(delete this.cancelBlur,void 0):(this._stop(),this._refresh(),this.previous!==this.element.val()&&this._trigger("change",e),void 0)},mousewheel:function(e,t){if(t){if(!this.spinning&&!this._start(e))return!1;this._spin((t>0?1:-1)*this.options.step,e),clearTimeout(this.mousewheelTimer),this.mousewheelTimer=this._delay(function(){this.spinning&&this._stop(e)},100),e.preventDefault()}},"mousedown .ui-spinner-button":function(t){function i(){var e=this.element[0]===this.document[0].activeElement;e||(this.element.focus(),this.previous=s,this._delay(function(){this.previous=s}))}var s;s=this.element[0]===this.document[0].activeElement?this.previous:this.element.val(),t.preventDefault(),i.call(this),this.cancelBlur=!0,this._delay(function(){delete this.cancelBlur,i.call(this)}),this._start(t)!==!1&&this._repeat(null,e(t.currentTarget).hasClass("ui-spinner-up")?1:-1,t)},"mouseup .ui-spinner-button":"_stop","mouseenter .ui-spinner-button":function(t){return e(t.currentTarget).hasClass("ui-state-active")?this._start(t)===!1?!1:(this._repeat(null,e(t.currentTarget).hasClass("ui-spinner-up")?1:-1,t),void 0):void 0},"mouseleave .ui-spinner-button":"_stop"},_draw:function(){var e=this.uiSpinner=this.element.addClass("ui-spinner-input").attr("autocomplete","off").wrap(this._uiSpinnerHtml()).parent().append(this._buttonHtml());this.element.attr("role","spinbutton"),this.buttons=e.find(".ui-spinner-button").attr("tabIndex",-1).button().removeClass("ui-corner-all"),this.buttons.height()>Math.ceil(.5*e.height())&&e.height()>0&&e.height(e.height()),this.options.disabled&&this.disable()
-},_keydown:function(t){var i=this.options,s=e.ui.keyCode;switch(t.keyCode){case s.UP:return this._repeat(null,1,t),!0;case s.DOWN:return this._repeat(null,-1,t),!0;case s.PAGE_UP:return this._repeat(null,i.page,t),!0;case s.PAGE_DOWN:return this._repeat(null,-i.page,t),!0}return!1},_uiSpinnerHtml:function(){return"<span class='ui-spinner ui-widget ui-widget-content ui-corner-all'></span>"},_buttonHtml:function(){return"<a class='ui-spinner-button ui-spinner-up ui-corner-tr'><span class='ui-icon "+this.options.icons.up+"'>&#9650;</span>"+"</a>"+"<a class='ui-spinner-button ui-spinner-down ui-corner-br'>"+"<span class='ui-icon "+this.options.icons.down+"'>&#9660;</span>"+"</a>"},_start:function(e){return this.spinning||this._trigger("start",e)!==!1?(this.counter||(this.counter=1),this.spinning=!0,!0):!1},_repeat:function(e,t,i){e=e||500,clearTimeout(this.timer),this.timer=this._delay(function(){this._repeat(40,t,i)},e),this._spin(t*this.options.step,i)},_spin:function(e,t){var i=this.value()||0;this.counter||(this.counter=1),i=this._adjustValue(i+e*this._increment(this.counter)),this.spinning&&this._trigger("spin",t,{value:i})===!1||(this._value(i),this.counter++)},_increment:function(t){var i=this.options.incremental;return i?e.isFunction(i)?i(t):Math.floor(t*t*t/5e4-t*t/500+17*t/200+1):1},_precision:function(){var e=this._precisionOf(this.options.step);return null!==this.options.min&&(e=Math.max(e,this._precisionOf(this.options.min))),e},_precisionOf:function(e){var t=""+e,i=t.indexOf(".");return-1===i?0:t.length-i-1},_adjustValue:function(e){var t,i,s=this.options;return t=null!==s.min?s.min:0,i=e-t,i=Math.round(i/s.step)*s.step,e=t+i,e=parseFloat(e.toFixed(this._precision())),null!==s.max&&e>s.max?s.max:null!==s.min&&s.min>e?s.min:e},_stop:function(e){this.spinning&&(clearTimeout(this.timer),clearTimeout(this.mousewheelTimer),this.counter=0,this.spinning=!1,this._trigger("stop",e))},_setOption:function(e,t){if("culture"===e||"numberFormat"===e){var i=this._parse(this.element.val());return this.options[e]=t,this.element.val(this._format(i)),void 0}("max"===e||"min"===e||"step"===e)&&"string"==typeof t&&(t=this._parse(t)),"icons"===e&&(this.buttons.first().find(".ui-icon").removeClass(this.options.icons.up).addClass(t.up),this.buttons.last().find(".ui-icon").removeClass(this.options.icons.down).addClass(t.down)),this._super(e,t),"disabled"===e&&(this.widget().toggleClass("ui-state-disabled",!!t),this.element.prop("disabled",!!t),this.buttons.button(t?"disable":"enable"))},_setOptions:h(function(e){this._super(e)}),_parse:function(e){return"string"==typeof e&&""!==e&&(e=window.Globalize&&this.options.numberFormat?Globalize.parseFloat(e,10,this.options.culture):+e),""===e||isNaN(e)?null:e},_format:function(e){return""===e?"":window.Globalize&&this.options.numberFormat?Globalize.format(e,this.options.numberFormat,this.options.culture):e},_refresh:function(){this.element.attr({"aria-valuemin":this.options.min,"aria-valuemax":this.options.max,"aria-valuenow":this._parse(this.element.val())})},isValid:function(){var e=this.value();return null===e?!1:e===this._adjustValue(e)},_value:function(e,t){var i;""!==e&&(i=this._parse(e),null!==i&&(t||(i=this._adjustValue(i)),e=this._format(i))),this.element.val(e),this._refresh()},_destroy:function(){this.element.removeClass("ui-spinner-input").prop("disabled",!1).removeAttr("autocomplete").removeAttr("role").removeAttr("aria-valuemin").removeAttr("aria-valuemax").removeAttr("aria-valuenow"),this.uiSpinner.replaceWith(this.element)},stepUp:h(function(e){this._stepUp(e)}),_stepUp:function(e){this._start()&&(this._spin((e||1)*this.options.step),this._stop())},stepDown:h(function(e){this._stepDown(e)}),_stepDown:function(e){this._start()&&(this._spin((e||1)*-this.options.step),this._stop())},pageUp:h(function(e){this._stepUp((e||1)*this.options.page)}),pageDown:h(function(e){this._stepDown((e||1)*this.options.page)}),value:function(e){return arguments.length?(h(this._value).call(this,e),void 0):this._parse(this.element.val())},widget:function(){return this.uiSpinner}}),e.widget("ui.tabs",{version:"1.11.4",delay:300,options:{active:null,collapsible:!1,event:"click",heightStyle:"content",hide:null,show:null,activate:null,beforeActivate:null,beforeLoad:null,load:null},_isLocal:function(){var e=/#.*$/;return function(t){var i,s;t=t.cloneNode(!1),i=t.href.replace(e,""),s=location.href.replace(e,"");try{i=decodeURIComponent(i)}catch(n){}try{s=decodeURIComponent(s)}catch(n){}return t.hash.length>1&&i===s}}(),_create:function(){var t=this,i=this.options;this.running=!1,this.element.addClass("ui-tabs ui-widget ui-widget-content ui-corner-all").toggleClass("ui-tabs-collapsible",i.collapsible),this._processTabs(),i.active=this._initialActive(),e.isArray(i.disabled)&&(i.disabled=e.unique(i.disabled.concat(e.map(this.tabs.filter(".ui-state-disabled"),function(e){return t.tabs.index(e)}))).sort()),this.active=this.options.active!==!1&&this.anchors.length?this._findActive(i.active):e(),this._refresh(),this.active.length&&this.load(i.active)},_initialActive:function(){var t=this.options.active,i=this.options.collapsible,s=location.hash.substring(1);return null===t&&(s&&this.tabs.each(function(i,n){return e(n).attr("aria-controls")===s?(t=i,!1):void 0}),null===t&&(t=this.tabs.index(this.tabs.filter(".ui-tabs-active"))),(null===t||-1===t)&&(t=this.tabs.length?0:!1)),t!==!1&&(t=this.tabs.index(this.tabs.eq(t)),-1===t&&(t=i?!1:0)),!i&&t===!1&&this.anchors.length&&(t=0),t},_getCreateEventData:function(){return{tab:this.active,panel:this.active.length?this._getPanelForTab(this.active):e()}},_tabKeydown:function(t){var i=e(this.document[0].activeElement).closest("li"),s=this.tabs.index(i),n=!0;if(!this._handlePageNav(t)){switch(t.keyCode){case e.ui.keyCode.RIGHT:case e.ui.keyCode.DOWN:s++;break;case e.ui.keyCode.UP:case e.ui.keyCode.LEFT:n=!1,s--;break;case e.ui.keyCode.END:s=this.anchors.length-1;break;case e.ui.keyCode.HOME:s=0;break;case e.ui.keyCode.SPACE:return t.preventDefault(),clearTimeout(this.activating),this._activate(s),void 0;case e.ui.keyCode.ENTER:return t.preventDefault(),clearTimeout(this.activating),this._activate(s===this.options.active?!1:s),void 0;default:return}t.preventDefault(),clearTimeout(this.activating),s=this._focusNextTab(s,n),t.ctrlKey||t.metaKey||(i.attr("aria-selected","false"),this.tabs.eq(s).attr("aria-selected","true"),this.activating=this._delay(function(){this.option("active",s)},this.delay))}},_panelKeydown:function(t){this._handlePageNav(t)||t.ctrlKey&&t.keyCode===e.ui.keyCode.UP&&(t.preventDefault(),this.active.focus())},_handlePageNav:function(t){return t.altKey&&t.keyCode===e.ui.keyCode.PAGE_UP?(this._activate(this._focusNextTab(this.options.active-1,!1)),!0):t.altKey&&t.keyCode===e.ui.keyCode.PAGE_DOWN?(this._activate(this._focusNextTab(this.options.active+1,!0)),!0):void 0},_findNextTab:function(t,i){function s(){return t>n&&(t=0),0>t&&(t=n),t}for(var n=this.tabs.length-1;-1!==e.inArray(s(),this.options.disabled);)t=i?t+1:t-1;return t},_focusNextTab:function(e,t){return e=this._findNextTab(e,t),this.tabs.eq(e).focus(),e},_setOption:function(e,t){return"active"===e?(this._activate(t),void 0):"disabled"===e?(this._setupDisabled(t),void 0):(this._super(e,t),"collapsible"===e&&(this.element.toggleClass("ui-tabs-collapsible",t),t||this.options.active!==!1||this._activate(0)),"event"===e&&this._setupEvents(t),"heightStyle"===e&&this._setupHeightStyle(t),void 0)},_sanitizeSelector:function(e){return e?e.replace(/[!"$%&'()*+,.\/:;<=>?@\[\]\^`{|}~]/g,"\\$&"):""},refresh:function(){var t=this.options,i=this.tablist.children(":has(a[href])");t.disabled=e.map(i.filter(".ui-state-disabled"),function(e){return i.index(e)}),this._processTabs(),t.active!==!1&&this.anchors.length?this.active.length&&!e.contains(this.tablist[0],this.active[0])?this.tabs.length===t.disabled.length?(t.active=!1,this.active=e()):this._activate(this._findNextTab(Math.max(0,t.active-1),!1)):t.active=this.tabs.index(this.active):(t.active=!1,this.active=e()),this._refresh()},_refresh:function(){this._setupDisabled(this.options.disabled),this._setupEvents(this.options.event),this._setupHeightStyle(this.options.heightStyle),this.tabs.not(this.active).attr({"aria-selected":"false","aria-expanded":"false",tabIndex:-1}),this.panels.not(this._getPanelForTab(this.active)).hide().attr({"aria-hidden":"true"}),this.active.length?(this.active.addClass("ui-tabs-active ui-state-active").attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0}),this._getPanelForTab(this.active).show().attr({"aria-hidden":"false"})):this.tabs.eq(0).attr("tabIndex",0)},_processTabs:function(){var t=this,i=this.tabs,s=this.anchors,n=this.panels;this.tablist=this._getList().addClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all").attr("role","tablist").delegate("> li","mousedown"+this.eventNamespace,function(t){e(this).is(".ui-state-disabled")&&t.preventDefault()}).delegate(".ui-tabs-anchor","focus"+this.eventNamespace,function(){e(this).closest("li").is(".ui-state-disabled")&&this.blur()}),this.tabs=this.tablist.find("> li:has(a[href])").addClass("ui-state-default ui-corner-top").attr({role:"tab",tabIndex:-1}),this.anchors=this.tabs.map(function(){return e("a",this)[0]}).addClass("ui-tabs-anchor").attr({role:"presentation",tabIndex:-1}),this.panels=e(),this.anchors.each(function(i,s){var n,a,o,r=e(s).uniqueId().attr("id"),h=e(s).closest("li"),l=h.attr("aria-controls");t._isLocal(s)?(n=s.hash,o=n.substring(1),a=t.element.find(t._sanitizeSelector(n))):(o=h.attr("aria-controls")||e({}).uniqueId()[0].id,n="#"+o,a=t.element.find(n),a.length||(a=t._createPanel(o),a.insertAfter(t.panels[i-1]||t.tablist)),a.attr("aria-live","polite")),a.length&&(t.panels=t.panels.add(a)),l&&h.data("ui-tabs-aria-controls",l),h.attr({"aria-controls":o,"aria-labelledby":r}),a.attr("aria-labelledby",r)}),this.panels.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").attr("role","tabpanel"),i&&(this._off(i.not(this.tabs)),this._off(s.not(this.anchors)),this._off(n.not(this.panels)))},_getList:function(){return this.tablist||this.element.find("ol,ul").eq(0)},_createPanel:function(t){return e("<div>").attr("id",t).addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").data("ui-tabs-destroy",!0)},_setupDisabled:function(t){e.isArray(t)&&(t.length?t.length===this.anchors.length&&(t=!0):t=!1);for(var i,s=0;i=this.tabs[s];s++)t===!0||-1!==e.inArray(s,t)?e(i).addClass("ui-state-disabled").attr("aria-disabled","true"):e(i).removeClass("ui-state-disabled").removeAttr("aria-disabled");this.options.disabled=t},_setupEvents:function(t){var i={};t&&e.each(t.split(" "),function(e,t){i[t]="_eventHandler"}),this._off(this.anchors.add(this.tabs).add(this.panels)),this._on(!0,this.anchors,{click:function(e){e.preventDefault()}}),this._on(this.anchors,i),this._on(this.tabs,{keydown:"_tabKeydown"}),this._on(this.panels,{keydown:"_panelKeydown"}),this._focusable(this.tabs),this._hoverable(this.tabs)},_setupHeightStyle:function(t){var i,s=this.element.parent();"fill"===t?(i=s.height(),i-=this.element.outerHeight()-this.element.height(),this.element.siblings(":visible").each(function(){var t=e(this),s=t.css("position");"absolute"!==s&&"fixed"!==s&&(i-=t.outerHeight(!0))}),this.element.children().not(this.panels).each(function(){i-=e(this).outerHeight(!0)}),this.panels.each(function(){e(this).height(Math.max(0,i-e(this).innerHeight()+e(this).height()))}).css("overflow","auto")):"auto"===t&&(i=0,this.panels.each(function(){i=Math.max(i,e(this).height("").height())}).height(i))},_eventHandler:function(t){var i=this.options,s=this.active,n=e(t.currentTarget),a=n.closest("li"),o=a[0]===s[0],r=o&&i.collapsible,h=r?e():this._getPanelForTab(a),l=s.length?this._getPanelForTab(s):e(),u={oldTab:s,oldPanel:l,newTab:r?e():a,newPanel:h};t.preventDefault(),a.hasClass("ui-state-disabled")||a.hasClass("ui-tabs-loading")||this.running||o&&!i.collapsible||this._trigger("beforeActivate",t,u)===!1||(i.active=r?!1:this.tabs.index(a),this.active=o?e():a,this.xhr&&this.xhr.abort(),l.length||h.length||e.error("jQuery UI Tabs: Mismatching fragment identifier."),h.length&&this.load(this.tabs.index(a),t),this._toggle(t,u))},_toggle:function(t,i){function s(){a.running=!1,a._trigger("activate",t,i)}function n(){i.newTab.closest("li").addClass("ui-tabs-active ui-state-active"),o.length&&a.options.show?a._show(o,a.options.show,s):(o.show(),s())}var a=this,o=i.newPanel,r=i.oldPanel;this.running=!0,r.length&&this.options.hide?this._hide(r,this.options.hide,function(){i.oldTab.closest("li").removeClass("ui-tabs-active ui-state-active"),n()}):(i.oldTab.closest("li").removeClass("ui-tabs-active ui-state-active"),r.hide(),n()),r.attr("aria-hidden","true"),i.oldTab.attr({"aria-selected":"false","aria-expanded":"false"}),o.length&&r.length?i.oldTab.attr("tabIndex",-1):o.length&&this.tabs.filter(function(){return 0===e(this).attr("tabIndex")}).attr("tabIndex",-1),o.attr("aria-hidden","false"),i.newTab.attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0})},_activate:function(t){var i,s=this._findActive(t);s[0]!==this.active[0]&&(s.length||(s=this.active),i=s.find(".ui-tabs-anchor")[0],this._eventHandler({target:i,currentTarget:i,preventDefault:e.noop}))},_findActive:function(t){return t===!1?e():this.tabs.eq(t)},_getIndex:function(e){return"string"==typeof e&&(e=this.anchors.index(this.anchors.filter("[href$='"+e+"']"))),e},_destroy:function(){this.xhr&&this.xhr.abort(),this.element.removeClass("ui-tabs ui-widget ui-widget-content ui-corner-all ui-tabs-collapsible"),this.tablist.removeClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all").removeAttr("role"),this.anchors.removeClass("ui-tabs-anchor").removeAttr("role").removeAttr("tabIndex").removeUniqueId(),this.tablist.unbind(this.eventNamespace),this.tabs.add(this.panels).each(function(){e.data(this,"ui-tabs-destroy")?e(this).remove():e(this).removeClass("ui-state-default ui-state-active ui-state-disabled ui-corner-top ui-corner-bottom ui-widget-content ui-tabs-active ui-tabs-panel").removeAttr("tabIndex").removeAttr("aria-live").removeAttr("aria-busy").removeAttr("aria-selected").removeAttr("aria-labelledby").removeAttr("aria-hidden").removeAttr("aria-expanded").removeAttr("role")}),this.tabs.each(function(){var t=e(this),i=t.data("ui-tabs-aria-controls");i?t.attr("aria-controls",i).removeData("ui-tabs-aria-controls"):t.removeAttr("aria-controls")}),this.panels.show(),"content"!==this.options.heightStyle&&this.panels.css("height","")},enable:function(t){var i=this.options.disabled;i!==!1&&(void 0===t?i=!1:(t=this._getIndex(t),i=e.isArray(i)?e.map(i,function(e){return e!==t?e:null}):e.map(this.tabs,function(e,i){return i!==t?i:null})),this._setupDisabled(i))},disable:function(t){var i=this.options.disabled;if(i!==!0){if(void 0===t)i=!0;else{if(t=this._getIndex(t),-1!==e.inArray(t,i))return;i=e.isArray(i)?e.merge([t],i).sort():[t]}this._setupDisabled(i)}},load:function(t,i){t=this._getIndex(t);var s=this,n=this.tabs.eq(t),a=n.find(".ui-tabs-anchor"),o=this._getPanelForTab(n),r={tab:n,panel:o},h=function(e,t){"abort"===t&&s.panels.stop(!1,!0),n.removeClass("ui-tabs-loading"),o.removeAttr("aria-busy"),e===s.xhr&&delete s.xhr};this._isLocal(a[0])||(this.xhr=e.ajax(this._ajaxSettings(a,i,r)),this.xhr&&"canceled"!==this.xhr.statusText&&(n.addClass("ui-tabs-loading"),o.attr("aria-busy","true"),this.xhr.done(function(e,t,n){setTimeout(function(){o.html(e),s._trigger("load",i,r),h(n,t)},1)}).fail(function(e,t){setTimeout(function(){h(e,t)},1)})))},_ajaxSettings:function(t,i,s){var n=this;return{url:t.attr("href"),beforeSend:function(t,a){return n._trigger("beforeLoad",i,e.extend({jqXHR:t,ajaxSettings:a},s))}}},_getPanelForTab:function(t){var i=e(t).attr("aria-controls");return this.element.find(this._sanitizeSelector("#"+i))}}),e.widget("ui.tooltip",{version:"1.11.4",options:{content:function(){var t=e(this).attr("title")||"";return e("<a>").text(t).html()},hide:!0,items:"[title]:not([disabled])",position:{my:"left top+15",at:"left bottom",collision:"flipfit flip"},show:!0,tooltipClass:null,track:!1,close:null,open:null},_addDescribedBy:function(t,i){var s=(t.attr("aria-describedby")||"").split(/\s+/);s.push(i),t.data("ui-tooltip-id",i).attr("aria-describedby",e.trim(s.join(" ")))},_removeDescribedBy:function(t){var i=t.data("ui-tooltip-id"),s=(t.attr("aria-describedby")||"").split(/\s+/),n=e.inArray(i,s);-1!==n&&s.splice(n,1),t.removeData("ui-tooltip-id"),s=e.trim(s.join(" ")),s?t.attr("aria-describedby",s):t.removeAttr("aria-describedby")},_create:function(){this._on({mouseover:"open",focusin:"open"}),this.tooltips={},this.parents={},this.options.disabled&&this._disable(),this.liveRegion=e("<div>").attr({role:"log","aria-live":"assertive","aria-relevant":"additions"}).addClass("ui-helper-hidden-accessible").appendTo(this.document[0].body)},_setOption:function(t,i){var s=this;return"disabled"===t?(this[i?"_disable":"_enable"](),this.options[t]=i,void 0):(this._super(t,i),"content"===t&&e.each(this.tooltips,function(e,t){s._updateContent(t.element)}),void 0)},_disable:function(){var t=this;e.each(this.tooltips,function(i,s){var n=e.Event("blur");n.target=n.currentTarget=s.element[0],t.close(n,!0)}),this.element.find(this.options.items).addBack().each(function(){var t=e(this);t.is("[title]")&&t.data("ui-tooltip-title",t.attr("title")).removeAttr("title")})},_enable:function(){this.element.find(this.options.items).addBack().each(function(){var t=e(this);t.data("ui-tooltip-title")&&t.attr("title",t.data("ui-tooltip-title"))})},open:function(t){var i=this,s=e(t?t.target:this.element).closest(this.options.items);s.length&&!s.data("ui-tooltip-id")&&(s.attr("title")&&s.data("ui-tooltip-title",s.attr("title")),s.data("ui-tooltip-open",!0),t&&"mouseover"===t.type&&s.parents().each(function(){var t,s=e(this);s.data("ui-tooltip-open")&&(t=e.Event("blur"),t.target=t.currentTarget=this,i.close(t,!0)),s.attr("title")&&(s.uniqueId(),i.parents[this.id]={element:this,title:s.attr("title")},s.attr("title",""))}),this._registerCloseHandlers(t,s),this._updateContent(s,t))},_updateContent:function(e,t){var i,s=this.options.content,n=this,a=t?t.type:null;return"string"==typeof s?this._open(t,e,s):(i=s.call(e[0],function(i){n._delay(function(){e.data("ui-tooltip-open")&&(t&&(t.type=a),this._open(t,e,i))})}),i&&this._open(t,e,i),void 0)},_open:function(t,i,s){function n(e){l.of=e,o.is(":hidden")||o.position(l)}var a,o,r,h,l=e.extend({},this.options.position);if(s){if(a=this._find(i))return a.tooltip.find(".ui-tooltip-content").html(s),void 0;i.is("[title]")&&(t&&"mouseover"===t.type?i.attr("title",""):i.removeAttr("title")),a=this._tooltip(i),o=a.tooltip,this._addDescribedBy(i,o.attr("id")),o.find(".ui-tooltip-content").html(s),this.liveRegion.children().hide(),s.clone?(h=s.clone(),h.removeAttr("id").find("[id]").removeAttr("id")):h=s,e("<div>").html(h).appendTo(this.liveRegion),this.options.track&&t&&/^mouse/.test(t.type)?(this._on(this.document,{mousemove:n}),n(t)):o.position(e.extend({of:i},this.options.position)),o.hide(),this._show(o,this.options.show),this.options.show&&this.options.show.delay&&(r=this.delayedShow=setInterval(function(){o.is(":visible")&&(n(l.of),clearInterval(r))},e.fx.interval)),this._trigger("open",t,{tooltip:o})}},_registerCloseHandlers:function(t,i){var s={keyup:function(t){if(t.keyCode===e.ui.keyCode.ESCAPE){var s=e.Event(t);s.currentTarget=i[0],this.close(s,!0)}}};i[0]!==this.element[0]&&(s.remove=function(){this._removeTooltip(this._find(i).tooltip)}),t&&"mouseover"!==t.type||(s.mouseleave="close"),t&&"focusin"!==t.type||(s.focusout="close"),this._on(!0,i,s)},close:function(t){var i,s=this,n=e(t?t.currentTarget:this.element),a=this._find(n);return a?(i=a.tooltip,a.closing||(clearInterval(this.delayedShow),n.data("ui-tooltip-title")&&!n.attr("title")&&n.attr("title",n.data("ui-tooltip-title")),this._removeDescribedBy(n),a.hiding=!0,i.stop(!0),this._hide(i,this.options.hide,function(){s._removeTooltip(e(this))}),n.removeData("ui-tooltip-open"),this._off(n,"mouseleave focusout keyup"),n[0]!==this.element[0]&&this._off(n,"remove"),this._off(this.document,"mousemove"),t&&"mouseleave"===t.type&&e.each(this.parents,function(t,i){e(i.element).attr("title",i.title),delete s.parents[t]}),a.closing=!0,this._trigger("close",t,{tooltip:i}),a.hiding||(a.closing=!1)),void 0):(n.removeData("ui-tooltip-open"),void 0)},_tooltip:function(t){var i=e("<div>").attr("role","tooltip").addClass("ui-tooltip ui-widget ui-corner-all ui-widget-content "+(this.options.tooltipClass||"")),s=i.uniqueId().attr("id");return e("<div>").addClass("ui-tooltip-content").appendTo(i),i.appendTo(this.document[0].body),this.tooltips[s]={element:t,tooltip:i}},_find:function(e){var t=e.data("ui-tooltip-id");return t?this.tooltips[t]:null},_removeTooltip:function(e){e.remove(),delete this.tooltips[e.attr("id")]},_destroy:function(){var t=this;e.each(this.tooltips,function(i,s){var n=e.Event("blur"),a=s.element;n.target=n.currentTarget=a[0],t.close(n,!0),e("#"+i).remove(),a.data("ui-tooltip-title")&&(a.attr("title")||a.attr("title",a.data("ui-tooltip-title")),a.removeData("ui-tooltip-title"))}),this.liveRegion.remove()}});var y="ui-effects-",b=e;e.effects={effect:{}},function(e,t){function i(e,t,i){var s=d[t.type]||{};return null==e?i||!t.def?null:t.def:(e=s.floor?~~e:parseFloat(e),isNaN(e)?t.def:s.mod?(e+s.mod)%s.mod:0>e?0:e>s.max?s.max:e)}function s(i){var s=l(),n=s._rgba=[];return i=i.toLowerCase(),f(h,function(e,a){var o,r=a.re.exec(i),h=r&&a.parse(r),l=a.space||"rgba";return h?(o=s[l](h),s[u[l].cache]=o[u[l].cache],n=s._rgba=o._rgba,!1):t}),n.length?("0,0,0,0"===n.join()&&e.extend(n,a.transparent),s):a[i]}function n(e,t,i){return i=(i+1)%1,1>6*i?e+6*(t-e)*i:1>2*i?t:2>3*i?e+6*(t-e)*(2/3-i):e}var a,o="backgroundColor borderBottomColor borderLeftColor borderRightColor borderTopColor color columnRuleColor outlineColor textDecorationColor textEmphasisColor",r=/^([\-+])=\s*(\d+\.?\d*)/,h=[{re:/rgba?\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,parse:function(e){return[e[1],e[2],e[3],e[4]]}},{re:/rgba?\(\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,parse:function(e){return[2.55*e[1],2.55*e[2],2.55*e[3],e[4]]}},{re:/#([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})/,parse:function(e){return[parseInt(e[1],16),parseInt(e[2],16),parseInt(e[3],16)]}},{re:/#([a-f0-9])([a-f0-9])([a-f0-9])/,parse:function(e){return[parseInt(e[1]+e[1],16),parseInt(e[2]+e[2],16),parseInt(e[3]+e[3],16)]}},{re:/hsla?\(\s*(\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,space:"hsla",parse:function(e){return[e[1],e[2]/100,e[3]/100,e[4]]}}],l=e.Color=function(t,i,s,n){return new e.Color.fn.parse(t,i,s,n)},u={rgba:{props:{red:{idx:0,type:"byte"},green:{idx:1,type:"byte"},blue:{idx:2,type:"byte"}}},hsla:{props:{hue:{idx:0,type:"degrees"},saturation:{idx:1,type:"percent"},lightness:{idx:2,type:"percent"}}}},d={"byte":{floor:!0,max:255},percent:{max:1},degrees:{mod:360,floor:!0}},c=l.support={},p=e("<p>")[0],f=e.each;p.style.cssText="background-color:rgba(1,1,1,.5)",c.rgba=p.style.backgroundColor.indexOf("rgba")>-1,f(u,function(e,t){t.cache="_"+e,t.props.alpha={idx:3,type:"percent",def:1}}),l.fn=e.extend(l.prototype,{parse:function(n,o,r,h){if(n===t)return this._rgba=[null,null,null,null],this;(n.jquery||n.nodeType)&&(n=e(n).css(o),o=t);var d=this,c=e.type(n),p=this._rgba=[];return o!==t&&(n=[n,o,r,h],c="array"),"string"===c?this.parse(s(n)||a._default):"array"===c?(f(u.rgba.props,function(e,t){p[t.idx]=i(n[t.idx],t)}),this):"object"===c?(n instanceof l?f(u,function(e,t){n[t.cache]&&(d[t.cache]=n[t.cache].slice())}):f(u,function(t,s){var a=s.cache;f(s.props,function(e,t){if(!d[a]&&s.to){if("alpha"===e||null==n[e])return;d[a]=s.to(d._rgba)}d[a][t.idx]=i(n[e],t,!0)}),d[a]&&0>e.inArray(null,d[a].slice(0,3))&&(d[a][3]=1,s.from&&(d._rgba=s.from(d[a])))}),this):t},is:function(e){var i=l(e),s=!0,n=this;return f(u,function(e,a){var o,r=i[a.cache];return r&&(o=n[a.cache]||a.to&&a.to(n._rgba)||[],f(a.props,function(e,i){return null!=r[i.idx]?s=r[i.idx]===o[i.idx]:t})),s}),s},_space:function(){var e=[],t=this;return f(u,function(i,s){t[s.cache]&&e.push(i)}),e.pop()},transition:function(e,t){var s=l(e),n=s._space(),a=u[n],o=0===this.alpha()?l("transparent"):this,r=o[a.cache]||a.to(o._rgba),h=r.slice();return s=s[a.cache],f(a.props,function(e,n){var a=n.idx,o=r[a],l=s[a],u=d[n.type]||{};null!==l&&(null===o?h[a]=l:(u.mod&&(l-o>u.mod/2?o+=u.mod:o-l>u.mod/2&&(o-=u.mod)),h[a]=i((l-o)*t+o,n)))}),this[n](h)},blend:function(t){if(1===this._rgba[3])return this;var i=this._rgba.slice(),s=i.pop(),n=l(t)._rgba;return l(e.map(i,function(e,t){return(1-s)*n[t]+s*e}))},toRgbaString:function(){var t="rgba(",i=e.map(this._rgba,function(e,t){return null==e?t>2?1:0:e});return 1===i[3]&&(i.pop(),t="rgb("),t+i.join()+")"},toHslaString:function(){var t="hsla(",i=e.map(this.hsla(),function(e,t){return null==e&&(e=t>2?1:0),t&&3>t&&(e=Math.round(100*e)+"%"),e});return 1===i[3]&&(i.pop(),t="hsl("),t+i.join()+")"},toHexString:function(t){var i=this._rgba.slice(),s=i.pop();return t&&i.push(~~(255*s)),"#"+e.map(i,function(e){return e=(e||0).toString(16),1===e.length?"0"+e:e}).join("")},toString:function(){return 0===this._rgba[3]?"transparent":this.toRgbaString()}}),l.fn.parse.prototype=l.fn,u.hsla.to=function(e){if(null==e[0]||null==e[1]||null==e[2])return[null,null,null,e[3]];var t,i,s=e[0]/255,n=e[1]/255,a=e[2]/255,o=e[3],r=Math.max(s,n,a),h=Math.min(s,n,a),l=r-h,u=r+h,d=.5*u;return t=h===r?0:s===r?60*(n-a)/l+360:n===r?60*(a-s)/l+120:60*(s-n)/l+240,i=0===l?0:.5>=d?l/u:l/(2-u),[Math.round(t)%360,i,d,null==o?1:o]},u.hsla.from=function(e){if(null==e[0]||null==e[1]||null==e[2])return[null,null,null,e[3]];var t=e[0]/360,i=e[1],s=e[2],a=e[3],o=.5>=s?s*(1+i):s+i-s*i,r=2*s-o;return[Math.round(255*n(r,o,t+1/3)),Math.round(255*n(r,o,t)),Math.round(255*n(r,o,t-1/3)),a]},f(u,function(s,n){var a=n.props,o=n.cache,h=n.to,u=n.from;l.fn[s]=function(s){if(h&&!this[o]&&(this[o]=h(this._rgba)),s===t)return this[o].slice();var n,r=e.type(s),d="array"===r||"object"===r?s:arguments,c=this[o].slice();return f(a,function(e,t){var s=d["object"===r?e:t.idx];null==s&&(s=c[t.idx]),c[t.idx]=i(s,t)}),u?(n=l(u(c)),n[o]=c,n):l(c)},f(a,function(t,i){l.fn[t]||(l.fn[t]=function(n){var a,o=e.type(n),h="alpha"===t?this._hsla?"hsla":"rgba":s,l=this[h](),u=l[i.idx];return"undefined"===o?u:("function"===o&&(n=n.call(this,u),o=e.type(n)),null==n&&i.empty?this:("string"===o&&(a=r.exec(n),a&&(n=u+parseFloat(a[2])*("+"===a[1]?1:-1))),l[i.idx]=n,this[h](l)))})})}),l.hook=function(t){var i=t.split(" ");f(i,function(t,i){e.cssHooks[i]={set:function(t,n){var a,o,r="";if("transparent"!==n&&("string"!==e.type(n)||(a=s(n)))){if(n=l(a||n),!c.rgba&&1!==n._rgba[3]){for(o="backgroundColor"===i?t.parentNode:t;(""===r||"transparent"===r)&&o&&o.style;)try{r=e.css(o,"backgroundColor"),o=o.parentNode}catch(h){}n=n.blend(r&&"transparent"!==r?r:"_default")}n=n.toRgbaString()}try{t.style[i]=n}catch(h){}}},e.fx.step[i]=function(t){t.colorInit||(t.start=l(t.elem,i),t.end=l(t.end),t.colorInit=!0),e.cssHooks[i].set(t.elem,t.start.transition(t.end,t.pos))}})},l.hook(o),e.cssHooks.borderColor={expand:function(e){var t={};return f(["Top","Right","Bottom","Left"],function(i,s){t["border"+s+"Color"]=e}),t}},a=e.Color.names={aqua:"#00ffff",black:"#000000",blue:"#0000ff",fuchsia:"#ff00ff",gray:"#808080",green:"#008000",lime:"#00ff00",maroon:"#800000",navy:"#000080",olive:"#808000",purple:"#800080",red:"#ff0000",silver:"#c0c0c0",teal:"#008080",white:"#ffffff",yellow:"#ffff00",transparent:[null,null,null,0],_default:"#ffffff"}}(b),function(){function t(t){var i,s,n=t.ownerDocument.defaultView?t.ownerDocument.defaultView.getComputedStyle(t,null):t.currentStyle,a={};if(n&&n.length&&n[0]&&n[n[0]])for(s=n.length;s--;)i=n[s],"string"==typeof n[i]&&(a[e.camelCase(i)]=n[i]);else for(i in n)"string"==typeof n[i]&&(a[i]=n[i]);return a}function i(t,i){var s,a,o={};for(s in i)a=i[s],t[s]!==a&&(n[s]||(e.fx.step[s]||!isNaN(parseFloat(a)))&&(o[s]=a));return o}var s=["add","remove","toggle"],n={border:1,borderBottom:1,borderColor:1,borderLeft:1,borderRight:1,borderTop:1,borderWidth:1,margin:1,padding:1};e.each(["borderLeftStyle","borderRightStyle","borderBottomStyle","borderTopStyle"],function(t,i){e.fx.step[i]=function(e){("none"!==e.end&&!e.setAttr||1===e.pos&&!e.setAttr)&&(b.style(e.elem,i,e.end),e.setAttr=!0)}}),e.fn.addBack||(e.fn.addBack=function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}),e.effects.animateClass=function(n,a,o,r){var h=e.speed(a,o,r);return this.queue(function(){var a,o=e(this),r=o.attr("class")||"",l=h.children?o.find("*").addBack():o;l=l.map(function(){var i=e(this);return{el:i,start:t(this)}}),a=function(){e.each(s,function(e,t){n[t]&&o[t+"Class"](n[t])})},a(),l=l.map(function(){return this.end=t(this.el[0]),this.diff=i(this.start,this.end),this}),o.attr("class",r),l=l.map(function(){var t=this,i=e.Deferred(),s=e.extend({},h,{queue:!1,complete:function(){i.resolve(t)}});return this.el.animate(this.diff,s),i.promise()}),e.when.apply(e,l.get()).done(function(){a(),e.each(arguments,function(){var t=this.el;e.each(this.diff,function(e){t.css(e,"")})}),h.complete.call(o[0])})})},e.fn.extend({addClass:function(t){return function(i,s,n,a){return s?e.effects.animateClass.call(this,{add:i},s,n,a):t.apply(this,arguments)}}(e.fn.addClass),removeClass:function(t){return function(i,s,n,a){return arguments.length>1?e.effects.animateClass.call(this,{remove:i},s,n,a):t.apply(this,arguments)}}(e.fn.removeClass),toggleClass:function(t){return function(i,s,n,a,o){return"boolean"==typeof s||void 0===s?n?e.effects.animateClass.call(this,s?{add:i}:{remove:i},n,a,o):t.apply(this,arguments):e.effects.animateClass.call(this,{toggle:i},s,n,a)}}(e.fn.toggleClass),switchClass:function(t,i,s,n,a){return e.effects.animateClass.call(this,{add:i,remove:t},s,n,a)}})}(),function(){function t(t,i,s,n){return e.isPlainObject(t)&&(i=t,t=t.effect),t={effect:t},null==i&&(i={}),e.isFunction(i)&&(n=i,s=null,i={}),("number"==typeof i||e.fx.speeds[i])&&(n=s,s=i,i={}),e.isFunction(s)&&(n=s,s=null),i&&e.extend(t,i),s=s||i.duration,t.duration=e.fx.off?0:"number"==typeof s?s:s in e.fx.speeds?e.fx.speeds[s]:e.fx.speeds._default,t.complete=n||i.complete,t}function i(t){return!t||"number"==typeof t||e.fx.speeds[t]?!0:"string"!=typeof t||e.effects.effect[t]?e.isFunction(t)?!0:"object"!=typeof t||t.effect?!1:!0:!0}e.extend(e.effects,{version:"1.11.4",save:function(e,t){for(var i=0;t.length>i;i++)null!==t[i]&&e.data(y+t[i],e[0].style[t[i]])},restore:function(e,t){var i,s;for(s=0;t.length>s;s++)null!==t[s]&&(i=e.data(y+t[s]),void 0===i&&(i=""),e.css(t[s],i))},setMode:function(e,t){return"toggle"===t&&(t=e.is(":hidden")?"show":"hide"),t},getBaseline:function(e,t){var i,s;switch(e[0]){case"top":i=0;break;case"middle":i=.5;break;case"bottom":i=1;break;default:i=e[0]/t.height}switch(e[1]){case"left":s=0;break;case"center":s=.5;break;case"right":s=1;break;default:s=e[1]/t.width}return{x:s,y:i}},createWrapper:function(t){if(t.parent().is(".ui-effects-wrapper"))return t.parent();var i={width:t.outerWidth(!0),height:t.outerHeight(!0),"float":t.css("float")},s=e("<div></div>").addClass("ui-effects-wrapper").css({fontSize:"100%",background:"transparent",border:"none",margin:0,padding:0}),n={width:t.width(),height:t.height()},a=document.activeElement;try{a.id}catch(o){a=document.body}return t.wrap(s),(t[0]===a||e.contains(t[0],a))&&e(a).focus(),s=t.parent(),"static"===t.css("position")?(s.css({position:"relative"}),t.css({position:"relative"})):(e.extend(i,{position:t.css("position"),zIndex:t.css("z-index")}),e.each(["top","left","bottom","right"],function(e,s){i[s]=t.css(s),isNaN(parseInt(i[s],10))&&(i[s]="auto")}),t.css({position:"relative",top:0,left:0,right:"auto",bottom:"auto"})),t.css(n),s.css(i).show()},removeWrapper:function(t){var i=document.activeElement;
-return t.parent().is(".ui-effects-wrapper")&&(t.parent().replaceWith(t),(t[0]===i||e.contains(t[0],i))&&e(i).focus()),t},setTransition:function(t,i,s,n){return n=n||{},e.each(i,function(e,i){var a=t.cssUnit(i);a[0]>0&&(n[i]=a[0]*s+a[1])}),n}}),e.fn.extend({effect:function(){function i(t){function i(){e.isFunction(a)&&a.call(n[0]),e.isFunction(t)&&t()}var n=e(this),a=s.complete,r=s.mode;(n.is(":hidden")?"hide"===r:"show"===r)?(n[r](),i()):o.call(n[0],s,i)}var s=t.apply(this,arguments),n=s.mode,a=s.queue,o=e.effects.effect[s.effect];return e.fx.off||!o?n?this[n](s.duration,s.complete):this.each(function(){s.complete&&s.complete.call(this)}):a===!1?this.each(i):this.queue(a||"fx",i)},show:function(e){return function(s){if(i(s))return e.apply(this,arguments);var n=t.apply(this,arguments);return n.mode="show",this.effect.call(this,n)}}(e.fn.show),hide:function(e){return function(s){if(i(s))return e.apply(this,arguments);var n=t.apply(this,arguments);return n.mode="hide",this.effect.call(this,n)}}(e.fn.hide),toggle:function(e){return function(s){if(i(s)||"boolean"==typeof s)return e.apply(this,arguments);var n=t.apply(this,arguments);return n.mode="toggle",this.effect.call(this,n)}}(e.fn.toggle),cssUnit:function(t){var i=this.css(t),s=[];return e.each(["em","px","%","pt"],function(e,t){i.indexOf(t)>0&&(s=[parseFloat(i),t])}),s}})}(),function(){var t={};e.each(["Quad","Cubic","Quart","Quint","Expo"],function(e,i){t[i]=function(t){return Math.pow(t,e+2)}}),e.extend(t,{Sine:function(e){return 1-Math.cos(e*Math.PI/2)},Circ:function(e){return 1-Math.sqrt(1-e*e)},Elastic:function(e){return 0===e||1===e?e:-Math.pow(2,8*(e-1))*Math.sin((80*(e-1)-7.5)*Math.PI/15)},Back:function(e){return e*e*(3*e-2)},Bounce:function(e){for(var t,i=4;((t=Math.pow(2,--i))-1)/11>e;);return 1/Math.pow(4,3-i)-7.5625*Math.pow((3*t-2)/22-e,2)}}),e.each(t,function(t,i){e.easing["easeIn"+t]=i,e.easing["easeOut"+t]=function(e){return 1-i(1-e)},e.easing["easeInOut"+t]=function(e){return.5>e?i(2*e)/2:1-i(-2*e+2)/2}})}(),e.effects,e.effects.effect.blind=function(t,i){var s,n,a,o=e(this),r=/up|down|vertical/,h=/up|left|vertical|horizontal/,l=["position","top","bottom","left","right","height","width"],u=e.effects.setMode(o,t.mode||"hide"),d=t.direction||"up",c=r.test(d),p=c?"height":"width",f=c?"top":"left",m=h.test(d),g={},v="show"===u;o.parent().is(".ui-effects-wrapper")?e.effects.save(o.parent(),l):e.effects.save(o,l),o.show(),s=e.effects.createWrapper(o).css({overflow:"hidden"}),n=s[p](),a=parseFloat(s.css(f))||0,g[p]=v?n:0,m||(o.css(c?"bottom":"right",0).css(c?"top":"left","auto").css({position:"absolute"}),g[f]=v?a:n+a),v&&(s.css(p,0),m||s.css(f,a+n)),s.animate(g,{duration:t.duration,easing:t.easing,queue:!1,complete:function(){"hide"===u&&o.hide(),e.effects.restore(o,l),e.effects.removeWrapper(o),i()}})},e.effects.effect.bounce=function(t,i){var s,n,a,o=e(this),r=["position","top","bottom","left","right","height","width"],h=e.effects.setMode(o,t.mode||"effect"),l="hide"===h,u="show"===h,d=t.direction||"up",c=t.distance,p=t.times||5,f=2*p+(u||l?1:0),m=t.duration/f,g=t.easing,v="up"===d||"down"===d?"top":"left",y="up"===d||"left"===d,b=o.queue(),_=b.length;for((u||l)&&r.push("opacity"),e.effects.save(o,r),o.show(),e.effects.createWrapper(o),c||(c=o["top"===v?"outerHeight":"outerWidth"]()/3),u&&(a={opacity:1},a[v]=0,o.css("opacity",0).css(v,y?2*-c:2*c).animate(a,m,g)),l&&(c/=Math.pow(2,p-1)),a={},a[v]=0,s=0;p>s;s++)n={},n[v]=(y?"-=":"+=")+c,o.animate(n,m,g).animate(a,m,g),c=l?2*c:c/2;l&&(n={opacity:0},n[v]=(y?"-=":"+=")+c,o.animate(n,m,g)),o.queue(function(){l&&o.hide(),e.effects.restore(o,r),e.effects.removeWrapper(o),i()}),_>1&&b.splice.apply(b,[1,0].concat(b.splice(_,f+1))),o.dequeue()},e.effects.effect.clip=function(t,i){var s,n,a,o=e(this),r=["position","top","bottom","left","right","height","width"],h=e.effects.setMode(o,t.mode||"hide"),l="show"===h,u=t.direction||"vertical",d="vertical"===u,c=d?"height":"width",p=d?"top":"left",f={};e.effects.save(o,r),o.show(),s=e.effects.createWrapper(o).css({overflow:"hidden"}),n="IMG"===o[0].tagName?s:o,a=n[c](),l&&(n.css(c,0),n.css(p,a/2)),f[c]=l?a:0,f[p]=l?0:a/2,n.animate(f,{queue:!1,duration:t.duration,easing:t.easing,complete:function(){l||o.hide(),e.effects.restore(o,r),e.effects.removeWrapper(o),i()}})},e.effects.effect.drop=function(t,i){var s,n=e(this),a=["position","top","bottom","left","right","opacity","height","width"],o=e.effects.setMode(n,t.mode||"hide"),r="show"===o,h=t.direction||"left",l="up"===h||"down"===h?"top":"left",u="up"===h||"left"===h?"pos":"neg",d={opacity:r?1:0};e.effects.save(n,a),n.show(),e.effects.createWrapper(n),s=t.distance||n["top"===l?"outerHeight":"outerWidth"](!0)/2,r&&n.css("opacity",0).css(l,"pos"===u?-s:s),d[l]=(r?"pos"===u?"+=":"-=":"pos"===u?"-=":"+=")+s,n.animate(d,{queue:!1,duration:t.duration,easing:t.easing,complete:function(){"hide"===o&&n.hide(),e.effects.restore(n,a),e.effects.removeWrapper(n),i()}})},e.effects.effect.explode=function(t,i){function s(){b.push(this),b.length===d*c&&n()}function n(){p.css({visibility:"visible"}),e(b).remove(),m||p.hide(),i()}var a,o,r,h,l,u,d=t.pieces?Math.round(Math.sqrt(t.pieces)):3,c=d,p=e(this),f=e.effects.setMode(p,t.mode||"hide"),m="show"===f,g=p.show().css("visibility","hidden").offset(),v=Math.ceil(p.outerWidth()/c),y=Math.ceil(p.outerHeight()/d),b=[];for(a=0;d>a;a++)for(h=g.top+a*y,u=a-(d-1)/2,o=0;c>o;o++)r=g.left+o*v,l=o-(c-1)/2,p.clone().appendTo("body").wrap("<div></div>").css({position:"absolute",visibility:"visible",left:-o*v,top:-a*y}).parent().addClass("ui-effects-explode").css({position:"absolute",overflow:"hidden",width:v,height:y,left:r+(m?l*v:0),top:h+(m?u*y:0),opacity:m?0:1}).animate({left:r+(m?0:l*v),top:h+(m?0:u*y),opacity:m?1:0},t.duration||500,t.easing,s)},e.effects.effect.fade=function(t,i){var s=e(this),n=e.effects.setMode(s,t.mode||"toggle");s.animate({opacity:n},{queue:!1,duration:t.duration,easing:t.easing,complete:i})},e.effects.effect.fold=function(t,i){var s,n,a=e(this),o=["position","top","bottom","left","right","height","width"],r=e.effects.setMode(a,t.mode||"hide"),h="show"===r,l="hide"===r,u=t.size||15,d=/([0-9]+)%/.exec(u),c=!!t.horizFirst,p=h!==c,f=p?["width","height"]:["height","width"],m=t.duration/2,g={},v={};e.effects.save(a,o),a.show(),s=e.effects.createWrapper(a).css({overflow:"hidden"}),n=p?[s.width(),s.height()]:[s.height(),s.width()],d&&(u=parseInt(d[1],10)/100*n[l?0:1]),h&&s.css(c?{height:0,width:u}:{height:u,width:0}),g[f[0]]=h?n[0]:u,v[f[1]]=h?n[1]:0,s.animate(g,m,t.easing).animate(v,m,t.easing,function(){l&&a.hide(),e.effects.restore(a,o),e.effects.removeWrapper(a),i()})},e.effects.effect.highlight=function(t,i){var s=e(this),n=["backgroundImage","backgroundColor","opacity"],a=e.effects.setMode(s,t.mode||"show"),o={backgroundColor:s.css("backgroundColor")};"hide"===a&&(o.opacity=0),e.effects.save(s,n),s.show().css({backgroundImage:"none",backgroundColor:t.color||"#ffff99"}).animate(o,{queue:!1,duration:t.duration,easing:t.easing,complete:function(){"hide"===a&&s.hide(),e.effects.restore(s,n),i()}})},e.effects.effect.size=function(t,i){var s,n,a,o=e(this),r=["position","top","bottom","left","right","width","height","overflow","opacity"],h=["position","top","bottom","left","right","overflow","opacity"],l=["width","height","overflow"],u=["fontSize"],d=["borderTopWidth","borderBottomWidth","paddingTop","paddingBottom"],c=["borderLeftWidth","borderRightWidth","paddingLeft","paddingRight"],p=e.effects.setMode(o,t.mode||"effect"),f=t.restore||"effect"!==p,m=t.scale||"both",g=t.origin||["middle","center"],v=o.css("position"),y=f?r:h,b={height:0,width:0,outerHeight:0,outerWidth:0};"show"===p&&o.show(),s={height:o.height(),width:o.width(),outerHeight:o.outerHeight(),outerWidth:o.outerWidth()},"toggle"===t.mode&&"show"===p?(o.from=t.to||b,o.to=t.from||s):(o.from=t.from||("show"===p?b:s),o.to=t.to||("hide"===p?b:s)),a={from:{y:o.from.height/s.height,x:o.from.width/s.width},to:{y:o.to.height/s.height,x:o.to.width/s.width}},("box"===m||"both"===m)&&(a.from.y!==a.to.y&&(y=y.concat(d),o.from=e.effects.setTransition(o,d,a.from.y,o.from),o.to=e.effects.setTransition(o,d,a.to.y,o.to)),a.from.x!==a.to.x&&(y=y.concat(c),o.from=e.effects.setTransition(o,c,a.from.x,o.from),o.to=e.effects.setTransition(o,c,a.to.x,o.to))),("content"===m||"both"===m)&&a.from.y!==a.to.y&&(y=y.concat(u).concat(l),o.from=e.effects.setTransition(o,u,a.from.y,o.from),o.to=e.effects.setTransition(o,u,a.to.y,o.to)),e.effects.save(o,y),o.show(),e.effects.createWrapper(o),o.css("overflow","hidden").css(o.from),g&&(n=e.effects.getBaseline(g,s),o.from.top=(s.outerHeight-o.outerHeight())*n.y,o.from.left=(s.outerWidth-o.outerWidth())*n.x,o.to.top=(s.outerHeight-o.to.outerHeight)*n.y,o.to.left=(s.outerWidth-o.to.outerWidth)*n.x),o.css(o.from),("content"===m||"both"===m)&&(d=d.concat(["marginTop","marginBottom"]).concat(u),c=c.concat(["marginLeft","marginRight"]),l=r.concat(d).concat(c),o.find("*[width]").each(function(){var i=e(this),s={height:i.height(),width:i.width(),outerHeight:i.outerHeight(),outerWidth:i.outerWidth()};f&&e.effects.save(i,l),i.from={height:s.height*a.from.y,width:s.width*a.from.x,outerHeight:s.outerHeight*a.from.y,outerWidth:s.outerWidth*a.from.x},i.to={height:s.height*a.to.y,width:s.width*a.to.x,outerHeight:s.height*a.to.y,outerWidth:s.width*a.to.x},a.from.y!==a.to.y&&(i.from=e.effects.setTransition(i,d,a.from.y,i.from),i.to=e.effects.setTransition(i,d,a.to.y,i.to)),a.from.x!==a.to.x&&(i.from=e.effects.setTransition(i,c,a.from.x,i.from),i.to=e.effects.setTransition(i,c,a.to.x,i.to)),i.css(i.from),i.animate(i.to,t.duration,t.easing,function(){f&&e.effects.restore(i,l)})})),o.animate(o.to,{queue:!1,duration:t.duration,easing:t.easing,complete:function(){0===o.to.opacity&&o.css("opacity",o.from.opacity),"hide"===p&&o.hide(),e.effects.restore(o,y),f||("static"===v?o.css({position:"relative",top:o.to.top,left:o.to.left}):e.each(["top","left"],function(e,t){o.css(t,function(t,i){var s=parseInt(i,10),n=e?o.to.left:o.to.top;return"auto"===i?n+"px":s+n+"px"})})),e.effects.removeWrapper(o),i()}})},e.effects.effect.scale=function(t,i){var s=e(this),n=e.extend(!0,{},t),a=e.effects.setMode(s,t.mode||"effect"),o=parseInt(t.percent,10)||(0===parseInt(t.percent,10)?0:"hide"===a?0:100),r=t.direction||"both",h=t.origin,l={height:s.height(),width:s.width(),outerHeight:s.outerHeight(),outerWidth:s.outerWidth()},u={y:"horizontal"!==r?o/100:1,x:"vertical"!==r?o/100:1};n.effect="size",n.queue=!1,n.complete=i,"effect"!==a&&(n.origin=h||["middle","center"],n.restore=!0),n.from=t.from||("show"===a?{height:0,width:0,outerHeight:0,outerWidth:0}:l),n.to={height:l.height*u.y,width:l.width*u.x,outerHeight:l.outerHeight*u.y,outerWidth:l.outerWidth*u.x},n.fade&&("show"===a&&(n.from.opacity=0,n.to.opacity=1),"hide"===a&&(n.from.opacity=1,n.to.opacity=0)),s.effect(n)},e.effects.effect.puff=function(t,i){var s=e(this),n=e.effects.setMode(s,t.mode||"hide"),a="hide"===n,o=parseInt(t.percent,10)||150,r=o/100,h={height:s.height(),width:s.width(),outerHeight:s.outerHeight(),outerWidth:s.outerWidth()};e.extend(t,{effect:"scale",queue:!1,fade:!0,mode:n,complete:i,percent:a?o:100,from:a?h:{height:h.height*r,width:h.width*r,outerHeight:h.outerHeight*r,outerWidth:h.outerWidth*r}}),s.effect(t)},e.effects.effect.pulsate=function(t,i){var s,n=e(this),a=e.effects.setMode(n,t.mode||"show"),o="show"===a,r="hide"===a,h=o||"hide"===a,l=2*(t.times||5)+(h?1:0),u=t.duration/l,d=0,c=n.queue(),p=c.length;for((o||!n.is(":visible"))&&(n.css("opacity",0).show(),d=1),s=1;l>s;s++)n.animate({opacity:d},u,t.easing),d=1-d;n.animate({opacity:d},u,t.easing),n.queue(function(){r&&n.hide(),i()}),p>1&&c.splice.apply(c,[1,0].concat(c.splice(p,l+1))),n.dequeue()},e.effects.effect.shake=function(t,i){var s,n=e(this),a=["position","top","bottom","left","right","height","width"],o=e.effects.setMode(n,t.mode||"effect"),r=t.direction||"left",h=t.distance||20,l=t.times||3,u=2*l+1,d=Math.round(t.duration/u),c="up"===r||"down"===r?"top":"left",p="up"===r||"left"===r,f={},m={},g={},v=n.queue(),y=v.length;for(e.effects.save(n,a),n.show(),e.effects.createWrapper(n),f[c]=(p?"-=":"+=")+h,m[c]=(p?"+=":"-=")+2*h,g[c]=(p?"-=":"+=")+2*h,n.animate(f,d,t.easing),s=1;l>s;s++)n.animate(m,d,t.easing).animate(g,d,t.easing);n.animate(m,d,t.easing).animate(f,d/2,t.easing).queue(function(){"hide"===o&&n.hide(),e.effects.restore(n,a),e.effects.removeWrapper(n),i()}),y>1&&v.splice.apply(v,[1,0].concat(v.splice(y,u+1))),n.dequeue()},e.effects.effect.slide=function(t,i){var s,n=e(this),a=["position","top","bottom","left","right","width","height"],o=e.effects.setMode(n,t.mode||"show"),r="show"===o,h=t.direction||"left",l="up"===h||"down"===h?"top":"left",u="up"===h||"left"===h,d={};e.effects.save(n,a),n.show(),s=t.distance||n["top"===l?"outerHeight":"outerWidth"](!0),e.effects.createWrapper(n).css({overflow:"hidden"}),r&&n.css(l,u?isNaN(s)?"-"+s:-s:s),d[l]=(r?u?"+=":"-=":u?"-=":"+=")+s,n.animate(d,{queue:!1,duration:t.duration,easing:t.easing,complete:function(){"hide"===o&&n.hide(),e.effects.restore(n,a),e.effects.removeWrapper(n),i()}})},e.effects.effect.transfer=function(t,i){var s=e(this),n=e(t.to),a="fixed"===n.css("position"),o=e("body"),r=a?o.scrollTop():0,h=a?o.scrollLeft():0,l=n.offset(),u={top:l.top-r,left:l.left-h,height:n.innerHeight(),width:n.innerWidth()},d=s.offset(),c=e("<div class='ui-effects-transfer'></div>").appendTo(document.body).addClass(t.className).css({top:d.top-r,left:d.left-h,height:s.innerHeight(),width:s.innerWidth(),position:a?"fixed":"absolute"}).animate(u,t.duration,t.easing,function(){c.remove(),i()})}});
\ No newline at end of file
diff --git a/#pma/js/jquery/jquery-ui-timepicker-addon.js b/#pma/js/jquery/jquery-ui-timepicker-addon.js
deleted file mode 100644
index 0baae3e7..00000000
--- a/#pma/js/jquery/jquery-ui-timepicker-addon.js
+++ /dev/null
@@ -1,2223 +0,0 @@
-/*! jQuery Timepicker Addon - v1.5.0 - 2014-09-01
-* http://trentrichardson.com/examples/timepicker
-* Copyright (c) 2014 Trent Richardson; Licensed MIT */
-(function ($) {
-
-	/*
-	* Lets not redefine timepicker, Prevent "Uncaught RangeError: Maximum call stack size exceeded"
-	*/
-	$.ui.timepicker = $.ui.timepicker || {};
-	if ($.ui.timepicker.version) {
-		return;
-	}
-
-	/*
-	* Extend jQueryUI, get it started with our version number
-	*/
-	$.extend($.ui, {
-		timepicker: {
-			version: "1.5.0"
-		}
-	});
-
-	/* 
-	* Timepicker manager.
-	* Use the singleton instance of this class, $.timepicker, to interact with the time picker.
-	* Settings for (groups of) time pickers are maintained in an instance object,
-	* allowing multiple different settings on the same page.
-	*/
-	var Timepicker = function () {
-		this.regional = []; // Available regional settings, indexed by language code
-		this.regional[''] = { // Default regional settings
-			currentText: 'Now',
-			closeText: 'Done',
-			amNames: ['AM', 'A'],
-			pmNames: ['PM', 'P'],
-			timeFormat: 'HH:mm',
-			timeSuffix: '',
-			timeOnlyTitle: 'Choose Time',
-			timeText: 'Time',
-			hourText: 'Hour',
-			minuteText: 'Minute',
-			secondText: 'Second',
-			millisecText: 'Millisecond',
-			microsecText: 'Microsecond',
-			timezoneText: 'Time Zone',
-			isRTL: false
-		};
-		this._defaults = { // Global defaults for all the datetime picker instances
-			showButtonPanel: true,
-			timeOnly: false,
-			timeOnlyShowDate: false,
-			showHour: null,
-			showMinute: null,
-			showSecond: null,
-			showMillisec: null,
-			showMicrosec: null,
-			showTimezone: null,
-			showTime: true,
-			stepHour: 1,
-			stepMinute: 1,
-			stepSecond: 1,
-			stepMillisec: 1,
-			stepMicrosec: 1,
-			hour: 0,
-			minute: 0,
-			second: 0,
-			millisec: 0,
-			microsec: 0,
-			timezone: null,
-			hourMin: 0,
-			minuteMin: 0,
-			secondMin: 0,
-			millisecMin: 0,
-			microsecMin: 0,
-			hourMax: 23,
-			minuteMax: 59,
-			secondMax: 59,
-			millisecMax: 999,
-			microsecMax: 999,
-			minDateTime: null,
-			maxDateTime: null,
-			maxTime: null,
-			minTime: null,
-			onSelect: null,
-			hourGrid: 0,
-			minuteGrid: 0,
-			secondGrid: 0,
-			millisecGrid: 0,
-			microsecGrid: 0,
-			alwaysSetTime: true,
-			separator: ' ',
-			altFieldTimeOnly: true,
-			altTimeFormat: null,
-			altSeparator: null,
-			altTimeSuffix: null,
-			altRedirectFocus: true,
-			pickerTimeFormat: null,
-			pickerTimeSuffix: null,
-			showTimepicker: true,
-			timezoneList: null,
-			addSliderAccess: false,
-			sliderAccessArgs: null,
-			controlType: 'slider',
-			defaultValue: null,
-			parse: 'strict'
-		};
-		$.extend(this._defaults, this.regional['']);
-	};
-
-	$.extend(Timepicker.prototype, {
-		$input: null,
-		$altInput: null,
-		$timeObj: null,
-		inst: null,
-		hour_slider: null,
-		minute_slider: null,
-		second_slider: null,
-		millisec_slider: null,
-		microsec_slider: null,
-		timezone_select: null,
-		maxTime: null,
-		minTime: null,
-		hour: 0,
-		minute: 0,
-		second: 0,
-		millisec: 0,
-		microsec: 0,
-		timezone: null,
-		hourMinOriginal: null,
-		minuteMinOriginal: null,
-		secondMinOriginal: null,
-		millisecMinOriginal: null,
-		microsecMinOriginal: null,
-		hourMaxOriginal: null,
-		minuteMaxOriginal: null,
-		secondMaxOriginal: null,
-		millisecMaxOriginal: null,
-		microsecMaxOriginal: null,
-		ampm: '',
-		formattedDate: '',
-		formattedTime: '',
-		formattedDateTime: '',
-		timezoneList: null,
-		units: ['hour', 'minute', 'second', 'millisec', 'microsec'],
-		support: {},
-		control: null,
-
-		/* 
-		* Override the default settings for all instances of the time picker.
-		* @param  {Object} settings  object - the new settings to use as defaults (anonymous object)
-		* @return {Object} the manager object
-		*/
-		setDefaults: function (settings) {
-			extendRemove(this._defaults, settings || {});
-			return this;
-		},
-
-		/*
-		* Create a new Timepicker instance
-		*/
-		_newInst: function ($input, opts) {
-			var tp_inst = new Timepicker(),
-				inlineSettings = {},
-				fns = {},
-				overrides, i;
-
-			for (var attrName in this._defaults) {
-				if (this._defaults.hasOwnProperty(attrName)) {
-					var attrValue = $input.attr('time:' + attrName);
-					if (attrValue) {
-						try {
-							inlineSettings[attrName] = eval(attrValue);
-						} catch (err) {
-							inlineSettings[attrName] = attrValue;
-						}
-					}
-				}
-			}
-
-			overrides = {
-				beforeShow: function (input, dp_inst) {
-					if ($.isFunction(tp_inst._defaults.evnts.beforeShow)) {
-						return tp_inst._defaults.evnts.beforeShow.call($input[0], input, dp_inst, tp_inst);
-					}
-				},
-				onChangeMonthYear: function (year, month, dp_inst) {
-					// Update the time as well : this prevents the time from disappearing from the $input field.
-					tp_inst._updateDateTime(dp_inst);
-					if ($.isFunction(tp_inst._defaults.evnts.onChangeMonthYear)) {
-						tp_inst._defaults.evnts.onChangeMonthYear.call($input[0], year, month, dp_inst, tp_inst);
-					}
-				},
-				onClose: function (dateText, dp_inst) {
-					if (tp_inst.timeDefined === true && $input.val() !== '') {
-						tp_inst._updateDateTime(dp_inst);
-					}
-					if ($.isFunction(tp_inst._defaults.evnts.onClose)) {
-						tp_inst._defaults.evnts.onClose.call($input[0], dateText, dp_inst, tp_inst);
-					}
-				}
-			};
-			for (i in overrides) {
-				if (overrides.hasOwnProperty(i)) {
-					fns[i] = opts[i] || null;
-				}
-			}
-
-			tp_inst._defaults = $.extend({}, this._defaults, inlineSettings, opts, overrides, {
-				evnts: fns,
-				timepicker: tp_inst // add timepicker as a property of datepicker: $.datepicker._get(dp_inst, 'timepicker');
-			});
-			tp_inst.amNames = $.map(tp_inst._defaults.amNames, function (val) {
-				return val.toUpperCase();
-			});
-			tp_inst.pmNames = $.map(tp_inst._defaults.pmNames, function (val) {
-				return val.toUpperCase();
-			});
-
-			// detect which units are supported
-			tp_inst.support = detectSupport(
-					tp_inst._defaults.timeFormat + 
-					(tp_inst._defaults.pickerTimeFormat ? tp_inst._defaults.pickerTimeFormat : '') +
-					(tp_inst._defaults.altTimeFormat ? tp_inst._defaults.altTimeFormat : ''));
-
-			// controlType is string - key to our this._controls
-			if (typeof(tp_inst._defaults.controlType) === 'string') {
-				if (tp_inst._defaults.controlType === 'slider' && typeof($.ui.slider) === 'undefined') {
-					tp_inst._defaults.controlType = 'select';
-				}
-				tp_inst.control = tp_inst._controls[tp_inst._defaults.controlType];
-			}
-			// controlType is an object and must implement create, options, value methods
-			else {
-				tp_inst.control = tp_inst._defaults.controlType;
-			}
-
-			// prep the timezone options
-			var timezoneList = [-720, -660, -600, -570, -540, -480, -420, -360, -300, -270, -240, -210, -180, -120, -60,
-					0, 60, 120, 180, 210, 240, 270, 300, 330, 345, 360, 390, 420, 480, 525, 540, 570, 600, 630, 660, 690, 720, 765, 780, 840];
-			if (tp_inst._defaults.timezoneList !== null) {
-				timezoneList = tp_inst._defaults.timezoneList;
-			}
-			var tzl = timezoneList.length, tzi = 0, tzv = null;
-			if (tzl > 0 && typeof timezoneList[0] !== 'object') {
-				for (; tzi < tzl; tzi++) {
-					tzv = timezoneList[tzi];
-					timezoneList[tzi] = { value: tzv, label: $.timepicker.timezoneOffsetString(tzv, tp_inst.support.iso8601) };
-				}
-			}
-			tp_inst._defaults.timezoneList = timezoneList;
-
-			// set the default units
-			tp_inst.timezone = tp_inst._defaults.timezone !== null ? $.timepicker.timezoneOffsetNumber(tp_inst._defaults.timezone) :
-							((new Date()).getTimezoneOffset() * -1);
-			tp_inst.hour = tp_inst._defaults.hour < tp_inst._defaults.hourMin ? tp_inst._defaults.hourMin :
-							tp_inst._defaults.hour > tp_inst._defaults.hourMax ? tp_inst._defaults.hourMax : tp_inst._defaults.hour;
-			tp_inst.minute = tp_inst._defaults.minute < tp_inst._defaults.minuteMin ? tp_inst._defaults.minuteMin :
-							tp_inst._defaults.minute > tp_inst._defaults.minuteMax ? tp_inst._defaults.minuteMax : tp_inst._defaults.minute;
-			tp_inst.second = tp_inst._defaults.second < tp_inst._defaults.secondMin ? tp_inst._defaults.secondMin :
-							tp_inst._defaults.second > tp_inst._defaults.secondMax ? tp_inst._defaults.secondMax : tp_inst._defaults.second;
-			tp_inst.millisec = tp_inst._defaults.millisec < tp_inst._defaults.millisecMin ? tp_inst._defaults.millisecMin :
-							tp_inst._defaults.millisec > tp_inst._defaults.millisecMax ? tp_inst._defaults.millisecMax : tp_inst._defaults.millisec;
-			tp_inst.microsec = tp_inst._defaults.microsec < tp_inst._defaults.microsecMin ? tp_inst._defaults.microsecMin :
-							tp_inst._defaults.microsec > tp_inst._defaults.microsecMax ? tp_inst._defaults.microsecMax : tp_inst._defaults.microsec;
-			tp_inst.ampm = '';
-			tp_inst.$input = $input;
-
-			if (tp_inst._defaults.altField) {
-				tp_inst.$altInput = $(tp_inst._defaults.altField);
-				if (tp_inst._defaults.altRedirectFocus === true) {
-					tp_inst.$altInput.css({
-						cursor: 'pointer'
-					}).focus(function () {
-						$input.trigger("focus");
-					});
-				}
-			}
-
-			if (tp_inst._defaults.minDate === 0 || tp_inst._defaults.minDateTime === 0) {
-				tp_inst._defaults.minDate = new Date();
-			}
-			if (tp_inst._defaults.maxDate === 0 || tp_inst._defaults.maxDateTime === 0) {
-				tp_inst._defaults.maxDate = new Date();
-			}
-
-			// datepicker needs minDate/maxDate, timepicker needs minDateTime/maxDateTime..
-			if (tp_inst._defaults.minDate !== undefined && tp_inst._defaults.minDate instanceof Date) {
-				tp_inst._defaults.minDateTime = new Date(tp_inst._defaults.minDate.getTime());
-			}
-			if (tp_inst._defaults.minDateTime !== undefined && tp_inst._defaults.minDateTime instanceof Date) {
-				tp_inst._defaults.minDate = new Date(tp_inst._defaults.minDateTime.getTime());
-			}
-			if (tp_inst._defaults.maxDate !== undefined && tp_inst._defaults.maxDate instanceof Date) {
-				tp_inst._defaults.maxDateTime = new Date(tp_inst._defaults.maxDate.getTime());
-			}
-			if (tp_inst._defaults.maxDateTime !== undefined && tp_inst._defaults.maxDateTime instanceof Date) {
-				tp_inst._defaults.maxDate = new Date(tp_inst._defaults.maxDateTime.getTime());
-			}
-			tp_inst.$input.bind('focus', function () {
-				tp_inst._onFocus();
-			});
-
-			return tp_inst;
-		},
-
-		/*
-		* add our sliders to the calendar
-		*/
-		_addTimePicker: function (dp_inst) {
-			var currDT = (this.$altInput && this._defaults.altFieldTimeOnly) ? this.$input.val() + ' ' + this.$altInput.val() : this.$input.val();
-
-			this.timeDefined = this._parseTime(currDT);
-			this._limitMinMaxDateTime(dp_inst, false);
-			this._injectTimePicker();
-		},
-
-		/*
-		* parse the time string from input value or _setTime
-		*/
-		_parseTime: function (timeString, withDate) {
-			if (!this.inst) {
-				this.inst = $.datepicker._getInst(this.$input[0]);
-			}
-
-			if (withDate || !this._defaults.timeOnly) {
-				var dp_dateFormat = $.datepicker._get(this.inst, 'dateFormat');
-				try {
-					var parseRes = parseDateTimeInternal(dp_dateFormat, this._defaults.timeFormat, timeString, $.datepicker._getFormatConfig(this.inst), this._defaults);
-					if (!parseRes.timeObj) {
-						return false;
-					}
-					$.extend(this, parseRes.timeObj);
-				} catch (err) {
-					$.timepicker.log("Error parsing the date/time string: " + err +
-									"\ndate/time string = " + timeString +
-									"\ntimeFormat = " + this._defaults.timeFormat +
-									"\ndateFormat = " + dp_dateFormat);
-					return false;
-				}
-				return true;
-			} else {
-				var timeObj = $.datepicker.parseTime(this._defaults.timeFormat, timeString, this._defaults);
-				if (!timeObj) {
-					return false;
-				}
-				$.extend(this, timeObj);
-				return true;
-			}
-		},
-
-		/*
-		* generate and inject html for timepicker into ui datepicker
-		*/
-		_injectTimePicker: function () {
-			var $dp = this.inst.dpDiv,
-				o = this.inst.settings,
-				tp_inst = this,
-				litem = '',
-				uitem = '',
-				show = null,
-				max = {},
-				gridSize = {},
-				size = null,
-				i = 0,
-				l = 0;
-
-			// Prevent displaying twice
-			if ($dp.find("div.ui-timepicker-div").length === 0 && o.showTimepicker) {
-				var noDisplay = ' style="display:none;"',
-					html = '<div class="ui-timepicker-div' + (o.isRTL ? ' ui-timepicker-rtl' : '') + '"><dl>' + '<dt class="ui_tpicker_time_label"' + ((o.showTime) ? '' : noDisplay) + '>' + o.timeText + '</dt>' +
-								'<dd class="ui_tpicker_time"' + ((o.showTime) ? '' : noDisplay) + '></dd>';
-
-				// Create the markup
-				for (i = 0, l = this.units.length; i < l; i++) {
-					litem = this.units[i];
-					uitem = litem.substr(0, 1).toUpperCase() + litem.substr(1);
-					show = o['show' + uitem] !== null ? o['show' + uitem] : this.support[litem];
-
-					// Added by Peter Medeiros:
-					// - Figure out what the hour/minute/second max should be based on the step values.
-					// - Example: if stepMinute is 15, then minMax is 45.
-					max[litem] = parseInt((o[litem + 'Max'] - ((o[litem + 'Max'] - o[litem + 'Min']) % o['step' + uitem])), 10);
-					gridSize[litem] = 0;
-
-					html += '<dt class="ui_tpicker_' + litem + '_label"' + (show ? '' : noDisplay) + '>' + o[litem + 'Text'] + '</dt>' +
-								'<dd class="ui_tpicker_' + litem + '"><div class="ui_tpicker_' + litem + '_slider"' + (show ? '' : noDisplay) + '></div>';
-
-					if (show && o[litem + 'Grid'] > 0) {
-						html += '<div style="padding-left: 1px"><table class="ui-tpicker-grid-label"><tr>';
-
-						if (litem === 'hour') {
-							for (var h = o[litem + 'Min']; h <= max[litem]; h += parseInt(o[litem + 'Grid'], 10)) {
-								gridSize[litem]++;
-								var tmph = $.datepicker.formatTime(this.support.ampm ? 'hht' : 'HH', {hour: h}, o);
-								html += '<td data-for="' + litem + '">' + tmph + '</td>';
-							}
-						}
-						else {
-							for (var m = o[litem + 'Min']; m <= max[litem]; m += parseInt(o[litem + 'Grid'], 10)) {
-								gridSize[litem]++;
-								html += '<td data-for="' + litem + '">' + ((m < 10) ? '0' : '') + m + '</td>';
-							}
-						}
-
-						html += '</tr></table></div>';
-					}
-					html += '</dd>';
-				}
-				
-				// Timezone
-				var showTz = o.showTimezone !== null ? o.showTimezone : this.support.timezone;
-				html += '<dt class="ui_tpicker_timezone_label"' + (showTz ? '' : noDisplay) + '>' + o.timezoneText + '</dt>';
-				html += '<dd class="ui_tpicker_timezone" ' + (showTz ? '' : noDisplay) + '></dd>';
-
-				// Create the elements from string
-				html += '</dl></div>';
-				var $tp = $(html);
-
-				// if we only want time picker...
-				if (o.timeOnly === true) {
-					$tp.prepend('<div class="ui-widget-header ui-helper-clearfix ui-corner-all">' + '<div class="ui-datepicker-title">' + o.timeOnlyTitle + '</div>' + '</div>');
-					$dp.find('.ui-datepicker-header, .ui-datepicker-calendar').hide();
-				}
-				
-				// add sliders, adjust grids, add events
-				for (i = 0, l = tp_inst.units.length; i < l; i++) {
-					litem = tp_inst.units[i];
-					uitem = litem.substr(0, 1).toUpperCase() + litem.substr(1);
-					show = o['show' + uitem] !== null ? o['show' + uitem] : this.support[litem];
-
-					// add the slider
-					tp_inst[litem + '_slider'] = tp_inst.control.create(tp_inst, $tp.find('.ui_tpicker_' + litem + '_slider'), litem, tp_inst[litem], o[litem + 'Min'], max[litem], o['step' + uitem]);
-
-					// adjust the grid and add click event
-					if (show && o[litem + 'Grid'] > 0) {
-						size = 100 * gridSize[litem] * o[litem + 'Grid'] / (max[litem] - o[litem + 'Min']);
-						$tp.find('.ui_tpicker_' + litem + ' table').css({
-							width: size + "%",
-							marginLeft: o.isRTL ? '0' : ((size / (-2 * gridSize[litem])) + "%"),
-							marginRight: o.isRTL ? ((size / (-2 * gridSize[litem])) + "%") : '0',
-							borderCollapse: 'collapse'
-						}).find("td").click(function (e) {
-								var $t = $(this),
-									h = $t.html(),
-									n = parseInt(h.replace(/[^0-9]/g), 10),
-									ap = h.replace(/[^apm]/ig),
-									f = $t.data('for'); // loses scope, so we use data-for
-
-								if (f === 'hour') {
-									if (ap.indexOf('p') !== -1 && n < 12) {
-										n += 12;
-									}
-									else {
-										if (ap.indexOf('a') !== -1 && n === 12) {
-											n = 0;
-										}
-									}
-								}
-								
-								tp_inst.control.value(tp_inst, tp_inst[f + '_slider'], litem, n);
-
-								tp_inst._onTimeChange();
-								tp_inst._onSelectHandler();
-							}).css({
-								cursor: 'pointer',
-								width: (100 / gridSize[litem]) + '%',
-								textAlign: 'center',
-								overflow: 'hidden'
-							});
-					} // end if grid > 0
-				} // end for loop
-
-				// Add timezone options
-				this.timezone_select = $tp.find('.ui_tpicker_timezone').append('<select></select>').find("select");
-				$.fn.append.apply(this.timezone_select,
-				$.map(o.timezoneList, function (val, idx) {
-					return $("<option />").val(typeof val === "object" ? val.value : val).text(typeof val === "object" ? val.label : val);
-				}));
-				if (typeof(this.timezone) !== "undefined" && this.timezone !== null && this.timezone !== "") {
-					var local_timezone = (new Date(this.inst.selectedYear, this.inst.selectedMonth, this.inst.selectedDay, 12)).getTimezoneOffset() * -1;
-					if (local_timezone === this.timezone) {
-						selectLocalTimezone(tp_inst);
-					} else {
-						this.timezone_select.val(this.timezone);
-					}
-				} else {
-					if (typeof(this.hour) !== "undefined" && this.hour !== null && this.hour !== "") {
-						this.timezone_select.val(o.timezone);
-					} else {
-						selectLocalTimezone(tp_inst);
-					}
-				}
-				this.timezone_select.change(function () {
-					tp_inst._onTimeChange();
-					tp_inst._onSelectHandler();
-				});
-				// End timezone options
-				
-				// inject timepicker into datepicker
-				var $buttonPanel = $dp.find('.ui-datepicker-buttonpane');
-				if ($buttonPanel.length) {
-					$buttonPanel.before($tp);
-				} else {
-					$dp.append($tp);
-				}
-
-				this.$timeObj = $tp.find('.ui_tpicker_time');
-
-				if (this.inst !== null) {
-					var timeDefined = this.timeDefined;
-					this._onTimeChange();
-					this.timeDefined = timeDefined;
-				}
-
-				// slideAccess integration: http://trentrichardson.com/2011/11/11/jquery-ui-sliders-and-touch-accessibility/
-				if (this._defaults.addSliderAccess) {
-					var sliderAccessArgs = this._defaults.sliderAccessArgs,
-						rtl = this._defaults.isRTL;
-					sliderAccessArgs.isRTL = rtl;
-						
-					setTimeout(function () { // fix for inline mode
-						if ($tp.find('.ui-slider-access').length === 0) {
-							$tp.find('.ui-slider:visible').sliderAccess(sliderAccessArgs);
-
-							// fix any grids since sliders are shorter
-							var sliderAccessWidth = $tp.find('.ui-slider-access:eq(0)').outerWidth(true);
-							if (sliderAccessWidth) {
-								$tp.find('table:visible').each(function () {
-									var $g = $(this),
-										oldWidth = $g.outerWidth(),
-										oldMarginLeft = $g.css(rtl ? 'marginRight' : 'marginLeft').toString().replace('%', ''),
-										newWidth = oldWidth - sliderAccessWidth,
-										newMarginLeft = ((oldMarginLeft * newWidth) / oldWidth) + '%',
-										css = { width: newWidth, marginRight: 0, marginLeft: 0 };
-									css[rtl ? 'marginRight' : 'marginLeft'] = newMarginLeft;
-									$g.css(css);
-								});
-							}
-						}
-					}, 10);
-				}
-				// end slideAccess integration
-
-				tp_inst._limitMinMaxDateTime(this.inst, true);
-			}
-		},
-
-		/*
-		* This function tries to limit the ability to go outside the
-		* min/max date range
-		*/
-		_limitMinMaxDateTime: function (dp_inst, adjustSliders) {
-			var o = this._defaults,
-				dp_date = new Date(dp_inst.selectedYear, dp_inst.selectedMonth, dp_inst.selectedDay);
-
-			if (!this._defaults.showTimepicker) {
-				return;
-			} // No time so nothing to check here
-
-			if ($.datepicker._get(dp_inst, 'minDateTime') !== null && $.datepicker._get(dp_inst, 'minDateTime') !== undefined && dp_date) {
-				var minDateTime = $.datepicker._get(dp_inst, 'minDateTime'),
-					minDateTimeDate = new Date(minDateTime.getFullYear(), minDateTime.getMonth(), minDateTime.getDate(), 0, 0, 0, 0);
-
-				if (this.hourMinOriginal === null || this.minuteMinOriginal === null || this.secondMinOriginal === null || this.millisecMinOriginal === null || this.microsecMinOriginal === null) {
-					this.hourMinOriginal = o.hourMin;
-					this.minuteMinOriginal = o.minuteMin;
-					this.secondMinOriginal = o.secondMin;
-					this.millisecMinOriginal = o.millisecMin;
-					this.microsecMinOriginal = o.microsecMin;
-				}
-
-				if (dp_inst.settings.timeOnly || minDateTimeDate.getTime() === dp_date.getTime()) {
-					this._defaults.hourMin = minDateTime.getHours();
-					if (this.hour <= this._defaults.hourMin) {
-						this.hour = this._defaults.hourMin;
-						this._defaults.minuteMin = minDateTime.getMinutes();
-						if (this.minute <= this._defaults.minuteMin) {
-							this.minute = this._defaults.minuteMin;
-							this._defaults.secondMin = minDateTime.getSeconds();
-							if (this.second <= this._defaults.secondMin) {
-								this.second = this._defaults.secondMin;
-								this._defaults.millisecMin = minDateTime.getMilliseconds();
-								if (this.millisec <= this._defaults.millisecMin) {
-									this.millisec = this._defaults.millisecMin;
-									this._defaults.microsecMin = minDateTime.getMicroseconds();
-								} else {
-									if (this.microsec < this._defaults.microsecMin) {
-										this.microsec = this._defaults.microsecMin;
-									}
-									this._defaults.microsecMin = this.microsecMinOriginal;
-								}
-							} else {
-								this._defaults.millisecMin = this.millisecMinOriginal;
-								this._defaults.microsecMin = this.microsecMinOriginal;
-							}
-						} else {
-							this._defaults.secondMin = this.secondMinOriginal;
-							this._defaults.millisecMin = this.millisecMinOriginal;
-							this._defaults.microsecMin = this.microsecMinOriginal;
-						}
-					} else {
-						this._defaults.minuteMin = this.minuteMinOriginal;
-						this._defaults.secondMin = this.secondMinOriginal;
-						this._defaults.millisecMin = this.millisecMinOriginal;
-						this._defaults.microsecMin = this.microsecMinOriginal;
-					}
-				} else {
-					this._defaults.hourMin = this.hourMinOriginal;
-					this._defaults.minuteMin = this.minuteMinOriginal;
-					this._defaults.secondMin = this.secondMinOriginal;
-					this._defaults.millisecMin = this.millisecMinOriginal;
-					this._defaults.microsecMin = this.microsecMinOriginal;
-				}
-			}
-
-			if ($.datepicker._get(dp_inst, 'maxDateTime') !== null && $.datepicker._get(dp_inst, 'maxDateTime') !== undefined && dp_date) {
-				var maxDateTime = $.datepicker._get(dp_inst, 'maxDateTime'),
-					maxDateTimeDate = new Date(maxDateTime.getFullYear(), maxDateTime.getMonth(), maxDateTime.getDate(), 0, 0, 0, 0);
-
-				if (this.hourMaxOriginal === null || this.minuteMaxOriginal === null || this.secondMaxOriginal === null || this.millisecMaxOriginal === null) {
-					this.hourMaxOriginal = o.hourMax;
-					this.minuteMaxOriginal = o.minuteMax;
-					this.secondMaxOriginal = o.secondMax;
-					this.millisecMaxOriginal = o.millisecMax;
-					this.microsecMaxOriginal = o.microsecMax;
-				}
-
-				if (dp_inst.settings.timeOnly || maxDateTimeDate.getTime() === dp_date.getTime()) {
-					this._defaults.hourMax = maxDateTime.getHours();
-					if (this.hour >= this._defaults.hourMax) {
-						this.hour = this._defaults.hourMax;
-						this._defaults.minuteMax = maxDateTime.getMinutes();
-						if (this.minute >= this._defaults.minuteMax) {
-							this.minute = this._defaults.minuteMax;
-							this._defaults.secondMax = maxDateTime.getSeconds();
-							if (this.second >= this._defaults.secondMax) {
-								this.second = this._defaults.secondMax;
-								this._defaults.millisecMax = maxDateTime.getMilliseconds();
-								if (this.millisec >= this._defaults.millisecMax) {
-									this.millisec = this._defaults.millisecMax;
-									this._defaults.microsecMax = maxDateTime.getMicroseconds();
-								} else {
-									if (this.microsec > this._defaults.microsecMax) {
-										this.microsec = this._defaults.microsecMax;
-									}
-									this._defaults.microsecMax = this.microsecMaxOriginal;
-								}
-							} else {
-								this._defaults.millisecMax = this.millisecMaxOriginal;
-								this._defaults.microsecMax = this.microsecMaxOriginal;
-							}
-						} else {
-							this._defaults.secondMax = this.secondMaxOriginal;
-							this._defaults.millisecMax = this.millisecMaxOriginal;
-							this._defaults.microsecMax = this.microsecMaxOriginal;
-						}
-					} else {
-						this._defaults.minuteMax = this.minuteMaxOriginal;
-						this._defaults.secondMax = this.secondMaxOriginal;
-						this._defaults.millisecMax = this.millisecMaxOriginal;
-						this._defaults.microsecMax = this.microsecMaxOriginal;
-					}
-				} else {
-					this._defaults.hourMax = this.hourMaxOriginal;
-					this._defaults.minuteMax = this.minuteMaxOriginal;
-					this._defaults.secondMax = this.secondMaxOriginal;
-					this._defaults.millisecMax = this.millisecMaxOriginal;
-					this._defaults.microsecMax = this.microsecMaxOriginal;
-				}
-			}
-
-			if (dp_inst.settings.minTime!==null) {				
-				var tempMinTime=new Date("01/01/1970 " + dp_inst.settings.minTime);				
-				if (this.hour<tempMinTime.getHours()) {
-					this.hour=this._defaults.hourMin=tempMinTime.getHours();
-					this.minute=this._defaults.minuteMin=tempMinTime.getMinutes();							
-				} else if (this.hour===tempMinTime.getHours() && this.minute<tempMinTime.getMinutes()) {
-					this.minute=this._defaults.minuteMin=tempMinTime.getMinutes();
-				} else {						
-					if (this._defaults.hourMin<tempMinTime.getHours()) {
-						this._defaults.hourMin=tempMinTime.getHours();
-						this._defaults.minuteMin=tempMinTime.getMinutes();					
-					} else if (this._defaults.hourMin===tempMinTime.getHours()===this.hour && this._defaults.minuteMin<tempMinTime.getMinutes()) {
-						this._defaults.minuteMin=tempMinTime.getMinutes();						
-					} else {
-						this._defaults.minuteMin=0;
-					}
-				}				
-			}
-			
-			if (dp_inst.settings.maxTime!==null) {				
-				var tempMaxTime=new Date("01/01/1970 " + dp_inst.settings.maxTime);
-				if (this.hour>tempMaxTime.getHours()) {
-					this.hour=this._defaults.hourMax=tempMaxTime.getHours();						
-					this.minute=this._defaults.minuteMax=tempMaxTime.getMinutes();
-				} else if (this.hour===tempMaxTime.getHours() && this.minute>tempMaxTime.getMinutes()) {							
-					this.minute=this._defaults.minuteMax=tempMaxTime.getMinutes();						
-				} else {
-					if (this._defaults.hourMax>tempMaxTime.getHours()) {
-						this._defaults.hourMax=tempMaxTime.getHours();
-						this._defaults.minuteMax=tempMaxTime.getMinutes();					
-					} else if (this._defaults.hourMax===tempMaxTime.getHours()===this.hour && this._defaults.minuteMax>tempMaxTime.getMinutes()) {
-						this._defaults.minuteMax=tempMaxTime.getMinutes();						
-					} else {
-						this._defaults.minuteMax=59;
-					}
-				}						
-			}
-			
-			if (adjustSliders !== undefined && adjustSliders === true) {
-				var hourMax = parseInt((this._defaults.hourMax - ((this._defaults.hourMax - this._defaults.hourMin) % this._defaults.stepHour)), 10),
-					minMax = parseInt((this._defaults.minuteMax - ((this._defaults.minuteMax - this._defaults.minuteMin) % this._defaults.stepMinute)), 10),
-					secMax = parseInt((this._defaults.secondMax - ((this._defaults.secondMax - this._defaults.secondMin) % this._defaults.stepSecond)), 10),
-					millisecMax = parseInt((this._defaults.millisecMax - ((this._defaults.millisecMax - this._defaults.millisecMin) % this._defaults.stepMillisec)), 10),
-					microsecMax = parseInt((this._defaults.microsecMax - ((this._defaults.microsecMax - this._defaults.microsecMin) % this._defaults.stepMicrosec)), 10);
-
-				if (this.hour_slider) {
-					this.control.options(this, this.hour_slider, 'hour', { min: this._defaults.hourMin, max: hourMax, step: this._defaults.stepHour });
-					this.control.value(this, this.hour_slider, 'hour', this.hour - (this.hour % this._defaults.stepHour));
-				}
-				if (this.minute_slider) {
-					this.control.options(this, this.minute_slider, 'minute', { min: this._defaults.minuteMin, max: minMax, step: this._defaults.stepMinute });
-					this.control.value(this, this.minute_slider, 'minute', this.minute - (this.minute % this._defaults.stepMinute));
-				}
-				if (this.second_slider) {
-					this.control.options(this, this.second_slider, 'second', { min: this._defaults.secondMin, max: secMax, step: this._defaults.stepSecond });
-					this.control.value(this, this.second_slider, 'second', this.second - (this.second % this._defaults.stepSecond));
-				}
-				if (this.millisec_slider) {
-					this.control.options(this, this.millisec_slider, 'millisec', { min: this._defaults.millisecMin, max: millisecMax, step: this._defaults.stepMillisec });
-					this.control.value(this, this.millisec_slider, 'millisec', this.millisec - (this.millisec % this._defaults.stepMillisec));
-				}
-				if (this.microsec_slider) {
-					this.control.options(this, this.microsec_slider, 'microsec', { min: this._defaults.microsecMin, max: microsecMax, step: this._defaults.stepMicrosec });
-					this.control.value(this, this.microsec_slider, 'microsec', this.microsec - (this.microsec % this._defaults.stepMicrosec));
-				}
-			}
-
-		},
-
-		/*
-		* when a slider moves, set the internal time...
-		* on time change is also called when the time is updated in the text field
-		*/
-		_onTimeChange: function () {
-			if (!this._defaults.showTimepicker) {
-                                return;
-			}
-			var hour = (this.hour_slider) ? this.control.value(this, this.hour_slider, 'hour') : false,
-				minute = (this.minute_slider) ? this.control.value(this, this.minute_slider, 'minute') : false,
-				second = (this.second_slider) ? this.control.value(this, this.second_slider, 'second') : false,
-				millisec = (this.millisec_slider) ? this.control.value(this, this.millisec_slider, 'millisec') : false,
-				microsec = (this.microsec_slider) ? this.control.value(this, this.microsec_slider, 'microsec') : false,
-				timezone = (this.timezone_select) ? this.timezone_select.val() : false,
-				o = this._defaults,
-				pickerTimeFormat = o.pickerTimeFormat || o.timeFormat,
-				pickerTimeSuffix = o.pickerTimeSuffix || o.timeSuffix;
-
-			if (typeof(hour) === 'object') {
-				hour = false;
-			}
-			if (typeof(minute) === 'object') {
-				minute = false;
-			}
-			if (typeof(second) === 'object') {
-				second = false;
-			}
-			if (typeof(millisec) === 'object') {
-				millisec = false;
-			}
-			if (typeof(microsec) === 'object') {
-				microsec = false;
-			}
-			if (typeof(timezone) === 'object') {
-				timezone = false;
-			}
-
-			if (hour !== false) {
-				hour = parseInt(hour, 10);
-			}
-			if (minute !== false) {
-				minute = parseInt(minute, 10);
-			}
-			if (second !== false) {
-				second = parseInt(second, 10);
-			}
-			if (millisec !== false) {
-				millisec = parseInt(millisec, 10);
-			}
-			if (microsec !== false) {
-				microsec = parseInt(microsec, 10);
-			}
-			if (timezone !== false) {
-				timezone = timezone.toString();
-			}
-
-			var ampm = o[hour < 12 ? 'amNames' : 'pmNames'][0];
-
-			// If the update was done in the input field, the input field should not be updated.
-			// If the update was done using the sliders, update the input field.
-			var hasChanged = (
-						hour !== parseInt(this.hour,10) || // sliders should all be numeric
-						minute !== parseInt(this.minute,10) || 
-						second !== parseInt(this.second,10) || 
-						millisec !== parseInt(this.millisec,10) || 
-						microsec !== parseInt(this.microsec,10) || 
-						(this.ampm.length > 0 && (hour < 12) !== ($.inArray(this.ampm.toUpperCase(), this.amNames) !== -1)) || 
-						(this.timezone !== null && timezone !== this.timezone.toString()) // could be numeric or "EST" format, so use toString()
-					);
-
-			if (hasChanged) {
-
-				if (hour !== false) {
-					this.hour = hour;
-				}
-				if (minute !== false) {
-					this.minute = minute;
-				}
-				if (second !== false) {
-					this.second = second;
-				}
-				if (millisec !== false) {
-					this.millisec = millisec;
-				}
-				if (microsec !== false) {
-					this.microsec = microsec;
-				}
-				if (timezone !== false) {
-					this.timezone = timezone;
-				}
-
-				if (!this.inst) {
-					this.inst = $.datepicker._getInst(this.$input[0]);
-				}
-
-				this._limitMinMaxDateTime(this.inst, true);
-			}
-			if (this.support.ampm) {
-				this.ampm = ampm;
-			}
-
-			// Updates the time within the timepicker
-			this.formattedTime = $.datepicker.formatTime(o.timeFormat, this, o);
-			if (this.$timeObj) {
-				if (pickerTimeFormat === o.timeFormat) {
-					this.$timeObj.text(this.formattedTime + pickerTimeSuffix);
-				}
-				else {
-					this.$timeObj.text($.datepicker.formatTime(pickerTimeFormat, this, o) + pickerTimeSuffix);
-				}
-			}
-
-			this.timeDefined = true;
-			if (hasChanged) {
-				this._updateDateTime();
-				//this.$input.focus(); // may automatically open the picker on setDate
-			}
-		},
-
-		/*
-		* call custom onSelect.
-		* bind to sliders slidestop, and grid click.
-		*/
-		_onSelectHandler: function () {
-			var onSelect = this._defaults.onSelect || this.inst.settings.onSelect;
-			var inputEl = this.$input ? this.$input[0] : null;
-			if (onSelect && inputEl) {
-				onSelect.apply(inputEl, [this.formattedDateTime, this]);
-			}
-		},
-
-		/*
-		* update our input with the new date time..
-		*/
-		_updateDateTime: function (dp_inst) {
-			dp_inst = this.inst || dp_inst;
-			var dtTmp = (dp_inst.currentYear > 0? 
-							new Date(dp_inst.currentYear, dp_inst.currentMonth, dp_inst.currentDay) : 
-							new Date(dp_inst.selectedYear, dp_inst.selectedMonth, dp_inst.selectedDay)),
-				dt = $.datepicker._daylightSavingAdjust(dtTmp),
-				//dt = $.datepicker._daylightSavingAdjust(new Date(dp_inst.selectedYear, dp_inst.selectedMonth, dp_inst.selectedDay)),
-				//dt = $.datepicker._daylightSavingAdjust(new Date(dp_inst.currentYear, dp_inst.currentMonth, dp_inst.currentDay)),
-				dateFmt = $.datepicker._get(dp_inst, 'dateFormat'),
-				formatCfg = $.datepicker._getFormatConfig(dp_inst),
-				timeAvailable = dt !== null && this.timeDefined;
-			this.formattedDate = $.datepicker.formatDate(dateFmt, (dt === null ? new Date() : dt), formatCfg);
-			var formattedDateTime = this.formattedDate;
-			
-			// if a slider was changed but datepicker doesn't have a value yet, set it
-			if (dp_inst.lastVal === "") {
-                dp_inst.currentYear = dp_inst.selectedYear;
-                dp_inst.currentMonth = dp_inst.selectedMonth;
-                dp_inst.currentDay = dp_inst.selectedDay;
-            }
-
-			/*
-			* remove following lines to force every changes in date picker to change the input value
-			* Bug descriptions: when an input field has a default value, and click on the field to pop up the date picker. 
-			* If the user manually empty the value in the input field, the date picker will never change selected value.
-			*/
-			//if (dp_inst.lastVal !== undefined && (dp_inst.lastVal.length > 0 && this.$input.val().length === 0)) {
-			//	return;
-			//}
-
-			if (this._defaults.timeOnly === true && this._defaults.timeOnlyShowDate === false) {
-				formattedDateTime = this.formattedTime;
-			} else if ((this._defaults.timeOnly !== true && (this._defaults.alwaysSetTime || timeAvailable)) || (this._defaults.timeOnly === true && this._defaults.timeOnlyShowDate === true)) {
-				formattedDateTime += this._defaults.separator + this.formattedTime + this._defaults.timeSuffix;
-			}
-
-			this.formattedDateTime = formattedDateTime;
-
-			if (!this._defaults.showTimepicker) {
-				this.$input.val(this.formattedDate);
-			} else if (this.$altInput && this._defaults.timeOnly === false && this._defaults.altFieldTimeOnly === true) {
-				this.$altInput.val(this.formattedTime);
-				this.$input.val(this.formattedDate);
-			} else if (this.$altInput) {
-				this.$input.val(formattedDateTime);
-				var altFormattedDateTime = '',
-					altSeparator = this._defaults.altSeparator !== null ? this._defaults.altSeparator : this._defaults.separator,
-					altTimeSuffix = this._defaults.altTimeSuffix !== null ? this._defaults.altTimeSuffix : this._defaults.timeSuffix;
-				
-				if (!this._defaults.timeOnly) {
-					if (this._defaults.altFormat) {
-						altFormattedDateTime = $.datepicker.formatDate(this._defaults.altFormat, (dt === null ? new Date() : dt), formatCfg);
-					}
-					else {
-						altFormattedDateTime = this.formattedDate;
-					}
-
-					if (altFormattedDateTime) {
-						altFormattedDateTime += altSeparator;
-					}
-				}
-
-				if (this._defaults.altTimeFormat !== null) {
-					altFormattedDateTime += $.datepicker.formatTime(this._defaults.altTimeFormat, this, this._defaults) + altTimeSuffix;
-				}
-				else {
-					altFormattedDateTime += this.formattedTime + altTimeSuffix;
-				}
-				this.$altInput.val(altFormattedDateTime);
-			} else {
-				this.$input.val(formattedDateTime);
-			}
-
-			this.$input.trigger("change");
-		},
-
-		_onFocus: function () {
-			if (!this.$input.val() && this._defaults.defaultValue) {
-				this.$input.val(this._defaults.defaultValue);
-				var inst = $.datepicker._getInst(this.$input.get(0)),
-					tp_inst = $.datepicker._get(inst, 'timepicker');
-				if (tp_inst) {
-					if (tp_inst._defaults.timeOnly && (inst.input.val() !== inst.lastVal)) {
-						try {
-							$.datepicker._updateDatepicker(inst);
-						} catch (err) {
-							$.timepicker.log(err);
-						}
-					}
-				}
-			}
-		},
-
-		/*
-		* Small abstraction to control types
-		* We can add more, just be sure to follow the pattern: create, options, value
-		*/
-		_controls: {
-			// slider methods
-			slider: {
-				create: function (tp_inst, obj, unit, val, min, max, step) {
-					var rtl = tp_inst._defaults.isRTL; // if rtl go -60->0 instead of 0->60
-					return obj.prop('slide', null).slider({
-						orientation: "horizontal",
-						value: rtl ? val * -1 : val,
-						min: rtl ? max * -1 : min,
-						max: rtl ? min * -1 : max,
-						step: step,
-						slide: function (event, ui) {
-							tp_inst.control.value(tp_inst, $(this), unit, rtl ? ui.value * -1 : ui.value);
-							tp_inst._onTimeChange();
-						},
-						stop: function (event, ui) {
-							tp_inst._onSelectHandler();
-						}
-					});	
-				},
-				options: function (tp_inst, obj, unit, opts, val) {
-					if (tp_inst._defaults.isRTL) {
-						if (typeof(opts) === 'string') {
-							if (opts === 'min' || opts === 'max') {
-								if (val !== undefined) {
-									return obj.slider(opts, val * -1);
-								}
-								return Math.abs(obj.slider(opts));
-							}
-							return obj.slider(opts);
-						}
-						var min = opts.min, 
-							max = opts.max;
-						opts.min = opts.max = null;
-						if (min !== undefined) {
-							opts.max = min * -1;
-						}
-						if (max !== undefined) {
-							opts.min = max * -1;
-						}
-						return obj.slider(opts);
-					}
-					if (typeof(opts) === 'string' && val !== undefined) {
-						return obj.slider(opts, val);
-					}
-					return obj.slider(opts);
-				},
-				value: function (tp_inst, obj, unit, val) {
-					if (tp_inst._defaults.isRTL) {
-						if (val !== undefined) {
-							return obj.slider('value', val * -1);
-						}
-						return Math.abs(obj.slider('value'));
-					}
-					if (val !== undefined) {
-						return obj.slider('value', val);
-					}
-					return obj.slider('value');
-				}
-			},
-			// select methods
-			select: {
-				create: function (tp_inst, obj, unit, val, min, max, step) {
-					var sel = '<select class="ui-timepicker-select ui-state-default ui-corner-all" data-unit="' + unit + '" data-min="' + min + '" data-max="' + max + '" data-step="' + step + '">',
-						format = tp_inst._defaults.pickerTimeFormat || tp_inst._defaults.timeFormat;
-
-					for (var i = min; i <= max; i += step) {
-						sel += '<option value="' + i + '"' + (i === val ? ' selected' : '') + '>';
-						if (unit === 'hour') {
-							sel += $.datepicker.formatTime($.trim(format.replace(/[^ht ]/ig, '')), {hour: i}, tp_inst._defaults);
-						}
-						else if (unit === 'millisec' || unit === 'microsec' || i >= 10) { sel += i; }
-						else {sel += '0' + i.toString(); }
-						sel += '</option>';
-					}
-					sel += '</select>';
-
-					obj.children('select').remove();
-
-					$(sel).appendTo(obj).change(function (e) {
-						tp_inst._onTimeChange();
-						tp_inst._onSelectHandler();
-					});
-
-					return obj;
-				},
-				options: function (tp_inst, obj, unit, opts, val) {
-					var o = {},
-						$t = obj.children('select');
-					if (typeof(opts) === 'string') {
-						if (val === undefined) {
-							return $t.data(opts);
-						}
-						o[opts] = val;	
-					}
-					else { o = opts; }
-					return tp_inst.control.create(tp_inst, obj, $t.data('unit'), $t.val(), o.min || $t.data('min'), o.max || $t.data('max'), o.step || $t.data('step'));
-				},
-				value: function (tp_inst, obj, unit, val) {
-					var $t = obj.children('select');
-					if (val !== undefined) {
-						return $t.val(val);
-					}
-					return $t.val();
-				}
-			}
-		} // end _controls
-
-	});
-
-	$.fn.extend({
-		/*
-		* shorthand just to use timepicker.
-		*/
-		timepicker: function (o) {
-			o = o || {};
-			var tmp_args = Array.prototype.slice.call(arguments);
-
-			if (typeof o === 'object') {
-				tmp_args[0] = $.extend(o, {
-					timeOnly: true
-				});
-			}
-
-			return $(this).each(function () {
-				$.fn.datetimepicker.apply($(this), tmp_args);
-			});
-		},
-
-		/*
-		* extend timepicker to datepicker
-		*/
-		datetimepicker: function (o) {
-			o = o || {};
-			var tmp_args = arguments;
-
-			if (typeof(o) === 'string') {
-				if (o === 'getDate'  || (o === 'option' && tmp_args.length === 2 && typeof (tmp_args[1]) === 'string')) {
-					return $.fn.datepicker.apply($(this[0]), tmp_args);
-				} else {
-					return this.each(function () {
-						var $t = $(this);
-						$t.datepicker.apply($t, tmp_args);
-					});
-				}
-			} else {
-				return this.each(function () {
-					var $t = $(this);
-					$t.datepicker($.timepicker._newInst($t, o)._defaults);
-				});
-			}
-		}
-	});
-
-	/*
-	* Public Utility to parse date and time
-	*/
-	$.datepicker.parseDateTime = function (dateFormat, timeFormat, dateTimeString, dateSettings, timeSettings) {
-		var parseRes = parseDateTimeInternal(dateFormat, timeFormat, dateTimeString, dateSettings, timeSettings);
-		if (parseRes.timeObj) {
-			var t = parseRes.timeObj;
-			parseRes.date.setHours(t.hour, t.minute, t.second, t.millisec);
-			parseRes.date.setMicroseconds(t.microsec);
-		}
-
-		return parseRes.date;
-	};
-
-	/*
-	* Public utility to parse time
-	*/
-	$.datepicker.parseTime = function (timeFormat, timeString, options) {
-		var o = extendRemove(extendRemove({}, $.timepicker._defaults), options || {}),
-			iso8601 = (timeFormat.replace(/\'.*?\'/g, '').indexOf('Z') !== -1);
-
-		// Strict parse requires the timeString to match the timeFormat exactly
-		var strictParse = function (f, s, o) {
-
-			// pattern for standard and localized AM/PM markers
-			var getPatternAmpm = function (amNames, pmNames) {
-				var markers = [];
-				if (amNames) {
-					$.merge(markers, amNames);
-				}
-				if (pmNames) {
-					$.merge(markers, pmNames);
-				}
-				markers = $.map(markers, function (val) {
-					return val.replace(/[.*+?|()\[\]{}\\]/g, '\\$&');
-				});
-				return '(' + markers.join('|') + ')?';
-			};
-
-			// figure out position of time elements.. cause js cant do named captures
-			var getFormatPositions = function (timeFormat) {
-				var finds = timeFormat.toLowerCase().match(/(h{1,2}|m{1,2}|s{1,2}|l{1}|c{1}|t{1,2}|z|'.*?')/g),
-					orders = {
-						h: -1,
-						m: -1,
-						s: -1,
-						l: -1,
-						c: -1,
-						t: -1,
-						z: -1
-					};
-
-				if (finds) {
-					for (var i = 0; i < finds.length; i++) {
-						if (orders[finds[i].toString().charAt(0)] === -1) {
-							orders[finds[i].toString().charAt(0)] = i + 1;
-						}
-					}
-				}
-				return orders;
-			};
-
-			var regstr = '^' + f.toString()
-					.replace(/([hH]{1,2}|mm?|ss?|[tT]{1,2}|[zZ]|[lc]|'.*?')/g, function (match) {
-							var ml = match.length;
-							switch (match.charAt(0).toLowerCase()) {
-							case 'h':
-								return ml === 1 ? '(\\d?\\d)' : '(\\d{' + ml + '})';
-							case 'm':
-								return ml === 1 ? '(\\d?\\d)' : '(\\d{' + ml + '})';
-							case 's':
-								return ml === 1 ? '(\\d?\\d)' : '(\\d{' + ml + '})';
-							case 'l':
-								return '(\\d?\\d?\\d)';
-							case 'c':
-								return '(\\d?\\d?\\d)';
-							case 'z':
-								return '(z|[-+]\\d\\d:?\\d\\d|\\S+)?';
-							case 't':
-								return getPatternAmpm(o.amNames, o.pmNames);
-							default:    // literal escaped in quotes
-								return '(' + match.replace(/\'/g, "").replace(/(\.|\$|\^|\\|\/|\(|\)|\[|\]|\?|\+|\*)/g, function (m) { return "\\" + m; }) + ')?';
-							}
-						})
-					.replace(/\s/g, '\\s?') +
-					o.timeSuffix + '$',
-				order = getFormatPositions(f),
-				ampm = '',
-				treg;
-
-			treg = s.match(new RegExp(regstr, 'i'));
-
-			var resTime = {
-				hour: 0,
-				minute: 0,
-				second: 0,
-				millisec: 0,
-				microsec: 0
-			};
-
-			if (treg) {
-				if (order.t !== -1) {
-					if (treg[order.t] === undefined || treg[order.t].length === 0) {
-						ampm = '';
-						resTime.ampm = '';
-					} else {
-						ampm = $.inArray(treg[order.t].toUpperCase(), o.amNames) !== -1 ? 'AM' : 'PM';
-						resTime.ampm = o[ampm === 'AM' ? 'amNames' : 'pmNames'][0];
-					}
-				}
-
-				if (order.h !== -1) {
-					if (ampm === 'AM' && treg[order.h] === '12') {
-						resTime.hour = 0; // 12am = 0 hour
-					} else {
-						if (ampm === 'PM' && treg[order.h] !== '12') {
-							resTime.hour = parseInt(treg[order.h], 10) + 12; // 12pm = 12 hour, any other pm = hour + 12
-						} else {
-							resTime.hour = Number(treg[order.h]);
-						}
-					}
-				}
-
-				if (order.m !== -1) {
-					resTime.minute = Number(treg[order.m]);
-				}
-				if (order.s !== -1) {
-					resTime.second = Number(treg[order.s]);
-				}
-				if (order.l !== -1) {
-					resTime.millisec = Number(treg[order.l]);
-				}
-				if (order.c !== -1) {
-					resTime.microsec = Number(treg[order.c]);
-				}
-				if (order.z !== -1 && treg[order.z] !== undefined) {
-					resTime.timezone = $.timepicker.timezoneOffsetNumber(treg[order.z]);
-				}
-
-
-				return resTime;
-			}
-			return false;
-		};// end strictParse
-
-		// First try JS Date, if that fails, use strictParse
-		var looseParse = function (f, s, o) {
-			try {
-				var d = new Date('2012-01-01 ' + s);
-				if (isNaN(d.getTime())) {
-					d = new Date('2012-01-01T' + s);
-					if (isNaN(d.getTime())) {
-						d = new Date('01/01/2012 ' + s);
-						if (isNaN(d.getTime())) {
-							throw "Unable to parse time with native Date: " + s;
-						}
-					}
-				}
-
-				return {
-					hour: d.getHours(),
-					minute: d.getMinutes(),
-					second: d.getSeconds(),
-					millisec: d.getMilliseconds(),
-					microsec: d.getMicroseconds(),
-					timezone: d.getTimezoneOffset() * -1
-				};
-			}
-			catch (err) {
-				try {
-					return strictParse(f, s, o);
-				}
-				catch (err2) {
-					$.timepicker.log("Unable to parse \ntimeString: " + s + "\ntimeFormat: " + f);
-				}				
-			}
-			return false;
-		}; // end looseParse
-		
-		if (typeof o.parse === "function") {
-			return o.parse(timeFormat, timeString, o);
-		}
-		if (o.parse === 'loose') {
-			return looseParse(timeFormat, timeString, o);
-		}
-		return strictParse(timeFormat, timeString, o);
-	};
-
-	/**
-	 * Public utility to format the time
-	 * @param {string} format format of the time
-	 * @param {Object} time Object not a Date for timezones
-	 * @param {Object} [options] essentially the regional[].. amNames, pmNames, ampm
-	 * @returns {string} the formatted time
-	 */
-	$.datepicker.formatTime = function (format, time, options) {
-		options = options || {};
-		options = $.extend({}, $.timepicker._defaults, options);
-		time = $.extend({
-			hour: 0,
-			minute: 0,
-			second: 0,
-			millisec: 0,
-			microsec: 0,
-			timezone: null
-		}, time);
-
-		var tmptime = format,
-			ampmName = options.amNames[0],
-			hour = parseInt(time.hour, 10);
-
-		if (hour > 11) {
-			ampmName = options.pmNames[0];
-		}
-
-		tmptime = tmptime.replace(/(?:HH?|hh?|mm?|ss?|[tT]{1,2}|[zZ]|[lc]|'.*?')/g, function (match) {
-			switch (match) {
-			case 'HH':
-				return ('0' + hour).slice(-2);
-			case 'H':
-				return hour;
-			case 'hh':
-				return ('0' + convert24to12(hour)).slice(-2);
-			case 'h':
-				return convert24to12(hour);
-			case 'mm':
-				return ('0' + time.minute).slice(-2);
-			case 'm':
-				return time.minute;
-			case 'ss':
-				return ('0' + time.second).slice(-2);
-			case 's':
-				return time.second;
-			case 'l':
-				return ('00' + time.millisec).slice(-3);
-			case 'c':
-				return ('00' + time.microsec).slice(-3);
-			case 'z':
-				return $.timepicker.timezoneOffsetString(time.timezone === null ? options.timezone : time.timezone, false);
-			case 'Z':
-				return $.timepicker.timezoneOffsetString(time.timezone === null ? options.timezone : time.timezone, true);
-			case 'T':
-				return ampmName.charAt(0).toUpperCase();
-			case 'TT':
-				return ampmName.toUpperCase();
-			case 't':
-				return ampmName.charAt(0).toLowerCase();
-			case 'tt':
-				return ampmName.toLowerCase();
-			default:
-				return match.replace(/'/g, "");
-			}
-		});
-
-		return tmptime;
-	};
-
-	/*
-	* the bad hack :/ override datepicker so it doesn't close on select
-	// inspired: http://stackoverflow.com/questions/1252512/jquery-datepicker-prevent-closing-picker-when-clicking-a-date/1762378#1762378
-	*/
-	$.datepicker._base_selectDate = $.datepicker._selectDate;
-	$.datepicker._selectDate = function (id, dateStr) {
-		var inst = this._getInst($(id)[0]),
-			tp_inst = this._get(inst, 'timepicker'),
-			was_inline;
-
-		if (tp_inst && inst.settings.showTimepicker) {
-			tp_inst._limitMinMaxDateTime(inst, true);
-			was_inline = inst.inline;
-			inst.inline = inst.stay_open = true;
-			//This way the onSelect handler called from calendarpicker get the full dateTime
-			this._base_selectDate(id, dateStr);
-			inst.inline = was_inline;
-			inst.stay_open = false;
-			this._notifyChange(inst);
-			this._updateDatepicker(inst);
-		} else {
-			this._base_selectDate(id, dateStr);
-		}
-	};
-
-	/*
-	* second bad hack :/ override datepicker so it triggers an event when changing the input field
-	* and does not redraw the datepicker on every selectDate event
-	*/
-	$.datepicker._base_updateDatepicker = $.datepicker._updateDatepicker;
-	$.datepicker._updateDatepicker = function (inst) {
-
-		// don't popup the datepicker if there is another instance already opened
-		var input = inst.input[0];
-		if ($.datepicker._curInst && $.datepicker._curInst !== inst && $.datepicker._datepickerShowing && $.datepicker._lastInput !== input) {
-			return;
-		}
-
-		if (typeof(inst.stay_open) !== 'boolean' || inst.stay_open === false) {
-
-			this._base_updateDatepicker(inst);
-
-			// Reload the time control when changing something in the input text field.
-			var tp_inst = this._get(inst, 'timepicker');
-			if (tp_inst) {
-				tp_inst._addTimePicker(inst);
-			}
-		}
-	};
-
-	/*
-	* third bad hack :/ override datepicker so it allows spaces and colon in the input field
-	*/
-	$.datepicker._base_doKeyPress = $.datepicker._doKeyPress;
-	$.datepicker._doKeyPress = function (event) {
-		var inst = $.datepicker._getInst(event.target),
-			tp_inst = $.datepicker._get(inst, 'timepicker');
-
-		if (tp_inst) {
-			if ($.datepicker._get(inst, 'constrainInput')) {
-				var ampm = tp_inst.support.ampm,
-					tz = tp_inst._defaults.showTimezone !== null ? tp_inst._defaults.showTimezone : tp_inst.support.timezone,
-					dateChars = $.datepicker._possibleChars($.datepicker._get(inst, 'dateFormat')),
-					datetimeChars = tp_inst._defaults.timeFormat.toString()
-											.replace(/[hms]/g, '')
-											.replace(/TT/g, ampm ? 'APM' : '')
-											.replace(/Tt/g, ampm ? 'AaPpMm' : '')
-											.replace(/tT/g, ampm ? 'AaPpMm' : '')
-											.replace(/T/g, ampm ? 'AP' : '')
-											.replace(/tt/g, ampm ? 'apm' : '')
-											.replace(/t/g, ampm ? 'ap' : '') + 
-											" " + tp_inst._defaults.separator + 
-											tp_inst._defaults.timeSuffix + 
-											(tz ? tp_inst._defaults.timezoneList.join('') : '') + 
-											(tp_inst._defaults.amNames.join('')) + (tp_inst._defaults.pmNames.join('')) + 
-											dateChars,
-					chr = String.fromCharCode(event.charCode === undefined ? event.keyCode : event.charCode);
-				return event.ctrlKey || (chr < ' ' || !dateChars || datetimeChars.indexOf(chr) > -1);
-			}
-		}
-
-		return $.datepicker._base_doKeyPress(event);
-	};
-
-	/*
-	* Fourth bad hack :/ override _updateAlternate function used in inline mode to init altField
-	* Update any alternate field to synchronise with the main field.
-	*/
-	$.datepicker._base_updateAlternate = $.datepicker._updateAlternate;
-	$.datepicker._updateAlternate = function (inst) {
-		var tp_inst = this._get(inst, 'timepicker');
-		if (tp_inst) {
-			var altField = tp_inst._defaults.altField;
-			if (altField) { // update alternate field too
-				var altFormat = tp_inst._defaults.altFormat || tp_inst._defaults.dateFormat,
-					date = this._getDate(inst),
-					formatCfg = $.datepicker._getFormatConfig(inst),
-					altFormattedDateTime = '', 
-					altSeparator = tp_inst._defaults.altSeparator ? tp_inst._defaults.altSeparator : tp_inst._defaults.separator, 
-					altTimeSuffix = tp_inst._defaults.altTimeSuffix ? tp_inst._defaults.altTimeSuffix : tp_inst._defaults.timeSuffix,
-					altTimeFormat = tp_inst._defaults.altTimeFormat !== null ? tp_inst._defaults.altTimeFormat : tp_inst._defaults.timeFormat;
-				
-				altFormattedDateTime += $.datepicker.formatTime(altTimeFormat, tp_inst, tp_inst._defaults) + altTimeSuffix;
-				if (!tp_inst._defaults.timeOnly && !tp_inst._defaults.altFieldTimeOnly && date !== null) {
-					if (tp_inst._defaults.altFormat) {
-						altFormattedDateTime = $.datepicker.formatDate(tp_inst._defaults.altFormat, date, formatCfg) + altSeparator + altFormattedDateTime;
-					}
-					else {
-						altFormattedDateTime = tp_inst.formattedDate + altSeparator + altFormattedDateTime;
-					}
-				}
-				$(altField).val( inst.input.val() ? altFormattedDateTime : "");
-			}
-		}
-		else {
-			$.datepicker._base_updateAlternate(inst);	
-		}
-	};
-
-	/*
-	* Override key up event to sync manual input changes.
-	*/
-	$.datepicker._base_doKeyUp = $.datepicker._doKeyUp;
-	$.datepicker._doKeyUp = function (event) {
-		var inst = $.datepicker._getInst(event.target),
-			tp_inst = $.datepicker._get(inst, 'timepicker');
-
-		if (tp_inst) {
-			if (tp_inst._defaults.timeOnly && (inst.input.val() !== inst.lastVal)) {
-				try {
-					$.datepicker._updateDatepicker(inst);
-				} catch (err) {
-					$.timepicker.log(err);
-				}
-			}
-		}
-
-		return $.datepicker._base_doKeyUp(event);
-	};
-
-	/*
-	* override "Today" button to also grab the time.
-	*/
-	$.datepicker._base_gotoToday = $.datepicker._gotoToday;
-	$.datepicker._gotoToday = function (id) {
-		var inst = this._getInst($(id)[0]),
-			$dp = inst.dpDiv;
-		this._base_gotoToday(id);
-		var tp_inst = this._get(inst, 'timepicker');
-		selectLocalTimezone(tp_inst);
-		var now = new Date();
-		this._setTime(inst, now);
-		this._setDate(inst, now);
-	};
-
-	/*
-	* Disable & enable the Time in the datetimepicker
-	*/
-	$.datepicker._disableTimepickerDatepicker = function (target) {
-		var inst = this._getInst(target);
-		if (!inst) {
-			return;
-		}
-
-		var tp_inst = this._get(inst, 'timepicker');
-		$(target).datepicker('getDate'); // Init selected[Year|Month|Day]
-		if (tp_inst) {
-			inst.settings.showTimepicker = false;
-			tp_inst._defaults.showTimepicker = false;
-			tp_inst._updateDateTime(inst);
-		}
-	};
-
-	$.datepicker._enableTimepickerDatepicker = function (target) {
-		var inst = this._getInst(target);
-		if (!inst) {
-			return;
-		}
-
-		var tp_inst = this._get(inst, 'timepicker');
-		$(target).datepicker('getDate'); // Init selected[Year|Month|Day]
-		if (tp_inst) {
-			inst.settings.showTimepicker = true;
-			tp_inst._defaults.showTimepicker = true;
-			tp_inst._addTimePicker(inst); // Could be disabled on page load
-			tp_inst._updateDateTime(inst);
-		}
-	};
-
-	/*
-	* Create our own set time function
-	*/
-	$.datepicker._setTime = function (inst, date) {
-		var tp_inst = this._get(inst, 'timepicker');
-		if (tp_inst) {
-			var defaults = tp_inst._defaults;
-
-			// calling _setTime with no date sets time to defaults
-			tp_inst.hour = date ? date.getHours() : defaults.hour;
-			tp_inst.minute = date ? date.getMinutes() : defaults.minute;
-			tp_inst.second = date ? date.getSeconds() : defaults.second;
-			tp_inst.millisec = date ? date.getMilliseconds() : defaults.millisec;
-			tp_inst.microsec = date ? date.getMicroseconds() : defaults.microsec;
-
-			//check if within min/max times.. 
-			tp_inst._limitMinMaxDateTime(inst, true);
-
-			tp_inst._onTimeChange();
-			tp_inst._updateDateTime(inst);
-		}
-	};
-
-	/*
-	* Create new public method to set only time, callable as $().datepicker('setTime', date)
-	*/
-	$.datepicker._setTimeDatepicker = function (target, date, withDate) {
-		var inst = this._getInst(target);
-		if (!inst) {
-			return;
-		}
-
-		var tp_inst = this._get(inst, 'timepicker');
-
-		if (tp_inst) {
-			this._setDateFromField(inst);
-			var tp_date;
-			if (date) {
-				if (typeof date === "string") {
-					tp_inst._parseTime(date, withDate);
-					tp_date = new Date();
-					tp_date.setHours(tp_inst.hour, tp_inst.minute, tp_inst.second, tp_inst.millisec);
-					tp_date.setMicroseconds(tp_inst.microsec);
-				} else {
-					tp_date = new Date(date.getTime());
-					tp_date.setMicroseconds(date.getMicroseconds());
-				}
-				if (tp_date.toString() === 'Invalid Date') {
-					tp_date = undefined;
-				}
-				this._setTime(inst, tp_date);
-			}
-		}
-
-	};
-
-	/*
-	* override setDate() to allow setting time too within Date object
-	*/
-	$.datepicker._base_setDateDatepicker = $.datepicker._setDateDatepicker;
-	$.datepicker._setDateDatepicker = function (target, _date) {
-		var inst = this._getInst(target);
-		var date = _date;
-		if (!inst) {
-			return;
-		}
-
-		if (typeof(_date) === 'string') {
-			date = new Date(_date);
-			if (!date.getTime()) {
-				this._base_setDateDatepicker.apply(this, arguments);
-				date = $(target).datepicker('getDate');
-			}
-		}
-
-		var tp_inst = this._get(inst, 'timepicker');
-		var tp_date;
-		if (date instanceof Date) {
-			tp_date = new Date(date.getTime());
-			tp_date.setMicroseconds(date.getMicroseconds());
-		} else {
-			tp_date = date;
-		}
-		
-		// This is important if you are using the timezone option, javascript's Date 
-		// object will only return the timezone offset for the current locale, so we 
-		// adjust it accordingly.  If not using timezone option this won't matter..
-		// If a timezone is different in tp, keep the timezone as is
-		if (tp_inst && tp_date) {
-			// look out for DST if tz wasn't specified
-			if (!tp_inst.support.timezone && tp_inst._defaults.timezone === null) {
-				tp_inst.timezone = tp_date.getTimezoneOffset() * -1;
-			}
-			date = $.timepicker.timezoneAdjust(date, tp_inst.timezone);
-			tp_date = $.timepicker.timezoneAdjust(tp_date, tp_inst.timezone);
-		}
-
-		this._updateDatepicker(inst);
-		this._base_setDateDatepicker.apply(this, arguments);
-		this._setTimeDatepicker(target, tp_date, true);
-	};
-
-	/*
-	* override getDate() to allow getting time too within Date object
-	*/
-	$.datepicker._base_getDateDatepicker = $.datepicker._getDateDatepicker;
-	$.datepicker._getDateDatepicker = function (target, noDefault) {
-		var inst = this._getInst(target);
-		if (!inst) {
-			return;
-		}
-
-		var tp_inst = this._get(inst, 'timepicker');
-
-		if (tp_inst) {
-			// if it hasn't yet been defined, grab from field
-			if (inst.lastVal === undefined) {
-				this._setDateFromField(inst, noDefault);
-			}
-
-			var date = this._getDate(inst);
-			if (date && tp_inst._parseTime($(target).val(), tp_inst.timeOnly)) {
-				date.setHours(tp_inst.hour, tp_inst.minute, tp_inst.second, tp_inst.millisec);
-				date.setMicroseconds(tp_inst.microsec);
-
-				// This is important if you are using the timezone option, javascript's Date 
-				// object will only return the timezone offset for the current locale, so we 
-				// adjust it accordingly.  If not using timezone option this won't matter..
-				if (tp_inst.timezone != null) {
-					// look out for DST if tz wasn't specified
-					if (!tp_inst.support.timezone && tp_inst._defaults.timezone === null) {
-						tp_inst.timezone = date.getTimezoneOffset() * -1;
-					}
-					date = $.timepicker.timezoneAdjust(date, tp_inst.timezone);
-				}
-			}
-			return date;
-		}
-		return this._base_getDateDatepicker(target, noDefault);
-	};
-
-	/*
-	* override parseDate() because UI 1.8.14 throws an error about "Extra characters"
-	* An option in datapicker to ignore extra format characters would be nicer.
-	*/
-	$.datepicker._base_parseDate = $.datepicker.parseDate;
-	$.datepicker.parseDate = function (format, value, settings) {
-		var date;
-		try {
-			date = this._base_parseDate(format, value, settings);
-		} catch (err) {
-			// Hack!  The error message ends with a colon, a space, and
-			// the "extra" characters.  We rely on that instead of
-			// attempting to perfectly reproduce the parsing algorithm.
-			if (err.indexOf(":") >= 0) {
-				date = this._base_parseDate(format, value.substring(0, value.length - (err.length - err.indexOf(':') - 2)), settings);
-				$.timepicker.log("Error parsing the date string: " + err + "\ndate string = " + value + "\ndate format = " + format);
-			} else {
-				throw err;
-			}
-		}
-		return date;
-	};
-
-	/*
-	* override formatDate to set date with time to the input
-	*/
-	$.datepicker._base_formatDate = $.datepicker._formatDate;
-	$.datepicker._formatDate = function (inst, day, month, year) {
-		var tp_inst = this._get(inst, 'timepicker');
-		if (tp_inst) {
-			tp_inst._updateDateTime(inst);
-			return tp_inst.$input.val();
-		}
-		return this._base_formatDate(inst);
-	};
-
-	/*
-	* override options setter to add time to maxDate(Time) and minDate(Time). MaxDate
-	*/
-	$.datepicker._base_optionDatepicker = $.datepicker._optionDatepicker;
-	$.datepicker._optionDatepicker = function (target, name, value) {
-		var inst = this._getInst(target),
-			name_clone;
-		if (!inst) {
-			return null;
-		}
-
-		var tp_inst = this._get(inst, 'timepicker');
-		if (tp_inst) {
-			var min = null,
-				max = null,
-				onselect = null,
-				overrides = tp_inst._defaults.evnts,
-				fns = {},
-				prop,
-				ret,
-				oldVal,
-				$target;
-			if (typeof name === 'string') { // if min/max was set with the string
-				if (name === 'minDate' || name === 'minDateTime') {
-					min = value;
-				} else if (name === 'maxDate' || name === 'maxDateTime') {
-					max = value;
-				} else if (name === 'onSelect') {
-					onselect = value;
-				} else if (overrides.hasOwnProperty(name)) {
-					if (typeof (value) === 'undefined') {
-						return overrides[name];
-					}
-					fns[name] = value;
-					name_clone = {}; //empty results in exiting function after overrides updated
-				}
-			} else if (typeof name === 'object') { //if min/max was set with the JSON
-				if (name.minDate) {
-					min = name.minDate;
-				} else if (name.minDateTime) {
-					min = name.minDateTime;
-				} else if (name.maxDate) {
-					max = name.maxDate;
-				} else if (name.maxDateTime) {
-					max = name.maxDateTime;
-				}
-				for (prop in overrides) {
-					if (overrides.hasOwnProperty(prop) && name[prop]) {
-						fns[prop] = name[prop];
-					}
-				}
-			}
-			for (prop in fns) {
-				if (fns.hasOwnProperty(prop)) {
-					overrides[prop] = fns[prop];
-					if (!name_clone) { name_clone = $.extend({}, name); }
-					delete name_clone[prop];
-				}
-			}
-			if (name_clone && isEmptyObject(name_clone)) { return; }
-			if (min) { //if min was set
-				if (min === 0) {
-					min = new Date();
-				} else {
-					min = new Date(min);
-				}
-				tp_inst._defaults.minDate = min;
-				tp_inst._defaults.minDateTime = min;
-			} else if (max) { //if max was set
-				if (max === 0) {
-					max = new Date();
-				} else {
-					max = new Date(max);
-				}
-				tp_inst._defaults.maxDate = max;
-				tp_inst._defaults.maxDateTime = max;
-			} else if (onselect) {
-				tp_inst._defaults.onSelect = onselect;
-			}
-
-			// Datepicker will override our date when we call _base_optionDatepicker when 
-			// calling minDate/maxDate, so we will first grab the value, call 
-			// _base_optionDatepicker, then set our value back.
-			if(min || max){
-				$target = $(target);
-				oldVal = $target.datetimepicker('getDate');
-				ret = this._base_optionDatepicker.call($.datepicker, target, name_clone || name, value);
-				$target.datetimepicker('setDate', oldVal);
-				return ret;
-			}
-		}
-		if (value === undefined) {
-			return this._base_optionDatepicker.call($.datepicker, target, name);
-		}
-		return this._base_optionDatepicker.call($.datepicker, target, name_clone || name, value);
-	};
-	
-	/*
-	* jQuery isEmptyObject does not check hasOwnProperty - if someone has added to the object prototype,
-	* it will return false for all objects
-	*/
-	var isEmptyObject = function (obj) {
-		var prop;
-		for (prop in obj) {
-			if (obj.hasOwnProperty(prop)) {
-				return false;
-			}
-		}
-		return true;
-	};
-
-	/*
-	* jQuery extend now ignores nulls!
-	*/
-	var extendRemove = function (target, props) {
-		$.extend(target, props);
-		for (var name in props) {
-			if (props[name] === null || props[name] === undefined) {
-				target[name] = props[name];
-			}
-		}
-		return target;
-	};
-
-	/*
-	* Determine by the time format which units are supported
-	* Returns an object of booleans for each unit
-	*/
-	var detectSupport = function (timeFormat) {
-		var tf = timeFormat.replace(/'.*?'/g, '').toLowerCase(), // removes literals
-			isIn = function (f, t) { // does the format contain the token?
-					return f.indexOf(t) !== -1 ? true : false;
-				};
-		return {
-				hour: isIn(tf, 'h'),
-				minute: isIn(tf, 'm'),
-				second: isIn(tf, 's'),
-				millisec: isIn(tf, 'l'),
-				microsec: isIn(tf, 'c'),
-				timezone: isIn(tf, 'z'),
-				ampm: isIn(tf, 't') && isIn(timeFormat, 'h'),
-				iso8601: isIn(timeFormat, 'Z')
-			};
-	};
-
-	/*
-	* Converts 24 hour format into 12 hour
-	* Returns 12 hour without leading 0
-	*/
-	var convert24to12 = function (hour) {
-		hour %= 12;
-
-		if (hour === 0) {
-			hour = 12;
-		}
-
-		return String(hour);
-	};
-
-	var computeEffectiveSetting = function (settings, property) {
-		return settings && settings[property] ? settings[property] : $.timepicker._defaults[property];
-	};
-
-	/*
-	* Splits datetime string into date and time substrings.
-	* Throws exception when date can't be parsed
-	* Returns {dateString: dateString, timeString: timeString}
-	*/
-	var splitDateTime = function (dateTimeString, timeSettings) {
-		// The idea is to get the number separator occurrences in datetime and the time format requested (since time has
-		// fewer unknowns, mostly numbers and am/pm). We will use the time pattern to split.
-		var separator = computeEffectiveSetting(timeSettings, 'separator'),
-			format = computeEffectiveSetting(timeSettings, 'timeFormat'),
-			timeParts = format.split(separator), // how many occurrences of separator may be in our format?
-			timePartsLen = timeParts.length,
-			allParts = dateTimeString.split(separator),
-			allPartsLen = allParts.length;
-
-		if (allPartsLen > 1) {
-			return {
-				dateString: allParts.splice(0, allPartsLen - timePartsLen).join(separator),
-				timeString: allParts.splice(0, timePartsLen).join(separator)
-			};
-		}
-
-		return {
-			dateString: dateTimeString,
-			timeString: ''
-		};
-	};
-
-	/*
-	* Internal function to parse datetime interval
-	* Returns: {date: Date, timeObj: Object}, where
-	*   date - parsed date without time (type Date)
-	*   timeObj = {hour: , minute: , second: , millisec: , microsec: } - parsed time. Optional
-	*/
-	var parseDateTimeInternal = function (dateFormat, timeFormat, dateTimeString, dateSettings, timeSettings) {
-		var date,
-			parts,
-			parsedTime;
-
-		parts = splitDateTime(dateTimeString, timeSettings);
-		date = $.datepicker._base_parseDate(dateFormat, parts.dateString, dateSettings);
-
-		if (parts.timeString === '') {
-			return {
-				date: date
-			};
-		}
-
-		parsedTime = $.datepicker.parseTime(timeFormat, parts.timeString, timeSettings);
-
-		if (!parsedTime) {
-			throw 'Wrong time format';
-		}
-
-		return {
-			date: date,
-			timeObj: parsedTime
-		};
-	};
-
-	/*
-	* Internal function to set timezone_select to the local timezone
-	*/
-	var selectLocalTimezone = function (tp_inst, date) {
-		if (tp_inst && tp_inst.timezone_select) {
-			var now = date || new Date();
-			tp_inst.timezone_select.val(-now.getTimezoneOffset());
-		}
-	};
-
-	/*
-	* Create a Singleton Instance
-	*/
-	$.timepicker = new Timepicker();
-
-	/**
-	 * Get the timezone offset as string from a date object (eg '+0530' for UTC+5.5)
-	 * @param {number} tzMinutes if not a number, less than -720 (-1200), or greater than 840 (+1400) this value is returned
-	 * @param {boolean} iso8601 if true formats in accordance to iso8601 "+12:45"
-	 * @return {string}
-	 */
-	$.timepicker.timezoneOffsetString = function (tzMinutes, iso8601) {
-		if (isNaN(tzMinutes) || tzMinutes > 840 || tzMinutes < -720) {
-			return tzMinutes;
-		}
-
-		var off = tzMinutes,
-			minutes = off % 60,
-			hours = (off - minutes) / 60,
-			iso = iso8601 ? ':' : '',
-			tz = (off >= 0 ? '+' : '-') + ('0' + Math.abs(hours)).slice(-2) + iso + ('0' + Math.abs(minutes)).slice(-2);
-		
-		if (tz === '+00:00') {
-			return 'Z';
-		}
-		return tz;
-	};
-
-	/**
-	 * Get the number in minutes that represents a timezone string
-	 * @param  {string} tzString formatted like "+0500", "-1245", "Z"
-	 * @return {number} the offset minutes or the original string if it doesn't match expectations
-	 */
-	$.timepicker.timezoneOffsetNumber = function (tzString) {
-		var normalized = tzString.toString().replace(':', ''); // excuse any iso8601, end up with "+1245"
-
-		if (normalized.toUpperCase() === 'Z') { // if iso8601 with Z, its 0 minute offset
-			return 0;
-		}
-
-		if (!/^(\-|\+)\d{4}$/.test(normalized)) { // possibly a user defined tz, so just give it back
-			return tzString;
-		}
-
-		return ((normalized.substr(0, 1) === '-' ? -1 : 1) * // plus or minus
-					((parseInt(normalized.substr(1, 2), 10) * 60) + // hours (converted to minutes)
-					parseInt(normalized.substr(3, 2), 10))); // minutes
-	};
-
-	/**
-	 * No way to set timezone in js Date, so we must adjust the minutes to compensate. (think setDate, getDate)
-	 * @param  {Date} date
-	 * @param  {string} toTimezone formatted like "+0500", "-1245"
-	 * @return {Date}
-	 */
-	$.timepicker.timezoneAdjust = function (date, toTimezone) {
-		var toTz = $.timepicker.timezoneOffsetNumber(toTimezone);
-		if (!isNaN(toTz)) {
-			date.setMinutes(date.getMinutes() + -date.getTimezoneOffset() - toTz);
-		}
-		return date;
-	};
-
-	/**
-	 * Calls `timepicker()` on the `startTime` and `endTime` elements, and configures them to
-	 * enforce date range limits.
-	 * n.b. The input value must be correctly formatted (reformatting is not supported)
-	 * @param  {Element} startTime
-	 * @param  {Element} endTime
-	 * @param  {Object} options Options for the timepicker() call
-	 * @return {jQuery}
-	 */
-	$.timepicker.timeRange = function (startTime, endTime, options) {
-		return $.timepicker.handleRange('timepicker', startTime, endTime, options);
-	};
-
-	/**
-	 * Calls `datetimepicker` on the `startTime` and `endTime` elements, and configures them to
-	 * enforce date range limits.
-	 * @param  {Element} startTime
-	 * @param  {Element} endTime
-	 * @param  {Object} options Options for the `timepicker()` call. Also supports `reformat`,
-	 *   a boolean value that can be used to reformat the input values to the `dateFormat`.
-	 * @param  {string} method Can be used to specify the type of picker to be added
-	 * @return {jQuery}
-	 */
-	$.timepicker.datetimeRange = function (startTime, endTime, options) {
-		$.timepicker.handleRange('datetimepicker', startTime, endTime, options);
-	};
-
-	/**
-	 * Calls `datepicker` on the `startTime` and `endTime` elements, and configures them to
-	 * enforce date range limits.
-	 * @param  {Element} startTime
-	 * @param  {Element} endTime
-	 * @param  {Object} options Options for the `timepicker()` call. Also supports `reformat`,
-	 *   a boolean value that can be used to reformat the input values to the `dateFormat`.
-	 * @return {jQuery}
-	 */
-	$.timepicker.dateRange = function (startTime, endTime, options) {
-		$.timepicker.handleRange('datepicker', startTime, endTime, options);
-	};
-
-	/**
-	 * Calls `method` on the `startTime` and `endTime` elements, and configures them to
-	 * enforce date range limits.
-	 * @param  {string} method Can be used to specify the type of picker to be added
-	 * @param  {Element} startTime
-	 * @param  {Element} endTime
-	 * @param  {Object} options Options for the `timepicker()` call. Also supports `reformat`,
-	 *   a boolean value that can be used to reformat the input values to the `dateFormat`.
-	 * @return {jQuery}
-	 */
-	$.timepicker.handleRange = function (method, startTime, endTime, options) {
-		options = $.extend({}, {
-			minInterval: 0, // min allowed interval in milliseconds
-			maxInterval: 0, // max allowed interval in milliseconds
-			start: {},      // options for start picker
-			end: {}         // options for end picker
-		}, options);
-
-		// for the mean time this fixes an issue with calling getDate with timepicker()
-		var timeOnly = false;
-		if(method === 'timepicker'){
-			timeOnly = true;
-			method = 'datetimepicker';
-		}
-
-		function checkDates(changed, other) {
-			var startdt = startTime[method]('getDate'),
-				enddt = endTime[method]('getDate'),
-				changeddt = changed[method]('getDate');
-
-			if (startdt !== null) {
-				var minDate = new Date(startdt.getTime()),
-					maxDate = new Date(startdt.getTime());
-
-				minDate.setMilliseconds(minDate.getMilliseconds() + options.minInterval);
-				maxDate.setMilliseconds(maxDate.getMilliseconds() + options.maxInterval);
-
-				if (options.minInterval > 0 && minDate > enddt) { // minInterval check
-					endTime[method]('setDate', minDate);
-				}
-				else if (options.maxInterval > 0 && maxDate < enddt) { // max interval check
-					endTime[method]('setDate', maxDate);
-				}
-				else if (startdt > enddt) {
-					other[method]('setDate', changeddt);
-				}
-			}
-		}
-
-		function selected(changed, other, option) {
-			if (!changed.val()) {
-				return;
-			}
-			var date = changed[method].call(changed, 'getDate');
-			if (date !== null && options.minInterval > 0) {
-				if (option === 'minDate') {
-					date.setMilliseconds(date.getMilliseconds() + options.minInterval);
-				}
-				if (option === 'maxDate') {
-					date.setMilliseconds(date.getMilliseconds() - options.minInterval);
-				}
-			}
-			
-			if (date.getTime) {
-				other[method].call(other, 'option', option, date);
-			}
-		}
-
-		$.fn[method].call(startTime, $.extend({
-			timeOnly: timeOnly,
-			onClose: function (dateText, inst) {
-				checkDates($(this), endTime);
-			},
-			onSelect: function (selectedDateTime) {
-				selected($(this), endTime, 'minDate');
-			}
-		}, options, options.start));
-		$.fn[method].call(endTime, $.extend({
-			timeOnly: timeOnly,
-			onClose: function (dateText, inst) {
-				checkDates($(this), startTime);
-			},
-			onSelect: function (selectedDateTime) {
-				selected($(this), startTime, 'maxDate');
-			}
-		}, options, options.end));
-
-		checkDates(startTime, endTime);
-		
-		selected(startTime, endTime, 'minDate');
-		selected(endTime, startTime, 'maxDate');
-
-		return $([startTime.get(0), endTime.get(0)]);
-	};
-
-	/**
-	 * Log error or data to the console during error or debugging
-	 * @param  {Object} err pass any type object to log to the console during error or debugging
-	 * @return {void}
-	 */
-	$.timepicker.log = function () {
-		if (window.console) {
-			window.console.log.apply(window.console, Array.prototype.slice.call(arguments));
-		}
-	};
-
-	/*
-	 * Add util object to allow access to private methods for testability.
-	 */
-	$.timepicker._util = {
-		_extendRemove: extendRemove,
-		_isEmptyObject: isEmptyObject,
-		_convert24to12: convert24to12,
-		_detectSupport: detectSupport,
-		_selectLocalTimezone: selectLocalTimezone,
-		_computeEffectiveSetting: computeEffectiveSetting,
-		_splitDateTime: splitDateTime,
-		_parseDateTimeInternal: parseDateTimeInternal
-	};
-
-	/*
-	* Microsecond support
-	*/
-	if (!Date.prototype.getMicroseconds) {
-		Date.prototype.microseconds = 0;
-		Date.prototype.getMicroseconds = function () { return this.microseconds; };
-		Date.prototype.setMicroseconds = function (m) {
-			this.setMilliseconds(this.getMilliseconds() + Math.floor(m / 1000));
-			this.microseconds = m % 1000;
-			return this;
-		};
-	}
-
-	/*
-	* Keep up with the version
-	*/
-	$.timepicker.version = "1.5.0";
-
-})(jQuery);
diff --git a/#pma/js/jquery/jquery.ba-hashchange-1.3.js b/#pma/js/jquery/jquery.ba-hashchange-1.3.js
deleted file mode 100644
index 59bfd4ab..00000000
--- a/#pma/js/jquery/jquery.ba-hashchange-1.3.js
+++ /dev/null
@@ -1,390 +0,0 @@
-/*!
- * jQuery hashchange event - v1.3 - 7/21/2010
- * http://benalman.com/projects/jquery-hashchange-plugin/
- * 
- * Copyright (c) 2010 "Cowboy" Ben Alman
- * Dual licensed under the MIT and GPL licenses.
- * http://benalman.com/about/license/
- */
-
-// Script: jQuery hashchange event
-//
-// *Version: 1.3, Last updated: 7/21/2010*
-// 
-// Project Home - http://benalman.com/projects/jquery-hashchange-plugin/
-// GitHub       - http://github.com/cowboy/jquery-hashchange/
-// Source       - http://github.com/cowboy/jquery-hashchange/raw/master/jquery.ba-hashchange.js
-// (Minified)   - http://github.com/cowboy/jquery-hashchange/raw/master/jquery.ba-hashchange.min.js (0.8kb gzipped)
-// 
-// About: License
-// 
-// Copyright (c) 2010 "Cowboy" Ben Alman,
-// Dual licensed under the MIT and GPL licenses.
-// http://benalman.com/about/license/
-// 
-// About: Examples
-// 
-// These working examples, complete with fully commented code, illustrate a few
-// ways in which this plugin can be used.
-// 
-// hashchange event - http://benalman.com/code/projects/jquery-hashchange/examples/hashchange/
-// document.domain - http://benalman.com/code/projects/jquery-hashchange/examples/document_domain/
-// 
-// About: Support and Testing
-// 
-// Information about what version or versions of jQuery this plugin has been
-// tested with, what browsers it has been tested in, and where the unit tests
-// reside (so you can test it yourself).
-// 
-// jQuery Versions - 1.2.6, 1.3.2, 1.4.1, 1.4.2
-// Browsers Tested - Internet Explorer 6-8, Firefox 2-4, Chrome 5-6, Safari 3.2-5,
-//                   Opera 9.6-10.60, iPhone 3.1, Android 1.6-2.2, BlackBerry 4.6-5.
-// Unit Tests      - http://benalman.com/code/projects/jquery-hashchange/unit/
-// 
-// About: Known issues
-// 
-// While this jQuery hashchange event implementation is quite stable and
-// robust, there are a few unfortunate browser bugs surrounding expected
-// hashchange event-based behaviors, independent of any JavaScript
-// window.onhashchange abstraction. See the following examples for more
-// information:
-// 
-// Chrome: Back Button - http://benalman.com/code/projects/jquery-hashchange/examples/bug-chrome-back-button/
-// Firefox: Remote XMLHttpRequest - http://benalman.com/code/projects/jquery-hashchange/examples/bug-firefox-remote-xhr/
-// WebKit: Back Button in an Iframe - http://benalman.com/code/projects/jquery-hashchange/examples/bug-webkit-hash-iframe/
-// Safari: Back Button from a different domain - http://benalman.com/code/projects/jquery-hashchange/examples/bug-safari-back-from-diff-domain/
-// 
-// Also note that should a browser natively support the window.onhashchange 
-// event, but not report that it does, the fallback polling loop will be used.
-// 
-// About: Release History
-// 
-// 1.3   - (7/21/2010) Reorganized IE6/7 Iframe code to make it more
-//         "removable" for mobile-only development. Added IE6/7 document.title
-//         support. Attempted to make Iframe as hidden as possible by using
-//         techniques from http://www.paciellogroup.com/blog/?p=604. Added 
-//         support for the "shortcut" format $(window).hashchange( fn ) and
-//         $(window).hashchange() like jQuery provides for built-in events.
-//         Renamed jQuery.hashchangeDelay to <jQuery.fn.hashchange.delay> and
-//         lowered its default value to 50. Added <jQuery.fn.hashchange.domain>
-//         and <jQuery.fn.hashchange.src> properties plus document-domain.html
-//         file to address access denied issues when setting document.domain in
-//         IE6/7.
-// 1.2   - (2/11/2010) Fixed a bug where coming back to a page using this plugin
-//         from a page on another domain would cause an error in Safari 4. Also,
-//         IE6/7 Iframe is now inserted after the body (this actually works),
-//         which prevents the page from scrolling when the event is first bound.
-//         Event can also now be bound before DOM ready, but it won't be usable
-//         before then in IE6/7.
-// 1.1   - (1/21/2010) Incorporated document.documentMode test to fix IE8 bug
-//         where browser version is incorrectly reported as 8.0, despite
-//         inclusion of the X-UA-Compatible IE=EmulateIE7 meta tag.
-// 1.0   - (1/9/2010) Initial Release. Broke out the jQuery BBQ event.special
-//         window.onhashchange functionality into a separate plugin for users
-//         who want just the basic event & back button support, without all the
-//         extra awesomeness that BBQ provides. This plugin will be included as
-//         part of jQuery BBQ, but also be available separately.
-
-(function($,window,undefined){
-  '$:nomunge'; // Used by YUI compressor.
-  
-  // Reused string.
-  var str_hashchange = 'hashchange',
-    
-    // Method / object references.
-    doc = document,
-    fake_onhashchange,
-    special = $.event.special,
-    
-    // Does the browser support window.onhashchange? Note that IE8 running in
-    // IE7 compatibility mode reports true for 'onhashchange' in window, even
-    // though the event isn't supported, so also test document.documentMode.
-    doc_mode = doc.documentMode,
-    supports_onhashchange = 'on' + str_hashchange in window && ( doc_mode === undefined || doc_mode > 7 );
-  
-  // Get location.hash (or what you'd expect location.hash to be) sans any
-  // leading #. Thanks for making this necessary, Firefox!
-  function get_fragment( url ) {
-    url = url || location.href;
-    return '#' + url.replace( /^[^#]*#?(.*)$/, '$1' );
-  };
-  
-  // Method: jQuery.fn.hashchange
-  // 
-  // Bind a handler to the window.onhashchange event or trigger all bound
-  // window.onhashchange event handlers. This behavior is consistent with
-  // jQuery's built-in event handlers.
-  // 
-  // Usage:
-  // 
-  // > jQuery(window).hashchange( [ handler ] );
-  // 
-  // Arguments:
-  // 
-  //  handler - (Function) Optional handler to be bound to the hashchange
-  //    event. This is a "shortcut" for the more verbose form:
-  //    jQuery(window).bind( 'hashchange', handler ). If handler is omitted,
-  //    all bound window.onhashchange event handlers will be triggered. This
-  //    is a shortcut for the more verbose
-  //    jQuery(window).trigger( 'hashchange' ). These forms are described in
-  //    the <hashchange event> section.
-  // 
-  // Returns:
-  // 
-  //  (jQuery) The initial jQuery collection of elements.
-  
-  // Allow the "shortcut" format $(elem).hashchange( fn ) for binding and
-  // $(elem).hashchange() for triggering, like jQuery does for built-in events.
-  $.fn[ str_hashchange ] = function( fn ) {
-    return fn ? this.bind( str_hashchange, fn ) : this.trigger( str_hashchange );
-  };
-  
-  // Property: jQuery.fn.hashchange.delay
-  // 
-  // The numeric interval (in milliseconds) at which the <hashchange event>
-  // polling loop executes. Defaults to 50.
-  
-  // Property: jQuery.fn.hashchange.domain
-  // 
-  // If you're setting document.domain in your JavaScript, and you want hash
-  // history to work in IE6/7, not only must this property be set, but you must
-  // also set document.domain BEFORE jQuery is loaded into the page. This
-  // property is only applicable if you are supporting IE6/7 (or IE8 operating
-  // in "IE7 compatibility" mode).
-  // 
-  // In addition, the <jQuery.fn.hashchange.src> property must be set to the
-  // path of the included "document-domain.html" file, which can be renamed or
-  // modified if necessary (note that the document.domain specified must be the
-  // same in both your main JavaScript as well as in this file).
-  // 
-  // Usage:
-  // 
-  // jQuery.fn.hashchange.domain = document.domain;
-  
-  // Property: jQuery.fn.hashchange.src
-  // 
-  // If, for some reason, you need to specify an Iframe src file (for example,
-  // when setting document.domain as in <jQuery.fn.hashchange.domain>), you can
-  // do so using this property. Note that when using this property, history
-  // won't be recorded in IE6/7 until the Iframe src file loads. This property
-  // is only applicable if you are supporting IE6/7 (or IE8 operating in "IE7
-  // compatibility" mode).
-  // 
-  // Usage:
-  // 
-  // jQuery.fn.hashchange.src = 'path/to/file.html';
-  
-  $.fn[ str_hashchange ].delay = 50;
-  /*
-  $.fn[ str_hashchange ].domain = null;
-  $.fn[ str_hashchange ].src = null;
-  */
-  
-  // Event: hashchange event
-  // 
-  // Fired when location.hash changes. In browsers that support it, the native
-  // HTML5 window.onhashchange event is used, otherwise a polling loop is
-  // initialized, running every <jQuery.fn.hashchange.delay> milliseconds to
-  // see if the hash has changed. In IE6/7 (and IE8 operating in "IE7
-  // compatibility" mode), a hidden Iframe is created to allow the back button
-  // and hash-based history to work.
-  // 
-  // Usage as described in <jQuery.fn.hashchange>:
-  // 
-  // > // Bind an event handler.
-  // > jQuery(window).hashchange( function(e) {
-  // >   var hash = location.hash;
-  // >   ...
-  // > });
-  // > 
-  // > // Manually trigger the event handler.
-  // > jQuery(window).hashchange();
-  // 
-  // A more verbose usage that allows for event namespacing:
-  // 
-  // > // Bind an event handler.
-  // > jQuery(window).bind( 'hashchange', function(e) {
-  // >   var hash = location.hash;
-  // >   ...
-  // > });
-  // > 
-  // > // Manually trigger the event handler.
-  // > jQuery(window).trigger( 'hashchange' );
-  // 
-  // Additional Notes:
-  // 
-  // * The polling loop and Iframe are not created until at least one handler
-  //   is actually bound to the 'hashchange' event.
-  // * If you need the bound handler(s) to execute immediately, in cases where
-  //   a location.hash exists on page load, via bookmark or page refresh for
-  //   example, use jQuery(window).hashchange() or the more verbose 
-  //   jQuery(window).trigger( 'hashchange' ).
-  // * The event can be bound before DOM ready, but since it won't be usable
-  //   before then in IE6/7 (due to the necessary Iframe), recommended usage is
-  //   to bind it inside a DOM ready handler.
-  
-  // Override existing $.event.special.hashchange methods (allowing this plugin
-  // to be defined after jQuery BBQ in BBQ's source code).
-  special[ str_hashchange ] = $.extend( special[ str_hashchange ], {
-    
-    // Called only when the first 'hashchange' event is bound to window.
-    setup: function() {
-      // If window.onhashchange is supported natively, there's nothing to do..
-      if ( supports_onhashchange ) { return false; }
-      
-      // Otherwise, we need to create our own. And we don't want to call this
-      // until the user binds to the event, just in case they never do, since it
-      // will create a polling loop and possibly even a hidden Iframe.
-      $( fake_onhashchange.start );
-    },
-    
-    // Called only when the last 'hashchange' event is unbound from window.
-    teardown: function() {
-      // If window.onhashchange is supported natively, there's nothing to do..
-      if ( supports_onhashchange ) { return false; }
-      
-      // Otherwise, we need to stop ours (if possible).
-      $( fake_onhashchange.stop );
-    }
-    
-  });
-  
-  // fake_onhashchange does all the work of triggering the window.onhashchange
-  // event for browsers that don't natively support it, including creating a
-  // polling loop to watch for hash changes and in IE 6/7 creating a hidden
-  // Iframe to enable back and forward.
-  fake_onhashchange = (function(){
-    var self = {},
-      timeout_id,
-      
-      // Remember the initial hash so it doesn't get triggered immediately.
-      last_hash = get_fragment(),
-      
-      fn_retval = function(val){ return val; },
-      history_set = fn_retval,
-      history_get = fn_retval;
-    
-    // Start the polling loop.
-    self.start = function() {
-      timeout_id || poll();
-    };
-    
-    // Stop the polling loop.
-    self.stop = function() {
-      timeout_id && clearTimeout( timeout_id );
-      timeout_id = undefined;
-    };
-    
-    // This polling loop checks every $.fn.hashchange.delay milliseconds to see
-    // if location.hash has changed, and triggers the 'hashchange' event on
-    // window when necessary.
-    function poll() {
-      var hash = get_fragment(),
-        history_hash = history_get( last_hash );
-      
-      if ( hash !== last_hash ) {
-        history_set( last_hash = hash, history_hash );
-        
-        $(window).trigger( str_hashchange );
-        
-      } else if ( history_hash !== last_hash ) {
-        location.href = location.href.replace( /#.*/, '' ) + history_hash;
-      }
-      
-      timeout_id = setTimeout( poll, $.fn[ str_hashchange ].delay );
-    };
-    
-    // vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
-    // vvvvvvvvvvvvvvvvvvv REMOVE IF NOT SUPPORTING IE6/7/8 vvvvvvvvvvvvvvvvvvv
-    // vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
-    (window.navigator.userAgent.indexOf("MSIE ") > -1 || !!window.navigator.userAgent.match(/Trident.*rv\:11\./)) && !supports_onhashchange && (function(){
-      // Not only do IE6/7 need the "magical" Iframe treatment, but so does IE8
-      // when running in "IE7 compatibility" mode.
-      
-      var iframe,
-        iframe_src;
-      
-      // When the event is bound and polling starts in IE 6/7, create a hidden
-      // Iframe for history handling.
-      self.start = function(){
-        if ( !iframe ) {
-          iframe_src = $.fn[ str_hashchange ].src;
-          iframe_src = iframe_src && iframe_src + get_fragment();
-          
-          // Create hidden Iframe. Attempt to make Iframe as hidden as possible
-          // by using techniques from http://www.paciellogroup.com/blog/?p=604.
-          iframe = $('<iframe tabindex="-1" title="empty"/>').hide()
-            
-            // When Iframe has completely loaded, initialize the history and
-            // start polling.
-            .one( 'load', function(){
-              iframe_src || history_set( get_fragment() );
-              poll();
-            })
-            
-            // Load Iframe src if specified, otherwise nothing.
-            .attr( 'src', iframe_src || 'javascript:0' )
-            
-            // Append Iframe after the end of the body to prevent unnecessary
-            // initial page scrolling (yes, this works).
-            .insertAfter( 'body' )[0].contentWindow;
-          
-          // Whenever `document.title` changes, update the Iframe's title to
-          // prettify the back/next history menu entries. Since IE sometimes
-          // errors with "Unspecified error" the very first time this is set
-          // (yes, very useful) wrap this with a try/catch block.
-          doc.onpropertychange = function(){
-            try {
-              if ( event.propertyName === 'title' ) {
-                iframe.document.title = doc.title;
-              }
-            } catch(e) {}
-          };
-          
-        }
-      };
-      
-      // Override the "stop" method since an IE6/7 Iframe was created. Even
-      // if there are no longer any bound event handlers, the polling loop
-      // is still necessary for back/next to work at all!
-      self.stop = fn_retval;
-      
-      // Get history by looking at the hidden Iframe's location.hash.
-      history_get = function() {
-        return get_fragment( iframe.location.href );
-      };
-      
-      // Set a new history item by opening and then closing the Iframe
-      // document, *then* setting its location.hash. If document.domain has
-      // been set, update that as well.
-      history_set = function( hash, history_hash ) {
-        var iframe_doc = iframe.document,
-          domain = $.fn[ str_hashchange ].domain;
-        
-        if ( hash !== history_hash ) {
-          // Update Iframe with any initial `document.title` that might be set.
-          iframe_doc.title = doc.title;
-          
-          // Opening the Iframe's document after it has been closed is what
-          // actually adds a history entry.
-          iframe_doc.open();
-          
-          // Set document.domain for the Iframe document as well, if necessary.
-          domain && iframe_doc.write( '<script>document.domain="' + domain + '"</script>' );
-          
-          iframe_doc.close();
-          
-          // Update the Iframe's hash, for great justice.
-          iframe.location.hash = hash;
-        }
-      };
-      
-    })();
-    // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-    // ^^^^^^^^^^^^^^^^^^^ REMOVE IF NOT SUPPORTING IE6/7/8 ^^^^^^^^^^^^^^^^^^^
-    // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-    
-    return self;
-  })();
-  
-})(jQuery,this);
diff --git a/#pma/js/jquery/jquery.cookie.js b/#pma/js/jquery/jquery.cookie.js
deleted file mode 100644
index 61d3bcef..00000000
--- a/#pma/js/jquery/jquery.cookie.js
+++ /dev/null
@@ -1,91 +0,0 @@
-/*jslint browser: true */ /*global jQuery: true */
-
-/**
- * jQuery Cookie plugin
- *
- * Copyright (c) 2010 Klaus Hartl (stilbuero.de)
- * Dual licensed under the MIT and GPL licenses:
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl.html
- *
- */
-
-// TODO JsDoc
-
-/**
- * Create a cookie with the given key and value and other optional parameters.
- *
- * @example $.cookie('the_cookie', 'the_value');
- * @desc Set the value of a cookie.
- * @example $.cookie('the_cookie', 'the_value', { expires: 7, path: '/', domain: 'jquery.com', secure: true });
- * @desc Create a cookie with all available options.
- * @example $.cookie('the_cookie', 'the_value');
- * @desc Create a session cookie.
- * @example $.cookie('the_cookie', null);
- * @desc Delete a cookie by passing null as value. Keep in mind that you have to use the same path and domain
- *       used when the cookie was set.
- *
- * @param String key The key of the cookie.
- * @param String value The value of the cookie.
- * @param Object options An object literal containing key/value pairs to provide optional cookie attributes.
- * @option Number|Date expires Either an integer specifying the expiration date from now on in days or a Date object.
- *                             If a negative value is specified (e.g. a date in the past), the cookie will be deleted.
- *                             If set to null or omitted, the cookie will be a session cookie and will not be retained
- *                             when the the browser exits.
- * @option String path The value of the path atribute of the cookie (default: path of page that created the cookie).
- * @option String domain The value of the domain attribute of the cookie (default: domain of page that created the cookie).
- * @option Boolean secure If true, the secure attribute of the cookie will be set and the cookie transmission will
- *                        require a secure protocol (like HTTPS).
- * @type undefined
- *
- * @name $.cookie
- * @cat Plugins/Cookie
- * @author Klaus Hartl/klaus.hartl@stilbuero.de
- */
-
-/**
- * Get the value of a cookie with the given key.
- *
- * @example $.cookie('the_cookie');
- * @desc Get the value of a cookie.
- *
- * @param String key The key of the cookie.
- * @return The value of the cookie.
- * @type String
- *
- * @name $.cookie
- * @cat Plugins/Cookie
- * @author Klaus Hartl/klaus.hartl@stilbuero.de
- */
-jQuery.cookie = function (key, value, options) {
-    
-    // key and at least value given, set cookie...
-    if (arguments.length > 1 && String(value) !== "[object Object]") {
-        options = jQuery.extend({}, options);
-
-        if (value === null || value === undefined) {
-            options.expires = -1;
-        }
-
-        if (typeof options.expires === 'number') {
-            var days = options.expires, t = options.expires = new Date();
-            t.setDate(t.getDate() + days);
-        }
-        
-        value = String(value);
-        
-        return (document.cookie = [
-            encodeURIComponent(key), '=',
-            options.raw ? value : encodeURIComponent(value),
-            options.expires ? '; expires=' + options.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE
-            options.path ? '; path=' + options.path : '',
-            options.domain ? '; domain=' + options.domain : '',
-            options.secure ? '; secure' : ''
-        ].join(''));
-    }
-
-    // key and possibly options given, get cookie...
-    options = value || {};
-    var result, decode = options.raw ? function (s) { return s; } : decodeURIComponent;
-    return (result = new RegExp('(?:^|; )' + encodeURIComponent(key) + '=([^;]*)').exec(document.cookie)) ? decode(result[1]) : null;
-};
diff --git a/#pma/js/jquery/jquery.debounce-1.0.5.js b/#pma/js/jquery/jquery.debounce-1.0.5.js
deleted file mode 100644
index 020128cb..00000000
--- a/#pma/js/jquery/jquery.debounce-1.0.5.js
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * Debounce and throttle function's decorator plugin 1.0.5
- *
- * Copyright (c) 2009 Filatov Dmitry (alpha@zforms.ru)
- * Dual licensed under the MIT and GPL licenses:
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl.html
- *
- */
-
-(function($) {
-
-$.extend({
-
-	debounce : function(fn, timeout, invokeAsap, ctx) {
-
-		if(arguments.length == 3 && typeof invokeAsap != 'boolean') {
-			ctx = invokeAsap;
-			invokeAsap = false;
-		}
-
-		var timer;
-
-		return function() {
-
-			var args = arguments;
-            ctx = ctx || this;
-
-			invokeAsap && !timer && fn.apply(ctx, args);
-
-			clearTimeout(timer);
-
-			timer = setTimeout(function() {
-				!invokeAsap && fn.apply(ctx, args);
-				timer = null;
-			}, timeout);
-
-		};
-
-	},
-
-	throttle : function(fn, timeout, ctx) {
-
-		var timer, args, needInvoke;
-
-		return function() {
-
-			args = arguments;
-			needInvoke = true;
-			ctx = ctx || this;
-
-			if(!timer) {
-				(function() {
-					if(needInvoke) {
-						fn.apply(ctx, args);
-						needInvoke = false;
-						timer = setTimeout(arguments.callee, timeout);
-					}
-					else {
-						timer = null;
-					}
-				})();
-			}
-
-		};
-
-	}
-
-});
-
-})(jQuery);
\ No newline at end of file
diff --git a/#pma/js/jquery/jquery.event.drag-2.2.js b/#pma/js/jquery/jquery.event.drag-2.2.js
deleted file mode 100644
index 1cda0e21..00000000
--- a/#pma/js/jquery/jquery.event.drag-2.2.js
+++ /dev/null
@@ -1,402 +0,0 @@
-/*! 
- * jquery.event.drag - v 2.2
- * Copyright (c) 2010 Three Dub Media - http://threedubmedia.com
- * Open Source MIT License - http://threedubmedia.com/code/license
- */
-// Created: 2008-06-04 
-// Updated: 2012-05-21
-// REQUIRES: jquery 1.7.x
-
-;(function( $ ){
-
-// add the jquery instance method
-$.fn.drag = function( str, arg, opts ){
-	// figure out the event type
-	var type = typeof str == "string" ? str : "",
-	// figure out the event handler...
-	fn = $.isFunction( str ) ? str : $.isFunction( arg ) ? arg : null;
-	// fix the event type
-	if ( type.indexOf("drag") !== 0 ) 
-		type = "drag"+ type;
-	// were options passed
-	opts = ( str == fn ? arg : opts ) || {};
-	// trigger or bind event handler
-	return fn ? this.bind( type, opts, fn ) : this.trigger( type );
-};
-
-// local refs (increase compression)
-var $event = $.event, 
-$special = $event.special,
-// configure the drag special event 
-drag = $special.drag = {
-	
-	// these are the default settings
-	defaults: {
-		which: 1, // mouse button pressed to start drag sequence
-		distance: 0, // distance dragged before dragstart
-		not: ':input', // selector to suppress dragging on target elements
-		handle: null, // selector to match handle target elements
-		relative: false, // true to use "position", false to use "offset"
-		drop: true, // false to suppress drop events, true or selector to allow
-		click: false // false to suppress click events after dragend (no proxy)
-	},
-	
-	// the key name for stored drag data
-	datakey: "dragdata",
-	
-	// prevent bubbling for better performance
-	noBubble: true,
-	
-	// count bound related events
-	add: function( obj ){ 
-		// read the interaction data
-		var data = $.data( this, drag.datakey ),
-		// read any passed options 
-		opts = obj.data || {};
-		// count another realted event
-		data.related += 1;
-		// extend data options bound with this event
-		// don't iterate "opts" in case it is a node 
-		$.each( drag.defaults, function( key, def ){
-			if ( opts[ key ] !== undefined )
-				data[ key ] = opts[ key ];
-		});
-	},
-	
-	// forget unbound related events
-	remove: function(){
-		$.data( this, drag.datakey ).related -= 1;
-	},
-	
-	// configure interaction, capture settings
-	setup: function(){
-		// check for related events
-		if ( $.data( this, drag.datakey ) ) 
-			return;
-		// initialize the drag data with copied defaults
-		var data = $.extend({ related:0 }, drag.defaults );
-		// store the interaction data
-		$.data( this, drag.datakey, data );
-		// bind the mousedown event, which starts drag interactions
-		$event.add( this, "touchstart mousedown", drag.init, data );
-		// prevent image dragging in IE...
-		if ( this.attachEvent ) 
-			this.attachEvent("ondragstart", drag.dontstart ); 
-	},
-	
-	// destroy configured interaction
-	teardown: function(){
-		var data = $.data( this, drag.datakey ) || {};
-		// check for related events
-		if ( data.related ) 
-			return;
-		// remove the stored data
-		$.removeData( this, drag.datakey );
-		// remove the mousedown event
-		$event.remove( this, "touchstart mousedown", drag.init );
-		// enable text selection
-		drag.textselect( true ); 
-		// un-prevent image dragging in IE...
-		if ( this.detachEvent ) 
-			this.detachEvent("ondragstart", drag.dontstart ); 
-	},
-		
-	// initialize the interaction
-	init: function( event ){ 
-		// sorry, only one touch at a time
-		if ( drag.touched ) 
-			return;
-		// the drag/drop interaction data
-		var dd = event.data, results;
-		// check the which directive
-		if ( event.which != 0 && dd.which > 0 && event.which != dd.which ) 
-			return; 
-		// check for suppressed selector
-		if ( $( event.target ).is( dd.not ) ) 
-			return;
-		// check for handle selector
-		if ( dd.handle && !$( event.target ).closest( dd.handle, event.currentTarget ).length ) 
-			return;
-
-		drag.touched = event.type == 'touchstart' ? this : null;
-		dd.propagates = 1;
-		dd.mousedown = this;
-		dd.interactions = [ drag.interaction( this, dd ) ];
-		dd.target = event.target;
-		dd.pageX = event.pageX;
-		dd.pageY = event.pageY;
-		dd.dragging = null;
-		// handle draginit event... 
-		results = drag.hijack( event, "draginit", dd );
-		// early cancel
-		if ( !dd.propagates )
-			return;
-		// flatten the result set
-		results = drag.flatten( results );
-		// insert new interaction elements
-		if ( results && results.length ){
-			dd.interactions = [];
-			$.each( results, function(){
-				dd.interactions.push( drag.interaction( this, dd ) );
-			});
-		}
-		// remember how many interactions are propagating
-		dd.propagates = dd.interactions.length;
-		// locate and init the drop targets
-		if ( dd.drop !== false && $special.drop ) 
-			$special.drop.handler( event, dd );
-		// disable text selection
-		drag.textselect( false ); 
-		// bind additional events...
-		if ( drag.touched )
-			$event.add( drag.touched, "touchmove touchend", drag.handler, dd );
-		else 
-			$event.add( document, "mousemove mouseup", drag.handler, dd );
-		// helps prevent text selection or scrolling
-		if ( !drag.touched || dd.live )
-			return false;
-	},	
-	
-	// returns an interaction object
-	interaction: function( elem, dd ){
-		var offset = $( elem )[ dd.relative ? "position" : "offset" ]() || { top:0, left:0 };
-		return {
-			drag: elem, 
-			callback: new drag.callback(), 
-			droppable: [],
-			offset: offset
-		};
-	},
-	
-	// handle drag-releatd DOM events
-	handler: function( event ){ 
-		// read the data before hijacking anything
-		var dd = event.data;	
-		// handle various events
-		switch ( event.type ){
-			// mousemove, check distance, start dragging
-			case !dd.dragging && 'touchmove': 
-				event.preventDefault();
-			case !dd.dragging && 'mousemove':
-				//  drag tolerance, x� + y� = distance�
-				if ( Math.pow(  event.pageX-dd.pageX, 2 ) + Math.pow(  event.pageY-dd.pageY, 2 ) < Math.pow( dd.distance, 2 ) ) 
-					break; // distance tolerance not reached
-				event.target = dd.target; // force target from "mousedown" event (fix distance issue)
-				drag.hijack( event, "dragstart", dd ); // trigger "dragstart"
-				if ( dd.propagates ) // "dragstart" not rejected
-					dd.dragging = true; // activate interaction
-			// mousemove, dragging
-			case 'touchmove':
-				event.preventDefault();
-			case 'mousemove':
-				if ( dd.dragging ){
-					// trigger "drag"		
-					drag.hijack( event, "drag", dd );
-					if ( dd.propagates ){
-						// manage drop events
-						if ( dd.drop !== false && $special.drop )
-							$special.drop.handler( event, dd ); // "dropstart", "dropend"							
-						break; // "drag" not rejected, stop		
-					}
-					event.type = "mouseup"; // helps "drop" handler behave
-				}
-			// mouseup, stop dragging
-			case 'touchend': 
-			case 'mouseup': 
-			default:
-				if ( drag.touched )
-					$event.remove( drag.touched, "touchmove touchend", drag.handler ); // remove touch events
-				else 
-					$event.remove( document, "mousemove mouseup", drag.handler ); // remove page events	
-				if ( dd.dragging ){
-					if ( dd.drop !== false && $special.drop )
-						$special.drop.handler( event, dd ); // "drop"
-					drag.hijack( event, "dragend", dd ); // trigger "dragend"	
-				}
-				drag.textselect( true ); // enable text selection
-				// if suppressing click events...
-				if ( dd.click === false && dd.dragging )
-					$.data( dd.mousedown, "suppress.click", new Date().getTime() + 5 );
-				dd.dragging = drag.touched = false; // deactivate element	
-				break;
-		}
-	},
-		
-	// re-use event object for custom events
-	hijack: function( event, type, dd, x, elem ){
-		// not configured
-		if ( !dd ) 
-			return;
-		// remember the original event and type
-		var orig = { event:event.originalEvent, type:event.type },
-		// is the event drag related or drog related?
-		mode = type.indexOf("drop") ? "drag" : "drop",
-		// iteration vars
-		result, i = x || 0, ia, $elems, callback,
-		len = !isNaN( x ) ? x : dd.interactions.length;
-		// modify the event type
-		event.type = type;
-		// remove the original event
-		event.originalEvent = null;
-		// initialize the results
-		dd.results = [];
-		// handle each interacted element
-		do if ( ia = dd.interactions[ i ] ){
-			// validate the interaction
-			if ( type !== "dragend" && ia.cancelled )
-				continue;
-			// set the dragdrop properties on the event object
-			callback = drag.properties( event, dd, ia );
-			// prepare for more results
-			ia.results = [];
-			// handle each element
-			$( elem || ia[ mode ] || dd.droppable ).each(function( p, subject ){
-				// identify drag or drop targets individually
-				callback.target = subject;
-				// force propagtion of the custom event
-				event.isPropagationStopped = function(){ return false; };
-				// handle the event	
-				result = subject ? $event.dispatch.call( subject, event, callback ) : null;
-				// stop the drag interaction for this element
-				if ( result === false ){
-					if ( mode == "drag" ){
-						ia.cancelled = true;
-						dd.propagates -= 1;
-					}
-					if ( type == "drop" ){
-						ia[ mode ][p] = null;
-					}
-				}
-				// assign any dropinit elements
-				else if ( type == "dropinit" )
-					ia.droppable.push( drag.element( result ) || subject );
-				// accept a returned proxy element 
-				if ( type == "dragstart" )
-					ia.proxy = $( drag.element( result ) || ia.drag )[0];
-				// remember this result	
-				ia.results.push( result );
-				// forget the event result, for recycling
-				delete event.result;
-				// break on cancelled handler
-				if ( type !== "dropinit" )
-					return result;
-			});	
-			// flatten the results	
-			dd.results[ i ] = drag.flatten( ia.results );	
-			// accept a set of valid drop targets
-			if ( type == "dropinit" )
-				ia.droppable = drag.flatten( ia.droppable );
-			// locate drop targets
-			if ( type == "dragstart" && !ia.cancelled )
-				callback.update(); 
-		}
-		while ( ++i < len )
-		// restore the original event & type
-		event.type = orig.type;
-		event.originalEvent = orig.event;
-		// return all handler results
-		return drag.flatten( dd.results );
-	},
-		
-	// extend the callback object with drag/drop properties...
-	properties: function( event, dd, ia ){		
-		var obj = ia.callback;
-		// elements
-		obj.drag = ia.drag;
-		obj.proxy = ia.proxy || ia.drag;
-		// starting mouse position
-		obj.startX = dd.pageX;
-		obj.startY = dd.pageY;
-		// current distance dragged
-		obj.deltaX = event.pageX - dd.pageX;
-		obj.deltaY = event.pageY - dd.pageY;
-		// original element position
-		obj.originalX = ia.offset.left;
-		obj.originalY = ia.offset.top;
-		// adjusted element position
-		obj.offsetX = obj.originalX + obj.deltaX; 
-		obj.offsetY = obj.originalY + obj.deltaY;
-		// assign the drop targets information
-		obj.drop = drag.flatten( ( ia.drop || [] ).slice() );
-		obj.available = drag.flatten( ( ia.droppable || [] ).slice() );
-		return obj;	
-	},
-	
-	// determine is the argument is an element or jquery instance
-	element: function( arg ){
-		if ( arg && ( arg.jquery || arg.nodeType == 1 ) )
-			return arg;
-	},
-	
-	// flatten nested jquery objects and arrays into a single dimension array
-	flatten: function( arr ){
-		return $.map( arr, function( member ){
-			return member && member.jquery ? $.makeArray( member ) : 
-				member && member.length ? drag.flatten( member ) : member;
-		});
-	},
-	
-	// toggles text selection attributes ON (true) or OFF (false)
-	textselect: function( bool ){ 
-		$( document )[ bool ? "unbind" : "bind" ]("selectstart", drag.dontstart )
-			.css("MozUserSelect", bool ? "" : "none" );
-		// .attr("unselectable", bool ? "off" : "on" )
-		document.unselectable = bool ? "off" : "on"; 
-	},
-	
-	// suppress "selectstart" and "ondragstart" events
-	dontstart: function(){ 
-		return false; 
-	},
-	
-	// a callback instance contructor
-	callback: function(){}
-	
-};
-
-// callback methods
-drag.callback.prototype = {
-	update: function(){
-		if ( $special.drop && this.available.length )
-			$.each( this.available, function( i ){
-				$special.drop.locate( this, i );
-			});
-	}
-};
-
-// patch $.event.$dispatch to allow suppressing clicks
-var $dispatch = $event.dispatch;
-$event.dispatch = function( event ){
-	if ( $.data( this, "suppress."+ event.type ) - new Date().getTime() > 0 ){
-		$.removeData( this, "suppress."+ event.type );
-		return;
-	}
-	return $dispatch.apply( this, arguments );
-};
-
-// event fix hooks for touch events...
-var touchHooks = 
-$event.fixHooks.touchstart = 
-$event.fixHooks.touchmove = 
-$event.fixHooks.touchend =
-$event.fixHooks.touchcancel = {
-	props: "clientX clientY pageX pageY screenX screenY".split( " " ),
-	filter: function( event, orig ) {
-		if ( orig ){
-			var touched = ( orig.touches && orig.touches[0] )
-				|| ( orig.changedTouches && orig.changedTouches[0] )
-				|| null; 
-			// iOS webkit: touchstart, touchmove, touchend
-			if ( touched ) 
-				$.each( touchHooks.props, function( i, prop ){
-					event[ prop ] = touched[ prop ];
-				});
-		}
-		return event;
-	}
-};
-
-// share the same special event configuration with related events...
-$special.draginit = $special.dragstart = $special.dragend = drag;
-
-})( jQuery );
\ No newline at end of file
diff --git a/#pma/js/jquery/jquery.fullscreen.js b/#pma/js/jquery/jquery.fullscreen.js
deleted file mode 100644
index 248e8ffd..00000000
--- a/#pma/js/jquery/jquery.fullscreen.js
+++ /dev/null
@@ -1,60 +0,0 @@
-// jQuery.FullScreen plugin
-
-// Triple-licensed: Public Domain, MIT and WTFPL license - share and enjoy!
-
-(function($) {
-  function isFullScreen() {
-    return document[!prefix ? 'fullScreen' :
-        'webkit' === prefix ? 'webkitIsFullScreen' :
-                     prefix + 'FullScreen'];
-  }
-  function cancelFullScreen() {
-    return document[prefix ? prefix + 'CancelFullScreen'
-                           : 'cancelFullScreen']();
-  }
-
-  var supported = typeof document.cancelFullScreen !== 'undefined'
-    , prefixes = ['webkit', 'moz', 'o', 'ms', 'khtml']
-    , prefix = ''
-    , noop = function() {}
-    , i
-    ;
-
-  if (!supported) {
-    for (i = 0; prefix = prefixes[i]; i++) {
-      if (typeof document[prefix + 'CancelFullScreen'] !== 'undefined') {
-        supported = true;
-        break;
-      }
-    }
-  }
-
-  if (supported) {
-    $.fn.requestFullScreen = function() {
-      return this.each(function() {
-        return this[prefix ? prefix + 'RequestFullScreen'
-                           : 'requestFullScreen']();
-      });
-    };
-    $.fn.fullScreenChange = function(fn) {
-      var ar = [prefix + 'fullscreenchange'].concat([].slice.call(arguments, 0))
-        , $e = $(this);
-      return $e.bind.apply($e, ar);
-    };
-    $.FullScreen =
-      { isFullScreen: isFullScreen
-      , cancelFullScreen: cancelFullScreen
-      , prefix: prefix
-      , supported: supported
-      };
-  }
-  else {
-    $.fn.requestFullScreen = $.fn.fullScreenChange = noop;
-    $.FullScreen =
-      { isFullScreen: function() { return false; }
-      , cancelFullScreen: noop
-      , prefix: prefix
-      , supported: supported
-      };
-  }
-})(jQuery);
diff --git a/#pma/js/jquery/jquery.mousewheel.js b/#pma/js/jquery/jquery.mousewheel.js
deleted file mode 100644
index 6756fa61..00000000
--- a/#pma/js/jquery/jquery.mousewheel.js
+++ /dev/null
@@ -1,221 +0,0 @@
-/*! Copyright (c) 2013 Brandon Aaron (http://brandon.aaron.sh)
- * Licensed under the MIT License (LICENSE.txt).
- *
- * Version: 3.1.12
- *
- * Requires: jQuery 1.2.2+
- */
-
-(function (factory) {
-    if ( typeof define === 'function' && define.amd ) {
-        // AMD. Register as an anonymous module.
-        define(['jquery'], factory);
-    } else if (typeof exports === 'object') {
-        // Node/CommonJS style for Browserify
-        module.exports = factory;
-    } else {
-        // Browser globals
-        factory(jQuery);
-    }
-}(function ($) {
-
-    var toFix  = ['wheel', 'mousewheel', 'DOMMouseScroll', 'MozMousePixelScroll'],
-        toBind = ( 'onwheel' in document || document.documentMode >= 9 ) ?
-                    ['wheel'] : ['mousewheel', 'DomMouseScroll', 'MozMousePixelScroll'],
-        slice  = Array.prototype.slice,
-        nullLowestDeltaTimeout, lowestDelta;
-
-    if ( $.event.fixHooks ) {
-        for ( var i = toFix.length; i; ) {
-            $.event.fixHooks[ toFix[--i] ] = $.event.mouseHooks;
-        }
-    }
-
-    var special = $.event.special.mousewheel = {
-        version: '3.1.12',
-
-        setup: function() {
-            if ( this.addEventListener ) {
-                for ( var i = toBind.length; i; ) {
-                    this.addEventListener( toBind[--i], handler, false );
-                }
-            } else {
-                this.onmousewheel = handler;
-            }
-            // Store the line height and page height for this particular element
-            $.data(this, 'mousewheel-line-height', special.getLineHeight(this));
-            $.data(this, 'mousewheel-page-height', special.getPageHeight(this));
-        },
-
-        teardown: function() {
-            if ( this.removeEventListener ) {
-                for ( var i = toBind.length; i; ) {
-                    this.removeEventListener( toBind[--i], handler, false );
-                }
-            } else {
-                this.onmousewheel = null;
-            }
-            // Clean up the data we added to the element
-            $.removeData(this, 'mousewheel-line-height');
-            $.removeData(this, 'mousewheel-page-height');
-        },
-
-        getLineHeight: function(elem) {
-            var $elem = $(elem),
-                $parent = $elem['offsetParent' in $.fn ? 'offsetParent' : 'parent']();
-            if (!$parent.length) {
-                $parent = $('body');
-            }
-            return parseInt($parent.css('fontSize'), 10) || parseInt($elem.css('fontSize'), 10) || 16;
-        },
-
-        getPageHeight: function(elem) {
-            return $(elem).height();
-        },
-
-        settings: {
-            adjustOldDeltas: true, // see shouldAdjustOldDeltas() below
-            normalizeOffset: true  // calls getBoundingClientRect for each event
-        }
-    };
-
-    $.fn.extend({
-        mousewheel: function(fn) {
-            return fn ? this.bind('mousewheel', fn) : this.trigger('mousewheel');
-        },
-
-        unmousewheel: function(fn) {
-            return this.unbind('mousewheel', fn);
-        }
-    });
-
-
-    function handler(event) {
-        var orgEvent   = event || window.event,
-            args       = slice.call(arguments, 1),
-            delta      = 0,
-            deltaX     = 0,
-            deltaY     = 0,
-            absDelta   = 0,
-            offsetX    = 0,
-            offsetY    = 0;
-        event = $.event.fix(orgEvent);
-        event.type = 'mousewheel';
-
-        // Old school scrollwheel delta
-        if ( 'detail'      in orgEvent ) { deltaY = orgEvent.detail * -1;      }
-        if ( 'wheelDelta'  in orgEvent ) { deltaY = orgEvent.wheelDelta;       }
-        if ( 'wheelDeltaY' in orgEvent ) { deltaY = orgEvent.wheelDeltaY;      }
-        if ( 'wheelDeltaX' in orgEvent ) { deltaX = orgEvent.wheelDeltaX * -1; }
-
-        // Firefox < 17 horizontal scrolling related to DOMMouseScroll event
-        if ( 'axis' in orgEvent && orgEvent.axis === orgEvent.HORIZONTAL_AXIS ) {
-            deltaX = deltaY * -1;
-            deltaY = 0;
-        }
-
-        // Set delta to be deltaY or deltaX if deltaY is 0 for backwards compatabilitiy
-        delta = deltaY === 0 ? deltaX : deltaY;
-
-        // New school wheel delta (wheel event)
-        if ( 'deltaY' in orgEvent ) {
-            deltaY = orgEvent.deltaY * -1;
-            delta  = deltaY;
-        }
-        if ( 'deltaX' in orgEvent ) {
-            deltaX = orgEvent.deltaX;
-            if ( deltaY === 0 ) { delta  = deltaX * -1; }
-        }
-
-        // No change actually happened, no reason to go any further
-        if ( deltaY === 0 && deltaX === 0 ) { return; }
-
-        // Need to convert lines and pages to pixels if we aren't already in pixels
-        // There are three delta modes:
-        //   * deltaMode 0 is by pixels, nothing to do
-        //   * deltaMode 1 is by lines
-        //   * deltaMode 2 is by pages
-        if ( orgEvent.deltaMode === 1 ) {
-            var lineHeight = $.data(this, 'mousewheel-line-height');
-            delta  *= lineHeight;
-            deltaY *= lineHeight;
-            deltaX *= lineHeight;
-        } else if ( orgEvent.deltaMode === 2 ) {
-            var pageHeight = $.data(this, 'mousewheel-page-height');
-            delta  *= pageHeight;
-            deltaY *= pageHeight;
-            deltaX *= pageHeight;
-        }
-
-        // Store lowest absolute delta to normalize the delta values
-        absDelta = Math.max( Math.abs(deltaY), Math.abs(deltaX) );
-
-        if ( !lowestDelta || absDelta < lowestDelta ) {
-            lowestDelta = absDelta;
-
-            // Adjust older deltas if necessary
-            if ( shouldAdjustOldDeltas(orgEvent, absDelta) ) {
-                lowestDelta /= 40;
-            }
-        }
-
-        // Adjust older deltas if necessary
-        if ( shouldAdjustOldDeltas(orgEvent, absDelta) ) {
-            // Divide all the things by 40!
-            delta  /= 40;
-            deltaX /= 40;
-            deltaY /= 40;
-        }
-
-        // Get a whole, normalized value for the deltas
-        delta  = Math[ delta  >= 1 ? 'floor' : 'ceil' ](delta  / lowestDelta);
-        deltaX = Math[ deltaX >= 1 ? 'floor' : 'ceil' ](deltaX / lowestDelta);
-        deltaY = Math[ deltaY >= 1 ? 'floor' : 'ceil' ](deltaY / lowestDelta);
-
-        // Normalise offsetX and offsetY properties
-        if ( special.settings.normalizeOffset && this.getBoundingClientRect ) {
-            var boundingRect = this.getBoundingClientRect();
-            offsetX = event.clientX - boundingRect.left;
-            offsetY = event.clientY - boundingRect.top;
-        }
-
-        // Add information to the event object
-        event.deltaX = deltaX;
-        event.deltaY = deltaY;
-        event.deltaFactor = lowestDelta;
-        event.offsetX = offsetX;
-        event.offsetY = offsetY;
-        // Go ahead and set deltaMode to 0 since we converted to pixels
-        // Although this is a little odd since we overwrite the deltaX/Y
-        // properties with normalized deltas.
-        event.deltaMode = 0;
-
-        // Add event and delta to the front of the arguments
-        args.unshift(event, delta, deltaX, deltaY);
-
-        // Clearout lowestDelta after sometime to better
-        // handle multiple device types that give different
-        // a different lowestDelta
-        // Ex: trackpad = 3 and mouse wheel = 120
-        if (nullLowestDeltaTimeout) { clearTimeout(nullLowestDeltaTimeout); }
-        nullLowestDeltaTimeout = setTimeout(nullLowestDelta, 200);
-
-        return ($.event.dispatch || $.event.handle).apply(this, args);
-    }
-
-    function nullLowestDelta() {
-        lowestDelta = null;
-    }
-
-    function shouldAdjustOldDeltas(orgEvent, absDelta) {
-        // If this is an older event and the delta is divisable by 120,
-        // then we are assuming that the browser is treating this as an
-        // older mouse wheel event and that we should divide the deltas
-        // by 40 to try and get a more usable deltaFactor.
-        // Side note, this actually impacts the reported scroll distance
-        // in older browsers and can cause scrolling to be slower than native.
-        // Turn this off by setting $.event.special.mousewheel.settings.adjustOldDeltas to false.
-        return special.settings.adjustOldDeltas && orgEvent.type === 'mousewheel' && absDelta % 120 === 0;
-    }
-
-}));
diff --git a/#pma/js/jquery/jquery.sortableTable.js b/#pma/js/jquery/jquery.sortableTable.js
deleted file mode 100644
index 1f4fc91d..00000000
--- a/#pma/js/jquery/jquery.sortableTable.js
+++ /dev/null
@@ -1,272 +0,0 @@
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * @fileoverview    A jquery plugin that allows drag&drop sorting in tables.
- *                  Coded because JQuery UI sortable doesn't support tables. Also it has no animation
- *
- * @name            Sortable Table JQuery plugin
- *
- * @requires    jQuery
- *
- */
-
-/* Options:
-
-$('table').sortableTable({
-    ignoreRect: { top, left, width, height }  - relative coordinates on each element. If the user clicks 
-                                               in this area, it is not seen as a drag&drop request. Useful for toolbars etc.
-    events: {
-       start: callback function when the user starts dragging
-       drop: callback function after an element has been dropped
-    }
-})
-*/
-
-/* Commands:
-
-$('table').sortableTable('init')      - equivalent to $('table').sortableTable()
-$('table').sortableTable('refresh')   - if the table has been changed, refresh correctly assigns all events again
-$('table').sortableTable('destroy')   - removes all events from the table
-
-*/ 
-
-/* Setup: 
-
-  Can be applied on any table, there is just one convention. 
-  Each cell (<td>) has to contain one and only one element (preferably div or span) 
-  which is the actually draggable element.
-*/
-(function($) {
-	jQuery.fn.sortableTable = function(method) {
-	
-		var methods = {
-			init : function(options) {
-				var tb = new sortableTableInstance(this, options);
-				tb.init();
-				$(this).data('sortableTable',tb);
-			},
-			refresh : function( ) { 
-				$(this).data('sortableTable').refresh();
-			},
-			destroy : function( ) { 
-				$(this).data('sortableTable').destroy();
-			}
-		};
-
-		if ( methods[method] ) {
-			return methods[method].apply( this, Array.prototype.slice.call( arguments, 1 ));
-		} else if ( typeof method === 'object' || ! method ) {
-			return methods.init.apply( this, arguments );
-		} else {
-			$.error( 'Method ' +  method + ' does not exist on jQuery.sortableTable' );
-		}    
-	
-		function sortableTableInstance(table, options) {
-			var down = false;
-			var	$draggedEl, oldCell, previewMove, id;
-			
-			if(!options) options = {};
-			
-			/* Mouse handlers on the child elements */
-			var onMouseUp = function(e) { 
-				dropAt(e.pageX, e.pageY); 
-			}
-			
-			var onMouseDown = function(e) {
-				$draggedEl = $(this).children();
-				if($draggedEl.length == 0) return;
-				if(options.ignoreRect && insideRect({x: e.pageX - $draggedEl.offset().left, y: e.pageY - $draggedEl.offset().top}, options.ignoreRect)) return;
-				
-				down = true;
-				oldCell = this;
-				//move(e.pageX,e.pageY);
-				
-				if(options.events && options.events.start)
-					options.events.start(this);
-
-				return false;
-			}
-			
-			var globalMouseMove = function(e) {
-				if(down) {
-					move(e.pageX,e.pageY);
-
-					if(inside($(oldCell), e.pageX, e.pageY)) {
-						if(previewMove != null) {
-							moveTo(previewMove);
-							previewMove = null;					
-						}
-					} else
-						$(table).find('td').each(function() {
-							if(inside($(this), e.pageX, e.pageY)) {
-								if($(previewMove).attr('class') != $(this).children().first().attr('class')) {
-									if(previewMove != null) moveTo(previewMove);
-									previewMove = $(this).children().first();
-									if(previewMove.length > 0)
-										moveTo($(previewMove), { pos: {
-											top: $(oldCell).offset().top - $(previewMove).parent().offset().top,
-											left: $(oldCell).offset().left - $(previewMove).parent().offset().left
-										} });
-								}
-								
-								return false;
-							}
-						});
-				}
-				
-				return false;
-			}
-			
-			var globalMouseOut = function() {
-				if(down) {
-					down = false;
-					if(previewMove) moveTo(previewMove);
-					moveTo($draggedEl);
-					previewMove = null;
-				}
-			}
-			
-			// Initialize sortable table
-			this.init = function() {
-				id = 1;
-				// Add some required css to each child element in the <td>s
-				$(table).find('td').children().each(function() {
-					// Remove any old occurences of our added draggable-num class
-					$(this).attr('class',$(this).attr('class').replace(/\s*draggable\-\d+/g,''));
-					$(this).addClass('draggable-' + (id++));
-				});
-				
-				// Mouse events
-				$(table).find('td').bind('mouseup',onMouseUp);
-				$(table).find('td').bind('mousedown',onMouseDown);
-
-				$(document).mousemove(globalMouseMove);
-				$(document).bind('mouseleave', globalMouseOut);
-			}
-			
-			// Call this when the table has been updated
-			this.refresh = function() {
-				this.destroy();
-				this.init();
-			}
-			
-			this.destroy = function() {
-				// Add some required css to each child element in the <td>s
-				$(table).find('td').children().each(function() {
-					// Remove any old occurences of our added draggable-num class
-					$(this).attr('class',$(this).attr('class').replace(/\s*draggable\-\d+/g,''));
-				});
-				
-				// Mouse events
-				$(table).find('td').unbind('mouseup',onMouseUp)
-				$(table).find('td').unbind('mousedown',onMouseDown);
-					
-				$(document).unbind('mousemove',globalMouseMove);
-				$(document).unbind('mouseleave',globalMouseOut);
-			}
-			
-			function switchElement(drag, dropTo) {
-				var dragPosDiff = { 
-					left: $(drag).children().first().offset().left - $(dropTo).offset().left, 
-					top:  $(drag).children().first().offset().top - $(dropTo).offset().top 
-				};
-				
-				var dropPosDiff = null;
-				if($(dropTo).children().length > 0) {
-					dropPosDiff = {
-						left: $(dropTo).children().first().offset().left - $(drag).offset().left,
-						top:  $(dropTo).children().first().offset().top - $(drag).offset().top 
-					};
-				}
-				
-				/* I love you append(). It moves the DOM Elements so gracefully <3 */
-				// Put the element in the way to old place
-				$(drag).append($(dropTo).children().first()).children()
-					.stop(true,true)
-					.bind('mouseup',onMouseUp);
-				
-				if(dropPosDiff)
-					$(drag).append($(dropTo).children().first()).children()
-						.css('left',dropPosDiff.left + 'px')
-						.css('top',dropPosDiff.top + 'px');
-					
-				// Put our dragged element into the space we just freed up
-				$(dropTo).append($(drag).children().first()).children()
-					.bind('mouseup',onMouseUp)
-					.css('left',dragPosDiff.left + 'px')
-					.css('top',dragPosDiff.top + 'px');
-				
-				moveTo($(dropTo).children().first(), { duration: 100 });
-				moveTo($(drag).children().first(), { duration: 100 });
-					
-				if(options.events && options.events.drop) {
-					// Drop event. The drag child element is moved into the drop element
-					// and vice versa. So the parameters are switched.
-					
-					// Calculate row and column index
-					colIdx = $(dropTo).prevAll().length;
-					rowIdx = $(dropTo).parent().prevAll().length;
-					
-					options.events.drop(drag,dropTo, { col: colIdx, row: rowIdx });
-				}
-			}
-			
-			function move(x,y) {
-				$draggedEl.offset({
-					top: Math.min($(document).height(), Math.max(0, y - $draggedEl.height()/2)), 
-					left: Math.min($(document).width(), Math.max(0, x - $draggedEl.width()/2))
-				});
-			}
-			
-			function inside($el, x,y) {
-				var off = $el.offset();
-				return y >= off.top && x >= off.left && x < off.left + $el.width() && y < off.top + $el.height();
-			}
-			
-			function insideRect(pos, r) {
-				return pos.y > r.top && pos.x > r.left && pos.y < r.top + r.height && pos.x < r.left + r.width;
-			}
-			
-			function dropAt(x,y) {
-				if(!down) return;
-				down = false;
-				
-				var switched = false;
-				
-				$(table).find('td').each(function() {
-					if($(this).children().first().attr('class') != $(oldCell).children().first().attr('class') && inside($(this), x, y)) {
-						switchElement(oldCell, this);
-						switched = true;
-						return;
-					}
-				});
-
-				if(!switched) {
-					if(previewMove) moveTo(previewMove);
-					moveTo($draggedEl);
-				}
-				
-				previewMove = null;
-			}
-			
-			function moveTo(elem, opts) {
-				if(!opts) opts = {};
-				if(!opts.pos) opts.pos = { left: 0, top: 0 };
-				if(!opts.duration) opts.duration = 200;
-				
-				$(elem).css('position','relative');
-				$(elem).animate({ top: opts.pos.top, left: opts.pos.left }, {
-					duration: opts.duration,
-					complete: function() {
-						if(opts.pos.left == 0 && opts.pos.top == 0) {
-							$(elem)
-								.css('position','')
-								.css('left','')
-								.css('top','');
-						}
-					}
-				});
-			}
-		}
-	}
-	
-})( jQuery );
\ No newline at end of file
diff --git a/#pma/js/jquery/jquery.svg.js b/#pma/js/jquery/jquery.svg.js
deleted file mode 100644
index acb4db18..00000000
--- a/#pma/js/jquery/jquery.svg.js
+++ /dev/null
@@ -1,1352 +0,0 @@
-/* http://keith-wood.name/svg.html
-   SVG for jQuery v1.5.0.
-   Written by Keith Wood (kbwood{at}iinet.com.au) August 2007.
-   Available under the MIT (http://keith-wood.name/licence.html) license. 
-   Please attribute the author if you use it. */
-
-(function($) { // Hide scope, no $ conflict
-
-/** The SVG manager.
-	<p>Use the singleton instance of this class, $.svg, 
-	to interact with the SVG functionality.</p>
-	<p>Expects HTML like:</p>
-	<pre>&lt;div>&lt;/div></pre>
-	@module SVGManager */
-function SVGManager() {
-	this._settings = []; // Settings to be remembered per SVG object
-	this._extensions = []; // List of SVG extensions added to SVGWrapper
-		// for each entry [0] is extension name, [1] is extension class (function)
-		// the function takes one parameter - the SVGWrapper instance
-	this.regional = []; // Localisations, indexed by language, '' for default (English)
-	this.regional[''] = {errorLoadingText: 'Error loading'};
-	this.local = this.regional['']; // Current localisation
-	this._uuid = new Date().getTime();
-	this._ie = !!window.ActiveXObject;
-}
-
-$.extend(SVGManager.prototype, {
-	/** Class name added to elements to indicate already configured with SVG. */
-	markerClassName: 'hasSVG',
-	/** Name of the data property for instance settings. */
-	propertyName: 'svgwrapper',
-
-	/** SVG namespace. */
-	svgNS: 'http://www.w3.org/2000/svg',
-	/** XLink namespace. */
-	xlinkNS: 'http://www.w3.org/1999/xlink',
-
-	/** SVG wrapper class. */
-	_wrapperClass: SVGWrapper,
-
-	/* Camel-case versions of attribute names containing dashes or are reserved words. */
-	_attrNames: {class_: 'class', in_: 'in',
-		alignmentBaseline: 'alignment-baseline', baselineShift: 'baseline-shift',
-		clipPath: 'clip-path', clipRule: 'clip-rule',
-		colorInterpolation: 'color-interpolation',
-		colorInterpolationFilters: 'color-interpolation-filters',
-		colorRendering: 'color-rendering', dominantBaseline: 'dominant-baseline',
-		enableBackground: 'enable-background', fillOpacity: 'fill-opacity',
-		fillRule: 'fill-rule', floodColor: 'flood-color',
-		floodOpacity: 'flood-opacity', fontFamily: 'font-family',
-		fontSize: 'font-size', fontSizeAdjust: 'font-size-adjust',
-		fontStretch: 'font-stretch', fontStyle: 'font-style',
-		fontVariant: 'font-variant', fontWeight: 'font-weight',
-		glyphOrientationHorizontal: 'glyph-orientation-horizontal',
-		glyphOrientationVertical: 'glyph-orientation-vertical',
-		horizAdvX: 'horiz-adv-x', horizOriginX: 'horiz-origin-x',
-		imageRendering: 'image-rendering', letterSpacing: 'letter-spacing',
-		lightingColor: 'lighting-color', markerEnd: 'marker-end',
-		markerMid: 'marker-mid', markerStart: 'marker-start',
-		stopColor: 'stop-color', stopOpacity: 'stop-opacity',
-		strikethroughPosition: 'strikethrough-position',
-		strikethroughThickness: 'strikethrough-thickness',
-		strokeDashArray: 'stroke-dasharray', strokeDashOffset: 'stroke-dashoffset',
-		strokeLineCap: 'stroke-linecap', strokeLineJoin: 'stroke-linejoin',
-		strokeMiterLimit: 'stroke-miterlimit', strokeOpacity: 'stroke-opacity',
-		strokeWidth: 'stroke-width', textAnchor: 'text-anchor',
-		textDecoration: 'text-decoration', textRendering: 'text-rendering',
-		underlinePosition: 'underline-position', underlineThickness: 'underline-thickness',
-		vertAdvY: 'vert-adv-y', vertOriginY: 'vert-origin-y',
-		wordSpacing: 'word-spacing', writingMode: 'writing-mode'},
-
-	/* Add the SVG object to its container. */
-	_attachSVG: function(container, settings) {
-		var svg = (container.namespaceURI === this.svgNS ? container : null);
-		var container = (svg ? null : container);
-		if ($(container || svg).hasClass(this.markerClassName)) {
-			return;
-		}
-		if (typeof settings === 'string') {
-			settings = {loadURL: settings};
-		}
-		else if (typeof settings === 'function') {
-			settings = {onLoad: settings};
-		}
-		$(container || svg).addClass(this.markerClassName);
-		try {
-			if (!svg) {
-				svg = document.createElementNS(this.svgNS, 'svg');
-				svg.setAttribute('version', '1.1');
-				if (container.clientWidth > 0) {
-					svg.setAttribute('width', container.clientWidth);
-				}
-				if (container.clientHeight > 0) {
-					svg.setAttribute('height', container.clientHeight);
-				}
-				container.appendChild(svg);
-			}
-			this._afterLoad(container, svg, settings || {});
-		}
-		catch (e) {
-			$(container).html('<p>SVG is not supported natively on this browser</p>');
-		}
-	},
-
-	/* Post-processing once loaded. */
-	_afterLoad: function(container, svg, settings) {
-		var settings = settings || this._settings[container.id];
-		this._settings[container ? container.id : ''] = null;
-		var wrapper = new this._wrapperClass(svg, container);
-		$.data(container || svg, $.svg.propertyName, wrapper);
-		try {
-			if (settings.loadURL) { // Load URL
-				wrapper.load(settings.loadURL, settings);
-			}
-			if (settings.settings) { // Additional settings
-				wrapper.configure(settings.settings);
-			}
-			if (settings.onLoad && !settings.loadURL) { // Onload callback
-				settings.onLoad.apply(container || svg, [wrapper]);
-			}
-		}
-		catch (e) {
-			alert(e);
-		}
-	},
-
-	/** Return the SVG wrapper created for a given container.
-		@param container {string|Element|jQuery} Selector for the container or
-				the container for the SVG object or jQuery collection where first entry is the container.
-		@return {SVGWrapper} The corresponding SVG wrapper element, or <code>null</code> if not attached. */
-	_getSVG: function(container) {
-		return $(container).data(this.propertyName);
-	},
-
-	/** Remove the SVG functionality from a div.
-		@param container {Element} The container for the SVG object. */
-	_destroySVG: function(container) {
-		container = $(container);
-		if (!container.hasClass(this.markerClassName)) {
-			return;
-		}
-		container.removeClass(this.markerClassName).removeData(this.propertyName);
-		if (container[0].namespaceURI !== this.svgNS) {
-			container.empty();
-		}
-	},
-
-	/** Extend the SVGWrapper object with an embedded class.
-		<p>The constructor function must take a single parameter that is
-	   a reference to the owning SVG root object. This allows the 
-		extension to access the basic SVG functionality.</p>
-		@param name {string} The name of the <code>SVGWrapper</code> attribute to access the new class.
-		@param extClass {function} The extension class constructor. */
-	addExtension: function(name, extClass) {
-		this._extensions.push([name, extClass]);
-	},
-
-	/** Does this node belong to SVG?
-		@param node {Element} The node to be tested.
-		@return {boolean} <code>true</code> if an SVG node, <code>false</code> if not. */
-	isSVGElem: function(node) {
-		return (node.nodeType === 1 && node.namespaceURI === $.svg.svgNS);
-	}
-});
-
-/** The main SVG interface, which encapsulates the SVG element.
-	<p>Obtain a reference from $().svg('get')</p>
-	@module SVGWrapper */
-function SVGWrapper(svg, container) {
-	this._svg = svg; // The SVG root node
-	this._container = container; // The containing div
-	for (var i = 0; i < $.svg._extensions.length; i++) {
-		var extension = $.svg._extensions[i];
-		this[extension[0]] = new extension[1](this);
-	}
-}
-
-$.extend(SVGWrapper.prototype, {
-
-	/** Retrieve the width of the SVG object.
-		@return {number} The width of the SVG canvas. */
-	width: function() {
-		return (this._container ? this._container.clientWidth : this._svg.width);
-	},
-
-	/** Retrieve the height of the SVG object.
-		@return {number} The height of the SVG canvas. */
-	height: function() {
-		return (this._container ? this._container.clientHeight : this._svg.height);
-	},
-
-	/** Retrieve the root SVG element.
-		@return {SVGElement} The top-level SVG element. */
-	root: function() {
-		return this._svg;
-	},
-
-	/** Configure a SVG node.
-		@param [node] {SVGElement} The node to configure, or the SVG root if not specified.
-		@param settings {object} Additional settings for the root.
-		@param [clear=false] {boolean} <code>true</code> to remove existing attributes first,
-				<code>false</code> to add to what is already there.
-		@return {SVGWrapper} This wrapper. */
-	configure: function(node, settings, clear) {
-		if (!node.nodeName) {
-			clear = settings;
-			settings = node;
-			node = this._svg;
-		}
-		if (clear) {
-			for (var i = node.attributes.length - 1; i >= 0; i--) {
-				var attr = node.attributes.item(i);
-				if (!(attr.nodeName === 'onload' || attr.nodeName === 'version' || 
-						attr.nodeName.substring(0, 5) === 'xmlns')) {
-					node.attributes.removeNamedItem(attr.nodeName);
-				}
-			}
-		}
-		for (var attrName in settings) {
-			node.setAttribute($.svg._attrNames[attrName] || attrName, settings[attrName]);
-		}
-		return this;
-	},
-
-	/** Locate a specific element in the SVG document.
-		@param id {string} The element's identifier.
-		@return {SVGElement} The element reference, or <code>null</code> if not found. */
-	getElementById: function(id) {
-		return this._svg.ownerDocument.getElementById(id);
-	},
-
-	/** Change the attributes for a SVG node.
-		@param element {SVGElement} The node to change.
-		@param settings {object} The new settings.
-		@return {SVGWrapper} This wrapper. */
-	change: function(element, settings) {
-		if (element) {
-			for (var name in settings) {
-				if (settings[name] == null) {
-					element.removeAttribute($.svg._attrNames[name] || name);
-				}
-				else {
-					element.setAttribute($.svg._attrNames[name] || name, settings[name]);
-				}
-			}
-		}
-		return this;
-	},
-
-	/** Check for parent being absent and adjust arguments accordingly.
-		@private
-		@param values {string[]} The given parameters.
-		@param names {string[]} The names of the parameters in order.
-		@param optSettings {string[]} The names of optional parameters.
-		@return {object} An object representing the named parameters. */
-	_args: function(values, names, optSettings) {
-		names.splice(0, 0, 'parent');
-		names.splice(names.length, 0, 'settings');
-		var args = {};
-		var offset = 0;
-		if (values[0] != null && values[0].jquery) {
-			values[0] = values[0][0];
-		}
-		if (values[0] != null && !(typeof values[0] === 'object' && values[0].nodeName)) {
-			args['parent'] = null;
-			offset = 1;
-		}
-		for (var i = 0; i < values.length; i++) {
-			args[names[i + offset]] = values[i];
-		}
-		if (optSettings) {
-			$.each(optSettings, function(i, value) {
-				if (typeof args[value] === 'object') {
-					args.settings = args[value];
-					args[value] = null;
-				}
-			});
-		}
-		return args;
-	},
-
-	/** Add a title.
-		@param [parent] {SVGElement|jQuery} The parent node for the new node, or SVG root if not specified.
-		@param text {string} The text of the title.
-		@param [settings] {object} Additional settings for this node.
-		@return {SVGElement} The new title node. */
-	title: function(parent, text, settings) {
-		var args = this._args(arguments, ['text']);
-		var node = this._makeNode(args.parent, 'title', args.settings || {});
-		node.appendChild(this._svg.ownerDocument.createTextNode(args.text));
-		return node;
-	},
-
-	/** Add a description.
-		@param [parent] {SVGElement|jQuery} The parent node for the new node, or SVG root if not specified.
-		@param text {string} The text of the description.
-		@param [settings] {object} Additional settings for this node.
-		@return {SVGElement} The new description node. */
-	describe: function(parent, text, settings) {
-		var args = this._args(arguments, ['text']);
-		var node = this._makeNode(args.parent, 'desc', args.settings || {});
-		node.appendChild(this._svg.ownerDocument.createTextNode(args.text));
-		return node;
-	},
-
-	/** Add a definitions node.
-		@param [parent] {SVGElement|jQuery} The parent node for the new node, or SVG root if not specified.
-		@param [id] {string} The ID of this definitions (optional).
-		@param [settings] {object} Additional settings for this node.
-		@return {SVGElement} The new definitions node. */
-	defs: function(parent, id, settings) {
-		var args = this._args(arguments, ['id'], ['id']);
-		return this._makeNode(args.parent, 'defs', $.extend((args.id ? {id: args.id} : {}), args.settings || {}));
-	},
-
-	/** Add a symbol definition.
-		@param [parent] {SVGElement|jQuery} The parent node for the new node, or SVG root if not specified.
-		@param id {string} The ID of this symbol.
-		@param x1 {number} The left coordinate for this symbol.
-		@param y1 {number} The top coordinate for this symbol.
-		@param width {number} The width of this symbol.
-		@param height {number} The height of this symbol.
-		@param [settings] {object} Additional settings for this node.
-		@return {SVGElement} The new symbol node. */
-	symbol: function(parent, id, x1, y1, width, height, settings) {
-		var args = this._args(arguments, ['id', 'x1', 'y1', 'width', 'height']);
-		return this._makeNode(args.parent, 'symbol', $.extend({id: args.id,
-				viewBox: args.x1 + ' ' + args.y1 + ' ' + args.width + ' ' + args.height}, args.settings || {}));
-	},
-
-	/** Add a marker definition.
-		@param [parent] {SVGElement|jQuery} The parent node for the new node, or SVG root if not specified.
-		@param id {string} The ID of this marker.
-		@param refX {number} The x-coordinate for the reference point.
-		@param refY {number} The y-coordinate for the reference point.
-		@param mWidth {number} The marker viewport width.
-		@param mHeight {number} The marker viewport height.
-		@param [orient] {string|number} 'auto' or angle (degrees).
-		@param [settings] {object} Additional settings for this node.
-		@return {SVGElement} The new marker node. */
-	marker: function(parent, id, refX, refY, mWidth, mHeight, orient, settings) {
-		var args = this._args(arguments, ['id', 'refX', 'refY', 'mWidth', 'mHeight', 'orient'], ['orient']);
-		return this._makeNode(args.parent, 'marker', $.extend(
-			{id: args.id, refX: args.refX, refY: args.refY, markerWidth: args.mWidth, 
-			markerHeight: args.mHeight, orient: args.orient || 'auto'}, args.settings || {}));
-	},
-
-	/** Add a style node.
-		@param [parent] {SVGElement|jQuery} The parent node for the new node, or SVG root if not specified.
-		@param styles {string} The CSS styles.
-		@param [settings] {object} Additional settings for this node.
-		@return {SVGElement} The new style node. */
-	style: function(parent, styles, settings) {
-		var args = this._args(arguments, ['styles']);
-		var node = this._makeNode(args.parent, 'style', $.extend({type: 'text/css'}, args.settings || {}));
-		node.appendChild(this._svg.ownerDocument.createTextNode(args.styles));
-		return node;
-	},
-
-	/** Add a script node.
-		@param [parent] {SVGElement|jQuery} The parent node for the new node, or SVG root if not specified.
-		@param script {string} The JavaScript code.
-		@param [type='text/javascript'] {string} The MIME type for the code.
-		@param [settings] {object} Additional settings for this node.
-		@return {SVGElement} The new script node. */
-	script: function(parent, script, type, settings) {
-		var args = this._args(arguments, ['script', 'type'], ['type']);
-		var node = this._makeNode(args.parent, 'script', $.extend(
-			{type: args.type || 'text/javascript'}, args.settings || {}));
-		node.appendChild(this._svg.ownerDocument.createTextNode(args.script));
-		if ($.svg._ie) {
-			$.globalEval(args.script);
-		}
-		return node;
-	},
-
-	/** Add a linear gradient definition.
-		<p>Specify all of <code>x1</code>, <code>y1</code>, <code>x2</code>, <code>y2</code> or none of them.</p>
-		@param [parent] {SVGElement|jQuery} The parent node for the new node, or SVG root if not specified.
-		@param id {string} The ID for this gradient.
-		@param stops {string[][]} The gradient stops, each entry is [0] is offset (0.0-1.0 or 0%-100%),
-				[1] is colour, [2] is opacity (optional).
-		@param [x1] {number} The x-coordinate of the gradient start.
-		@param [y1] {number} The y-coordinate of the gradient start.
-		@param [x2] {number} The x-coordinate of the gradient end.
-		@param [y2] {number} The y-coordinate of the gradient end.
-		@param [settings] {object} Additional settings for this node.
-		@return {SVGElement} The new linear gradient node. */
-	linearGradient: function(parent, id, stops, x1, y1, x2, y2, settings) {
-		var args = this._args(arguments, ['id', 'stops', 'x1', 'y1', 'x2', 'y2'], ['x1']);
-		var sets = $.extend({id: args.id},
-				(args.x1 != null ? {x1: args.x1, y1: args.y1, x2: args.x2, y2: args.y2} : {}));
-		return this._gradient(args.parent, 'linearGradient', $.extend(sets, args.settings || {}), args.stops);
-	},
-
-	/** Add a radial gradient definition.
-		<p>Specify all of <code>cx</code>, <code>cy</code>, <code>r</code>,
-		<code>fx</code>, <code>fy</code> or none of them.</p>
-		@param [parent] {SVGElement|jQuery} The parent node for the new node, or SVG root if not specified.
-		@param id {string} The ID for this gradient.
-		@param stops {string[][]} The gradient stops, each entry [0] is offset (0.0-1.0 or 0%-100%),
-				[1] is colour, [2] is opacity (optional).
-		@param [cx] {number} The x-coordinate of the largest circle centre.
-		@param [cy] {number} The y-coordinate of the largest circle centre.
-		@param [r] {number} The radius of the largest circle.
-		@param [fx] {number} The x-coordinate of the gradient focus.
-		@param [fy] {number} The y-coordinate of the gradient focus.
-		@param [settings] {object} Additional settings for this node.
-		@return {SVGElement} The new radial gradient node. */
-	radialGradient: function(parent, id, stops, cx, cy, r, fx, fy, settings) {
-		var args = this._args(arguments, ['id', 'stops', 'cx', 'cy', 'r', 'fx', 'fy'], ['cx']);
-		var sets = $.extend({id: args.id},
-			(args.cx != null ? {cx: args.cx, cy: args.cy, r: args.r, fx: args.fx, fy: args.fy} : {}));
-		return this._gradient(args.parent, 'radialGradient', $.extend(sets, args.settings || {}), args.stops);
-	},
-
-	/** Add a gradient node.
-		@private
-		@param parent {SVGElement|jQuery} The parent node for the new node.
-		@param name {string} The type of gradient node to create.
-		@param settings {object} The settings for this node.
-		@param stops {string[][]} The gradient stops.
-		@return {SVGElement} The new gradient node. */
-	_gradient: function(parent, name, settings, stops) {
-		var node = this._makeNode(parent, name, settings);
-		for (var i = 0; i < stops.length; i++) {
-			var stop = stops[i];
-			this._makeNode(node, 'stop', $.extend({offset: stop[0], stopColor: stop[1]}, 
-				(stop[2] != null ? {stopOpacity: stop[2]} : {})));
-		}
-		return node;
-	},
-
-	/** Add a pattern definition.
-		<p>Specify all of <code>vx</code>, <code>vy</code>, <code>xwidth</code>,
-		<code>vheight</code> or none of them.</p>
-		@param [parent] {SVGElement|jQuery} The parent node for the new node, or SVG root if not specified.
-		@param id {string} The ID for this pattern.
-		@param x {number} The x-coordinate for the left edge of the pattern.
-		@param y {number} The y-coordinate for the top edge of the pattern.
-		@param width {number} The width of the pattern.
-		@param height {number} The height of the pattern.
-		@param [vx] {number} The minimum x-coordinate for view box.
-		@param [vy] {number} The minimum y-coordinate for the view box.
-		@param [vwidth] {number} The width of the view box.
-		@param [vheight] {number} The height of the view box.
-		@param [settings] {object} Additional settings for this node.
-		@return {SVGElement} The new pattern definition node. */
-	pattern: function(parent, id, x, y, width, height, vx, vy, vwidth, vheight, settings) {
-		var args = this._args(arguments, ['id', 'x', 'y', 'width', 'height', 'vx', 'vy', 'vwidth', 'vheight'], ['vx']);
-		var sets = $.extend({id: args.id, x: args.x, y: args.y, width: args.width, height: args.height},
-			(args.vx != null ? {viewBox: args.vx + ' ' + args.vy + ' ' + args.vwidth + ' ' + args.vheight} : {}));
-		return this._makeNode(args.parent, 'pattern', $.extend(sets, args.settings || {}));
-	},
-
-	/** Add a clip path definition.
-		@param [parent] {SVGElement|jQuery} The parent node for the new node, or SVG root if not specified.
-		@param id {string} The ID for this path.
-		@param [units='userSpaceOnUse'] {string} Either 'userSpaceOnUse' or 'objectBoundingBox'.
-		@param [settings] {object} Additional settings for this node.
-		@return {SVGElement} The new clip path definition node. */
-	clipPath: function(parent, id, units, settings) {
-		var args = this._args(arguments, ['id', 'units']);
-		args.units = args.units || 'userSpaceOnUse';
-		return this._makeNode(args.parent, 'clipPath', $.extend(
-			{id: args.id, clipPathUnits: args.units}, args.settings || {}));
-	},
-
-	/** Add a mask definition.
-		@param [parent] {SVGElement|jQuery} The parent node for the new node, or SVG root if not specified.
-		@param id {string} The ID for this mask.
-		@param x {number} The x-coordinate for the left edge of the mask.
-		@param y {number} The y-coordinate for the top edge of the mask.
-		@param width {number} The width of the mask.
-		@param height {number} The height of the mask.
-		@param [settings] {object} Additional settings for this node.
-		@return {SVGElement} The new mask definition node. */
-	mask: function(parent, id, x, y, width, height, settings) {
-		var args = this._args(arguments, ['id', 'x', 'y', 'width', 'height']);
-		return this._makeNode(args.parent, 'mask', $.extend(
-			{id: args.id, x: args.x, y: args.y, width: args.width, height: args.height}, args.settings || {}));
-	},
-
-	/** Create a new path object.
-		@return {SVGPath} A new path object. */
-	createPath: function() {
-		return new SVGPath();
-	},
-
-	/** Create a new text object.
-		@return {SVGText} A new text object. */
-	createText: function() {
-		return new SVGText();
-	},
-
-	/** Add an embedded SVG element.
-		<p>Specify all of <code>vx</code>, <code>vy</code>,
-		<code>vwidth</code>, <code>vheight</code> or none of them.</p>
-		@param [parent] {SVGElement|jQuery} The parent node for the new node, or SVG root if not specified.
-		@param x {number} The x-coordinate for the left edge of the node.
-		@param y {number} The y-coordinate for the top edge of the node.
-		@param width {number} The width of the node.
-		@param height {number} The height of the node.
-		@param [vx] {number} The minimum x-coordinate for view box.
-		@param [vy] {number} The minimum y-coordinate for the view box.
-		@param [vwidth] {number} The width of the view box.
-		@param [vheight] {number} The height of the view box.
-		@param [settings] {object} Additional settings for this node.
-		@return {SVGElement} The new svg node. */
-	svg: function(parent, x, y, width, height, vx, vy, vwidth, vheight, settings) {
-		var args = this._args(arguments, ['x', 'y', 'width', 'height', 'vx', 'vy', 'vwidth', 'vheight'], ['vx']);
-		var sets = $.extend({x: args.x, y: args.y, width: args.width, height: args.height}, 
-			(args.vx != null ? {viewBox: args.vx + ' ' + args.vy + ' ' + args.vwidth + ' ' + args.vheight} : {}));
-		return this._makeNode(args.parent, 'svg', $.extend(sets, args.settings || {}));
-	},
-
-	/** Create a group.
-		@param [parent] {SVGElement|jQuery} The parent node for the new node, or SVG root if not specified.
-		@param [id] {string} The ID of this group.
-		@param [settings] {object} Additional settings for this node.
-		@return {SVGElement} The new group node. */
-	group: function(parent, id, settings) {
-		var args = this._args(arguments, ['id'], ['id']);
-		return this._makeNode(args.parent, 'g', $.extend({id: args.id}, args.settings || {}));
-	},
-
-	/** Add a usage reference.
-		<p>Specify all of <code>x</code>, <code>y</code>, <code>width</code>, <code>height</code> or none of them.</p>
-		@param [parent] {SVGElement|jQuery} The parent node for the new node, or SVG root if not specified.
-		@param [x] {number} The x-coordinate for the left edge of the node.
-		@param [y] {number} The y-coordinate for the top edge of the node.
-		@param [width] {number} The width of the node.
-		@param [height] {number} The height of the node.
-		@param ref {string} The ID of the definition node.
-		@param [settings] {object} Additional settings for this node.
-		@return {SVGElement} The new usage reference node. */
-	use: function(parent, x, y, width, height, ref, settings) {
-		var args = this._args(arguments, ['x', 'y', 'width', 'height', 'ref']);
-		if (typeof args.x === 'string') {
-			args.ref = args.x;
-			args.settings = args.y;
-			args.x = args.y = args.width = args.height = null;
-		}
-		var node = this._makeNode(args.parent, 'use', $.extend(
-			{x: args.x, y: args.y, width: args.width, height: args.height}, args.settings || {}));
-		node.setAttributeNS($.svg.xlinkNS, 'href', args.ref);
-		return node;
-	},
-
-	/** Add a link, which applies to all child elements.
-		@param [parent] {SVGElement|jQuery} The parent node for the new node, or SVG root if not specified.
-		@param ref {string} The target URL.
-		@param [settings] {object} Additional settings for this node.
-		@return {SVGElement} The new link node. */
-	link: function(parent, ref, settings) {
-		var args = this._args(arguments, ['ref']);
-		var node = this._makeNode(args.parent, 'a', args.settings);
-		node.setAttributeNS($.svg.xlinkNS, 'href', args.ref);
-		return node;
-	},
-
-	/** Add an image.
-		@param [parent] {SVGElement|jQuery} The parent node for the new node, or SVG root if not specified.
-		@param x {number} The x-coordinate for the left edge of the image.
-		@param y {number} The y-coordinate for the top edge of the image.
-		@param width {number} The width of the image.
-		@param height {number} The height of the image.
-		@param ref {string} The path to the image.
-		@param [settings] {object} Additional settings for this node.
-		@return {SVGElement} The new image node. */
-	image: function(parent, x, y, width, height, ref, settings) {
-		var args = this._args(arguments, ['x', 'y', 'width', 'height', 'ref']);
-		var node = this._makeNode(args.parent, 'image', $.extend(
-			{x: args.x, y: args.y, width: args.width, height: args.height}, args.settings || {}));
-		node.setAttributeNS($.svg.xlinkNS, 'href', args.ref);
-		return node;
-	},
-
-	/** Draw a path.
-		@param [parent] {SVGElement|jQuery} The parent node for the new node, or SVG root if not specified.
-		@param path {string|SVGPath} The path to draw.
-		@param [settings] {object} Additional settings for this node.
-		@return {SVGElement} The new path node. */
-	path: function(parent, path, settings) {
-		var args = this._args(arguments, ['path']);
-		return this._makeNode(args.parent, 'path', $.extend(
-			{d: (args.path.path ? args.path.path() : args.path)}, args.settings || {}));
-	},
-
-	/** Draw a rectangle.
-		<p>Specify both of <code>rx</code> and <code>ry</code> or neither.</p>
-		@param [parent] {SVGElement|jQuery} The parent node for the new node, or SVG root if not specified.
-		@param x {number} The x-coordinate for the left edge of the rectangle.
-		@param y {number} The y-coordinate for the top edge of the rectangle.
-		@param width {number} The width of the rectangle.
-		@param height {number} The height of the rectangle.
-		@param [rx] {number} The x-radius of the ellipse for the rounded corners.
-		@param [ry] {number} The y-radius of the ellipse for the rounded corners.
-		@param [settings] {object} Additional settings for this node.
-		@return {SVGElement} The new rectangle node. */
-	rect: function(parent, x, y, width, height, rx, ry, settings) {
-		var args = this._args(arguments, ['x', 'y', 'width', 'height', 'rx', 'ry'], ['rx']);
-		return this._makeNode(args.parent, 'rect', $.extend(
-			{x: args.x, y: args.y, width: args.width, height: args.height},
-			(args.rx ? {rx: args.rx, ry: args.ry} : {}), args.settings || {}));
-	},
-
-	/** Draw a circle.
-		@param [parent] {SVGElement|jQuery} The parent node for the new node, or SVG root if not specified.
-		@param cx {number} The x-coordinate for the centre of the circle.
-		@param cy {number} The y-coordinate for the centre of the circle.
-		@param r {number} The radius of the circle.
-		@param [settings] {object} Additional settings for this node.
-		@return {SVGElement} The new circle node. */
-	circle: function(parent, cx, cy, r, settings) {
-		var args = this._args(arguments, ['cx', 'cy', 'r']);
-		return this._makeNode(args.parent, 'circle', $.extend(
-			{cx: args.cx, cy: args.cy, r: args.r}, args.settings || {}));
-	},
-
-	/** Draw an ellipse.
-		@param [parent] {SVGElement|jQuery} The parent node for the new node, or SVG root if not specified.
-		@param cx {number} The x-coordinate for the centre of the ellipse.
-		@param cy {number} The y-coordinate for the centre of the ellipse.
-		@param rx {number} The x-radius of the ellipse.
-		@param ry {number} The y-radius of the ellipse.
-		@param [settings] {object} Additional settings for this node.
-		@return {SVGElement} The new ellipse node. */
-	ellipse: function(parent, cx, cy, rx, ry, settings) {
-		var args = this._args(arguments, ['cx', 'cy', 'rx', 'ry']);
-		return this._makeNode(args.parent, 'ellipse', $.extend(
-			{cx: args.cx, cy: args.cy, rx: args.rx, ry: args.ry}, args.settings || {}));
-	},
-
-	/** Draw a line.
-		@param [parent] {SVGElement|jQuery} The parent node for the new node, or SVG root if not specified.
-		@param x1 {number} The x-coordinate for the start of the line.
-		@param y1 {number} The y-coordinate for the start of the line.
-		@param x2 {number} The x-coordinate for the end of the line.
-		@param y2 {number} The y-coordinate for the end of the line.
-		@param [settings] {object} Additional settings for this node.
-		@return {SVGElement} The new line node. */
-	line: function(parent, x1, y1, x2, y2, settings) {
-		var args = this._args(arguments, ['x1', 'y1', 'x2', 'y2']);
-		return this._makeNode(args.parent, 'line', $.extend(
-			{x1: args.x1, y1: args.y1, x2: args.x2, y2: args.y2}, args.settings || {}));
-	},
-
-	/** Draw a polygonal line.
-		@param [parent] {SVGElement|jQuery} The parent node for the new node, or SVG root if not specified.
-		@param points {number[][]} The x-/y-coordinates for the points on the line.
-		@param [settings] {object} Additional settings for this node.
-		@return {SVGElement} The new polygonal line node. */
-	polyline: function(parent, points, settings) {
-		var args = this._args(arguments, ['points']);
-		return this._poly(args.parent, 'polyline', args.points, args.settings);
-	},
-
-	/** Draw a polygonal shape.
-		@param [parent] {SVGElement|jQuery} The parent node for the new node, or SVG root if not specified.
-		@param points {number[][]} The x-/y-coordinates for the points on the shape.
-		@param [settings] {object} Additional settings for this node.
-		@return {SVGElement} The new polygonal shape node. */
-	polygon: function(parent, points, settings) {
-		var args = this._args(arguments, ['points']);
-		return this._poly(args.parent, 'polygon', args.points, args.settings);
-	},
-
-	/** Draw a polygonal line or shape.
-		@private
-		@param parent {SVGElement|jQuery} The parent node for the new node.
-		@param name {string} The type of polygon to create.
-		@param points {number[][]} The x-/y-coordinates for the points on the shape.
-		@param [settings] {object} Additional settings for this node.
-		@return {SVGElement} The new polygon node. */
-	_poly: function(parent, name, points, settings) {
-		var ps = '';
-		for (var i = 0; i < points.length; i++) {
-			ps += points[i].join() + ' ';
-		}
-		return this._makeNode(parent, name, $.extend({points: $.trim(ps)}, settings || {}));
-	},
-
-	/** Draw text.
-		<p>Specify both of <code>x</code> and <code>y</code> or neither of them.</p>
-		@param [parent] {SVGElement|jQuery} The parent node for the new node, or SVG root if not specified.
-		@param [x] {number|number[]} The x-coordinate(s) for the text.
-		@param [y] {number|number[]} The y-coordinate(s) for the text.
-		@param value {string|SVGText} The text content or text with spans and references.
-		@param [settings] {object} Additional settings for this node.
-		@return {SVGElement} The new text node. */
-	text: function(parent, x, y, value, settings) {
-		var args = this._args(arguments, ['x', 'y', 'value']);
-		if (typeof args.x === 'string' && arguments.length < 4) {
-			args.value = args.x;
-			args.settings = args.y;
-			args.x = args.y = null;
-		}
-		return this._text(args.parent, 'text', args.value, $.extend(
-			{x: (args.x && $.isArray(args.x) ? args.x.join(' ') : args.x),
-			y: (args.y && $.isArray(args.y) ? args.y.join(' ') : args.y)}, args.settings || {}));
-	},
-
-	/** Draw text along a path.
-		@param [parent] {SVGElement|jQuery} The parent node for the new node, or SVG root if not specified.
-		@param path {string} The ID of the path.
-		@param value {string|SVGText} The text content or text with spans and references.
-		@param [settings] {object} Additional settings for this node.
-		@return {SVGElement} The new textpath node. */
-	textpath: function(parent, path, value, settings) {
-		var args = this._args(arguments, ['path', 'value']);
-		var node = this._text(args.parent, 'textPath', args.value, args.settings || {});
-		node.setAttributeNS($.svg.xlinkNS, 'href', args.path);
-		return node;
-	},
-
-	/** Draw text.
-		@private
-		@param parent {SVGElement|jQuery} The parent node for the new node.
-		@param name {string} The type of text to create.
-		@param value {string|SVGText} The text content or text with spans and references.
-		@param [settings] {object} Additional settings for this node.
-		@return {SVGElement} The new text node. */
-	_text: function(parent, name, value, settings) {
-		var node = this._makeNode(parent, name, settings);
-		if (typeof value === 'string') {
-			node.appendChild(node.ownerDocument.createTextNode(value));
-		}
-		else {
-			for (var i = 0; i < value._parts.length; i++) {
-				var part = value._parts[i];
-				if (part[0] === 'tspan') {
-					var child = this._makeNode(node, part[0], part[2]);
-					child.appendChild(node.ownerDocument.createTextNode(part[1]));
-					node.appendChild(child);
-				}
-				else if (part[0] === 'tref') {
-					var child = this._makeNode(node, part[0], part[2]);
-					child.setAttributeNS($.svg.xlinkNS, 'href', part[1]);
-					node.appendChild(child);
-				}
-				else if (part[0] === 'textpath') {
-					var set = $.extend({}, part[2]);
-					set.href = null;
-					var child = this._makeNode(node, part[0], set);
-					child.setAttributeNS($.svg.xlinkNS, 'href', part[2].href);
-					child.appendChild(node.ownerDocument.createTextNode(part[1]));
-					node.appendChild(child);
-				}
-				else { // straight text
-					node.appendChild(node.ownerDocument.createTextNode(part[1]));
-				}
-			}
-		}
-		return node;
-	},
-
-	/** Add a custom SVG element.
-		@param [parent] {SVGElement|jQuery} The parent node for the new node, or SVG root if not specified.
-		@param name {string} The name of the element.
-		@param [settings] {object} Additional settings for this node.
-		@return {SVGElement} The new custom node. */
-	other: function(parent, name, settings) {
-		var args = this._args(arguments, ['name']);
-		return this._makeNode(args.parent, args.name, args.settings || {});
-	},
-
-	/** Create a SVG node with the given settings.
-		@private
-		@param parent {SVGElement|jQuery} The parent node for the new node, or SVG root if <code>null</code>.
-		@param name {string} The name of the element.
-		@param [settings] {object} Additional settings for this node.
-		@return {SVGElement} The new node. */
-	_makeNode: function(parent, name, settings) {
-		parent = parent || this._svg;
-		var node = this._svg.ownerDocument.createElementNS($.svg.svgNS, name);
-		for (var name in settings) {
-			var value = settings[name];
-			if (value != null && (typeof value !== 'string' || value !== '')) {
-				node.setAttribute($.svg._attrNames[name] || name, value);
-			}
-		}
-		parent.appendChild(node);
-		return node;
-	},
-
-	/** Add an existing SVG node to the document.
-		@param [parent] {SVGElement|jQuery} The parent node for the new node, or SVG root if not specified.
-		@param node {SVGElement|string|jQuery} The new node to add or
-				the jQuery selector for the node or the set of nodes to add.
-		@return {SVGWrapper} This wrapper. */
-	add: function(parent, node) {
-		var args = this._args((arguments.length === 1 ? [null, parent] : arguments), ['node']);
-		var svg = this;
-		args.parent = args.parent || this._svg;
-		args.node = (args.node.jquery ? args.node : $(args.node));
-		try {
-			args.parent.appendChild(args.node.cloneNode(true));
-		}
-		catch (e) {
-			args.node.each(function() {
-				var child = svg._cloneAsSVG(this);
-				if (child) {
-					args.parent.appendChild(child);
-				}
-			});
-		}
-		return this;
-	},
-
-	/** Clone an existing SVG node and add it to the document.
-		@param [parent] {SVGElement|jQuery} The parent node for the new node, or SVG root if not specified.
-		@param node {SVGEelement|string|jQuery} The new node to add or
-				the jQuery selector for the node or the set of nodes to clone.
-		@return {SVGElement[]} The collection of new nodes. */
-	clone: function(parent, node) {
-		var svg = this;
-		var args = this._args((arguments.length === 1 ? [null, parent] : arguments), ['node']);
-		args.parent = args.parent || this._svg;
-		args.node = (args.node.jquery ? args.node : $(args.node));
-		var newNodes = [];
-		args.node.each(function() {
-			var child = svg._cloneAsSVG(this);
-			if (child) {
-				child.id = '';
-				args.parent.appendChild(child);
-				newNodes.push(child);
-			}
-		});
-		return newNodes;
-	},
-
-	/** SVG nodes must belong to the SVG namespace, so clone and ensure this is so.
-		@private
-		@param node {SVGElement} The SVG node to clone.
-		@return {SVGElement} The cloned node. */
-	_cloneAsSVG: function(node) {
-		var newNode = null;
-		if (node.nodeType === 1) { // element
-			newNode = this._svg.ownerDocument.createElementNS($.svg.svgNS, this._checkName(node.nodeName));
-			for (var i = 0; i < node.attributes.length; i++) {
-				var attr = node.attributes.item(i);
-				if (attr.nodeName !== 'xmlns' && attr.nodeValue) {
-					if (attr.prefix === 'xlink') {
-						newNode.setAttributeNS($.svg.xlinkNS, attr.localName || attr.baseName, attr.nodeValue);
-					}
-					else {
-						newNode.setAttribute(this._checkName(attr.nodeName), attr.nodeValue);
-					}
-				}
-			}
-			for (var i = 0; i < node.childNodes.length; i++) {
-				var child = this._cloneAsSVG(node.childNodes[i]);
-				if (child) {
-					newNode.appendChild(child);
-				}
-			}
-		}
-		else if (node.nodeType === 3) { // text
-			if ($.trim(node.nodeValue)) {
-				newNode = this._svg.ownerDocument.createTextNode(node.nodeValue);
-			}
-		}
-		else if (node.nodeType === 4) { // CDATA
-			if ($.trim(node.nodeValue)) {
-				try {
-					newNode = this._svg.ownerDocument.createCDATASection(node.nodeValue);
-				}
-				catch (e) {
-					newNode = this._svg.ownerDocument.createTextNode(
-						node.nodeValue.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;'));
-				}
-			}
-		}
-		return newNode;
-	},
-
-	/** Node names must be lower case and without SVG namespace prefix.
-		@private
-		@param name {string} The name to check.
-		@return {string} The corrected name. */
-	_checkName: function(name) {
-		name = (name.substring(0, 1) >= 'A' && name.substring(0, 1) <= 'Z' ? name.toLowerCase() : name);
-		return (name.substring(0, 4) === 'svg:' ? name.substring(4) : name);
-	},
-
-	/** Load an external SVG document.
-		@param url {string} The location of the SVG document or
-				the actual SVG content (starting with '<code>&lt;svg</code>'.
-		@param settings {boolean|function|object} Either <code>addTo</code> below or <code>onLoad</code> below or
-				additional settings for the load with attributes below:
-				<code>addTo</code> {boolean} <code>true</code> to add to what's already there,
-				or <code>false</code> to clear the canvas first,
-				<code>changeSize</code> {boolean} <code>true</code> to allow the canvas size to change,
-				or <code>false</code> to retain the original,
-				<code>onLoad</code> {function} callback after the document has loaded,
-				'<code>this</code>' is the container, receives SVG object and optional error message as a parameter,
-				<code>parent</code> {string|SVGElement|jQuery} the parent to load into,
-				defaults to top-level svg element.
-		@return {SVGWrapper} This wrapper. */
-	load: function(url, settings) {
-		settings = (typeof settings === 'boolean' ? {addTo: settings} :
-				(typeof settings === 'function' ? {onLoad: settings} :
-				(typeof settings === 'string' ? {parent: settings} : 
-				(typeof settings === 'object' && settings.nodeName ? {parent: settings} :
-				(typeof settings === 'object' && settings.jquery ? {parent: settings} : settings || {})))));
-		if (!settings.parent && !settings.addTo) {
-			this.clear(false);
-		}
-		var size = [this._svg.getAttribute('width'), this._svg.getAttribute('height')];
-		var wrapper = this;
-		// Report a problem with the load
-		var reportError = function(message) {
-			message = $.svg.local.errorLoadingText + ': ' + message;
-			if (settings.onLoad) {
-				settings.onLoad.apply(wrapper._container || wrapper._svg, [wrapper, message]);
-			}
-			else {
-				wrapper.text(null, 10, 20, message);
-			}
-		};
-		// Create a DOM from SVG content
-		var loadXML4IE = function(data) {
-			var xml = new ActiveXObject('Microsoft.XMLDOM');
-			xml.validateOnParse = false;
-			xml.resolveExternals = false;
-			xml.async = false;
-			xml.loadXML(data);
-			if (xml.parseError.errorCode !== 0) {
-				reportError(xml.parseError.reason);
-				return null;
-			}
-			return xml;
-		};
-		// Load the SVG DOM
-		var loadSVG = function(data) {
-			if (!data) {
-				return;
-			}
-			if (data.documentElement.nodeName !== 'svg') {
-				var errors = data.getElementsByTagName('parsererror');
-				var messages = (errors.length ? errors[0].getElementsByTagName('div') : []); // Safari
-				reportError(!errors.length ? '???' : (messages.length ? messages[0] : errors[0]).firstChild.nodeValue);
-				return;
-			}
-			var parent = (settings.parent ? $(settings.parent)[0] : wrapper._svg);
-			var attrs = {};
-			for (var i = 0; i < data.documentElement.attributes.length; i++) {
-				var attr = data.documentElement.attributes.item(i);
-				if (!(attr.nodeName === 'version' || attr.nodeName.substring(0, 5) === 'xmlns')) {
-					attrs[attr.nodeName] = attr.nodeValue;
-				}
-			}
-			wrapper.configure(parent, attrs, !settings.parent);
-			var nodes = data.documentElement.childNodes;
-			for (var i = 0; i < nodes.length; i++) {
-				try {
-					parent.appendChild(wrapper._svg.ownerDocument.importNode(nodes[i], true));
-					if (nodes[i].nodeName === 'script') {
-						$.globalEval(nodes[i].textContent);
-					}
-				}
-				catch (e) {
-					wrapper.add(parent, nodes[i]);
-				}
-			}
-			if (!settings.keepRelativeLinks && url.match('/')) {
-				var base = url.replace(/\/[^\/]*$/, '/');
-				$('*', parent).each(function() {
-					var href = $(this).attr('xlink:href');
-					if (href && !href.match(/(^[a-z][-a-z0-9+.]*:.*$)|(^\/.*$)|(^#.*$)/i)) {
-						$(this).attr('xlink:href', base + href);
-					}
-				});
-			}
-			if (!settings.changeSize) {
-				wrapper.configure(parent, {width: size[0], height: size[1]});
-			}
-			if (settings.onLoad) {
-				settings.onLoad.apply(wrapper._container || wrapper._svg, [wrapper]);
-			}
-		};
-		if (url.match('<svg')) { // Inline SVG
-			try {
-				loadSVG(new DOMParser().parseFromString(url, 'text/xml'));
-			} catch (e) {
-				reportError(e);
-			}
-		}
-		else { // Remote SVG
-			$.ajax({url: url, dataType: 'xml',
-				success: function(xml) {
-					loadSVG(xml);
-				}, error: function(http, message, exc) {
-					reportError(message + (exc ? ' ' + exc.message : ''));
-				}});
-		}
-		return this;
-	},
-
-	/** Delete a specified node.
-		@param node {SVGElement|jQuery} The drawing node to remove.
-		@return {SVGWrapper} This wrapper. */
-	remove: function(node) {
-		node = (node.jquery ? node[0] : node);
-		node.parentNode.removeChild(node);
-		return this;
-	},
-
-	/** Delete everything in the current document.
-		@param [attrsToo=false] {boolean} <code>true</code> to clear any root attributes as well,
-				<code>false</code> to leave them.
-		@return {SVGWrapper} This wrapper. */
-	clear: function(attrsToo) {
-		if (attrsToo) {
-			this.configure({}, true);
-		}
-		while (this._svg.firstChild) {
-			this._svg.removeChild(this._svg.firstChild);
-		}
-		return this;
-	},
-
-	/** Serialise the current diagram into an SVG text document.
-		@param [node] {SVGElement} The starting node, or SVG root if not specified .
-		@return {string} The SVG as text. */
-	toSVG: function(node) {
-		node = node || this._svg;
-		return (typeof XMLSerializer === 'undefined' ? this._toSVG(node) : new XMLSerializer().serializeToString(node));
-	},
-
-	/** Serialise one node in the SVG hierarchy.
-		@private
-		@param node {SVGElement} The current node to serialise.
-		@return {string} The serialised SVG. */
-	_toSVG: function(node) {
-		var svgDoc = '';
-		if (!node) {
-			return svgDoc;
-		}
-		if (node.nodeType === 3) { // Text
-			svgDoc = node.nodeValue;
-		}
-		else if (node.nodeType === 4) { // CDATA
-			svgDoc = '<![CDATA[' + node.nodeValue + ']]>';
-		}
-		else { // Element
-			svgDoc = '<' + node.nodeName;
-			if (node.attributes) {
-				for (var i = 0; i < node.attributes.length; i++) {
-					var attr = node.attributes.item(i);
-					if (!($.trim(attr.nodeValue) === '' || attr.nodeValue.match(/^\[object/) ||
-							attr.nodeValue.match(/^function/))) {
-						svgDoc += ' ' + (attr.namespaceURI === $.svg.xlinkNS ? 'xlink:' : '') +
-							attr.nodeName + '="' + attr.nodeValue + '"';
-					}
-				}
-			}	
-			if (node.firstChild) {
-				svgDoc += '>';
-				var child = node.firstChild;
-				while (child) {
-					svgDoc += this._toSVG(child);
-					child = child.nextSibling;
-				}
-				svgDoc += '</' + node.nodeName + '>';
-			}
-				else {
-				svgDoc += '/>';
-			}
-		}
-		return svgDoc;
-	}
-});
-
-/** Helper to generate an SVG path.
-	<p>Obtain an instance from the SVGWrapper object.</p>
-	<p>String calls together to generate the path and use its value:</p>
-	@module SVGPath
-	@example var path = root.createPath();
-   root.path(null, path.move(100, 100).line(300, 100).line(200, 300).close(), {fill: 'red'});
- // or
-   root.path(null, path.move(100, 100).line([[300, 100], [200, 300]]).close(), {fill: 'red'}); */
-function SVGPath() {
-	this._path = '';
-}
-
-$.extend(SVGPath.prototype, {
-	/** Prepare to create a new path.
-		@return {SVGPath} This path. */
-	reset: function() {
-		this._path = '';
-		return this;
-	},
-
-	/** Move the pointer to a position.
-		@param x {number|number[][]} x-coordinate to move to or x-/y-coordinates to move to.
-		@param [y] {number} y-coordinate to move to (omitted if <code>x</code> is array).
-		@param [relative=false] {boolean} <code>true</code> for coordinates relative to the current point,
-				<code>false</code> for coordinates being absolute.
-		@return {SVGPath} This path. */
-	move: function(x, y, relative) {
-		relative = ($.isArray(x) ? y : relative);
-		return this._coords((relative ? 'm' : 'M'), x, y);
-	},
-
-	/** Draw a line to a position.
-		@param x {number|number[][]} x-coordinate to move to or x-/y-coordinates to move to.
-		@param [y] {number} y-coordinate to move to (omitted if <code>x</code> is array).
-		@param [relative=false] {boolean} <code>true</code> for coordinates relative to the current point,
-				<code>false</code> for coordinates being absolute.
-		@return {SVGPath} This path. */
-	line: function(x, y, relative) {
-		relative = ($.isArray(x) ? y : relative);
-		return this._coords((relative ? 'l' : 'L'), x, y);
-	},
-
-	/** Draw a horizontal line to a position.
-		@param x {number|number[]} x-coordinate to draw to or x-coordinates to draw to.
-		@param relative {boolean} <code>true</code> for coordinates relative to the current point,
-				<code>false</code> for coordinates being absolute.
-		@return {SVGPath} This path. */
-	horiz: function(x, relative) {
-		this._path += (relative ? 'h' : 'H') + ($.isArray(x) ? x.join(' ') : x);
-		return this;
-	},
-
-	/** Draw a vertical line to a position.
-		@param y {number|number[]} y-coordinate to draw to or y-coordinates to draw to.
-		@param [relative=false] {boolean} <code>true</code> for coordinates relative to the current point,
-				<code>false</code> for coordinates being absolute.
-		@return {SVGPath} This path. */
-	vert: function(y, relative) {
-		this._path += (relative ? 'v' : 'V') + ($.isArray(y) ? y.join(' ') : y);
-		return this;
-	},
-
-	/** Draw a cubic Bézier curve.
-		@param x1 {number|number[][]} x-coordinate of beginning control point or
-				x-/y-coordinates of control and end points to draw to.
-		@param [y1] {number} y-coordinate of beginning control point (omitted if <code>x1</code> is array).
-		@param [x2] {number} x-coordinate of ending control point (omitted if <code>x1</code> is array).
-		@param [y2] {number} y-coordinate of ending control point (omitted if <code>x1</code> is array).
-		@param [x] {number} x-coordinate of curve end (omitted if <code>x1</code> is array).
-		@param [y] {number} y-coordinate of curve end (omitted if <code>x1</code> is array).
-		@param [relative=false] {boolean} <code>true</code> for coordinates relative to the current point,
-				<code>false</code> for coordinates being absolute.
-		@return {SVGPath} This path. */
-	curveC: function(x1, y1, x2, y2, x, y, relative) {
-		relative = ($.isArray(x1) ? y1 : relative);
-		return this._coords((relative ? 'c' : 'C'), x1, y1, x2, y2, x, y);
-	},
-
-	/** Continue a cubic Bézier curve.
-		<p>Starting control point is the reflection of the previous end control point.</p>
-		@param x2 {number|number[][]} x-coordinate of ending control point or
-				x-/y-coordinates of control and end points to draw to.
-		@param [y2] {number} y-coordinate of ending control point (omitted if <code>x2</code> is array).
-		@param [x] {number} x-coordinate of curve end (omitted if <code>x2</code> is array).
-		@param [y] {number} y-coordinate of curve end (omitted if <code>x2</code> is array).
-		@param [relative=false] {boolean} <code>true</code> for coordinates relative to the current point,
-				<code>false</code> for coordinates being absolute.
-		@return {SVGPath} This path. */
-	smoothC: function(x2, y2, x, y, relative) {
-		relative = ($.isArray(x2) ? y2 : relative);
-		return this._coords((relative ? 's' : 'S'), x2, y2, x, y);
-	},
-
-	/** Draw a quadratic Bézier curve.
-		@param x1 {number|number[][]} x-coordinate of control point or
-				x-/y-coordinates of control and end points to draw to.
-		@param [y1] {number} y-coordinate of control point (omitted if <code>x1</code> is array).
-		@param [x] {number} x-coordinate of curve end (omitted if <code>x1</code> is array).
-		@param [y] {number} y-coordinate of curve end (omitted if <code>x1</code> is array).
-		@param [relative=false] {boolean} <code>true</code> for coordinates relative to the current point,
-				<code>false</code> for coordinates being absolute.
-		@return {SVGPath} This path. */
-	curveQ: function(x1, y1, x, y, relative) {
-		relative = ($.isArray(x1) ? y1 : relative);
-		return this._coords((relative ? 'q' : 'Q'), x1, y1, x, y);
-	},
-
-	/** Continue a quadratic Bézier curve.
-		<p>Control point is the reflection of the previous control point.</p>
-		@param x {number|number[][]} x-coordinate of curve end or x-/y-coordinates of points to draw to.
-		@param [y] {number} y-coordinate of curve end (omitted if <code>x</code> is array).
-		@param [relative=false] {boolean} <code>true</code> for coordinates relative to the current point,
-				<code>false</code> for coordinates being absolute.
-		@return {SVGPath} This path. */
-	smoothQ: function(x, y, relative) {
-		relative = ($.isArray(x) ? y : relative);
-		return this._coords((relative ? 't' : 'T'), x, y);
-	},
-
-	/** Generate a path command with (a list of) coordinates.
-		@private
-		@param cmd {string} The command for the path element.
-		@param x1 {number} The first x-coordinate.
-		@param y1 {number} The first y-coordinate.
-		@param [x2] {number} The second x-coordinate.
-		@param [y2] {number} The second y-coordinate.
-		@param [x3] {number} The third x-coordinate.
-		@param [y3] {number} The third y-coordinate.
-		@return {SVGPath} This path. */
-	_coords: function(cmd, x1, y1, x2, y2, x3, y3) {
-		if ($.isArray(x1)) {
-			for (var i = 0; i < x1.length; i++) {
-				var cs = x1[i];
-				this._path += (i === 0 ? cmd : ' ') + cs[0] + ',' + cs[1] + (cs.length < 4 ? '' :
-						' ' + cs[2] + ',' + cs[3] + (cs.length < 6 ? '': ' ' + cs[4] + ',' + cs[5]));
-			}
-		}
-		else {
-			this._path += cmd + x1 + ',' + y1 + 
-				(x2 == null ? '' : ' ' + x2 + ',' + y2 + (x3 == null ? '' : ' ' + x3 + ',' + y3));
-		}
-		return this;
-	},
-
-	/** Draw an arc to a position.
-		@param rx {number|any[][]} x-radius of arc or x-/y-coordinates and flags for points to draw to.
-		@param [ry] {number} y-radius of arc (omitted if <code>rx</code> is array).
-		@param [xRotate] {number} x-axis rotation (degrees, clockwise) (omitted if <code>rx</code> is array).
-		@param [large] {boolean} <code>true</code> to draw the large part of the arc,
-				<code>false</code> to draw the small part (omitted if <code>rx</code> is array).
-		@param [clockwise] {boolean} <code>true</code> to draw the clockwise arc,
-				<code>false</code> to draw the anti-clockwise arc (omitted if <code>rx</code> is array).
-		@param [x] {number} x-coordinate of arc end (omitted if <code>rx</code> is array).
-		@param [y] {number} y-coordinate of arc end (omitted if <code>rx</code> is array).
-		@param [relative=false] {boolean} <code>true</code> for coordinates relative to the current point,
-				<code>false</code> for coordinates being absolute.
-		@return {SVGPath} This path. */
-	arc: function(rx, ry, xRotate, large, clockwise, x, y, relative) {
-		relative = ($.isArray(rx) ? ry : relative);
-		this._path += (relative ? 'a' : 'A');
-		if ($.isArray(rx)) {
-			for (var i = 0; i < rx.length; i++) {
-				var cs = rx[i];
-				this._path += (i === 0 ? '' : ' ') + cs[0] + ',' + cs[1] + ' ' +
-					cs[2] + ' ' + (cs[3] ? '1' : '0') + ',' + (cs[4] ? '1' : '0') + ' ' + cs[5] + ',' + cs[6];
-			}
-		}
-		else {
-			this._path += rx + ',' + ry + ' ' + xRotate + ' ' +
-				(large ? '1' : '0') + ',' + (clockwise ? '1' : '0') + ' ' + x + ',' + y;
-		}
-		return this;
-	},
-
-	/** Close the current path.
-		@return {SVGPath} This path. */
-	close: function() {
-		this._path += 'z';
-		return this;
-	},
-
-	/** Return the string rendering of the specified path.
-		@return {string} The stringified path. */
-	path: function() {
-		return this._path;
-	}
-});
-
-SVGPath.prototype.moveTo = SVGPath.prototype.move;
-SVGPath.prototype.lineTo = SVGPath.prototype.line;
-SVGPath.prototype.horizTo = SVGPath.prototype.horiz;
-SVGPath.prototype.vertTo = SVGPath.prototype.vert;
-SVGPath.prototype.curveCTo = SVGPath.prototype.curveC;
-SVGPath.prototype.smoothCTo = SVGPath.prototype.smoothC;
-SVGPath.prototype.curveQTo = SVGPath.prototype.curveQ;
-SVGPath.prototype.smoothQTo = SVGPath.prototype.smoothQ;
-SVGPath.prototype.arcTo = SVGPath.prototype.arc;
-
-/** Helper to generate an SVG text object.
-	<p>Obtain an instance from the SVGWrapper object.</p>
-	<p>String calls together to generate the text and use its value:</p>
-	@module SVGText
-	@example var text = root.createText();
-   root.text(null, x, y, text.string('This is ').
-     span('red', {fill: 'red'}).string('!'), {fill: 'blue'}); */
-function SVGText() {
-	this._parts = []; // The components of the text object
-}
-
-$.extend(SVGText.prototype, {
-	/** Prepare to create a new text object.
-		@return {SVGText} This text object. */
-	reset: function() {
-		this._parts = [];
-		return this;
-	},
-
-	/** Add a straight string value.
-		@param value {string} The actual text.
-		@return {SVGText} This text object. */
-	string: function(value) {
-		this._parts.push(['text', value]);
-		return this;
-	},
-
-	/** Add a separate text span that has its own settings.
-		@param value {string} The actual text.
-		@param settings {object} The settings for this text.
-		@return {SVGText} This text object. */
-	span: function(value, settings) {
-		this._parts.push(['tspan', value, settings]);
-		return this;
-	},
-
-	/** Add a reference to a previously defined text string.
-		@param id {string} The ID of the actual text.
-		@param settings {object} The settings for this text.
-		@return {SVGText} This text object. */
-	ref: function(id, settings) {
-		this._parts.push(['tref', id, settings]);
-		return this;
-	},
-
-	/** Add text drawn along a path.
-		@param id {string} The ID of the path.
-		@param value {string} The actual text.
-		@param settings {object} The settings for this text.
-		@return {SVGText} This text object. */
-	path: function(id, value, settings) {
-		this._parts.push(['textpath', value, $.extend({href: id}, settings || {})]);
-		return this;
-	}
-});
-
-/** Attach the SVG functionality to a jQuery selection.
-	@param [command] {string} The command to run.
-	@param [options] {object} The new settings to use for these SVG instances.
-	@return {jQuery} For chaining further calls. */
-$.fn.svg = function(options) {
-	var otherArgs = Array.prototype.slice.call(arguments, 1);
-	if (typeof options === 'string' && options === 'get') {
-		return $.svg['_' + options + 'SVG'].apply($.svg, [this[0]].concat(otherArgs));
-	}
-	return this.each(function() {
-		if (typeof options === 'string') {
-			$.svg['_' + options + 'SVG'].apply($.svg, [this].concat(otherArgs));
-		}
-		else {
-			$.svg._attachSVG(this, options || {});
-		} 
-	});
-};
-
-// Singleton primary SVG interface
-$.svg = new SVGManager();
-
-})(jQuery);
diff --git a/#pma/js/jquery/jquery.tablesorter.js b/#pma/js/jquery/jquery.tablesorter.js
deleted file mode 100644
index 2adc5951..00000000
--- a/#pma/js/jquery/jquery.tablesorter.js
+++ /dev/null
@@ -1,1033 +0,0 @@
-/*
- * 
- * TableSorter 2.0 - Client-side table sorting with ease!
- * Version 2.0.5b
- * @requires jQuery v1.2.3
- * 
- * Copyright (c) 2007 Christian Bach
- * Examples and docs at: http://tablesorter.com
- * Dual licensed under the MIT and GPL licenses:
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl.html
- * 
- */
-/**
- * 
- * @description Create a sortable table with multi-column sorting capabilitys
- * 
- * @example $('table').tablesorter();
- * @desc Create a simple tablesorter interface.
- * 
- * @example $('table').tablesorter({ sortList:[[0,0],[1,0]] });
- * @desc Create a tablesorter interface and sort on the first and secound column column headers.
- * 
- * @example $('table').tablesorter({ headers: { 0: { sorter: false}, 1: {sorter: false} } });
- *          
- * @desc Create a tablesorter interface and disableing the first and second  column headers.
- *      
- * 
- * @example $('table').tablesorter({ headers: { 0: {sorter:"integer"}, 1: {sorter:"currency"} } });
- * 
- * @desc Create a tablesorter interface and set a column parser for the first
- *       and second column.
- * 
- * 
- * @param Object
- *            settings An object literal containing key/value pairs to provide
- *            optional settings.
- * 
- * 
- * @option String cssHeader (optional) A string of the class name to be appended
- *         to sortable tr elements in the thead of the table. Default value:
- *         "header"
- * 
- * @option String cssAsc (optional) A string of the class name to be appended to
- *         sortable tr elements in the thead on a ascending sort. Default value:
- *         "headerSortUp"
- * 
- * @option String cssDesc (optional) A string of the class name to be appended
- *         to sortable tr elements in the thead on a descending sort. Default
- *         value: "headerSortDown"
- * 
- * @option String sortInitialOrder (optional) A string of the inital sorting
- *         order can be asc or desc. Default value: "asc"
- * 
- * @option String sortMultisortKey (optional) A string of the multi-column sort
- *         key. Default value: "shiftKey"
- * 
- * @option String textExtraction (optional) A string of the text-extraction
- *         method to use. For complex html structures inside td cell set this
- *         option to "complex", on large tables the complex option can be slow.
- *         Default value: "simple"
- * 
- * @option Object headers (optional) An array containing the forces sorting
- *         rules. This option let's you specify a default sorting rule. Default
- *         value: null
- * 
- * @option Array sortList (optional) An array containing the forces sorting
- *         rules. This option let's you specify a default sorting rule. Default
- *         value: null
- * 
- * @option Array sortForce (optional) An array containing forced sorting rules.
- *         This option let's you specify a default sorting rule, which is
- *         prepended to user-selected rules. Default value: null
- * 
- * @option Boolean sortLocaleCompare (optional) Boolean flag indicating whatever
- *         to use String.localeCampare method or not. Default set to true.
- * 
- * 
- * @option Array sortAppend (optional) An array containing forced sorting rules.
- *         This option let's you specify a default sorting rule, which is
- *         appended to user-selected rules. Default value: null
- * 
- * @option Boolean widthFixed (optional) Boolean flag indicating if tablesorter
- *         should apply fixed widths to the table columns. This is usefull when
- *         using the pager companion plugin. This options requires the dimension
- *         jquery plugin. Default value: false
- * 
- * @option Boolean cancelSelection (optional) Boolean flag indicating if
- *         tablesorter should cancel selection of the table headers text.
- *         Default value: true
- * 
- * @option Boolean debug (optional) Boolean flag indicating if tablesorter
- *         should display debuging information usefull for development.
- * 
- * @type jQuery
- * 
- * @name tablesorter
- * 
- * @cat Plugins/Tablesorter
- * 
- * @author Christian Bach/christian.bach@polyester.se
- */
-
-(function ($) {
-    $.extend({
-        tablesorter: new
-        function () {
-
-            var parsers = [],
-                widgets = [];
-
-            this.defaults = {
-                cssHeader: "header",
-                cssAsc: "headerSortUp",
-                cssDesc: "headerSortDown",
-                cssChildRow: "expand-child",
-                sortInitialOrder: "asc",
-                sortMultiSortKey: "shiftKey",
-                sortForce: null,
-                sortAppend: null,
-                sortLocaleCompare: true,
-                textExtraction: "simple",
-                parsers: {}, widgets: [],
-                widgetZebra: {
-                    css: ["even", "odd"]
-                }, headers: {}, widthFixed: false,
-                cancelSelection: true,
-                sortList: [],
-                headerList: [],
-                dateFormat: "us",
-                decimal: '/\.|\,/g',
-                onRenderHeader: null,
-                selectorHeaders: 'thead th',
-                debug: false
-            };
-
-            /* debuging utils */
-
-            function benchmark(s, d) {
-                log(s + "," + (new Date().getTime() - d.getTime()) + "ms");
-            }
-
-            this.benchmark = benchmark;
-
-            function log(s) {
-                if (typeof console != "undefined" && typeof console.debug != "undefined") {
-                    console.log(s);
-                } else {
-                    alert(s);
-                }
-            }
-
-            /* parsers utils */
-
-            function buildParserCache(table, $headers) {
-
-                if (table.config.debug) {
-                    var parsersDebug = "";
-                }
-
-                if (table.tBodies.length == 0) return; // In the case of empty tables
-                var rows = table.tBodies[0].rows;
-
-                if (rows[0]) {
-
-                    var list = [],
-                        cells = rows[0].cells,
-                        l = cells.length;
-
-                    for (var i = 0; i < l; i++) {
-
-                        var p = false;
-
-                        if ($.metadata && ($($headers[i]).metadata() && $($headers[i]).metadata().sorter)) {
-
-                            p = getParserById($($headers[i]).metadata().sorter);
-
-                        } else if ((table.config.headers[i] && table.config.headers[i].sorter)) {
-
-                            p = getParserById(table.config.headers[i].sorter);
-                        }
-                        if (!p) {
-
-                            p = detectParserForColumn(table, rows, -1, i);
-                        }
-
-                        if (table.config.debug) {
-                            parsersDebug += "column:" + i + " parser:" + p.id + "\n";
-                        }
-
-                        list.push(p);
-                    }
-                }
-
-                if (table.config.debug) {
-                    log(parsersDebug);
-                }
-
-                return list;
-            };
-
-            function detectParserForColumn(table, rows, rowIndex, cellIndex) {
-                var l = parsers.length,
-                    node = false,
-                    nodeValue = false,
-                    keepLooking = true;
-                while (nodeValue == '' && keepLooking) {
-                    rowIndex++;
-                    if (rows[rowIndex]) {
-                        node = getNodeFromRowAndCellIndex(rows, rowIndex, cellIndex);
-                        nodeValue = trimAndGetNodeText(table.config, node);
-                        if (table.config.debug) {
-                            log('Checking if value was empty on row:' + rowIndex);
-                        }
-                    } else {
-                        keepLooking = false;
-                    }
-                }
-                for (var i = 1; i < l; i++) {
-                    if (parsers[i].is(nodeValue, table, node)) {
-                        return parsers[i];
-                    }
-                }
-                // 0 is always the generic parser (text)
-                return parsers[0];
-            }
-
-            function getNodeFromRowAndCellIndex(rows, rowIndex, cellIndex) {
-                return rows[rowIndex].cells[cellIndex];
-            }
-
-            function trimAndGetNodeText(config, node) {
-                return $.trim(getElementText(config, node));
-            }
-
-            function getParserById(name) {
-                var l = parsers.length;
-                for (var i = 0; i < l; i++) {
-                    if (parsers[i].id.toLowerCase() == name.toLowerCase()) {
-                        return parsers[i];
-                    }
-                }
-                return false;
-            }
-
-            /* utils */
-
-            function buildCache(table) {
-
-                if (table.config.debug) {
-                    var cacheTime = new Date();
-                }
-
-                var totalRows = (table.tBodies[0] && table.tBodies[0].rows.length) || 0,
-                    totalCells = (table.tBodies[0].rows[0] && table.tBodies[0].rows[0].cells.length) || 0,
-                    parsers = table.config.parsers,
-                    cache = {
-                        row: [],
-                        normalized: []
-                    };
-
-                for (var i = 0; i < totalRows; ++i) {
-
-                    /** Add the table data to main data array */
-                    var c = $(table.tBodies[0].rows[i]),
-                        cols = [];
-
-                    // if this is a child row, add it to the last row's children and
-                    // continue to the next row
-                    if (c.hasClass(table.config.cssChildRow)) {
-                        cache.row[cache.row.length - 1] = cache.row[cache.row.length - 1].add(c);
-                        // go to the next for loop
-                        continue;
-                    }
-
-                    cache.row.push(c);
-
-                    for (var j = 0; j < totalCells; ++j) {
-                        cols.push(parsers[j].format(getElementText(table.config, c[0].cells[j]), table, c[0].cells[j]));
-                    }
-
-                    cols.push(cache.normalized.length); // add position for rowCache
-                    cache.normalized.push(cols);
-                    cols = null;
-                };
-
-                if (table.config.debug) {
-                    benchmark("Building cache for " + totalRows + " rows:", cacheTime);
-                }
-
-                return cache;
-            };
-
-            function getElementText(config, node) {
-
-                var text = "";
-
-                if (!node) return "";
-
-                if (!config.supportsTextContent) config.supportsTextContent = node.textContent || false;
-
-                if (config.textExtraction == "simple") {
-                    if (config.supportsTextContent) {
-                        text = node.textContent;
-                    } else {
-                        if (node.childNodes[0] && node.childNodes[0].hasChildNodes()) {
-                            text = node.childNodes[0].innerHTML;
-                        } else {
-                            text = node.innerHTML;
-                        }
-                    }
-                } else {
-                    if (typeof(config.textExtraction) == "function") {
-                        text = config.textExtraction(node);
-                    } else {
-                        text = $(node).text();
-                    }
-                }
-                return text;
-            }
-
-            function appendToTable(table, cache) {
-
-                if (table.config.debug) {
-                    var appendTime = new Date()
-                }
-
-                var c = cache,
-                    r = c.row,
-                    n = c.normalized,
-                    totalRows = n.length,
-                    checkCell = (n[0].length - 1),
-                    tableBody = $(table.tBodies[0]),
-                    rows = [];
-
-
-                for (var i = 0; i < totalRows; i++) {
-                    var pos = n[i][checkCell];
-
-                    rows.push(r[pos]);
-
-                    if (!table.config.appender) {
-
-                        //var o = ;
-                        var l = r[pos].length;
-                        for (var j = 0; j < l; j++) {
-                            tableBody[0].appendChild(r[pos][j]);
-                        }
-
-                        // 
-                    }
-                }
-
-
-
-                if (table.config.appender) {
-
-                    table.config.appender(table, rows);
-                }
-
-                rows = null;
-
-                if (table.config.debug) {
-                    benchmark("Rebuilt table:", appendTime);
-                }
-
-                // apply table widgets
-                applyWidget(table);
-
-                // trigger sortend
-                setTimeout(function () {
-                    $(table).trigger("sortEnd");
-                }, 0);
-
-            };
-
-            function buildHeaders(table) {
-
-                if (table.config.debug) {
-                    var time = new Date();
-                }
-
-                var meta = ($.metadata) ? true : false;
-                
-                var header_index = computeTableHeaderCellIndexes(table);
-
-                $tableHeaders = $(table.config.selectorHeaders, table).each(function (index) {
-
-                    this.column = header_index[this.parentNode.rowIndex + "-" + this.cellIndex];
-                    // this.column = index;
-                    this.order = formatSortingOrder(table.config.sortInitialOrder);
-                    
-					
-					this.count = this.order;
-
-                    if (checkHeaderMetadata(this) || checkHeaderOptions(table, index)) this.sortDisabled = true;
-					if (checkHeaderOptionsSortingLocked(table, index)) this.order = this.lockedOrder = checkHeaderOptionsSortingLocked(table, index);
-
-                    if (!this.sortDisabled) {
-                        var $th = $(this).addClass(table.config.cssHeader);
-                        if (table.config.onRenderHeader) table.config.onRenderHeader.apply($th);
-                    }
-
-                    // add cell to headerList
-                    table.config.headerList[index] = this;
-                });
-
-                if (table.config.debug) {
-                    benchmark("Built headers:", time);
-                    log($tableHeaders);
-                }
-
-                return $tableHeaders;
-
-            };
-
-            // from:
-            // http://www.javascripttoolbox.com/lib/table/examples.php
-            // http://www.javascripttoolbox.com/temp/table_cellindex.html
-
-
-            function computeTableHeaderCellIndexes(t) {
-                var matrix = [];
-                var lookup = {};
-                var thead = t.getElementsByTagName('THEAD')[0];
-                var trs = thead.getElementsByTagName('TR');
-
-                for (var i = 0; i < trs.length; i++) {
-                    var cells = trs[i].cells;
-                    for (var j = 0; j < cells.length; j++) {
-                        var c = cells[j];
-
-                        var rowIndex = c.parentNode.rowIndex;
-                        var cellId = rowIndex + "-" + c.cellIndex;
-                        var rowSpan = c.rowSpan || 1;
-                        var colSpan = c.colSpan || 1
-                        var firstAvailCol;
-                        if (typeof(matrix[rowIndex]) == "undefined") {
-                            matrix[rowIndex] = [];
-                        }
-                        // Find first available column in the first row
-                        for (var k = 0; k < matrix[rowIndex].length + 1; k++) {
-                            if (typeof(matrix[rowIndex][k]) == "undefined") {
-                                firstAvailCol = k;
-                                break;
-                            }
-                        }
-                        lookup[cellId] = firstAvailCol;
-                        for (var k = rowIndex; k < rowIndex + rowSpan; k++) {
-                            if (typeof(matrix[k]) == "undefined") {
-                                matrix[k] = [];
-                            }
-                            var matrixrow = matrix[k];
-                            for (var l = firstAvailCol; l < firstAvailCol + colSpan; l++) {
-                                matrixrow[l] = "x";
-                            }
-                        }
-                    }
-                }
-                return lookup;
-            }
-
-            function checkCellColSpan(table, rows, row) {
-                var arr = [],
-                    r = table.tHead.rows,
-                    c = r[row].cells;
-
-                for (var i = 0; i < c.length; i++) {
-                    var cell = c[i];
-
-                    if (cell.colSpan > 1) {
-                        arr = arr.concat(checkCellColSpan(table, headerArr, row++));
-                    } else {
-                        if (table.tHead.length == 1 || (cell.rowSpan > 1 || !r[row + 1])) {
-                            arr.push(cell);
-                        }
-                        // headerArr[row] = (i+row);
-                    }
-                }
-                return arr;
-            };
-
-            function checkHeaderMetadata(cell) {
-                if (($.metadata) && ($(cell).metadata().sorter === false)) {
-                    return true;
-                };
-                return false;
-            }
-
-            function checkHeaderOptions(table, i) {
-                if ((table.config.headers[i]) && (table.config.headers[i].sorter === false)) {
-                    return true;
-                };
-                return false;
-            }
-			
-			 function checkHeaderOptionsSortingLocked(table, i) {
-                if ((table.config.headers[i]) && (table.config.headers[i].lockedOrder)) return table.config.headers[i].lockedOrder;
-                return false;
-            }
-			
-            function applyWidget(table) {
-                var c = table.config.widgets;
-                var l = c.length;
-                for (var i = 0; i < l; i++) {
-
-                    getWidgetById(c[i]).format(table);
-                }
-
-            }
-
-            function getWidgetById(name) {
-                var l = widgets.length;
-                for (var i = 0; i < l; i++) {
-                    if (widgets[i].id.toLowerCase() == name.toLowerCase()) {
-                        return widgets[i];
-                    }
-                }
-            };
-
-            function formatSortingOrder(v) {
-                if (typeof(v) != "Number") {
-                    return (v.toLowerCase() == "desc") ? 1 : 0;
-                } else {
-                    return (v == 1) ? 1 : 0;
-                }
-            }
-
-            function isValueInArray(v, a) {
-                var l = a.length;
-                for (var i = 0; i < l; i++) {
-                    if (a[i][0] == v) {
-                        return true;
-                    }
-                }
-                return false;
-            }
-
-            function setHeadersCss(table, $headers, list, css) {
-                // remove all header information
-                $headers.removeClass(css[0]).removeClass(css[1]);
-
-                var h = [];
-                $headers.each(function (offset) {
-                    if (!this.sortDisabled) {
-                        h[this.column] = $(this);
-                    }
-                });
-
-                var l = list.length;
-                for (var i = 0; i < l; i++) {
-                    h[list[i][0]].addClass(css[list[i][1]]);
-                }
-            }
-
-            function fixColumnWidth(table, $headers) {
-                var c = table.config;
-                if (c.widthFixed) {
-                    var colgroup = $('<colgroup>');
-                    $("tr:first td", table.tBodies[0]).each(function () {
-                        colgroup.append($('<col>').css('width', $(this).width()));
-                    });
-                    $(table).prepend(colgroup);
-                };
-            }
-
-            function updateHeaderSortCount(table, sortList) {
-                var c = table.config,
-                    l = sortList.length;
-                for (var i = 0; i < l; i++) {
-                    var s = sortList[i],
-                        o = c.headerList[s[0]];
-                    o.count = s[1];
-                    o.count++;
-                }
-            }
-
-            /* sorting methods */
-
-            function multisort(table, sortList, cache) {
-
-                if (table.config.debug) {
-                    var sortTime = new Date();
-                }
-
-                var dynamicExp = "var sortWrapper = function(a,b) {",
-                    l = sortList.length;
-
-                // TODO: inline functions.
-                for (var i = 0; i < l; i++) {
-
-                    var c = sortList[i][0];
-                    var order = sortList[i][1];
-                    // var s = (getCachedSortType(table.config.parsers,c) == "text") ?
-                    // ((order == 0) ? "sortText" : "sortTextDesc") : ((order == 0) ?
-                    // "sortNumeric" : "sortNumericDesc");
-                    // var s = (table.config.parsers[c].type == "text") ? ((order == 0)
-                    // ? makeSortText(c) : makeSortTextDesc(c)) : ((order == 0) ?
-                    // makeSortNumeric(c) : makeSortNumericDesc(c));
-                    var s = (table.config.parsers[c].type == "text") ? ((order == 0) ? makeSortFunction("text", "asc", c) : makeSortFunction("text", "desc", c)) : ((order == 0) ? makeSortFunction("numeric", "asc", c) : makeSortFunction("numeric", "desc", c));
-                    var e = "e" + i;
-
-                    dynamicExp += "var " + e + " = " + s; // + "(a[" + c + "],b[" + c
-                    // + "]); ";
-                    dynamicExp += "if(" + e + ") { return " + e + "; } ";
-                    dynamicExp += "else { ";
-
-                }
-
-                // if value is the same keep orignal order
-                var orgOrderCol = cache.normalized[0].length - 1;
-                dynamicExp += "return a[" + orgOrderCol + "]-b[" + orgOrderCol + "];";
-
-                for (var i = 0; i < l; i++) {
-                    dynamicExp += "}; ";
-                }
-
-                dynamicExp += "return 0; ";
-                dynamicExp += "}; ";
-
-                if (table.config.debug) {
-                    benchmark("Evaling expression:" + dynamicExp, new Date());
-                }
-
-                eval(dynamicExp);
-
-                cache.normalized.sort(sortWrapper);
-
-                if (table.config.debug) {
-                    benchmark("Sorting on " + sortList.toString() + " and dir " + order + " time:", sortTime);
-                }
-
-                return cache;
-            };
-
-            function makeSortFunction(type, direction, index) {
-                var a = "a[" + index + "]",
-                    b = "b[" + index + "]";
-                if (type == 'text' && direction == 'asc') {
-                    return "(" + a + " == " + b + " ? 0 : (" + a + " === null ? Number.POSITIVE_INFINITY : (" + b + " === null ? Number.NEGATIVE_INFINITY : (" + a + " < " + b + ") ? -1 : 1 )));";
-                } else if (type == 'text' && direction == 'desc') {
-                    return "(" + a + " == " + b + " ? 0 : (" + a + " === null ? Number.POSITIVE_INFINITY : (" + b + " === null ? Number.NEGATIVE_INFINITY : (" + b + " < " + a + ") ? -1 : 1 )));";
-                } else if (type == 'numeric' && direction == 'asc') {
-                    return "(" + a + " === null && " + b + " === null) ? 0 :(" + a + " === null ? Number.POSITIVE_INFINITY : (" + b + " === null ? Number.NEGATIVE_INFINITY : " + a + " - " + b + "));";
-                } else if (type == 'numeric' && direction == 'desc') {
-                    return "(" + a + " === null && " + b + " === null) ? 0 :(" + a + " === null ? Number.POSITIVE_INFINITY : (" + b + " === null ? Number.NEGATIVE_INFINITY : " + b + " - " + a + "));";
-                }
-            };
-
-            function makeSortText(i) {
-                return "((a[" + i + "] < b[" + i + "]) ? -1 : ((a[" + i + "] > b[" + i + "]) ? 1 : 0));";
-            };
-
-            function makeSortTextDesc(i) {
-                return "((b[" + i + "] < a[" + i + "]) ? -1 : ((b[" + i + "] > a[" + i + "]) ? 1 : 0));";
-            };
-
-            function makeSortNumeric(i) {
-                return "a[" + i + "]-b[" + i + "];";
-            };
-
-            function makeSortNumericDesc(i) {
-                return "b[" + i + "]-a[" + i + "];";
-            };
-
-            function sortText(a, b) {
-                if (table.config.sortLocaleCompare) return a.localeCompare(b);
-                return ((a < b) ? -1 : ((a > b) ? 1 : 0));
-            };
-
-            function sortTextDesc(a, b) {
-                if (table.config.sortLocaleCompare) return b.localeCompare(a);
-                return ((b < a) ? -1 : ((b > a) ? 1 : 0));
-            };
-
-            function sortNumeric(a, b) {
-                return a - b;
-            };
-
-            function sortNumericDesc(a, b) {
-                return b - a;
-            };
-
-            function getCachedSortType(parsers, i) {
-                return parsers[i].type;
-            }; /* public methods */
-            this.construct = function (settings) {
-                return this.each(function () {
-                    // if no thead or tbody quit.
-                    if (!this.tHead || !this.tBodies) return;
-                    // declare
-                    var $this, $document, $headers, cache, config, shiftDown = 0,
-                        sortOrder;
-                    // new blank config object
-                    this.config = {};
-                    // merge and extend.
-                    config = $.extend(this.config, $.tablesorter.defaults, settings);
-                    // store common expression for speed
-                    $this = $(this);
-                    // save the settings where they read
-                    $.data(this, "tablesorter", config);
-                    // build headers
-                    $headers = buildHeaders(this);
-                    // try to auto detect column type, and store in tables config
-                    this.config.parsers = buildParserCache(this, $headers);
-                    // build the cache for the tbody cells
-                    cache = buildCache(this);
-                    // get the css class names, could be done else where.
-                    var sortCSS = [config.cssDesc, config.cssAsc];
-                    // fixate columns if the users supplies the fixedWidth option
-                    fixColumnWidth(this);
-                    // apply event handling to headers
-                    // this is to big, perhaps break it out?
-                    $headers.click(
-
-                    function (e) {
-                        var totalRows = ($this[0].tBodies[0] && $this[0].tBodies[0].rows.length) || 0;
-                        if (!this.sortDisabled && totalRows > 0) {
-                            // Only call sortStart if sorting is
-                            // enabled.
-                            $this.trigger("sortStart");
-                            // store exp, for speed
-                            var $cell = $(this);
-                            // get current column index
-                            var i = this.column;
-                            // get current column sort order
-                            this.order = this.count++ % 2;
-							// always sort on the locked order.
-							if(this.lockedOrder) this.order = this.lockedOrder;
-							
-							// user only whants to sort on one
-                            // column
-                            if (!e[config.sortMultiSortKey]) {
-                                // flush the sort list
-                                config.sortList = [];
-                                if (config.sortForce != null) {
-                                    var a = config.sortForce;
-                                    for (var j = 0; j < a.length; j++) {
-                                        if (a[j][0] != i) {
-                                            config.sortList.push(a[j]);
-                                        }
-                                    }
-                                }
-                                // add column to sort list
-                                config.sortList.push([i, this.order]);
-                                // multi column sorting
-                            } else {
-                                // the user has clicked on an all
-                                // ready sortet column.
-                                if (isValueInArray(i, config.sortList)) {
-                                    // revers the sorting direction
-                                    // for all tables.
-                                    for (var j = 0; j < config.sortList.length; j++) {
-                                        var s = config.sortList[j],
-                                            o = config.headerList[s[0]];
-                                        if (s[0] == i) {
-                                            o.count = s[1];
-                                            o.count++;
-                                            s[1] = o.count % 2;
-                                        }
-                                    }
-                                } else {
-                                    // add column to sort list array
-                                    config.sortList.push([i, this.order]);
-                                }
-                            };
-                            setTimeout(function () {
-                                // set css for headers
-                                setHeadersCss($this[0], $headers, config.sortList, sortCSS);
-                                appendToTable(
-	                                $this[0], multisort(
-	                                $this[0], config.sortList, cache)
-								);
-                            }, 1);
-                            // stop normal event by returning false
-                            return false;
-                        }
-                        // cancel selection
-                    }).mousedown(function () {
-                        if (config.cancelSelection) {
-                            this.onselectstart = function () {
-                                return false
-                            };
-                            return false;
-                        }
-                    });
-                    // apply easy methods that trigger binded events
-                    $this.bind("update", function () {
-                        var me = this;
-                        setTimeout(function () {
-                            // rebuild parsers.
-                            me.config.parsers = buildParserCache(
-                            me, $headers);
-                            // rebuild the cache map
-                            cache = buildCache(me);
-                        }, 1);
-                    }).bind("updateCell", function (e, cell) {
-                        var config = this.config;
-                        // get position from the dom.
-                        var pos = [(cell.parentNode.rowIndex - 1), cell.cellIndex];
-                        // update cache
-                        cache.normalized[pos[0]][pos[1]] = config.parsers[pos[1]].format(
-                        getElementText(config, cell), cell);
-                    }).bind("sorton", function (e, list) {
-                        $(this).trigger("sortStart");
-                        config.sortList = list;
-                        // update and store the sortlist
-                        var sortList = config.sortList;
-                        // update header count index
-                        updateHeaderSortCount(this, sortList);
-                        // set css for headers
-                        setHeadersCss(this, $headers, sortList, sortCSS);
-                        // sort the table and append it to the dom
-                        appendToTable(this, multisort(this, sortList, cache));
-                    }).bind("appendCache", function () {
-                        appendToTable(this, cache);
-                    }).bind("applyWidgetId", function (e, id) {
-                        getWidgetById(id).format(this);
-                    }).bind("applyWidgets", function () {
-                        // apply widgets
-                        applyWidget(this);
-                    });
-                    if ($.metadata && ($(this).metadata() && $(this).metadata().sortlist)) {
-                        config.sortList = $(this).metadata().sortlist;
-                    }
-                    // if user has supplied a sort list to constructor.
-                    if (config.sortList.length > 0) {
-                        $this.trigger("sorton", [config.sortList]);
-                    } else {
-                        // appendToTable used in sorton event already calls applyWidget
-                        // apply widgets
-                        applyWidget(this);
-                    }
-                });
-            };
-            this.addParser = function (parser) {
-                var l = parsers.length,
-                    a = true;
-                for (var i = 0; i < l; i++) {
-                    if (parsers[i].id.toLowerCase() == parser.id.toLowerCase()) {
-                        a = false;
-                    }
-                }
-                if (a) {
-                    parsers.push(parser);
-                };
-            };
-            this.addWidget = function (widget) {
-                widgets.push(widget);
-            };
-            this.formatFloat = function (s) {
-                var i = parseFloat(s);
-                return (isNaN(i)) ? 0 : i;
-            };
-            this.formatInt = function (s) {
-                var i = parseInt(s);
-                return (isNaN(i)) ? 0 : i;
-            };
-            this.isDigit = function (s, config) {
-                // replace all an wanted chars and match.
-                return /^[-+]?\d*$/.test($.trim(s.replace(/[,.']/g, '')));
-            };
-            this.clearTableBody = function (table) {
-                if (window.navigator.userAgent.indexOf("MSIE ") > -1 || !!window.navigator.userAgent.match(/Trident.*rv\:11\./)) {
-                    function empty() {
-                        while (this.firstChild)
-                        this.removeChild(this.firstChild);
-                    }
-                    empty.apply(table.tBodies[0]);
-                } else {
-                    table.tBodies[0].innerHTML = "";
-                }
-            };
-        }
-    });
-
-    // extend plugin scope
-    $.fn.extend({
-        tablesorter: $.tablesorter.construct
-    });
-
-    // make shortcut
-    var ts = $.tablesorter;
-
-    // add default parsers
-    ts.addParser({
-        id: "text",
-        is: function (s) {
-            return true;
-        }, format: function (s) {
-            return $.trim(s.toLocaleLowerCase());
-        }, type: "text"
-    });
-
-    ts.addParser({
-        id: "digit",
-        is: function (s, table) {
-            var c = table.config;
-            return $.tablesorter.isDigit(s, c);
-        }, format: function (s) {
-            return $.tablesorter.formatFloat(s);
-        }, type: "numeric"
-    });
-
-    ts.addParser({
-        id: "currency",
-        is: function (s) {
-            return /^[£$€?.]/.test(s);
-        }, format: function (s) {
-            return $.tablesorter.formatFloat(s.replace(new RegExp(/[£$€]/g), ""));
-        }, type: "numeric"
-    });
-
-    ts.addParser({
-        id: "ipAddress",
-        is: function (s) {
-            return /^\d{2,3}[\.]\d{2,3}[\.]\d{2,3}[\.]\d{2,3}$/.test(s);
-        }, format: function (s) {
-            var a = s.split("."),
-                r = "",
-                l = a.length;
-            for (var i = 0; i < l; i++) {
-                var item = a[i];
-                if (item.length == 2) {
-                    r += "0" + item;
-                } else {
-                    r += item;
-                }
-            }
-            return $.tablesorter.formatFloat(r);
-        }, type: "numeric"
-    });
-
-    ts.addParser({
-        id: "url",
-        is: function (s) {
-            return /^(https?|ftp|file):\/\/$/.test(s);
-        }, format: function (s) {
-            return jQuery.trim(s.replace(new RegExp(/(https?|ftp|file):\/\//), ''));
-        }, type: "text"
-    });
-
-    ts.addParser({
-        id: "isoDate",
-        is: function (s) {
-            return /^\d{4}[\/-]\d{1,2}[\/-]\d{1,2}$/.test(s);
-        }, format: function (s) {
-            return $.tablesorter.formatFloat((s != "") ? new Date(s.replace(
-            new RegExp(/-/g), "/")).getTime() : "0");
-        }, type: "numeric"
-    });
-
-    ts.addParser({
-        id: "percent",
-        is: function (s) {
-            return /\%$/.test($.trim(s));
-        }, format: function (s) {
-            return $.tablesorter.formatFloat(s.replace(new RegExp(/%/g), ""));
-        }, type: "numeric"
-    });
-
-    ts.addParser({
-        id: "usLongDate",
-        is: function (s) {
-            return s.match(new RegExp(/^[A-Za-z]{3,10}\.? [0-9]{1,2}, ([0-9]{4}|'?[0-9]{2}) (([0-2]?[0-9]:[0-5][0-9])|([0-1]?[0-9]:[0-5][0-9]\s(AM|PM)))$/));
-        }, format: function (s) {
-            return $.tablesorter.formatFloat(new Date(s).getTime());
-        }, type: "numeric"
-    });
-
-    ts.addParser({
-        id: "shortDate",
-        is: function (s) {
-            return /\d{1,2}[\/\-]\d{1,2}[\/\-]\d{2,4}/.test(s);
-        }, format: function (s, table) {
-            var c = table.config;
-            s = s.replace(/\-/g, "/");
-            if (c.dateFormat == "us") {
-                // reformat the string in ISO format
-                s = s.replace(/(\d{1,2})[\/\-](\d{1,2})[\/\-](\d{4})/, "$3/$1/$2");
-            } else if (c.dateFormat == "uk") {
-                // reformat the string in ISO format
-                s = s.replace(/(\d{1,2})[\/\-](\d{1,2})[\/\-](\d{4})/, "$3/$2/$1");
-            } else if (c.dateFormat == "dd/mm/yy" || c.dateFormat == "dd-mm-yy") {
-                s = s.replace(/(\d{1,2})[\/\-](\d{1,2})[\/\-](\d{2})/, "$1/$2/$3");
-            }
-            return $.tablesorter.formatFloat(new Date(s).getTime());
-        }, type: "numeric"
-    });
-    ts.addParser({
-        id: "time",
-        is: function (s) {
-            return /^(([0-2]?[0-9]:[0-5][0-9])|([0-1]?[0-9]:[0-5][0-9]\s(am|pm)))$/.test(s);
-        }, format: function (s) {
-            return $.tablesorter.formatFloat(new Date("2000/01/01 " + s).getTime());
-        }, type: "numeric"
-    });
-    ts.addParser({
-        id: "metadata",
-        is: function (s) {
-            return false;
-        }, format: function (s, table, cell) {
-            var c = table.config,
-                p = (!c.parserMetadataName) ? 'sortValue' : c.parserMetadataName;
-            return $(cell).metadata()[p];
-        }, type: "numeric"
-    });
-    // add default widgets
-    ts.addWidget({
-        id: "zebra",
-        format: function (table) {
-            if (table.config.debug) {
-                var time = new Date();
-            }
-            var $tr, row = -1,
-                odd;
-            // loop through the visible rows
-            $("tr:visible", table.tBodies[0]).each(function (i) {
-                $tr = $(this);
-                // style children rows the same way the parent
-                // row was styled
-                if (!$tr.hasClass(table.config.cssChildRow)) row++;
-                odd = (row % 2 == 0);
-                $tr.removeClass(
-                table.config.widgetZebra.css[odd ? 0 : 1]).addClass(
-                table.config.widgetZebra.css[odd ? 1 : 0])
-            });
-            if (table.config.debug) {
-                $.tablesorter.benchmark("Applying Zebra widget", time);
-            }
-        }
-    });
-})(jQuery);
\ No newline at end of file
diff --git a/#pma/js/jquery/jquery.uitablefilter.js b/#pma/js/jquery/jquery.uitablefilter.js
deleted file mode 100644
index 700c0f2e..00000000
--- a/#pma/js/jquery/jquery.uitablefilter.js
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright (c) 2008 Greg Weber greg at gregweber.info
- * Dual licensed under the MIT and GPLv2 licenses just as jQuery is:
- * http://jquery.org/license
- *
- * Multi-columns fork by natinusala
- *
- * documentation at http://gregweber.info/projects/uitablefilter
- *                  https://github.com/natinusala/jquery-uitablefilter
- *
- * allows table rows to be filtered (made invisible)
- * <code>
- * t = $('table')
- * $.uiTableFilter( t, phrase )
- * </code>
- * arguments:
- *   jQuery object containing table rows
- *   phrase to search for
- *   optional arguments:
- *     array of columns to limit search too (the column title in the table header)
- *     ifHidden - callback to execute if one or more elements was hidden
- *     tdElem - specific element within <td> to be considered for searching or to limit search to,
- *     default:whole <td>. useful if <td> has more than one elements inside but want to
- *     limit search within only some of elements or only visible elements. eg tdElem can be "td span"
- */
-(function($) {
-  $.uiTableFilter = function(jq, phrase, column, ifHidden, tdElem){
-    if(!tdElem) tdElem = "td";
-    var new_hidden = false;
-    if( this.last_phrase === phrase ) return false;
-
-    var phrase_length = phrase.length;
-    var words = phrase.toLowerCase().split(" ");
-
-    // these function pointers may change
-    var matches = function(elem) { elem.show() }
-    var noMatch = function(elem) { elem.hide(); new_hidden = true }
-    var getText = function(elem) { return elem.text() }
-
-    if( column )
-    {
-      if (!$.isArray(column))
-      {
-        column = new Array(column);
-      }
-
-      var index = new Array();
-
-      jq.find("thead > tr:last > th").each(function(i)
-      {
-          for (var j = 0; j < column.length; j++)
-          {
-              if ($.trim($(this).text()) == column[j])
-              {
-                  index[j] = i;
-                  break;
-              }
-          }
-
-      });
-
-      getText = function(elem) {
-          var selector = "";
-          for (var i = 0; i < index.length; i++)
-          {
-              if (i != 0) {selector += ",";}
-              selector += tdElem + ":eq(" + index[i] + ")";
-          }
-          return $(elem.find((selector))).text();
-      }
-    }
-
-    // if added one letter to last time,
-    // just check newest word and only need to hide
-    if( (words.size > 1) && (phrase.substr(0, phrase_length - 1) ===
-          this.last_phrase) ) {
-
-      if( phrase[-1] === " " )
-      { this.last_phrase = phrase; return false; }
-
-      var words = words[-1]; // just search for the newest word
-
-      // only hide visible rows
-      matches = function(elem) {;}
-      var elems = jq.find("tbody:first > tr:visible")
-    }
-    else {
-      new_hidden = true;
-      var elems = jq.find("tbody:first > tr")
-    }
-
-    elems.each(function(){
-      var elem = $(this);
-      $.uiTableFilter.has_words( getText(elem), words, false ) ?
-        matches(elem) : noMatch(elem);
-    });
-
-    last_phrase = phrase;
-    if( ifHidden && new_hidden ) ifHidden();
-    return jq;
-  };
-
-  // caching for speedup
-  $.uiTableFilter.last_phrase = ""
-
-  // not jQuery dependent
-  // "" [""] -> Boolean
-  // "" [""] Boolean -> Boolean
-  $.uiTableFilter.has_words = function( str, words, caseSensitive )
-  {
-    var text = caseSensitive ? str : str.toLowerCase();
-    for (var i=0; i < words.length; i++) {
-      if (text.indexOf(words[i]) === -1) return false;
-    }
-    return true;
-  }
-}) (jQuery);
diff --git a/#pma/js/jquery/jquery.validate.js b/#pma/js/jquery/jquery.validate.js
deleted file mode 100644
index 2f18b6c2..00000000
--- a/#pma/js/jquery/jquery.validate.js
+++ /dev/null
@@ -1,1365 +0,0 @@
-/*!
- * jQuery Validation Plugin v1.13.1
- *
- * http://jqueryvalidation.org/
- *
- * Copyright (c) 2014 Jörn Zaefferer
- * Released under the MIT license
- */
-(function( factory ) {
-    if ( typeof define === "function" && define.amd ) {
-        define( ["jquery"], factory );
-    } else {
-        factory( jQuery );
-    }
-}(function( $ ) {
-
-$.extend($.fn, {
-    // http://jqueryvalidation.org/validate/
-    validate: function( options ) {
-
-        // if nothing is selected, return nothing; can't chain anyway
-        if ( !this.length ) {
-            if ( options && options.debug && window.console ) {
-                console.warn( "Nothing selected, can't validate, returning nothing." );
-            }
-            return;
-        }
-
-        // check if a validator for this form was already created
-        var validator = $.data( this[ 0 ], "validator" );
-        if ( validator ) {
-            return validator;
-        }
-
-        // Add novalidate tag if HTML5.
-        this.attr( "novalidate", "novalidate" );
-
-        validator = new $.validator( options, this[ 0 ] );
-        $.data( this[ 0 ], "validator", validator );
-
-        if ( validator.settings.onsubmit ) {
-
-            this.validateDelegate( ":submit", "click", function( event ) {
-                if ( validator.settings.submitHandler ) {
-                    validator.submitButton = event.target;
-                }
-                // allow suppressing validation by adding a cancel class to the submit button
-                if ( $( event.target ).hasClass( "cancel" ) ) {
-                    validator.cancelSubmit = true;
-                }
-
-                // allow suppressing validation by adding the html5 formnovalidate attribute to the submit button
-                if ( $( event.target ).attr( "formnovalidate" ) !== undefined ) {
-                    validator.cancelSubmit = true;
-                }
-            });
-
-            // validate the form on submit
-            this.submit( function( event ) {
-                if ( validator.settings.debug ) {
-                    // prevent form submit to be able to see console output
-                    event.preventDefault();
-                }
-                function handle() {
-                    var hidden, result;
-                    if ( validator.settings.submitHandler ) {
-                        if ( validator.submitButton ) {
-                            // insert a hidden input as a replacement for the missing submit button
-                            hidden = $( "<input type='hidden'/>" )
-                                .attr( "name", validator.submitButton.name )
-                                .val( $( validator.submitButton ).val() )
-                                .appendTo( validator.currentForm );
-                        }
-                        result = validator.settings.submitHandler.call( validator, validator.currentForm, event );
-                        if ( validator.submitButton ) {
-                            // and clean up afterwards; thanks to no-block-scope, hidden can be referenced
-                            hidden.remove();
-                        }
-                        if ( result !== undefined ) {
-                            return result;
-                        }
-                        return false;
-                    }
-                    return true;
-                }
-
-                // prevent submit for invalid forms or custom submit handlers
-                if ( validator.cancelSubmit ) {
-                    validator.cancelSubmit = false;
-                    return handle();
-                }
-                if ( validator.form() ) {
-                    if ( validator.pendingRequest ) {
-                        validator.formSubmitted = true;
-                        return false;
-                    }
-                    return handle();
-                } else {
-                    validator.focusInvalid();
-                    return false;
-                }
-            });
-        }
-
-        return validator;
-    },
-    // http://jqueryvalidation.org/valid/
-    valid: function() {
-        var valid, validator;
-
-        if ( $( this[ 0 ] ).is( "form" ) ) {
-            valid = this.validate().form();
-        } else {
-            valid = true;
-            validator = $( this[ 0 ].form ).validate();
-            this.each( function() {
-                valid = validator.element( this ) && valid;
-            });
-        }
-        return valid;
-    },
-    // attributes: space separated list of attributes to retrieve and remove
-    removeAttrs: function( attributes ) {
-        var result = {},
-            $element = this;
-        $.each( attributes.split( /\s/ ), function( index, value ) {
-            result[ value ] = $element.attr( value );
-            $element.removeAttr( value );
-        });
-        return result;
-    },
-    // http://jqueryvalidation.org/rules/
-    rules: function( command, argument ) {
-        var element = this[ 0 ],
-            settings, staticRules, existingRules, data, param, filtered;
-
-        if ( command ) {
-            settings = $.data( element.form, "validator" ).settings;
-            staticRules = settings.rules;
-            existingRules = $.validator.staticRules( element );
-            switch ( command ) {
-            case "add":
-                $.extend( existingRules, $.validator.normalizeRule( argument ) );
-                // remove messages from rules, but allow them to be set separately
-                delete existingRules.messages;
-                staticRules[ element.name ] = existingRules;
-                if ( argument.messages ) {
-                    settings.messages[ element.name ] = $.extend( settings.messages[ element.name ], argument.messages );
-                }
-                break;
-            case "remove":
-                if ( !argument ) {
-                    delete staticRules[ element.name ];
-                    return existingRules;
-                }
-                filtered = {};
-                $.each( argument.split( /\s/ ), function( index, method ) {
-                    filtered[ method ] = existingRules[ method ];
-                    delete existingRules[ method ];
-                    if ( method === "required" ) {
-                        $( element ).removeAttr( "aria-required" );
-                    }
-                });
-                return filtered;
-            }
-        }
-
-        data = $.validator.normalizeRules(
-        $.extend(
-            {},
-            $.validator.classRules( element ),
-            $.validator.attributeRules( element ),
-            $.validator.dataRules( element ),
-            $.validator.staticRules( element )
-        ), element );
-
-        // make sure required is at front
-        if ( data.required ) {
-            param = data.required;
-            delete data.required;
-            data = $.extend( { required: param }, data );
-            $( element ).attr( "aria-required", "true" );
-        }
-
-        // make sure remote is at back
-        if ( data.remote ) {
-            param = data.remote;
-            delete data.remote;
-            data = $.extend( data, { remote: param });
-        }
-
-        return data;
-    }
-});
-
-// Custom selectors
-$.extend( $.expr[ ":" ], {
-    // http://jqueryvalidation.org/blank-selector/
-    blank: function( a ) {
-        return !$.trim( "" + $( a ).val() );
-    },
-    // http://jqueryvalidation.org/filled-selector/
-    filled: function( a ) {
-        return !!$.trim( "" + $( a ).val() );
-    },
-    // http://jqueryvalidation.org/unchecked-selector/
-    unchecked: function( a ) {
-        return !$( a ).prop( "checked" );
-    }
-});
-
-// constructor for validator
-$.validator = function( options, form ) {
-    this.settings = $.extend( true, {}, $.validator.defaults, options );
-    this.currentForm = form;
-    this.init();
-};
-
-// http://jqueryvalidation.org/jQuery.validator.format/
-$.validator.format = function( source, params ) {
-    if ( arguments.length === 1 ) {
-        return function() {
-            var args = $.makeArray( arguments );
-            args.unshift( source );
-            return $.validator.format.apply( this, args );
-        };
-    }
-    if ( arguments.length > 2 && params.constructor !== Array  ) {
-        params = $.makeArray( arguments ).slice( 1 );
-    }
-    if ( params.constructor !== Array ) {
-        params = [ params ];
-    }
-    $.each( params, function( i, n ) {
-        source = source.replace( new RegExp( "\\{" + i + "\\}", "g" ), function() {
-            return n;
-        });
-    });
-    return source;
-};
-
-$.extend( $.validator, {
-
-    defaults: {
-        messages: {},
-        groups: {},
-        rules: {},
-        errorClass: "error",
-        validClass: "valid",
-        errorElement: "label",
-        focusCleanup: false,
-        focusInvalid: true,
-        errorContainer: $( [] ),
-        errorLabelContainer: $( [] ),
-        onsubmit: true,
-        ignore: ":hidden",
-        ignoreTitle: false,
-        onfocusin: function( element ) {
-            this.lastActive = element;
-
-            // Hide error label and remove error class on focus if enabled
-            if ( this.settings.focusCleanup ) {
-                if ( this.settings.unhighlight ) {
-                    this.settings.unhighlight.call( this, element, this.settings.errorClass, this.settings.validClass );
-                }
-                this.hideThese( this.errorsFor( element ) );
-            }
-        },
-        onfocusout: function( element ) {
-            if ( !this.checkable( element ) && ( element.name in this.submitted || !this.optional( element ) ) ) {
-                this.element( element );
-            }
-        },
-        onkeyup: function( element, event ) {
-            if ( event.which === 9 && this.elementValue( element ) === "" ) {
-                return;
-            } else if ( element.name in this.submitted || element === this.lastElement ) {
-                this.element( element );
-            }
-        },
-        onclick: function( element ) {
-            // click on selects, radiobuttons and checkboxes
-            if ( element.name in this.submitted ) {
-                this.element( element );
-
-            // or option elements, check parent select in that case
-            } else if ( element.parentNode.name in this.submitted ) {
-                this.element( element.parentNode );
-            }
-        },
-        highlight: function( element, errorClass, validClass ) {
-            if ( element.type === "radio" ) {
-                this.findByName( element.name ).addClass( errorClass ).removeClass( validClass );
-            } else {
-                $( element ).addClass( errorClass ).removeClass( validClass );
-            }
-        },
-        unhighlight: function( element, errorClass, validClass ) {
-            if ( element.type === "radio" ) {
-                this.findByName( element.name ).removeClass( errorClass ).addClass( validClass );
-            } else {
-                $( element ).removeClass( errorClass ).addClass( validClass );
-            }
-        }
-    },
-
-    // http://jqueryvalidation.org/jQuery.validator.setDefaults/
-    setDefaults: function( settings ) {
-        $.extend( $.validator.defaults, settings );
-    },
-
-    messages: {
-        required: "This field is required.",
-        remote: "Please fix this field.",
-        email: "Please enter a valid email address.",
-        url: "Please enter a valid URL.",
-        date: "Please enter a valid date.",
-        dateISO: "Please enter a valid date ( ISO ).",
-        number: "Please enter a valid number.",
-        digits: "Please enter only digits.",
-        creditcard: "Please enter a valid credit card number.",
-        equalTo: "Please enter the same value again.",
-        maxlength: $.validator.format( "Please enter no more than {0} characters." ),
-        minlength: $.validator.format( "Please enter at least {0} characters." ),
-        rangelength: $.validator.format( "Please enter a value between {0} and {1} characters long." ),
-        range: $.validator.format( "Please enter a value between {0} and {1}." ),
-        max: $.validator.format( "Please enter a value less than or equal to {0}." ),
-        min: $.validator.format( "Please enter a value greater than or equal to {0}." )
-    },
-
-    autoCreateRanges: false,
-
-    prototype: {
-
-        init: function() {
-            this.labelContainer = $( this.settings.errorLabelContainer );
-            this.errorContext = this.labelContainer.length && this.labelContainer || $( this.currentForm );
-            this.containers = $( this.settings.errorContainer ).add( this.settings.errorLabelContainer );
-            this.submitted = {};
-            this.valueCache = {};
-            this.pendingRequest = 0;
-            this.pending = {};
-            this.invalid = {};
-            this.reset();
-
-            var groups = ( this.groups = {} ),
-                rules;
-            $.each( this.settings.groups, function( key, value ) {
-                if ( typeof value === "string" ) {
-                    value = value.split( /\s/ );
-                }
-                $.each( value, function( index, name ) {
-                    groups[ name ] = key;
-                });
-            });
-            rules = this.settings.rules;
-            $.each( rules, function( key, value ) {
-                rules[ key ] = $.validator.normalizeRule( value );
-            });
-
-            function delegate( event ) {
-                var validator = $.data( this[ 0 ].form, "validator" ),
-                    eventType = "on" + event.type.replace( /^validate/, "" ),
-                    settings = validator.settings;
-                if ( settings[ eventType ] && !this.is( settings.ignore ) ) {
-                    settings[ eventType ].call( validator, this[ 0 ], event );
-                }
-            }
-            $( this.currentForm )
-                .validateDelegate( ":text, [type='password'], [type='file'], select, textarea, " +
-                    "[type='number'], [type='search'] ,[type='tel'], [type='url'], " +
-                    "[type='email'], [type='datetime'], [type='date'], [type='month'], " +
-                    "[type='week'], [type='time'], [type='datetime-local'], " +
-                    "[type='range'], [type='color'], [type='radio'], [type='checkbox']",
-                    "focusin focusout keyup", delegate)
-                // Support: Chrome, oldIE
-                // "select" is provided as event.target when clicking a option
-                .validateDelegate("select, option, [type='radio'], [type='checkbox']", "click", delegate);
-
-            if ( this.settings.invalidHandler ) {
-                $( this.currentForm ).bind( "invalid-form.validate", this.settings.invalidHandler );
-            }
-
-            // Add aria-required to any Static/Data/Class required fields before first validation
-            // Screen readers require this attribute to be present before the initial submission http://www.w3.org/TR/WCAG-TECHS/ARIA2.html
-            $( this.currentForm ).find( "[required], [data-rule-required], .required" ).attr( "aria-required", "true" );
-        },
-
-        // http://jqueryvalidation.org/Validator.form/
-        form: function() {
-            this.checkForm();
-            $.extend( this.submitted, this.errorMap );
-            this.invalid = $.extend({}, this.errorMap );
-            if ( !this.valid() ) {
-                $( this.currentForm ).triggerHandler( "invalid-form", [ this ]);
-            }
-            this.showErrors();
-            return this.valid();
-        },
-
-        checkForm: function() {
-            this.prepareForm();
-            for ( var i = 0, elements = ( this.currentElements = this.elements() ); elements[ i ]; i++ ) {
-                this.check( elements[ i ] );
-            }
-            return this.valid();
-        },
-
-        // http://jqueryvalidation.org/Validator.element/
-        element: function( element ) {
-            var cleanElement = this.clean( element ),
-                checkElement = this.validationTargetFor( cleanElement ),
-                result = true;
-
-            this.lastElement = checkElement;
-
-            if ( checkElement === undefined ) {
-                delete this.invalid[ cleanElement.name ];
-            } else {
-                this.prepareElement( checkElement );
-                this.currentElements = $( checkElement );
-
-                result = this.check( checkElement ) !== false;
-                if ( result ) {
-                    delete this.invalid[ checkElement.name ];
-                } else {
-                    this.invalid[ checkElement.name ] = true;
-                }
-            }
-            // Add aria-invalid status for screen readers
-            $( element ).attr( "aria-invalid", !result );
-
-            if ( !this.numberOfInvalids() ) {
-                // Hide error containers on last error
-                this.toHide = this.toHide.add( this.containers );
-            }
-            this.showErrors();
-            return result;
-        },
-
-        // http://jqueryvalidation.org/Validator.showErrors/
-        showErrors: function( errors ) {
-            if ( errors ) {
-                // add items to error list and map
-                $.extend( this.errorMap, errors );
-                this.errorList = [];
-                for ( var name in errors ) {
-                    this.errorList.push({
-                        message: errors[ name ],
-                        element: this.findByName( name )[ 0 ]
-                    });
-                }
-                // remove items from success list
-                this.successList = $.grep( this.successList, function( element ) {
-                    return !( element.name in errors );
-                });
-            }
-            if ( this.settings.showErrors ) {
-                this.settings.showErrors.call( this, this.errorMap, this.errorList );
-            } else {
-                this.defaultShowErrors();
-            }
-        },
-
-        // http://jqueryvalidation.org/Validator.resetForm/
-        resetForm: function() {
-            if ( $.fn.resetForm ) {
-                $( this.currentForm ).resetForm();
-            }
-            this.submitted = {};
-            this.lastElement = null;
-            this.prepareForm();
-            this.hideErrors();
-            this.elements()
-                    .removeClass( this.settings.errorClass )
-                    .removeData( "previousValue" )
-                    .removeAttr( "aria-invalid" );
-        },
-
-        numberOfInvalids: function() {
-            return this.objectLength( this.invalid );
-        },
-
-        objectLength: function( obj ) {
-            /* jshint unused: false */
-            var count = 0,
-                i;
-            for ( i in obj ) {
-                count++;
-            }
-            return count;
-        },
-
-        hideErrors: function() {
-            this.hideThese( this.toHide );
-        },
-
-        hideThese: function( errors ) {
-            errors.not( this.containers ).text( "" );
-            this.addWrapper( errors ).hide();
-        },
-
-        valid: function() {
-            return this.size() === 0;
-        },
-
-        size: function() {
-            return this.errorList.length;
-        },
-
-        focusInvalid: function() {
-            if ( this.settings.focusInvalid ) {
-                try {
-                    $( this.findLastActive() || this.errorList.length && this.errorList[ 0 ].element || [])
-                    .filter( ":visible" )
-                    .focus()
-                    // manually trigger focusin event; without it, focusin handler isn't called, findLastActive won't have anything to find
-                    .trigger( "focusin" );
-                } catch ( e ) {
-                    // ignore IE throwing errors when focusing hidden elements
-                }
-            }
-        },
-
-        findLastActive: function() {
-            var lastActive = this.lastActive;
-            return lastActive && $.grep( this.errorList, function( n ) {
-                return n.element.name === lastActive.name;
-            }).length === 1 && lastActive;
-        },
-
-        elements: function() {
-            var validator = this,
-                rulesCache = {};
-
-            // select all valid inputs inside the form (no submit or reset buttons)
-            return $( this.currentForm )
-            .find( "input, select, textarea" )
-            .not( ":submit, :reset, :image, [disabled], [readonly]" )
-            .not( this.settings.ignore )
-            .filter( function() {
-                if ( !this.name && validator.settings.debug && window.console ) {
-                    console.error( "%o has no name assigned", this );
-                }
-
-                // select only the first element for each name, and only those with rules specified
-                if ( this.name in rulesCache || !validator.objectLength( $( this ).rules() ) ) {
-                    return false;
-                }
-
-                rulesCache[ this.name ] = true;
-                return true;
-            });
-        },
-
-        clean: function( selector ) {
-            return $( selector )[ 0 ];
-        },
-
-        errors: function() {
-            var errorClass = this.settings.errorClass.split( " " ).join( "." );
-            return $( this.settings.errorElement + "." + errorClass, this.errorContext );
-        },
-
-        reset: function() {
-            this.successList = [];
-            this.errorList = [];
-            this.errorMap = {};
-            this.toShow = $( [] );
-            this.toHide = $( [] );
-            this.currentElements = $( [] );
-        },
-
-        prepareForm: function() {
-            this.reset();
-            this.toHide = this.errors().add( this.containers );
-        },
-
-        prepareElement: function( element ) {
-            this.reset();
-            this.toHide = this.errorsFor( element );
-        },
-
-        elementValue: function( element ) {
-            var val,
-                $element = $( element ),
-                type = element.type;
-
-            if ( type === "radio" || type === "checkbox" ) {
-                return $( "input[name='" + element.name + "']:checked" ).val();
-            } else if ( type === "number" && typeof element.validity !== "undefined" ) {
-                return element.validity.badInput ? false : $element.val();
-            }
-
-            val = $element.val();
-            if ( typeof val === "string" ) {
-                return val.replace(/\r/g, "" );
-            }
-            return val;
-        },
-
-        check: function( element ) {
-            element = this.validationTargetFor( this.clean( element ) );
-
-            var rules = $( element ).rules(),
-                rulesCount = $.map( rules, function( n, i ) {
-                    return i;
-                }).length,
-                dependencyMismatch = false,
-                val = this.elementValue( element ),
-                result, method, rule;
-
-            for ( method in rules ) {
-                rule = { method: method, parameters: rules[ method ] };
-                try {
-
-                    result = $.validator.methods[ method ].call( this, val, element, rule.parameters );
-
-                    // if a method indicates that the field is optional and therefore valid,
-                    // don't mark it as valid when there are no other rules
-                    if ( result === "dependency-mismatch" && rulesCount === 1 ) {
-                        dependencyMismatch = true;
-                        continue;
-                    }
-                    dependencyMismatch = false;
-
-                    if ( result === "pending" ) {
-                        this.toHide = this.toHide.not( this.errorsFor( element ) );
-                        return;
-                    }
-
-                    if ( !result ) {
-                        this.formatAndAdd( element, rule );
-                        return false;
-                    }
-                } catch ( e ) {
-                    if ( this.settings.debug && window.console ) {
-                        console.log( "Exception occurred when checking element " + element.id + ", check the '" + rule.method + "' method.", e );
-                    }
-                    throw e;
-                }
-            }
-            if ( dependencyMismatch ) {
-                return;
-            }
-            if ( this.objectLength( rules ) ) {
-                this.successList.push( element );
-            }
-            return true;
-        },
-
-        // return the custom message for the given element and validation method
-        // specified in the element's HTML5 data attribute
-        // return the generic message if present and no method specific message is present
-        customDataMessage: function( element, method ) {
-            return $( element ).data( "msg" + method.charAt( 0 ).toUpperCase() +
-                method.substring( 1 ).toLowerCase() ) || $( element ).data( "msg" );
-        },
-
-        // return the custom message for the given element name and validation method
-        customMessage: function( name, method ) {
-            var m = this.settings.messages[ name ];
-            return m && ( m.constructor === String ? m : m[ method ]);
-        },
-
-        // return the first defined argument, allowing empty strings
-        findDefined: function() {
-            for ( var i = 0; i < arguments.length; i++) {
-                if ( arguments[ i ] !== undefined ) {
-                    return arguments[ i ];
-                }
-            }
-            return undefined;
-        },
-
-        defaultMessage: function( element, method ) {
-            return this.findDefined(
-                this.customMessage( element.name, method ),
-                this.customDataMessage( element, method ),
-                // title is never undefined, so handle empty string as undefined
-                !this.settings.ignoreTitle && element.title || undefined,
-                $.validator.messages[ method ],
-                "<strong>Warning: No message defined for " + element.name + "</strong>"
-            );
-        },
-
-        formatAndAdd: function( element, rule ) {
-            var message = this.defaultMessage( element, rule.method ),
-                theregex = /\$?\{(\d+)\}/g;
-            if ( typeof message === "function" ) {
-                message = message.call( this, rule.parameters, element );
-            } else if ( theregex.test( message ) ) {
-                message = $.validator.format( message.replace( theregex, "{$1}" ), rule.parameters );
-            }
-            this.errorList.push({
-                message: message,
-                element: element,
-                method: rule.method
-            });
-
-            this.errorMap[ element.name ] = message;
-            this.submitted[ element.name ] = message;
-        },
-
-        addWrapper: function( toToggle ) {
-            if ( this.settings.wrapper ) {
-                toToggle = toToggle.add( toToggle.parent( this.settings.wrapper ) );
-            }
-            return toToggle;
-        },
-
-        defaultShowErrors: function() {
-            var i, elements, error;
-            for ( i = 0; this.errorList[ i ]; i++ ) {
-                error = this.errorList[ i ];
-                if ( this.settings.highlight ) {
-                    this.settings.highlight.call( this, error.element, this.settings.errorClass, this.settings.validClass );
-                }
-                this.showLabel( error.element, error.message );
-            }
-            if ( this.errorList.length ) {
-                this.toShow = this.toShow.add( this.containers );
-            }
-            if ( this.settings.success ) {
-                for ( i = 0; this.successList[ i ]; i++ ) {
-                    this.showLabel( this.successList[ i ] );
-                }
-            }
-            if ( this.settings.unhighlight ) {
-                for ( i = 0, elements = this.validElements(); elements[ i ]; i++ ) {
-                    this.settings.unhighlight.call( this, elements[ i ], this.settings.errorClass, this.settings.validClass );
-                }
-            }
-            this.toHide = this.toHide.not( this.toShow );
-            this.hideErrors();
-            this.addWrapper( this.toShow ).show();
-        },
-
-        validElements: function() {
-            return this.currentElements.not( this.invalidElements() );
-        },
-
-        invalidElements: function() {
-            return $( this.errorList ).map(function() {
-                return this.element;
-            });
-        },
-
-        showLabel: function( element, message ) {
-            var place, group, errorID,
-                error = this.errorsFor( element ),
-                elementID = this.idOrName( element ),
-                describedBy = $( element ).attr( "aria-describedby" );
-            if ( error.length ) {
-                // refresh error/success class
-                error.removeClass( this.settings.validClass ).addClass( this.settings.errorClass );
-                // replace message on existing label
-                error.html( message );
-            } else {
-                // create error element
-                error = $( "<" + this.settings.errorElement + ">" )
-                    .attr( "id", elementID + "-error" )
-                    .addClass( this.settings.errorClass )
-                    .html( message || "" );
-
-                // Maintain reference to the element to be placed into the DOM
-                place = error;
-                if ( this.settings.wrapper ) {
-                    // make sure the element is visible, even in IE
-                    // actually showing the wrapped element is handled elsewhere
-                    place = error.hide().show().wrap( "<" + this.settings.wrapper + "/>" ).parent();
-                }
-                if ( this.labelContainer.length ) {
-                    this.labelContainer.append( place );
-                } else if ( this.settings.errorPlacement ) {
-                    this.settings.errorPlacement( place, $( element ) );
-                } else {
-                    place.insertAfter( element );
-                }
-
-                // Link error back to the element
-                if ( error.is( "label" ) ) {
-                    // If the error is a label, then associate using 'for'
-                    error.attr( "for", elementID );
-                } else if ( error.parents( "label[for='" + elementID + "']" ).length === 0 ) {
-                    // If the element is not a child of an associated label, then it's necessary
-                    // to explicitly apply aria-describedby
-
-                    errorID = error.attr( "id" ).replace( /(:|\.|\[|\])/g, "\\$1");
-                    // Respect existing non-error aria-describedby
-                    if ( !describedBy ) {
-                        describedBy = errorID;
-                    } else if ( !describedBy.match( new RegExp( "\\b" + errorID + "\\b" ) ) ) {
-                        // Add to end of list if not already present
-                        describedBy += " " + errorID;
-                    }
-                    $( element ).attr( "aria-describedby", describedBy );
-
-                    // If this element is grouped, then assign to all elements in the same group
-                    group = this.groups[ element.name ];
-                    if ( group ) {
-                        $.each( this.groups, function( name, testgroup ) {
-                            if ( testgroup === group ) {
-                                $( "[name='" + name + "']", this.currentForm )
-                                    .attr( "aria-describedby", error.attr( "id" ) );
-                            }
-                        });
-                    }
-                }
-            }
-            if ( !message && this.settings.success ) {
-                error.text( "" );
-                if ( typeof this.settings.success === "string" ) {
-                    error.addClass( this.settings.success );
-                } else {
-                    this.settings.success( error, element );
-                }
-            }
-            this.toShow = this.toShow.add( error );
-        },
-
-        errorsFor: function( element ) {
-            var name = this.idOrName( element ),
-                describer = $( element ).attr( "aria-describedby" ),
-                selector = "label[for='" + name + "'], label[for='" + name + "'] *";
-
-            // aria-describedby should directly reference the error element
-            if ( describer ) {
-                selector = selector + ", #" + describer.replace( /\s+/g, ", #" );
-            }
-            return this
-                .errors()
-                .filter( selector );
-        },
-
-        idOrName: function( element ) {
-            return this.groups[ element.name ] || ( this.checkable( element ) ? element.name : element.id || element.name );
-        },
-
-        validationTargetFor: function( element ) {
-
-            // If radio/checkbox, validate first element in group instead
-            if ( this.checkable( element ) ) {
-                element = this.findByName( element.name );
-            }
-
-            // Always apply ignore filter
-            return $( element ).not( this.settings.ignore )[ 0 ];
-        },
-
-        checkable: function( element ) {
-            return ( /radio|checkbox/i ).test( element.type );
-        },
-
-        findByName: function( name ) {
-            return $( this.currentForm ).find( "[name='" + name + "']" );
-        },
-
-        getLength: function( value, element ) {
-            switch ( element.nodeName.toLowerCase() ) {
-            case "select":
-                return $( "option:selected", element ).length;
-            case "input":
-                if ( this.checkable( element ) ) {
-                    return this.findByName( element.name ).filter( ":checked" ).length;
-                }
-            }
-            return value.length;
-        },
-
-        depend: function( param, element ) {
-            return this.dependTypes[typeof param] ? this.dependTypes[typeof param]( param, element ) : true;
-        },
-
-        dependTypes: {
-            "boolean": function( param ) {
-                return param;
-            },
-            "string": function( param, element ) {
-                return !!$( param, element.form ).length;
-            },
-            "function": function( param, element ) {
-                return param( element );
-            }
-        },
-
-        optional: function( element ) {
-            var val = this.elementValue( element );
-            return !$.validator.methods.required.call( this, val, element ) && "dependency-mismatch";
-        },
-
-        startRequest: function( element ) {
-            if ( !this.pending[ element.name ] ) {
-                this.pendingRequest++;
-                this.pending[ element.name ] = true;
-            }
-        },
-
-        stopRequest: function( element, valid ) {
-            this.pendingRequest--;
-            // sometimes synchronization fails, make sure pendingRequest is never < 0
-            if ( this.pendingRequest < 0 ) {
-                this.pendingRequest = 0;
-            }
-            delete this.pending[ element.name ];
-            if ( valid && this.pendingRequest === 0 && this.formSubmitted && this.form() ) {
-                $( this.currentForm ).submit();
-                this.formSubmitted = false;
-            } else if (!valid && this.pendingRequest === 0 && this.formSubmitted ) {
-                $( this.currentForm ).triggerHandler( "invalid-form", [ this ]);
-                this.formSubmitted = false;
-            }
-        },
-
-        previousValue: function( element ) {
-            return $.data( element, "previousValue" ) || $.data( element, "previousValue", {
-                old: null,
-                valid: true,
-                message: this.defaultMessage( element, "remote" )
-            });
-        }
-
-    },
-
-    classRuleSettings: {
-        required: { required: true },
-        email: { email: true },
-        url: { url: true },
-        date: { date: true },
-        dateISO: { dateISO: true },
-        number: { number: true },
-        digits: { digits: true },
-        creditcard: { creditcard: true }
-    },
-
-    addClassRules: function( className, rules ) {
-        if ( className.constructor === String ) {
-            this.classRuleSettings[ className ] = rules;
-        } else {
-            $.extend( this.classRuleSettings, className );
-        }
-    },
-
-    classRules: function( element ) {
-        var rules = {},
-            classes = $( element ).attr( "class" );
-
-        if ( classes ) {
-            $.each( classes.split( " " ), function() {
-                if ( this in $.validator.classRuleSettings ) {
-                    $.extend( rules, $.validator.classRuleSettings[ this ]);
-                }
-            });
-        }
-        return rules;
-    },
-
-    attributeRules: function( element ) {
-        var rules = {},
-            $element = $( element ),
-            type = element.getAttribute( "type" ),
-            method, value;
-
-        for ( method in $.validator.methods ) {
-
-            // support for <input required> in both html5 and older browsers
-            if ( method === "required" ) {
-                value = element.getAttribute( method );
-                // Some browsers return an empty string for the required attribute
-                // and non-HTML5 browsers might have required="" markup
-                if ( value === "" ) {
-                    value = true;
-                }
-                // force non-HTML5 browsers to return bool
-                value = !!value;
-            } else {
-                value = $element.attr( method );
-            }
-
-            // convert the value to a number for number inputs, and for text for backwards compability
-            // allows type="date" and others to be compared as strings
-            if ( /min|max/.test( method ) && ( type === null || /number|range|text/.test( type ) ) ) {
-                value = Number( value );
-            }
-
-            if ( value || value === 0 ) {
-                rules[ method ] = value;
-            } else if ( type === method && type !== "range" ) {
-                // exception: the jquery validate 'range' method
-                // does not test for the html5 'range' type
-                rules[ method ] = true;
-            }
-        }
-
-        // maxlength may be returned as -1, 2147483647 ( IE ) and 524288 ( safari ) for text inputs
-        if ( rules.maxlength && /-1|2147483647|524288/.test( rules.maxlength ) ) {
-            delete rules.maxlength;
-        }
-
-        return rules;
-    },
-
-    dataRules: function( element ) {
-        var method, value,
-            rules = {}, $element = $( element );
-        for ( method in $.validator.methods ) {
-            value = $element.data( "rule" + method.charAt( 0 ).toUpperCase() + method.substring( 1 ).toLowerCase() );
-            if ( value !== undefined ) {
-                rules[ method ] = value;
-            }
-        }
-        return rules;
-    },
-
-    staticRules: function( element ) {
-        var rules = {},
-            validator = $.data( element.form, "validator" );
-
-        if ( validator.settings.rules ) {
-            rules = $.validator.normalizeRule( validator.settings.rules[ element.name ] ) || {};
-        }
-        return rules;
-    },
-
-    normalizeRules: function( rules, element ) {
-        // handle dependency check
-        $.each( rules, function( prop, val ) {
-            // ignore rule when param is explicitly false, eg. required:false
-            if ( val === false ) {
-                delete rules[ prop ];
-                return;
-            }
-            if ( val.param || val.depends ) {
-                var keepRule = true;
-                switch ( typeof val.depends ) {
-                case "string":
-                    keepRule = !!$( val.depends, element.form ).length;
-                    break;
-                case "function":
-                    keepRule = val.depends.call( element, element );
-                    break;
-                }
-                if ( keepRule ) {
-                    rules[ prop ] = val.param !== undefined ? val.param : true;
-                } else {
-                    delete rules[ prop ];
-                }
-            }
-        });
-
-        // evaluate parameters
-        $.each( rules, function( rule, parameter ) {
-            rules[ rule ] = $.isFunction( parameter ) ? parameter( element ) : parameter;
-        });
-
-        // clean number parameters
-        $.each([ "minlength", "maxlength" ], function() {
-            if ( rules[ this ] ) {
-                rules[ this ] = Number( rules[ this ] );
-            }
-        });
-        $.each([ "rangelength", "range" ], function() {
-            var parts;
-            if ( rules[ this ] ) {
-                if ( $.isArray( rules[ this ] ) ) {
-                    rules[ this ] = [ Number( rules[ this ][ 0 ]), Number( rules[ this ][ 1 ] ) ];
-                } else if ( typeof rules[ this ] === "string" ) {
-                    parts = rules[ this ].replace(/[\[\]]/g, "" ).split( /[\s,]+/ );
-                    rules[ this ] = [ Number( parts[ 0 ]), Number( parts[ 1 ] ) ];
-                }
-            }
-        });
-
-        if ( $.validator.autoCreateRanges ) {
-            // auto-create ranges
-            if ( rules.min != null && rules.max != null ) {
-                rules.range = [ rules.min, rules.max ];
-                delete rules.min;
-                delete rules.max;
-            }
-            if ( rules.minlength != null && rules.maxlength != null ) {
-                rules.rangelength = [ rules.minlength, rules.maxlength ];
-                delete rules.minlength;
-                delete rules.maxlength;
-            }
-        }
-
-        return rules;
-    },
-
-    // Converts a simple string to a {string: true} rule, e.g., "required" to {required:true}
-    normalizeRule: function( data ) {
-        if ( typeof data === "string" ) {
-            var transformed = {};
-            $.each( data.split( /\s/ ), function() {
-                transformed[ this ] = true;
-            });
-            data = transformed;
-        }
-        return data;
-    },
-
-    // http://jqueryvalidation.org/jQuery.validator.addMethod/
-    addMethod: function( name, method, message ) {
-        $.validator.methods[ name ] = method;
-        $.validator.messages[ name ] = message !== undefined ? message : $.validator.messages[ name ];
-        if ( method.length < 3 ) {
-            $.validator.addClassRules( name, $.validator.normalizeRule( name ) );
-        }
-    },
-
-    methods: {
-
-        // http://jqueryvalidation.org/required-method/
-        required: function( value, element, param ) {
-            // check if dependency is met
-            if ( !this.depend( param, element ) ) {
-                return "dependency-mismatch";
-            }
-            if ( element.nodeName.toLowerCase() === "select" ) {
-                // could be an array for select-multiple or a string, both are fine this way
-                var val = $( element ).val();
-                return val && val.length > 0;
-            }
-            if ( this.checkable( element ) ) {
-                return this.getLength( value, element ) > 0;
-            }
-            return $.trim( value ).length > 0;
-        },
-
-        // http://jqueryvalidation.org/email-method/
-        email: function( value, element ) {
-            // From http://www.whatwg.org/specs/web-apps/current-work/multipage/states-of-the-type-attribute.html#e-mail-state-%28type=email%29
-            // Retrieved 2014-01-14
-            // If you have a problem with this implementation, report a bug against the above spec
-            // Or use custom methods to implement your own email validation
-            return this.optional( element ) || /^[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/.test( value );
-        },
-
-        // http://jqueryvalidation.org/url-method/
-        url: function( value, element ) {
-            // contributed by Scott Gonzalez: http://projects.scottsplayground.com/iri/
-            return this.optional( element ) || /^(https?|s?ftp):\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?(((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)(:\d*)?)(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)?(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?$/i.test( value );
-        },
-
-        // http://jqueryvalidation.org/date-method/
-        date: function( value, element ) {
-            return this.optional( element ) || !/Invalid|NaN/.test( new Date( value ).toString() );
-        },
-
-        // http://jqueryvalidation.org/dateISO-method/
-        dateISO: function( value, element ) {
-            return this.optional( element ) || /^\d{4}[\/\-](0?[1-9]|1[012])[\/\-](0?[1-9]|[12][0-9]|3[01])$/.test( value );
-        },
-
-        // http://jqueryvalidation.org/number-method/
-        number: function( value, element ) {
-            return this.optional( element ) || /^-?(?:\d+|\d{1,3}(?:,\d{3})+)?(?:\.\d+)?$/.test( value );
-        },
-
-        // http://jqueryvalidation.org/digits-method/
-        digits: function( value, element ) {
-            return this.optional( element ) || /^\d+$/.test( value );
-        },
-
-        // http://jqueryvalidation.org/creditcard-method/
-        // based on http://en.wikipedia.org/wiki/Luhn/
-        creditcard: function( value, element ) {
-            if ( this.optional( element ) ) {
-                return "dependency-mismatch";
-            }
-            // accept only spaces, digits and dashes
-            if ( /[^0-9 \-]+/.test( value ) ) {
-                return false;
-            }
-            var nCheck = 0,
-                nDigit = 0,
-                bEven = false,
-                n, cDigit;
-
-            value = value.replace( /\D/g, "" );
-
-            // Basing min and max length on
-            // http://developer.ean.com/general_info/Valid_Credit_Card_Types
-            if ( value.length < 13 || value.length > 19 ) {
-                return false;
-            }
-
-            for ( n = value.length - 1; n >= 0; n--) {
-                cDigit = value.charAt( n );
-                nDigit = parseInt( cDigit, 10 );
-                if ( bEven ) {
-                    if ( ( nDigit *= 2 ) > 9 ) {
-                        nDigit -= 9;
-                    }
-                }
-                nCheck += nDigit;
-                bEven = !bEven;
-            }
-
-            return ( nCheck % 10 ) === 0;
-        },
-
-        // http://jqueryvalidation.org/minlength-method/
-        minlength: function( value, element, param ) {
-            var length = $.isArray( value ) ? value.length : this.getLength( value, element );
-            return this.optional( element ) || length >= param;
-        },
-
-        // http://jqueryvalidation.org/maxlength-method/
-        maxlength: function( value, element, param ) {
-            var length = $.isArray( value ) ? value.length : this.getLength( value, element );
-            return this.optional( element ) || length <= param;
-        },
-
-        // http://jqueryvalidation.org/rangelength-method/
-        rangelength: function( value, element, param ) {
-            var length = $.isArray( value ) ? value.length : this.getLength( value, element );
-            return this.optional( element ) || ( length >= param[ 0 ] && length <= param[ 1 ] );
-        },
-
-        // http://jqueryvalidation.org/min-method/
-        min: function( value, element, param ) {
-            return this.optional( element ) || value >= param;
-        },
-
-        // http://jqueryvalidation.org/max-method/
-        max: function( value, element, param ) {
-            return this.optional( element ) || value <= param;
-        },
-
-        // http://jqueryvalidation.org/range-method/
-        range: function( value, element, param ) {
-            return this.optional( element ) || ( value >= param[ 0 ] && value <= param[ 1 ] );
-        },
-
-        // http://jqueryvalidation.org/equalTo-method/
-        equalTo: function( value, element, param ) {
-            // bind to the blur event of the target in order to revalidate whenever the target field is updated
-            // TODO find a way to bind the event just once, avoiding the unbind-rebind overhead
-            var target = $( param );
-            if ( this.settings.onfocusout ) {
-                target.unbind( ".validate-equalTo" ).bind( "blur.validate-equalTo", function() {
-                    $( element ).valid();
-                });
-            }
-            return value === target.val();
-        },
-
-        // http://jqueryvalidation.org/remote-method/
-        remote: function( value, element, param ) {
-            if ( this.optional( element ) ) {
-                return "dependency-mismatch";
-            }
-
-            var previous = this.previousValue( element ),
-                validator, data;
-
-            if (!this.settings.messages[ element.name ] ) {
-                this.settings.messages[ element.name ] = {};
-            }
-            previous.originalMessage = this.settings.messages[ element.name ].remote;
-            this.settings.messages[ element.name ].remote = previous.message;
-
-            param = typeof param === "string" && { url: param } || param;
-
-            if ( previous.old === value ) {
-                return previous.valid;
-            }
-
-            previous.old = value;
-            validator = this;
-            this.startRequest( element );
-            data = {};
-            data[ element.name ] = value;
-            $.ajax( $.extend( true, {
-                url: param,
-                mode: "abort",
-                port: "validate" + element.name,
-                dataType: "json",
-                data: data,
-                context: validator.currentForm,
-                success: function( response ) {
-                    var valid = response === true || response === "true",
-                        errors, message, submitted;
-
-                    validator.settings.messages[ element.name ].remote = previous.originalMessage;
-                    if ( valid ) {
-                        submitted = validator.formSubmitted;
-                        validator.prepareElement( element );
-                        validator.formSubmitted = submitted;
-                        validator.successList.push( element );
-                        delete validator.invalid[ element.name ];
-                        validator.showErrors();
-                    } else {
-                        errors = {};
-                        message = response || validator.defaultMessage( element, "remote" );
-                        errors[ element.name ] = previous.message = $.isFunction( message ) ? message( value ) : message;
-                        validator.invalid[ element.name ] = true;
-                        validator.showErrors( errors );
-                    }
-                    previous.valid = valid;
-                    validator.stopRequest( element, valid );
-                }
-            }, param ) );
-            return "pending";
-        }
-
-    }
-
-});
-
-$.format = function deprecated() {
-    throw "$.format has been deprecated. Please use $.validator.format instead.";
-};
-
-// ajax mode: abort
-// usage: $.ajax({ mode: "abort"[, port: "uniqueport"]});
-// if mode:"abort" is used, the previous request on that port (port can be undefined) is aborted via XMLHttpRequest.abort()
-
-var pendingRequests = {},
-    ajax;
-// Use a prefilter if available (1.5+)
-if ( $.ajaxPrefilter ) {
-    $.ajaxPrefilter(function( settings, _, xhr ) {
-        var port = settings.port;
-        if ( settings.mode === "abort" ) {
-            if ( pendingRequests[port] ) {
-                pendingRequests[port].abort();
-            }
-            pendingRequests[port] = xhr;
-        }
-    });
-} else {
-    // Proxy ajax
-    ajax = $.ajax;
-    $.ajax = function( settings ) {
-        var mode = ( "mode" in settings ? settings : $.ajaxSettings ).mode,
-            port = ( "port" in settings ? settings : $.ajaxSettings ).port;
-        if ( mode === "abort" ) {
-            if ( pendingRequests[port] ) {
-                pendingRequests[port].abort();
-            }
-            pendingRequests[port] = ajax.apply(this, arguments);
-            return pendingRequests[port];
-        }
-        return ajax.apply(this, arguments);
-    };
-}
-
-// provides delegate(type: String, delegate: Selector, handler: Callback) plugin for easier event delegation
-// handler is only called when $(event.target).is(delegate), in the scope of the jquery-object for event.target
-
-$.extend($.fn, {
-    validateDelegate: function( delegate, type, handler ) {
-        return this.bind(type, function( event ) {
-            var target = $(event.target);
-            if ( target.is(delegate) ) {
-                return handler.apply(target, arguments);
-            }
-        });
-    }
-});
-
-}));
\ No newline at end of file
diff --git a/#pma/js/jquery/src/README b/#pma/js/jquery/src/README
deleted file mode 100644
index e2cc78cc..00000000
--- a/#pma/js/jquery/src/README
+++ /dev/null
@@ -1,9 +0,0 @@
-jQuery and jQuery UI source
-===========================
-
-This directory contains source code for jQuery and jQuery UI.
-
-phpMyAdmin Developers: When updating the minified/concatened version of
-jQuery one directory back (i.e., in js/jquery/), make certain that the
-material under this directory is the complete, corresponding source for the
-minified/concatenated version.
diff --git a/#pma/js/jquery/src/jquery-ui/.jshintrc b/#pma/js/jquery/src/jquery-ui/.jshintrc
deleted file mode 100644
index 98a79b5d..00000000
--- a/#pma/js/jquery/src/jquery-ui/.jshintrc
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-	"boss": true,
-	"curly": true,
-	"eqeqeq": true,
-	"eqnull": true,
-	"expr": true,
-	"immed": true,
-	"noarg": true,
-	"onevar": true,
-	"quotmark": "double",
-	"smarttabs": true,
-	"trailing": true,
-	"undef": true,
-	"unused": true,
-
-	"browser": true,
-	"es3": true,
-	"jquery": true,
-
-	"globals": {
-		"define": false,
-		"Globalize": false
-	}
-}
diff --git a/#pma/js/jquery/src/jquery-ui/accordion.js b/#pma/js/jquery/src/jquery-ui/accordion.js
deleted file mode 100644
index d62df65a..00000000
--- a/#pma/js/jquery/src/jquery-ui/accordion.js
+++ /dev/null
@@ -1,590 +0,0 @@
-/*!
- * jQuery UI Accordion 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/accordion/
- */
-(function( factory ) {
-	if ( typeof define === "function" && define.amd ) {
-
-		// AMD. Register as an anonymous module.
-		define([
-			"jquery",
-			"./core",
-			"./widget"
-		], factory );
-	} else {
-
-		// Browser globals
-		factory( jQuery );
-	}
-}(function( $ ) {
-
-return $.widget( "ui.accordion", {
-	version: "1.11.4",
-	options: {
-		active: 0,
-		animate: {},
-		collapsible: false,
-		event: "click",
-		header: "> li > :first-child,> :not(li):even",
-		heightStyle: "auto",
-		icons: {
-			activeHeader: "ui-icon-triangle-1-s",
-			header: "ui-icon-triangle-1-e"
-		},
-
-		// callbacks
-		activate: null,
-		beforeActivate: null
-	},
-
-	hideProps: {
-		borderTopWidth: "hide",
-		borderBottomWidth: "hide",
-		paddingTop: "hide",
-		paddingBottom: "hide",
-		height: "hide"
-	},
-
-	showProps: {
-		borderTopWidth: "show",
-		borderBottomWidth: "show",
-		paddingTop: "show",
-		paddingBottom: "show",
-		height: "show"
-	},
-
-	_create: function() {
-		var options = this.options;
-		this.prevShow = this.prevHide = $();
-		this.element.addClass( "ui-accordion ui-widget ui-helper-reset" )
-			// ARIA
-			.attr( "role", "tablist" );
-
-		// don't allow collapsible: false and active: false / null
-		if ( !options.collapsible && (options.active === false || options.active == null) ) {
-			options.active = 0;
-		}
-
-		this._processPanels();
-		// handle negative values
-		if ( options.active < 0 ) {
-			options.active += this.headers.length;
-		}
-		this._refresh();
-	},
-
-	_getCreateEventData: function() {
-		return {
-			header: this.active,
-			panel: !this.active.length ? $() : this.active.next()
-		};
-	},
-
-	_createIcons: function() {
-		var icons = this.options.icons;
-		if ( icons ) {
-			$( "<span>" )
-				.addClass( "ui-accordion-header-icon ui-icon " + icons.header )
-				.prependTo( this.headers );
-			this.active.children( ".ui-accordion-header-icon" )
-				.removeClass( icons.header )
-				.addClass( icons.activeHeader );
-			this.headers.addClass( "ui-accordion-icons" );
-		}
-	},
-
-	_destroyIcons: function() {
-		this.headers
-			.removeClass( "ui-accordion-icons" )
-			.children( ".ui-accordion-header-icon" )
-				.remove();
-	},
-
-	_destroy: function() {
-		var contents;
-
-		// clean up main element
-		this.element
-			.removeClass( "ui-accordion ui-widget ui-helper-reset" )
-			.removeAttr( "role" );
-
-		// clean up headers
-		this.headers
-			.removeClass( "ui-accordion-header ui-accordion-header-active ui-state-default " +
-				"ui-corner-all ui-state-active ui-state-disabled ui-corner-top" )
-			.removeAttr( "role" )
-			.removeAttr( "aria-expanded" )
-			.removeAttr( "aria-selected" )
-			.removeAttr( "aria-controls" )
-			.removeAttr( "tabIndex" )
-			.removeUniqueId();
-
-		this._destroyIcons();
-
-		// clean up content panels
-		contents = this.headers.next()
-			.removeClass( "ui-helper-reset ui-widget-content ui-corner-bottom " +
-				"ui-accordion-content ui-accordion-content-active ui-state-disabled" )
-			.css( "display", "" )
-			.removeAttr( "role" )
-			.removeAttr( "aria-hidden" )
-			.removeAttr( "aria-labelledby" )
-			.removeUniqueId();
-
-		if ( this.options.heightStyle !== "content" ) {
-			contents.css( "height", "" );
-		}
-	},
-
-	_setOption: function( key, value ) {
-		if ( key === "active" ) {
-			// _activate() will handle invalid values and update this.options
-			this._activate( value );
-			return;
-		}
-
-		if ( key === "event" ) {
-			if ( this.options.event ) {
-				this._off( this.headers, this.options.event );
-			}
-			this._setupEvents( value );
-		}
-
-		this._super( key, value );
-
-		// setting collapsible: false while collapsed; open first panel
-		if ( key === "collapsible" && !value && this.options.active === false ) {
-			this._activate( 0 );
-		}
-
-		if ( key === "icons" ) {
-			this._destroyIcons();
-			if ( value ) {
-				this._createIcons();
-			}
-		}
-
-		// #5332 - opacity doesn't cascade to positioned elements in IE
-		// so we need to add the disabled class to the headers and panels
-		if ( key === "disabled" ) {
-			this.element
-				.toggleClass( "ui-state-disabled", !!value )
-				.attr( "aria-disabled", value );
-			this.headers.add( this.headers.next() )
-				.toggleClass( "ui-state-disabled", !!value );
-		}
-	},
-
-	_keydown: function( event ) {
-		if ( event.altKey || event.ctrlKey ) {
-			return;
-		}
-
-		var keyCode = $.ui.keyCode,
-			length = this.headers.length,
-			currentIndex = this.headers.index( event.target ),
-			toFocus = false;
-
-		switch ( event.keyCode ) {
-			case keyCode.RIGHT:
-			case keyCode.DOWN:
-				toFocus = this.headers[ ( currentIndex + 1 ) % length ];
-				break;
-			case keyCode.LEFT:
-			case keyCode.UP:
-				toFocus = this.headers[ ( currentIndex - 1 + length ) % length ];
-				break;
-			case keyCode.SPACE:
-			case keyCode.ENTER:
-				this._eventHandler( event );
-				break;
-			case keyCode.HOME:
-				toFocus = this.headers[ 0 ];
-				break;
-			case keyCode.END:
-				toFocus = this.headers[ length - 1 ];
-				break;
-		}
-
-		if ( toFocus ) {
-			$( event.target ).attr( "tabIndex", -1 );
-			$( toFocus ).attr( "tabIndex", 0 );
-			toFocus.focus();
-			event.preventDefault();
-		}
-	},
-
-	_panelKeyDown: function( event ) {
-		if ( event.keyCode === $.ui.keyCode.UP && event.ctrlKey ) {
-			$( event.currentTarget ).prev().focus();
-		}
-	},
-
-	refresh: function() {
-		var options = this.options;
-		this._processPanels();
-
-		// was collapsed or no panel
-		if ( ( options.active === false && options.collapsible === true ) || !this.headers.length ) {
-			options.active = false;
-			this.active = $();
-		// active false only when collapsible is true
-		} else if ( options.active === false ) {
-			this._activate( 0 );
-		// was active, but active panel is gone
-		} else if ( this.active.length && !$.contains( this.element[ 0 ], this.active[ 0 ] ) ) {
-			// all remaining panel are disabled
-			if ( this.headers.length === this.headers.find(".ui-state-disabled").length ) {
-				options.active = false;
-				this.active = $();
-			// activate previous panel
-			} else {
-				this._activate( Math.max( 0, options.active - 1 ) );
-			}
-		// was active, active panel still exists
-		} else {
-			// make sure active index is correct
-			options.active = this.headers.index( this.active );
-		}
-
-		this._destroyIcons();
-
-		this._refresh();
-	},
-
-	_processPanels: function() {
-		var prevHeaders = this.headers,
-			prevPanels = this.panels;
-
-		this.headers = this.element.find( this.options.header )
-			.addClass( "ui-accordion-header ui-state-default ui-corner-all" );
-
-		this.panels = this.headers.next()
-			.addClass( "ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom" )
-			.filter( ":not(.ui-accordion-content-active)" )
-			.hide();
-
-		// Avoid memory leaks (#10056)
-		if ( prevPanels ) {
-			this._off( prevHeaders.not( this.headers ) );
-			this._off( prevPanels.not( this.panels ) );
-		}
-	},
-
-	_refresh: function() {
-		var maxHeight,
-			options = this.options,
-			heightStyle = options.heightStyle,
-			parent = this.element.parent();
-
-		this.active = this._findActive( options.active )
-			.addClass( "ui-accordion-header-active ui-state-active ui-corner-top" )
-			.removeClass( "ui-corner-all" );
-		this.active.next()
-			.addClass( "ui-accordion-content-active" )
-			.show();
-
-		this.headers
-			.attr( "role", "tab" )
-			.each(function() {
-				var header = $( this ),
-					headerId = header.uniqueId().attr( "id" ),
-					panel = header.next(),
-					panelId = panel.uniqueId().attr( "id" );
-				header.attr( "aria-controls", panelId );
-				panel.attr( "aria-labelledby", headerId );
-			})
-			.next()
-				.attr( "role", "tabpanel" );
-
-		this.headers
-			.not( this.active )
-			.attr({
-				"aria-selected": "false",
-				"aria-expanded": "false",
-				tabIndex: -1
-			})
-			.next()
-				.attr({
-					"aria-hidden": "true"
-				})
-				.hide();
-
-		// make sure at least one header is in the tab order
-		if ( !this.active.length ) {
-			this.headers.eq( 0 ).attr( "tabIndex", 0 );
-		} else {
-			this.active.attr({
-				"aria-selected": "true",
-				"aria-expanded": "true",
-				tabIndex: 0
-			})
-			.next()
-				.attr({
-					"aria-hidden": "false"
-				});
-		}
-
-		this._createIcons();
-
-		this._setupEvents( options.event );
-
-		if ( heightStyle === "fill" ) {
-			maxHeight = parent.height();
-			this.element.siblings( ":visible" ).each(function() {
-				var elem = $( this ),
-					position = elem.css( "position" );
-
-				if ( position === "absolute" || position === "fixed" ) {
-					return;
-				}
-				maxHeight -= elem.outerHeight( true );
-			});
-
-			this.headers.each(function() {
-				maxHeight -= $( this ).outerHeight( true );
-			});
-
-			this.headers.next()
-				.each(function() {
-					$( this ).height( Math.max( 0, maxHeight -
-						$( this ).innerHeight() + $( this ).height() ) );
-				})
-				.css( "overflow", "auto" );
-		} else if ( heightStyle === "auto" ) {
-			maxHeight = 0;
-			this.headers.next()
-				.each(function() {
-					maxHeight = Math.max( maxHeight, $( this ).css( "height", "" ).height() );
-				})
-				.height( maxHeight );
-		}
-	},
-
-	_activate: function( index ) {
-		var active = this._findActive( index )[ 0 ];
-
-		// trying to activate the already active panel
-		if ( active === this.active[ 0 ] ) {
-			return;
-		}
-
-		// trying to collapse, simulate a click on the currently active header
-		active = active || this.active[ 0 ];
-
-		this._eventHandler({
-			target: active,
-			currentTarget: active,
-			preventDefault: $.noop
-		});
-	},
-
-	_findActive: function( selector ) {
-		return typeof selector === "number" ? this.headers.eq( selector ) : $();
-	},
-
-	_setupEvents: function( event ) {
-		var events = {
-			keydown: "_keydown"
-		};
-		if ( event ) {
-			$.each( event.split( " " ), function( index, eventName ) {
-				events[ eventName ] = "_eventHandler";
-			});
-		}
-
-		this._off( this.headers.add( this.headers.next() ) );
-		this._on( this.headers, events );
-		this._on( this.headers.next(), { keydown: "_panelKeyDown" });
-		this._hoverable( this.headers );
-		this._focusable( this.headers );
-	},
-
-	_eventHandler: function( event ) {
-		var options = this.options,
-			active = this.active,
-			clicked = $( event.currentTarget ),
-			clickedIsActive = clicked[ 0 ] === active[ 0 ],
-			collapsing = clickedIsActive && options.collapsible,
-			toShow = collapsing ? $() : clicked.next(),
-			toHide = active.next(),
-			eventData = {
-				oldHeader: active,
-				oldPanel: toHide,
-				newHeader: collapsing ? $() : clicked,
-				newPanel: toShow
-			};
-
-		event.preventDefault();
-
-		if (
-				// click on active header, but not collapsible
-				( clickedIsActive && !options.collapsible ) ||
-				// allow canceling activation
-				( this._trigger( "beforeActivate", event, eventData ) === false ) ) {
-			return;
-		}
-
-		options.active = collapsing ? false : this.headers.index( clicked );
-
-		// when the call to ._toggle() comes after the class changes
-		// it causes a very odd bug in IE 8 (see #6720)
-		this.active = clickedIsActive ? $() : clicked;
-		this._toggle( eventData );
-
-		// switch classes
-		// corner classes on the previously active header stay after the animation
-		active.removeClass( "ui-accordion-header-active ui-state-active" );
-		if ( options.icons ) {
-			active.children( ".ui-accordion-header-icon" )
-				.removeClass( options.icons.activeHeader )
-				.addClass( options.icons.header );
-		}
-
-		if ( !clickedIsActive ) {
-			clicked
-				.removeClass( "ui-corner-all" )
-				.addClass( "ui-accordion-header-active ui-state-active ui-corner-top" );
-			if ( options.icons ) {
-				clicked.children( ".ui-accordion-header-icon" )
-					.removeClass( options.icons.header )
-					.addClass( options.icons.activeHeader );
-			}
-
-			clicked
-				.next()
-				.addClass( "ui-accordion-content-active" );
-		}
-	},
-
-	_toggle: function( data ) {
-		var toShow = data.newPanel,
-			toHide = this.prevShow.length ? this.prevShow : data.oldPanel;
-
-		// handle activating a panel during the animation for another activation
-		this.prevShow.add( this.prevHide ).stop( true, true );
-		this.prevShow = toShow;
-		this.prevHide = toHide;
-
-		if ( this.options.animate ) {
-			this._animate( toShow, toHide, data );
-		} else {
-			toHide.hide();
-			toShow.show();
-			this._toggleComplete( data );
-		}
-
-		toHide.attr({
-			"aria-hidden": "true"
-		});
-		toHide.prev().attr({
-			"aria-selected": "false",
-			"aria-expanded": "false"
-		});
-		// if we're switching panels, remove the old header from the tab order
-		// if we're opening from collapsed state, remove the previous header from the tab order
-		// if we're collapsing, then keep the collapsing header in the tab order
-		if ( toShow.length && toHide.length ) {
-			toHide.prev().attr({
-				"tabIndex": -1,
-				"aria-expanded": "false"
-			});
-		} else if ( toShow.length ) {
-			this.headers.filter(function() {
-				return parseInt( $( this ).attr( "tabIndex" ), 10 ) === 0;
-			})
-			.attr( "tabIndex", -1 );
-		}
-
-		toShow
-			.attr( "aria-hidden", "false" )
-			.prev()
-				.attr({
-					"aria-selected": "true",
-					"aria-expanded": "true",
-					tabIndex: 0
-				});
-	},
-
-	_animate: function( toShow, toHide, data ) {
-		var total, easing, duration,
-			that = this,
-			adjust = 0,
-			boxSizing = toShow.css( "box-sizing" ),
-			down = toShow.length &&
-				( !toHide.length || ( toShow.index() < toHide.index() ) ),
-			animate = this.options.animate || {},
-			options = down && animate.down || animate,
-			complete = function() {
-				that._toggleComplete( data );
-			};
-
-		if ( typeof options === "number" ) {
-			duration = options;
-		}
-		if ( typeof options === "string" ) {
-			easing = options;
-		}
-		// fall back from options to animation in case of partial down settings
-		easing = easing || options.easing || animate.easing;
-		duration = duration || options.duration || animate.duration;
-
-		if ( !toHide.length ) {
-			return toShow.animate( this.showProps, duration, easing, complete );
-		}
-		if ( !toShow.length ) {
-			return toHide.animate( this.hideProps, duration, easing, complete );
-		}
-
-		total = toShow.show().outerHeight();
-		toHide.animate( this.hideProps, {
-			duration: duration,
-			easing: easing,
-			step: function( now, fx ) {
-				fx.now = Math.round( now );
-			}
-		});
-		toShow
-			.hide()
-			.animate( this.showProps, {
-				duration: duration,
-				easing: easing,
-				complete: complete,
-				step: function( now, fx ) {
-					fx.now = Math.round( now );
-					if ( fx.prop !== "height" ) {
-						if ( boxSizing === "content-box" ) {
-							adjust += fx.now;
-						}
-					} else if ( that.options.heightStyle !== "content" ) {
-						fx.now = Math.round( total - toHide.outerHeight() - adjust );
-						adjust = 0;
-					}
-				}
-			});
-	},
-
-	_toggleComplete: function( data ) {
-		var toHide = data.oldPanel;
-
-		toHide
-			.removeClass( "ui-accordion-content-active" )
-			.prev()
-				.removeClass( "ui-corner-top" )
-				.addClass( "ui-corner-all" );
-
-		// Work around for rendering bug in IE (#5421)
-		if ( toHide.length ) {
-			toHide.parent()[ 0 ].className = toHide.parent()[ 0 ].className;
-		}
-		this._trigger( "activate", null, data );
-	}
-});
-
-}));
diff --git a/#pma/js/jquery/src/jquery-ui/autocomplete.js b/#pma/js/jquery/src/jquery-ui/autocomplete.js
deleted file mode 100644
index 63beb1f4..00000000
--- a/#pma/js/jquery/src/jquery-ui/autocomplete.js
+++ /dev/null
@@ -1,628 +0,0 @@
-/*!
- * jQuery UI Autocomplete 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/autocomplete/
- */
-(function( factory ) {
-	if ( typeof define === "function" && define.amd ) {
-
-		// AMD. Register as an anonymous module.
-		define([
-			"jquery",
-			"./core",
-			"./widget",
-			"./position",
-			"./menu"
-		], factory );
-	} else {
-
-		// Browser globals
-		factory( jQuery );
-	}
-}(function( $ ) {
-
-$.widget( "ui.autocomplete", {
-	version: "1.11.4",
-	defaultElement: "<input>",
-	options: {
-		appendTo: null,
-		autoFocus: false,
-		delay: 300,
-		minLength: 1,
-		position: {
-			my: "left top",
-			at: "left bottom",
-			collision: "none"
-		},
-		source: null,
-
-		// callbacks
-		change: null,
-		close: null,
-		focus: null,
-		open: null,
-		response: null,
-		search: null,
-		select: null
-	},
-
-	requestIndex: 0,
-	pending: 0,
-
-	_create: function() {
-		// Some browsers only repeat keydown events, not keypress events,
-		// so we use the suppressKeyPress flag to determine if we've already
-		// handled the keydown event. #7269
-		// Unfortunately the code for & in keypress is the same as the up arrow,
-		// so we use the suppressKeyPressRepeat flag to avoid handling keypress
-		// events when we know the keydown event was used to modify the
-		// search term. #7799
-		var suppressKeyPress, suppressKeyPressRepeat, suppressInput,
-			nodeName = this.element[ 0 ].nodeName.toLowerCase(),
-			isTextarea = nodeName === "textarea",
-			isInput = nodeName === "input";
-
-		this.isMultiLine =
-			// Textareas are always multi-line
-			isTextarea ? true :
-			// Inputs are always single-line, even if inside a contentEditable element
-			// IE also treats inputs as contentEditable
-			isInput ? false :
-			// All other element types are determined by whether or not they're contentEditable
-			this.element.prop( "isContentEditable" );
-
-		this.valueMethod = this.element[ isTextarea || isInput ? "val" : "text" ];
-		this.isNewMenu = true;
-
-		this.element
-			.addClass( "ui-autocomplete-input" )
-			.attr( "autocomplete", "off" );
-
-		this._on( this.element, {
-			keydown: function( event ) {
-				if ( this.element.prop( "readOnly" ) ) {
-					suppressKeyPress = true;
-					suppressInput = true;
-					suppressKeyPressRepeat = true;
-					return;
-				}
-
-				suppressKeyPress = false;
-				suppressInput = false;
-				suppressKeyPressRepeat = false;
-				var keyCode = $.ui.keyCode;
-				switch ( event.keyCode ) {
-				case keyCode.PAGE_UP:
-					suppressKeyPress = true;
-					this._move( "previousPage", event );
-					break;
-				case keyCode.PAGE_DOWN:
-					suppressKeyPress = true;
-					this._move( "nextPage", event );
-					break;
-				case keyCode.UP:
-					suppressKeyPress = true;
-					this._keyEvent( "previous", event );
-					break;
-				case keyCode.DOWN:
-					suppressKeyPress = true;
-					this._keyEvent( "next", event );
-					break;
-				case keyCode.ENTER:
-					// when menu is open and has focus
-					if ( this.menu.active ) {
-						// #6055 - Opera still allows the keypress to occur
-						// which causes forms to submit
-						suppressKeyPress = true;
-						event.preventDefault();
-						this.menu.select( event );
-					}
-					break;
-				case keyCode.TAB:
-					if ( this.menu.active ) {
-						this.menu.select( event );
-					}
-					break;
-				case keyCode.ESCAPE:
-					if ( this.menu.element.is( ":visible" ) ) {
-						if ( !this.isMultiLine ) {
-							this._value( this.term );
-						}
-						this.close( event );
-						// Different browsers have different default behavior for escape
-						// Single press can mean undo or clear
-						// Double press in IE means clear the whole form
-						event.preventDefault();
-					}
-					break;
-				default:
-					suppressKeyPressRepeat = true;
-					// search timeout should be triggered before the input value is changed
-					this._searchTimeout( event );
-					break;
-				}
-			},
-			keypress: function( event ) {
-				if ( suppressKeyPress ) {
-					suppressKeyPress = false;
-					if ( !this.isMultiLine || this.menu.element.is( ":visible" ) ) {
-						event.preventDefault();
-					}
-					return;
-				}
-				if ( suppressKeyPressRepeat ) {
-					return;
-				}
-
-				// replicate some key handlers to allow them to repeat in Firefox and Opera
-				var keyCode = $.ui.keyCode;
-				switch ( event.keyCode ) {
-				case keyCode.PAGE_UP:
-					this._move( "previousPage", event );
-					break;
-				case keyCode.PAGE_DOWN:
-					this._move( "nextPage", event );
-					break;
-				case keyCode.UP:
-					this._keyEvent( "previous", event );
-					break;
-				case keyCode.DOWN:
-					this._keyEvent( "next", event );
-					break;
-				}
-			},
-			input: function( event ) {
-				if ( suppressInput ) {
-					suppressInput = false;
-					event.preventDefault();
-					return;
-				}
-				this._searchTimeout( event );
-			},
-			focus: function() {
-				this.selectedItem = null;
-				this.previous = this._value();
-			},
-			blur: function( event ) {
-				if ( this.cancelBlur ) {
-					delete this.cancelBlur;
-					return;
-				}
-
-				clearTimeout( this.searching );
-				this.close( event );
-				this._change( event );
-			}
-		});
-
-		this._initSource();
-		this.menu = $( "<ul>" )
-			.addClass( "ui-autocomplete ui-front" )
-			.appendTo( this._appendTo() )
-			.menu({
-				// disable ARIA support, the live region takes care of that
-				role: null
-			})
-			.hide()
-			.menu( "instance" );
-
-		this._on( this.menu.element, {
-			mousedown: function( event ) {
-				// prevent moving focus out of the text field
-				event.preventDefault();
-
-				// IE doesn't prevent moving focus even with event.preventDefault()
-				// so we set a flag to know when we should ignore the blur event
-				this.cancelBlur = true;
-				this._delay(function() {
-					delete this.cancelBlur;
-				});
-
-				// clicking on the scrollbar causes focus to shift to the body
-				// but we can't detect a mouseup or a click immediately afterward
-				// so we have to track the next mousedown and close the menu if
-				// the user clicks somewhere outside of the autocomplete
-				var menuElement = this.menu.element[ 0 ];
-				if ( !$( event.target ).closest( ".ui-menu-item" ).length ) {
-					this._delay(function() {
-						var that = this;
-						this.document.one( "mousedown", function( event ) {
-							if ( event.target !== that.element[ 0 ] &&
-									event.target !== menuElement &&
-									!$.contains( menuElement, event.target ) ) {
-								that.close();
-							}
-						});
-					});
-				}
-			},
-			menufocus: function( event, ui ) {
-				var label, item;
-				// support: Firefox
-				// Prevent accidental activation of menu items in Firefox (#7024 #9118)
-				if ( this.isNewMenu ) {
-					this.isNewMenu = false;
-					if ( event.originalEvent && /^mouse/.test( event.originalEvent.type ) ) {
-						this.menu.blur();
-
-						this.document.one( "mousemove", function() {
-							$( event.target ).trigger( event.originalEvent );
-						});
-
-						return;
-					}
-				}
-
-				item = ui.item.data( "ui-autocomplete-item" );
-				if ( false !== this._trigger( "focus", event, { item: item } ) ) {
-					// use value to match what will end up in the input, if it was a key event
-					if ( event.originalEvent && /^key/.test( event.originalEvent.type ) ) {
-						this._value( item.value );
-					}
-				}
-
-				// Announce the value in the liveRegion
-				label = ui.item.attr( "aria-label" ) || item.value;
-				if ( label && $.trim( label ).length ) {
-					this.liveRegion.children().hide();
-					$( "<div>" ).text( label ).appendTo( this.liveRegion );
-				}
-			},
-			menuselect: function( event, ui ) {
-				var item = ui.item.data( "ui-autocomplete-item" ),
-					previous = this.previous;
-
-				// only trigger when focus was lost (click on menu)
-				if ( this.element[ 0 ] !== this.document[ 0 ].activeElement ) {
-					this.element.focus();
-					this.previous = previous;
-					// #6109 - IE triggers two focus events and the second
-					// is asynchronous, so we need to reset the previous
-					// term synchronously and asynchronously :-(
-					this._delay(function() {
-						this.previous = previous;
-						this.selectedItem = item;
-					});
-				}
-
-				if ( false !== this._trigger( "select", event, { item: item } ) ) {
-					this._value( item.value );
-				}
-				// reset the term after the select event
-				// this allows custom select handling to work properly
-				this.term = this._value();
-
-				this.close( event );
-				this.selectedItem = item;
-			}
-		});
-
-		this.liveRegion = $( "<span>", {
-				role: "status",
-				"aria-live": "assertive",
-				"aria-relevant": "additions"
-			})
-			.addClass( "ui-helper-hidden-accessible" )
-			.appendTo( this.document[ 0 ].body );
-
-		// turning off autocomplete prevents the browser from remembering the
-		// value when navigating through history, so we re-enable autocomplete
-		// if the page is unloaded before the widget is destroyed. #7790
-		this._on( this.window, {
-			beforeunload: function() {
-				this.element.removeAttr( "autocomplete" );
-			}
-		});
-	},
-
-	_destroy: function() {
-		clearTimeout( this.searching );
-		this.element
-			.removeClass( "ui-autocomplete-input" )
-			.removeAttr( "autocomplete" );
-		this.menu.element.remove();
-		this.liveRegion.remove();
-	},
-
-	_setOption: function( key, value ) {
-		this._super( key, value );
-		if ( key === "source" ) {
-			this._initSource();
-		}
-		if ( key === "appendTo" ) {
-			this.menu.element.appendTo( this._appendTo() );
-		}
-		if ( key === "disabled" && value && this.xhr ) {
-			this.xhr.abort();
-		}
-	},
-
-	_appendTo: function() {
-		var element = this.options.appendTo;
-
-		if ( element ) {
-			element = element.jquery || element.nodeType ?
-				$( element ) :
-				this.document.find( element ).eq( 0 );
-		}
-
-		if ( !element || !element[ 0 ] ) {
-			element = this.element.closest( ".ui-front" );
-		}
-
-		if ( !element.length ) {
-			element = this.document[ 0 ].body;
-		}
-
-		return element;
-	},
-
-	_initSource: function() {
-		var array, url,
-			that = this;
-		if ( $.isArray( this.options.source ) ) {
-			array = this.options.source;
-			this.source = function( request, response ) {
-				response( $.ui.autocomplete.filter( array, request.term ) );
-			};
-		} else if ( typeof this.options.source === "string" ) {
-			url = this.options.source;
-			this.source = function( request, response ) {
-				if ( that.xhr ) {
-					that.xhr.abort();
-				}
-				that.xhr = $.ajax({
-					url: url,
-					data: request,
-					dataType: "json",
-					success: function( data ) {
-						response( data );
-					},
-					error: function() {
-						response([]);
-					}
-				});
-			};
-		} else {
-			this.source = this.options.source;
-		}
-	},
-
-	_searchTimeout: function( event ) {
-		clearTimeout( this.searching );
-		this.searching = this._delay(function() {
-
-			// Search if the value has changed, or if the user retypes the same value (see #7434)
-			var equalValues = this.term === this._value(),
-				menuVisible = this.menu.element.is( ":visible" ),
-				modifierKey = event.altKey || event.ctrlKey || event.metaKey || event.shiftKey;
-
-			if ( !equalValues || ( equalValues && !menuVisible && !modifierKey ) ) {
-				this.selectedItem = null;
-				this.search( null, event );
-			}
-		}, this.options.delay );
-	},
-
-	search: function( value, event ) {
-		value = value != null ? value : this._value();
-
-		// always save the actual value, not the one passed as an argument
-		this.term = this._value();
-
-		if ( value.length < this.options.minLength ) {
-			return this.close( event );
-		}
-
-		if ( this._trigger( "search", event ) === false ) {
-			return;
-		}
-
-		return this._search( value );
-	},
-
-	_search: function( value ) {
-		this.pending++;
-		this.element.addClass( "ui-autocomplete-loading" );
-		this.cancelSearch = false;
-
-		this.source( { term: value }, this._response() );
-	},
-
-	_response: function() {
-		var index = ++this.requestIndex;
-
-		return $.proxy(function( content ) {
-			if ( index === this.requestIndex ) {
-				this.__response( content );
-			}
-
-			this.pending--;
-			if ( !this.pending ) {
-				this.element.removeClass( "ui-autocomplete-loading" );
-			}
-		}, this );
-	},
-
-	__response: function( content ) {
-		if ( content ) {
-			content = this._normalize( content );
-		}
-		this._trigger( "response", null, { content: content } );
-		if ( !this.options.disabled && content && content.length && !this.cancelSearch ) {
-			this._suggest( content );
-			this._trigger( "open" );
-		} else {
-			// use ._close() instead of .close() so we don't cancel future searches
-			this._close();
-		}
-	},
-
-	close: function( event ) {
-		this.cancelSearch = true;
-		this._close( event );
-	},
-
-	_close: function( event ) {
-		if ( this.menu.element.is( ":visible" ) ) {
-			this.menu.element.hide();
-			this.menu.blur();
-			this.isNewMenu = true;
-			this._trigger( "close", event );
-		}
-	},
-
-	_change: function( event ) {
-		if ( this.previous !== this._value() ) {
-			this._trigger( "change", event, { item: this.selectedItem } );
-		}
-	},
-
-	_normalize: function( items ) {
-		// assume all items have the right format when the first item is complete
-		if ( items.length && items[ 0 ].label && items[ 0 ].value ) {
-			return items;
-		}
-		return $.map( items, function( item ) {
-			if ( typeof item === "string" ) {
-				return {
-					label: item,
-					value: item
-				};
-			}
-			return $.extend( {}, item, {
-				label: item.label || item.value,
-				value: item.value || item.label
-			});
-		});
-	},
-
-	_suggest: function( items ) {
-		var ul = this.menu.element.empty();
-		this._renderMenu( ul, items );
-		this.isNewMenu = true;
-		this.menu.refresh();
-
-		// size and position menu
-		ul.show();
-		this._resizeMenu();
-		ul.position( $.extend({
-			of: this.element
-		}, this.options.position ) );
-
-		if ( this.options.autoFocus ) {
-			this.menu.next();
-		}
-	},
-
-	_resizeMenu: function() {
-		var ul = this.menu.element;
-		ul.outerWidth( Math.max(
-			// Firefox wraps long text (possibly a rounding bug)
-			// so we add 1px to avoid the wrapping (#7513)
-			ul.width( "" ).outerWidth() + 1,
-			this.element.outerWidth()
-		) );
-	},
-
-	_renderMenu: function( ul, items ) {
-		var that = this;
-		$.each( items, function( index, item ) {
-			that._renderItemData( ul, item );
-		});
-	},
-
-	_renderItemData: function( ul, item ) {
-		return this._renderItem( ul, item ).data( "ui-autocomplete-item", item );
-	},
-
-	_renderItem: function( ul, item ) {
-		return $( "<li>" ).text( item.label ).appendTo( ul );
-	},
-
-	_move: function( direction, event ) {
-		if ( !this.menu.element.is( ":visible" ) ) {
-			this.search( null, event );
-			return;
-		}
-		if ( this.menu.isFirstItem() && /^previous/.test( direction ) ||
-				this.menu.isLastItem() && /^next/.test( direction ) ) {
-
-			if ( !this.isMultiLine ) {
-				this._value( this.term );
-			}
-
-			this.menu.blur();
-			return;
-		}
-		this.menu[ direction ]( event );
-	},
-
-	widget: function() {
-		return this.menu.element;
-	},
-
-	_value: function() {
-		return this.valueMethod.apply( this.element, arguments );
-	},
-
-	_keyEvent: function( keyEvent, event ) {
-		if ( !this.isMultiLine || this.menu.element.is( ":visible" ) ) {
-			this._move( keyEvent, event );
-
-			// prevents moving cursor to beginning/end of the text field in some browsers
-			event.preventDefault();
-		}
-	}
-});
-
-$.extend( $.ui.autocomplete, {
-	escapeRegex: function( value ) {
-		return value.replace( /[\-\[\]{}()*+?.,\\\^$|#\s]/g, "\\$&" );
-	},
-	filter: function( array, term ) {
-		var matcher = new RegExp( $.ui.autocomplete.escapeRegex( term ), "i" );
-		return $.grep( array, function( value ) {
-			return matcher.test( value.label || value.value || value );
-		});
-	}
-});
-
-// live region extension, adding a `messages` option
-// NOTE: This is an experimental API. We are still investigating
-// a full solution for string manipulation and internationalization.
-$.widget( "ui.autocomplete", $.ui.autocomplete, {
-	options: {
-		messages: {
-			noResults: "No search results.",
-			results: function( amount ) {
-				return amount + ( amount > 1 ? " results are" : " result is" ) +
-					" available, use up and down arrow keys to navigate.";
-			}
-		}
-	},
-
-	__response: function( content ) {
-		var message;
-		this._superApply( arguments );
-		if ( this.options.disabled || this.cancelSearch ) {
-			return;
-		}
-		if ( content && content.length ) {
-			message = this.options.messages.results( content.length );
-		} else {
-			message = this.options.messages.noResults;
-		}
-		this.liveRegion.children().hide();
-		$( "<div>" ).text( message ).appendTo( this.liveRegion );
-	}
-});
-
-return $.ui.autocomplete;
-
-}));
diff --git a/#pma/js/jquery/src/jquery-ui/button.js b/#pma/js/jquery/src/jquery-ui/button.js
deleted file mode 100644
index 171b6791..00000000
--- a/#pma/js/jquery/src/jquery-ui/button.js
+++ /dev/null
@@ -1,411 +0,0 @@
-/*!
- * jQuery UI Button 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/button/
- */
-(function( factory ) {
-	if ( typeof define === "function" && define.amd ) {
-
-		// AMD. Register as an anonymous module.
-		define([
-			"jquery",
-			"./core",
-			"./widget"
-		], factory );
-	} else {
-
-		// Browser globals
-		factory( jQuery );
-	}
-}(function( $ ) {
-
-var lastActive,
-	baseClasses = "ui-button ui-widget ui-state-default ui-corner-all",
-	typeClasses = "ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary ui-button-text-only",
-	formResetHandler = function() {
-		var form = $( this );
-		setTimeout(function() {
-			form.find( ":ui-button" ).button( "refresh" );
-		}, 1 );
-	},
-	radioGroup = function( radio ) {
-		var name = radio.name,
-			form = radio.form,
-			radios = $( [] );
-		if ( name ) {
-			name = name.replace( /'/g, "\\'" );
-			if ( form ) {
-				radios = $( form ).find( "[name='" + name + "'][type=radio]" );
-			} else {
-				radios = $( "[name='" + name + "'][type=radio]", radio.ownerDocument )
-					.filter(function() {
-						return !this.form;
-					});
-			}
-		}
-		return radios;
-	};
-
-$.widget( "ui.button", {
-	version: "1.11.4",
-	defaultElement: "<button>",
-	options: {
-		disabled: null,
-		text: true,
-		label: null,
-		icons: {
-			primary: null,
-			secondary: null
-		}
-	},
-	_create: function() {
-		this.element.closest( "form" )
-			.unbind( "reset" + this.eventNamespace )
-			.bind( "reset" + this.eventNamespace, formResetHandler );
-
-		if ( typeof this.options.disabled !== "boolean" ) {
-			this.options.disabled = !!this.element.prop( "disabled" );
-		} else {
-			this.element.prop( "disabled", this.options.disabled );
-		}
-
-		this._determineButtonType();
-		this.hasTitle = !!this.buttonElement.attr( "title" );
-
-		var that = this,
-			options = this.options,
-			toggleButton = this.type === "checkbox" || this.type === "radio",
-			activeClass = !toggleButton ? "ui-state-active" : "";
-
-		if ( options.label === null ) {
-			options.label = (this.type === "input" ? this.buttonElement.val() : this.buttonElement.html());
-		}
-
-		this._hoverable( this.buttonElement );
-
-		this.buttonElement
-			.addClass( baseClasses )
-			.attr( "role", "button" )
-			.bind( "mouseenter" + this.eventNamespace, function() {
-				if ( options.disabled ) {
-					return;
-				}
-				if ( this === lastActive ) {
-					$( this ).addClass( "ui-state-active" );
-				}
-			})
-			.bind( "mouseleave" + this.eventNamespace, function() {
-				if ( options.disabled ) {
-					return;
-				}
-				$( this ).removeClass( activeClass );
-			})
-			.bind( "click" + this.eventNamespace, function( event ) {
-				if ( options.disabled ) {
-					event.preventDefault();
-					event.stopImmediatePropagation();
-				}
-			});
-
-		// Can't use _focusable() because the element that receives focus
-		// and the element that gets the ui-state-focus class are different
-		this._on({
-			focus: function() {
-				this.buttonElement.addClass( "ui-state-focus" );
-			},
-			blur: function() {
-				this.buttonElement.removeClass( "ui-state-focus" );
-			}
-		});
-
-		if ( toggleButton ) {
-			this.element.bind( "change" + this.eventNamespace, function() {
-				that.refresh();
-			});
-		}
-
-		if ( this.type === "checkbox" ) {
-			this.buttonElement.bind( "click" + this.eventNamespace, function() {
-				if ( options.disabled ) {
-					return false;
-				}
-			});
-		} else if ( this.type === "radio" ) {
-			this.buttonElement.bind( "click" + this.eventNamespace, function() {
-				if ( options.disabled ) {
-					return false;
-				}
-				$( this ).addClass( "ui-state-active" );
-				that.buttonElement.attr( "aria-pressed", "true" );
-
-				var radio = that.element[ 0 ];
-				radioGroup( radio )
-					.not( radio )
-					.map(function() {
-						return $( this ).button( "widget" )[ 0 ];
-					})
-					.removeClass( "ui-state-active" )
-					.attr( "aria-pressed", "false" );
-			});
-		} else {
-			this.buttonElement
-				.bind( "mousedown" + this.eventNamespace, function() {
-					if ( options.disabled ) {
-						return false;
-					}
-					$( this ).addClass( "ui-state-active" );
-					lastActive = this;
-					that.document.one( "mouseup", function() {
-						lastActive = null;
-					});
-				})
-				.bind( "mouseup" + this.eventNamespace, function() {
-					if ( options.disabled ) {
-						return false;
-					}
-					$( this ).removeClass( "ui-state-active" );
-				})
-				.bind( "keydown" + this.eventNamespace, function(event) {
-					if ( options.disabled ) {
-						return false;
-					}
-					if ( event.keyCode === $.ui.keyCode.SPACE || event.keyCode === $.ui.keyCode.ENTER ) {
-						$( this ).addClass( "ui-state-active" );
-					}
-				})
-				// see #8559, we bind to blur here in case the button element loses
-				// focus between keydown and keyup, it would be left in an "active" state
-				.bind( "keyup" + this.eventNamespace + " blur" + this.eventNamespace, function() {
-					$( this ).removeClass( "ui-state-active" );
-				});
-
-			if ( this.buttonElement.is("a") ) {
-				this.buttonElement.keyup(function(event) {
-					if ( event.keyCode === $.ui.keyCode.SPACE ) {
-						// TODO pass through original event correctly (just as 2nd argument doesn't work)
-						$( this ).click();
-					}
-				});
-			}
-		}
-
-		this._setOption( "disabled", options.disabled );
-		this._resetButton();
-	},
-
-	_determineButtonType: function() {
-		var ancestor, labelSelector, checked;
-
-		if ( this.element.is("[type=checkbox]") ) {
-			this.type = "checkbox";
-		} else if ( this.element.is("[type=radio]") ) {
-			this.type = "radio";
-		} else if ( this.element.is("input") ) {
-			this.type = "input";
-		} else {
-			this.type = "button";
-		}
-
-		if ( this.type === "checkbox" || this.type === "radio" ) {
-			// we don't search against the document in case the element
-			// is disconnected from the DOM
-			ancestor = this.element.parents().last();
-			labelSelector = "label[for='" + this.element.attr("id") + "']";
-			this.buttonElement = ancestor.find( labelSelector );
-			if ( !this.buttonElement.length ) {
-				ancestor = ancestor.length ? ancestor.siblings() : this.element.siblings();
-				this.buttonElement = ancestor.filter( labelSelector );
-				if ( !this.buttonElement.length ) {
-					this.buttonElement = ancestor.find( labelSelector );
-				}
-			}
-			this.element.addClass( "ui-helper-hidden-accessible" );
-
-			checked = this.element.is( ":checked" );
-			if ( checked ) {
-				this.buttonElement.addClass( "ui-state-active" );
-			}
-			this.buttonElement.prop( "aria-pressed", checked );
-		} else {
-			this.buttonElement = this.element;
-		}
-	},
-
-	widget: function() {
-		return this.buttonElement;
-	},
-
-	_destroy: function() {
-		this.element
-			.removeClass( "ui-helper-hidden-accessible" );
-		this.buttonElement
-			.removeClass( baseClasses + " ui-state-active " + typeClasses )
-			.removeAttr( "role" )
-			.removeAttr( "aria-pressed" )
-			.html( this.buttonElement.find(".ui-button-text").html() );
-
-		if ( !this.hasTitle ) {
-			this.buttonElement.removeAttr( "title" );
-		}
-	},
-
-	_setOption: function( key, value ) {
-		this._super( key, value );
-		if ( key === "disabled" ) {
-			this.widget().toggleClass( "ui-state-disabled", !!value );
-			this.element.prop( "disabled", !!value );
-			if ( value ) {
-				if ( this.type === "checkbox" || this.type === "radio" ) {
-					this.buttonElement.removeClass( "ui-state-focus" );
-				} else {
-					this.buttonElement.removeClass( "ui-state-focus ui-state-active" );
-				}
-			}
-			return;
-		}
-		this._resetButton();
-	},
-
-	refresh: function() {
-		//See #8237 & #8828
-		var isDisabled = this.element.is( "input, button" ) ? this.element.is( ":disabled" ) : this.element.hasClass( "ui-button-disabled" );
-
-		if ( isDisabled !== this.options.disabled ) {
-			this._setOption( "disabled", isDisabled );
-		}
-		if ( this.type === "radio" ) {
-			radioGroup( this.element[0] ).each(function() {
-				if ( $( this ).is( ":checked" ) ) {
-					$( this ).button( "widget" )
-						.addClass( "ui-state-active" )
-						.attr( "aria-pressed", "true" );
-				} else {
-					$( this ).button( "widget" )
-						.removeClass( "ui-state-active" )
-						.attr( "aria-pressed", "false" );
-				}
-			});
-		} else if ( this.type === "checkbox" ) {
-			if ( this.element.is( ":checked" ) ) {
-				this.buttonElement
-					.addClass( "ui-state-active" )
-					.attr( "aria-pressed", "true" );
-			} else {
-				this.buttonElement
-					.removeClass( "ui-state-active" )
-					.attr( "aria-pressed", "false" );
-			}
-		}
-	},
-
-	_resetButton: function() {
-		if ( this.type === "input" ) {
-			if ( this.options.label ) {
-				this.element.val( this.options.label );
-			}
-			return;
-		}
-		var buttonElement = this.buttonElement.removeClass( typeClasses ),
-			buttonText = $( "<span></span>", this.document[0] )
-				.addClass( "ui-button-text" )
-				.html( this.options.label )
-				.appendTo( buttonElement.empty() )
-				.text(),
-			icons = this.options.icons,
-			multipleIcons = icons.primary && icons.secondary,
-			buttonClasses = [];
-
-		if ( icons.primary || icons.secondary ) {
-			if ( this.options.text ) {
-				buttonClasses.push( "ui-button-text-icon" + ( multipleIcons ? "s" : ( icons.primary ? "-primary" : "-secondary" ) ) );
-			}
-
-			if ( icons.primary ) {
-				buttonElement.prepend( "<span class='ui-button-icon-primary ui-icon " + icons.primary + "'></span>" );
-			}
-
-			if ( icons.secondary ) {
-				buttonElement.append( "<span class='ui-button-icon-secondary ui-icon " + icons.secondary + "'></span>" );
-			}
-
-			if ( !this.options.text ) {
-				buttonClasses.push( multipleIcons ? "ui-button-icons-only" : "ui-button-icon-only" );
-
-				if ( !this.hasTitle ) {
-					buttonElement.attr( "title", $.trim( buttonText ) );
-				}
-			}
-		} else {
-			buttonClasses.push( "ui-button-text-only" );
-		}
-		buttonElement.addClass( buttonClasses.join( " " ) );
-	}
-});
-
-$.widget( "ui.buttonset", {
-	version: "1.11.4",
-	options: {
-		items: "button, input[type=button], input[type=submit], input[type=reset], input[type=checkbox], input[type=radio], a, :data(ui-button)"
-	},
-
-	_create: function() {
-		this.element.addClass( "ui-buttonset" );
-	},
-
-	_init: function() {
-		this.refresh();
-	},
-
-	_setOption: function( key, value ) {
-		if ( key === "disabled" ) {
-			this.buttons.button( "option", key, value );
-		}
-
-		this._super( key, value );
-	},
-
-	refresh: function() {
-		var rtl = this.element.css( "direction" ) === "rtl",
-			allButtons = this.element.find( this.options.items ),
-			existingButtons = allButtons.filter( ":ui-button" );
-
-		// Initialize new buttons
-		allButtons.not( ":ui-button" ).button();
-
-		// Refresh existing buttons
-		existingButtons.button( "refresh" );
-
-		this.buttons = allButtons
-			.map(function() {
-				return $( this ).button( "widget" )[ 0 ];
-			})
-				.removeClass( "ui-corner-all ui-corner-left ui-corner-right" )
-				.filter( ":first" )
-					.addClass( rtl ? "ui-corner-right" : "ui-corner-left" )
-				.end()
-				.filter( ":last" )
-					.addClass( rtl ? "ui-corner-left" : "ui-corner-right" )
-				.end()
-			.end();
-	},
-
-	_destroy: function() {
-		this.element.removeClass( "ui-buttonset" );
-		this.buttons
-			.map(function() {
-				return $( this ).button( "widget" )[ 0 ];
-			})
-				.removeClass( "ui-corner-left ui-corner-right" )
-			.end()
-			.button( "destroy" );
-	}
-});
-
-return $.ui.button;
-
-}));
diff --git a/#pma/js/jquery/src/jquery-ui/core.js b/#pma/js/jquery/src/jquery-ui/core.js
deleted file mode 100644
index 46971288..00000000
--- a/#pma/js/jquery/src/jquery-ui/core.js
+++ /dev/null
@@ -1,304 +0,0 @@
-/*!
- * jQuery UI Core 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/category/ui-core/
- */
-(function( factory ) {
-	if ( typeof define === "function" && define.amd ) {
-
-		// AMD. Register as an anonymous module.
-		define( [ "jquery" ], factory );
-	} else {
-
-		// Browser globals
-		factory( jQuery );
-	}
-}(function( $ ) {
-
-// $.ui might exist from components with no dependencies, e.g., $.ui.position
-$.ui = $.ui || {};
-
-$.extend( $.ui, {
-	version: "1.11.4",
-
-	keyCode: {
-		BACKSPACE: 8,
-		COMMA: 188,
-		DELETE: 46,
-		DOWN: 40,
-		END: 35,
-		ENTER: 13,
-		ESCAPE: 27,
-		HOME: 36,
-		LEFT: 37,
-		PAGE_DOWN: 34,
-		PAGE_UP: 33,
-		PERIOD: 190,
-		RIGHT: 39,
-		SPACE: 32,
-		TAB: 9,
-		UP: 38
-	}
-});
-
-// plugins
-$.fn.extend({
-	scrollParent: function( includeHidden ) {
-		var position = this.css( "position" ),
-			excludeStaticParent = position === "absolute",
-			overflowRegex = includeHidden ? /(auto|scroll|hidden)/ : /(auto|scroll)/,
-			scrollParent = this.parents().filter( function() {
-				var parent = $( this );
-				if ( excludeStaticParent && parent.css( "position" ) === "static" ) {
-					return false;
-				}
-				return overflowRegex.test( parent.css( "overflow" ) + parent.css( "overflow-y" ) + parent.css( "overflow-x" ) );
-			}).eq( 0 );
-
-		return position === "fixed" || !scrollParent.length ? $( this[ 0 ].ownerDocument || document ) : scrollParent;
-	},
-
-	uniqueId: (function() {
-		var uuid = 0;
-
-		return function() {
-			return this.each(function() {
-				if ( !this.id ) {
-					this.id = "ui-id-" + ( ++uuid );
-				}
-			});
-		};
-	})(),
-
-	removeUniqueId: function() {
-		return this.each(function() {
-			if ( /^ui-id-\d+$/.test( this.id ) ) {
-				$( this ).removeAttr( "id" );
-			}
-		});
-	}
-});
-
-// selectors
-function focusable( element, isTabIndexNotNaN ) {
-	var map, mapName, img,
-		nodeName = element.nodeName.toLowerCase();
-	if ( "area" === nodeName ) {
-		map = element.parentNode;
-		mapName = map.name;
-		if ( !element.href || !mapName || map.nodeName.toLowerCase() !== "map" ) {
-			return false;
-		}
-		img = $( "img[usemap='#" + mapName + "']" )[ 0 ];
-		return !!img && visible( img );
-	}
-	return ( /^(input|select|textarea|button|object)$/.test( nodeName ) ?
-		!element.disabled :
-		"a" === nodeName ?
-			element.href || isTabIndexNotNaN :
-			isTabIndexNotNaN) &&
-		// the element and all of its ancestors must be visible
-		visible( element );
-}
-
-function visible( element ) {
-	return $.expr.filters.visible( element ) &&
-		!$( element ).parents().addBack().filter(function() {
-			return $.css( this, "visibility" ) === "hidden";
-		}).length;
-}
-
-$.extend( $.expr[ ":" ], {
-	data: $.expr.createPseudo ?
-		$.expr.createPseudo(function( dataName ) {
-			return function( elem ) {
-				return !!$.data( elem, dataName );
-			};
-		}) :
-		// support: jQuery <1.8
-		function( elem, i, match ) {
-			return !!$.data( elem, match[ 3 ] );
-		},
-
-	focusable: function( element ) {
-		return focusable( element, !isNaN( $.attr( element, "tabindex" ) ) );
-	},
-
-	tabbable: function( element ) {
-		var tabIndex = $.attr( element, "tabindex" ),
-			isTabIndexNaN = isNaN( tabIndex );
-		return ( isTabIndexNaN || tabIndex >= 0 ) && focusable( element, !isTabIndexNaN );
-	}
-});
-
-// support: jQuery <1.8
-if ( !$( "<a>" ).outerWidth( 1 ).jquery ) {
-	$.each( [ "Width", "Height" ], function( i, name ) {
-		var side = name === "Width" ? [ "Left", "Right" ] : [ "Top", "Bottom" ],
-			type = name.toLowerCase(),
-			orig = {
-				innerWidth: $.fn.innerWidth,
-				innerHeight: $.fn.innerHeight,
-				outerWidth: $.fn.outerWidth,
-				outerHeight: $.fn.outerHeight
-			};
-
-		function reduce( elem, size, border, margin ) {
-			$.each( side, function() {
-				size -= parseFloat( $.css( elem, "padding" + this ) ) || 0;
-				if ( border ) {
-					size -= parseFloat( $.css( elem, "border" + this + "Width" ) ) || 0;
-				}
-				if ( margin ) {
-					size -= parseFloat( $.css( elem, "margin" + this ) ) || 0;
-				}
-			});
-			return size;
-		}
-
-		$.fn[ "inner" + name ] = function( size ) {
-			if ( size === undefined ) {
-				return orig[ "inner" + name ].call( this );
-			}
-
-			return this.each(function() {
-				$( this ).css( type, reduce( this, size ) + "px" );
-			});
-		};
-
-		$.fn[ "outer" + name] = function( size, margin ) {
-			if ( typeof size !== "number" ) {
-				return orig[ "outer" + name ].call( this, size );
-			}
-
-			return this.each(function() {
-				$( this).css( type, reduce( this, size, true, margin ) + "px" );
-			});
-		};
-	});
-}
-
-// support: jQuery <1.8
-if ( !$.fn.addBack ) {
-	$.fn.addBack = function( selector ) {
-		return this.add( selector == null ?
-			this.prevObject : this.prevObject.filter( selector )
-		);
-	};
-}
-
-// support: jQuery 1.6.1, 1.6.2 (http://bugs.jquery.com/ticket/9413)
-if ( $( "<a>" ).data( "a-b", "a" ).removeData( "a-b" ).data( "a-b" ) ) {
-	$.fn.removeData = (function( removeData ) {
-		return function( key ) {
-			if ( arguments.length ) {
-				return removeData.call( this, $.camelCase( key ) );
-			} else {
-				return removeData.call( this );
-			}
-		};
-	})( $.fn.removeData );
-}
-
-// deprecated
-$.ui.ie = !!/msie [\w.]+/.exec( navigator.userAgent.toLowerCase() );
-
-$.fn.extend({
-	focus: (function( orig ) {
-		return function( delay, fn ) {
-			return typeof delay === "number" ?
-				this.each(function() {
-					var elem = this;
-					setTimeout(function() {
-						$( elem ).focus();
-						if ( fn ) {
-							fn.call( elem );
-						}
-					}, delay );
-				}) :
-				orig.apply( this, arguments );
-		};
-	})( $.fn.focus ),
-
-	disableSelection: (function() {
-		var eventType = "onselectstart" in document.createElement( "div" ) ?
-			"selectstart" :
-			"mousedown";
-
-		return function() {
-			return this.bind( eventType + ".ui-disableSelection", function( event ) {
-				event.preventDefault();
-			});
-		};
-	})(),
-
-	enableSelection: function() {
-		return this.unbind( ".ui-disableSelection" );
-	},
-
-	zIndex: function( zIndex ) {
-		if ( zIndex !== undefined ) {
-			return this.css( "zIndex", zIndex );
-		}
-
-		if ( this.length ) {
-			var elem = $( this[ 0 ] ), position, value;
-			while ( elem.length && elem[ 0 ] !== document ) {
-				// Ignore z-index if position is set to a value where z-index is ignored by the browser
-				// This makes behavior of this function consistent across browsers
-				// WebKit always returns auto if the element is positioned
-				position = elem.css( "position" );
-				if ( position === "absolute" || position === "relative" || position === "fixed" ) {
-					// IE returns 0 when zIndex is not specified
-					// other browsers return a string
-					// we ignore the case of nested elements with an explicit value of 0
-					// <div style="z-index: -10;"><div style="z-index: 0;"></div></div>
-					value = parseInt( elem.css( "zIndex" ), 10 );
-					if ( !isNaN( value ) && value !== 0 ) {
-						return value;
-					}
-				}
-				elem = elem.parent();
-			}
-		}
-
-		return 0;
-	}
-});
-
-// $.ui.plugin is deprecated. Use $.widget() extensions instead.
-$.ui.plugin = {
-	add: function( module, option, set ) {
-		var i,
-			proto = $.ui[ module ].prototype;
-		for ( i in set ) {
-			proto.plugins[ i ] = proto.plugins[ i ] || [];
-			proto.plugins[ i ].push( [ option, set[ i ] ] );
-		}
-	},
-	call: function( instance, name, args, allowDisconnected ) {
-		var i,
-			set = instance.plugins[ name ];
-
-		if ( !set ) {
-			return;
-		}
-
-		if ( !allowDisconnected && ( !instance.element[ 0 ].parentNode || instance.element[ 0 ].parentNode.nodeType === 11 ) ) {
-			return;
-		}
-
-		for ( i = 0; i < set.length; i++ ) {
-			if ( instance.options[ set[ i ][ 0 ] ] ) {
-				set[ i ][ 1 ].apply( instance.element, args );
-			}
-		}
-	}
-};
-
-}));
diff --git a/#pma/js/jquery/src/jquery-ui/datepicker.js b/#pma/js/jquery/src/jquery-ui/datepicker.js
deleted file mode 100644
index 855de978..00000000
--- a/#pma/js/jquery/src/jquery-ui/datepicker.js
+++ /dev/null
@@ -1,2084 +0,0 @@
-/*!
- * jQuery UI Datepicker 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/datepicker/
- */
-(function( factory ) {
-	if ( typeof define === "function" && define.amd ) {
-
-		// AMD. Register as an anonymous module.
-		define([
-			"jquery",
-			"./core"
-		], factory );
-	} else {
-
-		// Browser globals
-		factory( jQuery );
-	}
-}(function( $ ) {
-
-$.extend($.ui, { datepicker: { version: "1.11.4" } });
-
-var datepicker_instActive;
-
-function datepicker_getZindex( elem ) {
-	var position, value;
-	while ( elem.length && elem[ 0 ] !== document ) {
-		// Ignore z-index if position is set to a value where z-index is ignored by the browser
-		// This makes behavior of this function consistent across browsers
-		// WebKit always returns auto if the element is positioned
-		position = elem.css( "position" );
-		if ( position === "absolute" || position === "relative" || position === "fixed" ) {
-			// IE returns 0 when zIndex is not specified
-			// other browsers return a string
-			// we ignore the case of nested elements with an explicit value of 0
-			// <div style="z-index: -10;"><div style="z-index: 0;"></div></div>
-			value = parseInt( elem.css( "zIndex" ), 10 );
-			if ( !isNaN( value ) && value !== 0 ) {
-				return value;
-			}
-		}
-		elem = elem.parent();
-	}
-
-	return 0;
-}
-/* Date picker manager.
-   Use the singleton instance of this class, $.datepicker, to interact with the date picker.
-   Settings for (groups of) date pickers are maintained in an instance object,
-   allowing multiple different settings on the same page. */
-
-function Datepicker() {
-	this._curInst = null; // The current instance in use
-	this._keyEvent = false; // If the last event was a key event
-	this._disabledInputs = []; // List of date picker inputs that have been disabled
-	this._datepickerShowing = false; // True if the popup picker is showing , false if not
-	this._inDialog = false; // True if showing within a "dialog", false if not
-	this._mainDivId = "ui-datepicker-div"; // The ID of the main datepicker division
-	this._inlineClass = "ui-datepicker-inline"; // The name of the inline marker class
-	this._appendClass = "ui-datepicker-append"; // The name of the append marker class
-	this._triggerClass = "ui-datepicker-trigger"; // The name of the trigger marker class
-	this._dialogClass = "ui-datepicker-dialog"; // The name of the dialog marker class
-	this._disableClass = "ui-datepicker-disabled"; // The name of the disabled covering marker class
-	this._unselectableClass = "ui-datepicker-unselectable"; // The name of the unselectable cell marker class
-	this._currentClass = "ui-datepicker-current-day"; // The name of the current day marker class
-	this._dayOverClass = "ui-datepicker-days-cell-over"; // The name of the day hover marker class
-	this.regional = []; // Available regional settings, indexed by language code
-	this.regional[""] = { // Default regional settings
-		closeText: "Done", // Display text for close link
-		prevText: "Prev", // Display text for previous month link
-		nextText: "Next", // Display text for next month link
-		currentText: "Today", // Display text for current month link
-		monthNames: ["January","February","March","April","May","June",
-			"July","August","September","October","November","December"], // Names of months for drop-down and formatting
-		monthNamesShort: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"], // For formatting
-		dayNames: ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"], // For formatting
-		dayNamesShort: ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"], // For formatting
-		dayNamesMin: ["Su","Mo","Tu","We","Th","Fr","Sa"], // Column headings for days starting at Sunday
-		weekHeader: "Wk", // Column header for week of the year
-		dateFormat: "mm/dd/yy", // See format options on parseDate
-		firstDay: 0, // The first day of the week, Sun = 0, Mon = 1, ...
-		isRTL: false, // True if right-to-left language, false if left-to-right
-		showMonthAfterYear: false, // True if the year select precedes month, false for month then year
-		yearSuffix: "" // Additional text to append to the year in the month headers
-	};
-	this._defaults = { // Global defaults for all the date picker instances
-		showOn: "focus", // "focus" for popup on focus,
-			// "button" for trigger button, or "both" for either
-		showAnim: "fadeIn", // Name of jQuery animation for popup
-		showOptions: {}, // Options for enhanced animations
-		defaultDate: null, // Used when field is blank: actual date,
-			// +/-number for offset from today, null for today
-		appendText: "", // Display text following the input box, e.g. showing the format
-		buttonText: "...", // Text for trigger button
-		buttonImage: "", // URL for trigger button image
-		buttonImageOnly: false, // True if the image appears alone, false if it appears on a button
-		hideIfNoPrevNext: false, // True to hide next/previous month links
-			// if not applicable, false to just disable them
-		navigationAsDateFormat: false, // True if date formatting applied to prev/today/next links
-		gotoCurrent: false, // True if today link goes back to current selection instead
-		changeMonth: false, // True if month can be selected directly, false if only prev/next
-		changeYear: false, // True if year can be selected directly, false if only prev/next
-		yearRange: "c-10:c+10", // Range of years to display in drop-down,
-			// either relative to today's year (-nn:+nn), relative to currently displayed year
-			// (c-nn:c+nn), absolute (nnnn:nnnn), or a combination of the above (nnnn:-n)
-		showOtherMonths: false, // True to show dates in other months, false to leave blank
-		selectOtherMonths: false, // True to allow selection of dates in other months, false for unselectable
-		showWeek: false, // True to show week of the year, false to not show it
-		calculateWeek: this.iso8601Week, // How to calculate the week of the year,
-			// takes a Date and returns the number of the week for it
-		shortYearCutoff: "+10", // Short year values < this are in the current century,
-			// > this are in the previous century,
-			// string value starting with "+" for current year + value
-		minDate: null, // The earliest selectable date, or null for no limit
-		maxDate: null, // The latest selectable date, or null for no limit
-		duration: "fast", // Duration of display/closure
-		beforeShowDay: null, // Function that takes a date and returns an array with
-			// [0] = true if selectable, false if not, [1] = custom CSS class name(s) or "",
-			// [2] = cell title (optional), e.g. $.datepicker.noWeekends
-		beforeShow: null, // Function that takes an input field and
-			// returns a set of custom settings for the date picker
-		onSelect: null, // Define a callback function when a date is selected
-		onChangeMonthYear: null, // Define a callback function when the month or year is changed
-		onClose: null, // Define a callback function when the datepicker is closed
-		numberOfMonths: 1, // Number of months to show at a time
-		showCurrentAtPos: 0, // The position in multipe months at which to show the current month (starting at 0)
-		stepMonths: 1, // Number of months to step back/forward
-		stepBigMonths: 12, // Number of months to step back/forward for the big links
-		altField: "", // Selector for an alternate field to store selected dates into
-		altFormat: "", // The date format to use for the alternate field
-		constrainInput: true, // The input is constrained by the current date format
-		showButtonPanel: false, // True to show button panel, false to not show it
-		autoSize: false, // True to size the input for the date format, false to leave as is
-		disabled: false // The initial disabled state
-	};
-	$.extend(this._defaults, this.regional[""]);
-	this.regional.en = $.extend( true, {}, this.regional[ "" ]);
-	this.regional[ "en-US" ] = $.extend( true, {}, this.regional.en );
-	this.dpDiv = datepicker_bindHover($("<div id='" + this._mainDivId + "' class='ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>"));
-}
-
-$.extend(Datepicker.prototype, {
-	/* Class name added to elements to indicate already configured with a date picker. */
-	markerClassName: "hasDatepicker",
-
-	//Keep track of the maximum number of rows displayed (see #7043)
-	maxRows: 4,
-
-	// TODO rename to "widget" when switching to widget factory
-	_widgetDatepicker: function() {
-		return this.dpDiv;
-	},
-
-	/* Override the default settings for all instances of the date picker.
-	 * @param  settings  object - the new settings to use as defaults (anonymous object)
-	 * @return the manager object
-	 */
-	setDefaults: function(settings) {
-		datepicker_extendRemove(this._defaults, settings || {});
-		return this;
-	},
-
-	/* Attach the date picker to a jQuery selection.
-	 * @param  target	element - the target input field or division or span
-	 * @param  settings  object - the new settings to use for this date picker instance (anonymous)
-	 */
-	_attachDatepicker: function(target, settings) {
-		var nodeName, inline, inst;
-		nodeName = target.nodeName.toLowerCase();
-		inline = (nodeName === "div" || nodeName === "span");
-		if (!target.id) {
-			this.uuid += 1;
-			target.id = "dp" + this.uuid;
-		}
-		inst = this._newInst($(target), inline);
-		inst.settings = $.extend({}, settings || {});
-		if (nodeName === "input") {
-			this._connectDatepicker(target, inst);
-		} else if (inline) {
-			this._inlineDatepicker(target, inst);
-		}
-	},
-
-	/* Create a new instance object. */
-	_newInst: function(target, inline) {
-		var id = target[0].id.replace(/([^A-Za-z0-9_\-])/g, "\\\\$1"); // escape jQuery meta chars
-		return {id: id, input: target, // associated target
-			selectedDay: 0, selectedMonth: 0, selectedYear: 0, // current selection
-			drawMonth: 0, drawYear: 0, // month being drawn
-			inline: inline, // is datepicker inline or not
-			dpDiv: (!inline ? this.dpDiv : // presentation div
-			datepicker_bindHover($("<div class='" + this._inlineClass + " ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>")))};
-	},
-
-	/* Attach the date picker to an input field. */
-	_connectDatepicker: function(target, inst) {
-		var input = $(target);
-		inst.append = $([]);
-		inst.trigger = $([]);
-		if (input.hasClass(this.markerClassName)) {
-			return;
-		}
-		this._attachments(input, inst);
-		input.addClass(this.markerClassName).keydown(this._doKeyDown).
-			keypress(this._doKeyPress).keyup(this._doKeyUp);
-		this._autoSize(inst);
-		$.data(target, "datepicker", inst);
-		//If disabled option is true, disable the datepicker once it has been attached to the input (see ticket #5665)
-		if( inst.settings.disabled ) {
-			this._disableDatepicker( target );
-		}
-	},
-
-	/* Make attachments based on settings. */
-	_attachments: function(input, inst) {
-		var showOn, buttonText, buttonImage,
-			appendText = this._get(inst, "appendText"),
-			isRTL = this._get(inst, "isRTL");
-
-		if (inst.append) {
-			inst.append.remove();
-		}
-		if (appendText) {
-			inst.append = $("<span class='" + this._appendClass + "'>" + appendText + "</span>");
-			input[isRTL ? "before" : "after"](inst.append);
-		}
-
-		input.unbind("focus", this._showDatepicker);
-
-		if (inst.trigger) {
-			inst.trigger.remove();
-		}
-
-		showOn = this._get(inst, "showOn");
-		if (showOn === "focus" || showOn === "both") { // pop-up date picker when in the marked field
-			input.focus(this._showDatepicker);
-		}
-		if (showOn === "button" || showOn === "both") { // pop-up date picker when button clicked
-			buttonText = this._get(inst, "buttonText");
-			buttonImage = this._get(inst, "buttonImage");
-			inst.trigger = $(this._get(inst, "buttonImageOnly") ?
-				$("<img/>").addClass(this._triggerClass).
-					attr({ src: buttonImage, alt: buttonText, title: buttonText }) :
-				$("<button type='button'></button>").addClass(this._triggerClass).
-					html(!buttonImage ? buttonText : $("<img/>").attr(
-					{ src:buttonImage, alt:buttonText, title:buttonText })));
-			input[isRTL ? "before" : "after"](inst.trigger);
-			inst.trigger.click(function() {
-				if ($.datepicker._datepickerShowing && $.datepicker._lastInput === input[0]) {
-					$.datepicker._hideDatepicker();
-				} else if ($.datepicker._datepickerShowing && $.datepicker._lastInput !== input[0]) {
-					$.datepicker._hideDatepicker();
-					$.datepicker._showDatepicker(input[0]);
-				} else {
-					$.datepicker._showDatepicker(input[0]);
-				}
-				return false;
-			});
-		}
-	},
-
-	/* Apply the maximum length for the date format. */
-	_autoSize: function(inst) {
-		if (this._get(inst, "autoSize") && !inst.inline) {
-			var findMax, max, maxI, i,
-				date = new Date(2009, 12 - 1, 20), // Ensure double digits
-				dateFormat = this._get(inst, "dateFormat");
-
-			if (dateFormat.match(/[DM]/)) {
-				findMax = function(names) {
-					max = 0;
-					maxI = 0;
-					for (i = 0; i < names.length; i++) {
-						if (names[i].length > max) {
-							max = names[i].length;
-							maxI = i;
-						}
-					}
-					return maxI;
-				};
-				date.setMonth(findMax(this._get(inst, (dateFormat.match(/MM/) ?
-					"monthNames" : "monthNamesShort"))));
-				date.setDate(findMax(this._get(inst, (dateFormat.match(/DD/) ?
-					"dayNames" : "dayNamesShort"))) + 20 - date.getDay());
-			}
-			inst.input.attr("size", this._formatDate(inst, date).length);
-		}
-	},
-
-	/* Attach an inline date picker to a div. */
-	_inlineDatepicker: function(target, inst) {
-		var divSpan = $(target);
-		if (divSpan.hasClass(this.markerClassName)) {
-			return;
-		}
-		divSpan.addClass(this.markerClassName).append(inst.dpDiv);
-		$.data(target, "datepicker", inst);
-		this._setDate(inst, this._getDefaultDate(inst), true);
-		this._updateDatepicker(inst);
-		this._updateAlternate(inst);
-		//If disabled option is true, disable the datepicker before showing it (see ticket #5665)
-		if( inst.settings.disabled ) {
-			this._disableDatepicker( target );
-		}
-		// Set display:block in place of inst.dpDiv.show() which won't work on disconnected elements
-		// http://bugs.jqueryui.com/ticket/7552 - A Datepicker created on a detached div has zero height
-		inst.dpDiv.css( "display", "block" );
-	},
-
-	/* Pop-up the date picker in a "dialog" box.
-	 * @param  input element - ignored
-	 * @param  date	string or Date - the initial date to display
-	 * @param  onSelect  function - the function to call when a date is selected
-	 * @param  settings  object - update the dialog date picker instance's settings (anonymous object)
-	 * @param  pos int[2] - coordinates for the dialog's position within the screen or
-	 *					event - with x/y coordinates or
-	 *					leave empty for default (screen centre)
-	 * @return the manager object
-	 */
-	_dialogDatepicker: function(input, date, onSelect, settings, pos) {
-		var id, browserWidth, browserHeight, scrollX, scrollY,
-			inst = this._dialogInst; // internal instance
-
-		if (!inst) {
-			this.uuid += 1;
-			id = "dp" + this.uuid;
-			this._dialogInput = $("<input type='text' id='" + id +
-				"' style='position: absolute; top: -100px; width: 0px;'/>");
-			this._dialogInput.keydown(this._doKeyDown);
-			$("body").append(this._dialogInput);
-			inst = this._dialogInst = this._newInst(this._dialogInput, false);
-			inst.settings = {};
-			$.data(this._dialogInput[0], "datepicker", inst);
-		}
-		datepicker_extendRemove(inst.settings, settings || {});
-		date = (date && date.constructor === Date ? this._formatDate(inst, date) : date);
-		this._dialogInput.val(date);
-
-		this._pos = (pos ? (pos.length ? pos : [pos.pageX, pos.pageY]) : null);
-		if (!this._pos) {
-			browserWidth = document.documentElement.clientWidth;
-			browserHeight = document.documentElement.clientHeight;
-			scrollX = document.documentElement.scrollLeft || document.body.scrollLeft;
-			scrollY = document.documentElement.scrollTop || document.body.scrollTop;
-			this._pos = // should use actual width/height below
-				[(browserWidth / 2) - 100 + scrollX, (browserHeight / 2) - 150 + scrollY];
-		}
-
-		// move input on screen for focus, but hidden behind dialog
-		this._dialogInput.css("left", (this._pos[0] + 20) + "px").css("top", this._pos[1] + "px");
-		inst.settings.onSelect = onSelect;
-		this._inDialog = true;
-		this.dpDiv.addClass(this._dialogClass);
-		this._showDatepicker(this._dialogInput[0]);
-		if ($.blockUI) {
-			$.blockUI(this.dpDiv);
-		}
-		$.data(this._dialogInput[0], "datepicker", inst);
-		return this;
-	},
-
-	/* Detach a datepicker from its control.
-	 * @param  target	element - the target input field or division or span
-	 */
-	_destroyDatepicker: function(target) {
-		var nodeName,
-			$target = $(target),
-			inst = $.data(target, "datepicker");
-
-		if (!$target.hasClass(this.markerClassName)) {
-			return;
-		}
-
-		nodeName = target.nodeName.toLowerCase();
-		$.removeData(target, "datepicker");
-		if (nodeName === "input") {
-			inst.append.remove();
-			inst.trigger.remove();
-			$target.removeClass(this.markerClassName).
-				unbind("focus", this._showDatepicker).
-				unbind("keydown", this._doKeyDown).
-				unbind("keypress", this._doKeyPress).
-				unbind("keyup", this._doKeyUp);
-		} else if (nodeName === "div" || nodeName === "span") {
-			$target.removeClass(this.markerClassName).empty();
-		}
-
-		if ( datepicker_instActive === inst ) {
-			datepicker_instActive = null;
-		}
-	},
-
-	/* Enable the date picker to a jQuery selection.
-	 * @param  target	element - the target input field or division or span
-	 */
-	_enableDatepicker: function(target) {
-		var nodeName, inline,
-			$target = $(target),
-			inst = $.data(target, "datepicker");
-
-		if (!$target.hasClass(this.markerClassName)) {
-			return;
-		}
-
-		nodeName = target.nodeName.toLowerCase();
-		if (nodeName === "input") {
-			target.disabled = false;
-			inst.trigger.filter("button").
-				each(function() { this.disabled = false; }).end().
-				filter("img").css({opacity: "1.0", cursor: ""});
-		} else if (nodeName === "div" || nodeName === "span") {
-			inline = $target.children("." + this._inlineClass);
-			inline.children().removeClass("ui-state-disabled");
-			inline.find("select.ui-datepicker-month, select.ui-datepicker-year").
-				prop("disabled", false);
-		}
-		this._disabledInputs = $.map(this._disabledInputs,
-			function(value) { return (value === target ? null : value); }); // delete entry
-	},
-
-	/* Disable the date picker to a jQuery selection.
-	 * @param  target	element - the target input field or division or span
-	 */
-	_disableDatepicker: function(target) {
-		var nodeName, inline,
-			$target = $(target),
-			inst = $.data(target, "datepicker");
-
-		if (!$target.hasClass(this.markerClassName)) {
-			return;
-		}
-
-		nodeName = target.nodeName.toLowerCase();
-		if (nodeName === "input") {
-			target.disabled = true;
-			inst.trigger.filter("button").
-				each(function() { this.disabled = true; }).end().
-				filter("img").css({opacity: "0.5", cursor: "default"});
-		} else if (nodeName === "div" || nodeName === "span") {
-			inline = $target.children("." + this._inlineClass);
-			inline.children().addClass("ui-state-disabled");
-			inline.find("select.ui-datepicker-month, select.ui-datepicker-year").
-				prop("disabled", true);
-		}
-		this._disabledInputs = $.map(this._disabledInputs,
-			function(value) { return (value === target ? null : value); }); // delete entry
-		this._disabledInputs[this._disabledInputs.length] = target;
-	},
-
-	/* Is the first field in a jQuery collection disabled as a datepicker?
-	 * @param  target	element - the target input field or division or span
-	 * @return boolean - true if disabled, false if enabled
-	 */
-	_isDisabledDatepicker: function(target) {
-		if (!target) {
-			return false;
-		}
-		for (var i = 0; i < this._disabledInputs.length; i++) {
-			if (this._disabledInputs[i] === target) {
-				return true;
-			}
-		}
-		return false;
-	},
-
-	/* Retrieve the instance data for the target control.
-	 * @param  target  element - the target input field or division or span
-	 * @return  object - the associated instance data
-	 * @throws  error if a jQuery problem getting data
-	 */
-	_getInst: function(target) {
-		try {
-			return $.data(target, "datepicker");
-		}
-		catch (err) {
-			throw "Missing instance data for this datepicker";
-		}
-	},
-
-	/* Update or retrieve the settings for a date picker attached to an input field or division.
-	 * @param  target  element - the target input field or division or span
-	 * @param  name	object - the new settings to update or
-	 *				string - the name of the setting to change or retrieve,
-	 *				when retrieving also "all" for all instance settings or
-	 *				"defaults" for all global defaults
-	 * @param  value   any - the new value for the setting
-	 *				(omit if above is an object or to retrieve a value)
-	 */
-	_optionDatepicker: function(target, name, value) {
-		var settings, date, minDate, maxDate,
-			inst = this._getInst(target);
-
-		if (arguments.length === 2 && typeof name === "string") {
-			return (name === "defaults" ? $.extend({}, $.datepicker._defaults) :
-				(inst ? (name === "all" ? $.extend({}, inst.settings) :
-				this._get(inst, name)) : null));
-		}
-
-		settings = name || {};
-		if (typeof name === "string") {
-			settings = {};
-			settings[name] = value;
-		}
-
-		if (inst) {
-			if (this._curInst === inst) {
-				this._hideDatepicker();
-			}
-
-			date = this._getDateDatepicker(target, true);
-			minDate = this._getMinMaxDate(inst, "min");
-			maxDate = this._getMinMaxDate(inst, "max");
-			datepicker_extendRemove(inst.settings, settings);
-			// reformat the old minDate/maxDate values if dateFormat changes and a new minDate/maxDate isn't provided
-			if (minDate !== null && settings.dateFormat !== undefined && settings.minDate === undefined) {
-				inst.settings.minDate = this._formatDate(inst, minDate);
-			}
-			if (maxDate !== null && settings.dateFormat !== undefined && settings.maxDate === undefined) {
-				inst.settings.maxDate = this._formatDate(inst, maxDate);
-			}
-			if ( "disabled" in settings ) {
-				if ( settings.disabled ) {
-					this._disableDatepicker(target);
-				} else {
-					this._enableDatepicker(target);
-				}
-			}
-			this._attachments($(target), inst);
-			this._autoSize(inst);
-			this._setDate(inst, date);
-			this._updateAlternate(inst);
-			this._updateDatepicker(inst);
-		}
-	},
-
-	// change method deprecated
-	_changeDatepicker: function(target, name, value) {
-		this._optionDatepicker(target, name, value);
-	},
-
-	/* Redraw the date picker attached to an input field or division.
-	 * @param  target  element - the target input field or division or span
-	 */
-	_refreshDatepicker: function(target) {
-		var inst = this._getInst(target);
-		if (inst) {
-			this._updateDatepicker(inst);
-		}
-	},
-
-	/* Set the dates for a jQuery selection.
-	 * @param  target element - the target input field or division or span
-	 * @param  date	Date - the new date
-	 */
-	_setDateDatepicker: function(target, date) {
-		var inst = this._getInst(target);
-		if (inst) {
-			this._setDate(inst, date);
-			this._updateDatepicker(inst);
-			this._updateAlternate(inst);
-		}
-	},
-
-	/* Get the date(s) for the first entry in a jQuery selection.
-	 * @param  target element - the target input field or division or span
-	 * @param  noDefault boolean - true if no default date is to be used
-	 * @return Date - the current date
-	 */
-	_getDateDatepicker: function(target, noDefault) {
-		var inst = this._getInst(target);
-		if (inst && !inst.inline) {
-			this._setDateFromField(inst, noDefault);
-		}
-		return (inst ? this._getDate(inst) : null);
-	},
-
-	/* Handle keystrokes. */
-	_doKeyDown: function(event) {
-		var onSelect, dateStr, sel,
-			inst = $.datepicker._getInst(event.target),
-			handled = true,
-			isRTL = inst.dpDiv.is(".ui-datepicker-rtl");
-
-		inst._keyEvent = true;
-		if ($.datepicker._datepickerShowing) {
-			switch (event.keyCode) {
-				case 9: $.datepicker._hideDatepicker();
-						handled = false;
-						break; // hide on tab out
-				case 13: sel = $("td." + $.datepicker._dayOverClass + ":not(." +
-									$.datepicker._currentClass + ")", inst.dpDiv);
-						if (sel[0]) {
-							$.datepicker._selectDay(event.target, inst.selectedMonth, inst.selectedYear, sel[0]);
-						}
-
-						onSelect = $.datepicker._get(inst, "onSelect");
-						if (onSelect) {
-							dateStr = $.datepicker._formatDate(inst);
-
-							// trigger custom callback
-							onSelect.apply((inst.input ? inst.input[0] : null), [dateStr, inst]);
-						} else {
-							$.datepicker._hideDatepicker();
-						}
-
-						return false; // don't submit the form
-				case 27: $.datepicker._hideDatepicker();
-						break; // hide on escape
-				case 33: $.datepicker._adjustDate(event.target, (event.ctrlKey ?
-							-$.datepicker._get(inst, "stepBigMonths") :
-							-$.datepicker._get(inst, "stepMonths")), "M");
-						break; // previous month/year on page up/+ ctrl
-				case 34: $.datepicker._adjustDate(event.target, (event.ctrlKey ?
-							+$.datepicker._get(inst, "stepBigMonths") :
-							+$.datepicker._get(inst, "stepMonths")), "M");
-						break; // next month/year on page down/+ ctrl
-				case 35: if (event.ctrlKey || event.metaKey) {
-							$.datepicker._clearDate(event.target);
-						}
-						handled = event.ctrlKey || event.metaKey;
-						break; // clear on ctrl or command +end
-				case 36: if (event.ctrlKey || event.metaKey) {
-							$.datepicker._gotoToday(event.target);
-						}
-						handled = event.ctrlKey || event.metaKey;
-						break; // current on ctrl or command +home
-				case 37: if (event.ctrlKey || event.metaKey) {
-							$.datepicker._adjustDate(event.target, (isRTL ? +1 : -1), "D");
-						}
-						handled = event.ctrlKey || event.metaKey;
-						// -1 day on ctrl or command +left
-						if (event.originalEvent.altKey) {
-							$.datepicker._adjustDate(event.target, (event.ctrlKey ?
-								-$.datepicker._get(inst, "stepBigMonths") :
-								-$.datepicker._get(inst, "stepMonths")), "M");
-						}
-						// next month/year on alt +left on Mac
-						break;
-				case 38: if (event.ctrlKey || event.metaKey) {
-							$.datepicker._adjustDate(event.target, -7, "D");
-						}
-						handled = event.ctrlKey || event.metaKey;
-						break; // -1 week on ctrl or command +up
-				case 39: if (event.ctrlKey || event.metaKey) {
-							$.datepicker._adjustDate(event.target, (isRTL ? -1 : +1), "D");
-						}
-						handled = event.ctrlKey || event.metaKey;
-						// +1 day on ctrl or command +right
-						if (event.originalEvent.altKey) {
-							$.datepicker._adjustDate(event.target, (event.ctrlKey ?
-								+$.datepicker._get(inst, "stepBigMonths") :
-								+$.datepicker._get(inst, "stepMonths")), "M");
-						}
-						// next month/year on alt +right
-						break;
-				case 40: if (event.ctrlKey || event.metaKey) {
-							$.datepicker._adjustDate(event.target, +7, "D");
-						}
-						handled = event.ctrlKey || event.metaKey;
-						break; // +1 week on ctrl or command +down
-				default: handled = false;
-			}
-		} else if (event.keyCode === 36 && event.ctrlKey) { // display the date picker on ctrl+home
-			$.datepicker._showDatepicker(this);
-		} else {
-			handled = false;
-		}
-
-		if (handled) {
-			event.preventDefault();
-			event.stopPropagation();
-		}
-	},
-
-	/* Filter entered characters - based on date format. */
-	_doKeyPress: function(event) {
-		var chars, chr,
-			inst = $.datepicker._getInst(event.target);
-
-		if ($.datepicker._get(inst, "constrainInput")) {
-			chars = $.datepicker._possibleChars($.datepicker._get(inst, "dateFormat"));
-			chr = String.fromCharCode(event.charCode == null ? event.keyCode : event.charCode);
-			return event.ctrlKey || event.metaKey || (chr < " " || !chars || chars.indexOf(chr) > -1);
-		}
-	},
-
-	/* Synchronise manual entry and field/alternate field. */
-	_doKeyUp: function(event) {
-		var date,
-			inst = $.datepicker._getInst(event.target);
-
-		if (inst.input.val() !== inst.lastVal) {
-			try {
-				date = $.datepicker.parseDate($.datepicker._get(inst, "dateFormat"),
-					(inst.input ? inst.input.val() : null),
-					$.datepicker._getFormatConfig(inst));
-
-				if (date) { // only if valid
-					$.datepicker._setDateFromField(inst);
-					$.datepicker._updateAlternate(inst);
-					$.datepicker._updateDatepicker(inst);
-				}
-			}
-			catch (err) {
-			}
-		}
-		return true;
-	},
-
-	/* Pop-up the date picker for a given input field.
-	 * If false returned from beforeShow event handler do not show.
-	 * @param  input  element - the input field attached to the date picker or
-	 *					event - if triggered by focus
-	 */
-	_showDatepicker: function(input) {
-		input = input.target || input;
-		if (input.nodeName.toLowerCase() !== "input") { // find from button/image trigger
-			input = $("input", input.parentNode)[0];
-		}
-
-		if ($.datepicker._isDisabledDatepicker(input) || $.datepicker._lastInput === input) { // already here
-			return;
-		}
-
-		var inst, beforeShow, beforeShowSettings, isFixed,
-			offset, showAnim, duration;
-
-		inst = $.datepicker._getInst(input);
-		if ($.datepicker._curInst && $.datepicker._curInst !== inst) {
-			$.datepicker._curInst.dpDiv.stop(true, true);
-			if ( inst && $.datepicker._datepickerShowing ) {
-				$.datepicker._hideDatepicker( $.datepicker._curInst.input[0] );
-			}
-		}
-
-		beforeShow = $.datepicker._get(inst, "beforeShow");
-		beforeShowSettings = beforeShow ? beforeShow.apply(input, [input, inst]) : {};
-		if(beforeShowSettings === false){
-			return;
-		}
-		datepicker_extendRemove(inst.settings, beforeShowSettings);
-
-		inst.lastVal = null;
-		$.datepicker._lastInput = input;
-		$.datepicker._setDateFromField(inst);
-
-		if ($.datepicker._inDialog) { // hide cursor
-			input.value = "";
-		}
-		if (!$.datepicker._pos) { // position below input
-			$.datepicker._pos = $.datepicker._findPos(input);
-			$.datepicker._pos[1] += input.offsetHeight; // add the height
-		}
-
-		isFixed = false;
-		$(input).parents().each(function() {
-			isFixed |= $(this).css("position") === "fixed";
-			return !isFixed;
-		});
-
-		offset = {left: $.datepicker._pos[0], top: $.datepicker._pos[1]};
-		$.datepicker._pos = null;
-		//to avoid flashes on Firefox
-		inst.dpDiv.empty();
-		// determine sizing offscreen
-		inst.dpDiv.css({position: "absolute", display: "block", top: "-1000px"});
-		$.datepicker._updateDatepicker(inst);
-		// fix width for dynamic number of date pickers
-		// and adjust position before showing
-		offset = $.datepicker._checkOffset(inst, offset, isFixed);
-		inst.dpDiv.css({position: ($.datepicker._inDialog && $.blockUI ?
-			"static" : (isFixed ? "fixed" : "absolute")), display: "none",
-			left: offset.left + "px", top: offset.top + "px"});
-
-		if (!inst.inline) {
-			showAnim = $.datepicker._get(inst, "showAnim");
-			duration = $.datepicker._get(inst, "duration");
-			inst.dpDiv.css( "z-index", datepicker_getZindex( $( input ) ) + 1 );
-			$.datepicker._datepickerShowing = true;
-
-			if ( $.effects && $.effects.effect[ showAnim ] ) {
-				inst.dpDiv.show(showAnim, $.datepicker._get(inst, "showOptions"), duration);
-			} else {
-				inst.dpDiv[showAnim || "show"](showAnim ? duration : null);
-			}
-
-			if ( $.datepicker._shouldFocusInput( inst ) ) {
-				inst.input.focus();
-			}
-
-			$.datepicker._curInst = inst;
-		}
-	},
-
-	/* Generate the date picker content. */
-	_updateDatepicker: function(inst) {
-		this.maxRows = 4; //Reset the max number of rows being displayed (see #7043)
-		datepicker_instActive = inst; // for delegate hover events
-		inst.dpDiv.empty().append(this._generateHTML(inst));
-		this._attachHandlers(inst);
-
-		var origyearshtml,
-			numMonths = this._getNumberOfMonths(inst),
-			cols = numMonths[1],
-			width = 17,
-			activeCell = inst.dpDiv.find( "." + this._dayOverClass + " a" );
-
-		if ( activeCell.length > 0 ) {
-			datepicker_handleMouseover.apply( activeCell.get( 0 ) );
-		}
-
-		inst.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width("");
-		if (cols > 1) {
-			inst.dpDiv.addClass("ui-datepicker-multi-" + cols).css("width", (width * cols) + "em");
-		}
-		inst.dpDiv[(numMonths[0] !== 1 || numMonths[1] !== 1 ? "add" : "remove") +
-			"Class"]("ui-datepicker-multi");
-		inst.dpDiv[(this._get(inst, "isRTL") ? "add" : "remove") +
-			"Class"]("ui-datepicker-rtl");
-
-		if (inst === $.datepicker._curInst && $.datepicker._datepickerShowing && $.datepicker._shouldFocusInput( inst ) ) {
-			inst.input.focus();
-		}
-
-		// deffered render of the years select (to avoid flashes on Firefox)
-		if( inst.yearshtml ){
-			origyearshtml = inst.yearshtml;
-			setTimeout(function(){
-				//assure that inst.yearshtml didn't change.
-				if( origyearshtml === inst.yearshtml && inst.yearshtml ){
-					inst.dpDiv.find("select.ui-datepicker-year:first").replaceWith(inst.yearshtml);
-				}
-				origyearshtml = inst.yearshtml = null;
-			}, 0);
-		}
-	},
-
-	// #6694 - don't focus the input if it's already focused
-	// this breaks the change event in IE
-	// Support: IE and jQuery <1.9
-	_shouldFocusInput: function( inst ) {
-		return inst.input && inst.input.is( ":visible" ) && !inst.input.is( ":disabled" ) && !inst.input.is( ":focus" );
-	},
-
-	/* Check positioning to remain on screen. */
-	_checkOffset: function(inst, offset, isFixed) {
-		var dpWidth = inst.dpDiv.outerWidth(),
-			dpHeight = inst.dpDiv.outerHeight(),
-			inputWidth = inst.input ? inst.input.outerWidth() : 0,
-			inputHeight = inst.input ? inst.input.outerHeight() : 0,
-			viewWidth = document.documentElement.clientWidth + (isFixed ? 0 : $(document).scrollLeft()),
-			viewHeight = document.documentElement.clientHeight + (isFixed ? 0 : $(document).scrollTop());
-
-		offset.left -= (this._get(inst, "isRTL") ? (dpWidth - inputWidth) : 0);
-		offset.left -= (isFixed && offset.left === inst.input.offset().left) ? $(document).scrollLeft() : 0;
-		offset.top -= (isFixed && offset.top === (inst.input.offset().top + inputHeight)) ? $(document).scrollTop() : 0;
-
-		// now check if datepicker is showing outside window viewport - move to a better place if so.
-		offset.left -= Math.min(offset.left, (offset.left + dpWidth > viewWidth && viewWidth > dpWidth) ?
-			Math.abs(offset.left + dpWidth - viewWidth) : 0);
-		offset.top -= Math.min(offset.top, (offset.top + dpHeight > viewHeight && viewHeight > dpHeight) ?
-			Math.abs(dpHeight + inputHeight) : 0);
-
-		return offset;
-	},
-
-	/* Find an object's position on the screen. */
-	_findPos: function(obj) {
-		var position,
-			inst = this._getInst(obj),
-			isRTL = this._get(inst, "isRTL");
-
-		while (obj && (obj.type === "hidden" || obj.nodeType !== 1 || $.expr.filters.hidden(obj))) {
-			obj = obj[isRTL ? "previousSibling" : "nextSibling"];
-		}
-
-		position = $(obj).offset();
-		return [position.left, position.top];
-	},
-
-	/* Hide the date picker from view.
-	 * @param  input  element - the input field attached to the date picker
-	 */
-	_hideDatepicker: function(input) {
-		var showAnim, duration, postProcess, onClose,
-			inst = this._curInst;
-
-		if (!inst || (input && inst !== $.data(input, "datepicker"))) {
-			return;
-		}
-
-		if (this._datepickerShowing) {
-			showAnim = this._get(inst, "showAnim");
-			duration = this._get(inst, "duration");
-			postProcess = function() {
-				$.datepicker._tidyDialog(inst);
-			};
-
-			// DEPRECATED: after BC for 1.8.x $.effects[ showAnim ] is not needed
-			if ( $.effects && ( $.effects.effect[ showAnim ] || $.effects[ showAnim ] ) ) {
-				inst.dpDiv.hide(showAnim, $.datepicker._get(inst, "showOptions"), duration, postProcess);
-			} else {
-				inst.dpDiv[(showAnim === "slideDown" ? "slideUp" :
-					(showAnim === "fadeIn" ? "fadeOut" : "hide"))]((showAnim ? duration : null), postProcess);
-			}
-
-			if (!showAnim) {
-				postProcess();
-			}
-			this._datepickerShowing = false;
-
-			onClose = this._get(inst, "onClose");
-			if (onClose) {
-				onClose.apply((inst.input ? inst.input[0] : null), [(inst.input ? inst.input.val() : ""), inst]);
-			}
-
-			this._lastInput = null;
-			if (this._inDialog) {
-				this._dialogInput.css({ position: "absolute", left: "0", top: "-100px" });
-				if ($.blockUI) {
-					$.unblockUI();
-					$("body").append(this.dpDiv);
-				}
-			}
-			this._inDialog = false;
-		}
-	},
-
-	/* Tidy up after a dialog display. */
-	_tidyDialog: function(inst) {
-		inst.dpDiv.removeClass(this._dialogClass).unbind(".ui-datepicker-calendar");
-	},
-
-	/* Close date picker if clicked elsewhere. */
-	_checkExternalClick: function(event) {
-		if (!$.datepicker._curInst) {
-			return;
-		}
-
-		var $target = $(event.target),
-			inst = $.datepicker._getInst($target[0]);
-
-		if ( ( ( $target[0].id !== $.datepicker._mainDivId &&
-				$target.parents("#" + $.datepicker._mainDivId).length === 0 &&
-				!$target.hasClass($.datepicker.markerClassName) &&
-				!$target.closest("." + $.datepicker._triggerClass).length &&
-				$.datepicker._datepickerShowing && !($.datepicker._inDialog && $.blockUI) ) ) ||
-			( $target.hasClass($.datepicker.markerClassName) && $.datepicker._curInst !== inst ) ) {
-				$.datepicker._hideDatepicker();
-		}
-	},
-
-	/* Adjust one of the date sub-fields. */
-	_adjustDate: function(id, offset, period) {
-		var target = $(id),
-			inst = this._getInst(target[0]);
-
-		if (this._isDisabledDatepicker(target[0])) {
-			return;
-		}
-		this._adjustInstDate(inst, offset +
-			(period === "M" ? this._get(inst, "showCurrentAtPos") : 0), // undo positioning
-			period);
-		this._updateDatepicker(inst);
-	},
-
-	/* Action for current link. */
-	_gotoToday: function(id) {
-		var date,
-			target = $(id),
-			inst = this._getInst(target[0]);
-
-		if (this._get(inst, "gotoCurrent") && inst.currentDay) {
-			inst.selectedDay = inst.currentDay;
-			inst.drawMonth = inst.selectedMonth = inst.currentMonth;
-			inst.drawYear = inst.selectedYear = inst.currentYear;
-		} else {
-			date = new Date();
-			inst.selectedDay = date.getDate();
-			inst.drawMonth = inst.selectedMonth = date.getMonth();
-			inst.drawYear = inst.selectedYear = date.getFullYear();
-		}
-		this._notifyChange(inst);
-		this._adjustDate(target);
-	},
-
-	/* Action for selecting a new month/year. */
-	_selectMonthYear: function(id, select, period) {
-		var target = $(id),
-			inst = this._getInst(target[0]);
-
-		inst["selected" + (period === "M" ? "Month" : "Year")] =
-		inst["draw" + (period === "M" ? "Month" : "Year")] =
-			parseInt(select.options[select.selectedIndex].value,10);
-
-		this._notifyChange(inst);
-		this._adjustDate(target);
-	},
-
-	/* Action for selecting a day. */
-	_selectDay: function(id, month, year, td) {
-		var inst,
-			target = $(id);
-
-		if ($(td).hasClass(this._unselectableClass) || this._isDisabledDatepicker(target[0])) {
-			return;
-		}
-
-		inst = this._getInst(target[0]);
-		inst.selectedDay = inst.currentDay = $("a", td).html();
-		inst.selectedMonth = inst.currentMonth = month;
-		inst.selectedYear = inst.currentYear = year;
-		this._selectDate(id, this._formatDate(inst,
-			inst.currentDay, inst.currentMonth, inst.currentYear));
-	},
-
-	/* Erase the input field and hide the date picker. */
-	_clearDate: function(id) {
-		var target = $(id);
-		this._selectDate(target, "");
-	},
-
-	/* Update the input field with the selected date. */
-	_selectDate: function(id, dateStr) {
-		var onSelect,
-			target = $(id),
-			inst = this._getInst(target[0]);
-
-		dateStr = (dateStr != null ? dateStr : this._formatDate(inst));
-		if (inst.input) {
-			inst.input.val(dateStr);
-		}
-		this._updateAlternate(inst);
-
-		onSelect = this._get(inst, "onSelect");
-		if (onSelect) {
-			onSelect.apply((inst.input ? inst.input[0] : null), [dateStr, inst]);  // trigger custom callback
-		} else if (inst.input) {
-			inst.input.trigger("change"); // fire the change event
-		}
-
-		if (inst.inline){
-			this._updateDatepicker(inst);
-		} else {
-			this._hideDatepicker();
-			this._lastInput = inst.input[0];
-			if (typeof(inst.input[0]) !== "object") {
-				inst.input.focus(); // restore focus
-			}
-			this._lastInput = null;
-		}
-	},
-
-	/* Update any alternate field to synchronise with the main field. */
-	_updateAlternate: function(inst) {
-		var altFormat, date, dateStr,
-			altField = this._get(inst, "altField");
-
-		if (altField) { // update alternate field too
-			altFormat = this._get(inst, "altFormat") || this._get(inst, "dateFormat");
-			date = this._getDate(inst);
-			dateStr = this.formatDate(altFormat, date, this._getFormatConfig(inst));
-			$(altField).each(function() { $(this).val(dateStr); });
-		}
-	},
-
-	/* Set as beforeShowDay function to prevent selection of weekends.
-	 * @param  date  Date - the date to customise
-	 * @return [boolean, string] - is this date selectable?, what is its CSS class?
-	 */
-	noWeekends: function(date) {
-		var day = date.getDay();
-		return [(day > 0 && day < 6), ""];
-	},
-
-	/* Set as calculateWeek to determine the week of the year based on the ISO 8601 definition.
-	 * @param  date  Date - the date to get the week for
-	 * @return  number - the number of the week within the year that contains this date
-	 */
-	iso8601Week: function(date) {
-		var time,
-			checkDate = new Date(date.getTime());
-
-		// Find Thursday of this week starting on Monday
-		checkDate.setDate(checkDate.getDate() + 4 - (checkDate.getDay() || 7));
-
-		time = checkDate.getTime();
-		checkDate.setMonth(0); // Compare with Jan 1
-		checkDate.setDate(1);
-		return Math.floor(Math.round((time - checkDate) / 86400000) / 7) + 1;
-	},
-
-	/* Parse a string value into a date object.
-	 * See formatDate below for the possible formats.
-	 *
-	 * @param  format string - the expected format of the date
-	 * @param  value string - the date in the above format
-	 * @param  settings Object - attributes include:
-	 *					shortYearCutoff  number - the cutoff year for determining the century (optional)
-	 *					dayNamesShort	string[7] - abbreviated names of the days from Sunday (optional)
-	 *					dayNames		string[7] - names of the days from Sunday (optional)
-	 *					monthNamesShort string[12] - abbreviated names of the months (optional)
-	 *					monthNames		string[12] - names of the months (optional)
-	 * @return  Date - the extracted date value or null if value is blank
-	 */
-	parseDate: function (format, value, settings) {
-		if (format == null || value == null) {
-			throw "Invalid arguments";
-		}
-
-		value = (typeof value === "object" ? value.toString() : value + "");
-		if (value === "") {
-			return null;
-		}
-
-		var iFormat, dim, extra,
-			iValue = 0,
-			shortYearCutoffTemp = (settings ? settings.shortYearCutoff : null) || this._defaults.shortYearCutoff,
-			shortYearCutoff = (typeof shortYearCutoffTemp !== "string" ? shortYearCutoffTemp :
-				new Date().getFullYear() % 100 + parseInt(shortYearCutoffTemp, 10)),
-			dayNamesShort = (settings ? settings.dayNamesShort : null) || this._defaults.dayNamesShort,
-			dayNames = (settings ? settings.dayNames : null) || this._defaults.dayNames,
-			monthNamesShort = (settings ? settings.monthNamesShort : null) || this._defaults.monthNamesShort,
-			monthNames = (settings ? settings.monthNames : null) || this._defaults.monthNames,
-			year = -1,
-			month = -1,
-			day = -1,
-			doy = -1,
-			literal = false,
-			date,
-			// Check whether a format character is doubled
-			lookAhead = function(match) {
-				var matches = (iFormat + 1 < format.length && format.charAt(iFormat + 1) === match);
-				if (matches) {
-					iFormat++;
-				}
-				return matches;
-			},
-			// Extract a number from the string value
-			getNumber = function(match) {
-				var isDoubled = lookAhead(match),
-					size = (match === "@" ? 14 : (match === "!" ? 20 :
-					(match === "y" && isDoubled ? 4 : (match === "o" ? 3 : 2)))),
-					minSize = (match === "y" ? size : 1),
-					digits = new RegExp("^\\d{" + minSize + "," + size + "}"),
-					num = value.substring(iValue).match(digits);
-				if (!num) {
-					throw "Missing number at position " + iValue;
-				}
-				iValue += num[0].length;
-				return parseInt(num[0], 10);
-			},
-			// Extract a name from the string value and convert to an index
-			getName = function(match, shortNames, longNames) {
-				var index = -1,
-					names = $.map(lookAhead(match) ? longNames : shortNames, function (v, k) {
-						return [ [k, v] ];
-					}).sort(function (a, b) {
-						return -(a[1].length - b[1].length);
-					});
-
-				$.each(names, function (i, pair) {
-					var name = pair[1];
-					if (value.substr(iValue, name.length).toLowerCase() === name.toLowerCase()) {
-						index = pair[0];
-						iValue += name.length;
-						return false;
-					}
-				});
-				if (index !== -1) {
-					return index + 1;
-				} else {
-					throw "Unknown name at position " + iValue;
-				}
-			},
-			// Confirm that a literal character matches the string value
-			checkLiteral = function() {
-				if (value.charAt(iValue) !== format.charAt(iFormat)) {
-					throw "Unexpected literal at position " + iValue;
-				}
-				iValue++;
-			};
-
-		for (iFormat = 0; iFormat < format.length; iFormat++) {
-			if (literal) {
-				if (format.charAt(iFormat) === "'" && !lookAhead("'")) {
-					literal = false;
-				} else {
-					checkLiteral();
-				}
-			} else {
-				switch (format.charAt(iFormat)) {
-					case "d":
-						day = getNumber("d");
-						break;
-					case "D":
-						getName("D", dayNamesShort, dayNames);
-						break;
-					case "o":
-						doy = getNumber("o");
-						break;
-					case "m":
-						month = getNumber("m");
-						break;
-					case "M":
-						month = getName("M", monthNamesShort, monthNames);
-						break;
-					case "y":
-						year = getNumber("y");
-						break;
-					case "@":
-						date = new Date(getNumber("@"));
-						year = date.getFullYear();
-						month = date.getMonth() + 1;
-						day = date.getDate();
-						break;
-					case "!":
-						date = new Date((getNumber("!") - this._ticksTo1970) / 10000);
-						year = date.getFullYear();
-						month = date.getMonth() + 1;
-						day = date.getDate();
-						break;
-					case "'":
-						if (lookAhead("'")){
-							checkLiteral();
-						} else {
-							literal = true;
-						}
-						break;
-					default:
-						checkLiteral();
-				}
-			}
-		}
-
-		if (iValue < value.length){
-			extra = value.substr(iValue);
-			if (!/^\s+/.test(extra)) {
-				throw "Extra/unparsed characters found in date: " + extra;
-			}
-		}
-
-		if (year === -1) {
-			year = new Date().getFullYear();
-		} else if (year < 100) {
-			year += new Date().getFullYear() - new Date().getFullYear() % 100 +
-				(year <= shortYearCutoff ? 0 : -100);
-		}
-
-		if (doy > -1) {
-			month = 1;
-			day = doy;
-			do {
-				dim = this._getDaysInMonth(year, month - 1);
-				if (day <= dim) {
-					break;
-				}
-				month++;
-				day -= dim;
-			} while (true);
-		}
-
-		date = this._daylightSavingAdjust(new Date(year, month - 1, day));
-		if (date.getFullYear() !== year || date.getMonth() + 1 !== month || date.getDate() !== day) {
-			throw "Invalid date"; // E.g. 31/02/00
-		}
-		return date;
-	},
-
-	/* Standard date formats. */
-	ATOM: "yy-mm-dd", // RFC 3339 (ISO 8601)
-	COOKIE: "D, dd M yy",
-	ISO_8601: "yy-mm-dd",
-	RFC_822: "D, d M y",
-	RFC_850: "DD, dd-M-y",
-	RFC_1036: "D, d M y",
-	RFC_1123: "D, d M yy",
-	RFC_2822: "D, d M yy",
-	RSS: "D, d M y", // RFC 822
-	TICKS: "!",
-	TIMESTAMP: "@",
-	W3C: "yy-mm-dd", // ISO 8601
-
-	_ticksTo1970: (((1970 - 1) * 365 + Math.floor(1970 / 4) - Math.floor(1970 / 100) +
-		Math.floor(1970 / 400)) * 24 * 60 * 60 * 10000000),
-
-	/* Format a date object into a string value.
-	 * The format can be combinations of the following:
-	 * d  - day of month (no leading zero)
-	 * dd - day of month (two digit)
-	 * o  - day of year (no leading zeros)
-	 * oo - day of year (three digit)
-	 * D  - day name short
-	 * DD - day name long
-	 * m  - month of year (no leading zero)
-	 * mm - month of year (two digit)
-	 * M  - month name short
-	 * MM - month name long
-	 * y  - year (two digit)
-	 * yy - year (four digit)
-	 * @ - Unix timestamp (ms since 01/01/1970)
-	 * ! - Windows ticks (100ns since 01/01/0001)
-	 * "..." - literal text
-	 * '' - single quote
-	 *
-	 * @param  format string - the desired format of the date
-	 * @param  date Date - the date value to format
-	 * @param  settings Object - attributes include:
-	 *					dayNamesShort	string[7] - abbreviated names of the days from Sunday (optional)
-	 *					dayNames		string[7] - names of the days from Sunday (optional)
-	 *					monthNamesShort string[12] - abbreviated names of the months (optional)
-	 *					monthNames		string[12] - names of the months (optional)
-	 * @return  string - the date in the above format
-	 */
-	formatDate: function (format, date, settings) {
-		if (!date) {
-			return "";
-		}
-
-		var iFormat,
-			dayNamesShort = (settings ? settings.dayNamesShort : null) || this._defaults.dayNamesShort,
-			dayNames = (settings ? settings.dayNames : null) || this._defaults.dayNames,
-			monthNamesShort = (settings ? settings.monthNamesShort : null) || this._defaults.monthNamesShort,
-			monthNames = (settings ? settings.monthNames : null) || this._defaults.monthNames,
-			// Check whether a format character is doubled
-			lookAhead = function(match) {
-				var matches = (iFormat + 1 < format.length && format.charAt(iFormat + 1) === match);
-				if (matches) {
-					iFormat++;
-				}
-				return matches;
-			},
-			// Format a number, with leading zero if necessary
-			formatNumber = function(match, value, len) {
-				var num = "" + value;
-				if (lookAhead(match)) {
-					while (num.length < len) {
-						num = "0" + num;
-					}
-				}
-				return num;
-			},
-			// Format a name, short or long as requested
-			formatName = function(match, value, shortNames, longNames) {
-				return (lookAhead(match) ? longNames[value] : shortNames[value]);
-			},
-			output = "",
-			literal = false;
-
-		if (date) {
-			for (iFormat = 0; iFormat < format.length; iFormat++) {
-				if (literal) {
-					if (format.charAt(iFormat) === "'" && !lookAhead("'")) {
-						literal = false;
-					} else {
-						output += format.charAt(iFormat);
-					}
-				} else {
-					switch (format.charAt(iFormat)) {
-						case "d":
-							output += formatNumber("d", date.getDate(), 2);
-							break;
-						case "D":
-							output += formatName("D", date.getDay(), dayNamesShort, dayNames);
-							break;
-						case "o":
-							output += formatNumber("o",
-								Math.round((new Date(date.getFullYear(), date.getMonth(), date.getDate()).getTime() - new Date(date.getFullYear(), 0, 0).getTime()) / 86400000), 3);
-							break;
-						case "m":
-							output += formatNumber("m", date.getMonth() + 1, 2);
-							break;
-						case "M":
-							output += formatName("M", date.getMonth(), monthNamesShort, monthNames);
-							break;
-						case "y":
-							output += (lookAhead("y") ? date.getFullYear() :
-								(date.getYear() % 100 < 10 ? "0" : "") + date.getYear() % 100);
-							break;
-						case "@":
-							output += date.getTime();
-							break;
-						case "!":
-							output += date.getTime() * 10000 + this._ticksTo1970;
-							break;
-						case "'":
-							if (lookAhead("'")) {
-								output += "'";
-							} else {
-								literal = true;
-							}
-							break;
-						default:
-							output += format.charAt(iFormat);
-					}
-				}
-			}
-		}
-		return output;
-	},
-
-	/* Extract all possible characters from the date format. */
-	_possibleChars: function (format) {
-		var iFormat,
-			chars = "",
-			literal = false,
-			// Check whether a format character is doubled
-			lookAhead = function(match) {
-				var matches = (iFormat + 1 < format.length && format.charAt(iFormat + 1) === match);
-				if (matches) {
-					iFormat++;
-				}
-				return matches;
-			};
-
-		for (iFormat = 0; iFormat < format.length; iFormat++) {
-			if (literal) {
-				if (format.charAt(iFormat) === "'" && !lookAhead("'")) {
-					literal = false;
-				} else {
-					chars += format.charAt(iFormat);
-				}
-			} else {
-				switch (format.charAt(iFormat)) {
-					case "d": case "m": case "y": case "@":
-						chars += "0123456789";
-						break;
-					case "D": case "M":
-						return null; // Accept anything
-					case "'":
-						if (lookAhead("'")) {
-							chars += "'";
-						} else {
-							literal = true;
-						}
-						break;
-					default:
-						chars += format.charAt(iFormat);
-				}
-			}
-		}
-		return chars;
-	},
-
-	/* Get a setting value, defaulting if necessary. */
-	_get: function(inst, name) {
-		return inst.settings[name] !== undefined ?
-			inst.settings[name] : this._defaults[name];
-	},
-
-	/* Parse existing date and initialise date picker. */
-	_setDateFromField: function(inst, noDefault) {
-		if (inst.input.val() === inst.lastVal) {
-			return;
-		}
-
-		var dateFormat = this._get(inst, "dateFormat"),
-			dates = inst.lastVal = inst.input ? inst.input.val() : null,
-			defaultDate = this._getDefaultDate(inst),
-			date = defaultDate,
-			settings = this._getFormatConfig(inst);
-
-		try {
-			date = this.parseDate(dateFormat, dates, settings) || defaultDate;
-		} catch (event) {
-			dates = (noDefault ? "" : dates);
-		}
-		inst.selectedDay = date.getDate();
-		inst.drawMonth = inst.selectedMonth = date.getMonth();
-		inst.drawYear = inst.selectedYear = date.getFullYear();
-		inst.currentDay = (dates ? date.getDate() : 0);
-		inst.currentMonth = (dates ? date.getMonth() : 0);
-		inst.currentYear = (dates ? date.getFullYear() : 0);
-		this._adjustInstDate(inst);
-	},
-
-	/* Retrieve the default date shown on opening. */
-	_getDefaultDate: function(inst) {
-		return this._restrictMinMax(inst,
-			this._determineDate(inst, this._get(inst, "defaultDate"), new Date()));
-	},
-
-	/* A date may be specified as an exact value or a relative one. */
-	_determineDate: function(inst, date, defaultDate) {
-		var offsetNumeric = function(offset) {
-				var date = new Date();
-				date.setDate(date.getDate() + offset);
-				return date;
-			},
-			offsetString = function(offset) {
-				try {
-					return $.datepicker.parseDate($.datepicker._get(inst, "dateFormat"),
-						offset, $.datepicker._getFormatConfig(inst));
-				}
-				catch (e) {
-					// Ignore
-				}
-
-				var date = (offset.toLowerCase().match(/^c/) ?
-					$.datepicker._getDate(inst) : null) || new Date(),
-					year = date.getFullYear(),
-					month = date.getMonth(),
-					day = date.getDate(),
-					pattern = /([+\-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g,
-					matches = pattern.exec(offset);
-
-				while (matches) {
-					switch (matches[2] || "d") {
-						case "d" : case "D" :
-							day += parseInt(matches[1],10); break;
-						case "w" : case "W" :
-							day += parseInt(matches[1],10) * 7; break;
-						case "m" : case "M" :
-							month += parseInt(matches[1],10);
-							day = Math.min(day, $.datepicker._getDaysInMonth(year, month));
-							break;
-						case "y": case "Y" :
-							year += parseInt(matches[1],10);
-							day = Math.min(day, $.datepicker._getDaysInMonth(year, month));
-							break;
-					}
-					matches = pattern.exec(offset);
-				}
-				return new Date(year, month, day);
-			},
-			newDate = (date == null || date === "" ? defaultDate : (typeof date === "string" ? offsetString(date) :
-				(typeof date === "number" ? (isNaN(date) ? defaultDate : offsetNumeric(date)) : new Date(date.getTime()))));
-
-		newDate = (newDate && newDate.toString() === "Invalid Date" ? defaultDate : newDate);
-		if (newDate) {
-			newDate.setHours(0);
-			newDate.setMinutes(0);
-			newDate.setSeconds(0);
-			newDate.setMilliseconds(0);
-		}
-		return this._daylightSavingAdjust(newDate);
-	},
-
-	/* Handle switch to/from daylight saving.
-	 * Hours may be non-zero on daylight saving cut-over:
-	 * > 12 when midnight changeover, but then cannot generate
-	 * midnight datetime, so jump to 1AM, otherwise reset.
-	 * @param  date  (Date) the date to check
-	 * @return  (Date) the corrected date
-	 */
-	_daylightSavingAdjust: function(date) {
-		if (!date) {
-			return null;
-		}
-		date.setHours(date.getHours() > 12 ? date.getHours() + 2 : 0);
-		return date;
-	},
-
-	/* Set the date(s) directly. */
-	_setDate: function(inst, date, noChange) {
-		var clear = !date,
-			origMonth = inst.selectedMonth,
-			origYear = inst.selectedYear,
-			newDate = this._restrictMinMax(inst, this._determineDate(inst, date, new Date()));
-
-		inst.selectedDay = inst.currentDay = newDate.getDate();
-		inst.drawMonth = inst.selectedMonth = inst.currentMonth = newDate.getMonth();
-		inst.drawYear = inst.selectedYear = inst.currentYear = newDate.getFullYear();
-		if ((origMonth !== inst.selectedMonth || origYear !== inst.selectedYear) && !noChange) {
-			this._notifyChange(inst);
-		}
-		this._adjustInstDate(inst);
-		if (inst.input) {
-			inst.input.val(clear ? "" : this._formatDate(inst));
-		}
-	},
-
-	/* Retrieve the date(s) directly. */
-	_getDate: function(inst) {
-		var startDate = (!inst.currentYear || (inst.input && inst.input.val() === "") ? null :
-			this._daylightSavingAdjust(new Date(
-			inst.currentYear, inst.currentMonth, inst.currentDay)));
-			return startDate;
-	},
-
-	/* Attach the onxxx handlers.  These are declared statically so
-	 * they work with static code transformers like Caja.
-	 */
-	_attachHandlers: function(inst) {
-		var stepMonths = this._get(inst, "stepMonths"),
-			id = "#" + inst.id.replace( /\\\\/g, "\\" );
-		inst.dpDiv.find("[data-handler]").map(function () {
-			var handler = {
-				prev: function () {
-					$.datepicker._adjustDate(id, -stepMonths, "M");
-				},
-				next: function () {
-					$.datepicker._adjustDate(id, +stepMonths, "M");
-				},
-				hide: function () {
-					$.datepicker._hideDatepicker();
-				},
-				today: function () {
-					$.datepicker._gotoToday(id);
-				},
-				selectDay: function () {
-					$.datepicker._selectDay(id, +this.getAttribute("data-month"), +this.getAttribute("data-year"), this);
-					return false;
-				},
-				selectMonth: function () {
-					$.datepicker._selectMonthYear(id, this, "M");
-					return false;
-				},
-				selectYear: function () {
-					$.datepicker._selectMonthYear(id, this, "Y");
-					return false;
-				}
-			};
-			$(this).bind(this.getAttribute("data-event"), handler[this.getAttribute("data-handler")]);
-		});
-	},
-
-	/* Generate the HTML for the current state of the date picker. */
-	_generateHTML: function(inst) {
-		var maxDraw, prevText, prev, nextText, next, currentText, gotoDate,
-			controls, buttonPanel, firstDay, showWeek, dayNames, dayNamesMin,
-			monthNames, monthNamesShort, beforeShowDay, showOtherMonths,
-			selectOtherMonths, defaultDate, html, dow, row, group, col, selectedDate,
-			cornerClass, calender, thead, day, daysInMonth, leadDays, curRows, numRows,
-			printDate, dRow, tbody, daySettings, otherMonth, unselectable,
-			tempDate = new Date(),
-			today = this._daylightSavingAdjust(
-				new Date(tempDate.getFullYear(), tempDate.getMonth(), tempDate.getDate())), // clear time
-			isRTL = this._get(inst, "isRTL"),
-			showButtonPanel = this._get(inst, "showButtonPanel"),
-			hideIfNoPrevNext = this._get(inst, "hideIfNoPrevNext"),
-			navigationAsDateFormat = this._get(inst, "navigationAsDateFormat"),
-			numMonths = this._getNumberOfMonths(inst),
-			showCurrentAtPos = this._get(inst, "showCurrentAtPos"),
-			stepMonths = this._get(inst, "stepMonths"),
-			isMultiMonth = (numMonths[0] !== 1 || numMonths[1] !== 1),
-			currentDate = this._daylightSavingAdjust((!inst.currentDay ? new Date(9999, 9, 9) :
-				new Date(inst.currentYear, inst.currentMonth, inst.currentDay))),
-			minDate = this._getMinMaxDate(inst, "min"),
-			maxDate = this._getMinMaxDate(inst, "max"),
-			drawMonth = inst.drawMonth - showCurrentAtPos,
-			drawYear = inst.drawYear;
-
-		if (drawMonth < 0) {
-			drawMonth += 12;
-			drawYear--;
-		}
-		if (maxDate) {
-			maxDraw = this._daylightSavingAdjust(new Date(maxDate.getFullYear(),
-				maxDate.getMonth() - (numMonths[0] * numMonths[1]) + 1, maxDate.getDate()));
-			maxDraw = (minDate && maxDraw < minDate ? minDate : maxDraw);
-			while (this._daylightSavingAdjust(new Date(drawYear, drawMonth, 1)) > maxDraw) {
-				drawMonth--;
-				if (drawMonth < 0) {
-					drawMonth = 11;
-					drawYear--;
-				}
-			}
-		}
-		inst.drawMonth = drawMonth;
-		inst.drawYear = drawYear;
-
-		prevText = this._get(inst, "prevText");
-		prevText = (!navigationAsDateFormat ? prevText : this.formatDate(prevText,
-			this._daylightSavingAdjust(new Date(drawYear, drawMonth - stepMonths, 1)),
-			this._getFormatConfig(inst)));
-
-		prev = (this._canAdjustMonth(inst, -1, drawYear, drawMonth) ?
-			"<a class='ui-datepicker-prev ui-corner-all' data-handler='prev' data-event='click'" +
-			" title='" + prevText + "'><span class='ui-icon ui-icon-circle-triangle-" + ( isRTL ? "e" : "w") + "'>" + prevText + "</span></a>" :
-			(hideIfNoPrevNext ? "" : "<a class='ui-datepicker-prev ui-corner-all ui-state-disabled' title='"+ prevText +"'><span class='ui-icon ui-icon-circle-triangle-" + ( isRTL ? "e" : "w") + "'>" + prevText + "</span></a>"));
-
-		nextText = this._get(inst, "nextText");
-		nextText = (!navigationAsDateFormat ? nextText : this.formatDate(nextText,
-			this._daylightSavingAdjust(new Date(drawYear, drawMonth + stepMonths, 1)),
-			this._getFormatConfig(inst)));
-
-		next = (this._canAdjustMonth(inst, +1, drawYear, drawMonth) ?
-			"<a class='ui-datepicker-next ui-corner-all' data-handler='next' data-event='click'" +
-			" title='" + nextText + "'><span class='ui-icon ui-icon-circle-triangle-" + ( isRTL ? "w" : "e") + "'>" + nextText + "</span></a>" :
-			(hideIfNoPrevNext ? "" : "<a class='ui-datepicker-next ui-corner-all ui-state-disabled' title='"+ nextText + "'><span class='ui-icon ui-icon-circle-triangle-" + ( isRTL ? "w" : "e") + "'>" + nextText + "</span></a>"));
-
-		currentText = this._get(inst, "currentText");
-		gotoDate = (this._get(inst, "gotoCurrent") && inst.currentDay ? currentDate : today);
-		currentText = (!navigationAsDateFormat ? currentText :
-			this.formatDate(currentText, gotoDate, this._getFormatConfig(inst)));
-
-		controls = (!inst.inline ? "<button type='button' class='ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all' data-handler='hide' data-event='click'>" +
-			this._get(inst, "closeText") + "</button>" : "");
-
-		buttonPanel = (showButtonPanel) ? "<div class='ui-datepicker-buttonpane ui-widget-content'>" + (isRTL ? controls : "") +
-			(this._isInRange(inst, gotoDate) ? "<button type='button' class='ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all' data-handler='today' data-event='click'" +
-			">" + currentText + "</button>" : "") + (isRTL ? "" : controls) + "</div>" : "";
-
-		firstDay = parseInt(this._get(inst, "firstDay"),10);
-		firstDay = (isNaN(firstDay) ? 0 : firstDay);
-
-		showWeek = this._get(inst, "showWeek");
-		dayNames = this._get(inst, "dayNames");
-		dayNamesMin = this._get(inst, "dayNamesMin");
-		monthNames = this._get(inst, "monthNames");
-		monthNamesShort = this._get(inst, "monthNamesShort");
-		beforeShowDay = this._get(inst, "beforeShowDay");
-		showOtherMonths = this._get(inst, "showOtherMonths");
-		selectOtherMonths = this._get(inst, "selectOtherMonths");
-		defaultDate = this._getDefaultDate(inst);
-		html = "";
-		dow;
-		for (row = 0; row < numMonths[0]; row++) {
-			group = "";
-			this.maxRows = 4;
-			for (col = 0; col < numMonths[1]; col++) {
-				selectedDate = this._daylightSavingAdjust(new Date(drawYear, drawMonth, inst.selectedDay));
-				cornerClass = " ui-corner-all";
-				calender = "";
-				if (isMultiMonth) {
-					calender += "<div class='ui-datepicker-group";
-					if (numMonths[1] > 1) {
-						switch (col) {
-							case 0: calender += " ui-datepicker-group-first";
-								cornerClass = " ui-corner-" + (isRTL ? "right" : "left"); break;
-							case numMonths[1]-1: calender += " ui-datepicker-group-last";
-								cornerClass = " ui-corner-" + (isRTL ? "left" : "right"); break;
-							default: calender += " ui-datepicker-group-middle"; cornerClass = ""; break;
-						}
-					}
-					calender += "'>";
-				}
-				calender += "<div class='ui-datepicker-header ui-widget-header ui-helper-clearfix" + cornerClass + "'>" +
-					(/all|left/.test(cornerClass) && row === 0 ? (isRTL ? next : prev) : "") +
-					(/all|right/.test(cornerClass) && row === 0 ? (isRTL ? prev : next) : "") +
-					this._generateMonthYearHeader(inst, drawMonth, drawYear, minDate, maxDate,
-					row > 0 || col > 0, monthNames, monthNamesShort) + // draw month headers
-					"</div><table class='ui-datepicker-calendar'><thead>" +
-					"<tr>";
-				thead = (showWeek ? "<th class='ui-datepicker-week-col'>" + this._get(inst, "weekHeader") + "</th>" : "");
-				for (dow = 0; dow < 7; dow++) { // days of the week
-					day = (dow + firstDay) % 7;
-					thead += "<th scope='col'" + ((dow + firstDay + 6) % 7 >= 5 ? " class='ui-datepicker-week-end'" : "") + ">" +
-						"<span title='" + dayNames[day] + "'>" + dayNamesMin[day] + "</span></th>";
-				}
-				calender += thead + "</tr></thead><tbody>";
-				daysInMonth = this._getDaysInMonth(drawYear, drawMonth);
-				if (drawYear === inst.selectedYear && drawMonth === inst.selectedMonth) {
-					inst.selectedDay = Math.min(inst.selectedDay, daysInMonth);
-				}
-				leadDays = (this._getFirstDayOfMonth(drawYear, drawMonth) - firstDay + 7) % 7;
-				curRows = Math.ceil((leadDays + daysInMonth) / 7); // calculate the number of rows to generate
-				numRows = (isMultiMonth ? this.maxRows > curRows ? this.maxRows : curRows : curRows); //If multiple months, use the higher number of rows (see #7043)
-				this.maxRows = numRows;
-				printDate = this._daylightSavingAdjust(new Date(drawYear, drawMonth, 1 - leadDays));
-				for (dRow = 0; dRow < numRows; dRow++) { // create date picker rows
-					calender += "<tr>";
-					tbody = (!showWeek ? "" : "<td class='ui-datepicker-week-col'>" +
-						this._get(inst, "calculateWeek")(printDate) + "</td>");
-					for (dow = 0; dow < 7; dow++) { // create date picker days
-						daySettings = (beforeShowDay ?
-							beforeShowDay.apply((inst.input ? inst.input[0] : null), [printDate]) : [true, ""]);
-						otherMonth = (printDate.getMonth() !== drawMonth);
-						unselectable = (otherMonth && !selectOtherMonths) || !daySettings[0] ||
-							(minDate && printDate < minDate) || (maxDate && printDate > maxDate);
-						tbody += "<td class='" +
-							((dow + firstDay + 6) % 7 >= 5 ? " ui-datepicker-week-end" : "") + // highlight weekends
-							(otherMonth ? " ui-datepicker-other-month" : "") + // highlight days from other months
-							((printDate.getTime() === selectedDate.getTime() && drawMonth === inst.selectedMonth && inst._keyEvent) || // user pressed key
-							(defaultDate.getTime() === printDate.getTime() && defaultDate.getTime() === selectedDate.getTime()) ?
-							// or defaultDate is current printedDate and defaultDate is selectedDate
-							" " + this._dayOverClass : "") + // highlight selected day
-							(unselectable ? " " + this._unselectableClass + " ui-state-disabled": "") +  // highlight unselectable days
-							(otherMonth && !showOtherMonths ? "" : " " + daySettings[1] + // highlight custom dates
-							(printDate.getTime() === currentDate.getTime() ? " " + this._currentClass : "") + // highlight selected day
-							(printDate.getTime() === today.getTime() ? " ui-datepicker-today" : "")) + "'" + // highlight today (if different)
-							((!otherMonth || showOtherMonths) && daySettings[2] ? " title='" + daySettings[2].replace(/'/g, "&#39;") + "'" : "") + // cell title
-							(unselectable ? "" : " data-handler='selectDay' data-event='click' data-month='" + printDate.getMonth() + "' data-year='" + printDate.getFullYear() + "'") + ">" + // actions
-							(otherMonth && !showOtherMonths ? "&#xa0;" : // display for other months
-							(unselectable ? "<span class='ui-state-default'>" + printDate.getDate() + "</span>" : "<a class='ui-state-default" +
-							(printDate.getTime() === today.getTime() ? " ui-state-highlight" : "") +
-							(printDate.getTime() === currentDate.getTime() ? " ui-state-active" : "") + // highlight selected day
-							(otherMonth ? " ui-priority-secondary" : "") + // distinguish dates from other months
-							"' href='#'>" + printDate.getDate() + "</a>")) + "</td>"; // display selectable date
-						printDate.setDate(printDate.getDate() + 1);
-						printDate = this._daylightSavingAdjust(printDate);
-					}
-					calender += tbody + "</tr>";
-				}
-				drawMonth++;
-				if (drawMonth > 11) {
-					drawMonth = 0;
-					drawYear++;
-				}
-				calender += "</tbody></table>" + (isMultiMonth ? "</div>" +
-							((numMonths[0] > 0 && col === numMonths[1]-1) ? "<div class='ui-datepicker-row-break'></div>" : "") : "");
-				group += calender;
-			}
-			html += group;
-		}
-		html += buttonPanel;
-		inst._keyEvent = false;
-		return html;
-	},
-
-	/* Generate the month and year header. */
-	_generateMonthYearHeader: function(inst, drawMonth, drawYear, minDate, maxDate,
-			secondary, monthNames, monthNamesShort) {
-
-		var inMinYear, inMaxYear, month, years, thisYear, determineYear, year, endYear,
-			changeMonth = this._get(inst, "changeMonth"),
-			changeYear = this._get(inst, "changeYear"),
-			showMonthAfterYear = this._get(inst, "showMonthAfterYear"),
-			html = "<div class='ui-datepicker-title'>",
-			monthHtml = "";
-
-		// month selection
-		if (secondary || !changeMonth) {
-			monthHtml += "<span class='ui-datepicker-month'>" + monthNames[drawMonth] + "</span>";
-		} else {
-			inMinYear = (minDate && minDate.getFullYear() === drawYear);
-			inMaxYear = (maxDate && maxDate.getFullYear() === drawYear);
-			monthHtml += "<select class='ui-datepicker-month' data-handler='selectMonth' data-event='change'>";
-			for ( month = 0; month < 12; month++) {
-				if ((!inMinYear || month >= minDate.getMonth()) && (!inMaxYear || month <= maxDate.getMonth())) {
-					monthHtml += "<option value='" + month + "'" +
-						(month === drawMonth ? " selected='selected'" : "") +
-						">" + monthNamesShort[month] + "</option>";
-				}
-			}
-			monthHtml += "</select>";
-		}
-
-		if (!showMonthAfterYear) {
-			html += monthHtml + (secondary || !(changeMonth && changeYear) ? "&#xa0;" : "");
-		}
-
-		// year selection
-		if ( !inst.yearshtml ) {
-			inst.yearshtml = "";
-			if (secondary || !changeYear) {
-				html += "<span class='ui-datepicker-year'>" + drawYear + "</span>";
-			} else {
-				// determine range of years to display
-				years = this._get(inst, "yearRange").split(":");
-				thisYear = new Date().getFullYear();
-				determineYear = function(value) {
-					var year = (value.match(/c[+\-].*/) ? drawYear + parseInt(value.substring(1), 10) :
-						(value.match(/[+\-].*/) ? thisYear + parseInt(value, 10) :
-						parseInt(value, 10)));
-					return (isNaN(year) ? thisYear : year);
-				};
-				year = determineYear(years[0]);
-				endYear = Math.max(year, determineYear(years[1] || ""));
-				year = (minDate ? Math.max(year, minDate.getFullYear()) : year);
-				endYear = (maxDate ? Math.min(endYear, maxDate.getFullYear()) : endYear);
-				inst.yearshtml += "<select class='ui-datepicker-year' data-handler='selectYear' data-event='change'>";
-				for (; year <= endYear; year++) {
-					inst.yearshtml += "<option value='" + year + "'" +
-						(year === drawYear ? " selected='selected'" : "") +
-						">" + year + "</option>";
-				}
-				inst.yearshtml += "</select>";
-
-				html += inst.yearshtml;
-				inst.yearshtml = null;
-			}
-		}
-
-		html += this._get(inst, "yearSuffix");
-		if (showMonthAfterYear) {
-			html += (secondary || !(changeMonth && changeYear) ? "&#xa0;" : "") + monthHtml;
-		}
-		html += "</div>"; // Close datepicker_header
-		return html;
-	},
-
-	/* Adjust one of the date sub-fields. */
-	_adjustInstDate: function(inst, offset, period) {
-		var year = inst.drawYear + (period === "Y" ? offset : 0),
-			month = inst.drawMonth + (period === "M" ? offset : 0),
-			day = Math.min(inst.selectedDay, this._getDaysInMonth(year, month)) + (period === "D" ? offset : 0),
-			date = this._restrictMinMax(inst, this._daylightSavingAdjust(new Date(year, month, day)));
-
-		inst.selectedDay = date.getDate();
-		inst.drawMonth = inst.selectedMonth = date.getMonth();
-		inst.drawYear = inst.selectedYear = date.getFullYear();
-		if (period === "M" || period === "Y") {
-			this._notifyChange(inst);
-		}
-	},
-
-	/* Ensure a date is within any min/max bounds. */
-	_restrictMinMax: function(inst, date) {
-		var minDate = this._getMinMaxDate(inst, "min"),
-			maxDate = this._getMinMaxDate(inst, "max"),
-			newDate = (minDate && date < minDate ? minDate : date);
-		return (maxDate && newDate > maxDate ? maxDate : newDate);
-	},
-
-	/* Notify change of month/year. */
-	_notifyChange: function(inst) {
-		var onChange = this._get(inst, "onChangeMonthYear");
-		if (onChange) {
-			onChange.apply((inst.input ? inst.input[0] : null),
-				[inst.selectedYear, inst.selectedMonth + 1, inst]);
-		}
-	},
-
-	/* Determine the number of months to show. */
-	_getNumberOfMonths: function(inst) {
-		var numMonths = this._get(inst, "numberOfMonths");
-		return (numMonths == null ? [1, 1] : (typeof numMonths === "number" ? [1, numMonths] : numMonths));
-	},
-
-	/* Determine the current maximum date - ensure no time components are set. */
-	_getMinMaxDate: function(inst, minMax) {
-		return this._determineDate(inst, this._get(inst, minMax + "Date"), null);
-	},
-
-	/* Find the number of days in a given month. */
-	_getDaysInMonth: function(year, month) {
-		return 32 - this._daylightSavingAdjust(new Date(year, month, 32)).getDate();
-	},
-
-	/* Find the day of the week of the first of a month. */
-	_getFirstDayOfMonth: function(year, month) {
-		return new Date(year, month, 1).getDay();
-	},
-
-	/* Determines if we should allow a "next/prev" month display change. */
-	_canAdjustMonth: function(inst, offset, curYear, curMonth) {
-		var numMonths = this._getNumberOfMonths(inst),
-			date = this._daylightSavingAdjust(new Date(curYear,
-			curMonth + (offset < 0 ? offset : numMonths[0] * numMonths[1]), 1));
-
-		if (offset < 0) {
-			date.setDate(this._getDaysInMonth(date.getFullYear(), date.getMonth()));
-		}
-		return this._isInRange(inst, date);
-	},
-
-	/* Is the given date in the accepted range? */
-	_isInRange: function(inst, date) {
-		var yearSplit, currentYear,
-			minDate = this._getMinMaxDate(inst, "min"),
-			maxDate = this._getMinMaxDate(inst, "max"),
-			minYear = null,
-			maxYear = null,
-			years = this._get(inst, "yearRange");
-			if (years){
-				yearSplit = years.split(":");
-				currentYear = new Date().getFullYear();
-				minYear = parseInt(yearSplit[0], 10);
-				maxYear = parseInt(yearSplit[1], 10);
-				if ( yearSplit[0].match(/[+\-].*/) ) {
-					minYear += currentYear;
-				}
-				if ( yearSplit[1].match(/[+\-].*/) ) {
-					maxYear += currentYear;
-				}
-			}
-
-		return ((!minDate || date.getTime() >= minDate.getTime()) &&
-			(!maxDate || date.getTime() <= maxDate.getTime()) &&
-			(!minYear || date.getFullYear() >= minYear) &&
-			(!maxYear || date.getFullYear() <= maxYear));
-	},
-
-	/* Provide the configuration settings for formatting/parsing. */
-	_getFormatConfig: function(inst) {
-		var shortYearCutoff = this._get(inst, "shortYearCutoff");
-		shortYearCutoff = (typeof shortYearCutoff !== "string" ? shortYearCutoff :
-			new Date().getFullYear() % 100 + parseInt(shortYearCutoff, 10));
-		return {shortYearCutoff: shortYearCutoff,
-			dayNamesShort: this._get(inst, "dayNamesShort"), dayNames: this._get(inst, "dayNames"),
-			monthNamesShort: this._get(inst, "monthNamesShort"), monthNames: this._get(inst, "monthNames")};
-	},
-
-	/* Format the given date for display. */
-	_formatDate: function(inst, day, month, year) {
-		if (!day) {
-			inst.currentDay = inst.selectedDay;
-			inst.currentMonth = inst.selectedMonth;
-			inst.currentYear = inst.selectedYear;
-		}
-		var date = (day ? (typeof day === "object" ? day :
-			this._daylightSavingAdjust(new Date(year, month, day))) :
-			this._daylightSavingAdjust(new Date(inst.currentYear, inst.currentMonth, inst.currentDay)));
-		return this.formatDate(this._get(inst, "dateFormat"), date, this._getFormatConfig(inst));
-	}
-});
-
-/*
- * Bind hover events for datepicker elements.
- * Done via delegate so the binding only occurs once in the lifetime of the parent div.
- * Global datepicker_instActive, set by _updateDatepicker allows the handlers to find their way back to the active picker.
- */
-function datepicker_bindHover(dpDiv) {
-	var selector = "button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a";
-	return dpDiv.delegate(selector, "mouseout", function() {
-			$(this).removeClass("ui-state-hover");
-			if (this.className.indexOf("ui-datepicker-prev") !== -1) {
-				$(this).removeClass("ui-datepicker-prev-hover");
-			}
-			if (this.className.indexOf("ui-datepicker-next") !== -1) {
-				$(this).removeClass("ui-datepicker-next-hover");
-			}
-		})
-		.delegate( selector, "mouseover", datepicker_handleMouseover );
-}
-
-function datepicker_handleMouseover() {
-	if (!$.datepicker._isDisabledDatepicker( datepicker_instActive.inline? datepicker_instActive.dpDiv.parent()[0] : datepicker_instActive.input[0])) {
-		$(this).parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover");
-		$(this).addClass("ui-state-hover");
-		if (this.className.indexOf("ui-datepicker-prev") !== -1) {
-			$(this).addClass("ui-datepicker-prev-hover");
-		}
-		if (this.className.indexOf("ui-datepicker-next") !== -1) {
-			$(this).addClass("ui-datepicker-next-hover");
-		}
-	}
-}
-
-/* jQuery extend now ignores nulls! */
-function datepicker_extendRemove(target, props) {
-	$.extend(target, props);
-	for (var name in props) {
-		if (props[name] == null) {
-			target[name] = props[name];
-		}
-	}
-	return target;
-}
-
-/* Invoke the datepicker functionality.
-   @param  options  string - a command, optionally followed by additional parameters or
-					Object - settings for attaching new datepicker functionality
-   @return  jQuery object */
-$.fn.datepicker = function(options){
-
-	/* Verify an empty collection wasn't passed - Fixes #6976 */
-	if ( !this.length ) {
-		return this;
-	}
-
-	/* Initialise the date picker. */
-	if (!$.datepicker.initialized) {
-		$(document).mousedown($.datepicker._checkExternalClick);
-		$.datepicker.initialized = true;
-	}
-
-	/* Append datepicker main container to body if not exist. */
-	if ($("#"+$.datepicker._mainDivId).length === 0) {
-		$("body").append($.datepicker.dpDiv);
-	}
-
-	var otherArgs = Array.prototype.slice.call(arguments, 1);
-	if (typeof options === "string" && (options === "isDisabled" || options === "getDate" || options === "widget")) {
-		return $.datepicker["_" + options + "Datepicker"].
-			apply($.datepicker, [this[0]].concat(otherArgs));
-	}
-	if (options === "option" && arguments.length === 2 && typeof arguments[1] === "string") {
-		return $.datepicker["_" + options + "Datepicker"].
-			apply($.datepicker, [this[0]].concat(otherArgs));
-	}
-	return this.each(function() {
-		typeof options === "string" ?
-			$.datepicker["_" + options + "Datepicker"].
-				apply($.datepicker, [this].concat(otherArgs)) :
-			$.datepicker._attachDatepicker(this, options);
-	});
-};
-
-$.datepicker = new Datepicker(); // singleton instance
-$.datepicker.initialized = false;
-$.datepicker.uuid = new Date().getTime();
-$.datepicker.version = "1.11.4";
-
-return $.datepicker;
-
-}));
diff --git a/#pma/js/jquery/src/jquery-ui/dialog.js b/#pma/js/jquery/src/jquery-ui/dialog.js
deleted file mode 100644
index 2f978bed..00000000
--- a/#pma/js/jquery/src/jquery-ui/dialog.js
+++ /dev/null
@@ -1,876 +0,0 @@
-/*!
- * jQuery UI Dialog 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/dialog/
- */
-(function( factory ) {
-	if ( typeof define === "function" && define.amd ) {
-
-		// AMD. Register as an anonymous module.
-		define([
-			"jquery",
-			"./core",
-			"./widget",
-			"./button",
-			"./draggable",
-			"./mouse",
-			"./position",
-			"./resizable"
-		], factory );
-	} else {
-
-		// Browser globals
-		factory( jQuery );
-	}
-}(function( $ ) {
-
-return $.widget( "ui.dialog", {
-	version: "1.11.4",
-	options: {
-		appendTo: "body",
-		autoOpen: true,
-		buttons: [],
-		closeOnEscape: true,
-		closeText: "Close",
-		dialogClass: "",
-		draggable: true,
-		hide: null,
-		height: "auto",
-		maxHeight: null,
-		maxWidth: null,
-		minHeight: 150,
-		minWidth: 150,
-		modal: false,
-		position: {
-			my: "center",
-			at: "center",
-			of: window,
-			collision: "fit",
-			// Ensure the titlebar is always visible
-			using: function( pos ) {
-				var topOffset = $( this ).css( pos ).offset().top;
-				if ( topOffset < 0 ) {
-					$( this ).css( "top", pos.top - topOffset );
-				}
-			}
-		},
-		resizable: true,
-		show: null,
-		title: null,
-		width: 300,
-
-		// callbacks
-		beforeClose: null,
-		close: null,
-		drag: null,
-		dragStart: null,
-		dragStop: null,
-		focus: null,
-		open: null,
-		resize: null,
-		resizeStart: null,
-		resizeStop: null
-	},
-
-	sizeRelatedOptions: {
-		buttons: true,
-		height: true,
-		maxHeight: true,
-		maxWidth: true,
-		minHeight: true,
-		minWidth: true,
-		width: true
-	},
-
-	resizableRelatedOptions: {
-		maxHeight: true,
-		maxWidth: true,
-		minHeight: true,
-		minWidth: true
-	},
-
-	_create: function() {
-		this.originalCss = {
-			display: this.element[ 0 ].style.display,
-			width: this.element[ 0 ].style.width,
-			minHeight: this.element[ 0 ].style.minHeight,
-			maxHeight: this.element[ 0 ].style.maxHeight,
-			height: this.element[ 0 ].style.height
-		};
-		this.originalPosition = {
-			parent: this.element.parent(),
-			index: this.element.parent().children().index( this.element )
-		};
-		this.originalTitle = this.element.attr( "title" );
-		this.options.title = this.options.title || this.originalTitle;
-
-		this._createWrapper();
-
-		this.element
-			.show()
-			.removeAttr( "title" )
-			.addClass( "ui-dialog-content ui-widget-content" )
-			.appendTo( this.uiDialog );
-
-		this._createTitlebar();
-		this._createButtonPane();
-
-		if ( this.options.draggable && $.fn.draggable ) {
-			this._makeDraggable();
-		}
-		if ( this.options.resizable && $.fn.resizable ) {
-			this._makeResizable();
-		}
-
-		this._isOpen = false;
-
-		this._trackFocus();
-	},
-
-	_init: function() {
-		if ( this.options.autoOpen ) {
-			this.open();
-		}
-	},
-
-	_appendTo: function() {
-		var element = this.options.appendTo;
-		if ( element && (element.jquery || element.nodeType) ) {
-			return $( element );
-		}
-		return this.document.find( element || "body" ).eq( 0 );
-	},
-
-	_destroy: function() {
-		var next,
-			originalPosition = this.originalPosition;
-
-		this._untrackInstance();
-		this._destroyOverlay();
-
-		this.element
-			.removeUniqueId()
-			.removeClass( "ui-dialog-content ui-widget-content" )
-			.css( this.originalCss )
-			// Without detaching first, the following becomes really slow
-			.detach();
-
-		this.uiDialog.stop( true, true ).remove();
-
-		if ( this.originalTitle ) {
-			this.element.attr( "title", this.originalTitle );
-		}
-
-		next = originalPosition.parent.children().eq( originalPosition.index );
-		// Don't try to place the dialog next to itself (#8613)
-		if ( next.length && next[ 0 ] !== this.element[ 0 ] ) {
-			next.before( this.element );
-		} else {
-			originalPosition.parent.append( this.element );
-		}
-	},
-
-	widget: function() {
-		return this.uiDialog;
-	},
-
-	disable: $.noop,
-	enable: $.noop,
-
-	close: function( event ) {
-		var activeElement,
-			that = this;
-
-		if ( !this._isOpen || this._trigger( "beforeClose", event ) === false ) {
-			return;
-		}
-
-		this._isOpen = false;
-		this._focusedElement = null;
-		this._destroyOverlay();
-		this._untrackInstance();
-
-		if ( !this.opener.filter( ":focusable" ).focus().length ) {
-
-			// support: IE9
-			// IE9 throws an "Unspecified error" accessing document.activeElement from an <iframe>
-			try {
-				activeElement = this.document[ 0 ].activeElement;
-
-				// Support: IE9, IE10
-				// If the <body> is blurred, IE will switch windows, see #4520
-				if ( activeElement && activeElement.nodeName.toLowerCase() !== "body" ) {
-
-					// Hiding a focused element doesn't trigger blur in WebKit
-					// so in case we have nothing to focus on, explicitly blur the active element
-					// https://bugs.webkit.org/show_bug.cgi?id=47182
-					$( activeElement ).blur();
-				}
-			} catch ( error ) {}
-		}
-
-		this._hide( this.uiDialog, this.options.hide, function() {
-			that._trigger( "close", event );
-		});
-	},
-
-	isOpen: function() {
-		return this._isOpen;
-	},
-
-	moveToTop: function() {
-		this._moveToTop();
-	},
-
-	_moveToTop: function( event, silent ) {
-		var moved = false,
-			zIndices = this.uiDialog.siblings( ".ui-front:visible" ).map(function() {
-				return +$( this ).css( "z-index" );
-			}).get(),
-			zIndexMax = Math.max.apply( null, zIndices );
-
-		if ( zIndexMax >= +this.uiDialog.css( "z-index" ) ) {
-			this.uiDialog.css( "z-index", zIndexMax + 1 );
-			moved = true;
-		}
-
-		if ( moved && !silent ) {
-			this._trigger( "focus", event );
-		}
-		return moved;
-	},
-
-	open: function() {
-		var that = this;
-		if ( this._isOpen ) {
-			if ( this._moveToTop() ) {
-				this._focusTabbable();
-			}
-			return;
-		}
-
-		this._isOpen = true;
-		this.opener = $( this.document[ 0 ].activeElement );
-
-		this._size();
-		this._position();
-		this._createOverlay();
-		this._moveToTop( null, true );
-
-		// Ensure the overlay is moved to the top with the dialog, but only when
-		// opening. The overlay shouldn't move after the dialog is open so that
-		// modeless dialogs opened after the modal dialog stack properly.
-		if ( this.overlay ) {
-			this.overlay.css( "z-index", this.uiDialog.css( "z-index" ) - 1 );
-		}
-
-		this._show( this.uiDialog, this.options.show, function() {
-			that._focusTabbable();
-			that._trigger( "focus" );
-		});
-
-		// Track the dialog immediately upon openening in case a focus event
-		// somehow occurs outside of the dialog before an element inside the
-		// dialog is focused (#10152)
-		this._makeFocusTarget();
-
-		this._trigger( "open" );
-	},
-
-	_focusTabbable: function() {
-		// Set focus to the first match:
-		// 1. An element that was focused previously
-		// 2. First element inside the dialog matching [autofocus]
-		// 3. Tabbable element inside the content element
-		// 4. Tabbable element inside the buttonpane
-		// 5. The close button
-		// 6. The dialog itself
-		var hasFocus = this._focusedElement;
-		if ( !hasFocus ) {
-			hasFocus = this.element.find( "[autofocus]" );
-		}
-		if ( !hasFocus.length ) {
-			hasFocus = this.element.find( ":tabbable" );
-		}
-		if ( !hasFocus.length ) {
-			hasFocus = this.uiDialogButtonPane.find( ":tabbable" );
-		}
-		if ( !hasFocus.length ) {
-			hasFocus = this.uiDialogTitlebarClose.filter( ":tabbable" );
-		}
-		if ( !hasFocus.length ) {
-			hasFocus = this.uiDialog;
-		}
-		hasFocus.eq( 0 ).focus();
-	},
-
-	_keepFocus: function( event ) {
-		function checkFocus() {
-			var activeElement = this.document[0].activeElement,
-				isActive = this.uiDialog[0] === activeElement ||
-					$.contains( this.uiDialog[0], activeElement );
-			if ( !isActive ) {
-				this._focusTabbable();
-			}
-		}
-		event.preventDefault();
-		checkFocus.call( this );
-		// support: IE
-		// IE <= 8 doesn't prevent moving focus even with event.preventDefault()
-		// so we check again later
-		this._delay( checkFocus );
-	},
-
-	_createWrapper: function() {
-		this.uiDialog = $("<div>")
-			.addClass( "ui-dialog ui-widget ui-widget-content ui-corner-all ui-front " +
-				this.options.dialogClass )
-			.hide()
-			.attr({
-				// Setting tabIndex makes the div focusable
-				tabIndex: -1,
-				role: "dialog"
-			})
-			.appendTo( this._appendTo() );
-
-		this._on( this.uiDialog, {
-			keydown: function( event ) {
-				if ( this.options.closeOnEscape && !event.isDefaultPrevented() && event.keyCode &&
-						event.keyCode === $.ui.keyCode.ESCAPE ) {
-					event.preventDefault();
-					this.close( event );
-					return;
-				}
-
-				// prevent tabbing out of dialogs
-				if ( event.keyCode !== $.ui.keyCode.TAB || event.isDefaultPrevented() ) {
-					return;
-				}
-				var tabbables = this.uiDialog.find( ":tabbable" ),
-					first = tabbables.filter( ":first" ),
-					last = tabbables.filter( ":last" );
-
-				if ( ( event.target === last[0] || event.target === this.uiDialog[0] ) && !event.shiftKey ) {
-					this._delay(function() {
-						first.focus();
-					});
-					event.preventDefault();
-				} else if ( ( event.target === first[0] || event.target === this.uiDialog[0] ) && event.shiftKey ) {
-					this._delay(function() {
-						last.focus();
-					});
-					event.preventDefault();
-				}
-			},
-			mousedown: function( event ) {
-				if ( this._moveToTop( event ) ) {
-					this._focusTabbable();
-				}
-			}
-		});
-
-		// We assume that any existing aria-describedby attribute means
-		// that the dialog content is marked up properly
-		// otherwise we brute force the content as the description
-		if ( !this.element.find( "[aria-describedby]" ).length ) {
-			this.uiDialog.attr({
-				"aria-describedby": this.element.uniqueId().attr( "id" )
-			});
-		}
-	},
-
-	_createTitlebar: function() {
-		var uiDialogTitle;
-
-		this.uiDialogTitlebar = $( "<div>" )
-			.addClass( "ui-dialog-titlebar ui-widget-header ui-corner-all ui-helper-clearfix" )
-			.prependTo( this.uiDialog );
-		this._on( this.uiDialogTitlebar, {
-			mousedown: function( event ) {
-				// Don't prevent click on close button (#8838)
-				// Focusing a dialog that is partially scrolled out of view
-				// causes the browser to scroll it into view, preventing the click event
-				if ( !$( event.target ).closest( ".ui-dialog-titlebar-close" ) ) {
-					// Dialog isn't getting focus when dragging (#8063)
-					this.uiDialog.focus();
-				}
-			}
-		});
-
-		// support: IE
-		// Use type="button" to prevent enter keypresses in textboxes from closing the
-		// dialog in IE (#9312)
-		this.uiDialogTitlebarClose = $( "<button type='button'></button>" )
-			.button({
-				label: this.options.closeText,
-				icons: {
-					primary: "ui-icon-closethick"
-				},
-				text: false
-			})
-			.addClass( "ui-dialog-titlebar-close" )
-			.appendTo( this.uiDialogTitlebar );
-		this._on( this.uiDialogTitlebarClose, {
-			click: function( event ) {
-				event.preventDefault();
-				this.close( event );
-			}
-		});
-
-		uiDialogTitle = $( "<span>" )
-			.uniqueId()
-			.addClass( "ui-dialog-title" )
-			.prependTo( this.uiDialogTitlebar );
-		this._title( uiDialogTitle );
-
-		this.uiDialog.attr({
-			"aria-labelledby": uiDialogTitle.attr( "id" )
-		});
-	},
-
-	_title: function( title ) {
-		if ( !this.options.title ) {
-			title.html( "&#160;" );
-		}
-		title.text( this.options.title );
-	},
-
-	_createButtonPane: function() {
-		this.uiDialogButtonPane = $( "<div>" )
-			.addClass( "ui-dialog-buttonpane ui-widget-content ui-helper-clearfix" );
-
-		this.uiButtonSet = $( "<div>" )
-			.addClass( "ui-dialog-buttonset" )
-			.appendTo( this.uiDialogButtonPane );
-
-		this._createButtons();
-	},
-
-	_createButtons: function() {
-		var that = this,
-			buttons = this.options.buttons;
-
-		// if we already have a button pane, remove it
-		this.uiDialogButtonPane.remove();
-		this.uiButtonSet.empty();
-
-		if ( $.isEmptyObject( buttons ) || ($.isArray( buttons ) && !buttons.length) ) {
-			this.uiDialog.removeClass( "ui-dialog-buttons" );
-			return;
-		}
-
-		$.each( buttons, function( name, props ) {
-			var click, buttonOptions;
-			props = $.isFunction( props ) ?
-				{ click: props, text: name } :
-				props;
-			// Default to a non-submitting button
-			props = $.extend( { type: "button" }, props );
-			// Change the context for the click callback to be the main element
-			click = props.click;
-			props.click = function() {
-				click.apply( that.element[ 0 ], arguments );
-			};
-			buttonOptions = {
-				icons: props.icons,
-				text: props.showText
-			};
-			delete props.icons;
-			delete props.showText;
-			$( "<button></button>", props )
-				.button( buttonOptions )
-				.appendTo( that.uiButtonSet );
-		});
-		this.uiDialog.addClass( "ui-dialog-buttons" );
-		this.uiDialogButtonPane.appendTo( this.uiDialog );
-	},
-
-	_makeDraggable: function() {
-		var that = this,
-			options = this.options;
-
-		function filteredUi( ui ) {
-			return {
-				position: ui.position,
-				offset: ui.offset
-			};
-		}
-
-		this.uiDialog.draggable({
-			cancel: ".ui-dialog-content, .ui-dialog-titlebar-close",
-			handle: ".ui-dialog-titlebar",
-			containment: "document",
-			start: function( event, ui ) {
-				$( this ).addClass( "ui-dialog-dragging" );
-				that._blockFrames();
-				that._trigger( "dragStart", event, filteredUi( ui ) );
-			},
-			drag: function( event, ui ) {
-				that._trigger( "drag", event, filteredUi( ui ) );
-			},
-			stop: function( event, ui ) {
-				var left = ui.offset.left - that.document.scrollLeft(),
-					top = ui.offset.top - that.document.scrollTop();
-
-				options.position = {
-					my: "left top",
-					at: "left" + (left >= 0 ? "+" : "") + left + " " +
-						"top" + (top >= 0 ? "+" : "") + top,
-					of: that.window
-				};
-				$( this ).removeClass( "ui-dialog-dragging" );
-				that._unblockFrames();
-				that._trigger( "dragStop", event, filteredUi( ui ) );
-			}
-		});
-	},
-
-	_makeResizable: function() {
-		var that = this,
-			options = this.options,
-			handles = options.resizable,
-			// .ui-resizable has position: relative defined in the stylesheet
-			// but dialogs have to use absolute or fixed positioning
-			position = this.uiDialog.css("position"),
-			resizeHandles = typeof handles === "string" ?
-				handles	:
-				"n,e,s,w,se,sw,ne,nw";
-
-		function filteredUi( ui ) {
-			return {
-				originalPosition: ui.originalPosition,
-				originalSize: ui.originalSize,
-				position: ui.position,
-				size: ui.size
-			};
-		}
-
-		this.uiDialog.resizable({
-			cancel: ".ui-dialog-content",
-			containment: "document",
-			alsoResize: this.element,
-			maxWidth: options.maxWidth,
-			maxHeight: options.maxHeight,
-			minWidth: options.minWidth,
-			minHeight: this._minHeight(),
-			handles: resizeHandles,
-			start: function( event, ui ) {
-				$( this ).addClass( "ui-dialog-resizing" );
-				that._blockFrames();
-				that._trigger( "resizeStart", event, filteredUi( ui ) );
-			},
-			resize: function( event, ui ) {
-				that._trigger( "resize", event, filteredUi( ui ) );
-			},
-			stop: function( event, ui ) {
-				var offset = that.uiDialog.offset(),
-					left = offset.left - that.document.scrollLeft(),
-					top = offset.top - that.document.scrollTop();
-
-				options.height = that.uiDialog.height();
-				options.width = that.uiDialog.width();
-				options.position = {
-					my: "left top",
-					at: "left" + (left >= 0 ? "+" : "") + left + " " +
-						"top" + (top >= 0 ? "+" : "") + top,
-					of: that.window
-				};
-				$( this ).removeClass( "ui-dialog-resizing" );
-				that._unblockFrames();
-				that._trigger( "resizeStop", event, filteredUi( ui ) );
-			}
-		})
-		.css( "position", position );
-	},
-
-	_trackFocus: function() {
-		this._on( this.widget(), {
-			focusin: function( event ) {
-				this._makeFocusTarget();
-				this._focusedElement = $( event.target );
-			}
-		});
-	},
-
-	_makeFocusTarget: function() {
-		this._untrackInstance();
-		this._trackingInstances().unshift( this );
-	},
-
-	_untrackInstance: function() {
-		var instances = this._trackingInstances(),
-			exists = $.inArray( this, instances );
-		if ( exists !== -1 ) {
-			instances.splice( exists, 1 );
-		}
-	},
-
-	_trackingInstances: function() {
-		var instances = this.document.data( "ui-dialog-instances" );
-		if ( !instances ) {
-			instances = [];
-			this.document.data( "ui-dialog-instances", instances );
-		}
-		return instances;
-	},
-
-	_minHeight: function() {
-		var options = this.options;
-
-		return options.height === "auto" ?
-			options.minHeight :
-			Math.min( options.minHeight, options.height );
-	},
-
-	_position: function() {
-		// Need to show the dialog to get the actual offset in the position plugin
-		var isVisible = this.uiDialog.is( ":visible" );
-		if ( !isVisible ) {
-			this.uiDialog.show();
-		}
-		this.uiDialog.position( this.options.position );
-		if ( !isVisible ) {
-			this.uiDialog.hide();
-		}
-	},
-
-	_setOptions: function( options ) {
-		var that = this,
-			resize = false,
-			resizableOptions = {};
-
-		$.each( options, function( key, value ) {
-			that._setOption( key, value );
-
-			if ( key in that.sizeRelatedOptions ) {
-				resize = true;
-			}
-			if ( key in that.resizableRelatedOptions ) {
-				resizableOptions[ key ] = value;
-			}
-		});
-
-		if ( resize ) {
-			this._size();
-			this._position();
-		}
-		if ( this.uiDialog.is( ":data(ui-resizable)" ) ) {
-			this.uiDialog.resizable( "option", resizableOptions );
-		}
-	},
-
-	_setOption: function( key, value ) {
-		var isDraggable, isResizable,
-			uiDialog = this.uiDialog;
-
-		if ( key === "dialogClass" ) {
-			uiDialog
-				.removeClass( this.options.dialogClass )
-				.addClass( value );
-		}
-
-		if ( key === "disabled" ) {
-			return;
-		}
-
-		this._super( key, value );
-
-		if ( key === "appendTo" ) {
-			this.uiDialog.appendTo( this._appendTo() );
-		}
-
-		if ( key === "buttons" ) {
-			this._createButtons();
-		}
-
-		if ( key === "closeText" ) {
-			this.uiDialogTitlebarClose.button({
-				// Ensure that we always pass a string
-				label: "" + value
-			});
-		}
-
-		if ( key === "draggable" ) {
-			isDraggable = uiDialog.is( ":data(ui-draggable)" );
-			if ( isDraggable && !value ) {
-				uiDialog.draggable( "destroy" );
-			}
-
-			if ( !isDraggable && value ) {
-				this._makeDraggable();
-			}
-		}
-
-		if ( key === "position" ) {
-			this._position();
-		}
-
-		if ( key === "resizable" ) {
-			// currently resizable, becoming non-resizable
-			isResizable = uiDialog.is( ":data(ui-resizable)" );
-			if ( isResizable && !value ) {
-				uiDialog.resizable( "destroy" );
-			}
-
-			// currently resizable, changing handles
-			if ( isResizable && typeof value === "string" ) {
-				uiDialog.resizable( "option", "handles", value );
-			}
-
-			// currently non-resizable, becoming resizable
-			if ( !isResizable && value !== false ) {
-				this._makeResizable();
-			}
-		}
-
-		if ( key === "title" ) {
-			this._title( this.uiDialogTitlebar.find( ".ui-dialog-title" ) );
-		}
-	},
-
-	_size: function() {
-		// If the user has resized the dialog, the .ui-dialog and .ui-dialog-content
-		// divs will both have width and height set, so we need to reset them
-		var nonContentHeight, minContentHeight, maxContentHeight,
-			options = this.options;
-
-		// Reset content sizing
-		this.element.show().css({
-			width: "auto",
-			minHeight: 0,
-			maxHeight: "none",
-			height: 0
-		});
-
-		if ( options.minWidth > options.width ) {
-			options.width = options.minWidth;
-		}
-
-		// reset wrapper sizing
-		// determine the height of all the non-content elements
-		nonContentHeight = this.uiDialog.css({
-				height: "auto",
-				width: options.width
-			})
-			.outerHeight();
-		minContentHeight = Math.max( 0, options.minHeight - nonContentHeight );
-		maxContentHeight = typeof options.maxHeight === "number" ?
-			Math.max( 0, options.maxHeight - nonContentHeight ) :
-			"none";
-
-		if ( options.height === "auto" ) {
-			this.element.css({
-				minHeight: minContentHeight,
-				maxHeight: maxContentHeight,
-				height: "auto"
-			});
-		} else {
-			this.element.height( Math.max( 0, options.height - nonContentHeight ) );
-		}
-
-		if ( this.uiDialog.is( ":data(ui-resizable)" ) ) {
-			this.uiDialog.resizable( "option", "minHeight", this._minHeight() );
-		}
-	},
-
-	_blockFrames: function() {
-		this.iframeBlocks = this.document.find( "iframe" ).map(function() {
-			var iframe = $( this );
-
-			return $( "<div>" )
-				.css({
-					position: "absolute",
-					width: iframe.outerWidth(),
-					height: iframe.outerHeight()
-				})
-				.appendTo( iframe.parent() )
-				.offset( iframe.offset() )[0];
-		});
-	},
-
-	_unblockFrames: function() {
-		if ( this.iframeBlocks ) {
-			this.iframeBlocks.remove();
-			delete this.iframeBlocks;
-		}
-	},
-
-	_allowInteraction: function( event ) {
-		if ( $( event.target ).closest( ".ui-dialog" ).length ) {
-			return true;
-		}
-
-		// TODO: Remove hack when datepicker implements
-		// the .ui-front logic (#8989)
-		return !!$( event.target ).closest( ".ui-datepicker" ).length;
-	},
-
-	_createOverlay: function() {
-		if ( !this.options.modal ) {
-			return;
-		}
-
-		// We use a delay in case the overlay is created from an
-		// event that we're going to be cancelling (#2804)
-		var isOpening = true;
-		this._delay(function() {
-			isOpening = false;
-		});
-
-		if ( !this.document.data( "ui-dialog-overlays" ) ) {
-
-			// Prevent use of anchors and inputs
-			// Using _on() for an event handler shared across many instances is
-			// safe because the dialogs stack and must be closed in reverse order
-			this._on( this.document, {
-				focusin: function( event ) {
-					if ( isOpening ) {
-						return;
-					}
-
-					if ( !this._allowInteraction( event ) ) {
-						event.preventDefault();
-						this._trackingInstances()[ 0 ]._focusTabbable();
-					}
-				}
-			});
-		}
-
-		this.overlay = $( "<div>" )
-			.addClass( "ui-widget-overlay ui-front" )
-			.appendTo( this._appendTo() );
-		this._on( this.overlay, {
-			mousedown: "_keepFocus"
-		});
-		this.document.data( "ui-dialog-overlays",
-			(this.document.data( "ui-dialog-overlays" ) || 0) + 1 );
-	},
-
-	_destroyOverlay: function() {
-		if ( !this.options.modal ) {
-			return;
-		}
-
-		if ( this.overlay ) {
-			var overlays = this.document.data( "ui-dialog-overlays" ) - 1;
-
-			if ( !overlays ) {
-				this.document
-					.unbind( "focusin" )
-					.removeData( "ui-dialog-overlays" );
-			} else {
-				this.document.data( "ui-dialog-overlays", overlays );
-			}
-
-			this.overlay.remove();
-			this.overlay = null;
-		}
-	}
-});
-
-}));
diff --git a/#pma/js/jquery/src/jquery-ui/draggable.js b/#pma/js/jquery/src/jquery-ui/draggable.js
deleted file mode 100644
index 2d412bdb..00000000
--- a/#pma/js/jquery/src/jquery-ui/draggable.js
+++ /dev/null
@@ -1,1132 +0,0 @@
-/*!
- * jQuery UI Draggable 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/draggable/
- */
-(function( factory ) {
-	if ( typeof define === "function" && define.amd ) {
-
-		// AMD. Register as an anonymous module.
-		define([
-			"jquery",
-			"./core",
-			"./mouse",
-			"./widget"
-		], factory );
-	} else {
-
-		// Browser globals
-		factory( jQuery );
-	}
-}(function( $ ) {
-
-$.widget("ui.draggable", $.ui.mouse, {
-	version: "1.11.4",
-	widgetEventPrefix: "drag",
-	options: {
-		addClasses: true,
-		appendTo: "parent",
-		axis: false,
-		connectToSortable: false,
-		containment: false,
-		cursor: "auto",
-		cursorAt: false,
-		grid: false,
-		handle: false,
-		helper: "original",
-		iframeFix: false,
-		opacity: false,
-		refreshPositions: false,
-		revert: false,
-		revertDuration: 500,
-		scope: "default",
-		scroll: true,
-		scrollSensitivity: 20,
-		scrollSpeed: 20,
-		snap: false,
-		snapMode: "both",
-		snapTolerance: 20,
-		stack: false,
-		zIndex: false,
-
-		// callbacks
-		drag: null,
-		start: null,
-		stop: null
-	},
-	_create: function() {
-
-		if ( this.options.helper === "original" ) {
-			this._setPositionRelative();
-		}
-		if (this.options.addClasses){
-			this.element.addClass("ui-draggable");
-		}
-		if (this.options.disabled){
-			this.element.addClass("ui-draggable-disabled");
-		}
-		this._setHandleClassName();
-
-		this._mouseInit();
-	},
-
-	_setOption: function( key, value ) {
-		this._super( key, value );
-		if ( key === "handle" ) {
-			this._removeHandleClassName();
-			this._setHandleClassName();
-		}
-	},
-
-	_destroy: function() {
-		if ( ( this.helper || this.element ).is( ".ui-draggable-dragging" ) ) {
-			this.destroyOnClear = true;
-			return;
-		}
-		this.element.removeClass( "ui-draggable ui-draggable-dragging ui-draggable-disabled" );
-		this._removeHandleClassName();
-		this._mouseDestroy();
-	},
-
-	_mouseCapture: function(event) {
-		var o = this.options;
-
-		this._blurActiveElement( event );
-
-		// among others, prevent a drag on a resizable-handle
-		if (this.helper || o.disabled || $(event.target).closest(".ui-resizable-handle").length > 0) {
-			return false;
-		}
-
-		//Quit if we're not on a valid handle
-		this.handle = this._getHandle(event);
-		if (!this.handle) {
-			return false;
-		}
-
-		this._blockFrames( o.iframeFix === true ? "iframe" : o.iframeFix );
-
-		return true;
-
-	},
-
-	_blockFrames: function( selector ) {
-		this.iframeBlocks = this.document.find( selector ).map(function() {
-			var iframe = $( this );
-
-			return $( "<div>" )
-				.css( "position", "absolute" )
-				.appendTo( iframe.parent() )
-				.outerWidth( iframe.outerWidth() )
-				.outerHeight( iframe.outerHeight() )
-				.offset( iframe.offset() )[ 0 ];
-		});
-	},
-
-	_unblockFrames: function() {
-		if ( this.iframeBlocks ) {
-			this.iframeBlocks.remove();
-			delete this.iframeBlocks;
-		}
-	},
-
-	_blurActiveElement: function( event ) {
-		var document = this.document[ 0 ];
-
-		// Only need to blur if the event occurred on the draggable itself, see #10527
-		if ( !this.handleElement.is( event.target ) ) {
-			return;
-		}
-
-		// support: IE9
-		// IE9 throws an "Unspecified error" accessing document.activeElement from an <iframe>
-		try {
-
-			// Support: IE9, IE10
-			// If the <body> is blurred, IE will switch windows, see #9520
-			if ( document.activeElement && document.activeElement.nodeName.toLowerCase() !== "body" ) {
-
-				// Blur any element that currently has focus, see #4261
-				$( document.activeElement ).blur();
-			}
-		} catch ( error ) {}
-	},
-
-	_mouseStart: function(event) {
-
-		var o = this.options;
-
-		//Create and append the visible helper
-		this.helper = this._createHelper(event);
-
-		this.helper.addClass("ui-draggable-dragging");
-
-		//Cache the helper size
-		this._cacheHelperProportions();
-
-		//If ddmanager is used for droppables, set the global draggable
-		if ($.ui.ddmanager) {
-			$.ui.ddmanager.current = this;
-		}
-
-		/*
-		 * - Position generation -
-		 * This block generates everything position related - it's the core of draggables.
-		 */
-
-		//Cache the margins of the original element
-		this._cacheMargins();
-
-		//Store the helper's css position
-		this.cssPosition = this.helper.css( "position" );
-		this.scrollParent = this.helper.scrollParent( true );
-		this.offsetParent = this.helper.offsetParent();
-		this.hasFixedAncestor = this.helper.parents().filter(function() {
-				return $( this ).css( "position" ) === "fixed";
-			}).length > 0;
-
-		//The element's absolute position on the page minus margins
-		this.positionAbs = this.element.offset();
-		this._refreshOffsets( event );
-
-		//Generate the original position
-		this.originalPosition = this.position = this._generatePosition( event, false );
-		this.originalPageX = event.pageX;
-		this.originalPageY = event.pageY;
-
-		//Adjust the mouse offset relative to the helper if "cursorAt" is supplied
-		(o.cursorAt && this._adjustOffsetFromHelper(o.cursorAt));
-
-		//Set a containment if given in the options
-		this._setContainment();
-
-		//Trigger event + callbacks
-		if (this._trigger("start", event) === false) {
-			this._clear();
-			return false;
-		}
-
-		//Recache the helper size
-		this._cacheHelperProportions();
-
-		//Prepare the droppable offsets
-		if ($.ui.ddmanager && !o.dropBehaviour) {
-			$.ui.ddmanager.prepareOffsets(this, event);
-		}
-
-		// Reset helper's right/bottom css if they're set and set explicit width/height instead
-		// as this prevents resizing of elements with right/bottom set (see #7772)
-		this._normalizeRightBottom();
-
-		this._mouseDrag(event, true); //Execute the drag once - this causes the helper not to be visible before getting its correct position
-
-		//If the ddmanager is used for droppables, inform the manager that dragging has started (see #5003)
-		if ( $.ui.ddmanager ) {
-			$.ui.ddmanager.dragStart(this, event);
-		}
-
-		return true;
-	},
-
-	_refreshOffsets: function( event ) {
-		this.offset = {
-			top: this.positionAbs.top - this.margins.top,
-			left: this.positionAbs.left - this.margins.left,
-			scroll: false,
-			parent: this._getParentOffset(),
-			relative: this._getRelativeOffset()
-		};
-
-		this.offset.click = {
-			left: event.pageX - this.offset.left,
-			top: event.pageY - this.offset.top
-		};
-	},
-
-	_mouseDrag: function(event, noPropagation) {
-		// reset any necessary cached properties (see #5009)
-		if ( this.hasFixedAncestor ) {
-			this.offset.parent = this._getParentOffset();
-		}
-
-		//Compute the helpers position
-		this.position = this._generatePosition( event, true );
-		this.positionAbs = this._convertPositionTo("absolute");
-
-		//Call plugins and callbacks and use the resulting position if something is returned
-		if (!noPropagation) {
-			var ui = this._uiHash();
-			if (this._trigger("drag", event, ui) === false) {
-				this._mouseUp({});
-				return false;
-			}
-			this.position = ui.position;
-		}
-
-		this.helper[ 0 ].style.left = this.position.left + "px";
-		this.helper[ 0 ].style.top = this.position.top + "px";
-
-		if ($.ui.ddmanager) {
-			$.ui.ddmanager.drag(this, event);
-		}
-
-		return false;
-	},
-
-	_mouseStop: function(event) {
-
-		//If we are using droppables, inform the manager about the drop
-		var that = this,
-			dropped = false;
-		if ($.ui.ddmanager && !this.options.dropBehaviour) {
-			dropped = $.ui.ddmanager.drop(this, event);
-		}
-
-		//if a drop comes from outside (a sortable)
-		if (this.dropped) {
-			dropped = this.dropped;
-			this.dropped = false;
-		}
-
-		if ((this.options.revert === "invalid" && !dropped) || (this.options.revert === "valid" && dropped) || this.options.revert === true || ($.isFunction(this.options.revert) && this.options.revert.call(this.element, dropped))) {
-			$(this.helper).animate(this.originalPosition, parseInt(this.options.revertDuration, 10), function() {
-				if (that._trigger("stop", event) !== false) {
-					that._clear();
-				}
-			});
-		} else {
-			if (this._trigger("stop", event) !== false) {
-				this._clear();
-			}
-		}
-
-		return false;
-	},
-
-	_mouseUp: function( event ) {
-		this._unblockFrames();
-
-		//If the ddmanager is used for droppables, inform the manager that dragging has stopped (see #5003)
-		if ( $.ui.ddmanager ) {
-			$.ui.ddmanager.dragStop(this, event);
-		}
-
-		// Only need to focus if the event occurred on the draggable itself, see #10527
-		if ( this.handleElement.is( event.target ) ) {
-			// The interaction is over; whether or not the click resulted in a drag, focus the element
-			this.element.focus();
-		}
-
-		return $.ui.mouse.prototype._mouseUp.call(this, event);
-	},
-
-	cancel: function() {
-
-		if (this.helper.is(".ui-draggable-dragging")) {
-			this._mouseUp({});
-		} else {
-			this._clear();
-		}
-
-		return this;
-
-	},
-
-	_getHandle: function(event) {
-		return this.options.handle ?
-			!!$( event.target ).closest( this.element.find( this.options.handle ) ).length :
-			true;
-	},
-
-	_setHandleClassName: function() {
-		this.handleElement = this.options.handle ?
-			this.element.find( this.options.handle ) : this.element;
-		this.handleElement.addClass( "ui-draggable-handle" );
-	},
-
-	_removeHandleClassName: function() {
-		this.handleElement.removeClass( "ui-draggable-handle" );
-	},
-
-	_createHelper: function(event) {
-
-		var o = this.options,
-			helperIsFunction = $.isFunction( o.helper ),
-			helper = helperIsFunction ?
-				$( o.helper.apply( this.element[ 0 ], [ event ] ) ) :
-				( o.helper === "clone" ?
-					this.element.clone().removeAttr( "id" ) :
-					this.element );
-
-		if (!helper.parents("body").length) {
-			helper.appendTo((o.appendTo === "parent" ? this.element[0].parentNode : o.appendTo));
-		}
-
-		// http://bugs.jqueryui.com/ticket/9446
-		// a helper function can return the original element
-		// which wouldn't have been set to relative in _create
-		if ( helperIsFunction && helper[ 0 ] === this.element[ 0 ] ) {
-			this._setPositionRelative();
-		}
-
-		if (helper[0] !== this.element[0] && !(/(fixed|absolute)/).test(helper.css("position"))) {
-			helper.css("position", "absolute");
-		}
-
-		return helper;
-
-	},
-
-	_setPositionRelative: function() {
-		if ( !( /^(?:r|a|f)/ ).test( this.element.css( "position" ) ) ) {
-			this.element[ 0 ].style.position = "relative";
-		}
-	},
-
-	_adjustOffsetFromHelper: function(obj) {
-		if (typeof obj === "string") {
-			obj = obj.split(" ");
-		}
-		if ($.isArray(obj)) {
-			obj = { left: +obj[0], top: +obj[1] || 0 };
-		}
-		if ("left" in obj) {
-			this.offset.click.left = obj.left + this.margins.left;
-		}
-		if ("right" in obj) {
-			this.offset.click.left = this.helperProportions.width - obj.right + this.margins.left;
-		}
-		if ("top" in obj) {
-			this.offset.click.top = obj.top + this.margins.top;
-		}
-		if ("bottom" in obj) {
-			this.offset.click.top = this.helperProportions.height - obj.bottom + this.margins.top;
-		}
-	},
-
-	_isRootNode: function( element ) {
-		return ( /(html|body)/i ).test( element.tagName ) || element === this.document[ 0 ];
-	},
-
-	_getParentOffset: function() {
-
-		//Get the offsetParent and cache its position
-		var po = this.offsetParent.offset(),
-			document = this.document[ 0 ];
-
-		// This is a special case where we need to modify a offset calculated on start, since the following happened:
-		// 1. The position of the helper is absolute, so it's position is calculated based on the next positioned parent
-		// 2. The actual offset parent is a child of the scroll parent, and the scroll parent isn't the document, which means that
-		//    the scroll is included in the initial calculation of the offset of the parent, and never recalculated upon drag
-		if (this.cssPosition === "absolute" && this.scrollParent[0] !== document && $.contains(this.scrollParent[0], this.offsetParent[0])) {
-			po.left += this.scrollParent.scrollLeft();
-			po.top += this.scrollParent.scrollTop();
-		}
-
-		if ( this._isRootNode( this.offsetParent[ 0 ] ) ) {
-			po = { top: 0, left: 0 };
-		}
-
-		return {
-			top: po.top + (parseInt(this.offsetParent.css("borderTopWidth"), 10) || 0),
-			left: po.left + (parseInt(this.offsetParent.css("borderLeftWidth"), 10) || 0)
-		};
-
-	},
-
-	_getRelativeOffset: function() {
-		if ( this.cssPosition !== "relative" ) {
-			return { top: 0, left: 0 };
-		}
-
-		var p = this.element.position(),
-			scrollIsRootNode = this._isRootNode( this.scrollParent[ 0 ] );
-
-		return {
-			top: p.top - ( parseInt(this.helper.css( "top" ), 10) || 0 ) + ( !scrollIsRootNode ? this.scrollParent.scrollTop() : 0 ),
-			left: p.left - ( parseInt(this.helper.css( "left" ), 10) || 0 ) + ( !scrollIsRootNode ? this.scrollParent.scrollLeft() : 0 )
-		};
-
-	},
-
-	_cacheMargins: function() {
-		this.margins = {
-			left: (parseInt(this.element.css("marginLeft"), 10) || 0),
-			top: (parseInt(this.element.css("marginTop"), 10) || 0),
-			right: (parseInt(this.element.css("marginRight"), 10) || 0),
-			bottom: (parseInt(this.element.css("marginBottom"), 10) || 0)
-		};
-	},
-
-	_cacheHelperProportions: function() {
-		this.helperProportions = {
-			width: this.helper.outerWidth(),
-			height: this.helper.outerHeight()
-		};
-	},
-
-	_setContainment: function() {
-
-		var isUserScrollable, c, ce,
-			o = this.options,
-			document = this.document[ 0 ];
-
-		this.relativeContainer = null;
-
-		if ( !o.containment ) {
-			this.containment = null;
-			return;
-		}
-
-		if ( o.containment === "window" ) {
-			this.containment = [
-				$( window ).scrollLeft() - this.offset.relative.left - this.offset.parent.left,
-				$( window ).scrollTop() - this.offset.relative.top - this.offset.parent.top,
-				$( window ).scrollLeft() + $( window ).width() - this.helperProportions.width - this.margins.left,
-				$( window ).scrollTop() + ( $( window ).height() || document.body.parentNode.scrollHeight ) - this.helperProportions.height - this.margins.top
-			];
-			return;
-		}
-
-		if ( o.containment === "document") {
-			this.containment = [
-				0,
-				0,
-				$( document ).width() - this.helperProportions.width - this.margins.left,
-				( $( document ).height() || document.body.parentNode.scrollHeight ) - this.helperProportions.height - this.margins.top
-			];
-			return;
-		}
-
-		if ( o.containment.constructor === Array ) {
-			this.containment = o.containment;
-			return;
-		}
-
-		if ( o.containment === "parent" ) {
-			o.containment = this.helper[ 0 ].parentNode;
-		}
-
-		c = $( o.containment );
-		ce = c[ 0 ];
-
-		if ( !ce ) {
-			return;
-		}
-
-		isUserScrollable = /(scroll|auto)/.test( c.css( "overflow" ) );
-
-		this.containment = [
-			( parseInt( c.css( "borderLeftWidth" ), 10 ) || 0 ) + ( parseInt( c.css( "paddingLeft" ), 10 ) || 0 ),
-			( parseInt( c.css( "borderTopWidth" ), 10 ) || 0 ) + ( parseInt( c.css( "paddingTop" ), 10 ) || 0 ),
-			( isUserScrollable ? Math.max( ce.scrollWidth, ce.offsetWidth ) : ce.offsetWidth ) -
-				( parseInt( c.css( "borderRightWidth" ), 10 ) || 0 ) -
-				( parseInt( c.css( "paddingRight" ), 10 ) || 0 ) -
-				this.helperProportions.width -
-				this.margins.left -
-				this.margins.right,
-			( isUserScrollable ? Math.max( ce.scrollHeight, ce.offsetHeight ) : ce.offsetHeight ) -
-				( parseInt( c.css( "borderBottomWidth" ), 10 ) || 0 ) -
-				( parseInt( c.css( "paddingBottom" ), 10 ) || 0 ) -
-				this.helperProportions.height -
-				this.margins.top -
-				this.margins.bottom
-		];
-		this.relativeContainer = c;
-	},
-
-	_convertPositionTo: function(d, pos) {
-
-		if (!pos) {
-			pos = this.position;
-		}
-
-		var mod = d === "absolute" ? 1 : -1,
-			scrollIsRootNode = this._isRootNode( this.scrollParent[ 0 ] );
-
-		return {
-			top: (
-				pos.top	+																// The absolute mouse position
-				this.offset.relative.top * mod +										// Only for relative positioned nodes: Relative offset from element to offset parent
-				this.offset.parent.top * mod -										// The offsetParent's offset without borders (offset + border)
-				( ( this.cssPosition === "fixed" ? -this.offset.scroll.top : ( scrollIsRootNode ? 0 : this.offset.scroll.top ) ) * mod)
-			),
-			left: (
-				pos.left +																// The absolute mouse position
-				this.offset.relative.left * mod +										// Only for relative positioned nodes: Relative offset from element to offset parent
-				this.offset.parent.left * mod	-										// The offsetParent's offset without borders (offset + border)
-				( ( this.cssPosition === "fixed" ? -this.offset.scroll.left : ( scrollIsRootNode ? 0 : this.offset.scroll.left ) ) * mod)
-			)
-		};
-
-	},
-
-	_generatePosition: function( event, constrainPosition ) {
-
-		var containment, co, top, left,
-			o = this.options,
-			scrollIsRootNode = this._isRootNode( this.scrollParent[ 0 ] ),
-			pageX = event.pageX,
-			pageY = event.pageY;
-
-		// Cache the scroll
-		if ( !scrollIsRootNode || !this.offset.scroll ) {
-			this.offset.scroll = {
-				top: this.scrollParent.scrollTop(),
-				left: this.scrollParent.scrollLeft()
-			};
-		}
-
-		/*
-		 * - Position constraining -
-		 * Constrain the position to a mix of grid, containment.
-		 */
-
-		// If we are not dragging yet, we won't check for options
-		if ( constrainPosition ) {
-			if ( this.containment ) {
-				if ( this.relativeContainer ){
-					co = this.relativeContainer.offset();
-					containment = [
-						this.containment[ 0 ] + co.left,
-						this.containment[ 1 ] + co.top,
-						this.containment[ 2 ] + co.left,
-						this.containment[ 3 ] + co.top
-					];
-				} else {
-					containment = this.containment;
-				}
-
-				if (event.pageX - this.offset.click.left < containment[0]) {
-					pageX = containment[0] + this.offset.click.left;
-				}
-				if (event.pageY - this.offset.click.top < containment[1]) {
-					pageY = containment[1] + this.offset.click.top;
-				}
-				if (event.pageX - this.offset.click.left > containment[2]) {
-					pageX = containment[2] + this.offset.click.left;
-				}
-				if (event.pageY - this.offset.click.top > containment[3]) {
-					pageY = containment[3] + this.offset.click.top;
-				}
-			}
-
-			if (o.grid) {
-				//Check for grid elements set to 0 to prevent divide by 0 error causing invalid argument errors in IE (see ticket #6950)
-				top = o.grid[1] ? this.originalPageY + Math.round((pageY - this.originalPageY) / o.grid[1]) * o.grid[1] : this.originalPageY;
-				pageY = containment ? ((top - this.offset.click.top >= containment[1] || top - this.offset.click.top > containment[3]) ? top : ((top - this.offset.click.top >= containment[1]) ? top - o.grid[1] : top + o.grid[1])) : top;
-
-				left = o.grid[0] ? this.originalPageX + Math.round((pageX - this.originalPageX) / o.grid[0]) * o.grid[0] : this.originalPageX;
-				pageX = containment ? ((left - this.offset.click.left >= containment[0] || left - this.offset.click.left > containment[2]) ? left : ((left - this.offset.click.left >= containment[0]) ? left - o.grid[0] : left + o.grid[0])) : left;
-			}
-
-			if ( o.axis === "y" ) {
-				pageX = this.originalPageX;
-			}
-
-			if ( o.axis === "x" ) {
-				pageY = this.originalPageY;
-			}
-		}
-
-		return {
-			top: (
-				pageY -																	// The absolute mouse position
-				this.offset.click.top	-												// Click offset (relative to the element)
-				this.offset.relative.top -												// Only for relative positioned nodes: Relative offset from element to offset parent
-				this.offset.parent.top +												// The offsetParent's offset without borders (offset + border)
-				( this.cssPosition === "fixed" ? -this.offset.scroll.top : ( scrollIsRootNode ? 0 : this.offset.scroll.top ) )
-			),
-			left: (
-				pageX -																	// The absolute mouse position
-				this.offset.click.left -												// Click offset (relative to the element)
-				this.offset.relative.left -												// Only for relative positioned nodes: Relative offset from element to offset parent
-				this.offset.parent.left +												// The offsetParent's offset without borders (offset + border)
-				( this.cssPosition === "fixed" ? -this.offset.scroll.left : ( scrollIsRootNode ? 0 : this.offset.scroll.left ) )
-			)
-		};
-
-	},
-
-	_clear: function() {
-		this.helper.removeClass("ui-draggable-dragging");
-		if (this.helper[0] !== this.element[0] && !this.cancelHelperRemoval) {
-			this.helper.remove();
-		}
-		this.helper = null;
-		this.cancelHelperRemoval = false;
-		if ( this.destroyOnClear ) {
-			this.destroy();
-		}
-	},
-
-	_normalizeRightBottom: function() {
-		if ( this.options.axis !== "y" && this.helper.css( "right" ) !== "auto" ) {
-			this.helper.width( this.helper.width() );
-			this.helper.css( "right", "auto" );
-		}
-		if ( this.options.axis !== "x" && this.helper.css( "bottom" ) !== "auto" ) {
-			this.helper.height( this.helper.height() );
-			this.helper.css( "bottom", "auto" );
-		}
-	},
-
-	// From now on bulk stuff - mainly helpers
-
-	_trigger: function( type, event, ui ) {
-		ui = ui || this._uiHash();
-		$.ui.plugin.call( this, type, [ event, ui, this ], true );
-
-		// Absolute position and offset (see #6884 ) have to be recalculated after plugins
-		if ( /^(drag|start|stop)/.test( type ) ) {
-			this.positionAbs = this._convertPositionTo( "absolute" );
-			ui.offset = this.positionAbs;
-		}
-		return $.Widget.prototype._trigger.call( this, type, event, ui );
-	},
-
-	plugins: {},
-
-	_uiHash: function() {
-		return {
-			helper: this.helper,
-			position: this.position,
-			originalPosition: this.originalPosition,
-			offset: this.positionAbs
-		};
-	}
-
-});
-
-$.ui.plugin.add( "draggable", "connectToSortable", {
-	start: function( event, ui, draggable ) {
-		var uiSortable = $.extend( {}, ui, {
-			item: draggable.element
-		});
-
-		draggable.sortables = [];
-		$( draggable.options.connectToSortable ).each(function() {
-			var sortable = $( this ).sortable( "instance" );
-
-			if ( sortable && !sortable.options.disabled ) {
-				draggable.sortables.push( sortable );
-
-				// refreshPositions is called at drag start to refresh the containerCache
-				// which is used in drag. This ensures it's initialized and synchronized
-				// with any changes that might have happened on the page since initialization.
-				sortable.refreshPositions();
-				sortable._trigger("activate", event, uiSortable);
-			}
-		});
-	},
-	stop: function( event, ui, draggable ) {
-		var uiSortable = $.extend( {}, ui, {
-			item: draggable.element
-		});
-
-		draggable.cancelHelperRemoval = false;
-
-		$.each( draggable.sortables, function() {
-			var sortable = this;
-
-			if ( sortable.isOver ) {
-				sortable.isOver = 0;
-
-				// Allow this sortable to handle removing the helper
-				draggable.cancelHelperRemoval = true;
-				sortable.cancelHelperRemoval = false;
-
-				// Use _storedCSS To restore properties in the sortable,
-				// as this also handles revert (#9675) since the draggable
-				// may have modified them in unexpected ways (#8809)
-				sortable._storedCSS = {
-					position: sortable.placeholder.css( "position" ),
-					top: sortable.placeholder.css( "top" ),
-					left: sortable.placeholder.css( "left" )
-				};
-
-				sortable._mouseStop(event);
-
-				// Once drag has ended, the sortable should return to using
-				// its original helper, not the shared helper from draggable
-				sortable.options.helper = sortable.options._helper;
-			} else {
-				// Prevent this Sortable from removing the helper.
-				// However, don't set the draggable to remove the helper
-				// either as another connected Sortable may yet handle the removal.
-				sortable.cancelHelperRemoval = true;
-
-				sortable._trigger( "deactivate", event, uiSortable );
-			}
-		});
-	},
-	drag: function( event, ui, draggable ) {
-		$.each( draggable.sortables, function() {
-			var innermostIntersecting = false,
-				sortable = this;
-
-			// Copy over variables that sortable's _intersectsWith uses
-			sortable.positionAbs = draggable.positionAbs;
-			sortable.helperProportions = draggable.helperProportions;
-			sortable.offset.click = draggable.offset.click;
-
-			if ( sortable._intersectsWith( sortable.containerCache ) ) {
-				innermostIntersecting = true;
-
-				$.each( draggable.sortables, function() {
-					// Copy over variables that sortable's _intersectsWith uses
-					this.positionAbs = draggable.positionAbs;
-					this.helperProportions = draggable.helperProportions;
-					this.offset.click = draggable.offset.click;
-
-					if ( this !== sortable &&
-							this._intersectsWith( this.containerCache ) &&
-							$.contains( sortable.element[ 0 ], this.element[ 0 ] ) ) {
-						innermostIntersecting = false;
-					}
-
-					return innermostIntersecting;
-				});
-			}
-
-			if ( innermostIntersecting ) {
-				// If it intersects, we use a little isOver variable and set it once,
-				// so that the move-in stuff gets fired only once.
-				if ( !sortable.isOver ) {
-					sortable.isOver = 1;
-
-					// Store draggable's parent in case we need to reappend to it later.
-					draggable._parent = ui.helper.parent();
-
-					sortable.currentItem = ui.helper
-						.appendTo( sortable.element )
-						.data( "ui-sortable-item", true );
-
-					// Store helper option to later restore it
-					sortable.options._helper = sortable.options.helper;
-
-					sortable.options.helper = function() {
-						return ui.helper[ 0 ];
-					};
-
-					// Fire the start events of the sortable with our passed browser event,
-					// and our own helper (so it doesn't create a new one)
-					event.target = sortable.currentItem[ 0 ];
-					sortable._mouseCapture( event, true );
-					sortable._mouseStart( event, true, true );
-
-					// Because the browser event is way off the new appended portlet,
-					// modify necessary variables to reflect the changes
-					sortable.offset.click.top = draggable.offset.click.top;
-					sortable.offset.click.left = draggable.offset.click.left;
-					sortable.offset.parent.left -= draggable.offset.parent.left -
-						sortable.offset.parent.left;
-					sortable.offset.parent.top -= draggable.offset.parent.top -
-						sortable.offset.parent.top;
-
-					draggable._trigger( "toSortable", event );
-
-					// Inform draggable that the helper is in a valid drop zone,
-					// used solely in the revert option to handle "valid/invalid".
-					draggable.dropped = sortable.element;
-
-					// Need to refreshPositions of all sortables in the case that
-					// adding to one sortable changes the location of the other sortables (#9675)
-					$.each( draggable.sortables, function() {
-						this.refreshPositions();
-					});
-
-					// hack so receive/update callbacks work (mostly)
-					draggable.currentItem = draggable.element;
-					sortable.fromOutside = draggable;
-				}
-
-				if ( sortable.currentItem ) {
-					sortable._mouseDrag( event );
-					// Copy the sortable's position because the draggable's can potentially reflect
-					// a relative position, while sortable is always absolute, which the dragged
-					// element has now become. (#8809)
-					ui.position = sortable.position;
-				}
-			} else {
-				// If it doesn't intersect with the sortable, and it intersected before,
-				// we fake the drag stop of the sortable, but make sure it doesn't remove
-				// the helper by using cancelHelperRemoval.
-				if ( sortable.isOver ) {
-
-					sortable.isOver = 0;
-					sortable.cancelHelperRemoval = true;
-
-					// Calling sortable's mouseStop would trigger a revert,
-					// so revert must be temporarily false until after mouseStop is called.
-					sortable.options._revert = sortable.options.revert;
-					sortable.options.revert = false;
-
-					sortable._trigger( "out", event, sortable._uiHash( sortable ) );
-					sortable._mouseStop( event, true );
-
-					// restore sortable behaviors that were modfied
-					// when the draggable entered the sortable area (#9481)
-					sortable.options.revert = sortable.options._revert;
-					sortable.options.helper = sortable.options._helper;
-
-					if ( sortable.placeholder ) {
-						sortable.placeholder.remove();
-					}
-
-					// Restore and recalculate the draggable's offset considering the sortable
-					// may have modified them in unexpected ways. (#8809, #10669)
-					ui.helper.appendTo( draggable._parent );
-					draggable._refreshOffsets( event );
-					ui.position = draggable._generatePosition( event, true );
-
-					draggable._trigger( "fromSortable", event );
-
-					// Inform draggable that the helper is no longer in a valid drop zone
-					draggable.dropped = false;
-
-					// Need to refreshPositions of all sortables just in case removing
-					// from one sortable changes the location of other sortables (#9675)
-					$.each( draggable.sortables, function() {
-						this.refreshPositions();
-					});
-				}
-			}
-		});
-	}
-});
-
-$.ui.plugin.add("draggable", "cursor", {
-	start: function( event, ui, instance ) {
-		var t = $( "body" ),
-			o = instance.options;
-
-		if (t.css("cursor")) {
-			o._cursor = t.css("cursor");
-		}
-		t.css("cursor", o.cursor);
-	},
-	stop: function( event, ui, instance ) {
-		var o = instance.options;
-		if (o._cursor) {
-			$("body").css("cursor", o._cursor);
-		}
-	}
-});
-
-$.ui.plugin.add("draggable", "opacity", {
-	start: function( event, ui, instance ) {
-		var t = $( ui.helper ),
-			o = instance.options;
-		if (t.css("opacity")) {
-			o._opacity = t.css("opacity");
-		}
-		t.css("opacity", o.opacity);
-	},
-	stop: function( event, ui, instance ) {
-		var o = instance.options;
-		if (o._opacity) {
-			$(ui.helper).css("opacity", o._opacity);
-		}
-	}
-});
-
-$.ui.plugin.add("draggable", "scroll", {
-	start: function( event, ui, i ) {
-		if ( !i.scrollParentNotHidden ) {
-			i.scrollParentNotHidden = i.helper.scrollParent( false );
-		}
-
-		if ( i.scrollParentNotHidden[ 0 ] !== i.document[ 0 ] && i.scrollParentNotHidden[ 0 ].tagName !== "HTML" ) {
-			i.overflowOffset = i.scrollParentNotHidden.offset();
-		}
-	},
-	drag: function( event, ui, i  ) {
-
-		var o = i.options,
-			scrolled = false,
-			scrollParent = i.scrollParentNotHidden[ 0 ],
-			document = i.document[ 0 ];
-
-		if ( scrollParent !== document && scrollParent.tagName !== "HTML" ) {
-			if ( !o.axis || o.axis !== "x" ) {
-				if ( ( i.overflowOffset.top + scrollParent.offsetHeight ) - event.pageY < o.scrollSensitivity ) {
-					scrollParent.scrollTop = scrolled = scrollParent.scrollTop + o.scrollSpeed;
-				} else if ( event.pageY - i.overflowOffset.top < o.scrollSensitivity ) {
-					scrollParent.scrollTop = scrolled = scrollParent.scrollTop - o.scrollSpeed;
-				}
-			}
-
-			if ( !o.axis || o.axis !== "y" ) {
-				if ( ( i.overflowOffset.left + scrollParent.offsetWidth ) - event.pageX < o.scrollSensitivity ) {
-					scrollParent.scrollLeft = scrolled = scrollParent.scrollLeft + o.scrollSpeed;
-				} else if ( event.pageX - i.overflowOffset.left < o.scrollSensitivity ) {
-					scrollParent.scrollLeft = scrolled = scrollParent.scrollLeft - o.scrollSpeed;
-				}
-			}
-
-		} else {
-
-			if (!o.axis || o.axis !== "x") {
-				if (event.pageY - $(document).scrollTop() < o.scrollSensitivity) {
-					scrolled = $(document).scrollTop($(document).scrollTop() - o.scrollSpeed);
-				} else if ($(window).height() - (event.pageY - $(document).scrollTop()) < o.scrollSensitivity) {
-					scrolled = $(document).scrollTop($(document).scrollTop() + o.scrollSpeed);
-				}
-			}
-
-			if (!o.axis || o.axis !== "y") {
-				if (event.pageX - $(document).scrollLeft() < o.scrollSensitivity) {
-					scrolled = $(document).scrollLeft($(document).scrollLeft() - o.scrollSpeed);
-				} else if ($(window).width() - (event.pageX - $(document).scrollLeft()) < o.scrollSensitivity) {
-					scrolled = $(document).scrollLeft($(document).scrollLeft() + o.scrollSpeed);
-				}
-			}
-
-		}
-
-		if (scrolled !== false && $.ui.ddmanager && !o.dropBehaviour) {
-			$.ui.ddmanager.prepareOffsets(i, event);
-		}
-
-	}
-});
-
-$.ui.plugin.add("draggable", "snap", {
-	start: function( event, ui, i ) {
-
-		var o = i.options;
-
-		i.snapElements = [];
-
-		$(o.snap.constructor !== String ? ( o.snap.items || ":data(ui-draggable)" ) : o.snap).each(function() {
-			var $t = $(this),
-				$o = $t.offset();
-			if (this !== i.element[0]) {
-				i.snapElements.push({
-					item: this,
-					width: $t.outerWidth(), height: $t.outerHeight(),
-					top: $o.top, left: $o.left
-				});
-			}
-		});
-
-	},
-	drag: function( event, ui, inst ) {
-
-		var ts, bs, ls, rs, l, r, t, b, i, first,
-			o = inst.options,
-			d = o.snapTolerance,
-			x1 = ui.offset.left, x2 = x1 + inst.helperProportions.width,
-			y1 = ui.offset.top, y2 = y1 + inst.helperProportions.height;
-
-		for (i = inst.snapElements.length - 1; i >= 0; i--){
-
-			l = inst.snapElements[i].left - inst.margins.left;
-			r = l + inst.snapElements[i].width;
-			t = inst.snapElements[i].top - inst.margins.top;
-			b = t + inst.snapElements[i].height;
-
-			if ( x2 < l - d || x1 > r + d || y2 < t - d || y1 > b + d || !$.contains( inst.snapElements[ i ].item.ownerDocument, inst.snapElements[ i ].item ) ) {
-				if (inst.snapElements[i].snapping) {
-					(inst.options.snap.release && inst.options.snap.release.call(inst.element, event, $.extend(inst._uiHash(), { snapItem: inst.snapElements[i].item })));
-				}
-				inst.snapElements[i].snapping = false;
-				continue;
-			}
-
-			if (o.snapMode !== "inner") {
-				ts = Math.abs(t - y2) <= d;
-				bs = Math.abs(b - y1) <= d;
-				ls = Math.abs(l - x2) <= d;
-				rs = Math.abs(r - x1) <= d;
-				if (ts) {
-					ui.position.top = inst._convertPositionTo("relative", { top: t - inst.helperProportions.height, left: 0 }).top;
-				}
-				if (bs) {
-					ui.position.top = inst._convertPositionTo("relative", { top: b, left: 0 }).top;
-				}
-				if (ls) {
-					ui.position.left = inst._convertPositionTo("relative", { top: 0, left: l - inst.helperProportions.width }).left;
-				}
-				if (rs) {
-					ui.position.left = inst._convertPositionTo("relative", { top: 0, left: r }).left;
-				}
-			}
-
-			first = (ts || bs || ls || rs);
-
-			if (o.snapMode !== "outer") {
-				ts = Math.abs(t - y1) <= d;
-				bs = Math.abs(b - y2) <= d;
-				ls = Math.abs(l - x1) <= d;
-				rs = Math.abs(r - x2) <= d;
-				if (ts) {
-					ui.position.top = inst._convertPositionTo("relative", { top: t, left: 0 }).top;
-				}
-				if (bs) {
-					ui.position.top = inst._convertPositionTo("relative", { top: b - inst.helperProportions.height, left: 0 }).top;
-				}
-				if (ls) {
-					ui.position.left = inst._convertPositionTo("relative", { top: 0, left: l }).left;
-				}
-				if (rs) {
-					ui.position.left = inst._convertPositionTo("relative", { top: 0, left: r - inst.helperProportions.width }).left;
-				}
-			}
-
-			if (!inst.snapElements[i].snapping && (ts || bs || ls || rs || first)) {
-				(inst.options.snap.snap && inst.options.snap.snap.call(inst.element, event, $.extend(inst._uiHash(), { snapItem: inst.snapElements[i].item })));
-			}
-			inst.snapElements[i].snapping = (ts || bs || ls || rs || first);
-
-		}
-
-	}
-});
-
-$.ui.plugin.add("draggable", "stack", {
-	start: function( event, ui, instance ) {
-		var min,
-			o = instance.options,
-			group = $.makeArray($(o.stack)).sort(function(a, b) {
-				return (parseInt($(a).css("zIndex"), 10) || 0) - (parseInt($(b).css("zIndex"), 10) || 0);
-			});
-
-		if (!group.length) { return; }
-
-		min = parseInt($(group[0]).css("zIndex"), 10) || 0;
-		$(group).each(function(i) {
-			$(this).css("zIndex", min + i);
-		});
-		this.css("zIndex", (min + group.length));
-	}
-});
-
-$.ui.plugin.add("draggable", "zIndex", {
-	start: function( event, ui, instance ) {
-		var t = $( ui.helper ),
-			o = instance.options;
-
-		if (t.css("zIndex")) {
-			o._zIndex = t.css("zIndex");
-		}
-		t.css("zIndex", o.zIndex);
-	},
-	stop: function( event, ui, instance ) {
-		var o = instance.options;
-
-		if (o._zIndex) {
-			$(ui.helper).css("zIndex", o._zIndex);
-		}
-	}
-});
-
-return $.ui.draggable;
-
-}));
diff --git a/#pma/js/jquery/src/jquery-ui/droppable.js b/#pma/js/jquery/src/jquery-ui/droppable.js
deleted file mode 100644
index 593b66a6..00000000
--- a/#pma/js/jquery/src/jquery-ui/droppable.js
+++ /dev/null
@@ -1,413 +0,0 @@
-/*!
- * jQuery UI Droppable 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/droppable/
- */
-(function( factory ) {
-	if ( typeof define === "function" && define.amd ) {
-
-		// AMD. Register as an anonymous module.
-		define([
-			"jquery",
-			"./core",
-			"./widget",
-			"./mouse",
-			"./draggable"
-		], factory );
-	} else {
-
-		// Browser globals
-		factory( jQuery );
-	}
-}(function( $ ) {
-
-$.widget( "ui.droppable", {
-	version: "1.11.4",
-	widgetEventPrefix: "drop",
-	options: {
-		accept: "*",
-		activeClass: false,
-		addClasses: true,
-		greedy: false,
-		hoverClass: false,
-		scope: "default",
-		tolerance: "intersect",
-
-		// callbacks
-		activate: null,
-		deactivate: null,
-		drop: null,
-		out: null,
-		over: null
-	},
-	_create: function() {
-
-		var proportions,
-			o = this.options,
-			accept = o.accept;
-
-		this.isover = false;
-		this.isout = true;
-
-		this.accept = $.isFunction( accept ) ? accept : function( d ) {
-			return d.is( accept );
-		};
-
-		this.proportions = function( /* valueToWrite */ ) {
-			if ( arguments.length ) {
-				// Store the droppable's proportions
-				proportions = arguments[ 0 ];
-			} else {
-				// Retrieve or derive the droppable's proportions
-				return proportions ?
-					proportions :
-					proportions = {
-						width: this.element[ 0 ].offsetWidth,
-						height: this.element[ 0 ].offsetHeight
-					};
-			}
-		};
-
-		this._addToManager( o.scope );
-
-		o.addClasses && this.element.addClass( "ui-droppable" );
-
-	},
-
-	_addToManager: function( scope ) {
-		// Add the reference and positions to the manager
-		$.ui.ddmanager.droppables[ scope ] = $.ui.ddmanager.droppables[ scope ] || [];
-		$.ui.ddmanager.droppables[ scope ].push( this );
-	},
-
-	_splice: function( drop ) {
-		var i = 0;
-		for ( ; i < drop.length; i++ ) {
-			if ( drop[ i ] === this ) {
-				drop.splice( i, 1 );
-			}
-		}
-	},
-
-	_destroy: function() {
-		var drop = $.ui.ddmanager.droppables[ this.options.scope ];
-
-		this._splice( drop );
-
-		this.element.removeClass( "ui-droppable ui-droppable-disabled" );
-	},
-
-	_setOption: function( key, value ) {
-
-		if ( key === "accept" ) {
-			this.accept = $.isFunction( value ) ? value : function( d ) {
-				return d.is( value );
-			};
-		} else if ( key === "scope" ) {
-			var drop = $.ui.ddmanager.droppables[ this.options.scope ];
-
-			this._splice( drop );
-			this._addToManager( value );
-		}
-
-		this._super( key, value );
-	},
-
-	_activate: function( event ) {
-		var draggable = $.ui.ddmanager.current;
-		if ( this.options.activeClass ) {
-			this.element.addClass( this.options.activeClass );
-		}
-		if ( draggable ){
-			this._trigger( "activate", event, this.ui( draggable ) );
-		}
-	},
-
-	_deactivate: function( event ) {
-		var draggable = $.ui.ddmanager.current;
-		if ( this.options.activeClass ) {
-			this.element.removeClass( this.options.activeClass );
-		}
-		if ( draggable ){
-			this._trigger( "deactivate", event, this.ui( draggable ) );
-		}
-	},
-
-	_over: function( event ) {
-
-		var draggable = $.ui.ddmanager.current;
-
-		// Bail if draggable and droppable are same element
-		if ( !draggable || ( draggable.currentItem || draggable.element )[ 0 ] === this.element[ 0 ] ) {
-			return;
-		}
-
-		if ( this.accept.call( this.element[ 0 ], ( draggable.currentItem || draggable.element ) ) ) {
-			if ( this.options.hoverClass ) {
-				this.element.addClass( this.options.hoverClass );
-			}
-			this._trigger( "over", event, this.ui( draggable ) );
-		}
-
-	},
-
-	_out: function( event ) {
-
-		var draggable = $.ui.ddmanager.current;
-
-		// Bail if draggable and droppable are same element
-		if ( !draggable || ( draggable.currentItem || draggable.element )[ 0 ] === this.element[ 0 ] ) {
-			return;
-		}
-
-		if ( this.accept.call( this.element[ 0 ], ( draggable.currentItem || draggable.element ) ) ) {
-			if ( this.options.hoverClass ) {
-				this.element.removeClass( this.options.hoverClass );
-			}
-			this._trigger( "out", event, this.ui( draggable ) );
-		}
-
-	},
-
-	_drop: function( event, custom ) {
-
-		var draggable = custom || $.ui.ddmanager.current,
-			childrenIntersection = false;
-
-		// Bail if draggable and droppable are same element
-		if ( !draggable || ( draggable.currentItem || draggable.element )[ 0 ] === this.element[ 0 ] ) {
-			return false;
-		}
-
-		this.element.find( ":data(ui-droppable)" ).not( ".ui-draggable-dragging" ).each(function() {
-			var inst = $( this ).droppable( "instance" );
-			if (
-				inst.options.greedy &&
-				!inst.options.disabled &&
-				inst.options.scope === draggable.options.scope &&
-				inst.accept.call( inst.element[ 0 ], ( draggable.currentItem || draggable.element ) ) &&
-				$.ui.intersect( draggable, $.extend( inst, { offset: inst.element.offset() } ), inst.options.tolerance, event )
-			) { childrenIntersection = true; return false; }
-		});
-		if ( childrenIntersection ) {
-			return false;
-		}
-
-		if ( this.accept.call( this.element[ 0 ], ( draggable.currentItem || draggable.element ) ) ) {
-			if ( this.options.activeClass ) {
-				this.element.removeClass( this.options.activeClass );
-			}
-			if ( this.options.hoverClass ) {
-				this.element.removeClass( this.options.hoverClass );
-			}
-			this._trigger( "drop", event, this.ui( draggable ) );
-			return this.element;
-		}
-
-		return false;
-
-	},
-
-	ui: function( c ) {
-		return {
-			draggable: ( c.currentItem || c.element ),
-			helper: c.helper,
-			position: c.position,
-			offset: c.positionAbs
-		};
-	}
-
-});
-
-$.ui.intersect = (function() {
-	function isOverAxis( x, reference, size ) {
-		return ( x >= reference ) && ( x < ( reference + size ) );
-	}
-
-	return function( draggable, droppable, toleranceMode, event ) {
-
-		if ( !droppable.offset ) {
-			return false;
-		}
-
-		var x1 = ( draggable.positionAbs || draggable.position.absolute ).left + draggable.margins.left,
-			y1 = ( draggable.positionAbs || draggable.position.absolute ).top + draggable.margins.top,
-			x2 = x1 + draggable.helperProportions.width,
-			y2 = y1 + draggable.helperProportions.height,
-			l = droppable.offset.left,
-			t = droppable.offset.top,
-			r = l + droppable.proportions().width,
-			b = t + droppable.proportions().height;
-
-		switch ( toleranceMode ) {
-		case "fit":
-			return ( l <= x1 && x2 <= r && t <= y1 && y2 <= b );
-		case "intersect":
-			return ( l < x1 + ( draggable.helperProportions.width / 2 ) && // Right Half
-				x2 - ( draggable.helperProportions.width / 2 ) < r && // Left Half
-				t < y1 + ( draggable.helperProportions.height / 2 ) && // Bottom Half
-				y2 - ( draggable.helperProportions.height / 2 ) < b ); // Top Half
-		case "pointer":
-			return isOverAxis( event.pageY, t, droppable.proportions().height ) && isOverAxis( event.pageX, l, droppable.proportions().width );
-		case "touch":
-			return (
-				( y1 >= t && y1 <= b ) || // Top edge touching
-				( y2 >= t && y2 <= b ) || // Bottom edge touching
-				( y1 < t && y2 > b ) // Surrounded vertically
-			) && (
-				( x1 >= l && x1 <= r ) || // Left edge touching
-				( x2 >= l && x2 <= r ) || // Right edge touching
-				( x1 < l && x2 > r ) // Surrounded horizontally
-			);
-		default:
-			return false;
-		}
-	};
-})();
-
-/*
-	This manager tracks offsets of draggables and droppables
-*/
-$.ui.ddmanager = {
-	current: null,
-	droppables: { "default": [] },
-	prepareOffsets: function( t, event ) {
-
-		var i, j,
-			m = $.ui.ddmanager.droppables[ t.options.scope ] || [],
-			type = event ? event.type : null, // workaround for #2317
-			list = ( t.currentItem || t.element ).find( ":data(ui-droppable)" ).addBack();
-
-		droppablesLoop: for ( i = 0; i < m.length; i++ ) {
-
-			// No disabled and non-accepted
-			if ( m[ i ].options.disabled || ( t && !m[ i ].accept.call( m[ i ].element[ 0 ], ( t.currentItem || t.element ) ) ) ) {
-				continue;
-			}
-
-			// Filter out elements in the current dragged item
-			for ( j = 0; j < list.length; j++ ) {
-				if ( list[ j ] === m[ i ].element[ 0 ] ) {
-					m[ i ].proportions().height = 0;
-					continue droppablesLoop;
-				}
-			}
-
-			m[ i ].visible = m[ i ].element.css( "display" ) !== "none";
-			if ( !m[ i ].visible ) {
-				continue;
-			}
-
-			// Activate the droppable if used directly from draggables
-			if ( type === "mousedown" ) {
-				m[ i ]._activate.call( m[ i ], event );
-			}
-
-			m[ i ].offset = m[ i ].element.offset();
-			m[ i ].proportions({ width: m[ i ].element[ 0 ].offsetWidth, height: m[ i ].element[ 0 ].offsetHeight });
-
-		}
-
-	},
-	drop: function( draggable, event ) {
-
-		var dropped = false;
-		// Create a copy of the droppables in case the list changes during the drop (#9116)
-		$.each( ( $.ui.ddmanager.droppables[ draggable.options.scope ] || [] ).slice(), function() {
-
-			if ( !this.options ) {
-				return;
-			}
-			if ( !this.options.disabled && this.visible && $.ui.intersect( draggable, this, this.options.tolerance, event ) ) {
-				dropped = this._drop.call( this, event ) || dropped;
-			}
-
-			if ( !this.options.disabled && this.visible && this.accept.call( this.element[ 0 ], ( draggable.currentItem || draggable.element ) ) ) {
-				this.isout = true;
-				this.isover = false;
-				this._deactivate.call( this, event );
-			}
-
-		});
-		return dropped;
-
-	},
-	dragStart: function( draggable, event ) {
-		// Listen for scrolling so that if the dragging causes scrolling the position of the droppables can be recalculated (see #5003)
-		draggable.element.parentsUntil( "body" ).bind( "scroll.droppable", function() {
-			if ( !draggable.options.refreshPositions ) {
-				$.ui.ddmanager.prepareOffsets( draggable, event );
-			}
-		});
-	},
-	drag: function( draggable, event ) {
-
-		// If you have a highly dynamic page, you might try this option. It renders positions every time you move the mouse.
-		if ( draggable.options.refreshPositions ) {
-			$.ui.ddmanager.prepareOffsets( draggable, event );
-		}
-
-		// Run through all droppables and check their positions based on specific tolerance options
-		$.each( $.ui.ddmanager.droppables[ draggable.options.scope ] || [], function() {
-
-			if ( this.options.disabled || this.greedyChild || !this.visible ) {
-				return;
-			}
-
-			var parentInstance, scope, parent,
-				intersects = $.ui.intersect( draggable, this, this.options.tolerance, event ),
-				c = !intersects && this.isover ? "isout" : ( intersects && !this.isover ? "isover" : null );
-			if ( !c ) {
-				return;
-			}
-
-			if ( this.options.greedy ) {
-				// find droppable parents with same scope
-				scope = this.options.scope;
-				parent = this.element.parents( ":data(ui-droppable)" ).filter(function() {
-					return $( this ).droppable( "instance" ).options.scope === scope;
-				});
-
-				if ( parent.length ) {
-					parentInstance = $( parent[ 0 ] ).droppable( "instance" );
-					parentInstance.greedyChild = ( c === "isover" );
-				}
-			}
-
-			// we just moved into a greedy child
-			if ( parentInstance && c === "isover" ) {
-				parentInstance.isover = false;
-				parentInstance.isout = true;
-				parentInstance._out.call( parentInstance, event );
-			}
-
-			this[ c ] = true;
-			this[c === "isout" ? "isover" : "isout"] = false;
-			this[c === "isover" ? "_over" : "_out"].call( this, event );
-
-			// we just moved out of a greedy child
-			if ( parentInstance && c === "isout" ) {
-				parentInstance.isout = false;
-				parentInstance.isover = true;
-				parentInstance._over.call( parentInstance, event );
-			}
-		});
-
-	},
-	dragStop: function( draggable, event ) {
-		draggable.element.parentsUntil( "body" ).unbind( "scroll.droppable" );
-		// Call prepareOffsets one final time since IE does not fire return scroll events when overflow was caused by drag (see #5003)
-		if ( !draggable.options.refreshPositions ) {
-			$.ui.ddmanager.prepareOffsets( draggable, event );
-		}
-	}
-};
-
-return $.ui.droppable;
-
-}));
diff --git a/#pma/js/jquery/src/jquery-ui/effect-blind.js b/#pma/js/jquery/src/jquery-ui/effect-blind.js
deleted file mode 100644
index a4a48ea5..00000000
--- a/#pma/js/jquery/src/jquery-ui/effect-blind.js
+++ /dev/null
@@ -1,90 +0,0 @@
-/*!
- * jQuery UI Effects Blind 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/blind-effect/
- */
-(function( factory ) {
-	if ( typeof define === "function" && define.amd ) {
-
-		// AMD. Register as an anonymous module.
-		define([
-			"jquery",
-			"./effect"
-		], factory );
-	} else {
-
-		// Browser globals
-		factory( jQuery );
-	}
-}(function( $ ) {
-
-return $.effects.effect.blind = function( o, done ) {
-	// Create element
-	var el = $( this ),
-		rvertical = /up|down|vertical/,
-		rpositivemotion = /up|left|vertical|horizontal/,
-		props = [ "position", "top", "bottom", "left", "right", "height", "width" ],
-		mode = $.effects.setMode( el, o.mode || "hide" ),
-		direction = o.direction || "up",
-		vertical = rvertical.test( direction ),
-		ref = vertical ? "height" : "width",
-		ref2 = vertical ? "top" : "left",
-		motion = rpositivemotion.test( direction ),
-		animation = {},
-		show = mode === "show",
-		wrapper, distance, margin;
-
-	// if already wrapped, the wrapper's properties are my property. #6245
-	if ( el.parent().is( ".ui-effects-wrapper" ) ) {
-		$.effects.save( el.parent(), props );
-	} else {
-		$.effects.save( el, props );
-	}
-	el.show();
-	wrapper = $.effects.createWrapper( el ).css({
-		overflow: "hidden"
-	});
-
-	distance = wrapper[ ref ]();
-	margin = parseFloat( wrapper.css( ref2 ) ) || 0;
-
-	animation[ ref ] = show ? distance : 0;
-	if ( !motion ) {
-		el
-			.css( vertical ? "bottom" : "right", 0 )
-			.css( vertical ? "top" : "left", "auto" )
-			.css({ position: "absolute" });
-
-		animation[ ref2 ] = show ? margin : distance + margin;
-	}
-
-	// start at 0 if we are showing
-	if ( show ) {
-		wrapper.css( ref, 0 );
-		if ( !motion ) {
-			wrapper.css( ref2, margin + distance );
-		}
-	}
-
-	// Animate
-	wrapper.animate( animation, {
-		duration: o.duration,
-		easing: o.easing,
-		queue: false,
-		complete: function() {
-			if ( mode === "hide" ) {
-				el.hide();
-			}
-			$.effects.restore( el, props );
-			$.effects.removeWrapper( el );
-			done();
-		}
-	});
-};
-
-}));
diff --git a/#pma/js/jquery/src/jquery-ui/effect-bounce.js b/#pma/js/jquery/src/jquery-ui/effect-bounce.js
deleted file mode 100644
index 93a7a52e..00000000
--- a/#pma/js/jquery/src/jquery-ui/effect-bounce.js
+++ /dev/null
@@ -1,123 +0,0 @@
-/*!
- * jQuery UI Effects Bounce 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/bounce-effect/
- */
-(function( factory ) {
-	if ( typeof define === "function" && define.amd ) {
-
-		// AMD. Register as an anonymous module.
-		define([
-			"jquery",
-			"./effect"
-		], factory );
-	} else {
-
-		// Browser globals
-		factory( jQuery );
-	}
-}(function( $ ) {
-
-return $.effects.effect.bounce = function( o, done ) {
-	var el = $( this ),
-		props = [ "position", "top", "bottom", "left", "right", "height", "width" ],
-
-		// defaults:
-		mode = $.effects.setMode( el, o.mode || "effect" ),
-		hide = mode === "hide",
-		show = mode === "show",
-		direction = o.direction || "up",
-		distance = o.distance,
-		times = o.times || 5,
-
-		// number of internal animations
-		anims = times * 2 + ( show || hide ? 1 : 0 ),
-		speed = o.duration / anims,
-		easing = o.easing,
-
-		// utility:
-		ref = ( direction === "up" || direction === "down" ) ? "top" : "left",
-		motion = ( direction === "up" || direction === "left" ),
-		i,
-		upAnim,
-		downAnim,
-
-		// we will need to re-assemble the queue to stack our animations in place
-		queue = el.queue(),
-		queuelen = queue.length;
-
-	// Avoid touching opacity to prevent clearType and PNG issues in IE
-	if ( show || hide ) {
-		props.push( "opacity" );
-	}
-
-	$.effects.save( el, props );
-	el.show();
-	$.effects.createWrapper( el ); // Create Wrapper
-
-	// default distance for the BIGGEST bounce is the outer Distance / 3
-	if ( !distance ) {
-		distance = el[ ref === "top" ? "outerHeight" : "outerWidth" ]() / 3;
-	}
-
-	if ( show ) {
-		downAnim = { opacity: 1 };
-		downAnim[ ref ] = 0;
-
-		// if we are showing, force opacity 0 and set the initial position
-		// then do the "first" animation
-		el.css( "opacity", 0 )
-			.css( ref, motion ? -distance * 2 : distance * 2 )
-			.animate( downAnim, speed, easing );
-	}
-
-	// start at the smallest distance if we are hiding
-	if ( hide ) {
-		distance = distance / Math.pow( 2, times - 1 );
-	}
-
-	downAnim = {};
-	downAnim[ ref ] = 0;
-	// Bounces up/down/left/right then back to 0 -- times * 2 animations happen here
-	for ( i = 0; i < times; i++ ) {
-		upAnim = {};
-		upAnim[ ref ] = ( motion ? "-=" : "+=" ) + distance;
-
-		el.animate( upAnim, speed, easing )
-			.animate( downAnim, speed, easing );
-
-		distance = hide ? distance * 2 : distance / 2;
-	}
-
-	// Last Bounce when Hiding
-	if ( hide ) {
-		upAnim = { opacity: 0 };
-		upAnim[ ref ] = ( motion ? "-=" : "+=" ) + distance;
-
-		el.animate( upAnim, speed, easing );
-	}
-
-	el.queue(function() {
-		if ( hide ) {
-			el.hide();
-		}
-		$.effects.restore( el, props );
-		$.effects.removeWrapper( el );
-		done();
-	});
-
-	// inject all the animations we just queued to be first in line (after "inprogress")
-	if ( queuelen > 1) {
-		queue.splice.apply( queue,
-			[ 1, 0 ].concat( queue.splice( queuelen, anims + 1 ) ) );
-	}
-	el.dequeue();
-
-};
-
-}));
diff --git a/#pma/js/jquery/src/jquery-ui/effect-clip.js b/#pma/js/jquery/src/jquery-ui/effect-clip.js
deleted file mode 100644
index a1977475..00000000
--- a/#pma/js/jquery/src/jquery-ui/effect-clip.js
+++ /dev/null
@@ -1,77 +0,0 @@
-/*!
- * jQuery UI Effects Clip 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/clip-effect/
- */
-(function( factory ) {
-	if ( typeof define === "function" && define.amd ) {
-
-		// AMD. Register as an anonymous module.
-		define([
-			"jquery",
-			"./effect"
-		], factory );
-	} else {
-
-		// Browser globals
-		factory( jQuery );
-	}
-}(function( $ ) {
-
-return $.effects.effect.clip = function( o, done ) {
-	// Create element
-	var el = $( this ),
-		props = [ "position", "top", "bottom", "left", "right", "height", "width" ],
-		mode = $.effects.setMode( el, o.mode || "hide" ),
-		show = mode === "show",
-		direction = o.direction || "vertical",
-		vert = direction === "vertical",
-		size = vert ? "height" : "width",
-		position = vert ? "top" : "left",
-		animation = {},
-		wrapper, animate, distance;
-
-	// Save & Show
-	$.effects.save( el, props );
-	el.show();
-
-	// Create Wrapper
-	wrapper = $.effects.createWrapper( el ).css({
-		overflow: "hidden"
-	});
-	animate = ( el[0].tagName === "IMG" ) ? wrapper : el;
-	distance = animate[ size ]();
-
-	// Shift
-	if ( show ) {
-		animate.css( size, 0 );
-		animate.css( position, distance / 2 );
-	}
-
-	// Create Animation Object:
-	animation[ size ] = show ? distance : 0;
-	animation[ position ] = show ? 0 : distance / 2;
-
-	// Animate
-	animate.animate( animation, {
-		queue: false,
-		duration: o.duration,
-		easing: o.easing,
-		complete: function() {
-			if ( !show ) {
-				el.hide();
-			}
-			$.effects.restore( el, props );
-			$.effects.removeWrapper( el );
-			done();
-		}
-	});
-
-};
-
-}));
diff --git a/#pma/js/jquery/src/jquery-ui/effect-drop.js b/#pma/js/jquery/src/jquery-ui/effect-drop.js
deleted file mode 100644
index f530be35..00000000
--- a/#pma/js/jquery/src/jquery-ui/effect-drop.js
+++ /dev/null
@@ -1,75 +0,0 @@
-/*!
- * jQuery UI Effects Drop 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/drop-effect/
- */
-(function( factory ) {
-	if ( typeof define === "function" && define.amd ) {
-
-		// AMD. Register as an anonymous module.
-		define([
-			"jquery",
-			"./effect"
-		], factory );
-	} else {
-
-		// Browser globals
-		factory( jQuery );
-	}
-}(function( $ ) {
-
-return $.effects.effect.drop = function( o, done ) {
-
-	var el = $( this ),
-		props = [ "position", "top", "bottom", "left", "right", "opacity", "height", "width" ],
-		mode = $.effects.setMode( el, o.mode || "hide" ),
-		show = mode === "show",
-		direction = o.direction || "left",
-		ref = ( direction === "up" || direction === "down" ) ? "top" : "left",
-		motion = ( direction === "up" || direction === "left" ) ? "pos" : "neg",
-		animation = {
-			opacity: show ? 1 : 0
-		},
-		distance;
-
-	// Adjust
-	$.effects.save( el, props );
-	el.show();
-	$.effects.createWrapper( el );
-
-	distance = o.distance || el[ ref === "top" ? "outerHeight" : "outerWidth" ]( true ) / 2;
-
-	if ( show ) {
-		el
-			.css( "opacity", 0 )
-			.css( ref, motion === "pos" ? -distance : distance );
-	}
-
-	// Animation
-	animation[ ref ] = ( show ?
-		( motion === "pos" ? "+=" : "-=" ) :
-		( motion === "pos" ? "-=" : "+=" ) ) +
-		distance;
-
-	// Animate
-	el.animate( animation, {
-		queue: false,
-		duration: o.duration,
-		easing: o.easing,
-		complete: function() {
-			if ( mode === "hide" ) {
-				el.hide();
-			}
-			$.effects.restore( el, props );
-			$.effects.removeWrapper( el );
-			done();
-		}
-	});
-};
-
-}));
diff --git a/#pma/js/jquery/src/jquery-ui/effect-explode.js b/#pma/js/jquery/src/jquery-ui/effect-explode.js
deleted file mode 100644
index 55d112dd..00000000
--- a/#pma/js/jquery/src/jquery-ui/effect-explode.js
+++ /dev/null
@@ -1,107 +0,0 @@
-/*!
- * jQuery UI Effects Explode 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/explode-effect/
- */
-(function( factory ) {
-	if ( typeof define === "function" && define.amd ) {
-
-		// AMD. Register as an anonymous module.
-		define([
-			"jquery",
-			"./effect"
-		], factory );
-	} else {
-
-		// Browser globals
-		factory( jQuery );
-	}
-}(function( $ ) {
-
-return $.effects.effect.explode = function( o, done ) {
-
-	var rows = o.pieces ? Math.round( Math.sqrt( o.pieces ) ) : 3,
-		cells = rows,
-		el = $( this ),
-		mode = $.effects.setMode( el, o.mode || "hide" ),
-		show = mode === "show",
-
-		// show and then visibility:hidden the element before calculating offset
-		offset = el.show().css( "visibility", "hidden" ).offset(),
-
-		// width and height of a piece
-		width = Math.ceil( el.outerWidth() / cells ),
-		height = Math.ceil( el.outerHeight() / rows ),
-		pieces = [],
-
-		// loop
-		i, j, left, top, mx, my;
-
-	// children animate complete:
-	function childComplete() {
-		pieces.push( this );
-		if ( pieces.length === rows * cells ) {
-			animComplete();
-		}
-	}
-
-	// clone the element for each row and cell.
-	for ( i = 0; i < rows ; i++ ) { // ===>
-		top = offset.top + i * height;
-		my = i - ( rows - 1 ) / 2 ;
-
-		for ( j = 0; j < cells ; j++ ) { // |||
-			left = offset.left + j * width;
-			mx = j - ( cells - 1 ) / 2 ;
-
-			// Create a clone of the now hidden main element that will be absolute positioned
-			// within a wrapper div off the -left and -top equal to size of our pieces
-			el
-				.clone()
-				.appendTo( "body" )
-				.wrap( "<div></div>" )
-				.css({
-					position: "absolute",
-					visibility: "visible",
-					left: -j * width,
-					top: -i * height
-				})
-
-			// select the wrapper - make it overflow: hidden and absolute positioned based on
-			// where the original was located +left and +top equal to the size of pieces
-				.parent()
-				.addClass( "ui-effects-explode" )
-				.css({
-					position: "absolute",
-					overflow: "hidden",
-					width: width,
-					height: height,
-					left: left + ( show ? mx * width : 0 ),
-					top: top + ( show ? my * height : 0 ),
-					opacity: show ? 0 : 1
-				}).animate({
-					left: left + ( show ? 0 : mx * width ),
-					top: top + ( show ? 0 : my * height ),
-					opacity: show ? 1 : 0
-				}, o.duration || 500, o.easing, childComplete );
-		}
-	}
-
-	function animComplete() {
-		el.css({
-			visibility: "visible"
-		});
-		$( pieces ).remove();
-		if ( !show ) {
-			el.hide();
-		}
-		done();
-	}
-};
-
-}));
diff --git a/#pma/js/jquery/src/jquery-ui/effect-fade.js b/#pma/js/jquery/src/jquery-ui/effect-fade.js
deleted file mode 100644
index 2c17c031..00000000
--- a/#pma/js/jquery/src/jquery-ui/effect-fade.js
+++ /dev/null
@@ -1,40 +0,0 @@
-/*!
- * jQuery UI Effects Fade 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/fade-effect/
- */
-(function( factory ) {
-	if ( typeof define === "function" && define.amd ) {
-
-		// AMD. Register as an anonymous module.
-		define([
-			"jquery",
-			"./effect"
-		], factory );
-	} else {
-
-		// Browser globals
-		factory( jQuery );
-	}
-}(function( $ ) {
-
-return $.effects.effect.fade = function( o, done ) {
-	var el = $( this ),
-		mode = $.effects.setMode( el, o.mode || "toggle" );
-
-	el.animate({
-		opacity: mode
-	}, {
-		queue: false,
-		duration: o.duration,
-		easing: o.easing,
-		complete: done
-	});
-};
-
-}));
diff --git a/#pma/js/jquery/src/jquery-ui/effect-fold.js b/#pma/js/jquery/src/jquery-ui/effect-fold.js
deleted file mode 100644
index fb9539ef..00000000
--- a/#pma/js/jquery/src/jquery-ui/effect-fold.js
+++ /dev/null
@@ -1,86 +0,0 @@
-/*!
- * jQuery UI Effects Fold 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/fold-effect/
- */
-(function( factory ) {
-	if ( typeof define === "function" && define.amd ) {
-
-		// AMD. Register as an anonymous module.
-		define([
-			"jquery",
-			"./effect"
-		], factory );
-	} else {
-
-		// Browser globals
-		factory( jQuery );
-	}
-}(function( $ ) {
-
-return $.effects.effect.fold = function( o, done ) {
-
-	// Create element
-	var el = $( this ),
-		props = [ "position", "top", "bottom", "left", "right", "height", "width" ],
-		mode = $.effects.setMode( el, o.mode || "hide" ),
-		show = mode === "show",
-		hide = mode === "hide",
-		size = o.size || 15,
-		percent = /([0-9]+)%/.exec( size ),
-		horizFirst = !!o.horizFirst,
-		widthFirst = show !== horizFirst,
-		ref = widthFirst ? [ "width", "height" ] : [ "height", "width" ],
-		duration = o.duration / 2,
-		wrapper, distance,
-		animation1 = {},
-		animation2 = {};
-
-	$.effects.save( el, props );
-	el.show();
-
-	// Create Wrapper
-	wrapper = $.effects.createWrapper( el ).css({
-		overflow: "hidden"
-	});
-	distance = widthFirst ?
-		[ wrapper.width(), wrapper.height() ] :
-		[ wrapper.height(), wrapper.width() ];
-
-	if ( percent ) {
-		size = parseInt( percent[ 1 ], 10 ) / 100 * distance[ hide ? 0 : 1 ];
-	}
-	if ( show ) {
-		wrapper.css( horizFirst ? {
-			height: 0,
-			width: size
-		} : {
-			height: size,
-			width: 0
-		});
-	}
-
-	// Animation
-	animation1[ ref[ 0 ] ] = show ? distance[ 0 ] : size;
-	animation2[ ref[ 1 ] ] = show ? distance[ 1 ] : 0;
-
-	// Animate
-	wrapper
-		.animate( animation1, duration, o.easing )
-		.animate( animation2, duration, o.easing, function() {
-			if ( hide ) {
-				el.hide();
-			}
-			$.effects.restore( el, props );
-			$.effects.removeWrapper( el );
-			done();
-		});
-
-};
-
-}));
diff --git a/#pma/js/jquery/src/jquery-ui/effect-highlight.js b/#pma/js/jquery/src/jquery-ui/effect-highlight.js
deleted file mode 100644
index 833a4cd3..00000000
--- a/#pma/js/jquery/src/jquery-ui/effect-highlight.js
+++ /dev/null
@@ -1,60 +0,0 @@
-/*!
- * jQuery UI Effects Highlight 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/highlight-effect/
- */
-(function( factory ) {
-	if ( typeof define === "function" && define.amd ) {
-
-		// AMD. Register as an anonymous module.
-		define([
-			"jquery",
-			"./effect"
-		], factory );
-	} else {
-
-		// Browser globals
-		factory( jQuery );
-	}
-}(function( $ ) {
-
-return $.effects.effect.highlight = function( o, done ) {
-	var elem = $( this ),
-		props = [ "backgroundImage", "backgroundColor", "opacity" ],
-		mode = $.effects.setMode( elem, o.mode || "show" ),
-		animation = {
-			backgroundColor: elem.css( "backgroundColor" )
-		};
-
-	if (mode === "hide") {
-		animation.opacity = 0;
-	}
-
-	$.effects.save( elem, props );
-
-	elem
-		.show()
-		.css({
-			backgroundImage: "none",
-			backgroundColor: o.color || "#ffff99"
-		})
-		.animate( animation, {
-			queue: false,
-			duration: o.duration,
-			easing: o.easing,
-			complete: function() {
-				if ( mode === "hide" ) {
-					elem.hide();
-				}
-				$.effects.restore( elem, props );
-				done();
-			}
-		});
-};
-
-}));
diff --git a/#pma/js/jquery/src/jquery-ui/effect-puff.js b/#pma/js/jquery/src/jquery-ui/effect-puff.js
deleted file mode 100644
index 43f98728..00000000
--- a/#pma/js/jquery/src/jquery-ui/effect-puff.js
+++ /dev/null
@@ -1,60 +0,0 @@
-/*!
- * jQuery UI Effects Puff 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/puff-effect/
- */
-(function( factory ) {
-	if ( typeof define === "function" && define.amd ) {
-
-		// AMD. Register as an anonymous module.
-		define([
-			"jquery",
-			"./effect",
-			"./effect-scale"
-		], factory );
-	} else {
-
-		// Browser globals
-		factory( jQuery );
-	}
-}(function( $ ) {
-
-return $.effects.effect.puff = function( o, done ) {
-	var elem = $( this ),
-		mode = $.effects.setMode( elem, o.mode || "hide" ),
-		hide = mode === "hide",
-		percent = parseInt( o.percent, 10 ) || 150,
-		factor = percent / 100,
-		original = {
-			height: elem.height(),
-			width: elem.width(),
-			outerHeight: elem.outerHeight(),
-			outerWidth: elem.outerWidth()
-		};
-
-	$.extend( o, {
-		effect: "scale",
-		queue: false,
-		fade: true,
-		mode: mode,
-		complete: done,
-		percent: hide ? percent : 100,
-		from: hide ?
-			original :
-			{
-				height: original.height * factor,
-				width: original.width * factor,
-				outerHeight: original.outerHeight * factor,
-				outerWidth: original.outerWidth * factor
-			}
-	});
-
-	elem.effect( o );
-};
-
-}));
diff --git a/#pma/js/jquery/src/jquery-ui/effect-pulsate.js b/#pma/js/jquery/src/jquery-ui/effect-pulsate.js
deleted file mode 100644
index 7d21ea10..00000000
--- a/#pma/js/jquery/src/jquery-ui/effect-pulsate.js
+++ /dev/null
@@ -1,73 +0,0 @@
-/*!
- * jQuery UI Effects Pulsate 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/pulsate-effect/
- */
-(function( factory ) {
-	if ( typeof define === "function" && define.amd ) {
-
-		// AMD. Register as an anonymous module.
-		define([
-			"jquery",
-			"./effect"
-		], factory );
-	} else {
-
-		// Browser globals
-		factory( jQuery );
-	}
-}(function( $ ) {
-
-return $.effects.effect.pulsate = function( o, done ) {
-	var elem = $( this ),
-		mode = $.effects.setMode( elem, o.mode || "show" ),
-		show = mode === "show",
-		hide = mode === "hide",
-		showhide = ( show || mode === "hide" ),
-
-		// showing or hiding leaves of the "last" animation
-		anims = ( ( o.times || 5 ) * 2 ) + ( showhide ? 1 : 0 ),
-		duration = o.duration / anims,
-		animateTo = 0,
-		queue = elem.queue(),
-		queuelen = queue.length,
-		i;
-
-	if ( show || !elem.is(":visible")) {
-		elem.css( "opacity", 0 ).show();
-		animateTo = 1;
-	}
-
-	// anims - 1 opacity "toggles"
-	for ( i = 1; i < anims; i++ ) {
-		elem.animate({
-			opacity: animateTo
-		}, duration, o.easing );
-		animateTo = 1 - animateTo;
-	}
-
-	elem.animate({
-		opacity: animateTo
-	}, duration, o.easing);
-
-	elem.queue(function() {
-		if ( hide ) {
-			elem.hide();
-		}
-		done();
-	});
-
-	// We just queued up "anims" animations, we need to put them next in the queue
-	if ( queuelen > 1 ) {
-		queue.splice.apply( queue,
-			[ 1, 0 ].concat( queue.splice( queuelen, anims + 1 ) ) );
-	}
-	elem.dequeue();
-};
-
-}));
diff --git a/#pma/js/jquery/src/jquery-ui/effect-scale.js b/#pma/js/jquery/src/jquery-ui/effect-scale.js
deleted file mode 100644
index 8c8b68eb..00000000
--- a/#pma/js/jquery/src/jquery-ui/effect-scale.js
+++ /dev/null
@@ -1,89 +0,0 @@
-/*!
- * jQuery UI Effects Scale 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/scale-effect/
- */
-(function( factory ) {
-	if ( typeof define === "function" && define.amd ) {
-
-		// AMD. Register as an anonymous module.
-		define([
-			"jquery",
-			"./effect",
-			"./effect-size"
-		], factory );
-	} else {
-
-		// Browser globals
-		factory( jQuery );
-	}
-}(function( $ ) {
-
-return $.effects.effect.scale = function( o, done ) {
-
-	// Create element
-	var el = $( this ),
-		options = $.extend( true, {}, o ),
-		mode = $.effects.setMode( el, o.mode || "effect" ),
-		percent = parseInt( o.percent, 10 ) ||
-			( parseInt( o.percent, 10 ) === 0 ? 0 : ( mode === "hide" ? 0 : 100 ) ),
-		direction = o.direction || "both",
-		origin = o.origin,
-		original = {
-			height: el.height(),
-			width: el.width(),
-			outerHeight: el.outerHeight(),
-			outerWidth: el.outerWidth()
-		},
-		factor = {
-			y: direction !== "horizontal" ? (percent / 100) : 1,
-			x: direction !== "vertical" ? (percent / 100) : 1
-		};
-
-	// We are going to pass this effect to the size effect:
-	options.effect = "size";
-	options.queue = false;
-	options.complete = done;
-
-	// Set default origin and restore for show/hide
-	if ( mode !== "effect" ) {
-		options.origin = origin || [ "middle", "center" ];
-		options.restore = true;
-	}
-
-	options.from = o.from || ( mode === "show" ? {
-		height: 0,
-		width: 0,
-		outerHeight: 0,
-		outerWidth: 0
-	} : original );
-	options.to = {
-		height: original.height * factor.y,
-		width: original.width * factor.x,
-		outerHeight: original.outerHeight * factor.y,
-		outerWidth: original.outerWidth * factor.x
-	};
-
-	// Fade option to support puff
-	if ( options.fade ) {
-		if ( mode === "show" ) {
-			options.from.opacity = 0;
-			options.to.opacity = 1;
-		}
-		if ( mode === "hide" ) {
-			options.from.opacity = 1;
-			options.to.opacity = 0;
-		}
-	}
-
-	// Animate
-	el.effect( options );
-
-};
-
-}));
diff --git a/#pma/js/jquery/src/jquery-ui/effect-shake.js b/#pma/js/jquery/src/jquery-ui/effect-shake.js
deleted file mode 100644
index 8236d6bf..00000000
--- a/#pma/js/jquery/src/jquery-ui/effect-shake.js
+++ /dev/null
@@ -1,84 +0,0 @@
-/*!
- * jQuery UI Effects Shake 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/shake-effect/
- */
-(function( factory ) {
-	if ( typeof define === "function" && define.amd ) {
-
-		// AMD. Register as an anonymous module.
-		define([
-			"jquery",
-			"./effect"
-		], factory );
-	} else {
-
-		// Browser globals
-		factory( jQuery );
-	}
-}(function( $ ) {
-
-return $.effects.effect.shake = function( o, done ) {
-
-	var el = $( this ),
-		props = [ "position", "top", "bottom", "left", "right", "height", "width" ],
-		mode = $.effects.setMode( el, o.mode || "effect" ),
-		direction = o.direction || "left",
-		distance = o.distance || 20,
-		times = o.times || 3,
-		anims = times * 2 + 1,
-		speed = Math.round( o.duration / anims ),
-		ref = (direction === "up" || direction === "down") ? "top" : "left",
-		positiveMotion = (direction === "up" || direction === "left"),
-		animation = {},
-		animation1 = {},
-		animation2 = {},
-		i,
-
-		// we will need to re-assemble the queue to stack our animations in place
-		queue = el.queue(),
-		queuelen = queue.length;
-
-	$.effects.save( el, props );
-	el.show();
-	$.effects.createWrapper( el );
-
-	// Animation
-	animation[ ref ] = ( positiveMotion ? "-=" : "+=" ) + distance;
-	animation1[ ref ] = ( positiveMotion ? "+=" : "-=" ) + distance * 2;
-	animation2[ ref ] = ( positiveMotion ? "-=" : "+=" ) + distance * 2;
-
-	// Animate
-	el.animate( animation, speed, o.easing );
-
-	// Shakes
-	for ( i = 1; i < times; i++ ) {
-		el.animate( animation1, speed, o.easing ).animate( animation2, speed, o.easing );
-	}
-	el
-		.animate( animation1, speed, o.easing )
-		.animate( animation, speed / 2, o.easing )
-		.queue(function() {
-			if ( mode === "hide" ) {
-				el.hide();
-			}
-			$.effects.restore( el, props );
-			$.effects.removeWrapper( el );
-			done();
-		});
-
-	// inject all the animations we just queued to be first in line (after "inprogress")
-	if ( queuelen > 1) {
-		queue.splice.apply( queue,
-			[ 1, 0 ].concat( queue.splice( queuelen, anims + 1 ) ) );
-	}
-	el.dequeue();
-
-};
-
-}));
diff --git a/#pma/js/jquery/src/jquery-ui/effect-size.js b/#pma/js/jquery/src/jquery-ui/effect-size.js
deleted file mode 100644
index bc853cae..00000000
--- a/#pma/js/jquery/src/jquery-ui/effect-size.js
+++ /dev/null
@@ -1,233 +0,0 @@
-/*!
- * jQuery UI Effects Size 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/size-effect/
- */
-(function( factory ) {
-	if ( typeof define === "function" && define.amd ) {
-
-		// AMD. Register as an anonymous module.
-		define([
-			"jquery",
-			"./effect"
-		], factory );
-	} else {
-
-		// Browser globals
-		factory( jQuery );
-	}
-}(function( $ ) {
-
-return $.effects.effect.size = function( o, done ) {
-
-	// Create element
-	var original, baseline, factor,
-		el = $( this ),
-		props0 = [ "position", "top", "bottom", "left", "right", "width", "height", "overflow", "opacity" ],
-
-		// Always restore
-		props1 = [ "position", "top", "bottom", "left", "right", "overflow", "opacity" ],
-
-		// Copy for children
-		props2 = [ "width", "height", "overflow" ],
-		cProps = [ "fontSize" ],
-		vProps = [ "borderTopWidth", "borderBottomWidth", "paddingTop", "paddingBottom" ],
-		hProps = [ "borderLeftWidth", "borderRightWidth", "paddingLeft", "paddingRight" ],
-
-		// Set options
-		mode = $.effects.setMode( el, o.mode || "effect" ),
-		restore = o.restore || mode !== "effect",
-		scale = o.scale || "both",
-		origin = o.origin || [ "middle", "center" ],
-		position = el.css( "position" ),
-		props = restore ? props0 : props1,
-		zero = {
-			height: 0,
-			width: 0,
-			outerHeight: 0,
-			outerWidth: 0
-		};
-
-	if ( mode === "show" ) {
-		el.show();
-	}
-	original = {
-		height: el.height(),
-		width: el.width(),
-		outerHeight: el.outerHeight(),
-		outerWidth: el.outerWidth()
-	};
-
-	if ( o.mode === "toggle" && mode === "show" ) {
-		el.from = o.to || zero;
-		el.to = o.from || original;
-	} else {
-		el.from = o.from || ( mode === "show" ? zero : original );
-		el.to = o.to || ( mode === "hide" ? zero : original );
-	}
-
-	// Set scaling factor
-	factor = {
-		from: {
-			y: el.from.height / original.height,
-			x: el.from.width / original.width
-		},
-		to: {
-			y: el.to.height / original.height,
-			x: el.to.width / original.width
-		}
-	};
-
-	// Scale the css box
-	if ( scale === "box" || scale === "both" ) {
-
-		// Vertical props scaling
-		if ( factor.from.y !== factor.to.y ) {
-			props = props.concat( vProps );
-			el.from = $.effects.setTransition( el, vProps, factor.from.y, el.from );
-			el.to = $.effects.setTransition( el, vProps, factor.to.y, el.to );
-		}
-
-		// Horizontal props scaling
-		if ( factor.from.x !== factor.to.x ) {
-			props = props.concat( hProps );
-			el.from = $.effects.setTransition( el, hProps, factor.from.x, el.from );
-			el.to = $.effects.setTransition( el, hProps, factor.to.x, el.to );
-		}
-	}
-
-	// Scale the content
-	if ( scale === "content" || scale === "both" ) {
-
-		// Vertical props scaling
-		if ( factor.from.y !== factor.to.y ) {
-			props = props.concat( cProps ).concat( props2 );
-			el.from = $.effects.setTransition( el, cProps, factor.from.y, el.from );
-			el.to = $.effects.setTransition( el, cProps, factor.to.y, el.to );
-		}
-	}
-
-	$.effects.save( el, props );
-	el.show();
-	$.effects.createWrapper( el );
-	el.css( "overflow", "hidden" ).css( el.from );
-
-	// Adjust
-	if (origin) { // Calculate baseline shifts
-		baseline = $.effects.getBaseline( origin, original );
-		el.from.top = ( original.outerHeight - el.outerHeight() ) * baseline.y;
-		el.from.left = ( original.outerWidth - el.outerWidth() ) * baseline.x;
-		el.to.top = ( original.outerHeight - el.to.outerHeight ) * baseline.y;
-		el.to.left = ( original.outerWidth - el.to.outerWidth ) * baseline.x;
-	}
-	el.css( el.from ); // set top & left
-
-	// Animate
-	if ( scale === "content" || scale === "both" ) { // Scale the children
-
-		// Add margins/font-size
-		vProps = vProps.concat([ "marginTop", "marginBottom" ]).concat(cProps);
-		hProps = hProps.concat([ "marginLeft", "marginRight" ]);
-		props2 = props0.concat(vProps).concat(hProps);
-
-		el.find( "*[width]" ).each( function() {
-			var child = $( this ),
-				c_original = {
-					height: child.height(),
-					width: child.width(),
-					outerHeight: child.outerHeight(),
-					outerWidth: child.outerWidth()
-				};
-			if (restore) {
-				$.effects.save(child, props2);
-			}
-
-			child.from = {
-				height: c_original.height * factor.from.y,
-				width: c_original.width * factor.from.x,
-				outerHeight: c_original.outerHeight * factor.from.y,
-				outerWidth: c_original.outerWidth * factor.from.x
-			};
-			child.to = {
-				height: c_original.height * factor.to.y,
-				width: c_original.width * factor.to.x,
-				outerHeight: c_original.height * factor.to.y,
-				outerWidth: c_original.width * factor.to.x
-			};
-
-			// Vertical props scaling
-			if ( factor.from.y !== factor.to.y ) {
-				child.from = $.effects.setTransition( child, vProps, factor.from.y, child.from );
-				child.to = $.effects.setTransition( child, vProps, factor.to.y, child.to );
-			}
-
-			// Horizontal props scaling
-			if ( factor.from.x !== factor.to.x ) {
-				child.from = $.effects.setTransition( child, hProps, factor.from.x, child.from );
-				child.to = $.effects.setTransition( child, hProps, factor.to.x, child.to );
-			}
-
-			// Animate children
-			child.css( child.from );
-			child.animate( child.to, o.duration, o.easing, function() {
-
-				// Restore children
-				if ( restore ) {
-					$.effects.restore( child, props2 );
-				}
-			});
-		});
-	}
-
-	// Animate
-	el.animate( el.to, {
-		queue: false,
-		duration: o.duration,
-		easing: o.easing,
-		complete: function() {
-			if ( el.to.opacity === 0 ) {
-				el.css( "opacity", el.from.opacity );
-			}
-			if ( mode === "hide" ) {
-				el.hide();
-			}
-			$.effects.restore( el, props );
-			if ( !restore ) {
-
-				// we need to calculate our new positioning based on the scaling
-				if ( position === "static" ) {
-					el.css({
-						position: "relative",
-						top: el.to.top,
-						left: el.to.left
-					});
-				} else {
-					$.each([ "top", "left" ], function( idx, pos ) {
-						el.css( pos, function( _, str ) {
-							var val = parseInt( str, 10 ),
-								toRef = idx ? el.to.left : el.to.top;
-
-							// if original was "auto", recalculate the new value from wrapper
-							if ( str === "auto" ) {
-								return toRef + "px";
-							}
-
-							return val + toRef + "px";
-						});
-					});
-				}
-			}
-
-			$.effects.removeWrapper( el );
-			done();
-		}
-	});
-
-};
-
-}));
diff --git a/#pma/js/jquery/src/jquery-ui/effect-slide.js b/#pma/js/jquery/src/jquery-ui/effect-slide.js
deleted file mode 100644
index 790d5e55..00000000
--- a/#pma/js/jquery/src/jquery-ui/effect-slide.js
+++ /dev/null
@@ -1,74 +0,0 @@
-/*!
- * jQuery UI Effects Slide 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/slide-effect/
- */
-(function( factory ) {
-	if ( typeof define === "function" && define.amd ) {
-
-		// AMD. Register as an anonymous module.
-		define([
-			"jquery",
-			"./effect"
-		], factory );
-	} else {
-
-		// Browser globals
-		factory( jQuery );
-	}
-}(function( $ ) {
-
-return $.effects.effect.slide = function( o, done ) {
-
-	// Create element
-	var el = $( this ),
-		props = [ "position", "top", "bottom", "left", "right", "width", "height" ],
-		mode = $.effects.setMode( el, o.mode || "show" ),
-		show = mode === "show",
-		direction = o.direction || "left",
-		ref = (direction === "up" || direction === "down") ? "top" : "left",
-		positiveMotion = (direction === "up" || direction === "left"),
-		distance,
-		animation = {};
-
-	// Adjust
-	$.effects.save( el, props );
-	el.show();
-	distance = o.distance || el[ ref === "top" ? "outerHeight" : "outerWidth" ]( true );
-
-	$.effects.createWrapper( el ).css({
-		overflow: "hidden"
-	});
-
-	if ( show ) {
-		el.css( ref, positiveMotion ? (isNaN(distance) ? "-" + distance : -distance) : distance );
-	}
-
-	// Animation
-	animation[ ref ] = ( show ?
-		( positiveMotion ? "+=" : "-=") :
-		( positiveMotion ? "-=" : "+=")) +
-		distance;
-
-	// Animate
-	el.animate( animation, {
-		queue: false,
-		duration: o.duration,
-		easing: o.easing,
-		complete: function() {
-			if ( mode === "hide" ) {
-				el.hide();
-			}
-			$.effects.restore( el, props );
-			$.effects.removeWrapper( el );
-			done();
-		}
-	});
-};
-
-}));
diff --git a/#pma/js/jquery/src/jquery-ui/effect-transfer.js b/#pma/js/jquery/src/jquery-ui/effect-transfer.js
deleted file mode 100644
index db07ea21..00000000
--- a/#pma/js/jquery/src/jquery-ui/effect-transfer.js
+++ /dev/null
@@ -1,57 +0,0 @@
-/*!
- * jQuery UI Effects Transfer 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/transfer-effect/
- */
-(function( factory ) {
-	if ( typeof define === "function" && define.amd ) {
-
-		// AMD. Register as an anonymous module.
-		define([
-			"jquery",
-			"./effect"
-		], factory );
-	} else {
-
-		// Browser globals
-		factory( jQuery );
-	}
-}(function( $ ) {
-
-return $.effects.effect.transfer = function( o, done ) {
-	var elem = $( this ),
-		target = $( o.to ),
-		targetFixed = target.css( "position" ) === "fixed",
-		body = $("body"),
-		fixTop = targetFixed ? body.scrollTop() : 0,
-		fixLeft = targetFixed ? body.scrollLeft() : 0,
-		endPosition = target.offset(),
-		animation = {
-			top: endPosition.top - fixTop,
-			left: endPosition.left - fixLeft,
-			height: target.innerHeight(),
-			width: target.innerWidth()
-		},
-		startPosition = elem.offset(),
-		transfer = $( "<div class='ui-effects-transfer'></div>" )
-			.appendTo( document.body )
-			.addClass( o.className )
-			.css({
-				top: startPosition.top - fixTop,
-				left: startPosition.left - fixLeft,
-				height: elem.innerHeight(),
-				width: elem.innerWidth(),
-				position: targetFixed ? "fixed" : "absolute"
-			})
-			.animate( animation, o.duration, o.easing, function() {
-				transfer.remove();
-				done();
-			});
-};
-
-}));
diff --git a/#pma/js/jquery/src/jquery-ui/effect.js b/#pma/js/jquery/src/jquery-ui/effect.js
deleted file mode 100644
index d2bfe545..00000000
--- a/#pma/js/jquery/src/jquery-ui/effect.js
+++ /dev/null
@@ -1,1301 +0,0 @@
-/*!
- * jQuery UI Effects 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/category/effects-core/
- */
-(function( factory ) {
-	if ( typeof define === "function" && define.amd ) {
-
-		// AMD. Register as an anonymous module.
-		define( [ "jquery" ], factory );
-	} else {
-
-		// Browser globals
-		factory( jQuery );
-	}
-}(function( $ ) {
-
-var dataSpace = "ui-effects-",
-
-	// Create a local jQuery because jQuery Color relies on it and the
-	// global may not exist with AMD and a custom build (#10199)
-	jQuery = $;
-
-$.effects = {
-	effect: {}
-};
-
-/*!
- * jQuery Color Animations v2.1.2
- * https://github.com/jquery/jquery-color
- *
- * Copyright 2014 jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * Date: Wed Jan 16 08:47:09 2013 -0600
- */
-(function( jQuery, undefined ) {
-
-	var stepHooks = "backgroundColor borderBottomColor borderLeftColor borderRightColor borderTopColor color columnRuleColor outlineColor textDecorationColor textEmphasisColor",
-
-	// plusequals test for += 100 -= 100
-	rplusequals = /^([\-+])=\s*(\d+\.?\d*)/,
-	// a set of RE's that can match strings and generate color tuples.
-	stringParsers = [ {
-			re: /rgba?\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,
-			parse: function( execResult ) {
-				return [
-					execResult[ 1 ],
-					execResult[ 2 ],
-					execResult[ 3 ],
-					execResult[ 4 ]
-				];
-			}
-		}, {
-			re: /rgba?\(\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,
-			parse: function( execResult ) {
-				return [
-					execResult[ 1 ] * 2.55,
-					execResult[ 2 ] * 2.55,
-					execResult[ 3 ] * 2.55,
-					execResult[ 4 ]
-				];
-			}
-		}, {
-			// this regex ignores A-F because it's compared against an already lowercased string
-			re: /#([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})/,
-			parse: function( execResult ) {
-				return [
-					parseInt( execResult[ 1 ], 16 ),
-					parseInt( execResult[ 2 ], 16 ),
-					parseInt( execResult[ 3 ], 16 )
-				];
-			}
-		}, {
-			// this regex ignores A-F because it's compared against an already lowercased string
-			re: /#([a-f0-9])([a-f0-9])([a-f0-9])/,
-			parse: function( execResult ) {
-				return [
-					parseInt( execResult[ 1 ] + execResult[ 1 ], 16 ),
-					parseInt( execResult[ 2 ] + execResult[ 2 ], 16 ),
-					parseInt( execResult[ 3 ] + execResult[ 3 ], 16 )
-				];
-			}
-		}, {
-			re: /hsla?\(\s*(\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,
-			space: "hsla",
-			parse: function( execResult ) {
-				return [
-					execResult[ 1 ],
-					execResult[ 2 ] / 100,
-					execResult[ 3 ] / 100,
-					execResult[ 4 ]
-				];
-			}
-		} ],
-
-	// jQuery.Color( )
-	color = jQuery.Color = function( color, green, blue, alpha ) {
-		return new jQuery.Color.fn.parse( color, green, blue, alpha );
-	},
-	spaces = {
-		rgba: {
-			props: {
-				red: {
-					idx: 0,
-					type: "byte"
-				},
-				green: {
-					idx: 1,
-					type: "byte"
-				},
-				blue: {
-					idx: 2,
-					type: "byte"
-				}
-			}
-		},
-
-		hsla: {
-			props: {
-				hue: {
-					idx: 0,
-					type: "degrees"
-				},
-				saturation: {
-					idx: 1,
-					type: "percent"
-				},
-				lightness: {
-					idx: 2,
-					type: "percent"
-				}
-			}
-		}
-	},
-	propTypes = {
-		"byte": {
-			floor: true,
-			max: 255
-		},
-		"percent": {
-			max: 1
-		},
-		"degrees": {
-			mod: 360,
-			floor: true
-		}
-	},
-	support = color.support = {},
-
-	// element for support tests
-	supportElem = jQuery( "<p>" )[ 0 ],
-
-	// colors = jQuery.Color.names
-	colors,
-
-	// local aliases of functions called often
-	each = jQuery.each;
-
-// determine rgba support immediately
-supportElem.style.cssText = "background-color:rgba(1,1,1,.5)";
-support.rgba = supportElem.style.backgroundColor.indexOf( "rgba" ) > -1;
-
-// define cache name and alpha properties
-// for rgba and hsla spaces
-each( spaces, function( spaceName, space ) {
-	space.cache = "_" + spaceName;
-	space.props.alpha = {
-		idx: 3,
-		type: "percent",
-		def: 1
-	};
-});
-
-function clamp( value, prop, allowEmpty ) {
-	var type = propTypes[ prop.type ] || {};
-
-	if ( value == null ) {
-		return (allowEmpty || !prop.def) ? null : prop.def;
-	}
-
-	// ~~ is an short way of doing floor for positive numbers
-	value = type.floor ? ~~value : parseFloat( value );
-
-	// IE will pass in empty strings as value for alpha,
-	// which will hit this case
-	if ( isNaN( value ) ) {
-		return prop.def;
-	}
-
-	if ( type.mod ) {
-		// we add mod before modding to make sure that negatives values
-		// get converted properly: -10 -> 350
-		return (value + type.mod) % type.mod;
-	}
-
-	// for now all property types without mod have min and max
-	return 0 > value ? 0 : type.max < value ? type.max : value;
-}
-
-function stringParse( string ) {
-	var inst = color(),
-		rgba = inst._rgba = [];
-
-	string = string.toLowerCase();
-
-	each( stringParsers, function( i, parser ) {
-		var parsed,
-			match = parser.re.exec( string ),
-			values = match && parser.parse( match ),
-			spaceName = parser.space || "rgba";
-
-		if ( values ) {
-			parsed = inst[ spaceName ]( values );
-
-			// if this was an rgba parse the assignment might happen twice
-			// oh well....
-			inst[ spaces[ spaceName ].cache ] = parsed[ spaces[ spaceName ].cache ];
-			rgba = inst._rgba = parsed._rgba;
-
-			// exit each( stringParsers ) here because we matched
-			return false;
-		}
-	});
-
-	// Found a stringParser that handled it
-	if ( rgba.length ) {
-
-		// if this came from a parsed string, force "transparent" when alpha is 0
-		// chrome, (and maybe others) return "transparent" as rgba(0,0,0,0)
-		if ( rgba.join() === "0,0,0,0" ) {
-			jQuery.extend( rgba, colors.transparent );
-		}
-		return inst;
-	}
-
-	// named colors
-	return colors[ string ];
-}
-
-color.fn = jQuery.extend( color.prototype, {
-	parse: function( red, green, blue, alpha ) {
-		if ( red === undefined ) {
-			this._rgba = [ null, null, null, null ];
-			return this;
-		}
-		if ( red.jquery || red.nodeType ) {
-			red = jQuery( red ).css( green );
-			green = undefined;
-		}
-
-		var inst = this,
-			type = jQuery.type( red ),
-			rgba = this._rgba = [];
-
-		// more than 1 argument specified - assume ( red, green, blue, alpha )
-		if ( green !== undefined ) {
-			red = [ red, green, blue, alpha ];
-			type = "array";
-		}
-
-		if ( type === "string" ) {
-			return this.parse( stringParse( red ) || colors._default );
-		}
-
-		if ( type === "array" ) {
-			each( spaces.rgba.props, function( key, prop ) {
-				rgba[ prop.idx ] = clamp( red[ prop.idx ], prop );
-			});
-			return this;
-		}
-
-		if ( type === "object" ) {
-			if ( red instanceof color ) {
-				each( spaces, function( spaceName, space ) {
-					if ( red[ space.cache ] ) {
-						inst[ space.cache ] = red[ space.cache ].slice();
-					}
-				});
-			} else {
-				each( spaces, function( spaceName, space ) {
-					var cache = space.cache;
-					each( space.props, function( key, prop ) {
-
-						// if the cache doesn't exist, and we know how to convert
-						if ( !inst[ cache ] && space.to ) {
-
-							// if the value was null, we don't need to copy it
-							// if the key was alpha, we don't need to copy it either
-							if ( key === "alpha" || red[ key ] == null ) {
-								return;
-							}
-							inst[ cache ] = space.to( inst._rgba );
-						}
-
-						// this is the only case where we allow nulls for ALL properties.
-						// call clamp with alwaysAllowEmpty
-						inst[ cache ][ prop.idx ] = clamp( red[ key ], prop, true );
-					});
-
-					// everything defined but alpha?
-					if ( inst[ cache ] && jQuery.inArray( null, inst[ cache ].slice( 0, 3 ) ) < 0 ) {
-						// use the default of 1
-						inst[ cache ][ 3 ] = 1;
-						if ( space.from ) {
-							inst._rgba = space.from( inst[ cache ] );
-						}
-					}
-				});
-			}
-			return this;
-		}
-	},
-	is: function( compare ) {
-		var is = color( compare ),
-			same = true,
-			inst = this;
-
-		each( spaces, function( _, space ) {
-			var localCache,
-				isCache = is[ space.cache ];
-			if (isCache) {
-				localCache = inst[ space.cache ] || space.to && space.to( inst._rgba ) || [];
-				each( space.props, function( _, prop ) {
-					if ( isCache[ prop.idx ] != null ) {
-						same = ( isCache[ prop.idx ] === localCache[ prop.idx ] );
-						return same;
-					}
-				});
-			}
-			return same;
-		});
-		return same;
-	},
-	_space: function() {
-		var used = [],
-			inst = this;
-		each( spaces, function( spaceName, space ) {
-			if ( inst[ space.cache ] ) {
-				used.push( spaceName );
-			}
-		});
-		return used.pop();
-	},
-	transition: function( other, distance ) {
-		var end = color( other ),
-			spaceName = end._space(),
-			space = spaces[ spaceName ],
-			startColor = this.alpha() === 0 ? color( "transparent" ) : this,
-			start = startColor[ space.cache ] || space.to( startColor._rgba ),
-			result = start.slice();
-
-		end = end[ space.cache ];
-		each( space.props, function( key, prop ) {
-			var index = prop.idx,
-				startValue = start[ index ],
-				endValue = end[ index ],
-				type = propTypes[ prop.type ] || {};
-
-			// if null, don't override start value
-			if ( endValue === null ) {
-				return;
-			}
-			// if null - use end
-			if ( startValue === null ) {
-				result[ index ] = endValue;
-			} else {
-				if ( type.mod ) {
-					if ( endValue - startValue > type.mod / 2 ) {
-						startValue += type.mod;
-					} else if ( startValue - endValue > type.mod / 2 ) {
-						startValue -= type.mod;
-					}
-				}
-				result[ index ] = clamp( ( endValue - startValue ) * distance + startValue, prop );
-			}
-		});
-		return this[ spaceName ]( result );
-	},
-	blend: function( opaque ) {
-		// if we are already opaque - return ourself
-		if ( this._rgba[ 3 ] === 1 ) {
-			return this;
-		}
-
-		var rgb = this._rgba.slice(),
-			a = rgb.pop(),
-			blend = color( opaque )._rgba;
-
-		return color( jQuery.map( rgb, function( v, i ) {
-			return ( 1 - a ) * blend[ i ] + a * v;
-		}));
-	},
-	toRgbaString: function() {
-		var prefix = "rgba(",
-			rgba = jQuery.map( this._rgba, function( v, i ) {
-				return v == null ? ( i > 2 ? 1 : 0 ) : v;
-			});
-
-		if ( rgba[ 3 ] === 1 ) {
-			rgba.pop();
-			prefix = "rgb(";
-		}
-
-		return prefix + rgba.join() + ")";
-	},
-	toHslaString: function() {
-		var prefix = "hsla(",
-			hsla = jQuery.map( this.hsla(), function( v, i ) {
-				if ( v == null ) {
-					v = i > 2 ? 1 : 0;
-				}
-
-				// catch 1 and 2
-				if ( i && i < 3 ) {
-					v = Math.round( v * 100 ) + "%";
-				}
-				return v;
-			});
-
-		if ( hsla[ 3 ] === 1 ) {
-			hsla.pop();
-			prefix = "hsl(";
-		}
-		return prefix + hsla.join() + ")";
-	},
-	toHexString: function( includeAlpha ) {
-		var rgba = this._rgba.slice(),
-			alpha = rgba.pop();
-
-		if ( includeAlpha ) {
-			rgba.push( ~~( alpha * 255 ) );
-		}
-
-		return "#" + jQuery.map( rgba, function( v ) {
-
-			// default to 0 when nulls exist
-			v = ( v || 0 ).toString( 16 );
-			return v.length === 1 ? "0" + v : v;
-		}).join("");
-	},
-	toString: function() {
-		return this._rgba[ 3 ] === 0 ? "transparent" : this.toRgbaString();
-	}
-});
-color.fn.parse.prototype = color.fn;
-
-// hsla conversions adapted from:
-// https://code.google.com/p/maashaack/source/browse/packages/graphics/trunk/src/graphics/colors/HUE2RGB.as?r=5021
-
-function hue2rgb( p, q, h ) {
-	h = ( h + 1 ) % 1;
-	if ( h * 6 < 1 ) {
-		return p + ( q - p ) * h * 6;
-	}
-	if ( h * 2 < 1) {
-		return q;
-	}
-	if ( h * 3 < 2 ) {
-		return p + ( q - p ) * ( ( 2 / 3 ) - h ) * 6;
-	}
-	return p;
-}
-
-spaces.hsla.to = function( rgba ) {
-	if ( rgba[ 0 ] == null || rgba[ 1 ] == null || rgba[ 2 ] == null ) {
-		return [ null, null, null, rgba[ 3 ] ];
-	}
-	var r = rgba[ 0 ] / 255,
-		g = rgba[ 1 ] / 255,
-		b = rgba[ 2 ] / 255,
-		a = rgba[ 3 ],
-		max = Math.max( r, g, b ),
-		min = Math.min( r, g, b ),
-		diff = max - min,
-		add = max + min,
-		l = add * 0.5,
-		h, s;
-
-	if ( min === max ) {
-		h = 0;
-	} else if ( r === max ) {
-		h = ( 60 * ( g - b ) / diff ) + 360;
-	} else if ( g === max ) {
-		h = ( 60 * ( b - r ) / diff ) + 120;
-	} else {
-		h = ( 60 * ( r - g ) / diff ) + 240;
-	}
-
-	// chroma (diff) == 0 means greyscale which, by definition, saturation = 0%
-	// otherwise, saturation is based on the ratio of chroma (diff) to lightness (add)
-	if ( diff === 0 ) {
-		s = 0;
-	} else if ( l <= 0.5 ) {
-		s = diff / add;
-	} else {
-		s = diff / ( 2 - add );
-	}
-	return [ Math.round(h) % 360, s, l, a == null ? 1 : a ];
-};
-
-spaces.hsla.from = function( hsla ) {
-	if ( hsla[ 0 ] == null || hsla[ 1 ] == null || hsla[ 2 ] == null ) {
-		return [ null, null, null, hsla[ 3 ] ];
-	}
-	var h = hsla[ 0 ] / 360,
-		s = hsla[ 1 ],
-		l = hsla[ 2 ],
-		a = hsla[ 3 ],
-		q = l <= 0.5 ? l * ( 1 + s ) : l + s - l * s,
-		p = 2 * l - q;
-
-	return [
-		Math.round( hue2rgb( p, q, h + ( 1 / 3 ) ) * 255 ),
-		Math.round( hue2rgb( p, q, h ) * 255 ),
-		Math.round( hue2rgb( p, q, h - ( 1 / 3 ) ) * 255 ),
-		a
-	];
-};
-
-each( spaces, function( spaceName, space ) {
-	var props = space.props,
-		cache = space.cache,
-		to = space.to,
-		from = space.from;
-
-	// makes rgba() and hsla()
-	color.fn[ spaceName ] = function( value ) {
-
-		// generate a cache for this space if it doesn't exist
-		if ( to && !this[ cache ] ) {
-			this[ cache ] = to( this._rgba );
-		}
-		if ( value === undefined ) {
-			return this[ cache ].slice();
-		}
-
-		var ret,
-			type = jQuery.type( value ),
-			arr = ( type === "array" || type === "object" ) ? value : arguments,
-			local = this[ cache ].slice();
-
-		each( props, function( key, prop ) {
-			var val = arr[ type === "object" ? key : prop.idx ];
-			if ( val == null ) {
-				val = local[ prop.idx ];
-			}
-			local[ prop.idx ] = clamp( val, prop );
-		});
-
-		if ( from ) {
-			ret = color( from( local ) );
-			ret[ cache ] = local;
-			return ret;
-		} else {
-			return color( local );
-		}
-	};
-
-	// makes red() green() blue() alpha() hue() saturation() lightness()
-	each( props, function( key, prop ) {
-		// alpha is included in more than one space
-		if ( color.fn[ key ] ) {
-			return;
-		}
-		color.fn[ key ] = function( value ) {
-			var vtype = jQuery.type( value ),
-				fn = ( key === "alpha" ? ( this._hsla ? "hsla" : "rgba" ) : spaceName ),
-				local = this[ fn ](),
-				cur = local[ prop.idx ],
-				match;
-
-			if ( vtype === "undefined" ) {
-				return cur;
-			}
-
-			if ( vtype === "function" ) {
-				value = value.call( this, cur );
-				vtype = jQuery.type( value );
-			}
-			if ( value == null && prop.empty ) {
-				return this;
-			}
-			if ( vtype === "string" ) {
-				match = rplusequals.exec( value );
-				if ( match ) {
-					value = cur + parseFloat( match[ 2 ] ) * ( match[ 1 ] === "+" ? 1 : -1 );
-				}
-			}
-			local[ prop.idx ] = value;
-			return this[ fn ]( local );
-		};
-	});
-});
-
-// add cssHook and .fx.step function for each named hook.
-// accept a space separated string of properties
-color.hook = function( hook ) {
-	var hooks = hook.split( " " );
-	each( hooks, function( i, hook ) {
-		jQuery.cssHooks[ hook ] = {
-			set: function( elem, value ) {
-				var parsed, curElem,
-					backgroundColor = "";
-
-				if ( value !== "transparent" && ( jQuery.type( value ) !== "string" || ( parsed = stringParse( value ) ) ) ) {
-					value = color( parsed || value );
-					if ( !support.rgba && value._rgba[ 3 ] !== 1 ) {
-						curElem = hook === "backgroundColor" ? elem.parentNode : elem;
-						while (
-							(backgroundColor === "" || backgroundColor === "transparent") &&
-							curElem && curElem.style
-						) {
-							try {
-								backgroundColor = jQuery.css( curElem, "backgroundColor" );
-								curElem = curElem.parentNode;
-							} catch ( e ) {
-							}
-						}
-
-						value = value.blend( backgroundColor && backgroundColor !== "transparent" ?
-							backgroundColor :
-							"_default" );
-					}
-
-					value = value.toRgbaString();
-				}
-				try {
-					elem.style[ hook ] = value;
-				} catch ( e ) {
-					// wrapped to prevent IE from throwing errors on "invalid" values like 'auto' or 'inherit'
-				}
-			}
-		};
-		jQuery.fx.step[ hook ] = function( fx ) {
-			if ( !fx.colorInit ) {
-				fx.start = color( fx.elem, hook );
-				fx.end = color( fx.end );
-				fx.colorInit = true;
-			}
-			jQuery.cssHooks[ hook ].set( fx.elem, fx.start.transition( fx.end, fx.pos ) );
-		};
-	});
-
-};
-
-color.hook( stepHooks );
-
-jQuery.cssHooks.borderColor = {
-	expand: function( value ) {
-		var expanded = {};
-
-		each( [ "Top", "Right", "Bottom", "Left" ], function( i, part ) {
-			expanded[ "border" + part + "Color" ] = value;
-		});
-		return expanded;
-	}
-};
-
-// Basic color names only.
-// Usage of any of the other color names requires adding yourself or including
-// jquery.color.svg-names.js.
-colors = jQuery.Color.names = {
-	// 4.1. Basic color keywords
-	aqua: "#00ffff",
-	black: "#000000",
-	blue: "#0000ff",
-	fuchsia: "#ff00ff",
-	gray: "#808080",
-	green: "#008000",
-	lime: "#00ff00",
-	maroon: "#800000",
-	navy: "#000080",
-	olive: "#808000",
-	purple: "#800080",
-	red: "#ff0000",
-	silver: "#c0c0c0",
-	teal: "#008080",
-	white: "#ffffff",
-	yellow: "#ffff00",
-
-	// 4.2.3. "transparent" color keyword
-	transparent: [ null, null, null, 0 ],
-
-	_default: "#ffffff"
-};
-
-})( jQuery );
-
-/******************************************************************************/
-/****************************** CLASS ANIMATIONS ******************************/
-/******************************************************************************/
-(function() {
-
-var classAnimationActions = [ "add", "remove", "toggle" ],
-	shorthandStyles = {
-		border: 1,
-		borderBottom: 1,
-		borderColor: 1,
-		borderLeft: 1,
-		borderRight: 1,
-		borderTop: 1,
-		borderWidth: 1,
-		margin: 1,
-		padding: 1
-	};
-
-$.each([ "borderLeftStyle", "borderRightStyle", "borderBottomStyle", "borderTopStyle" ], function( _, prop ) {
-	$.fx.step[ prop ] = function( fx ) {
-		if ( fx.end !== "none" && !fx.setAttr || fx.pos === 1 && !fx.setAttr ) {
-			jQuery.style( fx.elem, prop, fx.end );
-			fx.setAttr = true;
-		}
-	};
-});
-
-function getElementStyles( elem ) {
-	var key, len,
-		style = elem.ownerDocument.defaultView ?
-			elem.ownerDocument.defaultView.getComputedStyle( elem, null ) :
-			elem.currentStyle,
-		styles = {};
-
-	if ( style && style.length && style[ 0 ] && style[ style[ 0 ] ] ) {
-		len = style.length;
-		while ( len-- ) {
-			key = style[ len ];
-			if ( typeof style[ key ] === "string" ) {
-				styles[ $.camelCase( key ) ] = style[ key ];
-			}
-		}
-	// support: Opera, IE <9
-	} else {
-		for ( key in style ) {
-			if ( typeof style[ key ] === "string" ) {
-				styles[ key ] = style[ key ];
-			}
-		}
-	}
-
-	return styles;
-}
-
-function styleDifference( oldStyle, newStyle ) {
-	var diff = {},
-		name, value;
-
-	for ( name in newStyle ) {
-		value = newStyle[ name ];
-		if ( oldStyle[ name ] !== value ) {
-			if ( !shorthandStyles[ name ] ) {
-				if ( $.fx.step[ name ] || !isNaN( parseFloat( value ) ) ) {
-					diff[ name ] = value;
-				}
-			}
-		}
-	}
-
-	return diff;
-}
-
-// support: jQuery <1.8
-if ( !$.fn.addBack ) {
-	$.fn.addBack = function( selector ) {
-		return this.add( selector == null ?
-			this.prevObject : this.prevObject.filter( selector )
-		);
-	};
-}
-
-$.effects.animateClass = function( value, duration, easing, callback ) {
-	var o = $.speed( duration, easing, callback );
-
-	return this.queue( function() {
-		var animated = $( this ),
-			baseClass = animated.attr( "class" ) || "",
-			applyClassChange,
-			allAnimations = o.children ? animated.find( "*" ).addBack() : animated;
-
-		// map the animated objects to store the original styles.
-		allAnimations = allAnimations.map(function() {
-			var el = $( this );
-			return {
-				el: el,
-				start: getElementStyles( this )
-			};
-		});
-
-		// apply class change
-		applyClassChange = function() {
-			$.each( classAnimationActions, function(i, action) {
-				if ( value[ action ] ) {
-					animated[ action + "Class" ]( value[ action ] );
-				}
-			});
-		};
-		applyClassChange();
-
-		// map all animated objects again - calculate new styles and diff
-		allAnimations = allAnimations.map(function() {
-			this.end = getElementStyles( this.el[ 0 ] );
-			this.diff = styleDifference( this.start, this.end );
-			return this;
-		});
-
-		// apply original class
-		animated.attr( "class", baseClass );
-
-		// map all animated objects again - this time collecting a promise
-		allAnimations = allAnimations.map(function() {
-			var styleInfo = this,
-				dfd = $.Deferred(),
-				opts = $.extend({}, o, {
-					queue: false,
-					complete: function() {
-						dfd.resolve( styleInfo );
-					}
-				});
-
-			this.el.animate( this.diff, opts );
-			return dfd.promise();
-		});
-
-		// once all animations have completed:
-		$.when.apply( $, allAnimations.get() ).done(function() {
-
-			// set the final class
-			applyClassChange();
-
-			// for each animated element,
-			// clear all css properties that were animated
-			$.each( arguments, function() {
-				var el = this.el;
-				$.each( this.diff, function(key) {
-					el.css( key, "" );
-				});
-			});
-
-			// this is guarnteed to be there if you use jQuery.speed()
-			// it also handles dequeuing the next anim...
-			o.complete.call( animated[ 0 ] );
-		});
-	});
-};
-
-$.fn.extend({
-	addClass: (function( orig ) {
-		return function( classNames, speed, easing, callback ) {
-			return speed ?
-				$.effects.animateClass.call( this,
-					{ add: classNames }, speed, easing, callback ) :
-				orig.apply( this, arguments );
-		};
-	})( $.fn.addClass ),
-
-	removeClass: (function( orig ) {
-		return function( classNames, speed, easing, callback ) {
-			return arguments.length > 1 ?
-				$.effects.animateClass.call( this,
-					{ remove: classNames }, speed, easing, callback ) :
-				orig.apply( this, arguments );
-		};
-	})( $.fn.removeClass ),
-
-	toggleClass: (function( orig ) {
-		return function( classNames, force, speed, easing, callback ) {
-			if ( typeof force === "boolean" || force === undefined ) {
-				if ( !speed ) {
-					// without speed parameter
-					return orig.apply( this, arguments );
-				} else {
-					return $.effects.animateClass.call( this,
-						(force ? { add: classNames } : { remove: classNames }),
-						speed, easing, callback );
-				}
-			} else {
-				// without force parameter
-				return $.effects.animateClass.call( this,
-					{ toggle: classNames }, force, speed, easing );
-			}
-		};
-	})( $.fn.toggleClass ),
-
-	switchClass: function( remove, add, speed, easing, callback) {
-		return $.effects.animateClass.call( this, {
-			add: add,
-			remove: remove
-		}, speed, easing, callback );
-	}
-});
-
-})();
-
-/******************************************************************************/
-/*********************************** EFFECTS **********************************/
-/******************************************************************************/
-
-(function() {
-
-$.extend( $.effects, {
-	version: "1.11.4",
-
-	// Saves a set of properties in a data storage
-	save: function( element, set ) {
-		for ( var i = 0; i < set.length; i++ ) {
-			if ( set[ i ] !== null ) {
-				element.data( dataSpace + set[ i ], element[ 0 ].style[ set[ i ] ] );
-			}
-		}
-	},
-
-	// Restores a set of previously saved properties from a data storage
-	restore: function( element, set ) {
-		var val, i;
-		for ( i = 0; i < set.length; i++ ) {
-			if ( set[ i ] !== null ) {
-				val = element.data( dataSpace + set[ i ] );
-				// support: jQuery 1.6.2
-				// http://bugs.jquery.com/ticket/9917
-				// jQuery 1.6.2 incorrectly returns undefined for any falsy value.
-				// We can't differentiate between "" and 0 here, so we just assume
-				// empty string since it's likely to be a more common value...
-				if ( val === undefined ) {
-					val = "";
-				}
-				element.css( set[ i ], val );
-			}
-		}
-	},
-
-	setMode: function( el, mode ) {
-		if (mode === "toggle") {
-			mode = el.is( ":hidden" ) ? "show" : "hide";
-		}
-		return mode;
-	},
-
-	// Translates a [top,left] array into a baseline value
-	// this should be a little more flexible in the future to handle a string & hash
-	getBaseline: function( origin, original ) {
-		var y, x;
-		switch ( origin[ 0 ] ) {
-			case "top": y = 0; break;
-			case "middle": y = 0.5; break;
-			case "bottom": y = 1; break;
-			default: y = origin[ 0 ] / original.height;
-		}
-		switch ( origin[ 1 ] ) {
-			case "left": x = 0; break;
-			case "center": x = 0.5; break;
-			case "right": x = 1; break;
-			default: x = origin[ 1 ] / original.width;
-		}
-		return {
-			x: x,
-			y: y
-		};
-	},
-
-	// Wraps the element around a wrapper that copies position properties
-	createWrapper: function( element ) {
-
-		// if the element is already wrapped, return it
-		if ( element.parent().is( ".ui-effects-wrapper" )) {
-			return element.parent();
-		}
-
-		// wrap the element
-		var props = {
-				width: element.outerWidth(true),
-				height: element.outerHeight(true),
-				"float": element.css( "float" )
-			},
-			wrapper = $( "<div></div>" )
-				.addClass( "ui-effects-wrapper" )
-				.css({
-					fontSize: "100%",
-					background: "transparent",
-					border: "none",
-					margin: 0,
-					padding: 0
-				}),
-			// Store the size in case width/height are defined in % - Fixes #5245
-			size = {
-				width: element.width(),
-				height: element.height()
-			},
-			active = document.activeElement;
-
-		// support: Firefox
-		// Firefox incorrectly exposes anonymous content
-		// https://bugzilla.mozilla.org/show_bug.cgi?id=561664
-		try {
-			active.id;
-		} catch ( e ) {
-			active = document.body;
-		}
-
-		element.wrap( wrapper );
-
-		// Fixes #7595 - Elements lose focus when wrapped.
-		if ( element[ 0 ] === active || $.contains( element[ 0 ], active ) ) {
-			$( active ).focus();
-		}
-
-		wrapper = element.parent(); //Hotfix for jQuery 1.4 since some change in wrap() seems to actually lose the reference to the wrapped element
-
-		// transfer positioning properties to the wrapper
-		if ( element.css( "position" ) === "static" ) {
-			wrapper.css({ position: "relative" });
-			element.css({ position: "relative" });
-		} else {
-			$.extend( props, {
-				position: element.css( "position" ),
-				zIndex: element.css( "z-index" )
-			});
-			$.each([ "top", "left", "bottom", "right" ], function(i, pos) {
-				props[ pos ] = element.css( pos );
-				if ( isNaN( parseInt( props[ pos ], 10 ) ) ) {
-					props[ pos ] = "auto";
-				}
-			});
-			element.css({
-				position: "relative",
-				top: 0,
-				left: 0,
-				right: "auto",
-				bottom: "auto"
-			});
-		}
-		element.css(size);
-
-		return wrapper.css( props ).show();
-	},
-
-	removeWrapper: function( element ) {
-		var active = document.activeElement;
-
-		if ( element.parent().is( ".ui-effects-wrapper" ) ) {
-			element.parent().replaceWith( element );
-
-			// Fixes #7595 - Elements lose focus when wrapped.
-			if ( element[ 0 ] === active || $.contains( element[ 0 ], active ) ) {
-				$( active ).focus();
-			}
-		}
-
-		return element;
-	},
-
-	setTransition: function( element, list, factor, value ) {
-		value = value || {};
-		$.each( list, function( i, x ) {
-			var unit = element.cssUnit( x );
-			if ( unit[ 0 ] > 0 ) {
-				value[ x ] = unit[ 0 ] * factor + unit[ 1 ];
-			}
-		});
-		return value;
-	}
-});
-
-// return an effect options object for the given parameters:
-function _normalizeArguments( effect, options, speed, callback ) {
-
-	// allow passing all options as the first parameter
-	if ( $.isPlainObject( effect ) ) {
-		options = effect;
-		effect = effect.effect;
-	}
-
-	// convert to an object
-	effect = { effect: effect };
-
-	// catch (effect, null, ...)
-	if ( options == null ) {
-		options = {};
-	}
-
-	// catch (effect, callback)
-	if ( $.isFunction( options ) ) {
-		callback = options;
-		speed = null;
-		options = {};
-	}
-
-	// catch (effect, speed, ?)
-	if ( typeof options === "number" || $.fx.speeds[ options ] ) {
-		callback = speed;
-		speed = options;
-		options = {};
-	}
-
-	// catch (effect, options, callback)
-	if ( $.isFunction( speed ) ) {
-		callback = speed;
-		speed = null;
-	}
-
-	// add options to effect
-	if ( options ) {
-		$.extend( effect, options );
-	}
-
-	speed = speed || options.duration;
-	effect.duration = $.fx.off ? 0 :
-		typeof speed === "number" ? speed :
-		speed in $.fx.speeds ? $.fx.speeds[ speed ] :
-		$.fx.speeds._default;
-
-	effect.complete = callback || options.complete;
-
-	return effect;
-}
-
-function standardAnimationOption( option ) {
-	// Valid standard speeds (nothing, number, named speed)
-	if ( !option || typeof option === "number" || $.fx.speeds[ option ] ) {
-		return true;
-	}
-
-	// Invalid strings - treat as "normal" speed
-	if ( typeof option === "string" && !$.effects.effect[ option ] ) {
-		return true;
-	}
-
-	// Complete callback
-	if ( $.isFunction( option ) ) {
-		return true;
-	}
-
-	// Options hash (but not naming an effect)
-	if ( typeof option === "object" && !option.effect ) {
-		return true;
-	}
-
-	// Didn't match any standard API
-	return false;
-}
-
-$.fn.extend({
-	effect: function( /* effect, options, speed, callback */ ) {
-		var args = _normalizeArguments.apply( this, arguments ),
-			mode = args.mode,
-			queue = args.queue,
-			effectMethod = $.effects.effect[ args.effect ];
-
-		if ( $.fx.off || !effectMethod ) {
-			// delegate to the original method (e.g., .show()) if possible
-			if ( mode ) {
-				return this[ mode ]( args.duration, args.complete );
-			} else {
-				return this.each( function() {
-					if ( args.complete ) {
-						args.complete.call( this );
-					}
-				});
-			}
-		}
-
-		function run( next ) {
-			var elem = $( this ),
-				complete = args.complete,
-				mode = args.mode;
-
-			function done() {
-				if ( $.isFunction( complete ) ) {
-					complete.call( elem[0] );
-				}
-				if ( $.isFunction( next ) ) {
-					next();
-				}
-			}
-
-			// If the element already has the correct final state, delegate to
-			// the core methods so the internal tracking of "olddisplay" works.
-			if ( elem.is( ":hidden" ) ? mode === "hide" : mode === "show" ) {
-				elem[ mode ]();
-				done();
-			} else {
-				effectMethod.call( elem[0], args, done );
-			}
-		}
-
-		return queue === false ? this.each( run ) : this.queue( queue || "fx", run );
-	},
-
-	show: (function( orig ) {
-		return function( option ) {
-			if ( standardAnimationOption( option ) ) {
-				return orig.apply( this, arguments );
-			} else {
-				var args = _normalizeArguments.apply( this, arguments );
-				args.mode = "show";
-				return this.effect.call( this, args );
-			}
-		};
-	})( $.fn.show ),
-
-	hide: (function( orig ) {
-		return function( option ) {
-			if ( standardAnimationOption( option ) ) {
-				return orig.apply( this, arguments );
-			} else {
-				var args = _normalizeArguments.apply( this, arguments );
-				args.mode = "hide";
-				return this.effect.call( this, args );
-			}
-		};
-	})( $.fn.hide ),
-
-	toggle: (function( orig ) {
-		return function( option ) {
-			if ( standardAnimationOption( option ) || typeof option === "boolean" ) {
-				return orig.apply( this, arguments );
-			} else {
-				var args = _normalizeArguments.apply( this, arguments );
-				args.mode = "toggle";
-				return this.effect.call( this, args );
-			}
-		};
-	})( $.fn.toggle ),
-
-	// helper functions
-	cssUnit: function(key) {
-		var style = this.css( key ),
-			val = [];
-
-		$.each( [ "em", "px", "%", "pt" ], function( i, unit ) {
-			if ( style.indexOf( unit ) > 0 ) {
-				val = [ parseFloat( style ), unit ];
-			}
-		});
-		return val;
-	}
-});
-
-})();
-
-/******************************************************************************/
-/*********************************** EASING ***********************************/
-/******************************************************************************/
-
-(function() {
-
-// based on easing equations from Robert Penner (http://www.robertpenner.com/easing)
-
-var baseEasings = {};
-
-$.each( [ "Quad", "Cubic", "Quart", "Quint", "Expo" ], function( i, name ) {
-	baseEasings[ name ] = function( p ) {
-		return Math.pow( p, i + 2 );
-	};
-});
-
-$.extend( baseEasings, {
-	Sine: function( p ) {
-		return 1 - Math.cos( p * Math.PI / 2 );
-	},
-	Circ: function( p ) {
-		return 1 - Math.sqrt( 1 - p * p );
-	},
-	Elastic: function( p ) {
-		return p === 0 || p === 1 ? p :
-			-Math.pow( 2, 8 * (p - 1) ) * Math.sin( ( (p - 1) * 80 - 7.5 ) * Math.PI / 15 );
-	},
-	Back: function( p ) {
-		return p * p * ( 3 * p - 2 );
-	},
-	Bounce: function( p ) {
-		var pow2,
-			bounce = 4;
-
-		while ( p < ( ( pow2 = Math.pow( 2, --bounce ) ) - 1 ) / 11 ) {}
-		return 1 / Math.pow( 4, 3 - bounce ) - 7.5625 * Math.pow( ( pow2 * 3 - 2 ) / 22 - p, 2 );
-	}
-});
-
-$.each( baseEasings, function( name, easeIn ) {
-	$.easing[ "easeIn" + name ] = easeIn;
-	$.easing[ "easeOut" + name ] = function( p ) {
-		return 1 - easeIn( 1 - p );
-	};
-	$.easing[ "easeInOut" + name ] = function( p ) {
-		return p < 0.5 ?
-			easeIn( p * 2 ) / 2 :
-			1 - easeIn( p * -2 + 2 ) / 2;
-	};
-});
-
-})();
-
-return $.effects;
-
-}));
diff --git a/#pma/js/jquery/src/jquery-ui/menu.js b/#pma/js/jquery/src/jquery-ui/menu.js
deleted file mode 100644
index 5a2bf63c..00000000
--- a/#pma/js/jquery/src/jquery-ui/menu.js
+++ /dev/null
@@ -1,646 +0,0 @@
-/*!
- * jQuery UI Menu 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/menu/
- */
-(function( factory ) {
-	if ( typeof define === "function" && define.amd ) {
-
-		// AMD. Register as an anonymous module.
-		define([
-			"jquery",
-			"./core",
-			"./widget",
-			"./position"
-		], factory );
-	} else {
-
-		// Browser globals
-		factory( jQuery );
-	}
-}(function( $ ) {
-
-return $.widget( "ui.menu", {
-	version: "1.11.4",
-	defaultElement: "<ul>",
-	delay: 300,
-	options: {
-		icons: {
-			submenu: "ui-icon-carat-1-e"
-		},
-		items: "> *",
-		menus: "ul",
-		position: {
-			my: "left-1 top",
-			at: "right top"
-		},
-		role: "menu",
-
-		// callbacks
-		blur: null,
-		focus: null,
-		select: null
-	},
-
-	_create: function() {
-		this.activeMenu = this.element;
-
-		// Flag used to prevent firing of the click handler
-		// as the event bubbles up through nested menus
-		this.mouseHandled = false;
-		this.element
-			.uniqueId()
-			.addClass( "ui-menu ui-widget ui-widget-content" )
-			.toggleClass( "ui-menu-icons", !!this.element.find( ".ui-icon" ).length )
-			.attr({
-				role: this.options.role,
-				tabIndex: 0
-			});
-
-		if ( this.options.disabled ) {
-			this.element
-				.addClass( "ui-state-disabled" )
-				.attr( "aria-disabled", "true" );
-		}
-
-		this._on({
-			// Prevent focus from sticking to links inside menu after clicking
-			// them (focus should always stay on UL during navigation).
-			"mousedown .ui-menu-item": function( event ) {
-				event.preventDefault();
-			},
-			"click .ui-menu-item": function( event ) {
-				var target = $( event.target );
-				if ( !this.mouseHandled && target.not( ".ui-state-disabled" ).length ) {
-					this.select( event );
-
-					// Only set the mouseHandled flag if the event will bubble, see #9469.
-					if ( !event.isPropagationStopped() ) {
-						this.mouseHandled = true;
-					}
-
-					// Open submenu on click
-					if ( target.has( ".ui-menu" ).length ) {
-						this.expand( event );
-					} else if ( !this.element.is( ":focus" ) && $( this.document[ 0 ].activeElement ).closest( ".ui-menu" ).length ) {
-
-						// Redirect focus to the menu
-						this.element.trigger( "focus", [ true ] );
-
-						// If the active item is on the top level, let it stay active.
-						// Otherwise, blur the active item since it is no longer visible.
-						if ( this.active && this.active.parents( ".ui-menu" ).length === 1 ) {
-							clearTimeout( this.timer );
-						}
-					}
-				}
-			},
-			"mouseenter .ui-menu-item": function( event ) {
-				// Ignore mouse events while typeahead is active, see #10458.
-				// Prevents focusing the wrong item when typeahead causes a scroll while the mouse
-				// is over an item in the menu
-				if ( this.previousFilter ) {
-					return;
-				}
-				var target = $( event.currentTarget );
-				// Remove ui-state-active class from siblings of the newly focused menu item
-				// to avoid a jump caused by adjacent elements both having a class with a border
-				target.siblings( ".ui-state-active" ).removeClass( "ui-state-active" );
-				this.focus( event, target );
-			},
-			mouseleave: "collapseAll",
-			"mouseleave .ui-menu": "collapseAll",
-			focus: function( event, keepActiveItem ) {
-				// If there's already an active item, keep it active
-				// If not, activate the first item
-				var item = this.active || this.element.find( this.options.items ).eq( 0 );
-
-				if ( !keepActiveItem ) {
-					this.focus( event, item );
-				}
-			},
-			blur: function( event ) {
-				this._delay(function() {
-					if ( !$.contains( this.element[0], this.document[0].activeElement ) ) {
-						this.collapseAll( event );
-					}
-				});
-			},
-			keydown: "_keydown"
-		});
-
-		this.refresh();
-
-		// Clicks outside of a menu collapse any open menus
-		this._on( this.document, {
-			click: function( event ) {
-				if ( this._closeOnDocumentClick( event ) ) {
-					this.collapseAll( event );
-				}
-
-				// Reset the mouseHandled flag
-				this.mouseHandled = false;
-			}
-		});
-	},
-
-	_destroy: function() {
-		// Destroy (sub)menus
-		this.element
-			.removeAttr( "aria-activedescendant" )
-			.find( ".ui-menu" ).addBack()
-				.removeClass( "ui-menu ui-widget ui-widget-content ui-menu-icons ui-front" )
-				.removeAttr( "role" )
-				.removeAttr( "tabIndex" )
-				.removeAttr( "aria-labelledby" )
-				.removeAttr( "aria-expanded" )
-				.removeAttr( "aria-hidden" )
-				.removeAttr( "aria-disabled" )
-				.removeUniqueId()
-				.show();
-
-		// Destroy menu items
-		this.element.find( ".ui-menu-item" )
-			.removeClass( "ui-menu-item" )
-			.removeAttr( "role" )
-			.removeAttr( "aria-disabled" )
-			.removeUniqueId()
-			.removeClass( "ui-state-hover" )
-			.removeAttr( "tabIndex" )
-			.removeAttr( "role" )
-			.removeAttr( "aria-haspopup" )
-			.children().each( function() {
-				var elem = $( this );
-				if ( elem.data( "ui-menu-submenu-carat" ) ) {
-					elem.remove();
-				}
-			});
-
-		// Destroy menu dividers
-		this.element.find( ".ui-menu-divider" ).removeClass( "ui-menu-divider ui-widget-content" );
-	},
-
-	_keydown: function( event ) {
-		var match, prev, character, skip,
-			preventDefault = true;
-
-		switch ( event.keyCode ) {
-		case $.ui.keyCode.PAGE_UP:
-			this.previousPage( event );
-			break;
-		case $.ui.keyCode.PAGE_DOWN:
-			this.nextPage( event );
-			break;
-		case $.ui.keyCode.HOME:
-			this._move( "first", "first", event );
-			break;
-		case $.ui.keyCode.END:
-			this._move( "last", "last", event );
-			break;
-		case $.ui.keyCode.UP:
-			this.previous( event );
-			break;
-		case $.ui.keyCode.DOWN:
-			this.next( event );
-			break;
-		case $.ui.keyCode.LEFT:
-			this.collapse( event );
-			break;
-		case $.ui.keyCode.RIGHT:
-			if ( this.active && !this.active.is( ".ui-state-disabled" ) ) {
-				this.expand( event );
-			}
-			break;
-		case $.ui.keyCode.ENTER:
-		case $.ui.keyCode.SPACE:
-			this._activate( event );
-			break;
-		case $.ui.keyCode.ESCAPE:
-			this.collapse( event );
-			break;
-		default:
-			preventDefault = false;
-			prev = this.previousFilter || "";
-			character = String.fromCharCode( event.keyCode );
-			skip = false;
-
-			clearTimeout( this.filterTimer );
-
-			if ( character === prev ) {
-				skip = true;
-			} else {
-				character = prev + character;
-			}
-
-			match = this._filterMenuItems( character );
-			match = skip && match.index( this.active.next() ) !== -1 ?
-				this.active.nextAll( ".ui-menu-item" ) :
-				match;
-
-			// If no matches on the current filter, reset to the last character pressed
-			// to move down the menu to the first item that starts with that character
-			if ( !match.length ) {
-				character = String.fromCharCode( event.keyCode );
-				match = this._filterMenuItems( character );
-			}
-
-			if ( match.length ) {
-				this.focus( event, match );
-				this.previousFilter = character;
-				this.filterTimer = this._delay(function() {
-					delete this.previousFilter;
-				}, 1000 );
-			} else {
-				delete this.previousFilter;
-			}
-		}
-
-		if ( preventDefault ) {
-			event.preventDefault();
-		}
-	},
-
-	_activate: function( event ) {
-		if ( !this.active.is( ".ui-state-disabled" ) ) {
-			if ( this.active.is( "[aria-haspopup='true']" ) ) {
-				this.expand( event );
-			} else {
-				this.select( event );
-			}
-		}
-	},
-
-	refresh: function() {
-		var menus, items,
-			that = this,
-			icon = this.options.icons.submenu,
-			submenus = this.element.find( this.options.menus );
-
-		this.element.toggleClass( "ui-menu-icons", !!this.element.find( ".ui-icon" ).length );
-
-		// Initialize nested menus
-		submenus.filter( ":not(.ui-menu)" )
-			.addClass( "ui-menu ui-widget ui-widget-content ui-front" )
-			.hide()
-			.attr({
-				role: this.options.role,
-				"aria-hidden": "true",
-				"aria-expanded": "false"
-			})
-			.each(function() {
-				var menu = $( this ),
-					item = menu.parent(),
-					submenuCarat = $( "<span>" )
-						.addClass( "ui-menu-icon ui-icon " + icon )
-						.data( "ui-menu-submenu-carat", true );
-
-				item
-					.attr( "aria-haspopup", "true" )
-					.prepend( submenuCarat );
-				menu.attr( "aria-labelledby", item.attr( "id" ) );
-			});
-
-		menus = submenus.add( this.element );
-		items = menus.find( this.options.items );
-
-		// Initialize menu-items containing spaces and/or dashes only as dividers
-		items.not( ".ui-menu-item" ).each(function() {
-			var item = $( this );
-			if ( that._isDivider( item ) ) {
-				item.addClass( "ui-widget-content ui-menu-divider" );
-			}
-		});
-
-		// Don't refresh list items that are already adapted
-		items.not( ".ui-menu-item, .ui-menu-divider" )
-			.addClass( "ui-menu-item" )
-			.uniqueId()
-			.attr({
-				tabIndex: -1,
-				role: this._itemRole()
-			});
-
-		// Add aria-disabled attribute to any disabled menu item
-		items.filter( ".ui-state-disabled" ).attr( "aria-disabled", "true" );
-
-		// If the active item has been removed, blur the menu
-		if ( this.active && !$.contains( this.element[ 0 ], this.active[ 0 ] ) ) {
-			this.blur();
-		}
-	},
-
-	_itemRole: function() {
-		return {
-			menu: "menuitem",
-			listbox: "option"
-		}[ this.options.role ];
-	},
-
-	_setOption: function( key, value ) {
-		if ( key === "icons" ) {
-			this.element.find( ".ui-menu-icon" )
-				.removeClass( this.options.icons.submenu )
-				.addClass( value.submenu );
-		}
-		if ( key === "disabled" ) {
-			this.element
-				.toggleClass( "ui-state-disabled", !!value )
-				.attr( "aria-disabled", value );
-		}
-		this._super( key, value );
-	},
-
-	focus: function( event, item ) {
-		var nested, focused;
-		this.blur( event, event && event.type === "focus" );
-
-		this._scrollIntoView( item );
-
-		this.active = item.first();
-		focused = this.active.addClass( "ui-state-focus" ).removeClass( "ui-state-active" );
-		// Only update aria-activedescendant if there's a role
-		// otherwise we assume focus is managed elsewhere
-		if ( this.options.role ) {
-			this.element.attr( "aria-activedescendant", focused.attr( "id" ) );
-		}
-
-		// Highlight active parent menu item, if any
-		this.active
-			.parent()
-			.closest( ".ui-menu-item" )
-			.addClass( "ui-state-active" );
-
-		if ( event && event.type === "keydown" ) {
-			this._close();
-		} else {
-			this.timer = this._delay(function() {
-				this._close();
-			}, this.delay );
-		}
-
-		nested = item.children( ".ui-menu" );
-		if ( nested.length && event && ( /^mouse/.test( event.type ) ) ) {
-			this._startOpening(nested);
-		}
-		this.activeMenu = item.parent();
-
-		this._trigger( "focus", event, { item: item } );
-	},
-
-	_scrollIntoView: function( item ) {
-		var borderTop, paddingTop, offset, scroll, elementHeight, itemHeight;
-		if ( this._hasScroll() ) {
-			borderTop = parseFloat( $.css( this.activeMenu[0], "borderTopWidth" ) ) || 0;
-			paddingTop = parseFloat( $.css( this.activeMenu[0], "paddingTop" ) ) || 0;
-			offset = item.offset().top - this.activeMenu.offset().top - borderTop - paddingTop;
-			scroll = this.activeMenu.scrollTop();
-			elementHeight = this.activeMenu.height();
-			itemHeight = item.outerHeight();
-
-			if ( offset < 0 ) {
-				this.activeMenu.scrollTop( scroll + offset );
-			} else if ( offset + itemHeight > elementHeight ) {
-				this.activeMenu.scrollTop( scroll + offset - elementHeight + itemHeight );
-			}
-		}
-	},
-
-	blur: function( event, fromFocus ) {
-		if ( !fromFocus ) {
-			clearTimeout( this.timer );
-		}
-
-		if ( !this.active ) {
-			return;
-		}
-
-		this.active.removeClass( "ui-state-focus" );
-		this.active = null;
-
-		this._trigger( "blur", event, { item: this.active } );
-	},
-
-	_startOpening: function( submenu ) {
-		clearTimeout( this.timer );
-
-		// Don't open if already open fixes a Firefox bug that caused a .5 pixel
-		// shift in the submenu position when mousing over the carat icon
-		if ( submenu.attr( "aria-hidden" ) !== "true" ) {
-			return;
-		}
-
-		this.timer = this._delay(function() {
-			this._close();
-			this._open( submenu );
-		}, this.delay );
-	},
-
-	_open: function( submenu ) {
-		var position = $.extend({
-			of: this.active
-		}, this.options.position );
-
-		clearTimeout( this.timer );
-		this.element.find( ".ui-menu" ).not( submenu.parents( ".ui-menu" ) )
-			.hide()
-			.attr( "aria-hidden", "true" );
-
-		submenu
-			.show()
-			.removeAttr( "aria-hidden" )
-			.attr( "aria-expanded", "true" )
-			.position( position );
-	},
-
-	collapseAll: function( event, all ) {
-		clearTimeout( this.timer );
-		this.timer = this._delay(function() {
-			// If we were passed an event, look for the submenu that contains the event
-			var currentMenu = all ? this.element :
-				$( event && event.target ).closest( this.element.find( ".ui-menu" ) );
-
-			// If we found no valid submenu ancestor, use the main menu to close all sub menus anyway
-			if ( !currentMenu.length ) {
-				currentMenu = this.element;
-			}
-
-			this._close( currentMenu );
-
-			this.blur( event );
-			this.activeMenu = currentMenu;
-		}, this.delay );
-	},
-
-	// With no arguments, closes the currently active menu - if nothing is active
-	// it closes all menus.  If passed an argument, it will search for menus BELOW
-	_close: function( startMenu ) {
-		if ( !startMenu ) {
-			startMenu = this.active ? this.active.parent() : this.element;
-		}
-
-		startMenu
-			.find( ".ui-menu" )
-				.hide()
-				.attr( "aria-hidden", "true" )
-				.attr( "aria-expanded", "false" )
-			.end()
-			.find( ".ui-state-active" ).not( ".ui-state-focus" )
-				.removeClass( "ui-state-active" );
-	},
-
-	_closeOnDocumentClick: function( event ) {
-		return !$( event.target ).closest( ".ui-menu" ).length;
-	},
-
-	_isDivider: function( item ) {
-
-		// Match hyphen, em dash, en dash
-		return !/[^\-\u2014\u2013\s]/.test( item.text() );
-	},
-
-	collapse: function( event ) {
-		var newItem = this.active &&
-			this.active.parent().closest( ".ui-menu-item", this.element );
-		if ( newItem && newItem.length ) {
-			this._close();
-			this.focus( event, newItem );
-		}
-	},
-
-	expand: function( event ) {
-		var newItem = this.active &&
-			this.active
-				.children( ".ui-menu " )
-				.find( this.options.items )
-				.first();
-
-		if ( newItem && newItem.length ) {
-			this._open( newItem.parent() );
-
-			// Delay so Firefox will not hide activedescendant change in expanding submenu from AT
-			this._delay(function() {
-				this.focus( event, newItem );
-			});
-		}
-	},
-
-	next: function( event ) {
-		this._move( "next", "first", event );
-	},
-
-	previous: function( event ) {
-		this._move( "prev", "last", event );
-	},
-
-	isFirstItem: function() {
-		return this.active && !this.active.prevAll( ".ui-menu-item" ).length;
-	},
-
-	isLastItem: function() {
-		return this.active && !this.active.nextAll( ".ui-menu-item" ).length;
-	},
-
-	_move: function( direction, filter, event ) {
-		var next;
-		if ( this.active ) {
-			if ( direction === "first" || direction === "last" ) {
-				next = this.active
-					[ direction === "first" ? "prevAll" : "nextAll" ]( ".ui-menu-item" )
-					.eq( -1 );
-			} else {
-				next = this.active
-					[ direction + "All" ]( ".ui-menu-item" )
-					.eq( 0 );
-			}
-		}
-		if ( !next || !next.length || !this.active ) {
-			next = this.activeMenu.find( this.options.items )[ filter ]();
-		}
-
-		this.focus( event, next );
-	},
-
-	nextPage: function( event ) {
-		var item, base, height;
-
-		if ( !this.active ) {
-			this.next( event );
-			return;
-		}
-		if ( this.isLastItem() ) {
-			return;
-		}
-		if ( this._hasScroll() ) {
-			base = this.active.offset().top;
-			height = this.element.height();
-			this.active.nextAll( ".ui-menu-item" ).each(function() {
-				item = $( this );
-				return item.offset().top - base - height < 0;
-			});
-
-			this.focus( event, item );
-		} else {
-			this.focus( event, this.activeMenu.find( this.options.items )
-				[ !this.active ? "first" : "last" ]() );
-		}
-	},
-
-	previousPage: function( event ) {
-		var item, base, height;
-		if ( !this.active ) {
-			this.next( event );
-			return;
-		}
-		if ( this.isFirstItem() ) {
-			return;
-		}
-		if ( this._hasScroll() ) {
-			base = this.active.offset().top;
-			height = this.element.height();
-			this.active.prevAll( ".ui-menu-item" ).each(function() {
-				item = $( this );
-				return item.offset().top - base + height > 0;
-			});
-
-			this.focus( event, item );
-		} else {
-			this.focus( event, this.activeMenu.find( this.options.items ).first() );
-		}
-	},
-
-	_hasScroll: function() {
-		return this.element.outerHeight() < this.element.prop( "scrollHeight" );
-	},
-
-	select: function( event ) {
-		// TODO: It should never be possible to not have an active item at this
-		// point, but the tests don't trigger mouseenter before click.
-		this.active = this.active || $( event.target ).closest( ".ui-menu-item" );
-		var ui = { item: this.active };
-		if ( !this.active.has( ".ui-menu" ).length ) {
-			this.collapseAll( event, true );
-		}
-		this._trigger( "select", event, ui );
-	},
-
-	_filterMenuItems: function(character) {
-		var escapedCharacter = character.replace( /[\-\[\]{}()*+?.,\\\^$|#\s]/g, "\\$&" ),
-			regex = new RegExp( "^" + escapedCharacter, "i" );
-
-		return this.activeMenu
-			.find( this.options.items )
-
-			// Only match on items, not dividers or other content (#10571)
-			.filter( ".ui-menu-item" )
-			.filter(function() {
-				return regex.test( $.trim( $( this ).text() ) );
-			});
-	}
-});
-
-}));
diff --git a/#pma/js/jquery/src/jquery-ui/mouse.js b/#pma/js/jquery/src/jquery-ui/mouse.js
deleted file mode 100644
index 89018bfe..00000000
--- a/#pma/js/jquery/src/jquery-ui/mouse.js
+++ /dev/null
@@ -1,199 +0,0 @@
-/*!
- * jQuery UI Mouse 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/mouse/
- */
-(function( factory ) {
-	if ( typeof define === "function" && define.amd ) {
-
-		// AMD. Register as an anonymous module.
-		define([
-			"jquery",
-			"./widget"
-		], factory );
-	} else {
-
-		// Browser globals
-		factory( jQuery );
-	}
-}(function( $ ) {
-
-var mouseHandled = false;
-$( document ).mouseup( function() {
-	mouseHandled = false;
-});
-
-return $.widget("ui.mouse", {
-	version: "1.11.4",
-	options: {
-		cancel: "input,textarea,button,select,option",
-		distance: 1,
-		delay: 0
-	},
-	_mouseInit: function() {
-		var that = this;
-
-		this.element
-			.bind("mousedown." + this.widgetName, function(event) {
-				return that._mouseDown(event);
-			})
-			.bind("click." + this.widgetName, function(event) {
-				if (true === $.data(event.target, that.widgetName + ".preventClickEvent")) {
-					$.removeData(event.target, that.widgetName + ".preventClickEvent");
-					event.stopImmediatePropagation();
-					return false;
-				}
-			});
-
-		this.started = false;
-	},
-
-	// TODO: make sure destroying one instance of mouse doesn't mess with
-	// other instances of mouse
-	_mouseDestroy: function() {
-		this.element.unbind("." + this.widgetName);
-		if ( this._mouseMoveDelegate ) {
-			this.document
-				.unbind("mousemove." + this.widgetName, this._mouseMoveDelegate)
-				.unbind("mouseup." + this.widgetName, this._mouseUpDelegate);
-		}
-	},
-
-	_mouseDown: function(event) {
-		// don't let more than one widget handle mouseStart
-		if ( mouseHandled ) {
-			return;
-		}
-
-		this._mouseMoved = false;
-
-		// we may have missed mouseup (out of window)
-		(this._mouseStarted && this._mouseUp(event));
-
-		this._mouseDownEvent = event;
-
-		var that = this,
-			btnIsLeft = (event.which === 1),
-			// event.target.nodeName works around a bug in IE 8 with
-			// disabled inputs (#7620)
-			elIsCancel = (typeof this.options.cancel === "string" && event.target.nodeName ? $(event.target).closest(this.options.cancel).length : false);
-		if (!btnIsLeft || elIsCancel || !this._mouseCapture(event)) {
-			return true;
-		}
-
-		this.mouseDelayMet = !this.options.delay;
-		if (!this.mouseDelayMet) {
-			this._mouseDelayTimer = setTimeout(function() {
-				that.mouseDelayMet = true;
-			}, this.options.delay);
-		}
-
-		if (this._mouseDistanceMet(event) && this._mouseDelayMet(event)) {
-			this._mouseStarted = (this._mouseStart(event) !== false);
-			if (!this._mouseStarted) {
-				event.preventDefault();
-				return true;
-			}
-		}
-
-		// Click event may never have fired (Gecko & Opera)
-		if (true === $.data(event.target, this.widgetName + ".preventClickEvent")) {
-			$.removeData(event.target, this.widgetName + ".preventClickEvent");
-		}
-
-		// these delegates are required to keep context
-		this._mouseMoveDelegate = function(event) {
-			return that._mouseMove(event);
-		};
-		this._mouseUpDelegate = function(event) {
-			return that._mouseUp(event);
-		};
-
-		this.document
-			.bind( "mousemove." + this.widgetName, this._mouseMoveDelegate )
-			.bind( "mouseup." + this.widgetName, this._mouseUpDelegate );
-
-		event.preventDefault();
-
-		mouseHandled = true;
-		return true;
-	},
-
-	_mouseMove: function(event) {
-		// Only check for mouseups outside the document if you've moved inside the document
-		// at least once. This prevents the firing of mouseup in the case of IE<9, which will
-		// fire a mousemove event if content is placed under the cursor. See #7778
-		// Support: IE <9
-		if ( this._mouseMoved ) {
-			// IE mouseup check - mouseup happened when mouse was out of window
-			if ($.ui.ie && ( !document.documentMode || document.documentMode < 9 ) && !event.button) {
-				return this._mouseUp(event);
-
-			// Iframe mouseup check - mouseup occurred in another document
-			} else if ( !event.which ) {
-				return this._mouseUp( event );
-			}
-		}
-
-		if ( event.which || event.button ) {
-			this._mouseMoved = true;
-		}
-
-		if (this._mouseStarted) {
-			this._mouseDrag(event);
-			return event.preventDefault();
-		}
-
-		if (this._mouseDistanceMet(event) && this._mouseDelayMet(event)) {
-			this._mouseStarted =
-				(this._mouseStart(this._mouseDownEvent, event) !== false);
-			(this._mouseStarted ? this._mouseDrag(event) : this._mouseUp(event));
-		}
-
-		return !this._mouseStarted;
-	},
-
-	_mouseUp: function(event) {
-		this.document
-			.unbind( "mousemove." + this.widgetName, this._mouseMoveDelegate )
-			.unbind( "mouseup." + this.widgetName, this._mouseUpDelegate );
-
-		if (this._mouseStarted) {
-			this._mouseStarted = false;
-
-			if (event.target === this._mouseDownEvent.target) {
-				$.data(event.target, this.widgetName + ".preventClickEvent", true);
-			}
-
-			this._mouseStop(event);
-		}
-
-		mouseHandled = false;
-		return false;
-	},
-
-	_mouseDistanceMet: function(event) {
-		return (Math.max(
-				Math.abs(this._mouseDownEvent.pageX - event.pageX),
-				Math.abs(this._mouseDownEvent.pageY - event.pageY)
-			) >= this.options.distance
-		);
-	},
-
-	_mouseDelayMet: function(/* event */) {
-		return this.mouseDelayMet;
-	},
-
-	// These are placeholder methods, to be overriden by extending plugin
-	_mouseStart: function(/* event */) {},
-	_mouseDrag: function(/* event */) {},
-	_mouseStop: function(/* event */) {},
-	_mouseCapture: function(/* event */) { return true; }
-});
-
-}));
diff --git a/#pma/js/jquery/src/jquery-ui/position.js b/#pma/js/jquery/src/jquery-ui/position.js
deleted file mode 100644
index bb97a5b6..00000000
--- a/#pma/js/jquery/src/jquery-ui/position.js
+++ /dev/null
@@ -1,517 +0,0 @@
-/*!
- * jQuery UI Position 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/position/
- */
-(function( factory ) {
-	if ( typeof define === "function" && define.amd ) {
-
-		// AMD. Register as an anonymous module.
-		define( [ "jquery" ], factory );
-	} else {
-
-		// Browser globals
-		factory( jQuery );
-	}
-}(function( $ ) {
-(function() {
-
-$.ui = $.ui || {};
-
-var cachedScrollbarWidth, supportsOffsetFractions,
-	max = Math.max,
-	abs = Math.abs,
-	round = Math.round,
-	rhorizontal = /left|center|right/,
-	rvertical = /top|center|bottom/,
-	roffset = /[\+\-]\d+(\.[\d]+)?%?/,
-	rposition = /^\w+/,
-	rpercent = /%$/,
-	_position = $.fn.position;
-
-function getOffsets( offsets, width, height ) {
-	return [
-		parseFloat( offsets[ 0 ] ) * ( rpercent.test( offsets[ 0 ] ) ? width / 100 : 1 ),
-		parseFloat( offsets[ 1 ] ) * ( rpercent.test( offsets[ 1 ] ) ? height / 100 : 1 )
-	];
-}
-
-function parseCss( element, property ) {
-	return parseInt( $.css( element, property ), 10 ) || 0;
-}
-
-function getDimensions( elem ) {
-	var raw = elem[0];
-	if ( raw.nodeType === 9 ) {
-		return {
-			width: elem.width(),
-			height: elem.height(),
-			offset: { top: 0, left: 0 }
-		};
-	}
-	if ( $.isWindow( raw ) ) {
-		return {
-			width: elem.width(),
-			height: elem.height(),
-			offset: { top: elem.scrollTop(), left: elem.scrollLeft() }
-		};
-	}
-	if ( raw.preventDefault ) {
-		return {
-			width: 0,
-			height: 0,
-			offset: { top: raw.pageY, left: raw.pageX }
-		};
-	}
-	return {
-		width: elem.outerWidth(),
-		height: elem.outerHeight(),
-		offset: elem.offset()
-	};
-}
-
-$.position = {
-	scrollbarWidth: function() {
-		if ( cachedScrollbarWidth !== undefined ) {
-			return cachedScrollbarWidth;
-		}
-		var w1, w2,
-			div = $( "<div style='display:block;position:absolute;width:50px;height:50px;overflow:hidden;'><div style='height:100px;width:auto;'></div></div>" ),
-			innerDiv = div.children()[0];
-
-		$( "body" ).append( div );
-		w1 = innerDiv.offsetWidth;
-		div.css( "overflow", "scroll" );
-
-		w2 = innerDiv.offsetWidth;
-
-		if ( w1 === w2 ) {
-			w2 = div[0].clientWidth;
-		}
-
-		div.remove();
-
-		return (cachedScrollbarWidth = w1 - w2);
-	},
-	getScrollInfo: function( within ) {
-		var overflowX = within.isWindow || within.isDocument ? "" :
-				within.element.css( "overflow-x" ),
-			overflowY = within.isWindow || within.isDocument ? "" :
-				within.element.css( "overflow-y" ),
-			hasOverflowX = overflowX === "scroll" ||
-				( overflowX === "auto" && within.width < within.element[0].scrollWidth ),
-			hasOverflowY = overflowY === "scroll" ||
-				( overflowY === "auto" && within.height < within.element[0].scrollHeight );
-		return {
-			width: hasOverflowY ? $.position.scrollbarWidth() : 0,
-			height: hasOverflowX ? $.position.scrollbarWidth() : 0
-		};
-	},
-	getWithinInfo: function( element ) {
-		var withinElement = $( element || window ),
-			isWindow = $.isWindow( withinElement[0] ),
-			isDocument = !!withinElement[ 0 ] && withinElement[ 0 ].nodeType === 9;
-		return {
-			element: withinElement,
-			isWindow: isWindow,
-			isDocument: isDocument,
-			offset: withinElement.offset() || { left: 0, top: 0 },
-			scrollLeft: withinElement.scrollLeft(),
-			scrollTop: withinElement.scrollTop(),
-
-			// support: jQuery 1.6.x
-			// jQuery 1.6 doesn't support .outerWidth/Height() on documents or windows
-			width: isWindow || isDocument ? withinElement.width() : withinElement.outerWidth(),
-			height: isWindow || isDocument ? withinElement.height() : withinElement.outerHeight()
-		};
-	}
-};
-
-$.fn.position = function( options ) {
-	if ( !options || !options.of ) {
-		return _position.apply( this, arguments );
-	}
-
-	// make a copy, we don't want to modify arguments
-	options = $.extend( {}, options );
-
-	var atOffset, targetWidth, targetHeight, targetOffset, basePosition, dimensions,
-		target = $( options.of ),
-		within = $.position.getWithinInfo( options.within ),
-		scrollInfo = $.position.getScrollInfo( within ),
-		collision = ( options.collision || "flip" ).split( " " ),
-		offsets = {};
-
-	dimensions = getDimensions( target );
-	if ( target[0].preventDefault ) {
-		// force left top to allow flipping
-		options.at = "left top";
-	}
-	targetWidth = dimensions.width;
-	targetHeight = dimensions.height;
-	targetOffset = dimensions.offset;
-	// clone to reuse original targetOffset later
-	basePosition = $.extend( {}, targetOffset );
-
-	// force my and at to have valid horizontal and vertical positions
-	// if a value is missing or invalid, it will be converted to center
-	$.each( [ "my", "at" ], function() {
-		var pos = ( options[ this ] || "" ).split( " " ),
-			horizontalOffset,
-			verticalOffset;
-
-		if ( pos.length === 1) {
-			pos = rhorizontal.test( pos[ 0 ] ) ?
-				pos.concat( [ "center" ] ) :
-				rvertical.test( pos[ 0 ] ) ?
-					[ "center" ].concat( pos ) :
-					[ "center", "center" ];
-		}
-		pos[ 0 ] = rhorizontal.test( pos[ 0 ] ) ? pos[ 0 ] : "center";
-		pos[ 1 ] = rvertical.test( pos[ 1 ] ) ? pos[ 1 ] : "center";
-
-		// calculate offsets
-		horizontalOffset = roffset.exec( pos[ 0 ] );
-		verticalOffset = roffset.exec( pos[ 1 ] );
-		offsets[ this ] = [
-			horizontalOffset ? horizontalOffset[ 0 ] : 0,
-			verticalOffset ? verticalOffset[ 0 ] : 0
-		];
-
-		// reduce to just the positions without the offsets
-		options[ this ] = [
-			rposition.exec( pos[ 0 ] )[ 0 ],
-			rposition.exec( pos[ 1 ] )[ 0 ]
-		];
-	});
-
-	// normalize collision option
-	if ( collision.length === 1 ) {
-		collision[ 1 ] = collision[ 0 ];
-	}
-
-	if ( options.at[ 0 ] === "right" ) {
-		basePosition.left += targetWidth;
-	} else if ( options.at[ 0 ] === "center" ) {
-		basePosition.left += targetWidth / 2;
-	}
-
-	if ( options.at[ 1 ] === "bottom" ) {
-		basePosition.top += targetHeight;
-	} else if ( options.at[ 1 ] === "center" ) {
-		basePosition.top += targetHeight / 2;
-	}
-
-	atOffset = getOffsets( offsets.at, targetWidth, targetHeight );
-	basePosition.left += atOffset[ 0 ];
-	basePosition.top += atOffset[ 1 ];
-
-	return this.each(function() {
-		var collisionPosition, using,
-			elem = $( this ),
-			elemWidth = elem.outerWidth(),
-			elemHeight = elem.outerHeight(),
-			marginLeft = parseCss( this, "marginLeft" ),
-			marginTop = parseCss( this, "marginTop" ),
-			collisionWidth = elemWidth + marginLeft + parseCss( this, "marginRight" ) + scrollInfo.width,
-			collisionHeight = elemHeight + marginTop + parseCss( this, "marginBottom" ) + scrollInfo.height,
-			position = $.extend( {}, basePosition ),
-			myOffset = getOffsets( offsets.my, elem.outerWidth(), elem.outerHeight() );
-
-		if ( options.my[ 0 ] === "right" ) {
-			position.left -= elemWidth;
-		} else if ( options.my[ 0 ] === "center" ) {
-			position.left -= elemWidth / 2;
-		}
-
-		if ( options.my[ 1 ] === "bottom" ) {
-			position.top -= elemHeight;
-		} else if ( options.my[ 1 ] === "center" ) {
-			position.top -= elemHeight / 2;
-		}
-
-		position.left += myOffset[ 0 ];
-		position.top += myOffset[ 1 ];
-
-		// if the browser doesn't support fractions, then round for consistent results
-		if ( !supportsOffsetFractions ) {
-			position.left = round( position.left );
-			position.top = round( position.top );
-		}
-
-		collisionPosition = {
-			marginLeft: marginLeft,
-			marginTop: marginTop
-		};
-
-		$.each( [ "left", "top" ], function( i, dir ) {
-			if ( $.ui.position[ collision[ i ] ] ) {
-				$.ui.position[ collision[ i ] ][ dir ]( position, {
-					targetWidth: targetWidth,
-					targetHeight: targetHeight,
-					elemWidth: elemWidth,
-					elemHeight: elemHeight,
-					collisionPosition: collisionPosition,
-					collisionWidth: collisionWidth,
-					collisionHeight: collisionHeight,
-					offset: [ atOffset[ 0 ] + myOffset[ 0 ], atOffset [ 1 ] + myOffset[ 1 ] ],
-					my: options.my,
-					at: options.at,
-					within: within,
-					elem: elem
-				});
-			}
-		});
-
-		if ( options.using ) {
-			// adds feedback as second argument to using callback, if present
-			using = function( props ) {
-				var left = targetOffset.left - position.left,
-					right = left + targetWidth - elemWidth,
-					top = targetOffset.top - position.top,
-					bottom = top + targetHeight - elemHeight,
-					feedback = {
-						target: {
-							element: target,
-							left: targetOffset.left,
-							top: targetOffset.top,
-							width: targetWidth,
-							height: targetHeight
-						},
-						element: {
-							element: elem,
-							left: position.left,
-							top: position.top,
-							width: elemWidth,
-							height: elemHeight
-						},
-						horizontal: right < 0 ? "left" : left > 0 ? "right" : "center",
-						vertical: bottom < 0 ? "top" : top > 0 ? "bottom" : "middle"
-					};
-				if ( targetWidth < elemWidth && abs( left + right ) < targetWidth ) {
-					feedback.horizontal = "center";
-				}
-				if ( targetHeight < elemHeight && abs( top + bottom ) < targetHeight ) {
-					feedback.vertical = "middle";
-				}
-				if ( max( abs( left ), abs( right ) ) > max( abs( top ), abs( bottom ) ) ) {
-					feedback.important = "horizontal";
-				} else {
-					feedback.important = "vertical";
-				}
-				options.using.call( this, props, feedback );
-			};
-		}
-
-		elem.offset( $.extend( position, { using: using } ) );
-	});
-};
-
-$.ui.position = {
-	fit: {
-		left: function( position, data ) {
-			var within = data.within,
-				withinOffset = within.isWindow ? within.scrollLeft : within.offset.left,
-				outerWidth = within.width,
-				collisionPosLeft = position.left - data.collisionPosition.marginLeft,
-				overLeft = withinOffset - collisionPosLeft,
-				overRight = collisionPosLeft + data.collisionWidth - outerWidth - withinOffset,
-				newOverRight;
-
-			// element is wider than within
-			if ( data.collisionWidth > outerWidth ) {
-				// element is initially over the left side of within
-				if ( overLeft > 0 && overRight <= 0 ) {
-					newOverRight = position.left + overLeft + data.collisionWidth - outerWidth - withinOffset;
-					position.left += overLeft - newOverRight;
-				// element is initially over right side of within
-				} else if ( overRight > 0 && overLeft <= 0 ) {
-					position.left = withinOffset;
-				// element is initially over both left and right sides of within
-				} else {
-					if ( overLeft > overRight ) {
-						position.left = withinOffset + outerWidth - data.collisionWidth;
-					} else {
-						position.left = withinOffset;
-					}
-				}
-			// too far left -> align with left edge
-			} else if ( overLeft > 0 ) {
-				position.left += overLeft;
-			// too far right -> align with right edge
-			} else if ( overRight > 0 ) {
-				position.left -= overRight;
-			// adjust based on position and margin
-			} else {
-				position.left = max( position.left - collisionPosLeft, position.left );
-			}
-		},
-		top: function( position, data ) {
-			var within = data.within,
-				withinOffset = within.isWindow ? within.scrollTop : within.offset.top,
-				outerHeight = data.within.height,
-				collisionPosTop = position.top - data.collisionPosition.marginTop,
-				overTop = withinOffset - collisionPosTop,
-				overBottom = collisionPosTop + data.collisionHeight - outerHeight - withinOffset,
-				newOverBottom;
-
-			// element is taller than within
-			if ( data.collisionHeight > outerHeight ) {
-				// element is initially over the top of within
-				if ( overTop > 0 && overBottom <= 0 ) {
-					newOverBottom = position.top + overTop + data.collisionHeight - outerHeight - withinOffset;
-					position.top += overTop - newOverBottom;
-				// element is initially over bottom of within
-				} else if ( overBottom > 0 && overTop <= 0 ) {
-					position.top = withinOffset;
-				// element is initially over both top and bottom of within
-				} else {
-					if ( overTop > overBottom ) {
-						position.top = withinOffset + outerHeight - data.collisionHeight;
-					} else {
-						position.top = withinOffset;
-					}
-				}
-			// too far up -> align with top
-			} else if ( overTop > 0 ) {
-				position.top += overTop;
-			// too far down -> align with bottom edge
-			} else if ( overBottom > 0 ) {
-				position.top -= overBottom;
-			// adjust based on position and margin
-			} else {
-				position.top = max( position.top - collisionPosTop, position.top );
-			}
-		}
-	},
-	flip: {
-		left: function( position, data ) {
-			var within = data.within,
-				withinOffset = within.offset.left + within.scrollLeft,
-				outerWidth = within.width,
-				offsetLeft = within.isWindow ? within.scrollLeft : within.offset.left,
-				collisionPosLeft = position.left - data.collisionPosition.marginLeft,
-				overLeft = collisionPosLeft - offsetLeft,
-				overRight = collisionPosLeft + data.collisionWidth - outerWidth - offsetLeft,
-				myOffset = data.my[ 0 ] === "left" ?
-					-data.elemWidth :
-					data.my[ 0 ] === "right" ?
-						data.elemWidth :
-						0,
-				atOffset = data.at[ 0 ] === "left" ?
-					data.targetWidth :
-					data.at[ 0 ] === "right" ?
-						-data.targetWidth :
-						0,
-				offset = -2 * data.offset[ 0 ],
-				newOverRight,
-				newOverLeft;
-
-			if ( overLeft < 0 ) {
-				newOverRight = position.left + myOffset + atOffset + offset + data.collisionWidth - outerWidth - withinOffset;
-				if ( newOverRight < 0 || newOverRight < abs( overLeft ) ) {
-					position.left += myOffset + atOffset + offset;
-				}
-			} else if ( overRight > 0 ) {
-				newOverLeft = position.left - data.collisionPosition.marginLeft + myOffset + atOffset + offset - offsetLeft;
-				if ( newOverLeft > 0 || abs( newOverLeft ) < overRight ) {
-					position.left += myOffset + atOffset + offset;
-				}
-			}
-		},
-		top: function( position, data ) {
-			var within = data.within,
-				withinOffset = within.offset.top + within.scrollTop,
-				outerHeight = within.height,
-				offsetTop = within.isWindow ? within.scrollTop : within.offset.top,
-				collisionPosTop = position.top - data.collisionPosition.marginTop,
-				overTop = collisionPosTop - offsetTop,
-				overBottom = collisionPosTop + data.collisionHeight - outerHeight - offsetTop,
-				top = data.my[ 1 ] === "top",
-				myOffset = top ?
-					-data.elemHeight :
-					data.my[ 1 ] === "bottom" ?
-						data.elemHeight :
-						0,
-				atOffset = data.at[ 1 ] === "top" ?
-					data.targetHeight :
-					data.at[ 1 ] === "bottom" ?
-						-data.targetHeight :
-						0,
-				offset = -2 * data.offset[ 1 ],
-				newOverTop,
-				newOverBottom;
-			if ( overTop < 0 ) {
-				newOverBottom = position.top + myOffset + atOffset + offset + data.collisionHeight - outerHeight - withinOffset;
-				if ( newOverBottom < 0 || newOverBottom < abs( overTop ) ) {
-					position.top += myOffset + atOffset + offset;
-				}
-			} else if ( overBottom > 0 ) {
-				newOverTop = position.top - data.collisionPosition.marginTop + myOffset + atOffset + offset - offsetTop;
-				if ( newOverTop > 0 || abs( newOverTop ) < overBottom ) {
-					position.top += myOffset + atOffset + offset;
-				}
-			}
-		}
-	},
-	flipfit: {
-		left: function() {
-			$.ui.position.flip.left.apply( this, arguments );
-			$.ui.position.fit.left.apply( this, arguments );
-		},
-		top: function() {
-			$.ui.position.flip.top.apply( this, arguments );
-			$.ui.position.fit.top.apply( this, arguments );
-		}
-	}
-};
-
-// fraction support test
-(function() {
-	var testElement, testElementParent, testElementStyle, offsetLeft, i,
-		body = document.getElementsByTagName( "body" )[ 0 ],
-		div = document.createElement( "div" );
-
-	//Create a "fake body" for testing based on method used in jQuery.support
-	testElement = document.createElement( body ? "div" : "body" );
-	testElementStyle = {
-		visibility: "hidden",
-		width: 0,
-		height: 0,
-		border: 0,
-		margin: 0,
-		background: "none"
-	};
-	if ( body ) {
-		$.extend( testElementStyle, {
-			position: "absolute",
-			left: "-1000px",
-			top: "-1000px"
-		});
-	}
-	for ( i in testElementStyle ) {
-		testElement.style[ i ] = testElementStyle[ i ];
-	}
-	testElement.appendChild( div );
-	testElementParent = body || document.documentElement;
-	testElementParent.insertBefore( testElement, testElementParent.firstChild );
-
-	div.style.cssText = "position: absolute; left: 10.7432222px;";
-
-	offsetLeft = $( div ).offset().left;
-	supportsOffsetFractions = offsetLeft > 10 && offsetLeft < 11;
-
-	testElement.innerHTML = "";
-	testElementParent.removeChild( testElement );
-})();
-
-})();
-
-return $.ui.position;
-
-}));
diff --git a/#pma/js/jquery/src/jquery-ui/progressbar.js b/#pma/js/jquery/src/jquery-ui/progressbar.js
deleted file mode 100644
index b4850194..00000000
--- a/#pma/js/jquery/src/jquery-ui/progressbar.js
+++ /dev/null
@@ -1,159 +0,0 @@
-/*!
- * jQuery UI Progressbar 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/progressbar/
- */
-(function( factory ) {
-	if ( typeof define === "function" && define.amd ) {
-
-		// AMD. Register as an anonymous module.
-		define([
-			"jquery",
-			"./core",
-			"./widget"
-		], factory );
-	} else {
-
-		// Browser globals
-		factory( jQuery );
-	}
-}(function( $ ) {
-
-return $.widget( "ui.progressbar", {
-	version: "1.11.4",
-	options: {
-		max: 100,
-		value: 0,
-
-		change: null,
-		complete: null
-	},
-
-	min: 0,
-
-	_create: function() {
-		// Constrain initial value
-		this.oldValue = this.options.value = this._constrainedValue();
-
-		this.element
-			.addClass( "ui-progressbar ui-widget ui-widget-content ui-corner-all" )
-			.attr({
-				// Only set static values, aria-valuenow and aria-valuemax are
-				// set inside _refreshValue()
-				role: "progressbar",
-				"aria-valuemin": this.min
-			});
-
-		this.valueDiv = $( "<div class='ui-progressbar-value ui-widget-header ui-corner-left'></div>" )
-			.appendTo( this.element );
-
-		this._refreshValue();
-	},
-
-	_destroy: function() {
-		this.element
-			.removeClass( "ui-progressbar ui-widget ui-widget-content ui-corner-all" )
-			.removeAttr( "role" )
-			.removeAttr( "aria-valuemin" )
-			.removeAttr( "aria-valuemax" )
-			.removeAttr( "aria-valuenow" );
-
-		this.valueDiv.remove();
-	},
-
-	value: function( newValue ) {
-		if ( newValue === undefined ) {
-			return this.options.value;
-		}
-
-		this.options.value = this._constrainedValue( newValue );
-		this._refreshValue();
-	},
-
-	_constrainedValue: function( newValue ) {
-		if ( newValue === undefined ) {
-			newValue = this.options.value;
-		}
-
-		this.indeterminate = newValue === false;
-
-		// sanitize value
-		if ( typeof newValue !== "number" ) {
-			newValue = 0;
-		}
-
-		return this.indeterminate ? false :
-			Math.min( this.options.max, Math.max( this.min, newValue ) );
-	},
-
-	_setOptions: function( options ) {
-		// Ensure "value" option is set after other values (like max)
-		var value = options.value;
-		delete options.value;
-
-		this._super( options );
-
-		this.options.value = this._constrainedValue( value );
-		this._refreshValue();
-	},
-
-	_setOption: function( key, value ) {
-		if ( key === "max" ) {
-			// Don't allow a max less than min
-			value = Math.max( this.min, value );
-		}
-		if ( key === "disabled" ) {
-			this.element
-				.toggleClass( "ui-state-disabled", !!value )
-				.attr( "aria-disabled", value );
-		}
-		this._super( key, value );
-	},
-
-	_percentage: function() {
-		return this.indeterminate ? 100 : 100 * ( this.options.value - this.min ) / ( this.options.max - this.min );
-	},
-
-	_refreshValue: function() {
-		var value = this.options.value,
-			percentage = this._percentage();
-
-		this.valueDiv
-			.toggle( this.indeterminate || value > this.min )
-			.toggleClass( "ui-corner-right", value === this.options.max )
-			.width( percentage.toFixed(0) + "%" );
-
-		this.element.toggleClass( "ui-progressbar-indeterminate", this.indeterminate );
-
-		if ( this.indeterminate ) {
-			this.element.removeAttr( "aria-valuenow" );
-			if ( !this.overlayDiv ) {
-				this.overlayDiv = $( "<div class='ui-progressbar-overlay'></div>" ).appendTo( this.valueDiv );
-			}
-		} else {
-			this.element.attr({
-				"aria-valuemax": this.options.max,
-				"aria-valuenow": value
-			});
-			if ( this.overlayDiv ) {
-				this.overlayDiv.remove();
-				this.overlayDiv = null;
-			}
-		}
-
-		if ( this.oldValue !== value ) {
-			this.oldValue = value;
-			this._trigger( "change" );
-		}
-		if ( value === this.options.max ) {
-			this._trigger( "complete" );
-		}
-	}
-});
-
-}));
diff --git a/#pma/js/jquery/src/jquery-ui/resizable.js b/#pma/js/jquery/src/jquery-ui/resizable.js
deleted file mode 100644
index c45ff3b6..00000000
--- a/#pma/js/jquery/src/jquery-ui/resizable.js
+++ /dev/null
@@ -1,1152 +0,0 @@
-/*!
- * jQuery UI Resizable 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/resizable/
- */
-(function( factory ) {
-	if ( typeof define === "function" && define.amd ) {
-
-		// AMD. Register as an anonymous module.
-		define([
-			"jquery",
-			"./core",
-			"./mouse",
-			"./widget"
-		], factory );
-	} else {
-
-		// Browser globals
-		factory( jQuery );
-	}
-}(function( $ ) {
-
-$.widget("ui.resizable", $.ui.mouse, {
-	version: "1.11.4",
-	widgetEventPrefix: "resize",
-	options: {
-		alsoResize: false,
-		animate: false,
-		animateDuration: "slow",
-		animateEasing: "swing",
-		aspectRatio: false,
-		autoHide: false,
-		containment: false,
-		ghost: false,
-		grid: false,
-		handles: "e,s,se",
-		helper: false,
-		maxHeight: null,
-		maxWidth: null,
-		minHeight: 10,
-		minWidth: 10,
-		// See #7960
-		zIndex: 90,
-
-		// callbacks
-		resize: null,
-		start: null,
-		stop: null
-	},
-
-	_num: function( value ) {
-		return parseInt( value, 10 ) || 0;
-	},
-
-	_isNumber: function( value ) {
-		return !isNaN( parseInt( value, 10 ) );
-	},
-
-	_hasScroll: function( el, a ) {
-
-		if ( $( el ).css( "overflow" ) === "hidden") {
-			return false;
-		}
-
-		var scroll = ( a && a === "left" ) ? "scrollLeft" : "scrollTop",
-			has = false;
-
-		if ( el[ scroll ] > 0 ) {
-			return true;
-		}
-
-		// TODO: determine which cases actually cause this to happen
-		// if the element doesn't have the scroll set, see if it's possible to
-		// set the scroll
-		el[ scroll ] = 1;
-		has = ( el[ scroll ] > 0 );
-		el[ scroll ] = 0;
-		return has;
-	},
-
-	_create: function() {
-
-		var n, i, handle, axis, hname,
-			that = this,
-			o = this.options;
-		this.element.addClass("ui-resizable");
-
-		$.extend(this, {
-			_aspectRatio: !!(o.aspectRatio),
-			aspectRatio: o.aspectRatio,
-			originalElement: this.element,
-			_proportionallyResizeElements: [],
-			_helper: o.helper || o.ghost || o.animate ? o.helper || "ui-resizable-helper" : null
-		});
-
-		// Wrap the element if it cannot hold child nodes
-		if (this.element[0].nodeName.match(/^(canvas|textarea|input|select|button|img)$/i)) {
-
-			this.element.wrap(
-				$("<div class='ui-wrapper' style='overflow: hidden;'></div>").css({
-					position: this.element.css("position"),
-					width: this.element.outerWidth(),
-					height: this.element.outerHeight(),
-					top: this.element.css("top"),
-					left: this.element.css("left")
-				})
-			);
-
-			this.element = this.element.parent().data(
-				"ui-resizable", this.element.resizable( "instance" )
-			);
-
-			this.elementIsWrapper = true;
-
-			this.element.css({
-				marginLeft: this.originalElement.css("marginLeft"),
-				marginTop: this.originalElement.css("marginTop"),
-				marginRight: this.originalElement.css("marginRight"),
-				marginBottom: this.originalElement.css("marginBottom")
-			});
-			this.originalElement.css({
-				marginLeft: 0,
-				marginTop: 0,
-				marginRight: 0,
-				marginBottom: 0
-			});
-			// support: Safari
-			// Prevent Safari textarea resize
-			this.originalResizeStyle = this.originalElement.css("resize");
-			this.originalElement.css("resize", "none");
-
-			this._proportionallyResizeElements.push( this.originalElement.css({
-				position: "static",
-				zoom: 1,
-				display: "block"
-			}) );
-
-			// support: IE9
-			// avoid IE jump (hard set the margin)
-			this.originalElement.css({ margin: this.originalElement.css("margin") });
-
-			this._proportionallyResize();
-		}
-
-		this.handles = o.handles ||
-			( !$(".ui-resizable-handle", this.element).length ?
-				"e,s,se" : {
-					n: ".ui-resizable-n",
-					e: ".ui-resizable-e",
-					s: ".ui-resizable-s",
-					w: ".ui-resizable-w",
-					se: ".ui-resizable-se",
-					sw: ".ui-resizable-sw",
-					ne: ".ui-resizable-ne",
-					nw: ".ui-resizable-nw"
-				} );
-
-		this._handles = $();
-		if ( this.handles.constructor === String ) {
-
-			if ( this.handles === "all") {
-				this.handles = "n,e,s,w,se,sw,ne,nw";
-			}
-
-			n = this.handles.split(",");
-			this.handles = {};
-
-			for (i = 0; i < n.length; i++) {
-
-				handle = $.trim(n[i]);
-				hname = "ui-resizable-" + handle;
-				axis = $("<div class='ui-resizable-handle " + hname + "'></div>");
-
-				axis.css({ zIndex: o.zIndex });
-
-				// TODO : What's going on here?
-				if ("se" === handle) {
-					axis.addClass("ui-icon ui-icon-gripsmall-diagonal-se");
-				}
-
-				this.handles[handle] = ".ui-resizable-" + handle;
-				this.element.append(axis);
-			}
-
-		}
-
-		this._renderAxis = function(target) {
-
-			var i, axis, padPos, padWrapper;
-
-			target = target || this.element;
-
-			for (i in this.handles) {
-
-				if (this.handles[i].constructor === String) {
-					this.handles[i] = this.element.children( this.handles[ i ] ).first().show();
-				} else if ( this.handles[ i ].jquery || this.handles[ i ].nodeType ) {
-					this.handles[ i ] = $( this.handles[ i ] );
-					this._on( this.handles[ i ], { "mousedown": that._mouseDown });
-				}
-
-				if (this.elementIsWrapper && this.originalElement[0].nodeName.match(/^(textarea|input|select|button)$/i)) {
-
-					axis = $(this.handles[i], this.element);
-
-					padWrapper = /sw|ne|nw|se|n|s/.test(i) ? axis.outerHeight() : axis.outerWidth();
-
-					padPos = [ "padding",
-						/ne|nw|n/.test(i) ? "Top" :
-						/se|sw|s/.test(i) ? "Bottom" :
-						/^e$/.test(i) ? "Right" : "Left" ].join("");
-
-					target.css(padPos, padWrapper);
-
-					this._proportionallyResize();
-				}
-
-				this._handles = this._handles.add( this.handles[ i ] );
-			}
-		};
-
-		// TODO: make renderAxis a prototype function
-		this._renderAxis(this.element);
-
-		this._handles = this._handles.add( this.element.find( ".ui-resizable-handle" ) );
-		this._handles.disableSelection();
-
-		this._handles.mouseover(function() {
-			if (!that.resizing) {
-				if (this.className) {
-					axis = this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i);
-				}
-				that.axis = axis && axis[1] ? axis[1] : "se";
-			}
-		});
-
-		if (o.autoHide) {
-			this._handles.hide();
-			$(this.element)
-				.addClass("ui-resizable-autohide")
-				.mouseenter(function() {
-					if (o.disabled) {
-						return;
-					}
-					$(this).removeClass("ui-resizable-autohide");
-					that._handles.show();
-				})
-				.mouseleave(function() {
-					if (o.disabled) {
-						return;
-					}
-					if (!that.resizing) {
-						$(this).addClass("ui-resizable-autohide");
-						that._handles.hide();
-					}
-				});
-		}
-
-		this._mouseInit();
-	},
-
-	_destroy: function() {
-
-		this._mouseDestroy();
-
-		var wrapper,
-			_destroy = function(exp) {
-				$(exp)
-					.removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing")
-					.removeData("resizable")
-					.removeData("ui-resizable")
-					.unbind(".resizable")
-					.find(".ui-resizable-handle")
-						.remove();
-			};
-
-		// TODO: Unwrap at same DOM position
-		if (this.elementIsWrapper) {
-			_destroy(this.element);
-			wrapper = this.element;
-			this.originalElement.css({
-				position: wrapper.css("position"),
-				width: wrapper.outerWidth(),
-				height: wrapper.outerHeight(),
-				top: wrapper.css("top"),
-				left: wrapper.css("left")
-			}).insertAfter( wrapper );
-			wrapper.remove();
-		}
-
-		this.originalElement.css("resize", this.originalResizeStyle);
-		_destroy(this.originalElement);
-
-		return this;
-	},
-
-	_mouseCapture: function(event) {
-		var i, handle,
-			capture = false;
-
-		for (i in this.handles) {
-			handle = $(this.handles[i])[0];
-			if (handle === event.target || $.contains(handle, event.target)) {
-				capture = true;
-			}
-		}
-
-		return !this.options.disabled && capture;
-	},
-
-	_mouseStart: function(event) {
-
-		var curleft, curtop, cursor,
-			o = this.options,
-			el = this.element;
-
-		this.resizing = true;
-
-		this._renderProxy();
-
-		curleft = this._num(this.helper.css("left"));
-		curtop = this._num(this.helper.css("top"));
-
-		if (o.containment) {
-			curleft += $(o.containment).scrollLeft() || 0;
-			curtop += $(o.containment).scrollTop() || 0;
-		}
-
-		this.offset = this.helper.offset();
-		this.position = { left: curleft, top: curtop };
-
-		this.size = this._helper ? {
-				width: this.helper.width(),
-				height: this.helper.height()
-			} : {
-				width: el.width(),
-				height: el.height()
-			};
-
-		this.originalSize = this._helper ? {
-				width: el.outerWidth(),
-				height: el.outerHeight()
-			} : {
-				width: el.width(),
-				height: el.height()
-			};
-
-		this.sizeDiff = {
-			width: el.outerWidth() - el.width(),
-			height: el.outerHeight() - el.height()
-		};
-
-		this.originalPosition = { left: curleft, top: curtop };
-		this.originalMousePosition = { left: event.pageX, top: event.pageY };
-
-		this.aspectRatio = (typeof o.aspectRatio === "number") ?
-			o.aspectRatio :
-			((this.originalSize.width / this.originalSize.height) || 1);
-
-		cursor = $(".ui-resizable-" + this.axis).css("cursor");
-		$("body").css("cursor", cursor === "auto" ? this.axis + "-resize" : cursor);
-
-		el.addClass("ui-resizable-resizing");
-		this._propagate("start", event);
-		return true;
-	},
-
-	_mouseDrag: function(event) {
-
-		var data, props,
-			smp = this.originalMousePosition,
-			a = this.axis,
-			dx = (event.pageX - smp.left) || 0,
-			dy = (event.pageY - smp.top) || 0,
-			trigger = this._change[a];
-
-		this._updatePrevProperties();
-
-		if (!trigger) {
-			return false;
-		}
-
-		data = trigger.apply(this, [ event, dx, dy ]);
-
-		this._updateVirtualBoundaries(event.shiftKey);
-		if (this._aspectRatio || event.shiftKey) {
-			data = this._updateRatio(data, event);
-		}
-
-		data = this._respectSize(data, event);
-
-		this._updateCache(data);
-
-		this._propagate("resize", event);
-
-		props = this._applyChanges();
-
-		if ( !this._helper && this._proportionallyResizeElements.length ) {
-			this._proportionallyResize();
-		}
-
-		if ( !$.isEmptyObject( props ) ) {
-			this._updatePrevProperties();
-			this._trigger( "resize", event, this.ui() );
-			this._applyChanges();
-		}
-
-		return false;
-	},
-
-	_mouseStop: function(event) {
-
-		this.resizing = false;
-		var pr, ista, soffseth, soffsetw, s, left, top,
-			o = this.options, that = this;
-
-		if (this._helper) {
-
-			pr = this._proportionallyResizeElements;
-			ista = pr.length && (/textarea/i).test(pr[0].nodeName);
-			soffseth = ista && this._hasScroll(pr[0], "left") ? 0 : that.sizeDiff.height;
-			soffsetw = ista ? 0 : that.sizeDiff.width;
-
-			s = {
-				width: (that.helper.width()  - soffsetw),
-				height: (that.helper.height() - soffseth)
-			};
-			left = (parseInt(that.element.css("left"), 10) +
-				(that.position.left - that.originalPosition.left)) || null;
-			top = (parseInt(that.element.css("top"), 10) +
-				(that.position.top - that.originalPosition.top)) || null;
-
-			if (!o.animate) {
-				this.element.css($.extend(s, { top: top, left: left }));
-			}
-
-			that.helper.height(that.size.height);
-			that.helper.width(that.size.width);
-
-			if (this._helper && !o.animate) {
-				this._proportionallyResize();
-			}
-		}
-
-		$("body").css("cursor", "auto");
-
-		this.element.removeClass("ui-resizable-resizing");
-
-		this._propagate("stop", event);
-
-		if (this._helper) {
-			this.helper.remove();
-		}
-
-		return false;
-
-	},
-
-	_updatePrevProperties: function() {
-		this.prevPosition = {
-			top: this.position.top,
-			left: this.position.left
-		};
-		this.prevSize = {
-			width: this.size.width,
-			height: this.size.height
-		};
-	},
-
-	_applyChanges: function() {
-		var props = {};
-
-		if ( this.position.top !== this.prevPosition.top ) {
-			props.top = this.position.top + "px";
-		}
-		if ( this.position.left !== this.prevPosition.left ) {
-			props.left = this.position.left + "px";
-		}
-		if ( this.size.width !== this.prevSize.width ) {
-			props.width = this.size.width + "px";
-		}
-		if ( this.size.height !== this.prevSize.height ) {
-			props.height = this.size.height + "px";
-		}
-
-		this.helper.css( props );
-
-		return props;
-	},
-
-	_updateVirtualBoundaries: function(forceAspectRatio) {
-		var pMinWidth, pMaxWidth, pMinHeight, pMaxHeight, b,
-			o = this.options;
-
-		b = {
-			minWidth: this._isNumber(o.minWidth) ? o.minWidth : 0,
-			maxWidth: this._isNumber(o.maxWidth) ? o.maxWidth : Infinity,
-			minHeight: this._isNumber(o.minHeight) ? o.minHeight : 0,
-			maxHeight: this._isNumber(o.maxHeight) ? o.maxHeight : Infinity
-		};
-
-		if (this._aspectRatio || forceAspectRatio) {
-			pMinWidth = b.minHeight * this.aspectRatio;
-			pMinHeight = b.minWidth / this.aspectRatio;
-			pMaxWidth = b.maxHeight * this.aspectRatio;
-			pMaxHeight = b.maxWidth / this.aspectRatio;
-
-			if (pMinWidth > b.minWidth) {
-				b.minWidth = pMinWidth;
-			}
-			if (pMinHeight > b.minHeight) {
-				b.minHeight = pMinHeight;
-			}
-			if (pMaxWidth < b.maxWidth) {
-				b.maxWidth = pMaxWidth;
-			}
-			if (pMaxHeight < b.maxHeight) {
-				b.maxHeight = pMaxHeight;
-			}
-		}
-		this._vBoundaries = b;
-	},
-
-	_updateCache: function(data) {
-		this.offset = this.helper.offset();
-		if (this._isNumber(data.left)) {
-			this.position.left = data.left;
-		}
-		if (this._isNumber(data.top)) {
-			this.position.top = data.top;
-		}
-		if (this._isNumber(data.height)) {
-			this.size.height = data.height;
-		}
-		if (this._isNumber(data.width)) {
-			this.size.width = data.width;
-		}
-	},
-
-	_updateRatio: function( data ) {
-
-		var cpos = this.position,
-			csize = this.size,
-			a = this.axis;
-
-		if (this._isNumber(data.height)) {
-			data.width = (data.height * this.aspectRatio);
-		} else if (this._isNumber(data.width)) {
-			data.height = (data.width / this.aspectRatio);
-		}
-
-		if (a === "sw") {
-			data.left = cpos.left + (csize.width - data.width);
-			data.top = null;
-		}
-		if (a === "nw") {
-			data.top = cpos.top + (csize.height - data.height);
-			data.left = cpos.left + (csize.width - data.width);
-		}
-
-		return data;
-	},
-
-	_respectSize: function( data ) {
-
-		var o = this._vBoundaries,
-			a = this.axis,
-			ismaxw = this._isNumber(data.width) && o.maxWidth && (o.maxWidth < data.width),
-			ismaxh = this._isNumber(data.height) && o.maxHeight && (o.maxHeight < data.height),
-			isminw = this._isNumber(data.width) && o.minWidth && (o.minWidth > data.width),
-			isminh = this._isNumber(data.height) && o.minHeight && (o.minHeight > data.height),
-			dw = this.originalPosition.left + this.originalSize.width,
-			dh = this.position.top + this.size.height,
-			cw = /sw|nw|w/.test(a), ch = /nw|ne|n/.test(a);
-		if (isminw) {
-			data.width = o.minWidth;
-		}
-		if (isminh) {
-			data.height = o.minHeight;
-		}
-		if (ismaxw) {
-			data.width = o.maxWidth;
-		}
-		if (ismaxh) {
-			data.height = o.maxHeight;
-		}
-
-		if (isminw && cw) {
-			data.left = dw - o.minWidth;
-		}
-		if (ismaxw && cw) {
-			data.left = dw - o.maxWidth;
-		}
-		if (isminh && ch) {
-			data.top = dh - o.minHeight;
-		}
-		if (ismaxh && ch) {
-			data.top = dh - o.maxHeight;
-		}
-
-		// Fixing jump error on top/left - bug #2330
-		if (!data.width && !data.height && !data.left && data.top) {
-			data.top = null;
-		} else if (!data.width && !data.height && !data.top && data.left) {
-			data.left = null;
-		}
-
-		return data;
-	},
-
-	_getPaddingPlusBorderDimensions: function( element ) {
-		var i = 0,
-			widths = [],
-			borders = [
-				element.css( "borderTopWidth" ),
-				element.css( "borderRightWidth" ),
-				element.css( "borderBottomWidth" ),
-				element.css( "borderLeftWidth" )
-			],
-			paddings = [
-				element.css( "paddingTop" ),
-				element.css( "paddingRight" ),
-				element.css( "paddingBottom" ),
-				element.css( "paddingLeft" )
-			];
-
-		for ( ; i < 4; i++ ) {
-			widths[ i ] = ( parseInt( borders[ i ], 10 ) || 0 );
-			widths[ i ] += ( parseInt( paddings[ i ], 10 ) || 0 );
-		}
-
-		return {
-			height: widths[ 0 ] + widths[ 2 ],
-			width: widths[ 1 ] + widths[ 3 ]
-		};
-	},
-
-	_proportionallyResize: function() {
-
-		if (!this._proportionallyResizeElements.length) {
-			return;
-		}
-
-		var prel,
-			i = 0,
-			element = this.helper || this.element;
-
-		for ( ; i < this._proportionallyResizeElements.length; i++) {
-
-			prel = this._proportionallyResizeElements[i];
-
-			// TODO: Seems like a bug to cache this.outerDimensions
-			// considering that we are in a loop.
-			if (!this.outerDimensions) {
-				this.outerDimensions = this._getPaddingPlusBorderDimensions( prel );
-			}
-
-			prel.css({
-				height: (element.height() - this.outerDimensions.height) || 0,
-				width: (element.width() - this.outerDimensions.width) || 0
-			});
-
-		}
-
-	},
-
-	_renderProxy: function() {
-
-		var el = this.element, o = this.options;
-		this.elementOffset = el.offset();
-
-		if (this._helper) {
-
-			this.helper = this.helper || $("<div style='overflow:hidden;'></div>");
-
-			this.helper.addClass(this._helper).css({
-				width: this.element.outerWidth() - 1,
-				height: this.element.outerHeight() - 1,
-				position: "absolute",
-				left: this.elementOffset.left + "px",
-				top: this.elementOffset.top + "px",
-				zIndex: ++o.zIndex //TODO: Don't modify option
-			});
-
-			this.helper
-				.appendTo("body")
-				.disableSelection();
-
-		} else {
-			this.helper = this.element;
-		}
-
-	},
-
-	_change: {
-		e: function(event, dx) {
-			return { width: this.originalSize.width + dx };
-		},
-		w: function(event, dx) {
-			var cs = this.originalSize, sp = this.originalPosition;
-			return { left: sp.left + dx, width: cs.width - dx };
-		},
-		n: function(event, dx, dy) {
-			var cs = this.originalSize, sp = this.originalPosition;
-			return { top: sp.top + dy, height: cs.height - dy };
-		},
-		s: function(event, dx, dy) {
-			return { height: this.originalSize.height + dy };
-		},
-		se: function(event, dx, dy) {
-			return $.extend(this._change.s.apply(this, arguments),
-				this._change.e.apply(this, [ event, dx, dy ]));
-		},
-		sw: function(event, dx, dy) {
-			return $.extend(this._change.s.apply(this, arguments),
-				this._change.w.apply(this, [ event, dx, dy ]));
-		},
-		ne: function(event, dx, dy) {
-			return $.extend(this._change.n.apply(this, arguments),
-				this._change.e.apply(this, [ event, dx, dy ]));
-		},
-		nw: function(event, dx, dy) {
-			return $.extend(this._change.n.apply(this, arguments),
-				this._change.w.apply(this, [ event, dx, dy ]));
-		}
-	},
-
-	_propagate: function(n, event) {
-		$.ui.plugin.call(this, n, [ event, this.ui() ]);
-		(n !== "resize" && this._trigger(n, event, this.ui()));
-	},
-
-	plugins: {},
-
-	ui: function() {
-		return {
-			originalElement: this.originalElement,
-			element: this.element,
-			helper: this.helper,
-			position: this.position,
-			size: this.size,
-			originalSize: this.originalSize,
-			originalPosition: this.originalPosition
-		};
-	}
-
-});
-
-/*
- * Resizable Extensions
- */
-
-$.ui.plugin.add("resizable", "animate", {
-
-	stop: function( event ) {
-		var that = $(this).resizable( "instance" ),
-			o = that.options,
-			pr = that._proportionallyResizeElements,
-			ista = pr.length && (/textarea/i).test(pr[0].nodeName),
-			soffseth = ista && that._hasScroll(pr[0], "left") ? 0 : that.sizeDiff.height,
-			soffsetw = ista ? 0 : that.sizeDiff.width,
-			style = { width: (that.size.width - soffsetw), height: (that.size.height - soffseth) },
-			left = (parseInt(that.element.css("left"), 10) +
-				(that.position.left - that.originalPosition.left)) || null,
-			top = (parseInt(that.element.css("top"), 10) +
-				(that.position.top - that.originalPosition.top)) || null;
-
-		that.element.animate(
-			$.extend(style, top && left ? { top: top, left: left } : {}), {
-				duration: o.animateDuration,
-				easing: o.animateEasing,
-				step: function() {
-
-					var data = {
-						width: parseInt(that.element.css("width"), 10),
-						height: parseInt(that.element.css("height"), 10),
-						top: parseInt(that.element.css("top"), 10),
-						left: parseInt(that.element.css("left"), 10)
-					};
-
-					if (pr && pr.length) {
-						$(pr[0]).css({ width: data.width, height: data.height });
-					}
-
-					// propagating resize, and updating values for each animation step
-					that._updateCache(data);
-					that._propagate("resize", event);
-
-				}
-			}
-		);
-	}
-
-});
-
-$.ui.plugin.add( "resizable", "containment", {
-
-	start: function() {
-		var element, p, co, ch, cw, width, height,
-			that = $( this ).resizable( "instance" ),
-			o = that.options,
-			el = that.element,
-			oc = o.containment,
-			ce = ( oc instanceof $ ) ? oc.get( 0 ) : ( /parent/.test( oc ) ) ? el.parent().get( 0 ) : oc;
-
-		if ( !ce ) {
-			return;
-		}
-
-		that.containerElement = $( ce );
-
-		if ( /document/.test( oc ) || oc === document ) {
-			that.containerOffset = {
-				left: 0,
-				top: 0
-			};
-			that.containerPosition = {
-				left: 0,
-				top: 0
-			};
-
-			that.parentData = {
-				element: $( document ),
-				left: 0,
-				top: 0,
-				width: $( document ).width(),
-				height: $( document ).height() || document.body.parentNode.scrollHeight
-			};
-		} else {
-			element = $( ce );
-			p = [];
-			$([ "Top", "Right", "Left", "Bottom" ]).each(function( i, name ) {
-				p[ i ] = that._num( element.css( "padding" + name ) );
-			});
-
-			that.containerOffset = element.offset();
-			that.containerPosition = element.position();
-			that.containerSize = {
-				height: ( element.innerHeight() - p[ 3 ] ),
-				width: ( element.innerWidth() - p[ 1 ] )
-			};
-
-			co = that.containerOffset;
-			ch = that.containerSize.height;
-			cw = that.containerSize.width;
-			width = ( that._hasScroll ( ce, "left" ) ? ce.scrollWidth : cw );
-			height = ( that._hasScroll ( ce ) ? ce.scrollHeight : ch ) ;
-
-			that.parentData = {
-				element: ce,
-				left: co.left,
-				top: co.top,
-				width: width,
-				height: height
-			};
-		}
-	},
-
-	resize: function( event ) {
-		var woset, hoset, isParent, isOffsetRelative,
-			that = $( this ).resizable( "instance" ),
-			o = that.options,
-			co = that.containerOffset,
-			cp = that.position,
-			pRatio = that._aspectRatio || event.shiftKey,
-			cop = {
-				top: 0,
-				left: 0
-			},
-			ce = that.containerElement,
-			continueResize = true;
-
-		if ( ce[ 0 ] !== document && ( /static/ ).test( ce.css( "position" ) ) ) {
-			cop = co;
-		}
-
-		if ( cp.left < ( that._helper ? co.left : 0 ) ) {
-			that.size.width = that.size.width +
-				( that._helper ?
-					( that.position.left - co.left ) :
-					( that.position.left - cop.left ) );
-
-			if ( pRatio ) {
-				that.size.height = that.size.width / that.aspectRatio;
-				continueResize = false;
-			}
-			that.position.left = o.helper ? co.left : 0;
-		}
-
-		if ( cp.top < ( that._helper ? co.top : 0 ) ) {
-			that.size.height = that.size.height +
-				( that._helper ?
-					( that.position.top - co.top ) :
-					that.position.top );
-
-			if ( pRatio ) {
-				that.size.width = that.size.height * that.aspectRatio;
-				continueResize = false;
-			}
-			that.position.top = that._helper ? co.top : 0;
-		}
-
-		isParent = that.containerElement.get( 0 ) === that.element.parent().get( 0 );
-		isOffsetRelative = /relative|absolute/.test( that.containerElement.css( "position" ) );
-
-		if ( isParent && isOffsetRelative ) {
-			that.offset.left = that.parentData.left + that.position.left;
-			that.offset.top = that.parentData.top + that.position.top;
-		} else {
-			that.offset.left = that.element.offset().left;
-			that.offset.top = that.element.offset().top;
-		}
-
-		woset = Math.abs( that.sizeDiff.width +
-			(that._helper ?
-				that.offset.left - cop.left :
-				(that.offset.left - co.left)) );
-
-		hoset = Math.abs( that.sizeDiff.height +
-			(that._helper ?
-				that.offset.top - cop.top :
-				(that.offset.top - co.top)) );
-
-		if ( woset + that.size.width >= that.parentData.width ) {
-			that.size.width = that.parentData.width - woset;
-			if ( pRatio ) {
-				that.size.height = that.size.width / that.aspectRatio;
-				continueResize = false;
-			}
-		}
-
-		if ( hoset + that.size.height >= that.parentData.height ) {
-			that.size.height = that.parentData.height - hoset;
-			if ( pRatio ) {
-				that.size.width = that.size.height * that.aspectRatio;
-				continueResize = false;
-			}
-		}
-
-		if ( !continueResize ) {
-			that.position.left = that.prevPosition.left;
-			that.position.top = that.prevPosition.top;
-			that.size.width = that.prevSize.width;
-			that.size.height = that.prevSize.height;
-		}
-	},
-
-	stop: function() {
-		var that = $( this ).resizable( "instance" ),
-			o = that.options,
-			co = that.containerOffset,
-			cop = that.containerPosition,
-			ce = that.containerElement,
-			helper = $( that.helper ),
-			ho = helper.offset(),
-			w = helper.outerWidth() - that.sizeDiff.width,
-			h = helper.outerHeight() - that.sizeDiff.height;
-
-		if ( that._helper && !o.animate && ( /relative/ ).test( ce.css( "position" ) ) ) {
-			$( this ).css({
-				left: ho.left - cop.left - co.left,
-				width: w,
-				height: h
-			});
-		}
-
-		if ( that._helper && !o.animate && ( /static/ ).test( ce.css( "position" ) ) ) {
-			$( this ).css({
-				left: ho.left - cop.left - co.left,
-				width: w,
-				height: h
-			});
-		}
-	}
-});
-
-$.ui.plugin.add("resizable", "alsoResize", {
-
-	start: function() {
-		var that = $(this).resizable( "instance" ),
-			o = that.options;
-
-		$(o.alsoResize).each(function() {
-			var el = $(this);
-			el.data("ui-resizable-alsoresize", {
-				width: parseInt(el.width(), 10), height: parseInt(el.height(), 10),
-				left: parseInt(el.css("left"), 10), top: parseInt(el.css("top"), 10)
-			});
-		});
-	},
-
-	resize: function(event, ui) {
-		var that = $(this).resizable( "instance" ),
-			o = that.options,
-			os = that.originalSize,
-			op = that.originalPosition,
-			delta = {
-				height: (that.size.height - os.height) || 0,
-				width: (that.size.width - os.width) || 0,
-				top: (that.position.top - op.top) || 0,
-				left: (that.position.left - op.left) || 0
-			};
-
-			$(o.alsoResize).each(function() {
-				var el = $(this), start = $(this).data("ui-resizable-alsoresize"), style = {},
-					css = el.parents(ui.originalElement[0]).length ?
-							[ "width", "height" ] :
-							[ "width", "height", "top", "left" ];
-
-				$.each(css, function(i, prop) {
-					var sum = (start[prop] || 0) + (delta[prop] || 0);
-					if (sum && sum >= 0) {
-						style[prop] = sum || null;
-					}
-				});
-
-				el.css(style);
-			});
-	},
-
-	stop: function() {
-		$(this).removeData("resizable-alsoresize");
-	}
-});
-
-$.ui.plugin.add("resizable", "ghost", {
-
-	start: function() {
-
-		var that = $(this).resizable( "instance" ), o = that.options, cs = that.size;
-
-		that.ghost = that.originalElement.clone();
-		that.ghost
-			.css({
-				opacity: 0.25,
-				display: "block",
-				position: "relative",
-				height: cs.height,
-				width: cs.width,
-				margin: 0,
-				left: 0,
-				top: 0
-			})
-			.addClass("ui-resizable-ghost")
-			.addClass(typeof o.ghost === "string" ? o.ghost : "");
-
-		that.ghost.appendTo(that.helper);
-
-	},
-
-	resize: function() {
-		var that = $(this).resizable( "instance" );
-		if (that.ghost) {
-			that.ghost.css({
-				position: "relative",
-				height: that.size.height,
-				width: that.size.width
-			});
-		}
-	},
-
-	stop: function() {
-		var that = $(this).resizable( "instance" );
-		if (that.ghost && that.helper) {
-			that.helper.get(0).removeChild(that.ghost.get(0));
-		}
-	}
-
-});
-
-$.ui.plugin.add("resizable", "grid", {
-
-	resize: function() {
-		var outerDimensions,
-			that = $(this).resizable( "instance" ),
-			o = that.options,
-			cs = that.size,
-			os = that.originalSize,
-			op = that.originalPosition,
-			a = that.axis,
-			grid = typeof o.grid === "number" ? [ o.grid, o.grid ] : o.grid,
-			gridX = (grid[0] || 1),
-			gridY = (grid[1] || 1),
-			ox = Math.round((cs.width - os.width) / gridX) * gridX,
-			oy = Math.round((cs.height - os.height) / gridY) * gridY,
-			newWidth = os.width + ox,
-			newHeight = os.height + oy,
-			isMaxWidth = o.maxWidth && (o.maxWidth < newWidth),
-			isMaxHeight = o.maxHeight && (o.maxHeight < newHeight),
-			isMinWidth = o.minWidth && (o.minWidth > newWidth),
-			isMinHeight = o.minHeight && (o.minHeight > newHeight);
-
-		o.grid = grid;
-
-		if (isMinWidth) {
-			newWidth += gridX;
-		}
-		if (isMinHeight) {
-			newHeight += gridY;
-		}
-		if (isMaxWidth) {
-			newWidth -= gridX;
-		}
-		if (isMaxHeight) {
-			newHeight -= gridY;
-		}
-
-		if (/^(se|s|e)$/.test(a)) {
-			that.size.width = newWidth;
-			that.size.height = newHeight;
-		} else if (/^(ne)$/.test(a)) {
-			that.size.width = newWidth;
-			that.size.height = newHeight;
-			that.position.top = op.top - oy;
-		} else if (/^(sw)$/.test(a)) {
-			that.size.width = newWidth;
-			that.size.height = newHeight;
-			that.position.left = op.left - ox;
-		} else {
-			if ( newHeight - gridY <= 0 || newWidth - gridX <= 0) {
-				outerDimensions = that._getPaddingPlusBorderDimensions( this );
-			}
-
-			if ( newHeight - gridY > 0 ) {
-				that.size.height = newHeight;
-				that.position.top = op.top - oy;
-			} else {
-				newHeight = gridY - outerDimensions.height;
-				that.size.height = newHeight;
-				that.position.top = op.top + os.height - newHeight;
-			}
-			if ( newWidth - gridX > 0 ) {
-				that.size.width = newWidth;
-				that.position.left = op.left - ox;
-			} else {
-				newWidth = gridX - outerDimensions.width;
-				that.size.width = newWidth;
-				that.position.left = op.left + os.width - newWidth;
-			}
-		}
-	}
-
-});
-
-return $.ui.resizable;
-
-}));
diff --git a/#pma/js/jquery/src/jquery-ui/selectable.js b/#pma/js/jquery/src/jquery-ui/selectable.js
deleted file mode 100644
index 04b3dc6d..00000000
--- a/#pma/js/jquery/src/jquery-ui/selectable.js
+++ /dev/null
@@ -1,287 +0,0 @@
-/*!
- * jQuery UI Selectable 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/selectable/
- */
-(function( factory ) {
-	if ( typeof define === "function" && define.amd ) {
-
-		// AMD. Register as an anonymous module.
-		define([
-			"jquery",
-			"./core",
-			"./mouse",
-			"./widget"
-		], factory );
-	} else {
-
-		// Browser globals
-		factory( jQuery );
-	}
-}(function( $ ) {
-
-return $.widget("ui.selectable", $.ui.mouse, {
-	version: "1.11.4",
-	options: {
-		appendTo: "body",
-		autoRefresh: true,
-		distance: 0,
-		filter: "*",
-		tolerance: "touch",
-
-		// callbacks
-		selected: null,
-		selecting: null,
-		start: null,
-		stop: null,
-		unselected: null,
-		unselecting: null
-	},
-	_create: function() {
-		var selectees,
-			that = this;
-
-		this.element.addClass("ui-selectable");
-
-		this.dragged = false;
-
-		// cache selectee children based on filter
-		this.refresh = function() {
-			selectees = $(that.options.filter, that.element[0]);
-			selectees.addClass("ui-selectee");
-			selectees.each(function() {
-				var $this = $(this),
-					pos = $this.offset();
-				$.data(this, "selectable-item", {
-					element: this,
-					$element: $this,
-					left: pos.left,
-					top: pos.top,
-					right: pos.left + $this.outerWidth(),
-					bottom: pos.top + $this.outerHeight(),
-					startselected: false,
-					selected: $this.hasClass("ui-selected"),
-					selecting: $this.hasClass("ui-selecting"),
-					unselecting: $this.hasClass("ui-unselecting")
-				});
-			});
-		};
-		this.refresh();
-
-		this.selectees = selectees.addClass("ui-selectee");
-
-		this._mouseInit();
-
-		this.helper = $("<div class='ui-selectable-helper'></div>");
-	},
-
-	_destroy: function() {
-		this.selectees
-			.removeClass("ui-selectee")
-			.removeData("selectable-item");
-		this.element
-			.removeClass("ui-selectable ui-selectable-disabled");
-		this._mouseDestroy();
-	},
-
-	_mouseStart: function(event) {
-		var that = this,
-			options = this.options;
-
-		this.opos = [ event.pageX, event.pageY ];
-
-		if (this.options.disabled) {
-			return;
-		}
-
-		this.selectees = $(options.filter, this.element[0]);
-
-		this._trigger("start", event);
-
-		$(options.appendTo).append(this.helper);
-		// position helper (lasso)
-		this.helper.css({
-			"left": event.pageX,
-			"top": event.pageY,
-			"width": 0,
-			"height": 0
-		});
-
-		if (options.autoRefresh) {
-			this.refresh();
-		}
-
-		this.selectees.filter(".ui-selected").each(function() {
-			var selectee = $.data(this, "selectable-item");
-			selectee.startselected = true;
-			if (!event.metaKey && !event.ctrlKey) {
-				selectee.$element.removeClass("ui-selected");
-				selectee.selected = false;
-				selectee.$element.addClass("ui-unselecting");
-				selectee.unselecting = true;
-				// selectable UNSELECTING callback
-				that._trigger("unselecting", event, {
-					unselecting: selectee.element
-				});
-			}
-		});
-
-		$(event.target).parents().addBack().each(function() {
-			var doSelect,
-				selectee = $.data(this, "selectable-item");
-			if (selectee) {
-				doSelect = (!event.metaKey && !event.ctrlKey) || !selectee.$element.hasClass("ui-selected");
-				selectee.$element
-					.removeClass(doSelect ? "ui-unselecting" : "ui-selected")
-					.addClass(doSelect ? "ui-selecting" : "ui-unselecting");
-				selectee.unselecting = !doSelect;
-				selectee.selecting = doSelect;
-				selectee.selected = doSelect;
-				// selectable (UN)SELECTING callback
-				if (doSelect) {
-					that._trigger("selecting", event, {
-						selecting: selectee.element
-					});
-				} else {
-					that._trigger("unselecting", event, {
-						unselecting: selectee.element
-					});
-				}
-				return false;
-			}
-		});
-
-	},
-
-	_mouseDrag: function(event) {
-
-		this.dragged = true;
-
-		if (this.options.disabled) {
-			return;
-		}
-
-		var tmp,
-			that = this,
-			options = this.options,
-			x1 = this.opos[0],
-			y1 = this.opos[1],
-			x2 = event.pageX,
-			y2 = event.pageY;
-
-		if (x1 > x2) { tmp = x2; x2 = x1; x1 = tmp; }
-		if (y1 > y2) { tmp = y2; y2 = y1; y1 = tmp; }
-		this.helper.css({ left: x1, top: y1, width: x2 - x1, height: y2 - y1 });
-
-		this.selectees.each(function() {
-			var selectee = $.data(this, "selectable-item"),
-				hit = false;
-
-			//prevent helper from being selected if appendTo: selectable
-			if (!selectee || selectee.element === that.element[0]) {
-				return;
-			}
-
-			if (options.tolerance === "touch") {
-				hit = ( !(selectee.left > x2 || selectee.right < x1 || selectee.top > y2 || selectee.bottom < y1) );
-			} else if (options.tolerance === "fit") {
-				hit = (selectee.left > x1 && selectee.right < x2 && selectee.top > y1 && selectee.bottom < y2);
-			}
-
-			if (hit) {
-				// SELECT
-				if (selectee.selected) {
-					selectee.$element.removeClass("ui-selected");
-					selectee.selected = false;
-				}
-				if (selectee.unselecting) {
-					selectee.$element.removeClass("ui-unselecting");
-					selectee.unselecting = false;
-				}
-				if (!selectee.selecting) {
-					selectee.$element.addClass("ui-selecting");
-					selectee.selecting = true;
-					// selectable SELECTING callback
-					that._trigger("selecting", event, {
-						selecting: selectee.element
-					});
-				}
-			} else {
-				// UNSELECT
-				if (selectee.selecting) {
-					if ((event.metaKey || event.ctrlKey) && selectee.startselected) {
-						selectee.$element.removeClass("ui-selecting");
-						selectee.selecting = false;
-						selectee.$element.addClass("ui-selected");
-						selectee.selected = true;
-					} else {
-						selectee.$element.removeClass("ui-selecting");
-						selectee.selecting = false;
-						if (selectee.startselected) {
-							selectee.$element.addClass("ui-unselecting");
-							selectee.unselecting = true;
-						}
-						// selectable UNSELECTING callback
-						that._trigger("unselecting", event, {
-							unselecting: selectee.element
-						});
-					}
-				}
-				if (selectee.selected) {
-					if (!event.metaKey && !event.ctrlKey && !selectee.startselected) {
-						selectee.$element.removeClass("ui-selected");
-						selectee.selected = false;
-
-						selectee.$element.addClass("ui-unselecting");
-						selectee.unselecting = true;
-						// selectable UNSELECTING callback
-						that._trigger("unselecting", event, {
-							unselecting: selectee.element
-						});
-					}
-				}
-			}
-		});
-
-		return false;
-	},
-
-	_mouseStop: function(event) {
-		var that = this;
-
-		this.dragged = false;
-
-		$(".ui-unselecting", this.element[0]).each(function() {
-			var selectee = $.data(this, "selectable-item");
-			selectee.$element.removeClass("ui-unselecting");
-			selectee.unselecting = false;
-			selectee.startselected = false;
-			that._trigger("unselected", event, {
-				unselected: selectee.element
-			});
-		});
-		$(".ui-selecting", this.element[0]).each(function() {
-			var selectee = $.data(this, "selectable-item");
-			selectee.$element.removeClass("ui-selecting").addClass("ui-selected");
-			selectee.selecting = false;
-			selectee.selected = true;
-			selectee.startselected = true;
-			that._trigger("selected", event, {
-				selected: selectee.element
-			});
-		});
-		this._trigger("stop", event);
-
-		this.helper.remove();
-
-		return false;
-	}
-
-});
-
-}));
diff --git a/#pma/js/jquery/src/jquery-ui/selectmenu.js b/#pma/js/jquery/src/jquery-ui/selectmenu.js
deleted file mode 100644
index 363d7923..00000000
--- a/#pma/js/jquery/src/jquery-ui/selectmenu.js
+++ /dev/null
@@ -1,615 +0,0 @@
-/*!
- * jQuery UI Selectmenu 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/selectmenu
- */
-(function( factory ) {
-	if ( typeof define === "function" && define.amd ) {
-
-		// AMD. Register as an anonymous module.
-		define([
-			"jquery",
-			"./core",
-			"./widget",
-			"./position",
-			"./menu"
-		], factory );
-	} else {
-
-		// Browser globals
-		factory( jQuery );
-	}
-}(function( $ ) {
-
-return $.widget( "ui.selectmenu", {
-	version: "1.11.4",
-	defaultElement: "<select>",
-	options: {
-		appendTo: null,
-		disabled: null,
-		icons: {
-			button: "ui-icon-triangle-1-s"
-		},
-		position: {
-			my: "left top",
-			at: "left bottom",
-			collision: "none"
-		},
-		width: null,
-
-		// callbacks
-		change: null,
-		close: null,
-		focus: null,
-		open: null,
-		select: null
-	},
-
-	_create: function() {
-		var selectmenuId = this.element.uniqueId().attr( "id" );
-		this.ids = {
-			element: selectmenuId,
-			button: selectmenuId + "-button",
-			menu: selectmenuId + "-menu"
-		};
-
-		this._drawButton();
-		this._drawMenu();
-
-		if ( this.options.disabled ) {
-			this.disable();
-		}
-	},
-
-	_drawButton: function() {
-		var that = this;
-
-		// Associate existing label with the new button
-		this.label = $( "label[for='" + this.ids.element + "']" ).attr( "for", this.ids.button );
-		this._on( this.label, {
-			click: function( event ) {
-				this.button.focus();
-				event.preventDefault();
-			}
-		});
-
-		// Hide original select element
-		this.element.hide();
-
-		// Create button
-		this.button = $( "<span>", {
-			"class": "ui-selectmenu-button ui-widget ui-state-default ui-corner-all",
-			tabindex: this.options.disabled ? -1 : 0,
-			id: this.ids.button,
-			role: "combobox",
-			"aria-expanded": "false",
-			"aria-autocomplete": "list",
-			"aria-owns": this.ids.menu,
-			"aria-haspopup": "true"
-		})
-			.insertAfter( this.element );
-
-		$( "<span>", {
-			"class": "ui-icon " + this.options.icons.button
-		})
-			.prependTo( this.button );
-
-		this.buttonText = $( "<span>", {
-			"class": "ui-selectmenu-text"
-		})
-			.appendTo( this.button );
-
-		this._setText( this.buttonText, this.element.find( "option:selected" ).text() );
-		this._resizeButton();
-
-		this._on( this.button, this._buttonEvents );
-		this.button.one( "focusin", function() {
-
-			// Delay rendering the menu items until the button receives focus.
-			// The menu may have already been rendered via a programmatic open.
-			if ( !that.menuItems ) {
-				that._refreshMenu();
-			}
-		});
-		this._hoverable( this.button );
-		this._focusable( this.button );
-	},
-
-	_drawMenu: function() {
-		var that = this;
-
-		// Create menu
-		this.menu = $( "<ul>", {
-			"aria-hidden": "true",
-			"aria-labelledby": this.ids.button,
-			id: this.ids.menu
-		});
-
-		// Wrap menu
-		this.menuWrap = $( "<div>", {
-			"class": "ui-selectmenu-menu ui-front"
-		})
-			.append( this.menu )
-			.appendTo( this._appendTo() );
-
-		// Initialize menu widget
-		this.menuInstance = this.menu
-			.menu({
-				role: "listbox",
-				select: function( event, ui ) {
-					event.preventDefault();
-
-					// support: IE8
-					// If the item was selected via a click, the text selection
-					// will be destroyed in IE
-					that._setSelection();
-
-					that._select( ui.item.data( "ui-selectmenu-item" ), event );
-				},
-				focus: function( event, ui ) {
-					var item = ui.item.data( "ui-selectmenu-item" );
-
-					// Prevent inital focus from firing and check if its a newly focused item
-					if ( that.focusIndex != null && item.index !== that.focusIndex ) {
-						that._trigger( "focus", event, { item: item } );
-						if ( !that.isOpen ) {
-							that._select( item, event );
-						}
-					}
-					that.focusIndex = item.index;
-
-					that.button.attr( "aria-activedescendant",
-						that.menuItems.eq( item.index ).attr( "id" ) );
-				}
-			})
-			.menu( "instance" );
-
-		// Adjust menu styles to dropdown
-		this.menu
-			.addClass( "ui-corner-bottom" )
-			.removeClass( "ui-corner-all" );
-
-		// Don't close the menu on mouseleave
-		this.menuInstance._off( this.menu, "mouseleave" );
-
-		// Cancel the menu's collapseAll on document click
-		this.menuInstance._closeOnDocumentClick = function() {
-			return false;
-		};
-
-		// Selects often contain empty items, but never contain dividers
-		this.menuInstance._isDivider = function() {
-			return false;
-		};
-	},
-
-	refresh: function() {
-		this._refreshMenu();
-		this._setText( this.buttonText, this._getSelectedItem().text() );
-		if ( !this.options.width ) {
-			this._resizeButton();
-		}
-	},
-
-	_refreshMenu: function() {
-		this.menu.empty();
-
-		var item,
-			options = this.element.find( "option" );
-
-		if ( !options.length ) {
-			return;
-		}
-
-		this._parseOptions( options );
-		this._renderMenu( this.menu, this.items );
-
-		this.menuInstance.refresh();
-		this.menuItems = this.menu.find( "li" ).not( ".ui-selectmenu-optgroup" );
-
-		item = this._getSelectedItem();
-
-		// Update the menu to have the correct item focused
-		this.menuInstance.focus( null, item );
-		this._setAria( item.data( "ui-selectmenu-item" ) );
-
-		// Set disabled state
-		this._setOption( "disabled", this.element.prop( "disabled" ) );
-	},
-
-	open: function( event ) {
-		if ( this.options.disabled ) {
-			return;
-		}
-
-		// If this is the first time the menu is being opened, render the items
-		if ( !this.menuItems ) {
-			this._refreshMenu();
-		} else {
-
-			// Menu clears focus on close, reset focus to selected item
-			this.menu.find( ".ui-state-focus" ).removeClass( "ui-state-focus" );
-			this.menuInstance.focus( null, this._getSelectedItem() );
-		}
-
-		this.isOpen = true;
-		this._toggleAttr();
-		this._resizeMenu();
-		this._position();
-
-		this._on( this.document, this._documentClick );
-
-		this._trigger( "open", event );
-	},
-
-	_position: function() {
-		this.menuWrap.position( $.extend( { of: this.button }, this.options.position ) );
-	},
-
-	close: function( event ) {
-		if ( !this.isOpen ) {
-			return;
-		}
-
-		this.isOpen = false;
-		this._toggleAttr();
-
-		this.range = null;
-		this._off( this.document );
-
-		this._trigger( "close", event );
-	},
-
-	widget: function() {
-		return this.button;
-	},
-
-	menuWidget: function() {
-		return this.menu;
-	},
-
-	_renderMenu: function( ul, items ) {
-		var that = this,
-			currentOptgroup = "";
-
-		$.each( items, function( index, item ) {
-			if ( item.optgroup !== currentOptgroup ) {
-				$( "<li>", {
-					"class": "ui-selectmenu-optgroup ui-menu-divider" +
-						( item.element.parent( "optgroup" ).prop( "disabled" ) ?
-							" ui-state-disabled" :
-							"" ),
-					text: item.optgroup
-				})
-					.appendTo( ul );
-
-				currentOptgroup = item.optgroup;
-			}
-
-			that._renderItemData( ul, item );
-		});
-	},
-
-	_renderItemData: function( ul, item ) {
-		return this._renderItem( ul, item ).data( "ui-selectmenu-item", item );
-	},
-
-	_renderItem: function( ul, item ) {
-		var li = $( "<li>" );
-
-		if ( item.disabled ) {
-			li.addClass( "ui-state-disabled" );
-		}
-		this._setText( li, item.label );
-
-		return li.appendTo( ul );
-	},
-
-	_setText: function( element, value ) {
-		if ( value ) {
-			element.text( value );
-		} else {
-			element.html( "&#160;" );
-		}
-	},
-
-	_move: function( direction, event ) {
-		var item, next,
-			filter = ".ui-menu-item";
-
-		if ( this.isOpen ) {
-			item = this.menuItems.eq( this.focusIndex );
-		} else {
-			item = this.menuItems.eq( this.element[ 0 ].selectedIndex );
-			filter += ":not(.ui-state-disabled)";
-		}
-
-		if ( direction === "first" || direction === "last" ) {
-			next = item[ direction === "first" ? "prevAll" : "nextAll" ]( filter ).eq( -1 );
-		} else {
-			next = item[ direction + "All" ]( filter ).eq( 0 );
-		}
-
-		if ( next.length ) {
-			this.menuInstance.focus( event, next );
-		}
-	},
-
-	_getSelectedItem: function() {
-		return this.menuItems.eq( this.element[ 0 ].selectedIndex );
-	},
-
-	_toggle: function( event ) {
-		this[ this.isOpen ? "close" : "open" ]( event );
-	},
-
-	_setSelection: function() {
-		var selection;
-
-		if ( !this.range ) {
-			return;
-		}
-
-		if ( window.getSelection ) {
-			selection = window.getSelection();
-			selection.removeAllRanges();
-			selection.addRange( this.range );
-
-		// support: IE8
-		} else {
-			this.range.select();
-		}
-
-		// support: IE
-		// Setting the text selection kills the button focus in IE, but
-		// restoring the focus doesn't kill the selection.
-		this.button.focus();
-	},
-
-	_documentClick: {
-		mousedown: function( event ) {
-			if ( !this.isOpen ) {
-				return;
-			}
-
-			if ( !$( event.target ).closest( ".ui-selectmenu-menu, #" + this.ids.button ).length ) {
-				this.close( event );
-			}
-		}
-	},
-
-	_buttonEvents: {
-
-		// Prevent text selection from being reset when interacting with the selectmenu (#10144)
-		mousedown: function() {
-			var selection;
-
-			if ( window.getSelection ) {
-				selection = window.getSelection();
-				if ( selection.rangeCount ) {
-					this.range = selection.getRangeAt( 0 );
-				}
-
-			// support: IE8
-			} else {
-				this.range = document.selection.createRange();
-			}
-		},
-
-		click: function( event ) {
-			this._setSelection();
-			this._toggle( event );
-		},
-
-		keydown: function( event ) {
-			var preventDefault = true;
-			switch ( event.keyCode ) {
-				case $.ui.keyCode.TAB:
-				case $.ui.keyCode.ESCAPE:
-					this.close( event );
-					preventDefault = false;
-					break;
-				case $.ui.keyCode.ENTER:
-					if ( this.isOpen ) {
-						this._selectFocusedItem( event );
-					}
-					break;
-				case $.ui.keyCode.UP:
-					if ( event.altKey ) {
-						this._toggle( event );
-					} else {
-						this._move( "prev", event );
-					}
-					break;
-				case $.ui.keyCode.DOWN:
-					if ( event.altKey ) {
-						this._toggle( event );
-					} else {
-						this._move( "next", event );
-					}
-					break;
-				case $.ui.keyCode.SPACE:
-					if ( this.isOpen ) {
-						this._selectFocusedItem( event );
-					} else {
-						this._toggle( event );
-					}
-					break;
-				case $.ui.keyCode.LEFT:
-					this._move( "prev", event );
-					break;
-				case $.ui.keyCode.RIGHT:
-					this._move( "next", event );
-					break;
-				case $.ui.keyCode.HOME:
-				case $.ui.keyCode.PAGE_UP:
-					this._move( "first", event );
-					break;
-				case $.ui.keyCode.END:
-				case $.ui.keyCode.PAGE_DOWN:
-					this._move( "last", event );
-					break;
-				default:
-					this.menu.trigger( event );
-					preventDefault = false;
-			}
-
-			if ( preventDefault ) {
-				event.preventDefault();
-			}
-		}
-	},
-
-	_selectFocusedItem: function( event ) {
-		var item = this.menuItems.eq( this.focusIndex );
-		if ( !item.hasClass( "ui-state-disabled" ) ) {
-			this._select( item.data( "ui-selectmenu-item" ), event );
-		}
-	},
-
-	_select: function( item, event ) {
-		var oldIndex = this.element[ 0 ].selectedIndex;
-
-		// Change native select element
-		this.element[ 0 ].selectedIndex = item.index;
-		this._setText( this.buttonText, item.label );
-		this._setAria( item );
-		this._trigger( "select", event, { item: item } );
-
-		if ( item.index !== oldIndex ) {
-			this._trigger( "change", event, { item: item } );
-		}
-
-		this.close( event );
-	},
-
-	_setAria: function( item ) {
-		var id = this.menuItems.eq( item.index ).attr( "id" );
-
-		this.button.attr({
-			"aria-labelledby": id,
-			"aria-activedescendant": id
-		});
-		this.menu.attr( "aria-activedescendant", id );
-	},
-
-	_setOption: function( key, value ) {
-		if ( key === "icons" ) {
-			this.button.find( "span.ui-icon" )
-				.removeClass( this.options.icons.button )
-				.addClass( value.button );
-		}
-
-		this._super( key, value );
-
-		if ( key === "appendTo" ) {
-			this.menuWrap.appendTo( this._appendTo() );
-		}
-
-		if ( key === "disabled" ) {
-			this.menuInstance.option( "disabled", value );
-			this.button
-				.toggleClass( "ui-state-disabled", value )
-				.attr( "aria-disabled", value );
-
-			this.element.prop( "disabled", value );
-			if ( value ) {
-				this.button.attr( "tabindex", -1 );
-				this.close();
-			} else {
-				this.button.attr( "tabindex", 0 );
-			}
-		}
-
-		if ( key === "width" ) {
-			this._resizeButton();
-		}
-	},
-
-	_appendTo: function() {
-		var element = this.options.appendTo;
-
-		if ( element ) {
-			element = element.jquery || element.nodeType ?
-				$( element ) :
-				this.document.find( element ).eq( 0 );
-		}
-
-		if ( !element || !element[ 0 ] ) {
-			element = this.element.closest( ".ui-front" );
-		}
-
-		if ( !element.length ) {
-			element = this.document[ 0 ].body;
-		}
-
-		return element;
-	},
-
-	_toggleAttr: function() {
-		this.button
-			.toggleClass( "ui-corner-top", this.isOpen )
-			.toggleClass( "ui-corner-all", !this.isOpen )
-			.attr( "aria-expanded", this.isOpen );
-		this.menuWrap.toggleClass( "ui-selectmenu-open", this.isOpen );
-		this.menu.attr( "aria-hidden", !this.isOpen );
-	},
-
-	_resizeButton: function() {
-		var width = this.options.width;
-
-		if ( !width ) {
-			width = this.element.show().outerWidth();
-			this.element.hide();
-		}
-
-		this.button.outerWidth( width );
-	},
-
-	_resizeMenu: function() {
-		this.menu.outerWidth( Math.max(
-			this.button.outerWidth(),
-
-			// support: IE10
-			// IE10 wraps long text (possibly a rounding bug)
-			// so we add 1px to avoid the wrapping
-			this.menu.width( "" ).outerWidth() + 1
-		) );
-	},
-
-	_getCreateOptions: function() {
-		return { disabled: this.element.prop( "disabled" ) };
-	},
-
-	_parseOptions: function( options ) {
-		var data = [];
-		options.each(function( index, item ) {
-			var option = $( item ),
-				optgroup = option.parent( "optgroup" );
-			data.push({
-				element: option,
-				index: index,
-				value: option.val(),
-				label: option.text(),
-				optgroup: optgroup.attr( "label" ) || "",
-				disabled: optgroup.prop( "disabled" ) || option.prop( "disabled" )
-			});
-		});
-		this.items = data;
-	},
-
-	_destroy: function() {
-		this.menuWrap.remove();
-		this.button.remove();
-		this.element.show();
-		this.element.removeUniqueId();
-		this.label.attr( "for", this.ids.element );
-	}
-});
-
-}));
diff --git a/#pma/js/jquery/src/jquery-ui/slider.js b/#pma/js/jquery/src/jquery-ui/slider.js
deleted file mode 100644
index a5071568..00000000
--- a/#pma/js/jquery/src/jquery-ui/slider.js
+++ /dev/null
@@ -1,717 +0,0 @@
-/*!
- * jQuery UI Slider 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/slider/
- */
-(function( factory ) {
-	if ( typeof define === "function" && define.amd ) {
-
-		// AMD. Register as an anonymous module.
-		define([
-			"jquery",
-			"./core",
-			"./mouse",
-			"./widget"
-		], factory );
-	} else {
-
-		// Browser globals
-		factory( jQuery );
-	}
-}(function( $ ) {
-
-return $.widget( "ui.slider", $.ui.mouse, {
-	version: "1.11.4",
-	widgetEventPrefix: "slide",
-
-	options: {
-		animate: false,
-		distance: 0,
-		max: 100,
-		min: 0,
-		orientation: "horizontal",
-		range: false,
-		step: 1,
-		value: 0,
-		values: null,
-
-		// callbacks
-		change: null,
-		slide: null,
-		start: null,
-		stop: null
-	},
-
-	// number of pages in a slider
-	// (how many times can you page up/down to go through the whole range)
-	numPages: 5,
-
-	_create: function() {
-		this._keySliding = false;
-		this._mouseSliding = false;
-		this._animateOff = true;
-		this._handleIndex = null;
-		this._detectOrientation();
-		this._mouseInit();
-		this._calculateNewMax();
-
-		this.element
-			.addClass( "ui-slider" +
-				" ui-slider-" + this.orientation +
-				" ui-widget" +
-				" ui-widget-content" +
-				" ui-corner-all");
-
-		this._refresh();
-		this._setOption( "disabled", this.options.disabled );
-
-		this._animateOff = false;
-	},
-
-	_refresh: function() {
-		this._createRange();
-		this._createHandles();
-		this._setupEvents();
-		this._refreshValue();
-	},
-
-	_createHandles: function() {
-		var i, handleCount,
-			options = this.options,
-			existingHandles = this.element.find( ".ui-slider-handle" ).addClass( "ui-state-default ui-corner-all" ),
-			handle = "<span class='ui-slider-handle ui-state-default ui-corner-all' tabindex='0'></span>",
-			handles = [];
-
-		handleCount = ( options.values && options.values.length ) || 1;
-
-		if ( existingHandles.length > handleCount ) {
-			existingHandles.slice( handleCount ).remove();
-			existingHandles = existingHandles.slice( 0, handleCount );
-		}
-
-		for ( i = existingHandles.length; i < handleCount; i++ ) {
-			handles.push( handle );
-		}
-
-		this.handles = existingHandles.add( $( handles.join( "" ) ).appendTo( this.element ) );
-
-		this.handle = this.handles.eq( 0 );
-
-		this.handles.each(function( i ) {
-			$( this ).data( "ui-slider-handle-index", i );
-		});
-	},
-
-	_createRange: function() {
-		var options = this.options,
-			classes = "";
-
-		if ( options.range ) {
-			if ( options.range === true ) {
-				if ( !options.values ) {
-					options.values = [ this._valueMin(), this._valueMin() ];
-				} else if ( options.values.length && options.values.length !== 2 ) {
-					options.values = [ options.values[0], options.values[0] ];
-				} else if ( $.isArray( options.values ) ) {
-					options.values = options.values.slice(0);
-				}
-			}
-
-			if ( !this.range || !this.range.length ) {
-				this.range = $( "<div></div>" )
-					.appendTo( this.element );
-
-				classes = "ui-slider-range" +
-				// note: this isn't the most fittingly semantic framework class for this element,
-				// but worked best visually with a variety of themes
-				" ui-widget-header ui-corner-all";
-			} else {
-				this.range.removeClass( "ui-slider-range-min ui-slider-range-max" )
-					// Handle range switching from true to min/max
-					.css({
-						"left": "",
-						"bottom": ""
-					});
-			}
-
-			this.range.addClass( classes +
-				( ( options.range === "min" || options.range === "max" ) ? " ui-slider-range-" + options.range : "" ) );
-		} else {
-			if ( this.range ) {
-				this.range.remove();
-			}
-			this.range = null;
-		}
-	},
-
-	_setupEvents: function() {
-		this._off( this.handles );
-		this._on( this.handles, this._handleEvents );
-		this._hoverable( this.handles );
-		this._focusable( this.handles );
-	},
-
-	_destroy: function() {
-		this.handles.remove();
-		if ( this.range ) {
-			this.range.remove();
-		}
-
-		this.element
-			.removeClass( "ui-slider" +
-				" ui-slider-horizontal" +
-				" ui-slider-vertical" +
-				" ui-widget" +
-				" ui-widget-content" +
-				" ui-corner-all" );
-
-		this._mouseDestroy();
-	},
-
-	_mouseCapture: function( event ) {
-		var position, normValue, distance, closestHandle, index, allowed, offset, mouseOverHandle,
-			that = this,
-			o = this.options;
-
-		if ( o.disabled ) {
-			return false;
-		}
-
-		this.elementSize = {
-			width: this.element.outerWidth(),
-			height: this.element.outerHeight()
-		};
-		this.elementOffset = this.element.offset();
-
-		position = { x: event.pageX, y: event.pageY };
-		normValue = this._normValueFromMouse( position );
-		distance = this._valueMax() - this._valueMin() + 1;
-		this.handles.each(function( i ) {
-			var thisDistance = Math.abs( normValue - that.values(i) );
-			if (( distance > thisDistance ) ||
-				( distance === thisDistance &&
-					(i === that._lastChangedValue || that.values(i) === o.min ))) {
-				distance = thisDistance;
-				closestHandle = $( this );
-				index = i;
-			}
-		});
-
-		allowed = this._start( event, index );
-		if ( allowed === false ) {
-			return false;
-		}
-		this._mouseSliding = true;
-
-		this._handleIndex = index;
-
-		closestHandle
-			.addClass( "ui-state-active" )
-			.focus();
-
-		offset = closestHandle.offset();
-		mouseOverHandle = !$( event.target ).parents().addBack().is( ".ui-slider-handle" );
-		this._clickOffset = mouseOverHandle ? { left: 0, top: 0 } : {
-			left: event.pageX - offset.left - ( closestHandle.width() / 2 ),
-			top: event.pageY - offset.top -
-				( closestHandle.height() / 2 ) -
-				( parseInt( closestHandle.css("borderTopWidth"), 10 ) || 0 ) -
-				( parseInt( closestHandle.css("borderBottomWidth"), 10 ) || 0) +
-				( parseInt( closestHandle.css("marginTop"), 10 ) || 0)
-		};
-
-		if ( !this.handles.hasClass( "ui-state-hover" ) ) {
-			this._slide( event, index, normValue );
-		}
-		this._animateOff = true;
-		return true;
-	},
-
-	_mouseStart: function() {
-		return true;
-	},
-
-	_mouseDrag: function( event ) {
-		var position = { x: event.pageX, y: event.pageY },
-			normValue = this._normValueFromMouse( position );
-
-		this._slide( event, this._handleIndex, normValue );
-
-		return false;
-	},
-
-	_mouseStop: function( event ) {
-		this.handles.removeClass( "ui-state-active" );
-		this._mouseSliding = false;
-
-		this._stop( event, this._handleIndex );
-		this._change( event, this._handleIndex );
-
-		this._handleIndex = null;
-		this._clickOffset = null;
-		this._animateOff = false;
-
-		return false;
-	},
-
-	_detectOrientation: function() {
-		this.orientation = ( this.options.orientation === "vertical" ) ? "vertical" : "horizontal";
-	},
-
-	_normValueFromMouse: function( position ) {
-		var pixelTotal,
-			pixelMouse,
-			percentMouse,
-			valueTotal,
-			valueMouse;
-
-		if ( this.orientation === "horizontal" ) {
-			pixelTotal = this.elementSize.width;
-			pixelMouse = position.x - this.elementOffset.left - ( this._clickOffset ? this._clickOffset.left : 0 );
-		} else {
-			pixelTotal = this.elementSize.height;
-			pixelMouse = position.y - this.elementOffset.top - ( this._clickOffset ? this._clickOffset.top : 0 );
-		}
-
-		percentMouse = ( pixelMouse / pixelTotal );
-		if ( percentMouse > 1 ) {
-			percentMouse = 1;
-		}
-		if ( percentMouse < 0 ) {
-			percentMouse = 0;
-		}
-		if ( this.orientation === "vertical" ) {
-			percentMouse = 1 - percentMouse;
-		}
-
-		valueTotal = this._valueMax() - this._valueMin();
-		valueMouse = this._valueMin() + percentMouse * valueTotal;
-
-		return this._trimAlignValue( valueMouse );
-	},
-
-	_start: function( event, index ) {
-		var uiHash = {
-			handle: this.handles[ index ],
-			value: this.value()
-		};
-		if ( this.options.values && this.options.values.length ) {
-			uiHash.value = this.values( index );
-			uiHash.values = this.values();
-		}
-		return this._trigger( "start", event, uiHash );
-	},
-
-	_slide: function( event, index, newVal ) {
-		var otherVal,
-			newValues,
-			allowed;
-
-		if ( this.options.values && this.options.values.length ) {
-			otherVal = this.values( index ? 0 : 1 );
-
-			if ( ( this.options.values.length === 2 && this.options.range === true ) &&
-					( ( index === 0 && newVal > otherVal) || ( index === 1 && newVal < otherVal ) )
-				) {
-				newVal = otherVal;
-			}
-
-			if ( newVal !== this.values( index ) ) {
-				newValues = this.values();
-				newValues[ index ] = newVal;
-				// A slide can be canceled by returning false from the slide callback
-				allowed = this._trigger( "slide", event, {
-					handle: this.handles[ index ],
-					value: newVal,
-					values: newValues
-				} );
-				otherVal = this.values( index ? 0 : 1 );
-				if ( allowed !== false ) {
-					this.values( index, newVal );
-				}
-			}
-		} else {
-			if ( newVal !== this.value() ) {
-				// A slide can be canceled by returning false from the slide callback
-				allowed = this._trigger( "slide", event, {
-					handle: this.handles[ index ],
-					value: newVal
-				} );
-				if ( allowed !== false ) {
-					this.value( newVal );
-				}
-			}
-		}
-	},
-
-	_stop: function( event, index ) {
-		var uiHash = {
-			handle: this.handles[ index ],
-			value: this.value()
-		};
-		if ( this.options.values && this.options.values.length ) {
-			uiHash.value = this.values( index );
-			uiHash.values = this.values();
-		}
-
-		this._trigger( "stop", event, uiHash );
-	},
-
-	_change: function( event, index ) {
-		if ( !this._keySliding && !this._mouseSliding ) {
-			var uiHash = {
-				handle: this.handles[ index ],
-				value: this.value()
-			};
-			if ( this.options.values && this.options.values.length ) {
-				uiHash.value = this.values( index );
-				uiHash.values = this.values();
-			}
-
-			//store the last changed value index for reference when handles overlap
-			this._lastChangedValue = index;
-
-			this._trigger( "change", event, uiHash );
-		}
-	},
-
-	value: function( newValue ) {
-		if ( arguments.length ) {
-			this.options.value = this._trimAlignValue( newValue );
-			this._refreshValue();
-			this._change( null, 0 );
-			return;
-		}
-
-		return this._value();
-	},
-
-	values: function( index, newValue ) {
-		var vals,
-			newValues,
-			i;
-
-		if ( arguments.length > 1 ) {
-			this.options.values[ index ] = this._trimAlignValue( newValue );
-			this._refreshValue();
-			this._change( null, index );
-			return;
-		}
-
-		if ( arguments.length ) {
-			if ( $.isArray( arguments[ 0 ] ) ) {
-				vals = this.options.values;
-				newValues = arguments[ 0 ];
-				for ( i = 0; i < vals.length; i += 1 ) {
-					vals[ i ] = this._trimAlignValue( newValues[ i ] );
-					this._change( null, i );
-				}
-				this._refreshValue();
-			} else {
-				if ( this.options.values && this.options.values.length ) {
-					return this._values( index );
-				} else {
-					return this.value();
-				}
-			}
-		} else {
-			return this._values();
-		}
-	},
-
-	_setOption: function( key, value ) {
-		var i,
-			valsLength = 0;
-
-		if ( key === "range" && this.options.range === true ) {
-			if ( value === "min" ) {
-				this.options.value = this._values( 0 );
-				this.options.values = null;
-			} else if ( value === "max" ) {
-				this.options.value = this._values( this.options.values.length - 1 );
-				this.options.values = null;
-			}
-		}
-
-		if ( $.isArray( this.options.values ) ) {
-			valsLength = this.options.values.length;
-		}
-
-		if ( key === "disabled" ) {
-			this.element.toggleClass( "ui-state-disabled", !!value );
-		}
-
-		this._super( key, value );
-
-		switch ( key ) {
-			case "orientation":
-				this._detectOrientation();
-				this.element
-					.removeClass( "ui-slider-horizontal ui-slider-vertical" )
-					.addClass( "ui-slider-" + this.orientation );
-				this._refreshValue();
-
-				// Reset positioning from previous orientation
-				this.handles.css( value === "horizontal" ? "bottom" : "left", "" );
-				break;
-			case "value":
-				this._animateOff = true;
-				this._refreshValue();
-				this._change( null, 0 );
-				this._animateOff = false;
-				break;
-			case "values":
-				this._animateOff = true;
-				this._refreshValue();
-				for ( i = 0; i < valsLength; i += 1 ) {
-					this._change( null, i );
-				}
-				this._animateOff = false;
-				break;
-			case "step":
-			case "min":
-			case "max":
-				this._animateOff = true;
-				this._calculateNewMax();
-				this._refreshValue();
-				this._animateOff = false;
-				break;
-			case "range":
-				this._animateOff = true;
-				this._refresh();
-				this._animateOff = false;
-				break;
-		}
-	},
-
-	//internal value getter
-	// _value() returns value trimmed by min and max, aligned by step
-	_value: function() {
-		var val = this.options.value;
-		val = this._trimAlignValue( val );
-
-		return val;
-	},
-
-	//internal values getter
-	// _values() returns array of values trimmed by min and max, aligned by step
-	// _values( index ) returns single value trimmed by min and max, aligned by step
-	_values: function( index ) {
-		var val,
-			vals,
-			i;
-
-		if ( arguments.length ) {
-			val = this.options.values[ index ];
-			val = this._trimAlignValue( val );
-
-			return val;
-		} else if ( this.options.values && this.options.values.length ) {
-			// .slice() creates a copy of the array
-			// this copy gets trimmed by min and max and then returned
-			vals = this.options.values.slice();
-			for ( i = 0; i < vals.length; i += 1) {
-				vals[ i ] = this._trimAlignValue( vals[ i ] );
-			}
-
-			return vals;
-		} else {
-			return [];
-		}
-	},
-
-	// returns the step-aligned value that val is closest to, between (inclusive) min and max
-	_trimAlignValue: function( val ) {
-		if ( val <= this._valueMin() ) {
-			return this._valueMin();
-		}
-		if ( val >= this._valueMax() ) {
-			return this._valueMax();
-		}
-		var step = ( this.options.step > 0 ) ? this.options.step : 1,
-			valModStep = (val - this._valueMin()) % step,
-			alignValue = val - valModStep;
-
-		if ( Math.abs(valModStep) * 2 >= step ) {
-			alignValue += ( valModStep > 0 ) ? step : ( -step );
-		}
-
-		// Since JavaScript has problems with large floats, round
-		// the final value to 5 digits after the decimal point (see #4124)
-		return parseFloat( alignValue.toFixed(5) );
-	},
-
-	_calculateNewMax: function() {
-		var max = this.options.max,
-			min = this._valueMin(),
-			step = this.options.step,
-			aboveMin = Math.floor( ( +( max - min ).toFixed( this._precision() ) ) / step ) * step;
-		max = aboveMin + min;
-		this.max = parseFloat( max.toFixed( this._precision() ) );
-	},
-
-	_precision: function() {
-		var precision = this._precisionOf( this.options.step );
-		if ( this.options.min !== null ) {
-			precision = Math.max( precision, this._precisionOf( this.options.min ) );
-		}
-		return precision;
-	},
-
-	_precisionOf: function( num ) {
-		var str = num.toString(),
-			decimal = str.indexOf( "." );
-		return decimal === -1 ? 0 : str.length - decimal - 1;
-	},
-
-	_valueMin: function() {
-		return this.options.min;
-	},
-
-	_valueMax: function() {
-		return this.max;
-	},
-
-	_refreshValue: function() {
-		var lastValPercent, valPercent, value, valueMin, valueMax,
-			oRange = this.options.range,
-			o = this.options,
-			that = this,
-			animate = ( !this._animateOff ) ? o.animate : false,
-			_set = {};
-
-		if ( this.options.values && this.options.values.length ) {
-			this.handles.each(function( i ) {
-				valPercent = ( that.values(i) - that._valueMin() ) / ( that._valueMax() - that._valueMin() ) * 100;
-				_set[ that.orientation === "horizontal" ? "left" : "bottom" ] = valPercent + "%";
-				$( this ).stop( 1, 1 )[ animate ? "animate" : "css" ]( _set, o.animate );
-				if ( that.options.range === true ) {
-					if ( that.orientation === "horizontal" ) {
-						if ( i === 0 ) {
-							that.range.stop( 1, 1 )[ animate ? "animate" : "css" ]( { left: valPercent + "%" }, o.animate );
-						}
-						if ( i === 1 ) {
-							that.range[ animate ? "animate" : "css" ]( { width: ( valPercent - lastValPercent ) + "%" }, { queue: false, duration: o.animate } );
-						}
-					} else {
-						if ( i === 0 ) {
-							that.range.stop( 1, 1 )[ animate ? "animate" : "css" ]( { bottom: ( valPercent ) + "%" }, o.animate );
-						}
-						if ( i === 1 ) {
-							that.range[ animate ? "animate" : "css" ]( { height: ( valPercent - lastValPercent ) + "%" }, { queue: false, duration: o.animate } );
-						}
-					}
-				}
-				lastValPercent = valPercent;
-			});
-		} else {
-			value = this.value();
-			valueMin = this._valueMin();
-			valueMax = this._valueMax();
-			valPercent = ( valueMax !== valueMin ) ?
-					( value - valueMin ) / ( valueMax - valueMin ) * 100 :
-					0;
-			_set[ this.orientation === "horizontal" ? "left" : "bottom" ] = valPercent + "%";
-			this.handle.stop( 1, 1 )[ animate ? "animate" : "css" ]( _set, o.animate );
-
-			if ( oRange === "min" && this.orientation === "horizontal" ) {
-				this.range.stop( 1, 1 )[ animate ? "animate" : "css" ]( { width: valPercent + "%" }, o.animate );
-			}
-			if ( oRange === "max" && this.orientation === "horizontal" ) {
-				this.range[ animate ? "animate" : "css" ]( { width: ( 100 - valPercent ) + "%" }, { queue: false, duration: o.animate } );
-			}
-			if ( oRange === "min" && this.orientation === "vertical" ) {
-				this.range.stop( 1, 1 )[ animate ? "animate" : "css" ]( { height: valPercent + "%" }, o.animate );
-			}
-			if ( oRange === "max" && this.orientation === "vertical" ) {
-				this.range[ animate ? "animate" : "css" ]( { height: ( 100 - valPercent ) + "%" }, { queue: false, duration: o.animate } );
-			}
-		}
-	},
-
-	_handleEvents: {
-		keydown: function( event ) {
-			var allowed, curVal, newVal, step,
-				index = $( event.target ).data( "ui-slider-handle-index" );
-
-			switch ( event.keyCode ) {
-				case $.ui.keyCode.HOME:
-				case $.ui.keyCode.END:
-				case $.ui.keyCode.PAGE_UP:
-				case $.ui.keyCode.PAGE_DOWN:
-				case $.ui.keyCode.UP:
-				case $.ui.keyCode.RIGHT:
-				case $.ui.keyCode.DOWN:
-				case $.ui.keyCode.LEFT:
-					event.preventDefault();
-					if ( !this._keySliding ) {
-						this._keySliding = true;
-						$( event.target ).addClass( "ui-state-active" );
-						allowed = this._start( event, index );
-						if ( allowed === false ) {
-							return;
-						}
-					}
-					break;
-			}
-
-			step = this.options.step;
-			if ( this.options.values && this.options.values.length ) {
-				curVal = newVal = this.values( index );
-			} else {
-				curVal = newVal = this.value();
-			}
-
-			switch ( event.keyCode ) {
-				case $.ui.keyCode.HOME:
-					newVal = this._valueMin();
-					break;
-				case $.ui.keyCode.END:
-					newVal = this._valueMax();
-					break;
-				case $.ui.keyCode.PAGE_UP:
-					newVal = this._trimAlignValue(
-						curVal + ( ( this._valueMax() - this._valueMin() ) / this.numPages )
-					);
-					break;
-				case $.ui.keyCode.PAGE_DOWN:
-					newVal = this._trimAlignValue(
-						curVal - ( (this._valueMax() - this._valueMin()) / this.numPages ) );
-					break;
-				case $.ui.keyCode.UP:
-				case $.ui.keyCode.RIGHT:
-					if ( curVal === this._valueMax() ) {
-						return;
-					}
-					newVal = this._trimAlignValue( curVal + step );
-					break;
-				case $.ui.keyCode.DOWN:
-				case $.ui.keyCode.LEFT:
-					if ( curVal === this._valueMin() ) {
-						return;
-					}
-					newVal = this._trimAlignValue( curVal - step );
-					break;
-			}
-
-			this._slide( event, index, newVal );
-		},
-		keyup: function( event ) {
-			var index = $( event.target ).data( "ui-slider-handle-index" );
-
-			if ( this._keySliding ) {
-				this._keySliding = false;
-				this._stop( event, index );
-				this._change( event, index );
-				$( event.target ).removeClass( "ui-state-active" );
-			}
-		}
-	}
-});
-
-}));
diff --git a/#pma/js/jquery/src/jquery-ui/sortable.js b/#pma/js/jquery/src/jquery-ui/sortable.js
deleted file mode 100644
index 10f4f103..00000000
--- a/#pma/js/jquery/src/jquery-ui/sortable.js
+++ /dev/null
@@ -1,1315 +0,0 @@
-/*!
- * jQuery UI Sortable 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/sortable/
- */
-(function( factory ) {
-	if ( typeof define === "function" && define.amd ) {
-
-		// AMD. Register as an anonymous module.
-		define([
-			"jquery",
-			"./core",
-			"./mouse",
-			"./widget"
-		], factory );
-	} else {
-
-		// Browser globals
-		factory( jQuery );
-	}
-}(function( $ ) {
-
-return $.widget("ui.sortable", $.ui.mouse, {
-	version: "1.11.4",
-	widgetEventPrefix: "sort",
-	ready: false,
-	options: {
-		appendTo: "parent",
-		axis: false,
-		connectWith: false,
-		containment: false,
-		cursor: "auto",
-		cursorAt: false,
-		dropOnEmpty: true,
-		forcePlaceholderSize: false,
-		forceHelperSize: false,
-		grid: false,
-		handle: false,
-		helper: "original",
-		items: "> *",
-		opacity: false,
-		placeholder: false,
-		revert: false,
-		scroll: true,
-		scrollSensitivity: 20,
-		scrollSpeed: 20,
-		scope: "default",
-		tolerance: "intersect",
-		zIndex: 1000,
-
-		// callbacks
-		activate: null,
-		beforeStop: null,
-		change: null,
-		deactivate: null,
-		out: null,
-		over: null,
-		receive: null,
-		remove: null,
-		sort: null,
-		start: null,
-		stop: null,
-		update: null
-	},
-
-	_isOverAxis: function( x, reference, size ) {
-		return ( x >= reference ) && ( x < ( reference + size ) );
-	},
-
-	_isFloating: function( item ) {
-		return (/left|right/).test(item.css("float")) || (/inline|table-cell/).test(item.css("display"));
-	},
-
-	_create: function() {
-		this.containerCache = {};
-		this.element.addClass("ui-sortable");
-
-		//Get the items
-		this.refresh();
-
-		//Let's determine the parent's offset
-		this.offset = this.element.offset();
-
-		//Initialize mouse events for interaction
-		this._mouseInit();
-
-		this._setHandleClassName();
-
-		//We're ready to go
-		this.ready = true;
-
-	},
-
-	_setOption: function( key, value ) {
-		this._super( key, value );
-
-		if ( key === "handle" ) {
-			this._setHandleClassName();
-		}
-	},
-
-	_setHandleClassName: function() {
-		this.element.find( ".ui-sortable-handle" ).removeClass( "ui-sortable-handle" );
-		$.each( this.items, function() {
-			( this.instance.options.handle ?
-				this.item.find( this.instance.options.handle ) : this.item )
-				.addClass( "ui-sortable-handle" );
-		});
-	},
-
-	_destroy: function() {
-		this.element
-			.removeClass( "ui-sortable ui-sortable-disabled" )
-			.find( ".ui-sortable-handle" )
-				.removeClass( "ui-sortable-handle" );
-		this._mouseDestroy();
-
-		for ( var i = this.items.length - 1; i >= 0; i-- ) {
-			this.items[i].item.removeData(this.widgetName + "-item");
-		}
-
-		return this;
-	},
-
-	_mouseCapture: function(event, overrideHandle) {
-		var currentItem = null,
-			validHandle = false,
-			that = this;
-
-		if (this.reverting) {
-			return false;
-		}
-
-		if(this.options.disabled || this.options.type === "static") {
-			return false;
-		}
-
-		//We have to refresh the items data once first
-		this._refreshItems(event);
-
-		//Find out if the clicked node (or one of its parents) is a actual item in this.items
-		$(event.target).parents().each(function() {
-			if($.data(this, that.widgetName + "-item") === that) {
-				currentItem = $(this);
-				return false;
-			}
-		});
-		if($.data(event.target, that.widgetName + "-item") === that) {
-			currentItem = $(event.target);
-		}
-
-		if(!currentItem) {
-			return false;
-		}
-		if(this.options.handle && !overrideHandle) {
-			$(this.options.handle, currentItem).find("*").addBack().each(function() {
-				if(this === event.target) {
-					validHandle = true;
-				}
-			});
-			if(!validHandle) {
-				return false;
-			}
-		}
-
-		this.currentItem = currentItem;
-		this._removeCurrentsFromItems();
-		return true;
-
-	},
-
-	_mouseStart: function(event, overrideHandle, noActivation) {
-
-		var i, body,
-			o = this.options;
-
-		this.currentContainer = this;
-
-		//We only need to call refreshPositions, because the refreshItems call has been moved to mouseCapture
-		this.refreshPositions();
-
-		//Create and append the visible helper
-		this.helper = this._createHelper(event);
-
-		//Cache the helper size
-		this._cacheHelperProportions();
-
-		/*
-		 * - Position generation -
-		 * This block generates everything position related - it's the core of draggables.
-		 */
-
-		//Cache the margins of the original element
-		this._cacheMargins();
-
-		//Get the next scrolling parent
-		this.scrollParent = this.helper.scrollParent();
-
-		//The element's absolute position on the page minus margins
-		this.offset = this.currentItem.offset();
-		this.offset = {
-			top: this.offset.top - this.margins.top,
-			left: this.offset.left - this.margins.left
-		};
-
-		$.extend(this.offset, {
-			click: { //Where the click happened, relative to the element
-				left: event.pageX - this.offset.left,
-				top: event.pageY - this.offset.top
-			},
-			parent: this._getParentOffset(),
-			relative: this._getRelativeOffset() //This is a relative to absolute position minus the actual position calculation - only used for relative positioned helper
-		});
-
-		// Only after we got the offset, we can change the helper's position to absolute
-		// TODO: Still need to figure out a way to make relative sorting possible
-		this.helper.css("position", "absolute");
-		this.cssPosition = this.helper.css("position");
-
-		//Generate the original position
-		this.originalPosition = this._generatePosition(event);
-		this.originalPageX = event.pageX;
-		this.originalPageY = event.pageY;
-
-		//Adjust the mouse offset relative to the helper if "cursorAt" is supplied
-		(o.cursorAt && this._adjustOffsetFromHelper(o.cursorAt));
-
-		//Cache the former DOM position
-		this.domPosition = { prev: this.currentItem.prev()[0], parent: this.currentItem.parent()[0] };
-
-		//If the helper is not the original, hide the original so it's not playing any role during the drag, won't cause anything bad this way
-		if(this.helper[0] !== this.currentItem[0]) {
-			this.currentItem.hide();
-		}
-
-		//Create the placeholder
-		this._createPlaceholder();
-
-		//Set a containment if given in the options
-		if(o.containment) {
-			this._setContainment();
-		}
-
-		if( o.cursor && o.cursor !== "auto" ) { // cursor option
-			body = this.document.find( "body" );
-
-			// support: IE
-			this.storedCursor = body.css( "cursor" );
-			body.css( "cursor", o.cursor );
-
-			this.storedStylesheet = $( "<style>*{ cursor: "+o.cursor+" !important; }</style>" ).appendTo( body );
-		}
-
-		if(o.opacity) { // opacity option
-			if (this.helper.css("opacity")) {
-				this._storedOpacity = this.helper.css("opacity");
-			}
-			this.helper.css("opacity", o.opacity);
-		}
-
-		if(o.zIndex) { // zIndex option
-			if (this.helper.css("zIndex")) {
-				this._storedZIndex = this.helper.css("zIndex");
-			}
-			this.helper.css("zIndex", o.zIndex);
-		}
-
-		//Prepare scrolling
-		if(this.scrollParent[0] !== this.document[0] && this.scrollParent[0].tagName !== "HTML") {
-			this.overflowOffset = this.scrollParent.offset();
-		}
-
-		//Call callbacks
-		this._trigger("start", event, this._uiHash());
-
-		//Recache the helper size
-		if(!this._preserveHelperProportions) {
-			this._cacheHelperProportions();
-		}
-
-
-		//Post "activate" events to possible containers
-		if( !noActivation ) {
-			for ( i = this.containers.length - 1; i >= 0; i-- ) {
-				this.containers[ i ]._trigger( "activate", event, this._uiHash( this ) );
-			}
-		}
-
-		//Prepare possible droppables
-		if($.ui.ddmanager) {
-			$.ui.ddmanager.current = this;
-		}
-
-		if ($.ui.ddmanager && !o.dropBehaviour) {
-			$.ui.ddmanager.prepareOffsets(this, event);
-		}
-
-		this.dragging = true;
-
-		this.helper.addClass("ui-sortable-helper");
-		this._mouseDrag(event); //Execute the drag once - this causes the helper not to be visible before getting its correct position
-		return true;
-
-	},
-
-	_mouseDrag: function(event) {
-		var i, item, itemElement, intersection,
-			o = this.options,
-			scrolled = false;
-
-		//Compute the helpers position
-		this.position = this._generatePosition(event);
-		this.positionAbs = this._convertPositionTo("absolute");
-
-		if (!this.lastPositionAbs) {
-			this.lastPositionAbs = this.positionAbs;
-		}
-
-		//Do scrolling
-		if(this.options.scroll) {
-			if(this.scrollParent[0] !== this.document[0] && this.scrollParent[0].tagName !== "HTML") {
-
-				if((this.overflowOffset.top + this.scrollParent[0].offsetHeight) - event.pageY < o.scrollSensitivity) {
-					this.scrollParent[0].scrollTop = scrolled = this.scrollParent[0].scrollTop + o.scrollSpeed;
-				} else if(event.pageY - this.overflowOffset.top < o.scrollSensitivity) {
-					this.scrollParent[0].scrollTop = scrolled = this.scrollParent[0].scrollTop - o.scrollSpeed;
-				}
-
-				if((this.overflowOffset.left + this.scrollParent[0].offsetWidth) - event.pageX < o.scrollSensitivity) {
-					this.scrollParent[0].scrollLeft = scrolled = this.scrollParent[0].scrollLeft + o.scrollSpeed;
-				} else if(event.pageX - this.overflowOffset.left < o.scrollSensitivity) {
-					this.scrollParent[0].scrollLeft = scrolled = this.scrollParent[0].scrollLeft - o.scrollSpeed;
-				}
-
-			} else {
-
-				if(event.pageY - this.document.scrollTop() < o.scrollSensitivity) {
-					scrolled = this.document.scrollTop(this.document.scrollTop() - o.scrollSpeed);
-				} else if(this.window.height() - (event.pageY - this.document.scrollTop()) < o.scrollSensitivity) {
-					scrolled = this.document.scrollTop(this.document.scrollTop() + o.scrollSpeed);
-				}
-
-				if(event.pageX - this.document.scrollLeft() < o.scrollSensitivity) {
-					scrolled = this.document.scrollLeft(this.document.scrollLeft() - o.scrollSpeed);
-				} else if(this.window.width() - (event.pageX - this.document.scrollLeft()) < o.scrollSensitivity) {
-					scrolled = this.document.scrollLeft(this.document.scrollLeft() + o.scrollSpeed);
-				}
-
-			}
-
-			if(scrolled !== false && $.ui.ddmanager && !o.dropBehaviour) {
-				$.ui.ddmanager.prepareOffsets(this, event);
-			}
-		}
-
-		//Regenerate the absolute position used for position checks
-		this.positionAbs = this._convertPositionTo("absolute");
-
-		//Set the helper position
-		if(!this.options.axis || this.options.axis !== "y") {
-			this.helper[0].style.left = this.position.left+"px";
-		}
-		if(!this.options.axis || this.options.axis !== "x") {
-			this.helper[0].style.top = this.position.top+"px";
-		}
-
-		//Rearrange
-		for (i = this.items.length - 1; i >= 0; i--) {
-
-			//Cache variables and intersection, continue if no intersection
-			item = this.items[i];
-			itemElement = item.item[0];
-			intersection = this._intersectsWithPointer(item);
-			if (!intersection) {
-				continue;
-			}
-
-			// Only put the placeholder inside the current Container, skip all
-			// items from other containers. This works because when moving
-			// an item from one container to another the
-			// currentContainer is switched before the placeholder is moved.
-			//
-			// Without this, moving items in "sub-sortables" can cause
-			// the placeholder to jitter between the outer and inner container.
-			if (item.instance !== this.currentContainer) {
-				continue;
-			}
-
-			// cannot intersect with itself
-			// no useless actions that have been done before
-			// no action if the item moved is the parent of the item checked
-			if (itemElement !== this.currentItem[0] &&
-				this.placeholder[intersection === 1 ? "next" : "prev"]()[0] !== itemElement &&
-				!$.contains(this.placeholder[0], itemElement) &&
-				(this.options.type === "semi-dynamic" ? !$.contains(this.element[0], itemElement) : true)
-			) {
-
-				this.direction = intersection === 1 ? "down" : "up";
-
-				if (this.options.tolerance === "pointer" || this._intersectsWithSides(item)) {
-					this._rearrange(event, item);
-				} else {
-					break;
-				}
-
-				this._trigger("change", event, this._uiHash());
-				break;
-			}
-		}
-
-		//Post events to containers
-		this._contactContainers(event);
-
-		//Interconnect with droppables
-		if($.ui.ddmanager) {
-			$.ui.ddmanager.drag(this, event);
-		}
-
-		//Call callbacks
-		this._trigger("sort", event, this._uiHash());
-
-		this.lastPositionAbs = this.positionAbs;
-		return false;
-
-	},
-
-	_mouseStop: function(event, noPropagation) {
-
-		if(!event) {
-			return;
-		}
-
-		//If we are using droppables, inform the manager about the drop
-		if ($.ui.ddmanager && !this.options.dropBehaviour) {
-			$.ui.ddmanager.drop(this, event);
-		}
-
-		if(this.options.revert) {
-			var that = this,
-				cur = this.placeholder.offset(),
-				axis = this.options.axis,
-				animation = {};
-
-			if ( !axis || axis === "x" ) {
-				animation.left = cur.left - this.offset.parent.left - this.margins.left + (this.offsetParent[0] === this.document[0].body ? 0 : this.offsetParent[0].scrollLeft);
-			}
-			if ( !axis || axis === "y" ) {
-				animation.top = cur.top - this.offset.parent.top - this.margins.top + (this.offsetParent[0] === this.document[0].body ? 0 : this.offsetParent[0].scrollTop);
-			}
-			this.reverting = true;
-			$(this.helper).animate( animation, parseInt(this.options.revert, 10) || 500, function() {
-				that._clear(event);
-			});
-		} else {
-			this._clear(event, noPropagation);
-		}
-
-		return false;
-
-	},
-
-	cancel: function() {
-
-		if(this.dragging) {
-
-			this._mouseUp({ target: null });
-
-			if(this.options.helper === "original") {
-				this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper");
-			} else {
-				this.currentItem.show();
-			}
-
-			//Post deactivating events to containers
-			for (var i = this.containers.length - 1; i >= 0; i--){
-				this.containers[i]._trigger("deactivate", null, this._uiHash(this));
-				if(this.containers[i].containerCache.over) {
-					this.containers[i]._trigger("out", null, this._uiHash(this));
-					this.containers[i].containerCache.over = 0;
-				}
-			}
-
-		}
-
-		if (this.placeholder) {
-			//$(this.placeholder[0]).remove(); would have been the jQuery way - unfortunately, it unbinds ALL events from the original node!
-			if(this.placeholder[0].parentNode) {
-				this.placeholder[0].parentNode.removeChild(this.placeholder[0]);
-			}
-			if(this.options.helper !== "original" && this.helper && this.helper[0].parentNode) {
-				this.helper.remove();
-			}
-
-			$.extend(this, {
-				helper: null,
-				dragging: false,
-				reverting: false,
-				_noFinalSort: null
-			});
-
-			if(this.domPosition.prev) {
-				$(this.domPosition.prev).after(this.currentItem);
-			} else {
-				$(this.domPosition.parent).prepend(this.currentItem);
-			}
-		}
-
-		return this;
-
-	},
-
-	serialize: function(o) {
-
-		var items = this._getItemsAsjQuery(o && o.connected),
-			str = [];
-		o = o || {};
-
-		$(items).each(function() {
-			var res = ($(o.item || this).attr(o.attribute || "id") || "").match(o.expression || (/(.+)[\-=_](.+)/));
-			if (res) {
-				str.push((o.key || res[1]+"[]")+"="+(o.key && o.expression ? res[1] : res[2]));
-			}
-		});
-
-		if(!str.length && o.key) {
-			str.push(o.key + "=");
-		}
-
-		return str.join("&");
-
-	},
-
-	toArray: function(o) {
-
-		var items = this._getItemsAsjQuery(o && o.connected),
-			ret = [];
-
-		o = o || {};
-
-		items.each(function() { ret.push($(o.item || this).attr(o.attribute || "id") || ""); });
-		return ret;
-
-	},
-
-	/* Be careful with the following core functions */
-	_intersectsWith: function(item) {
-
-		var x1 = this.positionAbs.left,
-			x2 = x1 + this.helperProportions.width,
-			y1 = this.positionAbs.top,
-			y2 = y1 + this.helperProportions.height,
-			l = item.left,
-			r = l + item.width,
-			t = item.top,
-			b = t + item.height,
-			dyClick = this.offset.click.top,
-			dxClick = this.offset.click.left,
-			isOverElementHeight = ( this.options.axis === "x" ) || ( ( y1 + dyClick ) > t && ( y1 + dyClick ) < b ),
-			isOverElementWidth = ( this.options.axis === "y" ) || ( ( x1 + dxClick ) > l && ( x1 + dxClick ) < r ),
-			isOverElement = isOverElementHeight && isOverElementWidth;
-
-		if ( this.options.tolerance === "pointer" ||
-			this.options.forcePointerForContainers ||
-			(this.options.tolerance !== "pointer" && this.helperProportions[this.floating ? "width" : "height"] > item[this.floating ? "width" : "height"])
-		) {
-			return isOverElement;
-		} else {
-
-			return (l < x1 + (this.helperProportions.width / 2) && // Right Half
-				x2 - (this.helperProportions.width / 2) < r && // Left Half
-				t < y1 + (this.helperProportions.height / 2) && // Bottom Half
-				y2 - (this.helperProportions.height / 2) < b ); // Top Half
-
-		}
-	},
-
-	_intersectsWithPointer: function(item) {
-
-		var isOverElementHeight = (this.options.axis === "x") || this._isOverAxis(this.positionAbs.top + this.offset.click.top, item.top, item.height),
-			isOverElementWidth = (this.options.axis === "y") || this._isOverAxis(this.positionAbs.left + this.offset.click.left, item.left, item.width),
-			isOverElement = isOverElementHeight && isOverElementWidth,
-			verticalDirection = this._getDragVerticalDirection(),
-			horizontalDirection = this._getDragHorizontalDirection();
-
-		if (!isOverElement) {
-			return false;
-		}
-
-		return this.floating ?
-			( ((horizontalDirection && horizontalDirection === "right") || verticalDirection === "down") ? 2 : 1 )
-			: ( verticalDirection && (verticalDirection === "down" ? 2 : 1) );
-
-	},
-
-	_intersectsWithSides: function(item) {
-
-		var isOverBottomHalf = this._isOverAxis(this.positionAbs.top + this.offset.click.top, item.top + (item.height/2), item.height),
-			isOverRightHalf = this._isOverAxis(this.positionAbs.left + this.offset.click.left, item.left + (item.width/2), item.width),
-			verticalDirection = this._getDragVerticalDirection(),
-			horizontalDirection = this._getDragHorizontalDirection();
-
-		if (this.floating && horizontalDirection) {
-			return ((horizontalDirection === "right" && isOverRightHalf) || (horizontalDirection === "left" && !isOverRightHalf));
-		} else {
-			return verticalDirection && ((verticalDirection === "down" && isOverBottomHalf) || (verticalDirection === "up" && !isOverBottomHalf));
-		}
-
-	},
-
-	_getDragVerticalDirection: function() {
-		var delta = this.positionAbs.top - this.lastPositionAbs.top;
-		return delta !== 0 && (delta > 0 ? "down" : "up");
-	},
-
-	_getDragHorizontalDirection: function() {
-		var delta = this.positionAbs.left - this.lastPositionAbs.left;
-		return delta !== 0 && (delta > 0 ? "right" : "left");
-	},
-
-	refresh: function(event) {
-		this._refreshItems(event);
-		this._setHandleClassName();
-		this.refreshPositions();
-		return this;
-	},
-
-	_connectWith: function() {
-		var options = this.options;
-		return options.connectWith.constructor === String ? [options.connectWith] : options.connectWith;
-	},
-
-	_getItemsAsjQuery: function(connected) {
-
-		var i, j, cur, inst,
-			items = [],
-			queries = [],
-			connectWith = this._connectWith();
-
-		if(connectWith && connected) {
-			for (i = connectWith.length - 1; i >= 0; i--){
-				cur = $(connectWith[i], this.document[0]);
-				for ( j = cur.length - 1; j >= 0; j--){
-					inst = $.data(cur[j], this.widgetFullName);
-					if(inst && inst !== this && !inst.options.disabled) {
-						queries.push([$.isFunction(inst.options.items) ? inst.options.items.call(inst.element) : $(inst.options.items, inst.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"), inst]);
-					}
-				}
-			}
-		}
-
-		queries.push([$.isFunction(this.options.items) ? this.options.items.call(this.element, null, { options: this.options, item: this.currentItem }) : $(this.options.items, this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"), this]);
-
-		function addItems() {
-			items.push( this );
-		}
-		for (i = queries.length - 1; i >= 0; i--){
-			queries[i][0].each( addItems );
-		}
-
-		return $(items);
-
-	},
-
-	_removeCurrentsFromItems: function() {
-
-		var list = this.currentItem.find(":data(" + this.widgetName + "-item)");
-
-		this.items = $.grep(this.items, function (item) {
-			for (var j=0; j < list.length; j++) {
-				if(list[j] === item.item[0]) {
-					return false;
-				}
-			}
-			return true;
-		});
-
-	},
-
-	_refreshItems: function(event) {
-
-		this.items = [];
-		this.containers = [this];
-
-		var i, j, cur, inst, targetData, _queries, item, queriesLength,
-			items = this.items,
-			queries = [[$.isFunction(this.options.items) ? this.options.items.call(this.element[0], event, { item: this.currentItem }) : $(this.options.items, this.element), this]],
-			connectWith = this._connectWith();
-
-		if(connectWith && this.ready) { //Shouldn't be run the first time through due to massive slow-down
-			for (i = connectWith.length - 1; i >= 0; i--){
-				cur = $(connectWith[i], this.document[0]);
-				for (j = cur.length - 1; j >= 0; j--){
-					inst = $.data(cur[j], this.widgetFullName);
-					if(inst && inst !== this && !inst.options.disabled) {
-						queries.push([$.isFunction(inst.options.items) ? inst.options.items.call(inst.element[0], event, { item: this.currentItem }) : $(inst.options.items, inst.element), inst]);
-						this.containers.push(inst);
-					}
-				}
-			}
-		}
-
-		for (i = queries.length - 1; i >= 0; i--) {
-			targetData = queries[i][1];
-			_queries = queries[i][0];
-
-			for (j=0, queriesLength = _queries.length; j < queriesLength; j++) {
-				item = $(_queries[j]);
-
-				item.data(this.widgetName + "-item", targetData); // Data for target checking (mouse manager)
-
-				items.push({
-					item: item,
-					instance: targetData,
-					width: 0, height: 0,
-					left: 0, top: 0
-				});
-			}
-		}
-
-	},
-
-	refreshPositions: function(fast) {
-
-		// Determine whether items are being displayed horizontally
-		this.floating = this.items.length ?
-			this.options.axis === "x" || this._isFloating( this.items[ 0 ].item ) :
-			false;
-
-		//This has to be redone because due to the item being moved out/into the offsetParent, the offsetParent's position will change
-		if(this.offsetParent && this.helper) {
-			this.offset.parent = this._getParentOffset();
-		}
-
-		var i, item, t, p;
-
-		for (i = this.items.length - 1; i >= 0; i--){
-			item = this.items[i];
-
-			//We ignore calculating positions of all connected containers when we're not over them
-			if(item.instance !== this.currentContainer && this.currentContainer && item.item[0] !== this.currentItem[0]) {
-				continue;
-			}
-
-			t = this.options.toleranceElement ? $(this.options.toleranceElement, item.item) : item.item;
-
-			if (!fast) {
-				item.width = t.outerWidth();
-				item.height = t.outerHeight();
-			}
-
-			p = t.offset();
-			item.left = p.left;
-			item.top = p.top;
-		}
-
-		if(this.options.custom && this.options.custom.refreshContainers) {
-			this.options.custom.refreshContainers.call(this);
-		} else {
-			for (i = this.containers.length - 1; i >= 0; i--){
-				p = this.containers[i].element.offset();
-				this.containers[i].containerCache.left = p.left;
-				this.containers[i].containerCache.top = p.top;
-				this.containers[i].containerCache.width = this.containers[i].element.outerWidth();
-				this.containers[i].containerCache.height = this.containers[i].element.outerHeight();
-			}
-		}
-
-		return this;
-	},
-
-	_createPlaceholder: function(that) {
-		that = that || this;
-		var className,
-			o = that.options;
-
-		if(!o.placeholder || o.placeholder.constructor === String) {
-			className = o.placeholder;
-			o.placeholder = {
-				element: function() {
-
-					var nodeName = that.currentItem[0].nodeName.toLowerCase(),
-						element = $( "<" + nodeName + ">", that.document[0] )
-							.addClass(className || that.currentItem[0].className+" ui-sortable-placeholder")
-							.removeClass("ui-sortable-helper");
-
-					if ( nodeName === "tbody" ) {
-						that._createTrPlaceholder(
-							that.currentItem.find( "tr" ).eq( 0 ),
-							$( "<tr>", that.document[ 0 ] ).appendTo( element )
-						);
-					} else if ( nodeName === "tr" ) {
-						that._createTrPlaceholder( that.currentItem, element );
-					} else if ( nodeName === "img" ) {
-						element.attr( "src", that.currentItem.attr( "src" ) );
-					}
-
-					if ( !className ) {
-						element.css( "visibility", "hidden" );
-					}
-
-					return element;
-				},
-				update: function(container, p) {
-
-					// 1. If a className is set as 'placeholder option, we don't force sizes - the class is responsible for that
-					// 2. The option 'forcePlaceholderSize can be enabled to force it even if a class name is specified
-					if(className && !o.forcePlaceholderSize) {
-						return;
-					}
-
-					//If the element doesn't have a actual height by itself (without styles coming from a stylesheet), it receives the inline height from the dragged item
-					if(!p.height()) { p.height(that.currentItem.innerHeight() - parseInt(that.currentItem.css("paddingTop")||0, 10) - parseInt(that.currentItem.css("paddingBottom")||0, 10)); }
-					if(!p.width()) { p.width(that.currentItem.innerWidth() - parseInt(that.currentItem.css("paddingLeft")||0, 10) - parseInt(that.currentItem.css("paddingRight")||0, 10)); }
-				}
-			};
-		}
-
-		//Create the placeholder
-		that.placeholder = $(o.placeholder.element.call(that.element, that.currentItem));
-
-		//Append it after the actual current item
-		that.currentItem.after(that.placeholder);
-
-		//Update the size of the placeholder (TODO: Logic to fuzzy, see line 316/317)
-		o.placeholder.update(that, that.placeholder);
-
-	},
-
-	_createTrPlaceholder: function( sourceTr, targetTr ) {
-		var that = this;
-
-		sourceTr.children().each(function() {
-			$( "<td>&#160;</td>", that.document[ 0 ] )
-				.attr( "colspan", $( this ).attr( "colspan" ) || 1 )
-				.appendTo( targetTr );
-		});
-	},
-
-	_contactContainers: function(event) {
-		var i, j, dist, itemWithLeastDistance, posProperty, sizeProperty, cur, nearBottom, floating, axis,
-			innermostContainer = null,
-			innermostIndex = null;
-
-		// get innermost container that intersects with item
-		for (i = this.containers.length - 1; i >= 0; i--) {
-
-			// never consider a container that's located within the item itself
-			if($.contains(this.currentItem[0], this.containers[i].element[0])) {
-				continue;
-			}
-
-			if(this._intersectsWith(this.containers[i].containerCache)) {
-
-				// if we've already found a container and it's more "inner" than this, then continue
-				if(innermostContainer && $.contains(this.containers[i].element[0], innermostContainer.element[0])) {
-					continue;
-				}
-
-				innermostContainer = this.containers[i];
-				innermostIndex = i;
-
-			} else {
-				// container doesn't intersect. trigger "out" event if necessary
-				if(this.containers[i].containerCache.over) {
-					this.containers[i]._trigger("out", event, this._uiHash(this));
-					this.containers[i].containerCache.over = 0;
-				}
-			}
-
-		}
-
-		// if no intersecting containers found, return
-		if(!innermostContainer) {
-			return;
-		}
-
-		// move the item into the container if it's not there already
-		if(this.containers.length === 1) {
-			if (!this.containers[innermostIndex].containerCache.over) {
-				this.containers[innermostIndex]._trigger("over", event, this._uiHash(this));
-				this.containers[innermostIndex].containerCache.over = 1;
-			}
-		} else {
-
-			//When entering a new container, we will find the item with the least distance and append our item near it
-			dist = 10000;
-			itemWithLeastDistance = null;
-			floating = innermostContainer.floating || this._isFloating(this.currentItem);
-			posProperty = floating ? "left" : "top";
-			sizeProperty = floating ? "width" : "height";
-			axis = floating ? "clientX" : "clientY";
-
-			for (j = this.items.length - 1; j >= 0; j--) {
-				if(!$.contains(this.containers[innermostIndex].element[0], this.items[j].item[0])) {
-					continue;
-				}
-				if(this.items[j].item[0] === this.currentItem[0]) {
-					continue;
-				}
-
-				cur = this.items[j].item.offset()[posProperty];
-				nearBottom = false;
-				if ( event[ axis ] - cur > this.items[ j ][ sizeProperty ] / 2 ) {
-					nearBottom = true;
-				}
-
-				if ( Math.abs( event[ axis ] - cur ) < dist ) {
-					dist = Math.abs( event[ axis ] - cur );
-					itemWithLeastDistance = this.items[ j ];
-					this.direction = nearBottom ? "up": "down";
-				}
-			}
-
-			//Check if dropOnEmpty is enabled
-			if(!itemWithLeastDistance && !this.options.dropOnEmpty) {
-				return;
-			}
-
-			if(this.currentContainer === this.containers[innermostIndex]) {
-				if ( !this.currentContainer.containerCache.over ) {
-					this.containers[ innermostIndex ]._trigger( "over", event, this._uiHash() );
-					this.currentContainer.containerCache.over = 1;
-				}
-				return;
-			}
-
-			itemWithLeastDistance ? this._rearrange(event, itemWithLeastDistance, null, true) : this._rearrange(event, null, this.containers[innermostIndex].element, true);
-			this._trigger("change", event, this._uiHash());
-			this.containers[innermostIndex]._trigger("change", event, this._uiHash(this));
-			this.currentContainer = this.containers[innermostIndex];
-
-			//Update the placeholder
-			this.options.placeholder.update(this.currentContainer, this.placeholder);
-
-			this.containers[innermostIndex]._trigger("over", event, this._uiHash(this));
-			this.containers[innermostIndex].containerCache.over = 1;
-		}
-
-
-	},
-
-	_createHelper: function(event) {
-
-		var o = this.options,
-			helper = $.isFunction(o.helper) ? $(o.helper.apply(this.element[0], [event, this.currentItem])) : (o.helper === "clone" ? this.currentItem.clone() : this.currentItem);
-
-		//Add the helper to the DOM if that didn't happen already
-		if(!helper.parents("body").length) {
-			$(o.appendTo !== "parent" ? o.appendTo : this.currentItem[0].parentNode)[0].appendChild(helper[0]);
-		}
-
-		if(helper[0] === this.currentItem[0]) {
-			this._storedCSS = { width: this.currentItem[0].style.width, height: this.currentItem[0].style.height, position: this.currentItem.css("position"), top: this.currentItem.css("top"), left: this.currentItem.css("left") };
-		}
-
-		if(!helper[0].style.width || o.forceHelperSize) {
-			helper.width(this.currentItem.width());
-		}
-		if(!helper[0].style.height || o.forceHelperSize) {
-			helper.height(this.currentItem.height());
-		}
-
-		return helper;
-
-	},
-
-	_adjustOffsetFromHelper: function(obj) {
-		if (typeof obj === "string") {
-			obj = obj.split(" ");
-		}
-		if ($.isArray(obj)) {
-			obj = {left: +obj[0], top: +obj[1] || 0};
-		}
-		if ("left" in obj) {
-			this.offset.click.left = obj.left + this.margins.left;
-		}
-		if ("right" in obj) {
-			this.offset.click.left = this.helperProportions.width - obj.right + this.margins.left;
-		}
-		if ("top" in obj) {
-			this.offset.click.top = obj.top + this.margins.top;
-		}
-		if ("bottom" in obj) {
-			this.offset.click.top = this.helperProportions.height - obj.bottom + this.margins.top;
-		}
-	},
-
-	_getParentOffset: function() {
-
-
-		//Get the offsetParent and cache its position
-		this.offsetParent = this.helper.offsetParent();
-		var po = this.offsetParent.offset();
-
-		// This is a special case where we need to modify a offset calculated on start, since the following happened:
-		// 1. The position of the helper is absolute, so it's position is calculated based on the next positioned parent
-		// 2. The actual offset parent is a child of the scroll parent, and the scroll parent isn't the document, which means that
-		//    the scroll is included in the initial calculation of the offset of the parent, and never recalculated upon drag
-		if(this.cssPosition === "absolute" && this.scrollParent[0] !== this.document[0] && $.contains(this.scrollParent[0], this.offsetParent[0])) {
-			po.left += this.scrollParent.scrollLeft();
-			po.top += this.scrollParent.scrollTop();
-		}
-
-		// This needs to be actually done for all browsers, since pageX/pageY includes this information
-		// with an ugly IE fix
-		if( this.offsetParent[0] === this.document[0].body || (this.offsetParent[0].tagName && this.offsetParent[0].tagName.toLowerCase() === "html" && $.ui.ie)) {
-			po = { top: 0, left: 0 };
-		}
-
-		return {
-			top: po.top + (parseInt(this.offsetParent.css("borderTopWidth"),10) || 0),
-			left: po.left + (parseInt(this.offsetParent.css("borderLeftWidth"),10) || 0)
-		};
-
-	},
-
-	_getRelativeOffset: function() {
-
-		if(this.cssPosition === "relative") {
-			var p = this.currentItem.position();
-			return {
-				top: p.top - (parseInt(this.helper.css("top"),10) || 0) + this.scrollParent.scrollTop(),
-				left: p.left - (parseInt(this.helper.css("left"),10) || 0) + this.scrollParent.scrollLeft()
-			};
-		} else {
-			return { top: 0, left: 0 };
-		}
-
-	},
-
-	_cacheMargins: function() {
-		this.margins = {
-			left: (parseInt(this.currentItem.css("marginLeft"),10) || 0),
-			top: (parseInt(this.currentItem.css("marginTop"),10) || 0)
-		};
-	},
-
-	_cacheHelperProportions: function() {
-		this.helperProportions = {
-			width: this.helper.outerWidth(),
-			height: this.helper.outerHeight()
-		};
-	},
-
-	_setContainment: function() {
-
-		var ce, co, over,
-			o = this.options;
-		if(o.containment === "parent") {
-			o.containment = this.helper[0].parentNode;
-		}
-		if(o.containment === "document" || o.containment === "window") {
-			this.containment = [
-				0 - this.offset.relative.left - this.offset.parent.left,
-				0 - this.offset.relative.top - this.offset.parent.top,
-				o.containment === "document" ? this.document.width() : this.window.width() - this.helperProportions.width - this.margins.left,
-				(o.containment === "document" ? this.document.width() : this.window.height() || this.document[0].body.parentNode.scrollHeight) - this.helperProportions.height - this.margins.top
-			];
-		}
-
-		if(!(/^(document|window|parent)$/).test(o.containment)) {
-			ce = $(o.containment)[0];
-			co = $(o.containment).offset();
-			over = ($(ce).css("overflow") !== "hidden");
-
-			this.containment = [
-				co.left + (parseInt($(ce).css("borderLeftWidth"),10) || 0) + (parseInt($(ce).css("paddingLeft"),10) || 0) - this.margins.left,
-				co.top + (parseInt($(ce).css("borderTopWidth"),10) || 0) + (parseInt($(ce).css("paddingTop"),10) || 0) - this.margins.top,
-				co.left+(over ? Math.max(ce.scrollWidth,ce.offsetWidth) : ce.offsetWidth) - (parseInt($(ce).css("borderLeftWidth"),10) || 0) - (parseInt($(ce).css("paddingRight"),10) || 0) - this.helperProportions.width - this.margins.left,
-				co.top+(over ? Math.max(ce.scrollHeight,ce.offsetHeight) : ce.offsetHeight) - (parseInt($(ce).css("borderTopWidth"),10) || 0) - (parseInt($(ce).css("paddingBottom"),10) || 0) - this.helperProportions.height - this.margins.top
-			];
-		}
-
-	},
-
-	_convertPositionTo: function(d, pos) {
-
-		if(!pos) {
-			pos = this.position;
-		}
-		var mod = d === "absolute" ? 1 : -1,
-			scroll = this.cssPosition === "absolute" && !(this.scrollParent[0] !== this.document[0] && $.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent,
-			scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName);
-
-		return {
-			top: (
-				pos.top	+																// The absolute mouse position
-				this.offset.relative.top * mod +										// Only for relative positioned nodes: Relative offset from element to offset parent
-				this.offset.parent.top * mod -											// The offsetParent's offset without borders (offset + border)
-				( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ) * mod)
-			),
-			left: (
-				pos.left +																// The absolute mouse position
-				this.offset.relative.left * mod +										// Only for relative positioned nodes: Relative offset from element to offset parent
-				this.offset.parent.left * mod	-										// The offsetParent's offset without borders (offset + border)
-				( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ) * mod)
-			)
-		};
-
-	},
-
-	_generatePosition: function(event) {
-
-		var top, left,
-			o = this.options,
-			pageX = event.pageX,
-			pageY = event.pageY,
-			scroll = this.cssPosition === "absolute" && !(this.scrollParent[0] !== this.document[0] && $.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent, scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName);
-
-		// This is another very weird special case that only happens for relative elements:
-		// 1. If the css position is relative
-		// 2. and the scroll parent is the document or similar to the offset parent
-		// we have to refresh the relative offset during the scroll so there are no jumps
-		if(this.cssPosition === "relative" && !(this.scrollParent[0] !== this.document[0] && this.scrollParent[0] !== this.offsetParent[0])) {
-			this.offset.relative = this._getRelativeOffset();
-		}
-
-		/*
-		 * - Position constraining -
-		 * Constrain the position to a mix of grid, containment.
-		 */
-
-		if(this.originalPosition) { //If we are not dragging yet, we won't check for options
-
-			if(this.containment) {
-				if(event.pageX - this.offset.click.left < this.containment[0]) {
-					pageX = this.containment[0] + this.offset.click.left;
-				}
-				if(event.pageY - this.offset.click.top < this.containment[1]) {
-					pageY = this.containment[1] + this.offset.click.top;
-				}
-				if(event.pageX - this.offset.click.left > this.containment[2]) {
-					pageX = this.containment[2] + this.offset.click.left;
-				}
-				if(event.pageY - this.offset.click.top > this.containment[3]) {
-					pageY = this.containment[3] + this.offset.click.top;
-				}
-			}
-
-			if(o.grid) {
-				top = this.originalPageY + Math.round((pageY - this.originalPageY) / o.grid[1]) * o.grid[1];
-				pageY = this.containment ? ( (top - this.offset.click.top >= this.containment[1] && top - this.offset.click.top <= this.containment[3]) ? top : ((top - this.offset.click.top >= this.containment[1]) ? top - o.grid[1] : top + o.grid[1])) : top;
-
-				left = this.originalPageX + Math.round((pageX - this.originalPageX) / o.grid[0]) * o.grid[0];
-				pageX = this.containment ? ( (left - this.offset.click.left >= this.containment[0] && left - this.offset.click.left <= this.containment[2]) ? left : ((left - this.offset.click.left >= this.containment[0]) ? left - o.grid[0] : left + o.grid[0])) : left;
-			}
-
-		}
-
-		return {
-			top: (
-				pageY -																// The absolute mouse position
-				this.offset.click.top -													// Click offset (relative to the element)
-				this.offset.relative.top	-											// Only for relative positioned nodes: Relative offset from element to offset parent
-				this.offset.parent.top +												// The offsetParent's offset without borders (offset + border)
-				( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ))
-			),
-			left: (
-				pageX -																// The absolute mouse position
-				this.offset.click.left -												// Click offset (relative to the element)
-				this.offset.relative.left	-											// Only for relative positioned nodes: Relative offset from element to offset parent
-				this.offset.parent.left +												// The offsetParent's offset without borders (offset + border)
-				( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ))
-			)
-		};
-
-	},
-
-	_rearrange: function(event, i, a, hardRefresh) {
-
-		a ? a[0].appendChild(this.placeholder[0]) : i.item[0].parentNode.insertBefore(this.placeholder[0], (this.direction === "down" ? i.item[0] : i.item[0].nextSibling));
-
-		//Various things done here to improve the performance:
-		// 1. we create a setTimeout, that calls refreshPositions
-		// 2. on the instance, we have a counter variable, that get's higher after every append
-		// 3. on the local scope, we copy the counter variable, and check in the timeout, if it's still the same
-		// 4. this lets only the last addition to the timeout stack through
-		this.counter = this.counter ? ++this.counter : 1;
-		var counter = this.counter;
-
-		this._delay(function() {
-			if(counter === this.counter) {
-				this.refreshPositions(!hardRefresh); //Precompute after each DOM insertion, NOT on mousemove
-			}
-		});
-
-	},
-
-	_clear: function(event, noPropagation) {
-
-		this.reverting = false;
-		// We delay all events that have to be triggered to after the point where the placeholder has been removed and
-		// everything else normalized again
-		var i,
-			delayedTriggers = [];
-
-		// We first have to update the dom position of the actual currentItem
-		// Note: don't do it if the current item is already removed (by a user), or it gets reappended (see #4088)
-		if(!this._noFinalSort && this.currentItem.parent().length) {
-			this.placeholder.before(this.currentItem);
-		}
-		this._noFinalSort = null;
-
-		if(this.helper[0] === this.currentItem[0]) {
-			for(i in this._storedCSS) {
-				if(this._storedCSS[i] === "auto" || this._storedCSS[i] === "static") {
-					this._storedCSS[i] = "";
-				}
-			}
-			this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper");
-		} else {
-			this.currentItem.show();
-		}
-
-		if(this.fromOutside && !noPropagation) {
-			delayedTriggers.push(function(event) { this._trigger("receive", event, this._uiHash(this.fromOutside)); });
-		}
-		if((this.fromOutside || this.domPosition.prev !== this.currentItem.prev().not(".ui-sortable-helper")[0] || this.domPosition.parent !== this.currentItem.parent()[0]) && !noPropagation) {
-			delayedTriggers.push(function(event) { this._trigger("update", event, this._uiHash()); }); //Trigger update callback if the DOM position has changed
-		}
-
-		// Check if the items Container has Changed and trigger appropriate
-		// events.
-		if (this !== this.currentContainer) {
-			if(!noPropagation) {
-				delayedTriggers.push(function(event) { this._trigger("remove", event, this._uiHash()); });
-				delayedTriggers.push((function(c) { return function(event) { c._trigger("receive", event, this._uiHash(this)); };  }).call(this, this.currentContainer));
-				delayedTriggers.push((function(c) { return function(event) { c._trigger("update", event, this._uiHash(this));  }; }).call(this, this.currentContainer));
-			}
-		}
-
-
-		//Post events to containers
-		function delayEvent( type, instance, container ) {
-			return function( event ) {
-				container._trigger( type, event, instance._uiHash( instance ) );
-			};
-		}
-		for (i = this.containers.length - 1; i >= 0; i--){
-			if (!noPropagation) {
-				delayedTriggers.push( delayEvent( "deactivate", this, this.containers[ i ] ) );
-			}
-			if(this.containers[i].containerCache.over) {
-				delayedTriggers.push( delayEvent( "out", this, this.containers[ i ] ) );
-				this.containers[i].containerCache.over = 0;
-			}
-		}
-
-		//Do what was originally in plugins
-		if ( this.storedCursor ) {
-			this.document.find( "body" ).css( "cursor", this.storedCursor );
-			this.storedStylesheet.remove();
-		}
-		if(this._storedOpacity) {
-			this.helper.css("opacity", this._storedOpacity);
-		}
-		if(this._storedZIndex) {
-			this.helper.css("zIndex", this._storedZIndex === "auto" ? "" : this._storedZIndex);
-		}
-
-		this.dragging = false;
-
-		if(!noPropagation) {
-			this._trigger("beforeStop", event, this._uiHash());
-		}
-
-		//$(this.placeholder[0]).remove(); would have been the jQuery way - unfortunately, it unbinds ALL events from the original node!
-		this.placeholder[0].parentNode.removeChild(this.placeholder[0]);
-
-		if ( !this.cancelHelperRemoval ) {
-			if ( this.helper[ 0 ] !== this.currentItem[ 0 ] ) {
-				this.helper.remove();
-			}
-			this.helper = null;
-		}
-
-		if(!noPropagation) {
-			for (i=0; i < delayedTriggers.length; i++) {
-				delayedTriggers[i].call(this, event);
-			} //Trigger all delayed events
-			this._trigger("stop", event, this._uiHash());
-		}
-
-		this.fromOutside = false;
-		return !this.cancelHelperRemoval;
-
-	},
-
-	_trigger: function() {
-		if ($.Widget.prototype._trigger.apply(this, arguments) === false) {
-			this.cancel();
-		}
-	},
-
-	_uiHash: function(_inst) {
-		var inst = _inst || this;
-		return {
-			helper: inst.helper,
-			placeholder: inst.placeholder || $([]),
-			position: inst.position,
-			originalPosition: inst.originalPosition,
-			offset: inst.positionAbs,
-			item: inst.currentItem,
-			sender: _inst ? _inst.element : null
-		};
-	}
-
-});
-
-}));
diff --git a/#pma/js/jquery/src/jquery-ui/spinner.js b/#pma/js/jquery/src/jquery-ui/spinner.js
deleted file mode 100644
index 388860f3..00000000
--- a/#pma/js/jquery/src/jquery-ui/spinner.js
+++ /dev/null
@@ -1,514 +0,0 @@
-/*!
- * jQuery UI Spinner 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/spinner/
- */
-(function( factory ) {
-	if ( typeof define === "function" && define.amd ) {
-
-		// AMD. Register as an anonymous module.
-		define([
-			"jquery",
-			"./core",
-			"./widget",
-			"./button"
-		], factory );
-	} else {
-
-		// Browser globals
-		factory( jQuery );
-	}
-}(function( $ ) {
-
-function spinner_modifier( fn ) {
-	return function() {
-		var previous = this.element.val();
-		fn.apply( this, arguments );
-		this._refresh();
-		if ( previous !== this.element.val() ) {
-			this._trigger( "change" );
-		}
-	};
-}
-
-return $.widget( "ui.spinner", {
-	version: "1.11.4",
-	defaultElement: "<input>",
-	widgetEventPrefix: "spin",
-	options: {
-		culture: null,
-		icons: {
-			down: "ui-icon-triangle-1-s",
-			up: "ui-icon-triangle-1-n"
-		},
-		incremental: true,
-		max: null,
-		min: null,
-		numberFormat: null,
-		page: 10,
-		step: 1,
-
-		change: null,
-		spin: null,
-		start: null,
-		stop: null
-	},
-
-	_create: function() {
-		// handle string values that need to be parsed
-		this._setOption( "max", this.options.max );
-		this._setOption( "min", this.options.min );
-		this._setOption( "step", this.options.step );
-
-		// Only format if there is a value, prevents the field from being marked
-		// as invalid in Firefox, see #9573.
-		if ( this.value() !== "" ) {
-			// Format the value, but don't constrain.
-			this._value( this.element.val(), true );
-		}
-
-		this._draw();
-		this._on( this._events );
-		this._refresh();
-
-		// turning off autocomplete prevents the browser from remembering the
-		// value when navigating through history, so we re-enable autocomplete
-		// if the page is unloaded before the widget is destroyed. #7790
-		this._on( this.window, {
-			beforeunload: function() {
-				this.element.removeAttr( "autocomplete" );
-			}
-		});
-	},
-
-	_getCreateOptions: function() {
-		var options = {},
-			element = this.element;
-
-		$.each( [ "min", "max", "step" ], function( i, option ) {
-			var value = element.attr( option );
-			if ( value !== undefined && value.length ) {
-				options[ option ] = value;
-			}
-		});
-
-		return options;
-	},
-
-	_events: {
-		keydown: function( event ) {
-			if ( this._start( event ) && this._keydown( event ) ) {
-				event.preventDefault();
-			}
-		},
-		keyup: "_stop",
-		focus: function() {
-			this.previous = this.element.val();
-		},
-		blur: function( event ) {
-			if ( this.cancelBlur ) {
-				delete this.cancelBlur;
-				return;
-			}
-
-			this._stop();
-			this._refresh();
-			if ( this.previous !== this.element.val() ) {
-				this._trigger( "change", event );
-			}
-		},
-		mousewheel: function( event, delta ) {
-			if ( !delta ) {
-				return;
-			}
-			if ( !this.spinning && !this._start( event ) ) {
-				return false;
-			}
-
-			this._spin( (delta > 0 ? 1 : -1) * this.options.step, event );
-			clearTimeout( this.mousewheelTimer );
-			this.mousewheelTimer = this._delay(function() {
-				if ( this.spinning ) {
-					this._stop( event );
-				}
-			}, 100 );
-			event.preventDefault();
-		},
-		"mousedown .ui-spinner-button": function( event ) {
-			var previous;
-
-			// We never want the buttons to have focus; whenever the user is
-			// interacting with the spinner, the focus should be on the input.
-			// If the input is focused then this.previous is properly set from
-			// when the input first received focus. If the input is not focused
-			// then we need to set this.previous based on the value before spinning.
-			previous = this.element[0] === this.document[0].activeElement ?
-				this.previous : this.element.val();
-			function checkFocus() {
-				var isActive = this.element[0] === this.document[0].activeElement;
-				if ( !isActive ) {
-					this.element.focus();
-					this.previous = previous;
-					// support: IE
-					// IE sets focus asynchronously, so we need to check if focus
-					// moved off of the input because the user clicked on the button.
-					this._delay(function() {
-						this.previous = previous;
-					});
-				}
-			}
-
-			// ensure focus is on (or stays on) the text field
-			event.preventDefault();
-			checkFocus.call( this );
-
-			// support: IE
-			// IE doesn't prevent moving focus even with event.preventDefault()
-			// so we set a flag to know when we should ignore the blur event
-			// and check (again) if focus moved off of the input.
-			this.cancelBlur = true;
-			this._delay(function() {
-				delete this.cancelBlur;
-				checkFocus.call( this );
-			});
-
-			if ( this._start( event ) === false ) {
-				return;
-			}
-
-			this._repeat( null, $( event.currentTarget ).hasClass( "ui-spinner-up" ) ? 1 : -1, event );
-		},
-		"mouseup .ui-spinner-button": "_stop",
-		"mouseenter .ui-spinner-button": function( event ) {
-			// button will add ui-state-active if mouse was down while mouseleave and kept down
-			if ( !$( event.currentTarget ).hasClass( "ui-state-active" ) ) {
-				return;
-			}
-
-			if ( this._start( event ) === false ) {
-				return false;
-			}
-			this._repeat( null, $( event.currentTarget ).hasClass( "ui-spinner-up" ) ? 1 : -1, event );
-		},
-		// TODO: do we really want to consider this a stop?
-		// shouldn't we just stop the repeater and wait until mouseup before
-		// we trigger the stop event?
-		"mouseleave .ui-spinner-button": "_stop"
-	},
-
-	_draw: function() {
-		var uiSpinner = this.uiSpinner = this.element
-			.addClass( "ui-spinner-input" )
-			.attr( "autocomplete", "off" )
-			.wrap( this._uiSpinnerHtml() )
-			.parent()
-				// add buttons
-				.append( this._buttonHtml() );
-
-		this.element.attr( "role", "spinbutton" );
-
-		// button bindings
-		this.buttons = uiSpinner.find( ".ui-spinner-button" )
-			.attr( "tabIndex", -1 )
-			.button()
-			.removeClass( "ui-corner-all" );
-
-		// IE 6 doesn't understand height: 50% for the buttons
-		// unless the wrapper has an explicit height
-		if ( this.buttons.height() > Math.ceil( uiSpinner.height() * 0.5 ) &&
-				uiSpinner.height() > 0 ) {
-			uiSpinner.height( uiSpinner.height() );
-		}
-
-		// disable spinner if element was already disabled
-		if ( this.options.disabled ) {
-			this.disable();
-		}
-	},
-
-	_keydown: function( event ) {
-		var options = this.options,
-			keyCode = $.ui.keyCode;
-
-		switch ( event.keyCode ) {
-		case keyCode.UP:
-			this._repeat( null, 1, event );
-			return true;
-		case keyCode.DOWN:
-			this._repeat( null, -1, event );
-			return true;
-		case keyCode.PAGE_UP:
-			this._repeat( null, options.page, event );
-			return true;
-		case keyCode.PAGE_DOWN:
-			this._repeat( null, -options.page, event );
-			return true;
-		}
-
-		return false;
-	},
-
-	_uiSpinnerHtml: function() {
-		return "<span class='ui-spinner ui-widget ui-widget-content ui-corner-all'></span>";
-	},
-
-	_buttonHtml: function() {
-		return "" +
-			"<a class='ui-spinner-button ui-spinner-up ui-corner-tr'>" +
-				"<span class='ui-icon " + this.options.icons.up + "'>&#9650;</span>" +
-			"</a>" +
-			"<a class='ui-spinner-button ui-spinner-down ui-corner-br'>" +
-				"<span class='ui-icon " + this.options.icons.down + "'>&#9660;</span>" +
-			"</a>";
-	},
-
-	_start: function( event ) {
-		if ( !this.spinning && this._trigger( "start", event ) === false ) {
-			return false;
-		}
-
-		if ( !this.counter ) {
-			this.counter = 1;
-		}
-		this.spinning = true;
-		return true;
-	},
-
-	_repeat: function( i, steps, event ) {
-		i = i || 500;
-
-		clearTimeout( this.timer );
-		this.timer = this._delay(function() {
-			this._repeat( 40, steps, event );
-		}, i );
-
-		this._spin( steps * this.options.step, event );
-	},
-
-	_spin: function( step, event ) {
-		var value = this.value() || 0;
-
-		if ( !this.counter ) {
-			this.counter = 1;
-		}
-
-		value = this._adjustValue( value + step * this._increment( this.counter ) );
-
-		if ( !this.spinning || this._trigger( "spin", event, { value: value } ) !== false) {
-			this._value( value );
-			this.counter++;
-		}
-	},
-
-	_increment: function( i ) {
-		var incremental = this.options.incremental;
-
-		if ( incremental ) {
-			return $.isFunction( incremental ) ?
-				incremental( i ) :
-				Math.floor( i * i * i / 50000 - i * i / 500 + 17 * i / 200 + 1 );
-		}
-
-		return 1;
-	},
-
-	_precision: function() {
-		var precision = this._precisionOf( this.options.step );
-		if ( this.options.min !== null ) {
-			precision = Math.max( precision, this._precisionOf( this.options.min ) );
-		}
-		return precision;
-	},
-
-	_precisionOf: function( num ) {
-		var str = num.toString(),
-			decimal = str.indexOf( "." );
-		return decimal === -1 ? 0 : str.length - decimal - 1;
-	},
-
-	_adjustValue: function( value ) {
-		var base, aboveMin,
-			options = this.options;
-
-		// make sure we're at a valid step
-		// - find out where we are relative to the base (min or 0)
-		base = options.min !== null ? options.min : 0;
-		aboveMin = value - base;
-		// - round to the nearest step
-		aboveMin = Math.round(aboveMin / options.step) * options.step;
-		// - rounding is based on 0, so adjust back to our base
-		value = base + aboveMin;
-
-		// fix precision from bad JS floating point math
-		value = parseFloat( value.toFixed( this._precision() ) );
-
-		// clamp the value
-		if ( options.max !== null && value > options.max) {
-			return options.max;
-		}
-		if ( options.min !== null && value < options.min ) {
-			return options.min;
-		}
-
-		return value;
-	},
-
-	_stop: function( event ) {
-		if ( !this.spinning ) {
-			return;
-		}
-
-		clearTimeout( this.timer );
-		clearTimeout( this.mousewheelTimer );
-		this.counter = 0;
-		this.spinning = false;
-		this._trigger( "stop", event );
-	},
-
-	_setOption: function( key, value ) {
-		if ( key === "culture" || key === "numberFormat" ) {
-			var prevValue = this._parse( this.element.val() );
-			this.options[ key ] = value;
-			this.element.val( this._format( prevValue ) );
-			return;
-		}
-
-		if ( key === "max" || key === "min" || key === "step" ) {
-			if ( typeof value === "string" ) {
-				value = this._parse( value );
-			}
-		}
-		if ( key === "icons" ) {
-			this.buttons.first().find( ".ui-icon" )
-				.removeClass( this.options.icons.up )
-				.addClass( value.up );
-			this.buttons.last().find( ".ui-icon" )
-				.removeClass( this.options.icons.down )
-				.addClass( value.down );
-		}
-
-		this._super( key, value );
-
-		if ( key === "disabled" ) {
-			this.widget().toggleClass( "ui-state-disabled", !!value );
-			this.element.prop( "disabled", !!value );
-			this.buttons.button( value ? "disable" : "enable" );
-		}
-	},
-
-	_setOptions: spinner_modifier(function( options ) {
-		this._super( options );
-	}),
-
-	_parse: function( val ) {
-		if ( typeof val === "string" && val !== "" ) {
-			val = window.Globalize && this.options.numberFormat ?
-				Globalize.parseFloat( val, 10, this.options.culture ) : +val;
-		}
-		return val === "" || isNaN( val ) ? null : val;
-	},
-
-	_format: function( value ) {
-		if ( value === "" ) {
-			return "";
-		}
-		return window.Globalize && this.options.numberFormat ?
-			Globalize.format( value, this.options.numberFormat, this.options.culture ) :
-			value;
-	},
-
-	_refresh: function() {
-		this.element.attr({
-			"aria-valuemin": this.options.min,
-			"aria-valuemax": this.options.max,
-			// TODO: what should we do with values that can't be parsed?
-			"aria-valuenow": this._parse( this.element.val() )
-		});
-	},
-
-	isValid: function() {
-		var value = this.value();
-
-		// null is invalid
-		if ( value === null ) {
-			return false;
-		}
-
-		// if value gets adjusted, it's invalid
-		return value === this._adjustValue( value );
-	},
-
-	// update the value without triggering change
-	_value: function( value, allowAny ) {
-		var parsed;
-		if ( value !== "" ) {
-			parsed = this._parse( value );
-			if ( parsed !== null ) {
-				if ( !allowAny ) {
-					parsed = this._adjustValue( parsed );
-				}
-				value = this._format( parsed );
-			}
-		}
-		this.element.val( value );
-		this._refresh();
-	},
-
-	_destroy: function() {
-		this.element
-			.removeClass( "ui-spinner-input" )
-			.prop( "disabled", false )
-			.removeAttr( "autocomplete" )
-			.removeAttr( "role" )
-			.removeAttr( "aria-valuemin" )
-			.removeAttr( "aria-valuemax" )
-			.removeAttr( "aria-valuenow" );
-		this.uiSpinner.replaceWith( this.element );
-	},
-
-	stepUp: spinner_modifier(function( steps ) {
-		this._stepUp( steps );
-	}),
-	_stepUp: function( steps ) {
-		if ( this._start() ) {
-			this._spin( (steps || 1) * this.options.step );
-			this._stop();
-		}
-	},
-
-	stepDown: spinner_modifier(function( steps ) {
-		this._stepDown( steps );
-	}),
-	_stepDown: function( steps ) {
-		if ( this._start() ) {
-			this._spin( (steps || 1) * -this.options.step );
-			this._stop();
-		}
-	},
-
-	pageUp: spinner_modifier(function( pages ) {
-		this._stepUp( (pages || 1) * this.options.page );
-	}),
-
-	pageDown: spinner_modifier(function( pages ) {
-		this._stepDown( (pages || 1) * this.options.page );
-	}),
-
-	value: function( newVal ) {
-		if ( !arguments.length ) {
-			return this._parse( this.element.val() );
-		}
-		spinner_modifier( this._value ).call( this, newVal );
-	},
-
-	widget: function() {
-		return this.uiSpinner;
-	}
-});
-
-}));
diff --git a/#pma/js/jquery/src/jquery-ui/tabs.js b/#pma/js/jquery/src/jquery-ui/tabs.js
deleted file mode 100644
index 60c8748e..00000000
--- a/#pma/js/jquery/src/jquery-ui/tabs.js
+++ /dev/null
@@ -1,886 +0,0 @@
-/*!
- * jQuery UI Tabs 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/tabs/
- */
-(function( factory ) {
-	if ( typeof define === "function" && define.amd ) {
-
-		// AMD. Register as an anonymous module.
-		define([
-			"jquery",
-			"./core",
-			"./widget"
-		], factory );
-	} else {
-
-		// Browser globals
-		factory( jQuery );
-	}
-}(function( $ ) {
-
-return $.widget( "ui.tabs", {
-	version: "1.11.4",
-	delay: 300,
-	options: {
-		active: null,
-		collapsible: false,
-		event: "click",
-		heightStyle: "content",
-		hide: null,
-		show: null,
-
-		// callbacks
-		activate: null,
-		beforeActivate: null,
-		beforeLoad: null,
-		load: null
-	},
-
-	_isLocal: (function() {
-		var rhash = /#.*$/;
-
-		return function( anchor ) {
-			var anchorUrl, locationUrl;
-
-			// support: IE7
-			// IE7 doesn't normalize the href property when set via script (#9317)
-			anchor = anchor.cloneNode( false );
-
-			anchorUrl = anchor.href.replace( rhash, "" );
-			locationUrl = location.href.replace( rhash, "" );
-
-			// decoding may throw an error if the URL isn't UTF-8 (#9518)
-			try {
-				anchorUrl = decodeURIComponent( anchorUrl );
-			} catch ( error ) {}
-			try {
-				locationUrl = decodeURIComponent( locationUrl );
-			} catch ( error ) {}
-
-			return anchor.hash.length > 1 && anchorUrl === locationUrl;
-		};
-	})(),
-
-	_create: function() {
-		var that = this,
-			options = this.options;
-
-		this.running = false;
-
-		this.element
-			.addClass( "ui-tabs ui-widget ui-widget-content ui-corner-all" )
-			.toggleClass( "ui-tabs-collapsible", options.collapsible );
-
-		this._processTabs();
-		options.active = this._initialActive();
-
-		// Take disabling tabs via class attribute from HTML
-		// into account and update option properly.
-		if ( $.isArray( options.disabled ) ) {
-			options.disabled = $.unique( options.disabled.concat(
-				$.map( this.tabs.filter( ".ui-state-disabled" ), function( li ) {
-					return that.tabs.index( li );
-				})
-			) ).sort();
-		}
-
-		// check for length avoids error when initializing empty list
-		if ( this.options.active !== false && this.anchors.length ) {
-			this.active = this._findActive( options.active );
-		} else {
-			this.active = $();
-		}
-
-		this._refresh();
-
-		if ( this.active.length ) {
-			this.load( options.active );
-		}
-	},
-
-	_initialActive: function() {
-		var active = this.options.active,
-			collapsible = this.options.collapsible,
-			locationHash = location.hash.substring( 1 );
-
-		if ( active === null ) {
-			// check the fragment identifier in the URL
-			if ( locationHash ) {
-				this.tabs.each(function( i, tab ) {
-					if ( $( tab ).attr( "aria-controls" ) === locationHash ) {
-						active = i;
-						return false;
-					}
-				});
-			}
-
-			// check for a tab marked active via a class
-			if ( active === null ) {
-				active = this.tabs.index( this.tabs.filter( ".ui-tabs-active" ) );
-			}
-
-			// no active tab, set to false
-			if ( active === null || active === -1 ) {
-				active = this.tabs.length ? 0 : false;
-			}
-		}
-
-		// handle numbers: negative, out of range
-		if ( active !== false ) {
-			active = this.tabs.index( this.tabs.eq( active ) );
-			if ( active === -1 ) {
-				active = collapsible ? false : 0;
-			}
-		}
-
-		// don't allow collapsible: false and active: false
-		if ( !collapsible && active === false && this.anchors.length ) {
-			active = 0;
-		}
-
-		return active;
-	},
-
-	_getCreateEventData: function() {
-		return {
-			tab: this.active,
-			panel: !this.active.length ? $() : this._getPanelForTab( this.active )
-		};
-	},
-
-	_tabKeydown: function( event ) {
-		var focusedTab = $( this.document[0].activeElement ).closest( "li" ),
-			selectedIndex = this.tabs.index( focusedTab ),
-			goingForward = true;
-
-		if ( this._handlePageNav( event ) ) {
-			return;
-		}
-
-		switch ( event.keyCode ) {
-			case $.ui.keyCode.RIGHT:
-			case $.ui.keyCode.DOWN:
-				selectedIndex++;
-				break;
-			case $.ui.keyCode.UP:
-			case $.ui.keyCode.LEFT:
-				goingForward = false;
-				selectedIndex--;
-				break;
-			case $.ui.keyCode.END:
-				selectedIndex = this.anchors.length - 1;
-				break;
-			case $.ui.keyCode.HOME:
-				selectedIndex = 0;
-				break;
-			case $.ui.keyCode.SPACE:
-				// Activate only, no collapsing
-				event.preventDefault();
-				clearTimeout( this.activating );
-				this._activate( selectedIndex );
-				return;
-			case $.ui.keyCode.ENTER:
-				// Toggle (cancel delayed activation, allow collapsing)
-				event.preventDefault();
-				clearTimeout( this.activating );
-				// Determine if we should collapse or activate
-				this._activate( selectedIndex === this.options.active ? false : selectedIndex );
-				return;
-			default:
-				return;
-		}
-
-		// Focus the appropriate tab, based on which key was pressed
-		event.preventDefault();
-		clearTimeout( this.activating );
-		selectedIndex = this._focusNextTab( selectedIndex, goingForward );
-
-		// Navigating with control/command key will prevent automatic activation
-		if ( !event.ctrlKey && !event.metaKey ) {
-
-			// Update aria-selected immediately so that AT think the tab is already selected.
-			// Otherwise AT may confuse the user by stating that they need to activate the tab,
-			// but the tab will already be activated by the time the announcement finishes.
-			focusedTab.attr( "aria-selected", "false" );
-			this.tabs.eq( selectedIndex ).attr( "aria-selected", "true" );
-
-			this.activating = this._delay(function() {
-				this.option( "active", selectedIndex );
-			}, this.delay );
-		}
-	},
-
-	_panelKeydown: function( event ) {
-		if ( this._handlePageNav( event ) ) {
-			return;
-		}
-
-		// Ctrl+up moves focus to the current tab
-		if ( event.ctrlKey && event.keyCode === $.ui.keyCode.UP ) {
-			event.preventDefault();
-			this.active.focus();
-		}
-	},
-
-	// Alt+page up/down moves focus to the previous/next tab (and activates)
-	_handlePageNav: function( event ) {
-		if ( event.altKey && event.keyCode === $.ui.keyCode.PAGE_UP ) {
-			this._activate( this._focusNextTab( this.options.active - 1, false ) );
-			return true;
-		}
-		if ( event.altKey && event.keyCode === $.ui.keyCode.PAGE_DOWN ) {
-			this._activate( this._focusNextTab( this.options.active + 1, true ) );
-			return true;
-		}
-	},
-
-	_findNextTab: function( index, goingForward ) {
-		var lastTabIndex = this.tabs.length - 1;
-
-		function constrain() {
-			if ( index > lastTabIndex ) {
-				index = 0;
-			}
-			if ( index < 0 ) {
-				index = lastTabIndex;
-			}
-			return index;
-		}
-
-		while ( $.inArray( constrain(), this.options.disabled ) !== -1 ) {
-			index = goingForward ? index + 1 : index - 1;
-		}
-
-		return index;
-	},
-
-	_focusNextTab: function( index, goingForward ) {
-		index = this._findNextTab( index, goingForward );
-		this.tabs.eq( index ).focus();
-		return index;
-	},
-
-	_setOption: function( key, value ) {
-		if ( key === "active" ) {
-			// _activate() will handle invalid values and update this.options
-			this._activate( value );
-			return;
-		}
-
-		if ( key === "disabled" ) {
-			// don't use the widget factory's disabled handling
-			this._setupDisabled( value );
-			return;
-		}
-
-		this._super( key, value);
-
-		if ( key === "collapsible" ) {
-			this.element.toggleClass( "ui-tabs-collapsible", value );
-			// Setting collapsible: false while collapsed; open first panel
-			if ( !value && this.options.active === false ) {
-				this._activate( 0 );
-			}
-		}
-
-		if ( key === "event" ) {
-			this._setupEvents( value );
-		}
-
-		if ( key === "heightStyle" ) {
-			this._setupHeightStyle( value );
-		}
-	},
-
-	_sanitizeSelector: function( hash ) {
-		return hash ? hash.replace( /[!"$%&'()*+,.\/:;<=>?@\[\]\^`{|}~]/g, "\\$&" ) : "";
-	},
-
-	refresh: function() {
-		var options = this.options,
-			lis = this.tablist.children( ":has(a[href])" );
-
-		// get disabled tabs from class attribute from HTML
-		// this will get converted to a boolean if needed in _refresh()
-		options.disabled = $.map( lis.filter( ".ui-state-disabled" ), function( tab ) {
-			return lis.index( tab );
-		});
-
-		this._processTabs();
-
-		// was collapsed or no tabs
-		if ( options.active === false || !this.anchors.length ) {
-			options.active = false;
-			this.active = $();
-		// was active, but active tab is gone
-		} else if ( this.active.length && !$.contains( this.tablist[ 0 ], this.active[ 0 ] ) ) {
-			// all remaining tabs are disabled
-			if ( this.tabs.length === options.disabled.length ) {
-				options.active = false;
-				this.active = $();
-			// activate previous tab
-			} else {
-				this._activate( this._findNextTab( Math.max( 0, options.active - 1 ), false ) );
-			}
-		// was active, active tab still exists
-		} else {
-			// make sure active index is correct
-			options.active = this.tabs.index( this.active );
-		}
-
-		this._refresh();
-	},
-
-	_refresh: function() {
-		this._setupDisabled( this.options.disabled );
-		this._setupEvents( this.options.event );
-		this._setupHeightStyle( this.options.heightStyle );
-
-		this.tabs.not( this.active ).attr({
-			"aria-selected": "false",
-			"aria-expanded": "false",
-			tabIndex: -1
-		});
-		this.panels.not( this._getPanelForTab( this.active ) )
-			.hide()
-			.attr({
-				"aria-hidden": "true"
-			});
-
-		// Make sure one tab is in the tab order
-		if ( !this.active.length ) {
-			this.tabs.eq( 0 ).attr( "tabIndex", 0 );
-		} else {
-			this.active
-				.addClass( "ui-tabs-active ui-state-active" )
-				.attr({
-					"aria-selected": "true",
-					"aria-expanded": "true",
-					tabIndex: 0
-				});
-			this._getPanelForTab( this.active )
-				.show()
-				.attr({
-					"aria-hidden": "false"
-				});
-		}
-	},
-
-	_processTabs: function() {
-		var that = this,
-			prevTabs = this.tabs,
-			prevAnchors = this.anchors,
-			prevPanels = this.panels;
-
-		this.tablist = this._getList()
-			.addClass( "ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all" )
-			.attr( "role", "tablist" )
-
-			// Prevent users from focusing disabled tabs via click
-			.delegate( "> li", "mousedown" + this.eventNamespace, function( event ) {
-				if ( $( this ).is( ".ui-state-disabled" ) ) {
-					event.preventDefault();
-				}
-			})
-
-			// support: IE <9
-			// Preventing the default action in mousedown doesn't prevent IE
-			// from focusing the element, so if the anchor gets focused, blur.
-			// We don't have to worry about focusing the previously focused
-			// element since clicking on a non-focusable element should focus
-			// the body anyway.
-			.delegate( ".ui-tabs-anchor", "focus" + this.eventNamespace, function() {
-				if ( $( this ).closest( "li" ).is( ".ui-state-disabled" ) ) {
-					this.blur();
-				}
-			});
-
-		this.tabs = this.tablist.find( "> li:has(a[href])" )
-			.addClass( "ui-state-default ui-corner-top" )
-			.attr({
-				role: "tab",
-				tabIndex: -1
-			});
-
-		this.anchors = this.tabs.map(function() {
-				return $( "a", this )[ 0 ];
-			})
-			.addClass( "ui-tabs-anchor" )
-			.attr({
-				role: "presentation",
-				tabIndex: -1
-			});
-
-		this.panels = $();
-
-		this.anchors.each(function( i, anchor ) {
-			var selector, panel, panelId,
-				anchorId = $( anchor ).uniqueId().attr( "id" ),
-				tab = $( anchor ).closest( "li" ),
-				originalAriaControls = tab.attr( "aria-controls" );
-
-			// inline tab
-			if ( that._isLocal( anchor ) ) {
-				selector = anchor.hash;
-				panelId = selector.substring( 1 );
-				panel = that.element.find( that._sanitizeSelector( selector ) );
-			// remote tab
-			} else {
-				// If the tab doesn't already have aria-controls,
-				// generate an id by using a throw-away element
-				panelId = tab.attr( "aria-controls" ) || $( {} ).uniqueId()[ 0 ].id;
-				selector = "#" + panelId;
-				panel = that.element.find( selector );
-				if ( !panel.length ) {
-					panel = that._createPanel( panelId );
-					panel.insertAfter( that.panels[ i - 1 ] || that.tablist );
-				}
-				panel.attr( "aria-live", "polite" );
-			}
-
-			if ( panel.length) {
-				that.panels = that.panels.add( panel );
-			}
-			if ( originalAriaControls ) {
-				tab.data( "ui-tabs-aria-controls", originalAriaControls );
-			}
-			tab.attr({
-				"aria-controls": panelId,
-				"aria-labelledby": anchorId
-			});
-			panel.attr( "aria-labelledby", anchorId );
-		});
-
-		this.panels
-			.addClass( "ui-tabs-panel ui-widget-content ui-corner-bottom" )
-			.attr( "role", "tabpanel" );
-
-		// Avoid memory leaks (#10056)
-		if ( prevTabs ) {
-			this._off( prevTabs.not( this.tabs ) );
-			this._off( prevAnchors.not( this.anchors ) );
-			this._off( prevPanels.not( this.panels ) );
-		}
-	},
-
-	// allow overriding how to find the list for rare usage scenarios (#7715)
-	_getList: function() {
-		return this.tablist || this.element.find( "ol,ul" ).eq( 0 );
-	},
-
-	_createPanel: function( id ) {
-		return $( "<div>" )
-			.attr( "id", id )
-			.addClass( "ui-tabs-panel ui-widget-content ui-corner-bottom" )
-			.data( "ui-tabs-destroy", true );
-	},
-
-	_setupDisabled: function( disabled ) {
-		if ( $.isArray( disabled ) ) {
-			if ( !disabled.length ) {
-				disabled = false;
-			} else if ( disabled.length === this.anchors.length ) {
-				disabled = true;
-			}
-		}
-
-		// disable tabs
-		for ( var i = 0, li; ( li = this.tabs[ i ] ); i++ ) {
-			if ( disabled === true || $.inArray( i, disabled ) !== -1 ) {
-				$( li )
-					.addClass( "ui-state-disabled" )
-					.attr( "aria-disabled", "true" );
-			} else {
-				$( li )
-					.removeClass( "ui-state-disabled" )
-					.removeAttr( "aria-disabled" );
-			}
-		}
-
-		this.options.disabled = disabled;
-	},
-
-	_setupEvents: function( event ) {
-		var events = {};
-		if ( event ) {
-			$.each( event.split(" "), function( index, eventName ) {
-				events[ eventName ] = "_eventHandler";
-			});
-		}
-
-		this._off( this.anchors.add( this.tabs ).add( this.panels ) );
-		// Always prevent the default action, even when disabled
-		this._on( true, this.anchors, {
-			click: function( event ) {
-				event.preventDefault();
-			}
-		});
-		this._on( this.anchors, events );
-		this._on( this.tabs, { keydown: "_tabKeydown" } );
-		this._on( this.panels, { keydown: "_panelKeydown" } );
-
-		this._focusable( this.tabs );
-		this._hoverable( this.tabs );
-	},
-
-	_setupHeightStyle: function( heightStyle ) {
-		var maxHeight,
-			parent = this.element.parent();
-
-		if ( heightStyle === "fill" ) {
-			maxHeight = parent.height();
-			maxHeight -= this.element.outerHeight() - this.element.height();
-
-			this.element.siblings( ":visible" ).each(function() {
-				var elem = $( this ),
-					position = elem.css( "position" );
-
-				if ( position === "absolute" || position === "fixed" ) {
-					return;
-				}
-				maxHeight -= elem.outerHeight( true );
-			});
-
-			this.element.children().not( this.panels ).each(function() {
-				maxHeight -= $( this ).outerHeight( true );
-			});
-
-			this.panels.each(function() {
-				$( this ).height( Math.max( 0, maxHeight -
-					$( this ).innerHeight() + $( this ).height() ) );
-			})
-			.css( "overflow", "auto" );
-		} else if ( heightStyle === "auto" ) {
-			maxHeight = 0;
-			this.panels.each(function() {
-				maxHeight = Math.max( maxHeight, $( this ).height( "" ).height() );
-			}).height( maxHeight );
-		}
-	},
-
-	_eventHandler: function( event ) {
-		var options = this.options,
-			active = this.active,
-			anchor = $( event.currentTarget ),
-			tab = anchor.closest( "li" ),
-			clickedIsActive = tab[ 0 ] === active[ 0 ],
-			collapsing = clickedIsActive && options.collapsible,
-			toShow = collapsing ? $() : this._getPanelForTab( tab ),
-			toHide = !active.length ? $() : this._getPanelForTab( active ),
-			eventData = {
-				oldTab: active,
-				oldPanel: toHide,
-				newTab: collapsing ? $() : tab,
-				newPanel: toShow
-			};
-
-		event.preventDefault();
-
-		if ( tab.hasClass( "ui-state-disabled" ) ||
-				// tab is already loading
-				tab.hasClass( "ui-tabs-loading" ) ||
-				// can't switch durning an animation
-				this.running ||
-				// click on active header, but not collapsible
-				( clickedIsActive && !options.collapsible ) ||
-				// allow canceling activation
-				( this._trigger( "beforeActivate", event, eventData ) === false ) ) {
-			return;
-		}
-
-		options.active = collapsing ? false : this.tabs.index( tab );
-
-		this.active = clickedIsActive ? $() : tab;
-		if ( this.xhr ) {
-			this.xhr.abort();
-		}
-
-		if ( !toHide.length && !toShow.length ) {
-			$.error( "jQuery UI Tabs: Mismatching fragment identifier." );
-		}
-
-		if ( toShow.length ) {
-			this.load( this.tabs.index( tab ), event );
-		}
-		this._toggle( event, eventData );
-	},
-
-	// handles show/hide for selecting tabs
-	_toggle: function( event, eventData ) {
-		var that = this,
-			toShow = eventData.newPanel,
-			toHide = eventData.oldPanel;
-
-		this.running = true;
-
-		function complete() {
-			that.running = false;
-			that._trigger( "activate", event, eventData );
-		}
-
-		function show() {
-			eventData.newTab.closest( "li" ).addClass( "ui-tabs-active ui-state-active" );
-
-			if ( toShow.length && that.options.show ) {
-				that._show( toShow, that.options.show, complete );
-			} else {
-				toShow.show();
-				complete();
-			}
-		}
-
-		// start out by hiding, then showing, then completing
-		if ( toHide.length && this.options.hide ) {
-			this._hide( toHide, this.options.hide, function() {
-				eventData.oldTab.closest( "li" ).removeClass( "ui-tabs-active ui-state-active" );
-				show();
-			});
-		} else {
-			eventData.oldTab.closest( "li" ).removeClass( "ui-tabs-active ui-state-active" );
-			toHide.hide();
-			show();
-		}
-
-		toHide.attr( "aria-hidden", "true" );
-		eventData.oldTab.attr({
-			"aria-selected": "false",
-			"aria-expanded": "false"
-		});
-		// If we're switching tabs, remove the old tab from the tab order.
-		// If we're opening from collapsed state, remove the previous tab from the tab order.
-		// If we're collapsing, then keep the collapsing tab in the tab order.
-		if ( toShow.length && toHide.length ) {
-			eventData.oldTab.attr( "tabIndex", -1 );
-		} else if ( toShow.length ) {
-			this.tabs.filter(function() {
-				return $( this ).attr( "tabIndex" ) === 0;
-			})
-			.attr( "tabIndex", -1 );
-		}
-
-		toShow.attr( "aria-hidden", "false" );
-		eventData.newTab.attr({
-			"aria-selected": "true",
-			"aria-expanded": "true",
-			tabIndex: 0
-		});
-	},
-
-	_activate: function( index ) {
-		var anchor,
-			active = this._findActive( index );
-
-		// trying to activate the already active panel
-		if ( active[ 0 ] === this.active[ 0 ] ) {
-			return;
-		}
-
-		// trying to collapse, simulate a click on the current active header
-		if ( !active.length ) {
-			active = this.active;
-		}
-
-		anchor = active.find( ".ui-tabs-anchor" )[ 0 ];
-		this._eventHandler({
-			target: anchor,
-			currentTarget: anchor,
-			preventDefault: $.noop
-		});
-	},
-
-	_findActive: function( index ) {
-		return index === false ? $() : this.tabs.eq( index );
-	},
-
-	_getIndex: function( index ) {
-		// meta-function to give users option to provide a href string instead of a numerical index.
-		if ( typeof index === "string" ) {
-			index = this.anchors.index( this.anchors.filter( "[href$='" + index + "']" ) );
-		}
-
-		return index;
-	},
-
-	_destroy: function() {
-		if ( this.xhr ) {
-			this.xhr.abort();
-		}
-
-		this.element.removeClass( "ui-tabs ui-widget ui-widget-content ui-corner-all ui-tabs-collapsible" );
-
-		this.tablist
-			.removeClass( "ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all" )
-			.removeAttr( "role" );
-
-		this.anchors
-			.removeClass( "ui-tabs-anchor" )
-			.removeAttr( "role" )
-			.removeAttr( "tabIndex" )
-			.removeUniqueId();
-
-		this.tablist.unbind( this.eventNamespace );
-
-		this.tabs.add( this.panels ).each(function() {
-			if ( $.data( this, "ui-tabs-destroy" ) ) {
-				$( this ).remove();
-			} else {
-				$( this )
-					.removeClass( "ui-state-default ui-state-active ui-state-disabled " +
-						"ui-corner-top ui-corner-bottom ui-widget-content ui-tabs-active ui-tabs-panel" )
-					.removeAttr( "tabIndex" )
-					.removeAttr( "aria-live" )
-					.removeAttr( "aria-busy" )
-					.removeAttr( "aria-selected" )
-					.removeAttr( "aria-labelledby" )
-					.removeAttr( "aria-hidden" )
-					.removeAttr( "aria-expanded" )
-					.removeAttr( "role" );
-			}
-		});
-
-		this.tabs.each(function() {
-			var li = $( this ),
-				prev = li.data( "ui-tabs-aria-controls" );
-			if ( prev ) {
-				li
-					.attr( "aria-controls", prev )
-					.removeData( "ui-tabs-aria-controls" );
-			} else {
-				li.removeAttr( "aria-controls" );
-			}
-		});
-
-		this.panels.show();
-
-		if ( this.options.heightStyle !== "content" ) {
-			this.panels.css( "height", "" );
-		}
-	},
-
-	enable: function( index ) {
-		var disabled = this.options.disabled;
-		if ( disabled === false ) {
-			return;
-		}
-
-		if ( index === undefined ) {
-			disabled = false;
-		} else {
-			index = this._getIndex( index );
-			if ( $.isArray( disabled ) ) {
-				disabled = $.map( disabled, function( num ) {
-					return num !== index ? num : null;
-				});
-			} else {
-				disabled = $.map( this.tabs, function( li, num ) {
-					return num !== index ? num : null;
-				});
-			}
-		}
-		this._setupDisabled( disabled );
-	},
-
-	disable: function( index ) {
-		var disabled = this.options.disabled;
-		if ( disabled === true ) {
-			return;
-		}
-
-		if ( index === undefined ) {
-			disabled = true;
-		} else {
-			index = this._getIndex( index );
-			if ( $.inArray( index, disabled ) !== -1 ) {
-				return;
-			}
-			if ( $.isArray( disabled ) ) {
-				disabled = $.merge( [ index ], disabled ).sort();
-			} else {
-				disabled = [ index ];
-			}
-		}
-		this._setupDisabled( disabled );
-	},
-
-	load: function( index, event ) {
-		index = this._getIndex( index );
-		var that = this,
-			tab = this.tabs.eq( index ),
-			anchor = tab.find( ".ui-tabs-anchor" ),
-			panel = this._getPanelForTab( tab ),
-			eventData = {
-				tab: tab,
-				panel: panel
-			},
-			complete = function( jqXHR, status ) {
-				if ( status === "abort" ) {
-					that.panels.stop( false, true );
-				}
-
-				tab.removeClass( "ui-tabs-loading" );
-				panel.removeAttr( "aria-busy" );
-
-				if ( jqXHR === that.xhr ) {
-					delete that.xhr;
-				}
-			};
-
-		// not remote
-		if ( this._isLocal( anchor[ 0 ] ) ) {
-			return;
-		}
-
-		this.xhr = $.ajax( this._ajaxSettings( anchor, event, eventData ) );
-
-		// support: jQuery <1.8
-		// jQuery <1.8 returns false if the request is canceled in beforeSend,
-		// but as of 1.8, $.ajax() always returns a jqXHR object.
-		if ( this.xhr && this.xhr.statusText !== "canceled" ) {
-			tab.addClass( "ui-tabs-loading" );
-			panel.attr( "aria-busy", "true" );
-
-			this.xhr
-				.done(function( response, status, jqXHR ) {
-					// support: jQuery <1.8
-					// http://bugs.jquery.com/ticket/11778
-					setTimeout(function() {
-						panel.html( response );
-						that._trigger( "load", event, eventData );
-
-						complete( jqXHR, status );
-					}, 1 );
-				})
-				.fail(function( jqXHR, status ) {
-					// support: jQuery <1.8
-					// http://bugs.jquery.com/ticket/11778
-					setTimeout(function() {
-						complete( jqXHR, status );
-					}, 1 );
-				});
-		}
-	},
-
-	_ajaxSettings: function( anchor, event, eventData ) {
-		var that = this;
-		return {
-			url: anchor.attr( "href" ),
-			beforeSend: function( jqXHR, settings ) {
-				return that._trigger( "beforeLoad", event,
-					$.extend( { jqXHR: jqXHR, ajaxSettings: settings }, eventData ) );
-			}
-		};
-	},
-
-	_getPanelForTab: function( tab ) {
-		var id = $( tab ).attr( "aria-controls" );
-		return this.element.find( this._sanitizeSelector( "#" + id ) );
-	}
-});
-
-}));
diff --git a/#pma/js/jquery/src/jquery-ui/tooltip.js b/#pma/js/jquery/src/jquery-ui/tooltip.js
deleted file mode 100644
index 02bcd44d..00000000
--- a/#pma/js/jquery/src/jquery-ui/tooltip.js
+++ /dev/null
@@ -1,473 +0,0 @@
-/*!
- * jQuery UI Tooltip 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/tooltip/
- */
-(function( factory ) {
-	if ( typeof define === "function" && define.amd ) {
-
-		// AMD. Register as an anonymous module.
-		define([
-			"jquery",
-			"./core",
-			"./widget",
-			"./position"
-		], factory );
-	} else {
-
-		// Browser globals
-		factory( jQuery );
-	}
-}(function( $ ) {
-
-return $.widget( "ui.tooltip", {
-	version: "1.11.4",
-	options: {
-		content: function() {
-			// support: IE<9, Opera in jQuery <1.7
-			// .text() can't accept undefined, so coerce to a string
-			var title = $( this ).attr( "title" ) || "";
-			// Escape title, since we're going from an attribute to raw HTML
-			return $( "<a>" ).text( title ).html();
-		},
-		hide: true,
-		// Disabled elements have inconsistent behavior across browsers (#8661)
-		items: "[title]:not([disabled])",
-		position: {
-			my: "left top+15",
-			at: "left bottom",
-			collision: "flipfit flip"
-		},
-		show: true,
-		tooltipClass: null,
-		track: false,
-
-		// callbacks
-		close: null,
-		open: null
-	},
-
-	_addDescribedBy: function( elem, id ) {
-		var describedby = (elem.attr( "aria-describedby" ) || "").split( /\s+/ );
-		describedby.push( id );
-		elem
-			.data( "ui-tooltip-id", id )
-			.attr( "aria-describedby", $.trim( describedby.join( " " ) ) );
-	},
-
-	_removeDescribedBy: function( elem ) {
-		var id = elem.data( "ui-tooltip-id" ),
-			describedby = (elem.attr( "aria-describedby" ) || "").split( /\s+/ ),
-			index = $.inArray( id, describedby );
-
-		if ( index !== -1 ) {
-			describedby.splice( index, 1 );
-		}
-
-		elem.removeData( "ui-tooltip-id" );
-		describedby = $.trim( describedby.join( " " ) );
-		if ( describedby ) {
-			elem.attr( "aria-describedby", describedby );
-		} else {
-			elem.removeAttr( "aria-describedby" );
-		}
-	},
-
-	_create: function() {
-		this._on({
-			mouseover: "open",
-			focusin: "open"
-		});
-
-		// IDs of generated tooltips, needed for destroy
-		this.tooltips = {};
-
-		// IDs of parent tooltips where we removed the title attribute
-		this.parents = {};
-
-		if ( this.options.disabled ) {
-			this._disable();
-		}
-
-		// Append the aria-live region so tooltips announce correctly
-		this.liveRegion = $( "<div>" )
-			.attr({
-				role: "log",
-				"aria-live": "assertive",
-				"aria-relevant": "additions"
-			})
-			.addClass( "ui-helper-hidden-accessible" )
-			.appendTo( this.document[ 0 ].body );
-	},
-
-	_setOption: function( key, value ) {
-		var that = this;
-
-		if ( key === "disabled" ) {
-			this[ value ? "_disable" : "_enable" ]();
-			this.options[ key ] = value;
-			// disable element style changes
-			return;
-		}
-
-		this._super( key, value );
-
-		if ( key === "content" ) {
-			$.each( this.tooltips, function( id, tooltipData ) {
-				that._updateContent( tooltipData.element );
-			});
-		}
-	},
-
-	_disable: function() {
-		var that = this;
-
-		// close open tooltips
-		$.each( this.tooltips, function( id, tooltipData ) {
-			var event = $.Event( "blur" );
-			event.target = event.currentTarget = tooltipData.element[ 0 ];
-			that.close( event, true );
-		});
-
-		// remove title attributes to prevent native tooltips
-		this.element.find( this.options.items ).addBack().each(function() {
-			var element = $( this );
-			if ( element.is( "[title]" ) ) {
-				element
-					.data( "ui-tooltip-title", element.attr( "title" ) )
-					.removeAttr( "title" );
-			}
-		});
-	},
-
-	_enable: function() {
-		// restore title attributes
-		this.element.find( this.options.items ).addBack().each(function() {
-			var element = $( this );
-			if ( element.data( "ui-tooltip-title" ) ) {
-				element.attr( "title", element.data( "ui-tooltip-title" ) );
-			}
-		});
-	},
-
-	open: function( event ) {
-		var that = this,
-			target = $( event ? event.target : this.element )
-				// we need closest here due to mouseover bubbling,
-				// but always pointing at the same event target
-				.closest( this.options.items );
-
-		// No element to show a tooltip for or the tooltip is already open
-		if ( !target.length || target.data( "ui-tooltip-id" ) ) {
-			return;
-		}
-
-		if ( target.attr( "title" ) ) {
-			target.data( "ui-tooltip-title", target.attr( "title" ) );
-		}
-
-		target.data( "ui-tooltip-open", true );
-
-		// kill parent tooltips, custom or native, for hover
-		if ( event && event.type === "mouseover" ) {
-			target.parents().each(function() {
-				var parent = $( this ),
-					blurEvent;
-				if ( parent.data( "ui-tooltip-open" ) ) {
-					blurEvent = $.Event( "blur" );
-					blurEvent.target = blurEvent.currentTarget = this;
-					that.close( blurEvent, true );
-				}
-				if ( parent.attr( "title" ) ) {
-					parent.uniqueId();
-					that.parents[ this.id ] = {
-						element: this,
-						title: parent.attr( "title" )
-					};
-					parent.attr( "title", "" );
-				}
-			});
-		}
-
-		this._registerCloseHandlers( event, target );
-		this._updateContent( target, event );
-	},
-
-	_updateContent: function( target, event ) {
-		var content,
-			contentOption = this.options.content,
-			that = this,
-			eventType = event ? event.type : null;
-
-		if ( typeof contentOption === "string" ) {
-			return this._open( event, target, contentOption );
-		}
-
-		content = contentOption.call( target[0], function( response ) {
-
-			// IE may instantly serve a cached response for ajax requests
-			// delay this call to _open so the other call to _open runs first
-			that._delay(function() {
-
-				// Ignore async response if tooltip was closed already
-				if ( !target.data( "ui-tooltip-open" ) ) {
-					return;
-				}
-
-				// jQuery creates a special event for focusin when it doesn't
-				// exist natively. To improve performance, the native event
-				// object is reused and the type is changed. Therefore, we can't
-				// rely on the type being correct after the event finished
-				// bubbling, so we set it back to the previous value. (#8740)
-				if ( event ) {
-					event.type = eventType;
-				}
-				this._open( event, target, response );
-			});
-		});
-		if ( content ) {
-			this._open( event, target, content );
-		}
-	},
-
-	_open: function( event, target, content ) {
-		var tooltipData, tooltip, delayedShow, a11yContent,
-			positionOption = $.extend( {}, this.options.position );
-
-		if ( !content ) {
-			return;
-		}
-
-		// Content can be updated multiple times. If the tooltip already
-		// exists, then just update the content and bail.
-		tooltipData = this._find( target );
-		if ( tooltipData ) {
-			tooltipData.tooltip.find( ".ui-tooltip-content" ).html( content );
-			return;
-		}
-
-		// if we have a title, clear it to prevent the native tooltip
-		// we have to check first to avoid defining a title if none exists
-		// (we don't want to cause an element to start matching [title])
-		//
-		// We use removeAttr only for key events, to allow IE to export the correct
-		// accessible attributes. For mouse events, set to empty string to avoid
-		// native tooltip showing up (happens only when removing inside mouseover).
-		if ( target.is( "[title]" ) ) {
-			if ( event && event.type === "mouseover" ) {
-				target.attr( "title", "" );
-			} else {
-				target.removeAttr( "title" );
-			}
-		}
-
-		tooltipData = this._tooltip( target );
-		tooltip = tooltipData.tooltip;
-		this._addDescribedBy( target, tooltip.attr( "id" ) );
-		tooltip.find( ".ui-tooltip-content" ).html( content );
-
-		// Support: Voiceover on OS X, JAWS on IE <= 9
-		// JAWS announces deletions even when aria-relevant="additions"
-		// Voiceover will sometimes re-read the entire log region's contents from the beginning
-		this.liveRegion.children().hide();
-		if ( content.clone ) {
-			a11yContent = content.clone();
-			a11yContent.removeAttr( "id" ).find( "[id]" ).removeAttr( "id" );
-		} else {
-			a11yContent = content;
-		}
-		$( "<div>" ).html( a11yContent ).appendTo( this.liveRegion );
-
-		function position( event ) {
-			positionOption.of = event;
-			if ( tooltip.is( ":hidden" ) ) {
-				return;
-			}
-			tooltip.position( positionOption );
-		}
-		if ( this.options.track && event && /^mouse/.test( event.type ) ) {
-			this._on( this.document, {
-				mousemove: position
-			});
-			// trigger once to override element-relative positioning
-			position( event );
-		} else {
-			tooltip.position( $.extend({
-				of: target
-			}, this.options.position ) );
-		}
-
-		tooltip.hide();
-
-		this._show( tooltip, this.options.show );
-		// Handle tracking tooltips that are shown with a delay (#8644). As soon
-		// as the tooltip is visible, position the tooltip using the most recent
-		// event.
-		if ( this.options.show && this.options.show.delay ) {
-			delayedShow = this.delayedShow = setInterval(function() {
-				if ( tooltip.is( ":visible" ) ) {
-					position( positionOption.of );
-					clearInterval( delayedShow );
-				}
-			}, $.fx.interval );
-		}
-
-		this._trigger( "open", event, { tooltip: tooltip } );
-	},
-
-	_registerCloseHandlers: function( event, target ) {
-		var events = {
-			keyup: function( event ) {
-				if ( event.keyCode === $.ui.keyCode.ESCAPE ) {
-					var fakeEvent = $.Event(event);
-					fakeEvent.currentTarget = target[0];
-					this.close( fakeEvent, true );
-				}
-			}
-		};
-
-		// Only bind remove handler for delegated targets. Non-delegated
-		// tooltips will handle this in destroy.
-		if ( target[ 0 ] !== this.element[ 0 ] ) {
-			events.remove = function() {
-				this._removeTooltip( this._find( target ).tooltip );
-			};
-		}
-
-		if ( !event || event.type === "mouseover" ) {
-			events.mouseleave = "close";
-		}
-		if ( !event || event.type === "focusin" ) {
-			events.focusout = "close";
-		}
-		this._on( true, target, events );
-	},
-
-	close: function( event ) {
-		var tooltip,
-			that = this,
-			target = $( event ? event.currentTarget : this.element ),
-			tooltipData = this._find( target );
-
-		// The tooltip may already be closed
-		if ( !tooltipData ) {
-
-			// We set ui-tooltip-open immediately upon open (in open()), but only set the
-			// additional data once there's actually content to show (in _open()). So even if the
-			// tooltip doesn't have full data, we always remove ui-tooltip-open in case we're in
-			// the period between open() and _open().
-			target.removeData( "ui-tooltip-open" );
-			return;
-		}
-
-		tooltip = tooltipData.tooltip;
-
-		// disabling closes the tooltip, so we need to track when we're closing
-		// to avoid an infinite loop in case the tooltip becomes disabled on close
-		if ( tooltipData.closing ) {
-			return;
-		}
-
-		// Clear the interval for delayed tracking tooltips
-		clearInterval( this.delayedShow );
-
-		// only set title if we had one before (see comment in _open())
-		// If the title attribute has changed since open(), don't restore
-		if ( target.data( "ui-tooltip-title" ) && !target.attr( "title" ) ) {
-			target.attr( "title", target.data( "ui-tooltip-title" ) );
-		}
-
-		this._removeDescribedBy( target );
-
-		tooltipData.hiding = true;
-		tooltip.stop( true );
-		this._hide( tooltip, this.options.hide, function() {
-			that._removeTooltip( $( this ) );
-		});
-
-		target.removeData( "ui-tooltip-open" );
-		this._off( target, "mouseleave focusout keyup" );
-
-		// Remove 'remove' binding only on delegated targets
-		if ( target[ 0 ] !== this.element[ 0 ] ) {
-			this._off( target, "remove" );
-		}
-		this._off( this.document, "mousemove" );
-
-		if ( event && event.type === "mouseleave" ) {
-			$.each( this.parents, function( id, parent ) {
-				$( parent.element ).attr( "title", parent.title );
-				delete that.parents[ id ];
-			});
-		}
-
-		tooltipData.closing = true;
-		this._trigger( "close", event, { tooltip: tooltip } );
-		if ( !tooltipData.hiding ) {
-			tooltipData.closing = false;
-		}
-	},
-
-	_tooltip: function( element ) {
-		var tooltip = $( "<div>" )
-				.attr( "role", "tooltip" )
-				.addClass( "ui-tooltip ui-widget ui-corner-all ui-widget-content " +
-					( this.options.tooltipClass || "" ) ),
-			id = tooltip.uniqueId().attr( "id" );
-
-		$( "<div>" )
-			.addClass( "ui-tooltip-content" )
-			.appendTo( tooltip );
-
-		tooltip.appendTo( this.document[0].body );
-
-		return this.tooltips[ id ] = {
-			element: element,
-			tooltip: tooltip
-		};
-	},
-
-	_find: function( target ) {
-		var id = target.data( "ui-tooltip-id" );
-		return id ? this.tooltips[ id ] : null;
-	},
-
-	_removeTooltip: function( tooltip ) {
-		tooltip.remove();
-		delete this.tooltips[ tooltip.attr( "id" ) ];
-	},
-
-	_destroy: function() {
-		var that = this;
-
-		// close open tooltips
-		$.each( this.tooltips, function( id, tooltipData ) {
-			// Delegate to close method to handle common cleanup
-			var event = $.Event( "blur" ),
-				element = tooltipData.element;
-			event.target = event.currentTarget = element[ 0 ];
-			that.close( event, true );
-
-			// Remove immediately; destroying an open tooltip doesn't use the
-			// hide animation
-			$( "#" + id ).remove();
-
-			// Restore the title
-			if ( element.data( "ui-tooltip-title" ) ) {
-				// If the title attribute has changed since open(), don't restore
-				if ( !element.attr( "title" ) ) {
-					element.attr( "title", element.data( "ui-tooltip-title" ) );
-				}
-				element.removeData( "ui-tooltip-title" );
-			}
-		});
-		this.liveRegion.remove();
-	}
-});
-
-}));
diff --git a/#pma/js/jquery/src/jquery-ui/widget.js b/#pma/js/jquery/src/jquery-ui/widget.js
deleted file mode 100644
index 1096ba62..00000000
--- a/#pma/js/jquery/src/jquery-ui/widget.js
+++ /dev/null
@@ -1,558 +0,0 @@
-/*!
- * jQuery UI Widget 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/jQuery.widget/
- */
-(function( factory ) {
-	if ( typeof define === "function" && define.amd ) {
-
-		// AMD. Register as an anonymous module.
-		define( [ "jquery" ], factory );
-	} else {
-
-		// Browser globals
-		factory( jQuery );
-	}
-}(function( $ ) {
-
-var widget_uuid = 0,
-	widget_slice = Array.prototype.slice;
-
-$.cleanData = (function( orig ) {
-	return function( elems ) {
-		var events, elem, i;
-		for ( i = 0; (elem = elems[i]) != null; i++ ) {
-			try {
-
-				// Only trigger remove when necessary to save time
-				events = $._data( elem, "events" );
-				if ( events && events.remove ) {
-					$( elem ).triggerHandler( "remove" );
-				}
-
-			// http://bugs.jquery.com/ticket/8235
-			} catch ( e ) {}
-		}
-		orig( elems );
-	};
-})( $.cleanData );
-
-$.widget = function( name, base, prototype ) {
-	var fullName, existingConstructor, constructor, basePrototype,
-		// proxiedPrototype allows the provided prototype to remain unmodified
-		// so that it can be used as a mixin for multiple widgets (#8876)
-		proxiedPrototype = {},
-		namespace = name.split( "." )[ 0 ];
-
-	name = name.split( "." )[ 1 ];
-	fullName = namespace + "-" + name;
-
-	if ( !prototype ) {
-		prototype = base;
-		base = $.Widget;
-	}
-
-	// create selector for plugin
-	$.expr[ ":" ][ fullName.toLowerCase() ] = function( elem ) {
-		return !!$.data( elem, fullName );
-	};
-
-	$[ namespace ] = $[ namespace ] || {};
-	existingConstructor = $[ namespace ][ name ];
-	constructor = $[ namespace ][ name ] = function( options, element ) {
-		// allow instantiation without "new" keyword
-		if ( !this._createWidget ) {
-			return new constructor( options, element );
-		}
-
-		// allow instantiation without initializing for simple inheritance
-		// must use "new" keyword (the code above always passes args)
-		if ( arguments.length ) {
-			this._createWidget( options, element );
-		}
-	};
-	// extend with the existing constructor to carry over any static properties
-	$.extend( constructor, existingConstructor, {
-		version: prototype.version,
-		// copy the object used to create the prototype in case we need to
-		// redefine the widget later
-		_proto: $.extend( {}, prototype ),
-		// track widgets that inherit from this widget in case this widget is
-		// redefined after a widget inherits from it
-		_childConstructors: []
-	});
-
-	basePrototype = new base();
-	// we need to make the options hash a property directly on the new instance
-	// otherwise we'll modify the options hash on the prototype that we're
-	// inheriting from
-	basePrototype.options = $.widget.extend( {}, basePrototype.options );
-	$.each( prototype, function( prop, value ) {
-		if ( !$.isFunction( value ) ) {
-			proxiedPrototype[ prop ] = value;
-			return;
-		}
-		proxiedPrototype[ prop ] = (function() {
-			var _super = function() {
-					return base.prototype[ prop ].apply( this, arguments );
-				},
-				_superApply = function( args ) {
-					return base.prototype[ prop ].apply( this, args );
-				};
-			return function() {
-				var __super = this._super,
-					__superApply = this._superApply,
-					returnValue;
-
-				this._super = _super;
-				this._superApply = _superApply;
-
-				returnValue = value.apply( this, arguments );
-
-				this._super = __super;
-				this._superApply = __superApply;
-
-				return returnValue;
-			};
-		})();
-	});
-	constructor.prototype = $.widget.extend( basePrototype, {
-		// TODO: remove support for widgetEventPrefix
-		// always use the name + a colon as the prefix, e.g., draggable:start
-		// don't prefix for widgets that aren't DOM-based
-		widgetEventPrefix: existingConstructor ? (basePrototype.widgetEventPrefix || name) : name
-	}, proxiedPrototype, {
-		constructor: constructor,
-		namespace: namespace,
-		widgetName: name,
-		widgetFullName: fullName
-	});
-
-	// If this widget is being redefined then we need to find all widgets that
-	// are inheriting from it and redefine all of them so that they inherit from
-	// the new version of this widget. We're essentially trying to replace one
-	// level in the prototype chain.
-	if ( existingConstructor ) {
-		$.each( existingConstructor._childConstructors, function( i, child ) {
-			var childPrototype = child.prototype;
-
-			// redefine the child widget using the same prototype that was
-			// originally used, but inherit from the new version of the base
-			$.widget( childPrototype.namespace + "." + childPrototype.widgetName, constructor, child._proto );
-		});
-		// remove the list of existing child constructors from the old constructor
-		// so the old child constructors can be garbage collected
-		delete existingConstructor._childConstructors;
-	} else {
-		base._childConstructors.push( constructor );
-	}
-
-	$.widget.bridge( name, constructor );
-
-	return constructor;
-};
-
-$.widget.extend = function( target ) {
-	var input = widget_slice.call( arguments, 1 ),
-		inputIndex = 0,
-		inputLength = input.length,
-		key,
-		value;
-	for ( ; inputIndex < inputLength; inputIndex++ ) {
-		for ( key in input[ inputIndex ] ) {
-			value = input[ inputIndex ][ key ];
-			if ( input[ inputIndex ].hasOwnProperty( key ) && value !== undefined ) {
-				// Clone objects
-				if ( $.isPlainObject( value ) ) {
-					target[ key ] = $.isPlainObject( target[ key ] ) ?
-						$.widget.extend( {}, target[ key ], value ) :
-						// Don't extend strings, arrays, etc. with objects
-						$.widget.extend( {}, value );
-				// Copy everything else by reference
-				} else {
-					target[ key ] = value;
-				}
-			}
-		}
-	}
-	return target;
-};
-
-$.widget.bridge = function( name, object ) {
-	var fullName = object.prototype.widgetFullName || name;
-	$.fn[ name ] = function( options ) {
-		var isMethodCall = typeof options === "string",
-			args = widget_slice.call( arguments, 1 ),
-			returnValue = this;
-
-		if ( isMethodCall ) {
-			this.each(function() {
-				var methodValue,
-					instance = $.data( this, fullName );
-				if ( options === "instance" ) {
-					returnValue = instance;
-					return false;
-				}
-				if ( !instance ) {
-					return $.error( "cannot call methods on " + name + " prior to initialization; " +
-						"attempted to call method '" + options + "'" );
-				}
-				if ( !$.isFunction( instance[options] ) || options.charAt( 0 ) === "_" ) {
-					return $.error( "no such method '" + options + "' for " + name + " widget instance" );
-				}
-				methodValue = instance[ options ].apply( instance, args );
-				if ( methodValue !== instance && methodValue !== undefined ) {
-					returnValue = methodValue && methodValue.jquery ?
-						returnValue.pushStack( methodValue.get() ) :
-						methodValue;
-					return false;
-				}
-			});
-		} else {
-
-			// Allow multiple hashes to be passed on init
-			if ( args.length ) {
-				options = $.widget.extend.apply( null, [ options ].concat(args) );
-			}
-
-			this.each(function() {
-				var instance = $.data( this, fullName );
-				if ( instance ) {
-					instance.option( options || {} );
-					if ( instance._init ) {
-						instance._init();
-					}
-				} else {
-					$.data( this, fullName, new object( options, this ) );
-				}
-			});
-		}
-
-		return returnValue;
-	};
-};
-
-$.Widget = function( /* options, element */ ) {};
-$.Widget._childConstructors = [];
-
-$.Widget.prototype = {
-	widgetName: "widget",
-	widgetEventPrefix: "",
-	defaultElement: "<div>",
-	options: {
-		disabled: false,
-
-		// callbacks
-		create: null
-	},
-	_createWidget: function( options, element ) {
-		element = $( element || this.defaultElement || this )[ 0 ];
-		this.element = $( element );
-		this.uuid = widget_uuid++;
-		this.eventNamespace = "." + this.widgetName + this.uuid;
-
-		this.bindings = $();
-		this.hoverable = $();
-		this.focusable = $();
-
-		if ( element !== this ) {
-			$.data( element, this.widgetFullName, this );
-			this._on( true, this.element, {
-				remove: function( event ) {
-					if ( event.target === element ) {
-						this.destroy();
-					}
-				}
-			});
-			this.document = $( element.style ?
-				// element within the document
-				element.ownerDocument :
-				// element is window or document
-				element.document || element );
-			this.window = $( this.document[0].defaultView || this.document[0].parentWindow );
-		}
-
-		this.options = $.widget.extend( {},
-			this.options,
-			this._getCreateOptions(),
-			options );
-
-		this._create();
-		this._trigger( "create", null, this._getCreateEventData() );
-		this._init();
-	},
-	_getCreateOptions: $.noop,
-	_getCreateEventData: $.noop,
-	_create: $.noop,
-	_init: $.noop,
-
-	destroy: function() {
-		this._destroy();
-		// we can probably remove the unbind calls in 2.0
-		// all event bindings should go through this._on()
-		this.element
-			.unbind( this.eventNamespace )
-			.removeData( this.widgetFullName )
-			// support: jquery <1.6.3
-			// http://bugs.jquery.com/ticket/9413
-			.removeData( $.camelCase( this.widgetFullName ) );
-		this.widget()
-			.unbind( this.eventNamespace )
-			.removeAttr( "aria-disabled" )
-			.removeClass(
-				this.widgetFullName + "-disabled " +
-				"ui-state-disabled" );
-
-		// clean up events and states
-		this.bindings.unbind( this.eventNamespace );
-		this.hoverable.removeClass( "ui-state-hover" );
-		this.focusable.removeClass( "ui-state-focus" );
-	},
-	_destroy: $.noop,
-
-	widget: function() {
-		return this.element;
-	},
-
-	option: function( key, value ) {
-		var options = key,
-			parts,
-			curOption,
-			i;
-
-		if ( arguments.length === 0 ) {
-			// don't return a reference to the internal hash
-			return $.widget.extend( {}, this.options );
-		}
-
-		if ( typeof key === "string" ) {
-			// handle nested keys, e.g., "foo.bar" => { foo: { bar: ___ } }
-			options = {};
-			parts = key.split( "." );
-			key = parts.shift();
-			if ( parts.length ) {
-				curOption = options[ key ] = $.widget.extend( {}, this.options[ key ] );
-				for ( i = 0; i < parts.length - 1; i++ ) {
-					curOption[ parts[ i ] ] = curOption[ parts[ i ] ] || {};
-					curOption = curOption[ parts[ i ] ];
-				}
-				key = parts.pop();
-				if ( arguments.length === 1 ) {
-					return curOption[ key ] === undefined ? null : curOption[ key ];
-				}
-				curOption[ key ] = value;
-			} else {
-				if ( arguments.length === 1 ) {
-					return this.options[ key ] === undefined ? null : this.options[ key ];
-				}
-				options[ key ] = value;
-			}
-		}
-
-		this._setOptions( options );
-
-		return this;
-	},
-	_setOptions: function( options ) {
-		var key;
-
-		for ( key in options ) {
-			this._setOption( key, options[ key ] );
-		}
-
-		return this;
-	},
-	_setOption: function( key, value ) {
-		this.options[ key ] = value;
-
-		if ( key === "disabled" ) {
-			this.widget()
-				.toggleClass( this.widgetFullName + "-disabled", !!value );
-
-			// If the widget is becoming disabled, then nothing is interactive
-			if ( value ) {
-				this.hoverable.removeClass( "ui-state-hover" );
-				this.focusable.removeClass( "ui-state-focus" );
-			}
-		}
-
-		return this;
-	},
-
-	enable: function() {
-		return this._setOptions({ disabled: false });
-	},
-	disable: function() {
-		return this._setOptions({ disabled: true });
-	},
-
-	_on: function( suppressDisabledCheck, element, handlers ) {
-		var delegateElement,
-			instance = this;
-
-		// no suppressDisabledCheck flag, shuffle arguments
-		if ( typeof suppressDisabledCheck !== "boolean" ) {
-			handlers = element;
-			element = suppressDisabledCheck;
-			suppressDisabledCheck = false;
-		}
-
-		// no element argument, shuffle and use this.element
-		if ( !handlers ) {
-			handlers = element;
-			element = this.element;
-			delegateElement = this.widget();
-		} else {
-			element = delegateElement = $( element );
-			this.bindings = this.bindings.add( element );
-		}
-
-		$.each( handlers, function( event, handler ) {
-			function handlerProxy() {
-				// allow widgets to customize the disabled handling
-				// - disabled as an array instead of boolean
-				// - disabled class as method for disabling individual parts
-				if ( !suppressDisabledCheck &&
-						( instance.options.disabled === true ||
-							$( this ).hasClass( "ui-state-disabled" ) ) ) {
-					return;
-				}
-				return ( typeof handler === "string" ? instance[ handler ] : handler )
-					.apply( instance, arguments );
-			}
-
-			// copy the guid so direct unbinding works
-			if ( typeof handler !== "string" ) {
-				handlerProxy.guid = handler.guid =
-					handler.guid || handlerProxy.guid || $.guid++;
-			}
-
-			var match = event.match( /^([\w:-]*)\s*(.*)$/ ),
-				eventName = match[1] + instance.eventNamespace,
-				selector = match[2];
-			if ( selector ) {
-				delegateElement.delegate( selector, eventName, handlerProxy );
-			} else {
-				element.bind( eventName, handlerProxy );
-			}
-		});
-	},
-
-	_off: function( element, eventName ) {
-		eventName = (eventName || "").split( " " ).join( this.eventNamespace + " " ) +
-			this.eventNamespace;
-		element.unbind( eventName ).undelegate( eventName );
-
-		// Clear the stack to avoid memory leaks (#10056)
-		this.bindings = $( this.bindings.not( element ).get() );
-		this.focusable = $( this.focusable.not( element ).get() );
-		this.hoverable = $( this.hoverable.not( element ).get() );
-	},
-
-	_delay: function( handler, delay ) {
-		function handlerProxy() {
-			return ( typeof handler === "string" ? instance[ handler ] : handler )
-				.apply( instance, arguments );
-		}
-		var instance = this;
-		return setTimeout( handlerProxy, delay || 0 );
-	},
-
-	_hoverable: function( element ) {
-		this.hoverable = this.hoverable.add( element );
-		this._on( element, {
-			mouseenter: function( event ) {
-				$( event.currentTarget ).addClass( "ui-state-hover" );
-			},
-			mouseleave: function( event ) {
-				$( event.currentTarget ).removeClass( "ui-state-hover" );
-			}
-		});
-	},
-
-	_focusable: function( element ) {
-		this.focusable = this.focusable.add( element );
-		this._on( element, {
-			focusin: function( event ) {
-				$( event.currentTarget ).addClass( "ui-state-focus" );
-			},
-			focusout: function( event ) {
-				$( event.currentTarget ).removeClass( "ui-state-focus" );
-			}
-		});
-	},
-
-	_trigger: function( type, event, data ) {
-		var prop, orig,
-			callback = this.options[ type ];
-
-		data = data || {};
-		event = $.Event( event );
-		event.type = ( type === this.widgetEventPrefix ?
-			type :
-			this.widgetEventPrefix + type ).toLowerCase();
-		// the original event may come from any element
-		// so we need to reset the target on the new event
-		event.target = this.element[ 0 ];
-
-		// copy original event properties over to the new event
-		orig = event.originalEvent;
-		if ( orig ) {
-			for ( prop in orig ) {
-				if ( !( prop in event ) ) {
-					event[ prop ] = orig[ prop ];
-				}
-			}
-		}
-
-		this.element.trigger( event, data );
-		return !( $.isFunction( callback ) &&
-			callback.apply( this.element[0], [ event ].concat( data ) ) === false ||
-			event.isDefaultPrevented() );
-	}
-};
-
-$.each( { show: "fadeIn", hide: "fadeOut" }, function( method, defaultEffect ) {
-	$.Widget.prototype[ "_" + method ] = function( element, options, callback ) {
-		if ( typeof options === "string" ) {
-			options = { effect: options };
-		}
-		var hasOptions,
-			effectName = !options ?
-				method :
-				options === true || typeof options === "number" ?
-					defaultEffect :
-					options.effect || defaultEffect;
-		options = options || {};
-		if ( typeof options === "number" ) {
-			options = { duration: options };
-		}
-		hasOptions = !$.isEmptyObject( options );
-		options.complete = callback;
-		if ( options.delay ) {
-			element.delay( options.delay );
-		}
-		if ( hasOptions && $.effects && $.effects.effect[ effectName ] ) {
-			element[ method ]( options );
-		} else if ( effectName !== method && element[ effectName ] ) {
-			element[ effectName ]( options.duration, options.easing, callback );
-		} else {
-			element.queue(function( next ) {
-				$( this )[ method ]();
-				if ( callback ) {
-					callback.call( element[ 0 ] );
-				}
-				next();
-			});
-		}
-	};
-});
-
-return $.widget;
-
-}));
diff --git a/#pma/js/jquery/src/jquery/.jshintrc b/#pma/js/jquery/src/jquery/.jshintrc
deleted file mode 100644
index ba16cd5d..00000000
--- a/#pma/js/jquery/src/jquery/.jshintrc
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"boss": true,
-	"curly": true,
-	"eqeqeq": true,
-	"eqnull": true,
-	"expr": true,
-	"immed": true,
-	"noarg": true,
-	"onevar": true,
-	"quotmark": "double",
-	"smarttabs": true,
-	"trailing": true,
-	"undef": true,
-	"unused": true,
-
-	"sub": true,
-
-	"browser": true,
-
-	"globals": {
-		"jQuery": true,
-		"define": true,
-		"module": true
-	}
-}
diff --git a/#pma/js/jquery/src/jquery/ajax.js b/#pma/js/jquery/src/jquery/ajax.js
deleted file mode 100644
index 5c7b4add..00000000
--- a/#pma/js/jquery/src/jquery/ajax.js
+++ /dev/null
@@ -1,786 +0,0 @@
-define([
-	"./core",
-	"./var/rnotwhite",
-	"./ajax/var/nonce",
-	"./ajax/var/rquery",
-	"./core/init",
-	"./ajax/parseJSON",
-	"./ajax/parseXML",
-	"./deferred"
-], function( jQuery, rnotwhite, nonce, rquery ) {
-
-var
-	rhash = /#.*$/,
-	rts = /([?&])_=[^&]*/,
-	rheaders = /^(.*?):[ \t]*([^\r\n]*)$/mg,
-	// #7653, #8125, #8152: local protocol detection
-	rlocalProtocol = /^(?:about|app|app-storage|.+-extension|file|res|widget):$/,
-	rnoContent = /^(?:GET|HEAD)$/,
-	rprotocol = /^\/\//,
-	rurl = /^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,
-
-	/* Prefilters
-	 * 1) They are useful to introduce custom dataTypes (see ajax/jsonp.js for an example)
-	 * 2) These are called:
-	 *    - BEFORE asking for a transport
-	 *    - AFTER param serialization (s.data is a string if s.processData is true)
-	 * 3) key is the dataType
-	 * 4) the catchall symbol "*" can be used
-	 * 5) execution will start with transport dataType and THEN continue down to "*" if needed
-	 */
-	prefilters = {},
-
-	/* Transports bindings
-	 * 1) key is the dataType
-	 * 2) the catchall symbol "*" can be used
-	 * 3) selection will start with transport dataType and THEN go to "*" if needed
-	 */
-	transports = {},
-
-	// Avoid comment-prolog char sequence (#10098); must appease lint and evade compression
-	allTypes = "*/".concat( "*" ),
-
-	// Document location
-	ajaxLocation = window.location.href,
-
-	// Segment location into parts
-	ajaxLocParts = rurl.exec( ajaxLocation.toLowerCase() ) || [];
-
-// Base "constructor" for jQuery.ajaxPrefilter and jQuery.ajaxTransport
-function addToPrefiltersOrTransports( structure ) {
-
-	// dataTypeExpression is optional and defaults to "*"
-	return function( dataTypeExpression, func ) {
-
-		if ( typeof dataTypeExpression !== "string" ) {
-			func = dataTypeExpression;
-			dataTypeExpression = "*";
-		}
-
-		var dataType,
-			i = 0,
-			dataTypes = dataTypeExpression.toLowerCase().match( rnotwhite ) || [];
-
-		if ( jQuery.isFunction( func ) ) {
-			// For each dataType in the dataTypeExpression
-			while ( (dataType = dataTypes[i++]) ) {
-				// Prepend if requested
-				if ( dataType[0] === "+" ) {
-					dataType = dataType.slice( 1 ) || "*";
-					(structure[ dataType ] = structure[ dataType ] || []).unshift( func );
-
-				// Otherwise append
-				} else {
-					(structure[ dataType ] = structure[ dataType ] || []).push( func );
-				}
-			}
-		}
-	};
-}
-
-// Base inspection function for prefilters and transports
-function inspectPrefiltersOrTransports( structure, options, originalOptions, jqXHR ) {
-
-	var inspected = {},
-		seekingTransport = ( structure === transports );
-
-	function inspect( dataType ) {
-		var selected;
-		inspected[ dataType ] = true;
-		jQuery.each( structure[ dataType ] || [], function( _, prefilterOrFactory ) {
-			var dataTypeOrTransport = prefilterOrFactory( options, originalOptions, jqXHR );
-			if ( typeof dataTypeOrTransport === "string" && !seekingTransport && !inspected[ dataTypeOrTransport ] ) {
-				options.dataTypes.unshift( dataTypeOrTransport );
-				inspect( dataTypeOrTransport );
-				return false;
-			} else if ( seekingTransport ) {
-				return !( selected = dataTypeOrTransport );
-			}
-		});
-		return selected;
-	}
-
-	return inspect( options.dataTypes[ 0 ] ) || !inspected[ "*" ] && inspect( "*" );
-}
-
-// A special extend for ajax options
-// that takes "flat" options (not to be deep extended)
-// Fixes #9887
-function ajaxExtend( target, src ) {
-	var key, deep,
-		flatOptions = jQuery.ajaxSettings.flatOptions || {};
-
-	for ( key in src ) {
-		if ( src[ key ] !== undefined ) {
-			( flatOptions[ key ] ? target : ( deep || (deep = {}) ) )[ key ] = src[ key ];
-		}
-	}
-	if ( deep ) {
-		jQuery.extend( true, target, deep );
-	}
-
-	return target;
-}
-
-/* Handles responses to an ajax request:
- * - finds the right dataType (mediates between content-type and expected dataType)
- * - returns the corresponding response
- */
-function ajaxHandleResponses( s, jqXHR, responses ) {
-
-	var ct, type, finalDataType, firstDataType,
-		contents = s.contents,
-		dataTypes = s.dataTypes;
-
-	// Remove auto dataType and get content-type in the process
-	while ( dataTypes[ 0 ] === "*" ) {
-		dataTypes.shift();
-		if ( ct === undefined ) {
-			ct = s.mimeType || jqXHR.getResponseHeader("Content-Type");
-		}
-	}
-
-	// Check if we're dealing with a known content-type
-	if ( ct ) {
-		for ( type in contents ) {
-			if ( contents[ type ] && contents[ type ].test( ct ) ) {
-				dataTypes.unshift( type );
-				break;
-			}
-		}
-	}
-
-	// Check to see if we have a response for the expected dataType
-	if ( dataTypes[ 0 ] in responses ) {
-		finalDataType = dataTypes[ 0 ];
-	} else {
-		// Try convertible dataTypes
-		for ( type in responses ) {
-			if ( !dataTypes[ 0 ] || s.converters[ type + " " + dataTypes[0] ] ) {
-				finalDataType = type;
-				break;
-			}
-			if ( !firstDataType ) {
-				firstDataType = type;
-			}
-		}
-		// Or just use first one
-		finalDataType = finalDataType || firstDataType;
-	}
-
-	// If we found a dataType
-	// We add the dataType to the list if needed
-	// and return the corresponding response
-	if ( finalDataType ) {
-		if ( finalDataType !== dataTypes[ 0 ] ) {
-			dataTypes.unshift( finalDataType );
-		}
-		return responses[ finalDataType ];
-	}
-}
-
-/* Chain conversions given the request and the original response
- * Also sets the responseXXX fields on the jqXHR instance
- */
-function ajaxConvert( s, response, jqXHR, isSuccess ) {
-	var conv2, current, conv, tmp, prev,
-		converters = {},
-		// Work with a copy of dataTypes in case we need to modify it for conversion
-		dataTypes = s.dataTypes.slice();
-
-	// Create converters map with lowercased keys
-	if ( dataTypes[ 1 ] ) {
-		for ( conv in s.converters ) {
-			converters[ conv.toLowerCase() ] = s.converters[ conv ];
-		}
-	}
-
-	current = dataTypes.shift();
-
-	// Convert to each sequential dataType
-	while ( current ) {
-
-		if ( s.responseFields[ current ] ) {
-			jqXHR[ s.responseFields[ current ] ] = response;
-		}
-
-		// Apply the dataFilter if provided
-		if ( !prev && isSuccess && s.dataFilter ) {
-			response = s.dataFilter( response, s.dataType );
-		}
-
-		prev = current;
-		current = dataTypes.shift();
-
-		if ( current ) {
-
-		// There's only work to do if current dataType is non-auto
-			if ( current === "*" ) {
-
-				current = prev;
-
-			// Convert response if prev dataType is non-auto and differs from current
-			} else if ( prev !== "*" && prev !== current ) {
-
-				// Seek a direct converter
-				conv = converters[ prev + " " + current ] || converters[ "* " + current ];
-
-				// If none found, seek a pair
-				if ( !conv ) {
-					for ( conv2 in converters ) {
-
-						// If conv2 outputs current
-						tmp = conv2.split( " " );
-						if ( tmp[ 1 ] === current ) {
-
-							// If prev can be converted to accepted input
-							conv = converters[ prev + " " + tmp[ 0 ] ] ||
-								converters[ "* " + tmp[ 0 ] ];
-							if ( conv ) {
-								// Condense equivalence converters
-								if ( conv === true ) {
-									conv = converters[ conv2 ];
-
-								// Otherwise, insert the intermediate dataType
-								} else if ( converters[ conv2 ] !== true ) {
-									current = tmp[ 0 ];
-									dataTypes.unshift( tmp[ 1 ] );
-								}
-								break;
-							}
-						}
-					}
-				}
-
-				// Apply converter (if not an equivalence)
-				if ( conv !== true ) {
-
-					// Unless errors are allowed to bubble, catch and return them
-					if ( conv && s[ "throws" ] ) {
-						response = conv( response );
-					} else {
-						try {
-							response = conv( response );
-						} catch ( e ) {
-							return { state: "parsererror", error: conv ? e : "No conversion from " + prev + " to " + current };
-						}
-					}
-				}
-			}
-		}
-	}
-
-	return { state: "success", data: response };
-}
-
-jQuery.extend({
-
-	// Counter for holding the number of active queries
-	active: 0,
-
-	// Last-Modified header cache for next request
-	lastModified: {},
-	etag: {},
-
-	ajaxSettings: {
-		url: ajaxLocation,
-		type: "GET",
-		isLocal: rlocalProtocol.test( ajaxLocParts[ 1 ] ),
-		global: true,
-		processData: true,
-		async: true,
-		contentType: "application/x-www-form-urlencoded; charset=UTF-8",
-		/*
-		timeout: 0,
-		data: null,
-		dataType: null,
-		username: null,
-		password: null,
-		cache: null,
-		throws: false,
-		traditional: false,
-		headers: {},
-		*/
-
-		accepts: {
-			"*": allTypes,
-			text: "text/plain",
-			html: "text/html",
-			xml: "application/xml, text/xml",
-			json: "application/json, text/javascript"
-		},
-
-		contents: {
-			xml: /xml/,
-			html: /html/,
-			json: /json/
-		},
-
-		responseFields: {
-			xml: "responseXML",
-			text: "responseText",
-			json: "responseJSON"
-		},
-
-		// Data converters
-		// Keys separate source (or catchall "*") and destination types with a single space
-		converters: {
-
-			// Convert anything to text
-			"* text": String,
-
-			// Text to html (true = no transformation)
-			"text html": true,
-
-			// Evaluate text as a json expression
-			"text json": jQuery.parseJSON,
-
-			// Parse text as xml
-			"text xml": jQuery.parseXML
-		},
-
-		// For options that shouldn't be deep extended:
-		// you can add your own custom options here if
-		// and when you create one that shouldn't be
-		// deep extended (see ajaxExtend)
-		flatOptions: {
-			url: true,
-			context: true
-		}
-	},
-
-	// Creates a full fledged settings object into target
-	// with both ajaxSettings and settings fields.
-	// If target is omitted, writes into ajaxSettings.
-	ajaxSetup: function( target, settings ) {
-		return settings ?
-
-			// Building a settings object
-			ajaxExtend( ajaxExtend( target, jQuery.ajaxSettings ), settings ) :
-
-			// Extending ajaxSettings
-			ajaxExtend( jQuery.ajaxSettings, target );
-	},
-
-	ajaxPrefilter: addToPrefiltersOrTransports( prefilters ),
-	ajaxTransport: addToPrefiltersOrTransports( transports ),
-
-	// Main method
-	ajax: function( url, options ) {
-
-		// If url is an object, simulate pre-1.5 signature
-		if ( typeof url === "object" ) {
-			options = url;
-			url = undefined;
-		}
-
-		// Force options to be an object
-		options = options || {};
-
-		var transport,
-			// URL without anti-cache param
-			cacheURL,
-			// Response headers
-			responseHeadersString,
-			responseHeaders,
-			// timeout handle
-			timeoutTimer,
-			// Cross-domain detection vars
-			parts,
-			// To know if global events are to be dispatched
-			fireGlobals,
-			// Loop variable
-			i,
-			// Create the final options object
-			s = jQuery.ajaxSetup( {}, options ),
-			// Callbacks context
-			callbackContext = s.context || s,
-			// Context for global events is callbackContext if it is a DOM node or jQuery collection
-			globalEventContext = s.context && ( callbackContext.nodeType || callbackContext.jquery ) ?
-				jQuery( callbackContext ) :
-				jQuery.event,
-			// Deferreds
-			deferred = jQuery.Deferred(),
-			completeDeferred = jQuery.Callbacks("once memory"),
-			// Status-dependent callbacks
-			statusCode = s.statusCode || {},
-			// Headers (they are sent all at once)
-			requestHeaders = {},
-			requestHeadersNames = {},
-			// The jqXHR state
-			state = 0,
-			// Default abort message
-			strAbort = "canceled",
-			// Fake xhr
-			jqXHR = {
-				readyState: 0,
-
-				// Builds headers hashtable if needed
-				getResponseHeader: function( key ) {
-					var match;
-					if ( state === 2 ) {
-						if ( !responseHeaders ) {
-							responseHeaders = {};
-							while ( (match = rheaders.exec( responseHeadersString )) ) {
-								responseHeaders[ match[1].toLowerCase() ] = match[ 2 ];
-							}
-						}
-						match = responseHeaders[ key.toLowerCase() ];
-					}
-					return match == null ? null : match;
-				},
-
-				// Raw string
-				getAllResponseHeaders: function() {
-					return state === 2 ? responseHeadersString : null;
-				},
-
-				// Caches the header
-				setRequestHeader: function( name, value ) {
-					var lname = name.toLowerCase();
-					if ( !state ) {
-						name = requestHeadersNames[ lname ] = requestHeadersNames[ lname ] || name;
-						requestHeaders[ name ] = value;
-					}
-					return this;
-				},
-
-				// Overrides response content-type header
-				overrideMimeType: function( type ) {
-					if ( !state ) {
-						s.mimeType = type;
-					}
-					return this;
-				},
-
-				// Status-dependent callbacks
-				statusCode: function( map ) {
-					var code;
-					if ( map ) {
-						if ( state < 2 ) {
-							for ( code in map ) {
-								// Lazy-add the new callback in a way that preserves old ones
-								statusCode[ code ] = [ statusCode[ code ], map[ code ] ];
-							}
-						} else {
-							// Execute the appropriate callbacks
-							jqXHR.always( map[ jqXHR.status ] );
-						}
-					}
-					return this;
-				},
-
-				// Cancel the request
-				abort: function( statusText ) {
-					var finalText = statusText || strAbort;
-					if ( transport ) {
-						transport.abort( finalText );
-					}
-					done( 0, finalText );
-					return this;
-				}
-			};
-
-		// Attach deferreds
-		deferred.promise( jqXHR ).complete = completeDeferred.add;
-		jqXHR.success = jqXHR.done;
-		jqXHR.error = jqXHR.fail;
-
-		// Remove hash character (#7531: and string promotion)
-		// Add protocol if not provided (prefilters might expect it)
-		// Handle falsy url in the settings object (#10093: consistency with old signature)
-		// We also use the url parameter if available
-		s.url = ( ( url || s.url || ajaxLocation ) + "" ).replace( rhash, "" )
-			.replace( rprotocol, ajaxLocParts[ 1 ] + "//" );
-
-		// Alias method option to type as per ticket #12004
-		s.type = options.method || options.type || s.method || s.type;
-
-		// Extract dataTypes list
-		s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().match( rnotwhite ) || [ "" ];
-
-		// A cross-domain request is in order when we have a protocol:host:port mismatch
-		if ( s.crossDomain == null ) {
-			parts = rurl.exec( s.url.toLowerCase() );
-			s.crossDomain = !!( parts &&
-				( parts[ 1 ] !== ajaxLocParts[ 1 ] || parts[ 2 ] !== ajaxLocParts[ 2 ] ||
-					( parts[ 3 ] || ( parts[ 1 ] === "http:" ? "80" : "443" ) ) !==
-						( ajaxLocParts[ 3 ] || ( ajaxLocParts[ 1 ] === "http:" ? "80" : "443" ) ) )
-			);
-		}
-
-		// Convert data if not already a string
-		if ( s.data && s.processData && typeof s.data !== "string" ) {
-			s.data = jQuery.param( s.data, s.traditional );
-		}
-
-		// Apply prefilters
-		inspectPrefiltersOrTransports( prefilters, s, options, jqXHR );
-
-		// If request was aborted inside a prefilter, stop there
-		if ( state === 2 ) {
-			return jqXHR;
-		}
-
-		// We can fire global events as of now if asked to
-		// Don't fire events if jQuery.event is undefined in an AMD-usage scenario (#15118)
-		fireGlobals = jQuery.event && s.global;
-
-		// Watch for a new set of requests
-		if ( fireGlobals && jQuery.active++ === 0 ) {
-			jQuery.event.trigger("ajaxStart");
-		}
-
-		// Uppercase the type
-		s.type = s.type.toUpperCase();
-
-		// Determine if request has content
-		s.hasContent = !rnoContent.test( s.type );
-
-		// Save the URL in case we're toying with the If-Modified-Since
-		// and/or If-None-Match header later on
-		cacheURL = s.url;
-
-		// More options handling for requests with no content
-		if ( !s.hasContent ) {
-
-			// If data is available, append data to url
-			if ( s.data ) {
-				cacheURL = ( s.url += ( rquery.test( cacheURL ) ? "&" : "?" ) + s.data );
-				// #9682: remove data so that it's not used in an eventual retry
-				delete s.data;
-			}
-
-			// Add anti-cache in url if needed
-			if ( s.cache === false ) {
-				s.url = rts.test( cacheURL ) ?
-
-					// If there is already a '_' parameter, set its value
-					cacheURL.replace( rts, "$1_=" + nonce++ ) :
-
-					// Otherwise add one to the end
-					cacheURL + ( rquery.test( cacheURL ) ? "&" : "?" ) + "_=" + nonce++;
-			}
-		}
-
-		// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
-		if ( s.ifModified ) {
-			if ( jQuery.lastModified[ cacheURL ] ) {
-				jqXHR.setRequestHeader( "If-Modified-Since", jQuery.lastModified[ cacheURL ] );
-			}
-			if ( jQuery.etag[ cacheURL ] ) {
-				jqXHR.setRequestHeader( "If-None-Match", jQuery.etag[ cacheURL ] );
-			}
-		}
-
-		// Set the correct header, if data is being sent
-		if ( s.data && s.hasContent && s.contentType !== false || options.contentType ) {
-			jqXHR.setRequestHeader( "Content-Type", s.contentType );
-		}
-
-		// Set the Accepts header for the server, depending on the dataType
-		jqXHR.setRequestHeader(
-			"Accept",
-			s.dataTypes[ 0 ] && s.accepts[ s.dataTypes[0] ] ?
-				s.accepts[ s.dataTypes[0] ] + ( s.dataTypes[ 0 ] !== "*" ? ", " + allTypes + "; q=0.01" : "" ) :
-				s.accepts[ "*" ]
-		);
-
-		// Check for headers option
-		for ( i in s.headers ) {
-			jqXHR.setRequestHeader( i, s.headers[ i ] );
-		}
-
-		// Allow custom headers/mimetypes and early abort
-		if ( s.beforeSend && ( s.beforeSend.call( callbackContext, jqXHR, s ) === false || state === 2 ) ) {
-			// Abort if not done already and return
-			return jqXHR.abort();
-		}
-
-		// Aborting is no longer a cancellation
-		strAbort = "abort";
-
-		// Install callbacks on deferreds
-		for ( i in { success: 1, error: 1, complete: 1 } ) {
-			jqXHR[ i ]( s[ i ] );
-		}
-
-		// Get transport
-		transport = inspectPrefiltersOrTransports( transports, s, options, jqXHR );
-
-		// If no transport, we auto-abort
-		if ( !transport ) {
-			done( -1, "No Transport" );
-		} else {
-			jqXHR.readyState = 1;
-
-			// Send global event
-			if ( fireGlobals ) {
-				globalEventContext.trigger( "ajaxSend", [ jqXHR, s ] );
-			}
-			// Timeout
-			if ( s.async && s.timeout > 0 ) {
-				timeoutTimer = setTimeout(function() {
-					jqXHR.abort("timeout");
-				}, s.timeout );
-			}
-
-			try {
-				state = 1;
-				transport.send( requestHeaders, done );
-			} catch ( e ) {
-				// Propagate exception as error if not done
-				if ( state < 2 ) {
-					done( -1, e );
-				// Simply rethrow otherwise
-				} else {
-					throw e;
-				}
-			}
-		}
-
-		// Callback for when everything is done
-		function done( status, nativeStatusText, responses, headers ) {
-			var isSuccess, success, error, response, modified,
-				statusText = nativeStatusText;
-
-			// Called once
-			if ( state === 2 ) {
-				return;
-			}
-
-			// State is "done" now
-			state = 2;
-
-			// Clear timeout if it exists
-			if ( timeoutTimer ) {
-				clearTimeout( timeoutTimer );
-			}
-
-			// Dereference transport for early garbage collection
-			// (no matter how long the jqXHR object will be used)
-			transport = undefined;
-
-			// Cache response headers
-			responseHeadersString = headers || "";
-
-			// Set readyState
-			jqXHR.readyState = status > 0 ? 4 : 0;
-
-			// Determine if successful
-			isSuccess = status >= 200 && status < 300 || status === 304;
-
-			// Get response data
-			if ( responses ) {
-				response = ajaxHandleResponses( s, jqXHR, responses );
-			}
-
-			// Convert no matter what (that way responseXXX fields are always set)
-			response = ajaxConvert( s, response, jqXHR, isSuccess );
-
-			// If successful, handle type chaining
-			if ( isSuccess ) {
-
-				// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
-				if ( s.ifModified ) {
-					modified = jqXHR.getResponseHeader("Last-Modified");
-					if ( modified ) {
-						jQuery.lastModified[ cacheURL ] = modified;
-					}
-					modified = jqXHR.getResponseHeader("etag");
-					if ( modified ) {
-						jQuery.etag[ cacheURL ] = modified;
-					}
-				}
-
-				// if no content
-				if ( status === 204 || s.type === "HEAD" ) {
-					statusText = "nocontent";
-
-				// if not modified
-				} else if ( status === 304 ) {
-					statusText = "notmodified";
-
-				// If we have data, let's convert it
-				} else {
-					statusText = response.state;
-					success = response.data;
-					error = response.error;
-					isSuccess = !error;
-				}
-			} else {
-				// Extract error from statusText and normalize for non-aborts
-				error = statusText;
-				if ( status || !statusText ) {
-					statusText = "error";
-					if ( status < 0 ) {
-						status = 0;
-					}
-				}
-			}
-
-			// Set data for the fake xhr object
-			jqXHR.status = status;
-			jqXHR.statusText = ( nativeStatusText || statusText ) + "";
-
-			// Success/Error
-			if ( isSuccess ) {
-				deferred.resolveWith( callbackContext, [ success, statusText, jqXHR ] );
-			} else {
-				deferred.rejectWith( callbackContext, [ jqXHR, statusText, error ] );
-			}
-
-			// Status-dependent callbacks
-			jqXHR.statusCode( statusCode );
-			statusCode = undefined;
-
-			if ( fireGlobals ) {
-				globalEventContext.trigger( isSuccess ? "ajaxSuccess" : "ajaxError",
-					[ jqXHR, s, isSuccess ? success : error ] );
-			}
-
-			// Complete
-			completeDeferred.fireWith( callbackContext, [ jqXHR, statusText ] );
-
-			if ( fireGlobals ) {
-				globalEventContext.trigger( "ajaxComplete", [ jqXHR, s ] );
-				// Handle the global AJAX counter
-				if ( !( --jQuery.active ) ) {
-					jQuery.event.trigger("ajaxStop");
-				}
-			}
-		}
-
-		return jqXHR;
-	},
-
-	getJSON: function( url, data, callback ) {
-		return jQuery.get( url, data, callback, "json" );
-	},
-
-	getScript: function( url, callback ) {
-		return jQuery.get( url, undefined, callback, "script" );
-	}
-});
-
-jQuery.each( [ "get", "post" ], function( i, method ) {
-	jQuery[ method ] = function( url, data, callback, type ) {
-		// Shift arguments if data argument was omitted
-		if ( jQuery.isFunction( data ) ) {
-			type = type || callback;
-			callback = data;
-			data = undefined;
-		}
-
-		return jQuery.ajax({
-			url: url,
-			type: method,
-			dataType: type,
-			data: data,
-			success: callback
-		});
-	};
-});
-
-return jQuery;
-});
diff --git a/#pma/js/jquery/src/jquery/ajax/jsonp.js b/#pma/js/jquery/src/jquery/ajax/jsonp.js
deleted file mode 100644
index ff0d5389..00000000
--- a/#pma/js/jquery/src/jquery/ajax/jsonp.js
+++ /dev/null
@@ -1,89 +0,0 @@
-define([
-	"../core",
-	"./var/nonce",
-	"./var/rquery",
-	"../ajax"
-], function( jQuery, nonce, rquery ) {
-
-var oldCallbacks = [],
-	rjsonp = /(=)\?(?=&|$)|\?\?/;
-
-// Default jsonp settings
-jQuery.ajaxSetup({
-	jsonp: "callback",
-	jsonpCallback: function() {
-		var callback = oldCallbacks.pop() || ( jQuery.expando + "_" + ( nonce++ ) );
-		this[ callback ] = true;
-		return callback;
-	}
-});
-
-// Detect, normalize options and install callbacks for jsonp requests
-jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
-
-	var callbackName, overwritten, responseContainer,
-		jsonProp = s.jsonp !== false && ( rjsonp.test( s.url ) ?
-			"url" :
-			typeof s.data === "string" && !( s.contentType || "" ).indexOf("application/x-www-form-urlencoded") && rjsonp.test( s.data ) && "data"
-		);
-
-	// Handle iff the expected data type is "jsonp" or we have a parameter to set
-	if ( jsonProp || s.dataTypes[ 0 ] === "jsonp" ) {
-
-		// Get callback name, remembering preexisting value associated with it
-		callbackName = s.jsonpCallback = jQuery.isFunction( s.jsonpCallback ) ?
-			s.jsonpCallback() :
-			s.jsonpCallback;
-
-		// Insert callback into url or form data
-		if ( jsonProp ) {
-			s[ jsonProp ] = s[ jsonProp ].replace( rjsonp, "$1" + callbackName );
-		} else if ( s.jsonp !== false ) {
-			s.url += ( rquery.test( s.url ) ? "&" : "?" ) + s.jsonp + "=" + callbackName;
-		}
-
-		// Use data converter to retrieve json after script execution
-		s.converters["script json"] = function() {
-			if ( !responseContainer ) {
-				jQuery.error( callbackName + " was not called" );
-			}
-			return responseContainer[ 0 ];
-		};
-
-		// force json dataType
-		s.dataTypes[ 0 ] = "json";
-
-		// Install callback
-		overwritten = window[ callbackName ];
-		window[ callbackName ] = function() {
-			responseContainer = arguments;
-		};
-
-		// Clean-up function (fires after converters)
-		jqXHR.always(function() {
-			// Restore preexisting value
-			window[ callbackName ] = overwritten;
-
-			// Save back as free
-			if ( s[ callbackName ] ) {
-				// make sure that re-using the options doesn't screw things around
-				s.jsonpCallback = originalSettings.jsonpCallback;
-
-				// save the callback name for future use
-				oldCallbacks.push( callbackName );
-			}
-
-			// Call if it was a function and we have a response
-			if ( responseContainer && jQuery.isFunction( overwritten ) ) {
-				overwritten( responseContainer[ 0 ] );
-			}
-
-			responseContainer = overwritten = undefined;
-		});
-
-		// Delegate to script
-		return "script";
-	}
-});
-
-});
diff --git a/#pma/js/jquery/src/jquery/ajax/load.js b/#pma/js/jquery/src/jquery/ajax/load.js
deleted file mode 100644
index bff25b1a..00000000
--- a/#pma/js/jquery/src/jquery/ajax/load.js
+++ /dev/null
@@ -1,75 +0,0 @@
-define([
-	"../core",
-	"../core/parseHTML",
-	"../ajax",
-	"../traversing",
-	"../manipulation",
-	"../selector",
-	// Optional event/alias dependency
-	"../event/alias"
-], function( jQuery ) {
-
-// Keep a copy of the old load method
-var _load = jQuery.fn.load;
-
-/**
- * Load a url into a page
- */
-jQuery.fn.load = function( url, params, callback ) {
-	if ( typeof url !== "string" && _load ) {
-		return _load.apply( this, arguments );
-	}
-
-	var selector, type, response,
-		self = this,
-		off = url.indexOf(" ");
-
-	if ( off >= 0 ) {
-		selector = jQuery.trim( url.slice( off ) );
-		url = url.slice( 0, off );
-	}
-
-	// If it's a function
-	if ( jQuery.isFunction( params ) ) {
-
-		// We assume that it's the callback
-		callback = params;
-		params = undefined;
-
-	// Otherwise, build a param string
-	} else if ( params && typeof params === "object" ) {
-		type = "POST";
-	}
-
-	// If we have elements to modify, make the request
-	if ( self.length > 0 ) {
-		jQuery.ajax({
-			url: url,
-
-			// if "type" variable is undefined, then "GET" method will be used
-			type: type,
-			dataType: "html",
-			data: params
-		}).done(function( responseText ) {
-
-			// Save response for use in complete callback
-			response = arguments;
-
-			self.html( selector ?
-
-				// If a selector was specified, locate the right elements in a dummy div
-				// Exclude scripts to avoid IE 'Permission Denied' errors
-				jQuery("<div>").append( jQuery.parseHTML( responseText ) ).find( selector ) :
-
-				// Otherwise use the full result
-				responseText );
-
-		}).complete( callback && function( jqXHR, status ) {
-			self.each( callback, response || [ jqXHR.responseText, status, jqXHR ] );
-		});
-	}
-
-	return this;
-};
-
-});
diff --git a/#pma/js/jquery/src/jquery/ajax/parseJSON.js b/#pma/js/jquery/src/jquery/ajax/parseJSON.js
deleted file mode 100644
index 3a96d15b..00000000
--- a/#pma/js/jquery/src/jquery/ajax/parseJSON.js
+++ /dev/null
@@ -1,13 +0,0 @@
-define([
-	"../core"
-], function( jQuery ) {
-
-// Support: Android 2.3
-// Workaround failure to string-cast null input
-jQuery.parseJSON = function( data ) {
-	return JSON.parse( data + "" );
-};
-
-return jQuery.parseJSON;
-
-});
diff --git a/#pma/js/jquery/src/jquery/ajax/parseXML.js b/#pma/js/jquery/src/jquery/ajax/parseXML.js
deleted file mode 100644
index 9eeb625f..00000000
--- a/#pma/js/jquery/src/jquery/ajax/parseXML.js
+++ /dev/null
@@ -1,28 +0,0 @@
-define([
-	"../core"
-], function( jQuery ) {
-
-// Cross-browser xml parsing
-jQuery.parseXML = function( data ) {
-	var xml, tmp;
-	if ( !data || typeof data !== "string" ) {
-		return null;
-	}
-
-	// Support: IE9
-	try {
-		tmp = new DOMParser();
-		xml = tmp.parseFromString( data, "text/xml" );
-	} catch ( e ) {
-		xml = undefined;
-	}
-
-	if ( !xml || xml.getElementsByTagName( "parsererror" ).length ) {
-		jQuery.error( "Invalid XML: " + data );
-	}
-	return xml;
-};
-
-return jQuery.parseXML;
-
-});
diff --git a/#pma/js/jquery/src/jquery/ajax/script.js b/#pma/js/jquery/src/jquery/ajax/script.js
deleted file mode 100644
index f44329d4..00000000
--- a/#pma/js/jquery/src/jquery/ajax/script.js
+++ /dev/null
@@ -1,64 +0,0 @@
-define([
-	"../core",
-	"../ajax"
-], function( jQuery ) {
-
-// Install script dataType
-jQuery.ajaxSetup({
-	accepts: {
-		script: "text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"
-	},
-	contents: {
-		script: /(?:java|ecma)script/
-	},
-	converters: {
-		"text script": function( text ) {
-			jQuery.globalEval( text );
-			return text;
-		}
-	}
-});
-
-// Handle cache's special case and crossDomain
-jQuery.ajaxPrefilter( "script", function( s ) {
-	if ( s.cache === undefined ) {
-		s.cache = false;
-	}
-	if ( s.crossDomain ) {
-		s.type = "GET";
-	}
-});
-
-// Bind script tag hack transport
-jQuery.ajaxTransport( "script", function( s ) {
-	// This transport only deals with cross domain requests
-	if ( s.crossDomain ) {
-		var script, callback;
-		return {
-			send: function( _, complete ) {
-				script = jQuery("<script>").prop({
-					async: true,
-					charset: s.scriptCharset,
-					src: s.url
-				}).on(
-					"load error",
-					callback = function( evt ) {
-						script.remove();
-						callback = null;
-						if ( evt ) {
-							complete( evt.type === "error" ? 404 : 200, evt.type );
-						}
-					}
-				);
-				document.head.appendChild( script[ 0 ] );
-			},
-			abort: function() {
-				if ( callback ) {
-					callback();
-				}
-			}
-		};
-	}
-});
-
-});
diff --git a/#pma/js/jquery/src/jquery/ajax/var/nonce.js b/#pma/js/jquery/src/jquery/ajax/var/nonce.js
deleted file mode 100644
index 0871aae8..00000000
--- a/#pma/js/jquery/src/jquery/ajax/var/nonce.js
+++ /dev/null
@@ -1,5 +0,0 @@
-define([
-	"../../core"
-], function( jQuery ) {
-	return jQuery.now();
-});
diff --git a/#pma/js/jquery/src/jquery/ajax/var/rquery.js b/#pma/js/jquery/src/jquery/ajax/var/rquery.js
deleted file mode 100644
index 500a77a0..00000000
--- a/#pma/js/jquery/src/jquery/ajax/var/rquery.js
+++ /dev/null
@@ -1,3 +0,0 @@
-define(function() {
-	return (/\?/);
-});
diff --git a/#pma/js/jquery/src/jquery/ajax/xhr.js b/#pma/js/jquery/src/jquery/ajax/xhr.js
deleted file mode 100644
index c2b43c92..00000000
--- a/#pma/js/jquery/src/jquery/ajax/xhr.js
+++ /dev/null
@@ -1,136 +0,0 @@
-define([
-	"../core",
-	"../var/support",
-	"../ajax"
-], function( jQuery, support ) {
-
-jQuery.ajaxSettings.xhr = function() {
-	try {
-		return new XMLHttpRequest();
-	} catch( e ) {}
-};
-
-var xhrId = 0,
-	xhrCallbacks = {},
-	xhrSuccessStatus = {
-		// file protocol always yields status code 0, assume 200
-		0: 200,
-		// Support: IE9
-		// #1450: sometimes IE returns 1223 when it should be 204
-		1223: 204
-	},
-	xhrSupported = jQuery.ajaxSettings.xhr();
-
-// Support: IE9
-// Open requests must be manually aborted on unload (#5280)
-// See https://support.microsoft.com/kb/2856746 for more info
-if ( window.attachEvent ) {
-	window.attachEvent( "onunload", function() {
-		for ( var key in xhrCallbacks ) {
-			xhrCallbacks[ key ]();
-		}
-	});
-}
-
-support.cors = !!xhrSupported && ( "withCredentials" in xhrSupported );
-support.ajax = xhrSupported = !!xhrSupported;
-
-jQuery.ajaxTransport(function( options ) {
-	var callback;
-
-	// Cross domain only allowed if supported through XMLHttpRequest
-	if ( support.cors || xhrSupported && !options.crossDomain ) {
-		return {
-			send: function( headers, complete ) {
-				var i,
-					xhr = options.xhr(),
-					id = ++xhrId;
-
-				xhr.open( options.type, options.url, options.async, options.username, options.password );
-
-				// Apply custom fields if provided
-				if ( options.xhrFields ) {
-					for ( i in options.xhrFields ) {
-						xhr[ i ] = options.xhrFields[ i ];
-					}
-				}
-
-				// Override mime type if needed
-				if ( options.mimeType && xhr.overrideMimeType ) {
-					xhr.overrideMimeType( options.mimeType );
-				}
-
-				// X-Requested-With header
-				// For cross-domain requests, seeing as conditions for a preflight are
-				// akin to a jigsaw puzzle, we simply never set it to be sure.
-				// (it can always be set on a per-request basis or even using ajaxSetup)
-				// For same-domain requests, won't change header if already provided.
-				if ( !options.crossDomain && !headers["X-Requested-With"] ) {
-					headers["X-Requested-With"] = "XMLHttpRequest";
-				}
-
-				// Set headers
-				for ( i in headers ) {
-					xhr.setRequestHeader( i, headers[ i ] );
-				}
-
-				// Callback
-				callback = function( type ) {
-					return function() {
-						if ( callback ) {
-							delete xhrCallbacks[ id ];
-							callback = xhr.onload = xhr.onerror = null;
-
-							if ( type === "abort" ) {
-								xhr.abort();
-							} else if ( type === "error" ) {
-								complete(
-									// file: protocol always yields status 0; see #8605, #14207
-									xhr.status,
-									xhr.statusText
-								);
-							} else {
-								complete(
-									xhrSuccessStatus[ xhr.status ] || xhr.status,
-									xhr.statusText,
-									// Support: IE9
-									// Accessing binary-data responseText throws an exception
-									// (#11426)
-									typeof xhr.responseText === "string" ? {
-										text: xhr.responseText
-									} : undefined,
-									xhr.getAllResponseHeaders()
-								);
-							}
-						}
-					};
-				};
-
-				// Listen to events
-				xhr.onload = callback();
-				xhr.onerror = callback("error");
-
-				// Create the abort callback
-				callback = xhrCallbacks[ id ] = callback("abort");
-
-				try {
-					// Do send the request (this may raise an exception)
-					xhr.send( options.hasContent && options.data || null );
-				} catch ( e ) {
-					// #14683: Only rethrow if this hasn't been notified as an error yet
-					if ( callback ) {
-						throw e;
-					}
-				}
-			},
-
-			abort: function() {
-				if ( callback ) {
-					callback();
-				}
-			}
-		};
-	}
-});
-
-});
diff --git a/#pma/js/jquery/src/jquery/attributes.js b/#pma/js/jquery/src/jquery/attributes.js
deleted file mode 100644
index fa2ef1ed..00000000
--- a/#pma/js/jquery/src/jquery/attributes.js
+++ /dev/null
@@ -1,11 +0,0 @@
-define([
-	"./core",
-	"./attributes/attr",
-	"./attributes/prop",
-	"./attributes/classes",
-	"./attributes/val"
-], function( jQuery ) {
-
-// Return jQuery for attributes-only inclusion
-return jQuery;
-});
diff --git a/#pma/js/jquery/src/jquery/attributes/attr.js b/#pma/js/jquery/src/jquery/attributes/attr.js
deleted file mode 100644
index a4414d11..00000000
--- a/#pma/js/jquery/src/jquery/attributes/attr.js
+++ /dev/null
@@ -1,141 +0,0 @@
-define([
-	"../core",
-	"../var/rnotwhite",
-	"../var/strundefined",
-	"../core/access",
-	"./support",
-	"../selector"
-], function( jQuery, rnotwhite, strundefined, access, support ) {
-
-var nodeHook, boolHook,
-	attrHandle = jQuery.expr.attrHandle;
-
-jQuery.fn.extend({
-	attr: function( name, value ) {
-		return access( this, jQuery.attr, name, value, arguments.length > 1 );
-	},
-
-	removeAttr: function( name ) {
-		return this.each(function() {
-			jQuery.removeAttr( this, name );
-		});
-	}
-});
-
-jQuery.extend({
-	attr: function( elem, name, value ) {
-		var hooks, ret,
-			nType = elem.nodeType;
-
-		// don't get/set attributes on text, comment and attribute nodes
-		if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
-			return;
-		}
-
-		// Fallback to prop when attributes are not supported
-		if ( typeof elem.getAttribute === strundefined ) {
-			return jQuery.prop( elem, name, value );
-		}
-
-		// All attributes are lowercase
-		// Grab necessary hook if one is defined
-		if ( nType !== 1 || !jQuery.isXMLDoc( elem ) ) {
-			name = name.toLowerCase();
-			hooks = jQuery.attrHooks[ name ] ||
-				( jQuery.expr.match.bool.test( name ) ? boolHook : nodeHook );
-		}
-
-		if ( value !== undefined ) {
-
-			if ( value === null ) {
-				jQuery.removeAttr( elem, name );
-
-			} else if ( hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ) {
-				return ret;
-
-			} else {
-				elem.setAttribute( name, value + "" );
-				return value;
-			}
-
-		} else if ( hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ) {
-			return ret;
-
-		} else {
-			ret = jQuery.find.attr( elem, name );
-
-			// Non-existent attributes return null, we normalize to undefined
-			return ret == null ?
-				undefined :
-				ret;
-		}
-	},
-
-	removeAttr: function( elem, value ) {
-		var name, propName,
-			i = 0,
-			attrNames = value && value.match( rnotwhite );
-
-		if ( attrNames && elem.nodeType === 1 ) {
-			while ( (name = attrNames[i++]) ) {
-				propName = jQuery.propFix[ name ] || name;
-
-				// Boolean attributes get special treatment (#10870)
-				if ( jQuery.expr.match.bool.test( name ) ) {
-					// Set corresponding property to false
-					elem[ propName ] = false;
-				}
-
-				elem.removeAttribute( name );
-			}
-		}
-	},
-
-	attrHooks: {
-		type: {
-			set: function( elem, value ) {
-				if ( !support.radioValue && value === "radio" &&
-					jQuery.nodeName( elem, "input" ) ) {
-					var val = elem.value;
-					elem.setAttribute( "type", value );
-					if ( val ) {
-						elem.value = val;
-					}
-					return value;
-				}
-			}
-		}
-	}
-});
-
-// Hooks for boolean attributes
-boolHook = {
-	set: function( elem, value, name ) {
-		if ( value === false ) {
-			// Remove boolean attributes when set to false
-			jQuery.removeAttr( elem, name );
-		} else {
-			elem.setAttribute( name, name );
-		}
-		return name;
-	}
-};
-jQuery.each( jQuery.expr.match.bool.source.match( /\w+/g ), function( i, name ) {
-	var getter = attrHandle[ name ] || jQuery.find.attr;
-
-	attrHandle[ name ] = function( elem, name, isXML ) {
-		var ret, handle;
-		if ( !isXML ) {
-			// Avoid an infinite loop by temporarily removing this function from the getter
-			handle = attrHandle[ name ];
-			attrHandle[ name ] = ret;
-			ret = getter( elem, name, isXML ) != null ?
-				name.toLowerCase() :
-				null;
-			attrHandle[ name ] = handle;
-		}
-		return ret;
-	};
-});
-
-});
diff --git a/#pma/js/jquery/src/jquery/attributes/classes.js b/#pma/js/jquery/src/jquery/attributes/classes.js
deleted file mode 100644
index 10113841..00000000
--- a/#pma/js/jquery/src/jquery/attributes/classes.js
+++ /dev/null
@@ -1,158 +0,0 @@
-define([
-	"../core",
-	"../var/rnotwhite",
-	"../var/strundefined",
-	"../data/var/data_priv",
-	"../core/init"
-], function( jQuery, rnotwhite, strundefined, data_priv ) {
-
-var rclass = /[\t\r\n\f]/g;
-
-jQuery.fn.extend({
-	addClass: function( value ) {
-		var classes, elem, cur, clazz, j, finalValue,
-			proceed = typeof value === "string" && value,
-			i = 0,
-			len = this.length;
-
-		if ( jQuery.isFunction( value ) ) {
-			return this.each(function( j ) {
-				jQuery( this ).addClass( value.call( this, j, this.className ) );
-			});
-		}
-
-		if ( proceed ) {
-			// The disjunction here is for better compressibility (see removeClass)
-			classes = ( value || "" ).match( rnotwhite ) || [];
-
-			for ( ; i < len; i++ ) {
-				elem = this[ i ];
-				cur = elem.nodeType === 1 && ( elem.className ?
-					( " " + elem.className + " " ).replace( rclass, " " ) :
-					" "
-				);
-
-				if ( cur ) {
-					j = 0;
-					while ( (clazz = classes[j++]) ) {
-						if ( cur.indexOf( " " + clazz + " " ) < 0 ) {
-							cur += clazz + " ";
-						}
-					}
-
-					// only assign if different to avoid unneeded rendering.
-					finalValue = jQuery.trim( cur );
-					if ( elem.className !== finalValue ) {
-						elem.className = finalValue;
-					}
-				}
-			}
-		}
-
-		return this;
-	},
-
-	removeClass: function( value ) {
-		var classes, elem, cur, clazz, j, finalValue,
-			proceed = arguments.length === 0 || typeof value === "string" && value,
-			i = 0,
-			len = this.length;
-
-		if ( jQuery.isFunction( value ) ) {
-			return this.each(function( j ) {
-				jQuery( this ).removeClass( value.call( this, j, this.className ) );
-			});
-		}
-		if ( proceed ) {
-			classes = ( value || "" ).match( rnotwhite ) || [];
-
-			for ( ; i < len; i++ ) {
-				elem = this[ i ];
-				// This expression is here for better compressibility (see addClass)
-				cur = elem.nodeType === 1 && ( elem.className ?
-					( " " + elem.className + " " ).replace( rclass, " " ) :
-					""
-				);
-
-				if ( cur ) {
-					j = 0;
-					while ( (clazz = classes[j++]) ) {
-						// Remove *all* instances
-						while ( cur.indexOf( " " + clazz + " " ) >= 0 ) {
-							cur = cur.replace( " " + clazz + " ", " " );
-						}
-					}
-
-					// Only assign if different to avoid unneeded rendering.
-					finalValue = value ? jQuery.trim( cur ) : "";
-					if ( elem.className !== finalValue ) {
-						elem.className = finalValue;
-					}
-				}
-			}
-		}
-
-		return this;
-	},
-
-	toggleClass: function( value, stateVal ) {
-		var type = typeof value;
-
-		if ( typeof stateVal === "boolean" && type === "string" ) {
-			return stateVal ? this.addClass( value ) : this.removeClass( value );
-		}
-
-		if ( jQuery.isFunction( value ) ) {
-			return this.each(function( i ) {
-				jQuery( this ).toggleClass( value.call(this, i, this.className, stateVal), stateVal );
-			});
-		}
-
-		return this.each(function() {
-			if ( type === "string" ) {
-				// Toggle individual class names
-				var className,
-					i = 0,
-					self = jQuery( this ),
-					classNames = value.match( rnotwhite ) || [];
-
-				while ( (className = classNames[ i++ ]) ) {
-					// Check each className given, space separated list
-					if ( self.hasClass( className ) ) {
-						self.removeClass( className );
-					} else {
-						self.addClass( className );
-					}
-				}
-
-			// Toggle whole class name
-			} else if ( type === strundefined || type === "boolean" ) {
-				if ( this.className ) {
-					// store className if set
-					data_priv.set( this, "__className__", this.className );
-				}
-
-				// If the element has a class name or if we're passed `false`,
-				// then remove the whole classname (if there was one, the above saved it).
-				// Otherwise bring back whatever was previously saved (if anything),
-				// falling back to the empty string if nothing was stored.
-				this.className = this.className || value === false ? "" : data_priv.get( this, "__className__" ) || "";
-			}
-		});
-	},
-
-	hasClass: function( selector ) {
-		var className = " " + selector + " ",
-			i = 0,
-			l = this.length;
-		for ( ; i < l; i++ ) {
-			if ( this[i].nodeType === 1 && (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) >= 0 ) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-});
-
-});
diff --git a/#pma/js/jquery/src/jquery/attributes/prop.js b/#pma/js/jquery/src/jquery/attributes/prop.js
deleted file mode 100644
index d4ee8b6b..00000000
--- a/#pma/js/jquery/src/jquery/attributes/prop.js
+++ /dev/null
@@ -1,94 +0,0 @@
-define([
-	"../core",
-	"../core/access",
-	"./support"
-], function( jQuery, access, support ) {
-
-var rfocusable = /^(?:input|select|textarea|button)$/i;
-
-jQuery.fn.extend({
-	prop: function( name, value ) {
-		return access( this, jQuery.prop, name, value, arguments.length > 1 );
-	},
-
-	removeProp: function( name ) {
-		return this.each(function() {
-			delete this[ jQuery.propFix[ name ] || name ];
-		});
-	}
-});
-
-jQuery.extend({
-	propFix: {
-		"for": "htmlFor",
-		"class": "className"
-	},
-
-	prop: function( elem, name, value ) {
-		var ret, hooks, notxml,
-			nType = elem.nodeType;
-
-		// Don't get/set properties on text, comment and attribute nodes
-		if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
-			return;
-		}
-
-		notxml = nType !== 1 || !jQuery.isXMLDoc( elem );
-
-		if ( notxml ) {
-			// Fix name and attach hooks
-			name = jQuery.propFix[ name ] || name;
-			hooks = jQuery.propHooks[ name ];
-		}
-
-		if ( value !== undefined ) {
-			return hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ?
-				ret :
-				( elem[ name ] = value );
-
-		} else {
-			return hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ?
-				ret :
-				elem[ name ];
-		}
-	},
-
-	propHooks: {
-		tabIndex: {
-			get: function( elem ) {
-				return elem.hasAttribute( "tabindex" ) || rfocusable.test( elem.nodeName ) || elem.href ?
-					elem.tabIndex :
-					-1;
-			}
-		}
-	}
-});
-
-if ( !support.optSelected ) {
-	jQuery.propHooks.selected = {
-		get: function( elem ) {
-			var parent = elem.parentNode;
-			if ( parent && parent.parentNode ) {
-				parent.parentNode.selectedIndex;
-			}
-			return null;
-		}
-	};
-}
-
-jQuery.each([
-	"tabIndex",
-	"readOnly",
-	"maxLength",
-	"cellSpacing",
-	"cellPadding",
-	"rowSpan",
-	"colSpan",
-	"useMap",
-	"frameBorder",
-	"contentEditable"
-], function() {
-	jQuery.propFix[ this.toLowerCase() ] = this;
-});
-
-});
diff --git a/#pma/js/jquery/src/jquery/attributes/support.js b/#pma/js/jquery/src/jquery/attributes/support.js
deleted file mode 100644
index 5db5c521..00000000
--- a/#pma/js/jquery/src/jquery/attributes/support.js
+++ /dev/null
@@ -1,35 +0,0 @@
-define([
-	"../var/support"
-], function( support ) {
-
-(function() {
-	var input = document.createElement( "input" ),
-		select = document.createElement( "select" ),
-		opt = select.appendChild( document.createElement( "option" ) );
-
-	input.type = "checkbox";
-
-	// Support: iOS<=5.1, Android<=4.2+
-	// Default value for a checkbox should be "on"
-	support.checkOn = input.value !== "";
-
-	// Support: IE<=11+
-	// Must access selectedIndex to make default options select
-	support.optSelected = opt.selected;
-
-	// Support: Android<=2.3
-	// Options inside disabled selects are incorrectly marked as disabled
-	select.disabled = true;
-	support.optDisabled = !opt.disabled;
-
-	// Support: IE<=11+
-	// An input loses its value after becoming a radio
-	input = document.createElement( "input" );
-	input.value = "t";
-	input.type = "radio";
-	support.radioValue = input.value === "t";
-})();
-
-return support;
-
-});
diff --git a/#pma/js/jquery/src/jquery/attributes/val.js b/#pma/js/jquery/src/jquery/attributes/val.js
deleted file mode 100644
index 4a1358a6..00000000
--- a/#pma/js/jquery/src/jquery/attributes/val.js
+++ /dev/null
@@ -1,161 +0,0 @@
-define([
-	"../core",
-	"./support",
-	"../core/init"
-], function( jQuery, support ) {
-
-var rreturn = /\r/g;
-
-jQuery.fn.extend({
-	val: function( value ) {
-		var hooks, ret, isFunction,
-			elem = this[0];
-
-		if ( !arguments.length ) {
-			if ( elem ) {
-				hooks = jQuery.valHooks[ elem.type ] || jQuery.valHooks[ elem.nodeName.toLowerCase() ];
-
-				if ( hooks && "get" in hooks && (ret = hooks.get( elem, "value" )) !== undefined ) {
-					return ret;
-				}
-
-				ret = elem.value;
-
-				return typeof ret === "string" ?
-					// Handle most common string cases
-					ret.replace(rreturn, "") :
-					// Handle cases where value is null/undef or number
-					ret == null ? "" : ret;
-			}
-
-			return;
-		}
-
-		isFunction = jQuery.isFunction( value );
-
-		return this.each(function( i ) {
-			var val;
-
-			if ( this.nodeType !== 1 ) {
-				return;
-			}
-
-			if ( isFunction ) {
-				val = value.call( this, i, jQuery( this ).val() );
-			} else {
-				val = value;
-			}
-
-			// Treat null/undefined as ""; convert numbers to string
-			if ( val == null ) {
-				val = "";
-
-			} else if ( typeof val === "number" ) {
-				val += "";
-
-			} else if ( jQuery.isArray( val ) ) {
-				val = jQuery.map( val, function( value ) {
-					return value == null ? "" : value + "";
-				});
-			}
-
-			hooks = jQuery.valHooks[ this.type ] || jQuery.valHooks[ this.nodeName.toLowerCase() ];
-
-			// If set returns undefined, fall back to normal setting
-			if ( !hooks || !("set" in hooks) || hooks.set( this, val, "value" ) === undefined ) {
-				this.value = val;
-			}
-		});
-	}
-});
-
-jQuery.extend({
-	valHooks: {
-		option: {
-			get: function( elem ) {
-				var val = jQuery.find.attr( elem, "value" );
-				return val != null ?
-					val :
-					// Support: IE10-11+
-					// option.text throws exceptions (#14686, #14858)
-					jQuery.trim( jQuery.text( elem ) );
-			}
-		},
-		select: {
-			get: function( elem ) {
-				var value, option,
-					options = elem.options,
-					index = elem.selectedIndex,
-					one = elem.type === "select-one" || index < 0,
-					values = one ? null : [],
-					max = one ? index + 1 : options.length,
-					i = index < 0 ?
-						max :
-						one ? index : 0;
-
-				// Loop through all the selected options
-				for ( ; i < max; i++ ) {
-					option = options[ i ];
-
-					// IE6-9 doesn't update selected after form reset (#2551)
-					if ( ( option.selected || i === index ) &&
-							// Don't return options that are disabled or in a disabled optgroup
-							( support.optDisabled ? !option.disabled : option.getAttribute( "disabled" ) === null ) &&
-							( !option.parentNode.disabled || !jQuery.nodeName( option.parentNode, "optgroup" ) ) ) {
-
-						// Get the specific value for the option
-						value = jQuery( option ).val();
-
-						// We don't need an array for one selects
-						if ( one ) {
-							return value;
-						}
-
-						// Multi-Selects return an array
-						values.push( value );
-					}
-				}
-
-				return values;
-			},
-
-			set: function( elem, value ) {
-				var optionSet, option,
-					options = elem.options,
-					values = jQuery.makeArray( value ),
-					i = options.length;
-
-				while ( i-- ) {
-					option = options[ i ];
-					if ( (option.selected = jQuery.inArray( option.value, values ) >= 0) ) {
-						optionSet = true;
-					}
-				}
-
-				// Force browsers to behave consistently when non-matching value is set
-				if ( !optionSet ) {
-					elem.selectedIndex = -1;
-				}
-				return values;
-			}
-		}
-	}
-});
-
-// Radios and checkboxes getter/setter
-jQuery.each([ "radio", "checkbox" ], function() {
-	jQuery.valHooks[ this ] = {
-		set: function( elem, value ) {
-			if ( jQuery.isArray( value ) ) {
-				return ( elem.checked = jQuery.inArray( jQuery(elem).val(), value ) >= 0 );
-			}
-		}
-	};
-	if ( !support.checkOn ) {
-		jQuery.valHooks[ this ].get = function( elem ) {
-			return elem.getAttribute("value") === null ? "on" : elem.value;
-		};
-	}
-});
-
-});
diff --git a/#pma/js/jquery/src/jquery/callbacks.js b/#pma/js/jquery/src/jquery/callbacks.js
deleted file mode 100644
index 17572bb9..00000000
--- a/#pma/js/jquery/src/jquery/callbacks.js
+++ /dev/null
@@ -1,205 +0,0 @@
-define([
-	"./core",
-	"./var/rnotwhite"
-], function( jQuery, rnotwhite ) {
-
-// String to Object options format cache
-var optionsCache = {};
-
-// Convert String-formatted options into Object-formatted ones and store in cache
-function createOptions( options ) {
-	var object = optionsCache[ options ] = {};
-	jQuery.each( options.match( rnotwhite ) || [], function( _, flag ) {
-		object[ flag ] = true;
-	});
-	return object;
-}
-
-/*
- * Create a callback list using the following parameters:
- *
- *	options: an optional list of space-separated options that will change how
- *			the callback list behaves or a more traditional option object
- *
- * By default a callback list will act like an event callback list and can be
- * "fired" multiple times.
- *
- * Possible options:
- *
- *	once:			will ensure the callback list can only be fired once (like a Deferred)
- *
- *	memory:			will keep track of previous values and will call any callback added
- *					after the list has been fired right away with the latest "memorized"
- *					values (like a Deferred)
- *
- *	unique:			will ensure a callback can only be added once (no duplicate in the list)
- *
- *	stopOnFalse:	interrupt callings when a callback returns false
- *
- */
-jQuery.Callbacks = function( options ) {
-
-	// Convert options from String-formatted to Object-formatted if needed
-	// (we check in cache first)
-	options = typeof options === "string" ?
-		( optionsCache[ options ] || createOptions( options ) ) :
-		jQuery.extend( {}, options );
-
-	var // Last fire value (for non-forgettable lists)
-		memory,
-		// Flag to know if list was already fired
-		fired,
-		// Flag to know if list is currently firing
-		firing,
-		// First callback to fire (used internally by add and fireWith)
-		firingStart,
-		// End of the loop when firing
-		firingLength,
-		// Index of currently firing callback (modified by remove if needed)
-		firingIndex,
-		// Actual callback list
-		list = [],
-		// Stack of fire calls for repeatable lists
-		stack = !options.once && [],
-		// Fire callbacks
-		fire = function( data ) {
-			memory = options.memory && data;
-			fired = true;
-			firingIndex = firingStart || 0;
-			firingStart = 0;
-			firingLength = list.length;
-			firing = true;
-			for ( ; list && firingIndex < firingLength; firingIndex++ ) {
-				if ( list[ firingIndex ].apply( data[ 0 ], data[ 1 ] ) === false && options.stopOnFalse ) {
-					memory = false; // To prevent further calls using add
-					break;
-				}
-			}
-			firing = false;
-			if ( list ) {
-				if ( stack ) {
-					if ( stack.length ) {
-						fire( stack.shift() );
-					}
-				} else if ( memory ) {
-					list = [];
-				} else {
-					self.disable();
-				}
-			}
-		},
-		// Actual Callbacks object
-		self = {
-			// Add a callback or a collection of callbacks to the list
-			add: function() {
-				if ( list ) {
-					// First, we save the current length
-					var start = list.length;
-					(function add( args ) {
-						jQuery.each( args, function( _, arg ) {
-							var type = jQuery.type( arg );
-							if ( type === "function" ) {
-								if ( !options.unique || !self.has( arg ) ) {
-									list.push( arg );
-								}
-							} else if ( arg && arg.length && type !== "string" ) {
-								// Inspect recursively
-								add( arg );
-							}
-						});
-					})( arguments );
-					// Do we need to add the callbacks to the
-					// current firing batch?
-					if ( firing ) {
-						firingLength = list.length;
-					// With memory, if we're not firing then
-					// we should call right away
-					} else if ( memory ) {
-						firingStart = start;
-						fire( memory );
-					}
-				}
-				return this;
-			},
-			// Remove a callback from the list
-			remove: function() {
-				if ( list ) {
-					jQuery.each( arguments, function( _, arg ) {
-						var index;
-						while ( ( index = jQuery.inArray( arg, list, index ) ) > -1 ) {
-							list.splice( index, 1 );
-							// Handle firing indexes
-							if ( firing ) {
-								if ( index <= firingLength ) {
-									firingLength--;
-								}
-								if ( index <= firingIndex ) {
-									firingIndex--;
-								}
-							}
-						}
-					});
-				}
-				return this;
-			},
-			// Check if a given callback is in the list.
-			// If no argument is given, return whether or not list has callbacks attached.
-			has: function( fn ) {
-				return fn ? jQuery.inArray( fn, list ) > -1 : !!( list && list.length );
-			},
-			// Remove all callbacks from the list
-			empty: function() {
-				list = [];
-				firingLength = 0;
-				return this;
-			},
-			// Have the list do nothing anymore
-			disable: function() {
-				list = stack = memory = undefined;
-				return this;
-			},
-			// Is it disabled?
-			disabled: function() {
-				return !list;
-			},
-			// Lock the list in its current state
-			lock: function() {
-				stack = undefined;
-				if ( !memory ) {
-					self.disable();
-				}
-				return this;
-			},
-			// Is it locked?
-			locked: function() {
-				return !stack;
-			},
-			// Call all callbacks with the given context and arguments
-			fireWith: function( context, args ) {
-				if ( list && ( !fired || stack ) ) {
-					args = args || [];
-					args = [ context, args.slice ? args.slice() : args ];
-					if ( firing ) {
-						stack.push( args );
-					} else {
-						fire( args );
-					}
-				}
-				return this;
-			},
-			// Call all the callbacks with the given arguments
-			fire: function() {
-				self.fireWith( this, arguments );
-				return this;
-			},
-			// To know if the callbacks have already been called at least once
-			fired: function() {
-				return !!fired;
-			}
-		};
-
-	return self;
-};
-
-return jQuery;
-});
diff --git a/#pma/js/jquery/src/jquery/core.js b/#pma/js/jquery/src/jquery/core.js
deleted file mode 100644
index 6f471eef..00000000
--- a/#pma/js/jquery/src/jquery/core.js
+++ /dev/null
@@ -1,502 +0,0 @@
-define([
-	"./var/arr",
-	"./var/slice",
-	"./var/concat",
-	"./var/push",
-	"./var/indexOf",
-	"./var/class2type",
-	"./var/toString",
-	"./var/hasOwn",
-	"./var/support"
-], function( arr, slice, concat, push, indexOf, class2type, toString, hasOwn, support ) {
-
-var
-	// Use the correct document accordingly with window argument (sandbox)
-	document = window.document,
-
-	version = "@VERSION",
-
-	// Define a local copy of jQuery
-	jQuery = function( selector, context ) {
-		// The jQuery object is actually just the init constructor 'enhanced'
-		// Need init if jQuery is called (just allow error to be thrown if not included)
-		return new jQuery.fn.init( selector, context );
-	},
-
-	// Support: Android<4.1
-	// Make sure we trim BOM and NBSP
-	rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,
-
-	// Matches dashed string for camelizing
-	rmsPrefix = /^-ms-/,
-	rdashAlpha = /-([\da-z])/gi,
-
-	// Used by jQuery.camelCase as callback to replace()
-	fcamelCase = function( all, letter ) {
-		return letter.toUpperCase();
-	};
-
-jQuery.fn = jQuery.prototype = {
-	// The current version of jQuery being used
-	jquery: version,
-
-	constructor: jQuery,
-
-	// Start with an empty selector
-	selector: "",
-
-	// The default length of a jQuery object is 0
-	length: 0,
-
-	toArray: function() {
-		return slice.call( this );
-	},
-
-	// Get the Nth element in the matched element set OR
-	// Get the whole matched element set as a clean array
-	get: function( num ) {
-		return num != null ?
-
-			// Return just the one element from the set
-			( num < 0 ? this[ num + this.length ] : this[ num ] ) :
-
-			// Return all the elements in a clean array
-			slice.call( this );
-	},
-
-	// Take an array of elements and push it onto the stack
-	// (returning the new matched element set)
-	pushStack: function( elems ) {
-
-		// Build a new jQuery matched element set
-		var ret = jQuery.merge( this.constructor(), elems );
-
-		// Add the old object onto the stack (as a reference)
-		ret.prevObject = this;
-		ret.context = this.context;
-
-		// Return the newly-formed element set
-		return ret;
-	},
-
-	// Execute a callback for every element in the matched set.
-	// (You can seed the arguments with an array of args, but this is
-	// only used internally.)
-	each: function( callback, args ) {
-		return jQuery.each( this, callback, args );
-	},
-
-	map: function( callback ) {
-		return this.pushStack( jQuery.map(this, function( elem, i ) {
-			return callback.call( elem, i, elem );
-		}));
-	},
-
-	slice: function() {
-		return this.pushStack( slice.apply( this, arguments ) );
-	},
-
-	first: function() {
-		return this.eq( 0 );
-	},
-
-	last: function() {
-		return this.eq( -1 );
-	},
-
-	eq: function( i ) {
-		var len = this.length,
-			j = +i + ( i < 0 ? len : 0 );
-		return this.pushStack( j >= 0 && j < len ? [ this[j] ] : [] );
-	},
-
-	end: function() {
-		return this.prevObject || this.constructor(null);
-	},
-
-	// For internal use only.
-	// Behaves like an Array's method, not like a jQuery method.
-	push: push,
-	sort: arr.sort,
-	splice: arr.splice
-};
-
-jQuery.extend = jQuery.fn.extend = function() {
-	var options, name, src, copy, copyIsArray, clone,
-		target = arguments[0] || {},
-		i = 1,
-		length = arguments.length,
-		deep = false;
-
-	// Handle a deep copy situation
-	if ( typeof target === "boolean" ) {
-		deep = target;
-
-		// Skip the boolean and the target
-		target = arguments[ i ] || {};
-		i++;
-	}
-
-	// Handle case when target is a string or something (possible in deep copy)
-	if ( typeof target !== "object" && !jQuery.isFunction(target) ) {
-		target = {};
-	}
-
-	// Extend jQuery itself if only one argument is passed
-	if ( i === length ) {
-		target = this;
-		i--;
-	}
-
-	for ( ; i < length; i++ ) {
-		// Only deal with non-null/undefined values
-		if ( (options = arguments[ i ]) != null ) {
-			// Extend the base object
-			for ( name in options ) {
-				src = target[ name ];
-				copy = options[ name ];
-
-				// Prevent never-ending loop
-				if ( target === copy ) {
-					continue;
-				}
-
-				// Recurse if we're merging plain objects or arrays
-				if ( deep && copy && ( jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)) ) ) {
-					if ( copyIsArray ) {
-						copyIsArray = false;
-						clone = src && jQuery.isArray(src) ? src : [];
-
-					} else {
-						clone = src && jQuery.isPlainObject(src) ? src : {};
-					}
-
-					// Never move original objects, clone them
-					target[ name ] = jQuery.extend( deep, clone, copy );
-
-				// Don't bring in undefined values
-				} else if ( copy !== undefined ) {
-					target[ name ] = copy;
-				}
-			}
-		}
-	}
-
-	// Return the modified object
-	return target;
-};
-
-jQuery.extend({
-	// Unique for each copy of jQuery on the page
-	expando: "jQuery" + ( version + Math.random() ).replace( /\D/g, "" ),
-
-	// Assume jQuery is ready without the ready module
-	isReady: true,
-
-	error: function( msg ) {
-		throw new Error( msg );
-	},
-
-	noop: function() {},
-
-	isFunction: function( obj ) {
-		return jQuery.type(obj) === "function";
-	},
-
-	isArray: Array.isArray,
-
-	isWindow: function( obj ) {
-		return obj != null && obj === obj.window;
-	},
-
-	isNumeric: function( obj ) {
-		// parseFloat NaNs numeric-cast false positives (null|true|false|"")
-		// ...but misinterprets leading-number strings, particularly hex literals ("0x...")
-		// subtraction forces infinities to NaN
-		// adding 1 corrects loss of precision from parseFloat (#15100)
-		return !jQuery.isArray( obj ) && (obj - parseFloat( obj ) + 1) >= 0;
-	},
-
-	isPlainObject: function( obj ) {
-		// Not plain objects:
-		// - Any object or value whose internal [[Class]] property is not "[object Object]"
-		// - DOM nodes
-		// - window
-		if ( jQuery.type( obj ) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) {
-			return false;
-		}
-
-		if ( obj.constructor &&
-				!hasOwn.call( obj.constructor.prototype, "isPrototypeOf" ) ) {
-			return false;
-		}
-
-		// If the function hasn't returned already, we're confident that
-		// |obj| is a plain object, created by {} or constructed with new Object
-		return true;
-	},
-
-	isEmptyObject: function( obj ) {
-		var name;
-		for ( name in obj ) {
-			return false;
-		}
-		return true;
-	},
-
-	type: function( obj ) {
-		if ( obj == null ) {
-			return obj + "";
-		}
-		// Support: Android<4.0, iOS<6 (functionish RegExp)
-		return typeof obj === "object" || typeof obj === "function" ?
-			class2type[ toString.call(obj) ] || "object" :
-			typeof obj;
-	},
-
-	// Evaluates a script in a global context
-	globalEval: function( code ) {
-		var script,
-			indirect = eval;
-
-		code = jQuery.trim( code );
-
-		if ( code ) {
-			// If the code includes a valid, prologue position
-			// strict mode pragma, execute code by injecting a
-			// script tag into the document.
-			if ( code.indexOf("use strict") === 1 ) {
-				script = document.createElement("script");
-				script.text = code;
-				document.head.appendChild( script ).parentNode.removeChild( script );
-			} else {
-			// Otherwise, avoid the DOM node creation, insertion
-			// and removal by using an indirect global eval
-				indirect( code );
-			}
-		}
-	},
-
-	// Convert dashed to camelCase; used by the css and data modules
-	// Support: IE9-11+
-	// Microsoft forgot to hump their vendor prefix (#9572)
-	camelCase: function( string ) {
-		return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase );
-	},
-
-	nodeName: function( elem, name ) {
-		return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase();
-	},
-
-	// args is for internal usage only
-	each: function( obj, callback, args ) {
-		var value,
-			i = 0,
-			length = obj.length,
-			isArray = isArraylike( obj );
-
-		if ( args ) {
-			if ( isArray ) {
-				for ( ; i < length; i++ ) {
-					value = callback.apply( obj[ i ], args );
-
-					if ( value === false ) {
-						break;
-					}
-				}
-			} else {
-				for ( i in obj ) {
-					value = callback.apply( obj[ i ], args );
-
-					if ( value === false ) {
-						break;
-					}
-				}
-			}
-
-		// A special, fast, case for the most common use of each
-		} else {
-			if ( isArray ) {
-				for ( ; i < length; i++ ) {
-					value = callback.call( obj[ i ], i, obj[ i ] );
-
-					if ( value === false ) {
-						break;
-					}
-				}
-			} else {
-				for ( i in obj ) {
-					value = callback.call( obj[ i ], i, obj[ i ] );
-
-					if ( value === false ) {
-						break;
-					}
-				}
-			}
-		}
-
-		return obj;
-	},
-
-	// Support: Android<4.1
-	trim: function( text ) {
-		return text == null ?
-			"" :
-			( text + "" ).replace( rtrim, "" );
-	},
-
-	// results is for internal usage only
-	makeArray: function( arr, results ) {
-		var ret = results || [];
-
-		if ( arr != null ) {
-			if ( isArraylike( Object(arr) ) ) {
-				jQuery.merge( ret,
-					typeof arr === "string" ?
-					[ arr ] : arr
-				);
-			} else {
-				push.call( ret, arr );
-			}
-		}
-
-		return ret;
-	},
-
-	inArray: function( elem, arr, i ) {
-		return arr == null ? -1 : indexOf.call( arr, elem, i );
-	},
-
-	merge: function( first, second ) {
-		var len = +second.length,
-			j = 0,
-			i = first.length;
-
-		for ( ; j < len; j++ ) {
-			first[ i++ ] = second[ j ];
-		}
-
-		first.length = i;
-
-		return first;
-	},
-
-	grep: function( elems, callback, invert ) {
-		var callbackInverse,
-			matches = [],
-			i = 0,
-			length = elems.length,
-			callbackExpect = !invert;
-
-		// Go through the array, only saving the items
-		// that pass the validator function
-		for ( ; i < length; i++ ) {
-			callbackInverse = !callback( elems[ i ], i );
-			if ( callbackInverse !== callbackExpect ) {
-				matches.push( elems[ i ] );
-			}
-		}
-
-		return matches;
-	},
-
-	// arg is for internal usage only
-	map: function( elems, callback, arg ) {
-		var value,
-			i = 0,
-			length = elems.length,
-			isArray = isArraylike( elems ),
-			ret = [];
-
-		// Go through the array, translating each of the items to their new values
-		if ( isArray ) {
-			for ( ; i < length; i++ ) {
-				value = callback( elems[ i ], i, arg );
-
-				if ( value != null ) {
-					ret.push( value );
-				}
-			}
-
-		// Go through every key on the object,
-		} else {
-			for ( i in elems ) {
-				value = callback( elems[ i ], i, arg );
-
-				if ( value != null ) {
-					ret.push( value );
-				}
-			}
-		}
-
-		// Flatten any nested arrays
-		return concat.apply( [], ret );
-	},
-
-	// A global GUID counter for objects
-	guid: 1,
-
-	// Bind a function to a context, optionally partially applying any
-	// arguments.
-	proxy: function( fn, context ) {
-		var tmp, args, proxy;
-
-		if ( typeof context === "string" ) {
-			tmp = fn[ context ];
-			context = fn;
-			fn = tmp;
-		}
-
-		// Quick check to determine if target is callable, in the spec
-		// this throws a TypeError, but we will just return undefined.
-		if ( !jQuery.isFunction( fn ) ) {
-			return undefined;
-		}
-
-		// Simulated bind
-		args = slice.call( arguments, 2 );
-		proxy = function() {
-			return fn.apply( context || this, args.concat( slice.call( arguments ) ) );
-		};
-
-		// Set the guid of unique handler to the same of original handler, so it can be removed
-		proxy.guid = fn.guid = fn.guid || jQuery.guid++;
-
-		return proxy;
-	},
-
-	now: Date.now,
-
-	// jQuery.support is not used in Core but other projects attach their
-	// properties to it so it needs to exist.
-	support: support
-});
-
-// Populate the class2type map
-jQuery.each("Boolean Number String Function Array Date RegExp Object Error".split(" "), function(i, name) {
-	class2type[ "[object " + name + "]" ] = name.toLowerCase();
-});
-
-function isArraylike( obj ) {
-
-	// Support: iOS 8.2 (not reproducible in simulator)
-	// `in` check used to prevent JIT error (gh-2145)
-	// hasOwn isn't used here due to false negatives
-	// regarding Nodelist length in IE
-	var length = "length" in obj && obj.length,
-		type = jQuery.type( obj );
-
-	if ( type === "function" || jQuery.isWindow( obj ) ) {
-		return false;
-	}
-
-	if ( obj.nodeType === 1 && length ) {
-		return true;
-	}
-
-	return type === "array" || length === 0 ||
-		typeof length === "number" && length > 0 && ( length - 1 ) in obj;
-}
-
-return jQuery;
-});
diff --git a/#pma/js/jquery/src/jquery/core/access.js b/#pma/js/jquery/src/jquery/core/access.js
deleted file mode 100644
index b6110c8f..00000000
--- a/#pma/js/jquery/src/jquery/core/access.js
+++ /dev/null
@@ -1,60 +0,0 @@
-define([
-	"../core"
-], function( jQuery ) {
-
-// Multifunctional method to get and set values of a collection
-// The value/s can optionally be executed if it's a function
-var access = jQuery.access = function( elems, fn, key, value, chainable, emptyGet, raw ) {
-	var i = 0,
-		len = elems.length,
-		bulk = key == null;
-
-	// Sets many values
-	if ( jQuery.type( key ) === "object" ) {
-		chainable = true;
-		for ( i in key ) {
-			jQuery.access( elems, fn, i, key[i], true, emptyGet, raw );
-		}
-
-	// Sets one value
-	} else if ( value !== undefined ) {
-		chainable = true;
-
-		if ( !jQuery.isFunction( value ) ) {
-			raw = true;
-		}
-
-		if ( bulk ) {
-			// Bulk operations run against the entire set
-			if ( raw ) {
-				fn.call( elems, value );
-				fn = null;
-
-			// ...except when executing function values
-			} else {
-				bulk = fn;
-				fn = function( elem, key, value ) {
-					return bulk.call( jQuery( elem ), value );
-				};
-			}
-		}
-
-		if ( fn ) {
-			for ( ; i < len; i++ ) {
-				fn( elems[i], key, raw ? value : value.call( elems[i], i, fn( elems[i], key ) ) );
-			}
-		}
-	}
-
-	return chainable ?
-		elems :
-
-		// Gets
-		bulk ?
-			fn.call( elems ) :
-			len ? fn( elems[0], key ) : emptyGet;
-};
-
-return access;
-
-});
diff --git a/#pma/js/jquery/src/jquery/core/init.js b/#pma/js/jquery/src/jquery/core/init.js
deleted file mode 100644
index 7e83a049..00000000
--- a/#pma/js/jquery/src/jquery/core/init.js
+++ /dev/null
@@ -1,123 +0,0 @@
-// Initialize a jQuery object
-define([
-	"../core",
-	"./var/rsingleTag",
-	"../traversing/findFilter"
-], function( jQuery, rsingleTag ) {
-
-// A central reference to the root jQuery(document)
-var rootjQuery,
-
-	// A simple way to check for HTML strings
-	// Prioritize #id over <tag> to avoid XSS via location.hash (#9521)
-	// Strict HTML recognition (#11290: must start with <)
-	rquickExpr = /^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,
-
-	init = jQuery.fn.init = function( selector, context ) {
-		var match, elem;
-
-		// HANDLE: $(""), $(null), $(undefined), $(false)
-		if ( !selector ) {
-			return this;
-		}
-
-		// Handle HTML strings
-		if ( typeof selector === "string" ) {
-			if ( selector[0] === "<" && selector[ selector.length - 1 ] === ">" && selector.length >= 3 ) {
-				// Assume that strings that start and end with <> are HTML and skip the regex check
-				match = [ null, selector, null ];
-
-			} else {
-				match = rquickExpr.exec( selector );
-			}
-
-			// Match html or make sure no context is specified for #id
-			if ( match && (match[1] || !context) ) {
-
-				// HANDLE: $(html) -> $(array)
-				if ( match[1] ) {
-					context = context instanceof jQuery ? context[0] : context;
-
-					// Option to run scripts is true for back-compat
-					// Intentionally let the error be thrown if parseHTML is not present
-					jQuery.merge( this, jQuery.parseHTML(
-						match[1],
-						context && context.nodeType ? context.ownerDocument || context : document,
-						true
-					) );
-
-					// HANDLE: $(html, props)
-					if ( rsingleTag.test( match[1] ) && jQuery.isPlainObject( context ) ) {
-						for ( match in context ) {
-							// Properties of context are called as methods if possible
-							if ( jQuery.isFunction( this[ match ] ) ) {
-								this[ match ]( context[ match ] );
-
-							// ...and otherwise set as attributes
-							} else {
-								this.attr( match, context[ match ] );
-							}
-						}
-					}
-
-					return this;
-
-				// HANDLE: $(#id)
-				} else {
-					elem = document.getElementById( match[2] );
-
-					// Support: Blackberry 4.6
-					// gEBID returns nodes no longer in the document (#6963)
-					if ( elem && elem.parentNode ) {
-						// Inject the element directly into the jQuery object
-						this.length = 1;
-						this[0] = elem;
-					}
-
-					this.context = document;
-					this.selector = selector;
-					return this;
-				}
-
-			// HANDLE: $(expr, $(...))
-			} else if ( !context || context.jquery ) {
-				return ( context || rootjQuery ).find( selector );
-
-			// HANDLE: $(expr, context)
-			// (which is just equivalent to: $(context).find(expr)
-			} else {
-				return this.constructor( context ).find( selector );
-			}
-
-		// HANDLE: $(DOMElement)
-		} else if ( selector.nodeType ) {
-			this.context = this[0] = selector;
-			this.length = 1;
-			return this;
-
-		// HANDLE: $(function)
-		// Shortcut for document ready
-		} else if ( jQuery.isFunction( selector ) ) {
-			return typeof rootjQuery.ready !== "undefined" ?
-				rootjQuery.ready( selector ) :
-				// Execute immediately if ready is not present
-				selector( jQuery );
-		}
-
-		if ( selector.selector !== undefined ) {
-			this.selector = selector.selector;
-			this.context = selector.context;
-		}
-
-		return jQuery.makeArray( selector, this );
-	};
-
-// Give the init function the jQuery prototype for later instantiation
-init.prototype = jQuery.fn;
-
-// Initialize central reference
-rootjQuery = jQuery( document );
-
-return init;
-
-});
diff --git a/#pma/js/jquery/src/jquery/core/parseHTML.js b/#pma/js/jquery/src/jquery/core/parseHTML.js
deleted file mode 100644
index 64cf2a18..00000000
--- a/#pma/js/jquery/src/jquery/core/parseHTML.js
+++ /dev/null
@@ -1,39 +0,0 @@
-define([
-	"../core",
-	"./var/rsingleTag",
-	"../manipulation" // buildFragment
-], function( jQuery, rsingleTag ) {
-
-// data: string of html
-// context (optional): If specified, the fragment will be created in this context, defaults to document
-// keepScripts (optional): If true, will include scripts passed in the html string
-jQuery.parseHTML = function( data, context, keepScripts ) {
-	if ( !data || typeof data !== "string" ) {
-		return null;
-	}
-	if ( typeof context === "boolean" ) {
-		keepScripts = context;
-		context = false;
-	}
-	context = context || document;
-
-	var parsed = rsingleTag.exec( data ),
-		scripts = !keepScripts && [];
-
-	// Single tag
-	if ( parsed ) {
-		return [ context.createElement( parsed[1] ) ];
-	}
-
-	parsed = jQuery.buildFragment( [ data ], context, scripts );
-
-	if ( scripts && scripts.length ) {
-		jQuery( scripts ).remove();
-	}
-
-	return jQuery.merge( [], parsed.childNodes );
-};
-
-return jQuery.parseHTML;
-
-});
diff --git a/#pma/js/jquery/src/jquery/core/ready.js b/#pma/js/jquery/src/jquery/core/ready.js
deleted file mode 100644
index db1a6e60..00000000
--- a/#pma/js/jquery/src/jquery/core/ready.js
+++ /dev/null
@@ -1,97 +0,0 @@
-define([
-	"../core",
-	"../core/init",
-	"../deferred"
-], function( jQuery ) {
-
-// The deferred used on DOM ready
-var readyList;
-
-jQuery.fn.ready = function( fn ) {
-	// Add the callback
-	jQuery.ready.promise().done( fn );
-
-	return this;
-};
-
-jQuery.extend({
-	// Is the DOM ready to be used? Set to true once it occurs.
-	isReady: false,
-
-	// A counter to track how many items to wait for before
-	// the ready event fires. See #6781
-	readyWait: 1,
-
-	// Hold (or release) the ready event
-	holdReady: function( hold ) {
-		if ( hold ) {
-			jQuery.readyWait++;
-		} else {
-			jQuery.ready( true );
-		}
-	},
-
-	// Handle when the DOM is ready
-	ready: function( wait ) {
-
-		// Abort if there are pending holds or we're already ready
-		if ( wait === true ? --jQuery.readyWait : jQuery.isReady ) {
-			return;
-		}
-
-		// Remember that the DOM is ready
-		jQuery.isReady = true;
-
-		// If a normal DOM Ready event fired, decrement, and wait if need be
-		if ( wait !== true && --jQuery.readyWait > 0 ) {
-			return;
-		}
-
-		// If there are functions bound, to execute
-		readyList.resolveWith( document, [ jQuery ] );
-
-		// Trigger any bound ready events
-		if ( jQuery.fn.triggerHandler ) {
-			jQuery( document ).triggerHandler( "ready" );
-			jQuery( document ).off( "ready" );
-		}
-	}
-});
-
-/**
- * The ready event handler and self cleanup method
- */
-function completed() {
-	document.removeEventListener( "DOMContentLoaded", completed, false );
-	window.removeEventListener( "load", completed, false );
-	jQuery.ready();
-}
-
-jQuery.ready.promise = function( obj ) {
-	if ( !readyList ) {
-
-		readyList = jQuery.Deferred();
-
-		// Catch cases where $(document).ready() is called after the browser event has already occurred.
-		// We once tried to use readyState "interactive" here, but it caused issues like the one
-		// discovered by ChrisS here: http://bugs.jquery.com/ticket/12282#comment:15
-		if ( document.readyState === "complete" ) {
-			// Handle it asynchronously to allow scripts the opportunity to delay ready
-			setTimeout( jQuery.ready );
-
-		} else {
-
-			// Use the handy event callback
-			document.addEventListener( "DOMContentLoaded", completed, false );
-
-			// A fallback to window.onload, that will always work
-			window.addEventListener( "load", completed, false );
-		}
-	}
-	return readyList.promise( obj );
-};
-
-// Kick off the DOM ready check even if the user does not
-jQuery.ready.promise();
-
-});
diff --git a/#pma/js/jquery/src/jquery/core/var/rsingleTag.js b/#pma/js/jquery/src/jquery/core/var/rsingleTag.js
deleted file mode 100644
index 7e7090b7..00000000
--- a/#pma/js/jquery/src/jquery/core/var/rsingleTag.js
+++ /dev/null
@@ -1,4 +0,0 @@
-define(function() {
-	// Match a standalone tag
-	return (/^<(\w+)\s*\/?>(?:<\/\1>|)$/);
-});
diff --git a/#pma/js/jquery/src/jquery/css.js b/#pma/js/jquery/src/jquery/css.js
deleted file mode 100644
index d4816175..00000000
--- a/#pma/js/jquery/src/jquery/css.js
+++ /dev/null
@@ -1,450 +0,0 @@
-define([
-	"./core",
-	"./var/pnum",
-	"./core/access",
-	"./css/var/rmargin",
-	"./css/var/rnumnonpx",
-	"./css/var/cssExpand",
-	"./css/var/isHidden",
-	"./css/var/getStyles",
-	"./css/curCSS",
-	"./css/defaultDisplay",
-	"./css/addGetHookIf",
-	"./css/support",
-	"./data/var/data_priv",
-
-	"./core/init",
-	"./css/swap",
-	"./core/ready",
-	"./selector" // contains
-], function( jQuery, pnum, access, rmargin, rnumnonpx, cssExpand, isHidden,
-	getStyles, curCSS, defaultDisplay, addGetHookIf, support, data_priv ) {
-
-var
-	// Swappable if display is none or starts with table except "table", "table-cell", or "table-caption"
-	// See here for display values: https://developer.mozilla.org/en-US/docs/CSS/display
-	rdisplayswap = /^(none|table(?!-c[ea]).+)/,
-	rnumsplit = new RegExp( "^(" + pnum + ")(.*)$", "i" ),
-	rrelNum = new RegExp( "^([+-])=(" + pnum + ")", "i" ),
-
-	cssShow = { position: "absolute", visibility: "hidden", display: "block" },
-	cssNormalTransform = {
-		letterSpacing: "0",
-		fontWeight: "400"
-	},
-
-	cssPrefixes = [ "Webkit", "O", "Moz", "ms" ];
-
-// Return a css property mapped to a potentially vendor prefixed property
-function vendorPropName( style, name ) {
-
-	// Shortcut for names that are not vendor prefixed
-	if ( name in style ) {
-		return name;
-	}
-
-	// Check for vendor prefixed names
-	var capName = name[0].toUpperCase() + name.slice(1),
-		origName = name,
-		i = cssPrefixes.length;
-
-	while ( i-- ) {
-		name = cssPrefixes[ i ] + capName;
-		if ( name in style ) {
-			return name;
-		}
-	}
-
-	return origName;
-}
-
-function setPositiveNumber( elem, value, subtract ) {
-	var matches = rnumsplit.exec( value );
-	return matches ?
-		// Guard against undefined "subtract", e.g., when used as in cssHooks
-		Math.max( 0, matches[ 1 ] - ( subtract || 0 ) ) + ( matches[ 2 ] || "px" ) :
-		value;
-}
-
-function augmentWidthOrHeight( elem, name, extra, isBorderBox, styles ) {
-	var i = extra === ( isBorderBox ? "border" : "content" ) ?
-		// If we already have the right measurement, avoid augmentation
-		4 :
-		// Otherwise initialize for horizontal or vertical properties
-		name === "width" ? 1 : 0,
-
-		val = 0;
-
-	for ( ; i < 4; i += 2 ) {
-		// Both box models exclude margin, so add it if we want it
-		if ( extra === "margin" ) {
-			val += jQuery.css( elem, extra + cssExpand[ i ], true, styles );
-		}
-
-		if ( isBorderBox ) {
-			// border-box includes padding, so remove it if we want content
-			if ( extra === "content" ) {
-				val -= jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
-			}
-
-			// At this point, extra isn't border nor margin, so remove border
-			if ( extra !== "margin" ) {
-				val -= jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
-			}
-		} else {
-			// At this point, extra isn't content, so add padding
-			val += jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
-
-			// At this point, extra isn't content nor padding, so add border
-			if ( extra !== "padding" ) {
-				val += jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
-			}
-		}
-	}
-
-	return val;
-}
-
-function getWidthOrHeight( elem, name, extra ) {
-
-	// Start with offset property, which is equivalent to the border-box value
-	var valueIsBorderBox = true,
-		val = name === "width" ? elem.offsetWidth : elem.offsetHeight,
-		styles = getStyles( elem ),
-		isBorderBox = jQuery.css( elem, "boxSizing", false, styles ) === "border-box";
-
-	// Some non-html elements return undefined for offsetWidth, so check for null/undefined
-	// svg - https://bugzilla.mozilla.org/show_bug.cgi?id=649285
-	// MathML - https://bugzilla.mozilla.org/show_bug.cgi?id=491668
-	if ( val <= 0 || val == null ) {
-		// Fall back to computed then uncomputed css if necessary
-		val = curCSS( elem, name, styles );
-		if ( val < 0 || val == null ) {
-			val = elem.style[ name ];
-		}
-
-		// Computed unit is not pixels. Stop here and return.
-		if ( rnumnonpx.test(val) ) {
-			return val;
-		}
-
-		// Check for style in case a browser which returns unreliable values
-		// for getComputedStyle silently falls back to the reliable elem.style
-		valueIsBorderBox = isBorderBox &&
-			( support.boxSizingReliable() || val === elem.style[ name ] );
-
-		// Normalize "", auto, and prepare for extra
-		val = parseFloat( val ) || 0;
-	}
-
-	// Use the active box-sizing model to add/subtract irrelevant styles
-	return ( val +
-		augmentWidthOrHeight(
-			elem,
-			name,
-			extra || ( isBorderBox ? "border" : "content" ),
-			valueIsBorderBox,
-			styles
-		)
-	) + "px";
-}
-
-function showHide( elements, show ) {
-	var display, elem, hidden,
-		values = [],
-		index = 0,
-		length = elements.length;
-
-	for ( ; index < length; index++ ) {
-		elem = elements[ index ];
-		if ( !elem.style ) {
-			continue;
-		}
-
-		values[ index ] = data_priv.get( elem, "olddisplay" );
-		display = elem.style.display;
-		if ( show ) {
-			// Reset the inline display of this element to learn if it is
-			// being hidden by cascaded rules or not
-			if ( !values[ index ] && display === "none" ) {
-				elem.style.display = "";
-			}
-
-			// Set elements which have been overridden with display: none
-			// in a stylesheet to whatever the default browser style is
-			// for such an element
-			if ( elem.style.display === "" && isHidden( elem ) ) {
-				values[ index ] = data_priv.access( elem, "olddisplay", defaultDisplay(elem.nodeName) );
-			}
-		} else {
-			hidden = isHidden( elem );
-
-			if ( display !== "none" || !hidden ) {
-				data_priv.set( elem, "olddisplay", hidden ? display : jQuery.css( elem, "display" ) );
-			}
-		}
-	}
-
-	// Set the display of most of the elements in a second loop
-	// to avoid the constant reflow
-	for ( index = 0; index < length; index++ ) {
-		elem = elements[ index ];
-		if ( !elem.style ) {
-			continue;
-		}
-		if ( !show || elem.style.display === "none" || elem.style.display === "" ) {
-			elem.style.display = show ? values[ index ] || "" : "none";
-		}
-	}
-
-	return elements;
-}
-
-jQuery.extend({
-
-	// Add in style property hooks for overriding the default
-	// behavior of getting and setting a style property
-	cssHooks: {
-		opacity: {
-			get: function( elem, computed ) {
-				if ( computed ) {
-
-					// We should always get a number back from opacity
-					var ret = curCSS( elem, "opacity" );
-					return ret === "" ? "1" : ret;
-				}
-			}
-		}
-	},
-
-	// Don't automatically add "px" to these possibly-unitless properties
-	cssNumber: {
-		"columnCount": true,
-		"fillOpacity": true,
-		"flexGrow": true,
-		"flexShrink": true,
-		"fontWeight": true,
-		"lineHeight": true,
-		"opacity": true,
-		"order": true,
-		"orphans": true,
-		"widows": true,
-		"zIndex": true,
-		"zoom": true
-	},
-
-	// Add in properties whose names you wish to fix before
-	// setting or getting the value
-	cssProps: {
-		"float": "cssFloat"
-	},
-
-	// Get and set the style property on a DOM Node
-	style: function( elem, name, value, extra ) {
-
-		// Don't set styles on text and comment nodes
-		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || !elem.style ) {
-			return;
-		}
-
-		// Make sure that we're working with the right name
-		var ret, type, hooks,
-			origName = jQuery.camelCase( name ),
-			style = elem.style;
-
-		name = jQuery.cssProps[ origName ] || ( jQuery.cssProps[ origName ] = vendorPropName( style, origName ) );
-
-		// Gets hook for the prefixed version, then unprefixed version
-		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
-
-		// Check if we're setting a value
-		if ( value !== undefined ) {
-			type = typeof value;
-
-			// Convert "+=" or "-=" to relative numbers (#7345)
-			if ( type === "string" && (ret = rrelNum.exec( value )) ) {
-				value = ( ret[1] + 1 ) * ret[2] + parseFloat( jQuery.css( elem, name ) );
-				// Fixes bug #9237
-				type = "number";
-			}
-
-			// Make sure that null and NaN values aren't set (#7116)
-			if ( value == null || value !== value ) {
-				return;
-			}
-
-			// If a number, add 'px' to the (except for certain CSS properties)
-			if ( type === "number" && !jQuery.cssNumber[ origName ] ) {
-				value += "px";
-			}
-
-			// Support: IE9-11+
-			// background-* props affect original clone's values
-			if ( !support.clearCloneStyle && value === "" && name.indexOf( "background" ) === 0 ) {
-				style[ name ] = "inherit";
-			}
-
-			// If a hook was provided, use that value, otherwise just set the specified value
-			if ( !hooks || !("set" in hooks) || (value = hooks.set( elem, value, extra )) !== undefined ) {
-				style[ name ] = value;
-			}
-
-		} else {
-			// If a hook was provided get the non-computed value from there
-			if ( hooks && "get" in hooks && (ret = hooks.get( elem, false, extra )) !== undefined ) {
-				return ret;
-			}
-
-			// Otherwise just get the value from the style object
-			return style[ name ];
-		}
-	},
-
-	css: function( elem, name, extra, styles ) {
-		var val, num, hooks,
-			origName = jQuery.camelCase( name );
-
-		// Make sure that we're working with the right name
-		name = jQuery.cssProps[ origName ] || ( jQuery.cssProps[ origName ] = vendorPropName( elem.style, origName ) );
-
-		// Try prefixed name followed by the unprefixed name
-		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
-
-		// If a hook was provided get the computed value from there
-		if ( hooks && "get" in hooks ) {
-			val = hooks.get( elem, true, extra );
-		}
-
-		// Otherwise, if a way to get the computed value exists, use that
-		if ( val === undefined ) {
-			val = curCSS( elem, name, styles );
-		}
-
-		// Convert "normal" to computed value
-		if ( val === "normal" && name in cssNormalTransform ) {
-			val = cssNormalTransform[ name ];
-		}
-
-		// Make numeric if forced or a qualifier was provided and val looks numeric
-		if ( extra === "" || extra ) {
-			num = parseFloat( val );
-			return extra === true || jQuery.isNumeric( num ) ? num || 0 : val;
-		}
-		return val;
-	}
-});
-
-jQuery.each([ "height", "width" ], function( i, name ) {
-	jQuery.cssHooks[ name ] = {
-		get: function( elem, computed, extra ) {
-			if ( computed ) {
-
-				// Certain elements can have dimension info if we invisibly show them
-				// but it must have a current display style that would benefit
-				return rdisplayswap.test( jQuery.css( elem, "display" ) ) && elem.offsetWidth === 0 ?
-					jQuery.swap( elem, cssShow, function() {
-						return getWidthOrHeight( elem, name, extra );
-					}) :
-					getWidthOrHeight( elem, name, extra );
-			}
-		},
-
-		set: function( elem, value, extra ) {
-			var styles = extra && getStyles( elem );
-			return setPositiveNumber( elem, value, extra ?
-				augmentWidthOrHeight(
-					elem,
-					name,
-					extra,
-					jQuery.css( elem, "boxSizing", false, styles ) === "border-box",
-					styles
-				) : 0
-			);
-		}
-	};
-});
-
-// Support: Android 2.3
-jQuery.cssHooks.marginRight = addGetHookIf( support.reliableMarginRight,
-	function( elem, computed ) {
-		if ( computed ) {
-			return jQuery.swap( elem, { "display": "inline-block" },
-				curCSS, [ elem, "marginRight" ] );
-		}
-	}
-);
-
-// These hooks are used by animate to expand properties
-jQuery.each({
-	margin: "",
-	padding: "",
-	border: "Width"
-}, function( prefix, suffix ) {
-	jQuery.cssHooks[ prefix + suffix ] = {
-		expand: function( value ) {
-			var i = 0,
-				expanded = {},
-
-				// Assumes a single number if not a string
-				parts = typeof value === "string" ? value.split(" ") : [ value ];
-
-			for ( ; i < 4; i++ ) {
-				expanded[ prefix + cssExpand[ i ] + suffix ] =
-					parts[ i ] || parts[ i - 2 ] || parts[ 0 ];
-			}
-
-			return expanded;
-		}
-	};
-
-	if ( !rmargin.test( prefix ) ) {
-		jQuery.cssHooks[ prefix + suffix ].set = setPositiveNumber;
-	}
-});
-
-jQuery.fn.extend({
-	css: function( name, value ) {
-		return access( this, function( elem, name, value ) {
-			var styles, len,
-				map = {},
-				i = 0;
-
-			if ( jQuery.isArray( name ) ) {
-				styles = getStyles( elem );
-				len = name.length;
-
-				for ( ; i < len; i++ ) {
-					map[ name[ i ] ] = jQuery.css( elem, name[ i ], false, styles );
-				}
-
-				return map;
-			}
-
-			return value !== undefined ?
-				jQuery.style( elem, name, value ) :
-				jQuery.css( elem, name );
-		}, name, value, arguments.length > 1 );
-	},
-	show: function() {
-		return showHide( this, true );
-	},
-	hide: function() {
-		return showHide( this );
-	},
-	toggle: function( state ) {
-		if ( typeof state === "boolean" ) {
-			return state ? this.show() : this.hide();
-		}
-
-		return this.each(function() {
-			if ( isHidden( this ) ) {
-				jQuery( this ).show();
-			} else {
-				jQuery( this ).hide();
-			}
-		});
-	}
-});
-
-return jQuery;
-});
diff --git a/#pma/js/jquery/src/jquery/css/addGetHookIf.js b/#pma/js/jquery/src/jquery/css/addGetHookIf.js
deleted file mode 100644
index e12f3598..00000000
--- a/#pma/js/jquery/src/jquery/css/addGetHookIf.js
+++ /dev/null
@@ -1,22 +0,0 @@
-define(function() {
-
-function addGetHookIf( conditionFn, hookFn ) {
-	// Define the hook, we'll check on the first run if it's really needed.
-	return {
-		get: function() {
-			if ( conditionFn() ) {
-				// Hook not needed (or it's not possible to use it due
-				// to missing dependency), remove it.
-				delete this.get;
-				return;
-			}
-
-			// Hook needed; redefine it so that the support test is not executed again.
-			return (this.get = hookFn).apply( this, arguments );
-		}
-	};
-}
-
-return addGetHookIf;
-
-});
diff --git a/#pma/js/jquery/src/jquery/css/curCSS.js b/#pma/js/jquery/src/jquery/css/curCSS.js
deleted file mode 100644
index 90e508cb..00000000
--- a/#pma/js/jquery/src/jquery/css/curCSS.js
+++ /dev/null
@@ -1,57 +0,0 @@
-define([
-	"../core",
-	"./var/rnumnonpx",
-	"./var/rmargin",
-	"./var/getStyles",
-	"../selector" // contains
-], function( jQuery, rnumnonpx, rmargin, getStyles ) {
-
-function curCSS( elem, name, computed ) {
-	var width, minWidth, maxWidth, ret,
-		style = elem.style;
-
-	computed = computed || getStyles( elem );
-
-	// Support: IE9
-	// getPropertyValue is only needed for .css('filter') (#12537)
-	if ( computed ) {
-		ret = computed.getPropertyValue( name ) || computed[ name ];
-	}
-
-	if ( computed ) {
-
-		if ( ret === "" && !jQuery.contains( elem.ownerDocument, elem ) ) {
-			ret = jQuery.style( elem, name );
-		}
-
-		// Support: iOS < 6
-		// A tribute to the "awesome hack by Dean Edwards"
-		// iOS < 6 (at least) returns percentage for a larger set of values, but width seems to be reliably pixels
-		// this is against the CSSOM draft spec: http://dev.w3.org/csswg/cssom/#resolved-values
-		if ( rnumnonpx.test( ret ) && rmargin.test( name ) ) {
-
-			// Remember the original values
-			width = style.width;
-			minWidth = style.minWidth;
-			maxWidth = style.maxWidth;
-
-			// Put in the new values to get a computed value out
-			style.minWidth = style.maxWidth = style.width = ret;
-			ret = computed.width;
-
-			// Revert the changed values
-			style.width = width;
-			style.minWidth = minWidth;
-			style.maxWidth = maxWidth;
-		}
-	}
-
-	return ret !== undefined ?
-		// Support: IE
-		// IE returns zIndex value as an integer.
-		ret + "" :
-		ret;
-}
-
-return curCSS;
-});
diff --git a/#pma/js/jquery/src/jquery/css/defaultDisplay.js b/#pma/js/jquery/src/jquery/css/defaultDisplay.js
deleted file mode 100644
index 046ae91b..00000000
--- a/#pma/js/jquery/src/jquery/css/defaultDisplay.js
+++ /dev/null
@@ -1,70 +0,0 @@
-define([
-	"../core",
-	"../manipulation" // appendTo
-], function( jQuery ) {
-
-var iframe,
-	elemdisplay = {};
-
-/**
- * Retrieve the actual display of a element
- * @param {String} name nodeName of the element
- * @param {Object} doc Document object
- */
-// Called only from within defaultDisplay
-function actualDisplay( name, doc ) {
-	var style,
-		elem = jQuery( doc.createElement( name ) ).appendTo( doc.body ),
-
-		// getDefaultComputedStyle might be reliably used only on attached element
-		display = window.getDefaultComputedStyle && ( style = window.getDefaultComputedStyle( elem[ 0 ] ) ) ?
-
-			// Use of this method is a temporary fix (more like optimization) until something better comes along,
-			// since it was removed from specification and supported only in FF
-			style.display : jQuery.css( elem[ 0 ], "display" );
-
-	// We don't have any data stored on the element,
-	// so use "detach" method as fast way to get rid of the element
-	elem.detach();
-
-	return display;
-}
-
-/**
- * Try to determine the default display value of an element
- * @param {String} nodeName
- */
-function defaultDisplay( nodeName ) {
-	var doc = document,
-		display = elemdisplay[ nodeName ];
-
-	if ( !display ) {
-		display = actualDisplay( nodeName, doc );
-
-		// If the simple way fails, read from inside an iframe
-		if ( display === "none" || !display ) {
-
-			// Use the already-created iframe if possible
-			iframe = (iframe || jQuery( "<iframe frameborder='0' width='0' height='0'/>" )).appendTo( doc.documentElement );
-
-			// Always write a new HTML skeleton so Webkit and Firefox don't choke on reuse
-			doc = iframe[ 0 ].contentDocument;
-
-			// Support: IE
-			doc.write();
-			doc.close();
-
-			display = actualDisplay( nodeName, doc );
-			iframe.detach();
-		}
-
-		// Store the correct default display
-		elemdisplay[ nodeName ] = display;
-	}
-
-	return display;
-}
-
-return defaultDisplay;
-
-});
diff --git a/#pma/js/jquery/src/jquery/css/hiddenVisibleSelectors.js b/#pma/js/jquery/src/jquery/css/hiddenVisibleSelectors.js
deleted file mode 100644
index c7f1c7ee..00000000
--- a/#pma/js/jquery/src/jquery/css/hiddenVisibleSelectors.js
+++ /dev/null
@@ -1,15 +0,0 @@
-define([
-	"../core",
-	"../selector"
-], function( jQuery ) {
-
-jQuery.expr.filters.hidden = function( elem ) {
-	// Support: Opera <= 12.12
-	// Opera reports offsetWidths and offsetHeights less than zero on some elements
-	return elem.offsetWidth <= 0 && elem.offsetHeight <= 0;
-};
-jQuery.expr.filters.visible = function( elem ) {
-	return !jQuery.expr.filters.hidden( elem );
-};
-
-});
diff --git a/#pma/js/jquery/src/jquery/css/support.js b/#pma/js/jquery/src/jquery/css/support.js
deleted file mode 100644
index b9eaf140..00000000
--- a/#pma/js/jquery/src/jquery/css/support.js
+++ /dev/null
@@ -1,96 +0,0 @@
-define([
-	"../core",
-	"../var/support"
-], function( jQuery, support ) {
-
-(function() {
-	var pixelPositionVal, boxSizingReliableVal,
-		docElem = document.documentElement,
-		container = document.createElement( "div" ),
-		div = document.createElement( "div" );
-
-	if ( !div.style ) {
-		return;
-	}
-
-	// Support: IE9-11+
-	// Style of cloned element affects source element cloned (#8908)
-	div.style.backgroundClip = "content-box";
-	div.cloneNode( true ).style.backgroundClip = "";
-	support.clearCloneStyle = div.style.backgroundClip === "content-box";
-
-	container.style.cssText = "border:0;width:0;height:0;top:0;left:-9999px;margin-top:1px;" +
-		"position:absolute";
-	container.appendChild( div );
-
-	// Executing both pixelPosition & boxSizingReliable tests require only one layout
-	// so they're executed at the same time to save the second computation.
-	function computePixelPositionAndBoxSizingReliable() {
-		div.style.cssText =
-			// Support: Firefox<29, Android 2.3
-			// Vendor-prefix box-sizing
-			"-webkit-box-sizing:border-box;-moz-box-sizing:border-box;" +
-			"box-sizing:border-box;display:block;margin-top:1%;top:1%;" +
-			"border:1px;padding:1px;width:4px;position:absolute";
-		div.innerHTML = "";
-		docElem.appendChild( container );
-
-		var divStyle = window.getComputedStyle( div, null );
-		pixelPositionVal = divStyle.top !== "1%";
-		boxSizingReliableVal = divStyle.width === "4px";
-
-		docElem.removeChild( container );
-	}
-
-	// Support: node.js jsdom
-	// Don't assume that getComputedStyle is a property of the global object
-	if ( window.getComputedStyle ) {
-		jQuery.extend( support, {
-			pixelPosition: function() {
-
-				// This test is executed only once but we still do memoizing
-				// since we can use the boxSizingReliable pre-computing.
-				// No need to check if the test was already performed, though.
-				computePixelPositionAndBoxSizingReliable();
-				return pixelPositionVal;
-			},
-			boxSizingReliable: function() {
-				if ( boxSizingReliableVal == null ) {
-					computePixelPositionAndBoxSizingReliable();
-				}
-				return boxSizingReliableVal;
-			},
-			reliableMarginRight: function() {
-
-				// Support: Android 2.3
-				// Check if div with explicit width and no margin-right incorrectly
-				// gets computed margin-right based on width of container. (#3333)
-				// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
-				// This support function is only executed once so no memoizing is needed.
-				var ret,
-					marginDiv = div.appendChild( document.createElement( "div" ) );
-
-				// Reset CSS: box-sizing; display; margin; border; padding
-				marginDiv.style.cssText = div.style.cssText =
-					// Support: Firefox<29, Android 2.3
-					// Vendor-prefix box-sizing
-					"-webkit-box-sizing:content-box;-moz-box-sizing:content-box;" +
-					"box-sizing:content-box;display:block;margin:0;border:0;padding:0";
-				marginDiv.style.marginRight = marginDiv.style.width = "0";
-				div.style.width = "1px";
-				docElem.appendChild( container );
-
-				ret = !parseFloat( window.getComputedStyle( marginDiv, null ).marginRight );
-
-				docElem.removeChild( container );
-				div.removeChild( marginDiv );
-
-				return ret;
-			}
-		});
-	}
-})();
-
-return support;
-
-});
diff --git a/#pma/js/jquery/src/jquery/css/swap.js b/#pma/js/jquery/src/jquery/css/swap.js
deleted file mode 100644
index ce164353..00000000
--- a/#pma/js/jquery/src/jquery/css/swap.js
+++ /dev/null
@@ -1,28 +0,0 @@
-define([
-	"../core"
-], function( jQuery ) {
-
-// A method for quickly swapping in/out CSS properties to get correct calculations.
-jQuery.swap = function( elem, options, callback, args ) {
-	var ret, name,
-		old = {};
-
-	// Remember the old values, and insert the new ones
-	for ( name in options ) {
-		old[ name ] = elem.style[ name ];
-		elem.style[ name ] = options[ name ];
-	}
-
-	ret = callback.apply( elem, args || [] );
-
-	// Revert the old values
-	for ( name in options ) {
-		elem.style[ name ] = old[ name ];
-	}
-
-	return ret;
-};
-
-return jQuery.swap;
-
-});
diff --git a/#pma/js/jquery/src/jquery/css/var/cssExpand.js b/#pma/js/jquery/src/jquery/css/var/cssExpand.js
deleted file mode 100644
index 91e90a88..00000000
--- a/#pma/js/jquery/src/jquery/css/var/cssExpand.js
+++ /dev/null
@@ -1,3 +0,0 @@
-define(function() {
-	return [ "Top", "Right", "Bottom", "Left" ];
-});
diff --git a/#pma/js/jquery/src/jquery/css/var/getStyles.js b/#pma/js/jquery/src/jquery/css/var/getStyles.js
deleted file mode 100644
index 413acd04..00000000
--- a/#pma/js/jquery/src/jquery/css/var/getStyles.js
+++ /dev/null
@@ -1,12 +0,0 @@
-define(function() {
-	return function( elem ) {
-		// Support: IE<=11+, Firefox<=30+ (#15098, #14150)
-		// IE throws on elements created in popups
-		// FF meanwhile throws on frame elements through "defaultView.getComputedStyle"
-		if ( elem.ownerDocument.defaultView.opener ) {
-			return elem.ownerDocument.defaultView.getComputedStyle( elem, null );
-		}
-
-		return window.getComputedStyle( elem, null );
-	};
-});
diff --git a/#pma/js/jquery/src/jquery/css/var/isHidden.js b/#pma/js/jquery/src/jquery/css/var/isHidden.js
deleted file mode 100644
index 15ab81a9..00000000
--- a/#pma/js/jquery/src/jquery/css/var/isHidden.js
+++ /dev/null
@@ -1,13 +0,0 @@
-define([
-	"../../core",
-	"../../selector"
-	// css is assumed
-], function( jQuery ) {
-
-	return function( elem, el ) {
-		// isHidden might be called from jQuery#filter function;
-		// in that case, element will be second argument
-		elem = el || elem;
-		return jQuery.css( elem, "display" ) === "none" || !jQuery.contains( elem.ownerDocument, elem );
-	};
-});
diff --git a/#pma/js/jquery/src/jquery/css/var/rmargin.js b/#pma/js/jquery/src/jquery/css/var/rmargin.js
deleted file mode 100644
index da0438db..00000000
--- a/#pma/js/jquery/src/jquery/css/var/rmargin.js
+++ /dev/null
@@ -1,3 +0,0 @@
-define(function() {
-	return (/^margin/);
-});
diff --git a/#pma/js/jquery/src/jquery/css/var/rnumnonpx.js b/#pma/js/jquery/src/jquery/css/var/rnumnonpx.js
deleted file mode 100644
index c93be285..00000000
--- a/#pma/js/jquery/src/jquery/css/var/rnumnonpx.js
+++ /dev/null
@@ -1,5 +0,0 @@
-define([
-	"../../var/pnum"
-], function( pnum ) {
-	return new RegExp( "^(" + pnum + ")(?!px)[a-z%]+$", "i" );
-});
diff --git a/#pma/js/jquery/src/jquery/data.js b/#pma/js/jquery/src/jquery/data.js
deleted file mode 100644
index f9af9ae6..00000000
--- a/#pma/js/jquery/src/jquery/data.js
+++ /dev/null
@@ -1,178 +0,0 @@
-define([
-	"./core",
-	"./var/rnotwhite",
-	"./core/access",
-	"./data/var/data_priv",
-	"./data/var/data_user"
-], function( jQuery, rnotwhite, access, data_priv, data_user ) {
-
-//	Implementation Summary
-//
-//	1. Enforce API surface and semantic compatibility with 1.9.x branch
-//	2. Improve the module's maintainability by reducing the storage
-//		paths to a single mechanism.
-//	3. Use the same single mechanism to support "private" and "user" data.
-//	4. _Never_ expose "private" data to user code (TODO: Drop _data, _removeData)
-//	5. Avoid exposing implementation details on user objects (eg. expando properties)
-//	6. Provide a clear path for implementation upgrade to WeakMap in 2014
-
-var rbrace = /^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,
-	rmultiDash = /([A-Z])/g;
-
-function dataAttr( elem, key, data ) {
-	var name;
-
-	// If nothing was found internally, try to fetch any
-	// data from the HTML5 data-* attribute
-	if ( data === undefined && elem.nodeType === 1 ) {
-		name = "data-" + key.replace( rmultiDash, "-$1" ).toLowerCase();
-		data = elem.getAttribute( name );
-
-		if ( typeof data === "string" ) {
-			try {
-				data = data === "true" ? true :
-					data === "false" ? false :
-					data === "null" ? null :
-					// Only convert to a number if it doesn't change the string
-					+data + "" === data ? +data :
-					rbrace.test( data ) ? jQuery.parseJSON( data ) :
-					data;
-			} catch( e ) {}
-
-			// Make sure we set the data so it isn't changed later
-			data_user.set( elem, key, data );
-		} else {
-			data = undefined;
-		}
-	}
-	return data;
-}
-
-jQuery.extend({
-	hasData: function( elem ) {
-		return data_user.hasData( elem ) || data_priv.hasData( elem );
-	},
-
-	data: function( elem, name, data ) {
-		return data_user.access( elem, name, data );
-	},
-
-	removeData: function( elem, name ) {
-		data_user.remove( elem, name );
-	},
-
-	// TODO: Now that all calls to _data and _removeData have been replaced
-	// with direct calls to data_priv methods, these can be deprecated.
-	_data: function( elem, name, data ) {
-		return data_priv.access( elem, name, data );
-	},
-
-	_removeData: function( elem, name ) {
-		data_priv.remove( elem, name );
-	}
-});
-
-jQuery.fn.extend({
-	data: function( key, value ) {
-		var i, name, data,
-			elem = this[ 0 ],
-			attrs = elem && elem.attributes;
-
-		// Gets all values
-		if ( key === undefined ) {
-			if ( this.length ) {
-				data = data_user.get( elem );
-
-				if ( elem.nodeType === 1 && !data_priv.get( elem, "hasDataAttrs" ) ) {
-					i = attrs.length;
-					while ( i-- ) {
-
-						// Support: IE11+
-						// The attrs elements can be null (#14894)
-						if ( attrs[ i ] ) {
-							name = attrs[ i ].name;
-							if ( name.indexOf( "data-" ) === 0 ) {
-								name = jQuery.camelCase( name.slice(5) );
-								dataAttr( elem, name, data[ name ] );
-							}
-						}
-					}
-					data_priv.set( elem, "hasDataAttrs", true );
-				}
-			}
-
-			return data;
-		}
-
-		// Sets multiple values
-		if ( typeof key === "object" ) {
-			return this.each(function() {
-				data_user.set( this, key );
-			});
-		}
-
-		return access( this, function( value ) {
-			var data,
-				camelKey = jQuery.camelCase( key );
-
-			// The calling jQuery object (element matches) is not empty
-			// (and therefore has an element appears at this[ 0 ]) and the
-			// `value` parameter was not undefined. An empty jQuery object
-			// will result in `undefined` for elem = this[ 0 ] which will
-			// throw an exception if an attempt to read a data cache is made.
-			if ( elem && value === undefined ) {
-				// Attempt to get data from the cache
-				// with the key as-is
-				data = data_user.get( elem, key );
-				if ( data !== undefined ) {
-					return data;
-				}
-
-				// Attempt to get data from the cache
-				// with the key camelized
-				data = data_user.get( elem, camelKey );
-				if ( data !== undefined ) {
-					return data;
-				}
-
-				// Attempt to "discover" the data in
-				// HTML5 custom data-* attrs
-				data = dataAttr( elem, camelKey, undefined );
-				if ( data !== undefined ) {
-					return data;
-				}
-
-				// We tried really hard, but the data doesn't exist.
-				return;
-			}
-
-			// Set the data...
-			this.each(function() {
-				// First, attempt to store a copy or reference of any
-				// data that might've been store with a camelCased key.
-				var data = data_user.get( this, camelKey );
-
-				// For HTML5 data-* attribute interop, we have to
-				// store property names with dashes in a camelCase form.
-				// This might not apply to all properties...*
-				data_user.set( this, camelKey, value );
-
-				// *... In the case of properties that might _actually_
-				// have dashes, we need to also store a copy of that
-				// unchanged property.
-				if ( key.indexOf("-") !== -1 && data !== undefined ) {
-					data_user.set( this, key, value );
-				}
-			});
-		}, null, value, arguments.length > 1, null, true );
-	},
-
-	removeData: function( key ) {
-		return this.each(function() {
-			data_user.remove( this, key );
-		});
-	}
-});
-
-return jQuery;
-});
diff --git a/#pma/js/jquery/src/jquery/data/Data.js b/#pma/js/jquery/src/jquery/data/Data.js
deleted file mode 100644
index 85afd64f..00000000
--- a/#pma/js/jquery/src/jquery/data/Data.js
+++ /dev/null
@@ -1,181 +0,0 @@
-define([
-	"../core",
-	"../var/rnotwhite",
-	"./accepts"
-], function( jQuery, rnotwhite ) {
-
-function Data() {
-	// Support: Android<4,
-	// Old WebKit does not have Object.preventExtensions/freeze method,
-	// return new empty object instead with no [[set]] accessor
-	Object.defineProperty( this.cache = {}, 0, {
-		get: function() {
-			return {};
-		}
-	});
-
-	this.expando = jQuery.expando + Data.uid++;
-}
-
-Data.uid = 1;
-Data.accepts = jQuery.acceptData;
-
-Data.prototype = {
-	key: function( owner ) {
-		// We can accept data for non-element nodes in modern browsers,
-		// but we should not, see #8335.
-		// Always return the key for a frozen object.
-		if ( !Data.accepts( owner ) ) {
-			return 0;
-		}
-
-		var descriptor = {},
-			// Check if the owner object already has a cache key
-			unlock = owner[ this.expando ];
-
-		// If not, create one
-		if ( !unlock ) {
-			unlock = Data.uid++;
-
-			// Secure it in a non-enumerable, non-writable property
-			try {
-				descriptor[ this.expando ] = { value: unlock };
-				Object.defineProperties( owner, descriptor );
-
-			// Support: Android<4
-			// Fallback to a less secure definition
-			} catch ( e ) {
-				descriptor[ this.expando ] = unlock;
-				jQuery.extend( owner, descriptor );
-			}
-		}
-
-		// Ensure the cache object
-		if ( !this.cache[ unlock ] ) {
-			this.cache[ unlock ] = {};
-		}
-
-		return unlock;
-	},
-	set: function( owner, data, value ) {
-		var prop,
-			// There may be an unlock assigned to this node,
-			// if there is no entry for this "owner", create one inline
-			// and set the unlock as though an owner entry had always existed
-			unlock = this.key( owner ),
-			cache = this.cache[ unlock ];
-
-		// Handle: [ owner, key, value ] args
-		if ( typeof data === "string" ) {
-			cache[ data ] = value;
-
-		// Handle: [ owner, { properties } ] args
-		} else {
-			// Fresh assignments by object are shallow copied
-			if ( jQuery.isEmptyObject( cache ) ) {
-				jQuery.extend( this.cache[ unlock ], data );
-			// Otherwise, copy the properties one-by-one to the cache object
-			} else {
-				for ( prop in data ) {
-					cache[ prop ] = data[ prop ];
-				}
-			}
-		}
-		return cache;
-	},
-	get: function( owner, key ) {
-		// Either a valid cache is found, or will be created.
-		// New caches will be created and the unlock returned,
-		// allowing direct access to the newly created
-		// empty data object. A valid owner object must be provided.
-		var cache = this.cache[ this.key( owner ) ];
-
-		return key === undefined ?
-			cache : cache[ key ];
-	},
-	access: function( owner, key, value ) {
-		var stored;
-		// In cases where either:
-		//
-		//   1. No key was specified
-		//   2. A string key was specified, but no value provided
-		//
-		// Take the "read" path and allow the get method to determine
-		// which value to return, respectively either:
-		//
-		//   1. The entire cache object
-		//   2. The data stored at the key
-		//
-		if ( key === undefined ||
-				((key && typeof key === "string") && value === undefined) ) {
-
-			stored = this.get( owner, key );
-
-			return stored !== undefined ?
-				stored : this.get( owner, jQuery.camelCase(key) );
-		}
-
-		// [*]When the key is not a string, or both a key and value
-		// are specified, set or extend (existing objects) with either:
-		//
-		//   1. An object of properties
-		//   2. A key and value
-		//
-		this.set( owner, key, value );
-
-		// Since the "set" path can have two possible entry points
-		// return the expected data based on which path was taken[*]
-		return value !== undefined ? value : key;
-	},
-	remove: function( owner, key ) {
-		var i, name, camel,
-			unlock = this.key( owner ),
-			cache = this.cache[ unlock ];
-
-		if ( key === undefined ) {
-			this.cache[ unlock ] = {};
-
-		} else {
-			// Support array or space separated string of keys
-			if ( jQuery.isArray( key ) ) {
-				// If "name" is an array of keys...
-				// When data is initially created, via ("key", "val") signature,
-				// keys will be converted to camelCase.
-				// Since there is no way to tell _how_ a key was added, remove
-				// both plain key and camelCase key. #12786
-				// This will only penalize the array argument path.
-				name = key.concat( key.map( jQuery.camelCase ) );
-			} else {
-				camel = jQuery.camelCase( key );
-				// Try the string as a key before any manipulation
-				if ( key in cache ) {
-					name = [ key, camel ];
-				} else {
-					// If a key with the spaces exists, use it.
-					// Otherwise, create an array by matching non-whitespace
-					name = camel;
-					name = name in cache ?
-						[ name ] : ( name.match( rnotwhite ) || [] );
-				}
-			}
-
-			i = name.length;
-			while ( i-- ) {
-				delete cache[ name[ i ] ];
-			}
-		}
-	},
-	hasData: function( owner ) {
-		return !jQuery.isEmptyObject(
-			this.cache[ owner[ this.expando ] ] || {}
-		);
-	},
-	discard: function( owner ) {
-		if ( owner[ this.expando ] ) {
-			delete this.cache[ owner[ this.expando ] ];
-		}
-	}
-};
-
-return Data;
-});
diff --git a/#pma/js/jquery/src/jquery/data/accepts.js b/#pma/js/jquery/src/jquery/data/accepts.js
deleted file mode 100644
index 291c7b47..00000000
--- a/#pma/js/jquery/src/jquery/data/accepts.js
+++ /dev/null
@@ -1,20 +0,0 @@
-define([
-	"../core"
-], function( jQuery ) {
-
-/**
- * Determines whether an object can have data
- */
-jQuery.acceptData = function( owner ) {
-	// Accepts only:
-	//  - Node
-	//    - Node.ELEMENT_NODE
-	//    - Node.DOCUMENT_NODE
-	//  - Object
-	//    - Any
-	/* jshint -W018 */
-	return owner.nodeType === 1 || owner.nodeType === 9 || !( +owner.nodeType );
-};
-
-return jQuery.acceptData;
-});
diff --git a/#pma/js/jquery/src/jquery/data/var/data_priv.js b/#pma/js/jquery/src/jquery/data/var/data_priv.js
deleted file mode 100644
index 24399e46..00000000
--- a/#pma/js/jquery/src/jquery/data/var/data_priv.js
+++ /dev/null
@@ -1,5 +0,0 @@
-define([
-	"../Data"
-], function( Data ) {
-	return new Data();
-});
diff --git a/#pma/js/jquery/src/jquery/data/var/data_user.js b/#pma/js/jquery/src/jquery/data/var/data_user.js
deleted file mode 100644
index 24399e46..00000000
--- a/#pma/js/jquery/src/jquery/data/var/data_user.js
+++ /dev/null
@@ -1,5 +0,0 @@
-define([
-	"../Data"
-], function( Data ) {
-	return new Data();
-});
diff --git a/#pma/js/jquery/src/jquery/deferred.js b/#pma/js/jquery/src/jquery/deferred.js
deleted file mode 100644
index 98f9c313..00000000
--- a/#pma/js/jquery/src/jquery/deferred.js
+++ /dev/null
@@ -1,149 +0,0 @@
-define([
-	"./core",
-	"./var/slice",
-	"./callbacks"
-], function( jQuery, slice ) {
-
-jQuery.extend({
-
-	Deferred: function( func ) {
-		var tuples = [
-				// action, add listener, listener list, final state
-				[ "resolve", "done", jQuery.Callbacks("once memory"), "resolved" ],
-				[ "reject", "fail", jQuery.Callbacks("once memory"), "rejected" ],
-				[ "notify", "progress", jQuery.Callbacks("memory") ]
-			],
-			state = "pending",
-			promise = {
-				state: function() {
-					return state;
-				},
-				always: function() {
-					deferred.done( arguments ).fail( arguments );
-					return this;
-				},
-				then: function( /* fnDone, fnFail, fnProgress */ ) {
-					var fns = arguments;
-					return jQuery.Deferred(function( newDefer ) {
-						jQuery.each( tuples, function( i, tuple ) {
-							var fn = jQuery.isFunction( fns[ i ] ) && fns[ i ];
-							// deferred[ done | fail | progress ] for forwarding actions to newDefer
-							deferred[ tuple[1] ](function() {
-								var returned = fn && fn.apply( this, arguments );
-								if ( returned && jQuery.isFunction( returned.promise ) ) {
-									returned.promise()
-										.done( newDefer.resolve )
-										.fail( newDefer.reject )
-										.progress( newDefer.notify );
-								} else {
-									newDefer[ tuple[ 0 ] + "With" ]( this === promise ? newDefer.promise() : this, fn ? [ returned ] : arguments );
-								}
-							});
-						});
-						fns = null;
-					}).promise();
-				},
-				// Get a promise for this deferred
-				// If obj is provided, the promise aspect is added to the object
-				promise: function( obj ) {
-					return obj != null ? jQuery.extend( obj, promise ) : promise;
-				}
-			},
-			deferred = {};
-
-		// Keep pipe for back-compat
-		promise.pipe = promise.then;
-
-		// Add list-specific methods
-		jQuery.each( tuples, function( i, tuple ) {
-			var list = tuple[ 2 ],
-				stateString = tuple[ 3 ];
-
-			// promise[ done | fail | progress ] = list.add
-			promise[ tuple[1] ] = list.add;
-
-			// Handle state
-			if ( stateString ) {
-				list.add(function() {
-					// state = [ resolved | rejected ]
-					state = stateString;
-
-				// [ reject_list | resolve_list ].disable; progress_list.lock
-				}, tuples[ i ^ 1 ][ 2 ].disable, tuples[ 2 ][ 2 ].lock );
-			}
-
-			// deferred[ resolve | reject | notify ]
-			deferred[ tuple[0] ] = function() {
-				deferred[ tuple[0] + "With" ]( this === deferred ? promise : this, arguments );
-				return this;
-			};
-			deferred[ tuple[0] + "With" ] = list.fireWith;
-		});
-
-		// Make the deferred a promise
-		promise.promise( deferred );
-
-		// Call given func if any
-		if ( func ) {
-			func.call( deferred, deferred );
-		}
-
-		// All done!
-		return deferred;
-	},
-
-	// Deferred helper
-	when: function( subordinate /* , ..., subordinateN */ ) {
-		var i = 0,
-			resolveValues = slice.call( arguments ),
-			length = resolveValues.length,
-
-			// the count of uncompleted subordinates
-			remaining = length !== 1 || ( subordinate && jQuery.isFunction( subordinate.promise ) ) ? length : 0,
-
-			// the master Deferred. If resolveValues consist of only a single Deferred, just use that.
-			deferred = remaining === 1 ? subordinate : jQuery.Deferred(),
-
-			// Update function for both resolve and progress values
-			updateFunc = function( i, contexts, values ) {
-				return function( value ) {
-					contexts[ i ] = this;
-					values[ i ] = arguments.length > 1 ? slice.call( arguments ) : value;
-					if ( values === progressValues ) {
-						deferred.notifyWith( contexts, values );
-					} else if ( !( --remaining ) ) {
-						deferred.resolveWith( contexts, values );
-					}
-				};
-			},
-
-			progressValues, progressContexts, resolveContexts;
-
-		// Add listeners to Deferred subordinates; treat others as resolved
-		if ( length > 1 ) {
-			progressValues = new Array( length );
-			progressContexts = new Array( length );
-			resolveContexts = new Array( length );
-			for ( ; i < length; i++ ) {
-				if ( resolveValues[ i ] && jQuery.isFunction( resolveValues[ i ].promise ) ) {
-					resolveValues[ i ].promise()
-						.done( updateFunc( i, resolveContexts, resolveValues ) )
-						.fail( deferred.reject )
-						.progress( updateFunc( i, progressContexts, progressValues ) );
-				} else {
-					--remaining;
-				}
-			}
-		}
-
-		// If we're not waiting on anything, resolve the master
-		if ( !remaining ) {
-			deferred.resolveWith( resolveContexts, resolveValues );
-		}
-
-		return deferred.promise();
-	}
-});
-
-return jQuery;
-});
diff --git a/#pma/js/jquery/src/jquery/deprecated.js b/#pma/js/jquery/src/jquery/deprecated.js
deleted file mode 100644
index 1b068bc3..00000000
--- a/#pma/js/jquery/src/jquery/deprecated.js
+++ /dev/null
@@ -1,13 +0,0 @@
-define([
-	"./core",
-	"./traversing"
-], function( jQuery ) {
-
-// The number of elements contained in the matched element set
-jQuery.fn.size = function() {
-	return this.length;
-};
-
-jQuery.fn.andSelf = jQuery.fn.addBack;
-
-});
diff --git a/#pma/js/jquery/src/jquery/dimensions.js b/#pma/js/jquery/src/jquery/dimensions.js
deleted file mode 100644
index e6cb04c0..00000000
--- a/#pma/js/jquery/src/jquery/dimensions.js
+++ /dev/null
@@ -1,50 +0,0 @@
-define([
-	"./core",
-	"./core/access",
-	"./css"
-], function( jQuery, access ) {
-
-// Create innerHeight, innerWidth, height, width, outerHeight and outerWidth methods
-jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
-	jQuery.each( { padding: "inner" + name, content: type, "": "outer" + name }, function( defaultExtra, funcName ) {
-		// Margin is only for outerHeight, outerWidth
-		jQuery.fn[ funcName ] = function( margin, value ) {
-			var chainable = arguments.length && ( defaultExtra || typeof margin !== "boolean" ),
-				extra = defaultExtra || ( margin === true || value === true ? "margin" : "border" );
-
-			return access( this, function( elem, type, value ) {
-				var doc;
-
-				if ( jQuery.isWindow( elem ) ) {
-					// As of 5/8/2012 this will yield incorrect results for Mobile Safari, but there
-					// isn't a whole lot we can do. See pull request at this URL for discussion:
-					// https://github.com/jquery/jquery/pull/764
-					return elem.document.documentElement[ "client" + name ];
-				}
-
-				// Get document width or height
-				if ( elem.nodeType === 9 ) {
-					doc = elem.documentElement;
-
-					// Either scroll[Width/Height] or offset[Width/Height] or client[Width/Height],
-					// whichever is greatest
-					return Math.max(
-						elem.body[ "scroll" + name ], doc[ "scroll" + name ],
-						elem.body[ "offset" + name ], doc[ "offset" + name ],
-						doc[ "client" + name ]
-					);
-				}
-
-				return value === undefined ?
-					// Get width or height on the element, requesting but not forcing parseFloat
-					jQuery.css( elem, type, extra ) :
-
-					// Set width or height on the element
-					jQuery.style( elem, type, value, extra );
-			}, type, chainable ? margin : undefined, chainable, null );
-		};
-	});
-});
-
-return jQuery;
-});
diff --git a/#pma/js/jquery/src/jquery/effects.js b/#pma/js/jquery/src/jquery/effects.js
deleted file mode 100644
index 90226bd4..00000000
--- a/#pma/js/jquery/src/jquery/effects.js
+++ /dev/null
@@ -1,648 +0,0 @@
-define([
-	"./core",
-	"./var/pnum",
-	"./css/var/cssExpand",
-	"./css/var/isHidden",
-	"./css/defaultDisplay",
-	"./data/var/data_priv",
-
-	"./core/init",
-	"./effects/Tween",
-	"./queue",
-	"./css",
-	"./deferred",
-	"./traversing"
-], function( jQuery, pnum, cssExpand, isHidden, defaultDisplay, data_priv ) {
-
-var
-	fxNow, timerId,
-	rfxtypes = /^(?:toggle|show|hide)$/,
-	rfxnum = new RegExp( "^(?:([+-])=|)(" + pnum + ")([a-z%]*)$", "i" ),
-	rrun = /queueHooks$/,
-	animationPrefilters = [ defaultPrefilter ],
-	tweeners = {
-		"*": [ function( prop, value ) {
-			var tween = this.createTween( prop, value ),
-				target = tween.cur(),
-				parts = rfxnum.exec( value ),
-				unit = parts && parts[ 3 ] || ( jQuery.cssNumber[ prop ] ? "" : "px" ),
-
-				// Starting value computation is required for potential unit mismatches
-				start = ( jQuery.cssNumber[ prop ] || unit !== "px" && +target ) &&
-					rfxnum.exec( jQuery.css( tween.elem, prop ) ),
-				scale = 1,
-				maxIterations = 20;
-
-			if ( start && start[ 3 ] !== unit ) {
-				// Trust units reported by jQuery.css
-				unit = unit || start[ 3 ];
-
-				// Make sure we update the tween properties later on
-				parts = parts || [];
-
-				// Iteratively approximate from a nonzero starting point
-				start = +target || 1;
-
-				do {
-					// If previous iteration zeroed out, double until we get *something*.
-					// Use string for doubling so we don't accidentally see scale as unchanged below
-					scale = scale || ".5";
-
-					// Adjust and apply
-					start = start / scale;
-					jQuery.style( tween.elem, prop, start + unit );
-
-				// Update scale, tolerating zero or NaN from tween.cur(),
-				// break the loop if scale is unchanged or perfect, or if we've just had enough
-				} while ( scale !== (scale = tween.cur() / target) && scale !== 1 && --maxIterations );
-			}
-
-			// Update tween properties
-			if ( parts ) {
-				start = tween.start = +start || +target || 0;
-				tween.unit = unit;
-				// If a +=/-= token was provided, we're doing a relative animation
-				tween.end = parts[ 1 ] ?
-					start + ( parts[ 1 ] + 1 ) * parts[ 2 ] :
-					+parts[ 2 ];
-			}
-
-			return tween;
-		} ]
-	};
-
-// Animations created synchronously will run synchronously
-function createFxNow() {
-	setTimeout(function() {
-		fxNow = undefined;
-	});
-	return ( fxNow = jQuery.now() );
-}
-
-// Generate parameters to create a standard animation
-function genFx( type, includeWidth ) {
-	var which,
-		i = 0,
-		attrs = { height: type };
-
-	// If we include width, step value is 1 to do all cssExpand values,
-	// otherwise step value is 2 to skip over Left and Right
-	includeWidth = includeWidth ? 1 : 0;
-	for ( ; i < 4 ; i += 2 - includeWidth ) {
-		which = cssExpand[ i ];
-		attrs[ "margin" + which ] = attrs[ "padding" + which ] = type;
-	}
-
-	if ( includeWidth ) {
-		attrs.opacity = attrs.width = type;
-	}
-
-	return attrs;
-}
-
-function createTween( value, prop, animation ) {
-	var tween,
-		collection = ( tweeners[ prop ] || [] ).concat( tweeners[ "*" ] ),
-		index = 0,
-		length = collection.length;
-	for ( ; index < length; index++ ) {
-		if ( (tween = collection[ index ].call( animation, prop, value )) ) {
-
-			// We're done with this property
-			return tween;
-		}
-	}
-}
-
-function defaultPrefilter( elem, props, opts ) {
-	/* jshint validthis: true */
-	var prop, value, toggle, tween, hooks, oldfire, display, checkDisplay,
-		anim = this,
-		orig = {},
-		style = elem.style,
-		hidden = elem.nodeType && isHidden( elem ),
-		dataShow = data_priv.get( elem, "fxshow" );
-
-	// Handle queue: false promises
-	if ( !opts.queue ) {
-		hooks = jQuery._queueHooks( elem, "fx" );
-		if ( hooks.unqueued == null ) {
-			hooks.unqueued = 0;
-			oldfire = hooks.empty.fire;
-			hooks.empty.fire = function() {
-				if ( !hooks.unqueued ) {
-					oldfire();
-				}
-			};
-		}
-		hooks.unqueued++;
-
-		anim.always(function() {
-			// Ensure the complete handler is called before this completes
-			anim.always(function() {
-				hooks.unqueued--;
-				if ( !jQuery.queue( elem, "fx" ).length ) {
-					hooks.empty.fire();
-				}
-			});
-		});
-	}
-
-	// Height/width overflow pass
-	if ( elem.nodeType === 1 && ( "height" in props || "width" in props ) ) {
-		// Make sure that nothing sneaks out
-		// Record all 3 overflow attributes because IE9-10 do not
-		// change the overflow attribute when overflowX and
-		// overflowY are set to the same value
-		opts.overflow = [ style.overflow, style.overflowX, style.overflowY ];
-
-		// Set display property to inline-block for height/width
-		// animations on inline elements that are having width/height animated
-		display = jQuery.css( elem, "display" );
-
-		// Test default display if display is currently "none"
-		checkDisplay = display === "none" ?
-			data_priv.get( elem, "olddisplay" ) || defaultDisplay( elem.nodeName ) : display;
-
-		if ( checkDisplay === "inline" && jQuery.css( elem, "float" ) === "none" ) {
-			style.display = "inline-block";
-		}
-	}
-
-	if ( opts.overflow ) {
-		style.overflow = "hidden";
-		anim.always(function() {
-			style.overflow = opts.overflow[ 0 ];
-			style.overflowX = opts.overflow[ 1 ];
-			style.overflowY = opts.overflow[ 2 ];
-		});
-	}
-
-	// show/hide pass
-	for ( prop in props ) {
-		value = props[ prop ];
-		if ( rfxtypes.exec( value ) ) {
-			delete props[ prop ];
-			toggle = toggle || value === "toggle";
-			if ( value === ( hidden ? "hide" : "show" ) ) {
-
-				// If there is dataShow left over from a stopped hide or show and we are going to proceed with show, we should pretend to be hidden
-				if ( value === "show" && dataShow && dataShow[ prop ] !== undefined ) {
-					hidden = true;
-				} else {
-					continue;
-				}
-			}
-			orig[ prop ] = dataShow && dataShow[ prop ] || jQuery.style( elem, prop );
-
-		// Any non-fx value stops us from restoring the original display value
-		} else {
-			display = undefined;
-		}
-	}
-
-	if ( !jQuery.isEmptyObject( orig ) ) {
-		if ( dataShow ) {
-			if ( "hidden" in dataShow ) {
-				hidden = dataShow.hidden;
-			}
-		} else {
-			dataShow = data_priv.access( elem, "fxshow", {} );
-		}
-
-		// Store state if its toggle - enables .stop().toggle() to "reverse"
-		if ( toggle ) {
-			dataShow.hidden = !hidden;
-		}
-		if ( hidden ) {
-			jQuery( elem ).show();
-		} else {
-			anim.done(function() {
-				jQuery( elem ).hide();
-			});
-		}
-		anim.done(function() {
-			var prop;
-
-			data_priv.remove( elem, "fxshow" );
-			for ( prop in orig ) {
-				jQuery.style( elem, prop, orig[ prop ] );
-			}
-		});
-		for ( prop in orig ) {
-			tween = createTween( hidden ? dataShow[ prop ] : 0, prop, anim );
-
-			if ( !( prop in dataShow ) ) {
-				dataShow[ prop ] = tween.start;
-				if ( hidden ) {
-					tween.end = tween.start;
-					tween.start = prop === "width" || prop === "height" ? 1 : 0;
-				}
-			}
-		}
-
-	// If this is a noop like .hide().hide(), restore an overwritten display value
-	} else if ( (display === "none" ? defaultDisplay( elem.nodeName ) : display) === "inline" ) {
-		style.display = display;
-	}
-}
-
-function propFilter( props, specialEasing ) {
-	var index, name, easing, value, hooks;
-
-	// camelCase, specialEasing and expand cssHook pass
-	for ( index in props ) {
-		name = jQuery.camelCase( index );
-		easing = specialEasing[ name ];
-		value = props[ index ];
-		if ( jQuery.isArray( value ) ) {
-			easing = value[ 1 ];
-			value = props[ index ] = value[ 0 ];
-		}
-
-		if ( index !== name ) {
-			props[ name ] = value;
-			delete props[ index ];
-		}
-
-		hooks = jQuery.cssHooks[ name ];
-		if ( hooks && "expand" in hooks ) {
-			value = hooks.expand( value );
-			delete props[ name ];
-
-			// Not quite $.extend, this won't overwrite existing keys.
-			// Reusing 'index' because we have the correct "name"
-			for ( index in value ) {
-				if ( !( index in props ) ) {
-					props[ index ] = value[ index ];
-					specialEasing[ index ] = easing;
-				}
-			}
-		} else {
-			specialEasing[ name ] = easing;
-		}
-	}
-}
-
-function Animation( elem, properties, options ) {
-	var result,
-		stopped,
-		index = 0,
-		length = animationPrefilters.length,
-		deferred = jQuery.Deferred().always( function() {
-			// Don't match elem in the :animated selector
-			delete tick.elem;
-		}),
-		tick = function() {
-			if ( stopped ) {
-				return false;
-			}
-			var currentTime = fxNow || createFxNow(),
-				remaining = Math.max( 0, animation.startTime + animation.duration - currentTime ),
-				// Support: Android 2.3
-				// Archaic crash bug won't allow us to use `1 - ( 0.5 || 0 )` (#12497)
-				temp = remaining / animation.duration || 0,
-				percent = 1 - temp,
-				index = 0,
-				length = animation.tweens.length;
-
-			for ( ; index < length ; index++ ) {
-				animation.tweens[ index ].run( percent );
-			}
-
-			deferred.notifyWith( elem, [ animation, percent, remaining ]);
-
-			if ( percent < 1 && length ) {
-				return remaining;
-			} else {
-				deferred.resolveWith( elem, [ animation ] );
-				return false;
-			}
-		},
-		animation = deferred.promise({
-			elem: elem,
-			props: jQuery.extend( {}, properties ),
-			opts: jQuery.extend( true, { specialEasing: {} }, options ),
-			originalProperties: properties,
-			originalOptions: options,
-			startTime: fxNow || createFxNow(),
-			duration: options.duration,
-			tweens: [],
-			createTween: function( prop, end ) {
-				var tween = jQuery.Tween( elem, animation.opts, prop, end,
-						animation.opts.specialEasing[ prop ] || animation.opts.easing );
-				animation.tweens.push( tween );
-				return tween;
-			},
-			stop: function( gotoEnd ) {
-				var index = 0,
-					// If we are going to the end, we want to run all the tweens
-					// otherwise we skip this part
-					length = gotoEnd ? animation.tweens.length : 0;
-				if ( stopped ) {
-					return this;
-				}
-				stopped = true;
-				for ( ; index < length ; index++ ) {
-					animation.tweens[ index ].run( 1 );
-				}
-
-				// Resolve when we played the last frame; otherwise, reject
-				if ( gotoEnd ) {
-					deferred.resolveWith( elem, [ animation, gotoEnd ] );
-				} else {
-					deferred.rejectWith( elem, [ animation, gotoEnd ] );
-				}
-				return this;
-			}
-		}),
-		props = animation.props;
-
-	propFilter( props, animation.opts.specialEasing );
-
-	for ( ; index < length ; index++ ) {
-		result = animationPrefilters[ index ].call( animation, elem, props, animation.opts );
-		if ( result ) {
-			return result;
-		}
-	}
-
-	jQuery.map( props, createTween, animation );
-
-	if ( jQuery.isFunction( animation.opts.start ) ) {
-		animation.opts.start.call( elem, animation );
-	}
-
-	jQuery.fx.timer(
-		jQuery.extend( tick, {
-			elem: elem,
-			anim: animation,
-			queue: animation.opts.queue
-		})
-	);
-
-	// attach callbacks from options
-	return animation.progress( animation.opts.progress )
-		.done( animation.opts.done, animation.opts.complete )
-		.fail( animation.opts.fail )
-		.always( animation.opts.always );
-}
-
-jQuery.Animation = jQuery.extend( Animation, {
-
-	tweener: function( props, callback ) {
-		if ( jQuery.isFunction( props ) ) {
-			callback = props;
-			props = [ "*" ];
-		} else {
-			props = props.split(" ");
-		}
-
-		var prop,
-			index = 0,
-			length = props.length;
-
-		for ( ; index < length ; index++ ) {
-			prop = props[ index ];
-			tweeners[ prop ] = tweeners[ prop ] || [];
-			tweeners[ prop ].unshift( callback );
-		}
-	},
-
-	prefilter: function( callback, prepend ) {
-		if ( prepend ) {
-			animationPrefilters.unshift( callback );
-		} else {
-			animationPrefilters.push( callback );
-		}
-	}
-});
-
-jQuery.speed = function( speed, easing, fn ) {
-	var opt = speed && typeof speed === "object" ? jQuery.extend( {}, speed ) : {
-		complete: fn || !fn && easing ||
-			jQuery.isFunction( speed ) && speed,
-		duration: speed,
-		easing: fn && easing || easing && !jQuery.isFunction( easing ) && easing
-	};
-
-	opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration :
-		opt.duration in jQuery.fx.speeds ? jQuery.fx.speeds[ opt.duration ] : jQuery.fx.speeds._default;
-
-	// Normalize opt.queue - true/undefined/null -> "fx"
-	if ( opt.queue == null || opt.queue === true ) {
-		opt.queue = "fx";
-	}
-
-	// Queueing
-	opt.old = opt.complete;
-
-	opt.complete = function() {
-		if ( jQuery.isFunction( opt.old ) ) {
-			opt.old.call( this );
-		}
-
-		if ( opt.queue ) {
-			jQuery.dequeue( this, opt.queue );
-		}
-	};
-
-	return opt;
-};
-
-jQuery.fn.extend({
-	fadeTo: function( speed, to, easing, callback ) {
-
-		// Show any hidden elements after setting opacity to 0
-		return this.filter( isHidden ).css( "opacity", 0 ).show()
-
-			// Animate to the value specified
-			.end().animate({ opacity: to }, speed, easing, callback );
-	},
-	animate: function( prop, speed, easing, callback ) {
-		var empty = jQuery.isEmptyObject( prop ),
-			optall = jQuery.speed( speed, easing, callback ),
-			doAnimation = function() {
-				// Operate on a copy of prop so per-property easing won't be lost
-				var anim = Animation( this, jQuery.extend( {}, prop ), optall );
-
-				// Empty animations, or finishing resolves immediately
-				if ( empty || data_priv.get( this, "finish" ) ) {
-					anim.stop( true );
-				}
-			};
-			doAnimation.finish = doAnimation;
-
-		return empty || optall.queue === false ?
-			this.each( doAnimation ) :
-			this.queue( optall.queue, doAnimation );
-	},
-	stop: function( type, clearQueue, gotoEnd ) {
-		var stopQueue = function( hooks ) {
-			var stop = hooks.stop;
-			delete hooks.stop;
-			stop( gotoEnd );
-		};
-
-		if ( typeof type !== "string" ) {
-			gotoEnd = clearQueue;
-			clearQueue = type;
-			type = undefined;
-		}
-		if ( clearQueue && type !== false ) {
-			this.queue( type || "fx", [] );
-		}
-
-		return this.each(function() {
-			var dequeue = true,
-				index = type != null && type + "queueHooks",
-				timers = jQuery.timers,
-				data = data_priv.get( this );
-
-			if ( index ) {
-				if ( data[ index ] && data[ index ].stop ) {
-					stopQueue( data[ index ] );
-				}
-			} else {
-				for ( index in data ) {
-					if ( data[ index ] && data[ index ].stop && rrun.test( index ) ) {
-						stopQueue( data[ index ] );
-					}
-				}
-			}
-
-			for ( index = timers.length; index--; ) {
-				if ( timers[ index ].elem === this && (type == null || timers[ index ].queue === type) ) {
-					timers[ index ].anim.stop( gotoEnd );
-					dequeue = false;
-					timers.splice( index, 1 );
-				}
-			}
-
-			// Start the next in the queue if the last step wasn't forced.
-			// Timers currently will call their complete callbacks, which
-			// will dequeue but only if they were gotoEnd.
-			if ( dequeue || !gotoEnd ) {
-				jQuery.dequeue( this, type );
-			}
-		});
-	},
-	finish: function( type ) {
-		if ( type !== false ) {
-			type = type || "fx";
-		}
-		return this.each(function() {
-			var index,
-				data = data_priv.get( this ),
-				queue = data[ type + "queue" ],
-				hooks = data[ type + "queueHooks" ],
-				timers = jQuery.timers,
-				length = queue ? queue.length : 0;
-
-			// Enable finishing flag on private data
-			data.finish = true;
-
-			// Empty the queue first
-			jQuery.queue( this, type, [] );
-
-			if ( hooks && hooks.stop ) {
-				hooks.stop.call( this, true );
-			}
-
-			// Look for any active animations, and finish them
-			for ( index = timers.length; index--; ) {
-				if ( timers[ index ].elem === this && timers[ index ].queue === type ) {
-					timers[ index ].anim.stop( true );
-					timers.splice( index, 1 );
-				}
-			}
-
-			// Look for any animations in the old queue and finish them
-			for ( index = 0; index < length; index++ ) {
-				if ( queue[ index ] && queue[ index ].finish ) {
-					queue[ index ].finish.call( this );
-				}
-			}
-
-			// Turn off finishing flag
-			delete data.finish;
-		});
-	}
-});
-
-jQuery.each([ "toggle", "show", "hide" ], function( i, name ) {
-	var cssFn = jQuery.fn[ name ];
-	jQuery.fn[ name ] = function( speed, easing, callback ) {
-		return speed == null || typeof speed === "boolean" ?
-			cssFn.apply( this, arguments ) :
-			this.animate( genFx( name, true ), speed, easing, callback );
-	};
-});
-
-// Generate shortcuts for custom animations
-jQuery.each({
-	slideDown: genFx("show"),
-	slideUp: genFx("hide"),
-	slideToggle: genFx("toggle"),
-	fadeIn: { opacity: "show" },
-	fadeOut: { opacity: "hide" },
-	fadeToggle: { opacity: "toggle" }
-}, function( name, props ) {
-	jQuery.fn[ name ] = function( speed, easing, callback ) {
-		return this.animate( props, speed, easing, callback );
-	};
-});
-
-jQuery.timers = [];
-jQuery.fx.tick = function() {
-	var timer,
-		i = 0,
-		timers = jQuery.timers;
-
-	fxNow = jQuery.now();
-
-	for ( ; i < timers.length; i++ ) {
-		timer = timers[ i ];
-		// Checks the timer has not already been removed
-		if ( !timer() && timers[ i ] === timer ) {
-			timers.splice( i--, 1 );
-		}
-	}
-
-	if ( !timers.length ) {
-		jQuery.fx.stop();
-	}
-	fxNow = undefined;
-};
-
-jQuery.fx.timer = function( timer ) {
-	jQuery.timers.push( timer );
-	if ( timer() ) {
-		jQuery.fx.start();
-	} else {
-		jQuery.timers.pop();
-	}
-};
-
-jQuery.fx.interval = 13;
-
-jQuery.fx.start = function() {
-	if ( !timerId ) {
-		timerId = setInterval( jQuery.fx.tick, jQuery.fx.interval );
-	}
-};
-
-jQuery.fx.stop = function() {
-	clearInterval( timerId );
-	timerId = null;
-};
-
-jQuery.fx.speeds = {
-	slow: 600,
-	fast: 200,
-	// Default speed
-	_default: 400
-};
-
-return jQuery;
-});
diff --git a/#pma/js/jquery/src/jquery/effects/Tween.js b/#pma/js/jquery/src/jquery/effects/Tween.js
deleted file mode 100644
index 9acd8d0c..00000000
--- a/#pma/js/jquery/src/jquery/effects/Tween.js
+++ /dev/null
@@ -1,114 +0,0 @@
-define([
-	"../core",
-	"../css"
-], function( jQuery ) {
-
-function Tween( elem, options, prop, end, easing ) {
-	return new Tween.prototype.init( elem, options, prop, end, easing );
-}
-jQuery.Tween = Tween;
-
-Tween.prototype = {
-	constructor: Tween,
-	init: function( elem, options, prop, end, easing, unit ) {
-		this.elem = elem;
-		this.prop = prop;
-		this.easing = easing || "swing";
-		this.options = options;
-		this.start = this.now = this.cur();
-		this.end = end;
-		this.unit = unit || ( jQuery.cssNumber[ prop ] ? "" : "px" );
-	},
-	cur: function() {
-		var hooks = Tween.propHooks[ this.prop ];
-
-		return hooks && hooks.get ?
-			hooks.get( this ) :
-			Tween.propHooks._default.get( this );
-	},
-	run: function( percent ) {
-		var eased,
-			hooks = Tween.propHooks[ this.prop ];
-
-		if ( this.options.duration ) {
-			this.pos = eased = jQuery.easing[ this.easing ](
-				percent, this.options.duration * percent, 0, 1, this.options.duration
-			);
-		} else {
-			this.pos = eased = percent;
-		}
-		this.now = ( this.end - this.start ) * eased + this.start;
-
-		if ( this.options.step ) {
-			this.options.step.call( this.elem, this.now, this );
-		}
-
-		if ( hooks && hooks.set ) {
-			hooks.set( this );
-		} else {
-			Tween.propHooks._default.set( this );
-		}
-		return this;
-	}
-};
-
-Tween.prototype.init.prototype = Tween.prototype;
-
-Tween.propHooks = {
-	_default: {
-		get: function( tween ) {
-			var result;
-
-			if ( tween.elem[ tween.prop ] != null &&
-				(!tween.elem.style || tween.elem.style[ tween.prop ] == null) ) {
-				return tween.elem[ tween.prop ];
-			}
-
-			// Passing an empty string as a 3rd parameter to .css will automatically
-			// attempt a parseFloat and fallback to a string if the parse fails.
-			// Simple values such as "10px" are parsed to Float;
-			// complex values such as "rotate(1rad)" are returned as-is.
-			result = jQuery.css( tween.elem, tween.prop, "" );
-			// Empty strings, null, undefined and "auto" are converted to 0.
-			return !result || result === "auto" ? 0 : result;
-		},
-		set: function( tween ) {
-			// Use step hook for back compat.
-			// Use cssHook if its there.
-			// Use .style if available and use plain properties where available.
-			if ( jQuery.fx.step[ tween.prop ] ) {
-				jQuery.fx.step[ tween.prop ]( tween );
-			} else if ( tween.elem.style && ( tween.elem.style[ jQuery.cssProps[ tween.prop ] ] != null || jQuery.cssHooks[ tween.prop ] ) ) {
-				jQuery.style( tween.elem, tween.prop, tween.now + tween.unit );
-			} else {
-				tween.elem[ tween.prop ] = tween.now;
-			}
-		}
-	}
-};
-
-// Support: IE9
-// Panic based approach to setting things on disconnected nodes
-Tween.propHooks.scrollTop = Tween.propHooks.scrollLeft = {
-	set: function( tween ) {
-		if ( tween.elem.nodeType && tween.elem.parentNode ) {
-			tween.elem[ tween.prop ] = tween.now;
-		}
-	}
-};
-
-jQuery.easing = {
-	linear: function( p ) {
-		return p;
-	},
-	swing: function( p ) {
-		return 0.5 - Math.cos( p * Math.PI ) / 2;
-	}
-};
-
-jQuery.fx = Tween.prototype.init;
-
-// Back Compat <1.8 extension point
-jQuery.fx.step = {};
-
-});
diff --git a/#pma/js/jquery/src/jquery/effects/animatedSelector.js b/#pma/js/jquery/src/jquery/effects/animatedSelector.js
deleted file mode 100644
index bc5a3d6c..00000000
--- a/#pma/js/jquery/src/jquery/effects/animatedSelector.js
+++ /dev/null
@@ -1,13 +0,0 @@
-define([
-	"../core",
-	"../selector",
-	"../effects"
-], function( jQuery ) {
-
-jQuery.expr.filters.animated = function( elem ) {
-	return jQuery.grep(jQuery.timers, function( fn ) {
-		return elem === fn.elem;
-	}).length;
-};
-
-});
diff --git a/#pma/js/jquery/src/jquery/event.js b/#pma/js/jquery/src/jquery/event.js
deleted file mode 100644
index 8f04b89c..00000000
--- a/#pma/js/jquery/src/jquery/event.js
+++ /dev/null
@@ -1,868 +0,0 @@
-define([
-	"./core",
-	"./var/strundefined",
-	"./var/rnotwhite",
-	"./var/hasOwn",
-	"./var/slice",
-	"./event/support",
-	"./data/var/data_priv",
-
-	"./core/init",
-	"./data/accepts",
-	"./selector"
-], function( jQuery, strundefined, rnotwhite, hasOwn, slice, support, data_priv ) {
-
-var
-	rkeyEvent = /^key/,
-	rmouseEvent = /^(?:mouse|pointer|contextmenu)|click/,
-	rfocusMorph = /^(?:focusinfocus|focusoutblur)$/,
-	rtypenamespace = /^([^.]*)(?:\.(.+)|)$/;
-
-function returnTrue() {
-	return true;
-}
-
-function returnFalse() {
-	return false;
-}
-
-function safeActiveElement() {
-	try {
-		return document.activeElement;
-	} catch ( err ) { }
-}
-
-/*
- * Helper functions for managing events -- not part of the public interface.
- * Props to Dean Edwards' addEvent library for many of the ideas.
- */
-jQuery.event = {
-
-	global: {},
-
-	add: function( elem, types, handler, data, selector ) {
-
-		var handleObjIn, eventHandle, tmp,
-			events, t, handleObj,
-			special, handlers, type, namespaces, origType,
-			elemData = data_priv.get( elem );
-
-		// Don't attach events to noData or text/comment nodes (but allow plain objects)
-		if ( !elemData ) {
-			return;
-		}
-
-		// Caller can pass in an object of custom data in lieu of the handler
-		if ( handler.handler ) {
-			handleObjIn = handler;
-			handler = handleObjIn.handler;
-			selector = handleObjIn.selector;
-		}
-
-		// Make sure that the handler has a unique ID, used to find/remove it later
-		if ( !handler.guid ) {
-			handler.guid = jQuery.guid++;
-		}
-
-		// Init the element's event structure and main handler, if this is the first
-		if ( !(events = elemData.events) ) {
-			events = elemData.events = {};
-		}
-		if ( !(eventHandle = elemData.handle) ) {
-			eventHandle = elemData.handle = function( e ) {
-				// Discard the second event of a jQuery.event.trigger() and
-				// when an event is called after a page has unloaded
-				return typeof jQuery !== strundefined && jQuery.event.triggered !== e.type ?
-					jQuery.event.dispatch.apply( elem, arguments ) : undefined;
-			};
-		}
-
-		// Handle multiple events separated by a space
-		types = ( types || "" ).match( rnotwhite ) || [ "" ];
-		t = types.length;
-		while ( t-- ) {
-			tmp = rtypenamespace.exec( types[t] ) || [];
-			type = origType = tmp[1];
-			namespaces = ( tmp[2] || "" ).split( "." ).sort();
-
-			// There *must* be a type, no attaching namespace-only handlers
-			if ( !type ) {
-				continue;
-			}
-
-			// If event changes its type, use the special event handlers for the changed type
-			special = jQuery.event.special[ type ] || {};
-
-			// If selector defined, determine special event api type, otherwise given type
-			type = ( selector ? special.delegateType : special.bindType ) || type;
-
-			// Update special based on newly reset type
-			special = jQuery.event.special[ type ] || {};
-
-			// handleObj is passed to all event handlers
-			handleObj = jQuery.extend({
-				type: type,
-				origType: origType,
-				data: data,
-				handler: handler,
-				guid: handler.guid,
-				selector: selector,
-				needsContext: selector && jQuery.expr.match.needsContext.test( selector ),
-				namespace: namespaces.join(".")
-			}, handleObjIn );
-
-			// Init the event handler queue if we're the first
-			if ( !(handlers = events[ type ]) ) {
-				handlers = events[ type ] = [];
-				handlers.delegateCount = 0;
-
-				// Only use addEventListener if the special events handler returns false
-				if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) {
-					if ( elem.addEventListener ) {
-						elem.addEventListener( type, eventHandle, false );
-					}
-				}
-			}
-
-			if ( special.add ) {
-				special.add.call( elem, handleObj );
-
-				if ( !handleObj.handler.guid ) {
-					handleObj.handler.guid = handler.guid;
-				}
-			}
-
-			// Add to the element's handler list, delegates in front
-			if ( selector ) {
-				handlers.splice( handlers.delegateCount++, 0, handleObj );
-			} else {
-				handlers.push( handleObj );
-			}
-
-			// Keep track of which events have ever been used, for event optimization
-			jQuery.event.global[ type ] = true;
-		}
-
-	},
-
-	// Detach an event or set of events from an element
-	remove: function( elem, types, handler, selector, mappedTypes ) {
-
-		var j, origCount, tmp,
-			events, t, handleObj,
-			special, handlers, type, namespaces, origType,
-			elemData = data_priv.hasData( elem ) && data_priv.get( elem );
-
-		if ( !elemData || !(events = elemData.events) ) {
-			return;
-		}
-
-		// Once for each type.namespace in types; type may be omitted
-		types = ( types || "" ).match( rnotwhite ) || [ "" ];
-		t = types.length;
-		while ( t-- ) {
-			tmp = rtypenamespace.exec( types[t] ) || [];
-			type = origType = tmp[1];
-			namespaces = ( tmp[2] || "" ).split( "." ).sort();
-
-			// Unbind all events (on this namespace, if provided) for the element
-			if ( !type ) {
-				for ( type in events ) {
-					jQuery.event.remove( elem, type + types[ t ], handler, selector, true );
-				}
-				continue;
-			}
-
-			special = jQuery.event.special[ type ] || {};
-			type = ( selector ? special.delegateType : special.bindType ) || type;
-			handlers = events[ type ] || [];
-			tmp = tmp[2] && new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" );
-
-			// Remove matching events
-			origCount = j = handlers.length;
-			while ( j-- ) {
-				handleObj = handlers[ j ];
-
-				if ( ( mappedTypes || origType === handleObj.origType ) &&
-					( !handler || handler.guid === handleObj.guid ) &&
-					( !tmp || tmp.test( handleObj.namespace ) ) &&
-					( !selector || selector === handleObj.selector || selector === "**" && handleObj.selector ) ) {
-					handlers.splice( j, 1 );
-
-					if ( handleObj.selector ) {
-						handlers.delegateCount--;
-					}
-					if ( special.remove ) {
-						special.remove.call( elem, handleObj );
-					}
-				}
-			}
-
-			// Remove generic event handler if we removed something and no more handlers exist
-			// (avoids potential for endless recursion during removal of special event handlers)
-			if ( origCount && !handlers.length ) {
-				if ( !special.teardown || special.teardown.call( elem, namespaces, elemData.handle ) === false ) {
-					jQuery.removeEvent( elem, type, elemData.handle );
-				}
-
-				delete events[ type ];
-			}
-		}
-
-		// Remove the expando if it's no longer used
-		if ( jQuery.isEmptyObject( events ) ) {
-			delete elemData.handle;
-			data_priv.remove( elem, "events" );
-		}
-	},
-
-	trigger: function( event, data, elem, onlyHandlers ) {
-
-		var i, cur, tmp, bubbleType, ontype, handle, special,
-			eventPath = [ elem || document ],
-			type = hasOwn.call( event, "type" ) ? event.type : event,
-			namespaces = hasOwn.call( event, "namespace" ) ? event.namespace.split(".") : [];
-
-		cur = tmp = elem = elem || document;
-
-		// Don't do events on text and comment nodes
-		if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
-			return;
-		}
-
-		// focus/blur morphs to focusin/out; ensure we're not firing them right now
-		if ( rfocusMorph.test( type + jQuery.event.triggered ) ) {
-			return;
-		}
-
-		if ( type.indexOf(".") >= 0 ) {
-			// Namespaced trigger; create a regexp to match event type in handle()
-			namespaces = type.split(".");
-			type = namespaces.shift();
-			namespaces.sort();
-		}
-		ontype = type.indexOf(":") < 0 && "on" + type;
-
-		// Caller can pass in a jQuery.Event object, Object, or just an event type string
-		event = event[ jQuery.expando ] ?
-			event :
-			new jQuery.Event( type, typeof event === "object" && event );
-
-		// Trigger bitmask: & 1 for native handlers; & 2 for jQuery (always true)
-		event.isTrigger = onlyHandlers ? 2 : 3;
-		event.namespace = namespaces.join(".");
-		event.namespace_re = event.namespace ?
-			new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" ) :
-			null;
-
-		// Clean up the event in case it is being reused
-		event.result = undefined;
-		if ( !event.target ) {
-			event.target = elem;
-		}
-
-		// Clone any incoming data and prepend the event, creating the handler arg list
-		data = data == null ?
-			[ event ] :
-			jQuery.makeArray( data, [ event ] );
-
-		// Allow special events to draw outside the lines
-		special = jQuery.event.special[ type ] || {};
-		if ( !onlyHandlers && special.trigger && special.trigger.apply( elem, data ) === false ) {
-			return;
-		}
-
-		// Determine event propagation path in advance, per W3C events spec (#9951)
-		// Bubble up to document, then to window; watch for a global ownerDocument var (#9724)
-		if ( !onlyHandlers && !special.noBubble && !jQuery.isWindow( elem ) ) {
-
-			bubbleType = special.delegateType || type;
-			if ( !rfocusMorph.test( bubbleType + type ) ) {
-				cur = cur.parentNode;
-			}
-			for ( ; cur; cur = cur.parentNode ) {
-				eventPath.push( cur );
-				tmp = cur;
-			}
-
-			// Only add window if we got to document (e.g., not plain obj or detached DOM)
-			if ( tmp === (elem.ownerDocument || document) ) {
-				eventPath.push( tmp.defaultView || tmp.parentWindow || window );
-			}
-		}
-
-		// Fire handlers on the event path
-		i = 0;
-		while ( (cur = eventPath[i++]) && !event.isPropagationStopped() ) {
-
-			event.type = i > 1 ?
-				bubbleType :
-				special.bindType || type;
-
-			// jQuery handler
-			handle = ( data_priv.get( cur, "events" ) || {} )[ event.type ] && data_priv.get( cur, "handle" );
-			if ( handle ) {
-				handle.apply( cur, data );
-			}
-
-			// Native handler
-			handle = ontype && cur[ ontype ];
-			if ( handle && handle.apply && jQuery.acceptData( cur ) ) {
-				event.result = handle.apply( cur, data );
-				if ( event.result === false ) {
-					event.preventDefault();
-				}
-			}
-		}
-		event.type = type;
-
-		// If nobody prevented the default action, do it now
-		if ( !onlyHandlers && !event.isDefaultPrevented() ) {
-
-			if ( (!special._default || special._default.apply( eventPath.pop(), data ) === false) &&
-				jQuery.acceptData( elem ) ) {
-
-				// Call a native DOM method on the target with the same name name as the event.
-				// Don't do default actions on window, that's where global variables be (#6170)
-				if ( ontype && jQuery.isFunction( elem[ type ] ) && !jQuery.isWindow( elem ) ) {
-
-					// Don't re-trigger an onFOO event when we call its FOO() method
-					tmp = elem[ ontype ];
-
-					if ( tmp ) {
-						elem[ ontype ] = null;
-					}
-
-					// Prevent re-triggering of the same event, since we already bubbled it above
-					jQuery.event.triggered = type;
-					elem[ type ]();
-					jQuery.event.triggered = undefined;
-
-					if ( tmp ) {
-						elem[ ontype ] = tmp;
-					}
-				}
-			}
-		}
-
-		return event.result;
-	},
-
-	dispatch: function( event ) {
-
-		// Make a writable jQuery.Event from the native event object
-		event = jQuery.event.fix( event );
-
-		var i, j, ret, matched, handleObj,
-			handlerQueue = [],
-			args = slice.call( arguments ),
-			handlers = ( data_priv.get( this, "events" ) || {} )[ event.type ] || [],
-			special = jQuery.event.special[ event.type ] || {};
-
-		// Use the fix-ed jQuery.Event rather than the (read-only) native event
-		args[0] = event;
-		event.delegateTarget = this;
-
-		// Call the preDispatch hook for the mapped type, and let it bail if desired
-		if ( special.preDispatch && special.preDispatch.call( this, event ) === false ) {
-			return;
-		}
-
-		// Determine handlers
-		handlerQueue = jQuery.event.handlers.call( this, event, handlers );
-
-		// Run delegates first; they may want to stop propagation beneath us
-		i = 0;
-		while ( (matched = handlerQueue[ i++ ]) && !event.isPropagationStopped() ) {
-			event.currentTarget = matched.elem;
-
-			j = 0;
-			while ( (handleObj = matched.handlers[ j++ ]) && !event.isImmediatePropagationStopped() ) {
-
-				// Triggered event must either 1) have no namespace, or 2) have namespace(s)
-				// a subset or equal to those in the bound event (both can have no namespace).
-				if ( !event.namespace_re || event.namespace_re.test( handleObj.namespace ) ) {
-
-					event.handleObj = handleObj;
-					event.data = handleObj.data;
-
-					ret = ( (jQuery.event.special[ handleObj.origType ] || {}).handle || handleObj.handler )
-							.apply( matched.elem, args );
-
-					if ( ret !== undefined ) {
-						if ( (event.result = ret) === false ) {
-							event.preventDefault();
-							event.stopPropagation();
-						}
-					}
-				}
-			}
-		}
-
-		// Call the postDispatch hook for the mapped type
-		if ( special.postDispatch ) {
-			special.postDispatch.call( this, event );
-		}
-
-		return event.result;
-	},
-
-	handlers: function( event, handlers ) {
-		var i, matches, sel, handleObj,
-			handlerQueue = [],
-			delegateCount = handlers.delegateCount,
-			cur = event.target;
-
-		// Find delegate handlers
-		// Black-hole SVG <use> instance trees (#13180)
-		// Avoid non-left-click bubbling in Firefox (#3861)
-		if ( delegateCount && cur.nodeType && (!event.button || event.type !== "click") ) {
-
-			for ( ; cur !== this; cur = cur.parentNode || this ) {
-
-				// Don't process clicks on disabled elements (#6911, #8165, #11382, #11764)
-				if ( cur.disabled !== true || event.type !== "click" ) {
-					matches = [];
-					for ( i = 0; i < delegateCount; i++ ) {
-						handleObj = handlers[ i ];
-
-						// Don't conflict with Object.prototype properties (#13203)
-						sel = handleObj.selector + " ";
-
-						if ( matches[ sel ] === undefined ) {
-							matches[ sel ] = handleObj.needsContext ?
-								jQuery( sel, this ).index( cur ) >= 0 :
-								jQuery.find( sel, this, null, [ cur ] ).length;
-						}
-						if ( matches[ sel ] ) {
-							matches.push( handleObj );
-						}
-					}
-					if ( matches.length ) {
-						handlerQueue.push({ elem: cur, handlers: matches });
-					}
-				}
-			}
-		}
-
-		// Add the remaining (directly-bound) handlers
-		if ( delegateCount < handlers.length ) {
-			handlerQueue.push({ elem: this, handlers: handlers.slice( delegateCount ) });
-		}
-
-		return handlerQueue;
-	},
-
-	// Includes some event props shared by KeyEvent and MouseEvent
-	props: "altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),
-
-	fixHooks: {},
-
-	keyHooks: {
-		props: "char charCode key keyCode".split(" "),
-		filter: function( event, original ) {
-
-			// Add which for key events
-			if ( event.which == null ) {
-				event.which = original.charCode != null ? original.charCode : original.keyCode;
-			}
-
-			return event;
-		}
-	},
-
-	mouseHooks: {
-		props: "button buttons clientX clientY offsetX offsetY pageX pageY screenX screenY toElement".split(" "),
-		filter: function( event, original ) {
-			var eventDoc, doc, body,
-				button = original.button;
-
-			// Calculate pageX/Y if missing and clientX/Y available
-			if ( event.pageX == null && original.clientX != null ) {
-				eventDoc = event.target.ownerDocument || document;
-				doc = eventDoc.documentElement;
-				body = eventDoc.body;
-
-				event.pageX = original.clientX + ( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) - ( doc && doc.clientLeft || body && body.clientLeft || 0 );
-				event.pageY = original.clientY + ( doc && doc.scrollTop  || body && body.scrollTop  || 0 ) - ( doc && doc.clientTop  || body && body.clientTop  || 0 );
-			}
-
-			// Add which for click: 1 === left; 2 === middle; 3 === right
-			// Note: button is not normalized, so don't use it
-			if ( !event.which && button !== undefined ) {
-				event.which = ( button & 1 ? 1 : ( button & 2 ? 3 : ( button & 4 ? 2 : 0 ) ) );
-			}
-
-			return event;
-		}
-	},
-
-	fix: function( event ) {
-		if ( event[ jQuery.expando ] ) {
-			return event;
-		}
-
-		// Create a writable copy of the event object and normalize some properties
-		var i, prop, copy,
-			type = event.type,
-			originalEvent = event,
-			fixHook = this.fixHooks[ type ];
-
-		if ( !fixHook ) {
-			this.fixHooks[ type ] = fixHook =
-				rmouseEvent.test( type ) ? this.mouseHooks :
-				rkeyEvent.test( type ) ? this.keyHooks :
-				{};
-		}
-		copy = fixHook.props ? this.props.concat( fixHook.props ) : this.props;
-
-		event = new jQuery.Event( originalEvent );
-
-		i = copy.length;
-		while ( i-- ) {
-			prop = copy[ i ];
-			event[ prop ] = originalEvent[ prop ];
-		}
-
-		// Support: Cordova 2.5 (WebKit) (#13255)
-		// All events should have a target; Cordova deviceready doesn't
-		if ( !event.target ) {
-			event.target = document;
-		}
-
-		// Support: Safari 6.0+, Chrome<28
-		// Target should not be a text node (#504, #13143)
-		if ( event.target.nodeType === 3 ) {
-			event.target = event.target.parentNode;
-		}
-
-		return fixHook.filter ? fixHook.filter( event, originalEvent ) : event;
-	},
-
-	special: {
-		load: {
-			// Prevent triggered image.load events from bubbling to window.load
-			noBubble: true
-		},
-		focus: {
-			// Fire native event if possible so blur/focus sequence is correct
-			trigger: function() {
-				if ( this !== safeActiveElement() && this.focus ) {
-					this.focus();
-					return false;
-				}
-			},
-			delegateType: "focusin"
-		},
-		blur: {
-			trigger: function() {
-				if ( this === safeActiveElement() && this.blur ) {
-					this.blur();
-					return false;
-				}
-			},
-			delegateType: "focusout"
-		},
-		click: {
-			// For checkbox, fire native event so checked state will be right
-			trigger: function() {
-				if ( this.type === "checkbox" && this.click && jQuery.nodeName( this, "input" ) ) {
-					this.click();
-					return false;
-				}
-			},
-
-			// For cross-browser consistency, don't fire native .click() on links
-			_default: function( event ) {
-				return jQuery.nodeName( event.target, "a" );
-			}
-		},
-
-		beforeunload: {
-			postDispatch: function( event ) {
-
-				// Support: Firefox 20+
-				// Firefox doesn't alert if the returnValue field is not set.
-				if ( event.result !== undefined && event.originalEvent ) {
-					event.originalEvent.returnValue = event.result;
-				}
-			}
-		}
-	},
-
-	simulate: function( type, elem, event, bubble ) {
-		// Piggyback on a donor event to simulate a different one.
-		// Fake originalEvent to avoid donor's stopPropagation, but if the
-		// simulated event prevents default then we do the same on the donor.
-		var e = jQuery.extend(
-			new jQuery.Event(),
-			event,
-			{
-				type: type,
-				isSimulated: true,
-				originalEvent: {}
-			}
-		);
-		if ( bubble ) {
-			jQuery.event.trigger( e, null, elem );
-		} else {
-			jQuery.event.dispatch.call( elem, e );
-		}
-		if ( e.isDefaultPrevented() ) {
-			event.preventDefault();
-		}
-	}
-};
-
-jQuery.removeEvent = function( elem, type, handle ) {
-	if ( elem.removeEventListener ) {
-		elem.removeEventListener( type, handle, false );
-	}
-};
-
-jQuery.Event = function( src, props ) {
-	// Allow instantiation without the 'new' keyword
-	if ( !(this instanceof jQuery.Event) ) {
-		return new jQuery.Event( src, props );
-	}
-
-	// Event object
-	if ( src && src.type ) {
-		this.originalEvent = src;
-		this.type = src.type;
-
-		// Events bubbling up the document may have been marked as prevented
-		// by a handler lower down the tree; reflect the correct value.
-		this.isDefaultPrevented = src.defaultPrevented ||
-				src.defaultPrevented === undefined &&
-				// Support: Android<4.0
-				src.returnValue === false ?
-			returnTrue :
-			returnFalse;
-
-	// Event type
-	} else {
-		this.type = src;
-	}
-
-	// Put explicitly provided properties onto the event object
-	if ( props ) {
-		jQuery.extend( this, props );
-	}
-
-	// Create a timestamp if incoming event doesn't have one
-	this.timeStamp = src && src.timeStamp || jQuery.now();
-
-	// Mark it as fixed
-	this[ jQuery.expando ] = true;
-};
-
-// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding
-// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
-jQuery.Event.prototype = {
-	isDefaultPrevented: returnFalse,
-	isPropagationStopped: returnFalse,
-	isImmediatePropagationStopped: returnFalse,
-
-	preventDefault: function() {
-		var e = this.originalEvent;
-
-		this.isDefaultPrevented = returnTrue;
-
-		if ( e && e.preventDefault ) {
-			e.preventDefault();
-		}
-	},
-	stopPropagation: function() {
-		var e = this.originalEvent;
-
-		this.isPropagationStopped = returnTrue;
-
-		if ( e && e.stopPropagation ) {
-			e.stopPropagation();
-		}
-	},
-	stopImmediatePropagation: function() {
-		var e = this.originalEvent;
-
-		this.isImmediatePropagationStopped = returnTrue;
-
-		if ( e && e.stopImmediatePropagation ) {
-			e.stopImmediatePropagation();
-		}
-
-		this.stopPropagation();
-	}
-};
-
-// Create mouseenter/leave events using mouseover/out and event-time checks
-// Support: Chrome 15+
-jQuery.each({
-	mouseenter: "mouseover",
-	mouseleave: "mouseout",
-	pointerenter: "pointerover",
-	pointerleave: "pointerout"
-}, function( orig, fix ) {
-	jQuery.event.special[ orig ] = {
-		delegateType: fix,
-		bindType: fix,
-
-		handle: function( event ) {
-			var ret,
-				target = this,
-				related = event.relatedTarget,
-				handleObj = event.handleObj;
-
-			// For mousenter/leave call the handler if related is outside the target.
-			// NB: No relatedTarget if the mouse left/entered the browser window
-			if ( !related || (related !== target && !jQuery.contains( target, related )) ) {
-				event.type = handleObj.origType;
-				ret = handleObj.handler.apply( this, arguments );
-				event.type = fix;
-			}
-			return ret;
-		}
-	};
-});
-
-// Support: Firefox, Chrome, Safari
-// Create "bubbling" focus and blur events
-if ( !support.focusinBubbles ) {
-	jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) {
-
-		// Attach a single capturing handler on the document while someone wants focusin/focusout
-		var handler = function( event ) {
-				jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ), true );
-			};
-
-		jQuery.event.special[ fix ] = {
-			setup: function() {
-				var doc = this.ownerDocument || this,
-					attaches = data_priv.access( doc, fix );
-
-				if ( !attaches ) {
-					doc.addEventListener( orig, handler, true );
-				}
-				data_priv.access( doc, fix, ( attaches || 0 ) + 1 );
-			},
-			teardown: function() {
-				var doc = this.ownerDocument || this,
-					attaches = data_priv.access( doc, fix ) - 1;
-
-				if ( !attaches ) {
-					doc.removeEventListener( orig, handler, true );
-					data_priv.remove( doc, fix );
-
-				} else {
-					data_priv.access( doc, fix, attaches );
-				}
-			}
-		};
-	});
-}
-
-jQuery.fn.extend({
-
-	on: function( types, selector, data, fn, /*INTERNAL*/ one ) {
-		var origFn, type;
-
-		// Types can be a map of types/handlers
-		if ( typeof types === "object" ) {
-			// ( types-Object, selector, data )
-			if ( typeof selector !== "string" ) {
-				// ( types-Object, data )
-				data = data || selector;
-				selector = undefined;
-			}
-			for ( type in types ) {
-				this.on( type, selector, data, types[ type ], one );
-			}
-			return this;
-		}
-
-		if ( data == null && fn == null ) {
-			// ( types, fn )
-			fn = selector;
-			data = selector = undefined;
-		} else if ( fn == null ) {
-			if ( typeof selector === "string" ) {
-				// ( types, selector, fn )
-				fn = data;
-				data = undefined;
-			} else {
-				// ( types, data, fn )
-				fn = data;
-				data = selector;
-				selector = undefined;
-			}
-		}
-		if ( fn === false ) {
-			fn = returnFalse;
-		} else if ( !fn ) {
-			return this;
-		}
-
-		if ( one === 1 ) {
-			origFn = fn;
-			fn = function( event ) {
-				// Can use an empty set, since event contains the info
-				jQuery().off( event );
-				return origFn.apply( this, arguments );
-			};
-			// Use same guid so caller can remove using origFn
-			fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ );
-		}
-		return this.each( function() {
-			jQuery.event.add( this, types, fn, data, selector );
-		});
-	},
-	one: function( types, selector, data, fn ) {
-		return this.on( types, selector, data, fn, 1 );
-	},
-	off: function( types, selector, fn ) {
-		var handleObj, type;
-		if ( types && types.preventDefault && types.handleObj ) {
-			// ( event )  dispatched jQuery.Event
-			handleObj = types.handleObj;
-			jQuery( types.delegateTarget ).off(
-				handleObj.namespace ? handleObj.origType + "." + handleObj.namespace : handleObj.origType,
-				handleObj.selector,
-				handleObj.handler
-			);
-			return this;
-		}
-		if ( typeof types === "object" ) {
-			// ( types-object [, selector] )
-			for ( type in types ) {
-				this.off( type, selector, types[ type ] );
-			}
-			return this;
-		}
-		if ( selector === false || typeof selector === "function" ) {
-			// ( types [, fn] )
-			fn = selector;
-			selector = undefined;
-		}
-		if ( fn === false ) {
-			fn = returnFalse;
-		}
-		return this.each(function() {
-			jQuery.event.remove( this, types, fn, selector );
-		});
-	},
-
-	trigger: function( type, data ) {
-		return this.each(function() {
-			jQuery.event.trigger( type, data, this );
-		});
-	},
-	triggerHandler: function( type, data ) {
-		var elem = this[0];
-		if ( elem ) {
-			return jQuery.event.trigger( type, data, elem, true );
-		}
-	}
-});
-
-return jQuery;
-});
diff --git a/#pma/js/jquery/src/jquery/event/ajax.js b/#pma/js/jquery/src/jquery/event/ajax.js
deleted file mode 100644
index 278c403e..00000000
--- a/#pma/js/jquery/src/jquery/event/ajax.js
+++ /dev/null
@@ -1,13 +0,0 @@
-define([
-	"../core",
-	"../event"
-], function( jQuery ) {
-
-// Attach a bunch of functions for handling common AJAX events
-jQuery.each( [ "ajaxStart", "ajaxStop", "ajaxComplete", "ajaxError", "ajaxSuccess", "ajaxSend" ], function( i, type ) {
-	jQuery.fn[ type ] = function( fn ) {
-		return this.on( type, fn );
-	};
-});
-
-});
diff --git a/#pma/js/jquery/src/jquery/event/alias.js b/#pma/js/jquery/src/jquery/event/alias.js
deleted file mode 100644
index 7e791750..00000000
--- a/#pma/js/jquery/src/jquery/event/alias.js
+++ /dev/null
@@ -1,39 +0,0 @@
-define([
-	"../core",
-	"../event"
-], function( jQuery ) {
-
-jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblclick " +
-	"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
-	"change select submit keydown keypress keyup error contextmenu").split(" "), function( i, name ) {
-
-	// Handle event binding
-	jQuery.fn[ name ] = function( data, fn ) {
-		return arguments.length > 0 ?
-			this.on( name, null, data, fn ) :
-			this.trigger( name );
-	};
-});
-
-jQuery.fn.extend({
-	hover: function( fnOver, fnOut ) {
-		return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
-	},
-
-	bind: function( types, data, fn ) {
-		return this.on( types, null, data, fn );
-	},
-	unbind: function( types, fn ) {
-		return this.off( types, null, fn );
-	},
-
-	delegate: function( selector, types, data, fn ) {
-		return this.on( types, selector, data, fn );
-	},
-	undelegate: function( selector, types, fn ) {
-		// ( namespace ) or ( selector, types [, fn] )
-		return arguments.length === 1 ? this.off( selector, "**" ) : this.off( types, selector || "**", fn );
-	}
-});
-
-});
diff --git a/#pma/js/jquery/src/jquery/event/support.js b/#pma/js/jquery/src/jquery/event/support.js
deleted file mode 100644
index 85060db7..00000000
--- a/#pma/js/jquery/src/jquery/event/support.js
+++ /dev/null
@@ -1,9 +0,0 @@
-define([
-	"../var/support"
-], function( support ) {
-
-support.focusinBubbles = "onfocusin" in window;
-
-return support;
-
-});
diff --git a/#pma/js/jquery/src/jquery/exports/amd.js b/#pma/js/jquery/src/jquery/exports/amd.js
deleted file mode 100644
index 9a9846f9..00000000
--- a/#pma/js/jquery/src/jquery/exports/amd.js
+++ /dev/null
@@ -1,24 +0,0 @@
-define([
-	"../core"
-], function( jQuery ) {
-
-// Register as a named AMD module, since jQuery can be concatenated with other
-// files that may use define, but not via a proper concatenation script that
-// understands anonymous AMD modules. A named AMD is safest and most robust
-// way to register. Lowercase jquery is used because AMD module names are
-// derived from file names, and jQuery is normally delivered in a lowercase
-// file name. Do this after creating the global so that if an AMD module wants
-// to call noConflict to hide this version of jQuery, it will work.
-
-// Note that for maximum portability, libraries that are not jQuery should
-// declare themselves as anonymous modules, and avoid setting a global if an
-// AMD loader is present. jQuery is a special case. For more information, see
-// https://github.com/jrburke/requirejs/wiki/Updating-existing-libraries#wiki-anon
-
-if ( typeof define === "function" && define.amd ) {
-	define( "jquery", [], function() {
-		return jQuery;
-	});
-}
-
-});
diff --git a/#pma/js/jquery/src/jquery/exports/global.js b/#pma/js/jquery/src/jquery/exports/global.js
deleted file mode 100644
index 6513287c..00000000
--- a/#pma/js/jquery/src/jquery/exports/global.js
+++ /dev/null
@@ -1,32 +0,0 @@
-define([
-	"../core",
-	"../var/strundefined"
-], function( jQuery, strundefined ) {
-
-var
-	// Map over jQuery in case of overwrite
-	_jQuery = window.jQuery,
-
-	// Map over the $ in case of overwrite
-	_$ = window.$;
-
-jQuery.noConflict = function( deep ) {
-	if ( window.$ === jQuery ) {
-		window.$ = _$;
-	}
-
-	if ( deep && window.jQuery === jQuery ) {
-		window.jQuery = _jQuery;
-	}
-
-	return jQuery;
-};
-
-// Expose jQuery and $ identifiers, even in AMD
-// (#7102#comment:10, https://github.com/jquery/jquery/pull/557)
-// and CommonJS for browser emulators (#13566)
-if ( typeof noGlobal === strundefined ) {
-	window.jQuery = window.$ = jQuery;
-}
-
-});
diff --git a/#pma/js/jquery/src/jquery/intro.js b/#pma/js/jquery/src/jquery/intro.js
deleted file mode 100644
index d7d43680..00000000
--- a/#pma/js/jquery/src/jquery/intro.js
+++ /dev/null
@@ -1,44 +0,0 @@
-/*!
- * jQuery JavaScript Library v@VERSION
- * http://jquery.com/
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- *
- * Copyright 2005, 2014 jQuery Foundation, Inc. and other contributors
- * Released under the MIT license
- * http://jquery.org/license
- *
- * Date: @DATE
- */
-
-(function( global, factory ) {
-
-	if ( typeof module === "object" && typeof module.exports === "object" ) {
-		// For CommonJS and CommonJS-like environments where a proper `window`
-		// is present, execute the factory and get jQuery.
-		// For environments that do not have a `window` with a `document`
-		// (such as Node.js), expose a factory as module.exports.
-		// This accentuates the need for the creation of a real `window`.
-		// e.g. var jQuery = require("jquery")(window);
-		// See ticket #14549 for more info.
-		module.exports = global.document ?
-			factory( global, true ) :
-			function( w ) {
-				if ( !w.document ) {
-					throw new Error( "jQuery requires a window with a document" );
-				}
-				return factory( w );
-			};
-	} else {
-		factory( global );
-	}
-
-// Pass this if window is not defined yet
-}(typeof window !== "undefined" ? window : this, function( window, noGlobal ) {
-
-// Support: Firefox 18+
-// Can't be in strict mode, several libs including ASP.NET trace
-// the stack via arguments.caller.callee and Firefox dies if
-// you try to trace through "use strict" call chains. (#13335)
-//"use strict";
diff --git a/#pma/js/jquery/src/jquery/jquery.js b/#pma/js/jquery/src/jquery/jquery.js
deleted file mode 100644
index d3857e95..00000000
--- a/#pma/js/jquery/src/jquery/jquery.js
+++ /dev/null
@@ -1,37 +0,0 @@
-define([
-	"./core",
-	"./selector",
-	"./traversing",
-	"./callbacks",
-	"./deferred",
-	"./core/ready",
-	"./data",
-	"./queue",
-	"./queue/delay",
-	"./attributes",
-	"./event",
-	"./event/alias",
-	"./manipulation",
-	"./manipulation/_evalUrl",
-	"./wrap",
-	"./css",
-	"./css/hiddenVisibleSelectors",
-	"./serialize",
-	"./ajax",
-	"./ajax/xhr",
-	"./ajax/script",
-	"./ajax/jsonp",
-	"./ajax/load",
-	"./event/ajax",
-	"./effects",
-	"./effects/animatedSelector",
-	"./offset",
-	"./dimensions",
-	"./deprecated",
-	"./exports/amd",
-	"./exports/global"
-], function( jQuery ) {
-
-return jQuery;
-
-});
diff --git a/#pma/js/jquery/src/jquery/manipulation.js b/#pma/js/jquery/src/jquery/manipulation.js
deleted file mode 100644
index c6279626..00000000
--- a/#pma/js/jquery/src/jquery/manipulation.js
+++ /dev/null
@@ -1,580 +0,0 @@
-define([
-	"./core",
-	"./var/concat",
-	"./var/push",
-	"./core/access",
-	"./manipulation/var/rcheckableType",
-	"./manipulation/support",
-	"./data/var/data_priv",
-	"./data/var/data_user",
-
-	"./core/init",
-	"./data/accepts",
-	"./traversing",
-	"./selector",
-	"./event"
-], function( jQuery, concat, push, access, rcheckableType, support, data_priv, data_user ) {
-
-var
-	rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,
-	rtagName = /<([\w:]+)/,
-	rhtml = /<|&#?\w+;/,
-	rnoInnerhtml = /<(?:script|style|link)/i,
-	// checked="checked" or checked
-	rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,
-	rscriptType = /^$|\/(?:java|ecma)script/i,
-	rscriptTypeMasked = /^true\/(.*)/,
-	rcleanScript = /^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,
-
-	// We have to close these tags to support XHTML (#13200)
-	wrapMap = {
-
-		// Support: IE9
-		option: [ 1, "<select multiple='multiple'>", "</select>" ],
-
-		thead: [ 1, "<table>", "</table>" ],
-		col: [ 2, "<table><colgroup>", "</colgroup></table>" ],
-		tr: [ 2, "<table><tbody>", "</tbody></table>" ],
-		td: [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ],
-
-		_default: [ 0, "", "" ]
-	};
-
-// Support: IE9
-wrapMap.optgroup = wrapMap.option;
-
-wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
-wrapMap.th = wrapMap.td;
-
-// Support: 1.x compatibility
-// Manipulating tables requires a tbody
-function manipulationTarget( elem, content ) {
-	return jQuery.nodeName( elem, "table" ) &&
-		jQuery.nodeName( content.nodeType !== 11 ? content : content.firstChild, "tr" ) ?
-
-		elem.getElementsByTagName("tbody")[0] ||
-			elem.appendChild( elem.ownerDocument.createElement("tbody") ) :
-		elem;
-}
-
-// Replace/restore the type attribute of script elements for safe DOM manipulation
-function disableScript( elem ) {
-	elem.type = (elem.getAttribute("type") !== null) + "/" + elem.type;
-	return elem;
-}
-function restoreScript( elem ) {
-	var match = rscriptTypeMasked.exec( elem.type );
-
-	if ( match ) {
-		elem.type = match[ 1 ];
-	} else {
-		elem.removeAttribute("type");
-	}
-
-	return elem;
-}
-
-// Mark scripts as having already been evaluated
-function setGlobalEval( elems, refElements ) {
-	var i = 0,
-		l = elems.length;
-
-	for ( ; i < l; i++ ) {
-		data_priv.set(
-			elems[ i ], "globalEval", !refElements || data_priv.get( refElements[ i ], "globalEval" )
-		);
-	}
-}
-
-function cloneCopyEvent( src, dest ) {
-	var i, l, type, pdataOld, pdataCur, udataOld, udataCur, events;
-
-	if ( dest.nodeType !== 1 ) {
-		return;
-	}
-
-	// 1. Copy private data: events, handlers, etc.
-	if ( data_priv.hasData( src ) ) {
-		pdataOld = data_priv.access( src );
-		pdataCur = data_priv.set( dest, pdataOld );
-		events = pdataOld.events;
-
-		if ( events ) {
-			delete pdataCur.handle;
-			pdataCur.events = {};
-
-			for ( type in events ) {
-				for ( i = 0, l = events[ type ].length; i < l; i++ ) {
-					jQuery.event.add( dest, type, events[ type ][ i ] );
-				}
-			}
-		}
-	}
-
-	// 2. Copy user data
-	if ( data_user.hasData( src ) ) {
-		udataOld = data_user.access( src );
-		udataCur = jQuery.extend( {}, udataOld );
-
-		data_user.set( dest, udataCur );
-	}
-}
-
-function getAll( context, tag ) {
-	var ret = context.getElementsByTagName ? context.getElementsByTagName( tag || "*" ) :
-			context.querySelectorAll ? context.querySelectorAll( tag || "*" ) :
-			[];
-
-	return tag === undefined || tag && jQuery.nodeName( context, tag ) ?
-		jQuery.merge( [ context ], ret ) :
-		ret;
-}
-
-// Fix IE bugs, see support tests
-function fixInput( src, dest ) {
-	var nodeName = dest.nodeName.toLowerCase();
-
-	// Fails to persist the checked state of a cloned checkbox or radio button.
-	if ( nodeName === "input" && rcheckableType.test( src.type ) ) {
-		dest.checked = src.checked;
-
-	// Fails to return the selected option to the default selected state when cloning options
-	} else if ( nodeName === "input" || nodeName === "textarea" ) {
-		dest.defaultValue = src.defaultValue;
-	}
-}
-
-jQuery.extend({
-	clone: function( elem, dataAndEvents, deepDataAndEvents ) {
-		var i, l, srcElements, destElements,
-			clone = elem.cloneNode( true ),
-			inPage = jQuery.contains( elem.ownerDocument, elem );
-
-		// Fix IE cloning issues
-		if ( !support.noCloneChecked && ( elem.nodeType === 1 || elem.nodeType === 11 ) &&
-				!jQuery.isXMLDoc( elem ) ) {
-
-			// We eschew Sizzle here for performance reasons: http://jsperf.com/getall-vs-sizzle/2
-			destElements = getAll( clone );
-			srcElements = getAll( elem );
-
-			for ( i = 0, l = srcElements.length; i < l; i++ ) {
-				fixInput( srcElements[ i ], destElements[ i ] );
-			}
-		}
-
-		// Copy the events from the original to the clone
-		if ( dataAndEvents ) {
-			if ( deepDataAndEvents ) {
-				srcElements = srcElements || getAll( elem );
-				destElements = destElements || getAll( clone );
-
-				for ( i = 0, l = srcElements.length; i < l; i++ ) {
-					cloneCopyEvent( srcElements[ i ], destElements[ i ] );
-				}
-			} else {
-				cloneCopyEvent( elem, clone );
-			}
-		}
-
-		// Preserve script evaluation history
-		destElements = getAll( clone, "script" );
-		if ( destElements.length > 0 ) {
-			setGlobalEval( destElements, !inPage && getAll( elem, "script" ) );
-		}
-
-		// Return the cloned set
-		return clone;
-	},
-
-	buildFragment: function( elems, context, scripts, selection ) {
-		var elem, tmp, tag, wrap, contains, j,
-			fragment = context.createDocumentFragment(),
-			nodes = [],
-			i = 0,
-			l = elems.length;
-
-		for ( ; i < l; i++ ) {
-			elem = elems[ i ];
-
-			if ( elem || elem === 0 ) {
-
-				// Add nodes directly
-				if ( jQuery.type( elem ) === "object" ) {
-					// Support: QtWebKit, PhantomJS
-					// push.apply(_, arraylike) throws on ancient WebKit
-					jQuery.merge( nodes, elem.nodeType ? [ elem ] : elem );
-
-				// Convert non-html into a text node
-				} else if ( !rhtml.test( elem ) ) {
-					nodes.push( context.createTextNode( elem ) );
-
-				// Convert html into DOM nodes
-				} else {
-					tmp = tmp || fragment.appendChild( context.createElement("div") );
-
-					// Deserialize a standard representation
-					tag = ( rtagName.exec( elem ) || [ "", "" ] )[ 1 ].toLowerCase();
-					wrap = wrapMap[ tag ] || wrapMap._default;
-					tmp.innerHTML = wrap[ 1 ] + elem.replace( rxhtmlTag, "<$1></$2>" ) + wrap[ 2 ];
-
-					// Descend through wrappers to the right content
-					j = wrap[ 0 ];
-					while ( j-- ) {
-						tmp = tmp.lastChild;
-					}
-
-					// Support: QtWebKit, PhantomJS
-					// push.apply(_, arraylike) throws on ancient WebKit
-					jQuery.merge( nodes, tmp.childNodes );
-
-					// Remember the top-level container
-					tmp = fragment.firstChild;
-
-					// Ensure the created nodes are orphaned (#12392)
-					tmp.textContent = "";
-				}
-			}
-		}
-
-		// Remove wrapper from fragment
-		fragment.textContent = "";
-
-		i = 0;
-		while ( (elem = nodes[ i++ ]) ) {
-
-			// #4087 - If origin and destination elements are the same, and this is
-			// that element, do not do anything
-			if ( selection && jQuery.inArray( elem, selection ) !== -1 ) {
-				continue;
-			}
-
-			contains = jQuery.contains( elem.ownerDocument, elem );
-
-			// Append to fragment
-			tmp = getAll( fragment.appendChild( elem ), "script" );
-
-			// Preserve script evaluation history
-			if ( contains ) {
-				setGlobalEval( tmp );
-			}
-
-			// Capture executables
-			if ( scripts ) {
-				j = 0;
-				while ( (elem = tmp[ j++ ]) ) {
-					if ( rscriptType.test( elem.type || "" ) ) {
-						scripts.push( elem );
-					}
-				}
-			}
-		}
-
-		return fragment;
-	},
-
-	cleanData: function( elems ) {
-		var data, elem, type, key,
-			special = jQuery.event.special,
-			i = 0;
-
-		for ( ; (elem = elems[ i ]) !== undefined; i++ ) {
-			if ( jQuery.acceptData( elem ) ) {
-				key = elem[ data_priv.expando ];
-
-				if ( key && (data = data_priv.cache[ key ]) ) {
-					if ( data.events ) {
-						for ( type in data.events ) {
-							if ( special[ type ] ) {
-								jQuery.event.remove( elem, type );
-
-							// This is a shortcut to avoid jQuery.event.remove's overhead
-							} else {
-								jQuery.removeEvent( elem, type, data.handle );
-							}
-						}
-					}
-					if ( data_priv.cache[ key ] ) {
-						// Discard any remaining `private` data
-						delete data_priv.cache[ key ];
-					}
-				}
-			}
-			// Discard any remaining `user` data
-			delete data_user.cache[ elem[ data_user.expando ] ];
-		}
-	}
-});
-
-jQuery.fn.extend({
-	text: function( value ) {
-		return access( this, function( value ) {
-			return value === undefined ?
-				jQuery.text( this ) :
-				this.empty().each(function() {
-					if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
-						this.textContent = value;
-					}
-				});
-		}, null, value, arguments.length );
-	},
-
-	append: function() {
-		return this.domManip( arguments, function( elem ) {
-			if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
-				var target = manipulationTarget( this, elem );
-				target.appendChild( elem );
-			}
-		});
-	},
-
-	prepend: function() {
-		return this.domManip( arguments, function( elem ) {
-			if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
-				var target = manipulationTarget( this, elem );
-				target.insertBefore( elem, target.firstChild );
-			}
-		});
-	},
-
-	before: function() {
-		return this.domManip( arguments, function( elem ) {
-			if ( this.parentNode ) {
-				this.parentNode.insertBefore( elem, this );
-			}
-		});
-	},
-
-	after: function() {
-		return this.domManip( arguments, function( elem ) {
-			if ( this.parentNode ) {
-				this.parentNode.insertBefore( elem, this.nextSibling );
-			}
-		});
-	},
-
-	remove: function( selector, keepData /* Internal Use Only */ ) {
-		var elem,
-			elems = selector ? jQuery.filter( selector, this ) : this,
-			i = 0;
-
-		for ( ; (elem = elems[i]) != null; i++ ) {
-			if ( !keepData && elem.nodeType === 1 ) {
-				jQuery.cleanData( getAll( elem ) );
-			}
-
-			if ( elem.parentNode ) {
-				if ( keepData && jQuery.contains( elem.ownerDocument, elem ) ) {
-					setGlobalEval( getAll( elem, "script" ) );
-				}
-				elem.parentNode.removeChild( elem );
-			}
-		}
-
-		return this;
-	},
-
-	empty: function() {
-		var elem,
-			i = 0;
-
-		for ( ; (elem = this[i]) != null; i++ ) {
-			if ( elem.nodeType === 1 ) {
-
-				// Prevent memory leaks
-				jQuery.cleanData( getAll( elem, false ) );
-
-				// Remove any remaining nodes
-				elem.textContent = "";
-			}
-		}
-
-		return this;
-	},
-
-	clone: function( dataAndEvents, deepDataAndEvents ) {
-		dataAndEvents = dataAndEvents == null ? false : dataAndEvents;
-		deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents;
-
-		return this.map(function() {
-			return jQuery.clone( this, dataAndEvents, deepDataAndEvents );
-		});
-	},
-
-	html: function( value ) {
-		return access( this, function( value ) {
-			var elem = this[ 0 ] || {},
-				i = 0,
-				l = this.length;
-
-			if ( value === undefined && elem.nodeType === 1 ) {
-				return elem.innerHTML;
-			}
-
-			// See if we can take a shortcut and just use innerHTML
-			if ( typeof value === "string" && !rnoInnerhtml.test( value ) &&
-				!wrapMap[ ( rtagName.exec( value ) || [ "", "" ] )[ 1 ].toLowerCase() ] ) {
-
-				value = value.replace( rxhtmlTag, "<$1></$2>" );
-
-				try {
-					for ( ; i < l; i++ ) {
-						elem = this[ i ] || {};
-
-						// Remove element nodes and prevent memory leaks
-						if ( elem.nodeType === 1 ) {
-							jQuery.cleanData( getAll( elem, false ) );
-							elem.innerHTML = value;
-						}
-					}
-
-					elem = 0;
-
-				// If using innerHTML throws an exception, use the fallback method
-				} catch( e ) {}
-			}
-
-			if ( elem ) {
-				this.empty().append( value );
-			}
-		}, null, value, arguments.length );
-	},
-
-	replaceWith: function() {
-		var arg = arguments[ 0 ];
-
-		// Make the changes, replacing each context element with the new content
-		this.domManip( arguments, function( elem ) {
-			arg = this.parentNode;
-
-			jQuery.cleanData( getAll( this ) );
-
-			if ( arg ) {
-				arg.replaceChild( elem, this );
-			}
-		});
-
-		// Force removal if there was no new content (e.g., from empty arguments)
-		return arg && (arg.length || arg.nodeType) ? this : this.remove();
-	},
-
-	detach: function( selector ) {
-		return this.remove( selector, true );
-	},
-
-	domManip: function( args, callback ) {
-
-		// Flatten any nested arrays
-		args = concat.apply( [], args );
-
-		var fragment, first, scripts, hasScripts, node, doc,
-			i = 0,
-			l = this.length,
-			set = this,
-			iNoClone = l - 1,
-			value = args[ 0 ],
-			isFunction = jQuery.isFunction( value );
-
-		// We can't cloneNode fragments that contain checked, in WebKit
-		if ( isFunction ||
-				( l > 1 && typeof value === "string" &&
-					!support.checkClone && rchecked.test( value ) ) ) {
-			return this.each(function( index ) {
-				var self = set.eq( index );
-				if ( isFunction ) {
-					args[ 0 ] = value.call( this, index, self.html() );
-				}
-				self.domManip( args, callback );
-			});
-		}
-
-		if ( l ) {
-			fragment = jQuery.buildFragment( args, this[ 0 ].ownerDocument, false, this );
-			first = fragment.firstChild;
-
-			if ( fragment.childNodes.length === 1 ) {
-				fragment = first;
-			}
-
-			if ( first ) {
-				scripts = jQuery.map( getAll( fragment, "script" ), disableScript );
-				hasScripts = scripts.length;
-
-				// Use the original fragment for the last item instead of the first because it can end up
-				// being emptied incorrectly in certain situations (#8070).
-				for ( ; i < l; i++ ) {
-					node = fragment;
-
-					if ( i !== iNoClone ) {
-						node = jQuery.clone( node, true, true );
-
-						// Keep references to cloned scripts for later restoration
-						if ( hasScripts ) {
-							// Support: QtWebKit
-							// jQuery.merge because push.apply(_, arraylike) throws
-							jQuery.merge( scripts, getAll( node, "script" ) );
-						}
-					}
-
-					callback.call( this[ i ], node, i );
-				}
-
-				if ( hasScripts ) {
-					doc = scripts[ scripts.length - 1 ].ownerDocument;
-
-					// Reenable scripts
-					jQuery.map( scripts, restoreScript );
-
-					// Evaluate executable scripts on first document insertion
-					for ( i = 0; i < hasScripts; i++ ) {
-						node = scripts[ i ];
-						if ( rscriptType.test( node.type || "" ) &&
-							!data_priv.access( node, "globalEval" ) && jQuery.contains( doc, node ) ) {
-
-							if ( node.src ) {
-								// Optional AJAX dependency, but won't run scripts if not present
-								if ( jQuery._evalUrl ) {
-									jQuery._evalUrl( node.src );
-								}
-							} else {
-								jQuery.globalEval( node.textContent.replace( rcleanScript, "" ) );
-							}
-						}
-					}
-				}
-			}
-		}
-
-		return this;
-	}
-});
-
-jQuery.each({
-	appendTo: "append",
-	prependTo: "prepend",
-	insertBefore: "before",
-	insertAfter: "after",
-	replaceAll: "replaceWith"
-}, function( name, original ) {
-	jQuery.fn[ name ] = function( selector ) {
-		var elems,
-			ret = [],
-			insert = jQuery( selector ),
-			last = insert.length - 1,
-			i = 0;
-
-		for ( ; i <= last; i++ ) {
-			elems = i === last ? this : this.clone( true );
-			jQuery( insert[ i ] )[ original ]( elems );
-
-			// Support: QtWebKit
-			// .get() because push.apply(_, arraylike) throws
-			push.apply( ret, elems.get() );
-		}
-
-		return this.pushStack( ret );
-	};
-});
-
-return jQuery;
-});
diff --git a/#pma/js/jquery/src/jquery/manipulation/_evalUrl.js b/#pma/js/jquery/src/jquery/manipulation/_evalUrl.js
deleted file mode 100644
index 6704749a..00000000
--- a/#pma/js/jquery/src/jquery/manipulation/_evalUrl.js
+++ /dev/null
@@ -1,18 +0,0 @@
-define([
-	"../ajax"
-], function( jQuery ) {
-
-jQuery._evalUrl = function( url ) {
-	return jQuery.ajax({
-		url: url,
-		type: "GET",
-		dataType: "script",
-		async: false,
-		global: false,
-		"throws": true
-	});
-};
-
-return jQuery._evalUrl;
-
-});
diff --git a/#pma/js/jquery/src/jquery/manipulation/support.js b/#pma/js/jquery/src/jquery/manipulation/support.js
deleted file mode 100644
index 822a014f..00000000
--- a/#pma/js/jquery/src/jquery/manipulation/support.js
+++ /dev/null
@@ -1,32 +0,0 @@
-define([
-	"../var/support"
-], function( support ) {
-
-(function() {
-	var fragment = document.createDocumentFragment(),
-		div = fragment.appendChild( document.createElement( "div" ) ),
-		input = document.createElement( "input" );
-
-	// Support: Safari<=5.1
-	// Check state lost if the name is set (#11217)
-	// Support: Windows Web Apps (WWA)
-	// `name` and `type` must use .setAttribute for WWA (#14901)
-	input.setAttribute( "type", "radio" );
-	input.setAttribute( "checked", "checked" );
-	input.setAttribute( "name", "t" );
-
-	div.appendChild( input );
-
-	// Support: Safari<=5.1, Android<4.2
-	// Older WebKit doesn't clone checked state correctly in fragments
-	support.checkClone = div.cloneNode( true ).cloneNode( true ).lastChild.checked;
-
-	// Support: IE<=11+
-	// Make sure textarea (and checkbox) defaultValue is properly cloned
-	div.innerHTML = "<textarea>x</textarea>";
-	support.noCloneChecked = !!div.cloneNode( true ).lastChild.defaultValue;
-})();
-
-return support;
-
-});
diff --git a/#pma/js/jquery/src/jquery/manipulation/var/rcheckableType.js b/#pma/js/jquery/src/jquery/manipulation/var/rcheckableType.js
deleted file mode 100644
index c27a15dc..00000000
--- a/#pma/js/jquery/src/jquery/manipulation/var/rcheckableType.js
+++ /dev/null
@@ -1,3 +0,0 @@
-define(function() {
-	return (/^(?:checkbox|radio)$/i);
-});
diff --git a/#pma/js/jquery/src/jquery/offset.js b/#pma/js/jquery/src/jquery/offset.js
deleted file mode 100644
index 4c34fd0e..00000000
--- a/#pma/js/jquery/src/jquery/offset.js
+++ /dev/null
@@ -1,207 +0,0 @@
-define([
-	"./core",
-	"./var/strundefined",
-	"./core/access",
-	"./css/var/rnumnonpx",
-	"./css/curCSS",
-	"./css/addGetHookIf",
-	"./css/support",
-
-	"./core/init",
-	"./css",
-	"./selector" // contains
-], function( jQuery, strundefined, access, rnumnonpx, curCSS, addGetHookIf, support ) {
-
-var docElem = window.document.documentElement;
-
-/**
- * Gets a window from an element
- */
-function getWindow( elem ) {
-	return jQuery.isWindow( elem ) ? elem : elem.nodeType === 9 && elem.defaultView;
-}
-
-jQuery.offset = {
-	setOffset: function( elem, options, i ) {
-		var curPosition, curLeft, curCSSTop, curTop, curOffset, curCSSLeft, calculatePosition,
-			position = jQuery.css( elem, "position" ),
-			curElem = jQuery( elem ),
-			props = {};
-
-		// Set position first, in-case top/left are set even on static elem
-		if ( position === "static" ) {
-			elem.style.position = "relative";
-		}
-
-		curOffset = curElem.offset();
-		curCSSTop = jQuery.css( elem, "top" );
-		curCSSLeft = jQuery.css( elem, "left" );
-		calculatePosition = ( position === "absolute" || position === "fixed" ) &&
-			( curCSSTop + curCSSLeft ).indexOf("auto") > -1;
-
-		// Need to be able to calculate position if either
-		// top or left is auto and position is either absolute or fixed
-		if ( calculatePosition ) {
-			curPosition = curElem.position();
-			curTop = curPosition.top;
-			curLeft = curPosition.left;
-
-		} else {
-			curTop = parseFloat( curCSSTop ) || 0;
-			curLeft = parseFloat( curCSSLeft ) || 0;
-		}
-
-		if ( jQuery.isFunction( options ) ) {
-			options = options.call( elem, i, curOffset );
-		}
-
-		if ( options.top != null ) {
-			props.top = ( options.top - curOffset.top ) + curTop;
-		}
-		if ( options.left != null ) {
-			props.left = ( options.left - curOffset.left ) + curLeft;
-		}
-
-		if ( "using" in options ) {
-			options.using.call( elem, props );
-
-		} else {
-			curElem.css( props );
-		}
-	}
-};
-
-jQuery.fn.extend({
-	offset: function( options ) {
-		if ( arguments.length ) {
-			return options === undefined ?
-				this :
-				this.each(function( i ) {
-					jQuery.offset.setOffset( this, options, i );
-				});
-		}
-
-		var docElem, win,
-			elem = this[ 0 ],
-			box = { top: 0, left: 0 },
-			doc = elem && elem.ownerDocument;
-
-		if ( !doc ) {
-			return;
-		}
-
-		docElem = doc.documentElement;
-
-		// Make sure it's not a disconnected DOM node
-		if ( !jQuery.contains( docElem, elem ) ) {
-			return box;
-		}
-
-		// Support: BlackBerry 5, iOS 3 (original iPhone)
-		// If we don't have gBCR, just use 0,0 rather than error
-		if ( typeof elem.getBoundingClientRect !== strundefined ) {
-			box = elem.getBoundingClientRect();
-		}
-		win = getWindow( doc );
-		return {
-			top: box.top + win.pageYOffset - docElem.clientTop,
-			left: box.left + win.pageXOffset - docElem.clientLeft
-		};
-	},
-
-	position: function() {
-		if ( !this[ 0 ] ) {
-			return;
-		}
-
-		var offsetParent, offset,
-			elem = this[ 0 ],
-			parentOffset = { top: 0, left: 0 };
-
-		// Fixed elements are offset from window (parentOffset = {top:0, left: 0}, because it is its only offset parent
-		if ( jQuery.css( elem, "position" ) === "fixed" ) {
-			// Assume getBoundingClientRect is there when computed position is fixed
-			offset = elem.getBoundingClientRect();
-
-		} else {
-			// Get *real* offsetParent
-			offsetParent = this.offsetParent();
-
-			// Get correct offsets
-			offset = this.offset();
-			if ( !jQuery.nodeName( offsetParent[ 0 ], "html" ) ) {
-				parentOffset = offsetParent.offset();
-			}
-
-			// Add offsetParent borders
-			parentOffset.top += jQuery.css( offsetParent[ 0 ], "borderTopWidth", true );
-			parentOffset.left += jQuery.css( offsetParent[ 0 ], "borderLeftWidth", true );
-		}
-
-		// Subtract parent offsets and element margins
-		return {
-			top: offset.top - parentOffset.top - jQuery.css( elem, "marginTop", true ),
-			left: offset.left - parentOffset.left - jQuery.css( elem, "marginLeft", true )
-		};
-	},
-
-	offsetParent: function() {
-		return this.map(function() {
-			var offsetParent = this.offsetParent || docElem;
-
-			while ( offsetParent && ( !jQuery.nodeName( offsetParent, "html" ) && jQuery.css( offsetParent, "position" ) === "static" ) ) {
-				offsetParent = offsetParent.offsetParent;
-			}
-
-			return offsetParent || docElem;
-		});
-	}
-});
-
-// Create scrollLeft and scrollTop methods
-jQuery.each( { scrollLeft: "pageXOffset", scrollTop: "pageYOffset" }, function( method, prop ) {
-	var top = "pageYOffset" === prop;
-
-	jQuery.fn[ method ] = function( val ) {
-		return access( this, function( elem, method, val ) {
-			var win = getWindow( elem );
-
-			if ( val === undefined ) {
-				return win ? win[ prop ] : elem[ method ];
-			}
-
-			if ( win ) {
-				win.scrollTo(
-					!top ? val : window.pageXOffset,
-					top ? val : window.pageYOffset
-				);
-
-			} else {
-				elem[ method ] = val;
-			}
-		}, method, val, arguments.length, null );
-	};
-});
-
-// Support: Safari<7+, Chrome<37+
-// Add the top/left cssHooks using jQuery.fn.position
-// Webkit bug: https://bugs.webkit.org/show_bug.cgi?id=29084
-// Blink bug: https://code.google.com/p/chromium/issues/detail?id=229280
-// getComputedStyle returns percent when specified for top/left/bottom/right;
-// rather than make the css module depend on the offset module, just check for it here
-jQuery.each( [ "top", "left" ], function( i, prop ) {
-	jQuery.cssHooks[ prop ] = addGetHookIf( support.pixelPosition,
-		function( elem, computed ) {
-			if ( computed ) {
-				computed = curCSS( elem, prop );
-				// If curCSS returns percentage, fallback to offset
-				return rnumnonpx.test( computed ) ?
-					jQuery( elem ).position()[ prop ] + "px" :
-					computed;
-			}
-		}
-	);
-});
-
-return jQuery;
-});
diff --git a/#pma/js/jquery/src/jquery/outro.js b/#pma/js/jquery/src/jquery/outro.js
deleted file mode 100644
index be4600a5..00000000
--- a/#pma/js/jquery/src/jquery/outro.js
+++ /dev/null
@@ -1 +0,0 @@
-}));
diff --git a/#pma/js/jquery/src/jquery/queue.js b/#pma/js/jquery/src/jquery/queue.js
deleted file mode 100644
index 199c56d3..00000000
--- a/#pma/js/jquery/src/jquery/queue.js
+++ /dev/null
@@ -1,142 +0,0 @@
-define([
-	"./core",
-	"./data/var/data_priv",
-	"./deferred",
-	"./callbacks"
-], function( jQuery, data_priv ) {
-
-jQuery.extend({
-	queue: function( elem, type, data ) {
-		var queue;
-
-		if ( elem ) {
-			type = ( type || "fx" ) + "queue";
-			queue = data_priv.get( elem, type );
-
-			// Speed up dequeue by getting out quickly if this is just a lookup
-			if ( data ) {
-				if ( !queue || jQuery.isArray( data ) ) {
-					queue = data_priv.access( elem, type, jQuery.makeArray(data) );
-				} else {
-					queue.push( data );
-				}
-			}
-			return queue || [];
-		}
-	},
-
-	dequeue: function( elem, type ) {
-		type = type || "fx";
-
-		var queue = jQuery.queue( elem, type ),
-			startLength = queue.length,
-			fn = queue.shift(),
-			hooks = jQuery._queueHooks( elem, type ),
-			next = function() {
-				jQuery.dequeue( elem, type );
-			};
-
-		// If the fx queue is dequeued, always remove the progress sentinel
-		if ( fn === "inprogress" ) {
-			fn = queue.shift();
-			startLength--;
-		}
-
-		if ( fn ) {
-
-			// Add a progress sentinel to prevent the fx queue from being
-			// automatically dequeued
-			if ( type === "fx" ) {
-				queue.unshift( "inprogress" );
-			}
-
-			// Clear up the last queue stop function
-			delete hooks.stop;
-			fn.call( elem, next, hooks );
-		}
-
-		if ( !startLength && hooks ) {
-			hooks.empty.fire();
-		}
-	},
-
-	// Not public - generate a queueHooks object, or return the current one
-	_queueHooks: function( elem, type ) {
-		var key = type + "queueHooks";
-		return data_priv.get( elem, key ) || data_priv.access( elem, key, {
-			empty: jQuery.Callbacks("once memory").add(function() {
-				data_priv.remove( elem, [ type + "queue", key ] );
-			})
-		});
-	}
-});
-
-jQuery.fn.extend({
-	queue: function( type, data ) {
-		var setter = 2;
-
-		if ( typeof type !== "string" ) {
-			data = type;
-			type = "fx";
-			setter--;
-		}
-
-		if ( arguments.length < setter ) {
-			return jQuery.queue( this[0], type );
-		}
-
-		return data === undefined ?
-			this :
-			this.each(function() {
-				var queue = jQuery.queue( this, type, data );
-
-				// Ensure a hooks for this queue
-				jQuery._queueHooks( this, type );
-
-				if ( type === "fx" && queue[0] !== "inprogress" ) {
-					jQuery.dequeue( this, type );
-				}
-			});
-	},
-	dequeue: function( type ) {
-		return this.each(function() {
-			jQuery.dequeue( this, type );
-		});
-	},
-	clearQueue: function( type ) {
-		return this.queue( type || "fx", [] );
-	},
-	// Get a promise resolved when queues of a certain type
-	// are emptied (fx is the type by default)
-	promise: function( type, obj ) {
-		var tmp,
-			count = 1,
-			defer = jQuery.Deferred(),
-			elements = this,
-			i = this.length,
-			resolve = function() {
-				if ( !( --count ) ) {
-					defer.resolveWith( elements, [ elements ] );
-				}
-			};
-
-		if ( typeof type !== "string" ) {
-			obj = type;
-			type = undefined;
-		}
-		type = type || "fx";
-
-		while ( i-- ) {
-			tmp = data_priv.get( elements[ i ], type + "queueHooks" );
-			if ( tmp && tmp.empty ) {
-				count++;
-				tmp.empty.add( resolve );
-			}
-		}
-		resolve();
-		return defer.promise( obj );
-	}
-});
-
-return jQuery;
-});
diff --git a/#pma/js/jquery/src/jquery/queue/delay.js b/#pma/js/jquery/src/jquery/queue/delay.js
deleted file mode 100644
index 4b4498ce..00000000
--- a/#pma/js/jquery/src/jquery/queue/delay.js
+++ /dev/null
@@ -1,22 +0,0 @@
-define([
-	"../core",
-	"../queue",
-	"../effects" // Delay is optional because of this dependency
-], function( jQuery ) {
-
-// Based off of the plugin by Clint Helfers, with permission.
-// http://blindsignals.com/index.php/2009/07/jquery-delay/
-jQuery.fn.delay = function( time, type ) {
-	time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time;
-	type = type || "fx";
-
-	return this.queue( type, function( next, hooks ) {
-		var timeout = setTimeout( next, time );
-		hooks.stop = function() {
-			clearTimeout( timeout );
-		};
-	});
-};
-
-return jQuery.fn.delay;
-});
diff --git a/#pma/js/jquery/src/jquery/selector-native.js b/#pma/js/jquery/src/jquery/selector-native.js
deleted file mode 100644
index d8163c2f..00000000
--- a/#pma/js/jquery/src/jquery/selector-native.js
+++ /dev/null
@@ -1,172 +0,0 @@
-define([
-	"./core"
-], function( jQuery ) {
-
-/*
- * Optional (non-Sizzle) selector module for custom builds.
- *
- * Note that this DOES NOT SUPPORT many documented jQuery
- * features in exchange for its smaller size:
- *
- * Attribute not equal selector
- * Positional selectors (:first; :eq(n); :odd; etc.)
- * Type selectors (:input; :checkbox; :button; etc.)
- * State-based selectors (:animated; :visible; :hidden; etc.)
- * :has(selector)
- * :not(complex selector)
- * custom selectors via Sizzle extensions
- * Leading combinators (e.g., $collection.find("> *"))
- * Reliable functionality on XML fragments
- * Requiring all parts of a selector to match elements under context
- *   (e.g., $div.find("div > *") now matches children of $div)
- * Matching against non-elements
- * Reliable sorting of disconnected nodes
- * querySelectorAll bug fixes (e.g., unreliable :focus on WebKit)
- *
- * If any of these are unacceptable tradeoffs, either use Sizzle or
- * customize this stub for the project's specific needs.
- */
-
-var docElem = window.document.documentElement,
-	selector_hasDuplicate,
-	matches = docElem.matches ||
-		docElem.webkitMatchesSelector ||
-		docElem.mozMatchesSelector ||
-		docElem.oMatchesSelector ||
-		docElem.msMatchesSelector,
-	selector_sortOrder = function( a, b ) {
-		// Flag for duplicate removal
-		if ( a === b ) {
-			selector_hasDuplicate = true;
-			return 0;
-		}
-
-		var compare = b.compareDocumentPosition && a.compareDocumentPosition && a.compareDocumentPosition( b );
-
-		if ( compare ) {
-			// Disconnected nodes
-			if ( compare & 1 ) {
-
-				// Choose the first element that is related to our document
-				if ( a === document || jQuery.contains(document, a) ) {
-					return -1;
-				}
-				if ( b === document || jQuery.contains(document, b) ) {
-					return 1;
-				}
-
-				// Maintain original order
-				return 0;
-			}
-
-			return compare & 4 ? -1 : 1;
-		}
-
-		// Not directly comparable, sort on existence of method
-		return a.compareDocumentPosition ? -1 : 1;
-	};
-
-jQuery.extend({
-	find: function( selector, context, results, seed ) {
-		var elem, nodeType,
-			i = 0;
-
-		results = results || [];
-		context = context || document;
-
-		// Same basic safeguard as Sizzle
-		if ( !selector || typeof selector !== "string" ) {
-			return results;
-		}
-
-		// Early return if context is not an element or document
-		if ( (nodeType = context.nodeType) !== 1 && nodeType !== 9 ) {
-			return [];
-		}
-
-		if ( seed ) {
-			while ( (elem = seed[i++]) ) {
-				if ( jQuery.find.matchesSelector(elem, selector) ) {
-					results.push( elem );
-				}
-			}
-		} else {
-			jQuery.merge( results, context.querySelectorAll(selector) );
-		}
-
-		return results;
-	},
-	unique: function( results ) {
-		var elem,
-			duplicates = [],
-			i = 0,
-			j = 0;
-
-		selector_hasDuplicate = false;
-		results.sort( selector_sortOrder );
-
-		if ( selector_hasDuplicate ) {
-			while ( (elem = results[i++]) ) {
-				if ( elem === results[ i ] ) {
-					j = duplicates.push( i );
-				}
-			}
-			while ( j-- ) {
-				results.splice( duplicates[ j ], 1 );
-			}
-		}
-
-		return results;
-	},
-	text: function( elem ) {
-		var node,
-			ret = "",
-			i = 0,
-			nodeType = elem.nodeType;
-
-		if ( !nodeType ) {
-			// If no nodeType, this is expected to be an array
-			while ( (node = elem[i++]) ) {
-				// Do not traverse comment nodes
-				ret += jQuery.text( node );
-			}
-		} else if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) {
-			// Use textContent for elements
-			return elem.textContent;
-		} else if ( nodeType === 3 || nodeType === 4 ) {
-			return elem.nodeValue;
-		}
-		// Do not include comment or processing instruction nodes
-
-		return ret;
-	},
-	contains: function( a, b ) {
-		var adown = a.nodeType === 9 ? a.documentElement : a,
-			bup = b && b.parentNode;
-		return a === bup || !!( bup && bup.nodeType === 1 && adown.contains(bup) );
-	},
-	isXMLDoc: function( elem ) {
-		return (elem.ownerDocument || elem).documentElement.nodeName !== "HTML";
-	},
-	expr: {
-		attrHandle: {},
-		match: {
-			bool: /^(?:checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped)$/i,
-			needsContext: /^[\x20\t\r\n\f]*[>+~]/
-		}
-	}
-});
-
-jQuery.extend( jQuery.find, {
-	matches: function( expr, elements ) {
-		return jQuery.find( expr, null, null, elements );
-	},
-	matchesSelector: function( elem, expr ) {
-		return matches.call( elem, expr );
-	},
-	attr: function( elem, name ) {
-		return elem.getAttribute( name );
-	}
-});
-
-});
diff --git a/#pma/js/jquery/src/jquery/selector-sizzle.js b/#pma/js/jquery/src/jquery/selector-sizzle.js
deleted file mode 100644
index 7d3926b1..00000000
--- a/#pma/js/jquery/src/jquery/selector-sizzle.js
+++ /dev/null
@@ -1,14 +0,0 @@
-define([
-	"./core",
-	"sizzle"
-], function( jQuery, Sizzle ) {
-
-jQuery.find = Sizzle;
-jQuery.expr = Sizzle.selectors;
-jQuery.expr[":"] = jQuery.expr.pseudos;
-jQuery.unique = Sizzle.uniqueSort;
-jQuery.text = Sizzle.getText;
-jQuery.isXMLDoc = Sizzle.isXML;
-jQuery.contains = Sizzle.contains;
-
-});
diff --git a/#pma/js/jquery/src/jquery/selector.js b/#pma/js/jquery/src/jquery/selector.js
deleted file mode 100644
index 01e9733b..00000000
--- a/#pma/js/jquery/src/jquery/selector.js
+++ /dev/null
@@ -1 +0,0 @@
-define([ "./selector-sizzle" ]);
diff --git a/#pma/js/jquery/src/jquery/serialize.js b/#pma/js/jquery/src/jquery/serialize.js
deleted file mode 100644
index 0d6dfec6..00000000
--- a/#pma/js/jquery/src/jquery/serialize.js
+++ /dev/null
@@ -1,111 +0,0 @@
-define([
-	"./core",
-	"./manipulation/var/rcheckableType",
-	"./core/init",
-	"./traversing", // filter
-	"./attributes/prop"
-], function( jQuery, rcheckableType ) {
-
-var r20 = /%20/g,
-	rbracket = /\[\]$/,
-	rCRLF = /\r?\n/g,
-	rsubmitterTypes = /^(?:submit|button|image|reset|file)$/i,
-	rsubmittable = /^(?:input|select|textarea|keygen)/i;
-
-function buildParams( prefix, obj, traditional, add ) {
-	var name;
-
-	if ( jQuery.isArray( obj ) ) {
-		// Serialize array item.
-		jQuery.each( obj, function( i, v ) {
-			if ( traditional || rbracket.test( prefix ) ) {
-				// Treat each array item as a scalar.
-				add( prefix, v );
-
-			} else {
-				// Item is non-scalar (array or object), encode its numeric index.
-				buildParams( prefix + "[" + ( typeof v === "object" ? i : "" ) + "]", v, traditional, add );
-			}
-		});
-
-	} else if ( !traditional && jQuery.type( obj ) === "object" ) {
-		// Serialize object item.
-		for ( name in obj ) {
-			buildParams( prefix + "[" + name + "]", obj[ name ], traditional, add );
-		}
-
-	} else {
-		// Serialize scalar item.
-		add( prefix, obj );
-	}
-}
-
-// Serialize an array of form elements or a set of
-// key/values into a query string
-jQuery.param = function( a, traditional ) {
-	var prefix,
-		s = [],
-		add = function( key, value ) {
-			// If value is a function, invoke it and return its value
-			value = jQuery.isFunction( value ) ? value() : ( value == null ? "" : value );
-			s[ s.length ] = encodeURIComponent( key ) + "=" + encodeURIComponent( value );
-		};
-
-	// Set traditional to true for jQuery <= 1.3.2 behavior.
-	if ( traditional === undefined ) {
-		traditional = jQuery.ajaxSettings && jQuery.ajaxSettings.traditional;
-	}
-
-	// If an array was passed in, assume that it is an array of form elements.
-	if ( jQuery.isArray( a ) || ( a.jquery && !jQuery.isPlainObject( a ) ) ) {
-		// Serialize the form elements
-		jQuery.each( a, function() {
-			add( this.name, this.value );
-		});
-
-	} else {
-		// If traditional, encode the "old" way (the way 1.3.2 or older
-		// did it), otherwise encode params recursively.
-		for ( prefix in a ) {
-			buildParams( prefix, a[ prefix ], traditional, add );
-		}
-	}
-
-	// Return the resulting serialization
-	return s.join( "&" ).replace( r20, "+" );
-};
-
-jQuery.fn.extend({
-	serialize: function() {
-		return jQuery.param( this.serializeArray() );
-	},
-	serializeArray: function() {
-		return this.map(function() {
-			// Can add propHook for "elements" to filter or add form elements
-			var elements = jQuery.prop( this, "elements" );
-			return elements ? jQuery.makeArray( elements ) : this;
-		})
-		.filter(function() {
-			var type = this.type;
-
-			// Use .is( ":disabled" ) so that fieldset[disabled] works
-			return this.name && !jQuery( this ).is( ":disabled" ) &&
-				rsubmittable.test( this.nodeName ) && !rsubmitterTypes.test( type ) &&
-				( this.checked || !rcheckableType.test( type ) );
-		})
-		.map(function( i, elem ) {
-			var val = jQuery( this ).val();
-
-			return val == null ?
-				null :
-				jQuery.isArray( val ) ?
-					jQuery.map( val, function( val ) {
-						return { name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
-					}) :
-					{ name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
-		}).get();
-	}
-});
-
-return jQuery;
-});
diff --git a/#pma/js/jquery/src/jquery/sizzle/dist/sizzle.js b/#pma/js/jquery/src/jquery/sizzle/dist/sizzle.js
deleted file mode 100644
index 89aecbc2..00000000
--- a/#pma/js/jquery/src/jquery/sizzle/dist/sizzle.js
+++ /dev/null
@@ -1,2067 +0,0 @@
-/*!
- * Sizzle CSS Selector Engine v2.2.0-pre
- * http://sizzlejs.com/
- *
- * Copyright 2008, 2014 jQuery Foundation, Inc. and other contributors
- * Released under the MIT license
- * http://jquery.org/license
- *
- * Date: 2014-12-16
- */
-(function( window ) {
-
-var i,
-	support,
-	Expr,
-	getText,
-	isXML,
-	tokenize,
-	compile,
-	select,
-	outermostContext,
-	sortInput,
-	hasDuplicate,
-
-	// Local document vars
-	setDocument,
-	document,
-	docElem,
-	documentIsHTML,
-	rbuggyQSA,
-	rbuggyMatches,
-	matches,
-	contains,
-
-	// Instance-specific data
-	expando = "sizzle" + 1 * new Date(),
-	preferredDoc = window.document,
-	dirruns = 0,
-	done = 0,
-	classCache = createCache(),
-	tokenCache = createCache(),
-	compilerCache = createCache(),
-	sortOrder = function( a, b ) {
-		if ( a === b ) {
-			hasDuplicate = true;
-		}
-		return 0;
-	},
-
-	// General-purpose constants
-	MAX_NEGATIVE = 1 << 31,
-
-	// Instance methods
-	hasOwn = ({}).hasOwnProperty,
-	arr = [],
-	pop = arr.pop,
-	push_native = arr.push,
-	push = arr.push,
-	slice = arr.slice,
-	// Use a stripped-down indexOf as it's faster than native
-	// http://jsperf.com/thor-indexof-vs-for/5
-	indexOf = function( list, elem ) {
-		var i = 0,
-			len = list.length;
-		for ( ; i < len; i++ ) {
-			if ( list[i] === elem ) {
-				return i;
-			}
-		}
-		return -1;
-	},
-
-	booleans = "checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",
-
-	// Regular expressions
-
-	// Whitespace characters http://www.w3.org/TR/css3-selectors/#whitespace
-	whitespace = "[\\x20\\t\\r\\n\\f]",
-	// http://www.w3.org/TR/css3-syntax/#characters
-	characterEncoding = "(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",
-
-	// Loosely modeled on CSS identifier characters
-	// An unquoted value should be a CSS identifier http://www.w3.org/TR/css3-selectors/#attribute-selectors
-	// Proper syntax: http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier
-	identifier = characterEncoding.replace( "w", "w#" ),
-
-	// Attribute selectors: http://www.w3.org/TR/selectors/#attribute-selectors
-	attributes = "\\[" + whitespace + "*(" + characterEncoding + ")(?:" + whitespace +
-		// Operator (capture 2)
-		"*([*^$|!~]?=)" + whitespace +
-		// "Attribute values must be CSS identifiers [capture 5] or strings [capture 3 or capture 4]"
-		"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|(" + identifier + "))|)" + whitespace +
-		"*\\]",
-
-	pseudos = ":(" + characterEncoding + ")(?:\\((" +
-		// To reduce the number of selectors needing tokenize in the preFilter, prefer arguments:
-		// 1. quoted (capture 3; capture 4 or capture 5)
-		"('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|" +
-		// 2. simple (capture 6)
-		"((?:\\\\.|[^\\\\()[\\]]|" + attributes + ")*)|" +
-		// 3. anything else (capture 2)
-		".*" +
-		")\\)|)",
-
-	// Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter
-	rwhitespace = new RegExp( whitespace + "+", "g" ),
-	rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + whitespace + "+$", "g" ),
-
-	rcomma = new RegExp( "^" + whitespace + "*," + whitespace + "*" ),
-	rcombinators = new RegExp( "^" + whitespace + "*([>+~]|" + whitespace + ")" + whitespace + "*" ),
-
-	rattributeQuotes = new RegExp( "=" + whitespace + "*([^\\]'\"]*?)" + whitespace + "*\\]", "g" ),
-
-	rpseudo = new RegExp( pseudos ),
-	ridentifier = new RegExp( "^" + identifier + "$" ),
-
-	matchExpr = {
-		"ID": new RegExp( "^#(" + characterEncoding + ")" ),
-		"CLASS": new RegExp( "^\\.(" + characterEncoding + ")" ),
-		"TAG": new RegExp( "^(" + characterEncoding.replace( "w", "w*" ) + ")" ),
-		"ATTR": new RegExp( "^" + attributes ),
-		"PSEUDO": new RegExp( "^" + pseudos ),
-		"CHILD": new RegExp( "^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" + whitespace +
-			"*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" + whitespace +
-			"*(\\d+)|))" + whitespace + "*\\)|)", "i" ),
-		"bool": new RegExp( "^(?:" + booleans + ")$", "i" ),
-		// For use in libraries implementing .is()
-		// We use this for POS matching in `select`
-		"needsContext": new RegExp( "^" + whitespace + "*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" +
-			whitespace + "*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)", "i" )
-	},
-
-	rinputs = /^(?:input|select|textarea|button)$/i,
-	rheader = /^h\d$/i,
-
-	rnative = /^[^{]+\{\s*\[native \w/,
-
-	// Easily-parseable/retrievable ID or TAG or CLASS selectors
-	rquickExpr = /^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,
-
-	rsibling = /[+~]/,
-	rescape = /'|\\/g,
-
-	// CSS escapes http://www.w3.org/TR/CSS21/syndata.html#escaped-characters
-	runescape = new RegExp( "\\\\([\\da-f]{1,6}" + whitespace + "?|(" + whitespace + ")|.)", "ig" ),
-	funescape = function( _, escaped, escapedWhitespace ) {
-		var high = "0x" + escaped - 0x10000;
-		// NaN means non-codepoint
-		// Support: Firefox<24
-		// Workaround erroneous numeric interpretation of +"0x"
-		return high !== high || escapedWhitespace ?
-			escaped :
-			high < 0 ?
-				// BMP codepoint
-				String.fromCharCode( high + 0x10000 ) :
-				// Supplemental Plane codepoint (surrogate pair)
-				String.fromCharCode( high >> 10 | 0xD800, high & 0x3FF | 0xDC00 );
-	},
-
-	// Used for iframes
-	// See setDocument()
-	// Removing the function wrapper causes a "Permission Denied"
-	// error in IE
-	unloadHandler = function() {
-		setDocument();
-	};
-
-// Optimize for push.apply( _, NodeList )
-try {
-	push.apply(
-		(arr = slice.call( preferredDoc.childNodes )),
-		preferredDoc.childNodes
-	);
-	// Support: Android<4.0
-	// Detect silently failing push.apply
-	arr[ preferredDoc.childNodes.length ].nodeType;
-} catch ( e ) {
-	push = { apply: arr.length ?
-
-		// Leverage slice if possible
-		function( target, els ) {
-			push_native.apply( target, slice.call(els) );
-		} :
-
-		// Support: IE<9
-		// Otherwise append directly
-		function( target, els ) {
-			var j = target.length,
-				i = 0;
-			// Can't trust NodeList.length
-			while ( (target[j++] = els[i++]) ) {}
-			target.length = j - 1;
-		}
-	};
-}
-
-function Sizzle( selector, context, results, seed ) {
-	var match, elem, m, nodeType,
-		// QSA vars
-		i, groups, old, nid, newContext, newSelector;
-
-	if ( ( context ? context.ownerDocument || context : preferredDoc ) !== document ) {
-		setDocument( context );
-	}
-
-	context = context || document;
-	results = results || [];
-	nodeType = context.nodeType;
-
-	if ( typeof selector !== "string" || !selector ||
-		nodeType !== 1 && nodeType !== 9 && nodeType !== 11 ) {
-
-		return results;
-	}
-
-	if ( !seed && documentIsHTML ) {
-
-		// Try to shortcut find operations when possible (e.g., not under DocumentFragment)
-		if ( nodeType !== 11 && (match = rquickExpr.exec( selector )) ) {
-			// Speed-up: Sizzle("#ID")
-			if ( (m = match[1]) ) {
-				if ( nodeType === 9 ) {
-					elem = context.getElementById( m );
-					// Check parentNode to catch when Blackberry 4.6 returns
-					// nodes that are no longer in the document (jQuery #6963)
-					if ( elem && elem.parentNode ) {
-						// Handle the case where IE, Opera, and Webkit return items
-						// by name instead of ID
-						if ( elem.id === m ) {
-							results.push( elem );
-							return results;
-						}
-					} else {
-						return results;
-					}
-				} else {
-					// Context is not a document
-					if ( context.ownerDocument && (elem = context.ownerDocument.getElementById( m )) &&
-						contains( context, elem ) && elem.id === m ) {
-						results.push( elem );
-						return results;
-					}
-				}
-
-			// Speed-up: Sizzle("TAG")
-			} else if ( match[2] ) {
-				push.apply( results, context.getElementsByTagName( selector ) );
-				return results;
-
-			// Speed-up: Sizzle(".CLASS")
-			} else if ( (m = match[3]) && support.getElementsByClassName ) {
-				push.apply( results, context.getElementsByClassName( m ) );
-				return results;
-			}
-		}
-
-		// QSA path
-		if ( support.qsa && (!rbuggyQSA || !rbuggyQSA.test( selector )) ) {
-			nid = old = expando;
-			newContext = context;
-			newSelector = nodeType !== 1 && selector;
-
-			// qSA works strangely on Element-rooted queries
-			// We can work around this by specifying an extra ID on the root
-			// and working up from there (Thanks to Andrew Dupont for the technique)
-			// IE 8 doesn't work on object elements
-			if ( nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) {
-				groups = tokenize( selector );
-
-				if ( (old = context.getAttribute("id")) ) {
-					nid = old.replace( rescape, "\\$&" );
-				} else {
-					context.setAttribute( "id", nid );
-				}
-				nid = "[id='" + nid + "'] ";
-
-				i = groups.length;
-				while ( i-- ) {
-					groups[i] = nid + toSelector( groups[i] );
-				}
-				newContext = rsibling.test( selector ) && testContext( context.parentNode ) || context;
-				newSelector = groups.join(",");
-			}
-
-			if ( newSelector ) {
-				try {
-					push.apply( results,
-						newContext.querySelectorAll( newSelector )
-					);
-					return results;
-				} catch(qsaError) {
-				} finally {
-					if ( !old ) {
-						context.removeAttribute("id");
-					}
-				}
-			}
-		}
-	}
-
-	// All others
-	return select( selector.replace( rtrim, "$1" ), context, results, seed );
-}
-
-/**
- * Create key-value caches of limited size
- * @returns {Function(string, Object)} Returns the Object data after storing it on itself with
- *	property name the (space-suffixed) string and (if the cache is larger than Expr.cacheLength)
- *	deleting the oldest entry
- */
-function createCache() {
-	var keys = [];
-
-	function cache( key, value ) {
-		// Use (key + " ") to avoid collision with native prototype properties (see Issue #157)
-		if ( keys.push( key + " " ) > Expr.cacheLength ) {
-			// Only keep the most recent entries
-			delete cache[ keys.shift() ];
-		}
-		return (cache[ key + " " ] = value);
-	}
-	return cache;
-}
-
-/**
- * Mark a function for special use by Sizzle
- * @param {Function} fn The function to mark
- */
-function markFunction( fn ) {
-	fn[ expando ] = true;
-	return fn;
-}
-
-/**
- * Support testing using an element
- * @param {Function} fn Passed the created div and expects a boolean result
- */
-function assert( fn ) {
-	var div = document.createElement("div");
-
-	try {
-		return !!fn( div );
-	} catch (e) {
-		return false;
-	} finally {
-		// Remove from its parent by default
-		if ( div.parentNode ) {
-			div.parentNode.removeChild( div );
-		}
-		// release memory in IE
-		div = null;
-	}
-}
-
-/**
- * Adds the same handler for all of the specified attrs
- * @param {String} attrs Pipe-separated list of attributes
- * @param {Function} handler The method that will be applied
- */
-function addHandle( attrs, handler ) {
-	var arr = attrs.split("|"),
-		i = attrs.length;
-
-	while ( i-- ) {
-		Expr.attrHandle[ arr[i] ] = handler;
-	}
-}
-
-/**
- * Checks document order of two siblings
- * @param {Element} a
- * @param {Element} b
- * @returns {Number} Returns less than 0 if a precedes b, greater than 0 if a follows b
- */
-function siblingCheck( a, b ) {
-	var cur = b && a,
-		diff = cur && a.nodeType === 1 && b.nodeType === 1 &&
-			( ~b.sourceIndex || MAX_NEGATIVE ) -
-			( ~a.sourceIndex || MAX_NEGATIVE );
-
-	// Use IE sourceIndex if available on both nodes
-	if ( diff ) {
-		return diff;
-	}
-
-	// Check if b follows a
-	if ( cur ) {
-		while ( (cur = cur.nextSibling) ) {
-			if ( cur === b ) {
-				return -1;
-			}
-		}
-	}
-
-	return a ? 1 : -1;
-}
-
-/**
- * Returns a function to use in pseudos for input types
- * @param {String} type
- */
-function createInputPseudo( type ) {
-	return function( elem ) {
-		var name = elem.nodeName.toLowerCase();
-		return name === "input" && elem.type === type;
-	};
-}
-
-/**
- * Returns a function to use in pseudos for buttons
- * @param {String} type
- */
-function createButtonPseudo( type ) {
-	return function( elem ) {
-		var name = elem.nodeName.toLowerCase();
-		return (name === "input" || name === "button") && elem.type === type;
-	};
-}
-
-/**
- * Returns a function to use in pseudos for positionals
- * @param {Function} fn
- */
-function createPositionalPseudo( fn ) {
-	return markFunction(function( argument ) {
-		argument = +argument;
-		return markFunction(function( seed, matches ) {
-			var j,
-				matchIndexes = fn( [], seed.length, argument ),
-				i = matchIndexes.length;
-
-			// Match elements found at the specified indexes
-			while ( i-- ) {
-				if ( seed[ (j = matchIndexes[i]) ] ) {
-					seed[j] = !(matches[j] = seed[j]);
-				}
-			}
-		});
-	});
-}
-
-/**
- * Checks a node for validity as a Sizzle context
- * @param {Element|Object=} context
- * @returns {Element|Object|Boolean} The input node if acceptable, otherwise a falsy value
- */
-function testContext( context ) {
-	return context && typeof context.getElementsByTagName !== "undefined" && context;
-}
-
-// Expose support vars for convenience
-support = Sizzle.support = {};
-
-/**
- * Detects XML nodes
- * @param {Element|Object} elem An element or a document
- * @returns {Boolean} True iff elem is a non-HTML XML node
- */
-isXML = Sizzle.isXML = function( elem ) {
-	// documentElement is verified for cases where it doesn't yet exist
-	// (such as loading iframes in IE - #4833)
-	var documentElement = elem && (elem.ownerDocument || elem).documentElement;
-	return documentElement ? documentElement.nodeName !== "HTML" : false;
-};
-
-/**
- * Sets document-related variables once based on the current document
- * @param {Element|Object} [doc] An element or document object to use to set the document
- * @returns {Object} Returns the current document
- */
-setDocument = Sizzle.setDocument = function( node ) {
-	var hasCompare, parent,
-		doc = node ? node.ownerDocument || node : preferredDoc;
-
-	// If no document and documentElement is available, return
-	if ( doc === document || doc.nodeType !== 9 || !doc.documentElement ) {
-		return document;
-	}
-
-	// Set our document
-	document = doc;
-	docElem = doc.documentElement;
-	parent = doc.defaultView;
-
-	// Support: IE>8
-	// If iframe document is assigned to "document" variable and if iframe has been reloaded,
-	// IE will throw "permission denied" error when accessing "document" variable, see jQuery #13936
-	// IE6-8 do not support the defaultView property so parent will be undefined
-	if ( parent && parent !== parent.top ) {
-		// IE11 does not have attachEvent, so all must suffer
-		if ( parent.addEventListener ) {
-			parent.addEventListener( "unload", unloadHandler, false );
-		} else if ( parent.attachEvent ) {
-			parent.attachEvent( "onunload", unloadHandler );
-		}
-	}
-
-	/* Support tests
-	---------------------------------------------------------------------- */
-	documentIsHTML = !isXML( doc );
-
-	/* Attributes
-	---------------------------------------------------------------------- */
-
-	// Support: IE<8
-	// Verify that getAttribute really returns attributes and not properties
-	// (excepting IE8 booleans)
-	support.attributes = assert(function( div ) {
-		div.className = "i";
-		return !div.getAttribute("className");
-	});
-
-	/* getElement(s)By*
-	---------------------------------------------------------------------- */
-
-	// Check if getElementsByTagName("*") returns only elements
-	support.getElementsByTagName = assert(function( div ) {
-		div.appendChild( doc.createComment("") );
-		return !div.getElementsByTagName("*").length;
-	});
-
-	// Support: IE<9
-	support.getElementsByClassName = rnative.test( doc.getElementsByClassName );
-
-	// Support: IE<10
-	// Check if getElementById returns elements by name
-	// The broken getElementById methods don't pick up programatically-set names,
-	// so use a roundabout getElementsByName test
-	support.getById = assert(function( div ) {
-		docElem.appendChild( div ).id = expando;
-		return !doc.getElementsByName || !doc.getElementsByName( expando ).length;
-	});
-
-	// ID find and filter
-	if ( support.getById ) {
-		Expr.find["ID"] = function( id, context ) {
-			if ( typeof context.getElementById !== "undefined" && documentIsHTML ) {
-				var m = context.getElementById( id );
-				// Check parentNode to catch when Blackberry 4.6 returns
-				// nodes that are no longer in the document #6963
-				return m && m.parentNode ? [ m ] : [];
-			}
-		};
-		Expr.filter["ID"] = function( id ) {
-			var attrId = id.replace( runescape, funescape );
-			return function( elem ) {
-				return elem.getAttribute("id") === attrId;
-			};
-		};
-	} else {
-		// Support: IE6/7
-		// getElementById is not reliable as a find shortcut
-		delete Expr.find["ID"];
-
-		Expr.filter["ID"] =  function( id ) {
-			var attrId = id.replace( runescape, funescape );
-			return function( elem ) {
-				var node = typeof elem.getAttributeNode !== "undefined" && elem.getAttributeNode("id");
-				return node && node.value === attrId;
-			};
-		};
-	}
-
-	// Tag
-	Expr.find["TAG"] = support.getElementsByTagName ?
-		function( tag, context ) {
-			if ( typeof context.getElementsByTagName !== "undefined" ) {
-				return context.getElementsByTagName( tag );
-
-			// DocumentFragment nodes don't have gEBTN
-			} else if ( support.qsa ) {
-				return context.querySelectorAll( tag );
-			}
-		} :
-
-		function( tag, context ) {
-			var elem,
-				tmp = [],
-				i = 0,
-				// By happy coincidence, a (broken) gEBTN appears on DocumentFragment nodes too
-				results = context.getElementsByTagName( tag );
-
-			// Filter out possible comments
-			if ( tag === "*" ) {
-				while ( (elem = results[i++]) ) {
-					if ( elem.nodeType === 1 ) {
-						tmp.push( elem );
-					}
-				}
-
-				return tmp;
-			}
-			return results;
-		};
-
-	// Class
-	Expr.find["CLASS"] = support.getElementsByClassName && function( className, context ) {
-		if ( documentIsHTML ) {
-			return context.getElementsByClassName( className );
-		}
-	};
-
-	/* QSA/matchesSelector
-	---------------------------------------------------------------------- */
-
-	// QSA and matchesSelector support
-
-	// matchesSelector(:active) reports false when true (IE9/Opera 11.5)
-	rbuggyMatches = [];
-
-	// qSa(:focus) reports false when true (Chrome 21)
-	// We allow this because of a bug in IE8/9 that throws an error
-	// whenever `document.activeElement` is accessed on an iframe
-	// So, we allow :focus to pass through QSA all the time to avoid the IE error
-	// See http://bugs.jquery.com/ticket/13378
-	rbuggyQSA = [];
-
-	if ( (support.qsa = rnative.test( doc.querySelectorAll )) ) {
-		// Build QSA regex
-		// Regex strategy adopted from Diego Perini
-		assert(function( div ) {
-			// Select is set to empty string on purpose
-			// This is to test IE's treatment of not explicitly
-			// setting a boolean content attribute,
-			// since its presence should be enough
-			// http://bugs.jquery.com/ticket/12359
-			docElem.appendChild( div ).innerHTML = "<a id='" + expando + "'></a>" +
-				"<select id='" + expando + "-\f]' msallowcapture=''>" +
-				"<option selected=''></option></select>";
-
-			// Support: IE8, Opera 11-12.16
-			// Nothing should be selected when empty strings follow ^= or $= or *=
-			// The test attribute must be unknown in Opera but "safe" for WinRT
-			// http://msdn.microsoft.com/en-us/library/ie/hh465388.aspx#attribute_section
-			if ( div.querySelectorAll("[msallowcapture^='']").length ) {
-				rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:''|\"\")" );
-			}
-
-			// Support: IE8
-			// Boolean attributes and "value" are not treated correctly
-			if ( !div.querySelectorAll("[selected]").length ) {
-				rbuggyQSA.push( "\\[" + whitespace + "*(?:value|" + booleans + ")" );
-			}
-
-			// Support: Chrome<29, Android<4.2+, Safari<7.0+, iOS<7.0+, PhantomJS<1.9.7+
-			if ( !div.querySelectorAll( "[id~=" + expando + "-]" ).length ) {
-				rbuggyQSA.push("~=");
-			}
-
-			// Webkit/Opera - :checked should return selected option elements
-			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
-			// IE8 throws error here and will not see later tests
-			if ( !div.querySelectorAll(":checked").length ) {
-				rbuggyQSA.push(":checked");
-			}
-
-			// Support: Safari 8+, iOS 8+
-			// https://bugs.webkit.org/show_bug.cgi?id=136851
-			// In-page `selector#id sibing-combinator selector` fails
-			if ( !div.querySelectorAll( "a#" + expando + "+*" ).length ) {
-				rbuggyQSA.push(".#.+[+~]");
-			}
-		});
-
-		assert(function( div ) {
-			// Support: Windows 8 Native Apps
-			// The type and name attributes are restricted during .innerHTML assignment
-			var input = doc.createElement("input");
-			input.setAttribute( "type", "hidden" );
-			div.appendChild( input ).setAttribute( "name", "D" );
-
-			// Support: IE8
-			// Enforce case-sensitivity of name attribute
-			if ( div.querySelectorAll("[name=d]").length ) {
-				rbuggyQSA.push( "name" + whitespace + "*[*^$|!~]?=" );
-			}
-
-			// FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled)
-			// IE8 throws error here and will not see later tests
-			if ( !div.querySelectorAll(":enabled").length ) {
-				rbuggyQSA.push( ":enabled", ":disabled" );
-			}
-
-			// Opera 10-11 does not throw on post-comma invalid pseudos
-			div.querySelectorAll("*,:x");
-			rbuggyQSA.push(",.*:");
-		});
-	}
-
-	if ( (support.matchesSelector = rnative.test( (matches = docElem.matches ||
-		docElem.webkitMatchesSelector ||
-		docElem.mozMatchesSelector ||
-		docElem.oMatchesSelector ||
-		docElem.msMatchesSelector) )) ) {
-
-		assert(function( div ) {
-			// Check to see if it's possible to do matchesSelector
-			// on a disconnected node (IE 9)
-			support.disconnectedMatch = matches.call( div, "div" );
-
-			// This should fail with an exception
-			// Gecko does not error, returns false instead
-			matches.call( div, "[s!='']:x" );
-			rbuggyMatches.push( "!=", pseudos );
-		});
-	}
-
-	rbuggyQSA = rbuggyQSA.length && new RegExp( rbuggyQSA.join("|") );
-	rbuggyMatches = rbuggyMatches.length && new RegExp( rbuggyMatches.join("|") );
-
-	/* Contains
-	---------------------------------------------------------------------- */
-	hasCompare = rnative.test( docElem.compareDocumentPosition );
-
-	// Element contains another
-	// Purposefully does not implement inclusive descendent
-	// As in, an element does not contain itself
-	contains = hasCompare || rnative.test( docElem.contains ) ?
-		function( a, b ) {
-			var adown = a.nodeType === 9 ? a.documentElement : a,
-				bup = b && b.parentNode;
-			return a === bup || !!( bup && bup.nodeType === 1 && (
-				adown.contains ?
-					adown.contains( bup ) :
-					a.compareDocumentPosition && a.compareDocumentPosition( bup ) & 16
-			));
-		} :
-		function( a, b ) {
-			if ( b ) {
-				while ( (b = b.parentNode) ) {
-					if ( b === a ) {
-						return true;
-					}
-				}
-			}
-			return false;
-		};
-
-	/* Sorting
-	---------------------------------------------------------------------- */
-
-	// Document order sorting
-	sortOrder = hasCompare ?
-	function( a, b ) {
-
-		// Flag for duplicate removal
-		if ( a === b ) {
-			hasDuplicate = true;
-			return 0;
-		}
-
-		// Sort on method existence if only one input has compareDocumentPosition
-		var compare = !a.compareDocumentPosition - !b.compareDocumentPosition;
-		if ( compare ) {
-			return compare;
-		}
-
-		// Calculate position if both inputs belong to the same document
-		compare = ( a.ownerDocument || a ) === ( b.ownerDocument || b ) ?
-			a.compareDocumentPosition( b ) :
-
-			// Otherwise we know they are disconnected
-			1;
-
-		// Disconnected nodes
-		if ( compare & 1 ||
-			(!support.sortDetached && b.compareDocumentPosition( a ) === compare) ) {
-
-			// Choose the first element that is related to our preferred document
-			if ( a === doc || a.ownerDocument === preferredDoc && contains(preferredDoc, a) ) {
-				return -1;
-			}
-			if ( b === doc || b.ownerDocument === preferredDoc && contains(preferredDoc, b) ) {
-				return 1;
-			}
-
-			// Maintain original order
-			return sortInput ?
-				( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) :
-				0;
-		}
-
-		return compare & 4 ? -1 : 1;
-	} :
-	function( a, b ) {
-		// Exit early if the nodes are identical
-		if ( a === b ) {
-			hasDuplicate = true;
-			return 0;
-		}
-
-		var cur,
-			i = 0,
-			aup = a.parentNode,
-			bup = b.parentNode,
-			ap = [ a ],
-			bp = [ b ];
-
-		// Parentless nodes are either documents or disconnected
-		if ( !aup || !bup ) {
-			return a === doc ? -1 :
-				b === doc ? 1 :
-				aup ? -1 :
-				bup ? 1 :
-				sortInput ?
-				( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) :
-				0;
-
-		// If the nodes are siblings, we can do a quick check
-		} else if ( aup === bup ) {
-			return siblingCheck( a, b );
-		}
-
-		// Otherwise we need full lists of their ancestors for comparison
-		cur = a;
-		while ( (cur = cur.parentNode) ) {
-			ap.unshift( cur );
-		}
-		cur = b;
-		while ( (cur = cur.parentNode) ) {
-			bp.unshift( cur );
-		}
-
-		// Walk down the tree looking for a discrepancy
-		while ( ap[i] === bp[i] ) {
-			i++;
-		}
-
-		return i ?
-			// Do a sibling check if the nodes have a common ancestor
-			siblingCheck( ap[i], bp[i] ) :
-
-			// Otherwise nodes in our document sort first
-			ap[i] === preferredDoc ? -1 :
-			bp[i] === preferredDoc ? 1 :
-			0;
-	};
-
-	return doc;
-};
-
-Sizzle.matches = function( expr, elements ) {
-	return Sizzle( expr, null, null, elements );
-};
-
-Sizzle.matchesSelector = function( elem, expr ) {
-	// Set document vars if needed
-	if ( ( elem.ownerDocument || elem ) !== document ) {
-		setDocument( elem );
-	}
-
-	// Make sure that attribute selectors are quoted
-	expr = expr.replace( rattributeQuotes, "='$1']" );
-
-	if ( support.matchesSelector && documentIsHTML &&
-		( !rbuggyMatches || !rbuggyMatches.test( expr ) ) &&
-		( !rbuggyQSA     || !rbuggyQSA.test( expr ) ) ) {
-
-		try {
-			var ret = matches.call( elem, expr );
-
-			// IE 9's matchesSelector returns false on disconnected nodes
-			if ( ret || support.disconnectedMatch ||
-					// As well, disconnected nodes are said to be in a document
-					// fragment in IE 9
-					elem.document && elem.document.nodeType !== 11 ) {
-				return ret;
-			}
-		} catch (e) {}
-	}
-
-	return Sizzle( expr, document, null, [ elem ] ).length > 0;
-};
-
-Sizzle.contains = function( context, elem ) {
-	// Set document vars if needed
-	if ( ( context.ownerDocument || context ) !== document ) {
-		setDocument( context );
-	}
-	return contains( context, elem );
-};
-
-Sizzle.attr = function( elem, name ) {
-	// Set document vars if needed
-	if ( ( elem.ownerDocument || elem ) !== document ) {
-		setDocument( elem );
-	}
-
-	var fn = Expr.attrHandle[ name.toLowerCase() ],
-		// Don't get fooled by Object.prototype properties (jQuery #13807)
-		val = fn && hasOwn.call( Expr.attrHandle, name.toLowerCase() ) ?
-			fn( elem, name, !documentIsHTML ) :
-			undefined;
-
-	return val !== undefined ?
-		val :
-		support.attributes || !documentIsHTML ?
-			elem.getAttribute( name ) :
-			(val = elem.getAttributeNode(name)) && val.specified ?
-				val.value :
-				null;
-};
-
-Sizzle.error = function( msg ) {
-	throw new Error( "Syntax error, unrecognized expression: " + msg );
-};
-
-/**
- * Document sorting and removing duplicates
- * @param {ArrayLike} results
- */
-Sizzle.uniqueSort = function( results ) {
-	var elem,
-		duplicates = [],
-		j = 0,
-		i = 0;
-
-	// Unless we *know* we can detect duplicates, assume their presence
-	hasDuplicate = !support.detectDuplicates;
-	sortInput = !support.sortStable && results.slice( 0 );
-	results.sort( sortOrder );
-
-	if ( hasDuplicate ) {
-		while ( (elem = results[i++]) ) {
-			if ( elem === results[ i ] ) {
-				j = duplicates.push( i );
-			}
-		}
-		while ( j-- ) {
-			results.splice( duplicates[ j ], 1 );
-		}
-	}
-
-	// Clear input after sorting to release objects
-	// See https://github.com/jquery/sizzle/pull/225
-	sortInput = null;
-
-	return results;
-};
-
-/**
- * Utility function for retrieving the text value of an array of DOM nodes
- * @param {Array|Element} elem
- */
-getText = Sizzle.getText = function( elem ) {
-	var node,
-		ret = "",
-		i = 0,
-		nodeType = elem.nodeType;
-
-	if ( !nodeType ) {
-		// If no nodeType, this is expected to be an array
-		while ( (node = elem[i++]) ) {
-			// Do not traverse comment nodes
-			ret += getText( node );
-		}
-	} else if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) {
-		// Use textContent for elements
-		// innerText usage removed for consistency of new lines (jQuery #11153)
-		if ( typeof elem.textContent === "string" ) {
-			return elem.textContent;
-		} else {
-			// Traverse its children
-			for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
-				ret += getText( elem );
-			}
-		}
-	} else if ( nodeType === 3 || nodeType === 4 ) {
-		return elem.nodeValue;
-	}
-	// Do not include comment or processing instruction nodes
-
-	return ret;
-};
-
-Expr = Sizzle.selectors = {
-
-	// Can be adjusted by the user
-	cacheLength: 50,
-
-	createPseudo: markFunction,
-
-	match: matchExpr,
-
-	attrHandle: {},
-
-	find: {},
-
-	relative: {
-		">": { dir: "parentNode", first: true },
-		" ": { dir: "parentNode" },
-		"+": { dir: "previousSibling", first: true },
-		"~": { dir: "previousSibling" }
-	},
-
-	preFilter: {
-		"ATTR": function( match ) {
-			match[1] = match[1].replace( runescape, funescape );
-
-			// Move the given value to match[3] whether quoted or unquoted
-			match[3] = ( match[3] || match[4] || match[5] || "" ).replace( runescape, funescape );
-
-			if ( match[2] === "~=" ) {
-				match[3] = " " + match[3] + " ";
-			}
-
-			return match.slice( 0, 4 );
-		},
-
-		"CHILD": function( match ) {
-			/* matches from matchExpr["CHILD"]
-				1 type (only|nth|...)
-				2 what (child|of-type)
-				3 argument (even|odd|\d*|\d*n([+-]\d+)?|...)
-				4 xn-component of xn+y argument ([+-]?\d*n|)
-				5 sign of xn-component
-				6 x of xn-component
-				7 sign of y-component
-				8 y of y-component
-			*/
-			match[1] = match[1].toLowerCase();
-
-			if ( match[1].slice( 0, 3 ) === "nth" ) {
-				// nth-* requires argument
-				if ( !match[3] ) {
-					Sizzle.error( match[0] );
-				}
-
-				// numeric x and y parameters for Expr.filter.CHILD
-				// remember that false/true cast respectively to 0/1
-				match[4] = +( match[4] ? match[5] + (match[6] || 1) : 2 * ( match[3] === "even" || match[3] === "odd" ) );
-				match[5] = +( ( match[7] + match[8] ) || match[3] === "odd" );
-
-			// other types prohibit arguments
-			} else if ( match[3] ) {
-				Sizzle.error( match[0] );
-			}
-
-			return match;
-		},
-
-		"PSEUDO": function( match ) {
-			var excess,
-				unquoted = !match[6] && match[2];
-
-			if ( matchExpr["CHILD"].test( match[0] ) ) {
-				return null;
-			}
-
-			// Accept quoted arguments as-is
-			if ( match[3] ) {
-				match[2] = match[4] || match[5] || "";
-
-			// Strip excess characters from unquoted arguments
-			} else if ( unquoted && rpseudo.test( unquoted ) &&
-				// Get excess from tokenize (recursively)
-				(excess = tokenize( unquoted, true )) &&
-				// advance to the next closing parenthesis
-				(excess = unquoted.indexOf( ")", unquoted.length - excess ) - unquoted.length) ) {
-
-				// excess is a negative index
-				match[0] = match[0].slice( 0, excess );
-				match[2] = unquoted.slice( 0, excess );
-			}
-
-			// Return only captures needed by the pseudo filter method (type and argument)
-			return match.slice( 0, 3 );
-		}
-	},
-
-	filter: {
-
-		"TAG": function( nodeNameSelector ) {
-			var nodeName = nodeNameSelector.replace( runescape, funescape ).toLowerCase();
-			return nodeNameSelector === "*" ?
-				function() { return true; } :
-				function( elem ) {
-					return elem.nodeName && elem.nodeName.toLowerCase() === nodeName;
-				};
-		},
-
-		"CLASS": function( className ) {
-			var pattern = classCache[ className + " " ];
-
-			return pattern ||
-				(pattern = new RegExp( "(^|" + whitespace + ")" + className + "(" + whitespace + "|$)" )) &&
-				classCache( className, function( elem ) {
-					return pattern.test( typeof elem.className === "string" && elem.className || typeof elem.getAttribute !== "undefined" && elem.getAttribute("class") || "" );
-				});
-		},
-
-		"ATTR": function( name, operator, check ) {
-			return function( elem ) {
-				var result = Sizzle.attr( elem, name );
-
-				if ( result == null ) {
-					return operator === "!=";
-				}
-				if ( !operator ) {
-					return true;
-				}
-
-				result += "";
-
-				return operator === "=" ? result === check :
-					operator === "!=" ? result !== check :
-					operator === "^=" ? check && result.indexOf( check ) === 0 :
-					operator === "*=" ? check && result.indexOf( check ) > -1 :
-					operator === "$=" ? check && result.slice( -check.length ) === check :
-					operator === "~=" ? ( " " + result.replace( rwhitespace, " " ) + " " ).indexOf( check ) > -1 :
-					operator === "|=" ? result === check || result.slice( 0, check.length + 1 ) === check + "-" :
-					false;
-			};
-		},
-
-		"CHILD": function( type, what, argument, first, last ) {
-			var simple = type.slice( 0, 3 ) !== "nth",
-				forward = type.slice( -4 ) !== "last",
-				ofType = what === "of-type";
-
-			return first === 1 && last === 0 ?
-
-				// Shortcut for :nth-*(n)
-				function( elem ) {
-					return !!elem.parentNode;
-				} :
-
-				function( elem, context, xml ) {
-					var cache, outerCache, node, diff, nodeIndex, start,
-						dir = simple !== forward ? "nextSibling" : "previousSibling",
-						parent = elem.parentNode,
-						name = ofType && elem.nodeName.toLowerCase(),
-						useCache = !xml && !ofType;
-
-					if ( parent ) {
-
-						// :(first|last|only)-(child|of-type)
-						if ( simple ) {
-							while ( dir ) {
-								node = elem;
-								while ( (node = node[ dir ]) ) {
-									if ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) {
-										return false;
-									}
-								}
-								// Reverse direction for :only-* (if we haven't yet done so)
-								start = dir = type === "only" && !start && "nextSibling";
-							}
-							return true;
-						}
-
-						start = [ forward ? parent.firstChild : parent.lastChild ];
-
-						// non-xml :nth-child(...) stores cache data on `parent`
-						if ( forward && useCache ) {
-							// Seek `elem` from a previously-cached index
-							outerCache = parent[ expando ] || (parent[ expando ] = {});
-							cache = outerCache[ type ] || [];
-							nodeIndex = cache[0] === dirruns && cache[1];
-							diff = cache[0] === dirruns && cache[2];
-							node = nodeIndex && parent.childNodes[ nodeIndex ];
-
-							while ( (node = ++nodeIndex && node && node[ dir ] ||
-
-								// Fallback to seeking `elem` from the start
-								(diff = nodeIndex = 0) || start.pop()) ) {
-
-								// When found, cache indexes on `parent` and break
-								if ( node.nodeType === 1 && ++diff && node === elem ) {
-									outerCache[ type ] = [ dirruns, nodeIndex, diff ];
-									break;
-								}
-							}
-
-						// Use previously-cached element index if available
-						} else if ( useCache && (cache = (elem[ expando ] || (elem[ expando ] = {}))[ type ]) && cache[0] === dirruns ) {
-							diff = cache[1];
-
-						// xml :nth-child(...) or :nth-last-child(...) or :nth(-last)?-of-type(...)
-						} else {
-							// Use the same loop as above to seek `elem` from the start
-							while ( (node = ++nodeIndex && node && node[ dir ] ||
-								(diff = nodeIndex = 0) || start.pop()) ) {
-
-								if ( ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) && ++diff ) {
-									// Cache the index of each encountered element
-									if ( useCache ) {
-										(node[ expando ] || (node[ expando ] = {}))[ type ] = [ dirruns, diff ];
-									}
-
-									if ( node === elem ) {
-										break;
-									}
-								}
-							}
-						}
-
-						// Incorporate the offset, then check against cycle size
-						diff -= last;
-						return diff === first || ( diff % first === 0 && diff / first >= 0 );
-					}
-				};
-		},
-
-		"PSEUDO": function( pseudo, argument ) {
-			// pseudo-class names are case-insensitive
-			// http://www.w3.org/TR/selectors/#pseudo-classes
-			// Prioritize by case sensitivity in case custom pseudos are added with uppercase letters
-			// Remember that setFilters inherits from pseudos
-			var args,
-				fn = Expr.pseudos[ pseudo ] || Expr.setFilters[ pseudo.toLowerCase() ] ||
-					Sizzle.error( "unsupported pseudo: " + pseudo );
-
-			// The user may use createPseudo to indicate that
-			// arguments are needed to create the filter function
-			// just as Sizzle does
-			if ( fn[ expando ] ) {
-				return fn( argument );
-			}
-
-			// But maintain support for old signatures
-			if ( fn.length > 1 ) {
-				args = [ pseudo, pseudo, "", argument ];
-				return Expr.setFilters.hasOwnProperty( pseudo.toLowerCase() ) ?
-					markFunction(function( seed, matches ) {
-						var idx,
-							matched = fn( seed, argument ),
-							i = matched.length;
-						while ( i-- ) {
-							idx = indexOf( seed, matched[i] );
-							seed[ idx ] = !( matches[ idx ] = matched[i] );
-						}
-					}) :
-					function( elem ) {
-						return fn( elem, 0, args );
-					};
-			}
-
-			return fn;
-		}
-	},
-
-	pseudos: {
-		// Potentially complex pseudos
-		"not": markFunction(function( selector ) {
-			// Trim the selector passed to compile
-			// to avoid treating leading and trailing
-			// spaces as combinators
-			var input = [],
-				results = [],
-				matcher = compile( selector.replace( rtrim, "$1" ) );
-
-			return matcher[ expando ] ?
-				markFunction(function( seed, matches, context, xml ) {
-					var elem,
-						unmatched = matcher( seed, null, xml, [] ),
-						i = seed.length;
-
-					// Match elements unmatched by `matcher`
-					while ( i-- ) {
-						if ( (elem = unmatched[i]) ) {
-							seed[i] = !(matches[i] = elem);
-						}
-					}
-				}) :
-				function( elem, context, xml ) {
-					input[0] = elem;
-					matcher( input, null, xml, results );
-					// Don't keep the element (issue #299)
-					input[0] = null;
-					return !results.pop();
-				};
-		}),
-
-		"has": markFunction(function( selector ) {
-			return function( elem ) {
-				return Sizzle( selector, elem ).length > 0;
-			};
-		}),
-
-		"contains": markFunction(function( text ) {
-			text = text.replace( runescape, funescape );
-			return function( elem ) {
-				return ( elem.textContent || elem.innerText || getText( elem ) ).indexOf( text ) > -1;
-			};
-		}),
-
-		// "Whether an element is represented by a :lang() selector
-		// is based solely on the element's language value
-		// being equal to the identifier C,
-		// or beginning with the identifier C immediately followed by "-".
-		// The matching of C against the element's language value is performed case-insensitively.
-		// The identifier C does not have to be a valid language name."
-		// http://www.w3.org/TR/selectors/#lang-pseudo
-		"lang": markFunction( function( lang ) {
-			// lang value must be a valid identifier
-			if ( !ridentifier.test(lang || "") ) {
-				Sizzle.error( "unsupported lang: " + lang );
-			}
-			lang = lang.replace( runescape, funescape ).toLowerCase();
-			return function( elem ) {
-				var elemLang;
-				do {
-					if ( (elemLang = documentIsHTML ?
-						elem.lang :
-						elem.getAttribute("xml:lang") || elem.getAttribute("lang")) ) {
-
-						elemLang = elemLang.toLowerCase();
-						return elemLang === lang || elemLang.indexOf( lang + "-" ) === 0;
-					}
-				} while ( (elem = elem.parentNode) && elem.nodeType === 1 );
-				return false;
-			};
-		}),
-
-		// Miscellaneous
-		"target": function( elem ) {
-			var hash = window.location && window.location.hash;
-			return hash && hash.slice( 1 ) === elem.id;
-		},
-
-		"root": function( elem ) {
-			return elem === docElem;
-		},
-
-		"focus": function( elem ) {
-			return elem === document.activeElement && (!document.hasFocus || document.hasFocus()) && !!(elem.type || elem.href || ~elem.tabIndex);
-		},
-
-		// Boolean properties
-		"enabled": function( elem ) {
-			return elem.disabled === false;
-		},
-
-		"disabled": function( elem ) {
-			return elem.disabled === true;
-		},
-
-		"checked": function( elem ) {
-			// In CSS3, :checked should return both checked and selected elements
-			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
-			var nodeName = elem.nodeName.toLowerCase();
-			return (nodeName === "input" && !!elem.checked) || (nodeName === "option" && !!elem.selected);
-		},
-
-		"selected": function( elem ) {
-			// Accessing this property makes selected-by-default
-			// options in Safari work properly
-			if ( elem.parentNode ) {
-				elem.parentNode.selectedIndex;
-			}
-
-			return elem.selected === true;
-		},
-
-		// Contents
-		"empty": function( elem ) {
-			// http://www.w3.org/TR/selectors/#empty-pseudo
-			// :empty is negated by element (1) or content nodes (text: 3; cdata: 4; entity ref: 5),
-			//   but not by others (comment: 8; processing instruction: 7; etc.)
-			// nodeType < 6 works because attributes (2) do not appear as children
-			for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
-				if ( elem.nodeType < 6 ) {
-					return false;
-				}
-			}
-			return true;
-		},
-
-		"parent": function( elem ) {
-			return !Expr.pseudos["empty"]( elem );
-		},
-
-		// Element/input types
-		"header": function( elem ) {
-			return rheader.test( elem.nodeName );
-		},
-
-		"input": function( elem ) {
-			return rinputs.test( elem.nodeName );
-		},
-
-		"button": function( elem ) {
-			var name = elem.nodeName.toLowerCase();
-			return name === "input" && elem.type === "button" || name === "button";
-		},
-
-		"text": function( elem ) {
-			var attr;
-			return elem.nodeName.toLowerCase() === "input" &&
-				elem.type === "text" &&
-
-				// Support: IE<8
-				// New HTML5 attribute values (e.g., "search") appear with elem.type === "text"
-				( (attr = elem.getAttribute("type")) == null || attr.toLowerCase() === "text" );
-		},
-
-		// Position-in-collection
-		"first": createPositionalPseudo(function() {
-			return [ 0 ];
-		}),
-
-		"last": createPositionalPseudo(function( matchIndexes, length ) {
-			return [ length - 1 ];
-		}),
-
-		"eq": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			return [ argument < 0 ? argument + length : argument ];
-		}),
-
-		"even": createPositionalPseudo(function( matchIndexes, length ) {
-			var i = 0;
-			for ( ; i < length; i += 2 ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		}),
-
-		"odd": createPositionalPseudo(function( matchIndexes, length ) {
-			var i = 1;
-			for ( ; i < length; i += 2 ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		}),
-
-		"lt": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			var i = argument < 0 ? argument + length : argument;
-			for ( ; --i >= 0; ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		}),
-
-		"gt": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			var i = argument < 0 ? argument + length : argument;
-			for ( ; ++i < length; ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		})
-	}
-};
-
-Expr.pseudos["nth"] = Expr.pseudos["eq"];
-
-// Add button/input type pseudos
-for ( i in { radio: true, checkbox: true, file: true, password: true, image: true } ) {
-	Expr.pseudos[ i ] = createInputPseudo( i );
-}
-for ( i in { submit: true, reset: true } ) {
-	Expr.pseudos[ i ] = createButtonPseudo( i );
-}
-
-// Easy API for creating new setFilters
-function setFilters() {}
-setFilters.prototype = Expr.filters = Expr.pseudos;
-Expr.setFilters = new setFilters();
-
-tokenize = Sizzle.tokenize = function( selector, parseOnly ) {
-	var matched, match, tokens, type,
-		soFar, groups, preFilters,
-		cached = tokenCache[ selector + " " ];
-
-	if ( cached ) {
-		return parseOnly ? 0 : cached.slice( 0 );
-	}
-
-	soFar = selector;
-	groups = [];
-	preFilters = Expr.preFilter;
-
-	while ( soFar ) {
-
-		// Comma and first run
-		if ( !matched || (match = rcomma.exec( soFar )) ) {
-			if ( match ) {
-				// Don't consume trailing commas as valid
-				soFar = soFar.slice( match[0].length ) || soFar;
-			}
-			groups.push( (tokens = []) );
-		}
-
-		matched = false;
-
-		// Combinators
-		if ( (match = rcombinators.exec( soFar )) ) {
-			matched = match.shift();
-			tokens.push({
-				value: matched,
-				// Cast descendant combinators to space
-				type: match[0].replace( rtrim, " " )
-			});
-			soFar = soFar.slice( matched.length );
-		}
-
-		// Filters
-		for ( type in Expr.filter ) {
-			if ( (match = matchExpr[ type ].exec( soFar )) && (!preFilters[ type ] ||
-				(match = preFilters[ type ]( match ))) ) {
-				matched = match.shift();
-				tokens.push({
-					value: matched,
-					type: type,
-					matches: match
-				});
-				soFar = soFar.slice( matched.length );
-			}
-		}
-
-		if ( !matched ) {
-			break;
-		}
-	}
-
-	// Return the length of the invalid excess
-	// if we're just parsing
-	// Otherwise, throw an error or return tokens
-	return parseOnly ?
-		soFar.length :
-		soFar ?
-			Sizzle.error( selector ) :
-			// Cache the tokens
-			tokenCache( selector, groups ).slice( 0 );
-};
-
-function toSelector( tokens ) {
-	var i = 0,
-		len = tokens.length,
-		selector = "";
-	for ( ; i < len; i++ ) {
-		selector += tokens[i].value;
-	}
-	return selector;
-}
-
-function addCombinator( matcher, combinator, base ) {
-	var dir = combinator.dir,
-		checkNonElements = base && dir === "parentNode",
-		doneName = done++;
-
-	return combinator.first ?
-		// Check against closest ancestor/preceding element
-		function( elem, context, xml ) {
-			while ( (elem = elem[ dir ]) ) {
-				if ( elem.nodeType === 1 || checkNonElements ) {
-					return matcher( elem, context, xml );
-				}
-			}
-		} :
-
-		// Check against all ancestor/preceding elements
-		function( elem, context, xml ) {
-			var oldCache, outerCache,
-				newCache = [ dirruns, doneName ];
-
-			// We can't set arbitrary data on XML nodes, so they don't benefit from dir caching
-			if ( xml ) {
-				while ( (elem = elem[ dir ]) ) {
-					if ( elem.nodeType === 1 || checkNonElements ) {
-						if ( matcher( elem, context, xml ) ) {
-							return true;
-						}
-					}
-				}
-			} else {
-				while ( (elem = elem[ dir ]) ) {
-					if ( elem.nodeType === 1 || checkNonElements ) {
-						outerCache = elem[ expando ] || (elem[ expando ] = {});
-						if ( (oldCache = outerCache[ dir ]) &&
-							oldCache[ 0 ] === dirruns && oldCache[ 1 ] === doneName ) {
-
-							// Assign to newCache so results back-propagate to previous elements
-							return (newCache[ 2 ] = oldCache[ 2 ]);
-						} else {
-							// Reuse newcache so results back-propagate to previous elements
-							outerCache[ dir ] = newCache;
-
-							// A match means we're done; a fail means we have to keep checking
-							if ( (newCache[ 2 ] = matcher( elem, context, xml )) ) {
-								return true;
-							}
-						}
-					}
-				}
-			}
-		};
-}
-
-function elementMatcher( matchers ) {
-	return matchers.length > 1 ?
-		function( elem, context, xml ) {
-			var i = matchers.length;
-			while ( i-- ) {
-				if ( !matchers[i]( elem, context, xml ) ) {
-					return false;
-				}
-			}
-			return true;
-		} :
-		matchers[0];
-}
-
-function multipleContexts( selector, contexts, results ) {
-	var i = 0,
-		len = contexts.length;
-	for ( ; i < len; i++ ) {
-		Sizzle( selector, contexts[i], results );
-	}
-	return results;
-}
-
-function condense( unmatched, map, filter, context, xml ) {
-	var elem,
-		newUnmatched = [],
-		i = 0,
-		len = unmatched.length,
-		mapped = map != null;
-
-	for ( ; i < len; i++ ) {
-		if ( (elem = unmatched[i]) ) {
-			if ( !filter || filter( elem, context, xml ) ) {
-				newUnmatched.push( elem );
-				if ( mapped ) {
-					map.push( i );
-				}
-			}
-		}
-	}
-
-	return newUnmatched;
-}
-
-function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postSelector ) {
-	if ( postFilter && !postFilter[ expando ] ) {
-		postFilter = setMatcher( postFilter );
-	}
-	if ( postFinder && !postFinder[ expando ] ) {
-		postFinder = setMatcher( postFinder, postSelector );
-	}
-	return markFunction(function( seed, results, context, xml ) {
-		var temp, i, elem,
-			preMap = [],
-			postMap = [],
-			preexisting = results.length,
-
-			// Get initial elements from seed or context
-			elems = seed || multipleContexts( selector || "*", context.nodeType ? [ context ] : context, [] ),
-
-			// Prefilter to get matcher input, preserving a map for seed-results synchronization
-			matcherIn = preFilter && ( seed || !selector ) ?
-				condense( elems, preMap, preFilter, context, xml ) :
-				elems,
-
-			matcherOut = matcher ?
-				// If we have a postFinder, or filtered seed, or non-seed postFilter or preexisting results,
-				postFinder || ( seed ? preFilter : preexisting || postFilter ) ?
-
-					// ...intermediate processing is necessary
-					[] :
-
-					// ...otherwise use results directly
-					results :
-				matcherIn;
-
-		// Find primary matches
-		if ( matcher ) {
-			matcher( matcherIn, matcherOut, context, xml );
-		}
-
-		// Apply postFilter
-		if ( postFilter ) {
-			temp = condense( matcherOut, postMap );
-			postFilter( temp, [], context, xml );
-
-			// Un-match failing elements by moving them back to matcherIn
-			i = temp.length;
-			while ( i-- ) {
-				if ( (elem = temp[i]) ) {
-					matcherOut[ postMap[i] ] = !(matcherIn[ postMap[i] ] = elem);
-				}
-			}
-		}
-
-		if ( seed ) {
-			if ( postFinder || preFilter ) {
-				if ( postFinder ) {
-					// Get the final matcherOut by condensing this intermediate into postFinder contexts
-					temp = [];
-					i = matcherOut.length;
-					while ( i-- ) {
-						if ( (elem = matcherOut[i]) ) {
-							// Restore matcherIn since elem is not yet a final match
-							temp.push( (matcherIn[i] = elem) );
-						}
-					}
-					postFinder( null, (matcherOut = []), temp, xml );
-				}
-
-				// Move matched elements from seed to results to keep them synchronized
-				i = matcherOut.length;
-				while ( i-- ) {
-					if ( (elem = matcherOut[i]) &&
-						(temp = postFinder ? indexOf( seed, elem ) : preMap[i]) > -1 ) {
-
-						seed[temp] = !(results[temp] = elem);
-					}
-				}
-			}
-
-		// Add elements to results, through postFinder if defined
-		} else {
-			matcherOut = condense(
-				matcherOut === results ?
-					matcherOut.splice( preexisting, matcherOut.length ) :
-					matcherOut
-			);
-			if ( postFinder ) {
-				postFinder( null, results, matcherOut, xml );
-			} else {
-				push.apply( results, matcherOut );
-			}
-		}
-	});
-}
-
-function matcherFromTokens( tokens ) {
-	var checkContext, matcher, j,
-		len = tokens.length,
-		leadingRelative = Expr.relative[ tokens[0].type ],
-		implicitRelative = leadingRelative || Expr.relative[" "],
-		i = leadingRelative ? 1 : 0,
-
-		// The foundational matcher ensures that elements are reachable from top-level context(s)
-		matchContext = addCombinator( function( elem ) {
-			return elem === checkContext;
-		}, implicitRelative, true ),
-		matchAnyContext = addCombinator( function( elem ) {
-			return indexOf( checkContext, elem ) > -1;
-		}, implicitRelative, true ),
-		matchers = [ function( elem, context, xml ) {
-			var ret = ( !leadingRelative && ( xml || context !== outermostContext ) ) || (
-				(checkContext = context).nodeType ?
-					matchContext( elem, context, xml ) :
-					matchAnyContext( elem, context, xml ) );
-			// Avoid hanging onto element (issue #299)
-			checkContext = null;
-			return ret;
-		} ];
-
-	for ( ; i < len; i++ ) {
-		if ( (matcher = Expr.relative[ tokens[i].type ]) ) {
-			matchers = [ addCombinator(elementMatcher( matchers ), matcher) ];
-		} else {
-			matcher = Expr.filter[ tokens[i].type ].apply( null, tokens[i].matches );
-
-			// Return special upon seeing a positional matcher
-			if ( matcher[ expando ] ) {
-				// Find the next relative operator (if any) for proper handling
-				j = ++i;
-				for ( ; j < len; j++ ) {
-					if ( Expr.relative[ tokens[j].type ] ) {
-						break;
-					}
-				}
-				return setMatcher(
-					i > 1 && elementMatcher( matchers ),
-					i > 1 && toSelector(
-						// If the preceding token was a descendant combinator, insert an implicit any-element `*`
-						tokens.slice( 0, i - 1 ).concat({ value: tokens[ i - 2 ].type === " " ? "*" : "" })
-					).replace( rtrim, "$1" ),
-					matcher,
-					i < j && matcherFromTokens( tokens.slice( i, j ) ),
-					j < len && matcherFromTokens( (tokens = tokens.slice( j )) ),
-					j < len && toSelector( tokens )
-				);
-			}
-			matchers.push( matcher );
-		}
-	}
-
-	return elementMatcher( matchers );
-}
-
-function matcherFromGroupMatchers( elementMatchers, setMatchers ) {
-	var bySet = setMatchers.length > 0,
-		byElement = elementMatchers.length > 0,
-		superMatcher = function( seed, context, xml, results, outermost ) {
-			var elem, j, matcher,
-				matchedCount = 0,
-				i = "0",
-				unmatched = seed && [],
-				setMatched = [],
-				contextBackup = outermostContext,
-				// We must always have either seed elements or outermost context
-				elems = seed || byElement && Expr.find["TAG"]( "*", outermost ),
-				// Use integer dirruns iff this is the outermost matcher
-				dirrunsUnique = (dirruns += contextBackup == null ? 1 : Math.random() || 0.1),
-				len = elems.length;
-
-			if ( outermost ) {
-				outermostContext = context !== document && context;
-			}
-
-			// Add elements passing elementMatchers directly to results
-			// Keep `i` a string if there are no elements so `matchedCount` will be "00" below
-			// Support: IE<9, Safari
-			// Tolerate NodeList properties (IE: "length"; Safari: <number>) matching elements by id
-			for ( ; i !== len && (elem = elems[i]) != null; i++ ) {
-				if ( byElement && elem ) {
-					j = 0;
-					while ( (matcher = elementMatchers[j++]) ) {
-						if ( matcher( elem, context, xml ) ) {
-							results.push( elem );
-							break;
-						}
-					}
-					if ( outermost ) {
-						dirruns = dirrunsUnique;
-					}
-				}
-
-				// Track unmatched elements for set filters
-				if ( bySet ) {
-					// They will have gone through all possible matchers
-					if ( (elem = !matcher && elem) ) {
-						matchedCount--;
-					}
-
-					// Lengthen the array for every element, matched or not
-					if ( seed ) {
-						unmatched.push( elem );
-					}
-				}
-			}
-
-			// Apply set filters to unmatched elements
-			matchedCount += i;
-			if ( bySet && i !== matchedCount ) {
-				j = 0;
-				while ( (matcher = setMatchers[j++]) ) {
-					matcher( unmatched, setMatched, context, xml );
-				}
-
-				if ( seed ) {
-					// Reintegrate element matches to eliminate the need for sorting
-					if ( matchedCount > 0 ) {
-						while ( i-- ) {
-							if ( !(unmatched[i] || setMatched[i]) ) {
-								setMatched[i] = pop.call( results );
-							}
-						}
-					}
-
-					// Discard index placeholder values to get only actual matches
-					setMatched = condense( setMatched );
-				}
-
-				// Add matches to results
-				push.apply( results, setMatched );
-
-				// Seedless set matches succeeding multiple successful matchers stipulate sorting
-				if ( outermost && !seed && setMatched.length > 0 &&
-					( matchedCount + setMatchers.length ) > 1 ) {
-
-					Sizzle.uniqueSort( results );
-				}
-			}
-
-			// Override manipulation of globals by nested matchers
-			if ( outermost ) {
-				dirruns = dirrunsUnique;
-				outermostContext = contextBackup;
-			}
-
-			return unmatched;
-		};
-
-	return bySet ?
-		markFunction( superMatcher ) :
-		superMatcher;
-}
-
-compile = Sizzle.compile = function( selector, match /* Internal Use Only */ ) {
-	var i,
-		setMatchers = [],
-		elementMatchers = [],
-		cached = compilerCache[ selector + " " ];
-
-	if ( !cached ) {
-		// Generate a function of recursive functions that can be used to check each element
-		if ( !match ) {
-			match = tokenize( selector );
-		}
-		i = match.length;
-		while ( i-- ) {
-			cached = matcherFromTokens( match[i] );
-			if ( cached[ expando ] ) {
-				setMatchers.push( cached );
-			} else {
-				elementMatchers.push( cached );
-			}
-		}
-
-		// Cache the compiled function
-		cached = compilerCache( selector, matcherFromGroupMatchers( elementMatchers, setMatchers ) );
-
-		// Save selector and tokenization
-		cached.selector = selector;
-	}
-	return cached;
-};
-
-/**
- * A low-level selection function that works with Sizzle's compiled
- *  selector functions
- * @param {String|Function} selector A selector or a pre-compiled
- *  selector function built with Sizzle.compile
- * @param {Element} context
- * @param {Array} [results]
- * @param {Array} [seed] A set of elements to match against
- */
-select = Sizzle.select = function( selector, context, results, seed ) {
-	var i, tokens, token, type, find,
-		compiled = typeof selector === "function" && selector,
-		match = !seed && tokenize( (selector = compiled.selector || selector) );
-
-	results = results || [];
-
-	// Try to minimize operations if there is no seed and only one group
-	if ( match.length === 1 ) {
-
-		// Take a shortcut and set the context if the root selector is an ID
-		tokens = match[0] = match[0].slice( 0 );
-		if ( tokens.length > 2 && (token = tokens[0]).type === "ID" &&
-				support.getById && context.nodeType === 9 && documentIsHTML &&
-				Expr.relative[ tokens[1].type ] ) {
-
-			context = ( Expr.find["ID"]( token.matches[0].replace(runescape, funescape), context ) || [] )[0];
-			if ( !context ) {
-				return results;
-
-			// Precompiled matchers will still verify ancestry, so step up a level
-			} else if ( compiled ) {
-				context = context.parentNode;
-			}
-
-			selector = selector.slice( tokens.shift().value.length );
-		}
-
-		// Fetch a seed set for right-to-left matching
-		i = matchExpr["needsContext"].test( selector ) ? 0 : tokens.length;
-		while ( i-- ) {
-			token = tokens[i];
-
-			// Abort if we hit a combinator
-			if ( Expr.relative[ (type = token.type) ] ) {
-				break;
-			}
-			if ( (find = Expr.find[ type ]) ) {
-				// Search, expanding context for leading sibling combinators
-				if ( (seed = find(
-					token.matches[0].replace( runescape, funescape ),
-					rsibling.test( tokens[0].type ) && testContext( context.parentNode ) || context
-				)) ) {
-
-					// If seed is empty or no tokens remain, we can return early
-					tokens.splice( i, 1 );
-					selector = seed.length && toSelector( tokens );
-					if ( !selector ) {
-						push.apply( results, seed );
-						return results;
-					}
-
-					break;
-				}
-			}
-		}
-	}
-
-	// Compile and execute a filtering function if one is not provided
-	// Provide `match` to avoid retokenization if we modified the selector above
-	( compiled || compile( selector, match ) )(
-		seed,
-		context,
-		!documentIsHTML,
-		results,
-		rsibling.test( selector ) && testContext( context.parentNode ) || context
-	);
-	return results;
-};
-
-// One-time assignments
-
-// Sort stability
-support.sortStable = expando.split("").sort( sortOrder ).join("") === expando;
-
-// Support: Chrome 14-35+
-// Always assume duplicates if they aren't passed to the comparison function
-support.detectDuplicates = !!hasDuplicate;
-
-// Initialize against the default document
-setDocument();
-
-// Support: Webkit<537.32 - Safari 6.0.3/Chrome 25 (fixed in Chrome 27)
-// Detached nodes confoundingly follow *each other*
-support.sortDetached = assert(function( div1 ) {
-	// Should return 1, but returns 4 (following)
-	return div1.compareDocumentPosition( document.createElement("div") ) & 1;
-});
-
-// Support: IE<8
-// Prevent attribute/property "interpolation"
-// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx
-if ( !assert(function( div ) {
-	div.innerHTML = "<a href='#'></a>";
-	return div.firstChild.getAttribute("href") === "#" ;
-}) ) {
-	addHandle( "type|href|height|width", function( elem, name, isXML ) {
-		if ( !isXML ) {
-			return elem.getAttribute( name, name.toLowerCase() === "type" ? 1 : 2 );
-		}
-	});
-}
-
-// Support: IE<9
-// Use defaultValue in place of getAttribute("value")
-if ( !support.attributes || !assert(function( div ) {
-	div.innerHTML = "<input/>";
-	div.firstChild.setAttribute( "value", "" );
-	return div.firstChild.getAttribute( "value" ) === "";
-}) ) {
-	addHandle( "value", function( elem, name, isXML ) {
-		if ( !isXML && elem.nodeName.toLowerCase() === "input" ) {
-			return elem.defaultValue;
-		}
-	});
-}
-
-// Support: IE<9
-// Use getAttributeNode to fetch booleans when getAttribute lies
-if ( !assert(function( div ) {
-	return div.getAttribute("disabled") == null;
-}) ) {
-	addHandle( booleans, function( elem, name, isXML ) {
-		var val;
-		if ( !isXML ) {
-			return elem[ name ] === true ? name.toLowerCase() :
-					(val = elem.getAttributeNode( name )) && val.specified ?
-					val.value :
-				null;
-		}
-	});
-}
-
-// EXPOSE
-if ( typeof define === "function" && define.amd ) {
-	define(function() { return Sizzle; });
-// Sizzle requires that there be a global window in Common-JS like environments
-} else if ( typeof module !== "undefined" && module.exports ) {
-	module.exports = Sizzle;
-} else {
-	window.Sizzle = Sizzle;
-}
-// EXPOSE
-
-})( window );
diff --git a/#pma/js/jquery/src/jquery/sizzle/dist/sizzle.min.js b/#pma/js/jquery/src/jquery/sizzle/dist/sizzle.min.js
deleted file mode 100644
index cf4d1a66..00000000
--- a/#pma/js/jquery/src/jquery/sizzle/dist/sizzle.min.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*! Sizzle v2.2.0-pre | (c) 2008, 2014 jQuery Foundation, Inc. | jquery.org/license */
-!function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+1*new Date,v=a.document,w=0,x=0,y=hb(),z=hb(),A=hb(),B=function(a,b){return a===b&&(l=!0),0},C=1<<31,D={}.hasOwnProperty,E=[],F=E.pop,G=E.push,H=E.push,I=E.slice,J=function(a,b){for(var c=0,d=a.length;d>c;c++)if(a[c]===b)return c;return-1},K="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",L="[\\x20\\t\\r\\n\\f]",M="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",N=M.replace("w","w#"),O="\\["+L+"*("+M+")(?:"+L+"*([*^$|!~]?=)"+L+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+N+"))|)"+L+"*\\]",P=":("+M+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+O+")*)|.*)\\)|)",Q=new RegExp(L+"+","g"),R=new RegExp("^"+L+"+|((?:^|[^\\\\])(?:\\\\.)*)"+L+"+$","g"),S=new RegExp("^"+L+"*,"+L+"*"),T=new RegExp("^"+L+"*([>+~]|"+L+")"+L+"*"),U=new RegExp("="+L+"*([^\\]'\"]*?)"+L+"*\\]","g"),V=new RegExp(P),W=new RegExp("^"+N+"$"),X={ID:new RegExp("^#("+M+")"),CLASS:new RegExp("^\\.("+M+")"),TAG:new RegExp("^("+M.replace("w","w*")+")"),ATTR:new RegExp("^"+O),PSEUDO:new RegExp("^"+P),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+L+"*(even|odd|(([+-]|)(\\d*)n|)"+L+"*(?:([+-]|)"+L+"*(\\d+)|))"+L+"*\\)|)","i"),bool:new RegExp("^(?:"+K+")$","i"),needsContext:new RegExp("^"+L+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+L+"*((?:-\\d)?\\d*)"+L+"*\\)|)(?=[^-]|$)","i")},Y=/^(?:input|select|textarea|button)$/i,Z=/^h\d$/i,$=/^[^{]+\{\s*\[native \w/,_=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ab=/[+~]/,bb=/'|\\/g,cb=new RegExp("\\\\([\\da-f]{1,6}"+L+"?|("+L+")|.)","ig"),db=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)},eb=function(){m()};try{H.apply(E=I.call(v.childNodes),v.childNodes),E[v.childNodes.length].nodeType}catch(fb){H={apply:E.length?function(a,b){G.apply(a,I.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function gb(a,b,d,e){var f,h,j,k,l,o,r,s,w,x;if((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,d=d||[],k=b.nodeType,"string"!=typeof a||!a||1!==k&&9!==k&&11!==k)return d;if(!e&&p){if(11!==k&&(f=_.exec(a)))if(j=f[1]){if(9===k){if(h=b.getElementById(j),!h||!h.parentNode)return d;if(h.id===j)return d.push(h),d}else if(b.ownerDocument&&(h=b.ownerDocument.getElementById(j))&&t(b,h)&&h.id===j)return d.push(h),d}else{if(f[2])return H.apply(d,b.getElementsByTagName(a)),d;if((j=f[3])&&c.getElementsByClassName)return H.apply(d,b.getElementsByClassName(j)),d}if(c.qsa&&(!q||!q.test(a))){if(s=r=u,w=b,x=1!==k&&a,1===k&&"object"!==b.nodeName.toLowerCase()){o=g(a),(r=b.getAttribute("id"))?s=r.replace(bb,"\\$&"):b.setAttribute("id",s),s="[id='"+s+"'] ",l=o.length;while(l--)o[l]=s+rb(o[l]);w=ab.test(a)&&pb(b.parentNode)||b,x=o.join(",")}if(x)try{return H.apply(d,w.querySelectorAll(x)),d}catch(y){}finally{r||b.removeAttribute("id")}}}return i(a.replace(R,"$1"),b,d,e)}function hb(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function ib(a){return a[u]=!0,a}function jb(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function kb(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function lb(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||C)-(~a.sourceIndex||C);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function mb(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function nb(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function ob(a){return ib(function(b){return b=+b,ib(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function pb(a){return a&&"undefined"!=typeof a.getElementsByTagName&&a}c=gb.support={},f=gb.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=gb.setDocument=function(a){var b,e,g=a?a.ownerDocument||a:v;return g!==n&&9===g.nodeType&&g.documentElement?(n=g,o=g.documentElement,e=g.defaultView,e&&e!==e.top&&(e.addEventListener?e.addEventListener("unload",eb,!1):e.attachEvent&&e.attachEvent("onunload",eb)),p=!f(g),c.attributes=jb(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=jb(function(a){return a.appendChild(g.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=$.test(g.getElementsByClassName),c.getById=jb(function(a){return o.appendChild(a).id=u,!g.getElementsByName||!g.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){var c="undefined"!=typeof a.getAttributeNode&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return"undefined"!=typeof b.getElementsByTagName?b.getElementsByTagName(a):c.qsa?b.querySelectorAll(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=$.test(g.querySelectorAll))&&(jb(function(a){o.appendChild(a).innerHTML="<a id='"+u+"'></a><select id='"+u+"-\f]' msallowcapture=''><option selected=''></option></select>",a.querySelectorAll("[msallowcapture^='']").length&&q.push("[*^$]="+L+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+L+"*(?:value|"+K+")"),a.querySelectorAll("[id~="+u+"-]").length||q.push("~="),a.querySelectorAll(":checked").length||q.push(":checked"),a.querySelectorAll("a#"+u+"+*").length||q.push(".#.+[+~]")}),jb(function(a){var b=g.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+L+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=$.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&jb(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",P)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=$.test(o.compareDocumentPosition),t=b||$.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===g||a.ownerDocument===v&&t(v,a)?-1:b===g||b.ownerDocument===v&&t(v,b)?1:k?J(k,a)-J(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,e=a.parentNode,f=b.parentNode,h=[a],i=[b];if(!e||!f)return a===g?-1:b===g?1:e?-1:f?1:k?J(k,a)-J(k,b):0;if(e===f)return lb(a,b);c=a;while(c=c.parentNode)h.unshift(c);c=b;while(c=c.parentNode)i.unshift(c);while(h[d]===i[d])d++;return d?lb(h[d],i[d]):h[d]===v?-1:i[d]===v?1:0},g):n},gb.matches=function(a,b){return gb(a,null,null,b)},gb.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(U,"='$1']"),!(!c.matchesSelector||!p||r&&r.test(b)||q&&q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return gb(b,n,null,[a]).length>0},gb.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},gb.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&D.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},gb.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},gb.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=gb.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=gb.selectors={cacheLength:50,createPseudo:ib,match:X,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(cb,db),a[3]=(a[3]||a[4]||a[5]||"").replace(cb,db),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||gb.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&gb.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return X.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&V.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(cb,db).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+L+")"+a+"("+L+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||"undefined"!=typeof a.getAttribute&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=gb.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e.replace(Q," ")+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h;if(q){if(f){while(p){l=b;while(l=l[p])if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){k=q[u]||(q[u]={}),j=k[a]||[],n=j[0]===w&&j[1],m=j[0]===w&&j[2],l=n&&q.childNodes[n];while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if(1===l.nodeType&&++m&&l===b){k[a]=[w,n,m];break}}else if(s&&(j=(b[u]||(b[u]={}))[a])&&j[0]===w)m=j[1];else while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if((h?l.nodeName.toLowerCase()===r:1===l.nodeType)&&++m&&(s&&((l[u]||(l[u]={}))[a]=[w,m]),l===b))break;return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||gb.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ib(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=J(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:ib(function(a){var b=[],c=[],d=h(a.replace(R,"$1"));return d[u]?ib(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),b[0]=null,!c.pop()}}),has:ib(function(a){return function(b){return gb(a,b).length>0}}),contains:ib(function(a){return a=a.replace(cb,db),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ib(function(a){return W.test(a||"")||gb.error("unsupported lang: "+a),a=a.replace(cb,db).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Z.test(a.nodeName)},input:function(a){return Y.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:ob(function(){return[0]}),last:ob(function(a,b){return[b-1]}),eq:ob(function(a,b,c){return[0>c?c+b:c]}),even:ob(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:ob(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:ob(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:ob(function(a,b,c){for(var d=0>c?c+b:c;++d<b;)a.push(d);return a})}},d.pseudos.nth=d.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})d.pseudos[b]=mb(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=nb(b);function qb(){}qb.prototype=d.filters=d.pseudos,d.setFilters=new qb,g=gb.tokenize=function(a,b){var c,e,f,g,h,i,j,k=z[a+" "];if(k)return b?0:k.slice(0);h=a,i=[],j=d.preFilter;while(h){(!c||(e=S.exec(h)))&&(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=T.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(R," ")}),h=h.slice(c.length));for(g in d.filter)!(e=X[g].exec(h))||j[g]&&!(e=j[g](e))||(c=e.shift(),f.push({value:c,type:g,matches:e}),h=h.slice(c.length));if(!c)break}return b?h.length:h?gb.error(a):z(a,i).slice(0)};function rb(a){for(var b=0,c=a.length,d="";c>b;b++)d+=a[b].value;return d}function sb(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(i=b[u]||(b[u]={}),(h=i[d])&&h[0]===w&&h[1]===f)return j[2]=h[2];if(i[d]=j,j[2]=a(b,c,g))return!0}}}function tb(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function ub(a,b,c){for(var d=0,e=b.length;e>d;d++)gb(a,b[d],c);return c}function vb(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function wb(a,b,c,d,e,f){return d&&!d[u]&&(d=wb(d)),e&&!e[u]&&(e=wb(e,f)),ib(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||ub(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:vb(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=vb(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?J(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=vb(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):H.apply(g,r)})}function xb(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=sb(function(a){return a===b},h,!0),l=sb(function(a){return J(b,a)>-1},h,!0),m=[function(a,c,d){var e=!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d));return b=null,e}];f>i;i++)if(c=d.relative[a[i].type])m=[sb(tb(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return wb(i>1&&tb(m),i>1&&rb(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(R,"$1"),c,e>i&&xb(a.slice(i,e)),f>e&&xb(a=a.slice(e)),f>e&&rb(a))}m.push(c)}return tb(m)}function yb(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,m,o,p=0,q="0",r=f&&[],s=[],t=j,u=f||e&&d.find.TAG("*",k),v=w+=null==t?1:Math.random()||.1,x=u.length;for(k&&(j=g!==n&&g);q!==x&&null!=(l=u[q]);q++){if(e&&l){m=0;while(o=a[m++])if(o(l,g,h)){i.push(l);break}k&&(w=v)}c&&((l=!o&&l)&&p--,f&&r.push(l))}if(p+=q,c&&q!==p){m=0;while(o=b[m++])o(r,s,g,h);if(f){if(p>0)while(q--)r[q]||s[q]||(s[q]=F.call(i));s=vb(s)}H.apply(i,s),k&&!f&&s.length>0&&p+b.length>1&&gb.uniqueSort(i)}return k&&(w=v,j=t),r};return c?ib(f):f}h=gb.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=xb(b[c]),f[u]?d.push(f):e.push(f);f=A(a,yb(e,d)),f.selector=a}return f},i=gb.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(cb,db),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=X.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(cb,db),ab.test(j[0].type)&&pb(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&rb(j),!a)return H.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,ab.test(a)&&pb(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=jb(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),jb(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||kb("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&jb(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||kb("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),jb(function(a){return null==a.getAttribute("disabled")})||kb(K,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),"function"==typeof define&&define.amd?define(function(){return gb}):"undefined"!=typeof module&&module.exports?module.exports=gb:a.Sizzle=gb}(window);
-//# sourceMappingURL=sizzle.min.map
\ No newline at end of file
diff --git a/#pma/js/jquery/src/jquery/sizzle/dist/sizzle.min.map b/#pma/js/jquery/src/jquery/sizzle/dist/sizzle.min.map
deleted file mode 100644
index e39754eb..00000000
--- a/#pma/js/jquery/src/jquery/sizzle/dist/sizzle.min.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"sizzle.min.js","sources":["sizzle.js"],"names":["window","i","support","Expr","getText","isXML","tokenize","compile","select","outermostContext","sortInput","hasDuplicate","setDocument","document","docElem","documentIsHTML","rbuggyQSA","rbuggyMatches","matches","contains","expando","Date","preferredDoc","dirruns","done","classCache","createCache","tokenCache","compilerCache","sortOrder","a","b","MAX_NEGATIVE","hasOwn","hasOwnProperty","arr","pop","push_native","push","slice","indexOf","list","elem","len","length","booleans","whitespace","characterEncoding","identifier","replace","attributes","pseudos","rwhitespace","RegExp","rtrim","rcomma","rcombinators","rattributeQuotes","rpseudo","ridentifier","matchExpr","ID","CLASS","TAG","ATTR","PSEUDO","CHILD","bool","needsContext","rinputs","rheader","rnative","rquickExpr","rsibling","rescape","runescape","funescape","_","escaped","escapedWhitespace","high","String","fromCharCode","unloadHandler","apply","call","childNodes","nodeType","e","target","els","j","Sizzle","selector","context","results","seed","match","m","groups","old","nid","newContext","newSelector","ownerDocument","exec","getElementById","parentNode","id","getElementsByTagName","getElementsByClassName","qsa","test","nodeName","toLowerCase","getAttribute","setAttribute","toSelector","testContext","join","querySelectorAll","qsaError","removeAttribute","keys","cache","key","value","cacheLength","shift","markFunction","fn","assert","div","createElement","removeChild","addHandle","attrs","handler","split","attrHandle","siblingCheck","cur","diff","sourceIndex","nextSibling","createInputPseudo","type","name","createButtonPseudo","createPositionalPseudo","argument","matchIndexes","documentElement","node","hasCompare","parent","doc","defaultView","top","addEventListener","attachEvent","className","appendChild","createComment","getById","getElementsByName","find","filter","attrId","getAttributeNode","tag","tmp","innerHTML","input","matchesSelector","webkitMatchesSelector","mozMatchesSelector","oMatchesSelector","msMatchesSelector","disconnectedMatch","compareDocumentPosition","adown","bup","compare","sortDetached","aup","ap","bp","unshift","expr","elements","ret","attr","val","undefined","specified","error","msg","Error","uniqueSort","duplicates","detectDuplicates","sortStable","sort","splice","textContent","firstChild","nodeValue","selectors","createPseudo","relative",">","dir","first"," ","+","~","preFilter","excess","unquoted","nodeNameSelector","pattern","operator","check","result","what","last","simple","forward","ofType","xml","outerCache","nodeIndex","start","useCache","lastChild","pseudo","args","setFilters","idx","matched","not","matcher","unmatched","has","text","innerText","lang","elemLang","hash","location","root","focus","activeElement","hasFocus","href","tabIndex","enabled","disabled","checked","selected","selectedIndex","empty","header","button","eq","even","odd","lt","gt","radio","checkbox","file","password","image","submit","reset","prototype","filters","parseOnly","tokens","soFar","preFilters","cached","addCombinator","combinator","base","checkNonElements","doneName","oldCache","newCache","elementMatcher","matchers","multipleContexts","contexts","condense","map","newUnmatched","mapped","setMatcher","postFilter","postFinder","postSelector","temp","preMap","postMap","preexisting","elems","matcherIn","matcherOut","matcherFromTokens","checkContext","leadingRelative","implicitRelative","matchContext","matchAnyContext","concat","matcherFromGroupMatchers","elementMatchers","setMatchers","bySet","byElement","superMatcher","outermost","matchedCount","setMatched","contextBackup","dirrunsUnique","Math","random","token","compiled","div1","defaultValue","define","amd","module","exports"],"mappings":";CAUA,SAAWA,GAEX,GAAIC,GACHC,EACAC,EACAC,EACAC,EACAC,EACAC,EACAC,EACAC,EACAC,EACAC,EAGAC,EACAC,EACAC,EACAC,EACAC,EACAC,EACAC,EACAC,EAGAC,EAAU,SAAW,EAAI,GAAIC,MAC7BC,EAAetB,EAAOa,SACtBU,EAAU,EACVC,EAAO,EACPC,EAAaC,KACbC,EAAaD,KACbE,EAAgBF,KAChBG,EAAY,SAAUC,EAAGC,GAIxB,MAHKD,KAAMC,IACVpB,GAAe,GAET,GAIRqB,EAAe,GAAK,GAGpBC,KAAcC,eACdC,KACAC,EAAMD,EAAIC,IACVC,EAAcF,EAAIG,KAClBA,EAAOH,EAAIG,KACXC,EAAQJ,EAAII,MAGZC,EAAU,SAAUC,EAAMC,GAGzB,IAFA,GAAIzC,GAAI,EACP0C,EAAMF,EAAKG,OACAD,EAAJ1C,EAASA,IAChB,GAAKwC,EAAKxC,KAAOyC,EAChB,MAAOzC,EAGT,OAAO,IAGR4C,EAAW,6HAKXC,EAAa,sBAEbC,EAAoB,mCAKpBC,EAAaD,EAAkBE,QAAS,IAAK,MAG7CC,EAAa,MAAQJ,EAAa,KAAOC,EAAoB,OAASD,EAErE,gBAAkBA,EAElB,2DAA6DE,EAAa,OAASF,EACnF,OAEDK,EAAU,KAAOJ,EAAoB,wFAKPG,EAAa,eAM3CE,EAAc,GAAIC,QAAQP,EAAa,IAAK,KAC5CQ,EAAQ,GAAID,QAAQ,IAAMP,EAAa,8BAAgCA,EAAa,KAAM,KAE1FS,EAAS,GAAIF,QAAQ,IAAMP,EAAa,KAAOA,EAAa,KAC5DU,EAAe,GAAIH,QAAQ,IAAMP,EAAa,WAAaA,EAAa,IAAMA,EAAa,KAE3FW,EAAmB,GAAIJ,QAAQ,IAAMP,EAAa,iBAAmBA,EAAa,OAAQ,KAE1FY,EAAU,GAAIL,QAAQF,GACtBQ,EAAc,GAAIN,QAAQ,IAAML,EAAa,KAE7CY,GACCC,GAAM,GAAIR,QAAQ,MAAQN,EAAoB,KAC9Ce,MAAS,GAAIT,QAAQ,QAAUN,EAAoB,KACnDgB,IAAO,GAAIV,QAAQ,KAAON,EAAkBE,QAAS,IAAK,MAAS,KACnEe,KAAQ,GAAIX,QAAQ,IAAMH,GAC1Be,OAAU,GAAIZ,QAAQ,IAAMF,GAC5Be,MAAS,GAAIb,QAAQ,yDAA2DP,EAC/E,+BAAiCA,EAAa,cAAgBA,EAC9D,aAAeA,EAAa,SAAU,KACvCqB,KAAQ,GAAId,QAAQ,OAASR,EAAW,KAAM,KAG9CuB,aAAgB,GAAIf,QAAQ,IAAMP,EAAa,mDAC9CA,EAAa,mBAAqBA,EAAa,mBAAoB,MAGrEuB,EAAU,sCACVC,EAAU,SAEVC,EAAU,yBAGVC,EAAa,mCAEbC,GAAW,OACXC,GAAU,QAGVC,GAAY,GAAItB,QAAQ,qBAAuBP,EAAa,MAAQA,EAAa,OAAQ,MACzF8B,GAAY,SAAUC,EAAGC,EAASC,GACjC,GAAIC,GAAO,KAAOF,EAAU,KAI5B,OAAOE,KAASA,GAAQD,EACvBD,EACO,EAAPE,EAECC,OAAOC,aAAcF,EAAO,OAE5BC,OAAOC,aAAcF,GAAQ,GAAK,MAAe,KAAPA,EAAe,QAO5DG,GAAgB,WACfvE,IAIF,KACC0B,EAAK8C,MACHjD,EAAMI,EAAM8C,KAAM/D,EAAagE,YAChChE,EAAagE,YAIdnD,EAAKb,EAAagE,WAAW1C,QAAS2C,SACrC,MAAQC,IACTlD,GAAS8C,MAAOjD,EAAIS,OAGnB,SAAU6C,EAAQC,GACjBrD,EAAY+C,MAAOK,EAAQlD,EAAM8C,KAAKK,KAKvC,SAAUD,EAAQC,GACjB,GAAIC,GAAIF,EAAO7C,OACd3C,EAAI,CAEL,OAASwF,EAAOE,KAAOD,EAAIzF,MAC3BwF,EAAO7C,OAAS+C,EAAI,IAKvB,QAASC,IAAQC,EAAUC,EAASC,EAASC,GAC5C,GAAIC,GAAOvD,EAAMwD,EAAGX,EAEnBtF,EAAGkG,EAAQC,EAAKC,EAAKC,EAAYC,CAUlC,KAROT,EAAUA,EAAQU,eAAiBV,EAAUxE,KAAmBT,GACtED,EAAakF,GAGdA,EAAUA,GAAWjF,EACrBkF,EAAUA,MACVR,EAAWO,EAAQP,SAEM,gBAAbM,KAA0BA,GACxB,IAAbN,GAA+B,IAAbA,GAA+B,KAAbA,EAEpC,MAAOQ,EAGR,KAAMC,GAAQjF,EAAiB,CAG9B,GAAkB,KAAbwE,IAAoBU,EAAQzB,EAAWiC,KAAMZ,IAEjD,GAAMK,EAAID,EAAM,IACf,GAAkB,IAAbV,EAAiB,CAIrB,GAHA7C,EAAOoD,EAAQY,eAAgBR,IAG1BxD,IAAQA,EAAKiE,WAQjB,MAAOZ,EALP,IAAKrD,EAAKkE,KAAOV,EAEhB,MADAH,GAAQzD,KAAMI,GACPqD,MAOT,IAAKD,EAAQU,gBAAkB9D,EAAOoD,EAAQU,cAAcE,eAAgBR,KAC3E/E,EAAU2E,EAASpD,IAAUA,EAAKkE,KAAOV,EAEzC,MADAH,GAAQzD,KAAMI,GACPqD,MAKH,CAAA,GAAKE,EAAM,GAEjB,MADA3D,GAAK8C,MAAOW,EAASD,EAAQe,qBAAsBhB,IAC5CE,CAGD,KAAMG,EAAID,EAAM,KAAO/F,EAAQ4G,uBAErC,MADAxE,GAAK8C,MAAOW,EAASD,EAAQgB,uBAAwBZ,IAC9CH,EAKT,GAAK7F,EAAQ6G,OAAS/F,IAAcA,EAAUgG,KAAMnB,IAAc,CASjE,GARAQ,EAAMD,EAAMhF,EACZkF,EAAaR,EACbS,EAA2B,IAAbhB,GAAkBM,EAMd,IAAbN,GAAqD,WAAnCO,EAAQmB,SAASC,cAA6B,CACpEf,EAAS7F,EAAUuF,IAEbO,EAAMN,EAAQqB,aAAa,OAChCd,EAAMD,EAAInD,QAASyB,GAAS,QAE5BoB,EAAQsB,aAAc,KAAMf,GAE7BA,EAAM,QAAUA,EAAM,MAEtBpG,EAAIkG,EAAOvD,MACX,OAAQ3C,IACPkG,EAAOlG,GAAKoG,EAAMgB,GAAYlB,EAAOlG,GAEtCqG,GAAa7B,GAASuC,KAAMnB,IAAcyB,GAAaxB,EAAQa,aAAgBb,EAC/ES,EAAcJ,EAAOoB,KAAK,KAG3B,GAAKhB,EACJ,IAIC,MAHAjE,GAAK8C,MAAOW,EACXO,EAAWkB,iBAAkBjB,IAEvBR,EACN,MAAM0B,IACN,QACKrB,GACLN,EAAQ4B,gBAAgB,QAQ7B,MAAOlH,GAAQqF,EAAS5C,QAASK,EAAO,MAAQwC,EAASC,EAASC,GASnE,QAAStE,MACR,GAAIiG,KAEJ,SAASC,GAAOC,EAAKC,GAMpB,MAJKH,GAAKrF,KAAMuF,EAAM,KAAQ1H,EAAK4H,mBAE3BH,GAAOD,EAAKK,SAEZJ,EAAOC,EAAM,KAAQC,EAE9B,MAAOF,GAOR,QAASK,IAAcC,GAEtB,MADAA,GAAI9G,IAAY,EACT8G,EAOR,QAASC,IAAQD,GAChB,GAAIE,GAAMvH,EAASwH,cAAc,MAEjC,KACC,QAASH,EAAIE,GACZ,MAAO5C,GACR,OAAO,EACN,QAEI4C,EAAIzB,YACRyB,EAAIzB,WAAW2B,YAAaF,GAG7BA,EAAM,MASR,QAASG,IAAWC,EAAOC,GAC1B,GAAItG,GAAMqG,EAAME,MAAM,KACrBzI,EAAIuI,EAAM5F,MAEX,OAAQ3C,IACPE,EAAKwI,WAAYxG,EAAIlC,IAAOwI,EAU9B,QAASG,IAAc9G,EAAGC,GACzB,GAAI8G,GAAM9G,GAAKD,EACdgH,EAAOD,GAAsB,IAAf/G,EAAEyD,UAAiC,IAAfxD,EAAEwD,YAChCxD,EAAEgH,aAAe/G,KACjBF,EAAEiH,aAAe/G,EAGtB,IAAK8G,EACJ,MAAOA,EAIR,IAAKD,EACJ,MAASA,EAAMA,EAAIG,YAClB,GAAKH,IAAQ9G,EACZ,MAAO,EAKV,OAAOD,GAAI,EAAI,GAOhB,QAASmH,IAAmBC,GAC3B,MAAO,UAAUxG,GAChB,GAAIyG,GAAOzG,EAAKuE,SAASC,aACzB,OAAgB,UAATiC,GAAoBzG,EAAKwG,OAASA,GAQ3C,QAASE,IAAoBF,GAC5B,MAAO,UAAUxG,GAChB,GAAIyG,GAAOzG,EAAKuE,SAASC,aACzB,QAAiB,UAATiC,GAA6B,WAATA,IAAsBzG,EAAKwG,OAASA,GAQlE,QAASG,IAAwBnB,GAChC,MAAOD,IAAa,SAAUqB,GAE7B,MADAA,IAAYA,EACLrB,GAAa,SAAUjC,EAAM9E,GACnC,GAAIyE,GACH4D,EAAerB,KAAQlC,EAAKpD,OAAQ0G,GACpCrJ,EAAIsJ,EAAa3G,MAGlB,OAAQ3C,IACF+F,EAAOL,EAAI4D,EAAatJ,MAC5B+F,EAAKL,KAAOzE,EAAQyE,GAAKK,EAAKL,SAYnC,QAAS2B,IAAaxB,GACrB,MAAOA,IAAmD,mBAAjCA,GAAQe,sBAAwCf,EAI1E5F,EAAU0F,GAAO1F,WAOjBG,EAAQuF,GAAOvF,MAAQ,SAAUqC,GAGhC,GAAI8G,GAAkB9G,IAASA,EAAK8D,eAAiB9D,GAAM8G,eAC3D,OAAOA,GAA+C,SAA7BA,EAAgBvC,UAAsB,GAQhErG,EAAcgF,GAAOhF,YAAc,SAAU6I,GAC5C,GAAIC,GAAYC,EACfC,EAAMH,EAAOA,EAAKjD,eAAiBiD,EAAOnI,CAG3C,OAAKsI,KAAQ/I,GAA6B,IAAjB+I,EAAIrE,UAAmBqE,EAAIJ,iBAKpD3I,EAAW+I,EACX9I,EAAU8I,EAAIJ,gBACdG,EAASC,EAAIC,YAMRF,GAAUA,IAAWA,EAAOG,MAE3BH,EAAOI,iBACXJ,EAAOI,iBAAkB,SAAU5E,IAAe,GACvCwE,EAAOK,aAClBL,EAAOK,YAAa,WAAY7E,KAMlCpE,GAAkBV,EAAOuJ,GAQzB1J,EAAQgD,WAAaiF,GAAO,SAAUC,GAErC,MADAA,GAAI6B,UAAY,KACR7B,EAAIjB,aAAa,eAO1BjH,EAAQ2G,qBAAuBsB,GAAO,SAAUC,GAE/C,MADAA,GAAI8B,YAAaN,EAAIO,cAAc,MAC3B/B,EAAIvB,qBAAqB,KAAKjE,SAIvC1C,EAAQ4G,uBAAyBvC,EAAQyC,KAAM4C,EAAI9C,wBAMnD5G,EAAQkK,QAAUjC,GAAO,SAAUC,GAElC,MADAtH,GAAQoJ,YAAa9B,GAAMxB,GAAKxF,GACxBwI,EAAIS,oBAAsBT,EAAIS,kBAAmBjJ,GAAUwB,SAI/D1C,EAAQkK,SACZjK,EAAKmK,KAAS,GAAI,SAAU1D,EAAId,GAC/B,GAAuC,mBAA3BA,GAAQY,gBAAkC3F,EAAiB,CACtE,GAAImF,GAAIJ,EAAQY,eAAgBE,EAGhC,OAAOV,IAAKA,EAAES,YAAeT,QAG/B/F,EAAKoK,OAAW,GAAI,SAAU3D,GAC7B,GAAI4D,GAAS5D,EAAG3D,QAAS0B,GAAWC,GACpC,OAAO,UAAUlC,GAChB,MAAOA,GAAKyE,aAAa,QAAUqD,YAM9BrK,GAAKmK,KAAS,GAErBnK,EAAKoK,OAAW,GAAK,SAAU3D,GAC9B,GAAI4D,GAAS5D,EAAG3D,QAAS0B,GAAWC,GACpC,OAAO,UAAUlC,GAChB,GAAI+G,GAAwC,mBAA1B/G,GAAK+H,kBAAoC/H,EAAK+H,iBAAiB,KACjF,OAAOhB,IAAQA,EAAK3B,QAAU0C,KAMjCrK,EAAKmK,KAAU,IAAIpK,EAAQ2G,qBAC1B,SAAU6D,EAAK5E,GACd,MAA6C,mBAAjCA,GAAQe,qBACZf,EAAQe,qBAAsB6D,GAG1BxK,EAAQ6G,IACZjB,EAAQ0B,iBAAkBkD,GAD3B,QAKR,SAAUA,EAAK5E,GACd,GAAIpD,GACHiI,KACA1K,EAAI,EAEJ8F,EAAUD,EAAQe,qBAAsB6D,EAGzC,IAAa,MAARA,EAAc,CAClB,MAAShI,EAAOqD,EAAQ9F,KACA,IAAlByC,EAAK6C,UACToF,EAAIrI,KAAMI,EAIZ,OAAOiI,GAER,MAAO5E,IAIT5F,EAAKmK,KAAY,MAAIpK,EAAQ4G,wBAA0B,SAAUmD,EAAWnE,GAC3E,MAAK/E,GACG+E,EAAQgB,uBAAwBmD,GADxC,QAWDhJ,KAOAD,MAEMd,EAAQ6G,IAAMxC,EAAQyC,KAAM4C,EAAIpC,qBAGrCW,GAAO,SAAUC,GAMhBtH,EAAQoJ,YAAa9B,GAAMwC,UAAY,UAAYxJ,EAAU,qBAC3CA,EAAU,iEAOvBgH,EAAIZ,iBAAiB,wBAAwB5E,QACjD5B,EAAUsB,KAAM,SAAWQ,EAAa,gBAKnCsF,EAAIZ,iBAAiB,cAAc5E,QACxC5B,EAAUsB,KAAM,MAAQQ,EAAa,aAAeD,EAAW,KAI1DuF,EAAIZ,iBAAkB,QAAUpG,EAAU,MAAOwB,QACtD5B,EAAUsB,KAAK,MAMV8F,EAAIZ,iBAAiB,YAAY5E,QACtC5B,EAAUsB,KAAK,YAMV8F,EAAIZ,iBAAkB,KAAOpG,EAAU,MAAOwB,QACnD5B,EAAUsB,KAAK,cAIjB6F,GAAO,SAAUC,GAGhB,GAAIyC,GAAQjB,EAAIvB,cAAc,QAC9BwC,GAAMzD,aAAc,OAAQ,UAC5BgB,EAAI8B,YAAaW,GAAQzD,aAAc,OAAQ,KAI1CgB,EAAIZ,iBAAiB,YAAY5E,QACrC5B,EAAUsB,KAAM,OAASQ,EAAa,eAKjCsF,EAAIZ,iBAAiB,YAAY5E,QACtC5B,EAAUsB,KAAM,WAAY,aAI7B8F,EAAIZ,iBAAiB,QACrBxG,EAAUsB,KAAK,YAIXpC,EAAQ4K,gBAAkBvG,EAAQyC,KAAO9F,EAAUJ,EAAQI,SAChEJ,EAAQiK,uBACRjK,EAAQkK,oBACRlK,EAAQmK,kBACRnK,EAAQoK,qBAER/C,GAAO,SAAUC,GAGhBlI,EAAQiL,kBAAoBjK,EAAQmE,KAAM+C,EAAK,OAI/ClH,EAAQmE,KAAM+C,EAAK,aACnBnH,EAAcqB,KAAM,KAAMa,KAI5BnC,EAAYA,EAAU4B,QAAU,GAAIS,QAAQrC,EAAUuG,KAAK,MAC3DtG,EAAgBA,EAAc2B,QAAU,GAAIS,QAAQpC,EAAcsG,KAAK,MAIvEmC,EAAanF,EAAQyC,KAAMlG,EAAQsK,yBAKnCjK,EAAWuI,GAAcnF,EAAQyC,KAAMlG,EAAQK,UAC9C,SAAUW,EAAGC,GACZ,GAAIsJ,GAAuB,IAAfvJ,EAAEyD,SAAiBzD,EAAE0H,gBAAkB1H,EAClDwJ,EAAMvJ,GAAKA,EAAE4E,UACd,OAAO7E,KAAMwJ,MAAWA,GAAwB,IAAjBA,EAAI/F,YAClC8F,EAAMlK,SACLkK,EAAMlK,SAAUmK,GAChBxJ,EAAEsJ,yBAA8D,GAAnCtJ,EAAEsJ,wBAAyBE,MAG3D,SAAUxJ,EAAGC,GACZ,GAAKA,EACJ,MAASA,EAAIA,EAAE4E,WACd,GAAK5E,IAAMD,EACV,OAAO,CAIV,QAAO,GAOTD,EAAY6H,EACZ,SAAU5H,EAAGC,GAGZ,GAAKD,IAAMC,EAEV,MADApB,IAAe,EACR,CAIR,IAAI4K,IAAWzJ,EAAEsJ,yBAA2BrJ,EAAEqJ,uBAC9C,OAAKG,GACGA,GAIRA,GAAYzJ,EAAE0E,eAAiB1E,MAAUC,EAAEyE,eAAiBzE,GAC3DD,EAAEsJ,wBAAyBrJ,GAG3B,EAGc,EAAVwJ,IACFrL,EAAQsL,cAAgBzJ,EAAEqJ,wBAAyBtJ,KAAQyJ,EAGxDzJ,IAAM8H,GAAO9H,EAAE0E,gBAAkBlF,GAAgBH,EAASG,EAAcQ,GACrE,GAEHC,IAAM6H,GAAO7H,EAAEyE,gBAAkBlF,GAAgBH,EAASG,EAAcS,GACrE,EAIDrB,EACJ8B,EAAS9B,EAAWoB,GAAMU,EAAS9B,EAAWqB,GAChD,EAGe,EAAVwJ,EAAc,GAAK,IAE3B,SAAUzJ,EAAGC,GAEZ,GAAKD,IAAMC,EAEV,MADApB,IAAe,EACR,CAGR,IAAIkI,GACH5I,EAAI,EACJwL,EAAM3J,EAAE6E,WACR2E,EAAMvJ,EAAE4E,WACR+E,GAAO5J,GACP6J,GAAO5J,EAGR,KAAM0J,IAAQH,EACb,MAAOxJ,KAAM8H,EAAM,GAClB7H,IAAM6H,EAAM,EACZ6B,EAAM,GACNH,EAAM,EACN5K,EACE8B,EAAS9B,EAAWoB,GAAMU,EAAS9B,EAAWqB,GAChD,CAGK,IAAK0J,IAAQH,EACnB,MAAO1C,IAAc9G,EAAGC,EAIzB8G,GAAM/G,CACN,OAAS+G,EAAMA,EAAIlC,WAClB+E,EAAGE,QAAS/C,EAEbA,GAAM9G,CACN,OAAS8G,EAAMA,EAAIlC,WAClBgF,EAAGC,QAAS/C,EAIb,OAAQ6C,EAAGzL,KAAO0L,EAAG1L,GACpBA,GAGD,OAAOA,GAEN2I,GAAc8C,EAAGzL,GAAI0L,EAAG1L,IAGxByL,EAAGzL,KAAOqB,EAAe,GACzBqK,EAAG1L,KAAOqB,EAAe,EACzB,GAGKsI,GA1WC/I,GA6WT+E,GAAO1E,QAAU,SAAU2K,EAAMC,GAChC,MAAOlG,IAAQiG,EAAM,KAAM,KAAMC,IAGlClG,GAAOkF,gBAAkB,SAAUpI,EAAMmJ,GASxC,IAPOnJ,EAAK8D,eAAiB9D,KAAW7B,GACvCD,EAAa8B,GAIdmJ,EAAOA,EAAK5I,QAASQ,EAAkB,aAElCvD,EAAQ4K,kBAAmB/J,GAC5BE,GAAkBA,EAAc+F,KAAM6E,IACtC7K,GAAkBA,EAAUgG,KAAM6E,IAErC,IACC,GAAIE,GAAM7K,EAAQmE,KAAM3C,EAAMmJ,EAG9B,IAAKE,GAAO7L,EAAQiL,mBAGlBzI,EAAK7B,UAAuC,KAA3B6B,EAAK7B,SAAS0E,SAChC,MAAOwG,GAEP,MAAOvG,IAGV,MAAOI,IAAQiG,EAAMhL,EAAU,MAAQ6B,IAASE,OAAS,GAG1DgD,GAAOzE,SAAW,SAAU2E,EAASpD,GAKpC,OAHOoD,EAAQU,eAAiBV,KAAcjF,GAC7CD,EAAakF,GAEP3E,EAAU2E,EAASpD,IAG3BkD,GAAOoG,KAAO,SAAUtJ,EAAMyG,IAEtBzG,EAAK8D,eAAiB9D,KAAW7B,GACvCD,EAAa8B,EAGd,IAAIwF,GAAK/H,EAAKwI,WAAYQ,EAAKjC,eAE9B+E,EAAM/D,GAAMjG,EAAOoD,KAAMlF,EAAKwI,WAAYQ,EAAKjC,eAC9CgB,EAAIxF,EAAMyG,GAAOpI,GACjBmL,MAEF,OAAeA,UAARD,EACNA,EACA/L,EAAQgD,aAAenC,EACtB2B,EAAKyE,aAAcgC,IAClB8C,EAAMvJ,EAAK+H,iBAAiBtB,KAAU8C,EAAIE,UAC1CF,EAAInE,MACJ,MAGJlC,GAAOwG,MAAQ,SAAUC,GACxB,KAAM,IAAIC,OAAO,0CAA4CD,IAO9DzG,GAAO2G,WAAa,SAAUxG,GAC7B,GAAIrD,GACH8J,KACA7G,EAAI,EACJ1F,EAAI,CAOL,IAJAU,GAAgBT,EAAQuM,iBACxB/L,GAAaR,EAAQwM,YAAc3G,EAAQxD,MAAO,GAClDwD,EAAQ4G,KAAM9K,GAETlB,EAAe,CACnB,MAAS+B,EAAOqD,EAAQ9F,KAClByC,IAASqD,EAAS9F,KACtB0F,EAAI6G,EAAWlK,KAAMrC,GAGvB,OAAQ0F,IACPI,EAAQ6G,OAAQJ,EAAY7G,GAAK,GAQnC,MAFAjF,GAAY,KAELqF,GAOR3F,EAAUwF,GAAOxF,QAAU,SAAUsC,GACpC,GAAI+G,GACHsC,EAAM,GACN9L,EAAI,EACJsF,EAAW7C,EAAK6C,QAEjB,IAAMA,GAMC,GAAkB,IAAbA,GAA+B,IAAbA,GAA+B,KAAbA,EAAkB,CAGjE,GAAiC,gBAArB7C,GAAKmK,YAChB,MAAOnK,GAAKmK,WAGZ,KAAMnK,EAAOA,EAAKoK,WAAYpK,EAAMA,EAAOA,EAAKsG,YAC/C+C,GAAO3L,EAASsC,OAGZ,IAAkB,IAAb6C,GAA+B,IAAbA,EAC7B,MAAO7C,GAAKqK,cAhBZ,OAAStD,EAAO/G,EAAKzC,KAEpB8L,GAAO3L,EAASqJ,EAkBlB,OAAOsC,IAGR5L,EAAOyF,GAAOoH,WAGbjF,YAAa,GAEbkF,aAAchF,GAEdhC,MAAOrC,EAEP+E,cAEA2B,QAEA4C,UACCC,KAAOC,IAAK,aAAcC,OAAO,GACjCC,KAAOF,IAAK,cACZG,KAAOH,IAAK,kBAAmBC,OAAO,GACtCG,KAAOJ,IAAK,oBAGbK,WACCzJ,KAAQ,SAAUiC,GAUjB,MATAA,GAAM,GAAKA,EAAM,GAAGhD,QAAS0B,GAAWC,IAGxCqB,EAAM,IAAOA,EAAM,IAAMA,EAAM,IAAMA,EAAM,IAAM,IAAKhD,QAAS0B,GAAWC,IAExD,OAAbqB,EAAM,KACVA,EAAM,GAAK,IAAMA,EAAM,GAAK,KAGtBA,EAAM1D,MAAO,EAAG,IAGxB2B,MAAS,SAAU+B,GA6BlB,MAlBAA,GAAM,GAAKA,EAAM,GAAGiB,cAEY,QAA3BjB,EAAM,GAAG1D,MAAO,EAAG,IAEjB0D,EAAM,IACXL,GAAOwG,MAAOnG,EAAM,IAKrBA,EAAM,KAAQA,EAAM,GAAKA,EAAM,IAAMA,EAAM,IAAM,GAAK,GAAmB,SAAbA,EAAM,IAA8B,QAAbA,EAAM,KACzFA,EAAM,KAAUA,EAAM,GAAKA,EAAM,IAAqB,QAAbA,EAAM,KAGpCA,EAAM,IACjBL,GAAOwG,MAAOnG,EAAM,IAGdA,GAGRhC,OAAU,SAAUgC,GACnB,GAAIyH,GACHC,GAAY1H,EAAM,IAAMA,EAAM,EAE/B,OAAKrC,GAAiB,MAAEoD,KAAMf,EAAM,IAC5B,MAIHA,EAAM,GACVA,EAAM,GAAKA,EAAM,IAAMA,EAAM,IAAM,GAGxB0H,GAAYjK,EAAQsD,KAAM2G,KAEpCD,EAASpN,EAAUqN,GAAU,MAE7BD,EAASC,EAASnL,QAAS,IAAKmL,EAAS/K,OAAS8K,GAAWC,EAAS/K,UAGvEqD,EAAM,GAAKA,EAAM,GAAG1D,MAAO,EAAGmL,GAC9BzH,EAAM,GAAK0H,EAASpL,MAAO,EAAGmL,IAIxBzH,EAAM1D,MAAO,EAAG,MAIzBgI,QAECxG,IAAO,SAAU6J,GAChB,GAAI3G,GAAW2G,EAAiB3K,QAAS0B,GAAWC,IAAYsC,aAChE,OAA4B,MAArB0G,EACN,WAAa,OAAO,GACpB,SAAUlL,GACT,MAAOA,GAAKuE,UAAYvE,EAAKuE,SAASC,gBAAkBD,IAI3DnD,MAAS,SAAUmG,GAClB,GAAI4D,GAAUpM,EAAYwI,EAAY,IAEtC,OAAO4D,KACLA,EAAU,GAAIxK,QAAQ,MAAQP,EAAa,IAAMmH,EAAY,IAAMnH,EAAa,SACjFrB,EAAYwI,EAAW,SAAUvH,GAChC,MAAOmL,GAAQ7G,KAAgC,gBAAnBtE,GAAKuH,WAA0BvH,EAAKuH,WAA0C,mBAAtBvH,GAAKyE,cAAgCzE,EAAKyE,aAAa,UAAY,OAI1JnD,KAAQ,SAAUmF,EAAM2E,EAAUC,GACjC,MAAO,UAAUrL,GAChB,GAAIsL,GAASpI,GAAOoG,KAAMtJ,EAAMyG,EAEhC,OAAe,OAAV6E,EACgB,OAAbF,EAEFA,GAINE,GAAU,GAEU,MAAbF,EAAmBE,IAAWD,EACvB,OAAbD,EAAoBE,IAAWD,EAClB,OAAbD,EAAoBC,GAAqC,IAA5BC,EAAOxL,QAASuL,GAChC,OAAbD,EAAoBC,GAASC,EAAOxL,QAASuL,GAAU,GAC1C,OAAbD,EAAoBC,GAASC,EAAOzL,OAAQwL,EAAMnL,UAAamL,EAClD,OAAbD,GAAsB,IAAME,EAAO/K,QAASG,EAAa,KAAQ,KAAMZ,QAASuL,GAAU,GAC7E,OAAbD,EAAoBE,IAAWD,GAASC,EAAOzL,MAAO,EAAGwL,EAAMnL,OAAS,KAAQmL,EAAQ,KACxF,IAZO,IAgBV7J,MAAS,SAAUgF,EAAM+E,EAAM3E,EAAU+D,EAAOa,GAC/C,GAAIC,GAAgC,QAAvBjF,EAAK3G,MAAO,EAAG,GAC3B6L,EAA+B,SAArBlF,EAAK3G,MAAO,IACtB8L,EAAkB,YAATJ,CAEV,OAAiB,KAAVZ,GAAwB,IAATa,EAGrB,SAAUxL,GACT,QAASA,EAAKiE,YAGf,SAAUjE,EAAMoD,EAASwI,GACxB,GAAI1G,GAAO2G,EAAY9E,EAAMX,EAAM0F,EAAWC,EAC7CrB,EAAMe,IAAWC,EAAU,cAAgB,kBAC3CzE,EAASjH,EAAKiE,WACdwC,EAAOkF,GAAU3L,EAAKuE,SAASC,cAC/BwH,GAAYJ,IAAQD,CAErB,IAAK1E,EAAS,CAGb,GAAKwE,EAAS,CACb,MAAQf,EAAM,CACb3D,EAAO/G,CACP,OAAS+G,EAAOA,EAAM2D,GACrB,GAAKiB,EAAS5E,EAAKxC,SAASC,gBAAkBiC,EAAyB,IAAlBM,EAAKlE,SACzD,OAAO,CAITkJ,GAAQrB,EAAe,SAATlE,IAAoBuF,GAAS,cAE5C,OAAO,EAMR,GAHAA,GAAUL,EAAUzE,EAAOmD,WAAanD,EAAOgF,WAG1CP,GAAWM,EAAW,CAE1BH,EAAa5E,EAAQvI,KAAcuI,EAAQvI,OAC3CwG,EAAQ2G,EAAYrF,OACpBsF,EAAY5G,EAAM,KAAOrG,GAAWqG,EAAM,GAC1CkB,EAAOlB,EAAM,KAAOrG,GAAWqG,EAAM,GACrC6B,EAAO+E,GAAa7E,EAAOrE,WAAYkJ,EAEvC,OAAS/E,IAAS+E,GAAa/E,GAAQA,EAAM2D,KAG3CtE,EAAO0F,EAAY,IAAMC,EAAMrM,MAGhC,GAAuB,IAAlBqH,EAAKlE,YAAoBuD,GAAQW,IAAS/G,EAAO,CACrD6L,EAAYrF,IAAW3H,EAASiN,EAAW1F,EAC3C,YAKI,IAAK4F,IAAa9G,GAASlF,EAAMtB,KAAcsB,EAAMtB,QAAkB8H,KAAWtB,EAAM,KAAOrG,EACrGuH,EAAOlB,EAAM,OAKb,OAAS6B,IAAS+E,GAAa/E,GAAQA,EAAM2D,KAC3CtE,EAAO0F,EAAY,IAAMC,EAAMrM,MAEhC,IAAOiM,EAAS5E,EAAKxC,SAASC,gBAAkBiC,EAAyB,IAAlBM,EAAKlE,aAAsBuD,IAE5E4F,KACHjF,EAAMrI,KAAcqI,EAAMrI,QAAkB8H,IAAW3H,EAASuH,IAG7DW,IAAS/G,GACb,KAQJ,OADAoG,IAAQoF,EACDpF,IAASuE,GAAWvE,EAAOuE,IAAU,GAAKvE,EAAOuE,GAAS,KAKrEpJ,OAAU,SAAU2K,EAAQtF,GAK3B,GAAIuF,GACH3G,EAAK/H,EAAKgD,QAASyL,IAAYzO,EAAK2O,WAAYF,EAAO1H,gBACtDtB,GAAOwG,MAAO,uBAAyBwC,EAKzC,OAAK1G,GAAI9G,GACD8G,EAAIoB,GAIPpB,EAAGtF,OAAS,GAChBiM,GAASD,EAAQA,EAAQ,GAAItF,GACtBnJ,EAAK2O,WAAW5M,eAAgB0M,EAAO1H,eAC7Ce,GAAa,SAAUjC,EAAM9E,GAC5B,GAAI6N,GACHC,EAAU9G,EAAIlC,EAAMsD,GACpBrJ,EAAI+O,EAAQpM,MACb,OAAQ3C,IACP8O,EAAMvM,EAASwD,EAAMgJ,EAAQ/O,IAC7B+F,EAAM+I,KAAW7N,EAAS6N,GAAQC,EAAQ/O,MAG5C,SAAUyC,GACT,MAAOwF,GAAIxF,EAAM,EAAGmM,KAIhB3G,IAIT/E,SAEC8L,IAAOhH,GAAa,SAAUpC,GAI7B,GAAIgF,MACH9E,KACAmJ,EAAU3O,EAASsF,EAAS5C,QAASK,EAAO,MAE7C,OAAO4L,GAAS9N,GACf6G,GAAa,SAAUjC,EAAM9E,EAAS4E,EAASwI,GAC9C,GAAI5L,GACHyM,EAAYD,EAASlJ,EAAM,KAAMsI,MACjCrO,EAAI+F,EAAKpD,MAGV,OAAQ3C,KACDyC,EAAOyM,EAAUlP,MACtB+F,EAAK/F,KAAOiB,EAAQjB,GAAKyC,MAI5B,SAAUA,EAAMoD,EAASwI,GAKxB,MAJAzD,GAAM,GAAKnI,EACXwM,EAASrE,EAAO,KAAMyD,EAAKvI,GAE3B8E,EAAM,GAAK,MACH9E,EAAQ3D,SAInBgN,IAAOnH,GAAa,SAAUpC,GAC7B,MAAO,UAAUnD,GAChB,MAAOkD,IAAQC,EAAUnD,GAAOE,OAAS,KAI3CzB,SAAY8G,GAAa,SAAUoH,GAElC,MADAA,GAAOA,EAAKpM,QAAS0B,GAAWC,IACzB,SAAUlC,GAChB,OAASA,EAAKmK,aAAenK,EAAK4M,WAAalP,EAASsC,IAASF,QAAS6M,GAAS,MAWrFE,KAAQtH,GAAc,SAAUsH,GAM/B,MAJM5L,GAAYqD,KAAKuI,GAAQ,KAC9B3J,GAAOwG,MAAO,qBAAuBmD,GAEtCA,EAAOA,EAAKtM,QAAS0B,GAAWC,IAAYsC,cACrC,SAAUxE,GAChB,GAAI8M,EACJ,GACC,IAAMA,EAAWzO,EAChB2B,EAAK6M,KACL7M,EAAKyE,aAAa,aAAezE,EAAKyE,aAAa,QAGnD,MADAqI,GAAWA,EAAStI,cACbsI,IAAaD,GAA2C,IAAnCC,EAAShN,QAAS+M,EAAO,YAE5C7M,EAAOA,EAAKiE,aAAiC,IAAlBjE,EAAK6C,SAC3C,QAAO,KAKTE,OAAU,SAAU/C,GACnB,GAAI+M,GAAOzP,EAAO0P,UAAY1P,EAAO0P,SAASD,IAC9C,OAAOA,IAAQA,EAAKlN,MAAO,KAAQG,EAAKkE,IAGzC+I,KAAQ,SAAUjN,GACjB,MAAOA,KAAS5B,GAGjB8O,MAAS,SAAUlN,GAClB,MAAOA,KAAS7B,EAASgP,iBAAmBhP,EAASiP,UAAYjP,EAASiP,gBAAkBpN,EAAKwG,MAAQxG,EAAKqN,OAASrN,EAAKsN,WAI7HC,QAAW,SAAUvN,GACpB,MAAOA,GAAKwN,YAAa,GAG1BA,SAAY,SAAUxN,GACrB,MAAOA,GAAKwN,YAAa,GAG1BC,QAAW,SAAUzN,GAGpB,GAAIuE,GAAWvE,EAAKuE,SAASC,aAC7B,OAAqB,UAAbD,KAA0BvE,EAAKyN,SAA0B,WAAblJ,KAA2BvE,EAAK0N,UAGrFA,SAAY,SAAU1N,GAOrB,MAJKA,GAAKiE,YACTjE,EAAKiE,WAAW0J,cAGV3N,EAAK0N,YAAa,GAI1BE,MAAS,SAAU5N,GAKlB,IAAMA,EAAOA,EAAKoK,WAAYpK,EAAMA,EAAOA,EAAKsG,YAC/C,GAAKtG,EAAK6C,SAAW,EACpB,OAAO,CAGT,QAAO,GAGRoE,OAAU,SAAUjH,GACnB,OAAQvC,EAAKgD,QAAe,MAAGT,IAIhC6N,OAAU,SAAU7N,GACnB,MAAO4B,GAAQ0C,KAAMtE,EAAKuE,WAG3B4D,MAAS,SAAUnI,GAClB,MAAO2B,GAAQ2C,KAAMtE,EAAKuE,WAG3BuJ,OAAU,SAAU9N,GACnB,GAAIyG,GAAOzG,EAAKuE,SAASC,aACzB,OAAgB,UAATiC,GAAkC,WAAdzG,EAAKwG,MAA8B,WAATC,GAGtDkG,KAAQ,SAAU3M,GACjB,GAAIsJ,EACJ,OAAuC,UAAhCtJ,EAAKuE,SAASC,eACN,SAAdxE,EAAKwG,OAImC,OAArC8C,EAAOtJ,EAAKyE,aAAa,UAA2C,SAAvB6E,EAAK9E,gBAIvDmG,MAAShE,GAAuB,WAC/B,OAAS,KAGV6E,KAAQ7E,GAAuB,SAAUE,EAAc3G,GACtD,OAASA,EAAS,KAGnB6N,GAAMpH,GAAuB,SAAUE,EAAc3G,EAAQ0G,GAC5D,OAAoB,EAAXA,EAAeA,EAAW1G,EAAS0G,KAG7CoH,KAAQrH,GAAuB,SAAUE,EAAc3G,GAEtD,IADA,GAAI3C,GAAI,EACI2C,EAAJ3C,EAAYA,GAAK,EACxBsJ,EAAajH,KAAMrC,EAEpB,OAAOsJ,KAGRoH,IAAOtH,GAAuB,SAAUE,EAAc3G,GAErD,IADA,GAAI3C,GAAI,EACI2C,EAAJ3C,EAAYA,GAAK,EACxBsJ,EAAajH,KAAMrC,EAEpB,OAAOsJ,KAGRqH,GAAMvH,GAAuB,SAAUE,EAAc3G,EAAQ0G,GAE5D,IADA,GAAIrJ,GAAe,EAAXqJ,EAAeA,EAAW1G,EAAS0G,IACjCrJ,GAAK,GACdsJ,EAAajH,KAAMrC,EAEpB,OAAOsJ,KAGRsH,GAAMxH,GAAuB,SAAUE,EAAc3G,EAAQ0G,GAE5D,IADA,GAAIrJ,GAAe,EAAXqJ,EAAeA,EAAW1G,EAAS0G,IACjCrJ,EAAI2C,GACb2G,EAAajH,KAAMrC,EAEpB,OAAOsJ,OAKVpJ,EAAKgD,QAAa,IAAIhD,EAAKgD,QAAY,EAGvC,KAAMlD,KAAO6Q,OAAO,EAAMC,UAAU,EAAMC,MAAM,EAAMC,UAAU,EAAMC,OAAO,GAC5E/Q,EAAKgD,QAASlD,GAAMgJ,GAAmBhJ,EAExC,KAAMA,KAAOkR,QAAQ,EAAMC,OAAO,GACjCjR,EAAKgD,QAASlD,GAAMmJ,GAAoBnJ,EAIzC,SAAS6O,OACTA,GAAWuC,UAAYlR,EAAKmR,QAAUnR,EAAKgD,QAC3ChD,EAAK2O,WAAa,GAAIA,IAEtBxO,EAAWsF,GAAOtF,SAAW,SAAUuF,EAAU0L,GAChD,GAAIvC,GAAS/I,EAAOuL,EAAQtI,EAC3BuI,EAAOtL,EAAQuL,EACfC,EAAShQ,EAAYkE,EAAW,IAEjC,IAAK8L,EACJ,MAAOJ,GAAY,EAAII,EAAOpP,MAAO,EAGtCkP,GAAQ5L,EACRM,KACAuL,EAAavR,EAAKsN,SAElB,OAAQgE,EAAQ,GAGTzC,IAAY/I,EAAQ1C,EAAOkD,KAAMgL,OACjCxL,IAEJwL,EAAQA,EAAMlP,MAAO0D,EAAM,GAAGrD,SAAY6O,GAE3CtL,EAAO7D,KAAOkP,OAGfxC,GAAU,GAGJ/I,EAAQzC,EAAaiD,KAAMgL,MAChCzC,EAAU/I,EAAM+B,QAChBwJ,EAAOlP,MACNwF,MAAOkH,EAEP9F,KAAMjD,EAAM,GAAGhD,QAASK,EAAO,OAEhCmO,EAAQA,EAAMlP,MAAOyM,EAAQpM,QAI9B,KAAMsG,IAAQ/I,GAAKoK,SACZtE,EAAQrC,EAAWsF,GAAOzC,KAAMgL,KAAcC,EAAYxI,MAC9DjD,EAAQyL,EAAYxI,GAAQjD,MAC7B+I,EAAU/I,EAAM+B,QAChBwJ,EAAOlP,MACNwF,MAAOkH,EACP9F,KAAMA,EACNhI,QAAS+E,IAEVwL,EAAQA,EAAMlP,MAAOyM,EAAQpM,QAI/B,KAAMoM,EACL,MAOF,MAAOuC,GACNE,EAAM7O,OACN6O,EACC7L,GAAOwG,MAAOvG,GAEdlE,EAAYkE,EAAUM,GAAS5D,MAAO,GAGzC,SAAS8E,IAAYmK,GAIpB,IAHA,GAAIvR,GAAI,EACP0C,EAAM6O,EAAO5O,OACbiD,EAAW,GACAlD,EAAJ1C,EAASA,IAChB4F,GAAY2L,EAAOvR,GAAG6H,KAEvB,OAAOjC,GAGR,QAAS+L,IAAe1C,EAAS2C,EAAYC,GAC5C,GAAI1E,GAAMyE,EAAWzE,IACpB2E,EAAmBD,GAAgB,eAAR1E,EAC3B4E,EAAWxQ,GAEZ,OAAOqQ,GAAWxE,MAEjB,SAAU3K,EAAMoD,EAASwI,GACxB,MAAS5L,EAAOA,EAAM0K,GACrB,GAAuB,IAAlB1K,EAAK6C,UAAkBwM,EAC3B,MAAO7C,GAASxM,EAAMoD,EAASwI,IAMlC,SAAU5L,EAAMoD,EAASwI,GACxB,GAAI2D,GAAU1D,EACb2D,GAAa3Q,EAASyQ,EAGvB,IAAK1D,GACJ,MAAS5L,EAAOA,EAAM0K,GACrB,IAAuB,IAAlB1K,EAAK6C,UAAkBwM,IACtB7C,EAASxM,EAAMoD,EAASwI,GAC5B,OAAO,MAKV,OAAS5L,EAAOA,EAAM0K,GACrB,GAAuB,IAAlB1K,EAAK6C,UAAkBwM,EAAmB,CAE9C,GADAxD,EAAa7L,EAAMtB,KAAcsB,EAAMtB,QACjC6Q,EAAW1D,EAAYnB,KAC5B6E,EAAU,KAAQ1Q,GAAW0Q,EAAU,KAAQD,EAG/C,MAAQE,GAAU,GAAMD,EAAU,EAMlC,IAHA1D,EAAYnB,GAAQ8E,EAGdA,EAAU,GAAMhD,EAASxM,EAAMoD,EAASwI,GAC7C,OAAO,IASf,QAAS6D,IAAgBC,GACxB,MAAOA,GAASxP,OAAS,EACxB,SAAUF,EAAMoD,EAASwI,GACxB,GAAIrO,GAAImS,EAASxP,MACjB,OAAQ3C,IACP,IAAMmS,EAASnS,GAAIyC,EAAMoD,EAASwI,GACjC,OAAO,CAGT,QAAO,GAER8D,EAAS,GAGX,QAASC,IAAkBxM,EAAUyM,EAAUvM,GAG9C,IAFA,GAAI9F,GAAI,EACP0C,EAAM2P,EAAS1P,OACJD,EAAJ1C,EAASA,IAChB2F,GAAQC,EAAUyM,EAASrS,GAAI8F,EAEhC,OAAOA,GAGR,QAASwM,IAAUpD,EAAWqD,EAAKjI,EAAQzE,EAASwI,GAOnD,IANA,GAAI5L,GACH+P,KACAxS,EAAI,EACJ0C,EAAMwM,EAAUvM,OAChB8P,EAAgB,MAAPF,EAEE7P,EAAJ1C,EAASA,KACVyC,EAAOyM,EAAUlP,OAChBsK,GAAUA,EAAQ7H,EAAMoD,EAASwI,MACtCmE,EAAanQ,KAAMI,GACdgQ,GACJF,EAAIlQ,KAAMrC,GAMd,OAAOwS,GAGR,QAASE,IAAYlF,EAAW5H,EAAUqJ,EAAS0D,EAAYC,EAAYC,GAO1E,MANKF,KAAeA,EAAYxR,KAC/BwR,EAAaD,GAAYC,IAErBC,IAAeA,EAAYzR,KAC/ByR,EAAaF,GAAYE,EAAYC,IAE/B7K,GAAa,SAAUjC,EAAMD,EAASD,EAASwI,GACrD,GAAIyE,GAAM9S,EAAGyC,EACZsQ,KACAC,KACAC,EAAcnN,EAAQnD,OAGtBuQ,EAAQnN,GAAQqM,GAAkBxM,GAAY,IAAKC,EAAQP,UAAaO,GAAYA,MAGpFsN,GAAY3F,IAAezH,GAASH,EAEnCsN,EADAZ,GAAUY,EAAOH,EAAQvF,EAAW3H,EAASwI,GAG9C+E,EAAanE,EAEZ2D,IAAgB7M,EAAOyH,EAAYyF,GAAeN,MAMjD7M,EACDqN,CAQF,IALKlE,GACJA,EAASkE,EAAWC,EAAYvN,EAASwI,GAIrCsE,EAAa,CACjBG,EAAOR,GAAUc,EAAYJ,GAC7BL,EAAYG,KAAUjN,EAASwI,GAG/BrO,EAAI8S,EAAKnQ,MACT,OAAQ3C,KACDyC,EAAOqQ,EAAK9S,MACjBoT,EAAYJ,EAAQhT,MAASmT,EAAWH,EAAQhT,IAAOyC,IAK1D,GAAKsD,GACJ,GAAK6M,GAAcpF,EAAY,CAC9B,GAAKoF,EAAa,CAEjBE,KACA9S,EAAIoT,EAAWzQ,MACf,OAAQ3C,KACDyC,EAAO2Q,EAAWpT,KAEvB8S,EAAKzQ,KAAO8Q,EAAUnT,GAAKyC,EAG7BmQ,GAAY,KAAOQ,KAAkBN,EAAMzE,GAI5CrO,EAAIoT,EAAWzQ,MACf,OAAQ3C,KACDyC,EAAO2Q,EAAWpT,MACtB8S,EAAOF,EAAarQ,EAASwD,EAAMtD,GAASsQ,EAAO/S,IAAM,KAE1D+F,EAAK+M,KAAUhN,EAAQgN,GAAQrQ,SAOlC2Q,GAAad,GACZc,IAAetN,EACdsN,EAAWzG,OAAQsG,EAAaG,EAAWzQ,QAC3CyQ,GAEGR,EACJA,EAAY,KAAM9M,EAASsN,EAAY/E,GAEvChM,EAAK8C,MAAOW,EAASsN,KAMzB,QAASC,IAAmB9B,GAwB3B,IAvBA,GAAI+B,GAAcrE,EAASvJ,EAC1BhD,EAAM6O,EAAO5O,OACb4Q,EAAkBrT,EAAK+M,SAAUsE,EAAO,GAAGtI,MAC3CuK,EAAmBD,GAAmBrT,EAAK+M,SAAS,KACpDjN,EAAIuT,EAAkB,EAAI,EAG1BE,EAAe9B,GAAe,SAAUlP,GACvC,MAAOA,KAAS6Q,GACdE,GAAkB,GACrBE,EAAkB/B,GAAe,SAAUlP,GAC1C,MAAOF,GAAS+Q,EAAc7Q,GAAS,IACrC+Q,GAAkB,GACrBrB,GAAa,SAAU1P,EAAMoD,EAASwI,GACrC,GAAIvC,IAASyH,IAAqBlF,GAAOxI,IAAYrF,MACnD8S,EAAezN,GAASP,SACxBmO,EAAchR,EAAMoD,EAASwI,GAC7BqF,EAAiBjR,EAAMoD,EAASwI,GAGlC,OADAiF,GAAe,KACRxH,IAGGpJ,EAAJ1C,EAASA,IAChB,GAAMiP,EAAU/O,EAAK+M,SAAUsE,EAAOvR,GAAGiJ,MACxCkJ,GAAaR,GAAcO,GAAgBC,GAAYlD,QACjD,CAIN,GAHAA,EAAU/O,EAAKoK,OAAQiH,EAAOvR,GAAGiJ,MAAO9D,MAAO,KAAMoM,EAAOvR,GAAGiB,SAG1DgO,EAAS9N,GAAY,CAGzB,IADAuE,IAAM1F,EACM0C,EAAJgD,EAASA,IAChB,GAAKxF,EAAK+M,SAAUsE,EAAO7L,GAAGuD,MAC7B,KAGF,OAAOyJ,IACN1S,EAAI,GAAKkS,GAAgBC,GACzBnS,EAAI,GAAKoH,GAERmK,EAAOjP,MAAO,EAAGtC,EAAI,GAAI2T,QAAS9L,MAAgC,MAAzB0J,EAAQvR,EAAI,GAAIiJ,KAAe,IAAM,MAC7EjG,QAASK,EAAO,MAClB4L,EACIvJ,EAAJ1F,GAASqT,GAAmB9B,EAAOjP,MAAOtC,EAAG0F,IACzChD,EAAJgD,GAAW2N,GAAoB9B,EAASA,EAAOjP,MAAOoD,IAClDhD,EAAJgD,GAAW0B,GAAYmK,IAGzBY,EAAS9P,KAAM4M,GAIjB,MAAOiD,IAAgBC,GAGxB,QAASyB,IAA0BC,EAAiBC,GACnD,GAAIC,GAAQD,EAAYnR,OAAS,EAChCqR,EAAYH,EAAgBlR,OAAS,EACrCsR,EAAe,SAAUlO,EAAMF,EAASwI,EAAKvI,EAASoO,GACrD,GAAIzR,GAAMiD,EAAGuJ,EACZkF,EAAe,EACfnU,EAAI,IACJkP,EAAYnJ,MACZqO,KACAC,EAAgB7T,EAEhB0S,EAAQnN,GAAQiO,GAAa9T,EAAKmK,KAAU,IAAG,IAAK6J,GAEpDI,EAAiBhT,GAA4B,MAAjB+S,EAAwB,EAAIE,KAAKC,UAAY,GACzE9R,EAAMwQ,EAAMvQ,MAUb,KARKuR,IACJ1T,EAAmBqF,IAAYjF,GAAYiF,GAOpC7F,IAAM0C,GAA4B,OAApBD,EAAOyQ,EAAMlT,IAAaA,IAAM,CACrD,GAAKgU,GAAavR,EAAO,CACxBiD,EAAI,CACJ,OAASuJ,EAAU4E,EAAgBnO,KAClC,GAAKuJ,EAASxM,EAAMoD,EAASwI,GAAQ,CACpCvI,EAAQzD,KAAMI,EACd,OAGGyR,IACJ5S,EAAUgT,GAKPP,KAEEtR,GAAQwM,GAAWxM,IACxB0R,IAIIpO,GACJmJ,EAAU7M,KAAMI,IAOnB,GADA0R,GAAgBnU,EACX+T,GAAS/T,IAAMmU,EAAe,CAClCzO,EAAI,CACJ,OAASuJ,EAAU6E,EAAYpO,KAC9BuJ,EAASC,EAAWkF,EAAYvO,EAASwI,EAG1C,IAAKtI,EAAO,CAEX,GAAKoO,EAAe,EACnB,MAAQnU,IACAkP,EAAUlP,IAAMoU,EAAWpU,KACjCoU,EAAWpU,GAAKmC,EAAIiD,KAAMU,GAM7BsO,GAAa9B,GAAU8B,GAIxB/R,EAAK8C,MAAOW,EAASsO,GAGhBF,IAAcnO,GAAQqO,EAAWzR,OAAS,GAC5CwR,EAAeL,EAAYnR,OAAW,GAExCgD,GAAO2G,WAAYxG,GAUrB,MALKoO,KACJ5S,EAAUgT,EACV9T,EAAmB6T,GAGbnF,EAGT,OAAO6E,GACN/L,GAAciM,GACdA,EAGF3T,EAAUqF,GAAOrF,QAAU,SAAUsF,EAAUI,GAC9C,GAAIhG,GACH8T,KACAD,KACAnC,EAAS/P,EAAeiE,EAAW,IAEpC,KAAM8L,EAAS,CAER1L,IACLA,EAAQ3F,EAAUuF,IAEnB5F,EAAIgG,EAAMrD,MACV,OAAQ3C,IACP0R,EAAS2B,GAAmBrN,EAAMhG,IAC7B0R,EAAQvQ,GACZ2S,EAAYzR,KAAMqP,GAElBmC,EAAgBxR,KAAMqP,EAKxBA,GAAS/P,EAAeiE,EAAUgO,GAA0BC,EAAiBC,IAG7EpC,EAAO9L,SAAWA,EAEnB,MAAO8L,IAYRnR,EAASoF,GAAOpF,OAAS,SAAUqF,EAAUC,EAASC,EAASC,GAC9D,GAAI/F,GAAGuR,EAAQkD,EAAOxL,EAAMoB,EAC3BqK,EAA+B,kBAAb9O,IAA2BA,EAC7CI,GAASD,GAAQ1F,EAAWuF,EAAW8O,EAAS9O,UAAYA,EAK7D,IAHAE,EAAUA,MAGY,IAAjBE,EAAMrD,OAAe,CAIzB,GADA4O,EAASvL,EAAM,GAAKA,EAAM,GAAG1D,MAAO,GAC/BiP,EAAO5O,OAAS,GAAkC,QAA5B8R,EAAQlD,EAAO,IAAItI,MAC5ChJ,EAAQkK,SAAgC,IAArBtE,EAAQP,UAAkBxE,GAC7CZ,EAAK+M,SAAUsE,EAAO,GAAGtI,MAAS,CAGnC,GADApD,GAAY3F,EAAKmK,KAAS,GAAGoK,EAAMxT,QAAQ,GAAG+B,QAAQ0B,GAAWC,IAAYkB,QAAkB,IACzFA,EACL,MAAOC,EAGI4O,KACX7O,EAAUA,EAAQa,YAGnBd,EAAWA,EAAStD,MAAOiP,EAAOxJ,QAAQF,MAAMlF,QAIjD3C,EAAI2D,EAAwB,aAAEoD,KAAMnB,GAAa,EAAI2L,EAAO5O,MAC5D,OAAQ3C,IAAM,CAIb,GAHAyU,EAAQlD,EAAOvR,GAGVE,EAAK+M,SAAWhE,EAAOwL,EAAMxL,MACjC,KAED,KAAMoB,EAAOnK,EAAKmK,KAAMpB,MAEjBlD,EAAOsE,EACZoK,EAAMxT,QAAQ,GAAG+B,QAAS0B,GAAWC,IACrCH,GAASuC,KAAMwK,EAAO,GAAGtI,OAAU5B,GAAaxB,EAAQa,aAAgBb,IACpE,CAKJ,GAFA0L,EAAO5E,OAAQ3M,EAAG,GAClB4F,EAAWG,EAAKpD,QAAUyE,GAAYmK,IAChC3L,EAEL,MADAvD,GAAK8C,MAAOW,EAASC,GACdD,CAGR,SAeJ,OAPE4O,GAAYpU,EAASsF,EAAUI,IAChCD,EACAF,GACC/E,EACDgF,EACAtB,GAASuC,KAAMnB,IAAcyB,GAAaxB,EAAQa,aAAgBb,GAE5DC,GAMR7F,EAAQwM,WAAatL,EAAQsH,MAAM,IAAIiE,KAAM9K,GAAY0F,KAAK,MAAQnG,EAItElB,EAAQuM,mBAAqB9L,EAG7BC,IAIAV,EAAQsL,aAAerD,GAAO,SAAUyM,GAEvC,MAAuE,GAAhEA,EAAKxJ,wBAAyBvK,EAASwH,cAAc,UAMvDF,GAAO,SAAUC,GAEtB,MADAA,GAAIwC,UAAY,mBAC+B,MAAxCxC,EAAI0E,WAAW3F,aAAa,WAEnCoB,GAAW,yBAA0B,SAAU7F,EAAMyG,EAAM9I,GAC1D,MAAMA,GAAN,OACQqC,EAAKyE,aAAcgC,EAA6B,SAAvBA,EAAKjC,cAA2B,EAAI,KAOjEhH,EAAQgD,YAAeiF,GAAO,SAAUC,GAG7C,MAFAA,GAAIwC,UAAY,WAChBxC,EAAI0E,WAAW1F,aAAc,QAAS,IACY,KAA3CgB,EAAI0E,WAAW3F,aAAc,YAEpCoB,GAAW,QAAS,SAAU7F,EAAMyG,EAAM9I,GACzC,MAAMA,IAAyC,UAAhCqC,EAAKuE,SAASC,cAA7B,OACQxE,EAAKmS,eAOT1M,GAAO,SAAUC,GACtB,MAAuC,OAAhCA,EAAIjB,aAAa,eAExBoB,GAAW1F,EAAU,SAAUH,EAAMyG,EAAM9I,GAC1C,GAAI4L,EACJ,OAAM5L,GAAN,OACQqC,EAAMyG,MAAW,EAAOA,EAAKjC,eACjC+E,EAAMvJ,EAAK+H,iBAAkBtB,KAAW8C,EAAIE,UAC7CF,EAAInE,MACL,OAMmB,kBAAXgN,SAAyBA,OAAOC,IAC3CD,OAAO,WAAa,MAAOlP,MAEE,mBAAXoP,SAA0BA,OAAOC,QACnDD,OAAOC,QAAUrP,GAEjB5F,EAAO4F,OAASA,IAIb5F"}
\ No newline at end of file
diff --git a/#pma/js/jquery/src/jquery/sizzle/test/data/empty.js b/#pma/js/jquery/src/jquery/sizzle/test/data/empty.js
deleted file mode 100644
index e69de29b..00000000
diff --git a/#pma/js/jquery/src/jquery/sizzle/test/data/mixed_sort.html b/#pma/js/jquery/src/jquery/sizzle/test/data/mixed_sort.html
deleted file mode 100644
index 162e3550..00000000
--- a/#pma/js/jquery/src/jquery/sizzle/test/data/mixed_sort.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<script>var QUnit = parent.QUnit</script>
-	<script src="testinit.js"></script>
-	<script src="../../dist/sizzle.js"></script>
-</head>
-<body>
-	<script>
-		var doc = parent.document,
-			unframed = [ doc.getElementById( "qunit-fixture" ), doc.body, doc.documentElement ],
-			framed = Sizzle( "*" );
-
-		window.parent.iframeCallback(
-			Sizzle.uniqueSort( unframed.concat( framed ) ),
-			framed.concat( unframed.reverse() ),
-			"Mixed array was sorted correctly"
-		);
-	</script>
-</body>
-</html>
diff --git a/#pma/js/jquery/src/jquery/sizzle/test/data/testinit.js b/#pma/js/jquery/src/jquery/sizzle/test/data/testinit.js
deleted file mode 100644
index 1c49c7ab..00000000
--- a/#pma/js/jquery/src/jquery/sizzle/test/data/testinit.js
+++ /dev/null
@@ -1,136 +0,0 @@
-var fireNative,
-	jQuery = this.jQuery || "jQuery", // For testing .noConflict()
-	$ = this.$ || "$",
-	originaljQuery = jQuery,
-	original$ = $;
-
-(function() {
-	// Config parameter to force basic code paths
-	QUnit.config.urlConfig.push({
-		id: "basic",
-		label: "Bypass optimizations",
-		tooltip: "Force use of the most basic code by disabling native querySelectorAll; contains; compareDocumentPosition"
-	});
-	if ( QUnit.urlParams.basic ) {
-		document.querySelectorAll = null;
-		document.documentElement.contains = null;
-		document.documentElement.compareDocumentPosition = null;
-		// Return array of length two to pass assertion
-		// But support should be false as its not native
-		document.getElementsByClassName = function() { return [ 0, 1 ]; };
-	}
-})();
-
-/**
- * Returns an array of elements with the given IDs
- * @example q("main", "foo", "bar")
- * @result [<div id="main">, <span id="foo">, <input id="bar">]
- */
-function q() {
-	var r = [],
-		i = 0;
-
-	for ( ; i < arguments.length; i++ ) {
-		r.push( document.getElementById( arguments[i] ) );
-	}
-	return r;
-}
-
-/**
- * Asserts that a select matches the given IDs
- * @param {String} a - Assertion name
- * @param {String} b - Sizzle selector
- * @param {String} c - Array of ids to construct what is expected
- * @example t("Check for something", "//[a]", ["foo", "baar"]);
- * @result returns true if "//[a]" return two elements with the IDs 'foo' and 'baar'
- */
-function t( a, b, c ) {
-	var f = Sizzle(b),
-		s = "",
-		i = 0;
-
-	for ( ; i < f.length; i++ ) {
-		s += ( s && "," ) + '"' + f[ i ].id + '"';
-	}
-
-	deepEqual(f, q.apply( q, c ), a + " (" + b + ")");
-}
-
-/**
- * Add random number to url to stop caching
- *
- * @example url("data/test.html")
- * @result "data/test.html?10538358428943"
- *
- * @example url("data/test.php?foo=bar")
- * @result "data/test.php?foo=bar&10538358345554"
- */
-function url( value ) {
-	return value + (/\?/.test(value) ? "&" : "?") + new Date().getTime() + "" + parseInt(Math.random()*100000);
-}
-
-var createWithFriesXML = function() {
-	var string = '<?xml version="1.0" encoding="UTF-8"?> \
-	<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" \
-		xmlns:xsd="http://www.w3.org/2001/XMLSchema" \
-		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> \
-		<soap:Body> \
-			<jsconf xmlns="http://www.example.com/ns1"> \
-				<response xmlns:ab="http://www.example.com/ns2"> \
-					<meta> \
-						<component id="seite1" class="component"> \
-							<properties xmlns:cd="http://www.example.com/ns3"> \
-								<property name="prop1"> \
-									<thing /> \
-									<value>1</value> \
-								</property> \
-								<property name="prop2"> \
-									<thing att="something" /> \
-								</property> \
-								<foo_bar>foo</foo_bar> \
-							</properties> \
-						</component> \
-					</meta> \
-				</response> \
-			</jsconf> \
-		</soap:Body> \
-	</soap:Envelope>';
-
-	return jQuery.parseXML( string );
-};
-
-fireNative = document.createEvent ?
-	function( node, type ) {
-		var event = document.createEvent("HTMLEvents");
-		event.initEvent( type, true, true );
-		node.dispatchEvent( event );
-	} :
-	function( node, type ) {
-		var event = document.createEventObject();
-		node.fireEvent( "on" + type, event );
-	};
-
-function testIframeWithCallback( title, fileName, func ) {
-	test( title, function() {
-		var iframe;
-
-		stop();
-		window.iframeCallback = function() {
-			var self = this,
-				args = arguments;
-			setTimeout(function() {
-				window.iframeCallback = undefined;
-				iframe.remove();
-				func.apply( self, args );
-				func = function() {};
-				start();
-			}, 0 );
-		};
-		iframe = jQuery( "<div/>" ).css({ position: "absolute", width: "500px", left: "-600px" })
-			.append( jQuery( "<iframe/>" ).attr( "src", url( "./data/" + fileName ) ) )
-			.appendTo( "#qunit-fixture" );
-	});
-};
-window.iframeCallback = undefined;
-
-function moduleTeardown() {}
diff --git a/#pma/js/jquery/src/jquery/sizzle/test/index.html b/#pma/js/jquery/src/jquery/sizzle/test/index.html
deleted file mode 100644
index 402e8671..00000000
--- a/#pma/js/jquery/src/jquery/sizzle/test/index.html
+++ /dev/null
@@ -1,242 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr" id="html">
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<title>Sizzle Test Suite</title>
-	<link rel="Stylesheet" media="screen" href="libs/qunit/qunit.css" />
-	<script type="text/javascript" src="libs/qunit/qunit.js"></script>
-	<script type="text/javascript" src="data/testinit.js"></script>
-	<script type="text/javascript" src="jquery.js"></script>
-	<script type="text/javascript" src="../dist/sizzle.js"></script>
-	<script type="text/javascript" src="unit/selector.js"></script>
-	<script type="text/javascript" src="unit/utilities.js"></script>
-	<script type="text/javascript" src="unit/extending.js"></script>
-</head>
-
-<body id="body">
-	<div id="qunit"></div>
-
-	<!-- Test HTML -->
-	<dl id="dl" style="position:absolute;top:-32767px;left:-32767px;width:1px">
-	<div id="qunit-fixture">
-		<p id="firstp">See <a id="simon1" href="http://simon.incutio.com/archive/2003/03/25/#getElementsBySelector" rel="bookmark">this blog entry</a> for more information.</p>
-		<p id="ap">
-			Here are some [links] in a normal paragraph: <a id="google" href="http://www.google.com/" title="Google!">Google</a>,
-			<a id="groups" href="http://groups.google.com/" class="GROUPS">Google Groups (Link)</a>.
-			This link has <code id="code1"><a href="http://smin" id="anchor1">class="blog"</a></code>:
-			<a href="http://diveintomark.org/" class="blog" hreflang="en" id="mark">diveintomark</a>
-
-		</p>
-		<div id="foo">
-			<p id="sndp">Everything inside the red border is inside a div with <code>id="foo"</code>.</p>
-			<p lang="en" id="en">This is a normal link: <a id="yahoo" href="http://www.yahoo.com/" class="blogTest">Yahoo</a></p>
-			<p id="sap">This link has <code><a href="#2" id="anchor2">class="blog"</a></code>: <a href="http://simon.incutio.com/" class="blog link" id="simon">Simon Willison's Weblog</a></p>
-
-		</div>
-		<div id="nothiddendiv" style="height:1px;background:white;" class="nothiddendiv">
-			<div id="nothiddendivchild"></div>
-		</div>
-		<span id="name+value"></span>
-		<p id="first">Try them out:</p>
-		<ul id="firstUL"></ul>
-		<ol id="empty"><!-- comment --></ol>
-		<form id="form" action="formaction">
-			<label for="action" id="label-for">Action:</label>
-			<input type="text" name="action" value="Test" id="text1" maxlength="30"/>
-			<input type="text" name="text2" value="Test" id="text2" disabled="disabled"/>
-			<input type="radio" name="radio1" id="radio1" value="on"/>
-
-			<input type="radio" name="radio2" id="radio2" checked="checked"/>
-			<input type="checkbox" name="check" id="check1" checked="checked"/>
-			<input type="checkbox" id="check2" value="on"/>
-
-			<input type="hidden" name="hidden" id="hidden1"/>
-			<input type="text" style="display:none;" name="foo[bar]" id="hidden2"/>
-
-			<input type="text" id="name" name="name" value="name" />
-			<input type="search" id="search" name="search" value="search" />
-
-			<button id="button" name="button" type="button">Button</button>
-
-			<textarea id="area1" maxlength="30">foobar</textarea>
-
-			<select name="select1" id="select1">
-				<option id="option1a" class="emptyopt" value="">Nothing</option>
-				<option id="option1b" value="1">1</option>
-				<option id="option1c" value="2">2</option>
-				<option id="option1d" value="3">3</option>
-			</select>
-			<select name="select2" id="select2">
-				<option id="option2a" class="emptyopt" value="">Nothing</option>
-				<option id="option2b" value="1">1</option>
-				<option id="option2c" value="2">2</option>
-				<option id="option2d" selected="selected" value="3">3</option>
-			</select>
-			<select name="select3" id="select3" multiple="multiple">
-				<option id="option3a" class="emptyopt" value="">Nothing</option>
-				<option id="option3b" selected="selected" value="1">1</option>
-				<option id="option3c" selected="selected" value="2">2</option>
-				<option id="option3d" value="3">3</option>
-				<option id="option3e">no value</option>
-			</select>
-			<select name="select4" id="select4" multiple="multiple">
-				<optgroup disabled="disabled">
-					<option id="option4a" class="emptyopt" value="">Nothing</option>
-					<option id="option4b" disabled="disabled" selected="selected" value="1">1</option>
-					<option id="option4c" selected="selected" value="2">2</option>
-				</optgroup>
-				<option selected="selected" disabled="disabled" id="option4d" value="3">3</option>
-				<option id="option4e">no value</option>
-			</select>
-			<select name="select5" id="select5">
-				<option id="option5a" value="3">1</option>
-				<option id="option5b" value="2">2</option>
-				<option id="option5c" value="1">3</option>
-			</select>
-
-			<object id="object1" codebase="stupid">
-				<param name="p1" value="x1" />
-				<param name="p2" value="x2" />
-			</object>
-
-			<span id="台北Táiběi"></span>
-			<span id="台北" lang="中文"></span>
-			<span id="utf8class1" class="台北Táiběi 台北"></span>
-			<span id="utf8class2" class="台北"></span>
-			<span id="foo:bar" class="foo:bar"><span id="foo_descendent"></span></span>
-			<span id="test.foo[5]bar" class="test.foo[5]bar"></span>
-
-			<foo_bar id="foobar">test element</foo_bar>
-		</form>
-		<b id="floatTest">Float test.</b>
-		<iframe id="iframe" name="iframe"></iframe>
-		<form id="lengthtest">
-			<input type="text" id="length" name="test"/>
-			<input type="text" id="idTest" name="id"/>
-		</form>
-		<table id="table"></table>
-
-		<form id="name-tests">
-			<!-- Inputs with a grouped name attribute. -->
-			<input name="types[]" id="types_all" type="checkbox" value="all" />
-			<input name="types[]" id="types_anime" type="checkbox" value="anime" />
-			<input name="types[]" id="types_movie" type="checkbox" value="movie" />
-		</form>
-
-		<form id="testForm" action="#" method="get">
-			<textarea name="T3" rows="2" cols="15">?
-Z</textarea>
-			<input type="hidden" name="H1" value="x" />
-			<input type="hidden" name="H2" />
-			<input name="PWD" type="password" value="" />
-			<input name="T1" type="text" />
-			<input name="T2" type="text" value="YES" readonly="readonly" />
-			<input type="checkbox" name="C1" value="1" />
-			<input type="checkbox" name="C2" />
-			<input type="radio" name="R1" value="1" />
-			<input type="radio" name="R1" value="2" />
-			<input type="text" name="My Name" value="me" />
-			<input type="reset" name="reset" value="NO" />
-			<select name="S1">
-				<option value="abc">ABC</option>
-				<option value="abc">ABC</option>
-				<option value="abc">ABC</option>
-			</select>
-			<select name="S2" multiple="multiple" size="3">
-				<option value="abc">ABC</option>
-				<option value="abc">ABC</option>
-				<option value="abc">ABC</option>
-			</select>
-			<select name="S3">
-				<option selected="selected">YES</option>
-			</select>
-			<select name="S4">
-				<option value="" selected="selected">NO</option>
-			</select>
-			<input type="submit" name="sub1" value="NO" />
-			<input type="submit" name="sub2" value="NO" />
-			<input type="image" name="sub3" value="NO" />
-			<button name="sub4" type="submit" value="NO">NO</button>
-			<input name="D1" type="text" value="NO" disabled="disabled" />
-			<input type="checkbox" checked="checked" disabled="disabled" name="D2" value="NO" />
-			<input type="radio" name="D3" value="NO" checked="checked" disabled="disabled" />
-			<select name="D4" disabled="disabled">
-				<option selected="selected" value="NO">NO</option>
-			</select>
-			<input id="list-test" type="text" />
-			<datalist id="datalist">
-				<option value="option"></option>
-			</datalist>
-		</form>
-		<div id="moretests">
-			<form>
-				<div id="checkedtest" style="display:none;">
-					<input type="radio" name="checkedtestradios" checked="checked"/>
-					<input type="radio" name="checkedtestradios" value="on"/>
-					<input type="checkbox" name="checkedtestcheckboxes" checked="checked"/>
-					<input type="checkbox" name="checkedtestcheckboxes" />
-				</div>
-			</form>
-			<div id="nonnodes"><span>hi</span> there <!-- mon ami --></div>
-			<div id="t2037">
-				<div><div class="hidden">hidden</div></div>
-			</div>
-			<div id="t6652">
-				<div></div>
-			</div>
-			<div id="t12087">
-				<input type="hidden" id="el12087" data-comma="0,1"/>
-			</div>
-			<div id="no-clone-exception"><object><embed></embed></object></div>
-			<div id="names-group">
-				<span id="name-is-example" name="example"></span>
-				<span id="name-is-div" name="div"></span>
-			</div>
-			<script id="script-no-src"></script>
-			<script id="script-src" src="data/empty.js"></script>
-			<div id="id-name-tests">
-				<a id="tName1ID" name="tName1"><span></span></a>
-				<a id="tName2ID" name="tName2"><span></span></a>
-				<div id="tName1"><span id="tName1-span">C</span></div>
-			</div>
-		</div>
-
-		<div id="tabindex-tests">
-			<ol id="listWithTabIndex" tabindex="5">
-				<li id="foodWithNegativeTabIndex" tabindex="-1">Rice</li>
-				<li id="foodNoTabIndex">Beans</li>
-				<li>Blinis</li>
-				<li>Tofu</li>
-			</ol>
-
-			<div id="divWithNoTabIndex">I'm hungry. I should...</div>
-			<span>...</span><a href="#" id="linkWithNoTabIndex">Eat lots of food</a><span>...</span> |
-			<span>...</span><a href="#" id="linkWithTabIndex" tabindex="2">Eat a little food</a><span>...</span> |
-			<span>...</span><a href="#" id="linkWithNegativeTabIndex" tabindex="-1">Eat no food</a><span>...</span>
-			<span>...</span><a id="linkWithNoHrefWithNoTabIndex">Eat a burger</a><span>...</span>
-			<span>...</span><a id="linkWithNoHrefWithTabIndex" tabindex="1">Eat some funyuns</a><span>...</span>
-			<span>...</span><a id="linkWithNoHrefWithNegativeTabIndex" tabindex="-1">Eat some funyuns</a><span>...</span>
-		</div>
-
-		<div id="liveHandlerOrder">
-			<span id="liveSpan1"><a href="#" id="liveLink1"></a></span>
-			<span id="liveSpan2"><a href="#" id="liveLink2"></a></span>
-		</div>
-
-		<div id="siblingTest">
-			<em id="siblingfirst">1</em>
-			<em id="siblingnext">2</em>
-			<em id="siblingthird">
-				<em id="siblingchild">
-					<em id="siblinggrandchild">
-						<em id="siblinggreatgrandchild"></em>
-					</em>
-				</em>
-			</em>
-			<span id="siblingspan"></span>
-		</div>​
-	</div>
-	</dl>
-	<br id="last"/>
-</body>
-</html>
diff --git a/#pma/js/jquery/src/jquery/sizzle/test/jquery.js b/#pma/js/jquery/src/jquery/sizzle/test/jquery.js
deleted file mode 100644
index 86a33051..00000000
--- a/#pma/js/jquery/src/jquery/sizzle/test/jquery.js
+++ /dev/null
@@ -1,9597 +0,0 @@
-/*!
- * jQuery JavaScript Library v1.9.1
- * http://jquery.com/
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- *
- * Copyright 2005, 2012 jQuery Foundation, Inc. and other contributors
- * Released under the MIT license
- * http://jquery.org/license
- *
- * Date: 2013-2-4
- */
-(function( window, undefined ) {
-
-// Can't do this because several apps including ASP.NET trace
-// the stack via arguments.caller.callee and Firefox dies if
-// you try to trace through "use strict" call chains. (#13335)
-// Support: Firefox 18+
-//"use strict";
-var
-	// The deferred used on DOM ready
-	readyList,
-
-	// A central reference to the root jQuery(document)
-	rootjQuery,
-
-	// Support: IE<9
-	// For `typeof node.method` instead of `node.method !== undefined`
-	core_strundefined = typeof undefined,
-
-	// Use the correct document accordingly with window argument (sandbox)
-	document = window.document,
-	location = window.location,
-
-	// Map over jQuery in case of overwrite
-	_jQuery = window.jQuery,
-
-	// Map over the $ in case of overwrite
-	_$ = window.$,
-
-	// [[Class]] -> type pairs
-	class2type = {},
-
-	// List of deleted data cache ids, so we can reuse them
-	core_deletedIds = [],
-
-	core_version = "1.9.1",
-
-	// Save a reference to some core methods
-	core_concat = core_deletedIds.concat,
-	core_push = core_deletedIds.push,
-	core_slice = core_deletedIds.slice,
-	core_indexOf = core_deletedIds.indexOf,
-	core_toString = class2type.toString,
-	core_hasOwn = class2type.hasOwnProperty,
-	core_trim = core_version.trim,
-
-	// Define a local copy of jQuery
-	jQuery = function( selector, context ) {
-		// The jQuery object is actually just the init constructor 'enhanced'
-		return new jQuery.fn.init( selector, context, rootjQuery );
-	},
-
-	// Used for matching numbers
-	core_pnum = /[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,
-
-	// Used for splitting on whitespace
-	core_rnotwhite = /\S+/g,
-
-	// Make sure we trim BOM and NBSP (here's looking at you, Safari 5.0 and IE)
-	rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,
-
-	// A simple way to check for HTML strings
-	// Prioritize #id over <tag> to avoid XSS via location.hash (#9521)
-	// Strict HTML recognition (#11290: must start with <)
-	rquickExpr = /^(?:(<[\w\W]+>)[^>]*|#([\w-]*))$/,
-
-	// Match a standalone tag
-	rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>|)$/,
-
-	// JSON RegExp
-	rvalidchars = /^[\],:{}\s]*$/,
-	rvalidbraces = /(?:^|:|,)(?:\s*\[)+/g,
-	rvalidescape = /\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,
-	rvalidtokens = /"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g,
-
-	// Matches dashed string for camelizing
-	rmsPrefix = /^-ms-/,
-	rdashAlpha = /-([\da-z])/gi,
-
-	// Used by jQuery.camelCase as callback to replace()
-	fcamelCase = function( all, letter ) {
-		return letter.toUpperCase();
-	},
-
-	// The ready event handler
-	completed = function( event ) {
-
-		// readyState === "complete" is good enough for us to call the dom ready in oldIE
-		if ( document.addEventListener || event.type === "load" || document.readyState === "complete" ) {
-			detach();
-			jQuery.ready();
-		}
-	},
-	// Clean-up method for dom ready events
-	detach = function() {
-		if ( document.addEventListener ) {
-			document.removeEventListener( "DOMContentLoaded", completed, false );
-			window.removeEventListener( "load", completed, false );
-
-		} else {
-			document.detachEvent( "onreadystatechange", completed );
-			window.detachEvent( "onload", completed );
-		}
-	};
-
-jQuery.fn = jQuery.prototype = {
-	// The current version of jQuery being used
-	jquery: core_version,
-
-	constructor: jQuery,
-	init: function( selector, context, rootjQuery ) {
-		var match, elem;
-
-		// HANDLE: $(""), $(null), $(undefined), $(false)
-		if ( !selector ) {
-			return this;
-		}
-
-		// Handle HTML strings
-		if ( typeof selector === "string" ) {
-			if ( selector.charAt(0) === "<" && selector.charAt( selector.length - 1 ) === ">" && selector.length >= 3 ) {
-				// Assume that strings that start and end with <> are HTML and skip the regex check
-				match = [ null, selector, null ];
-
-			} else {
-				match = rquickExpr.exec( selector );
-			}
-
-			// Match html or make sure no context is specified for #id
-			if ( match && (match[1] || !context) ) {
-
-				// HANDLE: $(html) -> $(array)
-				if ( match[1] ) {
-					context = context instanceof jQuery ? context[0] : context;
-
-					// scripts is true for back-compat
-					jQuery.merge( this, jQuery.parseHTML(
-						match[1],
-						context && context.nodeType ? context.ownerDocument || context : document,
-						true
-					) );
-
-					// HANDLE: $(html, props)
-					if ( rsingleTag.test( match[1] ) && jQuery.isPlainObject( context ) ) {
-						for ( match in context ) {
-							// Properties of context are called as methods if possible
-							if ( jQuery.isFunction( this[ match ] ) ) {
-								this[ match ]( context[ match ] );
-
-							// ...and otherwise set as attributes
-							} else {
-								this.attr( match, context[ match ] );
-							}
-						}
-					}
-
-					return this;
-
-				// HANDLE: $(#id)
-				} else {
-					elem = document.getElementById( match[2] );
-
-					// Check parentNode to catch when Blackberry 4.6 returns
-					// nodes that are no longer in the document #6963
-					if ( elem && elem.parentNode ) {
-						// Handle the case where IE and Opera return items
-						// by name instead of ID
-						if ( elem.id !== match[2] ) {
-							return rootjQuery.find( selector );
-						}
-
-						// Otherwise, we inject the element directly into the jQuery object
-						this.length = 1;
-						this[0] = elem;
-					}
-
-					this.context = document;
-					this.selector = selector;
-					return this;
-				}
-
-			// HANDLE: $(expr, $(...))
-			} else if ( !context || context.jquery ) {
-				return ( context || rootjQuery ).find( selector );
-
-			// HANDLE: $(expr, context)
-			// (which is just equivalent to: $(context).find(expr)
-			} else {
-				return this.constructor( context ).find( selector );
-			}
-
-		// HANDLE: $(DOMElement)
-		} else if ( selector.nodeType ) {
-			this.context = this[0] = selector;
-			this.length = 1;
-			return this;
-
-		// HANDLE: $(function)
-		// Shortcut for document ready
-		} else if ( jQuery.isFunction( selector ) ) {
-			return rootjQuery.ready( selector );
-		}
-
-		if ( selector.selector !== undefined ) {
-			this.selector = selector.selector;
-			this.context = selector.context;
-		}
-
-		return jQuery.makeArray( selector, this );
-	},
-
-	// Start with an empty selector
-	selector: "",
-
-	// The default length of a jQuery object is 0
-	length: 0,
-
-	// The number of elements contained in the matched element set
-	size: function() {
-		return this.length;
-	},
-
-	toArray: function() {
-		return core_slice.call( this );
-	},
-
-	// Get the Nth element in the matched element set OR
-	// Get the whole matched element set as a clean array
-	get: function( num ) {
-		return num == null ?
-
-			// Return a 'clean' array
-			this.toArray() :
-
-			// Return just the object
-			( num < 0 ? this[ this.length + num ] : this[ num ] );
-	},
-
-	// Take an array of elements and push it onto the stack
-	// (returning the new matched element set)
-	pushStack: function( elems ) {
-
-		// Build a new jQuery matched element set
-		var ret = jQuery.merge( this.constructor(), elems );
-
-		// Add the old object onto the stack (as a reference)
-		ret.prevObject = this;
-		ret.context = this.context;
-
-		// Return the newly-formed element set
-		return ret;
-	},
-
-	// Execute a callback for every element in the matched set.
-	// (You can seed the arguments with an array of args, but this is
-	// only used internally.)
-	each: function( callback, args ) {
-		return jQuery.each( this, callback, args );
-	},
-
-	ready: function( fn ) {
-		// Add the callback
-		jQuery.ready.promise().done( fn );
-
-		return this;
-	},
-
-	slice: function() {
-		return this.pushStack( core_slice.apply( this, arguments ) );
-	},
-
-	first: function() {
-		return this.eq( 0 );
-	},
-
-	last: function() {
-		return this.eq( -1 );
-	},
-
-	eq: function( i ) {
-		var len = this.length,
-			j = +i + ( i < 0 ? len : 0 );
-		return this.pushStack( j >= 0 && j < len ? [ this[j] ] : [] );
-	},
-
-	map: function( callback ) {
-		return this.pushStack( jQuery.map(this, function( elem, i ) {
-			return callback.call( elem, i, elem );
-		}));
-	},
-
-	end: function() {
-		return this.prevObject || this.constructor(null);
-	},
-
-	// For internal use only.
-	// Behaves like an Array's method, not like a jQuery method.
-	push: core_push,
-	sort: [].sort,
-	splice: [].splice
-};
-
-// Give the init function the jQuery prototype for later instantiation
-jQuery.fn.init.prototype = jQuery.fn;
-
-jQuery.extend = jQuery.fn.extend = function() {
-	var src, copyIsArray, copy, name, options, clone,
-		target = arguments[0] || {},
-		i = 1,
-		length = arguments.length,
-		deep = false;
-
-	// Handle a deep copy situation
-	if ( typeof target === "boolean" ) {
-		deep = target;
-		target = arguments[1] || {};
-		// skip the boolean and the target
-		i = 2;
-	}
-
-	// Handle case when target is a string or something (possible in deep copy)
-	if ( typeof target !== "object" && !jQuery.isFunction(target) ) {
-		target = {};
-	}
-
-	// extend jQuery itself if only one argument is passed
-	if ( length === i ) {
-		target = this;
-		--i;
-	}
-
-	for ( ; i < length; i++ ) {
-		// Only deal with non-null/undefined values
-		if ( (options = arguments[ i ]) != null ) {
-			// Extend the base object
-			for ( name in options ) {
-				src = target[ name ];
-				copy = options[ name ];
-
-				// Prevent never-ending loop
-				if ( target === copy ) {
-					continue;
-				}
-
-				// Recurse if we're merging plain objects or arrays
-				if ( deep && copy && ( jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)) ) ) {
-					if ( copyIsArray ) {
-						copyIsArray = false;
-						clone = src && jQuery.isArray(src) ? src : [];
-
-					} else {
-						clone = src && jQuery.isPlainObject(src) ? src : {};
-					}
-
-					// Never move original objects, clone them
-					target[ name ] = jQuery.extend( deep, clone, copy );
-
-				// Don't bring in undefined values
-				} else if ( copy !== undefined ) {
-					target[ name ] = copy;
-				}
-			}
-		}
-	}
-
-	// Return the modified object
-	return target;
-};
-
-jQuery.extend({
-	noConflict: function( deep ) {
-		if ( window.$ === jQuery ) {
-			window.$ = _$;
-		}
-
-		if ( deep && window.jQuery === jQuery ) {
-			window.jQuery = _jQuery;
-		}
-
-		return jQuery;
-	},
-
-	// Is the DOM ready to be used? Set to true once it occurs.
-	isReady: false,
-
-	// A counter to track how many items to wait for before
-	// the ready event fires. See #6781
-	readyWait: 1,
-
-	// Hold (or release) the ready event
-	holdReady: function( hold ) {
-		if ( hold ) {
-			jQuery.readyWait++;
-		} else {
-			jQuery.ready( true );
-		}
-	},
-
-	// Handle when the DOM is ready
-	ready: function( wait ) {
-
-		// Abort if there are pending holds or we're already ready
-		if ( wait === true ? --jQuery.readyWait : jQuery.isReady ) {
-			return;
-		}
-
-		// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
-		if ( !document.body ) {
-			return setTimeout( jQuery.ready );
-		}
-
-		// Remember that the DOM is ready
-		jQuery.isReady = true;
-
-		// If a normal DOM Ready event fired, decrement, and wait if need be
-		if ( wait !== true && --jQuery.readyWait > 0 ) {
-			return;
-		}
-
-		// If there are functions bound, to execute
-		readyList.resolveWith( document, [ jQuery ] );
-
-		// Trigger any bound ready events
-		if ( jQuery.fn.trigger ) {
-			jQuery( document ).trigger("ready").off("ready");
-		}
-	},
-
-	// See test/unit/core.js for details concerning isFunction.
-	// Since version 1.3, DOM methods and functions like alert
-	// aren't supported. They return false on IE (#2968).
-	isFunction: function( obj ) {
-		return jQuery.type(obj) === "function";
-	},
-
-	isArray: Array.isArray || function( obj ) {
-		return jQuery.type(obj) === "array";
-	},
-
-	isWindow: function( obj ) {
-		return obj != null && obj == obj.window;
-	},
-
-	isNumeric: function( obj ) {
-		return !isNaN( parseFloat(obj) ) && isFinite( obj );
-	},
-
-	type: function( obj ) {
-		if ( obj == null ) {
-			return String( obj );
-		}
-		return typeof obj === "object" || typeof obj === "function" ?
-			class2type[ core_toString.call(obj) ] || "object" :
-			typeof obj;
-	},
-
-	isPlainObject: function( obj ) {
-		// Must be an Object.
-		// Because of IE, we also have to check the presence of the constructor property.
-		// Make sure that DOM nodes and window objects don't pass through, as well
-		if ( !obj || jQuery.type(obj) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) {
-			return false;
-		}
-
-		try {
-			// Not own constructor property must be Object
-			if ( obj.constructor &&
-				!core_hasOwn.call(obj, "constructor") &&
-				!core_hasOwn.call(obj.constructor.prototype, "isPrototypeOf") ) {
-				return false;
-			}
-		} catch ( e ) {
-			// IE8,9 Will throw exceptions on certain host objects #9897
-			return false;
-		}
-
-		// Own properties are enumerated firstly, so to speed up,
-		// if last one is own, then all properties are own.
-
-		var key;
-		for ( key in obj ) {}
-
-		return key === undefined || core_hasOwn.call( obj, key );
-	},
-
-	isEmptyObject: function( obj ) {
-		var name;
-		for ( name in obj ) {
-			return false;
-		}
-		return true;
-	},
-
-	error: function( msg ) {
-		throw new Error( msg );
-	},
-
-	// data: string of html
-	// context (optional): If specified, the fragment will be created in this context, defaults to document
-	// keepScripts (optional): If true, will include scripts passed in the html string
-	parseHTML: function( data, context, keepScripts ) {
-		if ( !data || typeof data !== "string" ) {
-			return null;
-		}
-		if ( typeof context === "boolean" ) {
-			keepScripts = context;
-			context = false;
-		}
-		context = context || document;
-
-		var parsed = rsingleTag.exec( data ),
-			scripts = !keepScripts && [];
-
-		// Single tag
-		if ( parsed ) {
-			return [ context.createElement( parsed[1] ) ];
-		}
-
-		parsed = jQuery.buildFragment( [ data ], context, scripts );
-		if ( scripts ) {
-			jQuery( scripts ).remove();
-		}
-		return jQuery.merge( [], parsed.childNodes );
-	},
-
-	parseJSON: function( data ) {
-		// Attempt to parse using the native JSON parser first
-		if ( window.JSON && window.JSON.parse ) {
-			return window.JSON.parse( data );
-		}
-
-		if ( data === null ) {
-			return data;
-		}
-
-		if ( typeof data === "string" ) {
-
-			// Make sure leading/trailing whitespace is removed (IE can't handle it)
-			data = jQuery.trim( data );
-
-			if ( data ) {
-				// Make sure the incoming data is actual JSON
-				// Logic borrowed from http://json.org/json2.js
-				if ( rvalidchars.test( data.replace( rvalidescape, "@" )
-					.replace( rvalidtokens, "]" )
-					.replace( rvalidbraces, "")) ) {
-
-					return ( new Function( "return " + data ) )();
-				}
-			}
-		}
-
-		jQuery.error( "Invalid JSON: " + data );
-	},
-
-	// Cross-browser xml parsing
-	parseXML: function( data ) {
-		var xml, tmp;
-		if ( !data || typeof data !== "string" ) {
-			return null;
-		}
-		try {
-			if ( window.DOMParser ) { // Standard
-				tmp = new DOMParser();
-				xml = tmp.parseFromString( data , "text/xml" );
-			} else { // IE
-				xml = new ActiveXObject( "Microsoft.XMLDOM" );
-				xml.async = "false";
-				xml.loadXML( data );
-			}
-		} catch( e ) {
-			xml = undefined;
-		}
-		if ( !xml || !xml.documentElement || xml.getElementsByTagName( "parsererror" ).length ) {
-			jQuery.error( "Invalid XML: " + data );
-		}
-		return xml;
-	},
-
-	noop: function() {},
-
-	// Evaluates a script in a global context
-	// Workarounds based on findings by Jim Driscoll
-	// http://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context
-	globalEval: function( data ) {
-		if ( data && jQuery.trim( data ) ) {
-			// We use execScript on Internet Explorer
-			// We use an anonymous function so that context is window
-			// rather than jQuery in Firefox
-			( window.execScript || function( data ) {
-				window[ "eval" ].call( window, data );
-			} )( data );
-		}
-	},
-
-	// Convert dashed to camelCase; used by the css and data modules
-	// Microsoft forgot to hump their vendor prefix (#9572)
-	camelCase: function( string ) {
-		return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase );
-	},
-
-	nodeName: function( elem, name ) {
-		return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase();
-	},
-
-	// args is for internal usage only
-	each: function( obj, callback, args ) {
-		var value,
-			i = 0,
-			length = obj.length,
-			isArray = isArraylike( obj );
-
-		if ( args ) {
-			if ( isArray ) {
-				for ( ; i < length; i++ ) {
-					value = callback.apply( obj[ i ], args );
-
-					if ( value === false ) {
-						break;
-					}
-				}
-			} else {
-				for ( i in obj ) {
-					value = callback.apply( obj[ i ], args );
-
-					if ( value === false ) {
-						break;
-					}
-				}
-			}
-
-		// A special, fast, case for the most common use of each
-		} else {
-			if ( isArray ) {
-				for ( ; i < length; i++ ) {
-					value = callback.call( obj[ i ], i, obj[ i ] );
-
-					if ( value === false ) {
-						break;
-					}
-				}
-			} else {
-				for ( i in obj ) {
-					value = callback.call( obj[ i ], i, obj[ i ] );
-
-					if ( value === false ) {
-						break;
-					}
-				}
-			}
-		}
-
-		return obj;
-	},
-
-	// Use native String.trim function wherever possible
-	trim: core_trim && !core_trim.call("\uFEFF\xA0") ?
-		function( text ) {
-			return text == null ?
-				"" :
-				core_trim.call( text );
-		} :
-
-		// Otherwise use our own trimming functionality
-		function( text ) {
-			return text == null ?
-				"" :
-				( text + "" ).replace( rtrim, "" );
-		},
-
-	// results is for internal usage only
-	makeArray: function( arr, results ) {
-		var ret = results || [];
-
-		if ( arr != null ) {
-			if ( isArraylike( Object(arr) ) ) {
-				jQuery.merge( ret,
-					typeof arr === "string" ?
-					[ arr ] : arr
-				);
-			} else {
-				core_push.call( ret, arr );
-			}
-		}
-
-		return ret;
-	},
-
-	inArray: function( elem, arr, i ) {
-		var len;
-
-		if ( arr ) {
-			if ( core_indexOf ) {
-				return core_indexOf.call( arr, elem, i );
-			}
-
-			len = arr.length;
-			i = i ? i < 0 ? Math.max( 0, len + i ) : i : 0;
-
-			for ( ; i < len; i++ ) {
-				// Skip accessing in sparse arrays
-				if ( i in arr && arr[ i ] === elem ) {
-					return i;
-				}
-			}
-		}
-
-		return -1;
-	},
-
-	merge: function( first, second ) {
-		var l = second.length,
-			i = first.length,
-			j = 0;
-
-		if ( typeof l === "number" ) {
-			for ( ; j < l; j++ ) {
-				first[ i++ ] = second[ j ];
-			}
-		} else {
-			while ( second[j] !== undefined ) {
-				first[ i++ ] = second[ j++ ];
-			}
-		}
-
-		first.length = i;
-
-		return first;
-	},
-
-	grep: function( elems, callback, inv ) {
-		var retVal,
-			ret = [],
-			i = 0,
-			length = elems.length;
-		inv = !!inv;
-
-		// Go through the array, only saving the items
-		// that pass the validator function
-		for ( ; i < length; i++ ) {
-			retVal = !!callback( elems[ i ], i );
-			if ( inv !== retVal ) {
-				ret.push( elems[ i ] );
-			}
-		}
-
-		return ret;
-	},
-
-	// arg is for internal usage only
-	map: function( elems, callback, arg ) {
-		var value,
-			i = 0,
-			length = elems.length,
-			isArray = isArraylike( elems ),
-			ret = [];
-
-		// Go through the array, translating each of the items to their
-		if ( isArray ) {
-			for ( ; i < length; i++ ) {
-				value = callback( elems[ i ], i, arg );
-
-				if ( value != null ) {
-					ret[ ret.length ] = value;
-				}
-			}
-
-		// Go through every key on the object,
-		} else {
-			for ( i in elems ) {
-				value = callback( elems[ i ], i, arg );
-
-				if ( value != null ) {
-					ret[ ret.length ] = value;
-				}
-			}
-		}
-
-		// Flatten any nested arrays
-		return core_concat.apply( [], ret );
-	},
-
-	// A global GUID counter for objects
-	guid: 1,
-
-	// Bind a function to a context, optionally partially applying any
-	// arguments.
-	proxy: function( fn, context ) {
-		var args, proxy, tmp;
-
-		if ( typeof context === "string" ) {
-			tmp = fn[ context ];
-			context = fn;
-			fn = tmp;
-		}
-
-		// Quick check to determine if target is callable, in the spec
-		// this throws a TypeError, but we will just return undefined.
-		if ( !jQuery.isFunction( fn ) ) {
-			return undefined;
-		}
-
-		// Simulated bind
-		args = core_slice.call( arguments, 2 );
-		proxy = function() {
-			return fn.apply( context || this, args.concat( core_slice.call( arguments ) ) );
-		};
-
-		// Set the guid of unique handler to the same of original handler, so it can be removed
-		proxy.guid = fn.guid = fn.guid || jQuery.guid++;
-
-		return proxy;
-	},
-
-	// Multifunctional method to get and set values of a collection
-	// The value/s can optionally be executed if it's a function
-	access: function( elems, fn, key, value, chainable, emptyGet, raw ) {
-		var i = 0,
-			length = elems.length,
-			bulk = key == null;
-
-		// Sets many values
-		if ( jQuery.type( key ) === "object" ) {
-			chainable = true;
-			for ( i in key ) {
-				jQuery.access( elems, fn, i, key[i], true, emptyGet, raw );
-			}
-
-		// Sets one value
-		} else if ( value !== undefined ) {
-			chainable = true;
-
-			if ( !jQuery.isFunction( value ) ) {
-				raw = true;
-			}
-
-			if ( bulk ) {
-				// Bulk operations run against the entire set
-				if ( raw ) {
-					fn.call( elems, value );
-					fn = null;
-
-				// ...except when executing function values
-				} else {
-					bulk = fn;
-					fn = function( elem, key, value ) {
-						return bulk.call( jQuery( elem ), value );
-					};
-				}
-			}
-
-			if ( fn ) {
-				for ( ; i < length; i++ ) {
-					fn( elems[i], key, raw ? value : value.call( elems[i], i, fn( elems[i], key ) ) );
-				}
-			}
-		}
-
-		return chainable ?
-			elems :
-
-			// Gets
-			bulk ?
-				fn.call( elems ) :
-				length ? fn( elems[0], key ) : emptyGet;
-	},
-
-	now: function() {
-		return ( new Date() ).getTime();
-	}
-});
-
-jQuery.ready.promise = function( obj ) {
-	if ( !readyList ) {
-
-		readyList = jQuery.Deferred();
-
-		// Catch cases where $(document).ready() is called after the browser event has already occurred.
-		// we once tried to use readyState "interactive" here, but it caused issues like the one
-		// discovered by ChrisS here: http://bugs.jquery.com/ticket/12282#comment:15
-		if ( document.readyState === "complete" ) {
-			// Handle it asynchronously to allow scripts the opportunity to delay ready
-			setTimeout( jQuery.ready );
-
-		// Standards-based browsers support DOMContentLoaded
-		} else if ( document.addEventListener ) {
-			// Use the handy event callback
-			document.addEventListener( "DOMContentLoaded", completed, false );
-
-			// A fallback to window.onload, that will always work
-			window.addEventListener( "load", completed, false );
-
-		// If IE event model is used
-		} else {
-			// Ensure firing before onload, maybe late but safe also for iframes
-			document.attachEvent( "onreadystatechange", completed );
-
-			// A fallback to window.onload, that will always work
-			window.attachEvent( "onload", completed );
-
-			// If IE and not a frame
-			// continually check to see if the document is ready
-			var top = false;
-
-			try {
-				top = window.frameElement == null && document.documentElement;
-			} catch(e) {}
-
-			if ( top && top.doScroll ) {
-				(function doScrollCheck() {
-					if ( !jQuery.isReady ) {
-
-						try {
-							// Use the trick by Diego Perini
-							// http://javascript.nwbox.com/IEContentLoaded/
-							top.doScroll("left");
-						} catch(e) {
-							return setTimeout( doScrollCheck, 50 );
-						}
-
-						// detach all dom ready events
-						detach();
-
-						// and execute any waiting functions
-						jQuery.ready();
-					}
-				})();
-			}
-		}
-	}
-	return readyList.promise( obj );
-};
-
-// Populate the class2type map
-jQuery.each("Boolean Number String Function Array Date RegExp Object Error".split(" "), function(i, name) {
-	class2type[ "[object " + name + "]" ] = name.toLowerCase();
-});
-
-function isArraylike( obj ) {
-	var length = obj.length,
-		type = jQuery.type( obj );
-
-	if ( jQuery.isWindow( obj ) ) {
-		return false;
-	}
-
-	if ( obj.nodeType === 1 && length ) {
-		return true;
-	}
-
-	return type === "array" || type !== "function" &&
-		( length === 0 ||
-		typeof length === "number" && length > 0 && ( length - 1 ) in obj );
-}
-
-// All jQuery objects should point back to these
-rootjQuery = jQuery(document);
-// String to Object options format cache
-var optionsCache = {};
-
-// Convert String-formatted options into Object-formatted ones and store in cache
-function createOptions( options ) {
-	var object = optionsCache[ options ] = {};
-	jQuery.each( options.match( core_rnotwhite ) || [], function( _, flag ) {
-		object[ flag ] = true;
-	});
-	return object;
-}
-
-/*
- * Create a callback list using the following parameters:
- *
- *	options: an optional list of space-separated options that will change how
- *			the callback list behaves or a more traditional option object
- *
- * By default a callback list will act like an event callback list and can be
- * "fired" multiple times.
- *
- * Possible options:
- *
- *	once:			will ensure the callback list can only be fired once (like a Deferred)
- *
- *	memory:			will keep track of previous values and will call any callback added
- *					after the list has been fired right away with the latest "memorized"
- *					values (like a Deferred)
- *
- *	unique:			will ensure a callback can only be added once (no duplicate in the list)
- *
- *	stopOnFalse:	interrupt callings when a callback returns false
- *
- */
-jQuery.Callbacks = function( options ) {
-
-	// Convert options from String-formatted to Object-formatted if needed
-	// (we check in cache first)
-	options = typeof options === "string" ?
-		( optionsCache[ options ] || createOptions( options ) ) :
-		jQuery.extend( {}, options );
-
-	var // Flag to know if list is currently firing
-		firing,
-		// Last fire value (for non-forgettable lists)
-		memory,
-		// Flag to know if list was already fired
-		fired,
-		// End of the loop when firing
-		firingLength,
-		// Index of currently firing callback (modified by remove if needed)
-		firingIndex,
-		// First callback to fire (used internally by add and fireWith)
-		firingStart,
-		// Actual callback list
-		list = [],
-		// Stack of fire calls for repeatable lists
-		stack = !options.once && [],
-		// Fire callbacks
-		fire = function( data ) {
-			memory = options.memory && data;
-			fired = true;
-			firingIndex = firingStart || 0;
-			firingStart = 0;
-			firingLength = list.length;
-			firing = true;
-			for ( ; list && firingIndex < firingLength; firingIndex++ ) {
-				if ( list[ firingIndex ].apply( data[ 0 ], data[ 1 ] ) === false && options.stopOnFalse ) {
-					memory = false; // To prevent further calls using add
-					break;
-				}
-			}
-			firing = false;
-			if ( list ) {
-				if ( stack ) {
-					if ( stack.length ) {
-						fire( stack.shift() );
-					}
-				} else if ( memory ) {
-					list = [];
-				} else {
-					self.disable();
-				}
-			}
-		},
-		// Actual Callbacks object
-		self = {
-			// Add a callback or a collection of callbacks to the list
-			add: function() {
-				if ( list ) {
-					// First, we save the current length
-					var start = list.length;
-					(function add( args ) {
-						jQuery.each( args, function( _, arg ) {
-							var type = jQuery.type( arg );
-							if ( type === "function" ) {
-								if ( !options.unique || !self.has( arg ) ) {
-									list.push( arg );
-								}
-							} else if ( arg && arg.length && type !== "string" ) {
-								// Inspect recursively
-								add( arg );
-							}
-						});
-					})( arguments );
-					// Do we need to add the callbacks to the
-					// current firing batch?
-					if ( firing ) {
-						firingLength = list.length;
-					// With memory, if we're not firing then
-					// we should call right away
-					} else if ( memory ) {
-						firingStart = start;
-						fire( memory );
-					}
-				}
-				return this;
-			},
-			// Remove a callback from the list
-			remove: function() {
-				if ( list ) {
-					jQuery.each( arguments, function( _, arg ) {
-						var index;
-						while( ( index = jQuery.inArray( arg, list, index ) ) > -1 ) {
-							list.splice( index, 1 );
-							// Handle firing indexes
-							if ( firing ) {
-								if ( index <= firingLength ) {
-									firingLength--;
-								}
-								if ( index <= firingIndex ) {
-									firingIndex--;
-								}
-							}
-						}
-					});
-				}
-				return this;
-			},
-			// Check if a given callback is in the list.
-			// If no argument is given, return whether or not list has callbacks attached.
-			has: function( fn ) {
-				return fn ? jQuery.inArray( fn, list ) > -1 : !!( list && list.length );
-			},
-			// Remove all callbacks from the list
-			empty: function() {
-				list = [];
-				return this;
-			},
-			// Have the list do nothing anymore
-			disable: function() {
-				list = stack = memory = undefined;
-				return this;
-			},
-			// Is it disabled?
-			disabled: function() {
-				return !list;
-			},
-			// Lock the list in its current state
-			lock: function() {
-				stack = undefined;
-				if ( !memory ) {
-					self.disable();
-				}
-				return this;
-			},
-			// Is it locked?
-			locked: function() {
-				return !stack;
-			},
-			// Call all callbacks with the given context and arguments
-			fireWith: function( context, args ) {
-				args = args || [];
-				args = [ context, args.slice ? args.slice() : args ];
-				if ( list && ( !fired || stack ) ) {
-					if ( firing ) {
-						stack.push( args );
-					} else {
-						fire( args );
-					}
-				}
-				return this;
-			},
-			// Call all the callbacks with the given arguments
-			fire: function() {
-				self.fireWith( this, arguments );
-				return this;
-			},
-			// To know if the callbacks have already been called at least once
-			fired: function() {
-				return !!fired;
-			}
-		};
-
-	return self;
-};
-jQuery.extend({
-
-	Deferred: function( func ) {
-		var tuples = [
-				// action, add listener, listener list, final state
-				[ "resolve", "done", jQuery.Callbacks("once memory"), "resolved" ],
-				[ "reject", "fail", jQuery.Callbacks("once memory"), "rejected" ],
-				[ "notify", "progress", jQuery.Callbacks("memory") ]
-			],
-			state = "pending",
-			promise = {
-				state: function() {
-					return state;
-				},
-				always: function() {
-					deferred.done( arguments ).fail( arguments );
-					return this;
-				},
-				then: function( /* fnDone, fnFail, fnProgress */ ) {
-					var fns = arguments;
-					return jQuery.Deferred(function( newDefer ) {
-						jQuery.each( tuples, function( i, tuple ) {
-							var action = tuple[ 0 ],
-								fn = jQuery.isFunction( fns[ i ] ) && fns[ i ];
-							// deferred[ done | fail | progress ] for forwarding actions to newDefer
-							deferred[ tuple[1] ](function() {
-								var returned = fn && fn.apply( this, arguments );
-								if ( returned && jQuery.isFunction( returned.promise ) ) {
-									returned.promise()
-										.done( newDefer.resolve )
-										.fail( newDefer.reject )
-										.progress( newDefer.notify );
-								} else {
-									newDefer[ action + "With" ]( this === promise ? newDefer.promise() : this, fn ? [ returned ] : arguments );
-								}
-							});
-						});
-						fns = null;
-					}).promise();
-				},
-				// Get a promise for this deferred
-				// If obj is provided, the promise aspect is added to the object
-				promise: function( obj ) {
-					return obj != null ? jQuery.extend( obj, promise ) : promise;
-				}
-			},
-			deferred = {};
-
-		// Keep pipe for back-compat
-		promise.pipe = promise.then;
-
-		// Add list-specific methods
-		jQuery.each( tuples, function( i, tuple ) {
-			var list = tuple[ 2 ],
-				stateString = tuple[ 3 ];
-
-			// promise[ done | fail | progress ] = list.add
-			promise[ tuple[1] ] = list.add;
-
-			// Handle state
-			if ( stateString ) {
-				list.add(function() {
-					// state = [ resolved | rejected ]
-					state = stateString;
-
-				// [ reject_list | resolve_list ].disable; progress_list.lock
-				}, tuples[ i ^ 1 ][ 2 ].disable, tuples[ 2 ][ 2 ].lock );
-			}
-
-			// deferred[ resolve | reject | notify ]
-			deferred[ tuple[0] ] = function() {
-				deferred[ tuple[0] + "With" ]( this === deferred ? promise : this, arguments );
-				return this;
-			};
-			deferred[ tuple[0] + "With" ] = list.fireWith;
-		});
-
-		// Make the deferred a promise
-		promise.promise( deferred );
-
-		// Call given func if any
-		if ( func ) {
-			func.call( deferred, deferred );
-		}
-
-		// All done!
-		return deferred;
-	},
-
-	// Deferred helper
-	when: function( subordinate /* , ..., subordinateN */ ) {
-		var i = 0,
-			resolveValues = core_slice.call( arguments ),
-			length = resolveValues.length,
-
-			// the count of uncompleted subordinates
-			remaining = length !== 1 || ( subordinate && jQuery.isFunction( subordinate.promise ) ) ? length : 0,
-
-			// the master Deferred. If resolveValues consist of only a single Deferred, just use that.
-			deferred = remaining === 1 ? subordinate : jQuery.Deferred(),
-
-			// Update function for both resolve and progress values
-			updateFunc = function( i, contexts, values ) {
-				return function( value ) {
-					contexts[ i ] = this;
-					values[ i ] = arguments.length > 1 ? core_slice.call( arguments ) : value;
-					if( values === progressValues ) {
-						deferred.notifyWith( contexts, values );
-					} else if ( !( --remaining ) ) {
-						deferred.resolveWith( contexts, values );
-					}
-				};
-			},
-
-			progressValues, progressContexts, resolveContexts;
-
-		// add listeners to Deferred subordinates; treat others as resolved
-		if ( length > 1 ) {
-			progressValues = new Array( length );
-			progressContexts = new Array( length );
-			resolveContexts = new Array( length );
-			for ( ; i < length; i++ ) {
-				if ( resolveValues[ i ] && jQuery.isFunction( resolveValues[ i ].promise ) ) {
-					resolveValues[ i ].promise()
-						.done( updateFunc( i, resolveContexts, resolveValues ) )
-						.fail( deferred.reject )
-						.progress( updateFunc( i, progressContexts, progressValues ) );
-				} else {
-					--remaining;
-				}
-			}
-		}
-
-		// if we're not waiting on anything, resolve the master
-		if ( !remaining ) {
-			deferred.resolveWith( resolveContexts, resolveValues );
-		}
-
-		return deferred.promise();
-	}
-});
-jQuery.support = (function() {
-
-	var support, all, a,
-		input, select, fragment,
-		opt, eventName, isSupported, i,
-		div = document.createElement("div");
-
-	// Setup
-	div.setAttribute( "className", "t" );
-	div.innerHTML = "  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>";
-
-	// Support tests won't run in some limited or non-browser environments
-	all = div.getElementsByTagName("*");
-	a = div.getElementsByTagName("a")[ 0 ];
-	if ( !all || !a || !all.length ) {
-		return {};
-	}
-
-	// First batch of tests
-	select = document.createElement("select");
-	opt = select.appendChild( document.createElement("option") );
-	input = div.getElementsByTagName("input")[ 0 ];
-
-	a.style.cssText = "top:1px;float:left;opacity:.5";
-	support = {
-		// Test setAttribute on camelCase class. If it works, we need attrFixes when doing get/setAttribute (ie6/7)
-		getSetAttribute: div.className !== "t",
-
-		// IE strips leading whitespace when .innerHTML is used
-		leadingWhitespace: div.firstChild.nodeType === 3,
-
-		// Make sure that tbody elements aren't automatically inserted
-		// IE will insert them into empty tables
-		tbody: !div.getElementsByTagName("tbody").length,
-
-		// Make sure that link elements get serialized correctly by innerHTML
-		// This requires a wrapper element in IE
-		htmlSerialize: !!div.getElementsByTagName("link").length,
-
-		// Get the style information from getAttribute
-		// (IE uses .cssText instead)
-		style: /top/.test( a.getAttribute("style") ),
-
-		// Make sure that URLs aren't manipulated
-		// (IE normalizes it by default)
-		hrefNormalized: a.getAttribute("href") === "/a",
-
-		// Make sure that element opacity exists
-		// (IE uses filter instead)
-		// Use a regex to work around a WebKit issue. See #5145
-		opacity: /^0.5/.test( a.style.opacity ),
-
-		// Verify style float existence
-		// (IE uses styleFloat instead of cssFloat)
-		cssFloat: !!a.style.cssFloat,
-
-		// Check the default checkbox/radio value ("" on WebKit; "on" elsewhere)
-		checkOn: !!input.value,
-
-		// Make sure that a selected-by-default option has a working selected property.
-		// (WebKit defaults to false instead of true, IE too, if it's in an optgroup)
-		optSelected: opt.selected,
-
-		// Tests for enctype support on a form (#6743)
-		enctype: !!document.createElement("form").enctype,
-
-		// Makes sure cloning an html5 element does not cause problems
-		// Where outerHTML is undefined, this still works
-		html5Clone: document.createElement("nav").cloneNode( true ).outerHTML !== "<:nav></:nav>",
-
-		// jQuery.support.boxModel DEPRECATED in 1.8 since we don't support Quirks Mode
-		boxModel: document.compatMode === "CSS1Compat",
-
-		// Will be defined later
-		deleteExpando: true,
-		noCloneEvent: true,
-		inlineBlockNeedsLayout: false,
-		shrinkWrapBlocks: false,
-		reliableMarginRight: true,
-		boxSizingReliable: true,
-		pixelPosition: false
-	};
-
-	// Make sure checked status is properly cloned
-	input.checked = true;
-	support.noCloneChecked = input.cloneNode( true ).checked;
-
-	// Make sure that the options inside disabled selects aren't marked as disabled
-	// (WebKit marks them as disabled)
-	select.disabled = true;
-	support.optDisabled = !opt.disabled;
-
-	// Support: IE<9
-	try {
-		delete div.test;
-	} catch( e ) {
-		support.deleteExpando = false;
-	}
-
-	// Check if we can trust getAttribute("value")
-	input = document.createElement("input");
-	input.setAttribute( "value", "" );
-	support.input = input.getAttribute( "value" ) === "";
-
-	// Check if an input maintains its value after becoming a radio
-	input.value = "t";
-	input.setAttribute( "type", "radio" );
-	support.radioValue = input.value === "t";
-
-	// #11217 - WebKit loses check when the name is after the checked attribute
-	input.setAttribute( "checked", "t" );
-	input.setAttribute( "name", "t" );
-
-	fragment = document.createDocumentFragment();
-	fragment.appendChild( input );
-
-	// Check if a disconnected checkbox will retain its checked
-	// value of true after appended to the DOM (IE6/7)
-	support.appendChecked = input.checked;
-
-	// WebKit doesn't clone checked state correctly in fragments
-	support.checkClone = fragment.cloneNode( true ).cloneNode( true ).lastChild.checked;
-
-	// Support: IE<9
-	// Opera does not clone events (and typeof div.attachEvent === undefined).
-	// IE9-10 clones events bound via attachEvent, but they don't trigger with .click()
-	if ( div.attachEvent ) {
-		div.attachEvent( "onclick", function() {
-			support.noCloneEvent = false;
-		});
-
-		div.cloneNode( true ).click();
-	}
-
-	// Support: IE<9 (lack submit/change bubble), Firefox 17+ (lack focusin event)
-	// Beware of CSP restrictions (https://developer.mozilla.org/en/Security/CSP), test/csp.php
-	for ( i in { submit: true, change: true, focusin: true }) {
-		div.setAttribute( eventName = "on" + i, "t" );
-
-		support[ i + "Bubbles" ] = eventName in window || div.attributes[ eventName ].expando === false;
-	}
-
-	div.style.backgroundClip = "content-box";
-	div.cloneNode( true ).style.backgroundClip = "";
-	support.clearCloneStyle = div.style.backgroundClip === "content-box";
-
-	// Run tests that need a body at doc ready
-	jQuery(function() {
-		var container, marginDiv, tds,
-			divReset = "padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;",
-			body = document.getElementsByTagName("body")[0];
-
-		if ( !body ) {
-			// Return for frameset docs that don't have a body
-			return;
-		}
-
-		container = document.createElement("div");
-		container.style.cssText = "border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px";
-
-		body.appendChild( container ).appendChild( div );
-
-		// Support: IE8
-		// Check if table cells still have offsetWidth/Height when they are set
-		// to display:none and there are still other visible table cells in a
-		// table row; if so, offsetWidth/Height are not reliable for use when
-		// determining if an element has been hidden directly using
-		// display:none (it is still safe to use offsets if a parent element is
-		// hidden; don safety goggles and see bug #4512 for more information).
-		div.innerHTML = "<table><tr><td></td><td>t</td></tr></table>";
-		tds = div.getElementsByTagName("td");
-		tds[ 0 ].style.cssText = "padding:0;margin:0;border:0;display:none";
-		isSupported = ( tds[ 0 ].offsetHeight === 0 );
-
-		tds[ 0 ].style.display = "";
-		tds[ 1 ].style.display = "none";
-
-		// Support: IE8
-		// Check if empty table cells still have offsetWidth/Height
-		support.reliableHiddenOffsets = isSupported && ( tds[ 0 ].offsetHeight === 0 );
-
-		// Check box-sizing and margin behavior
-		div.innerHTML = "";
-		div.style.cssText = "box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;";
-		support.boxSizing = ( div.offsetWidth === 4 );
-		support.doesNotIncludeMarginInBodyOffset = ( body.offsetTop !== 1 );
-
-		// Use window.getComputedStyle because jsdom on node.js will break without it.
-		if ( window.getComputedStyle ) {
-			support.pixelPosition = ( window.getComputedStyle( div, null ) || {} ).top !== "1%";
-			support.boxSizingReliable = ( window.getComputedStyle( div, null ) || { width: "4px" } ).width === "4px";
-
-			// Check if div with explicit width and no margin-right incorrectly
-			// gets computed margin-right based on width of container. (#3333)
-			// Fails in WebKit before Feb 2011 nightlies
-			// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
-			marginDiv = div.appendChild( document.createElement("div") );
-			marginDiv.style.cssText = div.style.cssText = divReset;
-			marginDiv.style.marginRight = marginDiv.style.width = "0";
-			div.style.width = "1px";
-
-			support.reliableMarginRight =
-				!parseFloat( ( window.getComputedStyle( marginDiv, null ) || {} ).marginRight );
-		}
-
-		if ( typeof div.style.zoom !== core_strundefined ) {
-			// Support: IE<8
-			// Check if natively block-level elements act like inline-block
-			// elements when setting their display to 'inline' and giving
-			// them layout
-			div.innerHTML = "";
-			div.style.cssText = divReset + "width:1px;padding:1px;display:inline;zoom:1";
-			support.inlineBlockNeedsLayout = ( div.offsetWidth === 3 );
-
-			// Support: IE6
-			// Check if elements with layout shrink-wrap their children
-			div.style.display = "block";
-			div.innerHTML = "<div></div>";
-			div.firstChild.style.width = "5px";
-			support.shrinkWrapBlocks = ( div.offsetWidth !== 3 );
-
-			if ( support.inlineBlockNeedsLayout ) {
-				// Prevent IE 6 from affecting layout for positioned elements #11048
-				// Prevent IE from shrinking the body in IE 7 mode #12869
-				// Support: IE<8
-				body.style.zoom = 1;
-			}
-		}
-
-		body.removeChild( container );
-
-		// Null elements to avoid leaks in IE
-		container = div = tds = marginDiv = null;
-	});
-
-	// Null elements to avoid leaks in IE
-	all = select = fragment = opt = a = input = null;
-
-	return support;
-})();
-
-var rbrace = /(?:\{[\s\S]*\}|\[[\s\S]*\])$/,
-	rmultiDash = /([A-Z])/g;
-
-function internalData( elem, name, data, pvt /* Internal Use Only */ ){
-	if ( !jQuery.acceptData( elem ) ) {
-		return;
-	}
-
-	var thisCache, ret,
-		internalKey = jQuery.expando,
-		getByName = typeof name === "string",
-
-		// We have to handle DOM nodes and JS objects differently because IE6-7
-		// can't GC object references properly across the DOM-JS boundary
-		isNode = elem.nodeType,
-
-		// Only DOM nodes need the global jQuery cache; JS object data is
-		// attached directly to the object so GC can occur automatically
-		cache = isNode ? jQuery.cache : elem,
-
-		// Only defining an ID for JS objects if its cache already exists allows
-		// the code to shortcut on the same path as a DOM node with no cache
-		id = isNode ? elem[ internalKey ] : elem[ internalKey ] && internalKey;
-
-	// Avoid doing any more work than we need to when trying to get data on an
-	// object that has no data at all
-	if ( (!id || !cache[id] || (!pvt && !cache[id].data)) && getByName && data === undefined ) {
-		return;
-	}
-
-	if ( !id ) {
-		// Only DOM nodes need a new unique ID for each element since their data
-		// ends up in the global cache
-		if ( isNode ) {
-			elem[ internalKey ] = id = core_deletedIds.pop() || jQuery.guid++;
-		} else {
-			id = internalKey;
-		}
-	}
-
-	if ( !cache[ id ] ) {
-		cache[ id ] = {};
-
-		// Avoids exposing jQuery metadata on plain JS objects when the object
-		// is serialized using JSON.stringify
-		if ( !isNode ) {
-			cache[ id ].toJSON = jQuery.noop;
-		}
-	}
-
-	// An object can be passed to jQuery.data instead of a key/value pair; this gets
-	// shallow copied over onto the existing cache
-	if ( typeof name === "object" || typeof name === "function" ) {
-		if ( pvt ) {
-			cache[ id ] = jQuery.extend( cache[ id ], name );
-		} else {
-			cache[ id ].data = jQuery.extend( cache[ id ].data, name );
-		}
-	}
-
-	thisCache = cache[ id ];
-
-	// jQuery data() is stored in a separate object inside the object's internal data
-	// cache in order to avoid key collisions between internal data and user-defined
-	// data.
-	if ( !pvt ) {
-		if ( !thisCache.data ) {
-			thisCache.data = {};
-		}
-
-		thisCache = thisCache.data;
-	}
-
-	if ( data !== undefined ) {
-		thisCache[ jQuery.camelCase( name ) ] = data;
-	}
-
-	// Check for both converted-to-camel and non-converted data property names
-	// If a data property was specified
-	if ( getByName ) {
-
-		// First Try to find as-is property data
-		ret = thisCache[ name ];
-
-		// Test for null|undefined property data
-		if ( ret == null ) {
-
-			// Try to find the camelCased property
-			ret = thisCache[ jQuery.camelCase( name ) ];
-		}
-	} else {
-		ret = thisCache;
-	}
-
-	return ret;
-}
-
-function internalRemoveData( elem, name, pvt ) {
-	if ( !jQuery.acceptData( elem ) ) {
-		return;
-	}
-
-	var i, l, thisCache,
-		isNode = elem.nodeType,
-
-		// See jQuery.data for more information
-		cache = isNode ? jQuery.cache : elem,
-		id = isNode ? elem[ jQuery.expando ] : jQuery.expando;
-
-	// If there is already no cache entry for this object, there is no
-	// purpose in continuing
-	if ( !cache[ id ] ) {
-		return;
-	}
-
-	if ( name ) {
-
-		thisCache = pvt ? cache[ id ] : cache[ id ].data;
-
-		if ( thisCache ) {
-
-			// Support array or space separated string names for data keys
-			if ( !jQuery.isArray( name ) ) {
-
-				// try the string as a key before any manipulation
-				if ( name in thisCache ) {
-					name = [ name ];
-				} else {
-
-					// split the camel cased version by spaces unless a key with the spaces exists
-					name = jQuery.camelCase( name );
-					if ( name in thisCache ) {
-						name = [ name ];
-					} else {
-						name = name.split(" ");
-					}
-				}
-			} else {
-				// If "name" is an array of keys...
-				// When data is initially created, via ("key", "val") signature,
-				// keys will be converted to camelCase.
-				// Since there is no way to tell _how_ a key was added, remove
-				// both plain key and camelCase key. #12786
-				// This will only penalize the array argument path.
-				name = name.concat( jQuery.map( name, jQuery.camelCase ) );
-			}
-
-			for ( i = 0, l = name.length; i < l; i++ ) {
-				delete thisCache[ name[i] ];
-			}
-
-			// If there is no data left in the cache, we want to continue
-			// and let the cache object itself get destroyed
-			if ( !( pvt ? isEmptyDataObject : jQuery.isEmptyObject )( thisCache ) ) {
-				return;
-			}
-		}
-	}
-
-	// See jQuery.data for more information
-	if ( !pvt ) {
-		delete cache[ id ].data;
-
-		// Don't destroy the parent cache unless the internal data object
-		// had been the only thing left in it
-		if ( !isEmptyDataObject( cache[ id ] ) ) {
-			return;
-		}
-	}
-
-	// Destroy the cache
-	if ( isNode ) {
-		jQuery.cleanData( [ elem ], true );
-
-	// Use delete when supported for expandos or `cache` is not a window per isWindow (#10080)
-	} else if ( jQuery.support.deleteExpando || cache != cache.window ) {
-		delete cache[ id ];
-
-	// When all else fails, null
-	} else {
-		cache[ id ] = null;
-	}
-}
-
-jQuery.extend({
-	cache: {},
-
-	// Unique for each copy of jQuery on the page
-	// Non-digits removed to match rinlinejQuery
-	expando: "jQuery" + ( core_version + Math.random() ).replace( /\D/g, "" ),
-
-	// The following elements throw uncatchable exceptions if you
-	// attempt to add expando properties to them.
-	noData: {
-		"embed": true,
-		// Ban all objects except for Flash (which handle expandos)
-		"object": "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",
-		"applet": true
-	},
-
-	hasData: function( elem ) {
-		elem = elem.nodeType ? jQuery.cache[ elem[jQuery.expando] ] : elem[ jQuery.expando ];
-		return !!elem && !isEmptyDataObject( elem );
-	},
-
-	data: function( elem, name, data ) {
-		return internalData( elem, name, data );
-	},
-
-	removeData: function( elem, name ) {
-		return internalRemoveData( elem, name );
-	},
-
-	// For internal use only.
-	_data: function( elem, name, data ) {
-		return internalData( elem, name, data, true );
-	},
-
-	_removeData: function( elem, name ) {
-		return internalRemoveData( elem, name, true );
-	},
-
-	// A method for determining if a DOM node can handle the data expando
-	acceptData: function( elem ) {
-		// Do not set data on non-element because it will not be cleared (#8335).
-		if ( elem.nodeType && elem.nodeType !== 1 && elem.nodeType !== 9 ) {
-			return false;
-		}
-
-		var noData = elem.nodeName && jQuery.noData[ elem.nodeName.toLowerCase() ];
-
-		// nodes accept data unless otherwise specified; rejection can be conditional
-		return !noData || noData !== true && elem.getAttribute("classid") === noData;
-	}
-});
-
-jQuery.fn.extend({
-	data: function( key, value ) {
-		var attrs, name,
-			elem = this[0],
-			i = 0,
-			data = null;
-
-		// Gets all values
-		if ( key === undefined ) {
-			if ( this.length ) {
-				data = jQuery.data( elem );
-
-				if ( elem.nodeType === 1 && !jQuery._data( elem, "parsedAttrs" ) ) {
-					attrs = elem.attributes;
-					for ( ; i < attrs.length; i++ ) {
-						name = attrs[i].name;
-
-						if ( !name.indexOf( "data-" ) ) {
-							name = jQuery.camelCase( name.slice(5) );
-
-							dataAttr( elem, name, data[ name ] );
-						}
-					}
-					jQuery._data( elem, "parsedAttrs", true );
-				}
-			}
-
-			return data;
-		}
-
-		// Sets multiple values
-		if ( typeof key === "object" ) {
-			return this.each(function() {
-				jQuery.data( this, key );
-			});
-		}
-
-		return jQuery.access( this, function( value ) {
-
-			if ( value === undefined ) {
-				// Try to fetch any internally stored data first
-				return elem ? dataAttr( elem, key, jQuery.data( elem, key ) ) : null;
-			}
-
-			this.each(function() {
-				jQuery.data( this, key, value );
-			});
-		}, null, value, arguments.length > 1, null, true );
-	},
-
-	removeData: function( key ) {
-		return this.each(function() {
-			jQuery.removeData( this, key );
-		});
-	}
-});
-
-function dataAttr( elem, key, data ) {
-	// If nothing was found internally, try to fetch any
-	// data from the HTML5 data-* attribute
-	if ( data === undefined && elem.nodeType === 1 ) {
-
-		var name = "data-" + key.replace( rmultiDash, "-$1" ).toLowerCase();
-
-		data = elem.getAttribute( name );
-
-		if ( typeof data === "string" ) {
-			try {
-				data = data === "true" ? true :
-					data === "false" ? false :
-					data === "null" ? null :
-					// Only convert to a number if it doesn't change the string
-					+data + "" === data ? +data :
-					rbrace.test( data ) ? jQuery.parseJSON( data ) :
-						data;
-			} catch( e ) {}
-
-			// Make sure we set the data so it isn't changed later
-			jQuery.data( elem, key, data );
-
-		} else {
-			data = undefined;
-		}
-	}
-
-	return data;
-}
-
-// checks a cache object for emptiness
-function isEmptyDataObject( obj ) {
-	var name;
-	for ( name in obj ) {
-
-		// if the public data object is empty, the private is still empty
-		if ( name === "data" && jQuery.isEmptyObject( obj[name] ) ) {
-			continue;
-		}
-		if ( name !== "toJSON" ) {
-			return false;
-		}
-	}
-
-	return true;
-}
-jQuery.extend({
-	queue: function( elem, type, data ) {
-		var queue;
-
-		if ( elem ) {
-			type = ( type || "fx" ) + "queue";
-			queue = jQuery._data( elem, type );
-
-			// Speed up dequeue by getting out quickly if this is just a lookup
-			if ( data ) {
-				if ( !queue || jQuery.isArray(data) ) {
-					queue = jQuery._data( elem, type, jQuery.makeArray(data) );
-				} else {
-					queue.push( data );
-				}
-			}
-			return queue || [];
-		}
-	},
-
-	dequeue: function( elem, type ) {
-		type = type || "fx";
-
-		var queue = jQuery.queue( elem, type ),
-			startLength = queue.length,
-			fn = queue.shift(),
-			hooks = jQuery._queueHooks( elem, type ),
-			next = function() {
-				jQuery.dequeue( elem, type );
-			};
-
-		// If the fx queue is dequeued, always remove the progress sentinel
-		if ( fn === "inprogress" ) {
-			fn = queue.shift();
-			startLength--;
-		}
-
-		hooks.cur = fn;
-		if ( fn ) {
-
-			// Add a progress sentinel to prevent the fx queue from being
-			// automatically dequeued
-			if ( type === "fx" ) {
-				queue.unshift( "inprogress" );
-			}
-
-			// clear up the last queue stop function
-			delete hooks.stop;
-			fn.call( elem, next, hooks );
-		}
-
-		if ( !startLength && hooks ) {
-			hooks.empty.fire();
-		}
-	},
-
-	// not intended for public consumption - generates a queueHooks object, or returns the current one
-	_queueHooks: function( elem, type ) {
-		var key = type + "queueHooks";
-		return jQuery._data( elem, key ) || jQuery._data( elem, key, {
-			empty: jQuery.Callbacks("once memory").add(function() {
-				jQuery._removeData( elem, type + "queue" );
-				jQuery._removeData( elem, key );
-			})
-		});
-	}
-});
-
-jQuery.fn.extend({
-	queue: function( type, data ) {
-		var setter = 2;
-
-		if ( typeof type !== "string" ) {
-			data = type;
-			type = "fx";
-			setter--;
-		}
-
-		if ( arguments.length < setter ) {
-			return jQuery.queue( this[0], type );
-		}
-
-		return data === undefined ?
-			this :
-			this.each(function() {
-				var queue = jQuery.queue( this, type, data );
-
-				// ensure a hooks for this queue
-				jQuery._queueHooks( this, type );
-
-				if ( type === "fx" && queue[0] !== "inprogress" ) {
-					jQuery.dequeue( this, type );
-				}
-			});
-	},
-	dequeue: function( type ) {
-		return this.each(function() {
-			jQuery.dequeue( this, type );
-		});
-	},
-	// Based off of the plugin by Clint Helfers, with permission.
-	// http://blindsignals.com/index.php/2009/07/jquery-delay/
-	delay: function( time, type ) {
-		time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time;
-		type = type || "fx";
-
-		return this.queue( type, function( next, hooks ) {
-			var timeout = setTimeout( next, time );
-			hooks.stop = function() {
-				clearTimeout( timeout );
-			};
-		});
-	},
-	clearQueue: function( type ) {
-		return this.queue( type || "fx", [] );
-	},
-	// Get a promise resolved when queues of a certain type
-	// are emptied (fx is the type by default)
-	promise: function( type, obj ) {
-		var tmp,
-			count = 1,
-			defer = jQuery.Deferred(),
-			elements = this,
-			i = this.length,
-			resolve = function() {
-				if ( !( --count ) ) {
-					defer.resolveWith( elements, [ elements ] );
-				}
-			};
-
-		if ( typeof type !== "string" ) {
-			obj = type;
-			type = undefined;
-		}
-		type = type || "fx";
-
-		while( i-- ) {
-			tmp = jQuery._data( elements[ i ], type + "queueHooks" );
-			if ( tmp && tmp.empty ) {
-				count++;
-				tmp.empty.add( resolve );
-			}
-		}
-		resolve();
-		return defer.promise( obj );
-	}
-});
-var nodeHook, boolHook,
-	rclass = /[\t\r\n]/g,
-	rreturn = /\r/g,
-	rfocusable = /^(?:input|select|textarea|button|object)$/i,
-	rclickable = /^(?:a|area)$/i,
-	rboolean = /^(?:checked|selected|autofocus|autoplay|async|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped)$/i,
-	ruseDefault = /^(?:checked|selected)$/i,
-	getSetAttribute = jQuery.support.getSetAttribute,
-	getSetInput = jQuery.support.input;
-
-jQuery.fn.extend({
-	attr: function( name, value ) {
-		return jQuery.access( this, jQuery.attr, name, value, arguments.length > 1 );
-	},
-
-	removeAttr: function( name ) {
-		return this.each(function() {
-			jQuery.removeAttr( this, name );
-		});
-	},
-
-	prop: function( name, value ) {
-		return jQuery.access( this, jQuery.prop, name, value, arguments.length > 1 );
-	},
-
-	removeProp: function( name ) {
-		name = jQuery.propFix[ name ] || name;
-		return this.each(function() {
-			// try/catch handles cases where IE balks (such as removing a property on window)
-			try {
-				this[ name ] = undefined;
-				delete this[ name ];
-			} catch( e ) {}
-		});
-	},
-
-	addClass: function( value ) {
-		var classes, elem, cur, clazz, j,
-			i = 0,
-			len = this.length,
-			proceed = typeof value === "string" && value;
-
-		if ( jQuery.isFunction( value ) ) {
-			return this.each(function( j ) {
-				jQuery( this ).addClass( value.call( this, j, this.className ) );
-			});
-		}
-
-		if ( proceed ) {
-			// The disjunction here is for better compressibility (see removeClass)
-			classes = ( value || "" ).match( core_rnotwhite ) || [];
-
-			for ( ; i < len; i++ ) {
-				elem = this[ i ];
-				cur = elem.nodeType === 1 && ( elem.className ?
-					( " " + elem.className + " " ).replace( rclass, " " ) :
-					" "
-				);
-
-				if ( cur ) {
-					j = 0;
-					while ( (clazz = classes[j++]) ) {
-						if ( cur.indexOf( " " + clazz + " " ) < 0 ) {
-							cur += clazz + " ";
-						}
-					}
-					elem.className = jQuery.trim( cur );
-
-				}
-			}
-		}
-
-		return this;
-	},
-
-	removeClass: function( value ) {
-		var classes, elem, cur, clazz, j,
-			i = 0,
-			len = this.length,
-			proceed = arguments.length === 0 || typeof value === "string" && value;
-
-		if ( jQuery.isFunction( value ) ) {
-			return this.each(function( j ) {
-				jQuery( this ).removeClass( value.call( this, j, this.className ) );
-			});
-		}
-		if ( proceed ) {
-			classes = ( value || "" ).match( core_rnotwhite ) || [];
-
-			for ( ; i < len; i++ ) {
-				elem = this[ i ];
-				// This expression is here for better compressibility (see addClass)
-				cur = elem.nodeType === 1 && ( elem.className ?
-					( " " + elem.className + " " ).replace( rclass, " " ) :
-					""
-				);
-
-				if ( cur ) {
-					j = 0;
-					while ( (clazz = classes[j++]) ) {
-						// Remove *all* instances
-						while ( cur.indexOf( " " + clazz + " " ) >= 0 ) {
-							cur = cur.replace( " " + clazz + " ", " " );
-						}
-					}
-					elem.className = value ? jQuery.trim( cur ) : "";
-				}
-			}
-		}
-
-		return this;
-	},
-
-	toggleClass: function( value, stateVal ) {
-		var type = typeof value,
-			isBool = typeof stateVal === "boolean";
-
-		if ( jQuery.isFunction( value ) ) {
-			return this.each(function( i ) {
-				jQuery( this ).toggleClass( value.call(this, i, this.className, stateVal), stateVal );
-			});
-		}
-
-		return this.each(function() {
-			if ( type === "string" ) {
-				// toggle individual class names
-				var className,
-					i = 0,
-					self = jQuery( this ),
-					state = stateVal,
-					classNames = value.match( core_rnotwhite ) || [];
-
-				while ( (className = classNames[ i++ ]) ) {
-					// check each className given, space separated list
-					state = isBool ? state : !self.hasClass( className );
-					self[ state ? "addClass" : "removeClass" ]( className );
-				}
-
-			// Toggle whole class name
-			} else if ( type === core_strundefined || type === "boolean" ) {
-				if ( this.className ) {
-					// store className if set
-					jQuery._data( this, "__className__", this.className );
-				}
-
-				// If the element has a class name or if we're passed "false",
-				// then remove the whole classname (if there was one, the above saved it).
-				// Otherwise bring back whatever was previously saved (if anything),
-				// falling back to the empty string if nothing was stored.
-				this.className = this.className || value === false ? "" : jQuery._data( this, "__className__" ) || "";
-			}
-		});
-	},
-
-	hasClass: function( selector ) {
-		var className = " " + selector + " ",
-			i = 0,
-			l = this.length;
-		for ( ; i < l; i++ ) {
-			if ( this[i].nodeType === 1 && (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) >= 0 ) {
-				return true;
-			}
-		}
-
-		return false;
-	},
-
-	val: function( value ) {
-		var ret, hooks, isFunction,
-			elem = this[0];
-
-		if ( !arguments.length ) {
-			if ( elem ) {
-				hooks = jQuery.valHooks[ elem.type ] || jQuery.valHooks[ elem.nodeName.toLowerCase() ];
-
-				if ( hooks && "get" in hooks && (ret = hooks.get( elem, "value" )) !== undefined ) {
-					return ret;
-				}
-
-				ret = elem.value;
-
-				return typeof ret === "string" ?
-					// handle most common string cases
-					ret.replace(rreturn, "") :
-					// handle cases where value is null/undef or number
-					ret == null ? "" : ret;
-			}
-
-			return;
-		}
-
-		isFunction = jQuery.isFunction( value );
-
-		return this.each(function( i ) {
-			var val,
-				self = jQuery(this);
-
-			if ( this.nodeType !== 1 ) {
-				return;
-			}
-
-			if ( isFunction ) {
-				val = value.call( this, i, self.val() );
-			} else {
-				val = value;
-			}
-
-			// Treat null/undefined as ""; convert numbers to string
-			if ( val == null ) {
-				val = "";
-			} else if ( typeof val === "number" ) {
-				val += "";
-			} else if ( jQuery.isArray( val ) ) {
-				val = jQuery.map(val, function ( value ) {
-					return value == null ? "" : value + "";
-				});
-			}
-
-			hooks = jQuery.valHooks[ this.type ] || jQuery.valHooks[ this.nodeName.toLowerCase() ];
-
-			// If set returns undefined, fall back to normal setting
-			if ( !hooks || !("set" in hooks) || hooks.set( this, val, "value" ) === undefined ) {
-				this.value = val;
-			}
-		});
-	}
-});
-
-jQuery.extend({
-	valHooks: {
-		option: {
-			get: function( elem ) {
-				// attributes.value is undefined in Blackberry 4.7 but
-				// uses .value. See #6932
-				var val = elem.attributes.value;
-				return !val || val.specified ? elem.value : elem.text;
-			}
-		},
-		select: {
-			get: function( elem ) {
-				var value, option,
-					options = elem.options,
-					index = elem.selectedIndex,
-					one = elem.type === "select-one" || index < 0,
-					values = one ? null : [],
-					max = one ? index + 1 : options.length,
-					i = index < 0 ?
-						max :
-						one ? index : 0;
-
-				// Loop through all the selected options
-				for ( ; i < max; i++ ) {
-					option = options[ i ];
-
-					// oldIE doesn't update selected after form reset (#2551)
-					if ( ( option.selected || i === index ) &&
-							// Don't return options that are disabled or in a disabled optgroup
-							( jQuery.support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null ) &&
-							( !option.parentNode.disabled || !jQuery.nodeName( option.parentNode, "optgroup" ) ) ) {
-
-						// Get the specific value for the option
-						value = jQuery( option ).val();
-
-						// We don't need an array for one selects
-						if ( one ) {
-							return value;
-						}
-
-						// Multi-Selects return an array
-						values.push( value );
-					}
-				}
-
-				return values;
-			},
-
-			set: function( elem, value ) {
-				var values = jQuery.makeArray( value );
-
-				jQuery(elem).find("option").each(function() {
-					this.selected = jQuery.inArray( jQuery(this).val(), values ) >= 0;
-				});
-
-				if ( !values.length ) {
-					elem.selectedIndex = -1;
-				}
-				return values;
-			}
-		}
-	},
-
-	attr: function( elem, name, value ) {
-		var hooks, notxml, ret,
-			nType = elem.nodeType;
-
-		// don't get/set attributes on text, comment and attribute nodes
-		if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
-			return;
-		}
-
-		// Fallback to prop when attributes are not supported
-		if ( typeof elem.getAttribute === core_strundefined ) {
-			return jQuery.prop( elem, name, value );
-		}
-
-		notxml = nType !== 1 || !jQuery.isXMLDoc( elem );
-
-		// All attributes are lowercase
-		// Grab necessary hook if one is defined
-		if ( notxml ) {
-			name = name.toLowerCase();
-			hooks = jQuery.attrHooks[ name ] || ( rboolean.test( name ) ? boolHook : nodeHook );
-		}
-
-		if ( value !== undefined ) {
-
-			if ( value === null ) {
-				jQuery.removeAttr( elem, name );
-
-			} else if ( hooks && notxml && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ) {
-				return ret;
-
-			} else {
-				elem.setAttribute( name, value + "" );
-				return value;
-			}
-
-		} else if ( hooks && notxml && "get" in hooks && (ret = hooks.get( elem, name )) !== null ) {
-			return ret;
-
-		} else {
-
-			// In IE9+, Flash objects don't have .getAttribute (#12945)
-			// Support: IE9+
-			if ( typeof elem.getAttribute !== core_strundefined ) {
-				ret =  elem.getAttribute( name );
-			}
-
-			// Non-existent attributes return null, we normalize to undefined
-			return ret == null ?
-				undefined :
-				ret;
-		}
-	},
-
-	removeAttr: function( elem, value ) {
-		var name, propName,
-			i = 0,
-			attrNames = value && value.match( core_rnotwhite );
-
-		if ( attrNames && elem.nodeType === 1 ) {
-			while ( (name = attrNames[i++]) ) {
-				propName = jQuery.propFix[ name ] || name;
-
-				// Boolean attributes get special treatment (#10870)
-				if ( rboolean.test( name ) ) {
-					// Set corresponding property to false for boolean attributes
-					// Also clear defaultChecked/defaultSelected (if appropriate) for IE<8
-					if ( !getSetAttribute && ruseDefault.test( name ) ) {
-						elem[ jQuery.camelCase( "default-" + name ) ] =
-							elem[ propName ] = false;
-					} else {
-						elem[ propName ] = false;
-					}
-
-				// See #9699 for explanation of this approach (setting first, then removal)
-				} else {
-					jQuery.attr( elem, name, "" );
-				}
-
-				elem.removeAttribute( getSetAttribute ? name : propName );
-			}
-		}
-	},
-
-	attrHooks: {
-		type: {
-			set: function( elem, value ) {
-				if ( !jQuery.support.radioValue && value === "radio" && jQuery.nodeName(elem, "input") ) {
-					// Setting the type on a radio button after the value resets the value in IE6-9
-					// Reset value to default in case type is set after value during creation
-					var val = elem.value;
-					elem.setAttribute( "type", value );
-					if ( val ) {
-						elem.value = val;
-					}
-					return value;
-				}
-			}
-		}
-	},
-
-	propFix: {
-		tabindex: "tabIndex",
-		readonly: "readOnly",
-		"for": "htmlFor",
-		"class": "className",
-		maxlength: "maxLength",
-		cellspacing: "cellSpacing",
-		cellpadding: "cellPadding",
-		rowspan: "rowSpan",
-		colspan: "colSpan",
-		usemap: "useMap",
-		frameborder: "frameBorder",
-		contenteditable: "contentEditable"
-	},
-
-	prop: function( elem, name, value ) {
-		var ret, hooks, notxml,
-			nType = elem.nodeType;
-
-		// don't get/set properties on text, comment and attribute nodes
-		if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
-			return;
-		}
-
-		notxml = nType !== 1 || !jQuery.isXMLDoc( elem );
-
-		if ( notxml ) {
-			// Fix name and attach hooks
-			name = jQuery.propFix[ name ] || name;
-			hooks = jQuery.propHooks[ name ];
-		}
-
-		if ( value !== undefined ) {
-			if ( hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ) {
-				return ret;
-
-			} else {
-				return ( elem[ name ] = value );
-			}
-
-		} else {
-			if ( hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ) {
-				return ret;
-
-			} else {
-				return elem[ name ];
-			}
-		}
-	},
-
-	propHooks: {
-		tabIndex: {
-			get: function( elem ) {
-				// elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set
-				// http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
-				var attributeNode = elem.getAttributeNode("tabindex");
-
-				return attributeNode && attributeNode.specified ?
-					parseInt( attributeNode.value, 10 ) :
-					rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ?
-						0 :
-						undefined;
-			}
-		}
-	}
-});
-
-// Hook for boolean attributes
-boolHook = {
-	get: function( elem, name ) {
-		var
-			// Use .prop to determine if this attribute is understood as boolean
-			prop = jQuery.prop( elem, name ),
-
-			// Fetch it accordingly
-			attr = typeof prop === "boolean" && elem.getAttribute( name ),
-			detail = typeof prop === "boolean" ?
-
-				getSetInput && getSetAttribute ?
-					attr != null :
-					// oldIE fabricates an empty string for missing boolean attributes
-					// and conflates checked/selected into attroperties
-					ruseDefault.test( name ) ?
-						elem[ jQuery.camelCase( "default-" + name ) ] :
-						!!attr :
-
-				// fetch an attribute node for properties not recognized as boolean
-				elem.getAttributeNode( name );
-
-		return detail && detail.value !== false ?
-			name.toLowerCase() :
-			undefined;
-	},
-	set: function( elem, value, name ) {
-		if ( value === false ) {
-			// Remove boolean attributes when set to false
-			jQuery.removeAttr( elem, name );
-		} else if ( getSetInput && getSetAttribute || !ruseDefault.test( name ) ) {
-			// IE<8 needs the *property* name
-			elem.setAttribute( !getSetAttribute && jQuery.propFix[ name ] || name, name );
-
-		// Use defaultChecked and defaultSelected for oldIE
-		} else {
-			elem[ jQuery.camelCase( "default-" + name ) ] = elem[ name ] = true;
-		}
-
-		return name;
-	}
-};
-
-// fix oldIE value attroperty
-if ( !getSetInput || !getSetAttribute ) {
-	jQuery.attrHooks.value = {
-		get: function( elem, name ) {
-			var ret = elem.getAttributeNode( name );
-			return jQuery.nodeName( elem, "input" ) ?
-
-				// Ignore the value *property* by using defaultValue
-				elem.defaultValue :
-
-				ret && ret.specified ? ret.value : undefined;
-		},
-		set: function( elem, value, name ) {
-			if ( jQuery.nodeName( elem, "input" ) ) {
-				// Does not return so that setAttribute is also used
-				elem.defaultValue = value;
-			} else {
-				// Use nodeHook if defined (#1954); otherwise setAttribute is fine
-				return nodeHook && nodeHook.set( elem, value, name );
-			}
-		}
-	};
-}
-
-// IE6/7 do not support getting/setting some attributes with get/setAttribute
-if ( !getSetAttribute ) {
-
-	// Use this for any attribute in IE6/7
-	// This fixes almost every IE6/7 issue
-	nodeHook = jQuery.valHooks.button = {
-		get: function( elem, name ) {
-			var ret = elem.getAttributeNode( name );
-			return ret && ( name === "id" || name === "name" || name === "coords" ? ret.value !== "" : ret.specified ) ?
-				ret.value :
-				undefined;
-		},
-		set: function( elem, value, name ) {
-			// Set the existing or create a new attribute node
-			var ret = elem.getAttributeNode( name );
-			if ( !ret ) {
-				elem.setAttributeNode(
-					(ret = elem.ownerDocument.createAttribute( name ))
-				);
-			}
-
-			ret.value = value += "";
-
-			// Break association with cloned elements by also using setAttribute (#9646)
-			return name === "value" || value === elem.getAttribute( name ) ?
-				value :
-				undefined;
-		}
-	};
-
-	// Set contenteditable to false on removals(#10429)
-	// Setting to empty string throws an error as an invalid value
-	jQuery.attrHooks.contenteditable = {
-		get: nodeHook.get,
-		set: function( elem, value, name ) {
-			nodeHook.set( elem, value === "" ? false : value, name );
-		}
-	};
-
-	// Set width and height to auto instead of 0 on empty string( Bug #8150 )
-	// This is for removals
-	jQuery.each([ "width", "height" ], function( i, name ) {
-		jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], {
-			set: function( elem, value ) {
-				if ( value === "" ) {
-					elem.setAttribute( name, "auto" );
-					return value;
-				}
-			}
-		});
-	});
-}
-
-
-// Some attributes require a special call on IE
-// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx
-if ( !jQuery.support.hrefNormalized ) {
-	jQuery.each([ "href", "src", "width", "height" ], function( i, name ) {
-		jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], {
-			get: function( elem ) {
-				var ret = elem.getAttribute( name, 2 );
-				return ret == null ? undefined : ret;
-			}
-		});
-	});
-
-	// href/src property should get the full normalized URL (#10299/#12915)
-	jQuery.each([ "href", "src" ], function( i, name ) {
-		jQuery.propHooks[ name ] = {
-			get: function( elem ) {
-				return elem.getAttribute( name, 4 );
-			}
-		};
-	});
-}
-
-if ( !jQuery.support.style ) {
-	jQuery.attrHooks.style = {
-		get: function( elem ) {
-			// Return undefined in the case of empty string
-			// Note: IE uppercases css property names, but if we were to .toLowerCase()
-			// .cssText, that would destroy case senstitivity in URL's, like in "background"
-			return elem.style.cssText || undefined;
-		},
-		set: function( elem, value ) {
-			return ( elem.style.cssText = value + "" );
-		}
-	};
-}
-
-// Safari mis-reports the default selected property of an option
-// Accessing the parent's selectedIndex property fixes it
-if ( !jQuery.support.optSelected ) {
-	jQuery.propHooks.selected = jQuery.extend( jQuery.propHooks.selected, {
-		get: function( elem ) {
-			var parent = elem.parentNode;
-
-			if ( parent ) {
-				parent.selectedIndex;
-
-				// Make sure that it also works with optgroups, see #5701
-				if ( parent.parentNode ) {
-					parent.parentNode.selectedIndex;
-				}
-			}
-			return null;
-		}
-	});
-}
-
-// IE6/7 call enctype encoding
-if ( !jQuery.support.enctype ) {
-	jQuery.propFix.enctype = "encoding";
-}
-
-// Radios and checkboxes getter/setter
-if ( !jQuery.support.checkOn ) {
-	jQuery.each([ "radio", "checkbox" ], function() {
-		jQuery.valHooks[ this ] = {
-			get: function( elem ) {
-				// Handle the case where in Webkit "" is returned instead of "on" if a value isn't specified
-				return elem.getAttribute("value") === null ? "on" : elem.value;
-			}
-		};
-	});
-}
-jQuery.each([ "radio", "checkbox" ], function() {
-	jQuery.valHooks[ this ] = jQuery.extend( jQuery.valHooks[ this ], {
-		set: function( elem, value ) {
-			if ( jQuery.isArray( value ) ) {
-				return ( elem.checked = jQuery.inArray( jQuery(elem).val(), value ) >= 0 );
-			}
-		}
-	});
-});
-var rformElems = /^(?:input|select|textarea)$/i,
-	rkeyEvent = /^key/,
-	rmouseEvent = /^(?:mouse|contextmenu)|click/,
-	rfocusMorph = /^(?:focusinfocus|focusoutblur)$/,
-	rtypenamespace = /^([^.]*)(?:\.(.+)|)$/;
-
-function returnTrue() {
-	return true;
-}
-
-function returnFalse() {
-	return false;
-}
-
-/*
- * Helper functions for managing events -- not part of the public interface.
- * Props to Dean Edwards' addEvent library for many of the ideas.
- */
-jQuery.event = {
-
-	global: {},
-
-	add: function( elem, types, handler, data, selector ) {
-		var tmp, events, t, handleObjIn,
-			special, eventHandle, handleObj,
-			handlers, type, namespaces, origType,
-			elemData = jQuery._data( elem );
-
-		// Don't attach events to noData or text/comment nodes (but allow plain objects)
-		if ( !elemData ) {
-			return;
-		}
-
-		// Caller can pass in an object of custom data in lieu of the handler
-		if ( handler.handler ) {
-			handleObjIn = handler;
-			handler = handleObjIn.handler;
-			selector = handleObjIn.selector;
-		}
-
-		// Make sure that the handler has a unique ID, used to find/remove it later
-		if ( !handler.guid ) {
-			handler.guid = jQuery.guid++;
-		}
-
-		// Init the element's event structure and main handler, if this is the first
-		if ( !(events = elemData.events) ) {
-			events = elemData.events = {};
-		}
-		if ( !(eventHandle = elemData.handle) ) {
-			eventHandle = elemData.handle = function( e ) {
-				// Discard the second event of a jQuery.event.trigger() and
-				// when an event is called after a page has unloaded
-				return typeof jQuery !== core_strundefined && (!e || jQuery.event.triggered !== e.type) ?
-					jQuery.event.dispatch.apply( eventHandle.elem, arguments ) :
-					undefined;
-			};
-			// Add elem as a property of the handle fn to prevent a memory leak with IE non-native events
-			eventHandle.elem = elem;
-		}
-
-		// Handle multiple events separated by a space
-		// jQuery(...).bind("mouseover mouseout", fn);
-		types = ( types || "" ).match( core_rnotwhite ) || [""];
-		t = types.length;
-		while ( t-- ) {
-			tmp = rtypenamespace.exec( types[t] ) || [];
-			type = origType = tmp[1];
-			namespaces = ( tmp[2] || "" ).split( "." ).sort();
-
-			// If event changes its type, use the special event handlers for the changed type
-			special = jQuery.event.special[ type ] || {};
-
-			// If selector defined, determine special event api type, otherwise given type
-			type = ( selector ? special.delegateType : special.bindType ) || type;
-
-			// Update special based on newly reset type
-			special = jQuery.event.special[ type ] || {};
-
-			// handleObj is passed to all event handlers
-			handleObj = jQuery.extend({
-				type: type,
-				origType: origType,
-				data: data,
-				handler: handler,
-				guid: handler.guid,
-				selector: selector,
-				needsContext: selector && jQuery.expr.match.needsContext.test( selector ),
-				namespace: namespaces.join(".")
-			}, handleObjIn );
-
-			// Init the event handler queue if we're the first
-			if ( !(handlers = events[ type ]) ) {
-				handlers = events[ type ] = [];
-				handlers.delegateCount = 0;
-
-				// Only use addEventListener/attachEvent if the special events handler returns false
-				if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) {
-					// Bind the global event handler to the element
-					if ( elem.addEventListener ) {
-						elem.addEventListener( type, eventHandle, false );
-
-					} else if ( elem.attachEvent ) {
-						elem.attachEvent( "on" + type, eventHandle );
-					}
-				}
-			}
-
-			if ( special.add ) {
-				special.add.call( elem, handleObj );
-
-				if ( !handleObj.handler.guid ) {
-					handleObj.handler.guid = handler.guid;
-				}
-			}
-
-			// Add to the element's handler list, delegates in front
-			if ( selector ) {
-				handlers.splice( handlers.delegateCount++, 0, handleObj );
-			} else {
-				handlers.push( handleObj );
-			}
-
-			// Keep track of which events have ever been used, for event optimization
-			jQuery.event.global[ type ] = true;
-		}
-
-		// Nullify elem to prevent memory leaks in IE
-		elem = null;
-	},
-
-	// Detach an event or set of events from an element
-	remove: function( elem, types, handler, selector, mappedTypes ) {
-		var j, handleObj, tmp,
-			origCount, t, events,
-			special, handlers, type,
-			namespaces, origType,
-			elemData = jQuery.hasData( elem ) && jQuery._data( elem );
-
-		if ( !elemData || !(events = elemData.events) ) {
-			return;
-		}
-
-		// Once for each type.namespace in types; type may be omitted
-		types = ( types || "" ).match( core_rnotwhite ) || [""];
-		t = types.length;
-		while ( t-- ) {
-			tmp = rtypenamespace.exec( types[t] ) || [];
-			type = origType = tmp[1];
-			namespaces = ( tmp[2] || "" ).split( "." ).sort();
-
-			// Unbind all events (on this namespace, if provided) for the element
-			if ( !type ) {
-				for ( type in events ) {
-					jQuery.event.remove( elem, type + types[ t ], handler, selector, true );
-				}
-				continue;
-			}
-
-			special = jQuery.event.special[ type ] || {};
-			type = ( selector ? special.delegateType : special.bindType ) || type;
-			handlers = events[ type ] || [];
-			tmp = tmp[2] && new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" );
-
-			// Remove matching events
-			origCount = j = handlers.length;
-			while ( j-- ) {
-				handleObj = handlers[ j ];
-
-				if ( ( mappedTypes || origType === handleObj.origType ) &&
-					( !handler || handler.guid === handleObj.guid ) &&
-					( !tmp || tmp.test( handleObj.namespace ) ) &&
-					( !selector || selector === handleObj.selector || selector === "**" && handleObj.selector ) ) {
-					handlers.splice( j, 1 );
-
-					if ( handleObj.selector ) {
-						handlers.delegateCount--;
-					}
-					if ( special.remove ) {
-						special.remove.call( elem, handleObj );
-					}
-				}
-			}
-
-			// Remove generic event handler if we removed something and no more handlers exist
-			// (avoids potential for endless recursion during removal of special event handlers)
-			if ( origCount && !handlers.length ) {
-				if ( !special.teardown || special.teardown.call( elem, namespaces, elemData.handle ) === false ) {
-					jQuery.removeEvent( elem, type, elemData.handle );
-				}
-
-				delete events[ type ];
-			}
-		}
-
-		// Remove the expando if it's no longer used
-		if ( jQuery.isEmptyObject( events ) ) {
-			delete elemData.handle;
-
-			// removeData also checks for emptiness and clears the expando if empty
-			// so use it instead of delete
-			jQuery._removeData( elem, "events" );
-		}
-	},
-
-	trigger: function( event, data, elem, onlyHandlers ) {
-		var handle, ontype, cur,
-			bubbleType, special, tmp, i,
-			eventPath = [ elem || document ],
-			type = core_hasOwn.call( event, "type" ) ? event.type : event,
-			namespaces = core_hasOwn.call( event, "namespace" ) ? event.namespace.split(".") : [];
-
-		cur = tmp = elem = elem || document;
-
-		// Don't do events on text and comment nodes
-		if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
-			return;
-		}
-
-		// focus/blur morphs to focusin/out; ensure we're not firing them right now
-		if ( rfocusMorph.test( type + jQuery.event.triggered ) ) {
-			return;
-		}
-
-		if ( type.indexOf(".") >= 0 ) {
-			// Namespaced trigger; create a regexp to match event type in handle()
-			namespaces = type.split(".");
-			type = namespaces.shift();
-			namespaces.sort();
-		}
-		ontype = type.indexOf(":") < 0 && "on" + type;
-
-		// Caller can pass in a jQuery.Event object, Object, or just an event type string
-		event = event[ jQuery.expando ] ?
-			event :
-			new jQuery.Event( type, typeof event === "object" && event );
-
-		event.isTrigger = true;
-		event.namespace = namespaces.join(".");
-		event.namespace_re = event.namespace ?
-			new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" ) :
-			null;
-
-		// Clean up the event in case it is being reused
-		event.result = undefined;
-		if ( !event.target ) {
-			event.target = elem;
-		}
-
-		// Clone any incoming data and prepend the event, creating the handler arg list
-		data = data == null ?
-			[ event ] :
-			jQuery.makeArray( data, [ event ] );
-
-		// Allow special events to draw outside the lines
-		special = jQuery.event.special[ type ] || {};
-		if ( !onlyHandlers && special.trigger && special.trigger.apply( elem, data ) === false ) {
-			return;
-		}
-
-		// Determine event propagation path in advance, per W3C events spec (#9951)
-		// Bubble up to document, then to window; watch for a global ownerDocument var (#9724)
-		if ( !onlyHandlers && !special.noBubble && !jQuery.isWindow( elem ) ) {
-
-			bubbleType = special.delegateType || type;
-			if ( !rfocusMorph.test( bubbleType + type ) ) {
-				cur = cur.parentNode;
-			}
-			for ( ; cur; cur = cur.parentNode ) {
-				eventPath.push( cur );
-				tmp = cur;
-			}
-
-			// Only add window if we got to document (e.g., not plain obj or detached DOM)
-			if ( tmp === (elem.ownerDocument || document) ) {
-				eventPath.push( tmp.defaultView || tmp.parentWindow || window );
-			}
-		}
-
-		// Fire handlers on the event path
-		i = 0;
-		while ( (cur = eventPath[i++]) && !event.isPropagationStopped() ) {
-
-			event.type = i > 1 ?
-				bubbleType :
-				special.bindType || type;
-
-			// jQuery handler
-			handle = ( jQuery._data( cur, "events" ) || {} )[ event.type ] && jQuery._data( cur, "handle" );
-			if ( handle ) {
-				handle.apply( cur, data );
-			}
-
-			// Native handler
-			handle = ontype && cur[ ontype ];
-			if ( handle && jQuery.acceptData( cur ) && handle.apply && handle.apply( cur, data ) === false ) {
-				event.preventDefault();
-			}
-		}
-		event.type = type;
-
-		// If nobody prevented the default action, do it now
-		if ( !onlyHandlers && !event.isDefaultPrevented() ) {
-
-			if ( (!special._default || special._default.apply( elem.ownerDocument, data ) === false) &&
-				!(type === "click" && jQuery.nodeName( elem, "a" )) && jQuery.acceptData( elem ) ) {
-
-				// Call a native DOM method on the target with the same name name as the event.
-				// Can't use an .isFunction() check here because IE6/7 fails that test.
-				// Don't do default actions on window, that's where global variables be (#6170)
-				if ( ontype && elem[ type ] && !jQuery.isWindow( elem ) ) {
-
-					// Don't re-trigger an onFOO event when we call its FOO() method
-					tmp = elem[ ontype ];
-
-					if ( tmp ) {
-						elem[ ontype ] = null;
-					}
-
-					// Prevent re-triggering of the same event, since we already bubbled it above
-					jQuery.event.triggered = type;
-					try {
-						elem[ type ]();
-					} catch ( e ) {
-						// IE<9 dies on focus/blur to hidden element (#1486,#12518)
-						// only reproducible on winXP IE8 native, not IE9 in IE8 mode
-					}
-					jQuery.event.triggered = undefined;
-
-					if ( tmp ) {
-						elem[ ontype ] = tmp;
-					}
-				}
-			}
-		}
-
-		return event.result;
-	},
-
-	dispatch: function( event ) {
-
-		// Make a writable jQuery.Event from the native event object
-		event = jQuery.event.fix( event );
-
-		var i, ret, handleObj, matched, j,
-			handlerQueue = [],
-			args = core_slice.call( arguments ),
-			handlers = ( jQuery._data( this, "events" ) || {} )[ event.type ] || [],
-			special = jQuery.event.special[ event.type ] || {};
-
-		// Use the fix-ed jQuery.Event rather than the (read-only) native event
-		args[0] = event;
-		event.delegateTarget = this;
-
-		// Call the preDispatch hook for the mapped type, and let it bail if desired
-		if ( special.preDispatch && special.preDispatch.call( this, event ) === false ) {
-			return;
-		}
-
-		// Determine handlers
-		handlerQueue = jQuery.event.handlers.call( this, event, handlers );
-
-		// Run delegates first; they may want to stop propagation beneath us
-		i = 0;
-		while ( (matched = handlerQueue[ i++ ]) && !event.isPropagationStopped() ) {
-			event.currentTarget = matched.elem;
-
-			j = 0;
-			while ( (handleObj = matched.handlers[ j++ ]) && !event.isImmediatePropagationStopped() ) {
-
-				// Triggered event must either 1) have no namespace, or
-				// 2) have namespace(s) a subset or equal to those in the bound event (both can have no namespace).
-				if ( !event.namespace_re || event.namespace_re.test( handleObj.namespace ) ) {
-
-					event.handleObj = handleObj;
-					event.data = handleObj.data;
-
-					ret = ( (jQuery.event.special[ handleObj.origType ] || {}).handle || handleObj.handler )
-							.apply( matched.elem, args );
-
-					if ( ret !== undefined ) {
-						if ( (event.result = ret) === false ) {
-							event.preventDefault();
-							event.stopPropagation();
-						}
-					}
-				}
-			}
-		}
-
-		// Call the postDispatch hook for the mapped type
-		if ( special.postDispatch ) {
-			special.postDispatch.call( this, event );
-		}
-
-		return event.result;
-	},
-
-	handlers: function( event, handlers ) {
-		var sel, handleObj, matches, i,
-			handlerQueue = [],
-			delegateCount = handlers.delegateCount,
-			cur = event.target;
-
-		// Find delegate handlers
-		// Black-hole SVG <use> instance trees (#13180)
-		// Avoid non-left-click bubbling in Firefox (#3861)
-		if ( delegateCount && cur.nodeType && (!event.button || event.type !== "click") ) {
-
-			for ( ; cur != this; cur = cur.parentNode || this ) {
-
-				// Don't check non-elements (#13208)
-				// Don't process clicks on disabled elements (#6911, #8165, #11382, #11764)
-				if ( cur.nodeType === 1 && (cur.disabled !== true || event.type !== "click") ) {
-					matches = [];
-					for ( i = 0; i < delegateCount; i++ ) {
-						handleObj = handlers[ i ];
-
-						// Don't conflict with Object.prototype properties (#13203)
-						sel = handleObj.selector + " ";
-
-						if ( matches[ sel ] === undefined ) {
-							matches[ sel ] = handleObj.needsContext ?
-								jQuery( sel, this ).index( cur ) >= 0 :
-								jQuery.find( sel, this, null, [ cur ] ).length;
-						}
-						if ( matches[ sel ] ) {
-							matches.push( handleObj );
-						}
-					}
-					if ( matches.length ) {
-						handlerQueue.push({ elem: cur, handlers: matches });
-					}
-				}
-			}
-		}
-
-		// Add the remaining (directly-bound) handlers
-		if ( delegateCount < handlers.length ) {
-			handlerQueue.push({ elem: this, handlers: handlers.slice( delegateCount ) });
-		}
-
-		return handlerQueue;
-	},
-
-	fix: function( event ) {
-		if ( event[ jQuery.expando ] ) {
-			return event;
-		}
-
-		// Create a writable copy of the event object and normalize some properties
-		var i, prop, copy,
-			type = event.type,
-			originalEvent = event,
-			fixHook = this.fixHooks[ type ];
-
-		if ( !fixHook ) {
-			this.fixHooks[ type ] = fixHook =
-				rmouseEvent.test( type ) ? this.mouseHooks :
-				rkeyEvent.test( type ) ? this.keyHooks :
-				{};
-		}
-		copy = fixHook.props ? this.props.concat( fixHook.props ) : this.props;
-
-		event = new jQuery.Event( originalEvent );
-
-		i = copy.length;
-		while ( i-- ) {
-			prop = copy[ i ];
-			event[ prop ] = originalEvent[ prop ];
-		}
-
-		// Support: IE<9
-		// Fix target property (#1925)
-		if ( !event.target ) {
-			event.target = originalEvent.srcElement || document;
-		}
-
-		// Support: Chrome 23+, Safari?
-		// Target should not be a text node (#504, #13143)
-		if ( event.target.nodeType === 3 ) {
-			event.target = event.target.parentNode;
-		}
-
-		// Support: IE<9
-		// For mouse/key events, metaKey==false if it's undefined (#3368, #11328)
-		event.metaKey = !!event.metaKey;
-
-		return fixHook.filter ? fixHook.filter( event, originalEvent ) : event;
-	},
-
-	// Includes some event props shared by KeyEvent and MouseEvent
-	props: "altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),
-
-	fixHooks: {},
-
-	keyHooks: {
-		props: "char charCode key keyCode".split(" "),
-		filter: function( event, original ) {
-
-			// Add which for key events
-			if ( event.which == null ) {
-				event.which = original.charCode != null ? original.charCode : original.keyCode;
-			}
-
-			return event;
-		}
-	},
-
-	mouseHooks: {
-		props: "button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),
-		filter: function( event, original ) {
-			var body, eventDoc, doc,
-				button = original.button,
-				fromElement = original.fromElement;
-
-			// Calculate pageX/Y if missing and clientX/Y available
-			if ( event.pageX == null && original.clientX != null ) {
-				eventDoc = event.target.ownerDocument || document;
-				doc = eventDoc.documentElement;
-				body = eventDoc.body;
-
-				event.pageX = original.clientX + ( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) - ( doc && doc.clientLeft || body && body.clientLeft || 0 );
-				event.pageY = original.clientY + ( doc && doc.scrollTop  || body && body.scrollTop  || 0 ) - ( doc && doc.clientTop  || body && body.clientTop  || 0 );
-			}
-
-			// Add relatedTarget, if necessary
-			if ( !event.relatedTarget && fromElement ) {
-				event.relatedTarget = fromElement === event.target ? original.toElement : fromElement;
-			}
-
-			// Add which for click: 1 === left; 2 === middle; 3 === right
-			// Note: button is not normalized, so don't use it
-			if ( !event.which && button !== undefined ) {
-				event.which = ( button & 1 ? 1 : ( button & 2 ? 3 : ( button & 4 ? 2 : 0 ) ) );
-			}
-
-			return event;
-		}
-	},
-
-	special: {
-		load: {
-			// Prevent triggered image.load events from bubbling to window.load
-			noBubble: true
-		},
-		click: {
-			// For checkbox, fire native event so checked state will be right
-			trigger: function() {
-				if ( jQuery.nodeName( this, "input" ) && this.type === "checkbox" && this.click ) {
-					this.click();
-					return false;
-				}
-			}
-		},
-		focus: {
-			// Fire native event if possible so blur/focus sequence is correct
-			trigger: function() {
-				if ( this !== document.activeElement && this.focus ) {
-					try {
-						this.focus();
-						return false;
-					} catch ( e ) {
-						// Support: IE<9
-						// If we error on focus to hidden element (#1486, #12518),
-						// let .trigger() run the handlers
-					}
-				}
-			},
-			delegateType: "focusin"
-		},
-		blur: {
-			trigger: function() {
-				if ( this === document.activeElement && this.blur ) {
-					this.blur();
-					return false;
-				}
-			},
-			delegateType: "focusout"
-		},
-
-		beforeunload: {
-			postDispatch: function( event ) {
-
-				// Even when returnValue equals to undefined Firefox will still show alert
-				if ( event.result !== undefined ) {
-					event.originalEvent.returnValue = event.result;
-				}
-			}
-		}
-	},
-
-	simulate: function( type, elem, event, bubble ) {
-		// Piggyback on a donor event to simulate a different one.
-		// Fake originalEvent to avoid donor's stopPropagation, but if the
-		// simulated event prevents default then we do the same on the donor.
-		var e = jQuery.extend(
-			new jQuery.Event(),
-			event,
-			{ type: type,
-				isSimulated: true,
-				originalEvent: {}
-			}
-		);
-		if ( bubble ) {
-			jQuery.event.trigger( e, null, elem );
-		} else {
-			jQuery.event.dispatch.call( elem, e );
-		}
-		if ( e.isDefaultPrevented() ) {
-			event.preventDefault();
-		}
-	}
-};
-
-jQuery.removeEvent = document.removeEventListener ?
-	function( elem, type, handle ) {
-		if ( elem.removeEventListener ) {
-			elem.removeEventListener( type, handle, false );
-		}
-	} :
-	function( elem, type, handle ) {
-		var name = "on" + type;
-
-		if ( elem.detachEvent ) {
-
-			// #8545, #7054, preventing memory leaks for custom events in IE6-8
-			// detachEvent needed property on element, by name of that event, to properly expose it to GC
-			if ( typeof elem[ name ] === core_strundefined ) {
-				elem[ name ] = null;
-			}
-
-			elem.detachEvent( name, handle );
-		}
-	};
-
-jQuery.Event = function( src, props ) {
-	// Allow instantiation without the 'new' keyword
-	if ( !(this instanceof jQuery.Event) ) {
-		return new jQuery.Event( src, props );
-	}
-
-	// Event object
-	if ( src && src.type ) {
-		this.originalEvent = src;
-		this.type = src.type;
-
-		// Events bubbling up the document may have been marked as prevented
-		// by a handler lower down the tree; reflect the correct value.
-		this.isDefaultPrevented = ( src.defaultPrevented || src.returnValue === false ||
-			src.getPreventDefault && src.getPreventDefault() ) ? returnTrue : returnFalse;
-
-	// Event type
-	} else {
-		this.type = src;
-	}
-
-	// Put explicitly provided properties onto the event object
-	if ( props ) {
-		jQuery.extend( this, props );
-	}
-
-	// Create a timestamp if incoming event doesn't have one
-	this.timeStamp = src && src.timeStamp || jQuery.now();
-
-	// Mark it as fixed
-	this[ jQuery.expando ] = true;
-};
-
-// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding
-// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
-jQuery.Event.prototype = {
-	isDefaultPrevented: returnFalse,
-	isPropagationStopped: returnFalse,
-	isImmediatePropagationStopped: returnFalse,
-
-	preventDefault: function() {
-		var e = this.originalEvent;
-
-		this.isDefaultPrevented = returnTrue;
-		if ( !e ) {
-			return;
-		}
-
-		// If preventDefault exists, run it on the original event
-		if ( e.preventDefault ) {
-			e.preventDefault();
-
-		// Support: IE
-		// Otherwise set the returnValue property of the original event to false
-		} else {
-			e.returnValue = false;
-		}
-	},
-	stopPropagation: function() {
-		var e = this.originalEvent;
-
-		this.isPropagationStopped = returnTrue;
-		if ( !e ) {
-			return;
-		}
-		// If stopPropagation exists, run it on the original event
-		if ( e.stopPropagation ) {
-			e.stopPropagation();
-		}
-
-		// Support: IE
-		// Set the cancelBubble property of the original event to true
-		e.cancelBubble = true;
-	},
-	stopImmediatePropagation: function() {
-		this.isImmediatePropagationStopped = returnTrue;
-		this.stopPropagation();
-	}
-};
-
-// Create mouseenter/leave events using mouseover/out and event-time checks
-jQuery.each({
-	mouseenter: "mouseover",
-	mouseleave: "mouseout"
-}, function( orig, fix ) {
-	jQuery.event.special[ orig ] = {
-		delegateType: fix,
-		bindType: fix,
-
-		handle: function( event ) {
-			var ret,
-				target = this,
-				related = event.relatedTarget,
-				handleObj = event.handleObj;
-
-			// For mousenter/leave call the handler if related is outside the target.
-			// NB: No relatedTarget if the mouse left/entered the browser window
-			if ( !related || (related !== target && !jQuery.contains( target, related )) ) {
-				event.type = handleObj.origType;
-				ret = handleObj.handler.apply( this, arguments );
-				event.type = fix;
-			}
-			return ret;
-		}
-	};
-});
-
-// IE submit delegation
-if ( !jQuery.support.submitBubbles ) {
-
-	jQuery.event.special.submit = {
-		setup: function() {
-			// Only need this for delegated form submit events
-			if ( jQuery.nodeName( this, "form" ) ) {
-				return false;
-			}
-
-			// Lazy-add a submit handler when a descendant form may potentially be submitted
-			jQuery.event.add( this, "click._submit keypress._submit", function( e ) {
-				// Node name check avoids a VML-related crash in IE (#9807)
-				var elem = e.target,
-					form = jQuery.nodeName( elem, "input" ) || jQuery.nodeName( elem, "button" ) ? elem.form : undefined;
-				if ( form && !jQuery._data( form, "submitBubbles" ) ) {
-					jQuery.event.add( form, "submit._submit", function( event ) {
-						event._submit_bubble = true;
-					});
-					jQuery._data( form, "submitBubbles", true );
-				}
-			});
-			// return undefined since we don't need an event listener
-		},
-
-		postDispatch: function( event ) {
-			// If form was submitted by the user, bubble the event up the tree
-			if ( event._submit_bubble ) {
-				delete event._submit_bubble;
-				if ( this.parentNode && !event.isTrigger ) {
-					jQuery.event.simulate( "submit", this.parentNode, event, true );
-				}
-			}
-		},
-
-		teardown: function() {
-			// Only need this for delegated form submit events
-			if ( jQuery.nodeName( this, "form" ) ) {
-				return false;
-			}
-
-			// Remove delegated handlers; cleanData eventually reaps submit handlers attached above
-			jQuery.event.remove( this, "._submit" );
-		}
-	};
-}
-
-// IE change delegation and checkbox/radio fix
-if ( !jQuery.support.changeBubbles ) {
-
-	jQuery.event.special.change = {
-
-		setup: function() {
-
-			if ( rformElems.test( this.nodeName ) ) {
-				// IE doesn't fire change on a check/radio until blur; trigger it on click
-				// after a propertychange. Eat the blur-change in special.change.handle.
-				// This still fires onchange a second time for check/radio after blur.
-				if ( this.type === "checkbox" || this.type === "radio" ) {
-					jQuery.event.add( this, "propertychange._change", function( event ) {
-						if ( event.originalEvent.propertyName === "checked" ) {
-							this._just_changed = true;
-						}
-					});
-					jQuery.event.add( this, "click._change", function( event ) {
-						if ( this._just_changed && !event.isTrigger ) {
-							this._just_changed = false;
-						}
-						// Allow triggered, simulated change events (#11500)
-						jQuery.event.simulate( "change", this, event, true );
-					});
-				}
-				return false;
-			}
-			// Delegated event; lazy-add a change handler on descendant inputs
-			jQuery.event.add( this, "beforeactivate._change", function( e ) {
-				var elem = e.target;
-
-				if ( rformElems.test( elem.nodeName ) && !jQuery._data( elem, "changeBubbles" ) ) {
-					jQuery.event.add( elem, "change._change", function( event ) {
-						if ( this.parentNode && !event.isSimulated && !event.isTrigger ) {
-							jQuery.event.simulate( "change", this.parentNode, event, true );
-						}
-					});
-					jQuery._data( elem, "changeBubbles", true );
-				}
-			});
-		},
-
-		handle: function( event ) {
-			var elem = event.target;
-
-			// Swallow native change events from checkbox/radio, we already triggered them above
-			if ( this !== elem || event.isSimulated || event.isTrigger || (elem.type !== "radio" && elem.type !== "checkbox") ) {
-				return event.handleObj.handler.apply( this, arguments );
-			}
-		},
-
-		teardown: function() {
-			jQuery.event.remove( this, "._change" );
-
-			return !rformElems.test( this.nodeName );
-		}
-	};
-}
-
-// Create "bubbling" focus and blur events
-if ( !jQuery.support.focusinBubbles ) {
-	jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) {
-
-		// Attach a single capturing handler while someone wants focusin/focusout
-		var attaches = 0,
-			handler = function( event ) {
-				jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ), true );
-			};
-
-		jQuery.event.special[ fix ] = {
-			setup: function() {
-				if ( attaches++ === 0 ) {
-					document.addEventListener( orig, handler, true );
-				}
-			},
-			teardown: function() {
-				if ( --attaches === 0 ) {
-					document.removeEventListener( orig, handler, true );
-				}
-			}
-		};
-	});
-}
-
-jQuery.fn.extend({
-
-	on: function( types, selector, data, fn, /*INTERNAL*/ one ) {
-		var type, origFn;
-
-		// Types can be a map of types/handlers
-		if ( typeof types === "object" ) {
-			// ( types-Object, selector, data )
-			if ( typeof selector !== "string" ) {
-				// ( types-Object, data )
-				data = data || selector;
-				selector = undefined;
-			}
-			for ( type in types ) {
-				this.on( type, selector, data, types[ type ], one );
-			}
-			return this;
-		}
-
-		if ( data == null && fn == null ) {
-			// ( types, fn )
-			fn = selector;
-			data = selector = undefined;
-		} else if ( fn == null ) {
-			if ( typeof selector === "string" ) {
-				// ( types, selector, fn )
-				fn = data;
-				data = undefined;
-			} else {
-				// ( types, data, fn )
-				fn = data;
-				data = selector;
-				selector = undefined;
-			}
-		}
-		if ( fn === false ) {
-			fn = returnFalse;
-		} else if ( !fn ) {
-			return this;
-		}
-
-		if ( one === 1 ) {
-			origFn = fn;
-			fn = function( event ) {
-				// Can use an empty set, since event contains the info
-				jQuery().off( event );
-				return origFn.apply( this, arguments );
-			};
-			// Use same guid so caller can remove using origFn
-			fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ );
-		}
-		return this.each( function() {
-			jQuery.event.add( this, types, fn, data, selector );
-		});
-	},
-	one: function( types, selector, data, fn ) {
-		return this.on( types, selector, data, fn, 1 );
-	},
-	off: function( types, selector, fn ) {
-		var handleObj, type;
-		if ( types && types.preventDefault && types.handleObj ) {
-			// ( event )  dispatched jQuery.Event
-			handleObj = types.handleObj;
-			jQuery( types.delegateTarget ).off(
-				handleObj.namespace ? handleObj.origType + "." + handleObj.namespace : handleObj.origType,
-				handleObj.selector,
-				handleObj.handler
-			);
-			return this;
-		}
-		if ( typeof types === "object" ) {
-			// ( types-object [, selector] )
-			for ( type in types ) {
-				this.off( type, selector, types[ type ] );
-			}
-			return this;
-		}
-		if ( selector === false || typeof selector === "function" ) {
-			// ( types [, fn] )
-			fn = selector;
-			selector = undefined;
-		}
-		if ( fn === false ) {
-			fn = returnFalse;
-		}
-		return this.each(function() {
-			jQuery.event.remove( this, types, fn, selector );
-		});
-	},
-
-	bind: function( types, data, fn ) {
-		return this.on( types, null, data, fn );
-	},
-	unbind: function( types, fn ) {
-		return this.off( types, null, fn );
-	},
-
-	delegate: function( selector, types, data, fn ) {
-		return this.on( types, selector, data, fn );
-	},
-	undelegate: function( selector, types, fn ) {
-		// ( namespace ) or ( selector, types [, fn] )
-		return arguments.length === 1 ? this.off( selector, "**" ) : this.off( types, selector || "**", fn );
-	},
-
-	trigger: function( type, data ) {
-		return this.each(function() {
-			jQuery.event.trigger( type, data, this );
-		});
-	},
-	triggerHandler: function( type, data ) {
-		var elem = this[0];
-		if ( elem ) {
-			return jQuery.event.trigger( type, data, elem, true );
-		}
-	}
-});
-/*!
- * Sizzle CSS Selector Engine
- * Copyright 2012 jQuery Foundation and other contributors
- * Released under the MIT license
- * http://sizzlejs.com/
- */
-(function( window, undefined ) {
-
-var i,
-	cachedruns,
-	Expr,
-	getText,
-	isXML,
-	compile,
-	hasDuplicate,
-	outermostContext,
-
-	// Local document vars
-	setDocument,
-	document,
-	docElem,
-	documentIsXML,
-	rbuggyQSA,
-	rbuggyMatches,
-	matches,
-	contains,
-	sortOrder,
-
-	// Instance-specific data
-	expando = "sizzle" + -(new Date()),
-	preferredDoc = window.document,
-	support = {},
-	dirruns = 0,
-	done = 0,
-	classCache = createCache(),
-	tokenCache = createCache(),
-	compilerCache = createCache(),
-
-	// General-purpose constants
-	strundefined = typeof undefined,
-	MAX_NEGATIVE = 1 << 31,
-
-	// Array methods
-	arr = [],
-	pop = arr.pop,
-	push = arr.push,
-	slice = arr.slice,
-	// Use a stripped-down indexOf if we can't use a native one
-	indexOf = arr.indexOf || function( elem ) {
-		var i = 0,
-			len = this.length;
-		for ( ; i < len; i++ ) {
-			if ( this[i] === elem ) {
-				return i;
-			}
-		}
-		return -1;
-	},
-
-
-	// Regular expressions
-
-	// Whitespace characters http://www.w3.org/TR/css3-selectors/#whitespace
-	whitespace = "[\\x20\\t\\r\\n\\f]",
-	// http://www.w3.org/TR/css3-syntax/#characters
-	characterEncoding = "(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",
-
-	// Loosely modeled on CSS identifier characters
-	// An unquoted value should be a CSS identifier http://www.w3.org/TR/css3-selectors/#attribute-selectors
-	// Proper syntax: http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier
-	identifier = characterEncoding.replace( "w", "w#" ),
-
-	// Acceptable operators http://www.w3.org/TR/selectors/#attribute-selectors
-	operators = "([*^$|!~]?=)",
-	attributes = "\\[" + whitespace + "*(" + characterEncoding + ")" + whitespace +
-		"*(?:" + operators + whitespace + "*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|(" + identifier + ")|)|)" + whitespace + "*\\]",
-
-	// Prefer arguments quoted,
-	//   then not containing pseudos/brackets,
-	//   then attribute selectors/non-parenthetical expressions,
-	//   then anything else
-	// These preferences are here to reduce the number of selectors
-	//   needing tokenize in the PSEUDO preFilter
-	pseudos = ":(" + characterEncoding + ")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|" + attributes.replace( 3, 8 ) + ")*)|.*)\\)|)",
-
-	// Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter
-	rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + whitespace + "+$", "g" ),
-
-	rcomma = new RegExp( "^" + whitespace + "*," + whitespace + "*" ),
-	rcombinators = new RegExp( "^" + whitespace + "*([\\x20\\t\\r\\n\\f>+~])" + whitespace + "*" ),
-	rpseudo = new RegExp( pseudos ),
-	ridentifier = new RegExp( "^" + identifier + "$" ),
-
-	matchExpr = {
-		"ID": new RegExp( "^#(" + characterEncoding + ")" ),
-		"CLASS": new RegExp( "^\\.(" + characterEncoding + ")" ),
-		"NAME": new RegExp( "^\\[name=['\"]?(" + characterEncoding + ")['\"]?\\]" ),
-		"TAG": new RegExp( "^(" + characterEncoding.replace( "w", "w*" ) + ")" ),
-		"ATTR": new RegExp( "^" + attributes ),
-		"PSEUDO": new RegExp( "^" + pseudos ),
-		"CHILD": new RegExp( "^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" + whitespace +
-			"*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" + whitespace +
-			"*(\\d+)|))" + whitespace + "*\\)|)", "i" ),
-		// For use in libraries implementing .is()
-		// We use this for POS matching in `select`
-		"needsContext": new RegExp( "^" + whitespace + "*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" +
-			whitespace + "*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)", "i" )
-	},
-
-	rsibling = /[\x20\t\r\n\f]*[+~]/,
-
-	rnative = /^[^{]+\{\s*\[native code/,
-
-	// Easily-parseable/retrievable ID or TAG or CLASS selectors
-	rquickExpr = /^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,
-
-	rinputs = /^(?:input|select|textarea|button)$/i,
-	rheader = /^h\d$/i,
-
-	rescape = /'|\\/g,
-	rattributeQuotes = /\=[\x20\t\r\n\f]*([^'"\]]*)[\x20\t\r\n\f]*\]/g,
-
-	// CSS escapes http://www.w3.org/TR/CSS21/syndata.html#escaped-characters
-	runescape = /\\([\da-fA-F]{1,6}[\x20\t\r\n\f]?|.)/g,
-	funescape = function( _, escaped ) {
-		var high = "0x" + escaped - 0x10000;
-		// NaN means non-codepoint
-		return high !== high ?
-			escaped :
-			// BMP codepoint
-			high < 0 ?
-				String.fromCharCode( high + 0x10000 ) :
-				// Supplemental Plane codepoint (surrogate pair)
-				String.fromCharCode( high >> 10 | 0xD800, high & 0x3FF | 0xDC00 );
-	};
-
-// Use a stripped-down slice if we can't use a native one
-try {
-	slice.call( preferredDoc.documentElement.childNodes, 0 )[0].nodeType;
-} catch ( e ) {
-	slice = function( i ) {
-		var elem,
-			results = [];
-		while ( (elem = this[i++]) ) {
-			results.push( elem );
-		}
-		return results;
-	};
-}
-
-/**
- * For feature detection
- * @param {Function} fn The function to test for native support
- */
-function isNative( fn ) {
-	return rnative.test( fn + "" );
-}
-
-/**
- * Create key-value caches of limited size
- * @returns {Function(string, Object)} Returns the Object data after storing it on itself with
- *	property name the (space-suffixed) string and (if the cache is larger than Expr.cacheLength)
- *	deleting the oldest entry
- */
-function createCache() {
-	var cache,
-		keys = [];
-
-	return (cache = function( key, value ) {
-		// Use (key + " ") to avoid collision with native prototype properties (see Issue #157)
-		if ( keys.push( key += " " ) > Expr.cacheLength ) {
-			// Only keep the most recent entries
-			delete cache[ keys.shift() ];
-		}
-		return (cache[ key ] = value);
-	});
-}
-
-/**
- * Mark a function for special use by Sizzle
- * @param {Function} fn The function to mark
- */
-function markFunction( fn ) {
-	fn[ expando ] = true;
-	return fn;
-}
-
-/**
- * Support testing using an element
- * @param {Function} fn Passed the created div and expects a boolean result
- */
-function assert( fn ) {
-	var div = document.createElement("div");
-
-	try {
-		return fn( div );
-	} catch (e) {
-		return false;
-	} finally {
-		// release memory in IE
-		div = null;
-	}
-}
-
-function Sizzle( selector, context, results, seed ) {
-	var match, elem, m, nodeType,
-		// QSA vars
-		i, groups, old, nid, newContext, newSelector;
-
-	if ( ( context ? context.ownerDocument || context : preferredDoc ) !== document ) {
-		setDocument( context );
-	}
-
-	context = context || document;
-	results = results || [];
-
-	if ( !selector || typeof selector !== "string" ) {
-		return results;
-	}
-
-	if ( (nodeType = context.nodeType) !== 1 && nodeType !== 9 ) {
-		return [];
-	}
-
-	if ( !documentIsXML && !seed ) {
-
-		// Shortcuts
-		if ( (match = rquickExpr.exec( selector )) ) {
-			// Speed-up: Sizzle("#ID")
-			if ( (m = match[1]) ) {
-				if ( nodeType === 9 ) {
-					elem = context.getElementById( m );
-					// Check parentNode to catch when Blackberry 4.6 returns
-					// nodes that are no longer in the document #6963
-					if ( elem && elem.parentNode ) {
-						// Handle the case where IE, Opera, and Webkit return items
-						// by name instead of ID
-						if ( elem.id === m ) {
-							results.push( elem );
-							return results;
-						}
-					} else {
-						return results;
-					}
-				} else {
-					// Context is not a document
-					if ( context.ownerDocument && (elem = context.ownerDocument.getElementById( m )) &&
-						contains( context, elem ) && elem.id === m ) {
-						results.push( elem );
-						return results;
-					}
-				}
-
-			// Speed-up: Sizzle("TAG")
-			} else if ( match[2] ) {
-				push.apply( results, slice.call(context.getElementsByTagName( selector ), 0) );
-				return results;
-
-			// Speed-up: Sizzle(".CLASS")
-			} else if ( (m = match[3]) && support.getByClassName && context.getElementsByClassName ) {
-				push.apply( results, slice.call(context.getElementsByClassName( m ), 0) );
-				return results;
-			}
-		}
-
-		// QSA path
-		if ( support.qsa && !rbuggyQSA.test(selector) ) {
-			old = true;
-			nid = expando;
-			newContext = context;
-			newSelector = nodeType === 9 && selector;
-
-			// qSA works strangely on Element-rooted queries
-			// We can work around this by specifying an extra ID on the root
-			// and working up from there (Thanks to Andrew Dupont for the technique)
-			// IE 8 doesn't work on object elements
-			if ( nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) {
-				groups = tokenize( selector );
-
-				if ( (old = context.getAttribute("id")) ) {
-					nid = old.replace( rescape, "\\$&" );
-				} else {
-					context.setAttribute( "id", nid );
-				}
-				nid = "[id='" + nid + "'] ";
-
-				i = groups.length;
-				while ( i-- ) {
-					groups[i] = nid + toSelector( groups[i] );
-				}
-				newContext = rsibling.test( selector ) && context.parentNode || context;
-				newSelector = groups.join(",");
-			}
-
-			if ( newSelector ) {
-				try {
-					push.apply( results, slice.call( newContext.querySelectorAll(
-						newSelector
-					), 0 ) );
-					return results;
-				} catch(qsaError) {
-				} finally {
-					if ( !old ) {
-						context.removeAttribute("id");
-					}
-				}
-			}
-		}
-	}
-
-	// All others
-	return select( selector.replace( rtrim, "$1" ), context, results, seed );
-}
-
-/**
- * Detect xml
- * @param {Element|Object} elem An element or a document
- */
-isXML = Sizzle.isXML = function( elem ) {
-	// documentElement is verified for cases where it doesn't yet exist
-	// (such as loading iframes in IE - #4833)
-	var documentElement = elem && (elem.ownerDocument || elem).documentElement;
-	return documentElement ? documentElement.nodeName !== "HTML" : false;
-};
-
-/**
- * Sets document-related variables once based on the current document
- * @param {Element|Object} [doc] An element or document object to use to set the document
- * @returns {Object} Returns the current document
- */
-setDocument = Sizzle.setDocument = function( node ) {
-	var doc = node ? node.ownerDocument || node : preferredDoc;
-
-	// If no document and documentElement is available, return
-	if ( doc === document || doc.nodeType !== 9 || !doc.documentElement ) {
-		return document;
-	}
-
-	// Set our document
-	document = doc;
-	docElem = doc.documentElement;
-
-	// Support tests
-	documentIsXML = isXML( doc );
-
-	// Check if getElementsByTagName("*") returns only elements
-	support.tagNameNoComments = assert(function( div ) {
-		div.appendChild( doc.createComment("") );
-		return !div.getElementsByTagName("*").length;
-	});
-
-	// Check if attributes should be retrieved by attribute nodes
-	support.attributes = assert(function( div ) {
-		div.innerHTML = "<select></select>";
-		var type = typeof div.lastChild.getAttribute("multiple");
-		// IE8 returns a string for some attributes even when not present
-		return type !== "boolean" && type !== "string";
-	});
-
-	// Check if getElementsByClassName can be trusted
-	support.getByClassName = assert(function( div ) {
-		// Opera can't find a second classname (in 9.6)
-		div.innerHTML = "<div class='hidden e'></div><div class='hidden'></div>";
-		if ( !div.getElementsByClassName || !div.getElementsByClassName("e").length ) {
-			return false;
-		}
-
-		// Safari 3.2 caches class attributes and doesn't catch changes
-		div.lastChild.className = "e";
-		return div.getElementsByClassName("e").length === 2;
-	});
-
-	// Check if getElementById returns elements by name
-	// Check if getElementsByName privileges form controls or returns elements by ID
-	support.getByName = assert(function( div ) {
-		// Inject content
-		div.id = expando + 0;
-		div.innerHTML = "<a name='" + expando + "'></a><div name='" + expando + "'></div>";
-		docElem.insertBefore( div, docElem.firstChild );
-
-		// Test
-		var pass = doc.getElementsByName &&
-			// buggy browsers will return fewer than the correct 2
-			doc.getElementsByName( expando ).length === 2 +
-			// buggy browsers will return more than the correct 0
-			doc.getElementsByName( expando + 0 ).length;
-		support.getIdNotName = !doc.getElementById( expando );
-
-		// Cleanup
-		docElem.removeChild( div );
-
-		return pass;
-	});
-
-	// IE6/7 return modified attributes
-	Expr.attrHandle = assert(function( div ) {
-		div.innerHTML = "<a href='#'></a>";
-		return div.firstChild && typeof div.firstChild.getAttribute !== strundefined &&
-			div.firstChild.getAttribute("href") === "#";
-	}) ?
-		{} :
-		{
-			"href": function( elem ) {
-				return elem.getAttribute( "href", 2 );
-			},
-			"type": function( elem ) {
-				return elem.getAttribute("type");
-			}
-		};
-
-	// ID find and filter
-	if ( support.getIdNotName ) {
-		Expr.find["ID"] = function( id, context ) {
-			if ( typeof context.getElementById !== strundefined && !documentIsXML ) {
-				var m = context.getElementById( id );
-				// Check parentNode to catch when Blackberry 4.6 returns
-				// nodes that are no longer in the document #6963
-				return m && m.parentNode ? [m] : [];
-			}
-		};
-		Expr.filter["ID"] = function( id ) {
-			var attrId = id.replace( runescape, funescape );
-			return function( elem ) {
-				return elem.getAttribute("id") === attrId;
-			};
-		};
-	} else {
-		Expr.find["ID"] = function( id, context ) {
-			if ( typeof context.getElementById !== strundefined && !documentIsXML ) {
-				var m = context.getElementById( id );
-
-				return m ?
-					m.id === id || typeof m.getAttributeNode !== strundefined && m.getAttributeNode("id").value === id ?
-						[m] :
-						undefined :
-					[];
-			}
-		};
-		Expr.filter["ID"] =  function( id ) {
-			var attrId = id.replace( runescape, funescape );
-			return function( elem ) {
-				var node = typeof elem.getAttributeNode !== strundefined && elem.getAttributeNode("id");
-				return node && node.value === attrId;
-			};
-		};
-	}
-
-	// Tag
-	Expr.find["TAG"] = support.tagNameNoComments ?
-		function( tag, context ) {
-			if ( typeof context.getElementsByTagName !== strundefined ) {
-				return context.getElementsByTagName( tag );
-			}
-		} :
-		function( tag, context ) {
-			var elem,
-				tmp = [],
-				i = 0,
-				results = context.getElementsByTagName( tag );
-
-			// Filter out possible comments
-			if ( tag === "*" ) {
-				while ( (elem = results[i++]) ) {
-					if ( elem.nodeType === 1 ) {
-						tmp.push( elem );
-					}
-				}
-
-				return tmp;
-			}
-			return results;
-		};
-
-	// Name
-	Expr.find["NAME"] = support.getByName && function( tag, context ) {
-		if ( typeof context.getElementsByName !== strundefined ) {
-			return context.getElementsByName( name );
-		}
-	};
-
-	// Class
-	Expr.find["CLASS"] = support.getByClassName && function( className, context ) {
-		if ( typeof context.getElementsByClassName !== strundefined && !documentIsXML ) {
-			return context.getElementsByClassName( className );
-		}
-	};
-
-	// QSA and matchesSelector support
-
-	// matchesSelector(:active) reports false when true (IE9/Opera 11.5)
-	rbuggyMatches = [];
-
-	// qSa(:focus) reports false when true (Chrome 21),
-	// no need to also add to buggyMatches since matches checks buggyQSA
-	// A support test would require too much code (would include document ready)
-	rbuggyQSA = [ ":focus" ];
-
-	if ( (support.qsa = isNative(doc.querySelectorAll)) ) {
-		// Build QSA regex
-		// Regex strategy adopted from Diego Perini
-		assert(function( div ) {
-			// Select is set to empty string on purpose
-			// This is to test IE's treatment of not explictly
-			// setting a boolean content attribute,
-			// since its presence should be enough
-			// http://bugs.jquery.com/ticket/12359
-			div.innerHTML = "<select><option selected=''></option></select>";
-
-			// IE8 - Some boolean attributes are not treated correctly
-			if ( !div.querySelectorAll("[selected]").length ) {
-				rbuggyQSA.push( "\\[" + whitespace + "*(?:checked|disabled|ismap|multiple|readonly|selected|value)" );
-			}
-
-			// Webkit/Opera - :checked should return selected option elements
-			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
-			// IE8 throws error here and will not see later tests
-			if ( !div.querySelectorAll(":checked").length ) {
-				rbuggyQSA.push(":checked");
-			}
-		});
-
-		assert(function( div ) {
-
-			// Opera 10-12/IE8 - ^= $= *= and empty values
-			// Should not select anything
-			div.innerHTML = "<input type='hidden' i=''/>";
-			if ( div.querySelectorAll("[i^='']").length ) {
-				rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:\"\"|'')" );
-			}
-
-			// FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled)
-			// IE8 throws error here and will not see later tests
-			if ( !div.querySelectorAll(":enabled").length ) {
-				rbuggyQSA.push( ":enabled", ":disabled" );
-			}
-
-			// Opera 10-11 does not throw on post-comma invalid pseudos
-			div.querySelectorAll("*,:x");
-			rbuggyQSA.push(",.*:");
-		});
-	}
-
-	if ( (support.matchesSelector = isNative( (matches = docElem.matchesSelector ||
-		docElem.mozMatchesSelector ||
-		docElem.webkitMatchesSelector ||
-		docElem.oMatchesSelector ||
-		docElem.msMatchesSelector) )) ) {
-
-		assert(function( div ) {
-			// Check to see if it's possible to do matchesSelector
-			// on a disconnected node (IE 9)
-			support.disconnectedMatch = matches.call( div, "div" );
-
-			// This should fail with an exception
-			// Gecko does not error, returns false instead
-			matches.call( div, "[s!='']:x" );
-			rbuggyMatches.push( "!=", pseudos );
-		});
-	}
-
-	rbuggyQSA = new RegExp( rbuggyQSA.join("|") );
-	rbuggyMatches = new RegExp( rbuggyMatches.join("|") );
-
-	// Element contains another
-	// Purposefully does not implement inclusive descendent
-	// As in, an element does not contain itself
-	contains = isNative(docElem.contains) || docElem.compareDocumentPosition ?
-		function( a, b ) {
-			var adown = a.nodeType === 9 ? a.documentElement : a,
-				bup = b && b.parentNode;
-			return a === bup || !!( bup && bup.nodeType === 1 && (
-				adown.contains ?
-					adown.contains( bup ) :
-					a.compareDocumentPosition && a.compareDocumentPosition( bup ) & 16
-			));
-		} :
-		function( a, b ) {
-			if ( b ) {
-				while ( (b = b.parentNode) ) {
-					if ( b === a ) {
-						return true;
-					}
-				}
-			}
-			return false;
-		};
-
-	// Document order sorting
-	sortOrder = docElem.compareDocumentPosition ?
-	function( a, b ) {
-		var compare;
-
-		if ( a === b ) {
-			hasDuplicate = true;
-			return 0;
-		}
-
-		if ( (compare = b.compareDocumentPosition && a.compareDocumentPosition && a.compareDocumentPosition( b )) ) {
-			if ( compare & 1 || a.parentNode && a.parentNode.nodeType === 11 ) {
-				if ( a === doc || contains( preferredDoc, a ) ) {
-					return -1;
-				}
-				if ( b === doc || contains( preferredDoc, b ) ) {
-					return 1;
-				}
-				return 0;
-			}
-			return compare & 4 ? -1 : 1;
-		}
-
-		return a.compareDocumentPosition ? -1 : 1;
-	} :
-	function( a, b ) {
-		var cur,
-			i = 0,
-			aup = a.parentNode,
-			bup = b.parentNode,
-			ap = [ a ],
-			bp = [ b ];
-
-		// Exit early if the nodes are identical
-		if ( a === b ) {
-			hasDuplicate = true;
-			return 0;
-
-		// Parentless nodes are either documents or disconnected
-		} else if ( !aup || !bup ) {
-			return a === doc ? -1 :
-				b === doc ? 1 :
-				aup ? -1 :
-				bup ? 1 :
-				0;
-
-		// If the nodes are siblings, we can do a quick check
-		} else if ( aup === bup ) {
-			return siblingCheck( a, b );
-		}
-
-		// Otherwise we need full lists of their ancestors for comparison
-		cur = a;
-		while ( (cur = cur.parentNode) ) {
-			ap.unshift( cur );
-		}
-		cur = b;
-		while ( (cur = cur.parentNode) ) {
-			bp.unshift( cur );
-		}
-
-		// Walk down the tree looking for a discrepancy
-		while ( ap[i] === bp[i] ) {
-			i++;
-		}
-
-		return i ?
-			// Do a sibling check if the nodes have a common ancestor
-			siblingCheck( ap[i], bp[i] ) :
-
-			// Otherwise nodes in our document sort first
-			ap[i] === preferredDoc ? -1 :
-			bp[i] === preferredDoc ? 1 :
-			0;
-	};
-
-	// Always assume the presence of duplicates if sort doesn't
-	// pass them to our comparison function (as in Google Chrome).
-	hasDuplicate = false;
-	[0, 0].sort( sortOrder );
-	support.detectDuplicates = hasDuplicate;
-
-	return document;
-};
-
-Sizzle.matches = function( expr, elements ) {
-	return Sizzle( expr, null, null, elements );
-};
-
-Sizzle.matchesSelector = function( elem, expr ) {
-	// Set document vars if needed
-	if ( ( elem.ownerDocument || elem ) !== document ) {
-		setDocument( elem );
-	}
-
-	// Make sure that attribute selectors are quoted
-	expr = expr.replace( rattributeQuotes, "='$1']" );
-
-	// rbuggyQSA always contains :focus, so no need for an existence check
-	if ( support.matchesSelector && !documentIsXML && (!rbuggyMatches || !rbuggyMatches.test(expr)) && !rbuggyQSA.test(expr) ) {
-		try {
-			var ret = matches.call( elem, expr );
-
-			// IE 9's matchesSelector returns false on disconnected nodes
-			if ( ret || support.disconnectedMatch ||
-					// As well, disconnected nodes are said to be in a document
-					// fragment in IE 9
-					elem.document && elem.document.nodeType !== 11 ) {
-				return ret;
-			}
-		} catch(e) {}
-	}
-
-	return Sizzle( expr, document, null, [elem] ).length > 0;
-};
-
-Sizzle.contains = function( context, elem ) {
-	// Set document vars if needed
-	if ( ( context.ownerDocument || context ) !== document ) {
-		setDocument( context );
-	}
-	return contains( context, elem );
-};
-
-Sizzle.attr = function( elem, name ) {
-	var val;
-
-	// Set document vars if needed
-	if ( ( elem.ownerDocument || elem ) !== document ) {
-		setDocument( elem );
-	}
-
-	if ( !documentIsXML ) {
-		name = name.toLowerCase();
-	}
-	if ( (val = Expr.attrHandle[ name ]) ) {
-		return val( elem );
-	}
-	if ( documentIsXML || support.attributes ) {
-		return elem.getAttribute( name );
-	}
-	return ( (val = elem.getAttributeNode( name )) || elem.getAttribute( name ) ) && elem[ name ] === true ?
-		name :
-		val && val.specified ? val.value : null;
-};
-
-Sizzle.error = function( msg ) {
-	throw new Error( "Syntax error, unrecognized expression: " + msg );
-};
-
-// Document sorting and removing duplicates
-Sizzle.uniqueSort = function( results ) {
-	var elem,
-		duplicates = [],
-		i = 1,
-		j = 0;
-
-	// Unless we *know* we can detect duplicates, assume their presence
-	hasDuplicate = !support.detectDuplicates;
-	results.sort( sortOrder );
-
-	if ( hasDuplicate ) {
-		for ( ; (elem = results[i]); i++ ) {
-			if ( elem === results[ i - 1 ] ) {
-				j = duplicates.push( i );
-			}
-		}
-		while ( j-- ) {
-			results.splice( duplicates[ j ], 1 );
-		}
-	}
-
-	return results;
-};
-
-function siblingCheck( a, b ) {
-	var cur = b && a,
-		diff = cur && ( ~b.sourceIndex || MAX_NEGATIVE ) - ( ~a.sourceIndex || MAX_NEGATIVE );
-
-	// Use IE sourceIndex if available on both nodes
-	if ( diff ) {
-		return diff;
-	}
-
-	// Check if b follows a
-	if ( cur ) {
-		while ( (cur = cur.nextSibling) ) {
-			if ( cur === b ) {
-				return -1;
-			}
-		}
-	}
-
-	return a ? 1 : -1;
-}
-
-// Returns a function to use in pseudos for input types
-function createInputPseudo( type ) {
-	return function( elem ) {
-		var name = elem.nodeName.toLowerCase();
-		return name === "input" && elem.type === type;
-	};
-}
-
-// Returns a function to use in pseudos for buttons
-function createButtonPseudo( type ) {
-	return function( elem ) {
-		var name = elem.nodeName.toLowerCase();
-		return (name === "input" || name === "button") && elem.type === type;
-	};
-}
-
-// Returns a function to use in pseudos for positionals
-function createPositionalPseudo( fn ) {
-	return markFunction(function( argument ) {
-		argument = +argument;
-		return markFunction(function( seed, matches ) {
-			var j,
-				matchIndexes = fn( [], seed.length, argument ),
-				i = matchIndexes.length;
-
-			// Match elements found at the specified indexes
-			while ( i-- ) {
-				if ( seed[ (j = matchIndexes[i]) ] ) {
-					seed[j] = !(matches[j] = seed[j]);
-				}
-			}
-		});
-	});
-}
-
-/**
- * Utility function for retrieving the text value of an array of DOM nodes
- * @param {Array|Element} elem
- */
-getText = Sizzle.getText = function( elem ) {
-	var node,
-		ret = "",
-		i = 0,
-		nodeType = elem.nodeType;
-
-	if ( !nodeType ) {
-		// If no nodeType, this is expected to be an array
-		for ( ; (node = elem[i]); i++ ) {
-			// Do not traverse comment nodes
-			ret += getText( node );
-		}
-	} else if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) {
-		// Use textContent for elements
-		// innerText usage removed for consistency of new lines (see #11153)
-		if ( typeof elem.textContent === "string" ) {
-			return elem.textContent;
-		} else {
-			// Traverse its children
-			for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
-				ret += getText( elem );
-			}
-		}
-	} else if ( nodeType === 3 || nodeType === 4 ) {
-		return elem.nodeValue;
-	}
-	// Do not include comment or processing instruction nodes
-
-	return ret;
-};
-
-Expr = Sizzle.selectors = {
-
-	// Can be adjusted by the user
-	cacheLength: 50,
-
-	createPseudo: markFunction,
-
-	match: matchExpr,
-
-	find: {},
-
-	relative: {
-		">": { dir: "parentNode", first: true },
-		" ": { dir: "parentNode" },
-		"+": { dir: "previousSibling", first: true },
-		"~": { dir: "previousSibling" }
-	},
-
-	preFilter: {
-		"ATTR": function( match ) {
-			match[1] = match[1].replace( runescape, funescape );
-
-			// Move the given value to match[3] whether quoted or unquoted
-			match[3] = ( match[4] || match[5] || "" ).replace( runescape, funescape );
-
-			if ( match[2] === "~=" ) {
-				match[3] = " " + match[3] + " ";
-			}
-
-			return match.slice( 0, 4 );
-		},
-
-		"CHILD": function( match ) {
-			/* matches from matchExpr["CHILD"]
-				1 type (only|nth|...)
-				2 what (child|of-type)
-				3 argument (even|odd|\d*|\d*n([+-]\d+)?|...)
-				4 xn-component of xn+y argument ([+-]?\d*n|)
-				5 sign of xn-component
-				6 x of xn-component
-				7 sign of y-component
-				8 y of y-component
-			*/
-			match[1] = match[1].toLowerCase();
-
-			if ( match[1].slice( 0, 3 ) === "nth" ) {
-				// nth-* requires argument
-				if ( !match[3] ) {
-					Sizzle.error( match[0] );
-				}
-
-				// numeric x and y parameters for Expr.filter.CHILD
-				// remember that false/true cast respectively to 0/1
-				match[4] = +( match[4] ? match[5] + (match[6] || 1) : 2 * ( match[3] === "even" || match[3] === "odd" ) );
-				match[5] = +( ( match[7] + match[8] ) || match[3] === "odd" );
-
-			// other types prohibit arguments
-			} else if ( match[3] ) {
-				Sizzle.error( match[0] );
-			}
-
-			return match;
-		},
-
-		"PSEUDO": function( match ) {
-			var excess,
-				unquoted = !match[5] && match[2];
-
-			if ( matchExpr["CHILD"].test( match[0] ) ) {
-				return null;
-			}
-
-			// Accept quoted arguments as-is
-			if ( match[4] ) {
-				match[2] = match[4];
-
-			// Strip excess characters from unquoted arguments
-			} else if ( unquoted && rpseudo.test( unquoted ) &&
-				// Get excess from tokenize (recursively)
-				(excess = tokenize( unquoted, true )) &&
-				// advance to the next closing parenthesis
-				(excess = unquoted.indexOf( ")", unquoted.length - excess ) - unquoted.length) ) {
-
-				// excess is a negative index
-				match[0] = match[0].slice( 0, excess );
-				match[2] = unquoted.slice( 0, excess );
-			}
-
-			// Return only captures needed by the pseudo filter method (type and argument)
-			return match.slice( 0, 3 );
-		}
-	},
-
-	filter: {
-
-		"TAG": function( nodeName ) {
-			if ( nodeName === "*" ) {
-				return function() { return true; };
-			}
-
-			nodeName = nodeName.replace( runescape, funescape ).toLowerCase();
-			return function( elem ) {
-				return elem.nodeName && elem.nodeName.toLowerCase() === nodeName;
-			};
-		},
-
-		"CLASS": function( className ) {
-			var pattern = classCache[ className + " " ];
-
-			return pattern ||
-				(pattern = new RegExp( "(^|" + whitespace + ")" + className + "(" + whitespace + "|$)" )) &&
-				classCache( className, function( elem ) {
-					return pattern.test( elem.className || (typeof elem.getAttribute !== strundefined && elem.getAttribute("class")) || "" );
-				});
-		},
-
-		"ATTR": function( name, operator, check ) {
-			return function( elem ) {
-				var result = Sizzle.attr( elem, name );
-
-				if ( result == null ) {
-					return operator === "!=";
-				}
-				if ( !operator ) {
-					return true;
-				}
-
-				result += "";
-
-				return operator === "=" ? result === check :
-					operator === "!=" ? result !== check :
-					operator === "^=" ? check && result.indexOf( check ) === 0 :
-					operator === "*=" ? check && result.indexOf( check ) > -1 :
-					operator === "$=" ? check && result.slice( -check.length ) === check :
-					operator === "~=" ? ( " " + result + " " ).indexOf( check ) > -1 :
-					operator === "|=" ? result === check || result.slice( 0, check.length + 1 ) === check + "-" :
-					false;
-			};
-		},
-
-		"CHILD": function( type, what, argument, first, last ) {
-			var simple = type.slice( 0, 3 ) !== "nth",
-				forward = type.slice( -4 ) !== "last",
-				ofType = what === "of-type";
-
-			return first === 1 && last === 0 ?
-
-				// Shortcut for :nth-*(n)
-				function( elem ) {
-					return !!elem.parentNode;
-				} :
-
-				function( elem, context, xml ) {
-					var cache, outerCache, node, diff, nodeIndex, start,
-						dir = simple !== forward ? "nextSibling" : "previousSibling",
-						parent = elem.parentNode,
-						name = ofType && elem.nodeName.toLowerCase(),
-						useCache = !xml && !ofType;
-
-					if ( parent ) {
-
-						// :(first|last|only)-(child|of-type)
-						if ( simple ) {
-							while ( dir ) {
-								node = elem;
-								while ( (node = node[ dir ]) ) {
-									if ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) {
-										return false;
-									}
-								}
-								// Reverse direction for :only-* (if we haven't yet done so)
-								start = dir = type === "only" && !start && "nextSibling";
-							}
-							return true;
-						}
-
-						start = [ forward ? parent.firstChild : parent.lastChild ];
-
-						// non-xml :nth-child(...) stores cache data on `parent`
-						if ( forward && useCache ) {
-							// Seek `elem` from a previously-cached index
-							outerCache = parent[ expando ] || (parent[ expando ] = {});
-							cache = outerCache[ type ] || [];
-							nodeIndex = cache[0] === dirruns && cache[1];
-							diff = cache[0] === dirruns && cache[2];
-							node = nodeIndex && parent.childNodes[ nodeIndex ];
-
-							while ( (node = ++nodeIndex && node && node[ dir ] ||
-
-								// Fallback to seeking `elem` from the start
-								(diff = nodeIndex = 0) || start.pop()) ) {
-
-								// When found, cache indexes on `parent` and break
-								if ( node.nodeType === 1 && ++diff && node === elem ) {
-									outerCache[ type ] = [ dirruns, nodeIndex, diff ];
-									break;
-								}
-							}
-
-						// Use previously-cached element index if available
-						} else if ( useCache && (cache = (elem[ expando ] || (elem[ expando ] = {}))[ type ]) && cache[0] === dirruns ) {
-							diff = cache[1];
-
-						// xml :nth-child(...) or :nth-last-child(...) or :nth(-last)?-of-type(...)
-						} else {
-							// Use the same loop as above to seek `elem` from the start
-							while ( (node = ++nodeIndex && node && node[ dir ] ||
-								(diff = nodeIndex = 0) || start.pop()) ) {
-
-								if ( ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) && ++diff ) {
-									// Cache the index of each encountered element
-									if ( useCache ) {
-										(node[ expando ] || (node[ expando ] = {}))[ type ] = [ dirruns, diff ];
-									}
-
-									if ( node === elem ) {
-										break;
-									}
-								}
-							}
-						}
-
-						// Incorporate the offset, then check against cycle size
-						diff -= last;
-						return diff === first || ( diff % first === 0 && diff / first >= 0 );
-					}
-				};
-		},
-
-		"PSEUDO": function( pseudo, argument ) {
-			// pseudo-class names are case-insensitive
-			// http://www.w3.org/TR/selectors/#pseudo-classes
-			// Prioritize by case sensitivity in case custom pseudos are added with uppercase letters
-			// Remember that setFilters inherits from pseudos
-			var args,
-				fn = Expr.pseudos[ pseudo ] || Expr.setFilters[ pseudo.toLowerCase() ] ||
-					Sizzle.error( "unsupported pseudo: " + pseudo );
-
-			// The user may use createPseudo to indicate that
-			// arguments are needed to create the filter function
-			// just as Sizzle does
-			if ( fn[ expando ] ) {
-				return fn( argument );
-			}
-
-			// But maintain support for old signatures
-			if ( fn.length > 1 ) {
-				args = [ pseudo, pseudo, "", argument ];
-				return Expr.setFilters.hasOwnProperty( pseudo.toLowerCase() ) ?
-					markFunction(function( seed, matches ) {
-						var idx,
-							matched = fn( seed, argument ),
-							i = matched.length;
-						while ( i-- ) {
-							idx = indexOf.call( seed, matched[i] );
-							seed[ idx ] = !( matches[ idx ] = matched[i] );
-						}
-					}) :
-					function( elem ) {
-						return fn( elem, 0, args );
-					};
-			}
-
-			return fn;
-		}
-	},
-
-	pseudos: {
-		// Potentially complex pseudos
-		"not": markFunction(function( selector ) {
-			// Trim the selector passed to compile
-			// to avoid treating leading and trailing
-			// spaces as combinators
-			var input = [],
-				results = [],
-				matcher = compile( selector.replace( rtrim, "$1" ) );
-
-			return matcher[ expando ] ?
-				markFunction(function( seed, matches, context, xml ) {
-					var elem,
-						unmatched = matcher( seed, null, xml, [] ),
-						i = seed.length;
-
-					// Match elements unmatched by `matcher`
-					while ( i-- ) {
-						if ( (elem = unmatched[i]) ) {
-							seed[i] = !(matches[i] = elem);
-						}
-					}
-				}) :
-				function( elem, context, xml ) {
-					input[0] = elem;
-					matcher( input, null, xml, results );
-					return !results.pop();
-				};
-		}),
-
-		"has": markFunction(function( selector ) {
-			return function( elem ) {
-				return Sizzle( selector, elem ).length > 0;
-			};
-		}),
-
-		"contains": markFunction(function( text ) {
-			return function( elem ) {
-				return ( elem.textContent || elem.innerText || getText( elem ) ).indexOf( text ) > -1;
-			};
-		}),
-
-		// "Whether an element is represented by a :lang() selector
-		// is based solely on the element's language value
-		// being equal to the identifier C,
-		// or beginning with the identifier C immediately followed by "-".
-		// The matching of C against the element's language value is performed case-insensitively.
-		// The identifier C does not have to be a valid language name."
-		// http://www.w3.org/TR/selectors/#lang-pseudo
-		"lang": markFunction( function( lang ) {
-			// lang value must be a valid identifider
-			if ( !ridentifier.test(lang || "") ) {
-				Sizzle.error( "unsupported lang: " + lang );
-			}
-			lang = lang.replace( runescape, funescape ).toLowerCase();
-			return function( elem ) {
-				var elemLang;
-				do {
-					if ( (elemLang = documentIsXML ?
-						elem.getAttribute("xml:lang") || elem.getAttribute("lang") :
-						elem.lang) ) {
-
-						elemLang = elemLang.toLowerCase();
-						return elemLang === lang || elemLang.indexOf( lang + "-" ) === 0;
-					}
-				} while ( (elem = elem.parentNode) && elem.nodeType === 1 );
-				return false;
-			};
-		}),
-
-		// Miscellaneous
-		"target": function( elem ) {
-			var hash = window.location && window.location.hash;
-			return hash && hash.slice( 1 ) === elem.id;
-		},
-
-		"root": function( elem ) {
-			return elem === docElem;
-		},
-
-		"focus": function( elem ) {
-			return elem === document.activeElement && (!document.hasFocus || document.hasFocus()) && !!(elem.type || elem.href || ~elem.tabIndex);
-		},
-
-		// Boolean properties
-		"enabled": function( elem ) {
-			return elem.disabled === false;
-		},
-
-		"disabled": function( elem ) {
-			return elem.disabled === true;
-		},
-
-		"checked": function( elem ) {
-			// In CSS3, :checked should return both checked and selected elements
-			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
-			var nodeName = elem.nodeName.toLowerCase();
-			return (nodeName === "input" && !!elem.checked) || (nodeName === "option" && !!elem.selected);
-		},
-
-		"selected": function( elem ) {
-			// Accessing this property makes selected-by-default
-			// options in Safari work properly
-			if ( elem.parentNode ) {
-				elem.parentNode.selectedIndex;
-			}
-
-			return elem.selected === true;
-		},
-
-		// Contents
-		"empty": function( elem ) {
-			// http://www.w3.org/TR/selectors/#empty-pseudo
-			// :empty is only affected by element nodes and content nodes(including text(3), cdata(4)),
-			//   not comment, processing instructions, or others
-			// Thanks to Diego Perini for the nodeName shortcut
-			//   Greater than "@" means alpha characters (specifically not starting with "#" or "?")
-			for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
-				if ( elem.nodeName > "@" || elem.nodeType === 3 || elem.nodeType === 4 ) {
-					return false;
-				}
-			}
-			return true;
-		},
-
-		"parent": function( elem ) {
-			return !Expr.pseudos["empty"]( elem );
-		},
-
-		// Element/input types
-		"header": function( elem ) {
-			return rheader.test( elem.nodeName );
-		},
-
-		"input": function( elem ) {
-			return rinputs.test( elem.nodeName );
-		},
-
-		"button": function( elem ) {
-			var name = elem.nodeName.toLowerCase();
-			return name === "input" && elem.type === "button" || name === "button";
-		},
-
-		"text": function( elem ) {
-			var attr;
-			// IE6 and 7 will map elem.type to 'text' for new HTML5 types (search, etc)
-			// use getAttribute instead to test this case
-			return elem.nodeName.toLowerCase() === "input" &&
-				elem.type === "text" &&
-				( (attr = elem.getAttribute("type")) == null || attr.toLowerCase() === elem.type );
-		},
-
-		// Position-in-collection
-		"first": createPositionalPseudo(function() {
-			return [ 0 ];
-		}),
-
-		"last": createPositionalPseudo(function( matchIndexes, length ) {
-			return [ length - 1 ];
-		}),
-
-		"eq": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			return [ argument < 0 ? argument + length : argument ];
-		}),
-
-		"even": createPositionalPseudo(function( matchIndexes, length ) {
-			var i = 0;
-			for ( ; i < length; i += 2 ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		}),
-
-		"odd": createPositionalPseudo(function( matchIndexes, length ) {
-			var i = 1;
-			for ( ; i < length; i += 2 ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		}),
-
-		"lt": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			var i = argument < 0 ? argument + length : argument;
-			for ( ; --i >= 0; ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		}),
-
-		"gt": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			var i = argument < 0 ? argument + length : argument;
-			for ( ; ++i < length; ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		})
-	}
-};
-
-// Add button/input type pseudos
-for ( i in { radio: true, checkbox: true, file: true, password: true, image: true } ) {
-	Expr.pseudos[ i ] = createInputPseudo( i );
-}
-for ( i in { submit: true, reset: true } ) {
-	Expr.pseudos[ i ] = createButtonPseudo( i );
-}
-
-function tokenize( selector, parseOnly ) {
-	var matched, match, tokens, type,
-		soFar, groups, preFilters,
-		cached = tokenCache[ selector + " " ];
-
-	if ( cached ) {
-		return parseOnly ? 0 : cached.slice( 0 );
-	}
-
-	soFar = selector;
-	groups = [];
-	preFilters = Expr.preFilter;
-
-	while ( soFar ) {
-
-		// Comma and first run
-		if ( !matched || (match = rcomma.exec( soFar )) ) {
-			if ( match ) {
-				// Don't consume trailing commas as valid
-				soFar = soFar.slice( match[0].length ) || soFar;
-			}
-			groups.push( tokens = [] );
-		}
-
-		matched = false;
-
-		// Combinators
-		if ( (match = rcombinators.exec( soFar )) ) {
-			matched = match.shift();
-			tokens.push( {
-				value: matched,
-				// Cast descendant combinators to space
-				type: match[0].replace( rtrim, " " )
-			} );
-			soFar = soFar.slice( matched.length );
-		}
-
-		// Filters
-		for ( type in Expr.filter ) {
-			if ( (match = matchExpr[ type ].exec( soFar )) && (!preFilters[ type ] ||
-				(match = preFilters[ type ]( match ))) ) {
-				matched = match.shift();
-				tokens.push( {
-					value: matched,
-					type: type,
-					matches: match
-				} );
-				soFar = soFar.slice( matched.length );
-			}
-		}
-
-		if ( !matched ) {
-			break;
-		}
-	}
-
-	// Return the length of the invalid excess
-	// if we're just parsing
-	// Otherwise, throw an error or return tokens
-	return parseOnly ?
-		soFar.length :
-		soFar ?
-			Sizzle.error( selector ) :
-			// Cache the tokens
-			tokenCache( selector, groups ).slice( 0 );
-}
-
-function toSelector( tokens ) {
-	var i = 0,
-		len = tokens.length,
-		selector = "";
-	for ( ; i < len; i++ ) {
-		selector += tokens[i].value;
-	}
-	return selector;
-}
-
-function addCombinator( matcher, combinator, base ) {
-	var dir = combinator.dir,
-		checkNonElements = base && dir === "parentNode",
-		doneName = done++;
-
-	return combinator.first ?
-		// Check against closest ancestor/preceding element
-		function( elem, context, xml ) {
-			while ( (elem = elem[ dir ]) ) {
-				if ( elem.nodeType === 1 || checkNonElements ) {
-					return matcher( elem, context, xml );
-				}
-			}
-		} :
-
-		// Check against all ancestor/preceding elements
-		function( elem, context, xml ) {
-			var data, cache, outerCache,
-				dirkey = dirruns + " " + doneName;
-
-			// We can't set arbitrary data on XML nodes, so they don't benefit from dir caching
-			if ( xml ) {
-				while ( (elem = elem[ dir ]) ) {
-					if ( elem.nodeType === 1 || checkNonElements ) {
-						if ( matcher( elem, context, xml ) ) {
-							return true;
-						}
-					}
-				}
-			} else {
-				while ( (elem = elem[ dir ]) ) {
-					if ( elem.nodeType === 1 || checkNonElements ) {
-						outerCache = elem[ expando ] || (elem[ expando ] = {});
-						if ( (cache = outerCache[ dir ]) && cache[0] === dirkey ) {
-							if ( (data = cache[1]) === true || data === cachedruns ) {
-								return data === true;
-							}
-						} else {
-							cache = outerCache[ dir ] = [ dirkey ];
-							cache[1] = matcher( elem, context, xml ) || cachedruns;
-							if ( cache[1] === true ) {
-								return true;
-							}
-						}
-					}
-				}
-			}
-		};
-}
-
-function elementMatcher( matchers ) {
-	return matchers.length > 1 ?
-		function( elem, context, xml ) {
-			var i = matchers.length;
-			while ( i-- ) {
-				if ( !matchers[i]( elem, context, xml ) ) {
-					return false;
-				}
-			}
-			return true;
-		} :
-		matchers[0];
-}
-
-function condense( unmatched, map, filter, context, xml ) {
-	var elem,
-		newUnmatched = [],
-		i = 0,
-		len = unmatched.length,
-		mapped = map != null;
-
-	for ( ; i < len; i++ ) {
-		if ( (elem = unmatched[i]) ) {
-			if ( !filter || filter( elem, context, xml ) ) {
-				newUnmatched.push( elem );
-				if ( mapped ) {
-					map.push( i );
-				}
-			}
-		}
-	}
-
-	return newUnmatched;
-}
-
-function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postSelector ) {
-	if ( postFilter && !postFilter[ expando ] ) {
-		postFilter = setMatcher( postFilter );
-	}
-	if ( postFinder && !postFinder[ expando ] ) {
-		postFinder = setMatcher( postFinder, postSelector );
-	}
-	return markFunction(function( seed, results, context, xml ) {
-		var temp, i, elem,
-			preMap = [],
-			postMap = [],
-			preexisting = results.length,
-
-			// Get initial elements from seed or context
-			elems = seed || multipleContexts( selector || "*", context.nodeType ? [ context ] : context, [] ),
-
-			// Prefilter to get matcher input, preserving a map for seed-results synchronization
-			matcherIn = preFilter && ( seed || !selector ) ?
-				condense( elems, preMap, preFilter, context, xml ) :
-				elems,
-
-			matcherOut = matcher ?
-				// If we have a postFinder, or filtered seed, or non-seed postFilter or preexisting results,
-				postFinder || ( seed ? preFilter : preexisting || postFilter ) ?
-
-					// ...intermediate processing is necessary
-					[] :
-
-					// ...otherwise use results directly
-					results :
-				matcherIn;
-
-		// Find primary matches
-		if ( matcher ) {
-			matcher( matcherIn, matcherOut, context, xml );
-		}
-
-		// Apply postFilter
-		if ( postFilter ) {
-			temp = condense( matcherOut, postMap );
-			postFilter( temp, [], context, xml );
-
-			// Un-match failing elements by moving them back to matcherIn
-			i = temp.length;
-			while ( i-- ) {
-				if ( (elem = temp[i]) ) {
-					matcherOut[ postMap[i] ] = !(matcherIn[ postMap[i] ] = elem);
-				}
-			}
-		}
-
-		if ( seed ) {
-			if ( postFinder || preFilter ) {
-				if ( postFinder ) {
-					// Get the final matcherOut by condensing this intermediate into postFinder contexts
-					temp = [];
-					i = matcherOut.length;
-					while ( i-- ) {
-						if ( (elem = matcherOut[i]) ) {
-							// Restore matcherIn since elem is not yet a final match
-							temp.push( (matcherIn[i] = elem) );
-						}
-					}
-					postFinder( null, (matcherOut = []), temp, xml );
-				}
-
-				// Move matched elements from seed to results to keep them synchronized
-				i = matcherOut.length;
-				while ( i-- ) {
-					if ( (elem = matcherOut[i]) &&
-						(temp = postFinder ? indexOf.call( seed, elem ) : preMap[i]) > -1 ) {
-
-						seed[temp] = !(results[temp] = elem);
-					}
-				}
-			}
-
-		// Add elements to results, through postFinder if defined
-		} else {
-			matcherOut = condense(
-				matcherOut === results ?
-					matcherOut.splice( preexisting, matcherOut.length ) :
-					matcherOut
-			);
-			if ( postFinder ) {
-				postFinder( null, results, matcherOut, xml );
-			} else {
-				push.apply( results, matcherOut );
-			}
-		}
-	});
-}
-
-function matcherFromTokens( tokens ) {
-	var checkContext, matcher, j,
-		len = tokens.length,
-		leadingRelative = Expr.relative[ tokens[0].type ],
-		implicitRelative = leadingRelative || Expr.relative[" "],
-		i = leadingRelative ? 1 : 0,
-
-		// The foundational matcher ensures that elements are reachable from top-level context(s)
-		matchContext = addCombinator( function( elem ) {
-			return elem === checkContext;
-		}, implicitRelative, true ),
-		matchAnyContext = addCombinator( function( elem ) {
-			return indexOf.call( checkContext, elem ) > -1;
-		}, implicitRelative, true ),
-		matchers = [ function( elem, context, xml ) {
-			return ( !leadingRelative && ( xml || context !== outermostContext ) ) || (
-				(checkContext = context).nodeType ?
-					matchContext( elem, context, xml ) :
-					matchAnyContext( elem, context, xml ) );
-		} ];
-
-	for ( ; i < len; i++ ) {
-		if ( (matcher = Expr.relative[ tokens[i].type ]) ) {
-			matchers = [ addCombinator(elementMatcher( matchers ), matcher) ];
-		} else {
-			matcher = Expr.filter[ tokens[i].type ].apply( null, tokens[i].matches );
-
-			// Return special upon seeing a positional matcher
-			if ( matcher[ expando ] ) {
-				// Find the next relative operator (if any) for proper handling
-				j = ++i;
-				for ( ; j < len; j++ ) {
-					if ( Expr.relative[ tokens[j].type ] ) {
-						break;
-					}
-				}
-				return setMatcher(
-					i > 1 && elementMatcher( matchers ),
-					i > 1 && toSelector( tokens.slice( 0, i - 1 ) ).replace( rtrim, "$1" ),
-					matcher,
-					i < j && matcherFromTokens( tokens.slice( i, j ) ),
-					j < len && matcherFromTokens( (tokens = tokens.slice( j )) ),
-					j < len && toSelector( tokens )
-				);
-			}
-			matchers.push( matcher );
-		}
-	}
-
-	return elementMatcher( matchers );
-}
-
-function matcherFromGroupMatchers( elementMatchers, setMatchers ) {
-	// A counter to specify which element is currently being matched
-	var matcherCachedRuns = 0,
-		bySet = setMatchers.length > 0,
-		byElement = elementMatchers.length > 0,
-		superMatcher = function( seed, context, xml, results, expandContext ) {
-			var elem, j, matcher,
-				setMatched = [],
-				matchedCount = 0,
-				i = "0",
-				unmatched = seed && [],
-				outermost = expandContext != null,
-				contextBackup = outermostContext,
-				// We must always have either seed elements or context
-				elems = seed || byElement && Expr.find["TAG"]( "*", expandContext && context.parentNode || context ),
-				// Use integer dirruns iff this is the outermost matcher
-				dirrunsUnique = (dirruns += contextBackup == null ? 1 : Math.random() || 0.1);
-
-			if ( outermost ) {
-				outermostContext = context !== document && context;
-				cachedruns = matcherCachedRuns;
-			}
-
-			// Add elements passing elementMatchers directly to results
-			// Keep `i` a string if there are no elements so `matchedCount` will be "00" below
-			for ( ; (elem = elems[i]) != null; i++ ) {
-				if ( byElement && elem ) {
-					j = 0;
-					while ( (matcher = elementMatchers[j++]) ) {
-						if ( matcher( elem, context, xml ) ) {
-							results.push( elem );
-							break;
-						}
-					}
-					if ( outermost ) {
-						dirruns = dirrunsUnique;
-						cachedruns = ++matcherCachedRuns;
-					}
-				}
-
-				// Track unmatched elements for set filters
-				if ( bySet ) {
-					// They will have gone through all possible matchers
-					if ( (elem = !matcher && elem) ) {
-						matchedCount--;
-					}
-
-					// Lengthen the array for every element, matched or not
-					if ( seed ) {
-						unmatched.push( elem );
-					}
-				}
-			}
-
-			// Apply set filters to unmatched elements
-			matchedCount += i;
-			if ( bySet && i !== matchedCount ) {
-				j = 0;
-				while ( (matcher = setMatchers[j++]) ) {
-					matcher( unmatched, setMatched, context, xml );
-				}
-
-				if ( seed ) {
-					// Reintegrate element matches to eliminate the need for sorting
-					if ( matchedCount > 0 ) {
-						while ( i-- ) {
-							if ( !(unmatched[i] || setMatched[i]) ) {
-								setMatched[i] = pop.call( results );
-							}
-						}
-					}
-
-					// Discard index placeholder values to get only actual matches
-					setMatched = condense( setMatched );
-				}
-
-				// Add matches to results
-				push.apply( results, setMatched );
-
-				// Seedless set matches succeeding multiple successful matchers stipulate sorting
-				if ( outermost && !seed && setMatched.length > 0 &&
-					( matchedCount + setMatchers.length ) > 1 ) {
-
-					Sizzle.uniqueSort( results );
-				}
-			}
-
-			// Override manipulation of globals by nested matchers
-			if ( outermost ) {
-				dirruns = dirrunsUnique;
-				outermostContext = contextBackup;
-			}
-
-			return unmatched;
-		};
-
-	return bySet ?
-		markFunction( superMatcher ) :
-		superMatcher;
-}
-
-compile = Sizzle.compile = function( selector, group /* Internal Use Only */ ) {
-	var i,
-		setMatchers = [],
-		elementMatchers = [],
-		cached = compilerCache[ selector + " " ];
-
-	if ( !cached ) {
-		// Generate a function of recursive functions that can be used to check each element
-		if ( !group ) {
-			group = tokenize( selector );
-		}
-		i = group.length;
-		while ( i-- ) {
-			cached = matcherFromTokens( group[i] );
-			if ( cached[ expando ] ) {
-				setMatchers.push( cached );
-			} else {
-				elementMatchers.push( cached );
-			}
-		}
-
-		// Cache the compiled function
-		cached = compilerCache( selector, matcherFromGroupMatchers( elementMatchers, setMatchers ) );
-	}
-	return cached;
-};
-
-function multipleContexts( selector, contexts, results ) {
-	var i = 0,
-		len = contexts.length;
-	for ( ; i < len; i++ ) {
-		Sizzle( selector, contexts[i], results );
-	}
-	return results;
-}
-
-function select( selector, context, results, seed ) {
-	var i, tokens, token, type, find,
-		match = tokenize( selector );
-
-	if ( !seed ) {
-		// Try to minimize operations if there is only one group
-		if ( match.length === 1 ) {
-
-			// Take a shortcut and set the context if the root selector is an ID
-			tokens = match[0] = match[0].slice( 0 );
-			if ( tokens.length > 2 && (token = tokens[0]).type === "ID" &&
-					context.nodeType === 9 && !documentIsXML &&
-					Expr.relative[ tokens[1].type ] ) {
-
-				context = Expr.find["ID"]( token.matches[0].replace( runescape, funescape ), context )[0];
-				if ( !context ) {
-					return results;
-				}
-
-				selector = selector.slice( tokens.shift().value.length );
-			}
-
-			// Fetch a seed set for right-to-left matching
-			i = matchExpr["needsContext"].test( selector ) ? 0 : tokens.length;
-			while ( i-- ) {
-				token = tokens[i];
-
-				// Abort if we hit a combinator
-				if ( Expr.relative[ (type = token.type) ] ) {
-					break;
-				}
-				if ( (find = Expr.find[ type ]) ) {
-					// Search, expanding context for leading sibling combinators
-					if ( (seed = find(
-						token.matches[0].replace( runescape, funescape ),
-						rsibling.test( tokens[0].type ) && context.parentNode || context
-					)) ) {
-
-						// If seed is empty or no tokens remain, we can return early
-						tokens.splice( i, 1 );
-						selector = seed.length && toSelector( tokens );
-						if ( !selector ) {
-							push.apply( results, slice.call( seed, 0 ) );
-							return results;
-						}
-
-						break;
-					}
-				}
-			}
-		}
-	}
-
-	// Compile and execute a filtering function
-	// Provide `match` to avoid retokenization if we modified the selector above
-	compile( selector, match )(
-		seed,
-		context,
-		documentIsXML,
-		results,
-		rsibling.test( selector )
-	);
-	return results;
-}
-
-// Deprecated
-Expr.pseudos["nth"] = Expr.pseudos["eq"];
-
-// Easy API for creating new setFilters
-function setFilters() {}
-Expr.filters = setFilters.prototype = Expr.pseudos;
-Expr.setFilters = new setFilters();
-
-// Initialize with the default document
-setDocument();
-
-// Override sizzle attribute retrieval
-Sizzle.attr = jQuery.attr;
-jQuery.find = Sizzle;
-jQuery.expr = Sizzle.selectors;
-jQuery.expr[":"] = jQuery.expr.pseudos;
-jQuery.unique = Sizzle.uniqueSort;
-jQuery.text = Sizzle.getText;
-jQuery.isXMLDoc = Sizzle.isXML;
-jQuery.contains = Sizzle.contains;
-
-
-})( window );
-var runtil = /Until$/,
-	rparentsprev = /^(?:parents|prev(?:Until|All))/,
-	isSimple = /^.[^:#\[\.,]*$/,
-	rneedsContext = jQuery.expr.match.needsContext,
-	// methods guaranteed to produce a unique set when starting from a unique set
-	guaranteedUnique = {
-		children: true,
-		contents: true,
-		next: true,
-		prev: true
-	};
-
-jQuery.fn.extend({
-	find: function( selector ) {
-		var i, ret, self,
-			len = this.length;
-
-		if ( typeof selector !== "string" ) {
-			self = this;
-			return this.pushStack( jQuery( selector ).filter(function() {
-				for ( i = 0; i < len; i++ ) {
-					if ( jQuery.contains( self[ i ], this ) ) {
-						return true;
-					}
-				}
-			}) );
-		}
-
-		ret = [];
-		for ( i = 0; i < len; i++ ) {
-			jQuery.find( selector, this[ i ], ret );
-		}
-
-		// Needed because $( selector, context ) becomes $( context ).find( selector )
-		ret = this.pushStack( len > 1 ? jQuery.unique( ret ) : ret );
-		ret.selector = ( this.selector ? this.selector + " " : "" ) + selector;
-		return ret;
-	},
-
-	has: function( target ) {
-		var i,
-			targets = jQuery( target, this ),
-			len = targets.length;
-
-		return this.filter(function() {
-			for ( i = 0; i < len; i++ ) {
-				if ( jQuery.contains( this, targets[i] ) ) {
-					return true;
-				}
-			}
-		});
-	},
-
-	not: function( selector ) {
-		return this.pushStack( winnow(this, selector, false) );
-	},
-
-	filter: function( selector ) {
-		return this.pushStack( winnow(this, selector, true) );
-	},
-
-	is: function( selector ) {
-		return !!selector && (
-			typeof selector === "string" ?
-				// If this is a positional/relative selector, check membership in the returned set
-				// so $("p:first").is("p:last") won't return true for a doc with two "p".
-				rneedsContext.test( selector ) ?
-					jQuery( selector, this.context ).index( this[0] ) >= 0 :
-					jQuery.filter( selector, this ).length > 0 :
-				this.filter( selector ).length > 0 );
-	},
-
-	closest: function( selectors, context ) {
-		var cur,
-			i = 0,
-			l = this.length,
-			ret = [],
-			pos = rneedsContext.test( selectors ) || typeof selectors !== "string" ?
-				jQuery( selectors, context || this.context ) :
-				0;
-
-		for ( ; i < l; i++ ) {
-			cur = this[i];
-
-			while ( cur && cur.ownerDocument && cur !== context && cur.nodeType !== 11 ) {
-				if ( pos ? pos.index(cur) > -1 : jQuery.find.matchesSelector(cur, selectors) ) {
-					ret.push( cur );
-					break;
-				}
-				cur = cur.parentNode;
-			}
-		}
-
-		return this.pushStack( ret.length > 1 ? jQuery.unique( ret ) : ret );
-	},
-
-	// Determine the position of an element within
-	// the matched set of elements
-	index: function( elem ) {
-
-		// No argument, return index in parent
-		if ( !elem ) {
-			return ( this[0] && this[0].parentNode ) ? this.first().prevAll().length : -1;
-		}
-
-		// index in selector
-		if ( typeof elem === "string" ) {
-			return jQuery.inArray( this[0], jQuery( elem ) );
-		}
-
-		// Locate the position of the desired element
-		return jQuery.inArray(
-			// If it receives a jQuery object, the first element is used
-			elem.jquery ? elem[0] : elem, this );
-	},
-
-	add: function( selector, context ) {
-		var set = typeof selector === "string" ?
-				jQuery( selector, context ) :
-				jQuery.makeArray( selector && selector.nodeType ? [ selector ] : selector ),
-			all = jQuery.merge( this.get(), set );
-
-		return this.pushStack( jQuery.unique(all) );
-	},
-
-	addBack: function( selector ) {
-		return this.add( selector == null ?
-			this.prevObject : this.prevObject.filter(selector)
-		);
-	}
-});
-
-jQuery.fn.andSelf = jQuery.fn.addBack;
-
-function sibling( cur, dir ) {
-	do {
-		cur = cur[ dir ];
-	} while ( cur && cur.nodeType !== 1 );
-
-	return cur;
-}
-
-jQuery.each({
-	parent: function( elem ) {
-		var parent = elem.parentNode;
-		return parent && parent.nodeType !== 11 ? parent : null;
-	},
-	parents: function( elem ) {
-		return jQuery.dir( elem, "parentNode" );
-	},
-	parentsUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "parentNode", until );
-	},
-	next: function( elem ) {
-		return sibling( elem, "nextSibling" );
-	},
-	prev: function( elem ) {
-		return sibling( elem, "previousSibling" );
-	},
-	nextAll: function( elem ) {
-		return jQuery.dir( elem, "nextSibling" );
-	},
-	prevAll: function( elem ) {
-		return jQuery.dir( elem, "previousSibling" );
-	},
-	nextUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "nextSibling", until );
-	},
-	prevUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "previousSibling", until );
-	},
-	siblings: function( elem ) {
-		return jQuery.sibling( ( elem.parentNode || {} ).firstChild, elem );
-	},
-	children: function( elem ) {
-		return jQuery.sibling( elem.firstChild );
-	},
-	contents: function( elem ) {
-		return jQuery.nodeName( elem, "iframe" ) ?
-			elem.contentDocument || elem.contentWindow.document :
-			jQuery.merge( [], elem.childNodes );
-	}
-}, function( name, fn ) {
-	jQuery.fn[ name ] = function( until, selector ) {
-		var ret = jQuery.map( this, fn, until );
-
-		if ( !runtil.test( name ) ) {
-			selector = until;
-		}
-
-		if ( selector && typeof selector === "string" ) {
-			ret = jQuery.filter( selector, ret );
-		}
-
-		ret = this.length > 1 && !guaranteedUnique[ name ] ? jQuery.unique( ret ) : ret;
-
-		if ( this.length > 1 && rparentsprev.test( name ) ) {
-			ret = ret.reverse();
-		}
-
-		return this.pushStack( ret );
-	};
-});
-
-jQuery.extend({
-	filter: function( expr, elems, not ) {
-		if ( not ) {
-			expr = ":not(" + expr + ")";
-		}
-
-		return elems.length === 1 ?
-			jQuery.find.matchesSelector(elems[0], expr) ? [ elems[0] ] : [] :
-			jQuery.find.matches(expr, elems);
-	},
-
-	dir: function( elem, dir, until ) {
-		var matched = [],
-			cur = elem[ dir ];
-
-		while ( cur && cur.nodeType !== 9 && (until === undefined || cur.nodeType !== 1 || !jQuery( cur ).is( until )) ) {
-			if ( cur.nodeType === 1 ) {
-				matched.push( cur );
-			}
-			cur = cur[dir];
-		}
-		return matched;
-	},
-
-	sibling: function( n, elem ) {
-		var r = [];
-
-		for ( ; n; n = n.nextSibling ) {
-			if ( n.nodeType === 1 && n !== elem ) {
-				r.push( n );
-			}
-		}
-
-		return r;
-	}
-});
-
-// Implement the identical functionality for filter and not
-function winnow( elements, qualifier, keep ) {
-
-	// Can't pass null or undefined to indexOf in Firefox 4
-	// Set to 0 to skip string check
-	qualifier = qualifier || 0;
-
-	if ( jQuery.isFunction( qualifier ) ) {
-		return jQuery.grep(elements, function( elem, i ) {
-			var retVal = !!qualifier.call( elem, i, elem );
-			return retVal === keep;
-		});
-
-	} else if ( qualifier.nodeType ) {
-		return jQuery.grep(elements, function( elem ) {
-			return ( elem === qualifier ) === keep;
-		});
-
-	} else if ( typeof qualifier === "string" ) {
-		var filtered = jQuery.grep(elements, function( elem ) {
-			return elem.nodeType === 1;
-		});
-
-		if ( isSimple.test( qualifier ) ) {
-			return jQuery.filter(qualifier, filtered, !keep);
-		} else {
-			qualifier = jQuery.filter( qualifier, filtered );
-		}
-	}
-
-	return jQuery.grep(elements, function( elem ) {
-		return ( jQuery.inArray( elem, qualifier ) >= 0 ) === keep;
-	});
-}
-function createSafeFragment( document ) {
-	var list = nodeNames.split( "|" ),
-		safeFrag = document.createDocumentFragment();
-
-	if ( safeFrag.createElement ) {
-		while ( list.length ) {
-			safeFrag.createElement(
-				list.pop()
-			);
-		}
-	}
-	return safeFrag;
-}
-
-var nodeNames = "abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|" +
-		"header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",
-	rinlinejQuery = / jQuery\d+="(?:null|\d+)"/g,
-	rnoshimcache = new RegExp("<(?:" + nodeNames + ")[\\s/>]", "i"),
-	rleadingWhitespace = /^\s+/,
-	rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,
-	rtagName = /<([\w:]+)/,
-	rtbody = /<tbody/i,
-	rhtml = /<|&#?\w+;/,
-	rnoInnerhtml = /<(?:script|style|link)/i,
-	manipulation_rcheckableType = /^(?:checkbox|radio)$/i,
-	// checked="checked" or checked
-	rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,
-	rscriptType = /^$|\/(?:java|ecma)script/i,
-	rscriptTypeMasked = /^true\/(.*)/,
-	rcleanScript = /^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,
-
-	// We have to close these tags to support XHTML (#13200)
-	wrapMap = {
-		option: [ 1, "<select multiple='multiple'>", "</select>" ],
-		legend: [ 1, "<fieldset>", "</fieldset>" ],
-		area: [ 1, "<map>", "</map>" ],
-		param: [ 1, "<object>", "</object>" ],
-		thead: [ 1, "<table>", "</table>" ],
-		tr: [ 2, "<table><tbody>", "</tbody></table>" ],
-		col: [ 2, "<table><tbody></tbody><colgroup>", "</colgroup></table>" ],
-		td: [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ],
-
-		// IE6-8 can't serialize link, script, style, or any html5 (NoScope) tags,
-		// unless wrapped in a div with non-breaking characters in front of it.
-		_default: jQuery.support.htmlSerialize ? [ 0, "", "" ] : [ 1, "X<div>", "</div>"  ]
-	},
-	safeFragment = createSafeFragment( document ),
-	fragmentDiv = safeFragment.appendChild( document.createElement("div") );
-
-wrapMap.optgroup = wrapMap.option;
-wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
-wrapMap.th = wrapMap.td;
-
-jQuery.fn.extend({
-	text: function( value ) {
-		return jQuery.access( this, function( value ) {
-			return value === undefined ?
-				jQuery.text( this ) :
-				this.empty().append( ( this[0] && this[0].ownerDocument || document ).createTextNode( value ) );
-		}, null, value, arguments.length );
-	},
-
-	wrapAll: function( html ) {
-		if ( jQuery.isFunction( html ) ) {
-			return this.each(function(i) {
-				jQuery(this).wrapAll( html.call(this, i) );
-			});
-		}
-
-		if ( this[0] ) {
-			// The elements to wrap the target around
-			var wrap = jQuery( html, this[0].ownerDocument ).eq(0).clone(true);
-
-			if ( this[0].parentNode ) {
-				wrap.insertBefore( this[0] );
-			}
-
-			wrap.map(function() {
-				var elem = this;
-
-				while ( elem.firstChild && elem.firstChild.nodeType === 1 ) {
-					elem = elem.firstChild;
-				}
-
-				return elem;
-			}).append( this );
-		}
-
-		return this;
-	},
-
-	wrapInner: function( html ) {
-		if ( jQuery.isFunction( html ) ) {
-			return this.each(function(i) {
-				jQuery(this).wrapInner( html.call(this, i) );
-			});
-		}
-
-		return this.each(function() {
-			var self = jQuery( this ),
-				contents = self.contents();
-
-			if ( contents.length ) {
-				contents.wrapAll( html );
-
-			} else {
-				self.append( html );
-			}
-		});
-	},
-
-	wrap: function( html ) {
-		var isFunction = jQuery.isFunction( html );
-
-		return this.each(function(i) {
-			jQuery( this ).wrapAll( isFunction ? html.call(this, i) : html );
-		});
-	},
-
-	unwrap: function() {
-		return this.parent().each(function() {
-			if ( !jQuery.nodeName( this, "body" ) ) {
-				jQuery( this ).replaceWith( this.childNodes );
-			}
-		}).end();
-	},
-
-	append: function() {
-		return this.domManip(arguments, true, function( elem ) {
-			if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
-				this.appendChild( elem );
-			}
-		});
-	},
-
-	prepend: function() {
-		return this.domManip(arguments, true, function( elem ) {
-			if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
-				this.insertBefore( elem, this.firstChild );
-			}
-		});
-	},
-
-	before: function() {
-		return this.domManip( arguments, false, function( elem ) {
-			if ( this.parentNode ) {
-				this.parentNode.insertBefore( elem, this );
-			}
-		});
-	},
-
-	after: function() {
-		return this.domManip( arguments, false, function( elem ) {
-			if ( this.parentNode ) {
-				this.parentNode.insertBefore( elem, this.nextSibling );
-			}
-		});
-	},
-
-	// keepData is for internal use only--do not document
-	remove: function( selector, keepData ) {
-		var elem,
-			i = 0;
-
-		for ( ; (elem = this[i]) != null; i++ ) {
-			if ( !selector || jQuery.filter( selector, [ elem ] ).length > 0 ) {
-				if ( !keepData && elem.nodeType === 1 ) {
-					jQuery.cleanData( getAll( elem ) );
-				}
-
-				if ( elem.parentNode ) {
-					if ( keepData && jQuery.contains( elem.ownerDocument, elem ) ) {
-						setGlobalEval( getAll( elem, "script" ) );
-					}
-					elem.parentNode.removeChild( elem );
-				}
-			}
-		}
-
-		return this;
-	},
-
-	empty: function() {
-		var elem,
-			i = 0;
-
-		for ( ; (elem = this[i]) != null; i++ ) {
-			// Remove element nodes and prevent memory leaks
-			if ( elem.nodeType === 1 ) {
-				jQuery.cleanData( getAll( elem, false ) );
-			}
-
-			// Remove any remaining nodes
-			while ( elem.firstChild ) {
-				elem.removeChild( elem.firstChild );
-			}
-
-			// If this is a select, ensure that it displays empty (#12336)
-			// Support: IE<9
-			if ( elem.options && jQuery.nodeName( elem, "select" ) ) {
-				elem.options.length = 0;
-			}
-		}
-
-		return this;
-	},
-
-	clone: function( dataAndEvents, deepDataAndEvents ) {
-		dataAndEvents = dataAndEvents == null ? false : dataAndEvents;
-		deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents;
-
-		return this.map( function () {
-			return jQuery.clone( this, dataAndEvents, deepDataAndEvents );
-		});
-	},
-
-	html: function( value ) {
-		return jQuery.access( this, function( value ) {
-			var elem = this[0] || {},
-				i = 0,
-				l = this.length;
-
-			if ( value === undefined ) {
-				return elem.nodeType === 1 ?
-					elem.innerHTML.replace( rinlinejQuery, "" ) :
-					undefined;
-			}
-
-			// See if we can take a shortcut and just use innerHTML
-			if ( typeof value === "string" && !rnoInnerhtml.test( value ) &&
-				( jQuery.support.htmlSerialize || !rnoshimcache.test( value )  ) &&
-				( jQuery.support.leadingWhitespace || !rleadingWhitespace.test( value ) ) &&
-				!wrapMap[ ( rtagName.exec( value ) || ["", ""] )[1].toLowerCase() ] ) {
-
-				value = value.replace( rxhtmlTag, "<$1></$2>" );
-
-				try {
-					for (; i < l; i++ ) {
-						// Remove element nodes and prevent memory leaks
-						elem = this[i] || {};
-						if ( elem.nodeType === 1 ) {
-							jQuery.cleanData( getAll( elem, false ) );
-							elem.innerHTML = value;
-						}
-					}
-
-					elem = 0;
-
-				// If using innerHTML throws an exception, use the fallback method
-				} catch(e) {}
-			}
-
-			if ( elem ) {
-				this.empty().append( value );
-			}
-		}, null, value, arguments.length );
-	},
-
-	replaceWith: function( value ) {
-		var isFunc = jQuery.isFunction( value );
-
-		// Make sure that the elements are removed from the DOM before they are inserted
-		// this can help fix replacing a parent with child elements
-		if ( !isFunc && typeof value !== "string" ) {
-			value = jQuery( value ).not( this ).detach();
-		}
-
-		return this.domManip( [ value ], true, function( elem ) {
-			var next = this.nextSibling,
-				parent = this.parentNode;
-
-			if ( parent ) {
-				jQuery( this ).remove();
-				parent.insertBefore( elem, next );
-			}
-		});
-	},
-
-	detach: function( selector ) {
-		return this.remove( selector, true );
-	},
-
-	domManip: function( args, table, callback ) {
-
-		// Flatten any nested arrays
-		args = core_concat.apply( [], args );
-
-		var first, node, hasScripts,
-			scripts, doc, fragment,
-			i = 0,
-			l = this.length,
-			set = this,
-			iNoClone = l - 1,
-			value = args[0],
-			isFunction = jQuery.isFunction( value );
-
-		// We can't cloneNode fragments that contain checked, in WebKit
-		if ( isFunction || !( l <= 1 || typeof value !== "string" || jQuery.support.checkClone || !rchecked.test( value ) ) ) {
-			return this.each(function( index ) {
-				var self = set.eq( index );
-				if ( isFunction ) {
-					args[0] = value.call( this, index, table ? self.html() : undefined );
-				}
-				self.domManip( args, table, callback );
-			});
-		}
-
-		if ( l ) {
-			fragment = jQuery.buildFragment( args, this[ 0 ].ownerDocument, false, this );
-			first = fragment.firstChild;
-
-			if ( fragment.childNodes.length === 1 ) {
-				fragment = first;
-			}
-
-			if ( first ) {
-				table = table && jQuery.nodeName( first, "tr" );
-				scripts = jQuery.map( getAll( fragment, "script" ), disableScript );
-				hasScripts = scripts.length;
-
-				// Use the original fragment for the last item instead of the first because it can end up
-				// being emptied incorrectly in certain situations (#8070).
-				for ( ; i < l; i++ ) {
-					node = fragment;
-
-					if ( i !== iNoClone ) {
-						node = jQuery.clone( node, true, true );
-
-						// Keep references to cloned scripts for later restoration
-						if ( hasScripts ) {
-							jQuery.merge( scripts, getAll( node, "script" ) );
-						}
-					}
-
-					callback.call(
-						table && jQuery.nodeName( this[i], "table" ) ?
-							findOrAppend( this[i], "tbody" ) :
-							this[i],
-						node,
-						i
-					);
-				}
-
-				if ( hasScripts ) {
-					doc = scripts[ scripts.length - 1 ].ownerDocument;
-
-					// Reenable scripts
-					jQuery.map( scripts, restoreScript );
-
-					// Evaluate executable scripts on first document insertion
-					for ( i = 0; i < hasScripts; i++ ) {
-						node = scripts[ i ];
-						if ( rscriptType.test( node.type || "" ) &&
-							!jQuery._data( node, "globalEval" ) && jQuery.contains( doc, node ) ) {
-
-							if ( node.src ) {
-								// Hope ajax is available...
-								jQuery.ajax({
-									url: node.src,
-									type: "GET",
-									dataType: "script",
-									async: false,
-									global: false,
-									"throws": true
-								});
-							} else {
-								jQuery.globalEval( ( node.text || node.textContent || node.innerHTML || "" ).replace( rcleanScript, "" ) );
-							}
-						}
-					}
-				}
-
-				// Fix #11809: Avoid leaking memory
-				fragment = first = null;
-			}
-		}
-
-		return this;
-	}
-});
-
-function findOrAppend( elem, tag ) {
-	return elem.getElementsByTagName( tag )[0] || elem.appendChild( elem.ownerDocument.createElement( tag ) );
-}
-
-// Replace/restore the type attribute of script elements for safe DOM manipulation
-function disableScript( elem ) {
-	var attr = elem.getAttributeNode("type");
-	elem.type = ( attr && attr.specified ) + "/" + elem.type;
-	return elem;
-}
-function restoreScript( elem ) {
-	var match = rscriptTypeMasked.exec( elem.type );
-	if ( match ) {
-		elem.type = match[1];
-	} else {
-		elem.removeAttribute("type");
-	}
-	return elem;
-}
-
-// Mark scripts as having already been evaluated
-function setGlobalEval( elems, refElements ) {
-	var elem,
-		i = 0;
-	for ( ; (elem = elems[i]) != null; i++ ) {
-		jQuery._data( elem, "globalEval", !refElements || jQuery._data( refElements[i], "globalEval" ) );
-	}
-}
-
-function cloneCopyEvent( src, dest ) {
-
-	if ( dest.nodeType !== 1 || !jQuery.hasData( src ) ) {
-		return;
-	}
-
-	var type, i, l,
-		oldData = jQuery._data( src ),
-		curData = jQuery._data( dest, oldData ),
-		events = oldData.events;
-
-	if ( events ) {
-		delete curData.handle;
-		curData.events = {};
-
-		for ( type in events ) {
-			for ( i = 0, l = events[ type ].length; i < l; i++ ) {
-				jQuery.event.add( dest, type, events[ type ][ i ] );
-			}
-		}
-	}
-
-	// make the cloned public data object a copy from the original
-	if ( curData.data ) {
-		curData.data = jQuery.extend( {}, curData.data );
-	}
-}
-
-function fixCloneNodeIssues( src, dest ) {
-	var nodeName, e, data;
-
-	// We do not need to do anything for non-Elements
-	if ( dest.nodeType !== 1 ) {
-		return;
-	}
-
-	nodeName = dest.nodeName.toLowerCase();
-
-	// IE6-8 copies events bound via attachEvent when using cloneNode.
-	if ( !jQuery.support.noCloneEvent && dest[ jQuery.expando ] ) {
-		data = jQuery._data( dest );
-
-		for ( e in data.events ) {
-			jQuery.removeEvent( dest, e, data.handle );
-		}
-
-		// Event data gets referenced instead of copied if the expando gets copied too
-		dest.removeAttribute( jQuery.expando );
-	}
-
-	// IE blanks contents when cloning scripts, and tries to evaluate newly-set text
-	if ( nodeName === "script" && dest.text !== src.text ) {
-		disableScript( dest ).text = src.text;
-		restoreScript( dest );
-
-	// IE6-10 improperly clones children of object elements using classid.
-	// IE10 throws NoModificationAllowedError if parent is null, #12132.
-	} else if ( nodeName === "object" ) {
-		if ( dest.parentNode ) {
-			dest.outerHTML = src.outerHTML;
-		}
-
-		// This path appears unavoidable for IE9. When cloning an object
-		// element in IE9, the outerHTML strategy above is not sufficient.
-		// If the src has innerHTML and the destination does not,
-		// copy the src.innerHTML into the dest.innerHTML. #10324
-		if ( jQuery.support.html5Clone && ( src.innerHTML && !jQuery.trim(dest.innerHTML) ) ) {
-			dest.innerHTML = src.innerHTML;
-		}
-
-	} else if ( nodeName === "input" && manipulation_rcheckableType.test( src.type ) ) {
-		// IE6-8 fails to persist the checked state of a cloned checkbox
-		// or radio button. Worse, IE6-7 fail to give the cloned element
-		// a checked appearance if the defaultChecked value isn't also set
-
-		dest.defaultChecked = dest.checked = src.checked;
-
-		// IE6-7 get confused and end up setting the value of a cloned
-		// checkbox/radio button to an empty string instead of "on"
-		if ( dest.value !== src.value ) {
-			dest.value = src.value;
-		}
-
-	// IE6-8 fails to return the selected option to the default selected
-	// state when cloning options
-	} else if ( nodeName === "option" ) {
-		dest.defaultSelected = dest.selected = src.defaultSelected;
-
-	// IE6-8 fails to set the defaultValue to the correct value when
-	// cloning other types of input fields
-	} else if ( nodeName === "input" || nodeName === "textarea" ) {
-		dest.defaultValue = src.defaultValue;
-	}
-}
-
-jQuery.each({
-	appendTo: "append",
-	prependTo: "prepend",
-	insertBefore: "before",
-	insertAfter: "after",
-	replaceAll: "replaceWith"
-}, function( name, original ) {
-	jQuery.fn[ name ] = function( selector ) {
-		var elems,
-			i = 0,
-			ret = [],
-			insert = jQuery( selector ),
-			last = insert.length - 1;
-
-		for ( ; i <= last; i++ ) {
-			elems = i === last ? this : this.clone(true);
-			jQuery( insert[i] )[ original ]( elems );
-
-			// Modern browsers can apply jQuery collections as arrays, but oldIE needs a .get()
-			core_push.apply( ret, elems.get() );
-		}
-
-		return this.pushStack( ret );
-	};
-});
-
-function getAll( context, tag ) {
-	var elems, elem,
-		i = 0,
-		found = typeof context.getElementsByTagName !== core_strundefined ? context.getElementsByTagName( tag || "*" ) :
-			typeof context.querySelectorAll !== core_strundefined ? context.querySelectorAll( tag || "*" ) :
-			undefined;
-
-	if ( !found ) {
-		for ( found = [], elems = context.childNodes || context; (elem = elems[i]) != null; i++ ) {
-			if ( !tag || jQuery.nodeName( elem, tag ) ) {
-				found.push( elem );
-			} else {
-				jQuery.merge( found, getAll( elem, tag ) );
-			}
-		}
-	}
-
-	return tag === undefined || tag && jQuery.nodeName( context, tag ) ?
-		jQuery.merge( [ context ], found ) :
-		found;
-}
-
-// Used in buildFragment, fixes the defaultChecked property
-function fixDefaultChecked( elem ) {
-	if ( manipulation_rcheckableType.test( elem.type ) ) {
-		elem.defaultChecked = elem.checked;
-	}
-}
-
-jQuery.extend({
-	clone: function( elem, dataAndEvents, deepDataAndEvents ) {
-		var destElements, node, clone, i, srcElements,
-			inPage = jQuery.contains( elem.ownerDocument, elem );
-
-		if ( jQuery.support.html5Clone || jQuery.isXMLDoc(elem) || !rnoshimcache.test( "<" + elem.nodeName + ">" ) ) {
-			clone = elem.cloneNode( true );
-
-		// IE<=8 does not properly clone detached, unknown element nodes
-		} else {
-			fragmentDiv.innerHTML = elem.outerHTML;
-			fragmentDiv.removeChild( clone = fragmentDiv.firstChild );
-		}
-
-		if ( (!jQuery.support.noCloneEvent || !jQuery.support.noCloneChecked) &&
-				(elem.nodeType === 1 || elem.nodeType === 11) && !jQuery.isXMLDoc(elem) ) {
-
-			// We eschew Sizzle here for performance reasons: http://jsperf.com/getall-vs-sizzle/2
-			destElements = getAll( clone );
-			srcElements = getAll( elem );
-
-			// Fix all IE cloning issues
-			for ( i = 0; (node = srcElements[i]) != null; ++i ) {
-				// Ensure that the destination node is not null; Fixes #9587
-				if ( destElements[i] ) {
-					fixCloneNodeIssues( node, destElements[i] );
-				}
-			}
-		}
-
-		// Copy the events from the original to the clone
-		if ( dataAndEvents ) {
-			if ( deepDataAndEvents ) {
-				srcElements = srcElements || getAll( elem );
-				destElements = destElements || getAll( clone );
-
-				for ( i = 0; (node = srcElements[i]) != null; i++ ) {
-					cloneCopyEvent( node, destElements[i] );
-				}
-			} else {
-				cloneCopyEvent( elem, clone );
-			}
-		}
-
-		// Preserve script evaluation history
-		destElements = getAll( clone, "script" );
-		if ( destElements.length > 0 ) {
-			setGlobalEval( destElements, !inPage && getAll( elem, "script" ) );
-		}
-
-		destElements = srcElements = node = null;
-
-		// Return the cloned set
-		return clone;
-	},
-
-	buildFragment: function( elems, context, scripts, selection ) {
-		var j, elem, contains,
-			tmp, tag, tbody, wrap,
-			l = elems.length,
-
-			// Ensure a safe fragment
-			safe = createSafeFragment( context ),
-
-			nodes = [],
-			i = 0;
-
-		for ( ; i < l; i++ ) {
-			elem = elems[ i ];
-
-			if ( elem || elem === 0 ) {
-
-				// Add nodes directly
-				if ( jQuery.type( elem ) === "object" ) {
-					jQuery.merge( nodes, elem.nodeType ? [ elem ] : elem );
-
-				// Convert non-html into a text node
-				} else if ( !rhtml.test( elem ) ) {
-					nodes.push( context.createTextNode( elem ) );
-
-				// Convert html into DOM nodes
-				} else {
-					tmp = tmp || safe.appendChild( context.createElement("div") );
-
-					// Deserialize a standard representation
-					tag = ( rtagName.exec( elem ) || ["", ""] )[1].toLowerCase();
-					wrap = wrapMap[ tag ] || wrapMap._default;
-
-					tmp.innerHTML = wrap[1] + elem.replace( rxhtmlTag, "<$1></$2>" ) + wrap[2];
-
-					// Descend through wrappers to the right content
-					j = wrap[0];
-					while ( j-- ) {
-						tmp = tmp.lastChild;
-					}
-
-					// Manually add leading whitespace removed by IE
-					if ( !jQuery.support.leadingWhitespace && rleadingWhitespace.test( elem ) ) {
-						nodes.push( context.createTextNode( rleadingWhitespace.exec( elem )[0] ) );
-					}
-
-					// Remove IE's autoinserted <tbody> from table fragments
-					if ( !jQuery.support.tbody ) {
-
-						// String was a <table>, *may* have spurious <tbody>
-						elem = tag === "table" && !rtbody.test( elem ) ?
-							tmp.firstChild :
-
-							// String was a bare <thead> or <tfoot>
-							wrap[1] === "<table>" && !rtbody.test( elem ) ?
-								tmp :
-								0;
-
-						j = elem && elem.childNodes.length;
-						while ( j-- ) {
-							if ( jQuery.nodeName( (tbody = elem.childNodes[j]), "tbody" ) && !tbody.childNodes.length ) {
-								elem.removeChild( tbody );
-							}
-						}
-					}
-
-					jQuery.merge( nodes, tmp.childNodes );
-
-					// Fix #12392 for WebKit and IE > 9
-					tmp.textContent = "";
-
-					// Fix #12392 for oldIE
-					while ( tmp.firstChild ) {
-						tmp.removeChild( tmp.firstChild );
-					}
-
-					// Remember the top-level container for proper cleanup
-					tmp = safe.lastChild;
-				}
-			}
-		}
-
-		// Fix #11356: Clear elements from fragment
-		if ( tmp ) {
-			safe.removeChild( tmp );
-		}
-
-		// Reset defaultChecked for any radios and checkboxes
-		// about to be appended to the DOM in IE 6/7 (#8060)
-		if ( !jQuery.support.appendChecked ) {
-			jQuery.grep( getAll( nodes, "input" ), fixDefaultChecked );
-		}
-
-		i = 0;
-		while ( (elem = nodes[ i++ ]) ) {
-
-			// #4087 - If origin and destination elements are the same, and this is
-			// that element, do not do anything
-			if ( selection && jQuery.inArray( elem, selection ) !== -1 ) {
-				continue;
-			}
-
-			contains = jQuery.contains( elem.ownerDocument, elem );
-
-			// Append to fragment
-			tmp = getAll( safe.appendChild( elem ), "script" );
-
-			// Preserve script evaluation history
-			if ( contains ) {
-				setGlobalEval( tmp );
-			}
-
-			// Capture executables
-			if ( scripts ) {
-				j = 0;
-				while ( (elem = tmp[ j++ ]) ) {
-					if ( rscriptType.test( elem.type || "" ) ) {
-						scripts.push( elem );
-					}
-				}
-			}
-		}
-
-		tmp = null;
-
-		return safe;
-	},
-
-	cleanData: function( elems, /* internal */ acceptData ) {
-		var elem, type, id, data,
-			i = 0,
-			internalKey = jQuery.expando,
-			cache = jQuery.cache,
-			deleteExpando = jQuery.support.deleteExpando,
-			special = jQuery.event.special;
-
-		for ( ; (elem = elems[i]) != null; i++ ) {
-
-			if ( acceptData || jQuery.acceptData( elem ) ) {
-
-				id = elem[ internalKey ];
-				data = id && cache[ id ];
-
-				if ( data ) {
-					if ( data.events ) {
-						for ( type in data.events ) {
-							if ( special[ type ] ) {
-								jQuery.event.remove( elem, type );
-
-							// This is a shortcut to avoid jQuery.event.remove's overhead
-							} else {
-								jQuery.removeEvent( elem, type, data.handle );
-							}
-						}
-					}
-
-					// Remove cache only if it was not already removed by jQuery.event.remove
-					if ( cache[ id ] ) {
-
-						delete cache[ id ];
-
-						// IE does not allow us to delete expando properties from nodes,
-						// nor does it have a removeAttribute function on Document nodes;
-						// we must handle all of these cases
-						if ( deleteExpando ) {
-							delete elem[ internalKey ];
-
-						} else if ( typeof elem.removeAttribute !== core_strundefined ) {
-							elem.removeAttribute( internalKey );
-
-						} else {
-							elem[ internalKey ] = null;
-						}
-
-						core_deletedIds.push( id );
-					}
-				}
-			}
-		}
-	}
-});
-var iframe, getStyles, curCSS,
-	ralpha = /alpha\([^)]*\)/i,
-	ropacity = /opacity\s*=\s*([^)]*)/,
-	rposition = /^(top|right|bottom|left)$/,
-	// swappable if display is none or starts with table except "table", "table-cell", or "table-caption"
-	// see here for display values: https://developer.mozilla.org/en-US/docs/CSS/display
-	rdisplayswap = /^(none|table(?!-c[ea]).+)/,
-	rmargin = /^margin/,
-	rnumsplit = new RegExp( "^(" + core_pnum + ")(.*)$", "i" ),
-	rnumnonpx = new RegExp( "^(" + core_pnum + ")(?!px)[a-z%]+$", "i" ),
-	rrelNum = new RegExp( "^([+-])=(" + core_pnum + ")", "i" ),
-	elemdisplay = { BODY: "block" },
-
-	cssShow = { position: "absolute", visibility: "hidden", display: "block" },
-	cssNormalTransform = {
-		letterSpacing: 0,
-		fontWeight: 400
-	},
-
-	cssExpand = [ "Top", "Right", "Bottom", "Left" ],
-	cssPrefixes = [ "Webkit", "O", "Moz", "ms" ];
-
-// return a css property mapped to a potentially vendor prefixed property
-function vendorPropName( style, name ) {
-
-	// shortcut for names that are not vendor prefixed
-	if ( name in style ) {
-		return name;
-	}
-
-	// check for vendor prefixed names
-	var capName = name.charAt(0).toUpperCase() + name.slice(1),
-		origName = name,
-		i = cssPrefixes.length;
-
-	while ( i-- ) {
-		name = cssPrefixes[ i ] + capName;
-		if ( name in style ) {
-			return name;
-		}
-	}
-
-	return origName;
-}
-
-function isHidden( elem, el ) {
-	// isHidden might be called from jQuery#filter function;
-	// in that case, element will be second argument
-	elem = el || elem;
-	return jQuery.css( elem, "display" ) === "none" || !jQuery.contains( elem.ownerDocument, elem );
-}
-
-function showHide( elements, show ) {
-	var display, elem, hidden,
-		values = [],
-		index = 0,
-		length = elements.length;
-
-	for ( ; index < length; index++ ) {
-		elem = elements[ index ];
-		if ( !elem.style ) {
-			continue;
-		}
-
-		values[ index ] = jQuery._data( elem, "olddisplay" );
-		display = elem.style.display;
-		if ( show ) {
-			// Reset the inline display of this element to learn if it is
-			// being hidden by cascaded rules or not
-			if ( !values[ index ] && display === "none" ) {
-				elem.style.display = "";
-			}
-
-			// Set elements which have been overridden with display: none
-			// in a stylesheet to whatever the default browser style is
-			// for such an element
-			if ( elem.style.display === "" && isHidden( elem ) ) {
-				values[ index ] = jQuery._data( elem, "olddisplay", css_defaultDisplay(elem.nodeName) );
-			}
-		} else {
-
-			if ( !values[ index ] ) {
-				hidden = isHidden( elem );
-
-				if ( display && display !== "none" || !hidden ) {
-					jQuery._data( elem, "olddisplay", hidden ? display : jQuery.css( elem, "display" ) );
-				}
-			}
-		}
-	}
-
-	// Set the display of most of the elements in a second loop
-	// to avoid the constant reflow
-	for ( index = 0; index < length; index++ ) {
-		elem = elements[ index ];
-		if ( !elem.style ) {
-			continue;
-		}
-		if ( !show || elem.style.display === "none" || elem.style.display === "" ) {
-			elem.style.display = show ? values[ index ] || "" : "none";
-		}
-	}
-
-	return elements;
-}
-
-jQuery.fn.extend({
-	css: function( name, value ) {
-		return jQuery.access( this, function( elem, name, value ) {
-			var len, styles,
-				map = {},
-				i = 0;
-
-			if ( jQuery.isArray( name ) ) {
-				styles = getStyles( elem );
-				len = name.length;
-
-				for ( ; i < len; i++ ) {
-					map[ name[ i ] ] = jQuery.css( elem, name[ i ], false, styles );
-				}
-
-				return map;
-			}
-
-			return value !== undefined ?
-				jQuery.style( elem, name, value ) :
-				jQuery.css( elem, name );
-		}, name, value, arguments.length > 1 );
-	},
-	show: function() {
-		return showHide( this, true );
-	},
-	hide: function() {
-		return showHide( this );
-	},
-	toggle: function( state ) {
-		var bool = typeof state === "boolean";
-
-		return this.each(function() {
-			if ( bool ? state : isHidden( this ) ) {
-				jQuery( this ).show();
-			} else {
-				jQuery( this ).hide();
-			}
-		});
-	}
-});
-
-jQuery.extend({
-	// Add in style property hooks for overriding the default
-	// behavior of getting and setting a style property
-	cssHooks: {
-		opacity: {
-			get: function( elem, computed ) {
-				if ( computed ) {
-					// We should always get a number back from opacity
-					var ret = curCSS( elem, "opacity" );
-					return ret === "" ? "1" : ret;
-				}
-			}
-		}
-	},
-
-	// Exclude the following css properties to add px
-	cssNumber: {
-		"columnCount": true,
-		"fillOpacity": true,
-		"fontWeight": true,
-		"lineHeight": true,
-		"opacity": true,
-		"orphans": true,
-		"widows": true,
-		"zIndex": true,
-		"zoom": true
-	},
-
-	// Add in properties whose names you wish to fix before
-	// setting or getting the value
-	cssProps: {
-		// normalize float css property
-		"float": jQuery.support.cssFloat ? "cssFloat" : "styleFloat"
-	},
-
-	// Get and set the style property on a DOM Node
-	style: function( elem, name, value, extra ) {
-		// Don't set styles on text and comment nodes
-		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || !elem.style ) {
-			return;
-		}
-
-		// Make sure that we're working with the right name
-		var ret, type, hooks,
-			origName = jQuery.camelCase( name ),
-			style = elem.style;
-
-		name = jQuery.cssProps[ origName ] || ( jQuery.cssProps[ origName ] = vendorPropName( style, origName ) );
-
-		// gets hook for the prefixed version
-		// followed by the unprefixed version
-		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
-
-		// Check if we're setting a value
-		if ( value !== undefined ) {
-			type = typeof value;
-
-			// convert relative number strings (+= or -=) to relative numbers. #7345
-			if ( type === "string" && (ret = rrelNum.exec( value )) ) {
-				value = ( ret[1] + 1 ) * ret[2] + parseFloat( jQuery.css( elem, name ) );
-				// Fixes bug #9237
-				type = "number";
-			}
-
-			// Make sure that NaN and null values aren't set. See: #7116
-			if ( value == null || type === "number" && isNaN( value ) ) {
-				return;
-			}
-
-			// If a number was passed in, add 'px' to the (except for certain CSS properties)
-			if ( type === "number" && !jQuery.cssNumber[ origName ] ) {
-				value += "px";
-			}
-
-			// Fixes #8908, it can be done more correctly by specifing setters in cssHooks,
-			// but it would mean to define eight (for every problematic property) identical functions
-			if ( !jQuery.support.clearCloneStyle && value === "" && name.indexOf("background") === 0 ) {
-				style[ name ] = "inherit";
-			}
-
-			// If a hook was provided, use that value, otherwise just set the specified value
-			if ( !hooks || !("set" in hooks) || (value = hooks.set( elem, value, extra )) !== undefined ) {
-
-				// Wrapped to prevent IE from throwing errors when 'invalid' values are provided
-				// Fixes bug #5509
-				try {
-					style[ name ] = value;
-				} catch(e) {}
-			}
-
-		} else {
-			// If a hook was provided get the non-computed value from there
-			if ( hooks && "get" in hooks && (ret = hooks.get( elem, false, extra )) !== undefined ) {
-				return ret;
-			}
-
-			// Otherwise just get the value from the style object
-			return style[ name ];
-		}
-	},
-
-	css: function( elem, name, extra, styles ) {
-		var num, val, hooks,
-			origName = jQuery.camelCase( name );
-
-		// Make sure that we're working with the right name
-		name = jQuery.cssProps[ origName ] || ( jQuery.cssProps[ origName ] = vendorPropName( elem.style, origName ) );
-
-		// gets hook for the prefixed version
-		// followed by the unprefixed version
-		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
-
-		// If a hook was provided get the computed value from there
-		if ( hooks && "get" in hooks ) {
-			val = hooks.get( elem, true, extra );
-		}
-
-		// Otherwise, if a way to get the computed value exists, use that
-		if ( val === undefined ) {
-			val = curCSS( elem, name, styles );
-		}
-
-		//convert "normal" to computed value
-		if ( val === "normal" && name in cssNormalTransform ) {
-			val = cssNormalTransform[ name ];
-		}
-
-		// Return, converting to number if forced or a qualifier was provided and val looks numeric
-		if ( extra === "" || extra ) {
-			num = parseFloat( val );
-			return extra === true || jQuery.isNumeric( num ) ? num || 0 : val;
-		}
-		return val;
-	},
-
-	// A method for quickly swapping in/out CSS properties to get correct calculations
-	swap: function( elem, options, callback, args ) {
-		var ret, name,
-			old = {};
-
-		// Remember the old values, and insert the new ones
-		for ( name in options ) {
-			old[ name ] = elem.style[ name ];
-			elem.style[ name ] = options[ name ];
-		}
-
-		ret = callback.apply( elem, args || [] );
-
-		// Revert the old values
-		for ( name in options ) {
-			elem.style[ name ] = old[ name ];
-		}
-
-		return ret;
-	}
-});
-
-// NOTE: we've included the "window" in window.getComputedStyle
-// because jsdom on node.js will break without it.
-if ( window.getComputedStyle ) {
-	getStyles = function( elem ) {
-		return window.getComputedStyle( elem, null );
-	};
-
-	curCSS = function( elem, name, _computed ) {
-		var width, minWidth, maxWidth,
-			computed = _computed || getStyles( elem ),
-
-			// getPropertyValue is only needed for .css('filter') in IE9, see #12537
-			ret = computed ? computed.getPropertyValue( name ) || computed[ name ] : undefined,
-			style = elem.style;
-
-		if ( computed ) {
-
-			if ( ret === "" && !jQuery.contains( elem.ownerDocument, elem ) ) {
-				ret = jQuery.style( elem, name );
-			}
-
-			// A tribute to the "awesome hack by Dean Edwards"
-			// Chrome < 17 and Safari 5.0 uses "computed value" instead of "used value" for margin-right
-			// Safari 5.1.7 (at least) returns percentage for a larger set of values, but width seems to be reliably pixels
-			// this is against the CSSOM draft spec: http://dev.w3.org/csswg/cssom/#resolved-values
-			if ( rnumnonpx.test( ret ) && rmargin.test( name ) ) {
-
-				// Remember the original values
-				width = style.width;
-				minWidth = style.minWidth;
-				maxWidth = style.maxWidth;
-
-				// Put in the new values to get a computed value out
-				style.minWidth = style.maxWidth = style.width = ret;
-				ret = computed.width;
-
-				// Revert the changed values
-				style.width = width;
-				style.minWidth = minWidth;
-				style.maxWidth = maxWidth;
-			}
-		}
-
-		return ret;
-	};
-} else if ( document.documentElement.currentStyle ) {
-	getStyles = function( elem ) {
-		return elem.currentStyle;
-	};
-
-	curCSS = function( elem, name, _computed ) {
-		var left, rs, rsLeft,
-			computed = _computed || getStyles( elem ),
-			ret = computed ? computed[ name ] : undefined,
-			style = elem.style;
-
-		// Avoid setting ret to empty string here
-		// so we don't default to auto
-		if ( ret == null && style && style[ name ] ) {
-			ret = style[ name ];
-		}
-
-		// From the awesome hack by Dean Edwards
-		// http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
-
-		// If we're not dealing with a regular pixel number
-		// but a number that has a weird ending, we need to convert it to pixels
-		// but not position css attributes, as those are proportional to the parent element instead
-		// and we can't measure the parent instead because it might trigger a "stacking dolls" problem
-		if ( rnumnonpx.test( ret ) && !rposition.test( name ) ) {
-
-			// Remember the original values
-			left = style.left;
-			rs = elem.runtimeStyle;
-			rsLeft = rs && rs.left;
-
-			// Put in the new values to get a computed value out
-			if ( rsLeft ) {
-				rs.left = elem.currentStyle.left;
-			}
-			style.left = name === "fontSize" ? "1em" : ret;
-			ret = style.pixelLeft + "px";
-
-			// Revert the changed values
-			style.left = left;
-			if ( rsLeft ) {
-				rs.left = rsLeft;
-			}
-		}
-
-		return ret === "" ? "auto" : ret;
-	};
-}
-
-function setPositiveNumber( elem, value, subtract ) {
-	var matches = rnumsplit.exec( value );
-	return matches ?
-		// Guard against undefined "subtract", e.g., when used as in cssHooks
-		Math.max( 0, matches[ 1 ] - ( subtract || 0 ) ) + ( matches[ 2 ] || "px" ) :
-		value;
-}
-
-function augmentWidthOrHeight( elem, name, extra, isBorderBox, styles ) {
-	var i = extra === ( isBorderBox ? "border" : "content" ) ?
-		// If we already have the right measurement, avoid augmentation
-		4 :
-		// Otherwise initialize for horizontal or vertical properties
-		name === "width" ? 1 : 0,
-
-		val = 0;
-
-	for ( ; i < 4; i += 2 ) {
-		// both box models exclude margin, so add it if we want it
-		if ( extra === "margin" ) {
-			val += jQuery.css( elem, extra + cssExpand[ i ], true, styles );
-		}
-
-		if ( isBorderBox ) {
-			// border-box includes padding, so remove it if we want content
-			if ( extra === "content" ) {
-				val -= jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
-			}
-
-			// at this point, extra isn't border nor margin, so remove border
-			if ( extra !== "margin" ) {
-				val -= jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
-			}
-		} else {
-			// at this point, extra isn't content, so add padding
-			val += jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
-
-			// at this point, extra isn't content nor padding, so add border
-			if ( extra !== "padding" ) {
-				val += jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
-			}
-		}
-	}
-
-	return val;
-}
-
-function getWidthOrHeight( elem, name, extra ) {
-
-	// Start with offset property, which is equivalent to the border-box value
-	var valueIsBorderBox = true,
-		val = name === "width" ? elem.offsetWidth : elem.offsetHeight,
-		styles = getStyles( elem ),
-		isBorderBox = jQuery.support.boxSizing && jQuery.css( elem, "boxSizing", false, styles ) === "border-box";
-
-	// some non-html elements return undefined for offsetWidth, so check for null/undefined
-	// svg - https://bugzilla.mozilla.org/show_bug.cgi?id=649285
-	// MathML - https://bugzilla.mozilla.org/show_bug.cgi?id=491668
-	if ( val <= 0 || val == null ) {
-		// Fall back to computed then uncomputed css if necessary
-		val = curCSS( elem, name, styles );
-		if ( val < 0 || val == null ) {
-			val = elem.style[ name ];
-		}
-
-		// Computed unit is not pixels. Stop here and return.
-		if ( rnumnonpx.test(val) ) {
-			return val;
-		}
-
-		// we need the check for style in case a browser which returns unreliable values
-		// for getComputedStyle silently falls back to the reliable elem.style
-		valueIsBorderBox = isBorderBox && ( jQuery.support.boxSizingReliable || val === elem.style[ name ] );
-
-		// Normalize "", auto, and prepare for extra
-		val = parseFloat( val ) || 0;
-	}
-
-	// use the active box-sizing model to add/subtract irrelevant styles
-	return ( val +
-		augmentWidthOrHeight(
-			elem,
-			name,
-			extra || ( isBorderBox ? "border" : "content" ),
-			valueIsBorderBox,
-			styles
-		)
-	) + "px";
-}
-
-// Try to determine the default display value of an element
-function css_defaultDisplay( nodeName ) {
-	var doc = document,
-		display = elemdisplay[ nodeName ];
-
-	if ( !display ) {
-		display = actualDisplay( nodeName, doc );
-
-		// If the simple way fails, read from inside an iframe
-		if ( display === "none" || !display ) {
-			// Use the already-created iframe if possible
-			iframe = ( iframe ||
-				jQuery("<iframe frameborder='0' width='0' height='0'/>")
-				.css( "cssText", "display:block !important" )
-			).appendTo( doc.documentElement );
-
-			// Always write a new HTML skeleton so Webkit and Firefox don't choke on reuse
-			doc = ( iframe[0].contentWindow || iframe[0].contentDocument ).document;
-			doc.write("<!doctype html><html><body>");
-			doc.close();
-
-			display = actualDisplay( nodeName, doc );
-			iframe.detach();
-		}
-
-		// Store the correct default display
-		elemdisplay[ nodeName ] = display;
-	}
-
-	return display;
-}
-
-// Called ONLY from within css_defaultDisplay
-function actualDisplay( name, doc ) {
-	var elem = jQuery( doc.createElement( name ) ).appendTo( doc.body ),
-		display = jQuery.css( elem[0], "display" );
-	elem.remove();
-	return display;
-}
-
-jQuery.each([ "height", "width" ], function( i, name ) {
-	jQuery.cssHooks[ name ] = {
-		get: function( elem, computed, extra ) {
-			if ( computed ) {
-				// certain elements can have dimension info if we invisibly show them
-				// however, it must have a current display style that would benefit from this
-				return elem.offsetWidth === 0 && rdisplayswap.test( jQuery.css( elem, "display" ) ) ?
-					jQuery.swap( elem, cssShow, function() {
-						return getWidthOrHeight( elem, name, extra );
-					}) :
-					getWidthOrHeight( elem, name, extra );
-			}
-		},
-
-		set: function( elem, value, extra ) {
-			var styles = extra && getStyles( elem );
-			return setPositiveNumber( elem, value, extra ?
-				augmentWidthOrHeight(
-					elem,
-					name,
-					extra,
-					jQuery.support.boxSizing && jQuery.css( elem, "boxSizing", false, styles ) === "border-box",
-					styles
-				) : 0
-			);
-		}
-	};
-});
-
-if ( !jQuery.support.opacity ) {
-	jQuery.cssHooks.opacity = {
-		get: function( elem, computed ) {
-			// IE uses filters for opacity
-			return ropacity.test( (computed && elem.currentStyle ? elem.currentStyle.filter : elem.style.filter) || "" ) ?
-				( 0.01 * parseFloat( RegExp.$1 ) ) + "" :
-				computed ? "1" : "";
-		},
-
-		set: function( elem, value ) {
-			var style = elem.style,
-				currentStyle = elem.currentStyle,
-				opacity = jQuery.isNumeric( value ) ? "alpha(opacity=" + value * 100 + ")" : "",
-				filter = currentStyle && currentStyle.filter || style.filter || "";
-
-			// IE has trouble with opacity if it does not have layout
-			// Force it by setting the zoom level
-			style.zoom = 1;
-
-			// if setting opacity to 1, and no other filters exist - attempt to remove filter attribute #6652
-			// if value === "", then remove inline opacity #12685
-			if ( ( value >= 1 || value === "" ) &&
-					jQuery.trim( filter.replace( ralpha, "" ) ) === "" &&
-					style.removeAttribute ) {
-
-				// Setting style.filter to null, "" & " " still leave "filter:" in the cssText
-				// if "filter:" is present at all, clearType is disabled, we want to avoid this
-				// style.removeAttribute is IE Only, but so apparently is this code path...
-				style.removeAttribute( "filter" );
-
-				// if there is no filter style applied in a css rule or unset inline opacity, we are done
-				if ( value === "" || currentStyle && !currentStyle.filter ) {
-					return;
-				}
-			}
-
-			// otherwise, set new filter values
-			style.filter = ralpha.test( filter ) ?
-				filter.replace( ralpha, opacity ) :
-				filter + " " + opacity;
-		}
-	};
-}
-
-// These hooks cannot be added until DOM ready because the support test
-// for it is not run until after DOM ready
-jQuery(function() {
-	if ( !jQuery.support.reliableMarginRight ) {
-		jQuery.cssHooks.marginRight = {
-			get: function( elem, computed ) {
-				if ( computed ) {
-					// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
-					// Work around by temporarily setting element display to inline-block
-					return jQuery.swap( elem, { "display": "inline-block" },
-						curCSS, [ elem, "marginRight" ] );
-				}
-			}
-		};
-	}
-
-	// Webkit bug: https://bugs.webkit.org/show_bug.cgi?id=29084
-	// getComputedStyle returns percent when specified for top/left/bottom/right
-	// rather than make the css module depend on the offset module, we just check for it here
-	if ( !jQuery.support.pixelPosition && jQuery.fn.position ) {
-		jQuery.each( [ "top", "left" ], function( i, prop ) {
-			jQuery.cssHooks[ prop ] = {
-				get: function( elem, computed ) {
-					if ( computed ) {
-						computed = curCSS( elem, prop );
-						// if curCSS returns percentage, fallback to offset
-						return rnumnonpx.test( computed ) ?
-							jQuery( elem ).position()[ prop ] + "px" :
-							computed;
-					}
-				}
-			};
-		});
-	}
-
-});
-
-if ( jQuery.expr && jQuery.expr.filters ) {
-	jQuery.expr.filters.hidden = function( elem ) {
-		// Support: Opera <= 12.12
-		// Opera reports offsetWidths and offsetHeights less than zero on some elements
-		return elem.offsetWidth <= 0 && elem.offsetHeight <= 0 ||
-			(!jQuery.support.reliableHiddenOffsets && ((elem.style && elem.style.display) || jQuery.css( elem, "display" )) === "none");
-	};
-
-	jQuery.expr.filters.visible = function( elem ) {
-		return !jQuery.expr.filters.hidden( elem );
-	};
-}
-
-// These hooks are used by animate to expand properties
-jQuery.each({
-	margin: "",
-	padding: "",
-	border: "Width"
-}, function( prefix, suffix ) {
-	jQuery.cssHooks[ prefix + suffix ] = {
-		expand: function( value ) {
-			var i = 0,
-				expanded = {},
-
-				// assumes a single number if not a string
-				parts = typeof value === "string" ? value.split(" ") : [ value ];
-
-			for ( ; i < 4; i++ ) {
-				expanded[ prefix + cssExpand[ i ] + suffix ] =
-					parts[ i ] || parts[ i - 2 ] || parts[ 0 ];
-			}
-
-			return expanded;
-		}
-	};
-
-	if ( !rmargin.test( prefix ) ) {
-		jQuery.cssHooks[ prefix + suffix ].set = setPositiveNumber;
-	}
-});
-var r20 = /%20/g,
-	rbracket = /\[\]$/,
-	rCRLF = /\r?\n/g,
-	rsubmitterTypes = /^(?:submit|button|image|reset|file)$/i,
-	rsubmittable = /^(?:input|select|textarea|keygen)/i;
-
-jQuery.fn.extend({
-	serialize: function() {
-		return jQuery.param( this.serializeArray() );
-	},
-	serializeArray: function() {
-		return this.map(function(){
-			// Can add propHook for "elements" to filter or add form elements
-			var elements = jQuery.prop( this, "elements" );
-			return elements ? jQuery.makeArray( elements ) : this;
-		})
-		.filter(function(){
-			var type = this.type;
-			// Use .is(":disabled") so that fieldset[disabled] works
-			return this.name && !jQuery( this ).is( ":disabled" ) &&
-				rsubmittable.test( this.nodeName ) && !rsubmitterTypes.test( type ) &&
-				( this.checked || !manipulation_rcheckableType.test( type ) );
-		})
-		.map(function( i, elem ){
-			var val = jQuery( this ).val();
-
-			return val == null ?
-				null :
-				jQuery.isArray( val ) ?
-					jQuery.map( val, function( val ){
-						return { name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
-					}) :
-					{ name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
-		}).get();
-	}
-});
-
-//Serialize an array of form elements or a set of
-//key/values into a query string
-jQuery.param = function( a, traditional ) {
-	var prefix,
-		s = [],
-		add = function( key, value ) {
-			// If value is a function, invoke it and return its value
-			value = jQuery.isFunction( value ) ? value() : ( value == null ? "" : value );
-			s[ s.length ] = encodeURIComponent( key ) + "=" + encodeURIComponent( value );
-		};
-
-	// Set traditional to true for jQuery <= 1.3.2 behavior.
-	if ( traditional === undefined ) {
-		traditional = jQuery.ajaxSettings && jQuery.ajaxSettings.traditional;
-	}
-
-	// If an array was passed in, assume that it is an array of form elements.
-	if ( jQuery.isArray( a ) || ( a.jquery && !jQuery.isPlainObject( a ) ) ) {
-		// Serialize the form elements
-		jQuery.each( a, function() {
-			add( this.name, this.value );
-		});
-
-	} else {
-		// If traditional, encode the "old" way (the way 1.3.2 or older
-		// did it), otherwise encode params recursively.
-		for ( prefix in a ) {
-			buildParams( prefix, a[ prefix ], traditional, add );
-		}
-	}
-
-	// Return the resulting serialization
-	return s.join( "&" ).replace( r20, "+" );
-};
-
-function buildParams( prefix, obj, traditional, add ) {
-	var name;
-
-	if ( jQuery.isArray( obj ) ) {
-		// Serialize array item.
-		jQuery.each( obj, function( i, v ) {
-			if ( traditional || rbracket.test( prefix ) ) {
-				// Treat each array item as a scalar.
-				add( prefix, v );
-
-			} else {
-				// Item is non-scalar (array or object), encode its numeric index.
-				buildParams( prefix + "[" + ( typeof v === "object" ? i : "" ) + "]", v, traditional, add );
-			}
-		});
-
-	} else if ( !traditional && jQuery.type( obj ) === "object" ) {
-		// Serialize object item.
-		for ( name in obj ) {
-			buildParams( prefix + "[" + name + "]", obj[ name ], traditional, add );
-		}
-
-	} else {
-		// Serialize scalar item.
-		add( prefix, obj );
-	}
-}
-jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblclick " +
-	"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
-	"change select submit keydown keypress keyup error contextmenu").split(" "), function( i, name ) {
-
-	// Handle event binding
-	jQuery.fn[ name ] = function( data, fn ) {
-		return arguments.length > 0 ?
-			this.on( name, null, data, fn ) :
-			this.trigger( name );
-	};
-});
-
-jQuery.fn.hover = function( fnOver, fnOut ) {
-	return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
-};
-var
-	// Document location
-	ajaxLocParts,
-	ajaxLocation,
-	ajax_nonce = jQuery.now(),
-
-	ajax_rquery = /\?/,
-	rhash = /#.*$/,
-	rts = /([?&])_=[^&]*/,
-	rheaders = /^(.*?):[ \t]*([^\r\n]*)\r?$/mg, // IE leaves an \r character at EOL
-	// #7653, #8125, #8152: local protocol detection
-	rlocalProtocol = /^(?:about|app|app-storage|.+-extension|file|res|widget):$/,
-	rnoContent = /^(?:GET|HEAD)$/,
-	rprotocol = /^\/\//,
-	rurl = /^([\w.+-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,
-
-	// Keep a copy of the old load method
-	_load = jQuery.fn.load,
-
-	/* Prefilters
-	 * 1) They are useful to introduce custom dataTypes (see ajax/jsonp.js for an example)
-	 * 2) These are called:
-	 *    - BEFORE asking for a transport
-	 *    - AFTER param serialization (s.data is a string if s.processData is true)
-	 * 3) key is the dataType
-	 * 4) the catchall symbol "*" can be used
-	 * 5) execution will start with transport dataType and THEN continue down to "*" if needed
-	 */
-	prefilters = {},
-
-	/* Transports bindings
-	 * 1) key is the dataType
-	 * 2) the catchall symbol "*" can be used
-	 * 3) selection will start with transport dataType and THEN go to "*" if needed
-	 */
-	transports = {},
-
-	// Avoid comment-prolog char sequence (#10098); must appease lint and evade compression
-	allTypes = "*/".concat("*");
-
-// #8138, IE may throw an exception when accessing
-// a field from window.location if document.domain has been set
-try {
-	ajaxLocation = location.href;
-} catch( e ) {
-	// Use the href attribute of an A element
-	// since IE will modify it given document.location
-	ajaxLocation = document.createElement( "a" );
-	ajaxLocation.href = "";
-	ajaxLocation = ajaxLocation.href;
-}
-
-// Segment location into parts
-ajaxLocParts = rurl.exec( ajaxLocation.toLowerCase() ) || [];
-
-// Base "constructor" for jQuery.ajaxPrefilter and jQuery.ajaxTransport
-function addToPrefiltersOrTransports( structure ) {
-
-	// dataTypeExpression is optional and defaults to "*"
-	return function( dataTypeExpression, func ) {
-
-		if ( typeof dataTypeExpression !== "string" ) {
-			func = dataTypeExpression;
-			dataTypeExpression = "*";
-		}
-
-		var dataType,
-			i = 0,
-			dataTypes = dataTypeExpression.toLowerCase().match( core_rnotwhite ) || [];
-
-		if ( jQuery.isFunction( func ) ) {
-			// For each dataType in the dataTypeExpression
-			while ( (dataType = dataTypes[i++]) ) {
-				// Prepend if requested
-				if ( dataType[0] === "+" ) {
-					dataType = dataType.slice( 1 ) || "*";
-					(structure[ dataType ] = structure[ dataType ] || []).unshift( func );
-
-				// Otherwise append
-				} else {
-					(structure[ dataType ] = structure[ dataType ] || []).push( func );
-				}
-			}
-		}
-	};
-}
-
-// Base inspection function for prefilters and transports
-function inspectPrefiltersOrTransports( structure, options, originalOptions, jqXHR ) {
-
-	var inspected = {},
-		seekingTransport = ( structure === transports );
-
-	function inspect( dataType ) {
-		var selected;
-		inspected[ dataType ] = true;
-		jQuery.each( structure[ dataType ] || [], function( _, prefilterOrFactory ) {
-			var dataTypeOrTransport = prefilterOrFactory( options, originalOptions, jqXHR );
-			if( typeof dataTypeOrTransport === "string" && !seekingTransport && !inspected[ dataTypeOrTransport ] ) {
-				options.dataTypes.unshift( dataTypeOrTransport );
-				inspect( dataTypeOrTransport );
-				return false;
-			} else if ( seekingTransport ) {
-				return !( selected = dataTypeOrTransport );
-			}
-		});
-		return selected;
-	}
-
-	return inspect( options.dataTypes[ 0 ] ) || !inspected[ "*" ] && inspect( "*" );
-}
-
-// A special extend for ajax options
-// that takes "flat" options (not to be deep extended)
-// Fixes #9887
-function ajaxExtend( target, src ) {
-	var deep, key,
-		flatOptions = jQuery.ajaxSettings.flatOptions || {};
-
-	for ( key in src ) {
-		if ( src[ key ] !== undefined ) {
-			( flatOptions[ key ] ? target : ( deep || (deep = {}) ) )[ key ] = src[ key ];
-		}
-	}
-	if ( deep ) {
-		jQuery.extend( true, target, deep );
-	}
-
-	return target;
-}
-
-jQuery.fn.load = function( url, params, callback ) {
-	if ( typeof url !== "string" && _load ) {
-		return _load.apply( this, arguments );
-	}
-
-	var selector, response, type,
-		self = this,
-		off = url.indexOf(" ");
-
-	if ( off >= 0 ) {
-		selector = url.slice( off, url.length );
-		url = url.slice( 0, off );
-	}
-
-	// If it's a function
-	if ( jQuery.isFunction( params ) ) {
-
-		// We assume that it's the callback
-		callback = params;
-		params = undefined;
-
-	// Otherwise, build a param string
-	} else if ( params && typeof params === "object" ) {
-		type = "POST";
-	}
-
-	// If we have elements to modify, make the request
-	if ( self.length > 0 ) {
-		jQuery.ajax({
-			url: url,
-
-			// if "type" variable is undefined, then "GET" method will be used
-			type: type,
-			dataType: "html",
-			data: params
-		}).done(function( responseText ) {
-
-			// Save response for use in complete callback
-			response = arguments;
-
-			self.html( selector ?
-
-				// If a selector was specified, locate the right elements in a dummy div
-				// Exclude scripts to avoid IE 'Permission Denied' errors
-				jQuery("<div>").append( jQuery.parseHTML( responseText ) ).find( selector ) :
-
-				// Otherwise use the full result
-				responseText );
-
-		}).complete( callback && function( jqXHR, status ) {
-			self.each( callback, response || [ jqXHR.responseText, status, jqXHR ] );
-		});
-	}
-
-	return this;
-};
-
-// Attach a bunch of functions for handling common AJAX events
-jQuery.each( [ "ajaxStart", "ajaxStop", "ajaxComplete", "ajaxError", "ajaxSuccess", "ajaxSend" ], function( i, type ){
-	jQuery.fn[ type ] = function( fn ){
-		return this.on( type, fn );
-	};
-});
-
-jQuery.each( [ "get", "post" ], function( i, method ) {
-	jQuery[ method ] = function( url, data, callback, type ) {
-		// shift arguments if data argument was omitted
-		if ( jQuery.isFunction( data ) ) {
-			type = type || callback;
-			callback = data;
-			data = undefined;
-		}
-
-		return jQuery.ajax({
-			url: url,
-			type: method,
-			dataType: type,
-			data: data,
-			success: callback
-		});
-	};
-});
-
-jQuery.extend({
-
-	// Counter for holding the number of active queries
-	active: 0,
-
-	// Last-Modified header cache for next request
-	lastModified: {},
-	etag: {},
-
-	ajaxSettings: {
-		url: ajaxLocation,
-		type: "GET",
-		isLocal: rlocalProtocol.test( ajaxLocParts[ 1 ] ),
-		global: true,
-		processData: true,
-		async: true,
-		contentType: "application/x-www-form-urlencoded; charset=UTF-8",
-		/*
-		timeout: 0,
-		data: null,
-		dataType: null,
-		username: null,
-		password: null,
-		cache: null,
-		throws: false,
-		traditional: false,
-		headers: {},
-		*/
-
-		accepts: {
-			"*": allTypes,
-			text: "text/plain",
-			html: "text/html",
-			xml: "application/xml, text/xml",
-			json: "application/json, text/javascript"
-		},
-
-		contents: {
-			xml: /xml/,
-			html: /html/,
-			json: /json/
-		},
-
-		responseFields: {
-			xml: "responseXML",
-			text: "responseText"
-		},
-
-		// Data converters
-		// Keys separate source (or catchall "*") and destination types with a single space
-		converters: {
-
-			// Convert anything to text
-			"* text": window.String,
-
-			// Text to html (true = no transformation)
-			"text html": true,
-
-			// Evaluate text as a json expression
-			"text json": jQuery.parseJSON,
-
-			// Parse text as xml
-			"text xml": jQuery.parseXML
-		},
-
-		// For options that shouldn't be deep extended:
-		// you can add your own custom options here if
-		// and when you create one that shouldn't be
-		// deep extended (see ajaxExtend)
-		flatOptions: {
-			url: true,
-			context: true
-		}
-	},
-
-	// Creates a full fledged settings object into target
-	// with both ajaxSettings and settings fields.
-	// If target is omitted, writes into ajaxSettings.
-	ajaxSetup: function( target, settings ) {
-		return settings ?
-
-			// Building a settings object
-			ajaxExtend( ajaxExtend( target, jQuery.ajaxSettings ), settings ) :
-
-			// Extending ajaxSettings
-			ajaxExtend( jQuery.ajaxSettings, target );
-	},
-
-	ajaxPrefilter: addToPrefiltersOrTransports( prefilters ),
-	ajaxTransport: addToPrefiltersOrTransports( transports ),
-
-	// Main method
-	ajax: function( url, options ) {
-
-		// If url is an object, simulate pre-1.5 signature
-		if ( typeof url === "object" ) {
-			options = url;
-			url = undefined;
-		}
-
-		// Force options to be an object
-		options = options || {};
-
-		var // Cross-domain detection vars
-			parts,
-			// Loop variable
-			i,
-			// URL without anti-cache param
-			cacheURL,
-			// Response headers as string
-			responseHeadersString,
-			// timeout handle
-			timeoutTimer,
-
-			// To know if global events are to be dispatched
-			fireGlobals,
-
-			transport,
-			// Response headers
-			responseHeaders,
-			// Create the final options object
-			s = jQuery.ajaxSetup( {}, options ),
-			// Callbacks context
-			callbackContext = s.context || s,
-			// Context for global events is callbackContext if it is a DOM node or jQuery collection
-			globalEventContext = s.context && ( callbackContext.nodeType || callbackContext.jquery ) ?
-				jQuery( callbackContext ) :
-				jQuery.event,
-			// Deferreds
-			deferred = jQuery.Deferred(),
-			completeDeferred = jQuery.Callbacks("once memory"),
-			// Status-dependent callbacks
-			statusCode = s.statusCode || {},
-			// Headers (they are sent all at once)
-			requestHeaders = {},
-			requestHeadersNames = {},
-			// The jqXHR state
-			state = 0,
-			// Default abort message
-			strAbort = "canceled",
-			// Fake xhr
-			jqXHR = {
-				readyState: 0,
-
-				// Builds headers hashtable if needed
-				getResponseHeader: function( key ) {
-					var match;
-					if ( state === 2 ) {
-						if ( !responseHeaders ) {
-							responseHeaders = {};
-							while ( (match = rheaders.exec( responseHeadersString )) ) {
-								responseHeaders[ match[1].toLowerCase() ] = match[ 2 ];
-							}
-						}
-						match = responseHeaders[ key.toLowerCase() ];
-					}
-					return match == null ? null : match;
-				},
-
-				// Raw string
-				getAllResponseHeaders: function() {
-					return state === 2 ? responseHeadersString : null;
-				},
-
-				// Caches the header
-				setRequestHeader: function( name, value ) {
-					var lname = name.toLowerCase();
-					if ( !state ) {
-						name = requestHeadersNames[ lname ] = requestHeadersNames[ lname ] || name;
-						requestHeaders[ name ] = value;
-					}
-					return this;
-				},
-
-				// Overrides response content-type header
-				overrideMimeType: function( type ) {
-					if ( !state ) {
-						s.mimeType = type;
-					}
-					return this;
-				},
-
-				// Status-dependent callbacks
-				statusCode: function( map ) {
-					var code;
-					if ( map ) {
-						if ( state < 2 ) {
-							for ( code in map ) {
-								// Lazy-add the new callback in a way that preserves old ones
-								statusCode[ code ] = [ statusCode[ code ], map[ code ] ];
-							}
-						} else {
-							// Execute the appropriate callbacks
-							jqXHR.always( map[ jqXHR.status ] );
-						}
-					}
-					return this;
-				},
-
-				// Cancel the request
-				abort: function( statusText ) {
-					var finalText = statusText || strAbort;
-					if ( transport ) {
-						transport.abort( finalText );
-					}
-					done( 0, finalText );
-					return this;
-				}
-			};
-
-		// Attach deferreds
-		deferred.promise( jqXHR ).complete = completeDeferred.add;
-		jqXHR.success = jqXHR.done;
-		jqXHR.error = jqXHR.fail;
-
-		// Remove hash character (#7531: and string promotion)
-		// Add protocol if not provided (#5866: IE7 issue with protocol-less urls)
-		// Handle falsy url in the settings object (#10093: consistency with old signature)
-		// We also use the url parameter if available
-		s.url = ( ( url || s.url || ajaxLocation ) + "" ).replace( rhash, "" ).replace( rprotocol, ajaxLocParts[ 1 ] + "//" );
-
-		// Alias method option to type as per ticket #12004
-		s.type = options.method || options.type || s.method || s.type;
-
-		// Extract dataTypes list
-		s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().match( core_rnotwhite ) || [""];
-
-		// A cross-domain request is in order when we have a protocol:host:port mismatch
-		if ( s.crossDomain == null ) {
-			parts = rurl.exec( s.url.toLowerCase() );
-			s.crossDomain = !!( parts &&
-				( parts[ 1 ] !== ajaxLocParts[ 1 ] || parts[ 2 ] !== ajaxLocParts[ 2 ] ||
-					( parts[ 3 ] || ( parts[ 1 ] === "http:" ? 80 : 443 ) ) !=
-						( ajaxLocParts[ 3 ] || ( ajaxLocParts[ 1 ] === "http:" ? 80 : 443 ) ) )
-			);
-		}
-
-		// Convert data if not already a string
-		if ( s.data && s.processData && typeof s.data !== "string" ) {
-			s.data = jQuery.param( s.data, s.traditional );
-		}
-
-		// Apply prefilters
-		inspectPrefiltersOrTransports( prefilters, s, options, jqXHR );
-
-		// If request was aborted inside a prefilter, stop there
-		if ( state === 2 ) {
-			return jqXHR;
-		}
-
-		// We can fire global events as of now if asked to
-		fireGlobals = s.global;
-
-		// Watch for a new set of requests
-		if ( fireGlobals && jQuery.active++ === 0 ) {
-			jQuery.event.trigger("ajaxStart");
-		}
-
-		// Uppercase the type
-		s.type = s.type.toUpperCase();
-
-		// Determine if request has content
-		s.hasContent = !rnoContent.test( s.type );
-
-		// Save the URL in case we're toying with the If-Modified-Since
-		// and/or If-None-Match header later on
-		cacheURL = s.url;
-
-		// More options handling for requests with no content
-		if ( !s.hasContent ) {
-
-			// If data is available, append data to url
-			if ( s.data ) {
-				cacheURL = ( s.url += ( ajax_rquery.test( cacheURL ) ? "&" : "?" ) + s.data );
-				// #9682: remove data so that it's not used in an eventual retry
-				delete s.data;
-			}
-
-			// Add anti-cache in url if needed
-			if ( s.cache === false ) {
-				s.url = rts.test( cacheURL ) ?
-
-					// If there is already a '_' parameter, set its value
-					cacheURL.replace( rts, "$1_=" + ajax_nonce++ ) :
-
-					// Otherwise add one to the end
-					cacheURL + ( ajax_rquery.test( cacheURL ) ? "&" : "?" ) + "_=" + ajax_nonce++;
-			}
-		}
-
-		// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
-		if ( s.ifModified ) {
-			if ( jQuery.lastModified[ cacheURL ] ) {
-				jqXHR.setRequestHeader( "If-Modified-Since", jQuery.lastModified[ cacheURL ] );
-			}
-			if ( jQuery.etag[ cacheURL ] ) {
-				jqXHR.setRequestHeader( "If-None-Match", jQuery.etag[ cacheURL ] );
-			}
-		}
-
-		// Set the correct header, if data is being sent
-		if ( s.data && s.hasContent && s.contentType !== false || options.contentType ) {
-			jqXHR.setRequestHeader( "Content-Type", s.contentType );
-		}
-
-		// Set the Accepts header for the server, depending on the dataType
-		jqXHR.setRequestHeader(
-			"Accept",
-			s.dataTypes[ 0 ] && s.accepts[ s.dataTypes[0] ] ?
-				s.accepts[ s.dataTypes[0] ] + ( s.dataTypes[ 0 ] !== "*" ? ", " + allTypes + "; q=0.01" : "" ) :
-				s.accepts[ "*" ]
-		);
-
-		// Check for headers option
-		for ( i in s.headers ) {
-			jqXHR.setRequestHeader( i, s.headers[ i ] );
-		}
-
-		// Allow custom headers/mimetypes and early abort
-		if ( s.beforeSend && ( s.beforeSend.call( callbackContext, jqXHR, s ) === false || state === 2 ) ) {
-			// Abort if not done already and return
-			return jqXHR.abort();
-		}
-
-		// aborting is no longer a cancellation
-		strAbort = "abort";
-
-		// Install callbacks on deferreds
-		for ( i in { success: 1, error: 1, complete: 1 } ) {
-			jqXHR[ i ]( s[ i ] );
-		}
-
-		// Get transport
-		transport = inspectPrefiltersOrTransports( transports, s, options, jqXHR );
-
-		// If no transport, we auto-abort
-		if ( !transport ) {
-			done( -1, "No Transport" );
-		} else {
-			jqXHR.readyState = 1;
-
-			// Send global event
-			if ( fireGlobals ) {
-				globalEventContext.trigger( "ajaxSend", [ jqXHR, s ] );
-			}
-			// Timeout
-			if ( s.async && s.timeout > 0 ) {
-				timeoutTimer = setTimeout(function() {
-					jqXHR.abort("timeout");
-				}, s.timeout );
-			}
-
-			try {
-				state = 1;
-				transport.send( requestHeaders, done );
-			} catch ( e ) {
-				// Propagate exception as error if not done
-				if ( state < 2 ) {
-					done( -1, e );
-				// Simply rethrow otherwise
-				} else {
-					throw e;
-				}
-			}
-		}
-
-		// Callback for when everything is done
-		function done( status, nativeStatusText, responses, headers ) {
-			var isSuccess, success, error, response, modified,
-				statusText = nativeStatusText;
-
-			// Called once
-			if ( state === 2 ) {
-				return;
-			}
-
-			// State is "done" now
-			state = 2;
-
-			// Clear timeout if it exists
-			if ( timeoutTimer ) {
-				clearTimeout( timeoutTimer );
-			}
-
-			// Dereference transport for early garbage collection
-			// (no matter how long the jqXHR object will be used)
-			transport = undefined;
-
-			// Cache response headers
-			responseHeadersString = headers || "";
-
-			// Set readyState
-			jqXHR.readyState = status > 0 ? 4 : 0;
-
-			// Get response data
-			if ( responses ) {
-				response = ajaxHandleResponses( s, jqXHR, responses );
-			}
-
-			// If successful, handle type chaining
-			if ( status >= 200 && status < 300 || status === 304 ) {
-
-				// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
-				if ( s.ifModified ) {
-					modified = jqXHR.getResponseHeader("Last-Modified");
-					if ( modified ) {
-						jQuery.lastModified[ cacheURL ] = modified;
-					}
-					modified = jqXHR.getResponseHeader("etag");
-					if ( modified ) {
-						jQuery.etag[ cacheURL ] = modified;
-					}
-				}
-
-				// if no content
-				if ( status === 204 ) {
-					isSuccess = true;
-					statusText = "nocontent";
-
-				// if not modified
-				} else if ( status === 304 ) {
-					isSuccess = true;
-					statusText = "notmodified";
-
-				// If we have data, let's convert it
-				} else {
-					isSuccess = ajaxConvert( s, response );
-					statusText = isSuccess.state;
-					success = isSuccess.data;
-					error = isSuccess.error;
-					isSuccess = !error;
-				}
-			} else {
-				// We extract error from statusText
-				// then normalize statusText and status for non-aborts
-				error = statusText;
-				if ( status || !statusText ) {
-					statusText = "error";
-					if ( status < 0 ) {
-						status = 0;
-					}
-				}
-			}
-
-			// Set data for the fake xhr object
-			jqXHR.status = status;
-			jqXHR.statusText = ( nativeStatusText || statusText ) + "";
-
-			// Success/Error
-			if ( isSuccess ) {
-				deferred.resolveWith( callbackContext, [ success, statusText, jqXHR ] );
-			} else {
-				deferred.rejectWith( callbackContext, [ jqXHR, statusText, error ] );
-			}
-
-			// Status-dependent callbacks
-			jqXHR.statusCode( statusCode );
-			statusCode = undefined;
-
-			if ( fireGlobals ) {
-				globalEventContext.trigger( isSuccess ? "ajaxSuccess" : "ajaxError",
-					[ jqXHR, s, isSuccess ? success : error ] );
-			}
-
-			// Complete
-			completeDeferred.fireWith( callbackContext, [ jqXHR, statusText ] );
-
-			if ( fireGlobals ) {
-				globalEventContext.trigger( "ajaxComplete", [ jqXHR, s ] );
-				// Handle the global AJAX counter
-				if ( !( --jQuery.active ) ) {
-					jQuery.event.trigger("ajaxStop");
-				}
-			}
-		}
-
-		return jqXHR;
-	},
-
-	getScript: function( url, callback ) {
-		return jQuery.get( url, undefined, callback, "script" );
-	},
-
-	getJSON: function( url, data, callback ) {
-		return jQuery.get( url, data, callback, "json" );
-	}
-});
-
-/* Handles responses to an ajax request:
- * - sets all responseXXX fields accordingly
- * - finds the right dataType (mediates between content-type and expected dataType)
- * - returns the corresponding response
- */
-function ajaxHandleResponses( s, jqXHR, responses ) {
-	var firstDataType, ct, finalDataType, type,
-		contents = s.contents,
-		dataTypes = s.dataTypes,
-		responseFields = s.responseFields;
-
-	// Fill responseXXX fields
-	for ( type in responseFields ) {
-		if ( type in responses ) {
-			jqXHR[ responseFields[type] ] = responses[ type ];
-		}
-	}
-
-	// Remove auto dataType and get content-type in the process
-	while( dataTypes[ 0 ] === "*" ) {
-		dataTypes.shift();
-		if ( ct === undefined ) {
-			ct = s.mimeType || jqXHR.getResponseHeader("Content-Type");
-		}
-	}
-
-	// Check if we're dealing with a known content-type
-	if ( ct ) {
-		for ( type in contents ) {
-			if ( contents[ type ] && contents[ type ].test( ct ) ) {
-				dataTypes.unshift( type );
-				break;
-			}
-		}
-	}
-
-	// Check to see if we have a response for the expected dataType
-	if ( dataTypes[ 0 ] in responses ) {
-		finalDataType = dataTypes[ 0 ];
-	} else {
-		// Try convertible dataTypes
-		for ( type in responses ) {
-			if ( !dataTypes[ 0 ] || s.converters[ type + " " + dataTypes[0] ] ) {
-				finalDataType = type;
-				break;
-			}
-			if ( !firstDataType ) {
-				firstDataType = type;
-			}
-		}
-		// Or just use first one
-		finalDataType = finalDataType || firstDataType;
-	}
-
-	// If we found a dataType
-	// We add the dataType to the list if needed
-	// and return the corresponding response
-	if ( finalDataType ) {
-		if ( finalDataType !== dataTypes[ 0 ] ) {
-			dataTypes.unshift( finalDataType );
-		}
-		return responses[ finalDataType ];
-	}
-}
-
-// Chain conversions given the request and the original response
-function ajaxConvert( s, response ) {
-	var conv2, current, conv, tmp,
-		converters = {},
-		i = 0,
-		// Work with a copy of dataTypes in case we need to modify it for conversion
-		dataTypes = s.dataTypes.slice(),
-		prev = dataTypes[ 0 ];
-
-	// Apply the dataFilter if provided
-	if ( s.dataFilter ) {
-		response = s.dataFilter( response, s.dataType );
-	}
-
-	// Create converters map with lowercased keys
-	if ( dataTypes[ 1 ] ) {
-		for ( conv in s.converters ) {
-			converters[ conv.toLowerCase() ] = s.converters[ conv ];
-		}
-	}
-
-	// Convert to each sequential dataType, tolerating list modification
-	for ( ; (current = dataTypes[++i]); ) {
-
-		// There's only work to do if current dataType is non-auto
-		if ( current !== "*" ) {
-
-			// Convert response if prev dataType is non-auto and differs from current
-			if ( prev !== "*" && prev !== current ) {
-
-				// Seek a direct converter
-				conv = converters[ prev + " " + current ] || converters[ "* " + current ];
-
-				// If none found, seek a pair
-				if ( !conv ) {
-					for ( conv2 in converters ) {
-
-						// If conv2 outputs current
-						tmp = conv2.split(" ");
-						if ( tmp[ 1 ] === current ) {
-
-							// If prev can be converted to accepted input
-							conv = converters[ prev + " " + tmp[ 0 ] ] ||
-								converters[ "* " + tmp[ 0 ] ];
-							if ( conv ) {
-								// Condense equivalence converters
-								if ( conv === true ) {
-									conv = converters[ conv2 ];
-
-								// Otherwise, insert the intermediate dataType
-								} else if ( converters[ conv2 ] !== true ) {
-									current = tmp[ 0 ];
-									dataTypes.splice( i--, 0, current );
-								}
-
-								break;
-							}
-						}
-					}
-				}
-
-				// Apply converter (if not an equivalence)
-				if ( conv !== true ) {
-
-					// Unless errors are allowed to bubble, catch and return them
-					if ( conv && s["throws"] ) {
-						response = conv( response );
-					} else {
-						try {
-							response = conv( response );
-						} catch ( e ) {
-							return { state: "parsererror", error: conv ? e : "No conversion from " + prev + " to " + current };
-						}
-					}
-				}
-			}
-
-			// Update prev for next iteration
-			prev = current;
-		}
-	}
-
-	return { state: "success", data: response };
-}
-// Install script dataType
-jQuery.ajaxSetup({
-	accepts: {
-		script: "text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"
-	},
-	contents: {
-		script: /(?:java|ecma)script/
-	},
-	converters: {
-		"text script": function( text ) {
-			jQuery.globalEval( text );
-			return text;
-		}
-	}
-});
-
-// Handle cache's special case and global
-jQuery.ajaxPrefilter( "script", function( s ) {
-	if ( s.cache === undefined ) {
-		s.cache = false;
-	}
-	if ( s.crossDomain ) {
-		s.type = "GET";
-		s.global = false;
-	}
-});
-
-// Bind script tag hack transport
-jQuery.ajaxTransport( "script", function(s) {
-
-	// This transport only deals with cross domain requests
-	if ( s.crossDomain ) {
-
-		var script,
-			head = document.head || jQuery("head")[0] || document.documentElement;
-
-		return {
-
-			send: function( _, callback ) {
-
-				script = document.createElement("script");
-
-				script.async = true;
-
-				if ( s.scriptCharset ) {
-					script.charset = s.scriptCharset;
-				}
-
-				script.src = s.url;
-
-				// Attach handlers for all browsers
-				script.onload = script.onreadystatechange = function( _, isAbort ) {
-
-					if ( isAbort || !script.readyState || /loaded|complete/.test( script.readyState ) ) {
-
-						// Handle memory leak in IE
-						script.onload = script.onreadystatechange = null;
-
-						// Remove the script
-						if ( script.parentNode ) {
-							script.parentNode.removeChild( script );
-						}
-
-						// Dereference the script
-						script = null;
-
-						// Callback if not abort
-						if ( !isAbort ) {
-							callback( 200, "success" );
-						}
-					}
-				};
-
-				// Circumvent IE6 bugs with base elements (#2709 and #4378) by prepending
-				// Use native DOM manipulation to avoid our domManip AJAX trickery
-				head.insertBefore( script, head.firstChild );
-			},
-
-			abort: function() {
-				if ( script ) {
-					script.onload( undefined, true );
-				}
-			}
-		};
-	}
-});
-var oldCallbacks = [],
-	rjsonp = /(=)\?(?=&|$)|\?\?/;
-
-// Default jsonp settings
-jQuery.ajaxSetup({
-	jsonp: "callback",
-	jsonpCallback: function() {
-		var callback = oldCallbacks.pop() || ( jQuery.expando + "_" + ( ajax_nonce++ ) );
-		this[ callback ] = true;
-		return callback;
-	}
-});
-
-// Detect, normalize options and install callbacks for jsonp requests
-jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
-
-	var callbackName, overwritten, responseContainer,
-		jsonProp = s.jsonp !== false && ( rjsonp.test( s.url ) ?
-			"url" :
-			typeof s.data === "string" && !( s.contentType || "" ).indexOf("application/x-www-form-urlencoded") && rjsonp.test( s.data ) && "data"
-		);
-
-	// Handle iff the expected data type is "jsonp" or we have a parameter to set
-	if ( jsonProp || s.dataTypes[ 0 ] === "jsonp" ) {
-
-		// Get callback name, remembering preexisting value associated with it
-		callbackName = s.jsonpCallback = jQuery.isFunction( s.jsonpCallback ) ?
-			s.jsonpCallback() :
-			s.jsonpCallback;
-
-		// Insert callback into url or form data
-		if ( jsonProp ) {
-			s[ jsonProp ] = s[ jsonProp ].replace( rjsonp, "$1" + callbackName );
-		} else if ( s.jsonp !== false ) {
-			s.url += ( ajax_rquery.test( s.url ) ? "&" : "?" ) + s.jsonp + "=" + callbackName;
-		}
-
-		// Use data converter to retrieve json after script execution
-		s.converters["script json"] = function() {
-			if ( !responseContainer ) {
-				jQuery.error( callbackName + " was not called" );
-			}
-			return responseContainer[ 0 ];
-		};
-
-		// force json dataType
-		s.dataTypes[ 0 ] = "json";
-
-		// Install callback
-		overwritten = window[ callbackName ];
-		window[ callbackName ] = function() {
-			responseContainer = arguments;
-		};
-
-		// Clean-up function (fires after converters)
-		jqXHR.always(function() {
-			// Restore preexisting value
-			window[ callbackName ] = overwritten;
-
-			// Save back as free
-			if ( s[ callbackName ] ) {
-				// make sure that re-using the options doesn't screw things around
-				s.jsonpCallback = originalSettings.jsonpCallback;
-
-				// save the callback name for future use
-				oldCallbacks.push( callbackName );
-			}
-
-			// Call if it was a function and we have a response
-			if ( responseContainer && jQuery.isFunction( overwritten ) ) {
-				overwritten( responseContainer[ 0 ] );
-			}
-
-			responseContainer = overwritten = undefined;
-		});
-
-		// Delegate to script
-		return "script";
-	}
-});
-var xhrCallbacks, xhrSupported,
-	xhrId = 0,
-	// #5280: Internet Explorer will keep connections alive if we don't abort on unload
-	xhrOnUnloadAbort = window.ActiveXObject && function() {
-		// Abort all pending requests
-		var key;
-		for ( key in xhrCallbacks ) {
-			xhrCallbacks[ key ]( undefined, true );
-		}
-	};
-
-// Functions to create xhrs
-function createStandardXHR() {
-	try {
-		return new window.XMLHttpRequest();
-	} catch( e ) {}
-}
-
-function createActiveXHR() {
-	try {
-		return new window.ActiveXObject("Microsoft.XMLHTTP");
-	} catch( e ) {}
-}
-
-// Create the request object
-// (This is still attached to ajaxSettings for backward compatibility)
-jQuery.ajaxSettings.xhr = window.ActiveXObject ?
-	/* Microsoft failed to properly
-	 * implement the XMLHttpRequest in IE7 (can't request local files),
-	 * so we use the ActiveXObject when it is available
-	 * Additionally XMLHttpRequest can be disabled in IE7/IE8 so
-	 * we need a fallback.
-	 */
-	function() {
-		return !this.isLocal && createStandardXHR() || createActiveXHR();
-	} :
-	// For all other browsers, use the standard XMLHttpRequest object
-	createStandardXHR;
-
-// Determine support properties
-xhrSupported = jQuery.ajaxSettings.xhr();
-jQuery.support.cors = !!xhrSupported && ( "withCredentials" in xhrSupported );
-xhrSupported = jQuery.support.ajax = !!xhrSupported;
-
-// Create transport if the browser can provide an xhr
-if ( xhrSupported ) {
-
-	jQuery.ajaxTransport(function( s ) {
-		// Cross domain only allowed if supported through XMLHttpRequest
-		if ( !s.crossDomain || jQuery.support.cors ) {
-
-			var callback;
-
-			return {
-				send: function( headers, complete ) {
-
-					// Get a new xhr
-					var handle, i,
-						xhr = s.xhr();
-
-					// Open the socket
-					// Passing null username, generates a login popup on Opera (#2865)
-					if ( s.username ) {
-						xhr.open( s.type, s.url, s.async, s.username, s.password );
-					} else {
-						xhr.open( s.type, s.url, s.async );
-					}
-
-					// Apply custom fields if provided
-					if ( s.xhrFields ) {
-						for ( i in s.xhrFields ) {
-							xhr[ i ] = s.xhrFields[ i ];
-						}
-					}
-
-					// Override mime type if needed
-					if ( s.mimeType && xhr.overrideMimeType ) {
-						xhr.overrideMimeType( s.mimeType );
-					}
-
-					// X-Requested-With header
-					// For cross-domain requests, seeing as conditions for a preflight are
-					// akin to a jigsaw puzzle, we simply never set it to be sure.
-					// (it can always be set on a per-request basis or even using ajaxSetup)
-					// For same-domain requests, won't change header if already provided.
-					if ( !s.crossDomain && !headers["X-Requested-With"] ) {
-						headers["X-Requested-With"] = "XMLHttpRequest";
-					}
-
-					// Need an extra try/catch for cross domain requests in Firefox 3
-					try {
-						for ( i in headers ) {
-							xhr.setRequestHeader( i, headers[ i ] );
-						}
-					} catch( err ) {}
-
-					// Do send the request
-					// This may raise an exception which is actually
-					// handled in jQuery.ajax (so no try/catch here)
-					xhr.send( ( s.hasContent && s.data ) || null );
-
-					// Listener
-					callback = function( _, isAbort ) {
-						var status, responseHeaders, statusText, responses;
-
-						// Firefox throws exceptions when accessing properties
-						// of an xhr when a network error occurred
-						// http://helpful.knobs-dials.com/index.php/Component_returned_failure_code:_0x80040111_(NS_ERROR_NOT_AVAILABLE)
-						try {
-
-							// Was never called and is aborted or complete
-							if ( callback && ( isAbort || xhr.readyState === 4 ) ) {
-
-								// Only called once
-								callback = undefined;
-
-								// Do not keep as active anymore
-								if ( handle ) {
-									xhr.onreadystatechange = jQuery.noop;
-									if ( xhrOnUnloadAbort ) {
-										delete xhrCallbacks[ handle ];
-									}
-								}
-
-								// If it's an abort
-								if ( isAbort ) {
-									// Abort it manually if needed
-									if ( xhr.readyState !== 4 ) {
-										xhr.abort();
-									}
-								} else {
-									responses = {};
-									status = xhr.status;
-									responseHeaders = xhr.getAllResponseHeaders();
-
-									// When requesting binary data, IE6-9 will throw an exception
-									// on any attempt to access responseText (#11426)
-									if ( typeof xhr.responseText === "string" ) {
-										responses.text = xhr.responseText;
-									}
-
-									// Firefox throws an exception when accessing
-									// statusText for faulty cross-domain requests
-									try {
-										statusText = xhr.statusText;
-									} catch( e ) {
-										// We normalize with Webkit giving an empty statusText
-										statusText = "";
-									}
-
-									// Filter status for non standard behaviors
-
-									// If the request is local and we have data: assume a success
-									// (success with no data won't get notified, that's the best we
-									// can do given current implementations)
-									if ( !status && s.isLocal && !s.crossDomain ) {
-										status = responses.text ? 200 : 404;
-									// IE - #1450: sometimes returns 1223 when it should be 204
-									} else if ( status === 1223 ) {
-										status = 204;
-									}
-								}
-							}
-						} catch( firefoxAccessException ) {
-							if ( !isAbort ) {
-								complete( -1, firefoxAccessException );
-							}
-						}
-
-						// Call complete if needed
-						if ( responses ) {
-							complete( status, statusText, responses, responseHeaders );
-						}
-					};
-
-					if ( !s.async ) {
-						// if we're in sync mode we fire the callback
-						callback();
-					} else if ( xhr.readyState === 4 ) {
-						// (IE6 & IE7) if it's in cache and has been
-						// retrieved directly we need to fire the callback
-						setTimeout( callback );
-					} else {
-						handle = ++xhrId;
-						if ( xhrOnUnloadAbort ) {
-							// Create the active xhrs callbacks list if needed
-							// and attach the unload handler
-							if ( !xhrCallbacks ) {
-								xhrCallbacks = {};
-								jQuery( window ).unload( xhrOnUnloadAbort );
-							}
-							// Add to list of active xhrs callbacks
-							xhrCallbacks[ handle ] = callback;
-						}
-						xhr.onreadystatechange = callback;
-					}
-				},
-
-				abort: function() {
-					if ( callback ) {
-						callback( undefined, true );
-					}
-				}
-			};
-		}
-	});
-}
-var fxNow, timerId,
-	rfxtypes = /^(?:toggle|show|hide)$/,
-	rfxnum = new RegExp( "^(?:([+-])=|)(" + core_pnum + ")([a-z%]*)$", "i" ),
-	rrun = /queueHooks$/,
-	animationPrefilters = [ defaultPrefilter ],
-	tweeners = {
-		"*": [function( prop, value ) {
-			var end, unit,
-				tween = this.createTween( prop, value ),
-				parts = rfxnum.exec( value ),
-				target = tween.cur(),
-				start = +target || 0,
-				scale = 1,
-				maxIterations = 20;
-
-			if ( parts ) {
-				end = +parts[2];
-				unit = parts[3] || ( jQuery.cssNumber[ prop ] ? "" : "px" );
-
-				// We need to compute starting value
-				if ( unit !== "px" && start ) {
-					// Iteratively approximate from a nonzero starting point
-					// Prefer the current property, because this process will be trivial if it uses the same units
-					// Fallback to end or a simple constant
-					start = jQuery.css( tween.elem, prop, true ) || end || 1;
-
-					do {
-						// If previous iteration zeroed out, double until we get *something*
-						// Use a string for doubling factor so we don't accidentally see scale as unchanged below
-						scale = scale || ".5";
-
-						// Adjust and apply
-						start = start / scale;
-						jQuery.style( tween.elem, prop, start + unit );
-
-					// Update scale, tolerating zero or NaN from tween.cur()
-					// And breaking the loop if scale is unchanged or perfect, or if we've just had enough
-					} while ( scale !== (scale = tween.cur() / target) && scale !== 1 && --maxIterations );
-				}
-
-				tween.unit = unit;
-				tween.start = start;
-				// If a +=/-= token was provided, we're doing a relative animation
-				tween.end = parts[1] ? start + ( parts[1] + 1 ) * end : end;
-			}
-			return tween;
-		}]
-	};
-
-// Animations created synchronously will run synchronously
-function createFxNow() {
-	setTimeout(function() {
-		fxNow = undefined;
-	});
-	return ( fxNow = jQuery.now() );
-}
-
-function createTweens( animation, props ) {
-	jQuery.each( props, function( prop, value ) {
-		var collection = ( tweeners[ prop ] || [] ).concat( tweeners[ "*" ] ),
-			index = 0,
-			length = collection.length;
-		for ( ; index < length; index++ ) {
-			if ( collection[ index ].call( animation, prop, value ) ) {
-
-				// we're done with this property
-				return;
-			}
-		}
-	});
-}
-
-function Animation( elem, properties, options ) {
-	var result,
-		stopped,
-		index = 0,
-		length = animationPrefilters.length,
-		deferred = jQuery.Deferred().always( function() {
-			// don't match elem in the :animated selector
-			delete tick.elem;
-		}),
-		tick = function() {
-			if ( stopped ) {
-				return false;
-			}
-			var currentTime = fxNow || createFxNow(),
-				remaining = Math.max( 0, animation.startTime + animation.duration - currentTime ),
-				// archaic crash bug won't allow us to use 1 - ( 0.5 || 0 ) (#12497)
-				temp = remaining / animation.duration || 0,
-				percent = 1 - temp,
-				index = 0,
-				length = animation.tweens.length;
-
-			for ( ; index < length ; index++ ) {
-				animation.tweens[ index ].run( percent );
-			}
-
-			deferred.notifyWith( elem, [ animation, percent, remaining ]);
-
-			if ( percent < 1 && length ) {
-				return remaining;
-			} else {
-				deferred.resolveWith( elem, [ animation ] );
-				return false;
-			}
-		},
-		animation = deferred.promise({
-			elem: elem,
-			props: jQuery.extend( {}, properties ),
-			opts: jQuery.extend( true, { specialEasing: {} }, options ),
-			originalProperties: properties,
-			originalOptions: options,
-			startTime: fxNow || createFxNow(),
-			duration: options.duration,
-			tweens: [],
-			createTween: function( prop, end ) {
-				var tween = jQuery.Tween( elem, animation.opts, prop, end,
-						animation.opts.specialEasing[ prop ] || animation.opts.easing );
-				animation.tweens.push( tween );
-				return tween;
-			},
-			stop: function( gotoEnd ) {
-				var index = 0,
-					// if we are going to the end, we want to run all the tweens
-					// otherwise we skip this part
-					length = gotoEnd ? animation.tweens.length : 0;
-				if ( stopped ) {
-					return this;
-				}
-				stopped = true;
-				for ( ; index < length ; index++ ) {
-					animation.tweens[ index ].run( 1 );
-				}
-
-				// resolve when we played the last frame
-				// otherwise, reject
-				if ( gotoEnd ) {
-					deferred.resolveWith( elem, [ animation, gotoEnd ] );
-				} else {
-					deferred.rejectWith( elem, [ animation, gotoEnd ] );
-				}
-				return this;
-			}
-		}),
-		props = animation.props;
-
-	propFilter( props, animation.opts.specialEasing );
-
-	for ( ; index < length ; index++ ) {
-		result = animationPrefilters[ index ].call( animation, elem, props, animation.opts );
-		if ( result ) {
-			return result;
-		}
-	}
-
-	createTweens( animation, props );
-
-	if ( jQuery.isFunction( animation.opts.start ) ) {
-		animation.opts.start.call( elem, animation );
-	}
-
-	jQuery.fx.timer(
-		jQuery.extend( tick, {
-			elem: elem,
-			anim: animation,
-			queue: animation.opts.queue
-		})
-	);
-
-	// attach callbacks from options
-	return animation.progress( animation.opts.progress )
-		.done( animation.opts.done, animation.opts.complete )
-		.fail( animation.opts.fail )
-		.always( animation.opts.always );
-}
-
-function propFilter( props, specialEasing ) {
-	var value, name, index, easing, hooks;
-
-	// camelCase, specialEasing and expand cssHook pass
-	for ( index in props ) {
-		name = jQuery.camelCase( index );
-		easing = specialEasing[ name ];
-		value = props[ index ];
-		if ( jQuery.isArray( value ) ) {
-			easing = value[ 1 ];
-			value = props[ index ] = value[ 0 ];
-		}
-
-		if ( index !== name ) {
-			props[ name ] = value;
-			delete props[ index ];
-		}
-
-		hooks = jQuery.cssHooks[ name ];
-		if ( hooks && "expand" in hooks ) {
-			value = hooks.expand( value );
-			delete props[ name ];
-
-			// not quite $.extend, this wont overwrite keys already present.
-			// also - reusing 'index' from above because we have the correct "name"
-			for ( index in value ) {
-				if ( !( index in props ) ) {
-					props[ index ] = value[ index ];
-					specialEasing[ index ] = easing;
-				}
-			}
-		} else {
-			specialEasing[ name ] = easing;
-		}
-	}
-}
-
-jQuery.Animation = jQuery.extend( Animation, {
-
-	tweener: function( props, callback ) {
-		if ( jQuery.isFunction( props ) ) {
-			callback = props;
-			props = [ "*" ];
-		} else {
-			props = props.split(" ");
-		}
-
-		var prop,
-			index = 0,
-			length = props.length;
-
-		for ( ; index < length ; index++ ) {
-			prop = props[ index ];
-			tweeners[ prop ] = tweeners[ prop ] || [];
-			tweeners[ prop ].unshift( callback );
-		}
-	},
-
-	prefilter: function( callback, prepend ) {
-		if ( prepend ) {
-			animationPrefilters.unshift( callback );
-		} else {
-			animationPrefilters.push( callback );
-		}
-	}
-});
-
-function defaultPrefilter( elem, props, opts ) {
-	/*jshint validthis:true */
-	var prop, index, length,
-		value, dataShow, toggle,
-		tween, hooks, oldfire,
-		anim = this,
-		style = elem.style,
-		orig = {},
-		handled = [],
-		hidden = elem.nodeType && isHidden( elem );
-
-	// handle queue: false promises
-	if ( !opts.queue ) {
-		hooks = jQuery._queueHooks( elem, "fx" );
-		if ( hooks.unqueued == null ) {
-			hooks.unqueued = 0;
-			oldfire = hooks.empty.fire;
-			hooks.empty.fire = function() {
-				if ( !hooks.unqueued ) {
-					oldfire();
-				}
-			};
-		}
-		hooks.unqueued++;
-
-		anim.always(function() {
-			// doing this makes sure that the complete handler will be called
-			// before this completes
-			anim.always(function() {
-				hooks.unqueued--;
-				if ( !jQuery.queue( elem, "fx" ).length ) {
-					hooks.empty.fire();
-				}
-			});
-		});
-	}
-
-	// height/width overflow pass
-	if ( elem.nodeType === 1 && ( "height" in props || "width" in props ) ) {
-		// Make sure that nothing sneaks out
-		// Record all 3 overflow attributes because IE does not
-		// change the overflow attribute when overflowX and
-		// overflowY are set to the same value
-		opts.overflow = [ style.overflow, style.overflowX, style.overflowY ];
-
-		// Set display property to inline-block for height/width
-		// animations on inline elements that are having width/height animated
-		if ( jQuery.css( elem, "display" ) === "inline" &&
-				jQuery.css( elem, "float" ) === "none" ) {
-
-			// inline-level elements accept inline-block;
-			// block-level elements need to be inline with layout
-			if ( !jQuery.support.inlineBlockNeedsLayout || css_defaultDisplay( elem.nodeName ) === "inline" ) {
-				style.display = "inline-block";
-
-			} else {
-				style.zoom = 1;
-			}
-		}
-	}
-
-	if ( opts.overflow ) {
-		style.overflow = "hidden";
-		if ( !jQuery.support.shrinkWrapBlocks ) {
-			anim.always(function() {
-				style.overflow = opts.overflow[ 0 ];
-				style.overflowX = opts.overflow[ 1 ];
-				style.overflowY = opts.overflow[ 2 ];
-			});
-		}
-	}
-
-
-	// show/hide pass
-	for ( index in props ) {
-		value = props[ index ];
-		if ( rfxtypes.exec( value ) ) {
-			delete props[ index ];
-			toggle = toggle || value === "toggle";
-			if ( value === ( hidden ? "hide" : "show" ) ) {
-				continue;
-			}
-			handled.push( index );
-		}
-	}
-
-	length = handled.length;
-	if ( length ) {
-		dataShow = jQuery._data( elem, "fxshow" ) || jQuery._data( elem, "fxshow", {} );
-		if ( "hidden" in dataShow ) {
-			hidden = dataShow.hidden;
-		}
-
-		// store state if its toggle - enables .stop().toggle() to "reverse"
-		if ( toggle ) {
-			dataShow.hidden = !hidden;
-		}
-		if ( hidden ) {
-			jQuery( elem ).show();
-		} else {
-			anim.done(function() {
-				jQuery( elem ).hide();
-			});
-		}
-		anim.done(function() {
-			var prop;
-			jQuery._removeData( elem, "fxshow" );
-			for ( prop in orig ) {
-				jQuery.style( elem, prop, orig[ prop ] );
-			}
-		});
-		for ( index = 0 ; index < length ; index++ ) {
-			prop = handled[ index ];
-			tween = anim.createTween( prop, hidden ? dataShow[ prop ] : 0 );
-			orig[ prop ] = dataShow[ prop ] || jQuery.style( elem, prop );
-
-			if ( !( prop in dataShow ) ) {
-				dataShow[ prop ] = tween.start;
-				if ( hidden ) {
-					tween.end = tween.start;
-					tween.start = prop === "width" || prop === "height" ? 1 : 0;
-				}
-			}
-		}
-	}
-}
-
-function Tween( elem, options, prop, end, easing ) {
-	return new Tween.prototype.init( elem, options, prop, end, easing );
-}
-jQuery.Tween = Tween;
-
-Tween.prototype = {
-	constructor: Tween,
-	init: function( elem, options, prop, end, easing, unit ) {
-		this.elem = elem;
-		this.prop = prop;
-		this.easing = easing || "swing";
-		this.options = options;
-		this.start = this.now = this.cur();
-		this.end = end;
-		this.unit = unit || ( jQuery.cssNumber[ prop ] ? "" : "px" );
-	},
-	cur: function() {
-		var hooks = Tween.propHooks[ this.prop ];
-
-		return hooks && hooks.get ?
-			hooks.get( this ) :
-			Tween.propHooks._default.get( this );
-	},
-	run: function( percent ) {
-		var eased,
-			hooks = Tween.propHooks[ this.prop ];
-
-		if ( this.options.duration ) {
-			this.pos = eased = jQuery.easing[ this.easing ](
-				percent, this.options.duration * percent, 0, 1, this.options.duration
-			);
-		} else {
-			this.pos = eased = percent;
-		}
-		this.now = ( this.end - this.start ) * eased + this.start;
-
-		if ( this.options.step ) {
-			this.options.step.call( this.elem, this.now, this );
-		}
-
-		if ( hooks && hooks.set ) {
-			hooks.set( this );
-		} else {
-			Tween.propHooks._default.set( this );
-		}
-		return this;
-	}
-};
-
-Tween.prototype.init.prototype = Tween.prototype;
-
-Tween.propHooks = {
-	_default: {
-		get: function( tween ) {
-			var result;
-
-			if ( tween.elem[ tween.prop ] != null &&
-				(!tween.elem.style || tween.elem.style[ tween.prop ] == null) ) {
-				return tween.elem[ tween.prop ];
-			}
-
-			// passing an empty string as a 3rd parameter to .css will automatically
-			// attempt a parseFloat and fallback to a string if the parse fails
-			// so, simple values such as "10px" are parsed to Float.
-			// complex values such as "rotate(1rad)" are returned as is.
-			result = jQuery.css( tween.elem, tween.prop, "" );
-			// Empty strings, null, undefined and "auto" are converted to 0.
-			return !result || result === "auto" ? 0 : result;
-		},
-		set: function( tween ) {
-			// use step hook for back compat - use cssHook if its there - use .style if its
-			// available and use plain properties where available
-			if ( jQuery.fx.step[ tween.prop ] ) {
-				jQuery.fx.step[ tween.prop ]( tween );
-			} else if ( tween.elem.style && ( tween.elem.style[ jQuery.cssProps[ tween.prop ] ] != null || jQuery.cssHooks[ tween.prop ] ) ) {
-				jQuery.style( tween.elem, tween.prop, tween.now + tween.unit );
-			} else {
-				tween.elem[ tween.prop ] = tween.now;
-			}
-		}
-	}
-};
-
-// Remove in 2.0 - this supports IE8's panic based approach
-// to setting things on disconnected nodes
-
-Tween.propHooks.scrollTop = Tween.propHooks.scrollLeft = {
-	set: function( tween ) {
-		if ( tween.elem.nodeType && tween.elem.parentNode ) {
-			tween.elem[ tween.prop ] = tween.now;
-		}
-	}
-};
-
-jQuery.each([ "toggle", "show", "hide" ], function( i, name ) {
-	var cssFn = jQuery.fn[ name ];
-	jQuery.fn[ name ] = function( speed, easing, callback ) {
-		return speed == null || typeof speed === "boolean" ?
-			cssFn.apply( this, arguments ) :
-			this.animate( genFx( name, true ), speed, easing, callback );
-	};
-});
-
-jQuery.fn.extend({
-	fadeTo: function( speed, to, easing, callback ) {
-
-		// show any hidden elements after setting opacity to 0
-		return this.filter( isHidden ).css( "opacity", 0 ).show()
-
-			// animate to the value specified
-			.end().animate({ opacity: to }, speed, easing, callback );
-	},
-	animate: function( prop, speed, easing, callback ) {
-		var empty = jQuery.isEmptyObject( prop ),
-			optall = jQuery.speed( speed, easing, callback ),
-			doAnimation = function() {
-				// Operate on a copy of prop so per-property easing won't be lost
-				var anim = Animation( this, jQuery.extend( {}, prop ), optall );
-				doAnimation.finish = function() {
-					anim.stop( true );
-				};
-				// Empty animations, or finishing resolves immediately
-				if ( empty || jQuery._data( this, "finish" ) ) {
-					anim.stop( true );
-				}
-			};
-			doAnimation.finish = doAnimation;
-
-		return empty || optall.queue === false ?
-			this.each( doAnimation ) :
-			this.queue( optall.queue, doAnimation );
-	},
-	stop: function( type, clearQueue, gotoEnd ) {
-		var stopQueue = function( hooks ) {
-			var stop = hooks.stop;
-			delete hooks.stop;
-			stop( gotoEnd );
-		};
-
-		if ( typeof type !== "string" ) {
-			gotoEnd = clearQueue;
-			clearQueue = type;
-			type = undefined;
-		}
-		if ( clearQueue && type !== false ) {
-			this.queue( type || "fx", [] );
-		}
-
-		return this.each(function() {
-			var dequeue = true,
-				index = type != null && type + "queueHooks",
-				timers = jQuery.timers,
-				data = jQuery._data( this );
-
-			if ( index ) {
-				if ( data[ index ] && data[ index ].stop ) {
-					stopQueue( data[ index ] );
-				}
-			} else {
-				for ( index in data ) {
-					if ( data[ index ] && data[ index ].stop && rrun.test( index ) ) {
-						stopQueue( data[ index ] );
-					}
-				}
-			}
-
-			for ( index = timers.length; index--; ) {
-				if ( timers[ index ].elem === this && (type == null || timers[ index ].queue === type) ) {
-					timers[ index ].anim.stop( gotoEnd );
-					dequeue = false;
-					timers.splice( index, 1 );
-				}
-			}
-
-			// start the next in the queue if the last step wasn't forced
-			// timers currently will call their complete callbacks, which will dequeue
-			// but only if they were gotoEnd
-			if ( dequeue || !gotoEnd ) {
-				jQuery.dequeue( this, type );
-			}
-		});
-	},
-	finish: function( type ) {
-		if ( type !== false ) {
-			type = type || "fx";
-		}
-		return this.each(function() {
-			var index,
-				data = jQuery._data( this ),
-				queue = data[ type + "queue" ],
-				hooks = data[ type + "queueHooks" ],
-				timers = jQuery.timers,
-				length = queue ? queue.length : 0;
-
-			// enable finishing flag on private data
-			data.finish = true;
-
-			// empty the queue first
-			jQuery.queue( this, type, [] );
-
-			if ( hooks && hooks.cur && hooks.cur.finish ) {
-				hooks.cur.finish.call( this );
-			}
-
-			// look for any active animations, and finish them
-			for ( index = timers.length; index--; ) {
-				if ( timers[ index ].elem === this && timers[ index ].queue === type ) {
-					timers[ index ].anim.stop( true );
-					timers.splice( index, 1 );
-				}
-			}
-
-			// look for any animations in the old queue and finish them
-			for ( index = 0; index < length; index++ ) {
-				if ( queue[ index ] && queue[ index ].finish ) {
-					queue[ index ].finish.call( this );
-				}
-			}
-
-			// turn off finishing flag
-			delete data.finish;
-		});
-	}
-});
-
-// Generate parameters to create a standard animation
-function genFx( type, includeWidth ) {
-	var which,
-		attrs = { height: type },
-		i = 0;
-
-	// if we include width, step value is 1 to do all cssExpand values,
-	// if we don't include width, step value is 2 to skip over Left and Right
-	includeWidth = includeWidth? 1 : 0;
-	for( ; i < 4 ; i += 2 - includeWidth ) {
-		which = cssExpand[ i ];
-		attrs[ "margin" + which ] = attrs[ "padding" + which ] = type;
-	}
-
-	if ( includeWidth ) {
-		attrs.opacity = attrs.width = type;
-	}
-
-	return attrs;
-}
-
-// Generate shortcuts for custom animations
-jQuery.each({
-	slideDown: genFx("show"),
-	slideUp: genFx("hide"),
-	slideToggle: genFx("toggle"),
-	fadeIn: { opacity: "show" },
-	fadeOut: { opacity: "hide" },
-	fadeToggle: { opacity: "toggle" }
-}, function( name, props ) {
-	jQuery.fn[ name ] = function( speed, easing, callback ) {
-		return this.animate( props, speed, easing, callback );
-	};
-});
-
-jQuery.speed = function( speed, easing, fn ) {
-	var opt = speed && typeof speed === "object" ? jQuery.extend( {}, speed ) : {
-		complete: fn || !fn && easing ||
-			jQuery.isFunction( speed ) && speed,
-		duration: speed,
-		easing: fn && easing || easing && !jQuery.isFunction( easing ) && easing
-	};
-
-	opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration :
-		opt.duration in jQuery.fx.speeds ? jQuery.fx.speeds[ opt.duration ] : jQuery.fx.speeds._default;
-
-	// normalize opt.queue - true/undefined/null -> "fx"
-	if ( opt.queue == null || opt.queue === true ) {
-		opt.queue = "fx";
-	}
-
-	// Queueing
-	opt.old = opt.complete;
-
-	opt.complete = function() {
-		if ( jQuery.isFunction( opt.old ) ) {
-			opt.old.call( this );
-		}
-
-		if ( opt.queue ) {
-			jQuery.dequeue( this, opt.queue );
-		}
-	};
-
-	return opt;
-};
-
-jQuery.easing = {
-	linear: function( p ) {
-		return p;
-	},
-	swing: function( p ) {
-		return 0.5 - Math.cos( p*Math.PI ) / 2;
-	}
-};
-
-jQuery.timers = [];
-jQuery.fx = Tween.prototype.init;
-jQuery.fx.tick = function() {
-	var timer,
-		timers = jQuery.timers,
-		i = 0;
-
-	fxNow = jQuery.now();
-
-	for ( ; i < timers.length; i++ ) {
-		timer = timers[ i ];
-		// Checks the timer has not already been removed
-		if ( !timer() && timers[ i ] === timer ) {
-			timers.splice( i--, 1 );
-		}
-	}
-
-	if ( !timers.length ) {
-		jQuery.fx.stop();
-	}
-	fxNow = undefined;
-};
-
-jQuery.fx.timer = function( timer ) {
-	if ( timer() && jQuery.timers.push( timer ) ) {
-		jQuery.fx.start();
-	}
-};
-
-jQuery.fx.interval = 13;
-
-jQuery.fx.start = function() {
-	if ( !timerId ) {
-		timerId = setInterval( jQuery.fx.tick, jQuery.fx.interval );
-	}
-};
-
-jQuery.fx.stop = function() {
-	clearInterval( timerId );
-	timerId = null;
-};
-
-jQuery.fx.speeds = {
-	slow: 600,
-	fast: 200,
-	// Default speed
-	_default: 400
-};
-
-// Back Compat <1.8 extension point
-jQuery.fx.step = {};
-
-if ( jQuery.expr && jQuery.expr.filters ) {
-	jQuery.expr.filters.animated = function( elem ) {
-		return jQuery.grep(jQuery.timers, function( fn ) {
-			return elem === fn.elem;
-		}).length;
-	};
-}
-jQuery.fn.offset = function( options ) {
-	if ( arguments.length ) {
-		return options === undefined ?
-			this :
-			this.each(function( i ) {
-				jQuery.offset.setOffset( this, options, i );
-			});
-	}
-
-	var docElem, win,
-		box = { top: 0, left: 0 },
-		elem = this[ 0 ],
-		doc = elem && elem.ownerDocument;
-
-	if ( !doc ) {
-		return;
-	}
-
-	docElem = doc.documentElement;
-
-	// Make sure it's not a disconnected DOM node
-	if ( !jQuery.contains( docElem, elem ) ) {
-		return box;
-	}
-
-	// If we don't have gBCR, just use 0,0 rather than error
-	// BlackBerry 5, iOS 3 (original iPhone)
-	if ( typeof elem.getBoundingClientRect !== core_strundefined ) {
-		box = elem.getBoundingClientRect();
-	}
-	win = getWindow( doc );
-	return {
-		top: box.top  + ( win.pageYOffset || docElem.scrollTop )  - ( docElem.clientTop  || 0 ),
-		left: box.left + ( win.pageXOffset || docElem.scrollLeft ) - ( docElem.clientLeft || 0 )
-	};
-};
-
-jQuery.offset = {
-
-	setOffset: function( elem, options, i ) {
-		var position = jQuery.css( elem, "position" );
-
-		// set position first, in-case top/left are set even on static elem
-		if ( position === "static" ) {
-			elem.style.position = "relative";
-		}
-
-		var curElem = jQuery( elem ),
-			curOffset = curElem.offset(),
-			curCSSTop = jQuery.css( elem, "top" ),
-			curCSSLeft = jQuery.css( elem, "left" ),
-			calculatePosition = ( position === "absolute" || position === "fixed" ) && jQuery.inArray("auto", [curCSSTop, curCSSLeft]) > -1,
-			props = {}, curPosition = {}, curTop, curLeft;
-
-		// need to be able to calculate position if either top or left is auto and position is either absolute or fixed
-		if ( calculatePosition ) {
-			curPosition = curElem.position();
-			curTop = curPosition.top;
-			curLeft = curPosition.left;
-		} else {
-			curTop = parseFloat( curCSSTop ) || 0;
-			curLeft = parseFloat( curCSSLeft ) || 0;
-		}
-
-		if ( jQuery.isFunction( options ) ) {
-			options = options.call( elem, i, curOffset );
-		}
-
-		if ( options.top != null ) {
-			props.top = ( options.top - curOffset.top ) + curTop;
-		}
-		if ( options.left != null ) {
-			props.left = ( options.left - curOffset.left ) + curLeft;
-		}
-
-		if ( "using" in options ) {
-			options.using.call( elem, props );
-		} else {
-			curElem.css( props );
-		}
-	}
-};
-
-
-jQuery.fn.extend({
-
-	position: function() {
-		if ( !this[ 0 ] ) {
-			return;
-		}
-
-		var offsetParent, offset,
-			parentOffset = { top: 0, left: 0 },
-			elem = this[ 0 ];
-
-		// fixed elements are offset from window (parentOffset = {top:0, left: 0}, because it is it's only offset parent
-		if ( jQuery.css( elem, "position" ) === "fixed" ) {
-			// we assume that getBoundingClientRect is available when computed position is fixed
-			offset = elem.getBoundingClientRect();
-		} else {
-			// Get *real* offsetParent
-			offsetParent = this.offsetParent();
-
-			// Get correct offsets
-			offset = this.offset();
-			if ( !jQuery.nodeName( offsetParent[ 0 ], "html" ) ) {
-				parentOffset = offsetParent.offset();
-			}
-
-			// Add offsetParent borders
-			parentOffset.top  += jQuery.css( offsetParent[ 0 ], "borderTopWidth", true );
-			parentOffset.left += jQuery.css( offsetParent[ 0 ], "borderLeftWidth", true );
-		}
-
-		// Subtract parent offsets and element margins
-		// note: when an element has margin: auto the offsetLeft and marginLeft
-		// are the same in Safari causing offset.left to incorrectly be 0
-		return {
-			top:  offset.top  - parentOffset.top - jQuery.css( elem, "marginTop", true ),
-			left: offset.left - parentOffset.left - jQuery.css( elem, "marginLeft", true)
-		};
-	},
-
-	offsetParent: function() {
-		return this.map(function() {
-			var offsetParent = this.offsetParent || document.documentElement;
-			while ( offsetParent && ( !jQuery.nodeName( offsetParent, "html" ) && jQuery.css( offsetParent, "position") === "static" ) ) {
-				offsetParent = offsetParent.offsetParent;
-			}
-			return offsetParent || document.documentElement;
-		});
-	}
-});
-
-
-// Create scrollLeft and scrollTop methods
-jQuery.each( {scrollLeft: "pageXOffset", scrollTop: "pageYOffset"}, function( method, prop ) {
-	var top = /Y/.test( prop );
-
-	jQuery.fn[ method ] = function( val ) {
-		return jQuery.access( this, function( elem, method, val ) {
-			var win = getWindow( elem );
-
-			if ( val === undefined ) {
-				return win ? (prop in win) ? win[ prop ] :
-					win.document.documentElement[ method ] :
-					elem[ method ];
-			}
-
-			if ( win ) {
-				win.scrollTo(
-					!top ? val : jQuery( win ).scrollLeft(),
-					top ? val : jQuery( win ).scrollTop()
-				);
-
-			} else {
-				elem[ method ] = val;
-			}
-		}, method, val, arguments.length, null );
-	};
-});
-
-function getWindow( elem ) {
-	return jQuery.isWindow( elem ) ?
-		elem :
-		elem.nodeType === 9 ?
-			elem.defaultView || elem.parentWindow :
-			false;
-}
-// Create innerHeight, innerWidth, height, width, outerHeight and outerWidth methods
-jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
-	jQuery.each( { padding: "inner" + name, content: type, "": "outer" + name }, function( defaultExtra, funcName ) {
-		// margin is only for outerHeight, outerWidth
-		jQuery.fn[ funcName ] = function( margin, value ) {
-			var chainable = arguments.length && ( defaultExtra || typeof margin !== "boolean" ),
-				extra = defaultExtra || ( margin === true || value === true ? "margin" : "border" );
-
-			return jQuery.access( this, function( elem, type, value ) {
-				var doc;
-
-				if ( jQuery.isWindow( elem ) ) {
-					// As of 5/8/2012 this will yield incorrect results for Mobile Safari, but there
-					// isn't a whole lot we can do. See pull request at this URL for discussion:
-					// https://github.com/jquery/jquery/pull/764
-					return elem.document.documentElement[ "client" + name ];
-				}
-
-				// Get document width or height
-				if ( elem.nodeType === 9 ) {
-					doc = elem.documentElement;
-
-					// Either scroll[Width/Height] or offset[Width/Height] or client[Width/Height], whichever is greatest
-					// unfortunately, this causes bug #3838 in IE6/8 only, but there is currently no good, small way to fix it.
-					return Math.max(
-						elem.body[ "scroll" + name ], doc[ "scroll" + name ],
-						elem.body[ "offset" + name ], doc[ "offset" + name ],
-						doc[ "client" + name ]
-					);
-				}
-
-				return value === undefined ?
-					// Get width or height on the element, requesting but not forcing parseFloat
-					jQuery.css( elem, type, extra ) :
-
-					// Set width or height on the element
-					jQuery.style( elem, type, value, extra );
-			}, type, chainable ? margin : undefined, chainable, null );
-		};
-	});
-});
-// Limit scope pollution from any deprecated API
-// (function() {
-
-// })();
-// Expose jQuery to the global object
-window.jQuery = window.$ = jQuery;
-
-// Expose jQuery as an AMD module, but only for AMD loaders that
-// understand the issues with loading multiple versions of jQuery
-// in a page that all might call define(). The loader will indicate
-// they have special allowances for multiple jQuery versions by
-// specifying define.amd.jQuery = true. Register as a named module,
-// since jQuery can be concatenated with other files that may use define,
-// but not use a proper concatenation script that understands anonymous
-// AMD modules. A named AMD is safest and most robust way to register.
-// Lowercase jquery is used because AMD module names are derived from
-// file names, and jQuery is normally delivered in a lowercase file name.
-// Do this after creating the global so that if an AMD module wants to call
-// noConflict to hide this version of jQuery, it will work.
-if ( typeof define === "function" && define.amd && define.amd.jQuery ) {
-	define( "jquery", [], function () { return jQuery; } );
-}
-
-})( window );
\ No newline at end of file
diff --git a/#pma/js/jquery/src/jquery/sizzle/test/unit/extending.js b/#pma/js/jquery/src/jquery/sizzle/test/unit/extending.js
deleted file mode 100644
index 4b4c6e84..00000000
--- a/#pma/js/jquery/src/jquery/sizzle/test/unit/extending.js
+++ /dev/null
@@ -1,95 +0,0 @@
-module("extending", { teardown: moduleTeardown });
-
-test("custom pseudos", function() {
-	expect( 6 );
-
-	Sizzle.selectors.filters.foundation = Sizzle.selectors.filters.root;
-	deepEqual( Sizzle(":foundation"), [ document.documentElement ], "Copy element filter with new name" );
-	delete Sizzle.selectors.filters.foundation;
-
-	Sizzle.selectors.setFilters.primary = Sizzle.selectors.setFilters.first;
-	t( "Copy set filter with new name", "div:primary", ["qunit"] );
-	delete Sizzle.selectors.setFilters.primary;
-
-	Sizzle.selectors.filters.aristotlean = Sizzle.selectors.createPseudo(function() {
-		return function( elem ) {
-			return !!elem.id;
-		};
-	});
-	t( "Custom element filter", "#foo :aristotlean", [ "sndp", "en", "yahoo", "sap", "anchor2", "simon" ] );
-	delete Sizzle.selectors.filters.aristotlean;
-
-	Sizzle.selectors.filters.endswith = Sizzle.selectors.createPseudo(function( text ) {
-		return function( elem ) {
-			return Sizzle.getText( elem ).slice( -text.length ) === text;
-		};
-	});
-	t( "Custom element filter with argument", "a:endswith(ogle)", ["google"] );
-	delete Sizzle.selectors.filters.endswith;
-
-	Sizzle.selectors.setFilters.second = Sizzle.selectors.createPseudo(function() {
-		return Sizzle.selectors.createPseudo(function( seed, matches ) {
-			if ( seed[1] ) {
-				matches[1] = seed[1];
-				seed[1] = false;
-			}
-		});
-	});
-	t( "Custom set filter", "#qunit-fixture p:second", ["ap"] );
-	delete Sizzle.selectors.filters.second;
-
-	Sizzle.selectors.setFilters.slice = Sizzle.selectors.createPseudo(function( argument ) {
-		var bounds = argument.split(":");
-		return Sizzle.selectors.createPseudo(function( seed, matches ) {
-			var i = bounds[1];
-
-			// Match elements found at the specified indexes
-			while ( --i >= bounds[0] ) {
-				if ( seed[i] ) {
-					matches[i] = seed[i];
-					seed[i] = false;
-				}
-			}
-		});
-	});
-	t( "Custom set filter with argument", "#qunit-fixture p:slice(1:3)", [ "ap", "sndp" ] );
-	delete Sizzle.selectors.filters.slice;
-});
-
-test("backwards-compatible custom pseudos", function() {
-	expect( 3 );
-
-	Sizzle.selectors.filters.icontains = function( elem, i, match ) {
-		return Sizzle.getText( elem ).toLowerCase().indexOf( (match[3] || "").toLowerCase() ) > -1;
-	};
-	t( "Custom element filter with argument", "a:icontains(THIS BLOG ENTRY)", ["simon1"] );
-	delete Sizzle.selectors.filters.icontains;
-
-	Sizzle.selectors.setFilters.podium = function( elements, argument ) {
-		var count = argument == null || argument === "" ? 3 : +argument;
-		return elements.slice( 0, count );
-	};
-	// Using TAG as the first token here forces this setMatcher into a fail state
-	// Where the descendent combinator was lost
-	t( "Custom setFilter", "form#form :PODIUM", ["label-for", "text1", "text2"] );
-	t( "Custom setFilter with argument", "#form input:Podium(1)", ["text1"] );
-	delete Sizzle.selectors.setFilters.podium;
-});
-
-test("custom attribute getters", function() {
-	expect( 2 );
-
-	var original = Sizzle.selectors.attrHandle.hreflang,
-		selector = "a:contains('mark')[hreflang='http://diveintomark.org/en']";
-
-	Sizzle.selectors.attrHandle.hreflang = function( elem, name ) {
-		var href = elem.getAttribute("href"),
-			lang = elem.getAttribute( name );
-		return lang && ( href + lang );
-	};
-
-	deepEqual( Sizzle(selector, createWithFriesXML()), [], "Custom attrHandle (preferred document)" );
-	t( "Custom attrHandle (preferred document)", selector, ["mark"] );
-
-	Sizzle.selectors.attrHandle.hreflang = original;
-});
diff --git a/#pma/js/jquery/src/jquery/sizzle/test/unit/selector.js b/#pma/js/jquery/src/jquery/sizzle/test/unit/selector.js
deleted file mode 100644
index db5ca7f0..00000000
--- a/#pma/js/jquery/src/jquery/sizzle/test/unit/selector.js
+++ /dev/null
@@ -1,1149 +0,0 @@
-module("selector", { teardown: moduleTeardown });
-
-// #### NOTE: ####
-// jQuery should not be used in this module
-// except for DOM manipulation
-// If jQuery is mandatory for the selection, move the test to jquery/test/unit/selector.js
-// Use t() or Sizzle()
-// ###############
-
-/*
-	======== QUnit Reference ========
-	http://docs.jquery.com/QUnit
-
-	Test methods:
-		expect(numAssertions)
-		stop()
-		start()
-			note: QUnit's eventual addition of an argument to stop/start is ignored in this test suite
-			so that start and stop can be passed as callbacks without worrying about
-				their parameters
-	Test assertions:
-		ok(value, [message])
-		equal(actual, expected, [message])
-		notEqual(actual, expected, [message])
-		deepEqual(actual, expected, [message])
-		notDeepEqual(actual, expected, [message])
-		strictEqual(actual, expected, [message])
-		notStrictEqual(actual, expected, [message])
-		raises(block, [expected], [message])
-
-	======== testinit.js reference ========
-	See data/testinit.js
-
-	q(...);
-		Returns an array of elements with the given IDs
-		@example q("main", "foo", "bar") => [<div id="main">, <span id="foo">, <input id="bar">]
-
-	t( testName, selector, [ "array", "of", "ids" ] );
-		Asserts that a select matches the given IDs
-		@example t("Check for something", "//[a]", ["foo", "baar"]);
-
-	url( "some/url.php" );
-		Add random number to url to stop caching
-		@example url("data/test.html") => "data/test.html?10538358428943"
-		@example url("data/test.php?foo=bar") => "data/test.php?foo=bar&10538358345554"
-*/
-
-test("element", function() {
-	expect( 39 );
-
-	var form, all, good, i, obj1, lengthtest,
-		siblingTest, siblingNext, iframe, iframeDoc, html;
-
-	equal( Sizzle("").length, 0, "Empty selector returns an empty array" );
-	deepEqual( Sizzle("div", document.createTextNode("")), [], "Text element as context fails silently" );
-	form = document.getElementById("form");
-	ok( !Sizzle.matchesSelector( form, "" ), "Empty string passed to matchesSelector does not match" );
-	equal( Sizzle(" ").length, 0, "Empty selector returns an empty array" );
-	equal( Sizzle("\t").length, 0, "Empty selector returns an empty array" );
-
-	ok( Sizzle("*").length >= 30, "Select all" );
-	all = Sizzle("*");
-	good = true;
-	for ( i = 0; i < all.length; i++ ) {
-		if ( all[i].nodeType === 8 ) {
-			good = false;
-		}
-	}
-	ok( good, "Select all elements, no comment nodes" );
-	t( "Element Selector", "html", ["html"] );
-	t( "Element Selector", "body", ["body"] );
-	t( "Element Selector", "#qunit-fixture p", ["firstp","ap","sndp","en","sap","first"] );
-
-	t( "Leading space", " #qunit-fixture p", ["firstp","ap","sndp","en","sap","first"] );
-	t( "Leading tab", "\t#qunit-fixture p", ["firstp","ap","sndp","en","sap","first"] );
-	t( "Leading carriage return", "\r#qunit-fixture p", ["firstp","ap","sndp","en","sap","first"] );
-	t( "Leading line feed", "\n#qunit-fixture p", ["firstp","ap","sndp","en","sap","first"] );
-	t( "Leading form feed", "\f#qunit-fixture p", ["firstp","ap","sndp","en","sap","first"] );
-	t( "Trailing space", "#qunit-fixture p ", ["firstp","ap","sndp","en","sap","first"] );
-	t( "Trailing tab", "#qunit-fixture p\t", ["firstp","ap","sndp","en","sap","first"] );
-	t( "Trailing carriage return", "#qunit-fixture p\r", ["firstp","ap","sndp","en","sap","first"] );
-	t( "Trailing line feed", "#qunit-fixture p\n", ["firstp","ap","sndp","en","sap","first"] );
-	t( "Trailing form feed", "#qunit-fixture p\f", ["firstp","ap","sndp","en","sap","first"] );
-
-	t( "Parent Element", "dl ol", ["empty", "listWithTabIndex"] );
-	t( "Parent Element (non-space descendant combinator)", "dl\tol", ["empty", "listWithTabIndex"] );
-	obj1 = document.getElementById("object1");
-	equal( Sizzle("param", obj1).length, 2, "Object/param as context" );
-
-	deepEqual( Sizzle("select", form), q("select1","select2","select3","select4","select5"), "Finding selects with a context." );
-
-	// Check for unique-ness and sort order
-	deepEqual( Sizzle("p, div p"), Sizzle("p"), "Check for duplicates: p, div p" );
-
-	t( "Checking sort order", "h2, h1", ["qunit-header", "qunit-banner", "qunit-userAgent"] );
-	t( "Checking sort order", "h2:first, h1:first", ["qunit-header", "qunit-banner"] );
-	t( "Checking sort order", "#qunit-fixture p, #qunit-fixture p a", ["firstp", "simon1", "ap", "google", "groups", "anchor1", "mark", "sndp", "en", "yahoo", "sap", "anchor2", "simon", "first"] );
-
-	// Test Conflict ID
-	lengthtest = document.getElementById("lengthtest");
-	deepEqual( Sizzle("#idTest", lengthtest), q("idTest"), "Finding element with id of ID." );
-	deepEqual( Sizzle("[name='id']", lengthtest), q("idTest"), "Finding element with id of ID." );
-	deepEqual( Sizzle("input[id='idTest']", lengthtest), q("idTest"), "Finding elements with id of ID." );
-
-	siblingTest = document.getElementById("siblingTest");
-	deepEqual( Sizzle("div em", siblingTest), [], "Element-rooted QSA does not select based on document context" );
-	deepEqual( Sizzle("div em, div em, div em:not(div em)", siblingTest), [], "Element-rooted QSA does not select based on document context" );
-	deepEqual( Sizzle("div em, em\\,", siblingTest), [], "Escaped commas do not get treated with an id in element-rooted QSA" );
-
-	siblingNext = document.getElementById("siblingnext");
-	document.createDocumentFragment().appendChild( siblingTest );
-	deepEqual( Sizzle( "em + :not(:has(*)):not(:empty), foo", siblingTest ), [ siblingNext ],
-		"Non-qSA path correctly sets detached context for sibling selectors (jQuery #14351)" );
-
-	iframe = document.getElementById("iframe"),
-		iframeDoc = iframe.contentDocument || iframe.contentWindow.document;
-	iframeDoc.open();
-	iframeDoc.write("<body><p id='foo'>bar</p></body>");
-	iframeDoc.close();
-	deepEqual(
-		Sizzle( "p:contains(bar)", iframeDoc ),
-		[ iframeDoc.getElementById("foo") ],
-		"Other document as context"
-	);
-
-	html = "";
-	for ( i = 0; i < 100; i++ ) {
-		html = "<div>" + html + "</div>";
-	}
-	html = jQuery( html ).appendTo( document.body );
-	ok( !!Sizzle("body div div div").length, "No stack or performance problems with large amounts of descendents" );
-	ok( !!Sizzle("body>div div div").length, "No stack or performance problems with large amounts of descendents" );
-	html.remove();
-
-	// Real use case would be using .watch in browsers with window.watch (see Issue #157)
-	q("qunit-fixture")[0].appendChild( document.createElement("toString") ).id = "toString";
-	t( "Element name matches Object.prototype property", "toString#toString", ["toString"] );
-});
-
-test("XML Document Selectors", function() {
-	var xml = createWithFriesXML();
-	expect( 11 );
-
-	equal( Sizzle("foo_bar", xml).length, 1, "Element Selector with underscore" );
-	equal( Sizzle(".component", xml).length, 1, "Class selector" );
-	equal( Sizzle("[class*=component]", xml).length, 1, "Attribute selector for class" );
-	equal( Sizzle("property[name=prop2]", xml).length, 1, "Attribute selector with name" );
-	equal( Sizzle("[name=prop2]", xml).length, 1, "Attribute selector with name" );
-	equal( Sizzle("#seite1", xml).length, 1, "Attribute selector with ID" );
-	equal( Sizzle("component#seite1", xml).length, 1, "Attribute selector with ID" );
-	equal( Sizzle.matches( "#seite1", Sizzle("component", xml) ).length, 1, "Attribute selector filter with ID" );
-	equal( Sizzle("meta property thing", xml).length, 2, "Descendent selector and dir caching" );
-	ok( Sizzle.matchesSelector( xml.lastChild, "soap\\:Envelope" ), "Check for namespaced element" );
-
-	xml = jQuery.parseXML("<?xml version='1.0' encoding='UTF-8'?><root><elem id='1'/></root>");
-	equal( Sizzle( "elem:not(:has(*))", xml ).length, 1,
-		"Non-qSA path correctly handles numeric ids (jQuery #14142)" );
-});
-
-test("broken", function() {
-	expect( 26 );
-
-	var attrbad,
-		broken = function( name, selector ) {
-			throws(function() {
-				// Setting context to null here somehow avoids QUnit's window.error handling
-				// making the e & e.message correct
-				// For whatever reason, without this,
-				// Sizzle.error will be called but no error will be seen in oldIE
-				Sizzle.call( null, selector );
-			}, function( e ) {
-				return e.message.indexOf("Syntax error") >= 0;
-			}, name + ": " + selector );
-		};
-
-	broken( "Broken Selector", "[" );
-	broken( "Broken Selector", "(" );
-	broken( "Broken Selector", "{" );
-	broken( "Broken Selector", "<" );
-	broken( "Broken Selector", "()" );
-	broken( "Broken Selector", "<>" );
-	broken( "Broken Selector", "{}" );
-	broken( "Broken Selector", "," );
-	broken( "Broken Selector", ",a" );
-	broken( "Broken Selector", "a," );
-	// Hangs on IE 9 if regular expression is inefficient
-	broken( "Broken Selector", "[id=012345678901234567890123456789");
-	broken( "Doesn't exist", ":visble" );
-	broken( "Nth-child", ":nth-child" );
-	// Sigh again. IE 9 thinks this is also a real selector
-	// not super critical that we fix this case
-	//broken( "Nth-child", ":nth-child(-)" );
-	// Sigh. WebKit thinks this is a real selector in qSA
-	// They've already fixed this and it'll be coming into
-	// current browsers soon. Currently, Safari 5.0 still has this problem
-	// broken( "Nth-child", ":nth-child(asdf)", [] );
-	broken( "Nth-child", ":nth-child(2n+-0)" );
-	broken( "Nth-child", ":nth-child(2+0)" );
-	broken( "Nth-child", ":nth-child(- 1n)" );
-	broken( "Nth-child", ":nth-child(-1 n)" );
-	broken( "First-child", ":first-child(n)" );
-	broken( "Last-child", ":last-child(n)" );
-	broken( "Only-child", ":only-child(n)" );
-	broken( "Nth-last-last-child", ":nth-last-last-child(1)" );
-	broken( "First-last-child", ":first-last-child" );
-	broken( "Last-last-child", ":last-last-child" );
-	broken( "Only-last-child", ":only-last-child" );
-
-	// Make sure attribute value quoting works correctly. See: #6093
-	attrbad = jQuery("<input type='hidden' value='2' name='foo.baz' id='attrbad1'/><input type='hidden' value='2' name='foo[baz]' id='attrbad2'/>").appendTo("#qunit-fixture");
-
-	broken( "Attribute not escaped", "input[name=foo.baz]", [] );
-	// Shouldn't be matching those inner brackets
-	broken( "Attribute not escaped", "input[name=foo[baz]]", [] );
-});
-
-test("id", function() {
-	expect( 34 );
-
-	var fiddle, a;
-
-	t( "ID Selector", "#body", ["body"] );
-	t( "ID Selector w/ Element", "body#body", ["body"] );
-	t( "ID Selector w/ Element", "ul#first", [] );
-	t( "ID selector with existing ID descendant", "#firstp #simon1", ["simon1"] );
-	t( "ID selector with non-existant descendant", "#firstp #foobar", [] );
-	t( "ID selector using UTF8", "#台北Táiběi", ["台北Táiběi"] );
-	t( "Multiple ID selectors using UTF8", "#台北Táiběi, #台北", ["台北Táiběi","台北"] );
-	t( "Descendant ID selector using UTF8", "div #台北", ["台北"] );
-	t( "Child ID selector using UTF8", "form > #台北", ["台北"] );
-
-	t( "Escaped ID", "#foo\\:bar", ["foo:bar"] );
-	t( "Escaped ID with descendent", "#foo\\:bar span:not(:input)", ["foo_descendent"] );
-	t( "Escaped ID", "#test\\.foo\\[5\\]bar", ["test.foo[5]bar"] );
-	t( "Descendant escaped ID", "div #foo\\:bar", ["foo:bar"] );
-	t( "Descendant escaped ID", "div #test\\.foo\\[5\\]bar", ["test.foo[5]bar"] );
-	t( "Child escaped ID", "form > #foo\\:bar", ["foo:bar"] );
-	t( "Child escaped ID", "form > #test\\.foo\\[5\\]bar", ["test.foo[5]bar"] );
-
-	fiddle = jQuery("<div id='fiddle\\Foo'><span id='fiddleSpan'></span></div>").appendTo("#qunit-fixture");
-	deepEqual( Sizzle( "> span", Sizzle("#fiddle\\\\Foo")[0] ), q([ "fiddleSpan" ]), "Escaped ID as context" );
-	fiddle.remove();
-
-	t( "ID Selector, child ID present", "#form > #radio1", ["radio1"] ); // bug #267
-	t( "ID Selector, not an ancestor ID", "#form #first", [] );
-	t( "ID Selector, not a child ID", "#form > #option1a", [] );
-
-	t( "All Children of ID", "#foo > *", ["sndp", "en", "sap"] );
-	t( "All Children of ID with no children", "#firstUL > *", [] );
-
-	equal( Sizzle("#tName1")[0].id, "tName1", "ID selector with same value for a name attribute" );
-	t( "ID selector non-existing but name attribute on an A tag",         "#tName2",      [] );
-	t( "Leading ID selector non-existing but name attribute on an A tag", "#tName2 span", [] );
-	t( "Leading ID selector existing, retrieving the child",              "#tName1 span", ["tName1-span"] );
-	equal( Sizzle("div > div #tName1")[0].id, Sizzle("#tName1-span")[0].parentNode.id, "Ending with ID" );
-
-	a = jQuery("<a id='backslash\\foo'></a>").appendTo("#qunit-fixture");
-	t( "ID Selector contains backslash", "#backslash\\\\foo", ["backslash\\foo"] );
-
-	t( "ID Selector on Form with an input that has a name of 'id'", "#lengthtest", ["lengthtest"] );
-
-	t( "ID selector with non-existant ancestor", "#asdfasdf #foobar", [] ); // bug #986
-
-	deepEqual( Sizzle("div#form", document.body), [], "ID selector within the context of another element" );
-
-	t( "Underscore ID", "#types_all", ["types_all"] );
-	t( "Dash ID", "#qunit-fixture", ["qunit-fixture"] );
-
-	t( "ID with weird characters in it", "#name\\+value", ["name+value"] );
-});
-
-test("class", function() {
-	expect( 26 );
-
-	t( "Class Selector", ".blog", ["mark","simon"] );
-	t( "Class Selector", ".GROUPS", ["groups"] );
-	t( "Class Selector", ".blog.link", ["simon"] );
-	t( "Class Selector w/ Element", "a.blog", ["mark","simon"] );
-	t( "Parent Class Selector", "p .blog", ["mark","simon"] );
-
-	t( "Class selector using UTF8", ".台北Táiběi", ["utf8class1"] );
-	//t( "Class selector using UTF8", ".台北", ["utf8class1","utf8class2"] );
-	t( "Class selector using UTF8", ".台北Táiběi.台北", ["utf8class1"] );
-	t( "Class selector using UTF8", ".台北Táiběi, .台北", ["utf8class1","utf8class2"] );
-	t( "Descendant class selector using UTF8", "div .台北Táiběi", ["utf8class1"] );
-	t( "Child class selector using UTF8", "form > .台北Táiběi", ["utf8class1"] );
-
-	t( "Escaped Class", ".foo\\:bar", ["foo:bar"] );
-	t( "Escaped Class", ".test\\.foo\\[5\\]bar", ["test.foo[5]bar"] );
-	t( "Descendant escaped Class", "div .foo\\:bar", ["foo:bar"] );
-	t( "Descendant escaped Class", "div .test\\.foo\\[5\\]bar", ["test.foo[5]bar"] );
-	t( "Child escaped Class", "form > .foo\\:bar", ["foo:bar"] );
-	t( "Child escaped Class", "form > .test\\.foo\\[5\\]bar", ["test.foo[5]bar"] );
-
-	var div = document.createElement("div");
-	div.innerHTML = "<div class='test e'></div><div class='test'></div>";
-	deepEqual( Sizzle(".e", div), [ div.firstChild ], "Finding a second class." );
-
-	div.lastChild.className = "e";
-
-	deepEqual( Sizzle(".e", div), [ div.firstChild, div.lastChild ], "Finding a modified class." );
-
-	ok( !Sizzle.matchesSelector( div, ".null"), ".null does not match an element with no class" );
-	ok( !Sizzle.matchesSelector( div.firstChild, ".null div"), ".null does not match an element with no class" );
-	div.className = "null";
-	ok( Sizzle.matchesSelector( div, ".null"), ".null matches element with class 'null'" );
-	ok( Sizzle.matchesSelector( div.firstChild, ".null div"), "caching system respects DOM changes" );
-	ok( !Sizzle.matchesSelector( document, ".foo" ), "testing class on document doesn't error" );
-	ok( !Sizzle.matchesSelector( window, ".foo" ), "testing class on window doesn't error" );
-
-	div.lastChild.className += " hasOwnProperty toString";
-	deepEqual( Sizzle(".e.hasOwnProperty.toString", div), [ div.lastChild ], "Classes match Object.prototype properties" );
-
-	div = jQuery("<div><svg width='200' height='250' version='1.1' xmlns='http://www.w3.org/2000/svg'><rect x='10' y='10' width='30' height='30' class='foo'></rect></svg></div>")[0];
-	equal( Sizzle(".foo", div).length, 1, "Class selector against SVG" );
-});
-
-test("name", function() {
-	expect( 14 );
-
-	var form;
-
-	t( "Name selector", "input[name=action]", ["text1"] );
-	t( "Name selector with single quotes", "input[name='action']", ["text1"] );
-	t( "Name selector with double quotes", "input[name=\"action\"]", ["text1"] );
-
-	t( "Name selector non-input", "[name=example]", ["name-is-example"] );
-	t( "Name selector non-input", "[name=div]", ["name-is-div"] );
-	t( "Name selector non-input", "*[name=iframe]", ["iframe"] );
-
-	t( "Name selector for grouped input", "input[name='types[]']", ["types_all", "types_anime", "types_movie"] );
-
-	form = document.getElementById("form");
-	deepEqual( Sizzle("input[name=action]", form), q("text1"), "Name selector within the context of another element" );
-	deepEqual( Sizzle("input[name='foo[bar]']", form), q("hidden2"), "Name selector for grouped form element within the context of another element" );
-
-	form = jQuery("<form><input name='id'/></form>").appendTo("body");
-	equal( Sizzle("input", form[0]).length, 1, "Make sure that rooted queries on forms (with possible expandos) work." );
-
-	form.remove();
-
-	t( "Find elements that have similar IDs", "[name=tName1]", ["tName1ID"] );
-	t( "Find elements that have similar IDs", "[name=tName2]", ["tName2ID"] );
-	t( "Find elements that have similar IDs", "#tName2ID", ["tName2ID"] );
-
-	t( "Case-sensitivity", "[name=tname1]", [] );
-});
-
-test("multiple", function() {
-	expect(6);
-
-	t( "Comma Support", "h2, #qunit-fixture p", ["qunit-banner","qunit-userAgent","firstp","ap","sndp","en","sap","first"] );
-	t( "Comma Support", "h2 , #qunit-fixture p", ["qunit-banner","qunit-userAgent","firstp","ap","sndp","en","sap","first"] );
-	t( "Comma Support", "h2 , #qunit-fixture p", ["qunit-banner","qunit-userAgent","firstp","ap","sndp","en","sap","first"] );
-	t( "Comma Support", "h2,#qunit-fixture p", ["qunit-banner","qunit-userAgent","firstp","ap","sndp","en","sap","first"] );
-	t( "Comma Support", "h2,#qunit-fixture p ", ["qunit-banner","qunit-userAgent","firstp","ap","sndp","en","sap","first"] );
-	t( "Comma Support", "h2\t,\r#qunit-fixture p\n", ["qunit-banner","qunit-userAgent","firstp","ap","sndp","en","sap","first"] );
-});
-
-test("child and adjacent", function() {
-	expect( 42 );
-
-	var siblingFirst, en, nothiddendiv;
-
-	t( "Child", "p > a", ["simon1","google","groups","mark","yahoo","simon"] );
-	t( "Child", "p> a", ["simon1","google","groups","mark","yahoo","simon"] );
-	t( "Child", "p >a", ["simon1","google","groups","mark","yahoo","simon"] );
-	t( "Child", "p>a", ["simon1","google","groups","mark","yahoo","simon"] );
-	t( "Child w/ Class", "p > a.blog", ["mark","simon"] );
-	t( "All Children", "code > *", ["anchor1","anchor2"] );
-	t( "All Grandchildren", "p > * > *", ["anchor1","anchor2"] );
-	t( "Adjacent", "#qunit-fixture a + a", ["groups", "tName2ID"] );
-	t( "Adjacent", "#qunit-fixture a +a", ["groups", "tName2ID"] );
-	t( "Adjacent", "#qunit-fixture a+ a", ["groups", "tName2ID"] );
-	t( "Adjacent", "#qunit-fixture a+a", ["groups", "tName2ID"] );
-	t( "Adjacent", "p + p", ["ap","en","sap"] );
-	t( "Adjacent", "p#firstp + p", ["ap"] );
-	t( "Adjacent", "p[lang=en] + p", ["sap"] );
-	t( "Adjacent", "a.GROUPS + code + a", ["mark"] );
-	t( "Comma, Child, and Adjacent", "#qunit-fixture a + a, code > a", ["groups","anchor1","anchor2","tName2ID"] );
-	t( "Element Preceded By", "#qunit-fixture p ~ div", ["foo", "nothiddendiv", "moretests","tabindex-tests", "liveHandlerOrder", "siblingTest"] );
-	t( "Element Preceded By", "#first ~ div", ["moretests","tabindex-tests", "liveHandlerOrder", "siblingTest"] );
-	t( "Element Preceded By", "#groups ~ a", ["mark"] );
-	t( "Element Preceded By", "#length ~ input", ["idTest"] );
-	t( "Element Preceded By", "#siblingfirst ~ em", ["siblingnext", "siblingthird"] );
-	t( "Element Preceded By (multiple)", "#siblingTest em ~ em ~ em ~ span", ["siblingspan"] );
-	t( "Element Preceded By, Containing", "#liveHandlerOrder ~ div em:contains('1')", ["siblingfirst"] );
-
-	siblingFirst = document.getElementById("siblingfirst");
-
-	deepEqual( Sizzle("~ em", siblingFirst), q("siblingnext", "siblingthird"), "Element Preceded By with a context." );
-	deepEqual( Sizzle("+ em", siblingFirst), q("siblingnext"), "Element Directly Preceded By with a context." );
-	deepEqual( Sizzle("~ em:first", siblingFirst), q("siblingnext"), "Element Preceded By positional with a context." );
-
-	en = document.getElementById("en");
-	deepEqual( Sizzle("+ p, a", en), q("yahoo", "sap"), "Compound selector with context, beginning with sibling test." );
-	deepEqual( Sizzle("a, + p", en), q("yahoo", "sap"), "Compound selector with context, containing sibling test." );
-
-	t( "Multiple combinators selects all levels", "#siblingTest em *", ["siblingchild", "siblinggrandchild", "siblinggreatgrandchild"] );
-	t( "Multiple combinators selects all levels", "#siblingTest > em *", ["siblingchild", "siblinggrandchild", "siblinggreatgrandchild"] );
-	t( "Multiple sibling combinators doesn't miss general siblings", "#siblingTest > em:first-child + em ~ span", ["siblingspan"] );
-	t( "Combinators are not skipped when mixing general and specific", "#siblingTest > em:contains('x') + em ~ span", [] );
-
-	equal( Sizzle("#listWithTabIndex").length, 1, "Parent div for next test is found via ID (#8310)" );
-	equal( Sizzle("#listWithTabIndex li:eq(2) ~ li").length, 1, "Find by general sibling combinator (#8310)" );
-	equal( Sizzle("#__sizzle__").length, 0, "Make sure the temporary id assigned by sizzle is cleared out (#8310)" );
-	equal( Sizzle("#listWithTabIndex").length, 1, "Parent div for previous test is still found via ID (#8310)" );
-
-	t( "Verify deep class selector", "div.blah > p > a", [] );
-
-	t( "No element deep selector", "div.foo > span > a", [] );
-
-	nothiddendiv = document.getElementById("nothiddendiv");
-	deepEqual( Sizzle("> :first", nothiddendiv), q("nothiddendivchild"), "Verify child context positional selector" );
-	deepEqual( Sizzle("> :eq(0)", nothiddendiv), q("nothiddendivchild"), "Verify child context positional selector" );
-	deepEqual( Sizzle("> *:first", nothiddendiv), q("nothiddendivchild"), "Verify child context positional selector" );
-
-	t( "Non-existant ancestors", ".fototab > .thumbnails > a", [] );
-});
-
-test("attributes", function() {
-	expect( 76 );
-
-	var opt, input, attrbad, div;
-
-	t( "Attribute Exists", "#qunit-fixture a[title]", ["google"] );
-	t( "Attribute Exists (case-insensitive)", "#qunit-fixture a[TITLE]", ["google"] );
-	t( "Attribute Exists", "#qunit-fixture *[title]", ["google"] );
-	t( "Attribute Exists", "#qunit-fixture [title]", ["google"] );
-	t( "Attribute Exists", "#qunit-fixture a[ title ]", ["google"] );
-
-	t( "Boolean attribute exists", "#select2 option[selected]", ["option2d"]);
-	t( "Boolean attribute equals", "#select2 option[selected='selected']", ["option2d"]);
-
-	t( "Attribute Equals", "#qunit-fixture a[rel='bookmark']", ["simon1"] );
-	t( "Attribute Equals", "#qunit-fixture a[rel='bookmark']", ["simon1"] );
-	t( "Attribute Equals", "#qunit-fixture a[rel=bookmark]", ["simon1"] );
-	t( "Attribute Equals", "#qunit-fixture a[href='http://www.google.com/']", ["google"] );
-	t( "Attribute Equals", "#qunit-fixture a[ rel = 'bookmark' ]", ["simon1"] );
-	t( "Attribute Equals Number", "#qunit-fixture option[value=1]", ["option1b","option2b","option3b","option4b","option5c"] );
-	t( "Attribute Equals Number", "#qunit-fixture li[tabIndex=-1]", ["foodWithNegativeTabIndex"] );
-
-	document.getElementById("anchor2").href = "#2";
-	t( "href Attribute", "p a[href^=#]", ["anchor2"] );
-	t( "href Attribute", "p a[href*=#]", ["simon1", "anchor2"] );
-
-	t( "for Attribute", "form label[for]", ["label-for"] );
-	t( "for Attribute in form", "#form [for=action]", ["label-for"] );
-
-	t( "Attribute containing []", "input[name^='foo[']", ["hidden2"] );
-	t( "Attribute containing []", "input[name^='foo[bar]']", ["hidden2"] );
-	t( "Attribute containing []", "input[name*='[bar]']", ["hidden2"] );
-	t( "Attribute containing []", "input[name$='bar]']", ["hidden2"] );
-	t( "Attribute containing []", "input[name$='[bar]']", ["hidden2"] );
-	t( "Attribute containing []", "input[name$='foo[bar]']", ["hidden2"] );
-	t( "Attribute containing []", "input[name*='foo[bar]']", ["hidden2"] );
-
-	deepEqual( Sizzle( "input[data-comma='0,1']" ), [ document.getElementById("el12087") ], "Without context, single-quoted attribute containing ','" );
-	deepEqual( Sizzle( "input[data-comma=\"0,1\"]" ), [ document.getElementById("el12087") ], "Without context, double-quoted attribute containing ','" );
-	deepEqual( Sizzle( "input[data-comma='0,1']", document.getElementById("t12087") ), [ document.getElementById("el12087") ], "With context, single-quoted attribute containing ','" );
-	deepEqual( Sizzle( "input[data-comma=\"0,1\"]", document.getElementById("t12087") ), [ document.getElementById("el12087") ], "With context, double-quoted attribute containing ','" );
-
-	t( "Multiple Attribute Equals", "#form input[type='radio'], #form input[type='hidden']", ["radio1", "radio2", "hidden1"] );
-	t( "Multiple Attribute Equals", "#form input[type='radio'], #form input[type=\"hidden\"]", ["radio1", "radio2", "hidden1"] );
-	t( "Multiple Attribute Equals", "#form input[type='radio'], #form input[type=hidden]", ["radio1", "radio2", "hidden1"] );
-
-	t( "Attribute selector using UTF8", "span[lang=中文]", ["台北"] );
-
-	t( "Attribute Begins With", "a[href ^= 'http://www']", ["google","yahoo"] );
-	t( "Attribute Ends With", "a[href $= 'org/']", ["mark"] );
-	t( "Attribute Contains", "a[href *= 'google']", ["google","groups"] );
-	t( "Attribute Is Not Equal", "#ap a[hreflang!='en']", ["google","groups","anchor1"] );
-
-	opt = document.getElementById("option1a");
-	opt.setAttribute( "test", "" );
-
-	ok( Sizzle.matchesSelector( opt, "[id*=option1][type!=checkbox]" ), "Attribute Is Not Equal Matches" );
-	ok( Sizzle.matchesSelector( opt, "[id*=option1]" ), "Attribute With No Quotes Contains Matches" );
-	ok( Sizzle.matchesSelector( opt, "[test=]" ), "Attribute With No Quotes No Content Matches" );
-	ok( !Sizzle.matchesSelector( opt, "[test^='']" ), "Attribute with empty string value does not match startsWith selector (^=)" );
-	ok( Sizzle.matchesSelector( opt, "[id=option1a]" ), "Attribute With No Quotes Equals Matches" );
-	ok( Sizzle.matchesSelector( document.getElementById("simon1"), "a[href*=#]" ), "Attribute With No Quotes Href Contains Matches" );
-
-	t( "Empty values", "#select1 option[value='']", ["option1a"] );
-	t( "Empty values", "#select1 option[value!='']", ["option1b","option1c","option1d"] );
-
-	t( "Select options via :selected", "#select1 option:selected", ["option1a"] );
-	t( "Select options via :selected", "#select2 option:selected", ["option2d"] );
-	t( "Select options via :selected", "#select3 option:selected", ["option3b", "option3c"] );
-	t( "Select options via :selected", "select[name='select2'] option:selected", ["option2d"] );
-
-	t( "Grouped Form Elements", "input[name='foo[bar]']", ["hidden2"] );
-
-	input = document.getElementById("text1");
-	input.title = "Don't click me";
-
-	ok( Sizzle.matchesSelector( input, "input[title=\"Don't click me\"]" ), "Quote within attribute value does not mess up tokenizer" );
-
-	// Uncomment if the boolHook is removed
-	// var check2 = document.getElementById("check2");
-	// check2.checked = true;
-	// ok( !Sizzle.matches("[checked]", [ check2 ] ), "Dynamic boolean attributes match when they should with Sizzle.matches (#11115)" );
-
-	// jQuery #12303
-	input.setAttribute( "data-pos", ":first" );
-	ok( Sizzle.matchesSelector( input, "input[data-pos=\\:first]"), "POS within attribute value is treated as an attribute value" );
-	ok( Sizzle.matchesSelector( input, "input[data-pos=':first']"), "POS within attribute value is treated as an attribute value" );
-	ok( Sizzle.matchesSelector( input, ":input[data-pos=':first']"), "POS within attribute value after pseudo is treated as an attribute value" );
-	input.removeAttribute("data-pos");
-
-	// Make sure attribute value quoting works correctly. See jQuery #6093; #6428; #13894
-	// Use seeded results to bypass querySelectorAll optimizations
-	attrbad = jQuery(
-		"<input type='hidden' id='attrbad_space' name='foo bar'/>" +
-		"<input type='hidden' id='attrbad_dot' value='2' name='foo.baz'/>" +
-		"<input type='hidden' id='attrbad_brackets' value='2' name='foo[baz]'/>" +
-		"<input type='hidden' id='attrbad_injection' data-attr='foo_baz&#39;]'/>" +
-		"<input type='hidden' id='attrbad_quote' data-attr='&#39;'/>" +
-		"<input type='hidden' id='attrbad_backslash' data-attr='&#92;'/>" +
-		"<input type='hidden' id='attrbad_backslash_quote' data-attr='&#92;&#39;'/>" +
-		"<input type='hidden' id='attrbad_backslash_backslash' data-attr='&#92;&#92;'/>" +
-		"<input type='hidden' id='attrbad_unicode' data-attr='&#x4e00;'/>"
-	).appendTo("#qunit-fixture").get();
-
-	t( "Underscores don't need escaping", "input[id=types_all]", ["types_all"] );
-
-	deepEqual( Sizzle( "input[name=foo\\ bar]", null, null, attrbad ), q("attrbad_space"),
-		"Escaped space" );
-	deepEqual( Sizzle( "input[name=foo\\.baz]", null, null, attrbad ), q("attrbad_dot"),
-		"Escaped dot" );
-	deepEqual( Sizzle( "input[name=foo\\[baz\\]]", null, null, attrbad ), q("attrbad_brackets"),
-		"Escaped brackets" );
-	deepEqual( Sizzle( "input[data-attr='foo_baz\\']']", null, null, attrbad ), q("attrbad_injection"),
-		"Escaped quote + right bracket" );
-
-	deepEqual( Sizzle( "input[data-attr='\\'']", null, null, attrbad ), q("attrbad_quote"),
-		"Quoted quote" );
-	deepEqual( Sizzle( "input[data-attr='\\\\']", null, null, attrbad ), q("attrbad_backslash"),
-		"Quoted backslash" );
-	deepEqual( Sizzle( "input[data-attr='\\\\\\'']", null, null, attrbad ), q("attrbad_backslash_quote"),
-		"Quoted backslash quote" );
-	deepEqual( Sizzle( "input[data-attr='\\\\\\\\']", null, null, attrbad ), q("attrbad_backslash_backslash"),
-		"Quoted backslash backslash" );
-
-	deepEqual( Sizzle( "input[data-attr='\\5C\\\\']", null, null, attrbad ), q("attrbad_backslash_backslash"),
-		"Quoted backslash backslash (numeric escape)" );
-	deepEqual( Sizzle( "input[data-attr='\\5C \\\\']", null, null, attrbad ), q("attrbad_backslash_backslash"),
-		"Quoted backslash backslash (numeric escape with trailing space)" );
-	deepEqual( Sizzle( "input[data-attr='\\5C\t\\\\']", null, null, attrbad ), q("attrbad_backslash_backslash"),
-		"Quoted backslash backslash (numeric escape with trailing tab)" );
-	deepEqual( Sizzle( "input[data-attr='\\04e00']", null, null, attrbad ), q("attrbad_unicode"),
-		"Long numeric escape (BMP)" );
-	document.getElementById("attrbad_unicode").setAttribute( "data-attr", "\uD834\uDF06A" );
-	// It was too much code to fix Safari 5.x Supplemental Plane crashes (see ba5f09fa404379a87370ec905ffa47f8ac40aaa3)
-	// deepEqual( Sizzle( "input[data-attr='\\01D306A']", null, null, attrbad ), q("attrbad_unicode"),
-	// 	"Long numeric escape (non-BMP)" );
-
-	t( "input[type=text]", "#form input[type=text]", ["text1", "text2", "hidden2", "name"] );
-	t( "input[type=search]", "#form input[type=search]", ["search"] );
-	t( "script[src] (jQuery #13777)", "#moretests script[src]", ["script-src"] );
-
-	// #3279
-	div = document.createElement("div");
-	div.innerHTML = "<div id='foo' xml:test='something'></div>";
-
-	deepEqual( Sizzle( "[xml\\:test]", div ), [ div.firstChild ], "Finding by attribute with escaped characters." );
-
-	div = document.getElementById("foo");
-	t( "Object.prototype property \"constructor\" (negative)", "[constructor]", [] );
-	t( "Gecko Object.prototype property \"watch\" (negative)", "[watch]", [] );
-	div.setAttribute( "constructor", "foo" );
-	div.setAttribute( "watch", "bar" );
-	t( "Object.prototype property \"constructor\"", "[constructor='foo']", ["foo"] );
-	t( "Gecko Object.prototype property \"watch\"", "[watch='bar']", ["foo"] );
-
-	t( "Value attribute is retrieved correctly", "input[value=Test]", ["text1", "text2"] );
-});
-
-test("pseudo - (parent|empty)", function() {
-	expect( 3 );
-	t( "Empty", "ul:empty", ["firstUL"] );
-	t( "Empty with comment node", "ol:empty", ["empty"] );
-	t( "Is A Parent", "#qunit-fixture p:parent", ["firstp","ap","sndp","en","sap","first"] );
-});
-
-test("pseudo - (first|last|only)-(child|of-type)", function() {
-	expect( 12 );
-
-	t( "First Child", "p:first-child", ["firstp","sndp"] );
-	t( "First Child (leading id)", "#qunit-fixture p:first-child", ["firstp","sndp"] );
-	t( "First Child (leading class)", ".nothiddendiv div:first-child", ["nothiddendivchild"] );
-	t( "First Child (case-insensitive)", "#qunit-fixture p:FIRST-CHILD", ["firstp","sndp"] );
-
-	t( "Last Child", "p:last-child", ["sap"] );
-	t( "Last Child (leading id)", "#qunit-fixture a:last-child", ["simon1","anchor1","mark","yahoo","anchor2","simon","liveLink1","liveLink2"] );
-
-	t( "Only Child", "#qunit-fixture a:only-child", ["simon1","anchor1","yahoo","anchor2","liveLink1","liveLink2"] );
-
-	t( "First-of-type", "#qunit-fixture > p:first-of-type", ["firstp"] );
-	t( "Last-of-type", "#qunit-fixture > p:last-of-type", ["first"] );
-	t( "Only-of-type", "#qunit-fixture > :only-of-type", ["name+value", "firstUL", "empty", "floatTest", "iframe", "table"] );
-
-	// Verify that the child position isn't being cached improperly
-	var secondChildren = jQuery("p:nth-child(2)").before("<div></div>");
-
-	t( "No longer second child", "p:nth-child(2)", [] );
-	secondChildren.prev().remove();
-	t( "Restored second child", "p:nth-child(2)", ["ap","en"] );
-});
-
-test("pseudo - nth-child", function() {
-	expect( 30 );
-
-	t( "Nth-child", "p:nth-child(1)", ["firstp","sndp"] );
-	t( "Nth-child (with whitespace)", "p:nth-child( 1 )", ["firstp","sndp"] );
-	t( "Nth-child (case-insensitive)", "#form select:first option:NTH-child(3)", ["option1c"] );
-	t( "Not nth-child", "#qunit-fixture p:not(:nth-child(1))", ["ap","en","sap","first"] );
-
-	t( "Nth-child(2)", "#qunit-fixture form#form > *:nth-child(2)", ["text1"] );
-	t( "Nth-child(2)", "#qunit-fixture form#form > :nth-child(2)", ["text1"] );
-
-	t( "Nth-child(-1)", "#form select:first option:nth-child(-1)", [] );
-	t( "Nth-child(3)", "#form select:first option:nth-child(3)", ["option1c"] );
-	t( "Nth-child(0n+3)", "#form select:first option:nth-child(0n+3)", ["option1c"] );
-	t( "Nth-child(1n+0)", "#form select:first option:nth-child(1n+0)", ["option1a", "option1b", "option1c", "option1d"] );
-	t( "Nth-child(1n)", "#form select:first option:nth-child(1n)", ["option1a", "option1b", "option1c", "option1d"] );
-	t( "Nth-child(n)", "#form select:first option:nth-child(n)", ["option1a", "option1b", "option1c", "option1d"] );
-	t( "Nth-child(even)", "#form select:first option:nth-child(even)", ["option1b", "option1d"] );
-	t( "Nth-child(odd)", "#form select:first option:nth-child(odd)", ["option1a", "option1c"] );
-	t( "Nth-child(2n)", "#form select:first option:nth-child(2n)", ["option1b", "option1d"] );
-	t( "Nth-child(2n+1)", "#form select:first option:nth-child(2n+1)", ["option1a", "option1c"] );
-	t( "Nth-child(2n + 1)", "#form select:first option:nth-child(2n + 1)", ["option1a", "option1c"] );
-	t( "Nth-child(+2n + 1)", "#form select:first option:nth-child(+2n + 1)", ["option1a", "option1c"] );
-	t( "Nth-child(3n)", "#form select:first option:nth-child(3n)", ["option1c"] );
-	t( "Nth-child(3n+1)", "#form select:first option:nth-child(3n+1)", ["option1a", "option1d"] );
-	t( "Nth-child(3n+2)", "#form select:first option:nth-child(3n+2)", ["option1b"] );
-	t( "Nth-child(3n+3)", "#form select:first option:nth-child(3n+3)", ["option1c"] );
-	t( "Nth-child(3n-1)", "#form select:first option:nth-child(3n-1)", ["option1b"] );
-	t( "Nth-child(3n-2)", "#form select:first option:nth-child(3n-2)", ["option1a", "option1d"] );
-	t( "Nth-child(3n-3)", "#form select:first option:nth-child(3n-3)", ["option1c"] );
-	t( "Nth-child(3n+0)", "#form select:first option:nth-child(3n+0)", ["option1c"] );
-	t( "Nth-child(-1n+3)", "#form select:first option:nth-child(-1n+3)", ["option1a", "option1b", "option1c"] );
-	t( "Nth-child(-n+3)", "#form select:first option:nth-child(-n+3)", ["option1a", "option1b", "option1c"] );
-	t( "Nth-child(-1n + 3)", "#form select:first option:nth-child(-1n + 3)", ["option1a", "option1b", "option1c"] );
-
-	deepEqual( Sizzle( ":nth-child(n)", null, null, [ document.createElement("a") ].concat( q("ap") ) ), q("ap"), "Seeded nth-child" );
-});
-
-test("pseudo - nth-last-child", function() {
-	expect( 30 );
-
-	t( "Nth-last-child", "form:nth-last-child(5)", ["testForm"] );
-	t( "Nth-last-child (with whitespace)", "form:nth-last-child( 5 )", ["testForm"] );
-	t( "Nth-last-child (case-insensitive)", "#form select:first option:NTH-last-child(3)", ["option1b"] );
-	t( "Not nth-last-child", "#qunit-fixture p:not(:nth-last-child(1))", ["firstp", "ap", "sndp", "en", "first"] );
-
-	t( "Nth-last-child(-1)", "#form select:first option:nth-last-child(-1)", [] );
-	t( "Nth-last-child(3)", "#form select:first :nth-last-child(3)", ["option1b"] );
-	t( "Nth-last-child(3)", "#form select:first *:nth-last-child(3)", ["option1b"] );
-	t( "Nth-last-child(3)", "#form select:first option:nth-last-child(3)", ["option1b"] );
-	t( "Nth-last-child(0n+3)", "#form select:first option:nth-last-child(0n+3)", ["option1b"] );
-	t( "Nth-last-child(1n+0)", "#form select:first option:nth-last-child(1n+0)", ["option1a", "option1b", "option1c", "option1d"] );
-	t( "Nth-last-child(1n)", "#form select:first option:nth-last-child(1n)", ["option1a", "option1b", "option1c", "option1d"] );
-	t( "Nth-last-child(n)", "#form select:first option:nth-last-child(n)", ["option1a", "option1b", "option1c", "option1d"] );
-	t( "Nth-last-child(even)", "#form select:first option:nth-last-child(even)", ["option1a", "option1c"] );
-	t( "Nth-last-child(odd)", "#form select:first option:nth-last-child(odd)", ["option1b", "option1d"] );
-	t( "Nth-last-child(2n)", "#form select:first option:nth-last-child(2n)", ["option1a", "option1c"] );
-	t( "Nth-last-child(2n+1)", "#form select:first option:nth-last-child(2n+1)", ["option1b", "option1d"] );
-	t( "Nth-last-child(2n + 1)", "#form select:first option:nth-last-child(2n + 1)", ["option1b", "option1d"] );
-	t( "Nth-last-child(+2n + 1)", "#form select:first option:nth-last-child(+2n + 1)", ["option1b", "option1d"] );
-	t( "Nth-last-child(3n)", "#form select:first option:nth-last-child(3n)", ["option1b"] );
-	t( "Nth-last-child(3n+1)", "#form select:first option:nth-last-child(3n+1)", ["option1a", "option1d"] );
-	t( "Nth-last-child(3n+2)", "#form select:first option:nth-last-child(3n+2)", ["option1c"] );
-	t( "Nth-last-child(3n+3)", "#form select:first option:nth-last-child(3n+3)", ["option1b"] );
-	t( "Nth-last-child(3n-1)", "#form select:first option:nth-last-child(3n-1)", ["option1c"] );
-	t( "Nth-last-child(3n-2)", "#form select:first option:nth-last-child(3n-2)", ["option1a", "option1d"] );
-	t( "Nth-last-child(3n-3)", "#form select:first option:nth-last-child(3n-3)", ["option1b"] );
-	t( "Nth-last-child(3n+0)", "#form select:first option:nth-last-child(3n+0)", ["option1b"] );
-	t( "Nth-last-child(-1n+3)", "#form select:first option:nth-last-child(-1n+3)", ["option1b", "option1c", "option1d"] );
-	t( "Nth-last-child(-n+3)", "#form select:first option:nth-last-child(-n+3)", ["option1b", "option1c", "option1d"] );
-	t( "Nth-last-child(-1n + 3)", "#form select:first option:nth-last-child(-1n + 3)", ["option1b", "option1c", "option1d"] );
-
-	deepEqual( Sizzle( ":nth-last-child(n)", null, null, [ document.createElement("a") ].concat( q("ap") ) ), q("ap"), "Seeded nth-last-child" );
-});
-
-test("pseudo - nth-of-type", function() {
-	expect( 9 );
-	t( "Nth-of-type(-1)", ":nth-of-type(-1)", [] );
-	t( "Nth-of-type(3)", "#ap :nth-of-type(3)", ["mark"] );
-	t( "Nth-of-type(n)", "#ap :nth-of-type(n)", ["google", "groups", "code1", "anchor1", "mark"] );
-	t( "Nth-of-type(0n+3)", "#ap :nth-of-type(0n+3)", ["mark"] );
-	t( "Nth-of-type(2n)", "#ap :nth-of-type(2n)", ["groups"] );
-	t( "Nth-of-type(even)", "#ap :nth-of-type(even)", ["groups"] );
-	t( "Nth-of-type(2n+1)", "#ap :nth-of-type(2n+1)", ["google", "code1", "anchor1", "mark"] );
-	t( "Nth-of-type(odd)", "#ap :nth-of-type(odd)", ["google", "code1", "anchor1", "mark"] );
-	t( "Nth-of-type(-n+2)", "#qunit-fixture > :nth-of-type(-n+2)", ["firstp", "ap", "foo", "nothiddendiv", "name+value", "firstUL", "empty", "form", "floatTest", "iframe", "lengthtest", "table"] );
-});
-
-test("pseudo - nth-last-of-type", function() {
-	expect( 9 );
-	t( "Nth-last-of-type(-1)", ":nth-last-of-type(-1)", [] );
-	t( "Nth-last-of-type(3)", "#ap :nth-last-of-type(3)", ["google"] );
-	t( "Nth-last-of-type(n)", "#ap :nth-last-of-type(n)", ["google", "groups", "code1", "anchor1", "mark"] );
-	t( "Nth-last-of-type(0n+3)", "#ap :nth-last-of-type(0n+3)", ["google"] );
-	t( "Nth-last-of-type(2n)", "#ap :nth-last-of-type(2n)", ["groups"] );
-	t( "Nth-last-of-type(even)", "#ap :nth-last-of-type(even)", ["groups"] );
-	t( "Nth-last-of-type(2n+1)", "#ap :nth-last-of-type(2n+1)", ["google", "code1", "anchor1", "mark"] );
-	t( "Nth-last-of-type(odd)", "#ap :nth-last-of-type(odd)", ["google", "code1", "anchor1", "mark"] );
-	t( "Nth-last-of-type(-n+2)", "#qunit-fixture > :nth-last-of-type(-n+2)", ["ap", "name+value", "first", "firstUL", "empty", "floatTest", "iframe", "table", "name-tests", "testForm", "liveHandlerOrder", "siblingTest"] );
-});
-
-test("pseudo - has", function() {
-	expect( 3 );
-
-	t( "Basic test", "p:has(a)", ["firstp","ap","en","sap"] );
-	t( "Basic test (irrelevant whitespace)", "p:has( a )", ["firstp","ap","en","sap"] );
-	t( "Nested with overlapping candidates", "#qunit-fixture div:has(div:has(div:not([id])))", [ "moretests", "t2037" ] );
-});
-
-test("pseudo - misc", function() {
-	expect( 39 );
-
-	var select, tmp, input;
-
-	t( "Headers", ":header", ["qunit-header", "qunit-banner", "qunit-userAgent"] );
-	t( "Headers(case-insensitive)", ":Header", ["qunit-header", "qunit-banner", "qunit-userAgent"] );
-	t( "Multiple matches with the same context (cache check)", "#form select:has(option:first-child:contains('o'))", ["select1", "select2", "select3", "select4"] );
-
-	ok( Sizzle("#qunit-fixture :not(:has(:has(*)))").length, "All not grandparents" );
-
-	select = document.getElementById("select1");
-	ok( Sizzle.matchesSelector( select, ":has(option)" ), "Has Option Matches" );
-
-	ok( Sizzle("a:contains('')").length, "Empty string contains" );
-	t( "Text Contains", "a:contains(Google)", ["google","groups"] );
-	t( "Text Contains", "a:contains(Google Groups)", ["groups"] );
-
-	t( "Text Contains", "a:contains('Google Groups (Link)')", ["groups"] );
-	t( "Text Contains", "a:contains(\"(Link)\")", ["groups"] );
-	t( "Text Contains", "a:contains(Google Groups (Link))", ["groups"] );
-	t( "Text Contains", "a:contains((Link))", ["groups"] );
-
-
-	tmp = document.createElement("div");
-	tmp.id = "tmp_input";
-	document.body.appendChild( tmp );
-
-	jQuery.each( [ "button", "submit", "reset" ], function( i, type ) {
-		var els = jQuery(
-			"<input id='input_%' type='%'/><button id='button_%' type='%'>test</button>"
-			.replace( /%/g, type )
-		).appendTo( tmp );
-
-		t( "Input Buttons :" + type, "#tmp_input :" + type, [ "input_" + type, "button_" + type ] );
-
-		ok( Sizzle.matchesSelector( els[0], ":" + type ), "Input Matches :" + type );
-		ok( Sizzle.matchesSelector( els[1], ":" + type ), "Button Matches :" + type );
-	});
-
-	document.body.removeChild( tmp );
-
-	// Recreate tmp
-	tmp = document.createElement("div");
-	tmp.id = "tmp_input";
-	tmp.innerHTML = "<span>Hello I am focusable.</span>";
-	// Setting tabIndex should make the element focusable
-	// http://dev.w3.org/html5/spec/single-page.html#focus-management
-	document.body.appendChild( tmp );
-	tmp.tabIndex = 0;
-	tmp.focus();
-	if ( document.activeElement !== tmp || (document.hasFocus && !document.hasFocus()) ||
-		(document.querySelectorAll && !document.querySelectorAll("div:focus").length) ) {
-		ok( true, "The div was not focused. Skip checking the :focus match." );
-		ok( true, "The div was not focused. Skip checking the :focus match." );
-	} else {
-		t( "tabIndex element focused", ":focus", [ "tmp_input" ] );
-		ok( Sizzle.matchesSelector( tmp, ":focus" ), ":focus matches tabIndex div" );
-	}
-
-	// Blur tmp
-	tmp.blur();
-	document.body.focus();
-	ok( !Sizzle.matchesSelector( tmp, ":focus" ), ":focus doesn't match tabIndex div" );
-	document.body.removeChild( tmp );
-
-	// Input focus/active
-	input = document.createElement("input");
-	input.type = "text";
-	input.id = "focus-input";
-
-	document.body.appendChild( input );
-	input.focus();
-
-	// Inputs can't be focused unless the document has focus
-	if ( document.activeElement !== input || (document.hasFocus && !document.hasFocus()) ||
-		(document.querySelectorAll && !document.querySelectorAll("input:focus").length) ) {
-		ok( true, "The input was not focused. Skip checking the :focus match." );
-		ok( true, "The input was not focused. Skip checking the :focus match." );
-	} else {
-		t( "Element focused", "input:focus", [ "focus-input" ] );
-		ok( Sizzle.matchesSelector( input, ":focus" ), ":focus matches" );
-	}
-
-	input.blur();
-
-	// When IE is out of focus, blur does not work. Force it here.
-	if ( document.activeElement === input ) {
-		document.body.focus();
-	}
-
-	ok( !Sizzle.matchesSelector( input, ":focus" ), ":focus doesn't match" );
-	document.body.removeChild( input );
-
-
-
-	deepEqual(
-		Sizzle( "[id='select1'] *:not(:last-child), [id='select2'] *:not(:last-child)", q("qunit-fixture")[0] ),
-		q( "option1a", "option1b", "option1c", "option2a", "option2b", "option2c" ),
-		"caching system tolerates recursive selection"
-	);
-
-	// Tokenization edge cases
-	t( "Sequential pseudos", "#qunit-fixture p:has(:contains(mark)):has(code)", ["ap"] );
-	t( "Sequential pseudos", "#qunit-fixture p:has(:contains(mark)):has(code):contains(This link)", ["ap"] );
-
-	t( "Pseudo argument containing ')'", "p:has(>a.GROUPS[src!=')'])", ["ap"] );
-	t( "Pseudo argument containing ')'", "p:has(>a.GROUPS[src!=')'])", ["ap"] );
-	t( "Pseudo followed by token containing ')'", "p:contains(id=\"foo\")[id!=\\)]", ["sndp"] );
-	t( "Pseudo followed by token containing ')'", "p:contains(id=\"foo\")[id!=')']", ["sndp"] );
-
-	t( "Multi-pseudo", "#ap:has(*), #ap:has(*)", ["ap"] );
-	t( "Multi-positional", "#ap:gt(0), #ap:lt(1)", ["ap"] );
-	t( "Multi-pseudo with leading nonexistent id", "#nonexistent:has(*), #ap:has(*)", ["ap"] );
-	t( "Multi-positional with leading nonexistent id", "#nonexistent:gt(0), #ap:lt(1)", ["ap"] );
-
-	t( "Tokenization stressor", "a[class*=blog]:not(:has(*, :contains(!)), :contains(!)), br:contains(]), p:contains(]), :not(:empty):not(:parent)", ["ap", "mark","yahoo","simon"] );
-});
-
-
-test("pseudo - :not", function() {
-	expect( 43 );
-
-	t( "Not", "a.blog:not(.link)", ["mark"] );
-	t( ":not() with :first", "#foo p:not(:first) .link", ["simon"] );
-
-	t( "Not - multiple", "#form option:not(:contains(Nothing),#option1b,:selected)", ["option1c", "option1d", "option2b", "option2c", "option3d", "option3e", "option4e", "option5b", "option5c"] );
-	t( "Not - recursive", "#form option:not(:not(:selected))[id^='option3']", [ "option3b", "option3c"] );
-
-	t( ":not() failing interior", "#qunit-fixture p:not(.foo)", ["firstp","ap","sndp","en","sap","first"] );
-	t( ":not() failing interior", "#qunit-fixture p:not(div.foo)", ["firstp","ap","sndp","en","sap","first"] );
-	t( ":not() failing interior", "#qunit-fixture p:not(p.foo)", ["firstp","ap","sndp","en","sap","first"] );
-	t( ":not() failing interior", "#qunit-fixture p:not(#blargh)", ["firstp","ap","sndp","en","sap","first"] );
-	t( ":not() failing interior", "#qunit-fixture p:not(div#blargh)", ["firstp","ap","sndp","en","sap","first"] );
-	t( ":not() failing interior", "#qunit-fixture p:not(p#blargh)", ["firstp","ap","sndp","en","sap","first"] );
-
-	t( ":not Multiple", "#qunit-fixture p:not(a)", ["firstp","ap","sndp","en","sap","first"] );
-	t( ":not Multiple", "#qunit-fixture p:not( a )", ["firstp","ap","sndp","en","sap","first"] );
-	t( ":not Multiple", "#qunit-fixture p:not( p )", [] );
-	t( ":not Multiple", "#qunit-fixture p:not(a, b)", ["firstp","ap","sndp","en","sap","first"] );
-	t( ":not Multiple", "#qunit-fixture p:not(a, b, div)", ["firstp","ap","sndp","en","sap","first"] );
-	t( ":not Multiple", "p:not(p)", [] );
-	t( ":not Multiple", "p:not(a,p)", [] );
-	t( ":not Multiple", "p:not(p,a)", [] );
-	t( ":not Multiple", "p:not(a,p,b)", [] );
-	t( ":not Multiple", ":input:not(:image,:input,:submit)", [] );
-	t( ":not Multiple", "#qunit-fixture p:not(:has(a), :nth-child(1))", ["first"] );
-
-	t( "No element not selector", ".container div:not(.excluded) div", [] );
-
-	t( ":not() Existing attribute", "#form select:not([multiple])", ["select1", "select2", "select5"]);
-	t( ":not() Equals attribute", "#form select:not([name=select1])", ["select2", "select3", "select4","select5"]);
-	t( ":not() Equals quoted attribute", "#form select:not([name='select1'])", ["select2", "select3", "select4", "select5"]);
-
-	t( ":not() Multiple Class", "#foo a:not(.blog)", ["yahoo", "anchor2"] );
-	t( ":not() Multiple Class", "#foo a:not(.link)", ["yahoo", "anchor2"] );
-	t( ":not() Multiple Class", "#foo a:not(.blog.link)", ["yahoo", "anchor2"] );
-
-	t( ":not chaining (compound)", "#qunit-fixture div[id]:not(:has(div, span)):not(:has(*))", ["nothiddendivchild", "divWithNoTabIndex"] );
-	t( ":not chaining (with attribute)", "#qunit-fixture form[id]:not([action$='formaction']):not(:button)", ["lengthtest", "name-tests", "testForm"] );
-	t( ":not chaining (colon in attribute)", "#qunit-fixture form[id]:not([action='form:action']):not(:button)", ["form", "lengthtest", "name-tests", "testForm"] );
-	t( ":not chaining (colon in attribute and nested chaining)", "#qunit-fixture form[id]:not([action='form:action']:button):not(:input)", ["form", "lengthtest", "name-tests", "testForm"] );
-	t( ":not chaining", "#form select:not(.select1):contains(Nothing) > option:not(option)", [] );
-
-	t( "positional :not()", "#foo p:not(:last)", ["sndp", "en"] );
-	t( "positional :not() prefix", "#foo p:not(:last) a", ["yahoo"] );
-	t( "compound positional :not()", "#foo p:not(:first, :last)", ["en"] );
-	t( "compound positional :not()", "#foo p:not(:first, :even)", ["en"] );
-	t( "compound positional :not()", "#foo p:not(:first, :odd)", ["sap"] );
-	t( "reordered compound positional :not()", "#foo p:not(:odd, :first)", ["sap"] );
-
-	t( "positional :not() with pre-filter", "#foo p:not([id]:first)", ["en", "sap"] );
-	t( "positional :not() with post-filter", "#foo p:not(:first[id])", ["en", "sap"] );
-	t( "positional :not() with pre-filter", "#foo p:not([lang]:first)", ["sndp", "sap"] );
-	t( "positional :not() with post-filter", "#foo p:not(:first[lang])", ["sndp", "en", "sap"] );
-});
-
-test("pseudo - position", function() {
-	expect( 33 );
-
-	t( "First element", "div:first", ["qunit"] );
-	t( "First element(case-insensitive)", "div:fiRst", ["qunit"] );
-	t( "nth Element", "#qunit-fixture p:nth(1)", ["ap"] );
-	t( "First Element", "#qunit-fixture p:first", ["firstp"] );
-	t( "Last Element", "p:last", ["first"] );
-	t( "Even Elements", "#qunit-fixture p:even", ["firstp","sndp","sap"] );
-	t( "Odd Elements", "#qunit-fixture p:odd", ["ap","en","first"] );
-	t( "Position Equals", "#qunit-fixture p:eq(1)", ["ap"] );
-	t( "Position Equals (negative)", "#qunit-fixture p:eq(-1)", ["first"] );
-	t( "Position Greater Than", "#qunit-fixture p:gt(0)", ["ap","sndp","en","sap","first"] );
-	t( "Position Less Than", "#qunit-fixture p:lt(3)", ["firstp","ap","sndp"] );
-
-	t( "Check position filtering", "div#nothiddendiv:eq(0)", ["nothiddendiv"] );
-	t( "Check position filtering", "div#nothiddendiv:last", ["nothiddendiv"] );
-	t( "Check position filtering", "div#nothiddendiv:not(:gt(0))", ["nothiddendiv"] );
-	t( "Check position filtering", "#foo > :not(:first)", ["en", "sap"] );
-	t( "Check position filtering", "#qunit-fixture select > :not(:gt(2))", ["option1a", "option1b", "option1c"] );
-	t( "Check position filtering", "#qunit-fixture select:lt(2) :not(:first)", ["option1b", "option1c", "option1d", "option2a", "option2b", "option2c", "option2d"] );
-	t( "Check position filtering", "div.nothiddendiv:eq(0)", ["nothiddendiv"] );
-	t( "Check position filtering", "div.nothiddendiv:last", ["nothiddendiv"] );
-	t( "Check position filtering", "div.nothiddendiv:not(:lt(0))", ["nothiddendiv"] );
-
-	t( "Check element position", "#qunit-fixture div div:eq(0)", ["nothiddendivchild"] );
-	t( "Check element position", "#select1 option:eq(3)", ["option1d"] );
-	t( "Check element position", "#qunit-fixture div div:eq(10)", ["names-group"] );
-	t( "Check element position", "#qunit-fixture div div:first", ["nothiddendivchild"] );
-	t( "Check element position", "#qunit-fixture div > div:first", ["nothiddendivchild"] );
-	t( "Check element position", "#dl div:first div:first", ["foo"] );
-	t( "Check element position", "#dl div:first > div:first", ["foo"] );
-	t( "Check element position", "div#nothiddendiv:first > div:first", ["nothiddendivchild"] );
-	t( "Chained pseudo after a pos pseudo", "#listWithTabIndex li:eq(0):contains(Rice)", ["foodWithNegativeTabIndex"] );
-
-	t( "Check sort order with POS and comma", "#qunit-fixture em>em>em>em:first-child,div>em:first", ["siblingfirst", "siblinggreatgrandchild"] );
-
-	t( "Isolated position", ":last", ["last"] );
-
-	deepEqual( Sizzle( "*:lt(2) + *", null, [], Sizzle("#qunit-fixture > p") ), q("ap"), "Seeded pos with trailing relative" );
-
-	// jQuery #12526
-	var context = jQuery("#qunit-fixture").append("<div id='jquery12526'></div>")[0];
-	deepEqual( Sizzle( ":last", context ), q("jquery12526"), "Post-manipulation positional" );
-});
-
-test("pseudo - form", function() {
-	expect( 10 );
-
-	var extraTexts = jQuery("<input id=\"impliedText\"/><input id=\"capitalText\" type=\"TEXT\">").appendTo("#form");
-
-	t( "Form element :input", "#form :input", ["text1", "text2", "radio1", "radio2", "check1", "check2", "hidden1", "hidden2", "name", "search", "button", "area1", "select1", "select2", "select3", "select4", "select5", "impliedText", "capitalText"] );
-	t( "Form element :radio", "#form :radio", ["radio1", "radio2"] );
-	t( "Form element :checkbox", "#form :checkbox", ["check1", "check2"] );
-	t( "Form element :text", "#form :text", ["text1", "text2", "hidden2", "name", "impliedText", "capitalText"] );
-	t( "Form element :radio:checked", "#form :radio:checked", ["radio2"] );
-	t( "Form element :checkbox:checked", "#form :checkbox:checked", ["check1"] );
-	t( "Form element :radio:checked, :checkbox:checked", "#form :radio:checked, #form :checkbox:checked", ["radio2", "check1"] );
-
-	t( "Selected Option Element", "#form option:selected", ["option1a","option2d","option3b","option3c","option4b","option4c","option4d","option5a"] );
-	t( "Selected Option Element are also :checked", "#form option:checked", ["option1a","option2d","option3b","option3c","option4b","option4c","option4d","option5a"] );
-	t( "Hidden inputs should be treated as enabled. See QSA test.", "#hidden1:enabled", ["hidden1"] );
-
-	extraTexts.remove();
-});
-
-test("pseudo - :target and :root", function() {
-	expect( 2 );
-
-	// Target
-	var oldHash,
-	$link = jQuery("<a/>").attr({
-		href: "#",
-		id: "new-link"
-	}).appendTo("#qunit-fixture");
-
-	oldHash = window.location.hash;
-	window.location.hash = "new-link";
-
-	t( ":target", ":target", ["new-link"] );
-
-	$link.remove();
-	window.location.hash = oldHash;
-
-	// Root
-	equal( Sizzle(":root")[0], document.documentElement, ":root selector" );
-});
-
-test("pseudo - :lang", function() {
-	expect( 105 );
-
-	var docElem = document.documentElement,
-		docXmlLang = docElem.getAttribute("xml:lang"),
-		docLang = docElem.lang,
-		foo = document.getElementById("foo"),
-		anchor = document.getElementById("anchor2"),
-		xml = createWithFriesXML(),
-		testLang = function( text, elem, container, lang, extra ) {
-			var message,
-				full = lang + "-" + extra;
-
-			message = "lang=" + lang + " " + text;
-			container.setAttribute( container.ownerDocument.documentElement.nodeName === "HTML" ? "lang" : "xml:lang", lang );
-			assertMatch( message, elem, ":lang(" + lang + ")" );
-			assertMatch( message, elem, ":lang(" + mixCase(lang) + ")" );
-			assertNoMatch( message, elem, ":lang(" + full + ")" );
-			assertNoMatch( message, elem, ":lang(" + mixCase(full) + ")" );
-			assertNoMatch( message, elem, ":lang(" + lang + "-)" );
-			assertNoMatch( message, elem, ":lang(" + full + "-)" );
-			assertNoMatch( message, elem, ":lang(" + lang + "glish)" );
-			assertNoMatch( message, elem, ":lang(" + full + "glish)" );
-
-			message = "lang=" + full + " " + text;
-			container.setAttribute( container.ownerDocument.documentElement.nodeName === "HTML" ? "lang" : "xml:lang", full );
-			assertMatch( message, elem, ":lang(" + lang + ")" );
-			assertMatch( message, elem, ":lang(" + mixCase(lang) + ")" );
-			assertMatch( message, elem, ":lang(" + full + ")" );
-			assertMatch( message, elem, ":lang(" + mixCase(full) + ")" );
-			assertNoMatch( message, elem, ":lang(" + lang + "-)" );
-			assertNoMatch( message, elem, ":lang(" + full + "-)" );
-			assertNoMatch( message, elem, ":lang(" + lang + "glish)" );
-			assertNoMatch( message, elem, ":lang(" + full + "glish)" );
-		},
-		mixCase = function( str ) {
-			var ret = str.split(""),
-				i = ret.length;
-			while ( i-- ) {
-				if ( i & 1 ) {
-					ret[i] = ret[i].toUpperCase();
-				}
-			}
-			return ret.join("");
-		},
-		assertMatch = function( text, elem, selector ) {
-			ok( Sizzle.matchesSelector( elem, selector ), text + " match " + selector );
-		},
-		assertNoMatch = function( text, elem, selector ) {
-			ok( !Sizzle.matchesSelector( elem, selector ), text + " fail " + selector );
-		};
-
-	// Prefixing and inheritance
-	ok( Sizzle.matchesSelector( docElem, ":lang(" + docElem.lang + ")" ), "starting :lang" );
-	testLang( "document", anchor, docElem, "en", "us" );
-	testLang( "grandparent", anchor, anchor.parentNode.parentNode, "yue", "hk" );
-	ok( !Sizzle.matchesSelector( anchor, ":lang(en), :lang(en-us)" ),
-		":lang does not look above an ancestor with specified lang" );
-	testLang( "self", anchor, anchor, "es", "419" );
-	ok( !Sizzle.matchesSelector( anchor, ":lang(en), :lang(en-us), :lang(yue), :lang(yue-hk)" ),
-		":lang does not look above self with specified lang" );
-
-	// Searching by language tag
-	anchor.parentNode.parentNode.lang = "arab";
-	anchor.parentNode.lang = anchor.parentNode.id = "ara-sa";
-	anchor.lang = "ara";
-	deepEqual( Sizzle( ":lang(ara)", foo ), [ anchor.parentNode, anchor ], "Find by :lang" );
-
-	// Selector validity
-	anchor.parentNode.lang = "ara";
-	anchor.lang = "ara\\b";
-	deepEqual( Sizzle( ":lang(ara\\b)", foo ), [], ":lang respects backslashes" );
-	deepEqual( Sizzle( ":lang(ara\\\\b)", foo ), [ anchor ], ":lang respects escaped backslashes" );
-	throws(function() {
-		Sizzle.call( null, "dl:lang(c++)" );
-	}, function( e ) {
-		return e.message.indexOf("Syntax error") >= 0;
-	}, ":lang value must be a valid identifier" );
-
-	// XML
-	foo = jQuery( "response", xml )[0];
-	anchor = jQuery( "#seite1", xml )[0];
-	testLang( "XML document", anchor, xml.documentElement, "en", "us" );
-	testLang( "XML grandparent", anchor, foo, "yue", "hk" );
-	ok( !Sizzle.matchesSelector( anchor, ":lang(en), :lang(en-us)" ),
-		"XML :lang does not look above an ancestor with specified lang" );
-	testLang( "XML self", anchor, anchor, "es", "419" );
-	ok( !Sizzle.matchesSelector( anchor, ":lang(en), :lang(en-us), :lang(yue), :lang(yue-hk)" ),
-		"XML :lang does not look above self with specified lang" );
-
-	// Cleanup
-	if ( docXmlLang == null ) {
-		docElem.removeAttribute("xml:lang");
-	} else {
-		docElem.setAttribute( "xml:lang", docXmlLang );
-	}
-	docElem.lang = docLang;
-});
-
-test("caching", function() {
-	expect( 2 );
-	Sizzle( ":not(code)", document.getElementById("ap") );
-	deepEqual( Sizzle( ":not(code)", document.getElementById("foo") ), q("sndp", "en", "yahoo", "sap", "anchor2", "simon"), "Reusing selector with new context" );
-
-	t( "Deep ancestry caching in post-positional element matcher (jQuery #14657)",
-		"#qunit-fixture a:lt(3):parent",
-		[ "simon1", "google", "groups" ] );
-});
-
-asyncTest( "Iframe dispatch should not affect Sizzle, see jQuery #13936", 1, function() {
-	var loaded = false,
-		thrown = false,
-		iframe = document.getElementById("iframe"),
-		iframeDoc = iframe.contentDocument || iframe.contentWindow.document;
-
-	jQuery( iframe ).on( "load", function() {
-		var form;
-
-		try {
-			iframeDoc = this.contentDocument || this.contentWindow.document;
-			form = Sizzle( "#navigate", iframeDoc )[ 0 ];
-		} catch ( e ) {
-			thrown = e;
-		}
-
-		if ( loaded ) {
-			strictEqual( thrown, false, "No error thrown from post-reload Sizzle call" );
-			start();
-		} else {
-			loaded = true;
-			form.submit();
-		}
-	});
-
-	iframeDoc.open();
-	iframeDoc.write("<body><form id='navigate'></form></body>");
-	iframeDoc.close();
-});
-
-test("matchesSelector", function() {
-	expect( 6 );
-
-	var el = document.getElementById("simon1"),
-		disconnected = document.createElement("div");
-
-	ok( Sizzle.matchesSelector( el, "[rel='bookmark']" ), "quoted attribute" );
-	ok( Sizzle.matchesSelector( el, "[rel=bookmark]" ), "unquoted attribute" );
-	ok( Sizzle.matchesSelector( el, "[\nrel = bookmark\t]" ), "unquoted attribute with non-semantic whitespace" );
-
-	ok( Sizzle.matchesSelector( disconnected, "div" ), "disconnected element" );
-
-	ok( Sizzle.matchesSelector( el, "* > *" ), "child combinator (matching)" );
-	ok( !Sizzle.matchesSelector( disconnected, "* > *" ), "child combinator (not matching)" );
-});
-
-test("select() with pre-compiled function", function() {
-	expect( 6 );
-
-	jQuery.each([ "#qunit-fixture #first", "ol#listWithTabIndex > li[tabindex]", "#liveSpan1" ],
-	function( i, selector ) {
-		var compiled = Sizzle.compile( selector );
-		equal( Sizzle.select( compiled, document ).length, 1, "Should match using a compiled selector function" );
-		equal( Sizzle.select( compiled, Sizzle( "#first")[0] ).length, 0, "Should not match with different context" );
-	});
-});
diff --git a/#pma/js/jquery/src/jquery/sizzle/test/unit/utilities.js b/#pma/js/jquery/src/jquery/sizzle/test/unit/utilities.js
deleted file mode 100644
index d51888dd..00000000
--- a/#pma/js/jquery/src/jquery/sizzle/test/unit/utilities.js
+++ /dev/null
@@ -1,169 +0,0 @@
-module("utilities", { teardown: moduleTeardown });
-
-function testAttr( doc ) {
-	expect( 9 );
-
-	var el;
-	if ( doc ) {
-		// XML
-		el = doc.createElement( "input" );
-		el.setAttribute( "type", "checkbox" );
-	} else {
-		// Set checked on creation by creating with a fragment
-		// See http://jsfiddle.net/8sVgA/1/show/light in oldIE
-		el = jQuery( "<input type='checkbox' checked='checked' />" )[0];
-	}
-
-	// Set it again for good measure
-	el.setAttribute( "checked", "checked" );
-	el.setAttribute( "id", "id" );
-	el.setAttribute( "value", "on" );
-
-	strictEqual( Sizzle.attr( el, "nonexistent" ), null, "nonexistent" );
-	strictEqual( Sizzle.attr( el, "id" ), "id", "existent" );
-	strictEqual( Sizzle.attr( el, "value" ), "on", "value" );
-	strictEqual( Sizzle.attr( el, "checked" ), "checked", "boolean" );
-	strictEqual( Sizzle.attr( el, "href" ), null, "interpolation risk" );
-	strictEqual( Sizzle.attr( el, "constructor" ), null,
-		"Object.prototype property \"constructor\" (negative)" );
-	strictEqual( Sizzle.attr( el, "watch" ), null,
-		"Gecko Object.prototype property \"watch\" (negative)" );
-	el.setAttribute( "constructor", "foo" );
-	el.setAttribute( "watch", "bar" );
-	strictEqual( Sizzle.attr( el, "constructor" ), "foo",
-		"Object.prototype property \"constructor\"" );
-	strictEqual( Sizzle.attr( el, "watch" ), "bar",
-		"Gecko Object.prototype property \"watch\"" );
-}
-
-test("Sizzle.attr (HTML)", function() {
-	testAttr();
-});
-
-test("Sizzle.attr (XML)", function() {
-	testAttr( jQuery.parseXML("<root/>") );
-});
-
-test("Sizzle.contains", function() {
-	expect( 16 );
-
-	var container = document.getElementById("nonnodes"),
-		element = container.firstChild,
-		text = element.nextSibling,
-		nonContained = container.nextSibling,
-		detached = document.createElement("a");
-	ok( element && element.nodeType === 1, "preliminary: found element" );
-	ok( text && text.nodeType === 3, "preliminary: found text" );
-	ok( nonContained, "preliminary: found non-descendant" );
-	ok( Sizzle.contains(container, element), "child" );
-	ok( Sizzle.contains(container.parentNode, element), "grandchild" );
-	ok( Sizzle.contains(container, text), "text child" );
-	ok( Sizzle.contains(container.parentNode, text), "text grandchild" );
-	ok( !Sizzle.contains(container, container), "self" );
-	ok( !Sizzle.contains(element, container), "parent" );
-	ok( !Sizzle.contains(container, nonContained), "non-descendant" );
-	ok( !Sizzle.contains(container, document), "document" );
-	ok( !Sizzle.contains(container, document.documentElement), "documentElement (negative)" );
-	ok( !Sizzle.contains(container, null), "Passing null does not throw an error" );
-	ok( Sizzle.contains(document, document.documentElement), "documentElement (positive)" );
-	ok( Sizzle.contains(document, element), "document container (positive)" );
-	ok( !Sizzle.contains(document, detached), "document container (negative)" );
-});
-
-if ( jQuery("<svg xmlns='http://www.w3.org/2000/svg' version='1.1' height='1' width='1'><g/></svg>")[0].firstChild ) {
-	test("Sizzle.contains in SVG (jQuery #10832)", function() {
-		expect( 4 );
-
-		var svg = jQuery(
-			"<svg xmlns='http://www.w3.org/2000/svg' version='1.1' height='1' width='1'>" +
-				"<g><circle cx='1' cy='1' r='1' /></g>" +
-			"</svg>"
-		).appendTo("#qunit-fixture")[0];
-
-		ok( Sizzle.contains( svg, svg.firstChild ), "root child" );
-		ok( Sizzle.contains( svg.firstChild, svg.firstChild.firstChild ), "element child" );
-		ok( Sizzle.contains( svg, svg.firstChild.firstChild ), "root granchild" );
-		ok( !Sizzle.contains( svg.firstChild.firstChild, svg.firstChild ), "parent (negative)" );
-	});
-}
-
-test("Sizzle.uniqueSort", function() {
-	expect( 14 );
-
-	function Arrayish( arr ) {
-		var i = this.length = arr.length;
-		while ( i-- ) {
-			this[ i ] = arr[ i ];
-		}
-	}
-	Arrayish.prototype = {
-		slice: [].slice,
-		sort: [].sort,
-		splice: [].splice
-	};
-
-	var i, tests,
-		detached = [],
-		body = document.body,
-		fixture = document.getElementById("qunit-fixture"),
-		detached1 = document.createElement("p"),
-		detached2 = document.createElement("ul"),
-		detachedChild = detached1.appendChild( document.createElement("a") ),
-		detachedGrandchild = detachedChild.appendChild( document.createElement("b") );
-
-	for ( i = 0; i < 12; i++ ) {
-		detached.push( document.createElement("li") );
-		detached[i].id = "detached" + i;
-		detached2.appendChild( document.createElement("li") ).id = "detachedChild" + i;
-	}
-
-	tests = {
-		"Empty": {
-			input: [],
-			expected: []
-		},
-		"Single-element": {
-			input: [ fixture ],
-			expected: [ fixture ]
-		},
-		"No duplicates": {
-			input: [ fixture, body ],
-			expected: [ body, fixture ]
-		},
-		"Duplicates": {
-			input: [ body, fixture, fixture, body ],
-			expected: [ body, fixture ]
-		},
-		"Detached": {
-			input: detached.slice( 0 ),
-			expected: detached.slice( 0 )
-		},
-		"Detached children": {
-			input: [
-				detached2.childNodes[0],
-				detached2.childNodes[1],
-				detached2.childNodes[2],
-				detached2.childNodes[3]
-			],
-			expected: [
-				detached2.childNodes[0],
-				detached2.childNodes[1],
-				detached2.childNodes[2],
-				detached2.childNodes[3]
-			]
-		},
-		"Attached/detached mixture": {
-			input: [ detached1, fixture, detached2, document, detachedChild, body, detachedGrandchild ],
-			expected: [ document, body, fixture ],
-			length: 3
-		}
-	};
-
-	jQuery.each( tests, function( label, test ) {
-		var length = test.length || test.input.length;
-		deepEqual( Sizzle.uniqueSort( test.input ).slice( 0, length ), test.expected, label + " (array)" );
-		deepEqual( Sizzle.uniqueSort( new Arrayish(test.input) ).slice( 0, length ), test.expected, label + " (quasi-array)" );
-	});
-});
-
-testIframeWithCallback( "Sizzle.uniqueSort works cross-window (jQuery #14381)", "mixed_sort.html", deepEqual );
diff --git a/#pma/js/jquery/src/jquery/traversing.js b/#pma/js/jquery/src/jquery/traversing.js
deleted file mode 100644
index d9ff0aea..00000000
--- a/#pma/js/jquery/src/jquery/traversing.js
+++ /dev/null
@@ -1,199 +0,0 @@
-define([
-	"./core",
-	"./var/indexOf",
-	"./traversing/var/rneedsContext",
-	"./core/init",
-	"./traversing/findFilter",
-	"./selector"
-], function( jQuery, indexOf, rneedsContext ) {
-
-var rparentsprev = /^(?:parents|prev(?:Until|All))/,
-	// Methods guaranteed to produce a unique set when starting from a unique set
-	guaranteedUnique = {
-		children: true,
-		contents: true,
-		next: true,
-		prev: true
-	};
-
-jQuery.extend({
-	dir: function( elem, dir, until ) {
-		var matched = [],
-			truncate = until !== undefined;
-
-		while ( (elem = elem[ dir ]) && elem.nodeType !== 9 ) {
-			if ( elem.nodeType === 1 ) {
-				if ( truncate && jQuery( elem ).is( until ) ) {
-					break;
-				}
-				matched.push( elem );
-			}
-		}
-		return matched;
-	},
-
-	sibling: function( n, elem ) {
-		var matched = [];
-
-		for ( ; n; n = n.nextSibling ) {
-			if ( n.nodeType === 1 && n !== elem ) {
-				matched.push( n );
-			}
-		}
-
-		return matched;
-	}
-});
-
-jQuery.fn.extend({
-	has: function( target ) {
-		var targets = jQuery( target, this ),
-			l = targets.length;
-
-		return this.filter(function() {
-			var i = 0;
-			for ( ; i < l; i++ ) {
-				if ( jQuery.contains( this, targets[i] ) ) {
-					return true;
-				}
-			}
-		});
-	},
-
-	closest: function( selectors, context ) {
-		var cur,
-			i = 0,
-			l = this.length,
-			matched = [],
-			pos = rneedsContext.test( selectors ) || typeof selectors !== "string" ?
-				jQuery( selectors, context || this.context ) :
-				0;
-
-		for ( ; i < l; i++ ) {
-			for ( cur = this[i]; cur && cur !== context; cur = cur.parentNode ) {
-				// Always skip document fragments
-				if ( cur.nodeType < 11 && (pos ?
-					pos.index(cur) > -1 :
-
-					// Don't pass non-elements to Sizzle
-					cur.nodeType === 1 &&
-						jQuery.find.matchesSelector(cur, selectors)) ) {
-
-					matched.push( cur );
-					break;
-				}
-			}
-		}
-
-		return this.pushStack( matched.length > 1 ? jQuery.unique( matched ) : matched );
-	},
-
-	// Determine the position of an element within the set
-	index: function( elem ) {
-
-		// No argument, return index in parent
-		if ( !elem ) {
-			return ( this[ 0 ] && this[ 0 ].parentNode ) ? this.first().prevAll().length : -1;
-		}
-
-		// Index in selector
-		if ( typeof elem === "string" ) {
-			return indexOf.call( jQuery( elem ), this[ 0 ] );
-		}
-
-		// Locate the position of the desired element
-		return indexOf.call( this,
-
-			// If it receives a jQuery object, the first element is used
-			elem.jquery ? elem[ 0 ] : elem
-		);
-	},
-
-	add: function( selector, context ) {
-		return this.pushStack(
-			jQuery.unique(
-				jQuery.merge( this.get(), jQuery( selector, context ) )
-			)
-		);
-	},
-
-	addBack: function( selector ) {
-		return this.add( selector == null ?
-			this.prevObject : this.prevObject.filter(selector)
-		);
-	}
-});
-
-function sibling( cur, dir ) {
-	while ( (cur = cur[dir]) && cur.nodeType !== 1 ) {}
-	return cur;
-}
-
-jQuery.each({
-	parent: function( elem ) {
-		var parent = elem.parentNode;
-		return parent && parent.nodeType !== 11 ? parent : null;
-	},
-	parents: function( elem ) {
-		return jQuery.dir( elem, "parentNode" );
-	},
-	parentsUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "parentNode", until );
-	},
-	next: function( elem ) {
-		return sibling( elem, "nextSibling" );
-	},
-	prev: function( elem ) {
-		return sibling( elem, "previousSibling" );
-	},
-	nextAll: function( elem ) {
-		return jQuery.dir( elem, "nextSibling" );
-	},
-	prevAll: function( elem ) {
-		return jQuery.dir( elem, "previousSibling" );
-	},
-	nextUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "nextSibling", until );
-	},
-	prevUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "previousSibling", until );
-	},
-	siblings: function( elem ) {
-		return jQuery.sibling( ( elem.parentNode || {} ).firstChild, elem );
-	},
-	children: function( elem ) {
-		return jQuery.sibling( elem.firstChild );
-	},
-	contents: function( elem ) {
-		return elem.contentDocument || jQuery.merge( [], elem.childNodes );
-	}
-}, function( name, fn ) {
-	jQuery.fn[ name ] = function( until, selector ) {
-		var matched = jQuery.map( this, fn, until );
-
-		if ( name.slice( -5 ) !== "Until" ) {
-			selector = until;
-		}
-
-		if ( selector && typeof selector === "string" ) {
-			matched = jQuery.filter( selector, matched );
-		}
-
-		if ( this.length > 1 ) {
-			// Remove duplicates
-			if ( !guaranteedUnique[ name ] ) {
-				jQuery.unique( matched );
-			}
-
-			// Reverse order for parents* and prev-derivatives
-			if ( rparentsprev.test( name ) ) {
-				matched.reverse();
-			}
-		}
-
-		return this.pushStack( matched );
-	};
-});
-
-return jQuery;
-});
diff --git a/#pma/js/jquery/src/jquery/traversing/findFilter.js b/#pma/js/jquery/src/jquery/traversing/findFilter.js
deleted file mode 100644
index dd70a73f..00000000
--- a/#pma/js/jquery/src/jquery/traversing/findFilter.js
+++ /dev/null
@@ -1,100 +0,0 @@
-define([
-	"../core",
-	"../var/indexOf",
-	"./var/rneedsContext",
-	"../selector"
-], function( jQuery, indexOf, rneedsContext ) {
-
-var risSimple = /^.[^:#\[\.,]*$/;
-
-// Implement the identical functionality for filter and not
-function winnow( elements, qualifier, not ) {
-	if ( jQuery.isFunction( qualifier ) ) {
-		return jQuery.grep( elements, function( elem, i ) {
-			/* jshint -W018 */
-			return !!qualifier.call( elem, i, elem ) !== not;
-		});
-
-	}
-
-	if ( qualifier.nodeType ) {
-		return jQuery.grep( elements, function( elem ) {
-			return ( elem === qualifier ) !== not;
-		});
-
-	}
-
-	if ( typeof qualifier === "string" ) {
-		if ( risSimple.test( qualifier ) ) {
-			return jQuery.filter( qualifier, elements, not );
-		}
-
-		qualifier = jQuery.filter( qualifier, elements );
-	}
-
-	return jQuery.grep( elements, function( elem ) {
-		return ( indexOf.call( qualifier, elem ) >= 0 ) !== not;
-	});
-}
-
-jQuery.filter = function( expr, elems, not ) {
-	var elem = elems[ 0 ];
-
-	if ( not ) {
-		expr = ":not(" + expr + ")";
-	}
-
-	return elems.length === 1 && elem.nodeType === 1 ?
-		jQuery.find.matchesSelector( elem, expr ) ? [ elem ] : [] :
-		jQuery.find.matches( expr, jQuery.grep( elems, function( elem ) {
-			return elem.nodeType === 1;
-		}));
-};
-
-jQuery.fn.extend({
-	find: function( selector ) {
-		var i,
-			len = this.length,
-			ret = [],
-			self = this;
-
-		if ( typeof selector !== "string" ) {
-			return this.pushStack( jQuery( selector ).filter(function() {
-				for ( i = 0; i < len; i++ ) {
-					if ( jQuery.contains( self[ i ], this ) ) {
-						return true;
-					}
-				}
-			}) );
-		}
-
-		for ( i = 0; i < len; i++ ) {
-			jQuery.find( selector, self[ i ], ret );
-		}
-
-		// Needed because $( selector, context ) becomes $( context ).find( selector )
-		ret = this.pushStack( len > 1 ? jQuery.unique( ret ) : ret );
-		ret.selector = this.selector ? this.selector + " " + selector : selector;
-		return ret;
-	},
-	filter: function( selector ) {
-		return this.pushStack( winnow(this, selector || [], false) );
-	},
-	not: function( selector ) {
-		return this.pushStack( winnow(this, selector || [], true) );
-	},
-	is: function( selector ) {
-		return !!winnow(
-			this,
-
-			// If this is a positional/relative selector, check membership in the returned set
-			// so $("p:first").is("p:last") won't return true for a doc with two "p".
-			typeof selector === "string" && rneedsContext.test( selector ) ?
-				jQuery( selector ) :
-				selector || [],
-			false
-		).length;
-	}
-});
-
-});
diff --git a/#pma/js/jquery/src/jquery/traversing/var/rneedsContext.js b/#pma/js/jquery/src/jquery/traversing/var/rneedsContext.js
deleted file mode 100644
index 3d6ae403..00000000
--- a/#pma/js/jquery/src/jquery/traversing/var/rneedsContext.js
+++ /dev/null
@@ -1,6 +0,0 @@
-define([
-	"../../core",
-	"../../selector"
-], function( jQuery ) {
-	return jQuery.expr.match.needsContext;
-});
diff --git a/#pma/js/jquery/src/jquery/var/arr.js b/#pma/js/jquery/src/jquery/var/arr.js
deleted file mode 100644
index b18fc9ce..00000000
--- a/#pma/js/jquery/src/jquery/var/arr.js
+++ /dev/null
@@ -1,3 +0,0 @@
-define(function() {
-	return [];
-});
diff --git a/#pma/js/jquery/src/jquery/var/class2type.js b/#pma/js/jquery/src/jquery/var/class2type.js
deleted file mode 100644
index e674c3ba..00000000
--- a/#pma/js/jquery/src/jquery/var/class2type.js
+++ /dev/null
@@ -1,4 +0,0 @@
-define(function() {
-	// [[Class]] -> type pairs
-	return {};
-});
diff --git a/#pma/js/jquery/src/jquery/var/concat.js b/#pma/js/jquery/src/jquery/var/concat.js
deleted file mode 100644
index 7dcf77e3..00000000
--- a/#pma/js/jquery/src/jquery/var/concat.js
+++ /dev/null
@@ -1,5 +0,0 @@
-define([
-	"./arr"
-], function( arr ) {
-	return arr.concat;
-});
diff --git a/#pma/js/jquery/src/jquery/var/hasOwn.js b/#pma/js/jquery/src/jquery/var/hasOwn.js
deleted file mode 100644
index 32c002af..00000000
--- a/#pma/js/jquery/src/jquery/var/hasOwn.js
+++ /dev/null
@@ -1,5 +0,0 @@
-define([
-	"./class2type"
-], function( class2type ) {
-	return class2type.hasOwnProperty;
-});
diff --git a/#pma/js/jquery/src/jquery/var/indexOf.js b/#pma/js/jquery/src/jquery/var/indexOf.js
deleted file mode 100644
index cdbe3c74..00000000
--- a/#pma/js/jquery/src/jquery/var/indexOf.js
+++ /dev/null
@@ -1,5 +0,0 @@
-define([
-	"./arr"
-], function( arr ) {
-	return arr.indexOf;
-});
diff --git a/#pma/js/jquery/src/jquery/var/pnum.js b/#pma/js/jquery/src/jquery/var/pnum.js
deleted file mode 100644
index 40704472..00000000
--- a/#pma/js/jquery/src/jquery/var/pnum.js
+++ /dev/null
@@ -1,3 +0,0 @@
-define(function() {
-	return (/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/).source;
-});
diff --git a/#pma/js/jquery/src/jquery/var/push.js b/#pma/js/jquery/src/jquery/var/push.js
deleted file mode 100644
index ad6f0a17..00000000
--- a/#pma/js/jquery/src/jquery/var/push.js
+++ /dev/null
@@ -1,5 +0,0 @@
-define([
-	"./arr"
-], function( arr ) {
-	return arr.push;
-});
diff --git a/#pma/js/jquery/src/jquery/var/rnotwhite.js b/#pma/js/jquery/src/jquery/var/rnotwhite.js
deleted file mode 100644
index 7c69bec5..00000000
--- a/#pma/js/jquery/src/jquery/var/rnotwhite.js
+++ /dev/null
@@ -1,3 +0,0 @@
-define(function() {
-	return (/\S+/g);
-});
diff --git a/#pma/js/jquery/src/jquery/var/slice.js b/#pma/js/jquery/src/jquery/var/slice.js
deleted file mode 100644
index 614d46ca..00000000
--- a/#pma/js/jquery/src/jquery/var/slice.js
+++ /dev/null
@@ -1,5 +0,0 @@
-define([
-	"./arr"
-], function( arr ) {
-	return arr.slice;
-});
diff --git a/#pma/js/jquery/src/jquery/var/strundefined.js b/#pma/js/jquery/src/jquery/var/strundefined.js
deleted file mode 100644
index 04e16b03..00000000
--- a/#pma/js/jquery/src/jquery/var/strundefined.js
+++ /dev/null
@@ -1,3 +0,0 @@
-define(function() {
-	return typeof undefined;
-});
diff --git a/#pma/js/jquery/src/jquery/var/support.js b/#pma/js/jquery/src/jquery/var/support.js
deleted file mode 100644
index b25dbc74..00000000
--- a/#pma/js/jquery/src/jquery/var/support.js
+++ /dev/null
@@ -1,4 +0,0 @@
-define(function() {
-	// All support tests are defined in their respective modules.
-	return {};
-});
diff --git a/#pma/js/jquery/src/jquery/var/toString.js b/#pma/js/jquery/src/jquery/var/toString.js
deleted file mode 100644
index ca92d222..00000000
--- a/#pma/js/jquery/src/jquery/var/toString.js
+++ /dev/null
@@ -1,5 +0,0 @@
-define([
-	"./class2type"
-], function( class2type ) {
-	return class2type.toString;
-});
diff --git a/#pma/js/jquery/src/jquery/wrap.js b/#pma/js/jquery/src/jquery/wrap.js
deleted file mode 100644
index 4958251d..00000000
--- a/#pma/js/jquery/src/jquery/wrap.js
+++ /dev/null
@@ -1,79 +0,0 @@
-define([
-	"./core",
-	"./core/init",
-	"./manipulation", // clone
-	"./traversing" // parent, contents
-], function( jQuery ) {
-
-jQuery.fn.extend({
-	wrapAll: function( html ) {
-		var wrap;
-
-		if ( jQuery.isFunction( html ) ) {
-			return this.each(function( i ) {
-				jQuery( this ).wrapAll( html.call(this, i) );
-			});
-		}
-
-		if ( this[ 0 ] ) {
-
-			// The elements to wrap the target around
-			wrap = jQuery( html, this[ 0 ].ownerDocument ).eq( 0 ).clone( true );
-
-			if ( this[ 0 ].parentNode ) {
-				wrap.insertBefore( this[ 0 ] );
-			}
-
-			wrap.map(function() {
-				var elem = this;
-
-				while ( elem.firstElementChild ) {
-					elem = elem.firstElementChild;
-				}
-
-				return elem;
-			}).append( this );
-		}
-
-		return this;
-	},
-
-	wrapInner: function( html ) {
-		if ( jQuery.isFunction( html ) ) {
-			return this.each(function( i ) {
-				jQuery( this ).wrapInner( html.call(this, i) );
-			});
-		}
-
-		return this.each(function() {
-			var self = jQuery( this ),
-				contents = self.contents();
-
-			if ( contents.length ) {
-				contents.wrapAll( html );
-
-			} else {
-				self.append( html );
-			}
-		});
-	},
-
-	wrap: function( html ) {
-		var isFunction = jQuery.isFunction( html );
-
-		return this.each(function( i ) {
-			jQuery( this ).wrapAll( isFunction ? html.call(this, i) : html );
-		});
-	},
-
-	unwrap: function() {
-		return this.parent().each(function() {
-			if ( !jQuery.nodeName( this, "body" ) ) {
-				jQuery( this ).replaceWith( this.childNodes );
-			}
-		}).end();
-	}
-});
-
-return jQuery;
-});
diff --git a/#pma/js/keyhandler.js b/#pma/js/keyhandler.js
deleted file mode 100644
index 387e717d..00000000
--- a/#pma/js/keyhandler.js
+++ /dev/null
@@ -1,144 +0,0 @@
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-
-// global var that holds: 0- if ctrl key is not pressed 1- if ctrl key is pressed
-var ctrlKeyHistory = 0;
-
-/**
-  * Allows moving around inputs/select by Ctrl+arrows
-  *
-  * @param object   event data
-  */
-function onKeyDownArrowsHandler(e)
-{
-    e = e || window.event;
-
-    var o = (e.srcElement || e.target);
-    if (!o) {
-        return;
-    }
-    if (o.tagName != "TEXTAREA" && o.tagName != "INPUT" && o.tagName != "SELECT") {
-        return;
-    }
-    if ((e.which != 17) && (e.which != 37) && (e.which != 38) && (e.which != 39) && (e.which !=40)) {
-        return;
-    }
-    if (!o.id) {
-        return;
-    }
-
-    if (e.type == "keyup") {
-        if (e.which==17) {
-            ctrlKeyHistory = 0;
-        }
-        return;
-    }
-    else if (e.type == "keydown") {
-        if (e.which == 17) {
-            ctrlKeyHistory = 1;
-        }
-    }
-
-    if (ctrlKeyHistory != 1) {
-        return;
-    }
-
-    e.preventDefault();
-
-    var pos = o.id.split("_");
-    if (pos[0] != "field" || typeof pos[2] == "undefined") {
-        return;
-    }
-
-    var x = pos[2], y = pos[1];
-
-    switch (e.keyCode) {
-    case 38:
-        // up
-        y--;
-        break;
-    case 40:
-        // down
-        y++;
-        break;
-    case 37:
-        // left
-        x--;
-        break;
-    case 39:
-        // right
-        x++;
-        break;
-    default:
-        return;
-    }
-
-    var is_firefox = navigator.userAgent.toLowerCase().indexOf("firefox/") > -1;
-
-    var id = "field_" + y + "_" + x;
-
-    var nO = document.getElementById(id);
-    if (! nO) {
-        id = "field_" + y + "_" + x + "_0";
-        nO = document.getElementById(id);
-    }
-
-    // skip non existent fields
-    if (! nO) {
-        return;
-    }
-
-    // for firefox select tag
-    var lvalue = o.selectedIndex;
-    var nOvalue = nO.selectedIndex;
-
-    nO.focus();
-
-    if (is_firefox) {
-        var ffcheck = 0;
-        var ffversion;
-        for (ffversion = 3 ; ffversion < 25 ; ffversion++) {
-            var is_firefox_v_24 = navigator.userAgent.toLowerCase().indexOf('firefox/'+ffversion) > -1;
-            if (is_firefox_v_24) {
-                ffcheck = 1;
-                break;
-            }
-        }
-        if (ffcheck == 1) {
-            if (e.which == 38 || e.which == 37) {
-                nOvalue++;
-            }
-            else if (e.which == 40 || e.which == 39) {
-                nOvalue--;
-            }
-            nO.selectedIndex=nOvalue;
-        }
-        else {
-            if (e.which == 38 || e.which == 37) {
-                lvalue++;
-            }
-            else if (e.which == 40 || e.which == 39) {
-                lvalue--;
-            }
-            o.selectedIndex=lvalue;
-        }
-    }
-
-    if (nO.tagName != 'SELECT') {
-        nO.select();
-    }
-    e.returnValue = false;
-}
-
-AJAX.registerTeardown('keyhandler.js', function () {
-    $(document).off('keydown keyup', '#table_columns');
-    $(document).off('keydown keyup', 'table.insertRowTable');
-});
-
-AJAX.registerOnload('keyhandler.js', function () {
-    $(document).on('keydown keyup', '#table_columns', function (event) {
-        onKeyDownArrowsHandler(event.originalEvent);
-    });
-    $(document).on('keydown keyup', 'table.insertRowTable', function (event) {
-        onKeyDownArrowsHandler(event.originalEvent);
-    });
-});
diff --git a/#pma/js/line_counts.php b/#pma/js/line_counts.php
deleted file mode 100644
index 2d266230..00000000
--- a/#pma/js/line_counts.php
+++ /dev/null
@@ -1,562 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * An autogenerated file that stores the line counts of javascript files
- *
- * @package PhpMyAdmin
- */
-
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
-define('LINE_COUNTS', true);
-$LINE_COUNT = array();
-
-$LINE_COUNT['server_variables.js'] = 160;
-$LINE_COUNT['cross_framing_protection.js'] = 14;
-$LINE_COUNT['tbl_zoom_plot_jqplot.js'] = 645;
-$LINE_COUNT['tbl_relation.js'] = 234;
-$LINE_COUNT['navigation.js'] = 1545;
-$LINE_COUNT['sprintf.js'] = 211;
-$LINE_COUNT['pmd/designer_objects.js'] = 17;
-$LINE_COUNT['pmd/history.js'] = 869;
-$LINE_COUNT['pmd/init.js'] = 41;
-$LINE_COUNT['pmd/designer_db.js'] = 136;
-$LINE_COUNT['pmd/designer_page.js'] = 172;
-$LINE_COUNT['pmd/move.js'] = 2097;
-$LINE_COUNT['error_report.js'] = 310;
-$LINE_COUNT['console.js'] = 1539;
-$LINE_COUNT['jqplot/plugins/jqplot.canvasTextRenderer.js'] = 448;
-$LINE_COUNT['jqplot/plugins/jqplot.byteFormatter.js'] = 46;
-$LINE_COUNT['jqplot/plugins/jqplot.pointLabels.js'] = 376;
-$LINE_COUNT['jqplot/plugins/jqplot.dateAxisRenderer.js'] = 741;
-$LINE_COUNT['jqplot/plugins/jqplot.canvasAxisLabelRenderer.js'] = 202;
-$LINE_COUNT['jqplot/plugins/jqplot.categoryAxisRenderer.js'] = 679;
-$LINE_COUNT['jqplot/plugins/jqplot.barRenderer.js'] = 800;
-$LINE_COUNT['jqplot/plugins/jqplot.highlighter.js'] = 464;
-$LINE_COUNT['jqplot/plugins/jqplot.cursor.js'] = 1108;
-$LINE_COUNT['jqplot/plugins/jqplot.pieRenderer.js'] = 903;
-$LINE_COUNT['jqplot/jquery.jqplot.js'] = 11411;
-$LINE_COUNT['keyhandler.js'] = 144;
-$LINE_COUNT['common.js'] = 544;
-$LINE_COUNT['server_status_variables.js'] = 111;
-$LINE_COUNT['db_tracking.js'] = 88;
-$LINE_COUNT['server_status_advisor.js'] = 99;
-$LINE_COUNT['page_settings.js'] = 59;
-$LINE_COUNT['import.js'] = 158;
-$LINE_COUNT['tbl_structure.js'] = 515;
-$LINE_COUNT['indexes.js'] = 756;
-$LINE_COUNT['server_status_sorter.js'] = 83;
-$LINE_COUNT['server_privileges.js'] = 431;
-$LINE_COUNT['tbl_operations.js'] = 304;
-$LINE_COUNT['server_status_processes.js'] = 188;
-$LINE_COUNT['menu-resizer.js'] = 183;
-$LINE_COUNT['gis_data_editor.js'] = 399;
-$LINE_COUNT['functions.js'] = 5013;
-$LINE_COUNT['db_central_columns.js'] = 239;
-$LINE_COUNT['codemirror/addon/runmode/runmode.js'] = 72;
-$LINE_COUNT['codemirror/addon/lint/sql-lint.js'] = 40;
-$LINE_COUNT['codemirror/addon/lint/lint.js'] = 209;
-$LINE_COUNT['codemirror/addon/hint/show-hint.js'] = 383;
-$LINE_COUNT['codemirror/addon/hint/sql-hint.js'] = 254;
-$LINE_COUNT['codemirror/mode/javascript/javascript.js'] = 704;
-$LINE_COUNT['codemirror/mode/xml/xml.js'] = 384;
-$LINE_COUNT['codemirror/mode/sql/sql.js'] = 391;
-$LINE_COUNT['codemirror/lib/codemirror.js'] = 8735;
-$LINE_COUNT['replication.js'] = 89;
-$LINE_COUNT['db_operations.js'] = 157;
-$LINE_COUNT['server_plugins.js'] = 17;
-$LINE_COUNT['makegrid.js'] = 2287;
-$LINE_COUNT['tbl_gis_visualization.js'] = 365;
-$LINE_COUNT['server_status_queries.js'] = 34;
-$LINE_COUNT['jquery/jquery.mousewheel.js'] = 221;
-$LINE_COUNT['jquery/jquery.debounce-1.0.5.js'] = 70;
-$LINE_COUNT['jquery/jquery.svg.js'] = 1352;
-$LINE_COUNT['jquery/jquery.ba-hashchange-1.3.js'] = 390;
-$LINE_COUNT['jquery/src/jquery-ui/core.js'] = 304;
-$LINE_COUNT['jquery/src/jquery-ui/effect-bounce.js'] = 123;
-$LINE_COUNT['jquery/src/jquery-ui/resizable.js'] = 1152;
-$LINE_COUNT['jquery/src/jquery-ui/droppable.js'] = 413;
-$LINE_COUNT['jquery/src/jquery-ui/effect-shake.js'] = 84;
-$LINE_COUNT['jquery/src/jquery-ui/dialog.js'] = 876;
-$LINE_COUNT['jquery/src/jquery-ui/effect-clip.js'] = 77;
-$LINE_COUNT['jquery/src/jquery-ui/effect-explode.js'] = 107;
-$LINE_COUNT['jquery/src/jquery-ui/position.js'] = 517;
-$LINE_COUNT['jquery/src/jquery-ui/effect-highlight.js'] = 60;
-$LINE_COUNT['jquery/src/jquery-ui/selectable.js'] = 287;
-$LINE_COUNT['jquery/src/jquery-ui/mouse.js'] = 199;
-$LINE_COUNT['jquery/src/jquery-ui/datepicker.js'] = 2084;
-$LINE_COUNT['jquery/src/jquery-ui/autocomplete.js'] = 628;
-$LINE_COUNT['jquery/src/jquery-ui/effect-drop.js'] = 75;
-$LINE_COUNT['jquery/src/jquery-ui/tabs.js'] = 886;
-$LINE_COUNT['jquery/src/jquery-ui/effect.js'] = 1301;
-$LINE_COUNT['jquery/src/jquery-ui/draggable.js'] = 1132;
-$LINE_COUNT['jquery/src/jquery-ui/effect-transfer.js'] = 57;
-$LINE_COUNT['jquery/src/jquery-ui/progressbar.js'] = 159;
-$LINE_COUNT['jquery/src/jquery-ui/spinner.js'] = 514;
-$LINE_COUNT['jquery/src/jquery-ui/effect-blind.js'] = 90;
-$LINE_COUNT['jquery/src/jquery-ui/menu.js'] = 646;
-$LINE_COUNT['jquery/src/jquery-ui/selectmenu.js'] = 615;
-$LINE_COUNT['jquery/src/jquery-ui/effect-fade.js'] = 40;
-$LINE_COUNT['jquery/src/jquery-ui/widget.js'] = 558;
-$LINE_COUNT['jquery/src/jquery-ui/effect-scale.js'] = 89;
-$LINE_COUNT['jquery/src/jquery-ui/sortable.js'] = 1315;
-$LINE_COUNT['jquery/src/jquery-ui/slider.js'] = 717;
-$LINE_COUNT['jquery/src/jquery-ui/button.js'] = 411;
-$LINE_COUNT['jquery/src/jquery-ui/effect-size.js'] = 233;
-$LINE_COUNT['jquery/src/jquery-ui/accordion.js'] = 590;
-$LINE_COUNT['jquery/src/jquery-ui/tooltip.js'] = 473;
-$LINE_COUNT['jquery/src/jquery-ui/effect-pulsate.js'] = 73;
-$LINE_COUNT['jquery/src/jquery-ui/effect-puff.js'] = 60;
-$LINE_COUNT['jquery/src/jquery-ui/effect-fold.js'] = 86;
-$LINE_COUNT['jquery/src/jquery-ui/effect-slide.js'] = 74;
-$LINE_COUNT['jquery/src/jquery/core.js'] = 502;
-$LINE_COUNT['jquery/src/jquery/css/var/getStyles.js'] = 12;
-$LINE_COUNT['jquery/src/jquery/css/var/rmargin.js'] = 3;
-$LINE_COUNT['jquery/src/jquery/css/var/isHidden.js'] = 13;
-$LINE_COUNT['jquery/src/jquery/css/var/cssExpand.js'] = 3;
-$LINE_COUNT['jquery/src/jquery/css/var/rnumnonpx.js'] = 5;
-$LINE_COUNT['jquery/src/jquery/css/hiddenVisibleSelectors.js'] = 15;
-$LINE_COUNT['jquery/src/jquery/css/defaultDisplay.js'] = 70;
-$LINE_COUNT['jquery/src/jquery/css/support.js'] = 96;
-$LINE_COUNT['jquery/src/jquery/css/addGetHookIf.js'] = 22;
-$LINE_COUNT['jquery/src/jquery/css/swap.js'] = 28;
-$LINE_COUNT['jquery/src/jquery/css/curCSS.js'] = 57;
-$LINE_COUNT['jquery/src/jquery/deprecated.js'] = 13;
-$LINE_COUNT['jquery/src/jquery/wrap.js'] = 79;
-$LINE_COUNT['jquery/src/jquery/jquery.js'] = 37;
-$LINE_COUNT['jquery/src/jquery/data/Data.js'] = 181;
-$LINE_COUNT['jquery/src/jquery/data/var/data_priv.js'] = 5;
-$LINE_COUNT['jquery/src/jquery/data/var/data_user.js'] = 5;
-$LINE_COUNT['jquery/src/jquery/data/accepts.js'] = 20;
-$LINE_COUNT['jquery/src/jquery/css.js'] = 450;
-$LINE_COUNT['jquery/src/jquery/selector.js'] = 1;
-$LINE_COUNT['jquery/src/jquery/intro.js'] = 44;
-$LINE_COUNT['jquery/src/jquery/event/alias.js'] = 39;
-$LINE_COUNT['jquery/src/jquery/event/support.js'] = 9;
-$LINE_COUNT['jquery/src/jquery/event/ajax.js'] = 13;
-$LINE_COUNT['jquery/src/jquery/offset.js'] = 207;
-$LINE_COUNT['jquery/src/jquery/manipulation.js'] = 580;
-$LINE_COUNT['jquery/src/jquery/var/strundefined.js'] = 3;
-$LINE_COUNT['jquery/src/jquery/var/hasOwn.js'] = 5;
-$LINE_COUNT['jquery/src/jquery/var/slice.js'] = 5;
-$LINE_COUNT['jquery/src/jquery/var/rnotwhite.js'] = 3;
-$LINE_COUNT['jquery/src/jquery/var/toString.js'] = 5;
-$LINE_COUNT['jquery/src/jquery/var/arr.js'] = 3;
-$LINE_COUNT['jquery/src/jquery/var/class2type.js'] = 4;
-$LINE_COUNT['jquery/src/jquery/var/indexOf.js'] = 5;
-$LINE_COUNT['jquery/src/jquery/var/support.js'] = 4;
-$LINE_COUNT['jquery/src/jquery/var/push.js'] = 5;
-$LINE_COUNT['jquery/src/jquery/var/pnum.js'] = 3;
-$LINE_COUNT['jquery/src/jquery/var/concat.js'] = 5;
-$LINE_COUNT['jquery/src/jquery/queue.js'] = 142;
-$LINE_COUNT['jquery/src/jquery/deferred.js'] = 149;
-$LINE_COUNT['jquery/src/jquery/traversing.js'] = 199;
-$LINE_COUNT['jquery/src/jquery/data.js'] = 178;
-$LINE_COUNT['jquery/src/jquery/effects/Tween.js'] = 114;
-$LINE_COUNT['jquery/src/jquery/effects/animatedSelector.js'] = 13;
-$LINE_COUNT['jquery/src/jquery/dimensions.js'] = 50;
-$LINE_COUNT['jquery/src/jquery/effects.js'] = 648;
-$LINE_COUNT['jquery/src/jquery/manipulation/var/rcheckableType.js'] = 3;
-$LINE_COUNT['jquery/src/jquery/manipulation/support.js'] = 32;
-$LINE_COUNT['jquery/src/jquery/manipulation/_evalUrl.js'] = 18;
-$LINE_COUNT['jquery/src/jquery/traversing/var/rneedsContext.js'] = 6;
-$LINE_COUNT['jquery/src/jquery/traversing/findFilter.js'] = 100;
-$LINE_COUNT['jquery/src/jquery/serialize.js'] = 111;
-$LINE_COUNT['jquery/src/jquery/queue/delay.js'] = 22;
-$LINE_COUNT['jquery/src/jquery/event.js'] = 868;
-$LINE_COUNT['jquery/src/jquery/selector-sizzle.js'] = 14;
-$LINE_COUNT['jquery/src/jquery/sizzle/test/unit/selector.js'] = 1149;
-$LINE_COUNT['jquery/src/jquery/sizzle/test/unit/utilities.js'] = 169;
-$LINE_COUNT['jquery/src/jquery/sizzle/test/unit/extending.js'] = 95;
-$LINE_COUNT['jquery/src/jquery/sizzle/test/jquery.js'] = 9596;
-$LINE_COUNT['jquery/src/jquery/sizzle/test/data/empty.js'] = 0;
-$LINE_COUNT['jquery/src/jquery/sizzle/test/data/testinit.js'] = 136;
-$LINE_COUNT['jquery/src/jquery/sizzle/dist/sizzle.js'] = 2067;
-$LINE_COUNT['jquery/src/jquery/sizzle/dist/sizzle.min.js'] = 2;
-$LINE_COUNT['jquery/src/jquery/attributes/attr.js'] = 141;
-$LINE_COUNT['jquery/src/jquery/attributes/prop.js'] = 94;
-$LINE_COUNT['jquery/src/jquery/attributes/val.js'] = 161;
-$LINE_COUNT['jquery/src/jquery/attributes/support.js'] = 35;
-$LINE_COUNT['jquery/src/jquery/attributes/classes.js'] = 158;
-$LINE_COUNT['jquery/src/jquery/callbacks.js'] = 205;
-$LINE_COUNT['jquery/src/jquery/ajax/parseXML.js'] = 28;
-$LINE_COUNT['jquery/src/jquery/ajax/var/nonce.js'] = 5;
-$LINE_COUNT['jquery/src/jquery/ajax/var/rquery.js'] = 3;
-$LINE_COUNT['jquery/src/jquery/ajax/parseJSON.js'] = 13;
-$LINE_COUNT['jquery/src/jquery/ajax/xhr.js'] = 136;
-$LINE_COUNT['jquery/src/jquery/ajax/jsonp.js'] = 89;
-$LINE_COUNT['jquery/src/jquery/ajax/script.js'] = 64;
-$LINE_COUNT['jquery/src/jquery/ajax/load.js'] = 75;
-$LINE_COUNT['jquery/src/jquery/exports/amd.js'] = 24;
-$LINE_COUNT['jquery/src/jquery/exports/global.js'] = 32;
-$LINE_COUNT['jquery/src/jquery/selector-native.js'] = 172;
-$LINE_COUNT['jquery/src/jquery/core/init.js'] = 123;
-$LINE_COUNT['jquery/src/jquery/core/ready.js'] = 97;
-$LINE_COUNT['jquery/src/jquery/core/var/rsingleTag.js'] = 4;
-$LINE_COUNT['jquery/src/jquery/core/access.js'] = 60;
-$LINE_COUNT['jquery/src/jquery/core/parseHTML.js'] = 39;
-$LINE_COUNT['jquery/src/jquery/outro.js'] = 1;
-$LINE_COUNT['jquery/src/jquery/attributes.js'] = 11;
-$LINE_COUNT['jquery/src/jquery/ajax.js'] = 786;
-$LINE_COUNT['jquery/jquery.sortableTable.js'] = 271;
-$LINE_COUNT['jquery/jquery-ui-1.11.4.min.js'] = 12;
-$LINE_COUNT['jquery/jquery.fullscreen.js'] = 60;
-$LINE_COUNT['jquery/jquery.cookie.js'] = 91;
-$LINE_COUNT['jquery/jquery.tablesorter.js'] = 1032;
-$LINE_COUNT['jquery/jquery.event.drag-2.2.js'] = 401;
-$LINE_COUNT['jquery/jquery-ui-timepicker-addon.js'] = 2223;
-$LINE_COUNT['jquery/jquery-2.1.4.min.js'] = 4;
-$LINE_COUNT['jquery/additional-methods.js'] = 939;
-$LINE_COUNT['jquery/jquery.validate.js'] = 1364;
-$LINE_COUNT['jquery/jquery.uitablefilter.js'] = 117;
-$LINE_COUNT['db_search.js'] = 246;
-$LINE_COUNT['rte.js'] = 1075;
-$LINE_COUNT['transformations/image_upload.js'] = 28;
-$LINE_COUNT['transformations/sql_editor.js'] = 12;
-$LINE_COUNT['transformations/json_editor.js'] = 17;
-$LINE_COUNT['transformations/xml_editor.js'] = 16;
-$LINE_COUNT['transformations/json.js'] = 17;
-$LINE_COUNT['transformations/xml.js'] = 18;
-$LINE_COUNT['normalization.js'] = 710;
-$LINE_COUNT['microhistory.js'] = 332;
-$LINE_COUNT['server_user_groups.js'] = 42;
-$LINE_COUNT['export.js'] = 858;
-$LINE_COUNT['sql.js'] = 916;
-$LINE_COUNT['tbl_find_replace.js'] = 47;
-$LINE_COUNT['multi_column_sort.js'] = 81;
-$LINE_COUNT['doclinks.js'] = 365;
-$LINE_COUNT['server_status_monitor.js'] = 2188;
-$LINE_COUNT['server_databases.js'] = 133;
-$LINE_COUNT['tbl_tracking.js'] = 99;
-$LINE_COUNT['config.js'] = 867;
-$LINE_COUNT['tbl_select.js'] = 407;
-$LINE_COUNT['tbl_chart.js'] = 415;
-$LINE_COUNT['tbl_change.js'] = 725;
-$LINE_COUNT['big_ints.js'] = 67;
-$LINE_COUNT['db_structure.js'] = 433;
-$LINE_COUNT['tracekit/tracekit.js'] = 1114;
-$LINE_COUNT['chart.js'] = 664;
-$LINE_COUNT['openlayers/src/openlayers/lib/deprecated.js'] = 5842;
-$LINE_COUNT['openlayers/src/openlayers/lib/Rico/Color.js'] = 253;
-$LINE_COUNT['openlayers/src/openlayers/lib/Rico/license.js'] = 19;
-$LINE_COUNT['openlayers/src/openlayers/lib/Rico/Corner.js'] = 339;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers.js'] = 429;
-$LINE_COUNT['openlayers/src/openlayers/lib/Firebug/firebugx.js'] = 10;
-$LINE_COUNT['openlayers/src/openlayers/lib/Firebug/firebug.js'] = 674;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Control.js'] = 371;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Tween.js'] = 361;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Lang/pl.js'] = 88;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Lang/sk.js'] = 44;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Lang/hr.js'] = 37;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Lang/gl.js'] = 53;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Lang/pt.js'] = 55;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Lang/oc.js'] = 53;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Lang/cs-CZ.js'] = 45;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Lang/pt-BR.js'] = 54;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Lang/fur.js'] = 35;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Lang/es.js'] = 90;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Lang/br.js'] = 53;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Lang/fr.js'] = 53;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Lang/nn.js'] = 19;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Lang/lt.js'] = 47;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Lang/ar.js'] = 32;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Lang/vi.js'] = 53;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Lang/zh-CN.js'] = 80;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Lang/zh-TW.js'] = 81;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Lang/km.js'] = 23;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Lang/ru.js'] = 56;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Lang/ca.js'] = 89;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Lang/hsb.js'] = 53;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Lang/en-CA.js'] = 21;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Lang/bg.js'] = 25;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Lang/fi.js'] = 32;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Lang/is.js'] = 27;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Lang/gsw.js'] = 53;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Lang/hu.js'] = 54;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Lang/ia.js'] = 53;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Lang/io.js'] = 19;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Lang/sv-SE.js'] = 45;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Lang/de.js'] = 55;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Lang/nb.js'] = 82;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Lang/ja.js'] = 54;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Lang/id.js'] = 54;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Lang/ksh.js'] = 53;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Lang/el.js'] = 19;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Lang/be-tarask.js'] = 54;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Lang/it.js'] = 80;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Lang/da-DK.js'] = 80;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Lang/nl.js'] = 53;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Lang/te.js'] = 27;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Lang/en.js'] = 89;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Lang/ro.js'] = 69;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Lang/nds.js'] = 37;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Geometry/LineString.js'] = 646;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Geometry/Curve.js'] = 89;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Geometry/Point.js'] = 283;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Geometry/Polygon.js'] = 255;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Geometry/Collection.js'] = 563;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Geometry/MultiPolygon.js'] = 42;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Geometry/LinearRing.js'] = 433;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Geometry/MultiPoint.js'] = 66;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Geometry/MultiLineString.js'] = 258;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Marker.js'] = 241;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Feature.js'] = 225;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Util/vendorPrefix.js'] = 130;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Control/ScaleLine.js'] = 220;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Control/TransformFeature.js'] = 624;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Control/Panel.js'] = 431;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Control/MousePosition.js'] = 227;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Control/CacheWrite.js'] = 257;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Control/WMSGetFeatureInfo.js'] = 532;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Control/EditingToolbar.js'] = 81;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Control/KeyboardDefaults.js'] = 142;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Control/PinchZoom.js'] = 157;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Control/SLDSelect.js'] = 567;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Control/SelectFeature.js'] = 643;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Control/Attribution.js'] = 104;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Control/Snapping.js'] = 560;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Control/ZoomBox.js'] = 129;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Control/Permalink.js'] = 257;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Control/Zoom.js'] = 138;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Control/ZoomPanel.js'] = 54;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Control/Graticule.js'] = 377;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Control/NavigationHistory.js'] = 423;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Control/WMTSGetFeatureInfo.js'] = 400;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Control/PanZoomBar.js'] = 407;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Control/UTFGrid.js'] = 240;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Control/DrawFeature.js'] = 229;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Control/Scale.js'] = 100;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Control/Geolocate.js'] = 192;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Control/ModifyFeature.js'] = 835;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Control/Navigation.js'] = 345;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Control/GetFeature.js'] = 597;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Control/NavToolbar.js'] = 57;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Control/DragFeature.js'] = 366;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Control/ArgParser.js'] = 182;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Control/PanZoom.js'] = 233;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Control/DragPan.js'] = 156;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Control/Button.js'] = 44;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Control/ZoomToMaxExtent.js'] = 35;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Control/ZoomOut.js'] = 29;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Control/LayerSwitcher.js'] = 521;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Control/PanPanel.js'] = 73;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Control/ZoomIn.js'] = 29;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Control/TouchNavigation.js'] = 182;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Control/OverviewMap.js'] = 750;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Control/Measure.js'] = 379;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Control/Split.js'] = 494;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Control/Pan.js'] = 95;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Control/CacheRead.js'] = 156;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/StyleMap.js'] = 161;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Marker/Box.js'] = 120;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/WPSClient.js'] = 223;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Layer/WorldWind.js'] = 105;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Layer/PointGrid.js'] = 299;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Layer/SphericalMercator.js'] = 146;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Layer/OSM.js'] = 123;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Layer/Vector/RootContainer.js'] = 154;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Layer/MapGuide.js'] = 443;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Layer/PointTrack.js'] = 125;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Layer/KaMapCache.js'] = 143;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Layer/Image.js'] = 259;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Layer/Boxes.js'] = 76;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Layer/FixedZoomLevels.js'] = 319;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Layer/KaMap.js'] = 192;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Layer/Grid.js'] = 1343;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Layer/MapServer.js'] = 181;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Layer/TileCache.js'] = 140;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Layer/ArcGIS93Rest.js'] = 225;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Layer/ArcIMS.js'] = 425;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Layer/WMS.js'] = 267;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Layer/Bing.js'] = 333;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Layer/UTFGrid.js'] = 184;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Layer/Vector.js'] = 1007;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Layer/Text.js'] = 267;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Layer/EventPane.js'] = 441;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Layer/TMS.js'] = 202;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Layer/Google/v3.js'] = 351;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Layer/HTTPRequest.js'] = 230;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Layer/ArcGISCache.js'] = 480;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Layer/WMTS.js'] = 510;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Layer/XYZ.js'] = 172;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Layer/Google.js'] = 809;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Layer/Markers.js'] = 187;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Layer/Zoomify.js'] = 260;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Layer/GeoRSS.js'] = 265;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Protocol.js'] = 291;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Layer.js'] = 1377;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Symbolizer.js'] = 55;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Projection.js'] = 322;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Handler.js'] = 325;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Lang.js'] = 134;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Popup.js'] = 1065;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/TileManager.js'] = 462;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Symbolizer/Line.js'] = 74;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Symbolizer/Point.js'] = 157;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Symbolizer/Polygon.js'] = 88;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Symbolizer/Raster.js'] = 34;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Symbolizer/Text.js'] = 70;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format.js'] = 123;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Style2.js'] = 112;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/SingleFile.js'] = 78;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/BaseTypes/Size.js'] = 89;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/BaseTypes/Pixel.js'] = 143;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/BaseTypes/Bounds.js'] = 837;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/BaseTypes/Class.js'] = 121;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/BaseTypes/LonLat.js'] = 215;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/BaseTypes/Date.js'] = 123;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/BaseTypes/Element.js'] = 189;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Kinetic.js'] = 178;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Spherical.js'] = 67;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Map.js'] = 2867;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/OWSContext/v0_3_1.js'] = 595;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/WMC/v1_0_0.js'] = 104;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/WMC/v1.js'] = 1267;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/WMC/v1_1_0.js'] = 149;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/SOSCapabilities.js'] = 48;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/WCSGetCoverage.js'] = 199;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/CSWGetRecords.js'] = 34;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/WMTSCapabilities/v1_0_0.js'] = 251;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/CQL.js'] = 452;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/WCSCapabilities/v1_0_0.js'] = 170;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/WCSCapabilities/v1.js'] = 54;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/WCSCapabilities/v1_1_0.js'] = 109;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/ArcXML/Features.js'] = 46;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/WMSGetFeatureInfo.js'] = 296;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/Atom.js'] = 712;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/OSM.js'] = 465;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/GeoJSON.js'] = 716;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/WMSDescribeLayer.js'] = 53;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/ArcXML.js'] = 1028;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/CSWGetDomain.js'] = 34;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/WMC.js'] = 182;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/WMTSCapabilities.js'] = 230;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/Context.js'] = 334;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/QueryStringFilter.js'] = 183;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/JSON.js'] = 398;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/XLS.js'] = 68;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/SOSGetFeatureOfInterest.js'] = 190;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/XLS/v1.js'] = 304;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/XLS/v1_1_0.js'] = 48;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/WMSDescribeLayer/v1_1.js'] = 122;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/SLD.js'] = 81;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/GPX.js'] = 385;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/WCSCapabilities.js'] = 47;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/OWSCommon.js'] = 78;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/WPSDescribeProcess.js'] = 185;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/WMSCapabilities/v1_3_0.js'] = 30;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/WMSCapabilities/v1_1_1.js'] = 60;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/WMSCapabilities/v1.js'] = 368;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/WMSCapabilities/v1_1_1_WMSC.js'] = 85;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/WMSCapabilities/v1_1.js'] = 122;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/WMSCapabilities/v1_1_0.js'] = 57;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/WMSCapabilities/v1_3.js'] = 128;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/OGCExceptionReport.js'] = 108;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/SOSGetObservation.js'] = 302;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/WPSCapabilities/v1_0_0.js'] = 119;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/XML/VersionedOGC.js'] = 212;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/WFSDescribeFeatureType.js'] = 234;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/Text.js'] = 151;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/SLD/v1_0_0.js'] = 46;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/SLD/v1_0_0_GeoServer.js'] = 149;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/SLD/v1.js'] = 1309;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/GML/Base.js'] = 645;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/GML/v3.js'] = 477;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/GML/v2.js'] = 193;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/EncodedPolyline.js'] = 557;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/WPSCapabilities.js'] = 48;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/GML.js'] = 923;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/Filter.js'] = 53;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/CSWGetRecords/v2_0_2.js'] = 457;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/WFSCapabilities.js'] = 47;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/WKT.js'] = 392;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/XML.js'] = 897;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/WFS.js'] = 223;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/WPSExecute.js'] = 395;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/WFST/v1_0_0.js'] = 174;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/WFST/v1.js'] = 446;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/WFST/v1_1_0.js'] = 189;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/WFST.js'] = 34;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/OWSContext.js'] = 86;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/KML.js'] = 1517;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/CSWGetDomain/v2_0_2.js'] = 240;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/SOSCapabilities/v1_0_0.js'] = 158;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/OWSCommon/v1_0_0.js'] = 62;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/OWSCommon/v1.js'] = 318;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/OWSCommon/v1_1_0.js'] = 116;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/WFSCapabilities/v1_0_0.js'] = 115;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/WFSCapabilities/v1.js'] = 129;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/WFSCapabilities/v1_1_0.js'] = 63;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/WMSCapabilities.js'] = 56;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/Filter/v1_0_0.js'] = 183;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/Filter/v1.js'] = 504;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/Filter/v1_1_0.js'] = 222;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Format/GeoRSS.js'] = 409;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Geometry.js'] = 500;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Renderer/SVG.js'] = 1012;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Renderer/Elements.js'] = 1053;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Renderer/VML.js'] = 985;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Renderer/Canvas.js'] = 906;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Console.js'] = 250;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Protocol/CSW.js'] = 30;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Protocol/HTTP.js'] = 580;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Protocol/Script.js'] = 377;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Protocol/CSW/v2_0_2.js'] = 127;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Protocol/WFS/v1_0_0.js'] = 44;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Protocol/WFS/v1.js'] = 453;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Protocol/WFS/v1_1_0.js'] = 68;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Protocol/WFS.js'] = 86;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Protocol/SOS.js'] = 33;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Protocol/SOS/v1_0_0.js'] = 133;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/BaseTypes.js'] = 463;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Filter.js'] = 87;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/WPSProcess.js'] = 501;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Animation.js'] = 102;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Strategy/Save.js'] = 231;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Strategy/Refresh.js'] = 141;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Strategy/Cluster.js'] = 283;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Strategy/BBOX.js'] = 290;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Strategy/Filter.js'] = 159;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Strategy/Paging.js'] = 233;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Strategy/Fixed.js'] = 135;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Renderer.js'] = 432;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Events/featureclick.js'] = 321;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Events/buttonclick.js'] = 206;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Tile/Image.js'] = 510;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Tile/UTFGrid.js'] = 252;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Tile/Image/IFrame.js'] = 233;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Strategy.js'] = 121;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Util.js'] = 1773;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Request/XMLHttpRequest.js'] = 458;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Style.js'] = 448;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Request.js'] = 429;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Popup/Anchored.js'] = 195;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Popup/FramedCloud.js'] = 227;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Popup/Framed.js'] = 343;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Rule.js'] = 235;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Icon.js'] = 243;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Events.js'] = 1170;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Handler/RegularPolygon.js'] = 429;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Handler/Feature.js'] = 434;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Handler/Point.js'] = 556;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Handler/Polygon.js'] = 305;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Handler/MouseWheel.js'] = 264;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Handler/Drag.js'] = 547;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Handler/Keyboard.js'] = 117;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Handler/Box.js'] = 244;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Handler/Click.js'] = 505;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Handler/Path.js'] = 543;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Handler/Hover.js'] = 180;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Handler/Pinch.js'] = 239;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Filter/Comparison.js'] = 267;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Filter/Logical.js'] = 121;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Filter/Spatial.js'] = 122;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Filter/FeatureId.js'] = 87;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Filter/Function.js'] = 49;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Feature/Vector.js'] = 510;
-$LINE_COUNT['openlayers/src/openlayers/lib/OpenLayers/Tile.js'] = 292;
-$LINE_COUNT['openlayers/OpenLayers.js'] = 1443;
-$LINE_COUNT['db_qbe.js'] = 76;
-$LINE_COUNT['ajax.js'] = 797;
diff --git a/#pma/js/makegrid.js b/#pma/js/makegrid.js
deleted file mode 100644
index 37c43c51..00000000
--- a/#pma/js/makegrid.js
+++ /dev/null
@@ -1,2287 +0,0 @@
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Create advanced table (resize, reorder, and show/hide columns; and also grid editing).
- * This function is designed mainly for table DOM generated from browsing a table in the database.
- * For using this function in other table DOM, you may need to:
- * - add "draggable" class in the table header <th>, in order to make it resizable, sortable or hidable
- * - have at least one non-"draggable" header in the table DOM for placing column visibility drop-down arrow
- * - pass the value "false" for the parameter "enableGridEdit"
- * - adjust other parameter value, to select which features that will be enabled
- *
- * @param t the table DOM element
- * @param enableResize Optional, if false, column resizing feature will be disabled
- * @param enableReorder Optional, if false, column reordering feature will be disabled
- * @param enableVisib Optional, if false, show/hide column feature will be disabled
- * @param enableGridEdit Optional, if false, grid editing feature will be disabled
- */
-function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdit) {
-    var g = {
-        /***********
-         * Constant
-         ***********/
-        minColWidth: 15,
-
-
-        /***********
-         * Variables, assigned with default value, changed later
-         ***********/
-        actionSpan: 5,              // number of colspan in Actions header in a table
-        tableCreateTime: null,      // table creation time, used for saving column order and visibility to server, only available in "Browse tab"
-
-        // Column reordering variables
-        colOrder: [],      // array of column order
-
-        // Column visibility variables
-        colVisib: [],      // array of column visibility
-        showAllColText: '',         // string, text for "show all" button under column visibility list
-        visibleHeadersCount: 0,     // number of visible data headers
-
-        // Table hint variables
-        reorderHint: '',            // string, hint for column reordering
-        sortHint: '',               // string, hint for column sorting
-        markHint: '',               // string, hint for column marking
-        copyHint: '',               // string, hint for copy column name
-        showReorderHint: false,
-        showSortHint: false,
-        showMarkHint: false,
-
-        // Grid editing
-        isCellEditActive: false,    // true if current focus is in edit cell
-        isEditCellTextEditable: false,  // true if current edit cell is editable in the text input box (not textarea)
-        currentEditCell: null,      // reference to <td> that currently being edited
-        cellEditHint: '',           // hint shown when doing grid edit
-        gotoLinkText: '',           // "Go to link" text
-        wasEditedCellNull: false,   // true if last value of the edited cell was NULL
-        maxTruncatedLen: 0,         // number of characters that can be displayed in a cell
-        saveCellsAtOnce: false,     // $cfg[saveCellsAtOnce]
-        isCellEdited: false,        // true if at least one cell has been edited
-        saveCellWarning: '',        // string, warning text when user want to leave a page with unsaved edited data
-        lastXHR : null,             // last XHR object used in AJAX request
-        isSaving: false,            // true when currently saving edited data, used to handle double posting caused by pressing ENTER in grid edit text box in Chrome browser
-        alertNonUnique: '',         // string, alert shown when saving edited nonunique table
-
-        // Common hidden inputs
-        token: null,
-        server: null,
-        db: null,
-        table: null,
-
-
-        /************
-         * Functions
-         ************/
-
-        /**
-         * Start to resize column. Called when clicking on column separator.
-         *
-         * @param e event
-         * @param obj dragged div object
-         */
-        dragStartRsz: function (e, obj) {
-            var n = $(g.cRsz).find('div').index(obj);    // get the index of separator (i.e., column index)
-            $(obj).addClass('colborder_active');
-            g.colRsz = {
-                x0: e.pageX,
-                n: n,
-                obj: obj,
-                objLeft: $(obj).position().left,
-                objWidth: $(g.t).find('th.draggable:visible:eq(' + n + ') span').outerWidth()
-            };
-            $(document.body).css('cursor', 'col-resize').noSelect();
-            if (g.isCellEditActive) {
-                g.hideEditCell();
-            }
-        },
-
-        /**
-         * Start to reorder column. Called when clicking on table header.
-         *
-         * @param e event
-         * @param obj table header object
-         */
-        dragStartReorder: function (e, obj) {
-            // prepare the cCpy (column copy) and cPointer (column pointer) from the dragged column
-            $(g.cCpy).text($(obj).text());
-            var objPos = $(obj).position();
-            $(g.cCpy).css({
-                top: objPos.top + 20,
-                left: objPos.left,
-                height: $(obj).height(),
-                width: $(obj).width()
-            });
-            $(g.cPointer).css({
-                top: objPos.top
-            });
-
-            // get the column index, zero-based
-            var n = g.getHeaderIdx(obj);
-
-            g.colReorder = {
-                x0: e.pageX,
-                y0: e.pageY,
-                n: n,
-                newn: n,
-                obj: obj,
-                objTop: objPos.top,
-                objLeft: objPos.left
-            };
-
-            $(document.body).css('cursor', 'move').noSelect();
-            if (g.isCellEditActive) {
-                g.hideEditCell();
-            }
-        },
-
-        /**
-         * Handle mousemove event when dragging.
-         *
-         * @param e event
-         */
-        dragMove: function (e) {
-            if (g.colRsz) {
-                var dx = e.pageX - g.colRsz.x0;
-                if (g.colRsz.objWidth + dx > g.minColWidth) {
-                    $(g.colRsz.obj).css('left', g.colRsz.objLeft + dx + 'px');
-                }
-            } else if (g.colReorder) {
-                // dragged column animation
-                var dx = e.pageX - g.colReorder.x0;
-                $(g.cCpy)
-                    .css('left', g.colReorder.objLeft + dx)
-                    .show();
-
-                // pointer animation
-                var hoveredCol = g.getHoveredCol(e);
-                if (hoveredCol) {
-                    var newn = g.getHeaderIdx(hoveredCol);
-                    g.colReorder.newn = newn;
-                    if (newn != g.colReorder.n) {
-                        // show the column pointer in the right place
-                        var colPos = $(hoveredCol).position();
-                        var newleft = newn < g.colReorder.n ?
-                                      colPos.left :
-                                      colPos.left + $(hoveredCol).outerWidth();
-                        $(g.cPointer)
-                            .css({
-                                left: newleft,
-                                visibility: 'visible'
-                            });
-                    } else {
-                        // no movement to other column, hide the column pointer
-                        $(g.cPointer).css('visibility', 'hidden');
-                    }
-                }
-            }
-        },
-
-        /**
-         * Stop the dragging action.
-         *
-         * @param e event
-         */
-        dragEnd: function (e) {
-            if (g.colRsz) {
-                var dx = e.pageX - g.colRsz.x0;
-                var nw = g.colRsz.objWidth + dx;
-                if (nw < g.minColWidth) {
-                    nw = g.minColWidth;
-                }
-                var n = g.colRsz.n;
-                // do the resizing
-                g.resize(n, nw);
-
-                g.reposRsz();
-                g.reposDrop();
-                g.colRsz = false;
-                $(g.cRsz).find('div').removeClass('colborder_active');
-                rearrangeStickyColumns($(t).prev('.sticky_columns'), $(t));
-            } else if (g.colReorder) {
-                // shift columns
-                if (g.colReorder.newn != g.colReorder.n) {
-                    g.shiftCol(g.colReorder.n, g.colReorder.newn);
-                    // assign new position
-                    var objPos = $(g.colReorder.obj).position();
-                    g.colReorder.objTop = objPos.top;
-                    g.colReorder.objLeft = objPos.left;
-                    g.colReorder.n = g.colReorder.newn;
-                    // send request to server to remember the column order
-                    if (g.tableCreateTime) {
-                        g.sendColPrefs();
-                    }
-                    g.refreshRestoreButton();
-                }
-
-                // animate new column position
-                $(g.cCpy).stop(true, true)
-                    .animate({
-                        top: g.colReorder.objTop,
-                        left: g.colReorder.objLeft
-                    }, 'fast')
-                    .fadeOut();
-                $(g.cPointer).css('visibility', 'hidden');
-
-                g.colReorder = false;
-                rearrangeStickyColumns($(t).prev('.sticky_columns'), $(t));
-            }
-            $(document.body).css('cursor', 'inherit').noSelect(false);
-        },
-
-        /**
-         * Resize column n to new width "nw"
-         *
-         * @param n zero-based column index
-         * @param nw new width of the column in pixel
-         */
-        resize: function (n, nw) {
-            $(g.t).find('tr').each(function () {
-                $(this).find('th.draggable:visible:eq(' + n + ') span,' +
-                             'td:visible:eq(' + (g.actionSpan + n) + ') span')
-                       .css('width', nw);
-            });
-        },
-
-        /**
-         * Reposition column resize bars.
-         */
-        reposRsz: function () {
-            $(g.cRsz).find('div').hide();
-            var $firstRowCols = $(g.t).find('tr:first th.draggable:visible');
-            var $resizeHandles = $(g.cRsz).find('div').removeClass('condition');
-            $(g.t).find('table.pma_table').find('thead th:first').removeClass('before-condition');
-            for (var n = 0, l = $firstRowCols.length; n < l; n++) {
-                var $col = $($firstRowCols[n]);
-                var colWidth;
-                if (navigator.userAgent.toLowerCase().indexOf("safari") != -1) {
-                    colWidth = $col.outerWidth();
-                } else {
-                    colWidth = $col.outerWidth(true);
-                }
-                $($resizeHandles[n]).css('left', $col.position().left + colWidth)
-                   .show();
-                if ($col.hasClass('condition')) {
-                    $($resizeHandles[n]).addClass('condition');
-                    if (n > 0) {
-                        $($resizeHandles[n - 1]).addClass('condition');
-                    }
-                }
-            }
-            if ($($resizeHandles[0]).hasClass('condition')) {
-                $(g.t).find('thead th:first').addClass('before-condition');
-            }
-            $(g.cRsz).css('height', $(g.t).height());
-        },
-
-        /**
-         * Shift column from index oldn to newn.
-         *
-         * @param oldn old zero-based column index
-         * @param newn new zero-based column index
-         */
-        shiftCol: function (oldn, newn) {
-            $(g.t).find('tr').each(function () {
-                if (newn < oldn) {
-                    $(this).find('th.draggable:eq(' + newn + '),' +
-                                 'td:eq(' + (g.actionSpan + newn) + ')')
-                           .before($(this).find('th.draggable:eq(' + oldn + '),' +
-                                                'td:eq(' + (g.actionSpan + oldn) + ')'));
-                } else {
-                    $(this).find('th.draggable:eq(' + newn + '),' +
-                                 'td:eq(' + (g.actionSpan + newn) + ')')
-                           .after($(this).find('th.draggable:eq(' + oldn + '),' +
-                                               'td:eq(' + (g.actionSpan + oldn) + ')'));
-                }
-            });
-            // reposition the column resize bars
-            g.reposRsz();
-
-            // adjust the column visibility list
-            if (newn < oldn) {
-                $(g.cList).find('.lDiv div:eq(' + newn + ')')
-                          .before($(g.cList).find('.lDiv div:eq(' + oldn + ')'));
-            } else {
-                $(g.cList).find('.lDiv div:eq(' + newn + ')')
-                          .after($(g.cList).find('.lDiv div:eq(' + oldn + ')'));
-            }
-            // adjust the colOrder
-            var tmp = g.colOrder[oldn];
-            g.colOrder.splice(oldn, 1);
-            g.colOrder.splice(newn, 0, tmp);
-            // adjust the colVisib
-            if (g.colVisib.length > 0) {
-                tmp = g.colVisib[oldn];
-                g.colVisib.splice(oldn, 1);
-                g.colVisib.splice(newn, 0, tmp);
-            }
-        },
-
-        /**
-         * Find currently hovered table column's header (excluding actions column).
-         *
-         * @param e event
-         * @return the hovered column's th object or undefined if no hovered column found.
-         */
-        getHoveredCol: function (e) {
-            var hoveredCol;
-            $headers = $(g.t).find('th.draggable:visible');
-            $headers.each(function () {
-                var left = $(this).offset().left;
-                var right = left + $(this).outerWidth();
-                if (left <= e.pageX && e.pageX <= right) {
-                    hoveredCol = this;
-                }
-            });
-            return hoveredCol;
-        },
-
-        /**
-         * Get a zero-based index from a <th class="draggable"> tag in a table.
-         *
-         * @param obj table header <th> object
-         * @return zero-based index of the specified table header in the set of table headers (visible or not)
-         */
-        getHeaderIdx: function (obj) {
-            return $(obj).parents('tr').find('th.draggable').index(obj);
-        },
-
-        /**
-         * Reposition the columns back to normal order.
-         */
-        restoreColOrder: function () {
-            // use insertion sort, since we already have shiftCol function
-            for (var i = 1; i < g.colOrder.length; i++) {
-                var x = g.colOrder[i];
-                var j = i - 1;
-                while (j >= 0 && x < g.colOrder[j]) {
-                    j--;
-                }
-                if (j != i - 1) {
-                    g.shiftCol(i, j + 1);
-                }
-            }
-            if (g.tableCreateTime) {
-                // send request to server to remember the column order
-                g.sendColPrefs();
-            }
-            g.refreshRestoreButton();
-        },
-
-        /**
-         * Send column preferences (column order and visibility) to the server.
-         */
-        sendColPrefs: function () {
-            if ($(g.t).is('.ajax')) {   // only send preferences if ajax class
-                var post_params = {
-                    ajax_request: true,
-                    db: g.db,
-                    table: g.table,
-                    token: g.token,
-                    server: g.server,
-                    set_col_prefs: true,
-                    table_create_time: g.tableCreateTime
-                };
-                if (g.colOrder.length > 0) {
-                    $.extend(post_params, {col_order: g.colOrder.toString()});
-                }
-                if (g.colVisib.length > 0) {
-                    $.extend(post_params, {col_visib: g.colVisib.toString()});
-                }
-                $.post('sql.php', post_params, function (data) {
-                    if (data.success !== true) {
-                        var $temp_div = $(document.createElement('div'));
-                        $temp_div.html(data.error);
-                        $temp_div.addClass("error");
-                        PMA_ajaxShowMessage($temp_div, false);
-                    }
-                });
-            }
-        },
-
-        /**
-         * Refresh restore button state.
-         * Make restore button disabled if the table is similar with initial state.
-         */
-        refreshRestoreButton: function () {
-            // check if table state is as initial state
-            var isInitial = true;
-            for (var i = 0; i < g.colOrder.length; i++) {
-                if (g.colOrder[i] != i) {
-                    isInitial = false;
-                    break;
-                }
-            }
-            // check if only one visible column left
-            var isOneColumn = g.visibleHeadersCount == 1;
-            // enable or disable restore button
-            if (isInitial || isOneColumn) {
-                $(g.o).find('div.restore_column').hide();
-            } else {
-                $(g.o).find('div.restore_column').show();
-            }
-        },
-
-        /**
-         * Update current hint using the boolean values (showReorderHint, showSortHint, etc.).
-         *
-         */
-        updateHint: function () {
-            var text = '';
-            if (!g.colRsz && !g.colReorder) {     // if not resizing or dragging
-                if (g.visibleHeadersCount > 1) {
-                    g.showReorderHint = true;
-                }
-                if ($(t).find('th.marker').length > 0) {
-                    g.showMarkHint = true;
-                }
-                if (g.showSortHint && g.sortHint) {
-                    text += text.length > 0 ? '<br />' : '';
-                    text += '- ' + g.sortHint;
-                }
-                if (g.showMultiSortHint && g.strMultiSortHint) {
-                    text += text.length > 0 ? '<br />' : '';
-                    text += '- ' + g.strMultiSortHint;
-                }
-                if (g.showMarkHint &&
-                    g.markHint &&
-                    ! g.showSortHint && // we do not show mark hint, when sort hint is shown
-                    g.showReorderHint &&
-                    g.reorderHint
-                ) {
-                    text += text.length > 0 ? '<br />' : '';
-                    text += '- ' + g.reorderHint;
-                    text += text.length > 0 ? '<br />' : '';
-                    text += '- ' + g.markHint;
-                    text += text.length > 0 ? '<br />' : '';
-                    text += '- ' + g.copyHint;
-                }
-            }
-            return text;
-        },
-
-        /**
-         * Toggle column's visibility.
-         * After calling this function and it returns true, afterToggleCol() must be called.
-         *
-         * @return boolean True if the column is toggled successfully.
-         */
-        toggleCol: function (n) {
-            if (g.colVisib[n]) {
-                // can hide if more than one column is visible
-                if (g.visibleHeadersCount > 1) {
-                    $(g.t).find('tr').each(function () {
-                        $(this).find('th.draggable:eq(' + n + '),' +
-                                     'td:eq(' + (g.actionSpan + n) + ')')
-                               .hide();
-                    });
-                    g.colVisib[n] = 0;
-                    $(g.cList).find('.lDiv div:eq(' + n + ') input').prop('checked', false);
-                } else {
-                    // cannot hide, force the checkbox to stay checked
-                    $(g.cList).find('.lDiv div:eq(' + n + ') input').prop('checked', true);
-                    return false;
-                }
-            } else {    // column n is not visible
-                $(g.t).find('tr').each(function () {
-                    $(this).find('th.draggable:eq(' + n + '),' +
-                                 'td:eq(' + (g.actionSpan + n) + ')')
-                           .show();
-                });
-                g.colVisib[n] = 1;
-                $(g.cList).find('.lDiv div:eq(' + n + ') input').prop('checked', true);
-            }
-            return true;
-        },
-
-        /**
-         * This must be called if toggleCol() returns is true.
-         *
-         * This function is separated from toggleCol because, sometimes, we want to toggle
-         * some columns together at one time and do just one adjustment after it, e.g. in showAllColumns().
-         */
-        afterToggleCol: function () {
-            // some adjustments after hiding column
-            g.reposRsz();
-            g.reposDrop();
-            g.sendColPrefs();
-
-            // check visible first row headers count
-            g.visibleHeadersCount = $(g.t).find('tr:first th.draggable:visible').length;
-            g.refreshRestoreButton();
-        },
-
-        /**
-         * Show columns' visibility list.
-         *
-         * @param obj The drop down arrow of column visibility list
-         */
-        showColList: function (obj) {
-            // only show when not resizing or reordering
-            if (!g.colRsz && !g.colReorder) {
-                var pos = $(obj).position();
-                // check if the list position is too right
-                if (pos.left + $(g.cList).outerWidth(true) > $(document).width()) {
-                    pos.left = $(document).width() - $(g.cList).outerWidth(true);
-                }
-                $(g.cList).css({
-                        left: pos.left,
-                        top: pos.top + $(obj).outerHeight(true)
-                    })
-                    .show();
-                $(obj).addClass('coldrop-hover');
-            }
-        },
-
-        /**
-         * Hide columns' visibility list.
-         */
-        hideColList: function () {
-            $(g.cList).hide();
-            $(g.cDrop).find('.coldrop-hover').removeClass('coldrop-hover');
-        },
-
-        /**
-         * Reposition the column visibility drop-down arrow.
-         */
-        reposDrop: function () {
-            var $th = $(t).find('th:not(.draggable)');
-            for (var i = 0; i < $th.length; i++) {
-                var $cd = $(g.cDrop).find('div:eq(' + i + ')');   // column drop-down arrow
-                var pos = $($th[i]).position();
-                $cd.css({
-                        left: pos.left + $($th[i]).width() - $cd.width(),
-                        top: pos.top
-                    });
-            }
-        },
-
-        /**
-         * Show all hidden columns.
-         */
-        showAllColumns: function () {
-            for (var i = 0; i < g.colVisib.length; i++) {
-                if (!g.colVisib[i]) {
-                    g.toggleCol(i);
-                }
-            }
-            g.afterToggleCol();
-        },
-
-        /**
-         * Show edit cell, if it can be shown
-         *
-         * @param cell <td> element to be edited
-         */
-        showEditCell: function (cell) {
-            if ($(cell).is('.grid_edit') &&
-                !g.colRsz && !g.colReorder)
-            {
-                if (!g.isCellEditActive) {
-                    var $cell = $(cell);
-
-                    if ('string' === $cell.attr('data-type') ||
-                        'blob' === $cell.attr('data-type')
-                    ) {
-                        g.cEdit = g.cEditTextarea;
-                    } else {
-                        g.cEdit = g.cEditStd;
-                    }
-
-                    // remove all edit area and hide it
-                    $(g.cEdit).find('.edit_area').empty().hide();
-                    // reposition the cEdit element
-                    $(g.cEdit).css({
-                            top: $cell.position().top,
-                            left: $cell.position().left
-                        })
-                        .show()
-                        .find('.edit_box')
-                        .css({
-                            width: $cell.outerWidth(),
-                            height: $cell.outerHeight()
-                        });
-                    // fill the cell edit with text from <td>
-                    var value = PMA_getCellValue(cell);
-                    $(g.cEdit).find('.edit_box').val(value);
-
-                    g.currentEditCell = cell;
-                    $(g.cEdit).find('.edit_box').focus();
-                    moveCursorToEnd($(g.cEdit).find('.edit_box'));
-                    $(g.cEdit).find('*').prop('disabled', false);
-                }
-            }
-
-            function moveCursorToEnd(input) {
-                var originalValue = input.val();
-                var originallength = originalValue.length;
-                input.val('');
-                input.blur().focus().val(originalValue);
-                input[0].setSelectionRange(originallength, originallength);
-            }
-        },
-
-        /**
-         * Remove edit cell and the edit area, if it is shown.
-         *
-         * @param force Optional, force to hide edit cell without saving edited field.
-         * @param data  Optional, data from the POST AJAX request to save the edited field
-         *              or just specify "true", if we want to replace the edited field with the new value.
-         * @param field Optional, the edited <td>. If not specified, the function will
-         *              use currently edited <td> from g.currentEditCell.
-         * @param field Optional, this object contains a boolean named move (true, if called from move* functions)
-         *              and a <td> to which the grid_edit should move
-         */
-        hideEditCell: function (force, data, field, options) {
-            if (g.isCellEditActive && !force) {
-                // cell is being edited, save or post the edited data
-                if (options !== undefined) {
-                    g.saveOrPostEditedCell(options);
-                } else {
-                    g.saveOrPostEditedCell();
-                }
-                return;
-            }
-
-            // cancel any previous request
-            if (g.lastXHR !== null) {
-                g.lastXHR.abort();
-                g.lastXHR = null;
-            }
-
-            if (data) {
-                if (g.currentEditCell) {    // save value of currently edited cell
-                    // replace current edited field with the new value
-                    var $this_field = $(g.currentEditCell);
-                    var is_null = $this_field.data('value') === null;
-                    if (is_null) {
-                        $this_field.find('span').html('NULL');
-                        $this_field.addClass('null');
-                    } else {
-                        $this_field.removeClass('null');
-                        var value = data.isNeedToRecheck
-                            ? data.truncatableFieldValue
-                            : $this_field.data('value');
-
-                        // Truncates the text.
-                        $this_field.removeClass('truncated');
-                        if (PMA_commonParams.get('pftext') === 'P' && value.length > g.maxTruncatedLen) {
-                            $this_field.addClass('truncated');
-                            value = value.substring(0, g.maxTruncatedLen) + '...';
-                        }
-
-                        //Add <br> before carriage return.
-                        new_html = escapeHtml(value);
-                        new_html = new_html.replace(/\n/g, '<br>\n');
-
-                        //remove decimal places if column type not supported
-                        if (($this_field.attr('data-decimals') == 0) && ( $this_field.attr('data-type').indexOf('time') != -1)) {
-                            new_html = new_html.substring(0, new_html.indexOf('.'));
-                        }
-
-                        //remove addtional decimal places
-                        if (($this_field.attr('data-decimals') > 0) && ( $this_field.attr('data-type').indexOf('time') != -1)){
-                            new_html = new_html.substring(0, new_html.length - (6 - $this_field.attr('data-decimals')));
-                        }
-
-                        var selector = 'span';
-                        if ($this_field.hasClass('hex') && $this_field.find('a').length) {
-                            selector = 'a';
-                        }
-
-                        // Updates the code keeping highlighting (if any).
-                        var $target = $this_field.find(selector);
-                        if (!PMA_updateCode($target, new_html, value)) {
-                            $target.html(new_html);
-                        }
-                    }
-                    if ($this_field.is('.bit')) {
-                        $this_field.find('span').text($this_field.data('value'));
-                    }
-                }
-                if (data.transformations !== undefined) {
-                    $.each(data.transformations, function (cell_index, value) {
-                        var $this_field = $(g.t).find('.to_be_saved:eq(' + cell_index + ')');
-                        $this_field.find('span').html(value);
-                    });
-                }
-                if (data.relations !== undefined) {
-                    $.each(data.relations, function (cell_index, value) {
-                        var $this_field = $(g.t).find('.to_be_saved:eq(' + cell_index + ')');
-                        $this_field.find('span').html(value);
-                    });
-                }
-
-                // refresh the grid
-                g.reposRsz();
-                g.reposDrop();
-            }
-
-            // hide the cell editing area
-            $(g.cEdit).hide();
-            $(g.cEdit).find('.edit_box').blur();
-            g.isCellEditActive = false;
-            g.currentEditCell = null;
-            // destroy datepicker in edit area, if exist
-            var $dp = $(g.cEdit).find('.hasDatepicker');
-            if ($dp.length > 0) {
-                $(document).bind('mousedown', $.datepicker._checkExternalClick);
-                $dp.datepicker('destroy');
-                // change the cursor in edit box back to normal
-                // (the cursor become a hand pointer when we add datepicker)
-                $(g.cEdit).find('.edit_box').css('cursor', 'inherit');
-            }
-        },
-
-        /**
-         * Show drop-down edit area when edit cell is focused.
-         */
-        showEditArea: function () {
-            if (!g.isCellEditActive) {   // make sure the edit area has not been shown
-                g.isCellEditActive = true;
-                g.isEditCellTextEditable = false;
-                /**
-                 * @var $td current edited cell
-                 */
-                var $td = $(g.currentEditCell);
-                /**
-                 * @var $editArea the editing area
-                 */
-                var $editArea = $(g.cEdit).find('.edit_area');
-                /**
-                 * @var where_clause WHERE clause for the edited cell
-                 */
-                var where_clause = $td.parent('tr').find('.where_clause').val();
-                /**
-                 * @var field_name  String containing the name of this field.
-                 * @see getFieldName()
-                 */
-                var field_name = getFieldName($(t), $td);
-                /**
-                 * @var relation_curr_value String current value of the field (for fields that are foreign keyed).
-                 */
-                var relation_curr_value = $td.text();
-                /**
-                 * @var relation_key_or_display_column String relational key if in 'Relational display column' mode,
-                 * relational display column if in 'Relational key' mode (for fields that are foreign keyed).
-                 */
-                var relation_key_or_display_column = $td.find('a').attr('title');
-                /**
-                 * @var curr_value String current value of the field (for fields that are of type enum or set).
-                 */
-                var curr_value = $td.find('span').text();
-
-                // empty all edit area, then rebuild it based on $td classes
-                $editArea.empty();
-
-                // remember this instead of testing more than once
-                var is_null = $td.is('.null');
-
-                // add goto link, if this cell contains a link
-                if ($td.find('a').length > 0) {
-                    var gotoLink = document.createElement('div');
-                    gotoLink.className = 'goto_link';
-                    $(gotoLink).append(g.gotoLinkText + ' ').append($td.find('a').clone());
-                    $editArea.append(gotoLink);
-                }
-
-                g.wasEditedCellNull = false;
-                if ($td.is(':not(.not_null)')) {
-                    // append a null checkbox
-                    $editArea.append('<div class="null_div">Null:<input type="checkbox"></div>');
-
-                    var $checkbox = $editArea.find('.null_div input');
-                    // check if current <td> is NULL
-                    if (is_null) {
-                        $checkbox.prop('checked', true);
-                        g.wasEditedCellNull = true;
-                    }
-
-                    // if the select/editor is changed un-check the 'checkbox_null_<field_name>_<row_index>'.
-                    if ($td.is('.enum, .set')) {
-                        $editArea.on('change', 'select', function () {
-                            $checkbox.prop('checked', false);
-                        });
-                    } else if ($td.is('.relation')) {
-                        $editArea.on('change', 'select', function () {
-                            $checkbox.prop('checked', false);
-                        });
-                        $editArea.on('click', '.browse_foreign', function () {
-                            $checkbox.prop('checked', false);
-                        });
-                    } else {
-                        $(g.cEdit).on('keypress change paste', '.edit_box', function () {
-                            $checkbox.prop('checked', false);
-                        });
-                        // Capture ctrl+v (on IE and Chrome)
-                        $(g.cEdit).on('keydown', '.edit_box', function (e) {
-                            if (e.ctrlKey && e.which == 86) {
-                                $checkbox.prop('checked', false);
-                            }
-                        });
-                        $editArea.on('keydown', 'textarea', function () {
-                            $checkbox.prop('checked', false);
-                        });
-                    }
-
-                    // if null checkbox is clicked empty the corresponding select/editor.
-                    $checkbox.click(function () {
-                        if ($td.is('.enum')) {
-                            $editArea.find('select').val('');
-                        } else if ($td.is('.set')) {
-                            $editArea.find('select').find('option').each(function () {
-                                var $option = $(this);
-                                $option.prop('selected', false);
-                            });
-                        } else if ($td.is('.relation')) {
-                            // if the dropdown is there to select the foreign value
-                            if ($editArea.find('select').length > 0) {
-                                $editArea.find('select').val('');
-                            }
-                        } else {
-                            $editArea.find('textarea').val('');
-                        }
-                        $(g.cEdit).find('.edit_box').val('');
-                    });
-                }
-
-                //reset the position of the edit_area div after closing datetime picker
-                $(g.cEdit).find('.edit_area').css({'top' :'0','position':''});
-
-                if ($td.is('.relation')) {
-                    //handle relations
-                    $editArea.addClass('edit_area_loading');
-
-                    // initialize the original data
-                    $td.data('original_data', null);
-
-                    /**
-                     * @var post_params Object containing parameters for the POST request
-                     */
-                    var post_params = {
-                        'ajax_request' : true,
-                        'get_relational_values' : true,
-                        'server' : g.server,
-                        'db' : g.db,
-                        'table' : g.table,
-                        'column' : field_name,
-                        'token' : g.token,
-                        'curr_value' : relation_curr_value,
-                        'relation_key_or_display_column' : relation_key_or_display_column
-                    };
-
-                    g.lastXHR = $.post('sql.php', post_params, function (data) {
-                        g.lastXHR = null;
-                        $editArea.removeClass('edit_area_loading');
-                        if ($(data.dropdown).is('select')) {
-                            // save original_data
-                            var value = $(data.dropdown).val();
-                            $td.data('original_data', value);
-                            // update the text input field, in case where the "Relational display column" is checked
-                            $(g.cEdit).find('.edit_box').val(value);
-                        }
-
-                        $editArea.append(data.dropdown);
-                        $editArea.append('<div class="cell_edit_hint">' + g.cellEditHint + '</div>');
-
-                        // for 'Browse foreign values' options,
-                        // hide the value next to 'Browse foreign values' link
-                        $editArea.find('span.curr_value').hide();
-                        // handle update for new values selected from new window
-                        $editArea.find('span.curr_value').change(function () {
-                            $(g.cEdit).find('.edit_box').val($(this).text());
-                        });
-                    }); // end $.post()
-
-                    $editArea.show();
-                    $editArea.on('change', 'select', function () {
-                        $(g.cEdit).find('.edit_box').val($(this).val());
-                    });
-                    g.isEditCellTextEditable = true;
-                }
-                else if ($td.is('.enum')) {
-                    //handle enum fields
-                    $editArea.addClass('edit_area_loading');
-
-                    /**
-                     * @var post_params Object containing parameters for the POST request
-                     */
-                    var post_params = {
-                        'ajax_request' : true,
-                        'get_enum_values' : true,
-                        'server' : g.server,
-                        'db' : g.db,
-                        'table' : g.table,
-                        'column' : field_name,
-                        'token' : g.token,
-                        'curr_value' : curr_value
-                    };
-                    g.lastXHR = $.post('sql.php', post_params, function (data) {
-                        g.lastXHR = null;
-                        $editArea.removeClass('edit_area_loading');
-                        $editArea.append(data.dropdown);
-                        $editArea.append('<div class="cell_edit_hint">' + g.cellEditHint + '</div>');
-                    }); // end $.post()
-
-                    $editArea.show();
-                    $editArea.on('change', 'select', function () {
-                        $(g.cEdit).find('.edit_box').val($(this).val());
-                    });
-                }
-                else if ($td.is('.set')) {
-                    //handle set fields
-                    $editArea.addClass('edit_area_loading');
-
-                    /**
-                     * @var post_params Object containing parameters for the POST request
-                     */
-                    var post_params = {
-                        'ajax_request' : true,
-                        'get_set_values' : true,
-                        'server' : g.server,
-                        'db' : g.db,
-                        'table' : g.table,
-                        'column' : field_name,
-                        'token' : g.token,
-                        'curr_value' : curr_value
-                    };
-
-                    // if the data is truncated, get the full data
-                    if ($td.is('.truncated')) {
-                        post_params.get_full_values = true;
-                        post_params.where_clause = PMA_urldecode(where_clause);
-                    }
-
-                    g.lastXHR = $.post('sql.php', post_params, function (data) {
-                        g.lastXHR = null;
-                        $editArea.removeClass('edit_area_loading');
-                        $editArea.append(data.select);
-                        $td.data('original_data', $(data.select).val().join());
-                        $editArea.append('<div class="cell_edit_hint">' + g.cellEditHint + '</div>');
-                    }); // end $.post()
-
-                    $editArea.show();
-                    $editArea.on('change', 'select', function () {
-                        $(g.cEdit).find('.edit_box').val($(this).val());
-                    });
-                }
-                else if ($td.is('.truncated, .transformed')) {
-                    if ($td.is('.to_be_saved')) {   // cell has been edited
-                        var value = $td.data('value');
-                        $(g.cEdit).find('.edit_box').val(value);
-                        $editArea.append('<textarea></textarea>');
-                        $editArea.find('textarea').val(value);
-                        $editArea
-                            .on('keyup', 'textarea', function () {
-                                $(g.cEdit).find('.edit_box').val($(this).val());
-                            });
-                        $(g.cEdit).on('keyup', '.edit_box', function () {
-                            $editArea.find('textarea').val($(this).val());
-                        });
-                        $editArea.append('<div class="cell_edit_hint">' + g.cellEditHint + '</div>');
-                    } else {
-                        //handle truncated/transformed values values
-                        $editArea.addClass('edit_area_loading');
-
-                        // initialize the original data
-                        $td.data('original_data', null);
-
-                        /**
-                         * @var sql_query   String containing the SQL query used to retrieve value of truncated/transformed data
-                         */
-                        var sql_query = 'SELECT `' + field_name + '` FROM `' + g.table + '` WHERE ' + PMA_urldecode(where_clause);
-
-                        // Make the Ajax call and get the data, wrap it and insert it
-                        g.lastXHR = $.post('sql.php', {
-                            'token' : g.token,
-                            'server' : g.server,
-                            'db' : g.db,
-                            'ajax_request' : true,
-                            'sql_query' : sql_query,
-                            'grid_edit' : true
-                        }, function (data) {
-                            g.lastXHR = null;
-                            $editArea.removeClass('edit_area_loading');
-                            if (typeof data !== 'undefined' && data.success === true) {
-                                $td.data('original_data', data.value);
-                                $(g.cEdit).find('.edit_box').val(data.value);
-                            } else {
-                                PMA_ajaxShowMessage(data.error, false);
-                            }
-                        }); // end $.post()
-                    }
-                    g.isEditCellTextEditable = true;
-                } else if ($td.is('.timefield, .datefield, .datetimefield, .timestampfield')) {
-                    var $input_field = $(g.cEdit).find('.edit_box');
-
-                    // remember current datetime value in $input_field, if it is not null
-                    var datetime_value = !is_null ? $input_field.val() : '';
-
-                    var showMillisec = false;
-                    var showMicrosec = false;
-                    var timeFormat = 'HH:mm:ss';
-                    // check for decimal places of seconds
-                    if (($td.attr('data-decimals') > 0) && ($td.attr('data-type').indexOf('time') != -1)){
-                        if (datetime_value && datetime_value.indexOf('.') === false) {
-                            datetime_value += '.';
-                        }
-                        if ($td.attr('data-decimals') > 3) {
-                            showMillisec = true;
-                            showMicrosec = true;
-                            timeFormat = 'HH:mm:ss.lc';
-
-                            if (datetime_value) {
-                                datetime_value += '000000';
-                                var datetime_value = datetime_value.substring(0, datetime_value.indexOf('.') + 7);
-                                $input_field.val(datetime_value);
-                            }
-                        } else {
-                            showMillisec = true;
-                            timeFormat = 'HH:mm:ss.l';
-
-                            if (datetime_value) {
-                                datetime_value += '000';
-                                var datetime_value = datetime_value.substring(0, datetime_value.indexOf('.') + 4);
-                                $input_field.val(datetime_value);
-                            }
-                        }
-                    }
-
-                    // add datetime picker
-                    PMA_addDatepicker($input_field, $td.attr('data-type'), {
-                        showMillisec: showMillisec,
-                        showMicrosec: showMicrosec,
-                        timeFormat: timeFormat
-                    });
-
-                    $input_field.on('keyup', function (e) {
-                        if (e.which == 13) {
-                            // post on pressing "Enter"
-                            e.preventDefault();
-                            e.stopPropagation();
-                            g.saveOrPostEditedCell();
-                        } else if (e.which == 27) {
-                        } else {
-                            toggleDatepickerIfInvalid($td, $input_field);
-                        }
-                    });
-
-                    $input_field.datepicker("show");
-                    toggleDatepickerIfInvalid($td, $input_field);
-
-                    // unbind the mousedown event to prevent the problem of
-                    // datepicker getting closed, needs to be checked for any
-                    // change in names when updating
-                    $(document).unbind('mousedown', $.datepicker._checkExternalClick);
-
-                    //move ui-datepicker-div inside cEdit div
-                    var datepicker_div = $('#ui-datepicker-div');
-                    datepicker_div.css({'top': 0, 'left': 0, 'position': 'relative'});
-                    $(g.cEdit).append(datepicker_div);
-
-                    // cancel any click on the datepicker element
-                    $editArea.find('> *').click(function (e) {
-                        e.stopPropagation();
-                    });
-
-                    g.isEditCellTextEditable = true;
-                } else {
-                    g.isEditCellTextEditable = true;
-                    // only append edit area hint if there is a null checkbox
-                    if ($editArea.children().length > 0) {
-                        $editArea.append('<div class="cell_edit_hint">' + g.cellEditHint + '</div>');
-                    }
-                }
-                if ($editArea.children().length > 0) {
-                    $editArea.show();
-                }
-            }
-        },
-
-        /**
-         * Post the content of edited cell.
-         *
-         * @param field Optional, this object contains a boolean named move (true, if called from move* functions)
-         *              and a <td> to which the grid_edit should move
-         */
-        postEditedCell: function (options) {
-            if (g.isSaving) {
-                return;
-            }
-            g.isSaving = true;
-            /**
-             * @var relation_fields Array containing the name/value pairs of relational fields
-             */
-            var relation_fields = {};
-            /**
-             * @var relational_display string 'K' if relational key, 'D' if relational display column
-             */
-            var relational_display = $(g.o).find("input[name=relational_display]:checked").val();
-            /**
-             * @var transform_fields    Array containing the name/value pairs for transformed fields
-             */
-            var transform_fields = {};
-            /**
-             * @var transformation_fields   Boolean, if there are any transformed fields in the edited cells
-             */
-            var transformation_fields = false;
-            /**
-             * @var full_sql_query String containing the complete SQL query to update this table
-             */
-            var full_sql_query = '';
-            /**
-             * @var rel_fields_list  String, url encoded representation of {@link relations_fields}
-             */
-            var rel_fields_list = '';
-            /**
-             * @var transform_fields_list  String, url encoded representation of {@link transform_fields}
-             */
-            var transform_fields_list = '';
-            /**
-             * @var where_clause Array containing where clause for updated fields
-             */
-            var full_where_clause = [];
-            /**
-             * @var is_unique   Boolean, whether the rows in this table is unique or not
-             */
-            var is_unique = $(g.t).find('td.edit_row_anchor').is('.nonunique') ? 0 : 1;
-            /**
-             * multi edit variables
-             */
-            var me_fields_name = [];
-            var me_fields_type = [];
-            var me_fields = [];
-            var me_fields_null = [];
-
-            // alert user if edited table is not unique
-            if (!is_unique) {
-                alert(g.alertNonUnique);
-            }
-
-            // loop each edited row
-            $(g.t).find('td.to_be_saved').parents('tr').each(function () {
-                var $tr = $(this);
-                var where_clause = $tr.find('.where_clause').val();
-                if (typeof where_clause === 'undefined') {
-                    where_clause = '';
-                }
-                full_where_clause.push(PMA_urldecode(where_clause));
-                var condition_array = jQuery.parseJSON($tr.find('.condition_array').val());
-
-                /**
-                 * multi edit variables, for current row
-                 * @TODO array indices are still not correct, they should be md5 of field's name
-                 */
-                var fields_name = [];
-                var fields_type = [];
-                var fields = [];
-                var fields_null = [];
-
-                // loop each edited cell in a row
-                $tr.find('.to_be_saved').each(function () {
-                    /**
-                     * @var $this_field    Object referring to the td that is being edited
-                     */
-                    var $this_field = $(this);
-
-                    /**
-                     * @var field_name  String containing the name of this field.
-                     * @see getFieldName()
-                     */
-                    var field_name = getFieldName($(g.t), $this_field);
-
-                    /**
-                     * @var this_field_params   Array temporary storage for the name/value of current field
-                     */
-                    var this_field_params = {};
-
-                    if ($this_field.is('.transformed')) {
-                        transformation_fields =  true;
-                    }
-                    this_field_params[field_name] = $this_field.data('value');
-
-                    /**
-                     * @var is_null String capturing whether 'checkbox_null_<field_name>_<row_index>' is checked.
-                     */
-                    var is_null = this_field_params[field_name] === null;
-
-                    fields_name.push(field_name);
-
-                    if (is_null) {
-                        fields_null.push('on');
-                        fields.push('');
-                    } else {
-                        if ($this_field.is('.bit')) {
-                            fields_type.push('bit');
-                        } else if ($this_field.hasClass('hex')) {
-                            fields_type.push('hex');
-                        }
-                        fields_null.push('');
-                        fields.push($this_field.data('value'));
-
-                        var cell_index = $this_field.index('.to_be_saved');
-                        if ($this_field.is(":not(.relation, .enum, .set, .bit)")) {
-                            if ($this_field.is('.transformed')) {
-                                transform_fields[cell_index] = {};
-                                $.extend(transform_fields[cell_index], this_field_params);
-                            }
-                        } else if ($this_field.is('.relation')) {
-                            relation_fields[cell_index] = {};
-                            $.extend(relation_fields[cell_index], this_field_params);
-                        }
-                    }
-                    // check if edited field appears in WHERE clause
-                    if (where_clause.indexOf(PMA_urlencode(field_name)) > -1) {
-                        var field_str = '`' + g.table + '`.' + '`' + field_name + '`';
-                        for (var field in condition_array) {
-                            if (field.indexOf(field_str) > -1) {
-                                condition_array[field] = is_null ? 'IS NULL' : "= '" + this_field_params[field_name].replace(/'/g, "''") + "'";
-                                break;
-                            }
-                        }
-                    }
-
-                }); // end of loop for every edited cells in a row
-
-                // save new_clause
-                var new_clause = '';
-                for (var field in condition_array) {
-                    new_clause += field + ' ' + condition_array[field] + ' AND ';
-                }
-                new_clause = new_clause.substring(0, new_clause.length - 5); // remove the last AND
-                new_clause = PMA_urlencode(new_clause);
-                $tr.data('new_clause', new_clause);
-                // save condition_array
-                $tr.find('.condition_array').val(JSON.stringify(condition_array));
-
-                me_fields_name.push(fields_name);
-                me_fields_type.push(fields_type);
-                me_fields.push(fields);
-                me_fields_null.push(fields_null);
-
-            }); // end of loop for every edited rows
-
-            rel_fields_list = $.param(relation_fields);
-            transform_fields_list = $.param(transform_fields);
-
-            // Make the Ajax post after setting all parameters
-            /**
-             * @var post_params Object containing parameters for the POST request
-             */
-            var post_params = {'ajax_request' : true,
-                            'sql_query' : full_sql_query,
-                            'token' : g.token,
-                            'server' : g.server,
-                            'db' : g.db,
-                            'table' : g.table,
-                            'clause_is_unique' : is_unique,
-                            'where_clause' : full_where_clause,
-                            'fields[multi_edit]' : me_fields,
-                            'fields_name[multi_edit]' : me_fields_name,
-                            'fields_type[multi_edit]' : me_fields_type,
-                            'fields_null[multi_edit]' : me_fields_null,
-                            'rel_fields_list' : rel_fields_list,
-                            'do_transformations' : transformation_fields,
-                            'transform_fields_list' : transform_fields_list,
-                            'relational_display' : relational_display,
-                            'goto' : 'sql.php',
-                            'submit_type' : 'save'
-                          };
-
-            if (!g.saveCellsAtOnce) {
-                $(g.cEdit).find('*').prop('disabled', true);
-                $(g.cEdit).find('.edit_box').addClass('edit_box_posting');
-            } else {
-                $(g.o).find('div.save_edited').addClass('saving_edited_data')
-                    .find('input').prop('disabled', true);    // disable the save button
-            }
-
-            $.ajax({
-                type: 'POST',
-                url: 'tbl_replace.php',
-                data: post_params,
-                success:
-                    function (data) {
-                        g.isSaving = false;
-                        if (!g.saveCellsAtOnce) {
-                            $(g.cEdit).find('*').prop('disabled', false);
-                            $(g.cEdit).find('.edit_box').removeClass('edit_box_posting');
-                        } else {
-                            $(g.o).find('div.save_edited').removeClass('saving_edited_data')
-                                .find('input').prop('disabled', false);  // enable the save button back
-                        }
-                        if (typeof data !== 'undefined' && data.success === true) {
-                            if (typeof options === 'undefined' || ! options.move) {
-                                PMA_ajaxShowMessage(data.message);
-                            }
-
-                            // update where_clause related data in each edited row
-                            $(g.t).find('td.to_be_saved').parents('tr').each(function () {
-                                var new_clause = $(this).data('new_clause');
-                                var $where_clause = $(this).find('.where_clause');
-                                var old_clause = $where_clause.val();
-                                var decoded_old_clause = PMA_urldecode(old_clause);
-                                var decoded_new_clause = PMA_urldecode(new_clause);
-
-                                $where_clause.val(new_clause);
-                                // update Edit, Copy, and Delete links also
-                                $(this).find('a').each(function () {
-                                    $(this).attr('href', $(this).attr('href').replace(old_clause, new_clause));
-                                    // update delete confirmation in Delete link
-                                    if ($(this).attr('href').indexOf('DELETE') > -1) {
-                                        $(this).removeAttr('onclick')
-                                            .unbind('click')
-                                            .bind('click', function () {
-                                                return confirmLink(this, 'DELETE FROM `' + g.db + '`.`' + g.table + '` WHERE ' +
-                                                       decoded_new_clause + (is_unique ? '' : ' LIMIT 1'));
-                                            });
-                                    }
-                                });
-                                // update the multi edit checkboxes
-                                $(this).find('input[type=checkbox]').each(function () {
-                                    var $checkbox = $(this);
-                                    var checkbox_name = $checkbox.attr('name');
-                                    var checkbox_value = $checkbox.val();
-
-                                    $checkbox.attr('name', checkbox_name.replace(old_clause, new_clause));
-                                    $checkbox.val(checkbox_value.replace(decoded_old_clause, decoded_new_clause));
-                                });
-                            });
-                            // update the display of executed SQL query command
-                            if (typeof data.sql_query != 'undefined') {
-                                //extract query box
-                                var $result_query = $($.parseHTML(data.sql_query));
-                                var sqlOuter = $result_query.find('.sqlOuter').wrap('<p>').parent().html();
-                                var tools = $result_query.find('.tools').wrap('<p>').parent().html();
-                                // sqlOuter and tools will not be present if 'Show SQL queries' configuration is off
-                                if (typeof sqlOuter != 'undefined' && typeof tools != 'undefined') {
-                                    $(g.o).find('.result_query:not(:last)').remove();
-                                    var $existing_query = $(g.o).find('.result_query');
-                                    // If two query box exists update query in second else add a second box
-                                    if ($existing_query.find('div.sqlOuter').length > 1) {
-                                        $existing_query.children(":nth-child(4)").remove();
-                                        $existing_query.children(":nth-child(4)").remove();
-                                        $existing_query.append(sqlOuter + tools);
-                                    } else {
-                                        $existing_query.append(sqlOuter + tools);
-                                    }
-                                    PMA_highlightSQL($existing_query);
-                                }
-                            }
-                            // hide and/or update the successfully saved cells
-                            g.hideEditCell(true, data);
-
-                            // remove the "Save edited cells" button
-                            $(g.o).find('div.save_edited').hide();
-                            // update saved fields
-                            $(g.t).find('.to_be_saved')
-                                .removeClass('to_be_saved')
-                                .data('value', null)
-                                .data('original_data', null);
-
-                            g.isCellEdited = false;
-                        } else {
-                            PMA_ajaxShowMessage(data.error, false);
-                            if (!g.saveCellsAtOnce) {
-                                $(g.t).find('.to_be_saved')
-                                    .removeClass('to_be_saved');
-                            }
-                        }
-                    }
-            }).done(function(){
-                if (options !== undefined && options.move) {
-                    g.showEditCell(options.cell);
-                }
-            }); // end $.ajax()
-        },
-
-        /**
-         * Save edited cell, so it can be posted later.
-         */
-        saveEditedCell: function () {
-            /**
-             * @var $this_field    Object referring to the td that is being edited
-             */
-            var $this_field = $(g.currentEditCell);
-            var $test_element = ''; // to test the presence of a element
-
-            var need_to_post = false;
-
-            /**
-             * @var field_name  String containing the name of this field.
-             * @see getFieldName()
-             */
-            var field_name = getFieldName($(g.t), $this_field);
-
-            /**
-             * @var this_field_params   Array temporary storage for the name/value of current field
-             */
-            var this_field_params = {};
-
-            /**
-             * @var is_null String capturing whether 'checkbox_null_<field_name>_<row_index>' is checked.
-             */
-            var is_null = $(g.cEdit).find('input:checkbox').is(':checked');
-
-            if ($(g.cEdit).find('.edit_area').is('.edit_area_loading')) {
-                // the edit area is still loading (retrieving cell data), no need to post
-                need_to_post = false;
-            } else if (is_null) {
-                if (!g.wasEditedCellNull) {
-                    this_field_params[field_name] = null;
-                    need_to_post = true;
-                }
-            } else {
-                if ($this_field.is('.bit')) {
-                    this_field_params[field_name] = $(g.cEdit).find('.edit_box').val();
-                } else if ($this_field.is('.set')) {
-                    $test_element = $(g.cEdit).find('select');
-                    this_field_params[field_name] = $test_element.map(function () {
-                        return $(this).val();
-                    }).get().join(",");
-                } else if ($this_field.is('.relation, .enum')) {
-                    // for relation and enumeration, take the results from edit box value,
-                    // because selected value from drop-down, new window or multiple
-                    // selection list will always be updated to the edit box
-                    this_field_params[field_name] = $(g.cEdit).find('.edit_box').val();
-                } else if ($this_field.hasClass('hex')) {
-                    if ($(g.cEdit).find('.edit_box').val().match(/^[a-f0-9]*$/i) !== null) {
-                        this_field_params[field_name] = $(g.cEdit).find('.edit_box').val();
-                    } else {
-                        var hexError = '<div class="error">' + PMA_messages.strEnterValidHex + '</div>';
-                        PMA_ajaxShowMessage(hexError, false);
-                        this_field_params[field_name] = PMA_getCellValue(g.currentEditCell);
-                    }
-                } else {
-                    this_field_params[field_name] = $(g.cEdit).find('.edit_box').val();
-                }
-                if (g.wasEditedCellNull || this_field_params[field_name] != PMA_getCellValue(g.currentEditCell)) {
-                    need_to_post = true;
-                }
-            }
-
-            if (need_to_post) {
-                $(g.currentEditCell).addClass('to_be_saved')
-                    .data('value', this_field_params[field_name]);
-                if (g.saveCellsAtOnce) {
-                    $(g.o).find('div.save_edited').show();
-                }
-                g.isCellEdited = true;
-            }
-
-            return need_to_post;
-        },
-
-        /**
-         * Save or post currently edited cell, depending on the "saveCellsAtOnce" configuration.
-         *
-         * @param field Optional, this object contains a boolean named move (true, if called from move* functions)
-         *              and a <td> to which the grid_edit should move
-         */
-        saveOrPostEditedCell: function (options) {
-            var saved = g.saveEditedCell();
-            // Check if $cfg['SaveCellsAtOnce'] is false
-            if (!g.saveCellsAtOnce) {
-                // Check if need_to_post is true
-                if (saved) {
-                    // Check if this function called from 'move' functions
-                    if (options !== undefined && options.move) {
-                        g.postEditedCell(options);
-                    } else {
-                        g.postEditedCell();
-                    }
-                // need_to_post is false
-                } else {
-                    // Check if this function called from 'move' functions
-                    if (options !== undefined && options.move) {
-                        g.hideEditCell(true);
-                        g.showEditCell(options.cell);
-                    // NOT called from 'move' functions
-                    } else {
-                        g.hideEditCell(true);
-                    }
-                }
-            // $cfg['SaveCellsAtOnce'] is true
-            } else {
-                // If need_to_post
-                if (saved) {
-                    // If this function called from 'move' functions
-                    if (options !== undefined && options.move) {
-                        g.hideEditCell(true, true, false, options);
-                        g.showEditCell(options.cell);
-                    // NOT called from 'move' functions
-                    } else {
-                        g.hideEditCell(true, true);
-                    }
-                } else {
-                    // If this function called from 'move' functions
-                    if (options !== undefined && options.move) {
-                        g.hideEditCell(true, false, false, options);
-                        g.showEditCell(options.cell);
-                    // NOT called from 'move' functions
-                    } else {
-                        g.hideEditCell(true);
-                    }
-                }
-            }
-        },
-
-        /**
-         * Initialize column resize feature.
-         */
-        initColResize: function () {
-            // create column resizer div
-            g.cRsz = document.createElement('div');
-            g.cRsz.className = 'cRsz';
-
-            // get data columns in the first row of the table
-            var $firstRowCols = $(g.t).find('tr:first th.draggable');
-
-            // create column borders
-            $firstRowCols.each(function () {
-                var cb = document.createElement('div'); // column border
-                $(cb).addClass('colborder')
-                    .mousedown(function (e) {
-                        g.dragStartRsz(e, this);
-                    });
-                $(g.cRsz).append(cb);
-            });
-            g.reposRsz();
-
-            // attach to global div
-            $(g.gDiv).prepend(g.cRsz);
-        },
-
-        /**
-         * Initialize column reordering feature.
-         */
-        initColReorder: function () {
-            g.cCpy = document.createElement('div');     // column copy, to store copy of dragged column header
-            g.cPointer = document.createElement('div'); // column pointer, used when reordering column
-
-            // adjust g.cCpy
-            g.cCpy.className = 'cCpy';
-            $(g.cCpy).hide();
-
-            // adjust g.cPointer
-            g.cPointer.className = 'cPointer';
-            $(g.cPointer).css('visibility', 'hidden');  // set visibility to hidden instead of calling hide() to force browsers to cache the image in cPointer class
-
-            // assign column reordering hint
-            g.reorderHint = PMA_messages.strColOrderHint;
-
-            // get data columns in the first row of the table
-            var $firstRowCols = $(g.t).find('tr:first th.draggable');
-
-            // initialize column order
-            $col_order = $(g.o).find('.col_order');   // check if column order is passed from PHP
-            if ($col_order.length > 0) {
-                g.colOrder = $col_order.val().split(',');
-                for (var i = 0; i < g.colOrder.length; i++) {
-                    g.colOrder[i] = parseInt(g.colOrder[i], 10);
-                }
-            } else {
-                g.colOrder = [];
-                for (var i = 0; i < $firstRowCols.length; i++) {
-                    g.colOrder.push(i);
-                }
-            }
-
-            // register events
-            $(g.t).find('th.draggable')
-                .mousedown(function (e) {
-                    $(g.o).addClass("turnOffSelect");
-                    if (g.visibleHeadersCount > 1) {
-                        g.dragStartReorder(e, this);
-                    }
-                })
-                .mouseenter(function () {
-                    if (g.visibleHeadersCount > 1) {
-                        $(this).css('cursor', 'move');
-                    } else {
-                        $(this).css('cursor', 'inherit');
-                    }
-                })
-                .mouseleave(function () {
-                    g.showReorderHint = false;
-                    $(this).tooltip("option", {
-                        content: g.updateHint()
-                    });
-                })
-                .dblclick(function (e) {
-                    e.preventDefault();
-                    $("<div/>")
-                    .prop("title", PMA_messages.strColNameCopyTitle)
-                    .addClass("modal-copy")
-                    .text(PMA_messages.strColNameCopyText)
-                    .append(
-                        $("<input/>")
-                        .prop("readonly", true)
-                        .val($(this).data("column"))
-                        )
-                    .dialog({
-                        resizable: false,
-                        modal: true
-                    })
-                    .find("input").focus().select();
-                });
-            $(g.t).find('th.draggable a')
-                .dblclick(function (e) {
-                    e.stopPropagation();
-                });
-            // restore column order when the restore button is clicked
-            $(g.o).find('div.restore_column').click(function () {
-                g.restoreColOrder();
-            });
-
-            // attach to global div
-            $(g.gDiv).append(g.cPointer);
-            $(g.gDiv).append(g.cCpy);
-
-            // prevent default "dragstart" event when dragging a link
-            $(g.t).find('th a').bind('dragstart', function () {
-                return false;
-            });
-
-            // refresh the restore column button state
-            g.refreshRestoreButton();
-        },
-
-        /**
-         * Initialize column visibility feature.
-         */
-        initColVisib: function () {
-            g.cDrop = document.createElement('div');    // column drop-down arrows
-            g.cList = document.createElement('div');    // column visibility list
-
-            // adjust g.cDrop
-            g.cDrop.className = 'cDrop';
-
-            // adjust g.cList
-            g.cList.className = 'cList';
-            $(g.cList).hide();
-
-            // assign column visibility related hints
-            g.showAllColText = PMA_messages.strShowAllCol;
-
-            // get data columns in the first row of the table
-            var $firstRowCols = $(g.t).find('tr:first th.draggable');
-
-            var i;
-            // initialize column visibility
-            var $col_visib = $(g.o).find('.col_visib');   // check if column visibility is passed from PHP
-            if ($col_visib.length > 0) {
-                g.colVisib = $col_visib.val().split(',');
-                for (i = 0; i < g.colVisib.length; i++) {
-                    g.colVisib[i] = parseInt(g.colVisib[i], 10);
-                }
-            } else {
-                g.colVisib = [];
-                for (i = 0; i < $firstRowCols.length; i++) {
-                    g.colVisib.push(1);
-                }
-            }
-
-            // make sure we have more than one column
-            if ($firstRowCols.length > 1) {
-                var $colVisibTh = $(g.t).find('th:not(.draggable)');
-                PMA_tooltip(
-                    $colVisibTh,
-                    'th',
-                    PMA_messages.strColVisibHint
-                );
-
-                // create column visibility drop-down arrow(s)
-                $colVisibTh.each(function () {
-                        var $th = $(this);
-                        var cd = document.createElement('div'); // column drop-down arrow
-                        var pos = $th.position();
-                        $(cd).addClass('coldrop')
-                            .click(function () {
-                                if (g.cList.style.display == 'none') {
-                                    g.showColList(this);
-                                } else {
-                                    g.hideColList();
-                                }
-                            });
-                        $(g.cDrop).append(cd);
-                    });
-
-                // add column visibility control
-                g.cList.innerHTML = '<div class="lDiv"></div>';
-                var $listDiv = $(g.cList).find('div');
-
-                var tempClick = function () {
-                    if (g.toggleCol($(this).index())) {
-                        g.afterToggleCol();
-                    }
-                };
-
-                for (i = 0; i < $firstRowCols.length; i++) {
-                    var currHeader = $firstRowCols[i];
-                    var listElmt = document.createElement('div');
-                    $(listElmt).text($(currHeader).text())
-                        .prepend('<input type="checkbox" ' + (g.colVisib[i] ? 'checked="checked" ' : '') + '/>');
-                    $listDiv.append(listElmt);
-                    // add event on click
-                    $(listElmt).click(tempClick);
-                }
-                // add "show all column" button
-                var showAll = document.createElement('div');
-                $(showAll).addClass('showAllColBtn')
-                    .text(g.showAllColText);
-                $(g.cList).append(showAll);
-                $(showAll).click(function () {
-                    g.showAllColumns();
-                });
-                // prepend "show all column" button at top if the list is too long
-                if ($firstRowCols.length > 10) {
-                    var clone = showAll.cloneNode(true);
-                    $(g.cList).prepend(clone);
-                    $(clone).click(function () {
-                        g.showAllColumns();
-                    });
-                }
-            }
-
-            // hide column visibility list if we move outside the list
-            $(g.t).find('td, th.draggable').mouseenter(function () {
-                g.hideColList();
-            });
-
-            // attach to global div
-            $(g.gDiv).append(g.cDrop);
-            $(g.gDiv).append(g.cList);
-
-            // some adjustment
-            g.reposDrop();
-        },
-
-        /**
-         * Move currently Editing Cell to Up
-         */
-        moveUp: function(e) {
-            e.preventDefault();
-            var $this_field = $(g.currentEditCell);
-            var field_name = getFieldName($(g.t), $this_field);
-
-            var where_clause = $this_field.parents('tr').first().find('.where_clause').val();
-            if (typeof where_clause === 'undefined') {
-                where_clause = '';
-            }
-            where_clause = PMA_urldecode(where_clause);
-            var found = false;
-            var $found_row;
-            var $prev_row;
-            var j = 0;
-
-            $this_field.parents('tr').first().parents('tbody').children().each(function(){
-                if (PMA_urldecode($(this).find('.where_clause').val()) == where_clause) {
-                    found = true;
-                    $found_row = $(this);
-                }
-                if (!found) {
-                    $prev_row = $(this);
-                }
-            });
-
-            var new_cell;
-
-            if (found && $prev_row) {
-                $prev_row.children('td').each(function(){
-                    if (getFieldName($(g.t), $(this)) == field_name) {
-                        new_cell = this;
-                    }
-                });
-            }
-
-            if (new_cell) {
-                g.hideEditCell(false, false, false, {move : true, cell : new_cell});
-            }
-        },
-
-        /**
-         * Move currently Editing Cell to Down
-         */
-        moveDown: function(e) {
-            e.preventDefault();
-
-            var $this_field = $(g.currentEditCell);
-            var field_name = getFieldName($(g.t), $this_field);
-
-            var where_clause = $this_field.parents('tr').first().find('.where_clause').val();
-            if (typeof where_clause === 'undefined') {
-                where_clause = '';
-            }
-            where_clause = PMA_urldecode(where_clause);
-            var found = false;
-            var $found_row;
-            var $next_row;
-            var j = 0;
-            var next_row_found = false;
-            $this_field.parents('tr').first().parents('tbody').children().each(function(){
-                if (PMA_urldecode($(this).find('.where_clause').val()) == where_clause) {
-                    found = true;
-                    $found_row = $(this);
-                }
-                if (found) {
-                    if (j >= 1 && ! next_row_found) {
-                        $next_row = $(this);
-                        next_row_found = true;
-                    } else {
-                        j++;
-                    }
-                }
-            });
-
-            var new_cell;
-            if (found && $next_row) {
-                $next_row.children('td').each(function(){
-                    if (getFieldName($(g.t), $(this)) == field_name) {
-                        new_cell = this;
-                    }
-                });
-            }
-
-            if (new_cell) {
-                g.hideEditCell(false, false, false, {move : true, cell : new_cell});
-            }
-        },
-
-        /**
-         * Move currently Editing Cell to Left
-         */
-        moveLeft: function(e) {
-            e.preventDefault();
-
-            var $this_field = $(g.currentEditCell);
-            var field_name = getFieldName($(g.t), $this_field);
-
-            var where_clause = $this_field.parents('tr').first().find('.where_clause').val();
-            if (typeof where_clause === 'undefined') {
-                where_clause = '';
-            }
-            where_clause = PMA_urldecode(where_clause);
-            var found = false;
-            var $found_row;
-            var j = 0;
-            $this_field.parents('tr').first().parents('tbody').children().each(function(){
-                if (PMA_urldecode($(this).find('.where_clause').val()) == where_clause) {
-                    found = true;
-                    $found_row = $(this);
-                }
-            });
-
-            var left_cell;
-            var cell_found = false;
-            if (found) {
-                $found_row.children('td.grid_edit').each(function(){
-                    if (getFieldName($(g.t), $(this)) === field_name) {
-                        cell_found = true;
-                    }
-                    if (!cell_found) {
-                        left_cell = this;
-                    }
-                });
-            }
-
-            if (left_cell) {
-                g.hideEditCell(false, false, false, {move : true, cell : left_cell});
-            }
-        },
-
-        /**
-         * Move currently Editing Cell to Right
-         */
-        moveRight: function(e) {
-            e.preventDefault();
-
-            var $this_field = $(g.currentEditCell);
-            var field_name = getFieldName($(g.t), $this_field);
-
-            var where_clause = $this_field.parents('tr').first().find('.where_clause').val();
-            if (typeof where_clause === 'undefined') {
-                where_clause = '';
-            }
-            where_clause = PMA_urldecode(where_clause);
-            var found = false;
-            var $found_row;
-            var j = 0;
-            $this_field.parents('tr').first().parents('tbody').children().each(function(){
-                if (PMA_urldecode($(this).find('.where_clause').val()) == where_clause) {
-                    found = true;
-                    $found_row = $(this);
-                }
-            });
-
-            var right_cell;
-            var cell_found = false;
-            var next_cell_found = false;
-            if (found) {
-                $found_row.children('td.grid_edit').each(function(){
-                    if (getFieldName($(g.t), $(this)) === field_name) {
-                        cell_found = true;
-                    }
-                    if (cell_found) {
-                        if (j >= 1 && ! next_cell_found) {
-                            right_cell = this;
-                            next_cell_found = true;
-                        } else {
-                            j++;
-                        }
-                    }
-                });
-            }
-
-            if (right_cell) {
-                g.hideEditCell(false, false, false, {move : true, cell : right_cell});
-            }
-        },
-
-        /**
-         * Initialize grid editing feature.
-         */
-        initGridEdit: function () {
-
-            function startGridEditing(e, cell) {
-                if (g.isCellEditActive) {
-                    g.saveOrPostEditedCell();
-                } else {
-                    g.showEditCell(cell);
-                }
-                e.stopPropagation();
-            }
-
-            function handleCtrlNavigation(e) {
-                if ((e.ctrlKey && e.which == 38 ) || (e.altKey && e.which == 38)) {
-                    g.moveUp(e);
-                } else if ((e.ctrlKey && e.which == 40)  || (e.altKey && e.which == 40)) {
-                    g.moveDown(e);
-                } else if ((e.ctrlKey && e.which == 37 ) || (e.altKey && e.which == 37)) {
-                    g.moveLeft(e);
-                } else if ((e.ctrlKey && e.which == 39)  || (e.altKey && e.which == 39)) {
-                    g.moveRight(e);
-                }
-            }
-
-            // create cell edit wrapper element
-            g.cEditStd = document.createElement('div');
-            g.cEdit = g.cEditStd;
-            g.cEditTextarea = document.createElement('div');
-
-            // adjust g.cEditStd
-            g.cEditStd.className = 'cEdit';
-            $(g.cEditStd).html('<input class="edit_box" rows="1" ></input><div class="edit_area" />');
-            $(g.cEditStd).hide();
-
-            // adjust g.cEdit
-            g.cEditTextarea.className = 'cEdit';
-            $(g.cEditTextarea).html('<textarea class="edit_box" rows="1" ></textarea><div class="edit_area" />');
-            $(g.cEditTextarea).hide();
-
-            // assign cell editing hint
-            g.cellEditHint = PMA_messages.strCellEditHint;
-            g.saveCellWarning = PMA_messages.strSaveCellWarning;
-            g.alertNonUnique = PMA_messages.strAlertNonUnique;
-            g.gotoLinkText = PMA_messages.strGoToLink;
-
-            // initialize cell editing configuration
-            g.saveCellsAtOnce = $(g.o).find('.save_cells_at_once').val();
-            g.maxTruncatedLen = PMA_commonParams.get('LimitChars');
-
-            // register events
-            $(g.t).find('td.data.click1')
-                .click(function (e) {
-                    startGridEditing(e, this);
-                    // prevent default action when clicking on "link" in a table
-                    if ($(e.target).is('.grid_edit a')) {
-                        e.preventDefault();
-                    }
-                });
-
-            $(g.t).find('td.data.click2')
-                .click(function (e) {
-                    var $cell = $(this);
-                    // In the case of relational link, We want single click on the link
-                    // to goto the link and double click to start grid-editing.
-                    var $link = $(e.target);
-                    if ($link.is('.grid_edit.relation a')) {
-                        e.preventDefault();
-                        // get the click count and increase
-                        var clicks = $cell.data('clicks');
-                        clicks = (typeof clicks === 'undefined') ? 1 : clicks + 1;
-
-                        if (clicks == 1) {
-                            // if there are no previous clicks,
-                            // start the single click timer
-                            var timer = setTimeout(function () {
-                                // temporarily remove ajax class so the page loader will not handle it,
-                                // submit and then add it back
-                                $link.removeClass('ajax');
-                                AJAX.requestHandler.call($link[0]);
-                                $link.addClass('ajax');
-                                $cell.data('clicks', 0);
-                            }, 700);
-                            $cell.data('clicks', clicks);
-                            $cell.data('timer', timer);
-                        } else {
-                            // this is a double click, cancel the single click timer
-                            // and make the click count 0
-                            clearTimeout($cell.data('timer'));
-                            $cell.data('clicks', 0);
-                            // start grid-editing
-                            startGridEditing(e, this);
-                        }
-                    }
-                })
-                .dblclick(function (e) {
-                    if ($(e.target).is('.grid_edit a')) {
-                        e.preventDefault();
-                    } else {
-                        startGridEditing(e, this);
-                    }
-                });
-
-            $(g.cEditStd).on('keydown', 'input.edit_box, select', handleCtrlNavigation);
-
-            $(g.cEditStd).find('.edit_box').focus(function () {
-                g.showEditArea();
-            });
-            $(g.cEditStd).on('keydown', '.edit_box, select', function (e) {
-                if (e.which == 13) {
-                    // post on pressing "Enter"
-                    e.preventDefault();
-                    g.saveOrPostEditedCell();
-                }
-            });
-            $(g.cEditStd).keydown(function (e) {
-                if (!g.isEditCellTextEditable) {
-                    // prevent text editing
-                    e.preventDefault();
-                }
-            });
-
-            $(g.cEditTextarea).on('keydown', 'textarea.edit_box, select', handleCtrlNavigation);
-
-            $(g.cEditTextarea).find('.edit_box').focus(function () {
-                g.showEditArea();
-            });
-            $(g.cEditTextarea).on('keydown', '.edit_box, select', function (e) {
-                if (e.which == 13 && !e.shiftKey) {
-                    // post on pressing "Enter"
-                    e.preventDefault();
-                    g.saveOrPostEditedCell();
-                }
-            });
-            $(g.cEditTextarea).keydown(function (e) {
-                if (!g.isEditCellTextEditable) {
-                    // prevent text editing
-                    e.preventDefault();
-                }
-            });
-            $('html').click(function (e) {
-                // hide edit cell if the click is not fromDat edit area
-                if ($(e.target).parents().index($(g.cEdit)) == -1 &&
-                    !$(e.target).parents('.ui-datepicker-header').length &&
-                    !$('.browse_foreign_modal.ui-dialog:visible').length
-                ) {
-                    g.hideEditCell();
-                }
-            }).keydown(function (e) {
-                if (e.which == 27 && g.isCellEditActive) {
-
-                    // cancel on pressing "Esc"
-                    g.hideEditCell(true);
-                }
-            });
-            $(g.o).find('div.save_edited').click(function () {
-                g.hideEditCell();
-                g.postEditedCell();
-            });
-            $(window).bind('beforeunload', function () {
-                if (g.isCellEdited) {
-                    return g.saveCellWarning;
-                }
-            });
-
-            // attach to global div
-            $(g.gDiv).append(g.cEditStd);
-            $(g.gDiv).append(g.cEditTextarea);
-
-            // add hint for grid editing feature when hovering "Edit" link in each table row
-            if (PMA_messages.strGridEditFeatureHint !== undefined) {
-                PMA_tooltip(
-                    $(g.t).find('.edit_row_anchor a'),
-                    'a',
-                    PMA_messages.strGridEditFeatureHint
-                );
-            }
-        }
-    };
-
-    /******************
-     * Initialize grid
-     ******************/
-
-    // wrap all truncated data cells with span indicating the original length
-    // todo update the original length after a grid edit
-    $(t).find('td.data.truncated:not(:has(span))')
-        .wrapInner(function() {
-            return '<span title="' + PMA_messages.strOriginalLength + ' ' +
-                $(this).data('originallength') + '"></span>';
-        });
-
-    // wrap remaining cells, except actions cell, with span
-    $(t).find('th, td:not(:has(span))')
-        .wrapInner('<span />');
-
-    // create grid elements
-    g.gDiv = document.createElement('div');     // create global div
-
-    // initialize the table variable
-    g.t = t;
-
-    // enclosing .sqlqueryresults div
-    g.o = $(t).parents('.sqlqueryresults');
-
-    // get data columns in the first row of the table
-    var $firstRowCols = $(t).find('tr:first th.draggable');
-
-    // initialize visible headers count
-    g.visibleHeadersCount = $firstRowCols.filter(':visible').length;
-
-    // assign first column (actions) span
-    if (! $(t).find('tr:first th:first').hasClass('draggable')) {  // action header exist
-        g.actionSpan = $(t).find('tr:first th:first').prop('colspan');
-    } else {
-        g.actionSpan = 0;
-    }
-
-    // assign table create time
-    // table_create_time will only available if we are in "Browse" tab
-    g.tableCreateTime = $(g.o).find('.table_create_time').val();
-
-    // assign the hints
-    g.sortHint = PMA_messages.strSortHint;
-    g.strMultiSortHint = PMA_messages.strMultiSortHint;
-    g.markHint = PMA_messages.strColMarkHint;
-    g.copyHint = PMA_messages.strColNameCopyHint;
-
-    // assign common hidden inputs
-    var $common_hidden_inputs = $(g.o).find('div.common_hidden_inputs');
-    g.token = $common_hidden_inputs.find('input[name=token]').val();
-    g.server = $common_hidden_inputs.find('input[name=server]').val();
-    g.db = $common_hidden_inputs.find('input[name=db]').val();
-    g.table = $common_hidden_inputs.find('input[name=table]').val();
-
-    // add table class
-    $(t).addClass('pma_table');
-
-    // add relative position to global div so that resize handlers are correctly positioned
-    $(g.gDiv).css('position', 'relative');
-
-    // link the global div
-    $(t).before(g.gDiv);
-    $(g.gDiv).append(t);
-
-    // FEATURES
-    enableResize    = enableResize === undefined ? true : enableResize;
-    enableReorder   = enableReorder === undefined ? true : enableReorder;
-    enableVisib     = enableVisib === undefined ? true : enableVisib;
-    enableGridEdit  = enableGridEdit === undefined ? true : enableGridEdit;
-    if (enableResize) {
-        g.initColResize();
-    }
-    if (enableReorder &&
-        $(g.o).find('table.navigation').length > 0)    // disable reordering for result from EXPLAIN or SHOW syntax, which do not have a table navigation panel
-    {
-        g.initColReorder();
-    }
-    if (enableVisib) {
-        g.initColVisib();
-    }
-    if (enableGridEdit &&
-        $(t).is('.ajax'))   // make sure we have the ajax class
-    {
-        g.initGridEdit();
-    }
-
-    // create tooltip for each <th> with draggable class
-    PMA_tooltip(
-            $(t).find("th.draggable"),
-            'th',
-            g.updateHint()
-    );
-
-    // register events for hint tooltip (anchors inside draggable th)
-    $(t).find('th.draggable a')
-        .mouseenter(function () {
-            g.showSortHint = true;
-            g.showMultiSortHint = true;
-            $(t).find("th.draggable").tooltip("option", {
-                content: g.updateHint()
-            });
-        })
-        .mouseleave(function () {
-            g.showSortHint = false;
-            g.showMultiSortHint = false;
-            $(t).find("th.draggable").tooltip("option", {
-                content: g.updateHint()
-            });
-        });
-
-    // register events for dragging-related feature
-    if (enableResize || enableReorder) {
-        $(document).mousemove(function (e) {
-            g.dragMove(e);
-        });
-        $(document).mouseup(function (e) {
-            $(g.o).removeClass("turnOffSelect");
-            g.dragEnd(e);
-        });
-    }
-
-    // some adjustment
-    $(t).removeClass('data');
-    $(g.gDiv).addClass('data');
-}
-
-/**
- * jQuery plugin to cancel selection in HTML code.
- */
-(function ($) {
-    $.fn.noSelect = function (p) { //no select plugin by Paulo P.Marinas
-        var prevent = (p === null) ? true : p;
-        var is_msie = navigator.userAgent.indexOf('MSIE') > -1 || !!window.navigator.userAgent.match(/Trident.*rv\:11\./);
-        var is_firefox = navigator.userAgent.indexOf('Firefox') > -1;
-        var is_safari = navigator.userAgent.indexOf("Safari") > -1;
-        var is_opera = navigator.userAgent.indexOf("Presto") > -1;
-        if (prevent) {
-            return this.each(function () {
-                if (is_msie || is_safari) {
-                    $(this).bind('selectstart', function () {
-                        return false;
-                    });
-                } else if (is_firefox) {
-                    $(this).css('MozUserSelect', 'none');
-                    $('body').trigger('focus');
-                } else if (is_opera) {
-                    $(this).bind('mousedown', function () {
-                        return false;
-                    });
-                } else {
-                    $(this).attr('unselectable', 'on');
-                }
-            });
-        } else {
-            return this.each(function () {
-                if (is_msie || is_safari) {
-                    $(this).unbind('selectstart');
-                } else if (is_firefox) {
-                    $(this).css('MozUserSelect', 'inherit');
-                } else if (is_opera) {
-                    $(this).unbind('mousedown');
-                } else {
-                    $(this).removeAttr('unselectable');
-                }
-            });
-        }
-    }; //end noSelect
-})(jQuery);
diff --git a/#pma/js/menu-resizer.js b/#pma/js/menu-resizer.js
deleted file mode 100644
index 392f94be..00000000
--- a/#pma/js/menu-resizer.js
+++ /dev/null
@@ -1,183 +0,0 @@
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Handles the resizing of a menu according to the available screen width
- *
- * Uses themes/original/css/resizable-menu.css.php
- *
- * To initialise:
- * $('#myMenu').menuResizer(function () {
- *     // This function will be called to find out how much
- *     // available horizontal space there is for the menu
- *     return $('body').width() - 5; // Some extra margin for good measure
- * });
- *
- * To trigger a resize operation:
- * $('#myMenu').menuResizer('resize'); // Bind this to $(window).resize()
- *
- * To restore the menu to a state like before it was initialized:
- * $('#myMenu').menuResizer('destroy');
- *
- * @package PhpMyAdmin
- */
-(function ($) {
-    function MenuResizer($container, widthCalculator) {
-        var self = this;
-        self.$container = $container;
-        self.widthCalculator = widthCalculator;
-        // create submenu container
-        var link = $('<a />', {href: '#', 'class': 'tab nowrap'})
-            .text(PMA_messages.strMore)
-            .bind('click', false); // same as event.preventDefault()
-        var img = $container.find('li img');
-        if (img.length) {
-            $(PMA_getImage('b_more.png').toString()).prependTo(link);
-        }
-        var $submenu = $('<li />', {'class': 'submenu'})
-            .append(link)
-            .append($('<ul />'))
-            .mouseenter(function() {
-                if ($(this).find('ul .tabactive').length === 0) {
-                    $(this)
-                    .addClass('submenuhover')
-                    .find('> a')
-                    .addClass('tabactive');
-                }
-            })
-            .mouseleave(function() {
-                if ($(this).find('ul .tabactive').length === 0) {
-                    $(this)
-                    .removeClass('submenuhover')
-                    .find('> a')
-                    .removeClass('tabactive');
-                }
-            });
-        $container.children('.clearfloat').remove();
-        $container.append($submenu).append("<div class='clearfloat'></div>");
-        setTimeout(function () {
-            self.resize();
-        }, 4);
-    }
-    MenuResizer.prototype.resize = function () {
-        var wmax = this.widthCalculator.call(this.$container);
-        var $submenu = this.$container.find('.submenu:last');
-        var submenu_w = $submenu.outerWidth(true);
-        var $submenu_ul = $submenu.find('ul');
-        var $li = this.$container.find('> li');
-        var $li2 = $submenu_ul.find('li');
-        var more_shown = $li2.length > 0;
-        // Calculate the total width used by all the shown tabs
-        var total_len = more_shown ? submenu_w : 0;
-        var l = $li.length - 1;
-        var i;
-        for (i = 0; i < l; i++) {
-            total_len += $($li[i]).outerWidth(true);
-        }
-        // Now hide menu elements that don't fit into the menubar
-        var hidden = false; // Whether we have hidden any tabs
-        while (total_len >= wmax && --l >= 0) { // Process the tabs backwards
-            hidden = true;
-            var el = $($li[l]);
-            var el_width = el.outerWidth(true);
-            el.data('width', el_width);
-            if (! more_shown) {
-                total_len -= el_width;
-                el.prependTo($submenu_ul);
-                total_len += submenu_w;
-                more_shown = true;
-            } else {
-                total_len -= el_width;
-                el.prependTo($submenu_ul);
-            }
-        }
-        // If we didn't hide any tabs, then there might be some space to show some
-        if (! hidden) {
-            // Show menu elements that do fit into the menubar
-            for (i = 0, l = $li2.length; i < l; i++) {
-                total_len += $($li2[i]).data('width');
-                // item fits or (it is the last item
-                // and it would fit if More got removed)
-                if (total_len < wmax ||
-                    (i == $li2.length - 1 && total_len - submenu_w < wmax)
-                ) {
-                    $($li2[i]).insertBefore($submenu);
-                } else {
-                    break;
-                }
-            }
-        }
-        // Show/hide the "More" tab as needed
-        if ($submenu_ul.find('li').length > 0) {
-            $submenu.addClass('shown');
-        } else {
-            $submenu.removeClass('shown');
-        }
-        if (this.$container.find('> li').length == 1) {
-            // If there is only the "More" tab left, then we need
-            // to align the submenu to the left edge of the tab
-            $submenu_ul.removeClass().addClass('only');
-        } else {
-            // Otherwise we align the submenu to the right edge of the tab
-            $submenu_ul.removeClass().addClass('notonly');
-        }
-        if ($submenu.find('.tabactive').length) {
-            $submenu
-            .addClass('active')
-            .find('> a')
-            .removeClass('tab')
-            .addClass('tabactive');
-        } else {
-            $submenu
-            .removeClass('active')
-            .find('> a')
-            .addClass('tab')
-            .removeClass('tabactive');
-        }
-    };
-    MenuResizer.prototype.destroy = function () {
-        var $submenu = this.$container.find('li.submenu').removeData();
-        $submenu.find('li').appendTo(this.$container);
-        $submenu.remove();
-    };
-
-    /** Public API */
-    var methods = {
-        init: function(widthCalculator) {
-            return this.each(function () {
-                var $this = $(this);
-                if (! $this.data('menuResizer')) {
-                    $this.data(
-                        'menuResizer',
-                        new MenuResizer($this, widthCalculator)
-                    );
-                }
-            });
-        },
-        resize: function () {
-            return this.each(function () {
-                var self = $(this).data('menuResizer');
-                if (self) {
-                    self.resize();
-                }
-            });
-        },
-        destroy: function () {
-            return this.each(function () {
-                var self = $(this).data('menuResizer');
-                if (self) {
-                    self.destroy();
-                }
-            });
-        }
-    };
-
-    /** Extend jQuery */
-    $.fn.menuResizer = function(method) {
-        if (methods[method]) {
-            return methods[method].call(this);
-        } else if (typeof method === 'function') {
-            return methods.init.apply(this, [method]);
-        } else {
-            $.error('Method ' +  method + ' does not exist on jQuery.menuResizer');
-        }
-    };
-})(jQuery);
diff --git a/#pma/js/messages.php b/#pma/js/messages.php
deleted file mode 100644
index 365d0da1..00000000
--- a/#pma/js/messages.php
+++ /dev/null
@@ -1,962 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Exporting of translated messages from PHP to Javascript
- *
- * @package PhpMyAdmin
- */
-
-if (!defined('TESTSUITE')) {
-    chdir('..');
-
-    // Send correct type:
-    header('Content-Type: text/javascript; charset=UTF-8');
-
-    // Cache output in client - the nocache query parameter makes sure that this
-    // file is reloaded when config changes
-    header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 3600) . ' GMT');
-
-    // Avoid loading the full common.inc.php because this would add many
-    // non-js-compatible stuff like DOCTYPE
-    define('PMA_MINIMUM_COMMON', true);
-    define('PMA_PATH_TO_BASEDIR', '../');
-    require_once './libraries/common.inc.php';
-    // Close session early as we won't write anything there
-    session_write_close();
-}
-
-// But this one is needed for PMA_escapeJsString()
-require_once './libraries/js_escape.lib.php';
-
-$buffer = PMA\libraries\OutputBuffering::getInstance();
-$buffer->start();
-register_shutdown_function(
-    function () {
-        echo PMA\libraries\OutputBuffering::getInstance()->getContents();
-    }
-);
-
-/* For confirmations */
-$js_messages['strConfirm'] = __('Confirm');
-$js_messages['strDoYouReally'] = __('Do you really want to execute "%s"?');
-$js_messages['strDropDatabaseStrongWarning']
-    = __('You are about to DESTROY a complete database!');
-$js_messages['strDropTableStrongWarning']
-    = __('You are about to DESTROY a complete table!');
-$js_messages['strTruncateTableStrongWarning']
-    = __('You are about to TRUNCATE a complete table!');
-$js_messages['strDeleteTrackingData'] = __('Delete tracking data for this table?');
-$js_messages['strDeleteTrackingDataMultiple']
-    = __('Delete tracking data for these tables?');
-$js_messages['strDeleteTrackingVersion']
-    = __('Delete tracking data for this version?');
-$js_messages['strDeleteTrackingVersionMultiple']
-    = __('Delete tracking data for these versions?');
-$js_messages['strDeletingTrackingEntry'] = __('Delete entry from tracking report?');
-$js_messages['strDeletingTrackingData'] = __('Deleting tracking data');
-$js_messages['strDroppingPrimaryKeyIndex'] = __('Dropping Primary Key/Index');
-$js_messages['strDroppingForeignKey'] = __('Dropping Foreign key.');
-$js_messages['strOperationTakesLongTime']
-    = __('This operation could take a long time. Proceed anyway?');
-$js_messages['strDropUserGroupWarning']
-    = __('Do you really want to delete user group "%s"?');
-$js_messages['strConfirmDeleteQBESearch']
-    = __('Do you really want to delete the search "%s"?');
-$js_messages['strConfirmNavigation']
-    = __('You have unsaved changes; are you sure you want to leave this page?');
-$js_messages['strDropUserWarning']
-    = __('Do you really want to revoke the selected user(s) ?');
-$js_messages['strDeleteCentralColumnWarning']
-    = __('Do you really want to delete this central column?');
-$js_messages['strDropRTEitems']
-    = __('Do you really want to delete the selected items?');
-$js_messages['strDropPartitionWarning'] = __(
-    'Do you really want to DROP the selected partition(s)? This will also DELETE ' .
-    'the data related to the selected partition(s)!'
-);
-$js_messages['strTruncatePartitionWarning']
-    = __('Do you really want to TRUNCATE the selected partition(s)?');
-$js_messages['strRemovePartitioningWarning']
-    = __('Do you really want to remove partitioning?');
-$js_messages['strResetSlaveWarning'] = __('Do you really want to RESET SLAVE?');
-$js_messages['strChangeColumnCollation'] = __(
-    'This operation will attempt to convert your data to the new collation. In '
-    . 'rare cases, especially where a character doesn\'t exist in the new '
-    . 'collation, this process could cause the data to appear incorrectly under '
-    . 'the new collation; in this case we suggest you revert to the original '
-    . 'collation and refer to the tips at '
-)
-    . '<a href="%s" target="garbled_data_wiki">' . __('Garbled Data') . '</a>.'
-    . '<br/><br/>'
-    . __('Are you sure you wish to change the collation and convert the data?');
-$js_messages['strChangeAllColumnCollationsWarning'] = __(
-    'Through this operation, MySQL attempts to map the data values between '
-    . 'collations. If the character sets are incompatible, there may be data loss '
-    . 'and this lost data may <b>NOT</b> be recoverable simply by changing back the '
-    . 'column collation(s). <b>To convert existing data, it is suggested to use the '
-    . 'column(s) editing feature (the "Change" Link) on the table structure page. '
-    . '</b>'
-)
-. '<br/><br/>'
-. __(
-    'Are you sure you wish to change all the column collations and convert the data?'
-);
-
-/* For modal dialog buttons */
-$js_messages['strSaveAndClose'] = __('Save & close');
-$js_messages['strReset'] = __('Reset');
-$js_messages['strResetAll'] = __('Reset all');
-
-/* For indexes */
-$js_messages['strFormEmpty'] = __('Missing value in the form!');
-$js_messages['strRadioUnchecked'] = __('Select at least one of the options!');
-$js_messages['strEnterValidNumber'] = __('Please enter a valid number!');
-$js_messages['strEnterValidLength'] = __('Please enter a valid length!');
-$js_messages['strAddIndex'] = __('Add index');
-$js_messages['strEditIndex'] = __('Edit index');
-$js_messages['strAddToIndex'] = __('Add %s column(s) to index');
-$js_messages['strCreateSingleColumnIndex'] = __('Create single-column index');
-$js_messages['strCreateCompositeIndex'] = __('Create composite index');
-$js_messages['strCompositeWith'] = __('Composite with:');
-$js_messages['strMissingColumn'] = __('Please select column(s) for the index.');
-
-/* For Create Table */
-$js_messages['strLeastColumnError'] = __('You have to add at least one column.');
-
-/* For Preview SQL*/
-$js_messages['strPreviewSQL'] = __('Preview SQL');
-
-/* For Simulate DML*/
-$js_messages['strSimulateDML'] = __('Simulate query');
-$js_messages['strMatchedRows'] = __('Matched rows:');
-$js_messages['strSQLQuery'] = __('SQL query:');
-
-/* Charts */
-/* l10n: Default label for the y-Axis of Charts */
-$js_messages['strYValues'] = __('Y values');
-
-/* For server_privileges.js */
-$js_messages['strHostEmpty'] = __('The host name is empty!');
-$js_messages['strUserEmpty'] = __('The user name is empty!');
-$js_messages['strPasswordEmpty'] = __('The password is empty!');
-$js_messages['strPasswordNotSame'] = __('The passwords aren\'t the same!');
-$js_messages['strRemovingSelectedUsers'] = __('Removing Selected Users');
-$js_messages['strClose'] = __('Close');
-
-/* For export.js */
-$js_messages['strTemplateCreated'] = __('Template was created.');
-$js_messages['strTemplateLoaded'] = __('Template was loaded.');
-$js_messages['strTemplateUpdated'] = __('Template was updated.');
-$js_messages['strTemplateDeleted'] = __('Template was deleted.');
-
-/* l10n: Other, small valued, queries */
-$js_messages['strOther'] = __('Other');
-/* l10n: Thousands separator */
-$js_messages['strThousandsSeparator'] = __(',');
-/* l10n: Decimal separator */
-$js_messages['strDecimalSeparator'] = __('.');
-
-$js_messages['strChartConnectionsTitle'] = __('Connections / Processes');
-
-/* server status monitor */
-$js_messages['strIncompatibleMonitorConfig']
-    = __('Local monitor configuration incompatible!');
-$js_messages['strIncompatibleMonitorConfigDescription'] = __(
-    'The chart arrangement configuration in your browsers local storage is not '
-    . 'compatible anymore to the newer version of the monitor dialog. It is very '
-    . 'likely that your current configuration will not work anymore. Please reset '
-    . 'your configuration to default in the <i>Settings</i> menu.'
-);
-
-$js_messages['strQueryCacheEfficiency'] = __('Query cache efficiency');
-$js_messages['strQueryCacheUsage'] = __('Query cache usage');
-$js_messages['strQueryCacheUsed'] = __('Query cache used');
-
-$js_messages['strSystemCPUUsage'] = __('System CPU usage');
-$js_messages['strSystemMemory'] = __('System memory');
-$js_messages['strSystemSwap'] = __('System swap');
-
-$js_messages['strAverageLoad'] = __('Average load');
-$js_messages['strTotalMemory'] = __('Total memory');
-$js_messages['strCachedMemory'] = __('Cached memory');
-$js_messages['strBufferedMemory'] = __('Buffered memory');
-$js_messages['strFreeMemory'] = __('Free memory');
-$js_messages['strUsedMemory'] = __('Used memory');
-
-$js_messages['strTotalSwap'] = __('Total swap');
-$js_messages['strCachedSwap'] = __('Cached swap');
-$js_messages['strUsedSwap'] = __('Used swap');
-$js_messages['strFreeSwap'] = __('Free swap');
-
-$js_messages['strBytesSent'] = __('Bytes sent');
-$js_messages['strBytesReceived'] = __('Bytes received');
-$js_messages['strConnections'] = __('Connections');
-$js_messages['strProcesses'] = __('Processes');
-
-/* summary row */
-$js_messages['strB'] = __('B');
-$js_messages['strKiB'] = __('KiB');
-$js_messages['strMiB'] = __('MiB');
-$js_messages['strGiB'] = __('GiB');
-$js_messages['strTiB'] = __('TiB');
-$js_messages['strPiB'] = __('PiB');
-$js_messages['strEiB'] = __('EiB');
-$js_messages['strNTables'] = __('%d table(s)');
-
-/* l10n: Questions is the name of a MySQL Status variable */
-$js_messages['strQuestions'] = __('Questions');
-$js_messages['strTraffic'] = __('Traffic');
-$js_messages['strSettings'] = __('Settings');
-$js_messages['strAddChart'] = __('Add chart to grid');
-$js_messages['strClose'] = __('Close');
-$js_messages['strAddOneSeriesWarning']
-    = __('Please add at least one variable to the series!');
-$js_messages['strNone'] = __('None');
-$js_messages['strResumeMonitor'] = __('Resume monitor');
-$js_messages['strPauseMonitor'] = __('Pause monitor');
-$js_messages['strStartRefresh'] = __('Start auto refresh');
-$js_messages['strStopRefresh'] = __('Stop auto refresh');
-/* Monitor: Instructions Dialog */
-$js_messages['strBothLogOn'] = __('general_log and slow_query_log are enabled.');
-$js_messages['strGenLogOn'] = __('general_log is enabled.');
-$js_messages['strSlowLogOn'] = __('slow_query_log is enabled.');
-$js_messages['strBothLogOff'] = __('slow_query_log and general_log are disabled.');
-$js_messages['strLogOutNotTable'] = __('log_output is not set to TABLE.');
-$js_messages['strLogOutIsTable'] = __('log_output is set to TABLE.');
-$js_messages['strSmallerLongQueryTimeAdvice'] = __(
-    'slow_query_log is enabled, but the server logs only queries that take longer '
-    . 'than %d seconds. It is advisable to set this long_query_time 0-2 seconds, '
-    . 'depending on your system.'
-);
-$js_messages['strLongQueryTimeSet'] = __('long_query_time is set to %d second(s).');
-$js_messages['strSettingsAppliedGlobal'] = __(
-    'Following settings will be applied globally and reset to default on server '
-    . 'restart:'
-);
-/* l10n: %s is FILE or TABLE */
-$js_messages['strSetLogOutput'] = __('Set log_output to %s');
-/* l10n: Enable in this context means setting a status variable to ON */
-$js_messages['strEnableVar'] = __('Enable %s');
-/* l10n: Disable in this context means setting a status variable to OFF */
-$js_messages['strDisableVar'] = __('Disable %s');
-/* l10n: %d seconds */
-$js_messages['setSetLongQueryTime'] = __('Set long_query_time to %d seconds.');
-$js_messages['strNoSuperUser'] = __(
-    'You can\'t change these variables. Please log in as root or contact'
-    . ' your database administrator.'
-);
-$js_messages['strChangeSettings'] = __('Change settings');
-$js_messages['strCurrentSettings'] = __('Current settings');
-
-$js_messages['strChartTitle'] = __('Chart title');
-/* l10n: As in differential values */
-$js_messages['strDifferential'] = __('Differential');
-$js_messages['strDividedBy'] = __('Divided by %s');
-$js_messages['strUnit'] = __('Unit');
-
-$js_messages['strFromSlowLog'] = __('From slow log');
-$js_messages['strFromGeneralLog'] = __('From general log');
-$js_messages['strServerLogError'] = __(
-    'The database name is not known for this query in the server\'s logs.'
-);
-$js_messages['strAnalysingLogsTitle'] = __('Analysing logs');
-$js_messages['strAnalysingLogs']
-    = __('Analysing & loading logs. This may take a while.');
-$js_messages['strCancelRequest'] = __('Cancel request');
-$js_messages['strCountColumnExplanation'] = __(
-    'This column shows the amount of identical queries that are grouped together. '
-    . 'However only the SQL query itself has been used as a grouping criteria, so '
-    . 'the other attributes of queries, such as start time, may differ.'
-);
-$js_messages['strMoreCountColumnExplanation'] = __(
-    'Since grouping of INSERTs queries has been selected, INSERT queries into the '
-    . 'same table are also being grouped together, disregarding of the inserted '
-    . 'data.'
-);
-$js_messages['strLogDataLoaded']
-    = __('Log data loaded. Queries executed in this time span:');
-
-$js_messages['strJumpToTable'] = __('Jump to Log table');
-$js_messages['strNoDataFoundTitle'] = __('No data found');
-$js_messages['strNoDataFound']
-    = __('Log analysed, but no data found in this time span.');
-
-$js_messages['strAnalyzing'] = __('Analyzing…');
-$js_messages['strExplainOutput'] = __('Explain output');
-$js_messages['strStatus'] = __('Status');
-$js_messages['strTime'] = __('Time');
-$js_messages['strTotalTime'] = __('Total time:');
-$js_messages['strProfilingResults'] = __('Profiling results');
-$js_messages['strTable'] = _pgettext('Display format', 'Table');
-$js_messages['strChart'] = __('Chart');
-
-/* l10n: A collection of available filters */
-$js_messages['strFiltersForLogTable'] = __('Log table filter options');
-/* l10n: Filter as in "Start Filtering" */
-$js_messages['strFilter'] = __('Filter');
-$js_messages['strFilterByWordRegexp'] = __('Filter queries by word/regexp:');
-$js_messages['strIgnoreWhereAndGroup']
-    = __('Group queries, ignoring variable data in WHERE clauses');
-$js_messages['strSumRows'] = __('Sum of grouped rows:');
-$js_messages['strTotal'] = __('Total:');
-
-$js_messages['strLoadingLogs'] = __('Loading logs');
-$js_messages['strRefreshFailed'] = __('Monitor refresh failed');
-$js_messages['strInvalidResponseExplanation'] = __(
-    'While requesting new chart data the server returned an invalid response. This '
-    . 'is most likely because your session expired. Reloading the page and '
-    . 'reentering your credentials should help.'
-);
-$js_messages['strReloadPage'] = __('Reload page');
-
-$js_messages['strAffectedRows'] = __('Affected rows:');
-
-$js_messages['strFailedParsingConfig'] = __(
-    'Failed parsing config file. It doesn\'t seem to be valid JSON code.'
-);
-$js_messages['strFailedBuildingGrid'] = __(
-    'Failed building chart grid with imported config. Resetting to default config…'
-);
-$js_messages['strImport'] = __('Import');
-$js_messages['strImportDialogTitle'] = __('Import monitor configuration');
-$js_messages['strImportDialogMessage']
-    = __('Please select the file you want to import.');
-$js_messages['strNoImportFile'] = __('No files available on server for import!');
-
-$js_messages['strAnalyzeQuery'] = __('Analyse query');
-
-/* Server status advisor */
-
-$js_messages['strAdvisorSystem'] = __('Advisor system');
-$js_messages['strPerformanceIssues'] = __('Possible performance issues');
-$js_messages['strIssuse'] = __('Issue');
-$js_messages['strRecommendation'] = __('Recommendation');
-$js_messages['strRuleDetails'] = __('Rule details');
-$js_messages['strJustification'] = __('Justification');
-$js_messages['strFormula'] = __('Used variable / formula');
-$js_messages['strTest'] = __('Test');
-
-/* For query editor */
-$js_messages['strFormatting'] = __('Formatting SQL…');
-$js_messages['strNoParam'] = __('No parameters found!');
-
-/* For inline query editing */
-$js_messages['strGo'] = __('Go');
-$js_messages['strCancel'] = __('Cancel');
-
-/* For page-related settings */
-$js_messages['strPageSettings'] = __('Page-related settings');
-$js_messages['strApply'] = __('Apply');
-
-/* For Ajax Notifications */
-$js_messages['strLoading'] = __('Loading…');
-$js_messages['strAbortedRequest'] = __('Request aborted!!');
-$js_messages['strProcessingRequest'] = __('Processing request');
-$js_messages['strRequestFailed'] = __('Request failed!!');
-$js_messages['strErrorProcessingRequest'] = __('Error in processing request');
-$js_messages['strErrorCode'] = __('Error code: %s');
-$js_messages['strErrorText'] = __('Error text: %s');
-$js_messages['strNoDatabasesSelected'] = __('No databases selected.');
-$js_messages['strDroppingColumn'] = __('Dropping column');
-$js_messages['strAddingPrimaryKey'] = __('Adding primary key');
-$js_messages['strOK'] = __('OK');
-$js_messages['strDismiss'] = __('Click to dismiss this notification');
-
-/* For db_operations.js */
-$js_messages['strRenamingDatabases'] = __('Renaming databases');
-$js_messages['strCopyingDatabase'] = __('Copying database');
-$js_messages['strChangingCharset'] = __('Changing charset');
-$js_messages['strNo'] = __('No');
-
-/* For Foreign key checks */
-$js_messages['strForeignKeyCheck'] = __('Enable foreign key checks');
-
-/* For db_stucture.js */
-$js_messages['strErrorRealRowCount'] = __('Failed to get real row count.');
-
-/* For db_search.js */
-$js_messages['strSearching'] = __('Searching');
-$js_messages['strHideSearchResults'] = __('Hide search results');
-$js_messages['strShowSearchResults'] = __('Show search results');
-$js_messages['strBrowsing'] = __('Browsing');
-$js_messages['strDeleting'] = __('Deleting');
-$js_messages['strConfirmDeleteResults'] = __('Delete the matches for the %s table?');
-
-/* For db_routines.js */
-$js_messages['MissingReturn']
-    = __('The definition of a stored function must contain a RETURN statement!');
-$js_messages['strExport'] = __('Export');
-$js_messages['NoExportable']
-    = __('No routine is exportable. Required privileges may be lacking.');
-
-/* For ENUM/SET editor*/
-$js_messages['enum_editor'] = __('ENUM/SET editor');
-$js_messages['enum_columnVals'] =__('Values for column %s');
-$js_messages['enum_newColumnVals'] = __('Values for a new column');
-$js_messages['enum_hint'] =__('Enter each value in a separate field.');
-$js_messages['enum_addValue'] =__('Add %d value(s)');
-
-/* For import.js */
-$js_messages['strImportCSV'] = __(
-    'Note: If the file contains multiple tables, they will be combined into one.'
-);
-
-/* For sql.js */
-$js_messages['strHideQueryBox'] = __('Hide query box');
-$js_messages['strShowQueryBox'] = __('Show query box');
-$js_messages['strEdit'] = __('Edit');
-$js_messages['strDelete'] = __('Delete');
-$js_messages['strNotValidRowNumber'] = __('%d is not valid row number.');
-$js_messages['strBrowseForeignValues'] = __('Browse foreign values');
-$js_messages['strNoAutoSavedQuery'] = __('No auto-saved query');
-$js_messages['strBookmarkVariable'] = __('Variable %d:');
-
-/* For Central list of columns */
-$js_messages['pickColumn'] = __('Pick');
-$js_messages['pickColumnTitle'] = __('Column selector');
-$js_messages['searchList'] = __('Search this list');
-$js_messages['strEmptyCentralList'] = __(
-    'No columns in the central list. Make sure the Central columns list for '
-    . 'database %s has columns that are not present in the current table.'
-);
-$js_messages['seeMore'] = __('See more');
-$js_messages['confirmTitle'] = __('Are you sure?');
-$js_messages['makeConsistentMessage'] = __(
-    'This action may change some of the columns definition.<br/>Are you sure you '
-    . 'want to continue?'
-);
-$js_messages['strContinue'] = __('Continue');
-
-/** For normalization */
-$js_messages['strAddPrimaryKey'] = __('Add primary key');
-$js_messages['strPrimaryKeyAdded'] = __('Primary key added.');
-$js_messages['strToNextStep'] = __('Taking you to next step…');
-$js_messages['strFinishMsg']
-    = __("The first step of normalization is complete for table '%s'.");
-$js_messages['strEndStep'] = __("End of step");
-$js_messages['str2NFNormalization'] = __('Second step of normalization (2NF)');
-$js_messages['strDone'] = __('Done');
-$js_messages['strConfirmPd'] = __('Confirm partial dependencies');
-$js_messages['strSelectedPd'] = __('Selected partial dependencies are as follows:');
-$js_messages['strPdHintNote'] = __(
-    'Note: a, b -> d,f implies values of columns a and b combined together can '
-    . 'determine values of column d and column f.'
-);
-$js_messages['strNoPdSelected'] = __('No partial dependencies selected!');
-$js_messages['strBack'] = __('Back');
-$js_messages['strShowPossiblePd']
-    = __('Show me the possible partial dependencies based on data in the table');
-$js_messages['strHidePd'] = __('Hide partial dependencies list');
-$js_messages['strWaitForPd'] = __(
-    'Sit tight! It may take few seconds depending on data size and column count of '
-    . 'the table.'
-);
-$js_messages['strStep'] = __('Step');
-$js_messages['strMoveRepeatingGroup']
-    = '<ol><b>' . __('The following actions will be performed:') . '</b>'
-    . '<li>' . __('DROP columns %s from the table %s') . '</li>'
-    . '<li>' . __('Create the following table') . '</li>';
-$js_messages['strNewTablePlaceholder'] = 'Enter new table name';
-$js_messages['strNewColumnPlaceholder'] = 'Enter column name';
-$js_messages['str3NFNormalization'] = __('Third step of normalization (3NF)');
-$js_messages['strConfirmTd'] = __('Confirm transitive dependencies');
-$js_messages['strSelectedTd'] = __('Selected dependencies are as follows:');
-$js_messages['strNoTdSelected'] = __('No dependencies selected!');
-
-/* For server_variables.js */
-$js_messages['strSave'] = __('Save');
-
-/* For tbl_select.js */
-$js_messages['strHideSearchCriteria'] = __('Hide search criteria');
-$js_messages['strShowSearchCriteria'] = __('Show search criteria');
-$js_messages['strRangeSearch'] = __('Range search');
-$js_messages['strColumnMax'] = __('Column maximum:');
-$js_messages['strColumnMin'] = __('Column minimum:');
-$js_messages['strMinValue'] = __('Minimum value:');
-$js_messages['strMaxValue'] = __('Maximum value:');
-
-/* For tbl_find_replace.js */
-$js_messages['strHideFindNReplaceCriteria'] = __('Hide find and replace criteria');
-$js_messages['strShowFindNReplaceCriteria'] = __('Show find and replace criteria');
-
-/* For tbl_zoom_plot_jqplot.js */
-$js_messages['strDisplayHelp'] = '<ul><li>'
-    . __('Each point represents a data row.')
-    . '</li><li>'
-    . __('Hovering over a point will show its label.')
-    . '</li><li>'
-    . __('To zoom in, select a section of the plot with the mouse.')
-    . '</li><li>'
-    . __('Click reset zoom button to come back to original state.')
-    . '</li><li>'
-    . __('Click a data point to view and possibly edit the data row.')
-    . '</li><li>'
-    . __('The plot can be resized by dragging it along the bottom right corner.')
-    . '</li></ul>';
-$js_messages['strHelpTitle'] = 'Zoom search instructions';
-$js_messages['strInputNull'] = '<strong>' . __('Select two columns') . '</strong>';
-$js_messages['strSameInputs'] = '<strong>'
-    . __('Select two different columns')
-    . '</strong>';
-$js_messages['strDataPointContent'] = __('Data point content');
-
-/* For tbl_change.js */
-$js_messages['strIgnore'] = __('Ignore');
-$js_messages['strCopy'] = __('Copy');
-$js_messages['strX'] = __('X');
-$js_messages['strY'] = __('Y');
-$js_messages['strPoint'] = __('Point');
-$js_messages['strPointN'] = __('Point %d');
-$js_messages['strLineString'] = __('Linestring');
-$js_messages['strPolygon'] = __('Polygon');
-$js_messages['strGeometry'] = __('Geometry');
-$js_messages['strInnerRing'] = __('Inner ring');
-$js_messages['strOuterRing'] = __('Outer ring');
-$js_messages['strAddPoint'] = __('Add a point');
-$js_messages['strAddInnerRing'] = __('Add an inner ring');
-$js_messages['strYes'] = __('Yes');
-$js_messages['strCopyEncryptionKey'] = __('Do you want to copy encryption key?');
-$js_messages['strEncryptionKey'] = __('Encryption key');
-
-/* For Tip to be shown on Time field */
-$js_messages['strMysqlAllowedValuesTipTime'] = __(
-    'MySQL accepts additional values not selectable by the slider;'
-    . ' key in those values directly if desired'
-);
-
-/* For Tip to be shown on Date field */
-$js_messages['strMysqlAllowedValuesTipDate'] = __(
-    'MySQL accepts additional values not selectable by the datepicker;'
-    . ' key in those values directly if desired'
-);
-
-/* For Lock symbol Tooltip */
-$js_messages['strLockToolTip'] = __(
-    'Indicates that you have made changes to this page;'
-    . ' you will be prompted for confirmation before abandoning changes'
-);
-
-/* Designer (js/pmd/move.js) */
-$js_messages['strSelectReferencedKey'] = __('Select referenced key');
-$js_messages['strSelectForeignKey'] = __('Select Foreign Key');
-$js_messages['strPleaseSelectPrimaryOrUniqueKey']
-    = __('Please select the primary key or a unique key!');
-$js_messages['strChangeDisplay'] = __('Choose column to display');
-$js_messages['strLeavingDesigner'] = __(
-    'You haven\'t saved the changes in the layout. They will be lost if you'
-    . ' don\'t save them. Do you want to continue?'
-);
-$js_messages['strPageName'] = __('Page name');
-$js_messages['strSavePage'] = __('Save page');
-$js_messages['strSavePageAs'] = __('Save page as');
-$js_messages['strOpenPage'] = __('Open page');
-$js_messages['strDeletePage'] = __('Delete page');
-$js_messages['strUntitled'] = __('Untitled');
-$js_messages['strSelectPage'] = __('Please select a page to continue');
-$js_messages['strEnterValidPageName'] = __('Please enter a valid page name');
-$js_messages['strLeavingPage']
-    = __('Do you want to save the changes to the current page?');
-$js_messages['strSuccessfulPageDelete'] = __('Successfully deleted the page');
-$js_messages['strExportRelationalSchema'] = __('Export relational schema');
-$js_messages['strModificationSaved'] = __('Modifications have been saved');
-
-/* Visual query builder (js/pmd/move.js) */
-$js_messages['strAddOption'] = __('Add an option for column "%s".');
-$js_messages['strObjectsCreated'] = __('%d object(s) created.');
-$js_messages['strSubmit'] = __('Submit');
-
-/* For makegrid.js (column reordering, show/hide column, grid editing) */
-$js_messages['strCellEditHint'] = __('Press escape to cancel editing.');
-$js_messages['strSaveCellWarning'] = __(
-    'You have edited some data and they have not been saved. Are you sure you want '
-    . 'to leave this page before saving the data?'
-);
-$js_messages['strColOrderHint'] = __('Drag to reorder.');
-$js_messages['strSortHint'] = __('Click to sort results by this column.');
-$js_messages['strMultiSortHint'] = __(
-    'Shift+Click to add this column to ORDER BY clause or to toggle ASC/DESC.'
-    . '<br />- Ctrl+Click or Alt+Click (Mac: Shift+Option+Click) to remove column '
-    . 'from ORDER BY clause'
-);
-$js_messages['strColMarkHint'] = __('Click to mark/unmark.');
-$js_messages['strColNameCopyHint'] = __('Double-click to copy column name.');
-$js_messages['strColVisibHint'] = __(
-    'Click the drop-down arrow<br />to toggle column\'s visibility.'
-);
-$js_messages['strShowAllCol'] = __('Show all');
-$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.'
-);
-$js_messages['strEnterValidHex']
-    = __('Please enter a valid hexadecimal string. Valid characters are 0-9, A-F.');
-$js_messages['strShowAllRowsWarning'] = __(
-    'Do you really want to see all of the rows? For a big table this could crash '
-    . 'the browser.'
-);
-$js_messages['strOriginalLength'] = __('Original length');
-
-/** Drag & Drop sql import messages */
-$js_messages['dropImportMessageCancel'] = __('cancel');
-$js_messages['dropImportMessageAborted'] = __('Aborted');
-$js_messages['dropImportMessageFailed'] = __('Failed');
-$js_messages['dropImportMessageSuccess'] = __('Success');
-$js_messages['dropImportImportResultHeader'] = __('Import status');
-$js_messages['dropImportDropFiles'] = __('Drop files here');
-$js_messages['dropImportSelectDB'] = __('Select database first');
-
-/* For Print view */
-$js_messages['print'] = __('Print');
-$js_messages['back'] = __('Back');
-
-// this approach does not work when the parameter is changed via user prefs
-switch ($GLOBALS['cfg']['GridEditing']) {
-case 'double-click':
-    $js_messages['strGridEditFeatureHint'] = __(
-        'You can also edit most values<br />by double-clicking directly on them.'
-    );
-    break;
-case 'click':
-    $js_messages['strGridEditFeatureHint'] = __(
-        'You can also edit most values<br />by clicking directly on them.'
-    );
-    break;
-default:
-    break;
-}
-$js_messages['strGoToLink'] = __('Go to link:');
-$js_messages['strColNameCopyTitle'] = __('Copy column name.');
-$js_messages['strColNameCopyText']
-    = __('Right-click the column name to copy it to your clipboard.');
-
-/* password generation */
-$js_messages['strGeneratePassword'] = __('Generate password');
-$js_messages['strGenerate'] = __('Generate');
-$js_messages['strChangePassword'] = __('Change password');
-
-/* navigation tabs */
-$js_messages['strMore'] = __('More');
-
-/* navigation panel */
-$js_messages['strShowPanel'] = __('Show panel');
-$js_messages['strHidePanel'] = __('Hide panel');
-$js_messages['strUnhideNavItem'] = __('Show hidden navigation tree items.');
-$js_messages['linkWithMain'] = __('Link with main panel');
-$js_messages['unlinkWithMain'] = __('Unlink from main panel');
-
-/* microhistory */
-$js_messages['strInvalidPage']
-    = __('The requested page was not found in the history, it may have expired.');
-
-/* update */
-$js_messages['strNewerVersion'] = __(
-    'A newer version of phpMyAdmin is available and you should consider upgrading. '
-    . 'The newest version is %s, released on %s.'
-);
-/* l10n: Latest available phpMyAdmin version */
-$js_messages['strLatestAvailable'] = __(', latest stable version:');
-$js_messages['strUpToDate'] = __('up to date');
-
-$js_messages['strCreateView'] = __('Create view');
-
-/* Error Reporting */
-$js_messages['strSendErrorReport'] = __("Send error report");
-$js_messages['strSubmitErrorReport'] = __("Submit error report");
-$js_messages['strErrorOccurred'] = __(
-    "A fatal JavaScript error has occurred. Would you like to send an error report?"
-);
-$js_messages['strChangeReportSettings'] = __("Change report settings");
-$js_messages['strShowReportDetails'] = __("Show report details");
-$js_messages['strIgnore'] = __("Ignore");
-$js_messages['strTimeOutError'] = __(
-    "Your export is incomplete, due to a low execution time limit at the PHP level!"
-);
-
-$js_messages['strTooManyInputs'] = __(
-    "Warning: a form on this page has more than %d fields. On submission, "
-    . "some of the fields might be ignored, due to PHP's "
-    . "max_input_vars configuration."
-);
-
-$js_messages['phpErrorsFound'] = '<div class="error">'
-    . __('Some errors have been detected on the server!')
-    . '<br/>'
-    . __('Please look at the bottom of this window.')
-    . '<div>'
-    . '<input id="pma_ignore_errors_popup" type="submit" value="'
-    . __('Ignore')
-    . '" class="floatright" style="margin-top: 20px;">'
-    . '<input id="pma_ignore_all_errors_popup" type="submit" value="'
-    . __('Ignore All')
-    . '" class="floatright" style="margin-top: 20px;">'
-    . '</div></div>';
-
-$js_messages['phpErrorsBeingSubmitted'] = '<div class="error">'
-    . __('Some errors have been detected on the server!')
-    . '<br/>'
-    . __(
-        'As per your settings, they are being submitted currently, please be '
-        . 'patient.'
-    )
-    . '<br/>'
-    . '<img src="'
-    . ($_SESSION['PMA_Theme']->getImgPath('ajax_clock_small.gif'))
-    . '" width="16" height="16" alt="ajax clock"/>'
-    . '</div>';
-
-// For console
-$js_messages['strConsoleRequeryConfirm'] = __('Execute this query again?');
-$js_messages['strConsoleDeleteBookmarkConfirm']
-    = __('Do you really want to delete this bookmark?');
-$js_messages['strConsoleDebugError']
-    = __('Some error occurred while getting SQL debug info.');
-$js_messages['strConsoleDebugSummary']
-    = __('%s queries executed %s times in %s seconds.');
-$js_messages['strConsoleDebugArgsSummary'] = __('%s argument(s) passed');
-$js_messages['strConsoleDebugShowArgs'] = __('Show arguments');
-$js_messages['strConsoleDebugHideArgs'] = __('Hide arguments');
-$js_messages['strConsoleDebugTimeTaken'] = __('Time taken:');
-$js_messages['strNoLocalStorage'] = __('There was a problem accessing your browser storage, some features may not work properly for you. It is likely that the browser doesn\'t support storage or the quota limit has been reached. In Firefox, corrupted storage can also cause such a problem, clearing your "Offline Website Data" might help. In Safari, such problem is commonly caused by "Private Mode Browsing".');
-// For modals in db_structure.php
-$js_messages['strCopyTablesTo'] = __('Copy tables to');
-$js_messages['strAddPrefix'] = __('Add table prefix');
-$js_messages['strReplacePrefix'] = __('Replace table with prefix');
-$js_messages['strCopyPrefix'] = __('Copy table with prefix');
-
-echo "var PMA_messages = new Array();\n";
-foreach ($js_messages as $name => $js_message) {
-    PMA_printJsValue("PMA_messages['" . $name . "']", $js_message);
-}
-
-/* Calendar */
-echo "var themeCalendarImage = '" , $GLOBALS['pmaThemeImage']
-    , 'b_calendar.png' , "';\n";
-
-/* Image path */
-echo "var pmaThemeImage = '" , $GLOBALS['pmaThemeImage'] , "';\n";
-
-echo "var mysql_doc_template = '" , PMA\libraries\Util::getMySQLDocuURL('%s')
-    , "';\n";
-
-//Max input vars allowed by PHP.
-$maxInputVars = ini_get('max_input_vars');
-echo 'var maxInputVars = '
-    , (false === $maxInputVars || '' == $maxInputVars ? 'false' : (int)$maxInputVars)
-    , ';' . "\n";
-
-echo "if ($.datepicker) {\n";
-/* l10n: Display text for calendar close link */
-PMA_printJsValue("$.datepicker.regional['']['closeText']", __('Done'));
-/* l10n: Display text for previous month link in calendar */
-PMA_printJsValue(
-    "$.datepicker.regional['']['prevText']",
-    _pgettext('Previous month', 'Prev')
-);
-/* l10n: Display text for next month link in calendar */
-PMA_printJsValue(
-    "$.datepicker.regional['']['nextText']",
-    _pgettext('Next month', 'Next')
-);
-/* l10n: Display text for current month link in calendar */
-PMA_printJsValue("$.datepicker.regional['']['currentText']", __('Today'));
-PMA_printJsValue(
-    "$.datepicker.regional['']['monthNames']",
-    array(
-        __('January'),
-        __('February'),
-        __('March'),
-        __('April'),
-        __('May'),
-        __('June'),
-        __('July'),
-        __('August'),
-        __('September'),
-        __('October'),
-        __('November'),
-        __('December')
-    )
-);
-PMA_printJsValue(
-    "$.datepicker.regional['']['monthNamesShort']",
-    array(
-        /* l10n: Short month name */
-        __('Jan'),
-        /* l10n: Short month name */
-        __('Feb'),
-        /* l10n: Short month name */
-        __('Mar'),
-        /* l10n: Short month name */
-        __('Apr'),
-        /* l10n: Short month name */
-        _pgettext('Short month name', 'May'),
-        /* l10n: Short month name */
-        __('Jun'),
-        /* l10n: Short month name */
-        __('Jul'),
-        /* l10n: Short month name */
-        __('Aug'),
-        /* l10n: Short month name */
-        __('Sep'),
-        /* l10n: Short month name */
-        __('Oct'),
-        /* l10n: Short month name */
-        __('Nov'),
-        /* l10n: Short month name */
-        __('Dec')
-    )
-);
-PMA_printJsValue(
-    "$.datepicker.regional['']['dayNames']",
-    array(
-        __('Sunday'),
-        __('Monday'),
-        __('Tuesday'),
-        __('Wednesday'),
-        __('Thursday'),
-        __('Friday'),
-        __('Saturday')
-    )
-);
-PMA_printJsValue(
-    "$.datepicker.regional['']['dayNamesShort']",
-    array(
-        /* l10n: Short week day name */
-        __('Sun'),
-        /* l10n: Short week day name */
-        __('Mon'),
-        /* l10n: Short week day name */
-        __('Tue'),
-        /* l10n: Short week day name */
-        __('Wed'),
-        /* l10n: Short week day name */
-        __('Thu'),
-        /* l10n: Short week day name */
-        __('Fri'),
-        /* l10n: Short week day name */
-        __('Sat')
-    )
-);
-PMA_printJsValue(
-    "$.datepicker.regional['']['dayNamesMin']",
-    array(
-        /* l10n: Minimal week day name */
-        __('Su'),
-        /* l10n: Minimal week day name */
-        __('Mo'),
-        /* l10n: Minimal week day name */
-        __('Tu'),
-        /* l10n: Minimal week day name */
-        __('We'),
-        /* l10n: Minimal week day name */
-        __('Th'),
-        /* l10n: Minimal week day name */
-        __('Fr'),
-        /* l10n: Minimal week day name */
-        __('Sa')
-    )
-);
-/* l10n: Column header for week of the year in calendar */
-PMA_printJsValue("$.datepicker.regional['']['weekHeader']", __('Wk'));
-
-PMA_printJsValue(
-    "$.datepicker.regional['']['showMonthAfterYear']",
-    /* l10n: Month-year order for calendar, use either "calendar-month-year"
-    * or "calendar-year-month".
-    */
-    (__('calendar-month-year') == 'calendar-year-month')
-);
-/* l10n: Year suffix for calendar, "none" is empty. */
-$year_suffix = _pgettext('Year suffix', 'none');
-PMA_printJsValue(
-    "$.datepicker.regional['']['yearSuffix']",
-    ($year_suffix == 'none' ? '' : $year_suffix)
-);
-?>
-$.extend($.datepicker._defaults, $.datepicker.regional['']);
-} /* if ($.datepicker) */
-
-<?php
-echo "if ($.timepicker) {\n";
-PMA_printJsValue("$.timepicker.regional['']['timeText']", __('Time'));
-PMA_printJsValue("$.timepicker.regional['']['hourText']", __('Hour'));
-PMA_printJsValue("$.timepicker.regional['']['minuteText']", __('Minute'));
-PMA_printJsValue("$.timepicker.regional['']['secondText']", __('Second'));
-?>
-$.extend($.timepicker._defaults, $.timepicker.regional['']);
-} /* if ($.timepicker) */
-
-<?php
-/* Form validation */
-
-echo "function extendingValidatorMessages() {\n";
-echo "$.extend($.validator.messages, {\n";
-/* Default validation functions */
-PMA_printJsValueForFormValidation('required', __('This field is required'));
-PMA_printJsValueForFormValidation('remote', __('Please fix this field'));
-PMA_printJsValueForFormValidation('email', __('Please enter a valid email address'));
-PMA_printJsValueForFormValidation('url', __('Please enter a valid URL'));
-PMA_printJsValueForFormValidation('date', __('Please enter a valid date'));
-PMA_printJsValueForFormValidation(
-    'dateISO',
-    __('Please enter a valid date ( ISO )')
-);
-PMA_printJsValueForFormValidation('number', __('Please enter a valid number'));
-PMA_printJsValueForFormValidation(
-    'creditcard',
-    __('Please enter a valid credit card number')
-);
-PMA_printJsValueForFormValidation('digits', __('Please enter only digits'));
-PMA_printJsValueForFormValidation(
-    'equalTo',
-    __('Please enter the same value again')
-);
-PMA_printJsValueForFormValidation(
-    'maxlength',
-    __('Please enter no more than {0} characters'),
-    true
-);
-PMA_printJsValueForFormValidation(
-    'minlength',
-    __('Please enter at least {0} characters'),
-    true
-);
-PMA_printJsValueForFormValidation(
-    'rangelength',
-    __('Please enter a value between {0} and {1} characters long'),
-    true
-);
-PMA_printJsValueForFormValidation(
-    'range',
-    __('Please enter a value between {0} and {1}'),
-    true
-);
-PMA_printJsValueForFormValidation(
-    'max',
-    __('Please enter a value less than or equal to {0}'),
-    true
-);
-PMA_printJsValueForFormValidation(
-    'min',
-    __('Please enter a value greater than or equal to {0}'),
-    true
-);
-/* customed functions */
-PMA_printJsValueForFormValidation(
-    'validationFunctionForDateTime',
-    __('Please enter a valid date or time'),
-    true
-);
-PMA_printJsValueForFormValidation(
-    'validationFunctionForHex',
-    __('Please enter a valid HEX input'),
-    true
-);
-PMA_printJsValueForFormValidation(
-    'validationFunctionForFuns',
-    __('Error'),
-    true,
-    false
-);
-echo "\n});";
-echo "\n} /* if ($.validator) */";
-?>
diff --git a/#pma/js/microhistory.js b/#pma/js/microhistory.js
deleted file mode 100644
index 4263cd0e..00000000
--- a/#pma/js/microhistory.js
+++ /dev/null
@@ -1,332 +0,0 @@
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * An implementation of a client-side page cache.
- * This object also uses the cache to provide a simple microhistory,
- * that is the ability to use the back and forward buttons in the browser
- */
-PMA_MicroHistory = {
-    /**
-     * @var int The maximum number of pages to keep in the cache
-     */
-    MAX: 6,
-    /**
-     * @var object A hash used to prime the cache with data about the initially
-     *             loaded page. This is set in the footer, and then loaded
-     *             by a double-queued event further down this file.
-     */
-    primer: {},
-    /**
-     * @var array Stores the content of the cached pages
-     */
-    pages: [],
-    /**
-     * @var int The index of the currently loaded page
-     *          This is used to know at which point in the history we are
-     */
-    current: 0,
-    /**
-     * Saves a new page in the cache
-     *
-     * @param string hash    The hash part of the url that is being loaded
-     * @param array  scripts A list of scripts that is required for the page
-     * @param string menu    A hash that links to a menu stored
-     *                       in a dedicated menu cache
-     * @param array  params  A list of parameters used by PMA_commonParams()
-     * @param string rel     A relationship to the current page:
-     *                       'samepage': Forces the response to be treated as
-     *                                   the same page as the current one
-     *                       'newpage':  Forces the response to be treated as
-     *                                   a new page
-     *                       undefined:  Default behaviour, 'samepage' if the
-     *                                   selflinks of the two pages are the same.
-     *                                   'newpage' otherwise
-     *
-     * @return void
-     */
-    add: function (hash, scripts, menu, params, rel) {
-        if (this.pages.length > PMA_MicroHistory.MAX) {
-            // Trim the cache, to the maximum number of allowed entries
-            // This way we will have a cached menu for every page
-            for (var i = 0; i < this.pages.length - this.MAX; i++) {
-                delete this.pages[i];
-            }
-        }
-        while (this.current < this.pages.length) {
-            // trim the cache if we went back in the history
-            // and are now going forward again
-            this.pages.pop();
-        }
-        if (rel === 'newpage' ||
-            (
-                typeof rel === 'undefined' && (
-                    typeof this.pages[this.current - 1] === 'undefined' ||
-                    this.pages[this.current - 1].hash !== hash
-                )
-            )
-        ) {
-            this.pages.push({
-                hash: hash,
-                content: $('#page_content').html(),
-                scripts: scripts,
-                selflink: $('#selflink').html(),
-                menu: menu,
-                params: params
-            });
-            PMA_SetUrlHash(this.current, hash);
-            this.current++;
-        }
-    },
-    /**
-     * Restores a page from the cache. This is called when the hash
-     * part of the url changes and it's structure appears to be valid
-     *
-     * @param string index Which page from the history to load
-     *
-     * @return void
-     */
-    navigate: function (index) {
-        if (typeof this.pages[index] === 'undefined' ||
-            typeof this.pages[index].content === 'undefined' ||
-            typeof this.pages[index].menu === 'undefined' ||
-            ! PMA_MicroHistory.menus.get(this.pages[index].menu)
-        ) {
-            PMA_ajaxShowMessage(
-                '<div class="error">' + PMA_messages.strInvalidPage + '</div>',
-                false
-            );
-        } else {
-            AJAX.active = true;
-            var record = this.pages[index];
-            AJAX.scriptHandler.reset(function () {
-                $('#page_content').html(record.content);
-                $('#selflink').html(record.selflink);
-                PMA_MicroHistory.menus.replace(PMA_MicroHistory.menus.get(record.menu));
-                PMA_commonParams.setAll(record.params);
-                AJAX.scriptHandler.load(record.scripts);
-                PMA_MicroHistory.current = ++index;
-            });
-        }
-    },
-    /**
-     * Resaves the content of the current page in the cache.
-     * Necessary in order not to show the user some outdated version of the page
-     *
-     * @return void
-     */
-    update: function () {
-        var page = this.pages[this.current - 1];
-        if (page) {
-            page.content = $('#page_content').html();
-        }
-    },
-    /**
-     * @var object Dedicated menu cache
-     */
-    menus: {
-        /**
-         * Returns the number of items in an associative array
-         *
-         * @return int
-         */
-        size: function (obj) {
-            var size = 0, key;
-            for (key in obj) {
-                if (obj.hasOwnProperty(key)) {
-                    size++;
-                }
-            }
-            return size;
-        },
-        /**
-         * @var hash Stores the content of the cached menus
-         */
-        data: {},
-        /**
-         * Saves a new menu in the cache
-         *
-         * @param string hash    The hash (trimmed md5) of the menu to be saved
-         * @param string content The HTML code of the menu to be saved
-         *
-         * @return void
-         */
-        add: function (hash, content) {
-            if (this.size(this.data) > PMA_MicroHistory.MAX) {
-                // when the cache grows, we remove the oldest entry
-                var oldest, key, init = 0;
-                for (var i in this.data) {
-                    if (this.data[i]) {
-                        if (! init || this.data[i].timestamp.getTime() < oldest.getTime()) {
-                            oldest = this.data[i].timestamp;
-                            key = i;
-                            init = 1;
-                        }
-                    }
-                }
-                delete this.data[key];
-            }
-            this.data[hash] = {
-                content: content,
-                timestamp: new Date()
-            };
-        },
-        /**
-         * Retrieves a menu given its hash
-         *
-         * @param string hash The hash of the menu to be retrieved
-         *
-         * @return string
-         */
-        get: function (hash) {
-            if (this.data[hash]) {
-                return this.data[hash].content;
-            } else {
-                // This should never happen as long as the number of stored menus
-                // is larger or equal to the number of pages in the page cache
-                return '';
-            }
-        },
-        /**
-         * Prepares part of the parameter string used during page requests,
-         * this is necessary to tell the server which menus we have in the cache
-         *
-         * @return string
-         */
-        getRequestParam: function () {
-            var param = '';
-            var menuHashes = [];
-            for (var i in this.data) {
-                menuHashes.push(i);
-            }
-            var menuHashesParam = menuHashes.join('-');
-            if (menuHashesParam) {
-                param = '&menuHashes=' + menuHashesParam;
-            }
-            return param;
-        },
-        /**
-         * Replaces the menu with new content
-         *
-         * @return void
-         */
-        replace: function (content) {
-            $('#floating_menubar').html(content)
-                // Remove duplicate wrapper
-                // TODO: don't send it in the response
-                .children().first().remove();
-            $('#topmenu').menuResizer(PMA_mainMenuResizerCallback);
-        }
-    }
-};
-
-/**
- * URL hash management module.
- * Allows direct bookmarking and microhistory.
- */
-PMA_SetUrlHash = (function (jQuery, window) {
-    "use strict";
-    /**
-     * Indictaes whether we have already completed
-     * the initialisation of the hash
-     *
-     * @access private
-     */
-    var ready = false;
-    /**
-     * Stores a hash that needed to be set when we were not ready
-     *
-     * @access private
-     */
-    var savedHash = "";
-    /**
-     * Flag to indicate if the change of hash was triggered
-     * by a user pressing the back/forward button or if
-     * the change was triggered internally
-     *
-     * @access private
-     */
-    var userChange = true;
-
-    // Fix favicon disappearing in Firefox when setting location.hash
-    function resetFavicon() {
-        if (navigator.userAgent.indexOf('Firefox') > -1) {
-            // Move the link tags for the favicon to the bottom
-            // of the head element to force a reload of the favicon
-            $('head > link[href=favicon\\.ico]').appendTo('head');
-        }
-    }
-
-    /**
-     * Sets the hash part of the URL
-     *
-     * @access public
-     */
-    function setUrlHash(index, hash) {
-        /*
-         * Known problem:
-         * Setting hash leads to reload in webkit:
-         * http://www.quirksmode.org/bugreports/archives/2005/05/Safari_13_visual_anomaly_with_windowlocationhref.html
-         *
-         * so we expect that users are not running an ancient Safari version
-         */
-
-        userChange = false;
-        if (ready) {
-            window.location.hash = "PMAURL-" + index + ":" + hash;
-            resetFavicon();
-        } else {
-            savedHash = "PMAURL-" + index + ":" + hash;
-        }
-    }
-    /**
-     * Start initialisation
-     */
-    var urlhash = window.location.hash;
-    if (urlhash.substring(0, 8) == '#PMAURL-') {
-        // We have a valid hash, let's redirect the user
-        // to the page that it's pointing to
-        var colon_position = urlhash.indexOf(':');
-        var questionmark_position = urlhash.indexOf('?');
-        if (colon_position != -1 && questionmark_position != -1 && colon_position < questionmark_position) {
-            var hash_url = urlhash.substring(colon_position + 1, questionmark_position);
-            if (PMA_gotoWhitelist.indexOf(hash_url) != -1) {
-                window.location = urlhash.substring(
-                    colon_position + 1
-                );
-            }
-        }
-    } else {
-        // We don't have a valid hash, so we'll set it up
-        // when the page finishes loading
-        jQuery(function () {
-            /* Check if we should set URL */
-            if (savedHash !== "") {
-                window.location.hash = savedHash;
-                savedHash = "";
-                resetFavicon();
-            }
-            // Indicate that we're done initialising
-            ready = true;
-        });
-    }
-    /**
-     * Register an event handler for when the url hash changes
-     */
-    jQuery(function () {
-        jQuery(window).hashchange(function () {
-            if (userChange === false) {
-                // Ignore internally triggered hash changes
-                userChange = true;
-            } else if (/^#PMAURL-\d+:/.test(window.location.hash)) {
-                // Change page if the hash changed was triggered by a user action
-                var index = window.location.hash.substring(
-                    8, window.location.hash.indexOf(':')
-                );
-                PMA_MicroHistory.navigate(index);
-            }
-        });
-    });
-    /**
-     * Publicly exposes a reference to the otherwise private setUrlHash function
-     */
-    return setUrlHash;
-})(jQuery, window);
diff --git a/#pma/js/multi_column_sort.js b/#pma/js/multi_column_sort.js
deleted file mode 100644
index c4946a9b..00000000
--- a/#pma/js/multi_column_sort.js
+++ /dev/null
@@ -1,81 +0,0 @@
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * @fileoverview    Implements the shiftkey + click remove column
- *                  from order by clause funcationality
- * @name            columndelete
- *
- * @requires    jQuery
- */
-
-function captureURL(url)
-{
-    var URL = {};
-    url = '' + url;
-    // Exclude the url part till HTTP
-    url = url.substr(url.search("sql.php"), url.length);
-    // The url part between ORDER BY and &session_max_rows needs to be replaced.
-    URL.head = url.substr(0, url.indexOf('ORDER+BY') + 9);
-    URL.tail = url.substr(url.indexOf("&session_max_rows"), url.length);
-    return URL;
-}
-
-/**
- * This function is for navigating to the generated URL
- *
- * @param object   target HTMLAnchor element
- * @param object   parent HTMLDom Object
- */
-
-function removeColumnFromMultiSort(target, parent)
-{
-    var URL = captureURL(target);
-    var begin = target.indexOf('ORDER+BY') + 8;
-    var end = target.indexOf('&session_max_rows');
-    // get the names of the columns involved
-    var between_part = target.substr(begin, end-begin);
-    var columns = between_part.split('%2C+');
-    // If the given column is not part of the order clause exit from this function
-    var index = parent.find('small').length ? parent.find('small').text() : '';
-    if (index === ''){
-        return '';
-    }
-    // Remove the current clicked column
-    columns.splice(index-1, 1);
-    // If all the columns have been removed dont submit a query with nothing
-    // After order by clause.
-    if (columns.length === 0) {
-        var head = URL.head;
-        head = head.slice(0,head.indexOf('ORDER+BY'));
-        URL.head = head;
-        // removing the last sort order should have priority over what
-        // is remembered via the RememberSorting directive
-        URL.tail += '&discard_remembered_sort=1';
-    }
-    var middle_part = columns.join('%2C+');
-    url = URL.head + middle_part + URL.tail;
-    return url;
-}
-
-AJAX.registerOnload('keyhandler.js', function () {
-    $("th.draggable.column_heading.pointer.marker a").on('click', function (event) {
-        var url = $(this).parent().find('input').val();
-        if (event.ctrlKey || event.altKey) {
-            event.preventDefault();
-            url = removeColumnFromMultiSort(url, $(this).parent());
-            if (url) {
-                AJAX.source = $(this);
-                PMA_ajaxShowMessage();
-                $.get(url, {'ajax_request' : true, 'ajax_page_request' : true}, AJAX.responseHandler);
-            }
-        } else if (event.shiftKey) {
-            event.preventDefault();
-            AJAX.source = $(this);
-            PMA_ajaxShowMessage();
-            $.get(url, {'ajax_request' : true, 'ajax_page_request' : true}, AJAX.responseHandler);
-        }
-    });
-});
-
-AJAX.registerTeardown('keyhandler.js', function () {
-    $(document).off('click', "th.draggable.column_heading.pointer.marker a");
-});
diff --git a/#pma/js/navigation.js b/#pma/js/navigation.js
deleted file mode 100644
index ae8704b7..00000000
--- a/#pma/js/navigation.js
+++ /dev/null
@@ -1,1545 +0,0 @@
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * function used in or for navigation panel
- *
- * @package phpMyAdmin-Navigation
- */
-
-/**
- * updates the tree state in sessionStorage
- *
- * @returns void
- */
-function navTreeStateUpdate() {
-    // update if session storage is supported
-    if (isStorageSupported('sessionStorage')) {
-        var storage = window.sessionStorage;
-        // try catch necessary here to detect whether
-        // content to be stored exceeds storage capacity
-        try {
-            storage.setItem('navTreePaths', JSON.stringify(traverseNavigationForPaths()));
-            storage.setItem('server', PMA_commonParams.get('server'));
-            storage.setItem('token', PMA_commonParams.get('token'));
-        } catch(error) {
-            // storage capacity exceeded & old navigation tree
-            // state is no more valid, so remove it
-            storage.removeItem('navTreePaths');
-            storage.removeItem('server');
-            storage.removeItem('token');
-        }
-    }
-}
-
-/**
- * Loads child items of a node and executes a given callback
- *
- * @param isNode
- * @param $expandElem expander
- * @param callback    callback function
- *
- * @returns void
- */
-function loadChildNodes(isNode, $expandElem, callback) {
-
-    var $destination = null;
-    var params = null;
-
-    if (isNode) {
-        if (!$expandElem.hasClass('expander')) {
-            return;
-        }
-        $destination = $expandElem.closest('li');
-        params = {
-            aPath: $expandElem.find('span.aPath').text(),
-            vPath: $expandElem.find('span.vPath').text(),
-            pos: $expandElem.find('span.pos').text(),
-            pos2_name: $expandElem.find('span.pos2_name').text(),
-            pos2_value: $expandElem.find('span.pos2_value').text(),
-            searchClause: '',
-            searchClause2: ''
-        };
-        if ($expandElem.closest('ul').hasClass('search_results')) {
-            params.searchClause = PMA_fastFilter.getSearchClause();
-            params.searchClause2 = PMA_fastFilter.getSearchClause2($expandElem);
-        }
-    } else {
-        $destination = $('#pma_navigation_tree_content');
-        params = {
-            aPath: $expandElem.attr('aPath'),
-            vPath: $expandElem.attr('vPath'),
-            pos: $expandElem.attr('pos'),
-            pos2_name: '',
-            pos2_value: '',
-            searchClause: '',
-            searchClause2: ''
-        };
-    }
-
-    var url = $('#pma_navigation').find('a.navigation_url').attr('href');
-    $.get(url, params, function (data) {
-        if (typeof data !== 'undefined' && data.success === true) {
-            $destination.find('div.list_container').remove(); // FIXME: Hack, there shouldn't be a list container there
-            if (isNode) {
-                $destination.append(data.message);
-                $expandElem.addClass('loaded');
-            } else {
-                $destination.html(data.message);
-                $destination.children()
-                    .first()
-                    .css({
-                        border: '0px',
-                        margin: '0em',
-                        padding : '0em'
-                    })
-                    .slideDown('slow');
-            }
-            if (data._errors) {
-                var $errors = $(data._errors);
-                if ($errors.children().length > 0) {
-                    $('#pma_errors').replaceWith(data._errors);
-                }
-            }
-            if (callback && typeof callback == 'function') {
-                callback(data);
-            }
-        } else if(data.redirect_flag == "1") {
-            if (window.location.href.indexOf('?') === -1) {
-                window.location.href += '?session_expired=1';
-            } else {
-                window.location.href += '&session_expired=1';
-            }
-            window.location.reload();
-        } else {
-            var $throbber = $expandElem.find('img.throbber');
-            $throbber.hide();
-            var $icon = $expandElem.find('img.ic_b_plus');
-            $icon.show();
-            PMA_ajaxShowMessage(data.error, false);
-        }
-    });
-}
-
-/**
- * Collapses a node in navigation tree.
- *
- * @param $expandElem expander
- *
- * @returns void
- */
-function collapseTreeNode($expandElem) {
-    var $children = $expandElem.closest('li').children('div.list_container');
-    var $icon = $expandElem.find('img');
-    if ($expandElem.hasClass('loaded')) {
-        if ($icon.is('.ic_b_minus')) {
-            $icon.removeClass('ic_b_minus').addClass('ic_b_plus');
-            $children.slideUp('fast');
-        }
-    }
-    $expandElem.blur();
-    $children.promise().done(navTreeStateUpdate);
-}
-
-/**
- * Traverse the navigation tree backwards to generate all the actual
- * and virtual paths, as well as the positions in the pagination at
- * various levels, if necessary.
- *
- * @return Object
- */
-function traverseNavigationForPaths() {
-    var params = {
-        pos: $('#pma_navigation_tree').find('div.dbselector select').val()
-    };
-    if ($('#navi_db_select').length) {
-        return params;
-    }
-    var count = 0;
-    $('#pma_navigation_tree').find('a.expander:visible').each(function () {
-        if ($(this).find('img').is('.ic_b_minus') &&
-            $(this).closest('li').find('div.list_container .ic_b_minus').length === 0
-        ) {
-            params['n' + count + '_aPath'] = $(this).find('span.aPath').text();
-            params['n' + count + '_vPath'] = $(this).find('span.vPath').text();
-
-            var pos2_name = $(this).find('span.pos2_name').text();
-            if (! pos2_name) {
-                pos2_name = $(this)
-                    .parent()
-                    .parent()
-                    .find('span.pos2_name:last')
-                    .text();
-            }
-            var pos2_value = $(this).find('span.pos2_value').text();
-            if (! pos2_value) {
-                pos2_value = $(this)
-                    .parent()
-                    .parent()
-                    .find('span.pos2_value:last')
-                    .text();
-            }
-
-            params['n' + count + '_pos2_name'] = pos2_name;
-            params['n' + count + '_pos2_value'] = pos2_value;
-
-            params['n' + count + '_pos3_name'] = $(this).find('span.pos3_name').text();
-            params['n' + count + '_pos3_value'] = $(this).find('span.pos3_value').text();
-            count++;
-        }
-    });
-    return params;
-}
-
-/**
- * Executed on page load
- */
-$(function () {
-    if (! $('#pma_navigation').length) {
-        // Don't bother running any code if the navigation is not even on the page
-        return;
-    }
-
-    // Do not let the page reload on submitting the fast filter
-    $(document).on('submit', '.fast_filter', function (event) {
-        event.preventDefault();
-    });
-
-    // Fire up the resize handlers
-    new ResizeHandler();
-
-    /**
-     * opens/closes (hides/shows) tree elements
-     * loads data via ajax
-     */
-    $(document).on('click', '#pma_navigation_tree a.expander', function (event) {
-        event.preventDefault();
-        event.stopImmediatePropagation();
-        var $icon = $(this).find('img');
-        if ($icon.is('.ic_b_plus')) {
-            expandTreeNode($(this));
-        } else {
-            collapseTreeNode($(this));
-        }
-    });
-
-    /**
-     * Register event handler for click on the reload
-     * navigation icon at the top of the panel
-     */
-    $(document).on('click', '#pma_navigation_reload', function (event) {
-        event.preventDefault();
-        // reload icon object
-        var $icon = $(this).find('img');
-        // source of the hidden throbber icon
-        var icon_throbber_src = $('#pma_navigation').find('.throbber').attr('src');
-        // source of the reload icon
-        var icon_reload_src = $icon.attr('src');
-        // replace the source of the reload icon with the one for throbber
-        $icon.attr('src', icon_throbber_src);
-        PMA_reloadNavigation();
-        // after one second, put back the reload icon
-        setTimeout(function () {
-            $icon.attr('src', icon_reload_src);
-        }, 1000);
-    });
-
-    $(document).on("change", '#navi_db_select',  function (event) {
-        if (! $(this).val()) {
-            PMA_commonParams.set('db', '');
-            PMA_reloadNavigation();
-        }
-        $(this).closest('form').trigger('submit');
-    });
-
-    /**
-     * Register event handler for click on the collapse all
-     * navigation icon at the top of the navigation tree
-     */
-    $(document).on('click', '#pma_navigation_collapse', function (event) {
-        event.preventDefault();
-        $('#pma_navigation_tree').find('a.expander').each(function() {
-            var $icon = $(this).find('img');
-            if ($icon.is('.ic_b_minus')) {
-                $(this).click();
-            }
-        });
-    });
-
-    /**
-     * Register event handler to toggle
-     * the 'link with main panel' icon on mouseenter.
-     */
-    $(document).on('mouseenter', '#pma_navigation_sync', function (event) {
-        event.preventDefault();
-        var synced = $('#pma_navigation_tree').hasClass('synced');
-        var $img = $('#pma_navigation_sync').children('img');
-        if (synced) {
-            $img.removeClass('ic_s_link').addClass('ic_s_unlink');
-        } else {
-            $img.removeClass('ic_s_unlink').addClass('ic_s_link');
-        }
-    });
-
-    /**
-     * Register event handler to toggle
-     * the 'link with main panel' icon on mouseout.
-     */
-    $(document).on('mouseout', '#pma_navigation_sync', function (event) {
-        event.preventDefault();
-        var synced = $('#pma_navigation_tree').hasClass('synced');
-        var $img = $('#pma_navigation_sync').children('img');
-        if (synced) {
-            $img.removeClass('ic_s_unlink').addClass('ic_s_link');
-        } else {
-            $img.removeClass('ic_s_link').addClass('ic_s_unlink');
-        }
-    });
-
-    /**
-     * Register event handler to toggle
-     * the linking with main panel behavior
-     */
-    $(document).on('click', '#pma_navigation_sync', function (event) {
-        event.preventDefault();
-        var synced = $('#pma_navigation_tree').hasClass('synced');
-        var $img = $('#pma_navigation_sync').children('img');
-        if (synced) {
-            $img
-                .removeClass('ic_s_unlink')
-                .addClass('ic_s_link')
-                .attr('alt', PMA_messages.linkWithMain)
-                .attr('title', PMA_messages.linkWithMain);
-            $('#pma_navigation_tree')
-                .removeClass('synced')
-                .find('li.selected')
-                .removeClass('selected');
-        } else {
-            $img
-                .removeClass('ic_s_link')
-                .addClass('ic_s_unlink')
-                .attr('alt', PMA_messages.unlinkWithMain)
-                .attr('title', PMA_messages.unlinkWithMain);
-            $('#pma_navigation_tree').addClass('synced');
-            PMA_showCurrentNavigation();
-        }
-    });
-
-    /**
-     * Bind all "fast filter" events
-     */
-    $(document).on('click', '#pma_navigation_tree li.fast_filter span', PMA_fastFilter.events.clear);
-    $(document).on('focus', '#pma_navigation_tree li.fast_filter input.searchClause', PMA_fastFilter.events.focus);
-    $(document).on('blur', '#pma_navigation_tree li.fast_filter input.searchClause', PMA_fastFilter.events.blur);
-    $(document).on('keyup', '#pma_navigation_tree li.fast_filter input.searchClause', PMA_fastFilter.events.keyup);
-
-    /**
-     * Ajax handler for pagination
-     */
-    $(document).on('click', '#pma_navigation_tree div.pageselector a.ajax', function (event) {
-        event.preventDefault();
-        PMA_navigationTreePagination($(this));
-    });
-
-    /**
-     * Node highlighting
-     */
-    $(document).on(
-        'mouseover',
-        '#pma_navigation_tree.highlight li:not(.fast_filter)',
-        function () {
-            if ($('li:visible', this).length === 0) {
-                $(this).addClass('activePointer');
-            }
-        }
-    );
-    $(document).on(
-        'mouseout',
-        '#pma_navigation_tree.highlight li:not(.fast_filter)',
-        function () {
-            $(this).removeClass('activePointer');
-        }
-    );
-
-    /** Create a Routine, Trigger or Event */
-    $(document).on('click', 'li.new_procedure a.ajax, li.new_function a.ajax', function (event) {
-        event.preventDefault();
-        var dialog = new RTE.object('routine');
-        dialog.editorDialog(1, $(this));
-    });
-    $(document).on('click', 'li.new_trigger a.ajax', function (event) {
-        event.preventDefault();
-        var dialog = new RTE.object('trigger');
-        dialog.editorDialog(1, $(this));
-    });
-    $(document).on('click', 'li.new_event a.ajax', function (event) {
-        event.preventDefault();
-        var dialog = new RTE.object('event');
-        dialog.editorDialog(1, $(this));
-    });
-
-    /** Edit Routines, Triggers or Events */
-    $(document).on('click', 'li.procedure > a.ajax, li.function > a.ajax', function (event) {
-        event.preventDefault();
-        var dialog = new RTE.object('routine');
-        dialog.editorDialog(0, $(this));
-    });
-    $(document).on('click', 'li.trigger > a.ajax', function (event) {
-        event.preventDefault();
-        var dialog = new RTE.object('trigger');
-        dialog.editorDialog(0, $(this));
-    });
-    $(document).on('click', 'li.event > a.ajax', function (event) {
-        event.preventDefault();
-        var dialog = new RTE.object('event');
-        dialog.editorDialog(0, $(this));
-    });
-
-    /** Execute Routines */
-    $(document).on('click', 'li.procedure div a.ajax img,' +
-        ' li.function div a.ajax img', function (event) {
-        event.preventDefault();
-        var dialog = new RTE.object('routine');
-        dialog.executeDialog($(this).parent());
-    });
-    /** Export Triggers and Events */
-    $(document).on('click', 'li.trigger div:eq(1) a.ajax img,' +
-        ' li.event div:eq(1) a.ajax img', function (event) {
-        event.preventDefault();
-        var dialog = new RTE.object();
-        dialog.exportDialog($(this).parent());
-    });
-
-    /** New index */
-    $(document).on('click', '#pma_navigation_tree li.new_index a.ajax', function (event) {
-        event.preventDefault();
-        var url = $(this).attr('href').substr(
-            $(this).attr('href').indexOf('?') + 1
-        ) + '&ajax_request=true';
-        var title = PMA_messages.strAddIndex;
-        indexEditorDialog(url, title);
-    });
-
-    /** Edit index */
-    $(document).on('click', 'li.index a.ajax', function (event) {
-        event.preventDefault();
-        var url = $(this).attr('href').substr(
-            $(this).attr('href').indexOf('?') + 1
-        ) + '&ajax_request=true';
-        var title = PMA_messages.strEditIndex;
-        indexEditorDialog(url, title);
-    });
-
-    /** New view */
-    $(document).on('click', 'li.new_view a.ajax', function (event) {
-        event.preventDefault();
-        PMA_createViewDialog($(this));
-    });
-
-    /** Hide navigation tree item */
-    $(document).on('click', 'a.hideNavItem.ajax', function (event) {
-        event.preventDefault();
-        $.ajax({
-            type: 'POST',
-            url: $(this).attr('href') + '&ajax_request=true',
-            success: function (data) {
-                if (typeof data !== 'undefined' && data.success === true) {
-                    PMA_reloadNavigation();
-                } else {
-                    PMA_ajaxShowMessage(data.error);
-                }
-            }
-        });
-    });
-
-    /** Display a dialog to choose hidden navigation items to show */
-    $(document).on('click', 'a.showUnhide.ajax', function (event) {
-        event.preventDefault();
-        var $msg = PMA_ajaxShowMessage();
-        $.get($(this).attr('href') + '&ajax_request=1', function (data) {
-            if (typeof data !== 'undefined' && data.success === true) {
-                PMA_ajaxRemoveMessage($msg);
-                var buttonOptions = {};
-                buttonOptions[PMA_messages.strClose] = function () {
-                    $(this).dialog("close");
-                };
-                $('<div/>')
-                    .attr('id', 'unhideNavItemDialog')
-                    .append(data.message)
-                    .dialog({
-                        width: 400,
-                        minWidth: 200,
-                        modal: true,
-                        buttons: buttonOptions,
-                        title: PMA_messages.strUnhideNavItem,
-                        close: function () {
-                            $(this).remove();
-                        }
-                    });
-            } else {
-                PMA_ajaxShowMessage(data.error);
-            }
-        });
-    });
-
-    /** Show a hidden navigation tree item */
-    $(document).on('click', 'a.unhideNavItem.ajax', function (event) {
-        event.preventDefault();
-        var $tr = $(this).parents('tr');
-        var $msg = PMA_ajaxShowMessage();
-        $.ajax({
-            type: 'POST',
-            url: $(this).attr('href') + '&ajax_request=true',
-            success: function (data) {
-                PMA_ajaxRemoveMessage($msg);
-                if (typeof data !== 'undefined' && data.success === true) {
-                    $tr.remove();
-                    PMA_reloadNavigation();
-                } else {
-                    PMA_ajaxShowMessage(data.error);
-                }
-            }
-        });
-    });
-
-    // Add/Remove favorite table using Ajax.
-    $(document).on("click", ".favorite_table_anchor", function (event) {
-        event.preventDefault();
-        $self = $(this);
-        var anchor_id = $self.attr("id");
-        if($self.data("favtargetn") !== null) {
-            if($('a[data-favtargets="' + $self.data("favtargetn") + '"]').length > 0)
-            {
-                $('a[data-favtargets="' + $self.data("favtargetn") + '"]').trigger('click');
-                return;
-            }
-        }
-
-        $.ajax({
-            url: $self.attr('href'),
-            cache: false,
-            type: 'POST',
-            data: {
-                favorite_tables: (isStorageSupported('localStorage') && typeof window.localStorage.favorite_tables !== 'undefined')
-                    ? window.localStorage.favorite_tables
-                    : ''
-            },
-            success: function (data) {
-                if (data.changes) {
-                    $('#pma_favorite_list').html(data.list);
-                    $('#' + anchor_id).parent().html(data.anchor);
-                    PMA_tooltip(
-                        $('#' + anchor_id),
-                        'a',
-                        $('#' + anchor_id).attr("title")
-                    );
-                    // Update localStorage.
-                    if (isStorageSupported('localStorage')) {
-                        window.localStorage.favorite_tables = data.favorite_tables;
-                    }
-                } else {
-                    PMA_ajaxShowMessage(data.message);
-                }
-            }
-        });
-    });
-    // Check if session storage is supported
-    if (isStorageSupported('sessionStorage')) {
-        var storage = window.sessionStorage;
-        // remove tree from storage if Navi_panel config form is submitted
-        $(document).on('submit', 'form.config-form', function(event) {
-            storage.removeItem('navTreePaths');
-        });
-        // Initialize if no previous state is defined
-        if ($('#pma_navigation_tree_content').length &&
-            typeof storage.navTreePaths === 'undefined'
-        ) {
-            PMA_reloadNavigation();
-        } else if (PMA_commonParams.get('server') === storage.server &&
-            PMA_commonParams.get('token') === storage.token
-        ) {
-            // Reload the tree to the state before page refresh
-            PMA_reloadNavigation(null, JSON.parse(storage.navTreePaths));
-        } else {
-            // If the user is different
-            navTreeStateUpdate();
-        }
-    }
-});
-
-/**
- * Expands a node in navigation tree.
- *
- * @param $expandElem expander
- * @param callback    callback function
- *
- * @returns void
- */
-function expandTreeNode($expandElem, callback) {
-    var $children = $expandElem.closest('li').children('div.list_container');
-    var $icon = $expandElem.find('img');
-    if ($expandElem.hasClass('loaded')) {
-        if ($icon.is('.ic_b_plus')) {
-            $icon.removeClass('ic_b_plus').addClass('ic_b_minus');
-            $children.slideDown('fast');
-        }
-        if (callback && typeof callback == 'function') {
-            callback.call();
-        }
-        $children.promise().done(navTreeStateUpdate);
-    } else {
-        var $throbber = $('#pma_navigation').find('.throbber')
-            .first()
-            .clone()
-            .css({visibility: 'visible', display: 'block'})
-            .click(false);
-        $icon.hide();
-        $throbber.insertBefore($icon);
-
-        loadChildNodes(true, $expandElem, function (data) {
-            if (typeof data !== 'undefined' && data.success === true) {
-                var $destination = $expandElem.closest('li');
-                $icon.removeClass('ic_b_plus').addClass('ic_b_minus');
-                $children = $destination.children('div.list_container');
-                $children.slideDown('fast');
-                if ($destination.find('ul > li').length == 1) {
-                    $destination.find('ul > li')
-                        .find('a.expander.container')
-                        .click();
-                }
-                if (callback && typeof callback == 'function') {
-                    callback.call();
-                }
-                PMA_showFullName($destination);
-            } else {
-                PMA_ajaxShowMessage(data.error, false);
-            }
-            $icon.show();
-            $throbber.remove();
-            $children.promise().done(navTreeStateUpdate);
-        });
-    }
-    $expandElem.blur();
-}
-
-/**
- * Auto-scrolls the newly chosen database
- *
- * @param  object   $element    The element to set to view
- * @param  boolean  $forceToTop Whether to force scroll to top
- *
- */
-function scrollToView($element, $forceToTop) {
-    var $container = $('#pma_navigation_tree_content');
-    var elemTop = $element.offset().top - $container.offset().top;
-    var textHeight = 20;
-    var scrollPadding = 20; // extra padding from top of bottom when scrolling to view
-    if (elemTop < 0 || $forceToTop) {
-        $container.stop().animate({
-            scrollTop: elemTop + $container.scrollTop() - scrollPadding
-        });
-    } else if (elemTop + textHeight > $container.height()) {
-        $container.stop().animate({
-            scrollTop: elemTop + textHeight - $container.height() + $container.scrollTop() + scrollPadding
-        });
-    }
-}
-
-/**
- * Expand the navigation and highlight the current database or table/view
- *
- * @returns void
- */
-function PMA_showCurrentNavigation() {
-    var db = PMA_commonParams.get('db');
-    var table = PMA_commonParams.get('table');
-    $('#pma_navigation_tree')
-        .find('li.selected')
-        .removeClass('selected');
-    if (db) {
-        var $dbItem = findLoadedItem(
-            $('#pma_navigation_tree').find('> div'), db, 'database', !table
-        );
-        if ($('#navi_db_select').length &&
-            $('option:selected', $('#navi_db_select')).length
-        ) {
-            if (! PMA_selectCurrentDb()) {
-                return;
-            }
-            // If loaded database in navigation is not same as current one
-            if ($('#pma_navigation_tree_content').find('span.loaded_db:first').text()
-                !== $('#navi_db_select').val()
-            ) {
-                loadChildNodes(false, $('option:selected', $('#navi_db_select')), function (data) {
-                    handleTableOrDb(table, $('#pma_navigation_tree_content'));
-                    var $children = $('#pma_navigation_tree_content').children('div.list_container');
-                    $children.promise().done(navTreeStateUpdate);
-                });
-            } else {
-                handleTableOrDb(table, $('#pma_navigation_tree_content'));
-            }
-        } else if ($dbItem) {
-            var $expander = $dbItem.children('div:first').children('a.expander');
-            // if not loaded or loaded but collapsed
-            if (! $expander.hasClass('loaded') ||
-                $expander.find('img').is('.ic_b_plus')
-            ) {
-                expandTreeNode($expander, function () {
-                    handleTableOrDb(table, $dbItem);
-                });
-            } else {
-                handleTableOrDb(table, $dbItem);
-            }
-        }
-    } else if ($('#navi_db_select').length && $('#navi_db_select').val()) {
-        $('#navi_db_select').val('').hide().trigger('change');
-    }
-    PMA_showFullName($('#pma_navigation_tree'));
-
-    function handleTableOrDb(table, $dbItem) {
-        if (table) {
-            loadAndHighlightTableOrView($dbItem, table);
-        } else {
-            var $container = $dbItem.children('div.list_container');
-            var $tableContainer = $container.children('ul').children('li.tableContainer');
-            if ($tableContainer.length > 0) {
-                var $expander = $tableContainer.children('div:first').children('a.expander');
-                $tableContainer.addClass('selected');
-                expandTreeNode($expander, function () {
-                    scrollToView($dbItem, true);
-                });
-            } else {
-                scrollToView($dbItem, true);
-            }
-        }
-    }
-
-    function findLoadedItem($container, name, clazz, doSelect) {
-        var ret = false;
-        $container.children('ul').children('li').each(function () {
-            var $li = $(this);
-            // this is a navigation group, recurse
-            if ($li.is('.navGroup')) {
-                var $container = $li.children('div.list_container');
-                var $childRet = findLoadedItem(
-                    $container, name, clazz, doSelect
-                );
-                if ($childRet) {
-                    ret = $childRet;
-                    return false;
-                }
-            } else { // this is a real navigation item
-                // name and class matches
-                if (((clazz && $li.is('.' + clazz)) || ! clazz) &&
-                        $li.children('a').text() == name) {
-                    if (doSelect) {
-                        $li.addClass('selected');
-                    }
-                    // taverse up and expand and parent navigation groups
-                    $li.parents('.navGroup').each(function () {
-                        var $cont = $(this).children('div.list_container');
-                        if (! $cont.is(':visible')) {
-                            $(this)
-                                .children('div:first')
-                                .children('a.expander')
-                                .click();
-                        }
-                    });
-                    ret = $li;
-                    return false;
-                }
-            }
-        });
-        return ret;
-    }
-
-    function loadAndHighlightTableOrView($dbItem, itemName) {
-        var $container = $dbItem.children('div.list_container');
-        var $expander;
-        var $whichItem = isItemInContainer($container, itemName, 'li.table, li.view');
-        //If item already there in some container
-        if ($whichItem) {
-            //get the relevant container while may also be a subcontainer
-            var $relatedContainer = $whichItem.closest('li.subContainer').length
-                ? $whichItem.closest('li.subContainer')
-                : $dbItem;
-            $whichItem = findLoadedItem(
-                $relatedContainer.children('div.list_container'),
-                itemName, null, true
-            );
-            //Show directly
-            showTableOrView($whichItem, $relatedContainer.children('div:first').children('a.expander'));
-        //else if item not there, try loading once
-        } else {
-            var $sub_containers = $dbItem.find('.subContainer');
-            //If there are subContainers i.e. tableContainer or viewContainer
-            if($sub_containers.length > 0) {
-                var $containers = [];
-                $sub_containers.each(function (index) {
-                    $containers[index] = $(this);
-                    $expander = $containers[index]
-                        .children('div:first')
-                        .children('a.expander');
-                    if (! $expander.hasClass('loaded')) {
-                        loadAndShowTableOrView($expander, $containers[index], itemName);
-                    }
-                });
-            // else if no subContainers
-            } else {
-                $expander = $dbItem
-                    .children('div:first')
-                    .children('a.expander');
-                if (! $expander.hasClass('loaded')) {
-                    loadAndShowTableOrView($expander, $dbItem, itemName);
-                }
-            }
-        }
-    }
-
-    function loadAndShowTableOrView($expander, $relatedContainer, itemName) {
-        loadChildNodes(true, $expander, function (data) {
-            var $whichItem = findLoadedItem(
-                $relatedContainer.children('div.list_container'),
-                itemName, null, true
-            );
-            if ($whichItem) {
-                showTableOrView($whichItem, $expander);
-            }
-        });
-    }
-
-    function showTableOrView($whichItem, $expander) {
-        expandTreeNode($expander, function (data) {
-            if ($whichItem) {
-                scrollToView($whichItem, false);
-            }
-        });
-    }
-
-    function isItemInContainer($container, name, clazz)
-    {
-        var $whichItem = null;
-        $items = $container.find(clazz);
-        var found = false;
-        $items.each(function () {
-            if ($(this).children('a').text() == name) {
-                $whichItem = $(this);
-                return false;
-            }
-        });
-        return $whichItem;
-    }
-}
-
-/**
- * Disable navigation panel settings
- *
- * @return void
- */
-function PMA_disableNaviSettings() {
-    $('#pma_navigation_settings_icon').addClass('hide');
-    $('#pma_navigation_settings').remove();
-}
-
-/**
- * Ensure that navigation panel settings is properly setup.
- * If not, set it up
- *
- * @return void
- */
-function PMA_ensureNaviSettings(selflink) {
-    $('#pma_navigation_settings_icon').removeClass('hide');
-
-    if (!$('#pma_navigation_settings').length) {
-        var params = {
-            getNaviSettings: true
-        };
-        var url = $('#pma_navigation').find('a.navigation_url').attr('href');
-        $.post(url, params, function (data) {
-            if (typeof data !== 'undefined' && data.success) {
-                $('#pma_navi_settings_container').html(data.message);
-                setupRestoreField();
-                setupValidation();
-                setupConfigTabs();
-                $('#pma_navigation_settings').find('form').attr('action', selflink);
-            } else {
-                PMA_ajaxShowMessage(data.error);
-            }
-        });
-    } else {
-        $('#pma_navigation_settings').find('form').attr('action', selflink);
-    }
-}
-
-/**
- * Reloads the whole navigation tree while preserving its state
- *
- * @param  function     the callback function
- * @param  Object       stored navigation paths
- *
- * @return void
- */
-function PMA_reloadNavigation(callback, paths) {
-    var params = {
-        reload: true,
-        no_debug: true
-    };
-    paths = paths || traverseNavigationForPaths();
-    $.extend(params, paths);
-    if ($('#navi_db_select').length) {
-        params.db = PMA_commonParams.get('db');
-        requestNaviReload(params);
-        return;
-    }
-    requestNaviReload(params);
-
-    function requestNaviReload(params) {
-        var url = $('#pma_navigation').find('a.navigation_url').attr('href');
-        $.post(url, params, function (data) {
-            if (typeof data !== 'undefined' && data.success) {
-                $('#pma_navigation_tree').html(data.message).children('div').show();
-                if ($('#pma_navigation_tree').hasClass('synced')) {
-                    PMA_selectCurrentDb();
-                    PMA_showCurrentNavigation();
-                }
-                // Fire the callback, if any
-                if (typeof callback === 'function') {
-                    callback.call();
-                }
-                navTreeStateUpdate();
-            } else {
-                PMA_ajaxShowMessage(data.error);
-            }
-        });
-    }
-}
-
-function PMA_selectCurrentDb() {
-    var $naviDbSelect = $('#navi_db_select');
-
-    if (!$naviDbSelect.length) {
-        return false;
-    }
-
-    if (PMA_commonParams.get('db')) { // db selected
-        $naviDbSelect.show();
-    }
-
-    $naviDbSelect.val(PMA_commonParams.get('db'));
-    return $naviDbSelect.val() === PMA_commonParams.get('db');
-
-}
-
-/**
- * Handles any requests to change the page in a branch of a tree
- *
- * This can be called from link click or select change event handlers
- *
- * @param object $this A jQuery object that points to the element that
- * initiated the action of changing the page
- *
- * @return void
- */
-function PMA_navigationTreePagination($this) {
-    var $msgbox = PMA_ajaxShowMessage();
-    var isDbSelector = $this.closest('div.pageselector').is('.dbselector');
-    var url, params;
-    if ($this[0].tagName == 'A') {
-        url = $this.attr('href');
-        params = 'ajax_request=true';
-    } else { // tagName == 'SELECT'
-        url = 'navigation.php';
-        params = $this.closest("form").serialize() + '&ajax_request=true';
-    }
-    var searchClause = PMA_fastFilter.getSearchClause();
-    if (searchClause) {
-        params += '&searchClause=' + encodeURIComponent(searchClause);
-    }
-    if (isDbSelector) {
-        params += '&full=true';
-    } else {
-        var searchClause2 = PMA_fastFilter.getSearchClause2($this);
-        if (searchClause2) {
-            params += '&searchClause2=' + encodeURIComponent(searchClause2);
-        }
-    }
-    $.post(url, params, function (data) {
-        if (typeof data !== 'undefined' && data.success) {
-            PMA_ajaxRemoveMessage($msgbox);
-            if (isDbSelector) {
-                var val = PMA_fastFilter.getSearchClause();
-                $('#pma_navigation_tree')
-                    .html(data.message)
-                    .children('div')
-                    .show();
-                if (val) {
-                    $('#pma_navigation_tree')
-                        .find('li.fast_filter input.searchClause')
-                        .val(val);
-                }
-            } else {
-                var $parent = $this.closest('div.list_container').parent();
-                var val = PMA_fastFilter.getSearchClause2($this);
-                $this.closest('div.list_container').html(
-                    $(data.message).children().show()
-                );
-                if (val) {
-                    $parent.find('li.fast_filter input.searchClause').val(val);
-                }
-                $parent.find('span.pos2_value:first').text(
-                    $parent.find('span.pos2_value:last').text()
-                );
-                $parent.find('span.pos3_value:first').text(
-                    $parent.find('span.pos3_value:last').text()
-                );
-            }
-        } else {
-            PMA_ajaxShowMessage(data.error);
-            PMA_handleRedirectAndReload(data);
-        }
-        navTreeStateUpdate();
-    });
-}
-
-/**
- * @var ResizeHandler Custom object that manages the resizing of the navigation
- *
- * XXX: Must only be ever instanciated once
- * XXX: Inside event handlers the 'this' object is accessed as 'event.data.resize_handler'
- */
-var ResizeHandler = function () {
-    /**
-     * @var int panel_width Used by the collapser to know where to go
-     *                      back to when uncollapsing the panel
-     */
-    this.panel_width = 0;
-    /**
-     * @var string left Used to provide support for RTL languages
-     */
-    this.left = $('html').attr('dir') == 'ltr' ? 'left' : 'right';
-    /**
-     * Adjusts the width of the navigation panel to the specified value
-     *
-     * @param int pos Navigation width in pixels
-     *
-     * @return void
-     */
-    this.setWidth = function (pos) {
-        var $resizer = $('#pma_navigation_resizer');
-        var resizer_width = $resizer.width();
-        var $collapser = $('#pma_navigation_collapser');
-        $('#pma_navigation').width(pos);
-        $('body').css('margin-' + this.left, pos + 'px');
-        $("#floating_menubar, #pma_console")
-            .css('margin-' + this.left, (pos + resizer_width) + 'px');
-        $resizer.css(this.left, pos + 'px');
-        if (pos === 0) {
-            $collapser
-                .css(this.left, pos + resizer_width)
-                .html(this.getSymbol(pos))
-                .prop('title', PMA_messages.strShowPanel);
-        } else {
-            $collapser
-                .css(this.left, pos)
-                .html(this.getSymbol(pos))
-                .prop('title', PMA_messages.strHidePanel);
-        }
-        setTimeout(function () {
-            $(window).trigger('resize');
-        }, 4);
-    };
-    /**
-     * Returns the horizontal position of the mouse,
-     * relative to the outer side of the navigation panel
-     *
-     * @param int pos Navigation width in pixels
-     *
-     * @return void
-     */
-    this.getPos = function (event) {
-        var pos = event.pageX;
-        var windowWidth = $(window).width();
-        var windowScroll = $(window).scrollLeft();
-        pos = pos - windowScroll;
-        if (this.left != 'left') {
-            pos = windowWidth - event.pageX;
-        }
-        if (pos < 0) {
-            pos = 0;
-        } else if (pos + 100 >= windowWidth) {
-            pos = windowWidth - 100;
-        } else {
-            this.panel_width = 0;
-        }
-        return pos;
-    };
-    /**
-     * Returns the HTML code for the arrow symbol used in the collapser
-     *
-     * @param int width The width of the panel
-     *
-     * @return string
-     */
-    this.getSymbol = function (width) {
-        if (this.left == 'left') {
-            if (width === 0) {
-                return '&rarr;';
-            } else {
-                return '&larr;';
-            }
-        } else {
-            if (width === 0) {
-                return '&larr;';
-            } else {
-                return '&rarr;';
-            }
-        }
-    };
-    /**
-     * Event handler for initiating a resize of the panel
-     *
-     * @param object e Event data (contains a reference to resizeHandler)
-     *
-     * @return void
-     */
-    this.mousedown = function (event) {
-        event.preventDefault();
-        $(document)
-            .bind('mousemove', {'resize_handler': event.data.resize_handler},
-                $.throttle(event.data.resize_handler.mousemove, 4))
-            .bind('mouseup', {'resize_handler': event.data.resize_handler},
-                event.data.resize_handler.mouseup);
-        $('body').css('cursor', 'col-resize');
-    };
-    /**
-     * Event handler for terminating a resize of the panel
-     *
-     * @param object e Event data (contains a reference to resizeHandler)
-     *
-     * @return void
-     */
-    this.mouseup = function (event) {
-        $('body').css('cursor', '');
-        $.cookie('pma_navi_width', event.data.resize_handler.getPos(event));
-        $('#topmenu').menuResizer('resize');
-        $(document)
-            .unbind('mousemove')
-            .unbind('mouseup');
-    };
-    /**
-     * Event handler for updating the panel during a resize operation
-     *
-     * @param object e Event data (contains a reference to resizeHandler)
-     *
-     * @return void
-     */
-    this.mousemove = function (event) {
-        event.preventDefault();
-        var pos = event.data.resize_handler.getPos(event);
-        event.data.resize_handler.setWidth(pos);
-        if ($('.sticky_columns').length !== 0) {
-            handleAllStickyColumns();
-        }
-    };
-    /**
-     * Event handler for collapsing the panel
-     *
-     * @param object e Event data (contains a reference to resizeHandler)
-     *
-     * @return void
-     */
-    this.collapse = function (event) {
-        event.preventDefault();
-        var panel_width = event.data.resize_handler.panel_width;
-        var width = $('#pma_navigation').width();
-        if (width === 0 && panel_width === 0) {
-            panel_width = 240;
-        }
-        event.data.resize_handler.setWidth(panel_width);
-        event.data.resize_handler.panel_width = width;
-    };
-    /**
-     * Event handler for resizing the navigation tree height on window resize
-     *
-     * @return void
-     */
-    this.treeResize = function (event) {
-        var $nav        = $("#pma_navigation"),
-            $nav_tree   = $("#pma_navigation_tree"),
-            $nav_header = $("#pma_navigation_header"),
-            $nav_tree_content = $("#pma_navigation_tree_content");
-        $nav_tree.height($nav.height() - $nav_header.height());
-        if ($nav_tree_content.length > 0) {
-            $nav_tree_content.height($nav_tree.height() - $nav_tree_content.position().top);
-        } else {
-            //TODO: in fast filter search response there is no #pma_navigation_tree_content, needs to be added in php
-            $nav_tree.css({
-                'overflow-y': 'auto'
-            });
-        }
-        // Set content bottom space beacuse of console
-        $('body').css('margin-bottom', $('#pma_console').height() + 'px');
-    };
-    /* Initialisation section begins here */
-    if ($.cookie('pma_navi_width')) {
-        // If we have a cookie, set the width of the panel to its value
-        var pos = Math.abs(parseInt($.cookie('pma_navi_width'), 10) || 0);
-        this.setWidth(pos);
-        $('#topmenu').menuResizer('resize');
-    }
-    // Register the events for the resizer and the collapser
-    $(document).on('mousedown', '#pma_navigation_resizer', {'resize_handler': this}, this.mousedown);
-    $(document).on('click', '#pma_navigation_collapser', {'resize_handler': this}, this.collapse);
-
-    // Add the correct arrow symbol to the collapser
-    $('#pma_navigation_collapser').html(this.getSymbol($('#pma_navigation').width()));
-    // Fix navigation tree height
-    $(window).on('resize', this.treeResize);
-    // need to call this now and then, browser might decide
-    // to show/hide horizontal scrollbars depending on page content width
-    setInterval(this.treeResize, 2000);
-    this.treeResize();
-}; // End of ResizeHandler
-
-/**
- * @var object PMA_fastFilter Handles the functionality that allows filtering
- *                            of the items in a branch of the navigation tree
- */
-var PMA_fastFilter = {
-    /**
-     * Construct for the asynchronous fast filter functionality
-     *
-     * @param object $this        A jQuery object pointing to the list container
-     *                            which is the nearest parent of the fast filter
-     * @param string searchClause The query string for the filter
-     *
-     * @return new PMA_fastFilter.filter object
-     */
-    filter: function ($this, searchClause) {
-        /**
-         * @var object $this A jQuery object pointing to the list container
-         *                   which is the nearest parent of the fast filter
-         */
-        this.$this = $this;
-        /**
-         * @var bool searchClause The query string for the filter
-         */
-        this.searchClause = searchClause;
-        /**
-         * @var object $clone A clone of the original contents
-         *                    of the navigation branch before
-         *                    the fast filter was applied
-         */
-        this.$clone = $this.clone();
-        /**
-         * @var object xhr A reference to the ajax request that is currently running
-         */
-        this.xhr = null;
-        /**
-         * @var int timeout Used to delay the request for asynchronous search
-         */
-        this.timeout = null;
-
-        var $filterInput = $this.find('li.fast_filter input.searchClause');
-        if ($filterInput.length !== 0 &&
-            $filterInput.val() !== '' &&
-            $filterInput.val() != $filterInput[0].defaultValue
-        ) {
-            this.request();
-        }
-    },
-    /**
-     * Gets the query string from the database fast filter form
-     *
-     * @return string
-     */
-    getSearchClause: function () {
-        var retval = '';
-        var $input = $('#pma_navigation_tree')
-            .find('li.fast_filter.db_fast_filter input.searchClause');
-        if ($input.length && $input.val() != $input[0].defaultValue) {
-            retval = $input.val();
-        }
-        return retval;
-    },
-    /**
-     * Gets the query string from a second level item's fast filter form
-     * The retrieval is done by trasversing the navigation tree backwards
-     *
-     * @return string
-     */
-    getSearchClause2: function ($this) {
-        var $filterContainer = $this.closest('div.list_container');
-        var $filterInput = $([]);
-        if ($filterContainer
-            .find('li.fast_filter:not(.db_fast_filter) input.searchClause')
-            .length !== 0) {
-            $filterInput = $filterContainer
-                .find('li.fast_filter:not(.db_fast_filter) input.searchClause');
-        }
-        var searchClause2 = '';
-        if ($filterInput.length !== 0 &&
-            $filterInput.first().val() != $filterInput[0].defaultValue
-        ) {
-            searchClause2 = $filterInput.val();
-        }
-        return searchClause2;
-    },
-    /**
-     * @var hash events A list of functions that are bound to DOM events
-     *                  at the top of this file
-     */
-    events: {
-        focus: function (event) {
-            var $obj = $(this).closest('div.list_container');
-            if (! $obj.data('fastFilter')) {
-                $obj.data(
-                    'fastFilter',
-                    new PMA_fastFilter.filter($obj, $(this).val())
-                );
-            }
-            if ($(this).val() == this.defaultValue) {
-                $(this).val('');
-            } else {
-                $(this).select();
-            }
-        },
-        blur: function (event) {
-            if ($(this).val() === '') {
-                $(this).val(this.defaultValue);
-            }
-            var $obj = $(this).closest('div.list_container');
-            if ($(this).val() == this.defaultValue && $obj.data('fastFilter')) {
-                $obj.data('fastFilter').restore();
-            }
-        },
-        keyup: function (event) {
-            var $obj = $(this).closest('div.list_container');
-            var str = '';
-            if ($(this).val() != this.defaultValue && $(this).val() !== '') {
-                $obj.find('div.pageselector').hide();
-                str = $(this).val();
-            }
-
-            /**
-             * FIXME at the server level a value match is done while on
-             * the client side it is a regex match. These two should be aligned
-             */
-
-            // regex used for filtering.
-            var regex;
-            try {
-                regex = new RegExp(str, 'i');
-            } catch (err) {
-                return;
-            }
-
-            // this is the div that houses the items to be filtered by this filter.
-            var outerContainer;
-            if ($(this).closest('li.fast_filter').is('.db_fast_filter')) {
-                outerContainer = $('#pma_navigation_tree_content');
-            } else {
-                outerContainer = $obj;
-            }
-
-            // filters items that are directly under the div as well as grouped in
-            // groups. Does not filter child items (i.e. a database search does
-            // not filter tables)
-            var item_filter = function($curr) {
-                $curr.children('ul').children('li.navGroup').each(function() {
-                    $(this).children('div.list_container').each(function() {
-                        item_filter($(this)); // recursive
-                    });
-                });
-                $curr.children('ul').children('li').children('a').not('.container').each(function() {
-                    if (regex.test($(this).text())) {
-                        $(this).parent().show().removeClass('hidden');
-                    } else {
-                        $(this).parent().hide().addClass('hidden');
-                    }
-                });
-            };
-            item_filter(outerContainer);
-
-            // hides containers that does not have any visible children
-            var container_filter = function ($curr) {
-                $curr.children('ul').children('li.navGroup').each(function() {
-                    var $group = $(this);
-                    $group.children('div.list_container').each(function() {
-                        container_filter($(this)); // recursive
-                    });
-                    $group.show().removeClass('hidden');
-                    if ($group.children('div.list_container').children('ul')
-                            .children('li').not('.hidden').length === 0) {
-                        $group.hide().addClass('hidden');
-                    }
-                });
-            };
-            container_filter(outerContainer);
-
-            if ($(this).val() != this.defaultValue && $(this).val() !== '') {
-                if (! $obj.data('fastFilter')) {
-                    $obj.data(
-                        'fastFilter',
-                        new PMA_fastFilter.filter($obj, $(this).val())
-                    );
-                } else {
-                    if (event.keyCode == 13) {
-                        $obj.data('fastFilter').update($(this).val());
-                    }
-                }
-            } else if ($obj.data('fastFilter')) {
-                $obj.data('fastFilter').restore(true);
-            }
-        },
-        clear: function (event) {
-            event.stopPropagation();
-            // Clear the input and apply the fast filter with empty input
-            var filter = $(this).closest('div.list_container').data('fastFilter');
-            if (filter) {
-                filter.restore();
-            }
-            var value = $(this).prev()[0].defaultValue;
-            $(this).prev().val(value).trigger('keyup');
-        }
-    }
-};
-/**
- * Handles a change in the search clause
- *
- * @param string searchClause The query string for the filter
- *
- * @return void
- */
-PMA_fastFilter.filter.prototype.update = function (searchClause) {
-    if (this.searchClause != searchClause) {
-        this.searchClause = searchClause;
-        this.request();
-    }
-};
-/**
- * After a delay of 250mS, initiates a request to retrieve search results
- * Multiple calls to this function will always abort the previous request
- *
- * @return void
- */
-PMA_fastFilter.filter.prototype.request = function () {
-    var self = this;
-    if (self.$this.find('li.fast_filter').find('img.throbber').length === 0) {
-        self.$this.find('li.fast_filter').append(
-            $('<div class="throbber"></div>').append(
-                $('#pma_navigation_content')
-                    .find('img.throbber')
-                    .clone()
-                    .css({visibility: 'visible', display: 'block'})
-            )
-        );
-    }
-    if (self.xhr) {
-        self.xhr.abort();
-    }
-    var url = $('#pma_navigation').find('a.navigation_url').attr('href');
-    var params = self.$this.find('> ul > li > form.fast_filter').first().serialize();
-    if (self.$this.find('> ul > li > form.fast_filter:first input[name=searchClause]').length === 0) {
-        var $input = $('#pma_navigation_tree').find('li.fast_filter.db_fast_filter input.searchClause');
-        if ($input.length && $input.val() != $input[0].defaultValue) {
-            params += '&searchClause=' + encodeURIComponent($input.val());
-        }
-    }
-    self.xhr = $.ajax({
-        url: url,
-        type: 'post',
-        dataType: 'json',
-        data: params,
-        complete: function (jqXHR, status) {
-            if (status != 'abort') {
-                var data = $.parseJSON(jqXHR.responseText);
-                self.$this.find('li.fast_filter').find('div.throbber').remove();
-                if (data && data.results) {
-                    self.swap.apply(self, [data.message]);
-                }
-            }
-        }
-    });
-};
-/**
- * Replaces the contents of the navigation branch with the search results
- *
- * @param string list The search results
- *
- * @return void
- */
-PMA_fastFilter.filter.prototype.swap = function (list) {
-    this.$this
-        .html($(list).html())
-        .children()
-        .show()
-        .end()
-        .find('li.fast_filter input.searchClause')
-        .val(this.searchClause);
-    this.$this.data('fastFilter', this);
-};
-/**
- * Restores the navigation to the original state after the fast filter is cleared
- *
- * @param bool focus Whether to also focus the input box of the fast filter
- *
- * @return void
- */
-PMA_fastFilter.filter.prototype.restore = function (focus) {
-    if(this.$this.children('ul').first().hasClass('search_results')) {
-        this.$this.html(this.$clone.html()).children().show();
-        this.$this.data('fastFilter', this);
-        if (focus) {
-            this.$this.find('li.fast_filter input.searchClause').focus();
-        }
-    }
-    this.searchClause = '';
-    this.$this.find('div.pageselector').show();
-    this.$this.find('div.throbber').remove();
-};
-
-/**
- * Show full name when cursor hover and name not shown completely
- *
- * @param object $containerELem Container element
- *
- * @return void
- */
-function PMA_showFullName($containerELem) {
-
-    $containerELem.find('.hover_show_full').mouseenter(function() {
-        /** mouseenter */
-        var $this = $(this);
-        var thisOffset = $this.offset();
-        if($this.text() === '') {
-            return;
-        }
-        var $parent = $this.parent();
-        if(  ($parent.offset().left + $parent.outerWidth())
-           < (thisOffset.left + $this.outerWidth()))
-        {
-            var $fullNameLayer = $('#full_name_layer');
-            if($fullNameLayer.length === 0)
-            {
-                $('body').append('<div id="full_name_layer" class="hide"></div>');
-                $('#full_name_layer').mouseleave(function() {
-                    /** mouseleave */
-                    $(this).addClass('hide')
-                           .removeClass('hovering');
-                }).mouseenter(function() {
-                    /** mouseenter */
-                    $(this).addClass('hovering');
-                });
-                $fullNameLayer = $('#full_name_layer');
-            }
-            $fullNameLayer.removeClass('hide');
-            $fullNameLayer.css({left: thisOffset.left, top: thisOffset.top});
-            $fullNameLayer.html($this.clone());
-            setTimeout(function() {
-                if(! $fullNameLayer.hasClass('hovering'))
-                {
-                    $fullNameLayer.trigger('mouseleave');
-                }
-            }, 200);
-        }
-    });
-}
diff --git a/#pma/js/normalization.js b/#pma/js/normalization.js
deleted file mode 100644
index da1dbfe6..00000000
--- a/#pma/js/normalization.js
+++ /dev/null
@@ -1,710 +0,0 @@
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * @fileoverview   events handling from normalization page
- * @name            normalization
- *
- * @requires    jQuery
- */
-
-/**
- * AJAX scripts for normalization.php
- *
- */
-
-var normalizeto = '1nf';
-var primary_key;
-var data_parsed = null;
-function appendHtmlColumnsList()
-{
-    $.get(
-        "normalization.php",
-        {
-            "token": PMA_commonParams.get('token'),
-            "ajax_request": true,
-            "db": PMA_commonParams.get('db'),
-            "table": PMA_commonParams.get('table'),
-            "getColumns": true
-        },
-        function(data) {
-            if (data.success === true) {
-                $('select[name=makeAtomic]').html(data.message);
-            }
-        }
-    );
-}
-function goTo3NFStep1(newTables)
-{
-    if (Object.keys(newTables).length === 1) {
-        newTables = [PMA_commonParams.get('table')];
-    }
-    $.post(
-        "normalization.php",
-        {
-            "token": PMA_commonParams.get('token'),
-            "ajax_request": true,
-            "db": PMA_commonParams.get('db'),
-            "tables": newTables,
-            "step": '3.1'
-        }, function(data) {
-            $("#page_content").find("h3").html(PMA_messages.str3NFNormalization);
-            $("#mainContent").find("legend").html(data.legendText);
-            $("#mainContent").find("h4").html(data.headText);
-            $("#mainContent").find("p").html(data.subText);
-            $("#mainContent").find("#extra").html(data.extra);
-            $("#extra").find("form").each(function() {
-                var form_id = $(this).attr('id');
-                var colname = $(this).data('colname');
-                $("#" + form_id + " input[value='" + colname + "']").next().remove();
-                $("#" + form_id + " input[value='" + colname + "']").remove();
-            });
-            $("#mainContent").find("#newCols").html('');
-            $('.tblFooters').html('');
-            if (data.subText !== "") {
-                $('.tblFooters').html('<input type="button" onClick="processDependencies(\'\', true);" value="' + PMA_messages.strDone + '"/>');
-            }
-        }
-    );
-}
-function goTo2NFStep1() {
-    $.post(
-        "normalization.php",
-        {
-            "token": PMA_commonParams.get('token'),
-            "ajax_request": true,
-            "db": PMA_commonParams.get('db'),
-            "table": PMA_commonParams.get('table'),
-            "step": '2.1'
-        }, function(data) {
-            $("#page_content h3").html(PMA_messages.str2NFNormalization);
-            $("#mainContent legend").html(data.legendText);
-            $("#mainContent h4").html(data.headText);
-            $("#mainContent p").html(data.subText);
-            $("#mainContent #extra").html(data.extra);
-            $("#mainContent #newCols").html('');
-            if (data.subText !== '') {
-                $('.tblFooters').html('<input type="submit" value="' + PMA_messages.strDone + '" onclick="processDependencies(\'' + escapeJsString(escapeHtml(data.primary_key)) + '\');">');
-            } else {
-                if (normalizeto === '3nf') {
-                    $("#mainContent #newCols").html(PMA_messages.strToNextStep);
-                    setTimeout(function() {
-                        goTo3NFStep1([PMA_commonParams.get('table')]);
-                    }, 3000);
-                }
-            }
-        });
-}
-
-function goToFinish1NF()
-{
-    if (normalizeto !== '1nf') {
-        goTo2NFStep1();
-        return true;
-    }
-    $("#mainContent legend").html(PMA_messages.strEndStep);
-    $("#mainContent h4").html(
-        "<h3>" + PMA_sprintf(PMA_messages.strFinishMsg, escapeHtml(PMA_commonParams.get('table'))) + "</h3>"
-    );
-    $("#mainContent p").html('');
-    $("#mainContent #extra").html('');
-    $("#mainContent #newCols").html('');
-    $('.tblFooters').html('');
-}
-
-function goToStep4()
-{
-    $.post(
-        "normalization.php",
-        {
-            "token": PMA_commonParams.get('token'),
-            "ajax_request": true,
-            "db": PMA_commonParams.get('db'),
-            "table": PMA_commonParams.get('table'),
-            "step4": true
-        }, function(data) {
-            $("#mainContent legend").html(data.legendText);
-            $("#mainContent h4").html(data.headText);
-            $("#mainContent p").html(data.subText);
-            $("#mainContent #extra").html(data.extra);
-            $("#mainContent #newCols").html('');
-            $('.tblFooters').html('');
-            for(var pk in primary_key) {
-                $("#extra input[value='" + escapeJsString(primary_key[pk]) + "']").attr("disabled","disabled");
-            }
-        }
-    );
-}
-
-function goToStep3()
-{
-    $.post(
-        "normalization.php",
-        {
-            "token": PMA_commonParams.get('token'),
-            "ajax_request": true,
-            "db": PMA_commonParams.get('db'),
-            "table": PMA_commonParams.get('table'),
-            "step3": true
-        }, function(data) {
-            $("#mainContent legend").html(data.legendText);
-            $("#mainContent h4").html(data.headText);
-            $("#mainContent p").html(data.subText);
-            $("#mainContent #extra").html(data.extra);
-            $("#mainContent #newCols").html('');
-            $('.tblFooters').html('');
-            primary_key = $.parseJSON(data.primary_key);
-            for(var pk in primary_key) {
-                $("#extra input[value='" + escapeJsString(primary_key[pk]) + "']").attr("disabled","disabled");
-            }
-        }
-    );
-}
-
-function goToStep2(extra)
-{
-    $.post(
-        "normalization.php",
-        {
-            "token": PMA_commonParams.get('token'),
-            "ajax_request": true,
-            "db": PMA_commonParams.get('db'),
-            "table": PMA_commonParams.get('table'),
-            "step2": true
-        }, function(data) {
-            $("#mainContent legend").html(data.legendText);
-            $("#mainContent h4").html(data.headText);
-            $("#mainContent p").html(data.subText);
-            $("#mainContent #extra,#mainContent #newCols").html('');
-            $('.tblFooters').html('');
-            if (data.hasPrimaryKey === "1") {
-                if(extra === 'goToStep3') {
-                    $("#mainContent h4").html(PMA_messages.strPrimaryKeyAdded);
-                    $("#mainContent p").html(PMA_messages.strToNextStep);
-                }
-                if(extra === 'goToFinish1NF') {
-                    goToFinish1NF();
-                } else {
-                    setTimeout(function() {
-                        goToStep3();
-                    }, 3000);
-                }
-            } else {
-                //form to select columns to make primary
-                $("#mainContent #extra").html(data.extra);
-            }
-        }
-    );
-}
-
-function goTo2NFFinish(pd)
-{
-    var tables = {};
-    for (var dependson in pd) {
-        tables[dependson] = $('#extra input[name="' + dependson + '"]').val();
-    }
-    datastring = {"token": PMA_commonParams.get('token'),
-            "ajax_request": true,
-            "db": PMA_commonParams.get('db'),
-            "table": PMA_commonParams.get('table'),
-            "pd": JSON.stringify(pd),
-            "newTablesName":JSON.stringify(tables),
-            "createNewTables2NF":1};
-    $.ajax({
-            type: "POST",
-            url: "normalization.php",
-            data: datastring,
-            async:false,
-            success: function(data) {
-                if (data.success === true) {
-                    if(data.queryError === false) {
-                        if (normalizeto === '3nf') {
-                            $("#pma_navigation_reload").click();
-                            goTo3NFStep1(tables);
-                            return true;
-                        }
-                        $("#mainContent legend").html(data.legendText);
-                        $("#mainContent h4").html(data.headText);
-                        $("#mainContent p").html('');
-                        $("#mainContent #extra").html('');
-                        $('.tblFooters').html('');
-                    } else {
-                        PMA_ajaxShowMessage(data.extra, false);
-                    }
-                    $("#pma_navigation_reload").click();
-                } else {
-                    PMA_ajaxShowMessage(data.error, false);
-                }
-            }
-        });
-}
-
-function goTo3NFFinish(newTables)
-{
-    for (var table in newTables) {
-        for (var newtbl in newTables[table]) {
-            var updatedname = $('#extra input[name="' + newtbl + '"]').val();
-            newTables[table][updatedname] = newTables[table][newtbl];
-            if (updatedname !== newtbl) {
-                delete newTables[table][newtbl];
-            }
-        }
-    }
-    datastring = {"token": PMA_commonParams.get('token'),
-            "ajax_request": true,
-            "db": PMA_commonParams.get('db'),
-            "newTables":JSON.stringify(newTables),
-            "createNewTables3NF":1};
-    $.ajax({
-            type: "POST",
-            url: "normalization.php",
-            data: datastring,
-            async:false,
-            success: function(data) {
-                if (data.success === true) {
-                    if(data.queryError === false) {
-                        $("#mainContent legend").html(data.legendText);
-                        $("#mainContent h4").html(data.headText);
-                        $("#mainContent p").html('');
-                        $("#mainContent #extra").html('');
-                        $('.tblFooters').html('');
-                    } else {
-                        PMA_ajaxShowMessage(data.extra, false);
-                    }
-                    $("#pma_navigation_reload").click();
-                } else {
-                    PMA_ajaxShowMessage(data.error, false);
-                }
-            }
-        });
-}
-var backup = '';
-function goTo2NFStep2(pd, primary_key)
-{
-    $("#newCols").html('');
-    $("#mainContent legend").html(PMA_messages.strStep + ' 2.2 ' + PMA_messages.strConfirmPd);
-    $("#mainContent h4").html(PMA_messages.strSelectedPd);
-    $("#mainContent p").html(PMA_messages.strPdHintNote);
-    var extra = '<div class="dependencies_box">';
-    var pdFound = false;
-    for (var dependson in pd) {
-        if (dependson !== primary_key) {
-            pdFound = true;
-            extra += '<p class="displayblock desc">' + escapeHtml(dependson) + " -> " + escapeHtml(pd[dependson].toString()) + '</p>';
-        }
-    }
-    if(!pdFound) {
-        extra += '<p class="displayblock desc">' + PMA_messages.strNoPdSelected + '</p>';
-        extra += '</div>';
-    } else {
-        extra += '</div>';
-        datastring = {"token": PMA_commonParams.get('token'),
-            "ajax_request": true,
-            "db": PMA_commonParams.get('db'),
-            "table": PMA_commonParams.get('table'),
-            "pd": JSON.stringify(pd),
-            "getNewTables2NF":1};
-        $.ajax({
-            type: "GET",
-            url: "normalization.php",
-            data: datastring,
-            async:false,
-            success: function(data) {
-                if (data.success === true) {
-                    extra += data.message;
-                } else {
-                    PMA_ajaxShowMessage(data.error, false);
-                }
-            }
-        });
-    }
-    $("#mainContent #extra").html(extra);
-    $('.tblFooters').html('<input type="button" value="' + PMA_messages.strBack + '" id="backEditPd"/><input type="button" id="goTo2NFFinish" value="' + PMA_messages.strGo + '"/>');
-    $("#goTo2NFFinish").click(function(){
-        goTo2NFFinish(pd);
-    });
-}
-
-function goTo3NFStep2(pd, tablesTds)
-{
-    $("#newCols").html('');
-    $("#mainContent legend").html(PMA_messages.strStep + ' 3.2 ' + PMA_messages.strConfirmTd);
-    $("#mainContent h4").html(PMA_messages.strSelectedTd);
-    $("#mainContent p").html(PMA_messages.strPdHintNote);
-    var extra = '<div class="dependencies_box">';
-    var pdFound = false;
-    for (var table in tablesTds) {
-        for (var i in tablesTds[table]) {
-            dependson = tablesTds[table][i];
-            if (dependson !== '' && dependson !== table) {
-                pdFound = true;
-                extra += '<p class="displayblock desc">' + escapeHtml(dependson) + " -> " + escapeHtml(pd[dependson].toString()) + '</p>';
-            }
-        }
-    }
-    if(!pdFound) {
-        extra += '<p class="displayblock desc">' + PMA_messages.strNoTdSelected + '</p>';
-        extra += '</div>';
-    } else {
-        extra += '</div>';
-        datastring = {"token": PMA_commonParams.get('token'),
-            "ajax_request": true,
-            "db": PMA_commonParams.get('db'),
-            "tables": JSON.stringify(tablesTds),
-            "pd": JSON.stringify(pd),
-            "getNewTables3NF":1};
-        $.ajax({
-            type: "GET",
-            url: "normalization.php",
-            data: datastring,
-            async:false,
-            success: function(data) {
-                data_parsed = $.parseJSON(data.message);
-                if (data.success === true) {
-                    extra += data_parsed.html;
-                } else {
-                    PMA_ajaxShowMessage(data.error, false);
-                }
-            }
-        });
-    }
-    $("#mainContent #extra").html(extra);
-    $('.tblFooters').html('<input type="button" value="' + PMA_messages.strBack + '" id="backEditPd"/><input type="button" id="goTo3NFFinish" value="' + PMA_messages.strGo + '"/>');
-    $("#goTo3NFFinish").click(function(){
-        if (!pdFound) {
-            goTo3NFFinish([]);
-        } else {
-            goTo3NFFinish(data_parsed.newTables);
-        }
-    });
-}
-function processDependencies(primary_key, isTransitive)
-{
-    var pd = {};
-    var tablesTds = {};
-    var dependsOn;
-    pd[primary_key] = [];
-    $("#extra form").each(function() {
-        var tblname;
-        if (isTransitive === true) {
-            tblname = $(this).data('tablename');
-            primary_key = tblname;
-            if (!(tblname in tablesTds)) {
-                tablesTds[tblname] = [];
-            }
-            tablesTds[tblname].push(primary_key);
-        }
-        var form_id = $(this).attr('id');
-        $('#' + form_id + ' input[type=checkbox]:not(:checked)').removeAttr('checked');
-        dependsOn = '';
-        $('#' + form_id + ' input[type=checkbox]:checked').each(function(){
-            dependsOn += $(this).val() + ', ';
-            $(this).attr("checked","checked");
-        });
-        if (dependsOn === '') {
-            dependsOn = primary_key;
-        } else {
-            dependsOn = dependsOn.slice(0, -2);
-        }
-        if (! (dependsOn in pd)) {
-            pd[dependsOn] = [];
-        }
-        pd[dependsOn].push($(this).data('colname'));
-        if (isTransitive === true) {
-            if (!(tblname in tablesTds)) {
-                tablesTds[tblname] = [];
-            }
-            if ($.inArray(dependsOn, tablesTds[tblname]) === -1) {
-                tablesTds[tblname].push(dependsOn);
-            }
-        }
-    });
-    backup = $("#mainContent").html();
-    if (isTransitive === true) {
-        goTo3NFStep2(pd, tablesTds);
-    } else {
-        goTo2NFStep2(pd, primary_key);
-    }
-    return false;
-}
-
-function moveRepeatingGroup(repeatingCols) {
-    var newTable = $("input[name=repeatGroupTable]").val();
-    var newColumn = $("input[name=repeatGroupColumn]").val();
-    if (!newTable) {
-        $("input[name=repeatGroupTable]").focus();
-        return false;
-    }
-    if (!newColumn) {
-        $("input[name=repeatGroupColumn]").focus();
-        return false;
-    }
-    datastring = {"token": PMA_commonParams.get('token'),
-        "ajax_request": true,
-        "db": PMA_commonParams.get('db'),
-        "table": PMA_commonParams.get('table'),
-        "repeatingColumns": repeatingCols,
-        "newTable":newTable,
-        "newColumn":newColumn,
-        "primary_columns":primary_key.toString()
-    };
-    $.ajax({
-        type: "POST",
-        url: "normalization.php",
-        data: datastring,
-        async:false,
-        success: function(data) {
-            if (data.success === true) {
-                if(data.queryError === false) {
-                    goToStep3();
-                }
-                PMA_ajaxShowMessage(data.message, false);
-                $("#pma_navigation_reload").click();
-            } else {
-                PMA_ajaxShowMessage(data.error, false);
-            }
-        }
-    });
-}
-AJAX.registerTeardown('normalization.js', function () {
-    $("#extra").off("click", "#selectNonAtomicCol");
-    $("#splitGo").unbind('click');
-    $('.tblFooters').off("click", "#saveSplit");
-    $("#extra").off("click", "#addNewPrimary");
-    $(".tblFooters").off("click", "#saveNewPrimary");
-    $("#extra").off("click", "#removeRedundant");
-    $("#mainContent p").off("click", "#createPrimaryKey");
-    $("#mainContent").off("click", "#backEditPd");
-    $("#mainContent").off("click", "#showPossiblePd");
-    $("#mainContent").off("click", ".pickPd");
-});
-
-AJAX.registerOnload('normalization.js', function() {
-    var selectedCol;
-    normalizeto = $("#mainContent").data('normalizeto');
-    $("#extra").on("click", "#selectNonAtomicCol", function() {
-        if ($(this).val() === 'no_such_col') {
-            goToStep2();
-        } else {
-            selectedCol = $(this).val();
-        }
-    });
-
-    $("#splitGo").click(function() {
-        if(!selectedCol || selectedCol === '') {
-            return false;
-        }
-        var numField = $("#numField").val();
-        $.get(
-            "normalization.php",
-            {
-                "token": PMA_commonParams.get('token'),
-                "ajax_request": true,
-                "db": PMA_commonParams.get('db'),
-                "table": PMA_commonParams.get('table'),
-                "splitColumn": true,
-                "numFields": numField
-            },
-        function(data) {
-                if (data.success === true) {
-                    $('#newCols').html(data.message);
-                    $('.default_value').hide();
-                    $('.enum_notice').hide();
-                    $('.tblFooters').html("<input type='submit' id='saveSplit' value='" + PMA_messages.strSave + "'/>" +
-                        "<input type='submit' id='cancelSplit' value='" + PMA_messages.strCancel + "' " +
-                        "onclick=\"$('#newCols').html('');$(this).parent().html('')\"/>");
-                }
-            }
-        );
-        return false;
-    });
-    $('.tblFooters').on("click","#saveSplit", function() {
-        central_column_list = [];
-        if ($("#newCols #field_0_1").val() === '') {
-            $("#newCols #field_0_1").focus();
-            return false;
-        }
-        datastring = $('#newCols :input').serialize();
-        datastring += "&ajax_request=1&do_save_data=1&field_where=last";
-        $.post("tbl_addfield.php", datastring, function(data) {
-            if (data.success) {
-                $.post(
-                    "sql.php",
-                    {
-                        "token": PMA_commonParams.get('token'),
-                        "ajax_request": true,
-                        "db": PMA_commonParams.get('db'),
-                        "table": PMA_commonParams.get('table'),
-                        "dropped_column": selectedCol,
-                        "purge" : 1,
-                        "sql_query": 'ALTER TABLE `' + PMA_commonParams.get('table') + '` DROP `' + selectedCol + '`;',
-                        "is_js_confirmed": 1
-                    },
-                function(data) {
-                        if (data.success === true) {
-                            appendHtmlColumnsList();
-                            $('#newCols').html('');
-                            $('.tblFooters').html('');
-                        } else {
-                            PMA_ajaxShowMessage(data.error, false);
-                        }
-                        selectedCol = '';
-                    }
-                );
-            } else {
-                PMA_ajaxShowMessage(data.error, false);
-            }
-        });
-    });
-
-    $("#extra").on("click", "#addNewPrimary", function() {
-        $.get(
-            "normalization.php",
-            {
-                "token": PMA_commonParams.get('token'),
-                "ajax_request": true,
-                "db": PMA_commonParams.get('db'),
-                "table": PMA_commonParams.get('table'),
-                "addNewPrimary": true
-            },
-        function(data) {
-                if (data.success === true) {
-                    $('#newCols').html(data.message);
-                    $('.default_value').hide();
-                    $('.enum_notice').hide();
-                    $('.tblFooters').html("<input type='submit' id='saveNewPrimary' value='" + PMA_messages.strSave + "'/>" +
-                        "<input type='submit' id='cancelSplit' value='" + PMA_messages.strCancel + "' " +
-                        "onclick=\"$('#newCols').html('');$(this).parent().html('')\"/>");
-                } else {
-                    PMA_ajaxShowMessage(data.error, false);
-                }
-            }
-        );
-        return false;
-    });
-    $(".tblFooters").on("click", "#saveNewPrimary", function() {
-        var datastring = $('#newCols :input').serialize();
-        datastring += "&field_key[0]=primary_0&ajax_request=1&do_save_data=1&field_where=last";
-        $.post("tbl_addfield.php", datastring, function(data) {
-            if (data.success === true) {
-                $("#mainContent h4").html(PMA_messages.strPrimaryKeyAdded);
-                $("#mainContent p").html(PMA_messages.strToNextStep);
-                $("#mainContent #extra").html('');
-                $("#mainContent #newCols").html('');
-                $('.tblFooters').html('');
-                setTimeout(function() {
-                    goToStep3();
-                }, 2000);
-            } else {
-                PMA_ajaxShowMessage(data.error, false);
-            }
-        });
-    });
-    $("#extra").on("click", "#removeRedundant", function() {
-        var dropQuery = 'ALTER TABLE `' + PMA_commonParams.get('table') + '` ';
-        $("#extra input[type=checkbox]:checked").each(function() {
-            dropQuery += 'DROP `' + $(this).val() + '`, ';
-        });
-        dropQuery = dropQuery.slice(0, -2);
-        $.post(
-            "sql.php",
-            {
-                "token": PMA_commonParams.get('token'),
-                "ajax_request": true,
-                "db": PMA_commonParams.get('db'),
-                "table": PMA_commonParams.get('table'),
-                "sql_query": dropQuery,
-                "is_js_confirmed": 1
-            },
-        function(data) {
-                if (data.success === true) {
-                    goToStep2('goToFinish1NF');
-                } else {
-                    PMA_ajaxShowMessage(data.error, false);
-                }
-            }
-        );
-    });
-    $("#extra").on("click", "#moveRepeatingGroup", function() {
-        var repeatingCols = '';
-        $("#extra input[type=checkbox]:checked").each(function() {
-            repeatingCols += $(this).val() + ', ';
-        });
-
-        if (repeatingCols !== '') {
-            var newColName = $("#extra input[type=checkbox]:checked:first").val();
-            repeatingCols = repeatingCols.slice(0, -2);
-            var confirmStr = PMA_sprintf(PMA_messages.strMoveRepeatingGroup, escapeHtml(repeatingCols), escapeHtml(PMA_commonParams.get('table')));
-            confirmStr += '<input type="text" name="repeatGroupTable" placeholder="' + PMA_messages.strNewTablePlaceholder + '"/>' +
-                '( ' + escapeHtml(primary_key.toString()) + ', <input type="text" name="repeatGroupColumn" placeholder="' + PMA_messages.strNewColumnPlaceholder + '" value="' + escapeHtml(newColName) + '">)' +
-                '</ol>';
-            $("#newCols").html(confirmStr);
-            $('.tblFooters').html('<input type="submit" value="' + PMA_messages.strCancel + '" onclick="$(\'#newCols\').html(\'\');$(\'#extra input[type=checkbox]\').removeAttr(\'checked\')"/>' +
-                '<input type="submit" value="' + PMA_messages.strGo + '" onclick="moveRepeatingGroup(\'' + escapeJsString(escapeHtml(repeatingCols)) + '\')"/>');
-        }
-    });
-    $("#mainContent p").on("click", "#createPrimaryKey", function(event) {
-        event.preventDefault();
-        var url = { create_index: 1,
-            server:  PMA_commonParams.get('server'),
-            db: PMA_commonParams.get('db'),
-            table: PMA_commonParams.get('table'),
-            token: PMA_commonParams.get('token'),
-            added_fields: 1,
-            add_fields:1,
-            index: {Key_name:'PRIMARY'},
-            ajax_request: true
-        };
-        var title = PMA_messages.strAddPrimaryKey;
-        indexEditorDialog(url, title, function(){
-            //on success
-            $(".sqlqueryresults").remove();
-            $('.result_query').remove();
-            $('.tblFooters').html('');
-            goToStep2('goToStep3');
-        });
-        return false;
-    });
-    $("#mainContent").on("click", "#backEditPd", function(){
-        $("#mainContent").html(backup);
-    });
-    $("#mainContent").on("click", "#showPossiblePd", function(){
-        if($(this).hasClass('hideList')) {
-            $(this).html('+ ' + PMA_messages.strShowPossiblePd);
-            $(this).removeClass('hideList');
-            $("#newCols").slideToggle("slow");
-            return false;
-        }
-        if($("#newCols").html() !== '') {
-            $("#showPossiblePd").html('- ' + PMA_messages.strHidePd);
-            $("#showPossiblePd").addClass('hideList');
-            $("#newCols").slideToggle("slow");
-            return false;
-        }
-        $("#newCols").insertAfter("#mainContent h4");
-        $("#newCols").html('<div class="center">' + PMA_messages.strLoading + '<br/>' + PMA_messages.strWaitForPd + '</div>');
-        $.post(
-        "normalization.php",
-        {
-            "token": PMA_commonParams.get('token'),
-            "ajax_request": true,
-            "db": PMA_commonParams.get('db'),
-            "table": PMA_commonParams.get('table'),
-            "findPdl": true
-        }, function(data) {
-            $("#showPossiblePd").html('- ' + PMA_messages.strHidePd);
-            $("#showPossiblePd").addClass('hideList');
-            $("#newCols").html(data.message);
-        });
-    });
-    $("#mainContent").on("click", ".pickPd", function(){
-        var strColsLeft = $(this).next('.determinants').html();
-        var colsLeft = strColsLeft.split(',');
-        var strColsRight = $(this).next().next().html();
-        var colsRight = strColsRight.split(',');
-        for (var i in colsRight) {
-            $('form[data-colname="' + colsRight[i].trim() + '"] input[type="checkbox"]').prop('checked', false);
-            for (var j in colsLeft) {
-                $('form[data-colname="' + colsRight[i].trim() + '"] input[value="' + colsLeft[j].trim() + '"]').prop('checked', true);
-            }
-        }
-    });
-});
diff --git a/#pma/js/openlayers/OpenLayers.js b/#pma/js/openlayers/OpenLayers.js
deleted file mode 100644
index 669778d9..00000000
--- a/#pma/js/openlayers/OpenLayers.js
+++ /dev/null
@@ -1,1443 +0,0 @@
-/*
-
-  OpenLayers.js -- OpenLayers Map Viewer Library
-
-  Copyright (c) 2006-2013 by OpenLayers Contributors
-  Published under the 2-clause BSD license.
-  See http://openlayers.org/dev/license.txt for the full text of the license, and http://openlayers.org/dev/authors.txt for full list of contributors.
-
-  Includes compressed code under the following licenses:
-
-  (For uncompressed versions of the code used, please see the
-  OpenLayers Github repository: <https://github.com/openlayers/openlayers>)
-
-*/
-
-/**
- * Contains XMLHttpRequest.js <http://code.google.com/p/xmlhttprequest/>
- * Copyright 2007 Sergey Ilinsky (http://www.ilinsky.com)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- */
-
-/**
- * OpenLayers.Util.pagePosition is based on Yahoo's getXY method, which is
- * Copyright (c) 2006, Yahoo! Inc.
- * All rights reserved.
- * 
- * Redistribution and use of this software in source and binary forms, with or
- * without modification, are permitted provided that the following conditions
- * are met:
- * 
- * * Redistributions of source code must retain the above copyright notice,
- *   this list of conditions and the following disclaimer.
- * 
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- * 
- * * Neither the name of Yahoo! Inc. nor the names of its contributors may be
- *   used to endorse or promote products derived from this software without
- *   specific prior written permission of Yahoo! Inc.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
- * POSSIBILITY OF SUCH DAMAGE.
- */
-var OpenLayers={VERSION_NUMBER:"Release 2.13.1",singleFile:!0,_getScriptLocation:function(){for(var a=/(^|(.*?\/))(OpenLayers[^\/]*?\.js)(\?|$)/,b=document.getElementsByTagName("script"),c,d="",e=0,f=b.length;e<f;e++)if(c=b[e].getAttribute("src"))if(c=c.match(a)){d=c[1];break}return function(){return d}}(),ImgPath:""};OpenLayers.Class=function(){var a=arguments.length,b=arguments[0],c=arguments[a-1],d="function"==typeof c.initialize?c.initialize:function(){b.prototype.initialize.apply(this,arguments)};1<a?(a=[d,b].concat(Array.prototype.slice.call(arguments).slice(1,a-1),c),OpenLayers.inherit.apply(null,a)):d.prototype=c;return d};
-OpenLayers.inherit=function(a,b){var c=function(){};c.prototype=b.prototype;a.prototype=new c;var d,e,c=2;for(d=arguments.length;c<d;c++)e=arguments[c],"function"===typeof e&&(e=e.prototype),OpenLayers.Util.extend(a.prototype,e)};OpenLayers.Util=OpenLayers.Util||{};OpenLayers.Util.extend=function(a,b){a=a||{};if(b){for(var c in b){var d=b[c];void 0!==d&&(a[c]=d)}"function"==typeof window.Event&&b instanceof window.Event||(!b.hasOwnProperty||!b.hasOwnProperty("toString"))||(a.toString=b.toString)}return a};OpenLayers.String={startsWith:function(a,b){return 0==a.indexOf(b)},contains:function(a,b){return-1!=a.indexOf(b)},trim:function(a){return a.replace(/^\s\s*/,"").replace(/\s\s*$/,"")},camelize:function(a){a=a.split("-");for(var b=a[0],c=1,d=a.length;c<d;c++)var e=a[c],b=b+(e.charAt(0).toUpperCase()+e.substring(1));return b},format:function(a,b,c){b||(b=window);return a.replace(OpenLayers.String.tokenRegEx,function(a,e){for(var f,g=e.split(/\.+/),h=0;h<g.length;h++){0==h&&(f=b);if(void 0===f)break;
-f=f[g[h]]}"function"==typeof f&&(f=c?f.apply(null,c):f());return"undefined"==typeof f?"undefined":f})},tokenRegEx:/\$\{([\w.]+?)\}/g,numberRegEx:/^([+-]?)(?=\d|\.\d)\d*(\.\d*)?([Ee]([+-]?\d+))?$/,isNumeric:function(a){return OpenLayers.String.numberRegEx.test(a)},numericIf:function(a,b){var c=a;!0===b&&(null!=a&&a.replace)&&(a=a.replace(/^\s*|\s*$/g,""));return OpenLayers.String.isNumeric(a)?parseFloat(a):c}};
-OpenLayers.Number={decimalSeparator:".",thousandsSeparator:",",limitSigDigs:function(a,b){var c=0;0<b&&(c=parseFloat(a.toPrecision(b)));return c},format:function(a,b,c,d){b="undefined"!=typeof b?b:0;c="undefined"!=typeof c?c:OpenLayers.Number.thousandsSeparator;d="undefined"!=typeof d?d:OpenLayers.Number.decimalSeparator;null!=b&&(a=parseFloat(a.toFixed(b)));var e=a.toString().split(".");1==e.length&&null==b&&(b=0);a=e[0];if(c)for(var f=/(-?[0-9]+)([0-9]{3})/;f.test(a);)a=a.replace(f,"$1"+c+"$2");
-0==b?b=a:(c=1<e.length?e[1]:"0",null!=b&&(c+=Array(b-c.length+1).join("0")),b=a+d+c);return b},zeroPad:function(a,b,c){for(a=a.toString(c||10);a.length<b;)a="0"+a;return a}};
-OpenLayers.Function={bind:function(a,b){var c=Array.prototype.slice.apply(arguments,[2]);return function(){var d=c.concat(Array.prototype.slice.apply(arguments,[0]));return a.apply(b,d)}},bindAsEventListener:function(a,b){return function(c){return a.call(b,c||window.event)}},False:function(){return!1},True:function(){return!0},Void:function(){}};
-OpenLayers.Array={filter:function(a,b,c){var d=[];if(Array.prototype.filter)d=a.filter(b,c);else{var e=a.length;if("function"!=typeof b)throw new TypeError;for(var f=0;f<e;f++)if(f in a){var g=a[f];b.call(c,g,f,a)&&d.push(g)}}return d}};OpenLayers.Bounds=OpenLayers.Class({left:null,bottom:null,right:null,top:null,centerLonLat:null,initialize:function(a,b,c,d){OpenLayers.Util.isArray(a)&&(d=a[3],c=a[2],b=a[1],a=a[0]);null!=a&&(this.left=OpenLayers.Util.toFloat(a));null!=b&&(this.bottom=OpenLayers.Util.toFloat(b));null!=c&&(this.right=OpenLayers.Util.toFloat(c));null!=d&&(this.top=OpenLayers.Util.toFloat(d))},clone:function(){return new OpenLayers.Bounds(this.left,this.bottom,this.right,this.top)},equals:function(a){var b=!1;null!=
-a&&(b=this.left==a.left&&this.right==a.right&&this.top==a.top&&this.bottom==a.bottom);return b},toString:function(){return[this.left,this.bottom,this.right,this.top].join()},toArray:function(a){return!0===a?[this.bottom,this.left,this.top,this.right]:[this.left,this.bottom,this.right,this.top]},toBBOX:function(a,b){null==a&&(a=6);var c=Math.pow(10,a),d=Math.round(this.left*c)/c,e=Math.round(this.bottom*c)/c,f=Math.round(this.right*c)/c,c=Math.round(this.top*c)/c;return!0===b?e+","+d+","+c+","+f:d+
-","+e+","+f+","+c},toGeometry:function(){return new OpenLayers.Geometry.Polygon([new OpenLayers.Geometry.LinearRing([new OpenLayers.Geometry.Point(this.left,this.bottom),new OpenLayers.Geometry.Point(this.right,this.bottom),new OpenLayers.Geometry.Point(this.right,this.top),new OpenLayers.Geometry.Point(this.left,this.top)])])},getWidth:function(){return this.right-this.left},getHeight:function(){return this.top-this.bottom},getSize:function(){return new OpenLayers.Size(this.getWidth(),this.getHeight())},
-getCenterPixel:function(){return new OpenLayers.Pixel((this.left+this.right)/2,(this.bottom+this.top)/2)},getCenterLonLat:function(){this.centerLonLat||(this.centerLonLat=new OpenLayers.LonLat((this.left+this.right)/2,(this.bottom+this.top)/2));return this.centerLonLat},scale:function(a,b){null==b&&(b=this.getCenterLonLat());var c,d;"OpenLayers.LonLat"==b.CLASS_NAME?(c=b.lon,d=b.lat):(c=b.x,d=b.y);return new OpenLayers.Bounds((this.left-c)*a+c,(this.bottom-d)*a+d,(this.right-c)*a+c,(this.top-d)*a+
-d)},add:function(a,b){if(null==a||null==b)throw new TypeError("Bounds.add cannot receive null values");return new OpenLayers.Bounds(this.left+a,this.bottom+b,this.right+a,this.top+b)},extend:function(a){if(a)switch(a.CLASS_NAME){case "OpenLayers.LonLat":this.extendXY(a.lon,a.lat);break;case "OpenLayers.Geometry.Point":this.extendXY(a.x,a.y);break;case "OpenLayers.Bounds":this.centerLonLat=null;if(null==this.left||a.left<this.left)this.left=a.left;if(null==this.bottom||a.bottom<this.bottom)this.bottom=
-a.bottom;if(null==this.right||a.right>this.right)this.right=a.right;if(null==this.top||a.top>this.top)this.top=a.top}},extendXY:function(a,b){this.centerLonLat=null;if(null==this.left||a<this.left)this.left=a;if(null==this.bottom||b<this.bottom)this.bottom=b;if(null==this.right||a>this.right)this.right=a;if(null==this.top||b>this.top)this.top=b},containsLonLat:function(a,b){"boolean"===typeof b&&(b={inclusive:b});b=b||{};var c=this.contains(a.lon,a.lat,b.inclusive),d=b.worldBounds;d&&!c&&(c=d.getWidth(),
-d=Math.round((a.lon-(d.left+d.right)/2)/c),c=this.containsLonLat({lon:a.lon-d*c,lat:a.lat},{inclusive:b.inclusive}));return c},containsPixel:function(a,b){return this.contains(a.x,a.y,b)},contains:function(a,b,c){null==c&&(c=!0);if(null==a||null==b)return!1;a=OpenLayers.Util.toFloat(a);b=OpenLayers.Util.toFloat(b);var d=!1;return d=c?a>=this.left&&a<=this.right&&b>=this.bottom&&b<=this.top:a>this.left&&a<this.right&&b>this.bottom&&b<this.top},intersectsBounds:function(a,b){"boolean"===typeof b&&(b=
-{inclusive:b});b=b||{};if(b.worldBounds){var c=this.wrapDateLine(b.worldBounds);a=a.wrapDateLine(b.worldBounds)}else c=this;null==b.inclusive&&(b.inclusive=!0);var d=!1,e=c.left==a.right||c.right==a.left||c.top==a.bottom||c.bottom==a.top;if(b.inclusive||!e)var d=a.top>=c.bottom&&a.top<=c.top||c.top>a.bottom&&c.top<a.top,e=a.left>=c.left&&a.left<=c.right||c.left>=a.left&&c.left<=a.right,f=a.right>=c.left&&a.right<=c.right||c.right>=a.left&&c.right<=a.right,d=(a.bottom>=c.bottom&&a.bottom<=c.top||c.bottom>=
-a.bottom&&c.bottom<=a.top||d)&&(e||f);if(b.worldBounds&&!d){var g=b.worldBounds,e=g.getWidth(),f=!g.containsBounds(c),g=!g.containsBounds(a);f&&!g?(a=a.add(-e,0),d=c.intersectsBounds(a,{inclusive:b.inclusive})):g&&!f&&(c=c.add(-e,0),d=a.intersectsBounds(c,{inclusive:b.inclusive}))}return d},containsBounds:function(a,b,c){null==b&&(b=!1);null==c&&(c=!0);var d=this.contains(a.left,a.bottom,c),e=this.contains(a.right,a.bottom,c),f=this.contains(a.left,a.top,c);a=this.contains(a.right,a.top,c);return b?
-d||e||f||a:d&&e&&f&&a},determineQuadrant:function(a){var b="",c=this.getCenterLonLat(),b=b+(a.lat<c.lat?"b":"t");return b+=a.lon<c.lon?"l":"r"},transform:function(a,b){this.centerLonLat=null;var c=OpenLayers.Projection.transform({x:this.left,y:this.bottom},a,b),d=OpenLayers.Projection.transform({x:this.right,y:this.bottom},a,b),e=OpenLayers.Projection.transform({x:this.left,y:this.top},a,b),f=OpenLayers.Projection.transform({x:this.right,y:this.top},a,b);this.left=Math.min(c.x,e.x);this.bottom=Math.min(c.y,
-d.y);this.right=Math.max(d.x,f.x);this.top=Math.max(e.y,f.y);return this},wrapDateLine:function(a,b){b=b||{};var c=b.leftTolerance||0,d=b.rightTolerance||0,e=this.clone();if(a){for(var f=a.getWidth();e.left<a.left&&e.right-d<=a.left;)e=e.add(f,0);for(;e.left+c>=a.right&&e.right>a.right;)e=e.add(-f,0);c=e.left+c;c<a.right&&(c>a.left&&e.right-d>a.right)&&(e=e.add(-f,0))}return e},CLASS_NAME:"OpenLayers.Bounds"});
-OpenLayers.Bounds.fromString=function(a,b){var c=a.split(",");return OpenLayers.Bounds.fromArray(c,b)};OpenLayers.Bounds.fromArray=function(a,b){return!0===b?new OpenLayers.Bounds(a[1],a[0],a[3],a[2]):new OpenLayers.Bounds(a[0],a[1],a[2],a[3])};OpenLayers.Bounds.fromSize=function(a){return new OpenLayers.Bounds(0,a.h,a.w,0)};OpenLayers.Bounds.oppositeQuadrant=function(a){var b;b=""+("t"==a.charAt(0)?"b":"t");return b+="l"==a.charAt(1)?"r":"l"};OpenLayers.Element={visible:function(a){return"none"!=OpenLayers.Util.getElement(a).style.display},toggle:function(){for(var a=0,b=arguments.length;a<b;a++){var c=OpenLayers.Util.getElement(arguments[a]),d=OpenLayers.Element.visible(c)?"none":"";c.style.display=d}},remove:function(a){a=OpenLayers.Util.getElement(a);a.parentNode.removeChild(a)},getHeight:function(a){a=OpenLayers.Util.getElement(a);return a.offsetHeight},hasClass:function(a,b){var c=a.className;return!!c&&RegExp("(^|\\s)"+b+"(\\s|$)").test(c)},
-addClass:function(a,b){OpenLayers.Element.hasClass(a,b)||(a.className+=(a.className?" ":"")+b);return a},removeClass:function(a,b){var c=a.className;c&&(a.className=OpenLayers.String.trim(c.replace(RegExp("(^|\\s+)"+b+"(\\s+|$)")," ")));return a},toggleClass:function(a,b){OpenLayers.Element.hasClass(a,b)?OpenLayers.Element.removeClass(a,b):OpenLayers.Element.addClass(a,b);return a},getStyle:function(a,b){a=OpenLayers.Util.getElement(a);var c=null;if(a&&a.style){c=a.style[OpenLayers.String.camelize(b)];
-c||(document.defaultView&&document.defaultView.getComputedStyle?c=(c=document.defaultView.getComputedStyle(a,null))?c.getPropertyValue(b):null:a.currentStyle&&(c=a.currentStyle[OpenLayers.String.camelize(b)]));var d=["left","top","right","bottom"];window.opera&&(-1!=OpenLayers.Util.indexOf(d,b)&&"static"==OpenLayers.Element.getStyle(a,"position"))&&(c="auto")}return"auto"==c?null:c}};OpenLayers.LonLat=OpenLayers.Class({lon:0,lat:0,initialize:function(a,b){OpenLayers.Util.isArray(a)&&(b=a[1],a=a[0]);this.lon=OpenLayers.Util.toFloat(a);this.lat=OpenLayers.Util.toFloat(b)},toString:function(){return"lon="+this.lon+",lat="+this.lat},toShortString:function(){return this.lon+", "+this.lat},clone:function(){return new OpenLayers.LonLat(this.lon,this.lat)},add:function(a,b){if(null==a||null==b)throw new TypeError("LonLat.add cannot receive null values");return new OpenLayers.LonLat(this.lon+
-OpenLayers.Util.toFloat(a),this.lat+OpenLayers.Util.toFloat(b))},equals:function(a){var b=!1;null!=a&&(b=this.lon==a.lon&&this.lat==a.lat||isNaN(this.lon)&&isNaN(this.lat)&&isNaN(a.lon)&&isNaN(a.lat));return b},transform:function(a,b){var c=OpenLayers.Projection.transform({x:this.lon,y:this.lat},a,b);this.lon=c.x;this.lat=c.y;return this},wrapDateLine:function(a){var b=this.clone();if(a){for(;b.lon<a.left;)b.lon+=a.getWidth();for(;b.lon>a.right;)b.lon-=a.getWidth()}return b},CLASS_NAME:"OpenLayers.LonLat"});
-OpenLayers.LonLat.fromString=function(a){a=a.split(",");return new OpenLayers.LonLat(a[0],a[1])};OpenLayers.LonLat.fromArray=function(a){var b=OpenLayers.Util.isArray(a);return new OpenLayers.LonLat(b&&a[0],b&&a[1])};OpenLayers.Pixel=OpenLayers.Class({x:0,y:0,initialize:function(a,b){this.x=parseFloat(a);this.y=parseFloat(b)},toString:function(){return"x="+this.x+",y="+this.y},clone:function(){return new OpenLayers.Pixel(this.x,this.y)},equals:function(a){var b=!1;null!=a&&(b=this.x==a.x&&this.y==a.y||isNaN(this.x)&&isNaN(this.y)&&isNaN(a.x)&&isNaN(a.y));return b},distanceTo:function(a){return Math.sqrt(Math.pow(this.x-a.x,2)+Math.pow(this.y-a.y,2))},add:function(a,b){if(null==a||null==b)throw new TypeError("Pixel.add cannot receive null values");
-return new OpenLayers.Pixel(this.x+a,this.y+b)},offset:function(a){var b=this.clone();a&&(b=this.add(a.x,a.y));return b},CLASS_NAME:"OpenLayers.Pixel"});OpenLayers.Size=OpenLayers.Class({w:0,h:0,initialize:function(a,b){this.w=parseFloat(a);this.h=parseFloat(b)},toString:function(){return"w="+this.w+",h="+this.h},clone:function(){return new OpenLayers.Size(this.w,this.h)},equals:function(a){var b=!1;null!=a&&(b=this.w==a.w&&this.h==a.h||isNaN(this.w)&&isNaN(this.h)&&isNaN(a.w)&&isNaN(a.h));return b},CLASS_NAME:"OpenLayers.Size"});OpenLayers.Console={log:function(){},debug:function(){},info:function(){},warn:function(){},error:function(){},userError:function(a){alert(a)},assert:function(){},dir:function(){},dirxml:function(){},trace:function(){},group:function(){},groupEnd:function(){},time:function(){},timeEnd:function(){},profile:function(){},profileEnd:function(){},count:function(){},CLASS_NAME:"OpenLayers.Console"};
-(function(){for(var a=document.getElementsByTagName("script"),b=0,c=a.length;b<c;++b)if(-1!=a[b].src.indexOf("firebug.js")&&console){OpenLayers.Util.extend(OpenLayers.Console,console);break}})();OpenLayers.Lang={code:null,defaultCode:"en",getCode:function(){OpenLayers.Lang.code||OpenLayers.Lang.setCode();return OpenLayers.Lang.code},setCode:function(a){var b;a||(a="msie"==OpenLayers.BROWSER_NAME?navigator.userLanguage:navigator.language);a=a.split("-");a[0]=a[0].toLowerCase();"object"==typeof OpenLayers.Lang[a[0]]&&(b=a[0]);if(a[1]){var c=a[0]+"-"+a[1].toUpperCase();"object"==typeof OpenLayers.Lang[c]&&(b=c)}b||(OpenLayers.Console.warn("Failed to find OpenLayers.Lang."+a.join("-")+" dictionary, falling back to default language"),
-b=OpenLayers.Lang.defaultCode);OpenLayers.Lang.code=b},translate:function(a,b){var c=OpenLayers.Lang[OpenLayers.Lang.getCode()];(c=c&&c[a])||(c=a);b&&(c=OpenLayers.String.format(c,b));return c}};OpenLayers.i18n=OpenLayers.Lang.translate;OpenLayers.Util=OpenLayers.Util||{};OpenLayers.Util.getElement=function(){for(var a=[],b=0,c=arguments.length;b<c;b++){var d=arguments[b];"string"==typeof d&&(d=document.getElementById(d));if(1==arguments.length)return d;a.push(d)}return a};OpenLayers.Util.isElement=function(a){return!(!a||1!==a.nodeType)};OpenLayers.Util.isArray=function(a){return"[object Array]"===Object.prototype.toString.call(a)};OpenLayers.Util.removeItem=function(a,b){for(var c=a.length-1;0<=c;c--)a[c]==b&&a.splice(c,1);return a};
-OpenLayers.Util.indexOf=function(a,b){if("function"==typeof a.indexOf)return a.indexOf(b);for(var c=0,d=a.length;c<d;c++)if(a[c]==b)return c;return-1};OpenLayers.Util.dotless=/\./g;
-OpenLayers.Util.modifyDOMElement=function(a,b,c,d,e,f,g,h){b&&(a.id=b.replace(OpenLayers.Util.dotless,"_"));c&&(a.style.left=c.x+"px",a.style.top=c.y+"px");d&&(a.style.width=d.w+"px",a.style.height=d.h+"px");e&&(a.style.position=e);f&&(a.style.border=f);g&&(a.style.overflow=g);0<=parseFloat(h)&&1>parseFloat(h)?(a.style.filter="alpha(opacity="+100*h+")",a.style.opacity=h):1==parseFloat(h)&&(a.style.filter="",a.style.opacity="")};
-OpenLayers.Util.createDiv=function(a,b,c,d,e,f,g,h){var k=document.createElement("div");d&&(k.style.backgroundImage="url("+d+")");a||(a=OpenLayers.Util.createUniqueID("OpenLayersDiv"));e||(e="absolute");OpenLayers.Util.modifyDOMElement(k,a,b,c,e,f,g,h);return k};
-OpenLayers.Util.createImage=function(a,b,c,d,e,f,g,h){var k=document.createElement("img");a||(a=OpenLayers.Util.createUniqueID("OpenLayersDiv"));e||(e="relative");OpenLayers.Util.modifyDOMElement(k,a,b,c,e,f,null,g);h&&(k.style.display="none",b=function(){k.style.display="";OpenLayers.Event.stopObservingElement(k)},OpenLayers.Event.observe(k,"load",b),OpenLayers.Event.observe(k,"error",b));k.style.alt=a;k.galleryImg="no";d&&(k.src=d);return k};OpenLayers.IMAGE_RELOAD_ATTEMPTS=0;
-OpenLayers.Util.alphaHackNeeded=null;OpenLayers.Util.alphaHack=function(){if(null==OpenLayers.Util.alphaHackNeeded){var a=navigator.appVersion.split("MSIE"),a=parseFloat(a[1]),b=!1;try{b=!!document.body.filters}catch(c){}OpenLayers.Util.alphaHackNeeded=b&&5.5<=a&&7>a}return OpenLayers.Util.alphaHackNeeded};
-OpenLayers.Util.modifyAlphaImageDiv=function(a,b,c,d,e,f,g,h,k){OpenLayers.Util.modifyDOMElement(a,b,c,d,f,null,null,k);b=a.childNodes[0];e&&(b.src=e);OpenLayers.Util.modifyDOMElement(b,a.id+"_innerImage",null,d,"relative",g);OpenLayers.Util.alphaHack()&&("none"!=a.style.display&&(a.style.display="inline-block"),null==h&&(h="scale"),a.style.filter="progid:DXImageTransform.Microsoft.AlphaImageLoader(src='"+b.src+"', sizingMethod='"+h+"')",0<=parseFloat(a.style.opacity)&&1>parseFloat(a.style.opacity)&&
-(a.style.filter+=" alpha(opacity="+100*a.style.opacity+")"),b.style.filter="alpha(opacity=0)")};OpenLayers.Util.createAlphaImageDiv=function(a,b,c,d,e,f,g,h,k){var l=OpenLayers.Util.createDiv();k=OpenLayers.Util.createImage(null,null,null,null,null,null,null,k);k.className="olAlphaImg";l.appendChild(k);OpenLayers.Util.modifyAlphaImageDiv(l,a,b,c,d,e,f,g,h);return l};OpenLayers.Util.upperCaseObject=function(a){var b={},c;for(c in a)b[c.toUpperCase()]=a[c];return b};
-OpenLayers.Util.applyDefaults=function(a,b){a=a||{};var c="function"==typeof window.Event&&b instanceof window.Event,d;for(d in b)if(void 0===a[d]||!c&&b.hasOwnProperty&&b.hasOwnProperty(d)&&!a.hasOwnProperty(d))a[d]=b[d];!c&&(b&&b.hasOwnProperty&&b.hasOwnProperty("toString")&&!a.hasOwnProperty("toString"))&&(a.toString=b.toString);return a};
-OpenLayers.Util.getParameterString=function(a){var b=[],c;for(c in a){var d=a[c];if(null!=d&&"function"!=typeof d){if("object"==typeof d&&d.constructor==Array){for(var e=[],f,g=0,h=d.length;g<h;g++)f=d[g],e.push(encodeURIComponent(null===f||void 0===f?"":f));d=e.join(",")}else d=encodeURIComponent(d);b.push(encodeURIComponent(c)+"="+d)}}return b.join("&")};OpenLayers.Util.urlAppend=function(a,b){var c=a;if(b)var d=(a+" ").split(/[?&]/),c=c+(" "===d.pop()?b:d.length?"&"+b:"?"+b);return c};
-OpenLayers.Util.getImagesLocation=function(){return OpenLayers.ImgPath||OpenLayers._getScriptLocation()+"img/"};OpenLayers.Util.getImageLocation=function(a){return OpenLayers.Util.getImagesLocation()+a};OpenLayers.Util.Try=function(){for(var a=null,b=0,c=arguments.length;b<c;b++){var d=arguments[b];try{a=d();break}catch(e){}}return a};
-OpenLayers.Util.getXmlNodeValue=function(a){var b=null;OpenLayers.Util.Try(function(){b=a.text;b||(b=a.textContent);b||(b=a.firstChild.nodeValue)},function(){b=a.textContent});return b};OpenLayers.Util.mouseLeft=function(a,b){for(var c=a.relatedTarget?a.relatedTarget:a.toElement;c!=b&&null!=c;)c=c.parentNode;return c!=b};OpenLayers.Util.DEFAULT_PRECISION=14;OpenLayers.Util.toFloat=function(a,b){null==b&&(b=OpenLayers.Util.DEFAULT_PRECISION);"number"!==typeof a&&(a=parseFloat(a));return 0===b?a:parseFloat(a.toPrecision(b))};
-OpenLayers.Util.rad=function(a){return a*Math.PI/180};OpenLayers.Util.deg=function(a){return 180*a/Math.PI};OpenLayers.Util.VincentyConstants={a:6378137,b:6356752.3142,f:1/298.257223563};
-OpenLayers.Util.distVincenty=function(a,b){for(var c=OpenLayers.Util.VincentyConstants,d=c.a,e=c.b,c=c.f,f=OpenLayers.Util.rad(b.lon-a.lon),g=Math.atan((1-c)*Math.tan(OpenLayers.Util.rad(a.lat))),h=Math.atan((1-c)*Math.tan(OpenLayers.Util.rad(b.lat))),k=Math.sin(g),g=Math.cos(g),l=Math.sin(h),h=Math.cos(h),m=f,n=2*Math.PI,p=20;1E-12<Math.abs(m-n)&&0<--p;){var q=Math.sin(m),r=Math.cos(m),s=Math.sqrt(h*q*h*q+(g*l-k*h*r)*(g*l-k*h*r));if(0==s)return 0;var r=k*l+g*h*r,t=Math.atan2(s,r),u=Math.asin(g*h*
-q/s),v=Math.cos(u)*Math.cos(u),q=r-2*k*l/v,w=c/16*v*(4+c*(4-3*v)),n=m,m=f+(1-w)*c*Math.sin(u)*(t+w*s*(q+w*r*(-1+2*q*q)))}if(0==p)return NaN;d=v*(d*d-e*e)/(e*e);c=d/1024*(256+d*(-128+d*(74-47*d)));return(e*(1+d/16384*(4096+d*(-768+d*(320-175*d))))*(t-c*s*(q+c/4*(r*(-1+2*q*q)-c/6*q*(-3+4*s*s)*(-3+4*q*q))))).toFixed(3)/1E3};
-OpenLayers.Util.destinationVincenty=function(a,b,c){var d=OpenLayers.Util,e=d.VincentyConstants,f=e.a,g=e.b,h=e.f,e=a.lon;a=a.lat;var k=d.rad(b);b=Math.sin(k);k=Math.cos(k);a=(1-h)*Math.tan(d.rad(a));var l=1/Math.sqrt(1+a*a),m=a*l,n=Math.atan2(a,k);a=l*b;for(var p=1-a*a,f=p*(f*f-g*g)/(g*g),q=1+f/16384*(4096+f*(-768+f*(320-175*f))),r=f/1024*(256+f*(-128+f*(74-47*f))),f=c/(g*q),s=2*Math.PI;1E-12<Math.abs(f-s);)var t=Math.cos(2*n+f),u=Math.sin(f),v=Math.cos(f),w=r*u*(t+r/4*(v*(-1+2*t*t)-r/6*t*(-3+4*
-u*u)*(-3+4*t*t))),s=f,f=c/(g*q)+w;c=m*u-l*v*k;g=Math.atan2(m*v+l*u*k,(1-h)*Math.sqrt(a*a+c*c));b=Math.atan2(u*b,l*v-m*u*k);k=h/16*p*(4+h*(4-3*p));t=b-(1-k)*h*a*(f+k*u*(t+k*v*(-1+2*t*t)));Math.atan2(a,-c);return new OpenLayers.LonLat(e+d.deg(t),d.deg(g))};
-OpenLayers.Util.getParameters=function(a,b){b=b||{};a=null===a||void 0===a?window.location.href:a;var c="";if(OpenLayers.String.contains(a,"?"))var d=a.indexOf("?")+1,c=OpenLayers.String.contains(a,"#")?a.indexOf("#"):a.length,c=a.substring(d,c);for(var d={},c=c.split(/[&;]/),e=0,f=c.length;e<f;++e){var g=c[e].split("=");if(g[0]){var h=g[0];try{h=decodeURIComponent(h)}catch(k){h=unescape(h)}g=(g[1]||"").replace(/\+/g," ");try{g=decodeURIComponent(g)}catch(l){g=unescape(g)}!1!==b.splitArgs&&(g=g.split(","));
-1==g.length&&(g=g[0]);d[h]=g}}return d};OpenLayers.Util.lastSeqID=0;OpenLayers.Util.createUniqueID=function(a){a=null==a?"id_":a.replace(OpenLayers.Util.dotless,"_");OpenLayers.Util.lastSeqID+=1;return a+OpenLayers.Util.lastSeqID};OpenLayers.INCHES_PER_UNIT={inches:1,ft:12,mi:63360,m:39.37,km:39370,dd:4374754,yd:36};OpenLayers.INCHES_PER_UNIT["in"]=OpenLayers.INCHES_PER_UNIT.inches;OpenLayers.INCHES_PER_UNIT.degrees=OpenLayers.INCHES_PER_UNIT.dd;OpenLayers.INCHES_PER_UNIT.nmi=1852*OpenLayers.INCHES_PER_UNIT.m;
-OpenLayers.METERS_PER_INCH=0.0254000508001016;
-OpenLayers.Util.extend(OpenLayers.INCHES_PER_UNIT,{Inch:OpenLayers.INCHES_PER_UNIT.inches,Meter:1/OpenLayers.METERS_PER_INCH,Foot:0.3048006096012192/OpenLayers.METERS_PER_INCH,IFoot:0.3048/OpenLayers.METERS_PER_INCH,ClarkeFoot:0.3047972651151/OpenLayers.METERS_PER_INCH,SearsFoot:0.30479947153867626/OpenLayers.METERS_PER_INCH,GoldCoastFoot:0.3047997101815088/OpenLayers.METERS_PER_INCH,IInch:0.0254/OpenLayers.METERS_PER_INCH,MicroInch:2.54E-5/OpenLayers.METERS_PER_INCH,Mil:2.54E-8/OpenLayers.METERS_PER_INCH,
-Centimeter:0.01/OpenLayers.METERS_PER_INCH,Kilometer:1E3/OpenLayers.METERS_PER_INCH,Yard:0.9144018288036576/OpenLayers.METERS_PER_INCH,SearsYard:0.914398414616029/OpenLayers.METERS_PER_INCH,IndianYard:0.9143985307444408/OpenLayers.METERS_PER_INCH,IndianYd37:0.91439523/OpenLayers.METERS_PER_INCH,IndianYd62:0.9143988/OpenLayers.METERS_PER_INCH,IndianYd75:0.9143985/OpenLayers.METERS_PER_INCH,IndianFoot:0.30479951/OpenLayers.METERS_PER_INCH,IndianFt37:0.30479841/OpenLayers.METERS_PER_INCH,IndianFt62:0.3047996/
-OpenLayers.METERS_PER_INCH,IndianFt75:0.3047995/OpenLayers.METERS_PER_INCH,Mile:1609.3472186944373/OpenLayers.METERS_PER_INCH,IYard:0.9144/OpenLayers.METERS_PER_INCH,IMile:1609.344/OpenLayers.METERS_PER_INCH,NautM:1852/OpenLayers.METERS_PER_INCH,"Lat-66":110943.31648893273/OpenLayers.METERS_PER_INCH,"Lat-83":110946.25736872235/OpenLayers.METERS_PER_INCH,Decimeter:0.1/OpenLayers.METERS_PER_INCH,Millimeter:0.001/OpenLayers.METERS_PER_INCH,Dekameter:10/OpenLayers.METERS_PER_INCH,Decameter:10/OpenLayers.METERS_PER_INCH,
-Hectometer:100/OpenLayers.METERS_PER_INCH,GermanMeter:1.0000135965/OpenLayers.METERS_PER_INCH,CaGrid:0.999738/OpenLayers.METERS_PER_INCH,ClarkeChain:20.1166194976/OpenLayers.METERS_PER_INCH,GunterChain:20.11684023368047/OpenLayers.METERS_PER_INCH,BenoitChain:20.116782494375872/OpenLayers.METERS_PER_INCH,SearsChain:20.11676512155/OpenLayers.METERS_PER_INCH,ClarkeLink:0.201166194976/OpenLayers.METERS_PER_INCH,GunterLink:0.2011684023368047/OpenLayers.METERS_PER_INCH,BenoitLink:0.20116782494375873/OpenLayers.METERS_PER_INCH,
-SearsLink:0.2011676512155/OpenLayers.METERS_PER_INCH,Rod:5.02921005842012/OpenLayers.METERS_PER_INCH,IntnlChain:20.1168/OpenLayers.METERS_PER_INCH,IntnlLink:0.201168/OpenLayers.METERS_PER_INCH,Perch:5.02921005842012/OpenLayers.METERS_PER_INCH,Pole:5.02921005842012/OpenLayers.METERS_PER_INCH,Furlong:201.1684023368046/OpenLayers.METERS_PER_INCH,Rood:3.778266898/OpenLayers.METERS_PER_INCH,CapeFoot:0.3047972615/OpenLayers.METERS_PER_INCH,Brealey:375/OpenLayers.METERS_PER_INCH,ModAmFt:0.304812252984506/
-OpenLayers.METERS_PER_INCH,Fathom:1.8288/OpenLayers.METERS_PER_INCH,"NautM-UK":1853.184/OpenLayers.METERS_PER_INCH,"50kilometers":5E4/OpenLayers.METERS_PER_INCH,"150kilometers":15E4/OpenLayers.METERS_PER_INCH});
-OpenLayers.Util.extend(OpenLayers.INCHES_PER_UNIT,{mm:OpenLayers.INCHES_PER_UNIT.Meter/1E3,cm:OpenLayers.INCHES_PER_UNIT.Meter/100,dm:100*OpenLayers.INCHES_PER_UNIT.Meter,km:1E3*OpenLayers.INCHES_PER_UNIT.Meter,kmi:OpenLayers.INCHES_PER_UNIT.nmi,fath:OpenLayers.INCHES_PER_UNIT.Fathom,ch:OpenLayers.INCHES_PER_UNIT.IntnlChain,link:OpenLayers.INCHES_PER_UNIT.IntnlLink,"us-in":OpenLayers.INCHES_PER_UNIT.inches,"us-ft":OpenLayers.INCHES_PER_UNIT.Foot,"us-yd":OpenLayers.INCHES_PER_UNIT.Yard,"us-ch":OpenLayers.INCHES_PER_UNIT.GunterChain,
-"us-mi":OpenLayers.INCHES_PER_UNIT.Mile,"ind-yd":OpenLayers.INCHES_PER_UNIT.IndianYd37,"ind-ft":OpenLayers.INCHES_PER_UNIT.IndianFt37,"ind-ch":20.11669506/OpenLayers.METERS_PER_INCH});OpenLayers.DOTS_PER_INCH=72;OpenLayers.Util.normalizeScale=function(a){return 1<a?1/a:a};OpenLayers.Util.getResolutionFromScale=function(a,b){var c;a&&(null==b&&(b="degrees"),c=1/(OpenLayers.Util.normalizeScale(a)*OpenLayers.INCHES_PER_UNIT[b]*OpenLayers.DOTS_PER_INCH));return c};
-OpenLayers.Util.getScaleFromResolution=function(a,b){null==b&&(b="degrees");return a*OpenLayers.INCHES_PER_UNIT[b]*OpenLayers.DOTS_PER_INCH};
-OpenLayers.Util.pagePosition=function(a){var b=[0,0],c=OpenLayers.Util.getViewportElement();if(!a||a==window||a==c)return b;var d=OpenLayers.IS_GECKO&&document.getBoxObjectFor&&"absolute"==OpenLayers.Element.getStyle(a,"position")&&(""==a.style.top||""==a.style.left),e=null;if(a.getBoundingClientRect)a=a.getBoundingClientRect(),e=window.pageYOffset||c.scrollTop,b[0]=a.left+(window.pageXOffset||c.scrollLeft),b[1]=a.top+e;else if(document.getBoxObjectFor&&!d)a=document.getBoxObjectFor(a),c=document.getBoxObjectFor(c),
-b[0]=a.screenX-c.screenX,b[1]=a.screenY-c.screenY;else{b[0]=a.offsetLeft;b[1]=a.offsetTop;e=a.offsetParent;if(e!=a)for(;e;)b[0]+=e.offsetLeft,b[1]+=e.offsetTop,e=e.offsetParent;c=OpenLayers.BROWSER_NAME;if("opera"==c||"safari"==c&&"absolute"==OpenLayers.Element.getStyle(a,"position"))b[1]-=document.body.offsetTop;for(e=a.offsetParent;e&&e!=document.body;){b[0]-=e.scrollLeft;if("opera"!=c||"TR"!=e.tagName)b[1]-=e.scrollTop;e=e.offsetParent}}return b};
-OpenLayers.Util.getViewportElement=function(){var a=arguments.callee.viewportElement;void 0==a&&(a="msie"==OpenLayers.BROWSER_NAME&&"CSS1Compat"!=document.compatMode?document.body:document.documentElement,arguments.callee.viewportElement=a);return a};
-OpenLayers.Util.isEquivalentUrl=function(a,b,c){c=c||{};OpenLayers.Util.applyDefaults(c,{ignoreCase:!0,ignorePort80:!0,ignoreHash:!0,splitArgs:!1});a=OpenLayers.Util.createUrlObject(a,c);b=OpenLayers.Util.createUrlObject(b,c);for(var d in a)if("args"!==d&&a[d]!=b[d])return!1;for(d in a.args){if(a.args[d]!=b.args[d])return!1;delete b.args[d]}for(d in b.args)return!1;return!0};
-OpenLayers.Util.createUrlObject=function(a,b){b=b||{};if(!/^\w+:\/\//.test(a)){var c=window.location,d=c.port?":"+c.port:"",d=c.protocol+"//"+c.host.split(":").shift()+d;0===a.indexOf("/")?a=d+a:(c=c.pathname.split("/"),c.pop(),a=d+c.join("/")+"/"+a)}b.ignoreCase&&(a=a.toLowerCase());c=document.createElement("a");c.href=a;d={};d.host=c.host.split(":").shift();d.protocol=c.protocol;d.port=b.ignorePort80?"80"==c.port||"0"==c.port?"":c.port:""==c.port||"0"==c.port?"80":c.port;d.hash=b.ignoreHash||"#"===
-c.hash?"":c.hash;var e=c.search;e||(e=a.indexOf("?"),e=-1!=e?a.substr(e):"");d.args=OpenLayers.Util.getParameters(e,{splitArgs:b.splitArgs});d.pathname="/"==c.pathname.charAt(0)?c.pathname:"/"+c.pathname;return d};OpenLayers.Util.removeTail=function(a){var b=null,b=a.indexOf("?"),c=a.indexOf("#");return b=-1==b?-1!=c?a.substr(0,c):a:-1!=c?a.substr(0,Math.min(b,c)):a.substr(0,b)};OpenLayers.IS_GECKO=function(){var a=navigator.userAgent.toLowerCase();return-1==a.indexOf("webkit")&&-1!=a.indexOf("gecko")}();
-OpenLayers.CANVAS_SUPPORTED=function(){var a=document.createElement("canvas");return!(!a.getContext||!a.getContext("2d"))}();OpenLayers.BROWSER_NAME=function(){var a="",b=navigator.userAgent.toLowerCase();-1!=b.indexOf("opera")?a="opera":-1!=b.indexOf("msie")?a="msie":-1!=b.indexOf("safari")?a="safari":-1!=b.indexOf("mozilla")&&(a=-1!=b.indexOf("firefox")?"firefox":"mozilla");return a}();OpenLayers.Util.getBrowserName=function(){return OpenLayers.BROWSER_NAME};
-OpenLayers.Util.getRenderedDimensions=function(a,b,c){var d,e,f=document.createElement("div");f.style.visibility="hidden";for(var g=c&&c.containerElement?c.containerElement:document.body,h=!1,k=null,l=g;l&&"body"!=l.tagName.toLowerCase();){var m=OpenLayers.Element.getStyle(l,"position");if("absolute"==m){h=!0;break}else if(m&&"static"!=m)break;l=l.parentNode}!h||0!==g.clientHeight&&0!==g.clientWidth||(k=document.createElement("div"),k.style.visibility="hidden",k.style.position="absolute",k.style.overflow=
-"visible",k.style.width=document.body.clientWidth+"px",k.style.height=document.body.clientHeight+"px",k.appendChild(f));f.style.position="absolute";b&&(b.w?(d=b.w,f.style.width=d+"px"):b.h&&(e=b.h,f.style.height=e+"px"));c&&c.displayClass&&(f.className=c.displayClass);b=document.createElement("div");b.innerHTML=a;b.style.overflow="visible";if(b.childNodes)for(a=0,c=b.childNodes.length;a<c;a++)b.childNodes[a].style&&(b.childNodes[a].style.overflow="visible");f.appendChild(b);k?g.appendChild(k):g.appendChild(f);
-d||(d=parseInt(b.scrollWidth),f.style.width=d+"px");e||(e=parseInt(b.scrollHeight));f.removeChild(b);k?(k.removeChild(f),g.removeChild(k)):g.removeChild(f);return new OpenLayers.Size(d,e)};
-OpenLayers.Util.getScrollbarWidth=function(){var a=OpenLayers.Util._scrollbarWidth;if(null==a){var b=null,c=null,b=a=0,b=document.createElement("div");b.style.position="absolute";b.style.top="-1000px";b.style.left="-1000px";b.style.width="100px";b.style.height="50px";b.style.overflow="hidden";c=document.createElement("div");c.style.width="100%";c.style.height="200px";b.appendChild(c);document.body.appendChild(b);a=c.offsetWidth;b.style.overflow="scroll";b=c.offsetWidth;document.body.removeChild(document.body.lastChild);
-OpenLayers.Util._scrollbarWidth=a-b;a=OpenLayers.Util._scrollbarWidth}return a};
-OpenLayers.Util.getFormattedLonLat=function(a,b,c){c||(c="dms");a=(a+540)%360-180;var d=Math.abs(a),e=Math.floor(d),f=d=(d-e)/(1/60),d=Math.floor(d),f=Math.round(10*((f-d)/(1/60))),f=f/10;60<=f&&(f-=60,d+=1,60<=d&&(d-=60,e+=1));10>e&&(e="0"+e);e+="\u00b0";0<=c.indexOf("dm")&&(10>d&&(d="0"+d),e+=d+"'",0<=c.indexOf("dms")&&(10>f&&(f="0"+f),e+=f+'"'));return e="lon"==b?e+(0>a?OpenLayers.i18n("W"):OpenLayers.i18n("E")):e+(0>a?OpenLayers.i18n("S"):OpenLayers.i18n("N"))};OpenLayers.Format=OpenLayers.Class({options:null,externalProjection:null,internalProjection:null,data:null,keepData:!1,initialize:function(a){OpenLayers.Util.extend(this,a);this.options=a},destroy:function(){},read:function(a){throw Error("Read not implemented.");},write:function(a){throw Error("Write not implemented.");},CLASS_NAME:"OpenLayers.Format"});OpenLayers.Format.CSWGetRecords=function(a){a=OpenLayers.Util.applyDefaults(a,OpenLayers.Format.CSWGetRecords.DEFAULTS);var b=OpenLayers.Format.CSWGetRecords["v"+a.version.replace(/\./g,"_")];if(!b)throw"Unsupported CSWGetRecords version: "+a.version;return new b(a)};OpenLayers.Format.CSWGetRecords.DEFAULTS={version:"2.0.2"};OpenLayers.Control=OpenLayers.Class({id:null,map:null,div:null,type:null,allowSelection:!1,displayClass:"",title:"",autoActivate:!1,active:null,handlerOptions:null,handler:null,eventListeners:null,events:null,initialize:function(a){this.displayClass=this.CLASS_NAME.replace("OpenLayers.","ol").replace(/\./g,"");OpenLayers.Util.extend(this,a);this.events=new OpenLayers.Events(this);if(this.eventListeners instanceof Object)this.events.on(this.eventListeners);null==this.id&&(this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+
-"_"))},destroy:function(){this.events&&(this.eventListeners&&this.events.un(this.eventListeners),this.events.destroy(),this.events=null);this.eventListeners=null;this.handler&&(this.handler.destroy(),this.handler=null);if(this.handlers){for(var a in this.handlers)this.handlers.hasOwnProperty(a)&&"function"==typeof this.handlers[a].destroy&&this.handlers[a].destroy();this.handlers=null}this.map&&(this.map.removeControl(this),this.map=null);this.div=null},setMap:function(a){this.map=a;this.handler&&
-this.handler.setMap(a)},draw:function(a){null==this.div&&(this.div=OpenLayers.Util.createDiv(this.id),this.div.className=this.displayClass,this.allowSelection||(this.div.className+=" olControlNoSelect",this.div.setAttribute("unselectable","on",0),this.div.onselectstart=OpenLayers.Function.False),""!=this.title&&(this.div.title=this.title));null!=a&&(this.position=a.clone());this.moveTo(this.position);return this.div},moveTo:function(a){null!=a&&null!=this.div&&(this.div.style.left=a.x+"px",this.div.style.top=
-a.y+"px")},activate:function(){if(this.active)return!1;this.handler&&this.handler.activate();this.active=!0;this.map&&OpenLayers.Element.addClass(this.map.viewPortDiv,this.displayClass.replace(/ /g,"")+"Active");this.events.triggerEvent("activate");return!0},deactivate:function(){return this.active?(this.handler&&this.handler.deactivate(),this.active=!1,this.map&&OpenLayers.Element.removeClass(this.map.viewPortDiv,this.displayClass.replace(/ /g,"")+"Active"),this.events.triggerEvent("deactivate"),
-!0):!1},CLASS_NAME:"OpenLayers.Control"});OpenLayers.Control.TYPE_BUTTON=1;OpenLayers.Control.TYPE_TOGGLE=2;OpenLayers.Control.TYPE_TOOL=3;OpenLayers.Event={observers:!1,KEY_SPACE:32,KEY_BACKSPACE:8,KEY_TAB:9,KEY_RETURN:13,KEY_ESC:27,KEY_LEFT:37,KEY_UP:38,KEY_RIGHT:39,KEY_DOWN:40,KEY_DELETE:46,element:function(a){return a.target||a.srcElement},isSingleTouch:function(a){return a.touches&&1==a.touches.length},isMultiTouch:function(a){return a.touches&&1<a.touches.length},isLeftClick:function(a){return a.which&&1==a.which||a.button&&1==a.button},isRightClick:function(a){return a.which&&3==a.which||a.button&&2==a.button},stop:function(a,
-b){b||OpenLayers.Event.preventDefault(a);a.stopPropagation?a.stopPropagation():a.cancelBubble=!0},preventDefault:function(a){a.preventDefault?a.preventDefault():a.returnValue=!1},findElement:function(a,b){for(var c=OpenLayers.Event.element(a);c.parentNode&&(!c.tagName||c.tagName.toUpperCase()!=b.toUpperCase());)c=c.parentNode;return c},observe:function(a,b,c,d){a=OpenLayers.Util.getElement(a);d=d||!1;"keypress"==b&&(navigator.appVersion.match(/Konqueror|Safari|KHTML/)||a.attachEvent)&&(b="keydown");
-this.observers||(this.observers={});if(!a._eventCacheID){var e="eventCacheID_";a.id&&(e=a.id+"_"+e);a._eventCacheID=OpenLayers.Util.createUniqueID(e)}e=a._eventCacheID;this.observers[e]||(this.observers[e]=[]);this.observers[e].push({element:a,name:b,observer:c,useCapture:d});a.addEventListener?a.addEventListener(b,c,d):a.attachEvent&&a.attachEvent("on"+b,c)},stopObservingElement:function(a){a=OpenLayers.Util.getElement(a)._eventCacheID;this._removeElementObservers(OpenLayers.Event.observers[a])},
-_removeElementObservers:function(a){if(a)for(var b=a.length-1;0<=b;b--){var c=a[b];OpenLayers.Event.stopObserving.apply(this,[c.element,c.name,c.observer,c.useCapture])}},stopObserving:function(a,b,c,d){d=d||!1;a=OpenLayers.Util.getElement(a);var e=a._eventCacheID;"keypress"==b&&(navigator.appVersion.match(/Konqueror|Safari|KHTML/)||a.detachEvent)&&(b="keydown");var f=!1,g=OpenLayers.Event.observers[e];if(g)for(var h=0;!f&&h<g.length;){var k=g[h];if(k.name==b&&k.observer==c&&k.useCapture==d){g.splice(h,
-1);0==g.length&&delete OpenLayers.Event.observers[e];f=!0;break}h++}f&&(a.removeEventListener?a.removeEventListener(b,c,d):a&&a.detachEvent&&a.detachEvent("on"+b,c));return f},unloadCache:function(){if(OpenLayers.Event&&OpenLayers.Event.observers){for(var a in OpenLayers.Event.observers)OpenLayers.Event._removeElementObservers.apply(this,[OpenLayers.Event.observers[a]]);OpenLayers.Event.observers=!1}},CLASS_NAME:"OpenLayers.Event"};
-OpenLayers.Event.observe(window,"unload",OpenLayers.Event.unloadCache,!1);
-OpenLayers.Events=OpenLayers.Class({BROWSER_EVENTS:"mouseover mouseout mousedown mouseup mousemove click dblclick rightclick dblrightclick resize focus blur touchstart touchmove touchend keydown".split(" "),listeners:null,object:null,element:null,eventHandler:null,fallThrough:null,includeXY:!1,extensions:null,extensionCount:null,clearMouseListener:null,initialize:function(a,b,c,d,e){OpenLayers.Util.extend(this,e);this.object=a;this.fallThrough=d;this.listeners={};this.extensions={};this.extensionCount=
-{};this._msTouches=[];null!=b&&this.attachToElement(b)},destroy:function(){for(var a in this.extensions)"boolean"!==typeof this.extensions[a]&&this.extensions[a].destroy();this.extensions=null;this.element&&(OpenLayers.Event.stopObservingElement(this.element),this.element.hasScrollEvent&&OpenLayers.Event.stopObserving(window,"scroll",this.clearMouseListener));this.eventHandler=this.fallThrough=this.object=this.listeners=this.element=null},addEventType:function(a){},attachToElement:function(a){this.element?
-OpenLayers.Event.stopObservingElement(this.element):(this.eventHandler=OpenLayers.Function.bindAsEventListener(this.handleBrowserEvent,this),this.clearMouseListener=OpenLayers.Function.bind(this.clearMouseCache,this));this.element=a;for(var b=!!window.navigator.msMaxTouchPoints,c,d=0,e=this.BROWSER_EVENTS.length;d<e;d++)c=this.BROWSER_EVENTS[d],OpenLayers.Event.observe(a,c,this.eventHandler),b&&0===c.indexOf("touch")&&this.addMsTouchListener(a,c,this.eventHandler);OpenLayers.Event.observe(a,"dragstart",
-OpenLayers.Event.stop)},on:function(a){for(var b in a)"scope"!=b&&a.hasOwnProperty(b)&&this.register(b,a.scope,a[b])},register:function(a,b,c,d){a in OpenLayers.Events&&!this.extensions[a]&&(this.extensions[a]=new OpenLayers.Events[a](this));if(null!=c){null==b&&(b=this.object);var e=this.listeners[a];e||(e=[],this.listeners[a]=e,this.extensionCount[a]=0);b={obj:b,func:c};d?(e.splice(this.extensionCount[a],0,b),"object"===typeof d&&d.extension&&this.extensionCount[a]++):e.push(b)}},registerPriority:function(a,
-b,c){this.register(a,b,c,!0)},un:function(a){for(var b in a)"scope"!=b&&a.hasOwnProperty(b)&&this.unregister(b,a.scope,a[b])},unregister:function(a,b,c){null==b&&(b=this.object);a=this.listeners[a];if(null!=a)for(var d=0,e=a.length;d<e;d++)if(a[d].obj==b&&a[d].func==c){a.splice(d,1);break}},remove:function(a){null!=this.listeners[a]&&(this.listeners[a]=[])},triggerEvent:function(a,b){var c=this.listeners[a];if(c&&0!=c.length){null==b&&(b={});b.object=this.object;b.element=this.element;b.type||(b.type=
-a);for(var c=c.slice(),d,e=0,f=c.length;e<f&&(d=c[e],d=d.func.apply(d.obj,[b]),void 0==d||!1!=d);e++);this.fallThrough||OpenLayers.Event.stop(b,!0);return d}},handleBrowserEvent:function(a){var b=a.type,c=this.listeners[b];if(c&&0!=c.length){if((c=a.touches)&&c[0]){for(var d=0,e=0,f=c.length,g,h=0;h<f;++h)g=this.getTouchClientXY(c[h]),d+=g.clientX,e+=g.clientY;a.clientX=d/f;a.clientY=e/f}this.includeXY&&(a.xy=this.getMousePosition(a));this.triggerEvent(b,a)}},getTouchClientXY:function(a){var b=window.olMockWin||
-window,c=b.pageXOffset,b=b.pageYOffset,d=a.clientX,e=a.clientY;if(0===a.pageY&&Math.floor(e)>Math.floor(a.pageY)||0===a.pageX&&Math.floor(d)>Math.floor(a.pageX))d-=c,e-=b;else if(e<a.pageY-b||d<a.pageX-c)d=a.pageX-c,e=a.pageY-b;a.olClientX=d;a.olClientY=e;return{clientX:d,clientY:e}},clearMouseCache:function(){this.element.scrolls=null;this.element.lefttop=null;this.element.offsets=null},getMousePosition:function(a){this.includeXY?this.element.hasScrollEvent||(OpenLayers.Event.observe(window,"scroll",
-this.clearMouseListener),this.element.hasScrollEvent=!0):this.clearMouseCache();if(!this.element.scrolls){var b=OpenLayers.Util.getViewportElement();this.element.scrolls=[window.pageXOffset||b.scrollLeft,window.pageYOffset||b.scrollTop]}this.element.lefttop||(this.element.lefttop=[document.documentElement.clientLeft||0,document.documentElement.clientTop||0]);this.element.offsets||(this.element.offsets=OpenLayers.Util.pagePosition(this.element));return new OpenLayers.Pixel(a.clientX+this.element.scrolls[0]-
-this.element.offsets[0]-this.element.lefttop[0],a.clientY+this.element.scrolls[1]-this.element.offsets[1]-this.element.lefttop[1])},addMsTouchListener:function(a,b,c){function d(a){c(OpenLayers.Util.applyDefaults({stopPropagation:function(){for(var a=e.length-1;0<=a;--a)e[a].stopPropagation()},preventDefault:function(){for(var a=e.length-1;0<=a;--a)e[a].preventDefault()},type:b},a))}var e=this._msTouches;switch(b){case "touchstart":return this.addMsTouchListenerStart(a,b,d);case "touchend":return this.addMsTouchListenerEnd(a,
-b,d);case "touchmove":return this.addMsTouchListenerMove(a,b,d);default:throw"Unknown touch event type";}},addMsTouchListenerStart:function(a,b,c){var d=this._msTouches;OpenLayers.Event.observe(a,"MSPointerDown",function(a){for(var b=!1,g=0,h=d.length;g<h;++g)if(d[g].pointerId==a.pointerId){b=!0;break}b||d.push(a);a.touches=d.slice();c(a)});OpenLayers.Event.observe(a,"MSPointerUp",function(a){for(var b=0,c=d.length;b<c;++b)if(d[b].pointerId==a.pointerId){d.splice(b,1);break}})},addMsTouchListenerMove:function(a,
-b,c){var d=this._msTouches;OpenLayers.Event.observe(a,"MSPointerMove",function(a){if(a.pointerType!=a.MSPOINTER_TYPE_MOUSE||0!=a.buttons)if(1!=d.length||d[0].pageX!=a.pageX||d[0].pageY!=a.pageY){for(var b=0,g=d.length;b<g;++b)if(d[b].pointerId==a.pointerId){d[b]=a;break}a.touches=d.slice();c(a)}})},addMsTouchListenerEnd:function(a,b,c){var d=this._msTouches;OpenLayers.Event.observe(a,"MSPointerUp",function(a){for(var b=0,g=d.length;b<g;++b)if(d[b].pointerId==a.pointerId){d.splice(b,1);break}a.touches=
-d.slice();c(a)})},CLASS_NAME:"OpenLayers.Events"});OpenLayers.Events.buttonclick=OpenLayers.Class({target:null,events:"mousedown mouseup click dblclick touchstart touchmove touchend keydown".split(" "),startRegEx:/^mousedown|touchstart$/,cancelRegEx:/^touchmove$/,completeRegEx:/^mouseup|touchend$/,initialize:function(a){this.target=a;for(a=this.events.length-1;0<=a;--a)this.target.register(this.events[a],this,this.buttonClick,{extension:!0})},destroy:function(){for(var a=this.events.length-1;0<=a;--a)this.target.unregister(this.events[a],this,this.buttonClick);
-delete this.target},getPressedButton:function(a){var b=3,c;do{if(OpenLayers.Element.hasClass(a,"olButton")){c=a;break}a=a.parentNode}while(0<--b&&a);return c},ignore:function(a){var b=3,c=!1;do{if("a"===a.nodeName.toLowerCase()){c=!0;break}a=a.parentNode}while(0<--b&&a);return c},buttonClick:function(a){var b=!0,c=OpenLayers.Event.element(a);if(c&&(OpenLayers.Event.isLeftClick(a)||!~a.type.indexOf("mouse")))if(c=this.getPressedButton(c)){if("keydown"===a.type)switch(a.keyCode){case OpenLayers.Event.KEY_RETURN:case OpenLayers.Event.KEY_SPACE:this.target.triggerEvent("buttonclick",
-{buttonElement:c}),OpenLayers.Event.stop(a),b=!1}else if(this.startEvt){if(this.completeRegEx.test(a.type)){var b=OpenLayers.Util.pagePosition(c),d=OpenLayers.Util.getViewportElement(),e=window.pageYOffset||d.scrollTop;b[0]-=window.pageXOffset||d.scrollLeft;b[1]-=e;this.target.triggerEvent("buttonclick",{buttonElement:c,buttonXY:{x:this.startEvt.clientX-b[0],y:this.startEvt.clientY-b[1]}})}this.cancelRegEx.test(a.type)&&delete this.startEvt;OpenLayers.Event.stop(a);b=!1}this.startRegEx.test(a.type)&&
-(this.startEvt=a,OpenLayers.Event.stop(a),b=!1)}else b=!this.ignore(OpenLayers.Event.element(a)),delete this.startEvt;return b}});OpenLayers.Util=OpenLayers.Util||{};
-OpenLayers.Util.vendorPrefix=function(){function a(a){return a?a.replace(/([A-Z])/g,function(a){return"-"+a.toLowerCase()}).replace(/^ms-/,"-ms-"):null}function b(a,b){if(void 0===g[b]){var c,e=0,f=d.length,p="undefined"!==typeof a.cssText;for(g[b]=null;e<f;e++)if((c=d[e])?(p||(c=c.toLowerCase()),c=c+b.charAt(0).toUpperCase()+b.slice(1)):c=b,void 0!==a[c]){g[b]=c;break}}return g[b]}function c(a){return b(e,a)}var d=["","O","ms","Moz","Webkit"],e=document.createElement("div").style,f={},g={};return{css:function(b){if(void 0===
-f[b]){var d=b.replace(/(-[\s\S])/g,function(a){return a.charAt(1).toUpperCase()}),d=c(d);f[b]=a(d)}return f[b]},js:b,style:c,cssCache:f,jsCache:g}}();OpenLayers.Animation=function(a){var b=OpenLayers.Util.vendorPrefix.js(a,"requestAnimationFrame"),c=!!b,d=function(){var c=a[b]||function(b,c){a.setTimeout(b,16)};return function(b,d){c.apply(a,[b,d])}}(),e=0,f={};return{isNative:c,requestFrame:d,start:function(a,b,c){b=0<b?b:Number.POSITIVE_INFINITY;var l=++e,m=+new Date;f[l]=function(){f[l]&&+new Date-m<=b?(a(),f[l]&&d(f[l],c)):delete f[l]};d(f[l],c);return l},stop:function(a){delete f[a]}}}(window);OpenLayers.Tween=OpenLayers.Class({easing:null,begin:null,finish:null,duration:null,callbacks:null,time:null,minFrameRate:null,startTime:null,animationId:null,playing:!1,initialize:function(a){this.easing=a?a:OpenLayers.Easing.Expo.easeOut},start:function(a,b,c,d){this.playing=!0;this.begin=a;this.finish=b;this.duration=c;this.callbacks=d.callbacks;this.minFrameRate=d.minFrameRate||30;this.time=0;this.startTime=(new Date).getTime();OpenLayers.Animation.stop(this.animationId);this.animationId=null;
-this.callbacks&&this.callbacks.start&&this.callbacks.start.call(this,this.begin);this.animationId=OpenLayers.Animation.start(OpenLayers.Function.bind(this.play,this))},stop:function(){this.playing&&(this.callbacks&&this.callbacks.done&&this.callbacks.done.call(this,this.finish),OpenLayers.Animation.stop(this.animationId),this.animationId=null,this.playing=!1)},play:function(){var a={},b;for(b in this.begin){var c=this.begin[b],d=this.finish[b];if(null==c||null==d||isNaN(c)||isNaN(d))throw new TypeError("invalid value for Tween");
-a[b]=this.easing.apply(this,[this.time,c,d-c,this.duration])}this.time++;this.callbacks&&this.callbacks.eachStep&&((new Date).getTime()-this.startTime)/this.time<=1E3/this.minFrameRate&&this.callbacks.eachStep.call(this,a);this.time>this.duration&&this.stop()},CLASS_NAME:"OpenLayers.Tween"});OpenLayers.Easing={CLASS_NAME:"OpenLayers.Easing"};OpenLayers.Easing.Linear={easeIn:function(a,b,c,d){return c*a/d+b},easeOut:function(a,b,c,d){return c*a/d+b},easeInOut:function(a,b,c,d){return c*a/d+b},CLASS_NAME:"OpenLayers.Easing.Linear"};
-OpenLayers.Easing.Expo={easeIn:function(a,b,c,d){return 0==a?b:c*Math.pow(2,10*(a/d-1))+b},easeOut:function(a,b,c,d){return a==d?b+c:c*(-Math.pow(2,-10*a/d)+1)+b},easeInOut:function(a,b,c,d){return 0==a?b:a==d?b+c:1>(a/=d/2)?c/2*Math.pow(2,10*(a-1))+b:c/2*(-Math.pow(2,-10*--a)+2)+b},CLASS_NAME:"OpenLayers.Easing.Expo"};
-OpenLayers.Easing.Quad={easeIn:function(a,b,c,d){return c*(a/=d)*a+b},easeOut:function(a,b,c,d){return-c*(a/=d)*(a-2)+b},easeInOut:function(a,b,c,d){return 1>(a/=d/2)?c/2*a*a+b:-c/2*(--a*(a-2)-1)+b},CLASS_NAME:"OpenLayers.Easing.Quad"};OpenLayers.Projection=OpenLayers.Class({proj:null,projCode:null,titleRegEx:/\+title=[^\+]*/,initialize:function(a,b){OpenLayers.Util.extend(this,b);this.projCode=a;"object"==typeof Proj4js&&(this.proj=new Proj4js.Proj(a))},getCode:function(){return this.proj?this.proj.srsCode:this.projCode},getUnits:function(){return this.proj?this.proj.units:null},toString:function(){return this.getCode()},equals:function(a){var b=!1;a&&(a instanceof OpenLayers.Projection||(a=new OpenLayers.Projection(a)),"object"==
-typeof Proj4js&&this.proj.defData&&a.proj.defData?b=this.proj.defData.replace(this.titleRegEx,"")==a.proj.defData.replace(this.titleRegEx,""):a.getCode&&(b=this.getCode(),a=a.getCode(),b=b==a||!!OpenLayers.Projection.transforms[b]&&OpenLayers.Projection.transforms[b][a]===OpenLayers.Projection.nullTransform));return b},destroy:function(){delete this.proj;delete this.projCode},CLASS_NAME:"OpenLayers.Projection"});OpenLayers.Projection.transforms={};
-OpenLayers.Projection.defaults={"EPSG:4326":{units:"degrees",maxExtent:[-180,-90,180,90],yx:!0},"CRS:84":{units:"degrees",maxExtent:[-180,-90,180,90]},"EPSG:900913":{units:"m",maxExtent:[-2.003750834E7,-2.003750834E7,2.003750834E7,2.003750834E7]}};
-OpenLayers.Projection.addTransform=function(a,b,c){if(c===OpenLayers.Projection.nullTransform){var d=OpenLayers.Projection.defaults[a];d&&!OpenLayers.Projection.defaults[b]&&(OpenLayers.Projection.defaults[b]=d)}OpenLayers.Projection.transforms[a]||(OpenLayers.Projection.transforms[a]={});OpenLayers.Projection.transforms[a][b]=c};
-OpenLayers.Projection.transform=function(a,b,c){if(b&&c)if(b instanceof OpenLayers.Projection||(b=new OpenLayers.Projection(b)),c instanceof OpenLayers.Projection||(c=new OpenLayers.Projection(c)),b.proj&&c.proj)a=Proj4js.transform(b.proj,c.proj,a);else{b=b.getCode();c=c.getCode();var d=OpenLayers.Projection.transforms;if(d[b]&&d[b][c])d[b][c](a)}return a};OpenLayers.Projection.nullTransform=function(a){return a};
-(function(){function a(a){a.x=180*a.x/d;a.y=180/Math.PI*(2*Math.atan(Math.exp(a.y/d*Math.PI))-Math.PI/2);return a}function b(a){a.x=a.x*d/180;var b=Math.log(Math.tan((90+a.y)*Math.PI/360))/Math.PI*d;a.y=Math.max(-2.003750834E7,Math.min(b,2.003750834E7));return a}function c(c,d){var e=OpenLayers.Projection.addTransform,f=OpenLayers.Projection.nullTransform,g,p,q,r,s;g=0;for(p=d.length;g<p;++g)for(q=d[g],e(c,q,b),e(q,c,a),s=g+1;s<p;++s)r=d[s],e(q,r,f),e(r,q,f)}var d=2.003750834E7,e=["EPSG:900913","EPSG:3857",
-"EPSG:102113","EPSG:102100"],f=["CRS:84","urn:ogc:def:crs:EPSG:6.6:4326","EPSG:4326"],g;for(g=e.length-1;0<=g;--g)c(e[g],f);for(g=f.length-1;0<=g;--g)c(f[g],e)})();OpenLayers.Map=OpenLayers.Class({Z_INDEX_BASE:{BaseLayer:100,Overlay:325,Feature:725,Popup:750,Control:1E3},id:null,fractionalZoom:!1,events:null,allOverlays:!1,div:null,dragging:!1,size:null,viewPortDiv:null,layerContainerOrigin:null,layerContainerDiv:null,layers:null,controls:null,popups:null,baseLayer:null,center:null,resolution:null,zoom:0,panRatio:1.5,options:null,tileSize:null,projection:"EPSG:4326",units:null,resolutions:null,maxResolution:null,minResolution:null,maxScale:null,minScale:null,
-maxExtent:null,minExtent:null,restrictedExtent:null,numZoomLevels:16,theme:null,displayProjection:null,fallThrough:!1,autoUpdateSize:!0,eventListeners:null,panTween:null,panMethod:OpenLayers.Easing.Expo.easeOut,panDuration:50,zoomTween:null,zoomMethod:OpenLayers.Easing.Quad.easeOut,zoomDuration:20,paddingForPopups:null,layerContainerOriginPx:null,minPx:null,maxPx:null,initialize:function(a,b){1===arguments.length&&"object"===typeof a&&(a=(b=a)&&b.div);this.tileSize=new OpenLayers.Size(OpenLayers.Map.TILE_WIDTH,
-OpenLayers.Map.TILE_HEIGHT);this.paddingForPopups=new OpenLayers.Bounds(15,15,15,15);this.theme=OpenLayers._getScriptLocation()+"theme/default/style.css";this.options=OpenLayers.Util.extend({},b);OpenLayers.Util.extend(this,b);OpenLayers.Util.applyDefaults(this,OpenLayers.Projection.defaults[this.projection instanceof OpenLayers.Projection?this.projection.projCode:this.projection]);!this.maxExtent||this.maxExtent instanceof OpenLayers.Bounds||(this.maxExtent=new OpenLayers.Bounds(this.maxExtent));
-!this.minExtent||this.minExtent instanceof OpenLayers.Bounds||(this.minExtent=new OpenLayers.Bounds(this.minExtent));!this.restrictedExtent||this.restrictedExtent instanceof OpenLayers.Bounds||(this.restrictedExtent=new OpenLayers.Bounds(this.restrictedExtent));!this.center||this.center instanceof OpenLayers.LonLat||(this.center=new OpenLayers.LonLat(this.center));this.layers=[];this.id=OpenLayers.Util.createUniqueID("OpenLayers.Map_");this.div=OpenLayers.Util.getElement(a);this.div||(this.div=document.createElement("div"),
-this.div.style.height="1px",this.div.style.width="1px");OpenLayers.Element.addClass(this.div,"olMap");var c=this.id+"_OpenLayers_ViewPort";this.viewPortDiv=OpenLayers.Util.createDiv(c,null,null,null,"relative",null,"hidden");this.viewPortDiv.style.width="100%";this.viewPortDiv.style.height="100%";this.viewPortDiv.className="olMapViewport";this.div.appendChild(this.viewPortDiv);this.events=new OpenLayers.Events(this,this.viewPortDiv,null,this.fallThrough,{includeXY:!0});OpenLayers.TileManager&&null!==
-this.tileManager&&(this.tileManager instanceof OpenLayers.TileManager||(this.tileManager=new OpenLayers.TileManager(this.tileManager)),this.tileManager.addMap(this));c=this.id+"_OpenLayers_Container";this.layerContainerDiv=OpenLayers.Util.createDiv(c);this.layerContainerDiv.style.zIndex=this.Z_INDEX_BASE.Popup-1;this.layerContainerOriginPx={x:0,y:0};this.applyTransform();this.viewPortDiv.appendChild(this.layerContainerDiv);this.updateSize();if(this.eventListeners instanceof Object)this.events.on(this.eventListeners);
-!0===this.autoUpdateSize&&(this.updateSizeDestroy=OpenLayers.Function.bind(this.updateSize,this),OpenLayers.Event.observe(window,"resize",this.updateSizeDestroy));if(this.theme){for(var c=!0,d=document.getElementsByTagName("link"),e=0,f=d.length;e<f;++e)if(OpenLayers.Util.isEquivalentUrl(d.item(e).href,this.theme)){c=!1;break}c&&(c=document.createElement("link"),c.setAttribute("rel","stylesheet"),c.setAttribute("type","text/css"),c.setAttribute("href",this.theme),document.getElementsByTagName("head")[0].appendChild(c))}null==
-this.controls&&(this.controls=[],null!=OpenLayers.Control&&(OpenLayers.Control.Navigation?this.controls.push(new OpenLayers.Control.Navigation):OpenLayers.Control.TouchNavigation&&this.controls.push(new OpenLayers.Control.TouchNavigation),OpenLayers.Control.Zoom?this.controls.push(new OpenLayers.Control.Zoom):OpenLayers.Control.PanZoom&&this.controls.push(new OpenLayers.Control.PanZoom),OpenLayers.Control.ArgParser&&this.controls.push(new OpenLayers.Control.ArgParser),OpenLayers.Control.Attribution&&
-this.controls.push(new OpenLayers.Control.Attribution)));e=0;for(f=this.controls.length;e<f;e++)this.addControlToMap(this.controls[e]);this.popups=[];this.unloadDestroy=OpenLayers.Function.bind(this.destroy,this);OpenLayers.Event.observe(window,"unload",this.unloadDestroy);b&&b.layers&&(delete this.center,delete this.zoom,this.addLayers(b.layers),b.center&&!this.getCenter()&&this.setCenter(b.center,b.zoom));this.panMethod&&(this.panTween=new OpenLayers.Tween(this.panMethod));this.zoomMethod&&this.applyTransform.transform&&
-(this.zoomTween=new OpenLayers.Tween(this.zoomMethod))},getViewport:function(){return this.viewPortDiv},render:function(a){this.div=OpenLayers.Util.getElement(a);OpenLayers.Element.addClass(this.div,"olMap");this.viewPortDiv.parentNode.removeChild(this.viewPortDiv);this.div.appendChild(this.viewPortDiv);this.updateSize()},unloadDestroy:null,updateSizeDestroy:null,destroy:function(){if(!this.unloadDestroy)return!1;this.panTween&&(this.panTween.stop(),this.panTween=null);this.zoomTween&&(this.zoomTween.stop(),
-this.zoomTween=null);OpenLayers.Event.stopObserving(window,"unload",this.unloadDestroy);this.unloadDestroy=null;this.updateSizeDestroy&&OpenLayers.Event.stopObserving(window,"resize",this.updateSizeDestroy);this.paddingForPopups=null;if(null!=this.controls){for(var a=this.controls.length-1;0<=a;--a)this.controls[a].destroy();this.controls=null}if(null!=this.layers){for(a=this.layers.length-1;0<=a;--a)this.layers[a].destroy(!1);this.layers=null}this.viewPortDiv&&this.viewPortDiv.parentNode&&this.viewPortDiv.parentNode.removeChild(this.viewPortDiv);
-this.viewPortDiv=null;this.tileManager&&(this.tileManager.removeMap(this),this.tileManager=null);this.eventListeners&&(this.events.un(this.eventListeners),this.eventListeners=null);this.events.destroy();this.options=this.events=null},setOptions:function(a){var b=this.minPx&&a.restrictedExtent!=this.restrictedExtent;OpenLayers.Util.extend(this,a);b&&this.moveTo(this.getCachedCenter(),this.zoom,{forceZoomChange:!0})},getTileSize:function(){return this.tileSize},getBy:function(a,b,c){var d="function"==
-typeof c.test;return OpenLayers.Array.filter(this[a],function(a){return a[b]==c||d&&c.test(a[b])})},getLayersBy:function(a,b){return this.getBy("layers",a,b)},getLayersByName:function(a){return this.getLayersBy("name",a)},getLayersByClass:function(a){return this.getLayersBy("CLASS_NAME",a)},getControlsBy:function(a,b){return this.getBy("controls",a,b)},getControlsByClass:function(a){return this.getControlsBy("CLASS_NAME",a)},getLayer:function(a){for(var b=null,c=0,d=this.layers.length;c<d;c++){var e=
-this.layers[c];if(e.id==a){b=e;break}}return b},setLayerZIndex:function(a,b){a.setZIndex(this.Z_INDEX_BASE[a.isBaseLayer?"BaseLayer":"Overlay"]+5*b)},resetLayersZIndex:function(){for(var a=0,b=this.layers.length;a<b;a++)this.setLayerZIndex(this.layers[a],a)},addLayer:function(a){for(var b=0,c=this.layers.length;b<c;b++)if(this.layers[b]==a)return!1;if(!1===this.events.triggerEvent("preaddlayer",{layer:a}))return!1;this.allOverlays&&(a.isBaseLayer=!1);a.div.className="olLayerDiv";a.div.style.overflow=
-"";this.setLayerZIndex(a,this.layers.length);a.isFixed?this.viewPortDiv.appendChild(a.div):this.layerContainerDiv.appendChild(a.div);this.layers.push(a);a.setMap(this);a.isBaseLayer||this.allOverlays&&!this.baseLayer?null==this.baseLayer?this.setBaseLayer(a):a.setVisibility(!1):a.redraw();this.events.triggerEvent("addlayer",{layer:a});a.events.triggerEvent("added",{map:this,layer:a});a.afterAdd();return!0},addLayers:function(a){for(var b=0,c=a.length;b<c;b++)this.addLayer(a[b])},removeLayer:function(a,
-b){if(!1!==this.events.triggerEvent("preremovelayer",{layer:a})){null==b&&(b=!0);a.isFixed?this.viewPortDiv.removeChild(a.div):this.layerContainerDiv.removeChild(a.div);OpenLayers.Util.removeItem(this.layers,a);a.removeMap(this);a.map=null;if(this.baseLayer==a&&(this.baseLayer=null,b))for(var c=0,d=this.layers.length;c<d;c++){var e=this.layers[c];if(e.isBaseLayer||this.allOverlays){this.setBaseLayer(e);break}}this.resetLayersZIndex();this.events.triggerEvent("removelayer",{layer:a});a.events.triggerEvent("removed",
-{map:this,layer:a})}},getNumLayers:function(){return this.layers.length},getLayerIndex:function(a){return OpenLayers.Util.indexOf(this.layers,a)},setLayerIndex:function(a,b){var c=this.getLayerIndex(a);0>b?b=0:b>this.layers.length&&(b=this.layers.length);if(c!=b){this.layers.splice(c,1);this.layers.splice(b,0,a);for(var c=0,d=this.layers.length;c<d;c++)this.setLayerZIndex(this.layers[c],c);this.events.triggerEvent("changelayer",{layer:a,property:"order"});this.allOverlays&&(0===b?this.setBaseLayer(a):
-this.baseLayer!==this.layers[0]&&this.setBaseLayer(this.layers[0]))}},raiseLayer:function(a,b){var c=this.getLayerIndex(a)+b;this.setLayerIndex(a,c)},setBaseLayer:function(a){if(a!=this.baseLayer&&-1!=OpenLayers.Util.indexOf(this.layers,a)){var b=this.getCachedCenter(),c=OpenLayers.Util.getResolutionFromScale(this.getScale(),a.units);null==this.baseLayer||this.allOverlays||this.baseLayer.setVisibility(!1);this.baseLayer=a;if(!this.allOverlays||this.baseLayer.visibility)this.baseLayer.setVisibility(!0),
-!1===this.baseLayer.inRange&&this.baseLayer.redraw();null!=b&&(a=this.getZoomForResolution(c||this.resolution,!0),this.setCenter(b,a,!1,!0));this.events.triggerEvent("changebaselayer",{layer:this.baseLayer})}},addControl:function(a,b){this.controls.push(a);this.addControlToMap(a,b)},addControls:function(a,b){for(var c=1===arguments.length?[]:b,d=0,e=a.length;d<e;d++)this.addControl(a[d],c[d]?c[d]:null)},addControlToMap:function(a,b){a.outsideViewport=null!=a.div;this.displayProjection&&!a.displayProjection&&
-(a.displayProjection=this.displayProjection);a.setMap(this);var c=a.draw(b);c&&!a.outsideViewport&&(c.style.zIndex=this.Z_INDEX_BASE.Control+this.controls.length,this.viewPortDiv.appendChild(c));a.autoActivate&&a.activate()},getControl:function(a){for(var b=null,c=0,d=this.controls.length;c<d;c++){var e=this.controls[c];if(e.id==a){b=e;break}}return b},removeControl:function(a){a&&a==this.getControl(a.id)&&(a.div&&a.div.parentNode==this.viewPortDiv&&this.viewPortDiv.removeChild(a.div),OpenLayers.Util.removeItem(this.controls,
-a))},addPopup:function(a,b){if(b)for(var c=this.popups.length-1;0<=c;--c)this.removePopup(this.popups[c]);a.map=this;this.popups.push(a);if(c=a.draw())c.style.zIndex=this.Z_INDEX_BASE.Popup+this.popups.length,this.layerContainerDiv.appendChild(c)},removePopup:function(a){OpenLayers.Util.removeItem(this.popups,a);if(a.div)try{this.layerContainerDiv.removeChild(a.div)}catch(b){}a.map=null},getSize:function(){var a=null;null!=this.size&&(a=this.size.clone());return a},updateSize:function(){var a=this.getCurrentSize();
-if(a&&!isNaN(a.h)&&!isNaN(a.w)){this.events.clearMouseCache();var b=this.getSize();null==b&&(this.size=b=a);if(!a.equals(b)){this.size=a;a=0;for(b=this.layers.length;a<b;a++)this.layers[a].onMapResize();a=this.getCachedCenter();null!=this.baseLayer&&null!=a&&(b=this.getZoom(),this.zoom=null,this.setCenter(a,b))}}this.events.triggerEvent("updatesize")},getCurrentSize:function(){var a=new OpenLayers.Size(this.div.clientWidth,this.div.clientHeight);if(0==a.w&&0==a.h||isNaN(a.w)&&isNaN(a.h))a.w=this.div.offsetWidth,
-a.h=this.div.offsetHeight;if(0==a.w&&0==a.h||isNaN(a.w)&&isNaN(a.h))a.w=parseInt(this.div.style.width),a.h=parseInt(this.div.style.height);return a},calculateBounds:function(a,b){var c=null;null==a&&(a=this.getCachedCenter());null==b&&(b=this.getResolution());if(null!=a&&null!=b)var c=this.size.w*b/2,d=this.size.h*b/2,c=new OpenLayers.Bounds(a.lon-c,a.lat-d,a.lon+c,a.lat+d);return c},getCenter:function(){var a=null,b=this.getCachedCenter();b&&(a=b.clone());return a},getCachedCenter:function(){!this.center&&
-this.size&&(this.center=this.getLonLatFromViewPortPx({x:this.size.w/2,y:this.size.h/2}));return this.center},getZoom:function(){return this.zoom},pan:function(a,b,c){c=OpenLayers.Util.applyDefaults(c,{animate:!0,dragging:!1});if(c.dragging)0==a&&0==b||this.moveByPx(a,b);else{var d=this.getViewPortPxFromLonLat(this.getCachedCenter());a=d.add(a,b);if(this.dragging||!a.equals(d))d=this.getLonLatFromViewPortPx(a),c.animate?this.panTo(d):(this.moveTo(d),this.dragging&&(this.dragging=!1,this.events.triggerEvent("moveend")))}},
-panTo:function(a){if(this.panTween&&this.getExtent().scale(this.panRatio).containsLonLat(a)){var b=this.getCachedCenter();if(!a.equals(b)){var b=this.getPixelFromLonLat(b),c=this.getPixelFromLonLat(a),d=0,e=0;this.panTween.start({x:0,y:0},{x:c.x-b.x,y:c.y-b.y},this.panDuration,{callbacks:{eachStep:OpenLayers.Function.bind(function(a){this.moveByPx(a.x-d,a.y-e);d=Math.round(a.x);e=Math.round(a.y)},this),done:OpenLayers.Function.bind(function(b){this.moveTo(a);this.dragging=!1;this.events.triggerEvent("moveend")},
-this)}})}}else this.setCenter(a)},setCenter:function(a,b,c,d){this.panTween&&this.panTween.stop();this.zoomTween&&this.zoomTween.stop();this.moveTo(a,b,{dragging:c,forceZoomChange:d})},moveByPx:function(a,b){var c=this.size.w/2,d=this.size.h/2,e=c+a,f=d+b,g=this.baseLayer.wrapDateLine,h=0,k=0;this.restrictedExtent&&(h=c,k=d,g=!1);a=g||e<=this.maxPx.x-h&&e>=this.minPx.x+h?Math.round(a):0;b=f<=this.maxPx.y-k&&f>=this.minPx.y+k?Math.round(b):0;if(a||b){this.dragging||(this.dragging=!0,this.events.triggerEvent("movestart"));
-this.center=null;a&&(this.layerContainerOriginPx.x-=a,this.minPx.x-=a,this.maxPx.x-=a);b&&(this.layerContainerOriginPx.y-=b,this.minPx.y-=b,this.maxPx.y-=b);this.applyTransform();d=0;for(e=this.layers.length;d<e;++d)c=this.layers[d],c.visibility&&(c===this.baseLayer||c.inRange)&&(c.moveByPx(a,b),c.events.triggerEvent("move"));this.events.triggerEvent("move")}},adjustZoom:function(a){if(this.baseLayer&&this.baseLayer.wrapDateLine){var b=this.baseLayer.resolutions,c=this.getMaxExtent().getWidth()/this.size.w;
-if(this.getResolutionForZoom(a)>c)if(this.fractionalZoom)a=this.getZoomForResolution(c);else for(var d=a|0,e=b.length;d<e;++d)if(b[d]<=c){a=d;break}}return a},getMinZoom:function(){return this.adjustZoom(0)},moveTo:function(a,b,c){null==a||a instanceof OpenLayers.LonLat||(a=new OpenLayers.LonLat(a));c||(c={});null!=b&&(b=parseFloat(b),this.fractionalZoom||(b=Math.round(b)));var d=b;b=this.adjustZoom(b);b!==d&&(a=this.getCenter());var d=c.dragging||this.dragging,e=c.forceZoomChange;this.getCachedCenter()||
-this.isValidLonLat(a)||(a=this.maxExtent.getCenterLonLat(),this.center=a.clone());if(null!=this.restrictedExtent){null==a&&(a=this.center);null==b&&(b=this.getZoom());var f=this.getResolutionForZoom(b),f=this.calculateBounds(a,f);if(!this.restrictedExtent.containsBounds(f)){var g=this.restrictedExtent.getCenterLonLat();f.getWidth()>this.restrictedExtent.getWidth()?a=new OpenLayers.LonLat(g.lon,a.lat):f.left<this.restrictedExtent.left?a=a.add(this.restrictedExtent.left-f.left,0):f.right>this.restrictedExtent.right&&
-(a=a.add(this.restrictedExtent.right-f.right,0));f.getHeight()>this.restrictedExtent.getHeight()?a=new OpenLayers.LonLat(a.lon,g.lat):f.bottom<this.restrictedExtent.bottom?a=a.add(0,this.restrictedExtent.bottom-f.bottom):f.top>this.restrictedExtent.top&&(a=a.add(0,this.restrictedExtent.top-f.top))}}e=e||this.isValidZoomLevel(b)&&b!=this.getZoom();f=this.isValidLonLat(a)&&!a.equals(this.center);if(e||f||d){d||this.events.triggerEvent("movestart",{zoomChanged:e});f&&(!e&&this.center&&this.centerLayerContainer(a),
-this.center=a.clone());a=e?this.getResolutionForZoom(b):this.getResolution();if(e||null==this.layerContainerOrigin){this.layerContainerOrigin=this.getCachedCenter();this.layerContainerOriginPx.x=0;this.layerContainerOriginPx.y=0;this.applyTransform();var f=this.getMaxExtent({restricted:!0}),h=f.getCenterLonLat(),g=this.center.lon-h.lon,h=h.lat-this.center.lat,k=Math.round(f.getWidth()/a),l=Math.round(f.getHeight()/a);this.minPx={x:(this.size.w-k)/2-g/a,y:(this.size.h-l)/2-h/a};this.maxPx={x:this.minPx.x+
-Math.round(f.getWidth()/a),y:this.minPx.y+Math.round(f.getHeight()/a)}}e&&(this.zoom=b,this.resolution=a);a=this.getExtent();this.baseLayer.visibility&&(this.baseLayer.moveTo(a,e,c.dragging),c.dragging||this.baseLayer.events.triggerEvent("moveend",{zoomChanged:e}));a=this.baseLayer.getExtent();for(b=this.layers.length-1;0<=b;--b)f=this.layers[b],f===this.baseLayer||f.isBaseLayer||(g=f.calculateInRange(),f.inRange!=g&&((f.inRange=g)||f.display(!1),this.events.triggerEvent("changelayer",{layer:f,property:"visibility"})),
-g&&f.visibility&&(f.moveTo(a,e,c.dragging),c.dragging||f.events.triggerEvent("moveend",{zoomChanged:e})));this.events.triggerEvent("move");d||this.events.triggerEvent("moveend");if(e){b=0;for(c=this.popups.length;b<c;b++)this.popups[b].updatePosition();this.events.triggerEvent("zoomend")}}},centerLayerContainer:function(a){var b=this.getViewPortPxFromLonLat(this.layerContainerOrigin),c=this.getViewPortPxFromLonLat(a);if(null!=b&&null!=c){var d=this.layerContainerOriginPx.x;a=this.layerContainerOriginPx.y;
-var e=Math.round(b.x-c.x),b=Math.round(b.y-c.y);this.applyTransform(this.layerContainerOriginPx.x=e,this.layerContainerOriginPx.y=b);d-=e;a-=b;this.minPx.x-=d;this.maxPx.x-=d;this.minPx.y-=a;this.maxPx.y-=a}},isValidZoomLevel:function(a){return null!=a&&0<=a&&a<this.getNumZoomLevels()},isValidLonLat:function(a){var b=!1;null!=a&&(b=this.getMaxExtent(),b=b.containsLonLat(a,{worldBounds:this.baseLayer.wrapDateLine&&b}));return b},getProjection:function(){var a=this.getProjectionObject();return a?a.getCode():
-null},getProjectionObject:function(){var a=null;null!=this.baseLayer&&(a=this.baseLayer.projection);return a},getMaxResolution:function(){var a=null;null!=this.baseLayer&&(a=this.baseLayer.maxResolution);return a},getMaxExtent:function(a){var b=null;a&&a.restricted&&this.restrictedExtent?b=this.restrictedExtent:null!=this.baseLayer&&(b=this.baseLayer.maxExtent);return b},getNumZoomLevels:function(){var a=null;null!=this.baseLayer&&(a=this.baseLayer.numZoomLevels);return a},getExtent:function(){var a=
-null;null!=this.baseLayer&&(a=this.baseLayer.getExtent());return a},getResolution:function(){var a=null;null!=this.baseLayer?a=this.baseLayer.getResolution():!0===this.allOverlays&&0<this.layers.length&&(a=this.layers[0].getResolution());return a},getUnits:function(){var a=null;null!=this.baseLayer&&(a=this.baseLayer.units);return a},getScale:function(){var a=null;null!=this.baseLayer&&(a=this.getResolution(),a=OpenLayers.Util.getScaleFromResolution(a,this.baseLayer.units));return a},getZoomForExtent:function(a,
-b){var c=null;null!=this.baseLayer&&(c=this.baseLayer.getZoomForExtent(a,b));return c},getResolutionForZoom:function(a){var b=null;this.baseLayer&&(b=this.baseLayer.getResolutionForZoom(a));return b},getZoomForResolution:function(a,b){var c=null;null!=this.baseLayer&&(c=this.baseLayer.getZoomForResolution(a,b));return c},zoomTo:function(a,b){var c=this;if(c.isValidZoomLevel(a))if(c.baseLayer.wrapDateLine&&(a=c.adjustZoom(a)),c.zoomTween){var d=c.getResolution(),e=c.getResolutionForZoom(a),f={scale:1},
-d={scale:d/e};c.zoomTween.playing&&c.zoomTween.duration<3*c.zoomDuration?c.zoomTween.finish={scale:c.zoomTween.finish.scale*d.scale}:(b||(e=c.getSize(),b={x:e.w/2,y:e.h/2}),c.zoomTween.start(f,d,c.zoomDuration,{minFrameRate:50,callbacks:{eachStep:function(a){var d=c.layerContainerOriginPx;a=a.scale;c.applyTransform(d.x+((a-1)*(d.x-b.x)|0),d.y+((a-1)*(d.y-b.y)|0),a)},done:function(a){c.applyTransform();a=c.getResolution()/a.scale;var d=c.getZoomForResolution(a,!0);c.moveTo(c.getZoomTargetCenter(b,
-a),d,!0)}}}))}else f=b?c.getZoomTargetCenter(b,c.getResolutionForZoom(a)):null,c.setCenter(f,a)},zoomIn:function(){this.zoomTo(this.getZoom()+1)},zoomOut:function(){this.zoomTo(this.getZoom()-1)},zoomToExtent:function(a,b){a instanceof OpenLayers.Bounds||(a=new OpenLayers.Bounds(a));var c=a.getCenterLonLat();if(this.baseLayer.wrapDateLine){c=this.getMaxExtent();for(a=a.clone();a.right<a.left;)a.right+=c.getWidth();c=a.getCenterLonLat().wrapDateLine(c)}this.setCenter(c,this.getZoomForExtent(a,b))},
-zoomToMaxExtent:function(a){a=this.getMaxExtent({restricted:a?a.restricted:!0});this.zoomToExtent(a)},zoomToScale:function(a,b){var c=OpenLayers.Util.getResolutionFromScale(a,this.baseLayer.units),d=this.size.w*c/2,c=this.size.h*c/2,e=this.getCachedCenter(),d=new OpenLayers.Bounds(e.lon-d,e.lat-c,e.lon+d,e.lat+c);this.zoomToExtent(d,b)},getLonLatFromViewPortPx:function(a){var b=null;null!=this.baseLayer&&(b=this.baseLayer.getLonLatFromViewPortPx(a));return b},getViewPortPxFromLonLat:function(a){var b=
-null;null!=this.baseLayer&&(b=this.baseLayer.getViewPortPxFromLonLat(a));return b},getZoomTargetCenter:function(a,b){var c=null,d=this.getSize(),e=d.w/2-a.x,d=a.y-d.h/2,f=this.getLonLatFromPixel(a);f&&(c=new OpenLayers.LonLat(f.lon+e*b,f.lat+d*b));return c},getLonLatFromPixel:function(a){return this.getLonLatFromViewPortPx(a)},getPixelFromLonLat:function(a){a=this.getViewPortPxFromLonLat(a);a.x=Math.round(a.x);a.y=Math.round(a.y);return a},getGeodesicPixelSize:function(a){var b=a?this.getLonLatFromPixel(a):
-this.getCachedCenter()||new OpenLayers.LonLat(0,0),c=this.getResolution();a=b.add(-c/2,0);var d=b.add(c/2,0),e=b.add(0,-c/2),b=b.add(0,c/2),c=new OpenLayers.Projection("EPSG:4326"),f=this.getProjectionObject()||c;f.equals(c)||(a.transform(f,c),d.transform(f,c),e.transform(f,c),b.transform(f,c));return new OpenLayers.Size(OpenLayers.Util.distVincenty(a,d),OpenLayers.Util.distVincenty(e,b))},getViewPortPxFromLayerPx:function(a){var b=null;null!=a&&(b=a.add(this.layerContainerOriginPx.x,this.layerContainerOriginPx.y));
-return b},getLayerPxFromViewPortPx:function(a){var b=null;null!=a&&(b=a.add(-this.layerContainerOriginPx.x,-this.layerContainerOriginPx.y),isNaN(b.x)||isNaN(b.y))&&(b=null);return b},getLonLatFromLayerPx:function(a){a=this.getViewPortPxFromLayerPx(a);return this.getLonLatFromViewPortPx(a)},getLayerPxFromLonLat:function(a){a=this.getPixelFromLonLat(a);return this.getLayerPxFromViewPortPx(a)},applyTransform:function(a,b,c){c=c||1;var d=this.layerContainerOriginPx,e=1!==c;a=a||d.x;b=b||d.y;var f=this.layerContainerDiv.style,
-g=this.applyTransform.transform,h=this.applyTransform.template;if(void 0===g&&(g=OpenLayers.Util.vendorPrefix.style("transform"),this.applyTransform.transform=g)){var k=OpenLayers.Element.getStyle(this.viewPortDiv,OpenLayers.Util.vendorPrefix.css("transform"));k&&"none"===k||(h=["translate3d(",",0) ","scale3d(",",1)"],f[g]=[h[0],"0,0",h[1]].join(""));h&&~f[g].indexOf(h[0])||(h=["translate(",") ","scale(",")"]);this.applyTransform.template=h}null===g||"translate3d("!==h[0]&&!0!==e?(f.left=a+"px",f.top=
-b+"px",null!==g&&(f[g]="")):(!0===e&&"translate("===h[0]&&(a-=d.x,b-=d.y,f.left=d.x+"px",f.top=d.y+"px"),f[g]=[h[0],a,"px,",b,"px",h[1],h[2],c,",",c,h[3]].join(""))},CLASS_NAME:"OpenLayers.Map"});OpenLayers.Map.TILE_WIDTH=256;OpenLayers.Map.TILE_HEIGHT=256;OpenLayers.Handler=OpenLayers.Class({id:null,control:null,map:null,keyMask:null,active:!1,evt:null,touch:!1,initialize:function(a,b,c){OpenLayers.Util.extend(this,c);this.control=a;this.callbacks=b;(a=this.map||a.map)&&this.setMap(a);this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_")},setMap:function(a){this.map=a},checkModifiers:function(a){return null==this.keyMask?!0:((a.shiftKey?OpenLayers.Handler.MOD_SHIFT:0)|(a.ctrlKey?OpenLayers.Handler.MOD_CTRL:0)|(a.altKey?OpenLayers.Handler.MOD_ALT:
-0)|(a.metaKey?OpenLayers.Handler.MOD_META:0))==this.keyMask},activate:function(){if(this.active)return!1;for(var a=OpenLayers.Events.prototype.BROWSER_EVENTS,b=0,c=a.length;b<c;b++)this[a[b]]&&this.register(a[b],this[a[b]]);return this.active=!0},deactivate:function(){if(!this.active)return!1;for(var a=OpenLayers.Events.prototype.BROWSER_EVENTS,b=0,c=a.length;b<c;b++)this[a[b]]&&this.unregister(a[b],this[a[b]]);this.active=this.touch=!1;return!0},startTouch:function(){if(!this.touch){this.touch=!0;
-for(var a="mousedown mouseup mousemove click dblclick mouseout".split(" "),b=0,c=a.length;b<c;b++)this[a[b]]&&this.unregister(a[b],this[a[b]])}},callback:function(a,b){a&&this.callbacks[a]&&this.callbacks[a].apply(this.control,b)},register:function(a,b){this.map.events.registerPriority(a,this,b);this.map.events.registerPriority(a,this,this.setEvent)},unregister:function(a,b){this.map.events.unregister(a,this,b);this.map.events.unregister(a,this,this.setEvent)},setEvent:function(a){this.evt=a;return!0},
-destroy:function(){this.deactivate();this.control=this.map=null},CLASS_NAME:"OpenLayers.Handler"});OpenLayers.Handler.MOD_NONE=0;OpenLayers.Handler.MOD_SHIFT=1;OpenLayers.Handler.MOD_CTRL=2;OpenLayers.Handler.MOD_ALT=4;OpenLayers.Handler.MOD_META=8;OpenLayers.Handler.Click=OpenLayers.Class(OpenLayers.Handler,{delay:300,single:!0,"double":!1,pixelTolerance:0,dblclickTolerance:13,stopSingle:!1,stopDouble:!1,timerId:null,down:null,last:null,first:null,rightclickTimerId:null,touchstart:function(a){this.startTouch();this.down=this.getEventInfo(a);this.last=this.getEventInfo(a);return!0},touchmove:function(a){this.last=this.getEventInfo(a);return!0},touchend:function(a){this.down&&(a.xy=this.last.xy,a.lastTouches=this.last.touches,this.handleSingle(a),
-this.down=null);return!0},mousedown:function(a){this.down=this.getEventInfo(a);this.last=this.getEventInfo(a);return!0},mouseup:function(a){var b=!0;this.checkModifiers(a)&&(this.control.handleRightClicks&&OpenLayers.Event.isRightClick(a))&&(b=this.rightclick(a));return b},rightclick:function(a){if(this.passesTolerance(a)){if(null!=this.rightclickTimerId)return this.clearTimer(),this.callback("dblrightclick",[a]),!this.stopDouble;a=this["double"]?OpenLayers.Util.extend({},a):this.callback("rightclick",
-[a]);a=OpenLayers.Function.bind(this.delayedRightCall,this,a);this.rightclickTimerId=window.setTimeout(a,this.delay)}return!this.stopSingle},delayedRightCall:function(a){this.rightclickTimerId=null;a&&this.callback("rightclick",[a])},click:function(a){this.last||(this.last=this.getEventInfo(a));this.handleSingle(a);return!this.stopSingle},dblclick:function(a){this.handleDouble(a);return!this.stopDouble},handleDouble:function(a){this.passesDblclickTolerance(a)&&(this["double"]&&this.callback("dblclick",
-[a]),this.clearTimer())},handleSingle:function(a){this.passesTolerance(a)&&(null!=this.timerId?(this.last.touches&&1===this.last.touches.length&&(this["double"]&&OpenLayers.Event.preventDefault(a),this.handleDouble(a)),this.last.touches&&2===this.last.touches.length||this.clearTimer()):(this.first=this.getEventInfo(a),a=this.single?OpenLayers.Util.extend({},a):null,this.queuePotentialClick(a)))},queuePotentialClick:function(a){this.timerId=window.setTimeout(OpenLayers.Function.bind(this.delayedCall,
-this,a),this.delay)},passesTolerance:function(a){var b=!0;if(null!=this.pixelTolerance&&this.down&&this.down.xy&&(b=this.pixelTolerance>=this.down.xy.distanceTo(a.xy))&&this.touch&&this.down.touches.length===this.last.touches.length){a=0;for(var c=this.down.touches.length;a<c;++a)if(this.getTouchDistance(this.down.touches[a],this.last.touches[a])>this.pixelTolerance){b=!1;break}}return b},getTouchDistance:function(a,b){return Math.sqrt(Math.pow(a.clientX-b.clientX,2)+Math.pow(a.clientY-b.clientY,
-2))},passesDblclickTolerance:function(a){a=!0;this.down&&this.first&&(a=this.down.xy.distanceTo(this.first.xy)<=this.dblclickTolerance);return a},clearTimer:function(){null!=this.timerId&&(window.clearTimeout(this.timerId),this.timerId=null);null!=this.rightclickTimerId&&(window.clearTimeout(this.rightclickTimerId),this.rightclickTimerId=null)},delayedCall:function(a){this.timerId=null;a&&this.callback("click",[a])},getEventInfo:function(a){var b;if(a.touches){var c=a.touches.length;b=Array(c);for(var d,
-e=0;e<c;e++)d=a.touches[e],b[e]={clientX:d.olClientX,clientY:d.olClientY}}return{xy:a.xy,touches:b}},deactivate:function(){var a=!1;OpenLayers.Handler.prototype.deactivate.apply(this,arguments)&&(this.clearTimer(),this.last=this.first=this.down=null,a=!0);return a},CLASS_NAME:"OpenLayers.Handler.Click"});OpenLayers.Handler.Drag=OpenLayers.Class(OpenLayers.Handler,{started:!1,stopDown:!0,dragging:!1,last:null,start:null,lastMoveEvt:null,oldOnselectstart:null,interval:0,timeoutId:null,documentDrag:!1,documentEvents:null,initialize:function(a,b,c){OpenLayers.Handler.prototype.initialize.apply(this,arguments);if(!0===this.documentDrag){var d=this;this._docMove=function(a){d.mousemove({xy:{x:a.clientX,y:a.clientY},element:document})};this._docUp=function(a){d.mouseup({xy:{x:a.clientX,y:a.clientY}})}}},
-dragstart:function(a){var b=!0;this.dragging=!1;this.checkModifiers(a)&&(OpenLayers.Event.isLeftClick(a)||OpenLayers.Event.isSingleTouch(a))?(this.started=!0,this.last=this.start=a.xy,OpenLayers.Element.addClass(this.map.viewPortDiv,"olDragDown"),this.down(a),this.callback("down",[a.xy]),OpenLayers.Event.preventDefault(a),this.oldOnselectstart||(this.oldOnselectstart=document.onselectstart?document.onselectstart:OpenLayers.Function.True),document.onselectstart=OpenLayers.Function.False,b=!this.stopDown):
-(this.started=!1,this.last=this.start=null);return b},dragmove:function(a){this.lastMoveEvt=a;!this.started||(this.timeoutId||a.xy.x==this.last.x&&a.xy.y==this.last.y)||(!0===this.documentDrag&&this.documentEvents&&(a.element===document?(this.adjustXY(a),this.setEvent(a)):this.removeDocumentEvents()),0<this.interval&&(this.timeoutId=setTimeout(OpenLayers.Function.bind(this.removeTimeout,this),this.interval)),this.dragging=!0,this.move(a),this.callback("move",[a.xy]),this.oldOnselectstart||(this.oldOnselectstart=
-document.onselectstart,document.onselectstart=OpenLayers.Function.False),this.last=a.xy);return!0},dragend:function(a){if(this.started){!0===this.documentDrag&&this.documentEvents&&(this.adjustXY(a),this.removeDocumentEvents());var b=this.start!=this.last;this.dragging=this.started=!1;OpenLayers.Element.removeClass(this.map.viewPortDiv,"olDragDown");this.up(a);this.callback("up",[a.xy]);b&&this.callback("done",[a.xy]);document.onselectstart=this.oldOnselectstart}return!0},down:function(a){},move:function(a){},
-up:function(a){},out:function(a){},mousedown:function(a){return this.dragstart(a)},touchstart:function(a){this.startTouch();return this.dragstart(a)},mousemove:function(a){return this.dragmove(a)},touchmove:function(a){return this.dragmove(a)},removeTimeout:function(){this.timeoutId=null;this.dragging&&this.mousemove(this.lastMoveEvt)},mouseup:function(a){return this.dragend(a)},touchend:function(a){a.xy=this.last;return this.dragend(a)},mouseout:function(a){if(this.started&&OpenLayers.Util.mouseLeft(a,
-this.map.viewPortDiv))if(!0===this.documentDrag)this.addDocumentEvents();else{var b=this.start!=this.last;this.dragging=this.started=!1;OpenLayers.Element.removeClass(this.map.viewPortDiv,"olDragDown");this.out(a);this.callback("out",[]);b&&this.callback("done",[a.xy]);document.onselectstart&&(document.onselectstart=this.oldOnselectstart)}return!0},click:function(a){return this.start==this.last},activate:function(){var a=!1;OpenLayers.Handler.prototype.activate.apply(this,arguments)&&(this.dragging=
-!1,a=!0);return a},deactivate:function(){var a=!1;OpenLayers.Handler.prototype.deactivate.apply(this,arguments)&&(this.dragging=this.started=!1,this.last=this.start=null,a=!0,OpenLayers.Element.removeClass(this.map.viewPortDiv,"olDragDown"));return a},adjustXY:function(a){var b=OpenLayers.Util.pagePosition(this.map.viewPortDiv);a.xy.x-=b[0];a.xy.y-=b[1]},addDocumentEvents:function(){OpenLayers.Element.addClass(document.body,"olDragDown");this.documentEvents=!0;OpenLayers.Event.observe(document,"mousemove",
-this._docMove);OpenLayers.Event.observe(document,"mouseup",this._docUp)},removeDocumentEvents:function(){OpenLayers.Element.removeClass(document.body,"olDragDown");this.documentEvents=!1;OpenLayers.Event.stopObserving(document,"mousemove",this._docMove);OpenLayers.Event.stopObserving(document,"mouseup",this._docUp)},CLASS_NAME:"OpenLayers.Handler.Drag"});OpenLayers.Control.OverviewMap=OpenLayers.Class(OpenLayers.Control,{element:null,ovmap:null,size:{w:180,h:90},layers:null,minRectSize:15,minRectDisplayClass:"RectReplacement",minRatio:8,maxRatio:32,mapOptions:null,autoPan:!1,handlers:null,resolutionFactor:1,maximized:!1,maximizeTitle:"",minimizeTitle:"",initialize:function(a){this.layers=[];this.handlers={};OpenLayers.Control.prototype.initialize.apply(this,[a])},destroy:function(){this.mapDiv&&(this.handlers.click&&this.handlers.click.destroy(),
-this.handlers.drag&&this.handlers.drag.destroy(),this.ovmap&&this.ovmap.viewPortDiv.removeChild(this.extentRectangle),this.extentRectangle=null,this.rectEvents&&(this.rectEvents.destroy(),this.rectEvents=null),this.ovmap&&(this.ovmap.destroy(),this.ovmap=null),this.element.removeChild(this.mapDiv),this.mapDiv=null,this.div.removeChild(this.element),this.element=null,this.maximizeDiv&&(this.div.removeChild(this.maximizeDiv),this.maximizeDiv=null),this.minimizeDiv&&(this.div.removeChild(this.minimizeDiv),
-this.minimizeDiv=null),this.map.events.un({buttonclick:this.onButtonClick,moveend:this.update,changebaselayer:this.baseLayerDraw,scope:this}),OpenLayers.Control.prototype.destroy.apply(this,arguments))},draw:function(){OpenLayers.Control.prototype.draw.apply(this,arguments);if(0===this.layers.length)if(this.map.baseLayer)this.layers=[this.map.baseLayer.clone()];else return this.map.events.register("changebaselayer",this,this.baseLayerDraw),this.div;this.element=document.createElement("div");this.element.className=
-this.displayClass+"Element";this.element.style.display="none";this.mapDiv=document.createElement("div");this.mapDiv.style.width=this.size.w+"px";this.mapDiv.style.height=this.size.h+"px";this.mapDiv.style.position="relative";this.mapDiv.style.overflow="hidden";this.mapDiv.id=OpenLayers.Util.createUniqueID("overviewMap");this.extentRectangle=document.createElement("div");this.extentRectangle.style.position="absolute";this.extentRectangle.style.zIndex=1E3;this.extentRectangle.className=this.displayClass+
-"ExtentRectangle";this.element.appendChild(this.mapDiv);this.div.appendChild(this.element);if(this.outsideViewport)this.element.style.display="";else{this.div.className+=" "+this.displayClass+"Container";var a=OpenLayers.Util.getImageLocation("layer-switcher-maximize.png");this.maximizeDiv=OpenLayers.Util.createAlphaImageDiv(this.displayClass+"MaximizeButton",null,null,a,"absolute");this.maximizeDiv.style.display="none";this.maximizeDiv.className=this.displayClass+"MaximizeButton olButton";this.maximizeTitle&&
-(this.maximizeDiv.title=this.maximizeTitle);this.div.appendChild(this.maximizeDiv);a=OpenLayers.Util.getImageLocation("layer-switcher-minimize.png");this.minimizeDiv=OpenLayers.Util.createAlphaImageDiv("OpenLayers_Control_minimizeDiv",null,null,a,"absolute");this.minimizeDiv.style.display="none";this.minimizeDiv.className=this.displayClass+"MinimizeButton olButton";this.minimizeTitle&&(this.minimizeDiv.title=this.minimizeTitle);this.div.appendChild(this.minimizeDiv);this.minimizeControl()}this.map.getExtent()&&
-this.update();this.map.events.on({buttonclick:this.onButtonClick,moveend:this.update,scope:this});this.maximized&&this.maximizeControl();return this.div},baseLayerDraw:function(){this.draw();this.map.events.unregister("changebaselayer",this,this.baseLayerDraw)},rectDrag:function(a){var b=this.handlers.drag.last.x-a.x,c=this.handlers.drag.last.y-a.y;if(0!=b||0!=c){var d=this.rectPxBounds.top,e=this.rectPxBounds.left;a=Math.abs(this.rectPxBounds.getHeight());var f=this.rectPxBounds.getWidth(),c=Math.max(0,
-d-c),c=Math.min(c,this.ovmap.size.h-this.hComp-a),b=Math.max(0,e-b),b=Math.min(b,this.ovmap.size.w-this.wComp-f);this.setRectPxBounds(new OpenLayers.Bounds(b,c+a,b+f,c))}},mapDivClick:function(a){var b=this.rectPxBounds.getCenterPixel(),c=a.xy.x-b.x,d=a.xy.y-b.y,e=this.rectPxBounds.top,f=this.rectPxBounds.left;a=Math.abs(this.rectPxBounds.getHeight());b=this.rectPxBounds.getWidth();d=Math.max(0,e+d);d=Math.min(d,this.ovmap.size.h-a);c=Math.max(0,f+c);c=Math.min(c,this.ovmap.size.w-b);this.setRectPxBounds(new OpenLayers.Bounds(c,
-d+a,c+b,d));this.updateMapToRect()},onButtonClick:function(a){a.buttonElement===this.minimizeDiv?this.minimizeControl():a.buttonElement===this.maximizeDiv&&this.maximizeControl()},maximizeControl:function(a){this.element.style.display="";this.showToggle(!1);null!=a&&OpenLayers.Event.stop(a)},minimizeControl:function(a){this.element.style.display="none";this.showToggle(!0);null!=a&&OpenLayers.Event.stop(a)},showToggle:function(a){this.maximizeDiv&&(this.maximizeDiv.style.display=a?"":"none");this.minimizeDiv&&
-(this.minimizeDiv.style.display=a?"none":"")},update:function(){null==this.ovmap&&this.createMap();!this.autoPan&&this.isSuitableOverview()||this.updateOverview();this.updateRectToMap()},isSuitableOverview:function(){var a=this.map.getExtent(),b=this.map.getMaxExtent(),a=new OpenLayers.Bounds(Math.max(a.left,b.left),Math.max(a.bottom,b.bottom),Math.min(a.right,b.right),Math.min(a.top,b.top));this.ovmap.getProjection()!=this.map.getProjection()&&(a=a.transform(this.map.getProjectionObject(),this.ovmap.getProjectionObject()));
-b=this.ovmap.getResolution()/this.map.getResolution();return b>this.minRatio&&b<=this.maxRatio&&this.ovmap.getExtent().containsBounds(a)},updateOverview:function(){var a=this.map.getResolution(),b=this.ovmap.getResolution(),c=b/a;c>this.maxRatio?b=this.minRatio*a:c<=this.minRatio&&(b=this.maxRatio*a);this.ovmap.getProjection()!=this.map.getProjection()?(a=this.map.center.clone(),a.transform(this.map.getProjectionObject(),this.ovmap.getProjectionObject())):a=this.map.center;this.ovmap.setCenter(a,
-this.ovmap.getZoomForResolution(b*this.resolutionFactor));this.updateRectToMap()},createMap:function(){var a=OpenLayers.Util.extend({controls:[],maxResolution:"auto",fallThrough:!1},this.mapOptions);this.ovmap=new OpenLayers.Map(this.mapDiv,a);this.ovmap.viewPortDiv.appendChild(this.extentRectangle);OpenLayers.Event.stopObserving(window,"unload",this.ovmap.unloadDestroy);this.ovmap.addLayers(this.layers);this.ovmap.zoomToMaxExtent();this.wComp=(this.wComp=parseInt(OpenLayers.Element.getStyle(this.extentRectangle,
-"border-left-width"))+parseInt(OpenLayers.Element.getStyle(this.extentRectangle,"border-right-width")))?this.wComp:2;this.hComp=(this.hComp=parseInt(OpenLayers.Element.getStyle(this.extentRectangle,"border-top-width"))+parseInt(OpenLayers.Element.getStyle(this.extentRectangle,"border-bottom-width")))?this.hComp:2;this.handlers.drag=new OpenLayers.Handler.Drag(this,{move:this.rectDrag,done:this.updateMapToRect},{map:this.ovmap});this.handlers.click=new OpenLayers.Handler.Click(this,{click:this.mapDivClick},
-{single:!0,"double":!1,stopSingle:!0,stopDouble:!0,pixelTolerance:1,map:this.ovmap});this.handlers.click.activate();this.rectEvents=new OpenLayers.Events(this,this.extentRectangle,null,!0);this.rectEvents.register("mouseover",this,function(a){this.handlers.drag.active||this.map.dragging||this.handlers.drag.activate()});this.rectEvents.register("mouseout",this,function(a){this.handlers.drag.dragging||this.handlers.drag.deactivate()});if(this.ovmap.getProjection()!=this.map.getProjection()){var a=this.map.getProjectionObject().getUnits()||
-this.map.units||this.map.baseLayer.units,b=this.ovmap.getProjectionObject().getUnits()||this.ovmap.units||this.ovmap.baseLayer.units;this.resolutionFactor=a&&b?OpenLayers.INCHES_PER_UNIT[a]/OpenLayers.INCHES_PER_UNIT[b]:1}},updateRectToMap:function(){var a;a=this.ovmap.getProjection()!=this.map.getProjection()?this.map.getExtent().transform(this.map.getProjectionObject(),this.ovmap.getProjectionObject()):this.map.getExtent();(a=this.getRectBoundsFromMapBounds(a))&&this.setRectPxBounds(a)},updateMapToRect:function(){var a=
-this.getMapBoundsFromRectBounds(this.rectPxBounds);this.ovmap.getProjection()!=this.map.getProjection()&&(a=a.transform(this.ovmap.getProjectionObject(),this.map.getProjectionObject()));this.map.panTo(a.getCenterLonLat())},setRectPxBounds:function(a){var b=Math.max(a.top,0),c=Math.max(a.left,0),d=Math.min(a.top+Math.abs(a.getHeight()),this.ovmap.size.h-this.hComp);a=Math.min(a.left+a.getWidth(),this.ovmap.size.w-this.wComp);var e=Math.max(a-c,0),f=Math.max(d-b,0);e<this.minRectSize||f<this.minRectSize?
-(this.extentRectangle.className=this.displayClass+this.minRectDisplayClass,e=c+e/2-this.minRectSize/2,this.extentRectangle.style.top=Math.round(b+f/2-this.minRectSize/2)+"px",this.extentRectangle.style.left=Math.round(e)+"px",this.extentRectangle.style.height=this.minRectSize+"px",this.extentRectangle.style.width=this.minRectSize+"px"):(this.extentRectangle.className=this.displayClass+"ExtentRectangle",this.extentRectangle.style.top=Math.round(b)+"px",this.extentRectangle.style.left=Math.round(c)+
-"px",this.extentRectangle.style.height=Math.round(f)+"px",this.extentRectangle.style.width=Math.round(e)+"px");this.rectPxBounds=new OpenLayers.Bounds(Math.round(c),Math.round(d),Math.round(a),Math.round(b))},getRectBoundsFromMapBounds:function(a){var b=this.getOverviewPxFromLonLat({lon:a.left,lat:a.bottom});a=this.getOverviewPxFromLonLat({lon:a.right,lat:a.top});var c=null;b&&a&&(c=new OpenLayers.Bounds(b.x,b.y,a.x,a.y));return c},getMapBoundsFromRectBounds:function(a){var b=this.getLonLatFromOverviewPx({x:a.left,
-y:a.bottom});a=this.getLonLatFromOverviewPx({x:a.right,y:a.top});return new OpenLayers.Bounds(b.lon,b.lat,a.lon,a.lat)},getLonLatFromOverviewPx:function(a){var b=this.ovmap.size,c=this.ovmap.getResolution(),d=this.ovmap.getExtent().getCenterLonLat();return{lon:d.lon+(a.x-b.w/2)*c,lat:d.lat-(a.y-b.h/2)*c}},getOverviewPxFromLonLat:function(a){var b=this.ovmap.getResolution(),c=this.ovmap.getExtent();if(c)return{x:Math.round(1/b*(a.lon-c.left)),y:Math.round(1/b*(c.top-a.lat))}},CLASS_NAME:"OpenLayers.Control.OverviewMap"});OpenLayers.Layer=OpenLayers.Class({id:null,name:null,div:null,opacity:1,alwaysInRange:null,RESOLUTION_PROPERTIES:"scales resolutions maxScale minScale maxResolution minResolution numZoomLevels maxZoomLevel".split(" "),events:null,map:null,isBaseLayer:!1,alpha:!1,displayInLayerSwitcher:!0,visibility:!0,attribution:null,inRange:!1,imageSize:null,options:null,eventListeners:null,gutter:0,projection:null,units:null,scales:null,resolutions:null,maxExtent:null,minExtent:null,maxResolution:null,minResolution:null,
-numZoomLevels:null,minScale:null,maxScale:null,displayOutsideMaxExtent:!1,wrapDateLine:!1,metadata:null,initialize:function(a,b){this.metadata={};b=OpenLayers.Util.extend({},b);null!=this.alwaysInRange&&(b.alwaysInRange=this.alwaysInRange);this.addOptions(b);this.name=a;if(null==this.id&&(this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_"),this.div=OpenLayers.Util.createDiv(this.id),this.div.style.width="100%",this.div.style.height="100%",this.div.dir="ltr",this.events=new OpenLayers.Events(this,
-this.div),this.eventListeners instanceof Object))this.events.on(this.eventListeners)},destroy:function(a){null==a&&(a=!0);null!=this.map&&this.map.removeLayer(this,a);this.options=this.div=this.name=this.map=this.projection=null;this.events&&(this.eventListeners&&this.events.un(this.eventListeners),this.events.destroy());this.events=this.eventListeners=null},clone:function(a){null==a&&(a=new OpenLayers.Layer(this.name,this.getOptions()));OpenLayers.Util.applyDefaults(a,this);a.map=null;return a},
-getOptions:function(){var a={},b;for(b in this.options)a[b]=this[b];return a},setName:function(a){a!=this.name&&(this.name=a,null!=this.map&&this.map.events.triggerEvent("changelayer",{layer:this,property:"name"}))},addOptions:function(a,b){null==this.options&&(this.options={});a&&("string"==typeof a.projection&&(a.projection=new OpenLayers.Projection(a.projection)),a.projection&&OpenLayers.Util.applyDefaults(a,OpenLayers.Projection.defaults[a.projection.getCode()]),!a.maxExtent||a.maxExtent instanceof
-OpenLayers.Bounds||(a.maxExtent=new OpenLayers.Bounds(a.maxExtent)),!a.minExtent||a.minExtent instanceof OpenLayers.Bounds||(a.minExtent=new OpenLayers.Bounds(a.minExtent)));OpenLayers.Util.extend(this.options,a);OpenLayers.Util.extend(this,a);this.projection&&this.projection.getUnits()&&(this.units=this.projection.getUnits());if(this.map){var c=this.map.getResolution(),d=this.RESOLUTION_PROPERTIES.concat(["projection","units","minExtent","maxExtent"]),e;for(e in a)if(a.hasOwnProperty(e)&&0<=OpenLayers.Util.indexOf(d,
-e)){this.initResolutions();b&&this.map.baseLayer===this&&(this.map.setCenter(this.map.getCenter(),this.map.getZoomForResolution(c),!1,!0),this.map.events.triggerEvent("changebaselayer",{layer:this}));break}}},onMapResize:function(){},redraw:function(){var a=!1;if(this.map){this.inRange=this.calculateInRange();var b=this.getExtent();b&&(this.inRange&&this.visibility)&&(this.moveTo(b,!0,!1),this.events.triggerEvent("moveend",{zoomChanged:!0}),a=!0)}return a},moveTo:function(a,b,c){a=this.visibility;
-this.isBaseLayer||(a=a&&this.inRange);this.display(a)},moveByPx:function(a,b){},setMap:function(a){null==this.map&&(this.map=a,this.maxExtent=this.maxExtent||this.map.maxExtent,this.minExtent=this.minExtent||this.map.minExtent,this.projection=this.projection||this.map.projection,"string"==typeof this.projection&&(this.projection=new OpenLayers.Projection(this.projection)),this.units=this.projection.getUnits()||this.units||this.map.units,this.initResolutions(),this.isBaseLayer||(this.inRange=this.calculateInRange(),
-this.div.style.display=this.visibility&&this.inRange?"":"none"),this.setTileSize())},afterAdd:function(){},removeMap:function(a){},getImageSize:function(a){return this.imageSize||this.tileSize},setTileSize:function(a){this.tileSize=a=a?a:this.tileSize?this.tileSize:this.map.getTileSize();this.gutter&&(this.imageSize=new OpenLayers.Size(a.w+2*this.gutter,a.h+2*this.gutter))},getVisibility:function(){return this.visibility},setVisibility:function(a){a!=this.visibility&&(this.visibility=a,this.display(a),
-this.redraw(),null!=this.map&&this.map.events.triggerEvent("changelayer",{layer:this,property:"visibility"}),this.events.triggerEvent("visibilitychanged"))},display:function(a){a!=("none"!=this.div.style.display)&&(this.div.style.display=a&&this.calculateInRange()?"block":"none")},calculateInRange:function(){var a=!1;this.alwaysInRange?a=!0:this.map&&(a=this.map.getResolution(),a=a>=this.minResolution&&a<=this.maxResolution);return a},setIsBaseLayer:function(a){a!=this.isBaseLayer&&(this.isBaseLayer=
-a,null!=this.map&&this.map.events.triggerEvent("changebaselayer",{layer:this}))},initResolutions:function(){var a,b,c,d={},e=!0;a=0;for(b=this.RESOLUTION_PROPERTIES.length;a<b;a++)c=this.RESOLUTION_PROPERTIES[a],d[c]=this.options[c],e&&this.options[c]&&(e=!1);null==this.options.alwaysInRange&&(this.alwaysInRange=e);null==d.resolutions&&(d.resolutions=this.resolutionsFromScales(d.scales));null==d.resolutions&&(d.resolutions=this.calculateResolutions(d));if(null==d.resolutions){a=0;for(b=this.RESOLUTION_PROPERTIES.length;a<
-b;a++)c=this.RESOLUTION_PROPERTIES[a],d[c]=null!=this.options[c]?this.options[c]:this.map[c];null==d.resolutions&&(d.resolutions=this.resolutionsFromScales(d.scales));null==d.resolutions&&(d.resolutions=this.calculateResolutions(d))}var f;this.options.maxResolution&&"auto"!==this.options.maxResolution&&(f=this.options.maxResolution);this.options.minScale&&(f=OpenLayers.Util.getResolutionFromScale(this.options.minScale,this.units));var g;this.options.minResolution&&"auto"!==this.options.minResolution&&
-(g=this.options.minResolution);this.options.maxScale&&(g=OpenLayers.Util.getResolutionFromScale(this.options.maxScale,this.units));d.resolutions&&(d.resolutions.sort(function(a,b){return b-a}),f||(f=d.resolutions[0]),g||(g=d.resolutions[d.resolutions.length-1]));if(this.resolutions=d.resolutions){b=this.resolutions.length;this.scales=Array(b);for(a=0;a<b;a++)this.scales[a]=OpenLayers.Util.getScaleFromResolution(this.resolutions[a],this.units);this.numZoomLevels=b}if(this.minResolution=g)this.maxScale=
-OpenLayers.Util.getScaleFromResolution(g,this.units);if(this.maxResolution=f)this.minScale=OpenLayers.Util.getScaleFromResolution(f,this.units)},resolutionsFromScales:function(a){if(null!=a){var b,c,d;d=a.length;b=Array(d);for(c=0;c<d;c++)b[c]=OpenLayers.Util.getResolutionFromScale(a[c],this.units);return b}},calculateResolutions:function(a){var b,c,d=a.maxResolution;null!=a.minScale?d=OpenLayers.Util.getResolutionFromScale(a.minScale,this.units):"auto"==d&&null!=this.maxExtent&&(b=this.map.getSize(),
-c=this.maxExtent.getWidth()/b.w,b=this.maxExtent.getHeight()/b.h,d=Math.max(c,b));c=a.minResolution;null!=a.maxScale?c=OpenLayers.Util.getResolutionFromScale(a.maxScale,this.units):"auto"==a.minResolution&&null!=this.minExtent&&(b=this.map.getSize(),c=this.minExtent.getWidth()/b.w,b=this.minExtent.getHeight()/b.h,c=Math.max(c,b));"number"!==typeof d&&("number"!==typeof c&&null!=this.maxExtent)&&(d=this.map.getTileSize(),d=Math.max(this.maxExtent.getWidth()/d.w,this.maxExtent.getHeight()/d.h));b=a.maxZoomLevel;
-a=a.numZoomLevels;"number"===typeof c&&"number"===typeof d&&void 0===a?a=Math.floor(Math.log(d/c)/Math.log(2))+1:void 0===a&&null!=b&&(a=b+1);if(!("number"!==typeof a||0>=a||"number"!==typeof d&&"number"!==typeof c)){b=Array(a);var e=2;"number"==typeof c&&"number"==typeof d&&(e=Math.pow(d/c,1/(a-1)));var f;if("number"===typeof d)for(f=0;f<a;f++)b[f]=d/Math.pow(e,f);else for(f=0;f<a;f++)b[a-1-f]=c*Math.pow(e,f);return b}},getResolution:function(){var a=this.map.getZoom();return this.getResolutionForZoom(a)},
-getExtent:function(){return this.map.calculateBounds()},getZoomForExtent:function(a,b){var c=this.map.getSize(),c=Math.max(a.getWidth()/c.w,a.getHeight()/c.h);return this.getZoomForResolution(c,b)},getDataExtent:function(){},getResolutionForZoom:function(a){a=Math.max(0,Math.min(a,this.resolutions.length-1));if(this.map.fractionalZoom){var b=Math.floor(a),c=Math.ceil(a);a=this.resolutions[b]-(a-b)*(this.resolutions[b]-this.resolutions[c])}else a=this.resolutions[Math.round(a)];return a},getZoomForResolution:function(a,
-b){var c,d;if(this.map.fractionalZoom){var e=0,f=this.resolutions[e],g=this.resolutions[this.resolutions.length-1],h;c=0;for(d=this.resolutions.length;c<d;++c)if(h=this.resolutions[c],h>=a&&(f=h,e=c),h<=a){g=h;break}c=f-g;c=0<c?e+(f-a)/c:e}else{f=Number.POSITIVE_INFINITY;c=0;for(d=this.resolutions.length;c<d;c++)if(b){e=Math.abs(this.resolutions[c]-a);if(e>f)break;f=e}else if(this.resolutions[c]<a)break;c=Math.max(0,c-1)}return c},getLonLatFromViewPortPx:function(a){var b=null,c=this.map;if(null!=
-a&&c.minPx){var b=c.getResolution(),d=c.getMaxExtent({restricted:!0}),b=new OpenLayers.LonLat((a.x-c.minPx.x)*b+d.left,(c.minPx.y-a.y)*b+d.top);this.wrapDateLine&&(b=b.wrapDateLine(this.maxExtent))}return b},getViewPortPxFromLonLat:function(a,b){var c=null;null!=a&&(b=b||this.map.getResolution(),c=this.map.calculateBounds(null,b),c=new OpenLayers.Pixel(1/b*(a.lon-c.left),1/b*(c.top-a.lat)));return c},setOpacity:function(a){if(a!=this.opacity){this.opacity=a;for(var b=this.div.childNodes,c=0,d=b.length;c<
-d;++c){var e=b[c].firstChild||b[c],f=b[c].lastChild;f&&"iframe"===f.nodeName.toLowerCase()&&(e=f.parentNode);OpenLayers.Util.modifyDOMElement(e,null,null,null,null,null,null,a)}null!=this.map&&this.map.events.triggerEvent("changelayer",{layer:this,property:"opacity"})}},getZIndex:function(){return this.div.style.zIndex},setZIndex:function(a){this.div.style.zIndex=a},adjustBounds:function(a){if(this.gutter){var b=this.gutter*this.map.getResolution();a=new OpenLayers.Bounds(a.left-b,a.bottom-b,a.right+
-b,a.top+b)}this.wrapDateLine&&(b={rightTolerance:this.getResolution(),leftTolerance:this.getResolution()},a=a.wrapDateLine(this.maxExtent,b));return a},CLASS_NAME:"OpenLayers.Layer"});OpenLayers.Layer.SphericalMercator={getExtent:function(){var a=null;return a=this.sphericalMercator?this.map.calculateBounds():OpenLayers.Layer.FixedZoomLevels.prototype.getExtent.apply(this)},getLonLatFromViewPortPx:function(a){return OpenLayers.Layer.prototype.getLonLatFromViewPortPx.apply(this,arguments)},getViewPortPxFromLonLat:function(a){return OpenLayers.Layer.prototype.getViewPortPxFromLonLat.apply(this,arguments)},initMercatorParameters:function(){this.RESOLUTIONS=[];for(var a=0;a<=this.MAX_ZOOM_LEVEL;++a)this.RESOLUTIONS[a]=
-156543.03390625/Math.pow(2,a);this.units="m";this.projection=this.projection||"EPSG:900913"},forwardMercator:function(){var a=new OpenLayers.Projection("EPSG:4326"),b=new OpenLayers.Projection("EPSG:900913");return function(c,d){var e=OpenLayers.Projection.transform({x:c,y:d},a,b);return new OpenLayers.LonLat(e.x,e.y)}}(),inverseMercator:function(){var a=new OpenLayers.Projection("EPSG:4326"),b=new OpenLayers.Projection("EPSG:900913");return function(c,d){var e=OpenLayers.Projection.transform({x:c,
-y:d},b,a);return new OpenLayers.LonLat(e.x,e.y)}}()};OpenLayers.Layer.EventPane=OpenLayers.Class(OpenLayers.Layer,{smoothDragPan:!0,isBaseLayer:!0,isFixed:!0,pane:null,mapObject:null,initialize:function(a,b){OpenLayers.Layer.prototype.initialize.apply(this,arguments);null==this.pane&&(this.pane=OpenLayers.Util.createDiv(this.div.id+"_EventPane"))},destroy:function(){this.pane=this.mapObject=null;OpenLayers.Layer.prototype.destroy.apply(this,arguments)},setMap:function(a){OpenLayers.Layer.prototype.setMap.apply(this,arguments);this.pane.style.zIndex=
-parseInt(this.div.style.zIndex)+1;this.pane.style.display=this.div.style.display;this.pane.style.width="100%";this.pane.style.height="100%";"msie"==OpenLayers.BROWSER_NAME&&(this.pane.style.background="url("+OpenLayers.Util.getImageLocation("blank.gif")+")");this.isFixed?this.map.viewPortDiv.appendChild(this.pane):this.map.layerContainerDiv.appendChild(this.pane);this.loadMapObject();null==this.mapObject&&this.loadWarningMessage()},removeMap:function(a){this.pane&&this.pane.parentNode&&this.pane.parentNode.removeChild(this.pane);
-OpenLayers.Layer.prototype.removeMap.apply(this,arguments)},loadWarningMessage:function(){this.div.style.backgroundColor="darkblue";var a=this.map.getSize(),b=Math.min(a.w,300),c=Math.min(a.h,200),b=new OpenLayers.Size(b,c),a=(new OpenLayers.Pixel(a.w/2,a.h/2)).add(-b.w/2,-b.h/2),a=OpenLayers.Util.createDiv(this.name+"_warning",a,b,null,null,null,"auto");a.style.padding="7px";a.style.backgroundColor="yellow";a.innerHTML=this.getWarningHTML();this.div.appendChild(a)},getWarningHTML:function(){return""},
-display:function(a){OpenLayers.Layer.prototype.display.apply(this,arguments);this.pane.style.display=this.div.style.display},setZIndex:function(a){OpenLayers.Layer.prototype.setZIndex.apply(this,arguments);this.pane.style.zIndex=parseInt(this.div.style.zIndex)+1},moveByPx:function(a,b){OpenLayers.Layer.prototype.moveByPx.apply(this,arguments);this.dragPanMapObject?this.dragPanMapObject(a,-b):this.moveTo(this.map.getCachedCenter())},moveTo:function(a,b,c){OpenLayers.Layer.prototype.moveTo.apply(this,
-arguments);if(null!=this.mapObject){var d=this.map.getCenter(),e=this.map.getZoom();if(null!=d){var f=this.getMapObjectCenter(),f=this.getOLLonLatFromMapObjectLonLat(f),g=this.getMapObjectZoom(),g=this.getOLZoomFromMapObjectZoom(g);d.equals(f)&&e==g||(!b&&f&&this.dragPanMapObject&&this.smoothDragPan?(e=this.map.getViewPortPxFromLonLat(f),d=this.map.getViewPortPxFromLonLat(d),this.dragPanMapObject(d.x-e.x,e.y-d.y)):(d=this.getMapObjectLonLatFromOLLonLat(d),e=this.getMapObjectZoomFromOLZoom(e),this.setMapObjectCenter(d,
-e,c)))}}},getLonLatFromViewPortPx:function(a){var b=null;null!=this.mapObject&&null!=this.getMapObjectCenter()&&(a=this.getMapObjectPixelFromOLPixel(a),a=this.getMapObjectLonLatFromMapObjectPixel(a),b=this.getOLLonLatFromMapObjectLonLat(a));return b},getViewPortPxFromLonLat:function(a){var b=null;null!=this.mapObject&&null!=this.getMapObjectCenter()&&(a=this.getMapObjectLonLatFromOLLonLat(a),a=this.getMapObjectPixelFromMapObjectLonLat(a),b=this.getOLPixelFromMapObjectPixel(a));return b},getOLLonLatFromMapObjectLonLat:function(a){var b=
-null;null!=a&&(b=this.getLongitudeFromMapObjectLonLat(a),a=this.getLatitudeFromMapObjectLonLat(a),b=new OpenLayers.LonLat(b,a));return b},getMapObjectLonLatFromOLLonLat:function(a){var b=null;null!=a&&(b=this.getMapObjectLonLatFromLonLat(a.lon,a.lat));return b},getOLPixelFromMapObjectPixel:function(a){var b=null;null!=a&&(b=this.getXFromMapObjectPixel(a),a=this.getYFromMapObjectPixel(a),b=new OpenLayers.Pixel(b,a));return b},getMapObjectPixelFromOLPixel:function(a){var b=null;null!=a&&(b=this.getMapObjectPixelFromXY(a.x,
-a.y));return b},CLASS_NAME:"OpenLayers.Layer.EventPane"});OpenLayers.Layer.FixedZoomLevels=OpenLayers.Class({initialize:function(){},initResolutions:function(){for(var a=["minZoomLevel","maxZoomLevel","numZoomLevels"],b=0,c=a.length;b<c;b++){var d=a[b];this[d]=null!=this.options[d]?this.options[d]:this.map[d]}if(null==this.minZoomLevel||this.minZoomLevel<this.MIN_ZOOM_LEVEL)this.minZoomLevel=this.MIN_ZOOM_LEVEL;a=this.MAX_ZOOM_LEVEL-this.minZoomLevel+1;b=null==this.options.numZoomLevels&&null!=this.options.maxZoomLevel||null==this.numZoomLevels&&null!=this.maxZoomLevel?
-this.maxZoomLevel-this.minZoomLevel+1:this.numZoomLevels;this.numZoomLevels=null!=b?Math.min(b,a):a;this.maxZoomLevel=this.minZoomLevel+this.numZoomLevels-1;if(null!=this.RESOLUTIONS){a=0;this.resolutions=[];for(b=this.minZoomLevel;b<=this.maxZoomLevel;b++)this.resolutions[a++]=this.RESOLUTIONS[b];this.maxResolution=this.resolutions[0];this.minResolution=this.resolutions[this.resolutions.length-1]}},getResolution:function(){if(null!=this.resolutions)return OpenLayers.Layer.prototype.getResolution.apply(this,
-arguments);var a=null,b=this.map.getSize(),c=this.getExtent();null!=b&&null!=c&&(a=Math.max(c.getWidth()/b.w,c.getHeight()/b.h));return a},getExtent:function(){var a=this.map.getSize(),b=this.getLonLatFromViewPortPx({x:0,y:0}),a=this.getLonLatFromViewPortPx({x:a.w,y:a.h});return null!=b&&null!=a?new OpenLayers.Bounds(b.lon,a.lat,a.lon,b.lat):null},getZoomForResolution:function(a){if(null!=this.resolutions)return OpenLayers.Layer.prototype.getZoomForResolution.apply(this,arguments);var b=OpenLayers.Layer.prototype.getExtent.apply(this,
-[]);return this.getZoomForExtent(b)},getOLZoomFromMapObjectZoom:function(a){var b=null;null!=a&&(b=a-this.minZoomLevel,this.map.baseLayer!==this&&(b=this.map.baseLayer.getZoomForResolution(this.getResolutionForZoom(b))));return b},getMapObjectZoomFromOLZoom:function(a){var b=null;null!=a&&(b=a+this.minZoomLevel,this.map.baseLayer!==this&&(b=this.getZoomForResolution(this.map.baseLayer.getResolutionForZoom(b))));return b},CLASS_NAME:"OpenLayers.Layer.FixedZoomLevels"});OpenLayers.Layer.Google=OpenLayers.Class(OpenLayers.Layer.EventPane,OpenLayers.Layer.FixedZoomLevels,{MIN_ZOOM_LEVEL:0,MAX_ZOOM_LEVEL:21,RESOLUTIONS:[1.40625,0.703125,0.3515625,0.17578125,0.087890625,0.0439453125,0.02197265625,0.010986328125,0.0054931640625,0.00274658203125,0.001373291015625,6.866455078125E-4,3.4332275390625E-4,1.71661376953125E-4,8.58306884765625E-5,4.291534423828125E-5,2.145767211914062E-5,1.072883605957031E-5,5.36441802978515E-6,2.68220901489257E-6,1.341104507446289E-6,6.705522537231445E-7],
-type:null,wrapDateLine:!0,sphericalMercator:!1,version:null,initialize:function(a,b){b=b||{};b.version||(b.version="function"===typeof GMap2?"2":"3");var c=OpenLayers.Layer.Google["v"+b.version.replace(/\./g,"_")];if(c)OpenLayers.Util.applyDefaults(b,c);else throw"Unsupported Google Maps API version: "+b.version;OpenLayers.Util.applyDefaults(b,c.DEFAULTS);b.maxExtent&&(b.maxExtent=b.maxExtent.clone());OpenLayers.Layer.EventPane.prototype.initialize.apply(this,[a,b]);OpenLayers.Layer.FixedZoomLevels.prototype.initialize.apply(this,
-[a,b]);this.sphericalMercator&&(OpenLayers.Util.extend(this,OpenLayers.Layer.SphericalMercator),this.initMercatorParameters())},clone:function(){return new OpenLayers.Layer.Google(this.name,this.getOptions())},setVisibility:function(a){var b=null==this.opacity?1:this.opacity;OpenLayers.Layer.EventPane.prototype.setVisibility.apply(this,arguments);this.setOpacity(b)},display:function(a){this._dragging||this.setGMapVisibility(a);OpenLayers.Layer.EventPane.prototype.display.apply(this,arguments)},moveTo:function(a,
-b,c){this._dragging=c;OpenLayers.Layer.EventPane.prototype.moveTo.apply(this,arguments);delete this._dragging},setOpacity:function(a){a!==this.opacity&&(null!=this.map&&this.map.events.triggerEvent("changelayer",{layer:this,property:"opacity"}),this.opacity=a);if(this.getVisibility()){var b=this.getMapContainer();OpenLayers.Util.modifyDOMElement(b,null,null,null,null,null,null,a)}},destroy:function(){if(this.map){this.setGMapVisibility(!1);var a=OpenLayers.Layer.Google.cache[this.map.id];a&&1>=a.count&&
-this.removeGMapElements()}OpenLayers.Layer.EventPane.prototype.destroy.apply(this,arguments)},removeGMapElements:function(){var a=OpenLayers.Layer.Google.cache[this.map.id];if(a){var b=this.mapObject&&this.getMapContainer();b&&b.parentNode&&b.parentNode.removeChild(b);(b=a.termsOfUse)&&b.parentNode&&b.parentNode.removeChild(b);(a=a.poweredBy)&&a.parentNode&&a.parentNode.removeChild(a);this.mapObject&&(window.google&&google.maps&&google.maps.event&&google.maps.event.clearListeners)&&google.maps.event.clearListeners(this.mapObject,
-"tilesloaded")}},removeMap:function(a){this.visibility&&this.mapObject&&this.setGMapVisibility(!1);var b=OpenLayers.Layer.Google.cache[a.id];b&&(1>=b.count?(this.removeGMapElements(),delete OpenLayers.Layer.Google.cache[a.id]):--b.count);delete this.termsOfUse;delete this.poweredBy;delete this.mapObject;delete this.dragObject;OpenLayers.Layer.EventPane.prototype.removeMap.apply(this,arguments)},getOLBoundsFromMapObjectBounds:function(a){var b=null;null!=a&&(b=a.getSouthWest(),a=a.getNorthEast(),this.sphericalMercator?
-(b=this.forwardMercator(b.lng(),b.lat()),a=this.forwardMercator(a.lng(),a.lat())):(b=new OpenLayers.LonLat(b.lng(),b.lat()),a=new OpenLayers.LonLat(a.lng(),a.lat())),b=new OpenLayers.Bounds(b.lon,b.lat,a.lon,a.lat));return b},getWarningHTML:function(){return OpenLayers.i18n("googleWarning")},getMapObjectCenter:function(){return this.mapObject.getCenter()},getMapObjectZoom:function(){return this.mapObject.getZoom()},getLongitudeFromMapObjectLonLat:function(a){return this.sphericalMercator?this.forwardMercator(a.lng(),
-a.lat()).lon:a.lng()},getLatitudeFromMapObjectLonLat:function(a){return this.sphericalMercator?this.forwardMercator(a.lng(),a.lat()).lat:a.lat()},getXFromMapObjectPixel:function(a){return a.x},getYFromMapObjectPixel:function(a){return a.y},CLASS_NAME:"OpenLayers.Layer.Google"});OpenLayers.Layer.Google.cache={};
-OpenLayers.Layer.Google.v2={termsOfUse:null,poweredBy:null,dragObject:null,loadMapObject:function(){this.type||(this.type=G_NORMAL_MAP);var a,b,c,d=OpenLayers.Layer.Google.cache[this.map.id];if(d)a=d.mapObject,b=d.termsOfUse,c=d.poweredBy,++d.count;else{var d=this.map.viewPortDiv,e=document.createElement("div");e.id=this.map.id+"_GMap2Container";e.style.position="absolute";e.style.width="100%";e.style.height="100%";d.appendChild(e);try{a=new GMap2(e),b=e.lastChild,d.appendChild(b),b.style.zIndex=
-"1100",b.style.right="",b.style.bottom="",b.className="olLayerGoogleCopyright",c=e.lastChild,d.appendChild(c),c.style.zIndex="1100",c.style.right="",c.style.bottom="",c.className="olLayerGooglePoweredBy gmnoprint"}catch(f){throw f;}OpenLayers.Layer.Google.cache[this.map.id]={mapObject:a,termsOfUse:b,poweredBy:c,count:1}}this.mapObject=a;this.termsOfUse=b;this.poweredBy=c;-1===OpenLayers.Util.indexOf(this.mapObject.getMapTypes(),this.type)&&this.mapObject.addMapType(this.type);"function"==typeof a.getDragObject?
-this.dragObject=a.getDragObject():this.dragPanMapObject=null;!1===this.isBaseLayer&&this.setGMapVisibility("none"!==this.div.style.display)},onMapResize:function(){if(this.visibility&&this.mapObject.isLoaded())this.mapObject.checkResize();else{if(!this._resized)var a=this,b=GEvent.addListener(this.mapObject,"load",function(){GEvent.removeListener(b);delete a._resized;a.mapObject.checkResize();a.moveTo(a.map.getCenter(),a.map.getZoom())});this._resized=!0}},setGMapVisibility:function(a){var b=OpenLayers.Layer.Google.cache[this.map.id];
-if(b){var c=this.mapObject.getContainer();!0===a?(this.mapObject.setMapType(this.type),c.style.display="",this.termsOfUse.style.left="",this.termsOfUse.style.display="",this.poweredBy.style.display="",b.displayed=this.id):(b.displayed===this.id&&delete b.displayed,b.displayed||(c.style.display="none",this.termsOfUse.style.display="none",this.termsOfUse.style.left="-9999px",this.poweredBy.style.display="none"))}},getMapContainer:function(){return this.mapObject.getContainer()},getMapObjectBoundsFromOLBounds:function(a){var b=
-null;null!=a&&(b=this.sphericalMercator?this.inverseMercator(a.bottom,a.left):new OpenLayers.LonLat(a.bottom,a.left),a=this.sphericalMercator?this.inverseMercator(a.top,a.right):new OpenLayers.LonLat(a.top,a.right),b=new GLatLngBounds(new GLatLng(b.lat,b.lon),new GLatLng(a.lat,a.lon)));return b},setMapObjectCenter:function(a,b){this.mapObject.setCenter(a,b)},dragPanMapObject:function(a,b){this.dragObject.moveBy(new GSize(-a,b))},getMapObjectLonLatFromMapObjectPixel:function(a){return this.mapObject.fromContainerPixelToLatLng(a)},
-getMapObjectPixelFromMapObjectLonLat:function(a){return this.mapObject.fromLatLngToContainerPixel(a)},getMapObjectZoomFromMapObjectBounds:function(a){return this.mapObject.getBoundsZoomLevel(a)},getMapObjectLonLatFromLonLat:function(a,b){var c;this.sphericalMercator?(c=this.inverseMercator(a,b),c=new GLatLng(c.lat,c.lon)):c=new GLatLng(b,a);return c},getMapObjectPixelFromXY:function(a,b){return new GPoint(a,b)}};OpenLayers.Format.XML=OpenLayers.Class(OpenLayers.Format,{namespaces:null,namespaceAlias:null,defaultPrefix:null,readers:{},writers:{},xmldom:null,initialize:function(a){window.ActiveXObject&&(this.xmldom=new ActiveXObject("Microsoft.XMLDOM"));OpenLayers.Format.prototype.initialize.apply(this,[a]);this.namespaces=OpenLayers.Util.extend({},this.namespaces);this.namespaceAlias={};for(var b in this.namespaces)this.namespaceAlias[this.namespaces[b]]=b},destroy:function(){this.xmldom=null;OpenLayers.Format.prototype.destroy.apply(this,
-arguments)},setNamespace:function(a,b){this.namespaces[a]=b;this.namespaceAlias[b]=a},read:function(a){var b=a.indexOf("<");0<b&&(a=a.substring(b));b=OpenLayers.Util.Try(OpenLayers.Function.bind(function(){var b;b=window.ActiveXObject&&!this.xmldom?new ActiveXObject("Microsoft.XMLDOM"):this.xmldom;b.loadXML(a);return b},this),function(){return(new DOMParser).parseFromString(a,"text/xml")},function(){var b=new XMLHttpRequest;b.open("GET","data:text/xml;charset=utf-8,"+encodeURIComponent(a),!1);b.overrideMimeType&&
-b.overrideMimeType("text/xml");b.send(null);return b.responseXML});this.keepData&&(this.data=b);return b},write:function(a){if(this.xmldom)a=a.xml;else{var b=new XMLSerializer;if(1==a.nodeType){var c=document.implementation.createDocument("","",null);c.importNode&&(a=c.importNode(a,!0));c.appendChild(a);a=b.serializeToString(c)}else a=b.serializeToString(a)}return a},createElementNS:function(a,b){return this.xmldom?"string"==typeof a?this.xmldom.createNode(1,b,a):this.xmldom.createNode(1,b,""):document.createElementNS(a,
-b)},createDocumentFragment:function(){return this.xmldom?this.xmldom.createDocumentFragment():document.createDocumentFragment()},createTextNode:function(a){"string"!==typeof a&&(a=String(a));return this.xmldom?this.xmldom.createTextNode(a):document.createTextNode(a)},getElementsByTagNameNS:function(a,b,c){var d=[];if(a.getElementsByTagNameNS)d=a.getElementsByTagNameNS(b,c);else{a=a.getElementsByTagName("*");for(var e,f,g=0,h=a.length;g<h;++g)if(e=a[g],f=e.prefix?e.prefix+":"+c:c,"*"==c||f==e.nodeName)"*"!=
-b&&b!=e.namespaceURI||d.push(e)}return d},getAttributeNodeNS:function(a,b,c){var d=null;if(a.getAttributeNodeNS)d=a.getAttributeNodeNS(b,c);else{a=a.attributes;for(var e,f,g=0,h=a.length;g<h;++g)if(e=a[g],e.namespaceURI==b&&(f=e.prefix?e.prefix+":"+c:c,f==e.nodeName)){d=e;break}}return d},getAttributeNS:function(a,b,c){var d="";if(a.getAttributeNS)d=a.getAttributeNS(b,c)||"";else if(a=this.getAttributeNodeNS(a,b,c))d=a.nodeValue;return d},getChildValue:function(a,b){var c=b||"";if(a)for(var d=a.firstChild;d;d=
-d.nextSibling)switch(d.nodeType){case 3:case 4:c+=d.nodeValue}return c},isSimpleContent:function(a){var b=!0;for(a=a.firstChild;a;a=a.nextSibling)if(1===a.nodeType){b=!1;break}return b},contentType:function(a){var b=!1,c=!1,d=OpenLayers.Format.XML.CONTENT_TYPE.EMPTY;for(a=a.firstChild;a;a=a.nextSibling){switch(a.nodeType){case 1:c=!0;break;case 8:break;default:b=!0}if(c&&b)break}if(c&&b)d=OpenLayers.Format.XML.CONTENT_TYPE.MIXED;else{if(c)return OpenLayers.Format.XML.CONTENT_TYPE.COMPLEX;if(b)return OpenLayers.Format.XML.CONTENT_TYPE.SIMPLE}return d},
-hasAttributeNS:function(a,b,c){var d=!1;return d=a.hasAttributeNS?a.hasAttributeNS(b,c):!!this.getAttributeNodeNS(a,b,c)},setAttributeNS:function(a,b,c,d){if(a.setAttributeNS)a.setAttributeNS(b,c,d);else if(this.xmldom)b?(b=a.ownerDocument.createNode(2,c,b),b.nodeValue=d,a.setAttributeNode(b)):a.setAttribute(c,d);else throw"setAttributeNS not implemented";},createElementNSPlus:function(a,b){b=b||{};var c=b.uri||this.namespaces[b.prefix];c||(c=a.indexOf(":"),c=this.namespaces[a.substring(0,c)]);c||
-(c=this.namespaces[this.defaultPrefix]);c=this.createElementNS(c,a);b.attributes&&this.setAttributes(c,b.attributes);var d=b.value;null!=d&&c.appendChild(this.createTextNode(d));return c},setAttributes:function(a,b){var c,d,e;for(e in b)null!=b[e]&&b[e].toString&&(c=b[e].toString(),d=this.namespaces[e.substring(0,e.indexOf(":"))]||null,this.setAttributeNS(a,d,e,c))},readNode:function(a,b){b||(b={});var c=this.readers[a.namespaceURI?this.namespaceAlias[a.namespaceURI]:this.defaultPrefix];if(c){var d=
-a.localName||a.nodeName.split(":").pop();(c=c[d]||c["*"])&&c.apply(this,[a,b])}return b},readChildNodes:function(a,b){b||(b={});for(var c=a.childNodes,d,e=0,f=c.length;e<f;++e)d=c[e],1==d.nodeType&&this.readNode(d,b);return b},writeNode:function(a,b,c){var d,e=a.indexOf(":");0<e?(d=a.substring(0,e),a=a.substring(e+1)):d=c?this.namespaceAlias[c.namespaceURI]:this.defaultPrefix;b=this.writers[d][a].apply(this,[b]);c&&c.appendChild(b);return b},getChildEl:function(a,b,c){return a&&this.getThisOrNextEl(a.firstChild,
-b,c)},getNextEl:function(a,b,c){return a&&this.getThisOrNextEl(a.nextSibling,b,c)},getThisOrNextEl:function(a,b,c){a:for(;a;a=a.nextSibling)switch(a.nodeType){case 1:if(!(b&&b!==(a.localName||a.nodeName.split(":").pop())||c&&c!==a.namespaceURI))break a;a=null;break a;case 3:if(/^\s*$/.test(a.nodeValue))break;case 4:case 6:case 12:case 10:case 11:a=null;break a}return a||null},lookupNamespaceURI:function(a,b){var c=null;if(a)if(a.lookupNamespaceURI)c=a.lookupNamespaceURI(b);else a:switch(a.nodeType){case 1:if(null!==
-a.namespaceURI&&a.prefix===b){c=a.namespaceURI;break a}if(c=a.attributes.length)for(var d,e=0;e<c;++e)if(d=a.attributes[e],"xmlns"===d.prefix&&d.name==="xmlns:"+b){c=d.value||null;break a}else if("xmlns"===d.name&&null===b){c=d.value||null;break a}c=this.lookupNamespaceURI(a.parentNode,b);break a;case 2:c=this.lookupNamespaceURI(a.ownerElement,b);break a;case 9:c=this.lookupNamespaceURI(a.documentElement,b);break a;case 6:case 12:case 10:case 11:break a;default:c=this.lookupNamespaceURI(a.parentNode,
-b)}return c},getXMLDoc:function(){OpenLayers.Format.XML.document||this.xmldom||(document.implementation&&document.implementation.createDocument?OpenLayers.Format.XML.document=document.implementation.createDocument("","",null):!this.xmldom&&window.ActiveXObject&&(this.xmldom=new ActiveXObject("Microsoft.XMLDOM")));return OpenLayers.Format.XML.document||this.xmldom},CLASS_NAME:"OpenLayers.Format.XML"});OpenLayers.Format.XML.CONTENT_TYPE={EMPTY:0,SIMPLE:1,COMPLEX:2,MIXED:3};
-OpenLayers.Format.XML.lookupNamespaceURI=OpenLayers.Function.bind(OpenLayers.Format.XML.prototype.lookupNamespaceURI,OpenLayers.Format.XML.prototype);OpenLayers.Format.XML.document=null;OpenLayers.Format.WFST=function(a){a=OpenLayers.Util.applyDefaults(a,OpenLayers.Format.WFST.DEFAULTS);var b=OpenLayers.Format.WFST["v"+a.version.replace(/\./g,"_")];if(!b)throw"Unsupported WFST version: "+a.version;return new b(a)};OpenLayers.Format.WFST.DEFAULTS={version:"1.0.0"};OpenLayers.Feature=OpenLayers.Class({layer:null,id:null,lonlat:null,data:null,marker:null,popupClass:null,popup:null,initialize:function(a,b,c){this.layer=a;this.lonlat=b;this.data=null!=c?c:{};this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_")},destroy:function(){null!=this.layer&&null!=this.layer.map&&null!=this.popup&&this.layer.map.removePopup(this.popup);null!=this.layer&&null!=this.marker&&this.layer.removeMarker(this.marker);this.data=this.lonlat=this.id=this.layer=null;null!=this.marker&&
-(this.destroyMarker(this.marker),this.marker=null);null!=this.popup&&(this.destroyPopup(this.popup),this.popup=null)},onScreen:function(){var a=!1;null!=this.layer&&null!=this.layer.map&&(a=this.layer.map.getExtent().containsLonLat(this.lonlat));return a},createMarker:function(){null!=this.lonlat&&(this.marker=new OpenLayers.Marker(this.lonlat,this.data.icon));return this.marker},destroyMarker:function(){this.marker.destroy()},createPopup:function(a){null!=this.lonlat&&(this.popup||(this.popup=new (this.popupClass?
-this.popupClass:OpenLayers.Popup.Anchored)(this.id+"_popup",this.lonlat,this.data.popupSize,this.data.popupContentHTML,this.marker?this.marker.icon:null,a)),null!=this.data.overflow&&(this.popup.contentDiv.style.overflow=this.data.overflow),this.popup.feature=this);return this.popup},destroyPopup:function(){this.popup&&(this.popup.feature=null,this.popup.destroy(),this.popup=null)},CLASS_NAME:"OpenLayers.Feature"});OpenLayers.State={UNKNOWN:"Unknown",INSERT:"Insert",UPDATE:"Update",DELETE:"Delete"};
-OpenLayers.Feature.Vector=OpenLayers.Class(OpenLayers.Feature,{fid:null,geometry:null,attributes:null,bounds:null,state:null,style:null,url:null,renderIntent:"default",modified:null,initialize:function(a,b,c){OpenLayers.Feature.prototype.initialize.apply(this,[null,null,b]);this.lonlat=null;this.geometry=a?a:null;this.state=null;this.attributes={};b&&(this.attributes=OpenLayers.Util.extend(this.attributes,b));this.style=c?c:null},destroy:function(){this.layer&&(this.layer.removeFeatures(this),this.layer=
-null);this.modified=this.geometry=null;OpenLayers.Feature.prototype.destroy.apply(this,arguments)},clone:function(){return new OpenLayers.Feature.Vector(this.geometry?this.geometry.clone():null,this.attributes,this.style)},onScreen:function(a){var b=!1;this.layer&&this.layer.map&&(b=this.layer.map.getExtent(),a?(a=this.geometry.getBounds(),b=b.intersectsBounds(a)):b=b.toGeometry().intersects(this.geometry));return b},getVisibility:function(){return!(this.style&&"none"==this.style.display||!this.layer||
-this.layer&&this.layer.styleMap&&"none"==this.layer.styleMap.createSymbolizer(this,this.renderIntent).display||this.layer&&!this.layer.getVisibility())},createMarker:function(){return null},destroyMarker:function(){},createPopup:function(){return null},atPoint:function(a,b,c){var d=!1;this.geometry&&(d=this.geometry.atPoint(a,b,c));return d},destroyPopup:function(){},move:function(a){if(this.layer&&this.geometry.move){a="OpenLayers.LonLat"==a.CLASS_NAME?this.layer.getViewPortPxFromLonLat(a):a;var b=
-this.layer.getViewPortPxFromLonLat(this.geometry.getBounds().getCenterLonLat()),c=this.layer.map.getResolution();this.geometry.move(c*(a.x-b.x),c*(b.y-a.y));this.layer.drawFeature(this);return b}},toState:function(a){if(a==OpenLayers.State.UPDATE)switch(this.state){case OpenLayers.State.UNKNOWN:case OpenLayers.State.DELETE:this.state=a}else if(a==OpenLayers.State.INSERT)switch(this.state){case OpenLayers.State.UNKNOWN:break;default:this.state=a}else if(a==OpenLayers.State.DELETE)switch(this.state){case OpenLayers.State.UNKNOWN:case OpenLayers.State.UPDATE:this.state=
-a}else a==OpenLayers.State.UNKNOWN&&(this.state=a)},CLASS_NAME:"OpenLayers.Feature.Vector"});
-OpenLayers.Feature.Vector.style={"default":{fillColor:"#ee9900",fillOpacity:0.4,hoverFillColor:"white",hoverFillOpacity:0.8,strokeColor:"#ee9900",strokeOpacity:1,strokeWidth:1,strokeLinecap:"round",strokeDashstyle:"solid",hoverStrokeColor:"red",hoverStrokeOpacity:1,hoverStrokeWidth:0.2,pointRadius:6,hoverPointRadius:1,hoverPointUnit:"%",pointerEvents:"visiblePainted",cursor:"inherit",fontColor:"#000000",labelAlign:"cm",labelOutlineColor:"white",labelOutlineWidth:3},select:{fillColor:"blue",fillOpacity:0.4,
-hoverFillColor:"white",hoverFillOpacity:0.8,strokeColor:"blue",strokeOpacity:1,strokeWidth:2,strokeLinecap:"round",strokeDashstyle:"solid",hoverStrokeColor:"red",hoverStrokeOpacity:1,hoverStrokeWidth:0.2,pointRadius:6,hoverPointRadius:1,hoverPointUnit:"%",pointerEvents:"visiblePainted",cursor:"pointer",fontColor:"#000000",labelAlign:"cm",labelOutlineColor:"white",labelOutlineWidth:3},temporary:{fillColor:"#66cccc",fillOpacity:0.2,hoverFillColor:"white",hoverFillOpacity:0.8,strokeColor:"#66cccc",strokeOpacity:1,
-strokeLinecap:"round",strokeWidth:2,strokeDashstyle:"solid",hoverStrokeColor:"red",hoverStrokeOpacity:1,hoverStrokeWidth:0.2,pointRadius:6,hoverPointRadius:1,hoverPointUnit:"%",pointerEvents:"visiblePainted",cursor:"inherit",fontColor:"#000000",labelAlign:"cm",labelOutlineColor:"white",labelOutlineWidth:3},"delete":{display:"none"}};OpenLayers.Style=OpenLayers.Class({id:null,name:null,title:null,description:null,layerName:null,isDefault:!1,rules:null,context:null,defaultStyle:null,defaultsPerSymbolizer:!1,propertyStyles:null,initialize:function(a,b){OpenLayers.Util.extend(this,b);this.rules=[];b&&b.rules&&this.addRules(b.rules);this.setDefaultStyle(a||OpenLayers.Feature.Vector.style["default"]);this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_")},destroy:function(){for(var a=0,b=this.rules.length;a<b;a++)this.rules[a].destroy(),
-this.rules[a]=null;this.defaultStyle=this.rules=null},createSymbolizer:function(a){for(var b=this.defaultsPerSymbolizer?{}:this.createLiterals(OpenLayers.Util.extend({},this.defaultStyle),a),c=this.rules,d,e=[],f=!1,g=0,h=c.length;g<h;g++)d=c[g],d.evaluate(a)&&(d instanceof OpenLayers.Rule&&d.elseFilter?e.push(d):(f=!0,this.applySymbolizer(d,b,a)));if(!1==f&&0<e.length)for(f=!0,g=0,h=e.length;g<h;g++)this.applySymbolizer(e[g],b,a);0<c.length&&!1==f&&(b.display="none");null!=b.label&&"string"!==typeof b.label&&
-(b.label=String(b.label));return b},applySymbolizer:function(a,b,c){var d=c.geometry?this.getSymbolizerPrefix(c.geometry):OpenLayers.Style.SYMBOLIZER_PREFIXES[0];a=a.symbolizer[d]||a.symbolizer;!0===this.defaultsPerSymbolizer&&(d=this.defaultStyle,OpenLayers.Util.applyDefaults(a,{pointRadius:d.pointRadius}),!0!==a.stroke&&!0!==a.graphic||OpenLayers.Util.applyDefaults(a,{strokeWidth:d.strokeWidth,strokeColor:d.strokeColor,strokeOpacity:d.strokeOpacity,strokeDashstyle:d.strokeDashstyle,strokeLinecap:d.strokeLinecap}),
-!0!==a.fill&&!0!==a.graphic||OpenLayers.Util.applyDefaults(a,{fillColor:d.fillColor,fillOpacity:d.fillOpacity}),!0===a.graphic&&OpenLayers.Util.applyDefaults(a,{pointRadius:this.defaultStyle.pointRadius,externalGraphic:this.defaultStyle.externalGraphic,graphicName:this.defaultStyle.graphicName,graphicOpacity:this.defaultStyle.graphicOpacity,graphicWidth:this.defaultStyle.graphicWidth,graphicHeight:this.defaultStyle.graphicHeight,graphicXOffset:this.defaultStyle.graphicXOffset,graphicYOffset:this.defaultStyle.graphicYOffset}));
-return this.createLiterals(OpenLayers.Util.extend(b,a),c)},createLiterals:function(a,b){var c=OpenLayers.Util.extend({},b.attributes||b.data);OpenLayers.Util.extend(c,this.context);for(var d in this.propertyStyles)a[d]=OpenLayers.Style.createLiteral(a[d],c,b,d);return a},findPropertyStyles:function(){var a={};this.addPropertyStyles(a,this.defaultStyle);for(var b=this.rules,c,d,e=0,f=b.length;e<f;e++){c=b[e].symbolizer;for(var g in c)if(d=c[g],"object"==typeof d)this.addPropertyStyles(a,d);else{this.addPropertyStyles(a,
-c);break}}return a},addPropertyStyles:function(a,b){var c,d;for(d in b)c=b[d],"string"==typeof c&&c.match(/\$\{\w+\}/)&&(a[d]=!0);return a},addRules:function(a){Array.prototype.push.apply(this.rules,a);this.propertyStyles=this.findPropertyStyles()},setDefaultStyle:function(a){this.defaultStyle=a;this.propertyStyles=this.findPropertyStyles()},getSymbolizerPrefix:function(a){for(var b=OpenLayers.Style.SYMBOLIZER_PREFIXES,c=0,d=b.length;c<d;c++)if(-1!=a.CLASS_NAME.indexOf(b[c]))return b[c]},clone:function(){var a=
-OpenLayers.Util.extend({},this);if(this.rules){a.rules=[];for(var b=0,c=this.rules.length;b<c;++b)a.rules.push(this.rules[b].clone())}a.context=this.context&&OpenLayers.Util.extend({},this.context);b=OpenLayers.Util.extend({},this.defaultStyle);return new OpenLayers.Style(b,a)},CLASS_NAME:"OpenLayers.Style"});OpenLayers.Style.createLiteral=function(a,b,c,d){"string"==typeof a&&-1!=a.indexOf("${")&&(a=OpenLayers.String.format(a,b,[c,d]),a=isNaN(a)||!a?a:parseFloat(a));return a};
-OpenLayers.Style.SYMBOLIZER_PREFIXES=["Point","Line","Polygon","Text","Raster"];OpenLayers.Filter=OpenLayers.Class({initialize:function(a){OpenLayers.Util.extend(this,a)},destroy:function(){},evaluate:function(a){return!0},clone:function(){return null},toString:function(){return OpenLayers.Format&&OpenLayers.Format.CQL?OpenLayers.Format.CQL.prototype.write(this):Object.prototype.toString.call(this)},CLASS_NAME:"OpenLayers.Filter"});OpenLayers.Filter.Spatial=OpenLayers.Class(OpenLayers.Filter,{type:null,property:null,value:null,distance:null,distanceUnits:null,evaluate:function(a){var b=!1;switch(this.type){case OpenLayers.Filter.Spatial.BBOX:case OpenLayers.Filter.Spatial.INTERSECTS:if(a.geometry){var c=this.value;"OpenLayers.Bounds"==this.value.CLASS_NAME&&(c=this.value.toGeometry());a.geometry.intersects(c)&&(b=!0)}break;default:throw Error("evaluate is not implemented for this filter type.");}return b},clone:function(){var a=
-OpenLayers.Util.applyDefaults({value:this.value&&this.value.clone&&this.value.clone()},this);return new OpenLayers.Filter.Spatial(a)},CLASS_NAME:"OpenLayers.Filter.Spatial"});OpenLayers.Filter.Spatial.BBOX="BBOX";OpenLayers.Filter.Spatial.INTERSECTS="INTERSECTS";OpenLayers.Filter.Spatial.DWITHIN="DWITHIN";OpenLayers.Filter.Spatial.WITHIN="WITHIN";OpenLayers.Filter.Spatial.CONTAINS="CONTAINS";OpenLayers.Filter.FeatureId=OpenLayers.Class(OpenLayers.Filter,{fids:null,type:"FID",initialize:function(a){this.fids=[];OpenLayers.Filter.prototype.initialize.apply(this,[a])},evaluate:function(a){for(var b=0,c=this.fids.length;b<c;b++)if((a.fid||a.id)==this.fids[b])return!0;return!1},clone:function(){var a=new OpenLayers.Filter.FeatureId;OpenLayers.Util.extend(a,this);a.fids=this.fids.slice();return a},CLASS_NAME:"OpenLayers.Filter.FeatureId"});OpenLayers.Format.WFST.v1=OpenLayers.Class(OpenLayers.Format.XML,{namespaces:{xlink:"http://www.w3.org/1999/xlink",xsi:"http://www.w3.org/2001/XMLSchema-instance",wfs:"http://www.opengis.net/wfs",gml:"http://www.opengis.net/gml",ogc:"http://www.opengis.net/ogc",ows:"http://www.opengis.net/ows"},defaultPrefix:"wfs",version:null,schemaLocations:null,srsName:null,extractAttributes:!0,xy:!0,stateName:null,initialize:function(a){this.stateName={};this.stateName[OpenLayers.State.INSERT]="wfs:Insert";this.stateName[OpenLayers.State.UPDATE]=
-"wfs:Update";this.stateName[OpenLayers.State.DELETE]="wfs:Delete";OpenLayers.Format.XML.prototype.initialize.apply(this,[a])},getSrsName:function(a,b){var c=b&&b.srsName;c||(c=a&&a.layer?a.layer.projection.getCode():this.srsName);return c},read:function(a,b){b=b||{};OpenLayers.Util.applyDefaults(b,{output:"features"});"string"==typeof a&&(a=OpenLayers.Format.XML.prototype.read.apply(this,[a]));a&&9==a.nodeType&&(a=a.documentElement);var c={};a&&this.readNode(a,c,!0);c.features&&"features"===b.output&&
-(c=c.features);return c},readers:{wfs:{FeatureCollection:function(a,b){b.features=[];this.readChildNodes(a,b)}}},write:function(a,b){var c=this.writeNode("wfs:Transaction",{features:a,options:b}),d=this.schemaLocationAttr();d&&this.setAttributeNS(c,this.namespaces.xsi,"xsi:schemaLocation",d);return OpenLayers.Format.XML.prototype.write.apply(this,[c])},writers:{wfs:{GetFeature:function(a){var b=this.createElementNSPlus("wfs:GetFeature",{attributes:{service:"WFS",version:this.version,handle:a&&a.handle,
-outputFormat:a&&a.outputFormat,maxFeatures:a&&a.maxFeatures,"xsi:schemaLocation":this.schemaLocationAttr(a)}});if("string"==typeof this.featureType)this.writeNode("Query",a,b);else for(var c=0,d=this.featureType.length;c<d;c++)a.featureType=this.featureType[c],this.writeNode("Query",a,b);return b},Transaction:function(a){a=a||{};var b=a.options||{},c=this.createElementNSPlus("wfs:Transaction",{attributes:{service:"WFS",version:this.version,handle:b.handle}}),d,e=a.features;if(e){!0===b.multi&&OpenLayers.Util.extend(this.geometryTypes,
-{"OpenLayers.Geometry.Point":"MultiPoint","OpenLayers.Geometry.LineString":!0===this.multiCurve?"MultiCurve":"MultiLineString","OpenLayers.Geometry.Polygon":!0===this.multiSurface?"MultiSurface":"MultiPolygon"});var f,g;a=0;for(d=e.length;a<d;++a)g=e[a],(f=this.stateName[g.state])&&this.writeNode(f,{feature:g,options:b},c);!0===b.multi&&this.setGeometryTypes()}if(b.nativeElements)for(a=0,d=b.nativeElements.length;a<d;++a)this.writeNode("wfs:Native",b.nativeElements[a],c);return c},Native:function(a){return this.createElementNSPlus("wfs:Native",
-{attributes:{vendorId:a.vendorId,safeToIgnore:a.safeToIgnore},value:a.value})},Insert:function(a){var b=a.feature;a=a.options;a=this.createElementNSPlus("wfs:Insert",{attributes:{handle:a&&a.handle}});this.srsName=this.getSrsName(b);this.writeNode("feature:_typeName",b,a);return a},Update:function(a){var b=a.feature;a=a.options;a=this.createElementNSPlus("wfs:Update",{attributes:{handle:a&&a.handle,typeName:(this.featureNS?this.featurePrefix+":":"")+this.featureType}});this.featureNS&&a.setAttribute("xmlns:"+
-this.featurePrefix,this.featureNS);var c=b.modified;null===this.geometryName||c&&void 0===c.geometry||(this.srsName=this.getSrsName(b),this.writeNode("Property",{name:this.geometryName,value:b.geometry},a));for(var d in b.attributes)void 0===b.attributes[d]||c&&c.attributes&&(!c.attributes||void 0===c.attributes[d])||this.writeNode("Property",{name:d,value:b.attributes[d]},a);this.writeNode("ogc:Filter",new OpenLayers.Filter.FeatureId({fids:[b.fid]}),a);return a},Property:function(a){var b=this.createElementNSPlus("wfs:Property");
-this.writeNode("Name",a.name,b);null!==a.value&&this.writeNode("Value",a.value,b);return b},Name:function(a){return this.createElementNSPlus("wfs:Name",{value:a})},Value:function(a){var b;a instanceof OpenLayers.Geometry?(b=this.createElementNSPlus("wfs:Value"),a=this.writeNode("feature:_geometry",a).firstChild,b.appendChild(a)):b=this.createElementNSPlus("wfs:Value",{value:a});return b},Delete:function(a){var b=a.feature;a=a.options;a=this.createElementNSPlus("wfs:Delete",{attributes:{handle:a&&
-a.handle,typeName:(this.featureNS?this.featurePrefix+":":"")+this.featureType}});this.featureNS&&a.setAttribute("xmlns:"+this.featurePrefix,this.featureNS);this.writeNode("ogc:Filter",new OpenLayers.Filter.FeatureId({fids:[b.fid]}),a);return a}}},schemaLocationAttr:function(a){a=OpenLayers.Util.extend({featurePrefix:this.featurePrefix,schema:this.schema},a);var b=OpenLayers.Util.extend({},this.schemaLocations);a.schema&&(b[a.featurePrefix]=a.schema);a=[];var c,d;for(d in b)(c=this.namespaces[d])&&
-a.push(c+" "+b[d]);return a.join(" ")||void 0},setFilterProperty:function(a){if(a.filters)for(var b=0,c=a.filters.length;b<c;++b)OpenLayers.Format.WFST.v1.prototype.setFilterProperty.call(this,a.filters[b]);else a instanceof OpenLayers.Filter.Spatial&&!a.property&&(a.property=this.geometryName)},CLASS_NAME:"OpenLayers.Format.WFST.v1"});OpenLayers.Format.OGCExceptionReport=OpenLayers.Class(OpenLayers.Format.XML,{namespaces:{ogc:"http://www.opengis.net/ogc"},regExes:{trimSpace:/^\s*|\s*$/g,removeSpace:/\s*/g,splitSpace:/\s+/,trimComma:/\s*,\s*/g},defaultPrefix:"ogc",read:function(a){"string"==typeof a&&(a=OpenLayers.Format.XML.prototype.read.apply(this,[a]));var b={exceptionReport:null};a.documentElement&&(this.readChildNodes(a,b),null===b.exceptionReport&&(b=(new OpenLayers.Format.OWSCommon).read(a)));return b},readers:{ogc:{ServiceExceptionReport:function(a,
-b){b.exceptionReport={exceptions:[]};this.readChildNodes(a,b.exceptionReport)},ServiceException:function(a,b){var c={code:a.getAttribute("code"),locator:a.getAttribute("locator"),text:this.getChildValue(a)};b.exceptions.push(c)}}},CLASS_NAME:"OpenLayers.Format.OGCExceptionReport"});OpenLayers.Format.XML.VersionedOGC=OpenLayers.Class(OpenLayers.Format.XML,{defaultVersion:null,version:null,profile:null,allowFallback:!1,name:null,stringifyOutput:!1,parser:null,initialize:function(a){OpenLayers.Format.XML.prototype.initialize.apply(this,[a]);a=this.CLASS_NAME;this.name=a.substring(a.lastIndexOf(".")+1)},getVersion:function(a,b){var c;a?(c=this.version,c||(c=a.getAttribute("version"),c||(c=this.defaultVersion))):c=b&&b.version||this.version||this.defaultVersion;return c},getParser:function(a){a=
-a||this.defaultVersion;var b=this.profile?"_"+this.profile:"";if(!this.parser||this.parser.VERSION!=a){var c=OpenLayers.Format[this.name]["v"+a.replace(/\./g,"_")+b];if(!c&&(""!==b&&this.allowFallback&&(b="",c=OpenLayers.Format[this.name]["v"+a.replace(/\./g,"_")]),!c))throw"Can't find a "+this.name+" parser for version "+a+b;this.parser=new c(this.options)}return this.parser},write:function(a,b){var c=this.getVersion(null,b);this.parser=this.getParser(c);c=this.parser.write(a,b);return!1===this.stringifyOutput?
-c:OpenLayers.Format.XML.prototype.write.apply(this,[c])},read:function(a,b){"string"==typeof a&&(a=OpenLayers.Format.XML.prototype.read.apply(this,[a]));var c=this.getVersion(a.documentElement);this.parser=this.getParser(c);var d=this.parser.read(a,b),e=this.parser.errorProperty||null;null!==e&&void 0===d[e]&&(e=new OpenLayers.Format.OGCExceptionReport,d.error=e.read(a));d.version=c;return d},CLASS_NAME:"OpenLayers.Format.XML.VersionedOGC"});OpenLayers.Filter.Logical=OpenLayers.Class(OpenLayers.Filter,{filters:null,type:null,initialize:function(a){this.filters=[];OpenLayers.Filter.prototype.initialize.apply(this,[a])},destroy:function(){this.filters=null;OpenLayers.Filter.prototype.destroy.apply(this)},evaluate:function(a){var b,c;switch(this.type){case OpenLayers.Filter.Logical.AND:b=0;for(c=this.filters.length;b<c;b++)if(!1==this.filters[b].evaluate(a))return!1;return!0;case OpenLayers.Filter.Logical.OR:b=0;for(c=this.filters.length;b<
-c;b++)if(!0==this.filters[b].evaluate(a))return!0;return!1;case OpenLayers.Filter.Logical.NOT:return!this.filters[0].evaluate(a)}},clone:function(){for(var a=[],b=0,c=this.filters.length;b<c;++b)a.push(this.filters[b].clone());return new OpenLayers.Filter.Logical({type:this.type,filters:a})},CLASS_NAME:"OpenLayers.Filter.Logical"});OpenLayers.Filter.Logical.AND="&&";OpenLayers.Filter.Logical.OR="||";OpenLayers.Filter.Logical.NOT="!";OpenLayers.Filter.Comparison=OpenLayers.Class(OpenLayers.Filter,{type:null,property:null,value:null,matchCase:!0,lowerBoundary:null,upperBoundary:null,initialize:function(a){OpenLayers.Filter.prototype.initialize.apply(this,[a]);this.type===OpenLayers.Filter.Comparison.LIKE&&void 0===a.matchCase&&(this.matchCase=null)},evaluate:function(a){a instanceof OpenLayers.Feature.Vector&&(a=a.attributes);var b=!1;a=a[this.property];switch(this.type){case OpenLayers.Filter.Comparison.EQUAL_TO:b=this.value;
-b=this.matchCase||"string"!=typeof a||"string"!=typeof b?a==b:a.toUpperCase()==b.toUpperCase();break;case OpenLayers.Filter.Comparison.NOT_EQUAL_TO:b=this.value;b=this.matchCase||"string"!=typeof a||"string"!=typeof b?a!=b:a.toUpperCase()!=b.toUpperCase();break;case OpenLayers.Filter.Comparison.LESS_THAN:b=a<this.value;break;case OpenLayers.Filter.Comparison.GREATER_THAN:b=a>this.value;break;case OpenLayers.Filter.Comparison.LESS_THAN_OR_EQUAL_TO:b=a<=this.value;break;case OpenLayers.Filter.Comparison.GREATER_THAN_OR_EQUAL_TO:b=
-a>=this.value;break;case OpenLayers.Filter.Comparison.BETWEEN:b=a>=this.lowerBoundary&&a<=this.upperBoundary;break;case OpenLayers.Filter.Comparison.LIKE:b=RegExp(this.value,"gi").test(a);break;case OpenLayers.Filter.Comparison.IS_NULL:b=null===a}return b},value2regex:function(a,b,c){if("."==a)throw Error("'.' is an unsupported wildCard character for OpenLayers.Filter.Comparison");a=a?a:"*";b=b?b:".";this.value=this.value.replace(RegExp("\\"+(c?c:"!")+"(.|$)","g"),"\\$1");this.value=this.value.replace(RegExp("\\"+
-b,"g"),".");this.value=this.value.replace(RegExp("\\"+a,"g"),".*");this.value=this.value.replace(RegExp("\\\\.\\*","g"),"\\"+a);return this.value=this.value.replace(RegExp("\\\\\\.","g"),"\\"+b)},regex2value:function(){var a=this.value,a=a.replace(/!/g,"!!"),a=a.replace(/(\\)?\\\./g,function(a,c){return c?a:"!."}),a=a.replace(/(\\)?\\\*/g,function(a,c){return c?a:"!*"}),a=a.replace(/\\\\/g,"\\");return a=a.replace(/\.\*/g,"*")},clone:function(){return OpenLayers.Util.extend(new OpenLayers.Filter.Comparison,
-this)},CLASS_NAME:"OpenLayers.Filter.Comparison"});OpenLayers.Filter.Comparison.EQUAL_TO="==";OpenLayers.Filter.Comparison.NOT_EQUAL_TO="!=";OpenLayers.Filter.Comparison.LESS_THAN="<";OpenLayers.Filter.Comparison.GREATER_THAN=">";OpenLayers.Filter.Comparison.LESS_THAN_OR_EQUAL_TO="<=";OpenLayers.Filter.Comparison.GREATER_THAN_OR_EQUAL_TO=">=";OpenLayers.Filter.Comparison.BETWEEN="..";OpenLayers.Filter.Comparison.LIKE="~";OpenLayers.Filter.Comparison.IS_NULL="NULL";OpenLayers.Format.Filter=OpenLayers.Class(OpenLayers.Format.XML.VersionedOGC,{defaultVersion:"1.0.0",CLASS_NAME:"OpenLayers.Format.Filter"});OpenLayers.Filter.Function=OpenLayers.Class(OpenLayers.Filter,{name:null,params:null,CLASS_NAME:"OpenLayers.Filter.Function"});OpenLayers.Date={dateRegEx:/^(?:(\d{4})(?:-(\d{2})(?:-(\d{2}))?)?)?(?:(?:T(\d{1,2}):(\d{2}):(\d{2}(?:\.\d+)?)(Z|(?:[+-]\d{1,2}(?::(\d{2}))?)))|Z)?$/,toISOString:function(){return"toISOString"in Date.prototype?function(a){return a.toISOString()}:function(a){return isNaN(a.getTime())?"Invalid Date":a.getUTCFullYear()+"-"+OpenLayers.Number.zeroPad(a.getUTCMonth()+1,2)+"-"+OpenLayers.Number.zeroPad(a.getUTCDate(),2)+"T"+OpenLayers.Number.zeroPad(a.getUTCHours(),2)+":"+OpenLayers.Number.zeroPad(a.getUTCMinutes(),
-2)+":"+OpenLayers.Number.zeroPad(a.getUTCSeconds(),2)+"."+OpenLayers.Number.zeroPad(a.getUTCMilliseconds(),3)+"Z"}}(),parse:function(a){var b;if((a=a.match(this.dateRegEx))&&(a[1]||a[7])){b=parseInt(a[1],10)||0;var c=parseInt(a[2],10)-1||0,d=parseInt(a[3],10)||1;b=new Date(Date.UTC(b,c,d));if(c=a[7]){var d=parseInt(a[4],10),e=parseInt(a[5],10),f=parseFloat(a[6]),g=f|0,f=Math.round(1E3*(f-g));b.setUTCHours(d,e,g,f);"Z"!==c&&(c=parseInt(c,10),a=parseInt(a[8],10)||0,a=-1E3*(60*60*c+60*a),b=new Date(b.getTime()+
-a))}}else b=new Date("invalid");return b}};OpenLayers.Format.Filter.v1=OpenLayers.Class(OpenLayers.Format.XML,{namespaces:{ogc:"http://www.opengis.net/ogc",gml:"http://www.opengis.net/gml",xlink:"http://www.w3.org/1999/xlink",xsi:"http://www.w3.org/2001/XMLSchema-instance"},defaultPrefix:"ogc",schemaLocation:null,initialize:function(a){OpenLayers.Format.XML.prototype.initialize.apply(this,[a])},read:function(a){var b={};this.readers.ogc.Filter.apply(this,[a,b]);return b.filter},readers:{ogc:{_expression:function(a){for(var b="",c=a.firstChild;c;c=
-c.nextSibling)switch(c.nodeType){case 1:a=this.readNode(c);a.property?b+="${"+a.property+"}":void 0!==a.value&&(b+=a.value);break;case 3:case 4:b+=c.nodeValue}return b},Filter:function(a,b){var c={fids:[],filters:[]};this.readChildNodes(a,c);0<c.fids.length?b.filter=new OpenLayers.Filter.FeatureId({fids:c.fids}):0<c.filters.length&&(b.filter=c.filters[0])},FeatureId:function(a,b){var c=a.getAttribute("fid");c&&b.fids.push(c)},And:function(a,b){var c=new OpenLayers.Filter.Logical({type:OpenLayers.Filter.Logical.AND});
-this.readChildNodes(a,c);b.filters.push(c)},Or:function(a,b){var c=new OpenLayers.Filter.Logical({type:OpenLayers.Filter.Logical.OR});this.readChildNodes(a,c);b.filters.push(c)},Not:function(a,b){var c=new OpenLayers.Filter.Logical({type:OpenLayers.Filter.Logical.NOT});this.readChildNodes(a,c);b.filters.push(c)},PropertyIsLessThan:function(a,b){var c=new OpenLayers.Filter.Comparison({type:OpenLayers.Filter.Comparison.LESS_THAN});this.readChildNodes(a,c);b.filters.push(c)},PropertyIsGreaterThan:function(a,
-b){var c=new OpenLayers.Filter.Comparison({type:OpenLayers.Filter.Comparison.GREATER_THAN});this.readChildNodes(a,c);b.filters.push(c)},PropertyIsLessThanOrEqualTo:function(a,b){var c=new OpenLayers.Filter.Comparison({type:OpenLayers.Filter.Comparison.LESS_THAN_OR_EQUAL_TO});this.readChildNodes(a,c);b.filters.push(c)},PropertyIsGreaterThanOrEqualTo:function(a,b){var c=new OpenLayers.Filter.Comparison({type:OpenLayers.Filter.Comparison.GREATER_THAN_OR_EQUAL_TO});this.readChildNodes(a,c);b.filters.push(c)},
-PropertyIsBetween:function(a,b){var c=new OpenLayers.Filter.Comparison({type:OpenLayers.Filter.Comparison.BETWEEN});this.readChildNodes(a,c);b.filters.push(c)},Literal:function(a,b){b.value=OpenLayers.String.numericIf(this.getChildValue(a),!0)},PropertyName:function(a,b){b.property=this.getChildValue(a)},LowerBoundary:function(a,b){b.lowerBoundary=OpenLayers.String.numericIf(this.readers.ogc._expression.call(this,a),!0)},UpperBoundary:function(a,b){b.upperBoundary=OpenLayers.String.numericIf(this.readers.ogc._expression.call(this,
-a),!0)},Intersects:function(a,b){this.readSpatial(a,b,OpenLayers.Filter.Spatial.INTERSECTS)},Within:function(a,b){this.readSpatial(a,b,OpenLayers.Filter.Spatial.WITHIN)},Contains:function(a,b){this.readSpatial(a,b,OpenLayers.Filter.Spatial.CONTAINS)},DWithin:function(a,b){this.readSpatial(a,b,OpenLayers.Filter.Spatial.DWITHIN)},Distance:function(a,b){b.distance=parseInt(this.getChildValue(a));b.distanceUnits=a.getAttribute("units")},Function:function(a,b){},PropertyIsNull:function(a,b){var c=new OpenLayers.Filter.Comparison({type:OpenLayers.Filter.Comparison.IS_NULL});
-this.readChildNodes(a,c);b.filters.push(c)}}},readSpatial:function(a,b,c){c=new OpenLayers.Filter.Spatial({type:c});this.readChildNodes(a,c);c.value=c.components[0];delete c.components;b.filters.push(c)},encodeLiteral:function(a){a instanceof Date&&(a=OpenLayers.Date.toISOString(a));return a},writeOgcExpression:function(a,b){a instanceof OpenLayers.Filter.Function?this.writeNode("Function",a,b):this.writeNode("Literal",a,b);return b},write:function(a){return this.writers.ogc.Filter.apply(this,[a])},
-writers:{ogc:{Filter:function(a){var b=this.createElementNSPlus("ogc:Filter");this.writeNode(this.getFilterType(a),a,b);return b},_featureIds:function(a){for(var b=this.createDocumentFragment(),c=0,d=a.fids.length;c<d;++c)this.writeNode("ogc:FeatureId",a.fids[c],b);return b},FeatureId:function(a){return this.createElementNSPlus("ogc:FeatureId",{attributes:{fid:a}})},And:function(a){for(var b=this.createElementNSPlus("ogc:And"),c,d=0,e=a.filters.length;d<e;++d)c=a.filters[d],this.writeNode(this.getFilterType(c),
-c,b);return b},Or:function(a){for(var b=this.createElementNSPlus("ogc:Or"),c,d=0,e=a.filters.length;d<e;++d)c=a.filters[d],this.writeNode(this.getFilterType(c),c,b);return b},Not:function(a){var b=this.createElementNSPlus("ogc:Not");a=a.filters[0];this.writeNode(this.getFilterType(a),a,b);return b},PropertyIsLessThan:function(a){var b=this.createElementNSPlus("ogc:PropertyIsLessThan");this.writeNode("PropertyName",a,b);this.writeOgcExpression(a.value,b);return b},PropertyIsGreaterThan:function(a){var b=
-this.createElementNSPlus("ogc:PropertyIsGreaterThan");this.writeNode("PropertyName",a,b);this.writeOgcExpression(a.value,b);return b},PropertyIsLessThanOrEqualTo:function(a){var b=this.createElementNSPlus("ogc:PropertyIsLessThanOrEqualTo");this.writeNode("PropertyName",a,b);this.writeOgcExpression(a.value,b);return b},PropertyIsGreaterThanOrEqualTo:function(a){var b=this.createElementNSPlus("ogc:PropertyIsGreaterThanOrEqualTo");this.writeNode("PropertyName",a,b);this.writeOgcExpression(a.value,b);
-return b},PropertyIsBetween:function(a){var b=this.createElementNSPlus("ogc:PropertyIsBetween");this.writeNode("PropertyName",a,b);this.writeNode("LowerBoundary",a,b);this.writeNode("UpperBoundary",a,b);return b},PropertyName:function(a){return this.createElementNSPlus("ogc:PropertyName",{value:a.property})},Literal:function(a){return this.createElementNSPlus("ogc:Literal",{value:(this.encodeLiteral||OpenLayers.Format.Filter.v1.prototype.encodeLiteral)(a)})},LowerBoundary:function(a){var b=this.createElementNSPlus("ogc:LowerBoundary");
-this.writeOgcExpression(a.lowerBoundary,b);return b},UpperBoundary:function(a){var b=this.createElementNSPlus("ogc:UpperBoundary");this.writeNode("Literal",a.upperBoundary,b);return b},INTERSECTS:function(a){return this.writeSpatial(a,"Intersects")},WITHIN:function(a){return this.writeSpatial(a,"Within")},CONTAINS:function(a){return this.writeSpatial(a,"Contains")},DWITHIN:function(a){var b=this.writeSpatial(a,"DWithin");this.writeNode("Distance",a,b);return b},Distance:function(a){return this.createElementNSPlus("ogc:Distance",
-{attributes:{units:a.distanceUnits},value:a.distance})},Function:function(a){var b=this.createElementNSPlus("ogc:Function",{attributes:{name:a.name}});a=a.params;for(var c=0,d=a.length;c<d;c++)this.writeOgcExpression(a[c],b);return b},PropertyIsNull:function(a){var b=this.createElementNSPlus("ogc:PropertyIsNull");this.writeNode("PropertyName",a,b);return b}}},getFilterType:function(a){var b=this.filterMap[a.type];if(!b)throw"Filter writing not supported for rule type: "+a.type;return b},filterMap:{"&&":"And",
-"||":"Or","!":"Not","==":"PropertyIsEqualTo","!=":"PropertyIsNotEqualTo","<":"PropertyIsLessThan",">":"PropertyIsGreaterThan","<=":"PropertyIsLessThanOrEqualTo",">=":"PropertyIsGreaterThanOrEqualTo","..":"PropertyIsBetween","~":"PropertyIsLike",NULL:"PropertyIsNull",BBOX:"BBOX",DWITHIN:"DWITHIN",WITHIN:"WITHIN",CONTAINS:"CONTAINS",INTERSECTS:"INTERSECTS",FID:"_featureIds"},CLASS_NAME:"OpenLayers.Format.Filter.v1"});OpenLayers.Geometry=OpenLayers.Class({id:null,parent:null,bounds:null,initialize:function(){this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_")},destroy:function(){this.bounds=this.id=null},clone:function(){return new OpenLayers.Geometry},setBounds:function(a){a&&(this.bounds=a.clone())},clearBounds:function(){this.bounds=null;this.parent&&this.parent.clearBounds()},extendBounds:function(a){this.getBounds()?this.bounds.extend(a):this.setBounds(a)},getBounds:function(){null==this.bounds&&this.calculateBounds();
-return this.bounds},calculateBounds:function(){},distanceTo:function(a,b){},getVertices:function(a){},atPoint:function(a,b,c){var d=!1;null!=this.getBounds()&&null!=a&&(b=null!=b?b:0,c=null!=c?c:0,d=(new OpenLayers.Bounds(this.bounds.left-b,this.bounds.bottom-c,this.bounds.right+b,this.bounds.top+c)).containsLonLat(a));return d},getLength:function(){return 0},getArea:function(){return 0},getCentroid:function(){return null},toString:function(){return OpenLayers.Format&&OpenLayers.Format.WKT?OpenLayers.Format.WKT.prototype.write(new OpenLayers.Feature.Vector(this)):
-Object.prototype.toString.call(this)},CLASS_NAME:"OpenLayers.Geometry"});OpenLayers.Geometry.fromWKT=function(a){var b;if(OpenLayers.Format&&OpenLayers.Format.WKT){var c=OpenLayers.Geometry.fromWKT.format;c||(c=new OpenLayers.Format.WKT,OpenLayers.Geometry.fromWKT.format=c);a=c.read(a);if(a instanceof OpenLayers.Feature.Vector)b=a.geometry;else if(OpenLayers.Util.isArray(a)){b=a.length;for(var c=Array(b),d=0;d<b;++d)c[d]=a[d].geometry;b=new OpenLayers.Geometry.Collection(c)}}return b};
-OpenLayers.Geometry.segmentsIntersect=function(a,b,c){var d=c&&c.point;c=c&&c.tolerance;var e=!1,f=a.x1-b.x1,g=a.y1-b.y1,h=a.x2-a.x1,k=a.y2-a.y1,l=b.y2-b.y1,m=b.x2-b.x1,n=l*h-m*k,l=m*g-l*f,g=h*g-k*f;0==n?0==l&&0==g&&(e=!0):(f=l/n,n=g/n,0<=f&&(1>=f&&0<=n&&1>=n)&&(d?(h=a.x1+f*h,n=a.y1+f*k,e=new OpenLayers.Geometry.Point(h,n)):e=!0));if(c)if(e){if(d)a:for(a=[a,b],b=0;2>b;++b)for(f=a[b],k=1;3>k;++k)if(h=f["x"+k],n=f["y"+k],d=Math.sqrt(Math.pow(h-e.x,2)+Math.pow(n-e.y,2)),d<c){e.x=h;e.y=n;break a}}else a:for(a=
-[a,b],b=0;2>b;++b)for(h=a[b],n=a[(b+1)%2],k=1;3>k;++k)if(f={x:h["x"+k],y:h["y"+k]},g=OpenLayers.Geometry.distanceToSegment(f,n),g.distance<c){e=d?new OpenLayers.Geometry.Point(f.x,f.y):!0;break a}return e};OpenLayers.Geometry.distanceToSegment=function(a,b){var c=OpenLayers.Geometry.distanceSquaredToSegment(a,b);c.distance=Math.sqrt(c.distance);return c};
-OpenLayers.Geometry.distanceSquaredToSegment=function(a,b){var c=a.x,d=a.y,e=b.x1,f=b.y1,g=b.x2,h=b.y2,k=g-e,l=h-f,m=(k*(c-e)+l*(d-f))/(Math.pow(k,2)+Math.pow(l,2));0>=m||(1<=m?(e=g,f=h):(e+=m*k,f+=m*l));return{distance:Math.pow(e-c,2)+Math.pow(f-d,2),x:e,y:f,along:m}};OpenLayers.Geometry.Point=OpenLayers.Class(OpenLayers.Geometry,{x:null,y:null,initialize:function(a,b){OpenLayers.Geometry.prototype.initialize.apply(this,arguments);this.x=parseFloat(a);this.y=parseFloat(b)},clone:function(a){null==a&&(a=new OpenLayers.Geometry.Point(this.x,this.y));OpenLayers.Util.applyDefaults(a,this);return a},calculateBounds:function(){this.bounds=new OpenLayers.Bounds(this.x,this.y,this.x,this.y)},distanceTo:function(a,b){var c=!(b&&!1===b.edge)&&b&&b.details,d,e,f,g,h;a instanceof
-OpenLayers.Geometry.Point?(e=this.x,f=this.y,g=a.x,h=a.y,d=Math.sqrt(Math.pow(e-g,2)+Math.pow(f-h,2)),d=c?{x0:e,y0:f,x1:g,y1:h,distance:d}:d):(d=a.distanceTo(this,b),c&&(d={x0:d.x1,y0:d.y1,x1:d.x0,y1:d.y0,distance:d.distance}));return d},equals:function(a){var b=!1;null!=a&&(b=this.x==a.x&&this.y==a.y||isNaN(this.x)&&isNaN(this.y)&&isNaN(a.x)&&isNaN(a.y));return b},toShortString:function(){return this.x+", "+this.y},move:function(a,b){this.x+=a;this.y+=b;this.clearBounds()},rotate:function(a,b){a*=
-Math.PI/180;var c=this.distanceTo(b),d=a+Math.atan2(this.y-b.y,this.x-b.x);this.x=b.x+c*Math.cos(d);this.y=b.y+c*Math.sin(d);this.clearBounds()},getCentroid:function(){return new OpenLayers.Geometry.Point(this.x,this.y)},resize:function(a,b,c){this.x=b.x+a*(void 0==c?1:c)*(this.x-b.x);this.y=b.y+a*(this.y-b.y);this.clearBounds();return this},intersects:function(a){var b=!1;return b="OpenLayers.Geometry.Point"==a.CLASS_NAME?this.equals(a):a.intersects(this)},transform:function(a,b){a&&b&&(OpenLayers.Projection.transform(this,
-a,b),this.bounds=null);return this},getVertices:function(a){return[this]},CLASS_NAME:"OpenLayers.Geometry.Point"});OpenLayers.Geometry.Collection=OpenLayers.Class(OpenLayers.Geometry,{components:null,componentTypes:null,initialize:function(a){OpenLayers.Geometry.prototype.initialize.apply(this,arguments);this.components=[];null!=a&&this.addComponents(a)},destroy:function(){this.components.length=0;this.components=null;OpenLayers.Geometry.prototype.destroy.apply(this,arguments)},clone:function(){for(var a=eval("new "+this.CLASS_NAME+"()"),b=0,c=this.components.length;b<c;b++)a.addComponent(this.components[b].clone());
-OpenLayers.Util.applyDefaults(a,this);return a},getComponentsString:function(){for(var a=[],b=0,c=this.components.length;b<c;b++)a.push(this.components[b].toShortString());return a.join(",")},calculateBounds:function(){this.bounds=null;var a=new OpenLayers.Bounds,b=this.components;if(b)for(var c=0,d=b.length;c<d;c++)a.extend(b[c].getBounds());null!=a.left&&(null!=a.bottom&&null!=a.right&&null!=a.top)&&this.setBounds(a)},addComponents:function(a){OpenLayers.Util.isArray(a)||(a=[a]);for(var b=0,c=a.length;b<
-c;b++)this.addComponent(a[b])},addComponent:function(a,b){var c=!1;if(a&&(null==this.componentTypes||-1<OpenLayers.Util.indexOf(this.componentTypes,a.CLASS_NAME))){if(null!=b&&b<this.components.length){var c=this.components.slice(0,b),d=this.components.slice(b,this.components.length);c.push(a);this.components=c.concat(d)}else this.components.push(a);a.parent=this;this.clearBounds();c=!0}return c},removeComponents:function(a){var b=!1;OpenLayers.Util.isArray(a)||(a=[a]);for(var c=a.length-1;0<=c;--c)b=
-this.removeComponent(a[c])||b;return b},removeComponent:function(a){OpenLayers.Util.removeItem(this.components,a);this.clearBounds();return!0},getLength:function(){for(var a=0,b=0,c=this.components.length;b<c;b++)a+=this.components[b].getLength();return a},getArea:function(){for(var a=0,b=0,c=this.components.length;b<c;b++)a+=this.components[b].getArea();return a},getGeodesicArea:function(a){for(var b=0,c=0,d=this.components.length;c<d;c++)b+=this.components[c].getGeodesicArea(a);return b},getCentroid:function(a){if(!a)return this.components.length&&
-this.components[0].getCentroid();a=this.components.length;if(!a)return!1;for(var b=[],c=[],d=0,e=Number.MAX_VALUE,f,g=0;g<a;++g){f=this.components[g];var h=f.getArea();f=f.getCentroid(!0);isNaN(h)||(isNaN(f.x)||isNaN(f.y))||(b.push(h),d+=h,e=h<e&&0<h?h:e,c.push(f))}a=b.length;if(0===d){for(g=0;g<a;++g)b[g]=1;d=b.length}else{for(g=0;g<a;++g)b[g]/=e;d/=e}for(var k=e=0,g=0;g<a;++g)f=c[g],h=b[g],e+=f.x*h,k+=f.y*h;return new OpenLayers.Geometry.Point(e/d,k/d)},getGeodesicLength:function(a){for(var b=0,
-c=0,d=this.components.length;c<d;c++)b+=this.components[c].getGeodesicLength(a);return b},move:function(a,b){for(var c=0,d=this.components.length;c<d;c++)this.components[c].move(a,b)},rotate:function(a,b){for(var c=0,d=this.components.length;c<d;++c)this.components[c].rotate(a,b)},resize:function(a,b,c){for(var d=0;d<this.components.length;++d)this.components[d].resize(a,b,c);return this},distanceTo:function(a,b){for(var c=!(b&&!1===b.edge)&&b&&b.details,d,e,f,g=Number.POSITIVE_INFINITY,h=0,k=this.components.length;h<
-k&&!(d=this.components[h].distanceTo(a,b),f=c?d.distance:d,f<g&&(g=f,e=d,0==g));++h);return e},equals:function(a){var b=!0;if(a&&a.CLASS_NAME&&this.CLASS_NAME==a.CLASS_NAME)if(OpenLayers.Util.isArray(a.components)&&a.components.length==this.components.length)for(var c=0,d=this.components.length;c<d;++c){if(!this.components[c].equals(a.components[c])){b=!1;break}}else b=!1;else b=!1;return b},transform:function(a,b){if(a&&b){for(var c=0,d=this.components.length;c<d;c++)this.components[c].transform(a,
-b);this.bounds=null}return this},intersects:function(a){for(var b=!1,c=0,d=this.components.length;c<d&&!(b=a.intersects(this.components[c]));++c);return b},getVertices:function(a){for(var b=[],c=0,d=this.components.length;c<d;++c)Array.prototype.push.apply(b,this.components[c].getVertices(a));return b},CLASS_NAME:"OpenLayers.Geometry.Collection"});OpenLayers.Geometry.MultiPoint=OpenLayers.Class(OpenLayers.Geometry.Collection,{componentTypes:["OpenLayers.Geometry.Point"],addPoint:function(a,b){this.addComponent(a,b)},removePoint:function(a){this.removeComponent(a)},CLASS_NAME:"OpenLayers.Geometry.MultiPoint"});OpenLayers.Geometry.Curve=OpenLayers.Class(OpenLayers.Geometry.MultiPoint,{componentTypes:["OpenLayers.Geometry.Point"],getLength:function(){var a=0;if(this.components&&1<this.components.length)for(var b=1,c=this.components.length;b<c;b++)a+=this.components[b-1].distanceTo(this.components[b]);return a},getGeodesicLength:function(a){var b=this;if(a){var c=new OpenLayers.Projection("EPSG:4326");c.equals(a)||(b=this.clone().transform(a,c))}a=0;if(b.components&&1<b.components.length)for(var d,e=1,f=b.components.length;e<
-f;e++)c=b.components[e-1],d=b.components[e],a+=OpenLayers.Util.distVincenty({lon:c.x,lat:c.y},{lon:d.x,lat:d.y});return 1E3*a},CLASS_NAME:"OpenLayers.Geometry.Curve"});OpenLayers.Geometry.LineString=OpenLayers.Class(OpenLayers.Geometry.Curve,{removeComponent:function(a){var b=this.components&&2<this.components.length;b&&OpenLayers.Geometry.Collection.prototype.removeComponent.apply(this,arguments);return b},intersects:function(a){var b=!1,c=a.CLASS_NAME;if("OpenLayers.Geometry.LineString"==c||"OpenLayers.Geometry.LinearRing"==c||"OpenLayers.Geometry.Point"==c){var d=this.getSortedSegments();a="OpenLayers.Geometry.Point"==c?[{x1:a.x,y1:a.y,x2:a.x,y2:a.y}]:a.getSortedSegments();
-var e,f,g,h,k,l,m,n=0,p=d.length;a:for(;n<p;++n){c=d[n];e=c.x1;f=c.x2;g=c.y1;h=c.y2;var q=0,r=a.length;for(;q<r;++q){k=a[q];if(k.x1>f)break;if(!(k.x2<e||(l=k.y1,m=k.y2,Math.min(l,m)>Math.max(g,h)||Math.max(l,m)<Math.min(g,h)||!OpenLayers.Geometry.segmentsIntersect(c,k)))){b=!0;break a}}}}else b=a.intersects(this);return b},getSortedSegments:function(){for(var a=this.components.length-1,b=Array(a),c,d,e=0;e<a;++e)c=this.components[e],d=this.components[e+1],b[e]=c.x<d.x?{x1:c.x,y1:c.y,x2:d.x,y2:d.y}:
-{x1:d.x,y1:d.y,x2:c.x,y2:c.y};return b.sort(function(a,b){return a.x1-b.x1})},splitWithSegment:function(a,b){for(var c=!(b&&!1===b.edge),d=b&&b.tolerance,e=[],f=this.getVertices(),g=[],h=[],k=!1,l,m,n,p={point:!0,tolerance:d},q=null,r=0,s=f.length-2;r<=s;++r)if(d=f[r],g.push(d.clone()),l=f[r+1],m={x1:d.x,y1:d.y,x2:l.x,y2:l.y},m=OpenLayers.Geometry.segmentsIntersect(a,m,p),m instanceof OpenLayers.Geometry.Point&&((n=m.x===a.x1&&m.y===a.y1||m.x===a.x2&&m.y===a.y2||m.equals(d)||m.equals(l)?!0:!1)||c))m.equals(h[h.length-
-1])||h.push(m.clone()),0===r&&m.equals(d)||m.equals(l)||(k=!0,m.equals(d)||g.push(m),e.push(new OpenLayers.Geometry.LineString(g)),g=[m.clone()]);k&&(g.push(l.clone()),e.push(new OpenLayers.Geometry.LineString(g)));if(0<h.length)var t=a.x1<a.x2?1:-1,u=a.y1<a.y2?1:-1,q={lines:e,points:h.sort(function(a,b){return t*a.x-t*b.x||u*a.y-u*b.y})};return q},split:function(a,b){var c=null,d=b&&b.mutual,e,f,g,h;if(a instanceof OpenLayers.Geometry.LineString){var k=this.getVertices(),l,m,n,p,q,r=[];g=[];for(var s=
-0,t=k.length-2;s<=t;++s){l=k[s];m=k[s+1];n={x1:l.x,y1:l.y,x2:m.x,y2:m.y};h=h||[a];d&&r.push(l.clone());for(var u=0;u<h.length;++u)if(p=h[u].splitWithSegment(n,b))if(q=p.lines,0<q.length&&(q.unshift(u,1),Array.prototype.splice.apply(h,q),u+=q.length-2),d)for(var v=0,w=p.points.length;v<w;++v)q=p.points[v],q.equals(l)||(r.push(q),g.push(new OpenLayers.Geometry.LineString(r)),r=q.equals(m)?[]:[q.clone()])}d&&(0<g.length&&0<r.length)&&(r.push(m.clone()),g.push(new OpenLayers.Geometry.LineString(r)))}else c=
-a.splitWith(this,b);h&&1<h.length?f=!0:h=[];g&&1<g.length?e=!0:g=[];if(f||e)c=d?[g,h]:h;return c},splitWith:function(a,b){return a.split(this,b)},getVertices:function(a){return!0===a?[this.components[0],this.components[this.components.length-1]]:!1===a?this.components.slice(1,this.components.length-1):this.components.slice()},distanceTo:function(a,b){var c=!(b&&!1===b.edge)&&b&&b.details,d,e={},f=Number.POSITIVE_INFINITY;if(a instanceof OpenLayers.Geometry.Point){for(var g=this.getSortedSegments(),
-h=a.x,k=a.y,l,m=0,n=g.length;m<n;++m)if(l=g[m],d=OpenLayers.Geometry.distanceToSegment(a,l),d.distance<f){if(f=d.distance,e=d,0===f)break}else if(l.x2>h&&(k>l.y1&&k<l.y2||k<l.y1&&k>l.y2))break;e=c?{distance:e.distance,x0:e.x,y0:e.y,x1:h,y1:k}:e.distance}else if(a instanceof OpenLayers.Geometry.LineString){var g=this.getSortedSegments(),h=a.getSortedSegments(),p,q,r=h.length,s={point:!0},m=0,n=g.length;a:for(;m<n;++m){k=g[m];l=k.x1;q=k.y1;for(var t=0;t<r;++t)if(d=h[t],p=OpenLayers.Geometry.segmentsIntersect(k,
-d,s)){f=0;e={distance:0,x0:p.x,y0:p.y,x1:p.x,y1:p.y};break a}else d=OpenLayers.Geometry.distanceToSegment({x:l,y:q},d),d.distance<f&&(f=d.distance,e={distance:f,x0:l,y0:q,x1:d.x,y1:d.y})}c||(e=e.distance);0!==f&&k&&(d=a.distanceTo(new OpenLayers.Geometry.Point(k.x2,k.y2),b),m=c?d.distance:d,m<f&&(e=c?{distance:f,x0:d.x1,y0:d.y1,x1:d.x0,y1:d.y0}:m))}else e=a.distanceTo(this,b),c&&(e={distance:e.distance,x0:e.x1,y0:e.y1,x1:e.x0,y1:e.y0});return e},simplify:function(a){if(this&&null!==this){var b=this.getVertices();
-if(3>b.length)return this;var c=function(a,b,d,k){for(var l=0,m=0,n=b,p;n<d;n++){p=a[b];var q=a[d],r=a[n],r=Math.abs(0.5*(p.x*q.y+q.x*r.y+r.x*p.y-q.x*p.y-r.x*q.y-p.x*r.y));p=Math.sqrt(Math.pow(p.x-q.x,2)+Math.pow(p.y-q.y,2));p=2*(r/p);p>l&&(l=p,m=n)}l>k&&m!=b&&(e.push(m),c(a,b,m,k),c(a,m,d,k))},d=b.length-1,e=[];e.push(0);for(e.push(d);b[0].equals(b[d]);)d--,e.push(d);c(b,0,d,a);a=[];e.sort(function(a,b){return a-b});for(d=0;d<e.length;d++)a.push(b[e[d]]);return new OpenLayers.Geometry.LineString(a)}return this},
-CLASS_NAME:"OpenLayers.Geometry.LineString"});OpenLayers.Geometry.MultiLineString=OpenLayers.Class(OpenLayers.Geometry.Collection,{componentTypes:["OpenLayers.Geometry.LineString"],split:function(a,b){for(var c=null,d=b&&b.mutual,e,f,g,h,k=[],l=[a],m=0,n=this.components.length;m<n;++m){f=this.components[m];g=!1;for(var p=0;p<l.length;++p)if(e=f.split(l[p],b)){if(d){g=e[0];for(var q=0,r=g.length;q<r;++q)0===q&&k.length?k[k.length-1].addComponent(g[q]):k.push(new OpenLayers.Geometry.MultiLineString([g[q]]));g=!0;e=e[1]}if(e.length){e.unshift(p,
-1);Array.prototype.splice.apply(l,e);break}}g||(k.length?k[k.length-1].addComponent(f.clone()):k=[new OpenLayers.Geometry.MultiLineString(f.clone())])}k&&1<k.length?g=!0:k=[];l&&1<l.length?h=!0:l=[];if(g||h)c=d?[k,l]:l;return c},splitWith:function(a,b){var c=null,d=b&&b.mutual,e,f,g,h,k,l;if(a instanceof OpenLayers.Geometry.LineString){l=[];k=[a];for(var m=0,n=this.components.length;m<n;++m){g=!1;f=this.components[m];for(var p=0;p<k.length;++p)if(e=k[p].split(f,b)){d&&(g=e[0],g.length&&(g.unshift(p,
-1),Array.prototype.splice.apply(k,g),p+=g.length-2),e=e[1],0===e.length&&(e=[f.clone()]));g=0;for(var q=e.length;g<q;++g)0===g&&l.length?l[l.length-1].addComponent(e[g]):l.push(new OpenLayers.Geometry.MultiLineString([e[g]]));g=!0}g||(l.length?l[l.length-1].addComponent(f.clone()):l=[new OpenLayers.Geometry.MultiLineString([f.clone()])])}}else c=a.split(this);k&&1<k.length?h=!0:k=[];l&&1<l.length?g=!0:l=[];if(h||g)c=d?[k,l]:l;return c},CLASS_NAME:"OpenLayers.Geometry.MultiLineString"});OpenLayers.Geometry.LinearRing=OpenLayers.Class(OpenLayers.Geometry.LineString,{componentTypes:["OpenLayers.Geometry.Point"],addComponent:function(a,b){var c=!1,d=this.components.pop();null==b&&a.equals(d)||(c=OpenLayers.Geometry.Collection.prototype.addComponent.apply(this,arguments));OpenLayers.Geometry.Collection.prototype.addComponent.apply(this,[this.components[0]]);return c},removeComponent:function(a){var b=this.components&&3<this.components.length;b&&(this.components.pop(),OpenLayers.Geometry.Collection.prototype.removeComponent.apply(this,
-arguments),OpenLayers.Geometry.Collection.prototype.addComponent.apply(this,[this.components[0]]));return b},move:function(a,b){for(var c=0,d=this.components.length;c<d-1;c++)this.components[c].move(a,b)},rotate:function(a,b){for(var c=0,d=this.components.length;c<d-1;++c)this.components[c].rotate(a,b)},resize:function(a,b,c){for(var d=0,e=this.components.length;d<e-1;++d)this.components[d].resize(a,b,c);return this},transform:function(a,b){if(a&&b){for(var c=0,d=this.components.length;c<d-1;c++)this.components[c].transform(a,
-b);this.bounds=null}return this},getCentroid:function(){if(this.components){var a=this.components.length;if(0<a&&2>=a)return this.components[0].clone();if(2<a){var b=0,c=0,d=this.components[0].x,e=this.components[0].y,f=-1*this.getArea();if(0!=f){for(var g=0;g<a-1;g++)var h=this.components[g],k=this.components[g+1],b=b+(h.x+k.x-2*d)*((h.x-d)*(k.y-e)-(k.x-d)*(h.y-e)),c=c+(h.y+k.y-2*e)*((h.x-d)*(k.y-e)-(k.x-d)*(h.y-e));b=d+b/(6*f);a=e+c/(6*f)}else{for(g=0;g<a-1;g++)b+=this.components[g].x,c+=this.components[g].y;
-b/=a-1;a=c/(a-1)}return new OpenLayers.Geometry.Point(b,a)}return null}},getArea:function(){var a=0;if(this.components&&2<this.components.length){for(var b=a=0,c=this.components.length;b<c-1;b++)var d=this.components[b],e=this.components[b+1],a=a+(d.x+e.x)*(e.y-d.y);a=-a/2}return a},getGeodesicArea:function(a){var b=this;if(a){var c=new OpenLayers.Projection("EPSG:4326");c.equals(a)||(b=this.clone().transform(a,c))}a=0;c=b.components&&b.components.length;if(2<c){for(var d,e,f=0;f<c-1;f++)d=b.components[f],
-e=b.components[f+1],a+=OpenLayers.Util.rad(e.x-d.x)*(2+Math.sin(OpenLayers.Util.rad(d.y))+Math.sin(OpenLayers.Util.rad(e.y)));a=40680631590769*a/2}return a},containsPoint:function(a){var b=OpenLayers.Number.limitSigDigs,c=b(a.x,14);a=b(a.y,14);for(var d=this.components.length-1,e,f,g,h,k,l=0,m=0;m<d;++m)if(e=this.components[m],g=b(e.x,14),e=b(e.y,14),f=this.components[m+1],h=b(f.x,14),f=b(f.y,14),e==f){if(a==e&&(g<=h&&c>=g&&c<=h||g>=h&&c<=g&&c>=h)){l=-1;break}}else{k=b((a-f)*((h-g)/(f-e))+h,14);if(k==
-c&&(e<f&&a>=e&&a<=f||e>f&&a<=e&&a>=f)){l=-1;break}k<=c||g!=h&&(k<Math.min(g,h)||k>Math.max(g,h))||(e<f&&a>=e&&a<f||e>f&&a<e&&a>=f)&&++l}return-1==l?1:!!(l&1)},intersects:function(a){var b=!1;if("OpenLayers.Geometry.Point"==a.CLASS_NAME)b=this.containsPoint(a);else if("OpenLayers.Geometry.LineString"==a.CLASS_NAME)b=a.intersects(this);else if("OpenLayers.Geometry.LinearRing"==a.CLASS_NAME)b=OpenLayers.Geometry.LineString.prototype.intersects.apply(this,[a]);else for(var c=0,d=a.components.length;c<
-d&&!(b=a.components[c].intersects(this));++c);return b},getVertices:function(a){return!0===a?[]:this.components.slice(0,this.components.length-1)},CLASS_NAME:"OpenLayers.Geometry.LinearRing"});OpenLayers.Geometry.Polygon=OpenLayers.Class(OpenLayers.Geometry.Collection,{componentTypes:["OpenLayers.Geometry.LinearRing"],getArea:function(){var a=0;if(this.components&&0<this.components.length)for(var a=a+Math.abs(this.components[0].getArea()),b=1,c=this.components.length;b<c;b++)a-=Math.abs(this.components[b].getArea());return a},getGeodesicArea:function(a){var b=0;if(this.components&&0<this.components.length)for(var b=b+Math.abs(this.components[0].getGeodesicArea(a)),c=1,d=this.components.length;c<
-d;c++)b-=Math.abs(this.components[c].getGeodesicArea(a));return b},containsPoint:function(a){var b=this.components.length,c=!1;if(0<b&&(c=this.components[0].containsPoint(a),1!==c&&c&&1<b))for(var d,e=1;e<b;++e)if(d=this.components[e].containsPoint(a)){c=1===d?1:!1;break}return c},intersects:function(a){var b=!1,c,d;if("OpenLayers.Geometry.Point"==a.CLASS_NAME)b=this.containsPoint(a);else if("OpenLayers.Geometry.LineString"==a.CLASS_NAME||"OpenLayers.Geometry.LinearRing"==a.CLASS_NAME){c=0;for(d=
-this.components.length;c<d&&!(b=a.intersects(this.components[c]));++c);if(!b)for(c=0,d=a.components.length;c<d&&!(b=this.containsPoint(a.components[c]));++c);}else for(c=0,d=a.components.length;c<d&&!(b=this.intersects(a.components[c]));++c);if(!b&&"OpenLayers.Geometry.Polygon"==a.CLASS_NAME){var e=this.components[0];c=0;for(d=e.components.length;c<d&&!(b=a.containsPoint(e.components[c]));++c);}return b},distanceTo:function(a,b){return b&&!1===b.edge&&this.intersects(a)?0:OpenLayers.Geometry.Collection.prototype.distanceTo.apply(this,
-[a,b])},CLASS_NAME:"OpenLayers.Geometry.Polygon"});OpenLayers.Geometry.Polygon.createRegularPolygon=function(a,b,c,d){var e=Math.PI*(1/c-0.5);d&&(e+=d/180*Math.PI);for(var f,g=[],h=0;h<c;++h)f=e+2*h*Math.PI/c,d=a.x+b*Math.cos(f),f=a.y+b*Math.sin(f),g.push(new OpenLayers.Geometry.Point(d,f));a=new OpenLayers.Geometry.LinearRing(g);return new OpenLayers.Geometry.Polygon([a])};OpenLayers.Geometry.MultiPolygon=OpenLayers.Class(OpenLayers.Geometry.Collection,{componentTypes:["OpenLayers.Geometry.Polygon"],CLASS_NAME:"OpenLayers.Geometry.MultiPolygon"});OpenLayers.Format.GML=OpenLayers.Class(OpenLayers.Format.XML,{featureNS:"http://mapserver.gis.umn.edu/mapserver",featurePrefix:"feature",featureName:"featureMember",layerName:"features",geometryName:"geometry",collectionName:"FeatureCollection",gmlns:"http://www.opengis.net/gml",extractAttributes:!0,xy:!0,initialize:function(a){this.regExes={trimSpace:/^\s*|\s*$/g,removeSpace:/\s*/g,splitSpace:/\s+/,trimComma:/\s*,\s*/g};OpenLayers.Format.XML.prototype.initialize.apply(this,[a])},read:function(a){"string"==
-typeof a&&(a=OpenLayers.Format.XML.prototype.read.apply(this,[a]));a=this.getElementsByTagNameNS(a.documentElement,this.gmlns,this.featureName);for(var b=[],c=0;c<a.length;c++){var d=this.parseFeature(a[c]);d&&b.push(d)}return b},parseFeature:function(a){for(var b="MultiPolygon Polygon MultiLineString LineString MultiPoint Point Envelope".split(" "),c,d,e,f=0;f<b.length;++f)if(c=b[f],d=this.getElementsByTagNameNS(a,this.gmlns,c),0<d.length){if(e=this.parseGeometry[c.toLowerCase()])e=e.apply(this,
-[d[0]]),this.internalProjection&&this.externalProjection&&e.transform(this.externalProjection,this.internalProjection);else throw new TypeError("Unsupported geometry type: "+c);break}var g;c=this.getElementsByTagNameNS(a,this.gmlns,"Box");for(f=0;f<c.length;++f)b=c[f],d=this.parseGeometry.box.apply(this,[b]),b=b.parentNode,"boundedBy"===(b.localName||b.nodeName.split(":").pop())?g=d:e=d.toGeometry();var h;this.extractAttributes&&(h=this.parseAttributes(a));h=new OpenLayers.Feature.Vector(e,h);h.bounds=
-g;h.gml={featureType:a.firstChild.nodeName.split(":")[1],featureNS:a.firstChild.namespaceURI,featureNSPrefix:a.firstChild.prefix};a=a.firstChild;for(var k;a&&(1!=a.nodeType||!(k=a.getAttribute("fid")||a.getAttribute("id")));)a=a.nextSibling;h.fid=k;return h},parseGeometry:{point:function(a){var b,c;c=[];b=this.getElementsByTagNameNS(a,this.gmlns,"pos");0<b.length&&(c=b[0].firstChild.nodeValue,c=c.replace(this.regExes.trimSpace,""),c=c.split(this.regExes.splitSpace));0==c.length&&(b=this.getElementsByTagNameNS(a,
-this.gmlns,"coordinates"),0<b.length&&(c=b[0].firstChild.nodeValue,c=c.replace(this.regExes.removeSpace,""),c=c.split(",")));0==c.length&&(b=this.getElementsByTagNameNS(a,this.gmlns,"coord"),0<b.length&&(a=this.getElementsByTagNameNS(b[0],this.gmlns,"X"),b=this.getElementsByTagNameNS(b[0],this.gmlns,"Y"),0<a.length&&0<b.length&&(c=[a[0].firstChild.nodeValue,b[0].firstChild.nodeValue])));2==c.length&&(c[2]=null);return this.xy?new OpenLayers.Geometry.Point(c[0],c[1],c[2]):new OpenLayers.Geometry.Point(c[1],
-c[0],c[2])},multipoint:function(a){a=this.getElementsByTagNameNS(a,this.gmlns,"Point");var b=[];if(0<a.length)for(var c,d=0;d<a.length;++d)(c=this.parseGeometry.point.apply(this,[a[d]]))&&b.push(c);return new OpenLayers.Geometry.MultiPoint(b)},linestring:function(a,b){var c,d;d=[];var e=[];c=this.getElementsByTagNameNS(a,this.gmlns,"posList");if(0<c.length){d=this.getChildValue(c[0]);d=d.replace(this.regExes.trimSpace,"");d=d.split(this.regExes.splitSpace);var f=parseInt(c[0].getAttribute("dimension")),
-g,h,k;for(c=0;c<d.length/f;++c)g=c*f,h=d[g],k=d[g+1],g=2==f?null:d[g+2],this.xy?e.push(new OpenLayers.Geometry.Point(h,k,g)):e.push(new OpenLayers.Geometry.Point(k,h,g))}if(0==d.length&&(c=this.getElementsByTagNameNS(a,this.gmlns,"coordinates"),0<c.length))for(d=this.getChildValue(c[0]),d=d.replace(this.regExes.trimSpace,""),d=d.replace(this.regExes.trimComma,","),f=d.split(this.regExes.splitSpace),c=0;c<f.length;++c)d=f[c].split(","),2==d.length&&(d[2]=null),this.xy?e.push(new OpenLayers.Geometry.Point(d[0],
-d[1],d[2])):e.push(new OpenLayers.Geometry.Point(d[1],d[0],d[2]));d=null;0!=e.length&&(d=b?new OpenLayers.Geometry.LinearRing(e):new OpenLayers.Geometry.LineString(e));return d},multilinestring:function(a){a=this.getElementsByTagNameNS(a,this.gmlns,"LineString");var b=[];if(0<a.length)for(var c,d=0;d<a.length;++d)(c=this.parseGeometry.linestring.apply(this,[a[d]]))&&b.push(c);return new OpenLayers.Geometry.MultiLineString(b)},polygon:function(a){a=this.getElementsByTagNameNS(a,this.gmlns,"LinearRing");
-var b=[];if(0<a.length)for(var c,d=0;d<a.length;++d)(c=this.parseGeometry.linestring.apply(this,[a[d],!0]))&&b.push(c);return new OpenLayers.Geometry.Polygon(b)},multipolygon:function(a){a=this.getElementsByTagNameNS(a,this.gmlns,"Polygon");var b=[];if(0<a.length)for(var c,d=0;d<a.length;++d)(c=this.parseGeometry.polygon.apply(this,[a[d]]))&&b.push(c);return new OpenLayers.Geometry.MultiPolygon(b)},envelope:function(a){var b=[],c,d,e=this.getElementsByTagNameNS(a,this.gmlns,"lowerCorner");if(0<e.length){c=
-[];0<e.length&&(c=e[0].firstChild.nodeValue,c=c.replace(this.regExes.trimSpace,""),c=c.split(this.regExes.splitSpace));2==c.length&&(c[2]=null);var f=this.xy?new OpenLayers.Geometry.Point(c[0],c[1],c[2]):new OpenLayers.Geometry.Point(c[1],c[0],c[2])}a=this.getElementsByTagNameNS(a,this.gmlns,"upperCorner");if(0<a.length){c=[];0<a.length&&(c=a[0].firstChild.nodeValue,c=c.replace(this.regExes.trimSpace,""),c=c.split(this.regExes.splitSpace));2==c.length&&(c[2]=null);var g=this.xy?new OpenLayers.Geometry.Point(c[0],
-c[1],c[2]):new OpenLayers.Geometry.Point(c[1],c[0],c[2])}f&&g&&(b.push(new OpenLayers.Geometry.Point(f.x,f.y)),b.push(new OpenLayers.Geometry.Point(g.x,f.y)),b.push(new OpenLayers.Geometry.Point(g.x,g.y)),b.push(new OpenLayers.Geometry.Point(f.x,g.y)),b.push(new OpenLayers.Geometry.Point(f.x,f.y)),b=new OpenLayers.Geometry.LinearRing(b),d=new OpenLayers.Geometry.Polygon([b]));return d},box:function(a){var b=this.getElementsByTagNameNS(a,this.gmlns,"coordinates"),c=a=null;0<b.length&&(b=b[0].firstChild.nodeValue,
-b=b.split(" "),2==b.length&&(a=b[0].split(","),c=b[1].split(",")));if(null!==a&&null!==c)return new OpenLayers.Bounds(parseFloat(a[0]),parseFloat(a[1]),parseFloat(c[0]),parseFloat(c[1]))}},parseAttributes:function(a){var b={};a=a.firstChild;for(var c,d,e;a;){if(1==a.nodeType){a=a.childNodes;for(c=0;c<a.length;++c)if(d=a[c],1==d.nodeType)if(e=d.childNodes,1==e.length){if(e=e[0],3==e.nodeType||4==e.nodeType)d=d.prefix?d.nodeName.split(":")[1]:d.nodeName,e=e.nodeValue.replace(this.regExes.trimSpace,
-""),b[d]=e}else b[d.nodeName.split(":").pop()]=null;break}a=a.nextSibling}return b},write:function(a){OpenLayers.Util.isArray(a)||(a=[a]);for(var b=this.createElementNS("http://www.opengis.net/wfs","wfs:"+this.collectionName),c=0;c<a.length;c++)b.appendChild(this.createFeatureXML(a[c]));return OpenLayers.Format.XML.prototype.write.apply(this,[b])},createFeatureXML:function(a){var b=this.buildGeometryNode(a.geometry),c=this.createElementNS(this.featureNS,this.featurePrefix+":"+this.geometryName);c.appendChild(b);
-var b=this.createElementNS(this.gmlns,"gml:"+this.featureName),d=this.createElementNS(this.featureNS,this.featurePrefix+":"+this.layerName);d.setAttribute("fid",a.fid||a.id);d.appendChild(c);for(var e in a.attributes){var c=this.createTextNode(a.attributes[e]),f=e.substring(e.lastIndexOf(":")+1),f=this.createElementNS(this.featureNS,this.featurePrefix+":"+f);f.appendChild(c);d.appendChild(f)}b.appendChild(d);return b},buildGeometryNode:function(a){this.externalProjection&&this.internalProjection&&
-(a=a.clone(),a.transform(this.internalProjection,this.externalProjection));var b=a.CLASS_NAME,b=b.substring(b.lastIndexOf(".")+1);return this.buildGeometry[b.toLowerCase()].apply(this,[a])},buildGeometry:{point:function(a){var b=this.createElementNS(this.gmlns,"gml:Point");b.appendChild(this.buildCoordinatesNode(a));return b},multipoint:function(a){var b=this.createElementNS(this.gmlns,"gml:MultiPoint");a=a.components;for(var c,d,e=0;e<a.length;e++)c=this.createElementNS(this.gmlns,"gml:pointMember"),
-d=this.buildGeometry.point.apply(this,[a[e]]),c.appendChild(d),b.appendChild(c);return b},linestring:function(a){var b=this.createElementNS(this.gmlns,"gml:LineString");b.appendChild(this.buildCoordinatesNode(a));return b},multilinestring:function(a){var b=this.createElementNS(this.gmlns,"gml:MultiLineString");a=a.components;for(var c,d,e=0;e<a.length;++e)c=this.createElementNS(this.gmlns,"gml:lineStringMember"),d=this.buildGeometry.linestring.apply(this,[a[e]]),c.appendChild(d),b.appendChild(c);
-return b},linearring:function(a){var b=this.createElementNS(this.gmlns,"gml:LinearRing");b.appendChild(this.buildCoordinatesNode(a));return b},polygon:function(a){var b=this.createElementNS(this.gmlns,"gml:Polygon");a=a.components;for(var c,d,e=0;e<a.length;++e)c=0==e?"outerBoundaryIs":"innerBoundaryIs",c=this.createElementNS(this.gmlns,"gml:"+c),d=this.buildGeometry.linearring.apply(this,[a[e]]),c.appendChild(d),b.appendChild(c);return b},multipolygon:function(a){var b=this.createElementNS(this.gmlns,
-"gml:MultiPolygon");a=a.components;for(var c,d,e=0;e<a.length;++e)c=this.createElementNS(this.gmlns,"gml:polygonMember"),d=this.buildGeometry.polygon.apply(this,[a[e]]),c.appendChild(d),b.appendChild(c);return b},bounds:function(a){var b=this.createElementNS(this.gmlns,"gml:Box");b.appendChild(this.buildCoordinatesNode(a));return b}},buildCoordinatesNode:function(a){var b=this.createElementNS(this.gmlns,"gml:coordinates");b.setAttribute("decimal",".");b.setAttribute("cs",",");b.setAttribute("ts",
-" ");var c=[];if(a instanceof OpenLayers.Bounds)c.push(a.left+","+a.bottom),c.push(a.right+","+a.top);else{a=a.components?a.components:[a];for(var d=0;d<a.length;d++)c.push(a[d].x+","+a[d].y)}c=this.createTextNode(c.join(" "));b.appendChild(c);return b},CLASS_NAME:"OpenLayers.Format.GML"});OpenLayers.Format.GML||(OpenLayers.Format.GML={});
-OpenLayers.Format.GML.Base=OpenLayers.Class(OpenLayers.Format.XML,{namespaces:{gml:"http://www.opengis.net/gml",xlink:"http://www.w3.org/1999/xlink",xsi:"http://www.w3.org/2001/XMLSchema-instance",wfs:"http://www.opengis.net/wfs"},defaultPrefix:"gml",schemaLocation:null,featureType:null,featureNS:null,geometryName:"geometry",extractAttributes:!0,srsName:null,xy:!0,geometryTypes:null,singleFeatureType:null,regExes:{trimSpace:/^\s*|\s*$/g,removeSpace:/\s*/g,splitSpace:/\s+/,trimComma:/\s*,\s*/g,featureMember:/^(.*:)?featureMembers?$/},
-initialize:function(a){OpenLayers.Format.XML.prototype.initialize.apply(this,[a]);this.setGeometryTypes();a&&a.featureNS&&this.setNamespace("feature",a.featureNS);this.singleFeatureType=!a||"string"===typeof a.featureType},read:function(a){"string"==typeof a&&(a=OpenLayers.Format.XML.prototype.read.apply(this,[a]));a&&9==a.nodeType&&(a=a.documentElement);var b=[];this.readNode(a,{features:b},!0);if(0==b.length){var c=this.getElementsByTagNameNS(a,this.namespaces.gml,"featureMember");if(c.length){a=
-0;for(var d=c.length;a<d;++a)this.readNode(c[a],{features:b},!0)}else c=this.getElementsByTagNameNS(a,this.namespaces.gml,"featureMembers"),c.length&&this.readNode(c[0],{features:b},!0)}return b},readNode:function(a,b,c){!0===c&&!0===this.autoConfig&&(this.featureType=null,delete this.namespaceAlias[this.featureNS],delete this.namespaces.feature,this.featureNS=null);this.featureNS||(a.prefix in this.namespaces||a.parentNode.namespaceURI!=this.namespaces.gml||!this.regExes.featureMember.test(a.parentNode.nodeName))||
-(this.featureType=a.nodeName.split(":").pop(),this.setNamespace("feature",a.namespaceURI),this.featureNS=a.namespaceURI,this.autoConfig=!0);return OpenLayers.Format.XML.prototype.readNode.apply(this,[a,b])},readers:{gml:{_inherit:function(a,b,c){},featureMember:function(a,b){this.readChildNodes(a,b)},featureMembers:function(a,b){this.readChildNodes(a,b)},name:function(a,b){b.name=this.getChildValue(a)},boundedBy:function(a,b){var c={};this.readChildNodes(a,c);c.components&&0<c.components.length&&
-(b.bounds=c.components[0])},Point:function(a,b){var c={points:[]};this.readChildNodes(a,c);b.components||(b.components=[]);b.components.push(c.points[0])},coordinates:function(a,b){for(var c=this.getChildValue(a).replace(this.regExes.trimSpace,""),c=c.replace(this.regExes.trimComma,","),c=c.split(this.regExes.splitSpace),d,e=c.length,f=Array(e),g=0;g<e;++g)d=c[g].split(","),f[g]=this.xy?new OpenLayers.Geometry.Point(d[0],d[1],d[2]):new OpenLayers.Geometry.Point(d[1],d[0],d[2]);b.points=f},coord:function(a,
-b){var c={};this.readChildNodes(a,c);b.points||(b.points=[]);b.points.push(new OpenLayers.Geometry.Point(c.x,c.y,c.z))},X:function(a,b){b.x=this.getChildValue(a)},Y:function(a,b){b.y=this.getChildValue(a)},Z:function(a,b){b.z=this.getChildValue(a)},MultiPoint:function(a,b){var c={components:[]};this.readers.gml._inherit.apply(this,[a,c,b]);this.readChildNodes(a,c);b.components=[new OpenLayers.Geometry.MultiPoint(c.components)]},pointMember:function(a,b){this.readChildNodes(a,b)},LineString:function(a,
-b){var c={};this.readers.gml._inherit.apply(this,[a,c,b]);this.readChildNodes(a,c);b.components||(b.components=[]);b.components.push(new OpenLayers.Geometry.LineString(c.points))},MultiLineString:function(a,b){var c={components:[]};this.readers.gml._inherit.apply(this,[a,c,b]);this.readChildNodes(a,c);b.components=[new OpenLayers.Geometry.MultiLineString(c.components)]},lineStringMember:function(a,b){this.readChildNodes(a,b)},Polygon:function(a,b){var c={outer:null,inner:[]};this.readers.gml._inherit.apply(this,
-[a,c,b]);this.readChildNodes(a,c);c.inner.unshift(c.outer);b.components||(b.components=[]);b.components.push(new OpenLayers.Geometry.Polygon(c.inner))},LinearRing:function(a,b){var c={};this.readers.gml._inherit.apply(this,[a,c]);this.readChildNodes(a,c);b.components=[new OpenLayers.Geometry.LinearRing(c.points)]},MultiPolygon:function(a,b){var c={components:[]};this.readers.gml._inherit.apply(this,[a,c,b]);this.readChildNodes(a,c);b.components=[new OpenLayers.Geometry.MultiPolygon(c.components)]},
-polygonMember:function(a,b){this.readChildNodes(a,b)},GeometryCollection:function(a,b){var c={components:[]};this.readers.gml._inherit.apply(this,[a,c,b]);this.readChildNodes(a,c);b.components=[new OpenLayers.Geometry.Collection(c.components)]},geometryMember:function(a,b){this.readChildNodes(a,b)}},feature:{"*":function(a,b){var c,d=a.localName||a.nodeName.split(":").pop();b.features?this.singleFeatureType||-1===OpenLayers.Util.indexOf(this.featureType,d)?d===this.featureType&&(c="_typeName"):c=
-"_typeName":0==a.childNodes.length||1==a.childNodes.length&&3==a.firstChild.nodeType?this.extractAttributes&&(c="_attribute"):c="_geometry";c&&this.readers.feature[c].apply(this,[a,b])},_typeName:function(a,b){var c={components:[],attributes:{}};this.readChildNodes(a,c);c.name&&(c.attributes.name=c.name);var d=new OpenLayers.Feature.Vector(c.components[0],c.attributes);this.singleFeatureType||(d.type=a.nodeName.split(":").pop(),d.namespace=a.namespaceURI);var e=a.getAttribute("fid")||this.getAttributeNS(a,
-this.namespaces.gml,"id");e&&(d.fid=e);this.internalProjection&&(this.externalProjection&&d.geometry)&&d.geometry.transform(this.externalProjection,this.internalProjection);c.bounds&&(d.bounds=c.bounds);b.features.push(d)},_geometry:function(a,b){this.geometryName||(this.geometryName=a.nodeName.split(":").pop());this.readChildNodes(a,b)},_attribute:function(a,b){var c=a.localName||a.nodeName.split(":").pop(),d=this.getChildValue(a);b.attributes[c]=d}},wfs:{FeatureCollection:function(a,b){this.readChildNodes(a,
-b)}}},write:function(a){var b;b=OpenLayers.Util.isArray(a)?"featureMembers":"featureMember";a=this.writeNode("gml:"+b,a);this.setAttributeNS(a,this.namespaces.xsi,"xsi:schemaLocation",this.schemaLocation);return OpenLayers.Format.XML.prototype.write.apply(this,[a])},writers:{gml:{featureMember:function(a){var b=this.createElementNSPlus("gml:featureMember");this.writeNode("feature:_typeName",a,b);return b},MultiPoint:function(a){var b=this.createElementNSPlus("gml:MultiPoint");a=a.components||[a];
-for(var c=0,d=a.length;c<d;++c)this.writeNode("pointMember",a[c],b);return b},pointMember:function(a){var b=this.createElementNSPlus("gml:pointMember");this.writeNode("Point",a,b);return b},MultiLineString:function(a){var b=this.createElementNSPlus("gml:MultiLineString");a=a.components||[a];for(var c=0,d=a.length;c<d;++c)this.writeNode("lineStringMember",a[c],b);return b},lineStringMember:function(a){var b=this.createElementNSPlus("gml:lineStringMember");this.writeNode("LineString",a,b);return b},
-MultiPolygon:function(a){var b=this.createElementNSPlus("gml:MultiPolygon");a=a.components||[a];for(var c=0,d=a.length;c<d;++c)this.writeNode("polygonMember",a[c],b);return b},polygonMember:function(a){var b=this.createElementNSPlus("gml:polygonMember");this.writeNode("Polygon",a,b);return b},GeometryCollection:function(a){for(var b=this.createElementNSPlus("gml:GeometryCollection"),c=0,d=a.components.length;c<d;++c)this.writeNode("geometryMember",a.components[c],b);return b},geometryMember:function(a){var b=
-this.createElementNSPlus("gml:geometryMember");a=this.writeNode("feature:_geometry",a);b.appendChild(a.firstChild);return b}},feature:{_typeName:function(a){var b=this.createElementNSPlus("feature:"+this.featureType,{attributes:{fid:a.fid}});a.geometry&&this.writeNode("feature:_geometry",a.geometry,b);for(var c in a.attributes){var d=a.attributes[c];null!=d&&this.writeNode("feature:_attribute",{name:c,value:d},b)}return b},_geometry:function(a){this.externalProjection&&this.internalProjection&&(a=
-a.clone().transform(this.internalProjection,this.externalProjection));var b=this.createElementNSPlus("feature:"+this.geometryName);a=this.writeNode("gml:"+this.geometryTypes[a.CLASS_NAME],a,b);this.srsName&&a.setAttribute("srsName",this.srsName);return b},_attribute:function(a){return this.createElementNSPlus("feature:"+a.name,{value:a.value})}},wfs:{FeatureCollection:function(a){for(var b=this.createElementNSPlus("wfs:FeatureCollection"),c=0,d=a.length;c<d;++c)this.writeNode("gml:featureMember",
-a[c],b);return b}}},setGeometryTypes:function(){this.geometryTypes={"OpenLayers.Geometry.Point":"Point","OpenLayers.Geometry.MultiPoint":"MultiPoint","OpenLayers.Geometry.LineString":"LineString","OpenLayers.Geometry.MultiLineString":"MultiLineString","OpenLayers.Geometry.Polygon":"Polygon","OpenLayers.Geometry.MultiPolygon":"MultiPolygon","OpenLayers.Geometry.Collection":"GeometryCollection"}},CLASS_NAME:"OpenLayers.Format.GML.Base"});OpenLayers.Format.GML.v3=OpenLayers.Class(OpenLayers.Format.GML.Base,{schemaLocation:"http://www.opengis.net/gml http://schemas.opengis.net/gml/3.1.1/profiles/gmlsfProfile/1.0.0/gmlsf.xsd",curve:!1,multiCurve:!0,surface:!1,multiSurface:!0,initialize:function(a){OpenLayers.Format.GML.Base.prototype.initialize.apply(this,[a])},readers:{gml:OpenLayers.Util.applyDefaults({_inherit:function(a,b,c){if(a=parseInt(a.getAttribute("srsDimension"),10)||c&&c.srsDimension)b.srsDimension=a},featureMembers:function(a,
-b){this.readChildNodes(a,b)},Curve:function(a,b){var c={points:[]};this.readers.gml._inherit.apply(this,[a,c,b]);this.readChildNodes(a,c);b.components||(b.components=[]);b.components.push(new OpenLayers.Geometry.LineString(c.points))},segments:function(a,b){this.readChildNodes(a,b)},LineStringSegment:function(a,b){var c={};this.readChildNodes(a,c);c.points&&Array.prototype.push.apply(b.points,c.points)},pos:function(a,b){var c=this.getChildValue(a).replace(this.regExes.trimSpace,"").split(this.regExes.splitSpace),
-c=this.xy?new OpenLayers.Geometry.Point(c[0],c[1],c[2]):new OpenLayers.Geometry.Point(c[1],c[0],c[2]);b.points=[c]},posList:function(a,b){for(var c=this.getChildValue(a).replace(this.regExes.trimSpace,"").split(this.regExes.splitSpace),d=b.srsDimension||parseInt(a.getAttribute("srsDimension")||a.getAttribute("dimension"),10)||2,e,f,g,h=Array(c.length/d),k=0,l=c.length;k<l;k+=d)e=c[k],f=c[k+1],g=2==d?void 0:c[k+2],h[k/d]=this.xy?new OpenLayers.Geometry.Point(e,f,g):new OpenLayers.Geometry.Point(f,
-e,g);b.points=h},Surface:function(a,b){this.readChildNodes(a,b)},patches:function(a,b){this.readChildNodes(a,b)},PolygonPatch:function(a,b){this.readers.gml.Polygon.apply(this,[a,b])},exterior:function(a,b){var c={};this.readChildNodes(a,c);b.outer=c.components[0]},interior:function(a,b){var c={};this.readChildNodes(a,c);b.inner.push(c.components[0])},MultiCurve:function(a,b){var c={components:[]};this.readers.gml._inherit.apply(this,[a,c,b]);this.readChildNodes(a,c);0<c.components.length&&(b.components=
-[new OpenLayers.Geometry.MultiLineString(c.components)])},curveMember:function(a,b){this.readChildNodes(a,b)},MultiSurface:function(a,b){var c={components:[]};this.readers.gml._inherit.apply(this,[a,c,b]);this.readChildNodes(a,c);0<c.components.length&&(b.components=[new OpenLayers.Geometry.MultiPolygon(c.components)])},surfaceMember:function(a,b){this.readChildNodes(a,b)},surfaceMembers:function(a,b){this.readChildNodes(a,b)},pointMembers:function(a,b){this.readChildNodes(a,b)},lineStringMembers:function(a,
-b){this.readChildNodes(a,b)},polygonMembers:function(a,b){this.readChildNodes(a,b)},geometryMembers:function(a,b){this.readChildNodes(a,b)},Envelope:function(a,b){var c={points:Array(2)};this.readChildNodes(a,c);b.components||(b.components=[]);var d=c.points[0],c=c.points[1];b.components.push(new OpenLayers.Bounds(d.x,d.y,c.x,c.y))},lowerCorner:function(a,b){var c={};this.readers.gml.pos.apply(this,[a,c]);b.points[0]=c.points[0]},upperCorner:function(a,b){var c={};this.readers.gml.pos.apply(this,
-[a,c]);b.points[1]=c.points[0]}},OpenLayers.Format.GML.Base.prototype.readers.gml),feature:OpenLayers.Format.GML.Base.prototype.readers.feature,wfs:OpenLayers.Format.GML.Base.prototype.readers.wfs},write:function(a){var b;b=OpenLayers.Util.isArray(a)?"featureMembers":"featureMember";a=this.writeNode("gml:"+b,a);this.setAttributeNS(a,this.namespaces.xsi,"xsi:schemaLocation",this.schemaLocation);return OpenLayers.Format.XML.prototype.write.apply(this,[a])},writers:{gml:OpenLayers.Util.applyDefaults({featureMembers:function(a){for(var b=
-this.createElementNSPlus("gml:featureMembers"),c=0,d=a.length;c<d;++c)this.writeNode("feature:_typeName",a[c],b);return b},Point:function(a){var b=this.createElementNSPlus("gml:Point");this.writeNode("pos",a,b);return b},pos:function(a){return this.createElementNSPlus("gml:pos",{value:this.xy?a.x+" "+a.y:a.y+" "+a.x})},LineString:function(a){var b=this.createElementNSPlus("gml:LineString");this.writeNode("posList",a.components,b);return b},Curve:function(a){var b=this.createElementNSPlus("gml:Curve");
-this.writeNode("segments",a,b);return b},segments:function(a){var b=this.createElementNSPlus("gml:segments");this.writeNode("LineStringSegment",a,b);return b},LineStringSegment:function(a){var b=this.createElementNSPlus("gml:LineStringSegment");this.writeNode("posList",a.components,b);return b},posList:function(a){for(var b=a.length,c=Array(b),d,e=0;e<b;++e)d=a[e],c[e]=this.xy?d.x+" "+d.y:d.y+" "+d.x;return this.createElementNSPlus("gml:posList",{value:c.join(" ")})},Surface:function(a){var b=this.createElementNSPlus("gml:Surface");
-this.writeNode("patches",a,b);return b},patches:function(a){var b=this.createElementNSPlus("gml:patches");this.writeNode("PolygonPatch",a,b);return b},PolygonPatch:function(a){var b=this.createElementNSPlus("gml:PolygonPatch",{attributes:{interpolation:"planar"}});this.writeNode("exterior",a.components[0],b);for(var c=1,d=a.components.length;c<d;++c)this.writeNode("interior",a.components[c],b);return b},Polygon:function(a){var b=this.createElementNSPlus("gml:Polygon");this.writeNode("exterior",a.components[0],
-b);for(var c=1,d=a.components.length;c<d;++c)this.writeNode("interior",a.components[c],b);return b},exterior:function(a){var b=this.createElementNSPlus("gml:exterior");this.writeNode("LinearRing",a,b);return b},interior:function(a){var b=this.createElementNSPlus("gml:interior");this.writeNode("LinearRing",a,b);return b},LinearRing:function(a){var b=this.createElementNSPlus("gml:LinearRing");this.writeNode("posList",a.components,b);return b},MultiCurve:function(a){var b=this.createElementNSPlus("gml:MultiCurve");
-a=a.components||[a];for(var c=0,d=a.length;c<d;++c)this.writeNode("curveMember",a[c],b);return b},curveMember:function(a){var b=this.createElementNSPlus("gml:curveMember");this.curve?this.writeNode("Curve",a,b):this.writeNode("LineString",a,b);return b},MultiSurface:function(a){var b=this.createElementNSPlus("gml:MultiSurface");a=a.components||[a];for(var c=0,d=a.length;c<d;++c)this.writeNode("surfaceMember",a[c],b);return b},surfaceMember:function(a){var b=this.createElementNSPlus("gml:surfaceMember");
-this.surface?this.writeNode("Surface",a,b):this.writeNode("Polygon",a,b);return b},Envelope:function(a){var b=this.createElementNSPlus("gml:Envelope");this.writeNode("lowerCorner",a,b);this.writeNode("upperCorner",a,b);this.srsName&&b.setAttribute("srsName",this.srsName);return b},lowerCorner:function(a){return this.createElementNSPlus("gml:lowerCorner",{value:this.xy?a.left+" "+a.bottom:a.bottom+" "+a.left})},upperCorner:function(a){return this.createElementNSPlus("gml:upperCorner",{value:this.xy?
-a.right+" "+a.top:a.top+" "+a.right})}},OpenLayers.Format.GML.Base.prototype.writers.gml),feature:OpenLayers.Format.GML.Base.prototype.writers.feature,wfs:OpenLayers.Format.GML.Base.prototype.writers.wfs},setGeometryTypes:function(){this.geometryTypes={"OpenLayers.Geometry.Point":"Point","OpenLayers.Geometry.MultiPoint":"MultiPoint","OpenLayers.Geometry.LineString":!0===this.curve?"Curve":"LineString","OpenLayers.Geometry.MultiLineString":!1===this.multiCurve?"MultiLineString":"MultiCurve","OpenLayers.Geometry.Polygon":!0===
-this.surface?"Surface":"Polygon","OpenLayers.Geometry.MultiPolygon":!1===this.multiSurface?"MultiPolygon":"MultiSurface","OpenLayers.Geometry.Collection":"GeometryCollection"}},CLASS_NAME:"OpenLayers.Format.GML.v3"});OpenLayers.Format.Filter.v1_1_0=OpenLayers.Class(OpenLayers.Format.GML.v3,OpenLayers.Format.Filter.v1,{VERSION:"1.1.0",schemaLocation:"http://www.opengis.net/ogc/filter/1.1.0/filter.xsd",initialize:function(a){OpenLayers.Format.GML.v3.prototype.initialize.apply(this,[a])},readers:{ogc:OpenLayers.Util.applyDefaults({PropertyIsEqualTo:function(a,b){var c=a.getAttribute("matchCase"),c=new OpenLayers.Filter.Comparison({type:OpenLayers.Filter.Comparison.EQUAL_TO,matchCase:!("false"===c||"0"===c)});this.readChildNodes(a,
-c);b.filters.push(c)},PropertyIsNotEqualTo:function(a,b){var c=a.getAttribute("matchCase"),c=new OpenLayers.Filter.Comparison({type:OpenLayers.Filter.Comparison.NOT_EQUAL_TO,matchCase:!("false"===c||"0"===c)});this.readChildNodes(a,c);b.filters.push(c)},PropertyIsLike:function(a,b){var c=new OpenLayers.Filter.Comparison({type:OpenLayers.Filter.Comparison.LIKE});this.readChildNodes(a,c);var d=a.getAttribute("wildCard"),e=a.getAttribute("singleChar"),f=a.getAttribute("escapeChar");c.value2regex(d,e,
-f);b.filters.push(c)}},OpenLayers.Format.Filter.v1.prototype.readers.ogc),gml:OpenLayers.Format.GML.v3.prototype.readers.gml,feature:OpenLayers.Format.GML.v3.prototype.readers.feature},writers:{ogc:OpenLayers.Util.applyDefaults({PropertyIsEqualTo:function(a){var b=this.createElementNSPlus("ogc:PropertyIsEqualTo",{attributes:{matchCase:a.matchCase}});this.writeNode("PropertyName",a,b);this.writeOgcExpression(a.value,b);return b},PropertyIsNotEqualTo:function(a){var b=this.createElementNSPlus("ogc:PropertyIsNotEqualTo",
-{attributes:{matchCase:a.matchCase}});this.writeNode("PropertyName",a,b);this.writeOgcExpression(a.value,b);return b},PropertyIsLike:function(a){var b=this.createElementNSPlus("ogc:PropertyIsLike",{attributes:{matchCase:a.matchCase,wildCard:"*",singleChar:".",escapeChar:"!"}});this.writeNode("PropertyName",a,b);this.writeNode("Literal",a.regex2value(),b);return b},BBOX:function(a){var b=this.createElementNSPlus("ogc:BBOX");a.property&&this.writeNode("PropertyName",a,b);var c=this.writeNode("gml:Envelope",
-a.value);a.projection&&c.setAttribute("srsName",a.projection);b.appendChild(c);return b},SortBy:function(a){for(var b=this.createElementNSPlus("ogc:SortBy"),c=0,d=a.length;c<d;c++)this.writeNode("ogc:SortProperty",a[c],b);return b},SortProperty:function(a){var b=this.createElementNSPlus("ogc:SortProperty");this.writeNode("ogc:PropertyName",a,b);this.writeNode("ogc:SortOrder","DESC"==a.order?"DESC":"ASC",b);return b},SortOrder:function(a){return this.createElementNSPlus("ogc:SortOrder",{value:a})}},
-OpenLayers.Format.Filter.v1.prototype.writers.ogc),gml:OpenLayers.Format.GML.v3.prototype.writers.gml,feature:OpenLayers.Format.GML.v3.prototype.writers.feature},writeSpatial:function(a,b){var c=this.createElementNSPlus("ogc:"+b);this.writeNode("PropertyName",a,c);if(a.value instanceof OpenLayers.Filter.Function)this.writeNode("Function",a.value,c);else{var d;d=a.value instanceof OpenLayers.Geometry?this.writeNode("feature:_geometry",a.value).firstChild:this.writeNode("gml:Envelope",a.value);a.projection&&
-d.setAttribute("srsName",a.projection);c.appendChild(d)}return c},CLASS_NAME:"OpenLayers.Format.Filter.v1_1_0"});OpenLayers.Format.OWSCommon=OpenLayers.Class(OpenLayers.Format.XML.VersionedOGC,{defaultVersion:"1.0.0",getVersion:function(a,b){var c=this.version;if(!c){var d=a.getAttribute("xmlns:ows");d&&"1.1"===d.substring(d.lastIndexOf("/")+1)&&(c="1.1.0");c||(c=this.defaultVersion)}return c},CLASS_NAME:"OpenLayers.Format.OWSCommon"});OpenLayers.Format.OWSCommon.v1=OpenLayers.Class(OpenLayers.Format.XML,{regExes:{trimSpace:/^\s*|\s*$/g,removeSpace:/\s*/g,splitSpace:/\s+/,trimComma:/\s*,\s*/g},read:function(a,b){OpenLayers.Util.applyDefaults(b,this.options);var c={};this.readChildNodes(a,c);return c},readers:{ows:{Exception:function(a,b){var c={code:a.getAttribute("exceptionCode"),locator:a.getAttribute("locator"),texts:[]};b.exceptions.push(c);this.readChildNodes(a,c)},ExceptionText:function(a,b){var c=this.getChildValue(a);b.texts.push(c)},
-ServiceIdentification:function(a,b){b.serviceIdentification={};this.readChildNodes(a,b.serviceIdentification)},Title:function(a,b){b.title=this.getChildValue(a)},Abstract:function(a,b){b["abstract"]=this.getChildValue(a)},Keywords:function(a,b){b.keywords={};this.readChildNodes(a,b.keywords)},Keyword:function(a,b){b[this.getChildValue(a)]=!0},ServiceType:function(a,b){b.serviceType={codeSpace:a.getAttribute("codeSpace"),value:this.getChildValue(a)}},ServiceTypeVersion:function(a,b){b.serviceTypeVersion=
-this.getChildValue(a)},Fees:function(a,b){b.fees=this.getChildValue(a)},AccessConstraints:function(a,b){b.accessConstraints=this.getChildValue(a)},ServiceProvider:function(a,b){b.serviceProvider={};this.readChildNodes(a,b.serviceProvider)},ProviderName:function(a,b){b.providerName=this.getChildValue(a)},ProviderSite:function(a,b){b.providerSite=this.getAttributeNS(a,this.namespaces.xlink,"href")},ServiceContact:function(a,b){b.serviceContact={};this.readChildNodes(a,b.serviceContact)},IndividualName:function(a,
-b){b.individualName=this.getChildValue(a)},PositionName:function(a,b){b.positionName=this.getChildValue(a)},ContactInfo:function(a,b){b.contactInfo={};this.readChildNodes(a,b.contactInfo)},Phone:function(a,b){b.phone={};this.readChildNodes(a,b.phone)},Voice:function(a,b){b.voice=this.getChildValue(a)},Address:function(a,b){b.address={};this.readChildNodes(a,b.address)},DeliveryPoint:function(a,b){b.deliveryPoint=this.getChildValue(a)},City:function(a,b){b.city=this.getChildValue(a)},AdministrativeArea:function(a,
-b){b.administrativeArea=this.getChildValue(a)},PostalCode:function(a,b){b.postalCode=this.getChildValue(a)},Country:function(a,b){b.country=this.getChildValue(a)},ElectronicMailAddress:function(a,b){b.electronicMailAddress=this.getChildValue(a)},Role:function(a,b){b.role=this.getChildValue(a)},OperationsMetadata:function(a,b){b.operationsMetadata={};this.readChildNodes(a,b.operationsMetadata)},Operation:function(a,b){var c=a.getAttribute("name");b[c]={};this.readChildNodes(a,b[c])},DCP:function(a,
-b){b.dcp={};this.readChildNodes(a,b.dcp)},HTTP:function(a,b){b.http={};this.readChildNodes(a,b.http)},Get:function(a,b){b.get||(b.get=[]);var c={url:this.getAttributeNS(a,this.namespaces.xlink,"href")};this.readChildNodes(a,c);b.get.push(c)},Post:function(a,b){b.post||(b.post=[]);var c={url:this.getAttributeNS(a,this.namespaces.xlink,"href")};this.readChildNodes(a,c);b.post.push(c)},Parameter:function(a,b){b.parameters||(b.parameters={});var c=a.getAttribute("name");b.parameters[c]={};this.readChildNodes(a,
-b.parameters[c])},Constraint:function(a,b){b.constraints||(b.constraints={});var c=a.getAttribute("name");b.constraints[c]={};this.readChildNodes(a,b.constraints[c])},Value:function(a,b){b[this.getChildValue(a)]=!0},OutputFormat:function(a,b){b.formats.push({value:this.getChildValue(a)});this.readChildNodes(a,b)},WGS84BoundingBox:function(a,b){var c={};c.crs=a.getAttribute("crs");b.BoundingBox?b.BoundingBox.push(c):(b.projection=c.crs,c=b);this.readChildNodes(a,c)},BoundingBox:function(a,b){this.readers.ows.WGS84BoundingBox.apply(this,
-[a,b])},LowerCorner:function(a,b){var c=this.getChildValue(a).replace(this.regExes.trimSpace,""),c=c.replace(this.regExes.trimComma,","),c=c.split(this.regExes.splitSpace);b.left=c[0];b.bottom=c[1]},UpperCorner:function(a,b){var c=this.getChildValue(a).replace(this.regExes.trimSpace,""),c=c.replace(this.regExes.trimComma,","),c=c.split(this.regExes.splitSpace);b.right=c[0];b.top=c[1];b.bounds=new OpenLayers.Bounds(b.left,b.bottom,b.right,b.top);delete b.left;delete b.bottom;delete b.right;delete b.top},
-Language:function(a,b){b.language=this.getChildValue(a)}}},writers:{ows:{BoundingBox:function(a,b){var c=this.createElementNSPlus(b||"ows:BoundingBox",{attributes:{crs:a.projection}});this.writeNode("ows:LowerCorner",a,c);this.writeNode("ows:UpperCorner",a,c);return c},LowerCorner:function(a){return this.createElementNSPlus("ows:LowerCorner",{value:a.bounds.left+" "+a.bounds.bottom})},UpperCorner:function(a){return this.createElementNSPlus("ows:UpperCorner",{value:a.bounds.right+" "+a.bounds.top})},
-Identifier:function(a){return this.createElementNSPlus("ows:Identifier",{value:a})},Title:function(a){return this.createElementNSPlus("ows:Title",{value:a})},Abstract:function(a){return this.createElementNSPlus("ows:Abstract",{value:a})},OutputFormat:function(a){return this.createElementNSPlus("ows:OutputFormat",{value:a})}}},CLASS_NAME:"OpenLayers.Format.OWSCommon.v1"});OpenLayers.Format.OWSCommon.v1_0_0=OpenLayers.Class(OpenLayers.Format.OWSCommon.v1,{namespaces:{ows:"http://www.opengis.net/ows",xlink:"http://www.w3.org/1999/xlink"},readers:{ows:OpenLayers.Util.applyDefaults({ExceptionReport:function(a,b){b.success=!1;b.exceptionReport={version:a.getAttribute("version"),language:a.getAttribute("language"),exceptions:[]};this.readChildNodes(a,b.exceptionReport)}},OpenLayers.Format.OWSCommon.v1.prototype.readers.ows)},writers:{ows:OpenLayers.Format.OWSCommon.v1.prototype.writers.ows},
-CLASS_NAME:"OpenLayers.Format.OWSCommon.v1_0_0"});OpenLayers.Format.WFST.v1_1_0=OpenLayers.Class(OpenLayers.Format.Filter.v1_1_0,OpenLayers.Format.WFST.v1,{version:"1.1.0",schemaLocations:{wfs:"http://schemas.opengis.net/wfs/1.1.0/wfs.xsd"},initialize:function(a){OpenLayers.Format.Filter.v1_1_0.prototype.initialize.apply(this,[a]);OpenLayers.Format.WFST.v1.prototype.initialize.apply(this,[a])},readNode:function(a,b,c){return OpenLayers.Format.GML.v3.prototype.readNode.apply(this,arguments)},readers:{wfs:OpenLayers.Util.applyDefaults({FeatureCollection:function(a,
-b){b.numberOfFeatures=parseInt(a.getAttribute("numberOfFeatures"));OpenLayers.Format.WFST.v1.prototype.readers.wfs.FeatureCollection.apply(this,arguments)},TransactionResponse:function(a,b){b.insertIds=[];b.success=!1;this.readChildNodes(a,b)},TransactionSummary:function(a,b){b.success=!0},InsertResults:function(a,b){this.readChildNodes(a,b)},Feature:function(a,b){var c={fids:[]};this.readChildNodes(a,c);b.insertIds.push(c.fids[0])}},OpenLayers.Format.WFST.v1.prototype.readers.wfs),gml:OpenLayers.Format.GML.v3.prototype.readers.gml,
-feature:OpenLayers.Format.GML.v3.prototype.readers.feature,ogc:OpenLayers.Format.Filter.v1_1_0.prototype.readers.ogc,ows:OpenLayers.Format.OWSCommon.v1_0_0.prototype.readers.ows},writers:{wfs:OpenLayers.Util.applyDefaults({GetFeature:function(a){var b=OpenLayers.Format.WFST.v1.prototype.writers.wfs.GetFeature.apply(this,arguments);a&&this.setAttributes(b,{resultType:a.resultType,startIndex:a.startIndex,count:a.count});return b},Query:function(a){a=OpenLayers.Util.extend({featureNS:this.featureNS,
-featurePrefix:this.featurePrefix,featureType:this.featureType,srsName:this.srsName},a);var b=a.featurePrefix,c=this.createElementNSPlus("wfs:Query",{attributes:{typeName:(b?b+":":"")+a.featureType,srsName:a.srsName}});a.featureNS&&c.setAttribute("xmlns:"+b,a.featureNS);if(a.propertyNames)for(var b=0,d=a.propertyNames.length;b<d;b++)this.writeNode("wfs:PropertyName",{property:a.propertyNames[b]},c);a.filter&&(OpenLayers.Format.WFST.v1_1_0.prototype.setFilterProperty.call(this,a.filter),this.writeNode("ogc:Filter",
-a.filter,c));return c},PropertyName:function(a){return this.createElementNSPlus("wfs:PropertyName",{value:a.property})}},OpenLayers.Format.WFST.v1.prototype.writers.wfs),gml:OpenLayers.Format.GML.v3.prototype.writers.gml,feature:OpenLayers.Format.GML.v3.prototype.writers.feature,ogc:OpenLayers.Format.Filter.v1_1_0.prototype.writers.ogc},CLASS_NAME:"OpenLayers.Format.WFST.v1_1_0"});OpenLayers.Protocol=OpenLayers.Class({format:null,options:null,autoDestroy:!0,defaultFilter:null,initialize:function(a){a=a||{};OpenLayers.Util.extend(this,a);this.options=a},mergeWithDefaultFilter:function(a){return a&&this.defaultFilter?new OpenLayers.Filter.Logical({type:OpenLayers.Filter.Logical.AND,filters:[this.defaultFilter,a]}):a||this.defaultFilter||void 0},destroy:function(){this.format=this.options=null},read:function(a){a=a||{};a.filter=this.mergeWithDefaultFilter(a.filter)},create:function(){},
-update:function(){},"delete":function(){},commit:function(){},abort:function(a){},createCallback:function(a,b,c){return OpenLayers.Function.bind(function(){a.apply(this,[b,c])},this)},CLASS_NAME:"OpenLayers.Protocol"});OpenLayers.Protocol.Response=OpenLayers.Class({code:null,requestType:null,last:!0,features:null,data:null,reqFeatures:null,priv:null,error:null,initialize:function(a){OpenLayers.Util.extend(this,a)},success:function(){return 0<this.code},CLASS_NAME:"OpenLayers.Protocol.Response"});
-OpenLayers.Protocol.Response.SUCCESS=1;OpenLayers.Protocol.Response.FAILURE=0;OpenLayers.Format.JSON=OpenLayers.Class(OpenLayers.Format,{indent:"    ",space:" ",newline:"\n",level:0,pretty:!1,nativeJSON:function(){return!(!window.JSON||"function"!=typeof JSON.parse||"function"!=typeof JSON.stringify)}(),read:function(a,b){var c;if(this.nativeJSON)c=JSON.parse(a,b);else try{if(/^[\],:{}\s]*$/.test(a.replace(/\\["\\\/bfnrtu]/g,"@").replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,"]").replace(/(?:^|:|,)(?:\s*\[)+/g,""))&&(c=eval("("+a+")"),"function"===
-typeof b)){var d=function(a,c){if(c&&"object"===typeof c)for(var e in c)c.hasOwnProperty(e)&&(c[e]=d(e,c[e]));return b(a,c)};c=d("",c)}}catch(e){}this.keepData&&(this.data=c);return c},write:function(a,b){this.pretty=!!b;var c=null,d=typeof a;if(this.serialize[d])try{c=!this.pretty&&this.nativeJSON?JSON.stringify(a):this.serialize[d].apply(this,[a])}catch(e){OpenLayers.Console.error("Trouble serializing: "+e)}return c},writeIndent:function(){var a=[];if(this.pretty)for(var b=0;b<this.level;++b)a.push(this.indent);
-return a.join("")},writeNewline:function(){return this.pretty?this.newline:""},writeSpace:function(){return this.pretty?this.space:""},serialize:{object:function(a){if(null==a)return"null";if(a.constructor==Date)return this.serialize.date.apply(this,[a]);if(a.constructor==Array)return this.serialize.array.apply(this,[a]);var b=["{"];this.level+=1;var c,d,e,f=!1;for(c in a)a.hasOwnProperty(c)&&(d=OpenLayers.Format.JSON.prototype.write.apply(this,[c,this.pretty]),e=OpenLayers.Format.JSON.prototype.write.apply(this,
-[a[c],this.pretty]),null!=d&&null!=e&&(f&&b.push(","),b.push(this.writeNewline(),this.writeIndent(),d,":",this.writeSpace(),e),f=!0));this.level-=1;b.push(this.writeNewline(),this.writeIndent(),"}");return b.join("")},array:function(a){var b,c=["["];this.level+=1;for(var d=0,e=a.length;d<e;++d)b=OpenLayers.Format.JSON.prototype.write.apply(this,[a[d],this.pretty]),null!=b&&(0<d&&c.push(","),c.push(this.writeNewline(),this.writeIndent(),b));this.level-=1;c.push(this.writeNewline(),this.writeIndent(),
-"]");return c.join("")},string:function(a){var b={"\b":"\\b","\t":"\\t","\n":"\\n","\f":"\\f","\r":"\\r",'"':'\\"',"\\":"\\\\"};return/["\\\x00-\x1f]/.test(a)?'"'+a.replace(/([\x00-\x1f\\"])/g,function(a,d){var e=b[d];if(e)return e;e=d.charCodeAt();return"\\u00"+Math.floor(e/16).toString(16)+(e%16).toString(16)})+'"':'"'+a+'"'},number:function(a){return isFinite(a)?String(a):"null"},"boolean":function(a){return String(a)},date:function(a){function b(a){return 10>a?"0"+a:a}return'"'+a.getFullYear()+
-"-"+b(a.getMonth()+1)+"-"+b(a.getDate())+"T"+b(a.getHours())+":"+b(a.getMinutes())+":"+b(a.getSeconds())+'"'}},CLASS_NAME:"OpenLayers.Format.JSON"});OpenLayers.Format.GeoJSON=OpenLayers.Class(OpenLayers.Format.JSON,{ignoreExtraDims:!1,read:function(a,b,c){b=b?b:"FeatureCollection";var d=null,e=null,e="string"==typeof a?OpenLayers.Format.JSON.prototype.read.apply(this,[a,c]):a;if(!e)OpenLayers.Console.error("Bad JSON: "+a);else if("string"!=typeof e.type)OpenLayers.Console.error("Bad GeoJSON - no type: "+a);else if(this.isValidType(e,b))switch(b){case "Geometry":try{d=this.parseGeometry(e)}catch(f){OpenLayers.Console.error(f)}break;case "Feature":try{d=
-this.parseFeature(e),d.type="Feature"}catch(g){OpenLayers.Console.error(g)}break;case "FeatureCollection":switch(d=[],e.type){case "Feature":try{d.push(this.parseFeature(e))}catch(h){d=null,OpenLayers.Console.error(h)}break;case "FeatureCollection":a=0;for(b=e.features.length;a<b;++a)try{d.push(this.parseFeature(e.features[a]))}catch(k){d=null,OpenLayers.Console.error(k)}break;default:try{var l=this.parseGeometry(e);d.push(new OpenLayers.Feature.Vector(l))}catch(m){d=null,OpenLayers.Console.error(m)}}}return d},
-isValidType:function(a,b){var c=!1;switch(b){case "Geometry":-1==OpenLayers.Util.indexOf("Point MultiPoint LineString MultiLineString Polygon MultiPolygon Box GeometryCollection".split(" "),a.type)?OpenLayers.Console.error("Unsupported geometry type: "+a.type):c=!0;break;case "FeatureCollection":c=!0;break;default:a.type==b?c=!0:OpenLayers.Console.error("Cannot convert types from "+a.type+" to "+b)}return c},parseFeature:function(a){var b,c,d;c=a.properties?a.properties:{};d=a.geometry&&a.geometry.bbox||
-a.bbox;try{b=this.parseGeometry(a.geometry)}catch(e){throw e;}b=new OpenLayers.Feature.Vector(b,c);d&&(b.bounds=OpenLayers.Bounds.fromArray(d));a.id&&(b.fid=a.id);return b},parseGeometry:function(a){if(null==a)return null;var b,c=!1;if("GeometryCollection"==a.type){if(!OpenLayers.Util.isArray(a.geometries))throw"GeometryCollection must have geometries array: "+a;b=a.geometries.length;for(var c=Array(b),d=0;d<b;++d)c[d]=this.parseGeometry.apply(this,[a.geometries[d]]);b=new OpenLayers.Geometry.Collection(c);
-c=!0}else{if(!OpenLayers.Util.isArray(a.coordinates))throw"Geometry must have coordinates array: "+a;if(!this.parseCoords[a.type.toLowerCase()])throw"Unsupported geometry type: "+a.type;try{b=this.parseCoords[a.type.toLowerCase()].apply(this,[a.coordinates])}catch(e){throw e;}}this.internalProjection&&(this.externalProjection&&!c)&&b.transform(this.externalProjection,this.internalProjection);return b},parseCoords:{point:function(a){if(!1==this.ignoreExtraDims&&2!=a.length)throw"Only 2D points are supported: "+
-a;return new OpenLayers.Geometry.Point(a[0],a[1])},multipoint:function(a){for(var b=[],c=null,d=0,e=a.length;d<e;++d){try{c=this.parseCoords.point.apply(this,[a[d]])}catch(f){throw f;}b.push(c)}return new OpenLayers.Geometry.MultiPoint(b)},linestring:function(a){for(var b=[],c=null,d=0,e=a.length;d<e;++d){try{c=this.parseCoords.point.apply(this,[a[d]])}catch(f){throw f;}b.push(c)}return new OpenLayers.Geometry.LineString(b)},multilinestring:function(a){for(var b=[],c=null,d=0,e=a.length;d<e;++d){try{c=
-this.parseCoords.linestring.apply(this,[a[d]])}catch(f){throw f;}b.push(c)}return new OpenLayers.Geometry.MultiLineString(b)},polygon:function(a){for(var b=[],c,d,e=0,f=a.length;e<f;++e){try{d=this.parseCoords.linestring.apply(this,[a[e]])}catch(g){throw g;}c=new OpenLayers.Geometry.LinearRing(d.components);b.push(c)}return new OpenLayers.Geometry.Polygon(b)},multipolygon:function(a){for(var b=[],c=null,d=0,e=a.length;d<e;++d){try{c=this.parseCoords.polygon.apply(this,[a[d]])}catch(f){throw f;}b.push(c)}return new OpenLayers.Geometry.MultiPolygon(b)},
-box:function(a){if(2!=a.length)throw"GeoJSON box coordinates must have 2 elements";return new OpenLayers.Geometry.Polygon([new OpenLayers.Geometry.LinearRing([new OpenLayers.Geometry.Point(a[0][0],a[0][1]),new OpenLayers.Geometry.Point(a[1][0],a[0][1]),new OpenLayers.Geometry.Point(a[1][0],a[1][1]),new OpenLayers.Geometry.Point(a[0][0],a[1][1]),new OpenLayers.Geometry.Point(a[0][0],a[0][1])])])}},write:function(a,b){var c={type:null};if(OpenLayers.Util.isArray(a)){c.type="FeatureCollection";var d=
-a.length;c.features=Array(d);for(var e=0;e<d;++e){var f=a[e];if(!f instanceof OpenLayers.Feature.Vector)throw"FeatureCollection only supports collections of features: "+f;c.features[e]=this.extract.feature.apply(this,[f])}}else 0==a.CLASS_NAME.indexOf("OpenLayers.Geometry")?c=this.extract.geometry.apply(this,[a]):a instanceof OpenLayers.Feature.Vector&&(c=this.extract.feature.apply(this,[a]),a.layer&&a.layer.projection&&(c.crs=this.createCRSObject(a)));return OpenLayers.Format.JSON.prototype.write.apply(this,
-[c,b])},createCRSObject:function(a){a=a.layer.projection.toString();var b={};a.match(/epsg:/i)&&(a=parseInt(a.substring(a.indexOf(":")+1)),b=4326==a?{type:"name",properties:{name:"urn:ogc:def:crs:OGC:1.3:CRS84"}}:{type:"name",properties:{name:"EPSG:"+a}});return b},extract:{feature:function(a){var b=this.extract.geometry.apply(this,[a.geometry]),b={type:"Feature",properties:a.attributes,geometry:b};null!=a.fid&&(b.id=a.fid);return b},geometry:function(a){if(null==a)return null;this.internalProjection&&
-this.externalProjection&&(a=a.clone(),a.transform(this.internalProjection,this.externalProjection));var b=a.CLASS_NAME.split(".")[2];a=this.extract[b.toLowerCase()].apply(this,[a]);return"Collection"==b?{type:"GeometryCollection",geometries:a}:{type:b,coordinates:a}},point:function(a){return[a.x,a.y]},multipoint:function(a){for(var b=[],c=0,d=a.components.length;c<d;++c)b.push(this.extract.point.apply(this,[a.components[c]]));return b},linestring:function(a){for(var b=[],c=0,d=a.components.length;c<
-d;++c)b.push(this.extract.point.apply(this,[a.components[c]]));return b},multilinestring:function(a){for(var b=[],c=0,d=a.components.length;c<d;++c)b.push(this.extract.linestring.apply(this,[a.components[c]]));return b},polygon:function(a){for(var b=[],c=0,d=a.components.length;c<d;++c)b.push(this.extract.linestring.apply(this,[a.components[c]]));return b},multipolygon:function(a){for(var b=[],c=0,d=a.components.length;c<d;++c)b.push(this.extract.polygon.apply(this,[a.components[c]]));return b},collection:function(a){for(var b=
-a.components.length,c=Array(b),d=0;d<b;++d)c[d]=this.extract.geometry.apply(this,[a.components[d]]);return c}},CLASS_NAME:"OpenLayers.Format.GeoJSON"});OpenLayers.Protocol.Script=OpenLayers.Class(OpenLayers.Protocol,{url:null,params:null,callback:null,callbackTemplate:"OpenLayers.Protocol.Script.registry.${id}",callbackKey:"callback",callbackPrefix:"",scope:null,format:null,pendingRequests:null,srsInBBOX:!1,initialize:function(a){a=a||{};this.params={};this.pendingRequests={};OpenLayers.Protocol.prototype.initialize.apply(this,arguments);this.format||(this.format=new OpenLayers.Format.GeoJSON);if(!this.filterToParams&&OpenLayers.Format.QueryStringFilter){var b=
-new OpenLayers.Format.QueryStringFilter({srsInBBOX:this.srsInBBOX});this.filterToParams=function(a,d){return b.write(a,d)}}},read:function(a){OpenLayers.Protocol.prototype.read.apply(this,arguments);a=OpenLayers.Util.applyDefaults(a,this.options);a.params=OpenLayers.Util.applyDefaults(a.params,this.options.params);a.filter&&this.filterToParams&&(a.params=this.filterToParams(a.filter,a.params));var b=new OpenLayers.Protocol.Response({requestType:"read"}),c=this.createRequest(a.url,a.params,OpenLayers.Function.bind(function(c){b.data=
-c;this.handleRead(b,a)},this));b.priv=c;return b},createRequest:function(a,b,c){c=OpenLayers.Protocol.Script.register(c);var d=OpenLayers.String.format(this.callbackTemplate,{id:c});b=OpenLayers.Util.extend({},b);b[this.callbackKey]=this.callbackPrefix+d;a=OpenLayers.Util.urlAppend(a,OpenLayers.Util.getParameterString(b));b=document.createElement("script");b.type="text/javascript";b.src=a;b.id="OpenLayers_Protocol_Script_"+c;this.pendingRequests[b.id]=b;document.getElementsByTagName("head")[0].appendChild(b);
-return b},destroyRequest:function(a){OpenLayers.Protocol.Script.unregister(a.id.split("_").pop());delete this.pendingRequests[a.id];a.parentNode&&a.parentNode.removeChild(a)},handleRead:function(a,b){this.handleResponse(a,b)},handleResponse:function(a,b){b.callback&&(a.data?(a.features=this.parseFeatures(a.data),a.code=OpenLayers.Protocol.Response.SUCCESS):a.code=OpenLayers.Protocol.Response.FAILURE,this.destroyRequest(a.priv),b.callback.call(b.scope,a))},parseFeatures:function(a){return this.format.read(a)},
-abort:function(a){if(a)this.destroyRequest(a.priv);else for(var b in this.pendingRequests)this.destroyRequest(this.pendingRequests[b])},destroy:function(){this.abort();delete this.params;delete this.format;OpenLayers.Protocol.prototype.destroy.apply(this)},CLASS_NAME:"OpenLayers.Protocol.Script"});(function(){var a=OpenLayers.Protocol.Script,b=0;a.registry={};a.register=function(c){var d="c"+ ++b;a.registry[d]=function(){c.apply(this,arguments)};return d};a.unregister=function(b){delete a.registry[b]}})();OpenLayers.Format.EncodedPolyline=OpenLayers.Class(OpenLayers.Format,{geometryType:"linestring",initialize:function(a){OpenLayers.Format.prototype.initialize.apply(this,[a])},read:function(a){var b;if("linestring"==this.geometryType)b=OpenLayers.Geometry.LineString;else if("linearring"==this.geometryType)b=OpenLayers.Geometry.LinearRing;else if("multipoint"==this.geometryType)b=OpenLayers.Geometry.MultiPoint;else if("point"!=this.geometryType&&"polygon"!=this.geometryType)return null;a=this.decodeDeltas(a,
-2);for(var c=a.length,d=[],e=0;e+1<c;){var f=a[e++],g=a[e++];d.push(new OpenLayers.Geometry.Point(g,f))}return"point"==this.geometryType?new OpenLayers.Feature.Vector(d[0]):"polygon"==this.geometryType?new OpenLayers.Feature.Vector(new OpenLayers.Geometry.Polygon([new OpenLayers.Geometry.LinearRing(d)])):new OpenLayers.Feature.Vector(new b(d))},decode:function(a,b,c){a=this.decodeDeltas(a,b,c||1E5);c=a.length;for(var d=[],e=0;e+(b-1)<c;){for(var f=[],g=0;g<b;++g)f.push(a[e++]);d.push(f)}return d},
-write:function(a){a=(a.constructor==Array?a[0]:a).geometry;var b=a.CLASS_NAME.split(".")[2].toLowerCase();if("point"==b)a=Array(a);else if("linestring"==b||"linearring"==b||"multipoint"==b)a=a.components;else if("polygon"==b)a=a.components[0].components;else return null;for(var b=[],c=a.length,d=0;d<c;++d){var e=a[d];b.push(e.y);b.push(e.x)}return this.encodeDeltas(b,2)},encode:function(a,b,c){c=c||1E5;for(var d=[],e=a.length,f=0;f<e;++f)for(var g=a[f],h=0;h<b;++h)d.push(g[h]);return this.encodeDeltas(d,
-b,c)},encodeDeltas:function(a,b,c){var d,e=Array(b);for(d=0;d<b;++d)e[d]=0;for(var f=a.length,g=0;g<f;)for(d=0;d<b;++d,++g){var h=a[g],k=h-e[d];e[d]=h;a[g]=k}return this.encodeFloats(a,c||1E5)},decodeDeltas:function(a,b,c){var d,e=Array(b);for(d=0;d<b;++d)e[d]=0;a=this.decodeFloats(a,c||1E5);c=a.length;for(var f=0;f<c;)for(d=0;d<b;++d,++f)e[d]+=a[f],a[f]=e[d];return a},encodeFloats:function(a,b){for(var c=b||1E5,d=a.length,e=0;e<d;++e)a[e]=Math.round(a[e]*c);return this.encodeSignedIntegers(a)},decodeFloats:function(a,
-b){for(var c=b||1E5,d=this.decodeSignedIntegers(a),e=d.length,f=0;f<e;++f)d[f]/=c;return d},encodeSignedIntegers:function(a){for(var b=a.length,c=0;c<b;++c){var d=a[c],e=d<<1;0>d&&(e=~e);a[c]=e}return this.encodeUnsignedIntegers(a)},decodeSignedIntegers:function(a){a=this.decodeUnsignedIntegers(a);for(var b=a.length,c=0;c<b;++c){var d=a[c];a[c]=d&1?~(d>>1):d>>1}return a},encodeUnsignedIntegers:function(a){for(var b="",c=a.length,d=0;d<c;++d)b+=this.encodeUnsignedInteger(a[d]);return b},decodeUnsignedIntegers:function(a){for(var b=
-[],c=0,d=0,e=a.length,f=0;f<e;++f){var g=a.charCodeAt(f)-63,c=c|(g&31)<<d;32>g?(b.push(c),d=c=0):d+=5}return b},encodeFloat:function(a,b){a=Math.round(a*(b||1E5));return this.encodeSignedInteger(a)},decodeFloat:function(a,b){return this.decodeSignedInteger(a)/(b||1E5)},encodeSignedInteger:function(a){var b=a<<1;0>a&&(b=~b);return this.encodeUnsignedInteger(b)},decodeSignedInteger:function(a){a=this.decodeUnsignedInteger(a);return a&1?~(a>>1):a>>1},encodeUnsignedInteger:function(a){for(var b,c="";32<=
-a;)b=(32|a&31)+63,c+=String.fromCharCode(b),a>>=5;return c+=String.fromCharCode(a+63)},decodeUnsignedInteger:function(a){for(var b=0,c=0,d=a.length,e=0;e<d;++e){var f=a.charCodeAt(e)-63,b=b|(f&31)<<c;if(32>f)break;c+=5}return b},CLASS_NAME:"OpenLayers.Format.EncodedPolyline"});OpenLayers.Control.Panel=OpenLayers.Class(OpenLayers.Control,{controls:null,autoActivate:!0,defaultControl:null,saveState:!1,allowDepress:!1,activeState:null,initialize:function(a){OpenLayers.Control.prototype.initialize.apply(this,[a]);this.controls=[];this.activeState={}},destroy:function(){this.map&&this.map.events.unregister("buttonclick",this,this.onButtonClick);OpenLayers.Control.prototype.destroy.apply(this,arguments);for(var a,b=this.controls.length-1;0<=b;b--)a=this.controls[b],a.events&&
-a.events.un({activate:this.iconOn,deactivate:this.iconOff}),a.panel_div=null;this.activeState=null},activate:function(){if(OpenLayers.Control.prototype.activate.apply(this,arguments)){for(var a,b=0,c=this.controls.length;b<c;b++)a=this.controls[b],(a===this.defaultControl||this.saveState&&this.activeState[a.id])&&a.activate();!0===this.saveState&&(this.defaultControl=null);this.redraw();return!0}return!1},deactivate:function(){if(OpenLayers.Control.prototype.deactivate.apply(this,arguments)){for(var a,
-b=0,c=this.controls.length;b<c;b++)a=this.controls[b],this.activeState[a.id]=a.deactivate();this.redraw();return!0}return!1},draw:function(){OpenLayers.Control.prototype.draw.apply(this,arguments);this.outsideViewport?(this.events.attachToElement(this.div),this.events.register("buttonclick",this,this.onButtonClick)):this.map.events.register("buttonclick",this,this.onButtonClick);this.addControlsToMap(this.controls);return this.div},redraw:function(){for(var a=this.div.childNodes.length-1;0<=a;a--)this.div.removeChild(this.div.childNodes[a]);
-this.div.innerHTML="";if(this.active)for(var a=0,b=this.controls.length;a<b;a++)this.div.appendChild(this.controls[a].panel_div)},activateControl:function(a){if(!this.active)return!1;if(a.type==OpenLayers.Control.TYPE_BUTTON)a.trigger();else if(a.type==OpenLayers.Control.TYPE_TOGGLE)a.active?a.deactivate():a.activate();else if(this.allowDepress&&a.active)a.deactivate();else{for(var b,c=0,d=this.controls.length;c<d;c++)b=this.controls[c],b==a||b.type!==OpenLayers.Control.TYPE_TOOL&&null!=b.type||b.deactivate();
-a.activate()}},addControls:function(a){OpenLayers.Util.isArray(a)||(a=[a]);this.controls=this.controls.concat(a);for(var b=0,c=a.length;b<c;b++){var d=a[b],e=this.createControlMarkup(d);OpenLayers.Element.addClass(e,d.displayClass+"ItemInactive");OpenLayers.Element.addClass(e,"olButton");""==d.title||e.title||(e.title=d.title);d.panel_div=e}this.map&&(this.addControlsToMap(a),this.redraw())},createControlMarkup:function(a){return document.createElement("div")},addControlsToMap:function(a){for(var b,
-c=0,d=a.length;c<d;c++)b=a[c],!0===b.autoActivate?(b.autoActivate=!1,this.map.addControl(b),b.autoActivate=!0):(this.map.addControl(b),b.deactivate()),b.events.on({activate:this.iconOn,deactivate:this.iconOff})},iconOn:function(){var a=this.panel_div;a.className=a.className.replace(RegExp("\\b("+this.displayClass+"Item)Inactive\\b"),"$1Active")},iconOff:function(){var a=this.panel_div;a.className=a.className.replace(RegExp("\\b("+this.displayClass+"Item)Active\\b"),"$1Inactive")},onButtonClick:function(a){var b=
-this.controls;a=a.buttonElement;for(var c=b.length-1;0<=c;--c)if(b[c].panel_div===a){this.activateControl(b[c]);break}},getControlsBy:function(a,b){var c="function"==typeof b.test;return OpenLayers.Array.filter(this.controls,function(d){return d[a]==b||c&&b.test(d[a])})},getControlsByName:function(a){return this.getControlsBy("name",a)},getControlsByClass:function(a){return this.getControlsBy("CLASS_NAME",a)},CLASS_NAME:"OpenLayers.Control.Panel"});OpenLayers.Control.Button=OpenLayers.Class(OpenLayers.Control,{type:OpenLayers.Control.TYPE_BUTTON,trigger:function(){},CLASS_NAME:"OpenLayers.Control.Button"});OpenLayers.Control.ZoomIn=OpenLayers.Class(OpenLayers.Control.Button,{trigger:function(){this.map&&this.map.zoomIn()},CLASS_NAME:"OpenLayers.Control.ZoomIn"});OpenLayers.Control.ZoomOut=OpenLayers.Class(OpenLayers.Control.Button,{trigger:function(){this.map&&this.map.zoomOut()},CLASS_NAME:"OpenLayers.Control.ZoomOut"});OpenLayers.Control.ZoomToMaxExtent=OpenLayers.Class(OpenLayers.Control.Button,{trigger:function(){this.map&&this.map.zoomToMaxExtent()},CLASS_NAME:"OpenLayers.Control.ZoomToMaxExtent"});OpenLayers.Control.ZoomPanel=OpenLayers.Class(OpenLayers.Control.Panel,{initialize:function(a){OpenLayers.Control.Panel.prototype.initialize.apply(this,[a]);this.addControls([new OpenLayers.Control.ZoomIn,new OpenLayers.Control.ZoomToMaxExtent,new OpenLayers.Control.ZoomOut])},CLASS_NAME:"OpenLayers.Control.ZoomPanel"});OpenLayers.Layer.HTTPRequest=OpenLayers.Class(OpenLayers.Layer,{URL_HASH_FACTOR:(Math.sqrt(5)-1)/2,url:null,params:null,reproject:!1,initialize:function(a,b,c,d){OpenLayers.Layer.prototype.initialize.apply(this,[a,d]);this.url=b;this.params||(this.params=OpenLayers.Util.extend({},c))},destroy:function(){this.params=this.url=null;OpenLayers.Layer.prototype.destroy.apply(this,arguments)},clone:function(a){null==a&&(a=new OpenLayers.Layer.HTTPRequest(this.name,this.url,this.params,this.getOptions()));
-return a=OpenLayers.Layer.prototype.clone.apply(this,[a])},setUrl:function(a){this.url=a},mergeNewParams:function(a){this.params=OpenLayers.Util.extend(this.params,a);a=this.redraw();null!=this.map&&this.map.events.triggerEvent("changelayer",{layer:this,property:"params"});return a},redraw:function(a){return a?this.mergeNewParams({_olSalt:Math.random()}):OpenLayers.Layer.prototype.redraw.apply(this,[])},selectUrl:function(a,b){for(var c=1,d=0,e=a.length;d<e;d++)c*=a.charCodeAt(d)*this.URL_HASH_FACTOR,
-c-=Math.floor(c);return b[Math.floor(c*b.length)]},getFullRequestString:function(a,b){var c=b||this.url,d=OpenLayers.Util.extend({},this.params),d=OpenLayers.Util.extend(d,a),e=OpenLayers.Util.getParameterString(d);OpenLayers.Util.isArray(c)&&(c=this.selectUrl(e,c));var e=OpenLayers.Util.upperCaseObject(OpenLayers.Util.getParameters(c)),f;for(f in d)f.toUpperCase()in e&&delete d[f];e=OpenLayers.Util.getParameterString(d);return OpenLayers.Util.urlAppend(c,e)},CLASS_NAME:"OpenLayers.Layer.HTTPRequest"});OpenLayers.Tile=OpenLayers.Class({events:null,eventListeners:null,id:null,layer:null,url:null,bounds:null,size:null,position:null,isLoading:!1,initialize:function(a,b,c,d,e,f){this.layer=a;this.position=b.clone();this.setBounds(c);this.url=d;e&&(this.size=e.clone());this.id=OpenLayers.Util.createUniqueID("Tile_");OpenLayers.Util.extend(this,f);this.events=new OpenLayers.Events(this);if(this.eventListeners instanceof Object)this.events.on(this.eventListeners)},unload:function(){this.isLoading&&(this.isLoading=
-!1,this.events.triggerEvent("unload"))},destroy:function(){this.position=this.size=this.bounds=this.layer=null;this.eventListeners&&this.events.un(this.eventListeners);this.events.destroy();this.events=this.eventListeners=null},draw:function(a){a||this.clear();var b=this.shouldDraw();b&&(!a&&!1===this.events.triggerEvent("beforedraw"))&&(b=null);return b},shouldDraw:function(){var a=!1,b=this.layer.maxExtent;if(b){var c=this.layer.map,c=c.baseLayer.wrapDateLine&&c.getMaxExtent();this.bounds.intersectsBounds(b,
-{inclusive:!1,worldBounds:c})&&(a=!0)}return a||this.layer.displayOutsideMaxExtent},setBounds:function(a){a=a.clone();if(this.layer.map.baseLayer.wrapDateLine){var b=this.layer.map.getMaxExtent(),c=this.layer.map.getResolution();a=a.wrapDateLine(b,{leftTolerance:c,rightTolerance:c})}this.bounds=a},moveTo:function(a,b,c){null==c&&(c=!0);this.setBounds(a);this.position=b.clone();c&&this.draw()},clear:function(a){},CLASS_NAME:"OpenLayers.Tile"});OpenLayers.Tile.Image=OpenLayers.Class(OpenLayers.Tile,{url:null,imgDiv:null,frame:null,imageReloadAttempts:null,layerAlphaHack:null,asyncRequestId:null,maxGetUrlLength:null,canvasContext:null,crossOriginKeyword:null,initialize:function(a,b,c,d,e,f){OpenLayers.Tile.prototype.initialize.apply(this,arguments);this.url=d;this.layerAlphaHack=this.layer.alpha&&OpenLayers.Util.alphaHack();if(null!=this.maxGetUrlLength||this.layer.gutter||this.layerAlphaHack)this.frame=document.createElement("div"),this.frame.style.position=
-"absolute",this.frame.style.overflow="hidden";null!=this.maxGetUrlLength&&OpenLayers.Util.extend(this,OpenLayers.Tile.Image.IFrame)},destroy:function(){this.imgDiv&&(this.clear(),this.frame=this.imgDiv=null);this.asyncRequestId=null;OpenLayers.Tile.prototype.destroy.apply(this,arguments)},draw:function(){var a=OpenLayers.Tile.prototype.draw.apply(this,arguments);a?(this.layer!=this.layer.map.baseLayer&&this.layer.reproject&&(this.bounds=this.getBoundsFromBaseLayer(this.position)),this.isLoading?this._loadEvent=
-"reload":(this.isLoading=!0,this._loadEvent="loadstart"),this.renderTile(),this.positionTile()):!1===a&&this.unload();return a},renderTile:function(){if(this.layer.async){var a=this.asyncRequestId=(this.asyncRequestId||0)+1;this.layer.getURLasync(this.bounds,function(b){a==this.asyncRequestId&&(this.url=b,this.initImage())},this)}else this.url=this.layer.getURL(this.bounds),this.initImage()},positionTile:function(){var a=this.getTile().style,b=this.frame?this.size:this.layer.getImageSize(this.bounds),
-c=1;this.layer instanceof OpenLayers.Layer.Grid&&(c=this.layer.getServerResolution()/this.layer.map.getResolution());a.left=this.position.x+"px";a.top=this.position.y+"px";a.width=Math.round(c*b.w)+"px";a.height=Math.round(c*b.h)+"px"},clear:function(){OpenLayers.Tile.prototype.clear.apply(this,arguments);var a=this.imgDiv;if(a){var b=this.getTile();b.parentNode===this.layer.div&&this.layer.div.removeChild(b);this.setImgSrc();!0===this.layerAlphaHack&&(a.style.filter="");OpenLayers.Element.removeClass(a,
-"olImageLoadError")}this.canvasContext=null},getImage:function(){if(!this.imgDiv){this.imgDiv=OpenLayers.Tile.Image.IMAGE.cloneNode(!1);var a=this.imgDiv.style;if(this.frame){var b=0,c=0;this.layer.gutter&&(b=100*(this.layer.gutter/this.layer.tileSize.w),c=100*(this.layer.gutter/this.layer.tileSize.h));a.left=-b+"%";a.top=-c+"%";a.width=2*b+100+"%";a.height=2*c+100+"%"}a.visibility="hidden";a.opacity=0;1>this.layer.opacity&&(a.filter="alpha(opacity="+100*this.layer.opacity+")");a.position="absolute";
-this.layerAlphaHack&&(a.paddingTop=a.height,a.height="0",a.width="100%");this.frame&&this.frame.appendChild(this.imgDiv)}return this.imgDiv},setImage:function(a){this.imgDiv=a},initImage:function(){if(this.url||this.imgDiv){this.events.triggerEvent("beforeload");this.layer.div.appendChild(this.getTile());this.events.triggerEvent(this._loadEvent);var a=this.getImage(),b=a.getAttribute("src")||"";this.url&&OpenLayers.Util.isEquivalentUrl(b,this.url)?this._loadTimeout=window.setTimeout(OpenLayers.Function.bind(this.onImageLoad,
-this),0):(this.stopLoading(),this.crossOriginKeyword&&a.removeAttribute("crossorigin"),OpenLayers.Event.observe(a,"load",OpenLayers.Function.bind(this.onImageLoad,this)),OpenLayers.Event.observe(a,"error",OpenLayers.Function.bind(this.onImageError,this)),this.imageReloadAttempts=0,this.setImgSrc(this.url))}else this.isLoading=!1},setImgSrc:function(a){var b=this.imgDiv;a?(b.style.visibility="hidden",b.style.opacity=0,this.crossOriginKeyword&&("data:"!==a.substr(0,5)?b.setAttribute("crossorigin",this.crossOriginKeyword):
-b.removeAttribute("crossorigin")),b.src=a):(this.stopLoading(),this.imgDiv=null,b.parentNode&&b.parentNode.removeChild(b))},getTile:function(){return this.frame?this.frame:this.getImage()},createBackBuffer:function(){if(this.imgDiv&&!this.isLoading){var a;this.frame?(a=this.frame.cloneNode(!1),a.appendChild(this.imgDiv)):a=this.imgDiv;this.imgDiv=null;return a}},onImageLoad:function(){var a=this.imgDiv;this.stopLoading();a.style.visibility="inherit";a.style.opacity=this.layer.opacity;this.isLoading=
-!1;this.canvasContext=null;this.events.triggerEvent("loadend");!0===this.layerAlphaHack&&(a.style.filter="progid:DXImageTransform.Microsoft.AlphaImageLoader(src='"+a.src+"', sizingMethod='scale')")},onImageError:function(){var a=this.imgDiv;null!=a.src&&(this.imageReloadAttempts++,this.imageReloadAttempts<=OpenLayers.IMAGE_RELOAD_ATTEMPTS?this.setImgSrc(this.layer.getURL(this.bounds)):(OpenLayers.Element.addClass(a,"olImageLoadError"),this.events.triggerEvent("loaderror"),this.onImageLoad()))},stopLoading:function(){OpenLayers.Event.stopObservingElement(this.imgDiv);
-window.clearTimeout(this._loadTimeout);delete this._loadTimeout},getCanvasContext:function(){if(OpenLayers.CANVAS_SUPPORTED&&this.imgDiv&&!this.isLoading){if(!this.canvasContext){var a=document.createElement("canvas");a.width=this.size.w;a.height=this.size.h;this.canvasContext=a.getContext("2d");this.canvasContext.drawImage(this.imgDiv,0,0)}return this.canvasContext}},CLASS_NAME:"OpenLayers.Tile.Image"});
-OpenLayers.Tile.Image.IMAGE=function(){var a=new Image;a.className="olTileImage";a.galleryImg="no";return a}();OpenLayers.Layer.Grid=OpenLayers.Class(OpenLayers.Layer.HTTPRequest,{tileSize:null,tileOriginCorner:"bl",tileOrigin:null,tileOptions:null,tileClass:OpenLayers.Tile.Image,grid:null,singleTile:!1,ratio:1.5,buffer:0,transitionEffect:"resize",numLoadingTiles:0,serverResolutions:null,loading:!1,backBuffer:null,gridResolution:null,backBufferResolution:null,backBufferLonLat:null,backBufferTimerId:null,removeBackBufferDelay:null,className:null,gridLayout:null,rowSign:null,transitionendEvents:["transitionend",
-"webkitTransitionEnd","otransitionend","oTransitionEnd"],initialize:function(a,b,c,d){OpenLayers.Layer.HTTPRequest.prototype.initialize.apply(this,arguments);this.grid=[];this._removeBackBuffer=OpenLayers.Function.bind(this.removeBackBuffer,this);this.initProperties();this.rowSign="t"===this.tileOriginCorner.substr(0,1)?1:-1},initProperties:function(){void 0===this.options.removeBackBufferDelay&&(this.removeBackBufferDelay=this.singleTile?0:2500);void 0===this.options.className&&(this.className=this.singleTile?
-"olLayerGridSingleTile":"olLayerGrid")},setMap:function(a){OpenLayers.Layer.HTTPRequest.prototype.setMap.call(this,a);OpenLayers.Element.addClass(this.div,this.className)},removeMap:function(a){this.removeBackBuffer()},destroy:function(){this.removeBackBuffer();this.clearGrid();this.tileSize=this.grid=null;OpenLayers.Layer.HTTPRequest.prototype.destroy.apply(this,arguments)},clearGrid:function(){if(this.grid){for(var a=0,b=this.grid.length;a<b;a++)for(var c=this.grid[a],d=0,e=c.length;d<e;d++)this.destroyTile(c[d]);
-this.grid=[];this.gridLayout=this.gridResolution=null}},addOptions:function(a,b){var c=void 0!==a.singleTile&&a.singleTile!==this.singleTile;OpenLayers.Layer.HTTPRequest.prototype.addOptions.apply(this,arguments);this.map&&c&&(this.initProperties(),this.clearGrid(),this.tileSize=this.options.tileSize,this.setTileSize(),this.moveTo(null,!0))},clone:function(a){null==a&&(a=new OpenLayers.Layer.Grid(this.name,this.url,this.params,this.getOptions()));a=OpenLayers.Layer.HTTPRequest.prototype.clone.apply(this,
-[a]);null!=this.tileSize&&(a.tileSize=this.tileSize.clone());a.grid=[];a.gridResolution=null;a.backBuffer=null;a.backBufferTimerId=null;a.loading=!1;a.numLoadingTiles=0;return a},moveTo:function(a,b,c){OpenLayers.Layer.HTTPRequest.prototype.moveTo.apply(this,arguments);a=a||this.map.getExtent();if(null!=a){var d=!this.grid.length||b,e=this.getTilesBounds(),f=this.map.getResolution();this.getServerResolution(f);if(this.singleTile){if(d||!c&&!e.containsBounds(a))b&&"resize"!==this.transitionEffect&&
-this.removeBackBuffer(),b&&"resize"!==this.transitionEffect||this.applyBackBuffer(f),this.initSingleTile(a)}else(d=d||!e.intersectsBounds(a,{worldBounds:this.map.baseLayer.wrapDateLine&&this.map.getMaxExtent()}))?(!b||"resize"!==this.transitionEffect&&this.gridResolution!==f||this.applyBackBuffer(f),this.initGriddedTiles(a)):this.moveGriddedTiles()}},getTileData:function(a){var b=null,c=a.lon,d=a.lat,e=this.grid.length;if(this.map&&e){var f=this.map.getResolution();a=this.tileSize.w;var g=this.tileSize.h,
-h=this.grid[0][0].bounds,k=h.left,h=h.top;if(c<k&&this.map.baseLayer.wrapDateLine)var l=this.map.getMaxExtent().getWidth(),m=Math.ceil((k-c)/l),c=c+l*m;c=(c-k)/(f*a);d=(h-d)/(f*g);f=Math.floor(c);k=Math.floor(d);0<=k&&k<e&&(e=this.grid[k][f])&&(b={tile:e,i:Math.floor((c-f)*a),j:Math.floor((d-k)*g)})}return b},destroyTile:function(a){this.removeTileMonitoringHooks(a);a.destroy()},getServerResolution:function(a){var b=Number.POSITIVE_INFINITY;a=a||this.map.getResolution();if(this.serverResolutions&&
--1===OpenLayers.Util.indexOf(this.serverResolutions,a)){var c,d,e,f;for(c=this.serverResolutions.length-1;0<=c;c--){e=this.serverResolutions[c];d=Math.abs(e-a);if(d>b)break;b=d;f=e}a=f}return a},getServerZoom:function(){var a=this.getServerResolution();return this.serverResolutions?OpenLayers.Util.indexOf(this.serverResolutions,a):this.map.getZoomForResolution(a)+(this.zoomOffset||0)},applyBackBuffer:function(a){null!==this.backBufferTimerId&&this.removeBackBuffer();var b=this.backBuffer;if(!b){b=
-this.createBackBuffer();if(!b)return;a===this.gridResolution?this.div.insertBefore(b,this.div.firstChild):this.map.baseLayer.div.parentNode.insertBefore(b,this.map.baseLayer.div);this.backBuffer=b;var c=this.grid[0][0].bounds;this.backBufferLonLat={lon:c.left,lat:c.top};this.backBufferResolution=this.gridResolution}for(var c=this.backBufferResolution/a,d=b.childNodes,e,f=d.length-1;0<=f;--f)e=d[f],e.style.top=(c*e._i*e._h|0)+"px",e.style.left=(c*e._j*e._w|0)+"px",e.style.width=Math.round(c*e._w)+
-"px",e.style.height=Math.round(c*e._h)+"px";a=this.getViewPortPxFromLonLat(this.backBufferLonLat,a);c=this.map.layerContainerOriginPx.y;b.style.left=Math.round(a.x-this.map.layerContainerOriginPx.x)+"px";b.style.top=Math.round(a.y-c)+"px"},createBackBuffer:function(){var a;if(0<this.grid.length){a=document.createElement("div");a.id=this.div.id+"_bb";a.className="olBackBuffer";a.style.position="absolute";var b=this.map;a.style.zIndex="resize"===this.transitionEffect?this.getZIndex()-1:b.Z_INDEX_BASE.BaseLayer-
-(b.getNumLayers()-b.getLayerIndex(this));for(var b=0,c=this.grid.length;b<c;b++)for(var d=0,e=this.grid[b].length;d<e;d++){var f=this.grid[b][d],g=this.grid[b][d].createBackBuffer();g&&(g._i=b,g._j=d,g._w=f.size.w,g._h=f.size.h,g.id=f.id+"_bb",a.appendChild(g))}}return a},removeBackBuffer:function(){if(this._transitionElement){for(var a=this.transitionendEvents.length-1;0<=a;--a)OpenLayers.Event.stopObserving(this._transitionElement,this.transitionendEvents[a],this._removeBackBuffer);delete this._transitionElement}this.backBuffer&&
-(this.backBuffer.parentNode&&this.backBuffer.parentNode.removeChild(this.backBuffer),this.backBufferResolution=this.backBuffer=null,null!==this.backBufferTimerId&&(window.clearTimeout(this.backBufferTimerId),this.backBufferTimerId=null))},moveByPx:function(a,b){this.singleTile||this.moveGriddedTiles()},setTileSize:function(a){this.singleTile&&(a=this.map.getSize(),a.h=parseInt(a.h*this.ratio,10),a.w=parseInt(a.w*this.ratio,10));OpenLayers.Layer.HTTPRequest.prototype.setTileSize.apply(this,[a])},getTilesBounds:function(){var a=
-null,b=this.grid.length;if(b)var a=this.grid[b-1][0].bounds,b=this.grid[0].length*a.getWidth(),c=this.grid.length*a.getHeight(),a=new OpenLayers.Bounds(a.left,a.bottom,a.left+b,a.bottom+c);return a},initSingleTile:function(a){this.events.triggerEvent("retile");var b=a.getCenterLonLat(),c=a.getWidth()*this.ratio;a=a.getHeight()*this.ratio;b=new OpenLayers.Bounds(b.lon-c/2,b.lat-a/2,b.lon+c/2,b.lat+a/2);c=this.map.getLayerPxFromLonLat({lon:b.left,lat:b.top});this.grid.length||(this.grid[0]=[]);(a=this.grid[0][0])?
-a.moveTo(b,c):(a=this.addTile(b,c),this.addTileMonitoringHooks(a),a.draw(),this.grid[0][0]=a);this.removeExcessTiles(1,1);this.gridResolution=this.getServerResolution()},calculateGridLayout:function(a,b,c){var d=c*this.tileSize.w;c*=this.tileSize.h;var e=Math.floor((a.left-b.lon)/d)-this.buffer,f=this.rowSign;a=Math[~f?"floor":"ceil"](f*(b.lat-a.top+c)/c)-this.buffer*f;return{tilelon:d,tilelat:c,startcol:e,startrow:a}},getTileOrigin:function(){var a=this.tileOrigin;if(!a)var a=this.getMaxExtent(),
-b={tl:["left","top"],tr:["right","top"],bl:["left","bottom"],br:["right","bottom"]}[this.tileOriginCorner],a=new OpenLayers.LonLat(a[b[0]],a[b[1]]);return a},getTileBoundsForGridIndex:function(a,b){var c=this.getTileOrigin(),d=this.gridLayout,e=d.tilelon,f=d.tilelat,g=d.startcol,d=d.startrow,h=this.rowSign;return new OpenLayers.Bounds(c.lon+(g+b)*e,c.lat-(d+a*h)*f*h,c.lon+(g+b+1)*e,c.lat-(d+(a-1)*h)*f*h)},initGriddedTiles:function(a){this.events.triggerEvent("retile");var b=this.map.getSize(),c=this.getTileOrigin(),
-d=this.map.getResolution(),e=this.getServerResolution(),f=d/e,d=this.tileSize.w/f,f=this.tileSize.h/f,g=Math.ceil(b.h/f)+2*this.buffer+1,b=Math.ceil(b.w/d)+2*this.buffer+1;this.gridLayout=e=this.calculateGridLayout(a,c,e);var c=e.tilelon,h=e.tilelat,e=this.map.layerContainerOriginPx.x,k=this.map.layerContainerOriginPx.y,l=this.getTileBoundsForGridIndex(0,0),m=this.map.getViewPortPxFromLonLat(new OpenLayers.LonLat(l.left,l.top));m.x=Math.round(m.x)-e;m.y=Math.round(m.y)-k;var e=[],k=this.map.getCenter(),
-n=0;do{var p=this.grid[n];p||(p=[],this.grid.push(p));var q=0;do{var l=this.getTileBoundsForGridIndex(n,q),r=m.clone();r.x+=q*Math.round(d);r.y+=n*Math.round(f);var s=p[q];s?s.moveTo(l,r,!1):(s=this.addTile(l,r),this.addTileMonitoringHooks(s),p.push(s));r=l.getCenterLonLat();e.push({tile:s,distance:Math.pow(r.lon-k.lon,2)+Math.pow(r.lat-k.lat,2)});q+=1}while(l.right<=a.right+c*this.buffer||q<b);n+=1}while(l.bottom>=a.bottom-h*this.buffer||n<g);this.removeExcessTiles(n,q);this.gridResolution=d=this.getServerResolution();
-e.sort(function(a,b){return a.distance-b.distance});a=0;for(d=e.length;a<d;++a)e[a].tile.draw()},getMaxExtent:function(){return this.maxExtent},addTile:function(a,b){var c=new this.tileClass(this,b,a,null,this.tileSize,this.tileOptions);this.events.triggerEvent("addtile",{tile:c});return c},addTileMonitoringHooks:function(a){a.onLoadStart=function(){!1===this.loading&&(this.loading=!0,this.events.triggerEvent("loadstart"));this.events.triggerEvent("tileloadstart",{tile:a});this.numLoadingTiles++;
-!this.singleTile&&(this.backBuffer&&this.gridResolution===this.backBufferResolution)&&OpenLayers.Element.addClass(a.getTile(),"olTileReplacing")};a.onLoadEnd=function(b){this.numLoadingTiles--;b="unload"===b.type;this.events.triggerEvent("tileloaded",{tile:a,aborted:b});if(!this.singleTile&&!b&&this.backBuffer&&this.gridResolution===this.backBufferResolution){var c=a.getTile();if("none"===OpenLayers.Element.getStyle(c,"display")){var d=document.getElementById(a.id+"_bb");d&&d.parentNode.removeChild(d)}OpenLayers.Element.removeClass(c,
-"olTileReplacing")}if(0===this.numLoadingTiles){if(this.backBuffer)if(0===this.backBuffer.childNodes.length)this.removeBackBuffer();else{this._transitionElement=b?this.div.lastChild:a.imgDiv;b=this.transitionendEvents;for(c=b.length-1;0<=c;--c)OpenLayers.Event.observe(this._transitionElement,b[c],this._removeBackBuffer);this.backBufferTimerId=window.setTimeout(this._removeBackBuffer,this.removeBackBufferDelay)}this.loading=!1;this.events.triggerEvent("loadend")}};a.onLoadError=function(){this.events.triggerEvent("tileerror",
-{tile:a})};a.events.on({loadstart:a.onLoadStart,loadend:a.onLoadEnd,unload:a.onLoadEnd,loaderror:a.onLoadError,scope:this})},removeTileMonitoringHooks:function(a){a.unload();a.events.un({loadstart:a.onLoadStart,loadend:a.onLoadEnd,unload:a.onLoadEnd,loaderror:a.onLoadError,scope:this})},moveGriddedTiles:function(){for(var a=this.buffer+1;;){var b=this.grid[0][0],c=b.position.x+this.map.layerContainerOriginPx.x,b=b.position.y+this.map.layerContainerOriginPx.y,d=this.getServerResolution()/this.map.getResolution(),
-d={w:Math.round(this.tileSize.w*d),h:Math.round(this.tileSize.h*d)};if(c>-d.w*(a-1))this.shiftColumn(!0,d);else if(c<-d.w*a)this.shiftColumn(!1,d);else if(b>-d.h*(a-1))this.shiftRow(!0,d);else if(b<-d.h*a)this.shiftRow(!1,d);else break}},shiftRow:function(a,b){var c=this.grid,d=a?0:c.length-1,e=a?-1:1;this.gridLayout.startrow+=e*this.rowSign;for(var f=c[d],g=c[a?"pop":"shift"](),h=0,k=g.length;h<k;h++){var l=g[h],m=f[h].position.clone();m.y+=b.h*e;l.moveTo(this.getTileBoundsForGridIndex(d,h),m)}c[a?
-"unshift":"push"](g)},shiftColumn:function(a,b){var c=this.grid,d=a?0:c[0].length-1,e=a?-1:1;this.gridLayout.startcol+=e;for(var f=0,g=c.length;f<g;f++){var h=c[f],k=h[d].position.clone(),l=h[a?"pop":"shift"]();k.x+=b.w*e;l.moveTo(this.getTileBoundsForGridIndex(f,d),k);h[a?"unshift":"push"](l)}},removeExcessTiles:function(a,b){for(var c,d;this.grid.length>a;){var e=this.grid.pop();c=0;for(d=e.length;c<d;c++){var f=e[c];this.destroyTile(f)}}c=0;for(d=this.grid.length;c<d;c++)for(;this.grid[c].length>
-b;)e=this.grid[c],f=e.pop(),this.destroyTile(f)},onMapResize:function(){this.singleTile&&(this.clearGrid(),this.setTileSize())},getTileBounds:function(a){var b=this.maxExtent,c=this.getResolution(),d=c*this.tileSize.w,c=c*this.tileSize.h,e=this.getLonLatFromViewPortPx(a);a=b.left+d*Math.floor((e.lon-b.left)/d);b=b.bottom+c*Math.floor((e.lat-b.bottom)/c);return new OpenLayers.Bounds(a,b,a+d,b+c)},CLASS_NAME:"OpenLayers.Layer.Grid"});OpenLayers.Format.ArcXML=OpenLayers.Class(OpenLayers.Format.XML,{fontStyleKeys:"antialiasing blockout font fontcolor fontsize fontstyle glowing interval outline printmode shadow transparency".split(" "),request:null,response:null,initialize:function(a){this.request=new OpenLayers.Format.ArcXML.Request;this.response=new OpenLayers.Format.ArcXML.Response;if(a)if("feature"==a.requesttype){this.request.get_image=null;var b=this.request.get_feature.query;this.addCoordSys(b.featurecoordsys,a.featureCoordSys);
-this.addCoordSys(b.filtercoordsys,a.filterCoordSys);a.polygon?(b.isspatial=!0,b.spatialfilter.polygon=a.polygon):a.envelope&&(b.isspatial=!0,b.spatialfilter.envelope={minx:0,miny:0,maxx:0,maxy:0},this.parseEnvelope(b.spatialfilter.envelope,a.envelope))}else"image"==a.requesttype?(this.request.get_feature=null,b=this.request.get_image.properties,this.parseEnvelope(b.envelope,a.envelope),this.addLayers(b.layerlist,a.layers),this.addImageSize(b.imagesize,a.tileSize),this.addCoordSys(b.featurecoordsys,
-a.featureCoordSys),this.addCoordSys(b.filtercoordsys,a.filterCoordSys)):this.request=null;OpenLayers.Format.XML.prototype.initialize.apply(this,[a])},parseEnvelope:function(a,b){b&&4==b.length&&(a.minx=b[0],a.miny=b[1],a.maxx=b[2],a.maxy=b[3])},addLayers:function(a,b){for(var c=0,d=b.length;c<d;c++)a.push(b[c])},addImageSize:function(a,b){null!==b&&(a.width=b.w,a.height=b.h,a.printwidth=b.w,a.printheight=b.h)},addCoordSys:function(a,b){"string"==typeof b?(a.id=parseInt(b),a.string=b):"object"==typeof b&&
-null!==b.proj&&(a.id=b.proj.srsProjNumber,a.string=b.proj.srsCode)},iserror:function(a){var b=null;a?(a=OpenLayers.Format.XML.prototype.read.apply(this,[a]),a=a.documentElement.getElementsByTagName("ERROR"),b=null!==a&&0<a.length):b=""!==this.response.error;return b},read:function(a){"string"==typeof a&&(a=OpenLayers.Format.XML.prototype.read.apply(this,[a]));var b=null;a&&a.documentElement&&(b="ARCXML"==a.documentElement.nodeName?a.documentElement:a.documentElement.getElementsByTagName("ARCXML")[0]);
-if(!b||"parsererror"===b.firstChild.nodeName){var c,d;try{c=a.firstChild.nodeValue,d=a.firstChild.childNodes[1].firstChild.nodeValue}catch(e){}throw{message:"Error parsing the ArcXML request",error:c,source:d};}return this.parseResponse(b)},write:function(a){a||(a=this.request);var b=this.createElementNS("","ARCXML");b.setAttribute("version","1.1");var c=this.createElementNS("","REQUEST");if(null!=a.get_image){var d=this.createElementNS("","GET_IMAGE");c.appendChild(d);var e=this.createElementNS("",
-"PROPERTIES");d.appendChild(e);a=a.get_image.properties;null!=a.featurecoordsys&&(d=this.createElementNS("","FEATURECOORDSYS"),e.appendChild(d),0===a.featurecoordsys.id?d.setAttribute("string",a.featurecoordsys.string):d.setAttribute("id",a.featurecoordsys.id));null!=a.filtercoordsys&&(d=this.createElementNS("","FILTERCOORDSYS"),e.appendChild(d),0===a.filtercoordsys.id?d.setAttribute("string",a.filtercoordsys.string):d.setAttribute("id",a.filtercoordsys.id));null!=a.envelope&&(d=this.createElementNS("",
-"ENVELOPE"),e.appendChild(d),d.setAttribute("minx",a.envelope.minx),d.setAttribute("miny",a.envelope.miny),d.setAttribute("maxx",a.envelope.maxx),d.setAttribute("maxy",a.envelope.maxy));d=this.createElementNS("","IMAGESIZE");e.appendChild(d);d.setAttribute("height",a.imagesize.height);d.setAttribute("width",a.imagesize.width);if(a.imagesize.height!=a.imagesize.printheight||a.imagesize.width!=a.imagesize.printwidth)d.setAttribute("printheight",a.imagesize.printheight),d.setArrtibute("printwidth",a.imagesize.printwidth);
-null!=a.background&&(d=this.createElementNS("","BACKGROUND"),e.appendChild(d),d.setAttribute("color",a.background.color.r+","+a.background.color.g+","+a.background.color.b),null!==a.background.transcolor&&d.setAttribute("transcolor",a.background.transcolor.r+","+a.background.transcolor.g+","+a.background.transcolor.b));if(null!=a.layerlist&&0<a.layerlist.length)for(d=this.createElementNS("","LAYERLIST"),e.appendChild(d),e=0;e<a.layerlist.length;e++){var f=this.createElementNS("","LAYERDEF");d.appendChild(f);
-f.setAttribute("id",a.layerlist[e].id);f.setAttribute("visible",a.layerlist[e].visible);if("object"==typeof a.layerlist[e].query){var g=a.layerlist[e].query;if(0>g.where.length)continue;var h=null,h="boolean"==typeof g.spatialfilter&&g.spatialfilter?this.createElementNS("","SPATIALQUERY"):this.createElementNS("","QUERY");h.setAttribute("where",g.where);"number"==typeof g.accuracy&&0<g.accuracy&&h.setAttribute("accuracy",g.accuracy);"number"==typeof g.featurelimit&&2E3>g.featurelimit&&h.setAttribute("featurelimit",
-g.featurelimit);"string"==typeof g.subfields&&"#ALL#"!=g.subfields&&h.setAttribute("subfields",g.subfields);"string"==typeof g.joinexpression&&0<g.joinexpression.length&&h.setAttribute("joinexpression",g.joinexpression);"string"==typeof g.jointables&&0<g.jointables.length&&h.setAttribute("jointables",g.jointables);f.appendChild(h)}"object"==typeof a.layerlist[e].renderer&&this.addRenderer(f,a.layerlist[e].renderer)}}else null!=a.get_feature&&(d=this.createElementNS("","GET_FEATURES"),d.setAttribute("outputmode",
-"newxml"),d.setAttribute("checkesc","true"),a.get_feature.geometry?d.setAttribute("geometry",a.get_feature.geometry):d.setAttribute("geometry","false"),a.get_feature.compact&&d.setAttribute("compact",a.get_feature.compact),"number"==a.get_feature.featurelimit&&d.setAttribute("featurelimit",a.get_feature.featurelimit),d.setAttribute("globalenvelope","true"),c.appendChild(d),null!=a.get_feature.layer&&0<a.get_feature.layer.length&&(e=this.createElementNS("","LAYER"),e.setAttribute("id",a.get_feature.layer),
-d.appendChild(e)),a=a.get_feature.query,null!=a&&(e=null,e=a.isspatial?this.createElementNS("","SPATIALQUERY"):this.createElementNS("","QUERY"),d.appendChild(e),"number"==typeof a.accuracy&&e.setAttribute("accuracy",a.accuracy),null!=a.featurecoordsys&&(d=this.createElementNS("","FEATURECOORDSYS"),0==a.featurecoordsys.id?d.setAttribute("string",a.featurecoordsys.string):d.setAttribute("id",a.featurecoordsys.id),e.appendChild(d)),null!=a.filtercoordsys&&(d=this.createElementNS("","FILTERCOORDSYS"),
-0===a.filtercoordsys.id?d.setAttribute("string",a.filtercoordsys.string):d.setAttribute("id",a.filtercoordsys.id),e.appendChild(d)),0<a.buffer&&(d=this.createElementNS("","BUFFER"),d.setAttribute("distance",a.buffer),e.appendChild(d)),a.isspatial&&(d=this.createElementNS("","SPATIALFILTER"),d.setAttribute("relation",a.spatialfilter.relation),e.appendChild(d),a.spatialfilter.envelope?(f=this.createElementNS("","ENVELOPE"),f.setAttribute("minx",a.spatialfilter.envelope.minx),f.setAttribute("miny",a.spatialfilter.envelope.miny),
-f.setAttribute("maxx",a.spatialfilter.envelope.maxx),f.setAttribute("maxy",a.spatialfilter.envelope.maxy),d.appendChild(f)):"object"==typeof a.spatialfilter.polygon&&d.appendChild(this.writePolygonGeometry(a.spatialfilter.polygon))),null!=a.where&&0<a.where.length&&e.setAttribute("where",a.where)));b.appendChild(c);return OpenLayers.Format.XML.prototype.write.apply(this,[b])},addGroupRenderer:function(a,b){var c=this.createElementNS("","GROUPRENDERER");a.appendChild(c);for(var d=0;d<b.length;d++)this.addRenderer(c,
-b[d])},addRenderer:function(a,b){if(OpenLayers.Util.isArray(b))this.addGroupRenderer(a,b);else{var c=this.createElementNS("",b.type.toUpperCase()+"RENDERER");a.appendChild(c);"VALUEMAPRENDERER"==c.tagName?this.addValueMapRenderer(c,b):"VALUEMAPLABELRENDERER"==c.tagName?this.addValueMapLabelRenderer(c,b):"SIMPLELABELRENDERER"==c.tagName?this.addSimpleLabelRenderer(c,b):"SCALEDEPENDENTRENDERER"==c.tagName&&this.addScaleDependentRenderer(c,b)}},addScaleDependentRenderer:function(a,b){"string"!=typeof b.lower&&
-"number"!=typeof b.lower||a.setAttribute("lower",b.lower);"string"!=typeof b.upper&&"number"!=typeof b.upper||a.setAttribute("upper",b.upper);this.addRenderer(a,b.renderer)},addValueMapLabelRenderer:function(a,b){a.setAttribute("lookupfield",b.lookupfield);a.setAttribute("labelfield",b.labelfield);if("object"==typeof b.exacts)for(var c=0,d=b.exacts.length;c<d;c++){var e=b.exacts[c],f=this.createElementNS("","EXACT");"string"==typeof e.value&&f.setAttribute("value",e.value);"string"==typeof e.label&&
-f.setAttribute("label",e.label);"string"==typeof e.method&&f.setAttribute("method",e.method);a.appendChild(f);if("object"==typeof e.symbol){var g=null;"text"==e.symbol.type&&(g=this.createElementNS("","TEXTSYMBOL"));if(null!=g){for(var h=this.fontStyleKeys,k=0,l=h.length;k<l;k++){var m=h[k];e.symbol[m]&&g.setAttribute(m,e.symbol[m])}f.appendChild(g)}}}},addValueMapRenderer:function(a,b){a.setAttribute("lookupfield",b.lookupfield);if("object"==typeof b.ranges)for(var c=0,d=b.ranges.length;c<d;c++){var e=
-b.ranges[c],f=this.createElementNS("","RANGE");f.setAttribute("lower",e.lower);f.setAttribute("upper",e.upper);a.appendChild(f);if("object"==typeof e.symbol){var g=null;"simplepolygon"==e.symbol.type&&(g=this.createElementNS("","SIMPLEPOLYGONSYMBOL"));null!=g&&("string"==typeof e.symbol.boundarycolor&&g.setAttribute("boundarycolor",e.symbol.boundarycolor),"string"==typeof e.symbol.fillcolor&&g.setAttribute("fillcolor",e.symbol.fillcolor),"number"==typeof e.symbol.filltransparency&&g.setAttribute("filltransparency",
-e.symbol.filltransparency),f.appendChild(g))}}else if("object"==typeof b.exacts)for(c=0,d=b.exacts.length;c<d;c++)e=b.exacts[c],f=this.createElementNS("","EXACT"),"string"==typeof e.value&&f.setAttribute("value",e.value),"string"==typeof e.label&&f.setAttribute("label",e.label),"string"==typeof e.method&&f.setAttribute("method",e.method),a.appendChild(f),"object"==typeof e.symbol&&(g=null,"simplemarker"==e.symbol.type&&(g=this.createElementNS("","SIMPLEMARKERSYMBOL")),null!=g&&("string"==typeof e.symbol.antialiasing&&
-g.setAttribute("antialiasing",e.symbol.antialiasing),"string"==typeof e.symbol.color&&g.setAttribute("color",e.symbol.color),"string"==typeof e.symbol.outline&&g.setAttribute("outline",e.symbol.outline),"string"==typeof e.symbol.overlap&&g.setAttribute("overlap",e.symbol.overlap),"string"==typeof e.symbol.shadow&&g.setAttribute("shadow",e.symbol.shadow),"number"==typeof e.symbol.transparency&&g.setAttribute("transparency",e.symbol.transparency),"string"==typeof e.symbol.usecentroid&&g.setAttribute("usecentroid",
-e.symbol.usecentroid),"number"==typeof e.symbol.width&&g.setAttribute("width",e.symbol.width),f.appendChild(g)))},addSimpleLabelRenderer:function(a,b){a.setAttribute("field",b.field);for(var c="featureweight howmanylabels labelbufferratio labelpriorities labelweight linelabelposition rotationalangles".split(" "),d=0,e=c.length;d<e;d++){var f=c[d];b[f]&&a.setAttribute(f,b[f])}if("text"==b.symbol.type){var g=b.symbol,h=this.createElementNS("","TEXTSYMBOL");a.appendChild(h);c=this.fontStyleKeys;d=0;
-for(e=c.length;d<e;d++)f=c[d],g[f]&&h.setAttribute(f,b[f])}},writePolygonGeometry:function(a){if(!(a instanceof OpenLayers.Geometry.Polygon))throw{message:"Cannot write polygon geometry to ArcXML with an "+a.CLASS_NAME+" object.",geometry:a};for(var b=this.createElementNS("","POLYGON"),c=0,d=a.components.length;c<d;c++){for(var e=a.components[c],f=this.createElementNS("","RING"),g=0,h=e.components.length;g<h;g++){var k=e.components[g],l=this.createElementNS("","POINT");l.setAttribute("x",k.x);l.setAttribute("y",
-k.y);f.appendChild(l)}b.appendChild(f)}return b},parseResponse:function(a){"string"==typeof a&&(a=(new OpenLayers.Format.XML).read(a));var b=new OpenLayers.Format.ArcXML.Response,c=a.getElementsByTagName("ERROR");if(null!=c&&0<c.length)b.error=this.getChildValue(c,"Unknown error.");else{c=a.getElementsByTagName("RESPONSE");if(null==c||0==c.length)return b.error="No RESPONSE tag found in ArcXML response.",b;var d=c[0].firstChild.nodeName;"#text"==d&&(d=c[0].firstChild.nextSibling.nodeName);if("IMAGE"==
-d)c=a.getElementsByTagName("ENVELOPE"),a=a.getElementsByTagName("OUTPUT"),null==c||0==c.length?b.error="No ENVELOPE tag found in ArcXML response.":null==a||0==a.length?b.error="No OUTPUT tag found in ArcXML response.":(c=this.parseAttributes(c[0]),d=this.parseAttributes(a[0]),b.image="string"==typeof d.type?{envelope:c,output:{type:d.type,data:this.getChildValue(a[0])}}:{envelope:c,output:d});else if("FEATURES"==d){if(a=c[0].getElementsByTagName("FEATURES"),c=a[0].getElementsByTagName("FEATURECOUNT"),
-b.features.featurecount=c[0].getAttribute("count"),0<b.features.featurecount)for(c=a[0].getElementsByTagName("ENVELOPE"),b.features.envelope=this.parseAttributes(c[0],"number"),a=a[0].getElementsByTagName("FEATURE"),c=0;c<a.length;c++){for(var d=new OpenLayers.Feature.Vector,e=a[c].getElementsByTagName("FIELD"),f=0;f<e.length;f++){var g=e[f].getAttribute("name"),h=e[f].getAttribute("value");d.attributes[g]=h}e=a[c].getElementsByTagName("POLYGON");if(0<e.length){e=e[0].getElementsByTagName("RING");
-f=[];for(g=0;g<e.length;g++){h=[];h.push(this.parsePointGeometry(e[g]));for(var k=e[g].getElementsByTagName("HOLE"),l=0;l<k.length;l++)h.push(this.parsePointGeometry(k[l]));f.push(new OpenLayers.Geometry.Polygon(h))}d.geometry=1==f.length?f[0]:new OpenLayers.Geometry.MultiPolygon(f)}b.features.feature.push(d)}}else b.error="Unidentified response type."}return b},parseAttributes:function(a,b){for(var c={},d=0;d<a.attributes.length;d++)c[a.attributes[d].nodeName]="number"==b?parseFloat(a.attributes[d].nodeValue):
-a.attributes[d].nodeValue;return c},parsePointGeometry:function(a){var b=[],c=a.getElementsByTagName("COORDS");if(0<c.length)for(a=this.getChildValue(c[0]),a=a.split(/;/),c=0;c<a.length;c++){var d=a[c].split(/ /);b.push(new OpenLayers.Geometry.Point(d[0],d[1]))}else if(a=a.getElementsByTagName("POINT"),0<a.length)for(c=0;c<a.length;c++)b.push(new OpenLayers.Geometry.Point(parseFloat(a[c].getAttribute("x")),parseFloat(a[c].getAttribute("y"))));return new OpenLayers.Geometry.LinearRing(b)},CLASS_NAME:"OpenLayers.Format.ArcXML"});
-OpenLayers.Format.ArcXML.Request=OpenLayers.Class({initialize:function(a){return OpenLayers.Util.extend(this,{get_image:{properties:{background:null,draw:!0,envelope:{minx:0,miny:0,maxx:0,maxy:0},featurecoordsys:{id:0,string:"",datumtransformid:0,datumtransformstring:""},filtercoordsys:{id:0,string:"",datumtransformid:0,datumtransformstring:""},imagesize:{height:0,width:0,dpi:96,printheight:0,printwidth:0,scalesymbols:!1},layerlist:[],output:{baseurl:"",legendbaseurl:"",legendname:"",legendpath:"",
-legendurl:"",name:"",path:"",type:"jpg",url:""}}},get_feature:{layer:"",query:{isspatial:!1,featurecoordsys:{id:0,string:"",datumtransformid:0,datumtransformstring:""},filtercoordsys:{id:0,string:"",datumtransformid:0,datumtransformstring:""},buffer:0,where:"",spatialfilter:{relation:"envelope_intersection",envelope:null}}},environment:{separators:{cs:" ",ts:";"}},layer:[],workspaces:[]})},CLASS_NAME:"OpenLayers.Format.ArcXML.Request"});
-OpenLayers.Format.ArcXML.Response=OpenLayers.Class({initialize:function(a){return OpenLayers.Util.extend(this,{image:{envelope:null,output:""},features:{featurecount:0,envelope:null,feature:[]},error:""})},CLASS_NAME:"OpenLayers.Format.ArcXML.Response"});(function(){function a(){this._object=f&&!k?new f:new window.ActiveXObject("Microsoft.XMLHTTP");this._listeners=[]}function b(){return new a}function c(a){b.onreadystatechange&&b.onreadystatechange.apply(a);a.dispatchEvent({type:"readystatechange",bubbles:!1,cancelable:!1,timeStamp:new Date+0})}function d(a){try{a.responseText=a._object.responseText}catch(b){}try{var c;var d=a._object,e=d.responseXML,f=d.responseText;h&&(f&&e&&!e.documentElement&&d.getResponseHeader("Content-Type").match(/[^\/]+\/[^\+]+\+xml/))&&
-(e=new window.ActiveXObject("Microsoft.XMLDOM"),e.async=!1,e.validateOnParse=!1,e.loadXML(f));c=e&&(h&&0!=e.parseError||!e.documentElement||e.documentElement&&"parsererror"==e.documentElement.tagName)?null:e;a.responseXML=c}catch(g){}try{a.status=a._object.status}catch(k){}try{a.statusText=a._object.statusText}catch(u){}}function e(a){a._object.onreadystatechange=new window.Function}var f=window.XMLHttpRequest,g=!!window.controllers,h=window.document.all&&!window.opera,k=h&&window.navigator.userAgent.match(/MSIE 7.0/);
-b.prototype=a.prototype;g&&f.wrapped&&(b.wrapped=f.wrapped);b.UNSENT=0;b.OPENED=1;b.HEADERS_RECEIVED=2;b.LOADING=3;b.DONE=4;b.prototype.readyState=b.UNSENT;b.prototype.responseText="";b.prototype.responseXML=null;b.prototype.status=0;b.prototype.statusText="";b.prototype.priority="NORMAL";b.prototype.onreadystatechange=null;b.onreadystatechange=null;b.onopen=null;b.onsend=null;b.onabort=null;b.prototype.open=function(a,f,k,p,q){delete this._headers;3>arguments.length&&(k=!0);this._async=k;var r=this,
-s=this.readyState,t;h&&k&&(t=function(){s!=b.DONE&&(e(r),r.abort())},window.attachEvent("onunload",t));b.onopen&&b.onopen.apply(this,arguments);4<arguments.length?this._object.open(a,f,k,p,q):3<arguments.length?this._object.open(a,f,k,p):this._object.open(a,f,k);this.readyState=b.OPENED;c(this);this._object.onreadystatechange=function(){if(!g||k)r.readyState=r._object.readyState,d(r),r._aborted?r.readyState=b.UNSENT:(r.readyState==b.DONE&&(delete r._data,e(r),h&&k&&window.detachEvent("onunload",t)),
-s!=r.readyState&&c(r),s=r.readyState)}};b.prototype.send=function(a){b.onsend&&b.onsend.apply(this,arguments);arguments.length||(a=null);a&&a.nodeType&&(a=window.XMLSerializer?(new window.XMLSerializer).serializeToString(a):a.xml,this._headers["Content-Type"]||this._object.setRequestHeader("Content-Type","application/xml"));this._data=a;a:if(this._object.send(this._data),g&&!this._async)for(this.readyState=b.OPENED,d(this);this.readyState<b.DONE;)if(this.readyState++,c(this),this._aborted)break a};
-b.prototype.abort=function(){b.onabort&&b.onabort.apply(this,arguments);this.readyState>b.UNSENT&&(this._aborted=!0);this._object.abort();e(this);this.readyState=b.UNSENT;delete this._data};b.prototype.getAllResponseHeaders=function(){return this._object.getAllResponseHeaders()};b.prototype.getResponseHeader=function(a){return this._object.getResponseHeader(a)};b.prototype.setRequestHeader=function(a,b){this._headers||(this._headers={});this._headers[a]=b;return this._object.setRequestHeader(a,b)};
-b.prototype.addEventListener=function(a,b,c){for(var d=0,e;e=this._listeners[d];d++)if(e[0]==a&&e[1]==b&&e[2]==c)return;this._listeners.push([a,b,c])};b.prototype.removeEventListener=function(a,b,c){for(var d=0,e;(e=this._listeners[d])&&(e[0]!=a||e[1]!=b||e[2]!=c);d++);e&&this._listeners.splice(d,1)};b.prototype.dispatchEvent=function(a){a={type:a.type,target:this,currentTarget:this,eventPhase:2,bubbles:a.bubbles,cancelable:a.cancelable,timeStamp:a.timeStamp,stopPropagation:function(){},preventDefault:function(){},
-initEvent:function(){}};"readystatechange"==a.type&&this.onreadystatechange&&(this.onreadystatechange.handleEvent||this.onreadystatechange).apply(this,[a]);for(var b=0,c;c=this._listeners[b];b++)c[0]!=a.type||c[2]||(c[1].handleEvent||c[1]).apply(this,[a])};b.prototype.toString=function(){return"[object XMLHttpRequest]"};b.toString=function(){return"[XMLHttpRequest]"};window.Function.prototype.apply||(window.Function.prototype.apply=function(a,b){b||(b=[]);a.__func=this;a.__func(b[0],b[1],b[2],b[3],
-b[4]);delete a.__func});OpenLayers.Request||(OpenLayers.Request={});OpenLayers.Request.XMLHttpRequest=b})();OpenLayers.ProxyHost="";OpenLayers.Request||(OpenLayers.Request={});
-OpenLayers.Util.extend(OpenLayers.Request,{DEFAULT_CONFIG:{method:"GET",url:window.location.href,async:!0,user:void 0,password:void 0,params:null,proxy:OpenLayers.ProxyHost,headers:{},data:null,callback:function(){},success:null,failure:null,scope:null},URL_SPLIT_REGEX:/([^:]*:)\/\/([^:]*:?[^@]*@)?([^:\/\?]*):?([^\/\?]*)/,events:new OpenLayers.Events(this),makeSameOrigin:function(a,b){var c=0!==a.indexOf("http"),d=!c&&a.match(this.URL_SPLIT_REGEX);if(d){var e=window.location,c=d[1]==e.protocol&&d[3]==
-e.hostname,d=d[4],e=e.port;if(80!=d&&""!=d||"80"!=e&&""!=e)c=c&&d==e}c||b&&(a="function"==typeof b?b(a):b+encodeURIComponent(a));return a},issue:function(a){var b=OpenLayers.Util.extend(this.DEFAULT_CONFIG,{proxy:OpenLayers.ProxyHost});a=a||{};a.headers=a.headers||{};a=OpenLayers.Util.applyDefaults(a,b);a.headers=OpenLayers.Util.applyDefaults(a.headers,b.headers);var b=!1,c;for(c in a.headers)a.headers.hasOwnProperty(c)&&"x-requested-with"===c.toLowerCase()&&(b=!0);!1===b&&(a.headers["X-Requested-With"]=
-"XMLHttpRequest");var d=new OpenLayers.Request.XMLHttpRequest,e=OpenLayers.Util.urlAppend(a.url,OpenLayers.Util.getParameterString(a.params||{})),e=OpenLayers.Request.makeSameOrigin(e,a.proxy);d.open(a.method,e,a.async,a.user,a.password);for(var f in a.headers)d.setRequestHeader(f,a.headers[f]);var g=this.events,h=this;d.onreadystatechange=function(){d.readyState==OpenLayers.Request.XMLHttpRequest.DONE&&!1!==g.triggerEvent("complete",{request:d,config:a,requestUrl:e})&&h.runCallbacks({request:d,config:a,
-requestUrl:e})};!1===a.async?d.send(a.data):window.setTimeout(function(){0!==d.readyState&&d.send(a.data)},0);return d},runCallbacks:function(a){var b=a.request,c=a.config,d=c.scope?OpenLayers.Function.bind(c.callback,c.scope):c.callback,e;c.success&&(e=c.scope?OpenLayers.Function.bind(c.success,c.scope):c.success);var f;c.failure&&(f=c.scope?OpenLayers.Function.bind(c.failure,c.scope):c.failure);"file:"==OpenLayers.Util.createUrlObject(c.url).protocol&&b.responseText&&(b.status=200);d(b);if(!b.status||
-200<=b.status&&300>b.status)this.events.triggerEvent("success",a),e&&e(b);b.status&&(200>b.status||300<=b.status)&&(this.events.triggerEvent("failure",a),f&&f(b))},GET:function(a){a=OpenLayers.Util.extend(a,{method:"GET"});return OpenLayers.Request.issue(a)},POST:function(a){a=OpenLayers.Util.extend(a,{method:"POST"});a.headers=a.headers?a.headers:{};"CONTENT-TYPE"in OpenLayers.Util.upperCaseObject(a.headers)||(a.headers["Content-Type"]="application/xml");return OpenLayers.Request.issue(a)},PUT:function(a){a=
-OpenLayers.Util.extend(a,{method:"PUT"});a.headers=a.headers?a.headers:{};"CONTENT-TYPE"in OpenLayers.Util.upperCaseObject(a.headers)||(a.headers["Content-Type"]="application/xml");return OpenLayers.Request.issue(a)},DELETE:function(a){a=OpenLayers.Util.extend(a,{method:"DELETE"});return OpenLayers.Request.issue(a)},HEAD:function(a){a=OpenLayers.Util.extend(a,{method:"HEAD"});return OpenLayers.Request.issue(a)},OPTIONS:function(a){a=OpenLayers.Util.extend(a,{method:"OPTIONS"});return OpenLayers.Request.issue(a)}});OpenLayers.Layer.ArcIMS=OpenLayers.Class(OpenLayers.Layer.Grid,{DEFAULT_PARAMS:{ClientVersion:"9.2",ServiceName:""},featureCoordSys:"4326",filterCoordSys:"4326",layers:null,async:!0,name:"ArcIMS",isBaseLayer:!0,DEFAULT_OPTIONS:{tileSize:new OpenLayers.Size(512,512),featureCoordSys:"4326",filterCoordSys:"4326",layers:null,isBaseLayer:!0,async:!0,name:"ArcIMS"},initialize:function(a,b,c){this.tileSize=new OpenLayers.Size(512,512);this.params=OpenLayers.Util.applyDefaults({ServiceName:c.serviceName},
-this.DEFAULT_PARAMS);this.options=OpenLayers.Util.applyDefaults(c,this.DEFAULT_OPTIONS);OpenLayers.Layer.Grid.prototype.initialize.apply(this,[a,b,this.params,c]);this.transparent&&(this.isBaseLayer||(this.isBaseLayer=!1),"image/jpeg"==this.format&&(this.format=OpenLayers.Util.alphaHack()?"image/gif":"image/png"));null===this.options.layers&&(this.options.layers=[])},getURL:function(a){var b="";a=this.adjustBounds(a);a=new OpenLayers.Format.ArcXML(OpenLayers.Util.extend(this.options,{requesttype:"image",
-envelope:a.toArray(),tileSize:this.tileSize}));a=new OpenLayers.Request.POST({url:this.getFullRequestString(),data:a.write(),async:!1});null!=a&&(b=a.responseXML,b&&b.documentElement||(b=a.responseText),b=(new OpenLayers.Format.ArcXML).read(b),b=this.getUrlOrImage(b.image.output));return b},getURLasync:function(a,b,c){a=this.adjustBounds(a);a=new OpenLayers.Format.ArcXML(OpenLayers.Util.extend(this.options,{requesttype:"image",envelope:a.toArray(),tileSize:this.tileSize}));OpenLayers.Request.POST({url:this.getFullRequestString(),
-async:!0,data:a.write(),callback:function(a){var e=a.responseXML;e&&e.documentElement||(e=a.responseText);a=(new OpenLayers.Format.ArcXML).read(e);b.call(c,this.getUrlOrImage(a.image.output))},scope:this})},getUrlOrImage:function(a){var b="";a.url?b=a.url:a.data&&(b="data:image/"+a.type+";base64,"+a.data);return b},setLayerQuery:function(a,b){for(var c=0;c<this.options.layers.length;c++)if(a==this.options.layers[c].id){this.options.layers[c].query=b;return}this.options.layers.push({id:a,visible:!0,
-query:b})},getFeatureInfo:function(a,b,c){var d=c.buffer||1,e=c.callback||function(){},f=c.scope||window,g={};OpenLayers.Util.extend(g,this.options);g.requesttype="feature";a instanceof OpenLayers.LonLat?(g.polygon=null,g.envelope=[a.lon-d,a.lat-d,a.lon+d,a.lat+d]):a instanceof OpenLayers.Geometry.Polygon&&(g.envelope=null,g.polygon=a);var h=new OpenLayers.Format.ArcXML(g);OpenLayers.Util.extend(h.request.get_feature,c);h.request.get_feature.layer=b.id;"number"==typeof b.query.accuracy?h.request.get_feature.query.accuracy=
-b.query.accuracy:(a=this.map.getCenter(),c=this.map.getViewPortPxFromLonLat(a),c.x++,c=this.map.getLonLatFromPixel(c),h.request.get_feature.query.accuracy=c.lon-a.lon);h.request.get_feature.query.where=b.query.where;h.request.get_feature.query.spatialfilter.relation="area_intersection";OpenLayers.Request.POST({url:this.getFullRequestString({CustomService:"Query"}),data:h.write(),callback:function(a){a=h.parseResponse(a.responseText);h.iserror()?e.call(f,null):e.call(f,a.features)}})},clone:function(a){null==
-a&&(a=new OpenLayers.Layer.ArcIMS(this.name,this.url,this.getOptions()));return a=OpenLayers.Layer.Grid.prototype.clone.apply(this,[a])},CLASS_NAME:"OpenLayers.Layer.ArcIMS"});OpenLayers.Control.PanZoom=OpenLayers.Class(OpenLayers.Control,{slideFactor:50,slideRatio:null,buttons:null,position:null,initialize:function(a){this.position=new OpenLayers.Pixel(OpenLayers.Control.PanZoom.X,OpenLayers.Control.PanZoom.Y);OpenLayers.Control.prototype.initialize.apply(this,arguments)},destroy:function(){this.map&&this.map.events.unregister("buttonclick",this,this.onButtonClick);this.removeButtons();this.position=this.buttons=null;OpenLayers.Control.prototype.destroy.apply(this,arguments)},
-setMap:function(a){OpenLayers.Control.prototype.setMap.apply(this,arguments);this.map.events.register("buttonclick",this,this.onButtonClick)},draw:function(a){OpenLayers.Control.prototype.draw.apply(this,arguments);a=this.position;this.buttons=[];var b={w:18,h:18},c=new OpenLayers.Pixel(a.x+b.w/2,a.y);this._addButton("panup","north-mini.png",c,b);a.y=c.y+b.h;this._addButton("panleft","west-mini.png",a,b);this._addButton("panright","east-mini.png",a.add(b.w,0),b);this._addButton("pandown","south-mini.png",
-c.add(0,2*b.h),b);this._addButton("zoomin","zoom-plus-mini.png",c.add(0,3*b.h+5),b);this._addButton("zoomworld","zoom-world-mini.png",c.add(0,4*b.h+5),b);this._addButton("zoomout","zoom-minus-mini.png",c.add(0,5*b.h+5),b);return this.div},_addButton:function(a,b,c,d){b=OpenLayers.Util.getImageLocation(b);c=OpenLayers.Util.createAlphaImageDiv(this.id+"_"+a,c,d,b,"absolute");c.style.cursor="pointer";this.div.appendChild(c);c.action=a;c.className="olButton";this.buttons.push(c);return c},_removeButton:function(a){this.div.removeChild(a);
-OpenLayers.Util.removeItem(this.buttons,a)},removeButtons:function(){for(var a=this.buttons.length-1;0<=a;--a)this._removeButton(this.buttons[a])},onButtonClick:function(a){switch(a.buttonElement.action){case "panup":this.map.pan(0,-this.getSlideFactor("h"));break;case "pandown":this.map.pan(0,this.getSlideFactor("h"));break;case "panleft":this.map.pan(-this.getSlideFactor("w"),0);break;case "panright":this.map.pan(this.getSlideFactor("w"),0);break;case "zoomin":this.map.zoomIn();break;case "zoomout":this.map.zoomOut();
-break;case "zoomworld":this.map.zoomToMaxExtent()}},getSlideFactor:function(a){return this.slideRatio?this.map.getSize()[a]*this.slideRatio:this.slideFactor},CLASS_NAME:"OpenLayers.Control.PanZoom"});OpenLayers.Control.PanZoom.X=4;OpenLayers.Control.PanZoom.Y=4;OpenLayers.Control.PanZoomBar=OpenLayers.Class(OpenLayers.Control.PanZoom,{zoomStopWidth:18,zoomStopHeight:11,slider:null,sliderEvents:null,zoombarDiv:null,zoomWorldIcon:!1,panIcons:!0,forceFixedZoomLevel:!1,mouseDragStart:null,deltaY:null,zoomStart:null,destroy:function(){this._removeZoomBar();this.map.events.un({changebaselayer:this.redraw,updatesize:this.redraw,scope:this});OpenLayers.Control.PanZoom.prototype.destroy.apply(this,arguments);delete this.mouseDragStart;delete this.zoomStart},setMap:function(a){OpenLayers.Control.PanZoom.prototype.setMap.apply(this,
-arguments);this.map.events.on({changebaselayer:this.redraw,updatesize:this.redraw,scope:this})},redraw:function(){null!=this.div&&(this.removeButtons(),this._removeZoomBar());this.draw()},draw:function(a){OpenLayers.Control.prototype.draw.apply(this,arguments);a=this.position.clone();this.buttons=[];var b={w:18,h:18};if(this.panIcons){var c=new OpenLayers.Pixel(a.x+b.w/2,a.y),d=b.w;this.zoomWorldIcon&&(c=new OpenLayers.Pixel(a.x+b.w,a.y));this._addButton("panup","north-mini.png",c,b);a.y=c.y+b.h;
-this._addButton("panleft","west-mini.png",a,b);this.zoomWorldIcon&&(this._addButton("zoomworld","zoom-world-mini.png",a.add(b.w,0),b),d*=2);this._addButton("panright","east-mini.png",a.add(d,0),b);this._addButton("pandown","south-mini.png",c.add(0,2*b.h),b);this._addButton("zoomin","zoom-plus-mini.png",c.add(0,3*b.h+5),b);c=this._addZoomBar(c.add(0,4*b.h+5));this._addButton("zoomout","zoom-minus-mini.png",c,b)}else this._addButton("zoomin","zoom-plus-mini.png",a,b),c=this._addZoomBar(a.add(0,b.h)),
-this._addButton("zoomout","zoom-minus-mini.png",c,b),this.zoomWorldIcon&&(c=c.add(0,b.h+3),this._addButton("zoomworld","zoom-world-mini.png",c,b));return this.div},_addZoomBar:function(a){var b=OpenLayers.Util.getImageLocation("slider.png"),c=this.id+"_"+this.map.id,d=this.map.getMinZoom(),e=this.map.getNumZoomLevels()-1-this.map.getZoom(),e=OpenLayers.Util.createAlphaImageDiv(c,a.add(-1,e*this.zoomStopHeight),{w:20,h:9},b,"absolute");e.style.cursor="move";this.slider=e;this.sliderEvents=new OpenLayers.Events(this,
-e,null,!0,{includeXY:!0});this.sliderEvents.on({touchstart:this.zoomBarDown,touchmove:this.zoomBarDrag,touchend:this.zoomBarUp,mousedown:this.zoomBarDown,mousemove:this.zoomBarDrag,mouseup:this.zoomBarUp});var f={w:this.zoomStopWidth,h:this.zoomStopHeight*(this.map.getNumZoomLevels()-d)},b=OpenLayers.Util.getImageLocation("zoombar.png"),c=null;OpenLayers.Util.alphaHack()?(c=this.id+"_"+this.map.id,c=OpenLayers.Util.createAlphaImageDiv(c,a,{w:f.w,h:this.zoomStopHeight},b,"absolute",null,"crop"),c.style.height=
-f.h+"px"):c=OpenLayers.Util.createDiv("OpenLayers_Control_PanZoomBar_Zoombar"+this.map.id,a,f,b);c.style.cursor="pointer";c.className="olButton";this.zoombarDiv=c;this.div.appendChild(c);this.startTop=parseInt(c.style.top);this.div.appendChild(e);this.map.events.register("zoomend",this,this.moveZoomBar);return a=a.add(0,this.zoomStopHeight*(this.map.getNumZoomLevels()-d))},_removeZoomBar:function(){this.sliderEvents.un({touchstart:this.zoomBarDown,touchmove:this.zoomBarDrag,touchend:this.zoomBarUp,
-mousedown:this.zoomBarDown,mousemove:this.zoomBarDrag,mouseup:this.zoomBarUp});this.sliderEvents.destroy();this.div.removeChild(this.zoombarDiv);this.zoombarDiv=null;this.div.removeChild(this.slider);this.slider=null;this.map.events.unregister("zoomend",this,this.moveZoomBar)},onButtonClick:function(a){OpenLayers.Control.PanZoom.prototype.onButtonClick.apply(this,arguments);if(a.buttonElement===this.zoombarDiv){var b=a.buttonXY.y/this.zoomStopHeight;if(this.forceFixedZoomLevel||!this.map.fractionalZoom)b=
-Math.floor(b);b=this.map.getNumZoomLevels()-1-b;b=Math.min(Math.max(b,0),this.map.getNumZoomLevels()-1);this.map.zoomTo(b)}},passEventToSlider:function(a){this.sliderEvents.handleBrowserEvent(a)},zoomBarDown:function(a){if(OpenLayers.Event.isLeftClick(a)||OpenLayers.Event.isSingleTouch(a))this.map.events.on({touchmove:this.passEventToSlider,mousemove:this.passEventToSlider,mouseup:this.passEventToSlider,scope:this}),this.mouseDragStart=a.xy.clone(),this.zoomStart=a.xy.clone(),this.div.style.cursor=
-"move",this.zoombarDiv.offsets=null,OpenLayers.Event.stop(a)},zoomBarDrag:function(a){if(null!=this.mouseDragStart){var b=this.mouseDragStart.y-a.xy.y,c=OpenLayers.Util.pagePosition(this.zoombarDiv);0<a.clientY-c[1]&&a.clientY-c[1]<parseInt(this.zoombarDiv.style.height)-2&&(b=parseInt(this.slider.style.top)-b,this.slider.style.top=b+"px",this.mouseDragStart=a.xy.clone());this.deltaY=this.zoomStart.y-a.xy.y;OpenLayers.Event.stop(a)}},zoomBarUp:function(a){if((OpenLayers.Event.isLeftClick(a)||"touchend"===
-a.type)&&this.mouseDragStart){this.div.style.cursor="";this.map.events.un({touchmove:this.passEventToSlider,mouseup:this.passEventToSlider,mousemove:this.passEventToSlider,scope:this});var b=this.map.zoom;!this.forceFixedZoomLevel&&this.map.fractionalZoom?(b+=this.deltaY/this.zoomStopHeight,b=Math.min(Math.max(b,0),this.map.getNumZoomLevels()-1)):(b+=this.deltaY/this.zoomStopHeight,b=Math.max(Math.round(b),0));this.map.zoomTo(b);this.zoomStart=this.mouseDragStart=null;this.deltaY=0;OpenLayers.Event.stop(a)}},
-moveZoomBar:function(){var a=(this.map.getNumZoomLevels()-1-this.map.getZoom())*this.zoomStopHeight+this.startTop+1;this.slider.style.top=a+"px"},CLASS_NAME:"OpenLayers.Control.PanZoomBar"});OpenLayers.Format.WFSCapabilities=OpenLayers.Class(OpenLayers.Format.XML.VersionedOGC,{defaultVersion:"1.1.0",CLASS_NAME:"OpenLayers.Format.WFSCapabilities"});OpenLayers.Format.WFSCapabilities.v1=OpenLayers.Class(OpenLayers.Format.XML,{namespaces:{wfs:"http://www.opengis.net/wfs",xlink:"http://www.w3.org/1999/xlink",xsi:"http://www.w3.org/2001/XMLSchema-instance",ows:"http://www.opengis.net/ows"},errorProperty:"featureTypeList",defaultPrefix:"wfs",read:function(a){"string"==typeof a&&(a=OpenLayers.Format.XML.prototype.read.apply(this,[a]));a&&9==a.nodeType&&(a=a.documentElement);var b={};this.readNode(a,b);return b},readers:{wfs:{WFS_Capabilities:function(a,
-b){this.readChildNodes(a,b)},FeatureTypeList:function(a,b){b.featureTypeList={featureTypes:[]};this.readChildNodes(a,b.featureTypeList)},FeatureType:function(a,b){var c={};this.readChildNodes(a,c);b.featureTypes.push(c)},Name:function(a,b){var c=this.getChildValue(a);c&&(c=c.split(":"),b.name=c.pop(),0<c.length&&(b.featureNS=this.lookupNamespaceURI(a,c[0])))},Title:function(a,b){var c=this.getChildValue(a);c&&(b.title=c)},Abstract:function(a,b){var c=this.getChildValue(a);c&&(b["abstract"]=c)}}},
-CLASS_NAME:"OpenLayers.Format.WFSCapabilities.v1"});OpenLayers.Format.WFSCapabilities.v1_1_0=OpenLayers.Class(OpenLayers.Format.WFSCapabilities.v1,{regExes:{trimSpace:/^\s*|\s*$/g,removeSpace:/\s*/g,splitSpace:/\s+/,trimComma:/\s*,\s*/g},readers:{wfs:OpenLayers.Util.applyDefaults({DefaultSRS:function(a,b){var c=this.getChildValue(a);c&&(b.srs=c)}},OpenLayers.Format.WFSCapabilities.v1.prototype.readers.wfs),ows:OpenLayers.Format.OWSCommon.v1.prototype.readers.ows},CLASS_NAME:"OpenLayers.Format.WFSCapabilities.v1_1_0"});OpenLayers.Layer.Image=OpenLayers.Class(OpenLayers.Layer,{isBaseLayer:!0,url:null,extent:null,size:null,tile:null,aspectRatio:null,initialize:function(a,b,c,d,e){this.url=b;this.maxExtent=this.extent=c;this.size=d;OpenLayers.Layer.prototype.initialize.apply(this,[a,e]);this.aspectRatio=this.extent.getHeight()/this.size.h/(this.extent.getWidth()/this.size.w)},destroy:function(){this.tile&&(this.removeTileMonitoringHooks(this.tile),this.tile.destroy(),this.tile=null);OpenLayers.Layer.prototype.destroy.apply(this,
-arguments)},clone:function(a){null==a&&(a=new OpenLayers.Layer.Image(this.name,this.url,this.extent,this.size,this.getOptions()));return a=OpenLayers.Layer.prototype.clone.apply(this,[a])},setMap:function(a){null==this.options.maxResolution&&(this.options.maxResolution=this.aspectRatio*this.extent.getWidth()/this.size.w);OpenLayers.Layer.prototype.setMap.apply(this,arguments)},moveTo:function(a,b,c){OpenLayers.Layer.prototype.moveTo.apply(this,arguments);var d=null==this.tile;if(b||d){this.setTileSize();
-var e=this.map.getLayerPxFromLonLat({lon:this.extent.left,lat:this.extent.top});d?(this.tile=new OpenLayers.Tile.Image(this,e,this.extent,null,this.tileSize),this.addTileMonitoringHooks(this.tile)):(this.tile.size=this.tileSize.clone(),this.tile.position=e.clone());this.tile.draw()}},setTileSize:function(){var a=this.extent.getWidth()/this.map.getResolution(),b=this.extent.getHeight()/this.map.getResolution();this.tileSize=new OpenLayers.Size(a,b)},addTileMonitoringHooks:function(a){a.onLoadStart=
-function(){this.events.triggerEvent("loadstart")};a.events.register("loadstart",this,a.onLoadStart);a.onLoadEnd=function(){this.events.triggerEvent("loadend")};a.events.register("loadend",this,a.onLoadEnd);a.events.register("unload",this,a.onLoadEnd)},removeTileMonitoringHooks:function(a){a.unload();a.events.un({loadstart:a.onLoadStart,loadend:a.onLoadEnd,unload:a.onLoadEnd,scope:this})},setUrl:function(a){this.url=a;this.tile.draw()},getURL:function(a){return this.url},CLASS_NAME:"OpenLayers.Layer.Image"});OpenLayers.Strategy=OpenLayers.Class({layer:null,options:null,active:null,autoActivate:!0,autoDestroy:!0,initialize:function(a){OpenLayers.Util.extend(this,a);this.options=a;this.active=!1},destroy:function(){this.deactivate();this.options=this.layer=null},setLayer:function(a){this.layer=a},activate:function(){return this.active?!1:this.active=!0},deactivate:function(){return this.active?(this.active=!1,!0):!1},CLASS_NAME:"OpenLayers.Strategy"});OpenLayers.Strategy.Save=OpenLayers.Class(OpenLayers.Strategy,{events:null,auto:!1,timer:null,initialize:function(a){OpenLayers.Strategy.prototype.initialize.apply(this,[a]);this.events=new OpenLayers.Events(this)},activate:function(){var a=OpenLayers.Strategy.prototype.activate.call(this);if(a&&this.auto)if("number"===typeof this.auto)this.timer=window.setInterval(OpenLayers.Function.bind(this.save,this),1E3*this.auto);else this.layer.events.on({featureadded:this.triggerSave,afterfeaturemodified:this.triggerSave,
-scope:this});return a},deactivate:function(){var a=OpenLayers.Strategy.prototype.deactivate.call(this);a&&this.auto&&("number"===typeof this.auto?window.clearInterval(this.timer):this.layer.events.un({featureadded:this.triggerSave,afterfeaturemodified:this.triggerSave,scope:this}));return a},triggerSave:function(a){var b=a.feature;b.state!==OpenLayers.State.INSERT&&b.state!==OpenLayers.State.UPDATE&&b.state!==OpenLayers.State.DELETE||this.save([a.feature])},save:function(a){a||(a=this.layer.features);
-this.events.triggerEvent("start",{features:a});var b=this.layer.projection,c=this.layer.map.getProjectionObject();if(!c.equals(b)){for(var d=a.length,e=Array(d),f,g,h=0;h<d;++h)f=a[h],g=f.clone(),g.fid=f.fid,g.state=f.state,f.url&&(g.url=f.url),g._original=f,g.geometry.transform(c,b),e[h]=g;a=e}this.layer.protocol.commit(a,{callback:this.onCommit,scope:this})},onCommit:function(a){var b={response:a};if(a.success()){for(var c=a.reqFeatures,d,e=[],f=a.insertIds||[],g=0,h=0,k=c.length;h<k;++h)if(d=c[h],
-d=d._original||d,a=d.state)a==OpenLayers.State.DELETE?e.push(d):a==OpenLayers.State.INSERT&&(d.fid=f[g],++g),d.state=null;0<e.length&&this.layer.destroyFeatures(e);this.events.triggerEvent("success",b)}else this.events.triggerEvent("fail",b)},CLASS_NAME:"OpenLayers.Strategy.Save"});OpenLayers.Events.featureclick=OpenLayers.Class({cache:null,map:null,provides:["featureclick","nofeatureclick","featureover","featureout"],initialize:function(a){this.target=a;if(a.object instanceof OpenLayers.Map)this.setMap(a.object);else if(a.object instanceof OpenLayers.Layer.Vector)a.object.map?this.setMap(a.object.map):a.object.events.register("added",this,function(b){this.setMap(a.object.map)});else throw"Listeners for '"+this.provides.join("', '")+"' events can only be registered for OpenLayers.Layer.Vector or OpenLayers.Map instances";
-for(var b=this.provides.length-1;0<=b;--b)a.extensions[this.provides[b]]=!0},setMap:function(a){this.map=a;this.cache={};a.events.register("mousedown",this,this.start,{extension:!0});a.events.register("mouseup",this,this.onClick,{extension:!0});a.events.register("touchstart",this,this.start,{extension:!0});a.events.register("touchmove",this,this.cancel,{extension:!0});a.events.register("touchend",this,this.onClick,{extension:!0});a.events.register("mousemove",this,this.onMousemove,{extension:!0})},
-start:function(a){this.startEvt=a},cancel:function(a){delete this.startEvt},onClick:function(a){if(this.startEvt&&("touchend"===a.type||OpenLayers.Event.isLeftClick(a))){a=this.getFeatures(this.startEvt);delete this.startEvt;for(var b,c,d={},e=0,f=a.length;e<f&&(b=a[e],c=b.layer,d[c.id]=!0,b=this.triggerEvent("featureclick",{feature:b}),!1!==b);++e);e=0;for(f=this.map.layers.length;e<f;++e)c=this.map.layers[e],c instanceof OpenLayers.Layer.Vector&&!d[c.id]&&this.triggerEvent("nofeatureclick",{layer:c})}},
-onMousemove:function(a){delete this.startEvt;var b=this.getFeatures(a),c={};a=[];for(var d,e=0,f=b.length;e<f;++e)d=b[e],c[d.id]=d,this.cache[d.id]||a.push(d);var b=[],g;for(g in this.cache)d=this.cache[g],d.layer&&d.layer.map?c[d.id]||b.push(d):delete this.cache[g];e=0;for(f=a.length;e<f&&(d=a[e],this.cache[d.id]=d,g=this.triggerEvent("featureover",{feature:d}),!1!==g);++e);e=0;for(f=b.length;e<f&&(d=b[e],delete this.cache[d.id],g=this.triggerEvent("featureout",{feature:d}),!1!==g);++e);},triggerEvent:function(a,
-b){var c=b.feature?b.feature.layer:b.layer,d=this.target.object;if(d instanceof OpenLayers.Map||d===c)return this.target.triggerEvent(a,b)},getFeatures:function(a){var b=a.clientX,c=a.clientY,d=[],e=[],f=[],g,h,k,l;for(l=this.map.layers.length-1;0<=l;--l)if(g=this.map.layers[l],"none"!==g.div.style.display)if(g.renderer instanceof OpenLayers.Renderer.Elements){if(g instanceof OpenLayers.Layer.Vector)for(h=document.elementFromPoint(b,c);h&&h._featureId;)(k=g.getFeatureById(h._featureId))?(d.push(k),
-h.style.display="none",e.push(h),h=document.elementFromPoint(b,c)):h=!1;f.push(g);g.div.style.display="none"}else g.renderer instanceof OpenLayers.Renderer.Canvas&&(k=g.renderer.getFeatureIdFromEvent(a))&&(d.push(k),f.push(g));l=0;for(a=e.length;l<a;++l)e[l].style.display="";for(l=f.length-1;0<=l;--l)f[l].div.style.display="block";return d},destroy:function(){for(var a=this.provides.length-1;0<=a;--a)delete this.target.extensions[this.provides[a]];this.map.events.un({mousemove:this.onMousemove,mousedown:this.start,
-mouseup:this.onClick,touchstart:this.start,touchmove:this.cancel,touchend:this.onClick,scope:this});delete this.cache;delete this.map;delete this.target}});OpenLayers.Events.nofeatureclick=OpenLayers.Events.featureclick;OpenLayers.Events.featureover=OpenLayers.Events.featureclick;OpenLayers.Events.featureout=OpenLayers.Events.featureclick;OpenLayers.Format.GPX=OpenLayers.Class(OpenLayers.Format.XML,{defaultDesc:"No description available",extractWaypoints:!0,extractTracks:!0,extractRoutes:!0,extractAttributes:!0,namespaces:{gpx:"http://www.topografix.com/GPX/1/1",xsi:"http://www.w3.org/2001/XMLSchema-instance"},schemaLocation:"http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd",creator:"OpenLayers",initialize:function(a){this.externalProjection=new OpenLayers.Projection("EPSG:4326");OpenLayers.Format.XML.prototype.initialize.apply(this,
-[a])},read:function(a){"string"==typeof a&&(a=OpenLayers.Format.XML.prototype.read.apply(this,[a]));var b=[];if(this.extractTracks)for(var c=a.getElementsByTagName("trk"),d=0,e=c.length;d<e;d++){var f={};this.extractAttributes&&(f=this.parseAttributes(c[d]));for(var g=this.getElementsByTagNameNS(c[d],c[d].namespaceURI,"trkseg"),h=0,k=g.length;h<k;h++){var l=this.extractSegment(g[h],"trkpt");b.push(new OpenLayers.Feature.Vector(l,f))}}if(this.extractRoutes)for(e=a.getElementsByTagName("rte"),c=0,d=
-e.length;c<d;c++)f={},this.extractAttributes&&(f=this.parseAttributes(e[c])),g=this.extractSegment(e[c],"rtept"),b.push(new OpenLayers.Feature.Vector(g,f));if(this.extractWaypoints)for(a=a.getElementsByTagName("wpt"),c=0,e=a.length;c<e;c++)f={},this.extractAttributes&&(f=this.parseAttributes(a[c])),d=new OpenLayers.Geometry.Point(a[c].getAttribute("lon"),a[c].getAttribute("lat")),b.push(new OpenLayers.Feature.Vector(d,f));if(this.internalProjection&&this.externalProjection)for(f=0,a=b.length;f<a;f++)b[f].geometry.transform(this.externalProjection,
-this.internalProjection);return b},extractSegment:function(a,b){for(var c=this.getElementsByTagNameNS(a,a.namespaceURI,b),d=[],e=0,f=c.length;e<f;e++)d.push(new OpenLayers.Geometry.Point(c[e].getAttribute("lon"),c[e].getAttribute("lat")));return new OpenLayers.Geometry.LineString(d)},parseAttributes:function(a){var b={};a=a.firstChild;for(var c,d;a;)1==a.nodeType&&a.firstChild&&(c=a.firstChild,3==c.nodeType||4==c.nodeType)&&(d=a.prefix?a.nodeName.split(":")[1]:a.nodeName,"trkseg"!=d&&"rtept"!=d&&
-(b[d]=c.nodeValue)),a=a.nextSibling;return b},write:function(a,b){a=OpenLayers.Util.isArray(a)?a:[a];var c=this.createElementNS(this.namespaces.gpx,"gpx");c.setAttribute("version","1.1");c.setAttribute("creator",this.creator);this.setAttributes(c,{"xsi:schemaLocation":this.schemaLocation});b&&"object"==typeof b&&c.appendChild(this.buildMetadataNode(b));for(var d=0,e=a.length;d<e;d++)c.appendChild(this.buildFeatureNode(a[d]));return OpenLayers.Format.XML.prototype.write.apply(this,[c])},buildMetadataNode:function(a){for(var b=
-["name","desc","author"],c=this.createElementNS(this.namespaces.gpx,"metadata"),d=0;d<b.length;d++){var e=b[d];if(a[e]){var f=this.createElementNS(this.namespaces.gpx,e);f.appendChild(this.createTextNode(a[e]));c.appendChild(f)}}return c},buildFeatureNode:function(a){var b=a.geometry,b=b.clone();this.internalProjection&&this.externalProjection&&b.transform(this.internalProjection,this.externalProjection);if("OpenLayers.Geometry.Point"==b.CLASS_NAME){var c=this.buildWptNode(b);this.appendAttributesNode(c,
-a);return c}c=this.createElementNS(this.namespaces.gpx,"trk");this.appendAttributesNode(c,a);a=this.buildTrkSegNode(b);a=OpenLayers.Util.isArray(a)?a:[a];for(var b=0,d=a.length;b<d;b++)c.appendChild(a[b]);return c},buildTrkSegNode:function(a){var b,c,d,e;if("OpenLayers.Geometry.LineString"==a.CLASS_NAME||"OpenLayers.Geometry.LinearRing"==a.CLASS_NAME){b=this.createElementNS(this.namespaces.gpx,"trkseg");c=0;for(d=a.components.length;c<d;c++)e=a.components[c],b.appendChild(this.buildTrkPtNode(e));
-return b}b=[];c=0;for(d=a.components.length;c<d;c++)b.push(this.buildTrkSegNode(a.components[c]));return b},buildTrkPtNode:function(a){var b=this.createElementNS(this.namespaces.gpx,"trkpt");b.setAttribute("lon",a.x);b.setAttribute("lat",a.y);return b},buildWptNode:function(a){var b=this.createElementNS(this.namespaces.gpx,"wpt");b.setAttribute("lon",a.x);b.setAttribute("lat",a.y);return b},appendAttributesNode:function(a,b){var c=this.createElementNS(this.namespaces.gpx,"name");c.appendChild(this.createTextNode(b.attributes.name||
-b.id));a.appendChild(c);c=this.createElementNS(this.namespaces.gpx,"desc");c.appendChild(this.createTextNode(b.attributes.description||this.defaultDesc));a.appendChild(c)},CLASS_NAME:"OpenLayers.Format.GPX"});OpenLayers.Format.WMSDescribeLayer=OpenLayers.Class(OpenLayers.Format.XML.VersionedOGC,{defaultVersion:"1.1.1",CLASS_NAME:"OpenLayers.Format.WMSDescribeLayer"});OpenLayers.Format.WMSDescribeLayer.v1_1_1=OpenLayers.Class(OpenLayers.Format.WMSDescribeLayer,{initialize:function(a){OpenLayers.Format.WMSDescribeLayer.prototype.initialize.apply(this,[a])},read:function(a){"string"==typeof a&&(a=OpenLayers.Format.XML.prototype.read.apply(this,[a]));for(var b=a.documentElement.childNodes,c={layerDescriptions:[]},d,e,f=0;f<b.length;++f)if(d=b[f],e=d.nodeName,"LayerDescription"==e){e=d.getAttribute("name");var g="",h="",k="";d.getAttribute("owsType")?(g=d.getAttribute("owsType"),
-h=d.getAttribute("owsURL")):""!=d.getAttribute("wfs")?(g="WFS",h=d.getAttribute("wfs")):""!=d.getAttribute("wcs")&&(g="WCS",h=d.getAttribute("wcs"));d=d.getElementsByTagName("Query");0<d.length&&((k=d[0].getAttribute("typeName"))||(k=d[0].getAttribute("typename")));d={layerName:e,owsType:g,owsURL:h,typeName:k};c.layerDescriptions.push(d);c.length=c.layerDescriptions.length;c[c.length-1]=d}else if("ServiceException"==e)return{error:(new OpenLayers.Format.OGCExceptionReport).read(a)};return c},CLASS_NAME:"OpenLayers.Format.WMSDescribeLayer.v1_1_1"});
-OpenLayers.Format.WMSDescribeLayer.v1_1_0=OpenLayers.Format.WMSDescribeLayer.v1_1_1;OpenLayers.Layer.XYZ=OpenLayers.Class(OpenLayers.Layer.Grid,{isBaseLayer:!0,sphericalMercator:!1,zoomOffset:0,serverResolutions:null,initialize:function(a,b,c){if(c&&c.sphericalMercator||this.sphericalMercator)c=OpenLayers.Util.extend({projection:"EPSG:900913",numZoomLevels:19},c);OpenLayers.Layer.Grid.prototype.initialize.apply(this,[a||this.name,b||this.url,{},c])},clone:function(a){null==a&&(a=new OpenLayers.Layer.XYZ(this.name,this.url,this.getOptions()));return a=OpenLayers.Layer.Grid.prototype.clone.apply(this,
-[a])},getURL:function(a){a=this.getXYZ(a);var b=this.url;OpenLayers.Util.isArray(b)&&(b=this.selectUrl(""+a.x+a.y+a.z,b));return OpenLayers.String.format(b,a)},getXYZ:function(a){var b=this.getServerResolution(),c=Math.round((a.left-this.maxExtent.left)/(b*this.tileSize.w));a=Math.round((this.maxExtent.top-a.top)/(b*this.tileSize.h));b=this.getServerZoom();if(this.wrapDateLine)var d=Math.pow(2,b),c=(c%d+d)%d;return{x:c,y:a,z:b}},setMap:function(a){OpenLayers.Layer.Grid.prototype.setMap.apply(this,
-arguments);this.tileOrigin||(this.tileOrigin=new OpenLayers.LonLat(this.maxExtent.left,this.maxExtent.bottom))},CLASS_NAME:"OpenLayers.Layer.XYZ"});OpenLayers.Layer.OSM=OpenLayers.Class(OpenLayers.Layer.XYZ,{name:"OpenStreetMap",url:["http://a.tile.openstreetmap.org/${z}/${x}/${y}.png","http://b.tile.openstreetmap.org/${z}/${x}/${y}.png","http://c.tile.openstreetmap.org/${z}/${x}/${y}.png"],attribution:"&copy; <a href='http://www.openstreetmap.org/copyright'>OpenStreetMap</a> contributors",sphericalMercator:!0,wrapDateLine:!0,tileOptions:null,initialize:function(a,b,c){OpenLayers.Layer.XYZ.prototype.initialize.apply(this,arguments);this.tileOptions=
-OpenLayers.Util.extend({crossOriginKeyword:"anonymous"},this.options&&this.options.tileOptions)},clone:function(a){null==a&&(a=new OpenLayers.Layer.OSM(this.name,this.url,this.getOptions()));return a=OpenLayers.Layer.XYZ.prototype.clone.apply(this,[a])},CLASS_NAME:"OpenLayers.Layer.OSM"});OpenLayers.Renderer=OpenLayers.Class({container:null,root:null,extent:null,locked:!1,size:null,resolution:null,map:null,featureDx:0,initialize:function(a,b){this.container=OpenLayers.Util.getElement(a);OpenLayers.Util.extend(this,b)},destroy:function(){this.map=this.resolution=this.size=this.extent=this.container=null},supported:function(){return!1},setExtent:function(a,b){this.extent=a.clone();if(this.map.baseLayer&&this.map.baseLayer.wrapDateLine){var c=a.getWidth()/this.map.getExtent().getWidth();
-a=a.scale(1/c);this.extent=a.wrapDateLine(this.map.getMaxExtent()).scale(c)}b&&(this.resolution=null);return!0},setSize:function(a){this.size=a.clone();this.resolution=null},getResolution:function(){return this.resolution=this.resolution||this.map.getResolution()},drawFeature:function(a,b){null==b&&(b=a.style);if(a.geometry){var c=a.geometry.getBounds();if(c){var d;this.map.baseLayer&&this.map.baseLayer.wrapDateLine&&(d=this.map.getMaxExtent());c.intersectsBounds(this.extent,{worldBounds:d})?this.calculateFeatureDx(c,
-d):b={display:"none"};c=this.drawGeometry(a.geometry,b,a.id);if("none"!=b.display&&b.label&&!1!==c){d=a.geometry.getCentroid();if(b.labelXOffset||b.labelYOffset){var e=isNaN(b.labelXOffset)?0:b.labelXOffset,f=isNaN(b.labelYOffset)?0:b.labelYOffset,g=this.getResolution();d.move(e*g,f*g)}this.drawText(a.id,b,d)}else this.removeText(a.id);return c}}},calculateFeatureDx:function(a,b){this.featureDx=0;if(b){var c=b.getWidth();this.featureDx=Math.round(((a.left+a.right)/2-(this.extent.left+this.extent.right)/
-2)/c)*c}},drawGeometry:function(a,b,c){},drawText:function(a,b,c){},removeText:function(a){},clear:function(){},getFeatureIdFromEvent:function(a){},eraseFeatures:function(a){OpenLayers.Util.isArray(a)||(a=[a]);for(var b=0,c=a.length;b<c;++b){var d=a[b];this.eraseGeometry(d.geometry,d.id);this.removeText(d.id)}},eraseGeometry:function(a,b){},moveRoot:function(a){},getRenderLayerId:function(){return this.container.id},applyDefaultSymbolizer:function(a){var b=OpenLayers.Util.extend({},OpenLayers.Renderer.defaultSymbolizer);
-!1===a.stroke&&(delete b.strokeWidth,delete b.strokeColor);!1===a.fill&&delete b.fillColor;OpenLayers.Util.extend(b,a);return b},CLASS_NAME:"OpenLayers.Renderer"});OpenLayers.Renderer.defaultSymbolizer={fillColor:"#000000",strokeColor:"#000000",strokeWidth:2,fillOpacity:1,strokeOpacity:1,pointRadius:0,labelAlign:"cm"};
-OpenLayers.Renderer.symbol={star:[350,75,379,161,469,161,397,215,423,301,350,250,277,301,303,215,231,161,321,161,350,75],cross:[4,0,6,0,6,4,10,4,10,6,6,6,6,10,4,10,4,6,0,6,0,4,4,4,4,0],x:[0,0,25,0,50,35,75,0,100,0,65,50,100,100,75,100,50,65,25,100,0,100,35,50,0,0],square:[0,0,0,1,1,1,1,0,0,0],triangle:[0,10,10,10,5,0,0,10]};OpenLayers.Renderer.Canvas=OpenLayers.Class(OpenLayers.Renderer,{hitDetection:!0,hitOverflow:0,canvas:null,features:null,pendingRedraw:!1,cachedSymbolBounds:{},initialize:function(a,b){OpenLayers.Renderer.prototype.initialize.apply(this,arguments);this.root=document.createElement("canvas");this.container.appendChild(this.root);this.canvas=this.root.getContext("2d");this.features={};this.hitDetection&&(this.hitCanvas=document.createElement("canvas"),this.hitContext=this.hitCanvas.getContext("2d"))},
-setExtent:function(){OpenLayers.Renderer.prototype.setExtent.apply(this,arguments);return!1},eraseGeometry:function(a,b){this.eraseFeatures(this.features[b][0])},supported:function(){return OpenLayers.CANVAS_SUPPORTED},setSize:function(a){this.size=a.clone();var b=this.root;b.style.width=a.w+"px";b.style.height=a.h+"px";b.width=a.w;b.height=a.h;this.resolution=null;this.hitDetection&&(b=this.hitCanvas,b.style.width=a.w+"px",b.style.height=a.h+"px",b.width=a.w,b.height=a.h)},drawFeature:function(a,
-b){var c;if(a.geometry){b=this.applyDefaultSymbolizer(b||a.style);c=a.geometry.getBounds();var d;this.map.baseLayer&&this.map.baseLayer.wrapDateLine&&(d=this.map.getMaxExtent());d=c&&c.intersectsBounds(this.extent,{worldBounds:d});(c="none"!==b.display&&!!c&&d)?this.features[a.id]=[a,b]:delete this.features[a.id];this.pendingRedraw=!0}this.pendingRedraw&&!this.locked&&(this.redraw(),this.pendingRedraw=!1);return c},drawGeometry:function(a,b,c){var d=a.CLASS_NAME;if("OpenLayers.Geometry.Collection"==
-d||"OpenLayers.Geometry.MultiPoint"==d||"OpenLayers.Geometry.MultiLineString"==d||"OpenLayers.Geometry.MultiPolygon"==d)for(d=0;d<a.components.length;d++)this.drawGeometry(a.components[d],b,c);else switch(a.CLASS_NAME){case "OpenLayers.Geometry.Point":this.drawPoint(a,b,c);break;case "OpenLayers.Geometry.LineString":this.drawLineString(a,b,c);break;case "OpenLayers.Geometry.LinearRing":this.drawLinearRing(a,b,c);break;case "OpenLayers.Geometry.Polygon":this.drawPolygon(a,b,c)}},drawExternalGraphic:function(a,
-b,c){var d=new Image,e=b.title||b.graphicTitle;e&&(d.title=e);var f=b.graphicWidth||b.graphicHeight,g=b.graphicHeight||b.graphicWidth,f=f?f:2*b.pointRadius,g=g?g:2*b.pointRadius,h=void 0!=b.graphicXOffset?b.graphicXOffset:-(0.5*f),k=void 0!=b.graphicYOffset?b.graphicYOffset:-(0.5*g),l=b.graphicOpacity||b.fillOpacity;d.onload=OpenLayers.Function.bind(function(){if(this.features[c]){var b=this.getLocalXY(a),e=b[0],b=b[1];if(!isNaN(e)&&!isNaN(b)){var e=e+h|0,b=b+k|0,p=this.canvas;p.globalAlpha=l;var q=
-OpenLayers.Renderer.Canvas.drawImageScaleFactor||(OpenLayers.Renderer.Canvas.drawImageScaleFactor=/android 2.1/.test(navigator.userAgent.toLowerCase())?320/window.screen.width:1);p.drawImage(d,e*q,b*q,f*q,g*q);this.hitDetection&&(this.setHitContextStyle("fill",c),this.hitContext.fillRect(e,b,f,g))}}},this);d.src=b.externalGraphic},drawNamedSymbol:function(a,b,c){var d,e,f,g;f=Math.PI/180;var h=OpenLayers.Renderer.symbol[b.graphicName];if(!h)throw Error(b.graphicName+" is not a valid symbol name");
-if(!(!h.length||2>h.length||(a=this.getLocalXY(a),e=a[0],g=a[1],isNaN(e)||isNaN(g)))){this.canvas.lineCap="round";this.canvas.lineJoin="round";this.hitDetection&&(this.hitContext.lineCap="round",this.hitContext.lineJoin="round");if(b.graphicName in this.cachedSymbolBounds)d=this.cachedSymbolBounds[b.graphicName];else{d=new OpenLayers.Bounds;for(a=0;a<h.length;a+=2)d.extend(new OpenLayers.LonLat(h[a],h[a+1]));this.cachedSymbolBounds[b.graphicName]=d}this.canvas.save();this.hitDetection&&this.hitContext.save();
-this.canvas.translate(e,g);this.hitDetection&&this.hitContext.translate(e,g);a=f*b.rotation;isNaN(a)||(this.canvas.rotate(a),this.hitDetection&&this.hitContext.rotate(a));f=2*b.pointRadius/Math.max(d.getWidth(),d.getHeight());this.canvas.scale(f,f);this.hitDetection&&this.hitContext.scale(f,f);a=d.getCenterLonLat().lon;d=d.getCenterLonLat().lat;this.canvas.translate(-a,-d);this.hitDetection&&this.hitContext.translate(-a,-d);g=b.strokeWidth;b.strokeWidth=g/f;if(!1!==b.fill){this.setCanvasStyle("fill",
-b);this.canvas.beginPath();for(a=0;a<h.length;a+=2)d=h[a],e=h[a+1],0==a&&this.canvas.moveTo(d,e),this.canvas.lineTo(d,e);this.canvas.closePath();this.canvas.fill();if(this.hitDetection){this.setHitContextStyle("fill",c,b);this.hitContext.beginPath();for(a=0;a<h.length;a+=2)d=h[a],e=h[a+1],0==a&&this.canvas.moveTo(d,e),this.hitContext.lineTo(d,e);this.hitContext.closePath();this.hitContext.fill()}}if(!1!==b.stroke){this.setCanvasStyle("stroke",b);this.canvas.beginPath();for(a=0;a<h.length;a+=2)d=h[a],
-e=h[a+1],0==a&&this.canvas.moveTo(d,e),this.canvas.lineTo(d,e);this.canvas.closePath();this.canvas.stroke();if(this.hitDetection){this.setHitContextStyle("stroke",c,b,f);this.hitContext.beginPath();for(a=0;a<h.length;a+=2)d=h[a],e=h[a+1],0==a&&this.hitContext.moveTo(d,e),this.hitContext.lineTo(d,e);this.hitContext.closePath();this.hitContext.stroke()}}b.strokeWidth=g;this.canvas.restore();this.hitDetection&&this.hitContext.restore();this.setCanvasStyle("reset")}},setCanvasStyle:function(a,b){"fill"===
-a?(this.canvas.globalAlpha=b.fillOpacity,this.canvas.fillStyle=b.fillColor):"stroke"===a?(this.canvas.globalAlpha=b.strokeOpacity,this.canvas.strokeStyle=b.strokeColor,this.canvas.lineWidth=b.strokeWidth):(this.canvas.globalAlpha=0,this.canvas.lineWidth=1)},featureIdToHex:function(a){a=Number(a.split("_").pop())+1;16777216<=a&&(this.hitOverflow=a-16777215,a=a%16777216+1);a="000000"+a.toString(16);var b=a.length;return a="#"+a.substring(b-6,b)},setHitContextStyle:function(a,b,c,d){b=this.featureIdToHex(b);
-"fill"==a?(this.hitContext.globalAlpha=1,this.hitContext.fillStyle=b):"stroke"==a?(this.hitContext.globalAlpha=1,this.hitContext.strokeStyle=b,"undefined"===typeof d?this.hitContext.lineWidth=c.strokeWidth+2:isNaN(d)||(this.hitContext.lineWidth=c.strokeWidth+2/d)):(this.hitContext.globalAlpha=0,this.hitContext.lineWidth=1)},drawPoint:function(a,b,c){if(!1!==b.graphic)if(b.externalGraphic)this.drawExternalGraphic(a,b,c);else if(b.graphicName&&"circle"!=b.graphicName)this.drawNamedSymbol(a,b,c);else{var d=
-this.getLocalXY(a);a=d[0];d=d[1];if(!isNaN(a)&&!isNaN(d)){var e=2*Math.PI,f=b.pointRadius;!1!==b.fill&&(this.setCanvasStyle("fill",b),this.canvas.beginPath(),this.canvas.arc(a,d,f,0,e,!0),this.canvas.fill(),this.hitDetection&&(this.setHitContextStyle("fill",c,b),this.hitContext.beginPath(),this.hitContext.arc(a,d,f,0,e,!0),this.hitContext.fill()));!1!==b.stroke&&(this.setCanvasStyle("stroke",b),this.canvas.beginPath(),this.canvas.arc(a,d,f,0,e,!0),this.canvas.stroke(),this.hitDetection&&(this.setHitContextStyle("stroke",
-c,b),this.hitContext.beginPath(),this.hitContext.arc(a,d,f,0,e,!0),this.hitContext.stroke()),this.setCanvasStyle("reset"))}}},drawLineString:function(a,b,c){b=OpenLayers.Util.applyDefaults({fill:!1},b);this.drawLinearRing(a,b,c)},drawLinearRing:function(a,b,c){!1!==b.fill&&(this.setCanvasStyle("fill",b),this.renderPath(this.canvas,a,b,c,"fill"),this.hitDetection&&(this.setHitContextStyle("fill",c,b),this.renderPath(this.hitContext,a,b,c,"fill")));!1!==b.stroke&&(this.setCanvasStyle("stroke",b),this.renderPath(this.canvas,
-a,b,c,"stroke"),this.hitDetection&&(this.setHitContextStyle("stroke",c,b),this.renderPath(this.hitContext,a,b,c,"stroke")));this.setCanvasStyle("reset")},renderPath:function(a,b,c,d,e){b=b.components;c=b.length;a.beginPath();d=this.getLocalXY(b[0]);var f=d[1];if(!isNaN(d[0])&&!isNaN(f)){a.moveTo(d[0],d[1]);for(d=1;d<c;++d)f=this.getLocalXY(b[d]),a.lineTo(f[0],f[1]);"fill"===e?a.fill():a.stroke()}},drawPolygon:function(a,b,c){a=a.components;var d=a.length;this.drawLinearRing(a[0],b,c);for(var e=1;e<
-d;++e)this.canvas.globalCompositeOperation="destination-out",this.hitDetection&&(this.hitContext.globalCompositeOperation="destination-out"),this.drawLinearRing(a[e],OpenLayers.Util.applyDefaults({stroke:!1,fillOpacity:1},b),c),this.canvas.globalCompositeOperation="source-over",this.hitDetection&&(this.hitContext.globalCompositeOperation="source-over"),this.drawLinearRing(a[e],OpenLayers.Util.applyDefaults({fill:!1},b),c)},drawText:function(a,b){var c=this.getLocalXY(a);this.setCanvasStyle("reset");
-this.canvas.fillStyle=b.fontColor;this.canvas.globalAlpha=b.fontOpacity||1;var d=[b.fontStyle?b.fontStyle:"normal","normal",b.fontWeight?b.fontWeight:"normal",b.fontSize?b.fontSize:"1em",b.fontFamily?b.fontFamily:"sans-serif"].join(" "),e=b.label.split("\n"),f=e.length;if(this.canvas.fillText){this.canvas.font=d;this.canvas.textAlign=OpenLayers.Renderer.Canvas.LABEL_ALIGN[b.labelAlign[0]]||"center";this.canvas.textBaseline=OpenLayers.Renderer.Canvas.LABEL_ALIGN[b.labelAlign[1]]||"middle";var g=OpenLayers.Renderer.Canvas.LABEL_FACTOR[b.labelAlign[1]];
-null==g&&(g=-0.5);d=this.canvas.measureText("Mg").height||this.canvas.measureText("xx").width;c[1]+=d*g*(f-1);for(g=0;g<f;g++)b.labelOutlineWidth&&(this.canvas.save(),this.canvas.globalAlpha=b.labelOutlineOpacity||b.fontOpacity||1,this.canvas.strokeStyle=b.labelOutlineColor,this.canvas.lineWidth=b.labelOutlineWidth,this.canvas.strokeText(e[g],c[0],c[1]+d*g+1),this.canvas.restore()),this.canvas.fillText(e[g],c[0],c[1]+d*g)}else if(this.canvas.mozDrawText){this.canvas.mozTextStyle=d;var h=OpenLayers.Renderer.Canvas.LABEL_FACTOR[b.labelAlign[0]];
-null==h&&(h=-0.5);g=OpenLayers.Renderer.Canvas.LABEL_FACTOR[b.labelAlign[1]];null==g&&(g=-0.5);d=this.canvas.mozMeasureText("xx");c[1]+=d*(1+g*f);for(g=0;g<f;g++){var k=c[0]+h*this.canvas.mozMeasureText(e[g]),l=c[1]+g*d;this.canvas.translate(k,l);this.canvas.mozDrawText(e[g]);this.canvas.translate(-k,-l)}}this.setCanvasStyle("reset")},getLocalXY:function(a){var b=this.getResolution(),c=this.extent;return[(a.x-this.featureDx)/b+-c.left/b,c.top/b-a.y/b]},clear:function(){var a=this.root.height,b=this.root.width;
-this.canvas.clearRect(0,0,b,a);this.features={};this.hitDetection&&this.hitContext.clearRect(0,0,b,a)},getFeatureIdFromEvent:function(a){var b;if(this.hitDetection&&"none"!==this.root.style.display&&!this.map.dragging&&(a=a.xy,a=this.hitContext.getImageData(a.x|0,a.y|0,1,1).data,255===a[3]&&(a=a[2]+256*(a[1]+256*a[0])))){a="OpenLayers_Feature_Vector_"+(a-1+this.hitOverflow);try{b=this.features[a][0]}catch(c){}}return b},eraseFeatures:function(a){OpenLayers.Util.isArray(a)||(a=[a]);for(var b=0;b<a.length;++b)delete this.features[a[b].id];
-this.redraw()},redraw:function(){if(!this.locked){var a=this.root.height,b=this.root.width;this.canvas.clearRect(0,0,b,a);this.hitDetection&&this.hitContext.clearRect(0,0,b,a);var a=[],c,d,e=this.map.baseLayer&&this.map.baseLayer.wrapDateLine&&this.map.getMaxExtent(),f;for(f in this.features)this.features.hasOwnProperty(f)&&(b=this.features[f][0],c=b.geometry,this.calculateFeatureDx(c.getBounds(),e),d=this.features[f][1],this.drawGeometry(c,d,b.id),d.label&&a.push([b,d]));b=0;for(c=a.length;b<c;++b)f=
-a[b],this.drawText(f[0].geometry.getCentroid(),f[1])}},CLASS_NAME:"OpenLayers.Renderer.Canvas"});OpenLayers.Renderer.Canvas.LABEL_ALIGN={l:"left",r:"right",t:"top",b:"bottom"};OpenLayers.Renderer.Canvas.LABEL_FACTOR={l:0,r:-1,t:0,b:-1};OpenLayers.Renderer.Canvas.drawImageScaleFactor=null;OpenLayers.Format.OSM=OpenLayers.Class(OpenLayers.Format.XML,{checkTags:!1,interestingTagsExclude:null,areaTags:null,initialize:function(a){var b={interestingTagsExclude:"source source_ref source:ref history attribution created_by".split(" "),areaTags:"area building leisure tourism ruins historic landuse military natural sport".split(" ")},b=OpenLayers.Util.extend(b,a),c={};for(a=0;a<b.interestingTagsExclude.length;a++)c[b.interestingTagsExclude[a]]=!0;b.interestingTagsExclude=c;c={};for(a=0;a<b.areaTags.length;a++)c[b.areaTags[a]]=
-!0;b.areaTags=c;this.externalProjection=new OpenLayers.Projection("EPSG:4326");OpenLayers.Format.XML.prototype.initialize.apply(this,[b])},read:function(a){"string"==typeof a&&(a=OpenLayers.Format.XML.prototype.read.apply(this,[a]));var b=this.getNodes(a),c=this.getWays(a);a=Array(c.length);for(var d=0;d<c.length;d++){for(var e=Array(c[d].nodes.length),f=this.isWayArea(c[d])?1:0,g=0;g<c[d].nodes.length;g++){var h=b[c[d].nodes[g]],k=new OpenLayers.Geometry.Point(h.lon,h.lat);k.osm_id=parseInt(c[d].nodes[g]);
-e[g]=k;h.used=!0}h=null;h=f?new OpenLayers.Geometry.Polygon(new OpenLayers.Geometry.LinearRing(e)):new OpenLayers.Geometry.LineString(e);this.internalProjection&&this.externalProjection&&h.transform(this.externalProjection,this.internalProjection);e=new OpenLayers.Feature.Vector(h,c[d].tags);e.osm_id=parseInt(c[d].id);e.fid="way."+e.osm_id;a[d]=e}for(var l in b){h=b[l];if(!h.used||this.checkTags){c=null;if(this.checkTags){c=this.getTags(h.node,!0);if(h.used&&!c[1])continue;c=c[0]}else c=this.getTags(h.node);
-e=new OpenLayers.Feature.Vector(new OpenLayers.Geometry.Point(h.lon,h.lat),c);this.internalProjection&&this.externalProjection&&e.geometry.transform(this.externalProjection,this.internalProjection);e.osm_id=parseInt(l);e.fid="node."+e.osm_id;a.push(e)}h.node=null}return a},getNodes:function(a){a=a.getElementsByTagName("node");for(var b={},c=0;c<a.length;c++){var d=a[c],e=d.getAttribute("id");b[e]={lat:d.getAttribute("lat"),lon:d.getAttribute("lon"),node:d}}return b},getWays:function(a){a=a.getElementsByTagName("way");
-for(var b=[],c=0;c<a.length;c++){var d=a[c],e={id:d.getAttribute("id")};e.tags=this.getTags(d);d=d.getElementsByTagName("nd");e.nodes=Array(d.length);for(var f=0;f<d.length;f++)e.nodes[f]=d[f].getAttribute("ref");b.push(e)}return b},getTags:function(a,b){for(var c=a.getElementsByTagName("tag"),d={},e=!1,f=0;f<c.length;f++){var g=c[f].getAttribute("k");d[g]=c[f].getAttribute("v");b&&(this.interestingTagsExclude[g]||(e=!0))}return b?[d,e]:d},isWayArea:function(a){var b=!1,c=!1;a.nodes[0]==a.nodes[a.nodes.length-
-1]&&(b=!0);if(this.checkTags)for(var d in a.tags)if(this.areaTags[d]){c=!0;break}return b&&(this.checkTags?c:!0)},write:function(a){OpenLayers.Util.isArray(a)||(a=[a]);this.osm_id=1;this.created_nodes={};var b=this.createElementNS(null,"osm");b.setAttribute("version","0.5");b.setAttribute("generator","OpenLayers "+OpenLayers.VERSION_NUMBER);for(var c=a.length-1;0<=c;c--)for(var d=this.createFeatureNodes(a[c]),e=0;e<d.length;e++)b.appendChild(d[e]);return OpenLayers.Format.XML.prototype.write.apply(this,
-[b])},createFeatureNodes:function(a){var b=[],c=a.geometry.CLASS_NAME,c=c.substring(c.lastIndexOf(".")+1),c=c.toLowerCase();(c=this.createXML[c])&&(b=c.apply(this,[a]));return b},createXML:{point:function(a){var b=null,c=a.geometry?a.geometry:a;this.internalProjection&&this.externalProjection&&(c=c.clone(),c.transform(this.internalProjection,this.externalProjection));var d=!1;a.osm_id?(b=a.osm_id,this.created_nodes[b]&&(d=!0)):(b=-this.osm_id,this.osm_id++);var e=d?this.created_nodes[b]:this.createElementNS(null,
-"node");this.created_nodes[b]=e;e.setAttribute("id",b);e.setAttribute("lon",c.x);e.setAttribute("lat",c.y);a.attributes&&this.serializeTags(a,e);this.setState(a,e);return d?[]:[e]},linestring:function(a){var b,c=[],d=a.geometry;a.osm_id?b=a.osm_id:(b=-this.osm_id,this.osm_id++);var e=this.createElementNS(null,"way");e.setAttribute("id",b);for(b=0;b<d.components.length;b++){var f=this.createXML.point.apply(this,[d.components[b]]);if(f.length){var f=f[0],g=f.getAttribute("id");c.push(f)}else g=d.components[b].osm_id,
-f=this.created_nodes[g];this.setState(a,f);f=this.createElementNS(null,"nd");f.setAttribute("ref",g);e.appendChild(f)}this.serializeTags(a,e);c.push(e);return c},polygon:function(a){var b=OpenLayers.Util.extend({area:"yes"},a.attributes),b=new OpenLayers.Feature.Vector(a.geometry.components[0],b);b.osm_id=a.osm_id;return this.createXML.linestring.apply(this,[b])}},serializeTags:function(a,b){for(var c in a.attributes){var d=this.createElementNS(null,"tag");d.setAttribute("k",c);d.setAttribute("v",
-a.attributes[c]);b.appendChild(d)}},setState:function(a,b){if(a.state){var c=null;switch(a.state){case OpenLayers.State.UPDATE:case OpenLayers.State.DELETE:c="delete"}c&&b.setAttribute("action",c)}},CLASS_NAME:"OpenLayers.Format.OSM"});OpenLayers.Handler.Keyboard=OpenLayers.Class(OpenLayers.Handler,{KEY_EVENTS:["keydown","keyup"],eventListener:null,observeElement:null,initialize:function(a,b,c){OpenLayers.Handler.prototype.initialize.apply(this,arguments);this.eventListener=OpenLayers.Function.bindAsEventListener(this.handleKeyEvent,this)},destroy:function(){this.deactivate();this.eventListener=null;OpenLayers.Handler.prototype.destroy.apply(this,arguments)},activate:function(){if(OpenLayers.Handler.prototype.activate.apply(this,
-arguments)){this.observeElement=this.observeElement||document;for(var a=0,b=this.KEY_EVENTS.length;a<b;a++)OpenLayers.Event.observe(this.observeElement,this.KEY_EVENTS[a],this.eventListener);return!0}return!1},deactivate:function(){var a=!1;if(OpenLayers.Handler.prototype.deactivate.apply(this,arguments)){for(var a=0,b=this.KEY_EVENTS.length;a<b;a++)OpenLayers.Event.stopObserving(this.observeElement,this.KEY_EVENTS[a],this.eventListener);a=!0}return a},handleKeyEvent:function(a){this.checkModifiers(a)&&
-this.callback(a.type,[a])},CLASS_NAME:"OpenLayers.Handler.Keyboard"});OpenLayers.Control.ModifyFeature=OpenLayers.Class(OpenLayers.Control,{documentDrag:!1,geometryTypes:null,clickout:!0,toggle:!0,standalone:!1,layer:null,feature:null,vertex:null,vertices:null,virtualVertices:null,handlers:null,deleteCodes:null,virtualStyle:null,vertexRenderIntent:null,mode:null,createVertices:!0,modified:!1,radiusHandle:null,dragHandle:null,onModificationStart:function(){},onModification:function(){},onModificationEnd:function(){},initialize:function(a,b){b=b||{};this.layer=a;this.vertices=
-[];this.virtualVertices=[];this.virtualStyle=OpenLayers.Util.extend({},this.layer.style||this.layer.styleMap.createSymbolizer(null,b.vertexRenderIntent));this.virtualStyle.fillOpacity=0.3;this.virtualStyle.strokeOpacity=0.3;this.deleteCodes=[46,68];this.mode=OpenLayers.Control.ModifyFeature.RESHAPE;OpenLayers.Control.prototype.initialize.apply(this,[b]);OpenLayers.Util.isArray(this.deleteCodes)||(this.deleteCodes=[this.deleteCodes]);var c={documentDrag:this.documentDrag,stopDown:!1};this.handlers=
-{keyboard:new OpenLayers.Handler.Keyboard(this,{keydown:this.handleKeypress}),drag:new OpenLayers.Handler.Drag(this,{down:function(a){this.vertex=null;(a=this.layer.getFeatureFromEvent(this.handlers.drag.evt))?this.dragStart(a):this.clickout&&(this._unselect=this.feature)},move:function(a){delete this._unselect;this.vertex&&this.dragVertex(this.vertex,a)},up:function(){this.handlers.drag.stopDown=!1;this._unselect&&(this.unselectFeature(this._unselect),delete this._unselect)},done:function(a){this.vertex&&
-this.dragComplete(this.vertex)}},c)}},destroy:function(){this.map&&this.map.events.un({removelayer:this.handleMapEvents,changelayer:this.handleMapEvents,scope:this});this.layer=null;OpenLayers.Control.prototype.destroy.apply(this,[])},activate:function(){this.moveLayerToTop();this.map.events.on({removelayer:this.handleMapEvents,changelayer:this.handleMapEvents,scope:this});return this.handlers.keyboard.activate()&&this.handlers.drag.activate()&&OpenLayers.Control.prototype.activate.apply(this,arguments)},
-deactivate:function(){var a=!1;OpenLayers.Control.prototype.deactivate.apply(this,arguments)&&(this.moveLayerBack(),this.map.events.un({removelayer:this.handleMapEvents,changelayer:this.handleMapEvents,scope:this}),this.layer.removeFeatures(this.vertices,{silent:!0}),this.layer.removeFeatures(this.virtualVertices,{silent:!0}),this.vertices=[],this.handlers.drag.deactivate(),this.handlers.keyboard.deactivate(),(a=this.feature)&&(a.geometry&&a.layer)&&this.unselectFeature(a),a=!0);return a},beforeSelectFeature:function(a){return this.layer.events.triggerEvent("beforefeaturemodified",
-{feature:a})},selectFeature:function(a){if(!(this.feature===a||this.geometryTypes&&-1==OpenLayers.Util.indexOf(this.geometryTypes,a.geometry.CLASS_NAME))){!1!==this.beforeSelectFeature(a)&&(this.feature&&this.unselectFeature(this.feature),this.feature=a,this.layer.selectedFeatures.push(a),this.layer.drawFeature(a,"select"),this.modified=!1,this.resetVertices(),this.onModificationStart(this.feature));var b=a.modified;!a.geometry||b&&b.geometry||(this._originalGeometry=a.geometry.clone())}},unselectFeature:function(a){this.layer.removeFeatures(this.vertices,
-{silent:!0});this.vertices=[];this.layer.destroyFeatures(this.virtualVertices,{silent:!0});this.virtualVertices=[];this.dragHandle&&(this.layer.destroyFeatures([this.dragHandle],{silent:!0}),delete this.dragHandle);this.radiusHandle&&(this.layer.destroyFeatures([this.radiusHandle],{silent:!0}),delete this.radiusHandle);this.layer.drawFeature(this.feature,"default");this.feature=null;OpenLayers.Util.removeItem(this.layer.selectedFeatures,a);this.onModificationEnd(a);this.layer.events.triggerEvent("afterfeaturemodified",
-{feature:a,modified:this.modified});this.modified=!1},dragStart:function(a){var b="OpenLayers.Geometry.Point"==a.geometry.CLASS_NAME;this.standalone||(a._sketch||!b)&&a._sketch||(this.toggle&&this.feature===a&&(this._unselect=a),this.selectFeature(a));if(a._sketch||b)this.vertex=a,this.handlers.drag.stopDown=!0},dragVertex:function(a,b){var c=this.map.getLonLatFromViewPortPx(b),d=a.geometry;d.move(c.lon-d.x,c.lat-d.y);this.modified=!0;"OpenLayers.Geometry.Point"==this.feature.geometry.CLASS_NAME?
-this.layer.events.triggerEvent("vertexmodified",{vertex:a.geometry,feature:this.feature,pixel:b}):(a._index?(a.geometry.parent.addComponent(a.geometry,a._index),delete a._index,OpenLayers.Util.removeItem(this.virtualVertices,a),this.vertices.push(a)):a==this.dragHandle?(this.layer.removeFeatures(this.vertices,{silent:!0}),this.vertices=[],this.radiusHandle&&(this.layer.destroyFeatures([this.radiusHandle],{silent:!0}),this.radiusHandle=null)):a!==this.radiusHandle&&this.layer.events.triggerEvent("vertexmodified",
-{vertex:a.geometry,feature:this.feature,pixel:b}),0<this.virtualVertices.length&&(this.layer.destroyFeatures(this.virtualVertices,{silent:!0}),this.virtualVertices=[]),this.layer.drawFeature(this.feature,this.standalone?void 0:"select"));this.layer.drawFeature(a)},dragComplete:function(a){this.resetVertices();this.setFeatureState();this.onModification(this.feature);this.layer.events.triggerEvent("featuremodified",{feature:this.feature})},setFeatureState:function(){if(this.feature.state!=OpenLayers.State.INSERT&&
-this.feature.state!=OpenLayers.State.DELETE&&(this.feature.state=OpenLayers.State.UPDATE,this.modified&&this._originalGeometry)){var a=this.feature;a.modified=OpenLayers.Util.extend(a.modified,{geometry:this._originalGeometry});delete this._originalGeometry}},resetVertices:function(){0<this.vertices.length&&(this.layer.removeFeatures(this.vertices,{silent:!0}),this.vertices=[]);0<this.virtualVertices.length&&(this.layer.removeFeatures(this.virtualVertices,{silent:!0}),this.virtualVertices=[]);this.dragHandle&&
-(this.layer.destroyFeatures([this.dragHandle],{silent:!0}),this.dragHandle=null);this.radiusHandle&&(this.layer.destroyFeatures([this.radiusHandle],{silent:!0}),this.radiusHandle=null);this.feature&&"OpenLayers.Geometry.Point"!=this.feature.geometry.CLASS_NAME&&(this.mode&OpenLayers.Control.ModifyFeature.DRAG&&this.collectDragHandle(),this.mode&(OpenLayers.Control.ModifyFeature.ROTATE|OpenLayers.Control.ModifyFeature.RESIZE)&&this.collectRadiusHandle(),this.mode&OpenLayers.Control.ModifyFeature.RESHAPE&&
-(this.mode&OpenLayers.Control.ModifyFeature.RESIZE||this.collectVertices()))},handleKeypress:function(a){var b=a.keyCode;this.feature&&-1!=OpenLayers.Util.indexOf(this.deleteCodes,b)&&(b=this.layer.getFeatureFromEvent(this.handlers.drag.evt))&&(-1!=OpenLayers.Util.indexOf(this.vertices,b)&&!this.handlers.drag.dragging&&b.geometry.parent)&&(b.geometry.parent.removeComponent(b.geometry),this.layer.events.triggerEvent("vertexremoved",{vertex:b.geometry,feature:this.feature,pixel:a.xy}),this.layer.drawFeature(this.feature,
-this.standalone?void 0:"select"),this.modified=!0,this.resetVertices(),this.setFeatureState(),this.onModification(this.feature),this.layer.events.triggerEvent("featuremodified",{feature:this.feature}))},collectVertices:function(){function a(c){var d,e,f;if("OpenLayers.Geometry.Point"==c.CLASS_NAME)e=new OpenLayers.Feature.Vector(c),e._sketch=!0,e.renderIntent=b.vertexRenderIntent,b.vertices.push(e);else{f=c.components.length;"OpenLayers.Geometry.LinearRing"==c.CLASS_NAME&&(f-=1);for(d=0;d<f;++d)e=
-c.components[d],"OpenLayers.Geometry.Point"==e.CLASS_NAME?(e=new OpenLayers.Feature.Vector(e),e._sketch=!0,e.renderIntent=b.vertexRenderIntent,b.vertices.push(e)):a(e);if(b.createVertices&&"OpenLayers.Geometry.MultiPoint"!=c.CLASS_NAME)for(d=0,f=c.components.length;d<f-1;++d){e=c.components[d];var g=c.components[d+1];"OpenLayers.Geometry.Point"==e.CLASS_NAME&&"OpenLayers.Geometry.Point"==g.CLASS_NAME&&(e=new OpenLayers.Feature.Vector(new OpenLayers.Geometry.Point((e.x+g.x)/2,(e.y+g.y)/2),null,b.virtualStyle),
-e.geometry.parent=c,e._index=d+1,e._sketch=!0,b.virtualVertices.push(e))}}}this.vertices=[];this.virtualVertices=[];var b=this;a.call(this,this.feature.geometry);this.layer.addFeatures(this.virtualVertices,{silent:!0});this.layer.addFeatures(this.vertices,{silent:!0})},collectDragHandle:function(){var a=this.feature.geometry,b=a.getBounds().getCenterLonLat(),b=new OpenLayers.Geometry.Point(b.lon,b.lat),c=new OpenLayers.Feature.Vector(b);b.move=function(b,c){OpenLayers.Geometry.Point.prototype.move.call(this,
-b,c);a.move(b,c)};c._sketch=!0;this.dragHandle=c;this.dragHandle.renderIntent=this.vertexRenderIntent;this.layer.addFeatures([this.dragHandle],{silent:!0})},collectRadiusHandle:function(){var a=this.feature.geometry,b=a.getBounds(),c=b.getCenterLonLat(),d=new OpenLayers.Geometry.Point(c.lon,c.lat),b=new OpenLayers.Geometry.Point(b.right,b.bottom),c=new OpenLayers.Feature.Vector(b),e=this.mode&OpenLayers.Control.ModifyFeature.RESIZE,f=this.mode&OpenLayers.Control.ModifyFeature.RESHAPE,g=this.mode&
-OpenLayers.Control.ModifyFeature.ROTATE;b.move=function(b,c){OpenLayers.Geometry.Point.prototype.move.call(this,b,c);var l=this.x-d.x,m=this.y-d.y,n=l-b,p=m-c;if(g){var q=Math.atan2(p,n),q=Math.atan2(m,l)-q,q=q*(180/Math.PI);a.rotate(q,d)}if(e){var r;f?(m/=p,r=l/n/m):(n=Math.sqrt(n*n+p*p),m=Math.sqrt(l*l+m*m)/n);a.resize(m,d,r)}};c._sketch=!0;this.radiusHandle=c;this.radiusHandle.renderIntent=this.vertexRenderIntent;this.layer.addFeatures([this.radiusHandle],{silent:!0})},setMap:function(a){this.handlers.drag.setMap(a);
-OpenLayers.Control.prototype.setMap.apply(this,arguments)},handleMapEvents:function(a){"removelayer"!=a.type&&"order"!=a.property||this.moveLayerToTop()},moveLayerToTop:function(){var a=Math.max(this.map.Z_INDEX_BASE.Feature-1,this.layer.getZIndex())+1;this.layer.setZIndex(a)},moveLayerBack:function(){var a=this.layer.getZIndex()-1;a>=this.map.Z_INDEX_BASE.Feature?this.layer.setZIndex(a):this.map.setLayerZIndex(this.layer,this.map.getLayerIndex(this.layer))},CLASS_NAME:"OpenLayers.Control.ModifyFeature"});
-OpenLayers.Control.ModifyFeature.RESHAPE=1;OpenLayers.Control.ModifyFeature.RESIZE=2;OpenLayers.Control.ModifyFeature.ROTATE=4;OpenLayers.Control.ModifyFeature.DRAG=8;OpenLayers.Layer.Bing=OpenLayers.Class(OpenLayers.Layer.XYZ,{key:null,serverResolutions:[156543.03390625,78271.516953125,39135.7584765625,19567.87923828125,9783.939619140625,4891.9698095703125,2445.9849047851562,1222.9924523925781,611.4962261962891,305.74811309814453,152.87405654907226,76.43702827453613,38.218514137268066,19.109257068634033,9.554628534317017,4.777314267158508,2.388657133579254,1.194328566789627,0.5971642833948135,0.29858214169740677,0.14929107084870338,0.07464553542435169],attributionTemplate:'<span class="olBingAttribution ${type}"><div><a target="_blank" href="http://www.bing.com/maps/"><img src="${logo}" /></a></div>${copyrights}<a style="white-space: nowrap" target="_blank" href="http://www.microsoft.com/maps/product/terms.html">Terms of Use</a></span>',
-metadata:null,protocolRegex:/^http:/i,type:"Road",culture:"en-US",metadataParams:null,tileOptions:null,protocol:~window.location.href.indexOf("http")?"":"http:",initialize:function(a){a=OpenLayers.Util.applyDefaults({sphericalMercator:!0},a);OpenLayers.Layer.XYZ.prototype.initialize.apply(this,[a.name||"Bing "+(a.type||this.type),null,a]);this.tileOptions=OpenLayers.Util.extend({crossOriginKeyword:"anonymous"},this.options.tileOptions);this.loadMetadata()},loadMetadata:function(){this._callbackId=
-"_callback_"+this.id.replace(/\./g,"_");window[this._callbackId]=OpenLayers.Function.bind(OpenLayers.Layer.Bing.processMetadata,this);var a=OpenLayers.Util.applyDefaults({key:this.key,jsonp:this._callbackId,include:"ImageryProviders"},this.metadataParams),a=this.protocol+"//dev.virtualearth.net/REST/v1/Imagery/Metadata/"+this.type+"?"+OpenLayers.Util.getParameterString(a),b=document.createElement("script");b.type="text/javascript";b.src=a;b.id=this._callbackId;document.getElementsByTagName("head")[0].appendChild(b)},
-initLayer:function(){var a=this.metadata.resourceSets[0].resources[0],b=a.imageUrl.replace("{quadkey}","${quadkey}"),b=b.replace("{culture}",this.culture),b=b.replace(this.protocolRegex,this.protocol);this.url=[];for(var c=0;c<a.imageUrlSubdomains.length;++c)this.url.push(b.replace("{subdomain}",a.imageUrlSubdomains[c]));this.addOptions({maxResolution:Math.min(this.serverResolutions[a.zoomMin],this.maxResolution||Number.POSITIVE_INFINITY),numZoomLevels:Math.min(a.zoomMax+1-a.zoomMin,this.numZoomLevels)},
-!0);this.isBaseLayer||this.redraw();this.updateAttribution()},getURL:function(a){if(this.url){var b=this.getXYZ(a);a=b.x;for(var c=b.y,b=b.z,d=[],e=b;0<e;--e){var f="0",g=1<<e-1;0!=(a&g)&&f++;0!=(c&g)&&(f++,f++);d.push(f)}d=d.join("");a=this.selectUrl(""+a+c+b,this.url);return OpenLayers.String.format(a,{quadkey:d})}},updateAttribution:function(){var a=this.metadata;if(a.resourceSets&&this.map&&this.map.center){var b=a.resourceSets[0].resources[0],c=this.map.getExtent().transform(this.map.getProjectionObject(),
-new OpenLayers.Projection("EPSG:4326")),d=b.imageryProviders||[],e=OpenLayers.Util.indexOf(this.serverResolutions,this.getServerResolution()),b="",f,g,h,k,l,m,n;g=0;for(h=d.length;g<h;++g)for(f=d[g],k=0,l=f.coverageAreas.length;k<l;++k)n=f.coverageAreas[k],m=OpenLayers.Bounds.fromArray(n.bbox,!0),c.intersectsBounds(m)&&(e<=n.zoomMax&&e>=n.zoomMin)&&(b+=f.attribution+" ");a=a.brandLogoUri.replace(this.protocolRegex,this.protocol);this.attribution=OpenLayers.String.format(this.attributionTemplate,{type:this.type.toLowerCase(),
-logo:a,copyrights:b});this.map&&this.map.events.triggerEvent("changelayer",{layer:this,property:"attribution"})}},setMap:function(){OpenLayers.Layer.XYZ.prototype.setMap.apply(this,arguments);this.map.events.register("moveend",this,this.updateAttribution)},clone:function(a){null==a&&(a=new OpenLayers.Layer.Bing(this.options));return a=OpenLayers.Layer.XYZ.prototype.clone.apply(this,[a])},destroy:function(){this.map&&this.map.events.unregister("moveend",this,this.updateAttribution);OpenLayers.Layer.XYZ.prototype.destroy.apply(this,
-arguments)},CLASS_NAME:"OpenLayers.Layer.Bing"});OpenLayers.Layer.Bing.processMetadata=function(a){this.metadata=a;this.initLayer();a=document.getElementById(this._callbackId);a.parentNode.removeChild(a);window[this._callbackId]=void 0;delete this._callbackId};OpenLayers.StyleMap=OpenLayers.Class({styles:null,extendDefault:!0,initialize:function(a,b){this.styles={"default":new OpenLayers.Style(OpenLayers.Feature.Vector.style["default"]),select:new OpenLayers.Style(OpenLayers.Feature.Vector.style.select),temporary:new OpenLayers.Style(OpenLayers.Feature.Vector.style.temporary),"delete":new OpenLayers.Style(OpenLayers.Feature.Vector.style["delete"])};if(a instanceof OpenLayers.Style)this.styles["default"]=a,this.styles.select=a,this.styles.temporary=a,this.styles["delete"]=
-a;else if("object"==typeof a)for(var c in a)if(a[c]instanceof OpenLayers.Style)this.styles[c]=a[c];else if("object"==typeof a[c])this.styles[c]=new OpenLayers.Style(a[c]);else{this.styles["default"]=new OpenLayers.Style(a);this.styles.select=new OpenLayers.Style(a);this.styles.temporary=new OpenLayers.Style(a);this.styles["delete"]=new OpenLayers.Style(a);break}OpenLayers.Util.extend(this,b)},destroy:function(){for(var a in this.styles)this.styles[a].destroy();this.styles=null},createSymbolizer:function(a,
-b){a||(a=new OpenLayers.Feature.Vector);this.styles[b]||(b="default");a.renderIntent=b;var c={};this.extendDefault&&"default"!=b&&(c=this.styles["default"].createSymbolizer(a));return OpenLayers.Util.extend(c,this.styles[b].createSymbolizer(a))},addUniqueValueRules:function(a,b,c,d){var e=[],f;for(f in c)e.push(new OpenLayers.Rule({symbolizer:c[f],context:d,filter:new OpenLayers.Filter.Comparison({type:OpenLayers.Filter.Comparison.EQUAL_TO,property:b,value:f})}));this.styles[a].addRules(e)},CLASS_NAME:"OpenLayers.StyleMap"});OpenLayers.Layer.Vector=OpenLayers.Class(OpenLayers.Layer,{isBaseLayer:!1,isFixed:!1,features:null,filter:null,selectedFeatures:null,unrenderedFeatures:null,reportError:!0,style:null,styleMap:null,strategies:null,protocol:null,renderers:["SVG","VML","Canvas"],renderer:null,rendererOptions:null,geometryType:null,drawn:!1,ratio:1,initialize:function(a,b){OpenLayers.Layer.prototype.initialize.apply(this,arguments);this.renderer&&this.renderer.supported()||this.assignRenderer();this.renderer&&this.renderer.supported()||
-(this.renderer=null,this.displayError());this.styleMap||(this.styleMap=new OpenLayers.StyleMap);this.features=[];this.selectedFeatures=[];this.unrenderedFeatures={};if(this.strategies)for(var c=0,d=this.strategies.length;c<d;c++)this.strategies[c].setLayer(this)},destroy:function(){if(this.strategies){var a,b,c;b=0;for(c=this.strategies.length;b<c;b++)a=this.strategies[b],a.autoDestroy&&a.destroy();this.strategies=null}this.protocol&&(this.protocol.autoDestroy&&this.protocol.destroy(),this.protocol=
-null);this.destroyFeatures();this.unrenderedFeatures=this.selectedFeatures=this.features=null;this.renderer&&this.renderer.destroy();this.drawn=this.geometryType=this.renderer=null;OpenLayers.Layer.prototype.destroy.apply(this,arguments)},clone:function(a){null==a&&(a=new OpenLayers.Layer.Vector(this.name,this.getOptions()));a=OpenLayers.Layer.prototype.clone.apply(this,[a]);for(var b=this.features,c=b.length,d=Array(c),e=0;e<c;++e)d[e]=b[e].clone();a.features=d;return a},refresh:function(a){this.calculateInRange()&&
-this.visibility&&this.events.triggerEvent("refresh",a)},assignRenderer:function(){for(var a=0,b=this.renderers.length;a<b;a++){var c=this.renderers[a];if((c="function"==typeof c?c:OpenLayers.Renderer[c])&&c.prototype.supported()){this.renderer=new c(this.div,this.rendererOptions);break}}},displayError:function(){this.reportError&&OpenLayers.Console.userError(OpenLayers.i18n("browserNotSupported",{renderers:this.renderers.join("\n")}))},setMap:function(a){OpenLayers.Layer.prototype.setMap.apply(this,
-arguments);if(this.renderer){this.renderer.map=this.map;var b=this.map.getSize();b.w*=this.ratio;b.h*=this.ratio;this.renderer.setSize(b)}else this.map.removeLayer(this)},afterAdd:function(){if(this.strategies){var a,b,c;b=0;for(c=this.strategies.length;b<c;b++)a=this.strategies[b],a.autoActivate&&a.activate()}},removeMap:function(a){this.drawn=!1;if(this.strategies){var b,c;b=0;for(c=this.strategies.length;b<c;b++)a=this.strategies[b],a.autoActivate&&a.deactivate()}},onMapResize:function(){OpenLayers.Layer.prototype.onMapResize.apply(this,
-arguments);var a=this.map.getSize();a.w*=this.ratio;a.h*=this.ratio;this.renderer.setSize(a)},moveTo:function(a,b,c){OpenLayers.Layer.prototype.moveTo.apply(this,arguments);var d=!0;if(!c){this.renderer.root.style.visibility="hidden";var d=this.map.getSize(),e=d.w,d=d.h,e=e/2*this.ratio-e/2,d=d/2*this.ratio-d/2,e=e+this.map.layerContainerOriginPx.x,e=-Math.round(e),d=d+this.map.layerContainerOriginPx.y,d=-Math.round(d);this.div.style.left=e+"px";this.div.style.top=d+"px";e=this.map.getExtent().scale(this.ratio);
-d=this.renderer.setExtent(e,b);this.renderer.root.style.visibility="visible";!0===OpenLayers.IS_GECKO&&(this.div.scrollLeft=this.div.scrollLeft);if(!b&&d)for(var f in this.unrenderedFeatures)e=this.unrenderedFeatures[f],this.drawFeature(e)}if(!this.drawn||b||!d)for(this.drawn=!0,f=0,d=this.features.length;f<d;f++)this.renderer.locked=f!==d-1,e=this.features[f],this.drawFeature(e)},display:function(a){OpenLayers.Layer.prototype.display.apply(this,arguments);var b=this.div.style.display;b!=this.renderer.root.style.display&&
-(this.renderer.root.style.display=b)},addFeatures:function(a,b){OpenLayers.Util.isArray(a)||(a=[a]);var c=!b||!b.silent;if(c){var d={features:a};if(!1===this.events.triggerEvent("beforefeaturesadded",d))return;a=d.features}for(var d=[],e=0,f=a.length;e<f;e++){this.renderer.locked=e!=a.length-1?!0:!1;var g=a[e];if(this.geometryType&&!(g.geometry instanceof this.geometryType))throw new TypeError("addFeatures: component should be an "+this.geometryType.prototype.CLASS_NAME);g.layer=this;!g.style&&this.style&&
-(g.style=OpenLayers.Util.extend({},this.style));if(c){if(!1===this.events.triggerEvent("beforefeatureadded",{feature:g}))continue;this.preFeatureInsert(g)}d.push(g);this.features.push(g);this.drawFeature(g);c&&(this.events.triggerEvent("featureadded",{feature:g}),this.onFeatureInsert(g))}c&&this.events.triggerEvent("featuresadded",{features:d})},removeFeatures:function(a,b){if(a&&0!==a.length){if(a===this.features)return this.removeAllFeatures(b);OpenLayers.Util.isArray(a)||(a=[a]);a===this.selectedFeatures&&
-(a=a.slice());var c=!b||!b.silent;c&&this.events.triggerEvent("beforefeaturesremoved",{features:a});for(var d=a.length-1;0<=d;d--){this.renderer.locked=0!=d&&a[d-1].geometry?!0:!1;var e=a[d];delete this.unrenderedFeatures[e.id];c&&this.events.triggerEvent("beforefeatureremoved",{feature:e});this.features=OpenLayers.Util.removeItem(this.features,e);e.layer=null;e.geometry&&this.renderer.eraseFeatures(e);-1!=OpenLayers.Util.indexOf(this.selectedFeatures,e)&&OpenLayers.Util.removeItem(this.selectedFeatures,
-e);c&&this.events.triggerEvent("featureremoved",{feature:e})}c&&this.events.triggerEvent("featuresremoved",{features:a})}},removeAllFeatures:function(a){a=!a||!a.silent;var b=this.features;a&&this.events.triggerEvent("beforefeaturesremoved",{features:b});for(var c,d=b.length-1;0<=d;d--)c=b[d],a&&this.events.triggerEvent("beforefeatureremoved",{feature:c}),c.layer=null,a&&this.events.triggerEvent("featureremoved",{feature:c});this.renderer.clear();this.features=[];this.unrenderedFeatures={};this.selectedFeatures=
-[];a&&this.events.triggerEvent("featuresremoved",{features:b})},destroyFeatures:function(a,b){void 0==a&&(a=this.features);if(a){this.removeFeatures(a,b);for(var c=a.length-1;0<=c;c--)a[c].destroy()}},drawFeature:function(a,b){if(this.drawn){if("object"!=typeof b){b||a.state!==OpenLayers.State.DELETE||(b="delete");var c=b||a.renderIntent;(b=a.style||this.style)||(b=this.styleMap.createSymbolizer(a,c))}c=this.renderer.drawFeature(a,b);!1===c||null===c?this.unrenderedFeatures[a.id]=a:delete this.unrenderedFeatures[a.id]}},
-eraseFeatures:function(a){this.renderer.eraseFeatures(a)},getFeatureFromEvent:function(a){if(!this.renderer)throw Error("getFeatureFromEvent called on layer with no renderer. This usually means you destroyed a layer, but not some handler which is associated with it.");var b=null;(a=this.renderer.getFeatureIdFromEvent(a))&&(b="string"===typeof a?this.getFeatureById(a):a);return b},getFeatureBy:function(a,b){for(var c=null,d=0,e=this.features.length;d<e;++d)if(this.features[d][a]==b){c=this.features[d];
-break}return c},getFeatureById:function(a){return this.getFeatureBy("id",a)},getFeatureByFid:function(a){return this.getFeatureBy("fid",a)},getFeaturesByAttribute:function(a,b){var c,d,e=this.features.length,f=[];for(c=0;c<e;c++)(d=this.features[c])&&d.attributes&&d.attributes[a]===b&&f.push(d);return f},onFeatureInsert:function(a){},preFeatureInsert:function(a){},getDataExtent:function(){var a=null,b=this.features;if(b&&0<b.length)for(var c=null,d=0,e=b.length;d<e;d++)if(c=b[d].geometry)null===a&&
-(a=new OpenLayers.Bounds),a.extend(c.getBounds());return a},CLASS_NAME:"OpenLayers.Layer.Vector"});OpenLayers.Layer.PointGrid=OpenLayers.Class(OpenLayers.Layer.Vector,{dx:null,dy:null,ratio:1.5,maxFeatures:250,rotation:0,origin:null,gridBounds:null,initialize:function(a){a=a||{};OpenLayers.Layer.Vector.prototype.initialize.apply(this,[a.name,a])},setMap:function(a){OpenLayers.Layer.Vector.prototype.setMap.apply(this,arguments);a.events.register("moveend",this,this.onMoveEnd)},removeMap:function(a){a.events.unregister("moveend",this,this.onMoveEnd);OpenLayers.Layer.Vector.prototype.removeMap.apply(this,
-arguments)},setRatio:function(a){this.ratio=a;this.updateGrid(!0)},setMaxFeatures:function(a){this.maxFeatures=a;this.updateGrid(!0)},setSpacing:function(a,b){this.dx=a;this.dy=b||a;this.updateGrid(!0)},setOrigin:function(a){this.origin=a;this.updateGrid(!0)},getOrigin:function(){this.origin||(this.origin=this.map.getExtent().getCenterLonLat());return this.origin},setRotation:function(a){this.rotation=a;this.updateGrid(!0)},onMoveEnd:function(){this.updateGrid()},getViewBounds:function(){var a=this.map.getExtent();
-if(this.rotation){var b=this.getOrigin(),b=new OpenLayers.Geometry.Point(b.lon,b.lat),a=a.toGeometry();a.rotate(-this.rotation,b);a=a.getBounds()}return a},updateGrid:function(a){if(a||this.invalidBounds()){var b=this.getViewBounds(),c=this.getOrigin();a=new OpenLayers.Geometry.Point(c.lon,c.lat);var d=b.getWidth(),e=b.getHeight(),f=d/e,g=Math.sqrt(this.dx*this.dy*this.maxFeatures/f),d=Math.min(d*this.ratio,g*f),e=Math.min(e*this.ratio,g),b=b.getCenterLonLat();this.gridBounds=new OpenLayers.Bounds(b.lon-
-d/2,b.lat-e/2,b.lon+d/2,b.lat+e/2);for(var b=Math.floor(e/this.dy),d=Math.floor(d/this.dx),e=c.lon+this.dx*Math.ceil((this.gridBounds.left-c.lon)/this.dx),c=c.lat+this.dy*Math.ceil((this.gridBounds.bottom-c.lat)/this.dy),g=Array(b*d),h,k=0;k<d;++k)for(var f=e+k*this.dx,l=0;l<b;++l)h=c+l*this.dy,h=new OpenLayers.Geometry.Point(f,h),this.rotation&&h.rotate(this.rotation,a),g[k*b+l]=new OpenLayers.Feature.Vector(h);this.destroyFeatures(this.features,{silent:!0});this.addFeatures(g,{silent:!0})}},invalidBounds:function(){return!this.gridBounds||
-!this.gridBounds.containsBounds(this.getViewBounds())},CLASS_NAME:"OpenLayers.Layer.PointGrid"});OpenLayers.Handler.MouseWheel=OpenLayers.Class(OpenLayers.Handler,{wheelListener:null,interval:0,maxDelta:Number.POSITIVE_INFINITY,delta:0,cumulative:!0,initialize:function(a,b,c){OpenLayers.Handler.prototype.initialize.apply(this,arguments);this.wheelListener=OpenLayers.Function.bindAsEventListener(this.onWheelEvent,this)},destroy:function(){OpenLayers.Handler.prototype.destroy.apply(this,arguments);this.wheelListener=null},onWheelEvent:function(a){if(this.map&&this.checkModifiers(a)){for(var b=
-!1,c=!1,d=!1,e=OpenLayers.Event.element(a);null!=e&&!d&&!b;){if(!b)try{var f,b=(f=e.currentStyle?e.currentStyle.overflow:document.defaultView.getComputedStyle(e,null).getPropertyValue("overflow"))&&"auto"==f||"scroll"==f}catch(g){}if(!c&&(c=OpenLayers.Element.hasClass(e,"olScrollable"),!c))for(var d=0,h=this.map.layers.length;d<h;d++){var k=this.map.layers[d];if(e==k.div||e==k.pane){c=!0;break}}d=e==this.map.div;e=e.parentNode}if(!b&&d){if(c)if(b=0,a.wheelDelta?(b=a.wheelDelta,0===b%160&&(b*=0.75),
-b/=120):a.detail&&(b=-(a.detail/Math.abs(a.detail))),this.delta+=b,window.clearTimeout(this._timeoutId),this.interval&&Math.abs(this.delta)<this.maxDelta){var l=OpenLayers.Util.extend({},a);this._timeoutId=window.setTimeout(OpenLayers.Function.bind(function(){this.wheelZoom(l)},this),this.interval)}else this.wheelZoom(a);OpenLayers.Event.stop(a)}}},wheelZoom:function(a){var b=this.delta;this.delta=0;b&&(a.xy=this.map.events.getMousePosition(a),0>b?this.callback("down",[a,this.cumulative?Math.max(-this.maxDelta,
-b):-1]):this.callback("up",[a,this.cumulative?Math.min(this.maxDelta,b):1]))},activate:function(a){if(OpenLayers.Handler.prototype.activate.apply(this,arguments)){var b=this.wheelListener;OpenLayers.Event.observe(window,"DOMMouseScroll",b);OpenLayers.Event.observe(window,"mousewheel",b);OpenLayers.Event.observe(document,"mousewheel",b);return!0}return!1},deactivate:function(a){if(OpenLayers.Handler.prototype.deactivate.apply(this,arguments)){var b=this.wheelListener;OpenLayers.Event.stopObserving(window,
-"DOMMouseScroll",b);OpenLayers.Event.stopObserving(window,"mousewheel",b);OpenLayers.Event.stopObserving(document,"mousewheel",b);return!0}return!1},CLASS_NAME:"OpenLayers.Handler.MouseWheel"});OpenLayers.Symbolizer=OpenLayers.Class({zIndex:0,initialize:function(a){OpenLayers.Util.extend(this,a)},clone:function(){return new (eval(this.CLASS_NAME))(OpenLayers.Util.extend({},this))},CLASS_NAME:"OpenLayers.Symbolizer"});OpenLayers.Symbolizer.Raster=OpenLayers.Class(OpenLayers.Symbolizer,{initialize:function(a){OpenLayers.Symbolizer.prototype.initialize.apply(this,arguments)},CLASS_NAME:"OpenLayers.Symbolizer.Raster"});OpenLayers.Rule=OpenLayers.Class({id:null,name:null,title:null,description:null,context:null,filter:null,elseFilter:!1,symbolizer:null,symbolizers:null,minScaleDenominator:null,maxScaleDenominator:null,initialize:function(a){this.symbolizer={};OpenLayers.Util.extend(this,a);this.symbolizers&&delete this.symbolizer;this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_")},destroy:function(){for(var a in this.symbolizer)this.symbolizer[a]=null;this.symbolizer=null;delete this.symbolizers},evaluate:function(a){var b=
-this.getContext(a),c=!0;if(this.minScaleDenominator||this.maxScaleDenominator)var d=a.layer.map.getScale();this.minScaleDenominator&&(c=d>=OpenLayers.Style.createLiteral(this.minScaleDenominator,b));c&&this.maxScaleDenominator&&(c=d<OpenLayers.Style.createLiteral(this.maxScaleDenominator,b));c&&this.filter&&(c="OpenLayers.Filter.FeatureId"==this.filter.CLASS_NAME?this.filter.evaluate(a):this.filter.evaluate(b));return c},getContext:function(a){var b=this.context;b||(b=a.attributes||a.data);"function"==
-typeof this.context&&(b=this.context(a));return b},clone:function(){var a=OpenLayers.Util.extend({},this);if(this.symbolizers){var b=this.symbolizers.length;a.symbolizers=Array(b);for(var c=0;c<b;++c)a.symbolizers[c]=this.symbolizers[c].clone()}else{a.symbolizer={};for(var d in this.symbolizer)b=this.symbolizer[d],c=typeof b,"object"===c?a.symbolizer[d]=OpenLayers.Util.extend({},b):"string"===c&&(a.symbolizer[d]=b)}a.filter=this.filter&&this.filter.clone();a.context=this.context&&OpenLayers.Util.extend({},
-this.context);return new OpenLayers.Rule(a)},CLASS_NAME:"OpenLayers.Rule"});OpenLayers.Format.SLD=OpenLayers.Class(OpenLayers.Format.XML.VersionedOGC,{profile:null,defaultVersion:"1.0.0",stringifyOutput:!0,namedLayersAsArray:!1,CLASS_NAME:"OpenLayers.Format.SLD"});OpenLayers.Symbolizer.Polygon=OpenLayers.Class(OpenLayers.Symbolizer,{initialize:function(a){OpenLayers.Symbolizer.prototype.initialize.apply(this,arguments)},CLASS_NAME:"OpenLayers.Symbolizer.Polygon"});OpenLayers.Format.GML.v2=OpenLayers.Class(OpenLayers.Format.GML.Base,{schemaLocation:"http://www.opengis.net/gml http://schemas.opengis.net/gml/2.1.2/feature.xsd",initialize:function(a){OpenLayers.Format.GML.Base.prototype.initialize.apply(this,[a])},readers:{gml:OpenLayers.Util.applyDefaults({outerBoundaryIs:function(a,b){var c={};this.readChildNodes(a,c);b.outer=c.components[0]},innerBoundaryIs:function(a,b){var c={};this.readChildNodes(a,c);b.inner.push(c.components[0])},Box:function(a,b){var c=
-{};this.readChildNodes(a,c);b.components||(b.components=[]);var d=c.points[0],c=c.points[1];b.components.push(new OpenLayers.Bounds(d.x,d.y,c.x,c.y))}},OpenLayers.Format.GML.Base.prototype.readers.gml),feature:OpenLayers.Format.GML.Base.prototype.readers.feature,wfs:OpenLayers.Format.GML.Base.prototype.readers.wfs},write:function(a){var b;b=OpenLayers.Util.isArray(a)?"wfs:FeatureCollection":"gml:featureMember";a=this.writeNode(b,a);this.setAttributeNS(a,this.namespaces.xsi,"xsi:schemaLocation",this.schemaLocation);
-return OpenLayers.Format.XML.prototype.write.apply(this,[a])},writers:{gml:OpenLayers.Util.applyDefaults({Point:function(a){var b=this.createElementNSPlus("gml:Point");this.writeNode("coordinates",[a],b);return b},coordinates:function(a){for(var b=a.length,c=Array(b),d,e=0;e<b;++e)d=a[e],c[e]=this.xy?d.x+","+d.y:d.y+","+d.x,void 0!=d.z&&(c[e]+=","+d.z);return this.createElementNSPlus("gml:coordinates",{attributes:{decimal:".",cs:",",ts:" "},value:1==b?c[0]:c.join(" ")})},LineString:function(a){var b=
-this.createElementNSPlus("gml:LineString");this.writeNode("coordinates",a.components,b);return b},Polygon:function(a){var b=this.createElementNSPlus("gml:Polygon");this.writeNode("outerBoundaryIs",a.components[0],b);for(var c=1;c<a.components.length;++c)this.writeNode("innerBoundaryIs",a.components[c],b);return b},outerBoundaryIs:function(a){var b=this.createElementNSPlus("gml:outerBoundaryIs");this.writeNode("LinearRing",a,b);return b},innerBoundaryIs:function(a){var b=this.createElementNSPlus("gml:innerBoundaryIs");
-this.writeNode("LinearRing",a,b);return b},LinearRing:function(a){var b=this.createElementNSPlus("gml:LinearRing");this.writeNode("coordinates",a.components,b);return b},Box:function(a){var b=this.createElementNSPlus("gml:Box");this.writeNode("coordinates",[{x:a.left,y:a.bottom},{x:a.right,y:a.top}],b);this.srsName&&b.setAttribute("srsName",this.srsName);return b}},OpenLayers.Format.GML.Base.prototype.writers.gml),feature:OpenLayers.Format.GML.Base.prototype.writers.feature,wfs:OpenLayers.Format.GML.Base.prototype.writers.wfs},
-CLASS_NAME:"OpenLayers.Format.GML.v2"});OpenLayers.Format.Filter.v1_0_0=OpenLayers.Class(OpenLayers.Format.GML.v2,OpenLayers.Format.Filter.v1,{VERSION:"1.0.0",schemaLocation:"http://www.opengis.net/ogc/filter/1.0.0/filter.xsd",initialize:function(a){OpenLayers.Format.GML.v2.prototype.initialize.apply(this,[a])},readers:{ogc:OpenLayers.Util.applyDefaults({PropertyIsEqualTo:function(a,b){var c=new OpenLayers.Filter.Comparison({type:OpenLayers.Filter.Comparison.EQUAL_TO});this.readChildNodes(a,c);b.filters.push(c)},PropertyIsNotEqualTo:function(a,
-b){var c=new OpenLayers.Filter.Comparison({type:OpenLayers.Filter.Comparison.NOT_EQUAL_TO});this.readChildNodes(a,c);b.filters.push(c)},PropertyIsLike:function(a,b){var c=new OpenLayers.Filter.Comparison({type:OpenLayers.Filter.Comparison.LIKE});this.readChildNodes(a,c);var d=a.getAttribute("wildCard"),e=a.getAttribute("singleChar"),f=a.getAttribute("escape");c.value2regex(d,e,f);b.filters.push(c)}},OpenLayers.Format.Filter.v1.prototype.readers.ogc),gml:OpenLayers.Format.GML.v2.prototype.readers.gml,
-feature:OpenLayers.Format.GML.v2.prototype.readers.feature},writers:{ogc:OpenLayers.Util.applyDefaults({PropertyIsEqualTo:function(a){var b=this.createElementNSPlus("ogc:PropertyIsEqualTo");this.writeNode("PropertyName",a,b);this.writeOgcExpression(a.value,b);return b},PropertyIsNotEqualTo:function(a){var b=this.createElementNSPlus("ogc:PropertyIsNotEqualTo");this.writeNode("PropertyName",a,b);this.writeOgcExpression(a.value,b);return b},PropertyIsLike:function(a){var b=this.createElementNSPlus("ogc:PropertyIsLike",
-{attributes:{wildCard:"*",singleChar:".",escape:"!"}});this.writeNode("PropertyName",a,b);this.writeNode("Literal",a.regex2value(),b);return b},BBOX:function(a){var b=this.createElementNSPlus("ogc:BBOX");a.property&&this.writeNode("PropertyName",a,b);var c=this.writeNode("gml:Box",a.value,b);a.projection&&c.setAttribute("srsName",a.projection);return b}},OpenLayers.Format.Filter.v1.prototype.writers.ogc),gml:OpenLayers.Format.GML.v2.prototype.writers.gml,feature:OpenLayers.Format.GML.v2.prototype.writers.feature},
-writeSpatial:function(a,b){var c=this.createElementNSPlus("ogc:"+b);this.writeNode("PropertyName",a,c);if(a.value instanceof OpenLayers.Filter.Function)this.writeNode("Function",a.value,c);else{var d;d=a.value instanceof OpenLayers.Geometry?this.writeNode("feature:_geometry",a.value).firstChild:this.writeNode("gml:Box",a.value);a.projection&&d.setAttribute("srsName",a.projection);c.appendChild(d)}return c},CLASS_NAME:"OpenLayers.Format.Filter.v1_0_0"});OpenLayers.Format.WFST.v1_0_0=OpenLayers.Class(OpenLayers.Format.Filter.v1_0_0,OpenLayers.Format.WFST.v1,{version:"1.0.0",srsNameInQuery:!1,schemaLocations:{wfs:"http://schemas.opengis.net/wfs/1.0.0/WFS-transaction.xsd"},initialize:function(a){OpenLayers.Format.Filter.v1_0_0.prototype.initialize.apply(this,[a]);OpenLayers.Format.WFST.v1.prototype.initialize.apply(this,[a])},readNode:function(a,b,c){return OpenLayers.Format.GML.v2.prototype.readNode.apply(this,arguments)},readers:{wfs:OpenLayers.Util.applyDefaults({WFS_TransactionResponse:function(a,
-b){b.insertIds=[];b.success=!1;this.readChildNodes(a,b)},InsertResult:function(a,b){var c={fids:[]};this.readChildNodes(a,c);b.insertIds=b.insertIds.concat(c.fids)},TransactionResult:function(a,b){this.readChildNodes(a,b)},Status:function(a,b){this.readChildNodes(a,b)},SUCCESS:function(a,b){b.success=!0}},OpenLayers.Format.WFST.v1.prototype.readers.wfs),gml:OpenLayers.Format.GML.v2.prototype.readers.gml,feature:OpenLayers.Format.GML.v2.prototype.readers.feature,ogc:OpenLayers.Format.Filter.v1_0_0.prototype.readers.ogc},
-writers:{wfs:OpenLayers.Util.applyDefaults({Query:function(a){a=OpenLayers.Util.extend({featureNS:this.featureNS,featurePrefix:this.featurePrefix,featureType:this.featureType,srsName:this.srsName,srsNameInQuery:this.srsNameInQuery},a);var b=a.featurePrefix,c=this.createElementNSPlus("wfs:Query",{attributes:{typeName:(b?b+":":"")+a.featureType}});a.srsNameInQuery&&a.srsName&&c.setAttribute("srsName",a.srsName);a.featureNS&&c.setAttribute("xmlns:"+b,a.featureNS);if(a.propertyNames)for(var b=0,d=a.propertyNames.length;b<
-d;b++)this.writeNode("ogc:PropertyName",{property:a.propertyNames[b]},c);a.filter&&(this.setFilterProperty(a.filter),this.writeNode("ogc:Filter",a.filter,c));return c}},OpenLayers.Format.WFST.v1.prototype.writers.wfs),gml:OpenLayers.Format.GML.v2.prototype.writers.gml,feature:OpenLayers.Format.GML.v2.prototype.writers.feature,ogc:OpenLayers.Format.Filter.v1_0_0.prototype.writers.ogc},CLASS_NAME:"OpenLayers.Format.WFST.v1_0_0"});OpenLayers.ElementsIndexer=OpenLayers.Class({maxZIndex:null,order:null,indices:null,compare:null,initialize:function(a){this.compare=a?OpenLayers.ElementsIndexer.IndexingMethods.Z_ORDER_Y_ORDER:OpenLayers.ElementsIndexer.IndexingMethods.Z_ORDER_DRAWING_ORDER;this.clear()},insert:function(a){this.exists(a)&&this.remove(a);var b=a.id;this.determineZIndex(a);for(var c=-1,d=this.order.length,e;1<d-c;)e=parseInt((c+d)/2),0<this.compare(this,a,OpenLayers.Util.getElement(this.order[e]))?c=e:d=e;this.order.splice(d,
-0,b);this.indices[b]=this.getZIndex(a);return this.getNextElement(d)},remove:function(a){a=a.id;var b=OpenLayers.Util.indexOf(this.order,a);0<=b&&(this.order.splice(b,1),delete this.indices[a],this.maxZIndex=0<this.order.length?this.indices[this.order[this.order.length-1]]:0)},clear:function(){this.order=[];this.indices={};this.maxZIndex=0},exists:function(a){return null!=this.indices[a.id]},getZIndex:function(a){return a._style.graphicZIndex},determineZIndex:function(a){var b=a._style.graphicZIndex;
-null==b?(b=this.maxZIndex,a._style.graphicZIndex=b):b>this.maxZIndex&&(this.maxZIndex=b)},getNextElement:function(a){a+=1;if(a<this.order.length){var b=OpenLayers.Util.getElement(this.order[a]);void 0==b&&(b=this.getNextElement(a));return b}return null},CLASS_NAME:"OpenLayers.ElementsIndexer"});
-OpenLayers.ElementsIndexer.IndexingMethods={Z_ORDER:function(a,b,c){b=a.getZIndex(b);var d=0;c&&(a=a.getZIndex(c),d=b-a);return d},Z_ORDER_DRAWING_ORDER:function(a,b,c){a=OpenLayers.ElementsIndexer.IndexingMethods.Z_ORDER(a,b,c);c&&0==a&&(a=1);return a},Z_ORDER_Y_ORDER:function(a,b,c){a=OpenLayers.ElementsIndexer.IndexingMethods.Z_ORDER(a,b,c);c&&0===a&&(b=c._boundsBottom-b._boundsBottom,a=0===b?1:b);return a}};
-OpenLayers.Renderer.Elements=OpenLayers.Class(OpenLayers.Renderer,{rendererRoot:null,root:null,vectorRoot:null,textRoot:null,xmlns:null,xOffset:0,indexer:null,BACKGROUND_ID_SUFFIX:"_background",LABEL_ID_SUFFIX:"_label",LABEL_OUTLINE_SUFFIX:"_outline",initialize:function(a,b){OpenLayers.Renderer.prototype.initialize.apply(this,arguments);this.rendererRoot=this.createRenderRoot();this.root=this.createRoot("_root");this.vectorRoot=this.createRoot("_vroot");this.textRoot=this.createRoot("_troot");this.root.appendChild(this.vectorRoot);
-this.root.appendChild(this.textRoot);this.rendererRoot.appendChild(this.root);this.container.appendChild(this.rendererRoot);b&&(b.zIndexing||b.yOrdering)&&(this.indexer=new OpenLayers.ElementsIndexer(b.yOrdering))},destroy:function(){this.clear();this.xmlns=this.root=this.rendererRoot=null;OpenLayers.Renderer.prototype.destroy.apply(this,arguments)},clear:function(){var a,b=this.vectorRoot;if(b)for(;a=b.firstChild;)b.removeChild(a);if(b=this.textRoot)for(;a=b.firstChild;)b.removeChild(a);this.indexer&&
-this.indexer.clear()},setExtent:function(a,b){var c=OpenLayers.Renderer.prototype.setExtent.apply(this,arguments),d=this.getResolution();if(this.map.baseLayer&&this.map.baseLayer.wrapDateLine){var e,f=a.getWidth()/this.map.getExtent().getWidth();a=a.scale(1/f);f=this.map.getMaxExtent();f.right>a.left&&f.right<a.right?e=!0:f.left>a.left&&f.left<a.right&&(e=!1);if(e!==this.rightOfDateLine||b)c=!1,this.xOffset=!0===e?f.getWidth()/d:0;this.rightOfDateLine=e}return c},getNodeType:function(a,b){},drawGeometry:function(a,
-b,c){var d=a.CLASS_NAME,e=!0;if("OpenLayers.Geometry.Collection"==d||"OpenLayers.Geometry.MultiPoint"==d||"OpenLayers.Geometry.MultiLineString"==d||"OpenLayers.Geometry.MultiPolygon"==d){for(var d=0,f=a.components.length;d<f;d++)e=this.drawGeometry(a.components[d],b,c)&&e;return e}d=e=!1;"none"!=b.display&&(b.backgroundGraphic?this.redrawBackgroundNode(a.id,a,b,c):d=!0,e=this.redrawNode(a.id,a,b,c));!1==e&&(b=document.getElementById(a.id))&&(b._style.backgroundGraphic&&(d=!0),b.parentNode.removeChild(b));
-d&&(b=document.getElementById(a.id+this.BACKGROUND_ID_SUFFIX))&&b.parentNode.removeChild(b);return e},redrawNode:function(a,b,c,d){c=this.applyDefaultSymbolizer(c);a=this.nodeFactory(a,this.getNodeType(b,c));a._featureId=d;a._boundsBottom=b.getBounds().bottom;a._geometryClass=b.CLASS_NAME;a._style=c;b=this.drawGeometryNode(a,b,c);if(!1===b)return!1;a=b.node;this.indexer?(c=this.indexer.insert(a))?this.vectorRoot.insertBefore(a,c):this.vectorRoot.appendChild(a):a.parentNode!==this.vectorRoot&&this.vectorRoot.appendChild(a);
-this.postDraw(a);return b.complete},redrawBackgroundNode:function(a,b,c,d){c=OpenLayers.Util.extend({},c);c.externalGraphic=c.backgroundGraphic;c.graphicXOffset=c.backgroundXOffset;c.graphicYOffset=c.backgroundYOffset;c.graphicZIndex=c.backgroundGraphicZIndex;c.graphicWidth=c.backgroundWidth||c.graphicWidth;c.graphicHeight=c.backgroundHeight||c.graphicHeight;c.backgroundGraphic=null;c.backgroundXOffset=null;c.backgroundYOffset=null;c.backgroundGraphicZIndex=null;return this.redrawNode(a+this.BACKGROUND_ID_SUFFIX,
-b,c,null)},drawGeometryNode:function(a,b,c){c=c||a._style;var d={isFilled:void 0===c.fill?!0:c.fill,isStroked:void 0===c.stroke?!!c.strokeWidth:c.stroke},e;switch(b.CLASS_NAME){case "OpenLayers.Geometry.Point":!1===c.graphic&&(d.isFilled=!1,d.isStroked=!1);e=this.drawPoint(a,b);break;case "OpenLayers.Geometry.LineString":d.isFilled=!1;e=this.drawLineString(a,b);break;case "OpenLayers.Geometry.LinearRing":e=this.drawLinearRing(a,b);break;case "OpenLayers.Geometry.Polygon":e=this.drawPolygon(a,b);break;
-case "OpenLayers.Geometry.Rectangle":e=this.drawRectangle(a,b)}a._options=d;return!1!=e?{node:this.setStyle(a,c,d,b),complete:e}:!1},postDraw:function(a){},drawPoint:function(a,b){},drawLineString:function(a,b){},drawLinearRing:function(a,b){},drawPolygon:function(a,b){},drawRectangle:function(a,b){},drawCircle:function(a,b){},removeText:function(a){var b=document.getElementById(a+this.LABEL_ID_SUFFIX);b&&this.textRoot.removeChild(b);(a=document.getElementById(a+this.LABEL_OUTLINE_SUFFIX))&&this.textRoot.removeChild(a)},
-getFeatureIdFromEvent:function(a){var b=a.target,c=b&&b.correspondingUseElement;return(c?c:b||a.srcElement)._featureId},eraseGeometry:function(a,b){if("OpenLayers.Geometry.MultiPoint"==a.CLASS_NAME||"OpenLayers.Geometry.MultiLineString"==a.CLASS_NAME||"OpenLayers.Geometry.MultiPolygon"==a.CLASS_NAME||"OpenLayers.Geometry.Collection"==a.CLASS_NAME)for(var c=0,d=a.components.length;c<d;c++)this.eraseGeometry(a.components[c],b);else(c=OpenLayers.Util.getElement(a.id))&&c.parentNode&&(c.geometry&&(c.geometry.destroy(),
-c.geometry=null),c.parentNode.removeChild(c),this.indexer&&this.indexer.remove(c),c._style.backgroundGraphic&&(c=OpenLayers.Util.getElement(a.id+this.BACKGROUND_ID_SUFFIX))&&c.parentNode&&c.parentNode.removeChild(c))},nodeFactory:function(a,b){var c=OpenLayers.Util.getElement(a);c?this.nodeTypeCompare(c,b)||(c.parentNode.removeChild(c),c=this.nodeFactory(a,b)):c=this.createNode(b,a);return c},nodeTypeCompare:function(a,b){},createNode:function(a,b){},moveRoot:function(a){var b=this.root;a.root.parentNode==
-this.rendererRoot&&(b=a.root);b.parentNode.removeChild(b);a.rendererRoot.appendChild(b)},getRenderLayerId:function(){return this.root.parentNode.parentNode.id},isComplexSymbol:function(a){return"circle"!=a&&!!a},CLASS_NAME:"OpenLayers.Renderer.Elements"});OpenLayers.Control.ArgParser=OpenLayers.Class(OpenLayers.Control,{center:null,zoom:null,layers:null,displayProjection:null,getParameters:function(a){a=a||window.location.href;var b=OpenLayers.Util.getParameters(a),c=a.indexOf("#");0<c&&(a="?"+a.substring(c+1,a.length),OpenLayers.Util.extend(b,OpenLayers.Util.getParameters(a)));return b},setMap:function(a){OpenLayers.Control.prototype.setMap.apply(this,arguments);for(var b=0,c=this.map.controls.length;b<c;b++){var d=this.map.controls[b];if(d!=this&&
-"OpenLayers.Control.ArgParser"==d.CLASS_NAME){d.displayProjection!=this.displayProjection&&(this.displayProjection=d.displayProjection);break}}b==this.map.controls.length&&(b=this.getParameters(),b.layers&&(this.layers=b.layers,this.map.events.register("addlayer",this,this.configureLayers),this.configureLayers()),b.lat&&b.lon&&(this.center=new OpenLayers.LonLat(parseFloat(b.lon),parseFloat(b.lat)),b.zoom&&(this.zoom=parseFloat(b.zoom)),this.map.events.register("changebaselayer",this,this.setCenter),
-this.setCenter()))},setCenter:function(){this.map.baseLayer&&(this.map.events.unregister("changebaselayer",this,this.setCenter),this.displayProjection&&this.center.transform(this.displayProjection,this.map.getProjectionObject()),this.map.setCenter(this.center,this.zoom))},configureLayers:function(){if(this.layers.length==this.map.layers.length){this.map.events.unregister("addlayer",this,this.configureLayers);for(var a=0,b=this.layers.length;a<b;a++){var c=this.map.layers[a],d=this.layers.charAt(a);
-"B"==d?this.map.setBaseLayer(c):"T"!=d&&"F"!=d||c.setVisibility("T"==d)}}},CLASS_NAME:"OpenLayers.Control.ArgParser"});OpenLayers.Control.Permalink=OpenLayers.Class(OpenLayers.Control,{argParserClass:OpenLayers.Control.ArgParser,element:null,anchor:!1,base:"",displayProjection:null,initialize:function(a,b,c){null===a||"object"!=typeof a||OpenLayers.Util.isElement(a)?(OpenLayers.Control.prototype.initialize.apply(this,[c]),this.element=OpenLayers.Util.getElement(a),this.base=b||document.location.href):(this.base=document.location.href,OpenLayers.Control.prototype.initialize.apply(this,[a]),null!=this.element&&(this.element=
-OpenLayers.Util.getElement(this.element)))},destroy:function(){this.element&&this.element.parentNode==this.div&&(this.div.removeChild(this.element),this.element=null);this.map&&this.map.events.unregister("moveend",this,this.updateLink);OpenLayers.Control.prototype.destroy.apply(this,arguments)},setMap:function(a){OpenLayers.Control.prototype.setMap.apply(this,arguments);for(var b=0,c=this.map.controls.length;b<c;b++){var d=this.map.controls[b];if(d.CLASS_NAME==this.argParserClass.CLASS_NAME){d.displayProjection!=
-this.displayProjection&&(this.displayProjection=d.displayProjection);break}}b==this.map.controls.length&&this.map.addControl(new this.argParserClass({displayProjection:this.displayProjection}))},draw:function(){OpenLayers.Control.prototype.draw.apply(this,arguments);this.element||this.anchor||(this.element=document.createElement("a"),this.element.innerHTML=OpenLayers.i18n("Permalink"),this.element.href="",this.div.appendChild(this.element));this.map.events.on({moveend:this.updateLink,changelayer:this.updateLink,
-changebaselayer:this.updateLink,scope:this});this.updateLink();return this.div},updateLink:function(){var a=this.anchor?"#":"?",b=this.base,c=null;-1!=b.indexOf("#")&&!1==this.anchor&&(c=b.substring(b.indexOf("#"),b.length));-1!=b.indexOf(a)&&(b=b.substring(0,b.indexOf(a)));b=b.split("#")[0]+a+OpenLayers.Util.getParameterString(this.createParams());c&&(b+=c);this.anchor&&!this.element?window.location.href=b:this.element.href=b},createParams:function(a,b,c){a=a||this.map.getCenter();var d=OpenLayers.Util.getParameters(this.base);
-if(a)for(d.zoom=b||this.map.getZoom(),b=a.lat,a=a.lon,this.displayProjection&&(b=OpenLayers.Projection.transform({x:a,y:b},this.map.getProjectionObject(),this.displayProjection),a=b.x,b=b.y),d.lat=Math.round(1E5*b)/1E5,d.lon=Math.round(1E5*a)/1E5,c=c||this.map.layers,d.layers="",a=0,b=c.length;a<b;a++){var e=c[a];d.layers=e.isBaseLayer?d.layers+(e==this.map.baseLayer?"B":"0"):d.layers+(e.getVisibility()?"T":"F")}return d},CLASS_NAME:"OpenLayers.Control.Permalink"});OpenLayers.Layer.TMS=OpenLayers.Class(OpenLayers.Layer.Grid,{serviceVersion:"1.0.0",layername:null,type:null,isBaseLayer:!0,tileOrigin:null,serverResolutions:null,zoomOffset:0,initialize:function(a,b,c){var d=[];d.push(a,b,{},c);OpenLayers.Layer.Grid.prototype.initialize.apply(this,d)},clone:function(a){null==a&&(a=new OpenLayers.Layer.TMS(this.name,this.url,this.getOptions()));return a=OpenLayers.Layer.Grid.prototype.clone.apply(this,[a])},getURL:function(a){a=this.adjustBounds(a);var b=this.getServerResolution(),
-c=Math.round((a.left-this.tileOrigin.lon)/(b*this.tileSize.w));a=Math.round((a.bottom-this.tileOrigin.lat)/(b*this.tileSize.h));b=this.getServerZoom();c=this.serviceVersion+"/"+this.layername+"/"+b+"/"+c+"/"+a+"."+this.type;a=this.url;OpenLayers.Util.isArray(a)&&(a=this.selectUrl(c,a));return a+c},setMap:function(a){OpenLayers.Layer.Grid.prototype.setMap.apply(this,arguments);this.tileOrigin||(this.tileOrigin=new OpenLayers.LonLat(this.map.maxExtent.left,this.map.maxExtent.bottom))},CLASS_NAME:"OpenLayers.Layer.TMS"});OpenLayers.Format.WCSCapabilities=OpenLayers.Class(OpenLayers.Format.XML.VersionedOGC,{defaultVersion:"1.1.0",CLASS_NAME:"OpenLayers.Format.WCSCapabilities"});OpenLayers.Format.WCSCapabilities.v1=OpenLayers.Class(OpenLayers.Format.XML,{regExes:{trimSpace:/^\s*|\s*$/g,splitSpace:/\s+/},defaultPrefix:"wcs",read:function(a){"string"==typeof a&&(a=OpenLayers.Format.XML.prototype.read.apply(this,[a]));a&&9==a.nodeType&&(a=a.documentElement);var b={};this.readNode(a,b);return b},CLASS_NAME:"OpenLayers.Format.WCSCapabilities.v1"});OpenLayers.Format.WCSCapabilities.v1_0_0=OpenLayers.Class(OpenLayers.Format.WCSCapabilities.v1,{namespaces:{wcs:"http://www.opengis.net/wcs",xlink:"http://www.w3.org/1999/xlink",xsi:"http://www.w3.org/2001/XMLSchema-instance",ows:"http://www.opengis.net/ows"},errorProperty:"service",readers:{wcs:{WCS_Capabilities:function(a,b){this.readChildNodes(a,b)},Service:function(a,b){b.service={};this.readChildNodes(a,b.service)},name:function(a,b){b.name=this.getChildValue(a)},label:function(a,b){b.label=
-this.getChildValue(a)},keywords:function(a,b){b.keywords=[];this.readChildNodes(a,b.keywords)},keyword:function(a,b){b.push(this.getChildValue(a))},responsibleParty:function(a,b){b.responsibleParty={};this.readChildNodes(a,b.responsibleParty)},individualName:function(a,b){b.individualName=this.getChildValue(a)},organisationName:function(a,b){b.organisationName=this.getChildValue(a)},positionName:function(a,b){b.positionName=this.getChildValue(a)},contactInfo:function(a,b){b.contactInfo={};this.readChildNodes(a,
-b.contactInfo)},phone:function(a,b){b.phone={};this.readChildNodes(a,b.phone)},voice:function(a,b){b.voice=this.getChildValue(a)},facsimile:function(a,b){b.facsimile=this.getChildValue(a)},address:function(a,b){b.address={};this.readChildNodes(a,b.address)},deliveryPoint:function(a,b){b.deliveryPoint=this.getChildValue(a)},city:function(a,b){b.city=this.getChildValue(a)},postalCode:function(a,b){b.postalCode=this.getChildValue(a)},country:function(a,b){b.country=this.getChildValue(a)},electronicMailAddress:function(a,
-b){b.electronicMailAddress=this.getChildValue(a)},fees:function(a,b){b.fees=this.getChildValue(a)},accessConstraints:function(a,b){b.accessConstraints=this.getChildValue(a)},ContentMetadata:function(a,b){b.contentMetadata=[];this.readChildNodes(a,b.contentMetadata)},CoverageOfferingBrief:function(a,b){var c={};this.readChildNodes(a,c);b.push(c)},name:function(a,b){b.name=this.getChildValue(a)},label:function(a,b){b.label=this.getChildValue(a)},lonLatEnvelope:function(a,b){var c=this.getElementsByTagNameNS(a,
-"http://www.opengis.net/gml","pos");if(2==c.length){var d={},e={};OpenLayers.Format.GML.v3.prototype.readers.gml.pos.apply(this,[c[0],d]);OpenLayers.Format.GML.v3.prototype.readers.gml.pos.apply(this,[c[1],e]);b.lonLatEnvelope={};b.lonLatEnvelope.srsName=a.getAttribute("srsName");b.lonLatEnvelope.min=d.points[0];b.lonLatEnvelope.max=e.points[0]}}}},CLASS_NAME:"OpenLayers.Format.WCSCapabilities.v1_0_0"});OpenLayers.Strategy.Fixed=OpenLayers.Class(OpenLayers.Strategy,{preload:!1,activate:function(){var a=OpenLayers.Strategy.prototype.activate.apply(this,arguments);if(a)if(this.layer.events.on({refresh:this.load,scope:this}),!0==this.layer.visibility||this.preload)this.load();else this.layer.events.on({visibilitychanged:this.load,scope:this});return a},deactivate:function(){var a=OpenLayers.Strategy.prototype.deactivate.call(this);a&&this.layer.events.un({refresh:this.load,visibilitychanged:this.load,
-scope:this});return a},load:function(a){var b=this.layer;b.events.triggerEvent("loadstart",{filter:b.filter});b.protocol.read(OpenLayers.Util.applyDefaults({callback:this.merge,filter:b.filter,scope:this},a));b.events.un({visibilitychanged:this.load,scope:this})},merge:function(a){var b=this.layer;b.destroyFeatures();var c=a.features;if(c&&0<c.length){var d=b.projection,e=b.map.getProjectionObject();if(!e.equals(d))for(var f,g=0,h=c.length;g<h;++g)(f=c[g].geometry)&&f.transform(d,e);b.addFeatures(c)}b.events.triggerEvent("loadend",
-{response:a})},CLASS_NAME:"OpenLayers.Strategy.Fixed"});OpenLayers.Control.Zoom=OpenLayers.Class(OpenLayers.Control,{zoomInText:"+",zoomInId:"olZoomInLink",zoomOutText:"\u2212",zoomOutId:"olZoomOutLink",draw:function(){var a=OpenLayers.Control.prototype.draw.apply(this),b=this.getOrCreateLinks(a),c=b.zoomIn,b=b.zoomOut,d=this.map.events;b.parentNode!==a&&(d=this.events,d.attachToElement(b.parentNode));d.register("buttonclick",this,this.onZoomClick);this.zoomInLink=c;this.zoomOutLink=b;return a},getOrCreateLinks:function(a){var b=document.getElementById(this.zoomInId),
-c=document.getElementById(this.zoomOutId);b||(b=document.createElement("a"),b.href="#zoomIn",b.appendChild(document.createTextNode(this.zoomInText)),b.className="olControlZoomIn",a.appendChild(b));OpenLayers.Element.addClass(b,"olButton");c||(c=document.createElement("a"),c.href="#zoomOut",c.appendChild(document.createTextNode(this.zoomOutText)),c.className="olControlZoomOut",a.appendChild(c));OpenLayers.Element.addClass(c,"olButton");return{zoomIn:b,zoomOut:c}},onZoomClick:function(a){a=a.buttonElement;
-a===this.zoomInLink?this.map.zoomIn():a===this.zoomOutLink&&this.map.zoomOut()},destroy:function(){this.map&&this.map.events.unregister("buttonclick",this,this.onZoomClick);delete this.zoomInLink;delete this.zoomOutLink;OpenLayers.Control.prototype.destroy.apply(this)},CLASS_NAME:"OpenLayers.Control.Zoom"});OpenLayers.Layer.PointTrack=OpenLayers.Class(OpenLayers.Layer.Vector,{dataFrom:null,styleFrom:null,addNodes:function(a,b){if(2>a.length)throw Error("At least two point features have to be added to create a line from");for(var c=Array(a.length-1),d,e,f,g=0,h=a.length;g<h;g++){d=a[g];f=d.geometry;if(!f)f=d.lonlat,f=new OpenLayers.Geometry.Point(f.lon,f.lat);else if("OpenLayers.Geometry.Point"!=f.CLASS_NAME)throw new TypeError("Only features with point geometries are supported.");if(0<g){d=null!=this.dataFrom?
-a[g+this.dataFrom].data||a[g+this.dataFrom].attributes:null;var k=null!=this.styleFrom?a[g+this.styleFrom].style:null;e=new OpenLayers.Geometry.LineString([e,f]);c[g-1]=new OpenLayers.Feature.Vector(e,d,k)}e=f}this.addFeatures(c,b)},CLASS_NAME:"OpenLayers.Layer.PointTrack"});OpenLayers.Layer.PointTrack.SOURCE_NODE=-1;OpenLayers.Layer.PointTrack.TARGET_NODE=0;OpenLayers.Layer.PointTrack.dataFrom={SOURCE_NODE:-1,TARGET_NODE:0};OpenLayers.Protocol.WFS=function(a){a=OpenLayers.Util.applyDefaults(a,OpenLayers.Protocol.WFS.DEFAULTS);var b=OpenLayers.Protocol.WFS["v"+a.version.replace(/\./g,"_")];if(!b)throw"Unsupported WFS version: "+a.version;return new b(a)};
-OpenLayers.Protocol.WFS.fromWMSLayer=function(a,b){var c,d;c=a.params.LAYERS;c=(OpenLayers.Util.isArray(c)?c[0]:c).split(":");1<c.length&&(d=c[0]);c=c.pop();d={url:a.url,featureType:c,featurePrefix:d,srsName:a.projection&&a.projection.getCode()||a.map&&a.map.getProjectionObject().getCode(),version:"1.1.0"};return new OpenLayers.Protocol.WFS(OpenLayers.Util.applyDefaults(b,d))};OpenLayers.Protocol.WFS.DEFAULTS={version:"1.0.0"};OpenLayers.Layer.Markers=OpenLayers.Class(OpenLayers.Layer,{isBaseLayer:!1,markers:null,drawn:!1,initialize:function(a,b){OpenLayers.Layer.prototype.initialize.apply(this,arguments);this.markers=[]},destroy:function(){this.clearMarkers();this.markers=null;OpenLayers.Layer.prototype.destroy.apply(this,arguments)},setOpacity:function(a){if(a!=this.opacity){this.opacity=a;a=0;for(var b=this.markers.length;a<b;a++)this.markers[a].setOpacity(this.opacity)}},moveTo:function(a,b,c){OpenLayers.Layer.prototype.moveTo.apply(this,
-arguments);if(b||!this.drawn){for(var d=0,e=this.markers.length;d<e;d++)this.drawMarker(this.markers[d]);this.drawn=!0}},addMarker:function(a){this.markers.push(a);1>this.opacity&&a.setOpacity(this.opacity);this.map&&this.map.getExtent()&&(a.map=this.map,this.drawMarker(a))},removeMarker:function(a){this.markers&&this.markers.length&&(OpenLayers.Util.removeItem(this.markers,a),a.erase())},clearMarkers:function(){if(null!=this.markers)for(;0<this.markers.length;)this.removeMarker(this.markers[0])},
-drawMarker:function(a){var b=this.map.getLayerPxFromLonLat(a.lonlat);null==b?a.display(!1):a.isDrawn()?a.icon&&a.icon.moveTo(b):(a=a.draw(b),this.div.appendChild(a))},getDataExtent:function(){var a=null;if(this.markers&&0<this.markers.length)for(var a=new OpenLayers.Bounds,b=0,c=this.markers.length;b<c;b++)a.extend(this.markers[b].lonlat);return a},CLASS_NAME:"OpenLayers.Layer.Markers"});OpenLayers.Control.Pan=OpenLayers.Class(OpenLayers.Control.Button,{slideFactor:50,slideRatio:null,direction:null,initialize:function(a,b){this.direction=a;this.CLASS_NAME+=this.direction;OpenLayers.Control.prototype.initialize.apply(this,[b])},trigger:function(){if(this.map){var a=OpenLayers.Function.bind(function(a){return this.slideRatio?this.map.getSize()[a]*this.slideRatio:this.slideFactor},this);switch(this.direction){case OpenLayers.Control.Pan.NORTH:this.map.pan(0,-a("h"));break;case OpenLayers.Control.Pan.SOUTH:this.map.pan(0,
-a("h"));break;case OpenLayers.Control.Pan.WEST:this.map.pan(-a("w"),0);break;case OpenLayers.Control.Pan.EAST:this.map.pan(a("w"),0)}}},CLASS_NAME:"OpenLayers.Control.Pan"});OpenLayers.Control.Pan.NORTH="North";OpenLayers.Control.Pan.SOUTH="South";OpenLayers.Control.Pan.EAST="East";OpenLayers.Control.Pan.WEST="West";OpenLayers.Format.CSWGetDomain=function(a){a=OpenLayers.Util.applyDefaults(a,OpenLayers.Format.CSWGetDomain.DEFAULTS);var b=OpenLayers.Format.CSWGetDomain["v"+a.version.replace(/\./g,"_")];if(!b)throw"Unsupported CSWGetDomain version: "+a.version;return new b(a)};OpenLayers.Format.CSWGetDomain.DEFAULTS={version:"2.0.2"};OpenLayers.Format.CSWGetDomain.v2_0_2=OpenLayers.Class(OpenLayers.Format.XML,{namespaces:{xlink:"http://www.w3.org/1999/xlink",xsi:"http://www.w3.org/2001/XMLSchema-instance",csw:"http://www.opengis.net/cat/csw/2.0.2"},defaultPrefix:"csw",version:"2.0.2",schemaLocation:"http://www.opengis.net/cat/csw/2.0.2 http://schemas.opengis.net/csw/2.0.2/CSW-discovery.xsd",PropertyName:null,ParameterName:null,read:function(a){"string"==typeof a&&(a=OpenLayers.Format.XML.prototype.read.apply(this,[a]));a&&9==
-a.nodeType&&(a=a.documentElement);var b={};this.readNode(a,b);return b},readers:{csw:{GetDomainResponse:function(a,b){this.readChildNodes(a,b)},DomainValues:function(a,b){OpenLayers.Util.isArray(b.DomainValues)||(b.DomainValues=[]);for(var c=a.attributes,d={},e=0,f=c.length;e<f;++e)d[c[e].name]=c[e].nodeValue;this.readChildNodes(a,d);b.DomainValues.push(d)},PropertyName:function(a,b){b.PropertyName=this.getChildValue(a)},ParameterName:function(a,b){b.ParameterName=this.getChildValue(a)},ListOfValues:function(a,
-b){OpenLayers.Util.isArray(b.ListOfValues)||(b.ListOfValues=[]);this.readChildNodes(a,b.ListOfValues)},Value:function(a,b){for(var c=a.attributes,d={},e=0,f=c.length;e<f;++e)d[c[e].name]=c[e].nodeValue;d.value=this.getChildValue(a);b.push({Value:d})},ConceptualScheme:function(a,b){b.ConceptualScheme={};this.readChildNodes(a,b.ConceptualScheme)},Name:function(a,b){b.Name=this.getChildValue(a)},Document:function(a,b){b.Document=this.getChildValue(a)},Authority:function(a,b){b.Authority=this.getChildValue(a)},
-RangeOfValues:function(a,b){b.RangeOfValues={};this.readChildNodes(a,b.RangeOfValues)},MinValue:function(a,b){for(var c=a.attributes,d={},e=0,f=c.length;e<f;++e)d[c[e].name]=c[e].nodeValue;d.value=this.getChildValue(a);b.MinValue=d},MaxValue:function(a,b){for(var c=a.attributes,d={},e=0,f=c.length;e<f;++e)d[c[e].name]=c[e].nodeValue;d.value=this.getChildValue(a);b.MaxValue=d}}},write:function(a){a=this.writeNode("csw:GetDomain",a);return OpenLayers.Format.XML.prototype.write.apply(this,[a])},writers:{csw:{GetDomain:function(a){var b=
-this.createElementNSPlus("csw:GetDomain",{attributes:{service:"CSW",version:this.version}});a.PropertyName||this.PropertyName?this.writeNode("csw:PropertyName",a.PropertyName||this.PropertyName,b):(a.ParameterName||this.ParameterName)&&this.writeNode("csw:ParameterName",a.ParameterName||this.ParameterName,b);this.readChildNodes(b,a);return b},PropertyName:function(a){return this.createElementNSPlus("csw:PropertyName",{value:a})},ParameterName:function(a){return this.createElementNSPlus("csw:ParameterName",
-{value:a})}}},CLASS_NAME:"OpenLayers.Format.CSWGetDomain.v2_0_2"});OpenLayers.Format.ArcXML.Features=OpenLayers.Class(OpenLayers.Format.XML,{read:function(a){return(new OpenLayers.Format.ArcXML).read(a).features.feature}});OpenLayers.Control.Snapping=OpenLayers.Class(OpenLayers.Control,{DEFAULTS:{tolerance:10,node:!0,edge:!0,vertex:!0},greedy:!0,precedence:["node","vertex","edge"],resolution:null,geoToleranceCache:null,layer:null,feature:null,point:null,initialize:function(a){OpenLayers.Control.prototype.initialize.apply(this,[a]);this.options=a||{};this.options.layer&&this.setLayer(this.options.layer);a=OpenLayers.Util.extend({},this.options.defaults);this.defaults=OpenLayers.Util.applyDefaults(a,this.DEFAULTS);this.setTargets(this.options.targets);
-0===this.targets.length&&this.layer&&this.addTargetLayer(this.layer);this.geoToleranceCache={}},setLayer:function(a){this.active?(this.deactivate(),this.layer=a,this.activate()):this.layer=a},setTargets:function(a){this.targets=[];if(a&&a.length)for(var b,c=0,d=a.length;c<d;++c)b=a[c],b instanceof OpenLayers.Layer.Vector?this.addTargetLayer(b):this.addTarget(b)},addTargetLayer:function(a){this.addTarget({layer:a})},addTarget:function(a){a=OpenLayers.Util.applyDefaults(a,this.defaults);a.nodeTolerance=
-a.nodeTolerance||a.tolerance;a.vertexTolerance=a.vertexTolerance||a.tolerance;a.edgeTolerance=a.edgeTolerance||a.tolerance;this.targets.push(a)},removeTargetLayer:function(a){for(var b,c=this.targets.length-1;0<=c;--c)b=this.targets[c],b.layer===a&&this.removeTarget(b)},removeTarget:function(a){return OpenLayers.Util.removeItem(this.targets,a)},activate:function(){var a=OpenLayers.Control.prototype.activate.call(this);if(a&&this.layer&&this.layer.events)this.layer.events.on({sketchstarted:this.onSketchModified,
-sketchmodified:this.onSketchModified,vertexmodified:this.onVertexModified,scope:this});return a},deactivate:function(){var a=OpenLayers.Control.prototype.deactivate.call(this);a&&this.layer&&this.layer.events&&this.layer.events.un({sketchstarted:this.onSketchModified,sketchmodified:this.onSketchModified,vertexmodified:this.onVertexModified,scope:this});this.point=this.feature=null;return a},onSketchModified:function(a){this.feature=a.feature;this.considerSnapping(a.vertex,a.vertex)},onVertexModified:function(a){this.feature=
-a.feature;var b=this.layer.map.getLonLatFromViewPortPx(a.pixel);this.considerSnapping(a.vertex,new OpenLayers.Geometry.Point(b.lon,b.lat))},considerSnapping:function(a,b){for(var c={rank:Number.POSITIVE_INFINITY,dist:Number.POSITIVE_INFINITY,x:null,y:null},d=!1,e,f,g=0,h=this.targets.length;g<h;++g)if(f=this.targets[g],e=this.testTarget(f,b))if(this.greedy){c=e;c.target=f;d=!0;break}else if(e.rank<c.rank||e.rank===c.rank&&e.dist<c.dist)c=e,c.target=f,d=!0;d&&(!1!==this.events.triggerEvent("beforesnap",
-{point:a,x:c.x,y:c.y,distance:c.dist,layer:c.target.layer,snapType:this.precedence[c.rank]})?(a.x=c.x,a.y=c.y,this.point=a,this.events.triggerEvent("snap",{point:a,snapType:this.precedence[c.rank],layer:c.target.layer,distance:c.dist})):d=!1);this.point&&!d&&(a.x=b.x,a.y=b.y,this.point=null,this.events.triggerEvent("unsnap",{point:a}))},testTarget:function(a,b){var c=this.layer.map.getResolution();if("minResolution"in a&&c<a.minResolution||"maxResolution"in a&&c>=a.maxResolution)return null;for(var c=
-{node:this.getGeoTolerance(a.nodeTolerance,c),vertex:this.getGeoTolerance(a.vertexTolerance,c),edge:this.getGeoTolerance(a.edgeTolerance,c)},d=Math.max(c.node,c.vertex,c.edge),e={rank:Number.POSITIVE_INFINITY,dist:Number.POSITIVE_INFINITY},f=!1,g=a.layer.features,h,k,l,m,n,p,q=this.precedence.length,r=new OpenLayers.LonLat(b.x,b.y),s=0,t=g.length;s<t;++s)if(h=g[s],h!==this.feature&&(!h._sketch&&h.state!==OpenLayers.State.DELETE&&(!a.filter||a.filter.evaluate(h)))&&h.atPoint(r,d,d))for(var u=0,v=Math.min(e.rank+
-1,q);u<v;++u)if(k=this.precedence[u],a[k])if("edge"===k){if(l=h.geometry.distanceTo(b,{details:!0}),n=l.distance,n<=c[k]&&n<e.dist){e={rank:u,dist:n,x:l.x0,y:l.y0};f=!0;break}}else{l=h.geometry.getVertices("node"===k);p=!1;for(var w=0,x=l.length;w<x;++w)m=l[w],n=m.distanceTo(b),n<=c[k]&&(u<e.rank||u===e.rank&&n<e.dist)&&(e={rank:u,dist:n,x:m.x,y:m.y},p=f=!0);if(p)break}return f?e:null},getGeoTolerance:function(a,b){b!==this.resolution&&(this.resolution=b,this.geoToleranceCache={});var c=this.geoToleranceCache[a];
-void 0===c&&(c=a*b,this.geoToleranceCache[a]=c);return c},destroy:function(){this.active&&this.deactivate();delete this.layer;delete this.targets;OpenLayers.Control.prototype.destroy.call(this)},CLASS_NAME:"OpenLayers.Control.Snapping"});OpenLayers.Format.OWSCommon.v1_1_0=OpenLayers.Class(OpenLayers.Format.OWSCommon.v1,{namespaces:{ows:"http://www.opengis.net/ows/1.1",xlink:"http://www.w3.org/1999/xlink"},readers:{ows:OpenLayers.Util.applyDefaults({ExceptionReport:function(a,b){b.exceptionReport={version:a.getAttribute("version"),language:a.getAttribute("xml:lang"),exceptions:[]};this.readChildNodes(a,b.exceptionReport)},AllowedValues:function(a,b){b.allowedValues={};this.readChildNodes(a,b.allowedValues)},AnyValue:function(a,b){b.anyValue=
-!0},DataType:function(a,b){b.dataType=this.getChildValue(a)},Range:function(a,b){b.range={};this.readChildNodes(a,b.range)},MinimumValue:function(a,b){b.minValue=this.getChildValue(a)},MaximumValue:function(a,b){b.maxValue=this.getChildValue(a)},Identifier:function(a,b){b.identifier=this.getChildValue(a)},SupportedCRS:function(a,b){b.supportedCRS=this.getChildValue(a)}},OpenLayers.Format.OWSCommon.v1.prototype.readers.ows)},writers:{ows:OpenLayers.Util.applyDefaults({Range:function(a){var b=this.createElementNSPlus("ows:Range",
-{attributes:{"ows:rangeClosure":a.closure}});this.writeNode("ows:MinimumValue",a.minValue,b);this.writeNode("ows:MaximumValue",a.maxValue,b);return b},MinimumValue:function(a){return this.createElementNSPlus("ows:MinimumValue",{value:a})},MaximumValue:function(a){return this.createElementNSPlus("ows:MaximumValue",{value:a})},Value:function(a){return this.createElementNSPlus("ows:Value",{value:a})}},OpenLayers.Format.OWSCommon.v1.prototype.writers.ows)},CLASS_NAME:"OpenLayers.Format.OWSCommon.v1_1_0"});OpenLayers.Format.WCSGetCoverage=OpenLayers.Class(OpenLayers.Format.XML,{namespaces:{ows:"http://www.opengis.net/ows/1.1",wcs:"http://www.opengis.net/wcs/1.1",xlink:"http://www.w3.org/1999/xlink",xsi:"http://www.w3.org/2001/XMLSchema-instance"},regExes:{trimSpace:/^\s*|\s*$/g,removeSpace:/\s*/g,splitSpace:/\s+/,trimComma:/\s*,\s*/g},VERSION:"1.1.2",schemaLocation:"http://www.opengis.net/wcs/1.1 http://schemas.opengis.net/wcs/1.1/wcsGetCoverage.xsd",write:function(a){a=this.writeNode("wcs:GetCoverage",
-a);this.setAttributeNS(a,this.namespaces.xsi,"xsi:schemaLocation",this.schemaLocation);return OpenLayers.Format.XML.prototype.write.apply(this,[a])},writers:{wcs:{GetCoverage:function(a){var b=this.createElementNSPlus("wcs:GetCoverage",{attributes:{version:a.version||this.VERSION,service:"WCS"}});this.writeNode("ows:Identifier",a.identifier,b);this.writeNode("wcs:DomainSubset",a.domainSubset,b);this.writeNode("wcs:Output",a.output,b);return b},DomainSubset:function(a){var b=this.createElementNSPlus("wcs:DomainSubset",
-{});this.writeNode("ows:BoundingBox",a.boundingBox,b);a.temporalSubset&&this.writeNode("wcs:TemporalSubset",a.temporalSubset,b);return b},TemporalSubset:function(a){for(var b=this.createElementNSPlus("wcs:TemporalSubset",{}),c=0,d=a.timePeriods.length;c<d;++c)this.writeNode("wcs:TimePeriod",a.timePeriods[c],b);return b},TimePeriod:function(a){var b=this.createElementNSPlus("wcs:TimePeriod",{});this.writeNode("wcs:BeginPosition",a.begin,b);this.writeNode("wcs:EndPosition",a.end,b);a.resolution&&this.writeNode("wcs:TimeResolution",
-a.resolution,b);return b},BeginPosition:function(a){return this.createElementNSPlus("wcs:BeginPosition",{value:a})},EndPosition:function(a){return this.createElementNSPlus("wcs:EndPosition",{value:a})},TimeResolution:function(a){return this.createElementNSPlus("wcs:TimeResolution",{value:a})},Output:function(a){var b=this.createElementNSPlus("wcs:Output",{attributes:{format:a.format,store:a.store}});a.gridCRS&&this.writeNode("wcs:GridCRS",a.gridCRS,b);return b},GridCRS:function(a){var b=this.createElementNSPlus("wcs:GridCRS",
-{});this.writeNode("wcs:GridBaseCRS",a.baseCRS,b);a.type&&this.writeNode("wcs:GridType",a.type,b);a.origin&&this.writeNode("wcs:GridOrigin",a.origin,b);this.writeNode("wcs:GridOffsets",a.offsets,b);a.CS&&this.writeNode("wcs:GridCS",a.CS,b);return b},GridBaseCRS:function(a){return this.createElementNSPlus("wcs:GridBaseCRS",{value:a})},GridOrigin:function(a){return this.createElementNSPlus("wcs:GridOrigin",{value:a})},GridType:function(a){return this.createElementNSPlus("wcs:GridType",{value:a})},GridOffsets:function(a){return this.createElementNSPlus("wcs:GridOffsets",
-{value:a})},GridCS:function(a){return this.createElementNSPlus("wcs:GridCS",{value:a})}},ows:OpenLayers.Format.OWSCommon.v1_1_0.prototype.writers.ows},CLASS_NAME:"OpenLayers.Format.WCSGetCoverage"});OpenLayers.Format.KML=OpenLayers.Class(OpenLayers.Format.XML,{namespaces:{kml:"http://www.opengis.net/kml/2.2",gx:"http://www.google.com/kml/ext/2.2"},kmlns:"http://earth.google.com/kml/2.0",placemarksDesc:"No description available",foldersName:"OpenLayers export",foldersDesc:"Exported on "+new Date,extractAttributes:!0,kvpAttributes:!1,extractStyles:!1,extractTracks:!1,trackAttributes:null,internalns:null,features:null,styles:null,styleBaseUrl:"",fetched:null,maxDepth:0,initialize:function(a){this.regExes=
-{trimSpace:/^\s*|\s*$/g,removeSpace:/\s*/g,splitSpace:/\s+/,trimComma:/\s*,\s*/g,kmlColor:/(\w{2})(\w{2})(\w{2})(\w{2})/,kmlIconPalette:/root:\/\/icons\/palette-(\d+)(\.\w+)/,straightBracket:/\$\[(.*?)\]/g};this.externalProjection=new OpenLayers.Projection("EPSG:4326");OpenLayers.Format.XML.prototype.initialize.apply(this,[a])},read:function(a){this.features=[];this.styles={};this.fetched={};return this.parseData(a,{depth:0,styleBaseUrl:this.styleBaseUrl})},parseData:function(a,b){"string"==typeof a&&
-(a=OpenLayers.Format.XML.prototype.read.apply(this,[a]));for(var c=["Link","NetworkLink","Style","StyleMap","Placemark"],d=0,e=c.length;d<e;++d){var f=c[d],g=this.getElementsByTagNameNS(a,"*",f);if(0!=g.length)switch(f.toLowerCase()){case "link":case "networklink":this.parseLinks(g,b);break;case "style":this.extractStyles&&this.parseStyles(g,b);break;case "stylemap":this.extractStyles&&this.parseStyleMaps(g,b);break;case "placemark":this.parseFeatures(g,b)}}return this.features},parseLinks:function(a,
-b){if(b.depth>=this.maxDepth)return!1;var c=OpenLayers.Util.extend({},b);c.depth++;for(var d=0,e=a.length;d<e;d++){var f=this.parseProperty(a[d],"*","href");f&&!this.fetched[f]&&(this.fetched[f]=!0,(f=this.fetchLink(f))&&this.parseData(f,c))}},fetchLink:function(a){if(a=OpenLayers.Request.GET({url:a,async:!1}))return a.responseText},parseStyles:function(a,b){for(var c=0,d=a.length;c<d;c++){var e=this.parseStyle(a[c]);e&&(this.styles[(b.styleBaseUrl||"")+"#"+e.id]=e)}},parseKmlColor:function(a){var b=
-null;a&&(a=a.match(this.regExes.kmlColor))&&(b={color:"#"+a[4]+a[3]+a[2],opacity:parseInt(a[1],16)/255});return b},parseStyle:function(a){for(var b={},c=["LineStyle","PolyStyle","IconStyle","BalloonStyle","LabelStyle"],d,e,f=0,g=c.length;f<g;++f)if(d=c[f],e=this.getElementsByTagNameNS(a,"*",d)[0])switch(d.toLowerCase()){case "linestyle":d=this.parseProperty(e,"*","color");if(d=this.parseKmlColor(d))b.strokeColor=d.color,b.strokeOpacity=d.opacity;(d=this.parseProperty(e,"*","width"))&&(b.strokeWidth=
-d);break;case "polystyle":d=this.parseProperty(e,"*","color");if(d=this.parseKmlColor(d))b.fillOpacity=d.opacity,b.fillColor=d.color;"0"==this.parseProperty(e,"*","fill")&&(b.fillColor="none");"0"==this.parseProperty(e,"*","outline")&&(b.strokeWidth="0");break;case "iconstyle":var h=parseFloat(this.parseProperty(e,"*","scale")||1);d=32*h;var k=32*h,l=this.getElementsByTagNameNS(e,"*","Icon")[0];if(l){var m=this.parseProperty(l,"*","href");if(m){var n=this.parseProperty(l,"*","w"),p=this.parseProperty(l,
-"*","h");!OpenLayers.String.startsWith(m,"http://maps.google.com/mapfiles/kml")||(n||p)||(p=n=64,h/=2);n=n||p;p=p||n;n&&(d=parseInt(n)*h);p&&(k=parseInt(p)*h);if(p=m.match(this.regExes.kmlIconPalette))n=p[1],p=p[2],m=this.parseProperty(l,"*","x"),l=this.parseProperty(l,"*","y"),m="http://maps.google.com/mapfiles/kml/pal"+n+"/icon"+(8*(l?7-l/32:7)+(m?m/32:0))+p;b.graphicOpacity=1;b.externalGraphic=m}}if(e=this.getElementsByTagNameNS(e,"*","hotSpot")[0])m=parseFloat(e.getAttribute("x")),l=parseFloat(e.getAttribute("y")),
-n=e.getAttribute("xunits"),"pixels"==n?b.graphicXOffset=-m*h:"insetPixels"==n?b.graphicXOffset=-d+m*h:"fraction"==n&&(b.graphicXOffset=-d*m),e=e.getAttribute("yunits"),"pixels"==e?b.graphicYOffset=-k+l*h+1:"insetPixels"==e?b.graphicYOffset=-(l*h)+1:"fraction"==e&&(b.graphicYOffset=-k*(1-l)+1);b.graphicWidth=d;b.graphicHeight=k;break;case "balloonstyle":(e=OpenLayers.Util.getXmlNodeValue(e))&&(b.balloonStyle=e.replace(this.regExes.straightBracket,"${$1}"));break;case "labelstyle":if(d=this.parseProperty(e,
-"*","color"),d=this.parseKmlColor(d))b.fontColor=d.color,b.fontOpacity=d.opacity}!b.strokeColor&&b.fillColor&&(b.strokeColor=b.fillColor);(a=a.getAttribute("id"))&&b&&(b.id=a);return b},parseStyleMaps:function(a,b){for(var c=0,d=a.length;c<d;c++)for(var e=a[c],f=this.getElementsByTagNameNS(e,"*","Pair"),e=e.getAttribute("id"),g=0,h=f.length;g<h;g++){var k=f[g],l=this.parseProperty(k,"*","key");(k=this.parseProperty(k,"*","styleUrl"))&&"normal"==l&&(this.styles[(b.styleBaseUrl||"")+"#"+e]=this.styles[(b.styleBaseUrl||
-"")+k])}},parseFeatures:function(a,b){for(var c=[],d=0,e=a.length;d<e;d++){var f=a[d],g=this.parseFeature.apply(this,[f]);if(g){this.extractStyles&&(g.attributes&&g.attributes.styleUrl)&&(g.style=this.getStyle(g.attributes.styleUrl,b));if(this.extractStyles){var h=this.getElementsByTagNameNS(f,"*","Style")[0];h&&(h=this.parseStyle(h))&&(g.style=OpenLayers.Util.extend(g.style,h))}this.extractTracks?(f=this.getElementsByTagNameNS(f,this.namespaces.gx,"Track"))&&0<f.length&&(g={features:[],feature:g},
-this.readNode(f[0],g),0<g.features.length&&c.push.apply(c,g.features)):c.push(g)}else throw"Bad Placemark: "+d;}this.features=this.features.concat(c)},readers:{kml:{when:function(a,b){b.whens.push(OpenLayers.Date.parse(this.getChildValue(a)))},_trackPointAttribute:function(a,b){var c=a.nodeName.split(":").pop();b.attributes[c].push(this.getChildValue(a))}},gx:{Track:function(a,b){var c={whens:[],points:[],angles:[]};if(this.trackAttributes){var d;c.attributes={};for(var e=0,f=this.trackAttributes.length;e<
-f;++e)d=this.trackAttributes[e],c.attributes[d]=[],d in this.readers.kml||(this.readers.kml[d]=this.readers.kml._trackPointAttribute)}this.readChildNodes(a,c);if(c.whens.length!==c.points.length)throw Error("gx:Track with unequal number of when ("+c.whens.length+") and gx:coord ("+c.points.length+") elements.");var g=0<c.angles.length;if(g&&c.whens.length!==c.angles.length)throw Error("gx:Track with unequal number of when ("+c.whens.length+") and gx:angles ("+c.angles.length+") elements.");for(var h,
-e=0,f=c.whens.length;e<f;++e){h=b.feature.clone();h.fid=b.feature.fid||b.feature.id;d=c.points[e];h.geometry=d;"z"in d&&(h.attributes.altitude=d.z);this.internalProjection&&this.externalProjection&&h.geometry.transform(this.externalProjection,this.internalProjection);if(this.trackAttributes)for(var k=0,l=this.trackAttributes.length;k<l;++k)d=this.trackAttributes[k],h.attributes[d]=c.attributes[d][e];h.attributes.when=c.whens[e];h.attributes.trackId=b.feature.id;g&&(d=c.angles[e],h.attributes.heading=
-parseFloat(d[0]),h.attributes.tilt=parseFloat(d[1]),h.attributes.roll=parseFloat(d[2]));b.features.push(h)}},coord:function(a,b){var c=this.getChildValue(a).replace(this.regExes.trimSpace,"").split(/\s+/),d=new OpenLayers.Geometry.Point(c[0],c[1]);2<c.length&&(d.z=parseFloat(c[2]));b.points.push(d)},angles:function(a,b){var c=this.getChildValue(a).replace(this.regExes.trimSpace,"").split(/\s+/);b.angles.push(c)}}},parseFeature:function(a){for(var b=["MultiGeometry","Polygon","LineString","Point"],
-c,d,e,f=0,g=b.length;f<g;++f)if(c=b[f],this.internalns=a.namespaceURI?a.namespaceURI:this.kmlns,d=this.getElementsByTagNameNS(a,this.internalns,c),0<d.length){if(b=this.parseGeometry[c.toLowerCase()])e=b.apply(this,[d[0]]),this.internalProjection&&this.externalProjection&&e.transform(this.externalProjection,this.internalProjection);else throw new TypeError("Unsupported geometry type: "+c);break}var h;this.extractAttributes&&(h=this.parseAttributes(a));c=new OpenLayers.Feature.Vector(e,h);a=a.getAttribute("id")||
-a.getAttribute("name");null!=a&&(c.fid=a);return c},getStyle:function(a,b){var c=OpenLayers.Util.removeTail(a),d=OpenLayers.Util.extend({},b);d.depth++;d.styleBaseUrl=c;!this.styles[a]&&!OpenLayers.String.startsWith(a,"#")&&d.depth<=this.maxDepth&&!this.fetched[c]&&(c=this.fetchLink(c))&&this.parseData(c,d);return OpenLayers.Util.extend({},this.styles[a])},parseGeometry:{point:function(a){var b=this.getElementsByTagNameNS(a,this.internalns,"coordinates");a=[];if(0<b.length){var c=b[0].firstChild.nodeValue,
-c=c.replace(this.regExes.removeSpace,"");a=c.split(",")}b=null;if(1<a.length)2==a.length&&(a[2]=null),b=new OpenLayers.Geometry.Point(a[0],a[1],a[2]);else throw"Bad coordinate string: "+c;return b},linestring:function(a,b){var c=this.getElementsByTagNameNS(a,this.internalns,"coordinates"),d=null;if(0<c.length){for(var c=this.getChildValue(c[0]),c=c.replace(this.regExes.trimSpace,""),c=c.replace(this.regExes.trimComma,","),d=c.split(this.regExes.splitSpace),e=d.length,f=Array(e),g,h,k=0;k<e;++k)if(g=
-d[k].split(","),h=g.length,1<h)2==g.length&&(g[2]=null),f[k]=new OpenLayers.Geometry.Point(g[0],g[1],g[2]);else throw"Bad LineString point coordinates: "+d[k];if(e)d=b?new OpenLayers.Geometry.LinearRing(f):new OpenLayers.Geometry.LineString(f);else throw"Bad LineString coordinates: "+c;}return d},polygon:function(a){a=this.getElementsByTagNameNS(a,this.internalns,"LinearRing");var b=a.length,c=Array(b);if(0<b)for(var d=0,e=a.length;d<e;++d)if(b=this.parseGeometry.linestring.apply(this,[a[d],!0]))c[d]=
-b;else throw"Bad LinearRing geometry: "+d;return new OpenLayers.Geometry.Polygon(c)},multigeometry:function(a){for(var b,c=[],d=a.childNodes,e=0,f=d.length;e<f;++e)a=d[e],1==a.nodeType&&(b=a.prefix?a.nodeName.split(":")[1]:a.nodeName,(b=this.parseGeometry[b.toLowerCase()])&&c.push(b.apply(this,[a])));return new OpenLayers.Geometry.Collection(c)}},parseAttributes:function(a){var b={},c=a.getElementsByTagName("ExtendedData");c.length&&(b=this.parseExtendedData(c[0]));var d,e,f;a=a.childNodes;for(var c=
-0,g=a.length;c<g;++c)if(d=a[c],1==d.nodeType&&(e=d.childNodes,1<=e.length&&3>=e.length)){switch(e.length){case 1:f=e[0];break;case 2:f=e[0];e=e[1];f=3==f.nodeType||4==f.nodeType?f:e;break;default:f=e[1]}if(3==f.nodeType||4==f.nodeType)if(d=d.prefix?d.nodeName.split(":")[1]:d.nodeName,f=OpenLayers.Util.getXmlNodeValue(f))f=f.replace(this.regExes.trimSpace,""),b[d]=f}return b},parseExtendedData:function(a){var b={},c,d,e,f,g=a.getElementsByTagName("Data");c=0;for(d=g.length;c<d;c++){e=g[c];f=e.getAttribute("name");
-var h={},k=e.getElementsByTagName("value");k.length&&(h.value=this.getChildValue(k[0]));this.kvpAttributes?b[f]=h.value:(e=e.getElementsByTagName("displayName"),e.length&&(h.displayName=this.getChildValue(e[0])),b[f]=h)}a=a.getElementsByTagName("SimpleData");c=0;for(d=a.length;c<d;c++)h={},e=a[c],f=e.getAttribute("name"),h.value=this.getChildValue(e),this.kvpAttributes?b[f]=h.value:(h.displayName=f,b[f]=h);return b},parseProperty:function(a,b,c){var d;a=this.getElementsByTagNameNS(a,b,c);try{d=OpenLayers.Util.getXmlNodeValue(a[0])}catch(e){d=
-null}return d},write:function(a){OpenLayers.Util.isArray(a)||(a=[a]);for(var b=this.createElementNS(this.kmlns,"kml"),c=this.createFolderXML(),d=0,e=a.length;d<e;++d)c.appendChild(this.createPlacemarkXML(a[d]));b.appendChild(c);return OpenLayers.Format.XML.prototype.write.apply(this,[b])},createFolderXML:function(){var a=this.createElementNS(this.kmlns,"Folder");if(this.foldersName){var b=this.createElementNS(this.kmlns,"name"),c=this.createTextNode(this.foldersName);b.appendChild(c);a.appendChild(b)}this.foldersDesc&&
-(b=this.createElementNS(this.kmlns,"description"),c=this.createTextNode(this.foldersDesc),b.appendChild(c),a.appendChild(b));return a},createPlacemarkXML:function(a){var b=this.createElementNS(this.kmlns,"name"),c=a.style&&a.style.label?a.style.label:a.id;b.appendChild(this.createTextNode(a.attributes.name||c));var d=this.createElementNS(this.kmlns,"description");d.appendChild(this.createTextNode(a.attributes.description||this.placemarksDesc));c=this.createElementNS(this.kmlns,"Placemark");null!=
-a.fid&&c.setAttribute("id",a.fid);c.appendChild(b);c.appendChild(d);b=this.buildGeometryNode(a.geometry);c.appendChild(b);a.attributes&&(a=this.buildExtendedData(a.attributes))&&c.appendChild(a);return c},buildGeometryNode:function(a){var b=a.CLASS_NAME,b=b.substring(b.lastIndexOf(".")+1),b=this.buildGeometry[b.toLowerCase()],c=null;b&&(c=b.apply(this,[a]));return c},buildGeometry:{point:function(a){var b=this.createElementNS(this.kmlns,"Point");b.appendChild(this.buildCoordinatesNode(a));return b},
-multipoint:function(a){return this.buildGeometry.collection.apply(this,[a])},linestring:function(a){var b=this.createElementNS(this.kmlns,"LineString");b.appendChild(this.buildCoordinatesNode(a));return b},multilinestring:function(a){return this.buildGeometry.collection.apply(this,[a])},linearring:function(a){var b=this.createElementNS(this.kmlns,"LinearRing");b.appendChild(this.buildCoordinatesNode(a));return b},polygon:function(a){var b=this.createElementNS(this.kmlns,"Polygon");a=a.components;
-for(var c,d,e=0,f=a.length;e<f;++e)c=0==e?"outerBoundaryIs":"innerBoundaryIs",c=this.createElementNS(this.kmlns,c),d=this.buildGeometry.linearring.apply(this,[a[e]]),c.appendChild(d),b.appendChild(c);return b},multipolygon:function(a){return this.buildGeometry.collection.apply(this,[a])},collection:function(a){for(var b=this.createElementNS(this.kmlns,"MultiGeometry"),c,d=0,e=a.components.length;d<e;++d)(c=this.buildGeometryNode.apply(this,[a.components[d]]))&&b.appendChild(c);return b}},buildCoordinatesNode:function(a){var b=
-this.createElementNS(this.kmlns,"coordinates"),c;if(c=a.components){for(var d=c.length,e=Array(d),f=0;f<d;++f)a=c[f],e[f]=this.buildCoordinates(a);c=e.join(" ")}else c=this.buildCoordinates(a);c=this.createTextNode(c);b.appendChild(c);return b},buildCoordinates:function(a){this.internalProjection&&this.externalProjection&&(a=a.clone(),a.transform(this.internalProjection,this.externalProjection));return a.x+","+a.y},buildExtendedData:function(a){var b=this.createElementNS(this.kmlns,"ExtendedData"),
-c;for(c in a)if(a[c]&&"name"!=c&&"description"!=c&&"styleUrl"!=c){var d=this.createElementNS(this.kmlns,"Data");d.setAttribute("name",c);var e=this.createElementNS(this.kmlns,"value");if("object"==typeof a[c]){if(a[c].value&&e.appendChild(this.createTextNode(a[c].value)),a[c].displayName){var f=this.createElementNS(this.kmlns,"displayName");f.appendChild(this.getXMLDoc().createCDATASection(a[c].displayName));d.appendChild(f)}}else e.appendChild(this.createTextNode(a[c]));d.appendChild(e);b.appendChild(d)}return this.isSimpleContent(b)?
-null:b},CLASS_NAME:"OpenLayers.Format.KML"});OpenLayers.Format.WMSCapabilities=OpenLayers.Class(OpenLayers.Format.XML.VersionedOGC,{defaultVersion:"1.1.1",profile:null,CLASS_NAME:"OpenLayers.Format.WMSCapabilities"});OpenLayers.Format.WMSCapabilities.v1=OpenLayers.Class(OpenLayers.Format.XML,{namespaces:{wms:"http://www.opengis.net/wms",xlink:"http://www.w3.org/1999/xlink",xsi:"http://www.w3.org/2001/XMLSchema-instance"},defaultPrefix:"wms",read:function(a){"string"==typeof a&&(a=OpenLayers.Format.XML.prototype.read.apply(this,[a]));var b=a;a&&9==a.nodeType&&(a=a.documentElement);var c={};this.readNode(a,c);void 0===c.service&&(a=new OpenLayers.Format.OGCExceptionReport,c.error=a.read(b));return c},readers:{wms:{Service:function(a,
-b){b.service={};this.readChildNodes(a,b.service)},Name:function(a,b){b.name=this.getChildValue(a)},Title:function(a,b){b.title=this.getChildValue(a)},Abstract:function(a,b){b["abstract"]=this.getChildValue(a)},BoundingBox:function(a,b){var c={};c.bbox=[parseFloat(a.getAttribute("minx")),parseFloat(a.getAttribute("miny")),parseFloat(a.getAttribute("maxx")),parseFloat(a.getAttribute("maxy"))];var d={x:parseFloat(a.getAttribute("resx")),y:parseFloat(a.getAttribute("resy"))};isNaN(d.x)&&isNaN(d.y)||(c.res=
-d);return c},OnlineResource:function(a,b){b.href=this.getAttributeNS(a,this.namespaces.xlink,"href")},ContactInformation:function(a,b){b.contactInformation={};this.readChildNodes(a,b.contactInformation)},ContactPersonPrimary:function(a,b){b.personPrimary={};this.readChildNodes(a,b.personPrimary)},ContactPerson:function(a,b){b.person=this.getChildValue(a)},ContactOrganization:function(a,b){b.organization=this.getChildValue(a)},ContactPosition:function(a,b){b.position=this.getChildValue(a)},ContactAddress:function(a,
-b){b.contactAddress={};this.readChildNodes(a,b.contactAddress)},AddressType:function(a,b){b.type=this.getChildValue(a)},Address:function(a,b){b.address=this.getChildValue(a)},City:function(a,b){b.city=this.getChildValue(a)},StateOrProvince:function(a,b){b.stateOrProvince=this.getChildValue(a)},PostCode:function(a,b){b.postcode=this.getChildValue(a)},Country:function(a,b){b.country=this.getChildValue(a)},ContactVoiceTelephone:function(a,b){b.phone=this.getChildValue(a)},ContactFacsimileTelephone:function(a,
-b){b.fax=this.getChildValue(a)},ContactElectronicMailAddress:function(a,b){b.email=this.getChildValue(a)},Fees:function(a,b){var c=this.getChildValue(a);c&&"none"!=c.toLowerCase()&&(b.fees=c)},AccessConstraints:function(a,b){var c=this.getChildValue(a);c&&"none"!=c.toLowerCase()&&(b.accessConstraints=c)},Capability:function(a,b){b.capability={nestedLayers:[],layers:[]};this.readChildNodes(a,b.capability)},Request:function(a,b){b.request={};this.readChildNodes(a,b.request)},GetCapabilities:function(a,
-b){b.getcapabilities={formats:[]};this.readChildNodes(a,b.getcapabilities)},Format:function(a,b){OpenLayers.Util.isArray(b.formats)?b.formats.push(this.getChildValue(a)):b.format=this.getChildValue(a)},DCPType:function(a,b){this.readChildNodes(a,b)},HTTP:function(a,b){this.readChildNodes(a,b)},Get:function(a,b){b.get={};this.readChildNodes(a,b.get);b.href||(b.href=b.get.href)},Post:function(a,b){b.post={};this.readChildNodes(a,b.post);b.href||(b.href=b.get.href)},GetMap:function(a,b){b.getmap={formats:[]};
-this.readChildNodes(a,b.getmap)},GetFeatureInfo:function(a,b){b.getfeatureinfo={formats:[]};this.readChildNodes(a,b.getfeatureinfo)},Exception:function(a,b){b.exception={formats:[]};this.readChildNodes(a,b.exception)},Layer:function(a,b){var c,d;b.capability?(d=b.capability,c=b):d=b;var e=a.getAttributeNode("queryable"),f=e&&e.specified?a.getAttribute("queryable"):null,g=(e=a.getAttributeNode("cascaded"))&&e.specified?a.getAttribute("cascaded"):null,e=(e=a.getAttributeNode("opaque"))&&e.specified?
-a.getAttribute("opaque"):null,h=a.getAttribute("noSubsets"),k=a.getAttribute("fixedWidth"),l=a.getAttribute("fixedHeight"),m=c||{},n=OpenLayers.Util.extend;c={nestedLayers:[],styles:c?[].concat(c.styles):[],srs:c?n({},m.srs):{},metadataURLs:[],bbox:c?n({},m.bbox):{},llbbox:m.llbbox,dimensions:c?n({},m.dimensions):{},authorityURLs:c?n({},m.authorityURLs):{},identifiers:{},keywords:[],queryable:f&&""!==f?"1"===f||"true"===f:m.queryable||!1,cascaded:null!==g?parseInt(g):m.cascaded||0,opaque:e?"1"===
-e||"true"===e:m.opaque||!1,noSubsets:null!==h?"1"===h||"true"===h:m.noSubsets||!1,fixedWidth:null!=k?parseInt(k):m.fixedWidth||0,fixedHeight:null!=l?parseInt(l):m.fixedHeight||0,minScale:m.minScale,maxScale:m.maxScale,attribution:m.attribution};b.nestedLayers.push(c);c.capability=d;this.readChildNodes(a,c);delete c.capability;c.name&&(f=c.name.split(":"),g=d.request,e=g.getfeatureinfo,0<f.length&&(c.prefix=f[0]),d.layers.push(c),void 0===c.formats&&(c.formats=g.getmap.formats),void 0===c.infoFormats&&
-e&&(c.infoFormats=e.formats))},Attribution:function(a,b){b.attribution={};this.readChildNodes(a,b.attribution)},LogoURL:function(a,b){b.logo={width:a.getAttribute("width"),height:a.getAttribute("height")};this.readChildNodes(a,b.logo)},Style:function(a,b){var c={};b.styles.push(c);this.readChildNodes(a,c)},LegendURL:function(a,b){var c={width:a.getAttribute("width"),height:a.getAttribute("height")};b.legend=c;this.readChildNodes(a,c)},MetadataURL:function(a,b){var c={type:a.getAttribute("type")};
-b.metadataURLs.push(c);this.readChildNodes(a,c)},DataURL:function(a,b){b.dataURL={};this.readChildNodes(a,b.dataURL)},FeatureListURL:function(a,b){b.featureListURL={};this.readChildNodes(a,b.featureListURL)},AuthorityURL:function(a,b){var c=a.getAttribute("name"),d={};this.readChildNodes(a,d);b.authorityURLs[c]=d.href},Identifier:function(a,b){var c=a.getAttribute("authority");b.identifiers[c]=this.getChildValue(a)},KeywordList:function(a,b){this.readChildNodes(a,b)},SRS:function(a,b){b.srs[this.getChildValue(a)]=
-!0}}},CLASS_NAME:"OpenLayers.Format.WMSCapabilities.v1"});OpenLayers.Format.WMSCapabilities.v1_1=OpenLayers.Class(OpenLayers.Format.WMSCapabilities.v1,{readers:{wms:OpenLayers.Util.applyDefaults({WMT_MS_Capabilities:function(a,b){this.readChildNodes(a,b)},Keyword:function(a,b){b.keywords&&b.keywords.push(this.getChildValue(a))},DescribeLayer:function(a,b){b.describelayer={formats:[]};this.readChildNodes(a,b.describelayer)},GetLegendGraphic:function(a,b){b.getlegendgraphic={formats:[]};this.readChildNodes(a,b.getlegendgraphic)},GetStyles:function(a,b){b.getstyles=
-{formats:[]};this.readChildNodes(a,b.getstyles)},PutStyles:function(a,b){b.putstyles={formats:[]};this.readChildNodes(a,b.putstyles)},UserDefinedSymbolization:function(a,b){var c={supportSLD:1==parseInt(a.getAttribute("SupportSLD")),userLayer:1==parseInt(a.getAttribute("UserLayer")),userStyle:1==parseInt(a.getAttribute("UserStyle")),remoteWFS:1==parseInt(a.getAttribute("RemoteWFS"))};b.userSymbols=c},LatLonBoundingBox:function(a,b){b.llbbox=[parseFloat(a.getAttribute("minx")),parseFloat(a.getAttribute("miny")),
-parseFloat(a.getAttribute("maxx")),parseFloat(a.getAttribute("maxy"))]},BoundingBox:function(a,b){var c=OpenLayers.Format.WMSCapabilities.v1.prototype.readers.wms.BoundingBox.apply(this,[a,b]);c.srs=a.getAttribute("SRS");b.bbox[c.srs]=c},ScaleHint:function(a,b){var c=a.getAttribute("min"),d=a.getAttribute("max"),e=Math.pow(2,0.5),f=OpenLayers.INCHES_PER_UNIT.m;0!=c&&(b.maxScale=parseFloat((c/e*f*OpenLayers.DOTS_PER_INCH).toPrecision(13)));d!=Number.POSITIVE_INFINITY&&(b.minScale=parseFloat((d/e*f*
-OpenLayers.DOTS_PER_INCH).toPrecision(13)))},Dimension:function(a,b){var c={name:a.getAttribute("name").toLowerCase(),units:a.getAttribute("units"),unitsymbol:a.getAttribute("unitSymbol")};b.dimensions[c.name]=c},Extent:function(a,b){var c=a.getAttribute("name").toLowerCase();if(c in b.dimensions){c=b.dimensions[c];c.nearestVal="1"===a.getAttribute("nearestValue");c.multipleVal="1"===a.getAttribute("multipleValues");c.current="1"===a.getAttribute("current");c["default"]=a.getAttribute("default")||
-"";var d=this.getChildValue(a);c.values=d.split(",")}}},OpenLayers.Format.WMSCapabilities.v1.prototype.readers.wms)},CLASS_NAME:"OpenLayers.Format.WMSCapabilities.v1_1"});OpenLayers.Format.WMSCapabilities.v1_1_0=OpenLayers.Class(OpenLayers.Format.WMSCapabilities.v1_1,{version:"1.1.0",readers:{wms:OpenLayers.Util.applyDefaults({SRS:function(a,b){for(var c=this.getChildValue(a).split(/ +/),d=0,e=c.length;d<e;d++)b.srs[c[d]]=!0}},OpenLayers.Format.WMSCapabilities.v1_1.prototype.readers.wms)},CLASS_NAME:"OpenLayers.Format.WMSCapabilities.v1_1_0"});OpenLayers.Protocol.WFS.v1=OpenLayers.Class(OpenLayers.Protocol,{version:null,srsName:"EPSG:4326",featureType:null,featureNS:null,geometryName:"the_geom",schema:null,featurePrefix:"feature",formatOptions:null,readFormat:null,readOptions:null,initialize:function(a){OpenLayers.Protocol.prototype.initialize.apply(this,[a]);a.format||(this.format=OpenLayers.Format.WFST(OpenLayers.Util.extend({version:this.version,featureType:this.featureType,featureNS:this.featureNS,featurePrefix:this.featurePrefix,geometryName:this.geometryName,
-srsName:this.srsName,schema:this.schema},this.formatOptions)));!a.geometryName&&1<parseFloat(this.format.version)&&this.setGeometryName(null)},destroy:function(){this.options&&!this.options.format&&this.format.destroy();this.format=null;OpenLayers.Protocol.prototype.destroy.apply(this)},read:function(a){OpenLayers.Protocol.prototype.read.apply(this,arguments);a=OpenLayers.Util.extend({},a);OpenLayers.Util.applyDefaults(a,this.options||{});var b=new OpenLayers.Protocol.Response({requestType:"read"}),
-c=OpenLayers.Format.XML.prototype.write.apply(this.format,[this.format.writeNode("wfs:GetFeature",a)]);b.priv=OpenLayers.Request.POST({url:a.url,callback:this.createCallback(this.handleRead,b,a),params:a.params,headers:a.headers,data:c});return b},setFeatureType:function(a){this.featureType=a;this.format.featureType=a},setGeometryName:function(a){this.geometryName=a;this.format.geometryName=a},handleRead:function(a,b){b=OpenLayers.Util.extend({},b);OpenLayers.Util.applyDefaults(b,this.options);if(b.callback){var c=
-a.priv;200<=c.status&&300>c.status?(c=this.parseResponse(c,b.readOptions))&&!1!==c.success?(b.readOptions&&"object"==b.readOptions.output?OpenLayers.Util.extend(a,c):a.features=c,a.code=OpenLayers.Protocol.Response.SUCCESS):(a.code=OpenLayers.Protocol.Response.FAILURE,a.error=c):a.code=OpenLayers.Protocol.Response.FAILURE;b.callback.call(b.scope,a)}},parseResponse:function(a,b){var c=a.responseXML;c&&c.documentElement||(c=a.responseText);if(!c||0>=c.length)return null;c=null!==this.readFormat?this.readFormat.read(c):
-this.format.read(c,b);if(!this.featureNS){var d=this.readFormat||this.format;this.featureNS=d.featureNS;d.autoConfig=!1;this.geometryName||this.setGeometryName(d.geometryName)}return c},commit:function(a,b){b=OpenLayers.Util.extend({},b);OpenLayers.Util.applyDefaults(b,this.options);var c=new OpenLayers.Protocol.Response({requestType:"commit",reqFeatures:a});c.priv=OpenLayers.Request.POST({url:b.url,headers:b.headers,data:this.format.write(a,b),callback:this.createCallback(this.handleCommit,c,b)});
-return c},handleCommit:function(a,b){if(b.callback){var c=a.priv,d=c.responseXML;d&&d.documentElement||(d=c.responseText);c=this.format.read(d)||{};a.insertIds=c.insertIds||[];c.success?a.code=OpenLayers.Protocol.Response.SUCCESS:(a.code=OpenLayers.Protocol.Response.FAILURE,a.error=c);b.callback.call(b.scope,a)}},filterDelete:function(a,b){b=OpenLayers.Util.extend({},b);OpenLayers.Util.applyDefaults(b,this.options);new OpenLayers.Protocol.Response({requestType:"commit"});var c=this.format.createElementNSPlus("wfs:Transaction",
-{attributes:{service:"WFS",version:this.version}}),d=this.format.createElementNSPlus("wfs:Delete",{attributes:{typeName:(b.featureNS?this.featurePrefix+":":"")+b.featureType}});b.featureNS&&d.setAttribute("xmlns:"+this.featurePrefix,b.featureNS);var e=this.format.writeNode("ogc:Filter",a);d.appendChild(e);c.appendChild(d);c=OpenLayers.Format.XML.prototype.write.apply(this.format,[c]);return OpenLayers.Request.POST({url:this.url,callback:b.callback||function(){},data:c})},abort:function(a){a&&a.priv.abort()},
-CLASS_NAME:"OpenLayers.Protocol.WFS.v1"});OpenLayers.Handler.Feature=OpenLayers.Class(OpenLayers.Handler,{EVENTMAP:{click:{"in":"click",out:"clickout"},mousemove:{"in":"over",out:"out"},dblclick:{"in":"dblclick",out:null},mousedown:{"in":null,out:null},mouseup:{"in":null,out:null},touchstart:{"in":"click",out:"clickout"}},feature:null,lastFeature:null,down:null,up:null,clickTolerance:4,geometryTypes:null,stopClick:!0,stopDown:!0,stopUp:!1,initialize:function(a,b,c,d){OpenLayers.Handler.prototype.initialize.apply(this,[a,c,d]);this.layer=
-b},touchstart:function(a){this.startTouch();return OpenLayers.Event.isMultiTouch(a)?!0:this.mousedown(a)},touchmove:function(a){OpenLayers.Event.preventDefault(a)},mousedown:function(a){if(OpenLayers.Event.isLeftClick(a)||OpenLayers.Event.isSingleTouch(a))this.down=a.xy;return this.handle(a)?!this.stopDown:!0},mouseup:function(a){this.up=a.xy;return this.handle(a)?!this.stopUp:!0},click:function(a){return this.handle(a)?!this.stopClick:!0},mousemove:function(a){if(!this.callbacks.over&&!this.callbacks.out)return!0;
-this.handle(a);return!0},dblclick:function(a){return!this.handle(a)},geometryTypeMatches:function(a){return null==this.geometryTypes||-1<OpenLayers.Util.indexOf(this.geometryTypes,a.geometry.CLASS_NAME)},handle:function(a){this.feature&&!this.feature.layer&&(this.feature=null);var b=a.type,c=!1,d=!!this.feature,e="click"==b||"dblclick"==b||"touchstart"==b;(this.feature=this.layer.getFeatureFromEvent(a))&&!this.feature.layer&&(this.feature=null);this.lastFeature&&!this.lastFeature.layer&&(this.lastFeature=
-null);this.feature?("touchstart"===b&&OpenLayers.Event.preventDefault(a),a=this.feature!=this.lastFeature,this.geometryTypeMatches(this.feature)?(d&&a?(this.lastFeature&&this.triggerCallback(b,"out",[this.lastFeature]),this.triggerCallback(b,"in",[this.feature])):d&&!e||this.triggerCallback(b,"in",[this.feature]),this.lastFeature=this.feature,c=!0):(this.lastFeature&&(d&&a||e)&&this.triggerCallback(b,"out",[this.lastFeature]),this.feature=null)):this.lastFeature&&(d||e)&&this.triggerCallback(b,"out",
-[this.lastFeature]);return c},triggerCallback:function(a,b,c){if(b=this.EVENTMAP[a][b])"click"==a&&this.up&&this.down?(Math.sqrt(Math.pow(this.up.x-this.down.x,2)+Math.pow(this.up.y-this.down.y,2))<=this.clickTolerance&&this.callback(b,c),this.up=this.down=null):this.callback(b,c)},activate:function(){var a=!1;OpenLayers.Handler.prototype.activate.apply(this,arguments)&&(this.moveLayerToTop(),this.map.events.on({removelayer:this.handleMapEvents,changelayer:this.handleMapEvents,scope:this}),a=!0);
-return a},deactivate:function(){var a=!1;OpenLayers.Handler.prototype.deactivate.apply(this,arguments)&&(this.moveLayerBack(),this.up=this.down=this.lastFeature=this.feature=null,this.map.events.un({removelayer:this.handleMapEvents,changelayer:this.handleMapEvents,scope:this}),a=!0);return a},handleMapEvents:function(a){"removelayer"!=a.type&&"order"!=a.property||this.moveLayerToTop()},moveLayerToTop:function(){var a=Math.max(this.map.Z_INDEX_BASE.Feature-1,this.layer.getZIndex())+1;this.layer.setZIndex(a)},
-moveLayerBack:function(){var a=this.layer.getZIndex()-1;a>=this.map.Z_INDEX_BASE.Feature?this.layer.setZIndex(a):this.map.setLayerZIndex(this.layer,this.map.getLayerIndex(this.layer))},CLASS_NAME:"OpenLayers.Handler.Feature"});OpenLayers.Layer.Vector.RootContainer=OpenLayers.Class(OpenLayers.Layer.Vector,{displayInLayerSwitcher:!1,layers:null,display:function(){},getFeatureFromEvent:function(a){for(var b=this.layers,c,d=0;d<b.length;d++)if(c=b[d].getFeatureFromEvent(a))return c},setMap:function(a){OpenLayers.Layer.Vector.prototype.setMap.apply(this,arguments);this.collectRoots();a.events.register("changelayer",this,this.handleChangeLayer)},removeMap:function(a){a.events.unregister("changelayer",this,this.handleChangeLayer);
-this.resetRoots();OpenLayers.Layer.Vector.prototype.removeMap.apply(this,arguments)},collectRoots:function(){for(var a,b=0;b<this.map.layers.length;++b)a=this.map.layers[b],-1!=OpenLayers.Util.indexOf(this.layers,a)&&a.renderer.moveRoot(this.renderer)},resetRoots:function(){for(var a,b=0;b<this.layers.length;++b)a=this.layers[b],this.renderer&&a.renderer.getRenderLayerId()==this.id&&this.renderer.moveRoot(a.renderer)},handleChangeLayer:function(a){var b=a.layer;"order"==a.property&&-1!=OpenLayers.Util.indexOf(this.layers,
-b)&&(this.resetRoots(),this.collectRoots())},CLASS_NAME:"OpenLayers.Layer.Vector.RootContainer"});OpenLayers.Control.SelectFeature=OpenLayers.Class(OpenLayers.Control,{multipleKey:null,toggleKey:null,multiple:!1,clickout:!0,toggle:!1,hover:!1,highlightOnly:!1,box:!1,onBeforeSelect:function(){},onSelect:function(){},onUnselect:function(){},scope:null,geometryTypes:null,layer:null,layers:null,callbacks:null,selectStyle:null,renderIntent:"select",handlers:null,initialize:function(a,b){OpenLayers.Control.prototype.initialize.apply(this,[b]);null===this.scope&&(this.scope=this);this.initLayer(a);var c=
-{click:this.clickFeature,clickout:this.clickoutFeature};this.hover&&(c.over=this.overFeature,c.out=this.outFeature);this.callbacks=OpenLayers.Util.extend(c,this.callbacks);this.handlers={feature:new OpenLayers.Handler.Feature(this,this.layer,this.callbacks,{geometryTypes:this.geometryTypes})};this.box&&(this.handlers.box=new OpenLayers.Handler.Box(this,{done:this.selectBox},{boxDivClassName:"olHandlerBoxSelectFeature"}))},initLayer:function(a){OpenLayers.Util.isArray(a)?(this.layers=a,this.layer=
-new OpenLayers.Layer.Vector.RootContainer(this.id+"_container",{layers:a})):this.layer=a},destroy:function(){this.active&&this.layers&&this.map.removeLayer(this.layer);OpenLayers.Control.prototype.destroy.apply(this,arguments);this.layers&&this.layer.destroy()},activate:function(){this.active||(this.layers&&this.map.addLayer(this.layer),this.handlers.feature.activate(),this.box&&this.handlers.box&&this.handlers.box.activate());return OpenLayers.Control.prototype.activate.apply(this,arguments)},deactivate:function(){this.active&&
-(this.handlers.feature.deactivate(),this.handlers.box&&this.handlers.box.deactivate(),this.layers&&this.map.removeLayer(this.layer));return OpenLayers.Control.prototype.deactivate.apply(this,arguments)},unselectAll:function(a){var b=this.layers||[this.layer],c,d,e,f;for(e=0;e<b.length;++e)if(c=b[e],f=0,null!=c.selectedFeatures)for(;c.selectedFeatures.length>f;)d=c.selectedFeatures[f],a&&a.except==d?++f:this.unselect(d)},clickFeature:function(a){this.hover||(-1<OpenLayers.Util.indexOf(a.layer.selectedFeatures,
-a)?this.toggleSelect()?this.unselect(a):this.multipleSelect()||this.unselectAll({except:a}):(this.multipleSelect()||this.unselectAll({except:a}),this.select(a)))},multipleSelect:function(){return this.multiple||this.handlers.feature.evt&&this.handlers.feature.evt[this.multipleKey]},toggleSelect:function(){return this.toggle||this.handlers.feature.evt&&this.handlers.feature.evt[this.toggleKey]},clickoutFeature:function(a){!this.hover&&this.clickout&&this.unselectAll()},overFeature:function(a){var b=
-a.layer;this.hover&&(this.highlightOnly?this.highlight(a):-1==OpenLayers.Util.indexOf(b.selectedFeatures,a)&&this.select(a))},outFeature:function(a){if(this.hover)if(this.highlightOnly){if(a._lastHighlighter==this.id)if(a._prevHighlighter&&a._prevHighlighter!=this.id){delete a._lastHighlighter;var b=this.map.getControl(a._prevHighlighter);b&&b.highlight(a)}else this.unhighlight(a)}else this.unselect(a)},highlight:function(a){var b=a.layer;!1!==this.events.triggerEvent("beforefeaturehighlighted",{feature:a})&&
-(a._prevHighlighter=a._lastHighlighter,a._lastHighlighter=this.id,b.drawFeature(a,this.selectStyle||this.renderIntent),this.events.triggerEvent("featurehighlighted",{feature:a}))},unhighlight:function(a){var b=a.layer;void 0==a._prevHighlighter?delete a._lastHighlighter:(a._prevHighlighter!=this.id&&(a._lastHighlighter=a._prevHighlighter),delete a._prevHighlighter);b.drawFeature(a,a.style||a.layer.style||"default");this.events.triggerEvent("featureunhighlighted",{feature:a})},select:function(a){var b=
-this.onBeforeSelect.call(this.scope,a),c=a.layer;!1!==b&&(b=c.events.triggerEvent("beforefeatureselected",{feature:a}),!1!==b&&(c.selectedFeatures.push(a),this.highlight(a),this.handlers.feature.lastFeature||(this.handlers.feature.lastFeature=c.selectedFeatures[0]),c.events.triggerEvent("featureselected",{feature:a}),this.onSelect.call(this.scope,a)))},unselect:function(a){var b=a.layer;this.unhighlight(a);OpenLayers.Util.removeItem(b.selectedFeatures,a);b.events.triggerEvent("featureunselected",
-{feature:a});this.onUnselect.call(this.scope,a)},selectBox:function(a){if(a instanceof OpenLayers.Bounds){var b=this.map.getLonLatFromPixel({x:a.left,y:a.bottom});a=this.map.getLonLatFromPixel({x:a.right,y:a.top});b=new OpenLayers.Bounds(b.lon,b.lat,a.lon,a.lat);this.multipleSelect()||this.unselectAll();a=this.multiple;this.multiple=!0;var c=this.layers||[this.layer];this.events.triggerEvent("boxselectionstart",{layers:c});for(var d,e=0;e<c.length;++e){d=c[e];for(var f=0,g=d.features.length;f<g;++f){var h=
-d.features[f];h.getVisibility()&&(null==this.geometryTypes||-1<OpenLayers.Util.indexOf(this.geometryTypes,h.geometry.CLASS_NAME))&&b.toGeometry().intersects(h.geometry)&&-1==OpenLayers.Util.indexOf(d.selectedFeatures,h)&&this.select(h)}}this.multiple=a;this.events.triggerEvent("boxselectionend",{layers:c})}},setMap:function(a){this.handlers.feature.setMap(a);this.box&&this.handlers.box.setMap(a);OpenLayers.Control.prototype.setMap.apply(this,arguments)},setLayer:function(a){var b=this.active;this.unselectAll();
-this.deactivate();this.layers&&(this.layer.destroy(),this.layers=null);this.initLayer(a);this.handlers.feature.layer=this.layer;b&&this.activate()},CLASS_NAME:"OpenLayers.Control.SelectFeature"});OpenLayers.Handler.Point=OpenLayers.Class(OpenLayers.Handler,{point:null,layer:null,multi:!1,citeCompliant:!1,mouseDown:!1,stoppedDown:null,lastDown:null,lastUp:null,persist:!1,stopDown:!1,stopUp:!1,layerOptions:null,pixelTolerance:5,lastTouchPx:null,initialize:function(a,b,c){c&&c.layerOptions&&c.layerOptions.styleMap||(this.style=OpenLayers.Util.extend(OpenLayers.Feature.Vector.style["default"],{}));OpenLayers.Handler.prototype.initialize.apply(this,arguments)},activate:function(){if(!OpenLayers.Handler.prototype.activate.apply(this,
-arguments))return!1;var a=OpenLayers.Util.extend({displayInLayerSwitcher:!1,calculateInRange:OpenLayers.Function.True,wrapDateLine:this.citeCompliant},this.layerOptions);this.layer=new OpenLayers.Layer.Vector(this.CLASS_NAME,a);this.map.addLayer(this.layer);return!0},createFeature:function(a){a=this.layer.getLonLatFromViewPortPx(a);a=new OpenLayers.Geometry.Point(a.lon,a.lat);this.point=new OpenLayers.Feature.Vector(a);this.callback("create",[this.point.geometry,this.point]);this.point.geometry.clearBounds();
-this.layer.addFeatures([this.point],{silent:!0})},deactivate:function(){if(!OpenLayers.Handler.prototype.deactivate.apply(this,arguments))return!1;this.cancel();null!=this.layer.map&&(this.destroyFeature(!0),this.layer.destroy(!1));this.layer=null;return!0},destroyFeature:function(a){!this.layer||!a&&this.persist||this.layer.destroyFeatures();this.point=null},destroyPersistedFeature:function(){var a=this.layer;a&&1<a.features.length&&this.layer.features[0].destroy()},finalize:function(a){this.mouseDown=
-!1;this.lastTouchPx=this.lastUp=this.lastDown=null;this.callback(a?"cancel":"done",[this.geometryClone()]);this.destroyFeature(a)},cancel:function(){this.finalize(!0)},click:function(a){OpenLayers.Event.stop(a);return!1},dblclick:function(a){OpenLayers.Event.stop(a);return!1},modifyFeature:function(a){this.point||this.createFeature(a);a=this.layer.getLonLatFromViewPortPx(a);this.point.geometry.x=a.lon;this.point.geometry.y=a.lat;this.callback("modify",[this.point.geometry,this.point,!1]);this.point.geometry.clearBounds();
-this.drawFeature()},drawFeature:function(){this.layer.drawFeature(this.point,this.style)},getGeometry:function(){var a=this.point&&this.point.geometry;a&&this.multi&&(a=new OpenLayers.Geometry.MultiPoint([a]));return a},geometryClone:function(){var a=this.getGeometry();return a&&a.clone()},mousedown:function(a){return this.down(a)},touchstart:function(a){this.startTouch();this.lastTouchPx=a.xy;return this.down(a)},mousemove:function(a){return this.move(a)},touchmove:function(a){this.lastTouchPx=a.xy;
-return this.move(a)},mouseup:function(a){return this.up(a)},touchend:function(a){a.xy=this.lastTouchPx;return this.up(a)},down:function(a){this.mouseDown=!0;this.lastDown=a.xy;this.touch||this.modifyFeature(a.xy);this.stoppedDown=this.stopDown;return!this.stopDown},move:function(a){this.touch||this.mouseDown&&!this.stoppedDown||this.modifyFeature(a.xy);return!0},up:function(a){this.mouseDown=!1;this.stoppedDown=this.stopDown;if(!this.checkModifiers(a)||this.lastUp&&this.lastUp.equals(a.xy)||!this.lastDown||
-!this.passesTolerance(this.lastDown,a.xy,this.pixelTolerance))return!0;this.touch&&this.modifyFeature(a.xy);this.persist&&this.destroyPersistedFeature();this.lastUp=a.xy;this.finalize();return!this.stopUp},mouseout:function(a){OpenLayers.Util.mouseLeft(a,this.map.viewPortDiv)&&(this.stoppedDown=this.stopDown,this.mouseDown=!1)},passesTolerance:function(a,b,c){var d=!0;null!=c&&a&&b&&a.distanceTo(b)>c&&(d=!1);return d},CLASS_NAME:"OpenLayers.Handler.Point"});OpenLayers.Handler.Path=OpenLayers.Class(OpenLayers.Handler.Point,{line:null,maxVertices:null,doubleTouchTolerance:20,freehand:!1,freehandToggle:"shiftKey",timerId:null,redoStack:null,createFeature:function(a){a=this.layer.getLonLatFromViewPortPx(a);a=new OpenLayers.Geometry.Point(a.lon,a.lat);this.point=new OpenLayers.Feature.Vector(a);this.line=new OpenLayers.Feature.Vector(new OpenLayers.Geometry.LineString([this.point.geometry]));this.callback("create",[this.point.geometry,this.getSketch()]);
-this.point.geometry.clearBounds();this.layer.addFeatures([this.line,this.point],{silent:!0})},destroyFeature:function(a){OpenLayers.Handler.Point.prototype.destroyFeature.call(this,a);this.line=null},destroyPersistedFeature:function(){var a=this.layer;a&&2<a.features.length&&this.layer.features[0].destroy()},removePoint:function(){this.point&&this.layer.removeFeatures([this.point])},addPoint:function(a){this.layer.removeFeatures([this.point]);a=this.layer.getLonLatFromViewPortPx(a);this.point=new OpenLayers.Feature.Vector(new OpenLayers.Geometry.Point(a.lon,
-a.lat));this.line.geometry.addComponent(this.point.geometry,this.line.geometry.components.length);this.layer.addFeatures([this.point]);this.callback("point",[this.point.geometry,this.getGeometry()]);this.callback("modify",[this.point.geometry,this.getSketch()]);this.drawFeature();delete this.redoStack},insertXY:function(a,b){this.line.geometry.addComponent(new OpenLayers.Geometry.Point(a,b),this.getCurrentPointIndex());this.drawFeature();delete this.redoStack},insertDeltaXY:function(a,b){var c=this.getCurrentPointIndex()-
-1,c=this.line.geometry.components[c];!c||(isNaN(c.x)||isNaN(c.y))||this.insertXY(c.x+a,c.y+b)},insertDirectionLength:function(a,b){a*=Math.PI/180;var c=b*Math.cos(a),d=b*Math.sin(a);this.insertDeltaXY(c,d)},insertDeflectionLength:function(a,b){var c=this.getCurrentPointIndex()-1;if(0<c){var d=this.line.geometry.components[c],c=this.line.geometry.components[c-1],d=Math.atan2(d.y-c.y,d.x-c.x);this.insertDirectionLength(180*d/Math.PI+a,b)}},getCurrentPointIndex:function(){return this.line.geometry.components.length-
-1},undo:function(){var a=this.line.geometry,b=a.components,c=this.getCurrentPointIndex()-1,d=b[c],e=a.removeComponent(d);e&&(this.touch&&0<c&&(b=a.components,a=b[c-1],c=this.getCurrentPointIndex(),b=b[c],b.x=a.x,b.y=a.y),this.redoStack||(this.redoStack=[]),this.redoStack.push(d),this.drawFeature());return e},redo:function(){var a=this.redoStack&&this.redoStack.pop();a&&(this.line.geometry.addComponent(a,this.getCurrentPointIndex()),this.drawFeature());return!!a},freehandMode:function(a){return this.freehandToggle&&
-a[this.freehandToggle]?!this.freehand:this.freehand},modifyFeature:function(a,b){this.line||this.createFeature(a);var c=this.layer.getLonLatFromViewPortPx(a);this.point.geometry.x=c.lon;this.point.geometry.y=c.lat;this.callback("modify",[this.point.geometry,this.getSketch(),b]);this.point.geometry.clearBounds();this.drawFeature()},drawFeature:function(){this.layer.drawFeature(this.line,this.style);this.layer.drawFeature(this.point,this.style)},getSketch:function(){return this.line},getGeometry:function(){var a=
-this.line&&this.line.geometry;a&&this.multi&&(a=new OpenLayers.Geometry.MultiLineString([a]));return a},touchstart:function(a){if(this.timerId&&this.passesTolerance(this.lastTouchPx,a.xy,this.doubleTouchTolerance))return this.finishGeometry(),window.clearTimeout(this.timerId),this.timerId=null,!1;this.timerId&&(window.clearTimeout(this.timerId),this.timerId=null);this.timerId=window.setTimeout(OpenLayers.Function.bind(function(){this.timerId=null},this),300);return OpenLayers.Handler.Point.prototype.touchstart.call(this,
-a)},down:function(a){var b=this.stopDown;this.freehandMode(a)&&(b=!0,this.touch&&(this.modifyFeature(a.xy,!!this.lastUp),OpenLayers.Event.stop(a)));this.touch||this.lastDown&&this.passesTolerance(this.lastDown,a.xy,this.pixelTolerance)||this.modifyFeature(a.xy,!!this.lastUp);this.mouseDown=!0;this.lastDown=a.xy;this.stoppedDown=b;return!b},move:function(a){if(this.stoppedDown&&this.freehandMode(a))return this.persist&&this.destroyPersistedFeature(),this.maxVertices&&this.line&&this.line.geometry.components.length===
-this.maxVertices?(this.removePoint(),this.finalize()):this.addPoint(a.xy),!1;this.touch||this.mouseDown&&!this.stoppedDown||this.modifyFeature(a.xy,!!this.lastUp);return!0},up:function(a){!this.mouseDown||this.lastUp&&this.lastUp.equals(a.xy)||(this.stoppedDown&&this.freehandMode(a)?(this.persist&&this.destroyPersistedFeature(),this.removePoint(),this.finalize()):this.passesTolerance(this.lastDown,a.xy,this.pixelTolerance)&&(this.touch&&this.modifyFeature(a.xy),null==this.lastUp&&this.persist&&this.destroyPersistedFeature(),
-this.addPoint(a.xy),this.lastUp=a.xy,this.line.geometry.components.length===this.maxVertices+1&&this.finishGeometry()));this.stoppedDown=this.stopDown;this.mouseDown=!1;return!this.stopUp},finishGeometry:function(){this.line.geometry.removeComponent(this.line.geometry.components[this.line.geometry.components.length-1]);this.removePoint();this.finalize()},dblclick:function(a){this.freehandMode(a)||this.finishGeometry();return!1},CLASS_NAME:"OpenLayers.Handler.Path"});OpenLayers.Spherical=OpenLayers.Spherical||{};OpenLayers.Spherical.DEFAULT_RADIUS=6378137;OpenLayers.Spherical.computeDistanceBetween=function(a,b,c){c=c||OpenLayers.Spherical.DEFAULT_RADIUS;var d=Math.sin(Math.PI*(b.lon-a.lon)/360),e=Math.sin(Math.PI*(b.lat-a.lat)/360);a=e*e+d*d*Math.cos(Math.PI*a.lat/180)*Math.cos(Math.PI*b.lat/180);return 2*c*Math.atan2(Math.sqrt(a),Math.sqrt(1-a))};
-OpenLayers.Spherical.computeHeading=function(a,b){var c=Math.sin(Math.PI*(a.lon-b.lon)/180)*Math.cos(Math.PI*b.lat/180),d=Math.cos(Math.PI*a.lat/180)*Math.sin(Math.PI*b.lat/180)-Math.sin(Math.PI*a.lat/180)*Math.cos(Math.PI*b.lat/180)*Math.cos(Math.PI*(a.lon-b.lon)/180);return 180*Math.atan2(c,d)/Math.PI};OpenLayers.Control.CacheWrite=OpenLayers.Class(OpenLayers.Control,{layers:null,imageFormat:"image/png",quotaRegEx:/quota/i,setMap:function(a){OpenLayers.Control.prototype.setMap.apply(this,arguments);var b,c=this.layers||a.layers;for(b=c.length-1;0<=b;--b)this.addLayer({layer:c[b]});if(!this.layers)a.events.on({addlayer:this.addLayer,removeLayer:this.removeLayer,scope:this})},addLayer:function(a){a.layer.events.on({tileloadstart:this.makeSameOrigin,tileloaded:this.onTileLoaded,scope:this})},removeLayer:function(a){a.layer.events.un({tileloadstart:this.makeSameOrigin,
-tileloaded:this.onTileLoaded,scope:this})},makeSameOrigin:function(a){if(this.active&&(a=a.tile,a instanceof OpenLayers.Tile.Image&&!a.crossOriginKeyword&&"data:"!==a.url.substr(0,5))){var b=OpenLayers.Request.makeSameOrigin(a.url,OpenLayers.ProxyHost);OpenLayers.Control.CacheWrite.urlMap[b]=a.url;a.url=b}},onTileLoaded:function(a){this.active&&(!a.aborted&&a.tile instanceof OpenLayers.Tile.Image&&"data:"!==a.tile.url.substr(0,5))&&(this.cache({tile:a.tile}),delete OpenLayers.Control.CacheWrite.urlMap[a.tile.url])},
-cache:function(a){if(window.localStorage){a=a.tile;try{var b=a.getCanvasContext();b&&window.localStorage.setItem("olCache_"+(OpenLayers.Control.CacheWrite.urlMap[a.url]||a.url),b.canvas.toDataURL(this.imageFormat))}catch(c){(b=c.name||c.message)&&this.quotaRegEx.test(b)?this.events.triggerEvent("cachefull",{tile:a}):OpenLayers.Console.error(c.toString())}}},destroy:function(){if(this.layers||this.map){var a,b=this.layers||this.map.layers;for(a=b.length-1;0<=a;--a)this.removeLayer({layer:b[a]})}this.map&&
-this.map.events.un({addlayer:this.addLayer,removeLayer:this.removeLayer,scope:this});OpenLayers.Control.prototype.destroy.apply(this,arguments)},CLASS_NAME:"OpenLayers.Control.CacheWrite"});OpenLayers.Control.CacheWrite.clearCache=function(){if(window.localStorage){var a,b;for(a=window.localStorage.length-1;0<=a;--a)b=window.localStorage.key(a),"olCache_"===b.substr(0,8)&&window.localStorage.removeItem(b)}};OpenLayers.Control.CacheWrite.urlMap={};OpenLayers.Format.Context=OpenLayers.Class(OpenLayers.Format.XML.VersionedOGC,{layerOptions:null,layerParams:null,read:function(a,b){var c=OpenLayers.Format.XML.VersionedOGC.prototype.read.apply(this,arguments);if(b&&b.map)if(this.context=c,b.map instanceof OpenLayers.Map)c=this.mergeContextToMap(c,b.map);else{var d=b.map;if(OpenLayers.Util.isElement(d)||"string"==typeof d)d={div:d};c=this.contextToMap(c,d)}return c},getLayerFromContext:function(a){var b,c,d={queryable:a.queryable,visibility:a.visibility,
-maxExtent:a.maxExtent,metadata:OpenLayers.Util.applyDefaults(a.metadata,{styles:a.styles,formats:a.formats,"abstract":a["abstract"],dataURL:a.dataURL}),numZoomLevels:a.numZoomLevels,units:a.units,isBaseLayer:a.isBaseLayer,opacity:a.opacity,displayInLayerSwitcher:a.displayInLayerSwitcher,singleTile:a.singleTile,tileSize:a.tileSize?new OpenLayers.Size(a.tileSize.width,a.tileSize.height):void 0,minScale:a.minScale||a.maxScaleDenominator,maxScale:a.maxScale||a.minScaleDenominator,srs:a.srs,dimensions:a.dimensions,
-metadataURL:a.metadataURL};this.layerOptions&&OpenLayers.Util.applyDefaults(d,this.layerOptions);var e={layers:a.name,transparent:a.transparent,version:a.version};if(a.formats&&0<a.formats.length)for(e.format=a.formats[0].value,b=0,c=a.formats.length;b<c;b++){var f=a.formats[b];if(!0==f.current){e.format=f.value;break}}if(a.styles&&0<a.styles.length)for(b=0,c=a.styles.length;b<c;b++)if(f=a.styles[b],!0==f.current){f.href?e.sld=f.href:f.body?e.sld_body=f.body:e.styles=f.name;break}this.layerParams&&
-OpenLayers.Util.applyDefaults(e,this.layerParams);b=null;c=a.service;c==OpenLayers.Format.Context.serviceTypes.WFS?(d.strategies=[new OpenLayers.Strategy.BBOX],d.protocol=new OpenLayers.Protocol.WFS({url:a.url,featurePrefix:a.name.split(":")[0],featureType:a.name.split(":").pop()}),b=new OpenLayers.Layer.Vector(a.title||a.name,d)):c==OpenLayers.Format.Context.serviceTypes.KML?(d.strategies=[new OpenLayers.Strategy.Fixed],d.protocol=new OpenLayers.Protocol.HTTP({url:a.url,format:new OpenLayers.Format.KML}),
-b=new OpenLayers.Layer.Vector(a.title||a.name,d)):c==OpenLayers.Format.Context.serviceTypes.GML?(d.strategies=[new OpenLayers.Strategy.Fixed],d.protocol=new OpenLayers.Protocol.HTTP({url:a.url,format:new OpenLayers.Format.GML}),b=new OpenLayers.Layer.Vector(a.title||a.name,d)):a.features?(b=new OpenLayers.Layer.Vector(a.title||a.name,d),b.addFeatures(a.features)):!0!==a.categoryLayer&&(b=new OpenLayers.Layer.WMS(a.title||a.name,a.url,e,d));return b},getLayersFromContext:function(a){for(var b=[],c=
-0,d=a.length;c<d;c++){var e=this.getLayerFromContext(a[c]);null!==e&&b.push(e)}return b},contextToMap:function(a,b){b=OpenLayers.Util.applyDefaults({maxExtent:a.maxExtent,projection:a.projection,units:a.units},b);b.maxExtent&&(b.maxResolution=b.maxExtent.getWidth()/OpenLayers.Map.TILE_WIDTH);b.metadata={contactInformation:a.contactInformation,"abstract":a["abstract"],keywords:a.keywords,logo:a.logo,descriptionURL:a.descriptionURL};var c=new OpenLayers.Map(b);c.addLayers(this.getLayersFromContext(a.layersContext));
-c.setCenter(a.bounds.getCenterLonLat(),c.getZoomForExtent(a.bounds,!0));return c},mergeContextToMap:function(a,b){b.addLayers(this.getLayersFromContext(a.layersContext));return b},write:function(a,b){a=this.toContext(a);return OpenLayers.Format.XML.VersionedOGC.prototype.write.apply(this,arguments)},CLASS_NAME:"OpenLayers.Format.Context"});
-OpenLayers.Format.Context.serviceTypes={WMS:"urn:ogc:serviceType:WMS",WFS:"urn:ogc:serviceType:WFS",WCS:"urn:ogc:serviceType:WCS",GML:"urn:ogc:serviceType:GML",SLD:"urn:ogc:serviceType:SLD",FES:"urn:ogc:serviceType:FES",KML:"urn:ogc:serviceType:KML"};OpenLayers.Format.WMC=OpenLayers.Class(OpenLayers.Format.Context,{defaultVersion:"1.1.0",layerToContext:function(a){var b=this.getParser(),c={queryable:a.queryable,visibility:a.visibility,name:a.params.LAYERS,title:a.name,"abstract":a.metadata["abstract"],dataURL:a.metadata.dataURL,metadataURL:a.metadataURL,server:{version:a.params.VERSION,url:a.url},maxExtent:a.maxExtent,transparent:a.params.TRANSPARENT,numZoomLevels:a.numZoomLevels,units:a.units,isBaseLayer:a.isBaseLayer,opacity:1==a.opacity?void 0:
-a.opacity,displayInLayerSwitcher:a.displayInLayerSwitcher,singleTile:a.singleTile,tileSize:a.singleTile||!a.tileSize?void 0:{width:a.tileSize.w,height:a.tileSize.h},minScale:a.options.resolutions||a.options.scales||a.options.maxResolution||a.options.minScale?a.minScale:void 0,maxScale:a.options.resolutions||a.options.scales||a.options.minResolution||a.options.maxScale?a.maxScale:void 0,formats:[],styles:[],srs:a.srs,dimensions:a.dimensions};a.metadata.servertitle&&(c.server.title=a.metadata.servertitle);
-if(a.metadata.formats&&0<a.metadata.formats.length)for(var d=0,e=a.metadata.formats.length;d<e;d++){var f=a.metadata.formats[d];c.formats.push({value:f.value,current:f.value==a.params.FORMAT})}else c.formats.push({value:a.params.FORMAT,current:!0});if(a.metadata.styles&&0<a.metadata.styles.length)for(d=0,e=a.metadata.styles.length;d<e;d++)b=a.metadata.styles[d],b.current=b.href==a.params.SLD||b.body==a.params.SLD_BODY||b.name==a.params.STYLES?!0:!1,c.styles.push(b);else c.styles.push({href:a.params.SLD,
-body:a.params.SLD_BODY,name:a.params.STYLES||b.defaultStyleName,title:b.defaultStyleTitle,current:!0});return c},toContext:function(a){var b={},c=a.layers;if("OpenLayers.Map"==a.CLASS_NAME){var d=a.metadata||{};b.size=a.getSize();b.bounds=a.getExtent();b.projection=a.projection;b.title=a.title;b.keywords=d.keywords;b["abstract"]=d["abstract"];b.logo=d.logo;b.descriptionURL=d.descriptionURL;b.contactInformation=d.contactInformation;b.maxExtent=a.maxExtent}else OpenLayers.Util.applyDefaults(b,a),void 0!=
-b.layers&&delete b.layers;void 0==b.layersContext&&(b.layersContext=[]);if(void 0!=c&&OpenLayers.Util.isArray(c))for(a=0,d=c.length;a<d;a++){var e=c[a];e instanceof OpenLayers.Layer.WMS&&b.layersContext.push(this.layerToContext(e))}return b},CLASS_NAME:"OpenLayers.Format.WMC"});OpenLayers.Format.WMC.v1=OpenLayers.Class(OpenLayers.Format.XML,{namespaces:{ol:"http://openlayers.org/context",wmc:"http://www.opengis.net/context",sld:"http://www.opengis.net/sld",xlink:"http://www.w3.org/1999/xlink",xsi:"http://www.w3.org/2001/XMLSchema-instance"},schemaLocation:"",getNamespacePrefix:function(a){var b=null;if(null==a)b=this.namespaces[this.defaultPrefix];else for(b in this.namespaces)if(this.namespaces[b]==a)break;return b},defaultPrefix:"wmc",rootPrefix:null,defaultStyleName:"",
-defaultStyleTitle:"Default",initialize:function(a){OpenLayers.Format.XML.prototype.initialize.apply(this,[a])},read:function(a){"string"==typeof a&&(a=OpenLayers.Format.XML.prototype.read.apply(this,[a]));a=a.documentElement;this.rootPrefix=a.prefix;var b={version:a.getAttribute("version")};this.runChildNodes(b,a);return b},runChildNodes:function(a,b){for(var c=b.childNodes,d,e,f,g=0,h=c.length;g<h;++g)d=c[g],1==d.nodeType&&(e=this.getNamespacePrefix(d.namespaceURI),f=d.nodeName.split(":").pop(),
-(e=this["read_"+e+"_"+f])&&e.apply(this,[a,d]))},read_wmc_General:function(a,b){this.runChildNodes(a,b)},read_wmc_BoundingBox:function(a,b){a.projection=b.getAttribute("SRS");a.bounds=new OpenLayers.Bounds(b.getAttribute("minx"),b.getAttribute("miny"),b.getAttribute("maxx"),b.getAttribute("maxy"))},read_wmc_LayerList:function(a,b){a.layersContext=[];this.runChildNodes(a,b)},read_wmc_Layer:function(a,b){var c={visibility:"1"!=b.getAttribute("hidden"),queryable:"1"==b.getAttribute("queryable"),formats:[],
-styles:[],metadata:{}};this.runChildNodes(c,b);a.layersContext.push(c)},read_wmc_Extension:function(a,b){this.runChildNodes(a,b)},read_ol_units:function(a,b){a.units=this.getChildValue(b)},read_ol_maxExtent:function(a,b){var c=new OpenLayers.Bounds(b.getAttribute("minx"),b.getAttribute("miny"),b.getAttribute("maxx"),b.getAttribute("maxy"));a.maxExtent=c},read_ol_transparent:function(a,b){a.transparent=this.getChildValue(b)},read_ol_numZoomLevels:function(a,b){a.numZoomLevels=parseInt(this.getChildValue(b))},
-read_ol_opacity:function(a,b){a.opacity=parseFloat(this.getChildValue(b))},read_ol_singleTile:function(a,b){a.singleTile="true"==this.getChildValue(b)},read_ol_tileSize:function(a,b){var c={width:b.getAttribute("width"),height:b.getAttribute("height")};a.tileSize=c},read_ol_isBaseLayer:function(a,b){a.isBaseLayer="true"==this.getChildValue(b)},read_ol_displayInLayerSwitcher:function(a,b){a.displayInLayerSwitcher="true"==this.getChildValue(b)},read_wmc_Server:function(a,b){a.version=b.getAttribute("version");
-a.url=this.getOnlineResource_href(b);a.metadata.servertitle=b.getAttribute("title")},read_wmc_FormatList:function(a,b){this.runChildNodes(a,b)},read_wmc_Format:function(a,b){var c={value:this.getChildValue(b)};"1"==b.getAttribute("current")&&(c.current=!0);a.formats.push(c)},read_wmc_StyleList:function(a,b){this.runChildNodes(a,b)},read_wmc_Style:function(a,b){var c={};this.runChildNodes(c,b);"1"==b.getAttribute("current")&&(c.current=!0);a.styles.push(c)},read_wmc_SLD:function(a,b){this.runChildNodes(a,
-b)},read_sld_StyledLayerDescriptor:function(a,b){var c=OpenLayers.Format.XML.prototype.write.apply(this,[b]);a.body=c},read_sld_FeatureTypeStyle:function(a,b){var c=OpenLayers.Format.XML.prototype.write.apply(this,[b]);a.body=c},read_wmc_OnlineResource:function(a,b){a.href=this.getAttributeNS(b,this.namespaces.xlink,"href")},read_wmc_Name:function(a,b){var c=this.getChildValue(b);c&&(a.name=c)},read_wmc_Title:function(a,b){var c=this.getChildValue(b);c&&(a.title=c)},read_wmc_MetadataURL:function(a,
-b){a.metadataURL=this.getOnlineResource_href(b)},read_wmc_KeywordList:function(a,b){a.keywords=[];this.runChildNodes(a.keywords,b)},read_wmc_Keyword:function(a,b){a.push(this.getChildValue(b))},read_wmc_Abstract:function(a,b){var c=this.getChildValue(b);c&&(a["abstract"]=c)},read_wmc_LogoURL:function(a,b){a.logo={width:b.getAttribute("width"),height:b.getAttribute("height"),format:b.getAttribute("format"),href:this.getOnlineResource_href(b)}},read_wmc_DescriptionURL:function(a,b){a.descriptionURL=
-this.getOnlineResource_href(b)},read_wmc_ContactInformation:function(a,b){var c={};this.runChildNodes(c,b);a.contactInformation=c},read_wmc_ContactPersonPrimary:function(a,b){var c={};this.runChildNodes(c,b);a.personPrimary=c},read_wmc_ContactPerson:function(a,b){var c=this.getChildValue(b);c&&(a.person=c)},read_wmc_ContactOrganization:function(a,b){var c=this.getChildValue(b);c&&(a.organization=c)},read_wmc_ContactPosition:function(a,b){var c=this.getChildValue(b);c&&(a.position=c)},read_wmc_ContactAddress:function(a,
-b){var c={};this.runChildNodes(c,b);a.contactAddress=c},read_wmc_AddressType:function(a,b){var c=this.getChildValue(b);c&&(a.type=c)},read_wmc_Address:function(a,b){var c=this.getChildValue(b);c&&(a.address=c)},read_wmc_City:function(a,b){var c=this.getChildValue(b);c&&(a.city=c)},read_wmc_StateOrProvince:function(a,b){var c=this.getChildValue(b);c&&(a.stateOrProvince=c)},read_wmc_PostCode:function(a,b){var c=this.getChildValue(b);c&&(a.postcode=c)},read_wmc_Country:function(a,b){var c=this.getChildValue(b);
-c&&(a.country=c)},read_wmc_ContactVoiceTelephone:function(a,b){var c=this.getChildValue(b);c&&(a.phone=c)},read_wmc_ContactFacsimileTelephone:function(a,b){var c=this.getChildValue(b);c&&(a.fax=c)},read_wmc_ContactElectronicMailAddress:function(a,b){var c=this.getChildValue(b);c&&(a.email=c)},read_wmc_DataURL:function(a,b){a.dataURL=this.getOnlineResource_href(b)},read_wmc_LegendURL:function(a,b){var c={width:b.getAttribute("width"),height:b.getAttribute("height"),format:b.getAttribute("format"),
-href:this.getOnlineResource_href(b)};a.legend=c},read_wmc_DimensionList:function(a,b){a.dimensions={};this.runChildNodes(a.dimensions,b)},read_wmc_Dimension:function(a,b){var c={name:b.getAttribute("name").toLowerCase(),units:b.getAttribute("units")||"",unitSymbol:b.getAttribute("unitSymbol")||"",userValue:b.getAttribute("userValue")||"",nearestValue:"1"===b.getAttribute("nearestValue"),multipleValues:"1"===b.getAttribute("multipleValues"),current:"1"===b.getAttribute("current"),"default":b.getAttribute("default")||
-""},d=this.getChildValue(b);c.values=d.split(",");a[c.name]=c},write:function(a,b){var c=this.createElementDefaultNS("ViewContext");this.setAttributes(c,{version:this.VERSION,id:b&&"string"==typeof b.id?b.id:OpenLayers.Util.createUniqueID("OpenLayers_Context_")});this.setAttributeNS(c,this.namespaces.xsi,"xsi:schemaLocation",this.schemaLocation);c.appendChild(this.write_wmc_General(a));c.appendChild(this.write_wmc_LayerList(a));return OpenLayers.Format.XML.prototype.write.apply(this,[c])},createElementDefaultNS:function(a,
-b,c){a=this.createElementNS(this.namespaces[this.defaultPrefix],a);b&&a.appendChild(this.createTextNode(b));c&&this.setAttributes(a,c);return a},setAttributes:function(a,b){var c,d;for(d in b)c=b[d].toString(),c.match(/[A-Z]/)?this.setAttributeNS(a,null,d,c):a.setAttribute(d,c)},write_wmc_General:function(a){var b=this.createElementDefaultNS("General");a.size&&b.appendChild(this.createElementDefaultNS("Window",null,{width:a.size.w,height:a.size.h}));var c=a.bounds;b.appendChild(this.createElementDefaultNS("BoundingBox",
-null,{minx:c.left.toPrecision(18),miny:c.bottom.toPrecision(18),maxx:c.right.toPrecision(18),maxy:c.top.toPrecision(18),SRS:a.projection}));b.appendChild(this.createElementDefaultNS("Title",a.title));a.keywords&&b.appendChild(this.write_wmc_KeywordList(a.keywords));a["abstract"]&&b.appendChild(this.createElementDefaultNS("Abstract",a["abstract"]));a.logo&&b.appendChild(this.write_wmc_URLType("LogoURL",a.logo.href,a.logo));a.descriptionURL&&b.appendChild(this.write_wmc_URLType("DescriptionURL",a.descriptionURL));
-a.contactInformation&&b.appendChild(this.write_wmc_ContactInformation(a.contactInformation));b.appendChild(this.write_ol_MapExtension(a));return b},write_wmc_KeywordList:function(a){for(var b=this.createElementDefaultNS("KeywordList"),c=0,d=a.length;c<d;c++)b.appendChild(this.createElementDefaultNS("Keyword",a[c]));return b},write_wmc_ContactInformation:function(a){var b=this.createElementDefaultNS("ContactInformation");a.personPrimary&&b.appendChild(this.write_wmc_ContactPersonPrimary(a.personPrimary));
-a.position&&b.appendChild(this.createElementDefaultNS("ContactPosition",a.position));a.contactAddress&&b.appendChild(this.write_wmc_ContactAddress(a.contactAddress));a.phone&&b.appendChild(this.createElementDefaultNS("ContactVoiceTelephone",a.phone));a.fax&&b.appendChild(this.createElementDefaultNS("ContactFacsimileTelephone",a.fax));a.email&&b.appendChild(this.createElementDefaultNS("ContactElectronicMailAddress",a.email));return b},write_wmc_ContactPersonPrimary:function(a){var b=this.createElementDefaultNS("ContactPersonPrimary");
-a.person&&b.appendChild(this.createElementDefaultNS("ContactPerson",a.person));a.organization&&b.appendChild(this.createElementDefaultNS("ContactOrganization",a.organization));return b},write_wmc_ContactAddress:function(a){var b=this.createElementDefaultNS("ContactAddress");a.type&&b.appendChild(this.createElementDefaultNS("AddressType",a.type));a.address&&b.appendChild(this.createElementDefaultNS("Address",a.address));a.city&&b.appendChild(this.createElementDefaultNS("City",a.city));a.stateOrProvince&&
-b.appendChild(this.createElementDefaultNS("StateOrProvince",a.stateOrProvince));a.postcode&&b.appendChild(this.createElementDefaultNS("PostCode",a.postcode));a.country&&b.appendChild(this.createElementDefaultNS("Country",a.country));return b},write_ol_MapExtension:function(a){var b=this.createElementDefaultNS("Extension");if(a=a.maxExtent){var c=this.createElementNS(this.namespaces.ol,"ol:maxExtent");this.setAttributes(c,{minx:a.left.toPrecision(18),miny:a.bottom.toPrecision(18),maxx:a.right.toPrecision(18),
-maxy:a.top.toPrecision(18)});b.appendChild(c)}return b},write_wmc_LayerList:function(a){for(var b=this.createElementDefaultNS("LayerList"),c=0,d=a.layersContext.length;c<d;++c)b.appendChild(this.write_wmc_Layer(a.layersContext[c]));return b},write_wmc_Layer:function(a){var b=this.createElementDefaultNS("Layer",null,{queryable:a.queryable?"1":"0",hidden:a.visibility?"0":"1"});b.appendChild(this.write_wmc_Server(a));b.appendChild(this.createElementDefaultNS("Name",a.name));b.appendChild(this.createElementDefaultNS("Title",
-a.title));a["abstract"]&&b.appendChild(this.createElementDefaultNS("Abstract",a["abstract"]));a.dataURL&&b.appendChild(this.write_wmc_URLType("DataURL",a.dataURL));a.metadataURL&&b.appendChild(this.write_wmc_URLType("MetadataURL",a.metadataURL));return b},write_wmc_LayerExtension:function(a){var b=this.createElementDefaultNS("Extension"),c=a.maxExtent,d=this.createElementNS(this.namespaces.ol,"ol:maxExtent");this.setAttributes(d,{minx:c.left.toPrecision(18),miny:c.bottom.toPrecision(18),maxx:c.right.toPrecision(18),
-maxy:c.top.toPrecision(18)});b.appendChild(d);a.tileSize&&!a.singleTile&&(c=this.createElementNS(this.namespaces.ol,"ol:tileSize"),this.setAttributes(c,a.tileSize),b.appendChild(c));for(var c="transparent numZoomLevels units isBaseLayer opacity displayInLayerSwitcher singleTile".split(" "),e=0,f=c.length;e<f;++e)(d=this.createOLPropertyNode(a,c[e]))&&b.appendChild(d);return b},createOLPropertyNode:function(a,b){var c=null;null!=a[b]&&(c=this.createElementNS(this.namespaces.ol,"ol:"+b),c.appendChild(this.createTextNode(a[b].toString())));
-return c},write_wmc_Server:function(a){a=a.server;var b=this.createElementDefaultNS("Server"),c={service:"OGC:WMS",version:a.version};a.title&&(c.title=a.title);this.setAttributes(b,c);b.appendChild(this.write_wmc_OnlineResource(a.url));return b},write_wmc_URLType:function(a,b,c){a=this.createElementDefaultNS(a);a.appendChild(this.write_wmc_OnlineResource(b));if(c){b=["width","height","format"];for(var d=0;d<b.length;d++)b[d]in c&&a.setAttribute(b[d],c[b[d]])}return a},write_wmc_DimensionList:function(a){var b=
-this.createElementDefaultNS("DimensionList"),c;for(c in a.dimensions){var d={},e=a.dimensions[c],f;for(f in e)d[f]="boolean"==typeof e[f]?Number(e[f]):e[f];e="";d.values&&(e=d.values.join(","),delete d.values);b.appendChild(this.createElementDefaultNS("Dimension",e,d))}return b},write_wmc_FormatList:function(a){for(var b=this.createElementDefaultNS("FormatList"),c=0,d=a.formats.length;c<d;c++){var e=a.formats[c];b.appendChild(this.createElementDefaultNS("Format",e.value,e.current&&!0==e.current?{current:"1"}:
-null))}return b},write_wmc_StyleList:function(a){var b=this.createElementDefaultNS("StyleList");if((a=a.styles)&&OpenLayers.Util.isArray(a))for(var c,d=0,e=a.length;d<e;d++){var f=a[d],g=this.createElementDefaultNS("Style",null,f.current&&!0==f.current?{current:"1"}:null);f.href?(c=this.createElementDefaultNS("SLD"),f.name&&c.appendChild(this.createElementDefaultNS("Name",f.name)),f.title&&c.appendChild(this.createElementDefaultNS("Title",f.title)),f.legend&&c.appendChild(this.write_wmc_URLType("LegendURL",
-f.legend.href,f.legend)),f=this.write_wmc_OnlineResource(f.href),c.appendChild(f),g.appendChild(c)):f.body?(c=this.createElementDefaultNS("SLD"),f.name&&c.appendChild(this.createElementDefaultNS("Name",f.name)),f.title&&c.appendChild(this.createElementDefaultNS("Title",f.title)),f.legend&&c.appendChild(this.write_wmc_URLType("LegendURL",f.legend.href,f.legend)),f=OpenLayers.Format.XML.prototype.read.apply(this,[f.body]).documentElement,c.ownerDocument&&c.ownerDocument.importNode&&(f=c.ownerDocument.importNode(f,
-!0)),c.appendChild(f),g.appendChild(c)):(g.appendChild(this.createElementDefaultNS("Name",f.name)),g.appendChild(this.createElementDefaultNS("Title",f.title)),f["abstract"]&&g.appendChild(this.createElementDefaultNS("Abstract",f["abstract"])),f.legend&&g.appendChild(this.write_wmc_URLType("LegendURL",f.legend.href,f.legend)));b.appendChild(g)}return b},write_wmc_OnlineResource:function(a){var b=this.createElementDefaultNS("OnlineResource");this.setAttributeNS(b,this.namespaces.xlink,"xlink:type",
-"simple");this.setAttributeNS(b,this.namespaces.xlink,"xlink:href",a);return b},getOnlineResource_href:function(a){var b={};a=a.getElementsByTagName("OnlineResource");0<a.length&&this.read_wmc_OnlineResource(b,a[0]);return b.href},CLASS_NAME:"OpenLayers.Format.WMC.v1"});OpenLayers.Control.PanPanel=OpenLayers.Class(OpenLayers.Control.Panel,{slideFactor:50,slideRatio:null,initialize:function(a){OpenLayers.Control.Panel.prototype.initialize.apply(this,[a]);a={slideFactor:this.slideFactor,slideRatio:this.slideRatio};this.addControls([new OpenLayers.Control.Pan(OpenLayers.Control.Pan.NORTH,a),new OpenLayers.Control.Pan(OpenLayers.Control.Pan.SOUTH,a),new OpenLayers.Control.Pan(OpenLayers.Control.Pan.EAST,a),new OpenLayers.Control.Pan(OpenLayers.Control.Pan.WEST,a)])},
-CLASS_NAME:"OpenLayers.Control.PanPanel"});OpenLayers.Control.Attribution=OpenLayers.Class(OpenLayers.Control,{separator:", ",template:"${layers}",destroy:function(){this.map.events.un({removelayer:this.updateAttribution,addlayer:this.updateAttribution,changelayer:this.updateAttribution,changebaselayer:this.updateAttribution,scope:this});OpenLayers.Control.prototype.destroy.apply(this,arguments)},draw:function(){OpenLayers.Control.prototype.draw.apply(this,arguments);this.map.events.on({changebaselayer:this.updateAttribution,changelayer:this.updateAttribution,
-addlayer:this.updateAttribution,removelayer:this.updateAttribution,scope:this});this.updateAttribution();return this.div},updateAttribution:function(){var a=[];if(this.map&&this.map.layers){for(var b=0,c=this.map.layers.length;b<c;b++){var d=this.map.layers[b];d.attribution&&d.getVisibility()&&-1===OpenLayers.Util.indexOf(a,d.attribution)&&a.push(d.attribution)}this.div.innerHTML=OpenLayers.String.format(this.template,{layers:a.join(this.separator)})}},CLASS_NAME:"OpenLayers.Control.Attribution"});OpenLayers.Kinetic=OpenLayers.Class({threshold:0,deceleration:0.0035,nbPoints:100,delay:200,points:void 0,timerId:void 0,initialize:function(a){OpenLayers.Util.extend(this,a)},begin:function(){OpenLayers.Animation.stop(this.timerId);this.timerId=void 0;this.points=[]},update:function(a){this.points.unshift({xy:a,tick:(new Date).getTime()});this.points.length>this.nbPoints&&this.points.pop()},end:function(a){for(var b,c=(new Date).getTime(),d=0,e=this.points.length,f;d<e;d++){f=this.points[d];if(c-
-f.tick>this.delay)break;b=f}if(b&&(d=(new Date).getTime()-b.tick,c=Math.sqrt(Math.pow(a.x-b.xy.x,2)+Math.pow(a.y-b.xy.y,2)),d=c/d,!(0==d||d<this.threshold)))return c=Math.asin((a.y-b.xy.y)/c),b.xy.x<=a.x&&(c=Math.PI-c),{speed:d,theta:c}},move:function(a,b){var c=a.speed,d=Math.cos(a.theta),e=-Math.sin(a.theta),f=(new Date).getTime(),g=0,h=0;this.timerId=OpenLayers.Animation.start(OpenLayers.Function.bind(function(){if(null!=this.timerId){var a=(new Date).getTime()-f,l=-this.deceleration*Math.pow(a,
-2)/2+c*a,m=l*d,l=l*e,n,p;n=!1;0>=-this.deceleration*a+c&&(OpenLayers.Animation.stop(this.timerId),this.timerId=null,n=!0);a=m-g;p=l-h;g=m;h=l;b(a,p,n)}},this))},CLASS_NAME:"OpenLayers.Kinetic"});OpenLayers.Format.WPSExecute=OpenLayers.Class(OpenLayers.Format.XML,OpenLayers.Format.Filter.v1_1_0,{namespaces:{ows:"http://www.opengis.net/ows/1.1",gml:"http://www.opengis.net/gml",wps:"http://www.opengis.net/wps/1.0.0",wfs:"http://www.opengis.net/wfs",ogc:"http://www.opengis.net/ogc",wcs:"http://www.opengis.net/wcs",xlink:"http://www.w3.org/1999/xlink",xsi:"http://www.w3.org/2001/XMLSchema-instance"},regExes:{trimSpace:/^\s*|\s*$/g,removeSpace:/\s*/g,splitSpace:/\s+/,trimComma:/\s*,\s*/g},VERSION:"1.0.0",
-schemaLocation:"http://www.opengis.net/wps/1.0.0 http://schemas.opengis.net/wps/1.0.0/wpsAll.xsd",schemaLocationAttr:function(a){},write:function(a){var b;window.ActiveXObject?this.xmldom=b=new ActiveXObject("Microsoft.XMLDOM"):b=document.implementation.createDocument("","",null);a=this.writeNode("wps:Execute",a,b);this.setAttributeNS(a,this.namespaces.xsi,"xsi:schemaLocation",this.schemaLocation);return OpenLayers.Format.XML.prototype.write.apply(this,[a])},read:function(a){"string"==typeof a&&(a=
-OpenLayers.Format.XML.prototype.read.apply(this,[a]));a&&9==a.nodeType&&(a=a.documentElement);var b={};this.readNode(a,b);return b},writers:{wps:{Execute:function(a){var b=this.createElementNSPlus("wps:Execute",{attributes:{version:this.VERSION,service:"WPS"}});this.writeNode("ows:Identifier",a.identifier,b);this.writeNode("wps:DataInputs",a.dataInputs,b);this.writeNode("wps:ResponseForm",a.responseForm,b);return b},ResponseForm:function(a){var b=this.createElementNSPlus("wps:ResponseForm",{});a.rawDataOutput&&
-this.writeNode("wps:RawDataOutput",a.rawDataOutput,b);a.responseDocument&&this.writeNode("wps:ResponseDocument",a.responseDocument,b);return b},ResponseDocument:function(a){var b=this.createElementNSPlus("wps:ResponseDocument",{attributes:{storeExecuteResponse:a.storeExecuteResponse,lineage:a.lineage,status:a.status}});if(a.outputs)for(var c=0,d=a.outputs.length;c<d;c++)this.writeNode("wps:Output",a.outputs[c],b);return b},Output:function(a){var b=this.createElementNSPlus("wps:Output",{attributes:{asReference:a.asReference,
-mimeType:a.mimeType,encoding:a.encoding,schema:a.schema}});this.writeNode("ows:Identifier",a.identifier,b);this.writeNode("ows:Title",a.title,b);this.writeNode("ows:Abstract",a["abstract"],b);return b},RawDataOutput:function(a){var b=this.createElementNSPlus("wps:RawDataOutput",{attributes:{mimeType:a.mimeType,encoding:a.encoding,schema:a.schema}});this.writeNode("ows:Identifier",a.identifier,b);return b},DataInputs:function(a){for(var b=this.createElementNSPlus("wps:DataInputs",{}),c=0,d=a.length;c<
-d;++c)this.writeNode("wps:Input",a[c],b);return b},Input:function(a){var b=this.createElementNSPlus("wps:Input",{});this.writeNode("ows:Identifier",a.identifier,b);a.title&&this.writeNode("ows:Title",a.title,b);a.data&&this.writeNode("wps:Data",a.data,b);a.reference&&this.writeNode("wps:Reference",a.reference,b);a.boundingBoxData&&this.writeNode("wps:BoundingBoxData",a.boundingBoxData,b);return b},Data:function(a){var b=this.createElementNSPlus("wps:Data",{});a.literalData?this.writeNode("wps:LiteralData",
-a.literalData,b):a.complexData?this.writeNode("wps:ComplexData",a.complexData,b):a.boundingBoxData&&this.writeNode("ows:BoundingBox",a.boundingBoxData,b);return b},LiteralData:function(a){return this.createElementNSPlus("wps:LiteralData",{attributes:{uom:a.uom},value:a.value})},ComplexData:function(a){var b=this.createElementNSPlus("wps:ComplexData",{attributes:{mimeType:a.mimeType,encoding:a.encoding,schema:a.schema}}),c=a.value;"string"===typeof c?b.appendChild(this.getXMLDoc().createCDATASection(a.value)):
-b.appendChild(c);return b},Reference:function(a){var b=this.createElementNSPlus("wps:Reference",{attributes:{mimeType:a.mimeType,"xlink:href":a.href,method:a.method,encoding:a.encoding,schema:a.schema}});a.body&&this.writeNode("wps:Body",a.body,b);return b},BoundingBoxData:function(a,b){this.writers.ows.BoundingBox.apply(this,[a,b,"wps:BoundingBoxData"])},Body:function(a){var b=this.createElementNSPlus("wps:Body",{});a.wcs?this.writeNode("wcs:GetCoverage",a.wcs,b):a.wfs?(this.featureType=a.wfs.featureType,
-this.version=a.wfs.version,this.writeNode("wfs:GetFeature",a.wfs,b)):this.writeNode("wps:Execute",a,b);return b}},wcs:OpenLayers.Format.WCSGetCoverage.prototype.writers.wcs,wfs:OpenLayers.Format.WFST.v1_1_0.prototype.writers.wfs,ogc:OpenLayers.Format.Filter.v1_1_0.prototype.writers.ogc,ows:OpenLayers.Format.OWSCommon.v1_1_0.prototype.writers.ows},readers:{wps:{ExecuteResponse:function(a,b){b.executeResponse={lang:a.getAttribute("lang"),statusLocation:a.getAttribute("statusLocation"),serviceInstance:a.getAttribute("serviceInstance"),
-service:a.getAttribute("service")};this.readChildNodes(a,b.executeResponse)},Process:function(a,b){b.process={};this.readChildNodes(a,b.process)},Status:function(a,b){b.status={creationTime:a.getAttribute("creationTime")};this.readChildNodes(a,b.status)},ProcessSucceeded:function(a,b){b.processSucceeded=!0},ProcessOutputs:function(a,b){b.processOutputs=[];this.readChildNodes(a,b.processOutputs)},Output:function(a,b){var c={};this.readChildNodes(a,c);b.push(c)},Reference:function(a,b){b.reference=
-{href:a.getAttribute("href"),mimeType:a.getAttribute("mimeType"),encoding:a.getAttribute("encoding"),schema:a.getAttribute("schema")}},Data:function(a,b){b.data={};this.readChildNodes(a,b)},LiteralData:function(a,b){b.literalData={dataType:a.getAttribute("dataType"),uom:a.getAttribute("uom"),value:this.getChildValue(a)}},ComplexData:function(a,b){b.complexData={mimeType:a.getAttribute("mimeType"),schema:a.getAttribute("schema"),encoding:a.getAttribute("encoding"),value:""};if(this.isSimpleContent(a)){var c;
-for(c=a.firstChild;c;c=c.nextSibling)switch(c.nodeType){case 3:case 4:b.complexData.value+=c.nodeValue}}else for(c=a.firstChild;c;c=c.nextSibling)1==c.nodeType&&(b.complexData.value=c)},BoundingBox:function(a,b){b.boundingBoxData={dimensions:a.getAttribute("dimensions"),crs:a.getAttribute("crs")};this.readChildNodes(a,b.boundingBoxData)}},ows:OpenLayers.Format.OWSCommon.v1_1_0.prototype.readers.ows},CLASS_NAME:"OpenLayers.Format.WPSExecute"});OpenLayers.Layer.GeoRSS=OpenLayers.Class(OpenLayers.Layer.Markers,{location:null,features:null,formatOptions:null,selectedFeature:null,icon:null,popupSize:null,useFeedTitle:!0,initialize:function(a,b,c){OpenLayers.Layer.Markers.prototype.initialize.apply(this,[a,c]);this.location=b;this.features=[]},destroy:function(){OpenLayers.Layer.Markers.prototype.destroy.apply(this,arguments);this.clearFeatures();this.features=null},loadRSS:function(){this.loaded||(this.events.triggerEvent("loadstart"),OpenLayers.Request.GET({url:this.location,
-success:this.parseData,scope:this}),this.loaded=!0)},moveTo:function(a,b,c){OpenLayers.Layer.Markers.prototype.moveTo.apply(this,arguments);this.visibility&&!this.loaded&&this.loadRSS()},parseData:function(a){var b=a.responseXML;b&&b.documentElement||(b=OpenLayers.Format.XML.prototype.read(a.responseText));if(this.useFeedTitle){a=null;try{a=b.getElementsByTagNameNS("*","title")[0].firstChild.nodeValue}catch(c){a=b.getElementsByTagName("title")[0].firstChild.nodeValue}a&&this.setName(a)}a={};OpenLayers.Util.extend(a,
-this.formatOptions);this.map&&!this.projection.equals(this.map.getProjectionObject())&&(a.externalProjection=this.projection,a.internalProjection=this.map.getProjectionObject());b=(new OpenLayers.Format.GeoRSS(a)).read(b);a=0;for(var d=b.length;a<d;a++){var e={},f=b[a];if(f.geometry){var g=f.attributes.title?f.attributes.title:"Untitled",h=f.attributes.description?f.attributes.description:"No description.",k=f.attributes.link?f.attributes.link:"",f=f.geometry.getBounds().getCenterLonLat();e.icon=
-null==this.icon?OpenLayers.Marker.defaultIcon():this.icon.clone();e.popupSize=this.popupSize?this.popupSize.clone():new OpenLayers.Size(250,120);if(g||h){e.title=g;e.description=h;var l='<div class="olLayerGeoRSSClose">[x]</div>',l=l+'<div class="olLayerGeoRSSTitle">';k&&(l+='<a class="link" href="'+k+'" target="_blank">');l+=g;k&&(l+="</a>");l+="</div>";l+='<div style="" class="olLayerGeoRSSDescription">';l+=h;l+="</div>";e.popupContentHTML=l}f=new OpenLayers.Feature(this,f,e);this.features.push(f);
-e=f.createMarker();e.events.register("click",f,this.markerClick);this.addMarker(e)}}this.events.triggerEvent("loadend")},markerClick:function(a){var b=this==this.layer.selectedFeature;this.layer.selectedFeature=b?null:this;for(var c=0,d=this.layer.map.popups.length;c<d;c++)this.layer.map.removePopup(this.layer.map.popups[c]);b||(b=this.createPopup(),OpenLayers.Event.observe(b.div,"click",OpenLayers.Function.bind(function(){for(var a=0,b=this.layer.map.popups.length;a<b;a++)this.layer.map.removePopup(this.layer.map.popups[a])},
-this)),this.layer.map.addPopup(b));OpenLayers.Event.stop(a)},clearFeatures:function(){if(null!=this.features)for(;0<this.features.length;){var a=this.features[0];OpenLayers.Util.removeItem(this.features,a);a.destroy()}},CLASS_NAME:"OpenLayers.Layer.GeoRSS"});OpenLayers.Symbolizer.Point=OpenLayers.Class(OpenLayers.Symbolizer,{initialize:function(a){OpenLayers.Symbolizer.prototype.initialize.apply(this,arguments)},CLASS_NAME:"OpenLayers.Symbolizer.Point"});OpenLayers.Symbolizer.Line=OpenLayers.Class(OpenLayers.Symbolizer,{initialize:function(a){OpenLayers.Symbolizer.prototype.initialize.apply(this,arguments)},CLASS_NAME:"OpenLayers.Symbolizer.Line"});OpenLayers.Symbolizer.Text=OpenLayers.Class(OpenLayers.Symbolizer,{initialize:function(a){OpenLayers.Symbolizer.prototype.initialize.apply(this,arguments)},CLASS_NAME:"OpenLayers.Symbolizer.Text"});OpenLayers.Format.SLD.v1=OpenLayers.Class(OpenLayers.Format.Filter.v1_0_0,{namespaces:{sld:"http://www.opengis.net/sld",ogc:"http://www.opengis.net/ogc",gml:"http://www.opengis.net/gml",xlink:"http://www.w3.org/1999/xlink",xsi:"http://www.w3.org/2001/XMLSchema-instance"},defaultPrefix:"sld",schemaLocation:null,multipleSymbolizers:!1,featureTypeCounter:null,defaultSymbolizer:{fillColor:"#808080",fillOpacity:1,strokeColor:"#000000",strokeOpacity:1,strokeWidth:1,strokeDashstyle:"solid",pointRadius:3,
-graphicName:"square"},read:function(a,b){b=OpenLayers.Util.applyDefaults(b,this.options);var c={namedLayers:!0===b.namedLayersAsArray?[]:{}};this.readChildNodes(a,c);return c},readers:OpenLayers.Util.applyDefaults({sld:{StyledLayerDescriptor:function(a,b){b.version=a.getAttribute("version");this.readChildNodes(a,b)},Name:function(a,b){b.name=this.getChildValue(a)},Title:function(a,b){b.title=this.getChildValue(a)},Abstract:function(a,b){b.description=this.getChildValue(a)},NamedLayer:function(a,b){var c=
-{userStyles:[],namedStyles:[]};this.readChildNodes(a,c);for(var d=0,e=c.userStyles.length;d<e;++d)c.userStyles[d].layerName=c.name;OpenLayers.Util.isArray(b.namedLayers)?b.namedLayers.push(c):b.namedLayers[c.name]=c},NamedStyle:function(a,b){b.namedStyles.push(this.getChildName(a.firstChild))},UserStyle:function(a,b){var c={defaultsPerSymbolizer:!0,rules:[]};this.featureTypeCounter=-1;this.readChildNodes(a,c);this.multipleSymbolizers?(delete c.defaultsPerSymbolizer,c=new OpenLayers.Style2(c)):c=new OpenLayers.Style(this.defaultSymbolizer,
-c);b.userStyles.push(c)},IsDefault:function(a,b){"1"==this.getChildValue(a)&&(b.isDefault=!0)},FeatureTypeStyle:function(a,b){++this.featureTypeCounter;var c={rules:this.multipleSymbolizers?b.rules:[]};this.readChildNodes(a,c);this.multipleSymbolizers||(b.rules=c.rules)},Rule:function(a,b){var c;this.multipleSymbolizers&&(c={symbolizers:[]});c=new OpenLayers.Rule(c);this.readChildNodes(a,c);b.rules.push(c)},ElseFilter:function(a,b){b.elseFilter=!0},MinScaleDenominator:function(a,b){b.minScaleDenominator=
-parseFloat(this.getChildValue(a))},MaxScaleDenominator:function(a,b){b.maxScaleDenominator=parseFloat(this.getChildValue(a))},TextSymbolizer:function(a,b){var c={};this.readChildNodes(a,c);this.multipleSymbolizers?(c.zIndex=this.featureTypeCounter,b.symbolizers.push(new OpenLayers.Symbolizer.Text(c))):b.symbolizer.Text=OpenLayers.Util.applyDefaults(c,b.symbolizer.Text)},LabelPlacement:function(a,b){this.readChildNodes(a,b)},PointPlacement:function(a,b){var c={};this.readChildNodes(a,c);c.labelRotation=
-c.rotation;delete c.rotation;var d,e=b.labelAnchorPointX,f=b.labelAnchorPointY;e<=1/3?d="l":e>1/3&&e<2/3?d="c":e>=2/3&&(d="r");f<=1/3?d+="b":f>1/3&&f<2/3?d+="m":f>=2/3&&(d+="t");c.labelAlign=d;OpenLayers.Util.applyDefaults(b,c)},AnchorPoint:function(a,b){this.readChildNodes(a,b)},AnchorPointX:function(a,b){var c=this.readers.ogc._expression.call(this,a);c&&(b.labelAnchorPointX=c)},AnchorPointY:function(a,b){var c=this.readers.ogc._expression.call(this,a);c&&(b.labelAnchorPointY=c)},Displacement:function(a,
-b){this.readChildNodes(a,b)},DisplacementX:function(a,b){var c=this.readers.ogc._expression.call(this,a);c&&(b.labelXOffset=c)},DisplacementY:function(a,b){var c=this.readers.ogc._expression.call(this,a);c&&(b.labelYOffset=c)},LinePlacement:function(a,b){this.readChildNodes(a,b)},PerpendicularOffset:function(a,b){var c=this.readers.ogc._expression.call(this,a);c&&(b.labelPerpendicularOffset=c)},Label:function(a,b){var c=this.readers.ogc._expression.call(this,a);c&&(b.label=c)},Font:function(a,b){this.readChildNodes(a,
-b)},Halo:function(a,b){var c={};this.readChildNodes(a,c);b.haloRadius=c.haloRadius;b.haloColor=c.fillColor;b.haloOpacity=c.fillOpacity},Radius:function(a,b){var c=this.readers.ogc._expression.call(this,a);null!=c&&(b.haloRadius=c)},RasterSymbolizer:function(a,b){var c={};this.readChildNodes(a,c);this.multipleSymbolizers?(c.zIndex=this.featureTypeCounter,b.symbolizers.push(new OpenLayers.Symbolizer.Raster(c))):b.symbolizer.Raster=OpenLayers.Util.applyDefaults(c,b.symbolizer.Raster)},Geometry:function(a,
-b){b.geometry={};this.readChildNodes(a,b.geometry)},ColorMap:function(a,b){b.colorMap=[];this.readChildNodes(a,b.colorMap)},ColorMapEntry:function(a,b){var c=a.getAttribute("quantity"),d=a.getAttribute("opacity");b.push({color:a.getAttribute("color"),quantity:null!==c?parseFloat(c):void 0,label:a.getAttribute("label")||void 0,opacity:null!==d?parseFloat(d):void 0})},LineSymbolizer:function(a,b){var c={};this.readChildNodes(a,c);this.multipleSymbolizers?(c.zIndex=this.featureTypeCounter,b.symbolizers.push(new OpenLayers.Symbolizer.Line(c))):
-b.symbolizer.Line=OpenLayers.Util.applyDefaults(c,b.symbolizer.Line)},PolygonSymbolizer:function(a,b){var c={fill:!1,stroke:!1};this.multipleSymbolizers||(c=b.symbolizer.Polygon||c);this.readChildNodes(a,c);this.multipleSymbolizers?(c.zIndex=this.featureTypeCounter,b.symbolizers.push(new OpenLayers.Symbolizer.Polygon(c))):b.symbolizer.Polygon=c},PointSymbolizer:function(a,b){var c={fill:!1,stroke:!1,graphic:!1};this.multipleSymbolizers||(c=b.symbolizer.Point||c);this.readChildNodes(a,c);this.multipleSymbolizers?
-(c.zIndex=this.featureTypeCounter,b.symbolizers.push(new OpenLayers.Symbolizer.Point(c))):b.symbolizer.Point=c},Stroke:function(a,b){b.stroke=!0;this.readChildNodes(a,b)},Fill:function(a,b){b.fill=!0;this.readChildNodes(a,b)},CssParameter:function(a,b){var c=a.getAttribute("name"),d=this.cssMap[c];b.label&&("fill"===c?d="fontColor":"fill-opacity"===c&&(d="fontOpacity"));d&&(c=this.readers.ogc._expression.call(this,a))&&(b[d]=c)},Graphic:function(a,b){b.graphic=!0;var c={};this.readChildNodes(a,c);
-for(var d="stroke strokeColor strokeWidth strokeOpacity strokeLinecap fill fillColor fillOpacity graphicName rotation graphicFormat".split(" "),e,f,g=0,h=d.length;g<h;++g)e=d[g],f=c[e],void 0!=f&&(b[e]=f);void 0!=c.opacity&&(b.graphicOpacity=c.opacity);void 0!=c.size&&(isNaN(c.size/2)?b.graphicWidth=c.size:b.pointRadius=c.size/2);void 0!=c.href&&(b.externalGraphic=c.href);void 0!=c.rotation&&(b.rotation=c.rotation)},ExternalGraphic:function(a,b){this.readChildNodes(a,b)},Mark:function(a,b){this.readChildNodes(a,
-b)},WellKnownName:function(a,b){b.graphicName=this.getChildValue(a)},Opacity:function(a,b){var c=this.readers.ogc._expression.call(this,a);c&&(b.opacity=c)},Size:function(a,b){var c=this.readers.ogc._expression.call(this,a);c&&(b.size=c)},Rotation:function(a,b){var c=this.readers.ogc._expression.call(this,a);c&&(b.rotation=c)},OnlineResource:function(a,b){b.href=this.getAttributeNS(a,this.namespaces.xlink,"href")},Format:function(a,b){b.graphicFormat=this.getChildValue(a)}}},OpenLayers.Format.Filter.v1_0_0.prototype.readers),
-cssMap:{stroke:"strokeColor","stroke-opacity":"strokeOpacity","stroke-width":"strokeWidth","stroke-linecap":"strokeLinecap","stroke-dasharray":"strokeDashstyle",fill:"fillColor","fill-opacity":"fillOpacity","font-family":"fontFamily","font-size":"fontSize","font-weight":"fontWeight","font-style":"fontStyle"},getCssProperty:function(a){var b=null,c;for(c in this.cssMap)if(this.cssMap[c]==a){b=c;break}return b},getGraphicFormat:function(a){var b,c;for(c in this.graphicFormats)if(this.graphicFormats[c].test(a)){b=
-c;break}return b||this.defaultGraphicFormat},defaultGraphicFormat:"image/png",graphicFormats:{"image/jpeg":/\.jpe?g$/i,"image/gif":/\.gif$/i,"image/png":/\.png$/i},write:function(a){return this.writers.sld.StyledLayerDescriptor.apply(this,[a])},writers:OpenLayers.Util.applyDefaults({sld:{_OGCExpression:function(a,b){var c=this.createElementNSPlus(a),d="string"==typeof b?b.split("${"):[b];c.appendChild(this.createTextNode(d[0]));for(var e,f,g=1,h=d.length;g<h;g++)e=d[g],f=e.indexOf("}"),0<f?(this.writeNode("ogc:PropertyName",
-{property:e.substring(0,f)},c),c.appendChild(this.createTextNode(e.substring(++f)))):c.appendChild(this.createTextNode("${"+e));return c},StyledLayerDescriptor:function(a){var b=this.createElementNSPlus("sld:StyledLayerDescriptor",{attributes:{version:this.VERSION,"xsi:schemaLocation":this.schemaLocation}});b.setAttribute("xmlns:ogc",this.namespaces.ogc);b.setAttribute("xmlns:gml",this.namespaces.gml);a.name&&this.writeNode("Name",a.name,b);a.title&&this.writeNode("Title",a.title,b);a.description&&
-this.writeNode("Abstract",a.description,b);if(OpenLayers.Util.isArray(a.namedLayers))for(var c=0,d=a.namedLayers.length;c<d;++c)this.writeNode("NamedLayer",a.namedLayers[c],b);else for(c in a.namedLayers)this.writeNode("NamedLayer",a.namedLayers[c],b);return b},Name:function(a){return this.createElementNSPlus("sld:Name",{value:a})},Title:function(a){return this.createElementNSPlus("sld:Title",{value:a})},Abstract:function(a){return this.createElementNSPlus("sld:Abstract",{value:a})},NamedLayer:function(a){var b=
-this.createElementNSPlus("sld:NamedLayer");this.writeNode("Name",a.name,b);if(a.namedStyles)for(var c=0,d=a.namedStyles.length;c<d;++c)this.writeNode("NamedStyle",a.namedStyles[c],b);if(a.userStyles)for(c=0,d=a.userStyles.length;c<d;++c)this.writeNode("UserStyle",a.userStyles[c],b);return b},NamedStyle:function(a){var b=this.createElementNSPlus("sld:NamedStyle");this.writeNode("Name",a,b);return b},UserStyle:function(a){var b=this.createElementNSPlus("sld:UserStyle");a.name&&this.writeNode("Name",
-a.name,b);a.title&&this.writeNode("Title",a.title,b);a.description&&this.writeNode("Abstract",a.description,b);a.isDefault&&this.writeNode("IsDefault",a.isDefault,b);if(this.multipleSymbolizers&&a.rules){for(var c={0:[]},d=[0],e,f,g,h,k,l=0,m=a.rules.length;l<m;++l)if(e=a.rules[l],e.symbolizers){f={};for(var n=0,p=e.symbolizers.length;n<p;++n)g=e.symbolizers[n],h=g.zIndex,h in f||(k=e.clone(),k.symbolizers=[],f[h]=k),f[h].symbolizers.push(g.clone());for(h in f)h in c||(d.push(h),c[h]=[]),c[h].push(f[h])}else c[0].push(e.clone());
-d.sort();l=0;for(m=d.length;l<m;++l)e=c[d[l]],0<e.length&&(k=a.clone(),k.rules=c[d[l]],this.writeNode("FeatureTypeStyle",k,b))}else this.writeNode("FeatureTypeStyle",a,b);return b},IsDefault:function(a){return this.createElementNSPlus("sld:IsDefault",{value:a?"1":"0"})},FeatureTypeStyle:function(a){for(var b=this.createElementNSPlus("sld:FeatureTypeStyle"),c=0,d=a.rules.length;c<d;++c)this.writeNode("Rule",a.rules[c],b);return b},Rule:function(a){var b=this.createElementNSPlus("sld:Rule");a.name&&
-this.writeNode("Name",a.name,b);a.title&&this.writeNode("Title",a.title,b);a.description&&this.writeNode("Abstract",a.description,b);a.elseFilter?this.writeNode("ElseFilter",null,b):a.filter&&this.writeNode("ogc:Filter",a.filter,b);void 0!=a.minScaleDenominator&&this.writeNode("MinScaleDenominator",a.minScaleDenominator,b);void 0!=a.maxScaleDenominator&&this.writeNode("MaxScaleDenominator",a.maxScaleDenominator,b);var c,d;if(this.multipleSymbolizers&&a.symbolizers)for(var e=0,f=a.symbolizers.length;e<
-f;++e)d=a.symbolizers[e],c=d.CLASS_NAME.split(".").pop(),this.writeNode(c+"Symbolizer",d,b);else for(var f=OpenLayers.Style.SYMBOLIZER_PREFIXES,e=0,g=f.length;e<g;++e)c=f[e],(d=a.symbolizer[c])&&this.writeNode(c+"Symbolizer",d,b);return b},ElseFilter:function(){return this.createElementNSPlus("sld:ElseFilter")},MinScaleDenominator:function(a){return this.createElementNSPlus("sld:MinScaleDenominator",{value:a})},MaxScaleDenominator:function(a){return this.createElementNSPlus("sld:MaxScaleDenominator",
-{value:a})},LineSymbolizer:function(a){var b=this.createElementNSPlus("sld:LineSymbolizer");this.writeNode("Stroke",a,b);return b},Stroke:function(a){var b=this.createElementNSPlus("sld:Stroke");void 0!=a.strokeColor&&this.writeNode("CssParameter",{symbolizer:a,key:"strokeColor"},b);void 0!=a.strokeOpacity&&this.writeNode("CssParameter",{symbolizer:a,key:"strokeOpacity"},b);void 0!=a.strokeWidth&&this.writeNode("CssParameter",{symbolizer:a,key:"strokeWidth"},b);void 0!=a.strokeDashstyle&&"solid"!==
-a.strokeDashstyle&&this.writeNode("CssParameter",{symbolizer:a,key:"strokeDashstyle"},b);void 0!=a.strokeLinecap&&this.writeNode("CssParameter",{symbolizer:a,key:"strokeLinecap"},b);return b},CssParameter:function(a){return this.createElementNSPlus("sld:CssParameter",{attributes:{name:this.getCssProperty(a.key)},value:a.symbolizer[a.key]})},TextSymbolizer:function(a){var b=this.createElementNSPlus("sld:TextSymbolizer");null!=a.label&&this.writeNode("Label",a.label,b);null==a.fontFamily&&null==a.fontSize&&
-null==a.fontWeight&&null==a.fontStyle||this.writeNode("Font",a,b);null==a.labelAnchorPointX&&null==a.labelAnchorPointY&&null==a.labelAlign&&null==a.labelXOffset&&null==a.labelYOffset&&null==a.labelRotation&&null==a.labelPerpendicularOffset||this.writeNode("LabelPlacement",a,b);null==a.haloRadius&&null==a.haloColor&&null==a.haloOpacity||this.writeNode("Halo",a,b);null==a.fontColor&&null==a.fontOpacity||this.writeNode("Fill",{fillColor:a.fontColor,fillOpacity:a.fontOpacity},b);return b},LabelPlacement:function(a){var b=
-this.createElementNSPlus("sld:LabelPlacement");null==a.labelAnchorPointX&&null==a.labelAnchorPointY&&null==a.labelAlign&&null==a.labelXOffset&&null==a.labelYOffset&&null==a.labelRotation||null!=a.labelPerpendicularOffset||this.writeNode("PointPlacement",a,b);null!=a.labelPerpendicularOffset&&this.writeNode("LinePlacement",a,b);return b},LinePlacement:function(a){var b=this.createElementNSPlus("sld:LinePlacement");this.writeNode("PerpendicularOffset",a.labelPerpendicularOffset,b);return b},PerpendicularOffset:function(a){return this.createElementNSPlus("sld:PerpendicularOffset",
-{value:a})},PointPlacement:function(a){var b=this.createElementNSPlus("sld:PointPlacement");null==a.labelAnchorPointX&&null==a.labelAnchorPointY&&null==a.labelAlign||this.writeNode("AnchorPoint",a,b);null==a.labelXOffset&&null==a.labelYOffset||this.writeNode("Displacement",a,b);null!=a.labelRotation&&this.writeNode("Rotation",a.labelRotation,b);return b},AnchorPoint:function(a){var b=this.createElementNSPlus("sld:AnchorPoint"),c=a.labelAnchorPointX,d=a.labelAnchorPointY;null!=c&&this.writeNode("AnchorPointX",
-c,b);null!=d&&this.writeNode("AnchorPointY",d,b);if(null==c&&null==d){var e=a.labelAlign.substr(0,1);a=a.labelAlign.substr(1,1);"l"===e?c=0:"c"===e?c=0.5:"r"===e&&(c=1);"b"===a?d=0:"m"===a?d=0.5:"t"===a&&(d=1);this.writeNode("AnchorPointX",c,b);this.writeNode("AnchorPointY",d,b)}return b},AnchorPointX:function(a){return this.createElementNSPlus("sld:AnchorPointX",{value:a})},AnchorPointY:function(a){return this.createElementNSPlus("sld:AnchorPointY",{value:a})},Displacement:function(a){var b=this.createElementNSPlus("sld:Displacement");
-null!=a.labelXOffset&&this.writeNode("DisplacementX",a.labelXOffset,b);null!=a.labelYOffset&&this.writeNode("DisplacementY",a.labelYOffset,b);return b},DisplacementX:function(a){return this.createElementNSPlus("sld:DisplacementX",{value:a})},DisplacementY:function(a){return this.createElementNSPlus("sld:DisplacementY",{value:a})},Font:function(a){var b=this.createElementNSPlus("sld:Font");a.fontFamily&&this.writeNode("CssParameter",{symbolizer:a,key:"fontFamily"},b);a.fontSize&&this.writeNode("CssParameter",
-{symbolizer:a,key:"fontSize"},b);a.fontWeight&&this.writeNode("CssParameter",{symbolizer:a,key:"fontWeight"},b);a.fontStyle&&this.writeNode("CssParameter",{symbolizer:a,key:"fontStyle"},b);return b},Label:function(a){return this.writers.sld._OGCExpression.call(this,"sld:Label",a)},Halo:function(a){var b=this.createElementNSPlus("sld:Halo");a.haloRadius&&this.writeNode("Radius",a.haloRadius,b);(a.haloColor||a.haloOpacity)&&this.writeNode("Fill",{fillColor:a.haloColor,fillOpacity:a.haloOpacity},b);
-return b},Radius:function(a){return this.createElementNSPlus("sld:Radius",{value:a})},RasterSymbolizer:function(a){var b=this.createElementNSPlus("sld:RasterSymbolizer");a.geometry&&this.writeNode("Geometry",a.geometry,b);a.opacity&&this.writeNode("Opacity",a.opacity,b);a.colorMap&&this.writeNode("ColorMap",a.colorMap,b);return b},Geometry:function(a){var b=this.createElementNSPlus("sld:Geometry");a.property&&this.writeNode("ogc:PropertyName",a,b);return b},ColorMap:function(a){for(var b=this.createElementNSPlus("sld:ColorMap"),
-c=0,d=a.length;c<d;++c)this.writeNode("ColorMapEntry",a[c],b);return b},ColorMapEntry:function(a){var b=this.createElementNSPlus("sld:ColorMapEntry");b.setAttribute("color",a.color);void 0!==a.opacity&&b.setAttribute("opacity",parseFloat(a.opacity));void 0!==a.quantity&&b.setAttribute("quantity",parseFloat(a.quantity));void 0!==a.label&&b.setAttribute("label",a.label);return b},PolygonSymbolizer:function(a){var b=this.createElementNSPlus("sld:PolygonSymbolizer");!1!==a.fill&&this.writeNode("Fill",
-a,b);!1!==a.stroke&&this.writeNode("Stroke",a,b);return b},Fill:function(a){var b=this.createElementNSPlus("sld:Fill");a.fillColor&&this.writeNode("CssParameter",{symbolizer:a,key:"fillColor"},b);null!=a.fillOpacity&&this.writeNode("CssParameter",{symbolizer:a,key:"fillOpacity"},b);return b},PointSymbolizer:function(a){var b=this.createElementNSPlus("sld:PointSymbolizer");this.writeNode("Graphic",a,b);return b},Graphic:function(a){var b=this.createElementNSPlus("sld:Graphic");void 0!=a.externalGraphic?
-this.writeNode("ExternalGraphic",a,b):this.writeNode("Mark",a,b);void 0!=a.graphicOpacity&&this.writeNode("Opacity",a.graphicOpacity,b);void 0!=a.pointRadius?this.writeNode("Size",2*a.pointRadius,b):void 0!=a.graphicWidth&&this.writeNode("Size",a.graphicWidth,b);void 0!=a.rotation&&this.writeNode("Rotation",a.rotation,b);return b},ExternalGraphic:function(a){var b=this.createElementNSPlus("sld:ExternalGraphic");this.writeNode("OnlineResource",a.externalGraphic,b);a=a.graphicFormat||this.getGraphicFormat(a.externalGraphic);
-this.writeNode("Format",a,b);return b},Mark:function(a){var b=this.createElementNSPlus("sld:Mark");a.graphicName&&this.writeNode("WellKnownName",a.graphicName,b);!1!==a.fill&&this.writeNode("Fill",a,b);!1!==a.stroke&&this.writeNode("Stroke",a,b);return b},WellKnownName:function(a){return this.createElementNSPlus("sld:WellKnownName",{value:a})},Opacity:function(a){return this.createElementNSPlus("sld:Opacity",{value:a})},Size:function(a){return this.writers.sld._OGCExpression.call(this,"sld:Size",
-a)},Rotation:function(a){return this.createElementNSPlus("sld:Rotation",{value:a})},OnlineResource:function(a){return this.createElementNSPlus("sld:OnlineResource",{attributes:{"xlink:type":"simple","xlink:href":a}})},Format:function(a){return this.createElementNSPlus("sld:Format",{value:a})}}},OpenLayers.Format.Filter.v1_0_0.prototype.writers),CLASS_NAME:"OpenLayers.Format.SLD.v1"});OpenLayers.Layer.WMS=OpenLayers.Class(OpenLayers.Layer.Grid,{DEFAULT_PARAMS:{service:"WMS",version:"1.1.1",request:"GetMap",styles:"",format:"image/jpeg"},isBaseLayer:!0,encodeBBOX:!1,noMagic:!1,yx:{},initialize:function(a,b,c,d){var e=[];c=OpenLayers.Util.upperCaseObject(c);1.3<=parseFloat(c.VERSION)&&!c.EXCEPTIONS&&(c.EXCEPTIONS="INIMAGE");e.push(a,b,c,d);OpenLayers.Layer.Grid.prototype.initialize.apply(this,e);OpenLayers.Util.applyDefaults(this.params,OpenLayers.Util.upperCaseObject(this.DEFAULT_PARAMS));
-!this.noMagic&&(this.params.TRANSPARENT&&"true"==this.params.TRANSPARENT.toString().toLowerCase())&&(null!=d&&d.isBaseLayer||(this.isBaseLayer=!1),"image/jpeg"==this.params.FORMAT&&(this.params.FORMAT=OpenLayers.Util.alphaHack()?"image/gif":"image/png"))},clone:function(a){null==a&&(a=new OpenLayers.Layer.WMS(this.name,this.url,this.params,this.getOptions()));return a=OpenLayers.Layer.Grid.prototype.clone.apply(this,[a])},reverseAxisOrder:function(){var a=this.projection.getCode();return 1.3<=parseFloat(this.params.VERSION)&&
-!!(this.yx[a]||OpenLayers.Projection.defaults[a]&&OpenLayers.Projection.defaults[a].yx)},getURL:function(a){a=this.adjustBounds(a);var b=this.getImageSize(),c={},d=this.reverseAxisOrder();c.BBOX=this.encodeBBOX?a.toBBOX(null,d):a.toArray(d);c.WIDTH=b.w;c.HEIGHT=b.h;return this.getFullRequestString(c)},mergeNewParams:function(a){a=[OpenLayers.Util.upperCaseObject(a)];return OpenLayers.Layer.Grid.prototype.mergeNewParams.apply(this,a)},getFullRequestString:function(a,b){var c=this.map.getProjectionObject(),
-c=this.projection&&this.projection.equals(c)?this.projection.getCode():c.getCode(),c="none"==c?null:c;1.3<=parseFloat(this.params.VERSION)?this.params.CRS=c:this.params.SRS=c;"boolean"==typeof this.params.TRANSPARENT&&(a.TRANSPARENT=this.params.TRANSPARENT?"TRUE":"FALSE");return OpenLayers.Layer.Grid.prototype.getFullRequestString.apply(this,arguments)},CLASS_NAME:"OpenLayers.Layer.WMS"});OpenLayers.Layer.KaMap=OpenLayers.Class(OpenLayers.Layer.Grid,{isBaseLayer:!0,DEFAULT_PARAMS:{i:"jpeg",map:""},initialize:function(a,b,c,d){OpenLayers.Layer.Grid.prototype.initialize.apply(this,arguments);this.params=OpenLayers.Util.applyDefaults(this.params,this.DEFAULT_PARAMS)},getURL:function(a){a=this.adjustBounds(a);var b=this.map.getResolution(),c=Math.round(1E4*this.map.getScale())/1E4,d=Math.round(a.left/b);a=-Math.round(a.top/b);return this.getFullRequestString({t:a,l:d,s:c})},calculateGridLayout:function(a,
-b,c){b=c*this.tileSize.w;c*=this.tileSize.h;return{tilelon:b,tilelat:c,startcol:Math.floor(a.left/b)-this.buffer,startrow:Math.floor(a.top/c)+this.buffer}},getTileBoundsForGridIndex:function(a,b){this.getTileOrigin();var c=this.gridLayout,d=c.tilelon,e=c.tilelat,f=(c.startcol+b)*d,c=(c.startrow-a)*e;return new OpenLayers.Bounds(f,c,f+d,c+e)},clone:function(a){null==a&&(a=new OpenLayers.Layer.KaMap(this.name,this.url,this.params,this.getOptions()));a=OpenLayers.Layer.Grid.prototype.clone.apply(this,
-[a]);null!=this.tileSize&&(a.tileSize=this.tileSize.clone());a.grid=[];return a},getTileBounds:function(a){var b=this.getResolution(),c=b*this.tileSize.w,b=b*this.tileSize.h,d=this.getLonLatFromViewPortPx(a);a=c*Math.floor(d.lon/c);d=b*Math.floor(d.lat/b);return new OpenLayers.Bounds(a,d,a+c,d+b)},CLASS_NAME:"OpenLayers.Layer.KaMap"});OpenLayers.Format.WMC.v1_1_0=OpenLayers.Class(OpenLayers.Format.WMC.v1,{VERSION:"1.1.0",schemaLocation:"http://www.opengis.net/context http://schemas.opengis.net/context/1.1.0/context.xsd",initialize:function(a){OpenLayers.Format.WMC.v1.prototype.initialize.apply(this,[a])},read_sld_MinScaleDenominator:function(a,b){var c=parseFloat(this.getChildValue(b));0<c&&(a.maxScale=c)},read_sld_MaxScaleDenominator:function(a,b){a.minScale=parseFloat(this.getChildValue(b))},read_wmc_SRS:function(a,b){"srs"in
-a||(a.srs={});a.srs[this.getChildValue(b)]=!0},write_wmc_Layer:function(a){var b=OpenLayers.Format.WMC.v1.prototype.write_wmc_Layer.apply(this,[a]);if(a.maxScale){var c=this.createElementNS(this.namespaces.sld,"sld:MinScaleDenominator");c.appendChild(this.createTextNode(a.maxScale.toPrecision(16)));b.appendChild(c)}a.minScale&&(c=this.createElementNS(this.namespaces.sld,"sld:MaxScaleDenominator"),c.appendChild(this.createTextNode(a.minScale.toPrecision(16))),b.appendChild(c));if(a.srs)for(var d in a.srs)b.appendChild(this.createElementDefaultNS("SRS",
-d));b.appendChild(this.write_wmc_FormatList(a));b.appendChild(this.write_wmc_StyleList(a));a.dimensions&&b.appendChild(this.write_wmc_DimensionList(a));b.appendChild(this.write_wmc_LayerExtension(a));return b},CLASS_NAME:"OpenLayers.Format.WMC.v1_1_0"});OpenLayers.Format.XLS=OpenLayers.Class(OpenLayers.Format.XML.VersionedOGC,{defaultVersion:"1.1.0",stringifyOutput:!0,CLASS_NAME:"OpenLayers.Format.XLS"});OpenLayers.Format.XLS.v1=OpenLayers.Class(OpenLayers.Format.XML,{namespaces:{xls:"http://www.opengis.net/xls",gml:"http://www.opengis.net/gml",xsi:"http://www.w3.org/2001/XMLSchema-instance"},regExes:{trimSpace:/^\s*|\s*$/g,removeSpace:/\s*/g,splitSpace:/\s+/,trimComma:/\s*,\s*/g},xy:!0,defaultPrefix:"xls",schemaLocation:null,read:function(a,b){OpenLayers.Util.applyDefaults(b,this.options);var c={};this.readChildNodes(a,c);return c},readers:{xls:{XLS:function(a,b){b.version=a.getAttribute("version");
-this.readChildNodes(a,b)},Response:function(a,b){this.readChildNodes(a,b)},GeocodeResponse:function(a,b){b.responseLists=[];this.readChildNodes(a,b)},GeocodeResponseList:function(a,b){var c={features:[],numberOfGeocodedAddresses:parseInt(a.getAttribute("numberOfGeocodedAddresses"))};b.responseLists.push(c);this.readChildNodes(a,c)},GeocodedAddress:function(a,b){var c=new OpenLayers.Feature.Vector;b.features.push(c);this.readChildNodes(a,c);c.geometry=c.components[0]},GeocodeMatchCode:function(a,b){b.attributes.matchCode=
-{accuracy:parseFloat(a.getAttribute("accuracy")),matchType:a.getAttribute("matchType")}},Address:function(a,b){var c={countryCode:a.getAttribute("countryCode"),addressee:a.getAttribute("addressee"),street:[],place:[]};b.attributes.address=c;this.readChildNodes(a,c)},freeFormAddress:function(a,b){b.freeFormAddress=this.getChildValue(a)},StreetAddress:function(a,b){this.readChildNodes(a,b)},Building:function(a,b){b.building={number:a.getAttribute("number"),subdivision:a.getAttribute("subdivision"),
-buildingName:a.getAttribute("buildingName")}},Street:function(a,b){b.street.push(this.getChildValue(a))},Place:function(a,b){b.place[a.getAttribute("type")]=this.getChildValue(a)},PostalCode:function(a,b){b.postalCode=this.getChildValue(a)}},gml:OpenLayers.Format.GML.v3.prototype.readers.gml},write:function(a){return this.writers.xls.XLS.apply(this,[a])},writers:{xls:{XLS:function(a){var b=this.createElementNSPlus("xls:XLS",{attributes:{version:this.VERSION,"xsi:schemaLocation":this.schemaLocation}});
-this.writeNode("RequestHeader",a.header,b);this.writeNode("Request",a,b);return b},RequestHeader:function(a){return this.createElementNSPlus("xls:RequestHeader")},Request:function(a){var b=this.createElementNSPlus("xls:Request",{attributes:{methodName:"GeocodeRequest",requestID:a.requestID||"",version:this.VERSION}});this.writeNode("GeocodeRequest",a.addresses,b);return b},GeocodeRequest:function(a){for(var b=this.createElementNSPlus("xls:GeocodeRequest"),c=0,d=a.length;c<d;c++)this.writeNode("Address",
-a[c],b);return b},Address:function(a){var b=this.createElementNSPlus("xls:Address",{attributes:{countryCode:a.countryCode}});a.freeFormAddress?this.writeNode("freeFormAddress",a.freeFormAddress,b):(a.street&&this.writeNode("StreetAddress",a,b),a.municipality&&this.writeNode("Municipality",a.municipality,b),a.countrySubdivision&&this.writeNode("CountrySubdivision",a.countrySubdivision,b),a.postalCode&&this.writeNode("PostalCode",a.postalCode,b));return b},freeFormAddress:function(a){return this.createElementNSPlus("freeFormAddress",
-{value:a})},StreetAddress:function(a){var b=this.createElementNSPlus("xls:StreetAddress");a.building&&this.writeNode(b,"Building",a.building);a=a.street;OpenLayers.Util.isArray(a)||(a=[a]);for(var c=0,d=a.length;c<d;c++)this.writeNode("Street",a[c],b);return b},Building:function(a){return this.createElementNSPlus("xls:Building",{attributes:{number:a.number,subdivision:a.subdivision,buildingName:a.buildingName}})},Street:function(a){return this.createElementNSPlus("xls:Street",{value:a})},Municipality:function(a){return this.createElementNSPlus("xls:Place",
-{attributes:{type:"Municipality"},value:a})},CountrySubdivision:function(a){return this.createElementNSPlus("xls:Place",{attributes:{type:"CountrySubdivision"},value:a})},PostalCode:function(a){return this.createElementNSPlus("xls:PostalCode",{value:a})}}},CLASS_NAME:"OpenLayers.Format.XLS.v1"});OpenLayers.Format.XLS.v1_1_0=OpenLayers.Class(OpenLayers.Format.XLS.v1,{VERSION:"1.1",schemaLocation:"http://www.opengis.net/xls http://schemas.opengis.net/ols/1.1.0/LocationUtilityService.xsd",CLASS_NAME:"OpenLayers.Format.XLS.v1_1_0"});OpenLayers.Format.XLS.v1_1=OpenLayers.Format.XLS.v1_1_0;OpenLayers.Renderer.SVG=OpenLayers.Class(OpenLayers.Renderer.Elements,{xmlns:"http://www.w3.org/2000/svg",xlinkns:"http://www.w3.org/1999/xlink",MAX_PIXEL:15E3,translationParameters:null,symbolMetrics:null,initialize:function(a){this.supported()&&(OpenLayers.Renderer.Elements.prototype.initialize.apply(this,arguments),this.translationParameters={x:0,y:0},this.symbolMetrics={})},supported:function(){return document.implementation&&(document.implementation.hasFeature("org.w3c.svg","1.0")||document.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#SVG",
-"1.1")||document.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#BasicStructure","1.1"))},inValidRange:function(a,b,c){a+=c?0:this.translationParameters.x;b+=c?0:this.translationParameters.y;return a>=-this.MAX_PIXEL&&a<=this.MAX_PIXEL&&b>=-this.MAX_PIXEL&&b<=this.MAX_PIXEL},setExtent:function(a,b){var c=OpenLayers.Renderer.Elements.prototype.setExtent.apply(this,arguments),d=this.getResolution(),e=-a.left/d,d=a.top/d;if(b)return this.left=e,this.top=d,this.rendererRoot.setAttributeNS(null,
-"viewBox","0 0 "+this.size.w+" "+this.size.h),this.translate(this.xOffset,0),!0;(e=this.translate(e-this.left+this.xOffset,d-this.top))||this.setExtent(a,!0);return c&&e},translate:function(a,b){if(this.inValidRange(a,b,!0)){var c="";if(a||b)c="translate("+a+","+b+")";this.root.setAttributeNS(null,"transform",c);this.translationParameters={x:a,y:b};return!0}return!1},setSize:function(a){OpenLayers.Renderer.prototype.setSize.apply(this,arguments);this.rendererRoot.setAttributeNS(null,"width",this.size.w);
-this.rendererRoot.setAttributeNS(null,"height",this.size.h)},getNodeType:function(a,b){var c=null;switch(a.CLASS_NAME){case "OpenLayers.Geometry.Point":c=b.externalGraphic?"image":this.isComplexSymbol(b.graphicName)?"svg":"circle";break;case "OpenLayers.Geometry.Rectangle":c="rect";break;case "OpenLayers.Geometry.LineString":c="polyline";break;case "OpenLayers.Geometry.LinearRing":c="polygon";break;case "OpenLayers.Geometry.Polygon":case "OpenLayers.Geometry.Curve":c="path"}return c},setStyle:function(a,
-b,c){b=b||a._style;c=c||a._options;var d=b.title||b.graphicTitle;if(d){a.setAttributeNS(null,"title",d);var e=a.getElementsByTagName("title");0<e.length?e[0].firstChild.textContent=d:(e=this.nodeFactory(null,"title"),e.textContent=d,a.appendChild(e))}var e=parseFloat(a.getAttributeNS(null,"r")),d=1,f;if("OpenLayers.Geometry.Point"==a._geometryClass&&e){a.style.visibility="";if(!1===b.graphic)a.style.visibility="hidden";else if(b.externalGraphic){f=this.getPosition(a);b.graphicWidth&&b.graphicHeight&&
-a.setAttributeNS(null,"preserveAspectRatio","none");var e=b.graphicWidth||b.graphicHeight,g=b.graphicHeight||b.graphicWidth,e=e?e:2*b.pointRadius,g=g?g:2*b.pointRadius,h=void 0!=b.graphicYOffset?b.graphicYOffset:-(0.5*g),k=b.graphicOpacity||b.fillOpacity;a.setAttributeNS(null,"x",(f.x+(void 0!=b.graphicXOffset?b.graphicXOffset:-(0.5*e))).toFixed());a.setAttributeNS(null,"y",(f.y+h).toFixed());a.setAttributeNS(null,"width",e);a.setAttributeNS(null,"height",g);a.setAttributeNS(this.xlinkns,"xlink:href",
-b.externalGraphic);a.setAttributeNS(null,"style","opacity: "+k);a.onclick=OpenLayers.Event.preventDefault}else if(this.isComplexSymbol(b.graphicName)){var e=3*b.pointRadius,g=2*e,l=this.importSymbol(b.graphicName);f=this.getPosition(a);d=3*this.symbolMetrics[l.id][0]/g;h=a.parentNode;k=a.nextSibling;h&&h.removeChild(a);a.firstChild&&a.removeChild(a.firstChild);a.appendChild(l.firstChild.cloneNode(!0));a.setAttributeNS(null,"viewBox",l.getAttributeNS(null,"viewBox"));a.setAttributeNS(null,"width",
-g);a.setAttributeNS(null,"height",g);a.setAttributeNS(null,"x",f.x-e);a.setAttributeNS(null,"y",f.y-e);k?h.insertBefore(a,k):h&&h.appendChild(a)}else a.setAttributeNS(null,"r",b.pointRadius);e=b.rotation;void 0===e&&void 0===a._rotation||!f||(a._rotation=e,e|=0,"svg"!==a.nodeName?a.setAttributeNS(null,"transform","rotate("+e+" "+f.x+" "+f.y+")"):(f=this.symbolMetrics[l.id],a.firstChild.setAttributeNS(null,"transform","rotate("+e+" "+f[1]+" "+f[2]+")")))}c.isFilled?(a.setAttributeNS(null,"fill",b.fillColor),
-a.setAttributeNS(null,"fill-opacity",b.fillOpacity)):a.setAttributeNS(null,"fill","none");c.isStroked?(a.setAttributeNS(null,"stroke",b.strokeColor),a.setAttributeNS(null,"stroke-opacity",b.strokeOpacity),a.setAttributeNS(null,"stroke-width",b.strokeWidth*d),a.setAttributeNS(null,"stroke-linecap",b.strokeLinecap||"round"),a.setAttributeNS(null,"stroke-linejoin","round"),b.strokeDashstyle&&a.setAttributeNS(null,"stroke-dasharray",this.dashStyle(b,d))):a.setAttributeNS(null,"stroke","none");b.pointerEvents&&
-a.setAttributeNS(null,"pointer-events",b.pointerEvents);null!=b.cursor&&a.setAttributeNS(null,"cursor",b.cursor);return a},dashStyle:function(a,b){var c=a.strokeWidth*b,d=a.strokeDashstyle;switch(d){case "solid":return"none";case "dot":return[1,4*c].join();case "dash":return[4*c,4*c].join();case "dashdot":return[4*c,4*c,1,4*c].join();case "longdash":return[8*c,4*c].join();case "longdashdot":return[8*c,4*c,1,4*c].join();default:return OpenLayers.String.trim(d).replace(/\s+/g,",")}},createNode:function(a,
-b){var c=document.createElementNS(this.xmlns,a);b&&c.setAttributeNS(null,"id",b);return c},nodeTypeCompare:function(a,b){return b==a.nodeName},createRenderRoot:function(){var a=this.nodeFactory(this.container.id+"_svgRoot","svg");a.style.display="block";return a},createRoot:function(a){return this.nodeFactory(this.container.id+a,"g")},createDefs:function(){var a=this.nodeFactory(this.container.id+"_defs","defs");this.rendererRoot.appendChild(a);return a},drawPoint:function(a,b){return this.drawCircle(a,
-b,1)},drawCircle:function(a,b,c){var d=this.getResolution(),e=(b.x-this.featureDx)/d+this.left;b=this.top-b.y/d;return this.inValidRange(e,b)?(a.setAttributeNS(null,"cx",e),a.setAttributeNS(null,"cy",b),a.setAttributeNS(null,"r",c),a):!1},drawLineString:function(a,b){var c=this.getComponentsString(b.components);return c.path?(a.setAttributeNS(null,"points",c.path),c.complete?a:null):!1},drawLinearRing:function(a,b){var c=this.getComponentsString(b.components);return c.path?(a.setAttributeNS(null,
-"points",c.path),c.complete?a:null):!1},drawPolygon:function(a,b){for(var c="",d=!0,e=!0,f,g,h=0,k=b.components.length;h<k;h++)c+=" M",f=this.getComponentsString(b.components[h].components," "),(g=f.path)?(c+=" "+g,e=f.complete&&e):d=!1;return d?(a.setAttributeNS(null,"d",c+" z"),a.setAttributeNS(null,"fill-rule","evenodd"),e?a:null):!1},drawRectangle:function(a,b){var c=this.getResolution(),d=(b.x-this.featureDx)/c+this.left,e=this.top-b.y/c;return this.inValidRange(d,e)?(a.setAttributeNS(null,"x",
-d),a.setAttributeNS(null,"y",e),a.setAttributeNS(null,"width",b.width/c),a.setAttributeNS(null,"height",b.height/c),a):!1},drawText:function(a,b,c){var d=!!b.labelOutlineWidth;if(d){var e=OpenLayers.Util.extend({},b);e.fontColor=e.labelOutlineColor;e.fontStrokeColor=e.labelOutlineColor;e.fontStrokeWidth=b.labelOutlineWidth;b.labelOutlineOpacity&&(e.fontOpacity=b.labelOutlineOpacity);delete e.labelOutlineWidth;this.drawText(a,e,c)}var f=this.getResolution(),e=(c.x-this.featureDx)/f+this.left,g=c.y/
-f-this.top,d=d?this.LABEL_OUTLINE_SUFFIX:this.LABEL_ID_SUFFIX,f=this.nodeFactory(a+d,"text");f.setAttributeNS(null,"x",e);f.setAttributeNS(null,"y",-g);b.fontColor&&f.setAttributeNS(null,"fill",b.fontColor);b.fontStrokeColor&&f.setAttributeNS(null,"stroke",b.fontStrokeColor);b.fontStrokeWidth&&f.setAttributeNS(null,"stroke-width",b.fontStrokeWidth);b.fontOpacity&&f.setAttributeNS(null,"opacity",b.fontOpacity);b.fontFamily&&f.setAttributeNS(null,"font-family",b.fontFamily);b.fontSize&&f.setAttributeNS(null,
-"font-size",b.fontSize);b.fontWeight&&f.setAttributeNS(null,"font-weight",b.fontWeight);b.fontStyle&&f.setAttributeNS(null,"font-style",b.fontStyle);!0===b.labelSelect?(f.setAttributeNS(null,"pointer-events","visible"),f._featureId=a):f.setAttributeNS(null,"pointer-events","none");g=b.labelAlign||OpenLayers.Renderer.defaultSymbolizer.labelAlign;f.setAttributeNS(null,"text-anchor",OpenLayers.Renderer.SVG.LABEL_ALIGN[g[0]]||"middle");!0===OpenLayers.IS_GECKO&&f.setAttributeNS(null,"dominant-baseline",
-OpenLayers.Renderer.SVG.LABEL_ALIGN[g[1]]||"central");for(var h=b.label.split("\n"),k=h.length;f.childNodes.length>k;)f.removeChild(f.lastChild);for(var l=0;l<k;l++){var m=this.nodeFactory(a+d+"_tspan_"+l,"tspan");!0===b.labelSelect&&(m._featureId=a,m._geometry=c,m._geometryClass=c.CLASS_NAME);!1===OpenLayers.IS_GECKO&&m.setAttributeNS(null,"baseline-shift",OpenLayers.Renderer.SVG.LABEL_VSHIFT[g[1]]||"-35%");m.setAttribute("x",e);if(0==l){var n=OpenLayers.Renderer.SVG.LABEL_VFACTOR[g[1]];null==n&&
-(n=-0.5);m.setAttribute("dy",n*(k-1)+"em")}else m.setAttribute("dy","1em");m.textContent=""===h[l]?" ":h[l];m.parentNode||f.appendChild(m)}f.parentNode||this.textRoot.appendChild(f)},getComponentsString:function(a,b){for(var c=[],d=!0,e=a.length,f=[],g,h=0;h<e;h++)g=a[h],c.push(g),(g=this.getShortString(g))?f.push(g):(0<h&&this.getShortString(a[h-1])&&f.push(this.clipLine(a[h],a[h-1])),h<e-1&&this.getShortString(a[h+1])&&f.push(this.clipLine(a[h],a[h+1])),d=!1);return{path:f.join(b||","),complete:d}},
-clipLine:function(a,b){if(b.equals(a))return"";var c=this.getResolution(),d=this.MAX_PIXEL-this.translationParameters.x,e=this.MAX_PIXEL-this.translationParameters.y,f=(b.x-this.featureDx)/c+this.left,g=this.top-b.y/c,h=(a.x-this.featureDx)/c+this.left,c=this.top-a.y/c,k;if(h<-d||h>d)k=(c-g)/(h-f),h=0>h?-d:d,c=g+(h-f)*k;if(c<-e||c>e)k=(h-f)/(c-g),c=0>c?-e:e,h=f+(c-g)*k;return h+","+c},getShortString:function(a){var b=this.getResolution(),c=(a.x-this.featureDx)/b+this.left;a=this.top-a.y/b;return this.inValidRange(c,
-a)?c+","+a:!1},getPosition:function(a){return{x:parseFloat(a.getAttributeNS(null,"cx")),y:parseFloat(a.getAttributeNS(null,"cy"))}},importSymbol:function(a){this.defs||(this.defs=this.createDefs());var b=this.container.id+"-"+a,c=document.getElementById(b);if(null!=c)return c;var d=OpenLayers.Renderer.symbol[a];if(!d)throw Error(a+" is not a valid symbol name");a=this.nodeFactory(b,"symbol");var e=this.nodeFactory(null,"polygon");a.appendChild(e);for(var c=new OpenLayers.Bounds(Number.MAX_VALUE,Number.MAX_VALUE,
-0,0),f=[],g,h,k=0;k<d.length;k+=2)g=d[k],h=d[k+1],c.left=Math.min(c.left,g),c.bottom=Math.min(c.bottom,h),c.right=Math.max(c.right,g),c.top=Math.max(c.top,h),f.push(g,",",h);e.setAttributeNS(null,"points",f.join(" "));d=c.getWidth();e=c.getHeight();a.setAttributeNS(null,"viewBox",[c.left-d,c.bottom-e,3*d,3*e].join(" "));this.symbolMetrics[b]=[Math.max(d,e),c.getCenterLonLat().lon,c.getCenterLonLat().lat];this.defs.appendChild(a);return a},getFeatureIdFromEvent:function(a){var b=OpenLayers.Renderer.Elements.prototype.getFeatureIdFromEvent.apply(this,
-arguments);b||(b=a.target,b=b.parentNode&&b!=this.rendererRoot?b.parentNode._featureId:void 0);return b},CLASS_NAME:"OpenLayers.Renderer.SVG"});OpenLayers.Renderer.SVG.LABEL_ALIGN={l:"start",r:"end",b:"bottom",t:"hanging"};OpenLayers.Renderer.SVG.LABEL_VSHIFT={t:"-70%",b:"0"};OpenLayers.Renderer.SVG.LABEL_VFACTOR={t:0,b:-1};OpenLayers.Renderer.SVG.preventDefault=function(a){OpenLayers.Event.preventDefault(a)};OpenLayers.Format.SLD.v1_0_0=OpenLayers.Class(OpenLayers.Format.SLD.v1,{VERSION:"1.0.0",schemaLocation:"http://www.opengis.net/sld http://schemas.opengis.net/sld/1.0.0/StyledLayerDescriptor.xsd",CLASS_NAME:"OpenLayers.Format.SLD.v1_0_0"});OpenLayers.Format.OWSContext=OpenLayers.Class(OpenLayers.Format.Context,{defaultVersion:"0.3.1",getVersion:function(a,b){var c=OpenLayers.Format.XML.VersionedOGC.prototype.getVersion.apply(this,arguments);"0.3.0"===c&&(c=this.defaultVersion);return c},toContext:function(a){var b={};"OpenLayers.Map"==a.CLASS_NAME&&(b.bounds=a.getExtent(),b.maxExtent=a.maxExtent,b.projection=a.projection,b.size=a.getSize(),b.layers=a.layers);return b},CLASS_NAME:"OpenLayers.Format.OWSContext"});OpenLayers.Format.OWSContext.v0_3_1=OpenLayers.Class(OpenLayers.Format.XML,{namespaces:{owc:"http://www.opengis.net/ows-context",gml:"http://www.opengis.net/gml",kml:"http://www.opengis.net/kml/2.2",ogc:"http://www.opengis.net/ogc",ows:"http://www.opengis.net/ows",sld:"http://www.opengis.net/sld",xlink:"http://www.w3.org/1999/xlink",xsi:"http://www.w3.org/2001/XMLSchema-instance"},VERSION:"0.3.1",schemaLocation:"http://www.opengis.net/ows-context http://www.ogcnetwork.net/schemas/owc/0.3.1/owsContext.xsd",
-defaultPrefix:"owc",extractAttributes:!0,xy:!0,regExes:{trimSpace:/^\s*|\s*$/g,removeSpace:/\s*/g,splitSpace:/\s+/,trimComma:/\s*,\s*/g},featureNS:"http://mapserver.gis.umn.edu/mapserver",featureType:"vector",geometryName:"geometry",nestingLayerLookup:null,initialize:function(a){OpenLayers.Format.XML.prototype.initialize.apply(this,[a]);OpenLayers.Format.GML.v2.prototype.setGeometryTypes.call(this)},setNestingPath:function(a){if(a.layersContext)for(var b=0,c=a.layersContext.length;b<c;b++){var d=
-a.layersContext[b],e=[],f=a.title||"";a.metadata&&a.metadata.nestingPath&&(e=a.metadata.nestingPath.slice());""!=f&&e.push(f);d.metadata.nestingPath=e;d.layersContext&&this.setNestingPath(d)}},decomposeNestingPath:function(a){var b=[];if(OpenLayers.Util.isArray(a)){for(a=a.slice();0<a.length;)b.push(a.slice()),a.pop();b.reverse()}return b},read:function(a){"string"==typeof a&&(a=OpenLayers.Format.XML.prototype.read.apply(this,[a]));a&&9==a.nodeType&&(a=a.documentElement);var b={};this.readNode(a,
-b);this.setNestingPath({layersContext:b.layersContext});a=[];this.processLayer(a,b);delete b.layersContext;b.layersContext=a;return b},processLayer:function(a,b){if(b.layersContext)for(var c=0,d=b.layersContext.length;c<d;c++){var e=b.layersContext[c];a.push(e);e.layersContext&&this.processLayer(a,e)}},write:function(a,b){this.nestingLayerLookup={};b=b||{};OpenLayers.Util.applyDefaults(b,a);var c=this.writeNode("OWSContext",b);this.nestingLayerLookup=null;this.setAttributeNS(c,this.namespaces.xsi,
-"xsi:schemaLocation",this.schemaLocation);return OpenLayers.Format.XML.prototype.write.apply(this,[c])},readers:{kml:{Document:function(a,b){b.features=(new OpenLayers.Format.KML({kmlns:this.namespaces.kml,extractStyles:!0})).read(a)}},owc:{OWSContext:function(a,b){this.readChildNodes(a,b)},General:function(a,b){this.readChildNodes(a,b)},ResourceList:function(a,b){this.readChildNodes(a,b)},Layer:function(a,b){var c={metadata:{},visibility:"1"!=a.getAttribute("hidden"),queryable:"1"==a.getAttribute("queryable"),
-opacity:null!=a.getAttribute("opacity")?parseFloat(a.getAttribute("opacity")):null,name:a.getAttribute("name"),categoryLayer:null==a.getAttribute("name"),formats:[],styles:[]};b.layersContext||(b.layersContext=[]);b.layersContext.push(c);this.readChildNodes(a,c)},InlineGeometry:function(a,b){b.features=[];var c=this.getElementsByTagNameNS(a,this.namespaces.gml,"featureMember"),d;1<=c.length&&(d=c[0]);d&&d.firstChild&&(c=d.firstChild.nextSibling?d.firstChild.nextSibling:d.firstChild,this.setNamespace("feature",
-c.namespaceURI),this.featureType=c.localName||c.nodeName.split(":").pop(),this.readChildNodes(a,b))},Server:function(a,b){if(!b.service&&!b.version||b.service!=OpenLayers.Format.Context.serviceTypes.WMS)b.service=a.getAttribute("service"),b.version=a.getAttribute("version"),this.readChildNodes(a,b)},Name:function(a,b){b.name=this.getChildValue(a);this.readChildNodes(a,b)},Title:function(a,b){b.title=this.getChildValue(a);this.readChildNodes(a,b)},StyleList:function(a,b){this.readChildNodes(a,b.styles)},
-Style:function(a,b){var c={};b.push(c);this.readChildNodes(a,c)},LegendURL:function(a,b){var c={};b.legend=c;this.readChildNodes(a,c)},OnlineResource:function(a,b){b.url=this.getAttributeNS(a,this.namespaces.xlink,"href");this.readChildNodes(a,b)}},ows:OpenLayers.Format.OWSCommon.v1_0_0.prototype.readers.ows,gml:OpenLayers.Format.GML.v2.prototype.readers.gml,sld:OpenLayers.Format.SLD.v1_0_0.prototype.readers.sld,feature:OpenLayers.Format.GML.v2.prototype.readers.feature},writers:{owc:{OWSContext:function(a){var b=
-this.createElementNSPlus("OWSContext",{attributes:{version:this.VERSION,id:a.id||OpenLayers.Util.createUniqueID("OpenLayers_OWSContext_")}});this.writeNode("General",a,b);this.writeNode("ResourceList",a,b);return b},General:function(a){var b=this.createElementNSPlus("General");this.writeNode("ows:BoundingBox",a,b);this.writeNode("ows:Title",a.title||"OpenLayers OWSContext",b);return b},ResourceList:function(a){for(var b=this.createElementNSPlus("ResourceList"),c=0,d=a.layers.length;c<d;c++){var e=
-a.layers[c],f=this.decomposeNestingPath(e.metadata.nestingPath);this.writeNode("_Layer",{layer:e,subPaths:f},b)}return b},Server:function(a){var b=this.createElementNSPlus("Server",{attributes:{version:a.version,service:a.service}});this.writeNode("OnlineResource",a,b);return b},OnlineResource:function(a){return this.createElementNSPlus("OnlineResource",{attributes:{"xlink:href":a.url}})},InlineGeometry:function(a){var b=this.createElementNSPlus("InlineGeometry"),c=a.getDataExtent();null!==c&&this.writeNode("gml:boundedBy",
-c,b);for(var c=0,d=a.features.length;c<d;c++)this.writeNode("gml:featureMember",a.features[c],b);return b},StyleList:function(a){for(var b=this.createElementNSPlus("StyleList"),c=0,d=a.length;c<d;c++)this.writeNode("Style",a[c],b);return b},Style:function(a){var b=this.createElementNSPlus("Style");this.writeNode("Name",a,b);this.writeNode("Title",a,b);a.legend&&this.writeNode("LegendURL",a,b);return b},Name:function(a){return this.createElementNSPlus("Name",{value:a.name})},Title:function(a){return this.createElementNSPlus("Title",
-{value:a.title})},LegendURL:function(a){var b=this.createElementNSPlus("LegendURL");this.writeNode("OnlineResource",a.legend,b);return b},_WMS:function(a){var b=this.createElementNSPlus("Layer",{attributes:{name:a.params.LAYERS,queryable:a.queryable?"1":"0",hidden:a.visibility?"0":"1",opacity:a.hasOwnProperty("opacity")?a.opacity:null}});this.writeNode("ows:Title",a.name,b);this.writeNode("ows:OutputFormat",a.params.FORMAT,b);this.writeNode("Server",{service:OpenLayers.Format.Context.serviceTypes.WMS,
-version:a.params.VERSION,url:a.url},b);a.metadata.styles&&0<a.metadata.styles.length&&this.writeNode("StyleList",a.metadata.styles,b);return b},_Layer:function(a){var b,c,d;b=a.layer;c=a.subPaths;d=null;0<c.length?(b=c[0].join("/"),c=b.lastIndexOf("/"),d=this.nestingLayerLookup[b],c=0<c?b.substring(c+1,b.length):b,d||(d=this.createElementNSPlus("Layer"),this.writeNode("ows:Title",c,d),this.nestingLayerLookup[b]=d),a.subPaths.shift(),this.writeNode("_Layer",a,d)):(b instanceof OpenLayers.Layer.WMS?
-d=this.writeNode("_WMS",b):b instanceof OpenLayers.Layer.Vector&&(b.protocol instanceof OpenLayers.Protocol.WFS.v1?d=this.writeNode("_WFS",b):b.protocol instanceof OpenLayers.Protocol.HTTP?b.protocol.format instanceof OpenLayers.Format.GML?(b.protocol.format.version="2.1.2",d=this.writeNode("_GML",b)):b.protocol.format instanceof OpenLayers.Format.KML&&(b.protocol.format.version="2.2",d=this.writeNode("_KML",b)):(this.setNamespace("feature",this.featureNS),d=this.writeNode("_InlineGeometry",b))),
-b.options.maxScale&&this.writeNode("sld:MinScaleDenominator",b.options.maxScale,d),b.options.minScale&&this.writeNode("sld:MaxScaleDenominator",b.options.minScale,d),this.nestingLayerLookup[b.name]=d);return d},_WFS:function(a){var b=this.createElementNSPlus("Layer",{attributes:{name:a.protocol.featurePrefix+":"+a.protocol.featureType,hidden:a.visibility?"0":"1"}});this.writeNode("ows:Title",a.name,b);this.writeNode("Server",{service:OpenLayers.Format.Context.serviceTypes.WFS,version:a.protocol.version,
-url:a.protocol.url},b);return b},_InlineGeometry:function(a){var b=this.createElementNSPlus("Layer",{attributes:{name:this.featureType,hidden:a.visibility?"0":"1"}});this.writeNode("ows:Title",a.name,b);this.writeNode("InlineGeometry",a,b);return b},_GML:function(a){var b=this.createElementNSPlus("Layer");this.writeNode("ows:Title",a.name,b);this.writeNode("Server",{service:OpenLayers.Format.Context.serviceTypes.GML,url:a.protocol.url,version:a.protocol.format.version},b);return b},_KML:function(a){var b=
-this.createElementNSPlus("Layer");this.writeNode("ows:Title",a.name,b);this.writeNode("Server",{service:OpenLayers.Format.Context.serviceTypes.KML,version:a.protocol.format.version,url:a.protocol.url},b);return b}},gml:OpenLayers.Util.applyDefaults({boundedBy:function(a){var b=this.createElementNSPlus("gml:boundedBy");this.writeNode("gml:Box",a,b);return b}},OpenLayers.Format.GML.v2.prototype.writers.gml),ows:OpenLayers.Format.OWSCommon.v1_0_0.prototype.writers.ows,sld:OpenLayers.Format.SLD.v1_0_0.prototype.writers.sld,
-feature:OpenLayers.Format.GML.v2.prototype.writers.feature},CLASS_NAME:"OpenLayers.Format.OWSContext.v0_3_1"});OpenLayers.Popup=OpenLayers.Class({events:null,id:"",lonlat:null,div:null,contentSize:null,size:null,contentHTML:null,backgroundColor:"",opacity:"",border:"",contentDiv:null,groupDiv:null,closeDiv:null,autoSize:!1,minSize:null,maxSize:null,displayClass:"olPopup",contentDisplayClass:"olPopupContent",padding:0,disableFirefoxOverflowHack:!1,fixPadding:function(){"number"==typeof this.padding&&(this.padding=new OpenLayers.Bounds(this.padding,this.padding,this.padding,this.padding))},panMapIfOutOfView:!1,
-keepInMap:!1,closeOnMove:!1,map:null,initialize:function(a,b,c,d,e,f){null==a&&(a=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_"));this.id=a;this.lonlat=b;this.contentSize=null!=c?c:new OpenLayers.Size(OpenLayers.Popup.WIDTH,OpenLayers.Popup.HEIGHT);null!=d&&(this.contentHTML=d);this.backgroundColor=OpenLayers.Popup.COLOR;this.opacity=OpenLayers.Popup.OPACITY;this.border=OpenLayers.Popup.BORDER;this.div=OpenLayers.Util.createDiv(this.id,null,null,null,null,null,"hidden");this.div.className=this.displayClass;
-this.groupDiv=OpenLayers.Util.createDiv(this.id+"_GroupDiv",null,null,null,"relative",null,"hidden");a=this.div.id+"_contentDiv";this.contentDiv=OpenLayers.Util.createDiv(a,null,this.contentSize.clone(),null,"relative");this.contentDiv.className=this.contentDisplayClass;this.groupDiv.appendChild(this.contentDiv);this.div.appendChild(this.groupDiv);e&&this.addCloseBox(f);this.registerEvents()},destroy:function(){this.border=this.opacity=this.backgroundColor=this.contentHTML=this.size=this.lonlat=this.id=
-null;this.closeOnMove&&this.map&&this.map.events.unregister("movestart",this,this.hide);this.events.destroy();this.events=null;this.closeDiv&&(OpenLayers.Event.stopObservingElement(this.closeDiv),this.groupDiv.removeChild(this.closeDiv));this.closeDiv=null;this.div.removeChild(this.groupDiv);this.groupDiv=null;null!=this.map&&this.map.removePopup(this);this.panMapIfOutOfView=this.padding=this.maxSize=this.minSize=this.autoSize=this.div=this.map=null},draw:function(a){null==a&&null!=this.lonlat&&null!=
-this.map&&(a=this.map.getLayerPxFromLonLat(this.lonlat));this.closeOnMove&&this.map.events.register("movestart",this,this.hide);this.disableFirefoxOverflowHack||"firefox"!=OpenLayers.BROWSER_NAME||(this.map.events.register("movestart",this,function(){var a=document.defaultView.getComputedStyle(this.contentDiv,null).getPropertyValue("overflow");"hidden"!=a&&(this.contentDiv._oldOverflow=a,this.contentDiv.style.overflow="hidden")}),this.map.events.register("moveend",this,function(){var a=this.contentDiv._oldOverflow;
-a&&(this.contentDiv.style.overflow=a,this.contentDiv._oldOverflow=null)}));this.moveTo(a);this.autoSize||this.size||this.setSize(this.contentSize);this.setBackgroundColor();this.setOpacity();this.setBorder();this.setContentHTML();this.panMapIfOutOfView&&this.panIntoView();return this.div},updatePosition:function(){if(this.lonlat&&this.map){var a=this.map.getLayerPxFromLonLat(this.lonlat);a&&this.moveTo(a)}},moveTo:function(a){null!=a&&null!=this.div&&(this.div.style.left=a.x+"px",this.div.style.top=
-a.y+"px")},visible:function(){return OpenLayers.Element.visible(this.div)},toggle:function(){this.visible()?this.hide():this.show()},show:function(){this.div.style.display="";this.panMapIfOutOfView&&this.panIntoView()},hide:function(){this.div.style.display="none"},setSize:function(a){this.size=a.clone();var b=this.getContentDivPadding(),c=b.left+b.right,d=b.top+b.bottom;this.fixPadding();c+=this.padding.left+this.padding.right;d+=this.padding.top+this.padding.bottom;if(this.closeDiv)var e=parseInt(this.closeDiv.style.width),
-c=c+(e+b.right);this.size.w+=c;this.size.h+=d;"msie"==OpenLayers.BROWSER_NAME&&(this.contentSize.w+=b.left+b.right,this.contentSize.h+=b.bottom+b.top);null!=this.div&&(this.div.style.width=this.size.w+"px",this.div.style.height=this.size.h+"px");null!=this.contentDiv&&(this.contentDiv.style.width=a.w+"px",this.contentDiv.style.height=a.h+"px")},updateSize:function(){var a="<div class='"+this.contentDisplayClass+"'>"+this.contentDiv.innerHTML+"</div>",b=this.map?this.map.div:document.body,c=OpenLayers.Util.getRenderedDimensions(a,
-null,{displayClass:this.displayClass,containerElement:b}),d=this.getSafeContentSize(c),e=null;d.equals(c)?e=c:(c={w:d.w<c.w?d.w:null,h:d.h<c.h?d.h:null},c.w&&c.h?e=d:(a=OpenLayers.Util.getRenderedDimensions(a,c,{displayClass:this.contentDisplayClass,containerElement:b}),"hidden"!=OpenLayers.Element.getStyle(this.contentDiv,"overflow")&&a.equals(d)&&(d=OpenLayers.Util.getScrollbarWidth(),c.w?a.h+=d:a.w+=d),e=this.getSafeContentSize(a)));this.setSize(e)},setBackgroundColor:function(a){void 0!=a&&(this.backgroundColor=
-a);null!=this.div&&(this.div.style.backgroundColor=this.backgroundColor)},setOpacity:function(a){void 0!=a&&(this.opacity=a);null!=this.div&&(this.div.style.opacity=this.opacity,this.div.style.filter="alpha(opacity="+100*this.opacity+")")},setBorder:function(a){void 0!=a&&(this.border=a);null!=this.div&&(this.div.style.border=this.border)},setContentHTML:function(a){null!=a&&(this.contentHTML=a);null!=this.contentDiv&&(null!=this.contentHTML&&this.contentHTML!=this.contentDiv.innerHTML)&&(this.contentDiv.innerHTML=
-this.contentHTML,this.autoSize&&(this.registerImageListeners(),this.updateSize()))},registerImageListeners:function(){for(var a=function(){null!==this.popup.id&&(this.popup.updateSize(),this.popup.visible()&&this.popup.panMapIfOutOfView&&this.popup.panIntoView(),OpenLayers.Event.stopObserving(this.img,"load",this.img._onImgLoad))},b=this.contentDiv.getElementsByTagName("img"),c=0,d=b.length;c<d;c++){var e=b[c];if(0==e.width||0==e.height)e._onImgLoad=OpenLayers.Function.bind(a,{popup:this,img:e}),
-OpenLayers.Event.observe(e,"load",e._onImgLoad)}},getSafeContentSize:function(a){a=a.clone();var b=this.getContentDivPadding(),c=b.left+b.right,d=b.top+b.bottom;this.fixPadding();c+=this.padding.left+this.padding.right;d+=this.padding.top+this.padding.bottom;if(this.closeDiv)var e=parseInt(this.closeDiv.style.width),c=c+(e+b.right);this.minSize&&(a.w=Math.max(a.w,this.minSize.w-c),a.h=Math.max(a.h,this.minSize.h-d));this.maxSize&&(a.w=Math.min(a.w,this.maxSize.w-c),a.h=Math.min(a.h,this.maxSize.h-
-d));if(this.map&&this.map.size){e=b=0;if(this.keepInMap&&!this.panMapIfOutOfView)switch(e=this.map.getPixelFromLonLat(this.lonlat),this.relativePosition){case "tr":b=e.x;e=this.map.size.h-e.y;break;case "tl":b=this.map.size.w-e.x;e=this.map.size.h-e.y;break;case "bl":b=this.map.size.w-e.x;e=e.y;break;case "br":b=e.x;e=e.y;break;default:b=e.x,e=this.map.size.h-e.y}d=this.map.size.h-this.map.paddingForPopups.top-this.map.paddingForPopups.bottom-d-e;a.w=Math.min(a.w,this.map.size.w-this.map.paddingForPopups.left-
-this.map.paddingForPopups.right-c-b);a.h=Math.min(a.h,d)}return a},getContentDivPadding:function(){var a=this._contentDivPadding;a||(null==this.div.parentNode&&(this.div.style.display="none",document.body.appendChild(this.div)),this._contentDivPadding=a=new OpenLayers.Bounds(OpenLayers.Element.getStyle(this.contentDiv,"padding-left"),OpenLayers.Element.getStyle(this.contentDiv,"padding-bottom"),OpenLayers.Element.getStyle(this.contentDiv,"padding-right"),OpenLayers.Element.getStyle(this.contentDiv,
-"padding-top")),this.div.parentNode==document.body&&(document.body.removeChild(this.div),this.div.style.display=""));return a},addCloseBox:function(a){this.closeDiv=OpenLayers.Util.createDiv(this.id+"_close",null,{w:17,h:17});this.closeDiv.className="olPopupCloseBox";var b=this.getContentDivPadding();this.closeDiv.style.right=b.right+"px";this.closeDiv.style.top=b.top+"px";this.groupDiv.appendChild(this.closeDiv);a=a||function(a){this.hide();OpenLayers.Event.stop(a)};OpenLayers.Event.observe(this.closeDiv,
-"touchend",OpenLayers.Function.bindAsEventListener(a,this));OpenLayers.Event.observe(this.closeDiv,"click",OpenLayers.Function.bindAsEventListener(a,this))},panIntoView:function(){var a=this.map.getSize(),b=this.map.getViewPortPxFromLayerPx(new OpenLayers.Pixel(parseInt(this.div.style.left),parseInt(this.div.style.top))),c=b.clone();b.x<this.map.paddingForPopups.left?c.x=this.map.paddingForPopups.left:b.x+this.size.w>a.w-this.map.paddingForPopups.right&&(c.x=a.w-this.map.paddingForPopups.right-this.size.w);
-b.y<this.map.paddingForPopups.top?c.y=this.map.paddingForPopups.top:b.y+this.size.h>a.h-this.map.paddingForPopups.bottom&&(c.y=a.h-this.map.paddingForPopups.bottom-this.size.h);this.map.pan(b.x-c.x,b.y-c.y)},registerEvents:function(){this.events=new OpenLayers.Events(this,this.div,null,!0);this.events.on({mousedown:this.onmousedown,mousemove:this.onmousemove,mouseup:this.onmouseup,click:this.onclick,mouseout:this.onmouseout,dblclick:this.ondblclick,touchstart:function(a){OpenLayers.Event.stop(a,!0)},
-scope:this})},onmousedown:function(a){this.mousedown=!0;OpenLayers.Event.stop(a,!0)},onmousemove:function(a){this.mousedown&&OpenLayers.Event.stop(a,!0)},onmouseup:function(a){this.mousedown&&(this.mousedown=!1,OpenLayers.Event.stop(a,!0))},onclick:function(a){OpenLayers.Event.stop(a,!0)},onmouseout:function(a){this.mousedown=!1},ondblclick:function(a){OpenLayers.Event.stop(a,!0)},CLASS_NAME:"OpenLayers.Popup"});OpenLayers.Popup.WIDTH=200;OpenLayers.Popup.HEIGHT=200;OpenLayers.Popup.COLOR="white";
-OpenLayers.Popup.OPACITY=1;OpenLayers.Popup.BORDER="0px";OpenLayers.Control.ScaleLine=OpenLayers.Class(OpenLayers.Control,{maxWidth:100,topOutUnits:"km",topInUnits:"m",bottomOutUnits:"mi",bottomInUnits:"ft",eTop:null,eBottom:null,geodesic:!1,draw:function(){OpenLayers.Control.prototype.draw.apply(this,arguments);this.eTop||(this.eTop=document.createElement("div"),this.eTop.className=this.displayClass+"Top",this.div.appendChild(this.eTop),this.eTop.style.visibility=""==this.topOutUnits||""==this.topInUnits?"hidden":"visible",this.eBottom=document.createElement("div"),
-this.eBottom.className=this.displayClass+"Bottom",this.div.appendChild(this.eBottom),this.eBottom.style.visibility=""==this.bottomOutUnits||""==this.bottomInUnits?"hidden":"visible");this.map.events.register("moveend",this,this.update);this.update();return this.div},getBarLen:function(a){var b=parseInt(Math.log(a)/Math.log(10)),b=Math.pow(10,b);a=parseInt(a/b);return(5<a?5:2<a?2:1)*b},update:function(){var a=this.map.getResolution();if(a){var b=this.map.getUnits(),c=OpenLayers.INCHES_PER_UNIT,d=this.maxWidth*
-a*c[b],e=1;!0===this.geodesic&&(e=(this.map.getGeodesicPixelSize().w||1E-6)*this.maxWidth/(d/c.km),d*=e);var f,g;1E5<d?(f=this.topOutUnits,g=this.bottomOutUnits):(f=this.topInUnits,g=this.bottomInUnits);var h=d/c[f],k=d/c[g],d=this.getBarLen(h),l=this.getBarLen(k),h=d/c[b]*c[f],k=l/c[b]*c[g],b=h/a/e,a=k/a/e;"visible"==this.eBottom.style.visibility&&(this.eBottom.style.width=Math.round(a)+"px",this.eBottom.innerHTML=l+" "+g);"visible"==this.eTop.style.visibility&&(this.eTop.style.width=Math.round(b)+
-"px",this.eTop.innerHTML=d+" "+f)}},CLASS_NAME:"OpenLayers.Control.ScaleLine"});OpenLayers.Icon=OpenLayers.Class({url:null,size:null,offset:null,calculateOffset:null,imageDiv:null,px:null,initialize:function(a,b,c,d){this.url=a;this.size=b||{w:20,h:20};this.offset=c||{x:-(this.size.w/2),y:-(this.size.h/2)};this.calculateOffset=d;a=OpenLayers.Util.createUniqueID("OL_Icon_");this.imageDiv=OpenLayers.Util.createAlphaImageDiv(a)},destroy:function(){this.erase();OpenLayers.Event.stopObservingElement(this.imageDiv.firstChild);this.imageDiv.innerHTML="";this.imageDiv=null},clone:function(){return new OpenLayers.Icon(this.url,
-this.size,this.offset,this.calculateOffset)},setSize:function(a){null!=a&&(this.size=a);this.draw()},setUrl:function(a){null!=a&&(this.url=a);this.draw()},draw:function(a){OpenLayers.Util.modifyAlphaImageDiv(this.imageDiv,null,null,this.size,this.url,"absolute");this.moveTo(a);return this.imageDiv},erase:function(){null!=this.imageDiv&&null!=this.imageDiv.parentNode&&OpenLayers.Element.remove(this.imageDiv)},setOpacity:function(a){OpenLayers.Util.modifyAlphaImageDiv(this.imageDiv,null,null,null,null,
-null,null,null,a)},moveTo:function(a){null!=a&&(this.px=a);null!=this.imageDiv&&(null==this.px?this.display(!1):(this.calculateOffset&&(this.offset=this.calculateOffset(this.size)),OpenLayers.Util.modifyAlphaImageDiv(this.imageDiv,null,{x:this.px.x+this.offset.x,y:this.px.y+this.offset.y})))},display:function(a){this.imageDiv.style.display=a?"":"none"},isDrawn:function(){return this.imageDiv&&this.imageDiv.parentNode&&11!=this.imageDiv.parentNode.nodeType},CLASS_NAME:"OpenLayers.Icon"});OpenLayers.Marker=OpenLayers.Class({icon:null,lonlat:null,events:null,map:null,initialize:function(a,b){this.lonlat=a;var c=b?b:OpenLayers.Marker.defaultIcon();null==this.icon?this.icon=c:(this.icon.url=c.url,this.icon.size=c.size,this.icon.offset=c.offset,this.icon.calculateOffset=c.calculateOffset);this.events=new OpenLayers.Events(this,this.icon.imageDiv)},destroy:function(){this.erase();this.map=null;this.events.destroy();this.events=null;null!=this.icon&&(this.icon.destroy(),this.icon=null)},
-draw:function(a){return this.icon.draw(a)},erase:function(){null!=this.icon&&this.icon.erase()},moveTo:function(a){null!=a&&null!=this.icon&&this.icon.moveTo(a);this.lonlat=this.map.getLonLatFromLayerPx(a)},isDrawn:function(){return this.icon&&this.icon.isDrawn()},onScreen:function(){var a=!1;this.map&&(a=this.map.getExtent().containsLonLat(this.lonlat));return a},inflate:function(a){this.icon&&this.icon.setSize({w:this.icon.size.w*a,h:this.icon.size.h*a})},setOpacity:function(a){this.icon.setOpacity(a)},
-setUrl:function(a){this.icon.setUrl(a)},display:function(a){this.icon.display(a)},CLASS_NAME:"OpenLayers.Marker"});OpenLayers.Marker.defaultIcon=function(){return new OpenLayers.Icon(OpenLayers.Util.getImageLocation("marker.png"),{w:21,h:25},{x:-10.5,y:-25})};OpenLayers.Layer.TileCache=OpenLayers.Class(OpenLayers.Layer.Grid,{isBaseLayer:!0,format:"image/png",serverResolutions:null,initialize:function(a,b,c,d){this.layername=c;OpenLayers.Layer.Grid.prototype.initialize.apply(this,[a,b,{},d]);this.extension=this.format.split("/")[1].toLowerCase();this.extension="jpg"==this.extension?"jpeg":this.extension},clone:function(a){null==a&&(a=new OpenLayers.Layer.TileCache(this.name,this.url,this.layername,this.getOptions()));return a=OpenLayers.Layer.Grid.prototype.clone.apply(this,
-[a])},getURL:function(a){var b=this.getServerResolution(),c=this.maxExtent,d=this.tileSize,e=Math.round((a.left-c.left)/(b*d.w));a=Math.round((a.bottom-c.bottom)/(b*d.h));b=null!=this.serverResolutions?OpenLayers.Util.indexOf(this.serverResolutions,b):this.map.getZoom();e=[this.layername,OpenLayers.Number.zeroPad(b,2),OpenLayers.Number.zeroPad(parseInt(e/1E6),3),OpenLayers.Number.zeroPad(parseInt(e/1E3)%1E3,3),OpenLayers.Number.zeroPad(parseInt(e)%1E3,3),OpenLayers.Number.zeroPad(parseInt(a/1E6),
-3),OpenLayers.Number.zeroPad(parseInt(a/1E3)%1E3,3),OpenLayers.Number.zeroPad(parseInt(a)%1E3,3)+"."+this.extension].join("/");b=this.url;OpenLayers.Util.isArray(b)&&(b=this.selectUrl(e,b));b="/"==b.charAt(b.length-1)?b:b+"/";return b+e},CLASS_NAME:"OpenLayers.Layer.TileCache"});OpenLayers.Strategy.Paging=OpenLayers.Class(OpenLayers.Strategy,{features:null,length:10,num:null,paging:!1,activate:function(){var a=OpenLayers.Strategy.prototype.activate.call(this);if(a)this.layer.events.on({beforefeaturesadded:this.cacheFeatures,scope:this});return a},deactivate:function(){var a=OpenLayers.Strategy.prototype.deactivate.call(this);a&&(this.clearCache(),this.layer.events.un({beforefeaturesadded:this.cacheFeatures,scope:this}));return a},cacheFeatures:function(a){this.paging||(this.clearCache(),
-this.features=a.features,this.pageNext(a))},clearCache:function(){if(this.features)for(var a=0;a<this.features.length;++a)this.features[a].destroy();this.num=this.features=null},pageCount:function(){return Math.ceil((this.features?this.features.length:0)/this.length)},pageNum:function(){return this.num},pageLength:function(a){a&&0<a&&(this.length=a);return this.length},pageNext:function(a){var b=!1;this.features&&(null===this.num&&(this.num=-1),b=this.page((this.num+1)*this.length,a));return b},pagePrevious:function(){var a=
-!1;this.features&&(null===this.num&&(this.num=this.pageCount()),a=this.page((this.num-1)*this.length));return a},page:function(a,b){var c=!1;if(this.features&&0<=a&&a<this.features.length){var d=Math.floor(a/this.length);d!=this.num&&(this.paging=!0,c=this.features.slice(a,a+this.length),this.layer.removeFeatures(this.layer.features),this.num=d,b&&b.features?b.features=c:this.layer.addFeatures(c),this.paging=!1,c=!0)}return c},CLASS_NAME:"OpenLayers.Strategy.Paging"});OpenLayers.Control.DragFeature=OpenLayers.Class(OpenLayers.Control,{geometryTypes:null,onStart:function(a,b){},onDrag:function(a,b){},onComplete:function(a,b){},onEnter:function(a){},onLeave:function(a){},documentDrag:!1,layer:null,feature:null,dragCallbacks:{},featureCallbacks:{},lastPixel:null,initialize:function(a,b){OpenLayers.Control.prototype.initialize.apply(this,[b]);this.layer=a;this.handlers={drag:new OpenLayers.Handler.Drag(this,OpenLayers.Util.extend({down:this.downFeature,move:this.moveFeature,
-up:this.upFeature,out:this.cancel,done:this.doneDragging},this.dragCallbacks),{documentDrag:this.documentDrag}),feature:new OpenLayers.Handler.Feature(this,this.layer,OpenLayers.Util.extend({click:this.clickFeature,clickout:this.clickoutFeature,over:this.overFeature,out:this.outFeature},this.featureCallbacks),{geometryTypes:this.geometryTypes})}},clickFeature:function(a){this.handlers.feature.touch&&(!this.over&&this.overFeature(a))&&(this.handlers.drag.dragstart(this.handlers.feature.evt),this.handlers.drag.stopDown=
-!1)},clickoutFeature:function(a){this.handlers.feature.touch&&this.over&&(this.outFeature(a),this.handlers.drag.stopDown=!0)},destroy:function(){this.layer=null;OpenLayers.Control.prototype.destroy.apply(this,[])},activate:function(){return this.handlers.feature.activate()&&OpenLayers.Control.prototype.activate.apply(this,arguments)},deactivate:function(){this.handlers.drag.deactivate();this.handlers.feature.deactivate();this.feature=null;this.dragging=!1;this.lastPixel=null;OpenLayers.Element.removeClass(this.map.viewPortDiv,
-this.displayClass+"Over");return OpenLayers.Control.prototype.deactivate.apply(this,arguments)},overFeature:function(a){var b=!1;this.handlers.drag.dragging?this.over=this.feature.id==a.id?!0:!1:(this.feature=a,this.handlers.drag.activate(),this.over=b=!0,OpenLayers.Element.addClass(this.map.viewPortDiv,this.displayClass+"Over"),this.onEnter(a));return b},downFeature:function(a){this.lastPixel=a;this.onStart(this.feature,a)},moveFeature:function(a){var b=this.map.getResolution();this.feature.geometry.move(b*
-(a.x-this.lastPixel.x),b*(this.lastPixel.y-a.y));this.layer.drawFeature(this.feature);this.lastPixel=a;this.onDrag(this.feature,a)},upFeature:function(a){this.over||this.handlers.drag.deactivate()},doneDragging:function(a){this.onComplete(this.feature,a)},outFeature:function(a){this.handlers.drag.dragging?this.feature.id==a.id&&(this.over=!1):(this.over=!1,this.handlers.drag.deactivate(),OpenLayers.Element.removeClass(this.map.viewPortDiv,this.displayClass+"Over"),this.onLeave(a),this.feature=null)},
-cancel:function(){this.handlers.drag.deactivate();this.over=!1},setMap:function(a){this.handlers.drag.setMap(a);this.handlers.feature.setMap(a);OpenLayers.Control.prototype.setMap.apply(this,arguments)},CLASS_NAME:"OpenLayers.Control.DragFeature"});OpenLayers.Control.TransformFeature=OpenLayers.Class(OpenLayers.Control,{geometryTypes:null,layer:null,preserveAspectRatio:!1,rotate:!0,feature:null,renderIntent:"temporary",rotationHandleSymbolizer:null,box:null,center:null,scale:1,ratio:1,rotation:0,handles:null,rotationHandles:null,dragControl:null,irregular:!1,initialize:function(a,b){OpenLayers.Control.prototype.initialize.apply(this,[b]);this.layer=a;this.rotationHandleSymbolizer||(this.rotationHandleSymbolizer={stroke:!1,pointRadius:10,fillOpacity:0,
-cursor:"pointer"});this.createBox();this.createControl()},activate:function(){var a=!1;OpenLayers.Control.prototype.activate.apply(this,arguments)&&(this.dragControl.activate(),this.layer.addFeatures([this.box]),this.rotate&&this.layer.addFeatures(this.rotationHandles),this.layer.addFeatures(this.handles),a=!0);return a},deactivate:function(){var a=!1;OpenLayers.Control.prototype.deactivate.apply(this,arguments)&&(this.layer.removeFeatures(this.handles),this.rotate&&this.layer.removeFeatures(this.rotationHandles),
-this.layer.removeFeatures([this.box]),this.dragControl.deactivate(),a=!0);return a},setMap:function(a){this.dragControl.setMap(a);OpenLayers.Control.prototype.setMap.apply(this,arguments)},setFeature:function(a,b){b=OpenLayers.Util.applyDefaults(b,{rotation:0,scale:1,ratio:1});var c=this.rotation,d=this.center;OpenLayers.Util.extend(this,b);if(!1!==this.events.triggerEvent("beforesetfeature",{feature:a})){this.feature=a;this.activate();this._setfeature=!0;var e=this.feature.geometry.getBounds();this.box.move(e.getCenterLonLat());
-this.box.geometry.rotate(-c,d);this._angle=0;this.rotation?(c=a.geometry.clone(),c.rotate(-this.rotation,this.center),c=new OpenLayers.Feature.Vector(c.getBounds().toGeometry()),c.geometry.rotate(this.rotation,this.center),this.box.geometry.rotate(this.rotation,this.center),this.box.move(c.geometry.getBounds().getCenterLonLat()),c=c.geometry.components[0].components[0].getBounds().getCenterLonLat()):c=new OpenLayers.LonLat(e.left,e.bottom);this.handles[0].move(c);delete this._setfeature;this.events.triggerEvent("setfeature",
-{feature:a})}},unsetFeature:function(){this.active?this.deactivate():(this.feature=null,this.rotation=0,this.ratio=this.scale=1)},createBox:function(){var a=this;this.center=new OpenLayers.Geometry.Point(0,0);this.box=new OpenLayers.Feature.Vector(new OpenLayers.Geometry.LineString([new OpenLayers.Geometry.Point(-1,-1),new OpenLayers.Geometry.Point(0,-1),new OpenLayers.Geometry.Point(1,-1),new OpenLayers.Geometry.Point(1,0),new OpenLayers.Geometry.Point(1,1),new OpenLayers.Geometry.Point(0,1),new OpenLayers.Geometry.Point(-1,
-1),new OpenLayers.Geometry.Point(-1,0),new OpenLayers.Geometry.Point(-1,-1)]),null,"string"==typeof this.renderIntent?null:this.renderIntent);this.box.geometry.move=function(b,c){a._moving=!0;OpenLayers.Geometry.LineString.prototype.move.apply(this,arguments);a.center.move(b,c);delete a._moving};for(var b=function(a,b){OpenLayers.Geometry.Point.prototype.move.apply(this,arguments);this._rotationHandle&&this._rotationHandle.geometry.move(a,b);this._handle.geometry.move(a,b)},c=function(a,b,c){OpenLayers.Geometry.Point.prototype.resize.apply(this,
-arguments);this._rotationHandle&&this._rotationHandle.geometry.resize(a,b,c);this._handle.geometry.resize(a,b,c)},d=function(a,b){OpenLayers.Geometry.Point.prototype.rotate.apply(this,arguments);this._rotationHandle&&this._rotationHandle.geometry.rotate(a,b);this._handle.geometry.rotate(a,b)},e=function(b,c){var d=this.x,e=this.y;OpenLayers.Geometry.Point.prototype.move.call(this,b,c);if(!a._moving){var f=a.dragControl.handlers.drag.evt,g=!(!a._setfeature&&a.preserveAspectRatio)&&!(f&&f.shiftKey),
-h=new OpenLayers.Geometry.Point(d,e),f=a.center;this.rotate(-a.rotation,f);h.rotate(-a.rotation,f);var k=this.x-f.x,l=this.y-f.y,m=k-(this.x-h.x),n=l-(this.y-h.y);a.irregular&&!a._setfeature&&(k-=(this.x-h.x)/2,l-=(this.y-h.y)/2);this.x=d;this.y=e;h=1;g?(l=1E-5>Math.abs(n)?1:l/n,h=(1E-5>Math.abs(m)?1:k/m)/l):(m=Math.sqrt(m*m+n*n),l=Math.sqrt(k*k+l*l)/m);a._moving=!0;a.box.geometry.rotate(-a.rotation,f);delete a._moving;a.box.geometry.resize(l,f,h);a.box.geometry.rotate(a.rotation,f);a.transformFeature({scale:l,
-ratio:h});a.irregular&&!a._setfeature&&(k=f.clone(),k.x+=1E-5>Math.abs(d-f.x)?0:this.x-d,k.y+=1E-5>Math.abs(e-f.y)?0:this.y-e,a.box.geometry.move(this.x-d,this.y-e),a.transformFeature({center:k}))}},f=function(b,c){var d=this.x,e=this.y;OpenLayers.Geometry.Point.prototype.move.call(this,b,c);if(!a._moving){var f=a.dragControl.handlers.drag.evt,f=f&&f.shiftKey?45:1,g=a.center,h=this.x-g.x,k=this.y-g.y;this.x=d;this.y=e;d=Math.atan2(k-c,h-b);d=Math.atan2(k,h)-d;d*=180/Math.PI;a._angle=(a._angle+d)%
-360;d=a.rotation%f;if(Math.abs(a._angle)>=f||0!==d)d=Math.round(a._angle/f)*f-d,a._angle=0,a.box.geometry.rotate(d,g),a.transformFeature({rotation:d})}},g=Array(8),h=Array(4),k,l,m,n="sw s se e ne n nw w".split(" "),p=0;8>p;++p)k=this.box.geometry.components[p],l=new OpenLayers.Feature.Vector(k.clone(),{role:n[p]+"-resize"},"string"==typeof this.renderIntent?null:this.renderIntent),0==p%2&&(m=new OpenLayers.Feature.Vector(k.clone(),{role:n[p]+"-rotate"},"string"==typeof this.rotationHandleSymbolizer?
-null:this.rotationHandleSymbolizer),m.geometry.move=f,k._rotationHandle=m,h[p/2]=m),k.move=b,k.resize=c,k.rotate=d,l.geometry.move=e,k._handle=l,g[p]=l;this.rotationHandles=h;this.handles=g},createControl:function(){var a=this;this.dragControl=new OpenLayers.Control.DragFeature(this.layer,{documentDrag:!0,moveFeature:function(b){this.feature===a.feature&&(this.feature=a.box);OpenLayers.Control.DragFeature.prototype.moveFeature.apply(this,arguments)},onDrag:function(b,c){b===a.box&&a.transformFeature({center:a.center})},
-onStart:function(b,c){var d=!a.geometryTypes||-1!==OpenLayers.Util.indexOf(a.geometryTypes,b.geometry.CLASS_NAME),e=OpenLayers.Util.indexOf(a.handles,b),e=e+OpenLayers.Util.indexOf(a.rotationHandles,b);b!==a.feature&&(b!==a.box&&-2==e&&d)&&a.setFeature(b)},onComplete:function(b,c){a.events.triggerEvent("transformcomplete",{feature:a.feature})}})},drawHandles:function(){for(var a=this.layer,b=0;8>b;++b)this.rotate&&0===b%2&&a.drawFeature(this.rotationHandles[b/2],this.rotationHandleSymbolizer),a.drawFeature(this.handles[b],
-this.renderIntent)},transformFeature:function(a){if(!this._setfeature){this.scale*=a.scale||1;this.ratio*=a.ratio||1;var b=this.rotation;this.rotation=(this.rotation+(a.rotation||0))%360;if(!1!==this.events.triggerEvent("beforetransform",a)){var c=this.feature,d=c.geometry,e=this.center;d.rotate(-b,e);a.scale||a.ratio?d.resize(a.scale,e,a.ratio):a.center&&c.move(a.center.getBounds().getCenterLonLat());d.rotate(this.rotation,e);this.layer.drawFeature(c);c.toState(OpenLayers.State.UPDATE);this.events.triggerEvent("transform",
-a)}}this.layer.drawFeature(this.box,this.renderIntent);this.drawHandles()},destroy:function(){for(var a,b=0;8>b;++b)a=this.box.geometry.components[b],a._handle.destroy(),a._handle=null,a._rotationHandle&&a._rotationHandle.destroy(),a._rotationHandle=null;this.rotationHandles=this.rotationHandleSymbolizer=this.handles=this.feature=this.center=null;this.box.destroy();this.layer=this.box=null;this.dragControl.destroy();this.dragControl=null;OpenLayers.Control.prototype.destroy.apply(this,arguments)},
-CLASS_NAME:"OpenLayers.Control.TransformFeature"});OpenLayers.Handler.Box=OpenLayers.Class(OpenLayers.Handler,{dragHandler:null,boxDivClassName:"olHandlerBoxZoomBox",boxOffsets:null,initialize:function(a,b,c){OpenLayers.Handler.prototype.initialize.apply(this,arguments);this.dragHandler=new OpenLayers.Handler.Drag(this,{down:this.startBox,move:this.moveBox,out:this.removeBox,up:this.endBox},{keyMask:this.keyMask})},destroy:function(){OpenLayers.Handler.prototype.destroy.apply(this,arguments);this.dragHandler&&(this.dragHandler.destroy(),this.dragHandler=
-null)},setMap:function(a){OpenLayers.Handler.prototype.setMap.apply(this,arguments);this.dragHandler&&this.dragHandler.setMap(a)},startBox:function(a){this.callback("start",[]);this.zoomBox=OpenLayers.Util.createDiv("zoomBox",{x:-9999,y:-9999});this.zoomBox.className=this.boxDivClassName;this.zoomBox.style.zIndex=this.map.Z_INDEX_BASE.Popup-1;this.map.viewPortDiv.appendChild(this.zoomBox);OpenLayers.Element.addClass(this.map.viewPortDiv,"olDrawBox")},moveBox:function(a){var b=this.dragHandler.start.x,
-c=this.dragHandler.start.y,d=Math.abs(b-a.x),e=Math.abs(c-a.y),f=this.getBoxOffsets();this.zoomBox.style.width=d+f.width+1+"px";this.zoomBox.style.height=e+f.height+1+"px";this.zoomBox.style.left=(a.x<b?b-d-f.left:b-f.left)+"px";this.zoomBox.style.top=(a.y<c?c-e-f.top:c-f.top)+"px"},endBox:function(a){var b;if(5<Math.abs(this.dragHandler.start.x-a.x)||5<Math.abs(this.dragHandler.start.y-a.y)){var c=this.dragHandler.start;b=Math.min(c.y,a.y);var d=Math.max(c.y,a.y),e=Math.min(c.x,a.x);a=Math.max(c.x,
-a.x);b=new OpenLayers.Bounds(e,d,a,b)}else b=this.dragHandler.start.clone();this.removeBox();this.callback("done",[b])},removeBox:function(){this.map.viewPortDiv.removeChild(this.zoomBox);this.boxOffsets=this.zoomBox=null;OpenLayers.Element.removeClass(this.map.viewPortDiv,"olDrawBox")},activate:function(){return OpenLayers.Handler.prototype.activate.apply(this,arguments)?(this.dragHandler.activate(),!0):!1},deactivate:function(){return OpenLayers.Handler.prototype.deactivate.apply(this,arguments)?
-(this.dragHandler.deactivate()&&this.zoomBox&&this.removeBox(),!0):!1},getBoxOffsets:function(){if(!this.boxOffsets){var a=document.createElement("div");a.style.position="absolute";a.style.border="1px solid black";a.style.width="3px";document.body.appendChild(a);var b=3==a.clientWidth;document.body.removeChild(a);var a=parseInt(OpenLayers.Element.getStyle(this.zoomBox,"border-left-width")),c=parseInt(OpenLayers.Element.getStyle(this.zoomBox,"border-right-width")),d=parseInt(OpenLayers.Element.getStyle(this.zoomBox,
-"border-top-width")),e=parseInt(OpenLayers.Element.getStyle(this.zoomBox,"border-bottom-width"));this.boxOffsets={left:a,right:c,top:d,bottom:e,width:!1===b?a+c:0,height:!1===b?d+e:0}}return this.boxOffsets},CLASS_NAME:"OpenLayers.Handler.Box"});OpenLayers.Control.ZoomBox=OpenLayers.Class(OpenLayers.Control,{type:OpenLayers.Control.TYPE_TOOL,out:!1,keyMask:null,alwaysZoom:!1,zoomOnClick:!0,draw:function(){this.handler=new OpenLayers.Handler.Box(this,{done:this.zoomBox},{keyMask:this.keyMask})},zoomBox:function(a){if(a instanceof OpenLayers.Bounds){var b,c=a.getCenterPixel();if(this.out){b=Math.min(this.map.size.h/(a.bottom-a.top),this.map.size.w/(a.right-a.left));var d=this.map.getExtent(),e=this.map.getLonLatFromPixel(c),f=e.lon-d.getWidth()/
-2*b;a=e.lon+d.getWidth()/2*b;var g=e.lat-d.getHeight()/2*b;b=e.lat+d.getHeight()/2*b;b=new OpenLayers.Bounds(f,g,a,b)}else f=this.map.getLonLatFromPixel({x:a.left,y:a.bottom}),a=this.map.getLonLatFromPixel({x:a.right,y:a.top}),b=new OpenLayers.Bounds(f.lon,f.lat,a.lon,a.lat);f=this.map.getZoom();g=this.map.getSize();a=g.w/2;g=g.h/2;b=this.map.getZoomForExtent(b);d=this.map.getResolution();e=this.map.getResolutionForZoom(b);d==e?this.map.setCenter(this.map.getLonLatFromPixel(c)):this.map.zoomTo(b,
-{x:(d*c.x-e*a)/(d-e),y:(d*c.y-e*g)/(d-e)});f==this.map.getZoom()&&!0==this.alwaysZoom&&this.map.zoomTo(f+(this.out?-1:1))}else this.zoomOnClick&&(this.out?this.map.zoomTo(this.map.getZoom()-1,a):this.map.zoomTo(this.map.getZoom()+1,a))},CLASS_NAME:"OpenLayers.Control.ZoomBox"});OpenLayers.Control.DragPan=OpenLayers.Class(OpenLayers.Control,{type:OpenLayers.Control.TYPE_TOOL,panned:!1,interval:0,documentDrag:!1,kinetic:null,enableKinetic:!0,kineticInterval:10,draw:function(){if(this.enableKinetic&&OpenLayers.Kinetic){var a={interval:this.kineticInterval};"object"===typeof this.enableKinetic&&(a=OpenLayers.Util.extend(a,this.enableKinetic));this.kinetic=new OpenLayers.Kinetic(a)}this.handler=new OpenLayers.Handler.Drag(this,{move:this.panMap,done:this.panMapDone,down:this.panMapStart},
-{interval:this.interval,documentDrag:this.documentDrag})},panMapStart:function(){this.kinetic&&this.kinetic.begin()},panMap:function(a){this.kinetic&&this.kinetic.update(a);this.panned=!0;this.map.pan(this.handler.last.x-a.x,this.handler.last.y-a.y,{dragging:!0,animate:!1})},panMapDone:function(a){if(this.panned){var b=null;this.kinetic&&(b=this.kinetic.end(a));this.map.pan(this.handler.last.x-a.x,this.handler.last.y-a.y,{dragging:!!b,animate:!1});if(b){var c=this;this.kinetic.move(b,function(a,b,
-f){c.map.pan(a,b,{dragging:!f,animate:!1})})}this.panned=!1}},CLASS_NAME:"OpenLayers.Control.DragPan"});OpenLayers.Control.Navigation=OpenLayers.Class(OpenLayers.Control,{dragPan:null,dragPanOptions:null,pinchZoom:null,pinchZoomOptions:null,documentDrag:!1,zoomBox:null,zoomBoxEnabled:!0,zoomWheelEnabled:!0,mouseWheelOptions:null,handleRightClicks:!1,zoomBoxKeyMask:OpenLayers.Handler.MOD_SHIFT,autoActivate:!0,initialize:function(a){this.handlers={};OpenLayers.Control.prototype.initialize.apply(this,arguments)},destroy:function(){this.deactivate();this.dragPan&&this.dragPan.destroy();this.dragPan=null;
-this.zoomBox&&this.zoomBox.destroy();this.zoomBox=null;this.pinchZoom&&this.pinchZoom.destroy();this.pinchZoom=null;OpenLayers.Control.prototype.destroy.apply(this,arguments)},activate:function(){this.dragPan.activate();this.zoomWheelEnabled&&this.handlers.wheel.activate();this.handlers.click.activate();this.zoomBoxEnabled&&this.zoomBox.activate();this.pinchZoom&&this.pinchZoom.activate();return OpenLayers.Control.prototype.activate.apply(this,arguments)},deactivate:function(){this.pinchZoom&&this.pinchZoom.deactivate();
-this.zoomBox.deactivate();this.dragPan.deactivate();this.handlers.click.deactivate();this.handlers.wheel.deactivate();return OpenLayers.Control.prototype.deactivate.apply(this,arguments)},draw:function(){this.handleRightClicks&&(this.map.viewPortDiv.oncontextmenu=OpenLayers.Function.False);this.handlers.click=new OpenLayers.Handler.Click(this,{click:this.defaultClick,dblclick:this.defaultDblClick,dblrightclick:this.defaultDblRightClick},{"double":!0,stopDouble:!0});this.dragPan=new OpenLayers.Control.DragPan(OpenLayers.Util.extend({map:this.map,
-documentDrag:this.documentDrag},this.dragPanOptions));this.zoomBox=new OpenLayers.Control.ZoomBox({map:this.map,keyMask:this.zoomBoxKeyMask});this.dragPan.draw();this.zoomBox.draw();this.handlers.wheel=new OpenLayers.Handler.MouseWheel(this,{up:this.wheelUp,down:this.wheelDown},OpenLayers.Util.extend(this.map.fractionalZoom?{}:{cumulative:!1,interval:50,maxDelta:6},this.mouseWheelOptions));OpenLayers.Control.PinchZoom&&(this.pinchZoom=new OpenLayers.Control.PinchZoom(OpenLayers.Util.extend({map:this.map},
-this.pinchZoomOptions)))},defaultClick:function(a){a.lastTouches&&2==a.lastTouches.length&&this.map.zoomOut()},defaultDblClick:function(a){this.map.zoomTo(this.map.zoom+1,a.xy)},defaultDblRightClick:function(a){this.map.zoomTo(this.map.zoom-1,a.xy)},wheelChange:function(a,b){this.map.fractionalZoom||(b=Math.round(b));var c=this.map.getZoom(),d;d=Math.max(c+b,0);d=Math.min(d,this.map.getNumZoomLevels());d!==c&&this.map.zoomTo(d,a.xy)},wheelUp:function(a,b){this.wheelChange(a,b||1)},wheelDown:function(a,
-b){this.wheelChange(a,b||-1)},disableZoomBox:function(){this.zoomBoxEnabled=!1;this.zoomBox.deactivate()},enableZoomBox:function(){this.zoomBoxEnabled=!0;this.active&&this.zoomBox.activate()},disableZoomWheel:function(){this.zoomWheelEnabled=!1;this.handlers.wheel.deactivate()},enableZoomWheel:function(){this.zoomWheelEnabled=!0;this.active&&this.handlers.wheel.activate()},CLASS_NAME:"OpenLayers.Control.Navigation"});OpenLayers.Control.DrawFeature=OpenLayers.Class(OpenLayers.Control,{layer:null,callbacks:null,multi:!1,featureAdded:function(){},initialize:function(a,b,c){OpenLayers.Control.prototype.initialize.apply(this,[c]);this.callbacks=OpenLayers.Util.extend({done:this.drawFeature,modify:function(a,b){this.layer.events.triggerEvent("sketchmodified",{vertex:a,feature:b})},create:function(a,b){this.layer.events.triggerEvent("sketchstarted",{vertex:a,feature:b})}},this.callbacks);this.layer=a;this.handlerOptions=
-this.handlerOptions||{};this.handlerOptions.layerOptions=OpenLayers.Util.applyDefaults(this.handlerOptions.layerOptions,{renderers:a.renderers,rendererOptions:a.rendererOptions});"multi"in this.handlerOptions||(this.handlerOptions.multi=this.multi);if(a=this.layer.styleMap&&this.layer.styleMap.styles.temporary)this.handlerOptions.layerOptions=OpenLayers.Util.applyDefaults(this.handlerOptions.layerOptions,{styleMap:new OpenLayers.StyleMap({"default":a})});this.handler=new b(this,this.callbacks,this.handlerOptions)},
-drawFeature:function(a){a=new OpenLayers.Feature.Vector(a);!1!==this.layer.events.triggerEvent("sketchcomplete",{feature:a})&&(a.state=OpenLayers.State.INSERT,this.layer.addFeatures([a]),this.featureAdded(a),this.events.triggerEvent("featureadded",{feature:a}))},insertXY:function(a,b){this.handler&&this.handler.line&&this.handler.insertXY(a,b)},insertDeltaXY:function(a,b){this.handler&&this.handler.line&&this.handler.insertDeltaXY(a,b)},insertDirectionLength:function(a,b){this.handler&&this.handler.line&&
-this.handler.insertDirectionLength(a,b)},insertDeflectionLength:function(a,b){this.handler&&this.handler.line&&this.handler.insertDeflectionLength(a,b)},undo:function(){return this.handler.undo&&this.handler.undo()},redo:function(){return this.handler.redo&&this.handler.redo()},finishSketch:function(){this.handler.finishGeometry()},cancel:function(){this.handler.cancel()},CLASS_NAME:"OpenLayers.Control.DrawFeature"});OpenLayers.Handler.Polygon=OpenLayers.Class(OpenLayers.Handler.Path,{holeModifier:null,drawingHole:!1,polygon:null,createFeature:function(a){a=this.layer.getLonLatFromViewPortPx(a);a=new OpenLayers.Geometry.Point(a.lon,a.lat);this.point=new OpenLayers.Feature.Vector(a);this.line=new OpenLayers.Feature.Vector(new OpenLayers.Geometry.LinearRing([this.point.geometry]));this.polygon=new OpenLayers.Feature.Vector(new OpenLayers.Geometry.Polygon([this.line.geometry]));this.callback("create",[this.point.geometry,
-this.getSketch()]);this.point.geometry.clearBounds();this.layer.addFeatures([this.polygon,this.point],{silent:!0})},addPoint:function(a){if(!this.drawingHole&&this.holeModifier&&this.evt&&this.evt[this.holeModifier])for(var b=this.point.geometry,c=this.control.layer.features,d,e=c.length-1;0<=e;--e)if(d=c[e].geometry,(d instanceof OpenLayers.Geometry.Polygon||d instanceof OpenLayers.Geometry.MultiPolygon)&&d.intersects(b)){b=c[e];this.control.layer.removeFeatures([b],{silent:!0});this.control.layer.events.registerPriority("sketchcomplete",
-this,this.finalizeInteriorRing);this.control.layer.events.registerPriority("sketchmodified",this,this.enforceTopology);b.geometry.addComponent(this.line.geometry);this.polygon=b;this.drawingHole=!0;break}OpenLayers.Handler.Path.prototype.addPoint.apply(this,arguments)},getCurrentPointIndex:function(){return this.line.geometry.components.length-2},enforceTopology:function(a){a=a.vertex;var b=this.line.geometry.components;this.polygon.geometry.intersects(a)||(b=b[b.length-3],a.x=b.x,a.y=b.y)},finishGeometry:function(){this.line.geometry.removeComponent(this.line.geometry.components[this.line.geometry.components.length-
-2]);this.removePoint();this.finalize()},finalizeInteriorRing:function(){var a=this.line.geometry,b=0!==a.getArea();if(b){for(var c=this.polygon.geometry.components,d=c.length-2;0<=d;--d)if(a.intersects(c[d])){b=!1;break}if(b)a:for(d=c.length-2;0<d;--d)for(var e=c[d].components,f=0,g=e.length;f<g;++f)if(a.containsPoint(e[f])){b=!1;break a}}b?this.polygon.state!==OpenLayers.State.INSERT&&(this.polygon.state=OpenLayers.State.UPDATE):this.polygon.geometry.removeComponent(a);this.restoreFeature();return!1},
-cancel:function(){this.drawingHole&&(this.polygon.geometry.removeComponent(this.line.geometry),this.restoreFeature(!0));return OpenLayers.Handler.Path.prototype.cancel.apply(this,arguments)},restoreFeature:function(a){this.control.layer.events.unregister("sketchcomplete",this,this.finalizeInteriorRing);this.control.layer.events.unregister("sketchmodified",this,this.enforceTopology);this.layer.removeFeatures([this.polygon],{silent:!0});this.control.layer.addFeatures([this.polygon],{silent:!0});this.drawingHole=
-!1;a||this.control.layer.events.triggerEvent("sketchcomplete",{feature:this.polygon})},destroyFeature:function(a){OpenLayers.Handler.Path.prototype.destroyFeature.call(this,a);this.polygon=null},drawFeature:function(){this.layer.drawFeature(this.polygon,this.style);this.layer.drawFeature(this.point,this.style)},getSketch:function(){return this.polygon},getGeometry:function(){var a=this.polygon&&this.polygon.geometry;a&&this.multi&&(a=new OpenLayers.Geometry.MultiPolygon([a]));return a},CLASS_NAME:"OpenLayers.Handler.Polygon"});OpenLayers.Control.EditingToolbar=OpenLayers.Class(OpenLayers.Control.Panel,{citeCompliant:!1,initialize:function(a,b){OpenLayers.Control.Panel.prototype.initialize.apply(this,[b]);this.addControls([new OpenLayers.Control.Navigation]);var c=[new OpenLayers.Control.DrawFeature(a,OpenLayers.Handler.Point,{displayClass:"olControlDrawFeaturePoint",handlerOptions:{citeCompliant:this.citeCompliant}}),new OpenLayers.Control.DrawFeature(a,OpenLayers.Handler.Path,{displayClass:"olControlDrawFeaturePath",handlerOptions:{citeCompliant:this.citeCompliant}}),
-new OpenLayers.Control.DrawFeature(a,OpenLayers.Handler.Polygon,{displayClass:"olControlDrawFeaturePolygon",handlerOptions:{citeCompliant:this.citeCompliant}})];this.addControls(c)},draw:function(){var a=OpenLayers.Control.Panel.prototype.draw.apply(this,arguments);null===this.defaultControl&&(this.defaultControl=this.controls[0]);return a},CLASS_NAME:"OpenLayers.Control.EditingToolbar"});OpenLayers.Strategy.BBOX=OpenLayers.Class(OpenLayers.Strategy,{bounds:null,resolution:null,ratio:2,resFactor:null,response:null,activate:function(){var a=OpenLayers.Strategy.prototype.activate.call(this);a&&(this.layer.events.on({moveend:this.update,refresh:this.update,visibilitychanged:this.update,scope:this}),this.update());return a},deactivate:function(){var a=OpenLayers.Strategy.prototype.deactivate.call(this);a&&this.layer.events.un({moveend:this.update,refresh:this.update,visibilitychanged:this.update,
-scope:this});return a},update:function(a){var b=this.getMapBounds();null!==b&&(a&&a.force||this.layer.visibility&&this.layer.calculateInRange()&&this.invalidBounds(b))&&(this.calculateBounds(b),this.resolution=this.layer.map.getResolution(),this.triggerRead(a))},getMapBounds:function(){if(null===this.layer.map)return null;var a=this.layer.map.getExtent();a&&!this.layer.projection.equals(this.layer.map.getProjectionObject())&&(a=a.clone().transform(this.layer.map.getProjectionObject(),this.layer.projection));
-return a},invalidBounds:function(a){a||(a=this.getMapBounds());a=!this.bounds||!this.bounds.containsBounds(a);!a&&this.resFactor&&(a=this.resolution/this.layer.map.getResolution(),a=a>=this.resFactor||a<=1/this.resFactor);return a},calculateBounds:function(a){a||(a=this.getMapBounds());var b=a.getCenterLonLat(),c=a.getWidth()*this.ratio;a=a.getHeight()*this.ratio;this.bounds=new OpenLayers.Bounds(b.lon-c/2,b.lat-a/2,b.lon+c/2,b.lat+a/2)},triggerRead:function(a){!this.response||a&&!0===a.noAbort||
-(this.layer.protocol.abort(this.response),this.layer.events.triggerEvent("loadend"));var b={filter:this.createFilter()};this.layer.events.triggerEvent("loadstart",b);this.response=this.layer.protocol.read(OpenLayers.Util.applyDefaults({filter:b.filter,callback:this.merge,scope:this},a))},createFilter:function(){var a=new OpenLayers.Filter.Spatial({type:OpenLayers.Filter.Spatial.BBOX,value:this.bounds,projection:this.layer.projection});this.layer.filter&&(a=new OpenLayers.Filter.Logical({type:OpenLayers.Filter.Logical.AND,
-filters:[this.layer.filter,a]}));return a},merge:function(a){this.layer.destroyFeatures();if(a.success()){var b=a.features;if(b&&0<b.length){var c=this.layer.projection,d=this.layer.map.getProjectionObject();if(!d.equals(c))for(var e,f=0,g=b.length;f<g;++f)(e=b[f].geometry)&&e.transform(c,d);this.layer.addFeatures(b)}}else this.bounds=null;this.response=null;this.layer.events.triggerEvent("loadend",{response:a})},CLASS_NAME:"OpenLayers.Strategy.BBOX"});OpenLayers.Layer.WorldWind=OpenLayers.Class(OpenLayers.Layer.Grid,{DEFAULT_PARAMS:{},isBaseLayer:!0,lzd:null,zoomLevels:null,initialize:function(a,b,c,d,e,f){this.lzd=c;this.zoomLevels=d;c=[];c.push(a,b,e,f);OpenLayers.Layer.Grid.prototype.initialize.apply(this,c);this.params=OpenLayers.Util.applyDefaults(this.params,this.DEFAULT_PARAMS)},getZoom:function(){var a=this.map.getZoom();this.map.getMaxExtent();return a-=Math.log(this.maxResolution/(this.lzd/512))/Math.log(2)},getURL:function(a){a=this.adjustBounds(a);
-var b=this.getZoom(),c=this.map.getMaxExtent(),d=this.lzd/Math.pow(2,this.getZoom()),e=Math.floor((a.left-c.left)/d);a=Math.floor((a.bottom-c.bottom)/d);return this.map.getResolution()<=this.lzd/512&&this.getZoom()<=this.zoomLevels?this.getFullRequestString({L:b,X:e,Y:a}):OpenLayers.Util.getImageLocation("blank.gif")},CLASS_NAME:"OpenLayers.Layer.WorldWind"});OpenLayers.Protocol.CSW=function(a){a=OpenLayers.Util.applyDefaults(a,OpenLayers.Protocol.CSW.DEFAULTS);var b=OpenLayers.Protocol.CSW["v"+a.version.replace(/\./g,"_")];if(!b)throw"Unsupported CSW version: "+a.version;return new b(a)};OpenLayers.Protocol.CSW.DEFAULTS={version:"2.0.2"};OpenLayers.Format.WMTSCapabilities=OpenLayers.Class(OpenLayers.Format.XML.VersionedOGC,{defaultVersion:"1.0.0",yx:{"urn:ogc:def:crs:EPSG::4326":!0},createLayer:function(a,b){if(!("layer"in b))throw Error("Missing property 'layer' in configuration.");for(var c=a.contents,d,e=0,f=c.layers.length;e<f;++e)if(c.layers[e].identifier===b.layer){d=c.layers[e];break}if(!d)throw Error("Layer not found");var g=b.format;!g&&(d.formats&&d.formats.length)&&(g=d.formats[0]);var h;b.matrixSet?h=c.tileMatrixSets[b.matrixSet]:
-1<=d.tileMatrixSetLinks.length&&(h=c.tileMatrixSets[d.tileMatrixSetLinks[0].tileMatrixSet]);if(!h)throw Error("matrixSet not found");for(var k,e=0,f=d.styles.length;e<f&&(k=d.styles[e],!k.isDefault);++e);c=b.requestEncoding;if(!c&&(c="KVP",a.operationsMetadata.GetTile.dcp.http)){var l=a.operationsMetadata.GetTile.dcp.http;l.get[0].constraints&&(l=l.get[0].constraints.GetEncoding.allowedValues,l.KVP||!l.REST&&!l.RESTful||(c="REST"))}var l=[],m=b.params||{};delete b.params;for(var n=0,p=d.dimensions.length;n<
-p;n++){var q=d.dimensions[n];l.push(q.identifier);m.hasOwnProperty(q.identifier)||(m[q.identifier]=q["default"])}var n=b.projection||h.supportedCRS.replace(/urn:ogc:def:crs:(\w+):(.*:)?(\w+)$/,"$1:$3"),p=b.units||("EPSG:4326"===n?"degrees":"m"),q=[],r;for(r in h.matrixIds)h.matrixIds.hasOwnProperty(r)&&q.push(2.8E-4*h.matrixIds[r].scaleDenominator/OpenLayers.METERS_PER_INCH/OpenLayers.INCHES_PER_UNIT[p]);if("REST"===c&&d.resourceUrls){r=[];for(var f=0,s=d.resourceUrls.length;f<s;++f)e=d.resourceUrls[f],
-e.format===g&&"tile"===e.resourceType&&r.push(e.template)}else{s=a.operationsMetadata.GetTile.dcp.http.get;r=[];for(var t,e=0,f=s.length;e<f;e++)t=s[e].constraints,(!t||t&&t.GetEncoding.allowedValues[c])&&r.push(s[e].url)}return new OpenLayers.Layer.WMTS(OpenLayers.Util.applyDefaults(b,{url:r,requestEncoding:c,name:d.title,style:k.identifier,format:g,matrixIds:h.matrixIds,matrixSet:h.identifier,projection:n,units:p,resolutions:!1===b.isBaseLayer?void 0:q,serverResolutions:q,tileFullExtent:h.bounds,
-dimensions:l,params:m}))},CLASS_NAME:"OpenLayers.Format.WMTSCapabilities"});OpenLayers.Layer.Google.v3={DEFAULTS:{sphericalMercator:!0,projection:"EPSG:900913"},animationEnabled:!0,loadMapObject:function(){this.type||(this.type=google.maps.MapTypeId.ROADMAP);var a,b=OpenLayers.Layer.Google.cache[this.map.id];b?(a=b.mapObject,++b.count):(a=this.map.getCenter(),b=document.createElement("div"),b.className="olForeignContainer",b.style.width="100%",b.style.height="100%",a=new google.maps.Map(b,{center:a?new google.maps.LatLng(a.lat,a.lon):new google.maps.LatLng(0,0),zoom:this.map.getZoom()||
-0,mapTypeId:this.type,disableDefaultUI:!0,keyboardShortcuts:!1,draggable:!1,disableDoubleClickZoom:!0,scrollwheel:!1,streetViewControl:!1}),b=document.createElement("div"),b.style.width="100%",b.style.height="100%",a.controls[google.maps.ControlPosition.TOP_LEFT].push(b),b={googleControl:b,mapObject:a,count:1},OpenLayers.Layer.Google.cache[this.map.id]=b);this.mapObject=a;this.setGMapVisibility(this.visibility)},onMapResize:function(){this.visibility&&google.maps.event.trigger(this.mapObject,"resize")},
-setGMapVisibility:function(a){var b=OpenLayers.Layer.Google.cache[this.map.id],c=this.map;if(b){for(var d=this.type,e=c.layers,f,g=e.length-1;0<=g;--g)if(f=e[g],f instanceof OpenLayers.Layer.Google&&!0===f.visibility&&!0===f.inRange){d=f.type;a=!0;break}e=this.mapObject.getDiv();if(!0===a){if(e.parentNode!==c.div)if(b.rendered)c.div.appendChild(e),b.googleControl.appendChild(c.viewPortDiv),google.maps.event.trigger(this.mapObject,"resize");else{var h=this;google.maps.event.addListenerOnce(this.mapObject,
-"tilesloaded",function(){b.rendered=!0;h.setGMapVisibility(h.getVisibility());h.moveTo(h.map.getCenter())})}this.mapObject.setMapTypeId(d)}else b.googleControl.hasChildNodes()&&(c.div.appendChild(c.viewPortDiv),c.div.removeChild(e))}},getMapContainer:function(){return this.mapObject.getDiv()},getMapObjectBoundsFromOLBounds:function(a){var b=null;null!=a&&(b=this.sphericalMercator?this.inverseMercator(a.bottom,a.left):new OpenLayers.LonLat(a.bottom,a.left),a=this.sphericalMercator?this.inverseMercator(a.top,
-a.right):new OpenLayers.LonLat(a.top,a.right),b=new google.maps.LatLngBounds(new google.maps.LatLng(b.lat,b.lon),new google.maps.LatLng(a.lat,a.lon)));return b},getMapObjectLonLatFromMapObjectPixel:function(a){var b=this.map.getSize(),c=this.getLongitudeFromMapObjectLonLat(this.mapObject.center),d=this.getLatitudeFromMapObjectLonLat(this.mapObject.center),e=this.map.getResolution();a=new OpenLayers.LonLat(c+(a.x-b.w/2)*e,d-(a.y-b.h/2)*e);this.wrapDateLine&&(a=a.wrapDateLine(this.maxExtent));return this.getMapObjectLonLatFromLonLat(a.lon,
-a.lat)},getMapObjectPixelFromMapObjectLonLat:function(a){var b=this.getLongitudeFromMapObjectLonLat(a);a=this.getLatitudeFromMapObjectLonLat(a);var c=this.map.getResolution(),d=this.map.getExtent();return this.getMapObjectPixelFromXY(1/c*(b-d.left),1/c*(d.top-a))},setMapObjectCenter:function(a,b){if(!1===this.animationEnabled&&b!=this.mapObject.zoom){var c=this.getMapContainer();google.maps.event.addListenerOnce(this.mapObject,"idle",function(){c.style.visibility=""});c.style.visibility="hidden"}this.mapObject.setOptions({center:a,
-zoom:b})},getMapObjectZoomFromMapObjectBounds:function(a){return this.mapObject.getBoundsZoomLevel(a)},getMapObjectLonLatFromLonLat:function(a,b){var c;this.sphericalMercator?(c=this.inverseMercator(a,b),c=new google.maps.LatLng(c.lat,c.lon)):c=new google.maps.LatLng(b,a);return c},getMapObjectPixelFromXY:function(a,b){return new google.maps.Point(a,b)}};OpenLayers.Format.WPSDescribeProcess=OpenLayers.Class(OpenLayers.Format.XML,{VERSION:"1.0.0",namespaces:{wps:"http://www.opengis.net/wps/1.0.0",ows:"http://www.opengis.net/ows/1.1",xsi:"http://www.w3.org/2001/XMLSchema-instance"},schemaLocation:"http://www.opengis.net/wps/1.0.0 http://schemas.opengis.net/wps/1.0.0/wpsAll.xsd",defaultPrefix:"wps",regExes:{trimSpace:/^\s*|\s*$/g,removeSpace:/\s*/g,splitSpace:/\s+/,trimComma:/\s*,\s*/g},read:function(a){"string"==typeof a&&(a=OpenLayers.Format.XML.prototype.read.apply(this,
-[a]));a&&9==a.nodeType&&(a=a.documentElement);var b={};this.readNode(a,b);return b},readers:{wps:{ProcessDescriptions:function(a,b){b.processDescriptions={};this.readChildNodes(a,b.processDescriptions)},ProcessDescription:function(a,b){var c={processVersion:this.getAttributeNS(a,this.namespaces.wps,"processVersion"),statusSupported:"true"===a.getAttribute("statusSupported"),storeSupported:"true"===a.getAttribute("storeSupported")};this.readChildNodes(a,c);b[c.identifier]=c},DataInputs:function(a,
-b){b.dataInputs=[];this.readChildNodes(a,b.dataInputs)},ProcessOutputs:function(a,b){b.processOutputs=[];this.readChildNodes(a,b.processOutputs)},Output:function(a,b){var c={};this.readChildNodes(a,c);b.push(c)},ComplexOutput:function(a,b){b.complexOutput={};this.readChildNodes(a,b.complexOutput)},LiteralOutput:function(a,b){b.literalOutput={};this.readChildNodes(a,b.literalOutput)},Input:function(a,b){var c={maxOccurs:parseInt(a.getAttribute("maxOccurs")),minOccurs:parseInt(a.getAttribute("minOccurs"))};
-this.readChildNodes(a,c);b.push(c)},BoundingBoxData:function(a,b){b.boundingBoxData={};this.readChildNodes(a,b.boundingBoxData)},CRS:function(a,b){b.CRSs||(b.CRSs={});b.CRSs[this.getChildValue(a)]=!0},LiteralData:function(a,b){b.literalData={};this.readChildNodes(a,b.literalData)},ComplexData:function(a,b){b.complexData={};this.readChildNodes(a,b.complexData)},Default:function(a,b){b["default"]={};this.readChildNodes(a,b["default"])},Supported:function(a,b){b.supported={};this.readChildNodes(a,b.supported)},
-Format:function(a,b){var c={};this.readChildNodes(a,c);b.formats||(b.formats={});b.formats[c.mimeType]=!0},MimeType:function(a,b){b.mimeType=this.getChildValue(a)}},ows:OpenLayers.Format.OWSCommon.v1_1_0.prototype.readers.ows},CLASS_NAME:"OpenLayers.Format.WPSDescribeProcess"});OpenLayers.Format.WKT=OpenLayers.Class(OpenLayers.Format,{initialize:function(a){this.regExes={typeStr:/^\s*(\w+)\s*\(\s*(.*)\s*\)\s*$/,spaces:/\s+/,parenComma:/\)\s*,\s*\(/,doubleParenComma:/\)\s*\)\s*,\s*\(\s*\(/,trimParens:/^\s*\(?(.*?)\)?\s*$/};OpenLayers.Format.prototype.initialize.apply(this,[a])},read:function(a){var b,c;a=a.replace(/[\n\r]/g," ");if(c=this.regExes.typeStr.exec(a))if(a=c[1].toLowerCase(),c=c[2],this.parse[a]&&(b=this.parse[a].apply(this,[c])),this.internalProjection&&this.externalProjection)if(b&&
-"OpenLayers.Feature.Vector"==b.CLASS_NAME)b.geometry.transform(this.externalProjection,this.internalProjection);else if(b&&"geometrycollection"!=a&&"object"==typeof b)for(a=0,c=b.length;a<c;a++)b[a].geometry.transform(this.externalProjection,this.internalProjection);return b},write:function(a){var b,c;a.constructor==Array?c=!0:(a=[a],c=!1);var d=[];c&&d.push("GEOMETRYCOLLECTION(");for(var e=0,f=a.length;e<f;++e)c&&0<e&&d.push(","),b=a[e].geometry,d.push(this.extractGeometry(b));c&&d.push(")");return d.join("")},
-extractGeometry:function(a){var b=a.CLASS_NAME.split(".")[2].toLowerCase();if(!this.extract[b])return null;this.internalProjection&&this.externalProjection&&(a=a.clone(),a.transform(this.internalProjection,this.externalProjection));return("collection"==b?"GEOMETRYCOLLECTION":b.toUpperCase())+"("+this.extract[b].apply(this,[a])+")"},extract:{point:function(a){return a.x+" "+a.y},multipoint:function(a){for(var b=[],c=0,d=a.components.length;c<d;++c)b.push("("+this.extract.point.apply(this,[a.components[c]])+
-")");return b.join(",")},linestring:function(a){for(var b=[],c=0,d=a.components.length;c<d;++c)b.push(this.extract.point.apply(this,[a.components[c]]));return b.join(",")},multilinestring:function(a){for(var b=[],c=0,d=a.components.length;c<d;++c)b.push("("+this.extract.linestring.apply(this,[a.components[c]])+")");return b.join(",")},polygon:function(a){for(var b=[],c=0,d=a.components.length;c<d;++c)b.push("("+this.extract.linestring.apply(this,[a.components[c]])+")");return b.join(",")},multipolygon:function(a){for(var b=
-[],c=0,d=a.components.length;c<d;++c)b.push("("+this.extract.polygon.apply(this,[a.components[c]])+")");return b.join(",")},collection:function(a){for(var b=[],c=0,d=a.components.length;c<d;++c)b.push(this.extractGeometry.apply(this,[a.components[c]]));return b.join(",")}},parse:{point:function(a){a=OpenLayers.String.trim(a).split(this.regExes.spaces);return new OpenLayers.Feature.Vector(new OpenLayers.Geometry.Point(a[0],a[1]))},multipoint:function(a){for(var b=OpenLayers.String.trim(a).split(","),
-c=[],d=0,e=b.length;d<e;++d)a=b[d].replace(this.regExes.trimParens,"$1"),c.push(this.parse.point.apply(this,[a]).geometry);return new OpenLayers.Feature.Vector(new OpenLayers.Geometry.MultiPoint(c))},linestring:function(a){a=OpenLayers.String.trim(a).split(",");for(var b=[],c=0,d=a.length;c<d;++c)b.push(this.parse.point.apply(this,[a[c]]).geometry);return new OpenLayers.Feature.Vector(new OpenLayers.Geometry.LineString(b))},multilinestring:function(a){for(var b=OpenLayers.String.trim(a).split(this.regExes.parenComma),
-c=[],d=0,e=b.length;d<e;++d)a=b[d].replace(this.regExes.trimParens,"$1"),c.push(this.parse.linestring.apply(this,[a]).geometry);return new OpenLayers.Feature.Vector(new OpenLayers.Geometry.MultiLineString(c))},polygon:function(a){var b;a=OpenLayers.String.trim(a).split(this.regExes.parenComma);for(var c=[],d=0,e=a.length;d<e;++d)b=a[d].replace(this.regExes.trimParens,"$1"),b=this.parse.linestring.apply(this,[b]).geometry,b=new OpenLayers.Geometry.LinearRing(b.components),c.push(b);return new OpenLayers.Feature.Vector(new OpenLayers.Geometry.Polygon(c))},
-multipolygon:function(a){for(var b=OpenLayers.String.trim(a).split(this.regExes.doubleParenComma),c=[],d=0,e=b.length;d<e;++d)a=b[d].replace(this.regExes.trimParens,"$1"),c.push(this.parse.polygon.apply(this,[a]).geometry);return new OpenLayers.Feature.Vector(new OpenLayers.Geometry.MultiPolygon(c))},geometrycollection:function(a){a=a.replace(/,\s*([A-Za-z])/g,"|$1");a=OpenLayers.String.trim(a).split("|");for(var b=[],c=0,d=a.length;c<d;++c)b.push(OpenLayers.Format.WKT.prototype.read.apply(this,[a[c]]));
-return b}},CLASS_NAME:"OpenLayers.Format.WKT"});OpenLayers.WPSProcess=OpenLayers.Class({client:null,server:null,identifier:null,description:null,localWPS:"http://geoserver/wps",formats:null,chained:0,executeCallbacks:null,initialize:function(a){OpenLayers.Util.extend(this,a);this.executeCallbacks=[];this.formats={"application/wkt":new OpenLayers.Format.WKT,"application/json":new OpenLayers.Format.GeoJSON}},describe:function(a){a=a||{};if(!this.description)this.client.describeProcess(this.server,this.identifier,function(b){this.description||this.parseDescription(b);
-a.callback&&a.callback.call(a.scope,this.description)},this);else if(a.callback){var b=this.description;window.setTimeout(function(){a.callback.call(a.scope,b)},0)}},configure:function(a){this.describe({callback:function(){var b=this.description,c=a.inputs,d,e,f;e=0;for(f=b.dataInputs.length;e<f;++e)d=b.dataInputs[e],this.setInputData(d,c[d.identifier]);a.callback&&a.callback.call(a.scope)},scope:this});return this},execute:function(a){this.configure({inputs:a.inputs,callback:function(){var b=this,
-c=this.getOutputIndex(b.description.processOutputs,a.output);b.setResponseForm({outputIndex:c});(function e(){OpenLayers.Util.removeItem(b.executeCallbacks,e);0!==b.chained?b.executeCallbacks.push(e):OpenLayers.Request.POST({url:b.client.servers[b.server].url,data:(new OpenLayers.Format.WPSExecute).write(b.description),success:function(e){var g=b.findMimeType(b.description.processOutputs[c].complexOutput.supported.formats);e=b.formats[g].read(e.responseText);e instanceof OpenLayers.Feature.Vector&&
-(e=[e]);a.success&&(g={},g[a.output||"result"]=e,a.success.call(a.scope,g))},scope:b})})()},scope:this})},output:function(a){return new OpenLayers.WPSProcess.ChainLink({process:this,output:a})},parseDescription:function(a){a=this.client.servers[this.server];this.description=(new OpenLayers.Format.WPSDescribeProcess).read(a.processDescription[this.identifier]).processDescriptions[this.identifier]},setInputData:function(a,b){delete a.data;delete a.reference;if(b instanceof OpenLayers.WPSProcess.ChainLink)++this.chained,
-a.reference={method:"POST",href:b.process.server===this.server?this.localWPS:this.client.servers[b.process.server].url},b.process.describe({callback:function(){--this.chained;this.chainProcess(a,b)},scope:this});else{a.data={};var c=a.complexData;c?(c=this.findMimeType(c.supported.formats),a.data.complexData={mimeType:c,value:this.formats[c].write(this.toFeatures(b))}):a.data.literalData={value:b}}},setResponseForm:function(a){a=a||{};var b=this.description.processOutputs[a.outputIndex||0];this.description.responseForm=
-{rawDataOutput:{identifier:b.identifier,mimeType:this.findMimeType(b.complexOutput.supported.formats,a.supportedFormats)}}},getOutputIndex:function(a,b){var c;if(b)for(var d=a.length-1;0<=d;--d){if(a[d].identifier===b){c=d;break}}else c=0;return c},chainProcess:function(a,b){var c=this.getOutputIndex(b.process.description.processOutputs,b.output);a.reference.mimeType=this.findMimeType(a.complexData.supported.formats,b.process.description.processOutputs[c].complexOutput.supported.formats);var d={};
-d[a.reference.mimeType]=!0;b.process.setResponseForm({outputIndex:c,supportedFormats:d});for(a.reference.body=b.process.description;0<this.executeCallbacks.length;)this.executeCallbacks[0]()},toFeatures:function(a){var b=OpenLayers.Util.isArray(a);b||(a=[a]);for(var c=Array(a.length),d,e=0,f=a.length;e<f;++e)d=a[e],c[e]=d instanceof OpenLayers.Feature.Vector?d:new OpenLayers.Feature.Vector(d);return b?c:c[0]},findMimeType:function(a,b){b=b||this.formats;for(var c in a)if(c in b)return c},CLASS_NAME:"OpenLayers.WPSProcess"});
-OpenLayers.WPSProcess.ChainLink=OpenLayers.Class({process:null,output:null,initialize:function(a){OpenLayers.Util.extend(this,a)},CLASS_NAME:"OpenLayers.WPSProcess.ChainLink"});OpenLayers.WPSClient=OpenLayers.Class({servers:null,version:"1.0.0",lazy:!1,events:null,initialize:function(a){OpenLayers.Util.extend(this,a);this.events=new OpenLayers.Events(this);this.servers={};for(var b in a.servers)this.servers[b]="string"==typeof a.servers[b]?{url:a.servers[b],version:this.version,processDescription:{}}:a.servers[b]},execute:function(a){this.getProcess(a.server,a.process).execute({inputs:a.inputs,success:a.success,scope:a.scope})},getProcess:function(a,b){var c=new OpenLayers.WPSProcess({client:this,
-server:a,identifier:b});this.lazy||c.describe();return c},describeProcess:function(a,b,c,d){var e=this.servers[a];e.processDescription[b]?window.setTimeout(function(){c.call(d,e.processDescription[b])},0):b in e.processDescription?this.events.register("describeprocess",this,function g(a){a.identifier===b&&(this.events.unregister("describeprocess",this,g),c.call(d,a.raw))}):(e.processDescription[b]=null,OpenLayers.Request.GET({url:e.url,params:{SERVICE:"WPS",VERSION:e.version,REQUEST:"DescribeProcess",
-IDENTIFIER:b},success:function(a){e.processDescription[b]=a.responseText;this.events.triggerEvent("describeprocess",{identifier:b,raw:a.responseText})},scope:this}))},destroy:function(){this.events.destroy();this.servers=this.events=null},CLASS_NAME:"OpenLayers.WPSClient"});OpenLayers.Format.CSWGetRecords.v2_0_2=OpenLayers.Class(OpenLayers.Format.XML,{namespaces:{csw:"http://www.opengis.net/cat/csw/2.0.2",dc:"http://purl.org/dc/elements/1.1/",dct:"http://purl.org/dc/terms/",gmd:"http://www.isotc211.org/2005/gmd",geonet:"http://www.fao.org/geonetwork",ogc:"http://www.opengis.net/ogc",ows:"http://www.opengis.net/ows",xlink:"http://www.w3.org/1999/xlink",xsi:"http://www.w3.org/2001/XMLSchema-instance"},defaultPrefix:"csw",version:"2.0.2",schemaLocation:"http://www.opengis.net/cat/csw/2.0.2 http://schemas.opengis.net/csw/2.0.2/CSW-discovery.xsd",
-requestId:null,resultType:null,outputFormat:null,outputSchema:null,startPosition:null,maxRecords:null,DistributedSearch:null,ResponseHandler:null,Query:null,regExes:{trimSpace:/^\s*|\s*$/g,removeSpace:/\s*/g,splitSpace:/\s+/,trimComma:/\s*,\s*/g},initialize:function(a){OpenLayers.Format.XML.prototype.initialize.apply(this,[a])},read:function(a){"string"==typeof a&&(a=OpenLayers.Format.XML.prototype.read.apply(this,[a]));a&&9==a.nodeType&&(a=a.documentElement);var b={};this.readNode(a,b);return b},
-readers:{csw:{GetRecordsResponse:function(a,b){b.records=[];this.readChildNodes(a,b);var c=this.getAttributeNS(a,"","version");""!=c&&(b.version=c)},RequestId:function(a,b){b.RequestId=this.getChildValue(a)},SearchStatus:function(a,b){b.SearchStatus={};var c=this.getAttributeNS(a,"","timestamp");""!=c&&(b.SearchStatus.timestamp=c)},SearchResults:function(a,b){this.readChildNodes(a,b);for(var c=a.attributes,d={},e=0,f=c.length;e<f;++e)d[c[e].name]="numberOfRecordsMatched"==c[e].name||"numberOfRecordsReturned"==
-c[e].name||"nextRecord"==c[e].name?parseInt(c[e].nodeValue):c[e].nodeValue;b.SearchResults=d},SummaryRecord:function(a,b){var c={type:"SummaryRecord"};this.readChildNodes(a,c);b.records.push(c)},BriefRecord:function(a,b){var c={type:"BriefRecord"};this.readChildNodes(a,c);b.records.push(c)},DCMIRecord:function(a,b){var c={type:"DCMIRecord"};this.readChildNodes(a,c);b.records.push(c)},Record:function(a,b){var c={type:"Record"};this.readChildNodes(a,c);b.records.push(c)},"*":function(a,b){var c=a.localName||
-a.nodeName.split(":").pop();b[c]=this.getChildValue(a)}},geonet:{info:function(a,b){var c={};this.readChildNodes(a,c);b.gninfo=c}},dc:{"*":function(a,b){var c=a.localName||a.nodeName.split(":").pop();OpenLayers.Util.isArray(b[c])||(b[c]=[]);for(var d={},e=a.attributes,f=0,g=e.length;f<g;++f)d[e[f].name]=e[f].nodeValue;d.value=this.getChildValue(a);""!=d.value&&b[c].push(d)}},dct:{"*":function(a,b){var c=a.localName||a.nodeName.split(":").pop();OpenLayers.Util.isArray(b[c])||(b[c]=[]);b[c].push(this.getChildValue(a))}},
-ows:OpenLayers.Util.applyDefaults({BoundingBox:function(a,b){b.bounds&&(b.BoundingBox=[{crs:b.projection,value:[b.bounds.left,b.bounds.bottom,b.bounds.right,b.bounds.top]}],delete b.projection,delete b.bounds);OpenLayers.Format.OWSCommon.v1_0_0.prototype.readers.ows.BoundingBox.apply(this,arguments)}},OpenLayers.Format.OWSCommon.v1_0_0.prototype.readers.ows)},write:function(a){a=this.writeNode("csw:GetRecords",a);a.setAttribute("xmlns:gmd",this.namespaces.gmd);return OpenLayers.Format.XML.prototype.write.apply(this,
-[a])},writers:{csw:{GetRecords:function(a){a||(a={});var b=this.createElementNSPlus("csw:GetRecords",{attributes:{service:"CSW",version:this.version,requestId:a.requestId||this.requestId,resultType:a.resultType||this.resultType,outputFormat:a.outputFormat||this.outputFormat,outputSchema:a.outputSchema||this.outputSchema,startPosition:a.startPosition||this.startPosition,maxRecords:a.maxRecords||this.maxRecords}});(a.DistributedSearch||this.DistributedSearch)&&this.writeNode("csw:DistributedSearch",
-a.DistributedSearch||this.DistributedSearch,b);var c=a.ResponseHandler||this.ResponseHandler;if(OpenLayers.Util.isArray(c)&&0<c.length)for(var d=0,e=c.length;d<e;d++)this.writeNode("csw:ResponseHandler",c[d],b);this.writeNode("Query",a.Query||this.Query,b);return b},DistributedSearch:function(a){return this.createElementNSPlus("csw:DistributedSearch",{attributes:{hopCount:a.hopCount}})},ResponseHandler:function(a){return this.createElementNSPlus("csw:ResponseHandler",{value:a.value})},Query:function(a){a||
-(a={});var b=this.createElementNSPlus("csw:Query",{attributes:{typeNames:a.typeNames||"csw:Record"}}),c=a.ElementName;if(OpenLayers.Util.isArray(c)&&0<c.length)for(var d=0,e=c.length;d<e;d++)this.writeNode("csw:ElementName",c[d],b);else this.writeNode("csw:ElementSetName",a.ElementSetName||{value:"summary"},b);a.Constraint&&this.writeNode("csw:Constraint",a.Constraint,b);a.SortBy&&this.writeNode("ogc:SortBy",a.SortBy,b);return b},ElementName:function(a){return this.createElementNSPlus("csw:ElementName",
-{value:a.value})},ElementSetName:function(a){return this.createElementNSPlus("csw:ElementSetName",{attributes:{typeNames:a.typeNames},value:a.value})},Constraint:function(a){var b=this.createElementNSPlus("csw:Constraint",{attributes:{version:a.version}});if(a.Filter){var c=new OpenLayers.Format.Filter({version:a.version});b.appendChild(c.write(a.Filter))}else a.CqlText&&(a=this.createElementNSPlus("CqlText",{value:a.CqlText.value}),b.appendChild(a));return b}},ogc:OpenLayers.Format.Filter.v1_1_0.prototype.writers.ogc},
-CLASS_NAME:"OpenLayers.Format.CSWGetRecords.v2_0_2"});/*
- Apache 2 
-
- Contains portions of Rico <http://openrico.org/>
-
- Copyright 2005 Sabre Airline Solutions  
-
- Licensed under the Apache License, Version 2.0 (the "License"); you
- may not use this file except in compliance with the License. You
- may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0  
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied. See the License for the specific language governing
- permissions and limitations under the License. 
-*/
-OpenLayers.Marker.Box=OpenLayers.Class(OpenLayers.Marker,{bounds:null,div:null,initialize:function(a,b,c){this.bounds=a;this.div=OpenLayers.Util.createDiv();this.div.style.overflow="hidden";this.events=new OpenLayers.Events(this,this.div);this.setBorder(b,c)},destroy:function(){this.div=this.bounds=null;OpenLayers.Marker.prototype.destroy.apply(this,arguments)},setBorder:function(a,b){a||(a="red");b||(b=2);this.div.style.border=b+"px solid "+a},draw:function(a,b){OpenLayers.Util.modifyDOMElement(this.div,
-null,a,b);return this.div},onScreen:function(){var a=!1;this.map&&(a=this.map.getExtent().containsBounds(this.bounds,!0,!0));return a},display:function(a){this.div.style.display=a?"":"none"},CLASS_NAME:"OpenLayers.Marker.Box"});OpenLayers.Format.Text=OpenLayers.Class(OpenLayers.Format,{defaultStyle:null,extractStyles:!0,initialize:function(a){a=a||{};!1!==a.extractStyles&&(a.defaultStyle={externalGraphic:OpenLayers.Util.getImageLocation("marker.png"),graphicWidth:21,graphicHeight:25,graphicXOffset:-10.5,graphicYOffset:-12.5});OpenLayers.Format.prototype.initialize.apply(this,[a])},read:function(a){a=a.split("\n");for(var b,c=[],d=0;d<a.length-1;d++){var e=a[d].replace(/^\s*/,"").replace(/\s*$/,"");if("#"!=e.charAt(0))if(b){for(var e=
-e.split("\t"),f=new OpenLayers.Geometry.Point(0,0),g={},h=this.defaultStyle?OpenLayers.Util.applyDefaults({},this.defaultStyle):null,k=!1,l=0;l<e.length;l++)if(e[l])if("point"==b[l])k=e[l].split(","),f.y=parseFloat(k[0]),f.x=parseFloat(k[1]),k=!0;else if("lat"==b[l])f.y=parseFloat(e[l]),k=!0;else if("lon"==b[l])f.x=parseFloat(e[l]),k=!0;else if("title"==b[l])g.title=e[l];else if("image"==b[l]||"icon"==b[l]&&h)h.externalGraphic=e[l];else if("iconSize"==b[l]&&h){var m=e[l].split(",");h.graphicWidth=
-parseFloat(m[0]);h.graphicHeight=parseFloat(m[1])}else"iconOffset"==b[l]&&h?(m=e[l].split(","),h.graphicXOffset=parseFloat(m[0]),h.graphicYOffset=parseFloat(m[1])):"description"==b[l]?g.description=e[l]:"overflow"==b[l]?g.overflow=e[l]:g[b[l]]=e[l];k&&(this.internalProjection&&this.externalProjection&&f.transform(this.externalProjection,this.internalProjection),e=new OpenLayers.Feature.Vector(f,g,h),c.push(e))}else b=e.split("\t")}return c},CLASS_NAME:"OpenLayers.Format.Text"});OpenLayers.Layer.Text=OpenLayers.Class(OpenLayers.Layer.Markers,{location:null,features:null,formatOptions:null,selectedFeature:null,initialize:function(a,b){OpenLayers.Layer.Markers.prototype.initialize.apply(this,arguments);this.features=[]},destroy:function(){OpenLayers.Layer.Markers.prototype.destroy.apply(this,arguments);this.clearFeatures();this.features=null},loadText:function(){this.loaded||null==this.location||(this.events.triggerEvent("loadstart"),OpenLayers.Request.GET({url:this.location,
-success:this.parseData,failure:function(a){this.events.triggerEvent("loadend")},scope:this}),this.loaded=!0)},moveTo:function(a,b,c){OpenLayers.Layer.Markers.prototype.moveTo.apply(this,arguments);this.visibility&&!this.loaded&&this.loadText()},parseData:function(a){a=a.responseText;var b={};OpenLayers.Util.extend(b,this.formatOptions);this.map&&!this.projection.equals(this.map.getProjectionObject())&&(b.externalProjection=this.projection,b.internalProjection=this.map.getProjectionObject());a=(new OpenLayers.Format.Text(b)).read(a);
-for(var b=0,c=a.length;b<c;b++){var d={},e=a[b],f,g,h;f=new OpenLayers.LonLat(e.geometry.x,e.geometry.y);e.style.graphicWidth&&e.style.graphicHeight&&(g=new OpenLayers.Size(e.style.graphicWidth,e.style.graphicHeight));void 0!==e.style.graphicXOffset&&void 0!==e.style.graphicYOffset&&(h=new OpenLayers.Pixel(e.style.graphicXOffset,e.style.graphicYOffset));null!=e.style.externalGraphic?d.icon=new OpenLayers.Icon(e.style.externalGraphic,g,h):(d.icon=OpenLayers.Marker.defaultIcon(),null!=g&&d.icon.setSize(g));
-null!=e.attributes.title&&null!=e.attributes.description&&(d.popupContentHTML="<h2>"+e.attributes.title+"</h2><p>"+e.attributes.description+"</p>");d.overflow=e.attributes.overflow||"auto";d=new OpenLayers.Feature(this,f,d);this.features.push(d);f=d.createMarker();null!=e.attributes.title&&null!=e.attributes.description&&f.events.register("click",d,this.markerClick);this.addMarker(f)}this.events.triggerEvent("loadend")},markerClick:function(a){var b=this==this.layer.selectedFeature;this.layer.selectedFeature=
-b?null:this;for(var c=0,d=this.layer.map.popups.length;c<d;c++)this.layer.map.removePopup(this.layer.map.popups[c]);b||this.layer.map.addPopup(this.createPopup());OpenLayers.Event.stop(a)},clearFeatures:function(){if(null!=this.features)for(;0<this.features.length;){var a=this.features[0];OpenLayers.Util.removeItem(this.features,a);a.destroy()}},CLASS_NAME:"OpenLayers.Layer.Text"});OpenLayers.Handler.RegularPolygon=OpenLayers.Class(OpenLayers.Handler.Drag,{sides:4,radius:null,snapAngle:null,snapToggle:"shiftKey",layerOptions:null,persist:!1,irregular:!1,citeCompliant:!1,angle:null,fixedRadius:!1,feature:null,layer:null,origin:null,initialize:function(a,b,c){c&&c.layerOptions&&c.layerOptions.styleMap||(this.style=OpenLayers.Util.extend(OpenLayers.Feature.Vector.style["default"],{}));OpenLayers.Handler.Drag.prototype.initialize.apply(this,[a,b,c]);this.options=c?c:{}},setOptions:function(a){OpenLayers.Util.extend(this.options,
-a);OpenLayers.Util.extend(this,a)},activate:function(){var a=!1;OpenLayers.Handler.Drag.prototype.activate.apply(this,arguments)&&(a=OpenLayers.Util.extend({displayInLayerSwitcher:!1,calculateInRange:OpenLayers.Function.True,wrapDateLine:this.citeCompliant},this.layerOptions),this.layer=new OpenLayers.Layer.Vector(this.CLASS_NAME,a),this.map.addLayer(this.layer),a=!0);return a},deactivate:function(){var a=!1;OpenLayers.Handler.Drag.prototype.deactivate.apply(this,arguments)&&(this.dragging&&this.cancel(),
-null!=this.layer.map&&(this.layer.destroy(!1),this.feature&&this.feature.destroy()),this.feature=this.layer=null,a=!0);return a},down:function(a){this.fixedRadius=!!this.radius;a=this.layer.getLonLatFromViewPortPx(a.xy);this.origin=new OpenLayers.Geometry.Point(a.lon,a.lat);if(!this.fixedRadius||this.irregular)this.radius=this.map.getResolution();this.persist&&this.clear();this.feature=new OpenLayers.Feature.Vector;this.createGeometry();this.callback("create",[this.origin,this.feature]);this.layer.addFeatures([this.feature],
-{silent:!0});this.layer.drawFeature(this.feature,this.style)},move:function(a){var b=this.layer.getLonLatFromViewPortPx(a.xy),b=new OpenLayers.Geometry.Point(b.lon,b.lat);this.irregular?(a=Math.sqrt(2)*Math.abs(b.y-this.origin.y)/2,this.radius=Math.max(this.map.getResolution()/2,a)):this.fixedRadius?this.origin=b:(this.calculateAngle(b,a),this.radius=Math.max(this.map.getResolution()/2,b.distanceTo(this.origin)));this.modifyGeometry();if(this.irregular){a=b.x-this.origin.x;var b=b.y-this.origin.y,
-c;c=0==b?a/(this.radius*Math.sqrt(2)):a/b;this.feature.geometry.resize(1,this.origin,c);this.feature.geometry.move(a/2,b/2)}this.layer.drawFeature(this.feature,this.style)},up:function(a){this.finalize();this.start==this.last&&this.callback("done",[a.xy])},out:function(a){this.finalize()},createGeometry:function(){this.angle=Math.PI*(1/this.sides-0.5);this.snapAngle&&(this.angle+=this.snapAngle*(Math.PI/180));this.feature.geometry=OpenLayers.Geometry.Polygon.createRegularPolygon(this.origin,this.radius,
-this.sides,this.snapAngle)},modifyGeometry:function(){var a,b,c=this.feature.geometry.components[0];c.components.length!=this.sides+1&&(this.createGeometry(),c=this.feature.geometry.components[0]);for(var d=0;d<this.sides;++d)b=c.components[d],a=this.angle+2*d*Math.PI/this.sides,b.x=this.origin.x+this.radius*Math.cos(a),b.y=this.origin.y+this.radius*Math.sin(a),b.clearBounds()},calculateAngle:function(a,b){var c=Math.atan2(a.y-this.origin.y,a.x-this.origin.x);if(this.snapAngle&&this.snapToggle&&!b[this.snapToggle]){var d=
-Math.PI/180*this.snapAngle;this.angle=Math.round(c/d)*d}else this.angle=c},cancel:function(){this.callback("cancel",null);this.finalize()},finalize:function(){this.origin=null;this.radius=this.options.radius},clear:function(){this.layer&&(this.layer.renderer.clear(),this.layer.destroyFeatures())},callback:function(a,b){this.callbacks[a]&&this.callbacks[a].apply(this.control,[this.feature.geometry.clone()]);this.persist||"done"!=a&&"cancel"!=a||this.clear()},CLASS_NAME:"OpenLayers.Handler.RegularPolygon"});OpenLayers.Control.SLDSelect=OpenLayers.Class(OpenLayers.Control,{clearOnDeactivate:!1,layers:null,callbacks:null,selectionSymbolizer:{Polygon:{fillColor:"#FF0000",stroke:!1},Line:{strokeColor:"#FF0000",strokeWidth:2},Point:{graphicName:"square",fillColor:"#FF0000",pointRadius:5}},layerOptions:null,sketchStyle:null,wfsCache:{},layerCache:{},initialize:function(a,b){OpenLayers.Control.prototype.initialize.apply(this,[b]);this.callbacks=OpenLayers.Util.extend({done:this.select,click:this.select},this.callbacks);
-this.handlerOptions=this.handlerOptions||{};this.layerOptions=OpenLayers.Util.applyDefaults(this.layerOptions,{displayInLayerSwitcher:!1,tileOptions:{maxGetUrlLength:2048}});this.sketchStyle&&(this.handlerOptions.layerOptions=OpenLayers.Util.applyDefaults(this.handlerOptions.layerOptions,{styleMap:new OpenLayers.StyleMap({"default":this.sketchStyle})}));this.handler=new a(this,this.callbacks,this.handlerOptions)},destroy:function(){for(var a in this.layerCache)delete this.layerCache[a];for(a in this.wfsCache)delete this.wfsCache[a];
-OpenLayers.Control.prototype.destroy.apply(this,arguments)},coupleLayerVisiblity:function(a){this.setVisibility(a.object.getVisibility())},createSelectionLayer:function(a){var b;if(this.layerCache[a.id])b=this.layerCache[a.id];else{b=new OpenLayers.Layer.WMS(a.name,a.url,a.params,OpenLayers.Util.applyDefaults(this.layerOptions,a.getOptions()));this.layerCache[a.id]=b;if(!1===this.layerOptions.displayInLayerSwitcher)a.events.on({visibilitychanged:this.coupleLayerVisiblity,scope:b});this.map.addLayer(b)}return b},
-createSLD:function(a,b,c){for(var d={version:"1.0.0",namedLayers:{}},e=(""+a.params.LAYERS).split(","),f=0,g=e.length;f<g;f++){var h=e[f];d.namedLayers[h]={name:h,userStyles:[]};var k=this.selectionSymbolizer,l=c[f];0<=l.type.indexOf("Polygon")?k={Polygon:this.selectionSymbolizer.Polygon}:0<=l.type.indexOf("LineString")?k={Line:this.selectionSymbolizer.Line}:0<=l.type.indexOf("Point")&&(k={Point:this.selectionSymbolizer.Point});d.namedLayers[h].userStyles.push({name:"default",rules:[new OpenLayers.Rule({symbolizer:k,
-filter:b[f],maxScaleDenominator:a.options.minScale})]})}return(new OpenLayers.Format.SLD({srsName:this.map.getProjection()})).write(d)},parseDescribeLayer:function(a){var b=new OpenLayers.Format.WMSDescribeLayer,c=a.responseXML;c&&c.documentElement||(c=a.responseText);a=b.read(c);for(var b=[],c=null,d=0,e=a.length;d<e;d++)"WFS"==a[d].owsType&&(b.push(a[d].typeName),c=a[d].owsURL);OpenLayers.Request.GET({url:c,params:{SERVICE:"WFS",TYPENAME:b.toString(),REQUEST:"DescribeFeatureType",VERSION:"1.0.0"},
-callback:function(a){var b=new OpenLayers.Format.WFSDescribeFeatureType,c=a.responseXML;c&&c.documentElement||(c=a.responseText);a=b.read(c);this.control.wfsCache[this.layer.id]=a;this.control._queue&&this.control.applySelection()},scope:this})},getGeometryAttributes:function(a){var b=[];a=this.wfsCache[a.id];for(var c=0,d=a.featureTypes.length;c<d;c++)for(var e=a.featureTypes[c].properties,f=0,g=e.length;f<g;f++){var h=e[f],k=h.type;(0<=k.indexOf("LineString")||0<=k.indexOf("GeometryAssociationType")||
-0<=k.indexOf("GeometryPropertyType")||0<=k.indexOf("Point")||0<=k.indexOf("Polygon"))&&b.push(h)}return b},activate:function(){var a=OpenLayers.Control.prototype.activate.call(this);if(a)for(var b=0,c=this.layers.length;b<c;b++){var d=this.layers[b];d&&!this.wfsCache[d.id]&&OpenLayers.Request.GET({url:d.url,params:{SERVICE:"WMS",VERSION:d.params.VERSION,LAYERS:d.params.LAYERS,REQUEST:"DescribeLayer"},callback:this.parseDescribeLayer,scope:{layer:d,control:this}})}return a},deactivate:function(){var a=
-OpenLayers.Control.prototype.deactivate.call(this);if(a)for(var b=0,c=this.layers.length;b<c;b++){var d=this.layers[b];if(d&&!0===this.clearOnDeactivate){var e=this.layerCache,f=e[d.id];f&&(d.events.un({visibilitychanged:this.coupleLayerVisiblity,scope:f}),f.destroy(),delete e[d.id])}}return a},setLayers:function(a){this.active?(this.deactivate(),this.layers=a,this.activate()):this.layers=a},createFilter:function(a,b){var c=null;this.handler instanceof OpenLayers.Handler.RegularPolygon?c=!0===this.handler.irregular?
-new OpenLayers.Filter.Spatial({type:OpenLayers.Filter.Spatial.BBOX,property:a.name,value:b.getBounds()}):new OpenLayers.Filter.Spatial({type:OpenLayers.Filter.Spatial.INTERSECTS,property:a.name,value:b}):this.handler instanceof OpenLayers.Handler.Polygon?c=new OpenLayers.Filter.Spatial({type:OpenLayers.Filter.Spatial.INTERSECTS,property:a.name,value:b}):this.handler instanceof OpenLayers.Handler.Path?c=0<=a.type.indexOf("Point")?new OpenLayers.Filter.Spatial({type:OpenLayers.Filter.Spatial.DWITHIN,
-property:a.name,distance:0.01*this.map.getExtent().getWidth(),distanceUnits:this.map.getUnits(),value:b}):new OpenLayers.Filter.Spatial({type:OpenLayers.Filter.Spatial.INTERSECTS,property:a.name,value:b}):this.handler instanceof OpenLayers.Handler.Click&&(c=0<=a.type.indexOf("Polygon")?new OpenLayers.Filter.Spatial({type:OpenLayers.Filter.Spatial.INTERSECTS,property:a.name,value:b}):new OpenLayers.Filter.Spatial({type:OpenLayers.Filter.Spatial.DWITHIN,property:a.name,distance:0.01*this.map.getExtent().getWidth(),
-distanceUnits:this.map.getUnits(),value:b}));return c},select:function(a){this._queue=function(){for(var b=0,c=this.layers.length;b<c;b++){for(var d=this.layers[b],e=this.getGeometryAttributes(d),f=[],g=0,h=e.length;g<h;g++){var k=e[g];if(null!==k){if(!(a instanceof OpenLayers.Geometry)){var l=this.map.getLonLatFromPixel(a.xy);a=new OpenLayers.Geometry.Point(l.lon,l.lat)}k=this.createFilter(k,a);null!==k&&f.push(k)}}g=this.createSelectionLayer(d);this.events.triggerEvent("selected",{layer:d,filters:f});
-d=this.createSLD(d,f,e);g.mergeNewParams({SLD_BODY:d});delete this._queue}};this.applySelection()},applySelection:function(){for(var a=!0,b=0,c=this.layers.length;b<c;b++)if(!this.wfsCache[this.layers[b].id]){a=!1;break}a&&this._queue.call(this)},CLASS_NAME:"OpenLayers.Control.SLDSelect"});OpenLayers.Control.Scale=OpenLayers.Class(OpenLayers.Control,{element:null,geodesic:!1,initialize:function(a,b){OpenLayers.Control.prototype.initialize.apply(this,[b]);this.element=OpenLayers.Util.getElement(a)},draw:function(){OpenLayers.Control.prototype.draw.apply(this,arguments);this.element||(this.element=document.createElement("div"),this.div.appendChild(this.element));this.map.events.register("moveend",this,this.updateScale);this.updateScale();return this.div},updateScale:function(){var a;
-if(!0===this.geodesic){if(!this.map.getUnits())return;a=OpenLayers.INCHES_PER_UNIT;a=(this.map.getGeodesicPixelSize().w||1E-6)*a.km*OpenLayers.DOTS_PER_INCH}else a=this.map.getScale();a&&(a=9500<=a&&95E4>=a?Math.round(a/1E3)+"K":95E4<=a?Math.round(a/1E6)+"M":Math.round(a),this.element.innerHTML=OpenLayers.i18n("Scale = 1 : ${scaleDenom}",{scaleDenom:a}))},CLASS_NAME:"OpenLayers.Control.Scale"});OpenLayers.Layer.MapGuide=OpenLayers.Class(OpenLayers.Layer.Grid,{isBaseLayer:!0,useHttpTile:!1,singleTile:!1,useOverlay:!1,useAsyncOverlay:!0,TILE_PARAMS:{operation:"GETTILEIMAGE",version:"1.2.0"},SINGLE_TILE_PARAMS:{operation:"GETMAPIMAGE",format:"PNG",locale:"en",clip:"1",version:"1.0.0"},OVERLAY_PARAMS:{operation:"GETDYNAMICMAPOVERLAYIMAGE",format:"PNG",locale:"en",clip:"1",version:"2.0.0"},FOLDER_PARAMS:{tileColumnsPerFolder:30,tileRowsPerFolder:30,format:"png",querystring:null},defaultSize:new OpenLayers.Size(300,
-300),tileOriginCorner:"tl",initialize:function(a,b,c,d){OpenLayers.Layer.Grid.prototype.initialize.apply(this,arguments);if(null==d||null==d.isBaseLayer)this.isBaseLayer="true"!=this.transparent&&!0!=this.transparent;d&&null!=d.useOverlay&&(this.useOverlay=d.useOverlay);this.singleTile?this.useOverlay?(OpenLayers.Util.applyDefaults(this.params,this.OVERLAY_PARAMS),this.useAsyncOverlay||(this.params.version="1.0.0")):OpenLayers.Util.applyDefaults(this.params,this.SINGLE_TILE_PARAMS):(this.useHttpTile?
-OpenLayers.Util.applyDefaults(this.params,this.FOLDER_PARAMS):OpenLayers.Util.applyDefaults(this.params,this.TILE_PARAMS),this.setTileSize(this.defaultSize))},clone:function(a){null==a&&(a=new OpenLayers.Layer.MapGuide(this.name,this.url,this.params,this.getOptions()));return a=OpenLayers.Layer.Grid.prototype.clone.apply(this,[a])},getURL:function(a){var b;b=a.getCenterLonLat();var c=this.map.getSize();this.singleTile?(a={setdisplaydpi:OpenLayers.DOTS_PER_INCH,setdisplayheight:c.h*this.ratio,setdisplaywidth:c.w*
-this.ratio,setviewcenterx:b.lon,setviewcentery:b.lat,setviewscale:this.map.getScale()},this.useOverlay&&!this.useAsyncOverlay&&(b={},b=OpenLayers.Util.extend(b,a),b.operation="GETVISIBLEMAPEXTENT",b.version="1.0.0",b.session=this.params.session,b.mapName=this.params.mapName,b.format="text/xml",b=this.getFullRequestString(b),OpenLayers.Request.GET({url:b,async:!1})),b=this.getFullRequestString(a)):(c=this.map.getResolution(),b=Math.floor((a.left-this.maxExtent.left)/c),b=Math.round(b/this.tileSize.w),
-a=Math.floor((this.maxExtent.top-a.top)/c),a=Math.round(a/this.tileSize.h),b=this.useHttpTile?this.getImageFilePath({tilecol:b,tilerow:a,scaleindex:this.resolutions.length-this.map.zoom-1}):this.getFullRequestString({tilecol:b,tilerow:a,scaleindex:this.resolutions.length-this.map.zoom-1}));return b},getFullRequestString:function(a,b){var c=null==b?this.url:b;"object"==typeof c&&(c=c[Math.floor(Math.random()*c.length)]);var d=c,e=OpenLayers.Util.extend({},this.params),e=OpenLayers.Util.extend(e,a),
-f=OpenLayers.Util.upperCaseObject(OpenLayers.Util.getParameters(c)),g;for(g in e)g.toUpperCase()in f&&delete e[g];e=OpenLayers.Util.getParameterString(e);e=e.replace(/,/g,"+");""!=e&&(f=c.charAt(c.length-1),d="&"==f||"?"==f?d+e:-1==c.indexOf("?")?d+("?"+e):d+("&"+e));return d},getImageFilePath:function(a,b){var c=null==b?this.url:b;"object"==typeof c&&(c=c[Math.floor(Math.random()*c.length)]);var d="",e="";0>a.tilerow&&(d="-");d=0==a.tilerow?d+"0":d+Math.floor(Math.abs(a.tilerow/this.params.tileRowsPerFolder))*
-this.params.tileRowsPerFolder;0>a.tilecol&&(e="-");e=0==a.tilecol?e+"0":e+Math.floor(Math.abs(a.tilecol/this.params.tileColumnsPerFolder))*this.params.tileColumnsPerFolder;d="/S"+Math.floor(a.scaleindex)+"/"+this.params.basemaplayergroupname+"/R"+d+"/C"+e+"/"+a.tilerow%this.params.tileRowsPerFolder+"_"+a.tilecol%this.params.tileColumnsPerFolder+"."+this.params.format;this.params.querystring&&(d+="?"+this.params.querystring);return c+d},CLASS_NAME:"OpenLayers.Layer.MapGuide"});OpenLayers.Control.Measure=OpenLayers.Class(OpenLayers.Control,{callbacks:null,displaySystem:"metric",geodesic:!1,displaySystemUnits:{geographic:["dd"],english:["mi","ft","in"],metric:["km","m"]},partialDelay:300,delayedTrigger:null,persist:!1,immediate:!1,initialize:function(a,b){OpenLayers.Control.prototype.initialize.apply(this,[b]);var c={done:this.measureComplete,point:this.measurePartial};this.immediate&&(c.modify=this.measureImmediate);this.callbacks=OpenLayers.Util.extend(c,this.callbacks);
-this.handlerOptions=OpenLayers.Util.extend({persist:this.persist},this.handlerOptions);this.handler=new a(this,this.callbacks,this.handlerOptions)},deactivate:function(){this.cancelDelay();return OpenLayers.Control.prototype.deactivate.apply(this,arguments)},cancel:function(){this.cancelDelay();this.handler.cancel()},setImmediate:function(a){(this.immediate=a)?this.callbacks.modify=this.measureImmediate:delete this.callbacks.modify},updateHandler:function(a,b){var c=this.active;c&&this.deactivate();
-this.handler=new a(this,this.callbacks,b);c&&this.activate()},measureComplete:function(a){this.cancelDelay();this.measure(a,"measure")},measurePartial:function(a,b){this.cancelDelay();b=b.clone();this.handler.freehandMode(this.handler.evt)?this.measure(b,"measurepartial"):this.delayedTrigger=window.setTimeout(OpenLayers.Function.bind(function(){this.delayedTrigger=null;this.measure(b,"measurepartial")},this),this.partialDelay)},measureImmediate:function(a,b,c){c&&!this.handler.freehandMode(this.handler.evt)&&
-(this.cancelDelay(),this.measure(b.geometry,"measurepartial"))},cancelDelay:function(){null!==this.delayedTrigger&&(window.clearTimeout(this.delayedTrigger),this.delayedTrigger=null)},measure:function(a,b){var c,d;-1<a.CLASS_NAME.indexOf("LineString")?(c=this.getBestLength(a),d=1):(c=this.getBestArea(a),d=2);this.events.triggerEvent(b,{measure:c[0],units:c[1],order:d,geometry:a})},getBestArea:function(a){for(var b=this.displaySystemUnits[this.displaySystem],c,d,e=0,f=b.length;e<f&&!(c=b[e],d=this.getArea(a,
-c),1<d);++e);return[d,c]},getArea:function(a,b){var c,d;this.geodesic?(c=a.getGeodesicArea(this.map.getProjectionObject()),d="m"):(c=a.getArea(),d=this.map.getUnits());var e=OpenLayers.INCHES_PER_UNIT[b];e&&(c*=Math.pow(OpenLayers.INCHES_PER_UNIT[d]/e,2));return c},getBestLength:function(a){for(var b=this.displaySystemUnits[this.displaySystem],c,d,e=0,f=b.length;e<f&&!(c=b[e],d=this.getLength(a,c),1<d);++e);return[d,c]},getLength:function(a,b){var c,d;this.geodesic?(c=a.getGeodesicLength(this.map.getProjectionObject()),
-d="m"):(c=a.getLength(),d=this.map.getUnits());var e=OpenLayers.INCHES_PER_UNIT[b];e&&(c*=OpenLayers.INCHES_PER_UNIT[d]/e);return c},CLASS_NAME:"OpenLayers.Control.Measure"});OpenLayers.Format.WMC.v1_0_0=OpenLayers.Class(OpenLayers.Format.WMC.v1,{VERSION:"1.0.0",schemaLocation:"http://www.opengis.net/context http://schemas.opengis.net/context/1.0.0/context.xsd",initialize:function(a){OpenLayers.Format.WMC.v1.prototype.initialize.apply(this,[a])},read_wmc_SRS:function(a,b){var c=this.getChildValue(b);"object"!=typeof a.projections&&(a.projections={});for(var c=c.split(/ +/),d=0,e=c.length;d<e;d++)a.projections[c[d]]=!0},write_wmc_Layer:function(a){var b=OpenLayers.Format.WMC.v1.prototype.write_wmc_Layer.apply(this,
-[a]);if(a.srs){var c=[],d;for(d in a.srs)c.push(d);b.appendChild(this.createElementDefaultNS("SRS",c.join(" ")))}b.appendChild(this.write_wmc_FormatList(a));b.appendChild(this.write_wmc_StyleList(a));a.dimensions&&b.appendChild(this.write_wmc_DimensionList(a));b.appendChild(this.write_wmc_LayerExtension(a))},CLASS_NAME:"OpenLayers.Format.WMC.v1_0_0"});OpenLayers.Popup.Anchored=OpenLayers.Class(OpenLayers.Popup,{relativePosition:null,keepInMap:!0,anchor:null,initialize:function(a,b,c,d,e,f,g){OpenLayers.Popup.prototype.initialize.apply(this,[a,b,c,d,f,g]);this.anchor=null!=e?e:{size:new OpenLayers.Size(0,0),offset:new OpenLayers.Pixel(0,0)}},destroy:function(){this.relativePosition=this.anchor=null;OpenLayers.Popup.prototype.destroy.apply(this,arguments)},show:function(){this.updatePosition();OpenLayers.Popup.prototype.show.apply(this,arguments)},
-moveTo:function(a){var b=this.relativePosition;this.relativePosition=this.calculateRelativePosition(a);OpenLayers.Popup.prototype.moveTo.call(this,this.calculateNewPx(a));this.relativePosition!=b&&this.updateRelativePosition()},setSize:function(a){OpenLayers.Popup.prototype.setSize.apply(this,arguments);if(this.lonlat&&this.map){var b=this.map.getLayerPxFromLonLat(this.lonlat);this.moveTo(b)}},calculateRelativePosition:function(a){a=this.map.getLonLatFromLayerPx(a);a=this.map.getExtent().determineQuadrant(a);
-return OpenLayers.Bounds.oppositeQuadrant(a)},updateRelativePosition:function(){},calculateNewPx:function(a){a=a.offset(this.anchor.offset);var b=this.size||this.contentSize,c="t"==this.relativePosition.charAt(0);a.y+=c?-b.h:this.anchor.size.h;c="l"==this.relativePosition.charAt(1);a.x+=c?-b.w:this.anchor.size.w;return a},CLASS_NAME:"OpenLayers.Popup.Anchored"});OpenLayers.Popup.Framed=OpenLayers.Class(OpenLayers.Popup.Anchored,{imageSrc:null,imageSize:null,isAlphaImage:!1,positionBlocks:null,blocks:null,fixedRelativePosition:!1,initialize:function(a,b,c,d,e,f,g){OpenLayers.Popup.Anchored.prototype.initialize.apply(this,arguments);this.fixedRelativePosition&&(this.updateRelativePosition(),this.calculateRelativePosition=function(a){return this.relativePosition});this.contentDiv.style.position="absolute";this.contentDiv.style.zIndex=1;f&&(this.closeDiv.style.zIndex=
-1);this.groupDiv.style.position="absolute";this.groupDiv.style.top="0px";this.groupDiv.style.left="0px";this.groupDiv.style.height="100%";this.groupDiv.style.width="100%"},destroy:function(){this.isAlphaImage=this.imageSize=this.imageSrc=null;this.fixedRelativePosition=!1;this.positionBlocks=null;for(var a=0;a<this.blocks.length;a++){var b=this.blocks[a];b.image&&b.div.removeChild(b.image);b.image=null;b.div&&this.groupDiv.removeChild(b.div);b.div=null}this.blocks=null;OpenLayers.Popup.Anchored.prototype.destroy.apply(this,
-arguments)},setBackgroundColor:function(a){},setBorder:function(){},setOpacity:function(a){},setSize:function(a){OpenLayers.Popup.Anchored.prototype.setSize.apply(this,arguments);this.updateBlocks()},updateRelativePosition:function(){this.padding=this.positionBlocks[this.relativePosition].padding;if(this.closeDiv){var a=this.getContentDivPadding();this.closeDiv.style.right=a.right+this.padding.right+"px";this.closeDiv.style.top=a.top+this.padding.top+"px"}this.updateBlocks()},calculateNewPx:function(a){var b=
-OpenLayers.Popup.Anchored.prototype.calculateNewPx.apply(this,arguments);return b=b.offset(this.positionBlocks[this.relativePosition].offset)},createBlocks:function(){this.blocks=[];var a=null,b;for(b in this.positionBlocks){a=b;break}a=this.positionBlocks[a];for(b=0;b<a.blocks.length;b++){var c={};this.blocks.push(c);c.div=OpenLayers.Util.createDiv(this.id+"_FrameDecorationDiv_"+b,null,null,null,"absolute",null,"hidden",null);c.image=(this.isAlphaImage?OpenLayers.Util.createAlphaImageDiv:OpenLayers.Util.createImage)(this.id+
-"_FrameDecorationImg_"+b,null,this.imageSize,this.imageSrc,"absolute",null,null,null);c.div.appendChild(c.image);this.groupDiv.appendChild(c.div)}},updateBlocks:function(){this.blocks||this.createBlocks();if(this.size&&this.relativePosition){for(var a=this.positionBlocks[this.relativePosition],b=0;b<a.blocks.length;b++){var c=a.blocks[b],d=this.blocks[b],e=c.anchor.left,f=c.anchor.bottom,g=c.anchor.right,h=c.anchor.top,k=isNaN(c.size.w)?this.size.w-(g+e):c.size.w,l=isNaN(c.size.h)?this.size.h-(f+
-h):c.size.h;d.div.style.width=(0>k?0:k)+"px";d.div.style.height=(0>l?0:l)+"px";d.div.style.left=null!=e?e+"px":"";d.div.style.bottom=null!=f?f+"px":"";d.div.style.right=null!=g?g+"px":"";d.div.style.top=null!=h?h+"px":"";d.image.style.left=c.position.x+"px";d.image.style.top=c.position.y+"px"}this.contentDiv.style.left=this.padding.left+"px";this.contentDiv.style.top=this.padding.top+"px"}},CLASS_NAME:"OpenLayers.Popup.Framed"});OpenLayers.Popup.FramedCloud=OpenLayers.Class(OpenLayers.Popup.Framed,{contentDisplayClass:"olFramedCloudPopupContent",autoSize:!0,panMapIfOutOfView:!0,imageSize:new OpenLayers.Size(1276,736),isAlphaImage:!1,fixedRelativePosition:!1,positionBlocks:{tl:{offset:new OpenLayers.Pixel(44,0),padding:new OpenLayers.Bounds(8,40,8,9),blocks:[{size:new OpenLayers.Size("auto","auto"),anchor:new OpenLayers.Bounds(0,51,22,0),position:new OpenLayers.Pixel(0,0)},{size:new OpenLayers.Size(22,"auto"),anchor:new OpenLayers.Bounds(null,
-50,0,0),position:new OpenLayers.Pixel(-1238,0)},{size:new OpenLayers.Size("auto",19),anchor:new OpenLayers.Bounds(0,32,22,null),position:new OpenLayers.Pixel(0,-631)},{size:new OpenLayers.Size(22,18),anchor:new OpenLayers.Bounds(null,32,0,null),position:new OpenLayers.Pixel(-1238,-632)},{size:new OpenLayers.Size(81,35),anchor:new OpenLayers.Bounds(null,0,0,null),position:new OpenLayers.Pixel(0,-688)}]},tr:{offset:new OpenLayers.Pixel(-45,0),padding:new OpenLayers.Bounds(8,40,8,9),blocks:[{size:new OpenLayers.Size("auto",
-"auto"),anchor:new OpenLayers.Bounds(0,51,22,0),position:new OpenLayers.Pixel(0,0)},{size:new OpenLayers.Size(22,"auto"),anchor:new OpenLayers.Bounds(null,50,0,0),position:new OpenLayers.Pixel(-1238,0)},{size:new OpenLayers.Size("auto",19),anchor:new OpenLayers.Bounds(0,32,22,null),position:new OpenLayers.Pixel(0,-631)},{size:new OpenLayers.Size(22,19),anchor:new OpenLayers.Bounds(null,32,0,null),position:new OpenLayers.Pixel(-1238,-631)},{size:new OpenLayers.Size(81,35),anchor:new OpenLayers.Bounds(0,
-0,null,null),position:new OpenLayers.Pixel(-215,-687)}]},bl:{offset:new OpenLayers.Pixel(45,0),padding:new OpenLayers.Bounds(8,9,8,40),blocks:[{size:new OpenLayers.Size("auto","auto"),anchor:new OpenLayers.Bounds(0,21,22,32),position:new OpenLayers.Pixel(0,0)},{size:new OpenLayers.Size(22,"auto"),anchor:new OpenLayers.Bounds(null,21,0,32),position:new OpenLayers.Pixel(-1238,0)},{size:new OpenLayers.Size("auto",21),anchor:new OpenLayers.Bounds(0,0,22,null),position:new OpenLayers.Pixel(0,-629)},{size:new OpenLayers.Size(22,
-21),anchor:new OpenLayers.Bounds(null,0,0,null),position:new OpenLayers.Pixel(-1238,-629)},{size:new OpenLayers.Size(81,33),anchor:new OpenLayers.Bounds(null,null,0,0),position:new OpenLayers.Pixel(-101,-674)}]},br:{offset:new OpenLayers.Pixel(-44,0),padding:new OpenLayers.Bounds(8,9,8,40),blocks:[{size:new OpenLayers.Size("auto","auto"),anchor:new OpenLayers.Bounds(0,21,22,32),position:new OpenLayers.Pixel(0,0)},{size:new OpenLayers.Size(22,"auto"),anchor:new OpenLayers.Bounds(null,21,0,32),position:new OpenLayers.Pixel(-1238,
-0)},{size:new OpenLayers.Size("auto",21),anchor:new OpenLayers.Bounds(0,0,22,null),position:new OpenLayers.Pixel(0,-629)},{size:new OpenLayers.Size(22,21),anchor:new OpenLayers.Bounds(null,0,0,null),position:new OpenLayers.Pixel(-1238,-629)},{size:new OpenLayers.Size(81,33),anchor:new OpenLayers.Bounds(0,null,null,0),position:new OpenLayers.Pixel(-311,-674)}]}},minSize:new OpenLayers.Size(105,10),maxSize:new OpenLayers.Size(1200,660),initialize:function(a,b,c,d,e,f,g){this.imageSrc=OpenLayers.Util.getImageLocation("cloud-popup-relative.png");
-OpenLayers.Popup.Framed.prototype.initialize.apply(this,arguments);this.contentDiv.className=this.contentDisplayClass},CLASS_NAME:"OpenLayers.Popup.FramedCloud"});OpenLayers.Tile.Image.IFrame={useIFrame:null,blankImageUrl:"data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAQAIBRAA7",draw:function(){if(OpenLayers.Tile.Image.prototype.shouldDraw.call(this)){var a=this.layer.getURL(this.bounds),b=this.useIFrame;this.useIFrame=null!==this.maxGetUrlLength&&!this.layer.async&&a.length>this.maxGetUrlLength;a=b&&!this.useIFrame;b=!b&&this.useIFrame;if(a||b)this.imgDiv&&this.imgDiv.parentNode===this.frame&&this.frame.removeChild(this.imgDiv),this.imgDiv=
-null,a&&this.frame.removeChild(this.frame.firstChild)}return OpenLayers.Tile.Image.prototype.draw.apply(this,arguments)},getImage:function(){if(!0===this.useIFrame){if(!this.frame.childNodes.length){var a=document.createElement("div"),b=a.style;b.position="absolute";b.width="100%";b.height="100%";b.zIndex=1;b.backgroundImage="url("+this.blankImageUrl+")";this.frame.appendChild(a)}a=this.id+"_iFrame";9>parseFloat(navigator.appVersion.split("MSIE")[1])?(b=document.createElement('<iframe name="'+a+'">'),
-b.style.backgroundColor="#FFFFFF",b.style.filter="chroma(color=#FFFFFF)"):(b=document.createElement("iframe"),b.style.backgroundColor="transparent",b.name=a);b.scrolling="no";b.marginWidth="0px";b.marginHeight="0px";b.frameBorder="0";b.style.position="absolute";b.style.width="100%";b.style.height="100%";1>this.layer.opacity&&OpenLayers.Util.modifyDOMElement(b,null,null,null,null,null,null,this.layer.opacity);this.frame.appendChild(b);return this.imgDiv=b}return OpenLayers.Tile.Image.prototype.getImage.apply(this,
-arguments)},createRequestForm:function(){var a=document.createElement("form");a.method="POST";var b=this.layer.params._OLSALT,b=(b?b+"_":"")+this.bounds.toBBOX();a.action=OpenLayers.Util.urlAppend(this.layer.url,b);a.target=this.id+"_iFrame";this.layer.getImageSize();var b=OpenLayers.Util.getParameters(this.url),c,d;for(d in b)c=document.createElement("input"),c.type="hidden",c.name=d,c.value=b[d],a.appendChild(c);return a},setImgSrc:function(a){if(!0===this.useIFrame)if(a){var b=this.createRequestForm();
-this.frame.appendChild(b);b.submit();this.frame.removeChild(b)}else this.imgDiv.parentNode===this.frame&&(this.frame.removeChild(this.imgDiv),this.imgDiv=null);else OpenLayers.Tile.Image.prototype.setImgSrc.apply(this,arguments)},onImageLoad:function(){OpenLayers.Tile.Image.prototype.onImageLoad.apply(this,arguments);!0===this.useIFrame&&(this.imgDiv.style.opacity=1,this.frame.style.opacity=this.layer.opacity)},createBackBuffer:function(){var a;!1===this.useIFrame&&(a=OpenLayers.Tile.Image.prototype.createBackBuffer.call(this));
-return a}};OpenLayers.Format.SOSCapabilities=OpenLayers.Class(OpenLayers.Format.XML.VersionedOGC,{defaultVersion:"1.0.0",CLASS_NAME:"OpenLayers.Format.SOSCapabilities"});OpenLayers.Format.SOSCapabilities.v1_0_0=OpenLayers.Class(OpenLayers.Format.SOSCapabilities,{namespaces:{ows:"http://www.opengis.net/ows/1.1",sos:"http://www.opengis.net/sos/1.0",gml:"http://www.opengis.net/gml",xlink:"http://www.w3.org/1999/xlink"},regExes:{trimSpace:/^\s*|\s*$/g,removeSpace:/\s*/g,splitSpace:/\s+/,trimComma:/\s*,\s*/g},initialize:function(a){OpenLayers.Format.XML.prototype.initialize.apply(this,[a]);this.options=a},read:function(a){"string"==typeof a&&(a=OpenLayers.Format.XML.prototype.read.apply(this,
-[a]));a&&9==a.nodeType&&(a=a.documentElement);var b={};this.readNode(a,b);return b},readers:{gml:OpenLayers.Util.applyDefaults({name:function(a,b){b.name=this.getChildValue(a)},TimePeriod:function(a,b){b.timePeriod={};this.readChildNodes(a,b.timePeriod)},beginPosition:function(a,b){b.beginPosition=this.getChildValue(a)},endPosition:function(a,b){b.endPosition=this.getChildValue(a)}},OpenLayers.Format.GML.v3.prototype.readers.gml),sos:{Capabilities:function(a,b){this.readChildNodes(a,b)},Contents:function(a,
-b){b.contents={};this.readChildNodes(a,b.contents)},ObservationOfferingList:function(a,b){b.offeringList={};this.readChildNodes(a,b.offeringList)},ObservationOffering:function(a,b){var c=this.getAttributeNS(a,this.namespaces.gml,"id");b[c]={procedures:[],observedProperties:[],featureOfInterestIds:[],responseFormats:[],resultModels:[],responseModes:[]};this.readChildNodes(a,b[c])},time:function(a,b){b.time={};this.readChildNodes(a,b.time)},procedure:function(a,b){b.procedures.push(this.getAttributeNS(a,
-this.namespaces.xlink,"href"))},observedProperty:function(a,b){b.observedProperties.push(this.getAttributeNS(a,this.namespaces.xlink,"href"))},featureOfInterest:function(a,b){b.featureOfInterestIds.push(this.getAttributeNS(a,this.namespaces.xlink,"href"))},responseFormat:function(a,b){b.responseFormats.push(this.getChildValue(a))},resultModel:function(a,b){b.resultModels.push(this.getChildValue(a))},responseMode:function(a,b){b.responseModes.push(this.getChildValue(a))}},ows:OpenLayers.Format.OWSCommon.v1_1_0.prototype.readers.ows},
-CLASS_NAME:"OpenLayers.Format.SOSCapabilities.v1_0_0"});OpenLayers.Handler.Pinch=OpenLayers.Class(OpenLayers.Handler,{started:!1,stopDown:!1,pinching:!1,last:null,start:null,touchstart:function(a){var b=!0;this.pinching=!1;if(OpenLayers.Event.isMultiTouch(a))this.started=!0,this.last=this.start={distance:this.getDistance(a.touches),delta:0,scale:1},this.callback("start",[a,this.start]),b=!this.stopDown;else{if(this.started)return!1;this.started=!1;this.last=this.start=null}OpenLayers.Event.preventDefault(a);return b},touchmove:function(a){if(this.started&&
-OpenLayers.Event.isMultiTouch(a)){this.pinching=!0;var b=this.getPinchData(a);this.callback("move",[a,b]);this.last=b;OpenLayers.Event.stop(a)}else if(this.started)return!1;return!0},touchend:function(a){return this.started&&!OpenLayers.Event.isMultiTouch(a)?(this.pinching=this.started=!1,this.callback("done",[a,this.start,this.last]),this.last=this.start=null,!1):!0},activate:function(){var a=!1;OpenLayers.Handler.prototype.activate.apply(this,arguments)&&(this.pinching=!1,a=!0);return a},deactivate:function(){var a=
-!1;OpenLayers.Handler.prototype.deactivate.apply(this,arguments)&&(this.pinching=this.started=!1,this.last=this.start=null,a=!0);return a},getDistance:function(a){var b=a[0];a=a[1];return Math.sqrt(Math.pow(b.olClientX-a.olClientX,2)+Math.pow(b.olClientY-a.olClientY,2))},getPinchData:function(a){a=this.getDistance(a.touches);return{distance:a,delta:this.last.distance-a,scale:a/this.start.distance}},CLASS_NAME:"OpenLayers.Handler.Pinch"});OpenLayers.Control.NavToolbar=OpenLayers.Class(OpenLayers.Control.Panel,{initialize:function(a){OpenLayers.Control.Panel.prototype.initialize.apply(this,[a]);this.addControls([new OpenLayers.Control.Navigation,new OpenLayers.Control.ZoomBox])},draw:function(){var a=OpenLayers.Control.Panel.prototype.draw.apply(this,arguments);null===this.defaultControl&&(this.defaultControl=this.controls[0]);return a},CLASS_NAME:"OpenLayers.Control.NavToolbar"});OpenLayers.Strategy.Refresh=OpenLayers.Class(OpenLayers.Strategy,{force:!1,interval:0,timer:null,activate:function(){var a=OpenLayers.Strategy.prototype.activate.call(this);a&&(!0===this.layer.visibility&&this.start(),this.layer.events.on({visibilitychanged:this.reset,scope:this}));return a},deactivate:function(){var a=OpenLayers.Strategy.prototype.deactivate.call(this);a&&(this.stop(),this.layer.events.un({visibilitychanged:this.reset,scope:this}));return a},reset:function(){!0===this.layer.visibility?
-this.start():this.stop()},start:function(){this.interval&&("number"===typeof this.interval&&0<this.interval)&&(this.timer=window.setInterval(OpenLayers.Function.bind(this.refresh,this),this.interval))},refresh:function(){this.layer&&(this.layer.refresh&&"function"==typeof this.layer.refresh)&&this.layer.refresh({force:this.force})},stop:function(){null!==this.timer&&(window.clearInterval(this.timer),this.timer=null)},CLASS_NAME:"OpenLayers.Strategy.Refresh"});OpenLayers.Layer.ArcGIS93Rest=OpenLayers.Class(OpenLayers.Layer.Grid,{DEFAULT_PARAMS:{format:"png"},isBaseLayer:!0,initialize:function(a,b,c,d){var e=[];c=OpenLayers.Util.upperCaseObject(c);e.push(a,b,c,d);OpenLayers.Layer.Grid.prototype.initialize.apply(this,e);OpenLayers.Util.applyDefaults(this.params,OpenLayers.Util.upperCaseObject(this.DEFAULT_PARAMS));this.params.TRANSPARENT&&"true"==this.params.TRANSPARENT.toString().toLowerCase()&&(null!=d&&d.isBaseLayer||(this.isBaseLayer=!1),"jpg"==this.params.FORMAT&&
-(this.params.FORMAT=OpenLayers.Util.alphaHack()?"gif":"png"))},clone:function(a){null==a&&(a=new OpenLayers.Layer.ArcGIS93Rest(this.name,this.url,this.params,this.getOptions()));return a=OpenLayers.Layer.Grid.prototype.clone.apply(this,[a])},getURL:function(a){a=this.adjustBounds(a);var b=this.projection.getCode().split(":"),b=b[b.length-1],c=this.getImageSize();a={BBOX:a.toBBOX(),SIZE:c.w+","+c.h,F:"image",BBOXSR:b,IMAGESR:b};if(this.layerDefs){var b=[],d;for(d in this.layerDefs)this.layerDefs.hasOwnProperty(d)&&
-this.layerDefs[d]&&(b.push(d),b.push(":"),b.push(this.layerDefs[d]),b.push(";"));0<b.length&&(a.LAYERDEFS=b.join(""))}return this.getFullRequestString(a)},setLayerFilter:function(a,b){this.layerDefs||(this.layerDefs={});b?this.layerDefs[a]=b:delete this.layerDefs[a]},clearLayerFilter:function(a){a?delete this.layerDefs[a]:delete this.layerDefs},mergeNewParams:function(a){a=[OpenLayers.Util.upperCaseObject(a)];return OpenLayers.Layer.Grid.prototype.mergeNewParams.apply(this,a)},CLASS_NAME:"OpenLayers.Layer.ArcGIS93Rest"});OpenLayers.Handler.Hover=OpenLayers.Class(OpenLayers.Handler,{delay:500,pixelTolerance:null,stopMove:!1,px:null,timerId:null,mousemove:function(a){this.passesTolerance(a.xy)&&(this.clearTimer(),this.callback("move",[a]),this.px=a.xy,a=OpenLayers.Util.extend({},a),this.timerId=window.setTimeout(OpenLayers.Function.bind(this.delayedCall,this,a),this.delay));return!this.stopMove},mouseout:function(a){OpenLayers.Util.mouseLeft(a,this.map.viewPortDiv)&&(this.clearTimer(),this.callback("move",[a]));return!0},
-passesTolerance:function(a){var b=!0;this.pixelTolerance&&this.px&&Math.sqrt(Math.pow(this.px.x-a.x,2)+Math.pow(this.px.y-a.y,2))<this.pixelTolerance&&(b=!1);return b},clearTimer:function(){null!=this.timerId&&(window.clearTimeout(this.timerId),this.timerId=null)},delayedCall:function(a){this.callback("pause",[a])},deactivate:function(){var a=!1;OpenLayers.Handler.prototype.deactivate.apply(this,arguments)&&(this.clearTimer(),a=!0);return a},CLASS_NAME:"OpenLayers.Handler.Hover"});OpenLayers.Control.GetFeature=OpenLayers.Class(OpenLayers.Control,{protocol:null,multipleKey:null,toggleKey:null,modifiers:null,multiple:!1,click:!0,single:!0,clickout:!0,toggle:!1,clickTolerance:5,hover:!1,box:!1,maxFeatures:10,features:null,hoverFeature:null,handlers:null,hoverResponse:null,filterType:OpenLayers.Filter.Spatial.BBOX,initialize:function(a){a.handlerOptions=a.handlerOptions||{};OpenLayers.Control.prototype.initialize.apply(this,[a]);this.features={};this.handlers={};this.click&&(this.handlers.click=
-new OpenLayers.Handler.Click(this,{click:this.selectClick},this.handlerOptions.click||{}));this.box&&(this.handlers.box=new OpenLayers.Handler.Box(this,{done:this.selectBox},OpenLayers.Util.extend(this.handlerOptions.box,{boxDivClassName:"olHandlerBoxSelectFeature"})));this.hover&&(this.handlers.hover=new OpenLayers.Handler.Hover(this,{move:this.cancelHover,pause:this.selectHover},OpenLayers.Util.extend(this.handlerOptions.hover,{delay:250,pixelTolerance:2})))},activate:function(){if(!this.active)for(var a in this.handlers)this.handlers[a].activate();
-return OpenLayers.Control.prototype.activate.apply(this,arguments)},deactivate:function(){if(this.active)for(var a in this.handlers)this.handlers[a].deactivate();return OpenLayers.Control.prototype.deactivate.apply(this,arguments)},selectClick:function(a){var b=this.pixelToBounds(a.xy);this.setModifiers(a);this.request(b,{single:this.single})},selectBox:function(a){var b;if(a instanceof OpenLayers.Bounds)b=this.map.getLonLatFromPixel({x:a.left,y:a.bottom}),a=this.map.getLonLatFromPixel({x:a.right,
-y:a.top}),b=new OpenLayers.Bounds(b.lon,b.lat,a.lon,a.lat);else{if(this.click)return;b=this.pixelToBounds(a)}this.setModifiers(this.handlers.box.dragHandler.evt);this.request(b)},selectHover:function(a){a=this.pixelToBounds(a.xy);this.request(a,{single:!0,hover:!0})},cancelHover:function(){this.hoverResponse&&(this.protocol.abort(this.hoverResponse),this.hoverResponse=null,OpenLayers.Element.removeClass(this.map.viewPortDiv,"olCursorWait"))},request:function(a,b){b=b||{};var c=new OpenLayers.Filter.Spatial({type:this.filterType,
-value:a});OpenLayers.Element.addClass(this.map.viewPortDiv,"olCursorWait");c=this.protocol.read({maxFeatures:!0==b.single?this.maxFeatures:void 0,filter:c,callback:function(c){c.success()&&(c.features.length?!0==b.single?this.selectBestFeature(c.features,a.getCenterLonLat(),b):this.select(c.features):b.hover?this.hoverSelect():(this.events.triggerEvent("clickout"),this.clickout&&this.unselectAll()));OpenLayers.Element.removeClass(this.map.viewPortDiv,"olCursorWait")},scope:this});!0==b.hover&&(this.hoverResponse=
-c)},selectBestFeature:function(a,b,c){c=c||{};if(a.length){b=new OpenLayers.Geometry.Point(b.lon,b.lat);for(var d,e,f,g=Number.MAX_VALUE,h=0;h<a.length&&!(d=a[h],d.geometry&&(f=b.distanceTo(d.geometry,{edge:!1}),f<g&&(g=f,e=d,0==g)));++h);!0==c.hover?this.hoverSelect(e):this.select(e||a)}},setModifiers:function(a){this.modifiers={multiple:this.multiple||this.multipleKey&&a[this.multipleKey],toggle:this.toggle||this.toggleKey&&a[this.toggleKey]}},select:function(a){this.modifiers.multiple||this.modifiers.toggle||
-this.unselectAll();OpenLayers.Util.isArray(a)||(a=[a]);var b=this.events.triggerEvent("beforefeaturesselected",{features:a});if(!1!==b){for(var c=[],d,e=0,f=a.length;e<f;++e)d=a[e],this.features[d.fid||d.id]?this.modifiers.toggle&&this.unselect(this.features[d.fid||d.id]):(b=this.events.triggerEvent("beforefeatureselected",{feature:d}),!1!==b&&(this.features[d.fid||d.id]=d,c.push(d),this.events.triggerEvent("featureselected",{feature:d})));this.events.triggerEvent("featuresselected",{features:c})}},
-hoverSelect:function(a){var b=a?a.fid||a.id:null,c=this.hoverFeature?this.hoverFeature.fid||this.hoverFeature.id:null;c&&c!=b&&(this.events.triggerEvent("outfeature",{feature:this.hoverFeature}),this.hoverFeature=null);b&&b!=c&&(this.events.triggerEvent("hoverfeature",{feature:a}),this.hoverFeature=a)},unselect:function(a){delete this.features[a.fid||a.id];this.events.triggerEvent("featureunselected",{feature:a})},unselectAll:function(){for(var a in this.features)this.unselect(this.features[a])},
-setMap:function(a){for(var b in this.handlers)this.handlers[b].setMap(a);OpenLayers.Control.prototype.setMap.apply(this,arguments)},pixelToBounds:function(a){var b=a.add(-this.clickTolerance/2,this.clickTolerance/2);a=a.add(this.clickTolerance/2,-this.clickTolerance/2);b=this.map.getLonLatFromPixel(b);a=this.map.getLonLatFromPixel(a);return new OpenLayers.Bounds(b.lon,b.lat,a.lon,a.lat)},CLASS_NAME:"OpenLayers.Control.GetFeature"});OpenLayers.Format.QueryStringFilter=function(){function a(a){a=a.replace(/%/g,"\\%");a=a.replace(/\\\\\.(\*)?/g,function(a,b){return b?a:"\\\\_"});a=a.replace(/\\\\\.\*/g,"\\\\%");a=a.replace(/(\\)?\.(\*)?/g,function(a,b,c){return b||c?a:"_"});a=a.replace(/(\\)?\.\*/g,function(a,b){return b?a:"%"});a=a.replace(/\\\./g,".");return a=a.replace(/(\\)?\\\*/g,function(a,b){return b?a:"*"})}var b={};b[OpenLayers.Filter.Comparison.EQUAL_TO]="eq";b[OpenLayers.Filter.Comparison.NOT_EQUAL_TO]="ne";b[OpenLayers.Filter.Comparison.LESS_THAN]=
-"lt";b[OpenLayers.Filter.Comparison.LESS_THAN_OR_EQUAL_TO]="lte";b[OpenLayers.Filter.Comparison.GREATER_THAN]="gt";b[OpenLayers.Filter.Comparison.GREATER_THAN_OR_EQUAL_TO]="gte";b[OpenLayers.Filter.Comparison.LIKE]="ilike";return OpenLayers.Class(OpenLayers.Format,{wildcarded:!1,srsInBBOX:!1,write:function(c,d){d=d||{};var e=c.CLASS_NAME,e=e.substring(e.lastIndexOf(".")+1);switch(e){case "Spatial":switch(c.type){case OpenLayers.Filter.Spatial.BBOX:d.bbox=c.value.toArray();this.srsInBBOX&&c.projection&&
-d.bbox.push(c.projection.getCode());break;case OpenLayers.Filter.Spatial.DWITHIN:d.tolerance=c.distance;case OpenLayers.Filter.Spatial.WITHIN:d.lon=c.value.x;d.lat=c.value.y;break;default:OpenLayers.Console.warn("Unknown spatial filter type "+c.type)}break;case "Comparison":e=b[c.type];if(void 0!==e){var f=c.value;c.type==OpenLayers.Filter.Comparison.LIKE&&(f=a(f),this.wildcarded&&(f="%"+f+"%"));d[c.property+"__"+e]=f;d.queryable=d.queryable||[];d.queryable.push(c.property)}else OpenLayers.Console.warn("Unknown comparison filter type "+
-c.type);break;case "Logical":if(c.type===OpenLayers.Filter.Logical.AND)for(e=0,f=c.filters.length;e<f;e++)d=this.write(c.filters[e],d);else OpenLayers.Console.warn("Unsupported logical filter type "+c.type);break;default:OpenLayers.Console.warn("Unknown filter type "+e)}return d},CLASS_NAME:"OpenLayers.Format.QueryStringFilter"})}();OpenLayers.Control.MousePosition=OpenLayers.Class(OpenLayers.Control,{autoActivate:!0,element:null,prefix:"",separator:", ",suffix:"",numDigits:5,granularity:10,emptyString:null,lastXy:null,displayProjection:null,destroy:function(){this.deactivate();OpenLayers.Control.prototype.destroy.apply(this,arguments)},activate:function(){return OpenLayers.Control.prototype.activate.apply(this,arguments)?(this.map.events.register("mousemove",this,this.redraw),this.map.events.register("mouseout",this,this.reset),
-this.redraw(),!0):!1},deactivate:function(){return OpenLayers.Control.prototype.deactivate.apply(this,arguments)?(this.map.events.unregister("mousemove",this,this.redraw),this.map.events.unregister("mouseout",this,this.reset),this.element.innerHTML="",!0):!1},draw:function(){OpenLayers.Control.prototype.draw.apply(this,arguments);this.element||(this.div.left="",this.div.top="",this.element=this.div);return this.div},redraw:function(a){var b;if(null==a)this.reset();else if(null==this.lastXy||Math.abs(a.xy.x-
-this.lastXy.x)>this.granularity||Math.abs(a.xy.y-this.lastXy.y)>this.granularity)this.lastXy=a.xy;else if(b=this.map.getLonLatFromPixel(a.xy))this.displayProjection&&b.transform(this.map.getProjectionObject(),this.displayProjection),this.lastXy=a.xy,a=this.formatOutput(b),a!=this.element.innerHTML&&(this.element.innerHTML=a)},reset:function(a){null!=this.emptyString&&(this.element.innerHTML=this.emptyString)},formatOutput:function(a){var b=parseInt(this.numDigits);return this.prefix+a.lon.toFixed(b)+
-this.separator+a.lat.toFixed(b)+this.suffix},CLASS_NAME:"OpenLayers.Control.MousePosition"});OpenLayers.Control.Geolocate=OpenLayers.Class(OpenLayers.Control,{geolocation:null,available:"geolocation"in navigator,bind:!0,watch:!1,geolocationOptions:null,destroy:function(){this.deactivate();OpenLayers.Control.prototype.destroy.apply(this,arguments)},activate:function(){this.available&&!this.geolocation&&(this.geolocation=navigator.geolocation);return this.geolocation?OpenLayers.Control.prototype.activate.apply(this,arguments)?(this.watch?this.watchId=this.geolocation.watchPosition(OpenLayers.Function.bind(this.geolocate,
-this),OpenLayers.Function.bind(this.failure,this),this.geolocationOptions):this.getCurrentLocation(),!0):!1:(this.events.triggerEvent("locationuncapable"),!1)},deactivate:function(){this.active&&null!==this.watchId&&this.geolocation.clearWatch(this.watchId);return OpenLayers.Control.prototype.deactivate.apply(this,arguments)},geolocate:function(a){var b=(new OpenLayers.LonLat(a.coords.longitude,a.coords.latitude)).transform(new OpenLayers.Projection("EPSG:4326"),this.map.getProjectionObject());this.bind&&
-this.map.setCenter(b);this.events.triggerEvent("locationupdated",{position:a,point:new OpenLayers.Geometry.Point(b.lon,b.lat)})},getCurrentLocation:function(){if(!this.active||this.watch)return!1;this.geolocation.getCurrentPosition(OpenLayers.Function.bind(this.geolocate,this),OpenLayers.Function.bind(this.failure,this),this.geolocationOptions);return!0},failure:function(a){this.events.triggerEvent("locationfailed",{error:a})},CLASS_NAME:"OpenLayers.Control.Geolocate"});OpenLayers.Tile.UTFGrid=OpenLayers.Class(OpenLayers.Tile,{url:null,utfgridResolution:2,json:null,format:null,destroy:function(){this.clear();OpenLayers.Tile.prototype.destroy.apply(this,arguments)},draw:function(){var a=OpenLayers.Tile.prototype.draw.apply(this,arguments);if(a)if(this.isLoading?(this.abortLoading(),this.events.triggerEvent("reload")):(this.isLoading=!0,this.events.triggerEvent("loadstart")),this.url=this.layer.getURL(this.bounds),this.layer.useJSONP){var b=new OpenLayers.Protocol.Script({url:this.url,
-callback:function(a){this.isLoading=!1;this.events.triggerEvent("loadend");this.json=a.data},scope:this});b.read();this.request=b}else this.request=OpenLayers.Request.GET({url:this.url,callback:function(a){this.isLoading=!1;this.events.triggerEvent("loadend");200===a.status&&this.parseData(a.responseText)},scope:this});else this.unload();return a},abortLoading:function(){this.request&&(this.request.abort(),delete this.request);this.isLoading=!1},getFeatureInfo:function(a,b){var c=null;if(this.json){var d=
-this.getFeatureId(a,b);null!==d&&(c={id:d,data:this.json.data[d]})}return c},getFeatureId:function(a,b){var c=null;if(this.json){var d=this.utfgridResolution,d=this.json.grid[Math.floor(b/d)].charCodeAt(Math.floor(a/d)),d=this.indexFromCharCode(d),e=this.json.keys;!isNaN(d)&&d in e&&(c=e[d])}return c},indexFromCharCode:function(a){93<=a&&a--;35<=a&&a--;return a-32},parseData:function(a){this.format||(this.format=new OpenLayers.Format.JSON);this.json=this.format.read(a)},clear:function(){this.json=
-null},CLASS_NAME:"OpenLayers.Tile.UTFGrid"});OpenLayers.Protocol.HTTP=OpenLayers.Class(OpenLayers.Protocol,{url:null,headers:null,params:null,callback:null,scope:null,readWithPOST:!1,updateWithPOST:!1,deleteWithPOST:!1,wildcarded:!1,srsInBBOX:!1,initialize:function(a){a=a||{};this.params={};this.headers={};OpenLayers.Protocol.prototype.initialize.apply(this,arguments);if(!this.filterToParams&&OpenLayers.Format.QueryStringFilter){var b=new OpenLayers.Format.QueryStringFilter({wildcarded:this.wildcarded,srsInBBOX:this.srsInBBOX});this.filterToParams=
-function(a,d){return b.write(a,d)}}},destroy:function(){this.headers=this.params=null;OpenLayers.Protocol.prototype.destroy.apply(this)},read:function(a){OpenLayers.Protocol.prototype.read.apply(this,arguments);a=a||{};a.params=OpenLayers.Util.applyDefaults(a.params,this.options.params);a=OpenLayers.Util.applyDefaults(a,this.options);a.filter&&this.filterToParams&&(a.params=this.filterToParams(a.filter,a.params));var b=void 0!==a.readWithPOST?a.readWithPOST:this.readWithPOST,c=new OpenLayers.Protocol.Response({requestType:"read"});
-b?(b=a.headers||{},b["Content-Type"]="application/x-www-form-urlencoded",c.priv=OpenLayers.Request.POST({url:a.url,callback:this.createCallback(this.handleRead,c,a),data:OpenLayers.Util.getParameterString(a.params),headers:b})):c.priv=OpenLayers.Request.GET({url:a.url,callback:this.createCallback(this.handleRead,c,a),params:a.params,headers:a.headers});return c},handleRead:function(a,b){this.handleResponse(a,b)},create:function(a,b){b=OpenLayers.Util.applyDefaults(b,this.options);var c=new OpenLayers.Protocol.Response({reqFeatures:a,
-requestType:"create"});c.priv=OpenLayers.Request.POST({url:b.url,callback:this.createCallback(this.handleCreate,c,b),headers:b.headers,data:this.format.write(a)});return c},handleCreate:function(a,b){this.handleResponse(a,b)},update:function(a,b){b=b||{};var c=b.url||a.url||this.options.url+"/"+a.fid;b=OpenLayers.Util.applyDefaults(b,this.options);var d=new OpenLayers.Protocol.Response({reqFeatures:a,requestType:"update"});d.priv=OpenLayers.Request[this.updateWithPOST?"POST":"PUT"]({url:c,callback:this.createCallback(this.handleUpdate,
-d,b),headers:b.headers,data:this.format.write(a)});return d},handleUpdate:function(a,b){this.handleResponse(a,b)},"delete":function(a,b){b=b||{};var c=b.url||a.url||this.options.url+"/"+a.fid;b=OpenLayers.Util.applyDefaults(b,this.options);var d=new OpenLayers.Protocol.Response({reqFeatures:a,requestType:"delete"}),e=this.deleteWithPOST?"POST":"DELETE",c={url:c,callback:this.createCallback(this.handleDelete,d,b),headers:b.headers};this.deleteWithPOST&&(c.data=this.format.write(a));d.priv=OpenLayers.Request[e](c);
-return d},handleDelete:function(a,b){this.handleResponse(a,b)},handleResponse:function(a,b){var c=a.priv;b.callback&&(200<=c.status&&300>c.status?("delete"!=a.requestType&&(a.features=this.parseFeatures(c)),a.code=OpenLayers.Protocol.Response.SUCCESS):a.code=OpenLayers.Protocol.Response.FAILURE,b.callback.call(b.scope,a))},parseFeatures:function(a){var b=a.responseXML;b&&b.documentElement||(b=a.responseText);return!b||0>=b.length?null:this.format.read(b)},commit:function(a,b){function c(a){for(var b=
-a.features?a.features.length:0,c=Array(b),e=0;e<b;++e)c[e]=a.features[e].fid;r.insertIds=c;d.apply(this,[a])}function d(a){this.callUserCallback(a,b);q=q&&a.success();f++;f>=p&&b.callback&&(r.code=q?OpenLayers.Protocol.Response.SUCCESS:OpenLayers.Protocol.Response.FAILURE,b.callback.apply(b.scope,[r]))}b=OpenLayers.Util.applyDefaults(b,this.options);var e=[],f=0,g={};g[OpenLayers.State.INSERT]=[];g[OpenLayers.State.UPDATE]=[];g[OpenLayers.State.DELETE]=[];for(var h,k,l=[],m=0,n=a.length;m<n;++m)if(h=
-a[m],k=g[h.state])k.push(h),l.push(h);var p=(0<g[OpenLayers.State.INSERT].length?1:0)+g[OpenLayers.State.UPDATE].length+g[OpenLayers.State.DELETE].length,q=!0,r=new OpenLayers.Protocol.Response({reqFeatures:l});h=g[OpenLayers.State.INSERT];0<h.length&&e.push(this.create(h,OpenLayers.Util.applyDefaults({callback:c,scope:this},b.create)));h=g[OpenLayers.State.UPDATE];for(m=h.length-1;0<=m;--m)e.push(this.update(h[m],OpenLayers.Util.applyDefaults({callback:d,scope:this},b.update)));h=g[OpenLayers.State.DELETE];
-for(m=h.length-1;0<=m;--m)e.push(this["delete"](h[m],OpenLayers.Util.applyDefaults({callback:d,scope:this},b["delete"])));return e},abort:function(a){a&&a.priv.abort()},callUserCallback:function(a,b){var c=b[a.requestType];c&&c.callback&&c.callback.call(c.scope,a)},CLASS_NAME:"OpenLayers.Protocol.HTTP"});OpenLayers.Strategy.Cluster=OpenLayers.Class(OpenLayers.Strategy,{distance:20,threshold:null,features:null,clusters:null,clustering:!1,resolution:null,activate:function(){var a=OpenLayers.Strategy.prototype.activate.call(this);if(a)this.layer.events.on({beforefeaturesadded:this.cacheFeatures,featuresremoved:this.clearCache,moveend:this.cluster,scope:this});return a},deactivate:function(){var a=OpenLayers.Strategy.prototype.deactivate.call(this);a&&(this.clearCache(),this.layer.events.un({beforefeaturesadded:this.cacheFeatures,
-featuresremoved:this.clearCache,moveend:this.cluster,scope:this}));return a},cacheFeatures:function(a){var b=!0;this.clustering||(this.clearCache(),this.features=a.features,this.cluster(),b=!1);return b},clearCache:function(){this.clustering||(this.features=null)},cluster:function(a){if((!a||a.zoomChanged)&&this.features&&(a=this.layer.map.getResolution(),a!=this.resolution||!this.clustersExist())){this.resolution=a;a=[];for(var b,c,d,e=0;e<this.features.length;++e)if(b=this.features[e],b.geometry){c=
-!1;for(var f=a.length-1;0<=f;--f)if(d=a[f],this.shouldCluster(d,b)){this.addToCluster(d,b);c=!0;break}c||a.push(this.createCluster(this.features[e]))}this.clustering=!0;this.layer.removeAllFeatures();this.clustering=!1;if(0<a.length){if(1<this.threshold)for(b=a.slice(),a=[],e=0,d=b.length;e<d;++e)c=b[e],c.attributes.count<this.threshold?Array.prototype.push.apply(a,c.cluster):a.push(c);this.clustering=!0;this.layer.addFeatures(a);this.clustering=!1}this.clusters=a}},clustersExist:function(){var a=
-!1;if(this.clusters&&0<this.clusters.length&&this.clusters.length==this.layer.features.length)for(var a=!0,b=0;b<this.clusters.length;++b)if(this.clusters[b]!=this.layer.features[b]){a=!1;break}return a},shouldCluster:function(a,b){var c=a.geometry.getBounds().getCenterLonLat(),d=b.geometry.getBounds().getCenterLonLat();return Math.sqrt(Math.pow(c.lon-d.lon,2)+Math.pow(c.lat-d.lat,2))/this.resolution<=this.distance},addToCluster:function(a,b){a.cluster.push(b);a.attributes.count+=1},createCluster:function(a){var b=
-a.geometry.getBounds().getCenterLonLat(),b=new OpenLayers.Feature.Vector(new OpenLayers.Geometry.Point(b.lon,b.lat),{count:1});b.cluster=[a];return b},CLASS_NAME:"OpenLayers.Strategy.Cluster"});OpenLayers.Strategy.Filter=OpenLayers.Class(OpenLayers.Strategy,{filter:null,cache:null,caching:!1,activate:function(){var a=OpenLayers.Strategy.prototype.activate.apply(this,arguments);a&&(this.cache=[],this.layer.events.on({beforefeaturesadded:this.handleAdd,beforefeaturesremoved:this.handleRemove,scope:this}));return a},deactivate:function(){this.cache=null;this.layer&&this.layer.events&&this.layer.events.un({beforefeaturesadded:this.handleAdd,beforefeaturesremoved:this.handleRemove,scope:this});
-return OpenLayers.Strategy.prototype.deactivate.apply(this,arguments)},handleAdd:function(a){if(!this.caching&&this.filter){var b=a.features;a.features=[];for(var c,d=0,e=b.length;d<e;++d)c=b[d],this.filter.evaluate(c)?a.features.push(c):this.cache.push(c)}},handleRemove:function(a){this.caching||(this.cache=[])},setFilter:function(a){this.filter=a;a=this.cache;this.cache=[];this.handleAdd({features:this.layer.features});0<this.cache.length&&(this.caching=!0,this.layer.removeFeatures(this.cache.slice()),
-this.caching=!1);0<a.length&&(a={features:a},this.handleAdd(a),0<a.features.length&&(this.caching=!0,this.layer.addFeatures(a.features),this.caching=!1))},CLASS_NAME:"OpenLayers.Strategy.Filter"});OpenLayers.Protocol.SOS=function(a){a=OpenLayers.Util.applyDefaults(a,OpenLayers.Protocol.SOS.DEFAULTS);var b=OpenLayers.Protocol.SOS["v"+a.version.replace(/\./g,"_")];if(!b)throw"Unsupported SOS version: "+a.version;return new b(a)};OpenLayers.Protocol.SOS.DEFAULTS={version:"1.0.0"};OpenLayers.Format.WFSDescribeFeatureType=OpenLayers.Class(OpenLayers.Format.XML,{regExes:{trimSpace:/^\s*|\s*$/g},namespaces:{xsd:"http://www.w3.org/2001/XMLSchema"},readers:{xsd:{schema:function(a,b){var c=[],d={},e,f;this.readChildNodes(a,{complexTypes:c,customTypes:d});var g=a.attributes,h,k;e=0;for(f=g.length;e<f;++e)h=g[e],k=h.name,0===k.indexOf("xmlns")?this.setNamespace(k.split(":")[1]||"",h.value):b[k]=h.value;b.featureTypes=c;b.targetPrefix=this.namespaceAlias[b.targetNamespace];e=0;for(f=
-c.length;e<f;++e)g=c[e],h=d[g.typeName],d[g.typeName]&&(g.typeName=h.name)},complexType:function(a,b){var c={typeName:a.getAttribute("name")};this.readChildNodes(a,c);b.complexTypes.push(c)},complexContent:function(a,b){this.readChildNodes(a,b)},extension:function(a,b){this.readChildNodes(a,b)},sequence:function(a,b){var c={elements:[]};this.readChildNodes(a,c);b.properties=c.elements},element:function(a,b){var c;if(b.elements){var d={};c=a.attributes;for(var e,f=0,g=c.length;f<g;++f)e=c[f],d[e.name]=
-e.value;c=d.type;c||(c={},this.readChildNodes(a,c),d.restriction=c,d.type=c.base);d.localType=(c.base||c).split(":").pop();b.elements.push(d);this.readChildNodes(a,d)}b.complexTypes&&(c=a.getAttribute("type"),d=c.split(":").pop(),b.customTypes[d]={name:a.getAttribute("name"),type:c})},annotation:function(a,b){b.annotation={};this.readChildNodes(a,b.annotation)},appinfo:function(a,b){b.appinfo||(b.appinfo=[]);b.appinfo.push(this.getChildValue(a))},documentation:function(a,b){b.documentation||(b.documentation=
-[]);var c=this.getChildValue(a);b.documentation.push({lang:a.getAttribute("xml:lang"),textContent:c.replace(this.regExes.trimSpace,"")})},simpleType:function(a,b){this.readChildNodes(a,b)},restriction:function(a,b){b.base=a.getAttribute("base");this.readRestriction(a,b)}}},readRestriction:function(a,b){for(var c=a.childNodes,d,e,f=0,g=c.length;f<g;++f)d=c[f],1==d.nodeType&&(e=d.nodeName.split(":").pop(),d=d.getAttribute("value"),b[e]?("string"==typeof b[e]&&(b[e]=[b[e]]),b[e].push(d)):b[e]=d)},read:function(a){"string"==
-typeof a&&(a=OpenLayers.Format.XML.prototype.read.apply(this,[a]));a&&9==a.nodeType&&(a=a.documentElement);var b={};if("ExceptionReport"===a.nodeName.split(":").pop()){var c=new OpenLayers.Format.OGCExceptionReport;b.error=c.read(a)}else this.readNode(a,b);return b},CLASS_NAME:"OpenLayers.Format.WFSDescribeFeatureType"});OpenLayers.Format.GeoRSS=OpenLayers.Class(OpenLayers.Format.XML,{rssns:"http://backend.userland.com/rss2",featureNS:"http://mapserver.gis.umn.edu/mapserver",georssns:"http://www.georss.org/georss",geons:"http://www.w3.org/2003/01/geo/wgs84_pos#",featureTitle:"Untitled",featureDescription:"No Description",gmlParser:null,xy:!1,createGeometryFromItem:function(a){var b=this.getElementsByTagNameNS(a,this.georssns,"point"),c=this.getElementsByTagNameNS(a,this.geons,"lat"),d=this.getElementsByTagNameNS(a,
-this.geons,"long"),e=this.getElementsByTagNameNS(a,this.georssns,"line"),f=this.getElementsByTagNameNS(a,this.georssns,"polygon"),g=this.getElementsByTagNameNS(a,this.georssns,"where");a=this.getElementsByTagNameNS(a,this.georssns,"box");if(0<b.length||0<c.length&&0<d.length){0<b.length?(c=OpenLayers.String.trim(b[0].firstChild.nodeValue).split(/\s+/),2!=c.length&&(c=OpenLayers.String.trim(b[0].firstChild.nodeValue).split(/\s*,\s*/))):c=[parseFloat(c[0].firstChild.nodeValue),parseFloat(d[0].firstChild.nodeValue)];
-var h=new OpenLayers.Geometry.Point(c[1],c[0])}else if(0<e.length){c=OpenLayers.String.trim(this.getChildValue(e[0])).split(/\s+/);d=[];e=0;for(f=c.length;e<f;e+=2)b=new OpenLayers.Geometry.Point(c[e+1],c[e]),d.push(b);h=new OpenLayers.Geometry.LineString(d)}else if(0<f.length){c=OpenLayers.String.trim(this.getChildValue(f[0])).split(/\s+/);d=[];e=0;for(f=c.length;e<f;e+=2)b=new OpenLayers.Geometry.Point(c[e+1],c[e]),d.push(b);h=new OpenLayers.Geometry.Polygon([new OpenLayers.Geometry.LinearRing(d)])}else 0<
-g.length?(this.gmlParser||(this.gmlParser=new OpenLayers.Format.GML({xy:this.xy})),h=this.gmlParser.parseFeature(g[0]).geometry):0<a.length&&(c=OpenLayers.String.trim(a[0].firstChild.nodeValue).split(/\s+/),d=[],3<c.length&&(b=new OpenLayers.Geometry.Point(c[1],c[0]),d.push(b),b=new OpenLayers.Geometry.Point(c[1],c[2]),d.push(b),b=new OpenLayers.Geometry.Point(c[3],c[2]),d.push(b),b=new OpenLayers.Geometry.Point(c[3],c[0]),d.push(b),b=new OpenLayers.Geometry.Point(c[1],c[0]),d.push(b)),h=new OpenLayers.Geometry.Polygon([new OpenLayers.Geometry.LinearRing(d)]));
-h&&(this.internalProjection&&this.externalProjection)&&h.transform(this.externalProjection,this.internalProjection);return h},createFeatureFromItem:function(a){var b=this.createGeometryFromItem(a),c=this._getChildValue(a,"*","title",this.featureTitle),d=this._getChildValue(a,"*","description",this._getChildValue(a,"*","content",this._getChildValue(a,"*","summary",this.featureDescription))),e=this._getChildValue(a,"*","link");if(!e)try{e=this.getElementsByTagNameNS(a,"*","link")[0].getAttribute("href")}catch(f){e=
-null}a=this._getChildValue(a,"*","id",null);b=new OpenLayers.Feature.Vector(b,{title:c,description:d,link:e});b.fid=a;return b},_getChildValue:function(a,b,c,d){return(a=this.getElementsByTagNameNS(a,b,c))&&a[0]&&a[0].firstChild&&a[0].firstChild.nodeValue?this.getChildValue(a[0]):void 0==d?"":d},read:function(a){"string"==typeof a&&(a=OpenLayers.Format.XML.prototype.read.apply(this,[a]));var b=null,b=this.getElementsByTagNameNS(a,"*","item");0==b.length&&(b=this.getElementsByTagNameNS(a,"*","entry"));
-a=b.length;for(var c=Array(a),d=0;d<a;d++)c[d]=this.createFeatureFromItem(b[d]);return c},write:function(a){var b;if(OpenLayers.Util.isArray(a)){b=this.createElementNS(this.rssns,"rss");for(var c=0,d=a.length;c<d;c++)b.appendChild(this.createFeatureXML(a[c]))}else b=this.createFeatureXML(a);return OpenLayers.Format.XML.prototype.write.apply(this,[b])},createFeatureXML:function(a){var b=this.buildGeometryNode(a.geometry),c=this.createElementNS(this.rssns,"item"),d=this.createElementNS(this.rssns,"title");
-d.appendChild(this.createTextNode(a.attributes.title?a.attributes.title:""));var e=this.createElementNS(this.rssns,"description");e.appendChild(this.createTextNode(a.attributes.description?a.attributes.description:""));c.appendChild(d);c.appendChild(e);a.attributes.link&&(d=this.createElementNS(this.rssns,"link"),d.appendChild(this.createTextNode(a.attributes.link)),c.appendChild(d));for(var f in a.attributes)"link"!=f&&("title"!=f&&"description"!=f)&&(d=this.createTextNode(a.attributes[f]),e=f,-1!=
-f.search(":")&&(e=f.split(":")[1]),e=this.createElementNS(this.featureNS,"feature:"+e),e.appendChild(d),c.appendChild(e));c.appendChild(b);return c},buildGeometryNode:function(a){this.internalProjection&&this.externalProjection&&(a=a.clone(),a.transform(this.internalProjection,this.externalProjection));var b;if("OpenLayers.Geometry.Polygon"==a.CLASS_NAME)b=this.createElementNS(this.georssns,"georss:polygon"),b.appendChild(this.buildCoordinatesNode(a.components[0]));else if("OpenLayers.Geometry.LineString"==
-a.CLASS_NAME)b=this.createElementNS(this.georssns,"georss:line"),b.appendChild(this.buildCoordinatesNode(a));else if("OpenLayers.Geometry.Point"==a.CLASS_NAME)b=this.createElementNS(this.georssns,"georss:point"),b.appendChild(this.buildCoordinatesNode(a));else throw"Couldn't parse "+a.CLASS_NAME;return b},buildCoordinatesNode:function(a){var b=null;a.components&&(b=a.components);if(b){a=b.length;for(var c=Array(a),d=0;d<a;d++)c[d]=b[d].y+" "+b[d].x;b=c.join(" ")}else b=a.y+" "+a.x;return this.createTextNode(b)},
-CLASS_NAME:"OpenLayers.Format.GeoRSS"});OpenLayers.Format.WPSCapabilities=OpenLayers.Class(OpenLayers.Format.XML.VersionedOGC,{defaultVersion:"1.0.0",CLASS_NAME:"OpenLayers.Format.WPSCapabilities"});OpenLayers.Format.WPSCapabilities.v1_0_0=OpenLayers.Class(OpenLayers.Format.XML,{namespaces:{ows:"http://www.opengis.net/ows/1.1",wps:"http://www.opengis.net/wps/1.0.0",xlink:"http://www.w3.org/1999/xlink"},regExes:{trimSpace:/^\s*|\s*$/g,removeSpace:/\s*/g,splitSpace:/\s+/,trimComma:/\s*,\s*/g},initialize:function(a){OpenLayers.Format.XML.prototype.initialize.apply(this,[a])},read:function(a){"string"==typeof a&&(a=OpenLayers.Format.XML.prototype.read.apply(this,[a]));a&&9==a.nodeType&&(a=a.documentElement);
-var b={};this.readNode(a,b);return b},readers:{wps:{Capabilities:function(a,b){this.readChildNodes(a,b)},ProcessOfferings:function(a,b){b.processOfferings={};this.readChildNodes(a,b.processOfferings)},Process:function(a,b){var c={processVersion:this.getAttributeNS(a,this.namespaces.wps,"processVersion")};this.readChildNodes(a,c);b[c.identifier]=c},Languages:function(a,b){b.languages=[];this.readChildNodes(a,b.languages)},Default:function(a,b){var c={isDefault:!0};this.readChildNodes(a,c);b.push(c)},
-Supported:function(a,b){var c={};this.readChildNodes(a,c);b.push(c)}},ows:OpenLayers.Format.OWSCommon.v1_1_0.prototype.readers.ows},CLASS_NAME:"OpenLayers.Format.WPSCapabilities.v1_0_0"});OpenLayers.Control.PinchZoom=OpenLayers.Class(OpenLayers.Control,{type:OpenLayers.Control.TYPE_TOOL,pinchOrigin:null,currentCenter:null,autoActivate:!0,preserveCenter:!1,initialize:function(a){OpenLayers.Control.prototype.initialize.apply(this,arguments);this.handler=new OpenLayers.Handler.Pinch(this,{start:this.pinchStart,move:this.pinchMove,done:this.pinchDone},this.handlerOptions)},pinchStart:function(a,b){var c=this.preserveCenter?this.map.getPixelFromLonLat(this.map.getCenter()):a.xy;this.currentCenter=
-this.pinchOrigin=c},pinchMove:function(a,b){var c=b.scale,d=this.map.layerContainerOriginPx,e=this.pinchOrigin,f=this.preserveCenter?this.map.getPixelFromLonLat(this.map.getCenter()):a.xy,g=Math.round(d.x+f.x-e.x+(c-1)*(d.x-e.x)),d=Math.round(d.y+f.y-e.y+(c-1)*(d.y-e.y));this.map.applyTransform(g,d,c);this.currentCenter=f},pinchDone:function(a,b,c){this.map.applyTransform();a=this.map.getZoomForResolution(this.map.getResolution()/c.scale,!0);if(a!==this.map.getZoom()||!this.currentCenter.equals(this.pinchOrigin)){b=
-this.map.getResolutionForZoom(a);c=this.map.getLonLatFromPixel(this.pinchOrigin);var d=this.currentCenter,e=this.map.getSize();c.lon+=b*(e.w/2-d.x);c.lat-=b*(e.h/2-d.y);this.map.div.clientWidth=this.map.div.clientWidth;this.map.setCenter(c,a)}},CLASS_NAME:"OpenLayers.Control.PinchZoom"});OpenLayers.Control.TouchNavigation=OpenLayers.Class(OpenLayers.Control,{dragPan:null,dragPanOptions:null,pinchZoom:null,pinchZoomOptions:null,clickHandlerOptions:null,documentDrag:!1,autoActivate:!0,initialize:function(a){this.handlers={};OpenLayers.Control.prototype.initialize.apply(this,arguments)},destroy:function(){this.deactivate();this.dragPan&&this.dragPan.destroy();this.dragPan=null;this.pinchZoom&&(this.pinchZoom.destroy(),delete this.pinchZoom);OpenLayers.Control.prototype.destroy.apply(this,
-arguments)},activate:function(){return OpenLayers.Control.prototype.activate.apply(this,arguments)?(this.dragPan.activate(),this.handlers.click.activate(),this.pinchZoom.activate(),!0):!1},deactivate:function(){return OpenLayers.Control.prototype.deactivate.apply(this,arguments)?(this.dragPan.deactivate(),this.handlers.click.deactivate(),this.pinchZoom.deactivate(),!0):!1},draw:function(){var a={click:this.defaultClick,dblclick:this.defaultDblClick},b=OpenLayers.Util.extend({"double":!0,stopDouble:!0,
-pixelTolerance:2},this.clickHandlerOptions);this.handlers.click=new OpenLayers.Handler.Click(this,a,b);this.dragPan=new OpenLayers.Control.DragPan(OpenLayers.Util.extend({map:this.map,documentDrag:this.documentDrag},this.dragPanOptions));this.dragPan.draw();this.pinchZoom=new OpenLayers.Control.PinchZoom(OpenLayers.Util.extend({map:this.map},this.pinchZoomOptions))},defaultClick:function(a){a.lastTouches&&2==a.lastTouches.length&&this.map.zoomOut()},defaultDblClick:function(a){this.map.zoomTo(this.map.zoom+
-1,a.xy)},CLASS_NAME:"OpenLayers.Control.TouchNavigation"});OpenLayers.Console.warn("OpenLayers.Rico is deprecated");OpenLayers.Rico=OpenLayers.Rico||{};
-OpenLayers.Rico.Color=OpenLayers.Class({initialize:function(a,b,c){this.rgb={r:a,g:b,b:c}},setRed:function(a){this.rgb.r=a},setGreen:function(a){this.rgb.g=a},setBlue:function(a){this.rgb.b=a},setHue:function(a){var b=this.asHSB();b.h=a;this.rgb=OpenLayers.Rico.Color.HSBtoRGB(b.h,b.s,b.b)},setSaturation:function(a){var b=this.asHSB();b.s=a;this.rgb=OpenLayers.Rico.Color.HSBtoRGB(b.h,b.s,b.b)},setBrightness:function(a){var b=this.asHSB();b.b=a;this.rgb=OpenLayers.Rico.Color.HSBtoRGB(b.h,b.s,b.b)},
-darken:function(a){var b=this.asHSB();this.rgb=OpenLayers.Rico.Color.HSBtoRGB(b.h,b.s,Math.max(b.b-a,0))},brighten:function(a){var b=this.asHSB();this.rgb=OpenLayers.Rico.Color.HSBtoRGB(b.h,b.s,Math.min(b.b+a,1))},blend:function(a){this.rgb.r=Math.floor((this.rgb.r+a.rgb.r)/2);this.rgb.g=Math.floor((this.rgb.g+a.rgb.g)/2);this.rgb.b=Math.floor((this.rgb.b+a.rgb.b)/2)},isBright:function(){this.asHSB();return 0.5<this.asHSB().b},isDark:function(){return!this.isBright()},asRGB:function(){return"rgb("+
-this.rgb.r+","+this.rgb.g+","+this.rgb.b+")"},asHex:function(){return"#"+this.rgb.r.toColorPart()+this.rgb.g.toColorPart()+this.rgb.b.toColorPart()},asHSB:function(){return OpenLayers.Rico.Color.RGBtoHSB(this.rgb.r,this.rgb.g,this.rgb.b)},toString:function(){return this.asHex()}});
-OpenLayers.Rico.Color.createFromHex=function(a){if(4==a.length){var b=a;a="#";for(var c=1;4>c;c++)a+=b.charAt(c)+b.charAt(c)}0==a.indexOf("#")&&(a=a.substring(1));b=a.substring(0,2);c=a.substring(2,4);a=a.substring(4,6);return new OpenLayers.Rico.Color(parseInt(b,16),parseInt(c,16),parseInt(a,16))};
-OpenLayers.Rico.Color.createColorFromBackground=function(a){var b=OpenLayers.Element.getStyle(OpenLayers.Util.getElement(a),"backgroundColor");return"transparent"==b&&a.parentNode?OpenLayers.Rico.Color.createColorFromBackground(a.parentNode):null==b?new OpenLayers.Rico.Color(255,255,255):0==b.indexOf("rgb(")?(a=b.substring(4,b.length-1).split(","),new OpenLayers.Rico.Color(parseInt(a[0]),parseInt(a[1]),parseInt(a[2]))):0==b.indexOf("#")?OpenLayers.Rico.Color.createFromHex(b):new OpenLayers.Rico.Color(255,
-255,255)};
-OpenLayers.Rico.Color.HSBtoRGB=function(a,b,c){var d=0,e=0,f=0;if(0==b)f=e=d=parseInt(255*c+0.5);else{a=6*(a-Math.floor(a));var g=a-Math.floor(a),h=c*(1-b),k=c*(1-b*g);b=c*(1-b*(1-g));switch(parseInt(a)){case 0:d=255*c+0.5;e=255*b+0.5;f=255*h+0.5;break;case 1:d=255*k+0.5;e=255*c+0.5;f=255*h+0.5;break;case 2:d=255*h+0.5;e=255*c+0.5;f=255*b+0.5;break;case 3:d=255*h+0.5;e=255*k+0.5;f=255*c+0.5;break;case 4:d=255*b+0.5;e=255*h+0.5;f=255*c+0.5;break;case 5:d=255*c+0.5,e=255*h+0.5,f=255*k+0.5}}return{r:parseInt(d),g:parseInt(e),
-b:parseInt(f)}};OpenLayers.Rico.Color.RGBtoHSB=function(a,b,c){var d,e=a>b?a:b;c>e&&(e=c);var f=a<b?a:b;c<f&&(f=c);d=0!=e?(e-f)/e:0;if(0==d)a=0;else{var g=(e-a)/(e-f),h=(e-b)/(e-f);c=(e-c)/(e-f);a=(a==e?c-h:b==e?2+g-c:4+h-g)/6;0>a&&(a+=1)}return{h:a,s:d,b:e/255}};OpenLayers.Style2=OpenLayers.Class({id:null,name:null,title:null,description:null,layerName:null,isDefault:!1,rules:null,initialize:function(a){OpenLayers.Util.extend(this,a);this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_")},destroy:function(){for(var a=0,b=this.rules.length;a<b;a++)this.rules[a].destroy();delete this.rules},clone:function(){var a=OpenLayers.Util.extend({},this);if(this.rules){a.rules=[];for(var b=0,c=this.rules.length;b<c;++b)a.rules.push(this.rules[b].clone())}return new OpenLayers.Style2(a)},
-CLASS_NAME:"OpenLayers.Style2"});OpenLayers.Format.WFS=OpenLayers.Class(OpenLayers.Format.GML,{layer:null,wfsns:"http://www.opengis.net/wfs",ogcns:"http://www.opengis.net/ogc",initialize:function(a,b){OpenLayers.Format.GML.prototype.initialize.apply(this,[a]);this.layer=b;this.layer.featureNS&&(this.featureNS=this.layer.featureNS);this.layer.options.geometry_column&&(this.geometryName=this.layer.options.geometry_column);this.layer.options.typename&&(this.featureName=this.layer.options.typename)},write:function(a){var b=this.createElementNS(this.wfsns,
-"wfs:Transaction");b.setAttribute("version","1.0.0");b.setAttribute("service","WFS");for(var c=0;c<a.length;c++)switch(a[c].state){case OpenLayers.State.INSERT:b.appendChild(this.insert(a[c]));break;case OpenLayers.State.UPDATE:b.appendChild(this.update(a[c]));break;case OpenLayers.State.DELETE:b.appendChild(this.remove(a[c]))}return OpenLayers.Format.XML.prototype.write.apply(this,[b])},createFeatureXML:function(a){var b=this.buildGeometryNode(a.geometry),c=this.createElementNS(this.featureNS,"feature:"+
-this.geometryName);c.appendChild(b);b=this.createElementNS(this.featureNS,"feature:"+this.featureName);b.appendChild(c);for(var d in a.attributes){var c=this.createTextNode(a.attributes[d]),e=d;-1!=d.search(":")&&(e=d.split(":")[1]);e=this.createElementNS(this.featureNS,"feature:"+e);e.appendChild(c);b.appendChild(e)}return b},insert:function(a){var b=this.createElementNS(this.wfsns,"wfs:Insert");b.appendChild(this.createFeatureXML(a));return b},update:function(a){a.fid||OpenLayers.Console.userError(OpenLayers.i18n("noFID"));
-var b=this.createElementNS(this.wfsns,"wfs:Update");b.setAttribute("typeName",this.featurePrefix+":"+this.featureName);b.setAttribute("xmlns:"+this.featurePrefix,this.featureNS);var c=this.createElementNS(this.wfsns,"wfs:Property"),d=this.createElementNS(this.wfsns,"wfs:Name"),e=this.createTextNode(this.geometryName);d.appendChild(e);c.appendChild(d);d=this.createElementNS(this.wfsns,"wfs:Value");e=this.buildGeometryNode(a.geometry);a.layer&&e.setAttribute("srsName",a.layer.projection.getCode());
-d.appendChild(e);c.appendChild(d);b.appendChild(c);for(var f in a.attributes)c=this.createElementNS(this.wfsns,"wfs:Property"),d=this.createElementNS(this.wfsns,"wfs:Name"),d.appendChild(this.createTextNode(f)),c.appendChild(d),d=this.createElementNS(this.wfsns,"wfs:Value"),d.appendChild(this.createTextNode(a.attributes[f])),c.appendChild(d),b.appendChild(c);c=this.createElementNS(this.ogcns,"ogc:Filter");f=this.createElementNS(this.ogcns,"ogc:FeatureId");f.setAttribute("fid",a.fid);c.appendChild(f);
-b.appendChild(c);return b},remove:function(a){if(!a.fid)return OpenLayers.Console.userError(OpenLayers.i18n("noFID")),!1;var b=this.createElementNS(this.wfsns,"wfs:Delete");b.setAttribute("typeName",this.featurePrefix+":"+this.featureName);b.setAttribute("xmlns:"+this.featurePrefix,this.featureNS);var c=this.createElementNS(this.ogcns,"ogc:Filter"),d=this.createElementNS(this.ogcns,"ogc:FeatureId");d.setAttribute("fid",a.fid);c.appendChild(d);b.appendChild(c);return b},destroy:function(){this.layer=
-null},CLASS_NAME:"OpenLayers.Format.WFS"});OpenLayers.Format.SLD.v1_0_0_GeoServer=OpenLayers.Class(OpenLayers.Format.SLD.v1_0_0,{version:"1.0.0",profile:"GeoServer",readers:OpenLayers.Util.applyDefaults({sld:OpenLayers.Util.applyDefaults({Priority:function(a,b){var c=this.readers.ogc._expression.call(this,a);c&&(b.priority=c)},VendorOption:function(a,b){b.vendorOptions||(b.vendorOptions={});b.vendorOptions[a.getAttribute("name")]=this.getChildValue(a)},TextSymbolizer:function(a,b){OpenLayers.Format.SLD.v1_0_0.prototype.readers.sld.TextSymbolizer.apply(this,
-arguments);var c=this.multipleSymbolizers?b.symbolizers[b.symbolizers.length-1]:b.symbolizer.Text;void 0===c.graphic&&(c.graphic=!1)}},OpenLayers.Format.SLD.v1_0_0.prototype.readers.sld)},OpenLayers.Format.SLD.v1_0_0.prototype.readers),writers:OpenLayers.Util.applyDefaults({sld:OpenLayers.Util.applyDefaults({Priority:function(a){return this.writers.sld._OGCExpression.call(this,"sld:Priority",a)},VendorOption:function(a){return this.createElementNSPlus("sld:VendorOption",{attributes:{name:a.name},
-value:a.value})},TextSymbolizer:function(a){var b=OpenLayers.Format.SLD.v1_0_0.prototype.writers.sld.TextSymbolizer.apply(this,arguments);!1!==a.graphic&&(a.externalGraphic||a.graphicName)&&this.writeNode("Graphic",a,b);"priority"in a&&this.writeNode("Priority",a.priority,b);return this.addVendorOptions(b,a)},PointSymbolizer:function(a){var b=OpenLayers.Format.SLD.v1_0_0.prototype.writers.sld.PointSymbolizer.apply(this,arguments);return this.addVendorOptions(b,a)},LineSymbolizer:function(a){var b=
-OpenLayers.Format.SLD.v1_0_0.prototype.writers.sld.LineSymbolizer.apply(this,arguments);return this.addVendorOptions(b,a)},PolygonSymbolizer:function(a){var b=OpenLayers.Format.SLD.v1_0_0.prototype.writers.sld.PolygonSymbolizer.apply(this,arguments);return this.addVendorOptions(b,a)}},OpenLayers.Format.SLD.v1_0_0.prototype.writers.sld)},OpenLayers.Format.SLD.v1_0_0.prototype.writers),addVendorOptions:function(a,b){if(b.vendorOptions)for(var c in b.vendorOptions)this.writeNode("VendorOption",{name:c,
-value:b.vendorOptions[c]},a);return a},CLASS_NAME:"OpenLayers.Format.SLD.v1_0_0_GeoServer"});OpenLayers.Layer.Boxes=OpenLayers.Class(OpenLayers.Layer.Markers,{drawMarker:function(a){var b=this.map.getLayerPxFromLonLat({lon:a.bounds.left,lat:a.bounds.top}),c=this.map.getLayerPxFromLonLat({lon:a.bounds.right,lat:a.bounds.bottom});null==c||null==b?a.display(!1):(b=a.draw(b,{w:Math.max(1,c.x-b.x),h:Math.max(1,c.y-b.y)}),a.drawn||(this.div.appendChild(b),a.drawn=!0))},removeMarker:function(a){OpenLayers.Util.removeItem(this.markers,a);null!=a.div&&a.div.parentNode==this.div&&this.div.removeChild(a.div)},
-CLASS_NAME:"OpenLayers.Layer.Boxes"});OpenLayers.Format.WFSCapabilities.v1_0_0=OpenLayers.Class(OpenLayers.Format.WFSCapabilities.v1,{readers:{wfs:OpenLayers.Util.applyDefaults({Service:function(a,b){b.service={};this.readChildNodes(a,b.service)},Fees:function(a,b){var c=this.getChildValue(a);c&&"none"!=c.toLowerCase()&&(b.fees=c)},AccessConstraints:function(a,b){var c=this.getChildValue(a);c&&"none"!=c.toLowerCase()&&(b.accessConstraints=c)},OnlineResource:function(a,b){var c=this.getChildValue(a);c&&"none"!=c.toLowerCase()&&(b.onlineResource=
-c)},Keywords:function(a,b){var c=this.getChildValue(a);c&&"none"!=c.toLowerCase()&&(b.keywords=c.split(", "))},Capability:function(a,b){b.capability={};this.readChildNodes(a,b.capability)},Request:function(a,b){b.request={};this.readChildNodes(a,b.request)},GetFeature:function(a,b){b.getfeature={href:{},formats:[]};this.readChildNodes(a,b.getfeature)},ResultFormat:function(a,b){for(var c=a.childNodes,d,e=0;e<c.length;e++)d=c[e],1==d.nodeType&&b.formats.push(d.nodeName)},DCPType:function(a,b){this.readChildNodes(a,
-b)},HTTP:function(a,b){this.readChildNodes(a,b.href)},Get:function(a,b){b.get=a.getAttribute("onlineResource")},Post:function(a,b){b.post=a.getAttribute("onlineResource")},SRS:function(a,b){var c=this.getChildValue(a);c&&(b.srs=c)}},OpenLayers.Format.WFSCapabilities.v1.prototype.readers.wfs)},CLASS_NAME:"OpenLayers.Format.WFSCapabilities.v1_0_0"});OpenLayers.Format.WMSCapabilities.v1_3=OpenLayers.Class(OpenLayers.Format.WMSCapabilities.v1,{readers:{wms:OpenLayers.Util.applyDefaults({WMS_Capabilities:function(a,b){this.readChildNodes(a,b)},LayerLimit:function(a,b){b.layerLimit=parseInt(this.getChildValue(a))},MaxWidth:function(a,b){b.maxWidth=parseInt(this.getChildValue(a))},MaxHeight:function(a,b){b.maxHeight=parseInt(this.getChildValue(a))},BoundingBox:function(a,b){var c=OpenLayers.Format.WMSCapabilities.v1.prototype.readers.wms.BoundingBox.apply(this,
-[a,b]);c.srs=a.getAttribute("CRS");b.bbox[c.srs]=c},CRS:function(a,b){this.readers.wms.SRS.apply(this,[a,b])},EX_GeographicBoundingBox:function(a,b){b.llbbox=[];this.readChildNodes(a,b.llbbox)},westBoundLongitude:function(a,b){b[0]=this.getChildValue(a)},eastBoundLongitude:function(a,b){b[2]=this.getChildValue(a)},southBoundLatitude:function(a,b){b[1]=this.getChildValue(a)},northBoundLatitude:function(a,b){b[3]=this.getChildValue(a)},MinScaleDenominator:function(a,b){b.maxScale=parseFloat(this.getChildValue(a)).toPrecision(16)},
-MaxScaleDenominator:function(a,b){b.minScale=parseFloat(this.getChildValue(a)).toPrecision(16)},Dimension:function(a,b){var c={name:a.getAttribute("name").toLowerCase(),units:a.getAttribute("units"),unitsymbol:a.getAttribute("unitSymbol"),nearestVal:"1"===a.getAttribute("nearestValue"),multipleVal:"1"===a.getAttribute("multipleValues"),"default":a.getAttribute("default")||"",current:"1"===a.getAttribute("current"),values:this.getChildValue(a).split(",")};b.dimensions[c.name]=c},Keyword:function(a,
-b){var c={value:this.getChildValue(a),vocabulary:a.getAttribute("vocabulary")};b.keywords&&b.keywords.push(c)}},OpenLayers.Format.WMSCapabilities.v1.prototype.readers.wms),sld:{UserDefinedSymbolization:function(a,b){this.readers.wms.UserDefinedSymbolization.apply(this,[a,b]);b.userSymbols.inlineFeature=1==parseInt(a.getAttribute("InlineFeature"));b.userSymbols.remoteWCS=1==parseInt(a.getAttribute("RemoteWCS"))},DescribeLayer:function(a,b){this.readers.wms.DescribeLayer.apply(this,[a,b])},GetLegendGraphic:function(a,
-b){this.readers.wms.GetLegendGraphic.apply(this,[a,b])}}},CLASS_NAME:"OpenLayers.Format.WMSCapabilities.v1_3"});OpenLayers.Layer.Zoomify=OpenLayers.Class(OpenLayers.Layer.Grid,{size:null,isBaseLayer:!0,standardTileSize:256,tileOriginCorner:"tl",numberOfTiers:0,tileCountUpToTier:null,tierSizeInTiles:null,tierImageSize:null,initialize:function(a,b,c,d){this.initializeZoomify(c);OpenLayers.Layer.Grid.prototype.initialize.apply(this,[a,b,c,{},d])},initializeZoomify:function(a){var b=a.clone();this.size=a.clone();a=new OpenLayers.Size(Math.ceil(b.w/this.standardTileSize),Math.ceil(b.h/this.standardTileSize));this.tierSizeInTiles=
-[a];for(this.tierImageSize=[b];b.w>this.standardTileSize||b.h>this.standardTileSize;)b=new OpenLayers.Size(Math.floor(b.w/2),Math.floor(b.h/2)),a=new OpenLayers.Size(Math.ceil(b.w/this.standardTileSize),Math.ceil(b.h/this.standardTileSize)),this.tierSizeInTiles.push(a),this.tierImageSize.push(b);this.tierSizeInTiles.reverse();this.tierImageSize.reverse();this.numberOfTiers=this.tierSizeInTiles.length;b=[1];this.tileCountUpToTier=[0];for(a=1;a<this.numberOfTiers;a++)b.unshift(Math.pow(2,a)),this.tileCountUpToTier.push(this.tierSizeInTiles[a-
-1].w*this.tierSizeInTiles[a-1].h+this.tileCountUpToTier[a-1]);this.serverResolutions||(this.serverResolutions=b)},destroy:function(){OpenLayers.Layer.Grid.prototype.destroy.apply(this,arguments);this.tileCountUpToTier.length=0;this.tierSizeInTiles.length=0;this.tierImageSize.length=0},clone:function(a){null==a&&(a=new OpenLayers.Layer.Zoomify(this.name,this.url,this.size,this.options));return a=OpenLayers.Layer.Grid.prototype.clone.apply(this,[a])},getURL:function(a){a=this.adjustBounds(a);var b=
-this.getServerResolution(),c=Math.round((a.left-this.tileOrigin.lon)/(b*this.tileSize.w));a=Math.round((this.tileOrigin.lat-a.top)/(b*this.tileSize.h));b=this.getZoomForResolution(b);c="TileGroup"+Math.floor((c+a*this.tierSizeInTiles[b].w+this.tileCountUpToTier[b])/256)+"/"+b+"-"+c+"-"+a+".jpg";b=this.url;OpenLayers.Util.isArray(b)&&(b=this.selectUrl(c,b));return b+c},getImageSize:function(){if(0<arguments.length){var a=this.adjustBounds(arguments[0]),b=this.getServerResolution(),c=Math.round((a.left-
-this.tileOrigin.lon)/(b*this.tileSize.w)),a=Math.round((this.tileOrigin.lat-a.top)/(b*this.tileSize.h)),b=this.getZoomForResolution(b),d=this.standardTileSize,e=this.standardTileSize;c==this.tierSizeInTiles[b].w-1&&(d=this.tierImageSize[b].w%this.standardTileSize);a==this.tierSizeInTiles[b].h-1&&(e=this.tierImageSize[b].h%this.standardTileSize);return new OpenLayers.Size(d,e)}return this.tileSize},setMap:function(a){OpenLayers.Layer.Grid.prototype.setMap.apply(this,arguments);this.tileOrigin=new OpenLayers.LonLat(this.map.maxExtent.left,
-this.map.maxExtent.top)},CLASS_NAME:"OpenLayers.Layer.Zoomify"});OpenLayers.Layer.MapServer=OpenLayers.Class(OpenLayers.Layer.Grid,{DEFAULT_PARAMS:{mode:"map",map_imagetype:"png"},initialize:function(a,b,c,d){OpenLayers.Layer.Grid.prototype.initialize.apply(this,arguments);this.params=OpenLayers.Util.applyDefaults(this.params,this.DEFAULT_PARAMS);if(null==d||null==d.isBaseLayer)this.isBaseLayer="true"!=this.params.transparent&&!0!=this.params.transparent},clone:function(a){null==a&&(a=new OpenLayers.Layer.MapServer(this.name,this.url,this.params,this.getOptions()));
-return a=OpenLayers.Layer.Grid.prototype.clone.apply(this,[a])},getURL:function(a){a=this.adjustBounds(a);a=[a.left,a.bottom,a.right,a.top];var b=this.getImageSize();return this.getFullRequestString({mapext:a,imgext:a,map_size:[b.w,b.h],imgx:b.w/2,imgy:b.h/2,imgxy:[b.w,b.h]})},getFullRequestString:function(a,b){var c=null==b?this.url:b,d=OpenLayers.Util.extend({},this.params),d=OpenLayers.Util.extend(d,a),e=OpenLayers.Util.getParameterString(d);OpenLayers.Util.isArray(c)&&(c=this.selectUrl(e,c));
-var e=OpenLayers.Util.upperCaseObject(OpenLayers.Util.getParameters(c)),f;for(f in d)f.toUpperCase()in e&&delete d[f];e=OpenLayers.Util.getParameterString(d);d=c;e=e.replace(/,/g,"+");""!=e&&(f=c.charAt(c.length-1),d="&"==f||"?"==f?d+e:-1==c.indexOf("?")?d+("?"+e):d+("&"+e));return d},CLASS_NAME:"OpenLayers.Layer.MapServer"});OpenLayers.Renderer.VML=OpenLayers.Class(OpenLayers.Renderer.Elements,{xmlns:"urn:schemas-microsoft-com:vml",symbolCache:{},offset:null,initialize:function(a){if(this.supported()){if(!document.namespaces.olv){document.namespaces.add("olv",this.xmlns);for(var b=document.createStyleSheet(),c="shape rect oval fill stroke imagedata group textbox".split(" "),d=0,e=c.length;d<e;d++)b.addRule("olv\\:"+c[d],"behavior: url(#default#VML); position: absolute; display: inline-block;")}OpenLayers.Renderer.Elements.prototype.initialize.apply(this,
-arguments)}},supported:function(){return!!document.namespaces},setExtent:function(a,b){var c=OpenLayers.Renderer.Elements.prototype.setExtent.apply(this,arguments),d=this.getResolution(),e=a.left/d|0,d=a.top/d-this.size.h|0;b||!this.offset?(this.offset={x:e,y:d},d=e=0):(e-=this.offset.x,d-=this.offset.y);this.root.coordorigin=e-this.xOffset+" "+d;for(var e=[this.root,this.vectorRoot,this.textRoot],f=0,g=e.length;f<g;++f)d=e[f],d.coordsize=this.size.w+" "+this.size.h;this.root.style.flip="y";return c},
-setSize:function(a){OpenLayers.Renderer.prototype.setSize.apply(this,arguments);for(var b=[this.rendererRoot,this.root,this.vectorRoot,this.textRoot],c=this.size.w+"px",d=this.size.h+"px",e,f=0,g=b.length;f<g;++f)e=b[f],e.style.width=c,e.style.height=d},getNodeType:function(a,b){var c=null;switch(a.CLASS_NAME){case "OpenLayers.Geometry.Point":c=b.externalGraphic?"olv:rect":this.isComplexSymbol(b.graphicName)?"olv:shape":"olv:oval";break;case "OpenLayers.Geometry.Rectangle":c="olv:rect";break;case "OpenLayers.Geometry.LineString":case "OpenLayers.Geometry.LinearRing":case "OpenLayers.Geometry.Polygon":case "OpenLayers.Geometry.Curve":c=
-"olv:shape"}return c},setStyle:function(a,b,c,d){b=b||a._style;c=c||a._options;var e=b.fillColor,f=b.title||b.graphicTitle;f&&(a.title=f);if("OpenLayers.Geometry.Point"===a._geometryClass)if(b.externalGraphic){c.isFilled=!0;var e=b.graphicWidth||b.graphicHeight,f=b.graphicHeight||b.graphicWidth,e=e?e:2*b.pointRadius,f=f?f:2*b.pointRadius,g=this.getResolution(),h=void 0!=b.graphicXOffset?b.graphicXOffset:-(0.5*e),k=void 0!=b.graphicYOffset?b.graphicYOffset:-(0.5*f);a.style.left=((d.x-this.featureDx)/
-g-this.offset.x+h|0)+"px";a.style.top=(d.y/g-this.offset.y-(k+f)|0)+"px";a.style.width=e+"px";a.style.height=f+"px";a.style.flip="y";e="none";c.isStroked=!1}else this.isComplexSymbol(b.graphicName)?(f=this.importSymbol(b.graphicName),a.path=f.path,a.coordorigin=f.left+","+f.bottom,f=f.size,a.coordsize=f+","+f,this.drawCircle(a,d,b.pointRadius),a.style.flip="y"):this.drawCircle(a,d,b.pointRadius);c.isFilled?a.fillcolor=e:a.filled="false";d=a.getElementsByTagName("fill");d=0==d.length?null:d[0];c.isFilled?
-(d||(d=this.createNode("olv:fill",a.id+"_fill")),d.opacity=b.fillOpacity,"OpenLayers.Geometry.Point"===a._geometryClass&&b.externalGraphic&&(b.graphicOpacity&&(d.opacity=b.graphicOpacity),d.src=b.externalGraphic,d.type="frame",b.graphicWidth&&b.graphicHeight||(d.aspect="atmost")),d.parentNode!=a&&a.appendChild(d)):d&&a.removeChild(d);e=b.rotation;if(void 0!==e||void 0!==a._rotation)a._rotation=e,b.externalGraphic?(this.graphicRotate(a,h,k,b),d.opacity=0):"OpenLayers.Geometry.Point"===a._geometryClass&&
-(a.style.rotation=e||0);h=a.getElementsByTagName("stroke");h=0==h.length?null:h[0];c.isStroked?(h||(h=this.createNode("olv:stroke",a.id+"_stroke"),a.appendChild(h)),h.on=!0,h.color=b.strokeColor,h.weight=b.strokeWidth+"px",h.opacity=b.strokeOpacity,h.endcap="butt"==b.strokeLinecap?"flat":b.strokeLinecap||"round",b.strokeDashstyle&&(h.dashstyle=this.dashStyle(b))):(a.stroked=!1,h&&(h.on=!1));"inherit"!=b.cursor&&null!=b.cursor&&(a.style.cursor=b.cursor);return a},graphicRotate:function(a,b,c,d){d=
-d||a._style;var e=d.rotation||0,f,g;if(d.graphicWidth&&d.graphicHeight){g=Math.max(d.graphicWidth,d.graphicHeight);f=d.graphicWidth/d.graphicHeight;var h=Math.round(d.graphicWidth||g*f),k=Math.round(d.graphicHeight||g);a.style.width=h+"px";a.style.height=k+"px";var l=document.getElementById(a.id+"_image");l||(l=this.createNode("olv:imagedata",a.id+"_image"),a.appendChild(l));l.style.width=h+"px";l.style.height=k+"px";l.src=d.externalGraphic;l.style.filter="progid:DXImageTransform.Microsoft.AlphaImageLoader(src='', sizingMethod='scale')";
-l=e*Math.PI/180;e=Math.sin(l);l=Math.cos(l);e="progid:DXImageTransform.Microsoft.Matrix(M11="+l+",M12="+-e+",M21="+e+",M22="+l+",SizingMethod='auto expand')\n";(l=d.graphicOpacity||d.fillOpacity)&&1!=l&&(e+="progid:DXImageTransform.Microsoft.BasicImage(opacity="+l+")\n");a.style.filter=e;e=new OpenLayers.Geometry.Point(-b,-c);h=(new OpenLayers.Bounds(0,0,h,k)).toGeometry();h.rotate(d.rotation,e);h=h.getBounds();a.style.left=Math.round(parseInt(a.style.left)+h.left)+"px";a.style.top=Math.round(parseInt(a.style.top)-
-h.bottom)+"px"}else{var m=new Image;m.onreadystatechange=OpenLayers.Function.bind(function(){if("complete"==m.readyState||"interactive"==m.readyState)f=m.width/m.height,g=Math.max(2*d.pointRadius,d.graphicWidth||0,d.graphicHeight||0),b*=f,d.graphicWidth=g*f,d.graphicHeight=g,this.graphicRotate(a,b,c,d)},this);m.src=d.externalGraphic}},postDraw:function(a){a.style.visibility="visible";var b=a._style.fillColor,c=a._style.strokeColor;"none"==b&&a.fillcolor!=b&&(a.fillcolor=b);"none"==c&&a.strokecolor!=
-c&&(a.strokecolor=c)},setNodeDimension:function(a,b){var c=b.getBounds();if(c){var d=this.getResolution(),c=new OpenLayers.Bounds((c.left-this.featureDx)/d-this.offset.x|0,c.bottom/d-this.offset.y|0,(c.right-this.featureDx)/d-this.offset.x|0,c.top/d-this.offset.y|0);a.style.left=c.left+"px";a.style.top=c.top+"px";a.style.width=c.getWidth()+"px";a.style.height=c.getHeight()+"px";a.coordorigin=c.left+" "+c.top;a.coordsize=c.getWidth()+" "+c.getHeight()}},dashStyle:function(a){a=a.strokeDashstyle;switch(a){case "solid":case "dot":case "dash":case "dashdot":case "longdash":case "longdashdot":return a;
-default:return a=a.split(/[ ,]/),2==a.length?1*a[0]>=2*a[1]?"longdash":1==a[0]||1==a[1]?"dot":"dash":4==a.length?1*a[0]>=2*a[1]?"longdashdot":"dashdot":"solid"}},createNode:function(a,b){var c=document.createElement(a);b&&(c.id=b);c.unselectable="on";c.onselectstart=OpenLayers.Function.False;return c},nodeTypeCompare:function(a,b){var c=b,d=c.indexOf(":");-1!=d&&(c=c.substr(d+1));var e=a.nodeName,d=e.indexOf(":");-1!=d&&(e=e.substr(d+1));return c==e},createRenderRoot:function(){return this.nodeFactory(this.container.id+
-"_vmlRoot","div")},createRoot:function(a){return this.nodeFactory(this.container.id+a,"olv:group")},drawPoint:function(a,b){return this.drawCircle(a,b,1)},drawCircle:function(a,b,c){if(!isNaN(b.x)&&!isNaN(b.y)){var d=this.getResolution();a.style.left=((b.x-this.featureDx)/d-this.offset.x|0)-c+"px";a.style.top=(b.y/d-this.offset.y|0)-c+"px";b=2*c;a.style.width=b+"px";a.style.height=b+"px";return a}return!1},drawLineString:function(a,b){return this.drawLine(a,b,!1)},drawLinearRing:function(a,b){return this.drawLine(a,
-b,!0)},drawLine:function(a,b,c){this.setNodeDimension(a,b);for(var d=this.getResolution(),e=b.components.length,f=Array(e),g,h,k=0;k<e;k++)g=b.components[k],h=(g.x-this.featureDx)/d-this.offset.x|0,g=g.y/d-this.offset.y|0,f[k]=" "+h+","+g+" l ";b=c?" x e":" e";a.path="m"+f.join("")+b;return a},drawPolygon:function(a,b){this.setNodeDimension(a,b);var c=this.getResolution(),d=[],e,f,g,h,k,l,m,n,p,q;e=0;for(f=b.components.length;e<f;e++){d.push("m");g=b.components[e].components;h=0===e;l=k=null;m=0;
-for(n=g.length;m<n;m++)p=g[m],q=(p.x-this.featureDx)/c-this.offset.x|0,p=p.y/c-this.offset.y|0,q=" "+q+","+p,d.push(q),0==m&&d.push(" l"),h||(k?k!=q&&(l?l!=q&&(h=!0):l=q):k=q);d.push(h?" x ":" ")}d.push("e");a.path=d.join("");return a},drawRectangle:function(a,b){var c=this.getResolution();a.style.left=((b.x-this.featureDx)/c-this.offset.x|0)+"px";a.style.top=(b.y/c-this.offset.y|0)+"px";a.style.width=(b.width/c|0)+"px";a.style.height=(b.height/c|0)+"px";return a},drawText:function(a,b,c){var d=this.nodeFactory(a+
-this.LABEL_ID_SUFFIX,"olv:rect"),e=this.nodeFactory(a+this.LABEL_ID_SUFFIX+"_textbox","olv:textbox"),f=this.getResolution();d.style.left=((c.x-this.featureDx)/f-this.offset.x|0)+"px";d.style.top=(c.y/f-this.offset.y|0)+"px";d.style.flip="y";e.innerText=b.label;"inherit"!=b.cursor&&null!=b.cursor&&(e.style.cursor=b.cursor);b.fontColor&&(e.style.color=b.fontColor);b.fontOpacity&&(e.style.filter="alpha(opacity="+100*b.fontOpacity+")");b.fontFamily&&(e.style.fontFamily=b.fontFamily);b.fontSize&&(e.style.fontSize=
-b.fontSize);b.fontWeight&&(e.style.fontWeight=b.fontWeight);b.fontStyle&&(e.style.fontStyle=b.fontStyle);!0===b.labelSelect&&(d._featureId=a,e._featureId=a,e._geometry=c,e._geometryClass=c.CLASS_NAME);e.style.whiteSpace="nowrap";e.inset="1px,0px,0px,0px";d.parentNode||(d.appendChild(e),this.textRoot.appendChild(d));b=b.labelAlign||"cm";1==b.length&&(b+="m");a=e.clientWidth*OpenLayers.Renderer.VML.LABEL_SHIFT[b.substr(0,1)];e=e.clientHeight*OpenLayers.Renderer.VML.LABEL_SHIFT[b.substr(1,1)];d.style.left=
-parseInt(d.style.left)-a-1+"px";d.style.top=parseInt(d.style.top)+e+"px"},moveRoot:function(a){var b=this.map.getLayer(a.container.id);b instanceof OpenLayers.Layer.Vector.RootContainer&&(b=this.map.getLayer(this.container.id));b&&b.renderer.clear();OpenLayers.Renderer.Elements.prototype.moveRoot.apply(this,arguments);b&&b.redraw()},importSymbol:function(a){var b=this.container.id+"-"+a,c=this.symbolCache[b];if(c)return c;c=OpenLayers.Renderer.symbol[a];if(!c)throw Error(a+" is not a valid symbol name");
-a=new OpenLayers.Bounds(Number.MAX_VALUE,Number.MAX_VALUE,0,0);for(var d=["m"],e=0;e<c.length;e+=2){var f=c[e],g=c[e+1];a.left=Math.min(a.left,f);a.bottom=Math.min(a.bottom,g);a.right=Math.max(a.right,f);a.top=Math.max(a.top,g);d.push(f);d.push(g);0==e&&d.push("l")}d.push("x e");c=d.join(" ");d=(a.getWidth()-a.getHeight())/2;0<d?(a.bottom-=d,a.top+=d):(a.left+=d,a.right-=d);c={path:c,size:a.getWidth(),left:a.left,bottom:a.bottom};return this.symbolCache[b]=c},CLASS_NAME:"OpenLayers.Renderer.VML"});
-OpenLayers.Renderer.VML.LABEL_SHIFT={l:0,c:0.5,r:1,t:0,m:0.5,b:1};OpenLayers.Control.CacheRead=OpenLayers.Class(OpenLayers.Control,{fetchEvent:"tileloadstart",layers:null,autoActivate:!0,setMap:function(a){OpenLayers.Control.prototype.setMap.apply(this,arguments);var b,c=this.layers||a.layers;for(b=c.length-1;0<=b;--b)this.addLayer({layer:c[b]});if(!this.layers)a.events.on({addlayer:this.addLayer,removeLayer:this.removeLayer,scope:this})},addLayer:function(a){a.layer.events.register(this.fetchEvent,this,this.fetch)},removeLayer:function(a){a.layer.events.unregister(this.fetchEvent,
-this,this.fetch)},fetch:function(a){if(this.active&&window.localStorage&&a.tile instanceof OpenLayers.Tile.Image){var b=a.tile,c=b.url;!b.layer.crossOriginKeyword&&(OpenLayers.ProxyHost&&0===c.indexOf(OpenLayers.ProxyHost))&&(c=OpenLayers.Control.CacheWrite.urlMap[c]);if(c=window.localStorage.getItem("olCache_"+c))b.url=c,"tileerror"===a.type&&b.setImgSrc(c)}},destroy:function(){if(this.layers||this.map){var a,b=this.layers||this.map.layers;for(a=b.length-1;0<=a;--a)this.removeLayer({layer:b[a]})}this.map&&
-this.map.events.un({addlayer:this.addLayer,removeLayer:this.removeLayer,scope:this});OpenLayers.Control.prototype.destroy.apply(this,arguments)},CLASS_NAME:"OpenLayers.Control.CacheRead"});OpenLayers.Protocol.WFS.v1_0_0=OpenLayers.Class(OpenLayers.Protocol.WFS.v1,{version:"1.0.0",CLASS_NAME:"OpenLayers.Protocol.WFS.v1_0_0"});OpenLayers.Format.WMSGetFeatureInfo=OpenLayers.Class(OpenLayers.Format.XML,{layerIdentifier:"_layer",featureIdentifier:"_feature",regExes:{trimSpace:/^\s*|\s*$/g,removeSpace:/\s*/g,splitSpace:/\s+/,trimComma:/\s*,\s*/g},gmlFormat:null,read:function(a){"string"==typeof a&&(a=OpenLayers.Format.XML.prototype.read.apply(this,[a]));var b=a.documentElement;if(b){var c=this["read_"+b.nodeName];a=c?c.call(this,b):(new OpenLayers.Format.GML(this.options?this.options:{})).read(a)}return a},read_msGMLOutput:function(a){var b=
-[];if(a=this.getSiblingNodesByTagCriteria(a,this.layerIdentifier))for(var c=0,d=a.length;c<d;++c){var e=a[c],f=e.nodeName;e.prefix&&(f=f.split(":")[1]);f=f.replace(this.layerIdentifier,"");if(e=this.getSiblingNodesByTagCriteria(e,this.featureIdentifier))for(var g=0;g<e.length;g++){var h=e[g],k=this.parseGeometry(h),h=this.parseAttributes(h),h=new OpenLayers.Feature.Vector(k.geometry,h,null);h.bounds=k.bounds;h.type=f;b.push(h)}}return b},read_FeatureInfoResponse:function(a){var b=[];a=this.getElementsByTagNameNS(a,
-"*","FIELDS");for(var c=0,d=a.length;c<d;c++){var e=a[c],f={},g,h=e.attributes.length;if(0<h)for(g=0;g<h;g++){var k=e.attributes[g];f[k.nodeName]=k.nodeValue}else for(e=e.childNodes,g=0,h=e.length;g<h;++g)k=e[g],3!=k.nodeType&&(f[k.getAttribute("name")]=k.getAttribute("value"));b.push(new OpenLayers.Feature.Vector(null,f,null))}return b},getSiblingNodesByTagCriteria:function(a,b){var c=[],d,e,f,g;if(a&&a.hasChildNodes()){d=a.childNodes;f=d.length;for(var h=0;h<f;h++){for(g=d[h];g&&1!=g.nodeType;)g=
-g.nextSibling,h++;e=g?g.nodeName:"";0<e.length&&-1<e.indexOf(b)?c.push(g):(e=this.getSiblingNodesByTagCriteria(g,b),0<e.length&&(0==c.length?c=e:c.push(e)))}}return c},parseAttributes:function(a){var b={};if(1==a.nodeType){a=a.childNodes;for(var c=a.length,d=0;d<c;++d){var e=a[d];if(1==e.nodeType){var f=e.childNodes,e=e.prefix?e.nodeName.split(":")[1]:e.nodeName;0==f.length?b[e]=null:1==f.length&&(f=f[0],3==f.nodeType||4==f.nodeType)&&(f=f.nodeValue.replace(this.regExes.trimSpace,""),b[e]=f)}}}return b},
-parseGeometry:function(a){this.gmlFormat||(this.gmlFormat=new OpenLayers.Format.GML);a=this.gmlFormat.parseFeature(a);var b,c=null;a&&(b=a.geometry&&a.geometry.clone(),c=a.bounds&&a.bounds.clone(),a.destroy());return{geometry:b,bounds:c}},CLASS_NAME:"OpenLayers.Format.WMSGetFeatureInfo"});OpenLayers.Control.WMTSGetFeatureInfo=OpenLayers.Class(OpenLayers.Control,{hover:!1,requestEncoding:"KVP",drillDown:!1,maxFeatures:10,clickCallback:"click",layers:null,queryVisible:!0,infoFormat:"text/html",vendorParams:{},format:null,formatOptions:null,handler:null,hoverRequest:null,pending:0,initialize:function(a){a=a||{};a.handlerOptions=a.handlerOptions||{};OpenLayers.Control.prototype.initialize.apply(this,[a]);this.format||(this.format=new OpenLayers.Format.WMSGetFeatureInfo(a.formatOptions));
-!0===this.drillDown&&(this.hover=!1);this.hover?this.handler=new OpenLayers.Handler.Hover(this,{move:this.cancelHover,pause:this.getInfoForHover},OpenLayers.Util.extend(this.handlerOptions.hover||{},{delay:250})):(a={},a[this.clickCallback]=this.getInfoForClick,this.handler=new OpenLayers.Handler.Click(this,a,this.handlerOptions.click||{}))},getInfoForClick:function(a){this.request(a.xy,{})},getInfoForHover:function(a){this.request(a.xy,{hover:!0})},cancelHover:function(){this.hoverRequest&&(--this.pending,
-0>=this.pending&&(OpenLayers.Element.removeClass(this.map.viewPortDiv,"olCursorWait"),this.pending=0),this.hoverRequest.abort(),this.hoverRequest=null)},findLayers:function(){for(var a=this.layers||this.map.layers,b=[],c,d=a.length-1;0<=d&&(c=a[d],!(c instanceof OpenLayers.Layer.WMTS)||(c.requestEncoding!==this.requestEncoding||this.queryVisible&&!c.getVisibility())||(b.push(c),this.drillDown&&!this.hover));--d);return b},buildRequestOptions:function(a,b){var c=this.map.getLonLatFromPixel(b),d=a.getURL(new OpenLayers.Bounds(c.lon,
-c.lat,c.lon,c.lat)),d=OpenLayers.Util.getParameters(d),c=a.getTileInfo(c);OpenLayers.Util.extend(d,{service:"WMTS",version:a.version,request:"GetFeatureInfo",infoFormat:this.infoFormat,i:c.i,j:c.j});OpenLayers.Util.applyDefaults(d,this.vendorParams);return{url:OpenLayers.Util.isArray(a.url)?a.url[0]:a.url,params:OpenLayers.Util.upperCaseObject(d),callback:function(c){this.handleResponse(b,c,a)},scope:this}},request:function(a,b){b=b||{};var c=this.findLayers();if(0<c.length){for(var d,e,f=0,g=c.length;f<
-g;f++)e=c[f],d=this.events.triggerEvent("beforegetfeatureinfo",{xy:a,layer:e}),!1!==d&&(++this.pending,d=this.buildRequestOptions(e,a),d=OpenLayers.Request.GET(d),!0===b.hover&&(this.hoverRequest=d));0<this.pending&&OpenLayers.Element.addClass(this.map.viewPortDiv,"olCursorWait")}},handleResponse:function(a,b,c){--this.pending;0>=this.pending&&(OpenLayers.Element.removeClass(this.map.viewPortDiv,"olCursorWait"),this.pending=0);if(b.status&&(200>b.status||300<=b.status))this.events.triggerEvent("exception",
-{xy:a,request:b,layer:c});else{var d=b.responseXML;d&&d.documentElement||(d=b.responseText);var e,f;try{e=this.format.read(d)}catch(g){f=!0,this.events.triggerEvent("exception",{xy:a,request:b,error:g,layer:c})}f||this.events.triggerEvent("getfeatureinfo",{text:b.responseText,features:e,request:b,xy:a,layer:c})}},CLASS_NAME:"OpenLayers.Control.WMTSGetFeatureInfo"});OpenLayers.Protocol.CSW.v2_0_2=OpenLayers.Class(OpenLayers.Protocol,{formatOptions:null,initialize:function(a){OpenLayers.Protocol.prototype.initialize.apply(this,[a]);a.format||(this.format=new OpenLayers.Format.CSWGetRecords.v2_0_2(OpenLayers.Util.extend({},this.formatOptions)))},destroy:function(){this.options&&!this.options.format&&this.format.destroy();this.format=null;OpenLayers.Protocol.prototype.destroy.apply(this)},read:function(a){a=OpenLayers.Util.extend({},a);OpenLayers.Util.applyDefaults(a,
-this.options||{});var b=new OpenLayers.Protocol.Response({requestType:"read"}),c=this.format.write(a.params||a);b.priv=OpenLayers.Request.POST({url:a.url,callback:this.createCallback(this.handleRead,b,a),params:a.params,headers:a.headers,data:c});return b},handleRead:function(a,b){if(b.callback){var c=a.priv;200<=c.status&&300>c.status?(a.data=this.parseData(c),a.code=OpenLayers.Protocol.Response.SUCCESS):a.code=OpenLayers.Protocol.Response.FAILURE;b.callback.call(b.scope,a)}},parseData:function(a){var b=
-a.responseXML;b&&b.documentElement||(b=a.responseText);return!b||0>=b.length?null:this.format.read(b)},CLASS_NAME:"OpenLayers.Protocol.CSW.v2_0_2"});OpenLayers.Format.WCSCapabilities.v1_1_0=OpenLayers.Class(OpenLayers.Format.WCSCapabilities.v1,{namespaces:{wcs:"http://www.opengis.net/wcs/1.1",xlink:"http://www.w3.org/1999/xlink",xsi:"http://www.w3.org/2001/XMLSchema-instance",ows:"http://www.opengis.net/ows/1.1"},errorProperty:"operationsMetadata",readers:{wcs:OpenLayers.Util.applyDefaults({Capabilities:function(a,b){this.readChildNodes(a,b)},Contents:function(a,b){b.contentMetadata=[];this.readChildNodes(a,b.contentMetadata)},CoverageSummary:function(a,
-b){var c={};this.readChildNodes(a,c);b.push(c)},Identifier:function(a,b){b.identifier=this.getChildValue(a)},Title:function(a,b){b.title=this.getChildValue(a)},Abstract:function(a,b){b["abstract"]=this.getChildValue(a)},SupportedCRS:function(a,b){var c=this.getChildValue(a);c&&(b.supportedCRS||(b.supportedCRS=[]),b.supportedCRS.push(c))},SupportedFormat:function(a,b){var c=this.getChildValue(a);c&&(b.supportedFormat||(b.supportedFormat=[]),b.supportedFormat.push(c))}},OpenLayers.Format.WCSCapabilities.v1.prototype.readers.wcs),
-ows:OpenLayers.Format.OWSCommon.v1_1_0.prototype.readers.ows},CLASS_NAME:"OpenLayers.Format.WCSCapabilities.v1_1_0"});OpenLayers.Control.Graticule=OpenLayers.Class(OpenLayers.Control,{autoActivate:!0,intervals:[45,30,20,10,5,2,1,0.5,0.2,0.1,0.05,0.01,0.005,0.002,0.001],displayInLayerSwitcher:!0,visible:!0,numPoints:50,targetSize:200,layerName:null,labelled:!0,labelFormat:"dm",lineSymbolizer:{strokeColor:"#333",strokeWidth:1,strokeOpacity:0.5},labelSymbolizer:{},gratLayer:null,initialize:function(a){a=a||{};a.layerName=a.layerName||OpenLayers.i18n("Graticule");OpenLayers.Control.prototype.initialize.apply(this,[a]);
-this.labelSymbolizer.stroke=!1;this.labelSymbolizer.fill=!1;this.labelSymbolizer.label="${label}";this.labelSymbolizer.labelAlign="${labelAlign}";this.labelSymbolizer.labelXOffset="${xOffset}";this.labelSymbolizer.labelYOffset="${yOffset}"},destroy:function(){this.deactivate();OpenLayers.Control.prototype.destroy.apply(this,arguments);this.gratLayer&&(this.gratLayer.destroy(),this.gratLayer=null)},draw:function(){OpenLayers.Control.prototype.draw.apply(this,arguments);if(!this.gratLayer){var a=new OpenLayers.Style({},
-{rules:[new OpenLayers.Rule({symbolizer:{Point:this.labelSymbolizer,Line:this.lineSymbolizer}})]});this.gratLayer=new OpenLayers.Layer.Vector(this.layerName,{styleMap:new OpenLayers.StyleMap({"default":a}),visibility:this.visible,displayInLayerSwitcher:this.displayInLayerSwitcher})}return this.div},activate:function(){return OpenLayers.Control.prototype.activate.apply(this,arguments)?(this.map.addLayer(this.gratLayer),this.map.events.register("moveend",this,this.update),this.update(),!0):!1},deactivate:function(){return OpenLayers.Control.prototype.deactivate.apply(this,
-arguments)?(this.map.events.unregister("moveend",this,this.update),this.map.removeLayer(this.gratLayer),!0):!1},update:function(){var a=this.map.getExtent();if(a){this.gratLayer.destroyFeatures();var b=new OpenLayers.Projection("EPSG:4326"),c=this.map.getProjectionObject(),d=this.map.getResolution();c.proj&&"longlat"==c.proj.projName&&(this.numPoints=1);var e=this.map.getCenter(),f=new OpenLayers.Pixel(e.lon,e.lat);OpenLayers.Projection.transform(f,c,b);for(var e=this.targetSize*d,e=e*e,g,d=0;d<this.intervals.length;++d){g=
-this.intervals[d];var h=g/2,k=f.offset({x:-h,y:-h}),h=f.offset({x:h,y:h});OpenLayers.Projection.transform(k,b,c);OpenLayers.Projection.transform(h,b,c);if((k.x-h.x)*(k.x-h.x)+(k.y-h.y)*(k.y-h.y)<=e)break}f.x=Math.floor(f.x/g)*g;f.y=Math.floor(f.y/g)*g;var d=0,e=[f.clone()],h=f.clone(),l;do h=h.offset({x:0,y:g}),l=OpenLayers.Projection.transform(h.clone(),b,c),e.unshift(h);while(a.containsPixel(l)&&1E3>++d);h=f.clone();do h=h.offset({x:0,y:-g}),l=OpenLayers.Projection.transform(h.clone(),b,c),e.push(h);
-while(a.containsPixel(l)&&1E3>++d);d=0;k=[f.clone()];h=f.clone();do h=h.offset({x:-g,y:0}),l=OpenLayers.Projection.transform(h.clone(),b,c),k.unshift(h);while(a.containsPixel(l)&&1E3>++d);h=f.clone();do h=h.offset({x:g,y:0}),l=OpenLayers.Projection.transform(h.clone(),b,c),k.push(h);while(a.containsPixel(l)&&1E3>++d);g=[];for(d=0;d<k.length;++d){l=k[d].x;for(var f=[],m=null,n=Math.min(e[0].y,90),h=Math.max(e[e.length-1].y,-90),p=(n-h)/this.numPoints,n=h,h=0;h<=this.numPoints;++h){var q=new OpenLayers.Geometry.Point(l,
-n);q.transform(b,c);f.push(q);n+=p;q.y>=a.bottom&&!m&&(m=q)}this.labelled&&(m=new OpenLayers.Geometry.Point(m.x,a.bottom),l={value:l,label:this.labelled?OpenLayers.Util.getFormattedLonLat(l,"lon",this.labelFormat):"",labelAlign:"cb",xOffset:0,yOffset:2},this.gratLayer.addFeatures(new OpenLayers.Feature.Vector(m,l)));f=new OpenLayers.Geometry.LineString(f);g.push(new OpenLayers.Feature.Vector(f))}for(h=0;h<e.length;++h)if(n=e[h].y,!(-90>n||90<n)){f=[];d=k[0].x;p=(k[k.length-1].x-d)/this.numPoints;
-l=d;m=null;for(d=0;d<=this.numPoints;++d)q=new OpenLayers.Geometry.Point(l,n),q.transform(b,c),f.push(q),l+=p,q.x<a.right&&(m=q);this.labelled&&(m=new OpenLayers.Geometry.Point(a.right,m.y),l={value:n,label:this.labelled?OpenLayers.Util.getFormattedLonLat(n,"lat",this.labelFormat):"",labelAlign:"rb",xOffset:-2,yOffset:2},this.gratLayer.addFeatures(new OpenLayers.Feature.Vector(m,l)));f=new OpenLayers.Geometry.LineString(f);g.push(new OpenLayers.Feature.Vector(f))}this.gratLayer.addFeatures(g)}},CLASS_NAME:"OpenLayers.Control.Graticule"});OpenLayers.Console.warn("OpenLayers.Rico is deprecated");OpenLayers.Rico=OpenLayers.Rico||{};
-OpenLayers.Rico.Corner={round:function(a,b){a=OpenLayers.Util.getElement(a);this._setOptions(b);var c=this.options.color;"fromElement"==this.options.color&&(c=this._background(a));var d=this.options.bgColor;"fromParent"==this.options.bgColor&&(d=this._background(a.offsetParent));this._roundCornersImpl(a,c,d)},changeColor:function(a,b){a.style.backgroundColor=b;for(var c=a.parentNode.getElementsByTagName("span"),d=0;d<c.length;d++)c[d].style.backgroundColor=b},changeOpacity:function(a,b){var c="alpha(opacity="+
-100*b+")";a.style.opacity=b;a.style.filter=c;for(var d=a.parentNode.getElementsByTagName("span"),e=0;e<d.length;e++)d[e].style.opacity=b,d[e].style.filter=c},reRound:function(a,b){var c=a.parentNode.childNodes[2];a.parentNode.removeChild(a.parentNode.childNodes[0]);a.parentNode.removeChild(c);this.round(a.parentNode,b)},_roundCornersImpl:function(a,b,c){this.options.border&&this._renderBorder(a,c);this._isTopRounded()&&this._roundTopCorners(a,b,c);this._isBottomRounded()&&this._roundBottomCorners(a,
-b,c)},_renderBorder:function(a,b){var c="1px solid "+this._borderColor(b);a.innerHTML="<div "+("style='border-left: "+c+";"+("border-right: "+c)+"'")+">"+a.innerHTML+"</div>"},_roundTopCorners:function(a,b,c){for(var d=this._createCorner(c),e=0;e<this.options.numSlices;e++)d.appendChild(this._createCornerSlice(b,c,e,"top"));a.style.paddingTop=0;a.insertBefore(d,a.firstChild)},_roundBottomCorners:function(a,b,c){for(var d=this._createCorner(c),e=this.options.numSlices-1;0<=e;e--)d.appendChild(this._createCornerSlice(b,
-c,e,"bottom"));a.style.paddingBottom=0;a.appendChild(d)},_createCorner:function(a){var b=document.createElement("div");b.style.backgroundColor=this._isTransparent()?"transparent":a;return b},_createCornerSlice:function(a,b,c,d){var e=document.createElement("span"),f=e.style;f.backgroundColor=a;f.display="block";f.height="1px";f.overflow="hidden";f.fontSize="1px";a=this._borderColor(a,b);this.options.border&&0==c?(f.borderTopStyle="solid",f.borderTopWidth="1px",f.borderLeftWidth="0px",f.borderRightWidth=
-"0px",f.borderBottomWidth="0px",f.height="0px",f.borderColor=a):a&&(f.borderColor=a,f.borderStyle="solid",f.borderWidth="0px 1px");this.options.compact||c!=this.options.numSlices-1||(f.height="2px");this._setMargin(e,c,d);this._setBorder(e,c,d);return e},_setOptions:function(a){this.options={corners:"all",color:"fromElement",bgColor:"fromParent",blend:!0,border:!1,compact:!1};OpenLayers.Util.extend(this.options,a||{});this.options.numSlices=this.options.compact?2:4;this._isTransparent()&&(this.options.blend=
-!1)},_whichSideTop:function(){return this._hasString(this.options.corners,"all","top")||0<=this.options.corners.indexOf("tl")&&0<=this.options.corners.indexOf("tr")?"":0<=this.options.corners.indexOf("tl")?"left":0<=this.options.corners.indexOf("tr")?"right":""},_whichSideBottom:function(){return this._hasString(this.options.corners,"all","bottom")||0<=this.options.corners.indexOf("bl")&&0<=this.options.corners.indexOf("br")?"":0<=this.options.corners.indexOf("bl")?"left":0<=this.options.corners.indexOf("br")?
-"right":""},_borderColor:function(a,b){return"transparent"==a?b:this.options.border?this.options.border:this.options.blend?this._blend(b,a):""},_setMargin:function(a,b,c){b=this._marginSize(b);c="top"==c?this._whichSideTop():this._whichSideBottom();"left"==c?(a.style.marginLeft=b+"px",a.style.marginRight="0px"):"right"==c?(a.style.marginRight=b+"px",a.style.marginLeft="0px"):(a.style.marginLeft=b+"px",a.style.marginRight=b+"px")},_setBorder:function(a,b,c){b=this._borderSize(b);c="top"==c?this._whichSideTop():
-this._whichSideBottom();"left"==c?(a.style.borderLeftWidth=b+"px",a.style.borderRightWidth="0px"):"right"==c?(a.style.borderRightWidth=b+"px",a.style.borderLeftWidth="0px"):(a.style.borderLeftWidth=b+"px",a.style.borderRightWidth=b+"px");!1!=this.options.border&&(a.style.borderLeftWidth=b+"px",a.style.borderRightWidth=b+"px")},_marginSize:function(a){if(this._isTransparent())return 0;var b=[5,3,2,1],c=[3,2,1,0],d=[2,1],e=[1,0];return this.options.compact&&this.options.blend?e[a]:this.options.compact?
-d[a]:this.options.blend?c[a]:b[a]},_borderSize:function(a){var b=[5,3,2,1],c=[2,1,1,1],d=[1,0],e=[0,2,0,0];return this.options.compact&&(this.options.blend||this._isTransparent())?1:this.options.compact?d[a]:this.options.blend?c[a]:this.options.border?e[a]:this._isTransparent()?b[a]:0},_hasString:function(a){for(var b=1;b<arguments.length;b++)if(0<=a.indexOf(arguments[b]))return!0;return!1},_blend:function(a,b){var c=OpenLayers.Rico.Color.createFromHex(a);c.blend(OpenLayers.Rico.Color.createFromHex(b));
-return c},_background:function(a){try{return OpenLayers.Rico.Color.createColorFromBackground(a).asHex()}catch(b){return"#ffffff"}},_isTransparent:function(){return"transparent"==this.options.color},_isTopRounded:function(){return this._hasString(this.options.corners,"all","top","tl","tr")},_isBottomRounded:function(){return this._hasString(this.options.corners,"all","bottom","bl","br")},_hasSingleTextChild:function(a){return 1==a.childNodes.length&&3==a.childNodes[0].nodeType}};OpenLayers.Control.NavigationHistory=OpenLayers.Class(OpenLayers.Control,{type:OpenLayers.Control.TYPE_TOGGLE,previous:null,previousOptions:null,next:null,nextOptions:null,limit:50,autoActivate:!0,clearOnDeactivate:!1,registry:null,nextStack:null,previousStack:null,listeners:null,restoring:!1,initialize:function(a){OpenLayers.Control.prototype.initialize.apply(this,[a]);this.registry=OpenLayers.Util.extend({moveend:this.getState},this.registry);a={trigger:OpenLayers.Function.bind(this.previousTrigger,
-this),displayClass:this.displayClass+" "+this.displayClass+"Previous"};OpenLayers.Util.extend(a,this.previousOptions);this.previous=new OpenLayers.Control.Button(a);a={trigger:OpenLayers.Function.bind(this.nextTrigger,this),displayClass:this.displayClass+" "+this.displayClass+"Next"};OpenLayers.Util.extend(a,this.nextOptions);this.next=new OpenLayers.Control.Button(a);this.clear()},onPreviousChange:function(a,b){a&&!this.previous.active?this.previous.activate():!a&&this.previous.active&&this.previous.deactivate()},
-onNextChange:function(a,b){a&&!this.next.active?this.next.activate():!a&&this.next.active&&this.next.deactivate()},destroy:function(){OpenLayers.Control.prototype.destroy.apply(this);this.previous.destroy();this.next.destroy();this.deactivate();for(var a in this)this[a]=null},setMap:function(a){this.map=a;this.next.setMap(a);this.previous.setMap(a)},draw:function(){OpenLayers.Control.prototype.draw.apply(this,arguments);this.next.draw();this.previous.draw()},previousTrigger:function(){var a=this.previousStack.shift(),
-b=this.previousStack.shift();void 0!=b?(this.nextStack.unshift(a),this.previousStack.unshift(b),this.restoring=!0,this.restore(b),this.restoring=!1,this.onNextChange(this.nextStack[0],this.nextStack.length),this.onPreviousChange(this.previousStack[1],this.previousStack.length-1)):this.previousStack.unshift(a);return b},nextTrigger:function(){var a=this.nextStack.shift();void 0!=a&&(this.previousStack.unshift(a),this.restoring=!0,this.restore(a),this.restoring=!1,this.onNextChange(this.nextStack[0],
-this.nextStack.length),this.onPreviousChange(this.previousStack[1],this.previousStack.length-1));return a},clear:function(){this.previousStack=[];this.previous.deactivate();this.nextStack=[];this.next.deactivate()},getState:function(){return{center:this.map.getCenter(),resolution:this.map.getResolution(),projection:this.map.getProjectionObject(),units:this.map.getProjectionObject().getUnits()||this.map.units||this.map.baseLayer.units}},restore:function(a){var b,c;if(this.map.getProjectionObject()==
-a.projection)c=this.map.getZoomForResolution(a.resolution),b=a.center;else{b=a.center.clone();b.transform(a.projection,this.map.getProjectionObject());c=a.units;var d=this.map.getProjectionObject().getUnits()||this.map.units||this.map.baseLayer.units;c=this.map.getZoomForResolution((c&&d?OpenLayers.INCHES_PER_UNIT[c]/OpenLayers.INCHES_PER_UNIT[d]:1)*a.resolution)}this.map.setCenter(b,c)},setListeners:function(){this.listeners={};for(var a in this.registry)this.listeners[a]=OpenLayers.Function.bind(function(){if(!this.restoring){var b=
-this.registry[a].apply(this,arguments);this.previousStack.unshift(b);if(1<this.previousStack.length)this.onPreviousChange(this.previousStack[1],this.previousStack.length-1);this.previousStack.length>this.limit+1&&this.previousStack.pop();0<this.nextStack.length&&(this.nextStack=[],this.onNextChange(null,0))}return!0},this)},activate:function(){var a=!1;if(this.map&&OpenLayers.Control.prototype.activate.apply(this)){null==this.listeners&&this.setListeners();for(var b in this.listeners)this.map.events.register(b,
-this,this.listeners[b]);a=!0;0==this.previousStack.length&&this.initStack()}return a},initStack:function(){this.map.getCenter()&&this.listeners.moveend()},deactivate:function(){var a=!1;if(this.map&&OpenLayers.Control.prototype.deactivate.apply(this)){for(var b in this.listeners)this.map.events.unregister(b,this,this.listeners[b]);this.clearOnDeactivate&&this.clear();a=!0}return a},CLASS_NAME:"OpenLayers.Control.NavigationHistory"});OpenLayers.Layer.UTFGrid=OpenLayers.Class(OpenLayers.Layer.XYZ,{isBaseLayer:!1,projection:new OpenLayers.Projection("EPSG:900913"),useJSONP:!1,tileClass:OpenLayers.Tile.UTFGrid,initialize:function(a){OpenLayers.Layer.Grid.prototype.initialize.apply(this,[a.name,a.url,{},a]);this.tileOptions=OpenLayers.Util.extend({utfgridResolution:this.utfgridResolution},this.tileOptions)},createBackBuffer:function(){},clone:function(a){null==a&&(a=new OpenLayers.Layer.UTFGrid(this.getOptions()));return a=OpenLayers.Layer.Grid.prototype.clone.apply(this,
-[a])},getFeatureInfo:function(a){var b=null;(a=this.getTileData(a))&&a.tile&&(b=a.tile.getFeatureInfo(a.i,a.j));return b},getFeatureId:function(a){var b=null;a=this.getTileData(a);a.tile&&(b=a.tile.getFeatureId(a.i,a.j));return b},CLASS_NAME:"OpenLayers.Layer.UTFGrid"});OpenLayers.TileManager=OpenLayers.Class({cacheSize:256,tilesPerFrame:2,frameDelay:16,moveDelay:100,zoomDelay:200,maps:null,tileQueueId:null,tileQueue:null,tileCache:null,tileCacheIndex:null,initialize:function(a){OpenLayers.Util.extend(this,a);this.maps=[];this.tileQueueId={};this.tileQueue={};this.tileCache={};this.tileCacheIndex=[]},addMap:function(a){if(!this._destroyed&&OpenLayers.Layer.Grid){this.maps.push(a);this.tileQueue[a.id]=[];for(var b=0,c=a.layers.length;b<c;++b)this.addLayer({layer:a.layers[b]});
-a.events.on({move:this.move,zoomend:this.zoomEnd,changelayer:this.changeLayer,addlayer:this.addLayer,preremovelayer:this.removeLayer,scope:this})}},removeMap:function(a){if(!this._destroyed&&OpenLayers.Layer.Grid){window.clearTimeout(this.tileQueueId[a.id]);if(a.layers)for(var b=0,c=a.layers.length;b<c;++b)this.removeLayer({layer:a.layers[b]});a.events&&a.events.un({move:this.move,zoomend:this.zoomEnd,changelayer:this.changeLayer,addlayer:this.addLayer,preremovelayer:this.removeLayer,scope:this});
-delete this.tileQueue[a.id];delete this.tileQueueId[a.id];OpenLayers.Util.removeItem(this.maps,a)}},move:function(a){this.updateTimeout(a.object,this.moveDelay,!0)},zoomEnd:function(a){this.updateTimeout(a.object,this.zoomDelay)},changeLayer:function(a){"visibility"!==a.property&&"params"!==a.property||this.updateTimeout(a.object,0)},addLayer:function(a){a=a.layer;if(a instanceof OpenLayers.Layer.Grid){a.events.on({addtile:this.addTile,retile:this.clearTileQueue,scope:this});var b,c,d;for(b=a.grid.length-
-1;0<=b;--b)for(c=a.grid[b].length-1;0<=c;--c)d=a.grid[b][c],this.addTile({tile:d}),d.url&&!d.imgDiv&&this.manageTileCache({object:d})}},removeLayer:function(a){a=a.layer;if(a instanceof OpenLayers.Layer.Grid&&(this.clearTileQueue({object:a}),a.events&&a.events.un({addtile:this.addTile,retile:this.clearTileQueue,scope:this}),a.grid)){var b,c,d;for(b=a.grid.length-1;0<=b;--b)for(c=a.grid[b].length-1;0<=c;--c)d=a.grid[b][c],this.unloadTile({object:d})}},updateTimeout:function(a,b,c){window.clearTimeout(this.tileQueueId[a.id]);
-var d=this.tileQueue[a.id];if(!c||d.length)this.tileQueueId[a.id]=window.setTimeout(OpenLayers.Function.bind(function(){this.drawTilesFromQueue(a);d.length&&this.updateTimeout(a,this.frameDelay)},this),b)},addTile:function(a){if(a.tile instanceof OpenLayers.Tile.Image)a.tile.events.on({beforedraw:this.queueTileDraw,beforeload:this.manageTileCache,loadend:this.addToCache,unload:this.unloadTile,scope:this});else this.removeLayer({layer:a.tile.layer})},unloadTile:function(a){a=a.object;a.events.un({beforedraw:this.queueTileDraw,
-beforeload:this.manageTileCache,loadend:this.addToCache,unload:this.unloadTile,scope:this});OpenLayers.Util.removeItem(this.tileQueue[a.layer.map.id],a)},queueTileDraw:function(a){a=a.object;var b=!1,c=a.layer,d=c.getURL(a.bounds),e=this.tileCache[d];e&&"olTileImage"!==e.className&&(delete this.tileCache[d],OpenLayers.Util.removeItem(this.tileCacheIndex,d),e=null);!c.url||!c.async&&e||(b=this.tileQueue[c.map.id],~OpenLayers.Util.indexOf(b,a)||b.push(a),b=!0);return!b},drawTilesFromQueue:function(a){var b=
-this.tileQueue[a.id],c=this.tilesPerFrame;for(a=a.zoomTween&&a.zoomTween.playing;!a&&b.length&&c;)b.shift().draw(!0),--c},manageTileCache:function(a){a=a.object;var b=this.tileCache[a.url];b&&(b.parentNode&&OpenLayers.Element.hasClass(b.parentNode,"olBackBuffer")&&(b.parentNode.removeChild(b),b.id=null),b.parentNode||(b.style.visibility="hidden",b.style.opacity=0,a.setImage(b),OpenLayers.Util.removeItem(this.tileCacheIndex,a.url),this.tileCacheIndex.push(a.url)))},addToCache:function(a){a=a.object;
-this.tileCache[a.url]||OpenLayers.Element.hasClass(a.imgDiv,"olImageLoadError")||(this.tileCacheIndex.length>=this.cacheSize&&(delete this.tileCache[this.tileCacheIndex[0]],this.tileCacheIndex.shift()),this.tileCache[a.url]=a.imgDiv,this.tileCacheIndex.push(a.url))},clearTileQueue:function(a){a=a.object;for(var b=this.tileQueue[a.map.id],c=b.length-1;0<=c;--c)b[c].layer===a&&b.splice(c,1)},destroy:function(){for(var a=this.maps.length-1;0<=a;--a)this.removeMap(this.maps[a]);this.tileCacheIndex=this.tileCache=
-this.tileQueueId=this.tileQueue=this.maps=null;this._destroyed=!0}});OpenLayers.Layer.ArcGISCache=OpenLayers.Class(OpenLayers.Layer.XYZ,{url:null,tileOrigin:null,tileSize:new OpenLayers.Size(256,256),useArcGISServer:!0,type:"png",useScales:!1,overrideDPI:!1,initialize:function(a,b,c){OpenLayers.Layer.XYZ.prototype.initialize.apply(this,arguments);this.resolutions&&(this.serverResolutions=this.resolutions,this.maxExtent=this.getMaxExtentForResolution(this.resolutions[0]));if(this.layerInfo){var d=this.layerInfo,e=new OpenLayers.Bounds(d.fullExtent.xmin,d.fullExtent.ymin,
-d.fullExtent.xmax,d.fullExtent.ymax);this.projection="EPSG:"+d.spatialReference.wkid;this.sphericalMercator=102100==d.spatialReference.wkid;this.units="esriFeet"==d.units?"ft":"m";if(d.tileInfo){this.tileSize=new OpenLayers.Size(d.tileInfo.width||d.tileInfo.cols,d.tileInfo.height||d.tileInfo.rows);this.tileOrigin=new OpenLayers.LonLat(d.tileInfo.origin.x,d.tileInfo.origin.y);var f=new OpenLayers.Geometry.Point(e.left,e.top),e=new OpenLayers.Geometry.Point(e.right,e.bottom);this.useScales?this.scales=
-[]:this.resolutions=[];this.lods=[];for(var g in d.tileInfo.lods)if(d.tileInfo.lods.hasOwnProperty(g)){var h=d.tileInfo.lods[g];this.useScales?this.scales.push(h.scale):this.resolutions.push(h.resolution);var k=this.getContainingTileCoords(f,h.resolution);h.startTileCol=k.x;h.startTileRow=k.y;k=this.getContainingTileCoords(e,h.resolution);h.endTileCol=k.x;h.endTileRow=k.y;this.lods.push(h)}this.maxExtent=this.calculateMaxExtentWithLOD(this.lods[0]);this.serverResolutions=this.resolutions;this.overrideDPI&&
-d.tileInfo.dpi&&(OpenLayers.DOTS_PER_INCH=d.tileInfo.dpi)}}},getContainingTileCoords:function(a,b){return new OpenLayers.Pixel(Math.max(Math.floor((a.x-this.tileOrigin.lon)/(this.tileSize.w*b)),0),Math.max(Math.floor((this.tileOrigin.lat-a.y)/(this.tileSize.h*b)),0))},calculateMaxExtentWithLOD:function(a){var b=this.tileOrigin.lon+a.startTileCol*this.tileSize.w*a.resolution,c=this.tileOrigin.lat-a.startTileRow*this.tileSize.h*a.resolution;return new OpenLayers.Bounds(b,c-(a.endTileRow-a.startTileRow+
-1)*this.tileSize.h*a.resolution,b+(a.endTileCol-a.startTileCol+1)*this.tileSize.w*a.resolution,c)},calculateMaxExtentWithExtent:function(a,b){var c=new OpenLayers.Geometry.Point(a.left,a.top),d=new OpenLayers.Geometry.Point(a.right,a.bottom),c=this.getContainingTileCoords(c,b),d=this.getContainingTileCoords(d,b);return this.calculateMaxExtentWithLOD({resolution:b,startTileCol:c.x,startTileRow:c.y,endTileCol:d.x,endTileRow:d.y})},getUpperLeftTileCoord:function(a){var b=new OpenLayers.Geometry.Point(this.maxExtent.left,
-this.maxExtent.top);return this.getContainingTileCoords(b,a)},getLowerRightTileCoord:function(a){var b=new OpenLayers.Geometry.Point(this.maxExtent.right,this.maxExtent.bottom);return this.getContainingTileCoords(b,a)},getMaxExtentForResolution:function(a){var b=this.getUpperLeftTileCoord(a),c=this.getLowerRightTileCoord(a),d=this.tileOrigin.lon+b.x*this.tileSize.w*a,e=this.tileOrigin.lat-b.y*this.tileSize.h*a;return new OpenLayers.Bounds(d,e-(c.y-b.y+1)*this.tileSize.h*a,d+(c.x-b.x+1)*this.tileSize.w*
-a,e)},clone:function(a){null==a&&(a=new OpenLayers.Layer.ArcGISCache(this.name,this.url,this.options));return OpenLayers.Layer.XYZ.prototype.clone.apply(this,[a])},initGriddedTiles:function(a){delete this._tileOrigin;OpenLayers.Layer.XYZ.prototype.initGriddedTiles.apply(this,arguments)},getMaxExtent:function(){var a=this.map.getResolution();return this.maxExtent=this.getMaxExtentForResolution(a)},getTileOrigin:function(){if(!this._tileOrigin){var a=this.getMaxExtent();this._tileOrigin=new OpenLayers.LonLat(a.left,
-a.bottom)}return this._tileOrigin},getURL:function(a){var b=this.getResolution(),c=this.tileOrigin.lon+b*this.tileSize.w/2,d=this.tileOrigin.lat-b*this.tileSize.h/2;a=a.getCenterLonLat();c=Math.round(Math.abs((a.lon-c)/(b*this.tileSize.w)));d=Math.round(Math.abs((d-a.lat)/(b*this.tileSize.h)));a=this.map.getZoom();if(this.lods){if(b=this.lods[this.map.getZoom()],c<b.startTileCol||c>b.endTileCol||d<b.startTileRow||d>b.endTileRow)return null}else{var e=this.getUpperLeftTileCoord(b),b=this.getLowerRightTileCoord(b);
-if(c<e.x||c>=b.x||d<e.y||d>=b.y)return null}b=this.url;e=""+c+d+a;OpenLayers.Util.isArray(b)&&(b=this.selectUrl(e,b));this.useArcGISServer?b+="/tile/${z}/${y}/${x}":(c="C"+OpenLayers.Number.zeroPad(c,8,16),d="R"+OpenLayers.Number.zeroPad(d,8,16),a="L"+OpenLayers.Number.zeroPad(a,2,10),b=b+"/${z}/${y}/${x}."+this.type);b=OpenLayers.String.format(b,{x:c,y:d,z:a});return OpenLayers.Util.urlAppend(b,OpenLayers.Util.getParameterString(this.params))},CLASS_NAME:"OpenLayers.Layer.ArcGISCache"});OpenLayers.Control.WMSGetFeatureInfo=OpenLayers.Class(OpenLayers.Control,{hover:!1,drillDown:!1,maxFeatures:10,clickCallback:"click",output:"features",layers:null,queryVisible:!1,url:null,layerUrls:null,infoFormat:"text/html",vendorParams:{},format:null,formatOptions:null,handler:null,hoverRequest:null,initialize:function(a){a=a||{};a.handlerOptions=a.handlerOptions||{};OpenLayers.Control.prototype.initialize.apply(this,[a]);this.format||(this.format=new OpenLayers.Format.WMSGetFeatureInfo(a.formatOptions));
-!0===this.drillDown&&(this.hover=!1);this.hover?this.handler=new OpenLayers.Handler.Hover(this,{move:this.cancelHover,pause:this.getInfoForHover},OpenLayers.Util.extend(this.handlerOptions.hover||{},{delay:250})):(a={},a[this.clickCallback]=this.getInfoForClick,this.handler=new OpenLayers.Handler.Click(this,a,this.handlerOptions.click||{}))},getInfoForClick:function(a){this.events.triggerEvent("beforegetfeatureinfo",{xy:a.xy});OpenLayers.Element.addClass(this.map.viewPortDiv,"olCursorWait");this.request(a.xy,
-{})},getInfoForHover:function(a){this.events.triggerEvent("beforegetfeatureinfo",{xy:a.xy});this.request(a.xy,{hover:!0})},cancelHover:function(){this.hoverRequest&&(this.hoverRequest.abort(),this.hoverRequest=null)},findLayers:function(){for(var a=this.layers||this.map.layers,b=[],c,d,e=a.length-1;0<=e;--e)c=a[e],c instanceof OpenLayers.Layer.WMS&&(!this.queryVisible||c.getVisibility())&&(d=OpenLayers.Util.isArray(c.url)?c.url[0]:c.url,!1!==this.drillDown||this.url||(this.url=d),(!0===this.drillDown||
-this.urlMatches(d))&&b.push(c));return b},urlMatches:function(a){var b=OpenLayers.Util.isEquivalentUrl(this.url,a);if(!b&&this.layerUrls)for(var c=0,d=this.layerUrls.length;c<d;++c)if(OpenLayers.Util.isEquivalentUrl(this.layerUrls[c],a)){b=!0;break}return b},buildWMSOptions:function(a,b,c,d){for(var e=[],f=[],g=0,h=b.length;g<h;g++)null!=b[g].params.LAYERS&&(e=e.concat(b[g].params.LAYERS),f=f.concat(this.getStyleNames(b[g])));b=b[0];g=this.map.getProjection();(h=b.projection)&&h.equals(this.map.getProjectionObject())&&
-(g=h.getCode());d=OpenLayers.Util.extend({service:"WMS",version:b.params.VERSION,request:"GetFeatureInfo",exceptions:b.params.EXCEPTIONS,bbox:this.map.getExtent().toBBOX(null,b.reverseAxisOrder()),feature_count:this.maxFeatures,height:this.map.getSize().h,width:this.map.getSize().w,format:d,info_format:b.params.INFO_FORMAT||this.infoFormat},1.3<=parseFloat(b.params.VERSION)?{crs:g,i:parseInt(c.x),j:parseInt(c.y)}:{srs:g,x:parseInt(c.x),y:parseInt(c.y)});0!=e.length&&(d=OpenLayers.Util.extend({layers:e,
-query_layers:e,styles:f},d));OpenLayers.Util.applyDefaults(d,this.vendorParams);return{url:a,params:OpenLayers.Util.upperCaseObject(d),callback:function(b){this.handleResponse(c,b,a)},scope:this}},getStyleNames:function(a){return a.params.STYLES?a.params.STYLES:OpenLayers.Util.isArray(a.params.LAYERS)?Array(a.params.LAYERS.length):a.params.LAYERS.replace(/[^,]/g,"")},request:function(a,b){var c=this.findLayers();if(0==c.length)this.events.triggerEvent("nogetfeatureinfo"),OpenLayers.Element.removeClass(this.map.viewPortDiv,
-"olCursorWait");else if(b=b||{},!1===this.drillDown){var c=this.buildWMSOptions(this.url,c,a,c[0].params.FORMAT),d=OpenLayers.Request.GET(c);!0===b.hover&&(this.hoverRequest=d)}else{this._numRequests=this._requestCount=0;this.features=[];for(var d={},e,f=0,g=c.length;f<g;f++){var h=c[f];e=OpenLayers.Util.isArray(h.url)?h.url[0]:h.url;e in d?d[e].push(h):(this._numRequests++,d[e]=[h])}for(e in d)c=d[e],c=this.buildWMSOptions(e,c,a,c[0].params.FORMAT),OpenLayers.Request.GET(c)}},triggerGetFeatureInfo:function(a,
-b,c){this.events.triggerEvent("getfeatureinfo",{text:a.responseText,features:c,request:a,xy:b});OpenLayers.Element.removeClass(this.map.viewPortDiv,"olCursorWait")},handleResponse:function(a,b,c){var d=b.responseXML;d&&d.documentElement||(d=b.responseText);d=this.format.read(d);!1===this.drillDown?this.triggerGetFeatureInfo(b,a,d):(this._requestCount++,this._features="object"===this.output?(this._features||[]).concat({url:c,features:d}):(this._features||[]).concat(d),this._requestCount===this._numRequests&&
-(this.triggerGetFeatureInfo(b,a,this._features.concat()),delete this._features,delete this._requestCount,delete this._numRequests))},CLASS_NAME:"OpenLayers.Control.WMSGetFeatureInfo"});OpenLayers.Format.WMSCapabilities.v1_3_0=OpenLayers.Class(OpenLayers.Format.WMSCapabilities.v1_3,{version:"1.3.0",CLASS_NAME:"OpenLayers.Format.WMSCapabilities.v1_3_0"});OpenLayers.Format.SOSGetFeatureOfInterest=OpenLayers.Class(OpenLayers.Format.XML,{VERSION:"1.0.0",namespaces:{sos:"http://www.opengis.net/sos/1.0",gml:"http://www.opengis.net/gml",sa:"http://www.opengis.net/sampling/1.0",xsi:"http://www.w3.org/2001/XMLSchema-instance"},schemaLocation:"http://www.opengis.net/sos/1.0 http://schemas.opengis.net/sos/1.0.0/sosAll.xsd",defaultPrefix:"sos",regExes:{trimSpace:/^\s*|\s*$/g,removeSpace:/\s*/g,splitSpace:/\s+/,trimComma:/\s*,\s*/g},read:function(a){"string"==
-typeof a&&(a=OpenLayers.Format.XML.prototype.read.apply(this,[a]));a&&9==a.nodeType&&(a=a.documentElement);var b={features:[]};this.readNode(a,b);a=[];for(var c=0,d=b.features.length;c<d;c++){var e=b.features[c];this.internalProjection&&(this.externalProjection&&e.components[0])&&e.components[0].transform(this.externalProjection,this.internalProjection);e=new OpenLayers.Feature.Vector(e.components[0],e.attributes);a.push(e)}return a},readers:{sa:{SamplingPoint:function(a,b){if(!b.attributes){var c=
-{attributes:{}};b.features.push(c);b=c}b.attributes.id=this.getAttributeNS(a,this.namespaces.gml,"id");this.readChildNodes(a,b)},position:function(a,b){this.readChildNodes(a,b)}},gml:OpenLayers.Util.applyDefaults({FeatureCollection:function(a,b){this.readChildNodes(a,b)},featureMember:function(a,b){var c={attributes:{}};b.features.push(c);this.readChildNodes(a,c)},name:function(a,b){b.attributes.name=this.getChildValue(a)},pos:function(a,b){this.externalProjection||(this.externalProjection=new OpenLayers.Projection(a.getAttribute("srsName")));
-OpenLayers.Format.GML.v3.prototype.readers.gml.pos.apply(this,[a,b])}},OpenLayers.Format.GML.v3.prototype.readers.gml)},writers:{sos:{GetFeatureOfInterest:function(a){for(var b=this.createElementNSPlus("GetFeatureOfInterest",{attributes:{version:this.VERSION,service:"SOS","xsi:schemaLocation":this.schemaLocation}}),c=0,d=a.fois.length;c<d;c++)this.writeNode("FeatureOfInterestId",{foi:a.fois[c]},b);return b},FeatureOfInterestId:function(a){return this.createElementNSPlus("FeatureOfInterestId",{value:a.foi})}}},
-CLASS_NAME:"OpenLayers.Format.SOSGetFeatureOfInterest"});OpenLayers.Format.SOSGetObservation=OpenLayers.Class(OpenLayers.Format.XML,{namespaces:{ows:"http://www.opengis.net/ows",gml:"http://www.opengis.net/gml",sos:"http://www.opengis.net/sos/1.0",ogc:"http://www.opengis.net/ogc",om:"http://www.opengis.net/om/1.0",sa:"http://www.opengis.net/sampling/1.0",xlink:"http://www.w3.org/1999/xlink",xsi:"http://www.w3.org/2001/XMLSchema-instance"},regExes:{trimSpace:/^\s*|\s*$/g,removeSpace:/\s*/g,splitSpace:/\s+/,trimComma:/\s*,\s*/g},VERSION:"1.0.0",schemaLocation:"http://www.opengis.net/sos/1.0 http://schemas.opengis.net/sos/1.0.0/sosGetObservation.xsd",
-defaultPrefix:"sos",read:function(a){"string"==typeof a&&(a=OpenLayers.Format.XML.prototype.read.apply(this,[a]));a&&9==a.nodeType&&(a=a.documentElement);var b={measurements:[],observations:[]};this.readNode(a,b);return b},write:function(a){a=this.writeNode("sos:GetObservation",a);a.setAttribute("xmlns:om",this.namespaces.om);a.setAttribute("xmlns:ogc",this.namespaces.ogc);this.setAttributeNS(a,this.namespaces.xsi,"xsi:schemaLocation",this.schemaLocation);return OpenLayers.Format.XML.prototype.write.apply(this,
-[a])},readers:{om:{ObservationCollection:function(a,b){b.id=this.getAttributeNS(a,this.namespaces.gml,"id");this.readChildNodes(a,b)},member:function(a,b){this.readChildNodes(a,b)},Measurement:function(a,b){var c={};b.measurements.push(c);this.readChildNodes(a,c)},Observation:function(a,b){var c={};b.observations.push(c);this.readChildNodes(a,c)},samplingTime:function(a,b){var c={};b.samplingTime=c;this.readChildNodes(a,c)},observedProperty:function(a,b){b.observedProperty=this.getAttributeNS(a,this.namespaces.xlink,
-"href");this.readChildNodes(a,b)},procedure:function(a,b){b.procedure=this.getAttributeNS(a,this.namespaces.xlink,"href");this.readChildNodes(a,b)},featureOfInterest:function(a,b){var c={features:[]};b.fois=[];b.fois.push(c);this.readChildNodes(a,c);for(var d=[],e=0,f=c.features.length;e<f;e++){var g=c.features[e];d.push(new OpenLayers.Feature.Vector(g.components[0],g.attributes))}c.features=d},result:function(a,b){var c={};b.result=c;""!==this.getChildValue(a)?(c.value=this.getChildValue(a),c.uom=
-a.getAttribute("uom")):this.readChildNodes(a,c)}},sa:OpenLayers.Format.SOSGetFeatureOfInterest.prototype.readers.sa,gml:OpenLayers.Util.applyDefaults({TimeInstant:function(a,b){var c={};b.timeInstant=c;this.readChildNodes(a,c)},timePosition:function(a,b){b.timePosition=this.getChildValue(a)}},OpenLayers.Format.SOSGetFeatureOfInterest.prototype.readers.gml)},writers:{sos:{GetObservation:function(a){var b=this.createElementNSPlus("GetObservation",{attributes:{version:this.VERSION,service:"SOS"}});this.writeNode("offering",
-a,b);a.eventTime&&this.writeNode("eventTime",a,b);for(var c in a.procedures)this.writeNode("procedure",a.procedures[c],b);for(var d in a.observedProperties)this.writeNode("observedProperty",a.observedProperties[d],b);a.foi&&this.writeNode("featureOfInterest",a.foi,b);this.writeNode("responseFormat",a,b);a.resultModel&&this.writeNode("resultModel",a,b);a.responseMode&&this.writeNode("responseMode",a,b);return b},featureOfInterest:function(a){var b=this.createElementNSPlus("featureOfInterest");this.writeNode("ObjectID",
-a.objectId,b);return b},ObjectID:function(a){return this.createElementNSPlus("ObjectID",{value:a})},responseFormat:function(a){return this.createElementNSPlus("responseFormat",{value:a.responseFormat})},procedure:function(a){return this.createElementNSPlus("procedure",{value:a})},offering:function(a){return this.createElementNSPlus("offering",{value:a.offering})},observedProperty:function(a){return this.createElementNSPlus("observedProperty",{value:a})},eventTime:function(a){var b=this.createElementNSPlus("eventTime");
-"latest"===a.eventTime&&this.writeNode("ogc:TM_Equals",a,b);return b},resultModel:function(a){return this.createElementNSPlus("resultModel",{value:a.resultModel})},responseMode:function(a){return this.createElementNSPlus("responseMode",{value:a.responseMode})}},ogc:{TM_Equals:function(a){var b=this.createElementNSPlus("ogc:TM_Equals");this.writeNode("ogc:PropertyName",{property:"urn:ogc:data:time:iso8601"},b);"latest"===a.eventTime&&this.writeNode("gml:TimeInstant",{value:"latest"},b);return b},PropertyName:function(a){return this.createElementNSPlus("ogc:PropertyName",
-{value:a.property})}},gml:{TimeInstant:function(a){var b=this.createElementNSPlus("gml:TimeInstant");this.writeNode("gml:timePosition",a,b);return b},timePosition:function(a){return this.createElementNSPlus("gml:timePosition",{value:a.value})}}},CLASS_NAME:"OpenLayers.Format.SOSGetObservation"});OpenLayers.Control.UTFGrid=OpenLayers.Class(OpenLayers.Control,{autoActivate:!0,layers:null,defaultHandlerOptions:{delay:300,pixelTolerance:4,stopMove:!1,single:!0,"double":!1,stopSingle:!1,stopDouble:!1},handlerMode:"click",setHandler:function(a){this.handlerMode=a;this.resetHandler()},resetHandler:function(){this.handler&&(this.handler.deactivate(),this.handler.destroy(),this.handler=null);"hover"==this.handlerMode?this.handler=new OpenLayers.Handler.Hover(this,{pause:this.handleEvent,move:this.reset},
-this.handlerOptions):"click"==this.handlerMode?this.handler=new OpenLayers.Handler.Click(this,{click:this.handleEvent},this.handlerOptions):"move"==this.handlerMode&&(this.handler=new OpenLayers.Handler.Hover(this,{pause:this.handleEvent,move:this.handleEvent},this.handlerOptions));return this.handler?!0:!1},initialize:function(a){a=a||{};a.handlerOptions=a.handlerOptions||this.defaultHandlerOptions;OpenLayers.Control.prototype.initialize.apply(this,[a]);this.resetHandler()},handleEvent:function(a){if(null==
-a)this.reset();else{var b=this.map.getLonLatFromPixel(a.xy);if(b){var c=this.findLayers();if(0<c.length){for(var d={},e,f,g=0,h=c.length;g<h;g++)e=c[g],f=OpenLayers.Util.indexOf(this.map.layers,e),d[f]=e.getFeatureInfo(b);this.callback(d,b,a.xy)}}}},callback:function(a){},reset:function(a){this.callback(null)},findLayers:function(){for(var a=this.layers||this.map.layers,b=[],c,d=a.length-1;0<=d;--d)c=a[d],c instanceof OpenLayers.Layer.UTFGrid&&b.push(c);return b},CLASS_NAME:"OpenLayers.Control.UTFGrid"});OpenLayers.Format.CQL=function(){function a(a){function b(){var a=e.pop();switch(a.type){case "LOGICAL":var c=b(),g=b();return new OpenLayers.Filter.Logical({filters:[g,c],type:f[a.text.toUpperCase()]});case "NOT":return a=b(),new OpenLayers.Filter.Logical({filters:[a],type:OpenLayers.Filter.Logical.NOT});case "BETWEEN":return e.pop(),g=b(),a=b(),c=b(),new OpenLayers.Filter.Comparison({property:c,lowerBoundary:a,upperBoundary:g,type:OpenLayers.Filter.Comparison.BETWEEN});case "COMPARISON":return g=
-b(),c=b(),new OpenLayers.Filter.Comparison({property:c,value:g,type:d[a.text.toUpperCase()]});case "IS_NULL":return c=b(),new OpenLayers.Filter.Comparison({property:c,type:d[a.text.toUpperCase()]});case "VALUE":return(c=a.text.match(/^'(.*)'$/))?c[1].replace(/''/g,"'"):Number(a.text);case "SPATIAL":switch(a.text.toUpperCase()){case "BBOX":var a=b(),c=b(),g=b(),h=b(),k=b();return new OpenLayers.Filter.Spatial({type:OpenLayers.Filter.Spatial.BBOX,property:k,value:OpenLayers.Bounds.fromArray([h,g,c,
-a])});case "INTERSECTS":return g=b(),c=b(),new OpenLayers.Filter.Spatial({type:OpenLayers.Filter.Spatial.INTERSECTS,property:c,value:g});case "WITHIN":return g=b(),c=b(),new OpenLayers.Filter.Spatial({type:OpenLayers.Filter.Spatial.WITHIN,property:c,value:g});case "CONTAINS":return g=b(),c=b(),new OpenLayers.Filter.Spatial({type:OpenLayers.Filter.Spatial.CONTAINS,property:c,value:g});case "DWITHIN":return a=b(),g=b(),c=b(),new OpenLayers.Filter.Spatial({type:OpenLayers.Filter.Spatial.DWITHIN,value:g,
-property:c,distance:Number(a)})}case "GEOMETRY":return OpenLayers.Geometry.fromWKT(a.text);default:return a.text}}for(var c=[],e=[];a.length;){var g=a.shift();switch(g.type){case "PROPERTY":case "GEOMETRY":case "VALUE":e.push(g);break;case "COMPARISON":case "BETWEEN":case "IS_NULL":case "LOGICAL":for(var k=h[g.type];0<c.length&&h[c[c.length-1].type]<=k;)e.push(c.pop());c.push(g);break;case "SPATIAL":case "NOT":case "LPAREN":c.push(g);break;case "RPAREN":for(;0<c.length&&"LPAREN"!=c[c.length-1].type;)e.push(c.pop());
-c.pop();0<c.length&&"SPATIAL"==c[c.length-1].type&&e.push(c.pop());case "COMMA":case "END":break;default:throw Error("Unknown token type "+g.type);}}for(;0<c.length;)e.push(c.pop());a=b();if(0<e.length){a="Remaining tokens after building AST: \n";for(c=e.length-1;0<=c;c--)a+=e[c].type+": "+e[c].text+"\n";throw Error(a);}return a}var b={PROPERTY:/^[_a-zA-Z]\w*/,COMPARISON:/^(=|<>|<=|<|>=|>|LIKE)/i,IS_NULL:/^IS NULL/i,COMMA:/^,/,LOGICAL:/^(AND|OR)/i,VALUE:/^('([^']|'')*'|\d+(\.\d*)?|\.\d+)/,LPAREN:/^\(/,
-RPAREN:/^\)/,SPATIAL:/^(BBOX|INTERSECTS|DWITHIN|WITHIN|CONTAINS)/i,NOT:/^NOT/i,BETWEEN:/^BETWEEN/i,GEOMETRY:function(a){var b=/^(POINT|LINESTRING|POLYGON|MULTIPOINT|MULTILINESTRING|MULTIPOLYGON|GEOMETRYCOLLECTION)/.exec(a);if(b){var c=a.length,b=a.indexOf("(",b[0].length);if(-1<b)for(var d=1;b<c&&0<d;)switch(b++,a.charAt(b)){case "(":d++;break;case ")":d--}return[a.substr(0,b+1)]}},END:/^$/},c={LPAREN:["GEOMETRY","SPATIAL","PROPERTY","VALUE","LPAREN"],RPAREN:["NOT","LOGICAL","END","RPAREN"],PROPERTY:["COMPARISON",
-"BETWEEN","COMMA","IS_NULL"],BETWEEN:["VALUE"],IS_NULL:["END"],COMPARISON:["VALUE"],COMMA:["GEOMETRY","VALUE","PROPERTY"],VALUE:["LOGICAL","COMMA","RPAREN","END"],SPATIAL:["LPAREN"],LOGICAL:["NOT","VALUE","SPATIAL","PROPERTY","LPAREN"],NOT:["PROPERTY","LPAREN"],GEOMETRY:["COMMA","RPAREN"]},d={"=":OpenLayers.Filter.Comparison.EQUAL_TO,"<>":OpenLayers.Filter.Comparison.NOT_EQUAL_TO,"<":OpenLayers.Filter.Comparison.LESS_THAN,"<=":OpenLayers.Filter.Comparison.LESS_THAN_OR_EQUAL_TO,">":OpenLayers.Filter.Comparison.GREATER_THAN,
-">=":OpenLayers.Filter.Comparison.GREATER_THAN_OR_EQUAL_TO,LIKE:OpenLayers.Filter.Comparison.LIKE,BETWEEN:OpenLayers.Filter.Comparison.BETWEEN,"IS NULL":OpenLayers.Filter.Comparison.IS_NULL},e={},f={AND:OpenLayers.Filter.Logical.AND,OR:OpenLayers.Filter.Logical.OR},g={},h={RPAREN:3,LOGICAL:2,COMPARISON:1},k;for(k in d)d.hasOwnProperty(k)&&(e[d[k]]=k);for(k in f)f.hasOwnProperty(k)&&(g[f[k]]=k);return OpenLayers.Class(OpenLayers.Format,{read:function(d){var e=d;d=[];var f,g=["NOT","GEOMETRY","SPATIAL",
-"PROPERTY","LPAREN"];do{a:{f=g;for(var h=void 0,g=void 0,k=f.length,h=0;h<k;h++){var g=f[h],s=b[g]instanceof RegExp?b[g].exec(e):(0,b[g])(e);if(s){f=s[0];e=e.substr(f.length).replace(/^\s*/,"");f={type:g,text:f,remainder:e};break a}}d="ERROR: In parsing: ["+e+"], expected one of: ";for(h=0;h<k;h++)g=f[h],d+="\n    "+g+": "+b[g];throw Error(d);}e=f.remainder;g=c[f.type];if("END"!=f.type&&!g)throw Error("No follows list for "+f.type);d.push(f)}while("END"!=f.type);d=a(d);this.keepData&&(this.data=d);
-return d},write:function(a){if(a instanceof OpenLayers.Geometry)return a.toString();switch(a.CLASS_NAME){case "OpenLayers.Filter.Spatial":switch(a.type){case OpenLayers.Filter.Spatial.BBOX:return"BBOX("+a.property+","+a.value.toBBOX()+")";case OpenLayers.Filter.Spatial.DWITHIN:return"DWITHIN("+a.property+", "+this.write(a.value)+", "+a.distance+")";case OpenLayers.Filter.Spatial.WITHIN:return"WITHIN("+a.property+", "+this.write(a.value)+")";case OpenLayers.Filter.Spatial.INTERSECTS:return"INTERSECTS("+
-a.property+", "+this.write(a.value)+")";case OpenLayers.Filter.Spatial.CONTAINS:return"CONTAINS("+a.property+", "+this.write(a.value)+")";default:throw Error("Unknown spatial filter type: "+a.type);}case "OpenLayers.Filter.Logical":if(a.type==OpenLayers.Filter.Logical.NOT)return"NOT ("+this.write(a.filters[0])+")";for(var b="(",c=!0,d=0;d<a.filters.length;d++)c?c=!1:b+=") "+g[a.type]+" (",b+=this.write(a.filters[d]);return b+")";case "OpenLayers.Filter.Comparison":return a.type==OpenLayers.Filter.Comparison.BETWEEN?
-a.property+" BETWEEN "+this.write(a.lowerBoundary)+" AND "+this.write(a.upperBoundary):null!==a.value?a.property+" "+e[a.type]+" "+this.write(a.value):a.property+" "+e[a.type];case void 0:if("string"===typeof a)return"'"+a.replace(/'/g,"''")+"'";if("number"===typeof a)return String(a);default:throw Error("Can't encode: "+a.CLASS_NAME+" "+a);}},CLASS_NAME:"OpenLayers.Format.CQL"})}();OpenLayers.Control.Split=OpenLayers.Class(OpenLayers.Control,{layer:null,source:null,sourceOptions:null,tolerance:null,edge:!0,deferDelete:!1,mutual:!0,targetFilter:null,sourceFilter:null,handler:null,initialize:function(a){OpenLayers.Control.prototype.initialize.apply(this,[a]);this.options=a||{};this.options.source&&this.setSource(this.options.source)},setSource:function(a){this.active?(this.deactivate(),this.handler&&(this.handler.destroy(),delete this.handler),this.source=a,this.activate()):this.source=
-a},activate:function(){var a=OpenLayers.Control.prototype.activate.call(this);if(a)if(!this.source)this.handler||(this.handler=new OpenLayers.Handler.Path(this,{done:function(a){this.onSketchComplete({feature:new OpenLayers.Feature.Vector(a)})}},{layerOptions:this.sourceOptions})),this.handler.activate();else if(this.source.events)this.source.events.on({sketchcomplete:this.onSketchComplete,afterfeaturemodified:this.afterFeatureModified,scope:this});return a},deactivate:function(){var a=OpenLayers.Control.prototype.deactivate.call(this);
-a&&this.source&&this.source.events&&this.source.events.un({sketchcomplete:this.onSketchComplete,afterfeaturemodified:this.afterFeatureModified,scope:this});return a},onSketchComplete:function(a){this.feature=null;return!this.considerSplit(a.feature)},afterFeatureModified:function(a){a.modified&&"function"===typeof a.feature.geometry.split&&(this.feature=a.feature,this.considerSplit(a.feature))},removeByGeometry:function(a,b){for(var c=0,d=a.length;c<d;++c)if(a[c].geometry===b){a.splice(c,1);break}},
-isEligible:function(a){return a.geometry?a.state!==OpenLayers.State.DELETE&&"function"===typeof a.geometry.split&&this.feature!==a&&(!this.targetFilter||this.targetFilter.evaluate(a.attributes)):!1},considerSplit:function(a){var b=!1,c=!1;if(!this.sourceFilter||this.sourceFilter.evaluate(a.attributes)){for(var d=this.layer&&this.layer.features||[],e,f,g=[],h=[],k=this.layer===this.source&&this.mutual,l={edge:this.edge,tolerance:this.tolerance,mutual:k},m=[a.geometry],n,p,q,r=0,s=d.length;r<s;++r)if(n=
-d[r],this.isEligible(n)){p=[n.geometry];for(var t=0;t<m.length;++t){q=m[t];for(var u=0;u<p.length;++u)if(e=p[u],q.getBounds().intersectsBounds(e.getBounds())&&(e=q.split(e,l)))f=this.events.triggerEvent("beforesplit",{source:a,target:n}),!1!==f&&(k&&(f=e[0],1<f.length&&(f.unshift(t,1),Array.prototype.splice.apply(m,f),t+=f.length-3),e=e[1]),1<e.length&&(e.unshift(u,1),Array.prototype.splice.apply(p,e),u+=e.length-3))}p&&1<p.length&&(this.geomsToFeatures(n,p),this.events.triggerEvent("split",{original:n,
-features:p}),Array.prototype.push.apply(g,p),h.push(n),c=!0)}m&&1<m.length&&(this.geomsToFeatures(a,m),this.events.triggerEvent("split",{original:a,features:m}),Array.prototype.push.apply(g,m),h.push(a),b=!0);if(b||c){if(this.deferDelete){d=[];r=0;for(s=h.length;r<s;++r)c=h[r],c.state===OpenLayers.State.INSERT?d.push(c):(c.state=OpenLayers.State.DELETE,this.layer.drawFeature(c));this.layer.destroyFeatures(d,{silent:!0});r=0;for(s=g.length;r<s;++r)g[r].state=OpenLayers.State.INSERT}else this.layer.destroyFeatures(h,
-{silent:!0});this.layer.addFeatures(g,{silent:!0});this.events.triggerEvent("aftersplit",{source:a,features:g})}}return b},geomsToFeatures:function(a,b){var c=a.clone();delete c.geometry;for(var d,e=0,f=b.length;e<f;++e)d=c.clone(),d.geometry=b[e],d.state=OpenLayers.State.INSERT,b[e]=d},destroy:function(){this.active&&this.deactivate();OpenLayers.Control.prototype.destroy.call(this)},CLASS_NAME:"OpenLayers.Control.Split"});OpenLayers.Layer.WMTS=OpenLayers.Class(OpenLayers.Layer.Grid,{isBaseLayer:!0,version:"1.0.0",requestEncoding:"KVP",url:null,layer:null,matrixSet:null,style:null,format:"image/jpeg",tileOrigin:null,tileFullExtent:null,formatSuffix:null,matrixIds:null,dimensions:null,params:null,zoomOffset:0,serverResolutions:null,formatSuffixMap:{"image/png":"png","image/png8":"png","image/png24":"png","image/png32":"png",png:"png","image/jpeg":"jpg","image/jpg":"jpg",jpeg:"jpg",jpg:"jpg"},matrix:null,initialize:function(a){var b=
-{url:!0,layer:!0,style:!0,matrixSet:!0},c;for(c in b)if(!(c in a))throw Error("Missing property '"+c+"' in layer configuration.");a.params=OpenLayers.Util.upperCaseObject(a.params);OpenLayers.Layer.Grid.prototype.initialize.apply(this,[a.name,a.url,a.params,a]);this.formatSuffix||(this.formatSuffix=this.formatSuffixMap[this.format]||this.format.split("/").pop());if(this.matrixIds&&(a=this.matrixIds.length)&&"string"===typeof this.matrixIds[0])for(b=this.matrixIds,this.matrixIds=Array(a),c=0;c<a;++c)this.matrixIds[c]=
-{identifier:b[c]}},setMap:function(){OpenLayers.Layer.Grid.prototype.setMap.apply(this,arguments)},updateMatrixProperties:function(){if(this.matrix=this.getMatrix())this.matrix.topLeftCorner&&(this.tileOrigin=this.matrix.topLeftCorner),this.matrix.tileWidth&&this.matrix.tileHeight&&(this.tileSize=new OpenLayers.Size(this.matrix.tileWidth,this.matrix.tileHeight)),this.tileOrigin||(this.tileOrigin=new OpenLayers.LonLat(this.maxExtent.left,this.maxExtent.top)),this.tileFullExtent||(this.tileFullExtent=
-this.maxExtent)},moveTo:function(a,b,c){!b&&this.matrix||this.updateMatrixProperties();return OpenLayers.Layer.Grid.prototype.moveTo.apply(this,arguments)},clone:function(a){null==a&&(a=new OpenLayers.Layer.WMTS(this.options));return a=OpenLayers.Layer.Grid.prototype.clone.apply(this,[a])},getIdentifier:function(){return this.getServerZoom()},getMatrix:function(){var a;if(this.matrixIds&&0!==this.matrixIds.length)if("scaleDenominator"in this.matrixIds[0])for(var b=OpenLayers.METERS_PER_INCH*OpenLayers.INCHES_PER_UNIT[this.units]*
-this.getServerResolution()/2.8E-4,c=Number.POSITIVE_INFINITY,d,e=0,f=this.matrixIds.length;e<f;++e)d=Math.abs(1-this.matrixIds[e].scaleDenominator/b),d<c&&(c=d,a=this.matrixIds[e]);else a=this.matrixIds[this.getIdentifier()];else a={identifier:this.getIdentifier()};return a},getTileInfo:function(a){var b=this.getServerResolution(),c=(a.lon-this.tileOrigin.lon)/(b*this.tileSize.w);a=(this.tileOrigin.lat-a.lat)/(b*this.tileSize.h);var b=Math.floor(c),d=Math.floor(a);return{col:b,row:d,i:Math.floor((c-
-b)*this.tileSize.w),j:Math.floor((a-d)*this.tileSize.h)}},getURL:function(a){a=this.adjustBounds(a);var b="";if(!this.tileFullExtent||this.tileFullExtent.intersectsBounds(a)){a=a.getCenterLonLat();var c=this.getTileInfo(a);a=this.dimensions;var d,b=OpenLayers.Util.isArray(this.url)?this.selectUrl([this.version,this.style,this.matrixSet,this.matrix.identifier,c.row,c.col].join(),this.url):this.url;if("REST"===this.requestEncoding.toUpperCase())if(d=this.params,-1!==b.indexOf("{")){b=b.replace(/\{/g,
-"${");c={style:this.style,Style:this.style,TileMatrixSet:this.matrixSet,TileMatrix:this.matrix.identifier,TileRow:c.row,TileCol:c.col};if(a){var e,f;for(f=a.length-1;0<=f;--f)e=a[f],c[e]=d[e.toUpperCase()]}b=OpenLayers.String.format(b,c)}else{e=this.version+"/"+this.layer+"/"+this.style+"/";if(a)for(f=0;f<a.length;f++)d[a[f]]&&(e=e+d[a[f]]+"/");e=e+this.matrixSet+"/"+this.matrix.identifier+"/"+c.row+"/"+c.col+"."+this.formatSuffix;b.match(/\/$/)||(b+="/");b+=e}else"KVP"===this.requestEncoding.toUpperCase()&&
-(d={SERVICE:"WMTS",REQUEST:"GetTile",VERSION:this.version,LAYER:this.layer,STYLE:this.style,TILEMATRIXSET:this.matrixSet,TILEMATRIX:this.matrix.identifier,TILEROW:c.row,TILECOL:c.col,FORMAT:this.format},b=OpenLayers.Layer.Grid.prototype.getFullRequestString.apply(this,[d]))}return b},mergeNewParams:function(a){if("KVP"===this.requestEncoding.toUpperCase())return OpenLayers.Layer.Grid.prototype.mergeNewParams.apply(this,[OpenLayers.Util.upperCaseObject(a)])},CLASS_NAME:"OpenLayers.Layer.WMTS"});OpenLayers.Protocol.SOS.v1_0_0=OpenLayers.Class(OpenLayers.Protocol,{fois:null,formatOptions:null,initialize:function(a){OpenLayers.Protocol.prototype.initialize.apply(this,[a]);a.format||(this.format=new OpenLayers.Format.SOSGetFeatureOfInterest(this.formatOptions))},destroy:function(){this.options&&!this.options.format&&this.format.destroy();this.format=null;OpenLayers.Protocol.prototype.destroy.apply(this)},read:function(a){a=OpenLayers.Util.extend({},a);OpenLayers.Util.applyDefaults(a,this.options||
-{});var b=new OpenLayers.Protocol.Response({requestType:"read"}),c=this.format,c=OpenLayers.Format.XML.prototype.write.apply(c,[c.writeNode("sos:GetFeatureOfInterest",{fois:this.fois})]);b.priv=OpenLayers.Request.POST({url:a.url,callback:this.createCallback(this.handleRead,b,a),data:c});return b},handleRead:function(a,b){if(b.callback){var c=a.priv;200<=c.status&&300>c.status?(a.features=this.parseFeatures(c),a.code=OpenLayers.Protocol.Response.SUCCESS):a.code=OpenLayers.Protocol.Response.FAILURE;
-b.callback.call(b.scope,a)}},parseFeatures:function(a){var b=a.responseXML;b&&b.documentElement||(b=a.responseText);return!b||0>=b.length?null:this.format.read(b)},CLASS_NAME:"OpenLayers.Protocol.SOS.v1_0_0"});OpenLayers.Layer.KaMapCache=OpenLayers.Class(OpenLayers.Layer.KaMap,{IMAGE_EXTENSIONS:{jpeg:"jpg",gif:"gif",png:"png",png8:"png",png24:"png",dithered:"png"},DEFAULT_FORMAT:"jpeg",initialize:function(a,b,c,d){OpenLayers.Layer.KaMap.prototype.initialize.apply(this,arguments);this.extension=this.IMAGE_EXTENSIONS[this.params.i.toLowerCase()||this.DEFAULT_FORMAT]},getURL:function(a){a=this.adjustBounds(a);var b=this.map.getResolution(),c=Math.round(1E4*this.map.getScale())/1E4,d=Math.round(a.left/b);a=
--Math.round(a.top/b);var b=Math.floor(d/this.tileSize.w/this.params.metaTileSize.w)*this.tileSize.w*this.params.metaTileSize.w,e=Math.floor(a/this.tileSize.h/this.params.metaTileSize.h)*this.tileSize.h*this.params.metaTileSize.h,c=["/",this.params.map,"/",c,"/",this.params.g.replace(/\s/g,"_"),"/def/t",e,"/l",b,"/t",a,"l",d,".",this.extension],d=this.url;OpenLayers.Util.isArray(d)&&(d=this.selectUrl(c.join(""),d));return d+c.join("")},CLASS_NAME:"OpenLayers.Layer.KaMapCache"});OpenLayers.Protocol.WFS.v1_1_0=OpenLayers.Class(OpenLayers.Protocol.WFS.v1,{version:"1.1.0",initialize:function(a){OpenLayers.Protocol.WFS.v1.prototype.initialize.apply(this,arguments);this.outputFormat&&!this.readFormat&&("gml2"==this.outputFormat.toLowerCase()?this.readFormat=new OpenLayers.Format.GML.v2({featureType:this.featureType,featureNS:this.featureNS,geometryName:this.geometryName}):"json"==this.outputFormat.toLowerCase()&&(this.readFormat=new OpenLayers.Format.GeoJSON))},CLASS_NAME:"OpenLayers.Protocol.WFS.v1_1_0"});OpenLayers.Format.WMSCapabilities.v1_1_1=OpenLayers.Class(OpenLayers.Format.WMSCapabilities.v1_1,{version:"1.1.1",readers:{wms:OpenLayers.Util.applyDefaults({SRS:function(a,b){b.srs[this.getChildValue(a)]=!0}},OpenLayers.Format.WMSCapabilities.v1_1.prototype.readers.wms)},CLASS_NAME:"OpenLayers.Format.WMSCapabilities.v1_1_1"});OpenLayers.Format.WMSCapabilities.v1_1_1_WMSC=OpenLayers.Class(OpenLayers.Format.WMSCapabilities.v1_1_1,{version:"1.1.1",profile:"WMSC",readers:{wms:OpenLayers.Util.applyDefaults({VendorSpecificCapabilities:function(a,b){b.vendorSpecific={tileSets:[]};this.readChildNodes(a,b.vendorSpecific)},TileSet:function(a,b){var c={srs:{},bbox:{},resolutions:[]};this.readChildNodes(a,c);b.tileSets.push(c)},Resolutions:function(a,b){for(var c=this.getChildValue(a).split(" "),d=0,e=c.length;d<e;d++)""!=c[d]&&b.resolutions.push(parseFloat(c[d]))},
-Width:function(a,b){b.width=parseInt(this.getChildValue(a))},Height:function(a,b){b.height=parseInt(this.getChildValue(a))},Layers:function(a,b){b.layers=this.getChildValue(a)},Styles:function(a,b){b.styles=this.getChildValue(a)}},OpenLayers.Format.WMSCapabilities.v1_1_1.prototype.readers.wms)},CLASS_NAME:"OpenLayers.Format.WMSCapabilities.v1_1_1_WMSC"});OpenLayers.Control.LayerSwitcher=OpenLayers.Class(OpenLayers.Control,{layerStates:null,layersDiv:null,baseLayersDiv:null,baseLayers:null,dataLbl:null,dataLayersDiv:null,dataLayers:null,minimizeDiv:null,maximizeDiv:null,ascending:!0,initialize:function(a){OpenLayers.Control.prototype.initialize.apply(this,arguments);this.layerStates=[]},destroy:function(){this.clearLayersArray("base");this.clearLayersArray("data");this.map.events.un({buttonclick:this.onButtonClick,addlayer:this.redraw,changelayer:this.redraw,
-removelayer:this.redraw,changebaselayer:this.redraw,scope:this});this.events.unregister("buttonclick",this,this.onButtonClick);OpenLayers.Control.prototype.destroy.apply(this,arguments)},setMap:function(a){OpenLayers.Control.prototype.setMap.apply(this,arguments);this.map.events.on({addlayer:this.redraw,changelayer:this.redraw,removelayer:this.redraw,changebaselayer:this.redraw,scope:this});this.outsideViewport?(this.events.attachToElement(this.div),this.events.register("buttonclick",this,this.onButtonClick)):
-this.map.events.register("buttonclick",this,this.onButtonClick)},draw:function(){OpenLayers.Control.prototype.draw.apply(this);this.loadContents();this.outsideViewport||this.minimizeControl();this.redraw();return this.div},onButtonClick:function(a){a=a.buttonElement;a===this.minimizeDiv?this.minimizeControl():a===this.maximizeDiv?this.maximizeControl():a._layerSwitcher===this.id&&(a["for"]&&(a=document.getElementById(a["for"])),a.disabled||("radio"==a.type?(a.checked=!0,this.map.setBaseLayer(this.map.getLayer(a._layer))):
-(a.checked=!a.checked,this.updateMap())))},clearLayersArray:function(a){this[a+"LayersDiv"].innerHTML="";this[a+"Layers"]=[]},checkRedraw:function(){if(!this.layerStates.length||this.map.layers.length!=this.layerStates.length)return!0;for(var a=0,b=this.layerStates.length;a<b;a++){var c=this.layerStates[a],d=this.map.layers[a];if(c.name!=d.name||c.inRange!=d.inRange||c.id!=d.id||c.visibility!=d.visibility)return!0}return!1},redraw:function(){if(!this.checkRedraw())return this.div;this.clearLayersArray("base");
-this.clearLayersArray("data");var a=!1,b=!1,c=this.map.layers.length;this.layerStates=Array(c);for(var d=0;d<c;d++){var e=this.map.layers[d];this.layerStates[d]={name:e.name,visibility:e.visibility,inRange:e.inRange,id:e.id}}var f=this.map.layers.slice();this.ascending||f.reverse();d=0;for(c=f.length;d<c;d++){var e=f[d],g=e.isBaseLayer;if(e.displayInLayerSwitcher){g?b=!0:a=!0;var h=g?e==this.map.baseLayer:e.getVisibility(),k=document.createElement("input"),l=OpenLayers.Util.createUniqueID(this.id+
-"_input_");k.id=l;k.name=g?this.id+"_baseLayers":e.name;k.type=g?"radio":"checkbox";k.value=e.name;k.checked=h;k.defaultChecked=h;k.className="olButton";k._layer=e.id;k._layerSwitcher=this.id;g||e.inRange||(k.disabled=!0);h=document.createElement("label");h["for"]=k.id;OpenLayers.Element.addClass(h,"labelSpan olButton");h._layer=e.id;h._layerSwitcher=this.id;g||e.inRange||(h.style.color="gray");h.innerHTML=e.name;h.style.verticalAlign=g?"bottom":"baseline";l=document.createElement("br");(g?this.baseLayers:
-this.dataLayers).push({layer:e,inputElem:k,labelSpan:h});e=g?this.baseLayersDiv:this.dataLayersDiv;e.appendChild(k);e.appendChild(h);e.appendChild(l)}}this.dataLbl.style.display=a?"":"none";this.baseLbl.style.display=b?"":"none";return this.div},updateMap:function(){for(var a=0,b=this.baseLayers.length;a<b;a++){var c=this.baseLayers[a];c.inputElem.checked&&this.map.setBaseLayer(c.layer,!1)}a=0;for(b=this.dataLayers.length;a<b;a++)c=this.dataLayers[a],c.layer.setVisibility(c.inputElem.checked)},maximizeControl:function(a){this.div.style.width=
-"";this.div.style.height="";this.showControls(!1);null!=a&&OpenLayers.Event.stop(a)},minimizeControl:function(a){this.div.style.width="0px";this.div.style.height="0px";this.showControls(!0);null!=a&&OpenLayers.Event.stop(a)},showControls:function(a){this.maximizeDiv.style.display=a?"":"none";this.minimizeDiv.style.display=a?"none":"";this.layersDiv.style.display=a?"none":""},loadContents:function(){this.layersDiv=document.createElement("div");this.layersDiv.id=this.id+"_layersDiv";OpenLayers.Element.addClass(this.layersDiv,
-"layersDiv");this.baseLbl=document.createElement("div");this.baseLbl.innerHTML=OpenLayers.i18n("Base Layer");OpenLayers.Element.addClass(this.baseLbl,"baseLbl");this.baseLayersDiv=document.createElement("div");OpenLayers.Element.addClass(this.baseLayersDiv,"baseLayersDiv");this.dataLbl=document.createElement("div");this.dataLbl.innerHTML=OpenLayers.i18n("Overlays");OpenLayers.Element.addClass(this.dataLbl,"dataLbl");this.dataLayersDiv=document.createElement("div");OpenLayers.Element.addClass(this.dataLayersDiv,
-"dataLayersDiv");this.ascending?(this.layersDiv.appendChild(this.baseLbl),this.layersDiv.appendChild(this.baseLayersDiv),this.layersDiv.appendChild(this.dataLbl),this.layersDiv.appendChild(this.dataLayersDiv)):(this.layersDiv.appendChild(this.dataLbl),this.layersDiv.appendChild(this.dataLayersDiv),this.layersDiv.appendChild(this.baseLbl),this.layersDiv.appendChild(this.baseLayersDiv));this.div.appendChild(this.layersDiv);var a=OpenLayers.Util.getImageLocation("layer-switcher-maximize.png");this.maximizeDiv=
-OpenLayers.Util.createAlphaImageDiv("OpenLayers_Control_MaximizeDiv",null,null,a,"absolute");OpenLayers.Element.addClass(this.maximizeDiv,"maximizeDiv olButton");this.maximizeDiv.style.display="none";this.div.appendChild(this.maximizeDiv);a=OpenLayers.Util.getImageLocation("layer-switcher-minimize.png");this.minimizeDiv=OpenLayers.Util.createAlphaImageDiv("OpenLayers_Control_MinimizeDiv",null,null,a,"absolute");OpenLayers.Element.addClass(this.minimizeDiv,"minimizeDiv olButton");this.minimizeDiv.style.display=
-"none";this.div.appendChild(this.minimizeDiv)},CLASS_NAME:"OpenLayers.Control.LayerSwitcher"});OpenLayers.Format.Atom=OpenLayers.Class(OpenLayers.Format.XML,{namespaces:{atom:"http://www.w3.org/2005/Atom",georss:"http://www.georss.org/georss"},feedTitle:"untitled",defaultEntryTitle:"untitled",gmlParser:null,xy:!1,read:function(a){"string"==typeof a&&(a=OpenLayers.Format.XML.prototype.read.apply(this,[a]));return this.parseFeatures(a)},write:function(a){var b;if(OpenLayers.Util.isArray(a)){b=this.createElementNSPlus("atom:feed");b.appendChild(this.createElementNSPlus("atom:title",{value:this.feedTitle}));
-for(var c=0,d=a.length;c<d;c++)b.appendChild(this.buildEntryNode(a[c]))}else b=this.buildEntryNode(a);return OpenLayers.Format.XML.prototype.write.apply(this,[b])},buildContentNode:function(a){var b=this.createElementNSPlus("atom:content",{attributes:{type:a.type||null}});if(a.src)b.setAttribute("src",a.src);else if("text"==a.type||null==a.type)b.appendChild(this.createTextNode(a.value));else if("html"==a.type){if("string"!=typeof a.value)throw"HTML content must be in form of an escaped string";b.appendChild(this.createTextNode(a.value))}else"xhtml"==
-a.type?b.appendChild(a.value):"xhtml"==a.type||a.type.match(/(\+|\/)xml$/)?b.appendChild(a.value):b.appendChild(this.createTextNode(a.value));return b},buildEntryNode:function(a){var b=a.attributes,c=b.atom||{},d=this.createElementNSPlus("atom:entry");if(c.authors)for(var e=OpenLayers.Util.isArray(c.authors)?c.authors:[c.authors],f=0,g=e.length;f<g;f++)d.appendChild(this.buildPersonConstructNode("author",e[f]));if(c.categories)for(var e=OpenLayers.Util.isArray(c.categories)?c.categories:[c.categories],
-h,f=0,g=e.length;f<g;f++)h=e[f],d.appendChild(this.createElementNSPlus("atom:category",{attributes:{term:h.term,scheme:h.scheme||null,label:h.label||null}}));c.content&&d.appendChild(this.buildContentNode(c.content));if(c.contributors)for(e=OpenLayers.Util.isArray(c.contributors)?c.contributors:[c.contributors],f=0,g=e.length;f<g;f++)d.appendChild(this.buildPersonConstructNode("contributor",e[f]));a.fid&&d.appendChild(this.createElementNSPlus("atom:id",{value:a.fid}));if(c.links)for(e=OpenLayers.Util.isArray(c.links)?
-c.links:[c.links],f=0,g=e.length;f<g;f++)h=e[f],d.appendChild(this.createElementNSPlus("atom:link",{attributes:{href:h.href,rel:h.rel||null,type:h.type||null,hreflang:h.hreflang||null,title:h.title||null,length:h.length||null}}));c.published&&d.appendChild(this.createElementNSPlus("atom:published",{value:c.published}));c.rights&&d.appendChild(this.createElementNSPlus("atom:rights",{value:c.rights}));(c.summary||b.description)&&d.appendChild(this.createElementNSPlus("atom:summary",{value:c.summary||
-b.description}));d.appendChild(this.createElementNSPlus("atom:title",{value:c.title||b.title||this.defaultEntryTitle}));c.updated&&d.appendChild(this.createElementNSPlus("atom:updated",{value:c.updated}));a.geometry&&(b=this.createElementNSPlus("georss:where"),b.appendChild(this.buildGeometryNode(a.geometry)),d.appendChild(b));return d},initGmlParser:function(){this.gmlParser=new OpenLayers.Format.GML.v3({xy:this.xy,featureNS:"http://example.com#feature",internalProjection:this.internalProjection,
-externalProjection:this.externalProjection})},buildGeometryNode:function(a){this.gmlParser||this.initGmlParser();return this.gmlParser.writeNode("feature:_geometry",a).firstChild},buildPersonConstructNode:function(a,b){var c=["uri","email"],d=this.createElementNSPlus("atom:"+a);d.appendChild(this.createElementNSPlus("atom:name",{value:b.name}));for(var e=0,f=c.length;e<f;e++)b[c[e]]&&d.appendChild(this.createElementNSPlus("atom:"+c[e],{value:b[c[e]]}));return d},getFirstChildValue:function(a,b,c,
-d){return(a=this.getElementsByTagNameNS(a,b,c))&&0<a.length?this.getChildValue(a[0],d):d},parseFeature:function(a){var b={},c=null,d=null,e=null,f=this.namespaces.atom;this.parsePersonConstructs(a,"author",b);d=this.getElementsByTagNameNS(a,f,"category");0<d.length&&(b.categories=[]);for(var g=0,h=d.length;g<h;g++){c={};c.term=d[g].getAttribute("term");if(e=d[g].getAttribute("scheme"))c.scheme=e;if(e=d[g].getAttribute("label"))c.label=e;b.categories.push(c)}d=this.getElementsByTagNameNS(a,f,"content");
-if(0<d.length){c={};if(e=d[0].getAttribute("type"))c.type=e;(e=d[0].getAttribute("src"))?c.src=e:("text"==c.type||"html"==c.type||null==c.type?c.value=this.getFirstChildValue(a,f,"content",null):"xhtml"==c.type||c.type.match(/(\+|\/)xml$/)?c.value=this.getChildEl(d[0]):c.value=this.getFirstChildValue(a,f,"content",null),b.content=c)}this.parsePersonConstructs(a,"contributor",b);b.id=this.getFirstChildValue(a,f,"id",null);d=this.getElementsByTagNameNS(a,f,"link");0<d.length&&(b.links=Array(d.length));
-for(var k=["rel","type","hreflang","title","length"],g=0,h=d.length;g<h;g++){c={};c.href=d[g].getAttribute("href");for(var l=0,m=k.length;l<m;l++)(e=d[g].getAttribute(k[l]))&&(c[k[l]]=e);b.links[g]=c}if(c=this.getFirstChildValue(a,f,"published",null))b.published=c;if(c=this.getFirstChildValue(a,f,"rights",null))b.rights=c;if(c=this.getFirstChildValue(a,f,"summary",null))b.summary=c;b.title=this.getFirstChildValue(a,f,"title",null);b.updated=this.getFirstChildValue(a,f,"updated",null);c={title:b.title,
-description:b.summary,atom:b};a=this.parseLocations(a)[0];a=new OpenLayers.Feature.Vector(a,c);a.fid=b.id;return a},parseFeatures:function(a){var b=[],c=this.getElementsByTagNameNS(a,this.namespaces.atom,"entry");0==c.length&&(c=[a]);a=0;for(var d=c.length;a<d;a++)b.push(this.parseFeature(c[a]));return b},parseLocations:function(a){var b=this.namespaces.georss,c={components:[]},d=this.getElementsByTagNameNS(a,b,"where");if(d&&0<d.length){this.gmlParser||this.initGmlParser();for(var e=0,f=d.length;e<
-f;e++)this.gmlParser.readChildNodes(d[e],c)}c=c.components;if((d=this.getElementsByTagNameNS(a,b,"point"))&&0<d.length)for(e=0,f=d.length;e<f;e++){var g=OpenLayers.String.trim(d[e].firstChild.nodeValue).split(/\s+/);2!=g.length&&(g=OpenLayers.String.trim(d[e].firstChild.nodeValue).split(/\s*,\s*/));c.push(new OpenLayers.Geometry.Point(g[1],g[0]))}var h=this.getElementsByTagNameNS(a,b,"line");if(h&&0<h.length)for(var k,e=0,f=h.length;e<f;e++){d=OpenLayers.String.trim(h[e].firstChild.nodeValue).split(/\s+/);
-k=[];for(var l=0,m=d.length;l<m;l+=2)g=new OpenLayers.Geometry.Point(d[l+1],d[l]),k.push(g);c.push(new OpenLayers.Geometry.LineString(k))}if((a=this.getElementsByTagNameNS(a,b,"polygon"))&&0<a.length)for(e=0,f=a.length;e<f;e++){d=OpenLayers.String.trim(a[e].firstChild.nodeValue).split(/\s+/);k=[];l=0;for(m=d.length;l<m;l+=2)g=new OpenLayers.Geometry.Point(d[l+1],d[l]),k.push(g);c.push(new OpenLayers.Geometry.Polygon([new OpenLayers.Geometry.LinearRing(k)]))}if(this.internalProjection&&this.externalProjection)for(e=
-0,f=c.length;e<f;e++)c[e]&&c[e].transform(this.externalProjection,this.internalProjection);return c},parsePersonConstructs:function(a,b,c){var d=[],e=this.namespaces.atom;a=this.getElementsByTagNameNS(a,e,b);for(var f=["uri","email"],g=0,h=a.length;g<h;g++){var k={};k.name=this.getFirstChildValue(a[g],e,"name",null);for(var l=0,m=f.length;l<m;l++){var n=this.getFirstChildValue(a[g],e,f[l],null);n&&(k[f[l]]=n)}d.push(k)}0<d.length&&(c[b+"s"]=d)},CLASS_NAME:"OpenLayers.Format.Atom"});OpenLayers.Control.KeyboardDefaults=OpenLayers.Class(OpenLayers.Control,{autoActivate:!0,slideFactor:75,observeElement:null,draw:function(){this.handler=new OpenLayers.Handler.Keyboard(this,{keydown:this.defaultKeyPress},{observeElement:this.observeElement||document})},defaultKeyPress:function(a){var b,c=!0;b=OpenLayers.Event.element(a);if(!b||"INPUT"!=b.tagName&&"TEXTAREA"!=b.tagName&&"SELECT"!=b.tagName){switch(a.keyCode){case OpenLayers.Event.KEY_LEFT:this.map.pan(-this.slideFactor,0);break;case OpenLayers.Event.KEY_RIGHT:this.map.pan(this.slideFactor,
-0);break;case OpenLayers.Event.KEY_UP:this.map.pan(0,-this.slideFactor);break;case OpenLayers.Event.KEY_DOWN:this.map.pan(0,this.slideFactor);break;case 33:b=this.map.getSize();this.map.pan(0,-0.75*b.h);break;case 34:b=this.map.getSize();this.map.pan(0,0.75*b.h);break;case 35:b=this.map.getSize();this.map.pan(0.75*b.w,0);break;case 36:b=this.map.getSize();this.map.pan(-0.75*b.w,0);break;case 43:case 61:case 187:case 107:this.map.zoomIn();break;case 45:case 109:case 189:case 95:this.map.zoomOut();
-break;default:c=!1}c&&OpenLayers.Event.stop(a)}},CLASS_NAME:"OpenLayers.Control.KeyboardDefaults"});OpenLayers.Format.WMTSCapabilities.v1_0_0=OpenLayers.Class(OpenLayers.Format.OWSCommon.v1_1_0,{version:"1.0.0",namespaces:{ows:"http://www.opengis.net/ows/1.1",wmts:"http://www.opengis.net/wmts/1.0",xlink:"http://www.w3.org/1999/xlink"},yx:null,defaultPrefix:"wmts",initialize:function(a){OpenLayers.Format.XML.prototype.initialize.apply(this,[a]);this.options=a;a=OpenLayers.Util.extend({},OpenLayers.Format.WMTSCapabilities.prototype.yx);this.yx=OpenLayers.Util.extend(a,this.yx)},read:function(a){"string"==
-typeof a&&(a=OpenLayers.Format.XML.prototype.read.apply(this,[a]));a&&9==a.nodeType&&(a=a.documentElement);var b={};this.readNode(a,b);b.version=this.version;return b},readers:{wmts:{Capabilities:function(a,b){this.readChildNodes(a,b)},Contents:function(a,b){b.contents={};b.contents.layers=[];b.contents.tileMatrixSets={};this.readChildNodes(a,b.contents)},Layer:function(a,b){var c={styles:[],formats:[],dimensions:[],tileMatrixSetLinks:[],layers:[]};this.readChildNodes(a,c);b.layers.push(c)},Style:function(a,
-b){var c={};c.isDefault="true"===a.getAttribute("isDefault");this.readChildNodes(a,c);b.styles.push(c)},Format:function(a,b){b.formats.push(this.getChildValue(a))},TileMatrixSetLink:function(a,b){var c={};this.readChildNodes(a,c);b.tileMatrixSetLinks.push(c)},TileMatrixSet:function(a,b){if(b.layers){var c={matrixIds:[]};this.readChildNodes(a,c);b.tileMatrixSets[c.identifier]=c}else b.tileMatrixSet=this.getChildValue(a)},TileMatrix:function(a,b){var c={supportedCRS:b.supportedCRS};this.readChildNodes(a,
-c);b.matrixIds.push(c)},ScaleDenominator:function(a,b){b.scaleDenominator=parseFloat(this.getChildValue(a))},TopLeftCorner:function(a,b){var c=this.getChildValue(a).split(" "),d;b.supportedCRS&&(d=b.supportedCRS.replace(/urn:ogc:def:crs:(\w+):.+:(\w+)$/,"urn:ogc:def:crs:$1::$2"),d=!!this.yx[d]);b.topLeftCorner=d?new OpenLayers.LonLat(c[1],c[0]):new OpenLayers.LonLat(c[0],c[1])},TileWidth:function(a,b){b.tileWidth=parseInt(this.getChildValue(a))},TileHeight:function(a,b){b.tileHeight=parseInt(this.getChildValue(a))},
-MatrixWidth:function(a,b){b.matrixWidth=parseInt(this.getChildValue(a))},MatrixHeight:function(a,b){b.matrixHeight=parseInt(this.getChildValue(a))},ResourceURL:function(a,b){b.resourceUrl=b.resourceUrl||{};var c=a.getAttribute("resourceType");b.resourceUrls||(b.resourceUrls=[]);c=b.resourceUrl[c]={format:a.getAttribute("format"),template:a.getAttribute("template"),resourceType:c};b.resourceUrls.push(c)},WSDL:function(a,b){b.wsdl={};b.wsdl.href=a.getAttribute("xlink:href")},ServiceMetadataURL:function(a,
-b){b.serviceMetadataUrl={};b.serviceMetadataUrl.href=a.getAttribute("xlink:href")},LegendURL:function(a,b){b.legend={};b.legend.href=a.getAttribute("xlink:href");b.legend.format=a.getAttribute("format")},Dimension:function(a,b){var c={values:[]};this.readChildNodes(a,c);b.dimensions.push(c)},Default:function(a,b){b["default"]=this.getChildValue(a)},Value:function(a,b){b.values.push(this.getChildValue(a))}},ows:OpenLayers.Format.OWSCommon.v1_1_0.prototype.readers.ows},CLASS_NAME:"OpenLayers.Format.WMTSCapabilities.v1_0_0"});
diff --git a/#pma/js/openlayers/img/blank.gif b/#pma/js/openlayers/img/blank.gif
deleted file mode 100644
index 4bcc753a..00000000
Binary files a/#pma/js/openlayers/img/blank.gif and /dev/null differ
diff --git a/#pma/js/openlayers/img/cloud-popup-relative.png b/#pma/js/openlayers/img/cloud-popup-relative.png
deleted file mode 100644
index 9e063b7f..00000000
Binary files a/#pma/js/openlayers/img/cloud-popup-relative.png and /dev/null differ
diff --git a/#pma/js/openlayers/img/drag-rectangle-off.png b/#pma/js/openlayers/img/drag-rectangle-off.png
deleted file mode 100644
index 382a81d9..00000000
Binary files a/#pma/js/openlayers/img/drag-rectangle-off.png and /dev/null differ
diff --git a/#pma/js/openlayers/img/drag-rectangle-on.png b/#pma/js/openlayers/img/drag-rectangle-on.png
deleted file mode 100644
index 2ed2d5b0..00000000
Binary files a/#pma/js/openlayers/img/drag-rectangle-on.png and /dev/null differ
diff --git a/#pma/js/openlayers/img/east-mini.png b/#pma/js/openlayers/img/east-mini.png
deleted file mode 100644
index ecedc5ef..00000000
Binary files a/#pma/js/openlayers/img/east-mini.png and /dev/null differ
diff --git a/#pma/js/openlayers/img/layer-switcher-maximize.png b/#pma/js/openlayers/img/layer-switcher-maximize.png
deleted file mode 100644
index f346086b..00000000
Binary files a/#pma/js/openlayers/img/layer-switcher-maximize.png and /dev/null differ
diff --git a/#pma/js/openlayers/img/layer-switcher-minimize.png b/#pma/js/openlayers/img/layer-switcher-minimize.png
deleted file mode 100644
index b4aab0bf..00000000
Binary files a/#pma/js/openlayers/img/layer-switcher-minimize.png and /dev/null differ
diff --git a/#pma/js/openlayers/img/marker-blue.png b/#pma/js/openlayers/img/marker-blue.png
deleted file mode 100644
index f5b4efcf..00000000
Binary files a/#pma/js/openlayers/img/marker-blue.png and /dev/null differ
diff --git a/#pma/js/openlayers/img/marker-gold.png b/#pma/js/openlayers/img/marker-gold.png
deleted file mode 100644
index 0b62f961..00000000
Binary files a/#pma/js/openlayers/img/marker-gold.png and /dev/null differ
diff --git a/#pma/js/openlayers/img/marker-green.png b/#pma/js/openlayers/img/marker-green.png
deleted file mode 100644
index c36b164b..00000000
Binary files a/#pma/js/openlayers/img/marker-green.png and /dev/null differ
diff --git a/#pma/js/openlayers/img/marker.png b/#pma/js/openlayers/img/marker.png
deleted file mode 100644
index ea3e59a5..00000000
Binary files a/#pma/js/openlayers/img/marker.png and /dev/null differ
diff --git a/#pma/js/openlayers/img/measuring-stick-off.png b/#pma/js/openlayers/img/measuring-stick-off.png
deleted file mode 100644
index 3dbe8672..00000000
Binary files a/#pma/js/openlayers/img/measuring-stick-off.png and /dev/null differ
diff --git a/#pma/js/openlayers/img/measuring-stick-on.png b/#pma/js/openlayers/img/measuring-stick-on.png
deleted file mode 100644
index 967e68c4..00000000
Binary files a/#pma/js/openlayers/img/measuring-stick-on.png and /dev/null differ
diff --git a/#pma/js/openlayers/img/north-mini.png b/#pma/js/openlayers/img/north-mini.png
deleted file mode 100644
index dfd7211f..00000000
Binary files a/#pma/js/openlayers/img/north-mini.png and /dev/null differ
diff --git a/#pma/js/openlayers/img/panning-hand-off.png b/#pma/js/openlayers/img/panning-hand-off.png
deleted file mode 100644
index b676ba6b..00000000
Binary files a/#pma/js/openlayers/img/panning-hand-off.png and /dev/null differ
diff --git a/#pma/js/openlayers/img/panning-hand-on.png b/#pma/js/openlayers/img/panning-hand-on.png
deleted file mode 100644
index 4d33708b..00000000
Binary files a/#pma/js/openlayers/img/panning-hand-on.png and /dev/null differ
diff --git a/#pma/js/openlayers/img/slider.png b/#pma/js/openlayers/img/slider.png
deleted file mode 100644
index 43353642..00000000
Binary files a/#pma/js/openlayers/img/slider.png and /dev/null differ
diff --git a/#pma/js/openlayers/img/south-mini.png b/#pma/js/openlayers/img/south-mini.png
deleted file mode 100644
index 2970875c..00000000
Binary files a/#pma/js/openlayers/img/south-mini.png and /dev/null differ
diff --git a/#pma/js/openlayers/img/west-mini.png b/#pma/js/openlayers/img/west-mini.png
deleted file mode 100644
index 363cd3d7..00000000
Binary files a/#pma/js/openlayers/img/west-mini.png and /dev/null differ
diff --git a/#pma/js/openlayers/img/zoom-minus-mini.png b/#pma/js/openlayers/img/zoom-minus-mini.png
deleted file mode 100644
index 8f0d77ff..00000000
Binary files a/#pma/js/openlayers/img/zoom-minus-mini.png and /dev/null differ
diff --git a/#pma/js/openlayers/img/zoom-plus-mini.png b/#pma/js/openlayers/img/zoom-plus-mini.png
deleted file mode 100644
index 8a61f32b..00000000
Binary files a/#pma/js/openlayers/img/zoom-plus-mini.png and /dev/null differ
diff --git a/#pma/js/openlayers/img/zoom-world-mini.png b/#pma/js/openlayers/img/zoom-world-mini.png
deleted file mode 100644
index f3611c7f..00000000
Binary files a/#pma/js/openlayers/img/zoom-world-mini.png and /dev/null differ
diff --git a/#pma/js/openlayers/img/zoombar.png b/#pma/js/openlayers/img/zoombar.png
deleted file mode 100644
index 748fe5be..00000000
Binary files a/#pma/js/openlayers/img/zoombar.png and /dev/null differ
diff --git a/#pma/js/openlayers/src/openlayers/lib/Firebug/errorIcon.png b/#pma/js/openlayers/src/openlayers/lib/Firebug/errorIcon.png
deleted file mode 100644
index 2d75261b..00000000
Binary files a/#pma/js/openlayers/src/openlayers/lib/Firebug/errorIcon.png and /dev/null differ
diff --git a/#pma/js/openlayers/src/openlayers/lib/Firebug/firebug.css b/#pma/js/openlayers/src/openlayers/lib/Firebug/firebug.css
deleted file mode 100644
index 1f041c4d..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/Firebug/firebug.css
+++ /dev/null
@@ -1,209 +0,0 @@
-
-html, body {
-    margin: 0;
-    background: #FFFFFF;
-    font-family: Lucida Grande, Tahoma, sans-serif;
-    font-size: 11px;
-    overflow: hidden;
-}
-
-a {
-    text-decoration: none;
-}
-
-a:hover {
-    text-decoration: underline;
-}
-
-.toolbar {
-    height: 14px;
-    border-top: 1px solid ThreeDHighlight;
-    border-bottom: 1px solid ThreeDShadow;
-    padding: 2px 6px;
-    background: ThreeDFace;
-}
-
-.toolbarRight {
-    position: absolute;
-    top: 4px;
-    right: 6px;
-}
-
-#log {
-    overflow: auto;
-    position: absolute;
-    left: 0;
-    width: 100%;
-}
-
-#commandLine {
-    position: absolute;
-    bottom: 0;
-    left: 0;
-    width: 100%;
-    height: 18px;
-    border: none;
-    border-top: 1px solid ThreeDShadow;
-}
-
-/************************************************************************************************/
-
-.logRow {
-    position: relative;
-    border-bottom: 1px solid #D7D7D7;
-    padding: 2px 4px 1px 6px;
-    background-color: #FFFFFF;
-}
-
-.logRow-command {
-    font-family: Monaco, monospace;
-    color: blue;
-}
-
-.objectBox-null {
-    padding: 0 2px;
-    border: 1px solid #666666;
-    background-color: #888888;
-    color: #FFFFFF;
-}
-
-.objectBox-string {
-    font-family: Monaco, monospace;
-    color: red;
-    white-space: pre;
-}
-
-.objectBox-number {
-    color: #000088;
-}
-
-.objectBox-function {
-    font-family: Monaco, monospace;
-    color: DarkGreen;
-}
-
-.objectBox-object {
-    color: DarkGreen;
-    font-weight: bold;
-}
-
-/************************************************************************************************/
-
-.logRow-info,
-.logRow-error,
-.logRow-warning {
-    background: #FFFFFF no-repeat 2px 2px;
-    padding-left: 20px;
-    padding-bottom: 3px;
-}
-
-.logRow-info {
-    background-image: url(infoIcon.png);
-}
-
-.logRow-warning {
-    background-color: cyan;
-    background-image: url(warningIcon.png);
-}
-
-.logRow-error {
-    background-color: LightYellow;
-    background-image: url(errorIcon.png);
-}
-
-.errorMessage {
-    vertical-align: top;
-    color: #FF0000;
-}
-
-.objectBox-sourceLink {
-    position: absolute;
-    right: 4px;
-    top: 2px;
-    padding-left: 8px;
-    font-family: Lucida Grande, sans-serif;
-    font-weight: bold;
-    color: #0000FF;
-}
-
-/************************************************************************************************/
-
-.logRow-group {
-    background: #EEEEEE;
-    border-bottom: none;
-}
-
-.logGroup {
-    background: #EEEEEE;
-}
-
-.logGroupBox {
-    margin-left: 24px;
-    border-top: 1px solid #D7D7D7;
-    border-left: 1px solid #D7D7D7;
-}
-
-/************************************************************************************************/
-
-.selectorTag,
-.selectorId,
-.selectorClass {
-    font-family: Monaco, monospace;
-    font-weight: normal;
-}
-
-.selectorTag {
-    color: #0000FF;
-}
-
-.selectorId {
-    color: DarkBlue;
-}
-
-.selectorClass {
-    color: red;
-}
-
-/************************************************************************************************/
-
-.objectBox-element {
-    font-family: Monaco, monospace;
-    color: #000088;
-}
-
-.nodeChildren {
-    margin-left: 16px;
-}
-
-.nodeTag {
-    color: blue;
-}
-
-.nodeValue {
-    color: #FF0000;
-    font-weight: normal;
-}
-
-.nodeText,
-.nodeComment {
-    margin: 0 2px;
-    vertical-align: top;
-}
-
-.nodeText {
-    color: #333333;
-}
-
-.nodeComment {
-    color: DarkGreen;
-}
-
-/************************************************************************************************/
-
-.propertyNameCell {
-    vertical-align: top;
-}
-
-.propertyName {
-    font-weight: bold;
-}
diff --git a/#pma/js/openlayers/src/openlayers/lib/Firebug/firebug.html b/#pma/js/openlayers/src/openlayers/lib/Firebug/firebug.html
deleted file mode 100644
index 861e6393..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/Firebug/firebug.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-         "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-    <title>Firebug</title>
-    <link rel="stylesheet" type="text/css" href="firebug.css">
-</head>
-
-<body>
-    <div id="toolbar" class="toolbar">
-        <a href="#" onclick="parent.console.clear()">Clear</a>
-        <span class="toolbarRight">
-            <a href="#" onclick="parent.console.close()">Close</a>
-        </span>
-    </div>
-    <div id="log"></div>
-    <input type="text" id="commandLine">
-    
-    <script>parent.onFirebugReady(document);</script>
-</body>
-</html>
diff --git a/#pma/js/openlayers/src/openlayers/lib/Firebug/firebug.js b/#pma/js/openlayers/src/openlayers/lib/Firebug/firebug.js
deleted file mode 100644
index f07825e0..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/Firebug/firebug.js
+++ /dev/null
@@ -1,674 +0,0 @@
-
-if (!window.console || !console.firebug) { (function()
-{
-    window.console = 
-    {
-        log: function()
-        {
-            logFormatted(arguments, "");
-        },
-        
-        debug: function()
-        {
-            logFormatted(arguments, "debug");
-        },
-        
-        info: function()
-        {
-            logFormatted(arguments, "info");
-        },
-        
-        warn: function()
-        {
-            logFormatted(arguments, "warning");
-        },
-        
-        error: function()
-        {
-            logFormatted(arguments, "error");
-        },
-        
-        assert: function(truth, message)
-        {
-            if (!truth)
-            {
-                var args = [];
-                for (var i = 1; i < arguments.length; ++i)
-                    args.push(arguments[i]);
-                
-                logFormatted(args.length ? args : ["Assertion Failure"], "error");
-                throw message ? message : "Assertion Failure";
-            }
-        },
-        
-        dir: function(object)
-        {
-            var html = [];
-                        
-            var pairs = [];
-            for (var name in object)
-            {
-                try
-                {
-                    pairs.push([name, object[name]]);
-                }
-                catch (exc)
-                {
-                }
-            }
-            
-            pairs.sort(function(a, b) { return a[0] < b[0] ? -1 : 1; });
-            
-            html.push('<table>');
-            for (var i = 0; i < pairs.length; ++i)
-            {
-                var name = pairs[i][0], value = pairs[i][1];
-                
-                html.push('<tr>', 
-                '<td class="propertyNameCell"><span class="propertyName">',
-                    escapeHTML(name), '</span></td>', '<td><span class="propertyValue">');
-                appendObject(value, html);
-                html.push('</span></td></tr>');
-            }
-            html.push('</table>');
-            
-            logRow(html, "dir");
-        },
-        
-        dirxml: function(node)
-        {
-            var html = [];
-            
-            appendNode(node, html);
-            logRow(html, "dirxml");
-        },
-        
-        group: function()
-        {
-            logRow(arguments, "group", pushGroup);
-        },
-        
-        groupEnd: function()
-        {
-            logRow(arguments, "", popGroup);
-        },
-        
-        time: function(name)
-        {
-            timeMap[name] = (new Date()).getTime();
-        },
-        
-        timeEnd: function(name)
-        {
-            if (name in timeMap)
-            {
-                var delta = (new Date()).getTime() - timeMap[name];
-                logFormatted([name+ ":", delta+"ms"]);
-                delete timeMap[name];
-            }
-        },
-        
-        count: function()
-        {
-            this.warn(["count() not supported."]);
-        },
-        
-        trace: function()
-        {
-            this.warn(["trace() not supported."]);
-        },
-        
-        profile: function()
-        {
-            this.warn(["profile() not supported."]);
-        },
-        
-        profileEnd: function()
-        {
-        },
-        
-        clear: function()
-        {
-            consoleBody.innerHTML = "";
-        },
-
-        open: function()
-        {
-            toggleConsole(true);
-        },
-        
-        close: function()
-        {
-            if (frameVisible)
-                toggleConsole();
-        }
-    };
- 
-    // ********************************************************************************************
-       
-    var consoleFrame = null;
-    var consoleBody = null;
-    var commandLine = null;
-    
-    var frameVisible = false;
-    var messageQueue = [];
-    var groupStack = [];
-    var timeMap = {};
-    
-    var clPrefix = ">>> ";
-    
-    var isFirefox = navigator.userAgent.indexOf("Firefox") != -1;
-    var isIE = navigator.userAgent.indexOf("MSIE") != -1;
-    var isOpera = navigator.userAgent.indexOf("Opera") != -1;
-    var isSafari = navigator.userAgent.indexOf("AppleWebKit") != -1;
-
-    // ********************************************************************************************
-
-    function toggleConsole(forceOpen)
-    {
-        frameVisible = forceOpen || !frameVisible;
-        if (consoleFrame)
-            consoleFrame.style.visibility = frameVisible ? "visible" : "hidden";
-        else
-            waitForBody();
-    }
-
-    function focusCommandLine()
-    {
-        toggleConsole(true);
-        if (commandLine)
-            commandLine.focus();
-    }
-
-    function waitForBody()
-    {
-        if (document.body)
-            createFrame();
-        else
-            setTimeout(waitForBody, 200);
-    }    
-
-    function createFrame()
-    {
-        if (consoleFrame)
-            return;
-        
-        window.onFirebugReady = function(doc)
-        {
-            window.onFirebugReady = null;
-
-            var toolbar = doc.getElementById("toolbar");
-            toolbar.onmousedown = onSplitterMouseDown;
-
-            commandLine = doc.getElementById("commandLine");
-            addEvent(commandLine, "keydown", onCommandLineKeyDown);
-
-            addEvent(doc, isIE || isSafari ? "keydown" : "keypress", onKeyDown);
-            
-            consoleBody = doc.getElementById("log");
-            layout();
-            flush();
-        };
-
-        var baseURL = getFirebugURL();
-
-        consoleFrame = document.createElement("iframe");
-        consoleFrame.setAttribute("src", baseURL+"/firebug.html");
-        consoleFrame.setAttribute("frameBorder", "0");
-        consoleFrame.style.visibility = (frameVisible ? "visible" : "hidden");    
-        consoleFrame.style.zIndex = "2147483583";
-        consoleFrame.style.position = document.all ? "absolute" : "fixed";
-        consoleFrame.style.width = "100%";
-        consoleFrame.style.left = "0";
-        consoleFrame.style.bottom = "0";
-        consoleFrame.style.height = "200px";
-        document.body.appendChild(consoleFrame);
-    }
-    
-    function getFirebugURL()
-    {
-        var scripts = document.getElementsByTagName("script");
-        for (var i = 0; i < scripts.length; ++i)
-        {
-            if (scripts[i].src.indexOf("firebug.js") != -1)
-            {
-                var lastSlash = scripts[i].src.lastIndexOf("/");
-                return scripts[i].src.substr(0, lastSlash);
-            }
-        }
-    }
-    
-    function evalCommandLine()
-    {
-        var text = commandLine.value;
-        commandLine.value = "";
-
-        logRow([clPrefix, text], "command");
-        
-        var value;
-        try
-        {
-            value = eval(text);
-        }
-        catch (exc)
-        {
-        }
-
-        console.log(value);
-    }
-    
-    function layout()
-    {
-        var toolbar = consoleBody.ownerDocument.getElementById("toolbar");
-        var height = consoleFrame.offsetHeight - (toolbar.offsetHeight + commandLine.offsetHeight);
-        height = Math.max(height, 0);
-        consoleBody.style.top = toolbar.offsetHeight + "px";
-        consoleBody.style.height = height + "px";
-        
-        commandLine.style.top = (consoleFrame.offsetHeight - commandLine.offsetHeight) + "px";
-    }
-    
-    function logRow(message, className, handler)
-    {
-        if (consoleBody)
-            writeMessage(message, className, handler);
-        else
-        {
-            messageQueue.push([message, className, handler]);
-            waitForBody();
-        }
-    }
-    
-    function flush()
-    {
-        var queue = messageQueue;
-        messageQueue = [];
-        
-        for (var i = 0; i < queue.length; ++i)
-            writeMessage(queue[i][0], queue[i][1], queue[i][2]);
-    }
-
-    function writeMessage(message, className, handler)
-    {
-        var isScrolledToBottom =
-            consoleBody.scrollTop + consoleBody.offsetHeight >= consoleBody.scrollHeight;
-
-        if (!handler)
-            handler = writeRow;
-        
-        handler(message, className);
-        
-        if (isScrolledToBottom)
-            consoleBody.scrollTop = consoleBody.scrollHeight - consoleBody.offsetHeight;
-    }
-    
-    function appendRow(row)
-    {
-        var container = groupStack.length ? groupStack[groupStack.length-1] : consoleBody;
-        container.appendChild(row);
-    }
-
-    function writeRow(message, className)
-    {
-        var row = consoleBody.ownerDocument.createElement("div");
-        row.className = "logRow" + (className ? " logRow-"+className : "");
-        row.innerHTML = message.join("");
-        appendRow(row);
-    }
-
-    function pushGroup(message, className)
-    {
-        logFormatted(message, className);
-
-        var groupRow = consoleBody.ownerDocument.createElement("div");
-        groupRow.className = "logGroup";
-        var groupRowBox = consoleBody.ownerDocument.createElement("div");
-        groupRowBox.className = "logGroupBox";
-        groupRow.appendChild(groupRowBox);
-        appendRow(groupRowBox);
-        groupStack.push(groupRowBox);
-    }
-
-    function popGroup()
-    {
-        groupStack.pop();
-    }
-    
-    // ********************************************************************************************
-
-    function logFormatted(objects, className)
-    {
-        var html = [];
-
-        var format = objects[0];
-        var objIndex = 0;
-
-        if (typeof(format) != "string")
-        {
-            format = "";
-            objIndex = -1;
-        }
-
-        var parts = parseFormat(format);
-        for (var i = 0; i < parts.length; ++i)
-        {
-            var part = parts[i];
-            if (part && typeof(part) == "object")
-            {
-                var object = objects[++objIndex];
-                part.appender(object, html);
-            }
-            else
-                appendText(part, html);
-        }
-
-        for (var i = objIndex+1; i < objects.length; ++i)
-        {
-            appendText(" ", html);
-            
-            var object = objects[i];
-            if (typeof(object) == "string")
-                appendText(object, html);
-            else
-                appendObject(object, html);
-        }
-        
-        logRow(html, className);
-    }
-
-    function parseFormat(format)
-    {
-        var parts = [];
-
-        var reg = /((^%|[^\\]%)(\d+)?(\.)([a-zA-Z]))|((^%|[^\\]%)([a-zA-Z]))/;    
-        var appenderMap = {s: appendText, d: appendInteger, i: appendInteger, f: appendFloat};
-
-        for (var m = reg.exec(format); m; m = reg.exec(format))
-        {
-            var type = m[8] ? m[8] : m[5];
-            var appender = type in appenderMap ? appenderMap[type] : appendObject;
-            var precision = m[3] ? parseInt(m[3]) : (m[4] == "." ? -1 : 0);
-
-            parts.push(format.substr(0, m[0][0] == "%" ? m.index : m.index+1));
-            parts.push({appender: appender, precision: precision});
-
-            format = format.substr(m.index+m[0].length);
-        }
-
-        parts.push(format);
-
-        return parts;
-    }
-
-    function escapeHTML(value)
-    {
-        function replaceChars(ch)
-        {
-            switch (ch)
-            {
-                case "<":
-                    return "&lt;";
-                case ">":
-                    return "&gt;";
-                case "&":
-                    return "&amp;";
-                case "'":
-                    return "&#39;";
-                case '"':
-                    return "&quot;";
-            }
-            return "?";
-        };
-        return String(value).replace(/[<>&"']/g, replaceChars);
-    }
-
-    function objectToString(object)
-    {
-        try
-        {
-            return object+"";
-        }
-        catch (exc)
-        {
-            return null;
-        }
-    }
-
-    // ********************************************************************************************
-
-    function appendText(object, html)
-    {
-        html.push(escapeHTML(objectToString(object)));
-    }
-
-    function appendNull(object, html)
-    {
-        html.push('<span class="objectBox-null">', escapeHTML(objectToString(object)), '</span>');
-    }
-
-    function appendString(object, html)
-    {
-        html.push('<span class="objectBox-string">&quot;', escapeHTML(objectToString(object)),
-            '&quot;</span>');
-    }
-
-    function appendInteger(object, html)
-    {
-        html.push('<span class="objectBox-number">', escapeHTML(objectToString(object)), '</span>');
-    }
-
-    function appendFloat(object, html)
-    {
-        html.push('<span class="objectBox-number">', escapeHTML(objectToString(object)), '</span>');
-    }
-
-    function appendFunction(object, html)
-    {
-        var reName = /function ?(.*?)\(/;
-        var m = reName.exec(objectToString(object));
-        var name = m ? m[1] : "function";
-        html.push('<span class="objectBox-function">', escapeHTML(name), '()</span>');
-    }
-    
-    function appendObject(object, html)
-    {
-        try
-        {
-            if (object == undefined)
-                appendNull("undefined", html);
-            else if (object == null)
-                appendNull("null", html);
-            else if (typeof object == "string")
-                appendString(object, html);
-            else if (typeof object == "number")
-                appendInteger(object, html);
-            else if (typeof object == "function")
-                appendFunction(object, html);
-            else if (object.nodeType == 1)
-                appendSelector(object, html);
-            else if (typeof object == "object")
-                appendObjectFormatted(object, html);
-            else
-                appendText(object, html);
-        }
-        catch (exc)
-        {
-        }
-    }
-        
-    function appendObjectFormatted(object, html)
-    {
-        var text = objectToString(object);
-        var reObject = /\[object (.*?)\]/;
-
-        var m = reObject.exec(text);
-        html.push('<span class="objectBox-object">', m ? m[1] : text, '</span>')
-    }
-    
-    function appendSelector(object, html)
-    {
-        html.push('<span class="objectBox-selector">');
-
-        html.push('<span class="selectorTag">', escapeHTML(object.nodeName.toLowerCase()), '</span>');
-        if (object.id)
-            html.push('<span class="selectorId">#', escapeHTML(object.id), '</span>');
-        if (object.className)
-            html.push('<span class="selectorClass">.', escapeHTML(object.className), '</span>');
-
-        html.push('</span>');
-    }
-
-    function appendNode(node, html)
-    {
-        if (node.nodeType == 1)
-        {
-            html.push(
-                '<div class="objectBox-element">',
-                    '&lt;<span class="nodeTag">', node.nodeName.toLowerCase(), '</span>');
-
-            for (var i = 0; i < node.attributes.length; ++i)
-            {
-                var attr = node.attributes[i];
-                if (!attr.specified)
-                    continue;
-                
-                html.push('&nbsp;<span class="nodeName">', attr.nodeName.toLowerCase(),
-                    '</span>=&quot;<span class="nodeValue">', escapeHTML(attr.nodeValue),
-                    '</span>&quot;')
-            }
-
-            if (node.firstChild)
-            {
-                html.push('&gt;</div><div class="nodeChildren">');
-
-                for (var child = node.firstChild; child; child = child.nextSibling)
-                    appendNode(child, html);
-                    
-                html.push('</div><div class="objectBox-element">&lt;/<span class="nodeTag">', 
-                    node.nodeName.toLowerCase(), '&gt;</span></div>');
-            }
-            else
-                html.push('/&gt;</div>');
-        }
-        else if (node.nodeType == 3)
-        {
-            html.push('<div class="nodeText">', escapeHTML(node.nodeValue),
-                '</div>');
-        }
-    }
-
-    // ********************************************************************************************
-    
-    function addEvent(object, name, handler)
-    {
-        if (document.all)
-            object.attachEvent("on"+name, handler);
-        else
-            object.addEventListener(name, handler, false);
-    }
-    
-    function removeEvent(object, name, handler)
-    {
-        if (document.all)
-            object.detachEvent("on"+name, handler);
-        else
-            object.removeEventListener(name, handler, false);
-    }
-    
-    function cancelEvent(event)
-    {
-        if (document.all)
-            event.cancelBubble = true;
-        else
-            event.stopPropagation();        
-    }
-
-    function onError(msg, href, lineNo)
-    {
-        var html = [];
-        
-        var lastSlash = href.lastIndexOf("/");
-        var fileName = lastSlash == -1 ? href : href.substr(lastSlash+1);
-        
-        html.push(
-            '<span class="errorMessage">', msg, '</span>', 
-            '<div class="objectBox-sourceLink">', fileName, ' (line ', lineNo, ')</div>'
-        );
-        
-        logRow(html, "error");
-    };
-
-    function onKeyDown(event)
-    {
-        if (event.keyCode == 123)
-            toggleConsole();
-        else if ((event.keyCode == 108 || event.keyCode == 76) && event.shiftKey
-                 && (event.metaKey || event.ctrlKey))
-            focusCommandLine();
-        else
-            return;
-        
-        cancelEvent(event);
-    }
-
-    function onSplitterMouseDown(event)
-    {
-        if (isSafari || isOpera)
-            return;
-        
-        addEvent(document, "mousemove", onSplitterMouseMove);
-        addEvent(document, "mouseup", onSplitterMouseUp);
-
-        for (var i = 0; i < frames.length; ++i)
-        {
-            addEvent(frames[i].document, "mousemove", onSplitterMouseMove);
-            addEvent(frames[i].document, "mouseup", onSplitterMouseUp);
-        }
-    }
-    
-    function onSplitterMouseMove(event)
-    {
-        var win = document.all
-            ? event.srcElement.ownerDocument.parentWindow
-            : event.target.ownerDocument.defaultView;
-
-        var clientY = event.clientY;
-        if (win != win.parent)
-            clientY += win.frameElement ? win.frameElement.offsetTop : 0;
-        
-        var height = consoleFrame.offsetTop + consoleFrame.clientHeight;
-        var toolbar = consoleBody.ownerDocument.getElementById("toolbar");
-        var y = Math.max(height - clientY,
-                         toolbar.offsetHeight + commandLine.offsetHeight);
-        
-        consoleFrame.style.height = y + "px";
-        layout();
-    }
-    
-    function onSplitterMouseUp(event)
-    {
-        removeEvent(document, "mousemove", onSplitterMouseMove);
-        removeEvent(document, "mouseup", onSplitterMouseUp);
-
-        for (var i = 0; i < frames.length; ++i)
-        {
-            removeEvent(frames[i].document, "mousemove", onSplitterMouseMove);
-            removeEvent(frames[i].document, "mouseup", onSplitterMouseUp);
-        }
-    }
-    
-    function onCommandLineKeyDown(event)
-    {
-        if (event.keyCode == 13)
-            evalCommandLine();
-        else if (event.keyCode == 27)
-            commandLine.value = "";
-    }
-    
-    window.onerror = onError;
-    addEvent(document, isIE || isSafari ? "keydown" : "keypress", onKeyDown);
-    
-    if (document.documentElement.getAttribute("debug") == "true")
-        toggleConsole(true);
-})();
-}
diff --git a/#pma/js/openlayers/src/openlayers/lib/Firebug/firebugx.js b/#pma/js/openlayers/src/openlayers/lib/Firebug/firebugx.js
deleted file mode 100644
index f0a34df8..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/Firebug/firebugx.js
+++ /dev/null
@@ -1,10 +0,0 @@
-(function() {
-    if (!window.console || !console.firebug) {
-        var names = ["log", "debug", "info", "warn", "error", "assert", "dir", "dirxml",
-        "group", "groupEnd", "time", "timeEnd", "count", "trace", "profile", "profileEnd"];
-
-        window.console = {};
-        for (var i = 0; i < names.length; ++i)
-            window.console[names[i]] = function() {}
-    }
-})();
diff --git a/#pma/js/openlayers/src/openlayers/lib/Firebug/infoIcon.png b/#pma/js/openlayers/src/openlayers/lib/Firebug/infoIcon.png
deleted file mode 100644
index da1e5334..00000000
Binary files a/#pma/js/openlayers/src/openlayers/lib/Firebug/infoIcon.png and /dev/null differ
diff --git a/#pma/js/openlayers/src/openlayers/lib/Firebug/license.txt b/#pma/js/openlayers/src/openlayers/lib/Firebug/license.txt
deleted file mode 100644
index ba43b751..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/Firebug/license.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-Software License Agreement (BSD License)
-
-Copyright (c) 2007, Parakey Inc.
-All rights reserved.
-
-Redistribution and use of this software in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above
-  copyright notice, this list of conditions and the
-  following disclaimer.
-
-* Redistributions in binary form must reproduce the above
-  copyright notice, this list of conditions and the
-  following disclaimer in the documentation and/or other
-  materials provided with the distribution.
-
-* Neither the name of Parakey Inc. nor the names of its
-  contributors may be used to endorse or promote products
-  derived from this software without specific prior
-  written permission of Parakey Inc.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
-IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/#pma/js/openlayers/src/openlayers/lib/Firebug/readme.txt b/#pma/js/openlayers/src/openlayers/lib/Firebug/readme.txt
deleted file mode 100644
index 1edebf56..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/Firebug/readme.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-This directory contains the source for Firebug Lite
-(http://www.getfirebug.com/lite.html).  This code is distributed with a
-BSD License, Copyright (c) 2007, Parakey Inc.  See the included license.txt
-for the full text of the license.
-
-This is a patched version of the trunk from
-http://fbug.googlecode.com/svn/trunk.
-
-Revision 36 was patched to resolve the issue described here
-http://code.google.com/p/fbug/issues/detail?id=85
-
-When this issue is resolved, Firebug Lite can be used directly - no further
-modifications are needed for OpenLayers.
\ No newline at end of file
diff --git a/#pma/js/openlayers/src/openlayers/lib/Firebug/warningIcon.png b/#pma/js/openlayers/src/openlayers/lib/Firebug/warningIcon.png
deleted file mode 100644
index de51084e..00000000
Binary files a/#pma/js/openlayers/src/openlayers/lib/Firebug/warningIcon.png and /dev/null differ
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers.js
deleted file mode 100644
index 03530c25..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers.js
+++ /dev/null
@@ -1,429 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/* 
- * @requires OpenLayers/BaseTypes.js
- * @requires OpenLayers/Lang/en.js
- * @requires OpenLayers/Console.js
- */
- 
-/*
- * TODO: In 3.0, we will stop supporting build profiles that include
- * OpenLayers.js. This means we will not need the singleFile and scriptFile
- * variables, because we don't have to handle the singleFile case any more.
- */
-
-(function() {
-    /**
-     * Before creating the OpenLayers namespace, check to see if
-     * OpenLayers.singleFile is true.  This occurs if the
-     * OpenLayers/SingleFile.js script is included before this one - as is the
-     * case with old single file build profiles that included both
-     * OpenLayers.js and OpenLayers/SingleFile.js.
-     */
-    var singleFile = (typeof OpenLayers == "object" && OpenLayers.singleFile);
-    
-    /**
-     * Relative path of this script.
-     */
-    var scriptName = (!singleFile) ? "lib/OpenLayers.js" : "OpenLayers.js";
-
-    /*
-     * If window.OpenLayers isn't set when this script (OpenLayers.js) is
-     * evaluated (and if singleFile is false) then this script will load
-     * *all* OpenLayers scripts. If window.OpenLayers is set to an array
-     * then this script will attempt to load scripts for each string of
-     * the array, using the string as the src of the script.
-     *
-     * Example:
-     * (code)
-     *     <script type="text/javascript">
-     *         window.OpenLayers = [
-     *             "OpenLayers/Util.js",
-     *             "OpenLayers/BaseTypes.js"
-     *         ];
-     *     </script>
-     *     <script type="text/javascript" src="../lib/OpenLayers.js"></script>
-     * (end)
-     * In this example OpenLayers.js will load Util.js and BaseTypes.js only.
-     */
-    var jsFiles = window.OpenLayers;
-
-    /**
-     * Namespace: OpenLayers
-     * The OpenLayers object provides a namespace for all things OpenLayers
-     */
-    window.OpenLayers = {
-        /**
-         * Method: _getScriptLocation
-         * Return the path to this script. This is also implemented in
-         * OpenLayers/SingleFile.js
-         *
-         * Returns:
-         * {String} Path to this script
-         */
-        _getScriptLocation: (function() {
-            var r = new RegExp("(^|(.*?\\/))(" + scriptName + ")(\\?|$)"),
-                s = document.getElementsByTagName('script'),
-                src, m, l = "";
-            for(var i=0, len=s.length; i<len; i++) {
-                src = s[i].getAttribute('src');
-                if(src) {
-                    m = src.match(r);
-                    if(m) {
-                        l = m[1];
-                        break;
-                    }
-                }
-            }
-            return (function() { return l; });
-        })(),
-        
-        /**
-         * APIProperty: ImgPath
-         * {String} Set this to the path where control images are stored, a path  
-         * given here must end with a slash. If set to '' (which is the default) 
-         * OpenLayers will use its script location + "img/".
-         * 
-         * You will need to set this property when you have a singlefile build of 
-         * OpenLayers that either is not named "OpenLayers.js" or if you move
-         * the file in a way such that the image directory cannot be derived from 
-         * the script location.
-         * 
-         * If your custom OpenLayers build is named "my-custom-ol.js" and the images
-         * of OpenLayers are in a folder "/resources/external/images/ol" a correct
-         * way of including OpenLayers in your HTML would be:
-         * 
-         * (code)
-         *   <script src="/path/to/my-custom-ol.js" type="text/javascript"></script>
-         *   <script type="text/javascript">
-         *      // tell OpenLayers where the control images are
-         *      // remember the trailing slash
-         *      OpenLayers.ImgPath = "/resources/external/images/ol/";
-         *   </script>
-         * (end code)
-         * 
-         * Please remember that when your OpenLayers script is not named 
-         * "OpenLayers.js" you will have to make sure that the default theme is 
-         * loaded into the page by including an appropriate <link>-tag, 
-         * e.g.:
-         * 
-         * (code)
-         *   <link rel="stylesheet" href="/path/to/default/style.css"  type="text/css">
-         * (end code)
-         */
-        ImgPath : ''
-    };
-
-    /**
-     * OpenLayers.singleFile is a flag indicating this file is being included
-     * in a Single File Library build of the OpenLayers Library.
-     * 
-     * When we are *not* part of a SFL build we dynamically include the
-     * OpenLayers library code.
-     * 
-     * When we *are* part of a SFL build we do not dynamically include the 
-     * OpenLayers library code as it will be appended at the end of this file.
-     */
-    if(!singleFile) {
-        if (!jsFiles) {
-            jsFiles = [
-                "OpenLayers/BaseTypes/Class.js",
-                "OpenLayers/Util.js",
-                "OpenLayers/Util/vendorPrefix.js",
-                "OpenLayers/Animation.js",
-                "OpenLayers/BaseTypes.js",
-                "OpenLayers/BaseTypes/Bounds.js",
-                "OpenLayers/BaseTypes/Date.js",
-                "OpenLayers/BaseTypes/Element.js",
-                "OpenLayers/BaseTypes/LonLat.js",
-                "OpenLayers/BaseTypes/Pixel.js",
-                "OpenLayers/BaseTypes/Size.js",
-                "OpenLayers/Console.js",
-                "OpenLayers/Tween.js",
-                "OpenLayers/Kinetic.js",
-                "OpenLayers/Events.js",
-                "OpenLayers/Events/buttonclick.js",
-                "OpenLayers/Events/featureclick.js",
-                "OpenLayers/Request.js",
-                "OpenLayers/Request/XMLHttpRequest.js",
-                "OpenLayers/Projection.js",
-                "OpenLayers/Map.js",
-                "OpenLayers/Layer.js",
-                "OpenLayers/Icon.js",
-                "OpenLayers/Marker.js",
-                "OpenLayers/Marker/Box.js",
-                "OpenLayers/Popup.js",
-                "OpenLayers/Tile.js",
-                "OpenLayers/Tile/Image.js",
-                "OpenLayers/Tile/Image/IFrame.js",
-                "OpenLayers/Tile/UTFGrid.js",
-                "OpenLayers/Layer/Image.js",
-                "OpenLayers/Layer/SphericalMercator.js",
-                "OpenLayers/Layer/EventPane.js",
-                "OpenLayers/Layer/FixedZoomLevels.js",
-                "OpenLayers/Layer/Google.js",
-                "OpenLayers/Layer/Google/v3.js",
-                "OpenLayers/Layer/HTTPRequest.js",
-                "OpenLayers/Layer/Grid.js",
-                "OpenLayers/Layer/MapGuide.js",
-                "OpenLayers/Layer/MapServer.js",
-                "OpenLayers/Layer/KaMap.js",
-                "OpenLayers/Layer/KaMapCache.js",
-                "OpenLayers/Layer/Markers.js",
-                "OpenLayers/Layer/Text.js",
-                "OpenLayers/Layer/WorldWind.js",
-                "OpenLayers/Layer/ArcGIS93Rest.js",
-                "OpenLayers/Layer/WMS.js",
-                "OpenLayers/Layer/WMTS.js",
-                "OpenLayers/Layer/ArcIMS.js",
-                "OpenLayers/Layer/GeoRSS.js",
-                "OpenLayers/Layer/Boxes.js",
-                "OpenLayers/Layer/XYZ.js",
-                "OpenLayers/Layer/UTFGrid.js",
-                "OpenLayers/Layer/OSM.js",
-                "OpenLayers/Layer/Bing.js",
-                "OpenLayers/Layer/TMS.js",
-                "OpenLayers/Layer/TileCache.js",
-                "OpenLayers/Layer/Zoomify.js",
-                "OpenLayers/Layer/ArcGISCache.js",
-                "OpenLayers/Popup/Anchored.js",
-                "OpenLayers/Popup/Framed.js",
-                "OpenLayers/Popup/FramedCloud.js",
-                "OpenLayers/Feature.js",
-                "OpenLayers/Feature/Vector.js",
-                "OpenLayers/Handler.js",
-                "OpenLayers/Handler/Click.js",
-                "OpenLayers/Handler/Hover.js",
-                "OpenLayers/Handler/Point.js",
-                "OpenLayers/Handler/Path.js",
-                "OpenLayers/Handler/Polygon.js",
-                "OpenLayers/Handler/Feature.js",
-                "OpenLayers/Handler/Drag.js",
-                "OpenLayers/Handler/Pinch.js",
-                "OpenLayers/Handler/RegularPolygon.js",
-                "OpenLayers/Handler/Box.js",
-                "OpenLayers/Handler/MouseWheel.js",
-                "OpenLayers/Handler/Keyboard.js",
-                "OpenLayers/Control.js",
-                "OpenLayers/Control/Attribution.js",
-                "OpenLayers/Control/Button.js",
-                "OpenLayers/Control/CacheRead.js",
-                "OpenLayers/Control/CacheWrite.js",
-                "OpenLayers/Control/ZoomBox.js",
-                "OpenLayers/Control/ZoomToMaxExtent.js",
-                "OpenLayers/Control/DragPan.js",
-                "OpenLayers/Control/Navigation.js",
-                "OpenLayers/Control/PinchZoom.js",
-                "OpenLayers/Control/TouchNavigation.js",
-                "OpenLayers/Control/MousePosition.js",
-                "OpenLayers/Control/OverviewMap.js",
-                "OpenLayers/Control/KeyboardDefaults.js",
-                "OpenLayers/Control/PanZoom.js",
-                "OpenLayers/Control/PanZoomBar.js",
-                "OpenLayers/Control/ArgParser.js",
-                "OpenLayers/Control/Permalink.js",
-                "OpenLayers/Control/Scale.js",
-                "OpenLayers/Control/ScaleLine.js",
-                "OpenLayers/Control/Snapping.js",
-                "OpenLayers/Control/Split.js",
-                "OpenLayers/Control/LayerSwitcher.js",
-                "OpenLayers/Control/DrawFeature.js",
-                "OpenLayers/Control/DragFeature.js",
-                "OpenLayers/Control/ModifyFeature.js",
-                "OpenLayers/Control/Panel.js",
-                "OpenLayers/Control/SelectFeature.js",
-                "OpenLayers/Control/NavigationHistory.js",
-                "OpenLayers/Control/Measure.js",
-                "OpenLayers/Control/WMSGetFeatureInfo.js",
-                "OpenLayers/Control/WMTSGetFeatureInfo.js",
-                "OpenLayers/Control/Graticule.js",
-                "OpenLayers/Control/TransformFeature.js",
-                "OpenLayers/Control/UTFGrid.js",
-                "OpenLayers/Control/SLDSelect.js",
-                "OpenLayers/Control/Zoom.js",
-                "OpenLayers/Geometry.js",
-                "OpenLayers/Geometry/Collection.js",
-                "OpenLayers/Geometry/Point.js",
-                "OpenLayers/Geometry/MultiPoint.js",
-                "OpenLayers/Geometry/Curve.js",
-                "OpenLayers/Geometry/LineString.js",
-                "OpenLayers/Geometry/LinearRing.js",
-                "OpenLayers/Geometry/Polygon.js",
-                "OpenLayers/Geometry/MultiLineString.js",
-                "OpenLayers/Geometry/MultiPolygon.js",
-                "OpenLayers/Renderer.js",
-                "OpenLayers/Renderer/Elements.js",
-                "OpenLayers/Renderer/SVG.js",
-                "OpenLayers/Renderer/Canvas.js",
-                "OpenLayers/Renderer/VML.js",
-                "OpenLayers/Layer/Vector.js",
-                "OpenLayers/Layer/PointGrid.js",
-                "OpenLayers/Layer/Vector/RootContainer.js",
-                "OpenLayers/Strategy.js",
-                "OpenLayers/Strategy/Filter.js",
-                "OpenLayers/Strategy/Fixed.js",
-                "OpenLayers/Strategy/Cluster.js",
-                "OpenLayers/Strategy/Paging.js",
-                "OpenLayers/Strategy/BBOX.js",
-                "OpenLayers/Strategy/Save.js",
-                "OpenLayers/Strategy/Refresh.js",
-                "OpenLayers/Filter.js",
-                "OpenLayers/Filter/FeatureId.js",
-                "OpenLayers/Filter/Logical.js",
-                "OpenLayers/Filter/Comparison.js",
-                "OpenLayers/Filter/Spatial.js",
-                "OpenLayers/Filter/Function.js",                
-                "OpenLayers/Protocol.js",
-                "OpenLayers/Protocol/HTTP.js",
-                "OpenLayers/Protocol/WFS.js",
-                "OpenLayers/Protocol/WFS/v1.js",
-                "OpenLayers/Protocol/WFS/v1_0_0.js",
-                "OpenLayers/Protocol/WFS/v1_1_0.js",
-                "OpenLayers/Protocol/CSW.js", 
-                "OpenLayers/Protocol/CSW/v2_0_2.js",
-                "OpenLayers/Protocol/Script.js",
-                "OpenLayers/Protocol/SOS.js",
-                "OpenLayers/Protocol/SOS/v1_0_0.js",
-                "OpenLayers/Layer/PointTrack.js",
-                "OpenLayers/Style.js",
-                "OpenLayers/Style2.js",
-                "OpenLayers/StyleMap.js",
-                "OpenLayers/Rule.js",
-                "OpenLayers/Format.js",
-                "OpenLayers/Format/QueryStringFilter.js",
-                "OpenLayers/Format/XML.js",
-                "OpenLayers/Format/XML/VersionedOGC.js",
-                "OpenLayers/Format/Context.js",
-                "OpenLayers/Format/ArcXML.js",
-                "OpenLayers/Format/ArcXML/Features.js",
-                "OpenLayers/Format/GML.js",
-                "OpenLayers/Format/GML/Base.js",
-                "OpenLayers/Format/GML/v2.js",
-                "OpenLayers/Format/GML/v3.js",
-                "OpenLayers/Format/Atom.js",
-                "OpenLayers/Format/EncodedPolyline.js",
-                "OpenLayers/Format/KML.js",
-                "OpenLayers/Format/GeoRSS.js",
-                "OpenLayers/Format/WFS.js",
-                "OpenLayers/Format/OWSCommon.js",
-                "OpenLayers/Format/OWSCommon/v1.js",
-                "OpenLayers/Format/OWSCommon/v1_0_0.js",
-                "OpenLayers/Format/OWSCommon/v1_1_0.js",
-                "OpenLayers/Format/WCSCapabilities.js",
-                "OpenLayers/Format/WCSCapabilities/v1.js",
-                "OpenLayers/Format/WCSCapabilities/v1_0_0.js",
-                "OpenLayers/Format/WCSCapabilities/v1_1_0.js",
-                "OpenLayers/Format/WFSCapabilities.js",
-                "OpenLayers/Format/WFSCapabilities/v1.js",
-                "OpenLayers/Format/WFSCapabilities/v1_0_0.js",
-                "OpenLayers/Format/WFSCapabilities/v1_1_0.js",
-                "OpenLayers/Format/WFSDescribeFeatureType.js",
-                "OpenLayers/Format/WMSDescribeLayer.js",
-                "OpenLayers/Format/WMSDescribeLayer/v1_1.js",
-                "OpenLayers/Format/WKT.js",
-                "OpenLayers/Format/CQL.js",
-                "OpenLayers/Format/OSM.js",
-                "OpenLayers/Format/GPX.js",
-                "OpenLayers/Format/Filter.js",
-                "OpenLayers/Format/Filter/v1.js",
-                "OpenLayers/Format/Filter/v1_0_0.js",
-                "OpenLayers/Format/Filter/v1_1_0.js",
-                "OpenLayers/Format/SLD.js",
-                "OpenLayers/Format/SLD/v1.js",
-                "OpenLayers/Format/SLD/v1_0_0.js",
-                "OpenLayers/Format/SLD/v1_0_0_GeoServer.js",
-                "OpenLayers/Format/OWSCommon.js",
-                "OpenLayers/Format/OWSCommon/v1.js",
-                "OpenLayers/Format/OWSCommon/v1_0_0.js",
-                "OpenLayers/Format/OWSCommon/v1_1_0.js",
-                "OpenLayers/Format/CSWGetDomain.js",
-                "OpenLayers/Format/CSWGetDomain/v2_0_2.js",
-                "OpenLayers/Format/CSWGetRecords.js",
-                "OpenLayers/Format/CSWGetRecords/v2_0_2.js",
-                "OpenLayers/Format/WFST.js",
-                "OpenLayers/Format/WFST/v1.js",
-                "OpenLayers/Format/WFST/v1_0_0.js",
-                "OpenLayers/Format/WFST/v1_1_0.js",
-                "OpenLayers/Format/Text.js",
-                "OpenLayers/Format/JSON.js",
-                "OpenLayers/Format/GeoJSON.js",
-                "OpenLayers/Format/WMC.js",
-                "OpenLayers/Format/WMC/v1.js",
-                "OpenLayers/Format/WMC/v1_0_0.js",
-                "OpenLayers/Format/WMC/v1_1_0.js",
-                "OpenLayers/Format/WCSGetCoverage.js",
-                "OpenLayers/Format/WMSCapabilities.js",
-                "OpenLayers/Format/WMSCapabilities/v1.js",
-                "OpenLayers/Format/WMSCapabilities/v1_1.js",
-                "OpenLayers/Format/WMSCapabilities/v1_1_0.js",
-                "OpenLayers/Format/WMSCapabilities/v1_1_1.js",
-                "OpenLayers/Format/WMSCapabilities/v1_3.js",
-                "OpenLayers/Format/WMSCapabilities/v1_3_0.js",
-                "OpenLayers/Format/WMSCapabilities/v1_1_1_WMSC.js",
-                "OpenLayers/Format/WMSGetFeatureInfo.js",
-                "OpenLayers/Format/SOSCapabilities.js",
-                "OpenLayers/Format/SOSCapabilities/v1_0_0.js",
-                "OpenLayers/Format/SOSGetFeatureOfInterest.js",
-                "OpenLayers/Format/SOSGetObservation.js",
-                "OpenLayers/Format/OWSContext.js",
-                "OpenLayers/Format/OWSContext/v0_3_1.js",
-                "OpenLayers/Format/WMTSCapabilities.js",
-                "OpenLayers/Format/WMTSCapabilities/v1_0_0.js",
-                "OpenLayers/Format/WPSCapabilities.js",
-                "OpenLayers/Format/WPSCapabilities/v1_0_0.js",
-                "OpenLayers/Format/WPSDescribeProcess.js",
-                "OpenLayers/Format/WPSExecute.js",
-                "OpenLayers/Format/XLS.js",
-                "OpenLayers/Format/XLS/v1.js",
-                "OpenLayers/Format/XLS/v1_1_0.js",
-                "OpenLayers/Format/OGCExceptionReport.js",
-                "OpenLayers/Control/GetFeature.js",
-                "OpenLayers/Control/NavToolbar.js",
-                "OpenLayers/Control/PanPanel.js",
-                "OpenLayers/Control/Pan.js",
-                "OpenLayers/Control/ZoomIn.js",
-                "OpenLayers/Control/ZoomOut.js",
-                "OpenLayers/Control/ZoomPanel.js",
-                "OpenLayers/Control/EditingToolbar.js",
-                "OpenLayers/Control/Geolocate.js",
-                "OpenLayers/Symbolizer.js",
-                "OpenLayers/Symbolizer/Point.js",
-                "OpenLayers/Symbolizer/Line.js",
-                "OpenLayers/Symbolizer/Polygon.js",
-                "OpenLayers/Symbolizer/Text.js",
-                "OpenLayers/Symbolizer/Raster.js",
-                "OpenLayers/Lang.js",
-                "OpenLayers/Lang/en.js",
-                "OpenLayers/Spherical.js",
-                "OpenLayers/TileManager.js",
-                "OpenLayers/WPSClient.js",
-                "OpenLayers/WPSProcess.js"
-            ]; // etc.
-        }
-
-        // use "parser-inserted scripts" for guaranteed execution order
-        // http://hsivonen.iki.fi/script-execution/
-        var scriptTags = new Array(jsFiles.length);
-        var host = OpenLayers._getScriptLocation() + "lib/";
-        for (var i=0, len=jsFiles.length; i<len; i++) {
-            scriptTags[i] = "<script src='" + host + jsFiles[i] +
-                                   "'></script>"; 
-        }
-        if (scriptTags.length > 0) {
-            document.write(scriptTags.join(""));
-        }
-    }
-})();
-
-/**
- * Constant: VERSION_NUMBER
- *
- * This constant identifies the version of OpenLayers.
- *
- * When asking questions or reporting issues, make sure to include the output of
- *     OpenLayers.VERSION_NUMBER in the question or issue-description.
- */
-OpenLayers.VERSION_NUMBER="Release 2.13.1";
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Animation.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Animation.js
deleted file mode 100644
index 7b47a088..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Animation.js
+++ /dev/null
@@ -1,102 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/SingleFile.js
- * @requires OpenLayers/Util/vendorPrefix.js
- */
-
-/**
- * Namespace: OpenLayers.Animation
- * A collection of utility functions for executing methods that repaint a 
- *     portion of the browser window.  These methods take advantage of the
- *     browser's scheduled repaints where requestAnimationFrame is available.
- */
-OpenLayers.Animation = (function(window) {
-    
-    /**
-     * Property: isNative
-     * {Boolean} true if a native requestAnimationFrame function is available
-     */
-    var requestAnimationFrame = OpenLayers.Util.vendorPrefix.js(window, "requestAnimationFrame");
-    var isNative = !!(requestAnimationFrame);
-    
-    /**
-     * Function: requestFrame
-     * Schedule a function to be called at the next available animation frame.
-     *     Uses the native method where available.  Where requestAnimationFrame is
-     *     not available, setTimeout will be called with a 16ms delay.
-     *
-     * Parameters:
-     * callback - {Function} The function to be called at the next animation frame.
-     * element - {DOMElement} Optional element that visually bounds the animation.
-     */
-    var requestFrame = (function() {
-        var request = window[requestAnimationFrame] ||
-            function(callback, element) {
-                window.setTimeout(callback, 16);
-            };
-        // bind to window to avoid illegal invocation of native function
-        return function(callback, element) {
-            request.apply(window, [callback, element]);
-        };
-    })();
-    
-    // private variables for animation loops
-    var counter = 0;
-    var loops = {};
-    
-    /**
-     * Function: start
-     * Executes a method with <requestFrame> in series for some 
-     *     duration.
-     *
-     * Parameters:
-     * callback - {Function} The function to be called at the next animation frame.
-     * duration - {Number} Optional duration for the loop.  If not provided, the
-     *     animation loop will execute indefinitely.
-     * element - {DOMElement} Optional element that visually bounds the animation.
-     *
-     * Returns:
-     * {Number} Identifier for the animation loop.  Used to stop animations with
-     *     <stop>.
-     */
-    function start(callback, duration, element) {
-        duration = duration > 0 ? duration : Number.POSITIVE_INFINITY;
-        var id = ++counter;
-        var start = +new Date;
-        loops[id] = function() {
-            if (loops[id] && +new Date - start <= duration) {
-                callback();
-                if (loops[id]) {
-                    requestFrame(loops[id], element);
-                }
-            } else {
-                delete loops[id];
-            }
-        };
-        requestFrame(loops[id], element);
-        return id;
-    }
-    
-    /**
-     * Function: stop
-     * Terminates an animation loop started with <start>.
-     *
-     * Parameters:
-     * id - {Number} Identifier returned from <start>.
-     */
-    function stop(id) {
-        delete loops[id];
-    }
-    
-    return {
-        isNative: isNative,
-        requestFrame: requestFrame,
-        start: start,
-        stop: stop
-    };
-    
-})(window);
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/BaseTypes.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/BaseTypes.js
deleted file mode 100644
index d416b8fd..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/BaseTypes.js
+++ /dev/null
@@ -1,463 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/SingleFile.js
- */
-
-/** 
- * Header: OpenLayers Base Types
- * OpenLayers custom string, number and function functions are described here.
- */
-
-/**
- * Namespace: OpenLayers.String
- * Contains convenience functions for string manipulation.
- */
-OpenLayers.String = {
-
-    /**
-     * APIFunction: startsWith
-     * Test whether a string starts with another string. 
-     * 
-     * Parameters:
-     * str - {String} The string to test.
-     * sub - {String} The substring to look for.
-     *  
-     * Returns:
-     * {Boolean} The first string starts with the second.
-     */
-    startsWith: function(str, sub) {
-        return (str.indexOf(sub) == 0);
-    },
-
-    /**
-     * APIFunction: contains
-     * Test whether a string contains another string.
-     * 
-     * Parameters:
-     * str - {String} The string to test.
-     * sub - {String} The substring to look for.
-     * 
-     * Returns:
-     * {Boolean} The first string contains the second.
-     */
-    contains: function(str, sub) {
-        return (str.indexOf(sub) != -1);
-    },
-    
-    /**
-     * APIFunction: trim
-     * Removes leading and trailing whitespace characters from a string.
-     * 
-     * Parameters:
-     * str - {String} The (potentially) space padded string.  This string is not
-     *     modified.
-     * 
-     * Returns:
-     * {String} A trimmed version of the string with all leading and 
-     *     trailing spaces removed.
-     */
-    trim: function(str) {
-        return str.replace(/^\s\s*/, '').replace(/\s\s*$/, '');
-    },
-    
-    /**
-     * APIFunction: camelize
-     * Camel-case a hyphenated string. 
-     *     Ex. "chicken-head" becomes "chickenHead", and
-     *     "-chicken-head" becomes "ChickenHead".
-     *
-     * Parameters:
-     * str - {String} The string to be camelized.  The original is not modified.
-     * 
-     * Returns:
-     * {String} The string, camelized
-     */
-    camelize: function(str) {
-        var oStringList = str.split('-');
-        var camelizedString = oStringList[0];
-        for (var i=1, len=oStringList.length; i<len; i++) {
-            var s = oStringList[i];
-            camelizedString += s.charAt(0).toUpperCase() + s.substring(1);
-        }
-        return camelizedString;
-    },
-    
-    /**
-     * APIFunction: format
-     * Given a string with tokens in the form ${token}, return a string
-     *     with tokens replaced with properties from the given context
-     *     object.  Represent a literal "${" by doubling it, e.g. "${${".
-     *
-     * Parameters:
-     * template - {String} A string with tokens to be replaced.  A template
-     *     has the form "literal ${token}" where the token will be replaced
-     *     by the value of context["token"].
-     * context - {Object} An optional object with properties corresponding
-     *     to the tokens in the format string.  If no context is sent, the
-     *     window object will be used.
-     * args - {Array} Optional arguments to pass to any functions found in
-     *     the context.  If a context property is a function, the token
-     *     will be replaced by the return from the function called with
-     *     these arguments.
-     *
-     * Returns:
-     * {String} A string with tokens replaced from the context object.
-     */
-    format: function(template, context, args) {
-        if(!context) {
-            context = window;
-        }
-
-        // Example matching: 
-        // str   = ${foo.bar}
-        // match = foo.bar
-        var replacer = function(str, match) {
-            var replacement;
-
-            // Loop through all subs. Example: ${a.b.c}
-            // 0 -> replacement = context[a];
-            // 1 -> replacement = context[a][b];
-            // 2 -> replacement = context[a][b][c];
-            var subs = match.split(/\.+/);
-            for (var i=0; i< subs.length; i++) {
-                if (i == 0) {
-                    replacement = context;
-                }
-                if (replacement === undefined) {
-                    break;
-                }
-                replacement = replacement[subs[i]];
-            }
-
-            if(typeof replacement == "function") {
-                replacement = args ?
-                    replacement.apply(null, args) :
-                    replacement();
-            }
-
-            // If replacement is undefined, return the string 'undefined'.
-            // This is a workaround for a bugs in browsers not properly 
-            // dealing with non-participating groups in regular expressions:
-            // http://blog.stevenlevithan.com/archives/npcg-javascript
-            if (typeof replacement == 'undefined') {
-                return 'undefined';
-            } else {
-                return replacement; 
-            }
-        };
-
-        return template.replace(OpenLayers.String.tokenRegEx, replacer);
-    },
-
-    /**
-     * Property: tokenRegEx
-     * Used to find tokens in a string.
-     * Examples: ${a}, ${a.b.c}, ${a-b}, ${5}
-     */
-    tokenRegEx:  /\$\{([\w.]+?)\}/g,
-    
-    /**
-     * Property: numberRegEx
-     * Used to test strings as numbers.
-     */
-    numberRegEx: /^([+-]?)(?=\d|\.\d)\d*(\.\d*)?([Ee]([+-]?\d+))?$/,
-    
-    /**
-     * APIFunction: isNumeric
-     * Determine whether a string contains only a numeric value.
-     *
-     * Examples:
-     * (code)
-     * OpenLayers.String.isNumeric("6.02e23") // true
-     * OpenLayers.String.isNumeric("12 dozen") // false
-     * OpenLayers.String.isNumeric("4") // true
-     * OpenLayers.String.isNumeric(" 4 ") // false
-     * (end)
-     *
-     * Returns:
-     * {Boolean} String contains only a number.
-     */
-    isNumeric: function(value) {
-        return OpenLayers.String.numberRegEx.test(value);
-    },
-    
-    /**
-     * APIFunction: numericIf
-     * Converts a string that appears to be a numeric value into a number.
-     * 
-     * Parameters:
-     * value - {String}
-     * trimWhitespace - {Boolean}
-     *
-     * Returns:
-     * {Number|String} a Number if the passed value is a number, a String
-     *     otherwise. 
-     */
-    numericIf: function(value, trimWhitespace) {
-        var originalValue = value;
-        if (trimWhitespace === true && value != null && value.replace) {
-            value = value.replace(/^\s*|\s*$/g, "");
-        }
-        return OpenLayers.String.isNumeric(value) ? parseFloat(value) : originalValue;
-    }
-
-};
-
-/**
- * Namespace: OpenLayers.Number
- * Contains convenience functions for manipulating numbers.
- */
-OpenLayers.Number = {
-
-    /**
-     * Property: decimalSeparator
-     * Decimal separator to use when formatting numbers.
-     */
-    decimalSeparator: ".",
-    
-    /**
-     * Property: thousandsSeparator
-     * Thousands separator to use when formatting numbers.
-     */
-    thousandsSeparator: ",",
-    
-    /**
-     * APIFunction: limitSigDigs
-     * Limit the number of significant digits on a float.
-     * 
-     * Parameters:
-     * num - {Float}
-     * sig - {Integer}
-     * 
-     * Returns:
-     * {Float} The number, rounded to the specified number of significant
-     *     digits.
-     */
-    limitSigDigs: function(num, sig) {
-        var fig = 0;
-        if (sig > 0) {
-            fig = parseFloat(num.toPrecision(sig));
-        }
-        return fig;
-    },
-    
-    /**
-     * APIFunction: format
-     * Formats a number for output.
-     * 
-     * Parameters:
-     * num  - {Float}
-     * dec  - {Integer} Number of decimal places to round to.
-     *        Defaults to 0. Set to null to leave decimal places unchanged.
-     * tsep - {String} Thousands separator.
-     *        Default is ",".
-     * dsep - {String} Decimal separator.
-     *        Default is ".".
-     *
-     * Returns:
-     * {String} A string representing the formatted number.
-     */
-    format: function(num, dec, tsep, dsep) {
-        dec = (typeof dec != "undefined") ? dec : 0; 
-        tsep = (typeof tsep != "undefined") ? tsep :
-            OpenLayers.Number.thousandsSeparator; 
-        dsep = (typeof dsep != "undefined") ? dsep :
-            OpenLayers.Number.decimalSeparator;
-
-        if (dec != null) {
-            num = parseFloat(num.toFixed(dec));
-        }
-
-        var parts = num.toString().split(".");
-        if (parts.length == 1 && dec == null) {
-            // integer where we do not want to touch the decimals
-            dec = 0;
-        }
-        
-        var integer = parts[0];
-        if (tsep) {
-            var thousands = /(-?[0-9]+)([0-9]{3})/; 
-            while(thousands.test(integer)) { 
-                integer = integer.replace(thousands, "$1" + tsep + "$2"); 
-            }
-        }
-        
-        var str;
-        if (dec == 0) {
-            str = integer;
-        } else {
-            var rem = parts.length > 1 ? parts[1] : "0";
-            if (dec != null) {
-                rem = rem + new Array(dec - rem.length + 1).join("0");
-            }
-            str = integer + dsep + rem;
-        }
-        return str;
-    },
-
-    /**
-     * Method: zeroPad
-     * Create a zero padded string optionally with a radix for casting numbers.
-     *
-     * Parameters:
-     * num - {Number} The number to be zero padded.
-     * len - {Number} The length of the string to be returned.
-     * radix - {Number} An integer between 2 and 36 specifying the base to use
-     *     for representing numeric values.
-     */
-    zeroPad: function(num, len, radix) {
-        var str = num.toString(radix || 10);
-        while (str.length < len) {
-            str = "0" + str;
-        }
-        return str;
-    }    
-};
-
-/**
- * Namespace: OpenLayers.Function
- * Contains convenience functions for function manipulation.
- */
-OpenLayers.Function = {
-    /**
-     * APIFunction: bind
-     * Bind a function to an object.  Method to easily create closures with
-     *     'this' altered.
-     * 
-     * Parameters:
-     * func - {Function} Input function.
-     * object - {Object} The object to bind to the input function (as this).
-     * 
-     * Returns:
-     * {Function} A closure with 'this' set to the passed in object.
-     */
-    bind: function(func, object) {
-        // create a reference to all arguments past the second one
-        var args = Array.prototype.slice.apply(arguments, [2]);
-        return function() {
-            // Push on any additional arguments from the actual function call.
-            // These will come after those sent to the bind call.
-            var newArgs = args.concat(
-                Array.prototype.slice.apply(arguments, [0])
-            );
-            return func.apply(object, newArgs);
-        };
-    },
-    
-    /**
-     * APIFunction: bindAsEventListener
-     * Bind a function to an object, and configure it to receive the event
-     *     object as first parameter when called. 
-     * 
-     * Parameters:
-     * func - {Function} Input function to serve as an event listener.
-     * object - {Object} A reference to this.
-     * 
-     * Returns:
-     * {Function}
-     */
-    bindAsEventListener: function(func, object) {
-        return function(event) {
-            return func.call(object, event || window.event);
-        };
-    },
-    
-    /**
-     * APIFunction: False
-     * A simple function to that just does "return false". We use this to 
-     * avoid attaching anonymous functions to DOM event handlers, which 
-     * causes "issues" on IE<8.
-     * 
-     * Usage:
-     * document.onclick = OpenLayers.Function.False;
-     * 
-     * Returns:
-     * {Boolean}
-     */
-    False : function() {
-        return false;
-    },
-
-    /**
-     * APIFunction: True
-     * A simple function to that just does "return true". We use this to 
-     * avoid attaching anonymous functions to DOM event handlers, which 
-     * causes "issues" on IE<8.
-     * 
-     * Usage:
-     * document.onclick = OpenLayers.Function.True;
-     * 
-     * Returns:
-     * {Boolean}
-     */
-    True : function() {
-        return true;
-    },
-    
-    /**
-     * APIFunction: Void
-     * A reusable function that returns ``undefined``.
-     *
-     * Returns:
-     * {undefined}
-     */
-    Void: function() {}
-
-};
-
-/**
- * Namespace: OpenLayers.Array
- * Contains convenience functions for array manipulation.
- */
-OpenLayers.Array = {
-
-    /**
-     * APIMethod: filter
-     * Filter an array.  Provides the functionality of the
-     *     Array.prototype.filter extension to the ECMA-262 standard.  Where
-     *     available, Array.prototype.filter will be used.
-     *
-     * Based on well known example from http://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Global_Objects/Array/filter
-     *
-     * Parameters:
-     * array - {Array} The array to be filtered.  This array is not mutated.
-     *     Elements added to this array by the callback will not be visited.
-     * callback - {Function} A function that is called for each element in
-     *     the array.  If this function returns true, the element will be
-     *     included in the return.  The function will be called with three
-     *     arguments: the element in the array, the index of that element, and
-     *     the array itself.  If the optional caller parameter is specified
-     *     the callback will be called with this set to caller.
-     * caller - {Object} Optional object to be set as this when the callback
-     *     is called.
-     *
-     * Returns:
-     * {Array} An array of elements from the passed in array for which the
-     *     callback returns true.
-     */
-    filter: function(array, callback, caller) {
-        var selected = [];
-        if (Array.prototype.filter) {
-            selected = array.filter(callback, caller);
-        } else {
-            var len = array.length;
-            if (typeof callback != "function") {
-                throw new TypeError();
-            }
-            for(var i=0; i<len; i++) {
-                if (i in array) {
-                    var val = array[i];
-                    if (callback.call(caller, val, i, array)) {
-                        selected.push(val);
-                    }
-                }
-            }        
-        }
-        return selected;
-    }
-    
-};
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/BaseTypes/Bounds.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/BaseTypes/Bounds.js
deleted file mode 100644
index a828eb0c..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/BaseTypes/Bounds.js
+++ /dev/null
@@ -1,837 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/BaseTypes/Class.js
- */
-
-/**
- * Class: OpenLayers.Bounds
- * Instances of this class represent bounding boxes.  Data stored as left,
- * bottom, right, top floats. All values are initialized to null, however,
- * you should make sure you set them before using the bounds for anything.
- * 
- * Possible use case:
- * (code)
- *     bounds = new OpenLayers.Bounds();
- *     bounds.extend(new OpenLayers.LonLat(4,5));
- *     bounds.extend(new OpenLayers.LonLat(5,6));
- *     bounds.toBBOX(); // returns 4,5,5,6
- * (end)
- */
-OpenLayers.Bounds = OpenLayers.Class({
-
-    /**
-     * Property: left
-     * {Number} Minimum horizontal coordinate.
-     */
-    left: null,
-
-    /**
-     * Property: bottom
-     * {Number} Minimum vertical coordinate.
-     */
-    bottom: null,
-
-    /**
-     * Property: right
-     * {Number} Maximum horizontal coordinate.
-     */
-    right: null,
-
-    /**
-     * Property: top
-     * {Number} Maximum vertical coordinate.
-     */
-    top: null,
-    
-    /**
-     * Property: centerLonLat
-     * {<OpenLayers.LonLat>} A cached center location.  This should not be
-     *     accessed directly.  Use <getCenterLonLat> instead.
-     */
-    centerLonLat: null,
-
-    /**
-     * Constructor: OpenLayers.Bounds
-     * Construct a new bounds object. Coordinates can either be passed as four
-     * arguments, or as a single argument.
-     *
-     * Parameters (four arguments):
-     * left - {Number} The left bounds of the box.  Note that for width
-     *        calculations, this is assumed to be less than the right value.
-     * bottom - {Number} The bottom bounds of the box.  Note that for height
-     *          calculations, this is assumed to be less than the top value.
-     * right - {Number} The right bounds.
-     * top - {Number} The top bounds.
-     *
-     * Parameters (single argument):
-     * bounds - {Array(Number)} [left, bottom, right, top]
-     */
-    initialize: function(left, bottom, right, top) {
-        if (OpenLayers.Util.isArray(left)) {
-            top = left[3];
-            right = left[2];
-            bottom = left[1];
-            left = left[0];
-        }
-        if (left != null) {
-            this.left = OpenLayers.Util.toFloat(left);
-        }
-        if (bottom != null) {
-            this.bottom = OpenLayers.Util.toFloat(bottom);
-        }
-        if (right != null) {
-            this.right = OpenLayers.Util.toFloat(right);
-        }
-        if (top != null) {
-            this.top = OpenLayers.Util.toFloat(top);
-        }
-    },
-
-    /**
-     * Method: clone
-     * Create a cloned instance of this bounds.
-     *
-     * Returns:
-     * {<OpenLayers.Bounds>} A fresh copy of the bounds
-     */
-    clone:function() {
-        return new OpenLayers.Bounds(this.left, this.bottom, 
-                                     this.right, this.top);
-    },
-
-    /**
-     * Method: equals
-     * Test a two bounds for equivalence.
-     *
-     * Parameters:
-     * bounds - {<OpenLayers.Bounds>}
-     *
-     * Returns:
-     * {Boolean} The passed-in bounds object has the same left,
-     *           right, top, bottom components as this.  Note that if bounds 
-     *           passed in is null, returns false.
-     */
-    equals:function(bounds) {
-        var equals = false;
-        if (bounds != null) {
-            equals = ((this.left == bounds.left) && 
-                      (this.right == bounds.right) &&
-                      (this.top == bounds.top) && 
-                      (this.bottom == bounds.bottom));
-        }
-        return equals;
-    },
-
-    /** 
-     * APIMethod: toString
-     * Returns a string representation of the bounds object.
-     * 
-     * Returns:
-     * {String} String representation of bounds object. 
-     */
-    toString:function() {
-        return [this.left, this.bottom, this.right, this.top].join(",");
-    },
-
-    /**
-     * APIMethod: toArray
-     * Returns an array representation of the bounds object.
-     *
-     * Returns an array of left, bottom, right, top properties, or -- when the
-     *     optional parameter is true -- an array of the  bottom, left, top,
-     *     right properties.
-     *
-     * Parameters:
-     * reverseAxisOrder - {Boolean} Should we reverse the axis order?
-     *
-     * Returns:
-     * {Array} array of left, bottom, right, top
-     */
-    toArray: function(reverseAxisOrder) {
-        if (reverseAxisOrder === true) {
-            return [this.bottom, this.left, this.top, this.right];
-        } else {
-            return [this.left, this.bottom, this.right, this.top];
-        }
-    },    
-
-    /** 
-     * APIMethod: toBBOX
-     * Returns a boundingbox-string representation of the bounds object.
-     * 
-     * Parameters:
-     * decimal - {Integer} How many significant digits in the bbox coords?
-     *                     Default is 6
-     * reverseAxisOrder - {Boolean} Should we reverse the axis order?
-     * 
-     * Returns:
-     * {String} Simple String representation of bounds object.
-     *          (e.g. "5,42,10,45")
-     */
-    toBBOX:function(decimal, reverseAxisOrder) {
-        if (decimal== null) {
-            decimal = 6; 
-        }
-        var mult = Math.pow(10, decimal);
-        var xmin = Math.round(this.left * mult) / mult;
-        var ymin = Math.round(this.bottom * mult) / mult;
-        var xmax = Math.round(this.right * mult) / mult;
-        var ymax = Math.round(this.top * mult) / mult;
-        if (reverseAxisOrder === true) {
-            return ymin + "," + xmin + "," + ymax + "," + xmax;
-        } else {
-            return xmin + "," + ymin + "," + xmax + "," + ymax;
-        }
-    },
- 
-    /**
-     * APIMethod: toGeometry
-     * Create a new polygon geometry based on this bounds.
-     *
-     * Returns:
-     * {<OpenLayers.Geometry.Polygon>} A new polygon with the coordinates
-     *     of this bounds.
-     */
-    toGeometry: function() {
-        return new OpenLayers.Geometry.Polygon([
-            new OpenLayers.Geometry.LinearRing([
-                new OpenLayers.Geometry.Point(this.left, this.bottom),
-                new OpenLayers.Geometry.Point(this.right, this.bottom),
-                new OpenLayers.Geometry.Point(this.right, this.top),
-                new OpenLayers.Geometry.Point(this.left, this.top)
-            ])
-        ]);
-    },
-    
-    /**
-     * APIMethod: getWidth
-     * Returns the width of the bounds.
-     * 
-     * Returns:
-     * {Float} The width of the bounds (right minus left).
-     */
-    getWidth:function() {
-        return (this.right - this.left);
-    },
-
-    /**
-     * APIMethod: getHeight
-     * Returns the height of the bounds.
-     * 
-     * Returns:
-     * {Float} The height of the bounds (top minus bottom).
-     */
-    getHeight:function() {
-        return (this.top - this.bottom);
-    },
-
-    /**
-     * APIMethod: getSize
-     * Returns an <OpenLayers.Size> object of the bounds.
-     * 
-     * Returns:
-     * {<OpenLayers.Size>} The size of the bounds.
-     */
-    getSize:function() {
-        return new OpenLayers.Size(this.getWidth(), this.getHeight());
-    },
-
-    /**
-     * APIMethod: getCenterPixel
-     * Returns the <OpenLayers.Pixel> object which represents the center of the
-     *     bounds.
-     * 
-     * Returns:
-     * {<OpenLayers.Pixel>} The center of the bounds in pixel space.
-     */
-    getCenterPixel:function() {
-        return new OpenLayers.Pixel( (this.left + this.right) / 2,
-                                     (this.bottom + this.top) / 2);
-    },
-
-    /**
-     * APIMethod: getCenterLonLat
-     * Returns the <OpenLayers.LonLat> object which represents the center of the
-     *     bounds.
-     *
-     * Returns:
-     * {<OpenLayers.LonLat>} The center of the bounds in map space.
-     */
-    getCenterLonLat:function() {
-        if(!this.centerLonLat) {
-            this.centerLonLat = new OpenLayers.LonLat(
-                (this.left + this.right) / 2, (this.bottom + this.top) / 2
-            );
-        }
-        return this.centerLonLat;
-    },
-
-    /**
-     * APIMethod: scale
-     * Scales the bounds around a pixel or lonlat. Note that the new 
-     *     bounds may return non-integer properties, even if a pixel
-     *     is passed. 
-     * 
-     * Parameters:
-     * ratio - {Float} 
-     * origin - {<OpenLayers.Pixel> or <OpenLayers.LonLat>}
-     *          Default is center.
-     *
-     * Returns:
-     * {<OpenLayers.Bounds>} A new bounds that is scaled by ratio
-     *                      from origin.
-     */
-    scale: function(ratio, origin){
-        if(origin == null){
-            origin = this.getCenterLonLat();
-        }
-        
-        var origx,origy;
-
-        // get origin coordinates
-        if(origin.CLASS_NAME == "OpenLayers.LonLat"){
-            origx = origin.lon;
-            origy = origin.lat;
-        } else {
-            origx = origin.x;
-            origy = origin.y;
-        }
-
-        var left = (this.left - origx) * ratio + origx;
-        var bottom = (this.bottom - origy) * ratio + origy;
-        var right = (this.right - origx) * ratio + origx;
-        var top = (this.top - origy) * ratio + origy;
-        
-        return new OpenLayers.Bounds(left, bottom, right, top);
-    },
-
-    /**
-     * APIMethod: add
-     * Shifts the coordinates of the bound by the given horizontal and vertical
-     *     deltas.
-     *
-     * (start code)
-     * var bounds = new OpenLayers.Bounds(0, 0, 10, 10);
-     * bounds.toString();
-     * // => "0,0,10,10"
-     *
-     * bounds.add(-1.5, 4).toString();
-     * // => "-1.5,4,8.5,14"
-     * (end)
-     *
-     * This method will throw a TypeError if it is passed null as an argument.
-     *
-     * Parameters:
-     * x - {Float} horizontal delta
-     * y - {Float} vertical delta
-     *
-     * Returns:
-     * {<OpenLayers.Bounds>} A new bounds whose coordinates are the same as
-     *     this, but shifted by the passed-in x and y values.
-     */
-    add:function(x, y) {
-        if ( (x == null) || (y == null) ) {
-            throw new TypeError('Bounds.add cannot receive null values');
-        }
-        return new OpenLayers.Bounds(this.left + x, this.bottom + y,
-                                     this.right + x, this.top + y);
-    },
-    
-    /**
-     * APIMethod: extend
-     * Extend the bounds to include the <OpenLayers.LonLat>,
-     *     <OpenLayers.Geometry.Point> or <OpenLayers.Bounds> specified.
-     *
-     * Please note that this function assumes that left < right and
-     *     bottom < top.
-     *
-     * Parameters:
-     * object - {<OpenLayers.LonLat>, <OpenLayers.Geometry.Point> or
-     *     <OpenLayers.Bounds>} The object to be included in the new bounds
-     *     object.
-     */
-    extend:function(object) {
-        if (object) {
-            switch(object.CLASS_NAME) {
-                case "OpenLayers.LonLat":
-                    this.extendXY(object.lon, object.lat);
-                    break;
-                case "OpenLayers.Geometry.Point":
-                    this.extendXY(object.x, object.y);
-                    break;
-
-                case "OpenLayers.Bounds":
-                    // clear cached center location
-                    this.centerLonLat = null;
-
-                    if ( (this.left == null) || (object.left < this.left)) {
-                        this.left = object.left;
-                    }
-                    if ( (this.bottom == null) || (object.bottom < this.bottom) ) {
-                        this.bottom = object.bottom;
-                    }
-                    if ( (this.right == null) || (object.right > this.right) ) {
-                        this.right = object.right;
-                    }
-                    if ( (this.top == null) || (object.top > this.top) ) {
-                        this.top = object.top;
-                    }
-                    break;
-            }
-        }
-    },
-
-    /**
-     * APIMethod: extendXY
-     * Extend the bounds to include the XY coordinate specified.
-     *
-     * Parameters:
-     * x - {number} The X part of the the coordinate.
-     * y - {number} The Y part of the the coordinate.
-     */
-    extendXY:function(x, y) {
-        // clear cached center location
-        this.centerLonLat = null;
-
-        if ((this.left == null) || (x < this.left)) {
-            this.left = x;
-        }
-        if ((this.bottom == null) || (y < this.bottom)) {
-            this.bottom = y;
-        }
-        if ((this.right == null) || (x > this.right)) {
-            this.right = x;
-        }
-        if ((this.top == null) || (y > this.top)) {
-            this.top = y;
-        }
-    },
-
-    /**
-     * APIMethod: containsLonLat
-     * Returns whether the bounds object contains the given <OpenLayers.LonLat>.
-     * 
-     * Parameters:
-     * ll - {<OpenLayers.LonLat>|Object} OpenLayers.LonLat or an
-     *     object with a 'lon' and 'lat' properties.
-     * options - {Object} Optional parameters
-     *
-     * Acceptable options:
-     * inclusive - {Boolean} Whether or not to include the border.
-     *     Default is true.
-     * worldBounds - {<OpenLayers.Bounds>} If a worldBounds is provided, the
-     *     ll will be considered as contained if it exceeds the world bounds,
-     *     but can be wrapped around the dateline so it is contained by this
-     *     bounds.
-     *
-     * Returns:
-     * {Boolean} The passed-in lonlat is within this bounds.
-     */
-    containsLonLat: function(ll, options) {
-        if (typeof options === "boolean") {
-            options =  {inclusive: options};
-        }
-        options = options || {};
-        var contains = this.contains(ll.lon, ll.lat, options.inclusive),
-            worldBounds = options.worldBounds;
-        if (worldBounds && !contains) {
-            var worldWidth = worldBounds.getWidth();
-            var worldCenterX = (worldBounds.left + worldBounds.right) / 2;
-            var worldsAway = Math.round((ll.lon - worldCenterX) / worldWidth);
-            contains = this.containsLonLat({
-                lon: ll.lon - worldsAway * worldWidth,
-                lat: ll.lat
-            }, {inclusive: options.inclusive});
-        }
-        return contains;
-    },
-
-    /**
-     * APIMethod: containsPixel
-     * Returns whether the bounds object contains the given <OpenLayers.Pixel>.
-     * 
-     * Parameters:
-     * px - {<OpenLayers.Pixel>}
-     * inclusive - {Boolean} Whether or not to include the border. Default is
-     *     true.
-     *
-     * Returns:
-     * {Boolean} The passed-in pixel is within this bounds.
-     */
-    containsPixel:function(px, inclusive) {
-        return this.contains(px.x, px.y, inclusive);
-    },
-    
-    /**
-     * APIMethod: contains
-     * Returns whether the bounds object contains the given x and y.
-     * 
-     * Parameters:
-     * x - {Float}
-     * y - {Float}
-     * inclusive - {Boolean} Whether or not to include the border. Default is
-     *     true.
-     *
-     * Returns:
-     * {Boolean} Whether or not the passed-in coordinates are within this
-     *     bounds.
-     */
-    contains:function(x, y, inclusive) {
-        //set default
-        if (inclusive == null) {
-            inclusive = true;
-        }
-
-        if (x == null || y == null) {
-            return false;
-        }
-
-        x = OpenLayers.Util.toFloat(x);
-        y = OpenLayers.Util.toFloat(y);
-
-        var contains = false;
-        if (inclusive) {
-            contains = ((x >= this.left) && (x <= this.right) && 
-                        (y >= this.bottom) && (y <= this.top));
-        } else {
-            contains = ((x > this.left) && (x < this.right) && 
-                        (y > this.bottom) && (y < this.top));
-        }              
-        return contains;
-    },
-
-    /**
-     * APIMethod: intersectsBounds
-     * Determine whether the target bounds intersects this bounds.  Bounds are
-     *     considered intersecting if any of their edges intersect or if one
-     *     bounds contains the other.
-     * 
-     * Parameters:
-     * bounds - {<OpenLayers.Bounds>} The target bounds.
-     * options - {Object} Optional parameters.
-     * 
-     * Acceptable options:
-     * inclusive - {Boolean} Treat coincident borders as intersecting.  Default
-     *     is true.  If false, bounds that do not overlap but only touch at the
-     *     border will not be considered as intersecting.
-     * worldBounds - {<OpenLayers.Bounds>} If a worldBounds is provided, two
-     *     bounds will be considered as intersecting if they intersect when 
-     *     shifted to within the world bounds.  This applies only to bounds that
-     *     cross or are completely outside the world bounds.
-     *
-     * Returns:
-     * {Boolean} The passed-in bounds object intersects this bounds.
-     */
-    intersectsBounds:function(bounds, options) {
-        if (typeof options === "boolean") {
-            options =  {inclusive: options};
-        }
-        options = options || {};
-        if (options.worldBounds) {
-            var self = this.wrapDateLine(options.worldBounds);
-            bounds = bounds.wrapDateLine(options.worldBounds);
-        } else {
-            self = this;
-        }
-        if (options.inclusive == null) {
-            options.inclusive = true;
-        }
-        var intersects = false;
-        var mightTouch = (
-            self.left == bounds.right ||
-            self.right == bounds.left ||
-            self.top == bounds.bottom ||
-            self.bottom == bounds.top
-        );
-        
-        // if the two bounds only touch at an edge, and inclusive is false,
-        // then the bounds don't *really* intersect.
-        if (options.inclusive || !mightTouch) {
-            // otherwise, if one of the boundaries even partially contains another,
-            // inclusive of the edges, then they do intersect.
-            var inBottom = (
-                ((bounds.bottom >= self.bottom) && (bounds.bottom <= self.top)) ||
-                ((self.bottom >= bounds.bottom) && (self.bottom <= bounds.top))
-            );
-            var inTop = (
-                ((bounds.top >= self.bottom) && (bounds.top <= self.top)) ||
-                ((self.top > bounds.bottom) && (self.top < bounds.top))
-            );
-            var inLeft = (
-                ((bounds.left >= self.left) && (bounds.left <= self.right)) ||
-                ((self.left >= bounds.left) && (self.left <= bounds.right))
-            );
-            var inRight = (
-                ((bounds.right >= self.left) && (bounds.right <= self.right)) ||
-                ((self.right >= bounds.left) && (self.right <= bounds.right))
-            );
-            intersects = ((inBottom || inTop) && (inLeft || inRight));
-        }
-        // document me
-        if (options.worldBounds && !intersects) {
-            var world = options.worldBounds;
-            var width = world.getWidth();
-            var selfCrosses = !world.containsBounds(self);
-            var boundsCrosses = !world.containsBounds(bounds);
-            if (selfCrosses && !boundsCrosses) {
-                bounds = bounds.add(-width, 0);
-                intersects = self.intersectsBounds(bounds, {inclusive: options.inclusive});
-            } else if (boundsCrosses && !selfCrosses) {
-                self = self.add(-width, 0);
-                intersects = bounds.intersectsBounds(self, {inclusive: options.inclusive});                
-            }
-        }
-        return intersects;
-    },
-    
-    /**
-     * APIMethod: containsBounds
-     * Returns whether the bounds object contains the given <OpenLayers.Bounds>.
-     * 
-     * bounds - {<OpenLayers.Bounds>} The target bounds.
-     * partial - {Boolean} If any of the target corners is within this bounds
-     *     consider the bounds contained.  Default is false.  If false, the
-     *     entire target bounds must be contained within this bounds.
-     * inclusive - {Boolean} Treat shared edges as contained.  Default is
-     *     true.
-     *
-     * Returns:
-     * {Boolean} The passed-in bounds object is contained within this bounds. 
-     */
-    containsBounds:function(bounds, partial, inclusive) {
-        if (partial == null) {
-            partial = false;
-        }
-        if (inclusive == null) {
-            inclusive = true;
-        }
-        var bottomLeft  = this.contains(bounds.left, bounds.bottom, inclusive);
-        var bottomRight = this.contains(bounds.right, bounds.bottom, inclusive);
-        var topLeft  = this.contains(bounds.left, bounds.top, inclusive);
-        var topRight = this.contains(bounds.right, bounds.top, inclusive);
-        
-        return (partial) ? (bottomLeft || bottomRight || topLeft || topRight)
-                         : (bottomLeft && bottomRight && topLeft && topRight);
-    },
-
-    /** 
-     * APIMethod: determineQuadrant
-     * Returns the the quadrant ("br", "tr", "tl", "bl") in which the given
-     *     <OpenLayers.LonLat> lies.
-     *
-     * Parameters:
-     * lonlat - {<OpenLayers.LonLat>}
-     *
-     * Returns:
-     * {String} The quadrant ("br" "tr" "tl" "bl") of the bounds in which the
-     *     coordinate lies.
-     */
-    determineQuadrant: function(lonlat) {
-    
-        var quadrant = "";
-        var center = this.getCenterLonLat();
-        
-        quadrant += (lonlat.lat < center.lat) ? "b" : "t";
-        quadrant += (lonlat.lon < center.lon) ? "l" : "r";
-    
-        return quadrant; 
-    },
-    
-    /**
-     * APIMethod: transform
-     * Transform the Bounds object from source to dest. 
-     *
-     * Parameters: 
-     * source - {<OpenLayers.Projection>} Source projection. 
-     * dest   - {<OpenLayers.Projection>} Destination projection. 
-     *
-     * Returns:
-     * {<OpenLayers.Bounds>} Itself, for use in chaining operations.
-     */
-    transform: function(source, dest) {
-        // clear cached center location
-        this.centerLonLat = null;
-        var ll = OpenLayers.Projection.transform(
-            {'x': this.left, 'y': this.bottom}, source, dest);
-        var lr = OpenLayers.Projection.transform(
-            {'x': this.right, 'y': this.bottom}, source, dest);
-        var ul = OpenLayers.Projection.transform(
-            {'x': this.left, 'y': this.top}, source, dest);
-        var ur = OpenLayers.Projection.transform(
-            {'x': this.right, 'y': this.top}, source, dest);
-        this.left   = Math.min(ll.x, ul.x);
-        this.bottom = Math.min(ll.y, lr.y);
-        this.right  = Math.max(lr.x, ur.x);
-        this.top    = Math.max(ul.y, ur.y);
-        return this;
-    },
-
-    /**
-     * APIMethod: wrapDateLine
-     * Wraps the bounds object around the dateline.
-     *  
-     * Parameters:
-     * maxExtent - {<OpenLayers.Bounds>}
-     * options - {Object} Some possible options are:
-     *
-     * Allowed Options:
-     *                    leftTolerance - {float} Allow for a margin of error 
-     *                                            with the 'left' value of this 
-     *                                            bound.
-     *                                            Default is 0.
-     *                    rightTolerance - {float} Allow for a margin of error 
-     *                                             with the 'right' value of 
-     *                                             this bound.
-     *                                             Default is 0.
-     * 
-     * Returns:
-     * {<OpenLayers.Bounds>} A copy of this bounds, but wrapped around the 
-     *                       "dateline" (as specified by the borders of 
-     *                       maxExtent). Note that this function only returns 
-     *                       a different bounds value if this bounds is 
-     *                       *entirely* outside of the maxExtent. If this 
-     *                       bounds straddles the dateline (is part in/part 
-     *                       out of maxExtent), the returned bounds will always 
-     *                       cross the left edge of the given maxExtent.
-     *.
-     */
-    wrapDateLine: function(maxExtent, options) {    
-        options = options || {};
-        
-        var leftTolerance = options.leftTolerance || 0;
-        var rightTolerance = options.rightTolerance || 0;
-
-        var newBounds = this.clone();
-    
-        if (maxExtent) {
-            var width = maxExtent.getWidth();
-
-            //shift right?
-            while (newBounds.left < maxExtent.left && 
-                   newBounds.right - rightTolerance <= maxExtent.left ) { 
-                newBounds = newBounds.add(width, 0);
-            }
-
-            //shift left?
-            while (newBounds.left + leftTolerance >= maxExtent.right && 
-                   newBounds.right > maxExtent.right ) { 
-                newBounds = newBounds.add(-width, 0);
-            }
-           
-            // crosses right only? force left
-            var newLeft = newBounds.left + leftTolerance;
-            if (newLeft < maxExtent.right && newLeft > maxExtent.left && 
-                   newBounds.right - rightTolerance > maxExtent.right) {
-                newBounds = newBounds.add(-width, 0);
-            }
-        }
-                
-        return newBounds;
-    },
-
-    CLASS_NAME: "OpenLayers.Bounds"
-});
-
-/** 
- * APIFunction: fromString
- * Alternative constructor that builds a new OpenLayers.Bounds from a 
- *     parameter string.
- *
- * (begin code)
- * OpenLayers.Bounds.fromString("5,42,10,45");
- * // => equivalent to ...
- * new OpenLayers.Bounds(5, 42, 10, 45);
- * (end)
- *
- * Parameters: 
- * str - {String} Comma-separated bounds string. (e.g. "5,42,10,45")
- * reverseAxisOrder - {Boolean} Does the string use reverse axis order?
- *
- * Returns:
- * {<OpenLayers.Bounds>} New bounds object built from the 
- *                       passed-in String.
- */
-OpenLayers.Bounds.fromString = function(str, reverseAxisOrder) {
-    var bounds = str.split(",");
-    return OpenLayers.Bounds.fromArray(bounds, reverseAxisOrder);
-};
-
-/** 
- * APIFunction: fromArray
- * Alternative constructor that builds a new OpenLayers.Bounds from an array.
- *
- * (begin code)
- * OpenLayers.Bounds.fromArray( [5, 42, 10, 45] );
- * // => equivalent to ...
- * new OpenLayers.Bounds(5, 42, 10, 45);
- * (end)
- *
- * Parameters:
- * bbox - {Array(Float)} Array of bounds values (e.g. [5,42,10,45])
- * reverseAxisOrder - {Boolean} Does the array use reverse axis order?
- *
- * Returns:
- * {<OpenLayers.Bounds>} New bounds object built from the passed-in Array.
- */
-OpenLayers.Bounds.fromArray = function(bbox, reverseAxisOrder) {
-    return reverseAxisOrder === true ?
-           new OpenLayers.Bounds(bbox[1], bbox[0], bbox[3], bbox[2]) :
-           new OpenLayers.Bounds(bbox[0], bbox[1], bbox[2], bbox[3]);
-};
-
-/** 
- * APIFunction: fromSize
- * Alternative constructor that builds a new OpenLayers.Bounds from a size.
- *
- * (begin code)
- * OpenLayers.Bounds.fromSize( new OpenLayers.Size(10, 20) );
- * // => equivalent to ...
- * new OpenLayers.Bounds(0, 20, 10, 0);
- * (end)
- *
- * Parameters:
- * size - {<OpenLayers.Size> or Object} <OpenLayers.Size> or an object with
- *     both 'w' and 'h' properties.
- *
- * Returns:
- * {<OpenLayers.Bounds>} New bounds object built from the passed-in size.
- */
-OpenLayers.Bounds.fromSize = function(size) {
-    return new OpenLayers.Bounds(0,
-                                 size.h,
-                                 size.w,
-                                 0);
-};
-
-/**
- * Function: oppositeQuadrant
- * Get the opposite quadrant for a given quadrant string.
- *
- * (begin code)
- * OpenLayers.Bounds.oppositeQuadrant( "tl" );
- * // => "br"
- *
- * OpenLayers.Bounds.oppositeQuadrant( "tr" );
- * // => "bl"
- * (end)
- *
- * Parameters:
- * quadrant - {String} two character quadrant shortstring
- *
- * Returns:
- * {String} The opposing quadrant ("br" "tr" "tl" "bl"). For Example, if 
- *          you pass in "bl" it returns "tr", if you pass in "br" it 
- *          returns "tl", etc.
- */
-OpenLayers.Bounds.oppositeQuadrant = function(quadrant) {
-    var opp = "";
-    
-    opp += (quadrant.charAt(0) == 't') ? 'b' : 't';
-    opp += (quadrant.charAt(1) == 'l') ? 'r' : 'l';
-    
-    return opp;
-};
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/BaseTypes/Class.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/BaseTypes/Class.js
deleted file mode 100644
index 2be72129..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/BaseTypes/Class.js
+++ /dev/null
@@ -1,121 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/SingleFile.js
- */
-
-/**
- * Constructor: OpenLayers.Class
- * Base class used to construct all other classes. Includes support for 
- *     multiple inheritance. 
- *     
- * This constructor is new in OpenLayers 2.5.  At OpenLayers 3.0, the old 
- *     syntax for creating classes and dealing with inheritance 
- *     will be removed.
- * 
- * To create a new OpenLayers-style class, use the following syntax:
- * (code)
- *     var MyClass = OpenLayers.Class(prototype);
- * (end)
- *
- * To create a new OpenLayers-style class with multiple inheritance, use the
- *     following syntax:
- * (code)
- *     var MyClass = OpenLayers.Class(Class1, Class2, prototype);
- * (end)
- * 
- * Note that instanceof reflection will only reveal Class1 as superclass.
- *
- */
-OpenLayers.Class = function() {
-    var len = arguments.length;
-    var P = arguments[0];
-    var F = arguments[len-1];
-
-    var C = typeof F.initialize == "function" ?
-        F.initialize :
-        function(){ P.prototype.initialize.apply(this, arguments); };
-
-    if (len > 1) {
-        var newArgs = [C, P].concat(
-                Array.prototype.slice.call(arguments).slice(1, len-1), F);
-        OpenLayers.inherit.apply(null, newArgs);
-    } else {
-        C.prototype = F;
-    }
-    return C;
-};
-
-/**
- * Function: OpenLayers.inherit
- *
- * Parameters:
- * C - {Object} the class that inherits
- * P - {Object} the superclass to inherit from
- *
- * In addition to the mandatory C and P parameters, an arbitrary number of
- * objects can be passed, which will extend C.
- */
-OpenLayers.inherit = function(C, P) {
-   var F = function() {};
-   F.prototype = P.prototype;
-   C.prototype = new F;
-   var i, l, o;
-   for(i=2, l=arguments.length; i<l; i++) {
-       o = arguments[i];
-       if(typeof o === "function") {
-           o = o.prototype;
-       }
-       OpenLayers.Util.extend(C.prototype, o);
-   }
-};
-
-/**
- * APIFunction: extend
- * Copy all properties of a source object to a destination object.  Modifies
- *     the passed in destination object.  Any properties on the source object
- *     that are set to undefined will not be (re)set on the destination object.
- *
- * Parameters:
- * destination - {Object} The object that will be modified
- * source - {Object} The object with properties to be set on the destination
- *
- * Returns:
- * {Object} The destination object.
- */
-OpenLayers.Util = OpenLayers.Util || {};
-OpenLayers.Util.extend = function(destination, source) {
-    destination = destination || {};
-    if (source) {
-        for (var property in source) {
-            var value = source[property];
-            if (value !== undefined) {
-                destination[property] = value;
-            }
-        }
-
-        /**
-         * IE doesn't include the toString property when iterating over an object's
-         * properties with the for(property in object) syntax.  Explicitly check if
-         * the source has its own toString property.
-         */
-
-        /*
-         * FF/Windows < 2.0.0.13 reports "Illegal operation on WrappedNative
-         * prototype object" when calling hawOwnProperty if the source object
-         * is an instance of window.Event.
-         */
-
-        var sourceIsEvt = typeof window.Event == "function"
-                          && source instanceof window.Event;
-
-        if (!sourceIsEvt
-           && source.hasOwnProperty && source.hasOwnProperty("toString")) {
-            destination.toString = source.toString;
-        }
-    }
-    return destination;
-};
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/BaseTypes/Date.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/BaseTypes/Date.js
deleted file mode 100644
index 2646f247..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/BaseTypes/Date.js
+++ /dev/null
@@ -1,123 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/SingleFile.js
- */
-
-/**
- * Namespace: OpenLayers.Date
- * Contains implementations of Date.parse and date.toISOString that match the
- *     ECMAScript 5 specification for parsing RFC 3339 dates.
- *     http://tools.ietf.org/html/rfc3339
- */
-OpenLayers.Date = {
-
-    /** 
-     * APIProperty: dateRegEx
-     * The regex to be used for validating dates. You can provide your own
-     * regex for instance for adding support for years before BC. Default
-     * value is: /^(?:(\d{4})(?:-(\d{2})(?:-(\d{2}))?)?)?(?:(?:T(\d{1,2}):(\d{2}):(\d{2}(?:\.\d+)?)(Z|(?:[+-]\d{1,2}(?::(\d{2}))?)))|Z)?$/
-     */
-    dateRegEx: /^(?:(\d{4})(?:-(\d{2})(?:-(\d{2}))?)?)?(?:(?:T(\d{1,2}):(\d{2}):(\d{2}(?:\.\d+)?)(Z|(?:[+-]\d{1,2}(?::(\d{2}))?)))|Z)?$/,
-
-    /**
-     * APIMethod: toISOString
-     * Generates a string representing a date.  The format of the string follows
-     *     the profile of ISO 8601 for date and time on the Internet (see
-     *     http://tools.ietf.org/html/rfc3339).  If the toISOString method is
-     *     available on the Date prototype, that is used.  The toISOString
-     *     method for Date instances is defined in ECMA-262.
-     *
-     * Parameters:
-     * date - {Date} A date object.
-     *
-     * Returns:
-     * {String} A string representing the date (e.g.
-     *     "2010-08-07T16:58:23.123Z").  If the date does not have a valid time
-     *     (i.e. isNaN(date.getTime())) this method returns the string "Invalid
-     *     Date".  The ECMA standard says the toISOString method should throw
-     *     RangeError in this case, but Firefox returns a string instead.  For
-     *     best results, use isNaN(date.getTime()) to determine date validity
-     *     before generating date strings.
-     */
-    toISOString: (function() {
-        if ("toISOString" in Date.prototype) {
-            return function(date) {
-                return date.toISOString();
-            };
-        } else {
-            return function(date) {
-                var str;
-                if (isNaN(date.getTime())) {
-                    // ECMA-262 says throw RangeError, Firefox returns
-                    // "Invalid Date"
-                    str = "Invalid Date";
-                } else {
-                    str =
-                        date.getUTCFullYear() + "-" +
-                        OpenLayers.Number.zeroPad(date.getUTCMonth() + 1, 2) + "-" +
-                        OpenLayers.Number.zeroPad(date.getUTCDate(), 2) + "T" +
-                        OpenLayers.Number.zeroPad(date.getUTCHours(), 2) + ":" +
-                        OpenLayers.Number.zeroPad(date.getUTCMinutes(), 2) + ":" +
-                        OpenLayers.Number.zeroPad(date.getUTCSeconds(), 2) + "." +
-                        OpenLayers.Number.zeroPad(date.getUTCMilliseconds(), 3) + "Z";
-                }
-                return str;
-            };
-        }
-
-    })(),
-
-    /**
-     * APIMethod: parse
-     * Generate a date object from a string.  The format for the string follows
-     *     the profile of ISO 8601 for date and time on the Internet (see
-     *     http://tools.ietf.org/html/rfc3339).  We don't call the native
-     *     Date.parse because of inconsistency between implmentations.  In
-     *     Chrome, calling Date.parse with a string that doesn't contain any
-     *     indication of the timezone (e.g. "2011"), the date is interpreted
-     *     in local time.  On Firefox, the assumption is UTC.
-     *
-     * Parameters:
-     * str - {String} A string representing the date (e.g.
-     *     "2010", "2010-08", "2010-08-07", "2010-08-07T16:58:23.123Z",
-     *     "2010-08-07T11:58:23.123-06").
-     *
-     * Returns:
-     * {Date} A date object.  If the string could not be parsed, an invalid
-     *     date is returned (i.e. isNaN(date.getTime())).
-     */
-    parse: function(str) {
-        var date;
-        var match = str.match(this.dateRegEx);
-        if (match && (match[1] || match[7])) { // must have at least year or time
-            var year = parseInt(match[1], 10) || 0;
-            var month = (parseInt(match[2], 10) - 1) || 0;
-            var day = parseInt(match[3], 10) || 1;
-            date = new Date(Date.UTC(year, month, day));
-            // optional time
-            var type = match[7];
-            if (type) {
-                var hours = parseInt(match[4], 10);
-                var minutes = parseInt(match[5], 10);
-                var secFrac = parseFloat(match[6]);
-                var seconds = secFrac | 0;
-                var milliseconds = Math.round(1000 * (secFrac - seconds));
-                date.setUTCHours(hours, minutes, seconds, milliseconds);
-                // check offset
-                if (type !== "Z") {
-                    var hoursOffset = parseInt(type, 10);
-                    var minutesOffset = parseInt(match[8], 10) || 0;
-                    var offset = -1000 * (60 * (hoursOffset * 60) + minutesOffset * 60);
-                    date = new Date(date.getTime() + offset);
-                }
-            }
-        } else {
-            date = new Date("invalid");
-        }
-        return date;
-    }
-};
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/BaseTypes/Element.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/BaseTypes/Element.js
deleted file mode 100644
index dc71b5c8..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/BaseTypes/Element.js
+++ /dev/null
@@ -1,189 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Util.js
- * @requires OpenLayers/BaseTypes.js
- */
-
-/**
- * Namespace: OpenLayers.Element
- */
-OpenLayers.Element = {
-
-    /**
-     * APIFunction: visible
-     * 
-     * Parameters: 
-     * element - {DOMElement}
-     * 
-     * Returns:
-     * {Boolean} Is the element visible?
-     */
-    visible: function(element) {
-        return OpenLayers.Util.getElement(element).style.display != 'none';
-    },
-
-    /**
-     * APIFunction: toggle
-     * Toggle the visibility of element(s) passed in
-     * 
-     * Parameters:
-     * element - {DOMElement} Actually user can pass any number of elements
-     */
-    toggle: function() {
-        for (var i=0, len=arguments.length; i<len; i++) {
-            var element = OpenLayers.Util.getElement(arguments[i]);
-            var display = OpenLayers.Element.visible(element) ? 'none' 
-                                                              : '';
-            element.style.display = display;
-        }
-    },
-
-    /**
-     * APIFunction: remove
-     * Remove the specified element from the DOM.
-     * 
-     * Parameters:
-     * element - {DOMElement}
-     */
-    remove: function(element) {
-        element = OpenLayers.Util.getElement(element);
-        element.parentNode.removeChild(element);
-    },
-
-    /**
-     * APIFunction: getHeight
-     *  
-     * Parameters:
-     * element - {DOMElement}
-     * 
-     * Returns:
-     * {Integer} The offset height of the element passed in
-     */
-    getHeight: function(element) {
-        element = OpenLayers.Util.getElement(element);
-        return element.offsetHeight;
-    },
-
-    /**
-     * Function: hasClass
-     * Tests if an element has the given CSS class name.
-     *
-     * Parameters:
-     * element - {DOMElement} A DOM element node.
-     * name - {String} The CSS class name to search for.
-     *
-     * Returns:
-     * {Boolean} The element has the given class name.
-     */
-    hasClass: function(element, name) {
-        var names = element.className;
-        return (!!names && new RegExp("(^|\\s)" + name + "(\\s|$)").test(names));
-    },
-    
-    /**
-     * Function: addClass
-     * Add a CSS class name to an element.  Safe where element already has
-     *     the class name.
-     *
-     * Parameters:
-     * element - {DOMElement} A DOM element node.
-     * name - {String} The CSS class name to add.
-     *
-     * Returns:
-     * {DOMElement} The element.
-     */
-    addClass: function(element, name) {
-        if(!OpenLayers.Element.hasClass(element, name)) {
-            element.className += (element.className ? " " : "") + name;
-        }
-        return element;
-    },
-
-    /**
-     * Function: removeClass
-     * Remove a CSS class name from an element.  Safe where element does not
-     *     have the class name.
-     *
-     * Parameters:
-     * element - {DOMElement} A DOM element node.
-     * name - {String} The CSS class name to remove.
-     *
-     * Returns:
-     * {DOMElement} The element.
-     */
-    removeClass: function(element, name) {
-        var names = element.className;
-        if(names) {
-            element.className = OpenLayers.String.trim(
-                names.replace(
-                    new RegExp("(^|\\s+)" + name + "(\\s+|$)"), " "
-                )
-            );
-        }
-        return element;
-    },
-
-    /**
-     * Function: toggleClass
-     * Remove a CSS class name from an element if it exists.  Add the class name
-     *     if it doesn't exist.
-     *
-     * Parameters:
-     * element - {DOMElement} A DOM element node.
-     * name - {String} The CSS class name to toggle.
-     *
-     * Returns:
-     * {DOMElement} The element.
-     */
-    toggleClass: function(element, name) {
-        if(OpenLayers.Element.hasClass(element, name)) {
-            OpenLayers.Element.removeClass(element, name);
-        } else {
-            OpenLayers.Element.addClass(element, name);
-        }
-        return element;
-    },
-
-    /**
-     * APIFunction: getStyle
-     * 
-     * Parameters:
-     * element - {DOMElement}
-     * style - {?}
-     * 
-     * Returns:
-     * {?}
-     */
-    getStyle: function(element, style) {
-        element = OpenLayers.Util.getElement(element);
-
-        var value = null;
-        if (element && element.style) {
-            value = element.style[OpenLayers.String.camelize(style)];
-            if (!value) {
-                if (document.defaultView && 
-                    document.defaultView.getComputedStyle) {
-                    
-                    var css = document.defaultView.getComputedStyle(element, null);
-                    value = css ? css.getPropertyValue(style) : null;
-                } else if (element.currentStyle) {
-                    value = element.currentStyle[OpenLayers.String.camelize(style)];
-                }
-            }
-        
-            var positions = ['left', 'top', 'right', 'bottom'];
-            if (window.opera &&
-                (OpenLayers.Util.indexOf(positions,style) != -1) &&
-                (OpenLayers.Element.getStyle(element, 'position') == 'static')) { 
-                value = 'auto';
-            }
-        }
-    
-        return value == 'auto' ? null : value;
-    }
-
-};
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/BaseTypes/LonLat.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/BaseTypes/LonLat.js
deleted file mode 100644
index 0780dc33..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/BaseTypes/LonLat.js
+++ /dev/null
@@ -1,215 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/BaseTypes/Class.js
- */
-
-/**
- * Class: OpenLayers.LonLat
- * This class represents a longitude and latitude pair
- */
-OpenLayers.LonLat = OpenLayers.Class({
-
-    /** 
-     * APIProperty: lon
-     * {Float} The x-axis coodinate in map units
-     */
-    lon: 0.0,
-    
-    /** 
-     * APIProperty: lat
-     * {Float} The y-axis coordinate in map units
-     */
-    lat: 0.0,
-
-    /**
-     * Constructor: OpenLayers.LonLat
-     * Create a new map location. Coordinates can be passed either as two
-     * arguments, or as a single argument.
-     *
-     * Parameters (two arguments):
-     * lon - {Number} The x-axis coordinate in map units.  If your map is in
-     *     a geographic projection, this will be the Longitude.  Otherwise,
-     *     it will be the x coordinate of the map location in your map units.
-     * lat - {Number} The y-axis coordinate in map units.  If your map is in
-     *     a geographic projection, this will be the Latitude.  Otherwise,
-     *     it will be the y coordinate of the map location in your map units.
-     *
-     * Parameters (single argument):
-     * location - {Array(Float)} [lon, lat]
-     */
-    initialize: function(lon, lat) {
-        if (OpenLayers.Util.isArray(lon)) {
-            lat = lon[1];
-            lon = lon[0];
-        }
-        this.lon = OpenLayers.Util.toFloat(lon);
-        this.lat = OpenLayers.Util.toFloat(lat);
-    },
-    
-    /**
-     * Method: toString
-     * Return a readable string version of the lonlat
-     *
-     * Returns:
-     * {String} String representation of OpenLayers.LonLat object. 
-     *           (e.g. <i>"lon=5,lat=42"</i>)
-     */
-    toString:function() {
-        return ("lon=" + this.lon + ",lat=" + this.lat);
-    },
-
-    /** 
-     * APIMethod: toShortString
-     * 
-     * Returns:
-     * {String} Shortened String representation of OpenLayers.LonLat object. 
-     *         (e.g. <i>"5, 42"</i>)
-     */
-    toShortString:function() {
-        return (this.lon + ", " + this.lat);
-    },
-
-    /** 
-     * APIMethod: clone
-     * 
-     * Returns:
-     * {<OpenLayers.LonLat>} New OpenLayers.LonLat object with the same lon 
-     *                       and lat values
-     */
-    clone:function() {
-        return new OpenLayers.LonLat(this.lon, this.lat);
-    },
-
-    /** 
-     * APIMethod: add
-     * 
-     * Parameters:
-     * lon - {Float}
-     * lat - {Float}
-     * 
-     * Returns:
-     * {<OpenLayers.LonLat>} A new OpenLayers.LonLat object with the lon and 
-     *                       lat passed-in added to this's. 
-     */
-    add:function(lon, lat) {
-        if ( (lon == null) || (lat == null) ) {
-            throw new TypeError('LonLat.add cannot receive null values');
-        }
-        return new OpenLayers.LonLat(this.lon + OpenLayers.Util.toFloat(lon), 
-                                     this.lat + OpenLayers.Util.toFloat(lat));
-    },
-
-    /** 
-     * APIMethod: equals
-     * 
-     * Parameters:
-     * ll - {<OpenLayers.LonLat>}
-     * 
-     * Returns:
-     * {Boolean} Boolean value indicating whether the passed-in 
-     *           <OpenLayers.LonLat> object has the same lon and lat 
-     *           components as this.
-     *           Note: if ll passed in is null, returns false
-     */
-    equals:function(ll) {
-        var equals = false;
-        if (ll != null) {
-            equals = ((this.lon == ll.lon && this.lat == ll.lat) ||
-                      (isNaN(this.lon) && isNaN(this.lat) && isNaN(ll.lon) && isNaN(ll.lat)));
-        }
-        return equals;
-    },
-
-    /**
-     * APIMethod: transform
-     * Transform the LonLat object from source to dest. This transformation is
-     *    *in place*: if you want a *new* lonlat, use .clone() first.
-     *
-     * Parameters: 
-     * source - {<OpenLayers.Projection>} Source projection. 
-     * dest   - {<OpenLayers.Projection>} Destination projection. 
-     *
-     * Returns:
-     * {<OpenLayers.LonLat>} Itself, for use in chaining operations.
-     */
-    transform: function(source, dest) {
-        var point = OpenLayers.Projection.transform(
-            {'x': this.lon, 'y': this.lat}, source, dest);
-        this.lon = point.x;
-        this.lat = point.y;
-        return this;
-    },
-    
-    /**
-     * APIMethod: wrapDateLine
-     * 
-     * Parameters:
-     * maxExtent - {<OpenLayers.Bounds>}
-     * 
-     * Returns:
-     * {<OpenLayers.LonLat>} A copy of this lonlat, but wrapped around the 
-     *                       "dateline" (as specified by the borders of 
-     *                       maxExtent)
-     */
-    wrapDateLine: function(maxExtent) {    
-
-        var newLonLat = this.clone();
-    
-        if (maxExtent) {
-            //shift right?
-            while (newLonLat.lon < maxExtent.left) {
-                newLonLat.lon +=  maxExtent.getWidth();
-            }    
-           
-            //shift left?
-            while (newLonLat.lon > maxExtent.right) {
-                newLonLat.lon -= maxExtent.getWidth();
-            }    
-        }
-                
-        return newLonLat;
-    },
-
-    CLASS_NAME: "OpenLayers.LonLat"
-});
-
-/** 
- * Function: fromString
- * Alternative constructor that builds a new <OpenLayers.LonLat> from a 
- *     parameter string
- * 
- * Parameters:
- * str - {String} Comma-separated Lon,Lat coordinate string. 
- *                 (e.g. <i>"5,40"</i>)
- * 
- * Returns:
- * {<OpenLayers.LonLat>} New <OpenLayers.LonLat> object built from the 
- *                       passed-in String.
- */
-OpenLayers.LonLat.fromString = function(str) {
-    var pair = str.split(",");
-    return new OpenLayers.LonLat(pair[0], pair[1]);
-};
-
-/** 
- * Function: fromArray
- * Alternative constructor that builds a new <OpenLayers.LonLat> from an 
- *     array of two numbers that represent lon- and lat-values.
- * 
- * Parameters:
- * arr - {Array(Float)} Array of lon/lat values (e.g. [5,-42])
- * 
- * Returns:
- * {<OpenLayers.LonLat>} New <OpenLayers.LonLat> object built from the 
- *                       passed-in array.
- */
-OpenLayers.LonLat.fromArray = function(arr) {
-    var gotArr = OpenLayers.Util.isArray(arr),
-        lon = gotArr && arr[0],
-        lat = gotArr && arr[1];
-    return new OpenLayers.LonLat(lon, lat);
-};
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/BaseTypes/Pixel.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/BaseTypes/Pixel.js
deleted file mode 100644
index d6ac60ab..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/BaseTypes/Pixel.js
+++ /dev/null
@@ -1,143 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/BaseTypes/Class.js
- */
-
-/**
- * Class: OpenLayers.Pixel
- * This class represents a screen coordinate, in x and y coordinates
- */
-OpenLayers.Pixel = OpenLayers.Class({
-    
-    /**
-     * APIProperty: x
-     * {Number} The x coordinate
-     */
-    x: 0.0,
-
-    /**
-     * APIProperty: y
-     * {Number} The y coordinate
-     */
-    y: 0.0,
-    
-    /**
-     * Constructor: OpenLayers.Pixel
-     * Create a new OpenLayers.Pixel instance
-     *
-     * Parameters:
-     * x - {Number} The x coordinate
-     * y - {Number} The y coordinate
-     *
-     * Returns:
-     * An instance of OpenLayers.Pixel
-     */
-    initialize: function(x, y) {
-        this.x = parseFloat(x);
-        this.y = parseFloat(y);
-    },
-    
-    /**
-     * Method: toString
-     * Cast this object into a string
-     *
-     * Returns:
-     * {String} The string representation of Pixel. ex: "x=200.4,y=242.2"
-     */
-    toString:function() {
-        return ("x=" + this.x + ",y=" + this.y);
-    },
-
-    /**
-     * APIMethod: clone
-     * Return a clone of this pixel object
-     *
-     * Returns:
-     * {<OpenLayers.Pixel>} A clone pixel
-     */
-    clone:function() {
-        return new OpenLayers.Pixel(this.x, this.y); 
-    },
-    
-    /**
-     * APIMethod: equals
-     * Determine whether one pixel is equivalent to another
-     *
-     * Parameters:
-     * px - {<OpenLayers.Pixel>|Object} An OpenLayers.Pixel or an object with
-     *                                  a 'x' and 'y' properties.
-     *
-     * Returns:
-     * {Boolean} The point passed in as parameter is equal to this. Note that
-     * if px passed in is null, returns false.
-     */
-    equals:function(px) {
-        var equals = false;
-        if (px != null) {
-            equals = ((this.x == px.x && this.y == px.y) ||
-                      (isNaN(this.x) && isNaN(this.y) && isNaN(px.x) && isNaN(px.y)));
-        }
-        return equals;
-    },
-
-    /**
-     * APIMethod: distanceTo
-     * Returns the distance to the pixel point passed in as a parameter.
-     *
-     * Parameters:
-     * px - {<OpenLayers.Pixel>}
-     *
-     * Returns:
-     * {Float} The pixel point passed in as parameter to calculate the
-     *     distance to.
-     */
-    distanceTo:function(px) {
-        return Math.sqrt(
-            Math.pow(this.x - px.x, 2) +
-            Math.pow(this.y - px.y, 2)
-        );
-    },
-
-    /**
-     * APIMethod: add
-     *
-     * Parameters:
-     * x - {Integer}
-     * y - {Integer}
-     *
-     * Returns:
-     * {<OpenLayers.Pixel>} A new Pixel with this pixel's x&y augmented by the 
-     * values passed in.
-     */
-    add:function(x, y) {
-        if ( (x == null) || (y == null) ) {
-            throw new TypeError('Pixel.add cannot receive null values');
-        }
-        return new OpenLayers.Pixel(this.x + x, this.y + y);
-    },
-
-    /**
-    * APIMethod: offset
-    * 
-    * Parameters
-    * px - {<OpenLayers.Pixel>|Object} An OpenLayers.Pixel or an object with
-    *                                  a 'x' and 'y' properties.
-    * 
-    * Returns:
-    * {<OpenLayers.Pixel>} A new Pixel with this pixel's x&y augmented by the 
-    *                      x&y values of the pixel passed in.
-    */
-    offset:function(px) {
-        var newPx = this.clone();
-        if (px) {
-            newPx = this.add(px.x, px.y);
-        }
-        return newPx;
-    },
-
-    CLASS_NAME: "OpenLayers.Pixel"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/BaseTypes/Size.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/BaseTypes/Size.js
deleted file mode 100644
index 34c7a6c8..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/BaseTypes/Size.js
+++ /dev/null
@@ -1,89 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/BaseTypes/Class.js
- */
-
-/**
- * Class: OpenLayers.Size
- * Instances of this class represent a width/height pair
- */
-OpenLayers.Size = OpenLayers.Class({
-
-    /**
-     * APIProperty: w
-     * {Number} width
-     */
-    w: 0.0,
-    
-    /**
-     * APIProperty: h
-     * {Number} height
-     */
-    h: 0.0,
-
-
-    /**
-     * Constructor: OpenLayers.Size
-     * Create an instance of OpenLayers.Size
-     *
-     * Parameters:
-     * w - {Number} width
-     * h - {Number} height
-     */
-    initialize: function(w, h) {
-        this.w = parseFloat(w);
-        this.h = parseFloat(h);
-    },
-
-    /**
-     * Method: toString
-     * Return the string representation of a size object
-     *
-     * Returns:
-     * {String} The string representation of OpenLayers.Size object. 
-     * (e.g. <i>"w=55,h=66"</i>)
-     */
-    toString:function() {
-        return ("w=" + this.w + ",h=" + this.h);
-    },
-
-    /**
-     * APIMethod: clone
-     * Create a clone of this size object
-     *
-     * Returns:
-     * {<OpenLayers.Size>} A new OpenLayers.Size object with the same w and h
-     * values
-     */
-    clone:function() {
-        return new OpenLayers.Size(this.w, this.h);
-    },
-
-    /**
-     *
-     * APIMethod: equals
-     * Determine where this size is equal to another
-     *
-     * Parameters:
-     * sz - {<OpenLayers.Size>|Object} An OpenLayers.Size or an object with
-     *                                  a 'w' and 'h' properties.
-     *
-     * Returns: 
-     * {Boolean} The passed in size has the same h and w properties as this one.
-     * Note that if sz passed in is null, returns false.
-     */
-    equals:function(sz) {
-        var equals = false;
-        if (sz != null) {
-            equals = ((this.w == sz.w && this.h == sz.h) ||
-                      (isNaN(this.w) && isNaN(this.h) && isNaN(sz.w) && isNaN(sz.h)));
-        }
-        return equals;
-    },
-
-    CLASS_NAME: "OpenLayers.Size"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Console.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Console.js
deleted file mode 100644
index ef5029aa..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Console.js
+++ /dev/null
@@ -1,250 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/BaseTypes/Class.js
- */
-
-/**
- * Namespace: OpenLayers.Console
- * The OpenLayers.Console namespace is used for debugging and error logging.
- * If the Firebug Lite (../Firebug/firebug.js) is included before this script,
- * calls to OpenLayers.Console methods will get redirected to window.console.
- * This makes use of the Firebug extension where available and allows for
- * cross-browser debugging Firebug style.
- *
- * Note:
- * Note that behavior will differ with the Firebug extention and Firebug Lite.
- * Most notably, the Firebug Lite console does not currently allow for
- * hyperlinks to code or for clicking on object to explore their properties.
- * 
- */
-OpenLayers.Console = {
-    /**
-     * Create empty functions for all console methods.  The real value of these
-     * properties will be set if Firebug Lite (../Firebug/firebug.js script) is
-     * included.  We explicitly require the Firebug Lite script to trigger
-     * functionality of the OpenLayers.Console methods.
-     */
-    
-    /**
-     * APIFunction: log
-     * Log an object in the console.  The Firebug Lite console logs string
-     * representation of objects.  Given multiple arguments, they will
-     * be cast to strings and logged with a space delimiter.  If the first
-     * argument is a string with printf-like formatting, subsequent arguments
-     * will be used in string substitution.  Any additional arguments (beyond
-     * the number substituted in a format string) will be appended in a space-
-     * delimited line.
-     * 
-     * Parameters:
-     * object - {Object}
-     */
-    log: function() {},
-
-    /**
-     * APIFunction: debug
-     * Writes a message to the console, including a hyperlink to the line
-     * where it was called.
-     *
-     * May be called with multiple arguments as with OpenLayers.Console.log().
-     * 
-     * Parameters:
-     * object - {Object}
-     */
-    debug: function() {},
-
-    /**
-     * APIFunction: info
-     * Writes a message to the console with the visual "info" icon and color
-     * coding and a hyperlink to the line where it was called.
-     *
-     * May be called with multiple arguments as with OpenLayers.Console.log().
-     * 
-     * Parameters:
-     * object - {Object}
-     */
-    info: function() {},
-
-    /**
-     * APIFunction: warn
-     * Writes a message to the console with the visual "warning" icon and
-     * color coding and a hyperlink to the line where it was called.
-     *
-     * May be called with multiple arguments as with OpenLayers.Console.log().
-     * 
-     * Parameters:
-     * object - {Object}
-     */
-    warn: function() {},
-
-    /**
-     * APIFunction: error
-     * Writes a message to the console with the visual "error" icon and color
-     * coding and a hyperlink to the line where it was called.
-     *
-     * May be called with multiple arguments as with OpenLayers.Console.log().
-     * 
-     * Parameters:
-     * object - {Object}
-     */
-    error: function() {},
-    
-    /**
-     * APIFunction: userError
-     * A single interface for showing error messages to the user. The default
-     * behavior is a Javascript alert, though this can be overridden by
-     * reassigning OpenLayers.Console.userError to a different function.
-     *
-     * Expects a single error message
-     * 
-     * Parameters:
-     * error - {Object}
-     */
-    userError: function(error) {
-        alert(error);
-    },
-
-    /**
-     * APIFunction: assert
-     * Tests that an expression is true. If not, it will write a message to
-     * the console and throw an exception.
-     *
-     * May be called with multiple arguments as with OpenLayers.Console.log().
-     * 
-     * Parameters:
-     * object - {Object}
-     */
-    assert: function() {},
-
-    /**
-     * APIFunction: dir
-     * Prints an interactive listing of all properties of the object. This
-     * looks identical to the view that you would see in the DOM tab.
-     * 
-     * Parameters:
-     * object - {Object}
-     */
-    dir: function() {},
-
-    /**
-     * APIFunction: dirxml
-     * Prints the XML source tree of an HTML or XML element. This looks
-     * identical to the view that you would see in the HTML tab. You can click
-     * on any node to inspect it in the HTML tab.
-     * 
-     * Parameters:
-     * object - {Object}
-     */
-    dirxml: function() {},
-
-    /**
-     * APIFunction: trace
-     * Prints an interactive stack trace of JavaScript execution at the point
-     * where it is called.  The stack trace details the functions on the stack,
-     * as well as the values that were passed as arguments to each function.
-     * You can click each function to take you to its source in the Script tab,
-     * and click each argument value to inspect it in the DOM or HTML tabs.
-     * 
-     */
-    trace: function() {},
-
-    /**
-     * APIFunction: group
-     * Writes a message to the console and opens a nested block to indent all
-     * future messages sent to the console. Call OpenLayers.Console.groupEnd()
-     * to close the block.
-     *
-     * May be called with multiple arguments as with OpenLayers.Console.log().
-     * 
-     * Parameters:
-     * object - {Object}
-     */
-    group: function() {},
-
-    /**
-     * APIFunction: groupEnd
-     * Closes the most recently opened block created by a call to
-     * OpenLayers.Console.group
-     */
-    groupEnd: function() {},
-    
-    /**
-     * APIFunction: time
-     * Creates a new timer under the given name. Call
-     * OpenLayers.Console.timeEnd(name)
-     * with the same name to stop the timer and print the time elapsed.
-     *
-     * Parameters:
-     * name - {String}
-     */
-    time: function() {},
-
-    /**
-     * APIFunction: timeEnd
-     * Stops a timer created by a call to OpenLayers.Console.time(name) and
-     * writes the time elapsed.
-     *
-     * Parameters:
-     * name - {String}
-     */
-    timeEnd: function() {},
-
-    /**
-     * APIFunction: profile
-     * Turns on the JavaScript profiler. The optional argument title would
-     * contain the text to be printed in the header of the profile report.
-     *
-     * This function is not currently implemented in Firebug Lite.
-     * 
-     * Parameters:
-     * title - {String} Optional title for the profiler
-     */
-    profile: function() {},
-
-    /**
-     * APIFunction: profileEnd
-     * Turns off the JavaScript profiler and prints its report.
-     * 
-     * This function is not currently implemented in Firebug Lite.
-     */
-    profileEnd: function() {},
-
-    /**
-     * APIFunction: count
-     * Writes the number of times that the line of code where count was called
-     * was executed. The optional argument title will print a message in
-     * addition to the number of the count.
-     *
-     * This function is not currently implemented in Firebug Lite.
-     *
-     * Parameters:
-     * title - {String} Optional title to be printed with count
-     */
-    count: function() {},
-
-    CLASS_NAME: "OpenLayers.Console"
-};
-
-/**
- * Execute an anonymous function to extend the OpenLayers.Console namespace
- * if the firebug.js script is included.  This closure is used so that the
- * "scripts" and "i" variables don't pollute the global namespace.
- */
-(function() {
-    /**
-     * If Firebug Lite is included (before this script), re-route all
-     * OpenLayers.Console calls to the console object.
-     */
-    var scripts = document.getElementsByTagName("script");
-    for(var i=0, len=scripts.length; i<len; ++i) {
-        if(scripts[i].src.indexOf("firebug.js") != -1) {
-            if(console) {
-                OpenLayers.Util.extend(OpenLayers.Console, console);
-                break;
-            }
-        }
-    }
-})();
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control.js
deleted file mode 100644
index 472a4e6e..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control.js
+++ /dev/null
@@ -1,371 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/BaseTypes/Class.js
- */
-
-/**
- * Class: OpenLayers.Control
- * Controls affect the display or behavior of the map. They allow everything
- * from panning and zooming to displaying a scale indicator. Controls by 
- * default are added to the map they are contained within however it is
- * possible to add a control to an external div by passing the div in the
- * options parameter.
- * 
- * Example:
- * The following example shows how to add many of the common controls
- * to a map.
- * 
- * > var map = new OpenLayers.Map('map', { controls: [] });
- * >
- * > map.addControl(new OpenLayers.Control.PanZoomBar());
- * > map.addControl(new OpenLayers.Control.LayerSwitcher({'ascending':false}));
- * > map.addControl(new OpenLayers.Control.Permalink());
- * > map.addControl(new OpenLayers.Control.Permalink('permalink'));
- * > map.addControl(new OpenLayers.Control.MousePosition());
- * > map.addControl(new OpenLayers.Control.OverviewMap());
- * > map.addControl(new OpenLayers.Control.KeyboardDefaults());
- *
- * The next code fragment is a quick example of how to intercept 
- * shift-mouse click to display the extent of the bounding box
- * dragged out by the user.  Usually controls are not created
- * in exactly this manner.  See the source for a more complete 
- * example:
- *
- * > var control = new OpenLayers.Control();
- * > OpenLayers.Util.extend(control, {
- * >     draw: function () {
- * >         // this Handler.Box will intercept the shift-mousedown
- * >         // before Control.MouseDefault gets to see it
- * >         this.box = new OpenLayers.Handler.Box( control, 
- * >             {"done": this.notice},
- * >             {keyMask: OpenLayers.Handler.MOD_SHIFT});
- * >         this.box.activate();
- * >     },
- * >
- * >     notice: function (bounds) {
- * >         OpenLayers.Console.userError(bounds);
- * >     }
- * > }); 
- * > map.addControl(control);
- * 
- */
-OpenLayers.Control = OpenLayers.Class({
-
-    /** 
-     * Property: id 
-     * {String} 
-     */
-    id: null,
-    
-    /** 
-     * Property: map 
-     * {<OpenLayers.Map>} this gets set in the addControl() function in
-     * OpenLayers.Map 
-     */
-    map: null,
-
-    /** 
-     * APIProperty: div 
-     * {DOMElement} The element that contains the control, if not present the 
-     *     control is placed inside the map.
-     */
-    div: null,
-
-    /** 
-     * APIProperty: type 
-     * {Number} Controls can have a 'type'. The type determines the type of
-     * interactions which are possible with them when they are placed in an
-     * <OpenLayers.Control.Panel>. 
-     */
-    type: null, 
-
-    /** 
-     * Property: allowSelection
-     * {Boolean} By default, controls do not allow selection, because
-     * it may interfere with map dragging. If this is true, OpenLayers
-     * will not prevent selection of the control.
-     * Default is false.
-     */
-    allowSelection: false,  
-
-    /** 
-     * Property: displayClass 
-     * {string}  This property is used for CSS related to the drawing of the
-     * Control. 
-     */
-    displayClass: "",
-    
-    /**
-    * APIProperty: title  
-    * {string}  This property is used for showing a tooltip over the  
-    * Control.  
-    */ 
-    title: "",
-
-    /**
-     * APIProperty: autoActivate
-     * {Boolean} Activate the control when it is added to a map.  Default is
-     *     false.
-     */
-    autoActivate: false,
-
-    /** 
-     * APIProperty: active 
-     * {Boolean} The control is active (read-only).  Use <activate> and 
-     *     <deactivate> to change control state.
-     */
-    active: null,
-
-    /**
-     * Property: handlerOptions
-     * {Object} Used to set non-default properties on the control's handler
-     */
-    handlerOptions: null,
-
-    /** 
-     * Property: handler 
-     * {<OpenLayers.Handler>} null
-     */
-    handler: null,
-
-    /**
-     * APIProperty: eventListeners
-     * {Object} If set as an option at construction, the eventListeners
-     *     object will be registered with <OpenLayers.Events.on>.  Object
-     *     structure must be a listeners object as shown in the example for
-     *     the events.on method.
-     */
-    eventListeners: null,
-
-    /** 
-     * APIProperty: events
-     * {<OpenLayers.Events>} Events instance for listeners and triggering
-     *     control specific events.
-     *
-     * Register a listener for a particular event with the following syntax:
-     * (code)
-     * control.events.register(type, obj, listener);
-     * (end)
-     *
-     * Listeners will be called with a reference to an event object.  The
-     *     properties of this event depends on exactly what happened.
-     *
-     * All event objects have at least the following properties:
-     * object - {Object} A reference to control.events.object (a reference
-     *      to the control).
-     * element - {DOMElement} A reference to control.events.element (which
-     *      will be null unless documented otherwise).
-     *
-     * Supported map event types:
-     * activate - Triggered when activated.
-     * deactivate - Triggered when deactivated.
-     */
-    events: null,
-
-    /**
-     * Constructor: OpenLayers.Control
-     * Create an OpenLayers Control.  The options passed as a parameter
-     * directly extend the control.  For example passing the following:
-     * 
-     * > var control = new OpenLayers.Control({div: myDiv});
-     *
-     * Overrides the default div attribute value of null.
-     * 
-     * Parameters:
-     * options - {Object} 
-     */
-    initialize: function (options) {
-        // We do this before the extend so that instances can override
-        // className in options.
-        this.displayClass = 
-            this.CLASS_NAME.replace("OpenLayers.", "ol").replace(/\./g, "");
-        
-        OpenLayers.Util.extend(this, options);
-        
-        this.events = new OpenLayers.Events(this);
-        if(this.eventListeners instanceof Object) {
-            this.events.on(this.eventListeners);
-        }
-        if (this.id == null) {
-            this.id = OpenLayers.Util.createUniqueID(this.CLASS_NAME + "_");
-        }
-    },
-
-    /**
-     * Method: destroy
-     * The destroy method is used to perform any clean up before the control
-     * is dereferenced.  Typically this is where event listeners are removed
-     * to prevent memory leaks.
-     */
-    destroy: function () {
-        if(this.events) {
-            if(this.eventListeners) {
-                this.events.un(this.eventListeners);
-            }
-            this.events.destroy();
-            this.events = null;
-        }
-        this.eventListeners = null;
-
-        // eliminate circular references
-        if (this.handler) {
-            this.handler.destroy();
-            this.handler = null;
-        }
-        if(this.handlers) {
-            for(var key in this.handlers) {
-                if(this.handlers.hasOwnProperty(key) &&
-                   typeof this.handlers[key].destroy == "function") {
-                    this.handlers[key].destroy();
-                }
-            }
-            this.handlers = null;
-        }
-        if (this.map) {
-            this.map.removeControl(this);
-            this.map = null;
-        }
-        this.div = null;
-    },
-
-    /** 
-     * Method: setMap
-     * Set the map property for the control. This is done through an accessor
-     * so that subclasses can override this and take special action once 
-     * they have their map variable set. 
-     *
-     * Parameters:
-     * map - {<OpenLayers.Map>} 
-     */
-    setMap: function(map) {
-        this.map = map;
-        if (this.handler) {
-            this.handler.setMap(map);
-        }
-    },
-  
-    /**
-     * Method: draw
-     * The draw method is called when the control is ready to be displayed
-     * on the page.  If a div has not been created one is created.  Controls
-     * with a visual component will almost always want to override this method 
-     * to customize the look of control. 
-     *
-     * Parameters:
-     * px - {<OpenLayers.Pixel>} The top-left pixel position of the control
-     *      or null.
-     *
-     * Returns:
-     * {DOMElement} A reference to the DIV DOMElement containing the control
-     */
-    draw: function (px) {
-        if (this.div == null) {
-            this.div = OpenLayers.Util.createDiv(this.id);
-            this.div.className = this.displayClass;
-            if (!this.allowSelection) {
-                this.div.className += " olControlNoSelect";
-                this.div.setAttribute("unselectable", "on", 0);
-                this.div.onselectstart = OpenLayers.Function.False; 
-            }    
-            if (this.title != "") {
-                this.div.title = this.title;
-            }
-        }
-        if (px != null) {
-            this.position = px.clone();
-        }
-        this.moveTo(this.position);
-        return this.div;
-    },
-
-    /**
-     * Method: moveTo
-     * Sets the left and top style attributes to the passed in pixel 
-     * coordinates.
-     *
-     * Parameters:
-     * px - {<OpenLayers.Pixel>}
-     */
-    moveTo: function (px) {
-        if ((px != null) && (this.div != null)) {
-            this.div.style.left = px.x + "px";
-            this.div.style.top = px.y + "px";
-        }
-    },
-
-    /**
-     * APIMethod: activate
-     * Explicitly activates a control and it's associated
-     * handler if one has been set.  Controls can be
-     * deactivated by calling the deactivate() method.
-     * 
-     * Returns:
-     * {Boolean}  True if the control was successfully activated or
-     *            false if the control was already active.
-     */
-    activate: function () {
-        if (this.active) {
-            return false;
-        }
-        if (this.handler) {
-            this.handler.activate();
-        }
-        this.active = true;
-        if(this.map) {
-            OpenLayers.Element.addClass(
-                this.map.viewPortDiv,
-                this.displayClass.replace(/ /g, "") + "Active"
-            );
-        }
-        this.events.triggerEvent("activate");
-        return true;
-    },
-    
-    /**
-     * APIMethod: deactivate
-     * Deactivates a control and it's associated handler if any.  The exact
-     * effect of this depends on the control itself.
-     * 
-     * Returns:
-     * {Boolean} True if the control was effectively deactivated or false
-     *           if the control was already inactive.
-     */
-    deactivate: function () {
-        if (this.active) {
-            if (this.handler) {
-                this.handler.deactivate();
-            }
-            this.active = false;
-            if(this.map) {
-                OpenLayers.Element.removeClass(
-                    this.map.viewPortDiv,
-                    this.displayClass.replace(/ /g, "") + "Active"
-                );
-            }
-            this.events.triggerEvent("deactivate");
-            return true;
-        }
-        return false;
-    },
-
-    CLASS_NAME: "OpenLayers.Control"
-});
-
-/**
- * Constant: OpenLayers.Control.TYPE_BUTTON
- */
-OpenLayers.Control.TYPE_BUTTON = 1;
-
-/**
- * Constant: OpenLayers.Control.TYPE_TOGGLE
- */
-OpenLayers.Control.TYPE_TOGGLE = 2;
-
-/**
- * Constant: OpenLayers.Control.TYPE_TOOL
- */
-OpenLayers.Control.TYPE_TOOL   = 3;
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/ArgParser.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/ArgParser.js
deleted file mode 100644
index 6b076f57..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/ArgParser.js
+++ /dev/null
@@ -1,182 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-
-/**
- * @requires OpenLayers/Control.js
- */
-
-/**
- * Class: OpenLayers.Control.ArgParser
- * The ArgParser control adds location bar query string parsing functionality 
- * to an OpenLayers Map.
- * When added to a Map control, on a page load/refresh, the Map will 
- * automatically take the href string and parse it for lon, lat, zoom, and 
- * layers information. 
- *
- * Inherits from:
- *  - <OpenLayers.Control>
- */
-OpenLayers.Control.ArgParser = OpenLayers.Class(OpenLayers.Control, {
-
-    /**
-     * Property: center
-     * {<OpenLayers.LonLat>}
-     */
-    center: null,
-    
-    /**
-     * Property: zoom
-     * {int}
-     */
-    zoom: null,
-
-    /**
-     * Property: layers
-     * {String} Each character represents the state of the corresponding layer 
-     *     on the map.
-     */
-    layers: null,
-    
-    /** 
-     * APIProperty: displayProjection
-     * {<OpenLayers.Projection>} Requires proj4js support. 
-     *     Projection used when reading the coordinates from the URL. This will
-     *     reproject the map coordinates from the URL into the map's
-     *     projection.
-     *
-     *     If you are using this functionality, be aware that any permalink
-     *     which is added to the map will determine the coordinate type which
-     *     is read from the URL, which means you should not add permalinks with
-     *     different displayProjections to the same map. 
-     */
-    displayProjection: null, 
-
-    /**
-     * Constructor: OpenLayers.Control.ArgParser
-     *
-     * Parameters:
-     * options - {Object}
-     */
-
-    /**
-     * Method: getParameters
-     */    
-    getParameters: function(url) {
-        url = url || window.location.href;
-        var parameters = OpenLayers.Util.getParameters(url);
-
-        // If we have an anchor in the url use it to split the url
-        var index = url.indexOf('#');
-        if (index > 0) {
-            // create an url to parse on the getParameters
-            url = '?' + url.substring(index + 1, url.length);
-
-            OpenLayers.Util.extend(parameters,
-                    OpenLayers.Util.getParameters(url));
-        }
-        return parameters;
-    },
-    
-    /**
-     * Method: setMap
-     * Set the map property for the control. 
-     * 
-     * Parameters:
-     * map - {<OpenLayers.Map>} 
-     */
-    setMap: function(map) {
-        OpenLayers.Control.prototype.setMap.apply(this, arguments);
-
-        //make sure we dont already have an arg parser attached
-        for(var i=0, len=this.map.controls.length; i<len; i++) {
-            var control = this.map.controls[i];
-            if ( (control != this) &&
-                 (control.CLASS_NAME == "OpenLayers.Control.ArgParser") ) {
-                
-                // If a second argparser is added to the map, then we 
-                // override the displayProjection to be the one added to the
-                // map. 
-                if (control.displayProjection != this.displayProjection) {
-                    this.displayProjection = control.displayProjection;
-                }    
-                
-                break;
-            }
-        }
-        if (i == this.map.controls.length) {
-
-            var args = this.getParameters();
-            // Be careful to set layer first, to not trigger unnecessary layer loads
-            if (args.layers) {
-                this.layers = args.layers;
-    
-                // when we add a new layer, set its visibility 
-                this.map.events.register('addlayer', this, 
-                                         this.configureLayers);
-                this.configureLayers();
-            }
-            if (args.lat && args.lon) {
-                this.center = new OpenLayers.LonLat(parseFloat(args.lon),
-                                                    parseFloat(args.lat));
-                if (args.zoom) {
-                    this.zoom = parseFloat(args.zoom);
-                }
-    
-                // when we add a new baselayer to see when we can set the center
-                this.map.events.register('changebaselayer', this, 
-                                         this.setCenter);
-                this.setCenter();
-            }
-        }
-    },
-   
-    /** 
-     * Method: setCenter
-     * As soon as a baseLayer has been loaded, we center and zoom
-     *   ...and remove the handler.
-     */
-    setCenter: function() {
-        
-        if (this.map.baseLayer) {
-            //dont need to listen for this one anymore
-            this.map.events.unregister('changebaselayer', this, 
-                                       this.setCenter);
-            
-            if (this.displayProjection) {
-                this.center.transform(this.displayProjection, 
-                                      this.map.getProjectionObject()); 
-            }      
-
-            this.map.setCenter(this.center, this.zoom);
-        }
-    },
-
-    /** 
-     * Method: configureLayers
-     * As soon as all the layers are loaded, cycle through them and 
-     *   hide or show them. 
-     */
-    configureLayers: function() {
-
-        if (this.layers.length == this.map.layers.length) { 
-            this.map.events.unregister('addlayer', this, this.configureLayers);
-
-            for(var i=0, len=this.layers.length; i<len; i++) {
-                
-                var layer = this.map.layers[i];
-                var c = this.layers.charAt(i);
-                
-                if (c == "B") {
-                    this.map.setBaseLayer(layer);
-                } else if ( (c == "T") || (c == "F") ) {
-                    layer.setVisibility(c == "T");
-                }
-            }
-        }
-    },     
-
-    CLASS_NAME: "OpenLayers.Control.ArgParser"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/Attribution.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/Attribution.js
deleted file mode 100644
index e5ea1ce6..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/Attribution.js
+++ /dev/null
@@ -1,104 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Control.js
- */
-
-/**
- * Class: OpenLayers.Control.Attribution
- * The attribution control adds attribution from layers to the map display. 
- * It uses 'attribution' property of each layer.
- *
- * Inherits from:
- *  - <OpenLayers.Control>
- */
-OpenLayers.Control.Attribution = 
-  OpenLayers.Class(OpenLayers.Control, {
-    
-    /**
-     * APIProperty: separator
-     * {String} String used to separate layers.
-     */
-    separator: ", ",
-    
-    /**
-     * APIProperty: template
-     * {String} Template for the attribution. This has to include the substring
-     *     "${layers}", which will be replaced by the layer specific
-     *     attributions, separated by <separator>. The default is "${layers}".
-     */
-    template: "${layers}",
-    
-    /**
-     * Constructor: OpenLayers.Control.Attribution 
-     * 
-     * Parameters:
-     * options - {Object} Options for control.
-     */
-
-    /** 
-     * Method: destroy
-     * Destroy control.
-     */
-    destroy: function() {
-        this.map.events.un({
-            "removelayer": this.updateAttribution,
-            "addlayer": this.updateAttribution,
-            "changelayer": this.updateAttribution,
-            "changebaselayer": this.updateAttribution,
-            scope: this
-        });
-        
-        OpenLayers.Control.prototype.destroy.apply(this, arguments);
-    },    
-    
-    /**
-     * Method: draw
-     * Initialize control.
-     * 
-     * Returns: 
-     * {DOMElement} A reference to the DIV DOMElement containing the control
-     */    
-    draw: function() {
-        OpenLayers.Control.prototype.draw.apply(this, arguments);
-        
-        this.map.events.on({
-            'changebaselayer': this.updateAttribution,
-            'changelayer': this.updateAttribution,
-            'addlayer': this.updateAttribution,
-            'removelayer': this.updateAttribution,
-            scope: this
-        });
-        this.updateAttribution();
-        
-        return this.div;    
-    },
-
-    /**
-     * Method: updateAttribution
-     * Update attribution string.
-     */
-    updateAttribution: function() {
-        var attributions = [];
-        if (this.map && this.map.layers) {
-            for(var i=0, len=this.map.layers.length; i<len; i++) {
-                var layer = this.map.layers[i];
-                if (layer.attribution && layer.getVisibility()) {
-                    // add attribution only if attribution text is unique
-                    if (OpenLayers.Util.indexOf(
-                                    attributions, layer.attribution) === -1) {
-                        attributions.push( layer.attribution );
-                    }
-                }
-            } 
-            this.div.innerHTML = OpenLayers.String.format(this.template, {
-                layers: attributions.join(this.separator)
-            });
-        }
-    },
-
-    CLASS_NAME: "OpenLayers.Control.Attribution"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/Button.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/Button.js
deleted file mode 100644
index 830df6d6..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/Button.js
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Control.js
- */
-
-/**
- * Class: OpenLayers.Control.Button 
- * The Button control is a very simple push-button, for use with 
- * <OpenLayers.Control.Panel>.
- * When clicked, the function trigger() is executed.
- * 
- * Inherits from:
- *  - <OpenLayers.Control>
- *
- * Use:
- * (code)
- * var button = new OpenLayers.Control.Button({
- *     displayClass: "MyButton", trigger: myFunction
- * });
- * panel.addControls([button]);
- * (end)
- * 
- * Will create a button with CSS class MyButtonItemInactive, that
- *     will call the function MyFunction() when clicked.
- */
-OpenLayers.Control.Button = OpenLayers.Class(OpenLayers.Control, {
-    /**
-     * Property: type
-     * {Integer} OpenLayers.Control.TYPE_BUTTON.
-     */
-    type: OpenLayers.Control.TYPE_BUTTON,
-    
-    /**
-     * Method: trigger
-     * Called by a control panel when the button is clicked.
-     */
-    trigger: function() {},
-
-    CLASS_NAME: "OpenLayers.Control.Button"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/CacheRead.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/CacheRead.js
deleted file mode 100644
index 7768bce2..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/CacheRead.js
+++ /dev/null
@@ -1,156 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Control.js
- */
-
-/**
- * Class: OpenLayers.Control.CacheRead
- * A control for using image tiles cached with <OpenLayers.Control.CacheWrite>
- * from the browser's local storage.
- *
- * Inherits from:
- *  - <OpenLayers.Control>
- */
-OpenLayers.Control.CacheRead = OpenLayers.Class(OpenLayers.Control, {
-    
-    /**
-     * APIProperty: fetchEvent
-     * {String} The layer event to listen to for replacing remote resource tile
-     *     URLs with cached data URIs. Supported values are "tileerror" (try
-     *     remote first, fall back to cached) and "tileloadstart" (try cache
-     *     first, fall back to remote). Default is "tileloadstart".
-     *
-     *     Note that "tileerror" will not work for CORS enabled images (see
-     *     https://developer.mozilla.org/en/CORS_Enabled_Image), i.e. layers
-     *     configured with a <OpenLayers.Tile.Image.crossOriginKeyword> in
-     *     <OpenLayers.Layer.Grid.tileOptions>.
-     */
-    fetchEvent: "tileloadstart",
-    
-    /**
-     * APIProperty: layers
-     * {Array(<OpenLayers.Layer.Grid>)}. Optional. If provided, only these
-     *     layers will receive tiles from the cache.
-     */
-    layers: null,
-    
-    /**
-     * APIProperty: autoActivate
-     * {Boolean} Activate the control when it is added to a map.  Default is
-     *     true.
-     */
-    autoActivate: true,
-
-    /**
-     * Constructor: OpenLayers.Control.CacheRead
-     *
-     * Parameters:
-     * options - {Object} Object with API properties for this control
-     */
-    
-    /** 
-     * Method: setMap
-     * Set the map property for the control. 
-     * 
-     * Parameters:
-     * map - {<OpenLayers.Map>} 
-     */
-    setMap: function(map) {
-        OpenLayers.Control.prototype.setMap.apply(this, arguments);
-        var i, layers = this.layers || map.layers;
-        for (i=layers.length-1; i>=0; --i) {
-            this.addLayer({layer: layers[i]});
-        }
-        if (!this.layers) {
-            map.events.on({
-                addlayer: this.addLayer,
-                removeLayer: this.removeLayer,
-                scope: this
-            });
-        }
-    },
-    
-    /**
-     * Method: addLayer
-     * Adds a layer to the control. Once added, tiles requested for this layer
-     *     will be cached.
-     *
-     * Parameters:
-     * evt - {Object} Object with a layer property referencing an
-     *     <OpenLayers.Layer> instance
-     */
-    addLayer: function(evt) {
-        evt.layer.events.register(this.fetchEvent, this, this.fetch);        
-    },
-    
-    /**
-     * Method: removeLayer
-     * Removes a layer from the control. Once removed, tiles requested for this
-     *     layer will no longer be cached.
-     *
-     * Parameters:
-     * evt - {Object} Object with a layer property referencing an
-     *     <OpenLayers.Layer> instance
-     */
-    removeLayer: function(evt) {
-        evt.layer.events.unregister(this.fetchEvent, this, this.fetch);
-    },
-    
-    /**
-     * Method: fetch
-     * Listener to the <fetchEvent> event. Replaces a tile's url with a data
-     * URI from the cache.
-     *
-     * Parameters:
-     * evt - {Object} Event object with a tile property.
-     */
-    fetch: function(evt) {
-        if (this.active && window.localStorage &&
-                evt.tile instanceof OpenLayers.Tile.Image) {
-            var tile = evt.tile,
-                url = tile.url;
-            // deal with modified tile urls when both CacheWrite and CacheRead
-            // are active
-            if (!tile.layer.crossOriginKeyword && OpenLayers.ProxyHost &&
-                    url.indexOf(OpenLayers.ProxyHost) === 0) {
-                url = OpenLayers.Control.CacheWrite.urlMap[url];        
-            }
-            var dataURI = window.localStorage.getItem("olCache_" + url);
-            if (dataURI) {
-                tile.url = dataURI;
-                if (evt.type === "tileerror") {
-                    tile.setImgSrc(dataURI);
-                }
-            }
-        }
-    },
-    
-    /**
-     * Method: destroy
-     * The destroy method is used to perform any clean up before the control
-     * is dereferenced.  Typically this is where event listeners are removed
-     * to prevent memory leaks.
-     */
-    destroy: function() {
-        if (this.layers || this.map) {
-            var i, layers = this.layers || this.map.layers;
-            for (i=layers.length-1; i>=0; --i) {
-                this.removeLayer({layer: layers[i]});
-            }
-        }
-        if (this.map) {
-            this.map.events.un({
-                addlayer: this.addLayer,
-                removeLayer: this.removeLayer,
-                scope: this
-            });
-        }
-        OpenLayers.Control.prototype.destroy.apply(this, arguments);
-    },
-    
-    CLASS_NAME: "OpenLayers.Control.CacheRead"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/CacheWrite.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/CacheWrite.js
deleted file mode 100644
index 3d4ecf51..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/CacheWrite.js
+++ /dev/null
@@ -1,257 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Control.js
- * @requires OpenLayers/Request.js
- * @requires OpenLayers/Console.js
- */
-
-/**
- * Class: OpenLayers.Control.CacheWrite
- * A control for caching image tiles in the browser's local storage. The
- * <OpenLayers.Control.CacheRead> control is used to fetch and use the cached
- * tile images.
- *
- * Note: Before using this control on any layer that is not your own, make sure
- * that the terms of service of the tile provider allow local storage of tiles.
- *
- * Inherits from:
- *  - <OpenLayers.Control>
- */
-OpenLayers.Control.CacheWrite = OpenLayers.Class(OpenLayers.Control, {
-    
-    /** 
-     * APIProperty: events
-     * {<OpenLayers.Events>} Events instance for listeners and triggering
-     *     control specific events.
-     *
-     * To register events in the constructor, configure <eventListeners>.
-     *
-     * Register a listener for a particular event with the following syntax:
-     * (code)
-     * control.events.register(type, obj, listener);
-     * (end)
-     *
-     * Supported event types (in addition to those from <OpenLayers.Control.events>):
-     * cachefull - Triggered when the cache is full. Listeners receive an
-     *     object with a tile property as first argument. The tile references
-     *     the tile that couldn't be cached.
-     */
-    
-    /**
-     * APIProperty: eventListeners
-     * {Object} Object with event listeners, keyed by event name. An optional
-     *     scope property defines the scope that listeners will be executed in.
-     */
-
-    /**
-     * APIProperty: layers
-     * {Array(<OpenLayers.Layer.Grid>)}. Optional. If provided, caching
-     *     will be enabled for these layers only, otherwise for all cacheable
-     *     layers.
-     */
-    layers: null,
-    
-    /**
-     * APIProperty: imageFormat
-     * {String} The image format used for caching. The default is "image/png".
-     *     Supported formats depend on the user agent. If an unsupported
-     *     <imageFormat> is provided, "image/png" will be used. For aerial
-     *     imagery, "image/jpeg" is recommended.
-     */
-    imageFormat: "image/png",
-    
-    /**
-     * Property: quotaRegEx
-     * {RegExp}
-     */
-    quotaRegEx: (/quota/i),
-    
-    /**
-     * Constructor: OpenLayers.Control.CacheWrite
-     *
-     * Parameters:
-     * options - {Object} Object with API properties for this control.
-     */
-
-    /** 
-     * Method: setMap
-     * Set the map property for the control. 
-     * 
-     * Parameters:
-     * map - {<OpenLayers.Map>} 
-     */
-    setMap: function(map) {
-        OpenLayers.Control.prototype.setMap.apply(this, arguments);
-        var i, layers = this.layers || map.layers;
-        for (i=layers.length-1; i>=0; --i) {
-            this.addLayer({layer: layers[i]});
-        }
-        if (!this.layers) {
-            map.events.on({
-                addlayer: this.addLayer,
-                removeLayer: this.removeLayer,
-                scope: this
-            });
-        }
-    },
-    
-    /**
-     * Method: addLayer
-     * Adds a layer to the control. Once added, tiles requested for this layer
-     *     will be cached.
-     *
-     * Parameters:
-     * evt - {Object} Object with a layer property referencing an
-     *     <OpenLayers.Layer> instance
-     */
-    addLayer: function(evt) {
-        evt.layer.events.on({
-            tileloadstart: this.makeSameOrigin,
-            tileloaded: this.onTileLoaded,
-            scope: this
-        });        
-    },
-    
-    /**
-     * Method: removeLayer
-     * Removes a layer from the control. Once removed, tiles requested for this
-     *     layer will no longer be cached.
-     *
-     * Parameters:
-     * evt - {Object} Object with a layer property referencing an
-     *     <OpenLayers.Layer> instance
-     */
-    removeLayer: function(evt) {
-        evt.layer.events.un({
-            tileloadstart: this.makeSameOrigin,
-            tileloaded: this.onTileLoaded,
-            scope: this
-        });
-    },
-
-    /**
-     * Method: makeSameOrigin
-     * If the tile does not have CORS image loading enabled and is from a
-     * different origin, use OpenLayers.ProxyHost to make it a same origin url.
-     *
-     * Parameters:
-     * evt - {<OpenLayers.Event>}
-     */
-    makeSameOrigin: function(evt) {
-        if (this.active) {
-            var tile = evt.tile;
-            if (tile instanceof OpenLayers.Tile.Image &&
-                    !tile.crossOriginKeyword &&
-                    tile.url.substr(0, 5) !== "data:") {
-                var sameOriginUrl = OpenLayers.Request.makeSameOrigin(
-                    tile.url, OpenLayers.ProxyHost
-                );
-                OpenLayers.Control.CacheWrite.urlMap[sameOriginUrl] = tile.url;
-                tile.url = sameOriginUrl;
-            }
-        }
-    },
-    
-    /**
-     * Method: onTileLoaded
-     * Decides whether a tile can be cached and calls the cache method.
-     *
-     * Parameters:
-     * evt - {Event}
-     */
-    onTileLoaded: function(evt) {
-        if (this.active && !evt.aborted &&
-                evt.tile instanceof OpenLayers.Tile.Image &&
-                evt.tile.url.substr(0, 5) !== 'data:') {
-            this.cache({tile: evt.tile});
-            delete OpenLayers.Control.CacheWrite.urlMap[evt.tile.url];
-        }
-    },
-    
-    /**
-     * Method: cache
-     * Adds a tile to the cache. When the cache is full, the "cachefull" event
-     * is triggered.
-     *
-     * Parameters:
-     * obj - {Object} Object with a tile property, tile being the
-     *     <OpenLayers.Tile.Image> with the data to add to the cache
-     */
-    cache: function(obj) {
-        if (window.localStorage) {
-            var tile = obj.tile;
-            try {
-                var canvasContext = tile.getCanvasContext();
-                if (canvasContext) {
-                    var urlMap = OpenLayers.Control.CacheWrite.urlMap;
-                    var url = urlMap[tile.url] || tile.url;
-                    window.localStorage.setItem(
-                        "olCache_" + url,
-                        canvasContext.canvas.toDataURL(this.imageFormat)
-                    );
-                }
-            } catch(e) {
-                // local storage full or CORS violation
-                var reason = e.name || e.message;
-                if (reason && this.quotaRegEx.test(reason)) {
-                    this.events.triggerEvent("cachefull", {tile: tile});
-                } else {
-                    OpenLayers.Console.error(e.toString());
-                }
-            }
-        }
-    },
-    
-    /**
-     * Method: destroy
-     * The destroy method is used to perform any clean up before the control
-     * is dereferenced.  Typically this is where event listeners are removed
-     * to prevent memory leaks.
-     */
-    destroy: function() {
-        if (this.layers || this.map) {
-            var i, layers = this.layers || this.map.layers;
-            for (i=layers.length-1; i>=0; --i) {
-                this.removeLayer({layer: layers[i]});
-            }
-        }
-        if (this.map) {
-            this.map.events.un({
-                addlayer: this.addLayer,
-                removeLayer: this.removeLayer,
-                scope: this
-            });
-        }
-        OpenLayers.Control.prototype.destroy.apply(this, arguments);
-    },
-    
-    CLASS_NAME: "OpenLayers.Control.CacheWrite"
-});
-
-/**
- * APIFunction: OpenLayers.Control.CacheWrite.clearCache
- * Clears all tiles cached with <OpenLayers.Control.CacheWrite> from the cache.
- */
-OpenLayers.Control.CacheWrite.clearCache = function() {
-    if (!window.localStorage) { return; }
-    var i, key;
-    for (i=window.localStorage.length-1; i>=0; --i) {
-        key = window.localStorage.key(i);
-        if (key.substr(0, 8) === "olCache_") {
-            window.localStorage.removeItem(key);
-        }
-    }
-};
-
-/**
- * Property: OpenLayers.Control.CacheWrite.urlMap
- * {Object} Mapping of same origin urls to cache url keys. Entries will be
- *     deleted as soon as a tile was cached.
- */
-OpenLayers.Control.CacheWrite.urlMap = {};
-
-
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/DragFeature.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/DragFeature.js
deleted file mode 100644
index d8fb15f9..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/DragFeature.js
+++ /dev/null
@@ -1,366 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-
-/**
- * @requires OpenLayers/Control.js
- * @requires OpenLayers/Handler/Drag.js
- * @requires OpenLayers/Handler/Feature.js
- */
-
-/**
- * Class: OpenLayers.Control.DragFeature
- * The DragFeature control moves a feature with a drag of the mouse. Create a
- * new control with the <OpenLayers.Control.DragFeature> constructor.
- *
- * Inherits From:
- *  - <OpenLayers.Control>
- */
-OpenLayers.Control.DragFeature = OpenLayers.Class(OpenLayers.Control, {
-
-    /**
-     * APIProperty: geometryTypes
-     * {Array(String)} To restrict dragging to a limited set of geometry types,
-     *     send a list of strings corresponding to the geometry class names.
-     */
-    geometryTypes: null,
-    
-    /**
-     * APIProperty: onStart
-     * {Function} Define this function if you want to know when a drag starts.
-     *     The function should expect to receive two arguments: the feature
-     *     that is about to be dragged and the pixel location of the mouse.
-     *
-     * Parameters:
-     * feature - {<OpenLayers.Feature.Vector>} The feature that is about to be
-     *     dragged.
-     * pixel - {<OpenLayers.Pixel>} The pixel location of the mouse.
-     */
-    onStart: function(feature, pixel) {},
-
-    /**
-     * APIProperty: onDrag
-     * {Function} Define this function if you want to know about each move of a
-     *     feature. The function should expect to receive two arguments: the
-     *     feature that is being dragged and the pixel location of the mouse.
-     *
-     * Parameters:
-     * feature - {<OpenLayers.Feature.Vector>} The feature that was dragged.
-     * pixel - {<OpenLayers.Pixel>} The pixel location of the mouse.
-     */
-    onDrag: function(feature, pixel) {},
-
-    /**
-     * APIProperty: onComplete
-     * {Function} Define this function if you want to know when a feature is
-     *     done dragging. The function should expect to receive two arguments:
-     *     the feature that is being dragged and the pixel location of the
-     *     mouse.
-     *
-     * Parameters:
-     * feature - {<OpenLayers.Feature.Vector>} The feature that was dragged.
-     * pixel - {<OpenLayers.Pixel>} The pixel location of the mouse.
-     */
-    onComplete: function(feature, pixel) {},
-
-    /**
-     * APIProperty: onEnter
-     * {Function} Define this function if you want to know when the mouse
-     *     goes over a feature and thereby makes this feature a candidate
-     *     for dragging.
-     *
-     * Parameters:
-     * feature - {<OpenLayers.Feature.Vector>} The feature that is ready
-     *     to be dragged.
-     */
-    onEnter: function(feature) {},
-
-    /**
-     * APIProperty: onLeave
-     * {Function} Define this function if you want to know when the mouse
-     *     goes out of the feature that was dragged.
-     *
-     * Parameters:
-     * feature - {<OpenLayers.Feature.Vector>} The feature that was dragged.
-     */
-    onLeave: function(feature) {},
-
-    /**
-     * APIProperty: documentDrag
-     * {Boolean} If set to true, mouse dragging will continue even if the
-     *     mouse cursor leaves the map viewport. Default is false.
-     */
-    documentDrag: false,
-    
-    /**
-     * Property: layer
-     * {<OpenLayers.Layer.Vector>}
-     */
-    layer: null,
-    
-    /**
-     * Property: feature
-     * {<OpenLayers.Feature.Vector>}
-     */
-    feature: null,
-
-    /**
-     * Property: dragCallbacks
-     * {Object} The functions that are sent to the drag handler for callback.
-     */
-    dragCallbacks: {},
-
-    /**
-     * Property: featureCallbacks
-     * {Object} The functions that are sent to the feature handler for callback.
-     */
-    featureCallbacks: {},
-    
-    /**
-     * Property: lastPixel
-     * {<OpenLayers.Pixel>}
-     */
-    lastPixel: null,
-
-    /**
-     * Constructor: OpenLayers.Control.DragFeature
-     * Create a new control to drag features.
-     *
-     * Parameters:
-     * layer - {<OpenLayers.Layer.Vector>} The layer containing features to be
-     *     dragged.
-     * options - {Object} Optional object whose properties will be set on the
-     *     control.
-     */
-    initialize: function(layer, options) {
-        OpenLayers.Control.prototype.initialize.apply(this, [options]);
-        this.layer = layer;
-        this.handlers = {
-            drag: new OpenLayers.Handler.Drag(
-                this, OpenLayers.Util.extend({
-                    down: this.downFeature,
-                    move: this.moveFeature,
-                    up: this.upFeature,
-                    out: this.cancel,
-                    done: this.doneDragging
-                }, this.dragCallbacks), {
-                    documentDrag: this.documentDrag
-                }
-            ),
-            feature: new OpenLayers.Handler.Feature(
-                this, this.layer, OpenLayers.Util.extend({
-                    // 'click' and 'clickout' callback are for the mobile
-                    // support: no 'over' or 'out' in touch based browsers.
-                    click: this.clickFeature,
-                    clickout: this.clickoutFeature,
-                    over: this.overFeature,
-                    out: this.outFeature
-                }, this.featureCallbacks),
-                {geometryTypes: this.geometryTypes}
-            )
-        };
-    },
-
-    /**
-     * Method: clickFeature
-     * Called when the feature handler detects a click-in on a feature.
-     *
-     * Parameters:
-     * feature - {<OpenLayers.Feature.Vector>}
-     */
-    clickFeature: function(feature) {
-        if (this.handlers.feature.touch && !this.over && this.overFeature(feature)) {
-            this.handlers.drag.dragstart(this.handlers.feature.evt);
-            // to let the events propagate to the feature handler (click callback)
-            this.handlers.drag.stopDown = false;
-        }
-    },
-
-    /**
-     * Method: clickoutFeature
-     * Called when the feature handler detects a click-out on a feature.
-     *
-     * Parameters:
-     * feature - {<OpenLayers.Feature.Vector>}
-     */
-    clickoutFeature: function(feature) {
-        if (this.handlers.feature.touch && this.over) {
-            this.outFeature(feature);
-            this.handlers.drag.stopDown = true;
-        }
-    },
-
-    /**
-     * APIMethod: destroy
-     * Take care of things that are not handled in superclass
-     */
-    destroy: function() {
-        this.layer = null;
-        OpenLayers.Control.prototype.destroy.apply(this, []);
-    },
-
-    /**
-     * APIMethod: activate
-     * Activate the control and the feature handler.
-     * 
-     * Returns:
-     * {Boolean} Successfully activated the control and feature handler.
-     */
-    activate: function() {
-        return (this.handlers.feature.activate() &&
-                OpenLayers.Control.prototype.activate.apply(this, arguments));
-    },
-
-    /**
-     * APIMethod: deactivate
-     * Deactivate the control and all handlers.
-     * 
-     * Returns:
-     * {Boolean} Successfully deactivated the control.
-     */
-    deactivate: function() {
-        // the return from the handlers is unimportant in this case
-        this.handlers.drag.deactivate();
-        this.handlers.feature.deactivate();
-        this.feature = null;
-        this.dragging = false;
-        this.lastPixel = null;
-        OpenLayers.Element.removeClass(
-            this.map.viewPortDiv, this.displayClass + "Over"
-        );
-        return OpenLayers.Control.prototype.deactivate.apply(this, arguments);
-    },
-
-    /**
-     * Method: overFeature
-     * Called when the feature handler detects a mouse-over on a feature.
-     *     This activates the drag handler.
-     *
-     * Parameters:
-     * feature - {<OpenLayers.Feature.Vector>} The selected feature.
-     *
-     * Returns:
-     * {Boolean} Successfully activated the drag handler.
-     */
-    overFeature: function(feature) {
-        var activated = false;
-        if(!this.handlers.drag.dragging) {
-            this.feature = feature;
-            this.handlers.drag.activate();
-            activated = true;
-            this.over = true;
-            OpenLayers.Element.addClass(this.map.viewPortDiv, this.displayClass + "Over");
-            this.onEnter(feature);
-        } else {
-            if(this.feature.id == feature.id) {
-                this.over = true;
-            } else {
-                this.over = false;
-            }
-        }
-        return activated;
-    },
-
-    /**
-     * Method: downFeature
-     * Called when the drag handler detects a mouse-down.
-     *
-     * Parameters:
-     * pixel - {<OpenLayers.Pixel>} Location of the mouse event.
-     */
-    downFeature: function(pixel) {
-        this.lastPixel = pixel;
-        this.onStart(this.feature, pixel);
-    },
-
-    /**
-     * Method: moveFeature
-     * Called when the drag handler detects a mouse-move.  Also calls the
-     *     optional onDrag method.
-     * 
-     * Parameters:
-     * pixel - {<OpenLayers.Pixel>} Location of the mouse event.
-     */
-    moveFeature: function(pixel) {
-        var res = this.map.getResolution();
-        this.feature.geometry.move(res * (pixel.x - this.lastPixel.x),
-                                   res * (this.lastPixel.y - pixel.y));
-        this.layer.drawFeature(this.feature);
-        this.lastPixel = pixel;
-        this.onDrag(this.feature, pixel);
-    },
-
-    /**
-     * Method: upFeature
-     * Called when the drag handler detects a mouse-up.
-     * 
-     * Parameters:
-     * pixel - {<OpenLayers.Pixel>} Location of the mouse event.
-     */
-    upFeature: function(pixel) {
-        if(!this.over) {
-            this.handlers.drag.deactivate();
-        }
-    },
-
-    /**
-     * Method: doneDragging
-     * Called when the drag handler is done dragging.
-     *
-     * Parameters:
-     * pixel - {<OpenLayers.Pixel>} The last event pixel location.  If this event
-     *     came from a mouseout, this may not be in the map viewport.
-     */
-    doneDragging: function(pixel) {
-        this.onComplete(this.feature, pixel);
-    },
-
-    /**
-     * Method: outFeature
-     * Called when the feature handler detects a mouse-out on a feature.
-     *
-     * Parameters:
-     * feature - {<OpenLayers.Feature.Vector>} The feature that the mouse left.
-     */
-    outFeature: function(feature) {
-        if(!this.handlers.drag.dragging) {
-            this.over = false;
-            this.handlers.drag.deactivate();
-            OpenLayers.Element.removeClass(
-                this.map.viewPortDiv, this.displayClass + "Over"
-            );
-            this.onLeave(feature);
-            this.feature = null;
-        } else {
-            if(this.feature.id == feature.id) {
-                this.over = false;
-            }
-        }
-    },
-        
-    /**
-     * Method: cancel
-     * Called when the drag handler detects a mouse-out (from the map viewport).
-     */
-    cancel: function() {
-        this.handlers.drag.deactivate();
-        this.over = false;
-    },
-
-    /**
-     * Method: setMap
-     * Set the map property for the control and all handlers.
-     *
-     * Parameters: 
-     * map - {<OpenLayers.Map>} The control's map.
-     */
-    setMap: function(map) {
-        this.handlers.drag.setMap(map);
-        this.handlers.feature.setMap(map);
-        OpenLayers.Control.prototype.setMap.apply(this, arguments);
-    },
-
-    CLASS_NAME: "OpenLayers.Control.DragFeature"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/DragPan.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/DragPan.js
deleted file mode 100644
index 981a649f..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/DragPan.js
+++ /dev/null
@@ -1,156 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Control.js
- * @requires OpenLayers/Handler/Drag.js
- */
-
-/**
- * Class: OpenLayers.Control.DragPan
- * The DragPan control pans the map with a drag of the mouse.
- *
- * Inherits from:
- *  - <OpenLayers.Control>
- */
-OpenLayers.Control.DragPan = OpenLayers.Class(OpenLayers.Control, {
-
-    /** 
-     * Property: type
-     * {OpenLayers.Control.TYPES}
-     */
-    type: OpenLayers.Control.TYPE_TOOL,
-    
-    /**
-     * Property: panned
-     * {Boolean} The map moved.
-     */
-    panned: false,
-    
-    /**
-     * Property: interval
-     * {Integer} The number of milliseconds that should ellapse before
-     *     panning the map again. Defaults to 0 milliseconds, which means that
-     *     no separate cycle is used for panning. In most cases you won't want
-     *     to change this value. For slow machines/devices larger values can be
-     *     tried out.
-     */
-    interval: 0,
-    
-    /**
-     * APIProperty: documentDrag
-     * {Boolean} If set to true, mouse dragging will continue even if the
-     *     mouse cursor leaves the map viewport. Default is false.
-     */
-    documentDrag: false,
-
-    /**
-     * Property: kinetic
-     * {<OpenLayers.Kinetic>} The OpenLayers.Kinetic object.
-     */
-    kinetic: null,
-
-    /**
-     * APIProperty: enableKinetic
-     * {Boolean} Set this option to enable "kinetic dragging". Can be
-     *     set to true or to an object. If set to an object this
-     *     object will be passed to the {<OpenLayers.Kinetic>}
-     *     constructor. Defaults to true.
-     *     To get kinetic dragging, ensure that OpenLayers/Kinetic.js is
-     *     included in your build config.
-     */
-    enableKinetic: true,
-
-    /**
-     * APIProperty: kineticInterval
-     * {Integer} Interval in milliseconds between 2 steps in the "kinetic
-     *     scrolling". Applies only if enableKinetic is set. Defaults
-     *     to 10 milliseconds.
-     */
-    kineticInterval: 10,
-
-
-    /**
-     * Method: draw
-     * Creates a Drag handler, using <panMap> and
-     * <panMapDone> as callbacks.
-     */    
-    draw: function() {
-        if (this.enableKinetic && OpenLayers.Kinetic) {
-            var config = {interval: this.kineticInterval};
-            if(typeof this.enableKinetic === "object") {
-                config = OpenLayers.Util.extend(config, this.enableKinetic);
-            }
-            this.kinetic = new OpenLayers.Kinetic(config);
-        }
-        this.handler = new OpenLayers.Handler.Drag(this, {
-                "move": this.panMap,
-                "done": this.panMapDone,
-                "down": this.panMapStart
-            }, {
-                interval: this.interval,
-                documentDrag: this.documentDrag
-            }
-        );
-    },
-
-    /**
-     * Method: panMapStart
-     */
-    panMapStart: function() {
-        if(this.kinetic) {
-            this.kinetic.begin();
-        }
-    },
-
-    /**
-    * Method: panMap
-    *
-    * Parameters:
-    * xy - {<OpenLayers.Pixel>} Pixel of the mouse position
-    */
-    panMap: function(xy) {
-        if(this.kinetic) {
-            this.kinetic.update(xy);
-        }
-        this.panned = true;
-        this.map.pan(
-            this.handler.last.x - xy.x,
-            this.handler.last.y - xy.y,
-            {dragging: true, animate: false}
-        );
-    },
-    
-    /**
-     * Method: panMapDone
-     * Finish the panning operation.  Only call setCenter (through <panMap>)
-     *     if the map has actually been moved.
-     *
-     * Parameters:
-     * xy - {<OpenLayers.Pixel>} Pixel of the mouse position
-     */
-    panMapDone: function(xy) {
-        if(this.panned) {
-            var res = null;
-            if (this.kinetic) {
-                res = this.kinetic.end(xy);
-            }
-            this.map.pan(
-                this.handler.last.x - xy.x,
-                this.handler.last.y - xy.y,
-                {dragging: !!res, animate: false}
-            );
-            if (res) {
-                var self = this;
-                this.kinetic.move(res, function(x, y, end) {
-                    self.map.pan(x, y, {dragging: !end, animate: false});
-                });
-            }
-            this.panned = false;
-        }
-    },
-
-    CLASS_NAME: "OpenLayers.Control.DragPan"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/DrawFeature.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/DrawFeature.js
deleted file mode 100644
index b0afc71a..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/DrawFeature.js
+++ /dev/null
@@ -1,229 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-
-/**
- * @requires OpenLayers/Control.js
- * @requires OpenLayers/Feature/Vector.js
- */
-
-/**
- * Class: OpenLayers.Control.DrawFeature
- * The DrawFeature control draws point, line or polygon features on a vector
- * layer when active.
- *
- * Inherits from:
- *  - <OpenLayers.Control>
- */
-OpenLayers.Control.DrawFeature = OpenLayers.Class(OpenLayers.Control, {
-    
-    /**
-     * Property: layer
-     * {<OpenLayers.Layer.Vector>}
-     */
-    layer: null,
-
-    /**
-     * Property: callbacks
-     * {Object} The functions that are sent to the handler for callback
-     */
-    callbacks: null,
-    
-    /** 
-     * APIProperty: events
-     * {<OpenLayers.Events>} Events instance for listeners and triggering
-     *     control specific events.
-     *
-     * Register a listener for a particular event with the following syntax:
-     * (code)
-     * control.events.register(type, obj, listener);
-     * (end)
-     *
-     * Supported event types (in addition to those from <OpenLayers.Control.events>):
-     * featureadded - Triggered when a feature is added
-     */
-    
-    /**
-     * APIProperty: multi
-     * {Boolean} Cast features to multi-part geometries before passing to the
-     *     layer.  Default is false.
-     */
-    multi: false,
-
-    /**
-     * APIProperty: featureAdded
-     * {Function} Called after each feature is added
-     */
-    featureAdded: function() {},
-
-    /**
-     * APIProperty: handlerOptions
-     * {Object} Used to set non-default properties on the control's handler
-     */
-    
-    /**
-     * Constructor: OpenLayers.Control.DrawFeature
-     * 
-     * Parameters:
-     * layer - {<OpenLayers.Layer.Vector>} 
-     * handler - {<OpenLayers.Handler>} 
-     * options - {Object} 
-     */
-    initialize: function(layer, handler, options) {
-        OpenLayers.Control.prototype.initialize.apply(this, [options]);
-        this.callbacks = OpenLayers.Util.extend(
-            {
-                done: this.drawFeature,
-                modify: function(vertex, feature) {
-                    this.layer.events.triggerEvent(
-                        "sketchmodified", {vertex: vertex, feature: feature}
-                    );
-                },
-                create: function(vertex, feature) {
-                    this.layer.events.triggerEvent(
-                        "sketchstarted", {vertex: vertex, feature: feature}
-                    );
-                }
-            },
-            this.callbacks
-        );
-        this.layer = layer;
-        this.handlerOptions = this.handlerOptions || {};
-        this.handlerOptions.layerOptions = OpenLayers.Util.applyDefaults(
-            this.handlerOptions.layerOptions, {
-                renderers: layer.renderers, rendererOptions: layer.rendererOptions
-            }
-        );
-        if (!("multi" in this.handlerOptions)) {
-            this.handlerOptions.multi = this.multi;
-        }
-        var sketchStyle = this.layer.styleMap && this.layer.styleMap.styles.temporary;
-        if(sketchStyle) {
-            this.handlerOptions.layerOptions = OpenLayers.Util.applyDefaults(
-                this.handlerOptions.layerOptions,
-                {styleMap: new OpenLayers.StyleMap({"default": sketchStyle})}
-            );
-        }
-        this.handler = new handler(this, this.callbacks, this.handlerOptions);
-    },
-
-    /**
-     * Method: drawFeature
-     */
-    drawFeature: function(geometry) {
-        var feature = new OpenLayers.Feature.Vector(geometry);
-        var proceed = this.layer.events.triggerEvent(
-            "sketchcomplete", {feature: feature}
-        );
-        if(proceed !== false) {
-            feature.state = OpenLayers.State.INSERT;
-            this.layer.addFeatures([feature]);
-            this.featureAdded(feature);
-            this.events.triggerEvent("featureadded",{feature : feature});
-        }
-    },
-    
-    /**
-     * APIMethod: insertXY
-     * Insert a point in the current sketch given x & y coordinates.
-     *
-     * Parameters:
-     * x - {Number} The x-coordinate of the point.
-     * y - {Number} The y-coordinate of the point.
-     */
-    insertXY: function(x, y) {
-        if (this.handler && this.handler.line) {
-            this.handler.insertXY(x, y);
-        }
-    },
-
-    /**
-     * APIMethod: insertDeltaXY
-     * Insert a point given offsets from the previously inserted point.
-     *
-     * Parameters:
-     * dx - {Number} The x-coordinate offset of the point.
-     * dy - {Number} The y-coordinate offset of the point.
-     */
-    insertDeltaXY: function(dx, dy) {
-        if (this.handler && this.handler.line) {
-            this.handler.insertDeltaXY(dx, dy);
-        }
-    },
-
-    /**
-     * APIMethod: insertDirectionLength
-     * Insert a point in the current sketch given a direction and a length.
-     *
-     * Parameters:
-     * direction - {Number} Degrees clockwise from the positive x-axis.
-     * length - {Number} Distance from the previously drawn point.
-     */
-    insertDirectionLength: function(direction, length) {
-        if (this.handler && this.handler.line) {
-            this.handler.insertDirectionLength(direction, length);
-        }
-    },
-
-    /**
-     * APIMethod: insertDeflectionLength
-     * Insert a point in the current sketch given a deflection and a length.
-     *     The deflection should be degrees clockwise from the previously 
-     *     digitized segment.
-     *
-     * Parameters:
-     * deflection - {Number} Degrees clockwise from the previous segment.
-     * length - {Number} Distance from the previously drawn point.
-     */
-    insertDeflectionLength: function(deflection, length) {
-        if (this.handler && this.handler.line) {
-            this.handler.insertDeflectionLength(deflection, length);
-        }
-    },
-    
-    /**
-     * APIMethod: undo
-     * Remove the most recently added point in the current sketch geometry.
-     *
-     * Returns: 
-     * {Boolean} An edit was undone.
-     */
-    undo: function() {
-        return this.handler.undo && this.handler.undo();
-    },
-    
-    /**
-     * APIMethod: redo
-     * Reinsert the most recently removed point resulting from an <undo> call.
-     *     The undo stack is deleted whenever a point is added by other means.
-     *
-     * Returns: 
-     * {Boolean} An edit was redone.
-     */
-    redo: function() {
-        return this.handler.redo && this.handler.redo();
-    },
-    
-    /**
-     * APIMethod: finishSketch
-     * Finishes the sketch without including the currently drawn point.
-     *     This method can be called to terminate drawing programmatically
-     *     instead of waiting for the user to end the sketch.
-     */
-    finishSketch: function() {
-        this.handler.finishGeometry();
-    },
-
-    /**
-     * APIMethod: cancel
-     * Cancel the current sketch.  This removes the current sketch and keeps
-     *     the drawing control active.
-     */
-    cancel: function() {
-        this.handler.cancel();
-    },
-
-    CLASS_NAME: "OpenLayers.Control.DrawFeature"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/EditingToolbar.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/EditingToolbar.js
deleted file mode 100644
index ba7ca401..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/EditingToolbar.js
+++ /dev/null
@@ -1,81 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Control/Panel.js
- * @requires OpenLayers/Control/Navigation.js
- * @requires OpenLayers/Control/DrawFeature.js
- * @requires OpenLayers/Handler/Point.js
- * @requires OpenLayers/Handler/Path.js
- * @requires OpenLayers/Handler/Polygon.js
- */
-
-/**
- * Class: OpenLayers.Control.EditingToolbar 
- * The EditingToolbar is a panel of 4 controls to draw polygons, lines, 
- * points, or to navigate the map by panning. By default it appears in the 
- * upper right corner of the map.
- * 
- * Inherits from:
- *  - <OpenLayers.Control.Panel>
- */
-OpenLayers.Control.EditingToolbar = OpenLayers.Class(
-  OpenLayers.Control.Panel, {
-
-    /**
-     * APIProperty: citeCompliant
-     * {Boolean} If set to true, coordinates of features drawn in a map extent
-     * crossing the date line won't exceed the world bounds. Default is false.
-     */
-    citeCompliant: false,
-
-    /**
-     * Constructor: OpenLayers.Control.EditingToolbar
-     * Create an editing toolbar for a given layer. 
-     *
-     * Parameters:
-     * layer - {<OpenLayers.Layer.Vector>} 
-     * options - {Object} 
-     */
-    initialize: function(layer, options) {
-        OpenLayers.Control.Panel.prototype.initialize.apply(this, [options]);
-        
-        this.addControls(
-          [ new OpenLayers.Control.Navigation() ]
-        );  
-        var controls = [
-            new OpenLayers.Control.DrawFeature(layer, OpenLayers.Handler.Point, {
-                displayClass: 'olControlDrawFeaturePoint',
-                handlerOptions: {citeCompliant: this.citeCompliant}
-            }),
-            new OpenLayers.Control.DrawFeature(layer, OpenLayers.Handler.Path, {
-                displayClass: 'olControlDrawFeaturePath',
-                handlerOptions: {citeCompliant: this.citeCompliant}
-            }),
-            new OpenLayers.Control.DrawFeature(layer, OpenLayers.Handler.Polygon, {
-                displayClass: 'olControlDrawFeaturePolygon',
-                handlerOptions: {citeCompliant: this.citeCompliant}
-            })
-        ];
-        this.addControls(controls);
-    },
-
-    /**
-     * Method: draw
-     * calls the default draw, and then activates mouse defaults.
-     *
-     * Returns:
-     * {DOMElement}
-     */
-    draw: function() {
-        var div = OpenLayers.Control.Panel.prototype.draw.apply(this, arguments);
-        if (this.defaultControl === null) {
-            this.defaultControl = this.controls[0];
-        }
-        return div;
-    },
-
-    CLASS_NAME: "OpenLayers.Control.EditingToolbar"
-});    
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/Geolocate.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/Geolocate.js
deleted file mode 100644
index 4b5b4395..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/Geolocate.js
+++ /dev/null
@@ -1,192 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Control.js
- * @requires OpenLayers/Geometry/Point.js
- * @requires OpenLayers/Projection.js
- */
-
-/**
- * Class: OpenLayers.Control.Geolocate
- * The Geolocate control wraps w3c geolocation API into control that can be
- * bound to a map, and generate events on location update
- *
- * To use this control requires to load the proj4js library if the projection
- * of the map is not EPSG:4326 or EPSG:900913.
- *
- * Inherits from:
- *  - <OpenLayers.Control>
- */
-OpenLayers.Control.Geolocate = OpenLayers.Class(OpenLayers.Control, {
-
-    /** 
-     * APIProperty: events
-     * {<OpenLayers.Events>} Events instance for listeners and triggering
-     *     control specific events.
-     *
-     * Register a listener for a particular event with the following syntax:
-     * (code)
-     * control.events.register(type, obj, listener);
-     * (end)
-     *
-     * Supported event types (in addition to those from <OpenLayers.Control.events>):
-     * locationupdated - Triggered when browser return a new position. Listeners will 
-     *     receive an object with a 'position' property which is the browser.geolocation.position
-     *     native object, as well as a 'point' property which is the location transformed in the 
-     *     current map projection.
-     * locationfailed - Triggered when geolocation has failed
-     * locationuncapable - Triggered when control is activated on a browser
-     *     which doesn't support geolocation
-     */
-
-    /**
-     * Property: geolocation
-     * {Object} The geolocation engine, as a property to be possibly mocked.
-     * This is set lazily to avoid a memory leak in IE9.
-     */
-    geolocation: null,
-
-    /**
-     * Property: available
-     * {Boolean} The navigator.geolocation object is available.
-     */
-    available: ('geolocation' in navigator),
-
-    /**
-     * APIProperty: bind
-     * {Boolean} If true, map center will be set on location update.
-     */
-    bind: true,
-
-    /**
-     * APIProperty: watch
-     * {Boolean} If true, position will be update regularly.
-     */
-    watch: false,
-
-    /**
-     * APIProperty: geolocationOptions
-     * {Object} Options to pass to the navigator's geolocation API. See
-     *     <http://dev.w3.org/geo/api/spec-source.html>. No specific
-     *     option is passed to the geolocation API by default.
-     */
-    geolocationOptions: null,
-
-    /**
-     * Constructor: OpenLayers.Control.Geolocate
-     * Create a new control to deal with browser geolocation API
-     *
-     */
-
-    /**
-     * Method: destroy
-     */
-    destroy: function() {
-        this.deactivate();
-        OpenLayers.Control.prototype.destroy.apply(this, arguments);
-    },
-
-    /**
-     * Method: activate
-     * Activates the control.
-     *
-     * Returns:
-     * {Boolean} The control was effectively activated.
-     */
-    activate: function () {
-        if (this.available && !this.geolocation) {
-            // set lazily to avoid IE9 memory leak
-            this.geolocation = navigator.geolocation;
-        }
-        if (!this.geolocation) {
-            this.events.triggerEvent("locationuncapable");
-            return false;
-        }
-        if (OpenLayers.Control.prototype.activate.apply(this, arguments)) {
-            if (this.watch) {
-                this.watchId = this.geolocation.watchPosition(
-                    OpenLayers.Function.bind(this.geolocate, this),
-                    OpenLayers.Function.bind(this.failure, this),
-                    this.geolocationOptions
-                );
-            } else {
-                this.getCurrentLocation();
-            }
-            return true;
-        }
-        return false;
-    },
-
-    /**
-     * Method: deactivate
-     * Deactivates the control.
-     *
-     * Returns:
-     * {Boolean} The control was effectively deactivated.
-     */
-    deactivate: function () {
-        if (this.active && this.watchId !== null) {
-            this.geolocation.clearWatch(this.watchId);
-        }
-        return OpenLayers.Control.prototype.deactivate.apply(
-            this, arguments
-        );
-    },
-
-    /**
-     * Method: geolocate
-     * Activates the control.
-     *
-     */
-    geolocate: function (position) {
-        var center = new OpenLayers.LonLat(
-            position.coords.longitude,
-            position.coords.latitude
-        ).transform(
-            new OpenLayers.Projection("EPSG:4326"),
-            this.map.getProjectionObject()
-        );
-        if (this.bind) {
-            this.map.setCenter(center);
-        }
-        this.events.triggerEvent("locationupdated", {
-            position: position,
-            point: new OpenLayers.Geometry.Point(
-                center.lon, center.lat
-            )
-        });
-    },
-
-    /**
-     * APIMethod: getCurrentLocation
-     *
-     * Returns:
-     * {Boolean} Returns true if a event will be fired (successfull
-     * registration)
-     */
-    getCurrentLocation: function() {
-        if (!this.active || this.watch) {
-            return false;
-        }
-        this.geolocation.getCurrentPosition(
-            OpenLayers.Function.bind(this.geolocate, this),
-            OpenLayers.Function.bind(this.failure, this),
-            this.geolocationOptions
-        );
-        return true;
-    },
-
-    /**
-     * Method: failure
-     * method called on browser's geolocation failure
-     *
-     */
-    failure: function (error) {
-        this.events.triggerEvent("locationfailed", {error: error});
-    },
-
-    CLASS_NAME: "OpenLayers.Control.Geolocate"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/GetFeature.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/GetFeature.js
deleted file mode 100644
index 144e87fc..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/GetFeature.js
+++ /dev/null
@@ -1,597 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Control.js
- * @requires OpenLayers/Handler/Click.js
- * @requires OpenLayers/Handler/Box.js
- * @requires OpenLayers/Handler/Hover.js
- * @requires OpenLayers/Filter/Spatial.js
- */
-
-/**
- * Class: OpenLayers.Control.GetFeature
- * Gets vector features for locations underneath the mouse cursor. Can be
- *     configured to act on click, hover or dragged boxes. Uses an
- *     <OpenLayers.Protocol> that supports spatial filters to retrieve
- *     features from a server and fires events that notify applications of the
- *     selected features. 
- *
- * Inherits from:
- *  - <OpenLayers.Control>
- */
-OpenLayers.Control.GetFeature = OpenLayers.Class(OpenLayers.Control, {
-    
-    /**
-     * APIProperty: protocol
-     * {<OpenLayers.Protocol>} Required. The protocol used for fetching
-     *     features.
-     */
-    protocol: null,
-    
-    /**
-     * APIProperty: multipleKey
-     * {String} An event modifier ('altKey' or 'shiftKey') that temporarily sets
-     *     the <multiple> property to true.  Default is null.
-     */
-    multipleKey: null,
-    
-    /**
-     * APIProperty: toggleKey
-     * {String} An event modifier ('altKey' or 'shiftKey') that temporarily sets
-     *     the <toggle> property to true.  Default is null.
-     */
-    toggleKey: null,
-    
-    /**
-     * Property: modifiers
-     * {Object} The event modifiers to use, according to the current event
-     *     being handled by this control's handlers
-     */
-    modifiers: null,
-    
-    /**
-     * APIProperty: multiple
-     * {Boolean} Allow selection of multiple geometries.  Default is false.
-     */
-    multiple: false, 
-
-    /**
-     * APIProperty: click
-     * {Boolean} Use a click handler for selecting/unselecting features. If
-     *     both <click> and <box> are set to true, the click handler takes
-     *     precedence over the box handler if a box with zero extent was
-     *     selected.  Default is true.
-     */
-    click: true,
-
-    /**
-     * APIProperty: single
-     * {Boolean} Tells whether select by click should select a single
-     *     feature. If set to false, all matching features are selected.
-     *     If set to true, only the best matching feature is selected.
-     *     This option has an effect only of the <click> option is set
-     *     to true. Default is true.
-     */
-    single: true,
-    
-    /**
-     * APIProperty: clickout
-     * {Boolean} Unselect features when clicking outside any feature.
-     *     Applies only if <click> is true.  Default is true.
-     */
-    clickout: true,
-    
-    /**
-     * APIProperty: toggle
-     * {Boolean} Unselect a selected feature on click.  Applies only if
-     *     <click> is true.  Default is false.
-     */
-    toggle: false,
-
-    /**
-     * APIProperty: clickTolerance
-     * {Integer} Tolerance for the filter query in pixels. This has the
-     *     same effect as the tolerance parameter on WMS GetFeatureInfo
-     *     requests.  Will be ignored for box selections.  Applies only if
-     *     <click> or <hover> is true.  Default is 5.  Note that this not
-     *     only affects requests on click, but also on hover.
-     */
-    clickTolerance: 5,
-    
-    /**
-     * APIProperty: hover
-     * {Boolean} Send feature requests on mouse moves.  Default is false.
-     */
-    hover: false,
-
-    /**
-     * APIProperty: box
-     * {Boolean} Allow feature selection by drawing a box. If set to
-     *     true set <click> to false to disable the click handler and
-     *     rely on the box handler only, even for "zero extent" boxes.
-     *     See the description of the <click> option for additional
-     *     information.  Default is false.
-     */
-    box: false,
-    
-    /**
-     * APIProperty: maxFeatures
-     * {Integer} Maximum number of features to return from a query in single mode
-     *     if supported by the <protocol>. This set of features is then used to
-     *     determine the best match client-side. Default is 10.
-     */
-    maxFeatures: 10,
-    
-    /**
-     * Property: features
-     * {Object} Hash of {<OpenLayers.Feature.Vector>}, keyed by fid, holding
-     *     the currently selected features
-     */
-    features: null,
-    
-    /**
-     * Proeprty: hoverFeature
-     * {<OpenLayers.Feature.Vector>} The feature currently selected by the
-     *     hover handler
-     */
-    hoverFeature: null,
-    
-    /**
-     * APIProperty: handlerOptions
-     * {Object} Additional options for the handlers used by this control. This
-     *     is a hash with the keys "click", "box" and "hover".
-     */
-    
-    /**
-     * Property: handlers
-     * {Object} Object with references to multiple <OpenLayers.Handler>
-     *     instances.
-     */
-    handlers: null,
-
-    /**
-     * Property: hoverResponse
-     * {<OpenLayers.Protocol.Response>} The response object associated with
-     *     the currently running hover request (if any).
-     */
-    hoverResponse: null,
-    
-    /**
-     * Property: filterType
-     * {<String>} The type of filter to use when sending off a request. 
-     *     Possible values: 
-     *     OpenLayers.Filter.Spatial.<BBOX|INTERSECTS|WITHIN|CONTAINS>
-     *     Defaults to: OpenLayers.Filter.Spatial.BBOX
-     */
-    filterType: OpenLayers.Filter.Spatial.BBOX,
-
-    /** 
-     * APIProperty: events
-     * {<OpenLayers.Events>} Events instance for listeners and triggering
-     *     control specific events.
-     *
-     * Register a listener for a particular event with the following syntax:
-     * (code)
-     * control.events.register(type, obj, listener);
-     * (end)
-     *
-     * Supported event types (in addition to those from <OpenLayers.Control.events>):
-     * beforefeatureselected - Triggered when <click> is true before a
-     *      feature is selected. The event object has a feature property with
-     *      the feature about to select
-     * featureselected - Triggered when <click> is true and a feature is
-     *      selected. The event object has a feature property with the
-     *      selected feature
-     * beforefeaturesselected - Triggered when <click> is true before a
-     *      set of features is selected. The event object is an array of
-     *      feature properties with the features about to be selected.  
-     *      Return false after receiving this event to discontinue processing
-     *      of all featureselected events and the featuresselected event.
-     * featuresselected - Triggered when <click> is true and a set of
-     *      features is selected.  The event object is an array of feature
-     *      properties of the selected features
-     * featureunselected - Triggered when <click> is true and a feature is
-     *      unselected. The event object has a feature property with the
-     *      unselected feature
-     * clickout - Triggered when when <click> is true and no feature was
-     *      selected.
-     * hoverfeature - Triggered when <hover> is true and the mouse has
-     *      stopped over a feature
-     * outfeature - Triggered when <hover> is true and the mouse moves
-     *      moved away from a hover-selected feature
-     */
-
-    /**
-     * Constructor: OpenLayers.Control.GetFeature
-     * Create a new control for fetching remote features.
-     *
-     * Parameters:
-     * options - {Object} A configuration object which at least has to contain
-     *     a <protocol> property (if not, it has to be set before a request is
-     *     made)
-     */
-    initialize: function(options) {
-        options.handlerOptions = options.handlerOptions || {};
-
-        OpenLayers.Control.prototype.initialize.apply(this, [options]);
-        
-        this.features = {};
-
-        this.handlers = {};
-        
-        if(this.click) {
-            this.handlers.click = new OpenLayers.Handler.Click(this,
-                {click: this.selectClick}, this.handlerOptions.click || {});
-        }
-
-        if(this.box) {
-            this.handlers.box = new OpenLayers.Handler.Box(
-                this, {done: this.selectBox},
-                OpenLayers.Util.extend(this.handlerOptions.box, {
-                    boxDivClassName: "olHandlerBoxSelectFeature"
-                })
-            ); 
-        }
-        
-        if(this.hover) {
-            this.handlers.hover = new OpenLayers.Handler.Hover(
-                this, {'move': this.cancelHover, 'pause': this.selectHover},
-                OpenLayers.Util.extend(this.handlerOptions.hover, {
-                    'delay': 250,
-                    'pixelTolerance': 2
-                })
-            );
-        }
-    },
-    
-    /**
-     * Method: activate
-     * Activates the control.
-     * 
-     * Returns:
-     * {Boolean} The control was effectively activated.
-     */
-    activate: function () {
-        if (!this.active) {
-            for(var i in this.handlers) {
-                this.handlers[i].activate();
-            }
-        }
-        return OpenLayers.Control.prototype.activate.apply(
-            this, arguments
-        );
-    },
-
-    /**
-     * Method: deactivate
-     * Deactivates the control.
-     * 
-     * Returns:
-     * {Boolean} The control was effectively deactivated.
-     */
-    deactivate: function () {
-        if (this.active) {
-            for(var i in this.handlers) {
-                this.handlers[i].deactivate();
-            }
-        }
-        return OpenLayers.Control.prototype.deactivate.apply(
-            this, arguments
-        );
-    },
-    
-    /**
-     * Method: selectClick
-     * Called on click
-     *
-     * Parameters:
-     * evt - {<OpenLayers.Event>} 
-     */
-    selectClick: function(evt) {
-        var bounds = this.pixelToBounds(evt.xy);
-        
-        this.setModifiers(evt);
-        this.request(bounds, {single: this.single});
-    },
-
-    /**
-     * Method: selectBox
-     * Callback from the handlers.box set up when <box> selection is on
-     *
-     * Parameters:
-     * position - {<OpenLayers.Bounds>|Object} An OpenLayers.Bounds or
-     * an object with a 'left', 'bottom', 'right' and 'top' properties.
-     */
-    selectBox: function(position) {
-        var bounds;
-        if (position instanceof OpenLayers.Bounds) {
-            var minXY = this.map.getLonLatFromPixel({
-                x: position.left,
-                y: position.bottom
-            });
-            var maxXY = this.map.getLonLatFromPixel({
-                x: position.right,
-                y: position.top
-            });
-            bounds = new OpenLayers.Bounds(
-                minXY.lon, minXY.lat, maxXY.lon, maxXY.lat
-            );
-            
-        } else {
-            if(this.click) {
-                // box without extent - let the click handler take care of it
-                return;
-            }
-            bounds = this.pixelToBounds(position);
-        }
-        this.setModifiers(this.handlers.box.dragHandler.evt);
-        this.request(bounds);
-    },
-    
-    /**
-     * Method: selectHover
-     * Callback from the handlers.hover set up when <hover> selection is on
-     *
-     * Parameters:
-     * evt - {Object} event object with an xy property
-     */
-    selectHover: function(evt) {
-        var bounds = this.pixelToBounds(evt.xy);
-        this.request(bounds, {single: true, hover: true});
-    },
-
-    /**
-     * Method: cancelHover
-     * Callback from the handlers.hover set up when <hover> selection is on
-     */
-    cancelHover: function() {
-        if (this.hoverResponse) {
-            this.protocol.abort(this.hoverResponse);
-            this.hoverResponse = null;
-
-            OpenLayers.Element.removeClass(this.map.viewPortDiv, "olCursorWait");
-        }
-    },
-
-    /**
-     * Method: request
-     * Sends a GetFeature request to the WFS
-     * 
-     * Parameters:
-     * bounds - {<OpenLayers.Bounds>} bounds for the request's BBOX filter
-     * options - {Object} additional options for this method.
-     * 
-     * Supported options include:
-     * single - {Boolean} A single feature should be returned.
-     *     Note that this will be ignored if the protocol does not
-     *     return the geometries of the features.
-     * hover - {Boolean} Do the request for the hover handler.
-     */
-    request: function(bounds, options) {
-        options = options || {};
-        var filter = new OpenLayers.Filter.Spatial({
-            type: this.filterType, 
-            value: bounds
-        });
-        
-        // Set the cursor to "wait" to tell the user we're working.
-        OpenLayers.Element.addClass(this.map.viewPortDiv, "olCursorWait");
-
-        var response = this.protocol.read({
-            maxFeatures: options.single == true ? this.maxFeatures : undefined,
-            filter: filter,
-            callback: function(result) {
-                if(result.success()) {
-                    if(result.features.length) {
-                        if(options.single == true) {
-                            this.selectBestFeature(result.features,
-                                bounds.getCenterLonLat(), options);
-                        } else {
-                            this.select(result.features);
-                        }
-                    } else if(options.hover) {
-                        this.hoverSelect();
-                    } else {
-                        this.events.triggerEvent("clickout");
-                        if(this.clickout) {
-                            this.unselectAll();
-                        }
-                    }
-                }
-                // Reset the cursor.
-                OpenLayers.Element.removeClass(this.map.viewPortDiv, "olCursorWait");
-            },
-            scope: this
-        });
-        if(options.hover == true) {
-            this.hoverResponse = response;
-        }
-    },
-
-    /**
-     * Method: selectBestFeature
-     * Selects the feature from an array of features that is the best match
-     *     for the click position.
-     * 
-     * Parameters:
-     * features - {Array(<OpenLayers.Feature.Vector>)}
-     * clickPosition - {<OpenLayers.LonLat>}
-     * options - {Object} additional options for this method
-     * 
-     * Supported options include:
-     * hover - {Boolean} Do the selection for the hover handler.
-     */
-    selectBestFeature: function(features, clickPosition, options) {
-        options = options || {};
-        if(features.length) {
-            var point = new OpenLayers.Geometry.Point(clickPosition.lon,
-                clickPosition.lat);
-            var feature, resultFeature, dist;
-            var minDist = Number.MAX_VALUE;
-            for(var i=0; i<features.length; ++i) {
-                feature = features[i];
-                if(feature.geometry) {
-                    dist = point.distanceTo(feature.geometry, {edge: false});
-                    if(dist < minDist) {
-                        minDist = dist;
-                        resultFeature = feature;
-                        if(minDist == 0) {
-                            break;
-                        }
-                    }
-                }
-            }
-            
-            if(options.hover == true) {
-                this.hoverSelect(resultFeature);
-            } else {
-                this.select(resultFeature || features);
-            } 
-        }
-    },
-    
-    /**
-     * Method: setModifiers
-     * Sets the multiple and toggle modifiers according to the current event
-     * 
-     * Parameters:
-     * evt - {<OpenLayers.Event>}
-     */
-    setModifiers: function(evt) {
-        this.modifiers = {
-            multiple: this.multiple || (this.multipleKey && evt[this.multipleKey]),
-            toggle: this.toggle || (this.toggleKey && evt[this.toggleKey])
-        };        
-    },
-
-    /**
-     * Method: select
-     * Add feature to the hash of selected features and trigger the
-     * featureselected and featuresselected events.
-     * 
-     * Parameters:
-     * features - {<OpenLayers.Feature.Vector>} or an array of features
-     */
-    select: function(features) {
-        if(!this.modifiers.multiple && !this.modifiers.toggle) {
-            this.unselectAll();
-        }
-        if(!(OpenLayers.Util.isArray(features))) {
-            features = [features];
-        }
-        
-        var cont = this.events.triggerEvent("beforefeaturesselected", {
-            features: features
-        });
-        if(cont !== false) {
-            var selectedFeatures = [];
-            var feature;
-            for(var i=0, len=features.length; i<len; ++i) {
-                feature = features[i];
-                if(this.features[feature.fid || feature.id]) {
-                    if(this.modifiers.toggle) {
-                        this.unselect(this.features[feature.fid || feature.id]);
-                    }
-                } else {
-                    cont = this.events.triggerEvent("beforefeatureselected", {
-                        feature: feature
-                    });
-                    if(cont !== false) {
-                        this.features[feature.fid || feature.id] = feature;
-                        selectedFeatures.push(feature);
-                
-                        this.events.triggerEvent("featureselected",
-                            {feature: feature});
-                    }
-                }
-            }
-            this.events.triggerEvent("featuresselected", {
-                features: selectedFeatures
-            });
-        }
-    },
-    
-    /**
-     * Method: hoverSelect
-     * Sets/unsets the <hoverFeature>
-     * 
-     * Parameters:
-     * feature - {<OpenLayers.Feature.Vector>} the feature to hover-select.
-     *     If none is provided, the current <hoverFeature> will be nulled and
-     *     the outfeature event will be triggered.
-     */
-    hoverSelect: function(feature) {
-        var fid = feature ? feature.fid || feature.id : null;
-        var hfid = this.hoverFeature ?
-            this.hoverFeature.fid || this.hoverFeature.id : null;
-            
-        if(hfid && hfid != fid) {
-            this.events.triggerEvent("outfeature",
-                {feature: this.hoverFeature});
-            this.hoverFeature = null;
-        }
-        if(fid && fid != hfid) {
-            this.events.triggerEvent("hoverfeature", {feature: feature});
-            this.hoverFeature = feature;
-        }
-    },
-
-    /**
-     * Method: unselect
-     * Remove feature from the hash of selected features and trigger the
-     * featureunselected event.
-     *
-     * Parameters:
-     * feature - {<OpenLayers.Feature.Vector>}
-     */
-    unselect: function(feature) {
-        delete this.features[feature.fid || feature.id];
-        this.events.triggerEvent("featureunselected", {feature: feature});
-    },
-    
-    /**
-     * Method: unselectAll
-     * Unselect all selected features.
-     */
-    unselectAll: function() {
-        // we'll want an option to supress notification here
-        for(var fid in this.features) {
-            this.unselect(this.features[fid]);
-        }
-    },
-    
-    /** 
-     * Method: setMap
-     * Set the map property for the control. 
-     * 
-     * Parameters:
-     * map - {<OpenLayers.Map>} 
-     */
-    setMap: function(map) {
-        for(var i in this.handlers) {
-            this.handlers[i].setMap(map);
-        }
-        OpenLayers.Control.prototype.setMap.apply(this, arguments);
-    },
-    
-    /**
-     * Method: pixelToBounds
-     * Takes a pixel as argument and creates bounds after adding the
-     * <clickTolerance>.
-     * 
-     * Parameters:
-     * pixel - {<OpenLayers.Pixel>}
-     */
-    pixelToBounds: function(pixel) {
-        var llPx = pixel.add(-this.clickTolerance/2, this.clickTolerance/2);
-        var urPx = pixel.add(this.clickTolerance/2, -this.clickTolerance/2);
-        var ll = this.map.getLonLatFromPixel(llPx);
-        var ur = this.map.getLonLatFromPixel(urPx);
-        return new OpenLayers.Bounds(ll.lon, ll.lat, ur.lon, ur.lat);
-    },
-
-    CLASS_NAME: "OpenLayers.Control.GetFeature"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/Graticule.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/Graticule.js
deleted file mode 100644
index 2fce50d4..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/Graticule.js
+++ /dev/null
@@ -1,377 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Control.js
- * @requires OpenLayers/Lang.js
- * @requires OpenLayers/Rule.js
- * @requires OpenLayers/StyleMap.js
- * @requires OpenLayers/Layer/Vector.js
- */
-
-/**
- * Class: OpenLayers.Control.Graticule
- * The Graticule displays a grid of latitude/longitude lines reprojected on
- * the map.  
- * 
- * Inherits from:
- *  - <OpenLayers.Control>
- *  
- */
-OpenLayers.Control.Graticule = OpenLayers.Class(OpenLayers.Control, {
-
-    /**
-     * APIProperty: autoActivate
-     * {Boolean} Activate the control when it is added to a map. Default is
-     *     true. 
-     */
-    autoActivate: true,
-    
-    /**
-    * APIProperty: intervals
-    * {Array(Float)} A list of possible graticule widths in degrees.
-    */
-    intervals: [ 45, 30, 20, 10, 5, 2, 1,
-                 0.5, 0.2, 0.1, 0.05, 0.01, 
-                 0.005, 0.002, 0.001 ],
-
-    /**
-     * APIProperty: displayInLayerSwitcher
-     * {Boolean} Allows the Graticule control to be switched on and off by 
-     *     LayerSwitcher control. Defaults is true.
-     */
-    displayInLayerSwitcher: true,
-
-    /**
-     * APIProperty: visible
-     * {Boolean} should the graticule be initially visible (default=true)
-     */
-    visible: true,
-
-    /**
-     * APIProperty: numPoints
-     * {Integer} The number of points to use in each graticule line.  Higher
-     * numbers result in a smoother curve for projected maps 
-     */
-    numPoints: 50,
-
-    /**
-     * APIProperty: targetSize
-     * {Integer} The maximum size of the grid in pixels on the map
-     */
-    targetSize: 200,
-
-    /**
-     * APIProperty: layerName
-     * {String} The name to be displayed in the layer switcher, default is set 
-     *     by {<OpenLayers.Lang>}.
-     */
-    layerName: null,
-
-    /**
-     * APIProperty: labelled
-     * {Boolean} Should the graticule lines be labelled?. default=true
-     */
-    labelled: true,
-
-    /**
-     * APIProperty: labelFormat
-     * {String} the format of the labels, default = 'dm'. See
-     * <OpenLayers.Util.getFormattedLonLat> for other options.
-     */
-    labelFormat: 'dm',
-
-    /**
-     * APIProperty: lineSymbolizer
-     * {symbolizer} the symbolizer used to render lines
-     */
-    lineSymbolizer: {
-                strokeColor: "#333",
-                strokeWidth: 1,
-                strokeOpacity: 0.5
-            },
-
-    /**
-     * APIProperty: labelSymbolizer
-     * {symbolizer} the symbolizer used to render labels
-     */
-     labelSymbolizer: {},
-
-    /**
-     * Property: gratLayer
-     * {<OpenLayers.Layer.Vector>} vector layer used to draw the graticule on
-     */
-    gratLayer: null,
-
-    /**
-     * Constructor: OpenLayers.Control.Graticule
-     * Create a new graticule control to display a grid of latitude longitude
-     * lines.
-     * 
-     * Parameters:
-     * options - {Object} An optional object whose properties will be used
-     *     to extend the control.
-     */
-    initialize: function(options) {
-        options = options || {};
-        options.layerName = options.layerName || OpenLayers.i18n("Graticule");
-        OpenLayers.Control.prototype.initialize.apply(this, [options]);
-        
-        this.labelSymbolizer.stroke = false;
-        this.labelSymbolizer.fill = false;
-        this.labelSymbolizer.label = "${label}";
-        this.labelSymbolizer.labelAlign = "${labelAlign}";
-        this.labelSymbolizer.labelXOffset = "${xOffset}";
-        this.labelSymbolizer.labelYOffset = "${yOffset}";
-    },
-
-    /**
-     * APIMethod: destroy
-     */
-    destroy: function() {
-        this.deactivate();        
-        OpenLayers.Control.prototype.destroy.apply(this, arguments);        
-        if (this.gratLayer) {
-            this.gratLayer.destroy();
-            this.gratLayer = null;
-        }
-    },
-    
-    /**
-     * Method: draw
-     *
-     * initializes the graticule layer and does the initial update
-     * 
-     * Returns:
-     * {DOMElement}
-     */
-    draw: function() {
-        OpenLayers.Control.prototype.draw.apply(this, arguments);
-        if (!this.gratLayer) {
-            var gratStyle = new OpenLayers.Style({},{
-                rules: [new OpenLayers.Rule({'symbolizer':
-                    {"Point":this.labelSymbolizer,
-                     "Line":this.lineSymbolizer}
-                })]
-            });
-            this.gratLayer = new OpenLayers.Layer.Vector(this.layerName, {
-                styleMap: new OpenLayers.StyleMap({'default':gratStyle}),
-                visibility: this.visible,
-                displayInLayerSwitcher: this.displayInLayerSwitcher
-            });
-        }
-        return this.div;
-    },
-
-     /**
-     * APIMethod: activate
-     */
-    activate: function() {
-        if (OpenLayers.Control.prototype.activate.apply(this, arguments)) {
-            this.map.addLayer(this.gratLayer);
-            this.map.events.register('moveend', this, this.update);     
-            this.update();
-            return true;            
-        } else {
-            return false;
-        }
-    },
-    
-    /**
-     * APIMethod: deactivate
-     */
-    deactivate: function() {
-        if (OpenLayers.Control.prototype.deactivate.apply(this, arguments)) {
-            this.map.events.unregister('moveend', this, this.update);
-            this.map.removeLayer(this.gratLayer);
-            return true;
-        } else {
-            return false;
-        }
-    },
-    /**
-     * Method: update
-     *
-     * calculates the grid to be displayed and actually draws it
-     * 
-     * Returns:
-     * {DOMElement}
-     */
-    update: function() {
-        //wait for the map to be initialized before proceeding
-        var mapBounds = this.map.getExtent();
-        if (!mapBounds) {
-            return;
-        }
-        
-        //clear out the old grid
-        this.gratLayer.destroyFeatures();
-        
-        //get the projection objects required
-        var llProj = new OpenLayers.Projection("EPSG:4326");
-        var mapProj = this.map.getProjectionObject();
-        var mapRes = this.map.getResolution();
-        
-        //if the map is in lon/lat, then the lines are straight and only one
-        //point is required
-        if (mapProj.proj && mapProj.proj.projName == "longlat") {
-            this.numPoints = 1;
-        }
-        
-        //get the map center in EPSG:4326
-        var mapCenter = this.map.getCenter(); //lon and lat here are really map x and y
-        var mapCenterLL = new OpenLayers.Pixel(mapCenter.lon, mapCenter.lat);
-        OpenLayers.Projection.transform(mapCenterLL, mapProj, llProj);
-        
-        /* This block of code determines the lon/lat interval to use for the
-         * grid by calculating the diagonal size of one grid cell at the map
-         * center.  Iterates through the intervals array until the diagonal
-         * length is less than the targetSize option.
-         */
-        //find lat/lon interval that results in a grid of less than the target size
-        var testSq = this.targetSize*mapRes;
-        testSq *= testSq;   //compare squares rather than doing a square root to save time
-        var llInterval;
-        for (var i=0; i<this.intervals.length; ++i) {
-            llInterval = this.intervals[i];   //could do this for both x and y??
-            var delta = llInterval/2;  
-            var p1 = mapCenterLL.offset({x: -delta, y: -delta});  //test coords in EPSG:4326 space
-            var p2 = mapCenterLL.offset({x: delta, y: delta});
-            OpenLayers.Projection.transform(p1, llProj, mapProj); // convert them back to map projection
-            OpenLayers.Projection.transform(p2, llProj, mapProj);
-            var distSq = (p1.x-p2.x)*(p1.x-p2.x) + (p1.y-p2.y)*(p1.y-p2.y);
-            if (distSq <= testSq) {
-                break;
-            }
-        }
-        //alert(llInterval);
-        
-        //round the LL center to an even number based on the interval
-        mapCenterLL.x = Math.floor(mapCenterLL.x/llInterval)*llInterval;
-        mapCenterLL.y = Math.floor(mapCenterLL.y/llInterval)*llInterval;
-        //TODO adjust for minutses/seconds?
-        
-        /* The following 2 blocks calculate the nodes of the grid along a 
-         * line of constant longitude (then latitiude) running through the
-         * center of the map until it reaches the map edge.  The calculation
-         * goes from the center in both directions to the edge.
-         */
-        //get the central longitude line, increment the latitude
-        var iter = 0;
-        var centerLonPoints = [mapCenterLL.clone()];
-        var newPoint = mapCenterLL.clone();
-        var mapXY;
-        do {
-            newPoint = newPoint.offset({x: 0, y: llInterval});
-            mapXY = OpenLayers.Projection.transform(newPoint.clone(), llProj, mapProj);
-            centerLonPoints.unshift(newPoint);
-        } while (mapBounds.containsPixel(mapXY) && ++iter<1000);
-        newPoint = mapCenterLL.clone();
-        do {          
-            newPoint = newPoint.offset({x: 0, y: -llInterval});
-            mapXY = OpenLayers.Projection.transform(newPoint.clone(), llProj, mapProj);
-            centerLonPoints.push(newPoint);
-        } while (mapBounds.containsPixel(mapXY) && ++iter<1000);
-        
-        //get the central latitude line, increment the longitude
-        iter = 0;
-        var centerLatPoints = [mapCenterLL.clone()];
-        newPoint = mapCenterLL.clone();
-        do {
-            newPoint = newPoint.offset({x: -llInterval, y: 0});
-            mapXY = OpenLayers.Projection.transform(newPoint.clone(), llProj, mapProj);
-            centerLatPoints.unshift(newPoint);
-        } while (mapBounds.containsPixel(mapXY) && ++iter<1000);
-        newPoint = mapCenterLL.clone();
-        do {          
-            newPoint = newPoint.offset({x: llInterval, y: 0});
-            mapXY = OpenLayers.Projection.transform(newPoint.clone(), llProj, mapProj);
-            centerLatPoints.push(newPoint);
-        } while (mapBounds.containsPixel(mapXY) && ++iter<1000);
-        
-        //now generate a line for each node in the central lat and lon lines
-        //first loop over constant longitude
-        var lines = [];
-        for(var i=0; i < centerLatPoints.length; ++i) {
-            var lon = centerLatPoints[i].x;
-            var pointList = [];
-            var labelPoint = null;
-            var latEnd = Math.min(centerLonPoints[0].y, 90);
-            var latStart = Math.max(centerLonPoints[centerLonPoints.length - 1].y, -90);
-            var latDelta = (latEnd - latStart)/this.numPoints;
-            var lat = latStart;
-            for(var j=0; j<= this.numPoints; ++j) {
-                var gridPoint = new OpenLayers.Geometry.Point(lon,lat);
-                gridPoint.transform(llProj, mapProj);
-                pointList.push(gridPoint);
-                lat += latDelta;
-                if (gridPoint.y >= mapBounds.bottom && !labelPoint) {
-                    labelPoint = gridPoint;
-                }
-            }
-            if (this.labelled) {
-                //keep track of when this grid line crosses the map bounds to set
-                //the label position
-                //labels along the bottom, add 10 pixel offset up into the map
-                //TODO add option for labels on top
-                var labelPos = new OpenLayers.Geometry.Point(labelPoint.x,mapBounds.bottom);
-                var labelAttrs = {
-                    value: lon,
-                    label: this.labelled?OpenLayers.Util.getFormattedLonLat(lon, "lon", this.labelFormat):"",
-                    labelAlign: "cb",
-                    xOffset: 0,
-                    yOffset: 2
-                }; 
-                this.gratLayer.addFeatures(new OpenLayers.Feature.Vector(labelPos,labelAttrs));
-            }
-            var geom = new OpenLayers.Geometry.LineString(pointList);
-            lines.push(new OpenLayers.Feature.Vector(geom));
-        }
-        
-        //now draw the lines of constant latitude
-        for (var j=0; j < centerLonPoints.length; ++j) {
-            lat = centerLonPoints[j].y;
-            if (lat<-90 || lat>90) {  //latitudes only valid between -90 and 90
-                continue;
-            }
-            var pointList = [];
-            var lonStart = centerLatPoints[0].x;
-            var lonEnd = centerLatPoints[centerLatPoints.length - 1].x;
-            var lonDelta = (lonEnd - lonStart)/this.numPoints;
-            var lon = lonStart;
-            var labelPoint = null;
-            for(var i=0; i <= this.numPoints ; ++i) {
-                var gridPoint = new OpenLayers.Geometry.Point(lon,lat);
-                gridPoint.transform(llProj, mapProj);
-                pointList.push(gridPoint);
-                lon += lonDelta;
-                if (gridPoint.x < mapBounds.right) {
-                    labelPoint = gridPoint;
-                }
-            }
-            if (this.labelled) {
-                //keep track of when this grid line crosses the map bounds to set
-                //the label position
-                //labels along the right, 30 pixel offset left into the map
-                //TODO add option for labels on left
-                var labelPos = new OpenLayers.Geometry.Point(mapBounds.right, labelPoint.y); 
-                var labelAttrs = {
-                    value: lat,
-                    label: this.labelled?OpenLayers.Util.getFormattedLonLat(lat, "lat", this.labelFormat):"",
-                    labelAlign: "rb",
-                    xOffset: -2,
-                    yOffset: 2
-                }; 
-                this.gratLayer.addFeatures(new OpenLayers.Feature.Vector(labelPos,labelAttrs));
-            }
-            var geom = new OpenLayers.Geometry.LineString(pointList);
-            lines.push(new OpenLayers.Feature.Vector(geom));
-          }
-          this.gratLayer.addFeatures(lines);
-    },
-    
-    CLASS_NAME: "OpenLayers.Control.Graticule"
-});
-
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/KeyboardDefaults.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/KeyboardDefaults.js
deleted file mode 100644
index 3af88317..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/KeyboardDefaults.js
+++ /dev/null
@@ -1,142 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Control.js
- * @requires OpenLayers/Handler/Keyboard.js
- * @requires OpenLayers/Events.js
- */
-
-/**
- * Class: OpenLayers.Control.KeyboardDefaults
- * The KeyboardDefaults control adds panning and zooming functions, controlled
- * with the keyboard. By default arrow keys pan, +/- keys zoom & Page Up/Page
- * Down/Home/End scroll by three quarters of a page.
- * 
- * This control has no visible appearance.
- *
- * Inherits from:
- *  - <OpenLayers.Control>
- */
-OpenLayers.Control.KeyboardDefaults = OpenLayers.Class(OpenLayers.Control, {
-
-    /**
-     * APIProperty: autoActivate
-     * {Boolean} Activate the control when it is added to a map.  Default is
-     *     true.
-     */
-    autoActivate: true,
-
-    /**
-     * APIProperty: slideFactor
-     * Pixels to slide by.
-     */
-    slideFactor: 75,
-
-    /**
-     * APIProperty: observeElement
-     * {DOMelement|String} The DOM element to handle keys for. You
-     *     can use the map div here, to have the navigation keys
-     *     work when the map div has the focus. If undefined the
-     *     document is used.
-     */
-    observeElement: null,
-
-    /**
-     * Constructor: OpenLayers.Control.KeyboardDefaults
-     */
-        
-    /**
-     * Method: draw
-     * Create handler.
-     */
-    draw: function() {
-        var observeElement = this.observeElement || document;
-        this.handler = new OpenLayers.Handler.Keyboard( this,
-                {"keydown": this.defaultKeyPress},
-                {observeElement: observeElement}
-        );
-    },
-    
-    /**
-     * Method: defaultKeyPress
-     * When handling the key event, we only use evt.keyCode. This holds 
-     * some drawbacks, though we get around them below. When interpretting
-     * the keycodes below (including the comments associated with them),
-     * consult the URL below. For instance, the Safari browser returns
-     * "IE keycodes", and so is supported by any keycode labeled "IE".
-     * 
-     * Very informative URL:
-     *    http://unixpapa.com/js/key.html
-     *
-     * Parameters:
-     * evt - {Event} 
-     */
-    defaultKeyPress: function (evt) {
-        var size, handled = true;
-
-        var target = OpenLayers.Event.element(evt);
-        if (target  &&
-            (target.tagName == 'INPUT' ||
-             target.tagName == 'TEXTAREA' ||
-             target.tagName == 'SELECT')) {
-            return;
-        }
-
-        switch (evt.keyCode) {
-            case OpenLayers.Event.KEY_LEFT:
-                this.map.pan(-this.slideFactor, 0);
-                break;
-            case OpenLayers.Event.KEY_RIGHT: 
-                this.map.pan(this.slideFactor, 0);
-                break;
-            case OpenLayers.Event.KEY_UP:
-                this.map.pan(0, -this.slideFactor);
-                break;
-            case OpenLayers.Event.KEY_DOWN:
-                this.map.pan(0, this.slideFactor);
-                break;
-            
-            case 33: // Page Up. Same in all browsers.
-                size = this.map.getSize();
-                this.map.pan(0, -0.75*size.h);
-                break;
-            case 34: // Page Down. Same in all browsers.
-                size = this.map.getSize();
-                this.map.pan(0, 0.75*size.h);
-                break; 
-            case 35: // End. Same in all browsers.
-                size = this.map.getSize();
-                this.map.pan(0.75*size.w, 0);
-                break; 
-            case 36: // Home. Same in all browsers.
-                size = this.map.getSize();
-                this.map.pan(-0.75*size.w, 0);
-                break; 
-
-            case 43:  // +/= (ASCII), keypad + (ASCII, Opera)
-            case 61:  // +/= (Mozilla, Opera, some ASCII)
-            case 187: // +/= (IE)
-            case 107: // keypad + (IE, Mozilla)
-                this.map.zoomIn();
-                break; 
-            case 45:  // -/_ (ASCII, Opera), keypad - (ASCII, Opera)
-            case 109: // -/_ (Mozilla), keypad - (Mozilla, IE)
-            case 189: // -/_ (IE)
-            case 95:  // -/_ (some ASCII)
-                this.map.zoomOut();
-                break; 
-            default:
-                handled = false;
-        }
-        if (handled) {
-            // prevent browser default not to move the page
-            // when moving the page with the keyboard
-            OpenLayers.Event.stop(evt);
-        }
-    },
-
-    CLASS_NAME: "OpenLayers.Control.KeyboardDefaults"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/LayerSwitcher.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/LayerSwitcher.js
deleted file mode 100644
index 668f5c34..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/LayerSwitcher.js
+++ /dev/null
@@ -1,521 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Control.js
- * @requires OpenLayers/Lang.js
- * @requires OpenLayers/Util.js
- * @requires OpenLayers/Events/buttonclick.js
- */
-
-/**
- * Class: OpenLayers.Control.LayerSwitcher
- * The LayerSwitcher control displays a table of contents for the map. This
- * allows the user interface to switch between BaseLasyers and to show or hide
- * Overlays. By default the switcher is shown minimized on the right edge of
- * the map, the user may expand it by clicking on the handle.
- *
- * To create the LayerSwitcher outside of the map, pass the Id of a html div
- * as the first argument to the constructor.
- *
- * Inherits from:
- *  - <OpenLayers.Control>
- */
-OpenLayers.Control.LayerSwitcher = OpenLayers.Class(OpenLayers.Control, {
-
-    /**  
-     * Property: layerStates 
-     * {Array(Object)} Basically a copy of the "state" of the map's layers 
-     *     the last time the control was drawn. We have this in order to avoid
-     *     unnecessarily redrawing the control.
-     */
-    layerStates: null,
-
-  // DOM Elements
-
-    /**
-     * Property: layersDiv
-     * {DOMElement}
-     */
-    layersDiv: null,
-
-    /**
-     * Property: baseLayersDiv
-     * {DOMElement}
-     */
-    baseLayersDiv: null,
-
-    /**
-     * Property: baseLayers
-     * {Array(Object)}
-     */
-    baseLayers: null,
-
-
-    /**
-     * Property: dataLbl
-     * {DOMElement}
-     */
-    dataLbl: null,
-
-    /**
-     * Property: dataLayersDiv
-     * {DOMElement}
-     */
-    dataLayersDiv: null,
-
-    /**
-     * Property: dataLayers
-     * {Array(Object)}
-     */
-    dataLayers: null,
-
-
-    /**
-     * Property: minimizeDiv
-     * {DOMElement}
-     */
-    minimizeDiv: null,
-
-    /**
-     * Property: maximizeDiv
-     * {DOMElement}
-     */
-    maximizeDiv: null,
-
-    /**
-     * APIProperty: ascending
-     * {Boolean}
-     */
-    ascending: true,
-
-    /**
-     * Constructor: OpenLayers.Control.LayerSwitcher
-     *
-     * Parameters:
-     * options - {Object}
-     */
-    initialize: function(options) {
-        OpenLayers.Control.prototype.initialize.apply(this, arguments);
-        this.layerStates = [];
-    },
-
-    /**
-     * APIMethod: destroy
-     */
-    destroy: function() {
-
-        //clear out layers info and unregister their events
-        this.clearLayersArray("base");
-        this.clearLayersArray("data");
-
-        this.map.events.un({
-            buttonclick: this.onButtonClick,
-            addlayer: this.redraw,
-            changelayer: this.redraw,
-            removelayer: this.redraw,
-            changebaselayer: this.redraw,
-            scope: this
-        });
-        this.events.unregister("buttonclick", this, this.onButtonClick);
-
-        OpenLayers.Control.prototype.destroy.apply(this, arguments);
-    },
-
-    /**
-     * Method: setMap
-     *
-     * Properties:
-     * map - {<OpenLayers.Map>}
-     */
-    setMap: function(map) {
-        OpenLayers.Control.prototype.setMap.apply(this, arguments);
-
-        this.map.events.on({
-            addlayer: this.redraw,
-            changelayer: this.redraw,
-            removelayer: this.redraw,
-            changebaselayer: this.redraw,
-            scope: this
-        });
-        if (this.outsideViewport) {
-            this.events.attachToElement(this.div);
-            this.events.register("buttonclick", this, this.onButtonClick);
-        } else {
-            this.map.events.register("buttonclick", this, this.onButtonClick);
-        }
-    },
-
-    /**
-     * Method: draw
-     *
-     * Returns:
-     * {DOMElement} A reference to the DIV DOMElement containing the
-     *     switcher tabs.
-     */
-    draw: function() {
-        OpenLayers.Control.prototype.draw.apply(this);
-
-        // create layout divs
-        this.loadContents();
-
-        // set mode to minimize
-        if(!this.outsideViewport) {
-            this.minimizeControl();
-        }
-
-        // populate div with current info
-        this.redraw();
-
-        return this.div;
-    },
-
-    /**
-     * Method: onButtonClick
-     *
-     * Parameters:
-     * evt - {Event}
-     */
-    onButtonClick: function(evt) {
-        var button = evt.buttonElement;
-        if (button === this.minimizeDiv) {
-            this.minimizeControl();
-        } else if (button === this.maximizeDiv) {
-            this.maximizeControl();
-        } else if (button._layerSwitcher === this.id) {
-            if (button["for"]) {
-                button = document.getElementById(button["for"]);
-            }
-            if (!button.disabled) {
-                if (button.type == "radio") {
-                    button.checked = true;
-                    this.map.setBaseLayer(this.map.getLayer(button._layer));
-                } else {
-                    button.checked = !button.checked;
-                    this.updateMap();
-                }
-            }
-        }
-    },
-
-    /**
-     * Method: clearLayersArray
-     * User specifies either "base" or "data". we then clear all the
-     *     corresponding listeners, the div, and reinitialize a new array.
-     *
-     * Parameters:
-     * layersType - {String}
-     */
-    clearLayersArray: function(layersType) {
-        this[layersType + "LayersDiv"].innerHTML = "";
-        this[layersType + "Layers"] = [];
-    },
-
-
-    /**
-     * Method: checkRedraw
-     * Checks if the layer state has changed since the last redraw() call.
-     *
-     * Returns:
-     * {Boolean} The layer state changed since the last redraw() call.
-     */
-    checkRedraw: function() {
-        if ( !this.layerStates.length ||
-             (this.map.layers.length != this.layerStates.length) ) {
-            return true;
-        }
-
-        for (var i = 0, len = this.layerStates.length; i < len; i++) {
-            var layerState = this.layerStates[i];
-            var layer = this.map.layers[i];
-            if ( (layerState.name != layer.name) ||
-                 (layerState.inRange != layer.inRange) ||
-                 (layerState.id != layer.id) ||
-                 (layerState.visibility != layer.visibility) ) {
-                return true;
-            }
-        }
-
-        return false;
-    },
-
-    /**
-     * Method: redraw
-     * Goes through and takes the current state of the Map and rebuilds the
-     *     control to display that state. Groups base layers into a
-     *     radio-button group and lists each data layer with a checkbox.
-     *
-     * Returns:
-     * {DOMElement} A reference to the DIV DOMElement containing the control
-     */
-    redraw: function() {
-        //if the state hasn't changed since last redraw, no need
-        // to do anything. Just return the existing div.
-        if (!this.checkRedraw()) {
-            return this.div;
-        }
-
-        //clear out previous layers
-        this.clearLayersArray("base");
-        this.clearLayersArray("data");
-
-        var containsOverlays = false;
-        var containsBaseLayers = false;
-
-        // Save state -- for checking layer if the map state changed.
-        // We save this before redrawing, because in the process of redrawing
-        // we will trigger more visibility changes, and we want to not redraw
-        // and enter an infinite loop.
-        var len = this.map.layers.length;
-        this.layerStates = new Array(len);
-        for (var i=0; i <len; i++) {
-            var layer = this.map.layers[i];
-            this.layerStates[i] = {
-                'name': layer.name,
-                'visibility': layer.visibility,
-                'inRange': layer.inRange,
-                'id': layer.id
-            };
-        }
-
-        var layers = this.map.layers.slice();
-        if (!this.ascending) { layers.reverse(); }
-        for(var i=0, len=layers.length; i<len; i++) {
-            var layer = layers[i];
-            var baseLayer = layer.isBaseLayer;
-
-            if (layer.displayInLayerSwitcher) {
-
-                if (baseLayer) {
-                    containsBaseLayers = true;
-                } else {
-                    containsOverlays = true;
-                }
-
-                // only check a baselayer if it is *the* baselayer, check data
-                //  layers if they are visible
-                var checked = (baseLayer) ? (layer == this.map.baseLayer)
-                                          : layer.getVisibility();
-
-                // create input element
-                var inputElem = document.createElement("input"),
-                    // The input shall have an id attribute so we can use
-                    // labels to interact with them.
-                    inputId = OpenLayers.Util.createUniqueID(
-                        this.id + "_input_"
-                    );
-
-                inputElem.id = inputId;
-                inputElem.name = (baseLayer) ? this.id + "_baseLayers" : layer.name;
-                inputElem.type = (baseLayer) ? "radio" : "checkbox";
-                inputElem.value = layer.name;
-                inputElem.checked = checked;
-                inputElem.defaultChecked = checked;
-                inputElem.className = "olButton";
-                inputElem._layer = layer.id;
-                inputElem._layerSwitcher = this.id;
-
-                if (!baseLayer && !layer.inRange) {
-                    inputElem.disabled = true;
-                }
-
-                // create span
-                var labelSpan = document.createElement("label");
-                // this isn't the DOM attribute 'for', but an arbitrary name we
-                // use to find the appropriate input element in <onButtonClick>
-                labelSpan["for"] = inputElem.id;
-                OpenLayers.Element.addClass(labelSpan, "labelSpan olButton");
-                labelSpan._layer = layer.id;
-                labelSpan._layerSwitcher = this.id;
-                if (!baseLayer && !layer.inRange) {
-                    labelSpan.style.color = "gray";
-                }
-                labelSpan.innerHTML = layer.name;
-                labelSpan.style.verticalAlign = (baseLayer) ? "bottom"
-                                                            : "baseline";
-                // create line break
-                var br = document.createElement("br");
-
-
-                var groupArray = (baseLayer) ? this.baseLayers
-                                             : this.dataLayers;
-                groupArray.push({
-                    'layer': layer,
-                    'inputElem': inputElem,
-                    'labelSpan': labelSpan
-                });
-
-
-                var groupDiv = (baseLayer) ? this.baseLayersDiv
-                                           : this.dataLayersDiv;
-                groupDiv.appendChild(inputElem);
-                groupDiv.appendChild(labelSpan);
-                groupDiv.appendChild(br);
-            }
-        }
-
-        // if no overlays, dont display the overlay label
-        this.dataLbl.style.display = (containsOverlays) ? "" : "none";
-
-        // if no baselayers, dont display the baselayer label
-        this.baseLbl.style.display = (containsBaseLayers) ? "" : "none";
-
-        return this.div;
-    },
-
-    /**
-     * Method: updateMap
-     * Cycles through the loaded data and base layer input arrays and makes
-     *     the necessary calls to the Map object such that that the map's
-     *     visual state corresponds to what the user has selected in
-     *     the control.
-     */
-    updateMap: function() {
-
-        // set the newly selected base layer
-        for(var i=0, len=this.baseLayers.length; i<len; i++) {
-            var layerEntry = this.baseLayers[i];
-            if (layerEntry.inputElem.checked) {
-                this.map.setBaseLayer(layerEntry.layer, false);
-            }
-        }
-
-        // set the correct visibilities for the overlays
-        for(var i=0, len=this.dataLayers.length; i<len; i++) {
-            var layerEntry = this.dataLayers[i];
-            layerEntry.layer.setVisibility(layerEntry.inputElem.checked);
-        }
-
-    },
-
-    /**
-     * Method: maximizeControl
-     * Set up the labels and divs for the control
-     *
-     * Parameters:
-     * e - {Event}
-     */
-    maximizeControl: function(e) {
-
-        // set the div's width and height to empty values, so
-        // the div dimensions can be controlled by CSS
-        this.div.style.width = "";
-        this.div.style.height = "";
-
-        this.showControls(false);
-
-        if (e != null) {
-            OpenLayers.Event.stop(e);
-        }
-    },
-
-    /**
-     * Method: minimizeControl
-     * Hide all the contents of the control, shrink the size,
-     *     add the maximize icon
-     *
-     * Parameters:
-     * e - {Event}
-     */
-    minimizeControl: function(e) {
-
-        // to minimize the control we set its div's width
-        // and height to 0px, we cannot just set "display"
-        // to "none" because it would hide the maximize
-        // div
-        this.div.style.width = "0px";
-        this.div.style.height = "0px";
-
-        this.showControls(true);
-
-        if (e != null) {
-            OpenLayers.Event.stop(e);
-        }
-    },
-
-    /**
-     * Method: showControls
-     * Hide/Show all LayerSwitcher controls depending on whether we are
-     *     minimized or not
-     *
-     * Parameters:
-     * minimize - {Boolean}
-     */
-    showControls: function(minimize) {
-
-        this.maximizeDiv.style.display = minimize ? "" : "none";
-        this.minimizeDiv.style.display = minimize ? "none" : "";
-
-        this.layersDiv.style.display = minimize ? "none" : "";
-    },
-
-    /**
-     * Method: loadContents
-     * Set up the labels and divs for the control
-     */
-    loadContents: function() {
-
-        // layers list div
-        this.layersDiv = document.createElement("div");
-        this.layersDiv.id = this.id + "_layersDiv";
-        OpenLayers.Element.addClass(this.layersDiv, "layersDiv");
-
-        this.baseLbl = document.createElement("div");
-        this.baseLbl.innerHTML = OpenLayers.i18n("Base Layer");
-        OpenLayers.Element.addClass(this.baseLbl, "baseLbl");
-
-        this.baseLayersDiv = document.createElement("div");
-        OpenLayers.Element.addClass(this.baseLayersDiv, "baseLayersDiv");
-
-        this.dataLbl = document.createElement("div");
-        this.dataLbl.innerHTML = OpenLayers.i18n("Overlays");
-        OpenLayers.Element.addClass(this.dataLbl, "dataLbl");
-
-        this.dataLayersDiv = document.createElement("div");
-        OpenLayers.Element.addClass(this.dataLayersDiv, "dataLayersDiv");
-
-        if (this.ascending) {
-            this.layersDiv.appendChild(this.baseLbl);
-            this.layersDiv.appendChild(this.baseLayersDiv);
-            this.layersDiv.appendChild(this.dataLbl);
-            this.layersDiv.appendChild(this.dataLayersDiv);
-        } else {
-            this.layersDiv.appendChild(this.dataLbl);
-            this.layersDiv.appendChild(this.dataLayersDiv);
-            this.layersDiv.appendChild(this.baseLbl);
-            this.layersDiv.appendChild(this.baseLayersDiv);
-        }
-
-        this.div.appendChild(this.layersDiv);
-
-        // maximize button div
-        var img = OpenLayers.Util.getImageLocation('layer-switcher-maximize.png');
-        this.maximizeDiv = OpenLayers.Util.createAlphaImageDiv(
-                                    "OpenLayers_Control_MaximizeDiv",
-                                    null,
-                                    null,
-                                    img,
-                                    "absolute");
-        OpenLayers.Element.addClass(this.maximizeDiv, "maximizeDiv olButton");
-        this.maximizeDiv.style.display = "none";
-
-        this.div.appendChild(this.maximizeDiv);
-
-        // minimize button div
-        var img = OpenLayers.Util.getImageLocation('layer-switcher-minimize.png');
-        this.minimizeDiv = OpenLayers.Util.createAlphaImageDiv(
-                                    "OpenLayers_Control_MinimizeDiv",
-                                    null,
-                                    null,
-                                    img,
-                                    "absolute");
-        OpenLayers.Element.addClass(this.minimizeDiv, "minimizeDiv olButton");
-        this.minimizeDiv.style.display = "none";
-
-        this.div.appendChild(this.minimizeDiv);
-    },
-
-    CLASS_NAME: "OpenLayers.Control.LayerSwitcher"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/Measure.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/Measure.js
deleted file mode 100644
index 03c22b8c..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/Measure.js
+++ /dev/null
@@ -1,379 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Control.js
- * @requires OpenLayers/Feature/Vector.js
- */
-
-/**
- * Class: OpenLayers.Control.Measure
- * Allows for drawing of features for measurements.
- *
- * Inherits from:
- *  - <OpenLayers.Control>
- */
-OpenLayers.Control.Measure = OpenLayers.Class(OpenLayers.Control, {
-
-    /**
-     * APIProperty: events
-     * {<OpenLayers.Events>} Events instance for listeners and triggering
-     *     control specific events.
-     *
-     * Register a listener for a particular event with the following syntax:
-     * (code)
-     * control.events.register(type, obj, listener);
-     * (end)
-     *
-     * Supported event types (in addition to those from <OpenLayers.Control.events>):
-     * measure - Triggered when a measurement sketch is complete.  Listeners
-     *      will receive an event with measure, units, order, and geometry
-     *      properties.
-     * measurepartial - Triggered when a new point is added to the
-     *      measurement sketch or if the <immediate> property is true and the
-     *      measurement sketch is modified.  Listeners receive an event with measure,
-     *      units, order, and geometry.
-     */
-
-    /**
-     * APIProperty: handlerOptions
-     * {Object} Used to set non-default properties on the control's handler
-     */
-
-    /**
-     * Property: callbacks
-     * {Object} The functions that are sent to the handler for callback
-     */
-    callbacks: null,
-
-    /**
-     * APIProperty: displaySystem
-     * {String} Display system for output measurements.  Supported values
-     *     are 'english', 'metric', and 'geographic'.  Default is 'metric'.
-     */
-    displaySystem: 'metric',
-
-    /**
-     * APIProperty: geodesic
-     * {Boolean} Calculate geodesic metrics instead of planar metrics.  This
-     *     requires that geometries can be transformed into Geographic/WGS84
-     *     (if that is not already the map projection).  Default is false.
-     */
-    geodesic: false,
-
-    /**
-     * Property: displaySystemUnits
-     * {Object} Units for various measurement systems.  Values are arrays
-     *     of unit abbreviations (from OpenLayers.INCHES_PER_UNIT) in decreasing
-     *     order of length.
-     */
-    displaySystemUnits: {
-        geographic: ['dd'],
-        english: ['mi', 'ft', 'in'],
-        metric: ['km', 'm']
-    },
-
-    /**
-     * Property: delay
-     * {Number} Number of milliseconds between clicks before the event is
-     *     considered a double-click.  The "measurepartial" event will not
-     *     be triggered if the sketch is completed within this time.  This
-     *     is required for IE where creating a browser reflow (if a listener
-     *     is modifying the DOM by displaying the measurement values) messes
-     *     with the dblclick listener in the sketch handler.
-     */
-    partialDelay: 300,
-
-    /**
-     * Property: delayedTrigger
-     * {Number} Timeout id of trigger for measurepartial.
-     */
-    delayedTrigger: null,
-
-    /**
-     * APIProperty: persist
-     * {Boolean} Keep the temporary measurement sketch drawn after the
-     *     measurement is complete.  The geometry will persist until a new
-     *     measurement is started, the control is deactivated, or <cancel> is
-     *     called.
-     */
-    persist: false,
-
-    /**
-     * APIProperty: immediate
-     * {Boolean} Activates the immediate measurement so that the "measurepartial"
-     *     event is also fired once the measurement sketch is modified.
-     *     Default is false.
-     */
-    immediate : false,
-
-    /**
-     * Constructor: OpenLayers.Control.Measure
-     *
-     * Parameters:
-     * handler - {<OpenLayers.Handler>}
-     * options - {Object}
-     */
-    initialize: function(handler, options) {
-        OpenLayers.Control.prototype.initialize.apply(this, [options]);
-        var callbacks = {done: this.measureComplete,
-            point: this.measurePartial};
-        if (this.immediate){
-            callbacks.modify = this.measureImmediate;
-        }
-        this.callbacks = OpenLayers.Util.extend(callbacks, this.callbacks);
-
-        // let the handler options override, so old code that passes 'persist'
-        // directly to the handler does not need an update
-        this.handlerOptions = OpenLayers.Util.extend(
-            {persist: this.persist}, this.handlerOptions
-        );
-        this.handler = new handler(this, this.callbacks, this.handlerOptions);
-    },
-
-    /**
-     * APIMethod: deactivate
-     */
-    deactivate: function() {
-        this.cancelDelay();
-        return OpenLayers.Control.prototype.deactivate.apply(this, arguments);
-    },
-
-    /**
-     * APIMethod: cancel
-     * Stop the control from measuring.  If <persist> is true, the temporary
-     *     sketch will be erased.
-     */
-    cancel: function() {
-        this.cancelDelay();
-        this.handler.cancel();
-    },
-
-    /**
-     * APIMethod: setImmediate
-     * Sets the <immediate> property. Changes the activity of immediate
-     * measurement.
-     */
-    setImmediate: function(immediate) {
-        this.immediate = immediate;
-        if (this.immediate){
-            this.callbacks.modify = this.measureImmediate;
-        } else {
-            delete this.callbacks.modify;
-        }
-    },
-
-    /**
-     * Method: updateHandler
-     *
-     * Parameters:
-     * handler - {Function} One of the sketch handler constructors.
-     * options - {Object} Options for the handler.
-     */
-    updateHandler: function(handler, options) {
-        var active = this.active;
-        if(active) {
-            this.deactivate();
-        }
-        this.handler = new handler(this, this.callbacks, options);
-        if(active) {
-            this.activate();
-        }
-    },
-
-    /**
-     * Method: measureComplete
-     * Called when the measurement sketch is done.
-     *
-     * Parameters:
-     * geometry - {<OpenLayers.Geometry>}
-     */
-    measureComplete: function(geometry) {
-        this.cancelDelay();
-        this.measure(geometry, "measure");
-    },
-
-    /**
-     * Method: measurePartial
-     * Called each time a new point is added to the measurement sketch.
-     *
-     * Parameters:
-     * point - {<OpenLayers.Geometry.Point>} The last point added.
-     * geometry - {<OpenLayers.Geometry>} The sketch geometry.
-     */
-    measurePartial: function(point, geometry) {
-        this.cancelDelay();
-        geometry = geometry.clone();
-        // when we're wating for a dblclick, we have to trigger measurepartial
-        // after some delay to deal with reflow issues in IE
-        if (this.handler.freehandMode(this.handler.evt)) {
-            // no dblclick in freehand mode
-            this.measure(geometry, "measurepartial");
-        } else {
-            this.delayedTrigger = window.setTimeout(
-                OpenLayers.Function.bind(function() {
-                    this.delayedTrigger = null;
-                    this.measure(geometry, "measurepartial");
-                }, this),
-                this.partialDelay
-            );
-        }
-    },
-
-    /**
-     * Method: measureImmediate
-     * Called each time the measurement sketch is modified.
-     *
-     * Parameters:
-     * point - {<OpenLayers.Geometry.Point>} The point at the mouse position.
-     * feature - {<OpenLayers.Feature.Vector>} The sketch feature.
-     * drawing - {Boolean} Indicates whether we're currently drawing.
-     */
-    measureImmediate : function(point, feature, drawing) {
-        if (drawing && !this.handler.freehandMode(this.handler.evt)) {
-            this.cancelDelay();
-            this.measure(feature.geometry, "measurepartial");
-        }
-    },
-
-    /**
-     * Method: cancelDelay
-     * Cancels the delay measurement that measurePartial began.
-     */
-    cancelDelay: function() {
-        if (this.delayedTrigger !== null) {
-            window.clearTimeout(this.delayedTrigger);
-            this.delayedTrigger = null;
-        }
-    },
-
-    /**
-     * Method: measure
-     *
-     * Parameters:
-     * geometry - {<OpenLayers.Geometry>}
-     * eventType - {String}
-     */
-    measure: function(geometry, eventType) {
-        var stat, order;
-        if(geometry.CLASS_NAME.indexOf('LineString') > -1) {
-            stat = this.getBestLength(geometry);
-            order = 1;
-        } else {
-            stat = this.getBestArea(geometry);
-            order = 2;
-        }
-        this.events.triggerEvent(eventType, {
-            measure: stat[0],
-            units: stat[1],
-            order: order,
-            geometry: geometry
-        });
-    },
-
-    /**
-     * Method: getBestArea
-     * Based on the <displaySystem> returns the area of a geometry.
-     *
-     * Parameters:
-     * geometry - {<OpenLayers.Geometry>}
-     *
-     * Returns:
-     * {Array([Float, String])}  Returns a two item array containing the
-     *     area and the units abbreviation.
-     */
-    getBestArea: function(geometry) {
-        var units = this.displaySystemUnits[this.displaySystem];
-        var unit, area;
-        for(var i=0, len=units.length; i<len; ++i) {
-            unit = units[i];
-            area = this.getArea(geometry, unit);
-            if(area > 1) {
-                break;
-            }
-        }
-        return [area, unit];
-    },
-
-    /**
-     * Method: getArea
-     *
-     * Parameters:
-     * geometry - {<OpenLayers.Geometry>}
-     * units - {String} Unit abbreviation
-     *
-     * Returns:
-     * {Float} The geometry area in the given units.
-     */
-    getArea: function(geometry, units) {
-        var area, geomUnits;
-        if(this.geodesic) {
-            area = geometry.getGeodesicArea(this.map.getProjectionObject());
-            geomUnits = "m";
-        } else {
-            area = geometry.getArea();
-            geomUnits = this.map.getUnits();
-        }
-        var inPerDisplayUnit = OpenLayers.INCHES_PER_UNIT[units];
-        if(inPerDisplayUnit) {
-            var inPerMapUnit = OpenLayers.INCHES_PER_UNIT[geomUnits];
-            area *= Math.pow((inPerMapUnit / inPerDisplayUnit), 2);
-        }
-        return area;
-    },
-
-    /**
-     * Method: getBestLength
-     * Based on the <displaySystem> returns the length of a geometry.
-     *
-     * Parameters:
-     * geometry - {<OpenLayers.Geometry>}
-     *
-     * Returns:
-     * {Array([Float, String])}  Returns a two item array containing the
-     *     length and the units abbreviation.
-     */
-    getBestLength: function(geometry) {
-        var units = this.displaySystemUnits[this.displaySystem];
-        var unit, length;
-        for(var i=0, len=units.length; i<len; ++i) {
-            unit = units[i];
-            length = this.getLength(geometry, unit);
-            if(length > 1) {
-                break;
-            }
-        }
-        return [length, unit];
-    },
-
-    /**
-     * Method: getLength
-     *
-     * Parameters:
-     * geometry - {<OpenLayers.Geometry>}
-     * units - {String} Unit abbreviation
-     *
-     * Returns:
-     * {Float} The geometry length in the given units.
-     */
-    getLength: function(geometry, units) {
-        var length, geomUnits;
-        if(this.geodesic) {
-            length = geometry.getGeodesicLength(this.map.getProjectionObject());
-            geomUnits = "m";
-        } else {
-            length = geometry.getLength();
-            geomUnits = this.map.getUnits();
-        }
-        var inPerDisplayUnit = OpenLayers.INCHES_PER_UNIT[units];
-        if(inPerDisplayUnit) {
-            var inPerMapUnit = OpenLayers.INCHES_PER_UNIT[geomUnits];
-            length *= (inPerMapUnit / inPerDisplayUnit);
-        }
-        return length;
-    },
-
-    CLASS_NAME: "OpenLayers.Control.Measure"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/ModifyFeature.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/ModifyFeature.js
deleted file mode 100644
index e574608c..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/ModifyFeature.js
+++ /dev/null
@@ -1,835 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Control.js
- * @requires OpenLayers/Handler/Drag.js
- * @requires OpenLayers/Handler/Keyboard.js
- */
-
-/**
- * Class: OpenLayers.Control.ModifyFeature
- * Control to modify features.  When activated, a click renders the vertices
- *     of a feature - these vertices can then be dragged.  By default, the
- *     delete key will delete the vertex under the mouse.  New features are
- *     added by dragging "virtual vertices" between vertices.  Create a new
- *     control with the <OpenLayers.Control.ModifyFeature> constructor.
- *
- * Inherits From:
- *  - <OpenLayers.Control>
- */
-OpenLayers.Control.ModifyFeature = OpenLayers.Class(OpenLayers.Control, {
-
-    /**
-     * APIProperty: documentDrag
-     * {Boolean} If set to true, dragging vertices will continue even if the
-     *     mouse cursor leaves the map viewport. Default is false.
-     */
-    documentDrag: false,
-
-    /**
-     * APIProperty: geometryTypes
-     * {Array(String)} To restrict modification to a limited set of geometry
-     *     types, send a list of strings corresponding to the geometry class
-     *     names.
-     */
-    geometryTypes: null,
-
-    /**
-     * APIProperty: clickout
-     * {Boolean} Unselect features when clicking outside any feature.
-     *     Default is true.
-     */
-    clickout: true,
-
-    /**
-     * APIProperty: toggle
-     * {Boolean} Unselect a selected feature on click.
-     *      Default is true.
-     */
-    toggle: true,
-
-    /**
-     * APIProperty: standalone
-     * {Boolean} Set to true to create a control without SelectFeature
-     *     capabilities. Default is false.  If standalone is true, to modify
-     *     a feature, call the <selectFeature> method with the target feature.
-     *     Note that you must call the <unselectFeature> method to finish
-     *     feature modification in standalone mode (before starting to modify
-     *     another feature).
-     */
-    standalone: false,
-
-    /**
-     * Property: layer
-     * {<OpenLayers.Layer.Vector>}
-     */
-    layer: null,
-
-    /**
-     * Property: feature
-     * {<OpenLayers.Feature.Vector>} Feature currently available for modification.
-     */
-    feature: null,
-
-    /**
-     * Property: vertex
-     * {<OpenLayers.Feature.Vector>} Vertex currently being modified.
-     */
-    vertex: null,
-
-    /**
-     * Property: vertices
-     * {Array(<OpenLayers.Feature.Vector>)} Verticies currently available
-     *     for dragging.
-     */
-    vertices: null,
-
-    /**
-     * Property: virtualVertices
-     * {Array(<OpenLayers.Feature.Vector>)} Virtual vertices in the middle
-     *     of each edge.
-     */
-    virtualVertices: null,
-
-    /**
-     * Property: handlers
-     * {Object}
-     */
-    handlers: null,
-
-    /**
-     * APIProperty: deleteCodes
-     * {Array(Integer)} Keycodes for deleting verticies.  Set to null to disable
-     *     vertex deltion by keypress.  If non-null, keypresses with codes
-     *     in this array will delete vertices under the mouse. Default
-     *     is 46 and 68, the 'delete' and lowercase 'd' keys.
-     */
-    deleteCodes: null,
-
-    /**
-     * APIProperty: virtualStyle
-     * {Object} A symbolizer to be used for virtual vertices.
-     */
-    virtualStyle: null,
-
-    /**
-     * APIProperty: vertexRenderIntent
-     * {String} The renderIntent to use for vertices. If no <virtualStyle> is
-     * provided, this renderIntent will also be used for virtual vertices, with
-     * a fillOpacity and strokeOpacity of 0.3. Default is null, which means
-     * that the layer's default style will be used for vertices.
-     */
-    vertexRenderIntent: null,
-
-    /**
-     * APIProperty: mode
-     * {Integer} Bitfields specifying the modification mode. Defaults to
-     *      OpenLayers.Control.ModifyFeature.RESHAPE. To set the mode to a
-     *      combination of options, use the | operator. For example, to allow
-     *      the control to both resize and rotate features, use the following
-     *      syntax
-     * (code)
-     * control.mode = OpenLayers.Control.ModifyFeature.RESIZE |
-     *                OpenLayers.Control.ModifyFeature.ROTATE;
-     *  (end)
-     */
-    mode: null,
-
-    /**
-     * APIProperty: createVertices
-     * {Boolean} Create new vertices by dragging the virtual vertices
-     *     in the middle of each edge. Default is true.
-     */
-    createVertices: true,
-
-    /**
-     * Property: modified
-     * {Boolean} The currently selected feature has been modified.
-     */
-    modified: false,
-
-    /**
-     * Property: radiusHandle
-     * {<OpenLayers.Feature.Vector>} A handle for rotating/resizing a feature.
-     */
-    radiusHandle: null,
-
-    /**
-     * Property: dragHandle
-     * {<OpenLayers.Feature.Vector>} A handle for dragging a feature.
-     */
-    dragHandle: null,
-
-    /**
-     * APIProperty: onModificationStart 
-     * {Function} *Deprecated*.  Register for "beforefeaturemodified" instead.
-     *     The "beforefeaturemodified" event is triggered on the layer before
-     *     any modification begins.
-     *
-     * Optional function to be called when a feature is selected
-     *     to be modified. The function should expect to be called with a
-     *     feature.  This could be used for example to allow to lock the
-     *     feature on server-side.
-     */
-    onModificationStart: function() {},
-
-    /**
-     * APIProperty: onModification
-     * {Function} *Deprecated*.  Register for "featuremodified" instead.
-     *     The "featuremodified" event is triggered on the layer with each
-     *     feature modification.
-     *
-     * Optional function to be called when a feature has been
-     *     modified.  The function should expect to be called with a feature.
-     */
-    onModification: function() {},
-
-    /**
-     * APIProperty: onModificationEnd
-     * {Function} *Deprecated*.  Register for "afterfeaturemodified" instead.
-     *     The "afterfeaturemodified" event is triggered on the layer after
-     *     a feature has been modified.
-     *
-     * Optional function to be called when a feature is finished 
-     *     being modified.  The function should expect to be called with a
-     *     feature.
-     */
-    onModificationEnd: function() {},
-
-    /**
-     * Constructor: OpenLayers.Control.ModifyFeature
-     * Create a new modify feature control.
-     *
-     * Parameters:
-     * layer - {<OpenLayers.Layer.Vector>} Layer that contains features that
-     *     will be modified.
-     * options - {Object} Optional object whose properties will be set on the
-     *     control.
-     */
-    initialize: function(layer, options) {
-        options = options || {};
-        this.layer = layer;
-        this.vertices = [];
-        this.virtualVertices = [];
-        this.virtualStyle = OpenLayers.Util.extend({},
-            this.layer.style ||
-            this.layer.styleMap.createSymbolizer(null, options.vertexRenderIntent)
-        );
-        this.virtualStyle.fillOpacity = 0.3;
-        this.virtualStyle.strokeOpacity = 0.3;
-        this.deleteCodes = [46, 68];
-        this.mode = OpenLayers.Control.ModifyFeature.RESHAPE;
-        OpenLayers.Control.prototype.initialize.apply(this, [options]);
-        if(!(OpenLayers.Util.isArray(this.deleteCodes))) {
-            this.deleteCodes = [this.deleteCodes];
-        }
-        
-        // configure the drag handler
-        var dragCallbacks = {
-            down: function(pixel) {
-                this.vertex = null;
-                var feature = this.layer.getFeatureFromEvent(
-                        this.handlers.drag.evt);
-                if (feature) {
-                    this.dragStart(feature);
-                } else if (this.clickout) {
-                    this._unselect = this.feature;
-                }
-            },
-            move: function(pixel) {
-                delete this._unselect;
-                if (this.vertex) {
-                    this.dragVertex(this.vertex, pixel);
-                }
-            },
-            up: function() {
-                this.handlers.drag.stopDown = false;
-                if (this._unselect) {
-                    this.unselectFeature(this._unselect);
-                    delete this._unselect;
-                }
-            },
-            done: function(pixel) {
-                if (this.vertex) {
-                    this.dragComplete(this.vertex);
-                }
-            }
-        };
-        var dragOptions = {
-            documentDrag: this.documentDrag,
-            stopDown: false
-        };
-
-        // configure the keyboard handler
-        var keyboardOptions = {
-            keydown: this.handleKeypress
-        };
-        this.handlers = {
-            keyboard: new OpenLayers.Handler.Keyboard(this, keyboardOptions),
-            drag: new OpenLayers.Handler.Drag(this, dragCallbacks, dragOptions)
-        };
-    },
-
-    /**
-     * APIMethod: destroy
-     * Take care of things that are not handled in superclass.
-     */
-    destroy: function() {
-        if (this.map) {
-            this.map.events.un({
-                "removelayer": this.handleMapEvents,
-                "changelayer": this.handleMapEvents,
-                scope: this
-            });
-        }
-        this.layer = null;
-        OpenLayers.Control.prototype.destroy.apply(this, []);
-    },
-
-    /**
-     * APIMethod: activate
-     * Activate the control.
-     * 
-     * Returns:
-     * {Boolean} Successfully activated the control.
-     */
-    activate: function() {
-        this.moveLayerToTop();
-        this.map.events.on({
-            "removelayer": this.handleMapEvents,
-            "changelayer": this.handleMapEvents,
-            scope: this
-        });
-        return (this.handlers.keyboard.activate() &&
-                this.handlers.drag.activate() &&
-                OpenLayers.Control.prototype.activate.apply(this, arguments));
-    },
-
-    /**
-     * APIMethod: deactivate
-     * Deactivate the control.
-     *
-     * Returns: 
-     * {Boolean} Successfully deactivated the control.
-     */
-    deactivate: function() {
-        var deactivated = false;
-        // the return from the controls is unimportant in this case
-        if(OpenLayers.Control.prototype.deactivate.apply(this, arguments)) {
-            this.moveLayerBack();
-            this.map.events.un({
-                "removelayer": this.handleMapEvents,
-                "changelayer": this.handleMapEvents,
-                scope: this
-            });
-            this.layer.removeFeatures(this.vertices, {silent: true});
-            this.layer.removeFeatures(this.virtualVertices, {silent: true});
-            this.vertices = [];
-            this.handlers.drag.deactivate();
-            this.handlers.keyboard.deactivate();
-            var feature = this.feature;
-            if (feature && feature.geometry && feature.layer) {
-                this.unselectFeature(feature);
-            }
-            deactivated = true;
-        }
-        return deactivated;
-    },
-
-    /**
-     * Method: beforeSelectFeature
-     * Called before a feature is selected.
-     *
-     * Parameters:
-     * feature - {<OpenLayers.Feature.Vector>} The feature about to be selected.
-     */
-    beforeSelectFeature: function(feature) {
-        return this.layer.events.triggerEvent(
-            "beforefeaturemodified", {feature: feature}
-        );
-    },
-
-    /**
-     * APIMethod: selectFeature
-     * Select a feature for modification in standalone mode. In non-standalone
-     * mode, this method is called when a feature is selected by clicking.
-     * Register a listener to the beforefeaturemodified event and return false
-     * to prevent feature modification.
-     *
-     * Parameters:
-     * feature - {<OpenLayers.Feature.Vector>} the selected feature.
-     */
-    selectFeature: function(feature) {
-        if (this.feature === feature ||
-           (this.geometryTypes && OpenLayers.Util.indexOf(this.geometryTypes,
-           feature.geometry.CLASS_NAME) == -1)) {
-            return;
-        }
-        if (this.beforeSelectFeature(feature) !== false) {
-            if (this.feature) {
-                this.unselectFeature(this.feature);
-            }
-            this.feature = feature;
-            this.layer.selectedFeatures.push(feature);
-            this.layer.drawFeature(feature, 'select');
-            this.modified = false;
-            this.resetVertices();
-            this.onModificationStart(this.feature);
-        }
-        // keep track of geometry modifications
-        var modified = feature.modified;
-        if (feature.geometry && !(modified && modified.geometry)) {
-            this._originalGeometry = feature.geometry.clone();
-        }
-    },
-
-    /**
-     * APIMethod: unselectFeature
-     * Called when the select feature control unselects a feature.
-     *
-     * Parameters:
-     * feature - {<OpenLayers.Feature.Vector>} The unselected feature.
-     */
-    unselectFeature: function(feature) {
-        this.layer.removeFeatures(this.vertices, {silent: true});
-        this.vertices = [];
-        this.layer.destroyFeatures(this.virtualVertices, {silent: true});
-        this.virtualVertices = [];
-        if(this.dragHandle) {
-            this.layer.destroyFeatures([this.dragHandle], {silent: true});
-            delete this.dragHandle;
-        }
-        if(this.radiusHandle) {
-            this.layer.destroyFeatures([this.radiusHandle], {silent: true});
-            delete this.radiusHandle;
-        }
-        this.layer.drawFeature(this.feature, 'default');
-        this.feature = null;
-        OpenLayers.Util.removeItem(this.layer.selectedFeatures, feature);
-        this.onModificationEnd(feature);
-        this.layer.events.triggerEvent("afterfeaturemodified", {
-            feature: feature,
-            modified: this.modified
-        });
-        this.modified = false;
-    },
-    
-    
-    /**
-     * Method: dragStart
-     * Called by the drag handler before a feature is dragged.  This method is
-     *     used to differentiate between points and vertices
-     *     of higher order geometries.
-     *
-     * Parameters:
-     * feature - {<OpenLayers.Feature.Vector>} The point or vertex about to be
-     *     dragged.
-     */
-    dragStart: function(feature) {
-        var isPoint = feature.geometry.CLASS_NAME ==
-                'OpenLayers.Geometry.Point';
-        if (!this.standalone &&
-                ((!feature._sketch && isPoint) || !feature._sketch)) {
-            if (this.toggle && this.feature === feature) {
-                // mark feature for unselection
-                this._unselect = feature;
-            }
-            this.selectFeature(feature);
-        }
-        if (feature._sketch || isPoint) {
-            // feature is a drag or virtual handle or point
-            this.vertex = feature;
-            this.handlers.drag.stopDown = true;
-        }
-    },
-
-    /**
-     * Method: dragVertex
-     * Called by the drag handler with each drag move of a vertex.
-     *
-     * Parameters:
-     * vertex - {<OpenLayers.Feature.Vector>} The vertex being dragged.
-     * pixel - {<OpenLayers.Pixel>} Pixel location of the mouse event.
-     */
-    dragVertex: function(vertex, pixel) {
-        var pos = this.map.getLonLatFromViewPortPx(pixel);
-        var geom = vertex.geometry;
-        geom.move(pos.lon - geom.x, pos.lat - geom.y);
-        this.modified = true;
-        /**
-         * Five cases:
-         * 1) dragging a simple point
-         * 2) dragging a virtual vertex
-         * 3) dragging a drag handle
-         * 4) dragging a real vertex
-         * 5) dragging a radius handle
-         */
-        if(this.feature.geometry.CLASS_NAME == "OpenLayers.Geometry.Point") {
-            // dragging a simple point
-            this.layer.events.triggerEvent("vertexmodified", {
-                vertex: vertex.geometry,
-                feature: this.feature,
-                pixel: pixel
-            });
-        } else {
-            if(vertex._index) {
-                // dragging a virtual vertex
-                vertex.geometry.parent.addComponent(vertex.geometry,
-                                                    vertex._index);
-                // move from virtual to real vertex
-                delete vertex._index;
-                OpenLayers.Util.removeItem(this.virtualVertices, vertex);
-                this.vertices.push(vertex);
-            } else if(vertex == this.dragHandle) {
-                // dragging a drag handle
-                this.layer.removeFeatures(this.vertices, {silent: true});
-                this.vertices = [];
-                if(this.radiusHandle) {
-                    this.layer.destroyFeatures([this.radiusHandle], {silent: true});
-                    this.radiusHandle = null;
-                }
-            } else if(vertex !== this.radiusHandle) {
-                // dragging a real vertex
-                this.layer.events.triggerEvent("vertexmodified", {
-                    vertex: vertex.geometry,
-                    feature: this.feature,
-                    pixel: pixel
-                });
-            }
-            // dragging a radius handle - no special treatment
-            if(this.virtualVertices.length > 0) {
-                this.layer.destroyFeatures(this.virtualVertices, {silent: true});
-                this.virtualVertices = [];
-            }
-            this.layer.drawFeature(this.feature, this.standalone ? undefined :
-                                            'select');
-        }
-        // keep the vertex on top so it gets the mouseout after dragging
-        // this should be removed in favor of an option to draw under or
-        // maintain node z-index
-        this.layer.drawFeature(vertex);
-    },
-    
-    /**
-     * Method: dragComplete
-     * Called by the drag handler when the feature dragging is complete.
-     *
-     * Parameters:
-     * vertex - {<OpenLayers.Feature.Vector>} The vertex being dragged.
-     */
-    dragComplete: function(vertex) {
-        this.resetVertices();
-        this.setFeatureState();
-        this.onModification(this.feature);
-        this.layer.events.triggerEvent("featuremodified", 
-                                       {feature: this.feature});
-    },
-    
-    /**
-     * Method: setFeatureState
-     * Called when the feature is modified.  If the current state is not
-     *     INSERT or DELETE, the state is set to UPDATE.
-     */
-    setFeatureState: function() {
-        if(this.feature.state != OpenLayers.State.INSERT &&
-           this.feature.state != OpenLayers.State.DELETE) {
-            this.feature.state = OpenLayers.State.UPDATE;
-            if (this.modified && this._originalGeometry) {
-                var feature = this.feature;
-                feature.modified = OpenLayers.Util.extend(feature.modified, {
-                    geometry: this._originalGeometry
-                });
-                delete this._originalGeometry;
-            }
-        }
-    },
-    
-    /**
-     * Method: resetVertices
-     */
-    resetVertices: function() {
-        if(this.vertices.length > 0) {
-            this.layer.removeFeatures(this.vertices, {silent: true});
-            this.vertices = [];
-        }
-        if(this.virtualVertices.length > 0) {
-            this.layer.removeFeatures(this.virtualVertices, {silent: true});
-            this.virtualVertices = [];
-        }
-        if(this.dragHandle) {
-            this.layer.destroyFeatures([this.dragHandle], {silent: true});
-            this.dragHandle = null;
-        }
-        if(this.radiusHandle) {
-            this.layer.destroyFeatures([this.radiusHandle], {silent: true});
-            this.radiusHandle = null;
-        }
-        if(this.feature &&
-           this.feature.geometry.CLASS_NAME != "OpenLayers.Geometry.Point") {
-            if((this.mode & OpenLayers.Control.ModifyFeature.DRAG)) {
-                this.collectDragHandle();
-            }
-            if((this.mode & (OpenLayers.Control.ModifyFeature.ROTATE |
-                             OpenLayers.Control.ModifyFeature.RESIZE))) {
-                this.collectRadiusHandle();
-            }
-            if(this.mode & OpenLayers.Control.ModifyFeature.RESHAPE){
-                // Don't collect vertices when we're resizing
-                if (!(this.mode & OpenLayers.Control.ModifyFeature.RESIZE)){
-                    this.collectVertices();
-                }
-            }
-        }
-    },
-    
-    /**
-     * Method: handleKeypress
-     * Called by the feature handler on keypress.  This is used to delete
-     *     vertices. If the <deleteCode> property is set, vertices will
-     *     be deleted when a feature is selected for modification and
-     *     the mouse is over a vertex.
-     *
-     * Parameters:
-     * evt - {Event} Keypress event.
-     */
-    handleKeypress: function(evt) {
-        var code = evt.keyCode;
-        
-        // check for delete key
-        if(this.feature &&
-           OpenLayers.Util.indexOf(this.deleteCodes, code) != -1) {
-            var vertex = this.layer.getFeatureFromEvent(this.handlers.drag.evt);
-            if (vertex &&
-                    OpenLayers.Util.indexOf(this.vertices, vertex) != -1 &&
-                    !this.handlers.drag.dragging && vertex.geometry.parent) {
-                // remove the vertex
-                vertex.geometry.parent.removeComponent(vertex.geometry);
-                this.layer.events.triggerEvent("vertexremoved", {
-                    vertex: vertex.geometry,
-                    feature: this.feature,
-                    pixel: evt.xy
-                });
-                this.layer.drawFeature(this.feature, this.standalone ?
-                                       undefined : 'select');
-                this.modified = true;
-                this.resetVertices();
-                this.setFeatureState();
-                this.onModification(this.feature);
-                this.layer.events.triggerEvent("featuremodified", 
-                                               {feature: this.feature});
-            }
-        }
-    },
-
-    /**
-     * Method: collectVertices
-     * Collect the vertices from the modifiable feature's geometry and push
-     *     them on to the control's vertices array.
-     */
-    collectVertices: function() {
-        this.vertices = [];
-        this.virtualVertices = [];        
-        var control = this;
-        function collectComponentVertices(geometry) {
-            var i, vertex, component, len;
-            if(geometry.CLASS_NAME == "OpenLayers.Geometry.Point") {
-                vertex = new OpenLayers.Feature.Vector(geometry);
-                vertex._sketch = true;
-                vertex.renderIntent = control.vertexRenderIntent;
-                control.vertices.push(vertex);
-            } else {
-                var numVert = geometry.components.length;
-                if(geometry.CLASS_NAME == "OpenLayers.Geometry.LinearRing") {
-                    numVert -= 1;
-                }
-                for(i=0; i<numVert; ++i) {
-                    component = geometry.components[i];
-                    if(component.CLASS_NAME == "OpenLayers.Geometry.Point") {
-                        vertex = new OpenLayers.Feature.Vector(component);
-                        vertex._sketch = true;
-                        vertex.renderIntent = control.vertexRenderIntent;
-                        control.vertices.push(vertex);
-                    } else {
-                        collectComponentVertices(component);
-                    }
-                }
-                
-                // add virtual vertices in the middle of each edge
-                if (control.createVertices && geometry.CLASS_NAME != "OpenLayers.Geometry.MultiPoint") {
-                    for(i=0, len=geometry.components.length; i<len-1; ++i) {
-                        var prevVertex = geometry.components[i];
-                        var nextVertex = geometry.components[i + 1];
-                        if(prevVertex.CLASS_NAME == "OpenLayers.Geometry.Point" &&
-                           nextVertex.CLASS_NAME == "OpenLayers.Geometry.Point") {
-                            var x = (prevVertex.x + nextVertex.x) / 2;
-                            var y = (prevVertex.y + nextVertex.y) / 2;
-                            var point = new OpenLayers.Feature.Vector(
-                                new OpenLayers.Geometry.Point(x, y),
-                                null, control.virtualStyle
-                            );
-                            // set the virtual parent and intended index
-                            point.geometry.parent = geometry;
-                            point._index = i + 1;
-                            point._sketch = true;
-                            control.virtualVertices.push(point);
-                        }
-                    }
-                }
-            }
-        }
-        collectComponentVertices.call(this, this.feature.geometry);
-        this.layer.addFeatures(this.virtualVertices, {silent: true});
-        this.layer.addFeatures(this.vertices, {silent: true});
-    },
-
-    /**
-     * Method: collectDragHandle
-     * Collect the drag handle for the selected geometry.
-     */
-    collectDragHandle: function() {
-        var geometry = this.feature.geometry;
-        var center = geometry.getBounds().getCenterLonLat();
-        var originGeometry = new OpenLayers.Geometry.Point(
-            center.lon, center.lat
-        );
-        var origin = new OpenLayers.Feature.Vector(originGeometry);
-        originGeometry.move = function(x, y) {
-            OpenLayers.Geometry.Point.prototype.move.call(this, x, y);
-            geometry.move(x, y);
-        };
-        origin._sketch = true;
-        this.dragHandle = origin;
-        this.dragHandle.renderIntent = this.vertexRenderIntent;
-        this.layer.addFeatures([this.dragHandle], {silent: true});
-    },
-
-    /**
-     * Method: collectRadiusHandle
-     * Collect the radius handle for the selected geometry.
-     */
-    collectRadiusHandle: function() {
-        var geometry = this.feature.geometry;
-        var bounds = geometry.getBounds();
-        var center = bounds.getCenterLonLat();
-        var originGeometry = new OpenLayers.Geometry.Point(
-            center.lon, center.lat
-        );
-        var radiusGeometry = new OpenLayers.Geometry.Point(
-            bounds.right, bounds.bottom
-        );
-        var radius = new OpenLayers.Feature.Vector(radiusGeometry);
-        var resize = (this.mode & OpenLayers.Control.ModifyFeature.RESIZE);
-        var reshape = (this.mode & OpenLayers.Control.ModifyFeature.RESHAPE);
-        var rotate = (this.mode & OpenLayers.Control.ModifyFeature.ROTATE);
-
-        radiusGeometry.move = function(x, y) {
-            OpenLayers.Geometry.Point.prototype.move.call(this, x, y);
-            var dx1 = this.x - originGeometry.x;
-            var dy1 = this.y - originGeometry.y;
-            var dx0 = dx1 - x;
-            var dy0 = dy1 - y;
-            if(rotate) {
-                var a0 = Math.atan2(dy0, dx0);
-                var a1 = Math.atan2(dy1, dx1);
-                var angle = a1 - a0;
-                angle *= 180 / Math.PI;
-                geometry.rotate(angle, originGeometry);
-            }
-            if(resize) {
-                var scale, ratio;
-                // 'resize' together with 'reshape' implies that the aspect 
-                // ratio of the geometry will not be preserved whilst resizing 
-                if (reshape) {
-                    scale = dy1 / dy0;
-                    ratio = (dx1 / dx0) / scale;
-                } else {
-                    var l0 = Math.sqrt((dx0 * dx0) + (dy0 * dy0));
-                    var l1 = Math.sqrt((dx1 * dx1) + (dy1 * dy1));
-                    scale = l1 / l0;
-                }
-                geometry.resize(scale, originGeometry, ratio);
-            }
-        };
-        radius._sketch = true;
-        this.radiusHandle = radius;
-        this.radiusHandle.renderIntent = this.vertexRenderIntent;
-        this.layer.addFeatures([this.radiusHandle], {silent: true});
-    },
-
-    /**
-     * Method: setMap
-     * Set the map property for the control and all handlers.
-     *
-     * Parameters:
-     * map - {<OpenLayers.Map>} The control's map.
-     */
-    setMap: function(map) {
-        this.handlers.drag.setMap(map);
-        OpenLayers.Control.prototype.setMap.apply(this, arguments);
-    },
-
-    /**
-     * Method: handleMapEvents
-     * 
-     * Parameters:
-     * evt - {Object}
-     */
-    handleMapEvents: function(evt) {
-        if (evt.type == "removelayer" || evt.property == "order") {
-            this.moveLayerToTop();
-        }
-    },
-
-    /**
-     * Method: moveLayerToTop
-     * Moves the layer for this handler to the top, so mouse events can reach
-     * it.
-     */
-    moveLayerToTop: function() {
-        var index = Math.max(this.map.Z_INDEX_BASE['Feature'] - 1,
-            this.layer.getZIndex()) + 1;
-        this.layer.setZIndex(index);
-        
-    },
-
-    /**
-     * Method: moveLayerBack
-     * Moves the layer back to the position determined by the map's layers
-     * array.
-     */
-    moveLayerBack: function() {
-        var index = this.layer.getZIndex() - 1;
-        if (index >= this.map.Z_INDEX_BASE['Feature']) {
-            this.layer.setZIndex(index);
-        } else {
-            this.map.setLayerZIndex(this.layer,
-                this.map.getLayerIndex(this.layer));
-        }
-    },
-
-    CLASS_NAME: "OpenLayers.Control.ModifyFeature"
-});
-
-/**
- * Constant: RESHAPE
- * {Integer} Constant used to make the control work in reshape mode
- */
-OpenLayers.Control.ModifyFeature.RESHAPE = 1;
-/**
- * Constant: RESIZE
- * {Integer} Constant used to make the control work in resize mode
- */
-OpenLayers.Control.ModifyFeature.RESIZE = 2;
-/**
- * Constant: ROTATE
- * {Integer} Constant used to make the control work in rotate mode
- */
-OpenLayers.Control.ModifyFeature.ROTATE = 4;
-/**
- * Constant: DRAG
- * {Integer} Constant used to make the control work in drag mode
- */
-OpenLayers.Control.ModifyFeature.DRAG = 8;
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/MousePosition.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/MousePosition.js
deleted file mode 100644
index 0c88fcf8..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/MousePosition.js
+++ /dev/null
@@ -1,227 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-
-/**
- * @requires OpenLayers/Control.js
- */
-
-/**
- * Class: OpenLayers.Control.MousePosition
- * The MousePosition control displays geographic coordinates of the mouse
- * pointer, as it is moved about the map.
- *
- * You can use the <prefix>- or <suffix>-properties to provide more information
- * about the displayed coordinates to the user:
- *
- * (code)
- *     var mousePositionCtrl = new OpenLayers.Control.MousePosition({
- *         prefix: '<a target="_blank" ' +
- *             'href="http://spatialreference.org/ref/epsg/4326/">' +
- *             'EPSG:4326</a> coordinates: '
- *         }
- *     );
- * (end code)
- *
- * Inherits from:
- *  - <OpenLayers.Control>
- */
-OpenLayers.Control.MousePosition = OpenLayers.Class(OpenLayers.Control, {
-
-    /**
-     * APIProperty: autoActivate
-     * {Boolean} Activate the control when it is added to a map.  Default is
-     *     true.
-     */
-    autoActivate: true,
-
-    /**
-     * Property: element
-     * {DOMElement}
-     */
-    element: null,
-
-    /**
-     * APIProperty: prefix
-     * {String} A string to be prepended to the current pointers coordinates
-     *     when it is rendered.  Defaults to the empty string ''.
-     */
-    prefix: '',
-
-    /**
-     * APIProperty: separator
-     * {String} A string to be used to seperate the two coordinates from each
-     *     other.  Defaults to the string ', ', which will result in a
-     *     rendered coordinate of e.g. '42.12, 21.22'.
-     */
-    separator: ', ',
-
-    /**
-     * APIProperty: suffix
-     * {String} A string to be appended to the current pointers coordinates
-     *     when it is rendered.  Defaults to the empty string ''.
-     */
-    suffix: '',
-
-    /**
-     * APIProperty: numDigits
-     * {Integer} The number of digits each coordinate shall have when being
-     *     rendered, Defaults to 5.
-     */
-    numDigits: 5,
-
-    /**
-     * APIProperty: granularity
-     * {Integer}
-     */
-    granularity: 10,
-
-    /**
-     * APIProperty: emptyString
-     * {String} Set this to some value to set when the mouse is outside the
-     *     map.
-     */
-    emptyString: null,
-
-    /**
-     * Property: lastXy
-     * {<OpenLayers.Pixel>}
-     */
-    lastXy: null,
-
-    /**
-     * APIProperty: displayProjection
-     * {<OpenLayers.Projection>} The projection in which the mouse position is
-     *     displayed.
-     */
-    displayProjection: null,
-
-    /**
-     * Constructor: OpenLayers.Control.MousePosition
-     *
-     * Parameters:
-     * options - {Object} Options for control.
-     */
-
-    /**
-     * Method: destroy
-     */
-     destroy: function() {
-         this.deactivate();
-         OpenLayers.Control.prototype.destroy.apply(this, arguments);
-     },
-
-    /**
-     * APIMethod: activate
-     */
-    activate: function() {
-        if (OpenLayers.Control.prototype.activate.apply(this, arguments)) {
-            this.map.events.register('mousemove', this, this.redraw);
-            this.map.events.register('mouseout', this, this.reset);
-            this.redraw();
-            return true;
-        } else {
-            return false;
-        }
-    },
-
-    /**
-     * APIMethod: deactivate
-     */
-    deactivate: function() {
-        if (OpenLayers.Control.prototype.deactivate.apply(this, arguments)) {
-            this.map.events.unregister('mousemove', this, this.redraw);
-            this.map.events.unregister('mouseout', this, this.reset);
-            this.element.innerHTML = "";
-            return true;
-        } else {
-            return false;
-        }
-    },
-
-    /**
-     * Method: draw
-     * {DOMElement}
-     */
-    draw: function() {
-        OpenLayers.Control.prototype.draw.apply(this, arguments);
-
-        if (!this.element) {
-            this.div.left = "";
-            this.div.top = "";
-            this.element = this.div;
-        }
-
-        return this.div;
-    },
-
-    /**
-     * Method: redraw
-     */
-    redraw: function(evt) {
-
-        var lonLat;
-
-        if (evt == null) {
-            this.reset();
-            return;
-        } else {
-            if (this.lastXy == null ||
-                Math.abs(evt.xy.x - this.lastXy.x) > this.granularity ||
-                Math.abs(evt.xy.y - this.lastXy.y) > this.granularity)
-            {
-                this.lastXy = evt.xy;
-                return;
-            }
-
-            lonLat = this.map.getLonLatFromPixel(evt.xy);
-            if (!lonLat) {
-                // map has not yet been properly initialized
-                return;
-            }
-            if (this.displayProjection) {
-                lonLat.transform(this.map.getProjectionObject(),
-                                 this.displayProjection );
-            }
-            this.lastXy = evt.xy;
-
-        }
-
-        var newHtml = this.formatOutput(lonLat);
-
-        if (newHtml != this.element.innerHTML) {
-            this.element.innerHTML = newHtml;
-        }
-    },
-
-    /**
-     * Method: reset
-     */
-    reset: function(evt) {
-        if (this.emptyString != null) {
-            this.element.innerHTML = this.emptyString;
-        }
-    },
-
-    /**
-     * Method: formatOutput
-     * Override to provide custom display output
-     *
-     * Parameters:
-     * lonLat - {<OpenLayers.LonLat>} Location to display
-     */
-    formatOutput: function(lonLat) {
-        var digits = parseInt(this.numDigits);
-        var newHtml =
-            this.prefix +
-            lonLat.lon.toFixed(digits) +
-            this.separator +
-            lonLat.lat.toFixed(digits) +
-            this.suffix;
-        return newHtml;
-    },
-
-    CLASS_NAME: "OpenLayers.Control.MousePosition"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/NavToolbar.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/NavToolbar.js
deleted file mode 100644
index b6bc2aa4..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/NavToolbar.js
+++ /dev/null
@@ -1,57 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Control/Panel.js
- * @requires OpenLayers/Control/Navigation.js
- * @requires OpenLayers/Control/ZoomBox.js
- */
-
-/**
- * Class: OpenLayers.Control.NavToolbar
- * This Toolbar is an alternative to the Navigation control that displays
- *     the state of the control, and provides a UI for changing state to
- *     use the zoomBox via a Panel control.
- *
- * If you wish to change the properties of the Navigation control used
- *     in the NavToolbar, see: 
- *     http://trac.openlayers.org/wiki/Toolbars#SubclassingNavToolbar 
- * 
- * 
- * Inherits from:
- *  - <OpenLayers.Control.Panel>
- */
-OpenLayers.Control.NavToolbar = OpenLayers.Class(OpenLayers.Control.Panel, {
-
-    /**
-     * Constructor: OpenLayers.Control.NavToolbar 
-     * Add our two mousedefaults controls.
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be used
-     *     to extend the control.
-     */
-    initialize: function(options) {
-        OpenLayers.Control.Panel.prototype.initialize.apply(this, [options]);
-        this.addControls([
-          new OpenLayers.Control.Navigation(),
-          new OpenLayers.Control.ZoomBox()
-        ]);
-    },
-
-    /**
-     * Method: draw 
-     * calls the default draw, and then activates mouse defaults.
-     */
-    draw: function() {
-        var div = OpenLayers.Control.Panel.prototype.draw.apply(this, arguments);
-        if (this.defaultControl === null) {
-            this.defaultControl = this.controls[0];
-        }
-        return div;
-    },
-
-    CLASS_NAME: "OpenLayers.Control.NavToolbar"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/Navigation.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/Navigation.js
deleted file mode 100644
index d50e1312..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/Navigation.js
+++ /dev/null
@@ -1,345 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Control/ZoomBox.js
- * @requires OpenLayers/Control/DragPan.js
- * @requires OpenLayers/Handler/MouseWheel.js
- * @requires OpenLayers/Handler/Click.js
- */
-
-/**
- * Class: OpenLayers.Control.Navigation
- * The navigation control handles map browsing with mouse events (dragging,
- *     double-clicking, and scrolling the wheel).  Create a new navigation 
- *     control with the <OpenLayers.Control.Navigation> control.  
- * 
- *     Note that this control is added to the map by default (if no controls 
- *     array is sent in the options object to the <OpenLayers.Map> 
- *     constructor).
- * 
- * Inherits:
- *  - <OpenLayers.Control>
- */
-OpenLayers.Control.Navigation = OpenLayers.Class(OpenLayers.Control, {
-
-    /** 
-     * Property: dragPan
-     * {<OpenLayers.Control.DragPan>} 
-     */
-    dragPan: null,
-
-    /**
-     * APIProperty: dragPanOptions
-     * {Object} Options passed to the DragPan control.
-     */
-    dragPanOptions: null,
-
-    /**
-     * Property: pinchZoom
-     * {<OpenLayers.Control.PinchZoom>}
-     */
-    pinchZoom: null,
-
-    /**
-     * APIProperty: pinchZoomOptions
-     * {Object} Options passed to the PinchZoom control.
-     */
-    pinchZoomOptions: null,
-
-    /**
-     * APIProperty: documentDrag
-     * {Boolean} Allow panning of the map by dragging outside map viewport.
-     *     Default is false.
-     */
-    documentDrag: false,
-
-    /** 
-     * Property: zoomBox
-     * {<OpenLayers.Control.ZoomBox>}
-     */
-    zoomBox: null,
-
-    /**
-     * APIProperty: zoomBoxEnabled
-     * {Boolean} Whether the user can draw a box to zoom
-     */
-    zoomBoxEnabled: true, 
-
-    /**
-     * APIProperty: zoomWheelEnabled
-     * {Boolean} Whether the mousewheel should zoom the map
-     */
-    zoomWheelEnabled: true,
-    
-    /**
-     * Property: mouseWheelOptions
-     * {Object} Options passed to the MouseWheel control (only useful if
-     *     <zoomWheelEnabled> is set to true). Default is no options for maps
-     *     with fractionalZoom set to true, otherwise
-     *     {cumulative: false, interval: 50, maxDelta: 6} 
-     */
-    mouseWheelOptions: null,
-
-    /**
-     * APIProperty: handleRightClicks
-     * {Boolean} Whether or not to handle right clicks. Default is false.
-     */
-    handleRightClicks: false,
-
-    /**
-     * APIProperty: zoomBoxKeyMask
-     * {Integer} <OpenLayers.Handler> key code of the key, which has to be
-     *    pressed, while drawing the zoom box with the mouse on the screen. 
-     *    You should probably set handleRightClicks to true if you use this
-     *    with MOD_CTRL, to disable the context menu for machines which use
-     *    CTRL-Click as a right click.
-     * Default: <OpenLayers.Handler.MOD_SHIFT>
-     */
-    zoomBoxKeyMask: OpenLayers.Handler.MOD_SHIFT,
-    
-    /**
-     * APIProperty: autoActivate
-     * {Boolean} Activate the control when it is added to a map.  Default is
-     *     true.
-     */
-    autoActivate: true,
-
-    /**
-     * Constructor: OpenLayers.Control.Navigation
-     * Create a new navigation control
-     * 
-     * Parameters:
-     * options - {Object} An optional object whose properties will be set on
-     *                    the control
-     */
-    initialize: function(options) {
-        this.handlers = {};
-        OpenLayers.Control.prototype.initialize.apply(this, arguments);
-    },
-
-    /**
-     * Method: destroy
-     * The destroy method is used to perform any clean up before the control
-     * is dereferenced.  Typically this is where event listeners are removed
-     * to prevent memory leaks.
-     */
-    destroy: function() {
-        this.deactivate();
-
-        if (this.dragPan) {
-            this.dragPan.destroy();
-        }
-        this.dragPan = null;
-
-        if (this.zoomBox) {
-            this.zoomBox.destroy();
-        }
-        this.zoomBox = null;
-
-        if (this.pinchZoom) {
-            this.pinchZoom.destroy();
-        }
-        this.pinchZoom = null;
-
-        OpenLayers.Control.prototype.destroy.apply(this,arguments);
-    },
-    
-    /**
-     * Method: activate
-     */
-    activate: function() {
-        this.dragPan.activate();
-        if (this.zoomWheelEnabled) {
-            this.handlers.wheel.activate();
-        }    
-        this.handlers.click.activate();
-        if (this.zoomBoxEnabled) {
-            this.zoomBox.activate();
-        }
-        if (this.pinchZoom) {
-            this.pinchZoom.activate();
-        }
-        return OpenLayers.Control.prototype.activate.apply(this,arguments);
-    },
-
-    /**
-     * Method: deactivate
-     */
-    deactivate: function() {
-        if (this.pinchZoom) {
-            this.pinchZoom.deactivate();
-        }
-        this.zoomBox.deactivate();
-        this.dragPan.deactivate();
-        this.handlers.click.deactivate();
-        this.handlers.wheel.deactivate();
-        return OpenLayers.Control.prototype.deactivate.apply(this,arguments);
-    },
-    
-    /**
-     * Method: draw
-     */
-    draw: function() {
-        // disable right mouse context menu for support of right click events
-        if (this.handleRightClicks) {
-            this.map.viewPortDiv.oncontextmenu = OpenLayers.Function.False;
-        }
-
-        var clickCallbacks = { 
-            'click': this.defaultClick,
-            'dblclick': this.defaultDblClick, 
-            'dblrightclick': this.defaultDblRightClick 
-        };
-        var clickOptions = {
-            'double': true, 
-            'stopDouble': true
-        };
-        this.handlers.click = new OpenLayers.Handler.Click(
-            this, clickCallbacks, clickOptions
-        );
-        this.dragPan = new OpenLayers.Control.DragPan(
-            OpenLayers.Util.extend({
-                map: this.map,
-                documentDrag: this.documentDrag
-            }, this.dragPanOptions)
-        );
-        this.zoomBox = new OpenLayers.Control.ZoomBox(
-                    {map: this.map, keyMask: this.zoomBoxKeyMask});
-        this.dragPan.draw();
-        this.zoomBox.draw();
-        var wheelOptions = this.map.fractionalZoom ? {} : {
-            cumulative: false,
-            interval: 50,
-            maxDelta: 6
-        };
-        this.handlers.wheel = new OpenLayers.Handler.MouseWheel(
-            this, {up : this.wheelUp, down: this.wheelDown},
-            OpenLayers.Util.extend(wheelOptions, this.mouseWheelOptions)
-        );
-        if (OpenLayers.Control.PinchZoom) {
-            this.pinchZoom = new OpenLayers.Control.PinchZoom(
-                OpenLayers.Util.extend(
-                    {map: this.map}, this.pinchZoomOptions));
-        }
-    },
-
-    /**
-     * Method: defaultClick
-     *
-     * Parameters:
-     * evt - {Event}
-     */
-    defaultClick: function (evt) {
-        if (evt.lastTouches && evt.lastTouches.length == 2) {
-            this.map.zoomOut();
-        }
-    },
-
-    /**
-     * Method: defaultDblClick 
-     * 
-     * Parameters:
-     * evt - {Event} 
-     */
-    defaultDblClick: function (evt) {
-        this.map.zoomTo(this.map.zoom + 1, evt.xy);
-    },
-
-    /**
-     * Method: defaultDblRightClick 
-     * 
-     * Parameters:
-     * evt - {Event} 
-     */
-    defaultDblRightClick: function (evt) {
-        this.map.zoomTo(this.map.zoom - 1, evt.xy);
-    },
-    
-    /**
-     * Method: wheelChange  
-     *
-     * Parameters:
-     * evt - {Event}
-     * deltaZ - {Integer}
-     */
-    wheelChange: function(evt, deltaZ) {
-        if (!this.map.fractionalZoom) {
-            deltaZ =  Math.round(deltaZ);
-        }
-        var currentZoom = this.map.getZoom(),
-            newZoom = currentZoom + deltaZ;
-        newZoom = Math.max(newZoom, 0);
-        newZoom = Math.min(newZoom, this.map.getNumZoomLevels());
-        if (newZoom === currentZoom) {
-            return;
-        }
-        this.map.zoomTo(newZoom, evt.xy);
-    },
-
-    /** 
-     * Method: wheelUp
-     * User spun scroll wheel up
-     * 
-     * Parameters:
-     * evt - {Event}
-     * delta - {Integer}
-     */
-    wheelUp: function(evt, delta) {
-        this.wheelChange(evt, delta || 1);
-    },
-
-    /** 
-     * Method: wheelDown
-     * User spun scroll wheel down
-     * 
-     * Parameters:
-     * evt - {Event}
-     * delta - {Integer}
-     */
-    wheelDown: function(evt, delta) {
-        this.wheelChange(evt, delta || -1);
-    },
-    
-    /**
-     * Method: disableZoomBox
-     */
-    disableZoomBox : function() {
-        this.zoomBoxEnabled = false;
-        this.zoomBox.deactivate();       
-    },
-    
-    /**
-     * Method: enableZoomBox
-     */
-    enableZoomBox : function() {
-        this.zoomBoxEnabled = true;
-        if (this.active) {
-            this.zoomBox.activate();
-        }    
-    },
-    
-    /**
-     * Method: disableZoomWheel
-     */
-    
-    disableZoomWheel : function() {
-        this.zoomWheelEnabled = false;
-        this.handlers.wheel.deactivate();       
-    },
-    
-    /**
-     * Method: enableZoomWheel
-     */
-    
-    enableZoomWheel : function() {
-        this.zoomWheelEnabled = true;
-        if (this.active) {
-            this.handlers.wheel.activate();
-        }    
-    },
-
-    CLASS_NAME: "OpenLayers.Control.Navigation"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/NavigationHistory.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/NavigationHistory.js
deleted file mode 100644
index bf2f95af..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/NavigationHistory.js
+++ /dev/null
@@ -1,423 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Control.js
- * @requires OpenLayers/Control/Button.js
- */
-
-/**
- * Class: OpenLayers.Control.NavigationHistory
- * A navigation history control.  This is a meta-control, that creates two
- *     dependent controls: <previous> and <next>.  Call the trigger method
- *     on the <previous> and <next> controls to restore previous and next
- *     history states.  The previous and next controls will become active
- *     when there are available states to restore and will become deactive
- *     when there are no states to restore.
- *
- * Inherits from:
- *  - <OpenLayers.Control>
- */
-OpenLayers.Control.NavigationHistory = OpenLayers.Class(OpenLayers.Control, {
-
-    /**
-     * Property: type
-     * {String} Note that this control is not intended to be added directly
-     *     to a control panel.  Instead, add the sub-controls previous and
-     *     next.  These sub-controls are button type controls that activate
-     *     and deactivate themselves.  If this parent control is added to
-     *     a panel, it will act as a toggle.
-     */
-    type: OpenLayers.Control.TYPE_TOGGLE,
-
-    /**
-     * APIProperty: previous
-     * {<OpenLayers.Control>} A button type control whose trigger method restores
-     *     the previous state managed by this control.
-     */
-    previous: null,
-    
-    /**
-     * APIProperty: previousOptions
-     * {Object} Set this property on the options argument of the constructor
-     *     to set optional properties on the <previous> control.
-     */
-    previousOptions: null,
-    
-    /**
-     * APIProperty: next
-     * {<OpenLayers.Control>} A button type control whose trigger method restores
-     *     the next state managed by this control.
-     */
-    next: null,
-
-    /**
-     * APIProperty: nextOptions
-     * {Object} Set this property on the options argument of the constructor
-     *     to set optional properties on the <next> control.
-     */
-    nextOptions: null,
-
-    /**
-     * APIProperty: limit
-     * {Integer} Optional limit on the number of history items to retain.  If
-     *     null, there is no limit.  Default is 50.
-     */
-    limit: 50,
-
-    /**
-     * APIProperty: autoActivate
-     * {Boolean} Activate the control when it is added to a map.  Default is
-     *     true.
-     */
-    autoActivate: true,
-
-    /**
-     * Property: clearOnDeactivate
-     * {Boolean} Clear the history when the control is deactivated.  Default
-     *     is false.
-     */
-    clearOnDeactivate: false,
-
-    /**
-     * Property: registry
-     * {Object} An object with keys corresponding to event types.  Values
-     *     are functions that return an object representing the current state.
-     */
-    registry: null,
-
-    /**
-     * Property: nextStack
-     * {Array} Array of items in the history.
-     */
-    nextStack: null,
-
-    /**
-     * Property: previousStack
-     * {Array} List of items in the history.  First item represents the current
-     *     state.
-     */
-    previousStack: null,
-    
-    /**
-     * Property: listeners
-     * {Object} An object containing properties corresponding to event types.
-     *     This object is used to configure the control and is modified on
-     *     construction.
-     */
-    listeners: null,
-    
-    /**
-     * Property: restoring
-     * {Boolean} Currently restoring a history state.  This is set to true
-     *     before calling restore and set to false after restore returns.
-     */
-    restoring: false,
-    
-    /**
-     * Constructor: OpenLayers.Control.NavigationHistory 
-     * 
-     * Parameters:
-     * options - {Object} An optional object whose properties will be used
-     *     to extend the control.
-     */
-    initialize: function(options) {
-        OpenLayers.Control.prototype.initialize.apply(this, [options]);
-        
-        this.registry = OpenLayers.Util.extend({
-            "moveend": this.getState
-        }, this.registry);
-        
-        var previousOptions = {
-            trigger: OpenLayers.Function.bind(this.previousTrigger, this),
-            displayClass: this.displayClass + " " + this.displayClass + "Previous"
-        };
-        OpenLayers.Util.extend(previousOptions, this.previousOptions);
-        this.previous = new OpenLayers.Control.Button(previousOptions);
-        
-        var nextOptions = {
-            trigger: OpenLayers.Function.bind(this.nextTrigger, this),
-            displayClass: this.displayClass + " " + this.displayClass + "Next"
-        };
-        OpenLayers.Util.extend(nextOptions, this.nextOptions);
-        this.next = new OpenLayers.Control.Button(nextOptions);
-
-        this.clear();
-    },
-    
-    /**
-     * Method: onPreviousChange
-     * Called when the previous history stack changes.
-     *
-     * Parameters:
-     * state - {Object} An object representing the state to be restored
-     *     if previous is triggered again or null if no previous states remain.
-     * length - {Integer} The number of remaining previous states that can
-     *     be restored.
-     */
-    onPreviousChange: function(state, length) {
-        if(state && !this.previous.active) {
-            this.previous.activate();
-        } else if(!state && this.previous.active) {
-            this.previous.deactivate();
-        }
-    },
-    
-    /**
-     * Method: onNextChange
-     * Called when the next history stack changes.
-     *
-     * Parameters:
-     * state - {Object} An object representing the state to be restored
-     *     if next is triggered again or null if no next states remain.
-     * length - {Integer} The number of remaining next states that can
-     *     be restored.
-     */
-    onNextChange: function(state, length) {
-        if(state && !this.next.active) {
-            this.next.activate();
-        } else if(!state && this.next.active) {
-            this.next.deactivate();
-        }
-    },
-    
-    /**
-     * APIMethod: destroy
-     * Destroy the control.
-     */
-    destroy: function() {
-        OpenLayers.Control.prototype.destroy.apply(this);
-        this.previous.destroy();
-        this.next.destroy();
-        this.deactivate();
-        for(var prop in this) {
-            this[prop] = null;
-        }
-    },
-    
-    /** 
-     * Method: setMap
-     * Set the map property for the control and <previous> and <next> child
-     *     controls.
-     *
-     * Parameters:
-     * map - {<OpenLayers.Map>} 
-     */
-    setMap: function(map) {
-        this.map = map;
-        this.next.setMap(map);
-        this.previous.setMap(map);
-    },
-
-    /**
-     * Method: draw
-     * Called when the control is added to the map.
-     */
-    draw: function() {
-        OpenLayers.Control.prototype.draw.apply(this, arguments);
-        this.next.draw();
-        this.previous.draw();
-    },
-    
-    /**
-     * Method: previousTrigger
-     * Restore the previous state.  If no items are in the previous history
-     *     stack, this has no effect.
-     *
-     * Returns:
-     * {Object} Item representing state that was restored.  Undefined if no
-     *     items are in the previous history stack.
-     */
-    previousTrigger: function() {
-        var current = this.previousStack.shift();
-        var state = this.previousStack.shift();
-        if(state != undefined) {
-            this.nextStack.unshift(current);
-            this.previousStack.unshift(state);
-            this.restoring = true;
-            this.restore(state);
-            this.restoring = false;
-            this.onNextChange(this.nextStack[0], this.nextStack.length);
-            this.onPreviousChange(
-                this.previousStack[1], this.previousStack.length - 1
-            );
-        } else {
-            this.previousStack.unshift(current);
-        }
-        return state;
-    },
-    
-    /**
-     * APIMethod: nextTrigger
-     * Restore the next state.  If no items are in the next history
-     *     stack, this has no effect.  The next history stack is populated
-     *     as states are restored from the previous history stack.
-     *
-     * Returns:
-     * {Object} Item representing state that was restored.  Undefined if no
-     *     items are in the next history stack.
-     */
-    nextTrigger: function() {
-        var state = this.nextStack.shift();
-        if(state != undefined) {
-            this.previousStack.unshift(state);
-            this.restoring = true;
-            this.restore(state);
-            this.restoring = false;
-            this.onNextChange(this.nextStack[0], this.nextStack.length);
-            this.onPreviousChange(
-                this.previousStack[1], this.previousStack.length - 1
-            );
-        }
-        return state;
-    },
-    
-    /**
-     * APIMethod: clear
-     * Clear history.
-     */
-    clear: function() {
-        this.previousStack = [];
-        this.previous.deactivate();
-        this.nextStack = [];
-        this.next.deactivate();
-    },
-
-    /**
-     * Method: getState
-     * Get the current state and return it.
-     *
-     * Returns:
-     * {Object} An object representing the current state.
-     */
-    getState: function() {
-        return {
-            center: this.map.getCenter(),
-            resolution: this.map.getResolution(),
-            projection: this.map.getProjectionObject(),
-            units: this.map.getProjectionObject().getUnits() || 
-                this.map.units || this.map.baseLayer.units
-        };
-    },
-
-    /**
-     * Method: restore
-     * Update the state with the given object.
-     *
-     * Parameters:
-     * state - {Object} An object representing the state to restore.
-     */
-    restore: function(state) {
-        var center, zoom;
-        if (this.map.getProjectionObject() == state.projection) { 
-            zoom = this.map.getZoomForResolution(state.resolution);
-            center = state.center;
-        } else {
-            center = state.center.clone();
-            center.transform(state.projection, this.map.getProjectionObject());
-            var sourceUnits = state.units;
-            var targetUnits = this.map.getProjectionObject().getUnits() || 
-                this.map.units || this.map.baseLayer.units;
-            var resolutionFactor = sourceUnits && targetUnits ? 
-                OpenLayers.INCHES_PER_UNIT[sourceUnits] / OpenLayers.INCHES_PER_UNIT[targetUnits] : 1;
-            zoom = this.map.getZoomForResolution(resolutionFactor*state.resolution); 
-        }
-        this.map.setCenter(center, zoom);
-    },
-    
-    /**
-     * Method: setListeners
-     * Sets functions to be registered in the listeners object.
-     */
-    setListeners: function() {
-        this.listeners = {};
-        for(var type in this.registry) {
-            this.listeners[type] = OpenLayers.Function.bind(function() {
-                if(!this.restoring) {
-                    var state = this.registry[type].apply(this, arguments);
-                    this.previousStack.unshift(state);
-                    if(this.previousStack.length > 1) {
-                        this.onPreviousChange(
-                            this.previousStack[1], this.previousStack.length - 1
-                        );
-                    }
-                    if(this.previousStack.length > (this.limit + 1)) {
-                        this.previousStack.pop();
-                    }
-                    if(this.nextStack.length > 0) {
-                        this.nextStack = [];
-                        this.onNextChange(null, 0);
-                    }
-                }
-                return true;
-            }, this);
-        }
-    },
-
-    /**
-     * APIMethod: activate
-     * Activate the control.  This registers any listeners.
-     *
-     * Returns:
-     * {Boolean} Control successfully activated.
-     */
-    activate: function() {
-        var activated = false;
-        if(this.map) {
-            if(OpenLayers.Control.prototype.activate.apply(this)) {
-                if(this.listeners == null) {
-                    this.setListeners();
-                }
-                for(var type in this.listeners) {
-                    this.map.events.register(type, this, this.listeners[type]);
-                }
-                activated = true;
-                if(this.previousStack.length == 0) {
-                    this.initStack();
-                }
-            }
-        }
-        return activated;
-    },
-    
-    /**
-     * Method: initStack
-     * Called after the control is activated if the previous history stack is
-     *     empty.
-     */
-    initStack: function() {
-        if(this.map.getCenter()) {
-            this.listeners.moveend();
-        }
-    },
-    
-    /**
-     * APIMethod: deactivate
-     * Deactivate the control.  This unregisters any listeners.
-     *
-     * Returns:
-     * {Boolean} Control successfully deactivated.
-     */
-    deactivate: function() {
-        var deactivated = false;
-        if(this.map) {
-            if(OpenLayers.Control.prototype.deactivate.apply(this)) {
-                for(var type in this.listeners) {
-                    this.map.events.unregister(
-                        type, this, this.listeners[type]
-                    );
-                }
-                if(this.clearOnDeactivate) {
-                    this.clear();
-                }
-                deactivated = true;
-            }
-        }
-        return deactivated;
-    },
-    
-    CLASS_NAME: "OpenLayers.Control.NavigationHistory"
-});
-
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/OverviewMap.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/OverviewMap.js
deleted file mode 100644
index 50b9300f..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/OverviewMap.js
+++ /dev/null
@@ -1,750 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/** 
- * @requires OpenLayers/Control.js
- * @requires OpenLayers/BaseTypes.js
- * @requires OpenLayers/Events/buttonclick.js
- * @requires OpenLayers/Map.js
- * @requires OpenLayers/Handler/Click.js
- * @requires OpenLayers/Handler/Drag.js
- */
-
-/**
- * Class: OpenLayers.Control.OverviewMap
- * The OverMap control creates a small overview map, useful to display the 
- * extent of a zoomed map and your main map and provide additional 
- * navigation options to the User.  By default the overview map is drawn in
- * the lower right corner of the main map. Create a new overview map with the
- * <OpenLayers.Control.OverviewMap> constructor.
- *
- * Inherits from:
- *  - <OpenLayers.Control>
- */
-OpenLayers.Control.OverviewMap = OpenLayers.Class(OpenLayers.Control, {
-
-    /**
-     * Property: element
-     * {DOMElement} The DOM element that contains the overview map
-     */
-    element: null,
-    
-    /**
-     * APIProperty: ovmap
-     * {<OpenLayers.Map>} A reference to the overview map itself.
-     */
-    ovmap: null,
-
-    /**
-     * APIProperty: size
-     * {<OpenLayers.Size>} The overvew map size in pixels.  Note that this is
-     * the size of the map itself - the element that contains the map (default
-     * class name olControlOverviewMapElement) may have padding or other style
-     * attributes added via CSS.
-     */
-    size: {w: 180, h: 90},
-
-    /**
-     * APIProperty: layers
-     * {Array(<OpenLayers.Layer>)} Ordered list of layers in the overview map.
-     * If none are sent at construction, the base layer for the main map is used.
-     */
-    layers: null,
-    
-    /**
-     * APIProperty: minRectSize
-     * {Integer} The minimum width or height (in pixels) of the extent
-     *     rectangle on the overview map.  When the extent rectangle reaches
-     *     this size, it will be replaced depending on the value of the
-     *     <minRectDisplayClass> property.  Default is 15 pixels.
-     */
-    minRectSize: 15,
-    
-    /**
-     * APIProperty: minRectDisplayClass
-     * {String} Replacement style class name for the extent rectangle when
-     *     <minRectSize> is reached.  This string will be suffixed on to the
-     *     displayClass.  Default is "RectReplacement".
-     *
-     * Example CSS declaration:
-     * (code)
-     * .olControlOverviewMapRectReplacement {
-     *     overflow: hidden;
-     *     cursor: move;
-     *     background-image: url("img/overview_replacement.gif");
-     *     background-repeat: no-repeat;
-     *     background-position: center;
-     * }
-     * (end)
-     */
-    minRectDisplayClass: "RectReplacement",
-
-    /**
-     * APIProperty: minRatio
-     * {Float} The ratio of the overview map resolution to the main map
-     *     resolution at which to zoom farther out on the overview map.
-     */
-    minRatio: 8,
-
-    /**
-     * APIProperty: maxRatio
-     * {Float} The ratio of the overview map resolution to the main map
-     *     resolution at which to zoom farther in on the overview map.
-     */
-    maxRatio: 32,
-    
-    /**
-     * APIProperty: mapOptions
-     * {Object} An object containing any non-default properties to be sent to
-     *     the overview map's map constructor.  These should include any
-     *     non-default options that the main map was constructed with.
-     */
-    mapOptions: null,
-
-    /**
-     * APIProperty: autoPan
-     * {Boolean} Always pan the overview map, so the extent marker remains in
-     *     the center.  Default is false.  If true, when you drag the extent
-     *     marker, the overview map will update itself so the marker returns
-     *     to the center.
-     */
-    autoPan: false,
-    
-    /**
-     * Property: handlers
-     * {Object}
-     */
-    handlers: null,
-
-    /**
-     * Property: resolutionFactor
-     * {Object}
-     */
-    resolutionFactor: 1,
-
-    /**
-     * APIProperty: maximized
-     * {Boolean} Start as maximized (visible). Defaults to false.
-     */
-    maximized: false,
-
-    /**
-     * APIProperty: maximizeTitle
-     * {String}  This property is used for showing a tooltip over the  
-     * maximize div. Defaults to "" (no title).
-     */ 
-    maximizeTitle: "",
-
-    /**
-     * APIProperty: minimizeTitle
-     * {String}  This property is used for showing a tooltip over the  
-     * minimize div. Defaults to "" (no title).
-     */ 
-    minimizeTitle: "",
-
-    /**
-     * Constructor: OpenLayers.Control.OverviewMap
-     * Create a new overview map
-     *
-     * Parameters:
-     * options - {Object} Properties of this object will be set on the overview
-     * map object.  Note, to set options on the map object contained in this
-     * control, set <mapOptions> as one of the options properties.
-     */
-    initialize: function(options) {
-        this.layers = [];
-        this.handlers = {};
-        OpenLayers.Control.prototype.initialize.apply(this, [options]);
-    },
-    
-    /**
-     * APIMethod: destroy
-     * Deconstruct the control
-     */
-    destroy: function() {
-        if (!this.mapDiv) { // we've already been destroyed
-            return;
-        }
-        if (this.handlers.click) {
-            this.handlers.click.destroy();
-        }
-        if (this.handlers.drag) {
-            this.handlers.drag.destroy();
-        }
-
-        this.ovmap && this.ovmap.viewPortDiv.removeChild(this.extentRectangle);
-        this.extentRectangle = null;
-
-        if (this.rectEvents) {
-            this.rectEvents.destroy();
-            this.rectEvents = null;
-        }
-
-        if (this.ovmap) {
-            this.ovmap.destroy();
-            this.ovmap = null;
-        }
-        
-        this.element.removeChild(this.mapDiv);
-        this.mapDiv = null;
-
-        this.div.removeChild(this.element);
-        this.element = null;
-
-        if (this.maximizeDiv) {
-            this.div.removeChild(this.maximizeDiv);
-            this.maximizeDiv = null;
-        }
-        
-        if (this.minimizeDiv) {
-            this.div.removeChild(this.minimizeDiv);
-            this.minimizeDiv = null;
-        }
-
-        this.map.events.un({
-            buttonclick: this.onButtonClick,
-            moveend: this.update,
-            changebaselayer: this.baseLayerDraw,
-            scope: this
-        });
-
-        OpenLayers.Control.prototype.destroy.apply(this, arguments);    
-    },
-
-    /**
-     * Method: draw
-     * Render the control in the browser.
-     */    
-    draw: function() {
-        OpenLayers.Control.prototype.draw.apply(this, arguments);
-        if (this.layers.length === 0) {
-            if (this.map.baseLayer) {
-                var layer = this.map.baseLayer.clone();
-                this.layers = [layer];
-            } else {
-                this.map.events.register("changebaselayer", this, this.baseLayerDraw);
-                return this.div;
-            }
-        }
-
-        // create overview map DOM elements
-        this.element = document.createElement('div');
-        this.element.className = this.displayClass + 'Element';
-        this.element.style.display = 'none';
-
-        this.mapDiv = document.createElement('div');
-        this.mapDiv.style.width = this.size.w + 'px';
-        this.mapDiv.style.height = this.size.h + 'px';
-        this.mapDiv.style.position = 'relative';
-        this.mapDiv.style.overflow = 'hidden';
-        this.mapDiv.id = OpenLayers.Util.createUniqueID('overviewMap');
-        
-        this.extentRectangle = document.createElement('div');
-        this.extentRectangle.style.position = 'absolute';
-        this.extentRectangle.style.zIndex = 1000;  //HACK
-        this.extentRectangle.className = this.displayClass+'ExtentRectangle';
-
-        this.element.appendChild(this.mapDiv);  
-
-        this.div.appendChild(this.element);
-
-        // Optionally add min/max buttons if the control will go in the
-        // map viewport.
-        if(!this.outsideViewport) {
-            this.div.className += " " + this.displayClass + 'Container';
-            // maximize button div
-            var img = OpenLayers.Util.getImageLocation('layer-switcher-maximize.png');
-            this.maximizeDiv = OpenLayers.Util.createAlphaImageDiv(
-                                        this.displayClass + 'MaximizeButton', 
-                                        null, 
-                                        null, 
-                                        img, 
-                                        'absolute');
-            this.maximizeDiv.style.display = 'none';
-            this.maximizeDiv.className = this.displayClass + 'MaximizeButton olButton';
-            if (this.maximizeTitle) {
-                this.maximizeDiv.title = this.maximizeTitle;
-            }
-            this.div.appendChild(this.maximizeDiv);
-    
-            // minimize button div
-            var img = OpenLayers.Util.getImageLocation('layer-switcher-minimize.png');
-            this.minimizeDiv = OpenLayers.Util.createAlphaImageDiv(
-                                        'OpenLayers_Control_minimizeDiv', 
-                                        null, 
-                                        null, 
-                                        img, 
-                                        'absolute');
-            this.minimizeDiv.style.display = 'none';
-            this.minimizeDiv.className = this.displayClass + 'MinimizeButton olButton';
-            if (this.minimizeTitle) {
-                this.minimizeDiv.title = this.minimizeTitle;
-            }
-            this.div.appendChild(this.minimizeDiv);            
-            this.minimizeControl();
-        } else {
-            // show the overview map
-            this.element.style.display = '';
-        }
-        if(this.map.getExtent()) {
-            this.update();
-        }
-        
-        this.map.events.on({
-            buttonclick: this.onButtonClick,
-            moveend: this.update,
-            scope: this
-        });
-        
-        if (this.maximized) {
-            this.maximizeControl();
-        }
-        return this.div;
-    },
-    
-    /**
-     * Method: baseLayerDraw
-     * Draw the base layer - called if unable to complete in the initial draw
-     */
-    baseLayerDraw: function() {
-        this.draw();
-        this.map.events.unregister("changebaselayer", this, this.baseLayerDraw);
-    },
-
-    /**
-     * Method: rectDrag
-     * Handle extent rectangle drag
-     *
-     * Parameters:
-     * px - {<OpenLayers.Pixel>} The pixel location of the drag.
-     */
-    rectDrag: function(px) {
-        var deltaX = this.handlers.drag.last.x - px.x;
-        var deltaY = this.handlers.drag.last.y - px.y;
-        if(deltaX != 0 || deltaY != 0) {
-            var rectTop = this.rectPxBounds.top;
-            var rectLeft = this.rectPxBounds.left;
-            var rectHeight = Math.abs(this.rectPxBounds.getHeight());
-            var rectWidth = this.rectPxBounds.getWidth();
-            // don't allow dragging off of parent element
-            var newTop = Math.max(0, (rectTop - deltaY));
-            newTop = Math.min(newTop,
-                              this.ovmap.size.h - this.hComp - rectHeight);
-            var newLeft = Math.max(0, (rectLeft - deltaX));
-            newLeft = Math.min(newLeft,
-                               this.ovmap.size.w - this.wComp - rectWidth);
-            this.setRectPxBounds(new OpenLayers.Bounds(newLeft,
-                                                       newTop + rectHeight,
-                                                       newLeft + rectWidth,
-                                                       newTop));
-        }
-    },
-    
-    /**
-     * Method: mapDivClick
-     * Handle browser events
-     *
-     * Parameters:
-     * evt - {<OpenLayers.Event>} evt
-     */
-    mapDivClick: function(evt) {
-        var pxCenter = this.rectPxBounds.getCenterPixel();
-        var deltaX = evt.xy.x - pxCenter.x;
-        var deltaY = evt.xy.y - pxCenter.y;
-        var top = this.rectPxBounds.top;
-        var left = this.rectPxBounds.left;
-        var height = Math.abs(this.rectPxBounds.getHeight());
-        var width = this.rectPxBounds.getWidth();
-        var newTop = Math.max(0, (top + deltaY));
-        newTop = Math.min(newTop, this.ovmap.size.h - height);
-        var newLeft = Math.max(0, (left + deltaX));
-        newLeft = Math.min(newLeft, this.ovmap.size.w - width);
-        this.setRectPxBounds(new OpenLayers.Bounds(newLeft,
-                                                   newTop + height,
-                                                   newLeft + width,
-                                                   newTop));
-        this.updateMapToRect();
-    },
-    
-    /**
-     * Method: onButtonClick
-     *
-     * Parameters:
-     * evt - {Event}
-     */
-    onButtonClick: function(evt) {
-        if (evt.buttonElement === this.minimizeDiv) {
-            this.minimizeControl();
-        } else if (evt.buttonElement === this.maximizeDiv) {
-            this.maximizeControl();
-        }
-    },
-
-    /**
-     * Method: maximizeControl
-     * Unhide the control.  Called when the control is in the map viewport.
-     *
-     * Parameters:
-     * e - {<OpenLayers.Event>}
-     */
-    maximizeControl: function(e) {
-        this.element.style.display = '';
-        this.showToggle(false);
-        if (e != null) {
-            OpenLayers.Event.stop(e);                                            
-        }
-    },
-
-    /**
-     * Method: minimizeControl
-     * Hide all the contents of the control, shrink the size, 
-     * add the maximize icon
-     * 
-     * Parameters:
-     * e - {<OpenLayers.Event>}
-     */
-    minimizeControl: function(e) {
-        this.element.style.display = 'none';
-        this.showToggle(true);
-        if (e != null) {
-            OpenLayers.Event.stop(e);                                            
-        }
-    },
-
-    /**
-     * Method: showToggle
-     * Hide/Show the toggle depending on whether the control is minimized
-     *
-     * Parameters:
-     * minimize - {Boolean} 
-     */
-    showToggle: function(minimize) {
-        if (this.maximizeDiv) {
-            this.maximizeDiv.style.display = minimize ? '' : 'none';
-        }
-        if (this.minimizeDiv) {
-            this.minimizeDiv.style.display = minimize ? 'none' : '';
-        }
-    },
-
-    /**
-     * Method: update
-     * Update the overview map after layers move.
-     */
-    update: function() {
-        if(this.ovmap == null) {
-            this.createMap();
-        }
-        
-        if(this.autoPan || !this.isSuitableOverview()) {
-            this.updateOverview();
-        }
-        
-        // update extent rectangle
-        this.updateRectToMap();
-    },
-    
-    /**
-     * Method: isSuitableOverview
-     * Determines if the overview map is suitable given the extent and
-     * resolution of the main map.
-     */
-    isSuitableOverview: function() {
-        var mapExtent = this.map.getExtent();
-        var maxExtent = this.map.getMaxExtent();
-        var testExtent = new OpenLayers.Bounds(
-                                Math.max(mapExtent.left, maxExtent.left),
-                                Math.max(mapExtent.bottom, maxExtent.bottom),
-                                Math.min(mapExtent.right, maxExtent.right),
-                                Math.min(mapExtent.top, maxExtent.top));        
-
-        if (this.ovmap.getProjection() != this.map.getProjection()) {
-            testExtent = testExtent.transform(
-                this.map.getProjectionObject(),
-                this.ovmap.getProjectionObject() );
-        }
-
-        var resRatio = this.ovmap.getResolution() / this.map.getResolution();
-        return ((resRatio > this.minRatio) &&
-                (resRatio <= this.maxRatio) &&
-                (this.ovmap.getExtent().containsBounds(testExtent)));
-    },
-    
-    /**
-     * Method updateOverview
-     * Called by <update> if <isSuitableOverview> returns true
-     */
-    updateOverview: function() {
-        var mapRes = this.map.getResolution();
-        var targetRes = this.ovmap.getResolution();
-        var resRatio = targetRes / mapRes;
-        if(resRatio > this.maxRatio) {
-            // zoom in overview map
-            targetRes = this.minRatio * mapRes;            
-        } else if(resRatio <= this.minRatio) {
-            // zoom out overview map
-            targetRes = this.maxRatio * mapRes;
-        }
-        var center;
-        if (this.ovmap.getProjection() != this.map.getProjection()) {
-            center = this.map.center.clone();
-            center.transform(this.map.getProjectionObject(),
-                this.ovmap.getProjectionObject() );
-        } else {
-            center = this.map.center;
-        }
-        this.ovmap.setCenter(center, this.ovmap.getZoomForResolution(
-            targetRes * this.resolutionFactor));
-        this.updateRectToMap();
-    },
-    
-    /**
-     * Method: createMap
-     * Construct the map that this control contains
-     */
-    createMap: function() {
-        // create the overview map
-        var options = OpenLayers.Util.extend(
-                        {controls: [], maxResolution: 'auto', 
-                         fallThrough: false}, this.mapOptions);
-        this.ovmap = new OpenLayers.Map(this.mapDiv, options);
-        this.ovmap.viewPortDiv.appendChild(this.extentRectangle);
-        
-        // prevent ovmap from being destroyed when the page unloads, because
-        // the OverviewMap control has to do this (and does it).
-        OpenLayers.Event.stopObserving(window, 'unload', this.ovmap.unloadDestroy);
-        
-        this.ovmap.addLayers(this.layers);
-        this.ovmap.zoomToMaxExtent();
-        // check extent rectangle border width
-        this.wComp = parseInt(OpenLayers.Element.getStyle(this.extentRectangle,
-                                               'border-left-width')) +
-                     parseInt(OpenLayers.Element.getStyle(this.extentRectangle,
-                                               'border-right-width'));
-        this.wComp = (this.wComp) ? this.wComp : 2;
-        this.hComp = parseInt(OpenLayers.Element.getStyle(this.extentRectangle,
-                                               'border-top-width')) +
-                     parseInt(OpenLayers.Element.getStyle(this.extentRectangle,
-                                               'border-bottom-width'));
-        this.hComp = (this.hComp) ? this.hComp : 2;
-
-        this.handlers.drag = new OpenLayers.Handler.Drag(
-            this, {move: this.rectDrag, done: this.updateMapToRect},
-            {map: this.ovmap}
-        );
-        this.handlers.click = new OpenLayers.Handler.Click(
-            this, {
-                "click": this.mapDivClick
-            },{
-                "single": true, "double": false,
-                "stopSingle": true, "stopDouble": true,
-                "pixelTolerance": 1,
-                map: this.ovmap
-            }
-        );
-        this.handlers.click.activate();
-        
-        this.rectEvents = new OpenLayers.Events(this, this.extentRectangle,
-                                                null, true);
-        this.rectEvents.register("mouseover", this, function(e) {
-            if(!this.handlers.drag.active && !this.map.dragging) {
-                this.handlers.drag.activate();
-            }
-        });
-        this.rectEvents.register("mouseout", this, function(e) {
-            if(!this.handlers.drag.dragging) {
-                this.handlers.drag.deactivate();
-            }
-        });
-
-        if (this.ovmap.getProjection() != this.map.getProjection()) {
-            var sourceUnits = this.map.getProjectionObject().getUnits() ||
-                this.map.units || this.map.baseLayer.units;
-            var targetUnits = this.ovmap.getProjectionObject().getUnits() ||
-                this.ovmap.units || this.ovmap.baseLayer.units;
-            this.resolutionFactor = sourceUnits && targetUnits ?
-                OpenLayers.INCHES_PER_UNIT[sourceUnits] /
-                OpenLayers.INCHES_PER_UNIT[targetUnits] : 1;
-        }
-    },
-        
-    /**
-     * Method: updateRectToMap
-     * Updates the extent rectangle position and size to match the map extent
-     */
-    updateRectToMap: function() {
-        // If the projections differ we need to reproject
-        var bounds;
-        if (this.ovmap.getProjection() != this.map.getProjection()) {
-            bounds = this.map.getExtent().transform(
-                this.map.getProjectionObject(), 
-                this.ovmap.getProjectionObject() );
-        } else {
-            bounds = this.map.getExtent();
-        }
-        var pxBounds = this.getRectBoundsFromMapBounds(bounds);
-        if (pxBounds) {
-            this.setRectPxBounds(pxBounds);
-        }
-    },
-    
-    /**
-     * Method: updateMapToRect
-     * Updates the map extent to match the extent rectangle position and size
-     */
-    updateMapToRect: function() {
-        var lonLatBounds = this.getMapBoundsFromRectBounds(this.rectPxBounds);
-        if (this.ovmap.getProjection() != this.map.getProjection()) {
-            lonLatBounds = lonLatBounds.transform(
-                this.ovmap.getProjectionObject(),
-                this.map.getProjectionObject() );
-        }
-        this.map.panTo(lonLatBounds.getCenterLonLat());
-    },
-
-    /**
-     * Method: setRectPxBounds
-     * Set extent rectangle pixel bounds.
-     *
-     * Parameters:
-     * pxBounds - {<OpenLayers.Bounds>}
-     */
-    setRectPxBounds: function(pxBounds) {
-        var top = Math.max(pxBounds.top, 0);
-        var left = Math.max(pxBounds.left, 0);
-        var bottom = Math.min(pxBounds.top + Math.abs(pxBounds.getHeight()),
-                              this.ovmap.size.h - this.hComp);
-        var right = Math.min(pxBounds.left + pxBounds.getWidth(),
-                             this.ovmap.size.w - this.wComp);
-        var width = Math.max(right - left, 0);
-        var height = Math.max(bottom - top, 0);
-        if(width < this.minRectSize || height < this.minRectSize) {
-            this.extentRectangle.className = this.displayClass +
-                                             this.minRectDisplayClass;
-            var rLeft = left + (width / 2) - (this.minRectSize / 2);
-            var rTop = top + (height / 2) - (this.minRectSize / 2);
-            this.extentRectangle.style.top = Math.round(rTop) + 'px';
-            this.extentRectangle.style.left = Math.round(rLeft) + 'px';
-            this.extentRectangle.style.height = this.minRectSize + 'px';
-            this.extentRectangle.style.width = this.minRectSize + 'px';
-        } else {
-            this.extentRectangle.className = this.displayClass +
-                                             'ExtentRectangle';
-            this.extentRectangle.style.top = Math.round(top) + 'px';
-            this.extentRectangle.style.left = Math.round(left) + 'px';
-            this.extentRectangle.style.height = Math.round(height) + 'px';
-            this.extentRectangle.style.width = Math.round(width) + 'px';
-        }
-        this.rectPxBounds = new OpenLayers.Bounds(
-            Math.round(left), Math.round(bottom),
-            Math.round(right), Math.round(top)
-        );
-    },
-
-    /**
-     * Method: getRectBoundsFromMapBounds
-     * Get the rect bounds from the map bounds.
-     *
-     * Parameters:
-     * lonLatBounds - {<OpenLayers.Bounds>}
-     *
-     * Returns:
-     * {<OpenLayers.Bounds>}A bounds which is the passed-in map lon/lat extent
-     * translated into pixel bounds for the overview map
-     */
-    getRectBoundsFromMapBounds: function(lonLatBounds) {
-        var leftBottomPx = this.getOverviewPxFromLonLat({
-            lon: lonLatBounds.left,
-            lat: lonLatBounds.bottom
-        });
-        var rightTopPx = this.getOverviewPxFromLonLat({
-            lon: lonLatBounds.right,
-            lat: lonLatBounds.top
-        });
-        var bounds = null;
-        if (leftBottomPx && rightTopPx) {
-            bounds = new OpenLayers.Bounds(leftBottomPx.x, leftBottomPx.y,
-                                           rightTopPx.x, rightTopPx.y);
-        }
-        return bounds;
-    },
-
-    /**
-     * Method: getMapBoundsFromRectBounds
-     * Get the map bounds from the rect bounds.
-     *
-     * Parameters:
-     * pxBounds - {<OpenLayers.Bounds>}
-     *
-     * Returns:
-     * {<OpenLayers.Bounds>} Bounds which is the passed-in overview rect bounds
-     * translated into lon/lat bounds for the overview map
-     */
-    getMapBoundsFromRectBounds: function(pxBounds) {
-        var leftBottomLonLat = this.getLonLatFromOverviewPx({
-            x: pxBounds.left,
-            y: pxBounds.bottom
-        });
-        var rightTopLonLat = this.getLonLatFromOverviewPx({
-            x: pxBounds.right,
-            y: pxBounds.top
-        });
-        return new OpenLayers.Bounds(leftBottomLonLat.lon, leftBottomLonLat.lat,
-                                     rightTopLonLat.lon, rightTopLonLat.lat);
-    },
-
-    /**
-     * Method: getLonLatFromOverviewPx
-     * Get a map location from a pixel location
-     *
-     * Parameters:
-     * overviewMapPx - {<OpenLayers.Pixel>|Object} OpenLayers.Pixel or
-     *                                             an object with a
-     *                                             'x' and 'y' properties.
-     *
-     * Returns:
-     * {Object} Location which is the passed-in overview map
-     * OpenLayers.Pixel, translated into lon/lat by the overview
-     * map. An object with a 'lon' and 'lat' properties.
-     */
-    getLonLatFromOverviewPx: function(overviewMapPx) {
-        var size = this.ovmap.size;
-        var res  = this.ovmap.getResolution();
-        var center = this.ovmap.getExtent().getCenterLonLat();
-    
-        var deltaX = overviewMapPx.x - (size.w / 2);
-        var deltaY = overviewMapPx.y - (size.h / 2);
-
-        return {
-            lon: center.lon + deltaX * res,
-            lat: center.lat - deltaY * res
-        };
-    },
-
-    /**
-     * Method: getOverviewPxFromLonLat
-     * Get a pixel location from a map location
-     *
-     * Parameters:
-     * lonlat - {<OpenLayers.LonLat>|Object} OpenLayers.LonLat or an
-     *     object with a 'lon' and 'lat' properties.
-     *
-     * Returns:
-     * {Object} Location which is the passed-in OpenLayers.LonLat, 
-     * translated into overview map pixels
-     */
-    getOverviewPxFromLonLat: function(lonlat) {
-        var res = this.ovmap.getResolution();
-        var extent = this.ovmap.getExtent();
-        if (extent) {
-            return {
-                x: Math.round(1/res * (lonlat.lon - extent.left)),
-                y: Math.round(1/res * (extent.top - lonlat.lat))
-            };
-        } 
-    },
-
-    CLASS_NAME: 'OpenLayers.Control.OverviewMap'
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/Pan.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/Pan.js
deleted file mode 100644
index d7fcc07c..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/Pan.js
+++ /dev/null
@@ -1,95 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Control/Button.js
- */
-
-/**
- * Class: OpenLayers.Control.Pan
- * The Pan control is a single button to pan the map in one direction. For
- * a more complete control see <OpenLayers.Control.PanPanel>.
- *
- * Inherits from:
- *  - <OpenLayers.Control>
- */
-OpenLayers.Control.Pan = OpenLayers.Class(OpenLayers.Control.Button, {
-
-    /** 
-     * APIProperty: slideFactor
-     * {Integer} Number of pixels by which we'll pan the map in any direction 
-     *     on clicking the arrow buttons, defaults to 50.  If you want to pan
-     *     by some ratio of the map dimensions, use <slideRatio> instead.
-     */
-    slideFactor: 50,
-
-    /** 
-     * APIProperty: slideRatio
-     * {Number} The fraction of map width/height by which we'll pan the map            
-     *     on clicking the arrow buttons.  Default is null.  If set, will
-     *     override <slideFactor>. E.g. if slideRatio is .5, then Pan Up will
-     *     pan up half the map height. 
-     */
-    slideRatio: null,
-
-    /** 
-     * Property: direction
-     * {String} in {'North', 'South', 'East', 'West'}
-     */
-    direction: null,
-
-    /**
-     * Constructor: OpenLayers.Control.Pan 
-     * Control which handles the panning (in any of the cardinal directions)
-     *     of the map by a set px distance. 
-     *
-     * Parameters:
-     * direction - {String} The direction this button should pan.
-     * options - {Object} An optional object whose properties will be used
-     *     to extend the control.
-     */
-    initialize: function(direction, options) {
-    
-        this.direction = direction;
-        this.CLASS_NAME += this.direction;
-        
-        OpenLayers.Control.prototype.initialize.apply(this, [options]);
-    },
-    
-    /**
-     * Method: trigger
-     */
-    trigger: function(){
-        if (this.map) {
-            var getSlideFactor = OpenLayers.Function.bind(function (dim) {
-                return this.slideRatio ?
-                    this.map.getSize()[dim] * this.slideRatio :
-                    this.slideFactor;
-            }, this);
-    
-            switch (this.direction) {
-                case OpenLayers.Control.Pan.NORTH: 
-                    this.map.pan(0, -getSlideFactor("h"));
-                    break;
-                case OpenLayers.Control.Pan.SOUTH: 
-                    this.map.pan(0, getSlideFactor("h"));
-                    break;
-                case OpenLayers.Control.Pan.WEST: 
-                    this.map.pan(-getSlideFactor("w"), 0);
-                    break;
-                case OpenLayers.Control.Pan.EAST: 
-                    this.map.pan(getSlideFactor("w"), 0);
-                    break;
-            }   
-        }
-    },
-
-    CLASS_NAME: "OpenLayers.Control.Pan"
-});
-
-OpenLayers.Control.Pan.NORTH = "North";
-OpenLayers.Control.Pan.SOUTH = "South";
-OpenLayers.Control.Pan.EAST = "East";
-OpenLayers.Control.Pan.WEST = "West";
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/PanPanel.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/PanPanel.js
deleted file mode 100644
index eeedbd0b..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/PanPanel.js
+++ /dev/null
@@ -1,73 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Control/Panel.js
- * @requires OpenLayers/Control/Pan.js
- */
-
-/**
- * Class: OpenLayers.Control.PanPanel
- * The PanPanel is visible control for panning the map North, South, East or
- * West in small steps. By default it is drawn in the top left corner of the
- * map.
- *
- * Note: 
- * If you wish to use this class with the default images and you want 
- *       it to look nice in ie6, you should add the following, conditionally
- *       added css stylesheet to your HTML file:
- * 
- * (code)
- * <!--[if lte IE 6]>
- *   <link rel="stylesheet" href="../theme/default/ie6-style.css" type="text/css" />
- * <![endif]-->
- * (end)
- *
- * Inherits from:
- *  - <OpenLayers.Control.Panel> 
- */
-OpenLayers.Control.PanPanel = OpenLayers.Class(OpenLayers.Control.Panel, {
-
-    /** 
-     * APIProperty: slideFactor
-     * {Integer} Number of pixels by which we'll pan the map in any direction 
-     *     on clicking the arrow buttons, defaults to 50.  If you want to pan
-     *     by some ratio of the map dimensions, use <slideRatio> instead.
-     */
-    slideFactor: 50,
-
-    /** 
-     * APIProperty: slideRatio
-     * {Number} The fraction of map width/height by which we'll pan the map            
-     *     on clicking the arrow buttons.  Default is null.  If set, will
-     *     override <slideFactor>. E.g. if slideRatio is .5, then Pan Up will
-     *     pan up half the map height. 
-     */
-    slideRatio: null,
-
-    /**
-     * Constructor: OpenLayers.Control.PanPanel 
-     * Add the four directional pan buttons.
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be used
-     *     to extend the control.
-     */
-    initialize: function(options) {
-        OpenLayers.Control.Panel.prototype.initialize.apply(this, [options]);
-        var options = {
-            slideFactor: this.slideFactor,
-            slideRatio: this.slideRatio
-        };
-        this.addControls([
-            new OpenLayers.Control.Pan(OpenLayers.Control.Pan.NORTH, options),
-            new OpenLayers.Control.Pan(OpenLayers.Control.Pan.SOUTH, options),
-            new OpenLayers.Control.Pan(OpenLayers.Control.Pan.EAST, options),
-            new OpenLayers.Control.Pan(OpenLayers.Control.Pan.WEST, options)
-        ]);
-    },
-
-    CLASS_NAME: "OpenLayers.Control.PanPanel"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/PanZoom.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/PanZoom.js
deleted file mode 100644
index dd007cf4..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/PanZoom.js
+++ /dev/null
@@ -1,233 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-
-/**
- * @requires OpenLayers/Control.js
- * @requires OpenLayers/Events/buttonclick.js
- */
-
-/**
- * Class: OpenLayers.Control.PanZoom
- * The PanZoom is a visible control, composed of a
- * <OpenLayers.Control.PanPanel> and a <OpenLayers.Control.ZoomPanel>. By
- * default it is drawn in the upper left corner of the map.
- *
- * Inherits from:
- *  - <OpenLayers.Control>
- */
-OpenLayers.Control.PanZoom = OpenLayers.Class(OpenLayers.Control, {
-
-    /** 
-     * APIProperty: slideFactor
-     * {Integer} Number of pixels by which we'll pan the map in any direction 
-     *     on clicking the arrow buttons.  If you want to pan by some ratio
-     *     of the map dimensions, use <slideRatio> instead.
-     */
-    slideFactor: 50,
-
-    /** 
-     * APIProperty: slideRatio
-     * {Number} The fraction of map width/height by which we'll pan the map            
-     *     on clicking the arrow buttons.  Default is null.  If set, will
-     *     override <slideFactor>. E.g. if slideRatio is .5, then the Pan Up
-     *     button will pan up half the map height. 
-     */
-    slideRatio: null,
-
-    /** 
-     * Property: buttons
-     * {Array(DOMElement)} Array of Button Divs 
-     */
-    buttons: null,
-
-    /** 
-     * Property: position
-     * {<OpenLayers.Pixel>} 
-     */
-    position: null,
-
-    /**
-     * Constructor: OpenLayers.Control.PanZoom
-     * 
-     * Parameters:
-     * options - {Object}
-     */
-    initialize: function(options) {
-        this.position = new OpenLayers.Pixel(OpenLayers.Control.PanZoom.X,
-                                             OpenLayers.Control.PanZoom.Y);
-        OpenLayers.Control.prototype.initialize.apply(this, arguments);
-    },
-
-    /**
-     * APIMethod: destroy
-     */
-    destroy: function() {
-        if (this.map) {
-            this.map.events.unregister("buttonclick", this, this.onButtonClick);
-        }
-        this.removeButtons();
-        this.buttons = null;
-        this.position = null;
-        OpenLayers.Control.prototype.destroy.apply(this, arguments);
-    },
-
-    /** 
-     * Method: setMap
-     *
-     * Properties:
-     * map - {<OpenLayers.Map>} 
-     */
-    setMap: function(map) {
-        OpenLayers.Control.prototype.setMap.apply(this, arguments);
-        this.map.events.register("buttonclick", this, this.onButtonClick);
-    },
-
-    /**
-     * Method: draw
-     *
-     * Parameters:
-     * px - {<OpenLayers.Pixel>} 
-     * 
-     * Returns:
-     * {DOMElement} A reference to the container div for the PanZoom control.
-     */
-    draw: function(px) {
-        // initialize our internal div
-        OpenLayers.Control.prototype.draw.apply(this, arguments);
-        px = this.position;
-
-        // place the controls
-        this.buttons = [];
-
-        var sz = {w: 18, h: 18};
-        var centered = new OpenLayers.Pixel(px.x+sz.w/2, px.y);
-
-        this._addButton("panup", "north-mini.png", centered, sz);
-        px.y = centered.y+sz.h;
-        this._addButton("panleft", "west-mini.png", px, sz);
-        this._addButton("panright", "east-mini.png", px.add(sz.w, 0), sz);
-        this._addButton("pandown", "south-mini.png", 
-                        centered.add(0, sz.h*2), sz);
-        this._addButton("zoomin", "zoom-plus-mini.png", 
-                        centered.add(0, sz.h*3+5), sz);
-        this._addButton("zoomworld", "zoom-world-mini.png", 
-                        centered.add(0, sz.h*4+5), sz);
-        this._addButton("zoomout", "zoom-minus-mini.png", 
-                        centered.add(0, sz.h*5+5), sz);
-        return this.div;
-    },
-    
-    /**
-     * Method: _addButton
-     * 
-     * Parameters:
-     * id - {String} 
-     * img - {String} 
-     * xy - {<OpenLayers.Pixel>} 
-     * sz - {<OpenLayers.Size>} 
-     * 
-     * Returns:
-     * {DOMElement} A Div (an alphaImageDiv, to be precise) that contains the
-     *     image of the button, and has all the proper event handlers set.
-     */
-    _addButton:function(id, img, xy, sz) {
-        var imgLocation = OpenLayers.Util.getImageLocation(img);
-        var btn = OpenLayers.Util.createAlphaImageDiv(
-                                    this.id + "_" + id, 
-                                    xy, sz, imgLocation, "absolute");
-        btn.style.cursor = "pointer";
-        //we want to add the outer div
-        this.div.appendChild(btn);
-        btn.action = id;
-        btn.className = "olButton";
-    
-        //we want to remember/reference the outer div
-        this.buttons.push(btn);
-        return btn;
-    },
-    
-    /**
-     * Method: _removeButton
-     * 
-     * Parameters:
-     * btn - {Object}
-     */
-    _removeButton: function(btn) {
-        this.div.removeChild(btn);
-        OpenLayers.Util.removeItem(this.buttons, btn);
-    },
-    
-    /**
-     * Method: removeButtons
-     */
-    removeButtons: function() {
-        for(var i=this.buttons.length-1; i>=0; --i) {
-            this._removeButton(this.buttons[i]);
-        }
-    },
-    
-    /**
-     * Method: onButtonClick
-     *
-     * Parameters:
-     * evt - {Event}
-     */
-    onButtonClick: function(evt) {
-        var btn = evt.buttonElement;
-        switch (btn.action) {
-            case "panup": 
-                this.map.pan(0, -this.getSlideFactor("h"));
-                break;
-            case "pandown": 
-                this.map.pan(0, this.getSlideFactor("h"));
-                break;
-            case "panleft": 
-                this.map.pan(-this.getSlideFactor("w"), 0);
-                break;
-            case "panright": 
-                this.map.pan(this.getSlideFactor("w"), 0);
-                break;
-            case "zoomin": 
-                this.map.zoomIn(); 
-                break;
-            case "zoomout": 
-                this.map.zoomOut(); 
-                break;
-            case "zoomworld": 
-                this.map.zoomToMaxExtent(); 
-                break;
-        }
-    },
-    
-    /**
-     * Method: getSlideFactor
-     *
-     * Parameters:
-     * dim - {String} "w" or "h" (for width or height).
-     *
-     * Returns:
-     * {Number} The slide factor for panning in the requested direction.
-     */
-    getSlideFactor: function(dim) {
-        return this.slideRatio ?
-            this.map.getSize()[dim] * this.slideRatio :
-            this.slideFactor;
-    },
-
-    CLASS_NAME: "OpenLayers.Control.PanZoom"
-});
-
-/**
- * Constant: X
- * {Integer}
- */
-OpenLayers.Control.PanZoom.X = 4;
-
-/**
- * Constant: Y
- * {Integer}
- */
-OpenLayers.Control.PanZoom.Y = 4;
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/PanZoomBar.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/PanZoomBar.js
deleted file mode 100644
index ebf29647..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/PanZoomBar.js
+++ /dev/null
@@ -1,408 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-
-/**
- * @requires OpenLayers/Control/PanZoom.js
- */
-
-/**
- * Class: OpenLayers.Control.PanZoomBar
- * The PanZoomBar is a visible control composed of a
- * <OpenLayers.Control.PanPanel> and a <OpenLayers.Control.ZoomBar>. 
- * By default it is displayed in the upper left corner of the map as 4
- * directional arrows above a vertical slider.
- *
- * Inherits from:
- *  - <OpenLayers.Control.PanZoom>
- */
-OpenLayers.Control.PanZoomBar = OpenLayers.Class(OpenLayers.Control.PanZoom, {
-
-    /** 
-     * APIProperty: zoomStopWidth
-     */
-    zoomStopWidth: 18,
-
-    /** 
-     * APIProperty: zoomStopHeight
-     */
-    zoomStopHeight: 11,
-
-    /** 
-     * Property: slider
-     */
-    slider: null,
-
-    /** 
-     * Property: sliderEvents
-     * {<OpenLayers.Events>}
-     */
-    sliderEvents: null,
-
-    /** 
-     * Property: zoombarDiv
-     * {DOMElement}
-     */
-    zoombarDiv: null,
-
-    /** 
-     * APIProperty: zoomWorldIcon
-     * {Boolean}
-     */
-    zoomWorldIcon: false,
-
-    /**
-     * APIProperty: panIcons
-     * {Boolean} Set this property to false not to display the pan icons. If
-     * false the zoom world icon is placed under the zoom bar. Defaults to
-     * true.
-     */
-    panIcons: true,
-
-    /**
-     * APIProperty: forceFixedZoomLevel
-     * {Boolean} Force a fixed zoom level even though the map has 
-     *     fractionalZoom
-     */
-    forceFixedZoomLevel: false,
-
-    /**
-     * Property: mouseDragStart
-     * {<OpenLayers.Pixel>}
-     */
-    mouseDragStart: null,
-
-    /**
-     * Property: deltaY
-     * {Number} The cumulative vertical pixel offset during a zoom bar drag.
-     */
-    deltaY: null,
-
-    /**
-     * Property: zoomStart
-     * {<OpenLayers.Pixel>}
-     */
-    zoomStart: null,
-
-    /**
-     * Constructor: OpenLayers.Control.PanZoomBar
-     */ 
-
-    /**
-     * APIMethod: destroy
-     */
-    destroy: function() {
-
-        this._removeZoomBar();
-
-        this.map.events.un({
-            "changebaselayer": this.redraw,
-            "updatesize": this.redraw,
-            scope: this
-        });
-
-        OpenLayers.Control.PanZoom.prototype.destroy.apply(this, arguments);
-
-        delete this.mouseDragStart;
-        delete this.zoomStart;
-    },
-    
-    /**
-     * Method: setMap
-     * 
-     * Parameters:
-     * map - {<OpenLayers.Map>} 
-     */
-    setMap: function(map) {
-        OpenLayers.Control.PanZoom.prototype.setMap.apply(this, arguments);
-        this.map.events.on({
-            "changebaselayer": this.redraw,
-            "updatesize": this.redraw,
-            scope: this
-        });
-    },
-
-    /** 
-     * Method: redraw
-     * clear the div and start over.
-     */
-    redraw: function() {
-        if (this.div != null) {
-            this.removeButtons();
-            this._removeZoomBar();
-        }  
-        this.draw();
-    },
-    
-    /**
-    * Method: draw 
-    *
-    * Parameters:
-    * px - {<OpenLayers.Pixel>} 
-    */
-    draw: function(px) {
-        // initialize our internal div
-        OpenLayers.Control.prototype.draw.apply(this, arguments);
-        px = this.position.clone();
-
-        // place the controls
-        this.buttons = [];
-
-        var sz = {w: 18, h: 18};
-        if (this.panIcons) {
-            var centered = new OpenLayers.Pixel(px.x+sz.w/2, px.y);
-            var wposition = sz.w;
-
-            if (this.zoomWorldIcon) {
-                centered = new OpenLayers.Pixel(px.x+sz.w, px.y);
-            }
-
-            this._addButton("panup", "north-mini.png", centered, sz);
-            px.y = centered.y+sz.h;
-            this._addButton("panleft", "west-mini.png", px, sz);
-            if (this.zoomWorldIcon) {
-                this._addButton("zoomworld", "zoom-world-mini.png", px.add(sz.w, 0), sz);
-
-                wposition *= 2;
-            }
-            this._addButton("panright", "east-mini.png", px.add(wposition, 0), sz);
-            this._addButton("pandown", "south-mini.png", centered.add(0, sz.h*2), sz);
-            this._addButton("zoomin", "zoom-plus-mini.png", centered.add(0, sz.h*3+5), sz);
-            centered = this._addZoomBar(centered.add(0, sz.h*4 + 5));
-            this._addButton("zoomout", "zoom-minus-mini.png", centered, sz);
-        }
-        else {
-            this._addButton("zoomin", "zoom-plus-mini.png", px, sz);
-            centered = this._addZoomBar(px.add(0, sz.h));
-            this._addButton("zoomout", "zoom-minus-mini.png", centered, sz);
-            if (this.zoomWorldIcon) {
-                centered = centered.add(0, sz.h+3);
-                this._addButton("zoomworld", "zoom-world-mini.png", centered, sz);
-            }
-        }
-        return this.div;
-    },
-
-    /** 
-    * Method: _addZoomBar
-    * 
-    * Parameters:
-    * centered - {<OpenLayers.Pixel>} where zoombar drawing is to start.
-    */
-    _addZoomBar:function(centered) {
-        var imgLocation = OpenLayers.Util.getImageLocation("slider.png");
-        var id = this.id + "_" + this.map.id;
-        var minZoom = this.map.getMinZoom();
-        var zoomsToEnd = this.map.getNumZoomLevels() - 1 - this.map.getZoom();
-        var slider = OpenLayers.Util.createAlphaImageDiv(id,
-                       centered.add(-1, zoomsToEnd * this.zoomStopHeight), 
-                       {w: 20, h: 9},
-                       imgLocation,
-                       "absolute");
-        slider.style.cursor = "move";
-        this.slider = slider;
-        
-        this.sliderEvents = new OpenLayers.Events(this, slider, null, true,
-                                            {includeXY: true});
-        this.sliderEvents.on({
-            "touchstart": this.zoomBarDown,
-            "touchmove": this.zoomBarDrag,
-            "touchend": this.zoomBarUp,
-            "mousedown": this.zoomBarDown,
-            "mousemove": this.zoomBarDrag,
-            "mouseup": this.zoomBarUp
-        });
-        
-        var sz = {
-            w: this.zoomStopWidth,
-            h: this.zoomStopHeight * (this.map.getNumZoomLevels() - minZoom)
-        };
-        var imgLocation = OpenLayers.Util.getImageLocation("zoombar.png");
-        var div = null;
-        
-        if (OpenLayers.Util.alphaHack()) {
-            var id = this.id + "_" + this.map.id;
-            div = OpenLayers.Util.createAlphaImageDiv(id, centered,
-                                      {w: sz.w, h: this.zoomStopHeight},
-                                      imgLocation,
-                                      "absolute", null, "crop");
-            div.style.height = sz.h + "px";
-        } else {
-            div = OpenLayers.Util.createDiv(
-                        'OpenLayers_Control_PanZoomBar_Zoombar' + this.map.id,
-                        centered,
-                        sz,
-                        imgLocation);
-        }
-        div.style.cursor = "pointer";
-        div.className = "olButton";
-        this.zoombarDiv = div;
-        
-        this.div.appendChild(div);
-
-        this.startTop = parseInt(div.style.top);
-        this.div.appendChild(slider);
-
-        this.map.events.register("zoomend", this, this.moveZoomBar);
-
-        centered = centered.add(0, 
-            this.zoomStopHeight * (this.map.getNumZoomLevels() - minZoom));
-        return centered; 
-    },
-    
-    /**
-     * Method: _removeZoomBar
-     */
-    _removeZoomBar: function() {
-        this.sliderEvents.un({
-            "touchstart": this.zoomBarDown,
-            "touchmove": this.zoomBarDrag,
-            "touchend": this.zoomBarUp,
-            "mousedown": this.zoomBarDown,
-            "mousemove": this.zoomBarDrag,
-            "mouseup": this.zoomBarUp
-        });
-        this.sliderEvents.destroy();
-        
-        this.div.removeChild(this.zoombarDiv);
-        this.zoombarDiv = null;
-        this.div.removeChild(this.slider);
-        this.slider = null;
-        
-        this.map.events.unregister("zoomend", this, this.moveZoomBar);
-    },
-    
-    /**
-     * Method: onButtonClick
-     *
-     * Parameters:
-     * evt - {Event}
-     */
-    onButtonClick: function(evt) {
-        OpenLayers.Control.PanZoom.prototype.onButtonClick.apply(this, arguments);
-        if (evt.buttonElement === this.zoombarDiv) {
-            var levels = evt.buttonXY.y / this.zoomStopHeight;
-            if(this.forceFixedZoomLevel || !this.map.fractionalZoom) {
-                levels = Math.floor(levels);
-            }    
-            var zoom = (this.map.getNumZoomLevels() - 1) - levels; 
-            zoom = Math.min(Math.max(zoom, 0), this.map.getNumZoomLevels() - 1);
-            this.map.zoomTo(zoom);
-        }
-    },
-    
-    /**
-     * Method: passEventToSlider
-     * This function is used to pass events that happen on the div, or the map,
-     * through to the slider, which then does its moving thing.
-     *
-     * Parameters:
-     * evt - {<OpenLayers.Event>} 
-     */
-    passEventToSlider:function(evt) {
-        this.sliderEvents.handleBrowserEvent(evt);
-    },
-    
-    /*
-     * Method: zoomBarDown
-     * event listener for clicks on the slider
-     *
-     * Parameters:
-     * evt - {<OpenLayers.Event>} 
-     */
-    zoomBarDown:function(evt) {
-        if (!OpenLayers.Event.isLeftClick(evt) && !OpenLayers.Event.isSingleTouch(evt)) {
-            return;
-        }
-        this.map.events.on({
-            "touchmove": this.passEventToSlider,
-            "mousemove": this.passEventToSlider,
-            "mouseup": this.passEventToSlider,
-            scope: this
-        });
-        this.mouseDragStart = evt.xy.clone();
-        this.zoomStart = evt.xy.clone();
-        this.div.style.cursor = "move";
-        // reset the div offsets just in case the div moved
-        this.zoombarDiv.offsets = null; 
-        OpenLayers.Event.stop(evt);
-    },
-    
-    /*
-     * Method: zoomBarDrag
-     * This is what happens when a click has occurred, and the client is
-     * dragging.  Here we must ensure that the slider doesn't go beyond the
-     * bottom/top of the zoombar div, as well as moving the slider to its new
-     * visual location
-     *
-     * Parameters:
-     * evt - {<OpenLayers.Event>} 
-     */
-    zoomBarDrag:function(evt) {
-        if (this.mouseDragStart != null) {
-            var deltaY = this.mouseDragStart.y - evt.xy.y;
-            var offsets = OpenLayers.Util.pagePosition(this.zoombarDiv);
-            if ((evt.clientY - offsets[1]) > 0 && 
-                (evt.clientY - offsets[1]) < parseInt(this.zoombarDiv.style.height) - 2) {
-                var newTop = parseInt(this.slider.style.top) - deltaY;
-                this.slider.style.top = newTop+"px";
-                this.mouseDragStart = evt.xy.clone();
-            }
-            // set cumulative displacement
-            this.deltaY = this.zoomStart.y - evt.xy.y;
-            OpenLayers.Event.stop(evt);
-        }
-    },
-    
-    /*
-     * Method: zoomBarUp
-     * Perform cleanup when a mouseup event is received -- discover new zoom
-     * level and switch to it.
-     *
-     * Parameters:
-     * evt - {<OpenLayers.Event>} 
-     */
-    zoomBarUp:function(evt) {
-        if (!OpenLayers.Event.isLeftClick(evt) && evt.type !== "touchend") {
-            return;
-        }
-        if (this.mouseDragStart) {
-            this.div.style.cursor="";
-            this.map.events.un({
-                "touchmove": this.passEventToSlider,
-                "mouseup": this.passEventToSlider,
-                "mousemove": this.passEventToSlider,
-                scope: this
-            });
-            var zoomLevel = this.map.zoom;
-            if (!this.forceFixedZoomLevel && this.map.fractionalZoom) {
-                zoomLevel += this.deltaY/this.zoomStopHeight;
-                zoomLevel = Math.min(Math.max(zoomLevel, 0), 
-                                     this.map.getNumZoomLevels() - 1);
-            } else {
-                zoomLevel += this.deltaY/this.zoomStopHeight;
-                zoomLevel = Math.max(Math.round(zoomLevel), 0);      
-            }
-            this.map.zoomTo(zoomLevel);
-            this.mouseDragStart = null;
-            this.zoomStart = null;
-            this.deltaY = 0;
-            OpenLayers.Event.stop(evt);
-        }
-    },
-    
-    /*
-    * Method: moveZoomBar
-    * Change the location of the slider to match the current zoom level.
-    */
-    moveZoomBar:function() {
-        var newTop = 
-            ((this.map.getNumZoomLevels()-1) - this.map.getZoom()) * 
-            this.zoomStopHeight + this.startTop + 1;
-        this.slider.style.top = newTop + "px";
-    },    
-    
-    CLASS_NAME: "OpenLayers.Control.PanZoomBar"
-});
\ No newline at end of file
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/Panel.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/Panel.js
deleted file mode 100644
index 150afa70..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/Panel.js
+++ /dev/null
@@ -1,431 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Control.js
- * @requires OpenLayers/Events/buttonclick.js
- */
-
-/**
- * Class: OpenLayers.Control.Panel
- * The Panel control is a container for other controls. With it toolbars
- * may be composed.
- *
- * Inherits from:
- *  - <OpenLayers.Control>
- */
-OpenLayers.Control.Panel = OpenLayers.Class(OpenLayers.Control, {
-    /**
-     * Property: controls
-     * {Array(<OpenLayers.Control>)}
-     */
-    controls: null,    
-    
-    /**
-     * APIProperty: autoActivate
-     * {Boolean} Activate the control when it is added to a map.  Default is
-     *     true.
-     */
-    autoActivate: true,
-
-    /** 
-     * APIProperty: defaultControl
-     * {<OpenLayers.Control>} The control which is activated when the control is
-     * activated (turned on), which also happens at instantiation.
-     * If <saveState> is true, <defaultControl> will be nullified after the
-     * first activation of the panel.
-     */
-    defaultControl: null,
-    
-    /**
-     * APIProperty: saveState
-     * {Boolean} If set to true, the active state of this panel's controls will
-     * be stored on panel deactivation, and restored on reactivation. Default
-     * is false.
-     */
-    saveState: false,
-      
-    /**
-     * APIProperty: allowDepress
-     * {Boolean} If is true the <OpenLayers.Control.TYPE_TOOL> controls can 
-     *     be deactivated by clicking the icon that represents them.  Default 
-     *     is false.
-     */
-    allowDepress: false,
-    
-    /**
-     * Property: activeState
-     * {Object} stores the active state of this panel's controls.
-     */
-    activeState: null,
-
-    /**
-     * Constructor: OpenLayers.Control.Panel
-     * Create a new control panel.
-     *
-     * Each control in the panel is represented by an icon. When clicking 
-     *     on an icon, the <activateControl> method is called.
-     *
-     * Specific properties for controls on a panel:
-     * type - {Number} One of <OpenLayers.Control.TYPE_TOOL>,
-     *     <OpenLayers.Control.TYPE_TOGGLE>, <OpenLayers.Control.TYPE_BUTTON>.
-     *     If not provided, <OpenLayers.Control.TYPE_TOOL> is assumed.
-     * title - {string} Text displayed when mouse is over the icon that 
-     *     represents the control.     
-     *
-     * The <OpenLayers.Control.type> of a control determines the behavior when
-     * clicking its icon:
-     * <OpenLayers.Control.TYPE_TOOL> - The control is activated and other
-     *     controls of this type in the same panel are deactivated. This is
-     *     the default type.
-     * <OpenLayers.Control.TYPE_TOGGLE> - The active state of the control is
-     *     toggled.
-     * <OpenLayers.Control.TYPE_BUTTON> - The
-     *     <OpenLayers.Control.Button.trigger> method of the control is called,
-     *     but its active state is not changed.
-     *
-     * If a control is <OpenLayers.Control.active>, it will be drawn with the
-     * olControl[Name]ItemActive class, otherwise with the
-     * olControl[Name]ItemInactive class.
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be used
-     *     to extend the control.
-     */
-    initialize: function(options) {
-        OpenLayers.Control.prototype.initialize.apply(this, [options]);
-        this.controls = [];
-        this.activeState = {};
-    },
-
-    /**
-     * APIMethod: destroy
-     */
-    destroy: function() {
-        if (this.map) {
-            this.map.events.unregister("buttonclick", this, this.onButtonClick);
-        }
-        OpenLayers.Control.prototype.destroy.apply(this, arguments);
-        for (var ctl, i = this.controls.length - 1; i >= 0; i--) {
-            ctl = this.controls[i];
-            if (ctl.events) {
-                ctl.events.un({
-                    activate: this.iconOn,
-                    deactivate: this.iconOff
-                });
-            }
-            ctl.panel_div = null;
-        }
-        this.activeState = null;
-    },
-
-    /**
-     * APIMethod: activate
-     */
-    activate: function() {
-        if (OpenLayers.Control.prototype.activate.apply(this, arguments)) {
-            var control;
-            for (var i=0, len=this.controls.length; i<len; i++) {
-                control = this.controls[i];
-                if (control === this.defaultControl ||
-                            (this.saveState && this.activeState[control.id])) {
-                    control.activate();
-                }
-            }    
-            if (this.saveState === true) {
-                this.defaultControl = null;
-            }
-            this.redraw();
-            return true;
-        } else {
-            return false;
-        }
-    },
-    
-    /**
-     * APIMethod: deactivate
-     */
-    deactivate: function() {
-        if (OpenLayers.Control.prototype.deactivate.apply(this, arguments)) {
-            var control;
-            for (var i=0, len=this.controls.length; i<len; i++) {
-                control = this.controls[i];
-                this.activeState[control.id] = control.deactivate();
-            }    
-            this.redraw();
-            return true;
-        } else {
-            return false;
-        }
-    },
-    
-    /**
-     * Method: draw
-     *
-     * Returns:
-     * {DOMElement}
-     */    
-    draw: function() {
-        OpenLayers.Control.prototype.draw.apply(this, arguments);
-        if (this.outsideViewport) {
-            this.events.attachToElement(this.div);
-            this.events.register("buttonclick", this, this.onButtonClick);
-        } else {
-            this.map.events.register("buttonclick", this, this.onButtonClick);
-        }
-        this.addControlsToMap(this.controls);
-        return this.div;
-    },
-
-    /**
-     * Method: redraw
-     */
-    redraw: function() {
-        for (var l=this.div.childNodes.length, i=l-1; i>=0; i--) {
-            this.div.removeChild(this.div.childNodes[i]);
-        }
-        this.div.innerHTML = "";
-        if (this.active) {
-            for (var i=0, len=this.controls.length; i<len; i++) {
-                this.div.appendChild(this.controls[i].panel_div);
-            }
-        }
-    },
-    
-    /**
-     * APIMethod: activateControl
-     * This method is called when the user click on the icon representing a 
-     *     control in the panel.
-     *
-     * Parameters:
-     * control - {<OpenLayers.Control>}
-     */
-    activateControl: function (control) {
-        if (!this.active) { return false; }
-        if (control.type == OpenLayers.Control.TYPE_BUTTON) {
-            control.trigger();
-            return;
-        }
-        if (control.type == OpenLayers.Control.TYPE_TOGGLE) {
-            if (control.active) {
-                control.deactivate();
-            } else {
-                control.activate();
-            }
-            return;
-        }
-        if (this.allowDepress && control.active) {
-            control.deactivate();
-        } else {
-            var c;
-            for (var i=0, len=this.controls.length; i<len; i++) {
-                c = this.controls[i];
-                if (c != control &&
-                   (c.type === OpenLayers.Control.TYPE_TOOL || c.type == null)) {
-                    c.deactivate();
-                }
-            }
-            control.activate();
-        }
-    },
-
-    /**
-     * APIMethod: addControls
-     * To build a toolbar, you add a set of controls to it. addControls
-     * lets you add a single control or a list of controls to the 
-     * Control Panel.
-     *
-     * Parameters:
-     * controls - {<OpenLayers.Control>} Controls to add in the panel.
-     */    
-    addControls: function(controls) {
-        if (!(OpenLayers.Util.isArray(controls))) {
-            controls = [controls];
-        }
-        this.controls = this.controls.concat(controls);
-
-        for (var i=0, len=controls.length; i<len; i++) {
-            var control = controls[i],
-                element = this.createControlMarkup(control);
-            OpenLayers.Element.addClass(element, 
-                                        control.displayClass + "ItemInactive");
-            OpenLayers.Element.addClass(element, "olButton");
-            if (control.title != ""  && !element.title) {
-                element.title = control.title;
-            }
-            control.panel_div = element;
-        }
-
-        if (this.map) { // map.addControl() has already been called on the panel
-            this.addControlsToMap(controls);
-            this.redraw();
-        }
-    },
-
-    /**
-     * APIMethod: createControlMarkup
-     * This function just creates a div for the control. If specific HTML
-     * markup is needed this function can be overridden in specific classes,
-     * or at panel instantiation time:
-     *
-     * Example:
-     * (code)
-     * var panel = new OpenLayers.Control.Panel({
-     *     defaultControl: control,
-     *     // ovverride createControlMarkup to create actual buttons
-     *     // including texts wrapped into span elements.
-     *     createControlMarkup: function(control) {
-     *         var button = document.createElement('button'),
-     *             span = document.createElement('span');
-     *         if (control.text) {
-     *             span.innerHTML = control.text;
-     *         }
-     *         return button;
-     *     }
-     *  });
-     * (end)
-     *
-     * Parameters:
-     * control - {<OpenLayers.Control>} The control to create the HTML
-     *     markup for.
-     *
-     * Returns:
-     * {DOMElement} The markup.
-     */
-    createControlMarkup: function(control) {
-        return document.createElement("div");
-    },
-   
-    /**
-     * Method: addControlsToMap
-     * Only for internal use in draw() and addControls() methods.
-     *
-     * Parameters:
-     * controls - {Array(<OpenLayers.Control>)} Controls to add into map.
-     */         
-    addControlsToMap: function (controls) {
-        var control;
-        for (var i=0, len=controls.length; i<len; i++) {
-            control = controls[i];
-            if (control.autoActivate === true) {
-                control.autoActivate = false;
-                this.map.addControl(control);
-                control.autoActivate = true;
-            } else {
-                this.map.addControl(control);
-                control.deactivate();
-            }
-            control.events.on({
-                activate: this.iconOn,
-                deactivate: this.iconOff
-            });
-        }  
-    },
-
-    /**
-     * Method: iconOn
-     * Internal use, for use only with "controls[i].events.on/un".
-     */
-     iconOn: function() {
-        var d = this.panel_div; // "this" refers to a control on panel!
-        var re = new RegExp("\\b(" + this.displayClass + "Item)Inactive\\b");
-        d.className = d.className.replace(re, "$1Active");
-    },
-
-    /**
-     * Method: iconOff
-     * Internal use, for use only with "controls[i].events.on/un".
-     */
-     iconOff: function() {
-        var d = this.panel_div; // "this" refers to a control on panel!
-        var re = new RegExp("\\b(" + this.displayClass + "Item)Active\\b");
-        d.className = d.className.replace(re, "$1Inactive");
-    },
-    
-    /**
-     * Method: onButtonClick
-     *
-     * Parameters:
-     * evt - {Event}
-     */
-    onButtonClick: function (evt) {
-        var controls = this.controls,
-            button = evt.buttonElement;
-        for (var i=controls.length-1; i>=0; --i) {
-            if (controls[i].panel_div === button) {
-                this.activateControl(controls[i]);
-                break;
-            }
-        }
-    },
-
-    /**
-     * APIMethod: getControlsBy
-     * Get a list of controls with properties matching the given criteria.
-     *
-     * Parameters:
-     * property - {String} A control property to be matched.
-     * match - {String | Object} A string to match.  Can also be a regular
-     *     expression literal or object.  In addition, it can be any object
-     *     with a method named test.  For reqular expressions or other, if
-     *     match.test(control[property]) evaluates to true, the control will be
-     *     included in the array returned.  If no controls are found, an empty
-     *     array is returned.
-     *
-     * Returns:
-     * {Array(<OpenLayers.Control>)} A list of controls matching the given criteria.
-     *     An empty array is returned if no matches are found.
-     */
-    getControlsBy: function(property, match) {
-        var test = (typeof match.test == "function");
-        var found = OpenLayers.Array.filter(this.controls, function(item) {
-            return item[property] == match || (test && match.test(item[property]));
-        });
-        return found;
-    },
-
-    /**
-     * APIMethod: getControlsByName
-     * Get a list of contorls with names matching the given name.
-     *
-     * Parameters:
-     * match - {String | Object} A control name.  The name can also be a regular
-     *     expression literal or object.  In addition, it can be any object
-     *     with a method named test.  For reqular expressions or other, if
-     *     name.test(control.name) evaluates to true, the control will be included
-     *     in the list of controls returned.  If no controls are found, an empty
-     *     array is returned.
-     *
-     * Returns:
-     * {Array(<OpenLayers.Control>)} A list of controls matching the given name.
-     *     An empty array is returned if no matches are found.
-     */
-    getControlsByName: function(match) {
-        return this.getControlsBy("name", match);
-    },
-
-    /**
-     * APIMethod: getControlsByClass
-     * Get a list of controls of a given type (CLASS_NAME).
-     *
-     * Parameters:
-     * match - {String | Object} A control class name.  The type can also be a
-     *     regular expression literal or object.  In addition, it can be any
-     *     object with a method named test.  For reqular expressions or other,
-     *     if type.test(control.CLASS_NAME) evaluates to true, the control will
-     *     be included in the list of controls returned.  If no controls are
-     *     found, an empty array is returned.
-     *
-     * Returns:
-     * {Array(<OpenLayers.Control>)} A list of controls matching the given type.
-     *     An empty array is returned if no matches are found.
-     */
-    getControlsByClass: function(match) {
-        return this.getControlsBy("CLASS_NAME", match);
-    },
-
-    CLASS_NAME: "OpenLayers.Control.Panel"
-});
-
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/Permalink.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/Permalink.js
deleted file mode 100644
index 3d5d7a28..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/Permalink.js
+++ /dev/null
@@ -1,257 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-
-/**
- * @requires OpenLayers/Control.js
- * @requires OpenLayers/Control/ArgParser.js
- * @requires OpenLayers/Lang.js
- */
-
-/**
- * Class: OpenLayers.Control.Permalink
- * The Permalink control is hyperlink that will return the user to the 
- * current map view. By default it is drawn in the lower right corner of the
- * map. The href is updated as the map is zoomed, panned and whilst layers
- * are switched.
- * 
- * Inherits from:
- *  - <OpenLayers.Control>
- */
-OpenLayers.Control.Permalink = OpenLayers.Class(OpenLayers.Control, {
-    
-    /**
-     * APIProperty: argParserClass
-     * {Class} The ArgParser control class (not instance) to use with this
-     *     control.
-     */
-    argParserClass: OpenLayers.Control.ArgParser,
-
-    /** 
-     * Property: element 
-     * {DOMElement}
-     */
-    element: null,
-    
-    /** 
-     * APIProperty: anchor
-     * {Boolean} This option changes 3 things:
-     *     the character '#' is used in place of the character '?',
-     *     the window.href is updated if no element is provided.
-     *     When this option is set to true it's not recommend to provide
-     *     a base without provide an element.
-     */
-    anchor: false,
-
-    /** 
-     * APIProperty: base
-     * {String}
-     */
-    base: '',
-
-    /** 
-     * APIProperty: displayProjection
-     * {<OpenLayers.Projection>} Requires proj4js support.  Projection used
-     *     when creating the coordinates in the link. This will reproject the
-     *     map coordinates into display coordinates. If you are using this
-     *     functionality, the permalink which is last added to the map will
-     *     determine the coordinate type which is read from the URL, which
-     *     means you should not add permalinks with different
-     *     displayProjections to the same map. 
-     */
-    displayProjection: null, 
-
-    /**
-     * Constructor: OpenLayers.Control.Permalink
-     *
-     * Parameters: 
-     * element - {DOMElement} 
-     * base - {String} 
-     * options - {Object} options to the control.
-     *
-     * Or for anchor:
-     * options - {Object} options to the control.
-     */
-    initialize: function(element, base, options) {
-        if (element !== null && typeof element == 'object' && !OpenLayers.Util.isElement(element)) {
-            options = element;
-            this.base = document.location.href;
-            OpenLayers.Control.prototype.initialize.apply(this, [options]);
-            if (this.element != null) {
-                this.element = OpenLayers.Util.getElement(this.element);
-            }
-        }
-        else {
-            OpenLayers.Control.prototype.initialize.apply(this, [options]);
-            this.element = OpenLayers.Util.getElement(element);
-            this.base = base || document.location.href;
-        }
-    },
-    
-    /**
-     * APIMethod: destroy
-     */
-    destroy: function()  {
-        if (this.element && this.element.parentNode == this.div) {
-            this.div.removeChild(this.element);
-            this.element = null;
-        }
-        if (this.map) {
-            this.map.events.unregister('moveend', this, this.updateLink);
-        }
-
-        OpenLayers.Control.prototype.destroy.apply(this, arguments); 
-    },
-
-    /**
-     * Method: setMap
-     * Set the map property for the control. 
-     * 
-     * Parameters:
-     * map - {<OpenLayers.Map>} 
-     */
-    setMap: function(map) {
-        OpenLayers.Control.prototype.setMap.apply(this, arguments);
-
-        //make sure we have an arg parser attached
-        for(var i=0, len=this.map.controls.length; i<len; i++) {
-            var control = this.map.controls[i];
-            if (control.CLASS_NAME == this.argParserClass.CLASS_NAME) {
-                
-                // If a permalink is added to the map, and an ArgParser already
-                // exists, we override the displayProjection to be the one
-                // on the permalink. 
-                if (control.displayProjection != this.displayProjection) {
-                    this.displayProjection = control.displayProjection;
-                }    
-                
-                break;
-            }
-        }
-        if (i == this.map.controls.length) {
-            this.map.addControl(new this.argParserClass(
-                { 'displayProjection': this.displayProjection }));       
-        }
-
-    },
-
-    /**
-     * Method: draw
-     *
-     * Returns:
-     * {DOMElement}
-     */    
-    draw: function() {
-        OpenLayers.Control.prototype.draw.apply(this, arguments);
-          
-        if (!this.element && !this.anchor) {
-            this.element = document.createElement("a");
-            this.element.innerHTML = OpenLayers.i18n("Permalink");
-            this.element.href="";
-            this.div.appendChild(this.element);
-        }
-        this.map.events.on({
-            'moveend': this.updateLink,
-            'changelayer': this.updateLink,
-            'changebaselayer': this.updateLink,
-            scope: this
-        });
-        
-        // Make it so there is at least a link even though the map may not have
-        // moved yet.
-        this.updateLink();
-        
-        return this.div;
-    },
-   
-    /**
-     * Method: updateLink 
-     */
-    updateLink: function() {
-        var separator = this.anchor ? '#' : '?';
-        var href = this.base;
-        var anchor = null;
-        if (href.indexOf("#") != -1 && this.anchor == false) {
-            anchor = href.substring( href.indexOf("#"), href.length);
-        }
-        if (href.indexOf(separator) != -1) {
-            href = href.substring( 0, href.indexOf(separator) );
-        }
-        var splits = href.split("#");
-        href = splits[0] + separator+ OpenLayers.Util.getParameterString(this.createParams());
-        if (anchor) {
-            href += anchor;
-        }
-        if (this.anchor && !this.element) {
-            window.location.href = href;
-        }
-        else {
-            this.element.href = href;
-        }
-    }, 
-    
-    /**
-     * APIMethod: createParams
-     * Creates the parameters that need to be encoded into the permalink url.
-     * 
-     * Parameters:
-     * center - {<OpenLayers.LonLat>} center to encode in the permalink.
-     *     Defaults to the current map center.
-     * zoom - {Integer} zoom level to encode in the permalink. Defaults to the
-     *     current map zoom level.
-     * layers - {Array(<OpenLayers.Layer>)} layers to encode in the permalink.
-     *     Defaults to the current map layers.
-     * 
-     * Returns:
-     * {Object} Hash of parameters that will be url-encoded into the
-     * permalink.
-     */
-    createParams: function(center, zoom, layers) {
-        center = center || this.map.getCenter();
-          
-        var params = OpenLayers.Util.getParameters(this.base);
-        
-        // If there's still no center, map is not initialized yet. 
-        // Break out of this function, and simply return the params from the
-        // base link.
-        if (center) { 
-
-            //zoom
-            params.zoom = zoom || this.map.getZoom(); 
-
-            //lon,lat
-            var lat = center.lat;
-            var lon = center.lon;
-            
-            if (this.displayProjection) {
-                var mapPosition = OpenLayers.Projection.transform(
-                  { x: lon, y: lat }, 
-                  this.map.getProjectionObject(), 
-                  this.displayProjection );
-                lon = mapPosition.x;  
-                lat = mapPosition.y;  
-            }       
-            params.lat = Math.round(lat*100000)/100000;
-            params.lon = Math.round(lon*100000)/100000;
-    
-            //layers        
-            layers = layers || this.map.layers;  
-            params.layers = '';
-            for (var i=0, len=layers.length; i<len; i++) {
-                var layer = layers[i];
-    
-                if (layer.isBaseLayer) {
-                    params.layers += (layer == this.map.baseLayer) ? "B" : "0";
-                } else {
-                    params.layers += (layer.getVisibility()) ? "T" : "F";           
-                }
-            }
-        }
-
-        return params;
-    }, 
-
-    CLASS_NAME: "OpenLayers.Control.Permalink"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/PinchZoom.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/PinchZoom.js
deleted file mode 100644
index 13c11049..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/PinchZoom.js
+++ /dev/null
@@ -1,157 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Handler/Pinch.js
- */
-
-/**
- * Class: OpenLayers.Control.PinchZoom
- *
- * Inherits:
- *  - <OpenLayers.Control>
- */
-OpenLayers.Control.PinchZoom = OpenLayers.Class(OpenLayers.Control, {
-
-    /** 
-     * Property: type
-     * {OpenLayers.Control.TYPES}
-     */
-    type: OpenLayers.Control.TYPE_TOOL,
-
-    /**
-     * Property: pinchOrigin
-     * {Object} Cached object representing the pinch start (in pixels).
-     */
-    pinchOrigin: null,    
-    
-    /**
-     * Property: currentCenter
-     * {Object} Cached object representing the latest pinch center (in pixels).
-     */
-    currentCenter: null,    
-
-    /**
-     * APIProperty: autoActivate
-     * {Boolean} Activate the control when it is added to a map.  Default is
-     *     true.
-     */
-    autoActivate: true,
-
-    /**
-     * APIProperty: preserveCenter
-     * {Boolean} Set this to true if you don't want the map center to change
-     *     while pinching. For example you may want to set preserveCenter to
-     *     true when the user location is being watched and you want to preserve
-     *     the user location at the center of the map even if he zooms in or
-     *     out using pinch. This property's value can be changed any time on an
-     *     existing instance. Default is false.
-     */
-    preserveCenter: false,
-    
-    /**
-     * APIProperty: handlerOptions
-     * {Object} Used to set non-default properties on the pinch handler
-     */
-
-    /**
-     * Constructor: OpenLayers.Control.PinchZoom
-     * Create a control for zooming with pinch gestures.  This works on devices
-     *     with multi-touch support.
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be set on
-     *                    the control
-     */
-    initialize: function(options) {
-        OpenLayers.Control.prototype.initialize.apply(this, arguments);
-        this.handler = new OpenLayers.Handler.Pinch(this, {
-            start: this.pinchStart,
-            move: this.pinchMove,
-            done: this.pinchDone
-        }, this.handlerOptions);
-    },
-    
-    /**
-     * Method: pinchStart
-     *
-     * Parameters:
-     * evt - {Event}
-     * pinchData - {Object} pinch data object related to the current touchmove
-     *     of the pinch gesture. This give us the current scale of the pinch.
-     */
-    pinchStart: function(evt, pinchData) {
-        var xy = (this.preserveCenter) ?
-            this.map.getPixelFromLonLat(this.map.getCenter()) : evt.xy;
-        this.pinchOrigin = xy;
-        this.currentCenter = xy;
-    },
-    
-    /**
-     * Method: pinchMove
-     *
-     * Parameters:
-     * evt - {Event}
-     * pinchData - {Object} pinch data object related to the current touchmove
-     *     of the pinch gesture. This give us the current scale of the pinch.
-     */
-    pinchMove: function(evt, pinchData) {
-        var scale = pinchData.scale;
-        var containerOrigin = this.map.layerContainerOriginPx;
-        var pinchOrigin = this.pinchOrigin;
-        var current = (this.preserveCenter) ?
-            this.map.getPixelFromLonLat(this.map.getCenter()) : evt.xy;
-
-        var dx = Math.round((containerOrigin.x + current.x - pinchOrigin.x) + (scale - 1) * (containerOrigin.x - pinchOrigin.x));
-        var dy = Math.round((containerOrigin.y + current.y - pinchOrigin.y) + (scale - 1) * (containerOrigin.y - pinchOrigin.y));
-
-        this.map.applyTransform(dx, dy, scale);
-        this.currentCenter = current;
-    },
-
-    /**
-     * Method: pinchDone
-     *
-     * Parameters:
-     * evt - {Event}
-     * start - {Object} pinch data object related to the touchstart event that
-     *     started the pinch gesture.
-     * last - {Object} pinch data object related to the last touchmove event
-     *     of the pinch gesture. This give us the final scale of the pinch.
-     */
-    pinchDone: function(evt, start, last) {
-        this.map.applyTransform();
-        var zoom = this.map.getZoomForResolution(this.map.getResolution() / last.scale, true);
-        if (zoom !== this.map.getZoom() || !this.currentCenter.equals(this.pinchOrigin)) {
-            var resolution = this.map.getResolutionForZoom(zoom);
-
-            var location = this.map.getLonLatFromPixel(this.pinchOrigin);
-            var zoomPixel = this.currentCenter;        
-            var size = this.map.getSize();
-
-            location.lon += resolution * ((size.w / 2) - zoomPixel.x);
-            location.lat -= resolution * ((size.h / 2) - zoomPixel.y);
-
-            // Force a reflow before calling setCenter. This is to work
-            // around an issue occuring in iOS.
-            //
-            // See https://github.com/openlayers/openlayers/pull/351.
-            //
-            // Without a reflow setting the layer container div's top left
-            // style properties to "0px" - as done in Map.moveTo when zoom
-            // is changed - won't actually correctly reposition the layer
-            // container div.
-            //
-            // Also, we need to use a statement that the Google Closure
-            // compiler won't optimize away.
-            this.map.div.clientWidth = this.map.div.clientWidth;
-
-            this.map.setCenter(location, zoom);
-        }
-    },
-
-    CLASS_NAME: "OpenLayers.Control.PinchZoom"
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/SLDSelect.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/SLDSelect.js
deleted file mode 100644
index cd348a79..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/SLDSelect.js
+++ /dev/null
@@ -1,567 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Control.js
- * @requires OpenLayers/Layer/WMS.js
- * @requires OpenLayers/Handler/RegularPolygon.js
- * @requires OpenLayers/Handler/Polygon.js
- * @requires OpenLayers/Handler/Path.js
- * @requires OpenLayers/Handler/Click.js
- * @requires OpenLayers/Filter/Spatial.js
- * @requires OpenLayers/Format/SLD/v1_0_0.js
- */
-
-/**
- * Class: OpenLayers.Control.SLDSelect
- * Perform selections on WMS layers using Styled Layer Descriptor (SLD)
- *
- * Inherits from:
- *  - <OpenLayers.Control>
- */
-OpenLayers.Control.SLDSelect = OpenLayers.Class(OpenLayers.Control, {
-
-    /** 
-     * APIProperty: events
-     * {<OpenLayers.Events>} Events instance for listeners and triggering
-     *     control specific events.
-     *
-     * Register a listener for a particular event with the following syntax:
-     * (code)
-     * control.events.register(type, obj, listener);
-     * (end)
-     *
-     * Supported event types (in addition to those from <OpenLayers.Control.events>):
-     * selected - Triggered when a selection occurs.  Listeners receive an 
-     *     event with *filters* and *layer* properties.  Filters will be an 
-     *     array of OpenLayers.Filter objects created in order to perform 
-     *     the particular selection.
-     */
-
-    /**
-     * APIProperty: clearOnDeactivate
-     * {Boolean} Should the selection be cleared when the control is 
-     *     deactivated. Default value is false.
-     */
-    clearOnDeactivate: false,
-
-    /**
-     * APIProperty: layers
-     * {Array(<OpenLayers.Layer.WMS>)} The WMS layers this control will work 
-     *     on.
-     */
-    layers: null,
-
-    /**
-     * Property: callbacks
-     * {Object} The functions that are sent to the handler for callback
-     */
-    callbacks: null,
-
-    /**
-     * APIProperty: selectionSymbolizer
-     * {Object} Determines the styling of the selected objects. Default is
-     *     a selection in red.
-     */
-    selectionSymbolizer: {
-        'Polygon': {fillColor: '#FF0000', stroke: false},
-        'Line': {strokeColor: '#FF0000', strokeWidth: 2},
-        'Point': {graphicName: 'square', fillColor: '#FF0000', pointRadius: 5}
-    },
-
-    /**
-     * APIProperty: layerOptions
-     * {Object} The options to apply to the selection layer, by default the
-     *     selection layer will be kept out of the layer switcher.
-     */
-    layerOptions: null,
-
-    /**
-     * APIProperty: handlerOptions
-     * {Object} Used to set non-default properties on the control's handler
-     */
-
-    /**
-     * APIProperty: sketchStyle
-     * {<OpenLayers.Style>|Object} Style or symbolizer to use for the sketch
-     * handler. The recommended way of styling the sketch layer, however, is
-     * to configure an <OpenLayers.StyleMap> in the layerOptions of the
-     * <handlerOptions>:
-     * 
-     * (code)
-     * new OpenLayers.Control.SLDSelect(OpenLayers.Handler.Path, {
-     *     handlerOptions: {
-     *         layerOptions: {
-     *             styleMap: new OpenLayers.StyleMap({
-     *                 "default": {strokeColor: "yellow"}
-     *             })
-     *         }
-     *     }
-     * });
-     * (end)
-     */
-    sketchStyle: null,
-
-    /**
-     * APIProperty: wfsCache
-     * {Object} Cache to use for storing parsed results from
-     *     <OpenLayers.Format.WFSDescribeFeatureType.read>. If not provided,
-     *     these will be cached on the prototype.
-     */
-    wfsCache: {},
-
-    /**
-     * APIProperty: layerCache
-     * {Object} Cache to use for storing references to the selection layers.
-     *     Normally each source layer will have exactly 1 selection layer of
-     *     type OpenLayers.Layer.WMS. If not provided, layers will
-     *     be cached on the prototype. Note that if <clearOnDeactivate> is
-     *     true, the layer will no longer be cached after deactivating the
-     *     control.
-     */
-    layerCache: {},
-
-    /**
-     * Constructor: OpenLayers.Control.SLDSelect
-     * Create a new control for selecting features in WMS layers using
-     *     Styled Layer Descriptor (SLD).
-     *
-     * Parameters:
-     * handler - {<OpenLayers.Class>} A sketch handler class. This determines
-     *     the type of selection, e.g. box (<OpenLayers.Handler.Box>), point
-     *     (<OpenLayers.Handler.Point>), path (<OpenLayers.Handler.Path>) or
-     *     polygon (<OpenLayers.Handler.Polygon>) selection. To use circle
-     *     type selection, use <OpenLayers.Handler.RegularPolygon> and pass
-     *     the number of desired sides (e.g. 40) as "sides" property to the
-     *     <handlerOptions>.
-     * options - {Object} An object containing all configuration properties for
-     *     the control.
-     *
-     * Valid options:
-     * layers - Array({<OpenLayers.Layer.WMS>}) The layers to perform the
-     *     selection on.
-     */
-    initialize: function(handler, options) {
-        OpenLayers.Control.prototype.initialize.apply(this, [options]);
-
-        this.callbacks = OpenLayers.Util.extend({done: this.select, 
-            click: this.select}, this.callbacks);
-        this.handlerOptions = this.handlerOptions || {};
-        this.layerOptions = OpenLayers.Util.applyDefaults(this.layerOptions, {
-            displayInLayerSwitcher: false,
-            tileOptions: {maxGetUrlLength: 2048}
-        });
-        if (this.sketchStyle) {
-            this.handlerOptions.layerOptions = OpenLayers.Util.applyDefaults(
-                this.handlerOptions.layerOptions,
-                {styleMap: new OpenLayers.StyleMap({"default": this.sketchStyle})}
-            );
-        }
-        this.handler = new handler(this, this.callbacks, this.handlerOptions);
-    },
-
-    /**
-     * APIMethod: destroy
-     * Take care of things that are not handled in superclass.
-     */
-    destroy: function() {
-        for (var key in this.layerCache) {
-            delete this.layerCache[key];
-        }
-        for (var key in this.wfsCache) {
-            delete this.wfsCache[key];
-        }
-        OpenLayers.Control.prototype.destroy.apply(this, arguments);
-    },
-
-    /**
-     * Method: coupleLayerVisiblity
-     * Couple the selection layer and the source layer with respect to
-     *     layer visibility. So if the source layer is turned off, the
-     *     selection layer is also turned off.
-     *
-     * Context: 
-     * - {<OpenLayers.Layer>}
-     *
-     * Parameters:
-     * evt - {Object}
-     */
-    coupleLayerVisiblity: function(evt) {
-        this.setVisibility(evt.object.getVisibility());
-    },
-
-    /**
-     * Method: createSelectionLayer
-     * Creates a "clone" from the source layer in which the selection can
-     * be drawn. This ensures both the source layer and the selection are 
-     * visible and not only the selection.
-     *
-     * Parameters:
-     * source - {<OpenLayers.Layer.WMS>} The source layer on which the selection
-     *     is performed.
-     *
-     * Returns:
-     * {<OpenLayers.Layer.WMS>} A WMS layer with maxGetUrlLength configured to 2048
-     *     since SLD selections can easily get quite long.
-     */
-    createSelectionLayer: function(source) {
-        // check if we already have a selection layer for the source layer
-        var selectionLayer;
-        if (!this.layerCache[source.id]) {
-            selectionLayer = new OpenLayers.Layer.WMS(source.name, 
-                source.url, source.params, 
-                OpenLayers.Util.applyDefaults(
-                    this.layerOptions,
-                    source.getOptions())
-            );
-            this.layerCache[source.id] = selectionLayer;
-            // make sure the layers are coupled wrt visibility, but only
-            // if they are not displayed in the layer switcher, because in
-            // that case the user cannot control visibility.
-            if (this.layerOptions.displayInLayerSwitcher === false) {
-                source.events.on({
-                    "visibilitychanged": this.coupleLayerVisiblity,
-                    scope: selectionLayer});
-            }
-            this.map.addLayer(selectionLayer);
-        } else {
-            selectionLayer = this.layerCache[source.id];
-        }
-        return selectionLayer;
-    },
-
-    /**
-     * Method: createSLD
-     * Create the SLD document for the layer using the supplied filters.
-     *
-     * Parameters:
-     * layer - {<OpenLayers.Layer.WMS>}
-     * filters - Array({<OpenLayers.Filter>}) The filters to be applied.
-     * geometryAttributes - Array({Object}) The geometry attributes of the 
-     *     layer.
-     *
-     * Returns:
-     * {String} The SLD document generated as a string.
-     */
-    createSLD: function(layer, filters, geometryAttributes) {
-        var sld = {version: "1.0.0", namedLayers: {}};
-        var layerNames = [layer.params.LAYERS].join(",").split(",");
-        for (var i=0, len=layerNames.length; i<len; i++) { 
-            var name = layerNames[i];
-            sld.namedLayers[name] = {name: name, userStyles: []};
-            var symbolizer = this.selectionSymbolizer;
-            var geometryAttribute = geometryAttributes[i];
-            if (geometryAttribute.type.indexOf('Polygon') >= 0) {
-                symbolizer = {Polygon: this.selectionSymbolizer['Polygon']};
-            } else if (geometryAttribute.type.indexOf('LineString') >= 0) {
-                symbolizer = {Line: this.selectionSymbolizer['Line']};
-            } else if (geometryAttribute.type.indexOf('Point') >= 0) {
-                symbolizer = {Point: this.selectionSymbolizer['Point']};
-            }
-            var filter = filters[i];
-            sld.namedLayers[name].userStyles.push({name: 'default', rules: [
-                new OpenLayers.Rule({symbolizer: symbolizer, 
-                    filter: filter, 
-                    maxScaleDenominator: layer.options.minScale})
-            ]});
-        }
-        return new OpenLayers.Format.SLD({srsName: this.map.getProjection()}).write(sld);
-    },
-
-    /**
-     * Method: parseDescribeLayer
-     * Parse the SLD WMS DescribeLayer response and issue the corresponding
-     *     WFS DescribeFeatureType request
-     *
-     * request - {XMLHttpRequest} The request object.
-     */
-    parseDescribeLayer: function(request) {
-        var format = new OpenLayers.Format.WMSDescribeLayer();
-        var doc = request.responseXML;
-        if(!doc || !doc.documentElement) {
-            doc = request.responseText;
-        }
-        var describeLayer = format.read(doc);
-        var typeNames = [];
-        var url = null;
-        for (var i=0, len=describeLayer.length; i<len; i++) {
-            // perform a WFS DescribeFeatureType request
-            if (describeLayer[i].owsType == "WFS") {
-                typeNames.push(describeLayer[i].typeName);
-                url = describeLayer[i].owsURL;
-            }
-        }
-        var options = {
-            url: url,
-            params: {
-                SERVICE: "WFS",
-                TYPENAME: typeNames.toString(),
-                REQUEST: "DescribeFeatureType",
-                VERSION: "1.0.0"
-            },
-            callback: function(request) {
-                var format = new OpenLayers.Format.WFSDescribeFeatureType();
-                var doc = request.responseXML;
-                if(!doc || !doc.documentElement) {
-                    doc = request.responseText;
-                }
-                var describeFeatureType = format.read(doc);
-                this.control.wfsCache[this.layer.id] = describeFeatureType;
-                this.control._queue && this.control.applySelection();
-            },
-            scope: this
-        };
-        OpenLayers.Request.GET(options);
-    },
-
-   /**
-    * Method: getGeometryAttributes
-    * Look up the geometry attributes from the WFS DescribeFeatureType response
-    *
-    * Parameters:
-    * layer - {<OpenLayers.Layer.WMS>} The layer for which to look up the 
-    *     geometry attributes.
-    *
-    * Returns:
-    * Array({Object}) Array of geometry attributes
-    */ 
-   getGeometryAttributes: function(layer) {
-        var result = [];
-        var cache = this.wfsCache[layer.id];
-        for (var i=0, len=cache.featureTypes.length; i<len; i++) {
-            var typeName = cache.featureTypes[i];
-            var properties = typeName.properties;
-            for (var j=0, lenj=properties.length; j < lenj; j++) {
-                var property = properties[j];
-                var type = property.type;
-                if ((type.indexOf('LineString') >= 0) ||
-                    (type.indexOf('GeometryAssociationType') >=0) ||
-                    (type.indexOf('GeometryPropertyType') >= 0) ||
-                    (type.indexOf('Point') >= 0) ||
-                    (type.indexOf('Polygon') >= 0) ) {
-                        result.push(property);
-                }
-            }
-        }
-        return result;
-    },
-
-    /**
-     * APIMethod: activate
-     * Activate the control. Activating the control will perform a SLD WMS
-     *     DescribeLayer request followed by a WFS DescribeFeatureType request
-     *     so that the proper symbolizers can be chosen based on the geometry
-     *     type.
-     */
-    activate: function() {
-        var activated = OpenLayers.Control.prototype.activate.call(this);
-        if(activated) {
-            for (var i=0, len=this.layers.length; i<len; i++) {
-                var layer = this.layers[i];
-                if (layer && !this.wfsCache[layer.id]) {
-                    var options = {
-                        url: layer.url,
-                        params: {
-                            SERVICE: "WMS",
-                            VERSION: layer.params.VERSION,
-                            LAYERS: layer.params.LAYERS,
-                            REQUEST: "DescribeLayer"
-                        },
-                        callback: this.parseDescribeLayer,
-                        scope: {layer: layer, control: this}
-                    };
-                    OpenLayers.Request.GET(options);
-                }
-            }
-        }
-        return activated;
-    },
-
-    /**
-     * APIMethod: deactivate
-     * Deactivate the control. If clearOnDeactivate is true, remove the
-     *     selection layer(s).
-     */
-    deactivate: function() {
-        var deactivated = OpenLayers.Control.prototype.deactivate.call(this);
-        if(deactivated) {
-            for (var i=0, len=this.layers.length; i<len; i++) {
-                var layer = this.layers[i];
-                if (layer && this.clearOnDeactivate === true) {
-                    var layerCache = this.layerCache;
-                    var selectionLayer = layerCache[layer.id];
-                    if (selectionLayer) {
-                        layer.events.un({
-                            "visibilitychanged": this.coupleLayerVisiblity,
-                            scope: selectionLayer});
-                        selectionLayer.destroy();
-                        delete layerCache[layer.id];
-                    }
-                }
-            }
-        }
-        return deactivated;
-    },
-
-    /**
-     * APIMethod: setLayers
-     * Set the layers on which the selection should be performed.  Call the 
-     *     setLayers method if the layer(s) to be used change and the same 
-     *     control should be used on a new set of layers.
-     *     If the control is already active, it will be active after the new
-     *     set of layers is set.
-     *
-     * Parameters:
-     * layers - {Array(<OpenLayers.Layer.WMS>)}  The new set of layers on which 
-     *     the selection should be performed.
-     */
-    setLayers: function(layers) {
-        if(this.active) {
-            this.deactivate();
-            this.layers = layers;
-            this.activate();
-        } else {
-            this.layers = layers;
-        }
-    },
-
-    /**
-     * Function: createFilter
-     * Create the filter to be used in the SLD.
-     *
-     * Parameters:
-     * geometryAttribute - {Object} Used to get the name of the geometry 
-     *     attribute which is needed for constructing the spatial filter.
-     * geometry - {<OpenLayers.Geometry>} The geometry to use.
-     *
-     * Returns:
-     * {<OpenLayers.Filter.Spatial>} The spatial filter created.
-     */
-    createFilter: function(geometryAttribute, geometry) {
-        var filter = null;
-        if (this.handler instanceof OpenLayers.Handler.RegularPolygon) {
-            // box
-            if (this.handler.irregular === true) {
-                filter = new OpenLayers.Filter.Spatial({
-                    type: OpenLayers.Filter.Spatial.BBOX,
-                    property: geometryAttribute.name,
-                    value: geometry.getBounds()}
-                );
-            } else {
-                filter = new OpenLayers.Filter.Spatial({
-                    type: OpenLayers.Filter.Spatial.INTERSECTS,
-                    property: geometryAttribute.name,
-                    value: geometry}
-                );
-            }
-        } else if (this.handler instanceof OpenLayers.Handler.Polygon) {
-            filter = new OpenLayers.Filter.Spatial({
-                type: OpenLayers.Filter.Spatial.INTERSECTS,
-                property: geometryAttribute.name,
-                value: geometry}
-            );
-        } else if (this.handler instanceof OpenLayers.Handler.Path) {
-            // if source layer is point based, use DWITHIN instead
-            if (geometryAttribute.type.indexOf('Point') >= 0) {
-                filter = new OpenLayers.Filter.Spatial({
-                    type: OpenLayers.Filter.Spatial.DWITHIN,
-                    property: geometryAttribute.name,
-                    distance: this.map.getExtent().getWidth()*0.01 ,
-                    distanceUnits: this.map.getUnits(),
-                    value: geometry}
-                );
-            } else {
-                filter = new OpenLayers.Filter.Spatial({
-                    type: OpenLayers.Filter.Spatial.INTERSECTS,
-                    property: geometryAttribute.name,
-                    value: geometry}
-                );
-            }
-        } else if (this.handler instanceof OpenLayers.Handler.Click) {
-            if (geometryAttribute.type.indexOf('Polygon') >= 0) {
-                filter = new OpenLayers.Filter.Spatial({
-                    type: OpenLayers.Filter.Spatial.INTERSECTS,
-                    property: geometryAttribute.name,
-                    value: geometry}
-                );
-            } else {
-                filter = new OpenLayers.Filter.Spatial({
-                    type: OpenLayers.Filter.Spatial.DWITHIN,
-                    property: geometryAttribute.name,
-                    distance: this.map.getExtent().getWidth()*0.01 ,
-                    distanceUnits: this.map.getUnits(),
-                    value: geometry}
-                );
-            }
-        }
-        return filter;
-    },
-
-    /**
-     * Method: select
-     * When the handler is done, use SLD_BODY on the selection layer to
-     *     display the selection in the map.
-     *
-     * Parameters:
-     * geometry - {Object} or {<OpenLayers.Geometry>}
-     */
-    select: function(geometry) {
-        this._queue = function() {
-            for (var i=0, len=this.layers.length; i<len; i++) {
-                var layer = this.layers[i];
-                var geometryAttributes = this.getGeometryAttributes(layer);
-                var filters = [];
-                for (var j=0, lenj=geometryAttributes.length; j<lenj; j++) {
-                    var geometryAttribute = geometryAttributes[j];
-                    if (geometryAttribute !== null) {
-                        // from the click handler we will not get an actual 
-                        // geometry so transform
-                        if (!(geometry instanceof OpenLayers.Geometry)) {
-                            var point = this.map.getLonLatFromPixel(
-                                geometry.xy);
-                            geometry = new OpenLayers.Geometry.Point(
-                                point.lon, point.lat);
-                        }
-                        var filter = this.createFilter(geometryAttribute,
-                        geometry);
-                        if (filter !== null) {
-                            filters.push(filter);
-                        }
-                    }
-                }
-    
-                var selectionLayer = this.createSelectionLayer(layer);
-    
-                this.events.triggerEvent("selected", {
-                    layer: layer,
-                    filters: filters
-                });
-
-                var sld = this.createSLD(layer, filters, geometryAttributes);
-    
-                selectionLayer.mergeNewParams({SLD_BODY: sld});
-                delete this._queue;
-            }
-        };
-        this.applySelection();
-    },
-    
-    /**
-     * Method: applySelection
-     * Checks if all required wfs data is cached, and applies the selection
-     */
-    applySelection: function() {
-        var canApply = true;
-        for (var i=0, len=this.layers.length; i<len; i++) {
-            if(!this.wfsCache[this.layers[i].id]) {
-                canApply = false;
-                break;
-            }
-        }
-        canApply && this._queue.call(this);
-    },
-
-    CLASS_NAME: "OpenLayers.Control.SLDSelect"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/Scale.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/Scale.js
deleted file mode 100644
index c9f2d2b9..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/Scale.js
+++ /dev/null
@@ -1,100 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-
-/**
- * @requires OpenLayers/Control.js
- * @requires OpenLayers/Lang.js
- */
-
-/**
- * Class: OpenLayers.Control.Scale
- * The Scale control displays the current map scale as a ratio (e.g. Scale = 
- * 1:1M). By default it is displayed in the lower right corner of the map.
- *
- * Inherits from:
- *  - <OpenLayers.Control>
- */
-OpenLayers.Control.Scale = OpenLayers.Class(OpenLayers.Control, {
-    
-    /**
-     * Property: element
-     * {DOMElement}
-     */
-    element: null,
-    
-    /**
-     * APIProperty: geodesic
-     * {Boolean} Use geodesic measurement. Default is false. The recommended
-     * setting for maps in EPSG:4326 is false, and true EPSG:900913. If set to
-     * true, the scale will be calculated based on the horizontal size of the
-     * pixel in the center of the map viewport.
-     */
-    geodesic: false,
-
-    /**
-     * Constructor: OpenLayers.Control.Scale
-     * 
-     * Parameters:
-     * element - {DOMElement} 
-     * options - {Object} 
-     */
-    initialize: function(element, options) {
-        OpenLayers.Control.prototype.initialize.apply(this, [options]);
-        this.element = OpenLayers.Util.getElement(element);        
-    },
-
-    /**
-     * Method: draw
-     * 
-     * Returns:
-     * {DOMElement}
-     */    
-    draw: function() {
-        OpenLayers.Control.prototype.draw.apply(this, arguments);
-        if (!this.element) {
-            this.element = document.createElement("div");
-            this.div.appendChild(this.element);
-        }
-        this.map.events.register( 'moveend', this, this.updateScale);
-        this.updateScale();
-        return this.div;
-    },
-   
-    /**
-     * Method: updateScale
-     */
-    updateScale: function() {
-        var scale;
-        if(this.geodesic === true) {
-            var units = this.map.getUnits();
-            if(!units) {
-                return;
-            }
-            var inches = OpenLayers.INCHES_PER_UNIT;
-            scale = (this.map.getGeodesicPixelSize().w || 0.000001) *
-                    inches["km"] * OpenLayers.DOTS_PER_INCH;
-        } else {
-            scale = this.map.getScale();
-        }
-            
-        if (!scale) {
-            return;
-        }
-
-        if (scale >= 9500 && scale <= 950000) {
-            scale = Math.round(scale / 1000) + "K";
-        } else if (scale >= 950000) {
-            scale = Math.round(scale / 1000000) + "M";
-        } else {
-            scale = Math.round(scale);
-        }    
-        
-        this.element.innerHTML = OpenLayers.i18n("Scale = 1 : ${scaleDenom}", {'scaleDenom':scale});
-    }, 
-
-    CLASS_NAME: "OpenLayers.Control.Scale"
-});
-
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/ScaleLine.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/ScaleLine.js
deleted file mode 100644
index 92624142..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/ScaleLine.js
+++ /dev/null
@@ -1,220 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Control.js
- */
-
-/**
- * Class: OpenLayers.Control.ScaleLine
- * The ScaleLine displays a small line indicator representing the current 
- * map scale on the map. By default it is drawn in the lower left corner of
- * the map.
- * 
- * Inherits from:
- *  - <OpenLayers.Control>
- *  
- * Is a very close copy of:
- *  - <OpenLayers.Control.Scale>
- */
-OpenLayers.Control.ScaleLine = OpenLayers.Class(OpenLayers.Control, {
-
-    /**
-     * Property: maxWidth
-     * {Integer} Maximum width of the scale line in pixels.  Default is 100.
-     */
-    maxWidth: 100,
-
-    /**
-     * Property: topOutUnits
-     * {String} Units for zoomed out on top bar.  Default is km.
-     */
-    topOutUnits: "km",
-    
-    /**
-     * Property: topInUnits
-     * {String} Units for zoomed in on top bar.  Default is m.
-     */
-    topInUnits: "m",
-
-    /**
-     * Property: bottomOutUnits
-     * {String} Units for zoomed out on bottom bar.  Default is mi.
-     */
-    bottomOutUnits: "mi",
-
-    /**
-     * Property: bottomInUnits
-     * {String} Units for zoomed in on bottom bar.  Default is ft.
-     */
-    bottomInUnits: "ft",
-    
-    /**
-     * Property: eTop
-     * {DOMElement}
-     */
-    eTop: null,
-
-    /**
-     * Property: eBottom
-     * {DOMElement}
-     */
-    eBottom:null,
-    
-    /**
-     * APIProperty: geodesic
-     * {Boolean} Use geodesic measurement. Default is false. The recommended
-     * setting for maps in EPSG:4326 is false, and true EPSG:900913. If set to
-     * true, the scale will be calculated based on the horizontal size of the
-     * pixel in the center of the map viewport.
-     */
-    geodesic: false,
-
-    /**
-     * Constructor: OpenLayers.Control.ScaleLine
-     * Create a new scale line control.
-     * 
-     * Parameters:
-     * options - {Object} An optional object whose properties will be used
-     *     to extend the control.
-     */
-
-    /**
-     * Method: draw
-     * 
-     * Returns:
-     * {DOMElement}
-     */
-    draw: function() {
-        OpenLayers.Control.prototype.draw.apply(this, arguments);
-        if (!this.eTop) {
-            // stick in the top bar
-            this.eTop = document.createElement("div");
-            this.eTop.className = this.displayClass + "Top";
-            var theLen = this.topInUnits.length;
-            this.div.appendChild(this.eTop);
-            if((this.topOutUnits == "") || (this.topInUnits == "")) {
-                this.eTop.style.visibility = "hidden";
-            } else {
-                this.eTop.style.visibility = "visible";
-            }
-
-            // and the bottom bar
-            this.eBottom = document.createElement("div");
-            this.eBottom.className = this.displayClass + "Bottom";
-            this.div.appendChild(this.eBottom);
-            if((this.bottomOutUnits == "") || (this.bottomInUnits == "")) {
-                this.eBottom.style.visibility = "hidden";
-            } else {
-                this.eBottom.style.visibility = "visible";
-            }
-        }
-        this.map.events.register('moveend', this, this.update);
-        this.update();
-        return this.div;
-    },
-
-    /** 
-     * Method: getBarLen
-     * Given a number, round it down to the nearest 1,2,5 times a power of 10.
-     * That seems a fairly useful set of number groups to use.
-     * 
-     * Parameters:
-     * maxLen - {float}  the number we're rounding down from
-     * 
-     * Returns:
-     * {Float} the rounded number (less than or equal to maxLen)
-     */
-    getBarLen: function(maxLen) {
-        // nearest power of 10 lower than maxLen
-        var digits = parseInt(Math.log(maxLen) / Math.log(10));
-        var pow10 = Math.pow(10, digits);
-        
-        // ok, find first character
-        var firstChar = parseInt(maxLen / pow10);
-
-        // right, put it into the correct bracket
-        var barLen;
-        if(firstChar > 5) {
-            barLen = 5;
-        } else if(firstChar > 2) {
-            barLen = 2;
-        } else {
-            barLen = 1;
-        }
-
-        // scale it up the correct power of 10
-        return barLen * pow10;
-    },
-
-    /**
-     * Method: update
-     * Update the size of the bars, and the labels they contain.
-     */
-    update: function() {
-        var res = this.map.getResolution();
-        if (!res) {
-            return;
-        }
-
-        var curMapUnits = this.map.getUnits();
-        var inches = OpenLayers.INCHES_PER_UNIT;
-
-        // convert maxWidth to map units
-        var maxSizeData = this.maxWidth * res * inches[curMapUnits];
-        var geodesicRatio = 1;
-        if(this.geodesic === true) {
-            var maxSizeGeodesic = (this.map.getGeodesicPixelSize().w ||
-                0.000001) * this.maxWidth;
-            var maxSizeKilometers = maxSizeData / inches["km"];
-            geodesicRatio = maxSizeGeodesic / maxSizeKilometers;
-            maxSizeData *= geodesicRatio;
-        }
-
-        // decide whether to use large or small scale units     
-        var topUnits;
-        var bottomUnits;
-        if(maxSizeData > 100000) {
-            topUnits = this.topOutUnits;
-            bottomUnits = this.bottomOutUnits;
-        } else {
-            topUnits = this.topInUnits;
-            bottomUnits = this.bottomInUnits;
-        }
-
-        // and to map units units
-        var topMax = maxSizeData / inches[topUnits];
-        var bottomMax = maxSizeData / inches[bottomUnits];
-
-        // now trim this down to useful block length
-        var topRounded = this.getBarLen(topMax);
-        var bottomRounded = this.getBarLen(bottomMax);
-
-        // and back to display units
-        topMax = topRounded / inches[curMapUnits] * inches[topUnits];
-        bottomMax = bottomRounded / inches[curMapUnits] * inches[bottomUnits];
-
-        // and to pixel units
-        var topPx = topMax / res / geodesicRatio;
-        var bottomPx = bottomMax / res / geodesicRatio;
-        
-        // now set the pixel widths
-        // and the values inside them
-        
-        if (this.eBottom.style.visibility == "visible"){
-            this.eBottom.style.width = Math.round(bottomPx) + "px"; 
-            this.eBottom.innerHTML = bottomRounded + " " + bottomUnits ;
-        }
-            
-        if (this.eTop.style.visibility == "visible"){
-            this.eTop.style.width = Math.round(topPx) + "px";
-            this.eTop.innerHTML = topRounded + " " + topUnits;
-        }
-        
-    }, 
-
-    CLASS_NAME: "OpenLayers.Control.ScaleLine"
-});
-
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/SelectFeature.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/SelectFeature.js
deleted file mode 100644
index 54672671..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/SelectFeature.js
+++ /dev/null
@@ -1,643 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-
-/**
- * @requires OpenLayers/Control.js
- * @requires OpenLayers/Feature/Vector.js
- * @requires OpenLayers/Handler/Feature.js
- * @requires OpenLayers/Layer/Vector/RootContainer.js
- */
-
-/**
- * Class: OpenLayers.Control.SelectFeature
- * The SelectFeature control selects vector features from a given layer on 
- * click or hover. 
- *
- * Inherits from:
- *  - <OpenLayers.Control>
- */
-OpenLayers.Control.SelectFeature = OpenLayers.Class(OpenLayers.Control, {
-
-    /** 
-     * APIProperty: events
-     * {<OpenLayers.Events>} Events instance for listeners and triggering
-     *     control specific events.
-     *
-     * Register a listener for a particular event with the following syntax:
-     * (code)
-     * control.events.register(type, obj, listener);
-     * (end)
-     *
-     * Supported event types (in addition to those from <OpenLayers.Control.events>):
-     * beforefeaturehighlighted - Triggered before a feature is highlighted
-     * featurehighlighted - Triggered when a feature is highlighted
-     * featureunhighlighted - Triggered when a feature is unhighlighted
-     * boxselectionstart - Triggered before box selection starts
-     * boxselectionend - Triggered after box selection ends
-     */
-    
-    /**
-     * Property: multipleKey
-     * {String} An event modifier ('altKey' or 'shiftKey') that temporarily sets
-     *     the <multiple> property to true.  Default is null.
-     */
-    multipleKey: null,
-    
-    /**
-     * Property: toggleKey
-     * {String} An event modifier ('altKey' or 'shiftKey') that temporarily sets
-     *     the <toggle> property to true.  Default is null.
-     */
-    toggleKey: null,
-    
-    /**
-     * APIProperty: multiple
-     * {Boolean} Allow selection of multiple geometries.  Default is false.
-     */
-    multiple: false, 
-
-    /**
-     * APIProperty: clickout
-     * {Boolean} Unselect features when clicking outside any feature.
-     *     Default is true.
-     */
-    clickout: true,
-
-    /**
-     * APIProperty: toggle
-     * {Boolean} Unselect a selected feature on click.  Default is false.  Only
-     *     has meaning if hover is false.
-     */
-    toggle: false,
-
-    /**
-     * APIProperty: hover
-     * {Boolean} Select on mouse over and deselect on mouse out.  If true, this
-     * ignores clicks and only listens to mouse moves.
-     */
-    hover: false,
-
-    /**
-     * APIProperty: highlightOnly
-     * {Boolean} If true do not actually select features (that is place them in 
-     * the layer's selected features array), just highlight them. This property
-     * has no effect if hover is false. Defaults to false.
-     */
-    highlightOnly: false,
-    
-    /**
-     * APIProperty: box
-     * {Boolean} Allow feature selection by drawing a box.
-     */
-    box: false,
-    
-    /**
-     * Property: onBeforeSelect 
-     * {Function} Optional function to be called before a feature is selected.
-     *     The function should expect to be called with a feature.
-     */
-    onBeforeSelect: function() {},
-    
-    /**
-     * APIProperty: onSelect 
-     * {Function} Optional function to be called when a feature is selected.
-     *     The function should expect to be called with a feature.
-     */
-    onSelect: function() {},
-
-    /**
-     * APIProperty: onUnselect
-     * {Function} Optional function to be called when a feature is unselected.
-     *     The function should expect to be called with a feature.
-     */
-    onUnselect: function() {},
-    
-    /**
-     * Property: scope
-     * {Object} The scope to use with the onBeforeSelect, onSelect, onUnselect
-     *     callbacks. If null the scope will be this control.
-     */
-    scope: null,
-
-    /**
-     * APIProperty: geometryTypes
-     * {Array(String)} To restrict selecting to a limited set of geometry types,
-     *     send a list of strings corresponding to the geometry class names.
-     */
-    geometryTypes: null,
-
-    /**
-     * Property: layer
-     * {<OpenLayers.Layer.Vector>} The vector layer with a common renderer
-     * root for all layers this control is configured with (if an array of
-     * layers was passed to the constructor), or the vector layer the control
-     * was configured with (if a single layer was passed to the constructor).
-     */
-    layer: null,
-    
-    /**
-     * Property: layers
-     * {Array(<OpenLayers.Layer.Vector>)} The layers this control will work on,
-     * or null if the control was configured with a single layer
-     */
-    layers: null,
-    
-    /**
-     * APIProperty: callbacks
-     * {Object} The functions that are sent to the handlers.feature for callback
-     */
-    callbacks: null,
-    
-    /**
-     * APIProperty: selectStyle 
-     * {Object} Hash of styles
-     */
-    selectStyle: null,
-    
-    /**
-     * Property: renderIntent
-     * {String} key used to retrieve the select style from the layer's
-     * style map.
-     */
-    renderIntent: "select",
-
-    /**
-     * Property: handlers
-     * {Object} Object with references to multiple <OpenLayers.Handler>
-     *     instances.
-     */
-    handlers: null,
-
-    /**
-     * Constructor: OpenLayers.Control.SelectFeature
-     * Create a new control for selecting features.
-     *
-     * Parameters:
-     * layers - {<OpenLayers.Layer.Vector>}, or an array of vector layers. The
-     *     layer(s) this control will select features from.
-     * options - {Object} 
-     */
-    initialize: function(layers, options) {
-        OpenLayers.Control.prototype.initialize.apply(this, [options]);
-        
-        if(this.scope === null) {
-            this.scope = this;
-        }
-        this.initLayer(layers);
-        var callbacks = {
-            click: this.clickFeature,
-            clickout: this.clickoutFeature
-        };
-        if (this.hover) {
-            callbacks.over = this.overFeature;
-            callbacks.out = this.outFeature;
-        }
-             
-        this.callbacks = OpenLayers.Util.extend(callbacks, this.callbacks);
-        this.handlers = {
-            feature: new OpenLayers.Handler.Feature(
-                this, this.layer, this.callbacks,
-                {geometryTypes: this.geometryTypes}
-            )
-        };
-
-        if (this.box) {
-            this.handlers.box = new OpenLayers.Handler.Box(
-                this, {done: this.selectBox},
-                {boxDivClassName: "olHandlerBoxSelectFeature"}
-            ); 
-        }
-    },
-
-    /**
-     * Method: initLayer
-     * Assign the layer property. If layers is an array, we need to use
-     *     a RootContainer.
-     *
-     * Parameters:
-     * layers - {<OpenLayers.Layer.Vector>}, or an array of vector layers.
-     */
-    initLayer: function(layers) {
-        if(OpenLayers.Util.isArray(layers)) {
-            this.layers = layers;
-            this.layer = new OpenLayers.Layer.Vector.RootContainer(
-                this.id + "_container", {
-                    layers: layers
-                }
-            );
-        } else {
-            this.layer = layers;
-        }
-    },
-    
-    /**
-     * Method: destroy
-     */
-    destroy: function() {
-        if(this.active && this.layers) {
-            this.map.removeLayer(this.layer);
-        }
-        OpenLayers.Control.prototype.destroy.apply(this, arguments);
-        if(this.layers) {
-            this.layer.destroy();
-        }
-    },
-
-    /**
-     * Method: activate
-     * Activates the control.
-     * 
-     * Returns:
-     * {Boolean} The control was effectively activated.
-     */
-    activate: function () {
-        if (!this.active) {
-            if(this.layers) {
-                this.map.addLayer(this.layer);
-            }
-            this.handlers.feature.activate();
-            if(this.box && this.handlers.box) {
-                this.handlers.box.activate();
-            }
-        }
-        return OpenLayers.Control.prototype.activate.apply(
-            this, arguments
-        );
-    },
-
-    /**
-     * Method: deactivate
-     * Deactivates the control.
-     * 
-     * Returns:
-     * {Boolean} The control was effectively deactivated.
-     */
-    deactivate: function () {
-        if (this.active) {
-            this.handlers.feature.deactivate();
-            if(this.handlers.box) {
-                this.handlers.box.deactivate();
-            }
-            if(this.layers) {
-                this.map.removeLayer(this.layer);
-            }
-        }
-        return OpenLayers.Control.prototype.deactivate.apply(
-            this, arguments
-        );
-    },
-
-    /**
-     * Method: unselectAll
-     * Unselect all selected features.  To unselect all except for a single
-     *     feature, set the options.except property to the feature.
-     *
-     * Parameters:
-     * options - {Object} Optional configuration object.
-     */
-    unselectAll: function(options) {
-        // we'll want an option to supress notification here
-        var layers = this.layers || [this.layer],
-            layer, feature, l, numExcept;
-        for(l=0; l<layers.length; ++l) {
-            layer = layers[l];
-            numExcept = 0;
-            //layer.selectedFeatures is null when layer is destroyed and 
-            //one of it's preremovelayer listener calls setLayer 
-            //with another layer on this control
-            if(layer.selectedFeatures != null) {
-                while(layer.selectedFeatures.length > numExcept) {
-                    feature = layer.selectedFeatures[numExcept];
-                    if(!options || options.except != feature) {
-                        this.unselect(feature);
-                    } else {
-                        ++numExcept;
-                    }
-                }
-            }
-        }
-    },
-
-    /**
-     * Method: clickFeature
-     * Called on click in a feature
-     * Only responds if this.hover is false.
-     *
-     * Parameters:
-     * feature - {<OpenLayers.Feature.Vector>} 
-     */
-    clickFeature: function(feature) {
-        if(!this.hover) {
-            var selected = (OpenLayers.Util.indexOf(
-                feature.layer.selectedFeatures, feature) > -1);
-            if(selected) {
-                if(this.toggleSelect()) {
-                    this.unselect(feature);
-                } else if(!this.multipleSelect()) {
-                    this.unselectAll({except: feature});
-                }
-            } else {
-                if(!this.multipleSelect()) {
-                    this.unselectAll({except: feature});
-                }
-                this.select(feature);
-            }
-        }
-    },
-
-    /**
-     * Method: multipleSelect
-     * Allow for multiple selected features based on <multiple> property and
-     *     <multipleKey> event modifier.
-     *
-     * Returns:
-     * {Boolean} Allow for multiple selected features.
-     */
-    multipleSelect: function() {
-        return this.multiple || (this.handlers.feature.evt &&
-                                 this.handlers.feature.evt[this.multipleKey]);
-    },
-    
-    /**
-     * Method: toggleSelect
-     * Event should toggle the selected state of a feature based on <toggle>
-     *     property and <toggleKey> event modifier.
-     *
-     * Returns:
-     * {Boolean} Toggle the selected state of a feature.
-     */
-    toggleSelect: function() {
-        return this.toggle || (this.handlers.feature.evt &&
-                               this.handlers.feature.evt[this.toggleKey]);
-    },
-
-    /**
-     * Method: clickoutFeature
-     * Called on click outside a previously clicked (selected) feature.
-     * Only responds if this.hover is false.
-     *
-     * Parameters:
-     * feature - {<OpenLayers.Vector.Feature>} 
-     */
-    clickoutFeature: function(feature) {
-        if(!this.hover && this.clickout) {
-            this.unselectAll();
-        }
-    },
-
-    /**
-     * Method: overFeature
-     * Called on over a feature.
-     * Only responds if this.hover is true.
-     *
-     * Parameters:
-     * feature - {<OpenLayers.Feature.Vector>} 
-     */
-    overFeature: function(feature) {
-        var layer = feature.layer;
-        if(this.hover) {
-            if(this.highlightOnly) {
-                this.highlight(feature);
-            } else if(OpenLayers.Util.indexOf(
-                layer.selectedFeatures, feature) == -1) {
-                this.select(feature);
-            }
-        }
-    },
-
-    /**
-     * Method: outFeature
-     * Called on out of a selected feature.
-     * Only responds if this.hover is true.
-     *
-     * Parameters:
-     * feature - {<OpenLayers.Feature.Vector>} 
-     */
-    outFeature: function(feature) {
-        if(this.hover) {
-            if(this.highlightOnly) {
-                // we do nothing if we're not the last highlighter of the
-                // feature
-                if(feature._lastHighlighter == this.id) {
-                    // if another select control had highlighted the feature before
-                    // we did it ourself then we use that control to highlight the
-                    // feature as it was before we highlighted it, else we just
-                    // unhighlight it
-                    if(feature._prevHighlighter &&
-                       feature._prevHighlighter != this.id) {
-                        delete feature._lastHighlighter;
-                        var control = this.map.getControl(
-                            feature._prevHighlighter);
-                        if(control) {
-                            control.highlight(feature);
-                        }
-                    } else {
-                        this.unhighlight(feature);
-                    }
-                }
-            } else {
-                this.unselect(feature);
-            }
-        }
-    },
-
-    /**
-     * Method: highlight
-     * Redraw feature with the select style.
-     *
-     * Parameters:
-     * feature - {<OpenLayers.Feature.Vector>} 
-     */
-    highlight: function(feature) {
-        var layer = feature.layer;
-        var cont = this.events.triggerEvent("beforefeaturehighlighted", {
-            feature : feature
-        });
-        if(cont !== false) {
-            feature._prevHighlighter = feature._lastHighlighter;
-            feature._lastHighlighter = this.id;
-            var style = this.selectStyle || this.renderIntent;
-            layer.drawFeature(feature, style);
-            this.events.triggerEvent("featurehighlighted", {feature : feature});
-        }
-    },
-
-    /**
-     * Method: unhighlight
-     * Redraw feature with the "default" style
-     *
-     * Parameters:
-     * feature - {<OpenLayers.Feature.Vector>} 
-     */
-    unhighlight: function(feature) {
-        var layer = feature.layer;
-        // three cases:
-        // 1. there's no other highlighter, in that case _prev is undefined,
-        //    and we just need to undef _last
-        // 2. another control highlighted the feature after we did it, in
-        //    that case _last references this other control, and we just
-        //    need to undef _prev
-        // 3. another control highlighted the feature before we did it, in
-        //    that case _prev references this other control, and we need to
-        //    set _last to _prev and undef _prev
-        if(feature._prevHighlighter == undefined) {
-            delete feature._lastHighlighter;
-        } else if(feature._prevHighlighter == this.id) {
-            delete feature._prevHighlighter;
-        } else {
-            feature._lastHighlighter = feature._prevHighlighter;
-            delete feature._prevHighlighter;
-        }
-        layer.drawFeature(feature, feature.style || feature.layer.style ||
-            "default");
-        this.events.triggerEvent("featureunhighlighted", {feature : feature});
-    },
-    
-    /**
-     * Method: select
-     * Add feature to the layer's selectedFeature array, render the feature as
-     * selected, and call the onSelect function.
-     * 
-     * Parameters:
-     * feature - {<OpenLayers.Feature.Vector>} 
-     */
-    select: function(feature) {
-        var cont = this.onBeforeSelect.call(this.scope, feature);
-        var layer = feature.layer;
-        if(cont !== false) {
-            cont = layer.events.triggerEvent("beforefeatureselected", {
-                feature: feature
-            });
-            if(cont !== false) {
-                layer.selectedFeatures.push(feature);
-                this.highlight(feature);
-                // if the feature handler isn't involved in the feature
-                // selection (because the box handler is used or the
-                // feature is selected programatically) we fake the
-                // feature handler to allow unselecting on click
-                if(!this.handlers.feature.lastFeature) {
-                    this.handlers.feature.lastFeature = layer.selectedFeatures[0];
-                }
-                layer.events.triggerEvent("featureselected", {feature: feature});
-                this.onSelect.call(this.scope, feature);
-            }
-        }
-    },
-
-    /**
-     * Method: unselect
-     * Remove feature from the layer's selectedFeature array, render the feature as
-     * normal, and call the onUnselect function.
-     *
-     * Parameters:
-     * feature - {<OpenLayers.Feature.Vector>}
-     */
-    unselect: function(feature) {
-        var layer = feature.layer;
-        // Store feature style for restoration later
-        this.unhighlight(feature);
-        OpenLayers.Util.removeItem(layer.selectedFeatures, feature);
-        layer.events.triggerEvent("featureunselected", {feature: feature});
-        this.onUnselect.call(this.scope, feature);
-    },
-    
-    /**
-     * Method: selectBox
-     * Callback from the handlers.box set up when <box> selection is true
-     *     on.
-     *
-     * Parameters:
-     * position - {<OpenLayers.Bounds> || <OpenLayers.Pixel> }  
-     */
-    selectBox: function(position) {
-        if (position instanceof OpenLayers.Bounds) {
-            var minXY = this.map.getLonLatFromPixel({
-                x: position.left,
-                y: position.bottom
-            });
-            var maxXY = this.map.getLonLatFromPixel({
-                x: position.right,
-                y: position.top
-            });
-            var bounds = new OpenLayers.Bounds(
-                minXY.lon, minXY.lat, maxXY.lon, maxXY.lat
-            );
-            
-            // if multiple is false, first deselect currently selected features
-            if (!this.multipleSelect()) {
-                this.unselectAll();
-            }
-            
-            // because we're using a box, we consider we want multiple selection
-            var prevMultiple = this.multiple;
-            this.multiple = true;
-            var layers = this.layers || [this.layer];
-            this.events.triggerEvent("boxselectionstart", {layers: layers}); 
-            var layer;
-            for(var l=0; l<layers.length; ++l) {
-                layer = layers[l];
-                for(var i=0, len = layer.features.length; i<len; ++i) {
-                    var feature = layer.features[i];
-                    // check if the feature is displayed
-                    if (!feature.getVisibility()) {
-                        continue;
-                    }
-
-                    if (this.geometryTypes == null || OpenLayers.Util.indexOf(
-                            this.geometryTypes, feature.geometry.CLASS_NAME) > -1) {
-                        if (bounds.toGeometry().intersects(feature.geometry)) {
-                            if (OpenLayers.Util.indexOf(layer.selectedFeatures, feature) == -1) {
-                                this.select(feature);
-                            }
-                        }
-                    }
-                }
-            }
-            this.multiple = prevMultiple;
-            this.events.triggerEvent("boxselectionend", {layers: layers}); 
-        }
-    },
-
-    /** 
-     * Method: setMap
-     * Set the map property for the control. 
-     * 
-     * Parameters:
-     * map - {<OpenLayers.Map>} 
-     */
-    setMap: function(map) {
-        this.handlers.feature.setMap(map);
-        if (this.box) {
-            this.handlers.box.setMap(map);
-        }
-        OpenLayers.Control.prototype.setMap.apply(this, arguments);
-    },
-    
-    /**
-     * APIMethod: setLayer
-     * Attach a new layer to the control, overriding any existing layers.
-     *
-     * Parameters:
-     * layers - Array of {<OpenLayers.Layer.Vector>} or a single
-     *     {<OpenLayers.Layer.Vector>}
-     */
-    setLayer: function(layers) {
-        var isActive = this.active;
-        this.unselectAll();
-        this.deactivate();
-        if(this.layers) {
-            this.layer.destroy();
-            this.layers = null;
-        }
-        this.initLayer(layers);
-        this.handlers.feature.layer = this.layer;
-        if (isActive) {
-            this.activate();
-        }
-    },
-    
-    CLASS_NAME: "OpenLayers.Control.SelectFeature"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/Snapping.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/Snapping.js
deleted file mode 100644
index 21731147..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/Snapping.js
+++ /dev/null
@@ -1,560 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Control.js
- * @requires OpenLayers/Layer/Vector.js
- */
-
-/**
- * Class: OpenLayers.Control.Snapping
- * Acts as a snapping agent while editing vector features.
- *
- * Inherits from:
- *  - <OpenLayers.Control>
- */
-OpenLayers.Control.Snapping = OpenLayers.Class(OpenLayers.Control, {
-
-    /** 
-     * APIProperty: events
-     * {<OpenLayers.Events>} Events instance for listeners and triggering
-     *     control specific events.
-     *
-     * Register a listener for a particular event with the following syntax:
-     * (code)
-     * control.events.register(type, obj, listener);
-     * (end)
-     *
-     * Supported event types (in addition to those from <OpenLayers.Control.events>):
-     * beforesnap - Triggered before a snap occurs.  Listeners receive an
-     *     event object with *point*, *x*, *y*, *distance*, *layer*, and
-     *     *snapType* properties.  The point property will be original point
-     *     geometry considered for snapping. The x and y properties represent
-     *     coordinates the point will receive. The distance is the distance
-     *     of the snap.  The layer is the target layer.  The snapType property
-     *     will be one of "node", "vertex", or "edge". Return false to stop
-     *     snapping from occurring.
-     * snap - Triggered when a snap occurs.  Listeners receive an event with
-     *     *point*, *snapType*, *layer*, and *distance* properties.  The point
-     *     will be the location snapped to.  The snapType will be one of "node",
-     *     "vertex", or "edge".  The layer will be the target layer.  The
-     *     distance will be the distance of the snap in map units.
-     * unsnap - Triggered when a vertex is unsnapped.  Listeners receive an
-     *     event with a *point* property.
-     */
-    
-    /**
-     * CONSTANT: DEFAULTS
-     * Default target properties.
-     */
-    DEFAULTS: {
-        tolerance: 10,
-        node: true,
-        edge: true,
-        vertex: true
-    },
-    
-    /**
-     * Property: greedy
-     * {Boolean} Snap to closest feature in first layer with an eligible
-     *     feature.  Default is true.
-     */
-    greedy: true,
-    
-    /**
-     * Property: precedence
-     * {Array} List representing precedence of different snapping types.
-     *     Default is "node", "vertex", "edge".
-     */
-    precedence: ["node", "vertex", "edge"],
-    
-    /**
-     * Property: resolution
-     * {Float} The map resolution for the previously considered snap.
-     */
-    resolution: null,
-    
-    /**
-     * Property: geoToleranceCache
-     * {Object} A cache of geo-tolerances.  Tolerance values (in map units) are
-     *     calculated when the map resolution changes.
-     */
-    geoToleranceCache: null,
-    
-    /**
-     * Property: layer
-     * {<OpenLayers.Layer.Vector>} The current editable layer.  Set at
-     *     construction or after construction with <setLayer>.
-     */
-    layer: null,
-    
-    /**
-     * Property: feature
-     * {<OpenLayers.Feature.Vector>} The current editable feature.
-     */
-    feature: null,
-    
-    /**
-     * Property: point
-     * {<OpenLayers.Geometry.Point>} The currently snapped vertex.
-     */
-    point: null,
-
-    /**
-     * Constructor: OpenLayers.Control.Snapping
-     * Creates a new snapping control. A control is constructed with an editable
-     *     layer and a set of configuration objects for target layers. While the
-     *     control is active, dragging vertices while drawing new features or
-     *     modifying existing features on the editable layer will engage
-     *     snapping to features on the target layers. Whether a vertex snaps to
-     *     a feature on a target layer depends on the target layer configuration.
-     *
-     * Parameters:
-     * options - {Object} An object containing all configuration properties for
-     *     the control.
-     *
-     * Valid options:
-     * layer - {<OpenLayers.Layer.Vector>} The editable layer.  Features from this
-     *     layer that are digitized or modified may have vertices snapped to
-     *     features from any of the target layers.
-     * targets - {Array(Object | OpenLayers.Layer.Vector)} A list of objects for
-     *     configuring target layers.  See valid properties of the target
-     *     objects below.  If the items in the targets list are vector layers
-     *     (instead of configuration objects), the defaults from the <defaults>
-     *     property will apply.  The editable layer itself may be a target
-     *     layer, allowing newly created or edited features to be snapped to
-     *     existing features from the same layer.  If no targets are provided
-     *     the layer given in the constructor (as <layer>) will become the
-     *     initial target.
-     * defaults - {Object} An object with default properties to be applied
-     *     to all target objects.
-     * greedy - {Boolean} Snap to closest feature in first target layer that
-     *     applies.  Default is true.  If false, all features in all target
-     *     layers will be checked and the closest feature in all target layers
-     *     will be chosen.  The greedy property determines if the order of the
-     *     target layers is significant.  By default, the order of the target
-     *     layers is significant where layers earlier in the target layer list
-     *     have precedence over layers later in the list.  Within a single
-     *     layer, the closest feature is always chosen for snapping.  This
-     *     property only determines whether the search for a closer feature
-     *     continues after an eligible feature is found in a target layer.
-     *
-     * Valid target properties:
-     * layer - {<OpenLayers.Layer.Vector>} A target layer.  Features from this
-     *     layer will be eligible to act as snapping target for the editable
-     *     layer.
-     * tolerance - {Float} The distance (in pixels) at which snapping may occur.
-     *     Default is 10.
-     * node - {Boolean} Snap to nodes (first or last point in a geometry) in
-     *     target layer.  Default is true.
-     * nodeTolerance - {Float} Optional distance at which snapping may occur
-     *     for nodes specifically.  If none is provided, <tolerance> will be
-     *     used.
-     * vertex - {Boolean} Snap to vertices in target layer.  Default is true.
-     * vertexTolerance - {Float} Optional distance at which snapping may occur
-     *     for vertices specifically.  If none is provided, <tolerance> will be
-     *     used.
-     * edge - {Boolean} Snap to edges in target layer.  Default is true.
-     * edgeTolerance - {Float} Optional distance at which snapping may occur
-     *     for edges specifically.  If none is provided, <tolerance> will be
-     *     used.
-     * filter - {<OpenLayers.Filter>} Optional filter to evaluate to determine if
-     *     feature is eligible for snapping.  If filter evaluates to true for a
-     *     target feature a vertex may be snapped to the feature. 
-     * minResolution - {Number} If a minResolution is provided, snapping to this
-     *     target will only be considered if the map resolution is greater than
-     *     or equal to this value (the minResolution is inclusive).  Default is
-     *     no minimum resolution limit.
-     * maxResolution - {Number} If a maxResolution is provided, snapping to this
-     *     target will only be considered if the map resolution is strictly
-     *     less than this value (the maxResolution is exclusive).  Default is
-     *     no maximum resolution limit.
-     */
-    initialize: function(options) {
-        OpenLayers.Control.prototype.initialize.apply(this, [options]);
-        this.options = options || {}; // TODO: this could be done by the super
-        
-        // set the editable layer if provided
-        if(this.options.layer) {
-            this.setLayer(this.options.layer);
-        }
-        // configure target layers
-        var defaults = OpenLayers.Util.extend({}, this.options.defaults);
-        this.defaults = OpenLayers.Util.applyDefaults(defaults, this.DEFAULTS);
-        this.setTargets(this.options.targets);
-        if(this.targets.length === 0 && this.layer) {
-            this.addTargetLayer(this.layer);
-        }
-
-        this.geoToleranceCache = {};
-    },
-    
-    /**
-     * APIMethod: setLayer
-     * Set the editable layer.  Call the setLayer method if the editable layer
-     *     changes and the same control should be used on a new editable layer.
-     *     If the control is already active, it will be active after the new
-     *     layer is set.
-     *
-     * Parameters:
-     * layer - {<OpenLayers.Layer.Vector>}  The new editable layer.
-     */
-    setLayer: function(layer) {
-        if(this.active) {
-            this.deactivate();
-            this.layer = layer;
-            this.activate();
-        } else {
-            this.layer = layer;
-        }
-    },
-    
-    /**
-     * Method: setTargets
-     * Set the targets for the snapping agent.
-     *
-     * Parameters:
-     * targets - {Array} An array of target configs or target layers.
-     */
-    setTargets: function(targets) {
-        this.targets = [];
-        if(targets && targets.length) {
-            var target;
-            for(var i=0, len=targets.length; i<len; ++i) {
-                target = targets[i];
-                if(target instanceof OpenLayers.Layer.Vector) {
-                    this.addTargetLayer(target);
-                } else {
-                    this.addTarget(target);
-                }
-            }
-        }
-    },
-    
-    /**
-     * Method: addTargetLayer
-     * Add a target layer with the default target config.
-     *
-     * Parameters:
-     * layer - {<OpenLayers.Layer.Vector>} A target layer.
-     */
-    addTargetLayer: function(layer) {
-        this.addTarget({layer: layer});
-    },
-    
-    /**
-     * Method: addTarget
-     * Add a configured target layer.
-     *
-     * Parameters:
-     * target - {Object} A target config.
-     */
-    addTarget: function(target) {
-        target = OpenLayers.Util.applyDefaults(target, this.defaults);
-        target.nodeTolerance = target.nodeTolerance || target.tolerance;
-        target.vertexTolerance = target.vertexTolerance || target.tolerance;
-        target.edgeTolerance = target.edgeTolerance || target.tolerance;
-        this.targets.push(target);
-    },
-    
-    /**
-     * Method: removeTargetLayer
-     * Remove a target layer.
-     *
-     * Parameters:
-     * layer - {<OpenLayers.Layer.Vector>} The target layer to remove.
-     */
-    removeTargetLayer: function(layer) {
-        var target;
-        for(var i=this.targets.length-1; i>=0; --i) {
-            target = this.targets[i];
-            if(target.layer === layer) {
-                this.removeTarget(target);
-            }
-        }
-    },
-    
-    /**
-     * Method: removeTarget
-     * Remove a target.
-     *
-     * Parameters:
-     * target - {Object} A target config.
-     *
-     * Returns:
-     * {Array} The targets array.
-     */
-    removeTarget: function(target) {
-        return OpenLayers.Util.removeItem(this.targets, target);
-    },
-    
-    /**
-     * APIMethod: activate
-     * Activate the control.  Activating the control registers listeners for
-     *     editing related events so that during feature creation and
-     *     modification, moving vertices will trigger snapping.
-     */
-    activate: function() {
-        var activated = OpenLayers.Control.prototype.activate.call(this);
-        if(activated) {
-            if(this.layer && this.layer.events) {
-                this.layer.events.on({
-                    sketchstarted: this.onSketchModified,
-                    sketchmodified: this.onSketchModified,
-                    vertexmodified: this.onVertexModified,
-                    scope: this
-                });
-            }
-        }
-        return activated;
-    },
-    
-    /**
-     * APIMethod: deactivate
-     * Deactivate the control.  Deactivating the control unregisters listeners
-     *     so feature editing may proceed without engaging the snapping agent.
-     */
-    deactivate: function() {
-        var deactivated = OpenLayers.Control.prototype.deactivate.call(this);
-        if(deactivated) {
-            if(this.layer && this.layer.events) {
-                this.layer.events.un({
-                    sketchstarted: this.onSketchModified,
-                    sketchmodified: this.onSketchModified,
-                    vertexmodified: this.onVertexModified,
-                    scope: this
-                });
-            }
-        }
-        this.feature = null;
-        this.point = null;
-        return deactivated;
-    },
-    
-    /**
-     * Method: onSketchModified
-     * Registered as a listener for the sketchmodified event on the editable
-     *     layer.
-     *
-     * Parameters:
-     * event - {Object} The sketch modified event.
-     */
-    onSketchModified: function(event) {
-        this.feature = event.feature;
-        this.considerSnapping(event.vertex, event.vertex);
-    },
-    
-    /**
-     * Method: onVertexModified
-     * Registered as a listener for the vertexmodified event on the editable
-     *     layer.
-     *
-     * Parameters:
-     * event - {Object} The vertex modified event.
-     */
-    onVertexModified: function(event) {
-        this.feature = event.feature;
-        var loc = this.layer.map.getLonLatFromViewPortPx(event.pixel);
-        this.considerSnapping(
-            event.vertex, new OpenLayers.Geometry.Point(loc.lon, loc.lat)
-        );
-    },
-
-    /**
-     * Method: considerSnapping
-     *
-     * Parameters:
-     * point - {<OpenLayers.Geometry.Point>} The vertex to be snapped (or
-     *     unsnapped).
-     * loc - {<OpenLayers.Geometry.Point>} The location of the mouse in map
-     *     coords.
-     */
-    considerSnapping: function(point, loc) {
-        var best = {
-            rank: Number.POSITIVE_INFINITY,
-            dist: Number.POSITIVE_INFINITY,
-            x: null, y: null
-        };
-        var snapped = false;
-        var result, target;
-        for(var i=0, len=this.targets.length; i<len; ++i) {
-            target = this.targets[i];
-            result = this.testTarget(target, loc);
-            if(result) {
-                if(this.greedy) {
-                    best = result;
-                    best.target = target; 
-                    snapped = true;
-                    break;
-                } else {
-                    if((result.rank < best.rank) ||
-                       (result.rank === best.rank && result.dist < best.dist)) {
-                        best = result;
-                        best.target = target;
-                        snapped = true;
-                    }
-                }
-            }
-        }
-        if(snapped) {
-            var proceed = this.events.triggerEvent("beforesnap", {
-                point: point, x: best.x, y: best.y, distance: best.dist,
-                layer: best.target.layer, snapType: this.precedence[best.rank]
-            });
-            if(proceed !== false) {
-                point.x = best.x;
-                point.y = best.y;
-                this.point = point;
-                this.events.triggerEvent("snap", {
-                    point: point,
-                    snapType: this.precedence[best.rank],
-                    layer: best.target.layer,
-                    distance: best.dist
-                });
-            } else {
-                snapped = false;
-            }
-        }
-        if(this.point && !snapped) {
-            point.x = loc.x;
-            point.y = loc.y;
-            this.point = null;
-            this.events.triggerEvent("unsnap", {point: point});
-        }
-    },
-    
-    /**
-     * Method: testTarget
-     *
-     * Parameters:
-     * target - {Object} Object with target layer configuration.
-     * loc - {<OpenLayers.Geometry.Point>} The location of the mouse in map
-     *     coords.
-     *
-     * Returns:
-     * {Object} A result object with rank, dist, x, and y properties.
-     *     Returns null if candidate is not eligible for snapping.
-     */
-    testTarget: function(target, loc) {
-        var resolution = this.layer.map.getResolution();
-        if ("minResolution" in target) {
-            if (resolution < target.minResolution) {
-                return null;
-            }
-        }
-        if ("maxResolution" in target) {
-            if (resolution >= target.maxResolution) {
-                return null;
-            }
-        }
-        var tolerance = {
-            node: this.getGeoTolerance(target.nodeTolerance, resolution),
-            vertex: this.getGeoTolerance(target.vertexTolerance, resolution),
-            edge: this.getGeoTolerance(target.edgeTolerance, resolution)
-        };
-        // this could be cached if we don't support setting tolerance values directly
-        var maxTolerance = Math.max(
-            tolerance.node, tolerance.vertex, tolerance.edge
-        );
-        var result = {
-            rank: Number.POSITIVE_INFINITY, dist: Number.POSITIVE_INFINITY
-        };
-        var eligible = false;
-        var features = target.layer.features;
-        var feature, type, vertices, vertex, closest, dist, found;
-        var numTypes = this.precedence.length;
-        var ll = new OpenLayers.LonLat(loc.x, loc.y);
-        for(var i=0, len=features.length; i<len; ++i) {
-            feature = features[i];
-            if(feature !== this.feature && !feature._sketch &&
-               feature.state !== OpenLayers.State.DELETE &&
-               (!target.filter || target.filter.evaluate(feature))) {
-                if(feature.atPoint(ll, maxTolerance, maxTolerance)) {
-                    for(var j=0, stop=Math.min(result.rank+1, numTypes); j<stop; ++j) {
-                        type = this.precedence[j];
-                        if(target[type]) {
-                            if(type === "edge") {
-                                closest = feature.geometry.distanceTo(loc, {details: true});
-                                dist = closest.distance;
-                                if(dist <= tolerance[type] && dist < result.dist) {
-                                    result = {
-                                        rank: j, dist: dist,
-                                        x: closest.x0, y: closest.y0 // closest coords on feature
-                                    };
-                                    eligible = true;
-                                    // don't look for lower precedence types for this feature
-                                    break;
-                                }
-                            } else {
-                                // look for nodes or vertices
-                                vertices = feature.geometry.getVertices(type === "node");
-                                found = false;
-                                for(var k=0, klen=vertices.length; k<klen; ++k) {
-                                    vertex = vertices[k];
-                                    dist = vertex.distanceTo(loc);
-                                    if(dist <= tolerance[type] &&
-                                       (j < result.rank || (j === result.rank && dist < result.dist))) {
-                                        result = {
-                                            rank: j, dist: dist,
-                                            x: vertex.x, y: vertex.y
-                                        };
-                                        eligible = true;
-                                        found = true;
-                                    }
-                                }
-                                if(found) {
-                                    // don't look for lower precedence types for this feature
-                                    break;
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        return eligible ? result : null;
-    },
-    
-    /**
-     * Method: getGeoTolerance
-     * Calculate a tolerance in map units given a tolerance in pixels.  This
-     *     takes advantage of the <geoToleranceCache> when the map resolution
-     *     has not changed.
-     *     
-     * Parameters:
-     * tolerance - {Number} A tolerance value in pixels.
-     * resolution - {Number} Map resolution.
-     *
-     * Returns:
-     * {Number} A tolerance value in map units.
-     */
-    getGeoTolerance: function(tolerance, resolution) {
-        if(resolution !== this.resolution) {
-            this.resolution = resolution;
-            this.geoToleranceCache = {};
-        }
-        var geoTolerance = this.geoToleranceCache[tolerance];
-        if(geoTolerance === undefined) {
-            geoTolerance = tolerance * resolution;
-            this.geoToleranceCache[tolerance] = geoTolerance;
-        }
-        return geoTolerance;
-    },
-    
-    /**
-     * Method: destroy
-     * Clean up the control.
-     */
-    destroy: function() {
-        if(this.active) {
-            this.deactivate(); // TODO: this should be handled by the super
-        }
-        delete this.layer;
-        delete this.targets;
-        OpenLayers.Control.prototype.destroy.call(this);
-    },
-
-    CLASS_NAME: "OpenLayers.Control.Snapping"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/Split.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/Split.js
deleted file mode 100644
index de19eb7c..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/Split.js
+++ /dev/null
@@ -1,494 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Control.js
- * @requires OpenLayers/Handler/Path.js
- * @requires OpenLayers/Layer/Vector.js
- */
-
-/**
- * Class: OpenLayers.Control.Split
- * Acts as a split feature agent while editing vector features.
- *
- * Inherits from:
- *  - <OpenLayers.Control>
- */
-OpenLayers.Control.Split = OpenLayers.Class(OpenLayers.Control, {
-
-    /** 
-     * APIProperty: events
-     * {<OpenLayers.Events>} Events instance for listeners and triggering
-     *     control specific events.
-     *
-     * Register a listener for a particular event with the following syntax:
-     * (code)
-     * control.events.register(type, obj, listener);
-     * (end)
-     *
-     * Supported event types (in addition to those from <OpenLayers.Control.events>):
-     * beforesplit - Triggered before a split occurs.  Listeners receive an
-     *     event object with *source* and *target* properties.
-     * split - Triggered when a split occurs.  Listeners receive an event with
-     *     an *original* property and a *features* property.  The original
-     *     is a reference to the target feature that the sketch or modified
-     *     feature intersects.  The features property is a list of all features
-     *     that result from this single split.  This event is triggered before
-     *     the resulting features are added to the layer (while the layer still
-     *     has a reference to the original).
-     * aftersplit - Triggered after all splits resulting from a single sketch
-     *     or feature modification have occurred.  The original features
-     *     have been destroyed and features that result from the split
-     *     have already been added to the layer.  Listeners receive an event
-     *     with a *source* and *features* property.  The source references the
-     *     sketch or modified feature used as a splitter.  The features
-     *     property is a list of all resulting features.
-     */
-    
-    /**
-     * APIProperty: layer
-     * {<OpenLayers.Layer.Vector>} The target layer with features to be split.
-     *     Set at construction or after construction with <setLayer>.
-     */
-    layer: null,
-    
-    /**
-     * Property: source
-     * {<OpenLayers.Layer.Vector>} Optional source layer.  Any newly created
-     *     or modified features from this layer will be used to split features
-     *     on the target layer.  If not provided, a temporary sketch layer will
-     *     be created.
-     */
-    source: null,
-    
-    /**
-     * Property: sourceOptions
-     * {Options} If a temporary sketch layer is created, these layer options
-     *     will be applied.
-     */
-    sourceOptions: null,
-
-    /**
-     * APIProperty: tolerance
-     * {Number} Distance between the calculated intersection and a vertex on
-     *     the source geometry below which the existing vertex will be used
-     *     for the split.  Default is null.
-     */
-    tolerance: null,
-    
-    /**
-     * APIProperty: edge
-     * {Boolean} Allow splits given intersection of edges only.  Default is
-     *     true.  If false, a vertex on the source must be within the
-     *     <tolerance> distance of the calculated intersection for a split
-     *     to occur.
-     */
-    edge: true,
-    
-    /**
-     * APIProperty: deferDelete
-     * {Boolean} Instead of removing features from the layer, set feature
-     *     states of split features to DELETE.  This assumes a save strategy
-     *     or other component is in charge of removing features from the
-     *     layer.  Default is false.  If false, split features will be
-     *     immediately deleted from the layer.
-     */
-    deferDelete: false,
-    
-    /**
-     * APIProperty: mutual
-     * {Boolean} If source and target layers are the same, split source
-     *     features and target features where they intersect.  Default is
-     *     true.  If false, only target features will be split.
-     */
-    mutual: true,
-    
-    /**
-     * APIProperty: targetFilter
-     * {<OpenLayers.Filter>} Optional filter that will be evaluated
-     *     to determine if a feature from the target layer is eligible for
-     *     splitting.
-     */
-    targetFilter: null,
-    
-    /**
-     * APIProperty: sourceFilter
-     * {<OpenLayers.Filter>} Optional filter that will be evaluated
-     *     to determine if a feature from the source layer is eligible for
-     *     splitting.
-     */
-    sourceFilter: null,
-    
-    /**
-     * Property: handler
-     * {<OpenLayers.Handler.Path>} The temporary sketch handler created if
-     *     no source layer is provided.
-     */
-    handler: null,
-
-    /**
-     * Constructor: OpenLayers.Control.Split
-     * Creates a new split control. A control is constructed with a target
-     *     layer and an optional source layer. While the control is active,
-     *     creating new features or modifying existing features on the source
-     *     layer will result in splitting any eligible features on the target
-     *     layer.  If no source layer is provided, a temporary sketch layer will
-     *     be created to create lines for splitting features on the target.
-     *
-     * Parameters:
-     * options - {Object} An object containing all configuration properties for
-     *     the control.
-     *
-     * Valid options:
-     * layer - {<OpenLayers.Layer.Vector>} The target layer.  Features from this
-     *     layer will be split by new or modified features on the source layer
-     *     or temporary sketch layer.
-     * source - {<OpenLayers.Layer.Vector>} Optional source layer.  If provided
-     *     newly created features or modified features will be used to split
-     *     features on the target layer.  If not provided, a temporary sketch
-     *     layer will be created for drawing lines.
-     * tolerance - {Number} Optional value for the distance between a source
-     *     vertex and the calculated intersection below which the split will
-     *     occur at the vertex.
-     * edge - {Boolean} Allow splits given intersection of edges only.  Default
-     *     is true.  If false, a vertex on the source must be within the
-     *     <tolerance> distance of the calculated intersection for a split
-     *     to occur.
-     * mutual - {Boolean} If source and target are the same, split source
-     *     features and target features where they intersect.  Default is
-     *     true.  If false, only target features will be split.
-     * targetFilter - {<OpenLayers.Filter>} Optional filter that will be evaluated
-     *     to determine if a feature from the target layer is eligible for
-     *     splitting.
-     * sourceFilter - {<OpenLayers.Filter>} Optional filter that will be evaluated
-     *     to determine if a feature from the target layer is eligible for
-     *     splitting.
-     */
-    initialize: function(options) {
-        OpenLayers.Control.prototype.initialize.apply(this, [options]);
-        this.options = options || {}; // TODO: this could be done by the super
-        
-        // set the source layer if provided
-        if(this.options.source) {
-            this.setSource(this.options.source);
-        }
-    },
-    
-    /**
-     * APIMethod: setSource
-     * Set the source layer for edits layer.
-     *
-     * Parameters:
-     * layer - {<OpenLayers.Layer.Vector>}  The new source layer layer.  If
-     *     null, a temporary sketch layer will be created.
-     */
-    setSource: function(layer) {
-        if(this.active) {
-            this.deactivate();
-            if(this.handler) {
-                this.handler.destroy();
-                delete this.handler;
-            }
-            this.source = layer;
-            this.activate();
-        } else {
-            this.source = layer;
-        }
-    },
-    
-    /**
-     * APIMethod: activate
-     * Activate the control.  Activating the control registers listeners for
-     *     editing related events so that during feature creation and
-     *     modification, features in the target will be considered for
-     *     splitting.
-     */
-    activate: function() {
-        var activated = OpenLayers.Control.prototype.activate.call(this);
-        if(activated) {
-            if(!this.source) {
-                if(!this.handler) {
-                    this.handler = new OpenLayers.Handler.Path(this,
-                        {done: function(geometry) {
-                            this.onSketchComplete({
-                                feature: new OpenLayers.Feature.Vector(geometry)
-                            });
-                        }},
-                        {layerOptions: this.sourceOptions}
-                    );
-                }
-                this.handler.activate();
-            } else if(this.source.events) {
-                this.source.events.on({
-                    sketchcomplete: this.onSketchComplete,
-                    afterfeaturemodified: this.afterFeatureModified,
-                    scope: this
-                });
-            }
-        }
-        return activated;
-    },
-    
-    /**
-     * APIMethod: deactivate
-     * Deactivate the control.  Deactivating the control unregisters listeners
-     *     so feature editing may proceed without engaging the split agent.
-     */
-    deactivate: function() {
-        var deactivated = OpenLayers.Control.prototype.deactivate.call(this);
-        if(deactivated) {
-            if(this.source && this.source.events) {
-                this.source.events.un({
-                    sketchcomplete: this.onSketchComplete,
-                    afterfeaturemodified: this.afterFeatureModified,
-                    scope: this
-                });
-            }
-        }
-        return deactivated;
-    },
-    
-    /**
-     * Method: onSketchComplete
-     * Registered as a listener for the sketchcomplete event on the editable
-     *     layer.
-     *
-     * Parameters:
-     * event - {Object} The sketch complete event.
-     *
-     * Returns:
-     * {Boolean} Stop the sketch from being added to the layer (it has been
-     *     split).
-     */
-    onSketchComplete: function(event) {
-        this.feature = null;
-        return !this.considerSplit(event.feature);
-    },
-    
-    /**
-     * Method: afterFeatureModified
-     * Registered as a listener for the afterfeaturemodified event on the
-     *     editable layer.
-     *
-     * Parameters:
-     * event - {Object} The after feature modified event.
-     */
-    afterFeatureModified: function(event) {
-        if(event.modified) {
-            var feature = event.feature;
-            if (typeof feature.geometry.split === "function") {
-                this.feature = event.feature;
-                this.considerSplit(event.feature);
-            }
-        }
-    },
-    
-    /**
-     * Method: removeByGeometry
-     * Remove a feature from a list based on the given geometry.
-     *
-     * Parameters:
-     * features - {Array(<OpenLayers.Feature.Vector>)} A list of features.
-     * geometry - {<OpenLayers.Geometry>} A geometry.
-     */
-    removeByGeometry: function(features, geometry) {
-        for(var i=0, len=features.length; i<len; ++i) {
-            if(features[i].geometry === geometry) {
-                features.splice(i, 1);
-                break;
-            }
-        }
-    },
-    
-    /**
-     * Method: isEligible
-     * Test if a target feature is eligible for splitting.
-     *
-     * Parameters:
-     * target - {<OpenLayers.Feature.Vector>} The target feature.
-     *
-     * Returns:
-     * {Boolean} The target is eligible for splitting.
-     */
-    isEligible: function(target) {
-        if (!target.geometry) {
-            return false;
-        } else {
-            return (
-                target.state !== OpenLayers.State.DELETE
-            ) && (
-                typeof target.geometry.split === "function"
-            ) && (
-                this.feature !== target
-            ) && (
-                !this.targetFilter ||
-                this.targetFilter.evaluate(target.attributes)
-            );
-        }
-    },
-
-    /**
-     * Method: considerSplit
-     * Decide whether or not to split target features with the supplied
-     *     feature.  If <mutual> is true, both the source and target features
-     *     will be split if eligible.
-     *
-     * Parameters:
-     * feature - {<OpenLayers.Feature.Vector>} The newly created or modified
-     *     feature.
-     *
-     * Returns:
-     * {Boolean} The supplied feature was split (and destroyed).
-     */
-    considerSplit: function(feature) {
-        var sourceSplit = false;
-        var targetSplit = false;
-        if(!this.sourceFilter ||
-           this.sourceFilter.evaluate(feature.attributes)) {
-            var features = this.layer && this.layer.features || [];
-            var target, results, proceed;
-            var additions = [], removals = [];
-            var mutual = (this.layer === this.source) && this.mutual;
-            var options = {
-                edge: this.edge,
-                tolerance: this.tolerance,
-                mutual: mutual
-            };
-            var sourceParts = [feature.geometry];
-            var targetFeature, targetParts;
-            var source, parts;
-            for(var i=0, len=features.length; i<len; ++i) {
-                targetFeature = features[i];
-                if(this.isEligible(targetFeature)) {
-                    targetParts = [targetFeature.geometry];
-                    // work through source geoms - this array may change
-                    for(var j=0; j<sourceParts.length; ++j) { 
-                        source = sourceParts[j];
-                        // work through target parts - this array may change
-                        for(var k=0; k<targetParts.length; ++k) {
-                            target = targetParts[k];
-                            if(source.getBounds().intersectsBounds(target.getBounds())) {
-                                results = source.split(target, options);
-                                if(results) {
-                                    proceed = this.events.triggerEvent(
-                                        "beforesplit", {source: feature, target: targetFeature}
-                                    );
-                                    if(proceed !== false) {
-                                        if(mutual) {
-                                            parts = results[0];
-                                            // handle parts that result from source splitting
-                                            if(parts.length > 1) {
-                                                // splice in new source parts
-                                                parts.unshift(j, 1); // add args for splice below
-                                                Array.prototype.splice.apply(sourceParts, parts);
-                                                j += parts.length - 3;
-                                            }
-                                            results = results[1];
-                                        }
-                                        // handle parts that result from target splitting
-                                        if(results.length > 1) {
-                                            // splice in new target parts
-                                            results.unshift(k, 1); // add args for splice below
-                                            Array.prototype.splice.apply(targetParts, results);
-                                            k += results.length - 3;
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                    if(targetParts && targetParts.length > 1) {
-                        this.geomsToFeatures(targetFeature, targetParts);
-                        this.events.triggerEvent("split", {
-                            original: targetFeature,
-                            features: targetParts
-                        });
-                        Array.prototype.push.apply(additions, targetParts);
-                        removals.push(targetFeature);
-                        targetSplit = true;
-                    }
-                }
-            }
-            if(sourceParts && sourceParts.length > 1) {
-                this.geomsToFeatures(feature, sourceParts);
-                this.events.triggerEvent("split", {
-                    original: feature,
-                    features: sourceParts
-                });
-                Array.prototype.push.apply(additions, sourceParts);
-                removals.push(feature);
-                sourceSplit = true;
-            }
-            if(sourceSplit || targetSplit) {
-                // remove and add feature events are suppressed
-                // listen for split event on this control instead
-                if(this.deferDelete) {
-                    // Set state instead of removing.  Take care to avoid
-                    // setting delete for features that have not yet been
-                    // inserted - those should be destroyed immediately.
-                    var feat, destroys = [];
-                    for(var i=0, len=removals.length; i<len; ++i) {
-                        feat = removals[i];
-                        if(feat.state === OpenLayers.State.INSERT) {
-                            destroys.push(feat);
-                        } else {
-                            feat.state = OpenLayers.State.DELETE;
-                            this.layer.drawFeature(feat);
-                        }
-                    }
-                    this.layer.destroyFeatures(destroys, {silent: true});
-                    for(var i=0, len=additions.length; i<len; ++i) {
-                        additions[i].state = OpenLayers.State.INSERT;
-                    }
-                } else {
-                    this.layer.destroyFeatures(removals, {silent: true});
-                }
-                this.layer.addFeatures(additions, {silent: true});
-                this.events.triggerEvent("aftersplit", {
-                    source: feature,
-                    features: additions
-                });
-            }
-        }
-        return sourceSplit;
-    },
-    
-    /**
-     * Method: geomsToFeatures
-     * Create new features given a template feature and a list of geometries.
-     *     The list of geometries is modified in place.  The result will be
-     *     a list of new features.
-     *
-     * Parameters:
-     * feature - {<OpenLayers.Feature.Vector>} The feature to be cloned.
-     * geoms - {Array(<OpenLayers.Geometry>)} List of goemetries.  This will
-     *     become a list of new features.
-     */
-    geomsToFeatures: function(feature, geoms) {
-        var clone = feature.clone();
-        delete clone.geometry;
-        var newFeature;
-        for(var i=0, len=geoms.length; i<len; ++i) {
-            // turn results list from geoms to features
-            newFeature = clone.clone();
-            newFeature.geometry = geoms[i];
-            newFeature.state = OpenLayers.State.INSERT;
-            geoms[i] = newFeature;
-        }
-    },
-    
-    /**
-     * Method: destroy
-     * Clean up the control.
-     */
-    destroy: function() {
-        if(this.active) {
-            this.deactivate(); // TODO: this should be handled by the super
-        }
-        OpenLayers.Control.prototype.destroy.call(this);
-    },
-
-    CLASS_NAME: "OpenLayers.Control.Split"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/TouchNavigation.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/TouchNavigation.js
deleted file mode 100644
index cd5f9264..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/TouchNavigation.js
+++ /dev/null
@@ -1,182 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Control/DragPan.js
- * @requires OpenLayers/Control/PinchZoom.js
- * @requires OpenLayers/Handler/Click.js
- */
-
-/**
- * Class: OpenLayers.Control.TouchNavigation
- * The navigation control handles map browsing with touch events (dragging,
- *     double-tapping, tap with two fingers, and pinch zoom).  Create a new 
- *     control with the <OpenLayers.Control.TouchNavigation> constructor.
- *
- * If you’re only targeting touch enabled devices with your mapping application,
- *     you can create a map with only a TouchNavigation control. The 
- *     <OpenLayers.Control.Navigation> control is mobile ready by default, but 
- *     you can generate a smaller build of the library by only including this
- *     touch navigation control if you aren't concerned about mouse interaction.
- *
- * Inherits:
- *  - <OpenLayers.Control>
- */
-OpenLayers.Control.TouchNavigation = OpenLayers.Class(OpenLayers.Control, {
-
-    /**
-     * Property: dragPan
-     * {<OpenLayers.Control.DragPan>}
-     */
-    dragPan: null,
-
-    /**
-     * APIProperty: dragPanOptions
-     * {Object} Options passed to the DragPan control.
-     */
-    dragPanOptions: null,
-
-    /**
-     * Property: pinchZoom
-     * {<OpenLayers.Control.PinchZoom>}
-     */
-    pinchZoom: null,
-
-    /**
-     * APIProperty: pinchZoomOptions
-     * {Object} Options passed to the PinchZoom control.
-     */
-    pinchZoomOptions: null,
-
-    /**
-     * APIProperty: clickHandlerOptions
-     * {Object} Options passed to the Click handler.
-     */
-    clickHandlerOptions: null,
-
-    /**
-     * APIProperty: documentDrag
-     * {Boolean} Allow panning of the map by dragging outside map viewport.
-     *     Default is false.
-     */
-    documentDrag: false,
-
-    /**
-     * APIProperty: autoActivate
-     * {Boolean} Activate the control when it is added to a map.  Default is
-     *     true.
-     */
-    autoActivate: true,
-
-    /**
-     * Constructor: OpenLayers.Control.TouchNavigation
-     * Create a new navigation control
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be set on
-     *                    the control
-     */
-    initialize: function(options) {
-        this.handlers = {};
-        OpenLayers.Control.prototype.initialize.apply(this, arguments);
-    },
-
-    /**
-     * Method: destroy
-     * The destroy method is used to perform any clean up before the control
-     * is dereferenced.  Typically this is where event listeners are removed
-     * to prevent memory leaks.
-     */
-    destroy: function() {
-        this.deactivate();
-        if(this.dragPan) {
-            this.dragPan.destroy();
-        }
-        this.dragPan = null;
-        if (this.pinchZoom) {
-            this.pinchZoom.destroy();
-            delete this.pinchZoom;
-        }
-        OpenLayers.Control.prototype.destroy.apply(this,arguments);
-    },
-
-    /**
-     * Method: activate
-     */
-    activate: function() {
-        if(OpenLayers.Control.prototype.activate.apply(this,arguments)) {
-            this.dragPan.activate();
-            this.handlers.click.activate();
-            this.pinchZoom.activate();
-            return true;
-        }
-        return false;
-    },
-
-    /**
-     * Method: deactivate
-     */
-    deactivate: function() {
-        if(OpenLayers.Control.prototype.deactivate.apply(this,arguments)) {
-            this.dragPan.deactivate();
-            this.handlers.click.deactivate();
-            this.pinchZoom.deactivate();
-            return true;
-        }
-        return false;
-    },
-    
-    /**
-     * Method: draw
-     */
-    draw: function() {
-        var clickCallbacks = {
-            click: this.defaultClick,
-            dblclick: this.defaultDblClick
-        };
-        var clickOptions = OpenLayers.Util.extend({
-            "double": true,
-            stopDouble: true,
-            pixelTolerance: 2
-        }, this.clickHandlerOptions);
-        this.handlers.click = new OpenLayers.Handler.Click(
-            this, clickCallbacks, clickOptions
-        );
-        this.dragPan = new OpenLayers.Control.DragPan(
-            OpenLayers.Util.extend({
-                map: this.map,
-                documentDrag: this.documentDrag
-            }, this.dragPanOptions)
-        );
-        this.dragPan.draw();
-        this.pinchZoom = new OpenLayers.Control.PinchZoom(
-            OpenLayers.Util.extend({map: this.map}, this.pinchZoomOptions)
-        );
-    },
-
-    /**
-     * Method: defaultClick
-     *
-     * Parameters:
-     * evt - {Event}
-     */
-    defaultClick: function (evt) {
-        if(evt.lastTouches && evt.lastTouches.length == 2) {
-            this.map.zoomOut();
-        }
-    },
-
-    /**
-     * Method: defaultDblClick
-     *
-     * Parameters:
-     * evt - {Event}
-     */
-    defaultDblClick: function (evt) {
-        this.map.zoomTo(this.map.zoom + 1, evt.xy);
-    },
-
-    CLASS_NAME: "OpenLayers.Control.TouchNavigation"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/TransformFeature.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/TransformFeature.js
deleted file mode 100644
index 8c214564..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/TransformFeature.js
+++ /dev/null
@@ -1,624 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-
-/**
- * @requires OpenLayers/Control.js
- * @requires OpenLayers/Control/DragFeature.js
- * @requires OpenLayers/Feature/Vector.js
- * @requires OpenLayers/Geometry/LineString.js
- * @requires OpenLayers/Geometry/Point.js
- */
-
-/**
- * Class: OpenLayers.Control.TransformFeature
- * Control to transform features with a standard transformation box.
- *
- * Inherits From:
- *  - <OpenLayers.Control>
- */
-OpenLayers.Control.TransformFeature = OpenLayers.Class(OpenLayers.Control, {
-
-    /** 
-     * APIProperty: events
-     * {<OpenLayers.Events>} Events instance for listeners and triggering
-     *     control specific events.
-     *
-     * Register a listener for a particular event with the following syntax:
-     * (code)
-     * control.events.register(type, obj, listener);
-     * (end)
-     *
-     * Supported event types (in addition to those from <OpenLayers.Control.events>):
-     * beforesetfeature - Triggered before a feature is set for
-     *     tranformation. The feature will not be set if a listener returns
-     *     false. Listeners receive a *feature* property, with the feature
-     *     that will be set for transformation. Listeners are allowed to
-     *     set the control's *scale*, *ratio* and *rotation* properties,
-     *     which will set the initial scale, ratio and rotation of the
-     *     feature, like the <setFeature> method's initialParams argument.
-     * setfeature - Triggered when a feature is set for tranformation.
-     *     Listeners receive a *feature* property, with the feature that
-     *     is now set for transformation.
-     * beforetransform - Triggered while dragging, before a feature is
-     *     transformed. The feature will not be transformed if a listener
-     *     returns false (but the box still will). Listeners receive one or
-     *     more of *center*, *scale*, *ratio* and *rotation*. The *center*
-     *     property is an <OpenLayers.Geometry.Point> object with the new
-     *     center of the transformed feature, the others are Floats with the
-     *     scale, ratio or rotation change since the last transformation.
-     * transform - Triggered while dragging, when a feature is transformed.
-     *     Listeners receive an event object with one or more of *center*,
-     *     scale*, *ratio* and *rotation*. The *center* property is an
-     *     <OpenLayers.Geometry.Point> object with the new center of the
-     *     transformed feature, the others are Floats with the scale, ratio
-     *     or rotation change of the feature since the last transformation.
-     * transformcomplete - Triggered after dragging. Listeners receive
-     *     an event object with the transformed *feature*.
-     */
-
-    /**
-     * APIProperty: geometryTypes
-     * {Array(String)} To restrict transformation to a limited set of geometry
-     *     types, send a list of strings corresponding to the geometry class
-     *     names.
-     */
-    geometryTypes: null,
-
-    /**
-     * Property: layer
-     * {<OpenLayers.Layer.Vector>}
-     */
-    layer: null,
-    
-    /**
-     * APIProperty: preserveAspectRatio
-     * {Boolean} set to true to not change the feature's aspect ratio.
-     */
-    preserveAspectRatio: false,
-    
-    /**
-     * APIProperty: rotate
-     * {Boolean} set to false if rotation should be disabled. Default is true.
-     *     To be passed with the constructor or set when the control is not
-     *     active.
-     */
-    rotate: true,
-    
-    /**
-     * APIProperty: feature
-     * {<OpenLayers.Feature.Vector>} Feature currently available for
-     *     transformation. Read-only, use <setFeature> to set it manually.
-     */
-    feature: null,
-    
-    /**
-     * APIProperty: renderIntent
-     * {String|Object} Render intent for the transformation box and
-     *     handles. A symbolizer object can also be provided here.
-     */
-    renderIntent: "temporary",
-    
-    /**
-     * APIProperty: rotationHandleSymbolizer
-     * {Object|String} Optional. A custom symbolizer for the rotation handles.
-     *     A render intent can also be provided here. Defaults to
-     *     (code)
-     *     {
-     *         stroke: false,
-     *         pointRadius: 10,
-     *         fillOpacity: 0,
-     *         cursor: "pointer"
-     *     }
-     *     (end)
-     */
-    rotationHandleSymbolizer: null,
-    
-    /**
-     * APIProperty: box
-     * {<OpenLayers.Feature.Vector>} The transformation box rectangle.
-     *     Read-only.
-     */
-    box: null,
-    
-    /**
-     * APIProperty: center
-     * {<OpenLayers.Geometry.Point>} The center of the feature bounds.
-     * Read-only.
-     */
-    center: null,
-    
-    /**
-     * APIProperty: scale
-     * {Float} The scale of the feature, relative to the scale the time the
-     *     feature was set. Read-only, except for *beforesetfeature*
-     *     listeners.
-     */
-    scale: 1,
-    
-    /**
-     * APIProperty: ratio
-     * {Float} The ratio of the feature relative to the ratio the time the
-     *     feature was set. Read-only, except for *beforesetfeature*
-     *     listeners.
-     */
-    ratio: 1,
-    
-    /**
-     * Property: rotation
-     * {Integer} the current rotation angle of the box. Read-only, except for
-     *     *beforesetfeature* listeners.
-     */
-    rotation: 0,
-    
-    /**
-     * APIProperty: handles
-     * {Array(<OpenLayers.Feature.Vector>)} The 8 handles currently available
-     *     for scaling/resizing. Numbered counterclockwise, starting from the
-     *     southwest corner. Read-only.
-     */
-    handles: null,
-    
-    /**
-     * APIProperty: rotationHandles
-     * {Array(<OpenLayers.Feature.Vector>)} The 4 rotation handles currently
-     *     available for rotating. Numbered counterclockwise, starting from
-     *     the southwest corner. Read-only.
-     */
-    rotationHandles: null,
-    
-    /**
-     * Property: dragControl
-     * {<OpenLayers.Control.DragFeature>}
-     */
-    dragControl: null,
-    
-    /**
-     * APIProperty: irregular
-     * {Boolean} Make scaling/resizing work irregularly. If true then
-     *     dragging a handle causes the feature to resize in the direction
-     *     of movement. If false then the feature resizes symetrically
-     *     about it's center.
-     */
-    irregular: false,
-    
-    /**
-     * Constructor: OpenLayers.Control.TransformFeature
-     * Create a new transform feature control.
-     *
-     * Parameters:
-     * layer - {<OpenLayers.Layer.Vector>} Layer that contains features that
-     *     will be transformed.
-     * options - {Object} Optional object whose properties will be set on the
-     *     control.
-     */
-    initialize: function(layer, options) {
-        OpenLayers.Control.prototype.initialize.apply(this, [options]);
-
-        this.layer = layer;
-
-        if(!this.rotationHandleSymbolizer) {
-            this.rotationHandleSymbolizer = {
-                stroke: false,
-                pointRadius: 10,
-                fillOpacity: 0,
-                cursor: "pointer"
-            };
-        }
-
-        this.createBox();
-        this.createControl();        
-    },
-    
-    /**
-     * APIMethod: activate
-     * Activates the control.
-     */
-    activate: function() {
-        var activated = false;
-        if(OpenLayers.Control.prototype.activate.apply(this, arguments)) {
-            this.dragControl.activate();
-            this.layer.addFeatures([this.box]);
-            this.rotate && this.layer.addFeatures(this.rotationHandles);
-            this.layer.addFeatures(this.handles);        
-            activated = true;
-        }
-        return activated;
-    },
-    
-    /**
-     * APIMethod: deactivate
-     * Deactivates the control.
-     */
-    deactivate: function() {
-        var deactivated = false;
-        if(OpenLayers.Control.prototype.deactivate.apply(this, arguments)) {
-            this.layer.removeFeatures(this.handles);
-            this.rotate && this.layer.removeFeatures(this.rotationHandles);
-            this.layer.removeFeatures([this.box]);
-            this.dragControl.deactivate();
-            deactivated = true;
-        }
-        return deactivated;
-    },
-    
-    /**
-     * Method: setMap
-     * 
-     * Parameters:
-     * map - {<OpenLayers.Map>}
-     */
-    setMap: function(map) {
-        this.dragControl.setMap(map);
-        OpenLayers.Control.prototype.setMap.apply(this, arguments);
-    },
-
-    /**
-     * APIMethod: setFeature
-     * Place the transformation box on a feature and start transforming it.
-     * If the control is not active, it will be activated.
-     * 
-     * Parameters:
-     * feature - {<OpenLayers.Feature.Vector>}
-     * initialParams - {Object} Initial values for rotation, scale or ratio.
-     *     Setting a rotation value here will cause the transformation box to
-     *     start rotated. Setting a scale or ratio will not affect the
-     *     transormation box, but applications may use this to keep track of
-     *     scale and ratio of a feature across multiple transforms.
-     */
-    setFeature: function(feature, initialParams) {
-        initialParams = OpenLayers.Util.applyDefaults(initialParams, {
-            rotation: 0,
-            scale: 1,
-            ratio: 1
-        });
-
-        var oldRotation = this.rotation;
-        var oldCenter = this.center;
-        OpenLayers.Util.extend(this, initialParams);
-
-        var cont = this.events.triggerEvent("beforesetfeature",
-            {feature: feature}
-        );
-        if (cont === false) {
-            return;
-        }
-
-        this.feature = feature;
-        this.activate();
-
-        this._setfeature = true;
-
-        var featureBounds = this.feature.geometry.getBounds();
-        this.box.move(featureBounds.getCenterLonLat());
-        this.box.geometry.rotate(-oldRotation, oldCenter);
-        this._angle = 0;
-
-        var ll;
-        if(this.rotation) {
-            var geom = feature.geometry.clone();
-            geom.rotate(-this.rotation, this.center);
-            var box = new OpenLayers.Feature.Vector(
-                geom.getBounds().toGeometry());
-            box.geometry.rotate(this.rotation, this.center);
-            this.box.geometry.rotate(this.rotation, this.center);
-            this.box.move(box.geometry.getBounds().getCenterLonLat());
-            var llGeom = box.geometry.components[0].components[0];
-            ll = llGeom.getBounds().getCenterLonLat();
-        } else {
-            ll = new OpenLayers.LonLat(featureBounds.left, featureBounds.bottom);
-        }
-        this.handles[0].move(ll);
-        
-        delete this._setfeature;
-
-        this.events.triggerEvent("setfeature", {feature: feature});
-    },
-    
-    /**
-     * APIMethod: unsetFeature
-     * Remove the transformation box off any feature.
-     * If the control is active, it will be deactivated first.
-     */
-    unsetFeature: function() {
-        if (this.active) {
-            this.deactivate();
-        } else {
-            this.feature = null;
-            this.rotation = 0;
-            this.scale = 1;
-            this.ratio = 1;
-        }
-    },
-    
-    /**
-     * Method: createBox
-     * Creates the box with all handles and transformation handles.
-     */
-    createBox: function() {
-        var control = this;
-        
-        this.center = new OpenLayers.Geometry.Point(0, 0);
-        this.box = new OpenLayers.Feature.Vector(
-            new OpenLayers.Geometry.LineString([
-                new OpenLayers.Geometry.Point(-1, -1),
-                new OpenLayers.Geometry.Point(0, -1),
-                new OpenLayers.Geometry.Point(1, -1),
-                new OpenLayers.Geometry.Point(1, 0),
-                new OpenLayers.Geometry.Point(1, 1),
-                new OpenLayers.Geometry.Point(0, 1),
-                new OpenLayers.Geometry.Point(-1, 1),
-                new OpenLayers.Geometry.Point(-1, 0),
-                new OpenLayers.Geometry.Point(-1, -1)
-            ]), null,
-            typeof this.renderIntent == "string" ? null : this.renderIntent
-        );
-        
-        // Override for box move - make sure that the center gets updated
-        this.box.geometry.move = function(x, y) {
-            control._moving = true;
-            OpenLayers.Geometry.LineString.prototype.move.apply(this, arguments);
-            control.center.move(x, y);
-            delete control._moving;
-        };
-
-        // Overrides for vertex move, resize and rotate - make sure that
-        // handle and rotationHandle geometries are also moved, resized and
-        // rotated.
-        var vertexMoveFn = function(x, y) {
-            OpenLayers.Geometry.Point.prototype.move.apply(this, arguments);
-            this._rotationHandle && this._rotationHandle.geometry.move(x, y);
-            this._handle.geometry.move(x, y);
-        };
-        var vertexResizeFn = function(scale, center, ratio) {
-            OpenLayers.Geometry.Point.prototype.resize.apply(this, arguments);
-            this._rotationHandle && this._rotationHandle.geometry.resize(
-                scale, center, ratio);
-            this._handle.geometry.resize(scale, center, ratio);
-        };
-        var vertexRotateFn = function(angle, center) {
-            OpenLayers.Geometry.Point.prototype.rotate.apply(this, arguments);
-            this._rotationHandle && this._rotationHandle.geometry.rotate(
-                angle, center);
-            this._handle.geometry.rotate(angle, center);
-        };
-        
-        // Override for handle move - make sure that the box and other handles
-        // are updated, and finally transform the feature.
-        var handleMoveFn = function(x, y) {
-            var oldX = this.x, oldY = this.y;
-            OpenLayers.Geometry.Point.prototype.move.call(this, x, y);
-            if(control._moving) {
-                return;
-            }
-            var evt = control.dragControl.handlers.drag.evt;
-            var preserveAspectRatio = !control._setfeature &&
-                control.preserveAspectRatio;
-            var reshape = !preserveAspectRatio && !(evt && evt.shiftKey);
-            var oldGeom = new OpenLayers.Geometry.Point(oldX, oldY);
-            var centerGeometry = control.center;
-            this.rotate(-control.rotation, centerGeometry);
-            oldGeom.rotate(-control.rotation, centerGeometry);
-            var dx1 = this.x - centerGeometry.x;
-            var dy1 = this.y - centerGeometry.y;
-            var dx0 = dx1 - (this.x - oldGeom.x);
-            var dy0 = dy1 - (this.y - oldGeom.y);
-            if (control.irregular && !control._setfeature) {
-               dx1 -= (this.x - oldGeom.x) / 2;
-               dy1 -= (this.y - oldGeom.y) / 2;
-            }
-            this.x = oldX;
-            this.y = oldY;
-            var scale, ratio = 1;
-            if (reshape) {
-                scale = Math.abs(dy0) < 0.00001 ? 1 : dy1 / dy0;
-                ratio = (Math.abs(dx0) < 0.00001 ? 1 : (dx1 / dx0)) / scale;
-            } else {
-                var l0 = Math.sqrt((dx0 * dx0) + (dy0 * dy0));
-                var l1 = Math.sqrt((dx1 * dx1) + (dy1 * dy1));
-                scale = l1 / l0;
-            }
-
-            // rotate the box to 0 before resizing - saves us some
-            // calculations and is inexpensive because we don't drawFeature.
-            control._moving = true;
-            control.box.geometry.rotate(-control.rotation, centerGeometry);
-            delete control._moving;
-
-            control.box.geometry.resize(scale, centerGeometry, ratio);
-            control.box.geometry.rotate(control.rotation, centerGeometry);
-            control.transformFeature({scale: scale, ratio: ratio});
-            if (control.irregular && !control._setfeature) {
-               var newCenter = centerGeometry.clone();
-               newCenter.x += Math.abs(oldX - centerGeometry.x) < 0.00001 ? 0 : (this.x - oldX);
-               newCenter.y += Math.abs(oldY - centerGeometry.y) < 0.00001 ? 0 : (this.y - oldY);
-               control.box.geometry.move(this.x - oldX, this.y - oldY);
-               control.transformFeature({center: newCenter});
-            }
-        };
-        
-        // Override for rotation handle move - make sure that the box and
-        // other handles are updated, and finally transform the feature.
-        var rotationHandleMoveFn = function(x, y){
-            var oldX = this.x, oldY = this.y;
-            OpenLayers.Geometry.Point.prototype.move.call(this, x, y);
-            if(control._moving) {
-                return;
-            }
-            var evt = control.dragControl.handlers.drag.evt;
-            var constrain = (evt && evt.shiftKey) ? 45 : 1;
-            var centerGeometry = control.center;
-            var dx1 = this.x - centerGeometry.x;
-            var dy1 = this.y - centerGeometry.y;
-            var dx0 = dx1 - x;
-            var dy0 = dy1 - y;
-            this.x = oldX;
-            this.y = oldY;
-            var a0 = Math.atan2(dy0, dx0);
-            var a1 = Math.atan2(dy1, dx1);
-            var angle = a1 - a0;
-            angle *= 180 / Math.PI;
-            control._angle = (control._angle + angle) % 360;
-            var diff = control.rotation % constrain;
-            if(Math.abs(control._angle) >= constrain || diff !== 0) {
-                angle = Math.round(control._angle / constrain) * constrain -
-                    diff;
-                control._angle = 0;
-                control.box.geometry.rotate(angle, centerGeometry);
-                control.transformFeature({rotation: angle});
-            } 
-        };
-
-        var handles = new Array(8);
-        var rotationHandles = new Array(4);
-        var geom, handle, rotationHandle;
-        var positions = ["sw", "s", "se", "e", "ne", "n", "nw", "w"];
-        for(var i=0; i<8; ++i) {
-            geom = this.box.geometry.components[i];
-            handle = new OpenLayers.Feature.Vector(geom.clone(), {
-                role: positions[i] + "-resize"
-            }, typeof this.renderIntent == "string" ? null :
-                this.renderIntent);
-            if(i % 2 == 0) {
-                rotationHandle = new OpenLayers.Feature.Vector(geom.clone(), {
-                    role: positions[i] + "-rotate"
-                }, typeof this.rotationHandleSymbolizer == "string" ?
-                    null : this.rotationHandleSymbolizer);
-                rotationHandle.geometry.move = rotationHandleMoveFn;
-                geom._rotationHandle = rotationHandle;
-                rotationHandles[i/2] = rotationHandle;
-            }
-            geom.move = vertexMoveFn;
-            geom.resize = vertexResizeFn;
-            geom.rotate = vertexRotateFn;
-            handle.geometry.move = handleMoveFn;
-            geom._handle = handle;
-            handles[i] = handle;
-        }
-        
-        this.rotationHandles = rotationHandles;
-        this.handles = handles;
-    },
-    
-    /**
-     * Method: createControl
-     * Creates a DragFeature control for this control.
-     */
-    createControl: function() {
-        var control = this;
-        this.dragControl = new OpenLayers.Control.DragFeature(this.layer, {
-            documentDrag: true,
-            // avoid moving the feature itself - move the box instead
-            moveFeature: function(pixel) {
-                if(this.feature === control.feature) {
-                    this.feature = control.box;
-                }
-                OpenLayers.Control.DragFeature.prototype.moveFeature.apply(this,
-                    arguments);
-            },
-            // transform while dragging
-            onDrag: function(feature, pixel) {
-                if(feature === control.box) {
-                    control.transformFeature({center: control.center});
-                }
-            },
-            // set a new feature
-            onStart: function(feature, pixel) {
-                var eligible = !control.geometryTypes ||
-                    OpenLayers.Util.indexOf(control.geometryTypes,
-                        feature.geometry.CLASS_NAME) !== -1;
-                var i = OpenLayers.Util.indexOf(control.handles, feature);
-                i += OpenLayers.Util.indexOf(control.rotationHandles,
-                    feature);
-                if(feature !== control.feature && feature !== control.box &&
-                                                        i == -2 && eligible) {
-                    control.setFeature(feature);
-                }
-            },
-            onComplete: function(feature, pixel) {
-                control.events.triggerEvent("transformcomplete",
-                    {feature: control.feature});
-            }
-        });
-    },
-    
-    /**
-     * Method: drawHandles
-     * Draws the handles to match the box.
-     */
-    drawHandles: function() {
-        var layer = this.layer;
-        for(var i=0; i<8; ++i) {
-            if(this.rotate && i % 2 === 0) {
-                layer.drawFeature(this.rotationHandles[i/2],
-                    this.rotationHandleSymbolizer);
-            }
-            layer.drawFeature(this.handles[i], this.renderIntent);
-        }
-    },
-    
-    /**
-     * Method: transformFeature
-     * Transforms the feature.
-     * 
-     * Parameters:
-     * mods - {Object} An object with optional scale, ratio, rotation and
-     *     center properties.
-     */
-    transformFeature: function(mods) {
-        if(!this._setfeature) {
-            this.scale *= (mods.scale || 1);
-            this.ratio *= (mods.ratio || 1);
-            var oldRotation = this.rotation;
-            this.rotation = (this.rotation + (mods.rotation || 0)) % 360;
-            
-            if(this.events.triggerEvent("beforetransform", mods) !== false) {
-                var feature = this.feature;
-                var geom = feature.geometry;
-                var center = this.center;
-                geom.rotate(-oldRotation, center);
-                if(mods.scale || mods.ratio) {
-                    geom.resize(mods.scale, center, mods.ratio);
-                } else if(mods.center) {
-                    feature.move(mods.center.getBounds().getCenterLonLat());
-                }
-                geom.rotate(this.rotation, center);
-                this.layer.drawFeature(feature);
-                feature.toState(OpenLayers.State.UPDATE);
-                this.events.triggerEvent("transform", mods);
-            }
-        }
-        this.layer.drawFeature(this.box, this.renderIntent);
-        this.drawHandles();
-    },
-        
-    /**
-     * APIMethod: destroy
-     * Take care of things that are not handled in superclass.
-     */
-    destroy: function() {
-        var geom;
-        for(var i=0; i<8; ++i) {
-            geom = this.box.geometry.components[i];
-            geom._handle.destroy();
-            geom._handle = null;
-            geom._rotationHandle && geom._rotationHandle.destroy();
-            geom._rotationHandle = null;
-        }
-        this.center = null;
-        this.feature = null;
-        this.handles = null;
-        this.rotationHandleSymbolizer = null;
-        this.rotationHandles = null;
-        this.box.destroy();
-        this.box = null;
-        this.layer = null;
-        this.dragControl.destroy();
-        this.dragControl = null;
-        OpenLayers.Control.prototype.destroy.apply(this, arguments);
-    },
-
-    CLASS_NAME: "OpenLayers.Control.TransformFeature"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/UTFGrid.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/UTFGrid.js
deleted file mode 100644
index 79932011..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/UTFGrid.js
+++ /dev/null
@@ -1,240 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Control.js
- * @requires OpenLayers/Handler/Hover.js
- * @requires OpenLayers/Handler/Click.js
- */
-
-/**
- * Class: OpenLayers.Control.UTFGrid
- *
- * This Control provides behavior associated with UTFGrid Layers.
- * These 'hit grids' provide underlying feature attributes without
- * calling the server (again). This control allows Mousemove, Hovering 
- * and Click events to trigger callbacks that use the attributes in 
- * whatever way you need. 
- *
- * The most common example may be a UTFGrid layer containing feature
- * attributes that are displayed in a div as you mouseover.
- *
- * Example Code:
- *
- * (start code)
- * var world_utfgrid = new OpenLayers.Layer.UTFGrid( 
- *     'UTFGrid Layer', 
- *     "http://tiles/world_utfgrid/${z}/${x}/${y}.json"
- * );
- * map.addLayer(world_utfgrid);
- * 
- * var control = new OpenLayers.Control.UTFGrid({
- *     layers: [world_utfgrid],
- *     handlerMode: 'move',
- *     callback: function(infoLookup) {
- *         // do something with returned data
- *
- *     }
- * })
- * (end code)
- *
- *
- * Inherits from:
- *  - <OpenLayers.Control>
- */
-OpenLayers.Control.UTFGrid = OpenLayers.Class(OpenLayers.Control, {
-    
-    /**
-     * APIProperty: autoActivate
-     * {Boolean} Activate the control when it is added to a map.  Default is
-     *     true.
-     */
-    autoActivate: true,
-
-    /** 
-     * APIProperty: Layers
-     * List of layers to consider. Must be Layer.UTFGrids
-     * `null` is the default indicating all UTFGrid Layers are queried.
-     * {Array} <OpenLayers.Layer.UTFGrid> 
-     */
-    layers: null,
-
-    /* Property: defaultHandlerOptions
-     * The default opts passed to the handler constructors
-     */
-    defaultHandlerOptions: {
-        'delay': 300,
-        'pixelTolerance': 4,
-        'stopMove': false,
-        'single': true,
-        'double': false,
-        'stopSingle': false,
-        'stopDouble': false
-    },
-
-    /* APIProperty: handlerMode
-     * Defaults to 'click'. Can be 'hover' or 'move'.
-     */
-    handlerMode: 'click',
-
-    /**
-     * APIMethod: setHandler
-     * sets this.handlerMode and calls resetHandler()
-     *
-     * Parameters:
-     * hm - {String} Handler Mode string; 'click', 'hover' or 'move'.
-     */
-    setHandler: function(hm) {
-        this.handlerMode = hm;
-        this.resetHandler();
-    },
-
-    /**
-     * Method: resetHandler
-     * Deactivates the old hanlder and creates a new
-     * <OpenLayers.Handler> based on the mode specified in
-     * this.handlerMode
-     *
-     */
-    resetHandler: function() {
-        if (this.handler) {
-            this.handler.deactivate();
-            this.handler.destroy();
-            this.handler = null;
-        }
-   
-        if (this.handlerMode == 'hover') {
-            // Handle this event on hover
-            this.handler = new OpenLayers.Handler.Hover(
-                this,
-                {'pause': this.handleEvent, 'move': this.reset},
-                this.handlerOptions
-            );
-        } else if (this.handlerMode == 'click') {
-            // Handle this event on click
-            this.handler = new OpenLayers.Handler.Click(
-                this, {
-                    'click': this.handleEvent
-                }, this.handlerOptions
-            );
-        } else if (this.handlerMode == 'move') {
-            this.handler = new OpenLayers.Handler.Hover(
-                this,
-                // Handle this event while hovering OR moving
-                {'pause': this.handleEvent, 'move': this.handleEvent},
-                this.handlerOptions
-            );
-        }
-        if (this.handler) {
-            return true;
-        } else {
-            return false;
-        }
-    },
-
-    /**
-     * Constructor: <OpenLayers.Control.UTFGrid>
-     *
-     * Parameters:
-     * options - {Object} 
-     */
-    initialize: function(options) {
-        options = options || {};
-        options.handlerOptions = options.handlerOptions || this.defaultHandlerOptions;
-        OpenLayers.Control.prototype.initialize.apply(this, [options]);
-        this.resetHandler();
-    }, 
-
-    /**
-     * Method: handleEvent
-     * Internal method called when specified event is triggered.
-     * 
-     * This method does several things:
-     *
-     * Gets the lonLat of the event.
-     *
-     * Loops through the appropriate hit grid layers and gathers the attributes.
-     *
-     * Passes the attributes to the callback
-     *
-     * Parameters:
-     * evt - {<OpenLayers.Event>} 
-     */
-    handleEvent: function(evt) {
-        if (evt == null) {
-            this.reset();
-            return;
-        }
-
-        var lonLat = this.map.getLonLatFromPixel(evt.xy);
-        if (!lonLat) { 
-            return;
-        }    
-        
-        var layers = this.findLayers();
-        if (layers.length > 0) {
-            var infoLookup = {};
-            var layer, idx;
-            for (var i=0, len=layers.length; i<len; i++) {
-                layer = layers[i];
-                idx = OpenLayers.Util.indexOf(this.map.layers, layer);
-                infoLookup[idx] = layer.getFeatureInfo(lonLat);
-            }
-            this.callback(infoLookup, lonLat, evt.xy);
-        }
-    },
-
-    /**
-     * APIMethod: callback
-     * Function to be called when a mouse event corresponds with a location that
-     *     includes data in one of the configured UTFGrid layers.
-     *
-     * Parameters:
-     * infoLookup - {Object} Keys of this object are layer indexes and can be
-     *     used to resolve a layer in the map.layers array.  The structure of
-     *     the property values depend on the data included in the underlying
-     *     UTFGrid and may be any valid JSON type.  
-     */
-    callback: function(infoLookup) {
-        // to be provided in the constructor
-    },
-
-    /**
-     * Method: reset
-     * Calls the callback with null.
-     */
-    reset: function(evt) {
-        this.callback(null);
-    },
-
-    /**
-     * Method: findLayers
-     * Internal method to get the layers, independent of whether we are
-     *     inspecting the map or using a client-provided array
-     *
-     * The default value of this.layers is null; this causes the 
-     * findLayers method to return ALL UTFGrid layers encountered.
-     *
-     * Parameters:
-     * None
-     *
-     * Returns:
-     * {Array} Layers to handle on each event
-     */
-    findLayers: function() {
-        var candidates = this.layers || this.map.layers;
-        var layers = [];
-        var layer;
-        for (var i=candidates.length-1; i>=0; --i) {
-            layer = candidates[i];
-            if (layer instanceof OpenLayers.Layer.UTFGrid ) { 
-                layers.push(layer);
-            }
-        }
-        return layers;
-    },
-
-    CLASS_NAME: "OpenLayers.Control.UTFGrid"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/WMSGetFeatureInfo.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/WMSGetFeatureInfo.js
deleted file mode 100644
index c9242f65..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/WMSGetFeatureInfo.js
+++ /dev/null
@@ -1,532 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-
-/**
- * @requires OpenLayers/Control.js
- * @requires OpenLayers/Handler/Click.js
- * @requires OpenLayers/Handler/Hover.js
- * @requires OpenLayers/Request.js
- * @requires OpenLayers/Format/WMSGetFeatureInfo.js
- */
-
-/**
- * Class: OpenLayers.Control.WMSGetFeatureInfo
- * The WMSGetFeatureInfo control uses a WMS query to get information about a point on the map.  The
- * information may be in a display-friendly format such as HTML, or a machine-friendly format such
- * as GML, depending on the server's capabilities and the client's configuration.  This control
- * handles click or hover events, attempts to parse the results using an OpenLayers.Format, and
- * fires a 'getfeatureinfo' event with the click position, the raw body of the response, and an
- * array of features if it successfully read the response.
- *
- * Inherits from:
- *  - <OpenLayers.Control>
- */
-OpenLayers.Control.WMSGetFeatureInfo = OpenLayers.Class(OpenLayers.Control, {
-
-   /**
-     * APIProperty: hover
-     * {Boolean} Send GetFeatureInfo requests when mouse stops moving.
-     *     Default is false.
-     */
-    hover: false,
-
-    /**
-     * APIProperty: drillDown
-     * {Boolean} Drill down over all WMS layers in the map. When
-     *     using drillDown mode, hover is not possible, and an infoFormat that
-     *     returns parseable features is required. Default is false.
-     */
-    drillDown: false,
-
-    /**
-     * APIProperty: maxFeatures
-     * {Integer} Maximum number of features to return from a WMS query. This
-     *     sets the feature_count parameter on WMS GetFeatureInfo
-     *     requests.
-     */
-    maxFeatures: 10,
-
-    /**
-     * APIProperty: clickCallback
-     * {String} The click callback to register in the
-     *     {<OpenLayers.Handler.Click>} object created when the hover
-     *     option is set to false. Default is "click".
-     */
-    clickCallback: "click",
-
-    /**
-     * APIProperty: output
-     * {String} Either "features" or "object". When triggering a getfeatureinfo
-     *     request should we pass on an array of features or an object with with
-     *     a "features" property and other properties (such as the url of the
-     *     WMS). Default is "features".
-     */
-    output: "features",
-
-    /**
-     * APIProperty: layers
-     * {Array(<OpenLayers.Layer.WMS>)} The layers to query for feature info.
-     *     If omitted, all map WMS layers with a url that matches this <url> or
-     *     <layerUrls> will be considered.
-     */
-    layers: null,
-
-    /**
-     * APIProperty: queryVisible
-     * {Boolean} If true, filter out hidden layers when searching the map for
-     *     layers to query.  Default is false.
-     */
-    queryVisible: false,
-
-    /**
-     * APIProperty: url
-     * {String} The URL of the WMS service to use.  If not provided, the url
-     *     of the first eligible layer will be used.
-     */
-    url: null,
-
-    /**
-     * APIProperty: layerUrls
-     * {Array(String)} Optional list of urls for layers that should be queried.
-     *     This can be used when the layer url differs from the url used for
-     *     making GetFeatureInfo requests (in the case of a layer using cached
-     *     tiles).
-     */
-    layerUrls: null,
-
-    /**
-     * APIProperty: infoFormat
-     * {String} The mimetype to request from the server. If you are using
-     *     drillDown mode and have multiple servers that do not share a common
-     *     infoFormat, you can override the control's infoFormat by providing an
-     *     INFO_FORMAT parameter in your <OpenLayers.Layer.WMS> instance(s).
-     */
-    infoFormat: 'text/html',
-
-    /**
-     * APIProperty: vendorParams
-     * {Object} Additional parameters that will be added to the request, for
-     *     WMS implementations that support them. This could e.g. look like
-     * (start code)
-     * {
-     *     radius: 5
-     * }
-     * (end)
-     */
-    vendorParams: {},
-
-    /**
-     * APIProperty: format
-     * {<OpenLayers.Format>} A format for parsing GetFeatureInfo responses.
-     *     Default is <OpenLayers.Format.WMSGetFeatureInfo>.
-     */
-    format: null,
-
-    /**
-     * APIProperty: formatOptions
-     * {Object} Optional properties to set on the format (if one is not provided
-     *     in the <format> property.
-     */
-    formatOptions: null,
-
-    /**
-     * APIProperty: handlerOptions
-     * {Object} Additional options for the handlers used by this control, e.g.
-     * (start code)
-     * {
-     *     "click": {delay: 100},
-     *     "hover": {delay: 300}
-     * }
-     * (end)
-     */
-
-    /**
-     * Property: handler
-     * {Object} Reference to the <OpenLayers.Handler> for this control
-     */
-    handler: null,
-
-    /**
-     * Property: hoverRequest
-     * {<OpenLayers.Request>} contains the currently running hover request
-     *     (if any).
-     */
-    hoverRequest: null,
-
-    /**
-     * APIProperty: events
-     * {<OpenLayers.Events>} Events instance for listeners and triggering
-     *     control specific events.
-     *
-     * Register a listener for a particular event with the following syntax:
-     * (code)
-     * control.events.register(type, obj, listener);
-     * (end)
-     *
-     * Supported event types (in addition to those from <OpenLayers.Control.events>):
-     * beforegetfeatureinfo - Triggered before the request is sent.
-     *      The event object has an *xy* property with the position of the
-     *      mouse click or hover event that triggers the request.
-     * nogetfeatureinfo - no queryable layers were found.
-     * getfeatureinfo - Triggered when a GetFeatureInfo response is received.
-     *      The event object has a *text* property with the body of the
-     *      response (String), a *features* property with an array of the
-     *      parsed features, an *xy* property with the position of the mouse
-     *      click or hover event that triggered the request, and a *request*
-     *      property with the request itself. If drillDown is set to true and
-     *      multiple requests were issued to collect feature info from all
-     *      layers, *text* and *request* will only contain the response body
-     *      and request object of the last request.
-     */
-
-    /**
-     * Constructor: <OpenLayers.Control.WMSGetFeatureInfo>
-     *
-     * Parameters:
-     * options - {Object}
-     */
-    initialize: function(options) {
-        options = options || {};
-        options.handlerOptions = options.handlerOptions || {};
-
-        OpenLayers.Control.prototype.initialize.apply(this, [options]);
-
-        if(!this.format) {
-            this.format = new OpenLayers.Format.WMSGetFeatureInfo(
-                options.formatOptions
-            );
-        }
-
-        if(this.drillDown === true) {
-            this.hover = false;
-        }
-
-        if(this.hover) {
-            this.handler = new OpenLayers.Handler.Hover(
-                   this, {
-                       'move': this.cancelHover,
-                       'pause': this.getInfoForHover
-                   },
-                   OpenLayers.Util.extend(this.handlerOptions.hover || {}, {
-                       'delay': 250
-                   }));
-        } else {
-            var callbacks = {};
-            callbacks[this.clickCallback] = this.getInfoForClick;
-            this.handler = new OpenLayers.Handler.Click(
-                this, callbacks, this.handlerOptions.click || {});
-        }
-    },
-
-    /**
-     * Method: getInfoForClick
-     * Called on click
-     *
-     * Parameters:
-     * evt - {<OpenLayers.Event>}
-     */
-    getInfoForClick: function(evt) {
-        this.events.triggerEvent("beforegetfeatureinfo", {xy: evt.xy});
-        // Set the cursor to "wait" to tell the user we're working on their
-        // click.
-        OpenLayers.Element.addClass(this.map.viewPortDiv, "olCursorWait");
-        this.request(evt.xy, {});
-    },
-
-    /**
-     * Method: getInfoForHover
-     * Pause callback for the hover handler
-     *
-     * Parameters:
-     * evt - {Object}
-     */
-    getInfoForHover: function(evt) {
-        this.events.triggerEvent("beforegetfeatureinfo", {xy: evt.xy});
-        this.request(evt.xy, {hover: true});
-    },
-
-    /**
-     * Method: cancelHover
-     * Cancel callback for the hover handler
-     */
-    cancelHover: function() {
-        if (this.hoverRequest) {
-            this.hoverRequest.abort();
-            this.hoverRequest = null;
-        }
-    },
-
-    /**
-     * Method: findLayers
-     * Internal method to get the layers, independent of whether we are
-     *     inspecting the map or using a client-provided array
-     */
-    findLayers: function() {
-
-        var candidates = this.layers || this.map.layers;
-        var layers = [];
-        var layer, url;
-        for(var i = candidates.length - 1; i >= 0; --i) {
-            layer = candidates[i];
-            if(layer instanceof OpenLayers.Layer.WMS &&
-               (!this.queryVisible || layer.getVisibility())) {
-                url = OpenLayers.Util.isArray(layer.url) ? layer.url[0] : layer.url;
-                // if the control was not configured with a url, set it
-                // to the first layer url
-                if(this.drillDown === false && !this.url) {
-                    this.url = url;
-                }
-                if(this.drillDown === true || this.urlMatches(url)) {
-                    layers.push(layer);
-                }
-            }
-        }
-        return layers;
-    },
-
-    /**
-     * Method: urlMatches
-     * Test to see if the provided url matches either the control <url> or one
-     *     of the <layerUrls>.
-     *
-     * Parameters:
-     * url - {String} The url to test.
-     *
-     * Returns:
-     * {Boolean} The provided url matches the control <url> or one of the
-     *     <layerUrls>.
-     */
-    urlMatches: function(url) {
-        var matches = OpenLayers.Util.isEquivalentUrl(this.url, url);
-        if(!matches && this.layerUrls) {
-            for(var i=0, len=this.layerUrls.length; i<len; ++i) {
-                if(OpenLayers.Util.isEquivalentUrl(this.layerUrls[i], url)) {
-                    matches = true;
-                    break;
-                }
-            }
-        }
-        return matches;
-    },
-
-    /**
-     * Method: buildWMSOptions
-     * Build an object with the relevant WMS options for the GetFeatureInfo request
-     *
-     * Parameters:
-     * url - {String} The url to be used for sending the request
-     * layers - {Array(<OpenLayers.Layer.WMS)} An array of layers
-     * clickPosition - {<OpenLayers.Pixel>} The position on the map where the mouse
-     *     event occurred.
-     * format - {String} The format from the corresponding GetMap request
-     */
-    buildWMSOptions: function(url, layers, clickPosition, format) {
-        var layerNames = [], styleNames = [];
-        for (var i = 0, len = layers.length; i < len; i++) {
-            if (layers[i].params.LAYERS != null) {
-                layerNames = layerNames.concat(layers[i].params.LAYERS);
-                styleNames = styleNames.concat(this.getStyleNames(layers[i]));
-            }
-        }
-        var firstLayer = layers[0];
-        // use the firstLayer's projection if it matches the map projection -
-        // this assumes that all layers will be available in this projection
-        var projection = this.map.getProjection();
-        var layerProj = firstLayer.projection;
-        if (layerProj && layerProj.equals(this.map.getProjectionObject())) {
-            projection = layerProj.getCode();
-        }
-        var params = OpenLayers.Util.extend({
-            service: "WMS",
-            version: firstLayer.params.VERSION,
-            request: "GetFeatureInfo",
-            exceptions: firstLayer.params.EXCEPTIONS,
-            bbox: this.map.getExtent().toBBOX(null,
-                firstLayer.reverseAxisOrder()),
-            feature_count: this.maxFeatures,
-            height: this.map.getSize().h,
-            width: this.map.getSize().w,
-            format: format,
-            info_format: firstLayer.params.INFO_FORMAT || this.infoFormat
-        }, (parseFloat(firstLayer.params.VERSION) >= 1.3) ?
-            {
-                crs: projection,
-                i: parseInt(clickPosition.x),
-                j: parseInt(clickPosition.y)
-            } :
-            {
-                srs: projection,
-                x: parseInt(clickPosition.x),
-                y: parseInt(clickPosition.y)
-            }
-        );
-        if (layerNames.length != 0) {
-            params = OpenLayers.Util.extend({
-                layers: layerNames,
-                query_layers: layerNames,
-                styles: styleNames
-            }, params);
-        }
-        OpenLayers.Util.applyDefaults(params, this.vendorParams);
-        return {
-            url: url,
-            params: OpenLayers.Util.upperCaseObject(params),
-            callback: function(request) {
-                this.handleResponse(clickPosition, request, url);
-            },
-            scope: this
-        };
-    },
-
-    /**
-     * Method: getStyleNames
-     * Gets the STYLES parameter for the layer. Make sure the STYLES parameter
-     * matches the LAYERS parameter
-     *
-     * Parameters:
-     * layer - {<OpenLayers.Layer.WMS>}
-     *
-     * Returns:
-     * {Array(String)} The STYLES parameter
-     */
-    getStyleNames: function(layer) {
-        // in the event of a WMS layer bundling multiple layers but not
-        // specifying styles,we need the same number of commas to specify
-        // the default style for each of the layers.  We can't just leave it
-        // blank as we may be including other layers that do specify styles.
-        var styleNames;
-        if (layer.params.STYLES) {
-            styleNames = layer.params.STYLES;
-        } else {
-            if (OpenLayers.Util.isArray(layer.params.LAYERS)) {
-                styleNames = new Array(layer.params.LAYERS.length);
-            } else { // Assume it's a String
-                styleNames = layer.params.LAYERS.replace(/[^,]/g, "");
-            }
-        }
-        return styleNames;
-    },
-
-    /**
-     * Method: request
-     * Sends a GetFeatureInfo request to the WMS
-     *
-     * Parameters:
-     * clickPosition - {<OpenLayers.Pixel>} The position on the map where the
-     *     mouse event occurred.
-     * options - {Object} additional options for this method.
-     *
-     * Valid options:
-     * - *hover* {Boolean} true if we do the request for the hover handler
-     */
-    request: function(clickPosition, options) {
-        var layers = this.findLayers();
-        if(layers.length == 0) {
-            this.events.triggerEvent("nogetfeatureinfo");
-            // Reset the cursor.
-            OpenLayers.Element.removeClass(this.map.viewPortDiv, "olCursorWait");
-            return;
-        }
-
-        options = options || {};
-        if(this.drillDown === false) {
-            var wmsOptions = this.buildWMSOptions(this.url, layers,
-                clickPosition, layers[0].params.FORMAT);
-            var request = OpenLayers.Request.GET(wmsOptions);
-
-            if (options.hover === true) {
-                this.hoverRequest = request;
-            }
-        } else {
-            this._requestCount = 0;
-            this._numRequests = 0;
-            this.features = [];
-            // group according to service url to combine requests
-            var services = {}, url;
-            for(var i=0, len=layers.length; i<len; i++) {
-                var layer = layers[i];
-                var service, found = false;
-                url = OpenLayers.Util.isArray(layer.url) ? layer.url[0] : layer.url;
-                if(url in services) {
-                    services[url].push(layer);
-                } else {
-                    this._numRequests++;
-                    services[url] = [layer];
-                }
-            }
-            var layers;
-            for (var url in services) {
-                layers = services[url];
-                var wmsOptions = this.buildWMSOptions(url, layers,
-                    clickPosition, layers[0].params.FORMAT);
-                OpenLayers.Request.GET(wmsOptions);
-            }
-        }
-    },
-
-    /**
-     * Method: triggerGetFeatureInfo
-     * Trigger the getfeatureinfo event when all is done
-     *
-     * Parameters:
-     * request - {XMLHttpRequest} The request object
-     * xy - {<OpenLayers.Pixel>} The position on the map where the
-     *     mouse event occurred.
-     * features - {Array(<OpenLayers.Feature.Vector>)} or
-     *     {Array({Object}) when output is "object". The object has a url and a
-     *     features property which contains an array of features.
-     */
-    triggerGetFeatureInfo: function(request, xy, features) {
-        this.events.triggerEvent("getfeatureinfo", {
-            text: request.responseText,
-            features: features,
-            request: request,
-            xy: xy
-        });
-
-        // Reset the cursor.
-        OpenLayers.Element.removeClass(this.map.viewPortDiv, "olCursorWait");
-    },
-
-    /**
-     * Method: handleResponse
-     * Handler for the GetFeatureInfo response.
-     *
-     * Parameters:
-     * xy - {<OpenLayers.Pixel>} The position on the map where the
-     *     mouse event occurred.
-     * request - {XMLHttpRequest} The request object.
-     * url - {String} The url which was used for this request.
-     */
-    handleResponse: function(xy, request, url) {
-
-        var doc = request.responseXML;
-        if(!doc || !doc.documentElement) {
-            doc = request.responseText;
-        }
-        var features = this.format.read(doc);
-        if (this.drillDown === false) {
-            this.triggerGetFeatureInfo(request, xy, features);
-        } else {
-            this._requestCount++;
-            if (this.output === "object") {
-                this._features = (this._features || []).concat(
-                    {url: url, features: features}
-                );
-            } else {
-            this._features = (this._features || []).concat(features);
-            }
-            if (this._requestCount === this._numRequests) {
-                this.triggerGetFeatureInfo(request, xy, this._features.concat());
-                delete this._features;
-                delete this._requestCount;
-                delete this._numRequests;
-            }
-        }
-    },
-
-    CLASS_NAME: "OpenLayers.Control.WMSGetFeatureInfo"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/WMTSGetFeatureInfo.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/WMTSGetFeatureInfo.js
deleted file mode 100644
index c26f8f36..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/WMTSGetFeatureInfo.js
+++ /dev/null
@@ -1,400 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-
-/**
- * @requires OpenLayers/Control.js
- * @requires OpenLayers/Handler/Click.js
- * @requires OpenLayers/Handler/Hover.js
- * @requires OpenLayers/Request.js
- * @requires OpenLayers/Format/WMSGetFeatureInfo.js
- */
-
-/**
- * Class: OpenLayers.Control.WMTSGetFeatureInfo
- * The WMTSGetFeatureInfo control uses a WMTS query to get information about a 
- *     point on the map.  The information may be in a display-friendly format 
- *     such as HTML, or a machine-friendly format such as GML, depending on the 
- *     server's capabilities and the client's configuration.  This control 
- *     handles click or hover events, attempts to parse the results using an 
- *     OpenLayers.Format, and fires a 'getfeatureinfo' event for each layer
- *     queried.
- *
- * Inherits from:
- *  - <OpenLayers.Control>
- */
-OpenLayers.Control.WMTSGetFeatureInfo = OpenLayers.Class(OpenLayers.Control, {
-
-   /**
-     * APIProperty: hover
-     * {Boolean} Send GetFeatureInfo requests when mouse stops moving.
-     *     Default is false.
-     */
-    hover: false,
-    
-    /**
-     * Property: requestEncoding
-     * {String} One of "KVP" or "REST".  Only KVP encoding is supported at this 
-     *     time.
-     */
-    requestEncoding: "KVP",
-
-    /**
-     * APIProperty: drillDown
-     * {Boolean} Drill down over all WMTS layers in the map. When
-     *     using drillDown mode, hover is not possible.  A getfeatureinfo event
-     *     will be fired for each layer queried.
-     */
-    drillDown: false,
-
-    /**
-     * APIProperty: maxFeatures
-     * {Integer} Maximum number of features to return from a WMTS query. This
-     *     sets the feature_count parameter on WMTS GetFeatureInfo
-     *     requests.
-     */
-    maxFeatures: 10,
-
-    /** APIProperty: clickCallback
-     *  {String} The click callback to register in the
-     *      {<OpenLayers.Handler.Click>} object created when the hover
-     *      option is set to false. Default is "click".
-     */
-    clickCallback: "click",
-    
-    /**
-     * Property: layers
-     * {Array(<OpenLayers.Layer.WMTS>)} The layers to query for feature info.
-     *     If omitted, all map WMTS layers will be considered.
-     */
-    layers: null,
-
-    /**
-     * APIProperty: queryVisible
-     * {Boolean} Filter out hidden layers when searching the map for layers to 
-     *     query.  Default is true.
-     */
-    queryVisible: true,
-
-    /**
-     * Property: infoFormat
-     * {String} The mimetype to request from the server
-     */
-    infoFormat: 'text/html',
-    
-    /**
-     * Property: vendorParams
-     * {Object} Additional parameters that will be added to the request, for
-     * WMTS implementations that support them. This could e.g. look like
-     * (start code)
-     * {
-     *     radius: 5
-     * }
-     * (end)
-     */
-    vendorParams: {},
-    
-    /**
-     * Property: format
-     * {<OpenLayers.Format>} A format for parsing GetFeatureInfo responses.
-     *     Default is <OpenLayers.Format.WMSGetFeatureInfo>.
-     */
-    format: null,
-    
-    /**
-     * Property: formatOptions
-     * {Object} Optional properties to set on the format (if one is not provided
-     *     in the <format> property.
-     */
-    formatOptions: null,
-
-    /**
-     * APIProperty: handlerOptions
-     * {Object} Additional options for the handlers used by this control, e.g.
-     * (start code)
-     * {
-     *     "click": {delay: 100},
-     *     "hover": {delay: 300}
-     * }
-     * (end)
-     */
-    
-    /**
-     * Property: handler
-     * {Object} Reference to the <OpenLayers.Handler> for this control
-     */
-    handler: null,
-    
-    /**
-     * Property: hoverRequest
-     * {<OpenLayers.Request>} contains the currently running hover request
-     *     (if any).
-     */
-    hoverRequest: null,
-    
-    /** 
-     * APIProperty: events
-     * {<OpenLayers.Events>} Events instance for listeners and triggering
-     *     control specific events.
-     *
-     * Register a listener for a particular event with the following syntax:
-     * (code)
-     * control.events.register(type, obj, listener);
-     * (end)
-     *
-     * Supported event types (in addition to those from <OpenLayers.Control.events>):
-     * beforegetfeatureinfo - Triggered before each request is sent.
-     *      The event object has an *xy* property with the position of the 
-     *      mouse click or hover event that triggers the request and a *layer*
-     *      property referencing the layer about to be queried.  If a listener
-     *      returns false, the request will not be issued.
-     * getfeatureinfo - Triggered when a GetFeatureInfo response is received.
-     *      The event object has a *text* property with the body of the
-     *      response (String), a *features* property with an array of the
-     *      parsed features, an *xy* property with the position of the mouse
-     *      click or hover event that triggered the request, a *layer* property
-     *      referencing the layer queried and a *request* property with the 
-     *      request itself. If drillDown is set to true, one event will be fired
-     *      for each layer queried.
-     * exception - Triggered when a GetFeatureInfo request fails (with a 
-     *      status other than 200) or whenparsing fails.  Listeners will receive 
-     *      an event with *request*, *xy*, and *layer*  properties.  In the case 
-     *      of a parsing error, the event will also contain an *error* property.
-     */
-    
-    /** 
-     * Property: pending
-     * {Number}  The number of pending requests.
-     */
-    pending: 0,
-
-    /**
-     * Constructor: <OpenLayers.Control.WMTSGetFeatureInfo>
-     *
-     * Parameters:
-     * options - {Object} 
-     */
-    initialize: function(options) {
-        options = options || {};
-        options.handlerOptions = options.handlerOptions || {};
-
-        OpenLayers.Control.prototype.initialize.apply(this, [options]);
-        
-        if (!this.format) {
-            this.format = new OpenLayers.Format.WMSGetFeatureInfo(
-                options.formatOptions
-            );
-        }
-        
-        if (this.drillDown === true) {
-            this.hover = false;
-        }
-
-        if (this.hover) {
-            this.handler = new OpenLayers.Handler.Hover(
-                this, {
-                    move: this.cancelHover,
-                    pause: this.getInfoForHover
-                },
-                OpenLayers.Util.extend(
-                    this.handlerOptions.hover || {}, {delay: 250}
-                )
-            );
-        } else {
-            var callbacks = {};
-            callbacks[this.clickCallback] = this.getInfoForClick;
-            this.handler = new OpenLayers.Handler.Click(
-                this, callbacks, this.handlerOptions.click || {}
-            );
-        }
-    },
-
-    /**
-     * Method: getInfoForClick 
-     * Called on click
-     *
-     * Parameters:
-     * evt - {<OpenLayers.Event>} 
-     */
-    getInfoForClick: function(evt) {
-        this.request(evt.xy, {});
-    },
-   
-    /**
-     * Method: getInfoForHover
-     * Pause callback for the hover handler
-     *
-     * Parameters:
-     * evt - {Object}
-     */
-    getInfoForHover: function(evt) {
-        this.request(evt.xy, {hover: true});
-    },
-
-    /**
-     * Method: cancelHover
-     * Cancel callback for the hover handler
-     */
-    cancelHover: function() {
-        if (this.hoverRequest) {
-            --this.pending;
-            if (this.pending <= 0) {
-                OpenLayers.Element.removeClass(this.map.viewPortDiv, "olCursorWait");
-                this.pending = 0;
-            }            
-            this.hoverRequest.abort();
-            this.hoverRequest = null;
-        }
-    },
-
-    /**
-     * Method: findLayers
-     * Internal method to get the layers, independent of whether we are
-     *     inspecting the map or using a client-provided array
-     */
-    findLayers: function() {
-        var candidates = this.layers || this.map.layers;
-        var layers = [];
-        var layer;
-        for (var i=candidates.length-1; i>=0; --i) {
-            layer = candidates[i];
-            if (layer instanceof OpenLayers.Layer.WMTS &&
-                layer.requestEncoding === this.requestEncoding &&
-                (!this.queryVisible || layer.getVisibility())) {
-                layers.push(layer);
-                if (!this.drillDown || this.hover) {
-                    break;
-                }
-            }
-        }
-        return layers;
-    },
-    
-    /**
-     * Method: buildRequestOptions
-     * Build an object with the relevant options for the GetFeatureInfo request.
-     *
-     * Parameters:
-     * layer - {<OpenLayers.Layer.WMTS>} A WMTS layer.
-     * xy - {<OpenLayers.Pixel>} The position on the map where the 
-     *     mouse event occurred.
-     */
-    buildRequestOptions: function(layer, xy) {
-        var loc = this.map.getLonLatFromPixel(xy);
-        var getTileUrl = layer.getURL(
-            new OpenLayers.Bounds(loc.lon, loc.lat, loc.lon, loc.lat)
-        );
-        var params = OpenLayers.Util.getParameters(getTileUrl);
-        var tileInfo = layer.getTileInfo(loc);
-        OpenLayers.Util.extend(params, {
-            service: "WMTS",
-            version: layer.version,
-            request: "GetFeatureInfo",
-            infoFormat: this.infoFormat,
-            i: tileInfo.i,
-            j: tileInfo.j
-        });
-        OpenLayers.Util.applyDefaults(params, this.vendorParams);
-        return {
-            url: OpenLayers.Util.isArray(layer.url) ? layer.url[0] : layer.url,
-            params: OpenLayers.Util.upperCaseObject(params),
-            callback: function(request) {
-                this.handleResponse(xy, request, layer);
-            },
-            scope: this
-        };
-    },
-
-    /**
-     * Method: request
-     * Sends a GetFeatureInfo request to the WMTS
-     * 
-     * Parameters:
-     * xy - {<OpenLayers.Pixel>} The position on the map where the mouse event 
-     *     occurred.
-     * options - {Object} additional options for this method.
-     * 
-     * Valid options:
-     * - *hover* {Boolean} true if we do the request for the hover handler
-     */
-    request: function(xy, options) {
-        options = options || {};
-        var layers = this.findLayers();
-        if (layers.length > 0) {
-            var issue, layer;
-            for (var i=0, len=layers.length; i<len; i++) {
-                layer = layers[i];
-                issue = this.events.triggerEvent("beforegetfeatureinfo", {
-                    xy: xy,
-                    layer: layer
-                });
-                if (issue !== false) {
-                    ++this.pending;
-                    var requestOptions = this.buildRequestOptions(layer, xy);
-                    var request = OpenLayers.Request.GET(requestOptions);
-                    if (options.hover === true) {
-                        this.hoverRequest = request;
-                    }
-                }
-            }
-            if (this.pending > 0) {
-                OpenLayers.Element.addClass(this.map.viewPortDiv, "olCursorWait");
-            }
-        }
-    },
-
-    /**
-     * Method: handleResponse
-     * Handler for the GetFeatureInfo response.
-     * 
-     * Parameters:
-     * xy - {<OpenLayers.Pixel>} The position on the map where the mouse event 
-     *     occurred.
-     * request - {XMLHttpRequest} The request object.
-     * layer - {<OpenLayers.Layer.WMTS>} The queried layer.
-     */
-    handleResponse: function(xy, request, layer) {
-        --this.pending;
-        if (this.pending <= 0) {
-            OpenLayers.Element.removeClass(this.map.viewPortDiv, "olCursorWait");
-            this.pending = 0;
-        }
-        if (request.status && (request.status < 200 || request.status >= 300)) {
-            this.events.triggerEvent("exception", {
-                xy: xy, 
-                request: request,
-                layer: layer
-            });
-        } else {
-            var doc = request.responseXML;
-            if (!doc || !doc.documentElement) {
-                doc = request.responseText;
-            }
-            var features, except;
-            try {
-                features = this.format.read(doc);
-            } catch (error) {
-                except = true;
-                this.events.triggerEvent("exception", {
-                    xy: xy,
-                    request: request,
-                    error: error,
-                    layer: layer
-                });
-            }
-            if (!except) {
-                this.events.triggerEvent("getfeatureinfo", {
-                    text: request.responseText,
-                    features: features,
-                    request: request,
-                    xy: xy,
-                    layer: layer
-                });
-            }
-        }
-    },
-
-    CLASS_NAME: "OpenLayers.Control.WMTSGetFeatureInfo"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/Zoom.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/Zoom.js
deleted file mode 100644
index 70140f46..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/Zoom.js
+++ /dev/null
@@ -1,138 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Control.js
- * @requires OpenLayers/Events/buttonclick.js
- */
-
-/**
- * Class: OpenLayers.Control.Zoom
- * The Zoom control is a pair of +/- links for zooming in and out.
- *
- * Inherits from:
- *  - <OpenLayers.Control>
- */
-OpenLayers.Control.Zoom = OpenLayers.Class(OpenLayers.Control, {
-    
-    /**
-     * APIProperty: zoomInText
-     * {String}
-     * Text for zoom-in link.  Default is "+".
-     */
-    zoomInText: "+",
-
-    /**
-     * APIProperty: zoomInId
-     * {String}
-     * Instead of having the control create a zoom in link, you can provide 
-     *     the identifier for an anchor element already added to the document.
-     *     By default, an element with id "olZoomInLink" will be searched for
-     *     and used if it exists.
-     */
-    zoomInId: "olZoomInLink",
-
-    /**
-     * APIProperty: zoomOutText
-     * {String}
-     * Text for zoom-out link.  Default is "\u2212".
-     */
-    zoomOutText: "\u2212",
-
-    /**
-     * APIProperty: zoomOutId
-     * {String}
-     * Instead of having the control create a zoom out link, you can provide 
-     *     the identifier for an anchor element already added to the document.
-     *     By default, an element with id "olZoomOutLink" will be searched for
-     *     and used if it exists.
-     */
-    zoomOutId: "olZoomOutLink",
-
-    /**
-     * Method: draw
-     *
-     * Returns:
-     * {DOMElement} A reference to the DOMElement containing the zoom links.
-     */
-    draw: function() {
-        var div = OpenLayers.Control.prototype.draw.apply(this),
-            links = this.getOrCreateLinks(div),
-            zoomIn = links.zoomIn,
-            zoomOut = links.zoomOut,
-            eventsInstance = this.map.events;
-        
-        if (zoomOut.parentNode !== div) {
-            eventsInstance = this.events;
-            eventsInstance.attachToElement(zoomOut.parentNode);
-        }
-        eventsInstance.register("buttonclick", this, this.onZoomClick);
-        
-        this.zoomInLink = zoomIn;
-        this.zoomOutLink = zoomOut;
-        return div;
-    },
-    
-    /**
-     * Method: getOrCreateLinks
-     * 
-     * Parameters:
-     * el - {DOMElement}
-     *
-     * Return: 
-     * {Object} Object with zoomIn and zoomOut properties referencing links.
-     */
-    getOrCreateLinks: function(el) {
-        var zoomIn = document.getElementById(this.zoomInId),
-            zoomOut = document.getElementById(this.zoomOutId);
-        if (!zoomIn) {
-            zoomIn = document.createElement("a");
-            zoomIn.href = "#zoomIn";
-            zoomIn.appendChild(document.createTextNode(this.zoomInText));
-            zoomIn.className = "olControlZoomIn";
-            el.appendChild(zoomIn);
-        }
-        OpenLayers.Element.addClass(zoomIn, "olButton");
-        if (!zoomOut) {
-            zoomOut = document.createElement("a");
-            zoomOut.href = "#zoomOut";
-            zoomOut.appendChild(document.createTextNode(this.zoomOutText));
-            zoomOut.className = "olControlZoomOut";
-            el.appendChild(zoomOut);
-        }
-        OpenLayers.Element.addClass(zoomOut, "olButton");
-        return {
-            zoomIn: zoomIn, zoomOut: zoomOut
-        };
-    },
-    
-    /**
-     * Method: onZoomClick
-     * Called when zoomin/out link is clicked.
-     */
-    onZoomClick: function(evt) {
-        var button = evt.buttonElement;
-        if (button === this.zoomInLink) {
-            this.map.zoomIn();
-        } else if (button === this.zoomOutLink) {
-            this.map.zoomOut();
-        }
-    },
-
-    /** 
-     * Method: destroy
-     * Clean up.
-     */
-    destroy: function() {
-        if (this.map) {
-            this.map.events.unregister("buttonclick", this, this.onZoomClick);
-        }
-        delete this.zoomInLink;
-        delete this.zoomOutLink;
-        OpenLayers.Control.prototype.destroy.apply(this);
-    },
-
-    CLASS_NAME: "OpenLayers.Control.Zoom"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/ZoomBox.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/ZoomBox.js
deleted file mode 100644
index 9d4b2da0..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/ZoomBox.js
+++ /dev/null
@@ -1,129 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Control.js
- * @requires OpenLayers/Handler/Box.js
- */
-
-/**
- * Class: OpenLayers.Control.ZoomBox
- * The ZoomBox control enables zooming directly to a given extent, by drawing 
- * a box on the map. The box is drawn by holding down shift, whilst dragging 
- * the mouse.
- *
- * Inherits from:
- *  - <OpenLayers.Control>
- */
-OpenLayers.Control.ZoomBox = OpenLayers.Class(OpenLayers.Control, {
-    /**
-     * Property: type
-     * {OpenLayers.Control.TYPE}
-     */
-    type: OpenLayers.Control.TYPE_TOOL,
-
-    /**
-     * Property: out
-     * {Boolean} Should the control be used for zooming out?
-     */
-    out: false,
-
-    /**
-     * APIProperty: keyMask
-     * {Integer} Zoom only occurs if the keyMask matches the combination of 
-     *     keys down. Use bitwise operators and one or more of the
-     *     <OpenLayers.Handler> constants to construct a keyMask. Leave null if 
-     *     not used mask. Default is null.
-     */
-    keyMask: null,
-
-    /**
-     * APIProperty: alwaysZoom
-     * {Boolean} Always zoom in/out when box drawn, even if the zoom level does
-     * not change.
-     */
-    alwaysZoom: false,
-    
-    /**
-     * APIProperty: zoomOnClick
-     * {Boolean} Should we zoom when no box was dragged, i.e. the user only
-     * clicked? Default is true.
-     */
-    zoomOnClick: true,
-
-    /**
-     * Method: draw
-     */    
-    draw: function() {
-        this.handler = new OpenLayers.Handler.Box( this,
-                            {done: this.zoomBox}, {keyMask: this.keyMask} );
-    },
-
-    /**
-     * Method: zoomBox
-     *
-     * Parameters:
-     * position - {<OpenLayers.Bounds>} or {<OpenLayers.Pixel>}
-     */
-    zoomBox: function (position) {
-        if (position instanceof OpenLayers.Bounds) {
-            var bounds,
-                targetCenterPx = position.getCenterPixel();
-            if (!this.out) {
-                var minXY = this.map.getLonLatFromPixel({
-                    x: position.left,
-                    y: position.bottom
-                });
-                var maxXY = this.map.getLonLatFromPixel({
-                    x: position.right,
-                    y: position.top
-                });
-                bounds = new OpenLayers.Bounds(minXY.lon, minXY.lat,
-                                               maxXY.lon, maxXY.lat);
-            } else {
-                var pixWidth = position.right - position.left;
-                var pixHeight = position.bottom - position.top;
-                var zoomFactor = Math.min((this.map.size.h / pixHeight),
-                    (this.map.size.w / pixWidth));
-                var extent = this.map.getExtent();
-                var center = this.map.getLonLatFromPixel(targetCenterPx);
-                var xmin = center.lon - (extent.getWidth()/2)*zoomFactor;
-                var xmax = center.lon + (extent.getWidth()/2)*zoomFactor;
-                var ymin = center.lat - (extent.getHeight()/2)*zoomFactor;
-                var ymax = center.lat + (extent.getHeight()/2)*zoomFactor;
-                bounds = new OpenLayers.Bounds(xmin, ymin, xmax, ymax);
-            }
-            // always zoom in/out 
-            var lastZoom = this.map.getZoom(),
-                size = this.map.getSize(),
-                centerPx = {x: size.w / 2, y: size.h / 2},
-                zoom = this.map.getZoomForExtent(bounds),
-                oldRes = this.map.getResolution(),
-                newRes = this.map.getResolutionForZoom(zoom);
-            if (oldRes == newRes) {
-                this.map.setCenter(this.map.getLonLatFromPixel(targetCenterPx));
-            } else {
-              var zoomOriginPx = {
-                    x: (oldRes * targetCenterPx.x - newRes * centerPx.x) /
-                        (oldRes - newRes),
-                    y: (oldRes * targetCenterPx.y - newRes * centerPx.y) /
-                        (oldRes - newRes)
-                };
-                this.map.zoomTo(zoom, zoomOriginPx);
-            }
-            if (lastZoom == this.map.getZoom() && this.alwaysZoom == true){ 
-                this.map.zoomTo(lastZoom + (this.out ? -1 : 1)); 
-            }
-        } else if (this.zoomOnClick) { // it's a pixel
-            if (!this.out) {
-                this.map.zoomTo(this.map.getZoom() + 1, position);
-            } else {
-                this.map.zoomTo(this.map.getZoom() - 1, position);
-            }
-        }
-    },
-
-    CLASS_NAME: "OpenLayers.Control.ZoomBox"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/ZoomIn.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/ZoomIn.js
deleted file mode 100644
index 8da1e1cf..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/ZoomIn.js
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Control/Button.js
- */
-
-/**
- * Class: OpenLayers.Control.ZoomIn
- * The ZoomIn control is a button to increase the zoom level of a map.
- *
- * Inherits from:
- *  - <OpenLayers.Control>
- */
-OpenLayers.Control.ZoomIn = OpenLayers.Class(OpenLayers.Control.Button, {
-
-    /**
-     * Method: trigger
-     */
-    trigger: function(){
-        if (this.map) {
-            this.map.zoomIn();
-        }
-    },
-
-    CLASS_NAME: "OpenLayers.Control.ZoomIn"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/ZoomOut.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/ZoomOut.js
deleted file mode 100644
index 72a657b3..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/ZoomOut.js
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Control/Button.js
- */
-
-/**
- * Class: OpenLayers.Control.ZoomOut
- * The ZoomOut control is a button to decrease the zoom level of a map.
- *
- * Inherits from:
- *  - <OpenLayers.Control>
- */
-OpenLayers.Control.ZoomOut = OpenLayers.Class(OpenLayers.Control.Button, {
-
-    /**
-     * Method: trigger
-     */
-    trigger: function(){
-        if (this.map) {
-            this.map.zoomOut();
-        }
-    },
-
-    CLASS_NAME: "OpenLayers.Control.ZoomOut"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/ZoomPanel.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/ZoomPanel.js
deleted file mode 100644
index 147f6cb1..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/ZoomPanel.js
+++ /dev/null
@@ -1,54 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Control/Panel.js
- * @requires OpenLayers/Control/ZoomIn.js
- * @requires OpenLayers/Control/ZoomOut.js
- * @requires OpenLayers/Control/ZoomToMaxExtent.js
- */
-
-/**
- * Class: OpenLayers.Control.ZoomPanel
- * The ZoomPanel control is a compact collecton of 3 zoom controls: a 
- * <OpenLayers.Control.ZoomIn>, a <OpenLayers.Control.ZoomToMaxExtent>, and a
- * <OpenLayers.Control.ZoomOut>. By default it is drawn in the upper left 
- * corner of the map.
- *
- * Note: 
- * If you wish to use this class with the default images and you want 
- *       it to look nice in ie6, you should add the following, conditionally
- *       added css stylesheet to your HTML file:
- * 
- * (code)
- * <!--[if lte IE 6]>
- *   <link rel="stylesheet" href="../theme/default/ie6-style.css" type="text/css" />
- * <![endif]-->
- * (end)
- * 
- * Inherits from:
- *  - <OpenLayers.Control.Panel>
- */
-OpenLayers.Control.ZoomPanel = OpenLayers.Class(OpenLayers.Control.Panel, {
-
-    /**
-     * Constructor: OpenLayers.Control.ZoomPanel 
-     * Add the three zooming controls.
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be used
-     *     to extend the control.
-     */
-    initialize: function(options) {
-        OpenLayers.Control.Panel.prototype.initialize.apply(this, [options]);
-        this.addControls([
-            new OpenLayers.Control.ZoomIn(),
-            new OpenLayers.Control.ZoomToMaxExtent(),
-            new OpenLayers.Control.ZoomOut()
-        ]);
-    },
-
-    CLASS_NAME: "OpenLayers.Control.ZoomPanel"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/ZoomToMaxExtent.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/ZoomToMaxExtent.js
deleted file mode 100644
index bc2e7546..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Control/ZoomToMaxExtent.js
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Control/Button.js
- */
-
-/**
- * Class: OpenLayers.Control.ZoomToMaxExtent 
- * The ZoomToMaxExtent control is a button that zooms out to the maximum
- * extent of the map. It is designed to be used with a 
- * <OpenLayers.Control.Panel>.
- * 
- * Inherits from:
- *  - <OpenLayers.Control>
- */
-OpenLayers.Control.ZoomToMaxExtent = OpenLayers.Class(OpenLayers.Control.Button, {
-
-    /**
-     * Method: trigger
-     * 
-     * Called whenever this control is being rendered inside of a panel and a 
-     *     click occurs on this controls element. Actually zooms to the maximum
-     *     extent of this controls map.
-     */
-    trigger: function() {
-        if (this.map) {
-            this.map.zoomToMaxExtent();
-        }    
-    },
-
-    CLASS_NAME: "OpenLayers.Control.ZoomToMaxExtent"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Events.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Events.js
deleted file mode 100644
index 6a4a129c..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Events.js
+++ /dev/null
@@ -1,1170 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-
-/**
- * @requires OpenLayers/Util.js
- */
-
-/**
- * Namespace: OpenLayers.Event
- * Utility functions for event handling.
- */
-OpenLayers.Event = {
-
-    /** 
-     * Property: observers 
-     * {Object} A hashtable cache of the event observers. Keyed by
-     * element._eventCacheID 
-     */
-    observers: false,
-
-    /**
-     * Constant: KEY_SPACE
-     * {int}
-     */
-    KEY_SPACE: 32,
-    
-    /** 
-     * Constant: KEY_BACKSPACE 
-     * {int} 
-     */
-    KEY_BACKSPACE: 8,
-
-    /** 
-     * Constant: KEY_TAB 
-     * {int} 
-     */
-    KEY_TAB: 9,
-
-    /** 
-     * Constant: KEY_RETURN 
-     * {int} 
-     */
-    KEY_RETURN: 13,
-
-    /** 
-     * Constant: KEY_ESC 
-     * {int} 
-     */
-    KEY_ESC: 27,
-
-    /** 
-     * Constant: KEY_LEFT 
-     * {int} 
-     */
-    KEY_LEFT: 37,
-
-    /** 
-     * Constant: KEY_UP 
-     * {int} 
-     */
-    KEY_UP: 38,
-
-    /** 
-     * Constant: KEY_RIGHT 
-     * {int} 
-     */
-    KEY_RIGHT: 39,
-
-    /** 
-     * Constant: KEY_DOWN 
-     * {int} 
-     */
-    KEY_DOWN: 40,
-
-    /** 
-     * Constant: KEY_DELETE 
-     * {int} 
-     */
-    KEY_DELETE: 46,
-
-
-    /**
-     * Method: element
-     * Cross browser event element detection.
-     * 
-     * Parameters:
-     * event - {Event} 
-     * 
-     * Returns:
-     * {DOMElement} The element that caused the event 
-     */
-    element: function(event) {
-        return event.target || event.srcElement;
-    },
-
-    /**
-     * Method: isSingleTouch
-     * Determine whether event was caused by a single touch
-     *
-     * Parameters:
-     * event - {Event}
-     *
-     * Returns:
-     * {Boolean}
-     */
-    isSingleTouch: function(event) {
-        return event.touches && event.touches.length == 1;
-    },
-
-    /**
-     * Method: isMultiTouch
-     * Determine whether event was caused by a multi touch
-     *
-     * Parameters:
-     * event - {Event}
-     *
-     * Returns:
-     * {Boolean}
-     */
-    isMultiTouch: function(event) {
-        return event.touches && event.touches.length > 1;
-    },
-
-    /**
-     * Method: isLeftClick
-     * Determine whether event was caused by a left click. 
-     *
-     * Parameters:
-     * event - {Event} 
-     * 
-     * Returns:
-     * {Boolean}
-     */
-    isLeftClick: function(event) {
-        return (((event.which) && (event.which == 1)) ||
-                ((event.button) && (event.button == 1)));
-    },
-
-    /**
-     * Method: isRightClick
-     * Determine whether event was caused by a right mouse click. 
-     *
-     * Parameters:
-     * event - {Event} 
-     * 
-     * Returns:
-     * {Boolean}
-     */
-     isRightClick: function(event) {
-        return (((event.which) && (event.which == 3)) ||
-                ((event.button) && (event.button == 2)));
-    },
-     
-    /**
-     * Method: stop
-     * Stops an event from propagating. 
-     *
-     * Parameters: 
-     * event - {Event} 
-     * allowDefault - {Boolean} If true, we stop the event chain but 
-     *     still allow the default browser behaviour (text selection,
-     *     radio-button clicking, etc).  Default is false.
-     */
-    stop: function(event, allowDefault) {
-        
-        if (!allowDefault) { 
-            OpenLayers.Event.preventDefault(event);
-        }
-                
-        if (event.stopPropagation) {
-            event.stopPropagation();
-        } else {
-            event.cancelBubble = true;
-        }
-    },
-
-    /**
-     * Method: preventDefault
-     * Cancels the event if it is cancelable, without stopping further
-     * propagation of the event.
-     *
-     * Parameters:
-     * event - {Event}
-     */
-    preventDefault: function(event) {
-        if (event.preventDefault) {
-            event.preventDefault();
-        } else {
-            event.returnValue = false;
-        }
-    },
-
-    /** 
-     * Method: findElement
-     * 
-     * Parameters:
-     * event - {Event} 
-     * tagName - {String} 
-     * 
-     * Returns:
-     * {DOMElement} The first node with the given tagName, starting from the
-     * node the event was triggered on and traversing the DOM upwards
-     */
-    findElement: function(event, tagName) {
-        var element = OpenLayers.Event.element(event);
-        while (element.parentNode && (!element.tagName ||
-              (element.tagName.toUpperCase() != tagName.toUpperCase()))){
-            element = element.parentNode;
-        }
-        return element;
-    },
-
-    /** 
-     * Method: observe
-     * 
-     * Parameters:
-     * elementParam - {DOMElement || String} 
-     * name - {String} 
-     * observer - {function} 
-     * useCapture - {Boolean} 
-     */
-    observe: function(elementParam, name, observer, useCapture) {
-        var element = OpenLayers.Util.getElement(elementParam);
-        useCapture = useCapture || false;
-
-        if (name == 'keypress' &&
-           (navigator.appVersion.match(/Konqueror|Safari|KHTML/)
-           || element.attachEvent)) {
-            name = 'keydown';
-        }
-
-        //if observers cache has not yet been created, create it
-        if (!this.observers) {
-            this.observers = {};
-        }
-
-        //if not already assigned, make a new unique cache ID
-        if (!element._eventCacheID) {
-            var idPrefix = "eventCacheID_";
-            if (element.id) {
-                idPrefix = element.id + "_" + idPrefix;
-            }
-            element._eventCacheID = OpenLayers.Util.createUniqueID(idPrefix);
-        }
-
-        var cacheID = element._eventCacheID;
-
-        //if there is not yet a hash entry for this element, add one
-        if (!this.observers[cacheID]) {
-            this.observers[cacheID] = [];
-        }
-
-        //add a new observer to this element's list
-        this.observers[cacheID].push({
-            'element': element,
-            'name': name,
-            'observer': observer,
-            'useCapture': useCapture
-        });
-
-        //add the actual browser event listener
-        if (element.addEventListener) {
-            element.addEventListener(name, observer, useCapture);
-        } else if (element.attachEvent) {
-            element.attachEvent('on' + name, observer);
-        }
-    },
-
-    /** 
-     * Method: stopObservingElement
-     * Given the id of an element to stop observing, cycle through the 
-     *   element's cached observers, calling stopObserving on each one, 
-     *   skipping those entries which can no longer be removed.
-     * 
-     * parameters:
-     * elementParam - {DOMElement || String} 
-     */
-    stopObservingElement: function(elementParam) {
-        var element = OpenLayers.Util.getElement(elementParam);
-        var cacheID = element._eventCacheID;
-
-        this._removeElementObservers(OpenLayers.Event.observers[cacheID]);
-    },
-
-    /**
-     * Method: _removeElementObservers
-     *
-     * Parameters:
-     * elementObservers - {Array(Object)} Array of (element, name, 
-     *                                         observer, usecapture) objects, 
-     *                                         taken directly from hashtable
-     */
-    _removeElementObservers: function(elementObservers) {
-        if (elementObservers) {
-            for(var i = elementObservers.length-1; i >= 0; i--) {
-                var entry = elementObservers[i];
-                OpenLayers.Event.stopObserving.apply(this, [
-                    entry.element, entry.name, entry.observer, entry.useCapture
-                ]);
-            }
-        }
-    },
-
-    /**
-     * Method: stopObserving
-     * 
-     * Parameters:
-     * elementParam - {DOMElement || String} 
-     * name - {String} 
-     * observer - {function} 
-     * useCapture - {Boolean} 
-     *  
-     * Returns:
-     * {Boolean} Whether or not the event observer was removed
-     */
-    stopObserving: function(elementParam, name, observer, useCapture) {
-        useCapture = useCapture || false;
-    
-        var element = OpenLayers.Util.getElement(elementParam);
-        var cacheID = element._eventCacheID;
-
-        if (name == 'keypress') {
-            if ( navigator.appVersion.match(/Konqueror|Safari|KHTML/) || 
-                 element.detachEvent) {
-              name = 'keydown';
-            }
-        }
-
-        // find element's entry in this.observers cache and remove it
-        var foundEntry = false;
-        var elementObservers = OpenLayers.Event.observers[cacheID];
-        if (elementObservers) {
-    
-            // find the specific event type in the element's list
-            var i=0;
-            while(!foundEntry && i < elementObservers.length) {
-                var cacheEntry = elementObservers[i];
-    
-                if ((cacheEntry.name == name) &&
-                    (cacheEntry.observer == observer) &&
-                    (cacheEntry.useCapture == useCapture)) {
-    
-                    elementObservers.splice(i, 1);
-                    if (elementObservers.length == 0) {
-                        delete OpenLayers.Event.observers[cacheID];
-                    }
-                    foundEntry = true;
-                    break; 
-                }
-                i++;           
-            }
-        }
-    
-        //actually remove the event listener from browser
-        if (foundEntry) {
-            if (element.removeEventListener) {
-                element.removeEventListener(name, observer, useCapture);
-            } else if (element && element.detachEvent) {
-                element.detachEvent('on' + name, observer);
-            }
-        }
-        return foundEntry;
-    },
-    
-    /** 
-     * Method: unloadCache
-     * Cycle through all the element entries in the events cache and call
-     *   stopObservingElement on each. 
-     */
-    unloadCache: function() {
-        // check for OpenLayers.Event before checking for observers, because
-        // OpenLayers.Event may be undefined in IE if no map instance was
-        // created
-        if (OpenLayers.Event && OpenLayers.Event.observers) {
-            for (var cacheID in OpenLayers.Event.observers) {
-                var elementObservers = OpenLayers.Event.observers[cacheID];
-                OpenLayers.Event._removeElementObservers.apply(this, 
-                                                           [elementObservers]);
-            }
-            OpenLayers.Event.observers = false;
-        }
-    },
-
-    CLASS_NAME: "OpenLayers.Event"
-};
-
-/* prevent memory leaks in IE */
-OpenLayers.Event.observe(window, 'unload', OpenLayers.Event.unloadCache, false);
-
-/**
- * Class: OpenLayers.Events
- */
-OpenLayers.Events = OpenLayers.Class({
-
-    /** 
-     * Constant: BROWSER_EVENTS
-     * {Array(String)} supported events 
-     */
-    BROWSER_EVENTS: [
-        "mouseover", "mouseout",
-        "mousedown", "mouseup", "mousemove", 
-        "click", "dblclick", "rightclick", "dblrightclick",
-        "resize", "focus", "blur",
-        "touchstart", "touchmove", "touchend",
-        "keydown"
-    ],
-
-    /** 
-     * Property: listeners 
-     * {Object} Hashtable of Array(Function): events listener functions  
-     */
-    listeners: null,
-
-    /** 
-     * Property: object 
-     * {Object}  the code object issuing application events 
-     */
-    object: null,
-
-    /** 
-     * Property: element 
-     * {DOMElement}  the DOM element receiving browser events 
-     */
-    element: null,
-
-    /** 
-     * Property: eventHandler 
-     * {Function}  bound event handler attached to elements 
-     */
-    eventHandler: null,
-
-    /** 
-     * APIProperty: fallThrough 
-     * {Boolean} 
-     */
-    fallThrough: null,
-
-    /** 
-     * APIProperty: includeXY
-     * {Boolean} Should the .xy property automatically be created for browser
-     *    mouse events? In general, this should be false. If it is true, then
-     *    mouse events will automatically generate a '.xy' property on the 
-     *    event object that is passed. (Prior to OpenLayers 2.7, this was true
-     *    by default.) Otherwise, you can call the getMousePosition on the
-     *    relevant events handler on the object available via the 'evt.object'
-     *    property of the evt object. So, for most events, you can call:
-     *    function named(evt) { 
-     *        this.xy = this.object.events.getMousePosition(evt) 
-     *    } 
-     *
-     *    This option typically defaults to false for performance reasons:
-     *    when creating an events object whose primary purpose is to manage
-     *    relatively positioned mouse events within a div, it may make
-     *    sense to set it to true.
-     *
-     *    This option is also used to control whether the events object caches
-     *    offsets. If this is false, it will not: the reason for this is that
-     *    it is only expected to be called many times if the includeXY property
-     *    is set to true. If you set this to true, you are expected to clear 
-     *    the offset cache manually (using this.clearMouseCache()) if:
-     *        the border of the element changes
-     *        the location of the element in the page changes
-    */
-    includeXY: false,      
-    
-    /**
-     * APIProperty: extensions
-     * {Object} Event extensions registered with this instance. Keys are
-     *     event types, values are {OpenLayers.Events.*} extension instances or
-     *     {Boolean} for events that an instantiated extension provides in
-     *     addition to the one it was created for.
-     *
-     * Extensions create an event in addition to browser events, which usually
-     * fires when a sequence of browser events is completed. Extensions are
-     * automatically instantiated when a listener is registered for an event
-     * provided by an extension.
-     *
-     * Extensions are created in the <OpenLayers.Events> namespace using
-     * <OpenLayers.Class>, and named after the event they provide.
-     * The constructor receives the target <OpenLayers.Events> instance as
-     * argument. Extensions that need to capture browser events before they
-     * propagate can register their listeners events using <register>, with
-     * {extension: true} as 4th argument.
-     *
-     * If an extension creates more than one event, an alias for each event
-     * type should be created and reference the same class. The constructor
-     * should set a reference in the target's extensions registry to itself.
-     *
-     * Below is a minimal extension that provides the "foostart" and "fooend"
-     * event types, which replace the native "click" event type if clicked on
-     * an element with the css class "foo":
-     *
-     * (code)
-     *   OpenLayers.Events.foostart = OpenLayers.Class({
-     *       initialize: function(target) {
-     *           this.target = target;
-     *           this.target.register("click", this, this.doStuff, {extension: true});
-     *           // only required if extension provides more than one event type
-     *           this.target.extensions["foostart"] = true;
-     *           this.target.extensions["fooend"] = true;
-     *       },
-     *       destroy: function() {
-     *           var target = this.target;
-     *           target.unregister("click", this, this.doStuff);
-     *           delete this.target;
-     *           // only required if extension provides more than one event type
-     *           delete target.extensions["foostart"];
-     *           delete target.extensions["fooend"];
-     *       },
-     *       doStuff: function(evt) {
-     *           var propagate = true;
-     *           if (OpenLayers.Event.element(evt).className === "foo") {
-     *               propagate = false;
-     *               var target = this.target;
-     *               target.triggerEvent("foostart");
-     *               window.setTimeout(function() {
-     *                   target.triggerEvent("fooend");
-     *               }, 1000);
-     *           }
-     *           return propagate;
-     *       }
-     *   });
-     *   // only required if extension provides more than one event type
-     *   OpenLayers.Events.fooend = OpenLayers.Events.foostart;
-     * (end)
-     * 
-     */
-    extensions: null,
-    
-    /**
-     * Property: extensionCount
-     * {Object} Keys are event types (like in <listeners>), values are the
-     *     number of extension listeners for each event type.
-     */
-    extensionCount: null,
-
-    /**
-     * Method: clearMouseListener
-     * A version of <clearMouseCache> that is bound to this instance so that
-     *     it can be used with <OpenLayers.Event.observe> and
-     *     <OpenLayers.Event.stopObserving>.
-     */
-    clearMouseListener: null,
-
-    /**
-     * Constructor: OpenLayers.Events
-     * Construct an OpenLayers.Events object.
-     *
-     * Parameters:
-     * object - {Object} The js object to which this Events object  is being added
-     * element - {DOMElement} A dom element to respond to browser events
-     * eventTypes - {Array(String)} Deprecated.  Array of custom application
-     *     events.  A listener may be registered for any named event, regardless
-     *     of the values provided here.
-     * fallThrough - {Boolean} Allow events to fall through after these have
-     *                         been handled?
-     * options - {Object} Options for the events object.
-     */
-    initialize: function (object, element, eventTypes, fallThrough, options) {
-        OpenLayers.Util.extend(this, options);
-        this.object     = object;
-        this.fallThrough = fallThrough;
-        this.listeners  = {};
-        this.extensions = {};
-        this.extensionCount = {};
-        this._msTouches = [];
-        
-        // if a dom element is specified, add a listeners list 
-        // for browser events on the element and register them
-        if (element != null) {
-            this.attachToElement(element);
-        }
-    },
-
-    /**
-     * APIMethod: destroy
-     */
-    destroy: function () {
-        for (var e in this.extensions) {
-            if (typeof this.extensions[e] !== "boolean") {
-                this.extensions[e].destroy();
-            }
-        }
-        this.extensions = null;
-        if (this.element) {
-            OpenLayers.Event.stopObservingElement(this.element);
-            if(this.element.hasScrollEvent) {
-                OpenLayers.Event.stopObserving(
-                    window, "scroll", this.clearMouseListener
-                );
-            }
-        }
-        this.element = null;
-
-        this.listeners = null;
-        this.object = null;
-        this.fallThrough = null;
-        this.eventHandler = null;
-    },
-
-    /**
-     * APIMethod: addEventType
-     * Deprecated.  Any event can be triggered without adding it first.
-     * 
-     * Parameters:
-     * eventName - {String}
-     */
-    addEventType: function(eventName) {
-    },
-
-    /**
-     * Method: attachToElement
-     *
-     * Parameters:
-     * element - {HTMLDOMElement} a DOM element to attach browser events to
-     */
-    attachToElement: function (element) {
-        if (this.element) {
-            OpenLayers.Event.stopObservingElement(this.element);
-        } else {
-            // keep a bound copy of handleBrowserEvent() so that we can
-            // pass the same function to both Event.observe() and .stopObserving()
-            this.eventHandler = OpenLayers.Function.bindAsEventListener(
-                this.handleBrowserEvent, this
-            );
-            
-            // to be used with observe and stopObserving
-            this.clearMouseListener = OpenLayers.Function.bind(
-                this.clearMouseCache, this
-            );
-        }
-        this.element = element;
-        var msTouch = !!window.navigator.msMaxTouchPoints;
-        var type;
-        for (var i = 0, len = this.BROWSER_EVENTS.length; i < len; i++) {
-            type = this.BROWSER_EVENTS[i];
-            // register the event cross-browser
-            OpenLayers.Event.observe(element, type, this.eventHandler
-            );
-            if (msTouch && type.indexOf('touch') === 0) {
-                this.addMsTouchListener(element, type, this.eventHandler);
-            }
-        }
-        // disable dragstart in IE so that mousedown/move/up works normally
-        OpenLayers.Event.observe(element, "dragstart", OpenLayers.Event.stop);
-    },
-    
-    /**
-     * APIMethod: on
-     * Convenience method for registering listeners with a common scope.
-     *     Internally, this method calls <register> as shown in the examples
-     *     below.
-     *
-     * Example use:
-     * (code)
-     * // register a single listener for the "loadstart" event
-     * events.on({"loadstart": loadStartListener});
-     *
-     * // this is equivalent to the following
-     * events.register("loadstart", undefined, loadStartListener);
-     *
-     * // register multiple listeners to be called with the same `this` object
-     * events.on({
-     *     "loadstart": loadStartListener,
-     *     "loadend": loadEndListener,
-     *     scope: object
-     * });
-     *
-     * // this is equivalent to the following
-     * events.register("loadstart", object, loadStartListener);
-     * events.register("loadend", object, loadEndListener);
-     * (end)
-     *
-     * Parameters:
-     *  object - {Object}     
-     */
-    on: function(object) {
-        for(var type in object) {
-            if(type != "scope" && object.hasOwnProperty(type)) {
-                this.register(type, object.scope, object[type]);
-            }
-        }
-    },
-
-    /**
-     * APIMethod: register
-     * Register an event on the events object.
-     *
-     * When the event is triggered, the 'func' function will be called, in the
-     * context of 'obj'. Imagine we were to register an event, specifying an 
-     * OpenLayers.Bounds Object as 'obj'. When the event is triggered, the 
-     * context in the callback function will be our Bounds object. This means
-     * that within our callback function, we can access the properties and 
-     * methods of the Bounds object through the "this" variable. So our 
-     * callback could execute something like: 
-     * :    leftStr = "Left: " + this.left;
-     *   
-     *                   or
-     *  
-     * :    centerStr = "Center: " + this.getCenterLonLat();
-     *
-     * Parameters:
-     * type - {String} Name of the event to register
-     * obj - {Object} The object to bind the context to for the callback#.
-     *     If no object is specified, default is the Events's 'object' property.
-     * func - {Function} The callback function. If no callback is 
-     *     specified, this function does nothing.
-     * priority - {Boolean|Object} If true, adds the new listener to the
-     *     *front* of the events queue instead of to the end.
-     *
-     * Valid options for priority:
-     * extension - {Boolean} If true, then the event will be registered as
-     *     extension event. Extension events are handled before all other
-     *     events.
-     */
-    register: function (type, obj, func, priority) {
-        if (type in OpenLayers.Events && !this.extensions[type]) {
-            this.extensions[type] = new OpenLayers.Events[type](this);
-        }
-        if (func != null) {
-            if (obj == null)  {
-                obj = this.object;
-            }
-            var listeners = this.listeners[type];
-            if (!listeners) {
-                listeners = [];
-                this.listeners[type] = listeners;
-                this.extensionCount[type] = 0;
-            }
-            var listener = {obj: obj, func: func};
-            if (priority) {
-                listeners.splice(this.extensionCount[type], 0, listener);
-                if (typeof priority === "object" && priority.extension) {
-                    this.extensionCount[type]++;
-                }
-            } else {
-                listeners.push(listener);
-            }
-        }
-    },
-
-    /**
-     * APIMethod: registerPriority
-     * Same as register() but adds the new listener to the *front* of the
-     *     events queue instead of to the end.
-     *    
-     *     TODO: get rid of this in 3.0 - Decide whether listeners should be 
-     *     called in the order they were registered or in reverse order.
-     *
-     *
-     * Parameters:
-     * type - {String} Name of the event to register
-     * obj - {Object} The object to bind the context to for the callback#.
-     *                If no object is specified, default is the Events's 
-     *                'object' property.
-     * func - {Function} The callback function. If no callback is 
-     *                   specified, this function does nothing.
-     */
-    registerPriority: function (type, obj, func) {
-        this.register(type, obj, func, true);
-    },
-    
-    /**
-     * APIMethod: un
-     * Convenience method for unregistering listeners with a common scope.
-     *     Internally, this method calls <unregister> as shown in the examples
-     *     below.
-     *
-     * Example use:
-     * (code)
-     * // unregister a single listener for the "loadstart" event
-     * events.un({"loadstart": loadStartListener});
-     *
-     * // this is equivalent to the following
-     * events.unregister("loadstart", undefined, loadStartListener);
-     *
-     * // unregister multiple listeners with the same `this` object
-     * events.un({
-     *     "loadstart": loadStartListener,
-     *     "loadend": loadEndListener,
-     *     scope: object
-     * });
-     *
-     * // this is equivalent to the following
-     * events.unregister("loadstart", object, loadStartListener);
-     * events.unregister("loadend", object, loadEndListener);
-     * (end)
-     */
-    un: function(object) {
-        for(var type in object) {
-            if(type != "scope" && object.hasOwnProperty(type)) {
-                this.unregister(type, object.scope, object[type]);
-            }
-        }
-    },
-
-    /**
-     * APIMethod: unregister
-     *
-     * Parameters:
-     * type - {String} 
-     * obj - {Object} If none specified, defaults to this.object
-     * func - {Function} 
-     */
-    unregister: function (type, obj, func) {
-        if (obj == null)  {
-            obj = this.object;
-        }
-        var listeners = this.listeners[type];
-        if (listeners != null) {
-            for (var i=0, len=listeners.length; i<len; i++) {
-                if (listeners[i].obj == obj && listeners[i].func == func) {
-                    listeners.splice(i, 1);
-                    break;
-                }
-            }
-        }
-    },
-
-    /** 
-     * Method: remove
-     * Remove all listeners for a given event type. If type is not registered,
-     *     does nothing.
-     *
-     * Parameters:
-     * type - {String} 
-     */
-    remove: function(type) {
-        if (this.listeners[type] != null) {
-            this.listeners[type] = [];
-        }
-    },
-
-    /**
-     * APIMethod: triggerEvent
-     * Trigger a specified registered event.  
-     * 
-     * Parameters:
-     * type - {String} 
-     * evt - {Event || Object} will be passed to the listeners.
-     *
-     * Returns:
-     * {Boolean} The last listener return.  If a listener returns false, the
-     *     chain of listeners will stop getting called.
-     */
-    triggerEvent: function (type, evt) {
-        var listeners = this.listeners[type];
-
-        // fast path
-        if(!listeners || listeners.length == 0) {
-            return undefined;
-        }
-
-        // prep evt object with object & div references
-        if (evt == null) {
-            evt = {};
-        }
-        evt.object = this.object;
-        evt.element = this.element;
-        if(!evt.type) {
-            evt.type = type;
-        }
-    
-        // execute all callbacks registered for specified type
-        // get a clone of the listeners array to
-        // allow for splicing during callbacks
-        listeners = listeners.slice();
-        var continueChain;
-        for (var i=0, len=listeners.length; i<len; i++) {
-            var callback = listeners[i];
-            // bind the context to callback.obj
-            continueChain = callback.func.apply(callback.obj, [evt]);
-
-            if ((continueChain != undefined) && (continueChain == false)) {
-                // if callback returns false, execute no more callbacks.
-                break;
-            }
-        }
-        // don't fall through to other DOM elements
-        if (!this.fallThrough) {           
-            OpenLayers.Event.stop(evt, true);
-        }
-        return continueChain;
-    },
-
-    /**
-     * Method: handleBrowserEvent
-     * Basically just a wrapper to the triggerEvent() function, but takes 
-     *     care to set a property 'xy' on the event with the current mouse 
-     *     position.
-     *
-     * Parameters:
-     * evt - {Event} 
-     */
-    handleBrowserEvent: function (evt) {
-        var type = evt.type, listeners = this.listeners[type];
-        if(!listeners || listeners.length == 0) {
-            // noone's listening, bail out
-            return;
-        }
-        // add clientX & clientY to all events - corresponds to average x, y
-        var touches = evt.touches;
-        if (touches && touches[0]) {
-            var x = 0;
-            var y = 0;
-            var num = touches.length;
-            var touch;
-            for (var i=0; i<num; ++i) {
-                touch = this.getTouchClientXY(touches[i]);
-                x += touch.clientX;
-                y += touch.clientY;
-            }
-            evt.clientX = x / num;
-            evt.clientY = y / num;
-        }
-        if (this.includeXY) {
-            evt.xy = this.getMousePosition(evt);
-        } 
-        this.triggerEvent(type, evt);
-    },
-    
-    /**
-     * Method: getTouchClientXY
-     * WebKit has a few bugs for clientX/clientY. This method detects them
-     * and calculate the correct values.
-     *
-     * Parameters:
-     * evt - {Touch} a Touch object from a TouchEvent
-     * 
-     * Returns:
-     * {Object} An object with only clientX and clientY properties with the
-     * calculated values.
-     */
-    getTouchClientXY: function (evt) {
-        // olMochWin is to override window, used for testing
-        var win = window.olMockWin || window,
-            winPageX = win.pageXOffset,
-            winPageY = win.pageYOffset,
-            x = evt.clientX,
-            y = evt.clientY;
-        
-        if (evt.pageY === 0 && Math.floor(y) > Math.floor(evt.pageY) ||
-            evt.pageX === 0 && Math.floor(x) > Math.floor(evt.pageX)) {
-            // iOS4 include scroll offset in clientX/Y
-            x = x - winPageX;
-            y = y - winPageY;
-        } else if (y < (evt.pageY - winPageY) || x < (evt.pageX - winPageX) ) {
-            // Some Android browsers have totally bogus values for clientX/Y
-            // when scrolling/zooming a page
-            x = evt.pageX - winPageX;
-            y = evt.pageY - winPageY;
-        }
-        
-        evt.olClientX = x;
-        evt.olClientY = y;
-        
-        return {
-            clientX: x,
-            clientY: y
-        };
-    },
-    
-    /**
-     * APIMethod: clearMouseCache
-     * Clear cached data about the mouse position. This should be called any 
-     *     time the element that events are registered on changes position 
-     *     within the page.
-     */
-    clearMouseCache: function() { 
-        this.element.scrolls = null;
-        this.element.lefttop = null;
-        this.element.offsets = null;
-    },      
-
-    /**
-     * Method: getMousePosition
-     * 
-     * Parameters:
-     * evt - {Event} 
-     * 
-     * Returns:
-     * {<OpenLayers.Pixel>} The current xy coordinate of the mouse, adjusted
-     *                      for offsets
-     */
-    getMousePosition: function (evt) {
-        if (!this.includeXY) {
-            this.clearMouseCache();
-        } else if (!this.element.hasScrollEvent) {
-            OpenLayers.Event.observe(window, "scroll", this.clearMouseListener);
-            this.element.hasScrollEvent = true;
-        }
-        
-        if (!this.element.scrolls) {
-            var viewportElement = OpenLayers.Util.getViewportElement();
-            this.element.scrolls = [
-                window.pageXOffset || viewportElement.scrollLeft,
-                window.pageYOffset || viewportElement.scrollTop
-            ];
-        }
-
-        if (!this.element.lefttop) {
-            this.element.lefttop = [
-                (document.documentElement.clientLeft || 0),
-                (document.documentElement.clientTop  || 0)
-            ];
-        }
-        
-        if (!this.element.offsets) {
-            this.element.offsets = OpenLayers.Util.pagePosition(this.element);
-        }
-
-        return new OpenLayers.Pixel(
-            (evt.clientX + this.element.scrolls[0]) - this.element.offsets[0]
-                         - this.element.lefttop[0], 
-            (evt.clientY + this.element.scrolls[1]) - this.element.offsets[1]
-                         - this.element.lefttop[1]
-        ); 
-    },
-
-    /**
-     * Method: addMsTouchListener
-     *
-     * Parameters:
-     * element - {DOMElement} The DOM element to register the listener on
-     * type - {String} The event type
-     * handler - {Function} the handler
-     */
-    addMsTouchListener: function (element, type, handler) {
-        var eventHandler = this.eventHandler;
-        var touches = this._msTouches;
-
-        function msHandler(evt) {
-            handler(OpenLayers.Util.applyDefaults({
-                stopPropagation: function() {
-                    for (var i=touches.length-1; i>=0; --i) {
-                        touches[i].stopPropagation();
-                    }
-                },
-                preventDefault: function() {
-                    for (var i=touches.length-1; i>=0; --i) {
-                        touches[i].preventDefault();
-                    }
-                },
-                type: type
-            }, evt));
-        }
-
-        switch (type) {
-            case 'touchstart':
-                return this.addMsTouchListenerStart(element, type, msHandler);
-            case 'touchend':
-                return this.addMsTouchListenerEnd(element, type, msHandler);
-            case 'touchmove':
-                return this.addMsTouchListenerMove(element, type, msHandler);
-            default:
-                throw 'Unknown touch event type';
-        }
-    },
-
-    /**
-     * Method: addMsTouchListenerStart
-     *
-     * Parameters:
-     * element - {DOMElement} The DOM element to register the listener on
-     * type - {String} The event type
-     * handler - {Function} the handler
-     */
-    addMsTouchListenerStart: function(element, type, handler) {
-        var touches = this._msTouches;
-
-        var cb = function(e) {
-
-            var alreadyInArray = false;
-            for (var i=0, ii=touches.length; i<ii; ++i) {
-                if (touches[i].pointerId == e.pointerId) {
-                    alreadyInArray = true;
-                    break;
-                }
-            }
-            if (!alreadyInArray) {
-                touches.push(e);
-            }
-
-            e.touches = touches.slice();
-            handler(e);
-        };
-
-        OpenLayers.Event.observe(element, 'MSPointerDown', cb);
-
-        // Need to also listen for end events to keep the _msTouches list
-        // accurate
-        var internalCb = function(e) {
-            for (var i=0, ii=touches.length; i<ii; ++i) {
-                if (touches[i].pointerId == e.pointerId) {
-                    touches.splice(i, 1);
-                    break;
-                }
-            }
-        };
-        OpenLayers.Event.observe(element, 'MSPointerUp', internalCb);
-    },
-
-    /**
-     * Method: addMsTouchListenerMove
-     *
-     * Parameters:
-     * element - {DOMElement} The DOM element to register the listener on
-     * type - {String} The event type
-     * handler - {Function} the handler
-     */
-    addMsTouchListenerMove: function (element, type, handler) {
-        var touches = this._msTouches;
-        var cb = function(e) {
-
-            //Don't fire touch moves when mouse isn't down
-            if (e.pointerType == e.MSPOINTER_TYPE_MOUSE && e.buttons == 0) {
-                return;
-            }
-
-            if (touches.length == 1 && touches[0].pageX == e.pageX &&
-                    touches[0].pageY == e.pageY) {
-                // don't trigger event when pointer has not moved
-                return;
-            }
-            for (var i=0, ii=touches.length; i<ii; ++i) {
-                if (touches[i].pointerId == e.pointerId) {
-                    touches[i] = e;
-                    break;
-                }
-            }
-
-            e.touches = touches.slice();
-            handler(e);
-        };
-
-        OpenLayers.Event.observe(element, 'MSPointerMove', cb);
-    },
-
-    /**
-     * Method: addMsTouchListenerEnd
-     *
-     * Parameters:
-     * element - {DOMElement} The DOM element to register the listener on
-     * type - {String} The event type
-     * handler - {Function} the handler
-     */
-    addMsTouchListenerEnd: function (element, type, handler) {
-        var touches = this._msTouches;
-
-        var cb = function(e) {
-
-            for (var i=0, ii=touches.length; i<ii; ++i) {
-                if (touches[i].pointerId == e.pointerId) {
-                    touches.splice(i, 1);
-                    break;
-                }
-            }
-            
-            e.touches = touches.slice();
-            handler(e);
-        };
-
-        OpenLayers.Event.observe(element, 'MSPointerUp', cb);
-    },
-
-    CLASS_NAME: "OpenLayers.Events"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Events/buttonclick.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Events/buttonclick.js
deleted file mode 100644
index ae9094d9..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Events/buttonclick.js
+++ /dev/null
@@ -1,206 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Events.js
- */
-
-/**
- * Class: OpenLayers.Events.buttonclick
- * Extension event type for handling buttons on top of a dom element. This
- *     event type fires "buttonclick" on its <target> when a button was
- *     clicked. Buttons are detected by the "olButton" class.
- *
- * This event type makes sure that button clicks do not interfere with other
- *     events that are registered on the same <element>.
- *
- * Event types provided by this extension:
- * - *buttonclick* Triggered when a button is clicked. Listeners receive an
- *     object with a *buttonElement* property referencing the dom element of
- *     the clicked button, and an *buttonXY* property with the click position
- *     relative to the button.
- */
-OpenLayers.Events.buttonclick = OpenLayers.Class({
-    
-    /**
-     * Property: target
-     * {<OpenLayers.Events>} The events instance that the buttonclick event will
-     * be triggered on.
-     */
-    target: null,
-    
-    /**
-     * Property: events
-     * {Array} Events to observe and conditionally stop from propagating when
-     *     an element with the olButton class (or its olAlphaImg child) is
-     *     clicked.
-     */
-    events: [
-        'mousedown', 'mouseup', 'click', 'dblclick',
-        'touchstart', 'touchmove', 'touchend', 'keydown'
-    ],
-    
-    /**
-     * Property: startRegEx
-     * {RegExp} Regular expression to test Event.type for events that start
-     *     a buttonclick sequence.
-     */
-    startRegEx: /^mousedown|touchstart$/,
-
-    /**
-     * Property: cancelRegEx
-     * {RegExp} Regular expression to test Event.type for events that cancel
-     *     a buttonclick sequence.
-     */
-    cancelRegEx: /^touchmove$/,
-
-    /**
-     * Property: completeRegEx
-     * {RegExp} Regular expression to test Event.type for events that complete
-     *     a buttonclick sequence.
-     */
-    completeRegEx: /^mouseup|touchend$/,
-    
-    /**
-     * Property: startEvt
-     * {Event} The event that started the click sequence
-     */
-    
-    /**
-     * Constructor: OpenLayers.Events.buttonclick
-     * Construct a buttonclick event type. Applications are not supposed to
-     *     create instances of this class - they are created on demand by
-     *     <OpenLayers.Events> instances.
-     *
-     * Parameters:
-     * target - {<OpenLayers.Events>} The events instance that the buttonclick
-     *     event will be triggered on.
-     */
-    initialize: function(target) {
-        this.target = target;
-        for (var i=this.events.length-1; i>=0; --i) {
-            this.target.register(this.events[i], this, this.buttonClick, {
-                extension: true
-            });
-        }
-    },
-    
-    /**
-     * Method: destroy
-     */
-    destroy: function() {
-        for (var i=this.events.length-1; i>=0; --i) {
-            this.target.unregister(this.events[i], this, this.buttonClick);
-        }
-        delete this.target;
-    },
-
-    /**
-     * Method: getPressedButton
-     * Get the pressed button, if any. Returns undefined if no button
-     * was pressed.
-     *
-     * Arguments:
-     * element - {DOMElement} The event target.
-     *
-     * Returns:
-     * {DOMElement} The button element, or undefined.
-     */
-    getPressedButton: function(element) {
-        var depth = 3, // limit the search depth
-            button;
-        do {
-            if(OpenLayers.Element.hasClass(element, "olButton")) {
-                // hit!
-                button = element;
-                break;
-            }
-            element = element.parentNode;
-        } while(--depth > 0 && element);
-        return button;
-    },
-    
-    /**
-     * Method: ignore
-     * Check for event target elements that should be ignored by OpenLayers.
-     *
-     * Parameters:
-     * element - {DOMElement} The event target.
-     */
-    ignore: function(element) {
-        var depth = 3,
-            ignore = false;
-        do {
-            if (element.nodeName.toLowerCase() === 'a') {
-                ignore = true;
-                break;
-            }
-            element = element.parentNode;
-        } while (--depth > 0 && element);
-        return ignore;
-    },
-
-    /**
-     * Method: buttonClick
-     * Check if a button was clicked, and fire the buttonclick event
-     *
-     * Parameters:
-     * evt - {Event}
-     */
-    buttonClick: function(evt) {
-        var propagate = true,
-            element = OpenLayers.Event.element(evt);
-        if (element && (OpenLayers.Event.isLeftClick(evt) || !~evt.type.indexOf("mouse"))) {
-            // was a button pressed?
-            var button = this.getPressedButton(element);
-            if (button) {
-                if (evt.type === "keydown") {
-                    switch (evt.keyCode) {
-                    case OpenLayers.Event.KEY_RETURN:
-                    case OpenLayers.Event.KEY_SPACE:
-                        this.target.triggerEvent("buttonclick", {
-                            buttonElement: button
-                        });
-                        OpenLayers.Event.stop(evt);
-                        propagate = false;
-                        break;
-                    }
-                } else if (this.startEvt) {
-                    if (this.completeRegEx.test(evt.type)) {
-                        var pos = OpenLayers.Util.pagePosition(button);
-                        var viewportElement = OpenLayers.Util.getViewportElement();
-                        var scrollTop = window.pageYOffset || viewportElement.scrollTop;
-                        var scrollLeft = window.pageXOffset || viewportElement.scrollLeft;
-                        pos[0] = pos[0] - scrollLeft;
-                        pos[1] = pos[1] - scrollTop;
-                        
-                        this.target.triggerEvent("buttonclick", {
-                            buttonElement: button,
-                            buttonXY: {
-                                x: this.startEvt.clientX - pos[0],
-                                y: this.startEvt.clientY - pos[1]
-                            }
-                        });
-                    }
-                    if (this.cancelRegEx.test(evt.type)) {
-                        delete this.startEvt;
-                    }
-                    OpenLayers.Event.stop(evt);
-                    propagate = false;
-                }
-                if (this.startRegEx.test(evt.type)) {
-                    this.startEvt = evt;
-                    OpenLayers.Event.stop(evt);
-                    propagate = false;
-                }
-            } else {
-                propagate = !this.ignore(OpenLayers.Event.element(evt));
-                delete this.startEvt;
-            }
-        }
-        return propagate;
-    }
-    
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Events/featureclick.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Events/featureclick.js
deleted file mode 100644
index 9ae6ec53..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Events/featureclick.js
+++ /dev/null
@@ -1,321 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Events.js
- */
-
-/**
- * Class: OpenLayers.Events.featureclick
- *
- * Extension event type for handling feature click events, including overlapping
- * features. 
- * 
- * Event types provided by this extension:
- * - featureclick 
- */
-OpenLayers.Events.featureclick = OpenLayers.Class({
-    
-    /**
-     * Property: cache
-     * {Object} A cache of features under the mouse.
-     */
-    cache: null,
-    
-    /**
-     * Property: map
-     * {<OpenLayers.Map>} The map to register browser events on.
-     */
-    map: null,
-    
-    /**
-     * Property: provides
-     * {Array(String)} The event types provided by this extension.
-     */
-    provides: ["featureclick", "nofeatureclick", "featureover", "featureout"],
-    
-    /**
-     * Constructor: OpenLayers.Events.featureclick
-     * Create a new featureclick event type.
-     *
-     * Parameters:
-     * target - {<OpenLayers.Events>} The events instance to create the events
-     *     for.
-     */
-    initialize: function(target) {
-        this.target = target;
-        if (target.object instanceof OpenLayers.Map) {
-            this.setMap(target.object);
-        } else if (target.object instanceof OpenLayers.Layer.Vector) {
-            if (target.object.map) {
-                this.setMap(target.object.map);
-            } else {
-                target.object.events.register("added", this, function(evt) {
-                    this.setMap(target.object.map);
-                });
-            }
-        } else {
-            throw("Listeners for '" + this.provides.join("', '") +
-                "' events can only be registered for OpenLayers.Layer.Vector " + 
-                "or OpenLayers.Map instances");
-        }
-        for (var i=this.provides.length-1; i>=0; --i) {
-            target.extensions[this.provides[i]] = true;
-        }
-    },
-    
-    /**
-     * Method: setMap
-     *
-     * Parameters:
-     * map - {<OpenLayers.Map>} The map to register browser events on.
-     */
-    setMap: function(map) {
-        this.map = map;
-        this.cache = {};
-        map.events.register("mousedown", this, this.start, {extension: true});
-        map.events.register("mouseup", this, this.onClick, {extension: true});
-        map.events.register("touchstart", this, this.start, {extension: true});
-        map.events.register("touchmove", this, this.cancel, {extension: true});
-        map.events.register("touchend", this, this.onClick, {extension: true});
-        map.events.register("mousemove", this, this.onMousemove, {extension: true});
-    },
-    
-    /**
-     * Method: start
-     * Sets startEvt = evt.
-     *
-     * Parameters:
-     * evt - {<OpenLayers.Event>}
-     */
-    start: function(evt) {
-        this.startEvt = evt;
-    },
-    
-    /**
-     * Method: cancel
-     * Deletes the start event.
-     *
-     * Parameters:
-     * evt - {<OpenLayers.Event>}
-     */    
-    cancel: function(evt) {
-        delete this.startEvt;
-    },
-    
-    /**
-     * Method: onClick
-     * Listener for the click event.
-     *
-     * Parameters:
-     * evt - {<OpenLayers.Event>}
-     */
-    onClick: function(evt) {
-        if (!this.startEvt || evt.type !== "touchend" &&
-                !OpenLayers.Event.isLeftClick(evt)) {
-            return;
-        }
-        var features = this.getFeatures(this.startEvt);
-        delete this.startEvt;
-        // fire featureclick events
-        var feature, layer, more, clicked = {};
-        for (var i=0, len=features.length; i<len; ++i) {
-            feature = features[i];
-            layer = feature.layer;
-            clicked[layer.id] = true;
-            more = this.triggerEvent("featureclick", {feature: feature});
-            if (more === false) {
-                break;
-            }
-        }
-        // fire nofeatureclick events on all vector layers with no targets
-        for (i=0, len=this.map.layers.length; i<len; ++i) {
-            layer = this.map.layers[i];
-            if (layer instanceof OpenLayers.Layer.Vector && !clicked[layer.id]) {
-                this.triggerEvent("nofeatureclick", {layer: layer});
-            }
-        }
-    },
-    
-    /**
-     * Method: onMousemove
-     * Listener for the mousemove event.
-     *
-     * Parameters:
-     * evt - {<OpenLayers.Event>}
-     */
-    onMousemove: function(evt) {
-        delete this.startEvt;
-        var features = this.getFeatures(evt);
-        var over = {}, newly = [], feature;
-        for (var i=0, len=features.length; i<len; ++i) {
-            feature = features[i];
-            over[feature.id] = feature;
-            if (!this.cache[feature.id]) {
-                newly.push(feature);
-            }
-        }
-        // check if already over features
-        var out = [];
-        for (var id in this.cache) {
-            feature = this.cache[id];
-            if (feature.layer && feature.layer.map) {
-                if (!over[feature.id]) {
-                    out.push(feature);
-                }
-            } else {
-                // removed
-                delete this.cache[id];
-            }
-        }
-        // fire featureover events
-        var more;
-        for (i=0, len=newly.length; i<len; ++i) {
-            feature = newly[i];
-            this.cache[feature.id] = feature;
-            more = this.triggerEvent("featureover", {feature: feature});
-            if (more === false) {
-                break;
-            }
-        }
-        // fire featureout events
-        for (i=0, len=out.length; i<len; ++i) {
-            feature = out[i];
-            delete this.cache[feature.id];
-            more = this.triggerEvent("featureout", {feature: feature});
-            if (more === false) {
-                break;
-            }
-        }
-    },
-    
-    /**
-     * Method: triggerEvent
-     * Determines where to trigger the event and triggers it.
-     *
-     * Parameters:
-     * type - {String} The event type to trigger
-     * evt - {Object} The listener argument
-     *
-     * Returns:
-     * {Boolean} The last listener return.
-     */
-    triggerEvent: function(type, evt) {
-        var layer = evt.feature ? evt.feature.layer : evt.layer,
-            object = this.target.object;
-        if (object instanceof OpenLayers.Map || object === layer) {
-            return this.target.triggerEvent(type, evt);
-        }
-    },
-
-    /**
-     * Method: getFeatures
-     * Get all features at the given screen location.
-     *
-     * Parameters:
-     * evt - {Object} Event object.
-     *
-     * Returns:
-     * {Array(<OpenLayers.Feature.Vector>)} List of features at the given point.
-     */
-    getFeatures: function(evt) {
-        var x = evt.clientX, y = evt.clientY,
-            features = [], targets = [], layers = [],
-            layer, target, feature, i, len;
-        // go through all layers looking for targets
-        for (i=this.map.layers.length-1; i>=0; --i) {
-            layer = this.map.layers[i];
-            if (layer.div.style.display !== "none") {
-                if (layer.renderer instanceof OpenLayers.Renderer.Elements) {
-                    if (layer instanceof OpenLayers.Layer.Vector) {
-                        target = document.elementFromPoint(x, y);
-                        while (target && target._featureId) {
-                            feature = layer.getFeatureById(target._featureId);
-                            if (feature) {
-                                features.push(feature);
-                                target.style.display = "none";
-                                targets.push(target);
-                                target = document.elementFromPoint(x, y);
-                            } else {
-                                // sketch, all bets off
-                                target = false;
-                            }
-                        }
-                    }
-                    layers.push(layer);
-                    layer.div.style.display = "none";
-                } else if (layer.renderer instanceof OpenLayers.Renderer.Canvas) {
-                    feature = layer.renderer.getFeatureIdFromEvent(evt);
-                    if (feature) {
-                        features.push(feature);
-                        layers.push(layer);
-                    }
-                }
-            }
-        }
-        // restore feature visibility
-        for (i=0, len=targets.length; i<len; ++i) {
-            targets[i].style.display = "";
-        }
-        // restore layer visibility
-        for (i=layers.length-1; i>=0; --i) {
-            layers[i].div.style.display = "block";
-        }
-        return features;
-    },
-    
-    /**
-     * APIMethod: destroy
-     * Clean up.
-     */
-    destroy: function() {
-        for (var i=this.provides.length-1; i>=0; --i) {
-            delete this.target.extensions[this.provides[i]];
-        }        
-        this.map.events.un({
-            mousemove: this.onMousemove,
-            mousedown: this.start,
-            mouseup: this.onClick,
-            touchstart: this.start,
-            touchmove: this.cancel,
-            touchend: this.onClick,
-            scope: this
-        });
-        delete this.cache;
-        delete this.map;
-        delete this.target;
-    }
-    
-});
- 
-/**
- * Class: OpenLayers.Events.nofeatureclick
- *
- * Extension event type for handling click events that do not hit a feature. 
- * 
- * Event types provided by this extension:
- * - nofeatureclick 
- */
-OpenLayers.Events.nofeatureclick = OpenLayers.Events.featureclick;
-
-/**
- * Class: OpenLayers.Events.featureover
- *
- * Extension event type for handling hovering over a feature. 
- * 
- * Event types provided by this extension:
- * - featureover 
- */
-OpenLayers.Events.featureover = OpenLayers.Events.featureclick;
-
-/**
- * Class: OpenLayers.Events.featureout
- *
- * Extension event type for handling leaving a feature. 
- * 
- * Event types provided by this extension:
- * - featureout 
- */
-OpenLayers.Events.featureout = OpenLayers.Events.featureclick;
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Feature.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Feature.js
deleted file mode 100644
index ed7fd167..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Feature.js
+++ /dev/null
@@ -1,225 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-
-/**
- * @requires OpenLayers/BaseTypes/Class.js
- * @requires OpenLayers/Util.js
- */
-
-/**
- * Class: OpenLayers.Feature
- * Features are combinations of geography and attributes. The OpenLayers.Feature
- *     class specifically combines a marker and a lonlat.
- */
-OpenLayers.Feature = OpenLayers.Class({
-
-    /** 
-     * Property: layer 
-     * {<OpenLayers.Layer>} 
-     */
-    layer: null,
-
-    /** 
-     * Property: id 
-     * {String} 
-     */
-    id: null,
-    
-    /** 
-     * Property: lonlat 
-     * {<OpenLayers.LonLat>} 
-     */
-    lonlat: null,
-
-    /** 
-     * Property: data 
-     * {Object} 
-     */
-    data: null,
-
-    /** 
-     * Property: marker 
-     * {<OpenLayers.Marker>} 
-     */
-    marker: null,
-
-    /**
-     * APIProperty: popupClass
-     * {<OpenLayers.Class>} The class which will be used to instantiate
-     *     a new Popup. Default is <OpenLayers.Popup.Anchored>.
-     */
-    popupClass: null,
-
-    /** 
-     * Property: popup 
-     * {<OpenLayers.Popup>} 
-     */
-    popup: null,
-
-    /** 
-     * Constructor: OpenLayers.Feature
-     * Constructor for features.
-     *
-     * Parameters:
-     * layer - {<OpenLayers.Layer>} 
-     * lonlat - {<OpenLayers.LonLat>} 
-     * data - {Object} 
-     * 
-     * Returns:
-     * {<OpenLayers.Feature>}
-     */
-    initialize: function(layer, lonlat, data) {
-        this.layer = layer;
-        this.lonlat = lonlat;
-        this.data = (data != null) ? data : {};
-        this.id = OpenLayers.Util.createUniqueID(this.CLASS_NAME + "_"); 
-    },
-
-    /** 
-     * Method: destroy
-     * nullify references to prevent circular references and memory leaks
-     */
-    destroy: function() {
-
-        //remove the popup from the map
-        if ((this.layer != null) && (this.layer.map != null)) {
-            if (this.popup != null) {
-                this.layer.map.removePopup(this.popup);
-            }
-        }
-        // remove the marker from the layer
-        if (this.layer != null && this.marker != null) {
-            this.layer.removeMarker(this.marker);
-        }
-
-        this.layer = null;
-        this.id = null;
-        this.lonlat = null;
-        this.data = null;
-        if (this.marker != null) {
-            this.destroyMarker(this.marker);
-            this.marker = null;
-        }
-        if (this.popup != null) {
-            this.destroyPopup(this.popup);
-            this.popup = null;
-        }
-    },
-    
-    /**
-     * Method: onScreen
-     * 
-     * Returns:
-     * {Boolean} Whether or not the feature is currently visible on screen
-     *           (based on its 'lonlat' property)
-     */
-    onScreen:function() {
-        
-        var onScreen = false;
-        if ((this.layer != null) && (this.layer.map != null)) {
-            var screenBounds = this.layer.map.getExtent();
-            onScreen = screenBounds.containsLonLat(this.lonlat);
-        }    
-        return onScreen;
-    },
-    
-
-    /**
-     * Method: createMarker
-     * Based on the data associated with the Feature, create and return a marker object.
-     *
-     * Returns: 
-     * {<OpenLayers.Marker>} A Marker Object created from the 'lonlat' and 'icon' properties
-     *          set in this.data. If no 'lonlat' is set, returns null. If no
-     *          'icon' is set, OpenLayers.Marker() will load the default image.
-     *          
-     *          Note - this.marker is set to return value
-     * 
-     */
-    createMarker: function() {
-
-        if (this.lonlat != null) {
-            this.marker = new OpenLayers.Marker(this.lonlat, this.data.icon);
-        }
-        return this.marker;
-    },
-
-    /**
-     * Method: destroyMarker
-     * Destroys marker.
-     * If user overrides the createMarker() function, s/he should be able
-     *   to also specify an alternative function for destroying it
-     */
-    destroyMarker: function() {
-        this.marker.destroy();  
-    },
-
-    /**
-     * Method: createPopup
-     * Creates a popup object created from the 'lonlat', 'popupSize',
-     *     and 'popupContentHTML' properties set in this.data. It uses
-     *     this.marker.icon as default anchor. 
-     *  
-     *  If no 'lonlat' is set, returns null. 
-     *  If no this.marker has been created, no anchor is sent.
-     *
-     *  Note - the returned popup object is 'owned' by the feature, so you
-     *      cannot use the popup's destroy method to discard the popup.
-     *      Instead, you must use the feature's destroyPopup
-     * 
-     *  Note - this.popup is set to return value
-     * 
-     * Parameters: 
-     * closeBox - {Boolean} create popup with closebox or not
-     * 
-     * Returns:
-     * {<OpenLayers.Popup>} Returns the created popup, which is also set
-     *     as 'popup' property of this feature. Will be of whatever type
-     *     specified by this feature's 'popupClass' property, but must be
-     *     of type <OpenLayers.Popup>.
-     * 
-     */
-    createPopup: function(closeBox) {
-
-        if (this.lonlat != null) {
-            if (!this.popup) {
-                var anchor = (this.marker) ? this.marker.icon : null;
-                var popupClass = this.popupClass ? 
-                    this.popupClass : OpenLayers.Popup.Anchored;
-                this.popup = new popupClass(this.id + "_popup", 
-                                            this.lonlat,
-                                            this.data.popupSize,
-                                            this.data.popupContentHTML,
-                                            anchor, 
-                                            closeBox); 
-            }    
-            if (this.data.overflow != null) {
-                this.popup.contentDiv.style.overflow = this.data.overflow;
-            }    
-            
-            this.popup.feature = this;
-        }        
-        return this.popup;
-    },
-
-    
-    /**
-     * Method: destroyPopup
-     * Destroys the popup created via createPopup.
-     *
-     * As with the marker, if user overrides the createPopup() function, s/he 
-     *   should also be able to override the destruction
-     */
-    destroyPopup: function() {
-        if (this.popup) {
-            this.popup.feature = null;
-            this.popup.destroy();
-            this.popup = null;
-        }    
-    },
-
-    CLASS_NAME: "OpenLayers.Feature"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Feature/Vector.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Feature/Vector.js
deleted file mode 100644
index a6c8c70a..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Feature/Vector.js
+++ /dev/null
@@ -1,510 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-// TRASH THIS
-OpenLayers.State = {
-    /** states */
-    UNKNOWN: 'Unknown',
-    INSERT: 'Insert',
-    UPDATE: 'Update',
-    DELETE: 'Delete'
-};
-
-/**
- * @requires OpenLayers/Feature.js
- * @requires OpenLayers/Util.js
- */
-
-/**
- * Class: OpenLayers.Feature.Vector
- * Vector features use the OpenLayers.Geometry classes as geometry description.
- * They have an 'attributes' property, which is the data object, and a 'style'
- * property, the default values of which are defined in the 
- * <OpenLayers.Feature.Vector.style> objects.
- * 
- * Inherits from:
- *  - <OpenLayers.Feature>
- */
-OpenLayers.Feature.Vector = OpenLayers.Class(OpenLayers.Feature, {
-
-    /** 
-     * Property: fid 
-     * {String} 
-     */
-    fid: null,
-    
-    /** 
-     * APIProperty: geometry 
-     * {<OpenLayers.Geometry>} 
-     */
-    geometry: null,
-
-    /** 
-     * APIProperty: attributes 
-     * {Object} This object holds arbitrary, serializable properties that
-     *     describe the feature.
-     */
-    attributes: null,
-
-    /**
-     * Property: bounds
-     * {<OpenLayers.Bounds>} The box bounding that feature's geometry, that
-     *     property can be set by an <OpenLayers.Format> object when
-     *     deserializing the feature, so in most cases it represents an
-     *     information set by the server. 
-     */
-    bounds: null,
-
-    /** 
-     * Property: state 
-     * {String} 
-     */
-    state: null,
-    
-    /** 
-     * APIProperty: style 
-     * {Object} 
-     */
-    style: null,
-
-    /**
-     * APIProperty: url
-     * {String} If this property is set it will be taken into account by
-     *     {<OpenLayers.HTTP>} when upadting or deleting the feature.
-     */
-    url: null,
-    
-    /**
-     * Property: renderIntent
-     * {String} rendering intent currently being used
-     */
-    renderIntent: "default",
-    
-    /**
-     * APIProperty: modified
-     * {Object} An object with the originals of the geometry and attributes of
-     * the feature, if they were changed. Currently this property is only read
-     * by <OpenLayers.Format.WFST.v1>, and written by
-     * <OpenLayers.Control.ModifyFeature>, which sets the geometry property.
-     * Applications can set the originals of modified attributes in the
-     * attributes property. Note that applications have to check if this
-     * object and the attributes property is already created before using it.
-     * After a change made with ModifyFeature, this object could look like
-     *
-     * (code)
-     * {
-     *     geometry: >Object
-     * }
-     * (end)
-     *
-     * When an application has made changes to feature attributes, it could
-     * have set the attributes to something like this:
-     *
-     * (code)
-     * {
-     *     attributes: {
-     *         myAttribute: "original"
-     *     }
-     * }
-     * (end)
-     *
-     * Note that <OpenLayers.Format.WFST.v1> only checks for truthy values in
-     * *modified.geometry* and the attribute names in *modified.attributes*,
-     * but it is recommended to set the original values (and not just true) as
-     * attribute value, so applications could use this information to undo
-     * changes.
-     */
-    modified: null,
-
-    /** 
-     * Constructor: OpenLayers.Feature.Vector
-     * Create a vector feature. 
-     * 
-     * Parameters:
-     * geometry - {<OpenLayers.Geometry>} The geometry that this feature
-     *     represents.
-     * attributes - {Object} An optional object that will be mapped to the
-     *     <attributes> property. 
-     * style - {Object} An optional style object.
-     */
-    initialize: function(geometry, attributes, style) {
-        OpenLayers.Feature.prototype.initialize.apply(this,
-                                                      [null, null, attributes]);
-        this.lonlat = null;
-        this.geometry = geometry ? geometry : null;
-        this.state = null;
-        this.attributes = {};
-        if (attributes) {
-            this.attributes = OpenLayers.Util.extend(this.attributes,
-                                                     attributes);
-        }
-        this.style = style ? style : null; 
-    },
-    
-    /** 
-     * Method: destroy
-     * nullify references to prevent circular references and memory leaks
-     */
-    destroy: function() {
-        if (this.layer) {
-            this.layer.removeFeatures(this);
-            this.layer = null;
-        }
-            
-        this.geometry = null;
-        this.modified = null;
-        OpenLayers.Feature.prototype.destroy.apply(this, arguments);
-    },
-    
-    /**
-     * Method: clone
-     * Create a clone of this vector feature.  Does not set any non-standard
-     *     properties.
-     *
-     * Returns:
-     * {<OpenLayers.Feature.Vector>} An exact clone of this vector feature.
-     */
-    clone: function () {
-        return new OpenLayers.Feature.Vector(
-            this.geometry ? this.geometry.clone() : null,
-            this.attributes,
-            this.style);
-    },
-
-    /**
-     * Method: onScreen
-     * Determine whether the feature is within the map viewport.  This method
-     *     tests for an intersection between the geometry and the viewport
-     *     bounds.  If a more effecient but less precise geometry bounds
-     *     intersection is desired, call the method with the boundsOnly
-     *     parameter true.
-     *
-     * Parameters:
-     * boundsOnly - {Boolean} Only test whether a feature's bounds intersects
-     *     the viewport bounds.  Default is false.  If false, the feature's
-     *     geometry must intersect the viewport for onScreen to return true.
-     * 
-     * Returns:
-     * {Boolean} The feature is currently visible on screen (optionally
-     *     based on its bounds if boundsOnly is true).
-     */
-    onScreen:function(boundsOnly) {
-        var onScreen = false;
-        if(this.layer && this.layer.map) {
-            var screenBounds = this.layer.map.getExtent();
-            if(boundsOnly) {
-                var featureBounds = this.geometry.getBounds();
-                onScreen = screenBounds.intersectsBounds(featureBounds);
-            } else {
-                var screenPoly = screenBounds.toGeometry();
-                onScreen = screenPoly.intersects(this.geometry);
-            }
-        }    
-        return onScreen;
-    },
-
-    /**
-     * Method: getVisibility
-     * Determine whether the feature is displayed or not. It may not displayed
-     *     because:
-     *     - its style display property is set to 'none',
-     *     - it doesn't belong to any layer,
-     *     - the styleMap creates a symbolizer with display property set to 'none'
-     *          for it,
-     *     - the layer which it belongs to is not visible.
-     * 
-     * Returns:
-     * {Boolean} The feature is currently displayed.
-     */
-    getVisibility: function() {
-        return !(this.style && this.style.display == 'none' ||
-                 !this.layer ||
-                 this.layer && this.layer.styleMap &&
-                 this.layer.styleMap.createSymbolizer(this, this.renderIntent).display == 'none' ||
-                 this.layer && !this.layer.getVisibility());
-    },
-    
-    /**
-     * Method: createMarker
-     * HACK - we need to decide if all vector features should be able to
-     *     create markers
-     * 
-     * Returns:
-     * {<OpenLayers.Marker>} For now just returns null
-     */
-    createMarker: function() {
-        return null;
-    },
-
-    /**
-     * Method: destroyMarker
-     * HACK - we need to decide if all vector features should be able to
-     *     delete markers
-     * 
-     * If user overrides the createMarker() function, s/he should be able
-     *   to also specify an alternative function for destroying it
-     */
-    destroyMarker: function() {
-        // pass
-    },
-
-    /**
-     * Method: createPopup
-     * HACK - we need to decide if all vector features should be able to
-     *     create popups
-     * 
-     * Returns:
-     * {<OpenLayers.Popup>} For now just returns null
-     */
-    createPopup: function() {
-        return null;
-    },
-
-    /**
-     * Method: atPoint
-     * Determins whether the feature intersects with the specified location.
-     * 
-     * Parameters: 
-     * lonlat - {<OpenLayers.LonLat>|Object} OpenLayers.LonLat or an
-     *     object with a 'lon' and 'lat' properties.
-     * toleranceLon - {float} Optional tolerance in Geometric Coords
-     * toleranceLat - {float} Optional tolerance in Geographic Coords
-     * 
-     * Returns:
-     * {Boolean} Whether or not the feature is at the specified location
-     */
-    atPoint: function(lonlat, toleranceLon, toleranceLat) {
-        var atPoint = false;
-        if(this.geometry) {
-            atPoint = this.geometry.atPoint(lonlat, toleranceLon, 
-                                                    toleranceLat);
-        }
-        return atPoint;
-    },
-
-    /**
-     * Method: destroyPopup
-     * HACK - we need to decide if all vector features should be able to
-     * delete popups
-     */
-    destroyPopup: function() {
-        // pass
-    },
-
-    /**
-     * Method: move
-     * Moves the feature and redraws it at its new location
-     *
-     * Parameters:
-     * location - {<OpenLayers.LonLat> or <OpenLayers.Pixel>} the
-     *         location to which to move the feature.
-     */
-    move: function(location) {
-
-        if(!this.layer || !this.geometry.move){
-            //do nothing if no layer or immoveable geometry
-            return undefined;
-        }
-
-        var pixel;
-        if (location.CLASS_NAME == "OpenLayers.LonLat") {
-            pixel = this.layer.getViewPortPxFromLonLat(location);
-        } else {
-            pixel = location;
-        }
-        
-        var lastPixel = this.layer.getViewPortPxFromLonLat(this.geometry.getBounds().getCenterLonLat());
-        var res = this.layer.map.getResolution();
-        this.geometry.move(res * (pixel.x - lastPixel.x),
-                           res * (lastPixel.y - pixel.y));
-        this.layer.drawFeature(this);
-        return lastPixel;
-    },
-    
-    /**
-     * Method: toState
-     * Sets the new state
-     *
-     * Parameters:
-     * state - {String} 
-     */
-    toState: function(state) {
-        if (state == OpenLayers.State.UPDATE) {
-            switch (this.state) {
-                case OpenLayers.State.UNKNOWN:
-                case OpenLayers.State.DELETE:
-                    this.state = state;
-                    break;
-                case OpenLayers.State.UPDATE:
-                case OpenLayers.State.INSERT:
-                    break;
-            }
-        } else if (state == OpenLayers.State.INSERT) {
-            switch (this.state) {
-                case OpenLayers.State.UNKNOWN:
-                    break;
-                default:
-                    this.state = state;
-                    break;
-            }
-        } else if (state == OpenLayers.State.DELETE) {
-            switch (this.state) {
-                case OpenLayers.State.INSERT:
-                    // the feature should be destroyed
-                    break;
-                case OpenLayers.State.DELETE:
-                    break;
-                case OpenLayers.State.UNKNOWN:
-                case OpenLayers.State.UPDATE:
-                    this.state = state;
-                    break;
-            }
-        } else if (state == OpenLayers.State.UNKNOWN) {
-            this.state = state;
-        }
-    },
-    
-    CLASS_NAME: "OpenLayers.Feature.Vector"
-});
-
-
-/**
- * Constant: OpenLayers.Feature.Vector.style
- * OpenLayers features can have a number of style attributes. The 'default' 
- *     style will typically be used if no other style is specified. These
- *     styles correspond for the most part, to the styling properties defined
- *     by the SVG standard. 
- *     Information on fill properties: http://www.w3.org/TR/SVG/painting.html#FillProperties
- *     Information on stroke properties: http://www.w3.org/TR/SVG/painting.html#StrokeProperties
- *
- * Symbolizer properties:
- * fill - {Boolean} Set to false if no fill is desired.
- * fillColor - {String} Hex fill color.  Default is "#ee9900".
- * fillOpacity - {Number} Fill opacity (0-1).  Default is 0.4 
- * stroke - {Boolean} Set to false if no stroke is desired.
- * strokeColor - {String} Hex stroke color.  Default is "#ee9900".
- * strokeOpacity - {Number} Stroke opacity (0-1).  Default is 1.
- * strokeWidth - {Number} Pixel stroke width.  Default is 1.
- * strokeLinecap - {String} Stroke cap type.  Default is "round".  [butt | round | square]
- * strokeDashstyle - {String} Stroke dash style.  Default is "solid". [dot | dash | dashdot | longdash | longdashdot | solid]
- * graphic - {Boolean} Set to false if no graphic is desired.
- * pointRadius - {Number} Pixel point radius.  Default is 6.
- * pointerEvents - {String}  Default is "visiblePainted".
- * cursor - {String} Default is "".
- * externalGraphic - {String} Url to an external graphic that will be used for rendering points.
- * graphicWidth - {Number} Pixel width for sizing an external graphic.
- * graphicHeight - {Number} Pixel height for sizing an external graphic.
- * graphicOpacity - {Number} Opacity (0-1) for an external graphic.
- * graphicXOffset - {Number} Pixel offset along the positive x axis for displacing an external graphic.
- * graphicYOffset - {Number} Pixel offset along the positive y axis for displacing an external graphic.
- * rotation - {Number} For point symbolizers, this is the rotation of a graphic in the clockwise direction about its center point (or any point off center as specified by graphicXOffset and graphicYOffset).
- * graphicZIndex - {Number} The integer z-index value to use in rendering.
- * graphicName - {String} Named graphic to use when rendering points.  Supported values include "circle" (default),
- *     "square", "star", "x", "cross", "triangle".
- * graphicTitle - {String} Tooltip when hovering over a feature. *deprecated*, use title instead
- * title - {String} Tooltip when hovering over a feature. Not supported by the canvas renderer.
- * backgroundGraphic - {String} Url to a graphic to be used as the background under an externalGraphic.
- * backgroundGraphicZIndex - {Number} The integer z-index value to use in rendering the background graphic.
- * backgroundXOffset - {Number} The x offset (in pixels) for the background graphic.
- * backgroundYOffset - {Number} The y offset (in pixels) for the background graphic.
- * backgroundHeight - {Number} The height of the background graphic.  If not provided, the graphicHeight will be used.
- * backgroundWidth - {Number} The width of the background width.  If not provided, the graphicWidth will be used.
- * label - {String} The text for an optional label. For browsers that use the canvas renderer, this requires either
- *     fillText or mozDrawText to be available.
- * labelAlign - {String} Label alignment. This specifies the insertion point relative to the text. It is a string
- *     composed of two characters. The first character is for the horizontal alignment, the second for the vertical
- *     alignment. Valid values for horizontal alignment: "l"=left, "c"=center, "r"=right. Valid values for vertical
- *     alignment: "t"=top, "m"=middle, "b"=bottom. Example values: "lt", "cm", "rb". Default is "cm".
- * labelXOffset - {Number} Pixel offset along the positive x axis for displacing the label. Not supported by the canvas renderer.
- * labelYOffset - {Number} Pixel offset along the positive y axis for displacing the label. Not supported by the canvas renderer.
- * labelSelect - {Boolean} If set to true, labels will be selectable using SelectFeature or similar controls.
- *     Default is false.
- * labelOutlineColor - {String} The color of the label outline. Default is 'white'. Only supported by the canvas & SVG renderers.
- * labelOutlineWidth - {Number} The width of the label outline. Default is 3, set to 0 or null to disable. Only supported by the  SVG renderers.
- * labelOutlineOpacity - {Number} The opacity (0-1) of the label outline. Default is fontOpacity. Only supported by the canvas & SVG renderers.
- * fontColor - {String} The font color for the label, to be provided like CSS.
- * fontOpacity - {Number} Opacity (0-1) for the label
- * fontFamily - {String} The font family for the label, to be provided like in CSS.
- * fontSize - {String} The font size for the label, to be provided like in CSS.
- * fontStyle - {String} The font style for the label, to be provided like in CSS.
- * fontWeight - {String} The font weight for the label, to be provided like in CSS.
- * display - {String} Symbolizers will have no effect if display is set to "none".  All other values have no effect.
- */ 
-OpenLayers.Feature.Vector.style = {
-    'default': {
-        fillColor: "#ee9900",
-        fillOpacity: 0.4, 
-        hoverFillColor: "white",
-        hoverFillOpacity: 0.8,
-        strokeColor: "#ee9900",
-        strokeOpacity: 1,
-        strokeWidth: 1,
-        strokeLinecap: "round",
-        strokeDashstyle: "solid",
-        hoverStrokeColor: "red",
-        hoverStrokeOpacity: 1,
-        hoverStrokeWidth: 0.2,
-        pointRadius: 6,
-        hoverPointRadius: 1,
-        hoverPointUnit: "%",
-        pointerEvents: "visiblePainted",
-        cursor: "inherit",
-        fontColor: "#000000",
-        labelAlign: "cm",
-        labelOutlineColor: "white",
-        labelOutlineWidth: 3
-    },
-    'select': {
-        fillColor: "blue",
-        fillOpacity: 0.4, 
-        hoverFillColor: "white",
-        hoverFillOpacity: 0.8,
-        strokeColor: "blue",
-        strokeOpacity: 1,
-        strokeWidth: 2,
-        strokeLinecap: "round",
-        strokeDashstyle: "solid",
-        hoverStrokeColor: "red",
-        hoverStrokeOpacity: 1,
-        hoverStrokeWidth: 0.2,
-        pointRadius: 6,
-        hoverPointRadius: 1,
-        hoverPointUnit: "%",
-        pointerEvents: "visiblePainted",
-        cursor: "pointer",
-        fontColor: "#000000",
-        labelAlign: "cm",
-        labelOutlineColor: "white",
-        labelOutlineWidth: 3
-
-    },
-    'temporary': {
-        fillColor: "#66cccc",
-        fillOpacity: 0.2, 
-        hoverFillColor: "white",
-        hoverFillOpacity: 0.8,
-        strokeColor: "#66cccc",
-        strokeOpacity: 1,
-        strokeLinecap: "round",
-        strokeWidth: 2,
-        strokeDashstyle: "solid",
-        hoverStrokeColor: "red",
-        hoverStrokeOpacity: 1,
-        hoverStrokeWidth: 0.2,
-        pointRadius: 6,
-        hoverPointRadius: 1,
-        hoverPointUnit: "%",
-        pointerEvents: "visiblePainted",
-        cursor: "inherit",
-        fontColor: "#000000",
-        labelAlign: "cm",
-        labelOutlineColor: "white",
-        labelOutlineWidth: 3
-
-    },
-    'delete': {
-        display: "none"
-    }
-};    
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Filter.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Filter.js
deleted file mode 100644
index 99c04481..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Filter.js
+++ /dev/null
@@ -1,87 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-
-/**
- * @requires OpenLayers/BaseTypes/Class.js
- * @requires OpenLayers/Util.js
- * @requires OpenLayers/Style.js
- */
-
-/**
- * Class: OpenLayers.Filter
- * This class represents an OGC Filter.
- */
-OpenLayers.Filter = OpenLayers.Class({
-    
-    /** 
-     * Constructor: OpenLayers.Filter
-     * This class represents a generic filter.
-     *
-     * Parameters:
-     * options - {Object} Optional object whose properties will be set on the
-     *     instance.
-     * 
-     * Returns:
-     * {<OpenLayers.Filter>}
-     */
-    initialize: function(options) {
-        OpenLayers.Util.extend(this, options);
-    },
-
-    /** 
-     * APIMethod: destroy
-     * Remove reference to anything added.
-     */
-    destroy: function() {
-    },
-
-    /**
-     * APIMethod: evaluate
-     * Evaluates this filter in a specific context.  Instances or subclasses
-     * are supposed to override this method.
-     * 
-     * Parameters:
-     * context - {Object} Context to use in evaluating the filter.  If a vector
-     *     feature is provided, the feature.attributes will be used as context.
-     * 
-     * Returns:
-     * {Boolean} The filter applies.
-     */
-    evaluate: function(context) {
-        return true;
-    },
-    
-    /**
-     * APIMethod: clone
-     * Clones this filter. Should be implemented by subclasses.
-     * 
-     * Returns:
-     * {<OpenLayers.Filter>} Clone of this filter.
-     */
-    clone: function() {
-        return null;
-    },
-    
-    /**
-     * APIMethod: toString
-     *
-     * Returns:
-     * {String} Include <OpenLayers.Format.CQL> in your build to get a CQL
-     *     representation of the filter returned. Otherwise "[Object object]"
-     *     will be returned.
-     */
-    toString: function() {
-        var string;
-        if (OpenLayers.Format && OpenLayers.Format.CQL) {
-            string = OpenLayers.Format.CQL.prototype.write(this);
-        } else {
-            string = Object.prototype.toString.call(this);
-        }
-        return string;
-    },
-    
-    CLASS_NAME: "OpenLayers.Filter"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Filter/Comparison.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Filter/Comparison.js
deleted file mode 100644
index 6863ea8d..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Filter/Comparison.js
+++ /dev/null
@@ -1,267 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Filter.js
- */
-
-/**
- * Class: OpenLayers.Filter.Comparison
- * This class represents a comparison filter.
- * 
- * Inherits from:
- * - <OpenLayers.Filter>
- */
-OpenLayers.Filter.Comparison = OpenLayers.Class(OpenLayers.Filter, {
-
-    /**
-     * APIProperty: type
-     * {String} type: type of the comparison. This is one of
-     * - OpenLayers.Filter.Comparison.EQUAL_TO                 = "==";
-     * - OpenLayers.Filter.Comparison.NOT_EQUAL_TO             = "!=";
-     * - OpenLayers.Filter.Comparison.LESS_THAN                = "<";
-     * - OpenLayers.Filter.Comparison.GREATER_THAN             = ">";
-     * - OpenLayers.Filter.Comparison.LESS_THAN_OR_EQUAL_TO    = "<=";
-     * - OpenLayers.Filter.Comparison.GREATER_THAN_OR_EQUAL_TO = ">=";
-     * - OpenLayers.Filter.Comparison.BETWEEN                  = "..";
-     * - OpenLayers.Filter.Comparison.LIKE                     = "~";
-     * - OpenLayers.Filter.Comparison.IS_NULL                  = "NULL";
-     */
-    type: null,
-    
-    /**
-     * APIProperty: property
-     * {String}
-     * name of the context property to compare
-     */
-    property: null,
-    
-    /**
-     * APIProperty: value
-     * {Number} or {String}
-     * comparison value for binary comparisons. In the case of a String, this
-     * can be a combination of text and propertyNames in the form
-     * "literal ${propertyName}"
-     */
-    value: null,
-    
-    /**
-     * Property: matchCase
-     * {Boolean} Force case sensitive searches for EQUAL_TO and NOT_EQUAL_TO
-     *     comparisons.  The Filter Encoding 1.1 specification added a matchCase
-     *     attribute to ogc:PropertyIsEqualTo and ogc:PropertyIsNotEqualTo
-     *     elements.  This property will be serialized with those elements only
-     *     if using the v1.1.0 filter format. However, when evaluating filters
-     *     here, the matchCase property will always be respected (for EQUAL_TO
-     *     and NOT_EQUAL_TO).  Default is true. 
-     */
-    matchCase: true,
-    
-    /**
-     * APIProperty: lowerBoundary
-     * {Number} or {String}
-     * lower boundary for between comparisons. In the case of a String, this
-     * can be a combination of text and propertyNames in the form
-     * "literal ${propertyName}"
-     */
-    lowerBoundary: null,
-    
-    /**
-     * APIProperty: upperBoundary
-     * {Number} or {String}
-     * upper boundary for between comparisons. In the case of a String, this
-     * can be a combination of text and propertyNames in the form
-     * "literal ${propertyName}"
-     */
-    upperBoundary: null,
-
-    /** 
-     * Constructor: OpenLayers.Filter.Comparison
-     * Creates a comparison rule.
-     *
-     * Parameters:
-     * options - {Object} An optional object with properties to set on the
-     *           rule
-     * 
-     * Returns:
-     * {<OpenLayers.Filter.Comparison>}
-     */
-    initialize: function(options) {
-        OpenLayers.Filter.prototype.initialize.apply(this, [options]);
-        // since matchCase on PropertyIsLike is not schema compliant, we only
-        // want to use this if explicitly asked for
-        if (this.type === OpenLayers.Filter.Comparison.LIKE 
-            && options.matchCase === undefined) {
-                this.matchCase = null;
-        }
-    },
-
-    /**
-     * APIMethod: evaluate
-     * Evaluates this filter in a specific context.
-     * 
-     * Parameters:
-     * context - {Object} Context to use in evaluating the filter.  If a vector
-     *     feature is provided, the feature.attributes will be used as context.
-     * 
-     * Returns:
-     * {Boolean} The filter applies.
-     */
-    evaluate: function(context) {
-        if (context instanceof OpenLayers.Feature.Vector) {
-            context = context.attributes;
-        }
-        var result = false;
-        var got = context[this.property];
-        var exp;
-        switch(this.type) {
-            case OpenLayers.Filter.Comparison.EQUAL_TO:
-                exp = this.value;
-                if(!this.matchCase &&
-                   typeof got == "string" && typeof exp == "string") {
-                    result = (got.toUpperCase() == exp.toUpperCase());
-                } else {
-                    result = (got == exp);
-                }
-                break;
-            case OpenLayers.Filter.Comparison.NOT_EQUAL_TO:
-                exp = this.value;
-                if(!this.matchCase &&
-                   typeof got == "string" && typeof exp == "string") {
-                    result = (got.toUpperCase() != exp.toUpperCase());
-                } else {
-                    result = (got != exp);
-                }
-                break;
-            case OpenLayers.Filter.Comparison.LESS_THAN:
-                result = got < this.value;
-                break;
-            case OpenLayers.Filter.Comparison.GREATER_THAN:
-                result = got > this.value;
-                break;
-            case OpenLayers.Filter.Comparison.LESS_THAN_OR_EQUAL_TO:
-                result = got <= this.value;
-                break;
-            case OpenLayers.Filter.Comparison.GREATER_THAN_OR_EQUAL_TO:
-                result = got >= this.value;
-                break;
-            case OpenLayers.Filter.Comparison.BETWEEN:
-                result = (got >= this.lowerBoundary) &&
-                    (got <= this.upperBoundary);
-                break;
-            case OpenLayers.Filter.Comparison.LIKE:
-                var regexp = new RegExp(this.value, "gi");
-                result = regexp.test(got);
-                break;
-            case OpenLayers.Filter.Comparison.IS_NULL:
-                result = (got === null);
-                break;
-        }
-        return result;
-    },
-    
-    /**
-     * APIMethod: value2regex
-     * Converts the value of this rule into a regular expression string,
-     * according to the wildcard characters specified. This method has to
-     * be called after instantiation of this class, if the value is not a
-     * regular expression already.
-     * 
-     * Parameters:
-     * wildCard   - {Char} wildcard character in the above value, default
-     *              is "*"
-     * singleChar - {Char} single-character wildcard in the above value
-     *              default is "."
-     * escapeChar - {Char} escape character in the above value, default is
-     *              "!"
-     * 
-     * Returns:
-     * {String} regular expression string
-     */
-    value2regex: function(wildCard, singleChar, escapeChar) {
-        if (wildCard == ".") {
-            throw new Error("'.' is an unsupported wildCard character for " +
-                            "OpenLayers.Filter.Comparison");
-        }
-        
-
-        // set UMN MapServer defaults for unspecified parameters
-        wildCard = wildCard ? wildCard : "*";
-        singleChar = singleChar ? singleChar : ".";
-        escapeChar = escapeChar ? escapeChar : "!";
-        
-        this.value = this.value.replace(
-                new RegExp("\\"+escapeChar+"(.|$)", "g"), "\\$1");
-        this.value = this.value.replace(
-                new RegExp("\\"+singleChar, "g"), ".");
-        this.value = this.value.replace(
-                new RegExp("\\"+wildCard, "g"), ".*");
-        this.value = this.value.replace(
-                new RegExp("\\\\.\\*", "g"), "\\"+wildCard);
-        this.value = this.value.replace(
-                new RegExp("\\\\\\.", "g"), "\\"+singleChar);
-        
-        return this.value;
-    },
-    
-    /**
-     * Method: regex2value
-     * Convert the value of this rule from a regular expression string into an
-     *     ogc literal string using a wildCard of *, a singleChar of ., and an
-     *     escape of !.  Leaves the <value> property unmodified.
-     * 
-     * Returns:
-     * {String} A string value.
-     */
-    regex2value: function() {
-        
-        var value = this.value;
-        
-        // replace ! with !!
-        value = value.replace(/!/g, "!!");
-
-        // replace \. with !. (watching out for \\.)
-        value = value.replace(/(\\)?\\\./g, function($0, $1) {
-            return $1 ? $0 : "!.";
-        });
-        
-        // replace \* with #* (watching out for \\*)
-        value = value.replace(/(\\)?\\\*/g, function($0, $1) {
-            return $1 ? $0 : "!*";
-        });
-        
-        // replace \\ with \
-        value = value.replace(/\\\\/g, "\\");
-
-        // convert .* to * (the sequence #.* is not allowed)
-        value = value.replace(/\.\*/g, "*");
-        
-        return value;
-    },
-    
-    /**
-     * APIMethod: clone
-     * Clones this filter.
-     * 
-     * Returns:
-     * {<OpenLayers.Filter.Comparison>} Clone of this filter.
-     */
-    clone: function() {
-        return OpenLayers.Util.extend(new OpenLayers.Filter.Comparison(), this);
-    },
-    
-    CLASS_NAME: "OpenLayers.Filter.Comparison"
-});
-
-
-OpenLayers.Filter.Comparison.EQUAL_TO                 = "==";
-OpenLayers.Filter.Comparison.NOT_EQUAL_TO             = "!=";
-OpenLayers.Filter.Comparison.LESS_THAN                = "<";
-OpenLayers.Filter.Comparison.GREATER_THAN             = ">";
-OpenLayers.Filter.Comparison.LESS_THAN_OR_EQUAL_TO    = "<=";
-OpenLayers.Filter.Comparison.GREATER_THAN_OR_EQUAL_TO = ">=";
-OpenLayers.Filter.Comparison.BETWEEN                  = "..";
-OpenLayers.Filter.Comparison.LIKE                     = "~";
-OpenLayers.Filter.Comparison.IS_NULL                  = "NULL";
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Filter/FeatureId.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Filter/FeatureId.js
deleted file mode 100644
index 29276512..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Filter/FeatureId.js
+++ /dev/null
@@ -1,87 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-
-/**
- * @requires OpenLayers/Filter.js
- */
-
-/**
- * Class: OpenLayers.Filter.FeatureId
- * This class represents a ogc:FeatureId Filter, as being used for rule-based SLD
- * styling
- * 
- * Inherits from:
- * - <OpenLayers.Filter>
- */
-OpenLayers.Filter.FeatureId = OpenLayers.Class(OpenLayers.Filter, {
-
-    /** 
-     * APIProperty: fids
-     * {Array(String)} Feature Ids to evaluate this rule against. 
-     *     To be passed inside the params object.
-     */
-    fids: null,
-    
-    /** 
-     * Property: type
-     * {String} Type to identify this filter.
-     */
-    type: "FID",
-    
-    /** 
-     * Constructor: OpenLayers.Filter.FeatureId
-     * Creates an ogc:FeatureId rule.
-     *
-     * Parameters:
-     * options - {Object} An optional object with properties to set on the
-     *           rule
-     * 
-     * Returns:
-     * {<OpenLayers.Filter.FeatureId>}
-     */
-    initialize: function(options) {
-        this.fids = [];
-        OpenLayers.Filter.prototype.initialize.apply(this, [options]);
-    },
-
-    /**
-     * APIMethod: evaluate
-     * evaluates this rule for a specific feature
-     * 
-     * Parameters:
-     * feature - {<OpenLayers.Feature>} feature to apply the rule to.
-     *           For vector features, the check is run against the fid,
-     *           for plain features against the id.
-     * 
-     * Returns:
-     * {Boolean} true if the rule applies, false if it does not
-     */
-    evaluate: function(feature) {
-        for (var i=0, len=this.fids.length; i<len; i++) {
-            var fid = feature.fid || feature.id;
-            if (fid == this.fids[i]) {
-                return true;
-            }
-        }
-        return false;
-    },
-    
-    /**
-     * APIMethod: clone
-     * Clones this filter.
-     * 
-     * Returns:
-     * {<OpenLayers.Filter.FeatureId>} Clone of this filter.
-     */
-    clone: function() {
-        var filter = new OpenLayers.Filter.FeatureId();
-        OpenLayers.Util.extend(filter, this);
-        filter.fids = this.fids.slice();
-        return filter;
-    },
-    
-    CLASS_NAME: "OpenLayers.Filter.FeatureId"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Filter/Function.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Filter/Function.js
deleted file mode 100644
index 0d5a7a9f..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Filter/Function.js
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Filter.js
- */
-
-/**
- * Class: OpenLayers.Filter.Function
- * This class represents a filter function.
- * We are using this class for creation of complex 
- * filters that can contain filter functions as values.
- * Nesting function as other functions parameter is supported.
- * 
- * Inherits from:
- * - <OpenLayers.Filter>
- */
-OpenLayers.Filter.Function = OpenLayers.Class(OpenLayers.Filter, {
-
-    /**
-     * APIProperty: name
-     * {String} Name of the function.
-     */
-    name: null,
-    
-    /**
-     * APIProperty: params
-     * {Array(<OpenLayers.Filter.Function> || String || Number)} Function parameters
-     * For now support only other Functions, String or Number
-     */
-    params: null,  
-    
-    /** 
-     * Constructor: OpenLayers.Filter.Function
-     * Creates a filter function.
-     *
-     * Parameters:
-     * options - {Object} An optional object with properties to set on the
-     *     function.
-     * 
-     * Returns:
-     * {<OpenLayers.Filter.Function>}
-     */
-
-    CLASS_NAME: "OpenLayers.Filter.Function"
-});
-
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Filter/Logical.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Filter/Logical.js
deleted file mode 100644
index 4eac5799..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Filter/Logical.js
+++ /dev/null
@@ -1,121 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-
-/**
- * @requires OpenLayers/Filter.js
- */
-
-/**
- * Class: OpenLayers.Filter.Logical
- * This class represents ogc:And, ogc:Or and ogc:Not rules.
- * 
- * Inherits from:
- * - <OpenLayers.Filter>
- */
-OpenLayers.Filter.Logical = OpenLayers.Class(OpenLayers.Filter, {
-
-    /**
-     * APIProperty: filters
-     * {Array(<OpenLayers.Filter>)} Child filters for this filter.
-     */
-    filters: null, 
-     
-    /**
-     * APIProperty: type
-     * {String} type of logical operator. Available types are:
-     * - OpenLayers.Filter.Logical.AND = "&&";
-     * - OpenLayers.Filter.Logical.OR  = "||";
-     * - OpenLayers.Filter.Logical.NOT = "!";
-     */
-    type: null,
-
-    /** 
-     * Constructor: OpenLayers.Filter.Logical
-     * Creates a logical filter (And, Or, Not).
-     *
-     * Parameters:
-     * options - {Object} An optional object with properties to set on the
-     *     filter.
-     * 
-     * Returns:
-     * {<OpenLayers.Filter.Logical>}
-     */
-    initialize: function(options) {
-        this.filters = [];
-        OpenLayers.Filter.prototype.initialize.apply(this, [options]);
-    },
-    
-    /** 
-     * APIMethod: destroy
-     * Remove reference to child filters.
-     */
-    destroy: function() {
-        this.filters = null;
-        OpenLayers.Filter.prototype.destroy.apply(this);
-    },
-
-    /**
-     * APIMethod: evaluate
-     * Evaluates this filter in a specific context.
-     * 
-     * Parameters:
-     * context - {Object} Context to use in evaluating the filter.  A vector
-     *     feature may also be provided to evaluate feature attributes in 
-     *     comparison filters or geometries in spatial filters.
-     * 
-     * Returns:
-     * {Boolean} The filter applies.
-     */
-    evaluate: function(context) {
-        var i, len;
-        switch(this.type) {
-            case OpenLayers.Filter.Logical.AND:
-                for (i=0, len=this.filters.length; i<len; i++) {
-                    if (this.filters[i].evaluate(context) == false) {
-                        return false;
-                    }
-                }
-                return true;
-                
-            case OpenLayers.Filter.Logical.OR:
-                for (i=0, len=this.filters.length; i<len; i++) {
-                    if (this.filters[i].evaluate(context) == true) {
-                        return true;
-                    }
-                }
-                return false;
-            
-            case OpenLayers.Filter.Logical.NOT:
-                return (!this.filters[0].evaluate(context));
-        }
-        return undefined;
-    },
-    
-    /**
-     * APIMethod: clone
-     * Clones this filter.
-     * 
-     * Returns:
-     * {<OpenLayers.Filter.Logical>} Clone of this filter.
-     */
-    clone: function() {
-        var filters = [];        
-        for(var i=0, len=this.filters.length; i<len; ++i) {
-            filters.push(this.filters[i].clone());
-        }
-        return new OpenLayers.Filter.Logical({
-            type: this.type,
-            filters: filters
-        });
-    },
-    
-    CLASS_NAME: "OpenLayers.Filter.Logical"
-});
-
-
-OpenLayers.Filter.Logical.AND = "&&";
-OpenLayers.Filter.Logical.OR  = "||";
-OpenLayers.Filter.Logical.NOT = "!";
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Filter/Spatial.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Filter/Spatial.js
deleted file mode 100644
index dd9e2a7c..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Filter/Spatial.js
+++ /dev/null
@@ -1,122 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Filter.js
- */
-
-/**
- * Class: OpenLayers.Filter.Spatial
- * This class represents a spatial filter.
- * Currently implemented: BBOX, DWithin and Intersects
- * 
- * Inherits from:
- * - <OpenLayers.Filter>
- */
-OpenLayers.Filter.Spatial = OpenLayers.Class(OpenLayers.Filter, {
-
-    /**
-     * APIProperty: type
-     * {String} Type of spatial filter.
-     *
-     * The type should be one of:
-     * - OpenLayers.Filter.Spatial.BBOX
-     * - OpenLayers.Filter.Spatial.INTERSECTS
-     * - OpenLayers.Filter.Spatial.DWITHIN
-     * - OpenLayers.Filter.Spatial.WITHIN
-     * - OpenLayers.Filter.Spatial.CONTAINS
-     */
-    type: null,
-    
-    /**
-     * APIProperty: property
-     * {String} Name of the context property to compare.
-     */
-    property: null,
-    
-    /**
-     * APIProperty: value
-     * {<OpenLayers.Bounds> || <OpenLayers.Geometry>} The bounds or geometry
-     *     to be used by the filter.  Use bounds for BBOX filters and geometry
-     *     for INTERSECTS or DWITHIN filters.
-     */
-    value: null,
-
-    /**
-     * APIProperty: distance
-     * {Number} The distance to use in a DWithin spatial filter.
-     */
-    distance: null,
-
-    /**
-     * APIProperty: distanceUnits
-     * {String} The units to use for the distance, e.g. 'm'.
-     */
-    distanceUnits: null,
-    
-    /** 
-     * Constructor: OpenLayers.Filter.Spatial
-     * Creates a spatial filter.
-     *
-     * Parameters:
-     * options - {Object} An optional object with properties to set on the
-     *     filter.
-     * 
-     * Returns:
-     * {<OpenLayers.Filter.Spatial>}
-     */
-
-   /**
-    * Method: evaluate
-    * Evaluates this filter for a specific feature.
-    * 
-    * Parameters:
-    * feature - {<OpenLayers.Feature.Vector>} feature to apply the filter to.
-    * 
-    * Returns:
-    * {Boolean} The feature meets filter criteria.
-    */
-    evaluate: function(feature) {
-        var intersect = false;
-        switch(this.type) {
-            case OpenLayers.Filter.Spatial.BBOX:
-            case OpenLayers.Filter.Spatial.INTERSECTS:
-                if(feature.geometry) {
-                    var geom = this.value;
-                    if(this.value.CLASS_NAME == "OpenLayers.Bounds") {
-                        geom = this.value.toGeometry();
-                    }
-                    if(feature.geometry.intersects(geom)) {
-                        intersect = true;
-                    }
-                }
-                break;
-            default:
-                throw new Error('evaluate is not implemented for this filter type.');
-        }
-        return intersect;
-    },
-
-    /**
-     * APIMethod: clone
-     * Clones this filter.
-     * 
-     * Returns:
-     * {<OpenLayers.Filter.Spatial>} Clone of this filter.
-     */
-    clone: function() {
-        var options = OpenLayers.Util.applyDefaults({
-            value: this.value && this.value.clone && this.value.clone()
-        }, this);
-        return new OpenLayers.Filter.Spatial(options);
-    },
-    CLASS_NAME: "OpenLayers.Filter.Spatial"
-});
-
-OpenLayers.Filter.Spatial.BBOX = "BBOX";
-OpenLayers.Filter.Spatial.INTERSECTS = "INTERSECTS";
-OpenLayers.Filter.Spatial.DWITHIN = "DWITHIN";
-OpenLayers.Filter.Spatial.WITHIN = "WITHIN";
-OpenLayers.Filter.Spatial.CONTAINS = "CONTAINS";
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format.js
deleted file mode 100644
index 620ecc7e..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format.js
+++ /dev/null
@@ -1,123 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/BaseTypes/Class.js
- * @requires OpenLayers/Util.js
- */
-
-/**
- * Class: OpenLayers.Format
- * Base class for format reading/writing a variety of formats.  Subclasses
- *     of OpenLayers.Format are expected to have read and write methods.
- */
-OpenLayers.Format = OpenLayers.Class({
-    
-    /**
-     * Property: options
-     * {Object} A reference to options passed to the constructor.
-     */
-    options: null,
-    
-    /**
-     * APIProperty: externalProjection
-     * {<OpenLayers.Projection>} When passed a externalProjection and
-     *     internalProjection, the format will reproject the geometries it
-     *     reads or writes. The externalProjection is the projection used by
-     *     the content which is passed into read or which comes out of write.
-     *     In order to reproject, a projection transformation function for the
-     *     specified projections must be available. This support may be 
-     *     provided via proj4js or via a custom transformation function. See
-     *     {<OpenLayers.Projection.addTransform>} for more information on
-     *     custom transformations.
-     */
-    externalProjection: null,
-
-    /**
-     * APIProperty: internalProjection
-     * {<OpenLayers.Projection>} When passed a externalProjection and
-     *     internalProjection, the format will reproject the geometries it
-     *     reads or writes. The internalProjection is the projection used by
-     *     the geometries which are returned by read or which are passed into
-     *     write.  In order to reproject, a projection transformation function
-     *     for the specified projections must be available. This support may be
-     *     provided via proj4js or via a custom transformation function. See
-     *     {<OpenLayers.Projection.addTransform>} for more information on
-     *     custom transformations.
-     */
-    internalProjection: null,
-
-    /**
-     * APIProperty: data
-     * {Object} When <keepData> is true, this is the parsed string sent to
-     *     <read>.
-     */
-    data: null,
-
-    /**
-     * APIProperty: keepData
-     * {Object} Maintain a reference (<data>) to the most recently read data.
-     *     Default is false.
-     */
-    keepData: false,
-
-    /**
-     * Constructor: OpenLayers.Format
-     * Instances of this class are not useful.  See one of the subclasses.
-     *
-     * Parameters:
-     * options - {Object} An optional object with properties to set on the
-     *           format
-     *
-     * Valid options:
-     * keepData - {Boolean} If true, upon <read>, the data property will be
-     *     set to the parsed object (e.g. the json or xml object).
-     *
-     * Returns:
-     * An instance of OpenLayers.Format
-     */
-    initialize: function(options) {
-        OpenLayers.Util.extend(this, options);
-        this.options = options;
-    },
-    
-    /**
-     * APIMethod: destroy
-     * Clean up.
-     */
-    destroy: function() {
-    },
-
-    /**
-     * Method: read
-     * Read data from a string, and return an object whose type depends on the
-     * subclass. 
-     * 
-     * Parameters:
-     * data - {string} Data to read/parse.
-     *
-     * Returns:
-     * Depends on the subclass
-     */
-    read: function(data) {
-        throw new Error('Read not implemented.');
-    },
-    
-    /**
-     * Method: write
-     * Accept an object, and return a string. 
-     *
-     * Parameters:
-     * object - {Object} Object to be serialized
-     *
-     * Returns:
-     * {String} A string representation of the object.
-     */
-    write: function(object) {
-        throw new Error('Write not implemented.');
-    },
-
-    CLASS_NAME: "OpenLayers.Format"
-});     
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/ArcXML.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/ArcXML.js
deleted file mode 100644
index 9d523d1c..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/ArcXML.js
+++ /dev/null
@@ -1,1028 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/XML.js
- * @requires OpenLayers/Geometry/Polygon.js
- * @requires OpenLayers/Geometry/Point.js
- * @requires OpenLayers/Geometry/MultiPolygon.js
- * @requires OpenLayers/Geometry/LinearRing.js
- */
-
-/**
- * Class: OpenLayers.Format.ArcXML
- * Read/Write ArcXML. Create a new instance with the <OpenLayers.Format.ArcXML>
- *     constructor.
- * 
- * Inherits from:
- *  - <OpenLayers.Format.XML>
- */
-OpenLayers.Format.ArcXML = OpenLayers.Class(OpenLayers.Format.XML, {
-
-    /**
-     * Property: fontStyleKeys
-     * {Array} List of keys used in font styling.
-     */
-    fontStyleKeys: [
-        'antialiasing', 'blockout', 'font', 'fontcolor','fontsize', 'fontstyle',
-        'glowing', 'interval', 'outline', 'printmode', 'shadow', 'transparency'
-    ],
-
-    /**
-     * Property: request
-     * A get_image request destined for an ArcIMS server.
-     */
-    request: null,
-    
-    /**
-     * Property: response
-     * A parsed response from an ArcIMS server.
-     */
-    response: null,
-
-    /**
-     * Constructor: OpenLayers.Format.ArcXML
-     * Create a new parser/writer for ArcXML.  Create an instance of this class
-     *    to begin authoring a request to an ArcIMS service.  This is used
-     *    primarily by the ArcIMS layer, but could be used to do other wild
-     *    stuff, like geocoding.
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be set on
-     *     this instance.
-     */
-    initialize: function(options) {
-        this.request = new OpenLayers.Format.ArcXML.Request();
-        this.response = new OpenLayers.Format.ArcXML.Response();
-
-        if (options) {
-            if (options.requesttype == "feature") {
-                this.request.get_image = null;
-            
-                var qry = this.request.get_feature.query;
-                this.addCoordSys(qry.featurecoordsys, options.featureCoordSys);
-                this.addCoordSys(qry.filtercoordsys, options.filterCoordSys);
-            
-                if (options.polygon) {
-                    qry.isspatial = true;
-                    qry.spatialfilter.polygon = options.polygon;
-                } else if (options.envelope) {
-                    qry.isspatial = true;
-                    qry.spatialfilter.envelope = {minx:0, miny:0, maxx:0, maxy:0};
-                    this.parseEnvelope(qry.spatialfilter.envelope, options.envelope);
-                }
-            } else if (options.requesttype == "image") {
-                this.request.get_feature = null;
-            
-                var props = this.request.get_image.properties;
-                this.parseEnvelope(props.envelope, options.envelope);
-            
-                this.addLayers(props.layerlist, options.layers);
-                this.addImageSize(props.imagesize, options.tileSize);
-                this.addCoordSys(props.featurecoordsys, options.featureCoordSys);
-                this.addCoordSys(props.filtercoordsys, options.filterCoordSys);
-            } else {
-                // if an arcxml object is being created with no request type, it is
-                // probably going to consume a response, so do not throw an error if
-                // the requesttype is not defined
-                this.request = null;
-            }
-        }
-        
-        OpenLayers.Format.XML.prototype.initialize.apply(this, [options]);
-    },
-    
-    /**
-     * Method: parseEnvelope
-     * Parse an array of coordinates into an ArcXML envelope structure.
-     *
-     * Parameters:
-     * env - {Object} An envelope object that will contain the parsed coordinates.
-     * arr - {Array(double)} An array of coordinates in the order: [ minx, miny, maxx, maxy ]
-     */
-    parseEnvelope: function(env, arr) {
-        if (arr && arr.length == 4) {          
-            env.minx = arr[0];
-            env.miny = arr[1];
-            env.maxx = arr[2];
-            env.maxy = arr[3];
-        }
-    },
-    
-    /** 
-     * Method: addLayers
-     * Add a collection of layers to another collection of layers. Each layer in the list is tuple of
-     * { id, visible }.  These layer collections represent the 
-     * /ARCXML/REQUEST/get_image/PROPERTIES/LAYERLIST/LAYERDEF items in ArcXML
-     *
-     * TODO: Add support for dynamic layer rendering.
-     *
-     * Parameters:
-     * ll - {Array({id,visible})} A list of layer definitions.
-     * lyrs - {Array({id,visible})} A list of layer definitions.
-     */
-    addLayers: function(ll, lyrs) {
-        for(var lind = 0, len=lyrs.length; lind < len; lind++) {
-            ll.push(lyrs[lind]);
-        }
-    },
-    
-    /**
-     * Method: addImageSize
-     * Set the size of the requested image.
-     *
-     * Parameters:
-     * imsize - {Object} An ArcXML imagesize object.
-     * olsize - {<OpenLayers.Size>} The image size to set.
-     */
-    addImageSize: function(imsize, olsize) {
-        if (olsize !== null) {
-            imsize.width = olsize.w;
-            imsize.height = olsize.h;
-            imsize.printwidth = olsize.w;
-            imsize.printheight = olsize.h;
-        }
-    },
-
-    /**
-     * Method: addCoordSys
-     * Add the coordinate system information to an object. The object may be 
-     *
-     * Parameters:
-     * featOrFilt - {Object} A featurecoordsys or filtercoordsys ArcXML structure.
-     * fsys - {String} or {<OpenLayers.Projection>} or {filtercoordsys} or 
-     * {featurecoordsys} A projection representation. If it's a {String}, 
-     * the value is assumed to be the SRID.  If it's a {OpenLayers.Projection} 
-     * AND Proj4js is available, the projection number and name are extracted 
-     * from there.  If it's a filter or feature ArcXML structure, it is copied.
-     */
-    addCoordSys: function(featOrFilt, fsys) {
-        if (typeof fsys == "string") {
-            featOrFilt.id = parseInt(fsys);
-            featOrFilt.string = fsys;
-        }
-        // is this a proj4js instance?
-        else if (typeof fsys == "object" && fsys.proj !== null){
-            featOrFilt.id = fsys.proj.srsProjNumber;
-            featOrFilt.string = fsys.proj.srsCode;
-        } else {
-            featOrFilt = fsys;
-        }
-    },
-
-    /**
-     * APIMethod: iserror
-     * Check to see if the response from the server was an error.
-     *
-     * Parameters:
-     * data - {String} or {DOMElement} data to read/parse. If nothing is supplied,
-     * the current response is examined.
-     *
-     * Returns:
-     * {Boolean} true if the response was an error.
-     */
-    iserror: function(data) {
-        var ret = null; 
-        
-        if (!data) {
-            ret = (this.response.error !== '');
-        } else {
-            data = OpenLayers.Format.XML.prototype.read.apply(this, [data]);
-            var errorNodes = data.documentElement.getElementsByTagName("ERROR");
-            ret = (errorNodes !== null && errorNodes.length > 0);
-        }
-
-        return ret;
-    },
-
-    /**
-     * APIMethod: read
-     * Read data from a string, and return an response. 
-     * 
-     * Parameters:
-     * data - {String} or {DOMElement} data to read/parse.
-     *
-     * Returns:
-     * {<OpenLayers.Format.ArcXML.Response>} An ArcXML response. Note that this response
-     *     data may change in the future. 
-     */
-    read: function(data) {
-        if(typeof data == "string") {
-            data = OpenLayers.Format.XML.prototype.read.apply(this, [data]);
-        }
-        
-        var arcNode = null;
-        if (data && data.documentElement) {
-            if(data.documentElement.nodeName == "ARCXML") {
-                arcNode = data.documentElement;
-            } else {
-                arcNode = data.documentElement.getElementsByTagName("ARCXML")[0];
-            }
-        }
-          
-        // in Safari, arcNode will be there but will have a child named 
-        // parsererror
-        if (!arcNode || arcNode.firstChild.nodeName === 'parsererror') {
-            var error, source;
-            try {
-                error = data.firstChild.nodeValue;
-                source = data.firstChild.childNodes[1].firstChild.nodeValue;
-            } catch (err) {
-                // pass
-            }
-            throw {
-                message: "Error parsing the ArcXML request", 
-                error: error,
-                source: source
-            };
-        }
-        
-        var response = this.parseResponse(arcNode);
-        return response;
-    },
-    
-    /**
-     * APIMethod: write
-     * Generate an ArcXml document string for sending to an ArcIMS server. 
-     * 
-     * Returns:
-     * {String} A string representing the ArcXML document request.
-     */
-    write: function(request) {       
-        if (!request) {
-            request = this.request;
-        }    
-        var root = this.createElementNS("", "ARCXML");
-        root.setAttribute("version","1.1");
-
-        var reqElem = this.createElementNS("", "REQUEST");
-        
-        if (request.get_image != null) {
-            var getElem = this.createElementNS("", "GET_IMAGE");
-            reqElem.appendChild(getElem);
-
-            var propElem = this.createElementNS("", "PROPERTIES");
-            getElem.appendChild(propElem);
-
-            var props = request.get_image.properties;
-            if (props.featurecoordsys != null) {
-                var feat = this.createElementNS("", "FEATURECOORDSYS");
-                propElem.appendChild(feat);
-                
-                if (props.featurecoordsys.id === 0) {
-                    feat.setAttribute("string", props.featurecoordsys['string']);
-                }
-                else {
-                    feat.setAttribute("id", props.featurecoordsys.id);
-                }
-            }
-          
-            if (props.filtercoordsys != null) {
-                var filt = this.createElementNS("", "FILTERCOORDSYS");
-                propElem.appendChild(filt);
-
-                if (props.filtercoordsys.id === 0) {
-                    filt.setAttribute("string", props.filtercoordsys.string);
-                }
-                else {
-                    filt.setAttribute("id", props.filtercoordsys.id);
-                }
-            }
-          
-            if (props.envelope != null) {
-                var env = this.createElementNS("", "ENVELOPE");
-                propElem.appendChild(env);
-
-                env.setAttribute("minx", props.envelope.minx);
-                env.setAttribute("miny", props.envelope.miny);
-                env.setAttribute("maxx", props.envelope.maxx);
-                env.setAttribute("maxy", props.envelope.maxy);
-            }        
-          
-            var imagesz = this.createElementNS("", "IMAGESIZE");
-            propElem.appendChild(imagesz);
-          
-            imagesz.setAttribute("height", props.imagesize.height);
-            imagesz.setAttribute("width", props.imagesize.width);
-          
-            if (props.imagesize.height != props.imagesize.printheight ||
-                 props.imagesize.width != props.imagesize.printwidth) {
-                imagesz.setAttribute("printheight", props.imagesize.printheight);
-                imagesz.setArrtibute("printwidth", props.imagesize.printwidth);
-            }
-          
-            if (props.background != null) {
-                var backgrnd = this.createElementNS("", "BACKGROUND");
-                propElem.appendChild(backgrnd);
-            
-                backgrnd.setAttribute("color", 
-                    props.background.color.r + "," + 
-                    props.background.color.g + "," + 
-                    props.background.color.b);
-              
-                if (props.background.transcolor !== null) {
-                    backgrnd.setAttribute("transcolor", 
-                        props.background.transcolor.r + "," + 
-                        props.background.transcolor.g + "," + 
-                        props.background.transcolor.b);
-                }
-            }
-          
-            if (props.layerlist != null && props.layerlist.length > 0) {
-                var layerlst = this.createElementNS("", "LAYERLIST");
-                propElem.appendChild(layerlst);
-            
-                for (var ld = 0; ld < props.layerlist.length; ld++) {
-                    var ldef = this.createElementNS("", "LAYERDEF");
-                    layerlst.appendChild(ldef);
-              
-                    ldef.setAttribute("id", props.layerlist[ld].id);
-                    ldef.setAttribute("visible", props.layerlist[ld].visible);
-              
-                    if (typeof props.layerlist[ld].query == "object") {
-                        var query = props.layerlist[ld].query;
-
-                        if (query.where.length < 0) {
-                            continue;
-                        }
-                  
-                        var queryElem = null;
-                        if (typeof query.spatialfilter == "boolean" && query.spatialfilter) {
-                            // handle spatial filter madness
-                            queryElem = this.createElementNS("", "SPATIALQUERY");
-                        }
-                        else {
-                            queryElem = this.createElementNS("", "QUERY");
-                        }
-                
-                        queryElem.setAttribute("where", query.where);
-                
-                        if (typeof query.accuracy == "number" && query.accuracy > 0) {
-                            queryElem.setAttribute("accuracy", query.accuracy);
-                        }
-                        if (typeof query.featurelimit == "number" && query.featurelimit < 2000) {
-                            queryElem.setAttribute("featurelimit", query.featurelimit);
-                        }
-                        if (typeof query.subfields == "string" && query.subfields != "#ALL#") {
-                            queryElem.setAttribute("subfields", query.subfields);
-                        }
-                        if (typeof query.joinexpression == "string" && query.joinexpression.length > 0) {
-                            queryElem.setAttribute("joinexpression", query.joinexpression);
-                        }
-                        if (typeof query.jointables == "string" && query.jointables.length > 0) {
-                            queryElem.setAttribute("jointables", query.jointables);
-                        }
-
-                        ldef.appendChild(queryElem);
-                    }
-              
-                    if (typeof props.layerlist[ld].renderer == "object") {
-                        this.addRenderer(ldef, props.layerlist[ld].renderer);                  
-                    }
-                }
-            }
-        } else if (request.get_feature != null) {
-            var getElem = this.createElementNS("", "GET_FEATURES");
-            getElem.setAttribute("outputmode", "newxml");
-            getElem.setAttribute("checkesc", "true");
-          
-            if (request.get_feature.geometry) {
-                getElem.setAttribute("geometry", request.get_feature.geometry);
-            }
-            else {
-                getElem.setAttribute("geometry", "false");
-            }
-          
-            if (request.get_feature.compact) {
-                getElem.setAttribute("compact", request.get_feature.compact);
-            }
-          
-            if (request.get_feature.featurelimit == "number") {
-                getElem.setAttribute("featurelimit", request.get_feature.featurelimit);
-            }
-          
-            getElem.setAttribute("globalenvelope", "true");
-            reqElem.appendChild(getElem);
-          
-            if (request.get_feature.layer != null && request.get_feature.layer.length > 0) {
-                var lyrElem = this.createElementNS("", "LAYER");
-                lyrElem.setAttribute("id", request.get_feature.layer);
-                getElem.appendChild(lyrElem);
-            }
-          
-            var fquery = request.get_feature.query;
-            if (fquery != null) {
-                var qElem = null;
-                if (fquery.isspatial) {
-                    qElem = this.createElementNS("", "SPATIALQUERY");
-                } else {
-                    qElem = this.createElementNS("", "QUERY");
-                }
-                getElem.appendChild(qElem);
-                
-                if (typeof fquery.accuracy == "number") {
-                    qElem.setAttribute("accuracy", fquery.accuracy);
-                }
-                //qElem.setAttribute("featurelimit", "5");
-            
-                if (fquery.featurecoordsys != null) {
-                    var fcsElem1 = this.createElementNS("", "FEATURECOORDSYS");
-              
-                    if (fquery.featurecoordsys.id == 0) {
-                        fcsElem1.setAttribute("string", fquery.featurecoordsys.string);
-                    } else {
-                        fcsElem1.setAttribute("id", fquery.featurecoordsys.id);
-                    }
-                    qElem.appendChild(fcsElem1);
-                }
-            
-                if (fquery.filtercoordsys != null) {
-                    var fcsElem2 = this.createElementNS("", "FILTERCOORDSYS");
-              
-                    if (fquery.filtercoordsys.id === 0) {
-                        fcsElem2.setAttribute("string", fquery.filtercoordsys.string);
-                    } else {
-                        fcsElem2.setAttribute("id", fquery.filtercoordsys.id);
-                    }
-                    qElem.appendChild(fcsElem2);
-                }
-            
-                if (fquery.buffer > 0) {   
-                    var bufElem = this.createElementNS("", "BUFFER");
-                    bufElem.setAttribute("distance", fquery.buffer);
-                    qElem.appendChild(bufElem);
-                }
-            
-                if (fquery.isspatial) {
-                    var spfElem = this.createElementNS("", "SPATIALFILTER");
-                    spfElem.setAttribute("relation", fquery.spatialfilter.relation);
-                    qElem.appendChild(spfElem);
-              
-                    if (fquery.spatialfilter.envelope) {
-                        var envElem = this.createElementNS("", "ENVELOPE"); 
-                        envElem.setAttribute("minx", fquery.spatialfilter.envelope.minx);
-                        envElem.setAttribute("miny", fquery.spatialfilter.envelope.miny);
-                        envElem.setAttribute("maxx", fquery.spatialfilter.envelope.maxx);
-                        envElem.setAttribute("maxy", fquery.spatialfilter.envelope.maxy);
-                        spfElem.appendChild(envElem);
-                    } else if(typeof fquery.spatialfilter.polygon == "object") {
-                        spfElem.appendChild(this.writePolygonGeometry(fquery.spatialfilter.polygon));                
-                    }
-                }
-            
-                if (fquery.where != null && fquery.where.length > 0) {
-                    qElem.setAttribute("where", fquery.where);
-                }
-            }
-        }
-
-        root.appendChild(reqElem);
-
-        return OpenLayers.Format.XML.prototype.write.apply(this, [root]);
-    },
-    
-    
-    addGroupRenderer: function(ldef, toprenderer) {
-        var topRelem = this.createElementNS("", "GROUPRENDERER");
-        ldef.appendChild(topRelem);
-      
-        for (var rind = 0; rind < toprenderer.length; rind++) {
-            var renderer = toprenderer[rind];
-            this.addRenderer(topRelem, renderer);
-        }
-    },
-    
-    
-    addRenderer: function(topRelem, renderer) {
-        if (OpenLayers.Util.isArray(renderer)) {
-            this.addGroupRenderer(topRelem, renderer);
-        } else {
-            var renderElem = this.createElementNS("", renderer.type.toUpperCase() + "RENDERER");
-            topRelem.appendChild(renderElem);
-          
-            if (renderElem.tagName == "VALUEMAPRENDERER") {
-                this.addValueMapRenderer(renderElem, renderer);
-            } else if (renderElem.tagName == "VALUEMAPLABELRENDERER") {
-                this.addValueMapLabelRenderer(renderElem, renderer);
-            } else if (renderElem.tagName == "SIMPLELABELRENDERER") {
-                this.addSimpleLabelRenderer(renderElem, renderer);
-            } else if (renderElem.tagName == "SCALEDEPENDENTRENDERER") {
-                this.addScaleDependentRenderer(renderElem, renderer);
-            }
-        }             
-    },
-    
-    
-    addScaleDependentRenderer: function(renderElem, renderer) {
-        if (typeof renderer.lower == "string" || typeof renderer.lower == "number") {
-            renderElem.setAttribute("lower", renderer.lower);
-        }
-        if (typeof renderer.upper == "string" || typeof renderer.upper == "number") {
-            renderElem.setAttribute("upper", renderer.upper);
-        }
-        
-        this.addRenderer(renderElem, renderer.renderer);
-    },
-    
-    
-    addValueMapLabelRenderer: function(renderElem, renderer) {
-        renderElem.setAttribute("lookupfield", renderer.lookupfield);
-        renderElem.setAttribute("labelfield", renderer.labelfield);
-      
-        if (typeof renderer.exacts == "object") {
-            for (var ext=0, extlen=renderer.exacts.length; ext<extlen; ext++) {
-                var exact = renderer.exacts[ext];
-          
-                var eelem = this.createElementNS("", "EXACT");
-          
-                if (typeof exact.value == "string") {
-                    eelem.setAttribute("value", exact.value);
-                }
-                if (typeof exact.label == "string") {
-                    eelem.setAttribute("label", exact.label);
-                }
-                if (typeof exact.method == "string") {
-                    eelem.setAttribute("method", exact.method);
-                }
-
-                renderElem.appendChild(eelem);
-            
-                if (typeof exact.symbol == "object") {
-                    var selem = null;
-                
-                    if (exact.symbol.type == "text") {
-                        selem = this.createElementNS("", "TEXTSYMBOL");
-                    }
-                
-                    if (selem != null) {
-                        var keys = this.fontStyleKeys;
-                        for (var i = 0, len = keys.length; i < len; i++) {
-                            var key = keys[i];
-                            if (exact.symbol[key]) {
-                                selem.setAttribute(key, exact.symbol[key]);
-                            }
-                        }    
-                        eelem.appendChild(selem);
-                    }
-                }
-            } // for each exact
-        }      
-    },
-    
-    addValueMapRenderer: function(renderElem, renderer) {
-        renderElem.setAttribute("lookupfield", renderer.lookupfield);
-        
-        if (typeof renderer.ranges == "object") {
-            for(var rng=0, rnglen=renderer.ranges.length; rng<rnglen; rng++) {
-                var range = renderer.ranges[rng];
-                
-                var relem = this.createElementNS("", "RANGE");
-                relem.setAttribute("lower", range.lower);
-                relem.setAttribute("upper", range.upper);
-                
-                renderElem.appendChild(relem);
-                
-                if (typeof range.symbol == "object") {
-                    var selem = null;
-              
-                    if (range.symbol.type == "simplepolygon") {
-                        selem = this.createElementNS("", "SIMPLEPOLYGONSYMBOL");
-                    }
-              
-                    if (selem != null) {
-                        if (typeof range.symbol.boundarycolor == "string") {
-                            selem.setAttribute("boundarycolor", range.symbol.boundarycolor);
-                        }
-                        if (typeof range.symbol.fillcolor == "string") {
-                            selem.setAttribute("fillcolor", range.symbol.fillcolor);
-                        }
-                        if (typeof range.symbol.filltransparency == "number") {
-                            selem.setAttribute("filltransparency", range.symbol.filltransparency);
-                        }
-                        relem.appendChild(selem);
-                    }   
-                }
-            } // for each range
-        } else if (typeof renderer.exacts == "object") {
-            for (var ext=0, extlen=renderer.exacts.length; ext<extlen; ext++) {
-                var exact = renderer.exacts[ext];
-          
-                var eelem = this.createElementNS("", "EXACT");
-                if (typeof exact.value == "string") {
-                    eelem.setAttribute("value", exact.value);
-                }
-                if (typeof exact.label == "string") {
-                    eelem.setAttribute("label", exact.label);
-                }
-                if (typeof exact.method == "string") {
-                    eelem.setAttribute("method", exact.method);
-                }
-            
-                renderElem.appendChild(eelem);
-            
-                if (typeof exact.symbol == "object") {
-                    var selem = null;
-            
-                    if (exact.symbol.type == "simplemarker") {
-                        selem = this.createElementNS("", "SIMPLEMARKERSYMBOL");
-                    }
-            
-                    if (selem != null) {
-                        if (typeof exact.symbol.antialiasing == "string") {
-                            selem.setAttribute("antialiasing", exact.symbol.antialiasing);
-                        }
-                        if (typeof exact.symbol.color == "string") {
-                            selem.setAttribute("color", exact.symbol.color);
-                        }
-                        if (typeof exact.symbol.outline == "string") {
-                            selem.setAttribute("outline", exact.symbol.outline);
-                        }
-                        if (typeof exact.symbol.overlap == "string") {
-                            selem.setAttribute("overlap", exact.symbol.overlap);
-                        }
-                        if (typeof exact.symbol.shadow == "string") {
-                            selem.setAttribute("shadow", exact.symbol.shadow);
-                        }
-                        if (typeof exact.symbol.transparency == "number") {
-                            selem.setAttribute("transparency", exact.symbol.transparency);
-                        }
-                        //if (typeof exact.symbol.type == "string")
-                        //    selem.setAttribute("type", exact.symbol.type);
-                        if (typeof exact.symbol.usecentroid == "string") {
-                            selem.setAttribute("usecentroid", exact.symbol.usecentroid);
-                        }
-                        if (typeof exact.symbol.width == "number") {
-                            selem.setAttribute("width", exact.symbol.width);
-                        }
-                
-                        eelem.appendChild(selem);
-                    }
-                }
-            } // for each exact
-        }
-    },
-    
-    
-    addSimpleLabelRenderer: function(renderElem, renderer) {
-        renderElem.setAttribute("field", renderer.field);
-        var keys = ['featureweight', 'howmanylabels', 'labelbufferratio', 
-                    'labelpriorities', 'labelweight', 'linelabelposition',
-                    'rotationalangles'];
-        for (var i=0, len=keys.length; i<len; i++) {
-            var key = keys[i];
-            if (renderer[key]) {
-                renderElem.setAttribute(key, renderer[key]);
-            }
-        }     
-           
-        if (renderer.symbol.type == "text") {
-            var symbol = renderer.symbol;
-            var selem = this.createElementNS("", "TEXTSYMBOL");
-            renderElem.appendChild(selem);
-          
-            var keys = this.fontStyleKeys;
-            for (var i=0, len=keys.length; i<len; i++) {
-                var key = keys[i];
-                if (symbol[key]) {
-                    selem.setAttribute(key, renderer[key]);
-                }
-            }    
-        }    
-    },
-    
-    writePolygonGeometry: function(polygon) {
-        if (!(polygon instanceof OpenLayers.Geometry.Polygon)) {
-            throw { 
-                message:'Cannot write polygon geometry to ArcXML with an ' +
-                    polygon.CLASS_NAME + ' object.',
-                geometry: polygon
-            };
-        }
-        
-        var polyElem = this.createElementNS("", "POLYGON");
-      
-        for (var ln=0, lnlen=polygon.components.length; ln<lnlen; ln++) {
-            var ring = polygon.components[ln];
-            var ringElem = this.createElementNS("", "RING");
-        
-            for (var rn=0, rnlen=ring.components.length; rn<rnlen; rn++) {
-                var point = ring.components[rn];
-                var pointElem = this.createElementNS("", "POINT");
-            
-                pointElem.setAttribute("x", point.x);
-                pointElem.setAttribute("y", point.y);
-            
-                ringElem.appendChild(pointElem);
-            }
-        
-            polyElem.appendChild(ringElem);
-        }
-      
-        return polyElem;
-    },
-    
-    /**
-     * Method: parseResponse
-     * Take an ArcXML response, and parse in into this object's internal properties.
-     *
-     * Parameters:
-     * data - {String} or {DOMElement} The ArcXML response, as either a string or the
-     * top level DOMElement of the response.
-     */
-    parseResponse: function(data) {
-        if(typeof data == "string") { 
-            var newData = new OpenLayers.Format.XML();
-            data = newData.read(data);
-        }
-        var response = new OpenLayers.Format.ArcXML.Response();
-        
-        var errorNode = data.getElementsByTagName("ERROR");
-        
-        if (errorNode != null && errorNode.length > 0) {
-            response.error = this.getChildValue(errorNode, "Unknown error.");
-        } else {
-            var responseNode = data.getElementsByTagName("RESPONSE");
-          
-            if (responseNode == null || responseNode.length == 0) {
-                response.error = "No RESPONSE tag found in ArcXML response.";
-                return response;
-            }
-          
-            var rtype = responseNode[0].firstChild.nodeName;
-            if (rtype == "#text") {
-                rtype = responseNode[0].firstChild.nextSibling.nodeName;
-            }
-          
-            if (rtype == "IMAGE") {
-                var envelopeNode = data.getElementsByTagName("ENVELOPE");
-                var outputNode = data.getElementsByTagName("OUTPUT");
-                
-                if (envelopeNode == null || envelopeNode.length == 0) {
-                    response.error = "No ENVELOPE tag found in ArcXML response.";
-                } else if (outputNode == null || outputNode.length == 0) {
-                    response.error = "No OUTPUT tag found in ArcXML response.";
-                } else {
-                    var envAttr = this.parseAttributes(envelopeNode[0]);            
-                    var outputAttr = this.parseAttributes(outputNode[0]);
-                  
-                    if (typeof outputAttr.type == "string") {
-                        response.image = { 
-                            envelope: envAttr, 
-                            output: { 
-                                type: outputAttr.type, 
-                                data: this.getChildValue(outputNode[0])
-                            }
-                        };
-                    } else {
-                        response.image = { envelope: envAttr, output: outputAttr };
-                    }
-                }
-            } else if (rtype == "FEATURES") {
-                var features = responseNode[0].getElementsByTagName("FEATURES");
-            
-                // get the feature count
-                var featureCount = features[0].getElementsByTagName("FEATURECOUNT");
-                response.features.featurecount = featureCount[0].getAttribute("count");
-            
-                if (response.features.featurecount > 0) {
-                    // get the feature envelope
-                    var envelope = features[0].getElementsByTagName("ENVELOPE");
-                    response.features.envelope = this.parseAttributes(envelope[0], typeof(0));
-
-                    // get the field values per feature
-                    var featureList = features[0].getElementsByTagName("FEATURE");
-                    for (var fn = 0; fn < featureList.length; fn++) {
-                        var feature = new OpenLayers.Feature.Vector();
-                        var fields = featureList[fn].getElementsByTagName("FIELD");
-
-                        for (var fdn = 0; fdn < fields.length; fdn++) {
-                            var fieldName = fields[fdn].getAttribute("name");
-                            var fieldValue = fields[fdn].getAttribute("value");
-                            feature.attributes[ fieldName ] = fieldValue;
-                        }
-
-                        var geom = featureList[fn].getElementsByTagName("POLYGON");
-
-                        if (geom.length > 0) {
-                            // if there is a polygon, create an openlayers polygon, and assign
-                            // it to the .geometry property of the feature
-                            var ring = geom[0].getElementsByTagName("RING");
-
-                            var polys = [];
-                            for (var rn = 0; rn < ring.length; rn++) {
-                                var linearRings = [];
-                                linearRings.push(this.parsePointGeometry(ring[rn]));
-
-                                var holes = ring[rn].getElementsByTagName("HOLE");
-                                for (var hn = 0; hn < holes.length; hn++) {
-                                    linearRings.push(this.parsePointGeometry(holes[hn]));
-                                }
-                                holes = null;
-                                polys.push(new OpenLayers.Geometry.Polygon(linearRings));
-                                linearRings = null;
-                            }
-                            ring = null;
-                          
-                            if (polys.length == 1) {
-                                feature.geometry = polys[0];
-                            } else
-                            {
-                                feature.geometry = new OpenLayers.Geometry.MultiPolygon(polys);
-                            }
-                        }
-
-                        response.features.feature.push(feature);
-                    }
-                }
-            } else {
-                response.error = "Unidentified response type.";
-            }
-        }
-        return response;
-    },
-    
-    
-    /**
-     * Method: parseAttributes
-     *
-     * Parameters:
-     * node - {<DOMElement>} An element to parse attributes from.
-     *
-     * Returns:
-     * {Object} An attributes object, with properties set to attribute values.
-     */
-    parseAttributes: function(node,type) {
-        var attributes = {};
-        for(var attr = 0; attr < node.attributes.length; attr++) {
-            if (type == "number") {
-                attributes[node.attributes[attr].nodeName] = parseFloat(node.attributes[attr].nodeValue);
-            } else {
-                attributes[node.attributes[attr].nodeName] = node.attributes[attr].nodeValue;
-            }
-        }
-        return attributes;
-    },
-    
-    
-    /**
-     * Method: parsePointGeometry
-     *
-     * Parameters:
-     * node - {<DOMElement>} An element to parse <COORDS> or <POINT> arcxml data from.
-     *
-     * Returns:
-     * {<OpenLayers.Geometry.LinearRing>} A linear ring represented by the node's points.
-     */
-    parsePointGeometry: function(node) {
-        var ringPoints = [];
-        var coords = node.getElementsByTagName("COORDS");
-
-        if (coords.length > 0) {
-            // if coords is present, it's the only coords item
-            var coordArr = this.getChildValue(coords[0]);
-            coordArr = coordArr.split(/;/);
-            for (var cn = 0; cn < coordArr.length; cn++) {
-                var coordItems = coordArr[cn].split(/ /);
-                ringPoints.push(new OpenLayers.Geometry.Point(coordItems[0], coordItems[1]));
-            }
-            coords = null;
-        } else {
-            var point = node.getElementsByTagName("POINT");
-            if (point.length > 0) {
-                for (var pn = 0; pn < point.length; pn++) {
-                    ringPoints.push(
-                        new OpenLayers.Geometry.Point(
-                            parseFloat(point[pn].getAttribute("x")),
-                            parseFloat(point[pn].getAttribute("y"))
-                        )
-                    );
-                }
-            }
-            point = null;
-        }
-
-        return new OpenLayers.Geometry.LinearRing(ringPoints);      
-    },
-    
-    CLASS_NAME: "OpenLayers.Format.ArcXML" 
-});
-
-OpenLayers.Format.ArcXML.Request = OpenLayers.Class({
-    initialize: function(params) {
-        var defaults = {
-            get_image: {
-                properties: {
-                    background: null,
-                    /*{ 
-                        color: { r:255, g:255, b:255 },
-                        transcolor: null
-                    },*/
-                    draw: true,
-                    envelope: {
-                        minx: 0, 
-                        miny: 0, 
-                        maxx: 0, 
-                        maxy: 0
-                    },
-                    featurecoordsys: { 
-                        id:0, 
-                        string:"",
-                        datumtransformid:0,
-                        datumtransformstring:""
-                    },
-                    filtercoordsys:{
-                        id:0,
-                        string:"",
-                        datumtransformid:0,
-                        datumtransformstring:""
-                    },
-                    imagesize:{
-                        height:0,
-                        width:0,
-                        dpi:96,
-                        printheight:0,
-                        printwidth:0,
-                        scalesymbols:false
-                    },
-                    layerlist:[],
-                    /* no support for legends */
-                    output:{
-                        baseurl:"",
-                        legendbaseurl:"",
-                        legendname:"",
-                        legendpath:"",
-                        legendurl:"",
-                        name:"",
-                        path:"",
-                        type:"jpg",
-                        url:""
-                    }
-                }
-            },
-
-            get_feature: {
-                layer: "",
-                query: {
-                    isspatial: false,
-                    featurecoordsys: {
-                        id:0,
-                        string:"",
-                        datumtransformid:0,
-                        datumtransformstring:""
-                    },
-                    filtercoordsys: {
-                        id:0,
-                        string:"",
-                        datumtransformid:0,
-                        datumtransformstring:""
-                    },
-                    buffer:0,
-                    where:"",
-                    spatialfilter: {
-                        relation: "envelope_intersection",
-                        envelope: null
-                    }
-                }
-            },
-      
-            environment: {
-                separators: {
-                    cs:" ",
-                    ts:";"
-                }
-            },
-      
-            layer: [],
-            workspaces: []
-        };
-      
-        return OpenLayers.Util.extend(this, defaults);      
-    },
-  
-    CLASS_NAME: "OpenLayers.Format.ArcXML.Request"
-});
-
-OpenLayers.Format.ArcXML.Response = OpenLayers.Class({  
-    initialize: function(params) {
-        var defaults = {
-            image: {
-                envelope:null,
-                output:''
-            },
-      
-            features: {
-                featurecount: 0,
-                envelope: null,
-                feature: []
-            },
-      
-            error:''
-        };
-  
-        return OpenLayers.Util.extend(this, defaults);
-    },
-  
-    CLASS_NAME: "OpenLayers.Format.ArcXML.Response"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/ArcXML/Features.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/ArcXML/Features.js
deleted file mode 100644
index 5b8730d9..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/ArcXML/Features.js
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/ArcXML.js
- */
-
-/**
- * Class: OpenLayers.Format.ArcXML.Features
- * Read/Write ArcXML features. Create a new instance with the 
- *     <OpenLayers.Format.ArcXML.Features> constructor.
- * 
- * Inherits from:
- *  - <OpenLayers.Format.XML>
- */
-OpenLayers.Format.ArcXML.Features = OpenLayers.Class(OpenLayers.Format.XML, {
-
-    /**
-     * Constructor: OpenLayers.Format.ArcXML.Features
-     * Create a new parser/writer for ArcXML Features.  Create an instance of this class
-     * to get a set of features from an ArcXML response.
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be set on
-     *     this instance.
-     */
-    
-    /**
-     * APIMethod: read
-     * Read data from a string of ArcXML, and return a set of OpenLayers features. 
-     * 
-     * Parameters:
-     * data - {String} or {DOMElement} data to read/parse.
-     *
-     * Returns:
-     * {Array(<OpenLayers.Feature.Vector>)} A collection of features.
-     */
-    read: function(data) {
-        var axl = new OpenLayers.Format.ArcXML();
-        var parsed = axl.read(data);
-        
-        return parsed.features.feature;
-    }
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/Atom.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/Atom.js
deleted file mode 100644
index 8eb57922..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/Atom.js
+++ /dev/null
@@ -1,712 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/XML.js
- * @requires OpenLayers/Format/GML/v3.js
- * @requires OpenLayers/Feature/Vector.js
- */
-
-/**
- * Class: OpenLayers.Format.Atom
- * Read/write Atom feeds. Create a new instance with the
- *     <OpenLayers.Format.AtomFeed> constructor.
- *
- * Inherits from:
- *  - <OpenLayers.Format.XML>
- */
-OpenLayers.Format.Atom = OpenLayers.Class(OpenLayers.Format.XML, {
-    
-    /**
-     * Property: namespaces
-     * {Object} Mapping of namespace aliases to namespace URIs.  Properties
-     *     of this object should not be set individually.  Read-only.  All
-     *     XML subclasses should have their own namespaces object.  Use
-     *     <setNamespace> to add or set a namespace alias after construction.
-     */
-    namespaces: {
-        atom: "http://www.w3.org/2005/Atom",
-        georss: "http://www.georss.org/georss"
-    },
-    
-    /**
-     * APIProperty: feedTitle
-     * {String} Atom feed elements require a title.  Default is "untitled".
-     */
-    feedTitle: "untitled",
-
-    /**
-     * APIProperty: defaultEntryTitle
-     * {String} Atom entry elements require a title.  In cases where one is
-     *     not provided in the feature attributes, this will be used.  Default
-     *     is "untitled".
-     */
-    defaultEntryTitle: "untitled",
-
-    /**
-     * Property: gmlParse
-     * {Object} GML Format object for parsing features
-     * Non-API and only created if necessary
-     */
-    gmlParser: null,
-    
-    /**
-     * APIProperty: xy
-     * {Boolean} Order of the GML coordinate: true:(x,y) or false:(y,x)
-     * For GeoRSS the default is (y,x), therefore: false
-     */
-    xy: false,
-    
-    /**
-     * Constructor: OpenLayers.Format.AtomEntry
-     * Create a new parser for Atom.
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be set on
-     *     this instance.
-     */
-    
-    /**
-     * APIMethod: read
-     * Return a list of features from an Atom feed or entry document.
-     
-     * Parameters:
-     * doc - {Element} or {String}
-     *
-     * Returns:
-     * Array({<OpenLayers.Feature.Vector>})
-     */
-    read: function(doc) {
-        if (typeof doc == "string") {
-            doc = OpenLayers.Format.XML.prototype.read.apply(this, [doc]);
-        }
-        return this.parseFeatures(doc);
-    },
-    
-    /**
-     * APIMethod: write
-     * Serialize or more feature nodes to Atom documents.
-     *
-     * Parameters:
-     * features - {<OpenLayers.Feature.Vector>} or Array({<OpenLayers.Feature.Vector>})
-     *
-     * Returns:
-     * {String} an Atom entry document if passed one feature node, or a feed
-     * document if passed an array of feature nodes.
-     */
-    write: function(features) {
-        var doc;
-        if (OpenLayers.Util.isArray(features)) {
-            doc = this.createElementNSPlus("atom:feed");
-            doc.appendChild(
-                this.createElementNSPlus("atom:title", {
-                    value: this.feedTitle
-                })
-            );
-            for (var i=0, ii=features.length; i<ii; i++) {
-                doc.appendChild(this.buildEntryNode(features[i]));
-            }
-        }
-        else {
-            doc = this.buildEntryNode(features);
-        }
-        return OpenLayers.Format.XML.prototype.write.apply(this, [doc]);
-    },
-    
-    /**
-     * Method: buildContentNode
-     *
-     * Parameters:
-     * content - {Object}
-     *
-     * Returns:
-     * {DOMElement} an Atom content node.
-     *
-     * TODO: types other than text.
-     */
-    buildContentNode: function(content) {
-        var node = this.createElementNSPlus("atom:content", {
-            attributes: {
-                type: content.type || null
-            }
-        });
-        if (content.src) {
-            node.setAttribute("src", content.src);
-        } else {
-            if (content.type == "text" || content.type == null) {
-                node.appendChild(
-                    this.createTextNode(content.value)
-                );
-            } else if (content.type == "html") {
-                if (typeof content.value != "string") {
-                    throw "HTML content must be in form of an escaped string";
-                }
-                node.appendChild(
-                    this.createTextNode(content.value)
-                );
-            } else if (content.type == "xhtml") {
-                node.appendChild(content.value);
-            } else if (content.type == "xhtml" ||
-                           content.type.match(/(\+|\/)xml$/)) {
-                node.appendChild(content.value);
-            }
-            else { // MUST be a valid Base64 encoding
-                node.appendChild(
-                    this.createTextNode(content.value)
-                );
-            }
-        }
-        return node;
-    },
-    
-    /**
-     * Method: buildEntryNode
-     * Build an Atom entry node from a feature object.
-     *
-     * Parameters:
-     * feature - {<OpenLayers.Feature.Vector>}
-     *
-     * Returns:
-     * {DOMElement} an Atom entry node.
-     *
-     * These entries are geared for publication using AtomPub.
-     *
-     * TODO: support extension elements
-     */
-    buildEntryNode: function(feature) {
-        var attrib = feature.attributes;
-        var atomAttrib = attrib.atom || {};
-        var entryNode = this.createElementNSPlus("atom:entry");
-        
-        // atom:author
-        if (atomAttrib.authors) {
-            var authors = OpenLayers.Util.isArray(atomAttrib.authors) ?
-                atomAttrib.authors : [atomAttrib.authors];
-            for (var i=0, ii=authors.length; i<ii; i++) {
-                entryNode.appendChild(
-                    this.buildPersonConstructNode(
-                        "author", authors[i]
-                    )
-                );
-            }
-        }
-        
-        // atom:category
-        if (atomAttrib.categories) {
-            var categories = OpenLayers.Util.isArray(atomAttrib.categories) ?
-                atomAttrib.categories : [atomAttrib.categories];
-            var category;
-            for (var i=0, ii=categories.length; i<ii; i++) {
-                category = categories[i];
-                entryNode.appendChild(
-                    this.createElementNSPlus("atom:category", {
-                        attributes: {
-                            term: category.term,
-                            scheme: category.scheme || null,
-                            label: category.label || null
-                        }
-                    })
-                );
-            }
-        }
-        
-        // atom:content
-        if (atomAttrib.content) {
-            entryNode.appendChild(this.buildContentNode(atomAttrib.content));
-        }
-        
-        // atom:contributor
-        if (atomAttrib.contributors) {
-            var contributors = OpenLayers.Util.isArray(atomAttrib.contributors) ?
-                atomAttrib.contributors : [atomAttrib.contributors];
-            for (var i=0, ii=contributors.length; i<ii; i++) {
-                entryNode.appendChild(
-                    this.buildPersonConstructNode(
-                        "contributor",
-                        contributors[i]
-                        )
-                    );
-            }
-        }
-        
-        // atom:id
-        if (feature.fid) {
-            entryNode.appendChild(
-                this.createElementNSPlus("atom:id", {
-                    value: feature.fid
-                })
-            );
-        }
-        
-        // atom:link
-        if (atomAttrib.links) {
-            var links = OpenLayers.Util.isArray(atomAttrib.links) ?
-                atomAttrib.links : [atomAttrib.links];
-            var link;
-            for (var i=0, ii=links.length; i<ii; i++) {
-                link = links[i];
-                entryNode.appendChild(
-                    this.createElementNSPlus("atom:link", {
-                        attributes: {
-                            href: link.href,
-                            rel: link.rel || null,
-                            type: link.type || null,
-                            hreflang: link.hreflang || null,
-                            title: link.title || null,
-                            length: link.length || null
-                        }
-                    })
-                );
-            }
-        }
-        
-        // atom:published
-        if (atomAttrib.published) {
-            entryNode.appendChild(
-                this.createElementNSPlus("atom:published", {
-                    value: atomAttrib.published
-                })
-            );
-        }
-        
-        // atom:rights
-        if (atomAttrib.rights) {
-            entryNode.appendChild(
-                this.createElementNSPlus("atom:rights", {
-                    value: atomAttrib.rights
-                })
-            );
-        }
-        
-        // atom:source not implemented
-        
-        // atom:summary
-        if (atomAttrib.summary || attrib.description) {
-            entryNode.appendChild(
-                this.createElementNSPlus("atom:summary", {
-                    value: atomAttrib.summary || attrib.description
-                })
-            );
-        }
-        
-        // atom:title
-        entryNode.appendChild(
-            this.createElementNSPlus("atom:title", {
-                value: atomAttrib.title || attrib.title || this.defaultEntryTitle
-            })
-        );
-        
-        // atom:updated
-        if (atomAttrib.updated) {
-            entryNode.appendChild(
-                this.createElementNSPlus("atom:updated", {
-                    value: atomAttrib.updated
-                })
-            );
-        }
-        
-        // georss:where
-        if (feature.geometry) {
-            var whereNode = this.createElementNSPlus("georss:where");
-            whereNode.appendChild(
-                this.buildGeometryNode(feature.geometry)
-            );
-            entryNode.appendChild(whereNode);
-        }
-        
-        return entryNode;
-    },
-    
-    /**
-     * Method: initGmlParser
-     * Creates a GML parser.
-     */
-    initGmlParser: function() {
-        this.gmlParser = new OpenLayers.Format.GML.v3({
-            xy: this.xy,
-            featureNS: "http://example.com#feature",
-            internalProjection: this.internalProjection,
-            externalProjection: this.externalProjection
-        });
-    },
-    
-    /**
-     * Method: buildGeometryNode
-     * builds a GeoRSS node with a given geometry
-     *
-     * Parameters:
-     * geometry - {<OpenLayers.Geometry>}
-     *
-     * Returns:
-     * {DOMElement} A gml node.
-     */
-    buildGeometryNode: function(geometry) {
-        if (!this.gmlParser) {
-            this.initGmlParser();
-        }
-        var node = this.gmlParser.writeNode("feature:_geometry", geometry);
-        return node.firstChild;
-    },
-    
-    /**
-     * Method: buildPersonConstructNode
-     *
-     * Parameters:
-     * name - {String}
-     * value - {Object}
-     *
-     * Returns:
-     * {DOMElement} an Atom person construct node.
-     *
-     * Example:
-     * >>> buildPersonConstructNode("author", {name: "John Smith"})
-     * {<author><name>John Smith</name></author>}
-     *
-     * TODO: how to specify extension elements? Add to the oNames array?
-     */
-    buildPersonConstructNode: function(name, value) {
-        var oNames = ["uri", "email"];
-        var personNode = this.createElementNSPlus("atom:" + name);
-        personNode.appendChild(
-            this.createElementNSPlus("atom:name", {
-                value: value.name
-            })
-        );
-        for (var i=0, ii=oNames.length; i<ii; i++) {
-            if (value[oNames[i]]) {
-                personNode.appendChild(
-                    this.createElementNSPlus("atom:" + oNames[i], {
-                        value: value[oNames[i]]
-                    })
-                );
-            }
-        }
-        return personNode;
-    },
-    
-    /**
-     * Method: getFirstChildValue
-     *
-     * Parameters:
-     * node - {DOMElement}
-     * nsuri - {String} Child node namespace uri ("*" for any).
-     * name - {String} Child node name.
-     * def - {String} Optional string default to return if no child found.
-     *
-     * Returns:
-     * {String} The value of the first child with the given tag name.  Returns
-     *     default value or empty string if none found.
-     */
-    getFirstChildValue: function(node, nsuri, name, def) {
-        var value;
-        var nodes = this.getElementsByTagNameNS(node, nsuri, name);
-        if (nodes && nodes.length > 0) {
-            value = this.getChildValue(nodes[0], def);
-        } else {
-            value = def;
-        }
-        return value;
-    },
-    
-    /**
-     * Method: parseFeature
-     * Parse feature from an Atom entry node..
-     *
-     * Parameters:
-     * node - {DOMElement} An Atom entry or feed node.
-     *
-     * Returns:
-     * {<OpenLayers.Feature.Vector>}
-     */
-    parseFeature: function(node) {
-        var atomAttrib = {};
-        var value = null;
-        var nodes = null;
-        var attval = null;
-        var atomns = this.namespaces.atom;
-        
-        // atomAuthor*
-        this.parsePersonConstructs(node, "author", atomAttrib);
-        
-        // atomCategory*
-        nodes = this.getElementsByTagNameNS(node, atomns, "category");
-        if (nodes.length > 0) {
-            atomAttrib.categories = [];
-        }
-        for (var i=0, ii=nodes.length; i<ii; i++) {
-            value = {};
-            value.term = nodes[i].getAttribute("term");
-            attval = nodes[i].getAttribute("scheme");
-            if (attval) { value.scheme = attval; }
-            attval = nodes[i].getAttribute("label");
-            if (attval) { value.label = attval; }
-            atomAttrib.categories.push(value);
-        }
-        
-        // atomContent?
-        nodes = this.getElementsByTagNameNS(node, atomns, "content");
-        if (nodes.length > 0) {
-            value = {};
-            attval = nodes[0].getAttribute("type");
-            if (attval) {
-                value.type = attval;
-            }
-            attval = nodes[0].getAttribute("src");
-            if (attval) {
-                value.src = attval;
-            } else {
-                if (value.type == "text" || 
-                    value.type == "html" || 
-                    value.type == null ) {
-                    value.value = this.getFirstChildValue(
-                                        node,
-                                        atomns,
-                                        "content",
-                                        null
-                                        );
-                } else if (value.type == "xhtml" ||
-                           value.type.match(/(\+|\/)xml$/)) {
-                    value.value = this.getChildEl(nodes[0]);
-                } else { // MUST be base64 encoded
-                    value.value = this.getFirstChildValue(
-                                        node,
-                                        atomns,
-                                        "content",
-                                        null
-                                        );
-                }
-                atomAttrib.content = value;
-            }
-        }
-        
-        // atomContributor*
-        this.parsePersonConstructs(node, "contributor", atomAttrib);
-        
-        // atomId
-        atomAttrib.id = this.getFirstChildValue(node, atomns, "id", null);
-        
-        // atomLink*
-        nodes = this.getElementsByTagNameNS(node, atomns, "link");
-        if (nodes.length > 0) {
-            atomAttrib.links = new Array(nodes.length);
-        }
-        var oAtts = ["rel", "type", "hreflang", "title", "length"];
-        for (var i=0, ii=nodes.length; i<ii; i++) {
-            value = {};
-            value.href = nodes[i].getAttribute("href");
-            for (var j=0, jj=oAtts.length; j<jj; j++) {
-                attval = nodes[i].getAttribute(oAtts[j]);
-                if (attval) {
-                    value[oAtts[j]] = attval;
-                }
-            }
-            atomAttrib.links[i] = value;
-        }
-        
-        // atomPublished?
-        value = this.getFirstChildValue(node, atomns, "published", null);
-        if (value) {
-            atomAttrib.published = value;
-        }
-        
-        // atomRights?
-        value = this.getFirstChildValue(node, atomns, "rights", null);
-        if (value) {
-            atomAttrib.rights = value;
-        }
-        
-        // atomSource? -- not implemented
-        
-        // atomSummary?
-        value = this.getFirstChildValue(node, atomns, "summary", null);
-        if (value) {
-            atomAttrib.summary = value;
-        }
-        
-        // atomTitle
-        atomAttrib.title = this.getFirstChildValue(
-                                node, atomns, "title", null
-                                );
-        
-        // atomUpdated
-        atomAttrib.updated = this.getFirstChildValue(
-                                node, atomns, "updated", null
-                                );
-        
-        var featureAttrib = {
-            title: atomAttrib.title,
-            description: atomAttrib.summary,
-            atom: atomAttrib
-        };
-        var geometry = this.parseLocations(node)[0];
-        var feature = new OpenLayers.Feature.Vector(geometry, featureAttrib);
-        feature.fid = atomAttrib.id;
-        return feature;
-    },
-    
-    /**
-     * Method: parseFeatures
-     * Return features from an Atom entry or feed.
-     *
-     * Parameters:
-     * node - {DOMElement} An Atom entry or feed node.
-     *
-     * Returns:
-     * Array({<OpenLayers.Feature.Vector>})
-     */
-    parseFeatures: function(node) {
-        var features = [];
-        var entries = this.getElementsByTagNameNS(
-            node, this.namespaces.atom, "entry"
-        );
-        if (entries.length == 0) {
-            entries = [node];
-        }
-        for (var i=0, ii=entries.length; i<ii; i++) {
-            features.push(this.parseFeature(entries[i]));
-        }
-        return features;
-    },
-    
-    /**
-     * Method: parseLocations
-     * Parse the locations from an Atom entry or feed.
-     *
-     * Parameters:
-     * node - {DOMElement} An Atom entry or feed node.
-     *
-     * Returns:
-     * Array({<OpenLayers.Geometry>})
-     */
-    parseLocations: function(node) {
-        var georssns = this.namespaces.georss;
-
-        var locations = {components: []};
-        var where = this.getElementsByTagNameNS(node, georssns, "where");
-        if (where && where.length > 0) {
-            if (!this.gmlParser) {
-                this.initGmlParser();
-            }
-            for (var i=0, ii=where.length; i<ii; i++) {
-                this.gmlParser.readChildNodes(where[i], locations);
-            }
-        }
-        
-        var components = locations.components;
-        var point = this.getElementsByTagNameNS(node, georssns, "point");
-        if (point && point.length > 0) {
-            for (var i=0, ii=point.length; i<ii; i++) {
-                var xy = OpenLayers.String.trim(
-                            point[i].firstChild.nodeValue
-                            ).split(/\s+/);
-                if (xy.length !=2) {
-                    xy = OpenLayers.String.trim(
-                                point[i].firstChild.nodeValue
-                                ).split(/\s*,\s*/);
-                }
-                components.push(new OpenLayers.Geometry.Point(xy[1], xy[0]));
-            }
-        }
-
-        var line = this.getElementsByTagNameNS(node, georssns, "line");
-        if (line && line.length > 0) {
-            var coords;
-            var p;
-            var points;
-            for (var i=0, ii=line.length; i<ii; i++) {
-                coords = OpenLayers.String.trim(
-                                line[i].firstChild.nodeValue
-                                ).split(/\s+/);
-                points = [];
-                for (var j=0, jj=coords.length; j<jj; j+=2) {
-                    p = new OpenLayers.Geometry.Point(coords[j+1], coords[j]);
-                    points.push(p);
-                }
-                components.push(
-                    new OpenLayers.Geometry.LineString(points)
-                );
-            }
-        }        
-
-        var polygon = this.getElementsByTagNameNS(node, georssns, "polygon");
-        if (polygon && polygon.length > 0) {
-            var coords;
-            var p;
-            var points;
-            for (var i=0, ii=polygon.length; i<ii; i++) {
-                coords = OpenLayers.String.trim(
-                            polygon[i].firstChild.nodeValue
-                            ).split(/\s+/);
-                points = [];
-                for (var j=0, jj=coords.length; j<jj; j+=2) {
-                    p = new OpenLayers.Geometry.Point(coords[j+1], coords[j]);
-                    points.push(p);
-                }
-                components.push(
-                    new OpenLayers.Geometry.Polygon(
-                        [new OpenLayers.Geometry.LinearRing(points)]
-                    )
-                );
-            }
-        }
-        
-        if (this.internalProjection && this.externalProjection) {
-            for (var i=0, ii=components.length; i<ii; i++) {
-                if (components[i]) {
-                    components[i].transform(
-                        this.externalProjection,
-                        this.internalProjection
-                    );
-                }
-            }
-        }
-        
-        return components;
-    },
-    
-    /**
-     * Method: parsePersonConstruct
-     * Parse Atom person constructs from an Atom entry node.
-     *
-     * Parameters:
-     * node - {DOMElement} An Atom entry or feed node.
-     * name - {String} Construcy name ("author" or "contributor")
-     * data = {Object} Object in which to put parsed persons.
-     *
-     * Returns:
-     * An {Object}.
-     */
-    parsePersonConstructs: function(node, name, data) {
-        var persons = [];
-        var atomns = this.namespaces.atom;
-        var nodes = this.getElementsByTagNameNS(node, atomns, name);
-        var oAtts = ["uri", "email"];
-        for (var i=0, ii=nodes.length; i<ii; i++) {
-            var value = {};
-            value.name = this.getFirstChildValue(
-                            nodes[i],
-                            atomns,
-                            "name",
-                            null
-                            );
-            for (var j=0, jj=oAtts.length; j<jj; j++) {
-                var attval = this.getFirstChildValue(
-                            nodes[i],
-                            atomns,
-                            oAtts[j],
-                            null);
-                if (attval) {
-                    value[oAtts[j]] = attval;
-                }
-            }
-            persons.push(value);
-        }
-        if (persons.length > 0) {
-            data[name + "s"] = persons;
-        }
-    },
-
-    CLASS_NAME: "OpenLayers.Format.Atom"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/CQL.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/CQL.js
deleted file mode 100644
index 8430a8b5..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/CQL.js
+++ /dev/null
@@ -1,452 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/WKT.js
- * @requires OpenLayers/Filter/Comparison.js
- * @requires OpenLayers/Filter/Logical.js
- * @requires OpenLayers/Filter/Spatial.js
- */
-
-/**
- * Class: OpenLayers.Format.CQL
- * Read CQL strings to get <OpenLayers.Filter> objects.  Write 
- *     <OpenLayers.Filter> objects to get CQL strings. Create a new parser with 
- *     the <OpenLayers.Format.CQL> constructor.
- *
- * Inherits from:
- *  - <OpenLayers.Format>
- */
-OpenLayers.Format.CQL = (function() {
-    
-    var tokens = [
-        "PROPERTY", "COMPARISON", "VALUE", "LOGICAL"
-    ],
-
-    patterns = {
-        PROPERTY: /^[_a-zA-Z]\w*/,
-        COMPARISON: /^(=|<>|<=|<|>=|>|LIKE)/i,
-        IS_NULL: /^IS NULL/i,
-        COMMA: /^,/,
-        LOGICAL: /^(AND|OR)/i,
-        VALUE: /^('([^']|'')*'|\d+(\.\d*)?|\.\d+)/,
-        LPAREN: /^\(/,
-        RPAREN: /^\)/,
-        SPATIAL: /^(BBOX|INTERSECTS|DWITHIN|WITHIN|CONTAINS)/i,
-        NOT: /^NOT/i,
-        BETWEEN: /^BETWEEN/i,
-        GEOMETRY: function(text) {
-            var type = /^(POINT|LINESTRING|POLYGON|MULTIPOINT|MULTILINESTRING|MULTIPOLYGON|GEOMETRYCOLLECTION)/.exec(text);
-            if (type) {
-                var len = text.length;
-                var idx = text.indexOf("(", type[0].length);
-                if (idx > -1) {
-                    var depth = 1;
-                    while (idx < len && depth > 0) {
-                        idx++;
-                        switch(text.charAt(idx)) {
-                            case '(':
-                                depth++;
-                                break;
-                            case ')':
-                                depth--;
-                                break;
-                            default:
-                                // in default case, do nothing
-                        }
-                    }
-                }
-                return [text.substr(0, idx+1)];
-            }
-        },
-        END: /^$/
-    },
-
-    follows = {
-        LPAREN: ['GEOMETRY', 'SPATIAL', 'PROPERTY', 'VALUE', 'LPAREN'],
-        RPAREN: ['NOT', 'LOGICAL', 'END', 'RPAREN'],
-        PROPERTY: ['COMPARISON', 'BETWEEN', 'COMMA', 'IS_NULL'],
-        BETWEEN: ['VALUE'],
-        IS_NULL: ['END'],
-        COMPARISON: ['VALUE'],
-        COMMA: ['GEOMETRY', 'VALUE', 'PROPERTY'],
-        VALUE: ['LOGICAL', 'COMMA', 'RPAREN', 'END'],
-        SPATIAL: ['LPAREN'],
-        LOGICAL: ['NOT', 'VALUE', 'SPATIAL', 'PROPERTY', 'LPAREN'],
-        NOT: ['PROPERTY', 'LPAREN'],
-        GEOMETRY: ['COMMA', 'RPAREN']
-    },
-
-    operators = {
-        '=': OpenLayers.Filter.Comparison.EQUAL_TO,
-        '<>': OpenLayers.Filter.Comparison.NOT_EQUAL_TO,
-        '<': OpenLayers.Filter.Comparison.LESS_THAN,
-        '<=': OpenLayers.Filter.Comparison.LESS_THAN_OR_EQUAL_TO,
-        '>': OpenLayers.Filter.Comparison.GREATER_THAN,
-        '>=': OpenLayers.Filter.Comparison.GREATER_THAN_OR_EQUAL_TO,
-        'LIKE': OpenLayers.Filter.Comparison.LIKE,
-        'BETWEEN': OpenLayers.Filter.Comparison.BETWEEN,
-        'IS NULL': OpenLayers.Filter.Comparison.IS_NULL
-    },
-
-    operatorReverse = {},
-
-    logicals = {
-        'AND': OpenLayers.Filter.Logical.AND,
-        'OR': OpenLayers.Filter.Logical.OR
-    },
-
-    logicalReverse = {},
-
-    precedence = {
-        'RPAREN': 3,
-        'LOGICAL': 2,
-        'COMPARISON': 1
-    };
-
-    var i;
-    for (i in operators) {
-        if (operators.hasOwnProperty(i)) {
-            operatorReverse[operators[i]] = i;
-        }
-    }
-
-    for (i in logicals) {
-        if (logicals.hasOwnProperty(i)) {
-            logicalReverse[logicals[i]] = i;
-        }
-    }
-
-    function tryToken(text, pattern) {
-        if (pattern instanceof RegExp) {
-            return pattern.exec(text);
-        } else {
-            return pattern(text);
-        }
-    }
-
-    function nextToken(text, tokens) {
-        var i, token, len = tokens.length;
-        for (i=0; i<len; i++) {
-            token = tokens[i];
-            var pat = patterns[token];
-            var matches = tryToken(text, pat);
-            if (matches) {
-                var match = matches[0];
-                var remainder = text.substr(match.length).replace(/^\s*/, "");
-                return {
-                    type: token,
-                    text: match,
-                    remainder: remainder
-                };
-            }
-        }
-
-        var msg = "ERROR: In parsing: [" + text + "], expected one of: ";
-        for (i=0; i<len; i++) {
-            token = tokens[i];
-            msg += "\n    " + token + ": " + patterns[token];
-        }
-
-        throw new Error(msg);
-    }
-
-    function tokenize(text) {
-        var results = [];
-        var token, expect = ["NOT", "GEOMETRY", "SPATIAL", "PROPERTY", "LPAREN"];
-
-        do {
-            token = nextToken(text, expect);
-            text = token.remainder;
-            expect = follows[token.type];
-            if (token.type != "END" && !expect) {
-                throw new Error("No follows list for " + token.type);
-            }
-            results.push(token);
-        } while (token.type != "END");
-
-        return results;
-    }
-
-    function buildAst(tokens) {
-        var operatorStack = [],
-            postfix = [];
-
-        while (tokens.length) {
-            var tok = tokens.shift();
-            switch (tok.type) {
-                case "PROPERTY":
-                case "GEOMETRY":
-                case "VALUE":
-                    postfix.push(tok);
-                    break;
-                case "COMPARISON":
-                case "BETWEEN":
-                case "IS_NULL":
-                case "LOGICAL":
-                    var p = precedence[tok.type];
-
-                    while (operatorStack.length > 0 &&
-                        (precedence[operatorStack[operatorStack.length - 1].type] <= p)
-                    ) {
-                        postfix.push(operatorStack.pop());
-                    }
-
-                    operatorStack.push(tok);
-                    break;
-                case "SPATIAL":
-                case "NOT":
-                case "LPAREN":
-                    operatorStack.push(tok);
-                    break;
-                case "RPAREN":
-                    while (operatorStack.length > 0 &&
-                        (operatorStack[operatorStack.length - 1].type != "LPAREN")
-                    ) {
-                        postfix.push(operatorStack.pop());
-                    }
-                    operatorStack.pop(); // toss out the LPAREN
-
-                    if (operatorStack.length > 0 &&
-                        operatorStack[operatorStack.length-1].type == "SPATIAL") {
-                        postfix.push(operatorStack.pop());
-                    }
-                case "COMMA":
-                case "END":
-                    break;
-                default:
-                    throw new Error("Unknown token type " + tok.type);
-            }
-        }
-
-        while (operatorStack.length > 0) {
-            postfix.push(operatorStack.pop());
-        }
-
-        function buildTree() {
-            var tok = postfix.pop();
-            switch (tok.type) {
-                case "LOGICAL":
-                    var rhs = buildTree(),
-                        lhs = buildTree();
-                    return new OpenLayers.Filter.Logical({
-                        filters: [lhs, rhs],
-                        type: logicals[tok.text.toUpperCase()]
-                    });
-                case "NOT":
-                    var operand = buildTree();
-                    return new OpenLayers.Filter.Logical({
-                        filters: [operand],
-                        type: OpenLayers.Filter.Logical.NOT
-                    });
-                case "BETWEEN":
-                    var min, max, property;
-                    postfix.pop(); // unneeded AND token here
-                    max = buildTree();
-                    min = buildTree();
-                    property = buildTree();
-                    return new OpenLayers.Filter.Comparison({
-                        property: property,
-                        lowerBoundary: min,
-                        upperBoundary: max,
-                        type: OpenLayers.Filter.Comparison.BETWEEN
-                    });
-                case "COMPARISON":
-                    var value = buildTree(),
-                        property = buildTree();
-                    return new OpenLayers.Filter.Comparison({
-                        property: property,
-                        value: value,
-                        type: operators[tok.text.toUpperCase()]
-                    });
-                case "IS_NULL":
-                    var property = buildTree();
-                    return new OpenLayers.Filter.Comparison({
-                        property: property,
-                        type: operators[tok.text.toUpperCase()]
-                    });
-                case "VALUE":
-                    var match = tok.text.match(/^'(.*)'$/);
-                    if (match) {
-                        return match[1].replace(/''/g, "'");
-                    } else {
-                        return Number(tok.text);
-                    }
-                case "SPATIAL":
-                    switch(tok.text.toUpperCase()) {
-                        case "BBOX":
-                            var maxy = buildTree(),
-                                maxx = buildTree(),
-                                miny = buildTree(),
-                                minx = buildTree(),
-                                prop = buildTree();
-
-                            return new OpenLayers.Filter.Spatial({
-                                type: OpenLayers.Filter.Spatial.BBOX,
-                                property: prop,
-                                value: OpenLayers.Bounds.fromArray(
-                                    [minx, miny, maxx, maxy]
-                                )
-                            });
-                        case "INTERSECTS":
-                            var value = buildTree(),
-                                property = buildTree();
-                            return new OpenLayers.Filter.Spatial({
-                                type: OpenLayers.Filter.Spatial.INTERSECTS,
-                                property: property,
-                                value: value
-                            });
-                        case "WITHIN":
-                            var value = buildTree(),
-                                property = buildTree();
-                            return new OpenLayers.Filter.Spatial({
-                                type: OpenLayers.Filter.Spatial.WITHIN,
-                                property: property,
-                                value: value
-                            });
-                        case "CONTAINS":
-                            var value = buildTree(),
-                                property = buildTree();
-                            return new OpenLayers.Filter.Spatial({
-                                type: OpenLayers.Filter.Spatial.CONTAINS,
-                                property: property,
-                                value: value
-                            });
-                        case "DWITHIN":
-                            var distance = buildTree(),
-                                value = buildTree(),
-                                property = buildTree();
-                            return new OpenLayers.Filter.Spatial({
-                                type: OpenLayers.Filter.Spatial.DWITHIN,
-                                value: value,
-                                property: property,
-                                distance: Number(distance)
-                            });
-                    }
-                case "GEOMETRY":
-                    return OpenLayers.Geometry.fromWKT(tok.text);
-                default:
-                    return tok.text;
-            }
-        }
-
-        var result = buildTree();
-        if (postfix.length > 0) {
-            var msg = "Remaining tokens after building AST: \n";
-            for (var i = postfix.length - 1; i >= 0; i--) {
-                msg += postfix[i].type + ": " + postfix[i].text + "\n";
-            }
-            throw new Error(msg);
-        }
-
-        return result;
-    }
-
-    return OpenLayers.Class(OpenLayers.Format, {
-        /**
-         * APIMethod: read
-         * Generate a filter from a CQL string.
-
-         * Parameters:
-         * text - {String} The CQL text.
-         *
-         * Returns:
-         * {<OpenLayers.Filter>} A filter based on the CQL text.
-         */
-        read: function(text) { 
-            var result = buildAst(tokenize(text));
-            if (this.keepData) {
-                this.data = result;
-            }
-            return result;
-        },
-
-        /**
-         * APIMethod: write
-         * Convert a filter into a CQL string.
-
-         * Parameters:
-         * filter - {<OpenLayers.Filter>} The filter.
-         *
-         * Returns:
-         * {String} A CQL string based on the filter.
-         */
-        write: function(filter) {
-            if (filter instanceof OpenLayers.Geometry) {
-                return filter.toString();
-            }
-            switch (filter.CLASS_NAME) {
-                case "OpenLayers.Filter.Spatial":
-                    switch(filter.type) {
-                        case OpenLayers.Filter.Spatial.BBOX:
-                            return "BBOX(" +
-                                filter.property + "," +
-                                filter.value.toBBOX() +
-                                ")";
-                        case OpenLayers.Filter.Spatial.DWITHIN:
-                            return "DWITHIN(" +
-                                filter.property + ", " +
-                                this.write(filter.value) + ", " +
-                                filter.distance + ")";
-                        case OpenLayers.Filter.Spatial.WITHIN:
-                            return "WITHIN(" +
-                                filter.property + ", " +
-                                this.write(filter.value) + ")";
-                        case OpenLayers.Filter.Spatial.INTERSECTS:
-                            return "INTERSECTS(" +
-                                filter.property + ", " +
-                                this.write(filter.value) + ")";
-                        case OpenLayers.Filter.Spatial.CONTAINS:
-                            return "CONTAINS(" +
-                                filter.property + ", " +
-                                this.write(filter.value) + ")";
-                        default:
-                            throw new Error("Unknown spatial filter type: " + filter.type);
-                    }
-                case "OpenLayers.Filter.Logical":
-                    if (filter.type == OpenLayers.Filter.Logical.NOT) {
-                        // TODO: deal with precedence of logical operators to 
-                        // avoid extra parentheses (not urgent)
-                        return "NOT (" + this.write(filter.filters[0]) + ")";
-                    } else {
-                        var res = "(";
-                        var first = true;
-                        for (var i = 0; i < filter.filters.length; i++) {
-                            if (first) {
-                                first = false;
-                            } else {
-                                res += ") " + logicalReverse[filter.type] + " (";
-                            }
-                            res += this.write(filter.filters[i]);
-                        }
-                        return res + ")";
-                    }
-                case "OpenLayers.Filter.Comparison":
-                    if (filter.type == OpenLayers.Filter.Comparison.BETWEEN) {
-                        return filter.property + " BETWEEN " + 
-                            this.write(filter.lowerBoundary) + " AND " + 
-                            this.write(filter.upperBoundary);
-                    } else {
-                        return (filter.value !== null) ? filter.property +
-                            " " + operatorReverse[filter.type] + " " + 
-                            this.write(filter.value) : filter.property +
-                            " " + operatorReverse[filter.type];
-                    }
-                case undefined:
-                    if (typeof filter === "string") {
-                        return "'" + filter.replace(/'/g, "''") + "'";
-                    } else if (typeof filter === "number") {
-                        return String(filter);
-                    }
-                default:
-                    throw new Error("Can't encode: " + filter.CLASS_NAME + " " + filter);
-            }
-        },
-
-        CLASS_NAME: "OpenLayers.Format.CQL"
-
-    });
-})();
-
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/CSWGetDomain.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/CSWGetDomain.js
deleted file mode 100644
index 18d53284..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/CSWGetDomain.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format.js
- */
-
-/**
- * Class: OpenLayers.Format.CSWGetDomain
- * Default version is 2.0.2.
- *
- * Returns:
- * {<OpenLayers.Format>} A CSWGetDomain format of the given version.
- */
-OpenLayers.Format.CSWGetDomain = function(options) {
-    options = OpenLayers.Util.applyDefaults(
-        options, OpenLayers.Format.CSWGetDomain.DEFAULTS
-    );
-    var cls = OpenLayers.Format.CSWGetDomain["v"+options.version.replace(/\./g, "_")];
-    if(!cls) {
-        throw "Unsupported CSWGetDomain version: " + options.version;
-    }
-    return new cls(options);
-};
-
-/**
- * Constant: DEFAULTS
- * {Object} Default properties for the CSWGetDomain format.
- */
-OpenLayers.Format.CSWGetDomain.DEFAULTS = {
-    "version": "2.0.2"
-};
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/CSWGetDomain/v2_0_2.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/CSWGetDomain/v2_0_2.js
deleted file mode 100644
index 78200eab..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/CSWGetDomain/v2_0_2.js
+++ /dev/null
@@ -1,240 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/XML.js
- * @requires OpenLayers/Format/CSWGetDomain.js
- */
-
-/**
- * Class: OpenLayers.Format.CSWGetDomain.v2_0_2
- *     A format for creating CSWGetDomain v2.0.2 transactions. 
- *     Create a new instance with the
- *     <OpenLayers.Format.CSWGetDomain.v2_0_2> constructor.
- *
- * Inherits from:
- *  - <OpenLayers.Format.XML>
- */
-OpenLayers.Format.CSWGetDomain.v2_0_2 = OpenLayers.Class(OpenLayers.Format.XML, {
-    
-    /**
-     * Property: namespaces
-     * {Object} Mapping of namespace aliases to namespace URIs.
-     */
-    namespaces: {
-        xlink: "http://www.w3.org/1999/xlink",
-        xsi: "http://www.w3.org/2001/XMLSchema-instance",
-        csw: "http://www.opengis.net/cat/csw/2.0.2"
-    },
-
-    /**
-     * Property: defaultPrefix
-     * {String} The default prefix (used by Format.XML).
-     */
-    defaultPrefix: "csw",
-    
-    /**
-     * Property: version
-     * {String} CSW version number.
-     */
-    version: "2.0.2",
-    
-    /**
-     * Property: schemaLocation
-     * {String} http://www.opengis.net/cat/csw/2.0.2
-     *   http://schemas.opengis.net/csw/2.0.2/CSW-discovery.xsd
-     */
-    schemaLocation: "http://www.opengis.net/cat/csw/2.0.2 http://schemas.opengis.net/csw/2.0.2/CSW-discovery.xsd",
-
-    /**
-     * APIProperty: PropertyName
-     * {String} Value of the csw:PropertyName element, used when
-     *     writing a GetDomain document.
-     */
-    PropertyName: null,
-
-    /**
-     * APIProperty: ParameterName
-     * {String} Value of the csw:ParameterName element, used when
-     *     writing a GetDomain document.
-     */
-    ParameterName: null,
-    
-    /**
-     * Constructor: OpenLayers.Format.CSWGetDomain.v2_0_2
-     * A class for parsing and generating CSWGetDomain v2.0.2 transactions.
-     *
-     * Parameters:
-     * options - {Object} Optional object whose properties will be set on the
-     *     instance.
-     *
-     * Valid options properties:
-     * - PropertyName
-     * - ParameterName
-     */
-
-    /**
-     * APIMethod: read
-     * Parse the response from a GetDomain request.
-     */
-    read: function(data) {
-        if(typeof data == "string") { 
-            data = OpenLayers.Format.XML.prototype.read.apply(this, [data]);
-        }
-        if(data && data.nodeType == 9) {
-            data = data.documentElement;
-        }
-        var obj = {};
-        this.readNode(data, obj);
-        return obj;
-    },
-    
-    /**
-     * Property: readers
-     * Contains public functions, grouped by namespace prefix, that will
-     *     be applied when a namespaced node is found matching the function
-     *     name.  The function will be applied in the scope of this parser
-     *     with two arguments: the node being read and a context object passed
-     *     from the parent.
-     */
-    readers: {
-        "csw": {
-            "GetDomainResponse": function(node, obj) {
-                this.readChildNodes(node, obj);
-            },
-            "DomainValues": function(node, obj) {
-                if (!(OpenLayers.Util.isArray(obj.DomainValues))) {
-                    obj.DomainValues = [];
-                }
-                var attrs = node.attributes;
-                var domainValue = {};
-                for(var i=0, len=attrs.length; i<len; ++i) {
-                    domainValue[attrs[i].name] = attrs[i].nodeValue;
-                }
-                this.readChildNodes(node, domainValue);
-                obj.DomainValues.push(domainValue);
-            },
-            "PropertyName": function(node, obj) {
-                obj.PropertyName = this.getChildValue(node);
-            },
-            "ParameterName": function(node, obj) {
-                obj.ParameterName = this.getChildValue(node);
-            },
-            "ListOfValues": function(node, obj) {
-                if (!(OpenLayers.Util.isArray(obj.ListOfValues))) {
-                    obj.ListOfValues = [];
-                }
-                this.readChildNodes(node, obj.ListOfValues);
-            },
-            "Value": function(node, obj) {
-                var attrs = node.attributes;
-                var value = {};
-                for(var i=0, len=attrs.length; i<len; ++i) {
-                    value[attrs[i].name] = attrs[i].nodeValue;
-                }
-                value.value = this.getChildValue(node);
-                obj.push({Value: value});
-            },
-            "ConceptualScheme": function(node, obj) {
-                obj.ConceptualScheme = {};
-                this.readChildNodes(node, obj.ConceptualScheme);
-            },
-            "Name": function(node, obj) {
-                obj.Name = this.getChildValue(node);
-            },
-            "Document": function(node, obj) {
-                obj.Document = this.getChildValue(node);
-            },
-            "Authority": function(node, obj) {
-                obj.Authority = this.getChildValue(node);
-            },
-            "RangeOfValues": function(node, obj) {
-                obj.RangeOfValues = {};
-                this.readChildNodes(node, obj.RangeOfValues);
-            },
-            "MinValue": function(node, obj) {
-                var attrs = node.attributes;
-                var value = {};
-                for(var i=0, len=attrs.length; i<len; ++i) {
-                    value[attrs[i].name] = attrs[i].nodeValue;
-                }
-                value.value = this.getChildValue(node);
-                obj.MinValue = value;
-            },
-            "MaxValue": function(node, obj) {
-                var attrs = node.attributes;
-                var value = {};
-                for(var i=0, len=attrs.length; i<len; ++i) {
-                    value[attrs[i].name] = attrs[i].nodeValue;
-                }
-                value.value = this.getChildValue(node);
-                obj.MaxValue = value;
-            }
-        }
-    },
-    
-    /**
-     * APIMethod: write
-     * Given an configuration js object, write a CSWGetDomain request. 
-     *
-     * Parameters:
-     * options - {Object} A object mapping the request.
-     *
-     * Returns:
-     * {String} A serialized CSWGetDomain request.
-     */
-    write: function(options) {
-        var node = this.writeNode("csw:GetDomain", options);
-        return OpenLayers.Format.XML.prototype.write.apply(this, [node]);
-    },
-
-    /**
-     * Property: writers
-     * As a compliment to the readers property, this structure contains public
-     *     writing functions grouped by namespace alias and named like the
-     *     node names they produce.
-     */
-    writers: {
-        "csw": {
-            "GetDomain": function(options) {
-                var node = this.createElementNSPlus("csw:GetDomain", {
-                    attributes: {
-                        service: "CSW",
-                        version: this.version
-                    }
-                });
-                if (options.PropertyName || this.PropertyName) {
-                    this.writeNode(
-                        "csw:PropertyName",
-                        options.PropertyName || this.PropertyName,
-                        node
-                    );
-                } else if (options.ParameterName || this.ParameterName) {
-                    this.writeNode(
-                        "csw:ParameterName",
-                        options.ParameterName || this.ParameterName,
-                        node
-                    );
-                }
-                this.readChildNodes(node, options);
-                return node;
-            },
-            "PropertyName": function(value) {
-                var node = this.createElementNSPlus("csw:PropertyName", {
-                    value: value
-                });
-                return node;
-            },
-            "ParameterName": function(value) {
-                var node = this.createElementNSPlus("csw:ParameterName", {
-                    value: value
-                });
-                return node;
-            }
-        }
-    },
-   
-    CLASS_NAME: "OpenLayers.Format.CSWGetDomain.v2_0_2" 
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/CSWGetRecords.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/CSWGetRecords.js
deleted file mode 100644
index 923c5487..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/CSWGetRecords.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format.js
- */
-
-/**
- * Class: OpenLayers.Format.CSWGetRecords
- * Default version is 2.0.2.
- *
- * Returns:
- * {<OpenLayers.Format>} A CSWGetRecords format of the given version.
- */
-OpenLayers.Format.CSWGetRecords = function(options) {
-    options = OpenLayers.Util.applyDefaults(
-        options, OpenLayers.Format.CSWGetRecords.DEFAULTS
-    );
-    var cls = OpenLayers.Format.CSWGetRecords["v"+options.version.replace(/\./g, "_")];
-    if(!cls) {
-        throw "Unsupported CSWGetRecords version: " + options.version;
-    }
-    return new cls(options);
-};
-
-/**
- * Constant: DEFAULTS
- * {Object} Default properties for the CSWGetRecords format.
- */
-OpenLayers.Format.CSWGetRecords.DEFAULTS = {
-    "version": "2.0.2"
-};
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/CSWGetRecords/v2_0_2.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/CSWGetRecords/v2_0_2.js
deleted file mode 100644
index 3c876127..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/CSWGetRecords/v2_0_2.js
+++ /dev/null
@@ -1,457 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/XML.js
- * @requires OpenLayers/Format/CSWGetRecords.js
- * @requires OpenLayers/Format/Filter/v1_0_0.js
- * @requires OpenLayers/Format/Filter/v1_1_0.js
- * @requires OpenLayers/Format/OWSCommon/v1_0_0.js
- */
-
-/**
- * Class: OpenLayers.Format.CSWGetRecords.v2_0_2
- *     A format for creating CSWGetRecords v2.0.2 transactions. 
- *     Create a new instance with the
- *     <OpenLayers.Format.CSWGetRecords.v2_0_2> constructor.
- *
- * Inherits from:
- *  - <OpenLayers.Format.XML>
- */
-OpenLayers.Format.CSWGetRecords.v2_0_2 = OpenLayers.Class(OpenLayers.Format.XML, {
-    
-    /**
-     * Property: namespaces
-     * {Object} Mapping of namespace aliases to namespace URIs.
-     */
-    namespaces: {
-        csw: "http://www.opengis.net/cat/csw/2.0.2",
-        dc: "http://purl.org/dc/elements/1.1/",
-        dct: "http://purl.org/dc/terms/",
-        gmd: "http://www.isotc211.org/2005/gmd",
-        geonet: "http://www.fao.org/geonetwork",
-        ogc: "http://www.opengis.net/ogc",
-        ows: "http://www.opengis.net/ows",
-        xlink: "http://www.w3.org/1999/xlink",
-        xsi: "http://www.w3.org/2001/XMLSchema-instance"
-    },
-    
-    /**
-     * Property: defaultPrefix
-     * {String} The default prefix (used by Format.XML).
-     */
-    defaultPrefix: "csw",
-    
-    /**
-     * Property: version
-     * {String} CSW version number.
-     */
-    version: "2.0.2",
-    
-    /**
-     * Property: schemaLocation
-     * {String} http://www.opengis.net/cat/csw/2.0.2
-     *   http://schemas.opengis.net/csw/2.0.2/CSW-discovery.xsd
-     */
-    schemaLocation: "http://www.opengis.net/cat/csw/2.0.2 http://schemas.opengis.net/csw/2.0.2/CSW-discovery.xsd",
-
-    /**
-     * APIProperty: requestId
-     * {String} Value of the requestId attribute of the GetRecords element.
-     */
-    requestId: null,
-
-    /**
-     * APIProperty: resultType
-     * {String} Value of the resultType attribute of the GetRecords element,
-     *     specifies the result type in the GetRecords response, "hits" is
-     *     the default.
-     */
-    resultType: null,
-
-    /**
-     * APIProperty: outputFormat
-     * {String} Value of the outputFormat attribute of the GetRecords element,
-     *     specifies the format of the GetRecords response,
-     *     "application/xml" is the default.
-     */
-    outputFormat: null,
-
-    /**
-     * APIProperty: outputSchema
-     * {String} Value of the outputSchema attribute of the GetRecords element,
-     *     specifies the schema of the GetRecords response.
-     */
-    outputSchema: null,
-
-    /**
-     * APIProperty: startPosition
-     * {String} Value of the startPosition attribute of the GetRecords element,
-     *     specifies the start position (offset+1) for the GetRecords response,
-     *     1 is the default.
-     */
-    startPosition: null,
-
-    /**
-     * APIProperty: maxRecords
-     * {String} Value of the maxRecords attribute of the GetRecords element,
-     *     specifies the maximum number of records in the GetRecords response,
-     *     10 is the default.
-     */
-    maxRecords: null,
-
-    /**
-     * APIProperty: DistributedSearch
-     * {String} Value of the csw:DistributedSearch element, used when writing
-     *     a csw:GetRecords document.
-     */
-    DistributedSearch: null,
-
-    /**
-     * APIProperty: ResponseHandler
-     * {Array({String})} Values of the csw:ResponseHandler elements, used when
-     *     writting a csw:GetRecords document.
-     */
-    ResponseHandler: null,
-
-    /**
-     * APIProperty: Query
-     * {String} Value of the csw:Query element, used when writing a csw:GetRecords
-     *     document.
-     */
-    Query: null,
-
-    /**
-     * Property: regExes
-     * Compiled regular expressions for manipulating strings.
-     */
-    regExes: {
-        trimSpace: (/^\s*|\s*$/g),
-        removeSpace: (/\s*/g),
-        splitSpace: (/\s+/),
-        trimComma: (/\s*,\s*/g)
-    },
-
-    /**
-     * Constructor: OpenLayers.Format.CSWGetRecords.v2_0_2
-     * A class for parsing and generating CSWGetRecords v2.0.2 transactions.
-     *
-     * Parameters:
-     * options - {Object} Optional object whose properties will be set on the
-     *     instance.
-     *
-     * Valid options properties (documented as class properties):
-     * - requestId
-     * - resultType
-     * - outputFormat
-     * - outputSchema
-     * - startPosition
-     * - maxRecords
-     * - DistributedSearch
-     * - ResponseHandler
-     * - Query
-     */
-    initialize: function(options) {
-        OpenLayers.Format.XML.prototype.initialize.apply(this, [options]);
-    },
-
-    /**
-     * APIMethod: read
-     * Parse the response from a GetRecords request.
-     */
-    read: function(data) {
-        if(typeof data == "string") { 
-            data = OpenLayers.Format.XML.prototype.read.apply(this, [data]);
-        }
-        if(data && data.nodeType == 9) {
-            data = data.documentElement;
-        }
-        var obj = {};
-        this.readNode(data, obj);
-        return obj;
-    },
-    
-    /**
-     * Property: readers
-     * Contains public functions, grouped by namespace prefix, that will
-     *     be applied when a namespaced node is found matching the function
-     *     name.  The function will be applied in the scope of this parser
-     *     with two arguments: the node being read and a context object passed
-     *     from the parent.
-     */
-    readers: {
-        "csw": {
-            "GetRecordsResponse": function(node, obj) {
-                obj.records = [];
-                this.readChildNodes(node, obj);
-                var version = this.getAttributeNS(node, "", 'version');
-                if (version != "") {
-                    obj.version = version;
-                }
-            },
-            "RequestId": function(node, obj) {
-                obj.RequestId = this.getChildValue(node);
-            },
-            "SearchStatus": function(node, obj) {
-                obj.SearchStatus = {};
-                var timestamp = this.getAttributeNS(node, "", 'timestamp');
-                if (timestamp != "") {
-                    obj.SearchStatus.timestamp = timestamp;
-                }
-            },
-            "SearchResults": function(node, obj) {
-                this.readChildNodes(node, obj);
-                var attrs = node.attributes;
-                var SearchResults = {};
-                for(var i=0, len=attrs.length; i<len; ++i) {
-                    if ((attrs[i].name == "numberOfRecordsMatched") ||
-                        (attrs[i].name == "numberOfRecordsReturned") ||
-                        (attrs[i].name == "nextRecord")) {
-                        SearchResults[attrs[i].name] = parseInt(attrs[i].nodeValue);
-                    } else {
-                        SearchResults[attrs[i].name] = attrs[i].nodeValue;
-                    }
-                }
-                obj.SearchResults = SearchResults;
-            },
-            "SummaryRecord": function(node, obj) {
-                var record = {type: "SummaryRecord"};
-                this.readChildNodes(node, record);
-                obj.records.push(record);
-            },
-            "BriefRecord": function(node, obj) {
-                var record = {type: "BriefRecord"};
-                this.readChildNodes(node, record);
-                obj.records.push(record);
-            },
-            "DCMIRecord": function(node, obj) {
-                var record = {type: "DCMIRecord"};
-                this.readChildNodes(node, record);
-                obj.records.push(record);
-            },
-            "Record": function(node, obj) {
-                var record = {type: "Record"};
-                this.readChildNodes(node, record);
-                obj.records.push(record);
-            },
-            "*": function(node, obj) {
-                var name = node.localName || node.nodeName.split(":").pop();
-                obj[name] = this.getChildValue(node);
-            }
-        },
-        "geonet": {
-            "info": function(node, obj) {
-                var gninfo = {};
-                this.readChildNodes(node, gninfo);
-                obj.gninfo = gninfo;
-            }
-        },
-        "dc": {
-            // audience, contributor, coverage, creator, date, description, format,
-            // identifier, language, provenance, publisher, relation, rights,
-            // rightsHolder, source, subject, title, type, URI
-            "*": function(node, obj) {
-                var name = node.localName || node.nodeName.split(":").pop();
-                if (!(OpenLayers.Util.isArray(obj[name]))) {
-                    obj[name] = [];
-                }
-                var dc_element = {};
-                var attrs = node.attributes;
-                for(var i=0, len=attrs.length; i<len; ++i) {
-                    dc_element[attrs[i].name] = attrs[i].nodeValue;
-                }
-                dc_element.value = this.getChildValue(node);
-                if (dc_element.value != "") {
-                    obj[name].push(dc_element);
-                }
-            }
-        },
-        "dct": {
-            // abstract, modified, spatial
-            "*": function(node, obj) {
-                var name = node.localName || node.nodeName.split(":").pop();
-                if (!(OpenLayers.Util.isArray(obj[name]))) {
-                    obj[name] = [];
-                }
-                obj[name].push(this.getChildValue(node));
-            }
-        },
-        "ows": OpenLayers.Util.applyDefaults({
-            "BoundingBox": function(node, obj) {
-                if (obj.bounds) {
-                    obj.BoundingBox = [{crs: obj.projection, value: 
-                        [
-                            obj.bounds.left, 
-                            obj.bounds.bottom, 
-                            obj.bounds.right, 
-                            obj.bounds.top
-                    ]
-                    }];
-                    delete obj.projection;
-                    delete obj.bounds;
-                }
-                OpenLayers.Format.OWSCommon.v1_0_0.prototype.readers["ows"]["BoundingBox"].apply(
-                    this, arguments);
-            }
-        }, OpenLayers.Format.OWSCommon.v1_0_0.prototype.readers["ows"])
-    },
-    
-    /**
-     * Method: write
-     * Given an configuration js object, write a CSWGetRecords request. 
-     *
-     * Parameters:
-     * options - {Object} A object mapping the request.
-     *
-     * Returns:
-     * {String} A serialized CSWGetRecords request.
-     */
-    write: function(options) {
-        var node = this.writeNode("csw:GetRecords", options);
-        node.setAttribute("xmlns:gmd", this.namespaces.gmd);
-        return OpenLayers.Format.XML.prototype.write.apply(this, [node]);
-    },
-
-    /**
-     * Property: writers
-     * As a compliment to the readers property, this structure contains public
-     *     writing functions grouped by namespace alias and named like the
-     *     node names they produce.
-     */
-    writers: {
-        "csw": {
-            "GetRecords": function(options) {
-                if (!options) {
-                    options = {};
-                }
-                var node = this.createElementNSPlus("csw:GetRecords", {
-                    attributes: {
-                        service: "CSW",
-                        version: this.version,
-                        requestId: options.requestId || this.requestId,
-                        resultType: options.resultType || this.resultType,
-                        outputFormat: options.outputFormat || this.outputFormat,
-                        outputSchema: options.outputSchema || this.outputSchema,
-                        startPosition: options.startPosition || this.startPosition,
-                        maxRecords: options.maxRecords || this.maxRecords
-                    }
-                });
-                if (options.DistributedSearch || this.DistributedSearch) {
-                    this.writeNode(
-                        "csw:DistributedSearch",
-                        options.DistributedSearch || this.DistributedSearch,
-                        node
-                    );
-                }
-                var ResponseHandler = options.ResponseHandler || this.ResponseHandler;
-                if (OpenLayers.Util.isArray(ResponseHandler) && ResponseHandler.length > 0) {
-                    // ResponseHandler must be a non-empty array
-                    for(var i=0, len=ResponseHandler.length; i<len; i++) {
-                        this.writeNode(
-                            "csw:ResponseHandler",
-                            ResponseHandler[i],
-                            node
-                        );
-                    }
-                }
-                this.writeNode("Query", options.Query || this.Query, node);
-                return node;
-            },
-            "DistributedSearch": function(options) {
-                var node = this.createElementNSPlus("csw:DistributedSearch", {
-                    attributes: {
-                        hopCount: options.hopCount
-                    }
-                });
-                return node;
-            },
-            "ResponseHandler": function(options) {
-                var node = this.createElementNSPlus("csw:ResponseHandler", {
-                    value: options.value
-                });
-                return node;
-            },
-            "Query": function(options) {
-                if (!options) {
-                    options = {};
-                }
-                var node = this.createElementNSPlus("csw:Query", {
-                    attributes: {
-                        typeNames: options.typeNames || "csw:Record"
-                    }
-                });
-                var ElementName = options.ElementName;
-                if (OpenLayers.Util.isArray(ElementName) && ElementName.length > 0) {
-                    // ElementName must be a non-empty array
-                    for(var i=0, len=ElementName.length; i<len; i++) {
-                        this.writeNode(
-                            "csw:ElementName",
-                            ElementName[i],
-                            node
-                        );
-                    }
-                } else {
-                    this.writeNode(
-                        "csw:ElementSetName",
-                        options.ElementSetName || {value: 'summary'},
-                        node
-                    );
-                }
-                if (options.Constraint) {
-                    this.writeNode(
-                        "csw:Constraint",
-                        options.Constraint,
-                        node
-                    );
-                }
-                if (options.SortBy) {
-                    this.writeNode(
-                        "ogc:SortBy",
-                        options.SortBy,
-                        node
-                    );
-                }
-                return node;
-            },
-            "ElementName": function(options) {
-                var node = this.createElementNSPlus("csw:ElementName", {
-                    value: options.value
-                });
-                return node;
-            },
-            "ElementSetName": function(options) {
-                var node = this.createElementNSPlus("csw:ElementSetName", {
-                    attributes: {
-                        typeNames: options.typeNames
-                    },
-                    value: options.value
-                });
-                return node;
-            },
-            "Constraint": function(options) {
-                var node = this.createElementNSPlus("csw:Constraint", {
-                    attributes: {
-                        version: options.version
-                    }
-                });
-                if (options.Filter) {
-                    var format = new OpenLayers.Format.Filter({
-                        version: options.version
-                    });
-                    node.appendChild(format.write(options.Filter));
-                } else if (options.CqlText) {
-                    var child = this.createElementNSPlus("CqlText", {
-                        value: options.CqlText.value
-                    });
-                    node.appendChild(child);
-                }
-                return node;
-            }
-        },
-        "ogc": OpenLayers.Format.Filter.v1_1_0.prototype.writers["ogc"]
-    },
-   
-    CLASS_NAME: "OpenLayers.Format.CSWGetRecords.v2_0_2" 
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/Context.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/Context.js
deleted file mode 100644
index 73d6203d..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/Context.js
+++ /dev/null
@@ -1,334 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/XML/VersionedOGC.js
- */
-
-/**
- * Class: OpenLayers.Format.Context
- * Base class for both Format.WMC and Format.OWSContext
- *
- * Inherits from:
- *  - <OpenLayers.Format.XML.VersionedOGC>
- */
-OpenLayers.Format.Context = OpenLayers.Class(OpenLayers.Format.XML.VersionedOGC, {
-
-    /**
-     * Property: layerOptions
-     * {Object} Default options for layers created by the parser. These
-     *     options are overridden by the options which are read from the
-     *     capabilities document.
-     */
-    layerOptions: null,
-
-    /**
-     * Property: layerParams
-     * {Object} Default parameters for layers created by the parser. This
-     *     can be used e.g. to override DEFAULT_PARAMS for 
-     *     OpenLayers.Layer.WMS.
-     */
-    layerParams: null,
-
-    /**
-     * Constructor: OpenLayers.Format.Context
-     * Create a new parser for Context documents.
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be set on
-     *     this instance.
-     */
-
-    /**
-     * APIMethod: read
-     * Read Context data from a string, and return an object with map
-     *     properties and a list of layers.
-     *
-     * Parameters:
-     * data - {String} or {DOMElement} data to read/parse.
-     * options - {Object} The options object must contain a map property.  If
-     *     the map property is a string, it must be the id of a dom element
-     *     where the new map will be placed.  If the map property is an
-     *     <OpenLayers.Map>, the layers from the context document will be added
-     *     to the map.
-     *
-     * Returns:
-     * {<OpenLayers.Map>} A map based on the context.
-     */
-    read: function(data, options) {
-        var context = OpenLayers.Format.XML.VersionedOGC.prototype.read.apply(this, 
-            arguments);
-        var map;
-        if(options && options.map) {
-            this.context = context;
-            if(options.map instanceof OpenLayers.Map) {
-                map = this.mergeContextToMap(context, options.map);
-            } else {
-                var mapOptions = options.map;
-                if(OpenLayers.Util.isElement(mapOptions) ||
-                   typeof mapOptions == "string") {
-                    // we assume mapOptions references a div
-                    // element
-                    mapOptions = {div: mapOptions};
-                }
-                map = this.contextToMap(context, mapOptions);
-            }
-        } else {
-            // not documented as part of the API, provided as a non-API option
-            map = context;
-        }
-        return map;
-    },
-
-    /**
-     * Method: getLayerFromContext
-     * Create a WMS layer from a layerContext object.
-     *
-     * Parameters:
-     * layerContext - {Object} An object representing a WMS layer.
-     *
-     * Returns:
-     * {<OpenLayers.Layer.WMS>} A WMS layer.
-     */
-    getLayerFromContext: function(layerContext) {
-        var i, len;
-        // fill initial options object from layerContext
-        var options = {
-            queryable: layerContext.queryable, //keep queryable for api compatibility
-            visibility: layerContext.visibility,
-            maxExtent: layerContext.maxExtent,
-            metadata: OpenLayers.Util.applyDefaults(layerContext.metadata, 
-            {styles: layerContext.styles,
-             formats: layerContext.formats,
-             "abstract": layerContext["abstract"],
-             dataURL: layerContext.dataURL
-            }),
-            numZoomLevels: layerContext.numZoomLevels,
-            units: layerContext.units,
-            isBaseLayer: layerContext.isBaseLayer,
-            opacity: layerContext.opacity,
-            displayInLayerSwitcher: layerContext.displayInLayerSwitcher,
-            singleTile: layerContext.singleTile,
-            tileSize: (layerContext.tileSize) ? 
-                new OpenLayers.Size(
-                    layerContext.tileSize.width, 
-                    layerContext.tileSize.height
-                ) : undefined,
-            minScale: layerContext.minScale || layerContext.maxScaleDenominator,
-            maxScale: layerContext.maxScale || layerContext.minScaleDenominator,
-            srs: layerContext.srs,
-            dimensions: layerContext.dimensions,
-            metadataURL: layerContext.metadataURL
-        };
-        if (this.layerOptions) {
-            OpenLayers.Util.applyDefaults(options, this.layerOptions);
-        }
-
-        var params = {
-            layers: layerContext.name,
-            transparent: layerContext.transparent,
-            version: layerContext.version
-        };
-        if (layerContext.formats && layerContext.formats.length>0) {
-            // set default value for params if current attribute is not positionned
-            params.format = layerContext.formats[0].value;
-            for (i=0, len=layerContext.formats.length; i<len; i++) {
-                var format = layerContext.formats[i];
-                if (format.current == true) {
-                    params.format = format.value;
-                    break;
-                }
-            }
-        }
-        if (layerContext.styles && layerContext.styles.length>0) {
-            for (i=0, len=layerContext.styles.length; i<len; i++) {
-                var style = layerContext.styles[i];
-                if (style.current == true) {
-                    // three style types to consider
-                    // 1) linked SLD
-                    // 2) inline SLD
-                    // 3) named style
-                    if(style.href) {
-                        params.sld = style.href;
-                    } else if(style.body) {
-                        params.sld_body = style.body;
-                    } else {
-                        params.styles = style.name;
-                    }
-                    break;
-                }
-            }
-        }
-        if (this.layerParams) {
-            OpenLayers.Util.applyDefaults(params, this.layerParams);
-        }
-
-        var layer = null;
-        var service = layerContext.service;
-        if (service == OpenLayers.Format.Context.serviceTypes.WFS) {
-            options.strategies = [new OpenLayers.Strategy.BBOX()];
-            options.protocol = new OpenLayers.Protocol.WFS({
-                url: layerContext.url,
-                // since we do not know featureNS, let the protocol
-                // determine it automagically using featurePrefix
-                featurePrefix: layerContext.name.split(":")[0],
-                featureType: layerContext.name.split(":").pop()
-            });
-            layer = new OpenLayers.Layer.Vector(
-                layerContext.title || layerContext.name,
-                options
-            );
-        } else if (service == OpenLayers.Format.Context.serviceTypes.KML) {
-            // use a vector layer with an HTTP Protcol and a Fixed strategy
-            options.strategies = [new OpenLayers.Strategy.Fixed()];
-            options.protocol = new OpenLayers.Protocol.HTTP({
-                url: layerContext.url, 
-                format: new OpenLayers.Format.KML()
-            });
-            layer = new OpenLayers.Layer.Vector(
-                layerContext.title || layerContext.name,
-                options
-            );
-        } else if (service == OpenLayers.Format.Context.serviceTypes.GML) {
-            // use a vector layer with a HTTP Protocol and a Fixed strategy
-            options.strategies = [new OpenLayers.Strategy.Fixed()];
-            options.protocol = new OpenLayers.Protocol.HTTP({
-                url: layerContext.url, 
-                format: new OpenLayers.Format.GML()
-            });
-            layer = new OpenLayers.Layer.Vector(
-                layerContext.title || layerContext.name,
-                options
-            );
-        } else if (layerContext.features) {
-            // inline GML or KML features
-            layer = new OpenLayers.Layer.Vector(
-                layerContext.title || layerContext.name,
-                options
-            );
-            layer.addFeatures(layerContext.features);
-        } else if (layerContext.categoryLayer !== true) {
-            layer = new OpenLayers.Layer.WMS(
-                layerContext.title || layerContext.name,
-                layerContext.url,
-                params,
-                options
-            );
-        }
-        return layer;
-    },
-
-    /**
-     * Method: getLayersFromContext
-     * Create an array of layers from an array of layerContext objects.
-     *
-     * Parameters:
-     * layersContext - {Array(Object)} An array of objects representing layers.
-     *
-     * Returns:
-     * {Array(<OpenLayers.Layer>)} An array of layers.
-     */
-    getLayersFromContext: function(layersContext) {
-        var layers = [];
-        for (var i=0, len=layersContext.length; i<len; i++) {
-            var layer = this.getLayerFromContext(layersContext[i]);
-            if (layer !== null) {
-                layers.push(layer);
-            }
-        }
-        return layers;
-    },
-
-    /**
-     * Method: contextToMap
-     * Create a map given a context object.
-     *
-     * Parameters:
-     * context - {Object} The context object.
-     * options - {Object} Default map options.
-     *
-     * Returns:
-     * {<OpenLayers.Map>} A map based on the context object.
-     */
-    contextToMap: function(context, options) {
-        options = OpenLayers.Util.applyDefaults({
-            maxExtent:  context.maxExtent,
-            projection: context.projection,
-            units:      context.units
-        }, options);
-
-        if (options.maxExtent) {
-            options.maxResolution = 
-                options.maxExtent.getWidth() / OpenLayers.Map.TILE_WIDTH;
-        }
-
-        var metadata = {
-            contactInformation: context.contactInformation,
-            "abstract":         context["abstract"],
-            keywords:           context.keywords,
-            logo:               context.logo,
-            descriptionURL:     context.descriptionURL
-        };
-
-        options.metadata = metadata;
-
-        var map = new OpenLayers.Map(options);
-        map.addLayers(this.getLayersFromContext(context.layersContext));
-        map.setCenter(
-            context.bounds.getCenterLonLat(),
-            map.getZoomForExtent(context.bounds, true)
-        );
-        return map;
-    },
-
-    /**
-     * Method: mergeContextToMap
-     * Add layers from a context object to a map.
-     *
-     * Parameters:
-     * context - {Object} The context object.
-     * map - {<OpenLayers.Map>} The map.
-     *
-     * Returns:
-     * {<OpenLayers.Map>} The same map with layers added.
-     */
-    mergeContextToMap: function(context, map) {
-        map.addLayers(this.getLayersFromContext(context.layersContext));
-        return map;
-    },
-
-    /**
-     * APIMethod: write
-     * Write a context document given a map.
-     *
-     * Parameters:
-     * obj - {<OpenLayers.Map> | Object} A map or context object.
-     * options - {Object} Optional configuration object.
-     *
-     * Returns:
-     * {String} A context document string.
-     */
-    write: function(obj, options) {
-        obj = this.toContext(obj);
-        return OpenLayers.Format.XML.VersionedOGC.prototype.write.apply(this,
-            arguments);
-    },
-
-    CLASS_NAME: "OpenLayers.Format.Context"
-});
-
-/**
- * Constant: OpenLayers.Format.Context.serviceTypes
- * Enumeration for service types
- */
-OpenLayers.Format.Context.serviceTypes = {
-    "WMS": "urn:ogc:serviceType:WMS",
-    "WFS": "urn:ogc:serviceType:WFS",
-    "WCS": "urn:ogc:serviceType:WCS",
-    "GML": "urn:ogc:serviceType:GML",
-    "SLD": "urn:ogc:serviceType:SLD",
-    "FES": "urn:ogc:serviceType:FES",
-    "KML": "urn:ogc:serviceType:KML"
-};
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/EncodedPolyline.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/EncodedPolyline.js
deleted file mode 100644
index e10e8b27..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/EncodedPolyline.js
+++ /dev/null
@@ -1,557 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format.js
- * @requires OpenLayers/Feature/Vector.js
- */
-
-/**
- * Class: OpenLayers.Format.EncodedPolyline
- * Class for reading and writing encoded polylines.  Create a new instance
- * with the <OpenLayers.Format.EncodedPolyline> constructor.
- *
- * Inherits from:
- *  - <OpenLayers.Format>
- */
-OpenLayers.Format.EncodedPolyline = OpenLayers.Class(OpenLayers.Format, {
-
-    /**
-     * APIProperty: geometryType
-     * {String} Geometry type to output. One of: linestring (default),
-     *     linearring, point, multipoint or polygon. If the geometryType is
-     *     point, only the first point of the string is returned.
-     */
-    geometryType: "linestring",
-
-    /**
-     * Constructor: OpenLayers.Format.EncodedPolyline
-     * Create a new parser for encoded polylines
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be set on
-     *           this instance
-     *
-     * Returns:
-     * {<OpenLayers.Format.EncodedPolyline>} A new encoded polylines parser.
-     */
-    initialize: function(options) {
-        OpenLayers.Format.prototype.initialize.apply(this, [options]);
-    },
-
-    /**
-     * APIMethod: read
-     * Deserialize an encoded polyline string and return a vector feature.
-     *
-     * Parameters:
-     * encoded - {String} An encoded polyline string
-     *
-     * Returns:
-     * {<OpenLayers.Feature.Vector>} A vector feature with a linestring.
-     */
-    read: function(encoded) {
-        var geomType;
-        if (this.geometryType == "linestring")
-            geomType = OpenLayers.Geometry.LineString;
-        else if (this.geometryType == "linearring")
-            geomType = OpenLayers.Geometry.LinearRing;
-        else if (this.geometryType == "multipoint")
-            geomType = OpenLayers.Geometry.MultiPoint;
-        else if (this.geometryType != "point" && this.geometryType != "polygon")
-            return null;
-
-        var flatPoints = this.decodeDeltas(encoded, 2);
-        var flatPointsLength = flatPoints.length;
-
-        var pointGeometries = [];
-        for (var i = 0; i + 1 < flatPointsLength;) {
-            var y = flatPoints[i++], x = flatPoints[i++];
-            pointGeometries.push(new OpenLayers.Geometry.Point(x, y));
-        }
-
-
-        if (this.geometryType == "point")
-            return new OpenLayers.Feature.Vector(
-                pointGeometries[0]
-            );
-
-        if (this.geometryType == "polygon")
-            return new OpenLayers.Feature.Vector(
-                new OpenLayers.Geometry.Polygon([
-                    new OpenLayers.Geometry.LinearRing(pointGeometries)
-                ])
-            );
-
-        return new OpenLayers.Feature.Vector(
-            new geomType(pointGeometries)
-        );
-    },
-
-    /**
-     * APIMethod: decode
-     * Deserialize an encoded string and return an array of n-dimensional
-     * points.
-     *
-     * Parameters:
-     * encoded - {String} An encoded string
-     * dims - {int} The dimension of the points that are returned
-     *
-     * Returns:
-     * {Array(Array(int))} An array containing n-dimensional arrays of
-     *     coordinates.
-     */
-    decode: function(encoded, dims, opt_factor) {
-        var factor = opt_factor || 1e5;
-        var flatPoints = this.decodeDeltas(encoded, dims, factor);
-        var flatPointsLength = flatPoints.length;
-
-        var points = [];
-        for (var i = 0; i + (dims - 1) < flatPointsLength;) {
-            var point = [];
-
-            for (var dim = 0; dim < dims; ++dim) {
-                point.push(flatPoints[i++])
-            }
-
-            points.push(point);
-        }
-
-        return points;
-    },
-
-    /**
-     * APIMethod: write
-     * Serialize a feature or array of features into a WKT string.
-     *
-     * Parameters:
-     * features - {<OpenLayers.Feature.Vector>|Array} A feature or array of
-     *            features
-     *
-     * Returns:
-     * {String} The WKT string representation of the input geometries
-     */
-    write: function(features) {
-        var feature;
-        if (features.constructor == Array)
-            feature = features[0];
-        else
-            feature = features;
-
-        var geometry = feature.geometry;
-        var type = geometry.CLASS_NAME.split('.')[2].toLowerCase();
-
-        var pointGeometries;
-        if (type == "point")
-            pointGeometries = new Array(geometry);
-        else if (type == "linestring" ||
-                 type == "linearring" ||
-                 type == "multipoint")
-            pointGeometries = geometry.components;
-        else if (type == "polygon")
-            pointGeometries = geometry.components[0].components;
-        else
-            return null;
-
-        var flatPoints = [];
-
-        var pointGeometriesLength = pointGeometries.length;
-        for (var i = 0; i < pointGeometriesLength; ++i) {
-            var pointGeometry = pointGeometries[i];
-            flatPoints.push(pointGeometry.y);
-            flatPoints.push(pointGeometry.x);
-        }
-
-        return this.encodeDeltas(flatPoints, 2);
-    },
-
-    /**
-     * APIMethod: encode
-     * Serialize an array of n-dimensional points and return an encoded string
-     *
-     * Parameters:
-     * points - {Array(Array(int))} An array containing n-dimensional
-     *          arrays of coordinates
-     * dims - {int} The dimension of the points that should be read
-     *
-     * Returns:
-     * {String} An encoded string
-     */
-    encode: function (points, dims, opt_factor) {
-        var factor = opt_factor || 1e5;
-        var flatPoints = [];
-
-        var pointsLength = points.length;
-        for (var i = 0; i < pointsLength; ++i) {
-            var point = points[i];
-
-            for (var dim = 0; dim < dims; ++dim) {
-                flatPoints.push(point[dim]);
-            }
-        }
-
-        return this.encodeDeltas(flatPoints, dims, factor);
-    },
-
-    /**
-     * APIMethod: encodeDeltas
-     * Encode a list of n-dimensional points and return an encoded string
-     *
-     * Attention: This function will modify the passed array!
-     *
-     * Parameters:
-     * numbers - {Array.<number>} A list of n-dimensional points.
-     * dimension - {number} The dimension of the points in the list.
-     * opt_factor - {number=} The factor by which the numbers will be
-     * multiplied. The remaining decimal places will get rounded away.
-     *
-     * Returns:
-     * {string} The encoded string.
-     */
-    encodeDeltas: function(numbers, dimension, opt_factor) {
-      var factor = opt_factor || 1e5;
-      var d;
-
-      var lastNumbers = new Array(dimension);
-      for (d = 0; d < dimension; ++d) {
-        lastNumbers[d] = 0;
-      }
-
-      var numbersLength = numbers.length;
-      for (var i = 0; i < numbersLength;) {
-        for (d = 0; d < dimension; ++d, ++i) {
-          var num = numbers[i];
-          var delta = num - lastNumbers[d];
-          lastNumbers[d] = num;
-
-          numbers[i] = delta;
-        }
-      }
-
-      return this.encodeFloats(numbers, factor);
-    },
-
-
-    /**
-     * APIMethod: decodeDeltas
-     * Decode a list of n-dimensional points from an encoded string
-     *
-     * Parameters:
-     * encoded - {string} An encoded string.
-     * dimension - {number} The dimension of the points in the encoded string.
-     * opt_factor - {number=} The factor by which the resulting numbers will
-     * be divided.
-     *
-     * Returns:
-     * {Array.<number>} A list of n-dimensional points.
-     */
-    decodeDeltas: function(encoded, dimension, opt_factor) {
-      var factor = opt_factor || 1e5;
-      var d;
-
-      var lastNumbers = new Array(dimension);
-      for (d = 0; d < dimension; ++d) {
-        lastNumbers[d] = 0;
-      }
-
-      var numbers = this.decodeFloats(encoded, factor);
-
-      var numbersLength = numbers.length;
-      for (var i = 0; i < numbersLength;) {
-        for (d = 0; d < dimension; ++d, ++i) {
-          lastNumbers[d] += numbers[i];
-
-          numbers[i] = lastNumbers[d];
-        }
-      }
-
-      return numbers;
-    },
-
-
-    /**
-     * APIMethod: encodeFloats
-     * Encode a list of floating point numbers and return an encoded string
-     *
-     * Attention: This function will modify the passed array!
-     *
-     * Parameters:
-     * numbers - {Array.<number>} A list of floating point numbers.
-     * opt_factor - {number=} The factor by which the numbers will be
-     * multiplied. The remaining decimal places will get rounded away.
-     *
-     * Returns:
-     * {string} The encoded string.
-     */
-    encodeFloats: function(numbers, opt_factor) {
-      var factor = opt_factor || 1e5;
-
-      var numbersLength = numbers.length;
-      for (var i = 0; i < numbersLength; ++i) {
-        numbers[i] = Math.round(numbers[i] * factor);
-      }
-
-      return this.encodeSignedIntegers(numbers);
-    },
-
-
-    /**
-     * APIMethod: decodeFloats
-     * Decode a list of floating point numbers from an encoded string
-     *
-     * Parameters:
-     * encoded - {string} An encoded string.
-     * opt_factor - {number=} The factor by which the result will be divided.
-     *
-     * Returns:
-     * {Array.<number>} A list of floating point numbers.
-     */
-    decodeFloats: function(encoded, opt_factor) {
-      var factor = opt_factor || 1e5;
-
-      var numbers = this.decodeSignedIntegers(encoded);
-
-      var numbersLength = numbers.length;
-      for (var i = 0; i < numbersLength; ++i) {
-        numbers[i] /= factor;
-      }
-
-      return numbers;
-    },
-
-
-    /**
-     * APIMethod: encodeSignedIntegers
-     * Encode a list of signed integers and return an encoded string
-     *
-     * Attention: This function will modify the passed array!
-     *
-     * Parameters:
-     * numbers - {Array.<number>} A list of signed integers.
-     *
-     * Returns:
-     * {string} The encoded string.
-     */
-    encodeSignedIntegers: function(numbers) {
-      var numbersLength = numbers.length;
-      for (var i = 0; i < numbersLength; ++i) {
-        var num = numbers[i];
-
-        var signedNum = num << 1;
-        if (num < 0) {
-          signedNum = ~(signedNum);
-        }
-
-        numbers[i] = signedNum;
-      }
-
-      return this.encodeUnsignedIntegers(numbers);
-    },
-
-
-    /**
-     * APIMethod: decodeSignedIntegers
-     * Decode a list of signed integers from an encoded string
-     *
-     * Parameters:
-     * encoded - {string} An encoded string.
-     *
-     * Returns:
-     * {Array.<number>} A list of signed integers.
-     */
-    decodeSignedIntegers: function(encoded) {
-      var numbers = this.decodeUnsignedIntegers(encoded);
-
-      var numbersLength = numbers.length;
-      for (var i = 0; i < numbersLength; ++i) {
-        var num = numbers[i];
-        numbers[i] = (num & 1) ? ~(num >> 1) : (num >> 1);
-      }
-
-      return numbers;
-    },
-
-
-    /**
-     * APIMethod: encodeUnsignedIntegers
-     * Encode a list of unsigned integers and return an encoded string
-     *
-     * Parameters:
-     * numbers - {Array.<number>} A list of unsigned integers.
-     *
-     * Returns:
-     * {string} The encoded string.
-     */
-    encodeUnsignedIntegers: function(numbers) {
-      var encoded = '';
-
-      var numbersLength = numbers.length;
-      for (var i = 0; i < numbersLength; ++i) {
-        encoded += this.encodeUnsignedInteger(numbers[i]);
-      }
-
-      return encoded;
-    },
-
-
-    /**
-     * APIMethod: decodeUnsignedIntegers
-     * Decode a list of unsigned integers from an encoded string
-     *
-     * Parameters:
-     * encoded - {string} An encoded string.
-     *
-     * Returns:
-     * {Array.<number>} A list of unsigned integers.
-     */
-    decodeUnsignedIntegers: function(encoded) {
-      var numbers = [];
-
-      var current = 0;
-      var shift = 0;
-
-      var encodedLength = encoded.length;
-      for (var i = 0; i < encodedLength; ++i) {
-        var b = encoded.charCodeAt(i) - 63;
-
-        current |= (b & 0x1f) << shift;
-
-        if (b < 0x20) {
-          numbers.push(current);
-          current = 0;
-          shift = 0;
-        } else {
-          shift += 5;
-        }
-      }
-
-      return numbers;
-    },
-
-
-    /**
-     * Method: encodeFloat
-     * Encode one single floating point number and return an encoded string
-     *
-     * Parameters:
-     * num - {number} Floating point number that should be encoded.
-     * opt_factor - {number=} The factor by which num will be multiplied.
-     * The remaining decimal places will get rounded away.
-     *
-     * Returns:
-     * {string} The encoded string.
-     */
-    encodeFloat: function(num, opt_factor) {
-      num = Math.round(num * (opt_factor || 1e5));
-      return this.encodeSignedInteger(num);
-    },
-
-
-    /**
-     * Method: decodeFloat
-     * Decode one single floating point number from an encoded string
-     *
-     * Parameters:
-     * encoded - {string} An encoded string.
-     * opt_factor - {number=} The factor by which the result will be divided.
-     *
-     * Returns:
-     * {number} The decoded floating point number.
-     */
-    decodeFloat: function(encoded, opt_factor) {
-      var result = this.decodeSignedInteger(encoded);
-      return result / (opt_factor || 1e5);
-    },
-
-
-    /**
-     * Method: encodeSignedInteger
-     * Encode one single signed integer and return an encoded string
-     *
-     * Parameters:
-     * num - {number} Signed integer that should be encoded.
-     *
-     * Returns:
-     * {string} The encoded string.
-     */
-    encodeSignedInteger: function(num) {
-      var signedNum = num << 1;
-      if (num < 0) {
-        signedNum = ~(signedNum);
-      }
-
-      return this.encodeUnsignedInteger(signedNum);
-    },
-
-
-    /**
-     * Method: decodeSignedInteger
-     * Decode one single signed integer from an encoded string
-     *
-     * Parameters:
-     * encoded - {string} An encoded string.
-     *
-     * Returns:
-     * {number} The decoded signed integer.
-     */
-    decodeSignedInteger: function(encoded) {
-      var result = this.decodeUnsignedInteger(encoded);
-      return ((result & 1) ? ~(result >> 1) : (result >> 1));
-    },
-
-
-    /**
-     * Method: encodeUnsignedInteger
-     * Encode one single unsigned integer and return an encoded string
-     *
-     * Parameters:
-     * num - {number} Unsigned integer that should be encoded.
-     *
-     * Returns:
-     * {string} The encoded string.
-     */
-    encodeUnsignedInteger: function(num) {
-      var value, encoded = '';
-      while (num >= 0x20) {
-        value = (0x20 | (num & 0x1f)) + 63;
-        encoded += (String.fromCharCode(value));
-        num >>= 5;
-      }
-      value = num + 63;
-      encoded += (String.fromCharCode(value));
-      return encoded;
-    },
-
-
-    /**
-     * Method: decodeUnsignedInteger
-     * Decode one single unsigned integer from an encoded string
-     *
-     * Parameters:
-     * encoded - {string} An encoded string.
-     *
-     * Returns:
-     * {number} The decoded unsigned integer.
-     */
-    decodeUnsignedInteger: function(encoded) {
-      var result = 0;
-      var shift = 0;
-
-      var encodedLength = encoded.length;
-      for (var i = 0; i < encodedLength; ++i) {
-        var b = encoded.charCodeAt(i) - 63;
-
-        result |= (b & 0x1f) << shift;
-
-        if (b < 0x20)
-          break;
-
-        shift += 5;
-      }
-
-      return result;
-    },
-
-    CLASS_NAME: "OpenLayers.Format.EncodedPolyline"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/Filter.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/Filter.js
deleted file mode 100644
index 59c06a8e..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/Filter.js
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/XML/VersionedOGC.js
- * @requires OpenLayers/Filter/FeatureId.js
- * @requires OpenLayers/Filter/Logical.js
- * @requires OpenLayers/Filter/Comparison.js
- */
-
-/**
- * Class: OpenLayers.Format.Filter
- * Read/Write ogc:Filter. Create a new instance with the <OpenLayers.Format.Filter>
- *     constructor.
- * 
- * Inherits from:
- *  - <OpenLayers.Format.XML.VersionedOGC>
- */
-OpenLayers.Format.Filter = OpenLayers.Class(OpenLayers.Format.XML.VersionedOGC, {
-    
-    /**
-     * APIProperty: defaultVersion
-     * {String} Version number to assume if none found.  Default is "1.0.0".
-     */
-    defaultVersion: "1.0.0",
-    
-    /**
-     * APIMethod: write
-     * Write an ogc:Filter given a filter object.
-     *
-     * Parameters:
-     * filter - {<OpenLayers.Filter>} An filter.
-     * options - {Object} Optional configuration object.
-     *
-     * Returns:
-     * {Elment} An ogc:Filter element node.
-     */
-    
-    /**
-     * APIMethod: read
-     * Read and Filter doc and return an object representing the Filter.
-     *
-     * Parameters:
-     * data - {String | DOMElement} Data to read.
-     *
-     * Returns:
-     * {<OpenLayers.Filter>} A filter object.
-     */
-
-    CLASS_NAME: "OpenLayers.Format.Filter" 
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/Filter/v1.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/Filter/v1.js
deleted file mode 100644
index 539ec0f4..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/Filter/v1.js
+++ /dev/null
@@ -1,504 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-/**
- * @requires OpenLayers/Format/Filter.js
- * @requires OpenLayers/Format/XML.js
- * @requires OpenLayers/Filter/Function.js
- * @requires OpenLayers/BaseTypes/Date.js
- */
-
-/**
- * Class: OpenLayers.Format.Filter.v1
- * Superclass for Filter version 1 parsers.
- *
- * Inherits from:
- *  - <OpenLayers.Format.XML>
- */
-OpenLayers.Format.Filter.v1 = OpenLayers.Class(OpenLayers.Format.XML, {
-    
-    /**
-     * Property: namespaces
-     * {Object} Mapping of namespace aliases to namespace URIs.
-     */
-    namespaces: {
-        ogc: "http://www.opengis.net/ogc",
-        gml: "http://www.opengis.net/gml",
-        xlink: "http://www.w3.org/1999/xlink",
-        xsi: "http://www.w3.org/2001/XMLSchema-instance"
-    },
-
-    /**
-     * Property: defaultPrefix
-     */
-    defaultPrefix: "ogc",
-
-    /**
-     * Property: schemaLocation
-     * {String} Schema location for a particular minor version.
-     */
-    schemaLocation: null,
-    
-    /**
-     * Constructor: OpenLayers.Format.Filter.v1
-     * Instances of this class are not created directly.  Use the
-     *     <OpenLayers.Format.Filter> constructor instead.
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be set on
-     *     this instance.
-     */
-    initialize: function(options) {
-        OpenLayers.Format.XML.prototype.initialize.apply(this, [options]);
-    },
-    
-    /**
-     * Method: read
-     *
-     * Parameters:
-     * data - {DOMElement} A Filter document element.
-     *
-     * Returns:
-     * {<OpenLayers.Filter>} A filter object.
-     */
-    read: function(data) {
-        var obj = {};
-        this.readers.ogc["Filter"].apply(this, [data, obj]);
-        return obj.filter;
-    },
-    
-    /**
-     * Property: readers
-     * Contains public functions, grouped by namespace prefix, that will
-     *     be applied when a namespaced node is found matching the function
-     *     name.  The function will be applied in the scope of this parser
-     *     with two arguments: the node being read and a context object passed
-     *     from the parent.
-     */
-    readers: {
-        "ogc": {
-            "_expression": function(node) {
-                // only the simplest of ogc:expression handled
-                // "some text and an <PropertyName>attribute</PropertyName>"}
-                var obj, value = "";
-                for(var child=node.firstChild; child; child=child.nextSibling) {
-                    switch(child.nodeType) {
-                        case 1:
-                            obj = this.readNode(child);
-                            if (obj.property) {
-                                value += "${" + obj.property + "}";
-                            } else if (obj.value !== undefined) {
-                                value += obj.value;
-                            }
-                            break;
-                        case 3: // text node
-                        case 4: // cdata section
-                            value += child.nodeValue;
-                    }
-                }
-                return value;
-            },
-            "Filter": function(node, parent) {
-                // Filters correspond to subclasses of OpenLayers.Filter.
-                // Since they contain information we don't persist, we
-                // create a temporary object and then pass on the filter
-                // (ogc:Filter) to the parent obj.
-                var obj = {
-                    fids: [],
-                    filters: []
-                };
-                this.readChildNodes(node, obj);
-                if(obj.fids.length > 0) {
-                    parent.filter = new OpenLayers.Filter.FeatureId({
-                        fids: obj.fids
-                    });
-                } else if(obj.filters.length > 0) {
-                    parent.filter = obj.filters[0];
-                }
-            },
-            "FeatureId": function(node, obj) {
-                var fid = node.getAttribute("fid");
-                if(fid) {
-                    obj.fids.push(fid);
-                }
-            },
-            "And": function(node, obj) {
-                var filter = new OpenLayers.Filter.Logical({
-                    type: OpenLayers.Filter.Logical.AND
-                });
-                this.readChildNodes(node, filter);
-                obj.filters.push(filter);
-            },
-            "Or": function(node, obj) {
-                var filter = new OpenLayers.Filter.Logical({
-                    type: OpenLayers.Filter.Logical.OR
-                });
-                this.readChildNodes(node, filter);
-                obj.filters.push(filter);
-            },
-            "Not": function(node, obj) {
-                var filter = new OpenLayers.Filter.Logical({
-                    type: OpenLayers.Filter.Logical.NOT
-                });
-                this.readChildNodes(node, filter);
-                obj.filters.push(filter);
-            },
-            "PropertyIsLessThan": function(node, obj) {
-                var filter = new OpenLayers.Filter.Comparison({
-                    type: OpenLayers.Filter.Comparison.LESS_THAN
-                });
-                this.readChildNodes(node, filter);
-                obj.filters.push(filter);
-            },
-            "PropertyIsGreaterThan": function(node, obj) {
-                var filter = new OpenLayers.Filter.Comparison({
-                    type: OpenLayers.Filter.Comparison.GREATER_THAN
-                });
-                this.readChildNodes(node, filter);
-                obj.filters.push(filter);
-            },
-            "PropertyIsLessThanOrEqualTo": function(node, obj) {
-                var filter = new OpenLayers.Filter.Comparison({
-                    type: OpenLayers.Filter.Comparison.LESS_THAN_OR_EQUAL_TO
-                });
-                this.readChildNodes(node, filter);
-                obj.filters.push(filter);
-            },
-            "PropertyIsGreaterThanOrEqualTo": function(node, obj) {
-                var filter = new OpenLayers.Filter.Comparison({
-                    type: OpenLayers.Filter.Comparison.GREATER_THAN_OR_EQUAL_TO
-                });
-                this.readChildNodes(node, filter);
-                obj.filters.push(filter);
-            },
-            "PropertyIsBetween": function(node, obj) {
-                var filter = new OpenLayers.Filter.Comparison({
-                    type: OpenLayers.Filter.Comparison.BETWEEN
-                });
-                this.readChildNodes(node, filter);
-                obj.filters.push(filter);
-            },
-            "Literal": function(node, obj) {
-                obj.value = OpenLayers.String.numericIf(
-                    this.getChildValue(node), true);
-            },
-            "PropertyName": function(node, filter) {
-                filter.property = this.getChildValue(node);
-            },
-            "LowerBoundary": function(node, filter) {
-                filter.lowerBoundary = OpenLayers.String.numericIf(
-                    this.readers.ogc._expression.call(this, node), true);
-            },
-            "UpperBoundary": function(node, filter) {
-                filter.upperBoundary = OpenLayers.String.numericIf(
-                    this.readers.ogc._expression.call(this, node), true);
-            },
-            "Intersects": function(node, obj) {
-                this.readSpatial(node, obj, OpenLayers.Filter.Spatial.INTERSECTS);
-            },
-            "Within": function(node, obj) {
-                this.readSpatial(node, obj, OpenLayers.Filter.Spatial.WITHIN);
-            },
-            "Contains": function(node, obj) {
-                this.readSpatial(node, obj, OpenLayers.Filter.Spatial.CONTAINS);
-            },
-            "DWithin": function(node, obj) {
-                this.readSpatial(node, obj, OpenLayers.Filter.Spatial.DWITHIN);
-            },
-            "Distance": function(node, obj) {
-                obj.distance = parseInt(this.getChildValue(node));
-                obj.distanceUnits = node.getAttribute("units");
-            },
-            "Function": function(node, obj) {
-                //TODO write decoder for it
-                return;
-            },
-            "PropertyIsNull": function(node, obj) {
-                var filter = new OpenLayers.Filter.Comparison({
-                    type: OpenLayers.Filter.Comparison.IS_NULL
-                });
-                this.readChildNodes(node, filter);
-                obj.filters.push(filter);
-            }
-        }
-    },
-    
-    /**
-     * Method: readSpatial
-     *
-     * Read a {<OpenLayers.Filter.Spatial>} filter.
-     * 
-     * Parameters:
-     * node - {DOMElement} A DOM element that contains an ogc:expression.
-     * obj - {Object} The target object.
-     * type - {String} One of the OpenLayers.Filter.Spatial.* constants.
-     *
-     * Returns:
-     * {<OpenLayers.Filter.Spatial>} The created filter.
-     */
-    readSpatial: function(node, obj, type) {
-        var filter = new OpenLayers.Filter.Spatial({
-            type: type
-        });
-        this.readChildNodes(node, filter);
-        filter.value = filter.components[0];
-        delete filter.components;
-        obj.filters.push(filter);
-    },
-
-    /**
-     * APIMethod: encodeLiteral
-     * Generates the string representation of a value for use in <Literal> 
-     *     elements.  The default encoder writes Date values as ISO 8601 
-     *     strings.
-     *
-     * Parameters:
-     * value - {Object} Literal value to encode
-     *
-     * Returns:
-     * {String} String representation of the provided value.
-     */
-    encodeLiteral: function(value) {
-        if (value instanceof Date) {
-            value = OpenLayers.Date.toISOString(value);
-        }
-        return value;
-    },
-
-    /**
-     * Method: writeOgcExpression
-     * Limited support for writing OGC expressions. Currently it supports
-     * (<OpenLayers.Filter.Function> || String || Number)
-     *
-     * Parameters:
-     * value - (<OpenLayers.Filter.Function> || String || Number)
-     * node - {DOMElement} A parent DOM element 
-     *
-     * Returns:
-     * {DOMElement} Updated node element.
-     */
-    writeOgcExpression: function(value, node) {
-        if (value instanceof OpenLayers.Filter.Function){
-            this.writeNode("Function", value, node);
-        } else {
-            this.writeNode("Literal", value, node);
-        }
-        return node;
-    },    
-    
-    /**
-     * Method: write
-     *
-     * Parameters:
-     * filter - {<OpenLayers.Filter>} A filter object.
-     *
-     * Returns:
-     * {DOMElement} An ogc:Filter element.
-     */
-    write: function(filter) {
-        return this.writers.ogc["Filter"].apply(this, [filter]);
-    },
-    
-    /**
-     * Property: writers
-     * As a compliment to the readers property, this structure contains public
-     *     writing functions grouped by namespace alias and named like the
-     *     node names they produce.
-     */
-    writers: {
-        "ogc": {
-            "Filter": function(filter) {
-                var node = this.createElementNSPlus("ogc:Filter");
-                this.writeNode(this.getFilterType(filter), filter, node);
-                return node;
-            },
-            "_featureIds": function(filter) {
-                var node = this.createDocumentFragment();
-                for (var i=0, ii=filter.fids.length; i<ii; ++i) {
-                    this.writeNode("ogc:FeatureId", filter.fids[i], node);
-                }
-                return node;
-            },
-            "FeatureId": function(fid) {
-                return this.createElementNSPlus("ogc:FeatureId", {
-                    attributes: {fid: fid}
-                });
-            },
-            "And": function(filter) {
-                var node = this.createElementNSPlus("ogc:And");
-                var childFilter;
-                for (var i=0, ii=filter.filters.length; i<ii; ++i) {
-                    childFilter = filter.filters[i];
-                    this.writeNode(
-                        this.getFilterType(childFilter), childFilter, node
-                    );
-                }
-                return node;
-            },
-            "Or": function(filter) {
-                var node = this.createElementNSPlus("ogc:Or");
-                var childFilter;
-                for (var i=0, ii=filter.filters.length; i<ii; ++i) {
-                    childFilter = filter.filters[i];
-                    this.writeNode(
-                        this.getFilterType(childFilter), childFilter, node
-                    );
-                }
-                return node;
-            },
-            "Not": function(filter) {
-                var node = this.createElementNSPlus("ogc:Not");
-                var childFilter = filter.filters[0];
-                this.writeNode(
-                    this.getFilterType(childFilter), childFilter, node
-                );
-                return node;
-            },
-            "PropertyIsLessThan": function(filter) {
-                var node = this.createElementNSPlus("ogc:PropertyIsLessThan");
-                // no ogc:expression handling for PropertyName for now
-                this.writeNode("PropertyName", filter, node);
-                // handle Literals or Functions for now
-                this.writeOgcExpression(filter.value, node);
-                return node;
-            },
-            "PropertyIsGreaterThan": function(filter) {
-                var node = this.createElementNSPlus("ogc:PropertyIsGreaterThan");
-                // no ogc:expression handling for PropertyName for now
-                this.writeNode("PropertyName", filter, node);
-                // handle Literals or Functions for now
-                this.writeOgcExpression(filter.value, node);
-                return node;
-            },
-            "PropertyIsLessThanOrEqualTo": function(filter) {
-                var node = this.createElementNSPlus("ogc:PropertyIsLessThanOrEqualTo");
-                // no ogc:expression handling for PropertyName for now
-                this.writeNode("PropertyName", filter, node);
-                // handle Literals or Functions for now
-                this.writeOgcExpression(filter.value, node);
-                return node;
-            },
-            "PropertyIsGreaterThanOrEqualTo": function(filter) {
-                var node = this.createElementNSPlus("ogc:PropertyIsGreaterThanOrEqualTo");
-                // no ogc:expression handling for PropertyName for now
-                this.writeNode("PropertyName", filter, node);
-                // handle Literals or Functions for now
-                this.writeOgcExpression(filter.value, node);
-                return node;
-            },
-            "PropertyIsBetween": function(filter) {
-                var node = this.createElementNSPlus("ogc:PropertyIsBetween");
-                // no ogc:expression handling for PropertyName for now
-                this.writeNode("PropertyName", filter, node);
-                this.writeNode("LowerBoundary", filter, node);
-                this.writeNode("UpperBoundary", filter, node);
-                return node;
-            },
-            "PropertyName": function(filter) {
-                // no ogc:expression handling for now
-                return this.createElementNSPlus("ogc:PropertyName", {
-                    value: filter.property
-                });
-            },
-            "Literal": function(value) {
-                var encode = this.encodeLiteral ||
-                    OpenLayers.Format.Filter.v1.prototype.encodeLiteral;
-                return this.createElementNSPlus("ogc:Literal", {
-                    value: encode(value)
-                });
-            },
-            "LowerBoundary": function(filter) {
-                // handle Literals or Functions for now
-                var node = this.createElementNSPlus("ogc:LowerBoundary");
-                this.writeOgcExpression(filter.lowerBoundary, node);
-                return node;
-            },
-            "UpperBoundary": function(filter) {
-                // handle Literals or Functions for now
-                var node = this.createElementNSPlus("ogc:UpperBoundary");
-                this.writeNode("Literal", filter.upperBoundary, node);
-                return node;
-            },
-            "INTERSECTS": function(filter) {
-                return this.writeSpatial(filter, "Intersects");
-            },
-            "WITHIN": function(filter) {
-                return this.writeSpatial(filter, "Within");
-            },
-            "CONTAINS": function(filter) {
-                return this.writeSpatial(filter, "Contains");
-            },
-            "DWITHIN": function(filter) {
-                var node = this.writeSpatial(filter, "DWithin");
-                this.writeNode("Distance", filter, node);
-                return node;
-            },
-            "Distance": function(filter) {
-                return this.createElementNSPlus("ogc:Distance", {
-                    attributes: {
-                        units: filter.distanceUnits
-                    },
-                    value: filter.distance
-                });
-            },
-            "Function": function(filter) {
-                var node = this.createElementNSPlus("ogc:Function", {
-                    attributes: {
-                        name: filter.name
-                    }
-                });
-                var params = filter.params;
-                for(var i=0, len=params.length; i<len; i++){
-                    this.writeOgcExpression(params[i], node);
-                }
-                return node;
-            },
-            "PropertyIsNull": function(filter) {
-                var node = this.createElementNSPlus("ogc:PropertyIsNull");
-                this.writeNode("PropertyName", filter, node);
-                return node;
-            }
-        }
-    },
-
-    /**
-     * Method: getFilterType
-     */
-    getFilterType: function(filter) {
-        var filterType = this.filterMap[filter.type];
-        if(!filterType) {
-            throw "Filter writing not supported for rule type: " + filter.type;
-        }
-        return filterType;
-    },
-    
-    /**
-     * Property: filterMap
-     * {Object} Contains a member for each filter type.  Values are node names
-     *     for corresponding OGC Filter child elements.
-     */
-    filterMap: {
-        "&&": "And",
-        "||": "Or",
-        "!": "Not",
-        "==": "PropertyIsEqualTo",
-        "!=": "PropertyIsNotEqualTo",
-        "<": "PropertyIsLessThan",
-        ">": "PropertyIsGreaterThan",
-        "<=": "PropertyIsLessThanOrEqualTo",
-        ">=": "PropertyIsGreaterThanOrEqualTo",
-        "..": "PropertyIsBetween",
-        "~": "PropertyIsLike",
-        "NULL": "PropertyIsNull",
-        "BBOX": "BBOX",
-        "DWITHIN": "DWITHIN",
-        "WITHIN": "WITHIN",
-        "CONTAINS": "CONTAINS",
-        "INTERSECTS": "INTERSECTS",
-        "FID": "_featureIds"
-    },
-
-    CLASS_NAME: "OpenLayers.Format.Filter.v1" 
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/Filter/v1_0_0.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/Filter/v1_0_0.js
deleted file mode 100644
index 52e650e4..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/Filter/v1_0_0.js
+++ /dev/null
@@ -1,184 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/GML/v2.js
- * @requires OpenLayers/Format/Filter/v1.js
- */
-
-/**
- * Class: OpenLayers.Format.Filter.v1_0_0
- * Write ogc:Filter version 1.0.0.
- * 
- * Inherits from:
- *  - <OpenLayers.Format.GML.v2>
- *  - <OpenLayers.Format.Filter.v1>
- */
-OpenLayers.Format.Filter.v1_0_0 = OpenLayers.Class(
-    OpenLayers.Format.GML.v2, OpenLayers.Format.Filter.v1, {
-    
-    /**
-     * Constant: VERSION
-     * {String} 1.0.0
-     */
-    VERSION: "1.0.0",
-    
-    /**
-     * Property: schemaLocation
-     * {String} http://www.opengis.net/ogc/filter/1.0.0/filter.xsd
-     */
-    schemaLocation: "http://www.opengis.net/ogc/filter/1.0.0/filter.xsd",
-
-    /**
-     * Constructor: OpenLayers.Format.Filter.v1_0_0
-     * Instances of this class are not created directly.  Use the
-     *     <OpenLayers.Format.Filter> constructor instead.
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be set on
-     *     this instance.
-     */
-    initialize: function(options) {
-        OpenLayers.Format.GML.v2.prototype.initialize.apply(
-            this, [options]
-        );
-    },
-
-    /**
-     * Property: readers
-     * Contains public functions, grouped by namespace prefix, that will
-     *     be applied when a namespaced node is found matching the function
-     *     name.  The function will be applied in the scope of this parser
-     *     with two arguments: the node being read and a context object passed
-     *     from the parent.
-     */
-    readers: {
-        "ogc": OpenLayers.Util.applyDefaults({
-            "PropertyIsEqualTo": function(node, obj) {
-                var filter = new OpenLayers.Filter.Comparison({
-                    type: OpenLayers.Filter.Comparison.EQUAL_TO
-                });
-                this.readChildNodes(node, filter);
-                obj.filters.push(filter);
-            },
-            "PropertyIsNotEqualTo": function(node, obj) {
-                var filter = new OpenLayers.Filter.Comparison({
-                    type: OpenLayers.Filter.Comparison.NOT_EQUAL_TO
-                });
-                this.readChildNodes(node, filter);
-                obj.filters.push(filter);
-            },
-            "PropertyIsLike": function(node, obj) {
-                var filter = new OpenLayers.Filter.Comparison({
-                    type: OpenLayers.Filter.Comparison.LIKE
-                });
-                this.readChildNodes(node, filter);
-                var wildCard = node.getAttribute("wildCard");
-                var singleChar = node.getAttribute("singleChar");
-                var esc = node.getAttribute("escape");
-                filter.value2regex(wildCard, singleChar, esc);
-                obj.filters.push(filter);
-            }
-        }, OpenLayers.Format.Filter.v1.prototype.readers["ogc"]),
-        "gml": OpenLayers.Format.GML.v2.prototype.readers["gml"],
-        "feature": OpenLayers.Format.GML.v2.prototype.readers["feature"]        
-    },
-
-    /**
-     * Property: writers
-     * As a compliment to the readers property, this structure contains public
-     *     writing functions grouped by namespace alias and named like the
-     *     node names they produce.
-     */
-    writers: {
-        "ogc": OpenLayers.Util.applyDefaults({
-            "PropertyIsEqualTo": function(filter) {
-                var node = this.createElementNSPlus("ogc:PropertyIsEqualTo");
-                // no ogc:expression handling for PropertyName for now
-                this.writeNode("PropertyName", filter, node);
-                // handle Literals or Functions for now
-                this.writeOgcExpression(filter.value, node);
-                return node;
-            },
-            "PropertyIsNotEqualTo": function(filter) {
-                var node = this.createElementNSPlus("ogc:PropertyIsNotEqualTo");
-                // no ogc:expression handling for PropertyName for now
-                this.writeNode("PropertyName", filter, node);
-                // handle Literals or Functions for now
-                this.writeOgcExpression(filter.value, node);
-                return node;
-            },
-            "PropertyIsLike": function(filter) {
-                var node = this.createElementNSPlus("ogc:PropertyIsLike", {
-                    attributes: {
-                        wildCard: "*", singleChar: ".", escape: "!"
-                    }
-                });
-                // no ogc:expression handling for now
-                this.writeNode("PropertyName", filter, node);
-                // convert regex string to ogc string
-                this.writeNode("Literal", filter.regex2value(), node);
-                return node;
-            },
-            "BBOX": function(filter) {
-                var node = this.createElementNSPlus("ogc:BBOX");
-                // PropertyName is mandatory in 1.0.0, but e.g. GeoServer also
-                // accepts filters without it. When this is used with
-                // OpenLayers.Protocol.WFS, OpenLayers.Format.WFST will set a
-                // missing filter.property to the geometryName that is
-                // configured with the protocol, which defaults to "the_geom".
-                // So the only way to omit this mandatory property is to not
-                // set the property on the filter and to set the geometryName
-                // on the WFS protocol to null. The latter also happens when
-                // the protocol is configured without a geometryName and a
-                // featureNS.
-                filter.property && this.writeNode("PropertyName", filter, node);
-                var box = this.writeNode("gml:Box", filter.value, node);
-                if(filter.projection) {
-                    box.setAttribute("srsName", filter.projection);
-                }
-                return node;
-            }
-        }, OpenLayers.Format.Filter.v1.prototype.writers["ogc"]),
-        "gml": OpenLayers.Format.GML.v2.prototype.writers["gml"],
-        "feature": OpenLayers.Format.GML.v2.prototype.writers["feature"]
-    },
-
-    /**
-     * Method: writeSpatial
-     *
-     * Read a {<OpenLayers.Filter.Spatial>} filter and converts it into XML.
-     *
-     * Parameters:
-     * filter - {<OpenLayers.Filter.Spatial>} The filter.
-     * name - {String} Name of the generated XML element.
-     *
-     * Returns:
-     * {DOMElement} The created XML element.
-     */
-    writeSpatial: function(filter, name) {
-        var node = this.createElementNSPlus("ogc:"+name);
-        this.writeNode("PropertyName", filter, node);
-        if(filter.value instanceof OpenLayers.Filter.Function) {
-            this.writeNode("Function", filter.value, node);
-        } else {
-        var child;
-        if(filter.value instanceof OpenLayers.Geometry) {
-            child = this.writeNode("feature:_geometry", filter.value).firstChild;
-        } else {
-            child = this.writeNode("gml:Box", filter.value);
-        }
-        if(filter.projection) {
-            child.setAttribute("srsName", filter.projection);
-        }
-        node.appendChild(child);
-        }
-        return node;
-    },
-
-
-    CLASS_NAME: "OpenLayers.Format.Filter.v1_0_0" 
-
-});
\ No newline at end of file
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/Filter/v1_1_0.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/Filter/v1_1_0.js
deleted file mode 100644
index 628c4890..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/Filter/v1_1_0.js
+++ /dev/null
@@ -1,222 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/Filter/v1.js
- * @requires OpenLayers/Format/GML/v3.js
- */
-
-/**
- * Class: OpenLayers.Format.Filter.v1_1_0
- * Write ogc:Filter version 1.1.0.
- *
- * Differences from the v1.0.0 parser:
- *  - uses GML v3 instead of GML v2
- *  - reads matchCase attribute on ogc:PropertyIsEqual and
- *        ogc:PropertyIsNotEqual elements.
- *  - writes matchCase attribute from comparison filters of type EQUAL_TO,
- *        NOT_EQUAL_TO and LIKE.
- * 
- * Inherits from: 
- *  - <OpenLayers.Format.GML.v3>
- *  - <OpenLayers.Format.Filter.v1>
- */
-OpenLayers.Format.Filter.v1_1_0 = OpenLayers.Class(
-    OpenLayers.Format.GML.v3, OpenLayers.Format.Filter.v1, {
-    
-    /**
-     * Constant: VERSION
-     * {String} 1.1.0
-     */
-    VERSION: "1.1.0",
-    
-    /**
-     * Property: schemaLocation
-     * {String} http://www.opengis.net/ogc/filter/1.1.0/filter.xsd
-     */
-    schemaLocation: "http://www.opengis.net/ogc/filter/1.1.0/filter.xsd",
-
-    /**
-     * Constructor: OpenLayers.Format.Filter.v1_1_0
-     * Instances of this class are not created directly.  Use the
-     *     <OpenLayers.Format.Filter> constructor instead.
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be set on
-     *     this instance.
-     */
-    initialize: function(options) {
-        OpenLayers.Format.GML.v3.prototype.initialize.apply(
-            this, [options]
-        );
-    },
-
-    /**
-     * Property: readers
-     * Contains public functions, grouped by namespace prefix, that will
-     *     be applied when a namespaced node is found matching the function
-     *     name.  The function will be applied in the scope of this parser
-     *     with two arguments: the node being read and a context object passed
-     *     from the parent.
-     */
-    readers: {
-        "ogc": OpenLayers.Util.applyDefaults({
-            "PropertyIsEqualTo": function(node, obj) {
-                var matchCase = node.getAttribute("matchCase");
-                var filter = new OpenLayers.Filter.Comparison({
-                    type: OpenLayers.Filter.Comparison.EQUAL_TO,
-                    matchCase: !(matchCase === "false" || matchCase === "0")
-                });
-                this.readChildNodes(node, filter);
-                obj.filters.push(filter);
-            },
-            "PropertyIsNotEqualTo": function(node, obj) {
-                var matchCase = node.getAttribute("matchCase");
-                var filter = new OpenLayers.Filter.Comparison({
-                    type: OpenLayers.Filter.Comparison.NOT_EQUAL_TO,
-                    matchCase: !(matchCase === "false" || matchCase === "0")
-                });
-                this.readChildNodes(node, filter);
-                obj.filters.push(filter);
-            },
-            "PropertyIsLike": function(node, obj) {
-                var filter = new OpenLayers.Filter.Comparison({
-                    type: OpenLayers.Filter.Comparison.LIKE
-                });
-                this.readChildNodes(node, filter);
-                var wildCard = node.getAttribute("wildCard");
-                var singleChar = node.getAttribute("singleChar");
-                var esc = node.getAttribute("escapeChar");
-                filter.value2regex(wildCard, singleChar, esc);
-                obj.filters.push(filter);
-            }
-        }, OpenLayers.Format.Filter.v1.prototype.readers["ogc"]),
-        "gml": OpenLayers.Format.GML.v3.prototype.readers["gml"],
-        "feature": OpenLayers.Format.GML.v3.prototype.readers["feature"]        
-    },
-
-    /**
-     * Property: writers
-     * As a compliment to the readers property, this structure contains public
-     *     writing functions grouped by namespace alias and named like the
-     *     node names they produce.
-     */
-    writers: {
-        "ogc": OpenLayers.Util.applyDefaults({
-            "PropertyIsEqualTo": function(filter) {
-                var node = this.createElementNSPlus("ogc:PropertyIsEqualTo", {
-                    attributes: {matchCase: filter.matchCase}
-                });
-                // no ogc:expression handling for PropertyName for now
-                this.writeNode("PropertyName", filter, node);
-                // handle Literals or Functions for now
-                this.writeOgcExpression(filter.value, node);
-                return node;
-            },
-            "PropertyIsNotEqualTo": function(filter) {
-                var node = this.createElementNSPlus("ogc:PropertyIsNotEqualTo", {
-                    attributes: {matchCase: filter.matchCase}
-                });
-                // no ogc:expression handling for PropertyName for now
-                this.writeNode("PropertyName", filter, node);
-                // handle Literals or Functions for now
-                this.writeOgcExpression(filter.value, node);
-                return node;
-            },
-            "PropertyIsLike": function(filter) {
-                var node = this.createElementNSPlus("ogc:PropertyIsLike", {
-                    attributes: {
-                        matchCase: filter.matchCase,
-                        wildCard: "*", singleChar: ".", escapeChar: "!"
-                    }
-                });
-                // no ogc:expression handling for now
-                this.writeNode("PropertyName", filter, node);
-                // convert regex string to ogc string
-                this.writeNode("Literal", filter.regex2value(), node);
-                return node;
-            },
-            "BBOX": function(filter) {
-                var node = this.createElementNSPlus("ogc:BBOX");
-                // PropertyName is optional in 1.1.0
-                filter.property && this.writeNode("PropertyName", filter, node);
-                var box = this.writeNode("gml:Envelope", filter.value);
-                if(filter.projection) {
-                    box.setAttribute("srsName", filter.projection);
-                }
-                node.appendChild(box); 
-                return node;
-            },
-            "SortBy": function(sortProperties) {
-                var node = this.createElementNSPlus("ogc:SortBy");
-                for (var i=0,l=sortProperties.length;i<l;i++) {
-                    this.writeNode(
-                        "ogc:SortProperty",
-                        sortProperties[i],
-                        node
-                    );
-                }
-                return node;
-            }, 
-            "SortProperty": function(sortProperty) {
-                var node = this.createElementNSPlus("ogc:SortProperty");
-                this.writeNode(
-                    "ogc:PropertyName",
-                    sortProperty,
-                    node
-                );
-                this.writeNode(
-                    "ogc:SortOrder",
-                    (sortProperty.order == 'DESC') ? 'DESC' : 'ASC',
-                    node
-                );
-                return node;
-            },
-            "SortOrder": function(value) {
-                var node = this.createElementNSPlus("ogc:SortOrder", {
-                    value: value
-                });
-                return node;
-            }
-        }, OpenLayers.Format.Filter.v1.prototype.writers["ogc"]),
-        "gml": OpenLayers.Format.GML.v3.prototype.writers["gml"],
-        "feature": OpenLayers.Format.GML.v3.prototype.writers["feature"]
-    },
-
-    /**
-     * Method: writeSpatial
-     *
-     * Read a {<OpenLayers.Filter.Spatial>} filter and converts it into XML.
-     *
-     * Parameters:
-     * filter - {<OpenLayers.Filter.Spatial>} The filter.
-     * name - {String} Name of the generated XML element.
-     *
-     * Returns:
-     * {DOMElement} The created XML element.
-     */
-    writeSpatial: function(filter, name) {
-        var node = this.createElementNSPlus("ogc:"+name);
-        this.writeNode("PropertyName", filter, node);
-        if(filter.value instanceof OpenLayers.Filter.Function) {
-            this.writeNode("Function", filter.value, node);
-        } else {
-        var child;
-        if(filter.value instanceof OpenLayers.Geometry) {
-            child = this.writeNode("feature:_geometry", filter.value).firstChild;
-        } else {
-            child = this.writeNode("gml:Envelope", filter.value);
-        }
-        if(filter.projection) {
-            child.setAttribute("srsName", filter.projection);
-        }
-        node.appendChild(child);
-        }
-        return node;
-    },
-
-    CLASS_NAME: "OpenLayers.Format.Filter.v1_1_0" 
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/GML.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/GML.js
deleted file mode 100644
index 467f8758..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/GML.js
+++ /dev/null
@@ -1,923 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/XML.js
- * @requires OpenLayers/Feature/Vector.js
- * @requires OpenLayers/Geometry/Point.js
- * @requires OpenLayers/Geometry/MultiPoint.js
- * @requires OpenLayers/Geometry/LineString.js
- * @requires OpenLayers/Geometry/MultiLineString.js
- * @requires OpenLayers/Geometry/Polygon.js
- * @requires OpenLayers/Geometry/MultiPolygon.js
- */
-
-/**
- * Class: OpenLayers.Format.GML
- * Read/Write GML. Create a new instance with the <OpenLayers.Format.GML>
- *     constructor.  Supports the GML simple features profile.
- * 
- * Inherits from:
- *  - <OpenLayers.Format.XML>
- */
-OpenLayers.Format.GML = OpenLayers.Class(OpenLayers.Format.XML, {
-    
-    /**
-     * APIProperty: featureNS
-     * {String} Namespace used for feature attributes.  Default is
-     *     "http://mapserver.gis.umn.edu/mapserver".
-     */
-    featureNS: "http://mapserver.gis.umn.edu/mapserver",
-    
-    /**
-     * APIProperty: featurePrefix
-     * {String} Namespace alias (or prefix) for feature nodes.  Default is
-     *     "feature".
-     */
-    featurePrefix: "feature",
-    
-    /**
-     * APIProperty: featureName
-     * {String} Element name for features. Default is "featureMember".
-     */
-    featureName: "featureMember", 
-    
-    /**
-     * APIProperty: layerName
-     * {String} Name of data layer. Default is "features".
-     */
-    layerName: "features",
-    
-    /**
-     * APIProperty: geometryName
-     * {String} Name of geometry element.  Defaults to "geometry".
-     */
-    geometryName: "geometry",
-    
-    /** 
-     * APIProperty: collectionName
-     * {String} Name of featureCollection element.
-     */
-    collectionName: "FeatureCollection",
-    
-    /**
-     * APIProperty: gmlns
-     * {String} GML Namespace.
-     */
-    gmlns: "http://www.opengis.net/gml",
-
-    /**
-     * APIProperty: extractAttributes
-     * {Boolean} Extract attributes from GML.
-     */
-    extractAttributes: true,
-    
-    /**
-     * APIProperty: xy
-     * {Boolean} Order of the GML coordinate true:(x,y) or false:(y,x)
-     * Changing is not recommended, a new Format should be instantiated.
-     */ 
-    xy: true,
-    
-    /**
-     * Constructor: OpenLayers.Format.GML
-     * Create a new parser for GML.
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be set on
-     *     this instance.
-     */
-    initialize: function(options) {
-        // compile regular expressions once instead of every time they are used
-        this.regExes = {
-            trimSpace: (/^\s*|\s*$/g),
-            removeSpace: (/\s*/g),
-            splitSpace: (/\s+/),
-            trimComma: (/\s*,\s*/g)
-        };
-        OpenLayers.Format.XML.prototype.initialize.apply(this, [options]);
-    },
-
-    /**
-     * APIMethod: read
-     * Read data from a string, and return a list of features. 
-     * 
-     * Parameters:
-     * data - {String} or {DOMElement} data to read/parse.
-     *
-     * Returns:
-     * {Array(<OpenLayers.Feature.Vector>)} An array of features.
-     */
-    read: function(data) {
-        if(typeof data == "string") { 
-            data = OpenLayers.Format.XML.prototype.read.apply(this, [data]);
-        }
-        var featureNodes = this.getElementsByTagNameNS(data.documentElement,
-                                                       this.gmlns,
-                                                       this.featureName);
-        var features = [];
-        for(var i=0; i<featureNodes.length; i++) {
-            var feature = this.parseFeature(featureNodes[i]);
-            if(feature) {
-                features.push(feature);
-            }
-        }
-        return features;
-    },
-    
-    /**
-     * Method: parseFeature
-     * This function is the core of the GML parsing code in OpenLayers.
-     *    It creates the geometries that are then attached to the returned
-     *    feature, and calls parseAttributes() to get attribute data out.
-     *    
-     * Parameters:
-     * node - {DOMElement} A GML feature node. 
-     */
-    parseFeature: function(node) {
-        // only accept one geometry per feature - look for highest "order"
-        var order = ["MultiPolygon", "Polygon",
-                     "MultiLineString", "LineString",
-                     "MultiPoint", "Point", "Envelope"];
-        // FIXME: In case we parse a feature with no geometry, but boundedBy an Envelope,
-        // this code creates a geometry derived from the Envelope. This is not correct.
-        var type, nodeList, geometry, parser;
-        for(var i=0; i<order.length; ++i) {
-            type = order[i];
-            nodeList = this.getElementsByTagNameNS(node, this.gmlns, type);
-            if(nodeList.length > 0) {
-                // only deal with first geometry of this type
-                parser = this.parseGeometry[type.toLowerCase()];
-                if(parser) {
-                    geometry = parser.apply(this, [nodeList[0]]);
-                    if (this.internalProjection && this.externalProjection) {
-                        geometry.transform(this.externalProjection, 
-                                           this.internalProjection); 
-                    }                       
-                } else {
-                    throw new TypeError("Unsupported geometry type: " + type);
-                }
-                // stop looking for different geometry types
-                break;
-            }
-        }
-
-        var bounds;
-        var boxNodes = this.getElementsByTagNameNS(node, this.gmlns, "Box");
-        for(i=0; i<boxNodes.length; ++i) {
-            var boxNode = boxNodes[i];
-            var box = this.parseGeometry["box"].apply(this, [boxNode]);
-            var parentNode = boxNode.parentNode;
-            var parentName = parentNode.localName ||
-                             parentNode.nodeName.split(":").pop();
-            if(parentName === "boundedBy") {
-                bounds = box;
-            } else {
-                geometry = box.toGeometry();
-            }
-        }
-        
-        // construct feature (optionally with attributes)
-        var attributes;
-        if(this.extractAttributes) {
-            attributes = this.parseAttributes(node);
-        }
-        var feature = new OpenLayers.Feature.Vector(geometry, attributes);
-        feature.bounds = bounds;
-        
-        feature.gml = {
-            featureType: node.firstChild.nodeName.split(":")[1],
-            featureNS: node.firstChild.namespaceURI,
-            featureNSPrefix: node.firstChild.prefix
-        };
-                
-        // assign fid - this can come from a "fid" or "id" attribute
-        var childNode = node.firstChild;
-        var fid;
-        while(childNode) {
-            if(childNode.nodeType == 1) {
-                fid = childNode.getAttribute("fid") ||
-                      childNode.getAttribute("id");
-                if(fid) {
-                    break;
-                }
-            }
-            childNode = childNode.nextSibling;
-        }
-        feature.fid = fid;
-        return feature;
-    },
-    
-    /**
-     * Property: parseGeometry
-     * Properties of this object are the functions that parse geometries based
-     *     on their type.
-     */
-    parseGeometry: {
-        
-        /**
-         * Method: parseGeometry.point
-         * Given a GML node representing a point geometry, create an OpenLayers
-         *     point geometry.
-         *
-         * Parameters:
-         * node - {DOMElement} A GML node.
-         *
-         * Returns:
-         * {<OpenLayers.Geometry.Point>} A point geometry.
-         */
-        point: function(node) {
-            /**
-             * Three coordinate variations to consider:
-             * 1) <gml:pos>x y z</gml:pos>
-             * 2) <gml:coordinates>x, y, z</gml:coordinates>
-             * 3) <gml:coord><gml:X>x</gml:X><gml:Y>y</gml:Y></gml:coord>
-             */
-            var nodeList, coordString;
-            var coords = [];
-
-            // look for <gml:pos>
-            var nodeList = this.getElementsByTagNameNS(node, this.gmlns, "pos");
-            if(nodeList.length > 0) {
-                coordString = nodeList[0].firstChild.nodeValue;
-                coordString = coordString.replace(this.regExes.trimSpace, "");
-                coords = coordString.split(this.regExes.splitSpace);
-            }
-
-            // look for <gml:coordinates>
-            if(coords.length == 0) {
-                nodeList = this.getElementsByTagNameNS(node, this.gmlns,
-                                                       "coordinates");
-                if(nodeList.length > 0) {
-                    coordString = nodeList[0].firstChild.nodeValue;
-                    coordString = coordString.replace(this.regExes.removeSpace,
-                                                      "");
-                    coords = coordString.split(",");
-                }
-            }
-
-            // look for <gml:coord>
-            if(coords.length == 0) {
-                nodeList = this.getElementsByTagNameNS(node, this.gmlns,
-                                                       "coord");
-                if(nodeList.length > 0) {
-                    var xList = this.getElementsByTagNameNS(nodeList[0],
-                                                            this.gmlns, "X");
-                    var yList = this.getElementsByTagNameNS(nodeList[0],
-                                                            this.gmlns, "Y");
-                    if(xList.length > 0 && yList.length > 0) {
-                        coords = [xList[0].firstChild.nodeValue,
-                                  yList[0].firstChild.nodeValue];
-                    }
-                }
-            }
-                
-            // preserve third dimension
-            if(coords.length == 2) {
-                coords[2] = null;
-            }
-            
-            if (this.xy) {
-                return new OpenLayers.Geometry.Point(coords[0], coords[1],
-                                                 coords[2]);
-            }
-            else{
-                return new OpenLayers.Geometry.Point(coords[1], coords[0],
-                                                 coords[2]);
-            }
-        },
-        
-        /**
-         * Method: parseGeometry.multipoint
-         * Given a GML node representing a multipoint geometry, create an
-         *     OpenLayers multipoint geometry.
-         *
-         * Parameters:
-         * node - {DOMElement} A GML node.
-         *
-         * Returns:
-         * {<OpenLayers.Geometry.MultiPoint>} A multipoint geometry.
-         */
-        multipoint: function(node) {
-            var nodeList = this.getElementsByTagNameNS(node, this.gmlns,
-                                                       "Point");
-            var components = [];
-            if(nodeList.length > 0) {
-                var point;
-                for(var i=0; i<nodeList.length; ++i) {
-                    point = this.parseGeometry.point.apply(this, [nodeList[i]]);
-                    if(point) {
-                        components.push(point);
-                    }
-                }
-            }
-            return new OpenLayers.Geometry.MultiPoint(components);
-        },
-        
-        /**
-         * Method: parseGeometry.linestring
-         * Given a GML node representing a linestring geometry, create an
-         *     OpenLayers linestring geometry.
-         *
-         * Parameters:
-         * node - {DOMElement} A GML node.
-         *
-         * Returns:
-         * {<OpenLayers.Geometry.LineString>} A linestring geometry.
-         */
-        linestring: function(node, ring) {
-            /**
-             * Two coordinate variations to consider:
-             * 1) <gml:posList dimension="d">x0 y0 z0 x1 y1 z1</gml:posList>
-             * 2) <gml:coordinates>x0, y0, z0 x1, y1, z1</gml:coordinates>
-             */
-            var nodeList, coordString;
-            var coords = [];
-            var points = [];
-
-            // look for <gml:posList>
-            nodeList = this.getElementsByTagNameNS(node, this.gmlns, "posList");
-            if(nodeList.length > 0) {
-                coordString = this.getChildValue(nodeList[0]);
-                coordString = coordString.replace(this.regExes.trimSpace, "");
-                coords = coordString.split(this.regExes.splitSpace);
-                var dim = parseInt(nodeList[0].getAttribute("dimension"));
-                var j, x, y, z;
-                for(var i=0; i<coords.length/dim; ++i) {
-                    j = i * dim;
-                    x = coords[j];
-                    y = coords[j+1];
-                    z = (dim == 2) ? null : coords[j+2];
-                    if (this.xy) {
-                        points.push(new OpenLayers.Geometry.Point(x, y, z));
-                    } else {
-                        points.push(new OpenLayers.Geometry.Point(y, x, z));
-                    }
-                }
-            }
-
-            // look for <gml:coordinates>
-            if(coords.length == 0) {
-                nodeList = this.getElementsByTagNameNS(node, this.gmlns,
-                                                       "coordinates");
-                if(nodeList.length > 0) {
-                    coordString = this.getChildValue(nodeList[0]);
-                    coordString = coordString.replace(this.regExes.trimSpace,
-                                                      "");
-                    coordString = coordString.replace(this.regExes.trimComma,
-                                                      ",");
-                    var pointList = coordString.split(this.regExes.splitSpace);
-                    for(var i=0; i<pointList.length; ++i) {
-                        coords = pointList[i].split(",");
-                        if(coords.length == 2) {
-                            coords[2] = null;
-                        }
-                        if (this.xy) {
-                            points.push(new OpenLayers.Geometry.Point(coords[0],
-                                                                  coords[1],
-                                                                  coords[2]));
-                        } else {
-                            points.push(new OpenLayers.Geometry.Point(coords[1],
-                                                                  coords[0],
-                                                                  coords[2]));
-                        }
-                    }
-                }
-            }
-
-            var line = null;
-            if(points.length != 0) {
-                if(ring) {
-                    line = new OpenLayers.Geometry.LinearRing(points);
-                } else {
-                    line = new OpenLayers.Geometry.LineString(points);
-                }
-            }
-            return line;
-        },
-        
-        /**
-         * Method: parseGeometry.multilinestring
-         * Given a GML node representing a multilinestring geometry, create an
-         *     OpenLayers multilinestring geometry.
-         *
-         * Parameters:
-         * node - {DOMElement} A GML node.
-         *
-         * Returns:
-         * {<OpenLayers.Geometry.MultiLineString>} A multilinestring geometry.
-         */
-        multilinestring: function(node) {
-            var nodeList = this.getElementsByTagNameNS(node, this.gmlns,
-                                                       "LineString");
-            var components = [];
-            if(nodeList.length > 0) {
-                var line;
-                for(var i=0; i<nodeList.length; ++i) {
-                    line = this.parseGeometry.linestring.apply(this,
-                                                               [nodeList[i]]);
-                    if(line) {
-                        components.push(line);
-                    }
-                }
-            }
-            return new OpenLayers.Geometry.MultiLineString(components);
-        },
-        
-        /**
-         * Method: parseGeometry.polygon
-         * Given a GML node representing a polygon geometry, create an
-         *     OpenLayers polygon geometry.
-         *
-         * Parameters:
-         * node - {DOMElement} A GML node.
-         *
-         * Returns:
-         * {<OpenLayers.Geometry.Polygon>} A polygon geometry.
-         */
-        polygon: function(node) {
-            var nodeList = this.getElementsByTagNameNS(node, this.gmlns,
-                                                       "LinearRing");
-            var components = [];
-            if(nodeList.length > 0) {
-                // this assumes exterior ring first, inner rings after
-                var ring;
-                for(var i=0; i<nodeList.length; ++i) {
-                    ring = this.parseGeometry.linestring.apply(this,
-                                                        [nodeList[i], true]);
-                    if(ring) {
-                        components.push(ring);
-                    }
-                }
-            }
-            return new OpenLayers.Geometry.Polygon(components);
-        },
-        
-        /**
-         * Method: parseGeometry.multipolygon
-         * Given a GML node representing a multipolygon geometry, create an
-         *     OpenLayers multipolygon geometry.
-         *
-         * Parameters:
-         * node - {DOMElement} A GML node.
-         *
-         * Returns:
-         * {<OpenLayers.Geometry.MultiPolygon>} A multipolygon geometry.
-         */
-        multipolygon: function(node) {
-            var nodeList = this.getElementsByTagNameNS(node, this.gmlns,
-                                                       "Polygon");
-            var components = [];
-            if(nodeList.length > 0) {
-                var polygon;
-                for(var i=0; i<nodeList.length; ++i) {
-                    polygon = this.parseGeometry.polygon.apply(this,
-                                                               [nodeList[i]]);
-                    if(polygon) {
-                        components.push(polygon);
-                    }
-                }
-            }
-            return new OpenLayers.Geometry.MultiPolygon(components);
-        },
-        
-        envelope: function(node) {
-            var components = [];
-            var coordString;
-            var envelope;
-            
-            var lpoint = this.getElementsByTagNameNS(node, this.gmlns, "lowerCorner");
-            if (lpoint.length > 0) {
-                var coords = [];
-                
-                if(lpoint.length > 0) {
-                    coordString = lpoint[0].firstChild.nodeValue;
-                    coordString = coordString.replace(this.regExes.trimSpace, "");
-                    coords = coordString.split(this.regExes.splitSpace);
-                }
-                
-                if(coords.length == 2) {
-                    coords[2] = null;
-                }
-                if (this.xy) {
-                    var lowerPoint = new OpenLayers.Geometry.Point(coords[0], coords[1],coords[2]);
-                } else {
-                    var lowerPoint = new OpenLayers.Geometry.Point(coords[1], coords[0],coords[2]);
-                }
-            }
-            
-            var upoint = this.getElementsByTagNameNS(node, this.gmlns, "upperCorner");
-            if (upoint.length > 0) {
-                var coords = [];
-                
-                if(upoint.length > 0) {
-                    coordString = upoint[0].firstChild.nodeValue;
-                    coordString = coordString.replace(this.regExes.trimSpace, "");
-                    coords = coordString.split(this.regExes.splitSpace);
-                }
-                
-                if(coords.length == 2) {
-                    coords[2] = null;
-                }
-                if (this.xy) {
-                    var upperPoint = new OpenLayers.Geometry.Point(coords[0], coords[1],coords[2]);
-                } else {
-                    var upperPoint = new OpenLayers.Geometry.Point(coords[1], coords[0],coords[2]);
-                }
-            }
-            
-            if (lowerPoint && upperPoint) {
-                components.push(new OpenLayers.Geometry.Point(lowerPoint.x, lowerPoint.y));
-                components.push(new OpenLayers.Geometry.Point(upperPoint.x, lowerPoint.y));
-                components.push(new OpenLayers.Geometry.Point(upperPoint.x, upperPoint.y));
-                components.push(new OpenLayers.Geometry.Point(lowerPoint.x, upperPoint.y));
-                components.push(new OpenLayers.Geometry.Point(lowerPoint.x, lowerPoint.y));
-                
-                var ring = new OpenLayers.Geometry.LinearRing(components);
-                envelope = new OpenLayers.Geometry.Polygon([ring]);
-            }
-            return envelope; 
-        },
-
-        /**
-         * Method: parseGeometry.box
-         * Given a GML node representing a box geometry, create an
-         *     OpenLayers.Bounds.
-         *
-         * Parameters:
-         * node - {DOMElement} A GML node.
-         *
-         * Returns:
-         * {<OpenLayers.Bounds>} A bounds representing the box.
-         */
-        box: function(node) {
-            var nodeList = this.getElementsByTagNameNS(node, this.gmlns,
-                                                   "coordinates");
-            var coordString;
-            var coords, beginPoint = null, endPoint = null;
-            if (nodeList.length > 0) {
-                coordString = nodeList[0].firstChild.nodeValue;
-                coords = coordString.split(" ");
-                if (coords.length == 2) {
-                    beginPoint = coords[0].split(",");
-                    endPoint = coords[1].split(",");
-                }
-            }
-            if (beginPoint !== null && endPoint !== null) {
-                return new OpenLayers.Bounds(parseFloat(beginPoint[0]),
-                    parseFloat(beginPoint[1]),
-                    parseFloat(endPoint[0]),
-                    parseFloat(endPoint[1]) );
-            }
-        }
-        
-    },
-    
-    /**
-     * Method: parseAttributes
-     *
-     * Parameters:
-     * node - {DOMElement}
-     *
-     * Returns:
-     * {Object} An attributes object.
-     */
-    parseAttributes: function(node) {
-        var attributes = {};
-        // assume attributes are children of the first type 1 child
-        var childNode = node.firstChild;
-        var children, i, child, grandchildren, grandchild, name, value;
-        while(childNode) {
-            if(childNode.nodeType == 1) {
-                // attributes are type 1 children with one type 3 child
-                children = childNode.childNodes;
-                for(i=0; i<children.length; ++i) {
-                    child = children[i];
-                    if(child.nodeType == 1) {
-                        grandchildren = child.childNodes;
-                        if(grandchildren.length == 1) {
-                            grandchild = grandchildren[0];
-                            if(grandchild.nodeType == 3 ||
-                               grandchild.nodeType == 4) {
-                                name = (child.prefix) ?
-                                        child.nodeName.split(":")[1] :
-                                        child.nodeName;
-                                value = grandchild.nodeValue.replace(
-                                                this.regExes.trimSpace, "");
-                                attributes[name] = value;
-                            }
-                        } else {
-                            // If child has no childNodes (grandchildren),
-                            // set an attribute with null value.
-                            // e.g. <prefix:fieldname/> becomes
-                            // {fieldname: null}
-                            attributes[child.nodeName.split(":").pop()] = null;
-                        }
-                    }
-                }
-                break;
-            }
-            childNode = childNode.nextSibling;
-        }
-        return attributes;
-    },
-    
-    /**
-     * APIMethod: write
-     * Generate a GML document string given a list of features. 
-     * 
-     * Parameters:
-     * features - {Array(<OpenLayers.Feature.Vector>)} List of features to
-     *     serialize into a string.
-     *
-     * Returns:
-     * {String} A string representing the GML document.
-     */
-    write: function(features) {
-        if(!(OpenLayers.Util.isArray(features))) {
-            features = [features];
-        }
-        var gml = this.createElementNS("http://www.opengis.net/wfs",
-                                       "wfs:" + this.collectionName);
-        for(var i=0; i<features.length; i++) {
-            gml.appendChild(this.createFeatureXML(features[i]));
-        }
-        return OpenLayers.Format.XML.prototype.write.apply(this, [gml]);
-    },
-
-    /** 
-     * Method: createFeatureXML
-     * Accept an OpenLayers.Feature.Vector, and build a GML node for it.
-     *
-     * Parameters:
-     * feature - {<OpenLayers.Feature.Vector>} The feature to be built as GML.
-     *
-     * Returns:
-     * {DOMElement} A node reprensting the feature in GML.
-     */
-    createFeatureXML: function(feature) {
-        var geometry = feature.geometry;
-        var geometryNode = this.buildGeometryNode(geometry);
-        var geomContainer = this.createElementNS(this.featureNS,
-                                                 this.featurePrefix + ":" +
-                                                 this.geometryName);
-        geomContainer.appendChild(geometryNode);
-        var featureNode = this.createElementNS(this.gmlns,
-                                               "gml:" + this.featureName);
-        var featureContainer = this.createElementNS(this.featureNS,
-                                                    this.featurePrefix + ":" +
-                                                    this.layerName);
-        var fid = feature.fid || feature.id;
-        featureContainer.setAttribute("fid", fid);
-        featureContainer.appendChild(geomContainer);
-        for(var attr in feature.attributes) {
-            var attrText = this.createTextNode(feature.attributes[attr]); 
-            var nodename = attr.substring(attr.lastIndexOf(":") + 1);
-            var attrContainer = this.createElementNS(this.featureNS,
-                                                     this.featurePrefix + ":" +
-                                                     nodename);
-            attrContainer.appendChild(attrText);
-            featureContainer.appendChild(attrContainer);
-        }    
-        featureNode.appendChild(featureContainer);
-        return featureNode;
-    },
-    
-    /**
-     * APIMethod: buildGeometryNode
-     */
-    buildGeometryNode: function(geometry) {
-        if (this.externalProjection && this.internalProjection) {
-            geometry = geometry.clone();
-            geometry.transform(this.internalProjection, 
-                               this.externalProjection);
-        }    
-        var className = geometry.CLASS_NAME;
-        var type = className.substring(className.lastIndexOf(".") + 1);
-        var builder = this.buildGeometry[type.toLowerCase()];
-        return builder.apply(this, [geometry]);
-    },
-
-    /**
-     * Property: buildGeometry
-     * Object containing methods to do the actual geometry node building
-     *     based on geometry type.
-     */
-    buildGeometry: {
-        // TBD retrieve the srs from layer
-        // srsName is non-standard, so not including it until it's right.
-        // gml.setAttribute("srsName",
-        //                  "http://www.opengis.net/gml/srs/epsg.xml#4326");
-
-        /**
-         * Method: buildGeometry.point
-         * Given an OpenLayers point geometry, create a GML point.
-         *
-         * Parameters:
-         * geometry - {<OpenLayers.Geometry.Point>} A point geometry.
-         *
-         * Returns:
-         * {DOMElement} A GML point node.
-         */
-        point: function(geometry) {
-            var gml = this.createElementNS(this.gmlns, "gml:Point");
-            gml.appendChild(this.buildCoordinatesNode(geometry));
-            return gml;
-        },
-        
-        /**
-         * Method: buildGeometry.multipoint
-         * Given an OpenLayers multipoint geometry, create a GML multipoint.
-         *
-         * Parameters:
-         * geometry - {<OpenLayers.Geometry.MultiPoint>} A multipoint geometry.
-         *
-         * Returns:
-         * {DOMElement} A GML multipoint node.
-         */
-        multipoint: function(geometry) {
-            var gml = this.createElementNS(this.gmlns, "gml:MultiPoint");
-            var points = geometry.components;
-            var pointMember, pointGeom;
-            for(var i=0; i<points.length; i++) { 
-                pointMember = this.createElementNS(this.gmlns,
-                                                   "gml:pointMember");
-                pointGeom = this.buildGeometry.point.apply(this,
-                                                               [points[i]]);
-                pointMember.appendChild(pointGeom);
-                gml.appendChild(pointMember);
-            }
-            return gml;            
-        },
-        
-        /**
-         * Method: buildGeometry.linestring
-         * Given an OpenLayers linestring geometry, create a GML linestring.
-         *
-         * Parameters:
-         * geometry - {<OpenLayers.Geometry.LineString>} A linestring geometry.
-         *
-         * Returns:
-         * {DOMElement} A GML linestring node.
-         */
-        linestring: function(geometry) {
-            var gml = this.createElementNS(this.gmlns, "gml:LineString");
-            gml.appendChild(this.buildCoordinatesNode(geometry));
-            return gml;
-        },
-        
-        /**
-         * Method: buildGeometry.multilinestring
-         * Given an OpenLayers multilinestring geometry, create a GML
-         *     multilinestring.
-         *
-         * Parameters:
-         * geometry - {<OpenLayers.Geometry.MultiLineString>} A multilinestring
-         *     geometry.
-         *
-         * Returns:
-         * {DOMElement} A GML multilinestring node.
-         */
-        multilinestring: function(geometry) {
-            var gml = this.createElementNS(this.gmlns, "gml:MultiLineString");
-            var lines = geometry.components;
-            var lineMember, lineGeom;
-            for(var i=0; i<lines.length; ++i) {
-                lineMember = this.createElementNS(this.gmlns,
-                                                  "gml:lineStringMember");
-                lineGeom = this.buildGeometry.linestring.apply(this,
-                                                                   [lines[i]]);
-                lineMember.appendChild(lineGeom);
-                gml.appendChild(lineMember);
-            }
-            return gml;
-        },
-        
-        /**
-         * Method: buildGeometry.linearring
-         * Given an OpenLayers linearring geometry, create a GML linearring.
-         *
-         * Parameters:
-         * geometry - {<OpenLayers.Geometry.LinearRing>} A linearring geometry.
-         *
-         * Returns:
-         * {DOMElement} A GML linearring node.
-         */
-        linearring: function(geometry) {
-            var gml = this.createElementNS(this.gmlns, "gml:LinearRing");
-            gml.appendChild(this.buildCoordinatesNode(geometry));
-            return gml;
-        },
-        
-        /**
-         * Method: buildGeometry.polygon
-         * Given an OpenLayers polygon geometry, create a GML polygon.
-         *
-         * Parameters:
-         * geometry - {<OpenLayers.Geometry.Polygon>} A polygon geometry.
-         *
-         * Returns:
-         * {DOMElement} A GML polygon node.
-         */
-        polygon: function(geometry) {
-            var gml = this.createElementNS(this.gmlns, "gml:Polygon");
-            var rings = geometry.components;
-            var ringMember, ringGeom, type;
-            for(var i=0; i<rings.length; ++i) {
-                type = (i==0) ? "outerBoundaryIs" : "innerBoundaryIs";
-                ringMember = this.createElementNS(this.gmlns,
-                                                  "gml:" + type);
-                ringGeom = this.buildGeometry.linearring.apply(this,
-                                                                   [rings[i]]);
-                ringMember.appendChild(ringGeom);
-                gml.appendChild(ringMember);
-            }
-            return gml;
-        },
-        
-        /**
-         * Method: buildGeometry.multipolygon
-         * Given an OpenLayers multipolygon geometry, create a GML multipolygon.
-         *
-         * Parameters:
-         * geometry - {<OpenLayers.Geometry.MultiPolygon>} A multipolygon
-         *     geometry.
-         *
-         * Returns:
-         * {DOMElement} A GML multipolygon node.
-         */
-        multipolygon: function(geometry) {
-            var gml = this.createElementNS(this.gmlns, "gml:MultiPolygon");
-            var polys = geometry.components;
-            var polyMember, polyGeom;
-            for(var i=0; i<polys.length; ++i) {
-                polyMember = this.createElementNS(this.gmlns,
-                                                  "gml:polygonMember");
-                polyGeom = this.buildGeometry.polygon.apply(this,
-                                                                [polys[i]]);
-                polyMember.appendChild(polyGeom);
-                gml.appendChild(polyMember);
-            }
-            return gml;
-
-        },
- 
-        /**
-         * Method: buildGeometry.bounds
-         * Given an OpenLayers bounds, create a GML box.
-         *
-         * Parameters:
-         * bounds - {<OpenLayers.Geometry.Bounds>} A bounds object.
-         *
-         * Returns:
-         * {DOMElement} A GML box node.
-         */
-        bounds: function(bounds) {
-            var gml = this.createElementNS(this.gmlns, "gml:Box");
-            gml.appendChild(this.buildCoordinatesNode(bounds));
-            return gml;
-        }
-    },
-
-    /**
-     * Method: buildCoordinates
-     * builds the coordinates XmlNode
-     * (code)
-     * <gml:coordinates decimal="." cs="," ts=" ">...</gml:coordinates>
-     * (end)
-     *
-     * Parameters: 
-     * geometry - {<OpenLayers.Geometry>} 
-     *
-     * Returns:
-     * {XmlNode} created xmlNode
-     */
-    buildCoordinatesNode: function(geometry) {
-        var coordinatesNode = this.createElementNS(this.gmlns,
-                                                   "gml:coordinates");
-        coordinatesNode.setAttribute("decimal", ".");
-        coordinatesNode.setAttribute("cs", ",");
-        coordinatesNode.setAttribute("ts", " ");
-
-        var parts = [];
-
-        if(geometry instanceof OpenLayers.Bounds){
-            parts.push(geometry.left + "," + geometry.bottom);
-            parts.push(geometry.right + "," + geometry.top);
-        } else {
-            var points = (geometry.components) ? geometry.components : [geometry];
-            for(var i=0; i<points.length; i++) {
-                parts.push(points[i].x + "," + points[i].y);                
-            }            
-        }
-
-        var txtNode = this.createTextNode(parts.join(" "));
-        coordinatesNode.appendChild(txtNode);
-        
-        return coordinatesNode;
-    },
-
-    CLASS_NAME: "OpenLayers.Format.GML" 
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/GML/Base.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/GML/Base.js
deleted file mode 100644
index 6c499694..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/GML/Base.js
+++ /dev/null
@@ -1,645 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/XML.js
- * @requires OpenLayers/Format/GML.js
- */
-
-/**
- * Though required in the full build, if the GML format is excluded, we set
- * the namespace here.
- */
-if(!OpenLayers.Format.GML) {
-    OpenLayers.Format.GML = {};
-}
-
-/**
- * Class: OpenLayers.Format.GML.Base
- * Superclass for GML parsers.
- *
- * Inherits from:
- *  - <OpenLayers.Format.XML>
- */
-OpenLayers.Format.GML.Base = OpenLayers.Class(OpenLayers.Format.XML, {
-    
-    /**
-     * Property: namespaces
-     * {Object} Mapping of namespace aliases to namespace URIs.
-     */
-    namespaces: {
-        gml: "http://www.opengis.net/gml",
-        xlink: "http://www.w3.org/1999/xlink",
-        xsi: "http://www.w3.org/2001/XMLSchema-instance",
-        wfs: "http://www.opengis.net/wfs" // this is a convenience for reading wfs:FeatureCollection
-    },
-    
-    /**
-     * Property: defaultPrefix
-     */
-    defaultPrefix: "gml",
-
-    /**
-     * Property: schemaLocation
-     * {String} Schema location for a particular minor version.
-     */
-    schemaLocation: null,
-    
-    /**
-     * APIProperty: featureType
-     * {Array(String) or String} The local (without prefix) feature typeName(s).
-     */
-    featureType: null,
-    
-    /**
-     * APIProperty: featureNS
-     * {String} The feature namespace.  Must be set in the options at
-     *     construction.
-     */
-    featureNS: null,
-
-    /**
-     * APIProperty: geometry
-     * {String} Name of geometry element.  Defaults to "geometry". If null, it
-     * will be set on <read> when the first geometry is parsed.
-     */
-    geometryName: "geometry",
-
-    /**
-     * APIProperty: extractAttributes
-     * {Boolean} Extract attributes from GML.  Default is true.
-     */
-    extractAttributes: true,
-    
-    /**
-     * APIProperty: srsName
-     * {String} URI for spatial reference system.  This is optional for
-     *     single part geometries and mandatory for collections and multis.
-     *     If set, the srsName attribute will be written for all geometries.
-     *     Default is null.
-     */
-    srsName: null,
-
-    /**
-     * APIProperty: xy
-     * {Boolean} Order of the GML coordinate true:(x,y) or false:(y,x)
-     * Changing is not recommended, a new Format should be instantiated.
-     */ 
-    xy: true,
-
-    /**
-     * Property: geometryTypes
-     * {Object} Maps OpenLayers geometry class names to GML element names.
-     *     Use <setGeometryTypes> before accessing this property.
-     */
-    geometryTypes: null,
-
-    /**
-     * Property: singleFeatureType
-     * {Boolean} True if there is only 1 featureType, and not an array
-     *     of featuretypes.
-     */
-    singleFeatureType: null,
-    
-    /**
-     * Property: autoConfig
-     * {Boolean} Indicates if the format was configured without a <featureNS>,
-     * but auto-configured <featureNS> and <featureType> during read.
-     * Subclasses making use of <featureType> auto-configuration should make
-     * the first call to the <readNode> method (usually in the read method)
-     * with true as 3rd argument, so the auto-configured featureType can be
-     * reset and the format can be reused for subsequent reads with data from
-     * different featureTypes. Set to false after read if you want to keep the
-     * auto-configured values.
-     */
-
-    /**
-     * Property: regExes
-     * Compiled regular expressions for manipulating strings.
-     */
-    regExes: {
-        trimSpace: (/^\s*|\s*$/g),
-        removeSpace: (/\s*/g),
-        splitSpace: (/\s+/),
-        trimComma: (/\s*,\s*/g),
-        featureMember: (/^(.*:)?featureMembers?$/)
-    },
-
-    /**
-     * Constructor: OpenLayers.Format.GML.Base
-     * Instances of this class are not created directly.  Use the
-     *     <OpenLayers.Format.GML.v2> or <OpenLayers.Format.GML.v3> constructor
-     *     instead.
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be set on
-     *     this instance.
-     *
-     * Valid options properties:
-     * featureType - {Array(String) or String} Local (without prefix) feature 
-     *     typeName(s) (required for write).
-     * featureNS - {String} Feature namespace (required for write).
-     * geometryName - {String} Geometry element name (required for write).
-     */
-    initialize: function(options) {
-        OpenLayers.Format.XML.prototype.initialize.apply(this, [options]);
-        this.setGeometryTypes();
-        if(options && options.featureNS) {
-            this.setNamespace("feature", options.featureNS);
-        }
-        this.singleFeatureType = !options || (typeof options.featureType === "string");
-    },
-    
-    /**
-     * Method: read
-     *
-     * Parameters:
-     * data - {DOMElement} A gml:featureMember element, a gml:featureMembers
-     *     element, or an element containing either of the above at any level.
-     *
-     * Returns:
-     * {Array(<OpenLayers.Feature.Vector>)} An array of features.
-     */
-    read: function(data) {
-        if(typeof data == "string") { 
-            data = OpenLayers.Format.XML.prototype.read.apply(this, [data]);
-        }
-        if(data && data.nodeType == 9) {
-            data = data.documentElement;
-        }
-        var features = [];
-        this.readNode(data, {features: features}, true);
-        if(features.length == 0) {
-            // look for gml:featureMember elements
-            var elements = this.getElementsByTagNameNS(
-                data, this.namespaces.gml, "featureMember"
-            );
-            if(elements.length) {
-                for(var i=0, len=elements.length; i<len; ++i) {
-                    this.readNode(elements[i], {features: features}, true);
-                }
-            } else {
-                // look for gml:featureMembers elements (this is v3, but does no harm here)
-                var elements = this.getElementsByTagNameNS(
-                    data, this.namespaces.gml, "featureMembers"
-                );
-                if(elements.length) {
-                    // there can be only one
-                    this.readNode(elements[0], {features: features}, true);
-                }
-            }
-        }
-        return features;
-    },
-    
-    /**
-     * Method: readNode
-     * Shorthand for applying one of the named readers given the node
-     *     namespace and local name.  Readers take two args (node, obj) and
-     *     generally extend or modify the second.
-     *
-     * Parameters:
-     * node - {DOMElement} The node to be read (required).
-     * obj - {Object} The object to be modified (optional).
-     * first - {Boolean} Should be set to true for the first node read. This
-     *     is usually the readNode call in the read method. Without this being
-     *     set, auto-configured properties will stick on subsequent reads.
-     *
-     * Returns:
-     * {Object} The input object, modified (or a new one if none was provided).
-     */
-    readNode: function(node, obj, first) {
-        // on subsequent calls of format.read(), we want to reset auto-
-        // configured properties and auto-configure again.
-        if (first === true && this.autoConfig === true) {
-            this.featureType = null;
-            delete this.namespaceAlias[this.featureNS];
-            delete this.namespaces["feature"];
-            this.featureNS = null;
-        }
-        // featureType auto-configuration
-        if (!this.featureNS && (!(node.prefix in this.namespaces) &&
-                node.parentNode.namespaceURI == this.namespaces["gml"] &&
-                this.regExes.featureMember.test(node.parentNode.nodeName))) {
-            this.featureType = node.nodeName.split(":").pop();
-            this.setNamespace("feature", node.namespaceURI);
-            this.featureNS = node.namespaceURI;
-            this.autoConfig = true;
-        }
-        return OpenLayers.Format.XML.prototype.readNode.apply(this, [node, obj]);
-    },
-    
-    /**
-     * Property: readers
-     * Contains public functions, grouped by namespace prefix, that will
-     *     be applied when a namespaced node is found matching the function
-     *     name.  The function will be applied in the scope of this parser
-     *     with two arguments: the node being read and a context object passed
-     *     from the parent.
-     */
-    readers: {
-        "gml": {
-            "_inherit": function(node, obj, container) {
-                // To be implemented by version specific parsers
-            },
-            "featureMember": function(node, obj) {
-                this.readChildNodes(node, obj);
-            },
-            "featureMembers": function(node, obj) {
-                this.readChildNodes(node, obj);                
-            },
-            "name": function(node, obj) {
-                obj.name = this.getChildValue(node);
-            },
-            "boundedBy": function(node, obj) {
-                var container = {};
-                this.readChildNodes(node, container);
-                if(container.components && container.components.length > 0) {
-                    obj.bounds = container.components[0];
-                }
-            },
-            "Point": function(node, container) {
-                var obj = {points: []};
-                this.readChildNodes(node, obj);
-                if(!container.components) {
-                    container.components = [];
-                }
-                container.components.push(obj.points[0]);
-            },
-            "coordinates": function(node, obj) {
-                var str = this.getChildValue(node).replace(
-                    this.regExes.trimSpace, ""
-                );
-                str = str.replace(this.regExes.trimComma, ",");
-                var pointList = str.split(this.regExes.splitSpace);
-                var coords;
-                var numPoints = pointList.length;
-                var points = new Array(numPoints);
-                for(var i=0; i<numPoints; ++i) {
-                    coords = pointList[i].split(",");
-                    if (this.xy) {
-                        points[i] = new OpenLayers.Geometry.Point(
-                            coords[0], coords[1], coords[2]
-                        );
-                    } else {
-                        points[i] = new OpenLayers.Geometry.Point(
-                            coords[1], coords[0], coords[2]
-                        );
-                    }
-                }
-                obj.points = points;
-            },
-            "coord": function(node, obj) {
-                var coord = {};
-                this.readChildNodes(node, coord);
-                if(!obj.points) {
-                    obj.points = [];
-                }
-                obj.points.push(new OpenLayers.Geometry.Point(
-                    coord.x, coord.y, coord.z
-                ));
-            },
-            "X": function(node, coord) {
-                coord.x = this.getChildValue(node);
-            },
-            "Y": function(node, coord) {
-                coord.y = this.getChildValue(node);
-            },
-            "Z": function(node, coord) {
-                coord.z = this.getChildValue(node);
-            },
-            "MultiPoint": function(node, container) {
-                var obj = {components: []};
-                this.readers.gml._inherit.apply(this, [node, obj, container]);
-                this.readChildNodes(node, obj);
-                container.components = [
-                    new OpenLayers.Geometry.MultiPoint(obj.components)
-                ];
-            },
-            "pointMember": function(node, obj) {
-                this.readChildNodes(node, obj);
-            },
-            "LineString": function(node, container) {
-                var obj = {};
-                this.readers.gml._inherit.apply(this, [node, obj, container]);
-                this.readChildNodes(node, obj);
-                if(!container.components) {
-                    container.components = [];
-                }
-                container.components.push(
-                    new OpenLayers.Geometry.LineString(obj.points)
-                );
-            },
-            "MultiLineString": function(node, container) {
-                var obj = {components: []};
-                this.readers.gml._inherit.apply(this, [node, obj, container]);
-                this.readChildNodes(node, obj);
-                container.components = [
-                    new OpenLayers.Geometry.MultiLineString(obj.components)
-                ];
-            },
-            "lineStringMember": function(node, obj) {
-                this.readChildNodes(node, obj);
-            },
-            "Polygon": function(node, container) {
-                var obj = {outer: null, inner: []};
-                this.readers.gml._inherit.apply(this, [node, obj, container]);
-                this.readChildNodes(node, obj);
-                obj.inner.unshift(obj.outer);
-                if(!container.components) {
-                    container.components = [];
-                }
-                container.components.push(
-                    new OpenLayers.Geometry.Polygon(obj.inner)
-                );
-            },
-            "LinearRing": function(node, obj) {
-                var container = {};
-                this.readers.gml._inherit.apply(this, [node, container]);
-                this.readChildNodes(node, container);
-                obj.components = [new OpenLayers.Geometry.LinearRing(
-                    container.points
-                )];
-            },
-            "MultiPolygon": function(node, container) {
-                var obj = {components: []};
-                this.readers.gml._inherit.apply(this, [node, obj, container]);
-                this.readChildNodes(node, obj);
-                container.components = [
-                    new OpenLayers.Geometry.MultiPolygon(obj.components)
-                ];
-            },
-            "polygonMember": function(node, obj) {
-                this.readChildNodes(node, obj);
-            },
-            "GeometryCollection": function(node, container) {
-                var obj = {components: []};
-                this.readers.gml._inherit.apply(this, [node, obj, container]);
-                this.readChildNodes(node, obj);
-                container.components = [
-                    new OpenLayers.Geometry.Collection(obj.components)
-                ];
-            },
-            "geometryMember": function(node, obj) {
-                this.readChildNodes(node, obj);
-            }
-        },
-        "feature": {
-            "*": function(node, obj) {
-                // The node can either be named like the featureType, or it
-                // can be a child of the feature:featureType.  Children can be
-                // geometry or attributes.
-                var name;
-                var local = node.localName || node.nodeName.split(":").pop();
-                // Since an attribute can have the same name as the feature type
-                // we only want to read the node as a feature if the parent
-                // node can have feature nodes as children.  In this case, the
-                // obj.features property is set.
-                if (obj.features) {
-                    if (!this.singleFeatureType &&
-                        (OpenLayers.Util.indexOf(this.featureType, local) !== -1)) {
-                        name = "_typeName";
-                    } else if(local === this.featureType) {
-                        name = "_typeName";
-                    }
-                } else {
-                    // Assume attribute elements have one child node and that the child
-                    // is a text node.  Otherwise assume it is a geometry node.
-                    if(node.childNodes.length == 0 ||
-                       (node.childNodes.length == 1 && node.firstChild.nodeType == 3)) {
-                        if(this.extractAttributes) {
-                            name = "_attribute";
-                        }
-                    } else {
-                        name = "_geometry";
-                    }
-                }
-                if(name) {
-                    this.readers.feature[name].apply(this, [node, obj]);
-                }
-            },
-            "_typeName": function(node, obj) {
-                var container = {components: [], attributes: {}};
-                this.readChildNodes(node, container);
-                // look for common gml namespaced elements
-                if(container.name) {
-                    container.attributes.name = container.name;
-                }
-                var feature = new OpenLayers.Feature.Vector(
-                    container.components[0], container.attributes
-                );
-                if (!this.singleFeatureType) {
-                    feature.type = node.nodeName.split(":").pop();
-                    feature.namespace = node.namespaceURI;
-                }
-                var fid = node.getAttribute("fid") ||
-                    this.getAttributeNS(node, this.namespaces["gml"], "id");
-                if(fid) {
-                    feature.fid = fid;
-                }
-                if(this.internalProjection && this.externalProjection &&
-                   feature.geometry) {
-                    feature.geometry.transform(
-                        this.externalProjection, this.internalProjection
-                    );
-                }
-                if(container.bounds) {
-                    feature.bounds = container.bounds;
-                }
-                obj.features.push(feature);
-            },
-            "_geometry": function(node, obj) {
-                if (!this.geometryName) {
-                    this.geometryName = node.nodeName.split(":").pop();
-                }
-                this.readChildNodes(node, obj);
-            },
-            "_attribute": function(node, obj) {
-                var local = node.localName || node.nodeName.split(":").pop();
-                var value = this.getChildValue(node);
-                obj.attributes[local] = value;
-            }
-        },
-        "wfs": {
-            "FeatureCollection": function(node, obj) {
-                this.readChildNodes(node, obj);
-            }
-        }
-    },
-    
-    /**
-     * Method: write
-     *
-     * Parameters:
-     * features - {Array(<OpenLayers.Feature.Vector>) | OpenLayers.Feature.Vector}
-     *     An array of features or a single feature.
-     *
-     * Returns:
-     * {String} Given an array of features, a doc with a gml:featureMembers
-     *     element will be returned.  Given a single feature, a doc with a
-     *     gml:featureMember element will be returned.
-     */
-    write: function(features) {
-        var name;
-        if(OpenLayers.Util.isArray(features)) {
-            name = "featureMembers";
-        } else {
-            name = "featureMember";
-        }
-        var root = this.writeNode("gml:" + name, features);
-        this.setAttributeNS(
-            root, this.namespaces["xsi"],
-            "xsi:schemaLocation", this.schemaLocation
-        );
-
-        return OpenLayers.Format.XML.prototype.write.apply(this, [root]);
-    },
-    
-    /**
-     * Property: writers
-     * As a compliment to the readers property, this structure contains public
-     *     writing functions grouped by namespace alias and named like the
-     *     node names they produce.
-     */
-    writers: {
-        "gml": {
-            "featureMember": function(feature) {
-                var node = this.createElementNSPlus("gml:featureMember");
-                this.writeNode("feature:_typeName", feature, node);
-                return node;
-            },
-            "MultiPoint": function(geometry) {
-                var node = this.createElementNSPlus("gml:MultiPoint");
-                var components = geometry.components || [geometry];
-                for(var i=0, ii=components.length; i<ii; ++i) {
-                    this.writeNode("pointMember", components[i], node);
-                }
-                return node;
-            },
-            "pointMember": function(geometry) {
-                var node = this.createElementNSPlus("gml:pointMember");
-                this.writeNode("Point", geometry, node);
-                return node;
-            },
-            "MultiLineString": function(geometry) {
-                var node = this.createElementNSPlus("gml:MultiLineString");
-                var components = geometry.components || [geometry];
-                for(var i=0, ii=components.length; i<ii; ++i) {
-                    this.writeNode("lineStringMember", components[i], node);
-                }
-                return node;
-            },
-            "lineStringMember": function(geometry) {
-                var node = this.createElementNSPlus("gml:lineStringMember");
-                this.writeNode("LineString", geometry, node);
-                return node;
-            },
-            "MultiPolygon": function(geometry) {
-                var node = this.createElementNSPlus("gml:MultiPolygon");
-                var components = geometry.components || [geometry];
-                for(var i=0, ii=components.length; i<ii; ++i) {
-                    this.writeNode(
-                        "polygonMember", components[i], node
-                    );
-                }
-                return node;
-            },
-            "polygonMember": function(geometry) {
-                var node = this.createElementNSPlus("gml:polygonMember");
-                this.writeNode("Polygon", geometry, node);
-                return node;
-            },
-            "GeometryCollection": function(geometry) {
-                var node = this.createElementNSPlus("gml:GeometryCollection");
-                for(var i=0, len=geometry.components.length; i<len; ++i) {
-                    this.writeNode("geometryMember", geometry.components[i], node);
-                }
-                return node;
-            },
-            "geometryMember": function(geometry) {
-                var node = this.createElementNSPlus("gml:geometryMember");
-                var child = this.writeNode("feature:_geometry", geometry);
-                node.appendChild(child.firstChild);
-                return node;
-            }
-        },
-        "feature": {
-            "_typeName": function(feature) {
-                var node = this.createElementNSPlus("feature:" + this.featureType, {
-                    attributes: {fid: feature.fid}
-                });
-                if(feature.geometry) {
-                    this.writeNode("feature:_geometry", feature.geometry, node);
-                }
-                for(var name in feature.attributes) {
-                    var value = feature.attributes[name];
-                    if(value != null) {
-                        this.writeNode(
-                            "feature:_attribute",
-                            {name: name, value: value}, node
-                        );
-                    }
-                }
-                return node;
-            },
-            "_geometry": function(geometry) {
-                if(this.externalProjection && this.internalProjection) {
-                    geometry = geometry.clone().transform(
-                        this.internalProjection, this.externalProjection
-                    );
-                }    
-                var node = this.createElementNSPlus(
-                    "feature:" + this.geometryName
-                );
-                var type = this.geometryTypes[geometry.CLASS_NAME];
-                var child = this.writeNode("gml:" + type, geometry, node);
-                if(this.srsName) {
-                    child.setAttribute("srsName", this.srsName);
-                }
-                return node;
-            },
-            "_attribute": function(obj) {
-                return this.createElementNSPlus("feature:" + obj.name, {
-                    value: obj.value
-                });
-            }
-        },
-        "wfs": {
-            "FeatureCollection": function(features) {
-                /**
-                 * This is only here because GML2 only describes abstract
-                 * feature collections.  Typically, you would not be using
-                 * the GML format to write wfs elements.  This just provides
-                 * some way to write out lists of features.  GML3 defines the
-                 * featureMembers element, so that is used by default instead.
-                 */
-                var node = this.createElementNSPlus("wfs:FeatureCollection");
-                for(var i=0, len=features.length; i<len; ++i) {
-                    this.writeNode("gml:featureMember", features[i], node);
-                }
-                return node;
-            }
-        }
-    },
-    
-    /**
-     * Method: setGeometryTypes
-     * Sets the <geometryTypes> mapping.
-     */
-    setGeometryTypes: function() {
-        this.geometryTypes = {
-            "OpenLayers.Geometry.Point": "Point",
-            "OpenLayers.Geometry.MultiPoint": "MultiPoint",
-            "OpenLayers.Geometry.LineString": "LineString",
-            "OpenLayers.Geometry.MultiLineString": "MultiLineString",
-            "OpenLayers.Geometry.Polygon": "Polygon",
-            "OpenLayers.Geometry.MultiPolygon": "MultiPolygon",
-            "OpenLayers.Geometry.Collection": "GeometryCollection"
-        };
-    },
-
-    CLASS_NAME: "OpenLayers.Format.GML.Base" 
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/GML/v2.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/GML/v2.js
deleted file mode 100644
index bd26b999..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/GML/v2.js
+++ /dev/null
@@ -1,193 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/GML/Base.js
- */
-
-/**
- * Class: OpenLayers.Format.GML.v2
- * Parses GML version 2.
- *
- * Inherits from:
- *  - <OpenLayers.Format.GML.Base>
- */
-OpenLayers.Format.GML.v2 = OpenLayers.Class(OpenLayers.Format.GML.Base, {
-    
-    /**
-     * Property: schemaLocation
-     * {String} Schema location for a particular minor version.
-     */
-    schemaLocation: "http://www.opengis.net/gml http://schemas.opengis.net/gml/2.1.2/feature.xsd",
-
-    /**
-     * Constructor: OpenLayers.Format.GML.v2
-     * Create a parser for GML v2.
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be set on
-     *     this instance.
-     *
-     * Valid options properties:
-     * featureType - {String} Local (without prefix) feature typeName (required).
-     * featureNS - {String} Feature namespace (required).
-     * geometryName - {String} Geometry element name.
-     */
-    initialize: function(options) {
-        OpenLayers.Format.GML.Base.prototype.initialize.apply(this, [options]);
-    },
-
-    /**
-     * Property: readers
-     * Contains public functions, grouped by namespace prefix, that will
-     *     be applied when a namespaced node is found matching the function
-     *     name.  The function will be applied in the scope of this parser
-     *     with two arguments: the node being read and a context object passed
-     *     from the parent.
-     */
-    readers: {
-        "gml": OpenLayers.Util.applyDefaults({
-            "outerBoundaryIs": function(node, container) {
-                var obj = {};
-                this.readChildNodes(node, obj);
-                container.outer = obj.components[0];
-            },
-            "innerBoundaryIs": function(node, container) {
-                var obj = {};
-                this.readChildNodes(node, obj);
-                container.inner.push(obj.components[0]);
-            },
-            "Box": function(node, container) {
-                var obj = {};
-                this.readChildNodes(node, obj);
-                if(!container.components) {
-                    container.components = [];
-                }
-                var min = obj.points[0];
-                var max = obj.points[1];
-                container.components.push(
-                    new OpenLayers.Bounds(min.x, min.y, max.x, max.y)
-                );
-            }
-        }, OpenLayers.Format.GML.Base.prototype.readers["gml"]),
-        "feature": OpenLayers.Format.GML.Base.prototype.readers["feature"],
-        "wfs": OpenLayers.Format.GML.Base.prototype.readers["wfs"]
-    },
-
-    /**
-     * Method: write
-     *
-     * Parameters:
-     * features - {Array(<OpenLayers.Feature.Vector>) | OpenLayers.Feature.Vector}
-     *     An array of features or a single feature.
-     *
-     * Returns:
-     * {String} Given an array of features, a doc with a gml:featureMembers
-     *     element will be returned.  Given a single feature, a doc with a
-     *     gml:featureMember element will be returned.
-     */
-    write: function(features) {
-        var name;
-        if(OpenLayers.Util.isArray(features)) {
-            // GML2 only has abstract feature collections
-            // wfs provides a feature collection from a well-known schema
-            name = "wfs:FeatureCollection";
-        } else {
-            name = "gml:featureMember";
-        }
-        var root = this.writeNode(name, features);
-        this.setAttributeNS(
-            root, this.namespaces["xsi"],
-            "xsi:schemaLocation", this.schemaLocation
-        );
-
-        return OpenLayers.Format.XML.prototype.write.apply(this, [root]);
-    },
-
-    /**
-     * Property: writers
-     * As a compliment to the readers property, this structure contains public
-     *     writing functions grouped by namespace alias and named like the
-     *     node names they produce.
-     */
-    writers: {
-        "gml": OpenLayers.Util.applyDefaults({
-            "Point": function(geometry) {
-                var node = this.createElementNSPlus("gml:Point");
-                this.writeNode("coordinates", [geometry], node);
-                return node;
-            },
-            "coordinates": function(points) {
-                var numPoints = points.length;
-                var parts = new Array(numPoints);
-                var point;
-                for(var i=0; i<numPoints; ++i) {
-                    point = points[i];
-                    if(this.xy) {
-                        parts[i] = point.x + "," + point.y;
-                    } else {
-                        parts[i] = point.y + "," + point.x;
-                    }
-                    if(point.z != undefined) { // allow null or undefined
-                        parts[i] += "," + point.z;
-                    }
-                }
-                return this.createElementNSPlus("gml:coordinates", {
-                    attributes: {
-                        decimal: ".", cs: ",", ts: " "
-                    },
-                    value: (numPoints == 1) ? parts[0] : parts.join(" ")
-                });
-            },
-            "LineString": function(geometry) {
-                var node = this.createElementNSPlus("gml:LineString");
-                this.writeNode("coordinates", geometry.components, node);
-                return node;
-            },
-            "Polygon": function(geometry) {
-                var node = this.createElementNSPlus("gml:Polygon");
-                this.writeNode("outerBoundaryIs", geometry.components[0], node);
-                for(var i=1; i<geometry.components.length; ++i) {
-                    this.writeNode(
-                        "innerBoundaryIs", geometry.components[i], node
-                    );
-                }
-                return node;
-            },
-            "outerBoundaryIs": function(ring) {
-                var node = this.createElementNSPlus("gml:outerBoundaryIs");
-                this.writeNode("LinearRing", ring, node);
-                return node;
-            },
-            "innerBoundaryIs": function(ring) {
-                var node = this.createElementNSPlus("gml:innerBoundaryIs");
-                this.writeNode("LinearRing", ring, node);
-                return node;
-            },
-            "LinearRing": function(ring) {
-                var node = this.createElementNSPlus("gml:LinearRing");
-                this.writeNode("coordinates", ring.components, node);
-                return node;
-            },
-            "Box": function(bounds) {
-                var node = this.createElementNSPlus("gml:Box");
-                this.writeNode("coordinates", [
-                    {x: bounds.left, y: bounds.bottom},
-                    {x: bounds.right, y: bounds.top}
-                ], node);
-                // srsName attribute is optional for gml:Box
-                if(this.srsName) {
-                    node.setAttribute("srsName", this.srsName);
-                }
-                return node;
-            }
-        }, OpenLayers.Format.GML.Base.prototype.writers["gml"]),
-        "feature": OpenLayers.Format.GML.Base.prototype.writers["feature"],
-        "wfs": OpenLayers.Format.GML.Base.prototype.writers["wfs"]
-    },
-    
-    CLASS_NAME: "OpenLayers.Format.GML.v2" 
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/GML/v3.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/GML/v3.js
deleted file mode 100644
index 82c7b1e4..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/GML/v3.js
+++ /dev/null
@@ -1,477 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/GML/Base.js
- */
-
-/**
- * Class: OpenLayers.Format.GML.v3
- * Parses GML version 3.
- *
- * Inherits from:
- *  - <OpenLayers.Format.GML.Base>
- */
-OpenLayers.Format.GML.v3 = OpenLayers.Class(OpenLayers.Format.GML.Base, {
-    
-    /**
-     * Property: schemaLocation
-     * {String} Schema location for a particular minor version.  The writers
-     *     conform with the Simple Features Profile for GML.
-     */
-    schemaLocation: "http://www.opengis.net/gml http://schemas.opengis.net/gml/3.1.1/profiles/gmlsfProfile/1.0.0/gmlsf.xsd",
-
-    /**
-     * Property: curve
-     * {Boolean} Write gml:Curve instead of gml:LineString elements.  This also
-     *     affects the elements in multi-part geometries.  Default is false.
-     *     To write gml:Curve elements instead of gml:LineString, set curve
-     *     to true in the options to the contstructor (cannot be changed after
-     *     instantiation).
-     */
-    curve: false,
-    
-    /**
-     * Property: multiCurve
-     * {Boolean} Write gml:MultiCurve instead of gml:MultiLineString.  Since
-     *     the latter is deprecated in GML 3, the default is true.  To write
-     *     gml:MultiLineString instead of gml:MultiCurve, set multiCurve to
-     *     false in the options to the constructor (cannot be changed after
-     *     instantiation).
-     */
-    multiCurve: true,
-    
-    /**
-     * Property: surface
-     * {Boolean} Write gml:Surface instead of gml:Polygon elements.  This also
-     *     affects the elements in multi-part geometries.  Default is false.
-     *     To write gml:Surface elements instead of gml:Polygon, set surface
-     *     to true in the options to the contstructor (cannot be changed after
-     *     instantiation).
-     */
-    surface: false,
-
-    /**
-     * Property: multiSurface
-     * {Boolean} Write gml:multiSurface instead of gml:MultiPolygon.  Since
-     *     the latter is deprecated in GML 3, the default is true.  To write
-     *     gml:MultiPolygon instead of gml:multiSurface, set multiSurface to
-     *     false in the options to the constructor (cannot be changed after
-     *     instantiation).
-     */
-    multiSurface: true,
-
-    /**
-     * Constructor: OpenLayers.Format.GML.v3
-     * Create a parser for GML v3.
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be set on
-     *     this instance.
-     *
-     * Valid options properties:
-     * featureType - {String} Local (without prefix) feature typeName (required).
-     * featureNS - {String} Feature namespace (required).
-     * geometryName - {String} Geometry element name.
-     */
-    initialize: function(options) {
-        OpenLayers.Format.GML.Base.prototype.initialize.apply(this, [options]);
-    },
-
-    /**
-     * Property: readers
-     * Contains public functions, grouped by namespace prefix, that will
-     *     be applied when a namespaced node is found matching the function
-     *     name.  The function will be applied in the scope of this parser
-     *     with two arguments: the node being read and a context object passed
-     *     from the parent.
-     */
-    readers: {
-        "gml": OpenLayers.Util.applyDefaults({
-            "_inherit": function(node, obj, container) {
-                // SRSReferenceGroup attributes
-                var dim = parseInt(node.getAttribute("srsDimension"), 10) ||
-                    (container && container.srsDimension);
-                if (dim) {
-                    obj.srsDimension = dim;
-                }
-            },
-            "featureMembers": function(node, obj) {
-                this.readChildNodes(node, obj);
-            },
-            "Curve": function(node, container) {
-                var obj = {points: []};
-                this.readers.gml._inherit.apply(this, [node, obj, container]);
-                this.readChildNodes(node, obj);
-                if(!container.components) {
-                    container.components = [];
-                }
-                container.components.push(
-                    new OpenLayers.Geometry.LineString(obj.points)
-                );
-            },
-            "segments": function(node, obj) {
-                this.readChildNodes(node, obj);
-            },
-            "LineStringSegment": function(node, container) {
-                var obj = {};
-                this.readChildNodes(node, obj);
-                if(obj.points) {
-                    Array.prototype.push.apply(container.points, obj.points);
-                }
-            },
-            "pos": function(node, obj) {
-                var str = this.getChildValue(node).replace(
-                    this.regExes.trimSpace, ""
-                );
-                var coords = str.split(this.regExes.splitSpace);
-                var point;
-                if(this.xy) {
-                    point = new OpenLayers.Geometry.Point(
-                        coords[0], coords[1], coords[2]
-                    );
-                } else {
-                    point = new OpenLayers.Geometry.Point(
-                        coords[1], coords[0], coords[2]
-                    );
-                }
-                obj.points = [point];
-            },
-            "posList": function(node, obj) {
-                var str = this.getChildValue(node).replace(
-                    this.regExes.trimSpace, ""
-                );
-                var coords = str.split(this.regExes.splitSpace);
-                // The "dimension" attribute is from the GML 3.0.1 spec.
-                var dim = obj.srsDimension ||
-                    parseInt(node.getAttribute("srsDimension") || node.getAttribute("dimension"), 10) || 2;
-                var j, x, y, z;
-                var numPoints = coords.length / dim;
-                var points = new Array(numPoints);
-                for(var i=0, len=coords.length; i<len; i += dim) {
-                    x = coords[i];
-                    y = coords[i+1];
-                    z = (dim == 2) ? undefined : coords[i+2];
-                    if (this.xy) {
-                        points[i/dim] = new OpenLayers.Geometry.Point(x, y, z);
-                    } else {
-                        points[i/dim] = new OpenLayers.Geometry.Point(y, x, z);
-                    }
-                }
-                obj.points = points;
-            },
-            "Surface": function(node, obj) {
-                this.readChildNodes(node, obj);
-            },
-            "patches": function(node, obj) {
-                this.readChildNodes(node, obj);
-            },
-            "PolygonPatch": function(node, obj) {
-                this.readers.gml.Polygon.apply(this, [node, obj]);
-            },
-            "exterior": function(node, container) {
-                var obj = {};
-                this.readChildNodes(node, obj);
-                container.outer = obj.components[0];
-            },
-            "interior": function(node, container) {
-                var obj = {};
-                this.readChildNodes(node, obj);
-                container.inner.push(obj.components[0]);
-            },
-            "MultiCurve": function(node, container) {
-                var obj = {components: []};
-                this.readers.gml._inherit.apply(this, [node, obj, container]);
-                this.readChildNodes(node, obj);
-                if(obj.components.length > 0) {
-                    container.components = [
-                        new OpenLayers.Geometry.MultiLineString(obj.components)
-                    ];
-                }
-            },
-            "curveMember": function(node, obj) {
-                this.readChildNodes(node, obj);
-            },
-            "MultiSurface": function(node, container) {
-                var obj = {components: []};
-                this.readers.gml._inherit.apply(this, [node, obj, container]);
-                this.readChildNodes(node, obj);
-                if(obj.components.length > 0) {
-                    container.components = [
-                        new OpenLayers.Geometry.MultiPolygon(obj.components)
-                    ];
-                }
-            },
-            "surfaceMember": function(node, obj) {
-                this.readChildNodes(node, obj);
-            },
-            "surfaceMembers": function(node, obj) {
-                this.readChildNodes(node, obj);
-            },
-            "pointMembers": function(node, obj) {
-                this.readChildNodes(node, obj);
-            },
-            "lineStringMembers": function(node, obj) {
-                this.readChildNodes(node, obj);
-            },
-            "polygonMembers": function(node, obj) {
-                this.readChildNodes(node, obj);
-            },
-            "geometryMembers": function(node, obj) {
-                this.readChildNodes(node, obj);
-            },
-            "Envelope": function(node, container) {
-                var obj = {points: new Array(2)};
-                this.readChildNodes(node, obj);
-                if(!container.components) {
-                    container.components = [];
-                }
-                var min = obj.points[0];
-                var max = obj.points[1];
-                container.components.push(
-                    new OpenLayers.Bounds(min.x, min.y, max.x, max.y)
-                );
-            },
-            "lowerCorner": function(node, container) {
-                var obj = {};
-                this.readers.gml.pos.apply(this, [node, obj]);
-                container.points[0] = obj.points[0];
-            },
-            "upperCorner": function(node, container) {
-                var obj = {};
-                this.readers.gml.pos.apply(this, [node, obj]);
-                container.points[1] = obj.points[0];
-            }
-        }, OpenLayers.Format.GML.Base.prototype.readers["gml"]),            
-        "feature": OpenLayers.Format.GML.Base.prototype.readers["feature"],
-        "wfs": OpenLayers.Format.GML.Base.prototype.readers["wfs"]
-    },
-    
-    /**
-     * Method: write
-     *
-     * Parameters:
-     * features - {Array(<OpenLayers.Feature.Vector>) | OpenLayers.Feature.Vector}
-     *     An array of features or a single feature.
-     *
-     * Returns:
-     * {String} Given an array of features, a doc with a gml:featureMembers
-     *     element will be returned.  Given a single feature, a doc with a
-     *     gml:featureMember element will be returned.
-     */
-    write: function(features) {
-        var name;
-        if(OpenLayers.Util.isArray(features)) {
-            name = "featureMembers";
-        } else {
-            name = "featureMember";
-        }
-        var root = this.writeNode("gml:" + name, features);
-        this.setAttributeNS(
-            root, this.namespaces["xsi"],
-            "xsi:schemaLocation", this.schemaLocation
-        );
-
-        return OpenLayers.Format.XML.prototype.write.apply(this, [root]);
-    },
-
-    /**
-     * Property: writers
-     * As a compliment to the readers property, this structure contains public
-     *     writing functions grouped by namespace alias and named like the
-     *     node names they produce.
-     */
-    writers: {
-        "gml": OpenLayers.Util.applyDefaults({
-            "featureMembers": function(features) {
-                var node = this.createElementNSPlus("gml:featureMembers");
-                for(var i=0, len=features.length; i<len; ++i) {
-                    this.writeNode("feature:_typeName", features[i], node);
-                }
-                return node;
-            },
-            "Point": function(geometry) {
-                var node = this.createElementNSPlus("gml:Point");
-                this.writeNode("pos", geometry, node);
-                return node;
-            },
-            "pos": function(point) {
-                // only 2d for simple features profile
-                var pos = (this.xy) ?
-                    (point.x + " " + point.y) : (point.y + " " + point.x);
-                return this.createElementNSPlus("gml:pos", {
-                    value: pos
-                });
-            },
-            "LineString": function(geometry) {
-                var node = this.createElementNSPlus("gml:LineString");
-                this.writeNode("posList", geometry.components, node);
-                return node;
-            },
-            "Curve": function(geometry) {
-                var node = this.createElementNSPlus("gml:Curve");
-                this.writeNode("segments", geometry, node);
-                return node;
-            },
-            "segments": function(geometry) {
-                var node = this.createElementNSPlus("gml:segments");
-                this.writeNode("LineStringSegment", geometry, node);
-                return node;
-            },
-            "LineStringSegment": function(geometry) {
-                var node = this.createElementNSPlus("gml:LineStringSegment");
-                this.writeNode("posList", geometry.components, node);
-                return node;
-            },
-            "posList": function(points) {
-                // only 2d for simple features profile
-                var len = points.length;
-                var parts = new Array(len);
-                var point;
-                for(var i=0; i<len; ++i) {
-                    point = points[i];
-                    if(this.xy) {
-                        parts[i] = point.x + " " + point.y;
-                    } else {
-                        parts[i] = point.y + " " + point.x;
-                    }
-                }
-                return this.createElementNSPlus("gml:posList", {
-                    value: parts.join(" ")
-                }); 
-            },
-            "Surface": function(geometry) {
-                var node = this.createElementNSPlus("gml:Surface");
-                this.writeNode("patches", geometry, node);
-                return node;
-            },
-            "patches": function(geometry) {
-                var node = this.createElementNSPlus("gml:patches");
-                this.writeNode("PolygonPatch", geometry, node);
-                return node;
-            },
-            "PolygonPatch": function(geometry) {
-                var node = this.createElementNSPlus("gml:PolygonPatch", {
-                    attributes: {interpolation: "planar"}
-                });
-                this.writeNode("exterior", geometry.components[0], node);
-                for(var i=1, len=geometry.components.length; i<len; ++i) {
-                    this.writeNode(
-                        "interior", geometry.components[i], node
-                    );
-                }
-                return node;
-            },
-            "Polygon": function(geometry) {
-                var node = this.createElementNSPlus("gml:Polygon");
-                this.writeNode("exterior", geometry.components[0], node);
-                for(var i=1, len=geometry.components.length; i<len; ++i) {
-                    this.writeNode(
-                        "interior", geometry.components[i], node
-                    );
-                }
-                return node;
-            },
-            "exterior": function(ring) {
-                var node = this.createElementNSPlus("gml:exterior");
-                this.writeNode("LinearRing", ring, node);
-                return node;
-            },
-            "interior": function(ring) {
-                var node = this.createElementNSPlus("gml:interior");
-                this.writeNode("LinearRing", ring, node);
-                return node;
-            },
-            "LinearRing": function(ring) {
-                var node = this.createElementNSPlus("gml:LinearRing");
-                this.writeNode("posList", ring.components, node);
-                return node;
-            },
-            "MultiCurve": function(geometry) {
-                var node = this.createElementNSPlus("gml:MultiCurve");
-                var components = geometry.components || [geometry];
-                for(var i=0, len=components.length; i<len; ++i) {
-                    this.writeNode("curveMember", components[i], node);
-                }
-                return node;
-            },
-            "curveMember": function(geometry) {
-                var node = this.createElementNSPlus("gml:curveMember");
-                if(this.curve) {
-                    this.writeNode("Curve", geometry, node);
-                } else {
-                    this.writeNode("LineString", geometry, node);
-                }
-                return node;
-            },
-            "MultiSurface": function(geometry) {
-                var node = this.createElementNSPlus("gml:MultiSurface");
-                var components = geometry.components || [geometry];
-                for(var i=0, len=components.length; i<len; ++i) {
-                    this.writeNode("surfaceMember", components[i], node);
-                }
-                return node;
-            },
-            "surfaceMember": function(polygon) {
-                var node = this.createElementNSPlus("gml:surfaceMember");
-                if(this.surface) {
-                    this.writeNode("Surface", polygon, node);
-                } else {
-                    this.writeNode("Polygon", polygon, node);
-                }
-                return node;
-            },
-            "Envelope": function(bounds) {
-                var node = this.createElementNSPlus("gml:Envelope");
-                this.writeNode("lowerCorner", bounds, node);
-                this.writeNode("upperCorner", bounds, node);
-                // srsName attribute is required for gml:Envelope
-                if(this.srsName) {
-                    node.setAttribute("srsName", this.srsName);
-                }
-                return node;
-            },
-            "lowerCorner": function(bounds) {
-                // only 2d for simple features profile
-                var pos = (this.xy) ?
-                    (bounds.left + " " + bounds.bottom) :
-                    (bounds.bottom + " " + bounds.left);
-                return this.createElementNSPlus("gml:lowerCorner", {
-                    value: pos
-                });
-            },
-            "upperCorner": function(bounds) {
-                // only 2d for simple features profile
-                var pos = (this.xy) ?
-                    (bounds.right + " " + bounds.top) :
-                    (bounds.top + " " + bounds.right);
-                return this.createElementNSPlus("gml:upperCorner", {
-                    value: pos
-                });
-            }
-        }, OpenLayers.Format.GML.Base.prototype.writers["gml"]),
-        "feature": OpenLayers.Format.GML.Base.prototype.writers["feature"],
-        "wfs": OpenLayers.Format.GML.Base.prototype.writers["wfs"]
-    },
-
-    /**
-     * Method: setGeometryTypes
-     * Sets the <geometryTypes> mapping.
-     */
-    setGeometryTypes: function() {
-        this.geometryTypes = {
-            "OpenLayers.Geometry.Point": "Point",
-            "OpenLayers.Geometry.MultiPoint": "MultiPoint",
-            "OpenLayers.Geometry.LineString": (this.curve === true) ? "Curve": "LineString",
-            "OpenLayers.Geometry.MultiLineString": (this.multiCurve === false) ? "MultiLineString" : "MultiCurve",
-            "OpenLayers.Geometry.Polygon": (this.surface === true) ? "Surface" : "Polygon",
-            "OpenLayers.Geometry.MultiPolygon": (this.multiSurface === false) ? "MultiPolygon" : "MultiSurface",
-            "OpenLayers.Geometry.Collection": "GeometryCollection"
-        };
-    },
-    
-    CLASS_NAME: "OpenLayers.Format.GML.v3" 
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/GPX.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/GPX.js
deleted file mode 100644
index 16a8056b..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/GPX.js
+++ /dev/null
@@ -1,385 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/XML.js
- * @requires OpenLayers/Feature/Vector.js
- * @requires OpenLayers/Geometry/Point.js
- * @requires OpenLayers/Geometry/LineString.js
- * @requires OpenLayers/Projection.js
- */
-
-/**
- * Class: OpenLayers.Format.GPX
- * Read/write GPX parser. Create a new instance with the 
- *     <OpenLayers.Format.GPX> constructor.
- *
- * Inherits from:
- *  - <OpenLayers.Format.XML>
- */
-OpenLayers.Format.GPX = OpenLayers.Class(OpenLayers.Format.XML, {
-    
-
-    /** 
-     * APIProperty: defaultDesc
-     * {String} Default description for the waypoints/tracks in the case
-     *     where the feature has no "description" attribute.
-     *     Default is "No description available".
-     */
-    defaultDesc: "No description available",
-
-   /**
-    * APIProperty: extractWaypoints
-    * {Boolean} Extract waypoints from GPX. (default: true)
-    */
-    extractWaypoints: true,
-    
-   /**
-    * APIProperty: extractTracks
-    * {Boolean} Extract tracks from GPX. (default: true)
-    */
-    extractTracks: true,
-    
-   /**
-    * APIProperty: extractRoutes
-    * {Boolean} Extract routes from GPX. (default: true)
-    */
-    extractRoutes: true,
-    
-    /**
-     * APIProperty: extractAttributes
-     * {Boolean} Extract feature attributes from GPX. (default: true)
-     *     NOTE: Attributes as part of extensions to the GPX standard may not
-     *     be extracted.
-     */
-    extractAttributes: true,
-
-    /**
-     * Property: namespaces
-     * {Object} Mapping of namespace aliases to namespace URIs.
-     */
-    namespaces: {
-        gpx: "http://www.topografix.com/GPX/1/1",
-        xsi: "http://www.w3.org/2001/XMLSchema-instance"
-    },
-
-    /**
-     * Property: schemaLocation
-     * {String} Schema location. Defaults to
-     *  "http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd"
-     */
-    schemaLocation: "http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd",
-
-    /**
-     * APIProperty: creator
-     * {String} The creator attribute to be added to the written GPX files.
-     * Defaults to "OpenLayers"
-     */
-    creator: "OpenLayers",
-    
-    /**
-     * Constructor: OpenLayers.Format.GPX
-     * Create a new parser for GPX.
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be set on
-     *     this instance.
-     */
-    initialize: function(options) {
-        // GPX coordinates are always in longlat WGS84
-        this.externalProjection = new OpenLayers.Projection("EPSG:4326");
-
-        OpenLayers.Format.XML.prototype.initialize.apply(this, [options]);
-    },
-    
-    /**
-     * APIMethod: read
-     * Return a list of features from a GPX doc
-     *
-     * Parameters:
-     * doc - {Element} 
-     *
-     * Returns:
-     * Array({<OpenLayers.Feature.Vector>})
-     */
-    read: function(doc) {
-        if (typeof doc == "string") { 
-            doc = OpenLayers.Format.XML.prototype.read.apply(this, [doc]);
-        }
-        var features = [];
-        
-        if(this.extractTracks) {
-            var tracks = doc.getElementsByTagName("trk");
-            for (var i=0, len=tracks.length; i<len; i++) {
-                // Attributes are only in trk nodes, not trkseg nodes
-                var attrs = {};
-                if(this.extractAttributes) {
-                    attrs = this.parseAttributes(tracks[i]);
-                }
-                
-                var segs = this.getElementsByTagNameNS(tracks[i], tracks[i].namespaceURI, "trkseg");
-                for (var j = 0, seglen = segs.length; j < seglen; j++) {
-                    // We don't yet support extraction of trkpt attributes
-                    // All trksegs of a trk get that trk's attributes
-                    var track = this.extractSegment(segs[j], "trkpt");
-                    features.push(new OpenLayers.Feature.Vector(track, attrs));
-                }
-            }
-        }
-        
-        if(this.extractRoutes) {
-            var routes = doc.getElementsByTagName("rte");
-            for (var k=0, klen=routes.length; k<klen; k++) {
-                var attrs = {};
-                if(this.extractAttributes) {
-                    attrs = this.parseAttributes(routes[k]);
-                }
-                var route = this.extractSegment(routes[k], "rtept");
-                features.push(new OpenLayers.Feature.Vector(route, attrs));
-            }
-        }
-        
-        if(this.extractWaypoints) {
-            var waypoints = doc.getElementsByTagName("wpt");
-            for (var l = 0, len = waypoints.length; l < len; l++) {
-                var attrs = {};
-                if(this.extractAttributes) {
-                    attrs = this.parseAttributes(waypoints[l]);
-                }
-                var wpt = new OpenLayers.Geometry.Point(waypoints[l].getAttribute("lon"), waypoints[l].getAttribute("lat"));
-                features.push(new OpenLayers.Feature.Vector(wpt, attrs));
-            }
-        }
-        
-        if (this.internalProjection && this.externalProjection) {
-            for (var g = 0, featLength = features.length; g < featLength; g++) {
-                features[g].geometry.transform(this.externalProjection,
-                                    this.internalProjection);
-            }
-        }
-        
-        return features;
-    },
-    
-   /**
-    * Method: extractSegment
-    *
-    * Parameters:
-    * segment - {DOMElement} a trkseg or rte node to parse
-    * segmentType - {String} nodeName of waypoints that form the line
-    *
-    * Returns:
-    * {<OpenLayers.Geometry.LineString>} A linestring geometry
-    */
-    extractSegment: function(segment, segmentType) {
-        var points = this.getElementsByTagNameNS(segment, segment.namespaceURI, segmentType);
-        var point_features = [];
-        for (var i = 0, len = points.length; i < len; i++) {
-            point_features.push(new OpenLayers.Geometry.Point(points[i].getAttribute("lon"), points[i].getAttribute("lat")));
-        }
-        return new OpenLayers.Geometry.LineString(point_features);
-    },
-    
-    /**
-     * Method: parseAttributes
-     *
-     * Parameters:
-     * node - {<DOMElement>}
-     *
-     * Returns:
-     * {Object} An attributes object.
-     */
-    parseAttributes: function(node) {
-        // node is either a wpt, trk or rte
-        // attributes are children of the form <attr>value</attr>
-        var attributes = {};
-        var attrNode = node.firstChild, value, name;
-        while(attrNode) {
-            if(attrNode.nodeType == 1 && attrNode.firstChild) {
-                value = attrNode.firstChild;
-                if(value.nodeType == 3 || value.nodeType == 4) {
-                    name = (attrNode.prefix) ?
-                        attrNode.nodeName.split(":")[1] :
-                        attrNode.nodeName;
-                    if(name != "trkseg" && name != "rtept") {
-                        attributes[name] = value.nodeValue;
-                    }
-                }
-            }
-            attrNode = attrNode.nextSibling;
-        }
-        return attributes;
-    },
-
-    /**
-     * APIMethod: write
-     * Accepts Feature Collection, and returns a string. 
-     * 
-     * Parameters: 
-     * features - {Array(<OpenLayers.Feature.Vector>)} List of features to serialize into a string.
-     * metadata - {Object} A key/value pairs object to build a metadata node to
-     *      add to the gpx. Supported keys are 'name', 'desc', 'author'.
-     */
-    write: function(features, metadata) {
-        features = OpenLayers.Util.isArray(features) ?
-            features : [features];
-        var gpx = this.createElementNS(this.namespaces.gpx, "gpx");
-        gpx.setAttribute("version", "1.1");
-        gpx.setAttribute("creator", this.creator);
-        this.setAttributes(gpx, {
-            "xsi:schemaLocation": this.schemaLocation
-        });
-
-        if (metadata && typeof metadata == 'object') {
-            gpx.appendChild(this.buildMetadataNode(metadata));
-        }
-        for(var i=0, len=features.length; i<len; i++) {
-            gpx.appendChild(this.buildFeatureNode(features[i]));
-        }
-        return OpenLayers.Format.XML.prototype.write.apply(this, [gpx]);
-    },
-
-    /**
-     * Method: buildMetadataNode
-     * Creates a "metadata" node.
-     *
-     * Returns:
-     * {DOMElement}
-     */
-    buildMetadataNode: function(metadata) {
-        var types = ['name', 'desc', 'author'],
-            node = this.createElementNS(this.namespaces.gpx, 'metadata');
-        for (var i=0; i < types.length; i++) {
-            var type = types[i];
-            if (metadata[type]) {
-                var n = this.createElementNS(this.namespaces.gpx, type);
-                n.appendChild(this.createTextNode(metadata[type]));
-                node.appendChild(n);
-            }
-        }
-        return node;
-    },
-
-    /**
-     * Method: buildFeatureNode
-     * Accepts an <OpenLayers.Feature.Vector>, and builds a node for it.
-     * 
-     * Parameters:
-     * feature - {<OpenLayers.Feature.Vector>}
-     *
-     * Returns:
-     * {DOMElement} - The created node, either a 'wpt' or a 'trk'.
-     */
-    buildFeatureNode: function(feature) {
-        var geometry = feature.geometry;
-            geometry = geometry.clone();
-        if (this.internalProjection && this.externalProjection) {
-            geometry.transform(this.internalProjection, 
-                               this.externalProjection);
-        }
-        if (geometry.CLASS_NAME == "OpenLayers.Geometry.Point") {
-            var wpt = this.buildWptNode(geometry);
-            this.appendAttributesNode(wpt, feature);
-            return wpt;
-        } else {
-            var trkNode = this.createElementNS(this.namespaces.gpx, "trk");
-            this.appendAttributesNode(trkNode, feature);
-            var trkSegNodes = this.buildTrkSegNode(geometry);
-            trkSegNodes = OpenLayers.Util.isArray(trkSegNodes) ?
-                trkSegNodes : [trkSegNodes];
-            for (var i = 0, len = trkSegNodes.length; i < len; i++) {
-                trkNode.appendChild(trkSegNodes[i]);
-            }
-            return trkNode;
-        }
-    },
-
-    /**
-     * Method: buildTrkSegNode
-     * Builds trkseg node(s) given a geometry
-     *
-     * Parameters:
-     * trknode
-     * geometry - {<OpenLayers.Geometry>}
-     */
-    buildTrkSegNode: function(geometry) {
-        var node,
-            i,
-            len,
-            point,
-            nodes;
-        if (geometry.CLASS_NAME == "OpenLayers.Geometry.LineString" ||
-            geometry.CLASS_NAME == "OpenLayers.Geometry.LinearRing") {
-            node = this.createElementNS(this.namespaces.gpx, "trkseg");
-            for (i = 0, len=geometry.components.length; i < len; i++) {
-                point = geometry.components[i];
-                node.appendChild(this.buildTrkPtNode(point));
-            }
-            return node;
-        } else {
-            nodes = [];
-            for (i = 0, len = geometry.components.length; i < len; i++) {
-                nodes.push(this.buildTrkSegNode(geometry.components[i]));
-            }
-            return nodes;
-        }
-    },
-    
-    /**
-     * Method: buildTrkPtNode
-     * Builds a trkpt node given a point 
-     *
-     * Parameters:
-     * point - {<OpenLayers.Geometry.Point>}
-     *
-     * Returns:
-     * {DOMElement} A trkpt node
-     */
-    buildTrkPtNode: function(point) {
-        var node = this.createElementNS(this.namespaces.gpx, "trkpt");
-        node.setAttribute("lon", point.x);
-        node.setAttribute("lat", point.y);
-        return node;
-    },
-
-    /**
-     * Method: buildWptNode
-     * Builds a wpt node given a point
-     *
-     * Parameters:
-     * geometry - {<OpenLayers.Geometry.Point>}
-     *
-     * Returns:
-     * {DOMElement} A wpt node
-     */
-    buildWptNode: function(geometry) {
-        var node = this.createElementNS(this.namespaces.gpx, "wpt");
-        node.setAttribute("lon", geometry.x);
-        node.setAttribute("lat", geometry.y);
-        return node;
-    },
-
-    /**
-     * Method: appendAttributesNode
-     * Adds some attributes node.
-     *
-     * Parameters:
-     * node - {DOMElement} the node to append the attribute nodes to.
-     * feature - {<OpenLayers.Feature.Vector>}
-     */
-    appendAttributesNode: function(node, feature) {
-        var name = this.createElementNS(this.namespaces.gpx, 'name');
-        name.appendChild(this.createTextNode(
-            feature.attributes.name || feature.id));
-        node.appendChild(name);
-        var desc = this.createElementNS(this.namespaces.gpx, 'desc');
-        desc.appendChild(this.createTextNode(
-            feature.attributes.description || this.defaultDesc));
-        node.appendChild(desc);
-        // TBD - deal with remaining (non name/description) attributes.
-    },
-
-    CLASS_NAME: "OpenLayers.Format.GPX"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/GeoJSON.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/GeoJSON.js
deleted file mode 100644
index 0e02377b..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/GeoJSON.js
+++ /dev/null
@@ -1,716 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/JSON.js
- * @requires OpenLayers/Feature/Vector.js
- * @requires OpenLayers/Geometry/Point.js
- * @requires OpenLayers/Geometry/MultiPoint.js
- * @requires OpenLayers/Geometry/LineString.js
- * @requires OpenLayers/Geometry/MultiLineString.js
- * @requires OpenLayers/Geometry/Polygon.js
- * @requires OpenLayers/Geometry/MultiPolygon.js
- * @requires OpenLayers/Console.js
- */
-
-/**
- * Class: OpenLayers.Format.GeoJSON
- * Read and write GeoJSON. Create a new parser with the
- *     <OpenLayers.Format.GeoJSON> constructor.
- *
- * Inherits from:
- *  - <OpenLayers.Format.JSON>
- */
-OpenLayers.Format.GeoJSON = OpenLayers.Class(OpenLayers.Format.JSON, {
-
-    /**
-     * APIProperty: ignoreExtraDims
-     * {Boolean} Ignore dimensions higher than 2 when reading geometry
-     * coordinates.
-     */ 
-    ignoreExtraDims: false,
-    
-    /**
-     * Constructor: OpenLayers.Format.GeoJSON
-     * Create a new parser for GeoJSON.
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be set on
-     *     this instance.
-     */
-
-    /**
-     * APIMethod: read
-     * Deserialize a GeoJSON string.
-     *
-     * Parameters:
-     * json - {String} A GeoJSON string
-     * type - {String} Optional string that determines the structure of
-     *     the output.  Supported values are "Geometry", "Feature", and
-     *     "FeatureCollection".  If absent or null, a default of
-     *     "FeatureCollection" is assumed.
-     * filter - {Function} A function which will be called for every key and
-     *     value at every level of the final result. Each value will be
-     *     replaced by the result of the filter function. This can be used to
-     *     reform generic objects into instances of classes, or to transform
-     *     date strings into Date objects.
-     *
-     * Returns: 
-     * {Object} The return depends on the value of the type argument. If type
-     *     is "FeatureCollection" (the default), the return will be an array
-     *     of <OpenLayers.Feature.Vector>. If type is "Geometry", the input json
-     *     must represent a single geometry, and the return will be an
-     *     <OpenLayers.Geometry>.  If type is "Feature", the input json must
-     *     represent a single feature, and the return will be an
-     *     <OpenLayers.Feature.Vector>.
-     */
-    read: function(json, type, filter) {
-        type = (type) ? type : "FeatureCollection";
-        var results = null;
-        var obj = null;
-        if (typeof json == "string") {
-            obj = OpenLayers.Format.JSON.prototype.read.apply(this,
-                                                              [json, filter]);
-        } else { 
-            obj = json;
-        }    
-        if(!obj) {
-            OpenLayers.Console.error("Bad JSON: " + json);
-        } else if(typeof(obj.type) != "string") {
-            OpenLayers.Console.error("Bad GeoJSON - no type: " + json);
-        } else if(this.isValidType(obj, type)) {
-            switch(type) {
-                case "Geometry":
-                    try {
-                        results = this.parseGeometry(obj);
-                    } catch(err) {
-                        OpenLayers.Console.error(err);
-                    }
-                    break;
-                case "Feature":
-                    try {
-                        results = this.parseFeature(obj);
-                        results.type = "Feature";
-                    } catch(err) {
-                        OpenLayers.Console.error(err);
-                    }
-                    break;
-                case "FeatureCollection":
-                    // for type FeatureCollection, we allow input to be any type
-                    results = [];
-                    switch(obj.type) {
-                        case "Feature":
-                            try {
-                                results.push(this.parseFeature(obj));
-                            } catch(err) {
-                                results = null;
-                                OpenLayers.Console.error(err);
-                            }
-                            break;
-                        case "FeatureCollection":
-                            for(var i=0, len=obj.features.length; i<len; ++i) {
-                                try {
-                                    results.push(this.parseFeature(obj.features[i]));
-                                } catch(err) {
-                                    results = null;
-                                    OpenLayers.Console.error(err);
-                                }
-                            }
-                            break;
-                        default:
-                            try {
-                                var geom = this.parseGeometry(obj);
-                                results.push(new OpenLayers.Feature.Vector(geom));
-                            } catch(err) {
-                                results = null;
-                                OpenLayers.Console.error(err);
-                            }
-                    }
-                break;
-            }
-        }
-        return results;
-    },
-    
-    /**
-     * Method: isValidType
-     * Check if a GeoJSON object is a valid representative of the given type.
-     *
-     * Returns:
-     * {Boolean} The object is valid GeoJSON object of the given type.
-     */
-    isValidType: function(obj, type) {
-        var valid = false;
-        switch(type) {
-            case "Geometry":
-                if(OpenLayers.Util.indexOf(
-                    ["Point", "MultiPoint", "LineString", "MultiLineString",
-                     "Polygon", "MultiPolygon", "Box", "GeometryCollection"],
-                    obj.type) == -1) {
-                    // unsupported geometry type
-                    OpenLayers.Console.error("Unsupported geometry type: " +
-                                              obj.type);
-                } else {
-                    valid = true;
-                }
-                break;
-            case "FeatureCollection":
-                // allow for any type to be converted to a feature collection
-                valid = true;
-                break;
-            default:
-                // for Feature types must match
-                if(obj.type == type) {
-                    valid = true;
-                } else {
-                    OpenLayers.Console.error("Cannot convert types from " +
-                                              obj.type + " to " + type);
-                }
-        }
-        return valid;
-    },
-    
-    /**
-     * Method: parseFeature
-     * Convert a feature object from GeoJSON into an
-     *     <OpenLayers.Feature.Vector>.
-     *
-     * Parameters:
-     * obj - {Object} An object created from a GeoJSON object
-     *
-     * Returns:
-     * {<OpenLayers.Feature.Vector>} A feature.
-     */
-    parseFeature: function(obj) {
-        var feature, geometry, attributes, bbox;
-        attributes = (obj.properties) ? obj.properties : {};
-        bbox = (obj.geometry && obj.geometry.bbox) || obj.bbox;
-        try {
-            geometry = this.parseGeometry(obj.geometry);
-        } catch(err) {
-            // deal with bad geometries
-            throw err;
-        }
-        feature = new OpenLayers.Feature.Vector(geometry, attributes);
-        if(bbox) {
-            feature.bounds = OpenLayers.Bounds.fromArray(bbox);
-        }
-        if(obj.id) {
-            feature.fid = obj.id;
-        }
-        return feature;
-    },
-    
-    /**
-     * Method: parseGeometry
-     * Convert a geometry object from GeoJSON into an <OpenLayers.Geometry>.
-     *
-     * Parameters:
-     * obj - {Object} An object created from a GeoJSON object
-     *
-     * Returns: 
-     * {<OpenLayers.Geometry>} A geometry.
-     */
-    parseGeometry: function(obj) {
-        if (obj == null) {
-            return null;
-        }
-        var geometry, collection = false;
-        if(obj.type == "GeometryCollection") {
-            if(!(OpenLayers.Util.isArray(obj.geometries))) {
-                throw "GeometryCollection must have geometries array: " + obj;
-            }
-            var numGeom = obj.geometries.length;
-            var components = new Array(numGeom);
-            for(var i=0; i<numGeom; ++i) {
-                components[i] = this.parseGeometry.apply(
-                    this, [obj.geometries[i]]
-                );
-            }
-            geometry = new OpenLayers.Geometry.Collection(components);
-            collection = true;
-        } else {
-            if(!(OpenLayers.Util.isArray(obj.coordinates))) {
-                throw "Geometry must have coordinates array: " + obj;
-            }
-            if(!this.parseCoords[obj.type.toLowerCase()]) {
-                throw "Unsupported geometry type: " + obj.type;
-            }
-            try {
-                geometry = this.parseCoords[obj.type.toLowerCase()].apply(
-                    this, [obj.coordinates]
-                );
-            } catch(err) {
-                // deal with bad coordinates
-                throw err;
-            }
-        }
-        // We don't reproject collections because the children are reprojected
-        // for us when they are created.
-        if (this.internalProjection && this.externalProjection && !collection) {
-            geometry.transform(this.externalProjection, 
-                               this.internalProjection); 
-        }                       
-        return geometry;
-    },
-    
-    /**
-     * Property: parseCoords
-     * Object with properties corresponding to the GeoJSON geometry types.
-     *     Property values are functions that do the actual parsing.
-     */
-    parseCoords: {
-        /**
-         * Method: parseCoords.point
-         * Convert a coordinate array from GeoJSON into an
-         *     <OpenLayers.Geometry>.
-         *
-         * Parameters:
-         * array - {Object} The coordinates array from the GeoJSON fragment.
-         *
-         * Returns:
-         * {<OpenLayers.Geometry>} A geometry.
-         */
-        "point": function(array) {
-            if (this.ignoreExtraDims == false && 
-                  array.length != 2) {
-                    throw "Only 2D points are supported: " + array;
-            }
-            return new OpenLayers.Geometry.Point(array[0], array[1]);
-        },
-        
-        /**
-         * Method: parseCoords.multipoint
-         * Convert a coordinate array from GeoJSON into an
-         *     <OpenLayers.Geometry>.
-         *
-         * Parameters:
-         * array - {Object} The coordinates array from the GeoJSON fragment.
-         *
-         * Returns:
-         * {<OpenLayers.Geometry>} A geometry.
-         */
-        "multipoint": function(array) {
-            var points = [];
-            var p = null;
-            for(var i=0, len=array.length; i<len; ++i) {
-                try {
-                    p = this.parseCoords["point"].apply(this, [array[i]]);
-                } catch(err) {
-                    throw err;
-                }
-                points.push(p);
-            }
-            return new OpenLayers.Geometry.MultiPoint(points);
-        },
-
-        /**
-         * Method: parseCoords.linestring
-         * Convert a coordinate array from GeoJSON into an
-         *     <OpenLayers.Geometry>.
-         *
-         * Parameters:
-         * array - {Object} The coordinates array from the GeoJSON fragment.
-         *
-         * Returns:
-         * {<OpenLayers.Geometry>} A geometry.
-         */
-        "linestring": function(array) {
-            var points = [];
-            var p = null;
-            for(var i=0, len=array.length; i<len; ++i) {
-                try {
-                    p = this.parseCoords["point"].apply(this, [array[i]]);
-                } catch(err) {
-                    throw err;
-                }
-                points.push(p);
-            }
-            return new OpenLayers.Geometry.LineString(points);
-        },
-        
-        /**
-         * Method: parseCoords.multilinestring
-         * Convert a coordinate array from GeoJSON into an
-         *     <OpenLayers.Geometry>.
-         *
-         * Parameters:
-         * array - {Object} The coordinates array from the GeoJSON fragment.
-         *
-         * Returns:
-         * {<OpenLayers.Geometry>} A geometry.
-         */
-        "multilinestring": function(array) {
-            var lines = [];
-            var l = null;
-            for(var i=0, len=array.length; i<len; ++i) {
-                try {
-                    l = this.parseCoords["linestring"].apply(this, [array[i]]);
-                } catch(err) {
-                    throw err;
-                }
-                lines.push(l);
-            }
-            return new OpenLayers.Geometry.MultiLineString(lines);
-        },
-        
-        /**
-         * Method: parseCoords.polygon
-         * Convert a coordinate array from GeoJSON into an
-         *     <OpenLayers.Geometry>.
-         *
-         * Returns:
-         * {<OpenLayers.Geometry>} A geometry.
-         */
-        "polygon": function(array) {
-            var rings = [];
-            var r, l;
-            for(var i=0, len=array.length; i<len; ++i) {
-                try {
-                    l = this.parseCoords["linestring"].apply(this, [array[i]]);
-                } catch(err) {
-                    throw err;
-                }
-                r = new OpenLayers.Geometry.LinearRing(l.components);
-                rings.push(r);
-            }
-            return new OpenLayers.Geometry.Polygon(rings);
-        },
-
-        /**
-         * Method: parseCoords.multipolygon
-         * Convert a coordinate array from GeoJSON into an
-         *     <OpenLayers.Geometry>.
-         *
-         * Parameters:
-         * array - {Object} The coordinates array from the GeoJSON fragment.
-         *
-         * Returns:
-         * {<OpenLayers.Geometry>} A geometry.
-         */
-        "multipolygon": function(array) {
-            var polys = [];
-            var p = null;
-            for(var i=0, len=array.length; i<len; ++i) {
-                try {
-                    p = this.parseCoords["polygon"].apply(this, [array[i]]);
-                } catch(err) {
-                    throw err;
-                }
-                polys.push(p);
-            }
-            return new OpenLayers.Geometry.MultiPolygon(polys);
-        },
-
-        /**
-         * Method: parseCoords.box
-         * Convert a coordinate array from GeoJSON into an
-         *     <OpenLayers.Geometry>.
-         *
-         * Parameters:
-         * array - {Object} The coordinates array from the GeoJSON fragment.
-         *
-         * Returns:
-         * {<OpenLayers.Geometry>} A geometry.
-         */
-        "box": function(array) {
-            if(array.length != 2) {
-                throw "GeoJSON box coordinates must have 2 elements";
-            }
-            return new OpenLayers.Geometry.Polygon([
-                new OpenLayers.Geometry.LinearRing([
-                    new OpenLayers.Geometry.Point(array[0][0], array[0][1]),
-                    new OpenLayers.Geometry.Point(array[1][0], array[0][1]),
-                    new OpenLayers.Geometry.Point(array[1][0], array[1][1]),
-                    new OpenLayers.Geometry.Point(array[0][0], array[1][1]),
-                    new OpenLayers.Geometry.Point(array[0][0], array[0][1])
-                ])
-            ]);
-        }
-
-    },
-
-    /**
-     * APIMethod: write
-     * Serialize a feature, geometry, array of features into a GeoJSON string.
-     *
-     * Parameters:
-     * obj - {Object} An <OpenLayers.Feature.Vector>, <OpenLayers.Geometry>,
-     *     or an array of features.
-     * pretty - {Boolean} Structure the output with newlines and indentation.
-     *     Default is false.
-     *
-     * Returns:
-     * {String} The GeoJSON string representation of the input geometry,
-     *     features, or array of features.
-     */
-    write: function(obj, pretty) {
-        var geojson = {
-            "type": null
-        };
-        if(OpenLayers.Util.isArray(obj)) {
-            geojson.type = "FeatureCollection";
-            var numFeatures = obj.length;
-            geojson.features = new Array(numFeatures);
-            for(var i=0; i<numFeatures; ++i) {
-                var element = obj[i];
-                if(!element instanceof OpenLayers.Feature.Vector) {
-                    var msg = "FeatureCollection only supports collections " +
-                              "of features: " + element;
-                    throw msg;
-                }
-                geojson.features[i] = this.extract.feature.apply(
-                    this, [element]
-                );
-            }
-        } else if (obj.CLASS_NAME.indexOf("OpenLayers.Geometry") == 0) {
-            geojson = this.extract.geometry.apply(this, [obj]);
-        } else if (obj instanceof OpenLayers.Feature.Vector) {
-            geojson = this.extract.feature.apply(this, [obj]);
-            if(obj.layer && obj.layer.projection) {
-                geojson.crs = this.createCRSObject(obj);
-            }
-        }
-        return OpenLayers.Format.JSON.prototype.write.apply(this,
-                                                            [geojson, pretty]);
-    },
-
-    /**
-     * Method: createCRSObject
-     * Create the CRS object for an object.
-     *
-     * Parameters:
-     * object - {<OpenLayers.Feature.Vector>} 
-     *
-     * Returns:
-     * {Object} An object which can be assigned to the crs property
-     * of a GeoJSON object.
-     */
-    createCRSObject: function(object) {
-       var proj = object.layer.projection.toString();
-       var crs = {};
-       if (proj.match(/epsg:/i)) {
-           var code = parseInt(proj.substring(proj.indexOf(":") + 1));
-           if (code == 4326) {
-               crs = {
-                   "type": "name",
-                   "properties": {
-                       "name": "urn:ogc:def:crs:OGC:1.3:CRS84"
-                   }
-               };
-           } else {    
-               crs = {
-                   "type": "name",
-                   "properties": {
-                       "name": "EPSG:" + code
-                   }
-               };
-           }    
-       }
-       return crs;
-    },
-    
-    /**
-     * Property: extract
-     * Object with properties corresponding to the GeoJSON types.
-     *     Property values are functions that do the actual value extraction.
-     */
-    extract: {
-        /**
-         * Method: extract.feature
-         * Return a partial GeoJSON object representing a single feature.
-         *
-         * Parameters:
-         * feature - {<OpenLayers.Feature.Vector>}
-         *
-         * Returns:
-         * {Object} An object representing the point.
-         */
-        'feature': function(feature) {
-            var geom = this.extract.geometry.apply(this, [feature.geometry]);
-            var json = {
-                "type": "Feature",
-                "properties": feature.attributes,
-                "geometry": geom
-            };
-            if (feature.fid != null) {
-                json.id = feature.fid;
-            }
-            return json;
-        },
-        
-        /**
-         * Method: extract.geometry
-         * Return a GeoJSON object representing a single geometry.
-         *
-         * Parameters:
-         * geometry - {<OpenLayers.Geometry>}
-         *
-         * Returns:
-         * {Object} An object representing the geometry.
-         */
-        'geometry': function(geometry) {
-            if (geometry == null) {
-                return null;
-            }
-            if (this.internalProjection && this.externalProjection) {
-                geometry = geometry.clone();
-                geometry.transform(this.internalProjection, 
-                                   this.externalProjection);
-            }                       
-            var geometryType = geometry.CLASS_NAME.split('.')[2];
-            var data = this.extract[geometryType.toLowerCase()].apply(this, [geometry]);
-            var json;
-            if(geometryType == "Collection") {
-                json = {
-                    "type": "GeometryCollection",
-                    "geometries": data
-                };
-            } else {
-                json = {
-                    "type": geometryType,
-                    "coordinates": data
-                };
-            }
-            
-            return json;
-        },
-
-        /**
-         * Method: extract.point
-         * Return an array of coordinates from a point.
-         *
-         * Parameters:
-         * point - {<OpenLayers.Geometry.Point>}
-         *
-         * Returns: 
-         * {Array} An array of coordinates representing the point.
-         */
-        'point': function(point) {
-            return [point.x, point.y];
-        },
-
-        /**
-         * Method: extract.multipoint
-         * Return an array of point coordinates from a multipoint.
-         *
-         * Parameters:
-         * multipoint - {<OpenLayers.Geometry.MultiPoint>}
-         *
-         * Returns:
-         * {Array} An array of point coordinate arrays representing
-         *     the multipoint.
-         */
-        'multipoint': function(multipoint) {
-            var array = [];
-            for(var i=0, len=multipoint.components.length; i<len; ++i) {
-                array.push(this.extract.point.apply(this, [multipoint.components[i]]));
-            }
-            return array;
-        },
-        
-        /**
-         * Method: extract.linestring
-         * Return an array of coordinate arrays from a linestring.
-         *
-         * Parameters:
-         * linestring - {<OpenLayers.Geometry.LineString>}
-         *
-         * Returns:
-         * {Array} An array of coordinate arrays representing
-         *     the linestring.
-         */
-        'linestring': function(linestring) {
-            var array = [];
-            for(var i=0, len=linestring.components.length; i<len; ++i) {
-                array.push(this.extract.point.apply(this, [linestring.components[i]]));
-            }
-            return array;
-        },
-
-        /**
-         * Method: extract.multilinestring
-         * Return an array of linestring arrays from a linestring.
-         * 
-         * Parameters:
-         * multilinestring - {<OpenLayers.Geometry.MultiLineString>}
-         * 
-         * Returns:
-         * {Array} An array of linestring arrays representing
-         *     the multilinestring.
-         */
-        'multilinestring': function(multilinestring) {
-            var array = [];
-            for(var i=0, len=multilinestring.components.length; i<len; ++i) {
-                array.push(this.extract.linestring.apply(this, [multilinestring.components[i]]));
-            }
-            return array;
-        },
-        
-        /**
-         * Method: extract.polygon
-         * Return an array of linear ring arrays from a polygon.
-         *
-         * Parameters:
-         * polygon - {<OpenLayers.Geometry.Polygon>}
-         * 
-         * Returns:
-         * {Array} An array of linear ring arrays representing the polygon.
-         */
-        'polygon': function(polygon) {
-            var array = [];
-            for(var i=0, len=polygon.components.length; i<len; ++i) {
-                array.push(this.extract.linestring.apply(this, [polygon.components[i]]));
-            }
-            return array;
-        },
-
-        /**
-         * Method: extract.multipolygon
-         * Return an array of polygon arrays from a multipolygon.
-         * 
-         * Parameters:
-         * multipolygon - {<OpenLayers.Geometry.MultiPolygon>}
-         * 
-         * Returns:
-         * {Array} An array of polygon arrays representing
-         *     the multipolygon
-         */
-        'multipolygon': function(multipolygon) {
-            var array = [];
-            for(var i=0, len=multipolygon.components.length; i<len; ++i) {
-                array.push(this.extract.polygon.apply(this, [multipolygon.components[i]]));
-            }
-            return array;
-        },
-        
-        /**
-         * Method: extract.collection
-         * Return an array of geometries from a geometry collection.
-         * 
-         * Parameters:
-         * collection - {<OpenLayers.Geometry.Collection>}
-         * 
-         * Returns:
-         * {Array} An array of geometry objects representing the geometry
-         *     collection.
-         */
-        'collection': function(collection) {
-            var len = collection.components.length;
-            var array = new Array(len);
-            for(var i=0; i<len; ++i) {
-                array[i] = this.extract.geometry.apply(
-                    this, [collection.components[i]]
-                );
-            }
-            return array;
-        }
-        
-
-    },
-
-    CLASS_NAME: "OpenLayers.Format.GeoJSON" 
-
-});     
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/GeoRSS.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/GeoRSS.js
deleted file mode 100644
index cbbb4d89..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/GeoRSS.js
+++ /dev/null
@@ -1,409 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/XML.js
- * @requires OpenLayers/Feature/Vector.js
- * @requires OpenLayers/Geometry/Point.js
- * @requires OpenLayers/Geometry/LineString.js
- * @requires OpenLayers/Geometry/Polygon.js
- */
-
-/**
- * Class: OpenLayers.Format.GeoRSS
- * Read/write GeoRSS parser. Create a new instance with the 
- *     <OpenLayers.Format.GeoRSS> constructor.
- *
- * Inherits from:
- *  - <OpenLayers.Format.XML>
- */
-OpenLayers.Format.GeoRSS = OpenLayers.Class(OpenLayers.Format.XML, {
-    
-    /**
-     * APIProperty: rssns
-     * {String} RSS namespace to use. Defaults to
-     *   "http://backend.userland.com/rss2"
-     */
-    rssns: "http://backend.userland.com/rss2",
-    
-    /**
-     * APIProperty: featurens
-     * {String} Feature Attributes namespace.  Defaults to
-     *    "http://mapserver.gis.umn.edu/mapserver"
-     */
-    featureNS: "http://mapserver.gis.umn.edu/mapserver",
-    
-    /**
-     * APIProperty: georssns
-     * {String} GeoRSS namespace to use.  Defaults to
-     *     "http://www.georss.org/georss"
-     */
-    georssns: "http://www.georss.org/georss",
-
-    /**
-     * APIProperty: geons
-     * {String} W3C Geo namespace to use.  Defaults to
-     *     "http://www.w3.org/2003/01/geo/wgs84_pos#"
-     */
-    geons: "http://www.w3.org/2003/01/geo/wgs84_pos#",
-    
-    /**
-     * APIProperty: featureTitle
-     * {String} Default title for features.  Defaults to "Untitled"
-     */
-    featureTitle: "Untitled",
-    
-    /**
-     * APIProperty: featureDescription
-     * {String} Default description for features.  Defaults to "No Description"
-     */
-    featureDescription: "No Description",
-    
-    /**
-     * Property: gmlParse
-     * {Object} GML Format object for parsing features
-     * Non-API and only created if necessary
-     */
-    gmlParser: null,
-
-    /**
-     * APIProperty: xy
-     * {Boolean} Order of the GML coordinate: true:(x,y) or false:(y,x)
-     * For GeoRSS the default is (y,x), therefore: false
-     */ 
-    xy: false,
-    
-    /**
-     * Constructor: OpenLayers.Format.GeoRSS
-     * Create a new parser for GeoRSS.
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be set on
-     *     this instance.
-     */
-    
-    /**
-     * Method: createGeometryFromItem
-     * Return a geometry from a GeoRSS Item.
-     *
-     * Parameters:
-     * item - {DOMElement} A GeoRSS item node.
-     *
-     * Returns:
-     * {<OpenLayers.Geometry>} A geometry representing the node.
-     */
-    createGeometryFromItem: function(item) {
-        var point = this.getElementsByTagNameNS(item, this.georssns, "point");
-        var lat = this.getElementsByTagNameNS(item, this.geons, 'lat');
-        var lon = this.getElementsByTagNameNS(item, this.geons, 'long');
-        
-        var line = this.getElementsByTagNameNS(item,
-                                                this.georssns,
-                                                "line");
-        var polygon = this.getElementsByTagNameNS(item,
-                                                this.georssns,
-                                                "polygon");
-        var where = this.getElementsByTagNameNS(item, 
-                                                this.georssns, 
-                                                "where");
-        var box = this.getElementsByTagNameNS(item, 
-                                              this.georssns, 
-                                              "box");
-
-        if (point.length > 0 || (lat.length > 0 && lon.length > 0)) {
-            var location;
-            if (point.length > 0) {
-                location = OpenLayers.String.trim(
-                                point[0].firstChild.nodeValue).split(/\s+/);
-                if (location.length !=2) {
-                    location = OpenLayers.String.trim(
-                                point[0].firstChild.nodeValue).split(/\s*,\s*/);
-                }
-            } else {
-                location = [parseFloat(lat[0].firstChild.nodeValue),
-                                parseFloat(lon[0].firstChild.nodeValue)];
-            }    
-
-            var geometry = new OpenLayers.Geometry.Point(location[1], location[0]);
-              
-        } else if (line.length > 0) {
-            var coords = OpenLayers.String.trim(this.getChildValue(line[0])).split(/\s+/);
-            var components = []; 
-            var point;
-            for (var i=0, len=coords.length; i<len; i+=2) {
-                point = new OpenLayers.Geometry.Point(coords[i+1], coords[i]);
-                components.push(point);
-            }
-            geometry = new OpenLayers.Geometry.LineString(components);
-        } else if (polygon.length > 0) { 
-            var coords = OpenLayers.String.trim(this.getChildValue(polygon[0])).split(/\s+/);
-            var components = []; 
-            var point;
-            for (var i=0, len=coords.length; i<len; i+=2) {
-                point = new OpenLayers.Geometry.Point(coords[i+1], coords[i]);
-                components.push(point);
-            }
-            geometry = new OpenLayers.Geometry.Polygon([new OpenLayers.Geometry.LinearRing(components)]);
-        } else if (where.length > 0) { 
-            if (!this.gmlParser) {
-              this.gmlParser = new OpenLayers.Format.GML({'xy': this.xy});
-            }
-            var feature = this.gmlParser.parseFeature(where[0]);
-            geometry = feature.geometry;
-        } else if (box.length  > 0) {
-            var coords = OpenLayers.String.trim(box[0].firstChild.nodeValue).split(/\s+/);
-            var components = [];
-            var point;
-            if (coords.length > 3) {
-                point = new OpenLayers.Geometry.Point(coords[1], coords[0]);
-                components.push(point);
-                point = new OpenLayers.Geometry.Point(coords[1], coords[2]);
-                components.push(point);
-                point = new OpenLayers.Geometry.Point(coords[3], coords[2]);
-                components.push(point);
-                point = new OpenLayers.Geometry.Point(coords[3], coords[0]);
-                components.push(point);
-                point = new OpenLayers.Geometry.Point(coords[1], coords[0]);
-                components.push(point);
-            }
-            geometry = new OpenLayers.Geometry.Polygon([new OpenLayers.Geometry.LinearRing(components)]);
-        }
-        
-        if (geometry && this.internalProjection && this.externalProjection) {
-            geometry.transform(this.externalProjection, 
-                               this.internalProjection);
-        }
-
-        return geometry;
-    },        
-
-    /**
-     * Method: createFeatureFromItem
-     * Return a feature from a GeoRSS Item.
-     *
-     * Parameters:
-     * item - {DOMElement} A GeoRSS item node.
-     *
-     * Returns:
-     * {<OpenLayers.Feature.Vector>} A feature representing the item.
-     */
-    createFeatureFromItem: function(item) {
-        var geometry = this.createGeometryFromItem(item);
-     
-        /* Provide defaults for title and description */
-        var title = this._getChildValue(item, "*", "title", this.featureTitle);
-       
-        /* First try RSS descriptions, then Atom summaries */
-        var description = this._getChildValue(
-            item, "*", "description",
-            this._getChildValue(item, "*", "content",
-                this._getChildValue(item, "*", "summary", this.featureDescription)));
-
-        /* If no link URL is found in the first child node, try the
-           href attribute */
-        var link = this._getChildValue(item, "*", "link");
-        if(!link) {
-            try {
-                link = this.getElementsByTagNameNS(item, "*", "link")[0].getAttribute("href");
-            } catch(e) {
-                link = null;
-            }
-        }
-
-        var id = this._getChildValue(item, "*", "id", null);
-        
-        var data = {
-            "title": title,
-            "description": description,
-            "link": link
-        };
-        var feature = new OpenLayers.Feature.Vector(geometry, data);
-        feature.fid = id;
-        return feature;
-    },        
-    
-    /**
-     * Method: _getChildValue
-     *
-     * Parameters:
-     * node - {DOMElement}
-     * nsuri - {String} Child node namespace uri ("*" for any).
-     * name - {String} Child node name.
-     * def - {String} Optional string default to return if no child found.
-     *
-     * Returns:
-     * {String} The value of the first child with the given tag name.  Returns
-     *     default value or empty string if none found.
-     */
-    _getChildValue: function(node, nsuri, name, def) {
-        var value;
-        var eles = this.getElementsByTagNameNS(node, nsuri, name);
-        if(eles && eles[0] && eles[0].firstChild
-            && eles[0].firstChild.nodeValue) {
-            value = this.getChildValue(eles[0]);
-        } else {
-            value = (def == undefined) ? "" : def;
-        }
-        return value;
-    },
-    
-    /**
-     * APIMethod: read
-     * Return a list of features from a GeoRSS doc
-     *
-     * Parameters:
-     * doc - {Element} 
-     *
-     * Returns:
-     * {Array(<OpenLayers.Feature.Vector>)}
-     */
-    read: function(doc) {
-        if (typeof doc == "string") { 
-            doc = OpenLayers.Format.XML.prototype.read.apply(this, [doc]);
-        }
-
-        /* Try RSS items first, then Atom entries */
-        var itemlist = null;
-        itemlist = this.getElementsByTagNameNS(doc, '*', 'item');
-        if (itemlist.length == 0) {
-            itemlist = this.getElementsByTagNameNS(doc, '*', 'entry');
-        }
-        
-        var numItems = itemlist.length;
-        var features = new Array(numItems);
-        for(var i=0; i<numItems; i++) {
-            features[i] = this.createFeatureFromItem(itemlist[i]);
-        }
-        return features;
-    },
-    
-
-    /**
-     * APIMethod: write
-     * Accept Feature Collection, and return a string. 
-     * 
-     * Parameters: 
-     * features - {Array(<OpenLayers.Feature.Vector>)} List of features to serialize into a string.
-     */
-    write: function(features) {
-        var georss;
-        if(OpenLayers.Util.isArray(features)) {
-            georss = this.createElementNS(this.rssns, "rss");
-            for(var i=0, len=features.length; i<len; i++) {
-                georss.appendChild(this.createFeatureXML(features[i]));
-            }
-        } else {
-            georss = this.createFeatureXML(features);
-        }
-        return OpenLayers.Format.XML.prototype.write.apply(this, [georss]);
-    },
-
-    /**
-     * Method: createFeatureXML
-     * Accept an <OpenLayers.Feature.Vector>, and build a geometry for it.
-     * 
-     * Parameters:
-     * feature - {<OpenLayers.Feature.Vector>} 
-     *
-     * Returns:
-     * {DOMElement}
-     */
-    createFeatureXML: function(feature) {
-        var geometryNode = this.buildGeometryNode(feature.geometry);
-        var featureNode = this.createElementNS(this.rssns, "item");
-        var titleNode = this.createElementNS(this.rssns, "title");
-        titleNode.appendChild(this.createTextNode(feature.attributes.title ? feature.attributes.title : ""));
-        var descNode = this.createElementNS(this.rssns, "description");
-        descNode.appendChild(this.createTextNode(feature.attributes.description ? feature.attributes.description : ""));
-        featureNode.appendChild(titleNode);
-        featureNode.appendChild(descNode);
-        if (feature.attributes.link) {
-            var linkNode = this.createElementNS(this.rssns, "link");
-            linkNode.appendChild(this.createTextNode(feature.attributes.link));
-            featureNode.appendChild(linkNode);
-        }    
-        for(var attr in feature.attributes) {
-            if (attr == "link" || attr == "title" || attr == "description") { continue; } 
-            var attrText = this.createTextNode(feature.attributes[attr]); 
-            var nodename = attr;
-            if (attr.search(":") != -1) {
-                nodename = attr.split(":")[1];
-            }    
-            var attrContainer = this.createElementNS(this.featureNS, "feature:"+nodename);
-            attrContainer.appendChild(attrText);
-            featureNode.appendChild(attrContainer);
-        }    
-        featureNode.appendChild(geometryNode);
-        return featureNode;
-    },    
-    
-    /** 
-     * Method: buildGeometryNode
-     * builds a GeoRSS node with a given geometry
-     * 
-     * Parameters:
-     * geometry - {<OpenLayers.Geometry>}
-     *
-     * Returns:
-     * {DOMElement} A gml node.
-     */
-    buildGeometryNode: function(geometry) {
-        if (this.internalProjection && this.externalProjection) {
-            geometry = geometry.clone();
-            geometry.transform(this.internalProjection, 
-                               this.externalProjection);
-        }
-        var node;
-        // match Polygon
-        if (geometry.CLASS_NAME == "OpenLayers.Geometry.Polygon") {
-            node = this.createElementNS(this.georssns, 'georss:polygon');
-            
-            node.appendChild(this.buildCoordinatesNode(geometry.components[0]));
-        }
-        // match LineString
-        else if (geometry.CLASS_NAME == "OpenLayers.Geometry.LineString") {
-            node = this.createElementNS(this.georssns, 'georss:line');
-            
-            node.appendChild(this.buildCoordinatesNode(geometry));
-        }
-        // match Point
-        else if (geometry.CLASS_NAME == "OpenLayers.Geometry.Point") {
-            node = this.createElementNS(this.georssns, 'georss:point');
-            node.appendChild(this.buildCoordinatesNode(geometry));
-        } else {
-            throw "Couldn't parse " + geometry.CLASS_NAME;
-        }  
-        return node;         
-    },
-    
-    /** 
-     * Method: buildCoordinatesNode
-     * 
-     * Parameters:
-     * geometry - {<OpenLayers.Geometry>}
-     */
-    buildCoordinatesNode: function(geometry) {
-        var points = null;
-        
-        if (geometry.components) {
-            points = geometry.components;
-        }
-
-        var path;
-        if (points) {
-            var numPoints = points.length;
-            var parts = new Array(numPoints);
-            for (var i = 0; i < numPoints; i++) {
-                parts[i] = points[i].y + " " + points[i].x;
-            }
-            path = parts.join(" ");
-        } else {
-            path = geometry.y + " " + geometry.x;
-        }
-        return this.createTextNode(path);
-    },
-
-    CLASS_NAME: "OpenLayers.Format.GeoRSS" 
-});     
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/JSON.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/JSON.js
deleted file mode 100644
index 5b25e6af..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/JSON.js
+++ /dev/null
@@ -1,398 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * Note:
- * This work draws heavily from the public domain JSON serializer/deserializer
- *     at http://www.json.org/json.js. Rewritten so that it doesn't modify
- *     basic data prototypes.
- */
-
-/**
- * @requires OpenLayers/Format.js
- */
-
-/**
- * Class: OpenLayers.Format.JSON
- * A parser to read/write JSON safely.  Create a new instance with the
- *     <OpenLayers.Format.JSON> constructor.
- *
- * Inherits from:
- *  - <OpenLayers.Format>
- */
-OpenLayers.Format.JSON = OpenLayers.Class(OpenLayers.Format, {
-    
-    /**
-     * APIProperty: indent
-     * {String} For "pretty" printing, the indent string will be used once for
-     *     each indentation level.
-     */
-    indent: "    ",
-    
-    /**
-     * APIProperty: space
-     * {String} For "pretty" printing, the space string will be used after
-     *     the ":" separating a name/value pair.
-     */
-    space: " ",
-    
-    /**
-     * APIProperty: newline
-     * {String} For "pretty" printing, the newline string will be used at the
-     *     end of each name/value pair or array item.
-     */
-    newline: "\n",
-    
-    /**
-     * Property: level
-     * {Integer} For "pretty" printing, this is incremented/decremented during
-     *     serialization.
-     */
-    level: 0,
-
-    /**
-     * Property: pretty
-     * {Boolean} Serialize with extra whitespace for structure.  This is set
-     *     by the <write> method.
-     */
-    pretty: false,
-
-    /**
-     * Property: nativeJSON
-     * {Boolean} Does the browser support native json?
-     */
-    nativeJSON: (function() {
-        return !!(window.JSON && typeof JSON.parse == "function" && typeof JSON.stringify == "function");
-    })(),
-
-    /**
-     * Constructor: OpenLayers.Format.JSON
-     * Create a new parser for JSON.
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be set on
-     *     this instance.
-     */
-
-    /**
-     * APIMethod: read
-     * Deserialize a json string.
-     *
-     * Parameters:
-     * json - {String} A JSON string
-     * filter - {Function} A function which will be called for every key and
-     *     value at every level of the final result. Each value will be
-     *     replaced by the result of the filter function. This can be used to
-     *     reform generic objects into instances of classes, or to transform
-     *     date strings into Date objects.
-     *     
-     * Returns:
-     * {Object} An object, array, string, or number .
-     */
-    read: function(json, filter) {
-        var object;
-        if (this.nativeJSON) {
-            object = JSON.parse(json, filter);
-        } else try {
-            /**
-             * Parsing happens in three stages. In the first stage, we run the
-             *     text against a regular expression which looks for non-JSON
-             *     characters. We are especially concerned with '()' and 'new'
-             *     because they can cause invocation, and '=' because it can
-             *     cause mutation. But just to be safe, we will reject all
-             *     unexpected characters.
-             */
-            if (/^[\],:{}\s]*$/.test(json.replace(/\\["\\\/bfnrtu]/g, '@').
-                                replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']').
-                                replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
-
-                /**
-                 * In the second stage we use the eval function to compile the
-                 *     text into a JavaScript structure. The '{' operator is
-                 *     subject to a syntactic ambiguity in JavaScript - it can
-                 *     begin a block or an object literal. We wrap the text in
-                 *     parens to eliminate the ambiguity.
-                 */
-                object = eval('(' + json + ')');
-
-                /**
-                 * In the optional third stage, we recursively walk the new
-                 *     structure, passing each name/value pair to a filter
-                 *     function for possible transformation.
-                 */
-                if(typeof filter === 'function') {
-                    function walk(k, v) {
-                        if(v && typeof v === 'object') {
-                            for(var i in v) {
-                                if(v.hasOwnProperty(i)) {
-                                    v[i] = walk(i, v[i]);
-                                }
-                            }
-                        }
-                        return filter(k, v);
-                    }
-                    object = walk('', object);
-                }
-            }
-        } catch(e) {
-            // Fall through if the regexp test fails.
-        }
-
-        if(this.keepData) {
-            this.data = object;
-        }
-
-        return object;
-    },
-
-    /**
-     * APIMethod: write
-     * Serialize an object into a JSON string.
-     *
-     * Parameters:
-     * value - {String} The object, array, string, number, boolean or date
-     *     to be serialized.
-     * pretty - {Boolean} Structure the output with newlines and indentation.
-     *     Default is false.
-     *
-     * Returns:
-     * {String} The JSON string representation of the input value.
-     */
-    write: function(value, pretty) {
-        this.pretty = !!pretty;
-        var json = null;
-        var type = typeof value;
-        if(this.serialize[type]) {
-            try {
-                json = (!this.pretty && this.nativeJSON) ?
-                    JSON.stringify(value) :
-                    this.serialize[type].apply(this, [value]);
-            } catch(err) {
-                OpenLayers.Console.error("Trouble serializing: " + err);
-            }
-        }
-        return json;
-    },
-    
-    /**
-     * Method: writeIndent
-     * Output an indentation string depending on the indentation level.
-     *
-     * Returns:
-     * {String} An appropriate indentation string.
-     */
-    writeIndent: function() {
-        var pieces = [];
-        if(this.pretty) {
-            for(var i=0; i<this.level; ++i) {
-                pieces.push(this.indent);
-            }
-        }
-        return pieces.join('');
-    },
-    
-    /**
-     * Method: writeNewline
-     * Output a string representing a newline if in pretty printing mode.
-     *
-     * Returns:
-     * {String} A string representing a new line.
-     */
-    writeNewline: function() {
-        return (this.pretty) ? this.newline : '';
-    },
-    
-    /**
-     * Method: writeSpace
-     * Output a string representing a space if in pretty printing mode.
-     *
-     * Returns:
-     * {String} A space.
-     */
-    writeSpace: function() {
-        return (this.pretty) ? this.space : '';
-    },
-
-    /**
-     * Property: serialize
-     * Object with properties corresponding to the serializable data types.
-     *     Property values are functions that do the actual serializing.
-     */
-    serialize: {
-        /**
-         * Method: serialize.object
-         * Transform an object into a JSON string.
-         *
-         * Parameters:
-         * object - {Object} The object to be serialized.
-         * 
-         * Returns:
-         * {String} A JSON string representing the object.
-         */
-        'object': function(object) {
-            // three special objects that we want to treat differently
-            if(object == null) {
-                return "null";
-            }
-            if(object.constructor == Date) {
-                return this.serialize.date.apply(this, [object]);
-            }
-            if(object.constructor == Array) {
-                return this.serialize.array.apply(this, [object]);
-            }
-            var pieces = ['{'];
-            this.level += 1;
-            var key, keyJSON, valueJSON;
-            
-            var addComma = false;
-            for(key in object) {
-                if(object.hasOwnProperty(key)) {
-                    // recursive calls need to allow for sub-classing
-                    keyJSON = OpenLayers.Format.JSON.prototype.write.apply(this,
-                                                    [key, this.pretty]);
-                    valueJSON = OpenLayers.Format.JSON.prototype.write.apply(this,
-                                                    [object[key], this.pretty]);
-                    if(keyJSON != null && valueJSON != null) {
-                        if(addComma) {
-                            pieces.push(',');
-                        }
-                        pieces.push(this.writeNewline(), this.writeIndent(),
-                                    keyJSON, ':', this.writeSpace(), valueJSON);
-                        addComma = true;
-                    }
-                }
-            }
-            
-            this.level -= 1;
-            pieces.push(this.writeNewline(), this.writeIndent(), '}');
-            return pieces.join('');
-        },
-        
-        /**
-         * Method: serialize.array
-         * Transform an array into a JSON string.
-         *
-         * Parameters:
-         * array - {Array} The array to be serialized
-         * 
-         * Returns:
-         * {String} A JSON string representing the array.
-         */
-        'array': function(array) {
-            var json;
-            var pieces = ['['];
-            this.level += 1;
-    
-            for(var i=0, len=array.length; i<len; ++i) {
-                // recursive calls need to allow for sub-classing
-                json = OpenLayers.Format.JSON.prototype.write.apply(this,
-                                                    [array[i], this.pretty]);
-                if(json != null) {
-                    if(i > 0) {
-                        pieces.push(',');
-                    }
-                    pieces.push(this.writeNewline(), this.writeIndent(), json);
-                }
-            }
-
-            this.level -= 1;    
-            pieces.push(this.writeNewline(), this.writeIndent(), ']');
-            return pieces.join('');
-        },
-        
-        /**
-         * Method: serialize.string
-         * Transform a string into a JSON string.
-         *
-         * Parameters:
-         * string - {String} The string to be serialized
-         * 
-         * Returns:
-         * {String} A JSON string representing the string.
-         */
-        'string': function(string) {
-            // If the string contains no control characters, no quote characters, and no
-            // backslash characters, then we can simply slap some quotes around it.
-            // Otherwise we must also replace the offending characters with safe
-            // sequences.    
-            var m = {
-                '\b': '\\b',
-                '\t': '\\t',
-                '\n': '\\n',
-                '\f': '\\f',
-                '\r': '\\r',
-                '"' : '\\"',
-                '\\': '\\\\'
-            };
-            if(/["\\\x00-\x1f]/.test(string)) {
-                return '"' + string.replace(/([\x00-\x1f\\"])/g, function(a, b) {
-                    var c = m[b];
-                    if(c) {
-                        return c;
-                    }
-                    c = b.charCodeAt();
-                    return '\\u00' +
-                        Math.floor(c / 16).toString(16) +
-                        (c % 16).toString(16);
-                }) + '"';
-            }
-            return '"' + string + '"';
-        },
-
-        /**
-         * Method: serialize.number
-         * Transform a number into a JSON string.
-         *
-         * Parameters:
-         * number - {Number} The number to be serialized.
-         *
-         * Returns:
-         * {String} A JSON string representing the number.
-         */
-        'number': function(number) {
-            return isFinite(number) ? String(number) : "null";
-        },
-        
-        /**
-         * Method: serialize.boolean
-         * Transform a boolean into a JSON string.
-         *
-         * Parameters:
-         * bool - {Boolean} The boolean to be serialized.
-         * 
-         * Returns:
-         * {String} A JSON string representing the boolean.
-         */
-        'boolean': function(bool) {
-            return String(bool);
-        },
-        
-        /**
-         * Method: serialize.object
-         * Transform a date into a JSON string.
-         *
-         * Parameters:
-         * date - {Date} The date to be serialized.
-         * 
-         * Returns:
-         * {String} A JSON string representing the date.
-         */
-        'date': function(date) {    
-            function format(number) {
-                // Format integers to have at least two digits.
-                return (number < 10) ? '0' + number : number;
-            }
-            return '"' + date.getFullYear() + '-' +
-                    format(date.getMonth() + 1) + '-' +
-                    format(date.getDate()) + 'T' +
-                    format(date.getHours()) + ':' +
-                    format(date.getMinutes()) + ':' +
-                    format(date.getSeconds()) + '"';
-        }
-    },
-
-    CLASS_NAME: "OpenLayers.Format.JSON" 
-
-});     
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/KML.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/KML.js
deleted file mode 100644
index e10bce7b..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/KML.js
+++ /dev/null
@@ -1,1517 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/BaseTypes/Date.js
- * @requires OpenLayers/Format/XML.js
- * @requires OpenLayers/Feature/Vector.js
- * @requires OpenLayers/Geometry/Point.js
- * @requires OpenLayers/Geometry/LineString.js
- * @requires OpenLayers/Geometry/Polygon.js
- * @requires OpenLayers/Geometry/Collection.js
- * @requires OpenLayers/Request/XMLHttpRequest.js
- * @requires OpenLayers/Projection.js
- */
-
-/**
- * Class: OpenLayers.Format.KML
- * Read/Write KML. Create a new instance with the <OpenLayers.Format.KML>
- *     constructor. 
- * 
- * Inherits from:
- *  - <OpenLayers.Format.XML>
- */
-OpenLayers.Format.KML = OpenLayers.Class(OpenLayers.Format.XML, {
-    
-    /**
-     * Property: namespaces
-     * {Object} Mapping of namespace aliases to namespace URIs.
-     */
-    namespaces: {
-        kml: "http://www.opengis.net/kml/2.2",
-        gx: "http://www.google.com/kml/ext/2.2"
-    },
-
-    /**
-     * APIProperty: kmlns
-     * {String} KML Namespace to use. Defaults to 2.0 namespace.
-     */
-    kmlns: "http://earth.google.com/kml/2.0",
-    
-    /** 
-     * APIProperty: placemarksDesc
-     * {String} Name of the placemarks.  Default is "No description available".
-     */
-    placemarksDesc: "No description available",
-    
-    /** 
-     * APIProperty: foldersName
-     * {String} Name of the folders.  Default is "OpenLayers export".
-     *          If set to null, no name element will be created.
-     */
-    foldersName: "OpenLayers export",
-    
-    /** 
-     * APIProperty: foldersDesc
-     * {String} Description of the folders. Default is "Exported on [date]."
-     *          If set to null, no description element will be created.
-     */
-    foldersDesc: "Exported on " + new Date(),
-    
-    /**
-     * APIProperty: extractAttributes
-     * {Boolean} Extract attributes from KML.  Default is true.
-     *           Extracting styleUrls requires this to be set to true
-     *           Note that currently only Data and SimpleData 
-     *           elements are handled.
-     */
-    extractAttributes: true,
-    
-    /**
-     * APIProperty: kvpAttributes
-     * {Boolean} Only used if extractAttributes is true.
-     *           If set to true, attributes will be simple
-     *           key-value pairs, compatible with other formats,
-     *           Any displayName elements will be ignored.
-     *           If set to false, attributes will be objects,
-     *           retaining any displayName elements, but not
-     *           compatible with other formats. Any CDATA in
-     *           displayName will be read in as a string value.
-     *           Default is false.
-     */
-    kvpAttributes: false,
-    
-    /**
-     * Property: extractStyles
-     * {Boolean} Extract styles from KML.  Default is false.
-     *           Extracting styleUrls also requires extractAttributes to be
-     *           set to true
-     */
-    extractStyles: false,
-    
-    /**
-     * APIProperty: extractTracks
-     * {Boolean} Extract gx:Track elements from Placemark elements.  Default
-     *     is false.  If true, features will be generated for all points in
-     *     all gx:Track elements.  Features will have a when (Date) attribute
-     *     based on when elements in the track.  If tracks include angle
-     *     elements, features will have heading, tilt, and roll attributes.
-     *     If track point coordinates have three values, features will have
-     *     an altitude attribute with the third coordinate value.
-     */
-    extractTracks: false,
-    
-    /**
-     * APIProperty: trackAttributes
-     * {Array} If <extractTracks> is true, points within gx:Track elements will 
-     *     be parsed as features with when, heading, tilt, and roll attributes.
-     *     Any additional attribute names can be provided in <trackAttributes>.
-     */
-    trackAttributes: null,
-    
-    /**
-     * Property: internalns
-     * {String} KML Namespace to use -- defaults to the namespace of the
-     *     Placemark node being parsed, but falls back to kmlns. 
-     */
-    internalns: null,
-
-    /**
-     * Property: features
-     * {Array} Array of features
-     *     
-     */
-    features: null,
-
-    /**
-     * Property: styles
-     * {Object} Storage of style objects
-     *     
-     */
-    styles: null,
-    
-    /**
-     * Property: styleBaseUrl
-     * {String}
-     */
-    styleBaseUrl: "",
-
-    /**
-     * Property: fetched
-     * {Object} Storage of KML URLs that have been fetched before
-     *     in order to prevent reloading them.
-     */
-    fetched: null,
-
-    /**
-     * APIProperty: maxDepth
-     * {Integer} Maximum depth for recursive loading external KML URLs 
-     *           Defaults to 0: do no external fetching
-     */
-    maxDepth: 0,
-
-    /**
-     * Constructor: OpenLayers.Format.KML
-     * Create a new parser for KML.
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be set on
-     *     this instance.
-     */
-    initialize: function(options) {
-        // compile regular expressions once instead of every time they are used
-        this.regExes = {
-            trimSpace: (/^\s*|\s*$/g),
-            removeSpace: (/\s*/g),
-            splitSpace: (/\s+/),
-            trimComma: (/\s*,\s*/g),
-            kmlColor: (/(\w{2})(\w{2})(\w{2})(\w{2})/),
-            kmlIconPalette: (/root:\/\/icons\/palette-(\d+)(\.\w+)/),
-            straightBracket: (/\$\[(.*?)\]/g)
-        };
-        // KML coordinates are always in longlat WGS84
-        this.externalProjection = new OpenLayers.Projection("EPSG:4326");
-
-        OpenLayers.Format.XML.prototype.initialize.apply(this, [options]);
-    },
-
-    /**
-     * APIMethod: read
-     * Read data from a string, and return a list of features. 
-     * 
-     * Parameters: 
-     * data    - {String} or {DOMElement} data to read/parse.
-     *
-     * Returns:
-     * {Array(<OpenLayers.Feature.Vector>)} List of features.
-     */
-    read: function(data) {
-        this.features = [];
-        this.styles   = {};
-        this.fetched  = {};
-
-        // Set default options 
-        var options = {
-            depth: 0,
-            styleBaseUrl: this.styleBaseUrl
-        };
-
-        return this.parseData(data, options);
-    },
-
-    /**
-     * Method: parseData
-     * Read data from a string, and return a list of features. 
-     * 
-     * Parameters: 
-     * data    - {String} or {DOMElement} data to read/parse.
-     * options - {Object} Hash of options
-     *
-     * Returns:
-     * {Array(<OpenLayers.Feature.Vector>)} List of features.
-     */
-    parseData: function(data, options) {
-        if(typeof data == "string") {
-            data = OpenLayers.Format.XML.prototype.read.apply(this, [data]);
-        }
-
-        // Loop throught the following node types in this order and
-        // process the nodes found 
-        var types = ["Link", "NetworkLink", "Style", "StyleMap", "Placemark"];
-        for(var i=0, len=types.length; i<len; ++i) {
-            var type = types[i];
-
-            var nodes = this.getElementsByTagNameNS(data, "*", type);
-
-            // skip to next type if no nodes are found
-            if(nodes.length == 0) { 
-                continue;
-            }
-
-            switch (type.toLowerCase()) {
-
-                // Fetch external links 
-                case "link":
-                case "networklink":
-                    this.parseLinks(nodes, options);
-                    break;
-
-                // parse style information
-                case "style":
-                    if (this.extractStyles) {
-                        this.parseStyles(nodes, options);
-                    }
-                    break;
-                case "stylemap":
-                    if (this.extractStyles) {
-                        this.parseStyleMaps(nodes, options);
-                    }
-                    break;
-
-                // parse features
-                case "placemark":
-                    this.parseFeatures(nodes, options);
-                    break;
-            }
-        }
-        
-        return this.features;
-    },
-
-    /**
-     * Method: parseLinks
-     * Finds URLs of linked KML documents and fetches them
-     * 
-     * Parameters: 
-     * nodes   - {Array} of {DOMElement} data to read/parse.
-     * options - {Object} Hash of options
-     * 
-     */
-    parseLinks: function(nodes, options) {
-        
-        // Fetch external links <NetworkLink> and <Link>
-        // Don't do anything if we have reached our maximum depth for recursion
-        if (options.depth >= this.maxDepth) {
-            return false;
-        }
-
-        // increase depth
-        var newOptions = OpenLayers.Util.extend({}, options);
-        newOptions.depth++;
-
-        for(var i=0, len=nodes.length; i<len; i++) {
-            var href = this.parseProperty(nodes[i], "*", "href");
-            if(href && !this.fetched[href]) {
-                this.fetched[href] = true; // prevent reloading the same urls
-                var data = this.fetchLink(href);
-                if (data) {
-                    this.parseData(data, newOptions);
-                }
-            } 
-        }
-
-    },
-
-    /**
-     * Method: fetchLink
-     * Fetches a URL and returns the result
-     * 
-     * Parameters: 
-     * href  - {String} url to be fetched
-     * 
-     */
-    fetchLink: function(href) {
-        var request = OpenLayers.Request.GET({url: href, async: false});
-        if (request) {
-            return request.responseText;
-        }
-    },
-
-    /**
-     * Method: parseStyles
-     * Parses <Style> nodes
-     * 
-     * Parameters: 
-     * nodes    - {Array} of {DOMElement} data to read/parse.
-     * options  - {Object} Hash of options
-     * 
-     */
-    parseStyles: function(nodes, options) {
-        for(var i=0, len=nodes.length; i<len; i++) {
-            var style = this.parseStyle(nodes[i]);
-            if(style) {
-                var styleName = (options.styleBaseUrl || "") + "#" + style.id;
-                
-                this.styles[styleName] = style;
-            }
-        }
-    },
-
-    /**
-     * Method: parseKmlColor
-     * Parses a kml color (in 'aabbggrr' format) and returns the corresponding 
-     * color and opacity or null if the color is invalid.
-     *
-     * Parameters: 
-     * kmlColor - {String} a kml formated color
-     *
-     * Returns:
-     * {Object}
-     */
-    parseKmlColor: function(kmlColor) {
-        var color = null;
-        if (kmlColor) {
-            var matches = kmlColor.match(this.regExes.kmlColor);
-            if (matches) {
-                color = {
-                    color: '#' + matches[4] + matches[3] + matches[2],
-                    opacity: parseInt(matches[1], 16) / 255
-                };
-            }
-        }
-        return color;
-    },
-
-    /**
-     * Method: parseStyle
-     * Parses the children of a <Style> node and builds the style hash
-     * accordingly
-     * 
-     * Parameters: 
-     * node - {DOMElement} <Style> node
-     * 
-     */
-    parseStyle: function(node) {
-        var style = {};
-        
-        var types = ["LineStyle", "PolyStyle", "IconStyle", "BalloonStyle", 
-                     "LabelStyle"];
-        var type, styleTypeNode, nodeList, geometry, parser;
-        for(var i=0, len=types.length; i<len; ++i) {
-            type = types[i];
-            styleTypeNode = this.getElementsByTagNameNS(node, "*", type)[0];
-            if(!styleTypeNode) { 
-                continue;
-            }
-
-            // only deal with first geometry of this type
-            switch (type.toLowerCase()) {
-                case "linestyle":
-                    var kmlColor = this.parseProperty(styleTypeNode, "*", "color");
-                    var color = this.parseKmlColor(kmlColor);
-                    if (color) {
-                        style["strokeColor"] = color.color;
-                        style["strokeOpacity"] = color.opacity;
-                    }
-                    
-                    var width = this.parseProperty(styleTypeNode, "*", "width");
-                    if (width) {
-                        style["strokeWidth"] = width;
-                    }
-                    break;
-
-                case "polystyle":
-                    var kmlColor = this.parseProperty(styleTypeNode, "*", "color");
-                    var color = this.parseKmlColor(kmlColor);
-                    if (color) {
-                        style["fillOpacity"] = color.opacity;
-                        style["fillColor"] = color.color;
-                    }
-                    // Check if fill is disabled
-                    var fill = this.parseProperty(styleTypeNode, "*", "fill");
-                    if (fill == "0") {
-                        style["fillColor"] = "none";
-                    }
-                    // Check if outline is disabled
-                    var outline = this.parseProperty(styleTypeNode, "*", "outline");
-                    if (outline == "0") {
-                        style["strokeWidth"] = "0";
-                    }
-                   
-                    break;
-
-                case "iconstyle":
-                    // set scale
-                    var scale = parseFloat(this.parseProperty(styleTypeNode, 
-                                                          "*", "scale") || 1);
-  
-                    // set default width and height of icon
-                    var width = 32 * scale;
-                    var height = 32 * scale;
-
-                    var iconNode = this.getElementsByTagNameNS(styleTypeNode, 
-                                               "*", 
-                                               "Icon")[0];
-                    if (iconNode) {
-                        var href = this.parseProperty(iconNode, "*", "href");
-                        if (href) {                                                   
-
-                            var w = this.parseProperty(iconNode, "*", "w");
-                            var h = this.parseProperty(iconNode, "*", "h");
-
-                            // Settings for Google specific icons that are 64x64
-                            // We set the width and height to 64 and halve the
-                            // scale to prevent icons from being too big
-                            var google = "http://maps.google.com/mapfiles/kml";
-                            if (OpenLayers.String.startsWith(
-                                                 href, google) && !w && !h) {
-                                w = 64;
-                                h = 64;
-                                scale = scale / 2;
-                            }
-                                
-                            // if only dimension is defined, make sure the
-                            // other one has the same value
-                            w = w || h;
-                            h = h || w;
-
-                            if (w) {
-                                width = parseInt(w) * scale;
-                            }
-
-                            if (h) {
-                                height = parseInt(h) * scale;
-                            }
-
-                            // support for internal icons 
-                            //    (/root://icons/palette-x.png)
-                            // x and y tell the position on the palette:
-                            // - in pixels
-                            // - starting from the left bottom
-                            // We translate that to a position in the list 
-                            // and request the appropriate icon from the 
-                            // google maps website
-                            var matches = href.match(this.regExes.kmlIconPalette);
-                            if (matches)  {
-                                var palette = matches[1];
-                                var file_extension = matches[2];
-
-                                var x = this.parseProperty(iconNode, "*", "x");
-                                var y = this.parseProperty(iconNode, "*", "y");
-
-                                var posX = x ? x/32 : 0;
-                                var posY = y ? (7 - y/32) : 7;
-
-                                var pos = posY * 8 + posX;
-                                href = "http://maps.google.com/mapfiles/kml/pal" 
-                                     + palette + "/icon" + pos + file_extension;
-                            }
-
-                            style["graphicOpacity"] = 1; // fully opaque
-                            style["externalGraphic"] = href;
-                        }
-
-                    }
-
-
-                    // hotSpots define the offset for an Icon
-                    var hotSpotNode = this.getElementsByTagNameNS(styleTypeNode, 
-                                               "*", 
-                                               "hotSpot")[0];
-                    if (hotSpotNode) {
-                        var x = parseFloat(hotSpotNode.getAttribute("x"));
-                        var y = parseFloat(hotSpotNode.getAttribute("y"));
-
-                        var xUnits = hotSpotNode.getAttribute("xunits");
-                        if (xUnits == "pixels") {
-                            style["graphicXOffset"] = -x * scale;
-                        }
-                        else if (xUnits == "insetPixels") {
-                            style["graphicXOffset"] = -width + (x * scale);
-                        }
-                        else if (xUnits == "fraction") {
-                            style["graphicXOffset"] = -width * x;
-                        }
-
-                        var yUnits = hotSpotNode.getAttribute("yunits");
-                        if (yUnits == "pixels") {
-                            style["graphicYOffset"] = -height + (y * scale) + 1;
-                        }
-                        else if (yUnits == "insetPixels") {
-                            style["graphicYOffset"] = -(y * scale) + 1;
-                        }
-                        else if (yUnits == "fraction") {
-                            style["graphicYOffset"] =  -height * (1 - y) + 1;
-                        }
-                    }
-
-                    style["graphicWidth"] = width;
-                    style["graphicHeight"] = height;
-                    break;
-
-                case "balloonstyle":
-                    var balloonStyle = OpenLayers.Util.getXmlNodeValue(
-                                            styleTypeNode);
-                    if (balloonStyle) {
-                        style["balloonStyle"] = balloonStyle.replace(
-                                       this.regExes.straightBracket, "${$1}");
-                    }
-                    break;
-                case "labelstyle":
-                    var kmlColor = this.parseProperty(styleTypeNode, "*", "color");
-                    var color = this.parseKmlColor(kmlColor);
-                    if (color) {
-                        style["fontColor"] = color.color;
-                        style["fontOpacity"] = color.opacity;
-                    }
-                    break;
-
-                default:
-            }
-        }
-
-        // Some polygons have no line color, so we use the fillColor for that
-        if (!style["strokeColor"] && style["fillColor"]) {
-            style["strokeColor"] = style["fillColor"];
-        }
-
-        var id = node.getAttribute("id");
-        if (id && style) {
-            style.id = id;
-        }
-
-        return style;
-    },
-
-    /**
-     * Method: parseStyleMaps
-     * Parses <StyleMap> nodes, but only uses the 'normal' key
-     * 
-     * Parameters: 
-     * nodes    - {Array} of {DOMElement} data to read/parse.
-     * options  - {Object} Hash of options
-     * 
-     */
-    parseStyleMaps: function(nodes, options) {
-        // Only the default or "normal" part of the StyleMap is processed now
-        // To do the select or "highlight" bit, we'd need to change lots more
-
-        for(var i=0, len=nodes.length; i<len; i++) {
-            var node = nodes[i];
-            var pairs = this.getElementsByTagNameNS(node, "*", 
-                            "Pair");
-
-            var id = node.getAttribute("id");
-            for (var j=0, jlen=pairs.length; j<jlen; j++) {
-                var pair = pairs[j];
-                // Use the shortcut in the SLD format to quickly retrieve the 
-                // value of a node. Maybe it's good to have a method in 
-                // Format.XML to do this
-                var key = this.parseProperty(pair, "*", "key");
-                var styleUrl = this.parseProperty(pair, "*", "styleUrl");
-
-                if (styleUrl && key == "normal") {
-                    this.styles[(options.styleBaseUrl || "") + "#" + id] =
-                        this.styles[(options.styleBaseUrl || "") + styleUrl];
-                }
-
-                // TODO: implement the "select" part
-                //if (styleUrl && key == "highlight") {
-                //}
-
-            }
-        }
-
-    },
-
-
-    /**
-     * Method: parseFeatures
-     * Loop through all Placemark nodes and parse them.
-     * Will create a list of features
-     * 
-     * Parameters: 
-     * nodes    - {Array} of {DOMElement} data to read/parse.
-     * options  - {Object} Hash of options
-     * 
-     */
-    parseFeatures: function(nodes, options) {
-        var features = [];
-        for(var i=0, len=nodes.length; i<len; i++) {
-            var featureNode = nodes[i];
-            var feature = this.parseFeature.apply(this,[featureNode]) ;
-            if(feature) {
-
-                // Create reference to styleUrl 
-                if (this.extractStyles && feature.attributes &&
-                    feature.attributes.styleUrl) {
-                    feature.style = this.getStyle(feature.attributes.styleUrl, options);
-                }
-
-                if (this.extractStyles) {
-                    // Make sure that <Style> nodes within a placemark are 
-                    // processed as well
-                    var inlineStyleNode = this.getElementsByTagNameNS(featureNode,
-                                                        "*",
-                                                        "Style")[0];
-                    if (inlineStyleNode) {
-                        var inlineStyle= this.parseStyle(inlineStyleNode);
-                        if (inlineStyle) {
-                            feature.style = OpenLayers.Util.extend(
-                                feature.style, inlineStyle
-                            );
-                        }
-                    }
-                }
-
-                // check if gx:Track elements should be parsed
-                if (this.extractTracks) {
-                    var tracks = this.getElementsByTagNameNS(
-                        featureNode, this.namespaces.gx, "Track"
-                    );
-                    if (tracks && tracks.length > 0) {
-                        var track = tracks[0];
-                        var container = {
-                            features: [],
-                            feature: feature
-                        };
-                        this.readNode(track, container);
-                        if (container.features.length > 0) {
-                            features.push.apply(features, container.features);
-                        }
-                    }
-                } else {
-                    // add feature to list of features
-                    features.push(feature);                    
-                }
-            } else {
-                throw "Bad Placemark: " + i;
-            }
-        }
-
-        // add new features to existing feature list
-        this.features = this.features.concat(features);
-    },
-    
-    /**
-     * Property: readers
-     * Contains public functions, grouped by namespace prefix, that will
-     *     be applied when a namespaced node is found matching the function
-     *     name.  The function will be applied in the scope of this parser
-     *     with two arguments: the node being read and a context object passed
-     *     from the parent.
-     */
-    readers: {
-        "kml": {
-            "when": function(node, container) {
-                container.whens.push(OpenLayers.Date.parse(
-                    this.getChildValue(node)
-                ));
-            },
-            "_trackPointAttribute": function(node, container) {
-                var name = node.nodeName.split(":").pop();
-                container.attributes[name].push(this.getChildValue(node));
-            }
-        },
-        "gx": {
-            "Track": function(node, container) {
-                var obj = {
-                    whens: [],
-                    points: [],
-                    angles: []
-                };
-                if (this.trackAttributes) {
-                    var name;
-                    obj.attributes = {};
-                    for (var i=0, ii=this.trackAttributes.length; i<ii; ++i) {
-                        name = this.trackAttributes[i];
-                        obj.attributes[name] = [];
-                        if (!(name in this.readers.kml)) {
-                            this.readers.kml[name] = this.readers.kml._trackPointAttribute;
-                        }
-                    }
-                }
-                this.readChildNodes(node, obj);
-                if (obj.whens.length !== obj.points.length) {
-                    throw new Error("gx:Track with unequal number of when (" +
-                                    obj.whens.length + ") and gx:coord (" +
-                                    obj.points.length + ") elements.");
-                }
-                var hasAngles = obj.angles.length > 0;
-                if (hasAngles && obj.whens.length !== obj.angles.length) {
-                    throw new Error("gx:Track with unequal number of when (" +
-                                    obj.whens.length + ") and gx:angles (" +
-                                    obj.angles.length + ") elements.");
-                }
-                var feature, point, angles;
-                for (var i=0, ii=obj.whens.length; i<ii; ++i) {
-                    feature = container.feature.clone();
-                    feature.fid = container.feature.fid || container.feature.id;
-                    point = obj.points[i];
-                    feature.geometry = point;
-                    if ("z" in point) {
-                        feature.attributes.altitude = point.z;
-                    }
-                    if (this.internalProjection && this.externalProjection) {
-                        feature.geometry.transform(
-                            this.externalProjection, this.internalProjection
-                        ); 
-                    }
-                    if (this.trackAttributes) {
-                        for (var j=0, jj=this.trackAttributes.length; j<jj; ++j) {
-                            var name = this.trackAttributes[j];
-                            feature.attributes[name] = obj.attributes[name][i];
-                        }
-                    }
-                    feature.attributes.when = obj.whens[i];
-                    feature.attributes.trackId = container.feature.id;
-                    if (hasAngles) {
-                        angles = obj.angles[i];
-                        feature.attributes.heading = parseFloat(angles[0]);
-                        feature.attributes.tilt = parseFloat(angles[1]);
-                        feature.attributes.roll = parseFloat(angles[2]);
-                    }
-                    container.features.push(feature);
-                }
-            },
-            "coord": function(node, container) {
-                var str = this.getChildValue(node);
-                var coords = str.replace(this.regExes.trimSpace, "").split(/\s+/);
-                var point = new OpenLayers.Geometry.Point(coords[0], coords[1]);
-                if (coords.length > 2) {
-                    point.z = parseFloat(coords[2]);
-                }
-                container.points.push(point);
-            },
-            "angles": function(node, container) {
-                var str = this.getChildValue(node);
-                var parts = str.replace(this.regExes.trimSpace, "").split(/\s+/);
-                container.angles.push(parts);
-            }
-        }
-    },
-    
-    /**
-     * Method: parseFeature
-     * This function is the core of the KML parsing code in OpenLayers.
-     *     It creates the geometries that are then attached to the returned
-     *     feature, and calls parseAttributes() to get attribute data out.
-     *
-     * Parameters:
-     * node - {DOMElement}
-     *
-     * Returns:
-     * {<OpenLayers.Feature.Vector>} A vector feature.
-     */
-    parseFeature: function(node) {
-        // only accept one geometry per feature - look for highest "order"
-        var order = ["MultiGeometry", "Polygon", "LineString", "Point"];
-        var type, nodeList, geometry, parser;
-        for(var i=0, len=order.length; i<len; ++i) {
-            type = order[i];
-            this.internalns = node.namespaceURI ? 
-                    node.namespaceURI : this.kmlns;
-            nodeList = this.getElementsByTagNameNS(node, 
-                                                   this.internalns, type);
-            if(nodeList.length > 0) {
-                // only deal with first geometry of this type
-                var parser = this.parseGeometry[type.toLowerCase()];
-                if(parser) {
-                    geometry = parser.apply(this, [nodeList[0]]);
-                    if (this.internalProjection && this.externalProjection) {
-                        geometry.transform(this.externalProjection, 
-                                           this.internalProjection); 
-                    }                       
-                } else {
-                    throw new TypeError("Unsupported geometry type: " + type);
-                }
-                // stop looking for different geometry types
-                break;
-            }
-        }
-
-        // construct feature (optionally with attributes)
-        var attributes;
-        if(this.extractAttributes) {
-            attributes = this.parseAttributes(node);
-        }
-        var feature = new OpenLayers.Feature.Vector(geometry, attributes);
-
-        var fid = node.getAttribute("id") || node.getAttribute("name");
-        if(fid != null) {
-            feature.fid = fid;
-        }
-
-        return feature;
-    },        
-    
-    /**
-     * Method: getStyle
-     * Retrieves a style from a style hash using styleUrl as the key
-     * If the styleUrl doesn't exist yet, we try to fetch it 
-     * Internet
-     * 
-     * Parameters: 
-     * styleUrl  - {String} URL of style
-     * options   - {Object} Hash of options 
-     *
-     * Returns:
-     * {Object}  - (reference to) Style hash
-     */
-    getStyle: function(styleUrl, options) {
-
-        var styleBaseUrl = OpenLayers.Util.removeTail(styleUrl);
-
-        var newOptions = OpenLayers.Util.extend({}, options);
-        newOptions.depth++;
-        newOptions.styleBaseUrl = styleBaseUrl;
-
-        // Fetch remote Style URLs (if not fetched before) 
-        if (!this.styles[styleUrl] 
-                && !OpenLayers.String.startsWith(styleUrl, "#") 
-                && newOptions.depth <= this.maxDepth
-                && !this.fetched[styleBaseUrl] ) {
-
-            var data = this.fetchLink(styleBaseUrl);
-            if (data) {
-                this.parseData(data, newOptions);
-            }
-
-        }
-
-        // return requested style
-        var style = OpenLayers.Util.extend({}, this.styles[styleUrl]);
-        return style;
-    },
-    
-    /**
-     * Property: parseGeometry
-     * Properties of this object are the functions that parse geometries based
-     *     on their type.
-     */
-    parseGeometry: {
-        
-        /**
-         * Method: parseGeometry.point
-         * Given a KML node representing a point geometry, create an OpenLayers
-         *     point geometry.
-         *
-         * Parameters:
-         * node - {DOMElement} A KML Point node.
-         *
-         * Returns:
-         * {<OpenLayers.Geometry.Point>} A point geometry.
-         */
-        point: function(node) {
-            var nodeList = this.getElementsByTagNameNS(node, this.internalns,
-                                                       "coordinates");
-            var coords = [];
-            if(nodeList.length > 0) {
-                var coordString = nodeList[0].firstChild.nodeValue;
-                coordString = coordString.replace(this.regExes.removeSpace, "");
-                coords = coordString.split(",");
-            }
-
-            var point = null;
-            if(coords.length > 1) {
-                // preserve third dimension
-                if(coords.length == 2) {
-                    coords[2] = null;
-                }
-                point = new OpenLayers.Geometry.Point(coords[0], coords[1],
-                                                      coords[2]);
-            } else {
-                throw "Bad coordinate string: " + coordString;
-            }
-            return point;
-        },
-        
-        /**
-         * Method: parseGeometry.linestring
-         * Given a KML node representing a linestring geometry, create an
-         *     OpenLayers linestring geometry.
-         *
-         * Parameters:
-         * node - {DOMElement} A KML LineString node.
-         *
-         * Returns:
-         * {<OpenLayers.Geometry.LineString>} A linestring geometry.
-         */
-        linestring: function(node, ring) {
-            var nodeList = this.getElementsByTagNameNS(node, this.internalns,
-                                                       "coordinates");
-            var line = null;
-            if(nodeList.length > 0) {
-                var coordString = this.getChildValue(nodeList[0]);
-
-                coordString = coordString.replace(this.regExes.trimSpace,
-                                                  "");
-                coordString = coordString.replace(this.regExes.trimComma,
-                                                  ",");
-                var pointList = coordString.split(this.regExes.splitSpace);
-                var numPoints = pointList.length;
-                var points = new Array(numPoints);
-                var coords, numCoords;
-                for(var i=0; i<numPoints; ++i) {
-                    coords = pointList[i].split(",");
-                    numCoords = coords.length;
-                    if(numCoords > 1) {
-                        if(coords.length == 2) {
-                            coords[2] = null;
-                        }
-                        points[i] = new OpenLayers.Geometry.Point(coords[0],
-                                                                  coords[1],
-                                                                  coords[2]);
-                    } else {
-                        throw "Bad LineString point coordinates: " +
-                              pointList[i];
-                    }
-                }
-                if(numPoints) {
-                    if(ring) {
-                        line = new OpenLayers.Geometry.LinearRing(points);
-                    } else {
-                        line = new OpenLayers.Geometry.LineString(points);
-                    }
-                } else {
-                    throw "Bad LineString coordinates: " + coordString;
-                }
-            }
-
-            return line;
-        },
-        
-        /**
-         * Method: parseGeometry.polygon
-         * Given a KML node representing a polygon geometry, create an
-         *     OpenLayers polygon geometry.
-         *
-         * Parameters:
-         * node - {DOMElement} A KML Polygon node.
-         *
-         * Returns:
-         * {<OpenLayers.Geometry.Polygon>} A polygon geometry.
-         */
-        polygon: function(node) {
-            var nodeList = this.getElementsByTagNameNS(node, this.internalns,
-                                                       "LinearRing");
-            var numRings = nodeList.length;
-            var components = new Array(numRings);
-            if(numRings > 0) {
-                // this assumes exterior ring first, inner rings after
-                var ring;
-                for(var i=0, len=nodeList.length; i<len; ++i) {
-                    ring = this.parseGeometry.linestring.apply(this,
-                                                        [nodeList[i], true]);
-                    if(ring) {
-                        components[i] = ring;
-                    } else {
-                        throw "Bad LinearRing geometry: " + i;
-                    }
-                }
-            }
-            return new OpenLayers.Geometry.Polygon(components);
-        },
-        
-        /**
-         * Method: parseGeometry.multigeometry
-         * Given a KML node representing a multigeometry, create an
-         *     OpenLayers geometry collection.
-         *
-         * Parameters:
-         * node - {DOMElement} A KML MultiGeometry node.
-         *
-         * Returns:
-         * {<OpenLayers.Geometry.Collection>} A geometry collection.
-         */
-        multigeometry: function(node) {
-            var child, parser;
-            var parts = [];
-            var children = node.childNodes;
-            for(var i=0, len=children.length; i<len; ++i ) {
-                child = children[i];
-                if(child.nodeType == 1) {
-                    var type = (child.prefix) ?
-                            child.nodeName.split(":")[1] :
-                            child.nodeName;
-                    var parser = this.parseGeometry[type.toLowerCase()];
-                    if(parser) {
-                        parts.push(parser.apply(this, [child]));
-                    }
-                }
-            }
-            return new OpenLayers.Geometry.Collection(parts);
-        }
-        
-    },
-
-    /**
-     * Method: parseAttributes
-     *
-     * Parameters:
-     * node - {DOMElement}
-     *
-     * Returns:
-     * {Object} An attributes object.
-     */
-    parseAttributes: function(node) {
-        var attributes = {};
-       
-        // Extended Data is parsed first.
-        var edNodes = node.getElementsByTagName("ExtendedData");
-        if (edNodes.length) {
-            attributes = this.parseExtendedData(edNodes[0]);
-        }
-        
-        // assume attribute nodes are type 1 children with a type 3 or 4 child
-        var child, grandchildren, grandchild;
-        var children = node.childNodes;
-
-        for(var i=0, len=children.length; i<len; ++i) {
-            child = children[i];
-            if(child.nodeType == 1) {
-                grandchildren = child.childNodes;
-                if(grandchildren.length >= 1 && grandchildren.length <= 3) {
-                    var grandchild;
-                    switch (grandchildren.length) {
-                        case 1:
-                            grandchild = grandchildren[0];
-                            break;
-                        case 2:
-                            var c1 = grandchildren[0];
-                            var c2 = grandchildren[1];
-                            grandchild = (c1.nodeType == 3 || c1.nodeType == 4) ?
-                                c1 : c2;
-                            break;
-                        case 3:
-                        default:
-                            grandchild = grandchildren[1];
-                            break;
-                    }
-                    if(grandchild.nodeType == 3 || grandchild.nodeType == 4) {
-                        var name = (child.prefix) ?
-                                child.nodeName.split(":")[1] :
-                                child.nodeName;
-                        var value = OpenLayers.Util.getXmlNodeValue(grandchild);
-                        if (value) {
-                            value = value.replace(this.regExes.trimSpace, "");
-                            attributes[name] = value;
-                        }
-                    }
-                } 
-            }
-        }
-        return attributes;
-    },
-
-    /**
-     * Method: parseExtendedData
-     * Parse ExtendedData from KML. Limited support for schemas/datatypes.
-     *     See http://code.google.com/apis/kml/documentation/kmlreference.html#extendeddata
-     *     for more information on extendeddata.
-     */
-    parseExtendedData: function(node) {
-        var attributes = {};
-        var i, len, data, key;
-        var dataNodes = node.getElementsByTagName("Data");
-        for (i = 0, len = dataNodes.length; i < len; i++) {
-            data = dataNodes[i];
-            key = data.getAttribute("name");
-            var ed = {};
-            var valueNode = data.getElementsByTagName("value");
-            if (valueNode.length) {
-                ed['value'] = this.getChildValue(valueNode[0]);
-            }
-            if (this.kvpAttributes) {
-                attributes[key] = ed['value'];
-            } else {
-                var nameNode = data.getElementsByTagName("displayName");
-                if (nameNode.length) {
-                    ed['displayName'] = this.getChildValue(nameNode[0]);
-                }
-                attributes[key] = ed;
-            } 
-        }
-        var simpleDataNodes = node.getElementsByTagName("SimpleData");
-        for (i = 0, len = simpleDataNodes.length; i < len; i++) {
-            var ed = {};
-            data = simpleDataNodes[i];
-            key = data.getAttribute("name");
-            ed['value'] = this.getChildValue(data);
-            if (this.kvpAttributes) {
-                attributes[key] = ed['value'];
-            } else {
-                ed['displayName'] = key;
-                attributes[key] = ed;
-            }
-        }
-        
-        return attributes;    
-    },
-    
-    /**
-     * Method: parseProperty
-     * Convenience method to find a node and return its value
-     *
-     * Parameters:
-     * xmlNode    - {<DOMElement>}
-     * namespace  - {String} namespace of the node to find
-     * tagName    - {String} name of the property to parse
-     * 
-     * Returns:
-     * {String} The value for the requested property (defaults to null)
-     */    
-    parseProperty: function(xmlNode, namespace, tagName) {
-        var value;
-        var nodeList = this.getElementsByTagNameNS(xmlNode, namespace, tagName);
-        try {
-            value = OpenLayers.Util.getXmlNodeValue(nodeList[0]);
-        } catch(e) {
-            value = null;
-        }
-     
-        return value;
-    },                                                              
-
-    /**
-     * APIMethod: write
-     * Accept Feature Collection, and return a string. 
-     * 
-     * Parameters:
-     * features - {Array(<OpenLayers.Feature.Vector>)} An array of features.
-     *
-     * Returns:
-     * {String} A KML string.
-     */
-    write: function(features) {
-        if(!(OpenLayers.Util.isArray(features))) {
-            features = [features];
-        }
-        var kml = this.createElementNS(this.kmlns, "kml");
-        var folder = this.createFolderXML();
-        for(var i=0, len=features.length; i<len; ++i) {
-            folder.appendChild(this.createPlacemarkXML(features[i]));
-        }
-        kml.appendChild(folder);
-        return OpenLayers.Format.XML.prototype.write.apply(this, [kml]);
-    },
-
-    /**
-     * Method: createFolderXML
-     * Creates and returns a KML folder node
-     * 
-     * Returns:
-     * {DOMElement}
-     */
-    createFolderXML: function() {
-        // Folder
-        var folder = this.createElementNS(this.kmlns, "Folder");
-
-        // Folder name
-        if (this.foldersName) {
-            var folderName = this.createElementNS(this.kmlns, "name");
-            var folderNameText = this.createTextNode(this.foldersName); 
-            folderName.appendChild(folderNameText);
-            folder.appendChild(folderName);
-        }
-
-        // Folder description
-        if (this.foldersDesc) {
-            var folderDesc = this.createElementNS(this.kmlns, "description");        
-            var folderDescText = this.createTextNode(this.foldersDesc); 
-            folderDesc.appendChild(folderDescText);
-            folder.appendChild(folderDesc);
-        }
-
-        return folder;
-    },
-
-    /**
-     * Method: createPlacemarkXML
-     * Creates and returns a KML placemark node representing the given feature. 
-     * 
-     * Parameters:
-     * feature - {<OpenLayers.Feature.Vector>}
-     * 
-     * Returns:
-     * {DOMElement}
-     */
-    createPlacemarkXML: function(feature) {        
-        // Placemark name
-        var placemarkName = this.createElementNS(this.kmlns, "name");
-        var label = (feature.style && feature.style.label) ? feature.style.label : feature.id;
-        var name = feature.attributes.name || label;
-        placemarkName.appendChild(this.createTextNode(name));
-
-        // Placemark description
-        var placemarkDesc = this.createElementNS(this.kmlns, "description");
-        var desc = feature.attributes.description || this.placemarksDesc;
-        placemarkDesc.appendChild(this.createTextNode(desc));
-        
-        // Placemark
-        var placemarkNode = this.createElementNS(this.kmlns, "Placemark");
-        if(feature.fid != null) {
-            placemarkNode.setAttribute("id", feature.fid);
-        }
-        placemarkNode.appendChild(placemarkName);
-        placemarkNode.appendChild(placemarkDesc);
-
-        // Geometry node (Point, LineString, etc. nodes)
-        var geometryNode = this.buildGeometryNode(feature.geometry);
-        placemarkNode.appendChild(geometryNode);        
-        
-        // output attributes as extendedData
-        if (feature.attributes) {
-            var edNode = this.buildExtendedData(feature.attributes);
-            if (edNode) {
-                placemarkNode.appendChild(edNode);
-            }
-        }
-        
-        return placemarkNode;
-    },    
-
-    /**
-     * Method: buildGeometryNode
-     * Builds and returns a KML geometry node with the given geometry.
-     * 
-     * Parameters:
-     * geometry - {<OpenLayers.Geometry>}
-     * 
-     * Returns:
-     * {DOMElement}
-     */
-    buildGeometryNode: function(geometry) {
-        var className = geometry.CLASS_NAME;
-        var type = className.substring(className.lastIndexOf(".") + 1);
-        var builder = this.buildGeometry[type.toLowerCase()];
-        var node = null;
-        if(builder) {
-            node = builder.apply(this, [geometry]);
-        }
-        return node;
-    },
-
-    /**
-     * Property: buildGeometry
-     * Object containing methods to do the actual geometry node building
-     *     based on geometry type.
-     */
-    buildGeometry: {
-        // TBD: Anybody care about namespace aliases here (these nodes have
-        //    no prefixes)?
-
-        /**
-         * Method: buildGeometry.point
-         * Given an OpenLayers point geometry, create a KML point.
-         *
-         * Parameters:
-         * geometry - {<OpenLayers.Geometry.Point>} A point geometry.
-         *
-         * Returns:
-         * {DOMElement} A KML point node.
-         */
-        point: function(geometry) {
-            var kml = this.createElementNS(this.kmlns, "Point");
-            kml.appendChild(this.buildCoordinatesNode(geometry));
-            return kml;
-        },
-        
-        /**
-         * Method: buildGeometry.multipoint
-         * Given an OpenLayers multipoint geometry, create a KML
-         *     GeometryCollection.
-         *
-         * Parameters:
-         * geometry - {<OpenLayers.Geometry.Point>} A multipoint geometry.
-         *
-         * Returns:
-         * {DOMElement} A KML GeometryCollection node.
-         */
-        multipoint: function(geometry) {
-            return this.buildGeometry.collection.apply(this, [geometry]);
-        },
-
-        /**
-         * Method: buildGeometry.linestring
-         * Given an OpenLayers linestring geometry, create a KML linestring.
-         *
-         * Parameters:
-         * geometry - {<OpenLayers.Geometry.LineString>} A linestring geometry.
-         *
-         * Returns:
-         * {DOMElement} A KML linestring node.
-         */
-        linestring: function(geometry) {
-            var kml = this.createElementNS(this.kmlns, "LineString");
-            kml.appendChild(this.buildCoordinatesNode(geometry));
-            return kml;
-        },
-        
-        /**
-         * Method: buildGeometry.multilinestring
-         * Given an OpenLayers multilinestring geometry, create a KML
-         *     GeometryCollection.
-         *
-         * Parameters:
-         * geometry - {<OpenLayers.Geometry.Point>} A multilinestring geometry.
-         *
-         * Returns:
-         * {DOMElement} A KML GeometryCollection node.
-         */
-        multilinestring: function(geometry) {
-            return this.buildGeometry.collection.apply(this, [geometry]);
-        },
-
-        /**
-         * Method: buildGeometry.linearring
-         * Given an OpenLayers linearring geometry, create a KML linearring.
-         *
-         * Parameters:
-         * geometry - {<OpenLayers.Geometry.LinearRing>} A linearring geometry.
-         *
-         * Returns:
-         * {DOMElement} A KML linearring node.
-         */
-        linearring: function(geometry) {
-            var kml = this.createElementNS(this.kmlns, "LinearRing");
-            kml.appendChild(this.buildCoordinatesNode(geometry));
-            return kml;
-        },
-        
-        /**
-         * Method: buildGeometry.polygon
-         * Given an OpenLayers polygon geometry, create a KML polygon.
-         *
-         * Parameters:
-         * geometry - {<OpenLayers.Geometry.Polygon>} A polygon geometry.
-         *
-         * Returns:
-         * {DOMElement} A KML polygon node.
-         */
-        polygon: function(geometry) {
-            var kml = this.createElementNS(this.kmlns, "Polygon");
-            var rings = geometry.components;
-            var ringMember, ringGeom, type;
-            for(var i=0, len=rings.length; i<len; ++i) {
-                type = (i==0) ? "outerBoundaryIs" : "innerBoundaryIs";
-                ringMember = this.createElementNS(this.kmlns, type);
-                ringGeom = this.buildGeometry.linearring.apply(this,
-                                                               [rings[i]]);
-                ringMember.appendChild(ringGeom);
-                kml.appendChild(ringMember);
-            }
-            return kml;
-        },
-        
-        /**
-         * Method: buildGeometry.multipolygon
-         * Given an OpenLayers multipolygon geometry, create a KML
-         *     GeometryCollection.
-         *
-         * Parameters:
-         * geometry - {<OpenLayers.Geometry.Point>} A multipolygon geometry.
-         *
-         * Returns:
-         * {DOMElement} A KML GeometryCollection node.
-         */
-        multipolygon: function(geometry) {
-            return this.buildGeometry.collection.apply(this, [geometry]);
-        },
-
-        /**
-         * Method: buildGeometry.collection
-         * Given an OpenLayers geometry collection, create a KML MultiGeometry.
-         *
-         * Parameters:
-         * geometry - {<OpenLayers.Geometry.Collection>} A geometry collection.
-         *
-         * Returns:
-         * {DOMElement} A KML MultiGeometry node.
-         */
-        collection: function(geometry) {
-            var kml = this.createElementNS(this.kmlns, "MultiGeometry");
-            var child;
-            for(var i=0, len=geometry.components.length; i<len; ++i) {
-                child = this.buildGeometryNode.apply(this,
-                                                     [geometry.components[i]]);
-                if(child) {
-                    kml.appendChild(child);
-                }
-            }
-            return kml;
-        }
-    },
-
-    /**
-     * Method: buildCoordinatesNode
-     * Builds and returns the KML coordinates node with the given geometry
-     * <coordinates>...</coordinates>
-     * 
-     * Parameters:
-     * geometry - {<OpenLayers.Geometry>}
-     * 
-     * Returns:
-     * {DOMElement}
-     */     
-    buildCoordinatesNode: function(geometry) {
-        var coordinatesNode = this.createElementNS(this.kmlns, "coordinates");
-        
-        var path;
-        var points = geometry.components;
-        if(points) {
-            // LineString or LinearRing
-            var point;
-            var numPoints = points.length;
-            var parts = new Array(numPoints);
-            for(var i=0; i<numPoints; ++i) {
-                point = points[i];
-                parts[i] = this.buildCoordinates(point);
-            }
-            path = parts.join(" ");
-        } else {
-            // Point
-            path = this.buildCoordinates(geometry);
-        }
-        
-        var txtNode = this.createTextNode(path);
-        coordinatesNode.appendChild(txtNode);
-        
-        return coordinatesNode;
-    },    
-    
-    /**
-     * Method: buildCoordinates
-     *
-     * Parameters:
-     * point - {<OpenLayers.Geometry.Point>}
-     *
-     * Returns
-     * {String} a coordinate pair
-     */
-    buildCoordinates: function(point) {
-        if (this.internalProjection && this.externalProjection) {
-            point = point.clone();
-            point.transform(this.internalProjection, 
-                               this.externalProjection);
-        }
-        return point.x + "," + point.y;                     
-    },
-
-    /**
-     * Method: buildExtendedData
-     *
-     * Parameters:
-     * attributes - {Object}
-     *
-     * Returns
-     * {DOMElement} A KML ExtendedData node or {null} if no attributes.
-     */
-    buildExtendedData: function(attributes) {
-        var extendedData = this.createElementNS(this.kmlns, "ExtendedData");
-        for (var attributeName in attributes) {
-            // empty, name, description, styleUrl attributes ignored
-            if (attributes[attributeName] && attributeName != "name" && attributeName != "description" && attributeName != "styleUrl") {
-                var data = this.createElementNS(this.kmlns, "Data");
-                data.setAttribute("name", attributeName);
-                var value = this.createElementNS(this.kmlns, "value");
-                if (typeof attributes[attributeName] == "object") {
-                    // cater for object attributes with 'value' properties
-                    // other object properties will output an empty node
-                    if (attributes[attributeName].value) {
-                        value.appendChild(this.createTextNode(attributes[attributeName].value));
-                    }
-                    if (attributes[attributeName].displayName) {
-                        var displayName = this.createElementNS(this.kmlns, "displayName");
-                        // displayName always written as CDATA
-                        displayName.appendChild(this.getXMLDoc().createCDATASection(attributes[attributeName].displayName));
-                        data.appendChild(displayName);
-                    }
-                } else {
-                    value.appendChild(this.createTextNode(attributes[attributeName]));
-                }
-                data.appendChild(value);
-                extendedData.appendChild(data);
-            }
-        }
-        if (this.isSimpleContent(extendedData)) {
-            return null;
-        } else {
-            return extendedData;
-        }
-    },
-    
-    CLASS_NAME: "OpenLayers.Format.KML" 
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/OGCExceptionReport.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/OGCExceptionReport.js
deleted file mode 100644
index 61a9da54..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/OGCExceptionReport.js
+++ /dev/null
@@ -1,108 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/XML.js
- */
-
-/**
- * Class: OpenLayers.Format.OGCExceptionReport
- * Class to read exception reports for various OGC services and versions.
- *
- * Inherits from:
- *  - <OpenLayers.Format.XML>
- */
-OpenLayers.Format.OGCExceptionReport = OpenLayers.Class(OpenLayers.Format.XML, {
-
-    /**
-     * Property: namespaces
-     * {Object} Mapping of namespace aliases to namespace URIs.
-     */
-    namespaces: {
-        ogc: "http://www.opengis.net/ogc"
-    },
-
-    /**
-     * Property: regExes
-     * Compiled regular expressions for manipulating strings.
-     */
-    regExes: {
-        trimSpace: (/^\s*|\s*$/g),
-        removeSpace: (/\s*/g),
-        splitSpace: (/\s+/),
-        trimComma: (/\s*,\s*/g)
-    },
-
-    /**
-     * Property: defaultPrefix
-     */
-    defaultPrefix: "ogc",
-
-    /**
-     * Constructor: OpenLayers.Format.OGCExceptionReport
-     * Create a new parser for OGC exception reports.
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be set on
-     *     this instance.
-     */
-
-    /**
-     * APIMethod: read
-     * Read OGC exception report data from a string, and return an object with
-     * information about the exceptions.
-     *
-     * Parameters:
-     * data - {String} or {DOMElement} data to read/parse.
-     *
-     * Returns:
-     * {Object} Information about the exceptions that occurred.
-     */
-    read: function(data) {
-        var result;
-        if(typeof data == "string") {
-            data = OpenLayers.Format.XML.prototype.read.apply(this, [data]);
-        }
-        var root = data.documentElement;
-        var exceptionInfo = {exceptionReport: null}; 
-        if (root) {
-            this.readChildNodes(data, exceptionInfo);
-            if (exceptionInfo.exceptionReport === null) {
-                // fall-back to OWSCommon since this is a common output format for exceptions
-                // we cannot easily use the ows readers directly since they differ for 1.0 and 1.1
-                exceptionInfo = new OpenLayers.Format.OWSCommon().read(data);
-            }
-        }
-        return exceptionInfo;
-    },
-
-    /**
-     * Property: readers
-     * Contains public functions, grouped by namespace prefix, that will
-     *     be applied when a namespaced node is found matching the function
-     *     name.  The function will be applied in the scope of this parser
-     *     with two arguments: the node being read and a context object passed
-     *     from the parent.
-     */
-    readers: {
-        "ogc": {
-            "ServiceExceptionReport": function(node, obj) {
-                obj.exceptionReport = {exceptions: []};
-                this.readChildNodes(node, obj.exceptionReport);
-            },
-            "ServiceException": function(node, exceptionReport) {
-                var exception = {
-                    code: node.getAttribute("code"),
-                    locator: node.getAttribute("locator"),
-                    text: this.getChildValue(node)
-                };
-                exceptionReport.exceptions.push(exception);
-            }
-        }
-    },
-    
-    CLASS_NAME: "OpenLayers.Format.OGCExceptionReport"
-    
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/OSM.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/OSM.js
deleted file mode 100644
index 7283348f..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/OSM.js
+++ /dev/null
@@ -1,465 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/XML.js
- * @requires OpenLayers/Feature/Vector.js
- * @requires OpenLayers/Geometry/Point.js
- * @requires OpenLayers/Geometry/LineString.js
- * @requires OpenLayers/Geometry/Polygon.js
- * @requires OpenLayers/Projection.js
- */
-
-/**  
- * Class: OpenLayers.Format.OSM
- * OSM parser. Create a new instance with the 
- *     <OpenLayers.Format.OSM> constructor.
- *
- * Inherits from:
- *  - <OpenLayers.Format.XML>
- */
-OpenLayers.Format.OSM = OpenLayers.Class(OpenLayers.Format.XML, {
-    
-    /**
-     * APIProperty: checkTags
-     * {Boolean} Should tags be checked to determine whether something
-     * should be treated as a seperate node. Will slow down parsing.
-     * Default is false.
-     */
-    checkTags: false,
-
-    /**
-     * Property: interestingTagsExclude
-     * {Array} List of tags to exclude from 'interesting' checks on nodes.
-     * Must be set when creating the format. Will only be used if checkTags
-     * is set.
-     */
-    interestingTagsExclude: null, 
-    
-    /**
-     * APIProperty: areaTags
-     * {Array} List of tags indicating that something is an area.  
-     * Must be set when creating the format. Will only be used if 
-     * checkTags is true.
-     */
-    areaTags: null, 
-    
-    /**
-     * Constructor: OpenLayers.Format.OSM
-     * Create a new parser for OSM.
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be set on
-     *     this instance.
-     */
-    initialize: function(options) {
-        var layer_defaults = {
-          'interestingTagsExclude': ['source', 'source_ref', 
-              'source:ref', 'history', 'attribution', 'created_by'],
-          'areaTags': ['area', 'building', 'leisure', 'tourism', 'ruins',
-              'historic', 'landuse', 'military', 'natural', 'sport'] 
-        };
-          
-        layer_defaults = OpenLayers.Util.extend(layer_defaults, options);
-        
-        var interesting = {};
-        for (var i = 0; i < layer_defaults.interestingTagsExclude.length; i++) {
-            interesting[layer_defaults.interestingTagsExclude[i]] = true;
-        }
-        layer_defaults.interestingTagsExclude = interesting;
-        
-        var area = {};
-        for (var i = 0; i < layer_defaults.areaTags.length; i++) {
-            area[layer_defaults.areaTags[i]] = true;
-        }
-        layer_defaults.areaTags = area;
-
-        // OSM coordinates are always in longlat WGS84
-        this.externalProjection = new OpenLayers.Projection("EPSG:4326");
-        
-        OpenLayers.Format.XML.prototype.initialize.apply(this, [layer_defaults]);
-    },
-    
-    /**
-     * APIMethod: read
-     * Return a list of features from a OSM doc
-     
-     * Parameters:
-     * doc - {Element} 
-     *
-     * Returns:
-     * Array({<OpenLayers.Feature.Vector>})
-     */
-    read: function(doc) {
-        if (typeof doc == "string") { 
-            doc = OpenLayers.Format.XML.prototype.read.apply(this, [doc]);
-        }
-
-        var nodes = this.getNodes(doc);
-        var ways = this.getWays(doc);
-        
-        // Geoms will contain at least ways.length entries.
-        var feat_list = new Array(ways.length);
-        
-        for (var i = 0; i < ways.length; i++) {
-            // We know the minimal of this one ahead of time. (Could be -1
-            // due to areas/polygons)
-            var point_list = new Array(ways[i].nodes.length);
-            
-            var poly = this.isWayArea(ways[i]) ? 1 : 0; 
-            for (var j = 0; j < ways[i].nodes.length; j++) {
-               var node = nodes[ways[i].nodes[j]];
-               
-               var point = new OpenLayers.Geometry.Point(node.lon, node.lat);
-               
-               // Since OSM is topological, we stash the node ID internally. 
-               point.osm_id = parseInt(ways[i].nodes[j]);
-               point_list[j] = point;
-               
-               // We don't display nodes if they're used inside other 
-               // elements.
-               node.used = true; 
-            }
-            var geometry = null;
-            if (poly) { 
-                geometry = new OpenLayers.Geometry.Polygon(
-                    new OpenLayers.Geometry.LinearRing(point_list));
-            } else {    
-                geometry = new OpenLayers.Geometry.LineString(point_list);
-            }
-            if (this.internalProjection && this.externalProjection) {
-                geometry.transform(this.externalProjection, 
-                    this.internalProjection);
-            }        
-            var feat = new OpenLayers.Feature.Vector(geometry,
-                ways[i].tags);
-            feat.osm_id = parseInt(ways[i].id);
-            feat.fid = "way." + feat.osm_id;
-            feat_list[i] = feat;
-        } 
-        for (var node_id in nodes) {
-            var node = nodes[node_id];
-            if (!node.used || this.checkTags) {
-                var tags = null;
-                
-                if (this.checkTags) {
-                    var result = this.getTags(node.node, true);
-                    if (node.used && !result[1]) {
-                        continue;
-                    }
-                    tags = result[0];
-                } else { 
-                    tags = this.getTags(node.node);
-                }    
-                
-                var feat = new OpenLayers.Feature.Vector(
-                    new OpenLayers.Geometry.Point(node['lon'], node['lat']),
-                    tags);
-                if (this.internalProjection && this.externalProjection) {
-                    feat.geometry.transform(this.externalProjection, 
-                        this.internalProjection);
-                }        
-                feat.osm_id = parseInt(node_id); 
-                feat.fid = "node." + feat.osm_id;
-                feat_list.push(feat);
-            }   
-            // Memory cleanup
-            node.node = null;
-        }        
-        return feat_list;
-    },
-
-    /**
-     * Method: getNodes
-     * Return the node items from a doc.  
-     *
-     * Parameters:
-     * doc - {DOMElement} node to parse tags from
-     */
-    getNodes: function(doc) {
-        var node_list = doc.getElementsByTagName("node");
-        var nodes = {};
-        for (var i = 0; i < node_list.length; i++) {
-            var node = node_list[i];
-            var id = node.getAttribute("id");
-            nodes[id] = {
-                'lat': node.getAttribute("lat"),
-                'lon': node.getAttribute("lon"),
-                'node': node
-            };
-        }
-        return nodes;
-    },
-
-    /**
-     * Method: getWays
-     * Return the way items from a doc.  
-     *
-     * Parameters:
-     * doc - {DOMElement} node to parse tags from
-     */
-    getWays: function(doc) {
-        var way_list = doc.getElementsByTagName("way");
-        var return_ways = [];
-        for (var i = 0; i < way_list.length; i++) {
-            var way = way_list[i];
-            var way_object = {
-              id: way.getAttribute("id")
-            };
-            
-            way_object.tags = this.getTags(way);
-            
-            var node_list = way.getElementsByTagName("nd");
-            
-            way_object.nodes = new Array(node_list.length);
-            
-            for (var j = 0; j < node_list.length; j++) {
-                way_object.nodes[j] = node_list[j].getAttribute("ref");
-            }  
-            return_ways.push(way_object);
-        }
-        return return_ways; 
-        
-    },  
-    
-    /**
-     * Method: getTags
-     * Return the tags list attached to a specific DOM element.
-     *
-     * Parameters:
-     * dom_node - {DOMElement} node to parse tags from
-     * interesting_tags - {Boolean} whether the return from this function should
-     *    return a boolean indicating that it has 'interesting tags' -- 
-     *    tags like attribution and source are ignored. (To change the list
-     *    of tags, see interestingTagsExclude)
-     * 
-     * Returns:
-     * tags - {Object} hash of tags
-     * interesting - {Boolean} if interesting_tags is passed, returns
-     *     whether there are any interesting tags on this element.
-     */
-    getTags: function(dom_node, interesting_tags) {
-        var tag_list = dom_node.getElementsByTagName("tag");
-        var tags = {};
-        var interesting = false;
-        for (var j = 0; j < tag_list.length; j++) {
-            var key = tag_list[j].getAttribute("k");
-            tags[key] = tag_list[j].getAttribute("v");
-            if (interesting_tags) {
-                if (!this.interestingTagsExclude[key]) {
-                    interesting = true;
-                }
-            }    
-        }  
-        return interesting_tags ? [tags, interesting] : tags;     
-    },
-
-    /** 
-     * Method: isWayArea
-     * Given a way object from getWays, check whether the tags and geometry
-     * indicate something is an area.
-     *
-     * Returns:
-     * {Boolean}
-     */
-    isWayArea: function(way) { 
-        var poly_shaped = false;
-        var poly_tags = false;
-        
-        if (way.nodes[0] == way.nodes[way.nodes.length - 1]) {
-            poly_shaped = true;
-        }
-        if (this.checkTags) {
-            for(var key in way.tags) {
-                if (this.areaTags[key]) {
-                    poly_tags = true;
-                    break;
-                }
-            }
-        }    
-        return poly_shaped && (this.checkTags ? poly_tags : true);            
-    }, 
-
-    /**
-     * APIMethod: write 
-     * Takes a list of features, returns a serialized OSM format file for use
-     * in tools like JOSM.
-     *
-     * Parameters:
-     * features - {Array(<OpenLayers.Feature.Vector>)}
-     */
-    write: function(features) { 
-        if (!(OpenLayers.Util.isArray(features))) {
-            features = [features];
-        }
-        
-        this.osm_id = 1;
-        this.created_nodes = {};
-        var root_node = this.createElementNS(null, "osm");
-        root_node.setAttribute("version", "0.5");
-        root_node.setAttribute("generator", "OpenLayers "+ OpenLayers.VERSION_NUMBER);
-
-        // Loop backwards, because the deserializer puts nodes last, and 
-        // we want them first if possible
-        for(var i = features.length - 1; i >= 0; i--) {
-            var nodes = this.createFeatureNodes(features[i]);
-            for (var j = 0; j < nodes.length; j++) {
-                root_node.appendChild(nodes[j]);
-            }    
-        }
-        return OpenLayers.Format.XML.prototype.write.apply(this, [root_node]);
-    },
-
-    /**
-     * Method: createFeatureNodes
-     * Takes a feature, returns a list of nodes from size 0->n.
-     * Will include all pieces of the serialization that are required which
-     * have not already been created. Calls out to createXML based on geometry
-     * type.
-     *
-     * Parameters:
-     * feature - {<OpenLayers.Feature.Vector>}
-     */
-    createFeatureNodes: function(feature) {
-        var nodes = [];
-        var className = feature.geometry.CLASS_NAME;
-        var type = className.substring(className.lastIndexOf(".") + 1);
-        type = type.toLowerCase();
-        var builder = this.createXML[type];
-        if (builder) {
-            nodes = builder.apply(this, [feature]);
-        }
-        return nodes;
-    },
-    
-    /**
-     * Method: createXML
-     * Takes a feature, returns a list of nodes from size 0->n.
-     * Will include all pieces of the serialization that are required which
-     * have not already been created.
-     *
-     * Parameters:
-     * feature - {<OpenLayers.Feature.Vector>}
-     */
-    createXML: {
-        'point': function(point) {
-            var id = null;
-            var geometry = point.geometry ? point.geometry : point;
-            
-            if (this.internalProjection && this.externalProjection) {
-                geometry = geometry.clone();
-                geometry.transform(this.internalProjection, 
-                                   this.externalProjection);
-            }                       
-            
-            var already_exists = false; // We don't return anything if the node
-                                        // has already been created
-            if (point.osm_id) {
-                id = point.osm_id;
-                if (this.created_nodes[id]) {
-                    already_exists = true;
-                }    
-            } else {
-               id = -this.osm_id;
-               this.osm_id++; 
-            }
-            if (already_exists) {
-                node = this.created_nodes[id];
-            } else {    
-                var node = this.createElementNS(null, "node");
-            }
-            this.created_nodes[id] = node;
-            node.setAttribute("id", id);
-            node.setAttribute("lon", geometry.x); 
-            node.setAttribute("lat", geometry.y);
-            if (point.attributes) {
-                this.serializeTags(point, node);
-            }
-            this.setState(point, node);
-            return already_exists ? [] : [node];
-        }, 
-        linestring: function(feature) {
-            var id;
-            var nodes = [];
-            var geometry = feature.geometry;
-            if (feature.osm_id) {
-                id = feature.osm_id;
-            } else {
-                id = -this.osm_id;
-                this.osm_id++; 
-            }
-            var way = this.createElementNS(null, "way");
-            way.setAttribute("id", id);
-            for (var i = 0; i < geometry.components.length; i++) {
-                var node = this.createXML['point'].apply(this, [geometry.components[i]]);
-                if (node.length) {
-                    node = node[0];
-                    var node_ref = node.getAttribute("id");
-                    nodes.push(node);
-                } else {
-                    node_ref = geometry.components[i].osm_id;
-                    node = this.created_nodes[node_ref];
-                }
-                this.setState(feature, node);
-                var nd_dom = this.createElementNS(null, "nd");
-                nd_dom.setAttribute("ref", node_ref);
-                way.appendChild(nd_dom);
-            }
-            this.serializeTags(feature, way);
-            nodes.push(way);
-            
-            return nodes;
-        },
-        polygon: function(feature) {
-            var attrs = OpenLayers.Util.extend({'area':'yes'}, feature.attributes);
-            var feat = new OpenLayers.Feature.Vector(feature.geometry.components[0], attrs); 
-            feat.osm_id = feature.osm_id;
-            return this.createXML['linestring'].apply(this, [feat]);
-        }
-    },
-
-    /**
-     * Method: serializeTags
-     * Given a feature, serialize the attributes onto the given node.
-     *
-     * Parameters:
-     * feature - {<OpenLayers.Feature.Vector>}
-     * node - {DOMNode}
-     */
-    serializeTags: function(feature, node) {
-        for (var key in feature.attributes) {
-            var tag = this.createElementNS(null, "tag");
-            tag.setAttribute("k", key);
-            tag.setAttribute("v", feature.attributes[key]);
-            node.appendChild(tag);
-        }
-    },
-
-    /**
-     * Method: setState 
-     * OpenStreetMap has a convention that 'state' is stored for modification or deletion.
-     * This allows the file to be uploaded via JOSM or the bulk uploader tool.
-     *
-     * Parameters:
-     * feature - {<OpenLayers.Feature.Vector>}
-     * node - {DOMNode}
-     */
-    setState: function(feature, node) {
-        if (feature.state) {
-            var state = null;
-            switch(feature.state) {
-                case OpenLayers.State.UPDATE:
-                    state = "modify";
-                case OpenLayers.State.DELETE:
-                    state = "delete";
-            }
-            if (state) {
-                node.setAttribute("action", state);
-            }
-        }    
-    },
-
-    CLASS_NAME: "OpenLayers.Format.OSM" 
-});     
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/OWSCommon.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/OWSCommon.js
deleted file mode 100644
index fd718206..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/OWSCommon.js
+++ /dev/null
@@ -1,78 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/XML/VersionedOGC.js
- */
-
-/**
- * Class: OpenLayers.Format.OWSCommon
- * Read OWSCommon. Create a new instance with the <OpenLayers.Format.OWSCommon>
- *     constructor.
- * 
- * Inherits from:
- *  - <OpenLayers.Format.XML.VersionedOGC>
- */
-OpenLayers.Format.OWSCommon = OpenLayers.Class(OpenLayers.Format.XML.VersionedOGC, {
-    
-    /**
-     * APIProperty: defaultVersion
-     * {String} Version number to assume if none found.  Default is "1.0.0".
-     */
-    defaultVersion: "1.0.0",
-    
-    /**
-     * Constructor: OpenLayers.Format.OWSCommon
-     * Create a new parser for OWSCommon.
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be set on
-     *     this instance.
-     */
-
-    /**
-     * Method: getVersion
-     * Returns the version to use. Subclasses can override this function
-     * if a different version detection is needed.
-     *
-     * Parameters:
-     * root - {DOMElement}
-     * options - {Object} Optional configuration object.
-     *
-     * Returns:
-     * {String} The version to use.
-     */
-    getVersion: function(root, options) {
-        var version = this.version;
-        if(!version) {
-            // remember version does not correspond to the OWS version
-            // it corresponds to the WMS/WFS/WCS etc. request version
-            var uri = root.getAttribute("xmlns:ows");
-            // the above will fail if the namespace prefix is different than
-            // ows and if the namespace is declared on a different element
-            if (uri && uri.substring(uri.lastIndexOf("/")+1) === "1.1") {
-                version ="1.1.0";
-            } 
-            if(!version) {
-                version = this.defaultVersion;
-            }
-        }
-        return version;
-    },
-
-    /**
-     * APIMethod: read
-     * Read an OWSCommon document and return an object.
-     *
-     * Parameters:
-     * data - {String | DOMElement} Data to read.
-     * options - {Object} Options for the reader.
-     *
-     * Returns:
-     * {Object} An object representing the structure of the document.
-     */
-
-    CLASS_NAME: "OpenLayers.Format.OWSCommon" 
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/OWSCommon/v1.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/OWSCommon/v1.js
deleted file mode 100644
index 57ae9d25..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/OWSCommon/v1.js
+++ /dev/null
@@ -1,318 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/OWSCommon.js
- */
-
-/**
- * Class: OpenLayers.Format.OWSCommon.v1
- * Common readers and writers for OWSCommon v1.X formats
- *
- * Inherits from:
- *  - <OpenLayers.Format.XML>
- */
-OpenLayers.Format.OWSCommon.v1 = OpenLayers.Class(OpenLayers.Format.XML, {
-   
-    /**
-     * Property: regExes
-     * Compiled regular expressions for manipulating strings.
-     */
-    regExes: {
-        trimSpace: (/^\s*|\s*$/g),
-        removeSpace: (/\s*/g),
-        splitSpace: (/\s+/),
-        trimComma: (/\s*,\s*/g)
-    },
-
-    /**
-     * Method: read
-     *
-     * Parameters:
-     * data - {DOMElement} An OWSCommon document element.
-     * options - {Object} Options for the reader.
-     *
-     * Returns:
-     * {Object} An object representing the OWSCommon document.
-     */
-    read: function(data, options) {
-        options = OpenLayers.Util.applyDefaults(options, this.options);
-        var ows = {};
-        this.readChildNodes(data, ows);
-        return ows;
-    },
-
-    /**
-     * Property: readers
-     * Contains public functions, grouped by namespace prefix, that will
-     *     be applied when a namespaced node is found matching the function
-     *     name.  The function will be applied in the scope of this parser
-     *     with two arguments: the node being read and a context object passed
-     *     from the parent.
-     */
-    readers: {
-        "ows": {
-            "Exception": function(node, exceptionReport) {
-                var exception = {
-                    code: node.getAttribute('exceptionCode'),
-                    locator: node.getAttribute('locator'),
-                    texts: []
-                };
-                exceptionReport.exceptions.push(exception);
-                this.readChildNodes(node, exception);
-            },
-            "ExceptionText": function(node, exception) {
-                var text = this.getChildValue(node);
-                exception.texts.push(text);
-            },
-            "ServiceIdentification": function(node, obj) {
-                obj.serviceIdentification = {};
-                this.readChildNodes(node, obj.serviceIdentification);
-            },
-            "Title": function(node, obj) {
-                obj.title = this.getChildValue(node);
-            },
-            "Abstract": function(node, serviceIdentification) {
-                serviceIdentification["abstract"] = this.getChildValue(node);
-            },
-            "Keywords": function(node, serviceIdentification) {
-                serviceIdentification.keywords = {};
-                this.readChildNodes(node, serviceIdentification.keywords);
-            },
-            "Keyword": function(node, keywords) {
-                keywords[this.getChildValue(node)] = true;
-            },
-            "ServiceType": function(node, serviceIdentification) {
-                serviceIdentification.serviceType = {
-                    codeSpace: node.getAttribute('codeSpace'), 
-                    value: this.getChildValue(node)};
-            },
-            "ServiceTypeVersion": function(node, serviceIdentification) {
-                serviceIdentification.serviceTypeVersion = this.getChildValue(node);
-            },
-            "Fees": function(node, serviceIdentification) {
-                serviceIdentification.fees = this.getChildValue(node);
-            },
-            "AccessConstraints": function(node, serviceIdentification) {
-                serviceIdentification.accessConstraints = 
-                    this.getChildValue(node);
-            },
-            "ServiceProvider": function(node, obj) {
-                obj.serviceProvider = {};
-                this.readChildNodes(node, obj.serviceProvider);
-            },
-            "ProviderName": function(node, serviceProvider) {
-                serviceProvider.providerName = this.getChildValue(node);
-            },
-            "ProviderSite": function(node, serviceProvider) {
-                serviceProvider.providerSite = this.getAttributeNS(node, 
-                    this.namespaces.xlink, "href");
-            },
-            "ServiceContact": function(node, serviceProvider) {
-                serviceProvider.serviceContact = {};
-                this.readChildNodes(node, serviceProvider.serviceContact);
-            },
-            "IndividualName": function(node, serviceContact) {
-                serviceContact.individualName = this.getChildValue(node);
-            },
-            "PositionName": function(node, serviceContact) {
-                serviceContact.positionName = this.getChildValue(node);
-            },
-            "ContactInfo": function(node, serviceContact) {
-                serviceContact.contactInfo = {};
-                this.readChildNodes(node, serviceContact.contactInfo);
-            },
-            "Phone": function(node, contactInfo) {
-                contactInfo.phone = {};
-                this.readChildNodes(node, contactInfo.phone);
-            },
-            "Voice": function(node, phone) {
-                phone.voice = this.getChildValue(node);
-            },
-            "Address": function(node, contactInfo) {
-                contactInfo.address = {};
-                this.readChildNodes(node, contactInfo.address);
-            },
-            "DeliveryPoint": function(node, address) {
-                address.deliveryPoint = this.getChildValue(node);
-            },
-            "City": function(node, address) {
-                address.city = this.getChildValue(node);
-            },
-            "AdministrativeArea": function(node, address) {
-                address.administrativeArea = this.getChildValue(node);
-            },
-            "PostalCode": function(node, address) {
-                address.postalCode = this.getChildValue(node);
-            },
-            "Country": function(node, address) {
-                address.country = this.getChildValue(node);
-            },
-            "ElectronicMailAddress": function(node, address) {
-                address.electronicMailAddress = this.getChildValue(node);
-            },
-            "Role": function(node, serviceContact) {
-                serviceContact.role = this.getChildValue(node);
-            },
-            "OperationsMetadata": function(node, obj) {
-                obj.operationsMetadata = {};
-                this.readChildNodes(node, obj.operationsMetadata);
-            },
-            "Operation": function(node, operationsMetadata) {
-                var name = node.getAttribute("name");
-                operationsMetadata[name] = {};
-                this.readChildNodes(node, operationsMetadata[name]);
-            },
-            "DCP": function(node, operation) {
-                operation.dcp = {};
-                this.readChildNodes(node, operation.dcp);
-            },
-            "HTTP": function(node, dcp) {
-                dcp.http = {};
-                this.readChildNodes(node, dcp.http);
-            },
-            "Get": function(node, http) {
-                if (!http.get) {
-                    http.get = [];
-                }
-                var obj = {
-                    url: this.getAttributeNS(node, this.namespaces.xlink, "href")
-                };
-                this.readChildNodes(node, obj);
-                http.get.push(obj);
-            },
-            "Post": function(node, http) {
-                if (!http.post) {
-                    http.post = [];
-                }
-                var obj = {
-                    url: this.getAttributeNS(node, this.namespaces.xlink, "href")
-                };
-                this.readChildNodes(node, obj);
-                http.post.push(obj);
-            },
-            "Parameter": function(node, operation) {
-                if (!operation.parameters) {
-                    operation.parameters = {};
-                }
-                var name = node.getAttribute("name");
-                operation.parameters[name] = {};
-                this.readChildNodes(node, operation.parameters[name]);
-            },
-            "Constraint": function(node, obj) {
-                if (!obj.constraints) {
-                    obj.constraints = {};
-                }
-                var name = node.getAttribute("name");
-                obj.constraints[name] = {};
-                this.readChildNodes(node, obj.constraints[name]);
-            },
-            "Value": function(node, allowedValues) {
-                allowedValues[this.getChildValue(node)] = true;
-            },
-            "OutputFormat": function(node, obj) {
-                obj.formats.push({value: this.getChildValue(node)});
-                this.readChildNodes(node, obj);
-            },
-            "WGS84BoundingBox": function(node, obj) {
-                var boundingBox = {};
-                boundingBox.crs = node.getAttribute("crs");
-                if (obj.BoundingBox) {
-                    obj.BoundingBox.push(boundingBox);
-                } else {
-                    obj.projection = boundingBox.crs;
-                    boundingBox = obj;
-               }
-               this.readChildNodes(node, boundingBox);
-            },
-            "BoundingBox": function(node, obj) {
-                // FIXME: We consider that BoundingBox is the same as WGS84BoundingBox
-                // LowerCorner = "min_x min_y"
-                // UpperCorner = "max_x max_y"
-                // It should normally depend on the projection
-                this.readers['ows']['WGS84BoundingBox'].apply(this, [node, obj]);
-            },
-            "LowerCorner": function(node, obj) {
-                var str = this.getChildValue(node).replace(
-                    this.regExes.trimSpace, "");
-                str = str.replace(this.regExes.trimComma, ",");
-                var pointList = str.split(this.regExes.splitSpace);
-                obj.left = pointList[0];
-                obj.bottom = pointList[1];
-            },
-            "UpperCorner": function(node, obj) {
-                var str = this.getChildValue(node).replace(
-                    this.regExes.trimSpace, "");
-                str = str.replace(this.regExes.trimComma, ",");
-                var pointList = str.split(this.regExes.splitSpace);
-                obj.right = pointList[0];
-                obj.top = pointList[1];
-                obj.bounds = new OpenLayers.Bounds(obj.left, obj.bottom,
-                    obj.right, obj.top);
-                delete obj.left;
-                delete obj.bottom;
-                delete obj.right;
-                delete obj.top;
-            },
-            "Language": function(node, obj) {
-                obj.language = this.getChildValue(node);
-            }
-        }
-    },
-
-    /**
-     * Property: writers
-     * As a compliment to the readers property, this structure contains public
-     *     writing functions grouped by namespace alias and named like the
-     *     node names they produce.
-     */
-    writers: {
-        "ows": {
-            "BoundingBox": function(options, nodeName) {
-                var node = this.createElementNSPlus(nodeName || "ows:BoundingBox", {
-                    attributes: {
-                        crs: options.projection
-                    }
-                });
-                this.writeNode("ows:LowerCorner", options, node);
-                this.writeNode("ows:UpperCorner", options, node);
-                return node;
-            },
-            "LowerCorner": function(options) {
-                var node = this.createElementNSPlus("ows:LowerCorner", {
-                    value: options.bounds.left + " " + options.bounds.bottom });
-                return node;
-            },
-            "UpperCorner": function(options) {
-                var node = this.createElementNSPlus("ows:UpperCorner", {
-                    value: options.bounds.right + " " + options.bounds.top });
-                return node;
-            },
-            "Identifier": function(identifier) {
-                var node = this.createElementNSPlus("ows:Identifier", {
-                    value: identifier });
-                return node;
-            },
-            "Title": function(title) {
-                var node = this.createElementNSPlus("ows:Title", {
-                    value: title });
-                return node;
-            },
-            "Abstract": function(abstractValue) {
-                var node = this.createElementNSPlus("ows:Abstract", {
-                    value: abstractValue });
-                return node;
-            },
-            "OutputFormat": function(format) {
-                var node = this.createElementNSPlus("ows:OutputFormat", {
-                    value: format });
-                return node;
-            }
-        }
-    },
-
-    CLASS_NAME: "OpenLayers.Format.OWSCommon.v1"
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/OWSCommon/v1_0_0.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/OWSCommon/v1_0_0.js
deleted file mode 100644
index bc9852d7..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/OWSCommon/v1_0_0.js
+++ /dev/null
@@ -1,62 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/OWSCommon/v1.js
- */
-
-/**
- * Class: OpenLayers.Format.OWSCommon.v1_0_0
- * Parser for OWS Common version 1.0.0.
- *
- * Inherits from:
- *  - <OpenLayers.Format.OWSCommon.v1>
- */
-OpenLayers.Format.OWSCommon.v1_0_0 = OpenLayers.Class(OpenLayers.Format.OWSCommon.v1, {
-    
-    /**
-     * Property: namespaces
-     * {Object} Mapping of namespace aliases to namespace URIs.
-     */
-    namespaces: {
-        ows: "http://www.opengis.net/ows",
-        xlink: "http://www.w3.org/1999/xlink"
-    },    
-    
-    /**
-     * Property: readers
-     * Contains public functions, grouped by namespace prefix, that will
-     *     be applied when a namespaced node is found matching the function
-     *     name.  The function will be applied in the scope of this parser
-     *     with two arguments: the node being read and a context object passed
-     *     from the parent.
-     */
-    readers: {
-        "ows": OpenLayers.Util.applyDefaults({
-            "ExceptionReport": function(node, obj) {
-                obj.success = false;
-                obj.exceptionReport = {
-                    version: node.getAttribute('version'),
-                    language: node.getAttribute('language'),
-                    exceptions: []
-                };
-                this.readChildNodes(node, obj.exceptionReport);
-            } 
-        }, OpenLayers.Format.OWSCommon.v1.prototype.readers.ows)
-    },
-
-    /**
-     * Property: writers
-     * As a compliment to the readers property, this structure contains public
-     *     writing functions grouped by namespace alias and named like the
-     *     node names they produce.
-     */
-    writers: {
-        "ows": OpenLayers.Format.OWSCommon.v1.prototype.writers.ows
-    },
-    
-    CLASS_NAME: "OpenLayers.Format.OWSCommon.v1_0_0"
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/OWSCommon/v1_1_0.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/OWSCommon/v1_1_0.js
deleted file mode 100644
index 9da216c8..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/OWSCommon/v1_1_0.js
+++ /dev/null
@@ -1,116 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/OWSCommon/v1.js
- */
-
-/**
- * Class: OpenLayers.Format.OWSCommon.v1_1_0
- * Parser for OWS Common version 1.1.0.
- *
- * Inherits from:
- *  - <OpenLayers.Format.OWSCommon.v1>
- */
-OpenLayers.Format.OWSCommon.v1_1_0 = OpenLayers.Class(OpenLayers.Format.OWSCommon.v1, {
-
-    /**
-     * Property: namespaces
-     * {Object} Mapping of namespace aliases to namespace URIs.
-     */
-    namespaces: {
-        ows: "http://www.opengis.net/ows/1.1",
-        xlink: "http://www.w3.org/1999/xlink"
-    },    
-    
-    /**
-     * Property: readers
-     * Contains public functions, grouped by namespace prefix, that will
-     *     be applied when a namespaced node is found matching the function
-     *     name.  The function will be applied in the scope of this parser
-     *     with two arguments: the node being read and a context object passed
-     *     from the parent.
-     */
-    readers: {
-        "ows": OpenLayers.Util.applyDefaults({
-            "ExceptionReport": function(node, obj) {
-                obj.exceptionReport = {
-                    version: node.getAttribute('version'),
-                    language: node.getAttribute('xml:lang'),
-                    exceptions: []
-                };
-                this.readChildNodes(node, obj.exceptionReport);
-            },
-            "AllowedValues": function(node, parameter) {
-                parameter.allowedValues = {};
-                this.readChildNodes(node, parameter.allowedValues);
-            },
-            "AnyValue": function(node, parameter) {
-                parameter.anyValue = true;
-            },
-            "DataType": function(node, parameter) {
-                parameter.dataType = this.getChildValue(node);
-            },
-            "Range": function(node, allowedValues) {
-                allowedValues.range = {};
-                this.readChildNodes(node, allowedValues.range);
-            },
-            "MinimumValue": function(node, range) {
-                range.minValue = this.getChildValue(node);
-            },
-            "MaximumValue": function(node, range) {
-                range.maxValue = this.getChildValue(node);
-            },
-            "Identifier": function(node, obj) {
-                obj.identifier = this.getChildValue(node);
-            },
-            "SupportedCRS": function(node, obj) {
-                obj.supportedCRS = this.getChildValue(node);
-            }
-        }, OpenLayers.Format.OWSCommon.v1.prototype.readers["ows"])
-    },
-
-    /**
-     * Property: writers
-     * As a compliment to the readers property, this structure contains public
-     *     writing functions grouped by namespace alias and named like the
-     *     node names they produce.
-     */
-    writers: {
-        "ows": OpenLayers.Util.applyDefaults({
-            "Range": function(range) {
-                var node = this.createElementNSPlus("ows:Range", {
-                    attributes: {
-                        'ows:rangeClosure': range.closure
-                    }
-                });
-                this.writeNode("ows:MinimumValue", range.minValue, node);
-                this.writeNode("ows:MaximumValue", range.maxValue, node);
-                return node;
-            },
-            "MinimumValue": function(minValue) {
-                var node = this.createElementNSPlus("ows:MinimumValue", {
-                    value: minValue
-                });
-                return node;
-            },
-            "MaximumValue": function(maxValue) {
-                var node = this.createElementNSPlus("ows:MaximumValue", {
-                    value: maxValue
-                });
-                return node;
-            },
-            "Value": function(value) {
-                var node = this.createElementNSPlus("ows:Value", {
-                    value: value
-                });
-                return node;
-            }
-        }, OpenLayers.Format.OWSCommon.v1.prototype.writers["ows"])
-    },
-
-    CLASS_NAME: "OpenLayers.Format.OWSCommon.v1_1_0"
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/OWSContext.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/OWSContext.js
deleted file mode 100644
index ab38734f..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/OWSContext.js
+++ /dev/null
@@ -1,86 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/Context.js
- */
-
-/**
- * Class: OpenLayers.Format.OWSContext
- * Read and write OWS Context documents. OWS Context documents are a 
- * preliminary OGC (Open Geospatial Consortium) standard for storing the 
- * state of a web mapping application. In a way it is the successor to
- * Web Map Context (WMC), since it is more generic and more types of layers
- * can be stored. Also, nesting of layers is supported since version 0.3.1.
- * For more information see: http://www.ogcnetwork.net/context
- *
- * Inherits from:
- *  - <OpenLayers.Format.Context>
- */
-OpenLayers.Format.OWSContext = OpenLayers.Class(OpenLayers.Format.Context,{
-    
-    /**
-     * APIProperty: defaultVersion
-     * {String} Version number to assume if none found.  Default is "0.3.1".
-     */
-    defaultVersion: "0.3.1",
-
-    /**
-     * Constructor: OpenLayers.Format.OWSContext
-     * Create a new parser for OWS Context documents.
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be set on
-     *     this instance.
-     */
-    
-    /**
-     * Method: getVersion
-     * Returns the version to use. Subclasses can override this function
-     * if a different version detection is needed.
-     *
-     * Parameters:
-     * root - {DOMElement}
-     * options - {Object} Optional configuration object.
-     *
-     * Returns:
-     * {String} The version to use.
-     */
-    getVersion: function(root, options) {
-        var version = OpenLayers.Format.XML.VersionedOGC.prototype.getVersion.apply(
-            this, arguments);
-        // 0.3.1 is backwards compatible with 0.3.0
-        if (version === "0.3.0") {
-            version = this.defaultVersion;
-        }
-        return version;
-    },
-
-    /**
-     * Method: toContext
-     * Create a context object free from layer given a map or a
-     * context object.
-     *
-     * Parameters:
-     * obj - {<OpenLayers.Map> | Object} The map or context.
-     *
-     * Returns:
-     * {Object} A context object.
-     */
-    toContext: function(obj) {
-        var context = {};
-        if(obj.CLASS_NAME == "OpenLayers.Map") {
-            context.bounds = obj.getExtent();
-            context.maxExtent = obj.maxExtent;
-            context.projection = obj.projection;
-            context.size = obj.getSize();
-            context.layers = obj.layers;
-        }
-        return context;
-    },
-
-    CLASS_NAME: "OpenLayers.Format.OWSContext" 
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/OWSContext/v0_3_1.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/OWSContext/v0_3_1.js
deleted file mode 100644
index d6487e84..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/OWSContext/v0_3_1.js
+++ /dev/null
@@ -1,595 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/XML.js
- * @requires OpenLayers/Format/KML.js
- * @requires OpenLayers/Format/GML.js
- * @requires OpenLayers/Format/GML/v2.js
- * @requires OpenLayers/Format/SLD/v1_0_0.js
- * @requires OpenLayers/Format/OWSContext.js
- * @requires OpenLayers/Format/OWSCommon/v1_0_0.js
- */
-
-/**
- * Class: OpenLayers.Format.OWSContext.v0_3_1
- * Read and write OWSContext version 0.3.1.
- *
- * Inherits from:
- *  - <OpenLayers.Format.XML>
- */
-OpenLayers.Format.OWSContext.v0_3_1 = OpenLayers.Class(OpenLayers.Format.XML, {
-    
-    /**
-     * Property: namespaces
-     * {Object} Mapping of namespace aliases to namespace URIs.
-     */
-    namespaces: {
-        owc: "http://www.opengis.net/ows-context",
-        gml: "http://www.opengis.net/gml",
-        kml: "http://www.opengis.net/kml/2.2",
-        ogc: "http://www.opengis.net/ogc",
-        ows: "http://www.opengis.net/ows",
-        sld: "http://www.opengis.net/sld",
-        xlink: "http://www.w3.org/1999/xlink",
-        xsi: "http://www.w3.org/2001/XMLSchema-instance"
-    },
-
-    /**
-     * Constant: VERSION
-     * {String} 0.3.1
-     */
-    VERSION: "0.3.1", 
-
-    /**
-     * Property: schemaLocation
-     * {String} Schema location
-     */
-    schemaLocation: "http://www.opengis.net/ows-context http://www.ogcnetwork.net/schemas/owc/0.3.1/owsContext.xsd",
-
-    /**
-     * Property: defaultPrefix
-     * {String} Default namespace prefix to use.
-     */
-    defaultPrefix: "owc",
-
-    /**
-     * APIProperty: extractAttributes
-     * {Boolean} Extract attributes from GML.  Default is true.
-     */
-    extractAttributes: true,
-    
-    /**
-     * APIProperty: xy
-     * {Boolean} Order of the GML coordinate true:(x,y) or false:(y,x)
-     * Changing is not recommended, a new Format should be instantiated.
-     */ 
-    xy: true, 
-
-    /**
-     * Property: regExes
-     * Compiled regular expressions for manipulating strings.
-     */
-    regExes: {
-        trimSpace: (/^\s*|\s*$/g),
-        removeSpace: (/\s*/g),
-        splitSpace: (/\s+/),
-        trimComma: (/\s*,\s*/g)
-    },
-
-    /**
-     * Property: featureNS
-     * {String} The namespace uri to use for writing InlineGeometry
-     */
-    featureNS: "http://mapserver.gis.umn.edu/mapserver",
-
-    /**
-     * Property: featureType
-     * {String} The name to use as the feature type when writing out
-     *     InlineGeometry
-     */
-    featureType: 'vector',
-              
-    /**
-     * Property: geometryName
-     * {String} The name to use for the geometry attribute when writing out
-     *     InlineGeometry
-     */
-    geometryName: 'geometry',
-
-    /**
-     * Property: nestingLayerLookup
-     * {Object} Hashtable lookup for nesting layer nodes. Used while writing 
-     *     the OWS context document. It is necessary to keep track of the 
-     *     nestingPaths for which nesting layer nodes have already been 
-     *     created, so (nesting) layer nodes are added to those nodes.
-     *
-     * For example:
-     *
-     *     If there are three layers with nestingPaths:
-     *         layer1.metadata.nestingPath = "a/b/"
-     *         layer2.metadata.nestingPath = "a/b/"
-     *         layer2.metadata.nestingPath = "a/c"
-     *
-     *     then a nesting layer node "a" should be created once and added 
-     *     to the resource list, a nesting layer node "b" should be created 
-     *     once and added under "a", and a nesting layer node "c" should be 
-     *     created and added under "a". The lookup paths for these nodes 
-     *     will be "a", "a/b", and "a/c" respectively.
-     */
-    nestingLayerLookup: null,
-
-    /**
-     * Constructor: OpenLayers.Format.OWSContext.v0_3_1
-     * Instances of this class are not created directly.  Use the
-     *     <OpenLayers.Format.OWSContext> constructor instead.
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be set on
-     *     this instance.
-     */
-    initialize: function(options) {
-        OpenLayers.Format.XML.prototype.initialize.apply(this, [options]);
-        OpenLayers.Format.GML.v2.prototype.setGeometryTypes.call(this);
-    },
-
-    /**
-     * Method: setNestingPath
-     * Set the nestingPath property of the layer depending on the position
-     *     of the layer in hierarchy of layers.
-     *
-     * Parameters:
-     * l - {Object} An object that may have a layersContext array property.
-     * 
-     */
-    setNestingPath : function(l){
-        if(l.layersContext){
-            for (var i = 0, len = l.layersContext.length; i < len; i++) {
-                var layerContext = l.layersContext[i];
-                var nPath = [];
-                var nTitle = l.title || "";
-                if(l.metadata && l.metadata.nestingPath){
-                    nPath = l.metadata.nestingPath.slice();
-                }
-                if (nTitle != "") {
-                    nPath.push(nTitle);
-                }
-                layerContext.metadata.nestingPath = nPath;
-                if(layerContext.layersContext){
-                    this.setNestingPath(layerContext);
-                }
-            }
-        }
-    },
-
-    /**
-     * Function: decomposeNestingPath
-     * Takes a nestingPath like "a/b/c" and decomposes it into subpaths:
-     * "a", "a/b", "a/b/c"
-     *
-     * Parameters:
-     * nPath  - {Array} the nesting path
-     *
-     * Returns:
-     * Array({String}) Array with subpaths, or empty array if there is nothing
-     *     to decompose
-     */
-    decomposeNestingPath: function(nPath){
-        var a = [];
-        if (OpenLayers.Util.isArray(nPath)) {
-            var path = nPath.slice();
-            while (path.length > 0) {
-                a.push(path.slice());
-                path.pop();
-            }
-            a.reverse();
-        }
-        return a;
-    },
-
-    /**
-     * APIMethod: read
-     * Read OWS context data from a string or DOMElement, and return a list 
-     *     of layers. 
-     * 
-     * Parameters: 
-     * data - {String} or {DOMElement} data to read/parse.
-     *
-     * Returns:
-     * {Object} The context object with a flat layer list as a property named
-     *     layersContext.
-     */
-    read: function(data) {
-        if(typeof data == "string") {
-            data = OpenLayers.Format.XML.prototype.read.apply(this, [data]);
-        }
-        if(data && data.nodeType == 9) {
-            data = data.documentElement;
-        }
-        var context = {};
-        this.readNode(data, context);
-        // since an OWSContext can be nested we need to go through this
-        // structure recursively      
-        this.setNestingPath({layersContext : context.layersContext});
-        // after nesting path has been set, create a flat list of layers
-        var layers = [];
-        this.processLayer(layers, context);
-        delete context.layersContext;
-        context.layersContext = layers;
-        return context;
-    },
-
-    /**
-     * Method: processLayer
-     * Recursive function to get back a flat list of layers from the hierarchic
-     *     layer structure.
-     *
-     * Parameters:
-     * layerArray - {Array({Object})} Array of layerContext objects
-     * layer - {Object} layerContext object
-     */
-    processLayer: function(layerArray, layer) {
-        if (layer.layersContext) {
-            for (var i=0, len = layer.layersContext.length; i<len; i++) {
-                var l = layer.layersContext[i];
-                layerArray.push(l);
-                if (l.layersContext) {
-                    this.processLayer(layerArray, l);
-                }
-            }
-        }
-    },
-
-    /**
-     * APIMethod: write
-     *
-     * Parameters:
-     * context - {Object} An object representing the map context.
-     * options - {Object} Optional object.
-     *
-     * Returns:
-     * {String} An OWS Context document string.
-     */
-    write: function(context, options) {
-        var name = "OWSContext";
-        this.nestingLayerLookup = {}; //start with empty lookup
-        options = options || {};
-        OpenLayers.Util.applyDefaults(options, context);
-        var root = this.writeNode(name, options);
-        this.nestingLayerLookup = null; //clear lookup
-        this.setAttributeNS(
-            root, this.namespaces["xsi"],
-            "xsi:schemaLocation", this.schemaLocation
-        );
-        return OpenLayers.Format.XML.prototype.write.apply(this, [root]);
-    }, 
-
-    /**
-     * Property: readers
-     * Contains public functions, grouped by namespace prefix, that will
-     *     be applied when a namespaced node is found matching the function
-     *     name.  The function will be applied in the scope of this parser
-     *     with two arguments: the node being read and a context object passed
-     *     from the parent.
-     */
-    readers: {
-        "kml": {
-            "Document": function(node, obj) {
-                obj.features = new OpenLayers.Format.KML(
-                    {kmlns: this.namespaces.kml, 
-                        extractStyles: true}).read(node);
-            }
-        },
-        "owc": { 
-            "OWSContext": function(node, obj) {
-                this.readChildNodes(node, obj);
-            }, 
-            "General": function(node, obj) {
-                this.readChildNodes(node, obj);
-            },
-            "ResourceList": function(node, obj) {
-                this.readChildNodes(node, obj);
-            },
-            "Layer": function(node, obj) {
-                var layerContext = {
-                    metadata: {},
-                    visibility: (node.getAttribute("hidden") != "1"),
-                    queryable: (node.getAttribute("queryable") == "1"),
-                    opacity: ((node.getAttribute("opacity") != null) ? 
-                        parseFloat(node.getAttribute("opacity")) : null),
-                    name: node.getAttribute("name"),
-                    /* A category layer is a dummy layer meant for creating
-                       hierarchies. It is not a physical layer in the 
-                       OpenLayers sense. The assumption we make here is that
-                       category layers do not have a name attribute */
-                    categoryLayer: (node.getAttribute("name") == null),
-                    formats: [],
-                    styles: []
-                };
-                if (!obj.layersContext) {
-                    obj.layersContext = [];
-                }
-                obj.layersContext.push(layerContext);
-                this.readChildNodes(node, layerContext);
-            },
-            "InlineGeometry": function(node, obj) {
-                obj.features = [];
-                var elements = this.getElementsByTagNameNS(node, 
-                    this.namespaces.gml, "featureMember");
-                var el;
-                if (elements.length >= 1) {
-                    el = elements[0];
-                }
-                if (el && el.firstChild) {
-                    var featurenode = (el.firstChild.nextSibling) ? 
-                        el.firstChild.nextSibling : el.firstChild;
-                    this.setNamespace("feature", featurenode.namespaceURI);
-                    this.featureType = featurenode.localName || 
-                        featurenode.nodeName.split(":").pop();
-                    this.readChildNodes(node, obj);
-                }
-            },
-            "Server": function(node, obj) {
-                // when having multiple Server types, we prefer WMS
-                if ((!obj.service && !obj.version) || 
-                    (obj.service != 
-                        OpenLayers.Format.Context.serviceTypes.WMS)) {
-                            obj.service = node.getAttribute("service");
-                            obj.version = node.getAttribute("version");
-                            this.readChildNodes(node, obj);
-                }
-            },
-            "Name": function(node, obj) {
-                obj.name = this.getChildValue(node);
-                this.readChildNodes(node, obj);
-            },
-            "Title": function(node, obj) {
-                obj.title = this.getChildValue(node);
-                this.readChildNodes(node, obj);
-            },
-            "StyleList": function(node, obj) {
-                this.readChildNodes(node, obj.styles);
-            },
-            "Style": function(node, obj) {
-                var style = {};
-                obj.push(style);
-                this.readChildNodes(node, style);
-            },
-            "LegendURL": function(node, obj) {
-                var legend = {};
-                obj.legend = legend;
-                this.readChildNodes(node, legend);
-            },
-            "OnlineResource": function(node, obj) {
-                obj.url = this.getAttributeNS(node, this.namespaces.xlink, 
-                    "href");
-                this.readChildNodes(node, obj);
-            }
-        },
-        "ows": OpenLayers.Format.OWSCommon.v1_0_0.prototype.readers.ows,
-        "gml": OpenLayers.Format.GML.v2.prototype.readers.gml,
-        "sld": OpenLayers.Format.SLD.v1_0_0.prototype.readers.sld,
-        "feature": OpenLayers.Format.GML.v2.prototype.readers.feature
-    },
-
-    /**
-     * Property: writers
-     * As a compliment to the readers property, this structure contains public
-     *     writing functions grouped by namespace alias and named like the
-     *     node names they produce.
-     */
-    writers: {
-        "owc": {
-            "OWSContext": function(options) {
-                var node = this.createElementNSPlus("OWSContext", {
-                    attributes: {
-                        version: this.VERSION,
-                        id: options.id || OpenLayers.Util.createUniqueID("OpenLayers_OWSContext_")
-                    } 
-                }); 
-                this.writeNode("General", options, node);
-                this.writeNode("ResourceList", options, node);
-                return node; 
-            },
-            "General": function(options) {
-                var node = this.createElementNSPlus("General");
-                this.writeNode("ows:BoundingBox", options, node);
-                this.writeNode("ows:Title", options.title || 'OpenLayers OWSContext', node);
-                return node;
-            },
-            "ResourceList": function(options) {
-                var node = this.createElementNSPlus("ResourceList");
-                for (var i=0, len=options.layers.length; i<len; i++) {
-                    var layer = options.layers[i];
-                    var decomposedPath = this.decomposeNestingPath(layer.metadata.nestingPath);
-                    this.writeNode("_Layer", {layer: layer, subPaths: decomposedPath}, node);
-                }
-                return node;
-            },
-            "Server": function(options) {
-                var node = this.createElementNSPlus("Server", {attributes: {
-                    version: options.version,
-                    service: options.service }
-                });
-                this.writeNode("OnlineResource", options, node);
-                return node;
-            },
-            "OnlineResource": function(options) {
-                var node = this.createElementNSPlus("OnlineResource", {attributes: {
-                    "xlink:href": options.url }
-                });
-                return node;
-            },
-            "InlineGeometry": function(layer) {
-                var node = this.createElementNSPlus("InlineGeometry"),
-                    dataExtent = layer.getDataExtent();
-                if (dataExtent !== null) {
-                    this.writeNode("gml:boundedBy", dataExtent, node);
-                }
-                for (var i=0, len=layer.features.length; i<len; i++) {
-                    this.writeNode("gml:featureMember", layer.features[i], node);
-                }
-                return node;
-            },
-            "StyleList": function(styles) {
-                var node = this.createElementNSPlus("StyleList");
-                for (var i=0, len=styles.length; i<len; i++) {
-                    this.writeNode("Style", styles[i], node);
-                }
-                return node;
-            },
-            "Style": function(style) {
-                var node = this.createElementNSPlus("Style");
-                this.writeNode("Name", style, node);
-                this.writeNode("Title", style, node);
-                if (style.legend) {
-                    this.writeNode("LegendURL", style, node);
-                }
-                return node;
-            },
-            "Name": function(obj) {
-                var node = this.createElementNSPlus("Name", {
-                    value: obj.name });
-                return node;
-            },
-            "Title": function(obj) {
-                var node = this.createElementNSPlus("Title", {
-                    value: obj.title });
-                return node;
-            },
-            "LegendURL": function(style) {
-                var node = this.createElementNSPlus("LegendURL");
-                this.writeNode("OnlineResource", style.legend, node);
-                return node;
-            },
-            "_WMS": function(layer) {
-                var node = this.createElementNSPlus("Layer", {attributes: {
-                    name: layer.params.LAYERS,
-                    queryable: layer.queryable ? "1" : "0",
-                    hidden: layer.visibility ? "0" : "1",
-                    opacity: layer.hasOwnProperty("opacity") ? layer.opacity : null}
-                });
-                this.writeNode("ows:Title", layer.name, node);
-                this.writeNode("ows:OutputFormat", layer.params.FORMAT, node);
-                this.writeNode("Server", {service: 
-                    OpenLayers.Format.Context.serviceTypes.WMS,
-                    version: layer.params.VERSION, url: layer.url}, node);
-                if (layer.metadata.styles && layer.metadata.styles.length > 0) {
-                    this.writeNode("StyleList", layer.metadata.styles, node);
-                }
-                return node;
-            },
-            "_Layer": function(options) {
-                var layer, subPaths, node, title;
-                layer = options.layer;
-                subPaths = options.subPaths;
-                node = null;
-                title = null;
-                // subPaths is an array of an array
-                // recursively calling _Layer writer eats up subPaths, until a 
-                // real writer is called and nodes are returned.
-                if(subPaths.length > 0){
-                    var path = subPaths[0].join("/");
-                    var index = path.lastIndexOf("/");
-                    node = this.nestingLayerLookup[path];
-                    title = (index > 0)?path.substring(index + 1, path.length):path;
-                    if(!node){
-                        // category layer
-                        node = this.createElementNSPlus("Layer");
-                        this.writeNode("ows:Title", title, node);
-                        this.nestingLayerLookup[path] = node;
-                    }
-                    options.subPaths.shift();//remove a path after each call
-                    this.writeNode("_Layer", options, node);
-                    return node;
-                } else {
-                    // write out the actual layer
-                    if (layer instanceof OpenLayers.Layer.WMS) {
-                        node = this.writeNode("_WMS", layer);
-                    } else if (layer instanceof OpenLayers.Layer.Vector) {
-                        if (layer.protocol instanceof OpenLayers.Protocol.WFS.v1) {
-                            node = this.writeNode("_WFS", layer);
-                        } else if (layer.protocol instanceof OpenLayers.Protocol.HTTP) {
-                            if (layer.protocol.format instanceof OpenLayers.Format.GML) {
-                                layer.protocol.format.version = "2.1.2";
-                                node = this.writeNode("_GML", layer);
-                            } else if (layer.protocol.format instanceof OpenLayers.Format.KML) {
-                                layer.protocol.format.version = "2.2";
-                                node = this.writeNode("_KML", layer);
-                            }
-                        } else {
-                            // write out as inline GML since we have no idea
-                            // about the original Format
-                            this.setNamespace("feature", this.featureNS);
-                            node = this.writeNode("_InlineGeometry", layer);
-                        }
-                    }
-                    if (layer.options.maxScale) {
-                        this.writeNode("sld:MinScaleDenominator", 
-                            layer.options.maxScale, node);
-                    }
-                    if (layer.options.minScale) {
-                        this.writeNode("sld:MaxScaleDenominator", 
-                            layer.options.minScale, node);
-                    }
-                    this.nestingLayerLookup[layer.name] = node;
-                    return node;
-                }
-            },
-            "_WFS": function(layer) {
-                var node = this.createElementNSPlus("Layer", {attributes: {
-                    name: layer.protocol.featurePrefix + ":" + layer.protocol.featureType,
-                    hidden: layer.visibility ? "0" : "1" }
-                });
-                this.writeNode("ows:Title", layer.name, node);
-                this.writeNode("Server", {service: 
-                    OpenLayers.Format.Context.serviceTypes.WFS, 
-                    version: layer.protocol.version, 
-                    url: layer.protocol.url}, node);
-                return node;
-            },
-            "_InlineGeometry": function(layer) {
-                var node = this.createElementNSPlus("Layer", {attributes: {
-                    name: this.featureType,
-                    hidden: layer.visibility ? "0" : "1" }
-                });
-                this.writeNode("ows:Title", layer.name, node);
-                this.writeNode("InlineGeometry", layer, node);
-                return node;
-            },
-            "_GML": function(layer) {
-                var node = this.createElementNSPlus("Layer");
-                this.writeNode("ows:Title", layer.name, node);
-                this.writeNode("Server", {service: 
-                    OpenLayers.Format.Context.serviceTypes.GML, 
-                    url: layer.protocol.url, version: 
-                    layer.protocol.format.version}, node);
-                return node;
-            },
-            "_KML": function(layer) {
-                var node = this.createElementNSPlus("Layer");
-                this.writeNode("ows:Title", layer.name, node);
-                this.writeNode("Server", {service: 
-                    OpenLayers.Format.Context.serviceTypes.KML,
-                    version: layer.protocol.format.version, url: 
-                    layer.protocol.url}, node);
-                return node;
-            }
-        },
-        "gml": OpenLayers.Util.applyDefaults({
-            "boundedBy": function(bounds) {
-                var node = this.createElementNSPlus("gml:boundedBy");
-                this.writeNode("gml:Box", bounds, node);
-                return node;
-            }
-        }, OpenLayers.Format.GML.v2.prototype.writers.gml),
-        "ows": OpenLayers.Format.OWSCommon.v1_0_0.prototype.writers.ows,
-        "sld": OpenLayers.Format.SLD.v1_0_0.prototype.writers.sld,
-        "feature": OpenLayers.Format.GML.v2.prototype.writers.feature
-    },
-    
-    CLASS_NAME: "OpenLayers.Format.OWSContext.v0_3_1" 
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/QueryStringFilter.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/QueryStringFilter.js
deleted file mode 100644
index e33f7226..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/QueryStringFilter.js
+++ /dev/null
@@ -1,183 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Console.js
- * @requires OpenLayers/Format.js
- * @requires OpenLayers/Filter/Spatial.js
- * @requires OpenLayers/Filter/Comparison.js
- * @requires OpenLayers/Filter/Logical.js
- */
-
-/**
- * Class: OpenLayers.Format.QueryStringFilter
- * Parser for reading a query string and creating a simple filter.
- *
- * Inherits from:
- *  - <OpenLayers.Format>
- */
-OpenLayers.Format.QueryStringFilter = (function() {
-
-    /** 
-     * Map the OpenLayers.Filter.Comparison types to the operation strings of 
-     * the protocol.
-     */
-    var cmpToStr = {};
-    cmpToStr[OpenLayers.Filter.Comparison.EQUAL_TO] = "eq";
-    cmpToStr[OpenLayers.Filter.Comparison.NOT_EQUAL_TO] = "ne";
-    cmpToStr[OpenLayers.Filter.Comparison.LESS_THAN] = "lt";
-    cmpToStr[OpenLayers.Filter.Comparison.LESS_THAN_OR_EQUAL_TO] = "lte";
-    cmpToStr[OpenLayers.Filter.Comparison.GREATER_THAN] = "gt";
-    cmpToStr[OpenLayers.Filter.Comparison.GREATER_THAN_OR_EQUAL_TO] = "gte";
-    cmpToStr[OpenLayers.Filter.Comparison.LIKE] = "ilike";
-
-    /**
-     * Function: regex2value
-     * Convert the value from a regular expression string to a LIKE/ILIKE
-     * string known to the web service.
-     *
-     * Parameters:
-     * value - {String} The regex string.
-     *
-     * Returns:
-     * {String} The converted string.
-     */
-    function regex2value(value) {
-
-        // highly sensitive!! Do not change this without running the
-        // Protocol/HTTP.html unit tests
-
-        // convert % to \%
-        value = value.replace(/%/g, "\\%");
-
-        // convert \\. to \\_ (\\.* occurences converted later)
-        value = value.replace(/\\\\\.(\*)?/g, function($0, $1) {
-            return $1 ? $0 : "\\\\_";
-        });
-
-        // convert \\.* to \\%
-        value = value.replace(/\\\\\.\*/g, "\\\\%");
-
-        // convert . to _ (\. and .* occurences converted later)
-        value = value.replace(/(\\)?\.(\*)?/g, function($0, $1, $2) {
-            return $1 || $2 ? $0 : "_";
-        });
-
-        // convert .* to % (\.* occurnces converted later)
-        value = value.replace(/(\\)?\.\*/g, function($0, $1) {
-            return $1 ? $0 : "%";
-        });
-
-        // convert \. to .
-        value = value.replace(/\\\./g, ".");
-
-        // replace \* with * (watching out for \\*)
-        value = value.replace(/(\\)?\\\*/g, function($0, $1) {
-            return $1 ? $0 : "*";
-        });
-
-        return value;
-    }
-    
-    return OpenLayers.Class(OpenLayers.Format, {
-        
-        /**
-         * Property: wildcarded.
-         * {Boolean} If true percent signs are added around values
-         *     read from LIKE filters, for example if the protocol
-         *     read method is passed a LIKE filter whose property
-         *     is "foo" and whose value is "bar" the string
-         *     "foo__ilike=%bar%" will be sent in the query string;
-         *     defaults to false.
-         */
-        wildcarded: false,
-
-        /**
-         * APIProperty: srsInBBOX
-         * {Boolean} Include the SRS identifier in BBOX query string parameter.  
-         *     Default is false.  If true and the layer has a projection object set,
-         *     any BBOX filter will be serialized with a fifth item identifying the
-         *     projection.  E.g. bbox=-1000,-1000,1000,1000,EPSG:900913
-         */
-        srsInBBOX: false,
-
-        /**
-         * APIMethod: write
-         * Serialize an <OpenLayers.Filter> objects using the "simple" filter syntax for 
-         *     query string parameters.  This function must be called as a method of
-         *     a protocol instance.
-         *
-         * Parameters:
-         * filter - {<OpenLayers.Filter>} filter to convert.
-         * params - {Object} The parameters object.
-         *
-         * Returns:
-         * {Object} The resulting parameters object.
-         */
-        write: function(filter, params) {
-            params = params || {};
-            var className = filter.CLASS_NAME;
-            var filterType = className.substring(className.lastIndexOf(".") + 1);
-            switch (filterType) {
-                case "Spatial":
-                    switch (filter.type) {
-                        case OpenLayers.Filter.Spatial.BBOX:
-                            params.bbox = filter.value.toArray();
-                            if (this.srsInBBOX && filter.projection) {
-                                params.bbox.push(filter.projection.getCode());
-                            }
-                            break;
-                        case OpenLayers.Filter.Spatial.DWITHIN:
-                            params.tolerance = filter.distance;
-                            // no break here
-                        case OpenLayers.Filter.Spatial.WITHIN:
-                            params.lon = filter.value.x;
-                            params.lat = filter.value.y;
-                            break;
-                        default:
-                            OpenLayers.Console.warn(
-                                "Unknown spatial filter type " + filter.type);
-                    }
-                    break;
-                case "Comparison":
-                    var op = cmpToStr[filter.type];
-                    if (op !== undefined) {
-                        var value = filter.value;
-                        if (filter.type == OpenLayers.Filter.Comparison.LIKE) {
-                            value = regex2value(value);
-                            if (this.wildcarded) {
-                                value = "%" + value + "%";
-                            }
-                        }
-                        params[filter.property + "__" + op] = value;
-                        params.queryable = params.queryable || [];
-                        params.queryable.push(filter.property);
-                    } else {
-                        OpenLayers.Console.warn(
-                            "Unknown comparison filter type " + filter.type);
-                    }
-                    break;
-                case "Logical":
-                    if (filter.type === OpenLayers.Filter.Logical.AND) {
-                        for (var i=0,len=filter.filters.length; i<len; i++) {
-                            params = this.write(filter.filters[i], params);
-                        }
-                    } else {
-                        OpenLayers.Console.warn(
-                            "Unsupported logical filter type " + filter.type);
-                    }
-                    break;
-                default:
-                    OpenLayers.Console.warn("Unknown filter type " + filterType);
-            }
-            return params;
-        },
-        
-        CLASS_NAME: "OpenLayers.Format.QueryStringFilter"
-        
-    });
-
-
-})();
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/SLD.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/SLD.js
deleted file mode 100644
index 56e59d08..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/SLD.js
+++ /dev/null
@@ -1,81 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/XML/VersionedOGC.js
- * @requires OpenLayers/Style.js
- * @requires OpenLayers/Rule.js
- * @requires OpenLayers/Filter/FeatureId.js
- * @requires OpenLayers/Filter/Logical.js
- * @requires OpenLayers/Filter/Comparison.js
- * @requires OpenLayers/Filter/Spatial.js
- */
-
-/**
- * Class: OpenLayers.Format.SLD
- * Read/Write SLD. Create a new instance with the <OpenLayers.Format.SLD>
- *     constructor.
- * 
- * Inherits from:
- *  - <OpenLayers.Format.XML.VersionedOGC>
- */
-OpenLayers.Format.SLD = OpenLayers.Class(OpenLayers.Format.XML.VersionedOGC, {
-    
-    /**
-     * APIProperty: profile
-     * {String} If provided, use a custom profile.
-     *
-     * Currently supported profiles:
-     * - GeoServer - parses GeoServer vendor specific capabilities for SLD.
-     */
-    profile: null,
-
-    /**
-     * APIProperty: defaultVersion
-     * {String} Version number to assume if none found.  Default is "1.0.0".
-     */
-    defaultVersion: "1.0.0",
-    
-    /**
-     * APIProperty: stringifyOutput
-     * {Boolean} If true, write will return a string otherwise a DOMElement.
-     * Default is true.
-     */
-    stringifyOutput: true,
-    
-    /**
-     * APIProperty: namedLayersAsArray
-     * {Boolean} Generate a namedLayers array.  If false, the namedLayers
-     *     property value will be an object keyed by layer name. Default is
-     *     false.
-     */
-    namedLayersAsArray: false,
-    
-    /**
-     * APIMethod: write
-     * Write a SLD document given a list of styles.
-     *
-     * Parameters:
-     * sld - {Object} An object representing the SLD.
-     * options - {Object} Optional configuration object.
-     *
-     * Returns:
-     * {String} An SLD document string.
-     */
-    
-    /**
-     * APIMethod: read
-     * Read and SLD doc and return an object representing the SLD.
-     *
-     * Parameters:
-     * data - {String | DOMElement} Data to read.
-     * options - {Object} Options for the reader.
-     *
-     * Returns:
-     * {Object} An object representing the SLD.
-     */
-
-    CLASS_NAME: "OpenLayers.Format.SLD" 
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/SLD/v1.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/SLD/v1.js
deleted file mode 100644
index c43bac4f..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/SLD/v1.js
+++ /dev/null
@@ -1,1309 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Rule.js
- * @requires OpenLayers/Format/SLD.js
- * @requires OpenLayers/Format/Filter/v1_0_0.js
- * @requires OpenLayers/Symbolizer/Point.js
- * @requires OpenLayers/Symbolizer/Line.js
- * @requires OpenLayers/Symbolizer/Polygon.js
- * @requires OpenLayers/Symbolizer/Text.js
- * @requires OpenLayers/Symbolizer/Raster.js
- */
-
-/**
- * Class: OpenLayers.Format.SLD.v1
- * Superclass for SLD version 1 parsers.
- *
- * Inherits from:
- *  - <OpenLayers.Format.Filter.v1_0_0>
- */
-OpenLayers.Format.SLD.v1 = OpenLayers.Class(OpenLayers.Format.Filter.v1_0_0, {
-    
-    /**
-     * Property: namespaces
-     * {Object} Mapping of namespace aliases to namespace URIs.
-     */
-    namespaces: {
-        sld: "http://www.opengis.net/sld",
-        ogc: "http://www.opengis.net/ogc",
-        gml: "http://www.opengis.net/gml",
-        xlink: "http://www.w3.org/1999/xlink",
-        xsi: "http://www.w3.org/2001/XMLSchema-instance"
-    },
-    
-    /**
-     * Property: defaultPrefix
-     */
-    defaultPrefix: "sld",
-
-    /**
-     * Property: schemaLocation
-     * {String} Schema location for a particular minor version.
-     */
-    schemaLocation: null,
-    
-    /** 
-     * APIProperty: multipleSymbolizers
-     * {Boolean} Support multiple symbolizers per rule.  Default is false.  if
-     *     true, an OpenLayers.Style2 instance will be created to represent 
-     *     user styles instead of an OpenLayers.Style instace.  The 
-     *     OpenLayers.Style2 class allows collections of rules with multiple
-     *     symbolizers, but is not currently useful for client side rendering.
-     *     If multiple symbolizers is true, multiple FeatureTypeStyle elements
-     *     are preserved in reading/writing by setting symbolizer zIndex values.
-     *     In addition, the <defaultSymbolizer> property is ignored if 
-     *     multiple symbolizers are supported (defaults should be applied
-     *     when rendering).
-     */
-    multipleSymbolizers: false,
-
-    /**
-     * Property: featureTypeCounter
-     * {Number} Private counter for multiple feature type styles.
-     */
-    featureTypeCounter: null,
-
-    /**
-     * APIProperty: defaultSymbolizer.
-     * {Object} A symbolizer with the SLD defaults.
-     */
-    defaultSymbolizer: {
-        fillColor: "#808080",
-        fillOpacity: 1,
-        strokeColor: "#000000",
-        strokeOpacity: 1,
-        strokeWidth: 1,
-        strokeDashstyle: "solid",
-        pointRadius: 3,
-        graphicName: "square"
-    },
-    
-    /**
-     * Constructor: OpenLayers.Format.SLD.v1
-     * Instances of this class are not created directly.  Use the
-     *     <OpenLayers.Format.SLD> constructor instead.
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be set on
-     *     this instance.
-     */
-    
-    /**
-     * Method: read
-     *
-     * Parameters:
-     * data - {DOMElement} An SLD document element.
-     * options - {Object} Options for the reader.
-     *
-     * Valid options:
-     * namedLayersAsArray - {Boolean}  Generate a namedLayers array.  If false,
-     *     the namedLayers property value will be an object keyed by layer name.
-     *     Default is false.
-     *
-     * Returns:
-     * {Object} An object representing the SLD.
-     */
-    read: function(data, options) {
-        options = OpenLayers.Util.applyDefaults(options, this.options);
-        var sld = {
-            namedLayers: options.namedLayersAsArray === true ? [] : {}
-        };
-        this.readChildNodes(data, sld);
-        return sld;
-    },
-    
-    /**
-     * Property: readers
-     * Contains public functions, grouped by namespace prefix, that will
-     *     be applied when a namespaced node is found matching the function
-     *     name.  The function will be applied in the scope of this parser
-     *     with two arguments: the node being read and a context object passed
-     *     from the parent.
-     */
-    readers: OpenLayers.Util.applyDefaults({
-        "sld": {
-            "StyledLayerDescriptor": function(node, sld) {
-                sld.version = node.getAttribute("version");
-                this.readChildNodes(node, sld);
-            },
-            "Name": function(node, obj) {
-                obj.name = this.getChildValue(node);
-            },
-            "Title": function(node, obj) {
-                obj.title = this.getChildValue(node);
-            },
-            "Abstract": function(node, obj) {
-                obj.description = this.getChildValue(node);
-            },
-            "NamedLayer": function(node, sld) {
-                var layer = {
-                    userStyles: [],
-                    namedStyles: []
-                };
-                this.readChildNodes(node, layer);
-                // give each of the user styles this layer name
-                for(var i=0, len=layer.userStyles.length; i<len; ++i) {
-                    layer.userStyles[i].layerName = layer.name;
-                }
-                if(OpenLayers.Util.isArray(sld.namedLayers)) {
-                    sld.namedLayers.push(layer);                
-                } else {
-                    sld.namedLayers[layer.name] = layer;
-                }
-            },
-            "NamedStyle": function(node, layer) {
-                layer.namedStyles.push(
-                    this.getChildName(node.firstChild)
-                );
-            },
-            "UserStyle": function(node, layer) {
-                var obj = {defaultsPerSymbolizer: true, rules: []};
-                this.featureTypeCounter = -1;
-                this.readChildNodes(node, obj);
-                var style;
-                if (this.multipleSymbolizers) {
-                    delete obj.defaultsPerSymbolizer;
-                    style = new OpenLayers.Style2(obj);
-                } else {
-                    style = new OpenLayers.Style(this.defaultSymbolizer, obj);
-                }
-                layer.userStyles.push(style);
-            },
-            "IsDefault": function(node, style) {
-                if(this.getChildValue(node) == "1") {
-                    style.isDefault = true;
-                }
-            },
-            "FeatureTypeStyle": function(node, style) {
-                ++this.featureTypeCounter;
-                var obj = {
-                    rules: this.multipleSymbolizers ? style.rules : []
-                };
-                this.readChildNodes(node, obj);
-                if (!this.multipleSymbolizers) {
-                    style.rules = obj.rules;
-                }
-            },
-            "Rule": function(node, obj) {
-                var config;
-                if (this.multipleSymbolizers) {
-                    config = {symbolizers: []};
-                }
-                var rule = new OpenLayers.Rule(config);
-                this.readChildNodes(node, rule);
-                obj.rules.push(rule);
-            },
-            "ElseFilter": function(node, rule) {
-                rule.elseFilter = true;
-            },
-            "MinScaleDenominator": function(node, rule) {
-                rule.minScaleDenominator = parseFloat(this.getChildValue(node));
-            },
-            "MaxScaleDenominator": function(node, rule) {
-                rule.maxScaleDenominator = parseFloat(this.getChildValue(node));
-            },
-            "TextSymbolizer": function(node, rule) {
-                var config = {};
-                this.readChildNodes(node, config);
-                if (this.multipleSymbolizers) {
-                    config.zIndex = this.featureTypeCounter;
-                    rule.symbolizers.push(
-                        new OpenLayers.Symbolizer.Text(config)
-                    );
-                } else {
-                    rule.symbolizer["Text"] = OpenLayers.Util.applyDefaults(
-                        config, rule.symbolizer["Text"]
-                    );
-                }
-            },
-            "LabelPlacement": function(node, symbolizer) {
-                this.readChildNodes(node, symbolizer);
-            },
-            "PointPlacement": function(node, symbolizer) {
-                var config = {};
-                this.readChildNodes(node, config);
-                config.labelRotation = config.rotation;
-                delete config.rotation;
-                var labelAlign,
-                    x = symbolizer.labelAnchorPointX,
-                    y = symbolizer.labelAnchorPointY;
-                if (x <= 1/3) {
-                    labelAlign = 'l';
-                } else if (x > 1/3 && x < 2/3) {
-                    labelAlign = 'c';
-                } else if (x >= 2/3) {
-                    labelAlign = 'r';
-                }
-                if (y <= 1/3) {
-                    labelAlign += 'b';
-                } else if (y > 1/3 && y < 2/3) {
-                    labelAlign += 'm';
-                } else if (y >= 2/3) {
-                    labelAlign += 't';
-                }
-                config.labelAlign = labelAlign;
-                OpenLayers.Util.applyDefaults(symbolizer, config);
-            },
-            "AnchorPoint": function(node, symbolizer) {
-                this.readChildNodes(node, symbolizer);
-            },
-            "AnchorPointX": function(node, symbolizer) {
-                var labelAnchorPointX = this.readers.ogc._expression.call(this, node);
-                // always string, could be empty string
-                if(labelAnchorPointX) {
-                    symbolizer.labelAnchorPointX = labelAnchorPointX;
-                }
-            },
-            "AnchorPointY": function(node, symbolizer) {
-                var labelAnchorPointY = this.readers.ogc._expression.call(this, node);
-                // always string, could be empty string
-                if(labelAnchorPointY) {
-                    symbolizer.labelAnchorPointY = labelAnchorPointY;
-                }
-            },
-            "Displacement": function(node, symbolizer) {
-                this.readChildNodes(node, symbolizer);
-            },
-            "DisplacementX": function(node, symbolizer) {
-                var labelXOffset = this.readers.ogc._expression.call(this, node);
-                // always string, could be empty string
-                if(labelXOffset) {
-                    symbolizer.labelXOffset = labelXOffset;
-                }
-            },
-            "DisplacementY": function(node, symbolizer) {
-                var labelYOffset = this.readers.ogc._expression.call(this, node);
-                // always string, could be empty string
-                if(labelYOffset) {
-                    symbolizer.labelYOffset = labelYOffset;
-                }
-            },
-            "LinePlacement": function(node, symbolizer) {
-                this.readChildNodes(node, symbolizer);
-            },
-            "PerpendicularOffset": function(node, symbolizer) {
-                var labelPerpendicularOffset = this.readers.ogc._expression.call(this, node);
-                // always string, could be empty string
-                if(labelPerpendicularOffset) {
-                    symbolizer.labelPerpendicularOffset = labelPerpendicularOffset;
-                }
-            },
-            "Label": function(node, symbolizer) {
-                var value = this.readers.ogc._expression.call(this, node);
-                if (value) {
-                    symbolizer.label = value;
-                }
-            },
-            "Font": function(node, symbolizer) {
-                this.readChildNodes(node, symbolizer);
-            },
-            "Halo": function(node, symbolizer) {
-                // halo has a fill, so send fresh object
-                var obj = {};
-                this.readChildNodes(node, obj);
-                symbolizer.haloRadius = obj.haloRadius;
-                symbolizer.haloColor = obj.fillColor;
-                symbolizer.haloOpacity = obj.fillOpacity;
-            },
-            "Radius": function(node, symbolizer) {
-                var radius = this.readers.ogc._expression.call(this, node);
-                if(radius != null) {
-                    // radius is only used for halo
-                    symbolizer.haloRadius = radius;
-                }
-            },
-            "RasterSymbolizer": function(node, rule) {
-                var config = {};
-                this.readChildNodes(node, config);
-                if (this.multipleSymbolizers) {
-                    config.zIndex = this.featureTypeCounter;
-                    rule.symbolizers.push(
-                        new OpenLayers.Symbolizer.Raster(config)
-                    );
-                } else {
-                    rule.symbolizer["Raster"] = OpenLayers.Util.applyDefaults(
-                        config, rule.symbolizer["Raster"]
-                    );
-                }
-            },
-            "Geometry": function(node, obj) {
-                obj.geometry = {};
-                this.readChildNodes(node, obj.geometry);
-            },
-            "ColorMap": function(node, symbolizer) {
-                symbolizer.colorMap = [];
-                this.readChildNodes(node, symbolizer.colorMap);
-            },
-            "ColorMapEntry": function(node, colorMap) {
-                var q = node.getAttribute("quantity");
-                var o = node.getAttribute("opacity");
-                colorMap.push({
-                    color: node.getAttribute("color"),
-                    quantity: q !== null ? parseFloat(q) : undefined,
-                    label: node.getAttribute("label") || undefined,
-                    opacity: o !== null ? parseFloat(o) : undefined
-                });
-            },
-            "LineSymbolizer": function(node, rule) {
-                var config = {};
-                this.readChildNodes(node, config);
-                if (this.multipleSymbolizers) {
-                    config.zIndex = this.featureTypeCounter;
-                    rule.symbolizers.push(
-                        new OpenLayers.Symbolizer.Line(config)
-                    );
-                } else {
-                    rule.symbolizer["Line"] = OpenLayers.Util.applyDefaults(
-                        config, rule.symbolizer["Line"]
-                    );
-                }
-            },
-            "PolygonSymbolizer": function(node, rule) {
-                var config = {
-                    fill: false,
-                    stroke: false
-                };
-                if (!this.multipleSymbolizers) {
-                    config = rule.symbolizer["Polygon"] || config;
-                }
-                this.readChildNodes(node, config);
-                if (this.multipleSymbolizers) {
-                    config.zIndex = this.featureTypeCounter;
-                    rule.symbolizers.push(
-                        new OpenLayers.Symbolizer.Polygon(config)
-                    );
-                } else {
-                    rule.symbolizer["Polygon"] = config;
-                }
-            },
-            "PointSymbolizer": function(node, rule) {
-                var config = {
-                    fill: false,
-                    stroke: false,
-                    graphic: false
-                };
-                if (!this.multipleSymbolizers) {
-                    config = rule.symbolizer["Point"] || config;
-                }
-                this.readChildNodes(node, config);
-                if (this.multipleSymbolizers) {
-                    config.zIndex = this.featureTypeCounter;
-                    rule.symbolizers.push(
-                        new OpenLayers.Symbolizer.Point(config)
-                    );
-                } else {
-                    rule.symbolizer["Point"] = config;
-                }
-            },
-            "Stroke": function(node, symbolizer) {
-                symbolizer.stroke = true;
-                this.readChildNodes(node, symbolizer);
-            },
-            "Fill": function(node, symbolizer) {
-                symbolizer.fill = true;
-                this.readChildNodes(node, symbolizer);
-            },
-            "CssParameter": function(node, symbolizer) {
-                var cssProperty = node.getAttribute("name");
-                var symProperty = this.cssMap[cssProperty];
-                // for labels, fill should map to fontColor and fill-opacity 
-                // to fontOpacity
-                if (symbolizer.label) {
-                    if (cssProperty === 'fill') {
-                        symProperty = "fontColor";
-                    } else if (cssProperty === 'fill-opacity') {
-                        symProperty = "fontOpacity";
-                    }
-                }
-                if(symProperty) {
-                    // Limited support for parsing of OGC expressions
-                    var value = this.readers.ogc._expression.call(this, node);
-                    // always string, could be an empty string
-                    if(value) {
-                        symbolizer[symProperty] = value;
-                    }
-                }
-            },
-            "Graphic": function(node, symbolizer) {
-                symbolizer.graphic = true;
-                var graphic = {};
-                // painter's order not respected here, clobber previous with next
-                this.readChildNodes(node, graphic);
-                // directly properties with names that match symbolizer properties
-                var properties = [
-                    "stroke", "strokeColor", "strokeWidth", "strokeOpacity",
-                    "strokeLinecap", "fill", "fillColor", "fillOpacity",
-                    "graphicName", "rotation", "graphicFormat"
-                ];
-                var prop, value;
-                for(var i=0, len=properties.length; i<len; ++i) {
-                    prop = properties[i];
-                    value = graphic[prop];
-                    if(value != undefined) {
-                        symbolizer[prop] = value;
-                    }
-                }
-                // set other generic properties with specific graphic property names
-                if(graphic.opacity != undefined) {
-                    symbolizer.graphicOpacity = graphic.opacity;
-                }
-                if(graphic.size != undefined) {
-                    var pointRadius = graphic.size / 2;
-                    if (isNaN(pointRadius)) {
-                        // likely a property name
-                        symbolizer.graphicWidth = graphic.size;
-                    } else {
-                        symbolizer.pointRadius = graphic.size / 2;
-                    }
-                }
-                if(graphic.href != undefined) {
-                    symbolizer.externalGraphic = graphic.href;
-                }
-                if(graphic.rotation != undefined) {
-                    symbolizer.rotation = graphic.rotation;
-                }
-            },
-            "ExternalGraphic": function(node, graphic) {
-                this.readChildNodes(node, graphic);
-            },
-            "Mark": function(node, graphic) {
-                this.readChildNodes(node, graphic);
-            },
-            "WellKnownName": function(node, graphic) {
-                graphic.graphicName = this.getChildValue(node);
-            },
-            "Opacity": function(node, obj) {
-                var opacity = this.readers.ogc._expression.call(this, node);
-                // always string, could be empty string
-                if(opacity) {
-                    obj.opacity = opacity;
-                }
-            },
-            "Size": function(node, obj) {
-                var size = this.readers.ogc._expression.call(this, node);
-                // always string, could be empty string
-                if(size) {
-                    obj.size = size;
-                }
-            },
-            "Rotation": function(node, obj) {
-                var rotation = this.readers.ogc._expression.call(this, node);
-                // always string, could be empty string
-                if(rotation) {
-                    obj.rotation = rotation;
-                }
-            },
-            "OnlineResource": function(node, obj) {
-                obj.href = this.getAttributeNS(
-                    node, this.namespaces.xlink, "href"
-                );
-            },
-            "Format": function(node, graphic) {
-                graphic.graphicFormat = this.getChildValue(node);
-            }
-        }
-    }, OpenLayers.Format.Filter.v1_0_0.prototype.readers),
-    
-    /**
-     * Property: cssMap
-     * {Object} Object mapping supported css property names to OpenLayers
-     *     symbolizer property names.
-     */
-    cssMap: {
-        "stroke": "strokeColor",
-        "stroke-opacity": "strokeOpacity",
-        "stroke-width": "strokeWidth",
-        "stroke-linecap": "strokeLinecap",
-        "stroke-dasharray": "strokeDashstyle",
-        "fill": "fillColor",
-        "fill-opacity": "fillOpacity",
-        "font-family": "fontFamily",
-        "font-size": "fontSize",
-        "font-weight": "fontWeight",
-        "font-style": "fontStyle"
-    },
-    
-    /**
-     * Method: getCssProperty
-     * Given a symbolizer property, get the corresponding CSS property
-     *     from the <cssMap>.
-     *
-     * Parameters:
-     * sym - {String} A symbolizer property name.
-     *
-     * Returns:
-     * {String} A CSS property name or null if none found.
-     */
-    getCssProperty: function(sym) {
-        var css = null;
-        for(var prop in this.cssMap) {
-            if(this.cssMap[prop] == sym) {
-                css = prop;
-                break;
-            }
-        }
-        return css;
-    },
-    
-    /**
-     * Method: getGraphicFormat
-     * Given a href for an external graphic, try to determine the mime-type.
-     *     This method doesn't try too hard, and will fall back to
-     *     <defaultGraphicFormat> if one of the known <graphicFormats> is not
-     *     the file extension of the provided href.
-     *
-     * Parameters:
-     * href - {String}
-     *
-     * Returns:
-     * {String} The graphic format.
-     */
-    getGraphicFormat: function(href) {
-        var format, regex;
-        for(var key in this.graphicFormats) {
-            if(this.graphicFormats[key].test(href)) {
-                format = key;
-                break;
-            }
-        }
-        return format || this.defaultGraphicFormat;
-    },
-    
-    /**
-     * Property: defaultGraphicFormat
-     * {String} If none other can be determined from <getGraphicFormat>, this
-     *     default will be returned.
-     */
-    defaultGraphicFormat: "image/png",
-    
-    /**
-     * Property: graphicFormats
-     * {Object} Mapping of image mime-types to regular extensions matching 
-     *     well-known file extensions.
-     */
-    graphicFormats: {
-        "image/jpeg": /\.jpe?g$/i,
-        "image/gif": /\.gif$/i,
-        "image/png": /\.png$/i
-    },
-
-    /**
-     * Method: write
-     *
-     * Parameters:
-     * sld - {Object} An object representing the SLD.
-     *
-     * Returns:
-     * {DOMElement} The root of an SLD document.
-     */
-    write: function(sld) {
-        return this.writers.sld.StyledLayerDescriptor.apply(this, [sld]);
-    },
-    
-    /**
-     * Property: writers
-     * As a compliment to the readers property, this structure contains public
-     *     writing functions grouped by namespace alias and named like the
-     *     node names they produce.
-     */
-    writers: OpenLayers.Util.applyDefaults({
-        "sld": {
-            "_OGCExpression": function(nodeName, value) {
-                // only the simplest of ogc:expression handled
-                // {label: "some text and a ${propertyName}"}
-                var node = this.createElementNSPlus(nodeName);
-                var tokens = typeof value == "string" ?
-                    value.split("${") :
-                    [value];
-                node.appendChild(this.createTextNode(tokens[0]));
-                var item, last;
-                for(var i=1, len=tokens.length; i<len; i++) {
-                    item = tokens[i];
-                    last = item.indexOf("}"); 
-                    if(last > 0) {
-                        this.writeNode(
-                            "ogc:PropertyName",
-                            {property: item.substring(0, last)},
-                            node
-                        );
-                        node.appendChild(
-                            this.createTextNode(item.substring(++last))
-                        );
-                    } else {
-                        // no ending }, so this is a literal ${
-                        node.appendChild(
-                            this.createTextNode("${" + item)
-                        );
-                    }
-                }
-                return node;
-            },
-            "StyledLayerDescriptor": function(sld) {
-                var root = this.createElementNSPlus(
-                    "sld:StyledLayerDescriptor",
-                    {attributes: {
-                        "version": this.VERSION,
-                        "xsi:schemaLocation": this.schemaLocation
-                    }}
-                );
-
-                // For ArcGIS Server it is necessary to define this
-                // at the root level (see ticket:2166).
-                root.setAttribute("xmlns:ogc", this.namespaces.ogc);
-                root.setAttribute("xmlns:gml", this.namespaces.gml);
-
-                // add in optional name
-                if(sld.name) {
-                    this.writeNode("Name", sld.name, root);
-                }
-                // add in optional title
-                if(sld.title) {
-                    this.writeNode("Title", sld.title, root);
-                }
-                // add in optional description
-                if(sld.description) {
-                    this.writeNode("Abstract", sld.description, root);
-                }
-                // add in named layers
-                // allow namedLayers to be an array
-                if(OpenLayers.Util.isArray(sld.namedLayers)) {
-                    for(var i=0, len=sld.namedLayers.length; i<len; ++i) {
-                        this.writeNode("NamedLayer", sld.namedLayers[i], root);
-                    }
-                } else {
-                    for(var name in sld.namedLayers) {
-                        this.writeNode("NamedLayer", sld.namedLayers[name], root);
-                    }
-                }
-                return root;
-            },
-            "Name": function(name) {
-                return this.createElementNSPlus("sld:Name", {value: name});
-            },
-            "Title": function(title) {
-                return this.createElementNSPlus("sld:Title", {value: title});
-            },
-            "Abstract": function(description) {
-                return this.createElementNSPlus(
-                    "sld:Abstract", {value: description}
-                );
-            },
-            "NamedLayer": function(layer) {
-                var node = this.createElementNSPlus("sld:NamedLayer");
-
-                // add in required name
-                this.writeNode("Name", layer.name, node);
-
-                // optional sld:LayerFeatureConstraints here
-
-                // add in named styles
-                if(layer.namedStyles) {
-                    for(var i=0, len=layer.namedStyles.length; i<len; ++i) {
-                        this.writeNode(
-                            "NamedStyle", layer.namedStyles[i], node
-                        );
-                    }
-                }
-                
-                // add in user styles
-                if(layer.userStyles) {
-                    for(var i=0, len=layer.userStyles.length; i<len; ++i) {
-                        this.writeNode(
-                            "UserStyle", layer.userStyles[i], node
-                        );
-                    }
-                }
-                
-                return node;
-            },
-            "NamedStyle": function(name) {
-                var node = this.createElementNSPlus("sld:NamedStyle");
-                this.writeNode("Name", name, node);
-                return node;
-            },
-            "UserStyle": function(style) {
-                var node = this.createElementNSPlus("sld:UserStyle");
-
-                // add in optional name
-                if(style.name) {
-                    this.writeNode("Name", style.name, node);
-                }
-                // add in optional title
-                if(style.title) {
-                    this.writeNode("Title", style.title, node);
-                }
-                // add in optional description
-                if(style.description) {
-                    this.writeNode("Abstract", style.description, node);
-                }
-                
-                // add isdefault
-                if(style.isDefault) {
-                    this.writeNode("IsDefault", style.isDefault, node);
-                }
-                
-                // add FeatureTypeStyles
-                if (this.multipleSymbolizers && style.rules) {
-                    // group style objects by symbolizer zIndex
-                    var rulesByZ = {
-                        0: []
-                    };
-                    var zValues = [0];
-                    var rule, ruleMap, symbolizer, zIndex, clone;
-                    for (var i=0, ii=style.rules.length; i<ii; ++i) {
-                        rule = style.rules[i];
-                        if (rule.symbolizers) {
-                            ruleMap = {};
-                            for (var j=0, jj=rule.symbolizers.length; j<jj; ++j) {
-                                symbolizer = rule.symbolizers[j];
-                                zIndex = symbolizer.zIndex;
-                                if (!(zIndex in ruleMap)) {
-                                    clone = rule.clone();
-                                    clone.symbolizers = [];
-                                    ruleMap[zIndex] = clone;
-                                }
-                                ruleMap[zIndex].symbolizers.push(symbolizer.clone());
-                            }
-                            for (zIndex in ruleMap) {
-                                if (!(zIndex in rulesByZ)) {
-                                    zValues.push(zIndex);
-                                    rulesByZ[zIndex] = [];
-                                }
-                                rulesByZ[zIndex].push(ruleMap[zIndex]);
-                            }
-                        } else {
-                            // no symbolizers in rule
-                            rulesByZ[0].push(rule.clone());
-                        }
-                    }
-                    // write one FeatureTypeStyle per zIndex
-                    zValues.sort();
-                    var rules;
-                    for (var i=0, ii=zValues.length; i<ii; ++i) {
-                        rules = rulesByZ[zValues[i]];
-                        if (rules.length > 0) {
-                            clone = style.clone();
-                            clone.rules = rulesByZ[zValues[i]];
-                            this.writeNode("FeatureTypeStyle", clone, node);
-                        }
-                    }                    
-                } else {
-                    this.writeNode("FeatureTypeStyle", style, node);
-                }
-                
-                return node;
-            },
-            "IsDefault": function(bool) {
-                return this.createElementNSPlus(
-                    "sld:IsDefault", {value: (bool) ? "1" : "0"}
-                );
-            },
-            "FeatureTypeStyle": function(style) {
-                var node = this.createElementNSPlus("sld:FeatureTypeStyle");
-                
-                // OpenLayers currently stores no Name, Title, Abstract,
-                // FeatureTypeName, or SemanticTypeIdentifier information
-                // related to FeatureTypeStyle
-                
-                // add in rules
-                for(var i=0, len=style.rules.length; i<len; ++i) {
-                    this.writeNode("Rule", style.rules[i], node);
-                }
-                
-                return node;
-            },
-            "Rule": function(rule) {
-                var node = this.createElementNSPlus("sld:Rule");
-
-                // add in optional name
-                if(rule.name) {
-                    this.writeNode("Name", rule.name, node);
-                }
-                // add in optional title
-                if(rule.title) {
-                    this.writeNode("Title", rule.title, node);
-                }
-                // add in optional description
-                if(rule.description) {
-                    this.writeNode("Abstract", rule.description, node);
-                }
-                
-                // add in LegendGraphic here
-                
-                // add in optional filters
-                if(rule.elseFilter) {
-                    this.writeNode("ElseFilter", null, node);
-                } else if(rule.filter) {
-                    this.writeNode("ogc:Filter", rule.filter, node);
-                }
-                
-                // add in scale limits
-                if(rule.minScaleDenominator != undefined) {
-                    this.writeNode(
-                        "MinScaleDenominator", rule.minScaleDenominator, node
-                    );
-                }
-                if(rule.maxScaleDenominator != undefined) {
-                    this.writeNode(
-                        "MaxScaleDenominator", rule.maxScaleDenominator, node
-                    );
-                }
-                
-                var type, symbolizer;
-                if (this.multipleSymbolizers && rule.symbolizers) {
-                    var symbolizer;
-                    for (var i=0, ii=rule.symbolizers.length; i<ii; ++i) {
-                        symbolizer = rule.symbolizers[i];
-                        type = symbolizer.CLASS_NAME.split(".").pop();
-                        this.writeNode(
-                            type + "Symbolizer", symbolizer, node
-                        );
-                    }
-                } else {
-                    // add in symbolizers (relies on geometry type keys)
-                    var types = OpenLayers.Style.SYMBOLIZER_PREFIXES;
-                    for(var i=0, len=types.length; i<len; ++i) {
-                        type = types[i];
-                        symbolizer = rule.symbolizer[type];
-                        if(symbolizer) {
-                            this.writeNode(
-                                type + "Symbolizer", symbolizer, node
-                            );
-                        }
-                    }
-                }
-                return node;
-
-            },
-            "ElseFilter": function() {
-                return this.createElementNSPlus("sld:ElseFilter");
-            },
-            "MinScaleDenominator": function(scale) {
-                return this.createElementNSPlus(
-                    "sld:MinScaleDenominator", {value: scale}
-                );
-            },
-            "MaxScaleDenominator": function(scale) {
-                return this.createElementNSPlus(
-                    "sld:MaxScaleDenominator", {value: scale}
-                );
-            },
-            "LineSymbolizer": function(symbolizer) {
-                var node = this.createElementNSPlus("sld:LineSymbolizer");
-                this.writeNode("Stroke", symbolizer, node);
-                return node;
-            },
-            "Stroke": function(symbolizer) {
-                var node = this.createElementNSPlus("sld:Stroke");
-
-                // GraphicFill here
-                // GraphicStroke here
-
-                // add in CssParameters
-                if(symbolizer.strokeColor != undefined) {
-                    this.writeNode(
-                        "CssParameter",
-                        {symbolizer: symbolizer, key: "strokeColor"},
-                        node
-                    );
-                }
-                if(symbolizer.strokeOpacity != undefined) {
-                    this.writeNode(
-                        "CssParameter",
-                        {symbolizer: symbolizer, key: "strokeOpacity"},
-                        node
-                    );
-                }
-                if(symbolizer.strokeWidth != undefined) {
-                    this.writeNode(
-                        "CssParameter",
-                        {symbolizer: symbolizer, key: "strokeWidth"},
-                        node
-                    );
-                }
-                if(symbolizer.strokeDashstyle != undefined && symbolizer.strokeDashstyle !== "solid") {
-                    // assumes valid stroke-dasharray value
-                    this.writeNode(
-                        "CssParameter", 
-                        {symbolizer: symbolizer, key: "strokeDashstyle"},
-                        node
-                    );
-                }
-                if(symbolizer.strokeLinecap != undefined) {
-                    this.writeNode(
-                        "CssParameter", 
-                        {symbolizer: symbolizer, key: "strokeLinecap"},
-                        node
-                    );
-                }
-                return node;
-            },
-            "CssParameter": function(obj) {
-                // not handling ogc:expressions for now
-                return this.createElementNSPlus("sld:CssParameter", {
-                    attributes: {name: this.getCssProperty(obj.key)},
-                    value: obj.symbolizer[obj.key]
-                });
-            },
-            "TextSymbolizer": function(symbolizer) {
-                var node = this.createElementNSPlus("sld:TextSymbolizer");
-                // add in optional Label
-                if(symbolizer.label != null) {
-                    this.writeNode("Label", symbolizer.label, node);
-                }
-                // add in optional Font
-                if(symbolizer.fontFamily != null ||
-                    symbolizer.fontSize != null ||
-                    symbolizer.fontWeight != null ||
-                    symbolizer.fontStyle != null) {
-                        this.writeNode("Font", symbolizer, node);
-                }
-                // add in optional LabelPlacement
-                if (symbolizer.labelAnchorPointX != null ||
-                    symbolizer.labelAnchorPointY != null || 
-                    symbolizer.labelAlign != null ||
-                    symbolizer.labelXOffset != null ||
-                    symbolizer.labelYOffset != null ||
-                    symbolizer.labelRotation != null ||
-                    symbolizer.labelPerpendicularOffset != null) {
-                        this.writeNode("LabelPlacement", symbolizer, node);
-                }
-                // add in optional Halo
-                if(symbolizer.haloRadius != null ||
-                    symbolizer.haloColor != null ||
-                    symbolizer.haloOpacity != null) {
-                        this.writeNode("Halo", symbolizer, node);
-                }
-                // add in optional Fill
-                if(symbolizer.fontColor != null ||
-                   symbolizer.fontOpacity != null) {
-                    this.writeNode("Fill", {
-                        fillColor: symbolizer.fontColor,
-                        fillOpacity: symbolizer.fontOpacity
-                    }, node);
-                }
-                return node;
-            },
-            "LabelPlacement": function(symbolizer) {
-                var node = this.createElementNSPlus("sld:LabelPlacement");
-                // PointPlacement and LinePlacement are choices, so don't output both
-                if ((symbolizer.labelAnchorPointX != null ||
-                    symbolizer.labelAnchorPointY != null ||
-                    symbolizer.labelAlign != null ||
-                    symbolizer.labelXOffset != null ||
-                    symbolizer.labelYOffset != null ||
-                    symbolizer.labelRotation != null) && 
-                    symbolizer.labelPerpendicularOffset == null) {
-                        this.writeNode("PointPlacement", symbolizer, node);
-                }
-                if (symbolizer.labelPerpendicularOffset != null) {
-                    this.writeNode("LinePlacement", symbolizer, node);
-                }
-                return node;
-            },
-            "LinePlacement": function(symbolizer) {
-                var node = this.createElementNSPlus("sld:LinePlacement");
-                this.writeNode("PerpendicularOffset", symbolizer.labelPerpendicularOffset, node);
-                return node;
-            },
-            "PerpendicularOffset": function(value) {
-                return this.createElementNSPlus("sld:PerpendicularOffset", {
-                    value: value
-                });
-            },
-            "PointPlacement": function(symbolizer) {
-                var node = this.createElementNSPlus("sld:PointPlacement");
-                if (symbolizer.labelAnchorPointX != null ||
-                    symbolizer.labelAnchorPointY != null ||
-                    symbolizer.labelAlign != null) {
-                        this.writeNode("AnchorPoint", symbolizer, node);
-                }
-                if (symbolizer.labelXOffset != null ||
-                    symbolizer.labelYOffset != null) {
-                        this.writeNode("Displacement", symbolizer, node);
-                }
-                if (symbolizer.labelRotation != null) {
-                    this.writeNode("Rotation", symbolizer.labelRotation, node);
-                }
-                return node;
-            },
-            "AnchorPoint": function(symbolizer) {
-                var node = this.createElementNSPlus("sld:AnchorPoint");
-                var x = symbolizer.labelAnchorPointX,
-                    y = symbolizer.labelAnchorPointY;
-                if (x != null) {
-                    this.writeNode("AnchorPointX", x, node);
-                }
-                if (y != null) {
-                    this.writeNode("AnchorPointY", y, node);
-                }
-                if (x == null && y == null) {
-                    var xAlign = symbolizer.labelAlign.substr(0, 1),
-                        yAlign = symbolizer.labelAlign.substr(1, 1);
-                    if (xAlign === "l") {
-                        x = 0;
-                    } else if (xAlign === "c") {
-                        x = 0.5;
-                    } else if (xAlign === "r") {
-                        x = 1;
-                    }
-                    if (yAlign === "b") {
-                        y = 0;
-                    } else if (yAlign === "m") {
-                        y = 0.5;
-                    } else if (yAlign === "t") {
-                        y = 1;
-                    }
-                    this.writeNode("AnchorPointX", x, node);
-                    this.writeNode("AnchorPointY", y, node);
-                }
-                return node;
-            },
-            "AnchorPointX": function(value) {
-                return this.createElementNSPlus("sld:AnchorPointX", {
-                    value: value
-                }); 
-            },
-            "AnchorPointY": function(value) {
-                return this.createElementNSPlus("sld:AnchorPointY", {
-                    value: value
-                });
-            },
-            "Displacement": function(symbolizer) {
-                var node = this.createElementNSPlus("sld:Displacement");
-                if (symbolizer.labelXOffset != null) {
-                    this.writeNode("DisplacementX", symbolizer.labelXOffset, node);
-                }
-                if (symbolizer.labelYOffset != null) {
-                    this.writeNode("DisplacementY", symbolizer.labelYOffset, node);
-                }
-                return node;
-            },
-            "DisplacementX": function(value) {
-                return this.createElementNSPlus("sld:DisplacementX", {
-                    value: value
-                });
-            },
-            "DisplacementY": function(value) {
-                return this.createElementNSPlus("sld:DisplacementY", {
-                    value: value
-                });
-            },
-            "Font": function(symbolizer) {
-                var node = this.createElementNSPlus("sld:Font");
-                // add in CssParameters
-                if(symbolizer.fontFamily) {
-                    this.writeNode(
-                        "CssParameter",
-                        {symbolizer: symbolizer, key: "fontFamily"},
-                        node
-                    );
-                }
-                if(symbolizer.fontSize) {
-                    this.writeNode(
-                        "CssParameter",
-                        {symbolizer: symbolizer, key: "fontSize"},
-                        node
-                    );
-                }
-                if(symbolizer.fontWeight) {
-                    this.writeNode(
-                        "CssParameter",
-                        {symbolizer: symbolizer, key: "fontWeight"},
-                        node
-                    );
-                }
-                if(symbolizer.fontStyle) {
-                    this.writeNode(
-                        "CssParameter",
-                        {symbolizer: symbolizer, key: "fontStyle"},
-                        node
-                    );
-                }
-                return node;
-            },
-            "Label": function(label) {
-                return this.writers.sld._OGCExpression.call(
-                    this, "sld:Label", label
-                );
-            },
-            "Halo": function(symbolizer) {
-                var node = this.createElementNSPlus("sld:Halo");
-                if(symbolizer.haloRadius) {
-                    this.writeNode("Radius", symbolizer.haloRadius, node);
-                }
-                if(symbolizer.haloColor || symbolizer.haloOpacity) {
-                    this.writeNode("Fill", {
-                        fillColor: symbolizer.haloColor,
-                        fillOpacity: symbolizer.haloOpacity
-                    }, node);
-                }
-                return node;
-            },
-            "Radius": function(value) {
-                return this.createElementNSPlus("sld:Radius", {
-                    value: value
-                });
-            },
-            "RasterSymbolizer": function(symbolizer) {
-                var node = this.createElementNSPlus("sld:RasterSymbolizer");
-                if (symbolizer.geometry) {
-                    this.writeNode("Geometry", symbolizer.geometry, node);
-                }
-                if (symbolizer.opacity) {
-                    this.writeNode("Opacity", symbolizer.opacity, node);
-                }
-                if (symbolizer.colorMap) {
-                    this.writeNode("ColorMap", symbolizer.colorMap, node);
-                }
-                return node;
-            },
-            "Geometry": function(geometry) {
-                var node = this.createElementNSPlus("sld:Geometry");
-                if (geometry.property) {
-                    this.writeNode("ogc:PropertyName", geometry, node);
-                }
-                return node;
-            },
-            "ColorMap": function(colorMap) {
-                var node = this.createElementNSPlus("sld:ColorMap");
-                for (var i=0, len=colorMap.length; i<len; ++i) {
-                    this.writeNode("ColorMapEntry", colorMap[i], node);
-                }
-                return node;
-            },
-            "ColorMapEntry": function(colorMapEntry) {
-                var node = this.createElementNSPlus("sld:ColorMapEntry");
-                var a = colorMapEntry;
-                node.setAttribute("color", a.color);
-                a.opacity !== undefined && node.setAttribute("opacity",
-                    parseFloat(a.opacity));
-                a.quantity !== undefined && node.setAttribute("quantity",
-                    parseFloat(a.quantity));
-                a.label !== undefined && node.setAttribute("label", a.label);
-                return node;
-            },
-            "PolygonSymbolizer": function(symbolizer) {
-                var node = this.createElementNSPlus("sld:PolygonSymbolizer");
-                if(symbolizer.fill !== false) {
-                    this.writeNode("Fill", symbolizer, node);
-                }
-                if(symbolizer.stroke !== false) {
-                    this.writeNode("Stroke", symbolizer, node);
-                }
-                return node;
-            },
-            "Fill": function(symbolizer) {
-                var node = this.createElementNSPlus("sld:Fill");
-                
-                // GraphicFill here
-                
-                // add in CssParameters
-                if(symbolizer.fillColor) {
-                    this.writeNode(
-                        "CssParameter",
-                        {symbolizer: symbolizer, key: "fillColor"},
-                        node
-                    );
-                }
-                if(symbolizer.fillOpacity != null) {
-                    this.writeNode(
-                        "CssParameter",
-                        {symbolizer: symbolizer, key: "fillOpacity"},
-                        node
-                    );
-                }
-                return node;
-            },
-            "PointSymbolizer": function(symbolizer) {
-                var node = this.createElementNSPlus("sld:PointSymbolizer");
-                this.writeNode("Graphic", symbolizer, node);
-                return node;
-            },
-            "Graphic": function(symbolizer) {
-                var node = this.createElementNSPlus("sld:Graphic");
-                if(symbolizer.externalGraphic != undefined) {
-                    this.writeNode("ExternalGraphic", symbolizer, node);
-                } else {
-                    this.writeNode("Mark", symbolizer, node);
-                }
-                
-                if(symbolizer.graphicOpacity != undefined) {
-                    this.writeNode("Opacity", symbolizer.graphicOpacity, node);
-                }
-                if(symbolizer.pointRadius != undefined) {
-                    this.writeNode("Size", symbolizer.pointRadius * 2, node);
-                } else if (symbolizer.graphicWidth != undefined) {
-                    this.writeNode("Size", symbolizer.graphicWidth, node);
-                }
-                if(symbolizer.rotation != undefined) {
-                    this.writeNode("Rotation", symbolizer.rotation, node);
-                }
-                return node;
-            },
-            "ExternalGraphic": function(symbolizer) {
-                var node = this.createElementNSPlus("sld:ExternalGraphic");
-                this.writeNode(
-                    "OnlineResource", symbolizer.externalGraphic, node
-                );
-                var format = symbolizer.graphicFormat ||
-                             this.getGraphicFormat(symbolizer.externalGraphic);
-                this.writeNode("Format", format, node);
-                return node;
-            },
-            "Mark": function(symbolizer) {
-                var node = this.createElementNSPlus("sld:Mark");
-                if(symbolizer.graphicName) {
-                    this.writeNode("WellKnownName", symbolizer.graphicName, node);
-                }
-                if (symbolizer.fill !== false) {
-                    this.writeNode("Fill", symbolizer, node);
-                }
-                if (symbolizer.stroke !== false) {
-                    this.writeNode("Stroke", symbolizer, node);
-                }
-                return node;
-            },
-            "WellKnownName": function(name) {
-                return this.createElementNSPlus("sld:WellKnownName", {
-                    value: name
-                });
-            },
-            "Opacity": function(value) {
-                return this.createElementNSPlus("sld:Opacity", {
-                    value: value
-                });
-            },
-            "Size": function(value) {
-                return this.writers.sld._OGCExpression.call(
-                    this, "sld:Size", value
-                );
-            },
-            "Rotation": function(value) {
-                return this.createElementNSPlus("sld:Rotation", {
-                    value: value
-                });
-            },
-            "OnlineResource": function(href) {
-                return this.createElementNSPlus("sld:OnlineResource", {
-                    attributes: {
-                        "xlink:type": "simple",
-                        "xlink:href": href
-                    }
-                });
-            },
-            "Format": function(format) {
-                return this.createElementNSPlus("sld:Format", {
-                    value: format
-                });
-            }
-        }
-    }, OpenLayers.Format.Filter.v1_0_0.prototype.writers),
-    
-    CLASS_NAME: "OpenLayers.Format.SLD.v1" 
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/SLD/v1_0_0.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/SLD/v1_0_0.js
deleted file mode 100644
index e920b502..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/SLD/v1_0_0.js
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/SLD/v1.js
- * @requires OpenLayers/Format/Filter/v1_0_0.js
- */
-
-/**
- * Class: OpenLayers.Format.SLD.v1_0_0
- * Write SLD version 1.0.0.
- * 
- * Inherits from:
- *  - <OpenLayers.Format.SLD.v1>
- */
-OpenLayers.Format.SLD.v1_0_0 = OpenLayers.Class(
-    OpenLayers.Format.SLD.v1, {
-    
-    /**
-     * Constant: VERSION
-     * {String} 1.0.0
-     */
-    VERSION: "1.0.0",
-    
-    /**
-     * Property: schemaLocation
-     * {String} http://www.opengis.net/sld
-     *   http://schemas.opengis.net/sld/1.0.0/StyledLayerDescriptor.xsd
-     */
-    schemaLocation: "http://www.opengis.net/sld http://schemas.opengis.net/sld/1.0.0/StyledLayerDescriptor.xsd",
-
-    /**
-     * Constructor: OpenLayers.Format.SLD.v1_0_0
-     * Instances of this class are not created directly.  Use the
-     *     <OpenLayers.Format.SLD> constructor instead.
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be set on
-     *     this instance.
-     */
-
-    CLASS_NAME: "OpenLayers.Format.SLD.v1_0_0" 
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/SLD/v1_0_0_GeoServer.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/SLD/v1_0_0_GeoServer.js
deleted file mode 100644
index 902da67a..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/SLD/v1_0_0_GeoServer.js
+++ /dev/null
@@ -1,149 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/SLD/v1_0_0.js
- */
-
-/**
- * Class: OpenLayers.Format.SLD/v1_0_0_GeoServer
- * Read and write SLD version 1.0.0 with GeoServer-specific enhanced options.
- * See http://svn.osgeo.org/geotools/trunk/modules/extension/xsd/xsd-sld/src/main/resources/org/geotools/sld/bindings/StyledLayerDescriptor.xsd
- * for more information.
- *
- * Inherits from:
- *  - <OpenLayers.Format.SLD.v1_0_0>
- */
-OpenLayers.Format.SLD.v1_0_0_GeoServer = OpenLayers.Class(
-    OpenLayers.Format.SLD.v1_0_0, {
-
-    /**
-     * Property: version
-     * {String} The specific parser version.
-     */
-    version: "1.0.0",
-
-    /**
-     * Property: profile
-     * {String} The specific profile
-     */
-    profile: "GeoServer",
-
-   /**
-     * Constructor: OpenLayers.Format.SLD.v1_0_0_GeoServer
-     * Create a new parser for GeoServer-enhanced SLD version 1.0.0.
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be set on
-     *     this instance.
-     */
-
-    /**
-     * Property: readers
-     * Contains public functions, grouped by namespace prefix, that will
-     *     be applied when a namespaced node is found matching the function
-     *     name.  The function will be applied in the scope of this parser
-     *     with two arguments: the node being read and a context object passed
-     *     from the parent.
-     */
-    readers: OpenLayers.Util.applyDefaults({
-        "sld": OpenLayers.Util.applyDefaults({
-            "Priority": function(node, obj) {
-                var value = this.readers.ogc._expression.call(this, node);
-                if (value) {
-                    obj.priority = value;
-                }
-            },
-            "VendorOption": function(node, obj) {
-                if (!obj.vendorOptions) {
-                    obj.vendorOptions = {};
-                }
-                obj.vendorOptions[node.getAttribute("name")] = this.getChildValue(node);
-            },
-            "TextSymbolizer": function(node, rule) {
-                OpenLayers.Format.SLD.v1_0_0.prototype.readers.sld.TextSymbolizer.apply(this, arguments);
-                var symbolizer = this.multipleSymbolizers ? rule.symbolizers[rule.symbolizers.length-1] : rule.symbolizer["Text"];
-                if (symbolizer.graphic === undefined) {
-                    symbolizer.graphic = false;
-                }
-            }
-        }, OpenLayers.Format.SLD.v1_0_0.prototype.readers["sld"])
-    }, OpenLayers.Format.SLD.v1_0_0.prototype.readers),
-
-    /**
-     * Property: writers
-     * As a compliment to the readers property, this structure contains public
-     *     writing functions grouped by namespace alias and named like the
-     *     node names they produce.
-     */
-    writers: OpenLayers.Util.applyDefaults({
-        "sld": OpenLayers.Util.applyDefaults({
-            "Priority": function(priority) {
-                return this.writers.sld._OGCExpression.call(
-                    this, "sld:Priority", priority
-                );
-            },
-            "VendorOption": function(option) {
-                return this.createElementNSPlus("sld:VendorOption", {
-                    attributes: {name: option.name},
-                    value: option.value
-                });
-            },
-            "TextSymbolizer": function(symbolizer) {
-                var writers = OpenLayers.Format.SLD.v1_0_0.prototype.writers;
-                var node = writers["sld"]["TextSymbolizer"].apply(this, arguments);
-                if (symbolizer.graphic !== false && (symbolizer.externalGraphic || symbolizer.graphicName)) {
-                    this.writeNode("Graphic", symbolizer, node);
-                }
-                if ("priority" in symbolizer) {
-                    this.writeNode("Priority", symbolizer.priority, node);
-                }
-                return this.addVendorOptions(node, symbolizer);
-            },
-            "PointSymbolizer": function(symbolizer) {
-                var writers = OpenLayers.Format.SLD.v1_0_0.prototype.writers;
-                var node = writers["sld"]["PointSymbolizer"].apply(this, arguments);
-                return this.addVendorOptions(node, symbolizer);
-            },
-            "LineSymbolizer": function(symbolizer) {
-                var writers = OpenLayers.Format.SLD.v1_0_0.prototype.writers;
-                var node = writers["sld"]["LineSymbolizer"].apply(this, arguments);
-                return this.addVendorOptions(node, symbolizer);
-            },
-            "PolygonSymbolizer": function(symbolizer) {
-                var writers = OpenLayers.Format.SLD.v1_0_0.prototype.writers;
-                var node = writers["sld"]["PolygonSymbolizer"].apply(this, arguments);
-                return this.addVendorOptions(node, symbolizer);
-            }
-        }, OpenLayers.Format.SLD.v1_0_0.prototype.writers["sld"])
-    }, OpenLayers.Format.SLD.v1_0_0.prototype.writers),
-
-    /**
-     * Method: addVendorOptions
-     * Add in the VendorOption tags and return the node again.
-     *
-     * Parameters:
-     * node - {DOMElement} A DOM node.
-     * symbolizer - {Object}
-     *
-     * Returns:
-     * {DOMElement} A DOM node.
-     */
-    addVendorOptions: function(node, symbolizer) {
-        var options = symbolizer.vendorOptions;
-        if (options) {
-            for (var key in symbolizer.vendorOptions) {
-                this.writeNode("VendorOption", {
-                    name: key, 
-                    value: symbolizer.vendorOptions[key]
-                }, node);
-            }
-        }
-        return node;
-    },
-
-    CLASS_NAME: "OpenLayers.Format.SLD.v1_0_0_GeoServer"
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/SOSCapabilities.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/SOSCapabilities.js
deleted file mode 100644
index 1abb1c81..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/SOSCapabilities.js
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/XML/VersionedOGC.js
- */
- 
-/**
- * Class: OpenLayers.Format.SOSCapabilities
- * Read SOS Capabilities.
- * 
- * Inherits from:
- *  - <OpenLayers.Format.XML.VersionedOGC>
- */
-OpenLayers.Format.SOSCapabilities = OpenLayers.Class(OpenLayers.Format.XML.VersionedOGC, {
-    
-    /**
-     * APIProperty: defaultVersion
-     * {String} Version number to assume if none found.  Default is "1.0.0".
-     */
-    defaultVersion: "1.0.0",
-    
-    /**
-     * Constructor: OpenLayers.Format.SOSCapabilities
-     * Create a new parser for SOS Capabilities.
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be set on
-     *     this instance.
-     */
-
-    /**
-     * APIMethod: read
-     * Read capabilities data from a string, and return information about
-     * the service (offering and observedProperty mostly).
-     * 
-     * Parameters: 
-     * data - {String} or {DOMElement} data to read/parse.
-     *
-     * Returns:
-     * {Object} Info about the SOS
-     */
-    
-    CLASS_NAME: "OpenLayers.Format.SOSCapabilities" 
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/SOSCapabilities/v1_0_0.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/SOSCapabilities/v1_0_0.js
deleted file mode 100644
index 89c0e914..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/SOSCapabilities/v1_0_0.js
+++ /dev/null
@@ -1,158 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/SOSCapabilities.js
- * @requires OpenLayers/Format/OWSCommon/v1_1_0.js
- * @requires OpenLayers/Format/GML/v3.js
- */
-
-/**
- * Class: OpenLayers.Format.SOSCapabilities.v1_0_0
- * Read SOS Capabilities version 1.0.0.
- * 
- * Inherits from:
- *  - <OpenLayers.Format.SOSCapabilities>
- */
-OpenLayers.Format.SOSCapabilities.v1_0_0 = OpenLayers.Class(
-    OpenLayers.Format.SOSCapabilities, {
-
-    /**
-     * Property: namespaces
-     * {Object} Mapping of namespace aliases to namespace URIs.
-     */
-    namespaces: {
-        ows: "http://www.opengis.net/ows/1.1",
-        sos: "http://www.opengis.net/sos/1.0",
-        gml: "http://www.opengis.net/gml",
-        xlink: "http://www.w3.org/1999/xlink"
-    },
-
-    /**
-     * Property: regExes
-     * Compiled regular expressions for manipulating strings.
-     */
-    regExes: {
-        trimSpace: (/^\s*|\s*$/g),
-        removeSpace: (/\s*/g),
-        splitSpace: (/\s+/),
-        trimComma: (/\s*,\s*/g)
-    },
-    
-    /**
-     * Constructor: OpenLayers.Format.SOSCapabilities.v1_0_0
-     * Create a new parser for SOS capabilities version 1.0.0. 
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be set on
-     *     this instance.
-     */
-    initialize: function(options) {
-        OpenLayers.Format.XML.prototype.initialize.apply(this, [options]);
-        this.options = options;
-    },
-
-    /**
-     * APIMethod: read
-     * Read capabilities data from a string, and return info about the SOS.
-     * 
-     * Parameters: 
-     * data - {String} or {DOMElement} data to read/parse.
-     *
-     * Returns:
-     * {Object} Information about the SOS service.
-     */
-    read: function(data) {
-        if(typeof data == "string") {
-            data = OpenLayers.Format.XML.prototype.read.apply(this, [data]);
-        }
-        if(data && data.nodeType == 9) {
-            data = data.documentElement;
-        }
-        var capabilities = {};
-        this.readNode(data, capabilities);
-        return capabilities;
-    },
-
-    /**
-     * Property: readers
-     * Contains public functions, grouped by namespace prefix, that will
-     *     be applied when a namespaced node is found matching the function
-     *     name.  The function will be applied in the scope of this parser
-     *     with two arguments: the node being read and a context object passed
-     *     from the parent.
-     */
-    readers: {
-        "gml": OpenLayers.Util.applyDefaults({
-            "name": function(node, obj) {
-                obj.name = this.getChildValue(node);
-            },
-            "TimePeriod": function(node, obj) {
-                obj.timePeriod = {};
-                this.readChildNodes(node, obj.timePeriod);
-            },
-            "beginPosition": function(node, timePeriod) {
-                timePeriod.beginPosition = this.getChildValue(node);
-            },
-            "endPosition": function(node, timePeriod) {
-                timePeriod.endPosition = this.getChildValue(node);
-            }
-        }, OpenLayers.Format.GML.v3.prototype.readers["gml"]),
-        "sos": {
-            "Capabilities": function(node, obj) {
-                this.readChildNodes(node, obj);
-            },
-            "Contents": function(node, obj) {
-                obj.contents = {};
-                this.readChildNodes(node, obj.contents);
-            },
-            "ObservationOfferingList": function(node, contents) {
-                contents.offeringList = {};
-                this.readChildNodes(node, contents.offeringList);
-            },
-            "ObservationOffering": function(node, offeringList) {
-                var id = this.getAttributeNS(node, this.namespaces.gml, "id");
-                offeringList[id] = {
-                    procedures: [],
-                    observedProperties: [],
-                    featureOfInterestIds: [],
-                    responseFormats: [],
-                    resultModels: [],
-                    responseModes: []
-                };
-                this.readChildNodes(node, offeringList[id]);
-            },
-            "time": function(node, offering) {
-                offering.time = {};
-                this.readChildNodes(node, offering.time);
-            },
-            "procedure": function(node, offering) {
-                offering.procedures.push(this.getAttributeNS(node, 
-                    this.namespaces.xlink, "href"));
-            },
-            "observedProperty": function(node, offering) {
-                offering.observedProperties.push(this.getAttributeNS(node, 
-                    this.namespaces.xlink, "href"));
-            },
-            "featureOfInterest": function(node, offering) {
-                offering.featureOfInterestIds.push(this.getAttributeNS(node, 
-                    this.namespaces.xlink, "href"));
-            },
-            "responseFormat": function(node, offering) {
-                offering.responseFormats.push(this.getChildValue(node));
-            },
-            "resultModel": function(node, offering) {
-                offering.resultModels.push(this.getChildValue(node));
-            },
-            "responseMode": function(node, offering) {
-                offering.responseModes.push(this.getChildValue(node));
-            }
-        },
-        "ows": OpenLayers.Format.OWSCommon.v1_1_0.prototype.readers["ows"]
-    },    
-    
-    CLASS_NAME: "OpenLayers.Format.SOSCapabilities.v1_0_0" 
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/SOSGetFeatureOfInterest.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/SOSGetFeatureOfInterest.js
deleted file mode 100644
index aac2030d..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/SOSGetFeatureOfInterest.js
+++ /dev/null
@@ -1,190 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
- 
-/**
- * @requires OpenLayers/Format/XML.js
- * @requires OpenLayers/Format/GML/v3.js
- */
-
-/**
- * Class: OpenLayers.Format.SOSGetFeatureOfInterest
- * Read and write SOS GetFeatureOfInterest. This is used to get to
- * the location of the features (stations). The stations can have 1 or more
- * sensors.
- *
- * Inherits from:
- *  - <OpenLayers.Format.XML>
- */
-OpenLayers.Format.SOSGetFeatureOfInterest = OpenLayers.Class(
-    OpenLayers.Format.XML, {
-    
-    /**
-     * Constant: VERSION
-     * {String} 1.0.0
-     */
-    VERSION: "1.0.0",
-
-    /**
-     * Property: namespaces
-     * {Object} Mapping of namespace aliases to namespace URIs.
-     */
-    namespaces: {
-        sos: "http://www.opengis.net/sos/1.0",
-        gml: "http://www.opengis.net/gml",
-        sa: "http://www.opengis.net/sampling/1.0",
-        xsi: "http://www.w3.org/2001/XMLSchema-instance"
-    },
-
-    /**
-     * Property: schemaLocation
-     * {String} Schema location
-     */
-    schemaLocation: "http://www.opengis.net/sos/1.0 http://schemas.opengis.net/sos/1.0.0/sosAll.xsd",
-
-    /**
-     * Property: defaultPrefix
-     */
-    defaultPrefix: "sos",
-
-    /**
-     * Property: regExes
-     * Compiled regular expressions for manipulating strings.
-     */
-    regExes: {
-        trimSpace: (/^\s*|\s*$/g),
-        removeSpace: (/\s*/g),
-        splitSpace: (/\s+/),
-        trimComma: (/\s*,\s*/g)
-    },
-    
-    /**
-     * Constructor: OpenLayers.Format.SOSGetFeatureOfInterest
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be set on
-     *     this instance.
-     */
-
-    /**
-     * APIMethod: read
-     * Parse a GetFeatureOfInterest response and return an array of features
-     * 
-     * Parameters: 
-     * data - {String} or {DOMElement} data to read/parse.
-     *
-     * Returns:
-     * {Array(<OpenLayers.Feature.Vector>)} An array of features. 
-     */
-    read: function(data) {
-        if(typeof data == "string") {
-            data = OpenLayers.Format.XML.prototype.read.apply(this, [data]);
-        }
-        if(data && data.nodeType == 9) {
-            data = data.documentElement;
-        }
-
-        var info = {features: []};
-        this.readNode(data, info);
-       
-        var features = [];
-        for (var i=0, len=info.features.length; i<len; i++) {
-            var container = info.features[i];
-            // reproject features if needed
-            if(this.internalProjection && this.externalProjection &&
-                container.components[0]) {
-                    container.components[0].transform(
-                        this.externalProjection, this.internalProjection
-                    );
-            }             
-            var feature = new OpenLayers.Feature.Vector(
-                container.components[0], container.attributes);
-            features.push(feature);
-        }
-        return features;
-    },
-
-    /**
-     * Property: readers
-     * Contains public functions, grouped by namespace prefix, that will
-     *     be applied when a namespaced node is found matching the function
-     *     name.  The function will be applied in the scope of this parser
-     *     with two arguments: the node being read and a context object passed
-     *     from the parent.
-     */
-    readers: {
-        "sa": {
-            "SamplingPoint": function(node, obj) {
-                // sampling point can also be without a featureMember if 
-                // there is only 1
-                if (!obj.attributes) {
-                    var feature = {attributes: {}};
-                    obj.features.push(feature);
-                    obj = feature;
-                }
-                obj.attributes.id = this.getAttributeNS(node, 
-                    this.namespaces.gml, "id");
-                this.readChildNodes(node, obj);
-            },
-            "position": function (node, obj) {
-                this.readChildNodes(node, obj);
-            }
-        },
-        "gml": OpenLayers.Util.applyDefaults({
-            "FeatureCollection": function(node, obj) {
-                this.readChildNodes(node, obj);
-            },
-            "featureMember": function(node, obj) {
-                var feature = {attributes: {}};
-                obj.features.push(feature);
-                this.readChildNodes(node, feature);
-            },
-            "name": function(node, obj) {
-                obj.attributes.name = this.getChildValue(node);
-            },
-            "pos": function(node, obj) {
-                // we need to parse the srsName to get to the 
-                // externalProjection, that's why we cannot use
-                // GML v3 for this
-                if (!this.externalProjection) {
-                    this.externalProjection = new OpenLayers.Projection(
-                        node.getAttribute("srsName"));
-                }
-             OpenLayers.Format.GML.v3.prototype.readers.gml.pos.apply(
-                    this, [node, obj]);
-            }
-        }, OpenLayers.Format.GML.v3.prototype.readers.gml)
-    },
-    
-    /**
-     * Property: writers
-     * As a compliment to the readers property, this structure contains public
-     *     writing functions grouped by namespace alias and named like the
-     *     node names they produce.
-     */
-    writers: {
-        "sos": {
-            "GetFeatureOfInterest": function(options) {
-                var node = this.createElementNSPlus("GetFeatureOfInterest", {
-                    attributes: {
-                        version: this.VERSION,
-                        service: 'SOS',
-                        "xsi:schemaLocation": this.schemaLocation
-                    } 
-                }); 
-                for (var i=0, len=options.fois.length; i<len; i++) {
-                    this.writeNode("FeatureOfInterestId", {foi: options.fois[i]}, node);
-                }
-                return node; 
-            },
-            "FeatureOfInterestId": function(options) {
-                var node = this.createElementNSPlus("FeatureOfInterestId", {value: options.foi});
-                return node;
-            }
-        }
-    },
-
-    CLASS_NAME: "OpenLayers.Format.SOSGetFeatureOfInterest" 
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/SOSGetObservation.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/SOSGetObservation.js
deleted file mode 100644
index 9a6e2d73..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/SOSGetObservation.js
+++ /dev/null
@@ -1,302 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/XML.js
- * @requires OpenLayers/Format/SOSGetFeatureOfInterest.js
- */
-
-/**
- * Class: OpenLayers.Format.SOSGetObservation
- * Read and write SOS GetObersation (to get the actual values from a sensor) 
- *     version 1.0.0
- *
- * Inherits from:
- *  - <OpenLayers.Format.XML>
- */
-OpenLayers.Format.SOSGetObservation = OpenLayers.Class(OpenLayers.Format.XML, {
-    
-    /**
-     * Property: namespaces
-     * {Object} Mapping of namespace aliases to namespace URIs.
-     */
-    namespaces: {
-        ows: "http://www.opengis.net/ows",
-        gml: "http://www.opengis.net/gml",
-        sos: "http://www.opengis.net/sos/1.0",
-        ogc: "http://www.opengis.net/ogc",
-        om: "http://www.opengis.net/om/1.0",
-        sa: "http://www.opengis.net/sampling/1.0",
-        xlink: "http://www.w3.org/1999/xlink",
-        xsi: "http://www.w3.org/2001/XMLSchema-instance"
-    },
-
-    /**
-     * Property: regExes
-     * Compiled regular expressions for manipulating strings.
-     */
-    regExes: {
-        trimSpace: (/^\s*|\s*$/g),
-        removeSpace: (/\s*/g),
-        splitSpace: (/\s+/),
-        trimComma: (/\s*,\s*/g)
-    },
-
-    /**
-     * Constant: VERSION
-     * {String} 1.0.0
-     */
-    VERSION: "1.0.0",
-
-    /**
-     * Property: schemaLocation
-     * {String} Schema location
-     */
-    schemaLocation: "http://www.opengis.net/sos/1.0 http://schemas.opengis.net/sos/1.0.0/sosGetObservation.xsd",
-
-    /**
-     * Property: defaultPrefix
-     */
-    defaultPrefix: "sos",
-
-    /**
-     * Constructor: OpenLayers.Format.SOSGetObservation
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be set on
-     *     this instance.
-     */
-
-    /**
-     * Method: read
-     * 
-     * Parameters: 
-     * data - {String} or {DOMElement} data to read/parse.
-     *
-     * Returns:
-     * {Object} An object containing the measurements
-     */
-    read: function(data) {
-        if(typeof data == "string") {
-            data = OpenLayers.Format.XML.prototype.read.apply(this, [data]);
-        }
-        if(data && data.nodeType == 9) {
-            data = data.documentElement;
-        }
-        var info = {measurements: [], observations: []};
-        this.readNode(data, info);
-        return info;
-    },
-
-    /**
-     * Method: write
-     *
-     * Parameters:
-     * options - {Object} Optional object.
-     *
-     * Returns:
-     * {String} An SOS GetObservation request XML string.
-     */
-    write: function(options) {
-        var node = this.writeNode("sos:GetObservation", options);
-        node.setAttribute("xmlns:om", this.namespaces.om);
-        node.setAttribute("xmlns:ogc", this.namespaces.ogc);
-        this.setAttributeNS(
-            node, this.namespaces.xsi,
-            "xsi:schemaLocation", this.schemaLocation
-        );
-        return OpenLayers.Format.XML.prototype.write.apply(this, [node]);
-    }, 
-
-    /**
-     * Property: readers
-     * Contains public functions, grouped by namespace prefix, that will
-     *     be applied when a namespaced node is found matching the function
-     *     name.  The function will be applied in the scope of this parser
-     *     with two arguments: the node being read and a context object passed
-     *     from the parent.
-     */
-    readers: {
-        "om": {
-            "ObservationCollection": function(node, obj) {
-                obj.id = this.getAttributeNS(node, this.namespaces.gml, "id");
-                this.readChildNodes(node, obj);
-            },
-            "member": function(node, observationCollection) {
-                this.readChildNodes(node, observationCollection);
-            },
-            "Measurement": function(node, observationCollection) {
-                var measurement = {};
-                observationCollection.measurements.push(measurement);
-                this.readChildNodes(node, measurement);
-            },
-            "Observation": function(node, observationCollection) {
-                var observation = {};
-                observationCollection.observations.push(observation);
-                this.readChildNodes(node, observation);
-            },
-            "samplingTime": function(node, measurement) {
-                var samplingTime = {};
-                measurement.samplingTime = samplingTime;
-                this.readChildNodes(node, samplingTime);
-            },
-            "observedProperty": function(node, measurement) {
-                measurement.observedProperty = 
-                    this.getAttributeNS(node, this.namespaces.xlink, "href");
-                this.readChildNodes(node, measurement);
-            },
-            "procedure": function(node, measurement) {
-                measurement.procedure = 
-                    this.getAttributeNS(node, this.namespaces.xlink, "href");
-                this.readChildNodes(node, measurement);
-            },
-            "featureOfInterest": function(node, observation) {
-                var foi = {features: []};
-                observation.fois = [];
-                observation.fois.push(foi);
-                this.readChildNodes(node, foi);
-                // postprocessing to get actual features
-                var features = [];
-                for (var i=0, len=foi.features.length; i<len; i++) {
-                    var feature = foi.features[i];
-                    features.push(new OpenLayers.Feature.Vector(
-                        feature.components[0], feature.attributes));
-                }
-                foi.features = features;
-            },
-            "result": function(node, measurement) {
-                var result = {};
-                measurement.result = result;
-                if (this.getChildValue(node) !== '') {
-                    result.value = this.getChildValue(node);
-                    result.uom = node.getAttribute("uom");
-                } else {
-                    this.readChildNodes(node, result);
-                }
-            }
-        },
-        "sa": OpenLayers.Format.SOSGetFeatureOfInterest.prototype.readers.sa,
-        "gml": OpenLayers.Util.applyDefaults({
-            "TimeInstant": function(node, samplingTime) {
-               var timeInstant = {};
-                samplingTime.timeInstant = timeInstant;
-                this.readChildNodes(node, timeInstant);
-            },
-            "timePosition": function(node, timeInstant) {
-                timeInstant.timePosition = this.getChildValue(node);
-            }
-        }, OpenLayers.Format.SOSGetFeatureOfInterest.prototype.readers.gml)
-    },
-
-    /**
-     * Property: writers
-     * As a compliment to the readers property, this structure contains public
-     *     writing functions grouped by namespace alias and named like the
-     *     node names they produce.
-     */
-    writers: {
-        "sos": {
-            "GetObservation": function(options) {
-                var node = this.createElementNSPlus("GetObservation", {
-                    attributes: {
-                        version: this.VERSION,
-                        service: 'SOS'
-                    } 
-                }); 
-                this.writeNode("offering", options, node);
-                if (options.eventTime) {
-                    this.writeNode("eventTime", options, node);
-                }
-                for (var procedure in options.procedures) {
-                    this.writeNode("procedure", options.procedures[procedure], node);
-                }
-                for (var observedProperty in options.observedProperties) {
-                    this.writeNode("observedProperty", options.observedProperties[observedProperty], node);
-                }
-                if (options.foi) {
-                    this.writeNode("featureOfInterest", options.foi, node);
-                }
-                this.writeNode("responseFormat", options, node);
-                if (options.resultModel) {
-                    this.writeNode("resultModel", options, node);
-                }
-                if (options.responseMode) {
-                    this.writeNode("responseMode", options, node);
-                }
-                return node; 
-            },
-            "featureOfInterest": function(foi) {
-                var node = this.createElementNSPlus("featureOfInterest");
-                this.writeNode("ObjectID", foi.objectId, node);
-                return node;
-            },
-            "ObjectID": function(options) {
-                return this.createElementNSPlus("ObjectID",
-                    {value: options});
-            },
-            "responseFormat": function(options) {
-                return this.createElementNSPlus("responseFormat", 
-                    {value: options.responseFormat});
-            },
-            "procedure": function(procedure) {
-                return this.createElementNSPlus("procedure", 
-                    {value: procedure});
-            },
-            "offering": function(options) {
-                return this.createElementNSPlus("offering", {value: 
-                    options.offering});
-            },
-            "observedProperty": function(observedProperty) {
-                return this.createElementNSPlus("observedProperty", 
-                    {value: observedProperty});
-            },
-            "eventTime": function(options) {
-                var node = this.createElementNSPlus("eventTime");
-                if (options.eventTime === 'latest') {
-                    this.writeNode("ogc:TM_Equals", options, node);
-                }
-                return node;
-            },
-            "resultModel": function(options) {
-                return this.createElementNSPlus("resultModel", {value: 
-                    options.resultModel});
-            },
-            "responseMode": function(options) {
-                return this.createElementNSPlus("responseMode", {value: 
-                    options.responseMode});
-            }
-        },
-        "ogc": {
-            "TM_Equals": function(options) {
-                var node = this.createElementNSPlus("ogc:TM_Equals");
-                this.writeNode("ogc:PropertyName", {property: 
-                    "urn:ogc:data:time:iso8601"}, node);
-                if (options.eventTime === 'latest') {
-                    this.writeNode("gml:TimeInstant", {value: 'latest'}, node);
-                }
-                return node;
-            },
-            "PropertyName": function(options) {
-                return this.createElementNSPlus("ogc:PropertyName", 
-                    {value: options.property});
-            }
-        },
-        "gml": {
-            "TimeInstant": function(options) {
-                var node = this.createElementNSPlus("gml:TimeInstant");
-                this.writeNode("gml:timePosition", options, node);
-                return node;
-            },
-            "timePosition": function(options) {
-                var node = this.createElementNSPlus("gml:timePosition", 
-                    {value: options.value});
-                return node;
-            }
-        }
-    },
-    
-    CLASS_NAME: "OpenLayers.Format.SOSGetObservation" 
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/Text.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/Text.js
deleted file mode 100644
index bf9bcd55..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/Text.js
+++ /dev/null
@@ -1,151 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Feature/Vector.js
- * @requires OpenLayers/Geometry/Point.js
- */
-
-/**
- * Class: OpenLayers.Format.Text
- * Read Text format. Create a new instance with the <OpenLayers.Format.Text>
- *     constructor. This reads text which is formatted like CSV text, using
- *     tabs as the seperator by default. It provides parsing of data originally
- *     used in the MapViewerService, described on the wiki. This Format is used
- *     by the <OpenLayers.Layer.Text> class.
- *
- * Inherits from:
- *  - <OpenLayers.Format>
- */
-OpenLayers.Format.Text = OpenLayers.Class(OpenLayers.Format, {
-    
-    /**
-     * APIProperty: defaultStyle
-     * defaultStyle allows one to control the default styling of the features.
-     *    It should be a symbolizer hash. By default, this is set to match the
-     *    Layer.Text behavior, which is to use the default OpenLayers Icon.
-     */
-    defaultStyle: null,
-     
-    /**
-     * APIProperty: extractStyles
-     * set to true to extract styles from the TSV files, using information
-     * from the image or icon, iconSize and iconOffset fields. This will result
-     * in features with a symbolizer (style) property set, using the
-     * default symbolizer specified in <defaultStyle>. Set to false if you
-     * wish to use a styleMap or OpenLayers.Style options to style your
-     * layer instead.
-     */
-    extractStyles: true,
-
-    /**
-     * Constructor: OpenLayers.Format.Text
-     * Create a new parser for TSV Text.
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be set on
-     *     this instance.
-     */
-    initialize: function(options) {
-        options = options || {};
-
-        if(options.extractStyles !== false) {
-            options.defaultStyle = {
-                'externalGraphic': OpenLayers.Util.getImageLocation("marker.png"),
-                'graphicWidth': 21,
-                'graphicHeight': 25,
-                'graphicXOffset': -10.5,
-                'graphicYOffset': -12.5
-            };
-        }
-        
-        OpenLayers.Format.prototype.initialize.apply(this, [options]);
-    }, 
-
-    /**
-     * APIMethod: read
-     * Return a list of features from a Tab Seperated Values text string.
-     * 
-     * Parameters:
-     * text - {String} 
-     *
-     * Returns:
-     * Array({<OpenLayers.Feature.Vector>})
-     */
-    read: function(text) {
-        var lines = text.split('\n');
-        var columns;
-        var features = [];
-        // length - 1 to allow for trailing new line
-        for (var lcv = 0; lcv < (lines.length - 1); lcv++) {
-            var currLine = lines[lcv].replace(/^\s*/,'').replace(/\s*$/,'');
-        
-            if (currLine.charAt(0) != '#') { /* not a comment */
-            
-                if (!columns) {
-                    //First line is columns
-                    columns = currLine.split('\t');
-                } else {
-                    var vals = currLine.split('\t');
-                    var geometry = new OpenLayers.Geometry.Point(0,0);
-                    var attributes = {};
-                    var style = this.defaultStyle ? 
-                        OpenLayers.Util.applyDefaults({}, this.defaultStyle) :
-                        null;  
-                    var icon, iconSize, iconOffset, overflow;
-                    var set = false;
-                    for (var valIndex = 0; valIndex < vals.length; valIndex++) {
-                        if (vals[valIndex]) {
-                            if (columns[valIndex] == 'point') {
-                                var coords = vals[valIndex].split(',');
-                                geometry.y = parseFloat(coords[0]);
-                                geometry.x = parseFloat(coords[1]);
-                                set = true;
-                            } else if (columns[valIndex] == 'lat') {
-                                geometry.y = parseFloat(vals[valIndex]);
-                                set = true;
-                            } else if (columns[valIndex] == 'lon') {
-                                geometry.x = parseFloat(vals[valIndex]);
-                                set = true;
-                            } else if (columns[valIndex] == 'title')
-                                attributes['title'] = vals[valIndex];
-                            else if (columns[valIndex] == 'image' ||
-                                     columns[valIndex] == 'icon' && style) {
-                                style['externalGraphic'] = vals[valIndex];
-                            } else if (columns[valIndex] == 'iconSize' && style) {
-                                var size = vals[valIndex].split(',');
-                                style['graphicWidth'] = parseFloat(size[0]);
-                                style['graphicHeight'] = parseFloat(size[1]);
-                            } else if (columns[valIndex] == 'iconOffset' && style) {
-                                var offset = vals[valIndex].split(',');
-                                style['graphicXOffset'] = parseFloat(offset[0]);
-                                style['graphicYOffset'] = parseFloat(offset[1]);
-                            } else if (columns[valIndex] == 'description') {
-                                attributes['description'] = vals[valIndex];
-                            } else if (columns[valIndex] == 'overflow') {
-                                attributes['overflow'] = vals[valIndex];
-                            } else {
-                                // For StyleMap filtering, allow additional
-                                // columns to be stored as attributes.
-                                attributes[columns[valIndex]] = vals[valIndex];
-                            }    
-                        }
-                    }
-                    if (set) {
-                      if (this.internalProjection && this.externalProjection) {
-                          geometry.transform(this.externalProjection, 
-                                             this.internalProjection); 
-                      }
-                      var feature = new OpenLayers.Feature.Vector(geometry, attributes, style);
-                      features.push(feature);
-                    }
-                }
-            }
-        }
-        return features;
-    },   
-
-    CLASS_NAME: "OpenLayers.Format.Text" 
-});    
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WCSCapabilities.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WCSCapabilities.js
deleted file mode 100644
index 934aaa5d..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WCSCapabilities.js
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/XML/VersionedOGC.js
- */
-
-/**
- * Class: OpenLayers.Format.WCSCapabilities
- * Read WCS Capabilities.
- * 
- * Inherits from:
- *  - <OpenLayers.Format.XML.VersionedOGC>
- */
-OpenLayers.Format.WCSCapabilities = OpenLayers.Class(OpenLayers.Format.XML.VersionedOGC, {
-    
-    /**
-     * APIProperty: defaultVersion
-     * {String} Version number to assume if none found.  Default is "1.1.0".
-     */
-    defaultVersion: "1.1.0",
-
-    /**
-     * Constructor: OpenLayers.Format.WCSCapabilities
-     * Create a new parser for WCS capabilities.
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be set on
-     *     this instance.
-     */
-
-    /**
-     * APIMethod: read
-     * Read capabilities data from a string, and return a list of coverages. 
-     * 
-     * Parameters: 
-     * data - {String} or {DOMElement} data to read/parse.
-     *
-     * Returns:
-     * {Array} List of named coverages.
-     */
-    
-    CLASS_NAME: "OpenLayers.Format.WCSCapabilities" 
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WCSCapabilities/v1.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WCSCapabilities/v1.js
deleted file mode 100644
index bf8da3b1..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WCSCapabilities/v1.js
+++ /dev/null
@@ -1,55 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/WCSCapabilities.js
- */
-
-/**
- * Class: OpenLayers.Format.WCSCapabilities.v1
- * Abstract class not to be instantiated directly.
- * 
- * Inherits from:
- *  - <OpenLayers.Format.XML>
- */
-OpenLayers.Format.WCSCapabilities.v1 = OpenLayers.Class(
-    OpenLayers.Format.XML, {
-
-    regExes: {
-        trimSpace: (/^\s*|\s*$/g),
-        splitSpace: (/\s+/)
-    },
-
-    /**
-     * Property: defaultPrefix
-     */
-    defaultPrefix: "wcs",
-
-    /**
-     * APIMethod: read
-     * Read capabilities data from a string, and return a list of coverages. 
-     * 
-     * Parameters: 
-     * data - {String} or {DOMElement} data to read/parse.
-     *
-     * Returns:
-     * {Array} List of named coverages.
-     */
-    read: function(data) {
-        if(typeof data == "string") {
-            data = OpenLayers.Format.XML.prototype.read.apply(this, [data]);
-        }
-        var raw = data;
-        if(data && data.nodeType == 9) {
-            data = data.documentElement;
-        }
-        var capabilities = {};
-        this.readNode(data, capabilities);
-        return capabilities;
-    },
-
-    CLASS_NAME: "OpenLayers.Format.WCSCapabilities.v1" 
-
-});
\ No newline at end of file
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WCSCapabilities/v1_0_0.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WCSCapabilities/v1_0_0.js
deleted file mode 100644
index 4dfa0b8b..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WCSCapabilities/v1_0_0.js
+++ /dev/null
@@ -1,170 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/WCSCapabilities/v1.js
- * @requires OpenLayers/Format/GML/v3.js
- */
-
-/**
- * Class: OpenLayers.Format.WCSCapabilities/v1_0_0
- * Read WCS Capabilities version 1.0.0.
- * 
- * Inherits from:
- *  - <OpenLayers.Format.WCSCapabilities.v1>
- */
-OpenLayers.Format.WCSCapabilities.v1_0_0 = OpenLayers.Class(
-    OpenLayers.Format.WCSCapabilities.v1, {
-    
-    /**
-     * Constructor: OpenLayers.Format.WCSCapabilities.v1_0_0
-     * Create a new parser for WCS capabilities version 1.0.0.
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be set on
-     *     this instance.
-     */
-
-    /**
-     * Property: namespaces
-     * {Object} Mapping of namespace aliases to namespace URIs.
-     */
-    namespaces: {
-        wcs: "http://www.opengis.net/wcs",
-        xlink: "http://www.w3.org/1999/xlink",
-        xsi: "http://www.w3.org/2001/XMLSchema-instance",
-        ows: "http://www.opengis.net/ows"
-    },
-
-    /**
-     * Property: errorProperty
-     * {String} Which property of the returned object to check for in order to
-     * determine whether or not parsing has failed. In the case that the
-     * errorProperty is undefined on the returned object, the document will be
-     * run through an OGCExceptionReport parser.
-     */
-    errorProperty: "service",
-
-    /**
-     * Property: readers
-     * Contains public functions, grouped by namespace prefix, that will
-     *     be applied when a namespaced node is found matching the function
-     *     name.  The function will be applied in the scope of this parser
-     *     with two arguments: the node being read and a context object passed
-     *     from the parent.
-     */
-    readers: {
-        "wcs": {
-             "WCS_Capabilities": function(node, obj) {          
-                this.readChildNodes(node, obj);
-            },
-            "Service": function(node, obj) {
-                obj.service = {};
-                this.readChildNodes(node, obj.service);
-            },
-            "name": function(node, service) {  
-                service.name = this.getChildValue(node);
-            },
-            "label": function(node, service) {  
-                service.label = this.getChildValue(node);
-            },
-            "keywords": function(node, service) { 
-                service.keywords = []; 
-                this.readChildNodes(node, service.keywords);
-            },
-            "keyword": function(node, keywords) { 
-                // Append the keyword to the keywords list
-                keywords.push(this.getChildValue(node));      
-            },
-            "responsibleParty": function(node, service) {
-                service.responsibleParty = {};
-                this.readChildNodes(node, service.responsibleParty);   
-            },
-            "individualName": function(node, responsibleParty) {
-                responsibleParty.individualName = this.getChildValue(node);
-            },
-            "organisationName": function(node, responsibleParty) {
-                responsibleParty.organisationName = this.getChildValue(node);
-            },
-            "positionName": function(node, responsibleParty) {
-                responsibleParty.positionName = this.getChildValue(node);
-            },
-            "contactInfo": function(node, responsibleParty) {
-                responsibleParty.contactInfo = {};
-                this.readChildNodes(node, responsibleParty.contactInfo);
-            },
-            "phone": function(node, contactInfo) {
-                contactInfo.phone = {};
-                this.readChildNodes(node, contactInfo.phone);
-            },
-            "voice": function(node, phone) {
-                phone.voice = this.getChildValue(node);
-            },
-            "facsimile": function(node, phone) {
-                phone.facsimile = this.getChildValue(node);
-            },
-            "address": function(node, contactInfo) {
-                contactInfo.address = {};
-                this.readChildNodes(node, contactInfo.address);
-            },
-            "deliveryPoint": function(node, address) {
-                address.deliveryPoint = this.getChildValue(node);
-            },
-            "city": function(node, address) {
-                address.city = this.getChildValue(node);
-            },
-            "postalCode": function(node, address) {
-                address.postalCode = this.getChildValue(node);
-            },
-            "country": function(node, address) {
-                address.country = this.getChildValue(node);
-            },
-            "electronicMailAddress": function(node, address) {
-                address.electronicMailAddress = this.getChildValue(node);
-            },
-            "fees": function(node, service) {
-                service.fees = this.getChildValue(node);
-            },
-            "accessConstraints": function(node, service) {
-                service.accessConstraints = this.getChildValue(node);
-            },
-            "ContentMetadata": function(node, obj) {
-                obj.contentMetadata = [];
-                this.readChildNodes(node, obj.contentMetadata);
-            },
-            "CoverageOfferingBrief": function(node, contentMetadata) {
-                var coverageOfferingBrief = {};
-                this.readChildNodes(node, coverageOfferingBrief);
-                contentMetadata.push(coverageOfferingBrief);
-            },
-            "name": function(node, coverageOfferingBrief) {
-                coverageOfferingBrief.name = this.getChildValue(node);
-            },
-            "label": function(node, coverageOfferingBrief) {
-                coverageOfferingBrief.label = this.getChildValue(node);
-            },
-            "lonLatEnvelope": function(node, coverageOfferingBrief) {
-                var nodeList = this.getElementsByTagNameNS(node, "http://www.opengis.net/gml", "pos");
-
-                // We expect two nodes here, to create the corners of a bounding box
-                if(nodeList.length == 2) {
-                    var min = {};
-                    var max = {};
-
-                    OpenLayers.Format.GML.v3.prototype.readers["gml"].pos.apply(this, [nodeList[0], min]);
-                    OpenLayers.Format.GML.v3.prototype.readers["gml"].pos.apply(this, [nodeList[1], max]);
-
-                    coverageOfferingBrief.lonLatEnvelope = {};
-                    coverageOfferingBrief.lonLatEnvelope.srsName = node.getAttribute("srsName");
-                    coverageOfferingBrief.lonLatEnvelope.min = min.points[0];
-                    coverageOfferingBrief.lonLatEnvelope.max = max.points[0];
-                }
-            }
-        }
-    },
-    
-    CLASS_NAME: "OpenLayers.Format.WCSCapabilities.v1_0_0" 
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WCSCapabilities/v1_1_0.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WCSCapabilities/v1_1_0.js
deleted file mode 100644
index 1753c51e..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WCSCapabilities/v1_1_0.js
+++ /dev/null
@@ -1,109 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/WCSCapabilities/v1.js
- * @requires OpenLayers/Format/OWSCommon/v1_1_0.js
- */
-
-/**
- * Class: OpenLayers.Format.WCSCapabilities/v1_1_0
- * Read WCS Capabilities version 1.1.0.
- * 
- * Inherits from:
- *  - <OpenLayers.Format.WCSCapabilities.v1>
- */
-OpenLayers.Format.WCSCapabilities.v1_1_0 = OpenLayers.Class(
-    OpenLayers.Format.WCSCapabilities.v1, {
-
-    /**
-     * Property: namespaces
-     * {Object} Mapping of namespace aliases to namespace URIs.
-     */
-    namespaces: {
-        wcs: "http://www.opengis.net/wcs/1.1",
-        xlink: "http://www.w3.org/1999/xlink",
-        xsi: "http://www.w3.org/2001/XMLSchema-instance",
-        ows: "http://www.opengis.net/ows/1.1"
-    },
-
-    /**
-     * APIProperty: errorProperty
-     * {String} Which property of the returned object to check for in order to
-     * determine whether or not parsing has failed. In the case that the
-     * errorProperty is undefined on the returned object, the document will be
-     * run through an OGCExceptionReport parser.
-     */
-    errorProperty: "operationsMetadata",
-
-    /**
-     * Constructor: OpenLayers.Format.WCSCapabilities.v1_1_0
-     * Create a new parser for WCS capabilities version 1.1.0.
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be set on
-     *     this instance.
-     */
-
-    /**
-     * Property: readers
-     * Contains public functions, grouped by namespace prefix, that will
-     *     be applied when a namespaced node is found matching the function
-     *     name.  The function will be applied in the scope of this parser
-     *     with two arguments: the node being read and a context object passed
-     *     from the parent.
-     */
-    readers: {
-        "wcs": OpenLayers.Util.applyDefaults({
-            // In 1.0.0, this was WCS_Capabilties, in 1.1.0, it's Capabilities
-            "Capabilities": function(node, obj) {           
-                this.readChildNodes(node, obj);
-            },
-            "Contents": function(node, request) {
-                request.contentMetadata = [];
-                this.readChildNodes(node, request.contentMetadata);
-            },
-            "CoverageSummary": function(node, contentMetadata) {
-                var coverageSummary = {};
-                // Read the summary:
-                this.readChildNodes(node, coverageSummary);   
-
-                // Add it to the contentMetadata array:  
-                contentMetadata.push(coverageSummary);                 
-            },
-            "Identifier": function(node, coverageSummary) {
-                coverageSummary.identifier = this.getChildValue(node);
-            },
-            "Title": function(node, coverageSummary) {
-              coverageSummary.title = this.getChildValue(node);
-            },
-            "Abstract": function(node, coverageSummary) {
-                coverageSummary["abstract"] = this.getChildValue(node);
-            },
-            "SupportedCRS": function(node, coverageSummary) {
-                var crs = this.getChildValue(node);
-                if(crs) {
-                    if(!coverageSummary.supportedCRS) { 
-                        coverageSummary.supportedCRS = [];
-                    }
-                    coverageSummary.supportedCRS.push(crs);
-                }
-            },
-            "SupportedFormat": function(node, coverageSummary) {
-                var format = this.getChildValue(node);
-                if(format) {
-                    if(!coverageSummary.supportedFormat) { 
-                        coverageSummary.supportedFormat = [];
-                    }
-                    coverageSummary.supportedFormat.push(format);
-                }
-            }
-        }, OpenLayers.Format.WCSCapabilities.v1.prototype.readers["wcs"]),
-        "ows": OpenLayers.Format.OWSCommon.v1_1_0.prototype.readers["ows"]
-    },
-
-    CLASS_NAME: "OpenLayers.Format.WCSCapabilities.v1_1_0" 
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WCSGetCoverage.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WCSGetCoverage.js
deleted file mode 100644
index 2817f289..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WCSGetCoverage.js
+++ /dev/null
@@ -1,199 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/XML.js
- * @requires OpenLayers/Format/OWSCommon/v1_1_0.js
- */
-
-/**
- * Class: OpenLayers.Format.WCSGetCoverage version 1.1.0
- *
- * Inherits from:
- *  - <OpenLayers.Format.XML>
- */
-OpenLayers.Format.WCSGetCoverage = OpenLayers.Class(OpenLayers.Format.XML, {
-    
-    /**
-     * Property: namespaces
-     * {Object} Mapping of namespace aliases to namespace URIs.
-     */
-    namespaces: {
-        ows: "http://www.opengis.net/ows/1.1",
-        wcs: "http://www.opengis.net/wcs/1.1",
-        xlink: "http://www.w3.org/1999/xlink",
-        xsi: "http://www.w3.org/2001/XMLSchema-instance"
-    },
-
-    /**
-     * Property: regExes
-     * Compiled regular expressions for manipulating strings.
-     */
-    regExes: {
-        trimSpace: (/^\s*|\s*$/g),
-        removeSpace: (/\s*/g),
-        splitSpace: (/\s+/),
-        trimComma: (/\s*,\s*/g)
-    },
-
-    /**
-     * Constant: VERSION
-     * {String} 1.1.2
-     */
-    VERSION: "1.1.2",
-
-    /**
-     * Property: schemaLocation
-     * {String} Schema location
-     */
-    schemaLocation: "http://www.opengis.net/wcs/1.1 http://schemas.opengis.net/wcs/1.1/wcsGetCoverage.xsd",
-
-    /**
-     * Constructor: OpenLayers.Format.WCSGetCoverage
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be set on
-     *     this instance.
-     */
-
-    /**
-     * Method: write
-     *
-     * Parameters:
-     * options - {Object} Optional object.
-     *
-     * Returns:
-     * {String} A WCS GetCoverage request XML string.
-     */
-    write: function(options) {
-        var node = this.writeNode("wcs:GetCoverage", options);
-        this.setAttributeNS(
-            node, this.namespaces.xsi,
-            "xsi:schemaLocation", this.schemaLocation
-        );
-        return OpenLayers.Format.XML.prototype.write.apply(this, [node]);
-    }, 
-
-    /**
-     * Property: writers
-     * As a compliment to the readers property, this structure contains public
-     *     writing functions grouped by namespace alias and named like the
-     *     node names they produce.
-     */
-    writers: {
-        "wcs": {
-            "GetCoverage": function(options) {
-                var node = this.createElementNSPlus("wcs:GetCoverage", {
-                    attributes: {
-                        version: options.version || this.VERSION,
-                        service: 'WCS'
-                    } 
-                }); 
-                this.writeNode("ows:Identifier", options.identifier, node);
-                this.writeNode("wcs:DomainSubset", options.domainSubset, node);
-                this.writeNode("wcs:Output", options.output, node);
-                return node; 
-            },
-            "DomainSubset": function(domainSubset) {
-                var node = this.createElementNSPlus("wcs:DomainSubset", {});
-                this.writeNode("ows:BoundingBox", domainSubset.boundingBox, node);
-                if (domainSubset.temporalSubset) {
-                    this.writeNode("wcs:TemporalSubset", domainSubset.temporalSubset, node);
-                }
-                return node;
-            },
-            "TemporalSubset": function(temporalSubset) {
-                var node = this.createElementNSPlus("wcs:TemporalSubset", {});
-                for (var i=0, len=temporalSubset.timePeriods.length; i<len; ++i) {
-                    this.writeNode("wcs:TimePeriod", temporalSubset.timePeriods[i], node);
-                }
-                return node;
-            },
-            "TimePeriod": function(timePeriod) {
-                var node = this.createElementNSPlus("wcs:TimePeriod", {});
-                this.writeNode("wcs:BeginPosition", timePeriod.begin, node);
-                this.writeNode("wcs:EndPosition", timePeriod.end, node);
-                if (timePeriod.resolution) {
-                    this.writeNode("wcs:TimeResolution", timePeriod.resolution, node);
-                }
-                return node;
-            },
-            "BeginPosition": function(begin) {
-                var node = this.createElementNSPlus("wcs:BeginPosition", {
-                    value: begin
-                });
-                return node;
-            },
-            "EndPosition": function(end) {
-                var node = this.createElementNSPlus("wcs:EndPosition", {
-                    value: end
-                });
-                return node;
-            },
-            "TimeResolution": function(resolution) {
-                var node = this.createElementNSPlus("wcs:TimeResolution", {
-                    value: resolution
-                });
-                return node;
-            },
-            "Output": function(output) {
-                var node = this.createElementNSPlus("wcs:Output", {
-                    attributes: {
-                        format: output.format,
-                        store: output.store
-                    }
-                });
-                if (output.gridCRS) {
-                    this.writeNode("wcs:GridCRS", output.gridCRS, node);
-                }
-                return node;
-            },
-            "GridCRS": function(gridCRS) {
-                var node = this.createElementNSPlus("wcs:GridCRS", {});
-                this.writeNode("wcs:GridBaseCRS", gridCRS.baseCRS, node);
-                if (gridCRS.type) {
-                    this.writeNode("wcs:GridType", gridCRS.type, node);
-                }
-                if (gridCRS.origin) {
-                    this.writeNode("wcs:GridOrigin", gridCRS.origin, node);
-                }
-                this.writeNode("wcs:GridOffsets", gridCRS.offsets, node);
-                if (gridCRS.CS) {
-                    this.writeNode("wcs:GridCS", gridCRS.CS, node);
-                }
-                return node;
-            },
-            "GridBaseCRS": function(baseCRS) {
-                return this.createElementNSPlus("wcs:GridBaseCRS", {
-                    value: baseCRS
-                });
-            },
-            "GridOrigin": function(origin) {
-                return this.createElementNSPlus("wcs:GridOrigin", {
-                    value: origin
-                });
-            },
-            "GridType": function(type) {
-                return this.createElementNSPlus("wcs:GridType", {
-                    value: type
-                });
-            },
-            "GridOffsets": function(offsets) {
-                return this.createElementNSPlus("wcs:GridOffsets", {
-                    value: offsets
-                });
-            },
-            "GridCS": function(CS) {
-                return this.createElementNSPlus("wcs:GridCS", {
-                    value: CS
-                });
-            }
-        },
-        "ows": OpenLayers.Format.OWSCommon.v1_1_0.prototype.writers.ows
-    },
-    
-    CLASS_NAME: "OpenLayers.Format.WCSGetCoverage" 
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WFS.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WFS.js
deleted file mode 100644
index 44b03a3a..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WFS.js
+++ /dev/null
@@ -1,223 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/GML.js
- * @requires OpenLayers/Console.js
- * @requires OpenLayers/Lang.js
- */
-
-/**
- * Class: OpenLayers.Format.WFS
- * Read/Write WFS. 
- *
- * Inherits from:
- *  - <OpenLayers.Format.GML>
- */
-OpenLayers.Format.WFS = OpenLayers.Class(OpenLayers.Format.GML, {
-    
-    /** 
-     * Property: layer
-     * {<OpenLayers.Layer>}
-     */
-    layer: null,
-    
-    /**
-     * APIProperty: wfsns
-     * {String}
-     */
-    wfsns: "http://www.opengis.net/wfs",
-    
-    /**
-     * Property: ogcns
-     * {String}
-     */
-    ogcns: "http://www.opengis.net/ogc",
-    
-    /**
-     * Constructor: OpenLayers.Format.WFS
-     * Create a WFS-T formatter. This requires a layer: that layer should
-     * have two properties: geometry_column and typename. The parser
-     * for this format is subclassed entirely from GML: There is a writer 
-     * only, which uses most of the code from the GML layer, and wraps
-     * it in transactional elements.
-     * 
-     * Parameters: 
-     * options - {Object} 
-     * layer - {<OpenLayers.Layer>} 
-     */
-    initialize: function(options, layer) {
-        OpenLayers.Format.GML.prototype.initialize.apply(this, [options]);
-        this.layer = layer;
-        if (this.layer.featureNS) {
-            this.featureNS = this.layer.featureNS;
-        }    
-        if (this.layer.options.geometry_column) {
-            this.geometryName = this.layer.options.geometry_column;
-        }
-        if (this.layer.options.typename) {
-            this.featureName = this.layer.options.typename;
-        }
-    },
-    
-    /**
-     * Method: write 
-     * Takes a feature list, and generates a WFS-T Transaction 
-     *
-     * Parameters:
-     * features - {Array(<OpenLayers.Feature.Vector>)} 
-     */
-    write: function(features) {
-    
-        var transaction = this.createElementNS(this.wfsns, 'wfs:Transaction');
-        transaction.setAttribute("version","1.0.0");
-        transaction.setAttribute("service","WFS");
-        for (var i=0; i < features.length; i++) {
-            switch (features[i].state) {
-                case OpenLayers.State.INSERT:
-                    transaction.appendChild(this.insert(features[i]));
-                    break;
-                case OpenLayers.State.UPDATE:
-                    transaction.appendChild(this.update(features[i]));
-                    break;
-                case OpenLayers.State.DELETE:
-                    transaction.appendChild(this.remove(features[i]));
-                    break;
-            }
-        }
-        
-        return OpenLayers.Format.XML.prototype.write.apply(this,[transaction]);
-    },
-   
-    /**
-     * Method: createFeatureXML
-     *
-     * Parameters: 
-     * feature - {<OpenLayers.Feature.Vector>}
-     */ 
-    createFeatureXML: function(feature) {
-        var geometryNode = this.buildGeometryNode(feature.geometry);
-        var geomContainer = this.createElementNS(this.featureNS, "feature:" + this.geometryName);
-        geomContainer.appendChild(geometryNode);
-        var featureContainer = this.createElementNS(this.featureNS, "feature:" + this.featureName);
-        featureContainer.appendChild(geomContainer);
-        for(var attr in feature.attributes) {
-            var attrText = this.createTextNode(feature.attributes[attr]); 
-            var nodename = attr;
-            if (attr.search(":") != -1) {
-                nodename = attr.split(":")[1];
-            }    
-            var attrContainer = this.createElementNS(this.featureNS, "feature:" + nodename);
-            attrContainer.appendChild(attrText);
-            featureContainer.appendChild(attrContainer);
-        }    
-        return featureContainer;
-    },
-    
-    /**
-     * Method: insert 
-     * Takes a feature, and generates a WFS-T Transaction "Insert" 
-     *
-     * Parameters: 
-     * feature - {<OpenLayers.Feature.Vector>} 
-     */
-    insert: function(feature) {
-        var insertNode = this.createElementNS(this.wfsns, 'wfs:Insert');
-        insertNode.appendChild(this.createFeatureXML(feature));
-        return insertNode;
-    },
-    
-    /**
-     * Method: update
-     * Takes a feature, and generates a WFS-T Transaction "Update" 
-     *
-     * Parameters:
-     * feature - {<OpenLayers.Feature.Vector>} 
-     */
-    update: function(feature) {
-        if (!feature.fid) { OpenLayers.Console.userError(OpenLayers.i18n("noFID")); }
-        var updateNode = this.createElementNS(this.wfsns, 'wfs:Update');
-        updateNode.setAttribute("typeName", this.featurePrefix + ':' + this.featureName); 
-        updateNode.setAttribute("xmlns:" + this.featurePrefix, this.featureNS); 
-
-        var propertyNode = this.createElementNS(this.wfsns, 'wfs:Property');
-        var nameNode = this.createElementNS(this.wfsns, 'wfs:Name');
-        
-        var txtNode = this.createTextNode(this.geometryName);
-        nameNode.appendChild(txtNode);
-        propertyNode.appendChild(nameNode);
-        
-        var valueNode = this.createElementNS(this.wfsns, 'wfs:Value');
-        
-        var geometryNode = this.buildGeometryNode(feature.geometry);
-        
-        if(feature.layer){
-            geometryNode.setAttribute(
-                "srsName", feature.layer.projection.getCode()
-            );
-        }
-        
-        valueNode.appendChild(geometryNode);
-        
-        propertyNode.appendChild(valueNode);
-        updateNode.appendChild(propertyNode);
-        
-         // add in attributes
-        for(var propName in feature.attributes) {
-            propertyNode = this.createElementNS(this.wfsns, 'wfs:Property');
-            nameNode = this.createElementNS(this.wfsns, 'wfs:Name');
-            nameNode.appendChild(this.createTextNode(propName));
-            propertyNode.appendChild(nameNode);
-            valueNode = this.createElementNS(this.wfsns, 'wfs:Value');
-            valueNode.appendChild(this.createTextNode(feature.attributes[propName]));
-            propertyNode.appendChild(valueNode);
-            updateNode.appendChild(propertyNode);
-        }
-        
-        
-        var filterNode = this.createElementNS(this.ogcns, 'ogc:Filter');
-        var filterIdNode = this.createElementNS(this.ogcns, 'ogc:FeatureId');
-        filterIdNode.setAttribute("fid", feature.fid);
-        filterNode.appendChild(filterIdNode);
-        updateNode.appendChild(filterNode);
-
-        return updateNode;
-    },
-    
-    /**
-     * Method: remove 
-     * Takes a feature, and generates a WFS-T Transaction "Delete" 
-     *
-     * Parameters:
-     * feature - {<OpenLayers.Feature.Vector>} 
-     */
-    remove: function(feature) {
-        if (!feature.fid) { 
-            OpenLayers.Console.userError(OpenLayers.i18n("noFID")); 
-            return false; 
-        }
-        var deleteNode = this.createElementNS(this.wfsns, 'wfs:Delete');
-        deleteNode.setAttribute("typeName", this.featurePrefix + ':' + this.featureName); 
-        deleteNode.setAttribute("xmlns:" + this.featurePrefix, this.featureNS); 
-
-        var filterNode = this.createElementNS(this.ogcns, 'ogc:Filter');
-        var filterIdNode = this.createElementNS(this.ogcns, 'ogc:FeatureId');
-        filterIdNode.setAttribute("fid", feature.fid);
-        filterNode.appendChild(filterIdNode);
-        deleteNode.appendChild(filterNode);
-
-        return deleteNode;
-    },
-
-    /**
-     * APIMethod: destroy
-     * Remove ciruclar ref to layer 
-     */
-    destroy: function() {
-        this.layer = null;
-    },
-
-    CLASS_NAME: "OpenLayers.Format.WFS" 
-});    
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WFSCapabilities.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WFSCapabilities.js
deleted file mode 100644
index 61af0856..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WFSCapabilities.js
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/XML/VersionedOGC.js
- */
-
-/**
- * Class: OpenLayers.Format.WFSCapabilities
- * Read WFS Capabilities.
- * 
- * Inherits from:
- *  - <OpenLayers.Format.XML.VersionedOGC>
- */
-OpenLayers.Format.WFSCapabilities = OpenLayers.Class(OpenLayers.Format.XML.VersionedOGC, {
-    
-    /**
-     * APIProperty: defaultVersion
-     * {String} Version number to assume if none found.  Default is "1.1.0".
-     */
-    defaultVersion: "1.1.0",
-
-    /**
-     * Constructor: OpenLayers.Format.WFSCapabilities
-     * Create a new parser for WFS capabilities.
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be set on
-     *     this instance.
-     */
-
-    /**
-     * APIMethod: read
-     * Read capabilities data from a string, and return a list of layers. 
-     * 
-     * Parameters: 
-     * data - {String} or {DOMElement} data to read/parse.
-     *
-     * Returns:
-     * {Array} List of named layers.
-     */
-    
-    CLASS_NAME: "OpenLayers.Format.WFSCapabilities" 
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WFSCapabilities/v1.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WFSCapabilities/v1.js
deleted file mode 100644
index c4ec5170..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WFSCapabilities/v1.js
+++ /dev/null
@@ -1,129 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/WFSCapabilities.js
- */
-
-/**
- * Class: OpenLayers.Format.WFSCapabilities.v1
- * Abstract class not to be instantiated directly.
- * 
- * Inherits from:
- *  - <OpenLayers.Format.XML>
- */
-OpenLayers.Format.WFSCapabilities.v1 = OpenLayers.Class(
-    OpenLayers.Format.XML, {
-
-    /**
-     * Property: namespaces
-     * {Object} Mapping of namespace aliases to namespace URIs.
-     */
-    namespaces: {
-        wfs: "http://www.opengis.net/wfs",
-        xlink: "http://www.w3.org/1999/xlink",
-        xsi: "http://www.w3.org/2001/XMLSchema-instance",
-        ows: "http://www.opengis.net/ows"
-    },
-
-
-    /**
-     * APIProperty: errorProperty
-     * {String} Which property of the returned object to check for in order to
-     * determine whether or not parsing has failed. In the case that the
-     * errorProperty is undefined on the returned object, the document will be
-     * run through an OGCExceptionReport parser.
-     */
-    errorProperty: "featureTypeList",
-
-    /**
-     * Property: defaultPrefix
-     */
-    defaultPrefix: "wfs",
-    
-    /**
-     * Constructor: OpenLayers.Format.WFSCapabilities.v1_1
-     * Create an instance of one of the subclasses.
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be set on
-     *     this instance.
-     */
-
-    /**
-     * APIMethod: read
-     * Read capabilities data from a string, and return a list of layers. 
-     * 
-     * Parameters: 
-     * data - {String} or {DOMElement} data to read/parse.
-     *
-     * Returns:
-     * {Array} List of named layers.
-     */
-    read: function(data) {
-        if(typeof data == "string") {
-            data = OpenLayers.Format.XML.prototype.read.apply(this, [data]);
-        }
-        var raw = data;
-        if(data && data.nodeType == 9) {
-            data = data.documentElement;
-        }
-        var capabilities = {};
-        this.readNode(data, capabilities);
-        return capabilities;
-    },
-
-    /**
-     * Property: readers
-     * Contains public functions, grouped by namespace prefix, that will
-     *     be applied when a namespaced node is found matching the function
-     *     name.  The function will be applied in the scope of this parser
-     *     with two arguments: the node being read and a context object passed
-     *     from the parent.
-     */
-    readers: {
-        "wfs": {
-            "WFS_Capabilities": function(node, obj) {
-                this.readChildNodes(node, obj);
-            },
-            "FeatureTypeList": function(node, request) {
-                request.featureTypeList = {
-                    featureTypes: []
-                };
-                this.readChildNodes(node, request.featureTypeList);
-            },
-            "FeatureType": function(node, featureTypeList) {
-                var featureType = {};
-                this.readChildNodes(node, featureType);
-                featureTypeList.featureTypes.push(featureType);
-            },
-            "Name": function(node, obj) {
-                var name = this.getChildValue(node);
-                if(name) {
-                    var parts = name.split(":");
-                    obj.name = parts.pop();
-                    if(parts.length > 0) {
-                        obj.featureNS = this.lookupNamespaceURI(node, parts[0]);
-                    }
-                }
-            },
-            "Title": function(node, obj) {
-                var title = this.getChildValue(node);
-                if(title) {
-                    obj.title = title;
-                }
-            },
-            "Abstract": function(node, obj) {
-                var abst = this.getChildValue(node);
-                if(abst) {
-                    obj["abstract"] = abst;
-                }
-            }
-        }
-    },
-
-    CLASS_NAME: "OpenLayers.Format.WFSCapabilities.v1" 
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WFSCapabilities/v1_0_0.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WFSCapabilities/v1_0_0.js
deleted file mode 100644
index 6b202c74..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WFSCapabilities/v1_0_0.js
+++ /dev/null
@@ -1,115 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/WFSCapabilities/v1.js
- */
-
-/**
- * Class: OpenLayers.Format.WFSCapabilities/v1_0_0
- * Read WFS Capabilities version 1.0.0.
- * 
- * Inherits from:
- *  - <OpenLayers.Format.WFSCapabilities.v1>
- */
-OpenLayers.Format.WFSCapabilities.v1_0_0 = OpenLayers.Class(
-    OpenLayers.Format.WFSCapabilities.v1, {
-    
-    /**
-     * Constructor: OpenLayers.Format.WFSCapabilities.v1_0_0
-     * Create a new parser for WFS capabilities version 1.0.0.
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be set on
-     *     this instance.
-     */
-
-    /**
-     * Property: readers
-     * Contains public functions, grouped by namespace prefix, that will
-     *     be applied when a namespaced node is found matching the function
-     *     name.  The function will be applied in the scope of this parser
-     *     with two arguments: the node being read and a context object passed
-     *     from the parent.
-     */
-    readers: {
-        "wfs": OpenLayers.Util.applyDefaults({
-            "Service": function(node, capabilities) {
-                capabilities.service = {};
-                this.readChildNodes(node, capabilities.service);
-            },
-            "Fees": function(node, service) {
-                var fees = this.getChildValue(node);
-                if (fees && fees.toLowerCase() != "none") {
-                    service.fees = fees;
-                }
-            },
-            "AccessConstraints": function(node, service) {
-                var constraints = this.getChildValue(node);
-                if (constraints && constraints.toLowerCase() != "none") {
-                    service.accessConstraints = constraints;
-                }
-            },
-            "OnlineResource": function(node, service) {
-                var onlineResource = this.getChildValue(node);
-                if (onlineResource && onlineResource.toLowerCase() != "none") {
-                    service.onlineResource = onlineResource;
-                }
-            },
-            "Keywords": function(node, service) {
-                var keywords = this.getChildValue(node);
-                if (keywords && keywords.toLowerCase() != "none") {
-                    service.keywords = keywords.split(', ');
-                }
-            },
-            "Capability": function(node, capabilities) {
-                capabilities.capability = {};
-                this.readChildNodes(node, capabilities.capability);
-            },
-            "Request": function(node, obj) {
-                obj.request = {};
-                this.readChildNodes(node, obj.request);
-            },
-            "GetFeature": function(node, request) {
-                request.getfeature = {
-                    href: {}, // DCPType
-                    formats: [] // ResultFormat
-                };
-                this.readChildNodes(node, request.getfeature);
-            },
-            "ResultFormat": function(node, obj) {
-                var children = node.childNodes;
-                var childNode;
-                for(var i=0; i<children.length; i++) {
-                    childNode = children[i];
-                    if(childNode.nodeType == 1) {
-                        obj.formats.push(childNode.nodeName);
-                    }
-                }
-            },
-            "DCPType": function(node, obj) {
-                this.readChildNodes(node, obj);
-            },
-            "HTTP": function(node, obj) {
-                this.readChildNodes(node, obj.href);
-            },
-            "Get": function(node, obj) {
-                obj.get = node.getAttribute("onlineResource");
-            },
-            "Post": function(node, obj) {
-                obj.post = node.getAttribute("onlineResource");
-            },
-            "SRS": function(node, obj) {
-                var srs = this.getChildValue(node);
-                if (srs) {
-                    obj.srs = srs;
-                }
-            }
-        }, OpenLayers.Format.WFSCapabilities.v1.prototype.readers["wfs"])
-    },
-    
-    CLASS_NAME: "OpenLayers.Format.WFSCapabilities.v1_0_0" 
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WFSCapabilities/v1_1_0.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WFSCapabilities/v1_1_0.js
deleted file mode 100644
index 84f6b4bf..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WFSCapabilities/v1_1_0.js
+++ /dev/null
@@ -1,63 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/WFSCapabilities/v1.js
- * @requires OpenLayers/Format/OWSCommon/v1.js
- */
-
-/**
- * Class: OpenLayers.Format.WFSCapabilities/v1_1_0
- * Read WFS Capabilities version 1.1.0.
- * 
- * Inherits from:
- *  - <OpenLayers.Format.WFSCapabilities>
- */
-OpenLayers.Format.WFSCapabilities.v1_1_0 = OpenLayers.Class(
-    OpenLayers.Format.WFSCapabilities.v1, {
-
-    /**
-     * Property: regExes
-     * Compiled regular expressions for manipulating strings.
-     */
-    regExes: {
-        trimSpace: (/^\s*|\s*$/g),
-        removeSpace: (/\s*/g),
-        splitSpace: (/\s+/),
-        trimComma: (/\s*,\s*/g)
-    },
-    
-    /**
-     * Constructor: OpenLayers.Format.WFSCapabilities.v1_1_0
-     * Create a new parser for WFS capabilities version 1.1.0.
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be set on
-     *     this instance.
-     */
-
-    /**
-     * Property: readers
-     * Contains public functions, grouped by namespace prefix, that will
-     *     be applied when a namespaced node is found matching the function
-     *     name.  The function will be applied in the scope of this parser
-     *     with two arguments: the node being read and a context object passed
-     *     from the parent.
-     */
-    readers: {
-        "wfs": OpenLayers.Util.applyDefaults({
-            "DefaultSRS": function(node, obj) {
-                var defaultSRS = this.getChildValue(node);
-                if (defaultSRS) {
-                    obj.srs = defaultSRS;
-                }
-            }
-        }, OpenLayers.Format.WFSCapabilities.v1.prototype.readers["wfs"]),
-        "ows": OpenLayers.Format.OWSCommon.v1.prototype.readers.ows
-    },
-
-    CLASS_NAME: "OpenLayers.Format.WFSCapabilities.v1_1_0" 
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WFSDescribeFeatureType.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WFSDescribeFeatureType.js
deleted file mode 100644
index 416e845e..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WFSDescribeFeatureType.js
+++ /dev/null
@@ -1,234 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/XML.js
- * @requires OpenLayers/Format/OGCExceptionReport.js
- */
- 
-/**
- * Class: OpenLayers.Format.WFSDescribeFeatureType
- * Read WFS DescribeFeatureType response
- * 
- * Inherits from:
- *  - <OpenLayers.Format.XML>
- */
-OpenLayers.Format.WFSDescribeFeatureType = OpenLayers.Class(
-    OpenLayers.Format.XML, {
-
-    /**
-     * Property: regExes
-     * Compiled regular expressions for manipulating strings.
-     */
-    regExes: {
-        trimSpace: (/^\s*|\s*$/g)
-    },
-    
-    /**
-     * Property: namespaces
-     * {Object} Mapping of namespace aliases to namespace URIs.
-     */
-    namespaces: {
-        xsd: "http://www.w3.org/2001/XMLSchema"
-    },
-    
-    /**
-     * Constructor: OpenLayers.Format.WFSDescribeFeatureType
-     * Create a new parser for WFS DescribeFeatureType responses.
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be set on
-     *     this instance.
-     */
-    
-    /**
-     * Property: readers
-     * Contains public functions, grouped by namespace prefix, that will
-     *     be applied when a namespaced node is found matching the function
-     *     name.  The function will be applied in the scope of this parser
-     *     with two arguments: the node being read and a context object passed
-     *     from the parent.
-     */
-    readers: {
-        "xsd": {
-            "schema": function(node, obj) {
-                var complexTypes = [];
-                var customTypes = {};
-                var schema = {
-                    complexTypes: complexTypes,
-                    customTypes: customTypes
-                };
-                var i, len;
-                
-                this.readChildNodes(node, schema);
-
-                var attributes = node.attributes;
-                var attr, name;
-                for(i=0, len=attributes.length; i<len; ++i) {
-                    attr = attributes[i];
-                    name = attr.name;
-                    if(name.indexOf("xmlns") === 0) {
-                        this.setNamespace(name.split(":")[1] || "", attr.value);
-                    } else {
-                        obj[name] = attr.value;
-                    }
-                }
-                obj.featureTypes = complexTypes;                
-                obj.targetPrefix = this.namespaceAlias[obj.targetNamespace];
-                
-                // map complexTypes to names of customTypes
-                var complexType, customType;
-                for(i=0, len=complexTypes.length; i<len; ++i) {
-                    complexType = complexTypes[i];
-                    customType = customTypes[complexType.typeName];
-                    if(customTypes[complexType.typeName]) {
-                        complexType.typeName = customType.name;
-                    }
-                }
-            },
-            "complexType": function(node, obj) {
-                var complexType = {
-                    // this is a temporary typeName, it will be overwritten by
-                    // the schema reader with the metadata found in the
-                    // customTypes hash
-                    "typeName": node.getAttribute("name")
-                };
-                this.readChildNodes(node, complexType);
-                obj.complexTypes.push(complexType);
-            },
-            "complexContent": function(node, obj) {
-                this.readChildNodes(node, obj);
-            },
-            "extension": function(node, obj) {
-                this.readChildNodes(node, obj);
-            },
-            "sequence": function(node, obj) {
-                var sequence = {
-                    elements: []
-                };
-                this.readChildNodes(node, sequence);
-                obj.properties = sequence.elements;
-            },
-            "element": function(node, obj) {
-                var type;
-                if(obj.elements) {
-                    var element = {};
-                    var attributes = node.attributes;
-                    var attr;
-                    for(var i=0, len=attributes.length; i<len; ++i) {
-                        attr = attributes[i];
-                        element[attr.name] = attr.value;
-                    }
-                    
-                    type = element.type;
-                    if(!type) {
-                        type = {};
-                        this.readChildNodes(node, type);
-                        element.restriction = type;
-                        element.type = type.base;
-                    }
-                    var fullType = type.base || type;
-                    element.localType = fullType.split(":").pop();
-                    obj.elements.push(element);
-                    this.readChildNodes(node, element);
-                }
-                
-                if(obj.complexTypes) {
-                    type = node.getAttribute("type");
-                    var localType = type.split(":").pop();
-                    obj.customTypes[localType] = {
-                        "name": node.getAttribute("name"),
-                        "type": type
-                    };
-                }
-            },
-            "annotation": function(node, obj) {
-                obj.annotation = {};
-                this.readChildNodes(node, obj.annotation);
-            },
-            "appinfo": function(node, obj) {
-                if (!obj.appinfo) {
-                    obj.appinfo = [];
-                }
-                obj.appinfo.push(this.getChildValue(node));
-            },
-            "documentation": function(node, obj) {
-                if (!obj.documentation) {
-                    obj.documentation = [];
-                }
-                var value = this.getChildValue(node);
-                obj.documentation.push({
-                    lang: node.getAttribute("xml:lang"),
-                    textContent: value.replace(this.regExes.trimSpace, "")
-                });
-            },
-            "simpleType": function(node, obj) {
-                this.readChildNodes(node, obj);
-            },
-            "restriction": function(node, obj) {
-                obj.base = node.getAttribute("base");
-                this.readRestriction(node, obj);
-            }
-        }
-    },
-    
-    /**
-     * Method: readRestriction
-     * Reads restriction defined in the child nodes of a restriction element
-     * 
-     * Parameters:
-     * node - {DOMElement} the node to parse
-     * obj - {Object} the object that receives the read result
-     */
-    readRestriction: function(node, obj) {
-        var children = node.childNodes;
-        var child, nodeName, value;
-        for(var i=0, len=children.length; i<len; ++i) {
-            child = children[i];
-            if(child.nodeType == 1) {
-                nodeName = child.nodeName.split(":").pop();
-                value = child.getAttribute("value");
-                if(!obj[nodeName]) {
-                    obj[nodeName] = value;
-                } else {
-                    if(typeof obj[nodeName] == "string") {
-                        obj[nodeName] = [obj[nodeName]];
-                    }
-                    obj[nodeName].push(value);
-                }
-            }
-        }
-    },
-    
-    /**
-     * Method: read
-     *
-     * Parameters:
-     * data - {DOMElement|String} A WFS DescribeFeatureType document.
-     *
-     * Returns:
-     * {Object} An object representing the WFS DescribeFeatureType response.
-     */
-    read: function(data) {
-        if(typeof data == "string") { 
-            data = OpenLayers.Format.XML.prototype.read.apply(this, [data]);
-        }
-        if(data && data.nodeType == 9) {
-            data = data.documentElement;
-        }
-        var schema = {};
-        if (data.nodeName.split(":").pop() === 'ExceptionReport') {
-            // an exception must have occurred, so parse it
-            var parser = new OpenLayers.Format.OGCExceptionReport();
-            schema.error = parser.read(data);
-        } else {
-            this.readNode(data, schema);
-        }
-        return schema;
-    },
-    
-    CLASS_NAME: "OpenLayers.Format.WFSDescribeFeatureType" 
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WFST.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WFST.js
deleted file mode 100644
index eb3d9d9c..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WFST.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format.js
- */
-
-/**
- * Function: OpenLayers.Format.WFST
- * Used to create a versioned WFS protocol.  Default version is 1.0.0.
- *
- * Returns:
- * {<OpenLayers.Format>} A WFST format of the given version.
- */
-OpenLayers.Format.WFST = function(options) {
-    options = OpenLayers.Util.applyDefaults(
-        options, OpenLayers.Format.WFST.DEFAULTS
-    );
-    var cls = OpenLayers.Format.WFST["v"+options.version.replace(/\./g, "_")];
-    if(!cls) {
-        throw "Unsupported WFST version: " + options.version;
-    }
-    return new cls(options);
-};
-
-/**
- * Constant: OpenLayers.Format.WFST.DEFAULTS
- * {Object} Default properties for the WFST format.
- */
-OpenLayers.Format.WFST.DEFAULTS = {
-    "version": "1.0.0"
-};
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WFST/v1.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WFST/v1.js
deleted file mode 100644
index 306ba6ff..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WFST/v1.js
+++ /dev/null
@@ -1,446 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/XML.js
- * @requires OpenLayers/Format/WFST.js
- * @requires OpenLayers/Filter/Spatial.js
- * @requires OpenLayers/Filter/FeatureId.js
- */
-
-/**
- * Class: OpenLayers.Format.WFST.v1
- * Superclass for WFST parsers.
- *
- * Inherits from:
- *  - <OpenLayers.Format.XML>
- */
-OpenLayers.Format.WFST.v1 = OpenLayers.Class(OpenLayers.Format.XML, {
-    
-    /**
-     * Property: namespaces
-     * {Object} Mapping of namespace aliases to namespace URIs.
-     */
-    namespaces: {
-        xlink: "http://www.w3.org/1999/xlink",
-        xsi: "http://www.w3.org/2001/XMLSchema-instance",
-        wfs: "http://www.opengis.net/wfs",
-        gml: "http://www.opengis.net/gml",
-        ogc: "http://www.opengis.net/ogc",
-        ows: "http://www.opengis.net/ows"
-    },
-    
-    /**
-     * Property: defaultPrefix
-     */
-    defaultPrefix: "wfs",
-
-    /**
-     * Property: version
-     * {String} WFS version number.
-     */
-    version: null,
-
-    /**
-     * Property: schemaLocation
-     * {String} Schema location for a particular minor version.
-     */
-    schemaLocations: null,
-    
-    /**
-     * APIProperty: srsName
-     * {String} URI for spatial reference system.
-     */
-    srsName: null,
-
-    /**
-     * APIProperty: extractAttributes
-     * {Boolean} Extract attributes from GML.  Default is true.
-     */
-    extractAttributes: true,
-    
-    /**
-     * APIProperty: xy
-     * {Boolean} Order of the GML coordinate true:(x,y) or false:(y,x)
-     * Changing is not recommended, a new Format should be instantiated.
-     */ 
-    xy: true,
-
-    /**
-     * Property: stateName
-     * {Object} Maps feature states to node names.
-     */
-    stateName: null,
-    
-    /**
-     * Constructor: OpenLayers.Format.WFST.v1
-     * Instances of this class are not created directly.  Use the
-     *     <OpenLayers.Format.WFST.v1_0_0> or <OpenLayers.Format.WFST.v1_1_0>
-     *     constructor instead.
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be set on
-     *     this instance.
-     */
-    initialize: function(options) {
-        // set state name mapping
-        this.stateName = {};
-        this.stateName[OpenLayers.State.INSERT] = "wfs:Insert";
-        this.stateName[OpenLayers.State.UPDATE] = "wfs:Update";
-        this.stateName[OpenLayers.State.DELETE] = "wfs:Delete";
-        OpenLayers.Format.XML.prototype.initialize.apply(this, [options]);
-    },
-    
-    /**
-     * Method: getSrsName
-     */
-    getSrsName: function(feature, options) {
-        var srsName = options && options.srsName;
-        if(!srsName) {
-            if(feature && feature.layer) {
-                srsName = feature.layer.projection.getCode();
-            } else {
-                srsName = this.srsName;
-            }
-        }
-        return srsName;
-    },
-
-    /**
-     * APIMethod: read
-     * Parse the response from a transaction.  Because WFS is split into
-     *     Transaction requests (create, update, and delete) and GetFeature
-     *     requests (read), this method handles parsing of both types of
-     *     responses.
-     *
-     * Parameters:
-     * data - {String | Document} The WFST document to read
-     * options - {Object} Options for the reader
-     *
-     * Valid options properties:
-     * output - {String} either "features" or "object". The default is
-     *     "features", which means that the method will return an array of
-     *     features. If set to "object", an object with a "features" property
-     *     and other properties read by the parser will be returned.
-     *
-     * Returns:
-     * {Array | Object} Output depending on the output option.
-     */
-    read: function(data, options) {
-        options = options || {};
-        OpenLayers.Util.applyDefaults(options, {
-            output: "features"
-        });
-        
-        if(typeof data == "string") { 
-            data = OpenLayers.Format.XML.prototype.read.apply(this, [data]);
-        }
-        if(data && data.nodeType == 9) {
-            data = data.documentElement;
-        }
-        var obj = {};
-        if(data) {
-            this.readNode(data, obj, true);
-        }
-        if(obj.features && options.output === "features") {
-            obj = obj.features;
-        }
-        return obj;
-    },
-    
-    /**
-     * Property: readers
-     * Contains public functions, grouped by namespace prefix, that will
-     *     be applied when a namespaced node is found matching the function
-     *     name.  The function will be applied in the scope of this parser
-     *     with two arguments: the node being read and a context object passed
-     *     from the parent.
-     */
-    readers: {
-        "wfs": {
-            "FeatureCollection": function(node, obj) {
-                obj.features = [];
-                this.readChildNodes(node, obj);
-            }
-        }
-    },
-    
-    /**
-     * Method: write
-     * Given an array of features, write a WFS transaction.  This assumes
-     *     the features have a state property that determines the operation
-     *     type - insert, update, or delete.
-     *
-     * Parameters:
-     * features - {Array(<OpenLayers.Feature.Vector>)} A list of features. See
-     *     below for a more detailed description of the influence of the
-     *     feature's *modified* property.
-     * options - {Object}
-     *
-     * feature.modified rules:
-     * If a feature has a modified property set, the following checks will be
-     * made before a feature's geometry or attribute is included in an Update
-     * transaction:
-     * - *modified* is not set at all: The geometry and all attributes will be
-     *     included.
-     * - *modified.geometry* is set (null or a geometry): The geometry will be
-     *     included. If *modified.attributes* is not set, all attributes will
-     *     be included.
-     * - *modified.attributes* is set: Only the attributes set (i.e. to null or
-     *     a value) in *modified.attributes* will be included. 
-     *     If *modified.geometry* is not set, the geometry will not be included.
-     *
-     * Valid options include:
-     * - *multi* {Boolean} If set to true, geometries will be casted to
-     *   Multi geometries before writing.
-     *
-     * Returns:
-     * {String} A serialized WFS transaction.
-     */
-    write: function(features, options) {
-        var node = this.writeNode("wfs:Transaction", {
-            features:features,
-            options: options
-        });
-        var value = this.schemaLocationAttr();
-        if(value) {
-            this.setAttributeNS(
-                node, this.namespaces["xsi"], "xsi:schemaLocation",  value
-            );
-        }
-        return OpenLayers.Format.XML.prototype.write.apply(this, [node]);
-    },
-    
-    /**
-     * Property: writers
-     * As a compliment to the readers property, this structure contains public
-     *     writing functions grouped by namespace alias and named like the
-     *     node names they produce.
-     */
-    writers: {
-        "wfs": {
-            "GetFeature": function(options) {
-                var node = this.createElementNSPlus("wfs:GetFeature", {
-                    attributes: {
-                        service: "WFS",
-                        version: this.version,
-                        handle: options && options.handle,
-                        outputFormat: options && options.outputFormat,
-                        maxFeatures: options && options.maxFeatures,
-                        "xsi:schemaLocation": this.schemaLocationAttr(options)
-                    }
-                });
-                if (typeof this.featureType == "string") {
-                    this.writeNode("Query", options, node);
-                } else {
-                    for (var i=0,len = this.featureType.length; i<len; i++) { 
-                        options.featureType = this.featureType[i]; 
-                        this.writeNode("Query", options, node); 
-                    } 
-                }
-                return node;
-            },
-            "Transaction": function(obj) {
-                obj = obj || {};
-                var options = obj.options || {};
-                var node = this.createElementNSPlus("wfs:Transaction", {
-                    attributes: {
-                        service: "WFS",
-                        version: this.version,
-                        handle: options.handle
-                    }
-                });
-                var i, len;
-                var features = obj.features;
-                if(features) {
-                    // temporarily re-assigning geometry types
-                    if (options.multi === true) {
-                        OpenLayers.Util.extend(this.geometryTypes, {
-                            "OpenLayers.Geometry.Point": "MultiPoint",
-                            "OpenLayers.Geometry.LineString": (this.multiCurve === true) ? "MultiCurve": "MultiLineString",
-                            "OpenLayers.Geometry.Polygon": (this.multiSurface === true) ? "MultiSurface" : "MultiPolygon"
-                        });
-                    }
-                    var name, feature;
-                    for(i=0, len=features.length; i<len; ++i) {
-                        feature = features[i];
-                        name = this.stateName[feature.state];
-                        if(name) {
-                            this.writeNode(name, {
-                                feature: feature, 
-                                options: options
-                            }, node);
-                        }
-                    }
-                    // switch back to original geometry types assignment
-                    if (options.multi === true) {
-                        this.setGeometryTypes();
-                    }
-                }
-                if (options.nativeElements) {
-                    for (i=0, len=options.nativeElements.length; i<len; ++i) {
-                        this.writeNode("wfs:Native", 
-                            options.nativeElements[i], node);
-                    }
-                }
-                return node;
-            },
-            "Native": function(nativeElement) {
-                var node = this.createElementNSPlus("wfs:Native", {
-                    attributes: {
-                        vendorId: nativeElement.vendorId,
-                        safeToIgnore: nativeElement.safeToIgnore
-                    },
-                    value: nativeElement.value
-                });
-                return node;
-            },
-            "Insert": function(obj) {
-                var feature = obj.feature;
-                var options = obj.options;
-                var node = this.createElementNSPlus("wfs:Insert", {
-                    attributes: {
-                        handle: options && options.handle
-                    }
-                });
-                this.srsName = this.getSrsName(feature);
-                this.writeNode("feature:_typeName", feature, node);
-                return node;
-            },
-            "Update": function(obj) {
-                var feature = obj.feature;
-                var options = obj.options;
-                var node = this.createElementNSPlus("wfs:Update", {
-                    attributes: {
-                        handle: options && options.handle,
-                        typeName: (this.featureNS ? this.featurePrefix + ":" : "") +
-                            this.featureType
-                    }
-                });
-                if(this.featureNS) {
-                    node.setAttribute("xmlns:" + this.featurePrefix, this.featureNS);
-                }
-                
-                // add in geometry
-                var modified = feature.modified;
-                if (this.geometryName !== null && (!modified || modified.geometry !== undefined)) {
-                    this.srsName = this.getSrsName(feature);
-                    this.writeNode(
-                        "Property", {name: this.geometryName, value: feature.geometry}, node
-                    );
-                }
-        
-                // add in attributes
-                for(var key in feature.attributes) {
-                    if(feature.attributes[key] !== undefined &&
-                                (!modified || !modified.attributes ||
-                                (modified.attributes && modified.attributes[key] !== undefined))) {
-                        this.writeNode(
-                            "Property", {name: key, value: feature.attributes[key]}, node
-                        );
-                    }
-                }
-                
-                // add feature id filter
-                this.writeNode("ogc:Filter", new OpenLayers.Filter.FeatureId({
-                    fids: [feature.fid]
-                }), node);
-        
-                return node;
-            },
-            "Property": function(obj) {
-                var node = this.createElementNSPlus("wfs:Property");
-                this.writeNode("Name", obj.name, node);
-                if(obj.value !== null) {
-                    this.writeNode("Value", obj.value, node);
-                }
-                return node;
-            },
-            "Name": function(name) {
-                return this.createElementNSPlus("wfs:Name", {value: name});
-            },
-            "Value": function(obj) {
-                var node;
-                if(obj instanceof OpenLayers.Geometry) {
-                    node = this.createElementNSPlus("wfs:Value");
-                    var geom = this.writeNode("feature:_geometry", obj).firstChild;
-                    node.appendChild(geom);
-                } else {
-                    node = this.createElementNSPlus("wfs:Value", {value: obj});                
-                }
-                return node;
-            },
-            "Delete": function(obj) {
-                var feature = obj.feature;
-                var options = obj.options;
-                var node = this.createElementNSPlus("wfs:Delete", {
-                    attributes: {
-                        handle: options && options.handle,
-                        typeName: (this.featureNS ? this.featurePrefix + ":" : "") +
-                            this.featureType
-                    }
-                });
-                if(this.featureNS) {
-                    node.setAttribute("xmlns:" + this.featurePrefix, this.featureNS);
-                }
-                this.writeNode("ogc:Filter", new OpenLayers.Filter.FeatureId({
-                    fids: [feature.fid]
-                }), node);
-                return node;
-            }
-        }
-    },
-
-    /**
-     * Method: schemaLocationAttr
-     * Generate the xsi:schemaLocation attribute value.
-     *
-     * Returns:
-     * {String} The xsi:schemaLocation attribute or undefined if none.
-     */
-    schemaLocationAttr: function(options) {
-        options = OpenLayers.Util.extend({
-            featurePrefix: this.featurePrefix,
-            schema: this.schema
-        }, options);
-        var schemaLocations = OpenLayers.Util.extend({}, this.schemaLocations);
-        if(options.schema) {
-            schemaLocations[options.featurePrefix] = options.schema;
-        }
-        var parts = [];
-        var uri;
-        for(var key in schemaLocations) {
-            uri = this.namespaces[key];
-            if(uri) {
-                parts.push(uri + " " + schemaLocations[key]);
-            }
-        }
-        var value = parts.join(" ") || undefined;
-        return value;
-    },
-    
-    /**
-     * Method: setFilterProperty
-     * Set the property of each spatial filter.
-     *
-     * Parameters:
-     * filter - {<OpenLayers.Filter>}
-     */
-    setFilterProperty: function(filter) {
-        if(filter.filters) {
-            for(var i=0, len=filter.filters.length; i<len; ++i) {
-                OpenLayers.Format.WFST.v1.prototype.setFilterProperty.call(this, filter.filters[i]);
-            }
-        } else {
-            if(filter instanceof OpenLayers.Filter.Spatial && !filter.property) {
-                // got a spatial filter without property, so set it
-                filter.property = this.geometryName;
-            }
-        }
-    },
-
-    CLASS_NAME: "OpenLayers.Format.WFST.v1" 
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WFST/v1_0_0.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WFST/v1_0_0.js
deleted file mode 100644
index ed81a2d2..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WFST/v1_0_0.js
+++ /dev/null
@@ -1,174 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/WFST/v1.js
- * @requires OpenLayers/Format/Filter/v1_0_0.js
- */
-
-/**
- * Class: OpenLayers.Format.WFST.v1_0_0
- * A format for creating WFS v1.0.0 transactions.  Create a new instance with the
- *     <OpenLayers.Format.WFST.v1_0_0> constructor.
- *
- * Inherits from:
- *  - <OpenLayers.Format.Filter.v1_0_0>
- *  - <OpenLayers.Format.WFST.v1>
- */
-OpenLayers.Format.WFST.v1_0_0 = OpenLayers.Class(
-    OpenLayers.Format.Filter.v1_0_0, OpenLayers.Format.WFST.v1, {
-    
-    /**
-     * Property: version
-     * {String} WFS version number.
-     */
-    version: "1.0.0",
-
-    /**
-     * APIProperty: srsNameInQuery
-     * {Boolean} If true the reference system is passed in Query requests
-     *     via the "srsName" attribute to the "wfs:Query" element, this
-     *     property defaults to false as it isn't WFS 1.0.0 compliant.
-     */
-    srsNameInQuery: false,
-    
-    /**
-     * Property: schemaLocations
-     * {Object} Properties are namespace aliases, values are schema locations.
-     */
-    schemaLocations: {
-        "wfs": "http://schemas.opengis.net/wfs/1.0.0/WFS-transaction.xsd"
-    },
-
-    /**
-     * Constructor: OpenLayers.Format.WFST.v1_0_0
-     * A class for parsing and generating WFS v1.0.0 transactions.
-     *
-     * Parameters:
-     * options - {Object} Optional object whose properties will be set on the
-     *     instance.
-     *
-     * Valid options properties:
-     * featureType - {String} Local (without prefix) feature typeName (required).
-     * featureNS - {String} Feature namespace (optional).
-     * featurePrefix - {String} Feature namespace alias (optional - only used
-     *     if featureNS is provided).  Default is 'feature'.
-     * geometryName - {String} Name of geometry attribute.  Default is 'the_geom'.
-     */
-    initialize: function(options) {
-        OpenLayers.Format.Filter.v1_0_0.prototype.initialize.apply(this, [options]);
-        OpenLayers.Format.WFST.v1.prototype.initialize.apply(this, [options]);
-    },
-    
-    /**
-     * Method: readNode
-     * Shorthand for applying one of the named readers given the node
-     *     namespace and local name.  Readers take two args (node, obj) and
-     *     generally extend or modify the second.
-     *
-     * Parameters:
-     * node - {DOMElement} The node to be read (required).
-     * obj - {Object} The object to be modified (optional).
-     * first - {Boolean} Should be set to true for the first node read. This
-     *     is usually the readNode call in the read method. Without this being
-     *     set, auto-configured properties will stick on subsequent reads.
-     *
-     * Returns:
-     * {Object} The input object, modified (or a new one if none was provided).
-     */
-    readNode: function(node, obj, first) {
-        // Not the superclass, only the mixin classes inherit from
-        // Format.GML.v2. We need this because we don't want to get readNode
-        // from the superclass's superclass, which is OpenLayers.Format.XML.
-        return OpenLayers.Format.GML.v2.prototype.readNode.apply(this, arguments);
-    },
-    
-    /**
-     * Property: readers
-     * Contains public functions, grouped by namespace prefix, that will
-     *     be applied when a namespaced node is found matching the function
-     *     name.  The function will be applied in the scope of this parser
-     *     with two arguments: the node being read and a context object passed
-     *     from the parent.
-     */
-    readers: {
-        "wfs": OpenLayers.Util.applyDefaults({
-            "WFS_TransactionResponse": function(node, obj) {
-                obj.insertIds = [];
-                obj.success = false;
-                this.readChildNodes(node, obj);
-            },
-            "InsertResult": function(node, container) {
-                var obj = {fids: []};
-                this.readChildNodes(node, obj);
-                container.insertIds = container.insertIds.concat(obj.fids);
-            },
-            "TransactionResult": function(node, obj) {
-                this.readChildNodes(node, obj);
-            },
-            "Status": function(node, obj) {
-                this.readChildNodes(node, obj);
-            },
-            "SUCCESS": function(node, obj) {
-                obj.success = true;
-            }
-        }, OpenLayers.Format.WFST.v1.prototype.readers["wfs"]),
-        "gml": OpenLayers.Format.GML.v2.prototype.readers["gml"],
-        "feature": OpenLayers.Format.GML.v2.prototype.readers["feature"],
-        "ogc": OpenLayers.Format.Filter.v1_0_0.prototype.readers["ogc"]
-    },
-
-    /**
-     * Property: writers
-     * As a compliment to the readers property, this structure contains public
-     *     writing functions grouped by namespace alias and named like the
-     *     node names they produce.
-     */
-    writers: {
-        "wfs": OpenLayers.Util.applyDefaults({
-            "Query": function(options) {
-                options = OpenLayers.Util.extend({
-                    featureNS: this.featureNS,
-                    featurePrefix: this.featurePrefix,
-                    featureType: this.featureType,
-                    srsName: this.srsName,
-                    srsNameInQuery: this.srsNameInQuery
-                }, options);
-                var prefix = options.featurePrefix;
-                var node = this.createElementNSPlus("wfs:Query", {
-                    attributes: {
-                        typeName: (prefix ? prefix + ":" : "") +
-                            options.featureType
-                    }
-                });
-                if(options.srsNameInQuery && options.srsName) {
-                    node.setAttribute("srsName", options.srsName);
-                }
-                if(options.featureNS) {
-                    node.setAttribute("xmlns:" + prefix, options.featureNS);
-                }
-                if(options.propertyNames) {
-                    for(var i=0,len = options.propertyNames.length; i<len; i++) {
-                        this.writeNode(
-                            "ogc:PropertyName", 
-                            {property: options.propertyNames[i]},
-                            node
-                        );
-                    }
-                }
-                if(options.filter) {
-                    this.setFilterProperty(options.filter);
-                    this.writeNode("ogc:Filter", options.filter, node);
-                }
-                return node;
-            }
-        }, OpenLayers.Format.WFST.v1.prototype.writers["wfs"]),
-        "gml": OpenLayers.Format.GML.v2.prototype.writers["gml"],
-        "feature": OpenLayers.Format.GML.v2.prototype.writers["feature"],
-        "ogc": OpenLayers.Format.Filter.v1_0_0.prototype.writers["ogc"]
-    },
-   
-    CLASS_NAME: "OpenLayers.Format.WFST.v1_0_0" 
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WFST/v1_1_0.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WFST/v1_1_0.js
deleted file mode 100644
index ff2a88d3..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WFST/v1_1_0.js
+++ /dev/null
@@ -1,189 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/WFST/v1.js
- * @requires OpenLayers/Format/Filter/v1_1_0.js
- * @requires OpenLayers/Format/OWSCommon/v1_0_0.js
- */
-
-/**
- * Class: OpenLayers.Format.WFST.v1_1_0
- * A format for creating WFS v1.1.0 transactions.  Create a new instance with the
- *     <OpenLayers.Format.WFST.v1_1_0> constructor.
- *
- * Inherits from:
- *  - <OpenLayers.Format.Filter.v1_1_0>
- *  - <OpenLayers.Format.WFST.v1>
- */
-OpenLayers.Format.WFST.v1_1_0 = OpenLayers.Class(
-    OpenLayers.Format.Filter.v1_1_0, OpenLayers.Format.WFST.v1, {
-    
-    /**
-     * Property: version
-     * {String} WFS version number.
-     */
-    version: "1.1.0",
-    
-    /**
-     * Property: schemaLocations
-     * {Object} Properties are namespace aliases, values are schema locations.
-     */
-    schemaLocations: {
-        "wfs": "http://schemas.opengis.net/wfs/1.1.0/wfs.xsd"
-    },
-    
-    /**
-     * Constructor: OpenLayers.Format.WFST.v1_1_0
-     * A class for parsing and generating WFS v1.1.0 transactions.
-     *
-     * To read additional information like hit count (numberOfFeatures) from
-     * the  FeatureCollection, call the <OpenLayers.Format.WFST.v1.read> method
-     * with {output: "object"} as 2nd argument. Note that it is possible to
-     * just request the hit count from a WFS 1.1.0 server with the
-     * resultType="hits" request parameter.
-     *
-     * Parameters:
-     * options - {Object} Optional object whose properties will be set on the
-     *     instance.
-     *
-     * Valid options properties:
-     * featureType - {String} Local (without prefix) feature typeName (required).
-     * featureNS - {String} Feature namespace (optional).
-     * featurePrefix - {String} Feature namespace alias (optional - only used
-     *     if featureNS is provided).  Default is 'feature'.
-     * geometryName - {String} Name of geometry attribute.  Default is 'the_geom'.
-     */
-    initialize: function(options) {
-        OpenLayers.Format.Filter.v1_1_0.prototype.initialize.apply(this, [options]);
-        OpenLayers.Format.WFST.v1.prototype.initialize.apply(this, [options]);
-    },
-    
-    /**
-     * Method: readNode
-     * Shorthand for applying one of the named readers given the node
-     *     namespace and local name.  Readers take two args (node, obj) and
-     *     generally extend or modify the second.
-     *
-     * Parameters:
-     * node - {DOMElement} The node to be read (required).
-     * obj - {Object} The object to be modified (optional).
-     * first - {Boolean} Should be set to true for the first node read. This
-     *     is usually the readNode call in the read method. Without this being
-     *     set, auto-configured properties will stick on subsequent reads.
-     *
-     * Returns:
-     * {Object} The input object, modified (or a new one if none was provided).
-     */
-    readNode: function(node, obj, first) {
-        // Not the superclass, only the mixin classes inherit from
-        // Format.GML.v3. We need this because we don't want to get readNode
-        // from the superclass's superclass, which is OpenLayers.Format.XML.
-        return OpenLayers.Format.GML.v3.prototype.readNode.apply(this, arguments);
-    },
-    
-    /**
-     * Property: readers
-     * Contains public functions, grouped by namespace prefix, that will
-     *     be applied when a namespaced node is found matching the function
-     *     name.  The function will be applied in the scope of this parser
-     *     with two arguments: the node being read and a context object passed
-     *     from the parent.
-     */
-    readers: {
-        "wfs": OpenLayers.Util.applyDefaults({
-            "FeatureCollection": function(node, obj) {
-                obj.numberOfFeatures = parseInt(node.getAttribute(
-                    "numberOfFeatures"));
-                OpenLayers.Format.WFST.v1.prototype.readers["wfs"]["FeatureCollection"].apply(
-                    this, arguments);
-            },
-            "TransactionResponse": function(node, obj) {
-                obj.insertIds = [];
-                obj.success = false;
-                this.readChildNodes(node, obj);
-            },
-            "TransactionSummary": function(node, obj) {
-                // this is a limited test of success
-                obj.success = true;
-            },
-            "InsertResults": function(node, obj) {
-                this.readChildNodes(node, obj);
-            },
-            "Feature": function(node, container) {
-                var obj = {fids: []};
-                this.readChildNodes(node, obj);
-                container.insertIds.push(obj.fids[0]);
-            }
-        }, OpenLayers.Format.WFST.v1.prototype.readers["wfs"]),
-        "gml": OpenLayers.Format.GML.v3.prototype.readers["gml"],
-        "feature": OpenLayers.Format.GML.v3.prototype.readers["feature"],
-        "ogc": OpenLayers.Format.Filter.v1_1_0.prototype.readers["ogc"],
-        "ows": OpenLayers.Format.OWSCommon.v1_0_0.prototype.readers["ows"]
-    },
-
-    /**
-     * Property: writers
-     * As a compliment to the readers property, this structure contains public
-     *     writing functions grouped by namespace alias and named like the
-     *     node names they produce.
-     */
-    writers: {
-        "wfs": OpenLayers.Util.applyDefaults({
-            "GetFeature": function(options) {
-                var node = OpenLayers.Format.WFST.v1.prototype.writers["wfs"]["GetFeature"].apply(this, arguments);
-                options && this.setAttributes(node, {
-                    resultType: options.resultType,
-                    startIndex: options.startIndex,
-                    count: options.count
-                });
-                return node;
-            },
-            "Query": function(options) {
-                options = OpenLayers.Util.extend({
-                    featureNS: this.featureNS,
-                    featurePrefix: this.featurePrefix,
-                    featureType: this.featureType,
-                    srsName: this.srsName
-                }, options);
-                var prefix = options.featurePrefix;
-                var node = this.createElementNSPlus("wfs:Query", {
-                    attributes: {
-                        typeName: (prefix ? prefix + ":" : "") +
-                            options.featureType,
-                        srsName: options.srsName
-                    }
-                });
-                if(options.featureNS) {
-                    node.setAttribute("xmlns:" + prefix, options.featureNS);
-                }
-                if(options.propertyNames) {
-                    for(var i=0,len = options.propertyNames.length; i<len; i++) {
-                        this.writeNode(
-                            "wfs:PropertyName", 
-                            {property: options.propertyNames[i]},
-                            node
-                        );
-                    }
-                }
-                if(options.filter) {
-                    OpenLayers.Format.WFST.v1_1_0.prototype.setFilterProperty.call(this, options.filter);
-                    this.writeNode("ogc:Filter", options.filter, node);
-                }
-                return node;
-            },
-            "PropertyName": function(obj) {
-                return this.createElementNSPlus("wfs:PropertyName", {
-                    value: obj.property
-                });
-            }            
-        }, OpenLayers.Format.WFST.v1.prototype.writers["wfs"]),
-        "gml": OpenLayers.Format.GML.v3.prototype.writers["gml"],
-        "feature": OpenLayers.Format.GML.v3.prototype.writers["feature"],
-        "ogc": OpenLayers.Format.Filter.v1_1_0.prototype.writers["ogc"]
-    },
-
-    CLASS_NAME: "OpenLayers.Format.WFST.v1_1_0" 
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WKT.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WKT.js
deleted file mode 100644
index a7a7b2ea..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WKT.js
+++ /dev/null
@@ -1,392 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format.js
- * @requires OpenLayers/Feature/Vector.js
- * @requires OpenLayers/Geometry/Point.js
- * @requires OpenLayers/Geometry/MultiPoint.js
- * @requires OpenLayers/Geometry/LineString.js
- * @requires OpenLayers/Geometry/MultiLineString.js
- * @requires OpenLayers/Geometry/Polygon.js
- * @requires OpenLayers/Geometry/MultiPolygon.js
- */
-
-/**
- * Class: OpenLayers.Format.WKT
- * Class for reading and writing Well-Known Text.  Create a new instance
- * with the <OpenLayers.Format.WKT> constructor.
- * 
- * Inherits from:
- *  - <OpenLayers.Format>
- */
-OpenLayers.Format.WKT = OpenLayers.Class(OpenLayers.Format, {
-    
-    /**
-     * Constructor: OpenLayers.Format.WKT
-     * Create a new parser for WKT
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be set on
-     *           this instance
-     *
-     * Returns:
-     * {<OpenLayers.Format.WKT>} A new WKT parser.
-     */
-    initialize: function(options) {
-        this.regExes = {
-            'typeStr': /^\s*(\w+)\s*\(\s*(.*)\s*\)\s*$/,
-            'spaces': /\s+/,
-            'parenComma': /\)\s*,\s*\(/,
-            'doubleParenComma': /\)\s*\)\s*,\s*\(\s*\(/,  // can't use {2} here
-            'trimParens': /^\s*\(?(.*?)\)?\s*$/
-        };
-        OpenLayers.Format.prototype.initialize.apply(this, [options]);
-    },
-
-    /**
-     * APIMethod: read
-     * Deserialize a WKT string and return a vector feature or an
-     * array of vector features.  Supports WKT for POINT, MULTIPOINT,
-     * LINESTRING, MULTILINESTRING, POLYGON, MULTIPOLYGON, and
-     * GEOMETRYCOLLECTION.
-     *
-     * Parameters:
-     * wkt - {String} A WKT string
-     *
-     * Returns:
-     * {<OpenLayers.Feature.Vector>|Array} A feature or array of features for
-     * GEOMETRYCOLLECTION WKT.
-     */
-    read: function(wkt) {
-        var features, type, str;
-        wkt = wkt.replace(/[\n\r]/g, " ");
-        var matches = this.regExes.typeStr.exec(wkt);
-        if(matches) {
-            type = matches[1].toLowerCase();
-            str = matches[2];
-            if(this.parse[type]) {
-                features = this.parse[type].apply(this, [str]);
-            }
-            if (this.internalProjection && this.externalProjection) {
-                if (features && 
-                    features.CLASS_NAME == "OpenLayers.Feature.Vector") {
-                    features.geometry.transform(this.externalProjection,
-                                                this.internalProjection);
-                } else if (features &&
-                           type != "geometrycollection" &&
-                           typeof features == "object") {
-                    for (var i=0, len=features.length; i<len; i++) {
-                        var component = features[i];
-                        component.geometry.transform(this.externalProjection,
-                                                     this.internalProjection);
-                    }
-                }
-            }
-        }    
-        return features;
-    },
-
-    /**
-     * APIMethod: write
-     * Serialize a feature or array of features into a WKT string.
-     *
-     * Parameters:
-     * features - {<OpenLayers.Feature.Vector>|Array} A feature or array of
-     *            features
-     *
-     * Returns:
-     * {String} The WKT string representation of the input geometries
-     */
-    write: function(features) {
-        var collection, geometry, isCollection;
-        if (features.constructor == Array) {
-            collection = features;
-            isCollection = true;
-        } else {
-            collection = [features];
-            isCollection = false;
-        }
-        var pieces = [];
-        if (isCollection) {
-            pieces.push('GEOMETRYCOLLECTION(');
-        }
-        for (var i=0, len=collection.length; i<len; ++i) {
-            if (isCollection && i>0) {
-                pieces.push(',');
-            }
-            geometry = collection[i].geometry;
-            pieces.push(this.extractGeometry(geometry));
-        }
-        if (isCollection) {
-            pieces.push(')');
-        }
-        return pieces.join('');
-    },
-
-    /**
-     * Method: extractGeometry
-     * Entry point to construct the WKT for a single Geometry object.
-     *
-     * Parameters:
-     * geometry - {<OpenLayers.Geometry.Geometry>}
-     *
-     * Returns:
-     * {String} A WKT string of representing the geometry
-     */
-    extractGeometry: function(geometry) {
-        var type = geometry.CLASS_NAME.split('.')[2].toLowerCase();
-        if (!this.extract[type]) {
-            return null;
-        }
-        if (this.internalProjection && this.externalProjection) {
-            geometry = geometry.clone();
-            geometry.transform(this.internalProjection, this.externalProjection);
-        }                       
-        var wktType = type == 'collection' ? 'GEOMETRYCOLLECTION' : type.toUpperCase();
-        var data = wktType + '(' + this.extract[type].apply(this, [geometry]) + ')';
-        return data;
-    },
-    
-    /**
-     * Object with properties corresponding to the geometry types.
-     * Property values are functions that do the actual data extraction.
-     */
-    extract: {
-        /**
-         * Return a space delimited string of point coordinates.
-         * @param {OpenLayers.Geometry.Point} point
-         * @returns {String} A string of coordinates representing the point
-         */
-        'point': function(point) {
-            return point.x + ' ' + point.y;
-        },
-
-        /**
-         * Return a comma delimited string of point coordinates from a multipoint.
-         * @param {OpenLayers.Geometry.MultiPoint} multipoint
-         * @returns {String} A string of point coordinate strings representing
-         *                  the multipoint
-         */
-        'multipoint': function(multipoint) {
-            var array = [];
-            for(var i=0, len=multipoint.components.length; i<len; ++i) {
-                array.push('(' +
-                           this.extract.point.apply(this, [multipoint.components[i]]) +
-                           ')');
-            }
-            return array.join(',');
-        },
-        
-        /**
-         * Return a comma delimited string of point coordinates from a line.
-         * @param {OpenLayers.Geometry.LineString} linestring
-         * @returns {String} A string of point coordinate strings representing
-         *                  the linestring
-         */
-        'linestring': function(linestring) {
-            var array = [];
-            for(var i=0, len=linestring.components.length; i<len; ++i) {
-                array.push(this.extract.point.apply(this, [linestring.components[i]]));
-            }
-            return array.join(',');
-        },
-
-        /**
-         * Return a comma delimited string of linestring strings from a multilinestring.
-         * @param {OpenLayers.Geometry.MultiLineString} multilinestring
-         * @returns {String} A string of of linestring strings representing
-         *                  the multilinestring
-         */
-        'multilinestring': function(multilinestring) {
-            var array = [];
-            for(var i=0, len=multilinestring.components.length; i<len; ++i) {
-                array.push('(' +
-                           this.extract.linestring.apply(this, [multilinestring.components[i]]) +
-                           ')');
-            }
-            return array.join(',');
-        },
-        
-        /**
-         * Return a comma delimited string of linear ring arrays from a polygon.
-         * @param {OpenLayers.Geometry.Polygon} polygon
-         * @returns {String} An array of linear ring arrays representing the polygon
-         */
-        'polygon': function(polygon) {
-            var array = [];
-            for(var i=0, len=polygon.components.length; i<len; ++i) {
-                array.push('(' +
-                           this.extract.linestring.apply(this, [polygon.components[i]]) +
-                           ')');
-            }
-            return array.join(',');
-        },
-
-        /**
-         * Return an array of polygon arrays from a multipolygon.
-         * @param {OpenLayers.Geometry.MultiPolygon} multipolygon
-         * @returns {String} An array of polygon arrays representing
-         *                  the multipolygon
-         */
-        'multipolygon': function(multipolygon) {
-            var array = [];
-            for(var i=0, len=multipolygon.components.length; i<len; ++i) {
-                array.push('(' +
-                           this.extract.polygon.apply(this, [multipolygon.components[i]]) +
-                           ')');
-            }
-            return array.join(',');
-        },
-
-        /**
-         * Return the WKT portion between 'GEOMETRYCOLLECTION(' and ')' for an <OpenLayers.Geometry.Collection>
-         * @param {OpenLayers.Geometry.Collection} collection
-         * @returns {String} internal WKT representation of the collection
-         */
-        'collection': function(collection) {
-            var array = [];
-            for(var i=0, len=collection.components.length; i<len; ++i) {
-                array.push(this.extractGeometry.apply(this, [collection.components[i]]));
-            }
-            return array.join(',');
-        }
-
-    },
-
-    /**
-     * Object with properties corresponding to the geometry types.
-     * Property values are functions that do the actual parsing.
-     */
-    parse: {
-        /**
-         * Return point feature given a point WKT fragment.
-         * @param {String} str A WKT fragment representing the point
-         * @returns {OpenLayers.Feature.Vector} A point feature
-         * @private
-         */
-        'point': function(str) {
-            var coords = OpenLayers.String.trim(str).split(this.regExes.spaces);
-            return new OpenLayers.Feature.Vector(
-                new OpenLayers.Geometry.Point(coords[0], coords[1])
-            );
-        },
-
-        /**
-         * Return a multipoint feature given a multipoint WKT fragment.
-         * @param {String} str A WKT fragment representing the multipoint
-         * @returns {OpenLayers.Feature.Vector} A multipoint feature
-         * @private
-         */
-        'multipoint': function(str) {
-            var point;
-            var points = OpenLayers.String.trim(str).split(',');
-            var components = [];
-            for(var i=0, len=points.length; i<len; ++i) {
-                point = points[i].replace(this.regExes.trimParens, '$1');
-                components.push(this.parse.point.apply(this, [point]).geometry);
-            }
-            return new OpenLayers.Feature.Vector(
-                new OpenLayers.Geometry.MultiPoint(components)
-            );
-        },
-        
-        /**
-         * Return a linestring feature given a linestring WKT fragment.
-         * @param {String} str A WKT fragment representing the linestring
-         * @returns {OpenLayers.Feature.Vector} A linestring feature
-         * @private
-         */
-        'linestring': function(str) {
-            var points = OpenLayers.String.trim(str).split(',');
-            var components = [];
-            for(var i=0, len=points.length; i<len; ++i) {
-                components.push(this.parse.point.apply(this, [points[i]]).geometry);
-            }
-            return new OpenLayers.Feature.Vector(
-                new OpenLayers.Geometry.LineString(components)
-            );
-        },
-
-        /**
-         * Return a multilinestring feature given a multilinestring WKT fragment.
-         * @param {String} str A WKT fragment representing the multilinestring
-         * @returns {OpenLayers.Feature.Vector} A multilinestring feature
-         * @private
-         */
-        'multilinestring': function(str) {
-            var line;
-            var lines = OpenLayers.String.trim(str).split(this.regExes.parenComma);
-            var components = [];
-            for(var i=0, len=lines.length; i<len; ++i) {
-                line = lines[i].replace(this.regExes.trimParens, '$1');
-                components.push(this.parse.linestring.apply(this, [line]).geometry);
-            }
-            return new OpenLayers.Feature.Vector(
-                new OpenLayers.Geometry.MultiLineString(components)
-            );
-        },
-        
-        /**
-         * Return a polygon feature given a polygon WKT fragment.
-         * @param {String} str A WKT fragment representing the polygon
-         * @returns {OpenLayers.Feature.Vector} A polygon feature
-         * @private
-         */
-        'polygon': function(str) {
-            var ring, linestring, linearring;
-            var rings = OpenLayers.String.trim(str).split(this.regExes.parenComma);
-            var components = [];
-            for(var i=0, len=rings.length; i<len; ++i) {
-                ring = rings[i].replace(this.regExes.trimParens, '$1');
-                linestring = this.parse.linestring.apply(this, [ring]).geometry;
-                linearring = new OpenLayers.Geometry.LinearRing(linestring.components);
-                components.push(linearring);
-            }
-            return new OpenLayers.Feature.Vector(
-                new OpenLayers.Geometry.Polygon(components)
-            );
-        },
-
-        /**
-         * Return a multipolygon feature given a multipolygon WKT fragment.
-         * @param {String} str A WKT fragment representing the multipolygon
-         * @returns {OpenLayers.Feature.Vector} A multipolygon feature
-         * @private
-         */
-        'multipolygon': function(str) {
-            var polygon;
-            var polygons = OpenLayers.String.trim(str).split(this.regExes.doubleParenComma);
-            var components = [];
-            for(var i=0, len=polygons.length; i<len; ++i) {
-                polygon = polygons[i].replace(this.regExes.trimParens, '$1');
-                components.push(this.parse.polygon.apply(this, [polygon]).geometry);
-            }
-            return new OpenLayers.Feature.Vector(
-                new OpenLayers.Geometry.MultiPolygon(components)
-            );
-        },
-
-        /**
-         * Return an array of features given a geometrycollection WKT fragment.
-         * @param {String} str A WKT fragment representing the geometrycollection
-         * @returns {Array} An array of OpenLayers.Feature.Vector
-         * @private
-         */
-        'geometrycollection': function(str) {
-            // separate components of the collection with |
-            str = str.replace(/,\s*([A-Za-z])/g, '|$1');
-            var wktArray = OpenLayers.String.trim(str).split('|');
-            var components = [];
-            for(var i=0, len=wktArray.length; i<len; ++i) {
-                components.push(OpenLayers.Format.WKT.prototype.read.apply(this,[wktArray[i]]));
-            }
-            return components;
-        }
-
-    },
-
-    CLASS_NAME: "OpenLayers.Format.WKT" 
-});     
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMC.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMC.js
deleted file mode 100644
index ded1b3a0..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMC.js
+++ /dev/null
@@ -1,182 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/XML.js
- * @requires OpenLayers/Format/Context.js
- */
-
-/**
- * Class: OpenLayers.Format.WMC
- * Read and write Web Map Context documents.
- *
- * Inherits from:
- *  - <OpenLayers.Format.Context>
- */
-OpenLayers.Format.WMC = OpenLayers.Class(OpenLayers.Format.Context, {
-    
-    /**
-     * APIProperty: defaultVersion
-     * {String} Version number to assume if none found.  Default is "1.1.0".
-     */
-    defaultVersion: "1.1.0",
-
-    /**
-     * Constructor: OpenLayers.Format.WMC
-     * Create a new parser for Web Map Context documents.
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be set on
-     *     this instance.
-     */
-    
-    /**
-     * Method: layerToContext
-     * Create a layer context object given a wms layer object.
-     *
-     * Parameters:
-     * layer - {<OpenLayers.Layer.WMS>} The layer.
-     *
-     * Returns:
-     * {Object} A layer context object.
-     */
-    layerToContext: function(layer) {
-        var parser = this.getParser();
-        var layerContext = {
-            queryable: layer.queryable,
-            visibility: layer.visibility,
-            name: layer.params["LAYERS"],
-            title: layer.name,
-            "abstract": layer.metadata["abstract"],
-            dataURL: layer.metadata.dataURL,
-            metadataURL: layer.metadataURL,
-            server: {
-            version: layer.params["VERSION"],
-                url: layer.url
-            },
-            maxExtent: layer.maxExtent,
-            transparent: layer.params["TRANSPARENT"],
-            numZoomLevels: layer.numZoomLevels,
-            units: layer.units,
-            isBaseLayer: layer.isBaseLayer,
-            opacity: layer.opacity == 1 ? undefined : layer.opacity,
-            displayInLayerSwitcher: layer.displayInLayerSwitcher,
-            singleTile: layer.singleTile,
-            tileSize: (layer.singleTile || !layer.tileSize) ? 
-                undefined : {width: layer.tileSize.w, height: layer.tileSize.h},
-            minScale : (layer.options.resolutions ||
-                        layer.options.scales || 
-                        layer.options.maxResolution || 
-                        layer.options.minScale) ? 
-                        layer.minScale : undefined,
-            maxScale : (layer.options.resolutions ||
-                        layer.options.scales || 
-                        layer.options.minResolution || 
-                        layer.options.maxScale) ? 
-                        layer.maxScale : undefined,
-            formats: [],
-            styles: [],
-            srs: layer.srs,
-            dimensions: layer.dimensions
-        };
-
-
-        if (layer.metadata.servertitle) {
-            layerContext.server.title = layer.metadata.servertitle;
-        }
-
-        if (layer.metadata.formats && layer.metadata.formats.length > 0) {
-            for (var i=0, len=layer.metadata.formats.length; i<len; i++) {
-                var format = layer.metadata.formats[i];
-                layerContext.formats.push({
-                    value: format.value,
-                    current: (format.value == layer.params["FORMAT"])
-                });
-            }
-        } else {
-            layerContext.formats.push({
-                value: layer.params["FORMAT"],
-                current: true
-            });
-        }
-
-        if (layer.metadata.styles && layer.metadata.styles.length > 0) {
-            for (var i=0, len=layer.metadata.styles.length; i<len; i++) {
-                var style = layer.metadata.styles[i];
-                if ((style.href == layer.params["SLD"]) ||
-                    (style.body == layer.params["SLD_BODY"]) ||
-                    (style.name == layer.params["STYLES"])) {
-                    style.current = true;
-                } else {
-                    style.current = false;
-                }
-                layerContext.styles.push(style);
-            }
-        } else {
-            layerContext.styles.push({
-                href: layer.params["SLD"],
-                body: layer.params["SLD_BODY"],
-                name: layer.params["STYLES"] || parser.defaultStyleName,
-                title: parser.defaultStyleTitle,
-                current: true
-            });
-        }
-
-        return layerContext;
-    },
-    
-    /**
-     * Method: toContext
-     * Create a context object free from layer given a map or a
-     * context object.
-     *
-     * Parameters:
-     * obj - {<OpenLayers.Map> | Object} The map or context.
-     *
-     * Returns:
-     * {Object} A context object.
-     */
-    toContext: function(obj) {
-        var context = {};
-        var layers = obj.layers;
-        if (obj.CLASS_NAME == "OpenLayers.Map") {
-            var metadata = obj.metadata || {};
-            context.size = obj.getSize();
-            context.bounds = obj.getExtent();
-            context.projection = obj.projection;
-            context.title = obj.title;
-            context.keywords = metadata.keywords;
-            context["abstract"] = metadata["abstract"];
-            context.logo = metadata.logo;
-            context.descriptionURL = metadata.descriptionURL;
-            context.contactInformation = metadata.contactInformation;
-            context.maxExtent = obj.maxExtent;
-        } else {
-            // copy all obj properties except the "layers" property
-            OpenLayers.Util.applyDefaults(context, obj);
-            if (context.layers != undefined) {
-                delete(context.layers);
-            }
-        }
-
-        if (context.layersContext == undefined) {
-            context.layersContext = [];
-        }
-
-        // let's convert layers into layersContext object (if any)
-        if (layers != undefined && OpenLayers.Util.isArray(layers)) {
-            for (var i=0, len=layers.length; i<len; i++) {
-                var layer = layers[i];
-                if (layer instanceof OpenLayers.Layer.WMS) {
-                    context.layersContext.push(this.layerToContext(layer));
-                }
-            }
-        }
-        return context;
-    },
-
-    CLASS_NAME: "OpenLayers.Format.WMC" 
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMC/v1.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMC/v1.js
deleted file mode 100644
index 6c9a5c3d..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMC/v1.js
+++ /dev/null
@@ -1,1267 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/WMC.js
- * @requires OpenLayers/Format/XML.js
- */
-
-/**
- * Class: OpenLayers.Format.WMC.v1
- * Superclass for WMC version 1 parsers.
- *
- * Inherits from:
- *  - <OpenLayers.Format.XML>
- */
-OpenLayers.Format.WMC.v1 = OpenLayers.Class(OpenLayers.Format.XML, {
-    
-    /**
-     * Property: namespaces
-     * {Object} Mapping of namespace aliases to namespace URIs.
-     */
-    namespaces: {
-        ol: "http://openlayers.org/context",
-        wmc: "http://www.opengis.net/context",
-        sld: "http://www.opengis.net/sld",
-        xlink: "http://www.w3.org/1999/xlink",
-        xsi: "http://www.w3.org/2001/XMLSchema-instance"
-    },
-    
-    /**
-     * Property: schemaLocation
-     * {String} Schema location for a particular minor version.
-     */
-    schemaLocation: "",
-
-    /**
-     * Method: getNamespacePrefix
-     * Get the namespace prefix for a given uri from the <namespaces> object.
-     *
-     * Returns:
-     * {String} A namespace prefix or null if none found.
-     */
-    getNamespacePrefix: function(uri) {
-        var prefix = null;
-        if(uri == null) {
-            prefix = this.namespaces[this.defaultPrefix];
-        } else {
-            for(prefix in this.namespaces) {
-                if(this.namespaces[prefix] == uri) {
-                    break;
-                }
-            }
-        }
-        return prefix;
-    },
-    
-    /**
-     * Property: defaultPrefix
-     */
-    defaultPrefix: "wmc",
-
-    /**
-     * Property: rootPrefix
-     * {String} Prefix on the root node that maps to the context namespace URI.
-     */
-    rootPrefix: null,
-    
-    /**
-     * Property: defaultStyleName
-     * {String} Style name used if layer has no style param.  Default is "".
-     */
-    defaultStyleName: "",
-    
-    /**
-     * Property: defaultStyleTitle
-     * {String} Default style title.  Default is "Default".
-     */
-    defaultStyleTitle: "Default",
-    
-    /**
-     * Constructor: OpenLayers.Format.WMC.v1
-     * Instances of this class are not created directly.  Use the
-     *     <OpenLayers.Format.WMC> constructor instead.
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be set on
-     *     this instance.
-     */
-    initialize: function(options) {
-        OpenLayers.Format.XML.prototype.initialize.apply(this, [options]);
-    },
-
-    /**
-     * Method: read
-     * Read capabilities data from a string, and return a list of layers. 
-     * 
-     * Parameters: 
-     * data - {String} or {DOMElement} data to read/parse.
-     *
-     * Returns:
-     * {Array} List of named layers.
-     */
-    read: function(data) {
-        if(typeof data == "string") {
-            data = OpenLayers.Format.XML.prototype.read.apply(this, [data]);
-        }
-        var root = data.documentElement;
-        this.rootPrefix = root.prefix;
-        var context = {
-            version: root.getAttribute("version")
-        };
-        this.runChildNodes(context, root);
-        return context;
-    },
-    
-    /**
-     * Method: runChildNodes
-     */
-    runChildNodes: function(obj, node) {
-        var children = node.childNodes;
-        var childNode, processor, prefix, local;
-        for(var i=0, len=children.length; i<len; ++i) {
-            childNode = children[i];
-            if(childNode.nodeType == 1) {
-                prefix = this.getNamespacePrefix(childNode.namespaceURI);
-                local = childNode.nodeName.split(":").pop();
-                processor = this["read_" + prefix + "_" + local];
-                if(processor) {
-                    processor.apply(this, [obj, childNode]);
-                }
-            }
-        }
-    },
-    
-    /**
-     * Method: read_wmc_General
-     */
-    read_wmc_General: function(context, node) {
-        this.runChildNodes(context, node);
-    },
-    
-    /**
-     * Method: read_wmc_BoundingBox
-     */
-    read_wmc_BoundingBox: function(context, node) {
-        context.projection = node.getAttribute("SRS");
-        context.bounds = new OpenLayers.Bounds(
-            node.getAttribute("minx"), node.getAttribute("miny"),
-            node.getAttribute("maxx"), node.getAttribute("maxy")
-        );
-    },
-    
-    /**
-     * Method: read_wmc_LayerList
-     */
-    read_wmc_LayerList: function(context, node) {
-        // layersContext is an array containing info for each layer
-        context.layersContext = [];
-        this.runChildNodes(context, node);
-    },
-    
-    /**
-     * Method: read_wmc_Layer
-     */
-    read_wmc_Layer: function(context, node) {
-        var layerContext = {
-            visibility: (node.getAttribute("hidden") != "1"),
-            queryable: (node.getAttribute("queryable") == "1"),
-            formats: [],
-             styles: [],
-             metadata: {}
-        };
-
-        this.runChildNodes(layerContext, node);
-        // set properties common to multiple objects on layer options/params
-        context.layersContext.push(layerContext);
-    },
-    
-    /**
-     * Method: read_wmc_Extension
-     */
-    read_wmc_Extension: function(obj, node) {
-        this.runChildNodes(obj, node);
-    },
-
-    /**
-     * Method: read_ol_units
-     */
-    read_ol_units: function(layerContext, node) {
-        layerContext.units = this.getChildValue(node);
-    },
-    
-    /**
-     * Method: read_ol_maxExtent
-     */
-    read_ol_maxExtent: function(obj, node) {
-        var bounds = new OpenLayers.Bounds(
-            node.getAttribute("minx"), node.getAttribute("miny"),
-            node.getAttribute("maxx"), node.getAttribute("maxy")
-        );
-        obj.maxExtent = bounds;
-    },
-    
-    /**
-     * Method: read_ol_transparent
-     */
-    read_ol_transparent: function(layerContext, node) {
-        layerContext.transparent = this.getChildValue(node);
-    },
-
-    /**
-     * Method: read_ol_numZoomLevels
-     */
-    read_ol_numZoomLevels: function(layerContext, node) {
-        layerContext.numZoomLevels = parseInt(this.getChildValue(node));
-    },
-
-    /**
-     * Method: read_ol_opacity
-     */
-    read_ol_opacity: function(layerContext, node) {
-        layerContext.opacity = parseFloat(this.getChildValue(node));
-    },
-
-    /**
-     * Method: read_ol_singleTile
-     */
-    read_ol_singleTile: function(layerContext, node) {
-        layerContext.singleTile = (this.getChildValue(node) == "true");
-    },
-
-    /**
-     * Method: read_ol_tileSize
-     */
-    read_ol_tileSize: function(layerContext, node) {
-        var obj = {"width": node.getAttribute("width"), "height": node.getAttribute("height")};
-        layerContext.tileSize = obj;
-    },
-    
-    /**
-     * Method: read_ol_isBaseLayer
-     */
-    read_ol_isBaseLayer: function(layerContext, node) {
-        layerContext.isBaseLayer = (this.getChildValue(node) == "true");
-    },
-
-    /**
-     * Method: read_ol_displayInLayerSwitcher
-     */
-    read_ol_displayInLayerSwitcher: function(layerContext, node) {
-        layerContext.displayInLayerSwitcher = (this.getChildValue(node) == "true");
-    },
-
-    /**
-     * Method: read_wmc_Server
-     */
-    read_wmc_Server: function(layerContext, node) {
-        layerContext.version = node.getAttribute("version");
-         layerContext.url = this.getOnlineResource_href(node);
-         layerContext.metadata.servertitle = node.getAttribute("title");
-    },
-
-    /**
-     * Method: read_wmc_FormatList
-     */
-    read_wmc_FormatList: function(layerContext, node) {
-        this.runChildNodes(layerContext, node);
-    },
-
-    /**
-     * Method: read_wmc_Format
-     */
-    read_wmc_Format: function(layerContext, node) {
-        var format = {
-            value: this.getChildValue(node)
-        };
-        if(node.getAttribute("current") == "1") {
-            format.current = true;
-        }
-        layerContext.formats.push(format);
-    },
-    
-    /**
-     * Method: read_wmc_StyleList
-     */
-    read_wmc_StyleList: function(layerContext, node) {
-        this.runChildNodes(layerContext, node);
-    },
-
-    /**
-     * Method: read_wmc_Style
-     */
-    read_wmc_Style: function(layerContext, node) {
-        var style = {};
-        this.runChildNodes(style, node);
-        if(node.getAttribute("current") == "1") {
-            style.current = true;
-        }
-        layerContext.styles.push(style);
-    },
-    
-    /**
-     * Method: read_wmc_SLD
-     */
-    read_wmc_SLD: function(style, node) {
-        this.runChildNodes(style, node);
-        // style either comes back with an href or a body property
-    },
-    
-    /**
-     * Method: read_sld_StyledLayerDescriptor
-     */
-    read_sld_StyledLayerDescriptor: function(sld, node) {
-        var xml = OpenLayers.Format.XML.prototype.write.apply(this, [node]);
-        sld.body = xml;
-    },
-
-    /**
-      * Method: read_sld_FeatureTypeStyle
-      */
-     read_sld_FeatureTypeStyle: function(sld, node) {
-         var xml = OpenLayers.Format.XML.prototype.write.apply(this, [node]);
-         sld.body = xml;
-     },
-
-     /**
-     * Method: read_wmc_OnlineResource
-     */
-    read_wmc_OnlineResource: function(obj, node) {
-        obj.href = this.getAttributeNS(
-            node, this.namespaces.xlink, "href"
-        );
-    },
-    
-    /**
-     * Method: read_wmc_Name
-     */
-    read_wmc_Name: function(obj, node) {
-        var name = this.getChildValue(node);
-        if(name) {
-            obj.name = name;
-        }
-    },
-
-    /**
-     * Method: read_wmc_Title
-     */
-    read_wmc_Title: function(obj, node) {
-        var title = this.getChildValue(node);
-        if(title) {
-            obj.title = title;
-        }
-    },
-
-    /**
-     * Method: read_wmc_MetadataURL
-     */
-    read_wmc_MetadataURL: function(layerContext, node) {
-         layerContext.metadataURL = this.getOnlineResource_href(node);
-     },
-
-     /**
-      * Method: read_wmc_KeywordList
-      */
-     read_wmc_KeywordList: function(context, node) {
-         context.keywords = [];
-         this.runChildNodes(context.keywords, node);
-    },
-
-    /**
-      * Method: read_wmc_Keyword
-      */
-     read_wmc_Keyword: function(keywords, node) {
-         keywords.push(this.getChildValue(node));
-     },
-
-     /**
-     * Method: read_wmc_Abstract
-     */
-    read_wmc_Abstract: function(obj, node) {
-        var abst = this.getChildValue(node);
-        if(abst) {
-            obj["abstract"] = abst;
-        }
-    },
-    
-    /**
-      * Method: read_wmc_LogoURL
-      */
-     read_wmc_LogoURL: function(context, node) {
-         context.logo = {
-             width:  node.getAttribute("width"),
-             height: node.getAttribute("height"),
-             format: node.getAttribute("format"),
-             href:   this.getOnlineResource_href(node)
-         };
-     },
-
-     /**
-      * Method: read_wmc_DescriptionURL
-      */
-     read_wmc_DescriptionURL: function(context, node) {
-         context.descriptionURL = this.getOnlineResource_href(node);
-     },
-
-     /**
-      * Method: read_wmc_ContactInformation
-     */
-     read_wmc_ContactInformation: function(obj, node) {
-         var contact = {};
-         this.runChildNodes(contact, node);
-         obj.contactInformation = contact;
-     },
-
-     /**
-      * Method: read_wmc_ContactPersonPrimary
-      */
-     read_wmc_ContactPersonPrimary: function(contact, node) {
-         var personPrimary = {};
-         this.runChildNodes(personPrimary, node);
-         contact.personPrimary = personPrimary;
-     },
-
-     /**
-      * Method: read_wmc_ContactPerson
-      */
-     read_wmc_ContactPerson: function(primaryPerson, node) {
-         var person = this.getChildValue(node);
-         if (person) {
-             primaryPerson.person = person;
-         }
-     },
-
-     /**
-      * Method: read_wmc_ContactOrganization
-      */
-     read_wmc_ContactOrganization: function(primaryPerson, node) {
-         var organization = this.getChildValue(node);
-         if (organization) {
-             primaryPerson.organization = organization;
-         }
-     },
-
-     /**
-      * Method: read_wmc_ContactPosition
-      */
-     read_wmc_ContactPosition: function(contact, node) {
-         var position = this.getChildValue(node);
-         if (position) {
-             contact.position = position;
-         }
-     },
-
-     /**
-      * Method: read_wmc_ContactAddress
-      */
-     read_wmc_ContactAddress: function(contact, node) {
-         var contactAddress = {};
-         this.runChildNodes(contactAddress, node);
-         contact.contactAddress = contactAddress;
-     },
-
-     /**
-      * Method: read_wmc_AddressType
-      */
-     read_wmc_AddressType: function(contactAddress, node) {
-         var type = this.getChildValue(node);
-         if (type) {
-             contactAddress.type = type;
-         }
-     },
-
-     /**
-      * Method: read_wmc_Address
-      */
-     read_wmc_Address: function(contactAddress, node) {
-         var address = this.getChildValue(node);
-         if (address) {
-             contactAddress.address = address;
-         }
-     },
-
-     /**
-      * Method: read_wmc_City
-      */
-     read_wmc_City: function(contactAddress, node) {
-         var city = this.getChildValue(node);
-         if (city) {
-             contactAddress.city = city;
-         }
-     },
-
-     /**
-      * Method: read_wmc_StateOrProvince
-      */
-     read_wmc_StateOrProvince: function(contactAddress, node) {
-         var stateOrProvince = this.getChildValue(node);
-         if (stateOrProvince) {
-             contactAddress.stateOrProvince = stateOrProvince;
-         }
-     },
-
-     /**
-      * Method: read_wmc_PostCode
-      */
-     read_wmc_PostCode: function(contactAddress, node) {
-         var postcode = this.getChildValue(node);
-         if (postcode) {
-             contactAddress.postcode = postcode;
-         }
-     },
-
-     /**
-      * Method: read_wmc_Country
-      */
-     read_wmc_Country: function(contactAddress, node) {
-         var country = this.getChildValue(node);
-         if (country) {
-             contactAddress.country = country;
-         }
-     },
-
-     /**
-      * Method: read_wmc_ContactVoiceTelephone
-      */
-     read_wmc_ContactVoiceTelephone: function(contact, node) {
-         var phone = this.getChildValue(node);
-         if (phone) {
-             contact.phone = phone;
-         }
-     },
-
-     /**
-      * Method: read_wmc_ContactFacsimileTelephone
-      */
-     read_wmc_ContactFacsimileTelephone: function(contact, node) {
-         var fax = this.getChildValue(node);
-         if (fax) {
-             contact.fax = fax;
-         }
-     },
-
-     /**
-      * Method: read_wmc_ContactElectronicMailAddress
-      */
-     read_wmc_ContactElectronicMailAddress: function(contact, node) {
-         var email = this.getChildValue(node);
-         if (email) {
-             contact.email = email;
-         }
-     },
-
-     /**
-      * Method: read_wmc_DataURL
-      */
-     read_wmc_DataURL: function(layerContext, node) {
-         layerContext.dataURL = this.getOnlineResource_href(node);
-     },
-
-     /**
-     * Method: read_wmc_LegendURL
-     */
-    read_wmc_LegendURL: function(style, node) {
-        var legend = {
-            width: node.getAttribute('width'),
-             height: node.getAttribute('height'),
-             format: node.getAttribute('format'),
-             href:   this.getOnlineResource_href(node)
-        };
-        style.legend = legend;
-    },
-    
-    /**
-      * Method: read_wmc_DimensionList
-      */
-     read_wmc_DimensionList: function(layerContext, node) {
-         layerContext.dimensions = {};
-         this.runChildNodes(layerContext.dimensions, node);
-     },
-     /**
-      * Method: read_wmc_Dimension
-      */
-     read_wmc_Dimension: function(dimensions, node) {
-         var name = node.getAttribute("name").toLowerCase();
-
-         var dim = {
-             name:           name,
-             units:          node.getAttribute("units")          ||  "",
-             unitSymbol:     node.getAttribute("unitSymbol")     ||  "",
-             userValue:      node.getAttribute("userValue")      ||  "",
-             nearestValue:   node.getAttribute("nearestValue")   === "1",
-             multipleValues: node.getAttribute("multipleValues") === "1",
-             current:        node.getAttribute("current")        === "1",
-             "default":      node.getAttribute("default")        ||  ""
-         };
-         var values = this.getChildValue(node);
-         dim.values = values.split(",");
-
-         dimensions[dim.name] = dim;
-     },
-
-     /**
-     * Method: write
-     *
-     * Parameters:
-     * context - {Object} An object representing the map context.
-     * options - {Object} Optional object.
-     *
-     * Returns:
-     * {String} A WMC document string.
-     */
-    write: function(context, options) {
-        var root = this.createElementDefaultNS("ViewContext");
-        this.setAttributes(root, {
-            version: this.VERSION,
-            id: (options && typeof options.id == "string") ?
-                    options.id :
-                    OpenLayers.Util.createUniqueID("OpenLayers_Context_")
-        });
-        
-        // add schemaLocation attribute
-        this.setAttributeNS(
-            root, this.namespaces.xsi,
-            "xsi:schemaLocation", this.schemaLocation
-        );
-        
-        // required General element
-        root.appendChild(this.write_wmc_General(context));
-
-        // required LayerList element
-        root.appendChild(this.write_wmc_LayerList(context));
-
-        return OpenLayers.Format.XML.prototype.write.apply(this, [root]);
-    },
-    
-    /**
-     * Method: createElementDefaultNS
-     * Shorthand for createElementNS with namespace from <defaultPrefix>.
-     *     Can optionally be used to set attributes and a text child value.
-     *
-     * Parameters:
-     * name - {String} The qualified node name.
-     * childValue - {String} Optional value for text child node.
-     * attributes - {Object} Optional object representing attributes.
-     *
-     * Returns:
-     * {Element} An element node.
-     */
-    createElementDefaultNS: function(name, childValue, attributes) {
-        var node = this.createElementNS(
-            this.namespaces[this.defaultPrefix],
-            name
-        );
-        if(childValue) {
-            node.appendChild(this.createTextNode(childValue));
-        }
-        if(attributes) {
-            this.setAttributes(node, attributes);
-        }
-        return node;
-    },
-    
-    /**
-     * Method: setAttributes
-     * Set multiple attributes given key value pairs from an object.
-     *
-     * Parameters:
-     * node - {Element} An element node.
-     * obj - {Object} An object whose properties represent attribute names and
-     *     values represent attribute values.
-     */
-    setAttributes: function(node, obj) {
-        var value;
-        for(var name in obj) {
-            value = obj[name].toString();
-            if(value.match(/[A-Z]/)) {
-                // safari lowercases attributes with setAttribute
-                this.setAttributeNS(node, null, name, value);
-            } else {
-                node.setAttribute(name, value);
-            }
-        }
-    },
-
-    /**
-     * Method: write_wmc_General
-     * Create a General node given an context object.
-     *
-     * Parameters:
-     * context - {Object} Context object.
-     *
-     * Returns:
-     * {Element} A WMC General element node.
-     */
-    write_wmc_General: function(context) {
-        var node = this.createElementDefaultNS("General");
-
-        // optional Window element
-        if(context.size) {
-            node.appendChild(this.createElementDefaultNS(
-                "Window", null,
-                {
-                    width: context.size.w,
-                    height: context.size.h
-                }
-            ));
-        }
-        
-        // required BoundingBox element
-        var bounds = context.bounds;
-        node.appendChild(this.createElementDefaultNS(
-            "BoundingBox", null,
-            {
-                minx: bounds.left.toPrecision(18),
-                miny: bounds.bottom.toPrecision(18),
-                maxx: bounds.right.toPrecision(18),
-                maxy: bounds.top.toPrecision(18),
-                SRS: context.projection
-            }
-        ));
-
-        // required Title element
-        node.appendChild(this.createElementDefaultNS(
-            "Title", context.title
-        ));
-        
-         // optional KeywordList element
-         if (context.keywords) {
-             node.appendChild(this.write_wmc_KeywordList(context.keywords));
-         }
-
-         // optional Abstract element
-         if (context["abstract"]) {
-             node.appendChild(this.createElementDefaultNS(
-                 "Abstract", context["abstract"]
-             ));
-         }
-
-         // Optional LogoURL element
-         if (context.logo) {
-             node.appendChild(this.write_wmc_URLType("LogoURL", context.logo.href, context.logo));
-         }
-
-         // Optional DescriptionURL element
-         if (context.descriptionURL) {
-             node.appendChild(this.write_wmc_URLType("DescriptionURL", context.descriptionURL));
-         }
-
-         // Optional ContactInformation element
-         if (context.contactInformation) {
-             node.appendChild(this.write_wmc_ContactInformation(context.contactInformation));
-         }
-
-        // OpenLayers specific map properties
-        node.appendChild(this.write_ol_MapExtension(context));
-        
-        return node;
-    },
-    
-    /**
-      * Method: write_wmc_KeywordList
-      */
-     write_wmc_KeywordList: function(keywords) {
-         var node = this.createElementDefaultNS("KeywordList");
-
-         for (var i=0, len=keywords.length; i<len; i++) {
-             node.appendChild(this.createElementDefaultNS(
-                 "Keyword", keywords[i]
-             ));
-         }
-         return node;
-     },
-     /**
-      * Method: write_wmc_ContactInformation
-      */
-     write_wmc_ContactInformation: function(contact) {
-         var node = this.createElementDefaultNS("ContactInformation");
-
-         if (contact.personPrimary) {
-             node.appendChild(this.write_wmc_ContactPersonPrimary(contact.personPrimary));
-         }
-         if (contact.position) {
-             node.appendChild(this.createElementDefaultNS(
-                 "ContactPosition", contact.position
-             ));
-         }
-         if (contact.contactAddress) {
-             node.appendChild(this.write_wmc_ContactAddress(contact.contactAddress));
-         }
-         if (contact.phone) {
-             node.appendChild(this.createElementDefaultNS(
-                 "ContactVoiceTelephone", contact.phone
-             ));
-         }
-         if (contact.fax) {
-             node.appendChild(this.createElementDefaultNS(
-                 "ContactFacsimileTelephone", contact.fax
-             ));
-         }
-         if (contact.email) {
-             node.appendChild(this.createElementDefaultNS(
-                 "ContactElectronicMailAddress", contact.email
-             ));
-         }
-         return node;
-     },
-
-     /**
-      * Method: write_wmc_ContactPersonPrimary
-      */
-     write_wmc_ContactPersonPrimary: function(personPrimary) {
-         var node = this.createElementDefaultNS("ContactPersonPrimary");
-         if (personPrimary.person) {
-             node.appendChild(this.createElementDefaultNS(
-                 "ContactPerson", personPrimary.person
-             ));
-         }
-         if (personPrimary.organization) {
-             node.appendChild(this.createElementDefaultNS(
-                 "ContactOrganization", personPrimary.organization
-             ));
-         }
-         return node;
-     },
-
-     /**
-      * Method: write_wmc_ContactAddress
-      */
-     write_wmc_ContactAddress: function(contactAddress) {
-         var node = this.createElementDefaultNS("ContactAddress");
-         if (contactAddress.type) {
-             node.appendChild(this.createElementDefaultNS(
-                 "AddressType", contactAddress.type
-             ));
-         }
-         if (contactAddress.address) {
-             node.appendChild(this.createElementDefaultNS(
-                 "Address", contactAddress.address
-             ));
-         }
-         if (contactAddress.city) {
-             node.appendChild(this.createElementDefaultNS(
-                 "City", contactAddress.city
-             ));
-         }
-         if (contactAddress.stateOrProvince) {
-             node.appendChild(this.createElementDefaultNS(
-                 "StateOrProvince", contactAddress.stateOrProvince
-             ));
-         }
-         if (contactAddress.postcode) {
-             node.appendChild(this.createElementDefaultNS(
-                 "PostCode", contactAddress.postcode
-             ));
-         }
-         if (contactAddress.country) {
-             node.appendChild(this.createElementDefaultNS(
-                 "Country", contactAddress.country
-             ));
-         }
-         return node;
-     },
-
-     /**
-     * Method: write_ol_MapExtension
-     */
-    write_ol_MapExtension: function(context) {
-        var node = this.createElementDefaultNS("Extension");
-        
-        var bounds = context.maxExtent;
-        if(bounds) {
-            var maxExtent = this.createElementNS(
-                this.namespaces.ol, "ol:maxExtent"
-            );
-            this.setAttributes(maxExtent, {
-                minx: bounds.left.toPrecision(18),
-                miny: bounds.bottom.toPrecision(18),
-                maxx: bounds.right.toPrecision(18),
-                maxy: bounds.top.toPrecision(18)
-            });
-            node.appendChild(maxExtent);
-        }
-        
-        return node;
-    },
-    
-    /**
-     * Method: write_wmc_LayerList
-     * Create a LayerList node given an context object.
-     *
-     * Parameters:
-     * context - {Object} Context object.
-     *
-     * Returns:
-     * {Element} A WMC LayerList element node.
-     */
-    write_wmc_LayerList: function(context) {
-        var list = this.createElementDefaultNS("LayerList");
-        
-        for(var i=0, len=context.layersContext.length; i<len; ++i) {
-            list.appendChild(this.write_wmc_Layer(context.layersContext[i]));
-        }
-        
-        return list;
-    },
-
-    /**
-     * Method: write_wmc_Layer
-     * Create a Layer node given a layer context object.
-     *
-     * Parameters:
-     * context - {Object} A layer context object.}
-     *
-     * Returns:
-     * {Element} A WMC Layer element node.
-     */
-    write_wmc_Layer: function(context) {
-        var node = this.createElementDefaultNS(
-            "Layer", null, {
-                queryable: context.queryable ? "1" : "0",
-                hidden: context.visibility ? "0" : "1"
-            }
-        );
-        
-        // required Server element
-        node.appendChild(this.write_wmc_Server(context));
-
-        // required Name element
-        node.appendChild(this.createElementDefaultNS(
-            "Name", context.name
-        ));
-        
-        // required Title element
-        node.appendChild(this.createElementDefaultNS(
-            "Title", context.title
-        ));
-
-         // optional Abstract element
-         if (context["abstract"]) {
-             node.appendChild(this.createElementDefaultNS(
-                 "Abstract", context["abstract"]
-             ));
-         }
-
-         // optional DataURL element
-         if (context.dataURL) {
-             node.appendChild(this.write_wmc_URLType("DataURL", context.dataURL));
-         }
-
-        // optional MetadataURL element
-        if (context.metadataURL) {
-             node.appendChild(this.write_wmc_URLType("MetadataURL", context.metadataURL));
-        }
-        
-        return node;
-    },
-    
-    /**
-     * Method: write_wmc_LayerExtension
-     * Add OpenLayers specific layer parameters to an Extension element.
-     *
-     * Parameters:
-     * context - {Object} A layer context object.
-     *
-     * Returns:
-     * {Element} A WMC Extension element (for a layer).
-     */
-    write_wmc_LayerExtension: function(context) {
-        var node = this.createElementDefaultNS("Extension");
-        
-        var bounds = context.maxExtent;
-        var maxExtent = this.createElementNS(
-            this.namespaces.ol, "ol:maxExtent"
-        );
-        this.setAttributes(maxExtent, {
-            minx: bounds.left.toPrecision(18),
-            miny: bounds.bottom.toPrecision(18),
-            maxx: bounds.right.toPrecision(18),
-            maxy: bounds.top.toPrecision(18)
-        });
-        node.appendChild(maxExtent);
-        
-        if (context.tileSize && !context.singleTile) {
-            var size = this.createElementNS(
-                this.namespaces.ol, "ol:tileSize"
-            );
-            this.setAttributes(size, context.tileSize);
-            node.appendChild(size);
-        }
-        
-        var properties = [
-            "transparent", "numZoomLevels", "units", "isBaseLayer",
-            "opacity", "displayInLayerSwitcher", "singleTile"
-        ];
-        var child;
-        for(var i=0, len=properties.length; i<len; ++i) {
-            child = this.createOLPropertyNode(context, properties[i]);
-            if(child) {
-                node.appendChild(child);
-            }
-        }
-
-        return node;
-    },
-    
-    /**
-     * Method: createOLPropertyNode
-     * Create a node representing an OpenLayers property.  If the property is
-     *     null or undefined, null will be returned.
-     *
-     * Parameters:
-     * obj - {Object} An object.
-     * prop - {String} A property.
-     *
-     * Returns:
-     * {Element} A property node.
-     */
-    createOLPropertyNode: function(obj, prop) {
-        var node = null;
-        if(obj[prop] != null) {
-            node = this.createElementNS(this.namespaces.ol, "ol:" + prop);
-            node.appendChild(this.createTextNode(obj[prop].toString()));
-        }
-        return node;
-    },
-
-    /**
-     * Method: write_wmc_Server
-     * Create a Server node given a layer context object.
-     *
-     * Parameters:
-     * context - {Object} Layer context object.
-     *
-     * Returns:
-     * {Element} A WMC Server element node.
-     */
-    write_wmc_Server: function(context) {
-         var server = context.server;
-        var node = this.createElementDefaultNS("Server");
-         var attributes = {
-            service: "OGC:WMS",
-             version: server.version
-         };
-         if (server.title) {
-             attributes.title = server.title;
-         }
-         this.setAttributes(node, attributes);
-        
-        // required OnlineResource element
-         node.appendChild(this.write_wmc_OnlineResource(server.url));
-        
-        return node;
-    },
-
-    /**
-     * Method: write_wmc_URLType
-     * Create a LogoURL/DescriptionURL/MetadataURL/DataURL/LegendURL node given a object and elementName.
-     *
-     * Parameters:
-     * elName - {String} Name of element (LogoURL/DescriptionURL/MetadataURL/LegendURL)
-     * url - {String} URL string value
-     * attr - {Object} Optional attributes (width, height, format)
-     *
-     * Returns:
-     * {Element} A WMC element node.
-     */
-     write_wmc_URLType: function(elName, url, attr) {
-         var node = this.createElementDefaultNS(elName);
-         node.appendChild(this.write_wmc_OnlineResource(url));
-         if (attr) {
-             var optionalAttributes = ["width", "height", "format"];
-             for (var i=0; i<optionalAttributes.length; i++) {
-                 if (optionalAttributes[i] in attr) {
-                     node.setAttribute(optionalAttributes[i], attr[optionalAttributes[i]]);
-                 }
-             }
-         }
-         return node;
-     },
-
-     /**
-      * Method: write_wmc_DimensionList
-      */
-     write_wmc_DimensionList: function(context) {
-         var node = this.createElementDefaultNS("DimensionList");
-         var required_attributes = {
-             name: true,
-             units: true,
-             unitSymbol: true,
-             userValue: true
-         };
-         for (var dim in context.dimensions) {
-             var attributes = {};
-             var dimension = context.dimensions[dim];
-             for (var name in dimension) {
-                 if (typeof dimension[name] == "boolean") {
-                     attributes[name] = Number(dimension[name]);
-                 } else {
-                     attributes[name] = dimension[name];
-                 }
-             }
-             var values = "";
-             if (attributes.values) {
-                 values = attributes.values.join(",");
-                 delete attributes.values;
-             }
-
-             node.appendChild(this.createElementDefaultNS(
-                 "Dimension", values, attributes
-             ));
-         }
-        return node;
-    },
-
-    /**
-     * Method: write_wmc_FormatList
-     * Create a FormatList node given a layer context.
-     *
-     * Parameters:
-     * context - {Object} Layer context object.
-     *
-     * Returns:
-     * {Element} A WMC FormatList element node.
-     */
-    write_wmc_FormatList: function(context) {
-        var node = this.createElementDefaultNS("FormatList");
-        for (var i=0, len=context.formats.length; i<len; i++) {
-            var format = context.formats[i];
-            node.appendChild(this.createElementDefaultNS(
-                "Format",
-                format.value,
-                (format.current && format.current == true) ?
-                    {current: "1"} : null
-            ));
-        }
-
-        return node;
-    },
-
-    /**
-     * Method: write_wmc_StyleList
-     * Create a StyleList node given a layer context.
-     *
-     * Parameters:
-     * layer - {Object} Layer context object.
-     *
-     * Returns:
-     * {Element} A WMC StyleList element node.
-     */
-    write_wmc_StyleList: function(layer) {
-        var node = this.createElementDefaultNS("StyleList");
-
-        var styles = layer.styles;
-        if (styles && OpenLayers.Util.isArray(styles)) {
-            var sld;
-            for (var i=0, len=styles.length; i<len; i++) {
-                var s = styles[i];
-                // three style types to consider
-                // [1] linked SLD
-                // [2] inline SLD
-                // [3] named style
-                // running child nodes always gets name, optionally gets href or body
-                var style = this.createElementDefaultNS(
-                    "Style",
-                    null,
-                    (s.current && s.current == true) ?
-                    {current: "1"} : null
-                );
-                if(s.href) { // [1]
-                    sld = this.createElementDefaultNS("SLD");
-                     // Name is optional.
-                     if (s.name) {
-                    sld.appendChild(this.createElementDefaultNS("Name", s.name));
-                     }
-                    // Title is optional.
-                    if (s.title) {
-                        sld.appendChild(this.createElementDefaultNS("Title", s.title));
-                    }
-                     // LegendURL is optional
-                     if (s.legend) {
-                         sld.appendChild(this.write_wmc_URLType("LegendURL", s.legend.href, s.legend));
-                     }
-
-                     var link = this.write_wmc_OnlineResource(s.href);
-                     sld.appendChild(link);
-                    style.appendChild(sld);
-                } else if(s.body) { // [2]
-                    sld = this.createElementDefaultNS("SLD");
-                     // Name is optional.
-                     if (s.name) {
-                         sld.appendChild(this.createElementDefaultNS("Name", s.name));
-                     }
-                     // Title is optional.
-                     if (s.title) {
-                         sld.appendChild(this.createElementDefaultNS("Title", s.title));
-                     }
-                     // LegendURL is optional
-                     if (s.legend) {
-                         sld.appendChild(this.write_wmc_URLType("LegendURL", s.legend.href, s.legend));
-                     }
-
-                    // read in body as xml doc - assume proper namespace declarations
-                    var doc = OpenLayers.Format.XML.prototype.read.apply(this, [s.body]);
-                    // append to StyledLayerDescriptor node
-                    var imported = doc.documentElement;
-                    if(sld.ownerDocument && sld.ownerDocument.importNode) {
-                        imported = sld.ownerDocument.importNode(imported, true);
-                    }
-                    sld.appendChild(imported);
-                    style.appendChild(sld);            
-                } else { // [3]
-                    // both Name and Title are required.
-                    style.appendChild(this.createElementDefaultNS("Name", s.name));
-                    style.appendChild(this.createElementDefaultNS("Title", s.title));
-                    // Abstract is optional
-                    if (s['abstract']) { // abstract is a js keyword
-                        style.appendChild(this.createElementDefaultNS(
-                            "Abstract", s['abstract']
-                        ));
-                    }
-                     // LegendURL is optional
-                     if (s.legend) {
-                         style.appendChild(this.write_wmc_URLType("LegendURL", s.legend.href, s.legend));
-                }
-                 }
-                node.appendChild(style);
-            }
-        }
-
-        return node;
-    },
-
-    /**
-     * Method: write_wmc_OnlineResource
-     * Create an OnlineResource node given a URL.
-     *
-     * Parameters:
-     * href - {String} URL for the resource.
-     *
-     * Returns:
-     * {Element} A WMC OnlineResource element node.
-     */
-    write_wmc_OnlineResource: function(href) {
-        var node = this.createElementDefaultNS("OnlineResource");
-        this.setAttributeNS(node, this.namespaces.xlink, "xlink:type", "simple");
-        this.setAttributeNS(node, this.namespaces.xlink, "xlink:href", href);
-        return node;
-    },
-
-     /**
-      * Method: getOnlineResource_href
-      */
-     getOnlineResource_href: function(node) {
-         var object = {};
-         var links = node.getElementsByTagName("OnlineResource");
-         if(links.length > 0) {
-             this.read_wmc_OnlineResource(object, links[0]);
-         }
-         return object.href;
-     },
-
-
-    CLASS_NAME: "OpenLayers.Format.WMC.v1" 
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMC/v1_0_0.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMC/v1_0_0.js
deleted file mode 100644
index ace0d95c..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMC/v1_0_0.js
+++ /dev/null
@@ -1,104 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/WMC/v1.js
- */
-
-/**
- * Class: OpenLayers.Format.WMC.v1_0_0
- * Read and write WMC version 1.0.0.
- * 
- * Inherits from:
- *  - <OpenLayers.Format.WMC.v1>
- */
-OpenLayers.Format.WMC.v1_0_0 = OpenLayers.Class(
-    OpenLayers.Format.WMC.v1, {
-    
-    /**
-     * Constant: VERSION
-     * {String} 1.0.0
-     */
-    VERSION: "1.0.0",
-    
-    /**
-     * Property: schemaLocation
-     * {String} http://www.opengis.net/context
-     *     http://schemas.opengis.net/context/1.0.0/context.xsd
-     */
-    schemaLocation: "http://www.opengis.net/context http://schemas.opengis.net/context/1.0.0/context.xsd",
-
-    /**
-     * Constructor: OpenLayers.Format.WMC.v1_0_0
-     * Instances of this class are not created directly.  Use the
-     *     <OpenLayers.Format.WMC> constructor instead.
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be set on
-     *     this instance.
-     */
-    initialize: function(options) {
-        OpenLayers.Format.WMC.v1.prototype.initialize.apply(
-            this, [options]
-        );
-    },
-
-    /**
-     * Method: read_wmc_SRS
-     */
-    read_wmc_SRS: function(layerContext, node) {
-        var srs    = this.getChildValue(node);
-        if (typeof layerContext.projections != "object") {
-            layerContext.projections = {};
-        }
-        var values = srs.split(/ +/);
-        for (var i=0, len=values.length; i<len; i++) {
-            layerContext.projections[values[i]] = true;
-        }
-    },
-
-    /**
-     * Method: write_wmc_Layer
-     * Create a Layer node given a layer context object. This method adds
-     *     elements specific to version 1.0.0.
-     *
-     * Parameters:
-     * context - {Object} A layer context object.}
-     *
-     * Returns:
-     * {Element} A WMC Layer element node.
-     */
-    write_wmc_Layer: function(context) {
-        var node = OpenLayers.Format.WMC.v1.prototype.write_wmc_Layer.apply(
-            this, [context]
-        );
-    
-        // optional SRS element(s)
-        if (context.srs) {
-            var projections = [];
-            for(var name in context.srs) {
-                projections.push(name);
-            }
-            node.appendChild(this.createElementDefaultNS("SRS", projections.join(" ")));
-        }
-
-        // optional FormatList element
-        node.appendChild(this.write_wmc_FormatList(context));
-
-        // optional StyleList element
-        node.appendChild(this.write_wmc_StyleList(context));
-        
-        // optional DimensionList element
-        if (context.dimensions) {
-            node.appendChild(this.write_wmc_DimensionList(context));
-        }
-
-        // OpenLayers specific properties go in an Extension element
-        node.appendChild(this.write_wmc_LayerExtension(context));
-    },    
-
-    CLASS_NAME: "OpenLayers.Format.WMC.v1_0_0" 
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMC/v1_1_0.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMC/v1_1_0.js
deleted file mode 100644
index e5efc3e2..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMC/v1_1_0.js
+++ /dev/null
@@ -1,149 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/WMC/v1.js
- */
-
-/**
- * Class: OpenLayers.Format.WMC.v1_1_0
- * Read and write WMC version 1.1.0.
- *
- * Differences between 1.1.0 and 1.0.0:
- *     - 1.1.0 Layers have optional sld:MinScaleDenominator and
- *       sld:MaxScaleDenominator
- * 
- * Inherits from:
- *  - <OpenLayers.Format.WMC.v1>
- */
-OpenLayers.Format.WMC.v1_1_0 = OpenLayers.Class(
-    OpenLayers.Format.WMC.v1, {
-    
-    /**
-     * Constant: VERSION
-     * {String} 1.1.0
-     */
-    VERSION: "1.1.0",
-
-    /**
-     * Property: schemaLocation
-     * {String} http://www.opengis.net/context
-     *     http://schemas.opengis.net/context/1.1.0/context.xsd
-     */
-    schemaLocation: "http://www.opengis.net/context http://schemas.opengis.net/context/1.1.0/context.xsd",
-
-    /**
-     * Constructor: OpenLayers.Format.WMC.v1_1_0
-     * Instances of this class are not created directly.  Use the
-     *     <OpenLayers.Format.WMC> constructor instead.
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be set on
-     *     this instance.
-     */
-    initialize: function(options) {
-        OpenLayers.Format.WMC.v1.prototype.initialize.apply(
-            this, [options]
-        );
-    },
-
-    /**
-     * Method: read_sld_MinScaleDenominator
-     * Read a sld:MinScaleDenominator node.
-     *
-     * Parameters:
-     * layerContext - {Object} An object representing a layer.
-     * node - {Element} An element node.
-     */
-    read_sld_MinScaleDenominator: function(layerContext, node) {
-        var minScaleDenominator = parseFloat(this.getChildValue(node));
-        if (minScaleDenominator > 0) {
-            layerContext.maxScale = minScaleDenominator;
-        }
-    },
-
-    /**
-     * Method: read_sld_MaxScaleDenominator
-     * Read a sld:MaxScaleDenominator node.
-     *
-     * Parameters:
-     * layerContext - {Object} An object representing a layer.
-     * node - {Element} An element node.
-     */
-    read_sld_MaxScaleDenominator: function(layerContext, node) {
-        layerContext.minScale = parseFloat(this.getChildValue(node));
-    },
-
-    /**
-     * Method: read_wmc_SRS
-     */
-    read_wmc_SRS: function(layerContext, node) {
-        if (! ("srs" in layerContext)) {
-            layerContext.srs = {};
-        }
-        layerContext.srs[this.getChildValue(node)] = true;
-    },
-
-    /**
-     * Method: write_wmc_Layer
-     * Create a Layer node given a layer context object. This method adds
-     *     elements specific to version 1.1.0.
-     *
-     * Parameters:
-     * context - {Object} A layer context object.}
-     *
-     * Returns:
-     * {Element} A WMC Layer element node.
-     */
-    write_wmc_Layer: function(context) {
-        var node = OpenLayers.Format.WMC.v1.prototype.write_wmc_Layer.apply(
-            this, [context]
-        );
-        
-        // min/max scale denominator elements go before the 4th element in v1
-        if(context.maxScale) {
-            var minSD = this.createElementNS(
-                this.namespaces.sld, "sld:MinScaleDenominator"
-            );
-            minSD.appendChild(this.createTextNode(context.maxScale.toPrecision(16)));
-            node.appendChild(minSD);
-        }
-        
-        if(context.minScale) {
-            var maxSD = this.createElementNS(
-                this.namespaces.sld, "sld:MaxScaleDenominator"
-            );
-            maxSD.appendChild(this.createTextNode(context.minScale.toPrecision(16)));
-            node.appendChild(maxSD);
-        }
-
-        // optional SRS element(s)
-        if (context.srs) {
-            for(var name in context.srs) {
-                node.appendChild(this.createElementDefaultNS("SRS", name));
-            }
-        }
-
-        // optional FormatList element
-        node.appendChild(this.write_wmc_FormatList(context));
-
-        // optional StyleList element
-        node.appendChild(this.write_wmc_StyleList(context));
-        
-        // optional DimensionList element
-        if (context.dimensions) {
-            node.appendChild(this.write_wmc_DimensionList(context));
-        }
-
-        // OpenLayers specific properties go in an Extension element
-        node.appendChild(this.write_wmc_LayerExtension(context));
-        
-        return node;
-        
-    },
-
-    CLASS_NAME: "OpenLayers.Format.WMC.v1_1_0" 
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMSCapabilities.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMSCapabilities.js
deleted file mode 100644
index 2bf3cef0..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMSCapabilities.js
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/XML/VersionedOGC.js
- */
-
-/**
- * Class: OpenLayers.Format.WMSCapabilities
- * Read WMS Capabilities.
- * 
- * Inherits from:
- *  - <OpenLayers.Format.XML.VersionedOGC>
- */
-OpenLayers.Format.WMSCapabilities = OpenLayers.Class(OpenLayers.Format.XML.VersionedOGC, {
-    
-    /**
-     * APIProperty: defaultVersion
-     * {String} Version number to assume if none found.  Default is "1.1.1".
-     */
-    defaultVersion: "1.1.1",
-    
-    /**
-     * APIProperty: profile
-     * {String} If provided, use a custom profile.
-     *
-     * Currently supported profiles:
-     * - WMSC - parses vendor specific capabilities for WMS-C.
-     */
-    profile: null,
-    
-    /**
-     * Constructor: OpenLayers.Format.WMSCapabilities
-     * Create a new parser for WMS capabilities.
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be set on
-     *     this instance.
-     */
-
-    /**
-     * APIMethod: read
-     * Read capabilities data from a string, and return a list of layers. 
-     * 
-     * Parameters: 
-     * data - {String} or {DOMElement} data to read/parse.
-     *
-     * Returns:
-     * {Array} List of named layers.
-     */
-    
-    CLASS_NAME: "OpenLayers.Format.WMSCapabilities" 
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMSCapabilities/v1.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMSCapabilities/v1.js
deleted file mode 100644
index ef5c133e..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMSCapabilities/v1.js
+++ /dev/null
@@ -1,368 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/WMSCapabilities.js
- * @requires OpenLayers/Format/OGCExceptionReport.js
- * @requires OpenLayers/Format/XML.js
- */
-
-/**
- * Class: OpenLayers.Format.WMSCapabilities.v1
- * Abstract class not to be instantiated directly. Creates
- * the common parts for both WMS 1.1.X and WMS 1.3.X.
- * 
- * Inherits from:
- *  - <OpenLayers.Format.XML>
- */
-OpenLayers.Format.WMSCapabilities.v1 = OpenLayers.Class(
-    OpenLayers.Format.XML, {
-    
-    /**
-     * Property: namespaces
-     * {Object} Mapping of namespace aliases to namespace URIs.
-     */
-    namespaces: {
-        wms: "http://www.opengis.net/wms",
-        xlink: "http://www.w3.org/1999/xlink",
-        xsi: "http://www.w3.org/2001/XMLSchema-instance"
-    },
-
-    /**
-     * Property: defaultPrefix
-     */
-    defaultPrefix: "wms",
-    
-    /**
-     * Constructor: OpenLayers.Format.WMSCapabilities.v1
-     * Create an instance of one of the subclasses.
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be set on
-     *     this instance.
-     */
-
-    /**
-     * APIMethod: read
-     * Read capabilities data from a string, and return a list of layers. 
-     * 
-     * Parameters: 
-     * data - {String} or {DOMElement} data to read/parse.
-     *
-     * Returns:
-     * {Array} List of named layers.
-     */
-    read: function(data) {
-        if(typeof data == "string") {
-            data = OpenLayers.Format.XML.prototype.read.apply(this, [data]);
-        }
-        var raw = data;
-        if(data && data.nodeType == 9) {
-            data = data.documentElement;
-        }
-        var capabilities = {};
-        this.readNode(data, capabilities);
-        if (capabilities.service === undefined) {
-            // an exception must have occurred, so parse it
-            var parser = new OpenLayers.Format.OGCExceptionReport();
-            capabilities.error = parser.read(raw);
-        }
-        return capabilities;
-    },
-
-    /**
-     * Property: readers
-     * Contains public functions, grouped by namespace prefix, that will
-     *     be applied when a namespaced node is found matching the function
-     *     name.  The function will be applied in the scope of this parser
-     *     with two arguments: the node being read and a context object passed
-     *     from the parent.
-     */
-    readers: {
-        "wms": {
-            "Service": function(node, obj) {
-                obj.service = {};
-                this.readChildNodes(node, obj.service);
-            },
-            "Name": function(node, obj) {
-                obj.name = this.getChildValue(node);
-            },
-            "Title": function(node, obj) {
-                obj.title = this.getChildValue(node);
-            },
-            "Abstract": function(node, obj) {
-                obj["abstract"] = this.getChildValue(node);
-            },
-            "BoundingBox": function(node, obj) {
-                var bbox = {};
-                bbox.bbox = [
-                    parseFloat(node.getAttribute("minx")),
-                    parseFloat(node.getAttribute("miny")),
-                    parseFloat(node.getAttribute("maxx")),
-                    parseFloat(node.getAttribute("maxy"))
-                ];
-                var res = {
-                    x: parseFloat(node.getAttribute("resx")),
-                    y: parseFloat(node.getAttribute("resy"))
-                };
-
-                if (! (isNaN(res.x) && isNaN(res.y))) {
-                    bbox.res = res;
-                }
-                // return the bbox so that descendant classes can set the
-                // CRS and SRS and add it to the obj
-                return bbox;
-            },
-            "OnlineResource": function(node, obj) {
-                obj.href = this.getAttributeNS(node, this.namespaces.xlink, 
-                    "href");
-            },
-            "ContactInformation": function(node, obj) {
-                obj.contactInformation = {};
-                this.readChildNodes(node, obj.contactInformation);
-            },
-            "ContactPersonPrimary": function(node, obj) {
-                obj.personPrimary = {};
-                this.readChildNodes(node, obj.personPrimary);
-            },
-            "ContactPerson": function(node, obj) {
-                obj.person = this.getChildValue(node);
-            },
-            "ContactOrganization": function(node, obj) {
-                obj.organization = this.getChildValue(node);
-            },
-            "ContactPosition": function(node, obj) {
-                obj.position = this.getChildValue(node);
-            },
-            "ContactAddress": function(node, obj) {
-                obj.contactAddress = {};
-                this.readChildNodes(node, obj.contactAddress);
-            },
-            "AddressType": function(node, obj) {
-                obj.type = this.getChildValue(node);
-            },
-            "Address": function(node, obj) {
-                obj.address = this.getChildValue(node);
-            },
-            "City": function(node, obj) {
-                obj.city = this.getChildValue(node);
-            },
-            "StateOrProvince": function(node, obj) {
-                obj.stateOrProvince = this.getChildValue(node);
-            },
-            "PostCode": function(node, obj) {
-                obj.postcode = this.getChildValue(node);
-            },
-            "Country": function(node, obj) {
-                obj.country = this.getChildValue(node);
-            },
-            "ContactVoiceTelephone": function(node, obj) {
-                obj.phone = this.getChildValue(node);
-            },
-            "ContactFacsimileTelephone": function(node, obj) {
-                obj.fax = this.getChildValue(node);
-            },
-            "ContactElectronicMailAddress": function(node, obj) {
-                obj.email = this.getChildValue(node);
-            },
-            "Fees": function(node, obj) {
-                var fees = this.getChildValue(node);
-                if (fees && fees.toLowerCase() != "none") {
-                    obj.fees = fees;
-                }
-            },
-            "AccessConstraints": function(node, obj) {
-                var constraints = this.getChildValue(node);
-                if (constraints && constraints.toLowerCase() != "none") {
-                    obj.accessConstraints = constraints;
-                }
-            },
-            "Capability": function(node, obj) {
-                obj.capability = {
-                    nestedLayers: [],
-                    layers: []
-                };
-                this.readChildNodes(node, obj.capability);
-            },
-            "Request": function(node, obj) {
-                obj.request = {};
-                this.readChildNodes(node, obj.request);
-            },
-            "GetCapabilities": function(node, obj) {
-                obj.getcapabilities = {formats: []};
-                this.readChildNodes(node, obj.getcapabilities);
-            },
-            "Format": function(node, obj) {
-                if (OpenLayers.Util.isArray(obj.formats)) {
-                    obj.formats.push(this.getChildValue(node));
-                } else {
-                    obj.format = this.getChildValue(node);
-                }
-            },
-            "DCPType": function(node, obj) {
-                this.readChildNodes(node, obj);
-            },
-            "HTTP": function(node, obj) {
-                this.readChildNodes(node, obj);
-            },
-            "Get": function(node, obj) {
-                obj.get = {};
-                this.readChildNodes(node, obj.get);
-                // backwards compatibility
-                if (!obj.href) {
-                    obj.href = obj.get.href;
-                }
-            },
-            "Post": function(node, obj) {
-                obj.post = {};
-                this.readChildNodes(node, obj.post);
-                // backwards compatibility
-                if (!obj.href) {
-                    obj.href = obj.get.href;
-                }
-            },
-            "GetMap": function(node, obj) {
-                obj.getmap = {formats: []};
-                this.readChildNodes(node, obj.getmap);
-            },
-            "GetFeatureInfo": function(node, obj) {
-                obj.getfeatureinfo = {formats: []};
-                this.readChildNodes(node, obj.getfeatureinfo);
-            },
-            "Exception": function(node, obj) {
-                obj.exception = {formats: []};
-                this.readChildNodes(node, obj.exception);
-            },
-            "Layer": function(node, obj) {
-                var parentLayer, capability;
-                if (obj.capability) {
-                    capability = obj.capability;
-                    parentLayer = obj;
-                } else {
-                    capability = obj;
-                }
-                var attrNode = node.getAttributeNode("queryable");
-                var queryable = (attrNode && attrNode.specified) ? 
-                    node.getAttribute("queryable") : null;
-                attrNode = node.getAttributeNode("cascaded");
-                var cascaded = (attrNode && attrNode.specified) ?
-                    node.getAttribute("cascaded") : null;
-                attrNode = node.getAttributeNode("opaque");
-                var opaque = (attrNode && attrNode.specified) ?
-                    node.getAttribute('opaque') : null;
-                var noSubsets = node.getAttribute('noSubsets');
-                var fixedWidth = node.getAttribute('fixedWidth');
-                var fixedHeight = node.getAttribute('fixedHeight');
-                var parent = parentLayer || {},
-                    extend = OpenLayers.Util.extend;
-                var layer = {
-                    nestedLayers: [],
-                    styles: parentLayer ? [].concat(parentLayer.styles) : [],
-                    srs: parentLayer ? extend({}, parent.srs) : {}, 
-                    metadataURLs: [],
-                    bbox: parentLayer ? extend({}, parent.bbox) : {},
-                    llbbox: parent.llbbox,
-                    dimensions: parentLayer ? extend({}, parent.dimensions) : {},
-                    authorityURLs: parentLayer ? extend({}, parent.authorityURLs) : {},
-                    identifiers: {},
-                    keywords: [],
-                    queryable: (queryable && queryable !== "") ? 
-                        (queryable === "1" || queryable === "true" ) :
-                        (parent.queryable || false),
-                    cascaded: (cascaded !== null) ? parseInt(cascaded) :
-                        (parent.cascaded || 0),
-                    opaque: opaque ? 
-                        (opaque === "1" || opaque === "true" ) :
-                        (parent.opaque || false),
-                    noSubsets: (noSubsets !== null) ? 
-                        (noSubsets === "1" || noSubsets === "true" ) :
-                        (parent.noSubsets || false),
-                    fixedWidth: (fixedWidth != null) ? 
-                        parseInt(fixedWidth) : (parent.fixedWidth || 0),
-                    fixedHeight: (fixedHeight != null) ? 
-                        parseInt(fixedHeight) : (parent.fixedHeight || 0),
-                    minScale: parent.minScale,
-                    maxScale: parent.maxScale,
-                    attribution: parent.attribution
-                };
-                obj.nestedLayers.push(layer);
-                layer.capability = capability;
-                this.readChildNodes(node, layer);
-                delete layer.capability;
-                if(layer.name) {
-                    var parts = layer.name.split(":"),
-                        request = capability.request,
-                        gfi = request.getfeatureinfo;
-                    if(parts.length > 0) {
-                        layer.prefix = parts[0];
-                    }
-                    capability.layers.push(layer);
-                    if (layer.formats === undefined) {
-                        layer.formats = request.getmap.formats;
-                    }
-                    if (layer.infoFormats === undefined && gfi) {
-                        layer.infoFormats = gfi.formats;
-                    }
-                }
-            },
-            "Attribution": function(node, obj) {
-                obj.attribution = {};
-                this.readChildNodes(node, obj.attribution);
-            },
-            "LogoURL": function(node, obj) {
-                obj.logo = {
-                    width: node.getAttribute("width"),
-                    height: node.getAttribute("height")
-                };
-                this.readChildNodes(node, obj.logo);
-            },
-            "Style": function(node, obj) {
-                var style = {};
-                obj.styles.push(style);
-                this.readChildNodes(node, style);
-            },
-            "LegendURL": function(node, obj) {
-                var legend = {
-                    width: node.getAttribute("width"),
-                    height: node.getAttribute("height")
-                };
-                obj.legend = legend;
-                this.readChildNodes(node, legend);
-            },
-            "MetadataURL": function(node, obj) {
-                var metadataURL = {type: node.getAttribute("type")};
-                obj.metadataURLs.push(metadataURL);
-                this.readChildNodes(node, metadataURL);
-            },
-            "DataURL": function(node, obj) {
-                obj.dataURL = {};
-                this.readChildNodes(node, obj.dataURL);
-            },
-            "FeatureListURL": function(node, obj) {
-                obj.featureListURL = {};
-                this.readChildNodes(node, obj.featureListURL);
-            },
-            "AuthorityURL": function(node, obj) {
-                var name = node.getAttribute("name");
-                var authority = {};
-                this.readChildNodes(node, authority);
-                obj.authorityURLs[name] = authority.href;
-            },
-            "Identifier": function(node, obj) {
-                var authority = node.getAttribute("authority");
-                obj.identifiers[authority] = this.getChildValue(node);
-            },
-            "KeywordList": function(node, obj) {
-                this.readChildNodes(node, obj);
-            },
-            "SRS": function(node, obj) {
-                obj.srs[this.getChildValue(node)] = true;
-            }
-        }
-    },
-
-    CLASS_NAME: "OpenLayers.Format.WMSCapabilities.v1" 
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMSCapabilities/v1_1.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMSCapabilities/v1_1.js
deleted file mode 100644
index 0e15d380..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMSCapabilities/v1_1.js
+++ /dev/null
@@ -1,122 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/WMSCapabilities/v1.js
- */
-
-/**
- * Class: OpenLayers.Format.WMSCapabilities.v1_1
- * Abstract class not to be instantiated directly.
- * 
- * Inherits from:
- *  - <OpenLayers.Format.WMSCapabilities.v1>
- */
-OpenLayers.Format.WMSCapabilities.v1_1 = OpenLayers.Class(
-    OpenLayers.Format.WMSCapabilities.v1, {
-    
-    /**
-     * Property: readers
-     * Contains public functions, grouped by namespace prefix, that will
-     *     be applied when a namespaced node is found matching the function
-     *     name.  The function will be applied in the scope of this parser
-     *     with two arguments: the node being read and a context object passed
-     *     from the parent.
-     */
-    readers: {
-        "wms": OpenLayers.Util.applyDefaults({
-            "WMT_MS_Capabilities": function(node, obj) {
-                this.readChildNodes(node, obj);
-            },
-            "Keyword": function(node, obj) {
-                if (obj.keywords) {
-                    obj.keywords.push(this.getChildValue(node));
-                }
-            },
-            "DescribeLayer": function(node, obj) {
-                obj.describelayer = {formats: []};
-                this.readChildNodes(node, obj.describelayer);
-            },
-            "GetLegendGraphic": function(node, obj) {
-                obj.getlegendgraphic = {formats: []};
-                this.readChildNodes(node, obj.getlegendgraphic);
-            },
-            "GetStyles": function(node, obj) {
-                obj.getstyles = {formats: []};
-                this.readChildNodes(node, obj.getstyles);
-            },
-            "PutStyles": function(node, obj) {
-                obj.putstyles = {formats: []};
-                this.readChildNodes(node, obj.putstyles);
-            },
-            "UserDefinedSymbolization": function(node, obj) {
-                var userSymbols = {
-                    supportSLD: parseInt(node.getAttribute("SupportSLD")) == 1,
-                    userLayer: parseInt(node.getAttribute("UserLayer")) == 1,
-                    userStyle: parseInt(node.getAttribute("UserStyle")) == 1,
-                    remoteWFS: parseInt(node.getAttribute("RemoteWFS")) == 1
-                };
-                obj.userSymbols = userSymbols;
-            },
-            "LatLonBoundingBox": function(node, obj) {
-                obj.llbbox = [
-                    parseFloat(node.getAttribute("minx")),
-                    parseFloat(node.getAttribute("miny")),
-                    parseFloat(node.getAttribute("maxx")),
-                    parseFloat(node.getAttribute("maxy"))
-                ];
-            },
-            "BoundingBox": function(node, obj) {
-                var bbox = OpenLayers.Format.WMSCapabilities.v1.prototype.readers["wms"].BoundingBox.apply(this, [node, obj]);
-                bbox.srs  = node.getAttribute("SRS");
-                obj.bbox[bbox.srs] = bbox;
-            },
-            "ScaleHint": function(node, obj) {
-                var min = node.getAttribute("min");
-                var max = node.getAttribute("max");
-                var rad2 = Math.pow(2, 0.5);
-                var ipm = OpenLayers.INCHES_PER_UNIT["m"];
-                if (min != 0) {
-                    obj.maxScale = parseFloat(
-                        ((min / rad2) * ipm * 
-                            OpenLayers.DOTS_PER_INCH).toPrecision(13)
-                    );
-                }
-                if (max != Number.POSITIVE_INFINITY) {
-                    obj.minScale = parseFloat(
-                        ((max / rad2) * ipm * 
-                            OpenLayers.DOTS_PER_INCH).toPrecision(13)
-                    );
-                }
-            },
-            "Dimension": function(node, obj) {
-                var name = node.getAttribute("name").toLowerCase();
-                var dim = {
-                    name: name,
-                    units: node.getAttribute("units"),
-                    unitsymbol: node.getAttribute("unitSymbol")
-                };
-                obj.dimensions[dim.name] = dim;
-            },
-            "Extent": function(node, obj) {
-                var name = node.getAttribute("name").toLowerCase();
-                if (name in obj["dimensions"]) {
-                    var extent = obj.dimensions[name];
-                    extent.nearestVal = 
-                        node.getAttribute("nearestValue") === "1";
-                    extent.multipleVal = 
-                        node.getAttribute("multipleValues") === "1";
-                    extent.current = node.getAttribute("current") === "1";
-                    extent["default"] = node.getAttribute("default") || "";
-                    var values = this.getChildValue(node);
-                    extent.values = values.split(",");
-                }
-                }
-        }, OpenLayers.Format.WMSCapabilities.v1.prototype.readers["wms"])
-    },
-
-    CLASS_NAME: "OpenLayers.Format.WMSCapabilities.v1_1" 
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMSCapabilities/v1_1_0.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMSCapabilities/v1_1_0.js
deleted file mode 100644
index a1c62791..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMSCapabilities/v1_1_0.js
+++ /dev/null
@@ -1,57 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/WMSCapabilities/v1_1.js
- */
-
-/**
- * Class: OpenLayers.Format.WMSCapabilities/v1_1_0
- * Read WMS Capabilities version 1.1.0.
- * 
- * Inherits from:
- *  - <OpenLayers.Format.WMSCapabilities.v1_1>
- */
-OpenLayers.Format.WMSCapabilities.v1_1_0 = OpenLayers.Class(
-    OpenLayers.Format.WMSCapabilities.v1_1, {
-    
-    /**
-     * Property: version
-     * {String} The specific parser version.
-     */
-    version: "1.1.0",
-    
-    /**
-     * Constructor: OpenLayers.Format.WMSCapabilities.v1_1_0
-     * Create a new parser for WMS capabilities version 1.1.0.
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be set on
-     *     this instance.
-     */
-
-    /**
-     * Property: readers
-     * Contains public functions, grouped by namespace prefix, that will
-     *     be applied when a namespaced node is found matching the function
-     *     name.  The function will be applied in the scope of this parser
-     *     with two arguments: the node being read and a context object passed
-     *     from the parent.
-     */
-    readers: {
-        "wms": OpenLayers.Util.applyDefaults({
-            "SRS": function(node, obj) {
-                var srs = this.getChildValue(node);
-                var values = srs.split(/ +/);
-                for (var i=0, len=values.length; i<len; i++) {
-                    obj.srs[values[i]] = true;
-                }
-            }
-        }, OpenLayers.Format.WMSCapabilities.v1_1.prototype.readers["wms"])
-    },
-
-    CLASS_NAME: "OpenLayers.Format.WMSCapabilities.v1_1_0" 
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMSCapabilities/v1_1_1.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMSCapabilities/v1_1_1.js
deleted file mode 100644
index 459572b6..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMSCapabilities/v1_1_1.js
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/WMSCapabilities/v1_1.js
- */
-
-/**
- * Class: OpenLayers.Format.WMSCapabilities/v1_1_1
- * Read WMS Capabilities version 1.1.1.
- *
- * Note on <ScaleHint> parsing: If the 'min' attribute is set to "0", no
- * maxScale will be set on the layer object. If the 'max' attribute is set to
- * "Infinity", no minScale will be set. This makes it easy to create proper
- * {<OpenLayers.Layer.WMS>} configurations directly from the layer object
- * literals returned by this format, because no minScale/maxScale modifications
- * need to be made.
- * 
- * Inherits from:
- *  - <OpenLayers.Format.WMSCapabilities.v1_1>
- */
-OpenLayers.Format.WMSCapabilities.v1_1_1 = OpenLayers.Class(
-    OpenLayers.Format.WMSCapabilities.v1_1, {
-    
-    /**
-     * Property: version
-     * {String} The specific parser version.
-     */
-    version: "1.1.1",
-    
-    /**
-     * Constructor: OpenLayers.Format.WMSCapabilities.v1_1_1
-     * Create a new parser for WMS capabilities version 1.1.1.
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be set on
-     *     this instance.
-     */
-
-    /**
-     * Property: readers
-     * Contains public functions, grouped by namespace prefix, that will
-     *     be applied when a namespaced node is found matching the function
-     *     name.  The function will be applied in the scope of this parser
-     *     with two arguments: the node being read and a context object passed
-     *     from the parent.
-     */
-    readers: {
-        "wms": OpenLayers.Util.applyDefaults({
-            "SRS": function(node, obj) {
-                obj.srs[this.getChildValue(node)] = true;
-            }
-        }, OpenLayers.Format.WMSCapabilities.v1_1.prototype.readers["wms"])
-    },
-
-    CLASS_NAME: "OpenLayers.Format.WMSCapabilities.v1_1_1" 
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMSCapabilities/v1_1_1_WMSC.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMSCapabilities/v1_1_1_WMSC.js
deleted file mode 100644
index e58e4f75..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMSCapabilities/v1_1_1_WMSC.js
+++ /dev/null
@@ -1,85 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/WMSCapabilities/v1_1_1.js
- */
-
-/**
- * Class: OpenLayers.Format.WMSCapabilities/v1_1_1_WMSC
- * Read WMS-C Capabilities version 1.1.1.
- * 
- * Inherits from:
- *  - <OpenLayers.Format.WMSCapabilities.v1_1_1>
- */
-OpenLayers.Format.WMSCapabilities.v1_1_1_WMSC = OpenLayers.Class(
-    OpenLayers.Format.WMSCapabilities.v1_1_1, {
-    
-    /**
-     * Property: version
-     * {String} The specific parser version.
-     */
-    version: "1.1.1",
-    
-    /**
-     * Property: profile
-     * {String} The specific profile
-     */
-    profile: "WMSC",
-    
-    /**
-     * Constructor: OpenLayers.Format.WMSCapabilities.v1_1_1
-     * Create a new parser for WMS-C capabilities version 1.1.1.
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be set on
-     *     this instance.
-     */
-
-    /**
-     * Property: readers
-     * Contains public functions, grouped by namespace prefix, that will
-     *     be applied when a namespaced node is found matching the function
-     *     name.  The function will be applied in the scope of this parser
-     *     with two arguments: the node being read and a context object passed
-     *     from the parent.
-     */
-    readers: {
-        "wms": OpenLayers.Util.applyDefaults({
-            "VendorSpecificCapabilities": function(node, obj) {
-                obj.vendorSpecific = {tileSets: []};
-                this.readChildNodes(node, obj.vendorSpecific);
-            },
-            "TileSet": function(node, vendorSpecific) {
-                var tileset = {srs: {}, bbox: {}, resolutions: []};
-                this.readChildNodes(node, tileset);
-                vendorSpecific.tileSets.push(tileset);
-            },
-            "Resolutions": function(node, tileset) {
-                var res = this.getChildValue(node).split(" ");
-                for (var i=0, len=res.length; i<len; i++) {
-                    if (res[i] != "") {
-                        tileset.resolutions.push(parseFloat(res[i]));
-                    }
-                }
-            },
-            "Width": function(node, tileset) {
-                tileset.width = parseInt(this.getChildValue(node));
-            },
-            "Height": function(node, tileset) {
-                tileset.height = parseInt(this.getChildValue(node));
-            },
-            "Layers": function(node, tileset) {
-                tileset.layers = this.getChildValue(node);
-            },
-            "Styles": function(node, tileset) {
-                tileset.styles = this.getChildValue(node);
-            }
-        }, OpenLayers.Format.WMSCapabilities.v1_1_1.prototype.readers["wms"])
-    },
-
-    CLASS_NAME: "OpenLayers.Format.WMSCapabilities.v1_1_1_WMSC" 
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMSCapabilities/v1_3.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMSCapabilities/v1_3.js
deleted file mode 100644
index 9958286b..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMSCapabilities/v1_3.js
+++ /dev/null
@@ -1,128 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/WMSCapabilities/v1.js
- */
-
-/**
- * Class: OpenLayers.Format.WMSCapabilities/v1_3
- * Abstract base class for WMS Capabilities version 1.3.X. 
- * SLD 1.1.0 adds in the extra operations DescribeLayer and GetLegendGraphic, 
- * see: http://schemas.opengis.net/sld/1.1.0/sld_capabilities.xsd
- * 
- * Inherits from:
- *  - <OpenLayers.Format.WMSCapabilities.v1>
- */
-OpenLayers.Format.WMSCapabilities.v1_3 = OpenLayers.Class(
-    OpenLayers.Format.WMSCapabilities.v1, {
-    
-    /**
-     * Property: readers
-     * Contains public functions, grouped by namespace prefix, that will
-     *     be applied when a namespaced node is found matching the function
-     *     name.  The function will be applied in the scope of this parser
-     *     with two arguments: the node being read and a context object passed
-     *     from the parent.
-     */
-    readers: {
-        "wms": OpenLayers.Util.applyDefaults({
-            "WMS_Capabilities": function(node, obj) {
-                this.readChildNodes(node, obj);
-            },
-            "LayerLimit": function(node, obj) {
-                obj.layerLimit = parseInt(this.getChildValue(node));
-            },
-            "MaxWidth": function(node, obj) {
-                obj.maxWidth = parseInt(this.getChildValue(node));
-            },
-            "MaxHeight": function(node, obj) {
-                obj.maxHeight = parseInt(this.getChildValue(node));
-            },
-            "BoundingBox": function(node, obj) {
-                var bbox = OpenLayers.Format.WMSCapabilities.v1.prototype.readers["wms"].BoundingBox.apply(this, [node, obj]);
-                bbox.srs  = node.getAttribute("CRS");
-                obj.bbox[bbox.srs] = bbox;
-            },
-            "CRS": function(node, obj) {
-                // CRS is the synonym of SRS
-                this.readers.wms.SRS.apply(this, [node, obj]); 
-            },
-            "EX_GeographicBoundingBox": function(node, obj) {
-                // replacement of LatLonBoundingBox
-                obj.llbbox = [];
-                this.readChildNodes(node, obj.llbbox);
-                
-            },
-            "westBoundLongitude": function(node, obj) {
-                obj[0] = this.getChildValue(node);
-            },
-            "eastBoundLongitude": function(node, obj) {
-                obj[2] = this.getChildValue(node);
-            },
-            "southBoundLatitude": function(node, obj) {
-                obj[1] = this.getChildValue(node);
-            },
-            "northBoundLatitude": function(node, obj) {
-                obj[3] = this.getChildValue(node);
-            },
-            "MinScaleDenominator": function(node, obj) {
-                obj.maxScale = parseFloat(this.getChildValue(node)).toPrecision(16);
-            },
-            "MaxScaleDenominator": function(node, obj) {
-                obj.minScale = parseFloat(this.getChildValue(node)).toPrecision(16);
-            },
-            "Dimension": function(node, obj) {
-                // dimension has extra attributes: default, multipleValues, 
-                // nearestValue, current which used to be part of Extent. It now
-                // also contains the values.
-                var name = node.getAttribute("name").toLowerCase();
-                var dim = {
-                    name: name,
-                    units: node.getAttribute("units"),
-                    unitsymbol: node.getAttribute("unitSymbol"),
-                    nearestVal: node.getAttribute("nearestValue") === "1",
-                    multipleVal: node.getAttribute("multipleValues") === "1",
-                    "default": node.getAttribute("default") || "",
-                    current: node.getAttribute("current") === "1",
-                    values: this.getChildValue(node).split(",")
-                    
-                };
-                // Theoretically there can be more dimensions with the same
-                // name, but with a different unit. Until we meet such a case,
-                // let's just keep the same structure as the WMS 1.1 
-                // GetCapabilities parser uses. We will store the last
-                // one encountered.
-                obj.dimensions[dim.name] = dim;
-            },
-            "Keyword": function(node, obj) {
-                // TODO: should we change the structure of keyword in v1.js?
-                // Make it an object with a value instead of a string?
-                var keyword = {value: this.getChildValue(node), 
-                    vocabulary: node.getAttribute("vocabulary")};
-                if (obj.keywords) {
-                    obj.keywords.push(keyword);
-                }
-            }
-        }, OpenLayers.Format.WMSCapabilities.v1.prototype.readers["wms"]),
-        "sld": {
-            "UserDefinedSymbolization": function(node, obj) {
-                this.readers.wms.UserDefinedSymbolization.apply(this, [node, obj]);
-                // add the two extra attributes
-                obj.userSymbols.inlineFeature = parseInt(node.getAttribute("InlineFeature")) == 1;
-                obj.userSymbols.remoteWCS = parseInt(node.getAttribute("RemoteWCS")) == 1;
-            },
-            "DescribeLayer": function(node, obj) {
-                this.readers.wms.DescribeLayer.apply(this, [node, obj]);
-            },
-            "GetLegendGraphic": function(node, obj) {
-                this.readers.wms.GetLegendGraphic.apply(this, [node, obj]);
-            }
-        }
-    },
-    
-    CLASS_NAME: "OpenLayers.Format.WMSCapabilities.v1_3" 
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMSCapabilities/v1_3_0.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMSCapabilities/v1_3_0.js
deleted file mode 100644
index 776a28ad..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMSCapabilities/v1_3_0.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/WMSCapabilities/v1_3.js
- */
-
-/**
- * Class: OpenLayers.Format.WMSCapabilities/v1_3_0
- * Read WMS Capabilities version 1.3.0. 
- * SLD 1.1.0 adds in the extra operations DescribeLayer and GetLegendGraphic, 
- * see: http://schemas.opengis.net/sld/1.1.0/sld_capabilities.xsd
- * 
- * Inherits from:
- *  - <OpenLayers.Format.WMSCapabilities.v1_3>
- */
-OpenLayers.Format.WMSCapabilities.v1_3_0 = OpenLayers.Class(
-    OpenLayers.Format.WMSCapabilities.v1_3, {
-    
-    /**
-     * Property: version
-     * {String} The specific parser version.
-     */
-    version: "1.3.0",
-    
-    CLASS_NAME: "OpenLayers.Format.WMSCapabilities.v1_3_0" 
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMSDescribeLayer.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMSDescribeLayer.js
deleted file mode 100644
index 296262c4..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMSDescribeLayer.js
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/XML/VersionedOGC.js
- */
-
-/**
- * Class: OpenLayers.Format.WMSDescribeLayer
- * Read SLD WMS DescribeLayer response
- * DescribeLayer is meant to couple WMS to WFS and WCS
- * 
- * Inherits from:
- *  - <OpenLayers.Format.XML.VersionedOGC>
- */
-OpenLayers.Format.WMSDescribeLayer = OpenLayers.Class(OpenLayers.Format.XML.VersionedOGC, {
-
-    /**
-     * APIProperty: defaultVersion
-     * {String} Version number to assume if none found.  Default is "1.1.1".
-     */
-    defaultVersion: "1.1.1",
-   
-    /**
-     * Constructor: OpenLayers.Format.WMSDescribeLayer
-     * Create a new parser for WMS DescribeLayer responses.
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be set on
-     *     this instance.
-     */
-
-    /**
-     * APIMethod: read
-     * Read DescribeLayer data from a string, and return the response. 
-     * The OGC currently defines 2 formats which are allowed for output,
-     * so we need to parse these 2 types
-     * 
-     * Parameters: 
-     * data - {String} or {DOMElement} data to read/parse.
-     *
-     * Returns:
-     * {Array} Array of {<LayerDescription>} objects which have:
-     * - {String} owsType: WFS/WCS
-     * - {String} owsURL: the online resource
-     * - {String} typeName: the name of the typename on the service
-     */
-    
-    CLASS_NAME: "OpenLayers.Format.WMSDescribeLayer" 
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMSDescribeLayer/v1_1.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMSDescribeLayer/v1_1.js
deleted file mode 100644
index 3929d4b2..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMSDescribeLayer/v1_1.js
+++ /dev/null
@@ -1,122 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/WMSDescribeLayer.js
- * @requires OpenLayers/Format/OGCExceptionReport.js
- */
-
-/**
- * Class: OpenLayers.Format.WMSDescribeLayer.v1_1_1
- * Read SLD WMS DescribeLayer response for WMS 1.1.X
- * WMS 1.1.X is tightly coupled to SLD 1.0.0
- *
- * Example DescribeLayer request: 
- * http://demo.opengeo.org/geoserver/wms?request=DescribeLayer&version=1.1.1&layers=topp:states
- *
- * Inherits from:
- *  - <OpenLayers.Format.WMSDescribeLayer>
- */
-OpenLayers.Format.WMSDescribeLayer.v1_1_1 = OpenLayers.Class(
-    OpenLayers.Format.WMSDescribeLayer, {
-    
-    /**
-     * Constructor: OpenLayers.Format.WMSDescribeLayer
-     * Create a new parser for WMS DescribeLayer responses.
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be set on
-     *     this instance.
-     */
-    initialize: function(options) {
-        OpenLayers.Format.WMSDescribeLayer.prototype.initialize.apply(this, 
-            [options]);
-    },
-
-    /**
-     * APIMethod: read
-     * Read DescribeLayer data from a string, and return the response. 
-     * The OGC defines 2 formats which are allowed for output,
-     * so we need to parse these 2 types for version 1.1.X
-     * 
-     * Parameters: 
-     * data - {String} or {DOMElement} data to read/parse.
-     *
-     * Returns:
-     * {Object} Object with a layerDescriptions property, which holds an Array
-     * of {<LayerDescription>} objects which have:
-     * - {String} owsType: WFS/WCS
-     * - {String} owsURL: the online resource
-     * - {String} typeName: the name of the typename on the owsType service
-     * - {String} layerName: the name of the WMS layer we did a lookup for
-     */
-    read: function(data) {
-        if(typeof data == "string") {
-            data = OpenLayers.Format.XML.prototype.read.apply(this, [data]);
-        }
-        var root = data.documentElement;
-        var children = root.childNodes; 
-        var describelayer = {layerDescriptions: []};
-        var childNode, nodeName;
-        for(var i=0; i<children.length; ++i) { 
-            childNode = children[i];
-            nodeName = childNode.nodeName; 
-            if (nodeName == 'LayerDescription') {
-                var layerName = childNode.getAttribute('name');
-                var owsType = '';
-                var owsURL = '';
-                var typeName = '';
-                // check for owsType and owsURL attributes
-                if (childNode.getAttribute('owsType')) {
-                  owsType = childNode.getAttribute('owsType');
-                  owsURL = childNode.getAttribute('owsURL');
-                } else {
-                    // look for wfs or wcs attribute
-                    if (childNode.getAttribute('wfs') != '') {
-                        owsType = 'WFS';
-                        owsURL = childNode.getAttribute('wfs');
-                    } else if (childNode.getAttribute('wcs') != '') {
-                        owsType = 'WCS';
-                        owsURL = childNode.getAttribute('wcs');
-                    }
-                }
-                // look for Query child
-                var query = childNode.getElementsByTagName('Query');
-                if(query.length > 0) {
-                    typeName = query[0].getAttribute('typeName');
-                    if (!typeName) {
-                        // because of Ionic bug
-                        typeName = query[0].getAttribute('typename');
-                    }
-                }
-                var layerDescription = {
-                    layerName: layerName, owsType: owsType, 
-                    owsURL: owsURL, typeName: typeName
-                };
-                describelayer.layerDescriptions.push(layerDescription);
-                
-                //TODO do this in deprecated.js instead:
-                // array style index for backwards compatibility
-                describelayer.length = describelayer.layerDescriptions.length;
-                describelayer[describelayer.length - 1] = layerDescription; 
-                
-            } else if (nodeName == 'ServiceException') {
-                // an exception must have occurred, so parse it
-                var parser = new OpenLayers.Format.OGCExceptionReport();
-                return {
-                    error: parser.read(data)
-                };
-            }
-        }
-        return describelayer;
-    },
-    
-    CLASS_NAME: "OpenLayers.Format.WMSDescribeLayer.v1_1_1"
-
-});
-
-// Version alias - workaround for http://trac.osgeo.org/mapserver/ticket/2257
-OpenLayers.Format.WMSDescribeLayer.v1_1_0 =
-    OpenLayers.Format.WMSDescribeLayer.v1_1_1;
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMSGetFeatureInfo.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMSGetFeatureInfo.js
deleted file mode 100644
index 57eb2198..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMSGetFeatureInfo.js
+++ /dev/null
@@ -1,296 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/XML.js
- */
-
-/**
- * Class: OpenLayers.Format.WMSGetFeatureInfo
- * Class to read GetFeatureInfo responses from Web Mapping Services
- *
- * Inherits from:
- *  - <OpenLayers.Format.XML>
- */
-OpenLayers.Format.WMSGetFeatureInfo = OpenLayers.Class(OpenLayers.Format.XML, {
-
-    /**
-     * APIProperty: layerIdentifier
-     * {String} All xml nodes containing this search criteria will populate an
-     *     internal array of layer nodes.
-     */ 
-    layerIdentifier: '_layer',
-
-    /**
-     * APIProperty: featureIdentifier
-     * {String} All xml nodes containing this search criteria will populate an 
-     *     internal array of feature nodes for each layer node found.
-     */
-    featureIdentifier: '_feature',
-
-    /**
-     * Property: regExes
-     * Compiled regular expressions for manipulating strings.
-     */
-    regExes: {
-        trimSpace: (/^\s*|\s*$/g),
-        removeSpace: (/\s*/g),
-        splitSpace: (/\s+/),
-        trimComma: (/\s*,\s*/g)
-    },
-
-    /**
-     * Property: gmlFormat
-     * {<OpenLayers.Format.GML>} internal GML format for parsing geometries
-     *     in msGMLOutput
-     */
-    gmlFormat: null,
-
-    /**
-     * Constructor: OpenLayers.Format.WMSGetFeatureInfo
-     * Create a new parser for WMS GetFeatureInfo responses
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be set on
-     *     this instance.
-     */
-
-    /**
-     * APIMethod: read
-     * Read WMS GetFeatureInfo data from a string, and return an array of features
-     *
-     * Parameters:
-     * data - {String} or {DOMElement} data to read/parse.
-     *
-     * Returns:
-     * {Array(<OpenLayers.Feature.Vector>)} An array of features.
-     */
-    read: function(data) {
-        var result;
-        if(typeof data == "string") {
-            data = OpenLayers.Format.XML.prototype.read.apply(this, [data]);
-        }
-        var root = data.documentElement;
-        if(root) {
-            var scope = this;
-            var read = this["read_" + root.nodeName];
-            if(read) {
-                result = read.call(this, root);
-            } else {
-                // fall-back to GML since this is a common output format for WMS
-                // GetFeatureInfo responses
-                result = new OpenLayers.Format.GML((this.options ? this.options : {})).read(data);
-            }
-        } else {
-            result = data;
-        }
-        return result;
-    },
-    
-    
-    /**
-     * Method: read_msGMLOutput
-     * Parse msGMLOutput nodes.
-     *
-     * Parameters:
-     * data - {DOMElement}
-     *
-     * Returns:
-     * {Array}
-     */
-    read_msGMLOutput: function(data) {
-        var response = [];
-        var layerNodes = this.getSiblingNodesByTagCriteria(data,
-            this.layerIdentifier);
-        if (layerNodes) {
-            for (var i=0, len=layerNodes.length; i<len; ++i) {
-                var node = layerNodes[i];
-                var layerName = node.nodeName;
-                if (node.prefix) {
-                    layerName = layerName.split(':')[1];
-                }
-                var layerName = layerName.replace(this.layerIdentifier, '');
-                var featureNodes = this.getSiblingNodesByTagCriteria(node, 
-                    this.featureIdentifier);
-                if (featureNodes) {
-                    for (var j = 0; j < featureNodes.length; j++) {
-                        var featureNode = featureNodes[j];
-                        var geomInfo = this.parseGeometry(featureNode);
-                        var attributes = this.parseAttributes(featureNode);
-                        var feature = new OpenLayers.Feature.Vector(geomInfo.geometry, 
-                            attributes, null);
-                        feature.bounds = geomInfo.bounds;
-                        feature.type = layerName;
-                        response.push(feature);
-                    }
-                }
-            }
-        }
-        return response;
-    },
-    
-    /**
-     * Method: read_FeatureInfoResponse
-     * Parse FeatureInfoResponse nodes.
-     *
-     * Parameters:
-     * data - {DOMElement}
-     *
-     * Returns:
-     * {Array}
-     */
-    read_FeatureInfoResponse: function(data) {
-        var response = [];
-        var featureNodes = this.getElementsByTagNameNS(data, '*',
-            'FIELDS');
-
-        for(var i=0, len=featureNodes.length;i<len;i++) {
-            var featureNode = featureNodes[i];
-            var geom = null;
-
-            // attributes can be actual attributes on the FIELDS tag, 
-            // or FIELD children
-            var attributes = {};
-            var j;
-            var jlen = featureNode.attributes.length;
-            if (jlen > 0) {
-                for(j=0; j<jlen; j++) {
-                    var attribute = featureNode.attributes[j];
-                    attributes[attribute.nodeName] = attribute.nodeValue;
-                }
-            } else {
-                var nodes = featureNode.childNodes;
-                for (j=0, jlen=nodes.length; j<jlen; ++j) {
-                    var node = nodes[j];
-                    if (node.nodeType != 3) {
-                        attributes[node.getAttribute("name")] = 
-                            node.getAttribute("value");
-                    }
-                }
-            }
-
-            response.push(
-                new OpenLayers.Feature.Vector(geom, attributes, null)
-            );
-        }
-        return response;
-    },
-
-    /**
-     * Method: getSiblingNodesByTagCriteria
-     * Recursively searches passed xml node and all it's descendant levels for 
-     *     nodes whose tagName contains the passed search string. This returns an 
-     *     array of all sibling nodes which match the criteria from the highest 
-     *     hierarchial level from which a match is found.
-     * 
-     * Parameters:
-     * node - {DOMElement} An xml node
-     * criteria - {String} Search string which will match some part of a tagName 
-     *                                       
-     * Returns:
-     * Array({DOMElement}) An array of sibling xml nodes
-     */                
-    getSiblingNodesByTagCriteria: function(node, criteria){
-        var nodes = [];
-        var children, tagName, n, matchNodes, child;
-        if (node && node.hasChildNodes()) {
-            children = node.childNodes;
-            n = children.length;
-
-            for(var k=0; k<n; k++){
-                child = children[k];
-                while (child && child.nodeType != 1) {
-                    child = child.nextSibling;
-                    k++;
-                }
-                tagName = (child ? child.nodeName : '');
-                if (tagName.length > 0 && tagName.indexOf(criteria) > -1) {
-                    nodes.push(child);
-                } else {
-                    matchNodes = this.getSiblingNodesByTagCriteria(
-                        child, criteria);
-
-                    if(matchNodes.length > 0){
-                        (nodes.length == 0) ? 
-                            nodes = matchNodes : nodes.push(matchNodes);
-                    }
-                }
-            }
-
-        }
-        return nodes;
-    },
-
-    /**
-     * Method: parseAttributes
-     *
-     * Parameters:
-     * node - {<DOMElement>}
-     *
-     * Returns:
-     * {Object} An attributes object.
-     * 
-     * Notes:
-     * Assumes that attributes are direct child xml nodes of the passed node
-     * and contain only a single text node. 
-     */    
-    parseAttributes: function(node){
-        var attributes = {};
-        if (node.nodeType == 1) {
-            var children = node.childNodes;
-            var n = children.length;
-            for (var i = 0; i < n; ++i) {
-                var child = children[i];
-                if (child.nodeType == 1) {
-                    var grandchildren = child.childNodes;
-                    var name = (child.prefix) ?
-                        child.nodeName.split(":")[1] : child.nodeName;
-                    if (grandchildren.length == 0) {
-                        attributes[name] = null;
-                    } else if (grandchildren.length == 1) {
-                        var grandchild = grandchildren[0];
-                        if (grandchild.nodeType == 3 ||
-                            grandchild.nodeType == 4) {
-                            var value = grandchild.nodeValue.replace(
-                                this.regExes.trimSpace, "");
-                            attributes[name] = value;
-                        }
-                    }
-                }
-            }
-        }
-        return attributes;
-    },
-
-    /**
-     * Method: parseGeometry
-     * Parse the geometry and the feature bounds out of the node using 
-     *     Format.GML
-     *
-     * Parameters:
-     * node - {<DOMElement>}
-     *
-     * Returns:
-     * {Object} An object containing the geometry and the feature bounds
-    */
-    parseGeometry: function(node) {
-        // we need to use the old Format.GML parser since we do not know the 
-        // geometry name
-        if (!this.gmlFormat) {
-            this.gmlFormat = new OpenLayers.Format.GML();
-        }
-        var feature = this.gmlFormat.parseFeature(node);
-        var geometry, bounds = null;
-        if (feature) {
-            geometry = feature.geometry && feature.geometry.clone();
-            bounds = feature.bounds && feature.bounds.clone();
-            feature.destroy();
-        }
-        return {geometry: geometry, bounds: bounds};
-    },
-
-    CLASS_NAME: "OpenLayers.Format.WMSGetFeatureInfo"
-    
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMTSCapabilities.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMTSCapabilities.js
deleted file mode 100644
index 9cff69c8..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMTSCapabilities.js
+++ /dev/null
@@ -1,230 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/XML/VersionedOGC.js
- */
-
-/**
- * Class: OpenLayers.Format.WMTSCapabilities
- * Read WMTS Capabilities.
- *
- * Inherits from:
- *  - <OpenLayers.Format.XML.VersionedOGC>
- */
-OpenLayers.Format.WMTSCapabilities = OpenLayers.Class(OpenLayers.Format.XML.VersionedOGC, {
-
-    /**
-     * APIProperty: defaultVersion
-     * {String} Version number to assume if none found.  Default is "1.0.0".
-     */
-    defaultVersion: "1.0.0",
-
-    /**
-     * APIProperty: yx
-     * {Object} Members in the yx object are used to determine if a CRS URN
-     *     corresponds to a CRS with y,x axis order.  Member names are CRS URNs
-     *     and values are boolean.  By default, the following CRS URN are
-     *     assumed to correspond to a CRS with y,x axis order:
-     *
-     * * urn:ogc:def:crs:EPSG::4326
-     */
-    yx: {
-        "urn:ogc:def:crs:EPSG::4326": true
-    },
-
-    /**
-     * Constructor: OpenLayers.Format.WMTSCapabilities
-     * Create a new parser for WMTS capabilities.
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be set on
-     *     this instance.
-     */
-
-    /**
-     * APIMethod: read
-     * Read capabilities data from a string, and return information about
-     * the service (offering and observedProperty mostly).
-     *
-     * Parameters:
-     * data - {String} or {DOMElement} data to read/parse.
-     *
-     * Returns:
-     * {Object} Info about the WMTS Capabilities
-     */
-
-    /**
-     * APIMethod: createLayer
-     * Create a WMTS layer given a capabilities object.
-     *
-     * Parameters:
-     * capabilities - {Object} The object returned from a <read> call to this
-     *     format.
-     * config - {Object} Configuration properties for the layer.  Defaults for
-     *     the layer will apply if not provided.
-     *
-     * Required config properties:
-     * layer - {String} The layer identifier.
-     *
-     * Optional config properties:
-     * matrixSet - {String} The matrix set identifier, required if there is 
-     *      more than one matrix set in the layer capabilities.
-     * style - {String} The name of the style
-     * format - {String} Image format for the layer. Default is the first
-     *     format returned in the GetCapabilities response.
-     * param - {Object} The dimensions values eg: {"Year": "2012"}
-     *
-     * Returns:
-     * {<OpenLayers.Layer.WMTS>} A properly configured WMTS layer.  Throws an
-     *     error if an incomplete config is provided.  Returns undefined if no
-     *     layer could be created with the provided config.
-     */
-    createLayer: function(capabilities, config) {
-        var layer;
-
-        // confirm required properties are supplied in config
-        if (!('layer' in config)) {
-            throw new Error("Missing property 'layer' in configuration.");
-        }
-
-        var contents = capabilities.contents;
-
-        // find the layer definition with the given identifier
-        var layers = contents.layers;
-        var layerDef;
-        for (var i=0, ii=contents.layers.length; i<ii; ++i) {
-            if (contents.layers[i].identifier === config.layer) {
-                layerDef = contents.layers[i];
-                break;
-            }
-        }
-        if (!layerDef) {
-            throw new Error("Layer not found");
-        }
-        
-        var format = config.format;
-        if (!format && layerDef.formats && layerDef.formats.length) {
-            format = layerDef.formats[0];
-        }
-
-        // find the matrixSet definition
-        var matrixSet;
-        if (config.matrixSet) {
-            matrixSet = contents.tileMatrixSets[config.matrixSet];
-        } else if (layerDef.tileMatrixSetLinks.length >= 1) {
-            matrixSet = contents.tileMatrixSets[
-                layerDef.tileMatrixSetLinks[0].tileMatrixSet];
-        }
-        if (!matrixSet) {
-            throw new Error("matrixSet not found");
-        }
-
-        // get the default style for the layer
-        var style;
-        for (var i=0, ii=layerDef.styles.length; i<ii; ++i) {
-            style = layerDef.styles[i];
-            if (style.isDefault) {
-                break;
-            }
-        }
-
-        var requestEncoding = config.requestEncoding;
-        if (!requestEncoding) {
-            requestEncoding = "KVP";
-            if (capabilities.operationsMetadata.GetTile.dcp.http) {
-                var http = capabilities.operationsMetadata.GetTile.dcp.http;
-                // Get first get method
-                if (http.get[0].constraints) {
-                    var constraints = http.get[0].constraints;
-                    var allowedValues = constraints.GetEncoding.allowedValues;
-
-                    // The OGC documentation is not clear if we should use
-                    // REST or RESTful, ArcGis use RESTful,
-                    // and OpenLayers use REST.
-                    if (!allowedValues.KVP &&
-                            (allowedValues.REST || allowedValues.RESTful)) {
-                        requestEncoding = "REST";
-                    }
-                }
-            }
-        }
-
-        var dimensions = [];
-        var params = config.params || {};
-        // to don't overwrite the changes in the applyDefaults
-        delete config.params;
-        for (var id = 0, ld = layerDef.dimensions.length ; id < ld ; id++) {
-            var dimension = layerDef.dimensions[id];
-            dimensions.push(dimension.identifier);
-            if (!params.hasOwnProperty(dimension.identifier)) {
-                params[dimension.identifier] = dimension['default'];
-            }
-        }
-
-        var projection = config.projection || matrixSet.supportedCRS.replace(
-                /urn:ogc:def:crs:(\w+):(.*:)?(\w+)$/, "$1:$3");
-        var units = config.units ||
-                (projection === "EPSG:4326" ? "degrees" : "m");
-
-        var resolutions = [];
-        for (var mid in matrixSet.matrixIds) {
-            if (matrixSet.matrixIds.hasOwnProperty(mid)) {
-                resolutions.push(
-                    matrixSet.matrixIds[mid].scaleDenominator * 0.28E-3 /
-                        OpenLayers.METERS_PER_INCH /
-                        OpenLayers.INCHES_PER_UNIT[units]);
-            }
-        }
-
-        var url;
-        if (requestEncoding === "REST" && layerDef.resourceUrls) {
-            url = [];
-            var resourceUrls = layerDef.resourceUrls,
-                resourceUrl;
-            for (var t = 0, tt = layerDef.resourceUrls.length; t < tt; ++t) {
-                resourceUrl = layerDef.resourceUrls[t];
-                if (resourceUrl.format === format && resourceUrl.resourceType === "tile") {
-                    url.push(resourceUrl.template);
-                }
-            }
-        }
-        else {
-            var httpGet = capabilities.operationsMetadata.GetTile.dcp.http.get;
-            url = [];
-            var constraint;
-            for (var i = 0, ii = httpGet.length; i < ii; i++) {
-                constraint = httpGet[i].constraints;
-                if (!constraint || (constraint && constraint.
-                        GetEncoding.allowedValues[requestEncoding])) {
-                    url.push(httpGet[i].url);
-                }
-            }
-        }
-        
-        return new OpenLayers.Layer.WMTS(
-            OpenLayers.Util.applyDefaults(config, {
-                url: url,
-                requestEncoding: requestEncoding,
-                name: layerDef.title,
-                style: style.identifier,
-                format: format,
-                matrixIds: matrixSet.matrixIds,
-                matrixSet: matrixSet.identifier,
-                projection: projection,
-                units: units,
-                resolutions: config.isBaseLayer === false ? undefined :
-                    resolutions,
-                serverResolutions: resolutions,
-                tileFullExtent: matrixSet.bounds,
-                dimensions: dimensions,
-                params: params
-            })
-        );
-    },
-
-    CLASS_NAME: "OpenLayers.Format.WMTSCapabilities"
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMTSCapabilities/v1_0_0.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMTSCapabilities/v1_0_0.js
deleted file mode 100644
index fda2584b..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WMTSCapabilities/v1_0_0.js
+++ /dev/null
@@ -1,251 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/WMTSCapabilities.js
- * @requires OpenLayers/Format/OWSCommon/v1_1_0.js
- */
-
-/**
- * Class: OpenLayers.Format.WMTSCapabilities.v1_0_0
- * Read WMTS Capabilities version 1.0.0.
- * 
- * Inherits from:
- *  - <OpenLayers.Format.WMTSCapabilities>
- */
-OpenLayers.Format.WMTSCapabilities.v1_0_0 = OpenLayers.Class(
-    OpenLayers.Format.OWSCommon.v1_1_0, {
-        
-    /**
-     * Property: version
-     * {String} The parser version ("1.0.0").
-     */
-    version: "1.0.0",
-
-    /**
-     * Property: namespaces
-     * {Object} Mapping of namespace aliases to namespace URIs.
-     */
-    namespaces: {
-        ows: "http://www.opengis.net/ows/1.1",
-        wmts: "http://www.opengis.net/wmts/1.0",
-        xlink: "http://www.w3.org/1999/xlink"
-    },    
-    
-    /**
-     * Property: yx
-     * {Object} Members in the yx object are used to determine if a CRS URN
-     *     corresponds to a CRS with y,x axis order.  Member names are CRS URNs
-     *     and values are boolean.  Defaults come from the 
-     *     <OpenLayers.Format.WMTSCapabilities> prototype.
-     */
-    yx: null,
-
-    /**
-     * Property: defaultPrefix
-     * {String} The default namespace alias for creating element nodes.
-     */
-    defaultPrefix: "wmts",
-
-    /**
-     * Constructor: OpenLayers.Format.WMTSCapabilities.v1_0_0
-     * Create a new parser for WMTS capabilities version 1.0.0. 
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be set on
-     *     this instance.
-     */
-    initialize: function(options) {
-        OpenLayers.Format.XML.prototype.initialize.apply(this, [options]);
-        this.options = options;
-        var yx = OpenLayers.Util.extend(
-            {}, OpenLayers.Format.WMTSCapabilities.prototype.yx
-        );
-        this.yx = OpenLayers.Util.extend(yx, this.yx);
-    },
-
-    /**
-     * APIMethod: read
-     * Read capabilities data from a string, and return info about the WMTS.
-     * 
-     * Parameters: 
-     * data - {String} or {DOMElement} data to read/parse.
-     *
-     * Returns:
-     * {Object} Information about the SOS service.
-     */
-    read: function(data) {
-        if(typeof data == "string") {
-            data = OpenLayers.Format.XML.prototype.read.apply(this, [data]);
-        }
-        if(data && data.nodeType == 9) {
-            data = data.documentElement;
-        }
-        var capabilities = {};
-        this.readNode(data, capabilities);
-        capabilities.version = this.version;
-        return capabilities;
-    },
-
-    /**
-     * Property: readers
-     * Contains public functions, grouped by namespace prefix, that will
-     *     be applied when a namespaced node is found matching the function
-     *     name.  The function will be applied in the scope of this parser
-     *     with two arguments: the node being read and a context object passed
-     *     from the parent.
-     */
-    readers: {        
-        "wmts": {
-            "Capabilities": function(node, obj) {
-                this.readChildNodes(node, obj);
-            },
-            "Contents": function(node, obj) {
-                obj.contents = {};                
-                obj.contents.layers = [];
-                obj.contents.tileMatrixSets = {};                
-                this.readChildNodes(node, obj.contents);
-            },
-            "Layer": function(node, obj) {
-                var layer = {
-                    styles: [],
-                    formats: [],
-                    dimensions: [],
-                    tileMatrixSetLinks: []
-                };
-                layer.layers = [];
-                this.readChildNodes(node, layer);
-                obj.layers.push(layer);
-            },
-            "Style": function(node, obj) {
-                var style = {};
-                style.isDefault = (node.getAttribute("isDefault") === "true");
-                this.readChildNodes(node, style);
-                obj.styles.push(style);
-            },
-            "Format": function(node, obj) {
-                obj.formats.push(this.getChildValue(node)); 
-            },
-            "TileMatrixSetLink": function(node, obj) {
-                var tileMatrixSetLink = {};
-                this.readChildNodes(node, tileMatrixSetLink);
-                obj.tileMatrixSetLinks.push(tileMatrixSetLink);
-            },
-            "TileMatrixSet": function(node, obj) {
-                // node could be child of wmts:Contents or wmts:TileMatrixSetLink
-                // duck type wmts:Contents by looking for layers
-                if (obj.layers) {
-                    // TileMatrixSet as object type in schema
-                    var tileMatrixSet = {
-                        matrixIds: []
-                    };
-                    this.readChildNodes(node, tileMatrixSet);
-                    obj.tileMatrixSets[tileMatrixSet.identifier] = tileMatrixSet;
-                } else {
-                    // TileMatrixSet as string type in schema
-                    obj.tileMatrixSet = this.getChildValue(node);
-                }
-            },
-            "TileMatrix": function(node, obj) {
-                var tileMatrix = {
-                    supportedCRS: obj.supportedCRS
-                };
-                this.readChildNodes(node, tileMatrix);
-                obj.matrixIds.push(tileMatrix);
-            },
-            "ScaleDenominator": function(node, obj) {
-                obj.scaleDenominator = parseFloat(this.getChildValue(node)); 
-            },
-            "TopLeftCorner": function(node, obj) {                
-                var topLeftCorner = this.getChildValue(node);
-                var coords = topLeftCorner.split(" ");
-                // decide on axis order for the given CRS
-                var yx;
-                if (obj.supportedCRS) {
-                    // extract out version from URN
-                    var crs = obj.supportedCRS.replace(
-                        /urn:ogc:def:crs:(\w+):.+:(\w+)$/, 
-                        "urn:ogc:def:crs:$1::$2"
-                    );
-                    yx = !!this.yx[crs];
-                }
-                if (yx) {
-                    obj.topLeftCorner = new OpenLayers.LonLat(
-                        coords[1], coords[0]
-                    );
-                } else {
-                    obj.topLeftCorner = new OpenLayers.LonLat(
-                        coords[0], coords[1]
-                    );
-                }
-            },
-            "TileWidth": function(node, obj) {
-                obj.tileWidth = parseInt(this.getChildValue(node)); 
-            },
-            "TileHeight": function(node, obj) {
-                obj.tileHeight = parseInt(this.getChildValue(node)); 
-            },
-            "MatrixWidth": function(node, obj) {
-                obj.matrixWidth = parseInt(this.getChildValue(node)); 
-            },
-            "MatrixHeight": function(node, obj) {
-                obj.matrixHeight = parseInt(this.getChildValue(node)); 
-            },
-            "ResourceURL": function(node, obj) {
-                obj.resourceUrl = obj.resourceUrl || {};
-                var resourceType = node.getAttribute("resourceType");
-                if (!obj.resourceUrls) {
-                    obj.resourceUrls = [];
-                }
-                var resourceUrl = obj.resourceUrl[resourceType] = {
-                    format: node.getAttribute("format"),
-                    template: node.getAttribute("template"),
-                    resourceType: resourceType
-                };
-                obj.resourceUrls.push(resourceUrl);
-            },
-            // not used for now, can be added in the future though
-            /*"Themes": function(node, obj) {
-                obj.themes = [];
-                this.readChildNodes(node, obj.themes);
-            },
-            "Theme": function(node, obj) {
-                var theme = {};                
-                this.readChildNodes(node, theme);
-                obj.push(theme);
-            },*/
-            "WSDL": function(node, obj) {
-                obj.wsdl = {};
-                obj.wsdl.href = node.getAttribute("xlink:href");
-                // TODO: other attributes of <WSDL> element                
-            },
-            "ServiceMetadataURL": function(node, obj) {
-                obj.serviceMetadataUrl = {};
-                obj.serviceMetadataUrl.href = node.getAttribute("xlink:href");
-                // TODO: other attributes of <ServiceMetadataURL> element                
-            },
-            "LegendURL": function(node, obj) {
-                obj.legend = {};
-                obj.legend.href = node.getAttribute("xlink:href");
-                obj.legend.format = node.getAttribute("format");
-            },
-            "Dimension": function(node, obj) {
-                var dimension = {values: []};
-                this.readChildNodes(node, dimension);
-                obj.dimensions.push(dimension);
-            },
-            "Default": function(node, obj) {
-                obj["default"] = this.getChildValue(node);
-            },
-            "Value": function(node, obj) {
-                obj.values.push(this.getChildValue(node));
-            }
-        },
-        "ows": OpenLayers.Format.OWSCommon.v1_1_0.prototype.readers["ows"]
-    },    
-    
-    CLASS_NAME: "OpenLayers.Format.WMTSCapabilities.v1_0_0" 
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WPSCapabilities.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WPSCapabilities.js
deleted file mode 100644
index f0d74dbd..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WPSCapabilities.js
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/XML/VersionedOGC.js
- */
- 
-/**
- * Class: OpenLayers.Format.WPSCapabilities
- * Read WPS Capabilities.
- * 
- * Inherits from:
- *  - <OpenLayers.Format.XML.VersionedOGC>
- */
-OpenLayers.Format.WPSCapabilities = OpenLayers.Class(OpenLayers.Format.XML.VersionedOGC, {
-    
-    /**
-     * APIProperty: defaultVersion
-     * {String} Version number to assume if none found.  Default is "1.0.0".
-     */
-    defaultVersion: "1.0.0",
-    
-    /**
-     * Constructor: OpenLayers.Format.WPSCapabilities
-     * Create a new parser for WPS Capabilities.
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be set on
-     *     this instance.
-     */
-
-    /**
-     * APIMethod: read
-     * Read capabilities data from a string, and return information about
-     * the service.
-     * 
-     * Parameters: 
-     * data - {String} or {DOMElement} data to read/parse.
-     *
-     * Returns:
-     * {Object} Info about the WPS
-     */
-    
-    CLASS_NAME: "OpenLayers.Format.WPSCapabilities" 
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WPSCapabilities/v1_0_0.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WPSCapabilities/v1_0_0.js
deleted file mode 100644
index e6762a9b..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WPSCapabilities/v1_0_0.js
+++ /dev/null
@@ -1,119 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/WPSCapabilities.js
- * @requires OpenLayers/Format/OWSCommon/v1_1_0.js
- */
-
-/**
- * Class: OpenLayers.Format.WPSCapabilities.v1_0_0
- * Read WPS Capabilities version 1.0.0.
- * 
- * Inherits from:
- *  - <OpenLayers.Format.XML>
- */
-OpenLayers.Format.WPSCapabilities.v1_0_0 = OpenLayers.Class(
-    OpenLayers.Format.XML, {
-
-    /**
-     * Property: namespaces
-     * {Object} Mapping of namespace aliases to namespace URIs.
-     */
-    namespaces: {
-        ows: "http://www.opengis.net/ows/1.1",
-        wps: "http://www.opengis.net/wps/1.0.0",
-        xlink: "http://www.w3.org/1999/xlink"
-    },
-
-    /**
-     * Property: regExes
-     * Compiled regular expressions for manipulating strings.
-     */
-    regExes: {
-        trimSpace: (/^\s*|\s*$/g),
-        removeSpace: (/\s*/g),
-        splitSpace: (/\s+/),
-        trimComma: (/\s*,\s*/g)
-    },
-    
-    /**
-     * Constructor: OpenLayers.Format.WPSCapabilities.v1_0_0
-     * Create a new parser for WPS capabilities version 1.0.0. 
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be set on
-     *     this instance.
-     */
-    initialize: function(options) {
-        OpenLayers.Format.XML.prototype.initialize.apply(this, [options]);
-    },
-
-    /**
-     * APIMethod: read
-     * Read capabilities data from a string, and return info about the WPS.
-     * 
-     * Parameters: 
-     * data - {String} or {DOMElement} data to read/parse.
-     *
-     * Returns:
-     * {Object} Information about the WPS service.
-     */
-    read: function(data) {
-        if(typeof data == "string") {
-            data = OpenLayers.Format.XML.prototype.read.apply(this, [data]);
-        }
-        if(data && data.nodeType == 9) {
-            data = data.documentElement;
-        }
-        var capabilities = {};
-        this.readNode(data, capabilities);
-        return capabilities;
-    },
-
-    /**
-     * Property: readers
-     * Contains public functions, grouped by namespace prefix, that will
-     *     be applied when a namespaced node is found matching the function
-     *     name.  The function will be applied in the scope of this parser
-     *     with two arguments: the node being read and a context object passed
-     *     from the parent.
-     */
-    readers: {
-        "wps": {
-            "Capabilities": function(node, obj) {
-                this.readChildNodes(node, obj);
-            },
-            "ProcessOfferings": function(node, obj) {
-                obj.processOfferings = {};
-                this.readChildNodes(node, obj.processOfferings);
-            },
-            "Process": function(node, processOfferings) {
-                var processVersion = this.getAttributeNS(node, this.namespaces.wps, "processVersion");
-                var process = {processVersion: processVersion};
-                this.readChildNodes(node, process);
-                processOfferings[process.identifier] = process;
-            },
-            "Languages": function(node, obj) {
-                obj.languages = [];
-                this.readChildNodes(node, obj.languages);
-            },
-            "Default": function(node, languages) {
-                var language = {isDefault: true};
-                this.readChildNodes(node, language);
-                languages.push(language);
-            },
-            "Supported": function(node, languages) {
-                var language = {};
-                this.readChildNodes(node, language);     
-                languages.push(language);
-            }
-        },
-        "ows": OpenLayers.Format.OWSCommon.v1_1_0.prototype.readers["ows"]
-    },    
-    
-    CLASS_NAME: "OpenLayers.Format.WPSCapabilities.v1_0_0" 
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WPSDescribeProcess.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WPSDescribeProcess.js
deleted file mode 100644
index e8f96bb2..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WPSDescribeProcess.js
+++ /dev/null
@@ -1,185 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
- 
-/**
- * @requires OpenLayers/Format/XML.js
- * @requires OpenLayers/Format/OWSCommon/v1_1_0.js
- */
-
-/**
- * Class: OpenLayers.Format.WPSDescribeProcess
- * Read WPS DescribeProcess responses. 
- *
- * Inherits from:
- *  - <OpenLayers.Format.XML>
- */
-OpenLayers.Format.WPSDescribeProcess = OpenLayers.Class(
-    OpenLayers.Format.XML, {
-    
-    /**
-     * Constant: VERSION
-     * {String} 1.0.0
-     */
-    VERSION: "1.0.0",
-
-    /**
-     * Property: namespaces
-     * {Object} Mapping of namespace aliases to namespace URIs.
-     */
-    namespaces: {
-        wps: "http://www.opengis.net/wps/1.0.0",
-        ows: "http://www.opengis.net/ows/1.1",
-        xsi: "http://www.w3.org/2001/XMLSchema-instance"
-    },
-
-    /**
-     * Property: schemaLocation
-     * {String} Schema location
-     */
-    schemaLocation: "http://www.opengis.net/wps/1.0.0 http://schemas.opengis.net/wps/1.0.0/wpsAll.xsd",
-
-    /**
-     * Property: defaultPrefix
-     */
-    defaultPrefix: "wps",
-
-    /**
-     * Property: regExes
-     * Compiled regular expressions for manipulating strings.
-     */
-    regExes: {
-        trimSpace: (/^\s*|\s*$/g),
-        removeSpace: (/\s*/g),
-        splitSpace: (/\s+/),
-        trimComma: (/\s*,\s*/g)
-    },
-    
-    /**
-     * Constructor: OpenLayers.Format.WPSDescribeProcess
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be set on
-     *     this instance.
-     */
-
-    /**
-     * APIMethod: read
-     * Parse a WPS DescribeProcess and return an object with its information.
-     * 
-     * Parameters: 
-     * data - {String} or {DOMElement} data to read/parse.
-     *
-     * Returns:
-     * {Object}
-     */
-    read: function(data) {
-        if(typeof data == "string") {
-            data = OpenLayers.Format.XML.prototype.read.apply(this, [data]);
-        }
-        if(data && data.nodeType == 9) {
-            data = data.documentElement;
-        }
-        var info = {};
-        this.readNode(data, info);
-        return info;
-    },
-
-    /**
-     * Property: readers
-     * Contains public functions, grouped by namespace prefix, that will
-     *     be applied when a namespaced node is found matching the function
-     *     name.  The function will be applied in the scope of this parser
-     *     with two arguments: the node being read and a context object passed
-     *     from the parent.
-     */
-    readers: {
-        "wps": {
-            "ProcessDescriptions": function(node, obj) {
-                obj.processDescriptions = {};
-                this.readChildNodes(node, obj.processDescriptions);
-            },
-            "ProcessDescription": function(node, processDescriptions) {
-                var processVersion = this.getAttributeNS(node, this.namespaces.wps, "processVersion");
-                var processDescription = {
-                    processVersion: processVersion,
-                    statusSupported: (node.getAttribute("statusSupported") === "true"),
-                    storeSupported: (node.getAttribute("storeSupported") === "true")
-                };
-                this.readChildNodes(node, processDescription);
-                processDescriptions[processDescription.identifier] = processDescription;
-            },
-            "DataInputs": function(node, processDescription) {
-                processDescription.dataInputs = [];
-                this.readChildNodes(node, processDescription.dataInputs);
-            },
-            "ProcessOutputs": function(node, processDescription) {
-                processDescription.processOutputs = [];
-                this.readChildNodes(node, processDescription.processOutputs);
-            },
-            "Output": function(node, processOutputs) {
-                var output = {};
-                this.readChildNodes(node, output);
-                processOutputs.push(output);
-            },
-            "ComplexOutput": function(node, output) {
-                output.complexOutput = {};
-                this.readChildNodes(node, output.complexOutput);
-            },
-            "LiteralOutput": function(node, output) {
-                output.literalOutput = {};
-                this.readChildNodes(node, output.literalOutput);
-            },
-            "Input": function(node, dataInputs) {
-                var input = {
-                    maxOccurs: parseInt(node.getAttribute("maxOccurs")),
-                    minOccurs: parseInt(node.getAttribute("minOccurs"))
-                };
-                this.readChildNodes(node, input);
-                dataInputs.push(input);
-            },
-            "BoundingBoxData": function(node, input) {
-                input.boundingBoxData = {};
-                this.readChildNodes(node, input.boundingBoxData);
-            },
-            "CRS": function(node, obj) {
-                if (!obj.CRSs) {
-                    obj.CRSs = {};
-                }
-                obj.CRSs[this.getChildValue(node)] = true;
-            },
-            "LiteralData": function(node, input) {
-                input.literalData = {};
-                this.readChildNodes(node, input.literalData);
-            },
-            "ComplexData": function(node, input) {
-                input.complexData = {};
-                this.readChildNodes(node,  input.complexData);
-            },
-            "Default": function(node, complexData) {
-                complexData["default"] = {};
-                this.readChildNodes(node,  complexData["default"]);
-            },
-            "Supported": function(node, complexData) {
-                complexData["supported"] = {};
-                this.readChildNodes(node,  complexData["supported"]);
-            },
-            "Format": function(node, obj) {
-                var format = {};
-                this.readChildNodes(node, format);
-                if (!obj.formats) {
-                    obj.formats = {};
-                }
-                obj.formats[format.mimeType] = true;
-            },
-            "MimeType": function(node, format) {
-                format.mimeType = this.getChildValue(node);
-            }
-        },
-        "ows": OpenLayers.Format.OWSCommon.v1_1_0.prototype.readers["ows"]
-    },
-    
-    CLASS_NAME: "OpenLayers.Format.WPSDescribeProcess" 
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WPSExecute.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WPSExecute.js
deleted file mode 100644
index 0795b0d1..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/WPSExecute.js
+++ /dev/null
@@ -1,395 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/XML.js
- * @requires OpenLayers/Format/OWSCommon/v1_1_0.js
- * @requires OpenLayers/Format/WCSGetCoverage.js
- * @requires OpenLayers/Format/WFST/v1_1_0.js
- */
-
-/**
- * Class: OpenLayers.Format.WPSExecute version 1.0.0
- *
- * Inherits from:
- *  - <OpenLayers.Format.XML>
- */
-OpenLayers.Format.WPSExecute = OpenLayers.Class(OpenLayers.Format.XML,
-                                            OpenLayers.Format.Filter.v1_1_0, {
-    
-    /**
-     * Property: namespaces
-     * {Object} Mapping of namespace aliases to namespace URIs.
-     */
-    namespaces: {
-        ows: "http://www.opengis.net/ows/1.1",
-        gml: "http://www.opengis.net/gml",
-        wps: "http://www.opengis.net/wps/1.0.0",
-        wfs: "http://www.opengis.net/wfs",
-        ogc: "http://www.opengis.net/ogc",
-        wcs: "http://www.opengis.net/wcs",
-        xlink: "http://www.w3.org/1999/xlink",
-        xsi: "http://www.w3.org/2001/XMLSchema-instance"
-    },
-
-    /**
-     * Property: regExes
-     * Compiled regular expressions for manipulating strings.
-     */
-    regExes: {
-        trimSpace: (/^\s*|\s*$/g),
-        removeSpace: (/\s*/g),
-        splitSpace: (/\s+/),
-        trimComma: (/\s*,\s*/g)
-    },
-
-    /**
-     * Constant: VERSION
-     * {String} 1.0.0
-     */
-    VERSION: "1.0.0",
-
-    /**
-     * Property: schemaLocation
-     * {String} Schema location
-     */
-    schemaLocation: "http://www.opengis.net/wps/1.0.0 http://schemas.opengis.net/wps/1.0.0/wpsAll.xsd",
-
-    schemaLocationAttr: function(options) {
-        return undefined;
-    },
-
-    /**
-     * Constructor: OpenLayers.Format.WPSExecute
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be set on
-     *     this instance.
-     */
-
-    /**
-     * Method: write
-     *
-     * Parameters:
-     * options - {Object} Optional object.
-     *
-     * Returns:
-     * {String} An WPS Execute request XML string.
-     */
-    write: function(options) {
-        var doc;
-        if (window.ActiveXObject) {
-            doc = new ActiveXObject("Microsoft.XMLDOM");
-            this.xmldom = doc;
-        } else {
-            doc = document.implementation.createDocument("", "", null);
-        }
-        var node = this.writeNode("wps:Execute", options, doc);
-        this.setAttributeNS(
-            node, this.namespaces.xsi,
-            "xsi:schemaLocation", this.schemaLocation
-        );
-        return OpenLayers.Format.XML.prototype.write.apply(this, [node]);
-    }, 
-
-    /**
-     * APIMethod: read
-     * Parse a WPS Execute and return an object with its information.
-     * 
-     * Parameters: 
-     * data - {String} or {DOMElement} data to read/parse.
-     *
-     * Returns:
-     * {Object}
-     */
-    read: function(data) {
-        if(typeof data == "string") {
-            data = OpenLayers.Format.XML.prototype.read.apply(this, [data]);
-        }
-        if(data && data.nodeType == 9) {
-            data = data.documentElement;
-        }
-        var info = {};
-        this.readNode(data, info);
-        return info;
-    },
-
-    /**
-     * Property: writers
-     * As a compliment to the readers property, this structure contains public
-     *     writing functions grouped by namespace alias and named like the
-     *     node names they produce.
-     */
-    writers: {
-        "wps": {
-            "Execute": function(options) {
-                var node = this.createElementNSPlus("wps:Execute", {
-                    attributes: {
-                        version: this.VERSION,
-                        service: 'WPS'
-                    } 
-                }); 
-                this.writeNode("ows:Identifier", options.identifier, node);
-                this.writeNode("wps:DataInputs", options.dataInputs, node);
-                this.writeNode("wps:ResponseForm", options.responseForm, node);
-                return node; 
-            },
-            "ResponseForm": function(responseForm) {
-                var node = this.createElementNSPlus("wps:ResponseForm", {});
-                if (responseForm.rawDataOutput) {
-                    this.writeNode("wps:RawDataOutput", responseForm.rawDataOutput, node);
-                }
-                if (responseForm.responseDocument) {
-                    this.writeNode("wps:ResponseDocument", responseForm.responseDocument, node);
-                }
-                return node;
-            },
-            "ResponseDocument": function(responseDocument) {
-                var node = this.createElementNSPlus("wps:ResponseDocument", {
-                    attributes: {
-                        storeExecuteResponse: responseDocument.storeExecuteResponse,
-                        lineage: responseDocument.lineage,
-                        status: responseDocument.status
-                    }
-                });
-                if (responseDocument.outputs) {
-                    for (var i = 0, len = responseDocument.outputs.length; i < len; i++) {
-                        this.writeNode("wps:Output", responseDocument.outputs[i], node);
-                    }
-                }
-                return node;
-            },
-            "Output": function(output) {
-                var node = this.createElementNSPlus("wps:Output", {
-                    attributes: {
-                        asReference: output.asReference,
-                        mimeType: output.mimeType,
-                        encoding: output.encoding,
-                        schema: output.schema
-                    }
-                });
-                this.writeNode("ows:Identifier", output.identifier, node);
-                this.writeNode("ows:Title", output.title, node);
-                this.writeNode("ows:Abstract", output["abstract"], node);
-                return node;
-            },
-            "RawDataOutput": function(rawDataOutput) {
-                var node = this.createElementNSPlus("wps:RawDataOutput", {
-                    attributes: {
-                        mimeType: rawDataOutput.mimeType,
-                        encoding: rawDataOutput.encoding,
-                        schema: rawDataOutput.schema
-                    }
-                });
-                this.writeNode("ows:Identifier", rawDataOutput.identifier, node);
-                return node;
-            },
-            "DataInputs": function(dataInputs) {
-                var node = this.createElementNSPlus("wps:DataInputs", {});
-                for (var i=0, ii=dataInputs.length; i<ii; ++i) {
-                    this.writeNode("wps:Input", dataInputs[i], node);
-                }
-                return node;
-            },
-            "Input": function(input) {
-                var node = this.createElementNSPlus("wps:Input", {});
-                this.writeNode("ows:Identifier", input.identifier, node);
-                if (input.title) {
-                    this.writeNode("ows:Title", input.title, node);
-                }
-                if (input.data) {
-                    this.writeNode("wps:Data", input.data, node);
-                }
-                if (input.reference) {
-                    this.writeNode("wps:Reference", input.reference, node);
-                }
-                if (input.boundingBoxData) {
-                    this.writeNode("wps:BoundingBoxData", input.boundingBoxData, node);
-                }
-                return node;
-            },
-            "Data": function(data) {
-                var node = this.createElementNSPlus("wps:Data", {});
-                if (data.literalData) {
-                    this.writeNode("wps:LiteralData", data.literalData, node);
-                } else if (data.complexData) {
-                    this.writeNode("wps:ComplexData", data.complexData, node);
-                } else if (data.boundingBoxData) {
-                    this.writeNode("ows:BoundingBox", data.boundingBoxData, node);
-                }
-                return node;
-            },
-            "LiteralData": function(literalData) {
-                var node = this.createElementNSPlus("wps:LiteralData", {
-                    attributes: {
-                        uom: literalData.uom
-                    },
-                    value: literalData.value
-                });
-                return node;
-            },
-            "ComplexData": function(complexData) {
-                var node = this.createElementNSPlus("wps:ComplexData", {
-                    attributes: {
-                        mimeType: complexData.mimeType,
-                        encoding: complexData.encoding,
-                        schema: complexData.schema
-                    } 
-                });
-                var data = complexData.value;
-                if (typeof data === "string") {
-                    node.appendChild(
-                        this.getXMLDoc().createCDATASection(complexData.value)
-                    );
-                } else {
-                    node.appendChild(data);
-                }
-                return node;
-            },
-            "Reference": function(reference) {
-                var node = this.createElementNSPlus("wps:Reference", {
-                    attributes: {
-                        mimeType: reference.mimeType,
-                        "xlink:href": reference.href,
-                        method: reference.method,
-                        encoding: reference.encoding,
-                        schema: reference.schema
-                    }
-                });
-                if (reference.body) {
-                    this.writeNode("wps:Body", reference.body, node);
-                }
-                return node;
-            },
-            "BoundingBoxData": function(node, obj) {
-                this.writers['ows']['BoundingBox'].apply(this, [node, obj, "wps:BoundingBoxData"]);
-            },
-            "Body": function(body) {
-                var node = this.createElementNSPlus("wps:Body", {});
-                if (body.wcs) {
-                    this.writeNode("wcs:GetCoverage", body.wcs, node);
-                }
-                else if (body.wfs) {
-                    // OpenLayers.Format.WFST expects these to be on the 
-                    // instance and not in the options
-                    this.featureType = body.wfs.featureType;
-                    this.version = body.wfs.version;
-                    this.writeNode("wfs:GetFeature", body.wfs, node);
-                } else {
-                    this.writeNode("wps:Execute", body, node);
-                }
-                return node;                
-            }
-        },
-        "wcs": OpenLayers.Format.WCSGetCoverage.prototype.writers.wcs,
-        "wfs": OpenLayers.Format.WFST.v1_1_0.prototype.writers.wfs,
-        "ogc": OpenLayers.Format.Filter.v1_1_0.prototype.writers.ogc,
-        "ows": OpenLayers.Format.OWSCommon.v1_1_0.prototype.writers.ows
-    },
-
-    /**
-     * Property: readers
-     * Contains public functions, grouped by namespace prefix, that will
-     *     be applied when a namespaced node is found matching the function
-     *     name.  The function will be applied in the scope of this parser
-     *     with two arguments: the node being read and a context object passed
-     *     from the parent.
-     */
-    readers: {
-        "wps": {
-            "ExecuteResponse": function(node, obj) {
-                obj.executeResponse = {
-                    lang: node.getAttribute("lang"),
-                    statusLocation: node.getAttribute("statusLocation"),
-                    serviceInstance: node.getAttribute("serviceInstance"),
-                    service: node.getAttribute("service")
-                };
-                this.readChildNodes(node, obj.executeResponse);
-            },
-            "Process":function(node,obj) {
-                obj.process = {};
-                this.readChildNodes(node, obj.process);
-            },
-            "Status":function(node,obj) {
-                obj.status = {
-                    creationTime: node.getAttribute("creationTime")
-                };
-                this.readChildNodes(node, obj.status);
-            },
-            "ProcessSucceeded": function(node,obj) {
-                obj.processSucceeded = true;
-            },
-            "ProcessOutputs": function(node, processDescription) {
-                processDescription.processOutputs = [];
-                this.readChildNodes(node, processDescription.processOutputs);
-            },
-            "Output": function(node, processOutputs) {
-                var output = {};
-                this.readChildNodes(node, output);
-                processOutputs.push(output);
-            },
-            "Reference": function(node, output) {
-                output.reference = {
-                    href: node.getAttribute("href"),
-                    mimeType: node.getAttribute("mimeType"),
-                    encoding: node.getAttribute("encoding"),
-                    schema: node.getAttribute("schema")
-                };
-            },
-            "Data": function(node, output) {
-                output.data = {};
-                this.readChildNodes(node, output);
-            },
-            "LiteralData": function(node, output) {
-                output.literalData = {
-                    dataType: node.getAttribute("dataType"),
-                    uom: node.getAttribute("uom"),
-                    value: this.getChildValue(node)
-                };
-            },
-            "ComplexData": function(node, output) {
-                output.complexData = {
-                    mimeType: node.getAttribute("mimeType"),
-                    schema: node.getAttribute("schema"),
-                    encoding: node.getAttribute("encoding"),
-                    value: ""
-                };
-                
-                // try to get *some* value, ignore the empty text values
-                if (this.isSimpleContent(node)) {
-                    var child;
-                    for(child=node.firstChild; child; child=child.nextSibling) {
-                        switch(child.nodeType) {
-                            case 3: // text node
-                            case 4: // cdata section
-                                output.complexData.value += child.nodeValue;
-                        }
-                    }
-                }
-                else {
-                    for(child=node.firstChild; child; child=child.nextSibling) {
-                        if (child.nodeType == 1) {
-                            output.complexData.value = child;
-                        }
-                    }
-                }
-
-            },
-            "BoundingBox": function(node, output) {
-                output.boundingBoxData = {
-                    dimensions: node.getAttribute("dimensions"),
-                    crs: node.getAttribute("crs")
-                };
-                this.readChildNodes(node, output.boundingBoxData);
-            }
-        },
-
-        // TODO: we should add Exception parsing here
-        "ows": OpenLayers.Format.OWSCommon.v1_1_0.prototype.readers["ows"]
-    },
-    
-    CLASS_NAME: "OpenLayers.Format.WPSExecute" 
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/XLS.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/XLS.js
deleted file mode 100644
index 76f3f10a..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/XLS.js
+++ /dev/null
@@ -1,68 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/XML/VersionedOGC.js
- */
-
-/**
- * Class: OpenLayers.Format.XLS
- * Read/Write XLS (OpenLS). Create a new instance with the <OpenLayers.Format.XLS>
- *     constructor. Currently only implemented for Location Utility Services, more
- *     specifically only for Geocoding. No support for Reverse Geocoding as yet.
- * 
- * Inherits from:
- *  - <OpenLayers.Format.XML.VersionedOGC>
- */
-OpenLayers.Format.XLS = OpenLayers.Class(OpenLayers.Format.XML.VersionedOGC, {
-    
-    /**
-     * APIProperty: defaultVersion
-     * {String} Version number to assume if none found.  Default is "1.1.0".
-     */
-    defaultVersion: "1.1.0",
- 
-    /**
-     * APIProperty: stringifyOutput
-     * {Boolean} If true, write will return a string otherwise a DOMElement.
-     * Default is true.
-     */
-    stringifyOutput: true,
-    
-    /**
-     * Constructor: OpenLayers.Format.XLS
-     * Create a new parser for XLS.
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be set on
-     *     this instance.
-     */
-
-    /**
-     * APIMethod: write
-     * Write out an XLS request.
-     *
-     * Parameters:
-     * request - {Object} An object representing the LUS request.
-     * options - {Object} Optional configuration object.
-     *
-     * Returns:
-     * {String} An XLS document string.
-     */
-    
-    /**
-     * APIMethod: read
-     * Read an XLS doc and return an object representing the result.
-     *
-     * Parameters:
-     * data - {String | DOMElement} Data to read.
-     * options - {Object} Options for the reader.
-     *
-     * Returns:
-     * {Object} An object representing the GeocodeResponse.
-     */
-
-    CLASS_NAME: "OpenLayers.Format.XLS" 
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/XLS/v1.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/XLS/v1.js
deleted file mode 100644
index 642474f0..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/XLS/v1.js
+++ /dev/null
@@ -1,304 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/XLS.js
- * @requires OpenLayers/Format/GML/v3.js
- */
-
-/**
- * Class: OpenLayers.Format.XLS.v1
- * Superclass for XLS version 1 parsers. Only supports GeocodeRequest for now.
- *
- * Inherits from:
- *  - <OpenLayers.Format.XML>
- */
-OpenLayers.Format.XLS.v1 = OpenLayers.Class(OpenLayers.Format.XML, {
-    
-    /**
-     * Property: namespaces
-     * {Object} Mapping of namespace aliases to namespace URIs.
-     */
-    namespaces: {
-        xls: "http://www.opengis.net/xls",
-        gml: "http://www.opengis.net/gml",
-        xsi: "http://www.w3.org/2001/XMLSchema-instance"
-    },
-
-    /**
-     * Property: regExes
-     * Compiled regular expressions for manipulating strings.
-     */
-    regExes: {
-        trimSpace: (/^\s*|\s*$/g),
-        removeSpace: (/\s*/g),
-        splitSpace: (/\s+/),
-        trimComma: (/\s*,\s*/g)
-    },
-
-    /**
-     * APIProperty: xy
-     * {Boolean} Order of the GML coordinate true:(x,y) or false:(y,x)
-     * Changing is not recommended, a new Format should be instantiated.
-     */
-    xy: true,
-    
-    /**
-     * Property: defaultPrefix
-     */
-    defaultPrefix: "xls",
-
-    /**
-     * Property: schemaLocation
-     * {String} Schema location for a particular minor version.
-     */
-    schemaLocation: null,
-    
-    /**
-     * Constructor: OpenLayers.Format.XLS.v1
-     * Instances of this class are not created directly.  Use the
-     *     <OpenLayers.Format.XLS> constructor instead.
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be set on
-     *     this instance.
-     */
-    
-    /**
-     * Method: read
-     *
-     * Parameters:
-     * data - {DOMElement} An XLS document element.
-     * options - {Object} Options for the reader.
-     *
-     * Returns:
-     * {Object} An object representing the XLSResponse.
-     */
-    read: function(data, options) {
-        options = OpenLayers.Util.applyDefaults(options, this.options);
-        var xls = {};
-        this.readChildNodes(data, xls);
-        return xls;
-    },
-    
-    /**
-     * Property: readers
-     * Contains public functions, grouped by namespace prefix, that will
-     *     be applied when a namespaced node is found matching the function
-     *     name.  The function will be applied in the scope of this parser
-     *     with two arguments: the node being read and a context object passed
-     *     from the parent.
-     */
-    readers: {
-        "xls": {
-            "XLS": function(node, xls) {
-                xls.version = node.getAttribute("version");
-                this.readChildNodes(node, xls);
-            },
-            "Response": function(node, xls) {
-               this.readChildNodes(node, xls);
-            },
-            "GeocodeResponse": function(node, xls) {
-               xls.responseLists = [];
-               this.readChildNodes(node, xls);
-            },
-            "GeocodeResponseList": function(node, xls) {
-                var responseList = {
-                    features: [], 
-                    numberOfGeocodedAddresses: 
-                        parseInt(node.getAttribute("numberOfGeocodedAddresses"))
-                };
-                xls.responseLists.push(responseList);
-                this.readChildNodes(node, responseList);
-            },
-            "GeocodedAddress": function(node, responseList) {
-                var feature = new OpenLayers.Feature.Vector();
-                responseList.features.push(feature);
-                this.readChildNodes(node, feature);
-                // post-process geometry
-                feature.geometry = feature.components[0];
-            },
-            "GeocodeMatchCode": function(node, feature) {
-                feature.attributes.matchCode = {
-                    accuracy: parseFloat(node.getAttribute("accuracy")),
-                    matchType: node.getAttribute("matchType")
-                };
-            },
-            "Address": function(node, feature) {
-                var address = {
-                    countryCode: node.getAttribute("countryCode"),
-                    addressee: node.getAttribute("addressee"),
-                    street: [],
-                    place: []
-                };
-                feature.attributes.address = address;
-                this.readChildNodes(node, address);
-            },
-            "freeFormAddress": function(node, address) {
-                address.freeFormAddress = this.getChildValue(node);
-            },
-            "StreetAddress": function(node, address) {
-                this.readChildNodes(node, address);
-            },
-            "Building": function(node, address) {
-                address.building = {
-                    'number': node.getAttribute("number"),
-                    subdivision: node.getAttribute("subdivision"),
-                    buildingName: node.getAttribute("buildingName")
-                };
-            },
-            "Street": function(node, address) {
-                // only support the built-in primitive type for now
-                address.street.push(this.getChildValue(node));
-            },
-            "Place": function(node, address) {
-                // type is one of CountrySubdivision, 
-                // CountrySecondarySubdivision, Municipality or
-                // MunicipalitySubdivision
-                address.place[node.getAttribute("type")] = 
-                    this.getChildValue(node);
-            },
-            "PostalCode": function(node, address) {
-                address.postalCode = this.getChildValue(node);
-            }
-        },
-        "gml": OpenLayers.Format.GML.v3.prototype.readers.gml
-    },
-    
-    /**
-     * Method: write
-     *
-     * Parameters:
-     * request - {Object} An object representing the geocode request.
-     *
-     * Returns:
-     * {DOMElement} The root of an XLS document.
-     */
-    write: function(request) {
-        return this.writers.xls.XLS.apply(this, [request]);
-    },
-    
-    /**
-     * Property: writers
-     * As a compliment to the readers property, this structure contains public
-     *     writing functions grouped by namespace alias and named like the
-     *     node names they produce.
-     */
-    writers: {
-        "xls": {
-            "XLS": function(request) {
-                var root = this.createElementNSPlus(
-                    "xls:XLS",
-                    {attributes: {
-                        "version": this.VERSION,
-                        "xsi:schemaLocation": this.schemaLocation
-                    }}
-                );
-                this.writeNode("RequestHeader", request.header, root);
-                this.writeNode("Request", request, root);
-                return root;
-            },
-            "RequestHeader": function(header) {
-                return this.createElementNSPlus("xls:RequestHeader");
-            },
-            "Request": function(request) {
-                var node = this.createElementNSPlus("xls:Request", {
-                    attributes: {
-                        methodName: "GeocodeRequest",
-                        requestID: request.requestID || "",
-                        version: this.VERSION
-                    }
-                });
-                this.writeNode("GeocodeRequest", request.addresses, node);
-                return node;
-            },
-            "GeocodeRequest": function(addresses) {
-                var node = this.createElementNSPlus("xls:GeocodeRequest");
-                for (var i=0, len=addresses.length; i<len; i++) {
-                    this.writeNode("Address", addresses[i], node);
-                }
-                return node;
-            },
-            "Address": function(address) {
-                var node = this.createElementNSPlus("xls:Address", {
-                    attributes: {
-                        countryCode: address.countryCode
-                    }
-                });
-                if (address.freeFormAddress) {
-                    this.writeNode("freeFormAddress", address.freeFormAddress, node);
-                } else {
-                    if (address.street) {
-                        this.writeNode("StreetAddress", address, node);
-                    }
-                    if (address.municipality) {
-                        this.writeNode("Municipality", address.municipality, node);
-                    }
-                    if (address.countrySubdivision) {
-                        this.writeNode("CountrySubdivision", address.countrySubdivision, node);
-                    }
-                    if (address.postalCode) {
-                        this.writeNode("PostalCode", address.postalCode, node);
-                    }
-                }
-                return node;
-            },
-            "freeFormAddress": function(freeFormAddress) {
-                return this.createElementNSPlus("freeFormAddress", 
-                    {value: freeFormAddress});
-            },
-            "StreetAddress": function(address) {
-                var node = this.createElementNSPlus("xls:StreetAddress");
-                if (address.building) {
-                    this.writeNode(node, "Building", address.building);
-                }
-                var street = address.street;
-                if (!(OpenLayers.Util.isArray(street))) {
-                    street = [street];
-                }
-                for (var i=0, len=street.length; i < len; i++) {
-                    this.writeNode("Street", street[i], node);
-                }
-                return node;
-            },
-            "Building": function(building) {
-                return this.createElementNSPlus("xls:Building", {
-                    attributes: {
-                        "number": building["number"],
-                        "subdivision": building.subdivision,
-                        "buildingName": building.buildingName
-                    }
-                });
-            },
-            "Street": function(street) {
-                return this.createElementNSPlus("xls:Street", {value: street});
-            },
-            "Municipality": function(municipality) {
-                return this.createElementNSPlus("xls:Place", {
-                    attributes: {
-                        type: "Municipality"
-                    },
-                    value: municipality
-                });
-            },
-            "CountrySubdivision": function(countrySubdivision) {
-                return this.createElementNSPlus("xls:Place", {
-                    attributes: {
-                        type: "CountrySubdivision"
-                    },
-                    value: countrySubdivision
-                });
-            },
-            "PostalCode": function(postalCode) {
-                return this.createElementNSPlus("xls:PostalCode", {
-                    value: postalCode
-                });
-            }
-        }
-    },
-    
-    CLASS_NAME: "OpenLayers.Format.XLS.v1" 
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/XLS/v1_1_0.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/XLS/v1_1_0.js
deleted file mode 100644
index 7ffca261..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/XLS/v1_1_0.js
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/XLS/v1.js
- */
-
-/**
- * Class: OpenLayers.Format.XLS.v1_1_0
- * Read / write XLS version 1.1.0.
- * 
- * Inherits from:
- *  - <OpenLayers.Format.XLS.v1>
- */
-OpenLayers.Format.XLS.v1_1_0 = OpenLayers.Class(
-    OpenLayers.Format.XLS.v1, {
-    
-    /**
-     * Constant: VERSION
-     * {String} 1.1
-     */
-    VERSION: "1.1",
-    
-    /**
-     * Property: schemaLocation
-     * {String} http://www.opengis.net/xls
-     *   http://schemas.opengis.net/ols/1.1.0/LocationUtilityService.xsd
-     */
-    schemaLocation: "http://www.opengis.net/xls http://schemas.opengis.net/ols/1.1.0/LocationUtilityService.xsd",
-
-    /**
-     * Constructor: OpenLayers.Format.XLS.v1_1_0
-     * Instances of this class are not created directly.  Use the
-     *     <OpenLayers.Format.XLS> constructor instead.
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be set on
-     *     this instance.
-     */
-
-    CLASS_NAME: "OpenLayers.Format.XLS.v1_1_0"
-
-});
-
-// Support non standard implementation
-OpenLayers.Format.XLS.v1_1 = OpenLayers.Format.XLS.v1_1_0;
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/XML.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/XML.js
deleted file mode 100644
index 56f58713..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/XML.js
+++ /dev/null
@@ -1,897 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format.js
- */
-
-/**
- * Class: OpenLayers.Format.XML
- * Read and write XML.  For cross-browser XML generation, use methods on an
- *     instance of the XML format class instead of on <code>document<end>.
- *     The DOM creation and traversing methods exposed here all mimic the
- *     W3C XML DOM methods.  Create a new parser with the
- *     <OpenLayers.Format.XML> constructor.
- *
- * Inherits from:
- *  - <OpenLayers.Format>
- */
-OpenLayers.Format.XML = OpenLayers.Class(OpenLayers.Format, {
-    
-    /**
-     * Property: namespaces
-     * {Object} Mapping of namespace aliases to namespace URIs.  Properties
-     *     of this object should not be set individually.  Read-only.  All
-     *     XML subclasses should have their own namespaces object.  Use
-     *     <setNamespace> to add or set a namespace alias after construction.
-     */
-    namespaces: null,
-    
-    /**
-     * Property: namespaceAlias
-     * {Object} Mapping of namespace URI to namespace alias.  This object
-     *     is read-only.  Use <setNamespace> to add or set a namespace alias.
-     */
-    namespaceAlias: null,
-    
-    /**
-     * Property: defaultPrefix
-     * {String} The default namespace alias for creating element nodes.
-     */
-    defaultPrefix: null,
-    
-    /**
-     * Property: readers
-     * Contains public functions, grouped by namespace prefix, that will
-     *     be applied when a namespaced node is found matching the function
-     *     name.  The function will be applied in the scope of this parser
-     *     with two arguments: the node being read and a context object passed
-     *     from the parent.
-     */
-    readers: {},
-    
-    /**
-     * Property: writers
-     * As a compliment to the <readers> property, this structure contains public
-     *     writing functions grouped by namespace alias and named like the
-     *     node names they produce.
-     */
-    writers: {},
-
-    /**
-     * Property: xmldom
-     * {XMLDom} If this browser uses ActiveX, this will be set to a XMLDOM
-     *     object.  It is not intended to be a browser sniffing property.
-     *     Instead, the xmldom property is used instead of <code>document<end>
-     *     where namespaced node creation methods are not supported. In all
-     *     other browsers, this remains null.
-     */
-    xmldom: null,
-
-    /**
-     * Constructor: OpenLayers.Format.XML
-     * Construct an XML parser.  The parser is used to read and write XML.
-     *     Reading XML from a string returns a DOM element.  Writing XML from
-     *     a DOM element returns a string.
-     *
-     * Parameters:
-     * options - {Object} Optional object whose properties will be set on
-     *     the object.
-     */
-    initialize: function(options) {
-        if(window.ActiveXObject) {
-            this.xmldom = new ActiveXObject("Microsoft.XMLDOM");
-        }
-        OpenLayers.Format.prototype.initialize.apply(this, [options]);
-        // clone the namespace object and set all namespace aliases
-        this.namespaces = OpenLayers.Util.extend({}, this.namespaces);
-        this.namespaceAlias = {};
-        for(var alias in this.namespaces) {
-            this.namespaceAlias[this.namespaces[alias]] = alias;
-        }
-    },
-    
-    /**
-     * APIMethod: destroy
-     * Clean up.
-     */
-    destroy: function() {
-        this.xmldom = null;
-        OpenLayers.Format.prototype.destroy.apply(this, arguments);
-    },
-    
-    /**
-     * Method: setNamespace
-     * Set a namespace alias and URI for the format.
-     *
-     * Parameters:
-     * alias - {String} The namespace alias (prefix).
-     * uri - {String} The namespace URI.
-     */
-    setNamespace: function(alias, uri) {
-        this.namespaces[alias] = uri;
-        this.namespaceAlias[uri] = alias;
-    },
-
-    /**
-     * APIMethod: read
-     * Deserialize a XML string and return a DOM node.
-     *
-     * Parameters:
-     * text - {String} A XML string
-     
-     * Returns:
-     * {DOMElement} A DOM node
-     */
-    read: function(text) {
-        var index = text.indexOf('<');
-        if(index > 0) {
-            text = text.substring(index);
-        }
-        var node = OpenLayers.Util.Try(
-            OpenLayers.Function.bind((
-                function() {
-                    var xmldom;
-                    /**
-                     * Since we want to be able to call this method on the prototype
-                     * itself, this.xmldom may not exist even if in IE.
-                     */
-                    if(window.ActiveXObject && !this.xmldom) {
-                        xmldom = new ActiveXObject("Microsoft.XMLDOM");
-                    } else {
-                        xmldom = this.xmldom;
-                        
-                    }
-                    xmldom.loadXML(text);
-                    return xmldom;
-                }
-            ), this),
-            function() {
-                return new DOMParser().parseFromString(text, 'text/xml');
-            },
-            function() {
-                var req = new XMLHttpRequest();
-                req.open("GET", "data:" + "text/xml" +
-                         ";charset=utf-8," + encodeURIComponent(text), false);
-                if(req.overrideMimeType) {
-                    req.overrideMimeType("text/xml");
-                }
-                req.send(null);
-                return req.responseXML;
-            }
-        );
-
-        if(this.keepData) {
-            this.data = node;
-        }
-
-        return node;
-    },
-
-    /**
-     * APIMethod: write
-     * Serialize a DOM node into a XML string.
-     * 
-     * Parameters:
-     * node - {DOMElement} A DOM node.
-     *
-     * Returns:
-     * {String} The XML string representation of the input node.
-     */
-    write: function(node) {
-        var data;
-        if(this.xmldom) {
-            data = node.xml;
-        } else {
-            var serializer = new XMLSerializer();
-            if (node.nodeType == 1) {
-                // Add nodes to a document before serializing. Everything else
-                // is serialized as is. This may need more work. See #1218 .
-                var doc = document.implementation.createDocument("", "", null);
-                if (doc.importNode) {
-                    node = doc.importNode(node, true);
-                }
-                doc.appendChild(node);
-                data = serializer.serializeToString(doc);
-            } else {
-                data = serializer.serializeToString(node);
-            }
-        }
-        return data;
-    },
-
-    /**
-     * APIMethod: createElementNS
-     * Create a new element with namespace.  This node can be appended to
-     *     another node with the standard node.appendChild method.  For
-     *     cross-browser support, this method must be used instead of
-     *     document.createElementNS.
-     *
-     * Parameters:
-     * uri - {String} Namespace URI for the element.
-     * name - {String} The qualified name of the element (prefix:localname).
-     * 
-     * Returns:
-     * {Element} A DOM element with namespace.
-     */
-    createElementNS: function(uri, name) {
-        var element;
-        if(this.xmldom) {
-            if(typeof uri == "string") {
-                element = this.xmldom.createNode(1, name, uri);
-            } else {
-                element = this.xmldom.createNode(1, name, "");
-            }
-        } else {
-            element = document.createElementNS(uri, name);
-        }
-        return element;
-    },
-
-    /**
-     * APIMethod: createDocumentFragment
-     * Create a document fragment node that can be appended to another node
-     *     created by createElementNS.  This will call 
-     *     document.createDocumentFragment outside of IE.  In IE, the ActiveX
-     *     object's createDocumentFragment method is used.
-     *
-     * Returns:
-     * {Element} A document fragment.
-     */
-    createDocumentFragment: function() {
-        var element;
-        if (this.xmldom) {
-            element = this.xmldom.createDocumentFragment();
-        } else {
-            element = document.createDocumentFragment();
-        }
-        return element;
-    },
-
-    /**
-     * APIMethod: createTextNode
-     * Create a text node.  This node can be appended to another node with
-     *     the standard node.appendChild method.  For cross-browser support,
-     *     this method must be used instead of document.createTextNode.
-     * 
-     * Parameters:
-     * text - {String} The text of the node.
-     * 
-     * Returns: 
-     * {DOMElement} A DOM text node.
-     */
-    createTextNode: function(text) {
-        var node;
-        if (typeof text !== "string") {
-            text = String(text);
-        }
-        if(this.xmldom) {
-            node = this.xmldom.createTextNode(text);
-        } else {
-            node = document.createTextNode(text);
-        }
-        return node;
-    },
-
-    /**
-     * APIMethod: getElementsByTagNameNS
-     * Get a list of elements on a node given the namespace URI and local name.
-     *     To return all nodes in a given namespace, use '*' for the name
-     *     argument.  To return all nodes of a given (local) name, regardless
-     *     of namespace, use '*' for the uri argument.
-     * 
-     * Parameters:
-     * node - {Element} Node on which to search for other nodes.
-     * uri - {String} Namespace URI.
-     * name - {String} Local name of the tag (without the prefix).
-     * 
-     * Returns:
-     * {NodeList} A node list or array of elements.
-     */
-    getElementsByTagNameNS: function(node, uri, name) {
-        var elements = [];
-        if(node.getElementsByTagNameNS) {
-            elements = node.getElementsByTagNameNS(uri, name);
-        } else {
-            // brute force method
-            var allNodes = node.getElementsByTagName("*");
-            var potentialNode, fullName;
-            for(var i=0, len=allNodes.length; i<len; ++i) {
-                potentialNode = allNodes[i];
-                fullName = (potentialNode.prefix) ?
-                           (potentialNode.prefix + ":" + name) : name;
-                if((name == "*") || (fullName == potentialNode.nodeName)) {
-                    if((uri == "*") || (uri == potentialNode.namespaceURI)) {
-                        elements.push(potentialNode);
-                    }
-                }
-            }
-        }
-        return elements;
-    },
-
-    /**
-     * APIMethod: getAttributeNodeNS
-     * Get an attribute node given the namespace URI and local name.
-     * 
-     * Parameters:
-     * node - {Element} Node on which to search for attribute nodes.
-     * uri - {String} Namespace URI.
-     * name - {String} Local name of the attribute (without the prefix).
-     * 
-     * Returns:
-     * {DOMElement} An attribute node or null if none found.
-     */
-    getAttributeNodeNS: function(node, uri, name) {
-        var attributeNode = null;
-        if(node.getAttributeNodeNS) {
-            attributeNode = node.getAttributeNodeNS(uri, name);
-        } else {
-            var attributes = node.attributes;
-            var potentialNode, fullName;
-            for(var i=0, len=attributes.length; i<len; ++i) {
-                potentialNode = attributes[i];
-                if(potentialNode.namespaceURI == uri) {
-                    fullName = (potentialNode.prefix) ?
-                               (potentialNode.prefix + ":" + name) : name;
-                    if(fullName == potentialNode.nodeName) {
-                        attributeNode = potentialNode;
-                        break;
-                    }
-                }
-            }
-        }
-        return attributeNode;
-    },
-
-    /**
-     * APIMethod: getAttributeNS
-     * Get an attribute value given the namespace URI and local name.
-     * 
-     * Parameters:
-     * node - {Element} Node on which to search for an attribute.
-     * uri - {String} Namespace URI.
-     * name - {String} Local name of the attribute (without the prefix).
-     * 
-     * Returns:
-     * {String} An attribute value or and empty string if none found.
-     */
-    getAttributeNS: function(node, uri, name) {
-        var attributeValue = "";
-        if(node.getAttributeNS) {
-            attributeValue = node.getAttributeNS(uri, name) || "";
-        } else {
-            var attributeNode = this.getAttributeNodeNS(node, uri, name);
-            if(attributeNode) {
-                attributeValue = attributeNode.nodeValue;
-            }
-        }
-        return attributeValue;
-    },
-    
-    /**
-     * APIMethod: getChildValue
-     * Get the textual value of the node if it exists, or return an
-     *     optional default string.  Returns an empty string if no first child
-     *     exists and no default value is supplied.
-     *
-     * Parameters:
-     * node - {DOMElement} The element used to look for a first child value.
-     * def - {String} Optional string to return in the event that no
-     *     first child value exists.
-     *
-     * Returns:
-     * {String} The value of the first child of the given node.
-     */
-    getChildValue: function(node, def) {
-        var value = def || "";
-        if(node) {
-            for(var child=node.firstChild; child; child=child.nextSibling) {
-                switch(child.nodeType) {
-                    case 3: // text node
-                    case 4: // cdata section
-                        value += child.nodeValue;
-                }
-            }
-        }
-        return value;
-    },
-
-    /**
-     * APIMethod: isSimpleContent
-     * Test if the given node has only simple content (i.e. no child element
-     *     nodes).
-     *
-     * Parameters:
-     * node - {DOMElement} An element node.
-     *
-     * Returns:
-     * {Boolean} The node has no child element nodes (nodes of type 1). 
-     */
-    isSimpleContent: function(node) {
-        var simple = true;
-        for(var child=node.firstChild; child; child=child.nextSibling) {
-            if(child.nodeType === 1) {
-                simple = false;
-                break;
-            }
-        }
-        return simple;
-    },
-    
-    /**
-     * APIMethod: contentType
-     * Determine the content type for a given node.
-     *
-     * Parameters:
-     * node - {DOMElement}
-     *
-     * Returns:
-     * {Integer} One of OpenLayers.Format.XML.CONTENT_TYPE.{EMPTY,SIMPLE,COMPLEX,MIXED}
-     *     if the node has no, simple, complex, or mixed content.
-     */
-    contentType: function(node) {
-        var simple = false,
-            complex = false;
-            
-        var type = OpenLayers.Format.XML.CONTENT_TYPE.EMPTY;
-
-        for(var child=node.firstChild; child; child=child.nextSibling) {
-            switch(child.nodeType) {
-                case 1: // element
-                    complex = true;
-                    break;
-                case 8: // comment
-                    break;
-                default:
-                    simple = true;
-            }
-            if(complex && simple) {
-                break;
-            }
-        }
-        
-        if(complex && simple) {
-            type = OpenLayers.Format.XML.CONTENT_TYPE.MIXED;
-        } else if(complex) {
-            return OpenLayers.Format.XML.CONTENT_TYPE.COMPLEX;
-        } else if(simple) {
-            return OpenLayers.Format.XML.CONTENT_TYPE.SIMPLE;
-        }
-        return type;
-    },
-
-    /**
-     * APIMethod: hasAttributeNS
-     * Determine whether a node has a particular attribute matching the given
-     *     name and namespace.
-     * 
-     * Parameters:
-     * node - {Element} Node on which to search for an attribute.
-     * uri - {String} Namespace URI.
-     * name - {String} Local name of the attribute (without the prefix).
-     * 
-     * Returns:
-     * {Boolean} The node has an attribute matching the name and namespace.
-     */
-    hasAttributeNS: function(node, uri, name) {
-        var found = false;
-        if(node.hasAttributeNS) {
-            found = node.hasAttributeNS(uri, name);
-        } else {
-            found = !!this.getAttributeNodeNS(node, uri, name);
-        }
-        return found;
-    },
-    
-    /**
-     * APIMethod: setAttributeNS
-     * Adds a new attribute or changes the value of an attribute with the given
-     *     namespace and name.
-     *
-     * Parameters:
-     * node - {Element} Element node on which to set the attribute.
-     * uri - {String} Namespace URI for the attribute.
-     * name - {String} Qualified name (prefix:localname) for the attribute.
-     * value - {String} Attribute value.
-     */
-    setAttributeNS: function(node, uri, name, value) {
-        if(node.setAttributeNS) {
-            node.setAttributeNS(uri, name, value);
-        } else {
-            if(this.xmldom) {
-                if(uri) {
-                    var attribute = node.ownerDocument.createNode(
-                        2, name, uri
-                    );
-                    attribute.nodeValue = value;
-                    node.setAttributeNode(attribute);
-                } else {
-                    node.setAttribute(name, value);
-                }
-            } else {
-                throw "setAttributeNS not implemented";
-            }
-        }
-    },
-
-    /**
-     * Method: createElementNSPlus
-     * Shorthand for creating namespaced elements with optional attributes and
-     *     child text nodes.
-     *
-     * Parameters:
-     * name - {String} The qualified node name.
-     * options - {Object} Optional object for node configuration.
-     *
-     * Valid options:
-     * uri - {String} Optional namespace uri for the element - supply a prefix
-     *     instead if the namespace uri is a property of the format's namespace
-     *     object.
-     * attributes - {Object} Optional attributes to be set using the
-     *     <setAttributes> method.
-     * value - {String} Optional text to be appended as a text node.
-     *
-     * Returns:
-     * {Element} An element node.
-     */
-    createElementNSPlus: function(name, options) {
-        options = options || {};
-        // order of prefix preference
-        // 1. in the uri option
-        // 2. in the prefix option
-        // 3. in the qualified name
-        // 4. from the defaultPrefix
-        var uri = options.uri || this.namespaces[options.prefix];
-        if(!uri) {
-            var loc = name.indexOf(":");
-            uri = this.namespaces[name.substring(0, loc)];
-        }
-        if(!uri) {
-            uri = this.namespaces[this.defaultPrefix];
-        }
-        var node = this.createElementNS(uri, name);
-        if(options.attributes) {
-            this.setAttributes(node, options.attributes);
-        }
-        var value = options.value;
-        if(value != null) {
-            node.appendChild(this.createTextNode(value));
-        }
-        return node;
-    },
-    
-    /**
-     * Method: setAttributes
-     * Set multiple attributes given key value pairs from an object.
-     *
-     * Parameters:
-     * node - {Element} An element node.
-     * obj - {Object || Array} An object whose properties represent attribute
-     *     names and values represent attribute values.  If an attribute name
-     *     is a qualified name ("prefix:local"), the prefix will be looked up
-     *     in the parsers {namespaces} object.  If the prefix is found,
-     *     setAttributeNS will be used instead of setAttribute.
-     */
-    setAttributes: function(node, obj) {
-        var value, uri;
-        for(var name in obj) {
-            if(obj[name] != null && obj[name].toString) {
-                value = obj[name].toString();
-                // check for qualified attribute name ("prefix:local")
-                uri = this.namespaces[name.substring(0, name.indexOf(":"))] || null;
-                this.setAttributeNS(node, uri, name, value);
-            }
-        }
-    },
-
-    /**
-     * Method: readNode
-     * Shorthand for applying one of the named readers given the node
-     *     namespace and local name.  Readers take two args (node, obj) and
-     *     generally extend or modify the second.
-     *
-     * Parameters:
-     * node - {DOMElement} The node to be read (required).
-     * obj - {Object} The object to be modified (optional).
-     *
-     * Returns:
-     * {Object} The input object, modified (or a new one if none was provided).
-     */
-    readNode: function(node, obj) {
-        if(!obj) {
-            obj = {};
-        }
-        var group = this.readers[node.namespaceURI ? this.namespaceAlias[node.namespaceURI]: this.defaultPrefix];
-        if(group) {
-            var local = node.localName || node.nodeName.split(":").pop();
-            var reader = group[local] || group["*"];
-            if(reader) {
-                reader.apply(this, [node, obj]);
-            }
-        }
-        return obj;
-    },
-
-    /**
-     * Method: readChildNodes
-     * Shorthand for applying the named readers to all children of a node.
-     *     For each child of type 1 (element), <readSelf> is called.
-     *
-     * Parameters:
-     * node - {DOMElement} The node to be read (required).
-     * obj - {Object} The object to be modified (optional).
-     *
-     * Returns:
-     * {Object} The input object, modified.
-     */
-    readChildNodes: function(node, obj) {
-        if(!obj) {
-            obj = {};
-        }
-        var children = node.childNodes;
-        var child;
-        for(var i=0, len=children.length; i<len; ++i) {
-            child = children[i];
-            if(child.nodeType == 1) {
-                this.readNode(child, obj);
-            }
-        }
-        return obj;
-    },
-
-    /**
-     * Method: writeNode
-     * Shorthand for applying one of the named writers and appending the
-     *     results to a node.  If a qualified name is not provided for the
-     *     second argument (and a local name is used instead), the namespace
-     *     of the parent node will be assumed.
-     *
-     * Parameters:
-     * name - {String} The name of a node to generate.  If a qualified name
-     *     (e.g. "pre:Name") is used, the namespace prefix is assumed to be
-     *     in the <writers> group.  If a local name is used (e.g. "Name") then
-     *     the namespace of the parent is assumed.  If a local name is used
-     *     and no parent is supplied, then the default namespace is assumed.
-     * obj - {Object} Structure containing data for the writer.
-     * parent - {DOMElement} Result will be appended to this node.  If no parent
-     *     is supplied, the node will not be appended to anything.
-     *
-     * Returns:
-     * {DOMElement} The child node.
-     */
-    writeNode: function(name, obj, parent) {
-        var prefix, local;
-        var split = name.indexOf(":");
-        if(split > 0) {
-            prefix = name.substring(0, split);
-            local = name.substring(split + 1);
-        } else {
-            if(parent) {
-                prefix = this.namespaceAlias[parent.namespaceURI];
-            } else {
-                prefix = this.defaultPrefix;
-            }
-            local = name;
-        }
-        var child = this.writers[prefix][local].apply(this, [obj]);
-        if(parent) {
-            parent.appendChild(child);
-        }
-        return child;
-    },
-
-    /**
-     * APIMethod: getChildEl
-     * Get the first child element.  Optionally only return the first child
-     *     if it matches the given name and namespace URI.
-     *
-     * Parameters:
-     * node - {DOMElement} The parent node.
-     * name - {String} Optional node name (local) to search for.
-     * uri - {String} Optional namespace URI to search for.
-     *
-     * Returns:
-     * {DOMElement} The first child.  Returns null if no element is found, if
-     *     something significant besides an element is found, or if the element
-     *     found does not match the optional name and uri.
-     */
-    getChildEl: function(node, name, uri) {
-        return node && this.getThisOrNextEl(node.firstChild, name, uri);
-    },
-    
-    /**
-     * APIMethod: getNextEl
-     * Get the next sibling element.  Optionally get the first sibling only
-     *     if it matches the given local name and namespace URI.
-     *
-     * Parameters:
-     * node - {DOMElement} The node.
-     * name - {String} Optional local name of the sibling to search for.
-     * uri - {String} Optional namespace URI of the sibling to search for.
-     *
-     * Returns:
-     * {DOMElement} The next sibling element.  Returns null if no element is
-     *     found, something significant besides an element is found, or the
-     *     found element does not match the optional name and uri.
-     */
-    getNextEl: function(node, name, uri) {
-        return node && this.getThisOrNextEl(node.nextSibling, name, uri);
-    },
-    
-    /**
-     * Method: getThisOrNextEl
-     * Return this node or the next element node.  Optionally get the first
-     *     sibling with the given local name or namespace URI.
-     *
-     * Parameters:
-     * node - {DOMElement} The node.
-     * name - {String} Optional local name of the sibling to search for.
-     * uri - {String} Optional namespace URI of the sibling to search for.
-     *
-     * Returns:
-     * {DOMElement} The next sibling element.  Returns null if no element is
-     *     found, something significant besides an element is found, or the
-     *     found element does not match the query.
-     */
-    getThisOrNextEl: function(node, name, uri) {
-        outer: for(var sibling=node; sibling; sibling=sibling.nextSibling) {
-            switch(sibling.nodeType) {
-                case 1: // Element
-                    if((!name || name === (sibling.localName || sibling.nodeName.split(":").pop())) &&
-                       (!uri || uri === sibling.namespaceURI)) {
-                        // matches
-                        break outer;
-                    }
-                    sibling = null;
-                    break outer;
-                case 3: // Text
-                    if(/^\s*$/.test(sibling.nodeValue)) {
-                        break;
-                    }
-                case 4: // CDATA
-                case 6: // ENTITY_NODE
-                case 12: // NOTATION_NODE
-                case 10: // DOCUMENT_TYPE_NODE
-                case 11: // DOCUMENT_FRAGMENT_NODE
-                    sibling = null;
-                    break outer;
-            } // ignore comments and processing instructions
-        }
-        return sibling || null;
-    },
-    
-    /**
-     * APIMethod: lookupNamespaceURI
-     * Takes a prefix and returns the namespace URI associated with it on the given
-     *     node if found (and null if not). Supplying null for the prefix will
-     *     return the default namespace.
-     *
-     * For browsers that support it, this calls the native lookupNamesapceURI
-     *     function.  In other browsers, this is an implementation of
-     *     http://www.w3.org/TR/DOM-Level-3-Core/core.html#Node3-lookupNamespaceURI.
-     *
-     * For browsers that don't support the attribute.ownerElement property, this
-     *     method cannot be called on attribute nodes.
-     *     
-     * Parameters:
-     * node - {DOMElement} The node from which to start looking.
-     * prefix - {String} The prefix to lookup or null to lookup the default namespace.
-     * 
-     * Returns:
-     * {String} The namespace URI for the given prefix.  Returns null if the prefix
-     *     cannot be found or the node is the wrong type.
-     */
-    lookupNamespaceURI: function(node, prefix) {
-        var uri = null;
-        if(node) {
-            if(node.lookupNamespaceURI) {
-                uri = node.lookupNamespaceURI(prefix);
-            } else {
-                outer: switch(node.nodeType) {
-                    case 1: // ELEMENT_NODE
-                        if(node.namespaceURI !== null && node.prefix === prefix) {
-                            uri = node.namespaceURI;
-                            break outer;
-                        }
-                        var len = node.attributes.length;
-                        if(len) {
-                            var attr;
-                            for(var i=0; i<len; ++i) {
-                                attr = node.attributes[i];
-                                if(attr.prefix === "xmlns" && attr.name === "xmlns:" + prefix) {
-                                    uri = attr.value || null;
-                                    break outer;
-                                } else if(attr.name === "xmlns" && prefix === null) {
-                                    uri = attr.value || null;
-                                    break outer;
-                                }
-                            }
-                        }
-                        uri = this.lookupNamespaceURI(node.parentNode, prefix);
-                        break outer;
-                    case 2: // ATTRIBUTE_NODE
-                        uri = this.lookupNamespaceURI(node.ownerElement, prefix);
-                        break outer;
-                    case 9: // DOCUMENT_NODE
-                        uri = this.lookupNamespaceURI(node.documentElement, prefix);
-                        break outer;
-                    case 6: // ENTITY_NODE
-                    case 12: // NOTATION_NODE
-                    case 10: // DOCUMENT_TYPE_NODE
-                    case 11: // DOCUMENT_FRAGMENT_NODE
-                        break outer;
-                    default: 
-                        // TEXT_NODE (3), CDATA_SECTION_NODE (4), ENTITY_REFERENCE_NODE (5),
-                        // PROCESSING_INSTRUCTION_NODE (7), COMMENT_NODE (8)
-                        uri =  this.lookupNamespaceURI(node.parentNode, prefix);
-                        break outer;
-                }
-            }
-        }
-        return uri;
-    },
-    
-    /**
-     * Method: getXMLDoc
-     * Get an XML document for nodes that are not supported in HTML (e.g.
-     * createCDATASection). On IE, this will either return an existing or
-     * create a new <xmldom> on the instance. On other browsers, this will
-     * either return an existing or create a new shared document (see
-     * <OpenLayers.Format.XML.document>).
-     *
-     * Returns:
-     * {XMLDocument}
-     */
-    getXMLDoc: function() {
-        if (!OpenLayers.Format.XML.document && !this.xmldom) {
-            if (document.implementation && document.implementation.createDocument) {
-                OpenLayers.Format.XML.document =
-                    document.implementation.createDocument("", "", null);
-            } else if (!this.xmldom && window.ActiveXObject) {
-                this.xmldom = new ActiveXObject("Microsoft.XMLDOM");
-            }
-        }
-        return OpenLayers.Format.XML.document || this.xmldom;
-    },
-
-    CLASS_NAME: "OpenLayers.Format.XML" 
-
-});     
-
-OpenLayers.Format.XML.CONTENT_TYPE = {EMPTY: 0, SIMPLE: 1, COMPLEX: 2, MIXED: 3};
-
-/**
- * APIFunction: OpenLayers.Format.XML.lookupNamespaceURI
- * Takes a prefix and returns the namespace URI associated with it on the given
- *     node if found (and null if not). Supplying null for the prefix will
- *     return the default namespace.
- *
- * For browsers that support it, this calls the native lookupNamesapceURI
- *     function.  In other browsers, this is an implementation of
- *     http://www.w3.org/TR/DOM-Level-3-Core/core.html#Node3-lookupNamespaceURI.
- *
- * For browsers that don't support the attribute.ownerElement property, this
- *     method cannot be called on attribute nodes.
- *     
- * Parameters:
- * node - {DOMElement} The node from which to start looking.
- * prefix - {String} The prefix to lookup or null to lookup the default namespace.
- * 
- * Returns:
- * {String} The namespace URI for the given prefix.  Returns null if the prefix
- *     cannot be found or the node is the wrong type.
- */
-OpenLayers.Format.XML.lookupNamespaceURI = OpenLayers.Function.bind(
-    OpenLayers.Format.XML.prototype.lookupNamespaceURI,
-    OpenLayers.Format.XML.prototype
-);
-
-/**
- * Property: OpenLayers.Format.XML.document
- * {XMLDocument} XML document to reuse for creating non-HTML compliant nodes,
- * like document.createCDATASection.
- */
-OpenLayers.Format.XML.document = null;
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/XML/VersionedOGC.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/XML/VersionedOGC.js
deleted file mode 100644
index e68d9686..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Format/XML/VersionedOGC.js
+++ /dev/null
@@ -1,212 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Format/XML.js
- * @requires OpenLayers/Format/OGCExceptionReport.js
- */
-
-/**
- * Class: OpenLayers.Format.XML.VersionedOGC
- * Base class for versioned formats, i.e. a format which supports multiple
- * versions.
- *
- * To enable checking if parsing succeeded, you will need to define a property
- * called errorProperty on the parser you want to check. The parser will then
- * check the returned object to see if that property is present. If it is, it
- * assumes the parsing was successful. If it is not present (or is null), it will
- * pass the document through an OGCExceptionReport parser.
- * 
- * If errorProperty is undefined for the parser, this error checking mechanism
- * will be disabled.
- *
- *
- * 
- * Inherits from:
- *  - <OpenLayers.Format.XML>
- */
-OpenLayers.Format.XML.VersionedOGC = OpenLayers.Class(OpenLayers.Format.XML, {
-    
-    /**
-     * APIProperty: defaultVersion
-     * {String} Version number to assume if none found.
-     */
-    defaultVersion: null,
-    
-    /**
-     * APIProperty: version
-     * {String} Specify a version string if one is known.
-     */
-    version: null,
-
-    /**
-     * APIProperty: profile
-     * {String} If provided, use a custom profile.
-     */
-    profile: null,
-
-    /**
-     * APIProperty: allowFallback
-     * {Boolean} If a profiled parser cannot be found for the returned version,
-     * use a non-profiled parser as the fallback. Application code using this
-     * should take into account that the return object structure might be
-     * missing the specifics of the profile. Defaults to false.
-     */
-    allowFallback: false,
-
-    /**
-     * Property: name
-     * {String} The name of this parser, this is the part of the CLASS_NAME
-     * except for "OpenLayers.Format."
-     */
-    name: null,
-
-    /**
-     * APIProperty: stringifyOutput
-     * {Boolean} If true, write will return a string otherwise a DOMElement.
-     * Default is false.
-     */
-    stringifyOutput: false,
-
-    /**
-     * Property: parser
-     * {Object} Instance of the versioned parser.  Cached for multiple read and
-     *     write calls of the same version.
-     */
-    parser: null,
-
-    /**
-     * Constructor: OpenLayers.Format.XML.VersionedOGC.
-     * Constructor.
-     *
-     * Parameters:
-     * options - {Object} Optional object whose properties will be set on
-     *     the object.
-     */
-    initialize: function(options) {
-        OpenLayers.Format.XML.prototype.initialize.apply(this, [options]);
-        var className = this.CLASS_NAME;
-        this.name = className.substring(className.lastIndexOf(".")+1);
-    },
-
-    /**
-     * Method: getVersion
-     * Returns the version to use. Subclasses can override this function
-     * if a different version detection is needed.
-     *
-     * Parameters:
-     * root - {DOMElement}
-     * options - {Object} Optional configuration object.
-     *
-     * Returns:
-     * {String} The version to use.
-     */
-    getVersion: function(root, options) {
-        var version;
-        // read
-        if (root) {
-            version = this.version;
-            if(!version) {
-                version = root.getAttribute("version");
-                if(!version) {
-                    version = this.defaultVersion;
-                }
-            }
-        } else { // write
-            version = (options && options.version) || 
-                this.version || this.defaultVersion;
-        }
-        return version;
-    },
-
-    /**
-     * Method: getParser
-     * Get an instance of the cached parser if available, otherwise create one.
-     *
-     * Parameters:
-     * version - {String}
-     *
-     * Returns:
-     * {<OpenLayers.Format>}
-     */
-    getParser: function(version) {
-        version = version || this.defaultVersion;
-        var profile = this.profile ? "_" + this.profile : "";
-        if(!this.parser || this.parser.VERSION != version) {
-            var format = OpenLayers.Format[this.name][
-                "v" + version.replace(/\./g, "_") + profile
-            ];
-            if(!format) {
-                if (profile !== "" && this.allowFallback) {
-                    // fallback to the non-profiled version of the parser
-                    profile = "";
-                    format = OpenLayers.Format[this.name][
-                        "v" + version.replace(/\./g, "_")
-                    ];
-                }
-                if (!format) {
-                    throw "Can't find a " + this.name + " parser for version " +
-                          version + profile;
-                }
-            }
-            this.parser = new format(this.options);
-        }
-        return this.parser;
-    },
-
-    /**
-     * APIMethod: write
-     * Write a document.
-     *
-     * Parameters:
-     * obj - {Object} An object representing the document.
-     * options - {Object} Optional configuration object.
-     *
-     * Returns:
-     * {String} The document as a string
-     */
-    write: function(obj, options) {
-        var version = this.getVersion(null, options);
-        this.parser = this.getParser(version);
-        var root = this.parser.write(obj, options);
-        if (this.stringifyOutput === false) {
-            return root;
-        } else {
-            return OpenLayers.Format.XML.prototype.write.apply(this, [root]);
-        }
-    },
-
-    /**
-     * APIMethod: read
-     * Read a doc and return an object representing the document.
-     *
-     * Parameters:
-     * data - {String | DOMElement} Data to read.
-     * options - {Object} Options for the reader.
-     *
-     * Returns:
-     * {Object} An object representing the document.
-     */
-    read: function(data, options) {
-        if(typeof data == "string") {
-            data = OpenLayers.Format.XML.prototype.read.apply(this, [data]);
-        }
-        var root = data.documentElement;
-        var version = this.getVersion(root);
-        this.parser = this.getParser(version);          // Select the parser
-        var obj = this.parser.read(data, options);      // Parse the data
-
-        var errorProperty = this.parser.errorProperty || null;
-        if (errorProperty !== null && obj[errorProperty] === undefined) {
-            // an error must have happened, so parse it and report back
-            var format = new OpenLayers.Format.OGCExceptionReport();
-            obj.error = format.read(data);
-        }
-        obj.version = version;
-        return obj;
-    },
-
-    CLASS_NAME: "OpenLayers.Format.XML.VersionedOGC"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Geometry.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Geometry.js
deleted file mode 100644
index e7b8e59d..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Geometry.js
+++ /dev/null
@@ -1,500 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
- 
-/**
- * @requires OpenLayers/BaseTypes/Class.js
- */
-
-/**
- * Class: OpenLayers.Geometry
- * A Geometry is a description of a geographic object.  Create an instance of
- * this class with the <OpenLayers.Geometry> constructor.  This is a base class,
- * typical geometry types are described by subclasses of this class.
- *
- * Note that if you use the <OpenLayers.Geometry.fromWKT> method, you must
- * explicitly include the OpenLayers.Format.WKT in your build.
- */
-OpenLayers.Geometry = OpenLayers.Class({
-
-    /**
-     * Property: id
-     * {String} A unique identifier for this geometry.
-     */
-    id: null,
-
-    /**
-     * Property: parent
-     * {<OpenLayers.Geometry>}This is set when a Geometry is added as component
-     * of another geometry
-     */
-    parent: null,
-
-    /**
-     * Property: bounds 
-     * {<OpenLayers.Bounds>} The bounds of this geometry
-     */
-    bounds: null,
-
-    /**
-     * Constructor: OpenLayers.Geometry
-     * Creates a geometry object.  
-     */
-    initialize: function() {
-        this.id = OpenLayers.Util.createUniqueID(this.CLASS_NAME+ "_");
-    },
-    
-    /**
-     * Method: destroy
-     * Destroy this geometry.
-     */
-    destroy: function() {
-        this.id = null;
-        this.bounds = null;
-    },
-    
-    /**
-     * APIMethod: clone
-     * Create a clone of this geometry.  Does not set any non-standard
-     *     properties of the cloned geometry.
-     * 
-     * Returns:
-     * {<OpenLayers.Geometry>} An exact clone of this geometry.
-     */
-    clone: function() {
-        return new OpenLayers.Geometry();
-    },
-    
-    /**
-     * Method: setBounds
-     * Set the bounds for this Geometry.
-     * 
-     * Parameters:
-     * bounds - {<OpenLayers.Bounds>} 
-     */
-    setBounds: function(bounds) {
-        if (bounds) {
-            this.bounds = bounds.clone();
-        }
-    },
-    
-    /**
-     * Method: clearBounds
-     * Nullify this components bounds and that of its parent as well.
-     */
-    clearBounds: function() {
-        this.bounds = null;
-        if (this.parent) {
-            this.parent.clearBounds();
-        }    
-    },
-    
-    /**
-     * Method: extendBounds
-     * Extend the existing bounds to include the new bounds. 
-     * If geometry's bounds is not yet set, then set a new Bounds.
-     * 
-     * Parameters:
-     * newBounds - {<OpenLayers.Bounds>} 
-     */
-    extendBounds: function(newBounds){
-        var bounds = this.getBounds();
-        if (!bounds) {
-            this.setBounds(newBounds);
-        } else {
-            this.bounds.extend(newBounds);
-        }
-    },
-    
-    /**
-     * APIMethod: getBounds
-     * Get the bounds for this Geometry. If bounds is not set, it 
-     * is calculated again, this makes queries faster.
-     * 
-     * Returns:
-     * {<OpenLayers.Bounds>}
-     */
-    getBounds: function() {
-        if (this.bounds == null) {
-            this.calculateBounds();
-        }
-        return this.bounds;
-    },
-    
-    /** 
-     * APIMethod: calculateBounds
-     * Recalculate the bounds for the geometry. 
-     */
-    calculateBounds: function() {
-        //
-        // This should be overridden by subclasses.
-        //
-    },
-    
-    /**
-     * APIMethod: distanceTo
-     * Calculate the closest distance between two geometries (on the x-y plane).
-     *
-     * Parameters:
-     * geometry - {<OpenLayers.Geometry>} The target geometry.
-     * options - {Object} Optional properties for configuring the distance
-     *     calculation.
-     *
-     * Valid options depend on the specific geometry type.
-     * 
-     * Returns:
-     * {Number | Object} The distance between this geometry and the target.
-     *     If details is true, the return will be an object with distance,
-     *     x0, y0, x1, and x2 properties.  The x0 and y0 properties represent
-     *     the coordinates of the closest point on this geometry. The x1 and y1
-     *     properties represent the coordinates of the closest point on the
-     *     target geometry.
-     */
-    distanceTo: function(geometry, options) {
-    },
-    
-    /**
-     * APIMethod: getVertices
-     * Return a list of all points in this geometry.
-     *
-     * Parameters:
-     * nodes - {Boolean} For lines, only return vertices that are
-     *     endpoints.  If false, for lines, only vertices that are not
-     *     endpoints will be returned.  If not provided, all vertices will
-     *     be returned.
-     *
-     * Returns:
-     * {Array} A list of all vertices in the geometry.
-     */
-    getVertices: function(nodes) {
-    },
-
-    /**
-     * Method: atPoint
-     * Note - This is only an approximation based on the bounds of the 
-     * geometry.
-     * 
-     * Parameters:
-     * lonlat - {<OpenLayers.LonLat>|Object} OpenLayers.LonLat or an
-     *     object with a 'lon' and 'lat' properties.
-     * toleranceLon - {float} Optional tolerance in Geometric Coords
-     * toleranceLat - {float} Optional tolerance in Geographic Coords
-     * 
-     * Returns:
-     * {Boolean} Whether or not the geometry is at the specified location
-     */
-    atPoint: function(lonlat, toleranceLon, toleranceLat) {
-        var atPoint = false;
-        var bounds = this.getBounds();
-        if ((bounds != null) && (lonlat != null)) {
-
-            var dX = (toleranceLon != null) ? toleranceLon : 0;
-            var dY = (toleranceLat != null) ? toleranceLat : 0;
-    
-            var toleranceBounds = 
-                new OpenLayers.Bounds(this.bounds.left - dX,
-                                      this.bounds.bottom - dY,
-                                      this.bounds.right + dX,
-                                      this.bounds.top + dY);
-
-            atPoint = toleranceBounds.containsLonLat(lonlat);
-        }
-        return atPoint;
-    },
-    
-    /**
-     * Method: getLength
-     * Calculate the length of this geometry. This method is defined in
-     * subclasses.
-     * 
-     * Returns:
-     * {Float} The length of the collection by summing its parts
-     */
-    getLength: function() {
-        //to be overridden by geometries that actually have a length
-        //
-        return 0.0;
-    },
-
-    /**
-     * Method: getArea
-     * Calculate the area of this geometry. This method is defined in subclasses.
-     * 
-     * Returns:
-     * {Float} The area of the collection by summing its parts
-     */
-    getArea: function() {
-        //to be overridden by geometries that actually have an area
-        //
-        return 0.0;
-    },
-    
-    /**
-     * APIMethod: getCentroid
-     * Calculate the centroid of this geometry. This method is defined in subclasses.
-     *
-     * Returns:
-     * {<OpenLayers.Geometry.Point>} The centroid of the collection
-     */
-    getCentroid: function() {
-        return null;
-    },
-
-    /**
-     * Method: toString
-     * Returns a text representation of the geometry.  If the WKT format is
-     *     included in a build, this will be the Well-Known Text 
-     *     representation.
-     *
-     * Returns:
-     * {String} String representation of this geometry.
-     */
-    toString: function() {
-        var string;
-        if (OpenLayers.Format && OpenLayers.Format.WKT) {
-            string = OpenLayers.Format.WKT.prototype.write(
-                new OpenLayers.Feature.Vector(this)
-            );
-        } else {
-            string = Object.prototype.toString.call(this);
-        }
-        return string;
-    },
-
-    CLASS_NAME: "OpenLayers.Geometry"
-});
-
-/**
- * Function: OpenLayers.Geometry.fromWKT
- * Generate a geometry given a Well-Known Text string.  For this method to
- *     work, you must include the OpenLayers.Format.WKT in your build 
- *     explicitly.
- *
- * Parameters:
- * wkt - {String} A string representing the geometry in Well-Known Text.
- *
- * Returns:
- * {<OpenLayers.Geometry>} A geometry of the appropriate class.
- */
-OpenLayers.Geometry.fromWKT = function(wkt) {
-    var geom;
-    if (OpenLayers.Format && OpenLayers.Format.WKT) {
-        var format = OpenLayers.Geometry.fromWKT.format;
-        if (!format) {
-            format = new OpenLayers.Format.WKT();
-            OpenLayers.Geometry.fromWKT.format = format;
-        }
-        var result = format.read(wkt);
-        if (result instanceof OpenLayers.Feature.Vector) {
-            geom = result.geometry;
-        } else if (OpenLayers.Util.isArray(result)) {
-            var len = result.length;
-            var components = new Array(len);
-            for (var i=0; i<len; ++i) {
-                components[i] = result[i].geometry;
-            }
-            geom = new OpenLayers.Geometry.Collection(components);
-        }
-    }
-    return geom;
-};
-    
-/**
- * Method: OpenLayers.Geometry.segmentsIntersect
- * Determine whether two line segments intersect.  Optionally calculates
- *     and returns the intersection point.  This function is optimized for
- *     cases where seg1.x2 >= seg2.x1 || seg2.x2 >= seg1.x1.  In those
- *     obvious cases where there is no intersection, the function should
- *     not be called.
- *
- * Parameters:
- * seg1 - {Object} Object representing a segment with properties x1, y1, x2,
- *     and y2.  The start point is represented by x1 and y1.  The end point
- *     is represented by x2 and y2.  Start and end are ordered so that x1 < x2.
- * seg2 - {Object} Object representing a segment with properties x1, y1, x2,
- *     and y2.  The start point is represented by x1 and y1.  The end point
- *     is represented by x2 and y2.  Start and end are ordered so that x1 < x2.
- * options - {Object} Optional properties for calculating the intersection.
- *
- * Valid options:
- * point - {Boolean} Return the intersection point.  If false, the actual
- *     intersection point will not be calculated.  If true and the segments
- *     intersect, the intersection point will be returned.  If true and
- *     the segments do not intersect, false will be returned.  If true and
- *     the segments are coincident, true will be returned.
- * tolerance - {Number} If a non-null value is provided, if the segments are
- *     within the tolerance distance, this will be considered an intersection.
- *     In addition, if the point option is true and the calculated intersection
- *     is within the tolerance distance of an end point, the endpoint will be
- *     returned instead of the calculated intersection.  Further, if the
- *     intersection is within the tolerance of endpoints on both segments, or
- *     if two segment endpoints are within the tolerance distance of eachother
- *     (but no intersection is otherwise calculated), an endpoint on the
- *     first segment provided will be returned.
- *
- * Returns:
- * {Boolean | <OpenLayers.Geometry.Point>}  The two segments intersect.
- *     If the point argument is true, the return will be the intersection
- *     point or false if none exists.  If point is true and the segments
- *     are coincident, return will be true (and the instersection is equal
- *     to the shorter segment).
- */
-OpenLayers.Geometry.segmentsIntersect = function(seg1, seg2, options) {
-    var point = options && options.point;
-    var tolerance = options && options.tolerance;
-    var intersection = false;
-    var x11_21 = seg1.x1 - seg2.x1;
-    var y11_21 = seg1.y1 - seg2.y1;
-    var x12_11 = seg1.x2 - seg1.x1;
-    var y12_11 = seg1.y2 - seg1.y1;
-    var y22_21 = seg2.y2 - seg2.y1;
-    var x22_21 = seg2.x2 - seg2.x1;
-    var d = (y22_21 * x12_11) - (x22_21 * y12_11);
-    var n1 = (x22_21 * y11_21) - (y22_21 * x11_21);
-    var n2 = (x12_11 * y11_21) - (y12_11 * x11_21);
-    if(d == 0) {
-        // parallel
-        if(n1 == 0 && n2 == 0) {
-            // coincident
-            intersection = true;
-        }
-    } else {
-        var along1 = n1 / d;
-        var along2 = n2 / d;
-        if(along1 >= 0 && along1 <= 1 && along2 >=0 && along2 <= 1) {
-            // intersect
-            if(!point) {
-                intersection = true;
-            } else {
-                // calculate the intersection point
-                var x = seg1.x1 + (along1 * x12_11);
-                var y = seg1.y1 + (along1 * y12_11);
-                intersection = new OpenLayers.Geometry.Point(x, y);
-            }
-        }
-    }
-    if(tolerance) {
-        var dist;
-        if(intersection) {
-            if(point) {
-                var segs = [seg1, seg2];
-                var seg, x, y;
-                // check segment endpoints for proximity to intersection
-                // set intersection to first endpoint within the tolerance
-                outer: for(var i=0; i<2; ++i) {
-                    seg = segs[i];
-                    for(var j=1; j<3; ++j) {
-                        x = seg["x" + j];
-                        y = seg["y" + j];
-                        dist = Math.sqrt(
-                            Math.pow(x - intersection.x, 2) +
-                            Math.pow(y - intersection.y, 2)
-                        );
-                        if(dist < tolerance) {
-                            intersection.x = x;
-                            intersection.y = y;
-                            break outer;
-                        }
-                    }
-                }
-                
-            }
-        } else {
-            // no calculated intersection, but segments could be within
-            // the tolerance of one another
-            var segs = [seg1, seg2];
-            var source, target, x, y, p, result;
-            // check segment endpoints for proximity to intersection
-            // set intersection to first endpoint within the tolerance
-            outer: for(var i=0; i<2; ++i) {
-                source = segs[i];
-                target = segs[(i+1)%2];
-                for(var j=1; j<3; ++j) {
-                    p = {x: source["x"+j], y: source["y"+j]};
-                    result = OpenLayers.Geometry.distanceToSegment(p, target);
-                    if(result.distance < tolerance) {
-                        if(point) {
-                            intersection = new OpenLayers.Geometry.Point(p.x, p.y);
-                        } else {
-                            intersection = true;
-                        }
-                        break outer;
-                    }
-                }
-            }
-        }
-    }
-    return intersection;
-};
-
-/**
- * Function: OpenLayers.Geometry.distanceToSegment
- *
- * Parameters:
- * point - {Object} An object with x and y properties representing the
- *     point coordinates.
- * segment - {Object} An object with x1, y1, x2, and y2 properties
- *     representing endpoint coordinates.
- *
- * Returns:
- * {Object} An object with distance, along, x, and y properties.  The distance
- *     will be the shortest distance between the input point and segment.
- *     The x and y properties represent the coordinates along the segment
- *     where the shortest distance meets the segment. The along attribute
- *     describes how far between the two segment points the given point is.
- */
-OpenLayers.Geometry.distanceToSegment = function(point, segment) {
-    var result = OpenLayers.Geometry.distanceSquaredToSegment(point, segment);
-    result.distance = Math.sqrt(result.distance);
-    return result;
-};
-
-/**
- * Function: OpenLayers.Geometry.distanceSquaredToSegment
- *
- * Usually the distanceToSegment function should be used. This variant however
- * can be used for comparisons where the exact distance is not important.
- *
- * Parameters:
- * point - {Object} An object with x and y properties representing the
- *     point coordinates.
- * segment - {Object} An object with x1, y1, x2, and y2 properties
- *     representing endpoint coordinates.
- *
- * Returns:
- * {Object} An object with squared distance, along, x, and y properties.
- *     The distance will be the shortest distance between the input point and
- *     segment. The x and y properties represent the coordinates along the
- *     segment where the shortest distance meets the segment. The along
- *     attribute describes how far between the two segment points the given
- *     point is.
- */
-OpenLayers.Geometry.distanceSquaredToSegment = function(point, segment) {
-    var x0 = point.x;
-    var y0 = point.y;
-    var x1 = segment.x1;
-    var y1 = segment.y1;
-    var x2 = segment.x2;
-    var y2 = segment.y2;
-    var dx = x2 - x1;
-    var dy = y2 - y1;
-    var along = ((dx * (x0 - x1)) + (dy * (y0 - y1))) /
-                (Math.pow(dx, 2) + Math.pow(dy, 2));
-    var x, y;
-    if(along <= 0.0) {
-        x = x1;
-        y = y1;
-    } else if(along >= 1.0) {
-        x = x2;
-        y = y2;
-    } else {
-        x = x1 + along * dx;
-        y = y1 + along * dy;
-    }
-    return {
-        distance: Math.pow(x - x0, 2) + Math.pow(y - y0, 2),
-        x: x, y: y,
-        along: along
-    };
-};
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Geometry/Collection.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Geometry/Collection.js
deleted file mode 100644
index f76cc853..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Geometry/Collection.js
+++ /dev/null
@@ -1,563 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Geometry.js
- */
-
-/**
- * Class: OpenLayers.Geometry.Collection
- * A Collection is exactly what it sounds like: A collection of different 
- * Geometries. These are stored in the local parameter <components> (which
- * can be passed as a parameter to the constructor). 
- * 
- * As new geometries are added to the collection, they are NOT cloned. 
- * When removing geometries, they need to be specified by reference (ie you 
- * have to pass in the *exact* geometry to be removed).
- * 
- * The <getArea> and <getLength> functions here merely iterate through
- * the components, summing their respective areas and lengths.
- *
- * Create a new instance with the <OpenLayers.Geometry.Collection> constructor.
- *
- * Inherits from:
- *  - <OpenLayers.Geometry> 
- */
-OpenLayers.Geometry.Collection = OpenLayers.Class(OpenLayers.Geometry, {
-
-    /**
-     * APIProperty: components
-     * {Array(<OpenLayers.Geometry>)} The component parts of this geometry
-     */
-    components: null,
-    
-    /**
-     * Property: componentTypes
-     * {Array(String)} An array of class names representing the types of
-     * components that the collection can include.  A null value means the
-     * component types are not restricted.
-     */
-    componentTypes: null,
-
-    /**
-     * Constructor: OpenLayers.Geometry.Collection
-     * Creates a Geometry Collection -- a list of geoms.
-     *
-     * Parameters: 
-     * components - {Array(<OpenLayers.Geometry>)} Optional array of geometries
-     *
-     */
-    initialize: function (components) {
-        OpenLayers.Geometry.prototype.initialize.apply(this, arguments);
-        this.components = [];
-        if (components != null) {
-            this.addComponents(components);
-        }
-    },
-
-    /**
-     * APIMethod: destroy
-     * Destroy this geometry.
-     */
-    destroy: function () {
-        this.components.length = 0;
-        this.components = null;
-        OpenLayers.Geometry.prototype.destroy.apply(this, arguments);
-    },
-
-    /**
-     * APIMethod: clone
-     * Clone this geometry.
-     *
-     * Returns:
-     * {<OpenLayers.Geometry.Collection>} An exact clone of this collection
-     */
-    clone: function() {
-        var geometry = eval("new " + this.CLASS_NAME + "()");
-        for(var i=0, len=this.components.length; i<len; i++) {
-            geometry.addComponent(this.components[i].clone());
-        }
-        
-        // catch any randomly tagged-on properties
-        OpenLayers.Util.applyDefaults(geometry, this);
-        
-        return geometry;
-    },
-
-    /**
-     * Method: getComponentsString
-     * Get a string representing the components for this collection
-     * 
-     * Returns:
-     * {String} A string representation of the components of this geometry
-     */
-    getComponentsString: function(){
-        var strings = [];
-        for(var i=0, len=this.components.length; i<len; i++) {
-            strings.push(this.components[i].toShortString()); 
-        }
-        return strings.join(",");
-    },
-
-    /**
-     * APIMethod: calculateBounds
-     * Recalculate the bounds by iterating through the components and 
-     * calling calling extendBounds() on each item.
-     */
-    calculateBounds: function() {
-        this.bounds = null;
-        var bounds = new OpenLayers.Bounds();
-        var components = this.components;
-        if (components) {
-            for (var i=0, len=components.length; i<len; i++) {
-                bounds.extend(components[i].getBounds());
-            }
-        }
-        // to preserve old behavior, we only set bounds if non-null
-        // in the future, we could add bounds.isEmpty()
-        if (bounds.left != null && bounds.bottom != null && 
-            bounds.right != null && bounds.top != null) {
-            this.setBounds(bounds);
-        }
-    },
-
-    /**
-     * APIMethod: addComponents
-     * Add components to this geometry.
-     *
-     * Parameters:
-     * components - {Array(<OpenLayers.Geometry>)} An array of geometries to add
-     */
-    addComponents: function(components){
-        if(!(OpenLayers.Util.isArray(components))) {
-            components = [components];
-        }
-        for(var i=0, len=components.length; i<len; i++) {
-            this.addComponent(components[i]);
-        }
-    },
-
-    /**
-     * Method: addComponent
-     * Add a new component (geometry) to the collection.  If this.componentTypes
-     * is set, then the component class name must be in the componentTypes array.
-     *
-     * The bounds cache is reset.
-     * 
-     * Parameters:
-     * component - {<OpenLayers.Geometry>} A geometry to add
-     * index - {int} Optional index into the array to insert the component
-     *
-     * Returns:
-     * {Boolean} The component geometry was successfully added
-     */    
-    addComponent: function(component, index) {
-        var added = false;
-        if(component) {
-            if(this.componentTypes == null ||
-               (OpenLayers.Util.indexOf(this.componentTypes,
-                                        component.CLASS_NAME) > -1)) {
-
-                if(index != null && (index < this.components.length)) {
-                    var components1 = this.components.slice(0, index);
-                    var components2 = this.components.slice(index, 
-                                                           this.components.length);
-                    components1.push(component);
-                    this.components = components1.concat(components2);
-                } else {
-                    this.components.push(component);
-                }
-                component.parent = this;
-                this.clearBounds();
-                added = true;
-            }
-        }
-        return added;
-    },
-    
-    /**
-     * APIMethod: removeComponents
-     * Remove components from this geometry.
-     *
-     * Parameters:
-     * components - {Array(<OpenLayers.Geometry>)} The components to be removed
-     *
-     * Returns: 
-     * {Boolean} A component was removed.
-     */
-    removeComponents: function(components) {
-        var removed = false;
-
-        if(!(OpenLayers.Util.isArray(components))) {
-            components = [components];
-        }
-        for(var i=components.length-1; i>=0; --i) {
-            removed = this.removeComponent(components[i]) || removed;
-        }
-        return removed;
-    },
-    
-    /**
-     * Method: removeComponent
-     * Remove a component from this geometry.
-     *
-     * Parameters:
-     * component - {<OpenLayers.Geometry>} 
-     *
-     * Returns: 
-     * {Boolean} The component was removed.
-     */
-    removeComponent: function(component) {
-        
-        OpenLayers.Util.removeItem(this.components, component);
-        
-        // clearBounds() so that it gets recalculated on the next call
-        // to this.getBounds();
-        this.clearBounds();
-        return true;
-    },
-
-    /**
-     * APIMethod: getLength
-     * Calculate the length of this geometry
-     *
-     * Returns:
-     * {Float} The length of the geometry
-     */
-    getLength: function() {
-        var length = 0.0;
-        for (var i=0, len=this.components.length; i<len; i++) {
-            length += this.components[i].getLength();
-        }
-        return length;
-    },
-    
-    /**
-     * APIMethod: getArea
-     * Calculate the area of this geometry. Note how this function is overridden
-     * in <OpenLayers.Geometry.Polygon>.
-     *
-     * Returns:
-     * {Float} The area of the collection by summing its parts
-     */
-    getArea: function() {
-        var area = 0.0;
-        for (var i=0, len=this.components.length; i<len; i++) {
-            area += this.components[i].getArea();
-        }
-        return area;
-    },
-
-    /** 
-     * APIMethod: getGeodesicArea
-     * Calculate the approximate area of the polygon were it projected onto
-     *     the earth.
-     *
-     * Parameters:
-     * projection - {<OpenLayers.Projection>} The spatial reference system
-     *     for the geometry coordinates.  If not provided, Geographic/WGS84 is
-     *     assumed.
-     * 
-     * Reference:
-     * Robert. G. Chamberlain and William H. Duquette, "Some Algorithms for
-     *     Polygons on a Sphere", JPL Publication 07-03, Jet Propulsion
-     *     Laboratory, Pasadena, CA, June 2007 http://trs-new.jpl.nasa.gov/dspace/handle/2014/40409
-     *
-     * Returns:
-     * {float} The approximate geodesic area of the geometry in square meters.
-     */
-    getGeodesicArea: function(projection) {
-        var area = 0.0;
-        for(var i=0, len=this.components.length; i<len; i++) {
-            area += this.components[i].getGeodesicArea(projection);
-        }
-        return area;
-    },
-    
-    /**
-     * APIMethod: getCentroid
-     *
-     * Compute the centroid for this geometry collection.
-     *
-     * Parameters:
-     * weighted - {Boolean} Perform the getCentroid computation recursively,
-     * returning an area weighted average of all geometries in this collection.
-     *
-     * Returns:
-     * {<OpenLayers.Geometry.Point>} The centroid of the collection
-     */
-    getCentroid: function(weighted) {
-        if (!weighted) {
-            return this.components.length && this.components[0].getCentroid();
-        }
-        var len = this.components.length;
-        if (!len) {
-            return false;
-        }
-        
-        var areas = [];
-        var centroids = [];
-        var areaSum = 0;
-        var minArea = Number.MAX_VALUE;
-        var component;
-        for (var i=0; i<len; ++i) {
-            component = this.components[i];
-            var area = component.getArea();
-            var centroid = component.getCentroid(true);
-            if (isNaN(area) || isNaN(centroid.x) || isNaN(centroid.y)) {
-                continue;
-            }
-            areas.push(area);
-            areaSum += area;
-            minArea = (area < minArea && area > 0) ? area : minArea;
-            centroids.push(centroid);
-        }
-        len = areas.length;
-        if (areaSum === 0) {
-            // all the components in this collection have 0 area
-            // probably a collection of points -- weight all the points the same
-            for (var i=0; i<len; ++i) {
-                areas[i] = 1;
-            }
-            areaSum = areas.length;
-        } else {
-            // normalize all the areas where the smallest area will get
-            // a value of 1
-            for (var i=0; i<len; ++i) {
-                areas[i] /= minArea;
-            }
-            areaSum /= minArea;
-        }
-        
-        var xSum = 0, ySum = 0, centroid, area;
-        for (var i=0; i<len; ++i) {
-            centroid = centroids[i];
-            area = areas[i];
-            xSum += centroid.x * area;
-            ySum += centroid.y * area;
-        }
-        
-        return new OpenLayers.Geometry.Point(xSum/areaSum, ySum/areaSum);
-    },
-
-    /**
-     * APIMethod: getGeodesicLength
-     * Calculate the approximate length of the geometry were it projected onto
-     *     the earth.
-     *
-     * projection - {<OpenLayers.Projection>} The spatial reference system
-     *     for the geometry coordinates.  If not provided, Geographic/WGS84 is
-     *     assumed.
-     * 
-     * Returns:
-     * {Float} The appoximate geodesic length of the geometry in meters.
-     */
-    getGeodesicLength: function(projection) {
-        var length = 0.0;
-        for(var i=0, len=this.components.length; i<len; i++) {
-            length += this.components[i].getGeodesicLength(projection);
-        }
-        return length;
-    },
-
-    /**
-     * APIMethod: move
-     * Moves a geometry by the given displacement along positive x and y axes.
-     *     This modifies the position of the geometry and clears the cached
-     *     bounds.
-     *
-     * Parameters:
-     * x - {Float} Distance to move geometry in positive x direction. 
-     * y - {Float} Distance to move geometry in positive y direction.
-     */
-    move: function(x, y) {
-        for(var i=0, len=this.components.length; i<len; i++) {
-            this.components[i].move(x, y);
-        }
-    },
-
-    /**
-     * APIMethod: rotate
-     * Rotate a geometry around some origin
-     *
-     * Parameters:
-     * angle - {Float} Rotation angle in degrees (measured counterclockwise
-     *                 from the positive x-axis)
-     * origin - {<OpenLayers.Geometry.Point>} Center point for the rotation
-     */
-    rotate: function(angle, origin) {
-        for(var i=0, len=this.components.length; i<len; ++i) {
-            this.components[i].rotate(angle, origin);
-        }
-    },
-
-    /**
-     * APIMethod: resize
-     * Resize a geometry relative to some origin.  Use this method to apply
-     *     a uniform scaling to a geometry.
-     *
-     * Parameters:
-     * scale - {Float} Factor by which to scale the geometry.  A scale of 2
-     *                 doubles the size of the geometry in each dimension
-     *                 (lines, for example, will be twice as long, and polygons
-     *                 will have four times the area).
-     * origin - {<OpenLayers.Geometry.Point>} Point of origin for resizing
-     * ratio - {Float} Optional x:y ratio for resizing.  Default ratio is 1.
-     * 
-     * Returns:
-     * {<OpenLayers.Geometry>} - The current geometry. 
-     */
-    resize: function(scale, origin, ratio) {
-        for(var i=0; i<this.components.length; ++i) {
-            this.components[i].resize(scale, origin, ratio);
-        }
-        return this;
-    },
-
-    /**
-     * APIMethod: distanceTo
-     * Calculate the closest distance between two geometries (on the x-y plane).
-     *
-     * Parameters:
-     * geometry - {<OpenLayers.Geometry>} The target geometry.
-     * options - {Object} Optional properties for configuring the distance
-     *     calculation.
-     *
-     * Valid options:
-     * details - {Boolean} Return details from the distance calculation.
-     *     Default is false.
-     * edge - {Boolean} Calculate the distance from this geometry to the
-     *     nearest edge of the target geometry.  Default is true.  If true,
-     *     calling distanceTo from a geometry that is wholly contained within
-     *     the target will result in a non-zero distance.  If false, whenever
-     *     geometries intersect, calling distanceTo will return 0.  If false,
-     *     details cannot be returned.
-     *
-     * Returns:
-     * {Number | Object} The distance between this geometry and the target.
-     *     If details is true, the return will be an object with distance,
-     *     x0, y0, x1, and y1 properties.  The x0 and y0 properties represent
-     *     the coordinates of the closest point on this geometry. The x1 and y1
-     *     properties represent the coordinates of the closest point on the
-     *     target geometry.
-     */
-    distanceTo: function(geometry, options) {
-        var edge = !(options && options.edge === false);
-        var details = edge && options && options.details;
-        var result, best, distance;
-        var min = Number.POSITIVE_INFINITY;
-        for(var i=0, len=this.components.length; i<len; ++i) {
-            result = this.components[i].distanceTo(geometry, options);
-            distance = details ? result.distance : result;
-            if(distance < min) {
-                min = distance;
-                best = result;
-                if(min == 0) {
-                    break;
-                }
-            }
-        }
-        return best;
-    },
-
-    /** 
-     * APIMethod: equals
-     * Determine whether another geometry is equivalent to this one.  Geometries
-     *     are considered equivalent if all components have the same coordinates.
-     * 
-     * Parameters:
-     * geometry - {<OpenLayers.Geometry>} The geometry to test. 
-     *
-     * Returns:
-     * {Boolean} The supplied geometry is equivalent to this geometry.
-     */
-    equals: function(geometry) {
-        var equivalent = true;
-        if(!geometry || !geometry.CLASS_NAME ||
-           (this.CLASS_NAME != geometry.CLASS_NAME)) {
-            equivalent = false;
-        } else if(!(OpenLayers.Util.isArray(geometry.components)) ||
-                  (geometry.components.length != this.components.length)) {
-            equivalent = false;
-        } else {
-            for(var i=0, len=this.components.length; i<len; ++i) {
-                if(!this.components[i].equals(geometry.components[i])) {
-                    equivalent = false;
-                    break;
-                }
-            }
-        }
-        return equivalent;
-    },
-
-    /**
-     * APIMethod: transform
-     * Reproject the components geometry from source to dest.
-     * 
-     * Parameters:
-     * source - {<OpenLayers.Projection>} 
-     * dest - {<OpenLayers.Projection>}
-     * 
-     * Returns:
-     * {<OpenLayers.Geometry>} 
-     */
-    transform: function(source, dest) {
-        if (source && dest) {
-            for (var i=0, len=this.components.length; i<len; i++) {  
-                var component = this.components[i];
-                component.transform(source, dest);
-            }
-            this.bounds = null;
-        }
-        return this;
-    },
-
-    /**
-     * APIMethod: intersects
-     * Determine if the input geometry intersects this one.
-     *
-     * Parameters:
-     * geometry - {<OpenLayers.Geometry>} Any type of geometry.
-     *
-     * Returns:
-     * {Boolean} The input geometry intersects this one.
-     */
-    intersects: function(geometry) {
-        var intersect = false;
-        for(var i=0, len=this.components.length; i<len; ++ i) {
-            intersect = geometry.intersects(this.components[i]);
-            if(intersect) {
-                break;
-            }
-        }
-        return intersect;
-    },
-
-    /**
-     * APIMethod: getVertices
-     * Return a list of all points in this geometry.
-     *
-     * Parameters:
-     * nodes - {Boolean} For lines, only return vertices that are
-     *     endpoints.  If false, for lines, only vertices that are not
-     *     endpoints will be returned.  If not provided, all vertices will
-     *     be returned.
-     *
-     * Returns:
-     * {Array} A list of all vertices in the geometry.
-     */
-    getVertices: function(nodes) {
-        var vertices = [];
-        for(var i=0, len=this.components.length; i<len; ++i) {
-            Array.prototype.push.apply(
-                vertices, this.components[i].getVertices(nodes)
-            );
-        }
-        return vertices;
-    },
-
-
-    CLASS_NAME: "OpenLayers.Geometry.Collection"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Geometry/Curve.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Geometry/Curve.js
deleted file mode 100644
index e663e0b5..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Geometry/Curve.js
+++ /dev/null
@@ -1,89 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Geometry/MultiPoint.js
- */
-
-/**
- * Class: OpenLayers.Geometry.Curve
- * A Curve is a MultiPoint, whose points are assumed to be connected. To 
- * this end, we provide a "getLength()" function, which iterates through 
- * the points, summing the distances between them. 
- * 
- * Inherits: 
- *  - <OpenLayers.Geometry.MultiPoint>
- */
-OpenLayers.Geometry.Curve = OpenLayers.Class(OpenLayers.Geometry.MultiPoint, {
-
-    /**
-     * Property: componentTypes
-     * {Array(String)} An array of class names representing the types of 
-     *                 components that the collection can include.  A null 
-     *                 value means the component types are not restricted.
-     */
-    componentTypes: ["OpenLayers.Geometry.Point"],
-
-    /**
-     * Constructor: OpenLayers.Geometry.Curve
-     * 
-     * Parameters:
-     * point - {Array(<OpenLayers.Geometry.Point>)}
-     */
-    
-    /**
-     * APIMethod: getLength
-     * 
-     * Returns:
-     * {Float} The length of the curve
-     */
-    getLength: function() {
-        var length = 0.0;
-        if ( this.components && (this.components.length > 1)) {
-            for(var i=1, len=this.components.length; i<len; i++) {
-                length += this.components[i-1].distanceTo(this.components[i]);
-            }
-        }
-        return length;
-    },
-
-    /**
-     * APIMethod: getGeodesicLength
-     * Calculate the approximate length of the geometry were it projected onto
-     *     the earth.
-     *
-     * projection - {<OpenLayers.Projection>} The spatial reference system
-     *     for the geometry coordinates.  If not provided, Geographic/WGS84 is
-     *     assumed.
-     * 
-     * Returns:
-     * {Float} The appoximate geodesic length of the geometry in meters.
-     */
-    getGeodesicLength: function(projection) {
-        var geom = this;  // so we can work with a clone if needed
-        if(projection) {
-            var gg = new OpenLayers.Projection("EPSG:4326");
-            if(!gg.equals(projection)) {
-                geom = this.clone().transform(projection, gg);
-            }
-        }
-        var length = 0.0;
-        if(geom.components && (geom.components.length > 1)) {
-            var p1, p2;
-            for(var i=1, len=geom.components.length; i<len; i++) {
-                p1 = geom.components[i-1];
-                p2 = geom.components[i];
-                // this returns km and requires lon/lat properties
-                length += OpenLayers.Util.distVincenty(
-                    {lon: p1.x, lat: p1.y}, {lon: p2.x, lat: p2.y}
-                );
-            }
-        }
-        // convert to m
-        return length * 1000;
-    },
-
-    CLASS_NAME: "OpenLayers.Geometry.Curve"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Geometry/LineString.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Geometry/LineString.js
deleted file mode 100644
index b7d7dac3..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Geometry/LineString.js
+++ /dev/null
@@ -1,646 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Geometry/Curve.js
- */
-
-/**
- * Class: OpenLayers.Geometry.LineString
- * A LineString is a Curve which, once two points have been added to it, can 
- * never be less than two points long.
- * 
- * Inherits from:
- *  - <OpenLayers.Geometry.Curve>
- */
-OpenLayers.Geometry.LineString = OpenLayers.Class(OpenLayers.Geometry.Curve, {
-
-    /**
-     * Constructor: OpenLayers.Geometry.LineString
-     * Create a new LineString geometry
-     *
-     * Parameters:
-     * points - {Array(<OpenLayers.Geometry.Point>)} An array of points used to
-     *          generate the linestring
-     *
-     */
-
-    /**
-     * APIMethod: removeComponent
-     * Only allows removal of a point if there are three or more points in 
-     * the linestring. (otherwise the result would be just a single point)
-     *
-     * Parameters: 
-     * point - {<OpenLayers.Geometry.Point>} The point to be removed
-     *
-     * Returns: 
-     * {Boolean} The component was removed.
-     */
-    removeComponent: function(point) {
-        var removed = this.components && (this.components.length > 2);
-        if (removed) {
-            OpenLayers.Geometry.Collection.prototype.removeComponent.apply(this, 
-                                                                  arguments);
-        }
-        return removed;
-    },
-    
-    /**
-     * APIMethod: intersects
-     * Test for instersection between two geometries.  This is a cheapo
-     *     implementation of the Bently-Ottmann algorigithm.  It doesn't
-     *     really keep track of a sweep line data structure.  It is closer
-     *     to the brute force method, except that segments are sorted and
-     *     potential intersections are only calculated when bounding boxes
-     *     intersect.
-     *
-     * Parameters:
-     * geometry - {<OpenLayers.Geometry>}
-     *
-     * Returns:
-     * {Boolean} The input geometry intersects this geometry.
-     */
-    intersects: function(geometry) {
-        var intersect = false;
-        var type = geometry.CLASS_NAME;
-        if(type == "OpenLayers.Geometry.LineString" ||
-           type == "OpenLayers.Geometry.LinearRing" ||
-           type == "OpenLayers.Geometry.Point") {
-            var segs1 = this.getSortedSegments();
-            var segs2;
-            if(type == "OpenLayers.Geometry.Point") {
-                segs2 = [{
-                    x1: geometry.x, y1: geometry.y,
-                    x2: geometry.x, y2: geometry.y
-                }];
-            } else {
-                segs2 = geometry.getSortedSegments();
-            }
-            var seg1, seg1x1, seg1x2, seg1y1, seg1y2,
-                seg2, seg2y1, seg2y2;
-            // sweep right
-            outer: for(var i=0, len=segs1.length; i<len; ++i) {
-                seg1 = segs1[i];
-                seg1x1 = seg1.x1;
-                seg1x2 = seg1.x2;
-                seg1y1 = seg1.y1;
-                seg1y2 = seg1.y2;
-                inner: for(var j=0, jlen=segs2.length; j<jlen; ++j) {
-                    seg2 = segs2[j];
-                    if(seg2.x1 > seg1x2) {
-                        // seg1 still left of seg2
-                        break;
-                    }
-                    if(seg2.x2 < seg1x1) {
-                        // seg2 still left of seg1
-                        continue;
-                    }
-                    seg2y1 = seg2.y1;
-                    seg2y2 = seg2.y2;
-                    if(Math.min(seg2y1, seg2y2) > Math.max(seg1y1, seg1y2)) {
-                        // seg2 above seg1
-                        continue;
-                    }
-                    if(Math.max(seg2y1, seg2y2) < Math.min(seg1y1, seg1y2)) {
-                        // seg2 below seg1
-                        continue;
-                    }
-                    if(OpenLayers.Geometry.segmentsIntersect(seg1, seg2)) {
-                        intersect = true;
-                        break outer;
-                    }
-                }
-            }
-        } else {
-            intersect = geometry.intersects(this);
-        }
-        return intersect;
-    },
-    
-    /**
-     * Method: getSortedSegments
-     *
-     * Returns:
-     * {Array} An array of segment objects.  Segment objects have properties
-     *     x1, y1, x2, and y2.  The start point is represented by x1 and y1.
-     *     The end point is represented by x2 and y2.  Start and end are
-     *     ordered so that x1 < x2.
-     */
-    getSortedSegments: function() {
-        var numSeg = this.components.length - 1;
-        var segments = new Array(numSeg), point1, point2;
-        for(var i=0; i<numSeg; ++i) {
-            point1 = this.components[i];
-            point2 = this.components[i + 1];
-            if(point1.x < point2.x) {
-                segments[i] = {
-                    x1: point1.x,
-                    y1: point1.y,
-                    x2: point2.x,
-                    y2: point2.y
-                };
-            } else {
-                segments[i] = {
-                    x1: point2.x,
-                    y1: point2.y,
-                    x2: point1.x,
-                    y2: point1.y
-                };
-            }
-        }
-        // more efficient to define this somewhere static
-        function byX1(seg1, seg2) {
-            return seg1.x1 - seg2.x1;
-        }
-        return segments.sort(byX1);
-    },
-    
-    /**
-     * Method: splitWithSegment
-     * Split this geometry with the given segment.
-     *
-     * Parameters:
-     * seg - {Object} An object with x1, y1, x2, and y2 properties referencing
-     *     segment endpoint coordinates.
-     * options - {Object} Properties of this object will be used to determine
-     *     how the split is conducted.
-     *
-     * Valid options:
-     * edge - {Boolean} Allow splitting when only edges intersect.  Default is
-     *     true.  If false, a vertex on the source segment must be within the
-     *     tolerance distance of the intersection to be considered a split.
-     * tolerance - {Number} If a non-null value is provided, intersections
-     *     within the tolerance distance of one of the source segment's
-     *     endpoints will be assumed to occur at the endpoint.
-     *
-     * Returns:
-     * {Object} An object with *lines* and *points* properties.  If the given
-     *     segment intersects this linestring, the lines array will reference
-     *     geometries that result from the split.  The points array will contain
-     *     all intersection points.  Intersection points are sorted along the
-     *     segment (in order from x1,y1 to x2,y2).
-     */
-    splitWithSegment: function(seg, options) {
-        var edge = !(options && options.edge === false);
-        var tolerance = options && options.tolerance;
-        var lines = [];
-        var verts = this.getVertices();
-        var points = [];
-        var intersections = [];
-        var split = false;
-        var vert1, vert2, point;
-        var node, vertex, target;
-        var interOptions = {point: true, tolerance: tolerance};
-        var result = null;
-        for(var i=0, stop=verts.length-2; i<=stop; ++i) {
-            vert1 = verts[i];
-            points.push(vert1.clone());
-            vert2 = verts[i+1];
-            target = {x1: vert1.x, y1: vert1.y, x2: vert2.x, y2: vert2.y};
-            point = OpenLayers.Geometry.segmentsIntersect(
-                seg, target, interOptions
-            );
-            if(point instanceof OpenLayers.Geometry.Point) {
-                if((point.x === seg.x1 && point.y === seg.y1) ||
-                   (point.x === seg.x2 && point.y === seg.y2) ||
-                   point.equals(vert1) || point.equals(vert2)) {
-                    vertex = true;
-                } else {
-                    vertex = false;
-                }
-                if(vertex || edge) {
-                    // push intersections different than the previous
-                    if(!point.equals(intersections[intersections.length-1])) {
-                        intersections.push(point.clone());
-                    }
-                    if(i === 0) {
-                        if(point.equals(vert1)) {
-                            continue;
-                        }
-                    }
-                    if(point.equals(vert2)) {
-                        continue;
-                    }
-                    split = true;
-                    if(!point.equals(vert1)) {
-                        points.push(point);
-                    }
-                    lines.push(new OpenLayers.Geometry.LineString(points));
-                    points = [point.clone()];
-                }
-            }
-        }
-        if(split) {
-            points.push(vert2.clone());
-            lines.push(new OpenLayers.Geometry.LineString(points));
-        }
-        if(intersections.length > 0) {
-            // sort intersections along segment
-            var xDir = seg.x1 < seg.x2 ? 1 : -1;
-            var yDir = seg.y1 < seg.y2 ? 1 : -1;
-            result = {
-                lines: lines,
-                points: intersections.sort(function(p1, p2) {
-                    return (xDir * p1.x - xDir * p2.x) || (yDir * p1.y - yDir * p2.y);
-                })
-            };
-        }
-        return result;
-    },
-
-    /**
-     * Method: split
-     * Use this geometry (the source) to attempt to split a target geometry.
-     * 
-     * Parameters:
-     * target - {<OpenLayers.Geometry>} The target geometry.
-     * options - {Object} Properties of this object will be used to determine
-     *     how the split is conducted.
-     *
-     * Valid options:
-     * mutual - {Boolean} Split the source geometry in addition to the target
-     *     geometry.  Default is false.
-     * edge - {Boolean} Allow splitting when only edges intersect.  Default is
-     *     true.  If false, a vertex on the source must be within the tolerance
-     *     distance of the intersection to be considered a split.
-     * tolerance - {Number} If a non-null value is provided, intersections
-     *     within the tolerance distance of an existing vertex on the source
-     *     will be assumed to occur at the vertex.
-     * 
-     * Returns:
-     * {Array} A list of geometries (of this same type as the target) that
-     *     result from splitting the target with the source geometry.  The
-     *     source and target geometry will remain unmodified.  If no split
-     *     results, null will be returned.  If mutual is true and a split
-     *     results, return will be an array of two arrays - the first will be
-     *     all geometries that result from splitting the source geometry and
-     *     the second will be all geometries that result from splitting the
-     *     target geometry.
-     */
-    split: function(target, options) {
-        var results = null;
-        var mutual = options && options.mutual;
-        var sourceSplit, targetSplit, sourceParts, targetParts;
-        if(target instanceof OpenLayers.Geometry.LineString) {
-            var verts = this.getVertices();
-            var vert1, vert2, seg, splits, lines, point;
-            var points = [];
-            sourceParts = [];
-            for(var i=0, stop=verts.length-2; i<=stop; ++i) {
-                vert1 = verts[i];
-                vert2 = verts[i+1];
-                seg = {
-                    x1: vert1.x, y1: vert1.y,
-                    x2: vert2.x, y2: vert2.y
-                };
-                targetParts = targetParts || [target];
-                if(mutual) {
-                    points.push(vert1.clone());
-                }
-                for(var j=0; j<targetParts.length; ++j) {
-                    splits = targetParts[j].splitWithSegment(seg, options);
-                    if(splits) {
-                        // splice in new features
-                        lines = splits.lines;
-                        if(lines.length > 0) {
-                            lines.unshift(j, 1);
-                            Array.prototype.splice.apply(targetParts, lines);
-                            j += lines.length - 2;
-                        }
-                        if(mutual) {
-                            for(var k=0, len=splits.points.length; k<len; ++k) {
-                                point = splits.points[k];
-                                if(!point.equals(vert1)) {
-                                    points.push(point);
-                                    sourceParts.push(new OpenLayers.Geometry.LineString(points));
-                                    if(point.equals(vert2)) {
-                                        points = [];
-                                    } else {
-                                        points = [point.clone()];
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            if(mutual && sourceParts.length > 0 && points.length > 0) {
-                points.push(vert2.clone());
-                sourceParts.push(new OpenLayers.Geometry.LineString(points));
-            }
-        } else {
-            results = target.splitWith(this, options);
-        }
-        if(targetParts && targetParts.length > 1) {
-            targetSplit = true;
-        } else {
-            targetParts = [];
-        }
-        if(sourceParts && sourceParts.length > 1) {
-            sourceSplit = true;
-        } else {
-            sourceParts = [];
-        }
-        if(targetSplit || sourceSplit) {
-            if(mutual) {
-                results = [sourceParts, targetParts];
-            } else {
-                results = targetParts;
-            }
-        }
-        return results;
-    },
-
-    /**
-     * Method: splitWith
-     * Split this geometry (the target) with the given geometry (the source).
-     *
-     * Parameters:
-     * geometry - {<OpenLayers.Geometry>} A geometry used to split this
-     *     geometry (the source).
-     * options - {Object} Properties of this object will be used to determine
-     *     how the split is conducted.
-     *
-     * Valid options:
-     * mutual - {Boolean} Split the source geometry in addition to the target
-     *     geometry.  Default is false.
-     * edge - {Boolean} Allow splitting when only edges intersect.  Default is
-     *     true.  If false, a vertex on the source must be within the tolerance
-     *     distance of the intersection to be considered a split.
-     * tolerance - {Number} If a non-null value is provided, intersections
-     *     within the tolerance distance of an existing vertex on the source
-     *     will be assumed to occur at the vertex.
-     * 
-     * Returns:
-     * {Array} A list of geometries (of this same type as the target) that
-     *     result from splitting the target with the source geometry.  The
-     *     source and target geometry will remain unmodified.  If no split
-     *     results, null will be returned.  If mutual is true and a split
-     *     results, return will be an array of two arrays - the first will be
-     *     all geometries that result from splitting the source geometry and
-     *     the second will be all geometries that result from splitting the
-     *     target geometry.
-     */
-    splitWith: function(geometry, options) {
-        return geometry.split(this, options);
-
-    },
-
-    /**
-     * APIMethod: getVertices
-     * Return a list of all points in this geometry.
-     *
-     * Parameters:
-     * nodes - {Boolean} For lines, only return vertices that are
-     *     endpoints.  If false, for lines, only vertices that are not
-     *     endpoints will be returned.  If not provided, all vertices will
-     *     be returned.
-     *
-     * Returns:
-     * {Array} A list of all vertices in the geometry.
-     */
-    getVertices: function(nodes) {
-        var vertices;
-        if(nodes === true) {
-            vertices = [
-                this.components[0],
-                this.components[this.components.length-1]
-            ];
-        } else if (nodes === false) {
-            vertices = this.components.slice(1, this.components.length-1);
-        } else {
-            vertices = this.components.slice();
-        }
-        return vertices;
-    },
-
-    /**
-     * APIMethod: distanceTo
-     * Calculate the closest distance between two geometries (on the x-y plane).
-     *
-     * Parameters:
-     * geometry - {<OpenLayers.Geometry>} The target geometry.
-     * options - {Object} Optional properties for configuring the distance
-     *     calculation.
-     *
-     * Valid options:
-     * details - {Boolean} Return details from the distance calculation.
-     *     Default is false.
-     * edge - {Boolean} Calculate the distance from this geometry to the
-     *     nearest edge of the target geometry.  Default is true.  If true,
-     *     calling distanceTo from a geometry that is wholly contained within
-     *     the target will result in a non-zero distance.  If false, whenever
-     *     geometries intersect, calling distanceTo will return 0.  If false,
-     *     details cannot be returned.
-     *
-     * Returns:
-     * {Number | Object} The distance between this geometry and the target.
-     *     If details is true, the return will be an object with distance,
-     *     x0, y0, x1, and x2 properties.  The x0 and y0 properties represent
-     *     the coordinates of the closest point on this geometry. The x1 and y1
-     *     properties represent the coordinates of the closest point on the
-     *     target geometry.
-     */
-    distanceTo: function(geometry, options) {
-        var edge = !(options && options.edge === false);
-        var details = edge && options && options.details;
-        var result, best = {};
-        var min = Number.POSITIVE_INFINITY;
-        if(geometry instanceof OpenLayers.Geometry.Point) {
-            var segs = this.getSortedSegments();
-            var x = geometry.x;
-            var y = geometry.y;
-            var seg;
-            for(var i=0, len=segs.length; i<len; ++i) {
-                seg = segs[i];
-                result = OpenLayers.Geometry.distanceToSegment(geometry, seg);
-                if(result.distance < min) {
-                    min = result.distance;
-                    best = result;
-                    if(min === 0) {
-                        break;
-                    }
-                } else {
-                    // if distance increases and we cross y0 to the right of x0, no need to keep looking.
-                    if(seg.x2 > x && ((y > seg.y1 && y < seg.y2) || (y < seg.y1 && y > seg.y2))) {
-                        break;
-                    }
-                }
-            }
-            if(details) {
-                best = {
-                    distance: best.distance,
-                    x0: best.x, y0: best.y,
-                    x1: x, y1: y
-                };
-            } else {
-                best = best.distance;
-            }
-        } else if(geometry instanceof OpenLayers.Geometry.LineString) { 
-            var segs0 = this.getSortedSegments();
-            var segs1 = geometry.getSortedSegments();
-            var seg0, seg1, intersection, x0, y0;
-            var len1 = segs1.length;
-            var interOptions = {point: true};
-            outer: for(var i=0, len=segs0.length; i<len; ++i) {
-                seg0 = segs0[i];
-                x0 = seg0.x1;
-                y0 = seg0.y1;
-                for(var j=0; j<len1; ++j) {
-                    seg1 = segs1[j];
-                    intersection = OpenLayers.Geometry.segmentsIntersect(seg0, seg1, interOptions);
-                    if(intersection) {
-                        min = 0;
-                        best = {
-                            distance: 0,
-                            x0: intersection.x, y0: intersection.y,
-                            x1: intersection.x, y1: intersection.y
-                        };
-                        break outer;
-                    } else {
-                        result = OpenLayers.Geometry.distanceToSegment({x: x0, y: y0}, seg1);
-                        if(result.distance < min) {
-                            min = result.distance;
-                            best = {
-                                distance: min,
-                                x0: x0, y0: y0,
-                                x1: result.x, y1: result.y
-                            };
-                        }
-                    }
-                }
-            }
-            if(!details) {
-                best = best.distance;
-            }
-            if(min !== 0) {
-                // check the final vertex in this line's sorted segments
-                if(seg0) {
-                    result = geometry.distanceTo(
-                        new OpenLayers.Geometry.Point(seg0.x2, seg0.y2),
-                        options
-                    );
-                    var dist = details ? result.distance : result;
-                    if(dist < min) {
-                        if(details) {
-                            best = {
-                                distance: min,
-                                x0: result.x1, y0: result.y1,
-                                x1: result.x0, y1: result.y0
-                            };
-                        } else {
-                            best = dist;
-                        }
-                    }
-                }
-            }
-        } else {
-            best = geometry.distanceTo(this, options);
-            // swap since target comes from this line
-            if(details) {
-                best = {
-                    distance: best.distance,
-                    x0: best.x1, y0: best.y1,
-                    x1: best.x0, y1: best.y0
-                };
-            }
-        }
-        return best;
-    },
-    
-    /**
-     * APIMethod: simplify
-     * This function will return a simplified LineString.
-     * Simplification is based on the Douglas-Peucker algorithm.
-     *
-     *
-     * Parameters:
-     * tolerance - {number} threshhold for simplification in map units
-     *
-     * Returns:
-     * {OpenLayers.Geometry.LineString} the simplified LineString
-     */
-    simplify: function(tolerance){
-        if (this && this !== null) {
-            var points = this.getVertices();
-            if (points.length < 3) {
-                return this;
-            }
-    
-            var compareNumbers = function(a, b){
-                return (a-b);
-            };
-    
-            /**
-             * Private function doing the Douglas-Peucker reduction
-             */
-            var douglasPeuckerReduction = function(points, firstPoint, lastPoint, tolerance){
-                var maxDistance = 0;
-                var indexFarthest = 0;
-    
-                for (var index = firstPoint, distance; index < lastPoint; index++) {
-                    distance = perpendicularDistance(points[firstPoint], points[lastPoint], points[index]);
-                    if (distance > maxDistance) {
-                        maxDistance = distance;
-                        indexFarthest = index;
-                    }
-                }
-    
-                if (maxDistance > tolerance && indexFarthest != firstPoint) {
-                    //Add the largest point that exceeds the tolerance
-                    pointIndexsToKeep.push(indexFarthest);
-                    douglasPeuckerReduction(points, firstPoint, indexFarthest, tolerance);
-                    douglasPeuckerReduction(points, indexFarthest, lastPoint, tolerance);
-                }
-            };
-    
-            /**
-             * Private function calculating the perpendicular distance
-             * TODO: check whether OpenLayers.Geometry.LineString::distanceTo() is faster or slower
-             */
-            var perpendicularDistance = function(point1, point2, point){
-                //Area = |(1/2)(x1y2 + x2y3 + x3y1 - x2y1 - x3y2 - x1y3)|   *Area of triangle
-                //Base = v((x1-x2)²+(x1-x2)²)                               *Base of Triangle*
-                //Area = .5*Base*H                                          *Solve for height
-                //Height = Area/.5/Base
-    
-                var area = Math.abs(0.5 * (point1.x * point2.y + point2.x * point.y + point.x * point1.y - point2.x * point1.y - point.x * point2.y - point1.x * point.y));
-                var bottom = Math.sqrt(Math.pow(point1.x - point2.x, 2) + Math.pow(point1.y - point2.y, 2));
-                var height = area / bottom * 2;
-    
-                return height;
-            };
-    
-            var firstPoint = 0;
-            var lastPoint = points.length - 1;
-            var pointIndexsToKeep = [];
-    
-            //Add the first and last index to the keepers
-            pointIndexsToKeep.push(firstPoint);
-            pointIndexsToKeep.push(lastPoint);
-    
-            //The first and the last point cannot be the same
-            while (points[firstPoint].equals(points[lastPoint])) {
-                lastPoint--;
-                //Addition: the first point not equal to first point in the LineString is kept as well
-                pointIndexsToKeep.push(lastPoint);
-            }
-    
-            douglasPeuckerReduction(points, firstPoint, lastPoint, tolerance);
-            var returnPoints = [];
-            pointIndexsToKeep.sort(compareNumbers);
-            for (var index = 0; index < pointIndexsToKeep.length; index++) {
-                returnPoints.push(points[pointIndexsToKeep[index]]);
-            }
-            return new OpenLayers.Geometry.LineString(returnPoints);
-    
-        }
-        else {
-            return this;
-        }
-    },
-
-    CLASS_NAME: "OpenLayers.Geometry.LineString"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Geometry/LinearRing.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Geometry/LinearRing.js
deleted file mode 100644
index b0a694cb..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Geometry/LinearRing.js
+++ /dev/null
@@ -1,433 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Geometry/LineString.js
- */
-
-/**
- * Class: OpenLayers.Geometry.LinearRing
- * 
- * A Linear Ring is a special LineString which is closed. It closes itself 
- * automatically on every addPoint/removePoint by adding a copy of the first
- * point as the last point. 
- * 
- * Also, as it is the first in the line family to close itself, a getArea()
- * function is defined to calculate the enclosed area of the linearRing
- * 
- * Inherits:
- *  - <OpenLayers.Geometry.LineString>
- */
-OpenLayers.Geometry.LinearRing = OpenLayers.Class(
-  OpenLayers.Geometry.LineString, {
-
-    /**
-     * Property: componentTypes
-     * {Array(String)} An array of class names representing the types of 
-     *                 components that the collection can include.  A null 
-     *                 value means the component types are not restricted.
-     */
-    componentTypes: ["OpenLayers.Geometry.Point"],
-
-    /**
-     * Constructor: OpenLayers.Geometry.LinearRing
-     * Linear rings are constructed with an array of points.  This array
-     *     can represent a closed or open ring.  If the ring is open (the last
-     *     point does not equal the first point), the constructor will close
-     *     the ring.  If the ring is already closed (the last point does equal
-     *     the first point), it will be left closed.
-     * 
-     * Parameters:
-     * points - {Array(<OpenLayers.Geometry.Point>)} points
-     */
-
-    /**
-     * APIMethod: addComponent
-     * Adds a point to geometry components.  If the point is to be added to
-     *     the end of the components array and it is the same as the last point
-     *     already in that array, the duplicate point is not added.  This has 
-     *     the effect of closing the ring if it is not already closed, and 
-     *     doing the right thing if it is already closed.  This behavior can 
-     *     be overridden by calling the method with a non-null index as the 
-     *     second argument.
-     *
-     * Parameters:
-     * point - {<OpenLayers.Geometry.Point>}
-     * index - {Integer} Index into the array to insert the component
-     * 
-     * Returns:
-     * {Boolean} Was the Point successfully added?
-     */
-    addComponent: function(point, index) {
-        var added = false;
-
-        //remove last point
-        var lastPoint = this.components.pop();
-
-        // given an index, add the point
-        // without an index only add non-duplicate points
-        if(index != null || !point.equals(lastPoint)) {
-            added = OpenLayers.Geometry.Collection.prototype.addComponent.apply(this, 
-                                                                    arguments);
-        }
-
-        //append copy of first point
-        var firstPoint = this.components[0];
-        OpenLayers.Geometry.Collection.prototype.addComponent.apply(this, 
-                                                                [firstPoint]);
-        
-        return added;
-    },
-    
-    /**
-     * APIMethod: removeComponent
-     * Removes a point from geometry components.
-     *
-     * Parameters:
-     * point - {<OpenLayers.Geometry.Point>}
-     *
-     * Returns: 
-     * {Boolean} The component was removed.
-     */
-    removeComponent: function(point) {
-        var removed = this.components && (this.components.length > 3);
-        if (removed) {
-            //remove last point
-            this.components.pop();
-            
-            //remove our point
-            OpenLayers.Geometry.Collection.prototype.removeComponent.apply(this, 
-                                                                    arguments);
-            //append copy of first point
-            var firstPoint = this.components[0];
-            OpenLayers.Geometry.Collection.prototype.addComponent.apply(this, 
-                                                                [firstPoint]);
-        }
-        return removed;
-    },
-    
-    /**
-     * APIMethod: move
-     * Moves a geometry by the given displacement along positive x and y axes.
-     *     This modifies the position of the geometry and clears the cached
-     *     bounds.
-     *
-     * Parameters:
-     * x - {Float} Distance to move geometry in positive x direction. 
-     * y - {Float} Distance to move geometry in positive y direction.
-     */
-    move: function(x, y) {
-        for(var i = 0, len=this.components.length; i<len - 1; i++) {
-            this.components[i].move(x, y);
-        }
-    },
-
-    /**
-     * APIMethod: rotate
-     * Rotate a geometry around some origin
-     *
-     * Parameters:
-     * angle - {Float} Rotation angle in degrees (measured counterclockwise
-     *                 from the positive x-axis)
-     * origin - {<OpenLayers.Geometry.Point>} Center point for the rotation
-     */
-    rotate: function(angle, origin) {
-        for(var i=0, len=this.components.length; i<len - 1; ++i) {
-            this.components[i].rotate(angle, origin);
-        }
-    },
-
-    /**
-     * APIMethod: resize
-     * Resize a geometry relative to some origin.  Use this method to apply
-     *     a uniform scaling to a geometry.
-     *
-     * Parameters:
-     * scale - {Float} Factor by which to scale the geometry.  A scale of 2
-     *                 doubles the size of the geometry in each dimension
-     *                 (lines, for example, will be twice as long, and polygons
-     *                 will have four times the area).
-     * origin - {<OpenLayers.Geometry.Point>} Point of origin for resizing
-     * ratio - {Float} Optional x:y ratio for resizing.  Default ratio is 1.
-     * 
-     * Returns:
-     * {<OpenLayers.Geometry>} - The current geometry. 
-     */
-    resize: function(scale, origin, ratio) {
-        for(var i=0, len=this.components.length; i<len - 1; ++i) {
-            this.components[i].resize(scale, origin, ratio);
-        }
-        return this;
-    },
-    
-    /**
-     * APIMethod: transform
-     * Reproject the components geometry from source to dest.
-     *
-     * Parameters:
-     * source - {<OpenLayers.Projection>}
-     * dest - {<OpenLayers.Projection>}
-     * 
-     * Returns:
-     * {<OpenLayers.Geometry>} 
-     */
-    transform: function(source, dest) {
-        if (source && dest) {
-            for (var i=0, len=this.components.length; i<len - 1; i++) {
-                var component = this.components[i];
-                component.transform(source, dest);
-            }
-            this.bounds = null;
-        }
-        return this;
-    },
-    
-    /**
-     * APIMethod: getCentroid
-     *
-     * Returns:
-     * {<OpenLayers.Geometry.Point>} The centroid of the collection
-     */
-    getCentroid: function() {
-        if (this.components) {
-            var len = this.components.length;
-            if (len > 0 && len <= 2) {
-                return this.components[0].clone();
-            } else if (len > 2) {
-                var sumX = 0.0;
-                var sumY = 0.0;
-                var x0 = this.components[0].x;
-                var y0 = this.components[0].y;
-                var area = -1 * this.getArea();
-                if (area != 0) {
-                    for (var i = 0; i < len - 1; i++) {
-                        var b = this.components[i];
-                        var c = this.components[i+1];
-                        sumX += (b.x + c.x - 2 * x0) * ((b.x - x0) * (c.y - y0) - (c.x - x0) * (b.y - y0));
-                        sumY += (b.y + c.y - 2 * y0) * ((b.x - x0) * (c.y - y0) - (c.x - x0) * (b.y - y0));
-                    }
-                    var x = x0 + sumX / (6 * area);
-                    var y = y0 + sumY / (6 * area);
-                } else {
-                    for (var i = 0; i < len - 1; i++) {
-                        sumX += this.components[i].x;
-                        sumY += this.components[i].y;
-                    }
-                    var x = sumX / (len - 1);
-                    var y = sumY / (len - 1);
-                }
-                return new OpenLayers.Geometry.Point(x, y);
-            } else {
-                return null;
-            }
-        }
-    },
-
-    /**
-     * APIMethod: getArea
-     * Note - The area is positive if the ring is oriented CW, otherwise
-     *         it will be negative.
-     * 
-     * Returns:
-     * {Float} The signed area for a ring.
-     */
-    getArea: function() {
-        var area = 0.0;
-        if ( this.components && (this.components.length > 2)) {
-            var sum = 0.0;
-            for (var i=0, len=this.components.length; i<len - 1; i++) {
-                var b = this.components[i];
-                var c = this.components[i+1];
-                sum += (b.x + c.x) * (c.y - b.y);
-            }
-            area = - sum / 2.0;
-        }
-        return area;
-    },
-    
-    /**
-     * APIMethod: getGeodesicArea
-     * Calculate the approximate area of the polygon were it projected onto
-     *     the earth.  Note that this area will be positive if ring is oriented
-     *     clockwise, otherwise it will be negative.
-     *
-     * Parameters:
-     * projection - {<OpenLayers.Projection>} The spatial reference system
-     *     for the geometry coordinates.  If not provided, Geographic/WGS84 is
-     *     assumed.
-     * 
-     * Reference:
-     * Robert. G. Chamberlain and William H. Duquette, "Some Algorithms for
-     *     Polygons on a Sphere", JPL Publication 07-03, Jet Propulsion
-     *     Laboratory, Pasadena, CA, June 2007 http://trs-new.jpl.nasa.gov/dspace/handle/2014/40409
-     *
-     * Returns:
-     * {float} The approximate signed geodesic area of the polygon in square
-     *     meters.
-     */
-    getGeodesicArea: function(projection) {
-        var ring = this;  // so we can work with a clone if needed
-        if(projection) {
-            var gg = new OpenLayers.Projection("EPSG:4326");
-            if(!gg.equals(projection)) {
-                ring = this.clone().transform(projection, gg);
-            }
-        }
-        var area = 0.0;
-        var len = ring.components && ring.components.length;
-        if(len > 2) {
-            var p1, p2;
-            for(var i=0; i<len-1; i++) {
-                p1 = ring.components[i];
-                p2 = ring.components[i+1];
-                area += OpenLayers.Util.rad(p2.x - p1.x) *
-                        (2 + Math.sin(OpenLayers.Util.rad(p1.y)) +
-                        Math.sin(OpenLayers.Util.rad(p2.y)));
-            }
-            area = area * 6378137.0 * 6378137.0 / 2.0;
-        }
-        return area;
-    },
-    
-    /**
-     * Method: containsPoint
-     * Test if a point is inside a linear ring.  For the case where a point
-     *     is coincident with a linear ring edge, returns 1.  Otherwise,
-     *     returns boolean.
-     *
-     * Parameters:
-     * point - {<OpenLayers.Geometry.Point>}
-     *
-     * Returns:
-     * {Boolean | Number} The point is inside the linear ring.  Returns 1 if
-     *     the point is coincident with an edge.  Returns boolean otherwise.
-     */
-    containsPoint: function(point) {
-        var approx = OpenLayers.Number.limitSigDigs;
-        var digs = 14;
-        var px = approx(point.x, digs);
-        var py = approx(point.y, digs);
-        function getX(y, x1, y1, x2, y2) {
-            return (y - y2) * ((x2 - x1) / (y2 - y1)) + x2;
-        }
-        var numSeg = this.components.length - 1;
-        var start, end, x1, y1, x2, y2, cx, cy;
-        var crosses = 0;
-        for(var i=0; i<numSeg; ++i) {
-            start = this.components[i];
-            x1 = approx(start.x, digs);
-            y1 = approx(start.y, digs);
-            end = this.components[i + 1];
-            x2 = approx(end.x, digs);
-            y2 = approx(end.y, digs);
-            
-            /**
-             * The following conditions enforce five edge-crossing rules:
-             *    1. points coincident with edges are considered contained;
-             *    2. an upward edge includes its starting endpoint, and
-             *    excludes its final endpoint;
-             *    3. a downward edge excludes its starting endpoint, and
-             *    includes its final endpoint;
-             *    4. horizontal edges are excluded; and
-             *    5. the edge-ray intersection point must be strictly right
-             *    of the point P.
-             */
-            if(y1 == y2) {
-                // horizontal edge
-                if(py == y1) {
-                    // point on horizontal line
-                    if(x1 <= x2 && (px >= x1 && px <= x2) || // right or vert
-                       x1 >= x2 && (px <= x1 && px >= x2)) { // left or vert
-                        // point on edge
-                        crosses = -1;
-                        break;
-                    }
-                }
-                // ignore other horizontal edges
-                continue;
-            }
-            cx = approx(getX(py, x1, y1, x2, y2), digs);
-            if(cx == px) {
-                // point on line
-                if(y1 < y2 && (py >= y1 && py <= y2) || // upward
-                   y1 > y2 && (py <= y1 && py >= y2)) { // downward
-                    // point on edge
-                    crosses = -1;
-                    break;
-                }
-            }
-            if(cx <= px) {
-                // no crossing to the right
-                continue;
-            }
-            if(x1 != x2 && (cx < Math.min(x1, x2) || cx > Math.max(x1, x2))) {
-                // no crossing
-                continue;
-            }
-            if(y1 < y2 && (py >= y1 && py < y2) || // upward
-               y1 > y2 && (py < y1 && py >= y2)) { // downward
-                ++crosses;
-            }
-        }
-        var contained = (crosses == -1) ?
-            // on edge
-            1 :
-            // even (out) or odd (in)
-            !!(crosses & 1);
-
-        return contained;
-    },
-
-    /**
-     * APIMethod: intersects
-     * Determine if the input geometry intersects this one.
-     *
-     * Parameters:
-     * geometry - {<OpenLayers.Geometry>} Any type of geometry.
-     *
-     * Returns:
-     * {Boolean} The input geometry intersects this one.
-     */
-    intersects: function(geometry) {
-        var intersect = false;
-        if(geometry.CLASS_NAME == "OpenLayers.Geometry.Point") {
-            intersect = this.containsPoint(geometry);
-        } else if(geometry.CLASS_NAME == "OpenLayers.Geometry.LineString") {
-            intersect = geometry.intersects(this);
-        } else if(geometry.CLASS_NAME == "OpenLayers.Geometry.LinearRing") {
-            intersect = OpenLayers.Geometry.LineString.prototype.intersects.apply(
-                this, [geometry]
-            );
-        } else {
-            // check for component intersections
-            for(var i=0, len=geometry.components.length; i<len; ++ i) {
-                intersect = geometry.components[i].intersects(this);
-                if(intersect) {
-                    break;
-                }
-            }
-        }
-        return intersect;
-    },
-
-    /**
-     * APIMethod: getVertices
-     * Return a list of all points in this geometry.
-     *
-     * Parameters:
-     * nodes - {Boolean} For lines, only return vertices that are
-     *     endpoints.  If false, for lines, only vertices that are not
-     *     endpoints will be returned.  If not provided, all vertices will
-     *     be returned.
-     *
-     * Returns:
-     * {Array} A list of all vertices in the geometry.
-     */
-    getVertices: function(nodes) {
-        return (nodes === true) ? [] : this.components.slice(0, this.components.length-1);
-    },
-
-    CLASS_NAME: "OpenLayers.Geometry.LinearRing"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Geometry/MultiLineString.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Geometry/MultiLineString.js
deleted file mode 100644
index 4e330b0e..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Geometry/MultiLineString.js
+++ /dev/null
@@ -1,258 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Geometry/Collection.js
- * @requires OpenLayers/Geometry/LineString.js
- */
-
-/**
- * Class: OpenLayers.Geometry.MultiLineString
- * A MultiLineString is a geometry with multiple <OpenLayers.Geometry.LineString>
- * components.
- * 
- * Inherits from:
- *  - <OpenLayers.Geometry.Collection>
- *  - <OpenLayers.Geometry> 
- */
-OpenLayers.Geometry.MultiLineString = OpenLayers.Class(
-  OpenLayers.Geometry.Collection, {
-
-    /**
-     * Property: componentTypes
-     * {Array(String)} An array of class names representing the types of
-     * components that the collection can include.  A null value means the
-     * component types are not restricted.
-     */
-    componentTypes: ["OpenLayers.Geometry.LineString"],
-
-    /**
-     * Constructor: OpenLayers.Geometry.MultiLineString
-     * Constructor for a MultiLineString Geometry.
-     *
-     * Parameters: 
-     * components - {Array(<OpenLayers.Geometry.LineString>)} 
-     *
-     */
-    
-    /**
-     * Method: split
-     * Use this geometry (the source) to attempt to split a target geometry.
-     * 
-     * Parameters:
-     * geometry - {<OpenLayers.Geometry>} The target geometry.
-     * options - {Object} Properties of this object will be used to determine
-     *     how the split is conducted.
-     *
-     * Valid options:
-     * mutual - {Boolean} Split the source geometry in addition to the target
-     *     geometry.  Default is false.
-     * edge - {Boolean} Allow splitting when only edges intersect.  Default is
-     *     true.  If false, a vertex on the source must be within the tolerance
-     *     distance of the intersection to be considered a split.
-     * tolerance - {Number} If a non-null value is provided, intersections
-     *     within the tolerance distance of an existing vertex on the source
-     *     will be assumed to occur at the vertex.
-     * 
-     * Returns:
-     * {Array} A list of geometries (of this same type as the target) that
-     *     result from splitting the target with the source geometry.  The
-     *     source and target geometry will remain unmodified.  If no split
-     *     results, null will be returned.  If mutual is true and a split
-     *     results, return will be an array of two arrays - the first will be
-     *     all geometries that result from splitting the source geometry and
-     *     the second will be all geometries that result from splitting the
-     *     target geometry.
-     */
-    split: function(geometry, options) {
-        var results = null;
-        var mutual = options && options.mutual;
-        var splits, sourceLine, sourceLines, sourceSplit, targetSplit;
-        var sourceParts = [];
-        var targetParts = [geometry];
-        for(var i=0, len=this.components.length; i<len; ++i) {
-            sourceLine = this.components[i];
-            sourceSplit = false;
-            for(var j=0; j < targetParts.length; ++j) { 
-                splits = sourceLine.split(targetParts[j], options);
-                if(splits) {
-                    if(mutual) {
-                        sourceLines = splits[0];
-                        for(var k=0, klen=sourceLines.length; k<klen; ++k) {
-                            if(k===0 && sourceParts.length) {
-                                sourceParts[sourceParts.length-1].addComponent(
-                                    sourceLines[k]
-                                );
-                            } else {
-                                sourceParts.push(
-                                    new OpenLayers.Geometry.MultiLineString([
-                                        sourceLines[k]
-                                    ])
-                                );
-                            }
-                        }
-                        sourceSplit = true;
-                        splits = splits[1];
-                    }
-                    if(splits.length) {
-                        // splice in new target parts
-                        splits.unshift(j, 1);
-                        Array.prototype.splice.apply(targetParts, splits);
-                        break;
-                    }
-                }
-            }
-            if(!sourceSplit) {
-                // source line was not hit
-                if(sourceParts.length) {
-                    // add line to existing multi
-                    sourceParts[sourceParts.length-1].addComponent(
-                        sourceLine.clone()
-                    );
-                } else {
-                    // create a fresh multi
-                    sourceParts = [
-                        new OpenLayers.Geometry.MultiLineString(
-                            sourceLine.clone()
-                        )
-                    ];
-                }
-            }
-        }
-        if(sourceParts && sourceParts.length > 1) {
-            sourceSplit = true;
-        } else {
-            sourceParts = [];
-        }
-        if(targetParts && targetParts.length > 1) {
-            targetSplit = true;
-        } else {
-            targetParts = [];
-        }
-        if(sourceSplit || targetSplit) {
-            if(mutual) {
-                results = [sourceParts, targetParts];
-            } else {
-                results = targetParts;
-            }
-        }
-        return results;
-    },
-    
-    /**
-     * Method: splitWith
-     * Split this geometry (the target) with the given geometry (the source).
-     *
-     * Parameters:
-     * geometry - {<OpenLayers.Geometry>} A geometry used to split this
-     *     geometry (the source).
-     * options - {Object} Properties of this object will be used to determine
-     *     how the split is conducted.
-     *
-     * Valid options:
-     * mutual - {Boolean} Split the source geometry in addition to the target
-     *     geometry.  Default is false.
-     * edge - {Boolean} Allow splitting when only edges intersect.  Default is
-     *     true.  If false, a vertex on the source must be within the tolerance
-     *     distance of the intersection to be considered a split.
-     * tolerance - {Number} If a non-null value is provided, intersections
-     *     within the tolerance distance of an existing vertex on the source
-     *     will be assumed to occur at the vertex.
-     * 
-     * Returns:
-     * {Array} A list of geometries (of this same type as the target) that
-     *     result from splitting the target with the source geometry.  The
-     *     source and target geometry will remain unmodified.  If no split
-     *     results, null will be returned.  If mutual is true and a split
-     *     results, return will be an array of two arrays - the first will be
-     *     all geometries that result from splitting the source geometry and
-     *     the second will be all geometries that result from splitting the
-     *     target geometry.
-     */
-    splitWith: function(geometry, options) {
-        var results = null;
-        var mutual = options && options.mutual;
-        var splits, targetLine, sourceLines, sourceSplit, targetSplit, sourceParts, targetParts;
-        if(geometry instanceof OpenLayers.Geometry.LineString) {
-            targetParts = [];
-            sourceParts = [geometry];
-            for(var i=0, len=this.components.length; i<len; ++i) {
-                targetSplit = false;
-                targetLine = this.components[i];
-                for(var j=0; j<sourceParts.length; ++j) {
-                    splits = sourceParts[j].split(targetLine, options);
-                    if(splits) {
-                        if(mutual) {
-                            sourceLines = splits[0];
-                            if(sourceLines.length) {
-                                // splice in new source parts
-                                sourceLines.unshift(j, 1);
-                                Array.prototype.splice.apply(sourceParts, sourceLines);
-                                j += sourceLines.length - 2;
-                            }
-                            splits = splits[1];
-                            if(splits.length === 0) {
-                                splits = [targetLine.clone()];
-                            }
-                        }
-                        for(var k=0, klen=splits.length; k<klen; ++k) {
-                            if(k===0 && targetParts.length) {
-                                targetParts[targetParts.length-1].addComponent(
-                                    splits[k]
-                                );
-                            } else {
-                                targetParts.push(
-                                    new OpenLayers.Geometry.MultiLineString([
-                                        splits[k]
-                                    ])
-                                );
-                            }
-                        }
-                        targetSplit = true;                    
-                    }
-                }
-                if(!targetSplit) {
-                    // target component was not hit
-                    if(targetParts.length) {
-                        // add it to any existing multi-line
-                        targetParts[targetParts.length-1].addComponent(
-                            targetLine.clone()
-                        );
-                    } else {
-                        // or start with a fresh multi-line
-                        targetParts = [
-                            new OpenLayers.Geometry.MultiLineString([
-                                targetLine.clone()
-                            ])
-                        ];
-                    }
-                    
-                }
-            }
-        } else {
-            results = geometry.split(this);
-        }
-        if(sourceParts && sourceParts.length > 1) {
-            sourceSplit = true;
-        } else {
-            sourceParts = [];
-        }
-        if(targetParts && targetParts.length > 1) {
-            targetSplit = true;
-        } else {
-            targetParts = [];
-        }
-        if(sourceSplit || targetSplit) {
-            if(mutual) {
-                results = [sourceParts, targetParts];
-            } else {
-                results = targetParts;
-            }
-        }
-        return results;
-    },
-
-    CLASS_NAME: "OpenLayers.Geometry.MultiLineString"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Geometry/MultiPoint.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Geometry/MultiPoint.js
deleted file mode 100644
index ed8ff67f..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Geometry/MultiPoint.js
+++ /dev/null
@@ -1,66 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Geometry/Collection.js
- * @requires OpenLayers/Geometry/Point.js
- */
-
-/**
- * Class: OpenLayers.Geometry.MultiPoint
- * MultiPoint is a collection of Points.  Create a new instance with the
- * <OpenLayers.Geometry.MultiPoint> constructor.
- *
- * Inherits from:
- *  - <OpenLayers.Geometry.Collection>
- *  - <OpenLayers.Geometry>
- */
-OpenLayers.Geometry.MultiPoint = OpenLayers.Class(
-  OpenLayers.Geometry.Collection, {
-
-    /**
-     * Property: componentTypes
-     * {Array(String)} An array of class names representing the types of
-     * components that the collection can include.  A null value means the
-     * component types are not restricted.
-     */
-    componentTypes: ["OpenLayers.Geometry.Point"],
-
-    /**
-     * Constructor: OpenLayers.Geometry.MultiPoint
-     * Create a new MultiPoint Geometry
-     *
-     * Parameters:
-     * components - {Array(<OpenLayers.Geometry.Point>)} 
-     *
-     * Returns:
-     * {<OpenLayers.Geometry.MultiPoint>}
-     */
-
-    /**
-     * APIMethod: addPoint
-     * Wrapper for <OpenLayers.Geometry.Collection.addComponent>
-     *
-     * Parameters:
-     * point - {<OpenLayers.Geometry.Point>} Point to be added
-     * index - {Integer} Optional index
-     */
-    addPoint: function(point, index) {
-        this.addComponent(point, index);
-    },
-    
-    /**
-     * APIMethod: removePoint
-     * Wrapper for <OpenLayers.Geometry.Collection.removeComponent>
-     *
-     * Parameters:
-     * point - {<OpenLayers.Geometry.Point>} Point to be removed
-     */
-    removePoint: function(point){
-        this.removeComponent(point);
-    },
-
-    CLASS_NAME: "OpenLayers.Geometry.MultiPoint"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Geometry/MultiPolygon.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Geometry/MultiPolygon.js
deleted file mode 100644
index d1e59dc0..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Geometry/MultiPolygon.js
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Geometry/Collection.js
- * @requires OpenLayers/Geometry/Polygon.js
- */
-
-/**
- * Class: OpenLayers.Geometry.MultiPolygon
- * MultiPolygon is a geometry with multiple <OpenLayers.Geometry.Polygon>
- * components.  Create a new instance with the <OpenLayers.Geometry.MultiPolygon>
- * constructor.
- * 
- * Inherits from:
- *  - <OpenLayers.Geometry.Collection>
- */
-OpenLayers.Geometry.MultiPolygon = OpenLayers.Class(
-  OpenLayers.Geometry.Collection, {
-
-    /**
-     * Property: componentTypes
-     * {Array(String)} An array of class names representing the types of
-     * components that the collection can include.  A null value means the
-     * component types are not restricted.
-     */
-    componentTypes: ["OpenLayers.Geometry.Polygon"],
-
-    /**
-     * Constructor: OpenLayers.Geometry.MultiPolygon
-     * Create a new MultiPolygon geometry
-     *
-     * Parameters:
-     * components - {Array(<OpenLayers.Geometry.Polygon>)} An array of polygons
-     *              used to generate the MultiPolygon
-     *
-     */
-
-    CLASS_NAME: "OpenLayers.Geometry.MultiPolygon"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Geometry/Point.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Geometry/Point.js
deleted file mode 100644
index 456956f6..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Geometry/Point.js
+++ /dev/null
@@ -1,283 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Geometry.js
- */
-
-/**
- * Class: OpenLayers.Geometry.Point
- * Point geometry class. 
- * 
- * Inherits from:
- *  - <OpenLayers.Geometry> 
- */
-OpenLayers.Geometry.Point = OpenLayers.Class(OpenLayers.Geometry, {
-
-    /** 
-     * APIProperty: x 
-     * {float} 
-     */
-    x: null,
-
-    /** 
-     * APIProperty: y 
-     * {float} 
-     */
-    y: null,
-
-    /**
-     * Constructor: OpenLayers.Geometry.Point
-     * Construct a point geometry.
-     *
-     * Parameters:
-     * x - {float} 
-     * y - {float}
-     * 
-     */
-    initialize: function(x, y) {
-        OpenLayers.Geometry.prototype.initialize.apply(this, arguments);
-        
-        this.x = parseFloat(x);
-        this.y = parseFloat(y);
-    },
-
-    /**
-     * APIMethod: clone
-     * 
-     * Returns:
-     * {<OpenLayers.Geometry.Point>} An exact clone of this OpenLayers.Geometry.Point
-     */
-    clone: function(obj) {
-        if (obj == null) {
-            obj = new OpenLayers.Geometry.Point(this.x, this.y);
-        }
-
-        // catch any randomly tagged-on properties
-        OpenLayers.Util.applyDefaults(obj, this);
-
-        return obj;
-    },
-
-    /** 
-     * Method: calculateBounds
-     * Create a new Bounds based on the lon/lat
-     */
-    calculateBounds: function () {
-        this.bounds = new OpenLayers.Bounds(this.x, this.y,
-                                            this.x, this.y);
-    },
-
-    /**
-     * APIMethod: distanceTo
-     * Calculate the closest distance between two geometries (on the x-y plane).
-     *
-     * Parameters:
-     * geometry - {<OpenLayers.Geometry>} The target geometry.
-     * options - {Object} Optional properties for configuring the distance
-     *     calculation.
-     *
-     * Valid options:
-     * details - {Boolean} Return details from the distance calculation.
-     *     Default is false.
-     * edge - {Boolean} Calculate the distance from this geometry to the
-     *     nearest edge of the target geometry.  Default is true.  If true,
-     *     calling distanceTo from a geometry that is wholly contained within
-     *     the target will result in a non-zero distance.  If false, whenever
-     *     geometries intersect, calling distanceTo will return 0.  If false,
-     *     details cannot be returned.
-     *
-     * Returns:
-     * {Number | Object} The distance between this geometry and the target.
-     *     If details is true, the return will be an object with distance,
-     *     x0, y0, x1, and x2 properties.  The x0 and y0 properties represent
-     *     the coordinates of the closest point on this geometry. The x1 and y1
-     *     properties represent the coordinates of the closest point on the
-     *     target geometry.
-     */
-    distanceTo: function(geometry, options) {
-        var edge = !(options && options.edge === false);
-        var details = edge && options && options.details;
-        var distance, x0, y0, x1, y1, result;
-        if(geometry instanceof OpenLayers.Geometry.Point) {
-            x0 = this.x;
-            y0 = this.y;
-            x1 = geometry.x;
-            y1 = geometry.y;
-            distance = Math.sqrt(Math.pow(x0 - x1, 2) + Math.pow(y0 - y1, 2));
-            result = !details ?
-                distance : {x0: x0, y0: y0, x1: x1, y1: y1, distance: distance};
-        } else {
-            result = geometry.distanceTo(this, options);
-            if(details) {
-                // switch coord order since this geom is target
-                result = {
-                    x0: result.x1, y0: result.y1,
-                    x1: result.x0, y1: result.y0,
-                    distance: result.distance
-                };
-            }
-        }
-        return result;
-    },
-    
-    /** 
-     * APIMethod: equals
-     * Determine whether another geometry is equivalent to this one.  Geometries
-     *     are considered equivalent if all components have the same coordinates.
-     * 
-     * Parameters:
-     * geom - {<OpenLayers.Geometry.Point>} The geometry to test. 
-     *
-     * Returns:
-     * {Boolean} The supplied geometry is equivalent to this geometry.
-     */
-    equals: function(geom) {
-        var equals = false;
-        if (geom != null) {
-            equals = ((this.x == geom.x && this.y == geom.y) ||
-                      (isNaN(this.x) && isNaN(this.y) && isNaN(geom.x) && isNaN(geom.y)));
-        }
-        return equals;
-    },
-    
-    /**
-     * Method: toShortString
-     *
-     * Returns:
-     * {String} Shortened String representation of Point object. 
-     *         (ex. <i>"5, 42"</i>)
-     */
-    toShortString: function() {
-        return (this.x + ", " + this.y);
-    },
-    
-    /**
-     * APIMethod: move
-     * Moves a geometry by the given displacement along positive x and y axes.
-     *     This modifies the position of the geometry and clears the cached
-     *     bounds.
-     *
-     * Parameters:
-     * x - {Float} Distance to move geometry in positive x direction. 
-     * y - {Float} Distance to move geometry in positive y direction.
-     */
-    move: function(x, y) {
-        this.x = this.x + x;
-        this.y = this.y + y;
-        this.clearBounds();
-    },
-
-    /**
-     * APIMethod: rotate
-     * Rotate a point around another.
-     *
-     * Parameters:
-     * angle - {Float} Rotation angle in degrees (measured counterclockwise
-     *                 from the positive x-axis)
-     * origin - {<OpenLayers.Geometry.Point>} Center point for the rotation
-     */
-    rotate: function(angle, origin) {
-        angle *= Math.PI / 180;
-        var radius = this.distanceTo(origin);
-        var theta = angle + Math.atan2(this.y - origin.y, this.x - origin.x);
-        this.x = origin.x + (radius * Math.cos(theta));
-        this.y = origin.y + (radius * Math.sin(theta));
-        this.clearBounds();
-    },
-    
-    /**
-     * APIMethod: getCentroid
-     *
-     * Returns:
-     * {<OpenLayers.Geometry.Point>} The centroid of the collection
-     */
-    getCentroid: function() {
-        return new OpenLayers.Geometry.Point(this.x, this.y);
-    },
-
-    /**
-     * APIMethod: resize
-     * Resize a point relative to some origin.  For points, this has the effect
-     *     of scaling a vector (from the origin to the point).  This method is
-     *     more useful on geometry collection subclasses.
-     *
-     * Parameters:
-     * scale - {Float} Ratio of the new distance from the origin to the old
-     *                 distance from the origin.  A scale of 2 doubles the
-     *                 distance between the point and origin.
-     * origin - {<OpenLayers.Geometry.Point>} Point of origin for resizing
-     * ratio - {Float} Optional x:y ratio for resizing.  Default ratio is 1.
-     * 
-     * Returns:
-     * {<OpenLayers.Geometry>} - The current geometry. 
-     */
-    resize: function(scale, origin, ratio) {
-        ratio = (ratio == undefined) ? 1 : ratio;
-        this.x = origin.x + (scale * ratio * (this.x - origin.x));
-        this.y = origin.y + (scale * (this.y - origin.y));
-        this.clearBounds();
-        return this;
-    },
-    
-    /**
-     * APIMethod: intersects
-     * Determine if the input geometry intersects this one.
-     *
-     * Parameters:
-     * geometry - {<OpenLayers.Geometry>} Any type of geometry.
-     *
-     * Returns:
-     * {Boolean} The input geometry intersects this one.
-     */
-    intersects: function(geometry) {
-        var intersect = false;
-        if(geometry.CLASS_NAME == "OpenLayers.Geometry.Point") {
-            intersect = this.equals(geometry);
-        } else {
-            intersect = geometry.intersects(this);
-        }
-        return intersect;
-    },
-    
-    /**
-     * APIMethod: transform
-     * Translate the x,y properties of the point from source to dest.
-     * 
-     * Parameters:
-     * source - {<OpenLayers.Projection>} 
-     * dest - {<OpenLayers.Projection>}
-     * 
-     * Returns:
-     * {<OpenLayers.Geometry>} 
-     */
-    transform: function(source, dest) {
-        if ((source && dest)) {
-            OpenLayers.Projection.transform(
-                this, source, dest); 
-            this.bounds = null;
-        }       
-        return this;
-    },
-
-    /**
-     * APIMethod: getVertices
-     * Return a list of all points in this geometry.
-     *
-     * Parameters:
-     * nodes - {Boolean} For lines, only return vertices that are
-     *     endpoints.  If false, for lines, only vertices that are not
-     *     endpoints will be returned.  If not provided, all vertices will
-     *     be returned.
-     *
-     * Returns:
-     * {Array} A list of all vertices in the geometry.
-     */
-    getVertices: function(nodes) {
-        return [this];
-    },
-
-    CLASS_NAME: "OpenLayers.Geometry.Point"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Geometry/Polygon.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Geometry/Polygon.js
deleted file mode 100644
index 6aaff1fb..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Geometry/Polygon.js
+++ /dev/null
@@ -1,255 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Geometry/Collection.js
- * @requires OpenLayers/Geometry/LinearRing.js
- */
-
-/**
- * Class: OpenLayers.Geometry.Polygon 
- * Polygon is a collection of Geometry.LinearRings. 
- * 
- * Inherits from:
- *  - <OpenLayers.Geometry.Collection> 
- *  - <OpenLayers.Geometry> 
- */
-OpenLayers.Geometry.Polygon = OpenLayers.Class(
-  OpenLayers.Geometry.Collection, {
-
-    /**
-     * Property: componentTypes
-     * {Array(String)} An array of class names representing the types of
-     * components that the collection can include.  A null value means the
-     * component types are not restricted.
-     */
-    componentTypes: ["OpenLayers.Geometry.LinearRing"],
-
-    /**
-     * Constructor: OpenLayers.Geometry.Polygon
-     * Constructor for a Polygon geometry. 
-     * The first ring (this.component[0])is the outer bounds of the polygon and 
-     * all subsequent rings (this.component[1-n]) are internal holes.
-     *
-     *
-     * Parameters:
-     * components - {Array(<OpenLayers.Geometry.LinearRing>)} 
-     */
-
-    /** 
-     * APIMethod: getArea
-     * Calculated by subtracting the areas of the internal holes from the 
-     *   area of the outer hole.
-     * 
-     * Returns:
-     * {float} The area of the geometry
-     */
-    getArea: function() {
-        var area = 0.0;
-        if ( this.components && (this.components.length > 0)) {
-            area += Math.abs(this.components[0].getArea());
-            for (var i=1, len=this.components.length; i<len; i++) {
-                area -= Math.abs(this.components[i].getArea());
-            }
-        }
-        return area;
-    },
-
-    /** 
-     * APIMethod: getGeodesicArea
-     * Calculate the approximate area of the polygon were it projected onto
-     *     the earth.
-     *
-     * Parameters:
-     * projection - {<OpenLayers.Projection>} The spatial reference system
-     *     for the geometry coordinates.  If not provided, Geographic/WGS84 is
-     *     assumed.
-     * 
-     * Reference:
-     * Robert. G. Chamberlain and William H. Duquette, "Some Algorithms for
-     *     Polygons on a Sphere", JPL Publication 07-03, Jet Propulsion
-     *     Laboratory, Pasadena, CA, June 2007 http://trs-new.jpl.nasa.gov/dspace/handle/2014/40409
-     *
-     * Returns:
-     * {float} The approximate geodesic area of the polygon in square meters.
-     */
-    getGeodesicArea: function(projection) {
-        var area = 0.0;
-        if(this.components && (this.components.length > 0)) {
-            area += Math.abs(this.components[0].getGeodesicArea(projection));
-            for(var i=1, len=this.components.length; i<len; i++) {
-                area -= Math.abs(this.components[i].getGeodesicArea(projection));
-            }
-        }
-        return area;
-    },
-
-    /**
-     * Method: containsPoint
-     * Test if a point is inside a polygon.  Points on a polygon edge are
-     *     considered inside.
-     *
-     * Parameters:
-     * point - {<OpenLayers.Geometry.Point>}
-     *
-     * Returns:
-     * {Boolean | Number} The point is inside the polygon.  Returns 1 if the
-     *     point is on an edge.  Returns boolean otherwise.
-     */
-    containsPoint: function(point) {
-        var numRings = this.components.length;
-        var contained = false;
-        if(numRings > 0) {
-            // check exterior ring - 1 means on edge, boolean otherwise
-            contained = this.components[0].containsPoint(point);
-            if(contained !== 1) {
-                if(contained && numRings > 1) {
-                    // check interior rings
-                    var hole;
-                    for(var i=1; i<numRings; ++i) {
-                        hole = this.components[i].containsPoint(point);
-                        if(hole) {
-                            if(hole === 1) {
-                                // on edge
-                                contained = 1;
-                            } else {
-                                // in hole
-                                contained = false;
-                            }                            
-                            break;
-                        }
-                    }
-                }
-            }
-        }
-        return contained;
-    },
-
-    /**
-     * APIMethod: intersects
-     * Determine if the input geometry intersects this one.
-     *
-     * Parameters:
-     * geometry - {<OpenLayers.Geometry>} Any type of geometry.
-     *
-     * Returns:
-     * {Boolean} The input geometry intersects this one.
-     */
-    intersects: function(geometry) {
-        var intersect = false;
-        var i, len;
-        if(geometry.CLASS_NAME == "OpenLayers.Geometry.Point") {
-            intersect = this.containsPoint(geometry);
-        } else if(geometry.CLASS_NAME == "OpenLayers.Geometry.LineString" ||
-                  geometry.CLASS_NAME == "OpenLayers.Geometry.LinearRing") {
-            // check if rings/linestrings intersect
-            for(i=0, len=this.components.length; i<len; ++i) {
-                intersect = geometry.intersects(this.components[i]);
-                if(intersect) {
-                    break;
-                }
-            }
-            if(!intersect) {
-                // check if this poly contains points of the ring/linestring
-                for(i=0, len=geometry.components.length; i<len; ++i) {
-                    intersect = this.containsPoint(geometry.components[i]);
-                    if(intersect) {
-                        break;
-                    }
-                }
-            }
-        } else {
-            for(i=0, len=geometry.components.length; i<len; ++ i) {
-                intersect = this.intersects(geometry.components[i]);
-                if(intersect) {
-                    break;
-                }
-            }
-        }
-        // check case where this poly is wholly contained by another
-        if(!intersect && geometry.CLASS_NAME == "OpenLayers.Geometry.Polygon") {
-            // exterior ring points will be contained in the other geometry
-            var ring = this.components[0];
-            for(i=0, len=ring.components.length; i<len; ++i) {
-                intersect = geometry.containsPoint(ring.components[i]);
-                if(intersect) {
-                    break;
-                }
-            }
-        }
-        return intersect;
-    },
-
-    /**
-     * APIMethod: distanceTo
-     * Calculate the closest distance between two geometries (on the x-y plane).
-     *
-     * Parameters:
-     * geometry - {<OpenLayers.Geometry>} The target geometry.
-     * options - {Object} Optional properties for configuring the distance
-     *     calculation.
-     *
-     * Valid options:
-     * details - {Boolean} Return details from the distance calculation.
-     *     Default is false.
-     * edge - {Boolean} Calculate the distance from this geometry to the
-     *     nearest edge of the target geometry.  Default is true.  If true,
-     *     calling distanceTo from a geometry that is wholly contained within
-     *     the target will result in a non-zero distance.  If false, whenever
-     *     geometries intersect, calling distanceTo will return 0.  If false,
-     *     details cannot be returned.
-     *
-     * Returns:
-     * {Number | Object} The distance between this geometry and the target.
-     *     If details is true, the return will be an object with distance,
-     *     x0, y0, x1, and y1 properties.  The x0 and y0 properties represent
-     *     the coordinates of the closest point on this geometry. The x1 and y1
-     *     properties represent the coordinates of the closest point on the
-     *     target geometry.
-     */
-    distanceTo: function(geometry, options) {
-        var edge = !(options && options.edge === false);
-        var result;
-        // this is the case where we might not be looking for distance to edge
-        if(!edge && this.intersects(geometry)) {
-            result = 0;
-        } else {
-            result = OpenLayers.Geometry.Collection.prototype.distanceTo.apply(
-                this, [geometry, options]
-            );
-        }
-        return result;
-    },
-
-    CLASS_NAME: "OpenLayers.Geometry.Polygon"
-});
-
-/**
- * APIMethod: createRegularPolygon
- * Create a regular polygon around a radius. Useful for creating circles 
- * and the like.
- *
- * Parameters:
- * origin - {<OpenLayers.Geometry.Point>} center of polygon.
- * radius - {Float} distance to vertex, in map units.
- * sides - {Integer} Number of sides. 20 approximates a circle.
- * rotation - {Float} original angle of rotation, in degrees.
- */
-OpenLayers.Geometry.Polygon.createRegularPolygon = function(origin, radius, sides, rotation) {  
-    var angle = Math.PI * ((1/sides) - (1/2));
-    if(rotation) {
-        angle += (rotation / 180) * Math.PI;
-    }
-    var rotatedAngle, x, y;
-    var points = [];
-    for(var i=0; i<sides; ++i) {
-        rotatedAngle = angle + (i * 2 * Math.PI / sides);
-        x = origin.x + (radius * Math.cos(rotatedAngle));
-        y = origin.y + (radius * Math.sin(rotatedAngle));
-        points.push(new OpenLayers.Geometry.Point(x, y));
-    }
-    var ring = new OpenLayers.Geometry.LinearRing(points);
-    return new OpenLayers.Geometry.Polygon([ring]);
-};
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Handler.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Handler.js
deleted file mode 100644
index 0fef88e5..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Handler.js
+++ /dev/null
@@ -1,325 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/BaseTypes/Class.js
- * @requires OpenLayers/Events.js
- */
-
-/**
- * Class: OpenLayers.Handler
- * Base class to construct a higher-level handler for event sequences.  All
- *     handlers have activate and deactivate methods.  In addition, they have
- *     methods named like browser events.  When a handler is activated, any
- *     additional methods named like a browser event is registered as a
- *     listener for the corresponding event.  When a handler is deactivated,
- *     those same methods are unregistered as event listeners.
- *
- * Handlers also typically have a callbacks object with keys named like
- *     the abstracted events or event sequences that they are in charge of
- *     handling.  The controls that wrap handlers define the methods that
- *     correspond to these abstract events - so instead of listening for
- *     individual browser events, they only listen for the abstract events
- *     defined by the handler.
- *     
- * Handlers are created by controls, which ultimately have the responsibility
- *     of making changes to the the state of the application.  Handlers
- *     themselves may make temporary changes, but in general are expected to
- *     return the application in the same state that they found it.
- */
-OpenLayers.Handler = OpenLayers.Class({
-
-    /**
-     * Property: id
-     * {String}
-     */
-    id: null,
-        
-    /**
-     * APIProperty: control
-     * {<OpenLayers.Control>}. The control that initialized this handler.  The
-     *     control is assumed to have a valid map property - that map is used
-     *     in the handler's own setMap method.
-     */
-    control: null,
-
-    /**
-     * Property: map
-     * {<OpenLayers.Map>}
-     */
-    map: null,
-
-    /**
-     * APIProperty: keyMask
-     * {Integer} Use bitwise operators and one or more of the OpenLayers.Handler
-     *     constants to construct a keyMask.  The keyMask is used by
-     *     <checkModifiers>.  If the keyMask matches the combination of keys
-     *     down on an event, checkModifiers returns true.
-     *
-     * Example:
-     * (code)
-     *     // handler only responds if the Shift key is down
-     *     handler.keyMask = OpenLayers.Handler.MOD_SHIFT;
-     *
-     *     // handler only responds if Ctrl-Shift is down
-     *     handler.keyMask = OpenLayers.Handler.MOD_SHIFT |
-     *                       OpenLayers.Handler.MOD_CTRL;
-     * (end)
-     */
-    keyMask: null,
-
-    /**
-     * Property: active
-     * {Boolean}
-     */
-    active: false,
-    
-    /**
-     * Property: evt
-     * {Event} This property references the last event handled by the handler.
-     *     Note that this property is not part of the stable API.  Use of the
-     *     evt property should be restricted to controls in the library
-     *     or other applications that are willing to update with changes to
-     *     the OpenLayers code.
-     */
-    evt: null,
-    
-    /**
-     * Property: touch
-     * {Boolean} Indicates the support of touch events. When touch events are 
-     *     started touch will be true and all mouse related listeners will do 
-     *     nothing.
-     */
-    touch: false,
-
-    /**
-     * Constructor: OpenLayers.Handler
-     * Construct a handler.
-     *
-     * Parameters:
-     * control - {<OpenLayers.Control>} The control that initialized this
-     *     handler.  The control is assumed to have a valid map property; that
-     *     map is used in the handler's own setMap method.  If a map property
-     *     is present in the options argument it will be used instead.
-     * callbacks - {Object} An object whose properties correspond to abstracted
-     *     events or sequences of browser events.  The values for these
-     *     properties are functions defined by the control that get called by
-     *     the handler.
-     * options - {Object} An optional object whose properties will be set on
-     *     the handler.
-     */
-    initialize: function(control, callbacks, options) {
-        OpenLayers.Util.extend(this, options);
-        this.control = control;
-        this.callbacks = callbacks;
-
-        var map = this.map || control.map;
-        if (map) {
-            this.setMap(map); 
-        }
-        
-        this.id = OpenLayers.Util.createUniqueID(this.CLASS_NAME + "_");
-    },
-    
-    /**
-     * Method: setMap
-     */
-    setMap: function (map) {
-        this.map = map;
-    },
-
-    /**
-     * Method: checkModifiers
-     * Check the keyMask on the handler.  If no <keyMask> is set, this always
-     *     returns true.  If a <keyMask> is set and it matches the combination
-     *     of keys down on an event, this returns true.
-     *
-     * Returns:
-     * {Boolean} The keyMask matches the keys down on an event.
-     */
-    checkModifiers: function (evt) {
-        if(this.keyMask == null) {
-            return true;
-        }
-        /* calculate the keyboard modifier mask for this event */
-        var keyModifiers =
-            (evt.shiftKey ? OpenLayers.Handler.MOD_SHIFT : 0) |
-            (evt.ctrlKey  ? OpenLayers.Handler.MOD_CTRL  : 0) |
-            (evt.altKey   ? OpenLayers.Handler.MOD_ALT   : 0) |
-            (evt.metaKey  ? OpenLayers.Handler.MOD_META  : 0);
-    
-        /* if it differs from the handler object's key mask,
-           bail out of the event handler */
-        return (keyModifiers == this.keyMask);
-    },
-
-    /**
-     * APIMethod: activate
-     * Turn on the handler.  Returns false if the handler was already active.
-     * 
-     * Returns: 
-     * {Boolean} The handler was activated.
-     */
-    activate: function() {
-        if(this.active) {
-            return false;
-        }
-        // register for event handlers defined on this class.
-        var events = OpenLayers.Events.prototype.BROWSER_EVENTS;
-        for (var i=0, len=events.length; i<len; i++) {
-            if (this[events[i]]) {
-                this.register(events[i], this[events[i]]); 
-            }
-        } 
-        this.active = true;
-        return true;
-    },
-    
-    /**
-     * APIMethod: deactivate
-     * Turn off the handler.  Returns false if the handler was already inactive.
-     * 
-     * Returns:
-     * {Boolean} The handler was deactivated.
-     */
-    deactivate: function() {
-        if(!this.active) {
-            return false;
-        }
-        // unregister event handlers defined on this class.
-        var events = OpenLayers.Events.prototype.BROWSER_EVENTS;
-        for (var i=0, len=events.length; i<len; i++) {
-            if (this[events[i]]) {
-                this.unregister(events[i], this[events[i]]); 
-            }
-        } 
-        this.touch = false;
-        this.active = false;
-        return true;
-    },
-
-    /**
-     * Method: startTouch
-     * Start touch events, this method must be called by subclasses in 
-     *     "touchstart" method. When touch events are started <touch> will be
-     *     true and all mouse related listeners will do nothing.
-     */
-    startTouch: function() {
-        if (!this.touch) {
-            this.touch = true;
-            var events = [
-                "mousedown", "mouseup", "mousemove", "click", "dblclick",
-                "mouseout"
-            ];
-            for (var i=0, len=events.length; i<len; i++) {
-                if (this[events[i]]) {
-                    this.unregister(events[i], this[events[i]]); 
-                }
-            } 
-        }
-    },
-
-    /**
-    * Method: callback
-    * Trigger the control's named callback with the given arguments
-    *
-    * Parameters:
-    * name - {String} The key for the callback that is one of the properties
-    *     of the handler's callbacks object.
-    * args - {Array(*)} An array of arguments (any type) with which to call 
-    *     the callback (defined by the control).
-    */
-    callback: function (name, args) {
-        if (name && this.callbacks[name]) {
-            this.callbacks[name].apply(this.control, args);
-        }
-    },
-
-    /**
-    * Method: register
-    * register an event on the map
-    */
-    register: function (name, method) {
-        // TODO: deal with registerPriority in 3.0
-        this.map.events.registerPriority(name, this, method);
-        this.map.events.registerPriority(name, this, this.setEvent);
-    },
-
-    /**
-    * Method: unregister
-    * unregister an event from the map
-    */
-    unregister: function (name, method) {
-        this.map.events.unregister(name, this, method);   
-        this.map.events.unregister(name, this, this.setEvent);
-    },
-    
-    /**
-     * Method: setEvent
-     * With each registered browser event, the handler sets its own evt
-     *     property.  This property can be accessed by controls if needed
-     *     to get more information about the event that the handler is
-     *     processing.
-     *
-     * This allows modifier keys on the event to be checked (alt, shift, ctrl,
-     *     and meta cannot be checked with the keyboard handler).  For a
-     *     control to determine which modifier keys are associated with the
-     *     event that a handler is currently processing, it should access
-     *     (code)handler.evt.altKey || handler.evt.shiftKey ||
-     *     handler.evt.ctrlKey || handler.evt.metaKey(end).
-     *
-     * Parameters:
-     * evt - {Event} The browser event.
-     */
-    setEvent: function(evt) {
-        this.evt = evt;
-        return true;
-    },
-
-    /**
-     * Method: destroy
-     * Deconstruct the handler.
-     */
-    destroy: function () {
-        // unregister event listeners
-        this.deactivate();
-        // eliminate circular references
-        this.control = this.map = null;        
-    },
-
-    CLASS_NAME: "OpenLayers.Handler"
-});
-
-/**
- * Constant: OpenLayers.Handler.MOD_NONE
- * If set as the <keyMask>, <checkModifiers> returns false if any key is down.
- */
-OpenLayers.Handler.MOD_NONE  = 0;
-
-/**
- * Constant: OpenLayers.Handler.MOD_SHIFT
- * If set as the <keyMask>, <checkModifiers> returns false if Shift is down.
- */
-OpenLayers.Handler.MOD_SHIFT = 1;
-
-/**
- * Constant: OpenLayers.Handler.MOD_CTRL
- * If set as the <keyMask>, <checkModifiers> returns false if Ctrl is down.
- */
-OpenLayers.Handler.MOD_CTRL  = 2;
-
-/**
- * Constant: OpenLayers.Handler.MOD_ALT
- * If set as the <keyMask>, <checkModifiers> returns false if Alt is down.
- */
-OpenLayers.Handler.MOD_ALT   = 4;
-
-/**
- * Constant: OpenLayers.Handler.MOD_META
- * If set as the <keyMask>, <checkModifiers> returns false if Cmd is down.
- */
-OpenLayers.Handler.MOD_META  = 8;
-
-
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Handler/Box.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Handler/Box.js
deleted file mode 100644
index 9d3289aa..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Handler/Box.js
+++ /dev/null
@@ -1,244 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Handler.js
- * @requires OpenLayers/Handler/Drag.js
- */
-
-/**
- * Class: OpenLayers.Handler.Box
- * Handler for dragging a rectangle across the map.  Box is displayed 
- * on mouse down, moves on mouse move, and is finished on mouse up.
- *
- * Inherits from:
- *  - <OpenLayers.Handler> 
- */
-OpenLayers.Handler.Box = OpenLayers.Class(OpenLayers.Handler, {
-
-    /** 
-     * Property: dragHandler 
-     * {<OpenLayers.Handler.Drag>} 
-     */
-    dragHandler: null,
-
-    /**
-     * APIProperty: boxDivClassName
-     * {String} The CSS class to use for drawing the box. Default is
-     *     olHandlerBoxZoomBox
-     */
-    boxDivClassName: 'olHandlerBoxZoomBox',
-    
-    /**
-     * Property: boxOffsets
-     * {Object} Caches box offsets from css. This is used by the getBoxOffsets
-     * method.
-     */
-    boxOffsets: null,
-
-    /**
-     * Constructor: OpenLayers.Handler.Box
-     *
-     * Parameters:
-     * control - {<OpenLayers.Control>} 
-     * callbacks - {Object} An object with a properties whose values are
-     *     functions.  Various callbacks described below.
-     * options - {Object} 
-     *
-     * Named callbacks:
-     * start - Called when the box drag operation starts.
-     * done - Called when the box drag operation is finished.
-     *     The callback should expect to receive a single argument, the box 
-     *     bounds or a pixel. If the box dragging didn't span more than a 5 
-     *     pixel distance, a pixel will be returned instead of a bounds object.
-     */
-    initialize: function(control, callbacks, options) {
-        OpenLayers.Handler.prototype.initialize.apply(this, arguments);
-        this.dragHandler = new OpenLayers.Handler.Drag(
-            this, 
-            {
-                down: this.startBox, 
-                move: this.moveBox, 
-                out: this.removeBox,
-                up: this.endBox
-            }, 
-            {keyMask: this.keyMask}
-        );
-    },
-
-    /**
-     * Method: destroy
-     */
-    destroy: function() {
-        OpenLayers.Handler.prototype.destroy.apply(this, arguments);
-        if (this.dragHandler) {
-            this.dragHandler.destroy();
-            this.dragHandler = null;
-        }            
-    },
-
-    /**
-     * Method: setMap
-     */
-    setMap: function (map) {
-        OpenLayers.Handler.prototype.setMap.apply(this, arguments);
-        if (this.dragHandler) {
-            this.dragHandler.setMap(map);
-        }
-    },
-
-    /**
-    * Method: startBox
-    *
-    * Parameters:
-    * xy - {<OpenLayers.Pixel>}
-    */
-    startBox: function (xy) {
-        this.callback("start", []);
-        this.zoomBox = OpenLayers.Util.createDiv('zoomBox', {
-            x: -9999, y: -9999
-        });
-        this.zoomBox.className = this.boxDivClassName;                                         
-        this.zoomBox.style.zIndex = this.map.Z_INDEX_BASE["Popup"] - 1;
-        
-        this.map.viewPortDiv.appendChild(this.zoomBox);
-        
-        OpenLayers.Element.addClass(
-            this.map.viewPortDiv, "olDrawBox"
-        );
-    },
-
-    /**
-    * Method: moveBox
-    */
-    moveBox: function (xy) {
-        var startX = this.dragHandler.start.x;
-        var startY = this.dragHandler.start.y;
-        var deltaX = Math.abs(startX - xy.x);
-        var deltaY = Math.abs(startY - xy.y);
-
-        var offset = this.getBoxOffsets();
-        this.zoomBox.style.width = (deltaX + offset.width + 1) + "px";
-        this.zoomBox.style.height = (deltaY + offset.height + 1) + "px";
-        this.zoomBox.style.left = (xy.x < startX ?
-            startX - deltaX - offset.left : startX - offset.left) + "px";
-        this.zoomBox.style.top = (xy.y < startY ?
-            startY - deltaY - offset.top : startY - offset.top) + "px";
-    },
-
-    /**
-    * Method: endBox
-    */
-    endBox: function(end) {
-        var result;
-        if (Math.abs(this.dragHandler.start.x - end.x) > 5 ||    
-            Math.abs(this.dragHandler.start.y - end.y) > 5) {   
-            var start = this.dragHandler.start;
-            var top = Math.min(start.y, end.y);
-            var bottom = Math.max(start.y, end.y);
-            var left = Math.min(start.x, end.x);
-            var right = Math.max(start.x, end.x);
-            result = new OpenLayers.Bounds(left, bottom, right, top);
-        } else {
-            result = this.dragHandler.start.clone(); // i.e. OL.Pixel
-        } 
-        this.removeBox();
-
-        this.callback("done", [result]);
-    },
-
-    /**
-     * Method: removeBox
-     * Remove the zoombox from the screen and nullify our reference to it.
-     */
-    removeBox: function() {
-        this.map.viewPortDiv.removeChild(this.zoomBox);
-        this.zoomBox = null;
-        this.boxOffsets = null;
-        OpenLayers.Element.removeClass(
-            this.map.viewPortDiv, "olDrawBox"
-        );
-
-    },
-
-    /**
-     * Method: activate
-     */
-    activate: function () {
-        if (OpenLayers.Handler.prototype.activate.apply(this, arguments)) {
-            this.dragHandler.activate();
-            return true;
-        } else {
-            return false;
-        }
-    },
-
-    /**
-     * Method: deactivate
-     */
-    deactivate: function () {
-        if (OpenLayers.Handler.prototype.deactivate.apply(this, arguments)) {
-            if (this.dragHandler.deactivate()) {
-                if (this.zoomBox) {
-                    this.removeBox();
-                }
-            }
-            return true;
-        } else {
-            return false;
-        }
-    },
-    
-    /**
-     * Method: getBoxOffsets
-     * Determines border offsets for a box, according to the box model.
-     * 
-     * Returns:
-     * {Object} an object with the following offsets:
-     *     - left
-     *     - right
-     *     - top
-     *     - bottom
-     *     - width
-     *     - height
-     */
-    getBoxOffsets: function() {
-        if (!this.boxOffsets) {
-            // Determine the box model. If the testDiv's clientWidth is 3, then
-            // the borders are outside and we are dealing with the w3c box
-            // model. Otherwise, the browser uses the traditional box model and
-            // the borders are inside the box bounds, leaving us with a
-            // clientWidth of 1.
-            var testDiv = document.createElement("div");
-            //testDiv.style.visibility = "hidden";
-            testDiv.style.position = "absolute";
-            testDiv.style.border = "1px solid black";
-            testDiv.style.width = "3px";
-            document.body.appendChild(testDiv);
-            var w3cBoxModel = testDiv.clientWidth == 3;
-            document.body.removeChild(testDiv);
-            
-            var left = parseInt(OpenLayers.Element.getStyle(this.zoomBox,
-                "border-left-width"));
-            var right = parseInt(OpenLayers.Element.getStyle(
-                this.zoomBox, "border-right-width"));
-            var top = parseInt(OpenLayers.Element.getStyle(this.zoomBox,
-                "border-top-width"));
-            var bottom = parseInt(OpenLayers.Element.getStyle(
-                this.zoomBox, "border-bottom-width"));
-            this.boxOffsets = {
-                left: left,
-                right: right,
-                top: top,
-                bottom: bottom,
-                width: w3cBoxModel === false ? left + right : 0,
-                height: w3cBoxModel === false ? top + bottom : 0
-            };
-        }
-        return this.boxOffsets;
-    },
-  
-    CLASS_NAME: "OpenLayers.Handler.Box"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Handler/Click.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Handler/Click.js
deleted file mode 100644
index 94a8444e..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Handler/Click.js
+++ /dev/null
@@ -1,505 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Handler.js
- */
-
-/**
- * Class: OpenLayers.Handler.Click
- * A handler for mouse clicks.  The intention of this handler is to give
- *     controls more flexibility with handling clicks.  Browsers trigger
- *     click events twice for a double-click.  In addition, the mousedown,
- *     mousemove, mouseup sequence fires a click event.  With this handler,
- *     controls can decide whether to ignore clicks associated with a double
- *     click.  By setting a <pixelTolerance>, controls can also ignore clicks
- *     that include a drag.  Create a new instance with the
- *     <OpenLayers.Handler.Click> constructor.
- * 
- * Inherits from:
- *  - <OpenLayers.Handler> 
- */
-OpenLayers.Handler.Click = OpenLayers.Class(OpenLayers.Handler, {
-    /**
-     * APIProperty: delay
-     * {Number} Number of milliseconds between clicks before the event is
-     *     considered a double-click.
-     */
-    delay: 300,
-    
-    /**
-     * APIProperty: single
-     * {Boolean} Handle single clicks.  Default is true.  If false, clicks
-     * will not be reported.  If true, single-clicks will be reported.
-     */
-    single: true,
-    
-    /**
-     * APIProperty: double
-     * {Boolean} Handle double-clicks.  Default is false.
-     */
-    'double': false,
-    
-    /**
-     * APIProperty: pixelTolerance
-     * {Number} Maximum number of pixels between mouseup and mousedown for an
-     *     event to be considered a click.  Default is 0.  If set to an
-     *     integer value, clicks with a drag greater than the value will be
-     *     ignored.  This property can only be set when the handler is
-     *     constructed.
-     */
-    pixelTolerance: 0,
-        
-    /**
-     * APIProperty: dblclickTolerance
-     * {Number} Maximum distance in pixels between clicks for a sequence of 
-     *     events to be considered a double click.  Default is 13.  If the
-     *     distance between two clicks is greater than this value, a double-
-     *     click will not be fired.
-     */
-    dblclickTolerance: 13,
-        
-    /**
-     * APIProperty: stopSingle
-     * {Boolean} Stop other listeners from being notified of clicks.  Default
-     *     is false.  If true, any listeners registered before this one for 
-     *     click or rightclick events will not be notified.
-     */
-    stopSingle: false,
-    
-    /**
-     * APIProperty: stopDouble
-     * {Boolean} Stop other listeners from being notified of double-clicks.
-     *     Default is false.  If true, any click listeners registered before
-     *     this one will not be notified of *any* double-click events.
-     * 
-     * The one caveat with stopDouble is that given a map with two click
-     *     handlers, one with stopDouble true and the other with stopSingle
-     *     true, the stopSingle handler should be activated last to get
-     *     uniform cross-browser performance.  Since IE triggers one click
-     *     with a dblclick and FF triggers two, if a stopSingle handler is
-     *     activated first, all it gets in IE is a single click when the
-     *     second handler stops propagation on the dblclick.
-     */
-    stopDouble: false,
-
-    /**
-     * Property: timerId
-     * {Number} The id of the timeout waiting to clear the <delayedCall>.
-     */
-    timerId: null,
-    
-    /**
-     * Property: down
-     * {Object} Object that store relevant information about the last
-     *     mousedown or touchstart. Its 'xy' OpenLayers.Pixel property gives
-     *     the average location of the mouse/touch event. Its 'touches'
-     *     property records clientX/clientY of each touches.
-     */
-    down: null,
-
-    /**
-     * Property: last
-     * {Object} Object that store relevant information about the last
-     *     mousemove or touchmove. Its 'xy' OpenLayers.Pixel property gives
-     *     the average location of the mouse/touch event. Its 'touches'
-     *     property records clientX/clientY of each touches.
-     */
-    last: null,
-
-    /** 
-     * Property: first
-     * {Object} When waiting for double clicks, this object will store 
-     *     information about the first click in a two click sequence.
-     */
-    first: null,
-
-    /**
-     * Property: rightclickTimerId
-     * {Number} The id of the right mouse timeout waiting to clear the 
-     *     <delayedEvent>.
-     */
-    rightclickTimerId: null,
-    
-    /**
-     * Constructor: OpenLayers.Handler.Click
-     * Create a new click handler.
-     * 
-     * Parameters:
-     * control - {<OpenLayers.Control>} The control that is making use of
-     *     this handler.  If a handler is being used without a control, the
-     *     handler's setMap method must be overridden to deal properly with
-     *     the map.
-     * callbacks - {Object} An object with keys corresponding to callbacks
-     *     that will be called by the handler. The callbacks should
-     *     expect to recieve a single argument, the click event.
-     *     Callbacks for 'click' and 'dblclick' are supported.
-     * options - {Object} Optional object whose properties will be set on the
-     *     handler.
-     */
-    
-    /**
-     * Method: touchstart
-     * Handle touchstart.
-     *
-     * Returns:
-     * {Boolean} Continue propagating this event.
-     */
-    touchstart: function(evt) {
-        this.startTouch();
-        this.down = this.getEventInfo(evt);
-        this.last = this.getEventInfo(evt);
-        return true;
-    },
-    
-    /**
-     * Method: touchmove
-     *    Store position of last move, because touchend event can have
-     *    an empty "touches" property.
-     *
-     * Returns:
-     * {Boolean} Continue propagating this event.
-     */
-    touchmove: function(evt) {
-        this.last = this.getEventInfo(evt);
-        return true;
-    },
-
-    /**
-     * Method: touchend
-     *   Correctly set event xy property, and add lastTouches to have
-     *   touches property from last touchstart or touchmove
-     *
-     * Returns:
-     * {Boolean} Continue propagating this event.
-     */
-    touchend: function(evt) {
-        // touchstart may not have been allowed to propagate
-        if (this.down) {
-            evt.xy = this.last.xy;
-            evt.lastTouches = this.last.touches;
-            this.handleSingle(evt);
-            this.down = null;
-        }
-        return true;
-    },
-
-    /**
-     * Method: mousedown
-     * Handle mousedown.
-     *
-     * Returns:
-     * {Boolean} Continue propagating this event.
-     */
-    mousedown: function(evt) {
-        this.down = this.getEventInfo(evt);
-        this.last = this.getEventInfo(evt);
-        return true;
-    },
-
-    /**
-     * Method: mouseup
-     * Handle mouseup.  Installed to support collection of right mouse events.
-     * 
-     * Returns:
-     * {Boolean} Continue propagating this event.
-     */
-    mouseup: function (evt) {
-        var propagate = true;
-
-        // Collect right mouse clicks from the mouseup
-        //  IE - ignores the second right click in mousedown so using
-        //  mouseup instead
-        if (this.checkModifiers(evt) && this.control.handleRightClicks &&
-           OpenLayers.Event.isRightClick(evt)) {
-            propagate = this.rightclick(evt);
-        }
-
-        return propagate;
-    },
-    
-    /**
-     * Method: rightclick
-     * Handle rightclick.  For a dblrightclick, we get two clicks so we need 
-     *     to always register for dblrightclick to properly handle single 
-     *     clicks.
-     *     
-     * Returns:
-     * {Boolean} Continue propagating this event.
-     */
-    rightclick: function(evt) {
-        if(this.passesTolerance(evt)) {
-           if(this.rightclickTimerId != null) {
-                //Second click received before timeout this must be 
-                // a double click
-                this.clearTimer();
-                this.callback('dblrightclick', [evt]);
-                return !this.stopDouble;
-            } else { 
-                //Set the rightclickTimerId, send evt only if double is 
-                // true else trigger single
-                var clickEvent = this['double'] ?
-                    OpenLayers.Util.extend({}, evt) : 
-                    this.callback('rightclick', [evt]);
-
-                var delayedRightCall = OpenLayers.Function.bind(
-                    this.delayedRightCall, 
-                    this, 
-                    clickEvent
-                );
-                this.rightclickTimerId = window.setTimeout(
-                    delayedRightCall, this.delay
-                );
-            } 
-        }
-        return !this.stopSingle;
-    },
-    
-    /**
-     * Method: delayedRightCall
-     * Sets <rightclickTimerId> to null.  And optionally triggers the 
-     *     rightclick callback if evt is set.
-     */
-    delayedRightCall: function(evt) {
-        this.rightclickTimerId = null;
-        if (evt) {
-           this.callback('rightclick', [evt]);
-        }
-    },
-    
-    /**
-     * Method: click
-     * Handle click events from the browser.  This is registered as a listener
-     *     for click events and should not be called from other events in this
-     *     handler.
-     *
-     * Returns:
-     * {Boolean} Continue propagating this event.
-     */
-    click: function(evt) {
-        if (!this.last) {
-            this.last = this.getEventInfo(evt);
-        }
-        this.handleSingle(evt);
-        return !this.stopSingle;
-    },
-
-    /**
-     * Method: dblclick
-     * Handle dblclick.  For a dblclick, we get two clicks in some browsers
-     *     (FF) and one in others (IE).  So we need to always register for
-     *     dblclick to properly handle single clicks.  This method is registered
-     *     as a listener for the dblclick browser event.  It should *not* be
-     *     called by other methods in this handler.
-     *     
-     * Returns:
-     * {Boolean} Continue propagating this event.
-     */
-    dblclick: function(evt) {
-        this.handleDouble(evt);
-        return !this.stopDouble;
-    },
-    
-    /** 
-     * Method: handleDouble
-     * Handle double-click sequence.
-     */
-    handleDouble: function(evt) {
-        if (this.passesDblclickTolerance(evt)) {
-            if (this["double"]) {
-                this.callback("dblclick", [evt]);
-            }
-            // to prevent a dblclick from firing the click callback in IE
-            this.clearTimer();
-        }
-    },
-    
-    /** 
-     * Method: handleSingle
-     * Handle single click sequence.
-     */
-    handleSingle: function(evt) {
-        if (this.passesTolerance(evt)) {
-            if (this.timerId != null) {
-                // already received a click
-                if (this.last.touches && this.last.touches.length === 1) {
-                    // touch device, no dblclick event - this may be a double
-                    if (this["double"]) {
-                        // on Android don't let the browser zoom on the page
-                        OpenLayers.Event.preventDefault(evt);
-                    }
-                    this.handleDouble(evt);
-                }
-                // if we're not in a touch environment we clear the click timer
-                // if we've got a second touch, we'll get two touchend events
-                if (!this.last.touches || this.last.touches.length !== 2) {
-                    this.clearTimer();
-                }
-            } else {
-                // remember the first click info so we can compare to the second
-                this.first = this.getEventInfo(evt);
-                // set the timer, send evt only if single is true
-                //use a clone of the event object because it will no longer 
-                //be a valid event object in IE in the timer callback
-                var clickEvent = this.single ?
-                    OpenLayers.Util.extend({}, evt) : null;
-                this.queuePotentialClick(clickEvent);
-            }
-        }
-    },
-    
-    /** 
-     * Method: queuePotentialClick
-     * This method is separated out largely to make testing easier (so we
-     *     don't have to override window.setTimeout)
-     */
-    queuePotentialClick: function(evt) {
-        this.timerId = window.setTimeout(
-            OpenLayers.Function.bind(this.delayedCall, this, evt),
-            this.delay
-        );
-    },
-
-    /**
-     * Method: passesTolerance
-     * Determine whether the event is within the optional pixel tolerance.  Note
-     *     that the pixel tolerance check only works if mousedown events get to
-     *     the listeners registered here.  If they are stopped by other elements,
-     *     the <pixelTolerance> will have no effect here (this method will always
-     *     return true).
-     *
-     * Returns:
-     * {Boolean} The click is within the pixel tolerance (if specified).
-     */
-    passesTolerance: function(evt) {
-        var passes = true;
-        if (this.pixelTolerance != null && this.down && this.down.xy) {
-            passes = this.pixelTolerance >= this.down.xy.distanceTo(evt.xy);
-            // for touch environments, we also enforce that all touches
-            // start and end within the given tolerance to be considered a click
-            if (passes && this.touch && 
-                this.down.touches.length === this.last.touches.length) {
-                // the touchend event doesn't come with touches, so we check
-                // down and last
-                for (var i=0, ii=this.down.touches.length; i<ii; ++i) {
-                    if (this.getTouchDistance(
-                            this.down.touches[i], 
-                            this.last.touches[i]
-                        ) > this.pixelTolerance) {
-                        passes = false;
-                        break;
-                    }
-                }
-            }
-        }
-        return passes;
-    },
-    
-    /** 
-     * Method: getTouchDistance
-     *
-     * Returns:
-     * {Boolean} The pixel displacement between two touches.
-     */
-    getTouchDistance: function(from, to) {
-        return Math.sqrt(
-            Math.pow(from.clientX - to.clientX, 2) +
-            Math.pow(from.clientY - to.clientY, 2)
-        );
-    },
-    
-    /**
-     * Method: passesDblclickTolerance
-     * Determine whether the event is within the optional double-cick pixel 
-     *     tolerance.
-     *
-     * Returns:
-     * {Boolean} The click is within the double-click pixel tolerance.
-     */
-    passesDblclickTolerance: function(evt) {
-        var passes = true;
-        if (this.down && this.first) {
-            passes = this.down.xy.distanceTo(this.first.xy) <= this.dblclickTolerance;
-        }
-        return passes;
-    },
-
-    /**
-     * Method: clearTimer
-     * Clear the timer and set <timerId> to null.
-     */
-    clearTimer: function() {
-        if (this.timerId != null) {
-            window.clearTimeout(this.timerId);
-            this.timerId = null;
-        }
-        if (this.rightclickTimerId != null) {
-            window.clearTimeout(this.rightclickTimerId);
-            this.rightclickTimerId = null;
-        }
-    },
-    
-    /**
-     * Method: delayedCall
-     * Sets <timerId> to null.  And optionally triggers the click callback if
-     *     evt is set.
-     */
-    delayedCall: function(evt) {
-        this.timerId = null;
-        if (evt) {
-            this.callback("click", [evt]);
-        }
-    },
-
-    /**
-     * Method: getEventInfo
-     * This method allows us to store event information without storing the
-     *     actual event.  In touch devices (at least), the same event is 
-     *     modified between touchstart, touchmove, and touchend.
-     *
-     * Returns:
-     * {Object} An object with event related info.
-     */
-    getEventInfo: function(evt) {
-        var touches;
-        if (evt.touches) {
-            var len = evt.touches.length;
-            touches = new Array(len);
-            var touch;
-            for (var i=0; i<len; i++) {
-                touch = evt.touches[i];
-                touches[i] = {
-                    clientX: touch.olClientX,
-                    clientY: touch.olClientY
-                };
-            }
-        }
-        return {
-            xy: evt.xy,
-            touches: touches
-        };
-    },
-
-    /**
-     * APIMethod: deactivate
-     * Deactivate the handler.
-     *
-     * Returns:
-     * {Boolean} The handler was successfully deactivated.
-     */
-    deactivate: function() {
-        var deactivated = false;
-        if(OpenLayers.Handler.prototype.deactivate.apply(this, arguments)) {
-            this.clearTimer();
-            this.down = null;
-            this.first = null;
-            this.last = null;
-            deactivated = true;
-        }
-        return deactivated;
-    },
-
-    CLASS_NAME: "OpenLayers.Handler.Click"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Handler/Drag.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Handler/Drag.js
deleted file mode 100644
index 8c3cb558..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Handler/Drag.js
+++ /dev/null
@@ -1,547 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Handler.js
- */
-
-/**
- * Class: OpenLayers.Handler.Drag
- * The drag handler is used to deal with sequences of browser events related
- *     to dragging.  The handler is used by controls that want to know when
- *     a drag sequence begins, when a drag is happening, and when it has
- *     finished.
- *
- * Controls that use the drag handler typically construct it with callbacks
- *     for 'down', 'move', and 'done'.  Callbacks for these keys are called
- *     when the drag begins, with each move, and when the drag is done.  In
- *     addition, controls can have callbacks keyed to 'up' and 'out' if they
- *     care to differentiate between the types of events that correspond with
- *     the end of a drag sequence.  If no drag actually occurs (no mouse move)
- *     the 'down' and 'up' callbacks will be called, but not the 'done'
- *     callback.
- *
- * Create a new drag handler with the <OpenLayers.Handler.Drag> constructor.
- *
- * Inherits from:
- *  - <OpenLayers.Handler>
- */
-OpenLayers.Handler.Drag = OpenLayers.Class(OpenLayers.Handler, {
-  
-    /** 
-     * Property: started
-     * {Boolean} When a mousedown or touchstart event is received, we want to
-     * record it, but not set 'dragging' until the mouse moves after starting.
-     */
-    started: false,
-
-    /**
-     * Property: stopDown
-     * {Boolean} Stop propagation of mousedown events from getting to listeners
-     *     on the same element.  Default is true.
-     */
-    stopDown: true,
-
-    /** 
-     * Property: dragging 
-     * {Boolean} 
-     */
-    dragging: false,
-
-    /** 
-     * Property: last
-     * {<OpenLayers.Pixel>} The last pixel location of the drag.
-     */
-    last: null,
-
-    /** 
-     * Property: start
-     * {<OpenLayers.Pixel>} The first pixel location of the drag.
-     */
-    start: null,
-
-    /**
-     * Property: lastMoveEvt
-     * {Object} The last mousemove event that occurred. Used to
-     *     position the map correctly when our "delay drag"
-     *     timeout expired.
-     */
-    lastMoveEvt: null,
-
-    /**
-     * Property: oldOnselectstart
-     * {Function}
-     */
-    oldOnselectstart: null,
-    
-    /**
-     * Property: interval
-     * {Integer} In order to increase performance, an interval (in 
-     *     milliseconds) can be set to reduce the number of drag events 
-     *     called. If set, a new drag event will not be set until the 
-     *     interval has passed. 
-     *     Defaults to 0, meaning no interval. 
-     */
-    interval: 0,
-    
-    /**
-     * Property: timeoutId
-     * {String} The id of the timeout used for the mousedown interval.
-     *     This is "private", and should be left alone.
-     */
-    timeoutId: null,
-    
-    /**
-     * APIProperty: documentDrag
-     * {Boolean} If set to true, the handler will also handle mouse moves when
-     *     the cursor has moved out of the map viewport. Default is false.
-     */
-    documentDrag: false,
-    
-    /**
-     * Property: documentEvents
-     * {Boolean} Are we currently observing document events?
-     */
-    documentEvents: null,
-
-    /**
-     * Constructor: OpenLayers.Handler.Drag
-     * Returns OpenLayers.Handler.Drag
-     * 
-     * Parameters:
-     * control - {<OpenLayers.Control>} The control that is making use of
-     *     this handler.  If a handler is being used without a control, the
-     *     handlers setMap method must be overridden to deal properly with
-     *     the map.
-     * callbacks - {Object} An object containing a single function to be
-     *     called when the drag operation is finished. The callback should
-     *     expect to recieve a single argument, the pixel location of the event.
-     *     Callbacks for 'move' and 'done' are supported. You can also speficy
-     *     callbacks for 'down', 'up', and 'out' to respond to those events.
-     * options - {Object} 
-     */
-    initialize: function(control, callbacks, options) {
-        OpenLayers.Handler.prototype.initialize.apply(this, arguments);
-        
-        if (this.documentDrag === true) {
-            var me = this;
-            this._docMove = function(evt) {
-                me.mousemove({
-                    xy: {x: evt.clientX, y: evt.clientY},
-                    element: document
-                });
-            };
-            this._docUp = function(evt) {
-                me.mouseup({xy: {x: evt.clientX, y: evt.clientY}});
-            };
-        }
-    },
-
-    
-    /**
-     * Method: dragstart
-     * This private method is factorized from mousedown and touchstart methods
-     *
-     * Parameters:
-     * evt - {Event} The event
-     *
-     * Returns:
-     * {Boolean} Let the event propagate.
-     */
-    dragstart: function (evt) {
-        var propagate = true;
-        this.dragging = false;
-        if (this.checkModifiers(evt) &&
-               (OpenLayers.Event.isLeftClick(evt) ||
-                OpenLayers.Event.isSingleTouch(evt))) {
-            this.started = true;
-            this.start = evt.xy;
-            this.last = evt.xy;
-            OpenLayers.Element.addClass(
-                this.map.viewPortDiv, "olDragDown"
-            );
-            this.down(evt);
-            this.callback("down", [evt.xy]);
-
-            // prevent document dragging
-            OpenLayers.Event.preventDefault(evt);
-
-            if(!this.oldOnselectstart) {
-                this.oldOnselectstart = document.onselectstart ?
-                    document.onselectstart : OpenLayers.Function.True;
-            }
-            document.onselectstart = OpenLayers.Function.False;
-
-            propagate = !this.stopDown;
-        } else {
-            this.started = false;
-            this.start = null;
-            this.last = null;
-        }
-        return propagate;
-    },
-
-    /**
-     * Method: dragmove
-     * This private method is factorized from mousemove and touchmove methods
-     *
-     * Parameters:
-     * evt - {Event} The event
-     *
-     * Returns:
-     * {Boolean} Let the event propagate.
-     */
-    dragmove: function (evt) {
-        this.lastMoveEvt = evt;
-        if (this.started && !this.timeoutId && (evt.xy.x != this.last.x ||
-                                                evt.xy.y != this.last.y)) {
-            if(this.documentDrag === true && this.documentEvents) {
-                if(evt.element === document) {
-                    this.adjustXY(evt);
-                    // do setEvent manually because the documentEvents are not
-                    // registered with the map
-                    this.setEvent(evt);
-                } else {
-                    this.removeDocumentEvents();
-                }
-            }
-            if (this.interval > 0) {
-                this.timeoutId = setTimeout(
-                    OpenLayers.Function.bind(this.removeTimeout, this),
-                    this.interval);
-            }
-            this.dragging = true;
-
-            this.move(evt);
-            this.callback("move", [evt.xy]);
-            if(!this.oldOnselectstart) {
-                this.oldOnselectstart = document.onselectstart;
-                document.onselectstart = OpenLayers.Function.False;
-            }
-            this.last = evt.xy;
-        }
-        return true;
-    },
-
-    /**
-     * Method: dragend
-     * This private method is factorized from mouseup and touchend methods
-     *
-     * Parameters:
-     * evt - {Event} The event
-     *
-     * Returns:
-     * {Boolean} Let the event propagate.
-     */
-    dragend: function (evt) {
-        if (this.started) {
-            if(this.documentDrag === true && this.documentEvents) {
-                this.adjustXY(evt);
-                this.removeDocumentEvents();
-            }
-            var dragged = (this.start != this.last);
-            this.started = false;
-            this.dragging = false;
-            OpenLayers.Element.removeClass(
-                this.map.viewPortDiv, "olDragDown"
-            );
-            this.up(evt);
-            this.callback("up", [evt.xy]);
-            if(dragged) {
-                this.callback("done", [evt.xy]);
-            }
-            document.onselectstart = this.oldOnselectstart;
-        }
-        return true;
-    },
-
-    /**
-     * The four methods below (down, move, up, and out) are used by subclasses
-     *     to do their own processing related to these mouse events.
-     */
-
-    /**
-     * Method: down
-     * This method is called during the handling of the mouse down event.
-     *     Subclasses can do their own processing here.
-     *
-     * Parameters:
-     * evt - {Event} The mouse down event
-     */
-    down: function(evt) {
-    },
-
-    /**
-     * Method: move
-     * This method is called during the handling of the mouse move event.
-     *     Subclasses can do their own processing here.
-     *
-     * Parameters:
-     * evt - {Event} The mouse move event
-     *
-     */
-    move: function(evt) {
-    },
-
-    /**
-     * Method: up
-     * This method is called during the handling of the mouse up event.
-     *     Subclasses can do their own processing here.
-     *
-     * Parameters:
-     * evt - {Event} The mouse up event
-     */
-    up: function(evt) {
-    },
-
-    /**
-     * Method: out
-     * This method is called during the handling of the mouse out event.
-     *     Subclasses can do their own processing here.
-     *
-     * Parameters:
-     * evt - {Event} The mouse out event
-     */
-    out: function(evt) {
-    },
-
-    /**
-     * The methods below are part of the magic of event handling.  Because
-     *     they are named like browser events, they are registered as listeners
-     *     for the events they represent.
-     */
-
-    /**
-     * Method: mousedown
-     * Handle mousedown events
-     *
-     * Parameters:
-     * evt - {Event}
-     *
-     * Returns:
-     * {Boolean} Let the event propagate.
-     */
-    mousedown: function(evt) {
-        return this.dragstart(evt);
-    },
-
-    /**
-     * Method: touchstart
-     * Handle touchstart events
-     *
-     * Parameters:
-     * evt - {Event}
-     *
-     * Returns:
-     * {Boolean} Let the event propagate.
-     */
-    touchstart: function(evt) {
-        this.startTouch();
-        return this.dragstart(evt);
-    },
-
-    /**
-     * Method: mousemove
-     * Handle mousemove events
-     *
-     * Parameters:
-     * evt - {Event}
-     *
-     * Returns:
-     * {Boolean} Let the event propagate.
-     */
-    mousemove: function(evt) {
-        return this.dragmove(evt);
-    },
-
-    /**
-     * Method: touchmove
-     * Handle touchmove events
-     *
-     * Parameters:
-     * evt - {Event}
-     *
-     * Returns:
-     * {Boolean} Let the event propagate.
-     */
-    touchmove: function(evt) {
-        return this.dragmove(evt);
-    },
-
-    /**
-     * Method: removeTimeout
-     * Private. Called by mousemove() to remove the drag timeout.
-     */
-    removeTimeout: function() {
-        this.timeoutId = null;
-        // if timeout expires while we're still dragging (mouseup
-        // hasn't occurred) then call mousemove to move to the
-        // correct position
-        if(this.dragging) {
-            this.mousemove(this.lastMoveEvt);
-        }
-    },
-
-    /**
-     * Method: mouseup
-     * Handle mouseup events
-     *
-     * Parameters:
-     * evt - {Event}
-     *
-     * Returns:
-     * {Boolean} Let the event propagate.
-     */
-    mouseup: function(evt) {
-        return this.dragend(evt);
-    },
-
-    /**
-     * Method: touchend
-     * Handle touchend events
-     *
-     * Parameters:
-     * evt - {Event}
-     *
-     * Returns:
-     * {Boolean} Let the event propagate.
-     */
-    touchend: function(evt) {
-        // override evt.xy with last position since touchend does not have
-        // any touch position
-        evt.xy = this.last;
-        return this.dragend(evt);
-    },
-
-    /**
-     * Method: mouseout
-     * Handle mouseout events
-     *
-     * Parameters:
-     * evt - {Event}
-     *
-     * Returns:
-     * {Boolean} Let the event propagate.
-     */
-    mouseout: function (evt) {
-        if (this.started && OpenLayers.Util.mouseLeft(evt, this.map.viewPortDiv)) {
-            if(this.documentDrag === true) {
-                this.addDocumentEvents();
-            } else {
-                var dragged = (this.start != this.last);
-                this.started = false; 
-                this.dragging = false;
-                OpenLayers.Element.removeClass(
-                    this.map.viewPortDiv, "olDragDown"
-                );
-                this.out(evt);
-                this.callback("out", []);
-                if(dragged) {
-                    this.callback("done", [evt.xy]);
-                }
-                if(document.onselectstart) {
-                    document.onselectstart = this.oldOnselectstart;
-                }
-            }
-        }
-        return true;
-    },
-
-    /**
-     * Method: click
-     * The drag handler captures the click event.  If something else registers
-     *     for clicks on the same element, its listener will not be called 
-     *     after a drag.
-     * 
-     * Parameters: 
-     * evt - {Event} 
-     * 
-     * Returns:
-     * {Boolean} Let the event propagate.
-     */
-    click: function (evt) {
-        // let the click event propagate only if the mouse moved
-        return (this.start == this.last);
-    },
-
-    /**
-     * Method: activate
-     * Activate the handler.
-     * 
-     * Returns:
-     * {Boolean} The handler was successfully activated.
-     */
-    activate: function() {
-        var activated = false;
-        if(OpenLayers.Handler.prototype.activate.apply(this, arguments)) {
-            this.dragging = false;
-            activated = true;
-        }
-        return activated;
-    },
-
-    /**
-     * Method: deactivate 
-     * Deactivate the handler.
-     * 
-     * Returns:
-     * {Boolean} The handler was successfully deactivated.
-     */
-    deactivate: function() {
-        var deactivated = false;
-        if(OpenLayers.Handler.prototype.deactivate.apply(this, arguments)) {
-            this.started = false;
-            this.dragging = false;
-            this.start = null;
-            this.last = null;
-            deactivated = true;
-            OpenLayers.Element.removeClass(
-                this.map.viewPortDiv, "olDragDown"
-            );
-        }
-        return deactivated;
-    },
-    
-    /**
-     * Method: adjustXY
-     * Converts event coordinates that are relative to the document body to
-     * ones that are relative to the map viewport. The latter is the default in
-     * OpenLayers.
-     * 
-     * Parameters:
-     * evt - {Object}
-     */
-    adjustXY: function(evt) {
-        var pos = OpenLayers.Util.pagePosition(this.map.viewPortDiv);
-        evt.xy.x -= pos[0];
-        evt.xy.y -= pos[1];
-    },
-    
-    /**
-     * Method: addDocumentEvents
-     * Start observing document events when documentDrag is true and the mouse
-     * cursor leaves the map viewport while dragging.
-     */
-    addDocumentEvents: function() {
-        OpenLayers.Element.addClass(document.body, "olDragDown");
-        this.documentEvents = true;
-        OpenLayers.Event.observe(document, "mousemove", this._docMove);
-        OpenLayers.Event.observe(document, "mouseup", this._docUp);
-    },
-    
-    /**
-     * Method: removeDocumentEvents
-     * Stops observing document events when documentDrag is true and the mouse
-     * cursor re-enters the map viewport while dragging.
-     */
-    removeDocumentEvents: function() {
-        OpenLayers.Element.removeClass(document.body, "olDragDown");
-        this.documentEvents = false;
-        OpenLayers.Event.stopObserving(document, "mousemove", this._docMove);
-        OpenLayers.Event.stopObserving(document, "mouseup", this._docUp);
-    },
-
-    CLASS_NAME: "OpenLayers.Handler.Drag"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Handler/Feature.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Handler/Feature.js
deleted file mode 100644
index 39b86f27..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Handler/Feature.js
+++ /dev/null
@@ -1,434 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-
-/**
- * @requires OpenLayers/Handler.js
- */
-
-/**
- * Class: OpenLayers.Handler.Feature 
- * Handler to respond to mouse events related to a drawn feature.  Callbacks
- *     with the following keys will be notified of the following events
- *     associated with features: click, clickout, over, out, and dblclick.
- *
- * This handler stops event propagation for mousedown and mouseup if those
- *     browser events target features that can be selected.
- *
- * Inherits from:
- *  - <OpenLayers.Handler>
- */
-OpenLayers.Handler.Feature = OpenLayers.Class(OpenLayers.Handler, {
-
-    /**
-     * Property: EVENTMAP
-     * {Object} A object mapping the browser events to objects with callback
-     *     keys for in and out.
-     */
-    EVENTMAP: {
-        'click': {'in': 'click', 'out': 'clickout'},
-        'mousemove': {'in': 'over', 'out': 'out'},
-        'dblclick': {'in': 'dblclick', 'out': null},
-        'mousedown': {'in': null, 'out': null},
-        'mouseup': {'in': null, 'out': null},
-        'touchstart': {'in': 'click', 'out': 'clickout'}
-    },
-
-    /**
-     * Property: feature
-     * {<OpenLayers.Feature.Vector>} The last feature that was hovered.
-     */
-    feature: null,
-
-    /**
-     * Property: lastFeature
-     * {<OpenLayers.Feature.Vector>} The last feature that was handled.
-     */
-    lastFeature: null,
-
-    /**
-     * Property: down
-     * {<OpenLayers.Pixel>} The location of the last mousedown.
-     */
-    down: null,
-
-    /**
-     * Property: up
-     * {<OpenLayers.Pixel>} The location of the last mouseup.
-     */
-    up: null,
-    
-    /**
-     * Property: clickTolerance
-     * {Number} The number of pixels the mouse can move between mousedown
-     *     and mouseup for the event to still be considered a click.
-     *     Dragging the map should not trigger the click and clickout callbacks
-     *     unless the map is moved by less than this tolerance. Defaults to 4.
-     */
-    clickTolerance: 4,
-
-    /**
-     * Property: geometryTypes
-     * To restrict dragging to a limited set of geometry types, send a list
-     * of strings corresponding to the geometry class names.
-     * 
-     * @type Array(String)
-     */
-    geometryTypes: null,
-
-    /**
-     * Property: stopClick
-     * {Boolean} If stopClick is set to true, handled clicks do not
-     *      propagate to other click listeners. Otherwise, handled clicks
-     *      do propagate. Unhandled clicks always propagate, whatever the
-     *      value of stopClick. Defaults to true.
-     */
-    stopClick: true,
-
-    /**
-     * Property: stopDown
-     * {Boolean} If stopDown is set to true, handled mousedowns do not
-     *      propagate to other mousedown listeners. Otherwise, handled
-     *      mousedowns do propagate. Unhandled mousedowns always propagate,
-     *      whatever the value of stopDown. Defaults to true.
-     */
-    stopDown: true,
-
-    /**
-     * Property: stopUp
-     * {Boolean} If stopUp is set to true, handled mouseups do not
-     *      propagate to other mouseup listeners. Otherwise, handled mouseups
-     *      do propagate. Unhandled mouseups always propagate, whatever the
-     *      value of stopUp. Defaults to false.
-     */
-    stopUp: false,
-    
-    /**
-     * Constructor: OpenLayers.Handler.Feature
-     *
-     * Parameters:
-     * control - {<OpenLayers.Control>} 
-     * layer - {<OpenLayers.Layer.Vector>}
-     * callbacks - {Object} An object with a 'over' property whos value is
-     *     a function to be called when the mouse is over a feature. The 
-     *     callback should expect to recieve a single argument, the feature.
-     * options - {Object} 
-     */
-    initialize: function(control, layer, callbacks, options) {
-        OpenLayers.Handler.prototype.initialize.apply(this, [control, callbacks, options]);
-        this.layer = layer;
-    },
-
-    /**
-     * Method: touchstart
-     * Handle touchstart events
-     *
-     * Parameters:
-     * evt - {Event}
-     *
-     * Returns:
-     * {Boolean} Let the event propagate.
-     */
-    touchstart: function(evt) {
-        this.startTouch(); 
-        return OpenLayers.Event.isMultiTouch(evt) ?
-                true : this.mousedown(evt);
-    },
-
-    /**
-     * Method: touchmove
-     * Handle touchmove events. We just prevent the browser default behavior,
-     *    for Android Webkit not to select text when moving the finger after
-     *    selecting a feature.
-     *
-     * Parameters:
-     * evt - {Event}
-     */
-    touchmove: function(evt) {
-        OpenLayers.Event.preventDefault(evt);
-    },
-
-    /**
-     * Method: mousedown
-     * Handle mouse down.  Stop propagation if a feature is targeted by this
-     *     event (stops map dragging during feature selection).
-     * 
-     * Parameters:
-     * evt - {Event} 
-     */
-    mousedown: function(evt) {
-        // Feature selection is only done with a left click. Other handlers may stop the
-        // propagation of left-click mousedown events but not right-click mousedown events.
-        // This mismatch causes problems when comparing the location of the down and up
-        // events in the click function so it is important ignore right-clicks.
-        if (OpenLayers.Event.isLeftClick(evt) || OpenLayers.Event.isSingleTouch(evt)) {
-            this.down = evt.xy;
-        }
-        return this.handle(evt) ? !this.stopDown : true;
-    },
-    
-    /**
-     * Method: mouseup
-     * Handle mouse up.  Stop propagation if a feature is targeted by this
-     *     event.
-     * 
-     * Parameters:
-     * evt - {Event} 
-     */
-    mouseup: function(evt) {
-        this.up = evt.xy;
-        return this.handle(evt) ? !this.stopUp : true;
-    },
-
-    /**
-     * Method: click
-     * Handle click.  Call the "click" callback if click on a feature,
-     *     or the "clickout" callback if click outside any feature.
-     * 
-     * Parameters:
-     * evt - {Event} 
-     *
-     * Returns:
-     * {Boolean}
-     */
-    click: function(evt) {
-        return this.handle(evt) ? !this.stopClick : true;
-    },
-        
-    /**
-     * Method: mousemove
-     * Handle mouse moves.  Call the "over" callback if moving in to a feature,
-     *     or the "out" callback if moving out of a feature.
-     * 
-     * Parameters:
-     * evt - {Event} 
-     *
-     * Returns:
-     * {Boolean}
-     */
-    mousemove: function(evt) {
-        if (!this.callbacks['over'] && !this.callbacks['out']) {
-            return true;
-        }     
-        this.handle(evt);
-        return true;
-    },
-    
-    /**
-     * Method: dblclick
-     * Handle dblclick.  Call the "dblclick" callback if dblclick on a feature.
-     *
-     * Parameters:
-     * evt - {Event} 
-     *
-     * Returns:
-     * {Boolean}
-     */
-    dblclick: function(evt) {
-        return !this.handle(evt);
-    },
-
-    /**
-     * Method: geometryTypeMatches
-     * Return true if the geometry type of the passed feature matches
-     *     one of the geometry types in the geometryTypes array.
-     *
-     * Parameters:
-     * feature - {<OpenLayers.Vector.Feature>}
-     *
-     * Returns:
-     * {Boolean}
-     */
-    geometryTypeMatches: function(feature) {
-        return this.geometryTypes == null ||
-            OpenLayers.Util.indexOf(this.geometryTypes,
-                                    feature.geometry.CLASS_NAME) > -1;
-    },
-
-    /**
-     * Method: handle
-     *
-     * Parameters:
-     * evt - {Event}
-     *
-     * Returns:
-     * {Boolean} The event occurred over a relevant feature.
-     */
-    handle: function(evt) {
-        if(this.feature && !this.feature.layer) {
-            // feature has been destroyed
-            this.feature = null;
-        }
-        var type = evt.type;
-        var handled = false;
-        var previouslyIn = !!(this.feature); // previously in a feature
-        var click = (type == "click" || type == "dblclick" || type == "touchstart");
-        this.feature = this.layer.getFeatureFromEvent(evt);
-        if(this.feature && !this.feature.layer) {
-            // feature has been destroyed
-            this.feature = null;
-        }
-        if(this.lastFeature && !this.lastFeature.layer) {
-            // last feature has been destroyed
-            this.lastFeature = null;
-        }
-        if(this.feature) {
-            if(type === "touchstart") {
-                // stop the event to prevent Android Webkit from
-                // "flashing" the map div
-                OpenLayers.Event.preventDefault(evt);
-            }
-            var inNew = (this.feature != this.lastFeature);
-            if(this.geometryTypeMatches(this.feature)) {
-                // in to a feature
-                if(previouslyIn && inNew) {
-                    // out of last feature and in to another
-                    if(this.lastFeature) {
-                        this.triggerCallback(type, 'out', [this.lastFeature]);
-                    }
-                    this.triggerCallback(type, 'in', [this.feature]);
-                } else if(!previouslyIn || click) {
-                    // in feature for the first time
-                    this.triggerCallback(type, 'in', [this.feature]);
-                }
-                this.lastFeature = this.feature;
-                handled = true;
-            } else {
-                // not in to a feature
-                if(this.lastFeature && (previouslyIn && inNew || click)) {
-                    // out of last feature for the first time
-                    this.triggerCallback(type, 'out', [this.lastFeature]);
-                }
-                // next time the mouse goes in a feature whose geometry type
-                // doesn't match we don't want to call the 'out' callback
-                // again, so let's set this.feature to null so that
-                // previouslyIn will evaluate to false the next time
-                // we enter handle. Yes, a bit hackish...
-                this.feature = null;
-            }
-        } else if(this.lastFeature && (previouslyIn || click)) {
-            this.triggerCallback(type, 'out', [this.lastFeature]);
-        }
-        return handled;
-    },
-    
-    /**
-     * Method: triggerCallback
-     * Call the callback keyed in the event map with the supplied arguments.
-     *     For click and clickout, the <clickTolerance> is checked first.
-     *
-     * Parameters:
-     * type - {String}
-     */
-    triggerCallback: function(type, mode, args) {
-        var key = this.EVENTMAP[type][mode];
-        if(key) {
-            if(type == 'click' && this.up && this.down) {
-                // for click/clickout, only trigger callback if tolerance is met
-                var dpx = Math.sqrt(
-                    Math.pow(this.up.x - this.down.x, 2) +
-                    Math.pow(this.up.y - this.down.y, 2)
-                );
-                if(dpx <= this.clickTolerance) {
-                    this.callback(key, args);
-                }
-                // we're done with this set of events now: clear the cached
-                // positions so we can't trip over them later (this can occur
-                // if one of the up/down events gets eaten before it gets to us
-                // but we still get the click)
-                this.up = this.down = null;
-            } else {
-                this.callback(key, args);
-            }
-        }
-    },
-
-    /**
-     * Method: activate 
-     * Turn on the handler.  Returns false if the handler was already active.
-     *
-     * Returns:
-     * {Boolean}
-     */
-    activate: function() {
-        var activated = false;
-        if(OpenLayers.Handler.prototype.activate.apply(this, arguments)) {
-            this.moveLayerToTop();
-            this.map.events.on({
-                "removelayer": this.handleMapEvents,
-                "changelayer": this.handleMapEvents,
-                scope: this
-            });
-            activated = true;
-        }
-        return activated;
-    },
-    
-    /**
-     * Method: deactivate 
-     * Turn off the handler.  Returns false if the handler was already active.
-     *
-     * Returns: 
-     * {Boolean}
-     */
-    deactivate: function() {
-        var deactivated = false;
-        if(OpenLayers.Handler.prototype.deactivate.apply(this, arguments)) {
-            this.moveLayerBack();
-            this.feature = null;
-            this.lastFeature = null;
-            this.down = null;
-            this.up = null;
-            this.map.events.un({
-                "removelayer": this.handleMapEvents,
-                "changelayer": this.handleMapEvents,
-                scope: this
-            });
-            deactivated = true;
-        }
-        return deactivated;
-    },
-    
-    /**
-     * Method: handleMapEvents
-     * 
-     * Parameters:
-     * evt - {Object}
-     */
-    handleMapEvents: function(evt) {
-        if (evt.type == "removelayer" || evt.property == "order") {
-            this.moveLayerToTop();
-        }
-    },
-    
-    /**
-     * Method: moveLayerToTop
-     * Moves the layer for this handler to the top, so mouse events can reach
-     * it.
-     */
-    moveLayerToTop: function() {
-        var index = Math.max(this.map.Z_INDEX_BASE['Feature'] - 1,
-            this.layer.getZIndex()) + 1;
-        this.layer.setZIndex(index);
-        
-    },
-    
-    /**
-     * Method: moveLayerBack
-     * Moves the layer back to the position determined by the map's layers
-     * array.
-     */
-    moveLayerBack: function() {
-        var index = this.layer.getZIndex() - 1;
-        if (index >= this.map.Z_INDEX_BASE['Feature']) {
-            this.layer.setZIndex(index);
-        } else {
-            this.map.setLayerZIndex(this.layer,
-                this.map.getLayerIndex(this.layer));
-        }
-    },
-
-    CLASS_NAME: "OpenLayers.Handler.Feature"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Handler/Hover.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Handler/Hover.js
deleted file mode 100644
index 18b81f41..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Handler/Hover.js
+++ /dev/null
@@ -1,180 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Handler.js
- */
-
-/**
- * Class: OpenLayers.Handler.Hover
- * The hover handler is to be used to emulate mouseovers on objects
- *      on the map that aren't DOM elements. For example one can use
- *      this handler to send WMS/GetFeatureInfo requests as the user
- *      moves the mouve over the map.
- * 
- * Inherits from:
- *  - <OpenLayers.Handler> 
- */
-OpenLayers.Handler.Hover = OpenLayers.Class(OpenLayers.Handler, {
-
-    /**
-     * APIProperty: delay
-     * {Integer} - Number of milliseconds between mousemoves before
-     *      the event is considered a hover. Default is 500.
-     */
-    delay: 500,
-    
-    /**
-     * APIProperty: pixelTolerance
-     * {Integer} - Maximum number of pixels between mousemoves for
-     *      an event to be considered a hover. Default is null.
-     */
-    pixelTolerance: null,
-
-    /**
-     * APIProperty: stopMove
-     * {Boolean} - Stop other listeners from being notified on mousemoves.
-     *      Default is false.
-     */
-    stopMove: false,
-
-    /**
-     * Property: px
-     * {<OpenLayers.Pixel>} - The location of the last mousemove, expressed
-     *      in pixels.
-     */
-    px: null,
-
-    /**
-     * Property: timerId
-     * {Number} - The id of the timer.
-     */
-    timerId: null,
- 
-    /**
-     * Constructor: OpenLayers.Handler.Hover
-     * Construct a hover handler.
-     *
-     * Parameters:
-     * control - {<OpenLayers.Control>} The control that initialized this
-     *     handler.  The control is assumed to have a valid map property; that
-     *     map is used in the handler's own setMap method.
-     * callbacks - {Object} An object with keys corresponding to callbacks
-     *     that will be called by the handler. The callbacks should
-     *     expect to receive a single argument, the event. Callbacks for
-     *     'move', the mouse is moving, and 'pause', the mouse is pausing,
-     *     are supported.
-     * options - {Object} An optional object whose properties will be set on
-     *     the handler.
-     */
-
-    /**
-     * Method: mousemove
-     * Called when the mouse moves on the map.
-     *
-     * Parameters:
-     * evt - {<OpenLayers.Event>}
-     *
-     * Returns:
-     * {Boolean} Continue propagating this event.
-     */
-    mousemove: function(evt) {
-        if(this.passesTolerance(evt.xy)) {
-            this.clearTimer();
-            this.callback('move', [evt]);
-            this.px = evt.xy;
-            // clone the evt so original properties can be accessed even
-            // if the browser deletes them during the delay
-            evt = OpenLayers.Util.extend({}, evt);
-            this.timerId = window.setTimeout(
-                OpenLayers.Function.bind(this.delayedCall, this, evt),
-                this.delay
-            );
-        }
-        return !this.stopMove;
-    },
-
-    /**
-     * Method: mouseout
-     * Called when the mouse goes out of the map.
-     *
-     * Parameters:
-     * evt - {<OpenLayers.Event>}
-     *
-     * Returns:
-     * {Boolean} Continue propagating this event.
-     */
-    mouseout: function(evt) {
-        if (OpenLayers.Util.mouseLeft(evt, this.map.viewPortDiv)) {
-            this.clearTimer();
-            this.callback('move', [evt]);
-        }
-        return true;
-    },
-
-    /**
-     * Method: passesTolerance
-     * Determine whether the mouse move is within the optional pixel tolerance.
-     *
-     * Parameters:
-     * px - {<OpenLayers.Pixel>}
-     *
-     * Returns:
-     * {Boolean} The mouse move is within the pixel tolerance.
-     */
-    passesTolerance: function(px) {
-        var passes = true;
-        if(this.pixelTolerance && this.px) {
-            var dpx = Math.sqrt(
-                Math.pow(this.px.x - px.x, 2) +
-                Math.pow(this.px.y - px.y, 2)
-            );
-            if(dpx < this.pixelTolerance) {
-                passes = false;
-            }
-        }
-        return passes;
-    },
-
-    /**
-     * Method: clearTimer
-     * Clear the timer and set <timerId> to null.
-     */
-    clearTimer: function() {
-        if(this.timerId != null) {
-            window.clearTimeout(this.timerId);
-            this.timerId = null;
-        }
-    },
-
-    /**
-     * Method: delayedCall
-     * Triggers pause callback.
-     *
-     * Parameters:
-     * evt - {<OpenLayers.Event>}
-     */
-    delayedCall: function(evt) {
-        this.callback('pause', [evt]);
-    },
-
-    /**
-     * APIMethod: deactivate
-     * Deactivate the handler.
-     *
-     * Returns:
-     * {Boolean} The handler was successfully deactivated.
-     */
-    deactivate: function() {
-        var deactivated = false;
-        if(OpenLayers.Handler.prototype.deactivate.apply(this, arguments)) {
-            this.clearTimer();
-            deactivated = true;
-        }
-        return deactivated;
-    },
-
-    CLASS_NAME: "OpenLayers.Handler.Hover"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Handler/Keyboard.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Handler/Keyboard.js
deleted file mode 100644
index de7a4648..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Handler/Keyboard.js
+++ /dev/null
@@ -1,117 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Handler.js
- * @requires OpenLayers/Events.js
- */
-
-/**
- * Class: OpenLayers.handler.Keyboard
- * A handler for keyboard events.  Create a new instance with the
- *     <OpenLayers.Handler.Keyboard> constructor.
- * 
- * Inherits from:
- *  - <OpenLayers.Handler> 
- */
-OpenLayers.Handler.Keyboard = OpenLayers.Class(OpenLayers.Handler, {
-
-    /* http://www.quirksmode.org/js/keys.html explains key x-browser
-        key handling quirks in pretty nice detail */
-
-    /** 
-     * Constant: KEY_EVENTS
-     * keydown, keypress, keyup
-     */
-    KEY_EVENTS: ["keydown", "keyup"],
-
-    /** 
-    * Property: eventListener
-    * {Function}
-    */
-    eventListener: null,
-
-    /**
-     * Property: observeElement
-     * {DOMElement|String} The DOM element on which we listen for
-     *     key events. Default to the document.
-     */
-    observeElement: null,
-
-    /**
-     * Constructor: OpenLayers.Handler.Keyboard
-     * Returns a new keyboard handler.
-     * 
-     * Parameters:
-     * control - {<OpenLayers.Control>} The control that is making use of
-     *     this handler.  If a handler is being used without a control, the
-     *     handlers setMap method must be overridden to deal properly with
-     *     the map.
-     * callbacks - {Object} An object containing a single function to be
-     *     called when the drag operation is finished. The callback should
-     *     expect to recieve a single argument, the pixel location of the event.
-     *     Callbacks for 'keydown', 'keypress', and 'keyup' are supported.
-     * options - {Object} Optional object whose properties will be set on the
-     *     handler.
-     */
-    initialize: function(control, callbacks, options) {
-        OpenLayers.Handler.prototype.initialize.apply(this, arguments);
-        // cache the bound event listener method so it can be unobserved later
-        this.eventListener = OpenLayers.Function.bindAsEventListener(
-            this.handleKeyEvent, this
-        );
-    },
-    
-    /**
-     * Method: destroy
-     */
-    destroy: function() {
-        this.deactivate();
-        this.eventListener = null;
-        OpenLayers.Handler.prototype.destroy.apply(this, arguments);
-    },
-
-    /**
-     * Method: activate
-     */
-    activate: function() {
-        if (OpenLayers.Handler.prototype.activate.apply(this, arguments)) {
-            this.observeElement = this.observeElement || document;
-            for (var i=0, len=this.KEY_EVENTS.length; i<len; i++) {
-                OpenLayers.Event.observe(
-                    this.observeElement, this.KEY_EVENTS[i], this.eventListener);
-            }
-            return true;
-        } else {
-            return false;
-        }
-    },
-
-    /**
-     * Method: deactivate
-     */
-    deactivate: function() {
-        var deactivated = false;
-        if (OpenLayers.Handler.prototype.deactivate.apply(this, arguments)) {
-            for (var i=0, len=this.KEY_EVENTS.length; i<len; i++) {
-                OpenLayers.Event.stopObserving(
-                    this.observeElement, this.KEY_EVENTS[i], this.eventListener);
-            }
-            deactivated = true;
-        }
-        return deactivated;
-    },
-
-    /**
-     * Method: handleKeyEvent 
-     */
-    handleKeyEvent: function (evt) {
-        if (this.checkModifiers(evt)) {
-            this.callback(evt.type, [evt]);
-        }
-    },
-
-    CLASS_NAME: "OpenLayers.Handler.Keyboard"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Handler/MouseWheel.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Handler/MouseWheel.js
deleted file mode 100644
index c69dff34..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Handler/MouseWheel.js
+++ /dev/null
@@ -1,264 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Handler.js
- */
-
-/**
- * Class: OpenLayers.Handler.MouseWheel
- * Handler for wheel up/down events.
- * 
- * Inherits from:
- *  - <OpenLayers.Handler>
- */
-OpenLayers.Handler.MouseWheel = OpenLayers.Class(OpenLayers.Handler, {
-    /** 
-     * Property: wheelListener 
-     * {function} 
-     */
-    wheelListener: null,
-
-    /**
-     * Property: interval
-     * {Integer} In order to increase server performance, an interval (in 
-     *     milliseconds) can be set to reduce the number of up/down events 
-     *     called. If set, a new up/down event will not be set until the 
-     *     interval has passed. 
-     *     Defaults to 0, meaning no interval. 
-     */
-    interval: 0,
-    
-    /**
-     * Property: maxDelta
-     * {Integer} Maximum delta to collect before breaking from the current
-     *    interval. In cumulative mode, this also limits the maximum delta
-     *    returned from the handler. Default is Number.POSITIVE_INFINITY.
-     */
-    maxDelta: Number.POSITIVE_INFINITY,
-    
-    /**
-     * Property: delta
-     * {Integer} When interval is set, delta collects the mousewheel z-deltas
-     *     of the events that occur within the interval.
-     *      See also the cumulative option
-     */
-    delta: 0,
-    
-    /**
-     * Property: cumulative
-     * {Boolean} When interval is set: true to collect all the mousewheel 
-     *     z-deltas, false to only record the delta direction (positive or
-     *     negative)
-     */
-    cumulative: true,
-    
-    /**
-     * Constructor: OpenLayers.Handler.MouseWheel
-     *
-     * Parameters:
-     * control - {<OpenLayers.Control>} 
-     * callbacks - {Object} An object containing a single function to be
-     *                          called when the drag operation is finished.
-     *                          The callback should expect to recieve a single
-     *                          argument, the point geometry.
-     * options - {Object} 
-     */
-    initialize: function(control, callbacks, options) {
-        OpenLayers.Handler.prototype.initialize.apply(this, arguments);
-        this.wheelListener = OpenLayers.Function.bindAsEventListener(
-            this.onWheelEvent, this
-        );
-    },
-
-    /**
-     * Method: destroy
-     */    
-    destroy: function() {
-        OpenLayers.Handler.prototype.destroy.apply(this, arguments);
-        this.wheelListener = null;
-    },
-
-    /**
-     *  Mouse ScrollWheel code thanks to http://adomas.org/javascript-mouse-wheel/
-     */
-
-    /** 
-     * Method: onWheelEvent
-     * Catch the wheel event and handle it xbrowserly
-     * 
-     * Parameters:
-     * e - {Event} 
-     */
-    onWheelEvent: function(e){
-        
-        // make sure we have a map and check keyboard modifiers
-        if (!this.map || !this.checkModifiers(e)) {
-            return;
-        }
-        
-        // Ride up the element's DOM hierarchy to determine if it or any of 
-        //  its ancestors was: 
-        //   * specifically marked as scrollable (CSS overflow property)
-        //   * one of our layer divs or a div marked as scrollable
-        //     ('olScrollable' CSS class)
-        //   * the map div
-        //
-        var overScrollableDiv = false;
-        var allowScroll = false;
-        var overMapDiv = false;
-        
-        var elem = OpenLayers.Event.element(e);
-        while((elem != null) && !overMapDiv && !overScrollableDiv) {
-
-            if (!overScrollableDiv) {
-                try {
-                    var overflow;
-                    if (elem.currentStyle) {
-                        overflow = elem.currentStyle["overflow"];
-                    } else {
-                        var style = 
-                            document.defaultView.getComputedStyle(elem, null);
-                        overflow = style.getPropertyValue("overflow");
-                    }
-                    overScrollableDiv = ( overflow && 
-                        (overflow == "auto") || (overflow == "scroll") );
-                } catch(err) {
-                    //sometimes when scrolling in a popup, this causes 
-                    // obscure browser error
-                }
-            }
-
-            if (!allowScroll) {
-                allowScroll = OpenLayers.Element.hasClass(elem, 'olScrollable');
-                if (!allowScroll) {
-                    for (var i = 0, len = this.map.layers.length; i < len; i++) {
-                        // Are we in the layer div? Note that we have two cases
-                        // here: one is to catch EventPane layers, which have a
-                        // pane above the layer (layer.pane)
-                        var layer = this.map.layers[i];
-                        if (elem == layer.div || elem == layer.pane) {
-                            allowScroll = true;
-                            break;
-                        }
-                    }
-                }
-            }
-            overMapDiv = (elem == this.map.div);
-
-            elem = elem.parentNode;
-        }
-        
-        // Logic below is the following:
-        //
-        // If we are over a scrollable div or not over the map div:
-        //  * do nothing (let the browser handle scrolling)
-        //
-        //    otherwise 
-        // 
-        //    If we are over the layer div or a 'olScrollable' div:
-        //     * zoom/in out
-        //     then
-        //     * kill event (so as not to also scroll the page after zooming)
-        //
-        //       otherwise
-        //
-        //       Kill the event (dont scroll the page if we wheel over the 
-        //        layerswitcher or the pan/zoom control)
-        //
-        if (!overScrollableDiv && overMapDiv) {
-            if (allowScroll) {
-                var delta = 0;
-                
-                if (e.wheelDelta) {
-                    delta = e.wheelDelta;
-                    if (delta % 160 === 0) {
-                        // opera have steps of 160 instead of 120
-                        delta = delta * 0.75;
-                    }
-                    delta = delta / 120;
-                } else if (e.detail) {
-                    // detail in Firefox on OS X is 1/3 of Windows
-                    // so force delta 1 / -1
-                    delta = - (e.detail / Math.abs(e.detail));
-                }
-                this.delta += delta;
-
-                window.clearTimeout(this._timeoutId);
-                if(this.interval && Math.abs(this.delta) < this.maxDelta) {
-                    // store e because window.event might change during delay
-                    var evt = OpenLayers.Util.extend({}, e);
-                    this._timeoutId = window.setTimeout(
-                        OpenLayers.Function.bind(function(){
-                            this.wheelZoom(evt);
-                        }, this),
-                        this.interval
-                    );
-                } else {
-                    this.wheelZoom(e);
-                }
-            }
-            OpenLayers.Event.stop(e);
-        }
-    },
-
-    /**
-     * Method: wheelZoom
-     * Given the wheel event, we carry out the appropriate zooming in or out,
-     *     based on the 'wheelDelta' or 'detail' property of the event.
-     * 
-     * Parameters:
-     * e - {Event}
-     */
-    wheelZoom: function(e) {
-        var delta = this.delta;
-        this.delta = 0;
-        
-        if (delta) {
-            e.xy = this.map.events.getMousePosition(e);
-            if (delta < 0) {
-                this.callback("down",
-                    [e, this.cumulative ? Math.max(-this.maxDelta, delta) : -1]);
-            } else {
-                this.callback("up",
-                    [e, this.cumulative ? Math.min(this.maxDelta, delta) : 1]);
-            }
-        }
-    },
-    
-    /**
-     * Method: activate 
-     */
-    activate: function (evt) {
-        if (OpenLayers.Handler.prototype.activate.apply(this, arguments)) {
-            //register mousewheel events specifically on the window and document
-            var wheelListener = this.wheelListener;
-            OpenLayers.Event.observe(window, "DOMMouseScroll", wheelListener);
-            OpenLayers.Event.observe(window, "mousewheel", wheelListener);
-            OpenLayers.Event.observe(document, "mousewheel", wheelListener);
-            return true;
-        } else {
-            return false;
-        }
-    },
-
-    /**
-     * Method: deactivate 
-     */
-    deactivate: function (evt) {
-        if (OpenLayers.Handler.prototype.deactivate.apply(this, arguments)) {
-            // unregister mousewheel events specifically on the window and document
-            var wheelListener = this.wheelListener;
-            OpenLayers.Event.stopObserving(window, "DOMMouseScroll", wheelListener);
-            OpenLayers.Event.stopObserving(window, "mousewheel", wheelListener);
-            OpenLayers.Event.stopObserving(document, "mousewheel", wheelListener);
-            return true;
-        } else {
-            return false;
-        }
-    },
-
-    CLASS_NAME: "OpenLayers.Handler.MouseWheel"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Handler/Path.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Handler/Path.js
deleted file mode 100644
index 28512a15..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Handler/Path.js
+++ /dev/null
@@ -1,543 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-
-/**
- * @requires OpenLayers/Handler/Point.js
- * @requires OpenLayers/Geometry/Point.js
- * @requires OpenLayers/Geometry/LineString.js
- */
-
-/**
- * Class: OpenLayers.Handler.Path
- * Handler to draw a path on the map.  Path is displayed on mouse down,
- * moves on mouse move, and is finished on mouse up.
- *
- * Inherits from:
- *  - <OpenLayers.Handler.Point>
- */
-OpenLayers.Handler.Path = OpenLayers.Class(OpenLayers.Handler.Point, {
-    
-    /**
-     * Property: line
-     * {<OpenLayers.Feature.Vector>}
-     */
-    line: null,
-
-    /**
-     * APIProperty: maxVertices
-     * {Number} The maximum number of vertices which can be drawn by this
-     * handler. When the number of vertices reaches maxVertices, the
-     * geometry is automatically finalized. Default is null.
-     */
-    maxVertices: null,
-
-    /**
-     * Property: doubleTouchTolerance
-     * {Number} Maximum number of pixels between two touches for
-     *     the gesture to be considered a "finalize feature" action.
-     *     Default is 20.
-     */
-    doubleTouchTolerance: 20,
-
-    /**
-     * Property: freehand
-     * {Boolean} In freehand mode, the handler starts the path on mouse down,
-     * adds a point for every mouse move, and finishes the path on mouse up.
-     * Outside of freehand mode, a point is added to the path on every mouse
-     * click and double-click finishes the path.
-     */
-    freehand: false,
-    
-    /**
-     * Property: freehandToggle
-     * {String} If set, freehandToggle is checked on mouse events and will set
-     * the freehand mode to the opposite of this.freehand.  To disallow
-     * toggling between freehand and non-freehand mode, set freehandToggle to
-     * null.  Acceptable toggle values are 'shiftKey', 'ctrlKey', and 'altKey'.
-     */
-    freehandToggle: 'shiftKey',
-
-    /**
-     * Property: timerId
-     * {Integer} The timer used to test the double touch.
-     */
-    timerId: null,
-
-    /**
-     * Property: redoStack
-     * {Array} Stack containing points removed with <undo>.
-     */
-    redoStack: null,
-
-    /**
-     * Constructor: OpenLayers.Handler.Path
-     * Create a new path hander
-     *
-     * Parameters:
-     * control - {<OpenLayers.Control>} The control that owns this handler
-     * callbacks - {Object} An object with a properties whose values are
-     *     functions.  Various callbacks described below.
-     * options - {Object} An optional object with properties to be set on the
-     *           handler
-     *
-     * Named callbacks:
-     * create - Called when a sketch is first created.  Callback called with
-     *     the creation point geometry and sketch feature.
-     * modify - Called with each move of a vertex with the vertex (point)
-     *     geometry and the sketch feature.
-     * point - Called as each point is added.  Receives the new point geometry.
-     * done - Called when the point drawing is finished.  The callback will
-     *     recieve a single argument, the linestring geometry.
-     * cancel - Called when the handler is deactivated while drawing.  The
-     *     cancel callback will receive a geometry.
-     */
-
-    /**
-     * Method: createFeature
-     * Add temporary geometries
-     *
-     * Parameters:
-     * pixel - {<OpenLayers.Pixel>} The initial pixel location for the new
-     *     feature.
-     */
-    createFeature: function(pixel) {
-        var lonlat = this.layer.getLonLatFromViewPortPx(pixel); 
-        var geometry = new OpenLayers.Geometry.Point(
-            lonlat.lon, lonlat.lat
-        );
-        this.point = new OpenLayers.Feature.Vector(geometry);
-        this.line = new OpenLayers.Feature.Vector(
-            new OpenLayers.Geometry.LineString([this.point.geometry])
-        );
-        this.callback("create", [this.point.geometry, this.getSketch()]);
-        this.point.geometry.clearBounds();
-        this.layer.addFeatures([this.line, this.point], {silent: true});
-    },
-        
-    /**
-     * Method: destroyFeature
-     * Destroy temporary geometries
-     *
-     * Parameters:
-     * force - {Boolean} Destroy even if persist is true.
-     */
-    destroyFeature: function(force) {
-        OpenLayers.Handler.Point.prototype.destroyFeature.call(
-            this, force);
-        this.line = null;
-    },
-
-    /**
-     * Method: destroyPersistedFeature
-     * Destroy the persisted feature.
-     */
-    destroyPersistedFeature: function() {
-        var layer = this.layer;
-        if(layer && layer.features.length > 2) {
-            this.layer.features[0].destroy();
-        }
-    },
-
-    /**
-     * Method: removePoint
-     * Destroy the temporary point.
-     */
-    removePoint: function() {
-        if(this.point) {
-            this.layer.removeFeatures([this.point]);
-        }
-    },
-    
-    /**
-     * Method: addPoint
-     * Add point to geometry.  Send the point index to override
-     * the behavior of LinearRing that disregards adding duplicate points.
-     *
-     * Parameters:
-     * pixel - {<OpenLayers.Pixel>} The pixel location for the new point.
-     */
-    addPoint: function(pixel) {
-        this.layer.removeFeatures([this.point]);
-        var lonlat = this.layer.getLonLatFromViewPortPx(pixel); 
-        this.point = new OpenLayers.Feature.Vector(
-            new OpenLayers.Geometry.Point(lonlat.lon, lonlat.lat)
-        );
-        this.line.geometry.addComponent(
-            this.point.geometry, this.line.geometry.components.length
-        );
-        this.layer.addFeatures([this.point]);
-        this.callback("point", [this.point.geometry, this.getGeometry()]);
-        this.callback("modify", [this.point.geometry, this.getSketch()]);
-        this.drawFeature();
-        delete this.redoStack;
-    },
-    
-    /**
-     * Method: insertXY
-     * Insert a point in the current sketch given x & y coordinates.  The new
-     *     point is inserted immediately before the most recently drawn point.
-     *
-     * Parameters:
-     * x - {Number} The x-coordinate of the point.
-     * y - {Number} The y-coordinate of the point.
-     */
-    insertXY: function(x, y) {
-        this.line.geometry.addComponent(
-            new OpenLayers.Geometry.Point(x, y), 
-            this.getCurrentPointIndex()
-        );
-        this.drawFeature();
-        delete this.redoStack;
-    },
-
-    /**
-     * Method: insertDeltaXY
-     * Insert a point given offsets from the previously inserted point.
-     *
-     * Parameters:
-     * dx - {Number} The x-coordinate offset of the point.
-     * dy - {Number} The y-coordinate offset of the point.
-     */
-    insertDeltaXY: function(dx, dy) {
-        var previousIndex = this.getCurrentPointIndex() - 1;
-        var p0 = this.line.geometry.components[previousIndex];
-        if (p0 && !isNaN(p0.x) && !isNaN(p0.y)) {
-            this.insertXY(p0.x + dx, p0.y + dy);
-        }
-    },
-
-    /**
-     * Method: insertDirectionLength
-     * Insert a point in the current sketch given a direction and a length.
-     *
-     * Parameters:
-     * direction - {Number} Degrees clockwise from the positive x-axis.
-     * length - {Number} Distance from the previously drawn point.
-     */
-    insertDirectionLength: function(direction, length) {
-        direction *= Math.PI / 180;
-        var dx = length * Math.cos(direction);
-        var dy = length * Math.sin(direction);
-        this.insertDeltaXY(dx, dy);
-    },
-
-    /**
-     * Method: insertDeflectionLength
-     * Insert a point in the current sketch given a deflection and a length.
-     *     The deflection should be degrees clockwise from the previously 
-     *     digitized segment.
-     *
-     * Parameters:
-     * deflection - {Number} Degrees clockwise from the previous segment.
-     * length - {Number} Distance from the previously drawn point.
-     */
-    insertDeflectionLength: function(deflection, length) {
-        var previousIndex = this.getCurrentPointIndex() - 1;
-        if (previousIndex > 0) {
-            var p1 = this.line.geometry.components[previousIndex];
-            var p0 = this.line.geometry.components[previousIndex-1];
-            var theta = Math.atan2(p1.y - p0.y, p1.x - p0.x);
-            this.insertDirectionLength(
-                (theta * 180 / Math.PI) + deflection, length
-            );
-        }
-    },
-
-    /**
-     * Method: getCurrentPointIndex
-     * 
-     * Returns:
-     * {Number} The index of the most recently drawn point.
-     */
-    getCurrentPointIndex: function() {
-        return this.line.geometry.components.length - 1;
-    },
-    
-    
-    /**
-     * Method: undo
-     * Remove the most recently added point in the sketch geometry.
-     *
-     * Returns: 
-     * {Boolean} A point was removed.
-     */
-    undo: function() {
-        var geometry = this.line.geometry;
-        var components = geometry.components;
-        var index = this.getCurrentPointIndex() - 1;
-        var target = components[index];
-        var undone = geometry.removeComponent(target);
-        if (undone) {
-            // On touch devices, set the current ("mouse location") point to
-            // match the last digitized point.
-            if (this.touch && index > 0) {
-                components = geometry.components; // safety
-                var lastpt = components[index - 1];
-                var curptidx = this.getCurrentPointIndex();
-                var curpt = components[curptidx];
-                curpt.x = lastpt.x;
-                curpt.y = lastpt.y;
-            }
-            if (!this.redoStack) {
-                this.redoStack = [];
-            }
-            this.redoStack.push(target);
-            this.drawFeature();
-        }
-        return undone;
-    },
-    
-    /**
-     * Method: redo
-     * Reinsert the most recently removed point resulting from an <undo> call.
-     *     The undo stack is deleted whenever a point is added by other means.
-     *
-     * Returns: 
-     * {Boolean} A point was added.
-     */
-    redo: function() {
-        var target = this.redoStack && this.redoStack.pop();
-        if (target) {
-            this.line.geometry.addComponent(target, this.getCurrentPointIndex());
-            this.drawFeature();
-        }
-        return !!target;
-    },
-    
-    /**
-     * Method: freehandMode
-     * Determine whether to behave in freehand mode or not.
-     *
-     * Returns:
-     * {Boolean}
-     */
-    freehandMode: function(evt) {
-        return (this.freehandToggle && evt[this.freehandToggle]) ?
-                    !this.freehand : this.freehand;
-    },
-
-    /**
-     * Method: modifyFeature
-     * Modify the existing geometry given the new point
-     *
-     * Parameters:
-     * pixel - {<OpenLayers.Pixel>} The updated pixel location for the latest
-     *     point.
-     * drawing - {Boolean} Indicate if we're currently drawing.
-     */
-    modifyFeature: function(pixel, drawing) {
-        if(!this.line) {
-            this.createFeature(pixel);
-        }
-        var lonlat = this.layer.getLonLatFromViewPortPx(pixel); 
-        this.point.geometry.x = lonlat.lon;
-        this.point.geometry.y = lonlat.lat;
-        this.callback("modify", [this.point.geometry, this.getSketch(), drawing]);
-        this.point.geometry.clearBounds();
-        this.drawFeature();
-    },
-
-    /**
-     * Method: drawFeature
-     * Render geometries on the temporary layer.
-     */
-    drawFeature: function() {
-        this.layer.drawFeature(this.line, this.style);
-        this.layer.drawFeature(this.point, this.style);
-    },
-
-    /**
-     * Method: getSketch
-     * Return the sketch feature.
-     *
-     * Returns:
-     * {<OpenLayers.Feature.Vector>}
-     */
-    getSketch: function() {
-        return this.line;
-    },
-
-    /**
-     * Method: getGeometry
-     * Return the sketch geometry.  If <multi> is true, this will return
-     *     a multi-part geometry.
-     *
-     * Returns:
-     * {<OpenLayers.Geometry.LineString>}
-     */
-    getGeometry: function() {
-        var geometry = this.line && this.line.geometry;
-        if(geometry && this.multi) {
-            geometry = new OpenLayers.Geometry.MultiLineString([geometry]);
-        }
-        return geometry;
-    },
-
-    /**
-     * method: touchstart
-     * handle touchstart.
-     *
-     * parameters:
-     * evt - {event} the browser event
-     *
-     * returns:
-     * {boolean} allow event propagation
-     */
-    touchstart: function(evt) {
-        if (this.timerId &&
-            this.passesTolerance(this.lastTouchPx, evt.xy,
-                                 this.doubleTouchTolerance)) {
-            // double-tap, finalize the geometry
-            this.finishGeometry();
-            window.clearTimeout(this.timerId);
-            this.timerId = null;
-            return false;
-        } else {
-            if (this.timerId) {
-                window.clearTimeout(this.timerId);
-                this.timerId = null;
-            }
-            this.timerId = window.setTimeout(
-                OpenLayers.Function.bind(function() {
-                    this.timerId = null;
-                }, this), 300);
-            return OpenLayers.Handler.Point.prototype.touchstart.call(this, evt);
-        }
-    },
-
-    /**
-     * Method: down
-     * Handle mousedown and touchstart.  Add a new point to the geometry and
-     * render it. Return determines whether to propagate the event on the map.
-     * 
-     * Parameters:
-     * evt - {Event} The browser event
-     *
-     * Returns: 
-     * {Boolean} Allow event propagation
-     */
-    down: function(evt) {
-        var stopDown = this.stopDown;
-        if(this.freehandMode(evt)) {
-            stopDown = true;
-            if (this.touch) {
-                this.modifyFeature(evt.xy, !!this.lastUp);
-                OpenLayers.Event.stop(evt);
-            }
-        }
-        if (!this.touch && (!this.lastDown ||
-                            !this.passesTolerance(this.lastDown, evt.xy,
-                                                  this.pixelTolerance))) {
-            this.modifyFeature(evt.xy, !!this.lastUp);
-        }
-        this.mouseDown = true;
-        this.lastDown = evt.xy;
-        this.stoppedDown = stopDown;
-        return !stopDown;
-    },
-
-    /**
-     * Method: move
-     * Handle mousemove and touchmove.  Adjust the geometry and redraw.
-     * Return determines whether to propagate the event on the map.
-     * 
-     * Parameters:
-     * evt - {Event} The browser event
-     *
-     * Returns: 
-     * {Boolean} Allow event propagation
-     */
-    move: function (evt) {
-        if(this.stoppedDown && this.freehandMode(evt)) {
-            if(this.persist) {
-                this.destroyPersistedFeature();
-            }
-            if(this.maxVertices && this.line &&
-                    this.line.geometry.components.length === this.maxVertices) {
-                this.removePoint();
-                this.finalize();
-            } else {
-                this.addPoint(evt.xy);
-            }
-            return false;
-        }
-        if (!this.touch && (!this.mouseDown || this.stoppedDown)) {
-            this.modifyFeature(evt.xy, !!this.lastUp);
-        }
-        return true;
-    },
-    
-    /**
-     * Method: up
-     * Handle mouseup and touchend.  Send the latest point in the geometry to
-     * the control. Return determines whether to propagate the event on the map.
-     * 
-     * Parameters:
-     * evt - {Event} The browser event
-     *
-     * Returns: 
-     * {Boolean} Allow event propagation
-     */
-    up: function (evt) {
-        if (this.mouseDown && (!this.lastUp || !this.lastUp.equals(evt.xy))) {
-            if(this.stoppedDown && this.freehandMode(evt)) {
-                if (this.persist) {
-                    this.destroyPersistedFeature();
-                }
-                this.removePoint();
-                this.finalize();
-            } else {
-                if (this.passesTolerance(this.lastDown, evt.xy,
-                                         this.pixelTolerance)) {
-                    if (this.touch) {
-                        this.modifyFeature(evt.xy);
-                    }
-                    if(this.lastUp == null && this.persist) {
-                        this.destroyPersistedFeature();
-                    }
-                    this.addPoint(evt.xy);
-                    this.lastUp = evt.xy;
-                    if(this.line.geometry.components.length === this.maxVertices + 1) {
-                        this.finishGeometry();
-                    }
-                }
-            }
-        }
-        this.stoppedDown = this.stopDown;
-        this.mouseDown = false;
-        return !this.stopUp;
-    },
-
-    /**
-     * APIMethod: finishGeometry
-     * Finish the geometry and send it back to the control.
-     */
-    finishGeometry: function() {
-        var index = this.line.geometry.components.length - 1;
-        this.line.geometry.removeComponent(this.line.geometry.components[index]);
-        this.removePoint();
-        this.finalize();
-    },
-  
-    /**
-     * Method: dblclick 
-     * Handle double-clicks.
-     * 
-     * Parameters:
-     * evt - {Event} The browser event
-     *
-     * Returns: 
-     * {Boolean} Allow event propagation
-     */
-    dblclick: function(evt) {
-        if(!this.freehandMode(evt)) {
-            this.finishGeometry();
-        }
-        return false;
-    },
-
-    CLASS_NAME: "OpenLayers.Handler.Path"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Handler/Pinch.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Handler/Pinch.js
deleted file mode 100644
index cd3d086f..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Handler/Pinch.js
+++ /dev/null
@@ -1,239 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Handler.js
- */
-
-/**
- * Class: OpenLayers.Handler.Pinch
- * The pinch handler is used to deal with sequences of browser events related
- *     to pinch gestures. The handler is used by controls that want to know
- *     when a pinch sequence begins, when a pinch is happening, and when it has
- *     finished.
- *
- * Controls that use the pinch handler typically construct it with callbacks
- *     for 'start', 'move', and 'done'.  Callbacks for these keys are
- *     called when the pinch begins, with each change, and when the pinch is
- *     done.
- *
- * Create a new pinch handler with the <OpenLayers.Handler.Pinch> constructor.
- *
- * Inherits from:
- *  - <OpenLayers.Handler>
- */
-OpenLayers.Handler.Pinch = OpenLayers.Class(OpenLayers.Handler, {
-
-    /**
-     * Property: started
-     * {Boolean} When a touchstart event is received, we want to record it,
-     *     but not set 'pinching' until the touchmove get started after
-     *     starting.
-     */
-    started: false,
-
-    /**
-     * Property: stopDown
-     * {Boolean} Stop propagation of touchstart events from getting to
-     *     listeners on the same element. Default is false.
-     */
-    stopDown: false,
-
-    /**
-     * Property: pinching
-     * {Boolean}
-     */
-    pinching: false,
-
-    /**
-     * Property: last
-     * {Object} Object that store informations related to pinch last touch.
-     */
-    last: null,
-
-    /**
-     * Property: start
-     * {Object} Object that store informations related to pinch touchstart.
-     */
-    start: null,
-
-    /**
-     * Constructor: OpenLayers.Handler.Pinch
-     * Returns OpenLayers.Handler.Pinch
-     *
-     * Parameters:
-     * control - {<OpenLayers.Control>} The control that is making use of
-     *     this handler.  If a handler is being used without a control, the
-     *     handlers setMap method must be overridden to deal properly with
-     *     the map.
-     * callbacks - {Object} An object containing functions to be called when
-     *     the pinch operation start, change, or is finished. The callbacks
-     *     should expect to receive an object argument, which contains
-     *     information about scale, distance, and position of touch points.
-     * options - {Object}
-     */
-
-    /**
-     * Method: touchstart
-     * Handle touchstart events
-     *
-     * Parameters:
-     * evt - {Event}
-     *
-     * Returns:
-     * {Boolean} Let the event propagate.
-     */
-    touchstart: function(evt) {
-        var propagate = true;
-        this.pinching = false;
-        if (OpenLayers.Event.isMultiTouch(evt)) {
-            this.started = true;
-            this.last = this.start = {
-                distance: this.getDistance(evt.touches),
-                delta: 0,
-                scale: 1
-            };
-            this.callback("start", [evt, this.start]);
-            propagate = !this.stopDown;
-        } else if (this.started) {
-            // Some webkit versions send fake single-touch events during
-            // multitouch, which cause the drag handler to trigger
-            return false;
-        } else {
-            this.started = false;
-            this.start = null;
-            this.last = null;
-        }
-        // prevent document dragging
-        OpenLayers.Event.preventDefault(evt);
-        return propagate;
-    },
-
-    /**
-     * Method: touchmove
-     * Handle touchmove events
-     *
-     * Parameters:
-     * evt - {Event}
-     *
-     * Returns:
-     * {Boolean} Let the event propagate.
-     */
-    touchmove: function(evt) {
-        if (this.started && OpenLayers.Event.isMultiTouch(evt)) {
-            this.pinching = true;
-            var current = this.getPinchData(evt);
-            this.callback("move", [evt, current]);
-            this.last = current;
-            // prevent document dragging
-            OpenLayers.Event.stop(evt);
-        } else if (this.started) {
-            // Some webkit versions send fake single-touch events during
-            // multitouch, which cause the drag handler to trigger
-            return false;
-        }
-        return true;
-    },
-
-    /**
-     * Method: touchend
-     * Handle touchend events
-     *
-     * Parameters:
-     * evt - {Event}
-     *
-     * Returns:
-     * {Boolean} Let the event propagate.
-     */
-    touchend: function(evt) {
-        if (this.started && !OpenLayers.Event.isMultiTouch(evt)) {
-            this.started = false;
-            this.pinching = false;
-            this.callback("done", [evt, this.start, this.last]);
-            this.start = null;
-            this.last = null;
-            return false;
-        }
-        return true;
-    },
-
-    /**
-     * Method: activate
-     * Activate the handler.
-     *
-     * Returns:
-     * {Boolean} The handler was successfully activated.
-     */
-    activate: function() {
-        var activated = false;
-        if (OpenLayers.Handler.prototype.activate.apply(this, arguments)) {
-            this.pinching = false;
-            activated = true;
-        }
-        return activated;
-    },
-
-    /**
-     * Method: deactivate
-     * Deactivate the handler.
-     *
-     * Returns:
-     * {Boolean} The handler was successfully deactivated.
-     */
-    deactivate: function() {
-        var deactivated = false;
-        if (OpenLayers.Handler.prototype.deactivate.apply(this, arguments)) {
-            this.started = false;
-            this.pinching = false;
-            this.start = null;
-            this.last = null;
-            deactivated = true;
-        }
-        return deactivated;
-    },
-
-    /**
-     * Method: getDistance
-     * Get the distance in pixels between two touches.
-     *
-     * Parameters:
-     * touches - {Array(Object)}
-     *
-     * Returns:
-     * {Number} The distance in pixels.
-     */
-    getDistance: function(touches) {
-        var t0 = touches[0];
-        var t1 = touches[1];
-        return Math.sqrt(
-            Math.pow(t0.olClientX - t1.olClientX, 2) +
-            Math.pow(t0.olClientY - t1.olClientY, 2)
-        );
-    },
-
-
-    /**
-     * Method: getPinchData
-     * Get informations about the pinch event.
-     *
-     * Parameters:
-     * evt - {Event}
-     *
-     * Returns:
-     * {Object} Object that contains data about the current pinch.
-     */
-    getPinchData: function(evt) {
-        var distance = this.getDistance(evt.touches);
-        var scale = distance / this.start.distance;
-        return {
-            distance: distance,
-            delta: this.last.distance - distance,
-            scale: scale
-        };
-    },
-
-    CLASS_NAME: "OpenLayers.Handler.Pinch"
-});
-
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Handler/Point.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Handler/Point.js
deleted file mode 100644
index b4bb17c5..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Handler/Point.js
+++ /dev/null
@@ -1,556 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-
-/**
- * @requires OpenLayers/Handler.js
- * @requires OpenLayers/Geometry/Point.js
- */
-
-/**
- * Class: OpenLayers.Handler.Point
- * Handler to draw a point on the map. Point is displayed on activation,
- *     moves on mouse move, and is finished on mouse up. The handler triggers
- *     callbacks for 'done', 'cancel', and 'modify'. The modify callback is
- *     called with each change in the sketch and will receive the latest point
- *     drawn.  Create a new instance with the <OpenLayers.Handler.Point>
- *     constructor.
- * 
- * Inherits from:
- *  - <OpenLayers.Handler>
- */
-OpenLayers.Handler.Point = OpenLayers.Class(OpenLayers.Handler, {
-    
-    /**
-     * Property: point
-     * {<OpenLayers.Feature.Vector>} The currently drawn point
-     */
-    point: null,
-
-    /**
-     * Property: layer
-     * {<OpenLayers.Layer.Vector>} The temporary drawing layer
-     */
-    layer: null,
-    
-    /**
-     * APIProperty: multi
-     * {Boolean} Cast features to multi-part geometries before passing to the
-     *     layer.  Default is false.
-     */
-    multi: false,
-    
-    /**
-     * APIProperty: citeCompliant
-     * {Boolean} If set to true, coordinates of features drawn in a map extent
-     * crossing the date line won't exceed the world bounds. Default is false.
-     */
-    citeCompliant: false,
-    
-    /**
-     * Property: mouseDown
-     * {Boolean} The mouse is down
-     */
-    mouseDown: false,
-
-    /**
-     * Property: stoppedDown
-     * {Boolean} Indicate whether the last mousedown stopped the event
-     * propagation.
-     */
-    stoppedDown: null,
-
-    /**
-     * Property: lastDown
-     * {<OpenLayers.Pixel>} Location of the last mouse down
-     */
-    lastDown: null,
-
-    /**
-     * Property: lastUp
-     * {<OpenLayers.Pixel>}
-     */
-    lastUp: null,
-
-    /**
-     * APIProperty: persist
-     * {Boolean} Leave the feature rendered until destroyFeature is called.
-     *     Default is false.  If set to true, the feature remains rendered until
-     *     destroyFeature is called, typically by deactivating the handler or
-     *     starting another drawing.
-     */
-    persist: false,
-
-    /**
-     * APIProperty: stopDown
-     * {Boolean} Stop event propagation on mousedown. Must be false to
-     *     allow "pan while drawing". Defaults to false.
-     */
-    stopDown: false,
-
-    /**
-     * APIPropery: stopUp
-     * {Boolean} Stop event propagation on mouse. Must be false to
-     *     allow "pan while dragging". Defaults to fase.
-     */
-    stopUp: false,
-
-    /**
-     * Property: layerOptions
-     * {Object} Any optional properties to be set on the sketch layer.
-     */
-    layerOptions: null,
-    
-    /**
-     * APIProperty: pixelTolerance
-     * {Number} Maximum number of pixels between down and up (mousedown
-     *     and mouseup, or touchstart and touchend) for the handler to
-     *     add a new point. If set to an integer value, if the
-     *     displacement between down and up is great to this value
-     *     no point will be added. Default value is 5.
-     */
-    pixelTolerance: 5,
-
-    /**
-     * Property: lastTouchPx
-     * {<OpenLayers.Pixel>} The last pixel used to know the distance between
-     * two touches (for double touch).
-     */
-    lastTouchPx: null,
-
-    /**
-     * Constructor: OpenLayers.Handler.Point
-     * Create a new point handler.
-     *
-     * Parameters:
-     * control - {<OpenLayers.Control>} The control that owns this handler
-     * callbacks - {Object} An object with a properties whose values are
-     *     functions.  Various callbacks described below.
-     * options - {Object} An optional object with properties to be set on the
-     *           handler
-     *
-     * Named callbacks:
-     * create - Called when a sketch is first created.  Callback called with
-     *     the creation point geometry and sketch feature.
-     * modify - Called with each move of a vertex with the vertex (point)
-     *     geometry and the sketch feature.
-     * done - Called when the point drawing is finished.  The callback will
-     *     recieve a single argument, the point geometry.
-     * cancel - Called when the handler is deactivated while drawing.  The
-     *     cancel callback will receive a geometry.
-     */
-    initialize: function(control, callbacks, options) {
-        if(!(options && options.layerOptions && options.layerOptions.styleMap)) {
-            this.style = OpenLayers.Util.extend(OpenLayers.Feature.Vector.style['default'], {});
-        }
-
-        OpenLayers.Handler.prototype.initialize.apply(this, arguments);
-    },
-    
-    /**
-     * APIMethod: activate
-     * turn on the handler
-     */
-    activate: function() {
-        if(!OpenLayers.Handler.prototype.activate.apply(this, arguments)) {
-            return false;
-        }
-        // create temporary vector layer for rendering geometry sketch
-        // TBD: this could be moved to initialize/destroy - setting visibility here
-        var options = OpenLayers.Util.extend({
-            displayInLayerSwitcher: false,
-            // indicate that the temp vector layer will never be out of range
-            // without this, resolution properties must be specified at the
-            // map-level for this temporary layer to init its resolutions
-            // correctly
-            calculateInRange: OpenLayers.Function.True,
-            wrapDateLine: this.citeCompliant
-        }, this.layerOptions);
-        this.layer = new OpenLayers.Layer.Vector(this.CLASS_NAME, options);
-        this.map.addLayer(this.layer);
-        return true;
-    },
-    
-    /**
-     * Method: createFeature
-     * Add temporary features
-     *
-     * Parameters:
-     * pixel - {<OpenLayers.Pixel>} A pixel location on the map.
-     */
-    createFeature: function(pixel) {
-        var lonlat = this.layer.getLonLatFromViewPortPx(pixel); 
-        var geometry = new OpenLayers.Geometry.Point(
-            lonlat.lon, lonlat.lat
-        );
-        this.point = new OpenLayers.Feature.Vector(geometry);
-        this.callback("create", [this.point.geometry, this.point]);
-        this.point.geometry.clearBounds();
-        this.layer.addFeatures([this.point], {silent: true});
-    },
-
-    /**
-     * APIMethod: deactivate
-     * turn off the handler
-     */
-    deactivate: function() {
-        if(!OpenLayers.Handler.prototype.deactivate.apply(this, arguments)) {
-            return false;
-        }
-        this.cancel();
-        // If a layer's map property is set to null, it means that that layer
-        // isn't added to the map. Since we ourself added the layer to the map
-        // in activate(), we can assume that if this.layer.map is null it means
-        // that the layer has been destroyed (as a result of map.destroy() for
-        // example.
-        if (this.layer.map != null) {
-            this.destroyFeature(true);
-            this.layer.destroy(false);
-        }
-        this.layer = null;
-        return true;
-    },
-    
-    /**
-     * Method: destroyFeature
-     * Destroy the temporary geometries
-     *
-     * Parameters:
-     * force - {Boolean} Destroy even if persist is true.
-     */
-    destroyFeature: function(force) {
-        if(this.layer && (force || !this.persist)) {
-            this.layer.destroyFeatures();
-        }
-        this.point = null;
-    },
-
-    /**
-     * Method: destroyPersistedFeature
-     * Destroy the persisted feature.
-     */
-    destroyPersistedFeature: function() {
-        var layer = this.layer;
-        if(layer && layer.features.length > 1) {
-            this.layer.features[0].destroy();
-        }
-    },
-
-    /**
-     * Method: finalize
-     * Finish the geometry and call the "done" callback.
-     *
-     * Parameters:
-     * cancel - {Boolean} Call cancel instead of done callback.  Default
-     *          is false.
-     */
-    finalize: function(cancel) {
-        var key = cancel ? "cancel" : "done";
-        this.mouseDown = false;
-        this.lastDown = null;
-        this.lastUp = null;
-        this.lastTouchPx = null;
-        this.callback(key, [this.geometryClone()]);
-        this.destroyFeature(cancel);
-    },
-
-    /**
-     * APIMethod: cancel
-     * Finish the geometry and call the "cancel" callback.
-     */
-    cancel: function() {
-        this.finalize(true);
-    },
-
-    /**
-     * Method: click
-     * Handle clicks.  Clicks are stopped from propagating to other listeners
-     *     on map.events or other dom elements.
-     * 
-     * Parameters:
-     * evt - {Event} The browser event
-     *
-     * Returns: 
-     * {Boolean} Allow event propagation
-     */
-    click: function(evt) {
-        OpenLayers.Event.stop(evt);
-        return false;
-    },
-
-    /**
-     * Method: dblclick
-     * Handle double-clicks.  Double-clicks are stopped from propagating to other
-     *     listeners on map.events or other dom elements.
-     * 
-     * Parameters:
-     * evt - {Event} The browser event
-     *
-     * Returns: 
-     * {Boolean} Allow event propagation
-     */
-    dblclick: function(evt) {
-        OpenLayers.Event.stop(evt);
-        return false;
-    },
-    
-    /**
-     * Method: modifyFeature
-     * Modify the existing geometry given a pixel location.
-     *
-     * Parameters:
-     * pixel - {<OpenLayers.Pixel>} A pixel location on the map.
-     */
-    modifyFeature: function(pixel) {
-        if(!this.point) {
-            this.createFeature(pixel);
-        }
-        var lonlat = this.layer.getLonLatFromViewPortPx(pixel); 
-        this.point.geometry.x = lonlat.lon;
-        this.point.geometry.y = lonlat.lat;
-        this.callback("modify", [this.point.geometry, this.point, false]);
-        this.point.geometry.clearBounds();
-        this.drawFeature();
-    },
-
-    /**
-     * Method: drawFeature
-     * Render features on the temporary layer.
-     */
-    drawFeature: function() {
-        this.layer.drawFeature(this.point, this.style);
-    },
-    
-    /**
-     * Method: getGeometry
-     * Return the sketch geometry.  If <multi> is true, this will return
-     *     a multi-part geometry.
-     *
-     * Returns:
-     * {<OpenLayers.Geometry.Point>}
-     */
-    getGeometry: function() {
-        var geometry = this.point && this.point.geometry;
-        if(geometry && this.multi) {
-            geometry = new OpenLayers.Geometry.MultiPoint([geometry]);
-        }
-        return geometry;
-    },
-
-    /**
-     * Method: geometryClone
-     * Return a clone of the relevant geometry.
-     *
-     * Returns:
-     * {<OpenLayers.Geometry>}
-     */
-    geometryClone: function() {
-        var geom = this.getGeometry();
-        return geom && geom.clone();
-    },
-
-    /**
-     * Method: mousedown
-     * Handle mousedown.
-     * 
-     * Parameters:
-     * evt - {Event} The browser event
-     *
-     * Returns: 
-     * {Boolean} Allow event propagation
-     */
-    mousedown: function(evt) {
-        return this.down(evt);
-    },
-
-    /**
-     * Method: touchstart
-     * Handle touchstart.
-     * 
-     * Parameters:
-     * evt - {Event} The browser event
-     *
-     * Returns: 
-     * {Boolean} Allow event propagation
-     */
-    touchstart: function(evt) {
-        this.startTouch();
-        this.lastTouchPx = evt.xy;
-        return this.down(evt);
-    },
-
-    /**
-     * Method: mousemove
-     * Handle mousemove.
-     * 
-     * Parameters:
-     * evt - {Event} The browser event
-     *
-     * Returns: 
-     * {Boolean} Allow event propagation
-     */
-    mousemove: function(evt) {
-        return this.move(evt);
-    },
-
-    /**
-     * Method: touchmove
-     * Handle touchmove.
-     * 
-     * Parameters:
-     * evt - {Event} The browser event
-     *
-     * Returns: 
-     * {Boolean} Allow event propagation
-     */
-    touchmove: function(evt) {
-        this.lastTouchPx = evt.xy;
-        return this.move(evt);
-    },
-
-    /**
-     * Method: mouseup
-     * Handle mouseup.
-     * 
-     * Parameters:
-     * evt - {Event} The browser event
-     *
-     * Returns: 
-     * {Boolean} Allow event propagation
-     */
-    mouseup: function(evt) {
-        return this.up(evt);
-    },
-
-    /**
-     * Method: touchend
-     * Handle touchend.
-     * 
-     * Parameters:
-     * evt - {Event} The browser event
-     *
-     * Returns: 
-     * {Boolean} Allow event propagation
-     */
-    touchend: function(evt) {
-        evt.xy = this.lastTouchPx;
-        return this.up(evt);
-    },
-  
-    /**
-     * Method: down
-     * Handle mousedown and touchstart.  Adjust the geometry and redraw.
-     * Return determines whether to propagate the event on the map.
-     * 
-     * Parameters:
-     * evt - {Event} The browser event
-     *
-     * Returns: 
-     * {Boolean} Allow event propagation
-     */
-    down: function(evt) {
-        this.mouseDown = true;
-        this.lastDown = evt.xy;
-        if(!this.touch) { // no point displayed until up on touch devices
-            this.modifyFeature(evt.xy);
-        }
-        this.stoppedDown = this.stopDown;
-        return !this.stopDown;
-    },
-
-    /**
-     * Method: move
-     * Handle mousemove and touchmove.  Adjust the geometry and redraw.
-     * Return determines whether to propagate the event on the map.
-     * 
-     * Parameters:
-     * evt - {Event} The browser event
-     *
-     * Returns: 
-     * {Boolean} Allow event propagation
-     */
-    move: function (evt) {
-        if(!this.touch // no point displayed until up on touch devices
-           && (!this.mouseDown || this.stoppedDown)) {
-            this.modifyFeature(evt.xy);
-        }
-        return true;
-    },
-
-    /**
-     * Method: up
-     * Handle mouseup and touchend.  Send the latest point in the geometry to the control.
-     * Return determines whether to propagate the event on the map.
-     *
-     * Parameters:
-     * evt - {Event} The browser event
-     *
-     * Returns: 
-     * {Boolean} Allow event propagation
-     */
-    up: function (evt) {
-        this.mouseDown = false;
-        this.stoppedDown = this.stopDown;
-
-        // check keyboard modifiers
-        if(!this.checkModifiers(evt)) {
-            return true;
-        }
-        // ignore double-clicks
-        if (this.lastUp && this.lastUp.equals(evt.xy)) {
-            return true;
-        }
-        if (this.lastDown && this.passesTolerance(this.lastDown, evt.xy,
-                                                  this.pixelTolerance)) {
-            if (this.touch) {
-                this.modifyFeature(evt.xy);
-            }
-            if(this.persist) {
-                this.destroyPersistedFeature();
-            }
-            this.lastUp = evt.xy;
-            this.finalize();
-            return !this.stopUp;
-        } else {
-            return true;
-        }
-    },
-
-    /**
-     * Method: mouseout
-     * Handle mouse out.  For better user experience reset mouseDown
-     * and stoppedDown when the mouse leaves the map viewport.
-     *
-     * Parameters:
-     * evt - {Event} The browser event
-     */
-    mouseout: function(evt) {
-        if(OpenLayers.Util.mouseLeft(evt, this.map.viewPortDiv)) {
-            this.stoppedDown = this.stopDown;
-            this.mouseDown = false;
-        }
-    },
-
-    /**
-     * Method: passesTolerance
-     * Determine whether the event is within the optional pixel tolerance.
-     *
-     * Returns:
-     * {Boolean} The event is within the pixel tolerance (if specified).
-     */
-    passesTolerance: function(pixel1, pixel2, tolerance) {
-        var passes = true;
-
-        if (tolerance != null && pixel1 && pixel2) {
-            var dist = pixel1.distanceTo(pixel2);
-            if (dist > tolerance) {
-                passes = false;
-            }
-        }
-        return passes;
-    },
-    
-    CLASS_NAME: "OpenLayers.Handler.Point"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Handler/Polygon.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Handler/Polygon.js
deleted file mode 100644
index 4f6dfd28..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Handler/Polygon.js
+++ /dev/null
@@ -1,305 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-
-/**
- * @requires OpenLayers/Handler/Path.js
- * @requires OpenLayers/Geometry/Polygon.js
- */
-
-/**
- * Class: OpenLayers.Handler.Polygon
- * Handler to draw a polygon on the map.  Polygon is displayed on mouse down,
- * moves on mouse move, and is finished on mouse up.
- *
- * Inherits from:
- *  - <OpenLayers.Handler.Path>
- *  - <OpenLayers.Handler>
- */
-OpenLayers.Handler.Polygon = OpenLayers.Class(OpenLayers.Handler.Path, {
-    
-    /** 
-     * APIProperty: holeModifier
-     * {String} Key modifier to trigger hole digitizing.  Acceptable values are
-     *     "altKey", "shiftKey", or "ctrlKey".  If not set, no hole digitizing
-     *     will take place.  Default is null.
-     */
-    holeModifier: null,
-    
-    /**
-     * Property: drawingHole
-     * {Boolean} Currently drawing an interior ring.
-     */
-    drawingHole: false,
-    
-    /**
-     * Property: polygon
-     * {<OpenLayers.Feature.Vector>}
-     */
-    polygon: null,
-
-    /**
-     * Constructor: OpenLayers.Handler.Polygon
-     * Create a Polygon Handler.
-     *
-     * Parameters:
-     * control - {<OpenLayers.Control>} The control that owns this handler
-     * callbacks - {Object} An object with a properties whose values are
-     *     functions.  Various callbacks described below.
-     * options - {Object} An optional object with properties to be set on the
-     *           handler
-     *
-     * Named callbacks:
-     * create - Called when a sketch is first created.  Callback called with
-     *     the creation point geometry and sketch feature.
-     * modify - Called with each move of a vertex with the vertex (point)
-     *     geometry and the sketch feature.
-     * point - Called as each point is added.  Receives the new point geometry.
-     * done - Called when the point drawing is finished.  The callback will
-     *     recieve a single argument, the polygon geometry.
-     * cancel - Called when the handler is deactivated while drawing.  The
-     *     cancel callback will receive a geometry.
-     */
-    
-    /**
-     * Method: createFeature
-     * Add temporary geometries
-     *
-     * Parameters:
-     * pixel - {<OpenLayers.Pixel>} The initial pixel location for the new
-     *     feature.
-     */
-    createFeature: function(pixel) {
-        var lonlat = this.layer.getLonLatFromViewPortPx(pixel);
-        var geometry = new OpenLayers.Geometry.Point(
-            lonlat.lon, lonlat.lat
-        );
-        this.point = new OpenLayers.Feature.Vector(geometry);
-        this.line = new OpenLayers.Feature.Vector(
-            new OpenLayers.Geometry.LinearRing([this.point.geometry])
-        );
-        this.polygon = new OpenLayers.Feature.Vector(
-            new OpenLayers.Geometry.Polygon([this.line.geometry])
-        );
-        this.callback("create", [this.point.geometry, this.getSketch()]);
-        this.point.geometry.clearBounds();
-        this.layer.addFeatures([this.polygon, this.point], {silent: true});
-    },
-
-    /**
-     * Method: addPoint
-     * Add point to geometry.
-     *
-     * Parameters:
-     * pixel - {<OpenLayers.Pixel>} The pixel location for the new point.
-     */
-    addPoint: function(pixel) {
-        if(!this.drawingHole && this.holeModifier &&
-           this.evt && this.evt[this.holeModifier]) {
-            var geometry = this.point.geometry;
-            var features = this.control.layer.features;
-            var candidate, polygon;
-            // look for intersections, last drawn gets priority
-            for (var i=features.length-1; i>=0; --i) {
-                candidate = features[i].geometry;
-                if ((candidate instanceof OpenLayers.Geometry.Polygon || 
-                    candidate instanceof OpenLayers.Geometry.MultiPolygon) && 
-                    candidate.intersects(geometry)) {
-                    polygon = features[i];
-                    this.control.layer.removeFeatures([polygon], {silent: true});
-                    this.control.layer.events.registerPriority(
-                        "sketchcomplete", this, this.finalizeInteriorRing
-                    );
-                    this.control.layer.events.registerPriority(
-                        "sketchmodified", this, this.enforceTopology
-                    );
-                    polygon.geometry.addComponent(this.line.geometry);
-                    this.polygon = polygon;
-                    this.drawingHole = true;
-                    break;
-                }
-            }
-        }
-        OpenLayers.Handler.Path.prototype.addPoint.apply(this, arguments);
-    },
-
-    /**
-     * Method: getCurrentPointIndex
-     * 
-     * Returns:
-     * {Number} The index of the most recently drawn point.
-     */
-    getCurrentPointIndex: function() {
-        return this.line.geometry.components.length - 2;
-    },
-
-    /**
-     * Method: enforceTopology
-     * Simple topology enforcement for drawing interior rings.  Ensures vertices
-     *     of interior rings are contained by exterior ring.  Other topology 
-     *     rules are enforced in <finalizeInteriorRing> to allow drawing of 
-     *     rings that intersect only during the sketch (e.g. a "C" shaped ring
-     *     that nearly encloses another ring).
-     */
-    enforceTopology: function(event) {
-        var point = event.vertex;
-        var components = this.line.geometry.components;
-        // ensure that vertices of interior ring are contained by exterior ring
-        if (!this.polygon.geometry.intersects(point)) {
-            var last = components[components.length-3];
-            point.x = last.x;
-            point.y = last.y;
-        }
-    },
-
-    /**
-     * Method: finishGeometry
-     * Finish the geometry and send it back to the control.
-     */
-    finishGeometry: function() {
-        var index = this.line.geometry.components.length - 2;
-        this.line.geometry.removeComponent(this.line.geometry.components[index]);
-        this.removePoint();
-        this.finalize();
-    },
-
-    /**
-     * Method: finalizeInteriorRing
-     * Enforces that new ring has some area and doesn't contain vertices of any
-     *     other rings.
-     */
-    finalizeInteriorRing: function() {
-        var ring = this.line.geometry;
-        // ensure that ring has some area
-        var modified = (ring.getArea() !== 0);
-        if (modified) {
-            // ensure that new ring doesn't intersect any other rings
-            var rings = this.polygon.geometry.components;
-            for (var i=rings.length-2; i>=0; --i) {
-                if (ring.intersects(rings[i])) {
-                    modified = false;
-                    break;
-                }
-            }
-            if (modified) {
-                // ensure that new ring doesn't contain any other rings
-                var target;
-                outer: for (var i=rings.length-2; i>0; --i) {
-                    var points = rings[i].components;
-                    for (var j=0, jj=points.length; j<jj; ++j) {
-                        if (ring.containsPoint(points[j])) {
-                            modified = false;
-                            break outer;
-                        }
-                    }
-                }
-            }
-        }
-        if (modified) {
-            if (this.polygon.state !== OpenLayers.State.INSERT) {
-                this.polygon.state = OpenLayers.State.UPDATE;
-            }
-        } else {
-            this.polygon.geometry.removeComponent(ring);
-        }
-        this.restoreFeature();
-        return false;
-    },
-
-    /**
-     * APIMethod: cancel
-     * Finish the geometry and call the "cancel" callback.
-     */
-    cancel: function() {
-        if (this.drawingHole) {
-            this.polygon.geometry.removeComponent(this.line.geometry);
-            this.restoreFeature(true);
-        }
-        return OpenLayers.Handler.Path.prototype.cancel.apply(this, arguments);
-    },
-    
-    /**
-     * Method: restoreFeature
-     * Move the feature from the sketch layer to the target layer.
-     *
-     * Properties: 
-     * cancel - {Boolean} Cancel drawing.  If falsey, the "sketchcomplete" event
-     *     will be fired.
-     */
-    restoreFeature: function(cancel) {
-        this.control.layer.events.unregister(
-            "sketchcomplete", this, this.finalizeInteriorRing
-        );
-        this.control.layer.events.unregister(
-            "sketchmodified", this, this.enforceTopology
-        );
-        this.layer.removeFeatures([this.polygon], {silent: true});
-        this.control.layer.addFeatures([this.polygon], {silent: true});
-        this.drawingHole = false;
-        if (!cancel) {
-            // Re-trigger "sketchcomplete" so other listeners can do their
-            // business.  While this is somewhat sloppy (if a listener is 
-            // registered with registerPriority - not common - between the start
-            // and end of a single ring drawing - very uncommon - it will be 
-            // called twice).
-            // TODO: In 3.0, collapse sketch handlers into geometry specific
-            // drawing controls.
-            this.control.layer.events.triggerEvent(
-                "sketchcomplete", {feature : this.polygon}
-            );
-        }
-    },
-
-    /**
-     * Method: destroyFeature
-     * Destroy temporary geometries
-     *
-     * Parameters:
-     * force - {Boolean} Destroy even if persist is true.
-     */
-    destroyFeature: function(force) {
-        OpenLayers.Handler.Path.prototype.destroyFeature.call(
-            this, force);
-        this.polygon = null;
-    },
-
-    /**
-     * Method: drawFeature
-     * Render geometries on the temporary layer.
-     */
-    drawFeature: function() {
-        this.layer.drawFeature(this.polygon, this.style);
-        this.layer.drawFeature(this.point, this.style);
-    },
-    
-    /**
-     * Method: getSketch
-     * Return the sketch feature.
-     *
-     * Returns:
-     * {<OpenLayers.Feature.Vector>}
-     */
-    getSketch: function() {
-        return this.polygon;
-    },
-
-    /**
-     * Method: getGeometry
-     * Return the sketch geometry.  If <multi> is true, this will return
-     *     a multi-part geometry.
-     *
-     * Returns:
-     * {<OpenLayers.Geometry.Polygon>}
-     */
-    getGeometry: function() {
-        var geometry = this.polygon && this.polygon.geometry;
-        if(geometry && this.multi) {
-            geometry = new OpenLayers.Geometry.MultiPolygon([geometry]);
-        }
-        return geometry;
-    },
-
-    CLASS_NAME: "OpenLayers.Handler.Polygon"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Handler/RegularPolygon.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Handler/RegularPolygon.js
deleted file mode 100644
index bf4e2db9..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Handler/RegularPolygon.js
+++ /dev/null
@@ -1,429 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-
-/**
- * @requires OpenLayers/Handler/Drag.js
- */
-
-/**
- * Class: OpenLayers.Handler.RegularPolygon
- * Handler to draw a regular polygon on the map.  Polygon is displayed on mouse
- *     down, moves or is modified on mouse move, and is finished on mouse up.
- *     The handler triggers callbacks for 'done' and 'cancel'.  Create a new
- *     instance with the <OpenLayers.Handler.RegularPolygon> constructor.
- * 
- * Inherits from:
- *  - <OpenLayers.Handler.Drag>
- */
-OpenLayers.Handler.RegularPolygon = OpenLayers.Class(OpenLayers.Handler.Drag, {
-    
-    /**
-     * APIProperty: sides
-     * {Integer} Number of sides for the regular polygon.  Needs to be greater
-     *     than 2.  Defaults to 4.
-     */
-    sides: 4,
-
-    /**
-     * APIProperty: radius
-     * {Float} Optional radius in map units of the regular polygon.  If this is
-     *     set to some non-zero value, a polygon with a fixed radius will be
-     *     drawn and dragged with mose movements.  If this property is not
-     *     set, dragging changes the radius of the polygon.  Set to null by
-     *     default.
-     */
-    radius: null,
-    
-    /**
-     * APIProperty: snapAngle
-     * {Float} If set to a non-zero value, the handler will snap the polygon
-     *     rotation to multiples of the snapAngle.  Value is an angle measured
-     *     in degrees counterclockwise from the positive x-axis.  
-     */
-    snapAngle: null,
-    
-    /**
-     * APIProperty: snapToggle
-     * {String} If set, snapToggle is checked on mouse events and will set
-     *     the snap mode to the opposite of what it currently is.  To disallow
-     *     toggling between snap and non-snap mode, set freehandToggle to
-     *     null.  Acceptable toggle values are 'shiftKey', 'ctrlKey', and
-     *     'altKey'. Snap mode is only possible if this.snapAngle is set to a
-     *     non-zero value.
-     */
-    snapToggle: 'shiftKey',
-    
-    /**
-     * Property: layerOptions
-     * {Object} Any optional properties to be set on the sketch layer.
-     */
-    layerOptions: null,
-
-    /**
-     * APIProperty: persist
-     * {Boolean} Leave the feature rendered until clear is called.  Default
-     *     is false.  If set to true, the feature remains rendered until
-     *     clear is called, typically by deactivating the handler or starting
-     *     another drawing.
-     */
-    persist: false,
-
-    /**
-     * APIProperty: irregular
-     * {Boolean} Draw an irregular polygon instead of a regular polygon.
-     *     Default is false.  If true, the initial mouse down will represent
-     *     one corner of the polygon bounds and with each mouse movement, the
-     *     polygon will be stretched so the opposite corner of its bounds
-     *     follows the mouse position.  This property takes precedence over
-     *     the radius property.  If set to true, the radius property will
-     *     be ignored.
-     */
-    irregular: false,
-
-    /**
-     * APIProperty: citeCompliant
-     * {Boolean} If set to true, coordinates of features drawn in a map extent
-     * crossing the date line won't exceed the world bounds. Default is false.
-     */
-    citeCompliant: false,
-
-    /**
-     * Property: angle
-     * {Float} The angle from the origin (mouse down) to the current mouse
-     *     position, in radians.  This is measured counterclockwise from the
-     *     positive x-axis.
-     */
-    angle: null,
-
-    /**
-     * Property: fixedRadius
-     * {Boolean} The polygon has a fixed radius.  True if a radius is set before
-     *     drawing begins.  False otherwise.
-     */
-    fixedRadius: false,
-
-    /**
-     * Property: feature
-     * {<OpenLayers.Feature.Vector>} The currently drawn polygon feature
-     */
-    feature: null,
-
-    /**
-     * Property: layer
-     * {<OpenLayers.Layer.Vector>} The temporary drawing layer
-     */
-    layer: null,
-
-    /**
-     * Property: origin
-     * {<OpenLayers.Geometry.Point>} Location of the first mouse down
-     */
-    origin: null,
-
-    /**
-     * Constructor: OpenLayers.Handler.RegularPolygon
-     * Create a new regular polygon handler.
-     *
-     * Parameters:
-     * control - {<OpenLayers.Control>} The control that owns this handler
-     * callbacks - {Object} An object with a properties whose values are
-     *     functions.  Various callbacks described below.
-     * options - {Object} An object with properties to be set on the handler.
-     *     If the options.sides property is not specified, the number of sides
-     *     will default to 4.
-     *
-     * Named callbacks:
-     * create - Called when a sketch is first created.  Callback called with
-     *     the creation point geometry and sketch feature.
-     * done - Called when the sketch drawing is finished.  The callback will
-     *     recieve a single argument, the sketch geometry.
-     * cancel - Called when the handler is deactivated while drawing.  The
-     *     cancel callback will receive a geometry.
-     */
-    initialize: function(control, callbacks, options) {
-        if(!(options && options.layerOptions && options.layerOptions.styleMap)) {
-            this.style = OpenLayers.Util.extend(OpenLayers.Feature.Vector.style['default'], {});
-        }
-
-        OpenLayers.Handler.Drag.prototype.initialize.apply(this,
-                                                [control, callbacks, options]);
-        this.options = (options) ? options : {};
-    },
-    
-    /**
-     * APIMethod: setOptions
-     * 
-     * Parameters:
-     * newOptions - {Object} 
-     */
-    setOptions: function (newOptions) {
-        OpenLayers.Util.extend(this.options, newOptions);
-        OpenLayers.Util.extend(this, newOptions);
-    },
-    
-    /**
-     * APIMethod: activate
-     * Turn on the handler.
-     *
-     * Returns:
-     * {Boolean} The handler was successfully activated
-     */
-    activate: function() {
-        var activated = false;
-        if(OpenLayers.Handler.Drag.prototype.activate.apply(this, arguments)) {
-            // create temporary vector layer for rendering geometry sketch
-            var options = OpenLayers.Util.extend({
-                displayInLayerSwitcher: false,
-                // indicate that the temp vector layer will never be out of range
-                // without this, resolution properties must be specified at the
-                // map-level for this temporary layer to init its resolutions
-                // correctly
-                calculateInRange: OpenLayers.Function.True,
-                wrapDateLine: this.citeCompliant
-            }, this.layerOptions);
-            this.layer = new OpenLayers.Layer.Vector(this.CLASS_NAME, options);
-            this.map.addLayer(this.layer);
-            activated = true;
-        }
-        return activated;
-    },
-
-    /**
-     * APIMethod: deactivate
-     * Turn off the handler.
-     *
-     * Returns:
-     * {Boolean} The handler was successfully deactivated
-     */
-    deactivate: function() {
-        var deactivated = false;
-        if(OpenLayers.Handler.Drag.prototype.deactivate.apply(this, arguments)) {
-            // call the cancel callback if mid-drawing
-            if(this.dragging) {
-                this.cancel();
-            }
-            // If a layer's map property is set to null, it means that that
-            // layer isn't added to the map. Since we ourself added the layer
-            // to the map in activate(), we can assume that if this.layer.map
-            // is null it means that the layer has been destroyed (as a result
-            // of map.destroy() for example.
-            if (this.layer.map != null) {
-                this.layer.destroy(false);
-                if (this.feature) {
-                    this.feature.destroy();
-                }
-            }
-            this.layer = null;
-            this.feature = null;
-            deactivated = true;
-        }
-        return deactivated;
-    },
-    
-    /**
-     * Method: down
-     * Start drawing a new feature
-     *
-     * Parameters:
-     * evt - {Event} The drag start event
-     */
-    down: function(evt) {
-        this.fixedRadius = !!(this.radius);
-        var maploc = this.layer.getLonLatFromViewPortPx(evt.xy); 
-        this.origin = new OpenLayers.Geometry.Point(maploc.lon, maploc.lat);
-        // create the new polygon
-        if(!this.fixedRadius || this.irregular) {
-            // smallest radius should not be less one pixel in map units
-            // VML doesn't behave well with smaller
-            this.radius = this.map.getResolution();
-        }
-        if(this.persist) {
-            this.clear();
-        }
-        this.feature = new OpenLayers.Feature.Vector();
-        this.createGeometry();
-        this.callback("create", [this.origin, this.feature]);
-        this.layer.addFeatures([this.feature], {silent: true});
-        this.layer.drawFeature(this.feature, this.style);
-    },
-    
-    /**
-     * Method: move
-     * Respond to drag move events
-     *
-     * Parameters:
-     * evt - {Evt} The move event
-     */
-    move: function(evt) {
-        var maploc = this.layer.getLonLatFromViewPortPx(evt.xy); 
-        var point = new OpenLayers.Geometry.Point(maploc.lon, maploc.lat);
-        if(this.irregular) {
-            var ry = Math.sqrt(2) * Math.abs(point.y - this.origin.y) / 2;
-            this.radius = Math.max(this.map.getResolution() / 2, ry);
-        } else if(this.fixedRadius) {
-            this.origin = point;
-        } else {
-            this.calculateAngle(point, evt);
-            this.radius = Math.max(this.map.getResolution() / 2,
-                                   point.distanceTo(this.origin));
-        }
-        this.modifyGeometry();
-        if(this.irregular) {
-            var dx = point.x - this.origin.x;
-            var dy = point.y - this.origin.y;
-            var ratio;
-            if(dy == 0) {
-                ratio = dx / (this.radius * Math.sqrt(2));
-            } else {
-                ratio = dx / dy;
-            }
-            this.feature.geometry.resize(1, this.origin, ratio);
-            this.feature.geometry.move(dx / 2, dy / 2);
-        }
-        this.layer.drawFeature(this.feature, this.style);
-    },
-
-    /**
-     * Method: up
-     * Finish drawing the feature
-     *
-     * Parameters:
-     * evt - {Event} The mouse up event
-     */
-    up: function(evt) {
-        this.finalize();
-        // the mouseup method of superclass doesn't call the
-        // "done" callback if there's been no move between
-        // down and up
-        if (this.start == this.last) {
-            this.callback("done", [evt.xy]);
-        }
-    },
-
-    /**
-     * Method: out
-     * Finish drawing the feature.
-     *
-     * Parameters:
-     * evt - {Event} The mouse out event
-     */
-    out: function(evt) {
-        this.finalize();
-    },
-
-    /**
-     * Method: createGeometry
-     * Create the new polygon geometry.  This is called at the start of the
-     *     drag and at any point during the drag if the number of sides
-     *     changes.
-     */
-    createGeometry: function() {
-        this.angle = Math.PI * ((1/this.sides) - (1/2));
-        if(this.snapAngle) {
-            this.angle += this.snapAngle * (Math.PI / 180);
-        }
-        this.feature.geometry = OpenLayers.Geometry.Polygon.createRegularPolygon(
-            this.origin, this.radius, this.sides, this.snapAngle
-        );
-    },
-    
-    /**
-     * Method: modifyGeometry
-     * Modify the polygon geometry in place.
-     */
-    modifyGeometry: function() {
-        var angle, point;
-        var ring = this.feature.geometry.components[0];
-        // if the number of sides ever changes, create a new geometry
-        if(ring.components.length != (this.sides + 1)) {
-            this.createGeometry();
-            ring = this.feature.geometry.components[0];
-        }
-        for(var i=0; i<this.sides; ++i) {
-            point = ring.components[i];
-            angle = this.angle + (i * 2 * Math.PI / this.sides);
-            point.x = this.origin.x + (this.radius * Math.cos(angle));
-            point.y = this.origin.y + (this.radius * Math.sin(angle));
-            point.clearBounds();
-        }
-    },
-    
-    /**
-     * Method: calculateAngle
-     * Calculate the angle based on settings.
-     *
-     * Parameters:
-     * point - {<OpenLayers.Geometry.Point>}
-     * evt - {Event}
-     */
-    calculateAngle: function(point, evt) {
-        var alpha = Math.atan2(point.y - this.origin.y,
-                               point.x - this.origin.x);
-        if(this.snapAngle && (this.snapToggle && !evt[this.snapToggle])) {
-            var snapAngleRad = (Math.PI / 180) * this.snapAngle;
-            this.angle = Math.round(alpha / snapAngleRad) * snapAngleRad;
-        } else {
-            this.angle = alpha;
-        }
-    },
-
-    /**
-     * APIMethod: cancel
-     * Finish the geometry and call the "cancel" callback.
-     */
-    cancel: function() {
-        // the polygon geometry gets cloned in the callback method
-        this.callback("cancel", null);
-        this.finalize();
-    },
-
-    /**
-     * Method: finalize
-     * Finish the geometry and call the "done" callback.
-     */
-    finalize: function() {
-        this.origin = null;
-        this.radius = this.options.radius;
-    },
-
-    /**
-     * APIMethod: clear
-     * Clear any rendered features on the temporary layer.  This is called
-     *     when the handler is deactivated, canceled, or done (unless persist
-     *     is true).
-     */
-    clear: function() {
-        if (this.layer) {
-            this.layer.renderer.clear();
-            this.layer.destroyFeatures();
-        }
-    },
-    
-    /**
-     * Method: callback
-     * Trigger the control's named callback with the given arguments
-     *
-     * Parameters:
-     * name - {String} The key for the callback that is one of the properties
-     *     of the handler's callbacks object.
-     * args - {Array} An array of arguments with which to call the callback
-     *     (defined by the control).
-     */
-    callback: function (name, args) {
-        // override the callback method to always send the polygon geometry
-        if (this.callbacks[name]) {
-            this.callbacks[name].apply(this.control,
-                                       [this.feature.geometry.clone()]);
-        }
-        // since sketch features are added to the temporary layer
-        // they must be cleared here if done or cancel
-        if(!this.persist && (name == "done" || name == "cancel")) {
-            this.clear();
-        }
-    },
-
-    CLASS_NAME: "OpenLayers.Handler.RegularPolygon"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Icon.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Icon.js
deleted file mode 100644
index 2d8f9673..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Icon.js
+++ /dev/null
@@ -1,243 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/BaseTypes/Class.js
- */
-
-/**
- * Class: OpenLayers.Icon
- * 
- * The icon represents a graphical icon on the screen.  Typically used in
- * conjunction with a <OpenLayers.Marker> to represent markers on a screen.
- *
- * An icon has a url, size and position.  It also contains an offset which 
- * allows the center point to be represented correctly.  This can be
- * provided either as a fixed offset or a function provided to calculate
- * the desired offset. 
- * 
- */
-OpenLayers.Icon = OpenLayers.Class({
-    
-    /** 
-     * Property: url 
-     * {String}  image url
-     */
-    url: null,
-    
-    /** 
-     * Property: size 
-     * {<OpenLayers.Size>|Object} An OpenLayers.Size or
-     * an object with a 'w' and 'h' properties.
-     */
-    size: null,
-
-    /** 
-     * Property: offset 
-     * {<OpenLayers.Pixel>|Object} distance in pixels to offset the
-     * image when being rendered. An OpenLayers.Pixel or an object
-     * with a 'x' and 'y' properties.
-     */
-    offset: null,    
-    
-    /** 
-     * Property: calculateOffset 
-     * {Function} Function to calculate the offset (based on the size)
-     */
-    calculateOffset: null,    
-    
-    /** 
-     * Property: imageDiv 
-     * {DOMElement} 
-     */
-    imageDiv: null,
-
-    /** 
-     * Property: px 
-     * {<OpenLayers.Pixel>|Object} An OpenLayers.Pixel or an object
-     * with a 'x' and 'y' properties.
-     */
-    px: null,
-    
-    /** 
-     * Constructor: OpenLayers.Icon
-     * Creates an icon, which is an image tag in a div.  
-     *
-     * url - {String} 
-     * size - {<OpenLayers.Size>|Object} An OpenLayers.Size or an
-     *                                   object with a 'w' and 'h'
-     *                                   properties.
-     * offset - {<OpenLayers.Pixel>|Object} An OpenLayers.Pixel or an
-     *                                      object with a 'x' and 'y'
-     *                                      properties.
-     * calculateOffset - {Function} 
-     */
-    initialize: function(url, size, offset, calculateOffset) {
-        this.url = url;
-        this.size = size || {w: 20, h: 20};
-        this.offset = offset || {x: -(this.size.w/2), y: -(this.size.h/2)};
-        this.calculateOffset = calculateOffset;
-
-        var id = OpenLayers.Util.createUniqueID("OL_Icon_");
-        this.imageDiv = OpenLayers.Util.createAlphaImageDiv(id);
-    },
-    
-    /** 
-     * Method: destroy
-     * Nullify references and remove event listeners to prevent circular 
-     * references and memory leaks
-     */
-    destroy: function() {
-        // erase any drawn elements
-        this.erase();
-
-        OpenLayers.Event.stopObservingElement(this.imageDiv.firstChild); 
-        this.imageDiv.innerHTML = "";
-        this.imageDiv = null;
-    },
-
-    /** 
-     * Method: clone
-     * 
-     * Returns:
-     * {<OpenLayers.Icon>} A fresh copy of the icon.
-     */
-    clone: function() {
-        return new OpenLayers.Icon(this.url, 
-                                   this.size, 
-                                   this.offset, 
-                                   this.calculateOffset);
-    },
-    
-    /**
-     * Method: setSize
-     * 
-     * Parameters:
-     * size - {<OpenLayers.Size>|Object} An OpenLayers.Size or
-     * an object with a 'w' and 'h' properties.
-     */
-    setSize: function(size) {
-        if (size != null) {
-            this.size = size;
-        }
-        this.draw();
-    },
-    
-    /**
-     * Method: setUrl
-     * 
-     * Parameters:
-     * url - {String} 
-     */
-    setUrl: function(url) {
-        if (url != null) {
-            this.url = url;
-        }
-        this.draw();
-    },
-
-    /** 
-     * Method: draw
-     * Move the div to the given pixel.
-     * 
-     * Parameters:
-     * px - {<OpenLayers.Pixel>|Object} An OpenLayers.Pixel or an
-     *                                  object with a 'x' and 'y' properties.
-     * 
-     * Returns:
-     * {DOMElement} A new DOM Image of this icon set at the location passed-in
-     */
-    draw: function(px) {
-        OpenLayers.Util.modifyAlphaImageDiv(this.imageDiv, 
-                                            null, 
-                                            null, 
-                                            this.size, 
-                                            this.url, 
-                                            "absolute");
-        this.moveTo(px);
-        return this.imageDiv;
-    }, 
-
-    /** 
-     * Method: erase
-     * Erase the underlying image element.
-     */
-    erase: function() {
-        if (this.imageDiv != null && this.imageDiv.parentNode != null) {
-            OpenLayers.Element.remove(this.imageDiv);
-        }
-    }, 
-    
-    /** 
-     * Method: setOpacity
-     * Change the icon's opacity
-     *
-     * Parameters:
-     * opacity - {float} 
-     */
-    setOpacity: function(opacity) {
-        OpenLayers.Util.modifyAlphaImageDiv(this.imageDiv, null, null, null, 
-                                            null, null, null, null, opacity);
-
-    },
-    
-    /**
-     * Method: moveTo
-     * move icon to passed in px.
-     *
-     * Parameters:
-     * px - {<OpenLayers.Pixel>|Object} the pixel position to move to.
-     * An OpenLayers.Pixel or an object with a 'x' and 'y' properties.
-     */
-    moveTo: function (px) {
-        //if no px passed in, use stored location
-        if (px != null) {
-            this.px = px;
-        }
-
-        if (this.imageDiv != null) {
-            if (this.px == null) {
-                this.display(false);
-            } else {
-                if (this.calculateOffset) {
-                    this.offset = this.calculateOffset(this.size);  
-                }
-                OpenLayers.Util.modifyAlphaImageDiv(this.imageDiv, null, {
-                    x: this.px.x + this.offset.x,
-                    y: this.px.y + this.offset.y
-                });
-            }
-        }
-    },
-    
-    /** 
-     * Method: display
-     * Hide or show the icon
-     *
-     * Parameters:
-     * display - {Boolean} 
-     */
-    display: function(display) {
-        this.imageDiv.style.display = (display) ? "" : "none"; 
-    },
-    
-
-    /**
-     * APIMethod: isDrawn
-     * 
-     * Returns:
-     * {Boolean} Whether or not the icon is drawn.
-     */
-    isDrawn: function() {
-        // nodeType 11 for ie, whose nodes *always* have a parentNode
-        // (of type document fragment)
-        var isDrawn = (this.imageDiv && this.imageDiv.parentNode && 
-                       (this.imageDiv.parentNode.nodeType != 11));    
-
-        return isDrawn;   
-    },
-
-    CLASS_NAME: "OpenLayers.Icon"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Kinetic.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Kinetic.js
deleted file mode 100644
index 1cd78864..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Kinetic.js
+++ /dev/null
@@ -1,178 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/BaseTypes/Class.js
- * @requires OpenLayers/Animation.js
- */
-
-OpenLayers.Kinetic = OpenLayers.Class({
-
-    /**
-     * Property: threshold
-     * In most cases changing the threshold isn't needed.
-     * In px/ms, default to 0.
-     */
-    threshold: 0,
-
-    /**
-     * Property: deceleration
-     * {Float} the deseleration in px/ms², default to 0.0035.
-     */
-    deceleration: 0.0035,
-
-    /**
-     * Property: nbPoints
-     * {Integer} the number of points we use to calculate the kinetic
-     * initial values.
-     */
-    nbPoints: 100,
-
-    /**
-     * Property: delay
-     * {Float} time to consider to calculate the kinetic initial values.
-     * In ms, default to 200.
-     */
-    delay: 200,
-
-    /**
-     * Property: points
-     * List of points use to calculate the kinetic initial values.
-     */
-    points: undefined,
-
-    /**
-     * Property: timerId
-     * ID of the timer.
-     */
-    timerId: undefined,
-
-    /**
-     * Constructor: OpenLayers.Kinetic
-     *
-     * Parameters:
-     * options - {Object}
-     */
-    initialize: function(options) {
-        OpenLayers.Util.extend(this, options);
-    },
-
-    /**
-     * Method: begin
-     * Begins the dragging.
-     */
-    begin: function() {
-        OpenLayers.Animation.stop(this.timerId);
-        this.timerId = undefined;
-        this.points = [];
-    },
-
-    /**
-     * Method: update
-     * Updates during the dragging.
-     *
-     * Parameters:
-     * xy - {<OpenLayers.Pixel>} The new position.
-     */
-    update: function(xy) {
-        this.points.unshift({xy: xy, tick: new Date().getTime()});
-        if (this.points.length > this.nbPoints) {
-            this.points.pop();
-        }
-    },
-
-    /**
-     * Method: end
-     * Ends the dragging, start the kinetic.
-     *
-     * Parameters:
-     * xy - {<OpenLayers.Pixel>} The last position.
-     *
-     * Returns:
-     * {Object} An object with two properties: "speed", and "theta". The
-     *     "speed" and "theta" values are to be passed to the move 
-     *     function when starting the animation.
-     */
-    end: function(xy) {
-        var last, now = new Date().getTime();
-        for (var i = 0, l = this.points.length, point; i < l; i++) {
-            point = this.points[i];
-            if (now - point.tick > this.delay) {
-                break;
-            }
-            last = point;
-        }
-        if (!last) {
-            return;
-        }
-        var time = new Date().getTime() - last.tick;
-        var dist = Math.sqrt(Math.pow(xy.x - last.xy.x, 2) +
-                             Math.pow(xy.y - last.xy.y, 2));
-        var speed = dist / time;
-        if (speed == 0 || speed < this.threshold) {
-            return;
-        }
-        var theta = Math.asin((xy.y - last.xy.y) / dist);
-        if (last.xy.x <= xy.x) {
-            theta = Math.PI - theta;
-        }
-        return {speed: speed, theta: theta};
-    },
-
-    /**
-     * Method: move
-     * Launch the kinetic move pan.
-     *
-     * Parameters:
-     * info - {Object} An object with two properties, "speed", and "theta".
-     *     These values are those returned from the "end" call.
-     * callback - {Function} Function called on every step of the animation,
-     *     receives x, y (values to pan), end (is the last point).
-     */
-    move: function(info, callback) {
-        var v0 = info.speed;
-        var fx = Math.cos(info.theta);
-        var fy = -Math.sin(info.theta);
-
-        var initialTime = new Date().getTime();
-
-        var lastX = 0;
-        var lastY = 0;
-
-        var timerCallback = function() {
-            if (this.timerId == null) {
-                return;
-            }
-
-            var t = new Date().getTime() - initialTime;
-
-            var p = (-this.deceleration * Math.pow(t, 2)) / 2.0 + v0 * t;
-            var x = p * fx;
-            var y = p * fy;
-
-            var args = {};
-            args.end = false;
-            var v = -this.deceleration * t + v0;
-
-            if (v <= 0) {
-                OpenLayers.Animation.stop(this.timerId);
-                this.timerId = null;
-                args.end = true;
-            }
-
-            args.x = x - lastX;
-            args.y = y - lastY;
-            lastX = x;
-            lastY = y;
-            callback(args.x, args.y, args.end);
-        };
-
-        this.timerId = OpenLayers.Animation.start(
-            OpenLayers.Function.bind(timerCallback, this)
-        );
-    },
-
-    CLASS_NAME: "OpenLayers.Kinetic"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang.js
deleted file mode 100644
index 068562d3..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang.js
+++ /dev/null
@@ -1,134 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/BaseTypes.js
- * @requires OpenLayers/Console.js
- */
-
-/**
- * Namespace: OpenLayers.Lang
- * Internationalization namespace.  Contains dictionaries in various languages
- *     and methods to set and get the current language.
- */
-OpenLayers.Lang = {
-    
-    /** 
-     * Property: code
-     * {String}  Current language code to use in OpenLayers.  Use the
-     *     <setCode> method to set this value and the <getCode> method to
-     *     retrieve it.
-     */
-    code: null,
-
-    /** 
-     * APIProperty: defaultCode
-     * {String} Default language to use when a specific language can't be
-     *     found.  Default is "en".
-     */
-    defaultCode: "en",
-        
-    /**
-     * APIFunction: getCode
-     * Get the current language code.
-     *
-     * Returns:
-     * {String} The current language code.
-     */
-    getCode: function() {
-        if(!OpenLayers.Lang.code) {
-            OpenLayers.Lang.setCode();
-        }
-        return OpenLayers.Lang.code;
-    },
-    
-    /**
-     * APIFunction: setCode
-     * Set the language code for string translation.  This code is used by
-     *     the <OpenLayers.Lang.translate> method.
-     *
-     * Parameters:
-     * code - {String} These codes follow the IETF recommendations at
-     *     http://www.ietf.org/rfc/rfc3066.txt.  If no value is set, the
-     *     browser's language setting will be tested.  If no <OpenLayers.Lang>
-     *     dictionary exists for the code, the <OpenLayers.String.defaultLang>
-     *     will be used.
-     */
-    setCode: function(code) {
-        var lang;
-        if(!code) {
-            code = (OpenLayers.BROWSER_NAME == "msie") ?
-                navigator.userLanguage : navigator.language;
-        }
-        var parts = code.split('-');
-        parts[0] = parts[0].toLowerCase();
-        if(typeof OpenLayers.Lang[parts[0]] == "object") {
-            lang = parts[0];
-        }
-
-        // check for regional extensions
-        if(parts[1]) {
-            var testLang = parts[0] + '-' + parts[1].toUpperCase();
-            if(typeof OpenLayers.Lang[testLang] == "object") {
-                lang = testLang;
-            }
-        }
-        if(!lang) {
-            OpenLayers.Console.warn(
-                'Failed to find OpenLayers.Lang.' + parts.join("-") +
-                ' dictionary, falling back to default language'
-            );
-            lang = OpenLayers.Lang.defaultCode;
-        }
-        
-        OpenLayers.Lang.code = lang;
-    },
-
-    /**
-     * APIMethod: translate
-     * Looks up a key from a dictionary based on the current language string.
-     *     The value of <getCode> will be used to determine the appropriate
-     *     dictionary.  Dictionaries are stored in <OpenLayers.Lang>.
-     *
-     * Parameters:
-     * key - {String} The key for an i18n string value in the dictionary.
-     * context - {Object} Optional context to be used with
-     *     <OpenLayers.String.format>.
-     * 
-     * Returns:
-     * {String} A internationalized string.
-     */
-    translate: function(key, context) {
-        var dictionary = OpenLayers.Lang[OpenLayers.Lang.getCode()];
-        var message = dictionary && dictionary[key];
-        if(!message) {
-            // Message not found, fall back to message key
-            message = key;
-        }
-        if(context) {
-            message = OpenLayers.String.format(message, context);
-        }
-        return message;
-    }
-    
-};
-
-
-/**
- * APIMethod: OpenLayers.i18n
- * Alias for <OpenLayers.Lang.translate>.  Looks up a key from a dictionary
- *     based on the current language string. The value of
- *     <OpenLayers.Lang.getCode> will be used to determine the appropriate
- *     dictionary.  Dictionaries are stored in <OpenLayers.Lang>.
- *
- * Parameters:
- * key - {String} The key for an i18n string value in the dictionary.
- * context - {Object} Optional context to be used with
- *     <OpenLayers.String.format>.
- * 
- * Returns:
- * {String} A internationalized string.
- */
-OpenLayers.i18n = OpenLayers.Lang.translate;
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/ar.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/ar.js
deleted file mode 100644
index b9fe2248..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/ar.js
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Translators (2009 onwards):
- *  - Meno25
- *  - Mutarjem horr
- */
-
-/**
- * @requires OpenLayers/Lang.js
- */
-
-/**
- * Namespace: OpenLayers.Lang["ar"]
- * Dictionary for العربية.  Keys for entries are used in calls to
- *     <OpenLayers.Lang.translate>.  Entry bodies are normal strings or
- *     strings formatted for use with <OpenLayers.String.format> calls.
- */
-OpenLayers.Lang["ar"] = OpenLayers.Util.applyDefaults({
-
-    'Permalink': "وصلة دائمة",
-
-    'Base Layer': "الطبقة الاساسية",
-
-    'Scale = 1 : ${scaleDenom}': "النسبة = 1 : ${scaleDenom}",
-
-    'W': "غ",
-
-    'E': "شر",
-
-    'N': "شم",
-
-    'S': "ج"
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/be-tarask.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/be-tarask.js
deleted file mode 100644
index 29fc1a37..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/be-tarask.js
+++ /dev/null
@@ -1,54 +0,0 @@
-/* Translators (2009 onwards):
- *  - EugeneZelenko
- *  - Jim-by
- */
-
-/**
- * @requires OpenLayers/Lang.js
- */
-
-/**
- * Namespace: OpenLayers.Lang["be-tarask"]
- * Dictionary for Беларуская (тарашкевіца).  Keys for entries are used in calls to
- *     <OpenLayers.Lang.translate>.  Entry bodies are normal strings or
- *     strings formatted for use with <OpenLayers.String.format> calls.
- */
-OpenLayers.Lang["be-tarask"] = OpenLayers.Util.applyDefaults({
-
-    'unhandledRequest': "Неапрацаваны вынік запыту ${statusText}",
-
-    'Permalink': "Сталая спасылка",
-
-    'Overlays': "Слаі",
-
-    'Base Layer': "Базавы слой",
-
-    'noFID': "Немагчыма абнавіць магчымасьць, для якога не існуе FID.",
-
-    'browserNotSupported': "Ваш браўзэр не падтрымлівае вэктарную графіку. У цяперашні момант падтрымліваюцца: ${renderers}",
-
-    'minZoomLevelError': "Уласьцівасьць minZoomLevel прызначана толькі для выкарыстаньня са слаямі вытворнымі ад FixedZoomLevels. Тое, што  гэты wfs-слой правяраецца на minZoomLevel — рэха прошлага. Але мы ня можам выдаліць гэтую магчымасьць, таму што ад яе залежаць некаторыя заснаваныя на OL дастасаваньні. Тым ня менш, праверка minZoomLevel будзе выдаленая ў вэрсіі 3.0. Калі ласка, выкарыстоўваеце замест яе ўстаноўкі мінімальнага/максымальнага памераў, як апісана тут: http://trac.openlayers.org/wiki/SettingZoomLevels",
-
-    'commitSuccess': "WFS-транзакцыя: ПОСЬПЕХ ${response}",
-
-    'commitFailed': "WFS-транзакцыя: ПАМЫЛКА ${response}",
-
-    'googleWarning': "Не атрымалася загрузіць слой Google. \x3cbr\x3e\x3cbr\x3eКаб пазбавіцца гэтага паведамленьня, выберыце новы базавы слой у сьпісе ў верхнім правым куце.\x3cbr\x3e\x3cbr\x3e Хутчэй за ўсё, прычына ў тым, што скрыпт бібліятэкі Google Maps ня быў уключаныя альбо не ўтрымлівае слушны API-ключ для Вашага сайта.\x3cbr\x3e\x3cbr\x3eРаспрацоўшчыкам: Для таго, каб даведацца як зрабіць так, каб усё працавала, \x3ca href=\'http://trac.openlayers.org/wiki/Google\' target=\'_blank\'\x3eнацісьніце тут\x3c/a\x3e",
-
-    'getLayerWarning': "Немагчыма загрузіць слой ${layerType}.\x3cbr\x3e\x3cbr\x3eКаб пазбавіцца гэтага паведамленьня, выберыце новы базавы слой у сьпісе ў верхнім правым куце.\x3cbr\x3e\x3cbr\x3eХутчэй за ўсё, прычына ў тым, што скрыпт бібліятэкі ${layerLib} ня быў слушна ўключаны.\x3cbr\x3e\x3cbr\x3eРаспрацоўшчыкам: Для таго, каб даведацца як зрабіць так, каб усё працавала, \x3ca href=\'http://trac.openlayers.org/wiki/${layerLib}\' target=\'_blank\'\x3eнацісьніце тут\x3c/a\x3e",
-
-    'Scale = 1 : ${scaleDenom}': "Маштаб = 1 : ${scaleDenom}",
-
-    'W': "З",
-
-    'E': "У",
-
-    'N': "Пн",
-
-    'S': "Пд",
-
-    'reprojectDeprecated': "Вы выкарыстоўваеце ўстаноўку \'reproject\' для слоя ${layerName}. Гэтая ўстаноўка зьяўляецца састарэлай: яна выкарыстоўвалася для падтрымкі паказу зьвестак на камэрцыйных базавых мапах, але гэта функцыя цяпер рэалізаваная ў убудаванай падтрымцы сфэрычнай праекцыі Мэркатара. Дадатковая інфармацыя ёсьць на http://trac.openlayers.org/wiki/SphericalMercator.",
-
-    'methodDeprecated': "Гэты мэтад састарэлы і будзе выдалены ў вэрсіі 3.0. Калі ласка, замест яго выкарыстоўвайце ${newMethod}."
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/bg.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/bg.js
deleted file mode 100644
index 86f53aaf..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/bg.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Translators (2009 onwards):
- *  - DCLXVI
- */
-
-/**
- * @requires OpenLayers/Lang.js
- */
-
-/**
- * Namespace: OpenLayers.Lang["bg"]
- * Dictionary for Български.  Keys for entries are used in calls to
- *     <OpenLayers.Lang.translate>.  Entry bodies are normal strings or
- *     strings formatted for use with <OpenLayers.String.format> calls.
- */
-OpenLayers.Lang["bg"] = OpenLayers.Util.applyDefaults({
-
-    'Permalink': "Постоянна препратка",
-
-    'Base Layer': "Основен слой",
-
-    'Scale = 1 : ${scaleDenom}': "Мащаб = 1 : ${scaleDenom}",
-
-    'methodDeprecated': "Този метод е остарял и ще бъде премахват в 3.0. Вместо него използвайте ${newMethod}."
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/br.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/br.js
deleted file mode 100644
index 1e81559c..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/br.js
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Translators (2009 onwards):
- *  - Fulup
- */
-
-/**
- * @requires OpenLayers/Lang.js
- */
-
-/**
- * Namespace: OpenLayers.Lang["br"]
- * Dictionary for Brezhoneg.  Keys for entries are used in calls to
- *     <OpenLayers.Lang.translate>.  Entry bodies are normal strings or
- *     strings formatted for use with <OpenLayers.String.format> calls.
- */
-OpenLayers.Lang["br"] = OpenLayers.Util.applyDefaults({
-
-    'unhandledRequest': "Distro evel reked anveret ${statusText}",
-
-    'Permalink': "Peurliamm",
-
-    'Overlays': "Gwiskadoù",
-
-    'Base Layer': "Gwiskad diazez",
-
-    'noFID': "N\'haller ket hizivaat un elfenn ma n\'eus ket a niverenn-anaout (FID) eviti.",
-
-    'browserNotSupported': "N\'eo ket skoret an daskor vektorel gant ho merdeer. Setu aze an daskorerioù skoret evit ar poent :\n${renderers}",
-
-    'minZoomLevelError': "Ne zleer implijout ar perzh minZoomLevel nemet evit gwiskadoù FixedZoomLevels-descendent. Ar fed ma wiria ar gwiskad WHS-se hag-eñ ez eus eus minZoomLevel zo un aspadenn gozh. Koulskoude n\'omp ket evit e ziverkañ kuit da derriñ arloadoù diazezet war OL a c\'hallfe bezañ stag outañ. Setu perak eo dispredet -- Lamet kuit e vo ar gwiriañ minZoomLevel a-is er stumm 3.0. Ober gant an arventennoù bihanañ/brasañ evel deskrivet amañ e plas : http://trac.openlayers.org/wiki/SettingZoomLevels",
-
-    'commitSuccess': "Treuzgread WFS : MAT EO ${response}",
-
-    'commitFailed': "Treuzgread WFS Transaction: C\'HWITET ${response}",
-
-    'googleWarning': "N\'eus ket bet gallet kargañ ar gwiskad Google ent reizh.\x3cbr\x3e\x3cbr\x3eEvit en em zizober eus ar c\'hemenn-mañ, dibabit ur BaseLayer nevez en diuzer gwiskadoù er c\'horn dehoù el laez.\x3cbr\x3e\x3cbr\x3eSur a-walc\'h eo peogwir n\'eo ket bet ensoc\'het levraoueg Google Maps pe neuze ne glot ket an alc\'hwez API gant ho lec\'hienn.\x3cbr\x3e\x3cbr\x3eDiorroerien : Evit reizhañ an dra-se, \x3ca href=\'http://trac.openlayers.org/wiki/Google\' target=\'_blank\'\x3eclick here\x3c/a\x3e",
-
-    'getLayerWarning': "N\'haller ket kargañ ar gwiskad ${layerType} ent reizh.\x3cbr\x3e\x3cbr\x3eEvit en em zizober eus ar c\'hemenn-mañ, dibabit ur BaseLayer nevez en diuzer gwiskadoù er c\'horn dehoù el laez.\x3cbr\x3e\x3cbr\x3eSur a-walc\'h eo peogwir n\'eo ket bet ensoc\'het mat al levraoueg ${layerLib}.\x3cbr\x3e\x3cbr\x3eDiorroerien : Evit gouzout penaos reizhañ an dra-se, \x3ca href=\'http://trac.openlayers.org/wiki/${layerLib}\' target=\'_blank\'\x3eclick here\x3c/a\x3e",
-
-    'Scale = 1 : ${scaleDenom}': "Skeul = 1 : ${scaleDenom}",
-
-    'W': "K",
-
-    'E': "R",
-
-    'N': "N",
-
-    'S': "S",
-
-    'reprojectDeprecated': "Emaoc\'h oc\'h implijout an dibarzh \'reproject\' war ar gwiskad ${layerName}. Dispredet eo an dibarzh-mañ : bet eo hag e talveze da ziskwel roadennoù war-c\'horre kartennoù diazez kenwerzhel, un dra hag a c\'haller ober bremañ gant an arc\'hwel dre skor banndres boullek Mercator. Muioc\'h a ditouroù a c\'haller da gaout war http://trac.openlayers.org/wiki/SphericalMercator.",
-
-    'methodDeprecated': "Dispredet eo an daore-se ha tennet e vo kuit eus ar stumm 3.0. Grit gant ${newMethod} e plas."
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/ca.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/ca.js
deleted file mode 100644
index 75bcf8aa..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/ca.js
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
- * @requires OpenLayers/Lang.js
- */
-
-/**
- * Namespace: OpenLayers.Lang["ca"]
- * Dictionary for Catalan, UTF8 encoding. Keys for entries are used in calls to
- *     <OpenLayers.Lang.translate>.  Entry bodies are normal strings or
- *     strings formatted for use with <OpenLayers.String.format> calls.
- */
-OpenLayers.Lang.ca = {
-
-    'unhandledRequest': "Resposta a petició no gestionada ${statusText}",
-
-    'Permalink': "Enllaç permanent",
-
-    'Overlays': "Capes addicionals",
-
-    'Base Layer': "Capa Base",
-
-    'noFID': "No es pot actualitzar un element per al que no existeix FID.",
-
-    'browserNotSupported':
-        "El seu navegador no suporta renderització vectorial. Els renderitzadors suportats actualment són:\n${renderers}",
-
-    // console message
-    'minZoomLevelError':
-        "La propietat minZoomLevel s'ha d'utilitzar només " +
-        "amb les capes que tenen FixedZoomLevels. El fet que " +
-        "una capa wfs comprovi minZoomLevel és una relíquia del " +
-        "passat. No podem, però, eliminar-la sense trencar " +
-        "les aplicacions d'OpenLayers que en puguin dependre. " +
-        "Així doncs estem fent-la obsoleta -- la comprovació " +
-        "minZoomLevel s'eliminarà a la versió 3.0. Feu servir " +
-        "els paràmetres min/max resolution en substitució, tal com es descriu aquí: " +
-        "http://trac.openlayers.org/wiki/SettingZoomLevels",
-
-    'commitSuccess': "Transacció WFS: CORRECTA ${response}",
-
-    'commitFailed': "Transacció WFS: HA FALLAT ${response}",
-
-    'googleWarning':
-        "La capa Google no s'ha pogut carregar correctament.<br><br>" +
-        "Per evitar aquest missatge, seleccioneu una nova Capa Base " +
-        "al gestor de capes de la cantonada superior dreta.<br><br>" +
-        "Probablement això és degut a que l'script de la biblioteca de " +
-    "Google Maps no ha estat inclòs a la vostra pàgina, o no " +
-    "conté la clau de l'API correcta per a la vostra adreça.<br><br>" +
-        "Desenvolupadors: Per obtenir consells sobre com fer anar això, " +
-        "<a href='http://trac.openlayers.org/wiki/Google' " +
-        "target='_blank'>féu clic aquí</a>",
-
-    'getLayerWarning':
-        "Per evitar aquest missatge, seleccioneu una nova Capa Base " +
-        "al gestor de capes de la cantonada superior dreta.<br><br>" +
-        "Probablement això és degut a que l'script de la biblioteca " +
-        "${layerLib} " +
-        "no ha estat inclòs a la vostra pàgina.<br><br>" +
-        "Desenvolupadors: Per obtenir consells sobre com fer anar això, " +
-        "<a href='http://trac.openlayers.org/wiki/${layerLib}' " +
-        "target='_blank'>féu clic aquí</a>",
-
-    'Scale = 1 : ${scaleDenom}': "Escala = 1 : ${scaleDenom}",
-
-    //labels for the graticule control
-    'W': 'O',
-    'E': 'E',
-    'N': 'N',
-    'S': 'S',
-    'Graticule': 'Retícula',    
-        
-    // console message
-    'reprojectDeprecated':
-        "Esteu fent servir l'opció 'reproject' a la capa " +
-        "${layerName}. Aquesta opció és obsoleta: el seu ús fou concebut " +
-        "per suportar la visualització de dades sobre mapes base comercials, " + 
-        "però ara aquesta funcionalitat s'hauria d'assolir mitjançant el suport " +
-        "de la projecció Spherical Mercator. Més informació disponible a " +
-        "http://trac.openlayers.org/wiki/SphericalMercator.",
-
-    // console message
-    'methodDeprecated':
-        "Aquest mètode és obsolet i s'eliminarà a la versió 3.0. " +
-        "Si us plau feu servir em mètode alternatiu ${newMethod}.",
-
-    // **** end ****
-    'end': ''
-
-};
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/cs-CZ.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/cs-CZ.js
deleted file mode 100644
index 85a55dad..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/cs-CZ.js
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Translators (2009 onwards):
- *  - Mormegil
- */
-
-/**
- * @requires OpenLayers/Lang.js
- */
-
-/**
- * Namespace: OpenLayers.Lang["cs-CZ"]
- * Dictionary for Česky.  Keys for entries are used in calls to
- *     <OpenLayers.Lang.translate>.  Entry bodies are normal strings or
- *     strings formatted for use with <OpenLayers.String.format> calls.
- */
-OpenLayers.Lang["cs-CZ"] = OpenLayers.Util.applyDefaults({
-
-    'unhandledRequest': "Nezpracovaná návratová hodnota ${statusText}",
-
-    'Permalink': "Trvalý odkaz",
-
-    'Overlays': "Překryvné vrstvy",
-
-    'Base Layer': "Podkladové vrstvy",
-
-    'noFID': "Nelze aktualizovat prvek, pro který neexistuje FID.",
-
-    'browserNotSupported': "Váš prohlížeč nepodporuje vykreslování vektorů. Momentálně podporované nástroje jsou::\n${renderers}",
-
-    'minZoomLevelError': "Vlastnost minZoomLevel by se měla používat pouze s potomky FixedZoomLevels vrstvami. To znamená, že vrstva wfs kontroluje, zda-li minZoomLevel není zbytek z minulosti.Nelze to ovšem vyjmout bez možnosti, že bychom rozbili aplikace postavené na OL, které by na tom mohly záviset. Proto tuto vlastnost nedoporučujeme používat --  kontrola minZoomLevel bude odstraněna ve verzi 3.0. Použijte prosím raději nastavení min/max podle příkaldu popsaného na: http://trac.openlayers.org/wiki/SettingZoomLevels",
-
-    'commitSuccess': "WFS Transaction: ÚSPĚCH ${response}",
-
-    'commitFailed': "WFS Transaction: CHYBA ${response}",
-
-    'googleWarning': "Nepodařilo se správně načíst vrstvu Google.\x3cbr\x3e\x3cbr\x3eAbyste se zbavili této zprávy, zvolte jinou základní vrstvu v přepínači vrstev.\x3cbr\x3e\x3cbr\x3eTo se většinou stává, pokud nebyl načten skript, nebo neobsahuje správný klíč pro API pro tuto stránku.\x3cbr\x3e\x3cbr\x3eVývojáři: Pro pomoc, aby tohle fungovalo , \x3ca href=\'http://trac.openlayers.org/wiki/Google\' target=\'_blank\'\x3eklikněte sem\x3c/a\x3e",
-
-    'getLayerWarning': "The ${layerType} Layer was unable to load correctly.\x3cbr\x3e\x3cbr\x3eTo get rid of this message, select a new BaseLayer in the layer switcher in the upper-right corner.\x3cbr\x3e\x3cbr\x3eMost likely, this is because the ${layerLib} library script was either not correctly included.\x3cbr\x3e\x3cbr\x3eDevelopers: For help getting this working correctly, \x3ca href=\'http://trac.openlayers.org/wiki/${layerLib}\' target=\'_blank\'\x3eclick here\x3c/a\x3e",
-
-    'Scale = 1 : ${scaleDenom}': "Měřítko = 1 : ${scaleDenom}",
-
-    'reprojectDeprecated': "Použil jste volbu \'reproject\' ve vrstvě ${layerName}. Tato volba není doporučená: byla zde proto, aby bylo možno zobrazovat data z okomerčních serverů, ale tato funkce je nyní zajištěna pomocí podpory Spherical Mercator. Více informací naleznete na http://trac.openlayers.org/wiki/SphericalMercator.",
-
-    'methodDeprecated': "Tato metoda je zavržená a bude ve verzi 3.0 odstraněna. Prosím, použijte raději ${newMethod}."
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/da-DK.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/da-DK.js
deleted file mode 100644
index 3ba42c39..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/da-DK.js
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
- * @requires OpenLayers/Lang.js
- */
-
-/**
- * Namespace: OpenLayers.Lang["da-DK"]
- * Dictionary for Danish.  Keys for entries are used in calls to
- *     <OpenLayers.Lang.translate>.  Entry bodies are normal strings or
- *     strings formatted for use with <OpenLayers.String.format> calls.
- */
-OpenLayers.Lang['da-DK'] = {
-
-    'unhandledRequest': "En ikke håndteret forespørgsel returnerede ${statusText}",
-
-    'Permalink': "Permalink",
-
-    'Overlays': "Kortlag",
-
-    'Base Layer': "Baggrundslag",
-
-    'noFID': "Kan ikke opdateret en feature (et objekt) der ikke har et FID.",
-
-    'browserNotSupported':
-        "Din browser understøtter ikke vektor visning. Følgende vektor visninger understøttes:\n${renderers}",
-
-    // console message
-    'minZoomLevelError':
-        "Egenskaben minZoomLevel er kun beregnet til brug " +
-        "med FixedZoomLevels. At dette WFS lag kontrollerer " +
-        "minZoomLevel egenskaben, er et levn fra en tidligere " +
-        "version. Vi kan desværre ikke fjerne dette uden at risikere " +
-        "at ødelægge eksisterende OL baserede programmer der " +
-        " benytter denne funktionalitet. " +
-        "Egenskaben bør derfor ikke anvendes, og minZoomLevel " +
-        "kontrollen herunder vil blive fjernet i version 3.0. " +
-        "Benyt istedet min/max opløsnings indstillingerne, som " +
-        "er beskrevet her: " +
-        "http://trac.openlayers.org/wiki/SettingZoomLevels",
-
-    'commitSuccess': "WFS transaktion: LYKKEDES ${response}",
-
-    'commitFailed': "WFS transaktion: MISLYKKEDES ${response}",
-
-    'googleWarning':
-        "Google laget kunne ikke indlæses.<br><br>" +
-        "For at fjerne denne besked, vælg et nyt bagrundskort i " +
-        "lagskifteren i øverste højre hjørne.<br><br>" +
-        "Fejlen skyldes formentlig at Google Maps bibliotekts " +
-        "scriptet ikke er inkluderet, eller ikke indeholder den " +
-        "korrkte API nøgle for dit site.<br><br>" +
-        "Udviklere: For hjælp til at få dette til at fungere, " +
-        "<a href='http://trac.openlayers.org/wiki/Google' " +
-        "target='_blank'>klik her</a>",
-
-    'getLayerWarning':
-        "${layerType}-laget kunne ikke indlæses.<br><br>" +
-        "For at fjerne denne besked, vælg et nyt bagrundskort i " +
-        "lagskifteren i øverste højre hjørne.<br><br>" +
-        "Fejlen skyldes formentlig at ${layerLib} bibliotekts " +
-        "scriptet ikke er inkluderet.<br><br>" +
-        "Udviklere: For hjælp til at få dette til at fungere, " +
-        "<a href='http://trac.openlayers.org/wiki/${layerLib}' " +
-        "target='_blank'>klik her</a>",
-
-    'Scale = 1 : ${scaleDenom}': "Målforhold = 1 : ${scaleDenom}",
-
-    // console message
-    'reprojectDeprecated':
-        "Du anvender indstillingen 'reproject' på laget ${layerName}." + 
-        "Denne indstilling bør ikke længere anvendes. Den var beregnet " +
-        "til at vise data ovenpå kommercielle grundkort, men den funktionalitet " +
-        "bør nu opnås ved at anvende Spherical Mercator understøttelsen. " +
-        "Mere information er tilgængelig her: " +
-        "http://trac.openlayers.org/wiki/SphericalMercator.",
-
-    // console message
-    'methodDeprecated':
-        "Denne funktion bør ikke længere anvendes, og vil blive fjernet i version 3.0. " +
-        "Anvend venligst funktionen ${newMethod} istedet."
-};
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/de.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/de.js
deleted file mode 100644
index 62011c29..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/de.js
+++ /dev/null
@@ -1,55 +0,0 @@
-/* Translators (2009 onwards):
- *  - Grille chompa
- *  - Nikiwaibel
- *  - Umherirrender
- */
-
-/**
- * @requires OpenLayers/Lang.js
- */
-
-/**
- * Namespace: OpenLayers.Lang["de"]
- * Dictionary for Deutsch.  Keys for entries are used in calls to
- *     <OpenLayers.Lang.translate>.  Entry bodies are normal strings or
- *     strings formatted for use with <OpenLayers.String.format> calls.
- */
-OpenLayers.Lang["de"] = OpenLayers.Util.applyDefaults({
-
-    'unhandledRequest': "Unbehandelte Anfragerückmeldung ${statusText}",
-
-    'Permalink': "Permalink",
-
-    'Overlays': "Overlays",
-
-    'Base Layer': "Grundkarte",
-
-    'noFID': "Ein Feature, für das keine FID existiert, kann nicht aktualisiert werden.",
-
-    'browserNotSupported': "Ihr Browser unterstützt keine Vektordarstellung. Aktuell unterstützte Renderer:\n${renderers}",
-
-    'minZoomLevelError': "Die \x3ccode\x3eminZoomLevel\x3c/code\x3e-Eigenschaft ist nur für die Verwendung mit \x3ccode\x3eFixedZoomLevels\x3c/code\x3e-untergeordneten Layers vorgesehen. Das dieser \x3ctt\x3ewfs\x3c/tt\x3e-Layer die \x3ccode\x3eminZoomLevel\x3c/code\x3e-Eigenschaft überprüft ist ein Relikt der Vergangenheit. Wir können diese Überprüfung nicht entfernen, ohne das OL basierende Applikationen nicht mehr funktionieren. Daher markieren wir es als veraltet - die \x3ccode\x3eminZoomLevel\x3c/code\x3e-Überprüfung wird in Version 3.0 entfernt werden. Bitte verwenden Sie stattdessen die Min-/Max-Lösung, wie sie unter http://trac.openlayers.org/wiki/SettingZoomLevels beschrieben ist.",
-
-    'commitSuccess': "WFS-Transaktion: Erfolgreich ${response}",
-
-    'commitFailed': "WFS-Transaktion: Fehlgeschlagen ${response}",
-
-    'googleWarning': "Der Google-Layer konnte nicht korrekt geladen werden.\x3cbr\x3e\x3cbr\x3eUm diese Meldung nicht mehr zu erhalten, wählen Sie einen anderen Hintergrundlayer aus dem LayerSwitcher in der rechten oberen Ecke.\x3cbr\x3e\x3cbr\x3eSehr wahrscheinlich tritt dieser Fehler auf, weil das Skript der Google-Maps-Bibliothek nicht eingebunden wurde oder keinen gültigen API-Schlüssel für Ihre URL enthält.\x3cbr\x3e\x3cbr\x3eEntwickler: Besuche \x3ca href=\'http://trac.openlayers.org/wiki/Google\' target=\'_blank\'\x3edas Wiki\x3c/a\x3e für Hilfe zum korrekten Einbinden des Google-Layers",
-
-    'getLayerWarning': "Der ${layerType}-Layer konnte nicht korrekt geladen werden.\x3cbr\x3e\x3cbr\x3eUm diese Meldung nicht mehr zu erhalten, wählen Sie einen anderen Hintergrundlayer aus dem LayerSwitcher in der rechten oberen Ecke.\x3cbr\x3e\x3cbr\x3eSehr wahrscheinlich tritt dieser Fehler auf, weil das Skript der \'${layerLib}\'-Bibliothek nicht eingebunden wurde.\x3cbr\x3e\x3cbr\x3eEntwickler: Besuche \x3ca href=\'http://trac.openlayers.org/wiki/${layerLib}\' target=\'_blank\'\x3edas Wiki\x3c/a\x3e für Hilfe zum korrekten Einbinden von Layern",
-
-    'Scale = 1 : ${scaleDenom}': "Maßstab = 1 : ${scaleDenom}",
-
-    'W': "W",
-
-    'E': "O",
-
-    'N': "N",
-
-    'S': "S",
-
-    'reprojectDeprecated': "Sie verwenden die „Reproject“-Option des Layers ${layerName}. Diese Option ist veraltet: Sie wurde entwickelt um die Anzeige von Daten auf kommerziellen Basiskarten zu unterstützen, aber diese Funktion sollte jetzt durch Unterstützung der „Spherical Mercator“ erreicht werden. Weitere Informationen sind unter http://trac.openlayers.org/wiki/SphericalMercator verfügbar.",
-
-    'methodDeprecated': "Die Methode ist veraltet und wird in 3.0 entfernt. Bitte verwende stattdessen ${newMethod}."
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/el.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/el.js
deleted file mode 100644
index 0b3d067b..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/el.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Translators (2009 onwards):
- *  - Omnipaedista
- */
-
-/**
- * @requires OpenLayers/Lang.js
- */
-
-/**
- * Namespace: OpenLayers.Lang["el"]
- * Dictionary for Ελληνικά.  Keys for entries are used in calls to
- *     <OpenLayers.Lang.translate>.  Entry bodies are normal strings or
- *     strings formatted for use with <OpenLayers.String.format> calls.
- */
-OpenLayers.Lang["el"] = OpenLayers.Util.applyDefaults({
-
-    'Scale = 1 : ${scaleDenom}': "Κλίμακα ~ 1 : ${scaleDenom}"
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/en-CA.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/en-CA.js
deleted file mode 100644
index 59393335..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/en-CA.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * @requires OpenLayers/Lang/en.js
- */
-
-/**
- * Namespace: OpenLayers.Lang["en-CA"]
- * Dictionary for English-CA.  This dictionary inherits from the standard
- *     English dictionary.  Override only those entries with language specific
- *     to the CA region.
- *     
- * Keys for entries are used in calls to <OpenLayers.Lang.translate>.  Entry
- *     bodies are normal strings or strings formatted for use with
- *     <OpenLayers.String.format> calls.
- */
-OpenLayers.Lang['en-CA'] = OpenLayers.Util.applyDefaults({
-
-    // add any entries specific for this region here
-    // e.g.
-    // "someKey": "Some regionally specific value"
-    
-}, OpenLayers.Lang["en"]);
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/en.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/en.js
deleted file mode 100644
index 8fd08271..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/en.js
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
- * @requires OpenLayers/Lang.js
- */
-
-/**
- * Namespace: OpenLayers.Lang["en"]
- * Dictionary for English.  Keys for entries are used in calls to
- *     <OpenLayers.Lang.translate>.  Entry bodies are normal strings or
- *     strings formatted for use with <OpenLayers.String.format> calls.
- */
-OpenLayers.Lang.en = {
-
-    'unhandledRequest': "Unhandled request return ${statusText}",
-
-    'Permalink': "Permalink",
-
-    'Overlays': "Overlays",
-
-    'Base Layer': "Base Layer",
-
-    'noFID': "Can't update a feature for which there is no FID.",
-
-    'browserNotSupported':
-        "Your browser does not support vector rendering. Currently supported renderers are:\n${renderers}",
-
-    // console message
-    'minZoomLevelError':
-        "The minZoomLevel property is only intended for use " +
-        "with the FixedZoomLevels-descendent layers. That this " +
-        "wfs layer checks for minZoomLevel is a relic of the" +
-        "past. We cannot, however, remove it without possibly " +
-        "breaking OL based applications that may depend on it." +
-        " Therefore we are deprecating it -- the minZoomLevel " +
-        "check below will be removed at 3.0. Please instead " +
-        "use min/max resolution setting as described here: " +
-        "http://trac.openlayers.org/wiki/SettingZoomLevels",
-
-    'commitSuccess': "WFS Transaction: SUCCESS ${response}",
-
-    'commitFailed': "WFS Transaction: FAILED ${response}",
-
-    'googleWarning':
-        "The Google Layer was unable to load correctly.<br><br>" +
-        "To get rid of this message, select a new BaseLayer " +
-        "in the layer switcher in the upper-right corner.<br><br>" +
-        "Most likely, this is because the Google Maps library " +
-        "script was either not included, or does not contain the " +
-        "correct API key for your site.<br><br>" +
-        "Developers: For help getting this working correctly, " +
-        "<a href='http://trac.openlayers.org/wiki/Google' " +
-        "target='_blank'>click here</a>",
-
-    'getLayerWarning':
-        "The ${layerType} Layer was unable to load correctly.<br><br>" +
-        "To get rid of this message, select a new BaseLayer " +
-        "in the layer switcher in the upper-right corner.<br><br>" +
-        "Most likely, this is because the ${layerLib} library " +
-        "script was not correctly included.<br><br>" +
-        "Developers: For help getting this working correctly, " +
-        "<a href='http://trac.openlayers.org/wiki/${layerLib}' " +
-        "target='_blank'>click here</a>",
-
-    'Scale = 1 : ${scaleDenom}': "Scale = 1 : ${scaleDenom}",
-    
-    //labels for the graticule control
-    'W': 'W',
-    'E': 'E',
-    'N': 'N',
-    'S': 'S',
-    'Graticule': 'Graticule',
-
-    // console message
-    'reprojectDeprecated':
-        "You are using the 'reproject' option " +
-        "on the ${layerName} layer. This option is deprecated: " +
-        "its use was designed to support displaying data over commercial " + 
-        "basemaps, but that functionality should now be achieved by using " +
-        "Spherical Mercator support. More information is available from " +
-        "http://trac.openlayers.org/wiki/SphericalMercator.",
-
-    // console message
-    'methodDeprecated':
-        "This method has been deprecated and will be removed in 3.0. " +
-        "Please use ${newMethod} instead.",
-
-    // **** end ****
-    'end': ''
-    
-};
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/es.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/es.js
deleted file mode 100644
index d8b77b6e..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/es.js
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * @requires OpenLayers/Lang.js
- */
-
-/**
- * Namespace: OpenLayers.Lang["es"]
- * Dictionary for Spanish, UTF8 encoding. Keys for entries are used in calls to
- *     <OpenLayers.Lang.translate>.  Entry bodies are normal strings or
- *     strings formatted for use with <OpenLayers.String.format> calls.
- */
-OpenLayers.Lang.es = {
-
-    'unhandledRequest': "Respuesta a petición no gestionada ${statusText}",
-
-    'Permalink': "Enlace permanente",
-
-    'Overlays': "Capas superpuestas",
-
-    'Base Layer': "Capa Base",
-
-    'noFID': "No se puede actualizar un elemento para el que no existe FID.",
-
-    'browserNotSupported':
-        "Su navegador no soporta renderización vectorial. Los renderizadores soportados actualmente son:\n${renderers}",
-
-    // console message
-    'minZoomLevelError':
-        "La propiedad minZoomLevel debe sólo utilizarse " +
-        "con las capas que tienen FixedZoomLevels. El hecho de que " +
-        "una capa wfs compruebe minZoomLevel es una reliquia del " +
-        "pasado. Sin embargo, no podemos eliminarla sin discontinuar " +
-        "probablemente las aplicaciones OL que puedan depender de ello. " +
-        "Así pues estamos haciéndolo obsoleto --la comprobación " +
-        "minZoomLevel se eliminará en la versión 3.0. Utilice el ajuste " +
-        "de resolution min/max en su lugar, tal como se describe aquí: " +
-        "http://trac.openlayers.org/wiki/SettingZoomLevels",
-
-    'commitSuccess': "Transacción WFS: ÉXITO ${response}",
-
-    'commitFailed': "Transacción WFS: FALLÓ ${response}",
-
-    'googleWarning':
-        "La capa Google no pudo ser cargada correctamente.<br><br>" +
-        "Para evitar este mensaje, seleccione una nueva Capa Base " +
-        "en el selector de capas en la esquina superior derecha.<br><br>" +
-        "Probablemente, esto se debe a que el script de la biblioteca de " +
-        "Google Maps no fue correctamente incluido en su página, o no " +
-        "contiene la clave del API correcta para su sitio.<br><br>" +
-        "Desarrolladores: Para ayudar a hacer funcionar esto correctamente, " +
-        "<a href='http://trac.openlayers.org/wiki/Google' " +
-        "target='_blank'>haga clic aquí</a>",
-
-    'getLayerWarning':
-        "La capa ${layerType} no pudo ser cargada correctamente.<br><br>" +
-        "Para evitar este mensaje, seleccione una nueva Capa Base " +
-        "en el selector de capas en la esquina superior derecha.<br><br>" +
-        "Probablemente, esto se debe a que el script de " +
-        "la biblioteca ${layerLib} " +
-        "no fue correctamente incluido en su página.<br><br>" +
-        "Desarrolladores: Para ayudar a hacer funcionar esto correctamente, " +
-        "<a href='http://trac.openlayers.org/wiki/${layerLib}' " +
-        "target='_blank'>haga clic aquí</a>",
-
-    'Scale = 1 : ${scaleDenom}': "Escala = 1 : ${scaleDenom}",
-
-    //labels for the graticule control
-    'W': 'O',
-    'E': 'E',
-    'N': 'N',
-    'S': 'S',
-    'Graticule': 'Retícula',
-    
-    // console message
-    'reprojectDeprecated':
-        "Está usando la opción 'reproject' en la capa " +
-        "${layerName}. Esta opción es obsoleta: su uso fue diseñado " +
-        "para soportar la visualización de datos sobre mapas base comerciales, " + 
-        "pero ahora esa funcionalidad debería conseguirse mediante el soporte " +
-        "de la proyección Spherical Mercator. Más información disponible en " +
-        "http://trac.openlayers.org/wiki/SphericalMercator.",
-
-    // console message
-    'methodDeprecated':
-        "Este método es obsoleto y se eliminará en la versión 3.0. " +
-        "Por favor utilice el método ${newMethod} en su lugar.",
-
-    // **** end ****
-    'end': ''
-
-};
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/fi.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/fi.js
deleted file mode 100644
index 078508e2..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/fi.js
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Translators (2009 onwards):
- *  - Nike
- *  - Str4nd
- */
-
-/**
- * @requires OpenLayers/Lang.js
- */
-
-/**
- * Namespace: OpenLayers.Lang["fi"]
- * Dictionary for Suomi.  Keys for entries are used in calls to
- *     <OpenLayers.Lang.translate>.  Entry bodies are normal strings or
- *     strings formatted for use with <OpenLayers.String.format> calls.
- */
-OpenLayers.Lang["fi"] = OpenLayers.Util.applyDefaults({
-
-    'Permalink': "Ikilinkki",
-
-    'Overlays': "Kerrokset",
-
-    'Base Layer': "Peruskerros",
-
-    'W': "L",
-
-    'E': "I",
-
-    'N': "P",
-
-    'S': "E"
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/fr.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/fr.js
deleted file mode 100644
index c8ecdc93..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/fr.js
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Translators (2009 onwards):
- *  - Damouns
- *  - IAlex
- */
-
-/**
- * @requires OpenLayers/Lang.js
- */
-
-/**
- * Namespace: OpenLayers.Lang["fr"]
- * Dictionary for Français.  Keys for entries are used in calls to
- *     <OpenLayers.Lang.translate>.  Entry bodies are normal strings or
- *     strings formatted for use with <OpenLayers.String.format> calls.
- */
-OpenLayers.Lang["fr"] = OpenLayers.Util.applyDefaults({
-
-    'unhandledRequest': "Requête non gérée, retournant ${statusText}",
-
-    'Permalink': "Permalien",
-
-    'Overlays': "Calques",
-
-    'Base Layer': "Calque de base",
-
-    'noFID': "Impossible de mettre à jour un objet sans identifiant (fid).",
-
-    'browserNotSupported': "Votre navigateur ne supporte pas le rendu vectoriel. Les renderers actuellement supportés sont : \n${renderers}",
-
-    'minZoomLevelError': "La propriété minZoomLevel doit seulement être utilisée pour des couches FixedZoomLevels-descendent. Le fait que cette couche WFS vérifie la présence de minZoomLevel est une relique du passé. Nous ne pouvons toutefois la supprimer sans casser des applications qui pourraient en dépendre. C\'est pourquoi nous la déprécions -- la vérification du minZoomLevel sera supprimée en version 3.0. A la place, merci d\'utiliser les paramètres de résolutions min/max tel que décrit sur : http://trac.openlayers.org/wiki/SettingZoomLevels",
-
-    'commitSuccess': "Transaction WFS : SUCCES ${response}",
-
-    'commitFailed': "Transaction WFS : ECHEC ${response}",
-
-    'googleWarning': "La couche Google n\'a pas été en mesure de se charger correctement.\x3cbr\x3e\x3cbr\x3ePour supprimer ce message, choisissez une nouvelle BaseLayer dans le sélecteur de couche en haut à droite.\x3cbr\x3e\x3cbr\x3eCela est possiblement causé par la non-inclusion de la librairie Google Maps, ou alors parce que la clé de l\'API ne correspond pas à votre site.\x3cbr\x3e\x3cbr\x3eDéveloppeurs : pour savoir comment corriger ceci, \x3ca href=\'http://trac.openlayers.org/wiki/Google\' target=\'_blank\'\x3ecliquez ici\x3c/a\x3e",
-
-    'getLayerWarning': "La couche ${layerType} n\'est pas en mesure de se charger correctement.\x3cbr\x3e\x3cbr\x3ePour supprimer ce message, choisissez une nouvelle BaseLayer dans le sélecteur de couche en haut à droite.\x3cbr\x3e\x3cbr\x3eCela est possiblement causé par la non-inclusion de la librairie ${layerLib}.\x3cbr\x3e\x3cbr\x3eDéveloppeurs : pour savoir comment corriger ceci, \x3ca href=\'http://trac.openlayers.org/wiki/${layerLib}\' target=\'_blank\'\x3ecliquez ici\x3c/a\x3e",
-
-    'Scale = 1 : ${scaleDenom}': "Echelle ~ 1 : ${scaleDenom}",
-
-    'W': "O",
-
-    'E': "E",
-
-    'N': "N",
-
-    'S': "S",
-
-    'reprojectDeprecated': "Vous utilisez l\'option \'reproject\' sur la couche ${layerName}. Cette option est dépréciée : Son usage permettait d\'afficher des données au dessus de couches raster commerciales.Cette fonctionalité est maintenant supportée en utilisant le support de la projection Mercator Sphérique. Plus d\'information est disponible sur http://trac.openlayers.org/wiki/SphericalMercator.",
-
-    'methodDeprecated': "Cette méthode est dépréciée, et sera supprimée à la version 3.0. Merci d\'utiliser ${newMethod} à la place."
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/fur.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/fur.js
deleted file mode 100644
index 4e99f32e..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/fur.js
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Translators (2009 onwards):
- *  - Klenje
- */
-
-/**
- * @requires OpenLayers/Lang.js
- */
-
-/**
- * Namespace: OpenLayers.Lang["fur"]
- * Dictionary for Furlan.  Keys for entries are used in calls to
- *     <OpenLayers.Lang.translate>.  Entry bodies are normal strings or
- *     strings formatted for use with <OpenLayers.String.format> calls.
- */
-OpenLayers.Lang["fur"] = OpenLayers.Util.applyDefaults({
-
-    'Permalink': "Leam Permanent",
-
-    'Overlays': "Livei parsore",
-
-    'Base Layer': "Livel di base",
-
-    'browserNotSupported': "Il to sgarfadôr nol supuarte la renderizazion vetoriâl. Al moment a son supuartâts:\n${renderers}",
-
-    'Scale = 1 : ${scaleDenom}': "Scjale = 1 : ${scaleDenom}",
-
-    'W': "O",
-
-    'E': "E",
-
-    'N': "N",
-
-    'S': "S"
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/gl.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/gl.js
deleted file mode 100644
index d6e74d84..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/gl.js
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Translators (2009 onwards):
- *  - Toliño
- */
-
-/**
- * @requires OpenLayers/Lang.js
- */
-
-/**
- * Namespace: OpenLayers.Lang["gl"]
- * Dictionary for Galego.  Keys for entries are used in calls to
- *     <OpenLayers.Lang.translate>.  Entry bodies are normal strings or
- *     strings formatted for use with <OpenLayers.String.format> calls.
- */
-OpenLayers.Lang["gl"] = OpenLayers.Util.applyDefaults({
-
-    'unhandledRequest': "Solicitude non xerada; a resposta foi: ${statusText}",
-
-    'Permalink': "Ligazón permanente",
-
-    'Overlays': "Capas superpostas",
-
-    'Base Layer': "Capa base",
-
-    'noFID': "Non se pode actualizar a funcionalidade para a que non hai FID.",
-
-    'browserNotSupported': "O seu navegador non soporta a renderización de vectores. Os renderizadores soportados actualmente son:\n${renderers}",
-
-    'minZoomLevelError': "A propiedade minZoomLevel é só para uso conxuntamente coas capas FixedZoomLevels-descendent. O feito de que esa capa wfs verifique o minZoomLevel é unha reliquia do pasado. Non podemos, con todo, eliminala sen a posibilidade de non romper as aplicacións baseadas en OL que poidan depender dela. Por iso a estamos deixando obsoleta (a comprobación minZoomLevel de embaixo será eliminada na versión 3.0). Por favor, no canto diso use o axuste de resolución mín/máx tal e como está descrito aquí: http://trac.openlayers.org/wiki/SettingZoomLevels",
-
-    'commitSuccess': "Transacción WFS: ÉXITO ${response}",
-
-    'commitFailed': "Transacción WFS: FALLIDA ${response}",
-
-    'googleWarning': "A capa do Google non puido cargarse correctamente.\x3cbr\x3e\x3cbr\x3ePara evitar esta mensaxe, escolla unha nova capa base no seleccionador de capas na marxe superior dereita.\x3cbr\x3e\x3cbr\x3eProbablemente, isto acontece porque a escritura da libraría do Google Maps ou ben non foi incluída ou ben non contén a clave API correcta para o seu sitio.\x3cbr\x3e\x3cbr\x3eDesenvolvedores: para axudar a facer funcionar isto correctamente, \x3ca href=\'http://trac.openlayers.org/wiki/Google\' target=\'_blank\'\x3epremede aquí\x3c/a\x3e",
-
-    'getLayerWarning': "A capa ${layerType} foi incapaz de cargarse correctamente.\x3cbr\x3e\x3cbr\x3ePara evitar esta mensaxe, escolla unha nova capa base no seleccionador de capas na marxe superior dereita.\x3cbr\x3e\x3cbr\x3eProbablemente, isto acontece porque a escritura da libraría ${layerLib} non foi ben incluída.\x3cbr\x3e\x3cbr\x3eDesenvolvedores: para axudar a facer funcionar isto correctamente, \x3ca href=\'http://trac.openlayers.org/wiki/${layerLib}\' target=\'_blank\'\x3epremede aquí\x3c/a\x3e",
-
-    'Scale = 1 : ${scaleDenom}': "Escala = 1 : ${scaleDenom}",
-
-    'W': "O",
-
-    'E': "L",
-
-    'N': "N",
-
-    'S': "S",
-
-    'reprojectDeprecated': "Está usando a opción \"reproject\" na capa ${layerName}. Esta opción está obsoleta: o seu uso foi deseñado para a visualización de datos sobre mapas base comerciais, pero esta funcionalidade debera agora ser obtida utilizando a proxección Spherical Mercator. Hai dispoñible máis información en http://trac.openlayers.org/wiki/SphericalMercator.",
-
-    'methodDeprecated': "Este método está obsoleto e será eliminado na versión 3.0. Por favor, no canto deste use ${newMethod}."
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/gsw.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/gsw.js
deleted file mode 100644
index 45085018..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/gsw.js
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Translators (2009 onwards):
- *  - Als-Holder
- */
-
-/**
- * @requires OpenLayers/Lang.js
- */
-
-/**
- * Namespace: OpenLayers.Lang["gsw"]
- * Dictionary for Alemannisch.  Keys for entries are used in calls to
- *     <OpenLayers.Lang.translate>.  Entry bodies are normal strings or
- *     strings formatted for use with <OpenLayers.String.format> calls.
- */
-OpenLayers.Lang["gsw"] = OpenLayers.Util.applyDefaults({
-
-    'unhandledRequest': "Nit behandleti Aafrogsruckmäldig ${statusText}",
-
-    'Permalink': "Permalink",
-
-    'Overlays': "Iberlagerige",
-
-    'Base Layer': "Grundcharte",
-
-    'noFID': "E Feature, wu s kei FID derfir git, cha nit aktualisiert wäre.",
-
-    'browserNotSupported': "Dyy Browser unterstitzt kei Vektordarstellig. Aktuäll unterstitzti Renderer:\n${renderers}",
-
-    'minZoomLevelError': "D minZoomLevel-Eigeschaft isch nume dänk fir d Layer, wu vu dr FixedZoomLevels abstamme. Ass dää wfs-Layer minZoomLevel prieft, scih e Relikt us dr Vergangeheit. Mir chenne s aber nit ändere ohni OL_basierti Aawändige villicht kaputt gehn, wu dervu abhänge.  Us däm Grund het die Funktion d Eigeschaft \'deprecated\' iberchuu. D minZoomLevel-Priefig unte wird in dr Version 3.0 usegnuu. Bitte verwänd statt däm e min/max-Uflesig wie s do bschriben isch: http://trac.openlayers.org/wiki/SettingZoomLevels",
-
-    'commitSuccess': "WFS-Transaktion: ERFOLGRYCH ${response}",
-
-    'commitFailed': "WFS-Transaktion: FÄHLGSCHLAA ${response}",
-
-    'googleWarning': "Dr Google-Layer het nit korräkt chenne glade wäre.\x3cbr\x3e\x3cbr\x3eGo die Mäldig nimi z kriege, wehl e andere Hintergrundlayer us em LayerSwitcher im rächte obere Ecke.\x3cbr\x3e\x3cbr\x3eDää Fähler git s seli hyfig, wel s Skript vu dr Google-Maps-Bibliothek nit yybunde woren isch oder wel s kei giltige API-Schlissel fir Dyy URL din het.\x3cbr\x3e\x3cbr\x3eEntwickler: Fir Hilf zum korräkte Yybinde vum Google-Layer \x3ca href=\'http://trac.openlayers.org/wiki/Google\' target=\'_blank\'\x3edoo drucke\x3c/a\x3e",
-
-    'getLayerWarning': "Dr ${layerType}-Layer het nit korräkt chenne glade wäre.\x3cbr\x3e\x3cbr\x3eGo die Mäldig nimi z kriege, wehl e andere Hintergrundlayer us em LayerSwitcher im rächte obere Ecke.\x3cbr\x3e\x3cbr\x3eDää Fähler git s seli hyfig, wel s Skript vu dr \'${layerLib}\'-Bibliothek nit yybunde woren isch oder wel s kei giltige API-Schlissel fir Dyy URL din het.\x3cbr\x3e\x3cbr\x3eEntwickler: Fir Hilf zum korräkte Yybinde vu Layer \x3ca href=\'http://trac.openlayers.org/wiki/${layerLib}\' target=\'_blank\'\x3edoo drucke\x3c/a\x3e",
-
-    'Scale = 1 : ${scaleDenom}': "Maßstab = 1 : ${scaleDenom}",
-
-    'W': "W",
-
-    'E': "O",
-
-    'N': "N",
-
-    'S': "S",
-
-    'reprojectDeprecated': "Du bruchsch d \'reproject\'-Option bim ${layerName}-Layer. Die Option isch nimi giltig: si isch aagleit wore go   Date iber kommerziälli Grundcharte lege, aber des sott mer jetz mache mit dr Unterstitzig vu Spherical Mercator. Meh Informatione git s uf http://trac.openlayers.org/wiki/SphericalMercator.",
-
-    'methodDeprecated': "Die Methode isch veraltet un wird us dr Version 3.0 usegnuu. Bitte verwäbnd statt däm ${newMethod}."
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/hr.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/hr.js
deleted file mode 100644
index d56085a4..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/hr.js
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Translators (2009 onwards):
- *  - Mvrban
- */
-
-/**
- * @requires OpenLayers/Lang.js
- */
-
-/**
- * Namespace: OpenLayers.Lang["hr"]
- * Dictionary for Hrvatski.  Keys for entries are used in calls to
- *     <OpenLayers.Lang.translate>.  Entry bodies are normal strings or
- *     strings formatted for use with <OpenLayers.String.format> calls.
- */
-OpenLayers.Lang["hr"] = OpenLayers.Util.applyDefaults({
-
-    'unhandledRequest': "Nepodržani zahtjev ${statusText}",
-
-    'Permalink': "Permalink",
-
-    'Overlays': "Overlays",
-
-    'Base Layer': "Osnovna karta",
-
-    'noFID': "Ne mogu ažurirati značajku za koju ne postoji FID.",
-
-    'browserNotSupported': "Vaš preglednik ne podržava vektorsko renderiranje. Trenutno podržani rendereri su: ${renderers}",
-
-    'commitSuccess': "WFS Transakcija: USPJEŠNA ${response}",
-
-    'commitFailed': "WFS Transakcija: NEUSPJEŠNA ${response}",
-
-    'Scale = 1 : ${scaleDenom}': "Mjerilo = 1 : ${scaleDenom}",
-
-    'methodDeprecated': "Ova metoda nije odobrena i biti će maknuta u 3.0. Koristite ${newMethod}."
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/hsb.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/hsb.js
deleted file mode 100644
index 7a8e888d..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/hsb.js
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Translators (2009 onwards):
- *  - Michawiki
- */
-
-/**
- * @requires OpenLayers/Lang.js
- */
-
-/**
- * Namespace: OpenLayers.Lang["hsb"]
- * Dictionary for Hornjoserbsce.  Keys for entries are used in calls to
- *     <OpenLayers.Lang.translate>.  Entry bodies are normal strings or
- *     strings formatted for use with <OpenLayers.String.format> calls.
- */
-OpenLayers.Lang["hsb"] = OpenLayers.Util.applyDefaults({
-
-    'unhandledRequest': "Wotmołwa njewobdźěłaneho naprašowanja ${statusText}",
-
-    'Permalink': "Trajny wotkaz",
-
-    'Overlays': "Naworštowanja",
-
-    'Base Layer': "Zakładna runina",
-
-    'noFID': "Funkcija, za kotruž FID njeje, njeda so aktualizować.",
-
-    'browserNotSupported': "Twój wobhladowak wektorowe rysowanje njepodpěruje. Tuchwilu podpěrowane rysowaki su:\n${renderers}",
-
-    'minZoomLevelError': "Kajkosć minZoomLevel je jenož za wužiwanje z worštami myslena, kotrež wot FixedZoomLevels pochadźeja. Zo tuta woršta wfs za minZoomLevel přepruwuje, je relikt zańdźenosće. Njemóžemy wšak ju wotstronić, bjeztoho zo aplikacije, kotrež na OpenLayers bazěruja a snano tutu kajkosć wužiwaja, hižo njefunguja. Tohodla smy ju jako zestarjenu woznamjenili -- přepruwowanje za minZoomLevel budu so we wersiji 3.0 wotstronjeć. Prošu wužij město toho nastajenje min/max, kaž je tu wopisane: http://trac.openlayers.org/wiki/SettingZoomLevels",
-
-    'commitSuccess': "WFS-Transakcija: WUSPĚŠNA ${response}",
-
-    'commitFailed': "WFS-Transakcija: NJEPORADŹENA ${response}",
-
-    'googleWarning': "Woršta Google njemóžeše so korektnje začitać.\x3cbr\x3e\x3cbr\x3eZo by tutu zdźělenku wotbył, wubjer nowy BaseLayer z wuběra worštow horjeka naprawo.\x3cbr\x3e\x3cbr\x3eNajskerje so to stawa, dokelž skript biblioteki Google Maps pak njebu zapřijaty pak njewobsahuje korektny kluč API za twoje sydło.\x3cbr\x3e\x3cbr\x3eWuwiwarjo: Za pomoc ke korektnemu fungowanju worštow\n\x3ca href=\'http://trac.openlayers.org/wiki/Google\' target=\'_blank\'\x3etu kliknyć\x3c/a\x3e",
-
-    'getLayerWarning': "Woršta ${layerType} njemóžeše so korektnje začitać.\x3cbr\x3e\x3cbr\x3eZo by tutu zdźělenku wotbył, wubjer nowy BaseLayer z wuběra worštow horjeka naprawo.\x3cbr\x3e\x3cbr\x3eNajskerje so to stawa, dokelž skript biblioteki ${layerLib} njebu korektnje zapřijaty.\x3cbr\x3e\x3cbr\x3eWuwiwarjo: Za pomoc ke korektnemu fungowanju worštow\n\x3ca href=\'http://trac.openlayers.org/wiki/${layerLib}\' target=\'_blank\'\x3etu kliknyć\x3c/a\x3e",
-
-    'Scale = 1 : ${scaleDenom}': "Měritko = 1 : ${scaleDenom}",
-
-    'W': "Z",
-
-    'E': "W",
-
-    'N': "S",
-
-    'S': "J",
-
-    'reprojectDeprecated': "Wužiwaš opciju \"reproject\" wořšty ${layerName}. Tuta opcija je zestarjena: jeje wužiwanje bě myslene, zo by zwobraznjenje datow nad komercielnymi bazowymi kartami podpěrało, ale funkcionalnosć měła so nětko z pomocu Sperical Mercator docpěć. Dalše informacije steja na http://trac.openlayers.org/wiki/SphericalMercator k dispoziciji.",
-
-    'methodDeprecated': "Tuta metoda je so njeschwaliła a budźe so w 3.0 wotstronjeć. Prošu wužij ${newMethod} město toho."
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/hu.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/hu.js
deleted file mode 100644
index 10c9f5fd..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/hu.js
+++ /dev/null
@@ -1,54 +0,0 @@
-/* Translators (2009 onwards):
- *  - City-busz
- *  - Glanthor Reviol
- */
-
-/**
- * @requires OpenLayers/Lang.js
- */
-
-/**
- * Namespace: OpenLayers.Lang["hu"]
- * Dictionary for Magyar.  Keys for entries are used in calls to
- *     <OpenLayers.Lang.translate>.  Entry bodies are normal strings or
- *     strings formatted for use with <OpenLayers.String.format> calls.
- */
-OpenLayers.Lang["hu"] = OpenLayers.Util.applyDefaults({
-
-    'unhandledRequest': "Nem kezelt kérés visszatérése ${statusText}",
-
-    'Permalink': "Permalink",
-
-    'Overlays': "Rávetítések",
-
-    'Base Layer': "Alapréteg",
-
-    'noFID': "Nem frissíthető olyan jellemző, amely nem rendelkezik FID-del.",
-
-    'browserNotSupported': "A böngészője nem támogatja a vektoros renderelést. A jelenleg támogatott renderelők:\n${renderers}",
-
-    'minZoomLevelError': "A minZoomLevel tulajdonságot csak a következővel való használatra szánták: FixedZoomLevels-leszármazott fóliák. Ez azt jelenti, hogy a minZoomLevel wfs fólia jelölőnégyzetei már a múlté. Mi azonban nem távolíthatjuk el annak a veszélye nélkül, hogy az esetlegesen ettől függő OL alapú alkalmazásokat tönkretennénk. Ezért ezt érvénytelenítjük -- a minZoomLevel az alul levő jelölőnégyzet a 3.0-s verzióból el lesz távolítva. Kérjük, helyette használja a  min/max felbontás beállítást, amelyről az alábbi helyen talál leírást: http://trac.openlayers.org/wiki/SettingZoomLevels",
-
-    'commitSuccess': "WFS tranzakció: SIKERES ${response}",
-
-    'commitFailed': "WFS tranzakció: SIKERTELEN ${response}",
-
-    'googleWarning': "A Google fólia betöltése sikertelen.\x3cbr\x3e\x3cbr\x3eAhhoz, hogy ez az üzenet eltűnjön, válasszon egy új BaseLayer fóliát a jobb felső sarokban található fóliakapcsoló segítségével.\x3cbr\x3e\x3cbr\x3eNagy valószínűséggel ez azért van, mert a Google Maps könyvtár parancsfájlja nem található, vagy nem tartalmazza az Ön oldalához tartozó megfelelő API-kulcsot.\x3cbr\x3e\x3cbr\x3eFejlesztőknek: A helyes működtetésre vonatkozó segítség az alábbi helyen érhető el, \x3ca href=\'http://trac.openlayers.org/wiki/Google\' target=\'_blank\'\x3ekattintson ide\x3c/a\x3e",
-
-    'getLayerWarning': "A(z) ${layerType} fólia nem töltődött be helyesen.\x3cbr\x3e\x3cbr\x3eAhhoz, hogy ez az üzenet eltűnjön, válasszon egy új BaseLayer fóliát a jobb felső sarokban található fóliakapcsoló segítségével.\x3cbr\x3e\x3cbr\x3eNagy valószínűséggel ez azért van, mert a(z) ${layerLib} könyvtár parancsfájlja helytelen.\x3cbr\x3e\x3cbr\x3eFejlesztőknek: A helyes működtetésre vonatkozó segítség az alábbi helyen érhető el, \x3ca href=\'http://trac.openlayers.org/wiki/${layerLib}\' target=\'_blank\'\x3ekattintson ide\x3c/a\x3e",
-
-    'Scale = 1 : ${scaleDenom}': "Lépték = 1 : ${scaleDenom}",
-
-    'W': "Ny",
-
-    'E': "K",
-
-    'N': "É",
-
-    'S': "D",
-
-    'reprojectDeprecated': "Ön a \'reproject\' beállítást használja a(z) ${layerName} fólián. Ez a beállítás érvénytelen: használata az üzleti alaptérképek fölötti adatok megjelenítésének támogatására szolgált, de ezt a funkció ezentúl a Gömbi Mercator használatával érhető el. További információ az alábbi helyen érhető el: http://trac.openlayers.org/wiki/SphericalMercator",
-
-    'methodDeprecated': "Ez a módszer érvénytelenítve lett és a 3.0-s verzióból el lesz távolítva. Használja a(z) ${newMethod} módszert helyette."
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/ia.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/ia.js
deleted file mode 100644
index 02dfbc83..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/ia.js
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Translators (2009 onwards):
- *  - McDutchie
- */
-
-/**
- * @requires OpenLayers/Lang.js
- */
-
-/**
- * Namespace: OpenLayers.Lang["ia"]
- * Dictionary for Interlingua.  Keys for entries are used in calls to
- *     <OpenLayers.Lang.translate>.  Entry bodies are normal strings or
- *     strings formatted for use with <OpenLayers.String.format> calls.
- */
-OpenLayers.Lang["ia"] = OpenLayers.Util.applyDefaults({
-
-    'unhandledRequest': "Le responsa a un requesta non esseva maneate: ${statusText}",
-
-    'Permalink': "Permaligamine",
-
-    'Overlays': "Superpositiones",
-
-    'Base Layer': "Strato de base",
-
-    'noFID': "Non pote actualisar un elemento sin FID.",
-
-    'browserNotSupported': "Tu navigator non supporta le rendition de vectores. Le renditores actualmente supportate es:\n${renderers}",
-
-    'minZoomLevelError': "Le proprietate minZoomLevel es solmente pro uso con le stratos descendente de FixedZoomLevels. Le facto que iste strato WFS verifica minZoomLevel es un reliquia del passato. Nonobstante, si nos lo remove immediatemente, nos pote rumper applicationes a base de OL que depende de illo. Ergo nos lo declara obsolete; le verification de minZoomLevel in basso essera removite in version 3.0. Per favor usa in su loco le configuration de resolutiones min/max como describite a: http://trac.openlayers.org/wiki/SettingZoomLevels",
-
-    'commitSuccess': "Transaction WFS: SUCCESSO ${response}",
-
-    'commitFailed': "Transaction WFS: FALLEVA ${response}",
-
-    'googleWarning': "Le strato Google non poteva esser cargate correctemente.\x3cbr\x3e\x3cbr\x3ePro disfacer te de iste message, selige un nove BaseLayer in le selector de strato in alto a dextra.\x3cbr\x3e\x3cbr\x3eMulto probabilemente, isto es proque le script del libreria de Google Maps non esseva includite o non contine le clave API correcte pro tu sito.\x3cbr\x3e\x3cbr\x3eDisveloppatores: Pro adjuta de corriger isto, \x3ca href=\'http://trac.openlayers.org/wiki/Google\' target=\'_blank\'\x3eclicca hic\x3c/a",
-
-    'getLayerWarning': "Le strato ${layerType} non poteva esser cargate correctemente.\x3cbr\x3e\x3cbr\x3ePro disfacer te de iste message, selige un nove BaseLayer in le selector de strato in alto a dextra.\x3cbr\x3e\x3cbr\x3eMulto probabilemente, isto es proque le script del libreria de ${layerLib} non esseva correctemente includite.\x3cbr\x3e\x3cbr\x3eDisveloppatores: Pro adjuta de corriger isto, \x3ca href=\'http://trac.openlayers.org/wiki/${layerLib}\' target=\'_blank\'\x3eclicca hic\x3c/a\x3e",
-
-    'Scale = 1 : ${scaleDenom}': "Scala = 1 : ${scaleDenom}",
-
-    'W': "W",
-
-    'E': "E",
-
-    'N': "N",
-
-    'S': "S",
-
-    'reprojectDeprecated': "Tu usa le option \'reproject\' in le strato ${layerName} layer. Iste option es obsolescente: illo esseva pro poter monstrar datos super cartas de base commercial, ma iste functionalitate pote ora esser attingite con le uso de Spherical Mercator. Ulterior information es disponibile a http://trac.openlayers.org/wiki/SphericalMercator.",
-
-    'methodDeprecated': "Iste methodo ha essite declarate obsolescente e essera removite in version 3.0. Per favor usa ${newMethod} in su loco."
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/id.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/id.js
deleted file mode 100644
index 49b7f438..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/id.js
+++ /dev/null
@@ -1,54 +0,0 @@
-/* Translators (2009 onwards):
- *  - Irwangatot
- *  - IvanLanin
- */
-
-/**
- * @requires OpenLayers/Lang.js
- */
-
-/**
- * Namespace: OpenLayers.Lang["id"]
- * Dictionary for Bahasa Indonesia.  Keys for entries are used in calls to
- *     <OpenLayers.Lang.translate>.  Entry bodies are normal strings or
- *     strings formatted for use with <OpenLayers.String.format> calls.
- */
-OpenLayers.Lang["id"] = OpenLayers.Util.applyDefaults({
-
-    'unhandledRequest': "Permintaan yang tak tertangani menghasilkan ${statusText}",
-
-    'Permalink': "Pranala permanen",
-
-    'Overlays': "Hamparan",
-
-    'Base Layer': "Lapisan Dasar",
-
-    'noFID': "Tidak dapat memperbarui fitur yang tidak memiliki FID.",
-
-    'browserNotSupported': "Peramban Anda tidak mendukung penggambaran vektor. Penggambar yang didukung saat ini adalah:\n${renderers}",
-
-    'minZoomLevelError': "Properti minZoomLevel hanya ditujukan bekerja dengan lapisan FixedZoomLevels-descendent. Pengecekan minZoomLevel oleh lapisan wfs adalah peninggalan masa lalu. Kami tidak dapat menghapusnya tanpa kemungkinan merusak aplikasi berbasis OL yang mungkin bergantung padanya. Karenanya, kami menganggapnya tidak berlaku -- Cek minZoomLevel di bawah ini akan dihapus pada 3.0. Silakan gunakan penyetelan resolusi min/maks seperti dijabarkan di sini: http://trac.openlayers.org/wiki/SettingZoomLevels",
-
-    'commitSuccess': "WFS Transaksi: BERHASIL ${respon}",
-
-    'commitFailed': "WFS Transaksi: GAGAL ${respon}",
-
-    'googleWarning': "Lapisan Google tidak dapat dimuat dengan benar.\x3cbr\x3e\x3cbr\x3eUntuk menghilangkan pesan ini, pilih suatu BaseLayer baru melalui penukar lapisan (layer switcher) di ujung kanan atas.\x3cbr\x3e\x3cbr\x3eKemungkinan besar ini karena pustaka skrip Google Maps tidak disertakan atau tidak mengandung kunci API yang tepat untuk situs Anda.\x3cbr\x3e\x3cbr\x3ePengembang: Untuk bantuan mengatasi masalah ini, \x3ca href=\'http://trac.openlayers.org/wiki/Google\' target=\'_blank\'\x3eklik di sini\x3c/a\x3e",
-
-    'getLayerWarning': "Lapisan ${layerType} tidak dapat dimuat dengan benar.\x3cbr\x3e\x3cbr\x3eUntuk menghilangkan pesan ini, pilih suatu BaseLayer baru melalui penukar lapisan (layer switcher) di ujung kanan atas.\x3cbr\x3e\x3cbr\x3eKemungkinan besar ini karena pustaka skrip Google Maps tidak disertakan dengan benar.\x3cbr\x3e\x3cbr\x3ePengembang: Untuk bantuan mengatasi masalah ini, \x3ca href=\'http://trac.openlayers.org/wiki/${layerLib}\' target=\'_blank\'\x3eklik di sini\x3c/a\x3e",
-
-    'Scale = 1 : ${scaleDenom}': "Sekala = 1 : ${scaleDenom}",
-
-    'W': "B",
-
-    'E': "T",
-
-    'N': "U",
-
-    'S': "S",
-
-    'reprojectDeprecated': "Anda menggunakan opsi \'reproject\' pada lapisan ${layerName}. Opsi ini telah ditinggalkan: penggunaannya dirancang untuk mendukung tampilan data melalui peta dasar komersial, tapi fungsionalitas tersebut saat ini harus dilakukan dengan menggunakan dukungan Spherical Mercator. Informasi lebih lanjut tersedia di http://trac.openlayers.org/wiki/SphericalMercator.",
-
-    'methodDeprecated': "Metode ini telah usang dan akan dihapus di 3.0. Sebaliknya, harap gunakan ${newMethod}."
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/io.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/io.js
deleted file mode 100644
index 6f2263ab..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/io.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Translators (2009 onwards):
- *  - Malafaya
- */
-
-/**
- * @requires OpenLayers/Lang.js
- */
-
-/**
- * Namespace: OpenLayers.Lang["io"]
- * Dictionary for Ido.  Keys for entries are used in calls to
- *     <OpenLayers.Lang.translate>.  Entry bodies are normal strings or
- *     strings formatted for use with <OpenLayers.String.format> calls.
- */
-OpenLayers.Lang["io"] = OpenLayers.Util.applyDefaults({
-
-    'Scale = 1 : ${scaleDenom}': "Skalo = 1 : ${scaleDenom}"
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/is.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/is.js
deleted file mode 100644
index e2bc5369..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/is.js
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Translators (2009 onwards):
- *  - Ævar Arnfjörð Bjarmason
- */
-
-/**
- * @requires OpenLayers/Lang.js
- */
-
-/**
- * Namespace: OpenLayers.Lang["is"]
- * Dictionary for Íslenska.  Keys for entries are used in calls to
- *     <OpenLayers.Lang.translate>.  Entry bodies are normal strings or
- *     strings formatted for use with <OpenLayers.String.format> calls.
- */
-OpenLayers.Lang["is"] = OpenLayers.Util.applyDefaults({
-
-    'Permalink': "Varanlegur tengill",
-
-    'Overlays': "Þekjur",
-
-    'Base Layer': "Grunnlag",
-
-    'Scale = 1 : ${scaleDenom}': "Skali = 1 : ${scaleDenom}",
-
-    'methodDeprecated': "Þetta fall hefur verið úrelt og verður fjarlægt í 3.0. Notaðu ${newMethod} í staðin."
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/it.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/it.js
deleted file mode 100644
index a56ef0f1..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/it.js
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
- * @requires OpenLayers/Lang.js
- */
-
-/**
- * Namespace: OpenLayers.Lang["it"]
- * Dictionary for Italian.  Keys for entries are used in calls to
- *     <OpenLayers.Lang.translate>.  Entry bodies are normal strings or
- *     strings formatted for use with <OpenLayers.String.format> calls.
- */
-OpenLayers.Lang.it = {
-
-    'unhandledRequest': "Codice di ritorno della richiesta ${statusText}",
-
-    'Permalink': "Permalink",
-
-    'Overlays': "Overlays",
-
-    'Base Layer': "Livello base",
-
-    'noFID': "Impossibile aggiornare un elemento grafico che non abbia il FID.",
-
-    'browserNotSupported':
-        "Il tuo browser non supporta il rendering vettoriale. I renderizzatore attualemnte supportati sono:\n${renderers}",
-
-    // console message
-    'minZoomLevelError':
-        "La proprietà minZoomLevel è da utilizzare solamente " +
-        "con livelli che abbiano FixedZoomLevels. Il fatto che " +
-        "questo livello wfs controlli la proprietà minZoomLevel è " +
-        "un retaggio del passato. Non possiamo comunque rimuoverla " +
-        "senza rompere le vecchie applicazioni che dipendono su di essa." +
-        "Quindi siamo costretti a deprecarla -- minZoomLevel " +
-        "e sarà rimossa dalla vesione 3.0. Si prega di utilizzare i " +
-        "settaggi di risoluzione min/max come descritto qui: " +
-        "http://trac.openlayers.org/wiki/SettingZoomLevels",
-
-    'commitSuccess': "Transazione WFS: SUCCESS ${response}",
-
-    'commitFailed': "Transazione WFS: FAILED ${response}",
-
-    'googleWarning':
-        "Il livello Google non è riuscito a caricare correttamente.<br><br>" +
-        "Per evitare questo messaggio, seleziona un nuovo BaseLayer " +
-        "nel selettore di livelli nell'angolo in alto a destra.<br><br>" +
-        "Più precisamente, ciò accade perchè la libreria Google Maps " +
-        "non è stata inclusa nella pagina, oppure non contiene la " +
-        "corretta API key per il tuo sito.<br><br>" +
-        "Sviluppatori: Per aiuto su come farlo funzionare correttamente, " +
-        "<a href='http://trac.openlayers.org/wiki/Google' " +
-        "target='_blank'>clicca qui</a>",
-
-    'getLayerWarning':
-        "Il livello ${layerType} non è riuscito a caricare correttamente.<br><br>" +
-        "Per evitare questo messaggio, seleziona un nuovo BaseLayer " +
-        "nel selettore di livelli nell'angolo in alto a destra.<br><br>" +
-        "Più precisamente, ciò accade perchè la libreria ${layerLib} " +
-        "non è stata inclusa nella pagina.<br><br>" +
-        "Sviluppatori: Per aiuto su come farlo funzionare correttamente, " +
-        "<a href='http://trac.openlayers.org/wiki/${layerLib}' " +
-        "target='_blank'>clicca qui</a>",
-
-    'Scale = 1 : ${scaleDenom}': "Scala = 1 : ${scaleDenom}",
-
-    // console message
-    'reprojectDeprecated':
-        "Stai utilizzando l'opzione 'reproject' sul livello ${layerName}. " +
-        "Questa opzione è deprecata: il suo utilizzo è stato introdotto per" +
-        "supportare il disegno dei dati sopra mappe commerciali, ma tale " + 
-        "funzionalità dovrebbe essere ottenuta tramite l'utilizzo della proiezione " +
-        "Spherical Mercator. Per maggiori informazioni consultare qui " +
-        "http://trac.openlayers.org/wiki/SphericalMercator.",
-
-    // console message
-    'methodDeprecated':
-        "Questo metodo è stato deprecato e sarà rimosso dalla versione 3.0. " +
-        "Si prega di utilizzare il metodo ${newMethod} in alternativa.",
-
-    'end': ''
-};
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/ja.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/ja.js
deleted file mode 100644
index 75cc1e3e..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/ja.js
+++ /dev/null
@@ -1,54 +0,0 @@
-/* Translators (2009 onwards):
- *  - Fryed-peach
- *  - Mage Whopper
- */
-
-/**
- * @requires OpenLayers/Lang.js
- */
-
-/**
- * Namespace: OpenLayers.Lang["ja"]
- * Dictionary for 日本語.  Keys for entries are used in calls to
- *     <OpenLayers.Lang.translate>.  Entry bodies are normal strings or
- *     strings formatted for use with <OpenLayers.String.format> calls.
- */
-OpenLayers.Lang["ja"] = OpenLayers.Util.applyDefaults({
-
-    'unhandledRequest': "未処理の要求は ${statusText} を返します",
-
-    'Permalink': "パーマリンク",
-
-    'Overlays': "オーバーレイ",
-
-    'Base Layer': "基底レイヤー",
-
-    'noFID': "FID のない地物は更新できません。",
-
-    'browserNotSupported': "あなたのブラウザはベクターグラフィックスの描写に対応していません。現時点で対応しているソフトウェアは以下のものです。\n${renderers}",
-
-    'minZoomLevelError': "minZoomLevel プロパティは FixedZoomLevels を継承するレイヤーでの使用のみを想定しています。この minZoomLevel に対する WFS レイヤーの検査は歴史的なものです。しかしながら、この検査を除去するとそれに依存する OpenLayers ベースのアプリケーションを破壊してしまう可能性があります。よって廃止が予定されており、この minZoomLevel 検査はバージョン3.0で除去されます。代わりに、http://trac.openlayers.org/wiki/SettingZoomLevels で解説されている、最小および最大解像度設定を使用してください。",
-
-    'commitSuccess': "WFS トランザクション: 成功 ${response}",
-
-    'commitFailed': "WFS トランザクション: 失敗 ${response}",
-
-    'googleWarning': "Google レイヤーが正しく読み込みを行えませんでした。\x3cbr\x3e\x3cbr\x3eこのメッセージを消すには、右上の隅にあるレイヤー切り替え部分で新しい基底レイヤーを選んでください。\x3cbr\x3e\x3cbr\x3eおそらく、これは Google マップ用ライブラリのスクリプトが組み込まれていないか、あなたのサイトに対応する正しい API キーが設定されていないためです。\x3cbr\x3e\x3cbr\x3e開発者の方へ: 正しい動作をさせるために\x3ca href=\'http://trac.openlayers.org/wiki/Google\' target=\'_blank\'\x3eこちらのウィキ\x3c/a\x3eを参照してください。",
-
-    'getLayerWarning': "${layerType} レイヤーが正しく読み込みを行えませんでした。\x3cbr\x3e\x3cbr\x3eこのメッセージを消すには、右上の隅にあるレイヤー切り替え部分で新しい基底レイヤーを選んでください。\x3cbr\x3e\x3cbr\x3eおそらく、これは ${layerLib} ライブラリのスクリプトが正しく組み込まれていないためです。\x3cbr\x3e\x3cbr\x3e開発者の方へ: 正しい動作をさせるために\x3ca href=\'http://trac.openlayers.org/wiki/${layerLib}\' target=\'_blank\'\x3eこちらのウィキ\x3c/a\x3eを参照してください。",
-
-    'Scale = 1 : ${scaleDenom}': "縮尺 = 1 : ${scaleDenom}",
-
-    'W': "西",
-
-    'E': "東",
-
-    'N': "北",
-
-    'S': "南",
-
-    'reprojectDeprecated': "あなたは「${layerName}」レイヤーで reproject オプションを使っています。このオプションは商用の基底地図上に情報を表示する目的で設計されましたが、現在ではその機能は Spherical Mercator サポートを利用して実現されており、このオプションの使用は非推奨です。追加の情報は http://trac.openlayers.org/wiki/SphericalMercator で入手できます。",
-
-    'methodDeprecated': "このメソッドは廃止が予定されており、バージョン3.0で除去されます。代わりに ${newMethod} を使用してください。"
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/km.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/km.js
deleted file mode 100644
index 88351773..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/km.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Translators (2009 onwards):
- *  - វ័ណថារិទ្ធ
- */
-
-/**
- * @requires OpenLayers/Lang.js
- */
-
-/**
- * Namespace: OpenLayers.Lang["km"]
- * Dictionary for ភាសាខ្មែរ.  Keys for entries are used in calls to
- *     <OpenLayers.Lang.translate>.  Entry bodies are normal strings or
- *     strings formatted for use with <OpenLayers.String.format> calls.
- */
-OpenLayers.Lang["km"] = OpenLayers.Util.applyDefaults({
-
-    'Permalink': "តំណភ្ជាប់អចិន្ត្រៃយ៍",
-
-    'Base Layer': "ស្រទាប់បាត​",
-
-    'Scale = 1 : ${scaleDenom}': "មាត្រដ្ឋាន = ១ ៖ ${scaleDenom}"
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/ksh.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/ksh.js
deleted file mode 100644
index 3ba94f44..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/ksh.js
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Translators (2009 onwards):
- *  - Purodha
- */
-
-/**
- * @requires OpenLayers/Lang.js
- */
-
-/**
- * Namespace: OpenLayers.Lang["ksh"]
- * Dictionary for Ripoarisch.  Keys for entries are used in calls to
- *     <OpenLayers.Lang.translate>.  Entry bodies are normal strings or
- *     strings formatted for use with <OpenLayers.String.format> calls.
- */
-OpenLayers.Lang["ksh"] = OpenLayers.Util.applyDefaults({
-
-    'unhandledRequest': "Met dä Antwoot op en Aanfrooch ham_mer nix aanjefange: ${statusText}",
-
-    'Permalink': "Lengk op Duuer",
-
-    'Overlays': "Drövver jelaat",
-
-    'Base Layer': "Jrund-Nivoh",
-
-    'noFID': "En Saach, woh kein \x3ci lang=\"en\"\x3eFID\x3c/i\x3e för doh es, löht sesch nit ändere.",
-
-    'browserNotSupported': "Dinge Brauser kann kein Väktore ußjävve. De Zoote Ußjaabe, di em Momang jon, sen:\n${renderers}",
-
-    'minZoomLevelError': "De Eijeschaff „\x3ccode lang=\"en\"\x3eminZoomLevel\x3c/code\x3e“ es bloß doför jedaach, dat mer se met dä Nivvohß bruch, di vun \x3ccode lang=\"en\"\x3eFixedZoomLevels\x3c/code\x3e affhange don. Dat dat \x3ci lang=\"en\"\x3eWFS\x3c/i\x3e-Nivvoh övverhoup de Eijeschaff „\x3ccode lang=\"en\"\x3eminZoomLevel\x3c/code\x3e“ pröhfe deiht, es noch övveresch vun fröhjer. Mer künne dat ävver jez nit fott lohße, oohne dat mer Jevaa loufe, dat Aanwendunge vun OpenLayers nit mieh loufe, di sesch doh velleijsch noch drop am verlohße sin. Dröm sare mer, dat mer et nit mieh han welle, un de „\x3ccode lang=\"en\"\x3eminZoomLevel\x3c/code\x3e“-Eijeschaff weed hee vun de Version 3.0 af nit mieh jeprööf wäde. Nemm doför de Enstellung för de hühßte un de kleinßte Oplöhsung, esu wi et en http://trac.openlayers.org/wiki/SettingZoomLevels opjeschrevve es.",
-
-    'commitSuccess': "Dä \x3ci lang=\"en\"\x3eWFS\x3c/i\x3e-Vörjang es joot jeloufe: ${response}",
-
-    'commitFailed': "Dä \x3ci lang=\"en\"\x3eWFS\x3c/i\x3e-Vörjang es scheif jejange: ${response}",
-
-    'googleWarning': "Dat Nivvoh \x3ccode lang=\"en\"\x3eGoogle\x3c/code\x3e kunnt nit reschtesch jelaade wääde.\x3cbr /\x3e\x3cbr /\x3eÖm hee di Nohreesch loß ze krijje, donn en ander Jrund-Nivvoh ußsöhke, rähß bovve en de Äk.\x3cbr /\x3e\x3cbr /\x3eWascheinlesch es dat wiel dat \x3ci lang=\"en\"\x3eGoogle-Maps\x3c/i\x3e-Skrepp entweeder nit reschtesch enjebonge wood, udder nit dä reschtejje \x3ci lang=\"en\"\x3eAPI\x3c/i\x3e-Schlößel för Ding Web-ßait scheke deiht.\x3cbr /\x3e\x3cbr /\x3eFör Projrammierer jidd_et Hölp do_drövver, \x3ca href=\"http://trac.openlayers.org/wiki/Google\" target=\"_blank\"\x3ewi mer dat aan et Loufe brengk\x3c/a\x3e.",
-
-    'getLayerWarning': "Dat Nivvoh \x3ccode\x3e${layerType}\x3c/code\x3e kunnt nit reschtesch jelaade wääde.\x3cbr /\x3e\x3cbr /\x3eÖm hee di Nohreesch loß ze krijje, donn en ander Jrund-Nivvoh ußsöhkre, rähß bovve en de Äk.\x3cbr /\x3e\x3cbr /\x3eWascheinlesch es dat, wiel dat Skrepp \x3ccode\x3e${layerLib}\x3c/code\x3e nit reschtesch enjebonge wood.\x3cbr /\x3e\x3cbr /\x3eFör Projrammierer jidd_Et Hölp do_drövver, \x3ca href=\"http://trac.openlayers.org/wiki/${layerLib}\" target=\"_blank\"\x3ewi mer dat aan et Loufe brengk\x3c/a\x3e.",
-
-    'Scale = 1 : ${scaleDenom}': "Mohßshtaab = 1 : ${scaleDenom}",
-
-    'W': "W",
-
-    'E': "O",
-
-    'N': "N",
-
-    'S': "S",
-
-    'reprojectDeprecated': "Do bruchs de Ußwahl \x3ccode\x3ereproject\x3c/code\x3e op däm Nivvoh \x3ccode\x3e${layerName}\x3c/code\x3e. Di Ußwahl es nit mieh jähn jesinn. Se wohr doför jedaach, öm Date op jeschääfsmäßesch eruß jejovve Kaate bovve drop ze moole, wat ävver enzwesche besser met dä Öngershtözung för de ßfääresche Mäkaator Beldscher jeiht. Doh kanns De mieh drövver fenge op dä Sigg: http://trac.openlayers.org/wiki/SphericalMercator.",
-
-    'methodDeprecated': "Hee di Metood es nim_mih aktoäll un et weed se en dä Version 3.0 nit mieh jävve. Nemm \x3ccode\x3e${newMethod}\x3c/code\x3e doföör."
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/lt.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/lt.js
deleted file mode 100644
index e1f78976..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/lt.js
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * @requires OpenLayers/Lang.js
- */
-
-/**
- * Namespace: OpenLayers.Lang["lt"]
- * Dictionary for Lithuanian.  Keys for entries are used in calls to
- *     <OpenLayers.Lang.translate>.  Entry bodies are normal strings or
- *     strings formatted for use with <OpenLayers.String.format> calls.
- */
-OpenLayers.Lang['lt'] = OpenLayers.Util.applyDefaults({
-
-    'unhandledRequest': "Neapdorota užklausa gražino ${statusText}",
-
-    'Permalink': "Pastovi nuoroda",
-
-    'Overlays': "Papildomi sluoksniai",
-
-    'Base Layer': "Pagrindinis sluoksnis",
-
-    'noFID': "Negaliu atnaujinti objekto, kuris neturi FID.",
-
-    'browserNotSupported':
-    "Jūsų naršyklė nemoka parodyti vektorių. Šiuo metu galima naudotis tokiais rodymo varikliais:\n{renderers}",
-
-    'commitSuccess': "WFS Tranzakcija: PAVYKO ${response}",
-
-    'commitFailed': "WFS Tranzakcija: ŽLUGO ${response}",
-
-    'Scale = 1 : ${scaleDenom}': "Mastelis = 1 : ${scaleDenom}",
-    
-    //labels for the graticule control
-    'W': 'V',
-    'E': 'R',
-    'N': 'Š',
-    'S': 'P',
-    'Graticule': 'Tinklelis',
-
-    // console message
-    'methodDeprecated':
-    "Šis metodas yra pasenęs ir 3.0 versijoje bus pašalintas. " +
-    "Prašome naudoti ${newMethod}.",
-
-    // **** end ****
-    'end': ''
-    
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/nb.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/nb.js
deleted file mode 100644
index 24a4a7ef..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/nb.js
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- * @requires OpenLayers/Lang.js
- */
-
-/**
- * Namespace: OpenLayers.Lang["nb"]
- * Dictionary for norwegian bokmål (Norway). Keys for entries are used in calls to
- *     <OpenLayers.Lang.translate>.  Entry bodies are normal strings or
- *     strings formatted for use with <OpenLayers.String.format> calls.
- */
-OpenLayers.Lang["nb"] = {
-
-    'unhandledRequest': "Ubehandlet forespørsel returnerte ${statusText}",
-
-    'Permalink': "Kobling til denne siden",
-
-    'Overlays': "Kartlag",
-
-    'Base Layer': "Bakgrunnskart",
-
-    'noFID': "Kan ikke oppdatere et feature (et objekt) som ikke har FID.",
-
-    'browserNotSupported':
-        "Din nettleser støtter ikke vektortegning. Tegnemetodene som støttes er:\n${renderers}",
-
-    // console message
-    'minZoomLevelError':
-        "Egenskapen minZoomLevel er kun ment til bruk på lag " +
-        "basert på FixedZoomLevels. At dette wfs-laget sjekker " +
-        "minZoomLevel er en etterlevning fra tidligere versjoner. Det kan dog ikke " +
-        "tas bort uten å risikere at OL-baserte applikasjoner " +
-        "slutter å virke, så det er merket som foreldet: " +
-        "minZoomLevel i sjekken nedenfor vil fjernes i 3.0. " +
-        "Vennligst bruk innstillingene for min/maks oppløsning " +
-        "som er beskrevet her: "+
-        "http://trac.openlayers.org/wiki/SettingZoomLevels",
-
-    'commitSuccess': "WFS-transaksjon: LYKTES ${response}",
-
-    'commitFailed': "WFS-transaksjon: MISLYKTES ${response}",
-
-    'googleWarning':
-        "Google-laget kunne ikke lastes.<br><br>" +
-        "Bytt til et annet bakgrunnslag i lagvelgeren i " +
-        "øvre høyre hjørne for å slippe denne meldingen.<br><br>" +
-        "Sannsynligvis forårsakes feilen av at Google Maps-biblioteket " +
-        "ikke er riktig inkludert på nettsiden, eller at det ikke er " +
-        "angitt riktig API-nøkkel for nettstedet.<br><br>" +
-        "Utviklere: For hjelp til å få dette til å virke se "+
-        "<a href='http://trac.openlayers.org/wiki/Google' " +
-        "target='_blank'>her</a>.",
-
-    'getLayerWarning':
-        "${layerType}-laget kunne ikke lastes.<br><br>" +
-        "Bytt til et annet bakgrunnslag i lagvelgeren i " +
-        "øvre høyre hjørne for å slippe denne meldingen.<br><br>" +
-        "Sannsynligvis forårsakes feilen av at " +
-        "${layerLib}-biblioteket ikke var riktig inkludert " +
-        "på nettsiden.<br><br>" +
-        "Utviklere: For hjelp til å få dette til å virke se " +
-        "<a href='http://trac.openlayers.org/wiki/${layerLib}' " +
-        "target='_blank'>her</a>.",
-
-    'Scale = 1 : ${scaleDenom}': "<strong>Skala</strong> 1 : ${scaleDenom}",
-
-    // console message
-    'reprojectDeprecated':
-        "Du bruker innstillingen 'reproject' på laget ${layerName}. " +
-        "Denne innstillingen er foreldet, den var ment for å støtte " +
-        "visning av kartdata over kommersielle bakgrunnskart, men det " +
-        "bør nå gjøres med støtten for Spherical Mercator. Mer informasjon " +
-        "finnes på http://trac.openlayers.org/wiki/SphericalMercator.",
-
-    // console message
-    'methodDeprecated':
-        "Denne metoden er markert som foreldet og vil bli fjernet i 3.0. " +
-        "Vennligst bruk ${newMethod} i stedet.",
-
-    'end': ''
-};
-
-OpenLayers.Lang["no"] = OpenLayers.Lang["nb"];
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/nds.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/nds.js
deleted file mode 100644
index 9be21b9b..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/nds.js
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Translators (2009 onwards):
- *  - Slomox
- */
-
-/**
- * @requires OpenLayers/Lang.js
- */
-
-/**
- * Namespace: OpenLayers.Lang["nds"]
- * Dictionary for Plattdüütsch.  Keys for entries are used in calls to
- *     <OpenLayers.Lang.translate>.  Entry bodies are normal strings or
- *     strings formatted for use with <OpenLayers.String.format> calls.
- */
-OpenLayers.Lang["nds"] = OpenLayers.Util.applyDefaults({
-
-    'unhandledRequest': "Unbehannelt Trüchmellels för de Anfraag ${statusText}",
-
-    'Permalink': "Permalink",
-
-    'Overlays': "Overlays",
-
-    'Base Layer': "Achtergrundkoort",
-
-    'noFID': "En Feature, dat keen FID hett, kann nich aktuell maakt warrn.",
-
-    'browserNotSupported': "Dien Browser ünnerstütt keen Vektorbiller. Ünnerstütt Renderers:\n${renderers}",
-
-    'commitSuccess': "WFS-Transakschoon: hett klappt ${response}",
-
-    'commitFailed': "WFS-Transakschoon: hett nich klappt ${response}",
-
-    'Scale = 1 : ${scaleDenom}': "Skaal = 1 : ${scaleDenom}",
-
-    'methodDeprecated': "Disse Methood is oold un schall dat in 3.0 nich mehr geven. Bruuk dor man beter ${newMethod} för."
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/nl.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/nl.js
deleted file mode 100644
index 88887165..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/nl.js
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Translators (2009 onwards):
- *  - Siebrand
- */
-
-/**
- * @requires OpenLayers/Lang.js
- */
-
-/**
- * Namespace: OpenLayers.Lang["nl"]
- * Dictionary for Nederlands.  Keys for entries are used in calls to
- *     <OpenLayers.Lang.translate>.  Entry bodies are normal strings or
- *     strings formatted for use with <OpenLayers.String.format> calls.
- */
-OpenLayers.Lang["nl"] = OpenLayers.Util.applyDefaults({
-
-    'unhandledRequest': "Het verzoek is niet afgehandeld met de volgende melding: ${statusText}",
-
-    'Permalink': "Permanente verwijzing",
-
-    'Overlays': "Overlays",
-
-    'Base Layer': "Achtergrondkaart",
-
-    'noFID': "Een optie die geen FID heeft kan niet bijgewerkt worden.",
-
-    'browserNotSupported': "Uw browser ondersteunt het weergeven van vectoren niet.\nMomenteel ondersteunde weergavemogelijkheden:\n${renderers}",
-
-    'minZoomLevelError': "De eigenschap minZoomLevel is alleen bedoeld voor gebruik lagen met die afstammen van FixedZoomLevels-lagen.\nDat deze WFS-laag minZoomLevel controleert, is een overblijfsel uit het verleden.\nWe kunnen deze controle echter niet verwijderen zonder op OL gebaseerde applicaties die hervan afhankelijk zijn stuk te maken.\nDaarom heeft deze functionaliteit de eigenschap \'deprecated\' gekregen - de minZoomLevel wordt verwijderd in versie 3.0.\nGebruik in plaats van deze functie de mogelijkheid om min/max voor resolutie in te stellen zoals op de volgende pagina wordt beschreven:\nhttp://trac.openlayers.org/wiki/SettingZoomLevels",
-
-    'commitSuccess': "WFS-transactie: succesvol ${response}",
-
-    'commitFailed': "WFS-transactie: mislukt ${response}",
-
-    'googleWarning': "De Google-Layer kon niet correct geladen worden.\x3cbr /\x3e\x3cbr /\x3e\nOm deze melding niet meer te krijgen, moet u een andere achtergrondkaart kiezen in de laagwisselaar in de rechterbovenhoek.\x3cbr /\x3e\x3cbr /\x3e\nDit komt waarschijnlijk doordat de bibliotheek ${layerLib} niet correct ingevoegd is.\x3cbr /\x3e\x3cbr /\x3e\nOntwikkelaars: \x3ca href=\'http://trac.openlayers.org/wiki/${layerLib}\' target=\'_blank\'\x3eklik hier\x3c/a\x3e om dit werkend te krijgen.",
-
-    'getLayerWarning': "De laag ${layerType} kon niet goed geladen worden.\x3cbr /\x3e\x3cbr /\x3e\nOm deze melding niet meer te krijgen, moet u een andere achtergrondkaart kiezen in de laagwisselaar in de rechterbovenhoek.\x3cbr /\x3e\x3cbr /\x3e\nDit komt waarschijnlijk doordat de bibliotheek ${layerLib} niet correct is ingevoegd.\x3cbr /\x3e\x3cbr /\x3e\nOntwikkelaars: \x3ca href=\'http://trac.openlayers.org/wiki/${layerLib}\' target=\'_blank\'\x3eklik hier\x3c/a\x3e om dit werkend te krijgen.",
-
-    'Scale = 1 : ${scaleDenom}': "Schaal = 1 : ${scaleDenom}",
-
-    'W': "W",
-
-    'E': "O",
-
-    'N': "N",
-
-    'S': "Z",
-
-    'reprojectDeprecated': "U gebruikt de optie \'reproject\' op de laag ${layerName}.\nDeze optie is vervallen: deze optie was ontwikkeld om gegevens over commerciële basiskaarten weer te geven, maar deze functionaliteit wordt nu bereikt door ondersteuning van Spherical Mercator.\nMeer informatie is beschikbaar op http://trac.openlayers.org/wiki/SphericalMercator.",
-
-    'methodDeprecated': "Deze methode is verouderd en wordt verwijderd in versie 3.0.\nGebruik ${newMethod}."
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/nn.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/nn.js
deleted file mode 100644
index cb47f318..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/nn.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Translators (2009 onwards):
- *  - Harald Khan
- */
-
-/**
- * @requires OpenLayers/Lang.js
- */
-
-/**
- * Namespace: OpenLayers.Lang["nn"]
- * Dictionary for ‪Norsk (nynorsk)‬.  Keys for entries are used in calls to
- *     <OpenLayers.Lang.translate>.  Entry bodies are normal strings or
- *     strings formatted for use with <OpenLayers.String.format> calls.
- */
-OpenLayers.Lang["nn"] = OpenLayers.Util.applyDefaults({
-
-    'Scale = 1 : ${scaleDenom}': "Skala = 1 : ${scaleDenom}"
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/oc.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/oc.js
deleted file mode 100644
index 244c2906..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/oc.js
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Translators (2009 onwards):
- *  - Cedric31
- */
-
-/**
- * @requires OpenLayers/Lang.js
- */
-
-/**
- * Namespace: OpenLayers.Lang["oc"]
- * Dictionary for Occitan.  Keys for entries are used in calls to
- *     <OpenLayers.Lang.translate>.  Entry bodies are normal strings or
- *     strings formatted for use with <OpenLayers.String.format> calls.
- */
-OpenLayers.Lang["oc"] = OpenLayers.Util.applyDefaults({
-
-    'unhandledRequest': "Requèsta pas gerida, retorna ${statusText}",
-
-    'Permalink': "Permaligam",
-
-    'Overlays': "Calques",
-
-    'Base Layer': "Calc de basa",
-
-    'noFID': "Impossible de metre a jorn un objècte sens identificant (fid).",
-
-    'browserNotSupported': "Vòstre navegidor supòrta pas lo rendut vectorial. Los renderers actualament suportats son : \n${renderers}",
-
-    'minZoomLevelError': "La proprietat minZoomLevel deu èsser utilizada solament per de jaces FixedZoomLevels-descendent. Lo fach qu\'aqueste jaç WFS verifique la preséncia de minZoomLevel es una relica del passat. Çaquelà, la podèm suprimir sens copar d\'aplicacions que ne poirián dependre. Es per aquò que la depreciam -- la verificacion del minZoomLevel serà suprimida en version 3.0. A la plaça, mercés d\'utilizar los paramètres de resolucions min/max tal coma descrich sus : http://trac.openlayers.org/wiki/SettingZoomLevels",
-
-    'commitSuccess': "Transaccion WFS : SUCCES ${response}",
-
-    'commitFailed': "Transaccion WFS : FRACAS ${response}",
-
-    'googleWarning': "Lo jaç Google es pas estat en mesura de se cargar corrèctament.\x3cbr\x3e\x3cbr\x3ePer suprimir aqueste messatge, causissètz una BaseLayer novèla dins lo selector de jaç en naut a drecha.\x3cbr\x3e\x3cbr\x3eAquò es possiblament causat par la non-inclusion de la librariá Google Maps, o alara perque que la clau de l\'API correspond pas a vòstre site.\x3cbr\x3e\x3cbr\x3eDesvolopaires : per saber cossí corregir aquò, \x3ca href=\'http://trac.openlayers.org/wiki/Google\' target=\'_blank\'\x3eclicatz aicí\x3c/a\x3e",
-
-    'getLayerWarning': "Lo jaç ${layerType} es pas en mesura de se cargar corrèctament.\x3cbr\x3e\x3cbr\x3ePer suprimir aqueste messatge, causissètz una  BaseLayer novèla dins lo selector de jaç en naut a drecha.\x3cbr\x3e\x3cbr\x3eAquò es possiblament causat per la non-inclusion de la librariá ${layerLib}.\x3cbr\x3e\x3cbr\x3eDesvolopaires : per saber cossí corregir aquí, \x3ca href=\'http://trac.openlayers.org/wiki/${layerLib}\' target=\'_blank\'\x3eclicatz aicí\x3c/a\x3e",
-
-    'Scale = 1 : ${scaleDenom}': "Escala ~ 1 : ${scaleDenom}",
-
-    'W': "O",
-
-    'E': "È",
-
-    'N': "N",
-
-    'S': "S",
-
-    'reprojectDeprecated': "Utilizatz l\'opcion \'reproject\' sul jaç ${layerName}. Aquesta opcion es despreciada : Son usatge permetiá d\'afichar de donadas al dessús de jaces raster comercials. Aquesta foncionalitat ara es suportada en utilizant lo supòrt de la projeccion Mercator Esferica. Mai d\'informacion es disponibla sus http://trac.openlayers.org/wiki/SphericalMercator.",
-
-    'methodDeprecated': "Aqueste metòde es despreciada, e serà suprimida a la version 3.0. Mercés d\'utilizar ${newMethod} a la plaça."
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/pl.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/pl.js
deleted file mode 100644
index dfaa42a1..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/pl.js
+++ /dev/null
@@ -1,89 +0,0 @@
-/* Translators:
- *  - Arkadiusz Grabka
- */
-
-/**
- * @requires OpenLayers/Lang.js
- */
-
-/**
- * Namespace: OpenLayers.Lang["pl"]
- * Dictionary for Polish.  Keys for entries are used in calls to
- *     <OpenLayers.Lang.translate>.  Entry bodies are normal strings or
- *     strings formatted for use with <OpenLayers.String.format> calls.
- */
-OpenLayers.Lang["pl"] = OpenLayers.Util.applyDefaults({
-
-    'unhandledRequest': "Nieobsługiwane żądanie zwróciło ${statusText}",
-
-    'Permalink': "Permalink",
-
-    'Overlays': "Nakładki",
-
-    'Base Layer': "Warstwa podstawowa",
-
-    'noFID': "Nie można zaktualizować funkcji, dla których nie ma FID.",
-
-    'browserNotSupported':
-        "Twoja przeglądarka nie obsługuje renderowania wektorów. Obecnie obsługiwane renderowanie to:\n${renderers}",
-
-    // console message
-    'minZoomLevelError':
-        "Właściwość minZoomLevel jest przeznaczona tylko do użytku " +
-        "z warstwami FixedZoomLevels-descendent." +
-        "Warstwa wfs, która sprawdza minZoomLevel jest reliktem przeszłości." +
-        "Nie możemy jej jednak usunąc bez mozliwości łamania OL aplikacji, " +
-        "które mogą być od niej zależne. " +
-        "Dlatego jesteśmy za deprecjację -- minZoomLevel " +
-        "zostanie usunięta w wersji 3.0. W zamian prosze użyj " +
-        "min/max rozdzielczości w sposób opisany tutaj: " +
-        "http://trac.openlayers.org/wiki/SettingZoomLevels",
-
-    'commitSuccess': "Transakcja WFS: SUKCES ${response}",
-
-    'commitFailed': "Transakcja WFS: FAILED ${response}",
-
-    'googleWarning':
-        "Warstwa Google nie był w stanie załadować się poprawnie.<br><br>" +
-        "Aby pozbyć się tej wiadomości, wybierz nową Warstwe podstawową " +
-        "w przełączniku warstw w górnym prawym rogu mapy.<br><br>" +
-        "Najprawdopodobniej jest to spowodowane tym, że biblioteka Google Maps " +
-        "nie jest załadowana, lub nie zawiera poprawnego klucza do API dla twojej strony<br><br>" +
-        "Programisto: Aby uzyskać pomoc , " +
-        "<a href='http://trac.openlayers.org/wiki/Google' " +
-        "target='_blank'>kliknij tutaj</a>",
-
-    'getLayerWarning':
-        "Warstwa ${layerType} nie mogła zostać załadowana poprawnie.<br><br>" +
-        "Aby pozbyć się tej wiadomości, wybierz nową Warstwe podstawową " +
-        "w przełączniku warstw w górnym prawym rogu mapy.<br><br>" +
-        "Najprawdopodobniej jest to spowodowane tym, że biblioteka ${layerLib} " +
-        "nie jest załadowana, lub może(o ile biblioteka tego wymaga) " +
-        "byc potrzebny klucza do API dla twojej strony<br><br>" +
-        "Programisto: Aby uzyskać pomoc , " +
-        "<a href='http://trac.openlayers.org/wiki/${layerLib}' " +
-        "target='_blank'>kliknij tutaj</a>",
-
-    'Scale = 1 : ${scaleDenom}': "Skala = 1 : ${scaleDenom}",
-    
-    //labels for the graticule control
-    'W': 'ZACH',
-    'E': 'WSCH',
-    'N': 'PN',
-    'S': 'PD',
-    'Graticule': 'Siatka',
-
-    // console message
-    'reprojectDeprecated':
-        "w warstwie ${layerName} używasz opcji 'reproject'. " +
-        "Ta opcja jest przestarzała: " +
-        "jej zastosowanie został zaprojektowany, aby wspierać wyświetlania danych przez komercyjne mapy, "+
-        "jednak obecnie ta funkcjonalność powinien zostać osiągnięty za pomocą Spherical Mercator " +
-        "its use was designed to support displaying data over commercial. Więcje informacji na ten temat możesz znaleźć na stronie " + 
-        "http://trac.openlayers.org/wiki/SphericalMercator.",
-
-    // console message
-    'methodDeprecated':
-        "Ta metoda jest przestarzała i będzie usunięta od wersji 3.0. " +
-        "W zamian użyj ${newMethod}."
-});
\ No newline at end of file
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/pt-BR.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/pt-BR.js
deleted file mode 100644
index 60e6779c..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/pt-BR.js
+++ /dev/null
@@ -1,54 +0,0 @@
-/* Translators (2009 onwards):
- *  - Luckas Blade
- *  - Rodrigo Avila
- */
-
-/**
- * @requires OpenLayers/Lang.js
- */
-
-/**
- * Namespace: OpenLayers.Lang["pt-br"]
- * Dictionary for Português do Brasil.  Keys for entries are used in calls to
- *     <OpenLayers.Lang.translate>.  Entry bodies are normal strings or
- *     strings formatted for use with <OpenLayers.String.format> calls.
- */
-OpenLayers.Lang["pt-BR"] = OpenLayers.Util.applyDefaults({
-
-    'unhandledRequest': "A requisição retornou um erro não tratado: ${statusText}",
-
-    'Permalink': "Link para essa página",
-
-    'Overlays': "Camadas de Sobreposição",
-
-    'Base Layer': "Camada Base",
-
-    'noFID': "Não é possível atualizar uma feição que não tenha um FID.",
-
-    'browserNotSupported': "Seu navegador não suporta renderização de vetores. Os renderizadores suportados atualmente são:\n${renderers}",
-
-    'minZoomLevelError': "A propriedade minZoomLevel é de uso restrito das camadas descendentes de FixedZoomLevels. A verificação dessa propriedade pelas camadas wfs é um resíduo do passado. Não podemos, entretanto não é possível removê-la sem possívelmente quebrar o funcionamento de aplicações OL que possuem depência com ela. Portanto estamos tornando seu uso obsoleto -- a verificação desse atributo será removida na versão 3.0. Ao invés, use as opções de resolução min/max como descrito em: http://trac.openlayers.org/wiki/SettingZoomLevels",
-
-    'commitSuccess': "Transação WFS : SUCESSO ${response}",
-
-    'commitFailed': "Transação WFS : ERRO ${response}",
-
-    'googleWarning': "Não foi possível carregar a camada Google corretamente.\x3cbr\x3e\x3cbr\x3ePara se livrar dessa mensagem, selecione uma nova Camada Base, na ferramenta de alternação de camadas localização do canto superior direito.\x3cbr\x3e\x3cbr\x3eMuito provavelmente, isso foi causado porque o script da biblioteca do Google Maps não foi incluído, ou porque ele não contém a chave correta da API para o seu site.\x3cbr\x3e\x3cbr\x3eDesenvolvedores: Para obter ajuda em solucionar esse problema \x3ca href=\'http://trac.openlayers.org/wiki/Google\' target=\'_blank\'\x3ecliquem aqui\x3c/a\x3e",
-
-    'getLayerWarning': "Não foi possível carregar a camada ${layerType} corretamente.\x3cbr\x3e\x3cbr\x3ePara se livrar dessa mensagem, selecione uma nova Camada Base, na ferramenta de alternação de camadas localização do canto superior direito.\x3cbr\x3e\x3cbr\x3eMuito provavelmente, isso foi causado porque o script da biblioteca ${layerLib} não foi incluído corretamente.\x3cbr\x3e\x3cbr\x3eDesenvolvedores: Para obter ajuda em solucionar esse problema \x3ca href=\'http://trac.openlayers.org/wiki/${layerLib}\' target=\'_blank\'\x3ecliquem aqui\x3c/a\x3e",
-
-    'Scale = 1 : ${scaleDenom}': "Escala = 1 : ${scaleDenom}",
-
-    'W': "O",
-
-    'E': "L",
-
-    'N': "N",
-
-    'S': "S",
-
-    'reprojectDeprecated': "Você está usando a opção \'reproject\' na camada ${layerName}. Essa opção está obsoleta: seu uso foi projetado para suportar a visualização de dados sobre bases de mapas comerciais, entretanto essa funcionalidade deve agora ser alcançada usando o suporte à projeção Mercator. Mais informação está disponível em: http://trac.openlayers.org/wiki/SphericalMercator.",
-
-    'methodDeprecated': "Esse método está obsoleto e será removido na versão 3.0. Ao invés, por favor use ${newMethod}."
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/pt.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/pt.js
deleted file mode 100644
index af8e519c..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/pt.js
+++ /dev/null
@@ -1,55 +0,0 @@
-/* Translators (2009 onwards):
- *  - Hamilton Abreu
- *  - Malafaya
- *  - Waldir
- */
-
-/**
- * @requires OpenLayers/Lang.js
- */
-
-/**
- * Namespace: OpenLayers.Lang["pt"]
- * Dictionary for Português.  Keys for entries are used in calls to
- *     <OpenLayers.Lang.translate>.  Entry bodies are normal strings or
- *     strings formatted for use with <OpenLayers.String.format> calls.
- */
-OpenLayers.Lang["pt"] = OpenLayers.Util.applyDefaults({
-
-    'unhandledRequest': "Servidor devolveu erro não contemplado ${statusText}",
-
-    'Permalink': "Ligação permanente",
-
-    'Overlays': "Sobreposições",
-
-    'Base Layer': "Camada Base",
-
-    'noFID': "Não é possível atualizar um elemento para a qual não há FID.",
-
-    'browserNotSupported': "O seu navegador não suporta renderização vetorial. Actualmente os renderizadores suportados são:\n${renderers}",
-
-    'minZoomLevelError': "A propriedade minZoomLevel só deve ser usada com as camadas descendentes da FixedZoomLevels. A verificação da propriedade por esta camada wfs é uma relíquia do passado. No entanto, não podemos removê-la sem correr o risco de afectar aplicações OL que dependam dela. Portanto, estamos a torná-la obsoleta -- a verificação minZoomLevel será removida na versão 3.0. Em vez dela, por favor, use as opções de resolução min/max descritas aqui: http://trac.openlayers.org/wiki/SettingZoomLevels",
-
-    'commitSuccess': "Transacção WFS: SUCESSO ${response}",
-
-    'commitFailed': "Transacção WFS: FALHOU ${response}",
-
-    'googleWarning': "A Camada Google não foi correctamente carregada.\x3cbr\x3e\x3cbr\x3ePara deixar de receber esta mensagem, seleccione uma nova Camada-Base no \'\'switcher\'\' de camadas no canto superior direito.\x3cbr\x3e\x3cbr\x3eProvavelmente, isto acontece porque o \'\'script\'\' da biblioteca do Google Maps não foi incluído ou não contém a chave API correcta para o seu sítio.\x3cbr\x3e\x3cbr\x3eProgramadores: Para ajuda sobre como solucionar o problema \x3ca href=\'http://trac.openlayers.org/wiki/Google\' target=\'_blank\'\x3eclique aqui\x3c/a\x3e .",
-
-    'getLayerWarning': "A camada ${layerType} não foi correctamente carregada.\x3cbr\x3e\x3cbr\x3ePara desactivar esta mensagem, seleccione uma nova Camada-Base no \'\'switcher\'\' de camadas no canto superior direito.\x3cbr\x3e\x3cbr\x3eProvavelmente, isto acontece porque o \'\'script\'\' da biblioteca ${layerLib} não foi incluído correctamente.\x3cbr\x3e\x3cbr\x3eProgramadores: Para ajuda sobre como solucionar o problema \x3ca href=\'http://trac.openlayers.org/wiki/${layerLib}\' target=\'_blank\'\x3eclique aqui\x3c/a\x3e .",
-
-    'Scale = 1 : ${scaleDenom}': "Escala = 1 : ${scaleDenom}",
-
-    'W': "O",
-
-    'E': "E",
-
-    'N': "N",
-
-    'S': "S",
-
-    'reprojectDeprecated': "Está usando a opção \'reproject\' na camada ${layerName}. Esta opção é obsoleta: foi concebida para permitir a apresentação de dados sobre mapas-base comerciais, mas esta funcionalidade é agora suportada pelo Mercator Esférico. Mais informação está disponível em http://trac.openlayers.org/wiki/SphericalMercator.",
-
-    'methodDeprecated': "Este método foi declarado obsoleto e será removido na versão 3.0. Por favor, use ${newMethod} em vez disso."
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/ro.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/ro.js
deleted file mode 100644
index 6e8a04f0..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/ro.js
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
- * @requires OpenLayers/Lang.js
- */
-/**
- * Namespace: OpenLayers.Lang["ro"]
- * Dictionary for Romanian.  Keys for entries are used in calls to
- *     <OpenLayers.Lang.translate>.  Entry bodies are normal strings or
- *     strings formatted for use with <OpenLayers.String.format> calls.
-*/
-OpenLayers.Lang.ro = {
-    'unhandledRequest': "Cerere nesoluționată return ${statusText}",
-    'Permalink': "Legatură permanentă",
-    'Overlays': "Straturi vector",
-    'Base Layer': "Straturi de bază",
-    'noFID': "Nu pot actualiza un feature pentru care nu există FID.",
-    'browserNotSupported':
-        "Browserul tău nu suportă afișarea vectorilor. Supoetul curent pentru randare:\n${renderers}",
-    // console message
-    'minZoomLevelError':
-        "Proprietatea minZoomLevel este doar pentru a fi folosită " +
-        "cu straturile FixedZoomLevels-descendent. De aceea acest " +
-        "strat wfs verifică dacă minZoomLevel este o relicvă" +
-        ". Nu îl putem , oricum, înlătura fără " +
-        "a afecta aplicațiile Openlayers care depind de ea." +
-        " De aceea considerăm depreciat -- minZoomLevel " +
-        "și îl vom înlătura în 3.0. Folosește " +
-        "min/max resolution cum este descrisă aici: " +
-        "http://trac.openlayers.org/wiki/SettingZoomLevels",
-    'commitSuccess': "Tranzacție WFS: SUCCES ${response}",
-    'commitFailed': "Tranzacție WFS : EȘEC ${response}",
-    'googleWarning':
-        "Stratul Google nu a putut fi încărcat corect.<br><br>" +
-        "Pentru a elimina acest mesaj, selectează un nou strat de bază " +
-        "în Layerswitcher din colțul dreata-sus.<br><br>" +
-        "Asta datorită, faptului că Google Maps library " +
-        "script nu este inclus, sau nu conține " +
-        "cheia API corectă pentru situl tău.<br><br>" +
-        "Developeri: Pentru ajutor, " +
-        "<a href='http://trac.openlayers.org/wiki/Google' " +
-        "target='_blank'>apăsați aici</a>",
-    'getLayerWarning':
-        "Stratul ${layerType} nu a putut fi încărcat corect.<br><br>" +
-        "pentru a înlătura acest mesaj, selectează un nou strat de bază " +
-        "Acesta eroare apare de obicei când ${layerLib} library " +
-        "script nu a fost încărcat corect.<br><br>" +
-        "Developeri: Pentru ajutor privind utilizarea corectă, " +
-        "<a href='http://trac.openlayers.org/wiki/${layerLib}' " +
-        "target='_blank'>apasă aici</a>",
-    'Scale = 1 : ${scaleDenom}': "Scara = 1 : ${scaleDenom}",
-    //labels for the graticule control
-    'W': 'V',
-    'E': 'E',
-    'N': 'N',
-    'S': 'S',
-    'Graticule': 'Graticule',
-    // console message
-    'reprojectDeprecated':
-        "folosești opțiunea 'reproject' " +
-        "pentru stratul ${layerName} . Această opțiune este depreciată: " +
-        "a fost utilizată pentru afișarea straturilor de bază comerciale " + 
-        "Mai multe informații despre proiecția Mercator sunt disponibile aici " +
-        "http://trac.openlayers.org/wiki/SphericalMercator.",
-    // console message
-    'methodDeprecated':
-        "Această metodă este depreciată și va fi înlăturată in versiunea 3.0. " +
-        "folosește metoda ${newMethod}.",
-    // **** end ****
-    'end': ''
-};
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/ru.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/ru.js
deleted file mode 100644
index 23ecda88..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/ru.js
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Translators (2009 onwards):
- *  - Ferrer
- *  - Komzpa
- *  - Lockal
- *  - Александр Сигачёв
- */
-
-/**
- * @requires OpenLayers/Lang.js
- */
-
-/**
- * Namespace: OpenLayers.Lang["ru"]
- * Dictionary for Русский.  Keys for entries are used in calls to
- *     <OpenLayers.Lang.translate>.  Entry bodies are normal strings or
- *     strings formatted for use with <OpenLayers.String.format> calls.
- */
-OpenLayers.Lang["ru"] = OpenLayers.Util.applyDefaults({
-
-    'unhandledRequest': "Необработанный запрос вернул ${statusText}",
-
-    'Permalink': "Постоянная ссылка",
-
-    'Overlays': "Слои",
-
-    'Base Layer': "Основной слой",
-
-    'noFID': "Невозможно обновить объект, для которого нет FID.",
-
-    'browserNotSupported': "Ваш браузер не поддерживает векторную графику. На данный момент поддерживаются:\n${renderers}",
-
-    'minZoomLevelError': "Свойство minZoomLevel предназначено только для использования со слоями, являющимися потомками FixedZoomLevels. То, что этот WFS-слой проверяется на minZoomLevel — реликт прошлого. Однако мы не можем удалить эту функцию, так как, возможно, от неё зависят некоторые основанные на OpenLayers приложения. Функция объявлена устаревшей — проверка minZoomLevel будет удалена в 3.0. Пожалуйста, используйте вместо неё настройку мин/макс разрешения, описанную здесь: http://trac.openlayers.org/wiki/SettingZoomLevels",
-
-    'commitSuccess': "Транзакция WFS: УСПЕШНО ${response}",
-
-    'commitFailed': "Транзакция WFS: ОШИБКА ${response}",
-
-    'googleWarning': "Слой Google не удалось нормально загрузить.\x3cbr\x3e\x3cbr\x3eЧтобы избавиться от этого сообщения, выбите другой основной слой в переключателе в правом верхнем углу.\x3cbr\x3e\x3cbr\x3eСкорее всего, причина в том, что библиотека Google Maps не была включена или не содержит корректного API-ключа для вашего сайта.\x3cbr\x3e\x3cbr\x3eРазработчикам: чтобы узнать, как сделать, чтобы всё заработало, \x3ca href=\'http://trac.openlayers.org/wiki/Google\' target=\'_blank\'\x3eщёлкните тут\x3c/a\x3e",
-
-    'getLayerWarning': "Слой ${layerType} не удалось нормально загрузить. \x3cbr\x3e\x3cbr\x3eЧтобы избавиться от этого сообщения, выбите другой основной слой в переключателе в правом верхнем углу.\x3cbr\x3e\x3cbr\x3eСкорее всего, причина в том, что библиотека ${layerLib} не была включена или была включена некорректно.\x3cbr\x3e\x3cbr\x3eРазработчикам: чтобы узнать, как сделать, чтобы всё заработало, \x3ca href=\'http://trac.openlayers.org/wiki/${layerLib}\' target=\'_blank\'\x3eщёлкните тут\x3c/a\x3e",
-
-    'Scale = 1 : ${scaleDenom}': "Масштаб = 1 : ${scaleDenom}",
-
-    'W': "З",
-
-    'E': "В",
-
-    'N': "С",
-
-    'S': "Ю",
-
-    'reprojectDeprecated': "Вы используете опцию \'reproject\' для слоя ${layerName}. Эта опция является устаревшей: ее использование предполагалось для поддержки показа данных поверх коммерческих базовых карт, но теперь этот функционал несёт встроенная поддержка сферической проекции Меркатора. Больше сведений доступно на http://trac.openlayers.org/wiki/SphericalMercator.",
-
-    'methodDeprecated': "Этот метод считается устаревшим и будет удалён в версии 3.0. Пожалуйста, пользуйтесь ${newMethod}."
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/sk.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/sk.js
deleted file mode 100644
index 475647f5..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/sk.js
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Translators (2009 onwards):
- *  - Helix84
- */
-
-/**
- * @requires OpenLayers/Lang.js
- */
-
-/**
- * Namespace: OpenLayers.Lang["sk"]
- * Dictionary for Slovenčina.  Keys for entries are used in calls to
- *     <OpenLayers.Lang.translate>.  Entry bodies are normal strings or
- *     strings formatted for use with <OpenLayers.String.format> calls.
- */
-OpenLayers.Lang["sk"] = OpenLayers.Util.applyDefaults({
-
-    'unhandledRequest': "Neobslúžené požiadavky vracajú ${statusText}",
-
-    'Permalink': "Trvalý odkaz",
-
-    'Overlays': "Prekrytia",
-
-    'Base Layer': "Základná vrstva",
-
-    'noFID': "Nie je možné aktualizovať vlastnosť, pre ktorú neexistuje FID.",
-
-    'browserNotSupported': "Váš prehliadač nepodporuje vykresľovanie vektorov. Momentálne podporované vykresľovače sú:\n${renderers}",
-
-    'minZoomLevelError': "Vlastnosť minZoomLevel je určený iba na použitie s vrstvami odvodenými od FixedZoomLevels. To, že táto wfs vrstva kontroluje minZoomLevel je pozostatok z minulosti. Nemôžeme ho však odstrániť, aby sme sa vyhli možnému porušeniu aplikácií založených na Open Layers, ktoré na tomto môže závisieť. Preto ho označujeme ako zavrhovaný - dolu uvedená kontrola minZoomLevel bude odstránená vo verzii 3.0. Použite prosím namiesto toho kontrolu min./max. rozlíšenia podľa tu uvedeného popisu: http://trac.openlayers.org/wiki/SettingZoomLevels",
-
-    'commitSuccess': "Transakcia WFS: ÚSPEŠNÁ ${response}",
-
-    'commitFailed': "Transakcia WFS: ZLYHALA ${response}",
-
-    'googleWarning': "Vrstvu Google nebolo možné správne načítať.\x3cbr\x3e\x3cbr\x3eAby ste sa tejto správy zbavili vyberte novú BaseLayer v prepínači vrstiev v pravom hornom rohu.\x3cbr\x3e\x3cbr\x3eToto sa stalo pravdepodobne preto, že skript knižnice Google Maps buď nebol načítaný alebo neobsahuje správny kľúč API pre vašu lokalitu.\x3cbr\x3e\x3cbr\x3eVývojári: Tu môžete získať \x3ca href=\'http://trac.openlayers.org/wiki/Google\' target=\'_blank\'\x3epomoc so sfunkčnením\x3c/a\x3e",
-
-    'getLayerWarning': "Vrstvu ${layerType} nebolo možné správne načítať.\x3cbr\x3e\x3cbr\x3eAby ste sa tejto správy zbavili vyberte novú BaseLayer v prepínači vrstiev v pravom hornom rohu.\x3cbr\x3e\x3cbr\x3eToto sa stalo pravdepodobne preto, že skript knižnice ${layerType} buď nebol načítaný alebo neobsahuje správny kľúč API pre vašu lokalitu.\x3cbr\x3e\x3cbr\x3eVývojári: Tu môžete získať \x3ca href=\'http://trac.openlayers.org/wiki/${layerType}\' target=\'_blank\'\x3epomoc so sfunkčnením\x3c/a\x3e",
-
-    'Scale = 1 : ${scaleDenom}': "Mierka = 1 : ${scaleDenom}",
-
-    'reprojectDeprecated': "Používate voľby „reproject“ vrstvy ${layerType}. Táto voľba je zzavrhovaná: jej použitie bolo navrhnuté na podporu zobrazovania údajov nad komerčnými základovými mapami, ale túto funkcionalitu je teraz možné dosiahnuť pomocou Spherical Mercator. Ďalšie informácie získate na stránke http://trac.openlayers.org/wiki/SphericalMercator.",
-
-    'methodDeprecated': "Táto metóda je zavrhovaná a bude odstránená vo verzii 3.0. Použite prosím namiesto nej metódu ${newMethod}."
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/sv-SE.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/sv-SE.js
deleted file mode 100644
index 21762502..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/sv-SE.js
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Translators (2009 onwards):
- *  - Sannab
- */
-
-/**
- * @requires OpenLayers/Lang.js
- */
-
-/**
- * Namespace: OpenLayers.Lang["sv"]
- * Dictionary for Svenska.  Keys for entries are used in calls to
- *     <OpenLayers.Lang.translate>.  Entry bodies are normal strings or
- *     strings formatted for use with <OpenLayers.String.format> calls.
- */
-OpenLayers.Lang["sv"] = OpenLayers.Util.applyDefaults({
-
-    'unhandledRequest': "Ej hanterad fråga retur ${statusText}",
-
-    'Permalink': "Permalänk",
-
-    'Overlays': "Kartlager",
-
-    'Base Layer': "Bakgrundskarta",
-
-    'noFID': "Kan ej uppdatera feature (objekt) för vilket FID saknas.",
-
-    'browserNotSupported': "Din webbläsare stöder inte vektorvisning. För närvarande stöds följande visning:\n${renderers}",
-
-    'minZoomLevelError': "Egenskapen minZoomLevel är endast avsedd att användas med lager med FixedZoomLevels. Att detta WFS-lager kontrollerar minZoomLevel är en relik från äldre versioner. Vi kan dock inte ta bort det utan att riskera att OL-baserade tillämpningar som använder detta slutar fungera. Därför är det satt som deprecated, minZoomLevel kommer att tas bort i version 3.0. Använd i stället inställning av min/max resolution som beskrivs här: http://trac.openlayers.org/wiki/SettingZoomLevels",
-
-    'commitSuccess': "WFS-transaktion: LYCKADES ${response}",
-
-    'commitFailed': "WFS-transaktion: MISSLYCKADES ${response}",
-
-    'googleWarning': "Google-lagret kunde inte laddas korrekt.\x3cbr\x3e\x3cbr\x3eFör att slippa detta meddelande, välj en annan bakgrundskarta i lagerväljaren i övre högra hörnet.\x3cbr\x3e\x3cbr\x3eSannolikt beror felet på att Google Maps-biblioteket inte är inkluderat på webbsidan eller på att sidan inte anger korrekt API-nyckel för webbplatsen.\x3cbr\x3e\x3cbr\x3eUtvecklare: hjälp för att åtgärda detta, \x3ca href=\'http://trac.openlayers.org/wiki/Google\' target=\'_blank\'\x3eklicka här\x3c/a\x3e.",
-
-    'getLayerWarning': "${layerType}-lagret kunde inte laddas korrekt.\x3cbr\x3e\x3cbr\x3eFör att slippa detta meddelande, välj en annan bakgrundskarta i lagerväljaren i övre högra hörnet.\x3cbr\x3e\x3cbr\x3eSannolikt beror felet på att ${layerLib}-biblioteket inte är inkluderat på webbsidan.\x3cbr\x3e\x3cbr\x3eUtvecklare: hjälp för att åtgärda detta, \x3ca href=\'http://trac.openlayers.org/wiki/${layerLib}\' target=\'_blank\'\x3eklicka här\x3c/a\x3e.",
-
-    'Scale = 1 : ${scaleDenom}': "\x3cstrong\x3eSkala\x3c/strong\x3e 1 : ${scaleDenom}",
-
-    'reprojectDeprecated': "Du använder inställningen \'reproject\' på lagret ${layerName}. Denna inställning markerad som deprecated: den var avsedd att användas för att stödja visning av kartdata på kommersiella bakgrundskartor, men nu bör man i stället använda Spherical Mercator-stöd för den funktionaliteten. Mer information finns på http://trac.openlayers.org/wiki/SphericalMercator.",
-
-    'methodDeprecated': "Denna metod är markerad som deprecated och kommer att tas bort i 3.0. Använd ${newMethod} i stället."
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/te.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/te.js
deleted file mode 100644
index 289eff3d..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/te.js
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Translators (2009 onwards):
- *  - Veeven
- */
-
-/**
- * @requires OpenLayers/Lang.js
- */
-
-/**
- * Namespace: OpenLayers.Lang["te"]
- * Dictionary for తెలుగు.  Keys for entries are used in calls to
- *     <OpenLayers.Lang.translate>.  Entry bodies are normal strings or
- *     strings formatted for use with <OpenLayers.String.format> calls.
- */
-OpenLayers.Lang["te"] = OpenLayers.Util.applyDefaults({
-
-    'Permalink': "స్థిరలింకు",
-
-    'W': "ప",
-
-    'E': "తూ",
-
-    'N': "ఉ",
-
-    'S': "ద"
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/vi.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/vi.js
deleted file mode 100644
index 63b42708..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/vi.js
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Translators (2009 onwards):
- *  - Minh Nguyen
- */
-
-/**
- * @requires OpenLayers/Lang.js
- */
-
-/**
- * Namespace: OpenLayers.Lang["vi"]
- * Dictionary for Tiếng Việt.  Keys for entries are used in calls to
- *     <OpenLayers.Lang.translate>.  Entry bodies are normal strings or
- *     strings formatted for use with <OpenLayers.String.format> calls.
- */
-OpenLayers.Lang["vi"] = OpenLayers.Util.applyDefaults({
-
-    'unhandledRequest': "Không xử lý được phản hồi ${statusText} cho yêu cầu",
-
-    'Permalink': "Liên kết thường trực",
-
-    'Overlays': "Lấp bản đồ",
-
-    'Base Layer': "Lớp nền",
-
-    'noFID': "Không thể cập nhật tính năng thiếu FID.",
-
-    'browserNotSupported': "Trình duyệt của bạn không hỗ trợ chức năng vẽ bằng vectơ. Hiện hỗ trợ các bộ kết xuất:\n${renderers}",
-
-    'minZoomLevelError': "Chỉ nên sử dụng thuộc tính minZoomLevel với các lớp FixedZoomLevels-descendent. Việc lớp wfs này tìm cho minZoomLevel là di tích còn lại từ xưa. Tuy nhiên, nếu chúng tôi dời nó thì sẽ vỡ các chương trình OpenLayers mà dựa trên nó. Bởi vậy chúng tôi phản đối sử dụng nó\x26nbsp;– bước tìm cho minZoomLevel sẽ được dời vào phiên bản 3.0. Xin sử dụng thiết lập độ phân tích tối thiểu / tối đa thay thế, theo hướng dẫn này: http://trac.openlayers.org/wiki/SettingZoomLevels",
-
-    'commitSuccess': "Giao dịch WFS: THÀNH CÔNG ${response}",
-
-    'commitFailed': "Giao dịch WFS: THẤT BẠI ${response}",
-
-    'googleWarning': "Không thể tải lớp Google đúng đắn.\x3cbr\x3e\x3cbr\x3eĐể tránh thông báo này lần sau, hãy chọn BaseLayer mới dùng điều khiển chọn lớp ở góc trên phải.\x3cbr\x3e\x3cbr\x3eChắc script thư viện Google Maps hoặc không được bao gồm hoặc không chứa khóa API hợp với website của bạn.\x3cbr\x3e\x3cbr\x3e\x3ca href=\'http://trac.openlayers.org/wiki/Google\' target=\'_blank\'\x3eTrợ giúp về tính năng này\x3c/a\x3e cho người phát triển.",
-
-    'getLayerWarning': "Không thể tải lớp ${layerType} đúng đắn.\x3cbr\x3e\x3cbr\x3eĐể tránh thông báo này lần sau, hãy chọn BaseLayer mới dùng điều khiển chọn lớp ở góc trên phải.\x3cbr\x3e\x3cbr\x3eChắc script thư viện ${layerLib} không được bao gồm đúng kiểu.\x3cbr\x3e\x3cbr\x3e\x3ca href=\'http://trac.openlayers.org/wiki/${layerLib}\' target=\'_blank\'\x3eTrợ giúp về tính năng này\x3c/a\x3e cho người phát triển.",
-
-    'Scale = 1 : ${scaleDenom}': "Tỷ lệ = 1 : ${scaleDenom}",
-
-    'W': "T",
-
-    'E': "Đ",
-
-    'N': "B",
-
-    'S': "N",
-
-    'reprojectDeprecated': "Bạn đang áp dụng chế độ “reproject” vào lớp ${layerName}. Chế độ này đã bị phản đối: nó có mục đích hỗ trợ lấp dữ liệu trên các nền bản đồ thương mại; nên thực hiện hiệu ứng đó dùng tính năng Mercator Hình cầu. Có sẵn thêm chi tiết tại http://trac.openlayers.org/wiki/SphericalMercator .",
-
-    'methodDeprecated': "Phương thức này đã bị phản đối và sẽ bị dời vào phiên bản 3.0. Xin hãy sử dụng ${newMethod} thay thế."
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/zh-CN.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/zh-CN.js
deleted file mode 100644
index 449dd696..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/zh-CN.js
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
- * @requires OpenLayers/Lang.js
- */
-
-/**
- * Namespace: OpenLayers.Lang["zh-CN"]
- * Dictionary for Simplified Chinese.  Keys for entries are used in calls to
- *     <OpenLayers.Lang.translate>.  Entry bodies are normal strings or
- *     strings formatted for use with <OpenLayers.String.format> calls.
- */
-OpenLayers.Lang["zh-CN"] = {
-
-    'unhandledRequest': "未处理的请求，返回值为 ${statusText}",
-
-    'Permalink': "永久链接",
-
-    'Overlays': "叠加层",
-
-    'Base Layer': "基础图层",
-
-    'noFID': "无法更新feature，缺少FID。",
-
-    'browserNotSupported':
-        "你使用的浏览器不支持矢量渲染。当前支持的渲染方式包括：\n${renderers}",
-
-    // console message
-    'minZoomLevelError':
-        "minZoomLevel属性仅适合用于" +
-        "使用了固定缩放级别的图层。这个 " +
-        "wfs 图层检查 minZoomLevel 是过去遗留下来的。" +
-        "然而，我们不能移除它，" +
-        "而破坏依赖于它的基于OL的应用程序。" +
-        "因此，我们废除了它 -- minZoomLevel " +
-        "将会在3.0中被移除。请改用 " +
-        "min/max resolution 设置，参考：" +
-        "http://trac.openlayers.org/wiki/SettingZoomLevels",
-
-    'commitSuccess': "WFS Transaction: 成功。 ${response}",
-
-    'commitFailed': "WFS Transaction: 失败。 ${response}",
-
-    'googleWarning':
-        "Google图层不能正确加载。<br><br>" +
-        "要消除这个信息，请在右上角的" +
-        "图层控制面板中选择其他的基础图层。<br><br>" +
-        "这种情况很可能是没有正确的包含Google地图脚本库，" +
-        "或者是没有包含在你的站点上" +
-        "使用的正确的Google Maps API密匙。<br><br>" +
-        "开发者：获取使其正确工作的帮助信息，" +
-        "<a href='http://trac.openlayers.org/wiki/Google' " +
-        "target='_blank'>点击这里</a>",
-
-    'getLayerWarning':
-        "${layerType} 图层不能正确加载。<br><br>" +
-        "要消除这个信息，请在右上角的" +
-        "图层控制面板中选择其他的基础图层。<br><br>" +
-        "这种情况很可能是没有正确的包含" +
-        "${layerLib} 脚本库。<br><br>" +
-        "开发者：获取使其正确工作的帮助信息，" +
-        "<a href='http://trac.openlayers.org/wiki/${layerLib}' " +
-        "target='_blank'>点击这里</a>",
-
-    'Scale = 1 : ${scaleDenom}': "比例尺 = 1 : ${scaleDenom}",
-
-    // console message
-    'reprojectDeprecated':
-        "你正在使用 ${layerName} 图层上的'reproject'选项。" +
-        "这个选项已经不再使用：" +
-        "它是被设计用来支持显示商业的地图数据，" + 
-        "不过现在该功能可以通过使用Spherical Mercator来实现。" +
-        "更多信息可以参阅" +
-        "http://trac.openlayers.org/wiki/SphericalMercator.",
-
-    // console message
-    'methodDeprecated':
-        "该方法已经不再被支持，并且将在3.0中被移除。" +
-        "请使用 ${newMethod} 方法来替代。",
-
-    'end': ''
-};
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/zh-TW.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/zh-TW.js
deleted file mode 100644
index b70e861c..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Lang/zh-TW.js
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- * @requires OpenLayers/Lang.js
- */
-
-/**
- * Namespace: OpenLayers.Lang["zh-TW"]
- * Dictionary for Traditional Chinese. (Used Mainly in Taiwan) 
- * Keys for entries are used in calls to
- *     <OpenLayers.Lang.translate>.  Entry bodies are normal strings or
- *     strings formatted for use with <OpenLayers.String.format> calls.
- */
-OpenLayers.Lang["zh-TW"] = {
-
-    'unhandledRequest': "未處理的請求，傳回值為 ${statusText}。",
-
-    'Permalink': "永久連結",
-
-    'Overlays': "額外圖層",
-
-    'Base Layer': "基礎圖層",
-
-    'noFID': "因為沒有 FID 所以無法更新 feature。",
-
-    'browserNotSupported':
-        "您的瀏覽器未支援向量渲染. 目前支援的渲染方式是:\n${renderers}",
-
-    // console message
-    'minZoomLevelError':
-        "minZoomLevel 屬性僅適合用在 " +
-        "FixedZoomLevels-descendent 類型的圖層. 這個" +
-        "wfs layer 的 minZoomLevel 是過去所遺留下來的，" +
-        "然而我們不能移除它而不讓它將" +
-        "過去的程式相容性給破壞掉。" +
-        "因此我們將會迴避使用它 -- minZoomLevel " +
-        "會在3.0被移除，請改" +
-        "用在這邊描述的 min/max resolution 設定: " +
-        "http://trac.openlayers.org/wiki/SettingZoomLevels",
-
-    'commitSuccess': "WFS Transaction: 成功 ${response}",
-
-    'commitFailed': "WFS Transaction: 失敗 ${response}",
-
-    'googleWarning':
-        "The Google Layer 圖層無法被正確的載入。<br><br>" +
-        "要迴避這個訊息, 請在右上角的圖層改變器裡，" +
-        "選一個新的基礎圖層。<br><br>" +
-        "很有可能是因為 Google Maps 的函式庫" +
-        "腳本沒有被正確的置入，或沒有包含 " +
-        "您網站上正確的 API key <br><br>" +
-        "開發者: 要幫助這個行為正確完成，" +
-        "<a href='http://trac.openlayers.org/wiki/Google' " +
-        "target='_blank'>請按這裡</a>",
-
-    'getLayerWarning':
-        "${layerType} 圖層無法被正確的載入。<br><br>" +
-        "要迴避這個訊息, 請在右上角的圖層改變器裡，" +
-        "選一個新的基礎圖層。<br><br>" +
-        "很有可能是因為 ${layerLib} 的函式庫" +
-        "腳本沒有被正確的置入。<br><br>" +
-        "開發者: 要幫助這個行為正確完成，" +
-        "<a href='http://trac.openlayers.org/wiki/${layerLib}' " +
-        "target='_blank'>請按這裡</a>",
-
-    'Scale = 1 : ${scaleDenom}': "Scale = 1 : ${scaleDenom}",
-
-    // console message
-    'reprojectDeprecated':
-        "你正使用 'reproject' 這個選項 " +
-        "在 ${layerName} 層。這個選項已經不再使用:" +
-        "它的使用原本是設計用來支援在商業地圖上秀出資料，" + 
-        "但這個功能已經被" +
-        "Spherical Mercator所取代。更多的資訊可以在 " +
-        "http://trac.openlayers.org/wiki/SphericalMercator 找到。",
-
-    // console message
-    'methodDeprecated':
-        "這個方法已經不再使用且在3.0將會被移除，" +
-        "請使用 ${newMethod} 來代替。",
-
-    'end': ''
-};
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer.js
deleted file mode 100644
index 3bd4186a..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer.js
+++ /dev/null
@@ -1,1377 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-
-/**
- * @requires OpenLayers/BaseTypes/Class.js
- * @requires OpenLayers/Map.js
- * @requires OpenLayers/Projection.js
- */
-
-/**
- * Class: OpenLayers.Layer
- */
-OpenLayers.Layer = OpenLayers.Class({
-
-    /**
-     * APIProperty: id
-     * {String}
-     */
-    id: null,
-
-    /** 
-     * APIProperty: name
-     * {String}
-     */
-    name: null,
-
-    /** 
-     * APIProperty: div
-     * {DOMElement}
-     */
-    div: null,
-
-    /**
-     * APIProperty: opacity
-     * {Float} The layer's opacity. Float number between 0.0 and 1.0. Default
-     * is 1.
-     */
-    opacity: 1,
-
-    /**
-     * APIProperty: alwaysInRange
-     * {Boolean} If a layer's display should not be scale-based, this should 
-     *     be set to true. This will cause the layer, as an overlay, to always 
-     *     be 'active', by always returning true from the calculateInRange() 
-     *     function. 
-     * 
-     *     If not explicitly specified for a layer, its value will be 
-     *     determined on startup in initResolutions() based on whether or not 
-     *     any scale-specific properties have been set as options on the 
-     *     layer. If no scale-specific options have been set on the layer, we 
-     *     assume that it should always be in range.
-     * 
-     *     See #987 for more info.
-     */
-    alwaysInRange: null,   
-
-    /**
-     * Constant: RESOLUTION_PROPERTIES
-     * {Array} The properties that are used for calculating resolutions
-     *     information.
-     */
-    RESOLUTION_PROPERTIES: [
-        'scales', 'resolutions',
-        'maxScale', 'minScale',
-        'maxResolution', 'minResolution',
-        'numZoomLevels', 'maxZoomLevel'
-    ],
-
-    /**
-     * APIProperty: events
-     * {<OpenLayers.Events>}
-     *
-     * Register a listener for a particular event with the following syntax:
-     * (code)
-     * layer.events.register(type, obj, listener);
-     * (end)
-     *
-     * Listeners will be called with a reference to an event object.  The
-     *     properties of this event depends on exactly what happened.
-     *
-     * All event objects have at least the following properties:
-     * object - {Object} A reference to layer.events.object.
-     * element - {DOMElement} A reference to layer.events.element.
-     *
-     * Supported map event types:
-     * loadstart - Triggered when layer loading starts.  When using a Vector 
-     *     layer with a Fixed or BBOX strategy, the event object includes 
-     *     a *filter* property holding the OpenLayers.Filter used when 
-     *     calling read on the protocol.
-     * loadend - Triggered when layer loading ends.  When using a Vector layer
-     *     with a Fixed or BBOX strategy, the event object includes a 
-     *     *response* property holding an OpenLayers.Protocol.Response object.
-     * visibilitychanged - Triggered when the layer's visibility property is
-     *     changed, e.g. by turning the layer on or off in the layer switcher.
-     *     Note that the actual visibility of the layer can also change if it
-     *     gets out of range (see <calculateInRange>). If you also want to catch
-     *     these cases, register for the map's 'changelayer' event instead.
-     * move - Triggered when layer moves (triggered with every mousemove
-     *     during a drag).
-     * moveend - Triggered when layer is done moving, object passed as
-     *     argument has a zoomChanged boolean property which tells that the
-     *     zoom has changed.
-     * added - Triggered after the layer is added to a map.  Listeners will
-     *     receive an object with a *map* property referencing the map and a
-     *     *layer* property referencing the layer.
-     * removed - Triggered after the layer is removed from the map.  Listeners
-     *     will receive an object with a *map* property referencing the map and
-     *     a *layer* property referencing the layer.
-     */
-    events: null,
-
-    /**
-     * APIProperty: map
-     * {<OpenLayers.Map>} This variable is set when the layer is added to 
-     *     the map, via the accessor function setMap().
-     */
-    map: null,
-    
-    /**
-     * APIProperty: isBaseLayer
-     * {Boolean} Whether or not the layer is a base layer. This should be set 
-     *     individually by all subclasses. Default is false
-     */
-    isBaseLayer: false,
- 
-    /**
-     * Property: alpha
-     * {Boolean} The layer's images have an alpha channel.  Default is false.
-     */
-    alpha: false,
-
-    /** 
-     * APIProperty: displayInLayerSwitcher
-     * {Boolean} Display the layer's name in the layer switcher.  Default is
-     *     true.
-     */
-    displayInLayerSwitcher: true,
-
-    /**
-     * APIProperty: visibility
-     * {Boolean} The layer should be displayed in the map.  Default is true.
-     */
-    visibility: true,
-
-    /**
-     * APIProperty: attribution
-     * {String} Attribution string, displayed when an 
-     *     <OpenLayers.Control.Attribution> has been added to the map.
-     */
-    attribution: null, 
-
-    /** 
-     * Property: inRange
-     * {Boolean} The current map resolution is within the layer's min/max 
-     *     range. This is set in <OpenLayers.Map.setCenter> whenever the zoom 
-     *     changes.
-     */
-    inRange: false,
-    
-    /**
-     * Propery: imageSize
-     * {<OpenLayers.Size>} For layers with a gutter, the image is larger than 
-     *     the tile by twice the gutter in each dimension.
-     */
-    imageSize: null,
-    
-  // OPTIONS
-
-    /** 
-     * Property: options
-     * {Object} An optional object whose properties will be set on the layer.
-     *     Any of the layer properties can be set as a property of the options
-     *     object and sent to the constructor when the layer is created.
-     */
-    options: null,
-
-    /**
-     * APIProperty: eventListeners
-     * {Object} If set as an option at construction, the eventListeners
-     *     object will be registered with <OpenLayers.Events.on>.  Object
-     *     structure must be a listeners object as shown in the example for
-     *     the events.on method.
-     */
-    eventListeners: null,
-
-    /**
-     * APIProperty: gutter
-     * {Integer} Determines the width (in pixels) of the gutter around image
-     *     tiles to ignore.  By setting this property to a non-zero value,
-     *     images will be requested that are wider and taller than the tile
-     *     size by a value of 2 x gutter.  This allows artifacts of rendering
-     *     at tile edges to be ignored.  Set a gutter value that is equal to
-     *     half the size of the widest symbol that needs to be displayed.
-     *     Defaults to zero.  Non-tiled layers always have zero gutter.
-     */ 
-    gutter: 0, 
-
-    /**
-     * APIProperty: projection
-     * {<OpenLayers.Projection>} or {<String>} Specifies the projection of the layer.
-     *     Can be set in the layer options. If not specified in the layer options,
-     *     it is set to the default projection specified in the map,
-     *     when the layer is added to the map.
-     *     Projection along with default maxExtent and resolutions
-     *     are set automatically with commercial baselayers in EPSG:3857,
-     *     such as Google, Bing and OpenStreetMap, and do not need to be specified.
-     *     Otherwise, if specifying projection, also set maxExtent,
-     *     maxResolution or resolutions as appropriate.
-     *     When using vector layers with strategies, layer projection should be set
-     *     to the projection of the source data if that is different from the map default.
-     * 
-     *     Can be either a string or an <OpenLayers.Projection> object;
-     *     if a string is passed, will be converted to an object when
-     *     the layer is added to the map.
-     * 
-     */
-    projection: null,    
-    
-    /**
-     * APIProperty: units
-     * {String} The layer map units.  Defaults to null.  Possible values
-     *     are 'degrees' (or 'dd'), 'm', 'ft', 'km', 'mi', 'inches'.
-     *     Normally taken from the projection.
-     *     Only required if both map and layers do not define a projection,
-     *     or if they define a projection which does not define units.
-     */
-    units: null,
-
-    /**
-     * APIProperty: scales
-     * {Array}  An array of map scales in descending order.  The values in the
-     *     array correspond to the map scale denominator.  Note that these
-     *     values only make sense if the display (monitor) resolution of the
-     *     client is correctly guessed by whomever is configuring the
-     *     application.  In addition, the units property must also be set.
-     *     Use <resolutions> instead wherever possible.
-     */
-    scales: null,
-
-    /**
-     * APIProperty: resolutions
-     * {Array} A list of map resolutions (map units per pixel) in descending
-     *     order.  If this is not set in the layer constructor, it will be set
-     *     based on other resolution related properties (maxExtent,
-     *     maxResolution, maxScale, etc.).
-     */
-    resolutions: null,
-    
-    /**
-     * APIProperty: maxExtent
-     * {<OpenLayers.Bounds>|Array} If provided as an array, the array
-     *     should consist of four values (left, bottom, right, top).
-     *     The maximum extent for the layer.  Defaults to null.
-     * 
-     *     The center of these bounds will not stray outside
-     *     of the viewport extent during panning.  In addition, if
-     *     <displayOutsideMaxExtent> is set to false, data will not be
-     *     requested that falls completely outside of these bounds.
-     */
-    maxExtent: null,
-    
-    /**
-     * APIProperty: minExtent
-     * {<OpenLayers.Bounds>|Array} If provided as an array, the array
-     *     should consist of four values (left, bottom, right, top).
-     *     The minimum extent for the layer.  Defaults to null.
-     */
-    minExtent: null,
-    
-    /**
-     * APIProperty: maxResolution
-     * {Float} Default max is 360 deg / 256 px, which corresponds to
-     *     zoom level 0 on gmaps.  Specify a different value in the layer 
-     *     options if you are not using the default <OpenLayers.Map.tileSize>
-     *     and displaying the whole world.
-     */
-    maxResolution: null,
-
-    /**
-     * APIProperty: minResolution
-     * {Float}
-     */
-    minResolution: null,
-
-    /**
-     * APIProperty: numZoomLevels
-     * {Integer}
-     */
-    numZoomLevels: null,
-    
-    /**
-     * APIProperty: minScale
-     * {Float}
-     */
-    minScale: null,
-    
-    /**
-     * APIProperty: maxScale
-     * {Float}
-     */
-    maxScale: null,
-
-    /**
-     * APIProperty: displayOutsideMaxExtent
-     * {Boolean} Request map tiles that are completely outside of the max 
-     *     extent for this layer. Defaults to false.
-     */
-    displayOutsideMaxExtent: false,
-
-    /**
-     * APIProperty: wrapDateLine
-     * {Boolean} Wraps the world at the international dateline, so the map can
-     * be panned infinitely in longitudinal direction. Only use this on the
-     * base layer, and only if the layer's maxExtent equals the world bounds.
-     * #487 for more info.   
-     */
-    wrapDateLine: false,
-    
-    /**
-     * Property: metadata
-     * {Object} This object can be used to store additional information on a
-     *     layer object.
-     */
-    metadata: null,
-    
-    /**
-     * Constructor: OpenLayers.Layer
-     *
-     * Parameters:
-     * name - {String} The layer name
-     * options - {Object} Hashtable of extra options to tag onto the layer
-     */
-    initialize: function(name, options) {
-
-        this.metadata = {};
-        
-        options = OpenLayers.Util.extend({}, options);
-        // make sure we respect alwaysInRange if set on the prototype
-        if (this.alwaysInRange != null) {
-            options.alwaysInRange = this.alwaysInRange;
-        }
-        this.addOptions(options);
-
-        this.name = name;
-        
-        if (this.id == null) {
-
-            this.id = OpenLayers.Util.createUniqueID(this.CLASS_NAME + "_");
-
-            this.div = OpenLayers.Util.createDiv(this.id);
-            this.div.style.width = "100%";
-            this.div.style.height = "100%";
-            this.div.dir = "ltr";
-
-            this.events = new OpenLayers.Events(this, this.div);
-            if(this.eventListeners instanceof Object) {
-                this.events.on(this.eventListeners);
-            }
-
-        }
-    },
-    
-    /**
-     * Method: destroy
-     * Destroy is a destructor: this is to alleviate cyclic references which
-     *     the Javascript garbage cleaner can not take care of on its own.
-     *
-     * Parameters:
-     * setNewBaseLayer - {Boolean} Set a new base layer when this layer has
-     *     been destroyed.  Default is true.
-     */
-    destroy: function(setNewBaseLayer) {
-        if (setNewBaseLayer == null) {
-            setNewBaseLayer = true;
-        }
-        if (this.map != null) {
-            this.map.removeLayer(this, setNewBaseLayer);
-        }
-        this.projection = null;
-        this.map = null;
-        this.name = null;
-        this.div = null;
-        this.options = null;
-
-        if (this.events) {
-            if(this.eventListeners) {
-                this.events.un(this.eventListeners);
-            }
-            this.events.destroy();
-        }
-        this.eventListeners = null;
-        this.events = null;
-    },
-    
-   /**
-    * Method: clone
-    *
-    * Parameters:
-    * obj - {<OpenLayers.Layer>} The layer to be cloned
-    *
-    * Returns:
-    * {<OpenLayers.Layer>} An exact clone of this <OpenLayers.Layer>
-    */
-    clone: function (obj) {
-        
-        if (obj == null) {
-            obj = new OpenLayers.Layer(this.name, this.getOptions());
-        }
-        
-        // catch any randomly tagged-on properties
-        OpenLayers.Util.applyDefaults(obj, this);
-        
-        // a cloned layer should never have its map property set
-        //  because it has not been added to a map yet. 
-        obj.map = null;
-        
-        return obj;
-    },
-    
-    /**
-     * Method: getOptions
-     * Extracts an object from the layer with the properties that were set as
-     *     options, but updates them with the values currently set on the
-     *     instance.
-     * 
-     * Returns:
-     * {Object} the <options> of the layer, representing the current state.
-     */
-    getOptions: function() {
-        var options = {};
-        for(var o in this.options) {
-            options[o] = this[o];
-        }
-        return options;
-    },
-    
-    /** 
-     * APIMethod: setName
-     * Sets the new layer name for this layer.  Can trigger a changelayer event
-     *     on the map.
-     *
-     * Parameters:
-     * newName - {String} The new name.
-     */
-    setName: function(newName) {
-        if (newName != this.name) {
-            this.name = newName;
-            if (this.map != null) {
-                this.map.events.triggerEvent("changelayer", {
-                    layer: this,
-                    property: "name"
-                });
-            }
-        }
-    },    
-    
-   /**
-    * APIMethod: addOptions
-    * 
-    * Parameters:
-    * newOptions - {Object}
-    * reinitialize - {Boolean} If set to true, and if resolution options of the
-    *     current baseLayer were changed, the map will be recentered to make
-    *     sure that it is displayed with a valid resolution, and a
-    *     changebaselayer event will be triggered.
-    */
-    addOptions: function (newOptions, reinitialize) {
-
-        if (this.options == null) {
-            this.options = {};
-        }
-        
-        if (newOptions) {
-            // make sure this.projection references a projection object
-            if(typeof newOptions.projection == "string") {
-                newOptions.projection = new OpenLayers.Projection(newOptions.projection);
-            }
-            if (newOptions.projection) {
-                // get maxResolution, units and maxExtent from projection defaults if
-                // they are not defined already
-                OpenLayers.Util.applyDefaults(newOptions,
-                    OpenLayers.Projection.defaults[newOptions.projection.getCode()]);
-            }
-            // allow array for extents
-            if (newOptions.maxExtent && !(newOptions.maxExtent instanceof OpenLayers.Bounds)) {
-                newOptions.maxExtent = new OpenLayers.Bounds(newOptions.maxExtent);
-            }
-            if (newOptions.minExtent && !(newOptions.minExtent instanceof OpenLayers.Bounds)) {
-                newOptions.minExtent = new OpenLayers.Bounds(newOptions.minExtent);
-            }
-        }
-
-        // update our copy for clone
-        OpenLayers.Util.extend(this.options, newOptions);
-
-        // add new options to this
-        OpenLayers.Util.extend(this, newOptions);
-        
-        // get the units from the projection, if we have a projection
-        // and it it has units
-        if(this.projection && this.projection.getUnits()) {
-            this.units = this.projection.getUnits();
-        }
-
-        // re-initialize resolutions if necessary, i.e. if any of the
-        // properties of the "properties" array defined below is set
-        // in the new options
-        if(this.map) {
-            // store current resolution so we can try to restore it later
-            var resolution = this.map.getResolution();
-            var properties = this.RESOLUTION_PROPERTIES.concat(
-                ["projection", "units", "minExtent", "maxExtent"]
-            );
-            for(var o in newOptions) {
-                if(newOptions.hasOwnProperty(o) &&
-                   OpenLayers.Util.indexOf(properties, o) >= 0) {
-
-                    this.initResolutions();
-                    if (reinitialize && this.map.baseLayer === this) {
-                        // update map position, and restore previous resolution
-                        this.map.setCenter(this.map.getCenter(),
-                            this.map.getZoomForResolution(resolution),
-                            false, true
-                        );
-                        // trigger a changebaselayer event to make sure that
-                        // all controls (especially
-                        // OpenLayers.Control.PanZoomBar) get notified of the
-                        // new options
-                        this.map.events.triggerEvent("changebaselayer", {
-                            layer: this
-                        });
-                    }
-                    break;
-                }
-            }
-        }
-    },
-
-    /**
-     * APIMethod: onMapResize
-     * This function can be implemented by subclasses
-     */
-    onMapResize: function() {
-        //this function can be implemented by subclasses  
-    },
-
-    /**
-     * APIMethod: redraw
-     * Redraws the layer.  Returns true if the layer was redrawn, false if not.
-     *
-     * Returns:
-     * {Boolean} The layer was redrawn.
-     */
-    redraw: function() {
-        var redrawn = false;
-        if (this.map) {
-
-            // min/max Range may have changed
-            this.inRange = this.calculateInRange();
-
-            // map's center might not yet be set
-            var extent = this.getExtent();
-
-            if (extent && this.inRange && this.visibility) {
-                var zoomChanged = true;
-                this.moveTo(extent, zoomChanged, false);
-                this.events.triggerEvent("moveend",
-                    {"zoomChanged": zoomChanged});
-                redrawn = true;
-            }
-        }
-        return redrawn;
-    },
-
-    /**
-     * Method: moveTo
-     * 
-     * Parameters:
-     * bounds - {<OpenLayers.Bounds>}
-     * zoomChanged - {Boolean} Tells when zoom has changed, as layers have to
-     *     do some init work in that case.
-     * dragging - {Boolean}
-     */
-    moveTo:function(bounds, zoomChanged, dragging) {
-        var display = this.visibility;
-        if (!this.isBaseLayer) {
-            display = display && this.inRange;
-        }
-        this.display(display);
-    },
-
-    /**
-     * Method: moveByPx
-     * Move the layer based on pixel vector. To be implemented by subclasses.
-     *
-     * Parameters:
-     * dx - {Number} The x coord of the displacement vector.
-     * dy - {Number} The y coord of the displacement vector.
-     */
-    moveByPx: function(dx, dy) {
-    },
-
-    /**
-     * Method: setMap
-     * Set the map property for the layer. This is done through an accessor
-     *     so that subclasses can override this and take special action once 
-     *     they have their map variable set. 
-     * 
-     *     Here we take care to bring over any of the necessary default 
-     *     properties from the map. 
-     * 
-     * Parameters:
-     * map - {<OpenLayers.Map>}
-     */
-    setMap: function(map) {
-        if (this.map == null) {
-        
-            this.map = map;
-            
-            // grab some essential layer data from the map if it hasn't already
-            //  been set
-            this.maxExtent = this.maxExtent || this.map.maxExtent;
-            this.minExtent = this.minExtent || this.map.minExtent;
-
-            this.projection = this.projection || this.map.projection;
-            if (typeof this.projection == "string") {
-                this.projection = new OpenLayers.Projection(this.projection);
-            }
-
-            // Check the projection to see if we can get units -- if not, refer
-            // to properties.
-            this.units = this.projection.getUnits() ||
-                         this.units || this.map.units;
-            
-            this.initResolutions();
-            
-            if (!this.isBaseLayer) {
-                this.inRange = this.calculateInRange();
-                var show = ((this.visibility) && (this.inRange));
-                this.div.style.display = show ? "" : "none";
-            }
-            
-            // deal with gutters
-            this.setTileSize();
-        }
-    },
-    
-    /**
-     * Method: afterAdd
-     * Called at the end of the map.addLayer sequence.  At this point, the map
-     *     will have a base layer.  To be overridden by subclasses.
-     */
-    afterAdd: function() {
-    },
-    
-    /**
-     * APIMethod: removeMap
-     * Just as setMap() allows each layer the possibility to take a 
-     *     personalized action on being added to the map, removeMap() allows
-     *     each layer to take a personalized action on being removed from it. 
-     *     For now, this will be mostly unused, except for the EventPane layer,
-     *     which needs this hook so that it can remove the special invisible
-     *     pane. 
-     * 
-     * Parameters:
-     * map - {<OpenLayers.Map>}
-     */
-    removeMap: function(map) {
-        //to be overridden by subclasses
-    },
-    
-    /**
-     * APIMethod: getImageSize
-     *
-     * Parameters:
-     * bounds - {<OpenLayers.Bounds>} optional tile bounds, can be used
-     *     by subclasses that have to deal with different tile sizes at the
-     *     layer extent edges (e.g. Zoomify)
-     * 
-     * Returns:
-     * {<OpenLayers.Size>} The size that the image should be, taking into 
-     *     account gutters.
-     */ 
-    getImageSize: function(bounds) { 
-        return (this.imageSize || this.tileSize); 
-    },    
-  
-    /**
-     * APIMethod: setTileSize
-     * Set the tile size based on the map size.  This also sets layer.imageSize
-     *     or use by Tile.Image.
-     * 
-     * Parameters:
-     * size - {<OpenLayers.Size>}
-     */
-    setTileSize: function(size) {
-        var tileSize = (size) ? size :
-                                ((this.tileSize) ? this.tileSize :
-                                                   this.map.getTileSize());
-        this.tileSize = tileSize;
-        if(this.gutter) {
-          // layers with gutters need non-null tile sizes
-          //if(tileSize == null) {
-          //    OpenLayers.console.error("Error in layer.setMap() for " +
-          //                              this.name + ": layers with " +
-          //                              "gutters need non-null tile sizes");
-          //}
-            this.imageSize = new OpenLayers.Size(tileSize.w + (2*this.gutter), 
-                                                 tileSize.h + (2*this.gutter)); 
-        }
-    },
-
-    /**
-     * APIMethod: getVisibility
-     * 
-     * Returns:
-     * {Boolean} The layer should be displayed (if in range).
-     */
-    getVisibility: function() {
-        return this.visibility;
-    },
-
-    /** 
-     * APIMethod: setVisibility
-     * Set the visibility flag for the layer and hide/show & redraw 
-     *     accordingly. Fire event unless otherwise specified
-     * 
-     * Note that visibility is no longer simply whether or not the layer's
-     *     style.display is set to "block". Now we store a 'visibility' state 
-     *     property on the layer class, this allows us to remember whether or 
-     *     not we *desire* for a layer to be visible. In the case where the 
-     *     map's resolution is out of the layer's range, this desire may be 
-     *     subverted.
-     * 
-     * Parameters:
-     * visibility - {Boolean} Whether or not to display the layer (if in range)
-     */
-    setVisibility: function(visibility) {
-        if (visibility != this.visibility) {
-            this.visibility = visibility;
-            this.display(visibility);
-            this.redraw();
-            if (this.map != null) {
-                this.map.events.triggerEvent("changelayer", {
-                    layer: this,
-                    property: "visibility"
-                });
-            }
-            this.events.triggerEvent("visibilitychanged");
-        }
-    },
-
-    /** 
-     * APIMethod: display
-     * Hide or show the Layer. This is designed to be used internally, and 
-     *     is not generally the way to enable or disable the layer. For that,
-     *     use the setVisibility function instead..
-     * 
-     * Parameters:
-     * display - {Boolean}
-     */
-    display: function(display) {
-        if (display != (this.div.style.display != "none")) {
-            this.div.style.display = (display && this.calculateInRange()) ? "block" : "none";
-        }
-    },
-
-    /**
-     * APIMethod: calculateInRange
-     * 
-     * Returns:
-     * {Boolean} The layer is displayable at the current map's current
-     *     resolution. Note that if 'alwaysInRange' is true for the layer, 
-     *     this function will always return true.
-     */
-    calculateInRange: function() {
-        var inRange = false;
-
-        if (this.alwaysInRange) {
-            inRange = true;
-        } else {
-            if (this.map) {
-                var resolution = this.map.getResolution();
-                inRange = ( (resolution >= this.minResolution) &&
-                            (resolution <= this.maxResolution) );
-            }
-        }
-        return inRange;
-    },
-
-    /** 
-     * APIMethod: setIsBaseLayer
-     * 
-     * Parameters:
-     * isBaseLayer - {Boolean}
-     */
-    setIsBaseLayer: function(isBaseLayer) {
-        if (isBaseLayer != this.isBaseLayer) {
-            this.isBaseLayer = isBaseLayer;
-            if (this.map != null) {
-                this.map.events.triggerEvent("changebaselayer", {
-                    layer: this
-                });
-            }
-        }
-    },
-
-  /********************************************************/
-  /*                                                      */
-  /*                 Baselayer Functions                  */
-  /*                                                      */
-  /********************************************************/
-  
-    /** 
-     * Method: initResolutions
-     * This method's responsibility is to set up the 'resolutions' array 
-     *     for the layer -- this array is what the layer will use to interface
-     *     between the zoom levels of the map and the resolution display 
-     *     of the layer.
-     * 
-     * The user has several options that determine how the array is set up.
-     *  
-     * For a detailed explanation, see the following wiki from the 
-     *     openlayers.org homepage:
-     *     http://trac.openlayers.org/wiki/SettingZoomLevels
-     */
-    initResolutions: function() {
-
-        // ok we want resolutions, here's our strategy:
-        //
-        // 1. if resolutions are defined in the layer config, use them
-        // 2. else, if scales are defined in the layer config then derive
-        //    resolutions from these scales
-        // 3. else, attempt to calculate resolutions from maxResolution,
-        //    minResolution, numZoomLevels, maxZoomLevel set in the
-        //    layer config
-        // 4. if we still don't have resolutions, and if resolutions
-        //    are defined in the same, use them
-        // 5. else, if scales are defined in the map then derive
-        //    resolutions from these scales
-        // 6. else, attempt to calculate resolutions from maxResolution,
-        //    minResolution, numZoomLevels, maxZoomLevel set in the
-        //    map
-        // 7. hope for the best!
-
-        var i, len, p;
-        var props = {}, alwaysInRange = true;
-
-        // get resolution data from layer config
-        // (we also set alwaysInRange in the layer as appropriate)
-        for(i=0, len=this.RESOLUTION_PROPERTIES.length; i<len; i++) {
-            p = this.RESOLUTION_PROPERTIES[i];
-            props[p] = this.options[p];
-            if(alwaysInRange && this.options[p]) {
-                alwaysInRange = false;
-            }
-        }
-        if(this.options.alwaysInRange == null) {
-            this.alwaysInRange = alwaysInRange;
-        }
-
-        // if we don't have resolutions then attempt to derive them from scales
-        if(props.resolutions == null) {
-            props.resolutions = this.resolutionsFromScales(props.scales);
-        }
-
-        // if we still don't have resolutions then attempt to calculate them
-        if(props.resolutions == null) {
-            props.resolutions = this.calculateResolutions(props);
-        }
-
-        // if we couldn't calculate resolutions then we look at we have
-        // in the map
-        if(props.resolutions == null) {
-            for(i=0, len=this.RESOLUTION_PROPERTIES.length; i<len; i++) {
-                p = this.RESOLUTION_PROPERTIES[i];
-                props[p] = this.options[p] != null ?
-                    this.options[p] : this.map[p];
-            }
-            if(props.resolutions == null) {
-                props.resolutions = this.resolutionsFromScales(props.scales);
-            }
-            if(props.resolutions == null) {
-                props.resolutions = this.calculateResolutions(props);
-            }
-        }
-
-        // ok, we new need to set properties in the instance
-
-        // get maxResolution from the config if it's defined there
-        var maxResolution;
-        if(this.options.maxResolution &&
-           this.options.maxResolution !== "auto") {
-            maxResolution = this.options.maxResolution;
-        }
-        if(this.options.minScale) {
-            maxResolution = OpenLayers.Util.getResolutionFromScale(
-                this.options.minScale, this.units);
-        }
-
-        // get minResolution from the config if it's defined there
-        var minResolution;
-        if(this.options.minResolution &&
-           this.options.minResolution !== "auto") {
-            minResolution = this.options.minResolution;
-        }
-        if(this.options.maxScale) {
-            minResolution = OpenLayers.Util.getResolutionFromScale(
-                this.options.maxScale, this.units);
-        }
-
-        if(props.resolutions) {
-
-            //sort resolutions array descendingly
-            props.resolutions.sort(function(a, b) {
-                return (b - a);
-            });
-
-            // if we still don't have a maxResolution get it from the
-            // resolutions array
-            if(!maxResolution) {
-                maxResolution = props.resolutions[0];
-            }
-
-            // if we still don't have a minResolution get it from the
-            // resolutions array
-            if(!minResolution) {
-                var lastIdx = props.resolutions.length - 1;
-                minResolution = props.resolutions[lastIdx];
-            }
-        }
-
-        this.resolutions = props.resolutions;
-        if(this.resolutions) {
-            len = this.resolutions.length;
-            this.scales = new Array(len);
-            for(i=0; i<len; i++) {
-                this.scales[i] = OpenLayers.Util.getScaleFromResolution(
-                    this.resolutions[i], this.units);
-            }
-            this.numZoomLevels = len;
-        }
-        this.minResolution = minResolution;
-        if(minResolution) {
-            this.maxScale = OpenLayers.Util.getScaleFromResolution(
-                minResolution, this.units);
-        }
-        this.maxResolution = maxResolution;
-        if(maxResolution) {
-            this.minScale = OpenLayers.Util.getScaleFromResolution(
-                maxResolution, this.units);
-        }
-    },
-
-    /**
-     * Method: resolutionsFromScales
-     * Derive resolutions from scales.
-     *
-     * Parameters:
-     * scales - {Array(Number)} Scales
-     *
-     * Returns
-     * {Array(Number)} Resolutions
-     */
-    resolutionsFromScales: function(scales) {
-        if(scales == null) {
-            return;
-        }
-        var resolutions, i, len;
-        len = scales.length;
-        resolutions = new Array(len);
-        for(i=0; i<len; i++) {
-            resolutions[i] = OpenLayers.Util.getResolutionFromScale(
-                scales[i], this.units);
-        }
-        return resolutions;
-    },
-
-    /**
-     * Method: calculateResolutions
-     * Calculate resolutions based on the provided properties.
-     *
-     * Parameters:
-     * props - {Object} Properties
-     *
-     * Returns:
-     * {Array({Number})} Array of resolutions.
-     */
-    calculateResolutions: function(props) {
-
-        var viewSize, wRes, hRes;
-
-        // determine maxResolution
-        var maxResolution = props.maxResolution;
-        if(props.minScale != null) {
-            maxResolution =
-                OpenLayers.Util.getResolutionFromScale(props.minScale,
-                                                       this.units);
-        } else if(maxResolution == "auto" && this.maxExtent != null) {
-            viewSize = this.map.getSize();
-            wRes = this.maxExtent.getWidth() / viewSize.w;
-            hRes = this.maxExtent.getHeight() / viewSize.h;
-            maxResolution = Math.max(wRes, hRes);
-        }
-
-        // determine minResolution
-        var minResolution = props.minResolution;
-        if(props.maxScale != null) {
-            minResolution =
-                OpenLayers.Util.getResolutionFromScale(props.maxScale,
-                                                       this.units);
-        } else if(props.minResolution == "auto" && this.minExtent != null) {
-            viewSize = this.map.getSize();
-            wRes = this.minExtent.getWidth() / viewSize.w;
-            hRes = this.minExtent.getHeight()/ viewSize.h;
-            minResolution = Math.max(wRes, hRes);
-        }
-
-        if(typeof maxResolution !== "number" &&
-           typeof minResolution !== "number" &&
-           this.maxExtent != null) {
-            // maxResolution for default grid sets assumes that at zoom
-            // level zero, the whole world fits on one tile.
-            var tileSize = this.map.getTileSize();
-            maxResolution = Math.max(
-                this.maxExtent.getWidth() / tileSize.w,
-                this.maxExtent.getHeight() / tileSize.h
-            );
-        }
-
-        // determine numZoomLevels
-        var maxZoomLevel = props.maxZoomLevel;
-        var numZoomLevels = props.numZoomLevels;
-        if(typeof minResolution === "number" &&
-           typeof maxResolution === "number" && numZoomLevels === undefined) {
-            var ratio = maxResolution / minResolution;
-            numZoomLevels = Math.floor(Math.log(ratio) / Math.log(2)) + 1;
-        } else if(numZoomLevels === undefined && maxZoomLevel != null) {
-            numZoomLevels = maxZoomLevel + 1;
-        }
-
-        // are we able to calculate resolutions?
-        if(typeof numZoomLevels !== "number" || numZoomLevels <= 0 ||
-           (typeof maxResolution !== "number" &&
-                typeof minResolution !== "number")) {
-            return;
-        }
-
-        // now we have numZoomLevels and at least one of maxResolution
-        // or minResolution, we can populate the resolutions array
-
-        var resolutions = new Array(numZoomLevels);
-        var base = 2;
-        if(typeof minResolution == "number" &&
-           typeof maxResolution == "number") {
-            // if maxResolution and minResolution are set, we calculate
-            // the base for exponential scaling that starts at
-            // maxResolution and ends at minResolution in numZoomLevels
-            // steps.
-            base = Math.pow(
-                    (maxResolution / minResolution),
-                (1 / (numZoomLevels - 1))
-            );
-        }
-
-        var i;
-        if(typeof maxResolution === "number") {
-            for(i=0; i<numZoomLevels; i++) {
-                resolutions[i] = maxResolution / Math.pow(base, i);
-            }
-        } else {
-            for(i=0; i<numZoomLevels; i++) {
-                resolutions[numZoomLevels - 1 - i] =
-                    minResolution * Math.pow(base, i);
-            }
-        }
-
-        return resolutions;
-    },
-
-    /**
-     * APIMethod: getResolution
-     * 
-     * Returns:
-     * {Float} The currently selected resolution of the map, taken from the
-     *     resolutions array, indexed by current zoom level.
-     */
-    getResolution: function() {
-        var zoom = this.map.getZoom();
-        return this.getResolutionForZoom(zoom);
-    },
-
-    /** 
-     * APIMethod: getExtent
-     * 
-     * Returns:
-     * {<OpenLayers.Bounds>} A Bounds object which represents the lon/lat 
-     *     bounds of the current viewPort.
-     */
-    getExtent: function() {
-        // just use stock map calculateBounds function -- passing no arguments
-        //  means it will user map's current center & resolution
-        //
-        return this.map.calculateBounds();
-    },
-
-    /**
-     * APIMethod: getZoomForExtent
-     * 
-     * Parameters:
-     * extent - {<OpenLayers.Bounds>}
-     * closest - {Boolean} Find the zoom level that most closely fits the 
-     *     specified bounds. Note that this may result in a zoom that does 
-     *     not exactly contain the entire extent.
-     *     Default is false.
-     *
-     * Returns:
-     * {Integer} The index of the zoomLevel (entry in the resolutions array) 
-     *     for the passed-in extent. We do this by calculating the ideal 
-     *     resolution for the given extent (based on the map size) and then 
-     *     calling getZoomForResolution(), passing along the 'closest'
-     *     parameter.
-     */
-    getZoomForExtent: function(extent, closest) {
-        var viewSize = this.map.getSize();
-        var idealResolution = Math.max( extent.getWidth()  / viewSize.w,
-                                        extent.getHeight() / viewSize.h );
-
-        return this.getZoomForResolution(idealResolution, closest);
-    },
-    
-    /** 
-     * Method: getDataExtent
-     * Calculates the max extent which includes all of the data for the layer.
-     *     This function is to be implemented by subclasses.
-     * 
-     * Returns:
-     * {<OpenLayers.Bounds>}
-     */
-    getDataExtent: function () {
-        //to be implemented by subclasses
-    },
-
-    /**
-     * APIMethod: getResolutionForZoom
-     * 
-     * Parameters:
-     * zoom - {Float}
-     * 
-     * Returns:
-     * {Float} A suitable resolution for the specified zoom.
-     */
-    getResolutionForZoom: function(zoom) {
-        zoom = Math.max(0, Math.min(zoom, this.resolutions.length - 1));
-        var resolution;
-        if(this.map.fractionalZoom) {
-            var low = Math.floor(zoom);
-            var high = Math.ceil(zoom);
-            resolution = this.resolutions[low] -
-                ((zoom-low) * (this.resolutions[low]-this.resolutions[high]));
-        } else {
-            resolution = this.resolutions[Math.round(zoom)];
-        }
-        return resolution;
-    },
-
-    /**
-     * APIMethod: getZoomForResolution
-     * 
-     * Parameters:
-     * resolution - {Float}
-     * closest - {Boolean} Find the zoom level that corresponds to the absolute 
-     *     closest resolution, which may result in a zoom whose corresponding
-     *     resolution is actually smaller than we would have desired (if this
-     *     is being called from a getZoomForExtent() call, then this means that
-     *     the returned zoom index might not actually contain the entire 
-     *     extent specified... but it'll be close).
-     *     Default is false.
-     * 
-     * Returns:
-     * {Integer} The index of the zoomLevel (entry in the resolutions array) 
-     *     that corresponds to the best fit resolution given the passed in 
-     *     value and the 'closest' specification.
-     */
-    getZoomForResolution: function(resolution, closest) {
-        var zoom, i, len;
-        if(this.map.fractionalZoom) {
-            var lowZoom = 0;
-            var highZoom = this.resolutions.length - 1;
-            var highRes = this.resolutions[lowZoom];
-            var lowRes = this.resolutions[highZoom];
-            var res;
-            for(i=0, len=this.resolutions.length; i<len; ++i) {
-                res = this.resolutions[i];
-                if(res >= resolution) {
-                    highRes = res;
-                    lowZoom = i;
-                }
-                if(res <= resolution) {
-                    lowRes = res;
-                    highZoom = i;
-                    break;
-                }
-            }
-            var dRes = highRes - lowRes;
-            if(dRes > 0) {
-                zoom = lowZoom + ((highRes - resolution) / dRes);
-            } else {
-                zoom = lowZoom;
-            }
-        } else {
-            var diff;
-            var minDiff = Number.POSITIVE_INFINITY;
-            for(i=0, len=this.resolutions.length; i<len; i++) {            
-                if (closest) {
-                    diff = Math.abs(this.resolutions[i] - resolution);
-                    if (diff > minDiff) {
-                        break;
-                    }
-                    minDiff = diff;
-                } else {
-                    if (this.resolutions[i] < resolution) {
-                        break;
-                    }
-                }
-            }
-            zoom = Math.max(0, i-1);
-        }
-        return zoom;
-    },
-    
-    /**
-     * APIMethod: getLonLatFromViewPortPx
-     * 
-     * Parameters:
-     * viewPortPx - {<OpenLayers.Pixel>|Object} An OpenLayers.Pixel or
-     *                                          an object with a 'x'
-     *                                          and 'y' properties.
-     *
-     * Returns:
-     * {<OpenLayers.LonLat>} An OpenLayers.LonLat which is the passed-in 
-     *     view port <OpenLayers.Pixel>, translated into lon/lat by the layer.
-     */
-    getLonLatFromViewPortPx: function (viewPortPx) {
-        var lonlat = null;
-        var map = this.map;
-        if (viewPortPx != null && map.minPx) {
-            var res = map.getResolution();
-            var maxExtent = map.getMaxExtent({restricted: true});
-            var lon = (viewPortPx.x - map.minPx.x) * res + maxExtent.left;
-            var lat = (map.minPx.y - viewPortPx.y) * res + maxExtent.top;
-            lonlat = new OpenLayers.LonLat(lon, lat);
-
-            if (this.wrapDateLine) {
-                lonlat = lonlat.wrapDateLine(this.maxExtent);
-            }
-        }
-        return lonlat;
-    },
-
-    /**
-     * APIMethod: getViewPortPxFromLonLat
-     * Returns a pixel location given a map location.  This method will return
-     *     fractional pixel values.
-     * 
-     * Parameters:
-     * lonlat - {<OpenLayers.LonLat>|Object} An OpenLayers.LonLat or
-     *                                       an object with a 'lon'
-     *                                       and 'lat' properties.
-     *
-     * Returns: 
-     * {<OpenLayers.Pixel>} An <OpenLayers.Pixel> which is the passed-in 
-     *     lonlat translated into view port pixels.
-     */
-    getViewPortPxFromLonLat: function (lonlat, resolution) {
-        var px = null; 
-        if (lonlat != null) {
-            resolution = resolution || this.map.getResolution();
-            var extent = this.map.calculateBounds(null, resolution);
-            px = new OpenLayers.Pixel(
-                (1/resolution * (lonlat.lon - extent.left)),
-                (1/resolution * (extent.top - lonlat.lat))
-            );    
-        }
-        return px;
-    },
-    
-    /**
-     * APIMethod: setOpacity
-     * Sets the opacity for the entire layer (all images)
-     * 
-     * Parameters:
-     * opacity - {Float}
-     */
-    setOpacity: function(opacity) {
-        if (opacity != this.opacity) {
-            this.opacity = opacity;
-            var childNodes = this.div.childNodes;
-            for(var i = 0, len = childNodes.length; i < len; ++i) {
-                var element = childNodes[i].firstChild || childNodes[i];
-                var lastChild = childNodes[i].lastChild;
-                //TODO de-uglify this
-                if (lastChild && lastChild.nodeName.toLowerCase() === "iframe") {
-                    element = lastChild.parentNode;
-                }
-                OpenLayers.Util.modifyDOMElement(element, null, null, null, 
-                                                 null, null, null, opacity);
-            }
-            if (this.map != null) {
-                this.map.events.triggerEvent("changelayer", {
-                    layer: this,
-                    property: "opacity"
-                });
-            }
-        }
-    },
-
-    /**
-     * Method: getZIndex
-     * 
-     * Returns: 
-     * {Integer} the z-index of this layer
-     */    
-    getZIndex: function () {
-        return this.div.style.zIndex;
-    },
-
-    /**
-     * Method: setZIndex
-     * 
-     * Parameters: 
-     * zIndex - {Integer}
-     */    
-    setZIndex: function (zIndex) {
-        this.div.style.zIndex = zIndex;
-    },
-
-    /**
-     * Method: adjustBounds
-     * This function will take a bounds, and if wrapDateLine option is set
-     *     on the layer, it will return a bounds which is wrapped around the 
-     *     world. We do not wrap for bounds which *cross* the 
-     *     maxExtent.left/right, only bounds which are entirely to the left 
-     *     or entirely to the right.
-     * 
-     * Parameters:
-     * bounds - {<OpenLayers.Bounds>}
-     */
-    adjustBounds: function (bounds) {
-
-        if (this.gutter) {
-            // Adjust the extent of a bounds in map units by the 
-            // layer's gutter in pixels.
-            var mapGutter = this.gutter * this.map.getResolution();
-            bounds = new OpenLayers.Bounds(bounds.left - mapGutter,
-                                           bounds.bottom - mapGutter,
-                                           bounds.right + mapGutter,
-                                           bounds.top + mapGutter);
-        }
-
-        if (this.wrapDateLine) {
-            // wrap around the date line, within the limits of rounding error
-            var wrappingOptions = { 
-                'rightTolerance':this.getResolution(),
-                'leftTolerance':this.getResolution()
-            };    
-            bounds = bounds.wrapDateLine(this.maxExtent, wrappingOptions);
-                              
-        }
-        return bounds;
-    },
-
-    CLASS_NAME: "OpenLayers.Layer"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/ArcGIS93Rest.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/ArcGIS93Rest.js
deleted file mode 100644
index c5bac36c..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/ArcGIS93Rest.js
+++ /dev/null
@@ -1,225 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Layer/Grid.js
- */
-
-/**
- * Class: OpenLayers.Layer.ArcGIS93Rest
- * Instances of OpenLayers.Layer.ArcGIS93Rest are used to display data from
- *     ESRI ArcGIS Server 9.3 (and up?) Mapping Services using the REST API.
- *     Create a new ArcGIS93Rest layer with the <OpenLayers.Layer.ArcGIS93Rest>
- *     constructor.  More detail on the REST API is available at
- *     http://sampleserver1.arcgisonline.com/ArcGIS/SDK/REST/index.html ;
- *     specifically, the URL provided to this layer should be an export service
- *     URL: http://sampleserver1.arcgisonline.com/ArcGIS/SDK/REST/export.html 
- * 
- * Inherits from:
- *  - <OpenLayers.Layer.Grid>
- */
-OpenLayers.Layer.ArcGIS93Rest = OpenLayers.Class(OpenLayers.Layer.Grid, {
-
-    /**
-     * Constant: DEFAULT_PARAMS
-     * {Object} Hashtable of default parameter key/value pairs 
-     */
-    DEFAULT_PARAMS: { 
-      format: "png"
-    },
-        
-    /**
-     * APIProperty: isBaseLayer
-     * {Boolean} Default is true for ArcGIS93Rest layer
-     */
-    isBaseLayer: true,
- 
- 
-    /**
-     * Constructor: OpenLayers.Layer.ArcGIS93Rest
-     * Create a new ArcGIS93Rest layer object.
-     *
-     * Example:
-     * (code)
-     * var arcims = new OpenLayers.Layer.ArcGIS93Rest("MyName",
-     *                                    "http://sampleserver1.arcgisonline.com/ArcGIS/rest/services/Specialty/ESRI_StateCityHighway_USA/MapServer/export", 
-     *                                    {
-     *                                      layers: "0,1,2"
-     *                                    });
-     * (end)
-     *
-     * Parameters:
-     * name - {String} A name for the layer
-     * url - {String} Base url for the ArcGIS server REST service
-     * options - {Object} An object with key/value pairs representing the
-     *                    options and option values.
-     *
-     * Valid Options:
-     *        format - {String} MIME type of desired image type.
-     *        layers - {String} Comma-separated list of layers to display.
-     *        srs - {String} Projection ID.
-     */
-    initialize: function(name, url, params, options) {
-        var newArguments = [];
-        //uppercase params
-        params = OpenLayers.Util.upperCaseObject(params);
-        newArguments.push(name, url, params, options);
-        OpenLayers.Layer.Grid.prototype.initialize.apply(this, newArguments);
-        OpenLayers.Util.applyDefaults(
-                       this.params, 
-                       OpenLayers.Util.upperCaseObject(this.DEFAULT_PARAMS)
-                       );
-                       
-        //layer is transparent        
-        if (this.params.TRANSPARENT && 
-            this.params.TRANSPARENT.toString().toLowerCase() == "true") {
-            
-            // unless explicitly set in options, make layer an overlay
-            if ( (options == null) || (!options.isBaseLayer) ) {
-                this.isBaseLayer = false;
-            } 
-            
-            // jpegs can never be transparent, so intelligently switch the 
-            //  format, depending on the browser's capabilities
-            if (this.params.FORMAT == "jpg") {
-                this.params.FORMAT = OpenLayers.Util.alphaHack() ? "gif"
-                                                                 : "png";
-            }
-        }
-    },    
-
-    /**
-         * Method: clone
-         * Create a clone of this layer
-         *
-         * Returns:
-         * {<OpenLayers.Layer.ArcGIS93Rest>} An exact clone of this layer
-         */
-    clone: function (obj) {
-        
-        if (obj == null) {
-            obj = new OpenLayers.Layer.ArcGIS93Rest(this.name,
-                                           this.url,
-                                           this.params,
-                                           this.getOptions());
-        }
-
-        //get all additions from superclasses
-        obj = OpenLayers.Layer.Grid.prototype.clone.apply(this, [obj]);
-
-        // copy/set any non-init, non-simple values here
-
-        return obj;
-    },
-    
-    
-    /**
-     * Method: getURL
-     * Return an image url this layer.
-     *
-     * Parameters:
-     * bounds - {<OpenLayers.Bounds>} A bounds representing the bbox for the
-     *                                request.
-     *
-     * Returns:
-     * {String} A string with the map image's url.
-     */
-    getURL: function (bounds) {
-        bounds = this.adjustBounds(bounds);
-
-        // ArcGIS Server only wants the numeric portion of the projection ID.
-        var projWords = this.projection.getCode().split(":");
-        var srid = projWords[projWords.length - 1];
-
-        var imageSize = this.getImageSize(); 
-        var newParams = {
-            'BBOX': bounds.toBBOX(),
-            'SIZE': imageSize.w + "," + imageSize.h,
-            // We always want image, the other options were json, image with a whole lotta html around it, etc.
-            'F': "image",
-            'BBOXSR': srid,
-            'IMAGESR': srid
-        };
-
-        // Now add the filter parameters.
-        if (this.layerDefs) {
-            var layerDefStrList = [];
-            var layerID;
-            for(layerID in this.layerDefs) {
-                if (this.layerDefs.hasOwnProperty(layerID)) {
-                    if (this.layerDefs[layerID]) {
-                        layerDefStrList.push(layerID);
-                        layerDefStrList.push(":");
-                        layerDefStrList.push(this.layerDefs[layerID]);
-                        layerDefStrList.push(";");
-                    }
-                }
-            }
-            if (layerDefStrList.length > 0) {
-                newParams['LAYERDEFS'] = layerDefStrList.join("");
-            }
-        }
-        var requestString = this.getFullRequestString(newParams);
-        return requestString;
-    },
-    
-    /**
-     * Method: setLayerFilter
-     * addTile creates a tile, initializes it, and adds it to the layer div. 
-     *
-     * Parameters:
-     * id - {String} The id of the layer to which the filter applies.
-     * queryDef - {String} A sql-ish query filter, for more detail see the ESRI
-     *                     documentation at http://sampleserver1.arcgisonline.com/ArcGIS/SDK/REST/export.html
-     */
-    setLayerFilter: function ( id, queryDef ) {
-        if (!this.layerDefs) {
-            this.layerDefs = {};
-        }
-        if (queryDef) {
-            this.layerDefs[id] = queryDef;
-        } else {
-            delete this.layerDefs[id];
-        }
-    },
-    
-    /**
-     * Method: clearLayerFilter
-     * Clears layer filters, either from a specific layer,
-     * or all of them.
-     *
-     * Parameters:
-     * id - {String} The id of the layer from which to remove any
-     *               filter.  If unspecified/blank, all filters
-     *               will be removed.
-     */
-    clearLayerFilter: function ( id ) {
-        if (id) {
-            delete this.layerDefs[id];
-        } else {
-            delete this.layerDefs;
-        }
-    },
-    
-    /**
-     * APIMethod: mergeNewParams
-     * Catch changeParams and uppercase the new params to be merged in
-     *     before calling changeParams on the super class.
-     * 
-     *     Once params have been changed, the tiles will be reloaded with
-     *     the new parameters.
-     * 
-     * Parameters:
-     * newParams - {Object} Hashtable of new params to use
-     */
-    mergeNewParams:function(newParams) {
-        var upperParams = OpenLayers.Util.upperCaseObject(newParams);
-        var newArguments = [upperParams];
-        return OpenLayers.Layer.Grid.prototype.mergeNewParams.apply(this, 
-                                                             newArguments);
-    },
-
-    CLASS_NAME: "OpenLayers.Layer.ArcGIS93Rest"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/ArcGISCache.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/ArcGISCache.js
deleted file mode 100644
index 99f7ddac..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/ArcGISCache.js
+++ /dev/null
@@ -1,480 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/** 
- * @requires OpenLayers/Layer/XYZ.js
- */ 
-
-/** 
- * Class: OpenLayers.Layer.ArcGISCache   
- * Layer for accessing cached map tiles from an ArcGIS Server style mapcache. 
- * Tile must already be cached for this layer to access it. This does not require 
- * ArcGIS Server itself.
- * 
- * A few attempts have been made at this kind of layer before. See 
- * http://trac.osgeo.org/openlayers/ticket/1967 
- * and 
- * http://trac.osgeo.org/openlayers/browser/sandbox/tschaub/arcgiscache/lib/OpenLayers/Layer/ArcGISCache.js
- *
- * Typically the problem encountered is that the tiles seem to "jump around".
- * This is due to the fact that the actual max extent for the tiles on AGS layers
- * changes at each zoom level due to the way these caches are constructed.
- * We have attempted to use the resolutions, tile size, and tile origin
- * from the cache meta data to make the appropriate changes to the max extent
- * of the tile to compensate for this behavior.  This must be done as zoom levels change
- * and before tiles are requested, which is why methods from base classes are overridden.
- *
- * For reference, you can access mapcache meta data in two ways. For accessing a 
- * mapcache through ArcGIS Server, you can simply go to the landing page for the
- * layer. (ie. http://services.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/MapServer)
- * For accessing it directly through HTTP, there should always be a conf.xml file
- * in the root directory. 
- * (ie. http://serverx.esri.com/arcgiscache/DG_County_roads_yesA_backgroundDark/Layers/conf.xml)
- *  
- *Inherits from: 
- *  - <OpenLayers.Layer.XYZ>             
- */    
-OpenLayers.Layer.ArcGISCache = OpenLayers.Class(OpenLayers.Layer.XYZ, {  
-
-    /**
-     * APIProperty: url
-     * {String | Array} The base URL for the layer cache.  You can also
-     *     provide a list of URL strings for the layer if your cache is
-     *     available from multiple origins.  This must be set before the layer
-     *     is drawn.
-     */
-    url: null,
-    
-   /**
-    * APIProperty: tileOrigin
-    * {<OpenLayers.LonLat>} The location of the tile origin for the cache.
-    *     An ArcGIS cache has it's origin at the upper-left (lowest x value
-    *     and highest y value of the coordinate system).  The units for the
-    *     tile origin should be the same as the units for the cached data.
-    */
-    tileOrigin: null, 
-   
-   /**
-    * APIProperty: tileSize
-    * {<OpenLayers.Size>} This size of each tile. Defaults to 256 by 256 pixels.
-    */
-    tileSize: new OpenLayers.Size(256, 256),
-    
-   /**
-    * APIProperty: useAGS
-    * {Boolean} Indicates if we are going to be accessing the ArcGIS Server (AGS)
-    *     cache via an AGS MapServer or directly through HTTP. When accessing via
-    *     AGS the path structure uses a standard z/y/x structure. But AGS actually
-    *     stores the tile images on disk using a hex based folder structure that looks
-    *     like "http://example.com/mylayer/L00/R00000000/C00000000.png".  Learn more
-    *     about this here:
-    *     http://blogs.esri.com/Support/blogs/mappingcenter/archive/2010/08/20/Checking-Your-Local-Cache-Folders.aspx
-    *     Defaults to true;
-    */    
-    useArcGISServer: true,
-
-   /**
-    * APIProperty: type
-    * {String} Image type for the layer.  This becomes the filename extension
-    *     in tile requests.  Default is "png" (generating a url like
-    *     "http://example.com/mylayer/L00/R00000000/C00000000.png").
-    */
-    type: 'png',
-    
-    /**
-    * APIProperty: useScales
-    * {Boolean} Optional override to indicate that the layer should use 'scale' information
-    *     returned from the server capabilities object instead of 'resolution' information.
-    *     This can be important if your tile server uses an unusual DPI for the tiles.
-    */
-    useScales: false,
-    
-   /**
-    * APIProperty: overrideDPI
-    * {Boolean} Optional override to change the OpenLayers.DOTS_PER_INCH setting based 
-    *     on the tile information in the server capabilities object.  This can be useful 
-    *     if your server has a non-standard DPI setting on its tiles, and you're only using 
-    *     tiles with that DPI.  This value is used while OpenLayers is calculating resolution
-    *     using scales, and is not necessary if you have resolution information. (This is
-    *     typically the case)  Regardless, this setting can be useful, but is dangerous
-    *     because it will impact other layers while calculating resolution.  Only use this
-    *     if you know what you are doing.  (See OpenLayers.Util.getResolutionFromScale)
-    */
-    overrideDPI: false,
-    
-   /**
-    * Constructor: OpenLayers.Layer.ArcGISCache 
-    * Creates a new instance of this class 
-    * 
-    * Parameters: 
-    * name - {String} 
-    * url - {String} 
-    * options - {Object} extra layer options
-    */ 
-    initialize: function(name, url, options) { 
-        OpenLayers.Layer.XYZ.prototype.initialize.apply(this, arguments);
-
-        if (this.resolutions) {        
-            this.serverResolutions = this.resolutions;
-            this.maxExtent = this.getMaxExtentForResolution(this.resolutions[0]);
-        }
-
-        // this block steps through translating the values from the server layer JSON 
-        // capabilities object into values that we can use.  This is also a helpful
-        // reference when configuring this layer directly.
-        if (this.layerInfo) {
-            // alias the object
-            var info = this.layerInfo;
-            
-            // build our extents
-            var startingTileExtent = new OpenLayers.Bounds(
-                info.fullExtent.xmin, 
-                info.fullExtent.ymin, 
-                info.fullExtent.xmax, 
-                info.fullExtent.ymax  
-            );
-
-            // set our projection based on the given spatial reference.
-            // esri uses slightly different IDs, so this may not be comprehensive
-            this.projection = 'EPSG:' + info.spatialReference.wkid;
-            this.sphericalMercator = (info.spatialReference.wkid == 102100);
-            
-            // convert esri units into openlayers units (basic feet or meters only)
-            this.units = (info.units == "esriFeet") ? 'ft' : 'm';
-
-            // optional extended section based on whether or not the server returned
-            // specific tile information
-            if (!!info.tileInfo) {            
-                // either set the tiles based on rows/columns, or specific width/height
-                this.tileSize = new OpenLayers.Size(
-                    info.tileInfo.width || info.tileInfo.cols, 
-                    info.tileInfo.height || info.tileInfo.rows
-                );
-                
-                // this must be set when manually configuring this layer
-                this.tileOrigin = new OpenLayers.LonLat(
-                    info.tileInfo.origin.x, 
-                    info.tileInfo.origin.y
-                );
-
-                var upperLeft = new OpenLayers.Geometry.Point(
-                    startingTileExtent.left, 
-                    startingTileExtent.top
-                );
-                
-                var bottomRight = new OpenLayers.Geometry.Point(
-                    startingTileExtent.right, 
-                    startingTileExtent.bottom
-                );            
-                
-                if (this.useScales) {
-                    this.scales = [];
-                } else {
-                    this.resolutions = [];
-                }
-                
-                this.lods = [];
-                for(var key in info.tileInfo.lods) {
-                    if (info.tileInfo.lods.hasOwnProperty(key)) {
-                        var lod = info.tileInfo.lods[key];
-                        if (this.useScales) {
-                            this.scales.push(lod.scale);
-                        } else {
-                            this.resolutions.push(lod.resolution);
-                        }
-                    
-                        var start = this.getContainingTileCoords(upperLeft, lod.resolution);
-                        lod.startTileCol = start.x;
-                        lod.startTileRow = start.y;
-                    
-                        var end = this.getContainingTileCoords(bottomRight, lod.resolution);
-                        lod.endTileCol = end.x;
-                        lod.endTileRow = end.y;    
-                        this.lods.push(lod);
-                    }
-                }
-
-                this.maxExtent = this.calculateMaxExtentWithLOD(this.lods[0]);
-                this.serverResolutions = this.resolutions;
-                if (this.overrideDPI && info.tileInfo.dpi) {
-                    // see comment above for 'overrideDPI'
-                    OpenLayers.DOTS_PER_INCH = info.tileInfo.dpi;
-                }
-            } 
-       }
-    }, 
-
-   /** 
-    * Method: getContainingTileCoords
-    * Calculates the x/y pixel corresponding to the position of the tile
-    *     that contains the given point and for the for the given resolution.
-    * 
-    * Parameters:
-    * point - {<OpenLayers.Geometry.Point>} 
-    * res - {Float} The resolution for which to compute the extent.
-    * 
-    * Returns: 
-    * {<OpenLayers.Pixel>} The x/y pixel corresponding to the position 
-    * of the upper left tile for the given resolution.
-    */
-    getContainingTileCoords: function(point, res) {
-        return new OpenLayers.Pixel(
-           Math.max(Math.floor((point.x - this.tileOrigin.lon) / (this.tileSize.w * res)),0),
-           Math.max(Math.floor((this.tileOrigin.lat - point.y) / (this.tileSize.h * res)),0)
-        );
-    },
-    
-   /** 
-    * Method: calculateMaxExtentWithLOD
-    * Given a Level of Detail object from the server, this function
-    *     calculates the actual max extent
-    * 
-    * Parameters: 
-    * lod - {Object} a Level of Detail Object from the server capabilities object 
-            representing a particular zoom level
-    * 
-    * Returns: 
-    * {<OpenLayers.Bounds>} The actual extent of the tiles for the given zoom level
-    */
-   calculateMaxExtentWithLOD: function(lod) {
-        // the max extent we're provided with just overlaps some tiles
-        // our real extent is the bounds of all the tiles we touch
-
-        var numTileCols = (lod.endTileCol - lod.startTileCol) + 1;
-        var numTileRows = (lod.endTileRow - lod.startTileRow) + 1;        
-
-        var minX = this.tileOrigin.lon + (lod.startTileCol * this.tileSize.w * lod.resolution);
-        var maxX = minX + (numTileCols * this.tileSize.w * lod.resolution);
-
-        var maxY = this.tileOrigin.lat - (lod.startTileRow * this.tileSize.h * lod.resolution);
-        var minY = maxY - (numTileRows * this.tileSize.h * lod.resolution);
-        return new OpenLayers.Bounds(minX, minY, maxX, maxY);
-   },
-    
-   /** 
-    * Method: calculateMaxExtentWithExtent
-    * Given a 'suggested' max extent from the server, this function uses
-    *     information about the actual tile sizes to determine the actual
-    *     extent of the layer.
-    * 
-    * Parameters: 
-    * extent - {<OpenLayers.Bounds>} The 'suggested' extent for the layer
-    * res - {Float} The resolution for which to compute the extent.
-    * 
-    * Returns: 
-    * {<OpenLayers.Bounds>} The actual extent of the tiles for the given zoom level
-    */
-   calculateMaxExtentWithExtent: function(extent, res) {
-        var upperLeft = new OpenLayers.Geometry.Point(extent.left, extent.top);
-        var bottomRight = new OpenLayers.Geometry.Point(extent.right, extent.bottom);
-        var start = this.getContainingTileCoords(upperLeft, res);
-        var end = this.getContainingTileCoords(bottomRight, res);
-        var lod = {
-            resolution: res,
-            startTileCol: start.x,
-            startTileRow: start.y,
-            endTileCol: end.x,
-            endTileRow: end.y
-        };
-        return this.calculateMaxExtentWithLOD(lod);
-   },
-    
-    /** 
-    * Method: getUpperLeftTileCoord
-    * Calculates the x/y pixel corresponding to the position 
-    *     of the upper left tile for the given resolution.
-    * 
-    * Parameters: 
-    * res - {Float} The resolution for which to compute the extent.
-    * 
-    * Returns: 
-    * {<OpenLayers.Pixel>} The x/y pixel corresponding to the position 
-    * of the upper left tile for the given resolution.
-    */
-    getUpperLeftTileCoord: function(res) {
-        var upperLeft = new OpenLayers.Geometry.Point(
-            this.maxExtent.left,
-            this.maxExtent.top);
-        return this.getContainingTileCoords(upperLeft, res);
-    },
-
-    /** 
-    * Method: getLowerRightTileCoord
-    * Calculates the x/y pixel corresponding to the position 
-    *     of the lower right tile for the given resolution.
-    *  
-    * Parameters: 
-    * res - {Float} The resolution for which to compute the extent.
-    * 
-    * Returns: 
-    * {<OpenLayers.Pixel>} The x/y pixel corresponding to the position
-    * of the lower right tile for the given resolution.
-    */
-    getLowerRightTileCoord: function(res) {
-        var bottomRight = new OpenLayers.Geometry.Point(
-            this.maxExtent.right,
-            this.maxExtent.bottom);
-        return this.getContainingTileCoords(bottomRight, res);
-    },
-    
-   /** 
-    * Method: getMaxExtentForResolution
-    * Since the max extent of a set of tiles can change from zoom level
-    *     to zoom level, we need to be able to calculate that max extent 
-    *     for a given resolution.
-    *
-    * Parameters: 
-    * res - {Float} The resolution for which to compute the extent.
-    * 
-    * Returns: 
-    * {<OpenLayers.Bounds>} The extent for this resolution
-    */ 
-    getMaxExtentForResolution: function(res) {
-        var start = this.getUpperLeftTileCoord(res);
-        var end = this.getLowerRightTileCoord(res);
-
-        var numTileCols = (end.x - start.x) + 1;
-        var numTileRows = (end.y - start.y) + 1;
-
-        var minX = this.tileOrigin.lon + (start.x * this.tileSize.w * res);
-        var maxX = minX + (numTileCols * this.tileSize.w * res);
-        
-        var maxY = this.tileOrigin.lat - (start.y * this.tileSize.h * res);
-        var minY = maxY - (numTileRows * this.tileSize.h * res);
-        return new OpenLayers.Bounds(minX, minY, maxX, maxY);
-    },
-    
-   /** 
-    * APIMethod: clone 
-    * Returns an exact clone of this OpenLayers.Layer.ArcGISCache
-    * 
-    * Parameters: 
-    * [obj] - {Object} optional object to assign the cloned instance to.
-    *  
-    * Returns: 
-    * {<OpenLayers.Layer.ArcGISCache>} clone of this instance 
-    */ 
-    clone: function (obj) { 
-        if (obj == null) { 
-            obj = new OpenLayers.Layer.ArcGISCache(this.name, this.url, this.options);
-        }
-        return OpenLayers.Layer.XYZ.prototype.clone.apply(this, [obj]);
-    },
-
-    /**
-     * Method: initGriddedTiles
-     * 
-     * Parameters:
-     * bounds - {<OpenLayers.Bounds>}
-     */
-    initGriddedTiles: function(bounds) {
-        delete this._tileOrigin;
-        OpenLayers.Layer.XYZ.prototype.initGriddedTiles.apply(this, arguments);
-    },
-    
-    /**
-     * Method: getMaxExtent
-     * Get this layer's maximum extent.
-     *
-     * Returns:
-     * {<OpenLayers.Bounds>}
-     */
-    getMaxExtent: function() {
-        var resolution = this.map.getResolution();
-        return this.maxExtent = this.getMaxExtentForResolution(resolution);
-    },
-
-    /**
-     * Method: getTileOrigin
-     * Determine the origin for aligning the grid of tiles.  
-     *     The origin will be derived from the layer's <maxExtent> property. 
-     *
-     * Returns:
-     * {<OpenLayers.LonLat>} The tile origin.
-     */
-    getTileOrigin: function() {
-        if (!this._tileOrigin) {
-            var extent = this.getMaxExtent();
-            this._tileOrigin = new OpenLayers.LonLat(extent.left, extent.bottom);
-        }
-        return this._tileOrigin;
-    },
-
-   /**
-    * Method: getURL
-    * Determine the URL for a tile given the tile bounds.  This is should support
-    *     urls that access tiles through an ArcGIS Server MapServer or directly through
-    *     the hex folder structure using HTTP.  Just be sure to set the useArcGISServer
-    *     property appropriately!  This is basically the same as 
-    *     'OpenLayers.Layer.TMS.getURL',  but with the addition of hex addressing,
-    *     and tile rounding.
-    *
-    * Parameters:
-    * bounds - {<OpenLayers.Bounds>}
-    *
-    * Returns:
-    * {String} The URL for a tile based on given bounds.
-    */
-    getURL: function (bounds) {
-        var res = this.getResolution(); 
-
-        // tile center
-        var originTileX = (this.tileOrigin.lon + (res * this.tileSize.w/2)); 
-        var originTileY = (this.tileOrigin.lat - (res * this.tileSize.h/2));
-
-        var center = bounds.getCenterLonLat();
-        var point = { x: center.lon, y: center.lat };
-        var x = (Math.round(Math.abs((center.lon - originTileX) / (res * this.tileSize.w)))); 
-        var y = (Math.round(Math.abs((originTileY - center.lat) / (res * this.tileSize.h)))); 
-        var z = this.map.getZoom();
-
-        // this prevents us from getting pink tiles (non-existant tiles)
-        if (this.lods) {        
-            var lod = this.lods[this.map.getZoom()];
-            if ((x < lod.startTileCol || x > lod.endTileCol) 
-                || (y < lod.startTileRow || y > lod.endTileRow)) {
-                    return null;
-            }
-        }
-        else {
-            var start = this.getUpperLeftTileCoord(res);
-            var end = this.getLowerRightTileCoord(res);
-            if ((x < start.x || x >= end.x)
-                || (y < start.y || y >= end.y)) {
-                    return null;
-            }        
-        }
-
-        // Construct the url string
-        var url = this.url;
-        var s = '' + x + y + z;
-
-        if (OpenLayers.Util.isArray(url)) {
-            url = this.selectUrl(s, url);
-        }
-
-        // Accessing tiles through ArcGIS Server uses a different path
-        // structure than direct access via the folder structure.
-        if (this.useArcGISServer) {
-            // AGS MapServers have pretty url access to tiles
-            url = url + '/tile/${z}/${y}/${x}';
-        } else {
-            // The tile images are stored using hex values on disk.
-            x = 'C' + OpenLayers.Number.zeroPad(x, 8, 16);
-            y = 'R' + OpenLayers.Number.zeroPad(y, 8, 16);
-            z = 'L' + OpenLayers.Number.zeroPad(z, 2, 10);
-            url = url + '/${z}/${y}/${x}.' + this.type;
-        }
-
-        // Write the values into our formatted url
-        url = OpenLayers.String.format(url, {'x': x, 'y': y, 'z': z});
-
-        return OpenLayers.Util.urlAppend(
-            url, OpenLayers.Util.getParameterString(this.params)
-        );
-    },
-
-    CLASS_NAME: 'OpenLayers.Layer.ArcGISCache' 
-}); 
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/ArcIMS.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/ArcIMS.js
deleted file mode 100644
index e19584c9..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/ArcIMS.js
+++ /dev/null
@@ -1,425 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Layer/Grid.js
- * @requires OpenLayers/Format/ArcXML.js
- * @requires OpenLayers/Request.js
- */
-
-/**
- * Class: OpenLayers.Layer.ArcIMS
- * Instances of OpenLayers.Layer.ArcIMS are used to display data from ESRI ArcIMS
- *     Mapping Services. Create a new ArcIMS layer with the <OpenLayers.Layer.ArcIMS>
- *     constructor.
- * 
- * Inherits from:
- *  - <OpenLayers.Layer.Grid>
- */
-OpenLayers.Layer.ArcIMS = OpenLayers.Class(OpenLayers.Layer.Grid, {
-
-    /**
-     * Constant: DEFAULT_PARAMS
-     * {Object} Default query string parameters.
-     */
-    DEFAULT_PARAMS: { 
-        ClientVersion: "9.2",
-        ServiceName: ''
-    },
-    
-    /**
-     * APIProperty: featureCoordSys
-     * {String} Code for feature coordinate system.  Default is "4326".
-     */
-    featureCoordSys: "4326",
-    
-    /**
-     * APIProperty: filterCoordSys
-     * {String} Code for filter coordinate system.  Default is "4326".
-     */
-    filterCoordSys: "4326",
-    
-    /**
-     * APIProperty: layers
-     * {Array} An array of objects with layer properties.
-     */
-    layers: null,
-    
-    /**
-     * APIProperty: async
-     * {Boolean} Request images asynchronously.  Default is true.
-     */
-    async: true,
-    
-    /**
-     * APIProperty: name
-     * {String} Layer name.  Default is "ArcIMS".
-     */
-    name: "ArcIMS",
-
-    /**
-     * APIProperty: isBaseLayer
-     * {Boolean} The layer is a base layer.  Default is true.
-     */
-    isBaseLayer: true,
-
-    /**
-     * Constant: DEFAULT_OPTIONS
-     * {Object} Default layers properties.
-     */
-    DEFAULT_OPTIONS: {
-        tileSize: new OpenLayers.Size(512, 512),
-        featureCoordSys: "4326",
-        filterCoordSys: "4326",
-        layers: null,
-        isBaseLayer: true,
-        async: true,
-        name: "ArcIMS"
-    }, 
- 
-    /**
-     * Constructor: OpenLayers.Layer.ArcIMS
-     * Create a new ArcIMS layer object.
-     *
-     * Example:
-     * (code)
-     * var arcims = new OpenLayers.Layer.ArcIMS(
-     *     "Global Sample",
-     *     "http://sample.avencia.com/servlet/com.esri.esrimap.Esrimap", 
-     *     {
-     *         service: "OpenLayers_Sample", 
-     *         layers: [
-     *             // layers to manipulate
-     *             {id: "1", visible: true}
-     *         ]
-     *     }
-     * );
-     * (end)
-     *
-     * Parameters:
-     * name - {String} A name for the layer
-     * url - {String} Base url for the ArcIMS server
-     * options - {Object} Optional object with properties to be set on the
-     *     layer.
-     */
-    initialize: function(name, url, options) {
-        
-        this.tileSize = new OpenLayers.Size(512, 512);
-
-        // parameters
-        this.params = OpenLayers.Util.applyDefaults(
-            {ServiceName: options.serviceName},
-            this.DEFAULT_PARAMS
-        );
-        this.options = OpenLayers.Util.applyDefaults(
-            options, this.DEFAULT_OPTIONS
-        );
-          
-        OpenLayers.Layer.Grid.prototype.initialize.apply(
-            this, [name, url, this.params, options]
-        );
-
-        //layer is transparent        
-        if (this.transparent) {
-            
-            // unless explicitly set in options, make layer an overlay
-            if (!this.isBaseLayer) {
-                this.isBaseLayer = false;
-            } 
-            
-            // jpegs can never be transparent, so intelligently switch the 
-            //  format, depending on the browser's capabilities
-            if (this.format == "image/jpeg") {
-                this.format = OpenLayers.Util.alphaHack() ? "image/gif" : "image/png";
-            }
-        }
-
-        // create an empty layer list if no layers specified in the options
-        if (this.options.layers === null) {
-            this.options.layers = [];
-        }
-    },    
-
-    /**
-     * Method: getURL
-     * Return an image url this layer.
-     *
-     * Parameters:
-     * bounds - {<OpenLayers.Bounds>} A bounds representing the bbox for the
-     *     request.
-     *
-     * Returns:
-     * {String} A string with the map image's url.
-     */
-    getURL: function(bounds) {
-        var url = "";
-        bounds = this.adjustBounds(bounds);
-        
-        // create an arcxml request to generate the image
-        var axlReq = new OpenLayers.Format.ArcXML( 
-            OpenLayers.Util.extend(this.options, {
-                requesttype: "image",
-                envelope: bounds.toArray(),
-                tileSize: this.tileSize
-            })
-        );
-        
-        // create a synchronous ajax request to get an arcims image
-        var req = new OpenLayers.Request.POST({
-            url: this.getFullRequestString(),
-            data: axlReq.write(),
-            async: false
-        });
-        
-        // if the response exists
-        if (req != null) {
-            var doc = req.responseXML;
-
-            if (!doc || !doc.documentElement) {            
-                doc = req.responseText;
-            }
-
-            // create a new arcxml format to read the response
-            var axlResp = new OpenLayers.Format.ArcXML();
-            var arcxml = axlResp.read(doc);
-            url = this.getUrlOrImage(arcxml.image.output);
-        }
-        
-        return url;
-    },
-    
-    
-    /**
-     * Method: getURLasync
-     * Get an image url this layer asynchronously, and execute a callback
-     *     when the image url is generated.
-     *
-     * Parameters:
-     * bounds - {<OpenLayers.Bounds>} A bounds representing the bbox for the
-     *     request.
-     * callback - {Function} Function to call when image url is retrieved.
-     * scope - {Object} The scope of the callback method.
-     */
-    getURLasync: function(bounds, callback, scope) {
-        bounds = this.adjustBounds(bounds);
-        
-        // create an arcxml request to generate the image
-        var axlReq = new OpenLayers.Format.ArcXML(  
-            OpenLayers.Util.extend(this.options, { 
-                requesttype: "image",
-                envelope: bounds.toArray(),
-                tileSize: this.tileSize
-            })
-        );
-        
-        // create an asynchronous ajax request to get an arcims image
-        OpenLayers.Request.POST({
-            url: this.getFullRequestString(),
-            async: true,
-            data: axlReq.write(),
-            callback: function(req) {
-                // process the response from ArcIMS, and call the callback function
-                // to set the image URL
-                var doc = req.responseXML;
-                if (!doc || !doc.documentElement) {            
-                    doc = req.responseText;
-                }
-
-                // create a new arcxml format to read the response
-                var axlResp = new OpenLayers.Format.ArcXML();
-                var arcxml = axlResp.read(doc);
-                
-                callback.call(scope, this.getUrlOrImage(arcxml.image.output));
-            },
-            scope: this
-        });
-    },
-    
-    /**
-     * Method: getUrlOrImage
-     * Extract a url or image from the ArcXML image output.
-     *
-     * Parameters:
-     * output - {Object} The image.output property of the object returned from
-     *     the ArcXML format read method.
-     *
-     * Returns:
-     * {String} A URL for an image (potentially with the data protocol).
-     */
-    getUrlOrImage: function(output) {
-        var ret = "";
-        if(output.url) {
-            // If the image response output url is a string, then the image
-            // data is not inline.
-            ret = output.url;
-        } else if(output.data) {
-            // The image data is inline and base64 encoded, create a data
-            // url for the image.  This will only work for small images,
-            // due to browser url length limits.
-            ret = "data:image/" + output.type + 
-                  ";base64," + output.data;
-        }
-        return ret;
-    },
-    
-    /**
-     * Method: setLayerQuery
-     * Set the query definition on this layer. Query definitions are used to
-     *     render parts of the spatial data in an image, and can be used to
-     *     filter features or layers in the ArcIMS service.
-     *
-     * Parameters:
-     * id - {String} The ArcIMS layer ID.
-     * querydef - {Object} The query definition to apply to this layer.
-     */
-    setLayerQuery: function(id, querydef) {
-        // find the matching layer, if it exists
-        for (var lyr = 0; lyr < this.options.layers.length; lyr++) {
-            if (id == this.options.layers[lyr].id) {
-                // replace this layer definition
-                this.options.layers[lyr].query = querydef;
-                return;
-            }
-        }
-      
-        // no layer found, create a new definition
-        this.options.layers.push({id: id, visible: true, query: querydef});
-    },
-    
-    /**
-     * Method: getFeatureInfo
-     * Get feature information from ArcIMS.  Using the applied geometry, apply
-     *     the options to the query (buffer, area/envelope intersection), and
-     *     query the ArcIMS service.
-     *
-     * A note about accuracy:
-     * ArcIMS interprets the accuracy attribute in feature requests to be
-     *     something like the 'modulus' operator on feature coordinates,
-     *     applied to the database geometry of the feature.  It doesn't round,
-     *     so your feature coordinates may be up to (1 x accuracy) offset from
-     *     the actual feature coordinates.  If the accuracy of the layer is not
-     *     specified, the accuracy will be computed to be approximately 1
-     *     feature coordinate per screen  pixel.
-     *
-     * Parameters:
-     * geometry - {<OpenLayers.LonLat>} or {<OpenLayers.Geometry.Polygon>} The
-     *     geometry to use when making the query. This should be a closed
-     *     polygon for behavior approximating a free selection.
-     * layer - {Object} The ArcIMS layer definition. This is an anonymous object
-     *     that looks like:
-     * (code)
-     * {
-     *     id: "ArcXML layer ID",  // the ArcXML layer ID
-     *     query: {
-     *         where: "STATE = 'PA'",  // the where clause of the query
-     *         accuracy: 100           // the accuracy of the returned feature
-     *     }
-     * }
-     * (end)
-     * options - {Object} Object with non-default properties to set on the layer.
-     *     Supported properties are buffer, callback, scope, and any other
-     *     properties applicable to the ArcXML format.  Set the 'callback' and
-     *     'scope' for an object and function to recieve the parsed features
-     *     from ArcIMS.
-     */
-    getFeatureInfo: function(geometry, layer, options) {
-        // set the buffer to 1 unit (dd/m/ft?) by default
-        var buffer = options.buffer || 1;
-        // empty callback by default
-        var callback = options.callback || function() {};
-        // default scope is window (global)
-        var scope = options.scope || window;
-
-        // apply these option to the request options
-        var requestOptions = {};
-        OpenLayers.Util.extend(requestOptions, this.options);
-
-        // this is a feature request
-        requestOptions.requesttype = "feature";
-
-        if (geometry instanceof OpenLayers.LonLat) {
-            // create an envelope if the geometry is really a lon/lat
-            requestOptions.polygon = null;
-            requestOptions.envelope = [ 
-                geometry.lon - buffer, 
-                geometry.lat - buffer,
-                geometry.lon + buffer,
-                geometry.lat + buffer
-            ];
-        } else if (geometry instanceof OpenLayers.Geometry.Polygon) {
-            // use the polygon assigned, and empty the envelope
-            requestOptions.envelope = null;
-            requestOptions.polygon = geometry;
-        }
-      
-        // create an arcxml request to get feature requests
-        var arcxml = new OpenLayers.Format.ArcXML(requestOptions);
-
-        // apply any get feature options to the arcxml request
-        OpenLayers.Util.extend(arcxml.request.get_feature, options);
-
-        arcxml.request.get_feature.layer = layer.id;
-        if (typeof layer.query.accuracy == "number") {
-            // set the accuracy if it was specified
-            arcxml.request.get_feature.query.accuracy = layer.query.accuracy;
-        } else {
-            // guess that the accuracy is 1 per screen pixel
-            var mapCenter = this.map.getCenter();
-            var viewPx = this.map.getViewPortPxFromLonLat(mapCenter);
-            viewPx.x++;
-            var mapOffCenter = this.map.getLonLatFromPixel(viewPx);
-            arcxml.request.get_feature.query.accuracy = mapOffCenter.lon - mapCenter.lon;
-        }
-        
-        // set the get_feature query to be the same as the layer passed in
-        arcxml.request.get_feature.query.where = layer.query.where;
-        
-        // use area_intersection
-        arcxml.request.get_feature.query.spatialfilter.relation = "area_intersection";
-      
-        // create a new asynchronous request to get the feature info
-        OpenLayers.Request.POST({
-            url: this.getFullRequestString({'CustomService': 'Query'}),
-            data: arcxml.write(),
-            callback: function(request) {
-                // parse the arcxml response
-                var response = arcxml.parseResponse(request.responseText);
-                
-                if (!arcxml.iserror()) {
-                    // if the arcxml is not an error, call the callback with the features parsed
-                    callback.call(scope, response.features);
-                } else {
-                    // if the arcxml is an error, return null features selected
-                    callback.call(scope, null);
-                }
-            }
-        });
-    },
-
-    /**
-     * Method: clone
-     * Create a clone of this layer
-     *
-     * Returns:
-     * {<OpenLayers.Layer.ArcIMS>} An exact clone of this layer
-     */
-    clone: function (obj) {
-
-        if (obj == null) {
-            obj = new OpenLayers.Layer.ArcIMS(this.name,
-                                           this.url,
-                                           this.getOptions());
-        }
-
-        //get all additions from superclasses
-        obj = OpenLayers.Layer.Grid.prototype.clone.apply(this, [obj]);
-
-        // copy/set any non-init, non-simple values here
-
-        return obj;
-    },
-    
-    CLASS_NAME: "OpenLayers.Layer.ArcIMS"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/Bing.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/Bing.js
deleted file mode 100644
index 06152853..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/Bing.js
+++ /dev/null
@@ -1,333 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Layer/XYZ.js
- */
-
-/** 
- * Class: OpenLayers.Layer.Bing
- * Bing layer using direct tile access as provided by Bing Maps REST Services.
- * See http://msdn.microsoft.com/en-us/library/ff701713.aspx for more
- * information. Note: Terms of Service compliant use requires the map to be
- * configured with an <OpenLayers.Control.Attribution> control and the
- * attribution placed on or near the map.
- * 
- * Inherits from:
- *  - <OpenLayers.Layer.XYZ>
- */
-OpenLayers.Layer.Bing = OpenLayers.Class(OpenLayers.Layer.XYZ, {
-
-    /**
-     * Property: key
-     * {String} API key for Bing maps, get your own key 
-     *     at http://bingmapsportal.com/ .
-     */
-    key: null,
-
-    /**
-     * Property: serverResolutions
-     * {Array} the resolutions provided by the Bing servers.
-     */
-    serverResolutions: [
-        156543.03390625, 78271.516953125, 39135.7584765625,
-        19567.87923828125, 9783.939619140625, 4891.9698095703125,
-        2445.9849047851562, 1222.9924523925781, 611.4962261962891,
-        305.74811309814453, 152.87405654907226, 76.43702827453613,
-        38.218514137268066, 19.109257068634033, 9.554628534317017,
-        4.777314267158508, 2.388657133579254, 1.194328566789627,
-        0.5971642833948135, 0.29858214169740677, 0.14929107084870338,
-        0.07464553542435169
-    ],
-    
-    /**
-     * Property: attributionTemplate
-     * {String}
-     */
-    attributionTemplate: '<span class="olBingAttribution ${type}">' +
-         '<div><a target="_blank" href="http://www.bing.com/maps/">' +
-         '<img src="${logo}" /></a></div>${copyrights}' +
-         '<a style="white-space: nowrap" target="_blank" '+
-         'href="http://www.microsoft.com/maps/product/terms.html">' +
-         'Terms of Use</a></span>',
-
-    /**
-     * Property: metadata
-     * {Object} Metadata for this layer, as returned by the callback script
-     */
-    metadata: null,
-
-    /**
-     * Property: protocolRegex
-     * {RegExp} Regular expression to match and replace http: in bing urls
-     */
-    protocolRegex: /^http:/i,
-    
-    /**
-     * APIProperty: type
-     * {String} The layer identifier.  Any non-birdseye imageryType
-     *     from http://msdn.microsoft.com/en-us/library/ff701716.aspx can be
-     *     used.  Default is "Road".
-     */
-    type: "Road",
-    
-    /**
-     * APIProperty: culture
-     * {String} The culture identifier.  See http://msdn.microsoft.com/en-us/library/ff701709.aspx
-     * for the definition and the possible values.  Default is "en-US".
-     */
-    culture: "en-US",
-    
-    /**
-     * APIProperty: metadataParams
-     * {Object} Optional url parameters for the Get Imagery Metadata request
-     * as described here: http://msdn.microsoft.com/en-us/library/ff701716.aspx
-     */
-    metadataParams: null,
-
-    /** APIProperty: tileOptions
-     *  {Object} optional configuration options for <OpenLayers.Tile> instances
-     *  created by this Layer. Default is
-     *
-     *  (code)
-     *  {crossOriginKeyword: 'anonymous'}
-     *  (end)
-     */
-    tileOptions: null,
-
-    /** APIProperty: protocol
-     *  {String} Protocol to use to fetch Imagery Metadata, tiles and bing logo
-     *  Can be 'http:' 'https:' or ''
-     *
-     *  Warning: tiles may not be available under both HTTP and HTTPS protocols.
-     *  Microsoft approved use of both HTTP and HTTPS urls for tiles. However
-     *  this is undocumented and the Imagery Metadata API always returns HTTP
-     *  urls.
-     *
-     *  Default is '', unless when executed from a file:/// uri, in which case
-     *  it is 'http:'.
-     */
-    protocol: ~window.location.href.indexOf('http') ? '' : 'http:',
-
-    /**
-     * Constructor: OpenLayers.Layer.Bing
-     * Create a new Bing layer.
-     *
-     * Example:
-     * (code)
-     * var road = new OpenLayers.Layer.Bing({
-     *     name: "My Bing Aerial Layer",
-     *     type: "Aerial",
-     *     key: "my-api-key-here",
-     * });
-     * (end)
-     *
-     * Parameters:
-     * options - {Object} Configuration properties for the layer.
-     *
-     * Required configuration properties:
-     * key - {String} Bing Maps API key for your application. Get one at
-     *     http://bingmapsportal.com/.
-     * type - {String} The layer identifier.  Any non-birdseye imageryType
-     *     from http://msdn.microsoft.com/en-us/library/ff701716.aspx can be
-     *     used.
-     *
-     * Any other documented layer properties can be provided in the config object.
-     */
-    initialize: function(options) {
-        options = OpenLayers.Util.applyDefaults({
-            sphericalMercator: true
-        }, options);
-        var name = options.name || "Bing " + (options.type || this.type);
-        
-        var newArgs = [name, null, options];
-        OpenLayers.Layer.XYZ.prototype.initialize.apply(this, newArgs);
-        this.tileOptions = OpenLayers.Util.extend({
-            crossOriginKeyword: 'anonymous'
-        }, this.options.tileOptions);
-        this.loadMetadata(); 
-    },
-
-    /**
-     * Method: loadMetadata
-     */
-    loadMetadata: function() {
-        this._callbackId = "_callback_" + this.id.replace(/\./g, "_");
-        // link the processMetadata method to the global scope and bind it
-        // to this instance
-        window[this._callbackId] = OpenLayers.Function.bind(
-            OpenLayers.Layer.Bing.processMetadata, this
-        );
-        var params = OpenLayers.Util.applyDefaults({
-            key: this.key,
-            jsonp: this._callbackId,
-            include: "ImageryProviders"
-        }, this.metadataParams);
-        var url = this.protocol + "//dev.virtualearth.net/REST/v1/Imagery/Metadata/" +
-            this.type + "?" + OpenLayers.Util.getParameterString(params);
-        var script = document.createElement("script");
-        script.type = "text/javascript";
-        script.src = url;
-        script.id = this._callbackId;
-        document.getElementsByTagName("head")[0].appendChild(script);
-    },
-    
-    /**
-     * Method: initLayer
-     *
-     * Sets layer properties according to the metadata provided by the API
-     */
-    initLayer: function() {
-        var res = this.metadata.resourceSets[0].resources[0];
-        var url = res.imageUrl.replace("{quadkey}", "${quadkey}");
-        url = url.replace("{culture}", this.culture);
-        url = url.replace(this.protocolRegex, this.protocol);
-        this.url = [];
-        for (var i=0; i<res.imageUrlSubdomains.length; ++i) {
-            this.url.push(url.replace("{subdomain}", res.imageUrlSubdomains[i]));
-        }
-        this.addOptions({
-            maxResolution: Math.min(
-                this.serverResolutions[res.zoomMin],
-                this.maxResolution || Number.POSITIVE_INFINITY
-            ),
-            numZoomLevels: Math.min(
-                res.zoomMax + 1 - res.zoomMin, this.numZoomLevels
-            )
-        }, true);
-        if (!this.isBaseLayer) {
-            this.redraw();
-        }
-        this.updateAttribution();
-    },
-    
-    /**
-     * Method: getURL
-     *
-     * Paramters:
-     * bounds - {<OpenLayers.Bounds>}
-     */
-    getURL: function(bounds) {
-        if (!this.url) {
-            return;
-        }
-        var xyz = this.getXYZ(bounds), x = xyz.x, y = xyz.y, z = xyz.z;
-        var quadDigits = [];
-        for (var i = z; i > 0; --i) {
-            var digit = '0';
-            var mask = 1 << (i - 1);
-            if ((x & mask) != 0) {
-                digit++;
-            }
-            if ((y & mask) != 0) {
-                digit++;
-                digit++;
-            }
-            quadDigits.push(digit);
-        }
-        var quadKey = quadDigits.join("");
-        var url = this.selectUrl('' + x + y + z, this.url);
-
-        return OpenLayers.String.format(url, {'quadkey': quadKey});
-    },
-    
-    /**
-     * Method: updateAttribution
-     * Updates the attribution according to the requirements outlined in
-     * http://gis.638310.n2.nabble.com/Bing-imagery-td5789168.html
-     */
-    updateAttribution: function() {
-        var metadata = this.metadata;
-        if (!metadata.resourceSets || !this.map || !this.map.center) {
-            return;
-        }
-        var res = metadata.resourceSets[0].resources[0];
-        var extent = this.map.getExtent().transform(
-            this.map.getProjectionObject(),
-            new OpenLayers.Projection("EPSG:4326")
-        );
-        var providers = res.imageryProviders || [],
-            zoom = OpenLayers.Util.indexOf(this.serverResolutions,
-                                           this.getServerResolution()),
-            copyrights = "", provider, i, ii, j, jj, bbox, coverage;
-        for (i=0,ii=providers.length; i<ii; ++i) {
-            provider = providers[i];
-            for (j=0,jj=provider.coverageAreas.length; j<jj; ++j) {
-                coverage = provider.coverageAreas[j];
-                // axis order provided is Y,X
-                bbox = OpenLayers.Bounds.fromArray(coverage.bbox, true);
-                if (extent.intersectsBounds(bbox) &&
-                        zoom <= coverage.zoomMax && zoom >= coverage.zoomMin) {
-                    copyrights += provider.attribution + " ";
-                }
-            }
-        }
-        var logo = metadata.brandLogoUri.replace(this.protocolRegex, this.protocol);
-        this.attribution = OpenLayers.String.format(this.attributionTemplate, {
-            type: this.type.toLowerCase(),
-            logo: logo,
-            copyrights: copyrights
-        });
-        this.map && this.map.events.triggerEvent("changelayer", {
-            layer: this,
-            property: "attribution"
-        });
-    },
-    
-    /**
-     * Method: setMap
-     */
-    setMap: function() {
-        OpenLayers.Layer.XYZ.prototype.setMap.apply(this, arguments);
-        this.map.events.register("moveend", this, this.updateAttribution);
-    },
-    
-    /**
-     * APIMethod: clone
-     * 
-     * Parameters:
-     * obj - {Object}
-     * 
-     * Returns:
-     * {<OpenLayers.Layer.Bing>} An exact clone of this <OpenLayers.Layer.Bing>
-     */
-    clone: function(obj) {
-        if (obj == null) {
-            obj = new OpenLayers.Layer.Bing(this.options);
-        }
-        //get all additions from superclasses
-        obj = OpenLayers.Layer.XYZ.prototype.clone.apply(this, [obj]);
-        // copy/set any non-init, non-simple values here
-        return obj;
-    },
-    
-    /**
-     * Method: destroy
-     */
-    destroy: function() {
-        this.map &&
-            this.map.events.unregister("moveend", this, this.updateAttribution);
-        OpenLayers.Layer.XYZ.prototype.destroy.apply(this, arguments);
-    },
-    
-    CLASS_NAME: "OpenLayers.Layer.Bing"
-});
-
-/**
- * Function: OpenLayers.Layer.Bing.processMetadata
- * This function will be bound to an instance, linked to the global scope with
- * an id, and called by the JSONP script returned by the API.
- *
- * Parameters:
- * metadata - {Object} metadata as returned by the API
- */
-OpenLayers.Layer.Bing.processMetadata = function(metadata) {
-    this.metadata = metadata;
-    this.initLayer();
-    var script = document.getElementById(this._callbackId);
-    script.parentNode.removeChild(script);
-    window[this._callbackId] = undefined; // cannot delete from window in IE
-    delete this._callbackId;
-};
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/Boxes.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/Boxes.js
deleted file mode 100644
index 7cd605a9..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/Boxes.js
+++ /dev/null
@@ -1,76 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-
-/**
- * @requires OpenLayers/Layer.js
- * @requires OpenLayers/Layer/Markers.js
- */
-
-/**
- * Class: OpenLayers.Layer.Boxes
- * Draw divs as 'boxes' on the layer. 
- *
- * Inherits from:
- *  - <OpenLayers.Layer.Markers>
- */
-OpenLayers.Layer.Boxes = OpenLayers.Class(OpenLayers.Layer.Markers, {
-
-    /**
-     * Constructor: OpenLayers.Layer.Boxes
-     *
-     * Parameters:
-     * name - {String} 
-     * options - {Object} Hashtable of extra options to tag onto the layer
-     */
-    
-    /**
-     * Method: drawMarker 
-     * Calculate the pixel location for the marker, create it, and
-     *    add it to the layer's div
-     *
-     * Parameters: 
-     * marker - {<OpenLayers.Marker.Box>} 
-     */
-    drawMarker: function(marker) {
-        var topleft = this.map.getLayerPxFromLonLat({
-            lon: marker.bounds.left,
-            lat: marker.bounds.top
-        });
-        var botright = this.map.getLayerPxFromLonLat({
-            lon: marker.bounds.right,
-            lat: marker.bounds.bottom
-        });
-        if (botright == null || topleft == null) {
-            marker.display(false);
-        } else {
-            var markerDiv = marker.draw(topleft, {
-                w: Math.max(1, botright.x - topleft.x),
-                h: Math.max(1, botright.y - topleft.y)
-            });
-            if (!marker.drawn) {
-                this.div.appendChild(markerDiv);
-                marker.drawn = true;
-            }
-        }
-    },
-
-
-    /**
-     * APIMethod: removeMarker 
-     * 
-     * Parameters:
-     * marker - {<OpenLayers.Marker.Box>} 
-     */
-    removeMarker: function(marker) {
-        OpenLayers.Util.removeItem(this.markers, marker);
-        if ((marker.div != null) &&
-            (marker.div.parentNode == this.div) ) {
-            this.div.removeChild(marker.div);    
-        }
-    },
-
-    CLASS_NAME: "OpenLayers.Layer.Boxes"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/EventPane.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/EventPane.js
deleted file mode 100644
index 15a852fb..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/EventPane.js
+++ /dev/null
@@ -1,441 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-
-/**
- * @requires OpenLayers/Layer.js
- * @requires OpenLayers/Util.js
- */
-
-/**
- * Class: OpenLayers.Layer.EventPane
- * Base class for 3rd party layers, providing a DOM element which isolates
- * the 3rd-party layer from mouse events.
- * Only used by Google layers.
- *
- * Automatically instantiated by the Google constructor, and not usually instantiated directly.
- *
- * Create a new event pane layer with the
- * <OpenLayers.Layer.EventPane> constructor.
- * 
- * Inherits from:
- *  - <OpenLayers.Layer>
- */
-OpenLayers.Layer.EventPane = OpenLayers.Class(OpenLayers.Layer, {
-    
-    /**
-     * APIProperty: smoothDragPan
-     * {Boolean} smoothDragPan determines whether non-public/internal API
-     *     methods are used for better performance while dragging EventPane 
-     *     layers. When not in sphericalMercator mode, the smoother dragging 
-     *     doesn't actually move north/south directly with the number of 
-     *     pixels moved, resulting in a slight offset when you drag your mouse 
-     *     north south with this option on. If this visual disparity bothers 
-     *     you, you should turn this option off, or use spherical mercator. 
-     *     Default is on.
-     */
-    smoothDragPan: true,
-
-    /**
-     * Property: isBaseLayer
-     * {Boolean} EventPaned layers are always base layers, by necessity.
-     */ 
-    isBaseLayer: true,
-
-    /**
-     * APIProperty: isFixed
-     * {Boolean} EventPaned layers are fixed by default.
-     */ 
-    isFixed: true,
-
-    /**
-     * Property: pane
-     * {DOMElement} A reference to the element that controls the events.
-     */
-    pane: null,
-
-
-    /**
-     * Property: mapObject
-     * {Object} This is the object which will be used to load the 3rd party library
-     * in the case of the google layer, this will be of type GMap, 
-     * in the case of the ve layer, this will be of type VEMap
-     */ 
-    mapObject: null,
-
-
-    /**
-     * Constructor: OpenLayers.Layer.EventPane
-     * Create a new event pane layer
-     *
-     * Parameters:
-     * name - {String}
-     * options - {Object} Hashtable of extra options to tag onto the layer
-     */
-    initialize: function(name, options) {
-        OpenLayers.Layer.prototype.initialize.apply(this, arguments);
-        if (this.pane == null) {
-            this.pane = OpenLayers.Util.createDiv(this.div.id + "_EventPane");
-        }
-    },
-    
-    /**
-     * APIMethod: destroy
-     * Deconstruct this layer.
-     */
-    destroy: function() {
-        this.mapObject = null;
-        this.pane = null;
-        OpenLayers.Layer.prototype.destroy.apply(this, arguments); 
-    },
-
-    
-    /**
-     * Method: setMap
-     * Set the map property for the layer. This is done through an accessor
-     * so that subclasses can override this and take special action once 
-     * they have their map variable set. 
-     *
-     * Parameters:
-     * map - {<OpenLayers.Map>}
-     */
-    setMap: function(map) {
-        OpenLayers.Layer.prototype.setMap.apply(this, arguments);
-        
-        this.pane.style.zIndex = parseInt(this.div.style.zIndex) + 1;
-        this.pane.style.display = this.div.style.display;
-        this.pane.style.width="100%";
-        this.pane.style.height="100%";
-        if (OpenLayers.BROWSER_NAME == "msie") {
-            this.pane.style.background = 
-                "url(" + OpenLayers.Util.getImageLocation("blank.gif") + ")";
-        }
-
-        if (this.isFixed) {
-            this.map.viewPortDiv.appendChild(this.pane);
-        } else {
-            this.map.layerContainerDiv.appendChild(this.pane);
-        }
-
-        // once our layer has been added to the map, we can load it
-        this.loadMapObject();
-    
-        // if map didn't load, display warning
-        if (this.mapObject == null) {
-            this.loadWarningMessage();
-        }
-    },
-
-    /**
-     * APIMethod: removeMap
-     * On being removed from the map, we'll like to remove the invisible 'pane'
-     *     div that we added to it on creation. 
-     * 
-     * Parameters:
-     * map - {<OpenLayers.Map>}
-     */
-    removeMap: function(map) {
-        if (this.pane && this.pane.parentNode) {
-            this.pane.parentNode.removeChild(this.pane);
-        }
-        OpenLayers.Layer.prototype.removeMap.apply(this, arguments);
-    },
-  
-    /**
-     * Method: loadWarningMessage
-     * If we can't load the map lib, then display an error message to the 
-     *     user and tell them where to go for help.
-     * 
-     *     This function sets up the layout for the warning message. Each 3rd
-     *     party layer must implement its own getWarningHTML() function to 
-     *     provide the actual warning message.
-     */
-    loadWarningMessage:function() {
-
-        this.div.style.backgroundColor = "darkblue";
-
-        var viewSize = this.map.getSize();
-        
-        var msgW = Math.min(viewSize.w, 300);
-        var msgH = Math.min(viewSize.h, 200);
-        var size = new OpenLayers.Size(msgW, msgH);
-
-        var centerPx = new OpenLayers.Pixel(viewSize.w/2, viewSize.h/2);
-
-        var topLeft = centerPx.add(-size.w/2, -size.h/2);            
-
-        var div = OpenLayers.Util.createDiv(this.name + "_warning", 
-                                            topLeft, 
-                                            size,
-                                            null,
-                                            null,
-                                            null,
-                                            "auto");
-
-        div.style.padding = "7px";
-        div.style.backgroundColor = "yellow";
-
-        div.innerHTML = this.getWarningHTML();
-        this.div.appendChild(div);
-    },
-  
-    /** 
-     * Method: getWarningHTML
-     * To be implemented by subclasses.
-     * 
-     * Returns:
-     * {String} String with information on why layer is broken, how to get
-     *          it working.
-     */
-    getWarningHTML:function() {
-        //should be implemented by subclasses
-        return "";
-    },
-  
-    /**
-     * Method: display
-     * Set the display on the pane
-     *
-     * Parameters:
-     * display - {Boolean}
-     */
-    display: function(display) {
-        OpenLayers.Layer.prototype.display.apply(this, arguments);
-        this.pane.style.display = this.div.style.display;
-    },
-  
-    /**
-     * Method: setZIndex
-     * Set the z-index order for the pane.
-     * 
-     * Parameters:
-     * zIndex - {int}
-     */
-    setZIndex: function (zIndex) {
-        OpenLayers.Layer.prototype.setZIndex.apply(this, arguments);
-        this.pane.style.zIndex = parseInt(this.div.style.zIndex) + 1;
-    },
-    
-    /**
-     * Method: moveByPx
-     * Move the layer based on pixel vector. To be implemented by subclasses.
-     *
-     * Parameters:
-     * dx - {Number} The x coord of the displacement vector.
-     * dy - {Number} The y coord of the displacement vector.
-     */
-    moveByPx: function(dx, dy) {
-        OpenLayers.Layer.prototype.moveByPx.apply(this, arguments);
-        
-        if (this.dragPanMapObject) {
-            this.dragPanMapObject(dx, -dy);
-        } else {
-            this.moveTo(this.map.getCachedCenter());
-        }
-    },
-
-    /**
-     * Method: moveTo
-     * Handle calls to move the layer.
-     * 
-     * Parameters:
-     * bounds - {<OpenLayers.Bounds>}
-     * zoomChanged - {Boolean}
-     * dragging - {Boolean}
-     */
-    moveTo:function(bounds, zoomChanged, dragging) {
-        OpenLayers.Layer.prototype.moveTo.apply(this, arguments);
-
-        if (this.mapObject != null) {
-
-            var newCenter = this.map.getCenter();
-            var newZoom = this.map.getZoom();
-
-            if (newCenter != null) {
-
-                var moOldCenter = this.getMapObjectCenter();
-                var oldCenter = this.getOLLonLatFromMapObjectLonLat(moOldCenter);
-
-                var moOldZoom = this.getMapObjectZoom();
-                var oldZoom= this.getOLZoomFromMapObjectZoom(moOldZoom);
-
-                if (!(newCenter.equals(oldCenter)) || newZoom != oldZoom) {
-
-                    if (!zoomChanged && oldCenter && this.dragPanMapObject && 
-                        this.smoothDragPan) {
-                        var oldPx = this.map.getViewPortPxFromLonLat(oldCenter);
-                        var newPx = this.map.getViewPortPxFromLonLat(newCenter);
-                        this.dragPanMapObject(newPx.x-oldPx.x, oldPx.y-newPx.y);
-                    } else {
-                        var center = this.getMapObjectLonLatFromOLLonLat(newCenter);
-                        var zoom = this.getMapObjectZoomFromOLZoom(newZoom);
-                        this.setMapObjectCenter(center, zoom, dragging);
-                    }
-                }
-            }
-        }
-    },
-
-
-  /********************************************************/
-  /*                                                      */
-  /*                 Baselayer Functions                  */
-  /*                                                      */
-  /********************************************************/
-
-    /**
-     * Method: getLonLatFromViewPortPx
-     * Get a map location from a pixel location
-     * 
-     * Parameters:
-     * viewPortPx - {<OpenLayers.Pixel>}
-     *
-     * Returns:
-     *  {<OpenLayers.LonLat>} An OpenLayers.LonLat which is the passed-in view
-     *  port OpenLayers.Pixel, translated into lon/lat by map lib
-     *  If the map lib is not loaded or not centered, returns null
-     */
-    getLonLatFromViewPortPx: function (viewPortPx) {
-        var lonlat = null;
-        if ( (this.mapObject != null) && 
-             (this.getMapObjectCenter() != null) ) {
-            var moPixel = this.getMapObjectPixelFromOLPixel(viewPortPx);
-            var moLonLat = this.getMapObjectLonLatFromMapObjectPixel(moPixel);
-            lonlat = this.getOLLonLatFromMapObjectLonLat(moLonLat);
-        }
-        return lonlat;
-    },
-
- 
-    /**
-     * Method: getViewPortPxFromLonLat
-     * Get a pixel location from a map location
-     *
-     * Parameters:
-     * lonlat - {<OpenLayers.LonLat>}
-     *
-     * Returns:
-     * {<OpenLayers.Pixel>} An OpenLayers.Pixel which is the passed-in
-     * OpenLayers.LonLat, translated into view port pixels by map lib
-     * If map lib is not loaded or not centered, returns null
-     */
-    getViewPortPxFromLonLat: function (lonlat) {
-        var viewPortPx = null;
-        if ( (this.mapObject != null) && 
-             (this.getMapObjectCenter() != null) ) {
-
-            var moLonLat = this.getMapObjectLonLatFromOLLonLat(lonlat);
-            var moPixel = this.getMapObjectPixelFromMapObjectLonLat(moLonLat);
-        
-            viewPortPx = this.getOLPixelFromMapObjectPixel(moPixel);
-        }
-        return viewPortPx;
-    },
-
-  /********************************************************/
-  /*                                                      */
-  /*               Translation Functions                  */
-  /*                                                      */
-  /*   The following functions translate Map Object and   */
-  /*            OL formats for Pixel, LonLat              */
-  /*                                                      */
-  /********************************************************/
-
-  //
-  // TRANSLATION: MapObject LatLng <-> OpenLayers.LonLat
-  //
-
-    /**
-     * Method: getOLLonLatFromMapObjectLonLat
-     * Get an OL style map location from a 3rd party style map location
-     *
-     * Parameters
-     * moLonLat - {Object}
-     * 
-     * Returns:
-     * {<OpenLayers.LonLat>} An OpenLayers.LonLat, translated from the passed in 
-     *          MapObject LonLat
-     *          Returns null if null value is passed in
-     */
-    getOLLonLatFromMapObjectLonLat: function(moLonLat) {
-        var olLonLat = null;
-        if (moLonLat != null) {
-            var lon = this.getLongitudeFromMapObjectLonLat(moLonLat);
-            var lat = this.getLatitudeFromMapObjectLonLat(moLonLat);
-            olLonLat = new OpenLayers.LonLat(lon, lat);
-        }
-        return olLonLat;
-    },
-
-    /**
-     * Method: getMapObjectLonLatFromOLLonLat
-     * Get a 3rd party map location from an OL map location.
-     *
-     * Parameters:
-     * olLonLat - {<OpenLayers.LonLat>}
-     * 
-     * Returns:
-     * {Object} A MapObject LonLat, translated from the passed in 
-     *          OpenLayers.LonLat
-     *          Returns null if null value is passed in
-     */
-    getMapObjectLonLatFromOLLonLat: function(olLonLat) {
-        var moLatLng = null;
-        if (olLonLat != null) {
-            moLatLng = this.getMapObjectLonLatFromLonLat(olLonLat.lon,
-                                                         olLonLat.lat);
-        }
-        return moLatLng;
-    },
-
-
-  //
-  // TRANSLATION: MapObject Pixel <-> OpenLayers.Pixel
-  //
-
-    /**
-     * Method: getOLPixelFromMapObjectPixel
-     * Get an OL pixel location from a 3rd party pixel location.
-     *
-     * Parameters:
-     * moPixel - {Object}
-     * 
-     * Returns:
-     * {<OpenLayers.Pixel>} An OpenLayers.Pixel, translated from the passed in 
-     *          MapObject Pixel
-     *          Returns null if null value is passed in
-     */
-    getOLPixelFromMapObjectPixel: function(moPixel) {
-        var olPixel = null;
-        if (moPixel != null) {
-            var x = this.getXFromMapObjectPixel(moPixel);
-            var y = this.getYFromMapObjectPixel(moPixel);
-            olPixel = new OpenLayers.Pixel(x, y);
-        }
-        return olPixel;
-    },
-
-    /**
-     * Method: getMapObjectPixelFromOLPixel
-     * Get a 3rd party pixel location from an OL pixel location
-     *
-     * Parameters:
-     * olPixel - {<OpenLayers.Pixel>}
-     * 
-     * Returns:
-     * {Object} A MapObject Pixel, translated from the passed in 
-     *          OpenLayers.Pixel
-     *          Returns null if null value is passed in
-     */
-    getMapObjectPixelFromOLPixel: function(olPixel) {
-        var moPixel = null;
-        if (olPixel != null) {
-            moPixel = this.getMapObjectPixelFromXY(olPixel.x, olPixel.y);
-        }
-        return moPixel;
-    },
-
-    CLASS_NAME: "OpenLayers.Layer.EventPane"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/FixedZoomLevels.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/FixedZoomLevels.js
deleted file mode 100644
index f6472389..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/FixedZoomLevels.js
+++ /dev/null
@@ -1,319 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Layer.js
- */
-
-/**
- * Class: OpenLayers.Layer.FixedZoomLevels
- *   Some Layers will already have established zoom levels (like google 
- *    or ve). Instead of trying to determine them and populate a resolutions[]
- *    Array with those values, we will hijack the resolution functionality
- *    here.
- * 
- *   When you subclass FixedZoomLevels: 
- * 
- *   The initResolutions() call gets nullified, meaning no resolutions[] array 
- *    is set up. Which would be a big problem getResolution() in Layer, since 
- *    it merely takes map.zoom and indexes into resolutions[]... but....
- * 
- *   The getResolution() call is also overridden. Instead of using the 
- *    resolutions[] array, we simply calculate the current resolution based
- *    on the current extent and the current map size. But how will we be able
- *    to calculate the current extent without knowing the resolution...?
- *  
- *   The getExtent() function is also overridden. Instead of calculating extent
- *    based on the center point and the current resolution, we instead 
- *    calculate the extent by getting the lonlats at the top-left and 
- *    bottom-right by using the getLonLatFromViewPortPx() translation function,
- *    taken from the pixel locations (0,0) and the size of the map. But how 
- *    will we be able to do lonlat-px translation without resolution....?
- * 
- *   The getZoomForResolution() method is overridden. Instead of indexing into
- *    the resolutions[] array, we call OpenLayers.Layer.getExent(), passing in
- *    the desired resolution. With this extent, we then call getZoomForExtent() 
- * 
- * 
- *   Whenever you implement a layer using OpenLayers.Layer.FixedZoomLevels, 
- *    it is your responsibility to provide the following three functions:
- * 
- *   - getLonLatFromViewPortPx
- *   - getViewPortPxFromLonLat
- *   - getZoomForExtent
- * 
- *  ...those three functions should generally be provided by any reasonable 
- *  API that you might be working from.
- *
- */
-OpenLayers.Layer.FixedZoomLevels = OpenLayers.Class({
-      
-  /********************************************************/
-  /*                                                      */
-  /*                 Baselayer Functions                  */
-  /*                                                      */
-  /*    The following functions must all be implemented   */
-  /*                  by all base layers                  */
-  /*                                                      */
-  /********************************************************/
-    
-    /**
-     * Constructor: OpenLayers.Layer.FixedZoomLevels
-     * Create a new fixed zoom levels layer.
-     */
-    initialize: function() {
-        //this class is only just to add the following functions... 
-        // nothing to actually do here... but it is probably a good
-        // idea to have layers that use these functions call this 
-        // inititalize() anyways, in case at some point we decide we 
-        // do want to put some functionality or state in here. 
-    },
-    
-    /**
-     * Method: initResolutions
-     * Populate the resolutions array
-     */
-    initResolutions: function() {
-
-        var props = ['minZoomLevel', 'maxZoomLevel', 'numZoomLevels'];
-          
-        for(var i=0, len=props.length; i<len; i++) {
-            var property = props[i];
-            this[property] = (this.options[property] != null)  
-                                     ? this.options[property] 
-                                     : this.map[property];
-        }
-
-        if ( (this.minZoomLevel == null) ||
-             (this.minZoomLevel < this.MIN_ZOOM_LEVEL) ){
-            this.minZoomLevel = this.MIN_ZOOM_LEVEL;
-        }        
-
-        //
-        // At this point, we know what the minimum desired zoom level is, and
-        //  we must calculate the total number of zoom levels. 
-        //  
-        //  Because we allow for the setting of either the 'numZoomLevels'
-        //   or the 'maxZoomLevel' properties... on either the layer or the  
-        //   map, we have to define some rules to see which we take into
-        //   account first in this calculation. 
-        //
-        // The following is the precedence list for these properties:
-        // 
-        // (1) numZoomLevels set on layer
-        // (2) maxZoomLevel set on layer
-        // (3) numZoomLevels set on map
-        // (4) maxZoomLevel set on map*
-        // (5) none of the above*
-        //
-        // *Note that options (4) and (5) are only possible if the user 
-        //  _explicitly_ sets the 'numZoomLevels' property on the map to 
-        //  null, since it is set by default to 16. 
-        //
-
-        //
-        // Note to future: In 3.0, I think we should remove the default 
-        // value of 16 for map.numZoomLevels. Rather, I think that value 
-        // should be set as a default on the Layer.WMS class. If someone
-        // creates a 3rd party layer and does not specify any 'minZoomLevel', 
-        // 'maxZoomLevel', or 'numZoomLevels', and has not explicitly 
-        // specified any of those on the map object either.. then I think
-        // it is fair to say that s/he wants all the zoom levels available.
-        // 
-        // By making map.numZoomLevels *null* by default, that will be the 
-        // case. As it is, I don't feel comfortable changing that right now
-        // as it would be a glaring API change and actually would probably
-        // break many peoples' codes. 
-        //
-
-        //the number of zoom levels we'd like to have.
-        var desiredZoomLevels;
-
-        //this is the maximum number of zoom levels the layer will allow, 
-        // given the specified starting minimum zoom level.
-        var limitZoomLevels = this.MAX_ZOOM_LEVEL - this.minZoomLevel + 1;
-
-        if ( ((this.options.numZoomLevels == null) && 
-              (this.options.maxZoomLevel != null)) // (2)
-              ||
-             ((this.numZoomLevels == null) &&
-              (this.maxZoomLevel != null)) // (4)
-           ) {
-            //calculate based on specified maxZoomLevel (on layer or map)
-            desiredZoomLevels = this.maxZoomLevel - this.minZoomLevel + 1;
-        } else {
-            //calculate based on specified numZoomLevels (on layer or map)
-            // this covers cases (1) and (3)
-            desiredZoomLevels = this.numZoomLevels;
-        }
-
-        if (desiredZoomLevels != null) {
-            //Now that we know what we would *like* the number of zoom levels
-            // to be, based on layer or map options, we have to make sure that
-            // it does not conflict with the actual limit, as specified by 
-            // the constants on the layer itself (and calculated into the
-            // 'limitZoomLevels' variable). 
-            this.numZoomLevels = Math.min(desiredZoomLevels, limitZoomLevels);
-        } else {
-            // case (5) -- neither 'numZoomLevels' not 'maxZoomLevel' was 
-            // set on either the layer or the map. So we just use the 
-            // maximum limit as calculated by the layer's constants.
-            this.numZoomLevels = limitZoomLevels;
-        }
-
-        //now that the 'numZoomLevels' is appropriately, safely set, 
-        // we go back and re-calculate the 'maxZoomLevel'.
-        this.maxZoomLevel = this.minZoomLevel + this.numZoomLevels - 1;
-
-        if (this.RESOLUTIONS != null) {
-            var resolutionsIndex = 0;
-            this.resolutions = [];
-            for(var i= this.minZoomLevel; i <= this.maxZoomLevel; i++) {
-                this.resolutions[resolutionsIndex++] = this.RESOLUTIONS[i];            
-            }
-            this.maxResolution = this.resolutions[0];
-            this.minResolution = this.resolutions[this.resolutions.length - 1];
-        }       
-    },
-    
-    /**
-     * APIMethod: getResolution
-     * Get the current map resolution
-     * 
-     * Returns:
-     * {Float} Map units per Pixel
-     */
-    getResolution: function() {
-
-        if (this.resolutions != null) {
-            return OpenLayers.Layer.prototype.getResolution.apply(this, arguments);
-        } else {
-            var resolution = null;
-            
-            var viewSize = this.map.getSize();
-            var extent = this.getExtent();
-            
-            if ((viewSize != null) && (extent != null)) {
-                resolution = Math.max( extent.getWidth()  / viewSize.w,
-                                       extent.getHeight() / viewSize.h );
-            }
-            return resolution;
-        }
-     },
-
-    /**
-     * APIMethod: getExtent
-     * Calculates using px-> lonlat translation functions on tl and br 
-     *     corners of viewport
-     * 
-     * Returns:
-     * {<OpenLayers.Bounds>} A Bounds object which represents the lon/lat 
-     *                       bounds of the current viewPort.
-     */
-    getExtent: function () {
-        var size = this.map.getSize();
-        var tl = this.getLonLatFromViewPortPx({
-            x: 0, y: 0
-        });
-        var br = this.getLonLatFromViewPortPx({
-            x: size.w, y: size.h
-        });
-        
-        if ((tl != null) && (br != null)) {
-            return new OpenLayers.Bounds(tl.lon, br.lat, br.lon, tl.lat);
-        } else {
-            return null;
-        }
-    },
-
-    /**
-     * Method: getZoomForResolution
-     * Get the zoom level for a given resolution
-     *
-     * Parameters:
-     * resolution - {Float}
-     *
-     * Returns:
-     * {Integer} A suitable zoom level for the specified resolution.
-     *           If no baselayer is set, returns null.
-     */
-    getZoomForResolution: function(resolution) {
-      
-        if (this.resolutions != null) {
-            return OpenLayers.Layer.prototype.getZoomForResolution.apply(this, arguments);
-        } else {
-            var extent = OpenLayers.Layer.prototype.getExtent.apply(this, []);
-            return this.getZoomForExtent(extent);
-        }
-    },
-
-
-
-    
-    /********************************************************/
-    /*                                                      */
-    /*             Translation Functions                    */
-    /*                                                      */
-    /*    The following functions translate GMaps and OL    */ 
-    /*     formats for Pixel, LonLat, Bounds, and Zoom      */
-    /*                                                      */
-    /********************************************************/
-    
-    
-    //
-    // TRANSLATION: MapObject Zoom <-> OpenLayers Zoom
-    //
-  
-    /**
-     * Method: getOLZoomFromMapObjectZoom
-     * Get the OL zoom index from the map object zoom level
-     *
-     * Parameters:
-     * moZoom - {Integer}
-     * 
-     * Returns:
-     * {Integer} An OpenLayers Zoom level, translated from the passed in zoom
-     *           Returns null if null value is passed in
-     */
-    getOLZoomFromMapObjectZoom: function(moZoom) {
-        var zoom = null;
-        if (moZoom != null) {
-            zoom = moZoom - this.minZoomLevel;
-            if (this.map.baseLayer !== this) {
-                zoom = this.map.baseLayer.getZoomForResolution(
-                    this.getResolutionForZoom(zoom)
-                );
-            }
-        }
-        return zoom;
-    },
-    
-    /**
-     * Method: getMapObjectZoomFromOLZoom
-     * Get the map object zoom level from the OL zoom level
-     *
-     * Parameters:
-     * olZoom - {Integer}
-     * 
-     * Returns:
-     * {Integer} A MapObject level, translated from the passed in olZoom
-     *           Returns null if null value is passed in
-     */
-    getMapObjectZoomFromOLZoom: function(olZoom) {
-        var zoom = null; 
-        if (olZoom != null) {
-            zoom = olZoom + this.minZoomLevel;
-            if (this.map.baseLayer !== this) {
-                zoom = this.getZoomForResolution(
-                    this.map.baseLayer.getResolutionForZoom(zoom)
-                );
-            }
-        }
-        return zoom;
-    },
-
-    CLASS_NAME: "OpenLayers.Layer.FixedZoomLevels"
-});
-
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/GeoRSS.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/GeoRSS.js
deleted file mode 100644
index 564d071c..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/GeoRSS.js
+++ /dev/null
@@ -1,265 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-
-/**
- * @requires OpenLayers/Layer/Markers.js
- * @requires OpenLayers/Request/XMLHttpRequest.js
- */
-
-/**
- * Class: OpenLayers.Layer.GeoRSS
- * Add GeoRSS Point features to your map. 
- * 
- * Inherits from:
- *  - <OpenLayers.Layer.Markers>
- */
-OpenLayers.Layer.GeoRSS = OpenLayers.Class(OpenLayers.Layer.Markers, {
-
-    /** 
-     * Property: location 
-     * {String} store url of text file 
-     */
-    location: null,
-
-    /** 
-     * Property: features 
-     * {Array(<OpenLayers.Feature>)} 
-     */
-    features: null,
-    
-    /**
-     * APIProperty: formatOptions
-     * {Object} Hash of options which should be passed to the format when it is
-     * created. Must be passed in the constructor.
-     */
-    formatOptions: null, 
-
-    /** 
-     * Property: selectedFeature 
-     * {<OpenLayers.Feature>} 
-     */
-    selectedFeature: null,
-
-    /** 
-     * APIProperty: icon 
-     * {<OpenLayers.Icon>}. This determines the Icon to be used on the map
-     * for this GeoRSS layer.
-     */
-    icon: null,
-
-    /**
-     * APIProperty: popupSize
-     * {<OpenLayers.Size>} This determines the size of GeoRSS popups. If 
-     * not provided, defaults to 250px by 120px. 
-     */
-    popupSize: null, 
-    
-    /** 
-     * APIProperty: useFeedTitle 
-     * {Boolean} Set layer.name to the first <title> element in the feed. Default is true. 
-     */
-    useFeedTitle: true,
-    
-    /**
-    * Constructor: OpenLayers.Layer.GeoRSS
-    * Create a GeoRSS Layer.
-    *
-    * Parameters:
-    * name - {String} 
-    * location - {String} 
-    * options - {Object}
-    */
-    initialize: function(name, location, options) {
-        OpenLayers.Layer.Markers.prototype.initialize.apply(this, [name, options]);
-        this.location = location;
-        this.features = [];
-    },
-
-    /**
-     * Method: destroy 
-     */
-    destroy: function() {
-        // Warning: Layer.Markers.destroy() must be called prior to calling
-        // clearFeatures() here, otherwise we leak memory. Indeed, if
-        // Layer.Markers.destroy() is called after clearFeatures(), it won't be
-        // able to remove the marker image elements from the layer's div since
-        // the markers will have been destroyed by clearFeatures().
-        OpenLayers.Layer.Markers.prototype.destroy.apply(this, arguments);
-        this.clearFeatures();
-        this.features = null;
-    },
-
-    /**
-     * Method: loadRSS
-     * Start the load of the RSS data. Don't do this when we first add the layer,
-     * since we may not be visible at any point, and it would therefore be a waste.
-     */
-    loadRSS: function() {
-        if (!this.loaded) {
-            this.events.triggerEvent("loadstart");
-            OpenLayers.Request.GET({
-                url: this.location,
-                success: this.parseData,
-                scope: this
-            });
-            this.loaded = true;
-        }    
-    },    
-    
-    /**
-     * Method: moveTo
-     * If layer is visible and RSS has not been loaded, load RSS. 
-     * 
-     * Parameters:
-     * bounds - {Object} 
-     * zoomChanged - {Object} 
-     * minor - {Object} 
-     */
-    moveTo:function(bounds, zoomChanged, minor) {
-        OpenLayers.Layer.Markers.prototype.moveTo.apply(this, arguments);
-        if(this.visibility && !this.loaded){
-            this.loadRSS();
-        }
-    },
-        
-    /**
-     * Method: parseData
-     * Parse the data returned from the Events call.
-     *
-     * Parameters:
-     * ajaxRequest - {<OpenLayers.Request.XMLHttpRequest>} 
-     */
-    parseData: function(ajaxRequest) {
-        var doc = ajaxRequest.responseXML;
-        if (!doc || !doc.documentElement) {
-            doc = OpenLayers.Format.XML.prototype.read(ajaxRequest.responseText);
-        }
-        
-        if (this.useFeedTitle) {
-            var name = null;
-            try {
-                name = doc.getElementsByTagNameNS('*', 'title')[0].firstChild.nodeValue;
-            }
-            catch (e) {
-                name = doc.getElementsByTagName('title')[0].firstChild.nodeValue;
-            }
-            if (name) {
-                this.setName(name);
-            }    
-        }
-       
-        var options = {};
-        
-        OpenLayers.Util.extend(options, this.formatOptions);
-        
-        if (this.map && !this.projection.equals(this.map.getProjectionObject())) {
-            options.externalProjection = this.projection;
-            options.internalProjection = this.map.getProjectionObject();
-        }    
-        
-        var format = new OpenLayers.Format.GeoRSS(options);
-        var features = format.read(doc);
-        
-        for (var i=0, len=features.length; i<len; i++) {
-            var data = {};
-            var feature = features[i];
-            
-            // we don't support features with no geometry in the GeoRSS
-            // layer at this time. 
-            if (!feature.geometry) {
-                continue;
-            }    
-            
-            var title = feature.attributes.title ? 
-                         feature.attributes.title : "Untitled";
-            
-            var description = feature.attributes.description ? 
-                         feature.attributes.description : "No description.";
-            
-            var link = feature.attributes.link ? feature.attributes.link : "";
-
-            var location = feature.geometry.getBounds().getCenterLonLat();
-            
-            
-            data.icon = this.icon == null ? 
-                                     OpenLayers.Marker.defaultIcon() : 
-                                     this.icon.clone();
-            
-            data.popupSize = this.popupSize ? 
-                             this.popupSize.clone() :
-                             new OpenLayers.Size(250, 120);
-            
-            if (title || description) {
-                // we have supplemental data, store them.
-                data.title = title;
-                data.description = description;
-            
-                var contentHTML = '<div class="olLayerGeoRSSClose">[x]</div>'; 
-                contentHTML += '<div class="olLayerGeoRSSTitle">';
-                if (link) {
-                    contentHTML += '<a class="link" href="'+link+'" target="_blank">';
-                }
-                contentHTML += title;
-                if (link) {
-                    contentHTML += '</a>';
-                }
-                contentHTML += '</div>';
-                contentHTML += '<div style="" class="olLayerGeoRSSDescription">';
-                contentHTML += description;
-                contentHTML += '</div>';
-                data['popupContentHTML'] = contentHTML;                
-            }
-            var feature = new OpenLayers.Feature(this, location, data);
-            this.features.push(feature);
-            var marker = feature.createMarker();
-            marker.events.register('click', feature, this.markerClick);
-            this.addMarker(marker);
-        }
-        this.events.triggerEvent("loadend");
-    },
-    
-    /**
-     * Method: markerClick
-     *
-     * Parameters:
-     * evt - {Event} 
-     */
-    markerClick: function(evt) {
-        var sameMarkerClicked = (this == this.layer.selectedFeature);
-        this.layer.selectedFeature = (!sameMarkerClicked) ? this : null;
-        for(var i=0, len=this.layer.map.popups.length; i<len; i++) {
-            this.layer.map.removePopup(this.layer.map.popups[i]);
-        }
-        if (!sameMarkerClicked) {
-            var popup = this.createPopup();
-            OpenLayers.Event.observe(popup.div, "click",
-                OpenLayers.Function.bind(function() { 
-                    for(var i=0, len=this.layer.map.popups.length; i<len; i++) { 
-                        this.layer.map.removePopup(this.layer.map.popups[i]); 
-                    }
-                }, this)
-            );
-            this.layer.map.addPopup(popup); 
-        }
-        OpenLayers.Event.stop(evt);
-    },
-
-    /**
-     * Method: clearFeatures
-     * Destroy all features in this layer.
-     */
-    clearFeatures: function() {
-        if (this.features != null) {
-            while(this.features.length > 0) {
-                var feature = this.features[0];
-                OpenLayers.Util.removeItem(this.features, feature);
-                feature.destroy();
-            }
-        }        
-    },
-    
-    CLASS_NAME: "OpenLayers.Layer.GeoRSS"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/Google.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/Google.js
deleted file mode 100644
index 6e85fbaa..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/Google.js
+++ /dev/null
@@ -1,809 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-
-/**
- * @requires OpenLayers/Layer/SphericalMercator.js
- * @requires OpenLayers/Layer/EventPane.js
- * @requires OpenLayers/Layer/FixedZoomLevels.js
- * @requires OpenLayers/Lang.js
- */
-
-/**
- * Class: OpenLayers.Layer.Google
- * 
- * Provides a wrapper for Google's Maps API
- * Normally the Terms of Use for this API do not allow wrapping, but Google
- * have provided written consent to OpenLayers for this - see email in 
- * http://osgeo-org.1560.n6.nabble.com/Google-Maps-API-Terms-of-Use-changes-tp4910013p4911981.html
- * 
- * Inherits from:
- *  - <OpenLayers.Layer.SphericalMercator>
- *  - <OpenLayers.Layer.EventPane>
- *  - <OpenLayers.Layer.FixedZoomLevels>
- */
-OpenLayers.Layer.Google = OpenLayers.Class(
-    OpenLayers.Layer.EventPane, 
-    OpenLayers.Layer.FixedZoomLevels, {
-    
-    /** 
-     * Constant: MIN_ZOOM_LEVEL
-     * {Integer} 0 
-     */
-    MIN_ZOOM_LEVEL: 0,
-    
-    /** 
-     * Constant: MAX_ZOOM_LEVEL
-     * {Integer} 21
-     */
-    MAX_ZOOM_LEVEL: 21,
-
-    /** 
-     * Constant: RESOLUTIONS
-     * {Array(Float)} Hardcode these resolutions so that they are more closely
-     *                tied with the standard wms projection
-     */
-    RESOLUTIONS: [
-        1.40625, 
-        0.703125, 
-        0.3515625, 
-        0.17578125, 
-        0.087890625, 
-        0.0439453125,
-        0.02197265625, 
-        0.010986328125, 
-        0.0054931640625, 
-        0.00274658203125,
-        0.001373291015625, 
-        0.0006866455078125, 
-        0.00034332275390625,
-        0.000171661376953125, 
-        0.0000858306884765625, 
-        0.00004291534423828125,
-        0.00002145767211914062, 
-        0.00001072883605957031,
-        0.00000536441802978515, 
-        0.00000268220901489257,
-        0.0000013411045074462891,
-        0.00000067055225372314453
-    ],
-
-    /**
-     * APIProperty: type
-     * {GMapType}
-     */
-    type: null,
-
-    /**
-     * APIProperty: wrapDateLine
-     * {Boolean} Allow user to pan forever east/west.  Default is true.  
-     *     Setting this to false only restricts panning if 
-     *     <sphericalMercator> is true. 
-     */
-    wrapDateLine: true,
-
-    /**
-     * APIProperty: sphericalMercator
-     * {Boolean} Should the map act as a mercator-projected map? This will
-     *     cause all interactions with the map to be in the actual map 
-     *     projection, which allows support for vector drawing, overlaying 
-     *     other maps, etc. 
-     */
-    sphericalMercator: false, 
-    
-    /**
-     * Property: version
-     * {Number} The version of the Google Maps API
-     */
-    version: null,
-
-    /** 
-     * Constructor: OpenLayers.Layer.Google
-     * 
-     * Parameters:
-     * name - {String} A name for the layer.
-     * options - {Object} An optional object whose properties will be set
-     *     on the layer.
-     */
-    initialize: function(name, options) {
-        options = options || {};
-        if(!options.version) {
-            options.version = typeof GMap2 === "function" ? "2" : "3";
-        }
-        var mixin = OpenLayers.Layer.Google["v" +
-            options.version.replace(/\./g, "_")];
-        if (mixin) {
-            OpenLayers.Util.applyDefaults(options, mixin);
-        } else {
-            throw "Unsupported Google Maps API version: " + options.version;
-        }
-
-        OpenLayers.Util.applyDefaults(options, mixin.DEFAULTS);
-        if (options.maxExtent) {
-            options.maxExtent = options.maxExtent.clone();
-        }
-
-        OpenLayers.Layer.EventPane.prototype.initialize.apply(this,
-            [name, options]);
-        OpenLayers.Layer.FixedZoomLevels.prototype.initialize.apply(this, 
-            [name, options]);
-
-        if (this.sphericalMercator) {
-            OpenLayers.Util.extend(this, OpenLayers.Layer.SphericalMercator);
-            this.initMercatorParameters();
-        }    
-    },
-
-    /**
-     * Method: clone
-     * Create a clone of this layer
-     *
-     * Returns:
-     * {<OpenLayers.Layer.Google>} An exact clone of this layer
-     */
-    clone: function() {
-        /**
-         * This method isn't intended to be called by a subclass and it
-         * doesn't call the same method on the superclass.  We don't call
-         * the super's clone because we don't want properties that are set
-         * on this layer after initialize (i.e. this.mapObject etc.).
-         */
-        return new OpenLayers.Layer.Google(
-            this.name, this.getOptions()
-        );
-    },
-
-    /**
-     * APIMethod: setVisibility
-     * Set the visibility flag for the layer and hide/show & redraw 
-     *     accordingly. Fire event unless otherwise specified
-     * 
-     * Note that visibility is no longer simply whether or not the layer's
-     *     style.display is set to "block". Now we store a 'visibility' state 
-     *     property on the layer class, this allows us to remember whether or 
-     *     not we *desire* for a layer to be visible. In the case where the 
-     *     map's resolution is out of the layer's range, this desire may be 
-     *     subverted.
-     * 
-     * Parameters:
-     * visible - {Boolean} Display the layer (if in range)
-     */
-    setVisibility: function(visible) {
-        // sharing a map container, opacity has to be set per layer
-        var opacity = this.opacity == null ? 1 : this.opacity;
-        OpenLayers.Layer.EventPane.prototype.setVisibility.apply(this, arguments);
-        this.setOpacity(opacity);
-    },
-    
-    /** 
-     * APIMethod: display
-     * Hide or show the Layer
-     * 
-     * Parameters:
-     * visible - {Boolean}
-     */
-    display: function(visible) {
-        if (!this._dragging) {
-            this.setGMapVisibility(visible);
-        }
-        OpenLayers.Layer.EventPane.prototype.display.apply(this, arguments);
-    },
-    
-    /**
-     * Method: moveTo
-     * 
-     * Parameters:
-     * bounds - {<OpenLayers.Bounds>}
-     * zoomChanged - {Boolean} Tells when zoom has changed, as layers have to
-     *     do some init work in that case.
-     * dragging - {Boolean}
-     */
-    moveTo: function(bounds, zoomChanged, dragging) {
-        this._dragging = dragging;
-        OpenLayers.Layer.EventPane.prototype.moveTo.apply(this, arguments);
-        delete this._dragging;
-    },
-    
-    /**
-     * APIMethod: setOpacity
-     * Sets the opacity for the entire layer (all images)
-     * 
-     * Parameters:
-     * opacity - {Float}
-     */
-    setOpacity: function(opacity) {
-        if (opacity !== this.opacity) {
-            if (this.map != null) {
-                this.map.events.triggerEvent("changelayer", {
-                    layer: this,
-                    property: "opacity"
-                });
-            }
-            this.opacity = opacity;
-        }
-        // Though this layer's opacity may not change, we're sharing a container
-        // and need to update the opacity for the entire container.
-        if (this.getVisibility()) {
-            var container = this.getMapContainer();
-            OpenLayers.Util.modifyDOMElement(
-                container, null, null, null, null, null, null, opacity
-            );
-        }
-    },
-
-    /**
-     * APIMethod: destroy
-     * Clean up this layer.
-     */
-    destroy: function() {
-        /**
-         * We have to override this method because the event pane destroy
-         * deletes the mapObject reference before removing this layer from
-         * the map.
-         */
-        if (this.map) {
-            this.setGMapVisibility(false);
-            var cache = OpenLayers.Layer.Google.cache[this.map.id];
-            if (cache && cache.count <= 1) {
-                this.removeGMapElements();
-            }            
-        }
-        OpenLayers.Layer.EventPane.prototype.destroy.apply(this, arguments);
-    },
-    
-    /**
-     * Method: removeGMapElements
-     * Remove all elements added to the dom.  This should only be called if
-     * this is the last of the Google layers for the given map.
-     */
-    removeGMapElements: function() {
-        var cache = OpenLayers.Layer.Google.cache[this.map.id];
-        if (cache) {
-            // remove shared elements from dom
-            var container = this.mapObject && this.getMapContainer();                
-            if (container && container.parentNode) {
-                container.parentNode.removeChild(container);
-            }
-            var termsOfUse = cache.termsOfUse;
-            if (termsOfUse && termsOfUse.parentNode) {
-                termsOfUse.parentNode.removeChild(termsOfUse);
-            }
-            var poweredBy = cache.poweredBy;
-            if (poweredBy && poweredBy.parentNode) {
-                poweredBy.parentNode.removeChild(poweredBy);
-            }
-            if (this.mapObject && window.google && google.maps &&
-                    google.maps.event && google.maps.event.clearListeners) {
-                google.maps.event.clearListeners(this.mapObject, 'tilesloaded');
-            }
-        }
-    },
-
-    /**
-     * APIMethod: removeMap
-     * On being removed from the map, also remove termsOfUse and poweredBy divs
-     * 
-     * Parameters:
-     * map - {<OpenLayers.Map>}
-     */
-    removeMap: function(map) {
-        // hide layer before removing
-        if (this.visibility && this.mapObject) {
-            this.setGMapVisibility(false);
-        }
-        // check to see if last Google layer in this map
-        var cache = OpenLayers.Layer.Google.cache[map.id];
-        if (cache) {
-            if (cache.count <= 1) {
-                this.removeGMapElements();
-                delete OpenLayers.Layer.Google.cache[map.id];
-            } else {
-                // decrement the layer count
-                --cache.count;
-            }
-        }
-        // remove references to gmap elements
-        delete this.termsOfUse;
-        delete this.poweredBy;
-        delete this.mapObject;
-        delete this.dragObject;
-        OpenLayers.Layer.EventPane.prototype.removeMap.apply(this, arguments);
-    },
-    
-  //
-  // TRANSLATION: MapObject Bounds <-> OpenLayers.Bounds
-  //
-
-    /**
-     * APIMethod: getOLBoundsFromMapObjectBounds
-     * 
-     * Parameters:
-     * moBounds - {Object}
-     * 
-     * Returns:
-     * {<OpenLayers.Bounds>} An <OpenLayers.Bounds>, translated from the 
-     *                       passed-in MapObject Bounds.
-     *                       Returns null if null value is passed in.
-     */
-    getOLBoundsFromMapObjectBounds: function(moBounds) {
-        var olBounds = null;
-        if (moBounds != null) {
-            var sw = moBounds.getSouthWest();
-            var ne = moBounds.getNorthEast();
-            if (this.sphericalMercator) {
-                sw = this.forwardMercator(sw.lng(), sw.lat());
-                ne = this.forwardMercator(ne.lng(), ne.lat());
-            } else {
-                sw = new OpenLayers.LonLat(sw.lng(), sw.lat()); 
-                ne = new OpenLayers.LonLat(ne.lng(), ne.lat()); 
-            }    
-            olBounds = new OpenLayers.Bounds(sw.lon, 
-                                             sw.lat, 
-                                             ne.lon, 
-                                             ne.lat );
-        }
-        return olBounds;
-    },
-
-    /** 
-     * APIMethod: getWarningHTML
-     * 
-     * Returns: 
-     * {String} String with information on why layer is broken, how to get
-     *          it working.
-     */
-    getWarningHTML:function() {
-        return OpenLayers.i18n("googleWarning");
-    },
-
-
-    /************************************
-     *                                  *
-     *   MapObject Interface Controls   *
-     *                                  *
-     ************************************/
-
-
-  // Get&Set Center, Zoom
-
-    /**
-     * APIMethod: getMapObjectCenter
-     * 
-     * Returns: 
-     * {Object} The mapObject's current center in Map Object format
-     */
-    getMapObjectCenter: function() {
-        return this.mapObject.getCenter();
-    },
-
-    /** 
-     * APIMethod: getMapObjectZoom
-     * 
-     * Returns:
-     * {Integer} The mapObject's current zoom, in Map Object format
-     */
-    getMapObjectZoom: function() {
-        return this.mapObject.getZoom();
-    },
-
-  
-    /************************************
-     *                                  *
-     *       MapObject Primitives       *
-     *                                  *
-     ************************************/
-
-
-  // LonLat
-    
-    /**
-     * APIMethod: getLongitudeFromMapObjectLonLat
-     * 
-     * Parameters:
-     * moLonLat - {Object} MapObject LonLat format
-     * 
-     * Returns:
-     * {Float} Longitude of the given MapObject LonLat
-     */
-    getLongitudeFromMapObjectLonLat: function(moLonLat) {
-        return this.sphericalMercator ? 
-          this.forwardMercator(moLonLat.lng(), moLonLat.lat()).lon :
-          moLonLat.lng();  
-    },
-
-    /**
-     * APIMethod: getLatitudeFromMapObjectLonLat
-     * 
-     * Parameters:
-     * moLonLat - {Object} MapObject LonLat format
-     * 
-     * Returns:
-     * {Float} Latitude of the given MapObject LonLat
-     */
-    getLatitudeFromMapObjectLonLat: function(moLonLat) {
-        var lat = this.sphericalMercator ? 
-          this.forwardMercator(moLonLat.lng(), moLonLat.lat()).lat :
-          moLonLat.lat(); 
-        return lat;  
-    },
-    
-  // Pixel
-    
-    /**
-     * APIMethod: getXFromMapObjectPixel
-     * 
-     * Parameters:
-     * moPixel - {Object} MapObject Pixel format
-     * 
-     * Returns:
-     * {Integer} X value of the MapObject Pixel
-     */
-    getXFromMapObjectPixel: function(moPixel) {
-        return moPixel.x;
-    },
-
-    /**
-     * APIMethod: getYFromMapObjectPixel
-     * 
-     * Parameters:
-     * moPixel - {Object} MapObject Pixel format
-     * 
-     * Returns:
-     * {Integer} Y value of the MapObject Pixel
-     */
-    getYFromMapObjectPixel: function(moPixel) {
-        return moPixel.y;
-    },
-    
-    CLASS_NAME: "OpenLayers.Layer.Google"
-});
-
-/**
- * Property: OpenLayers.Layer.Google.cache
- * {Object} Cache for elements that should only be created once per map.
- */
-OpenLayers.Layer.Google.cache = {};
-
-
-/**
- * Constant: OpenLayers.Layer.Google.v2
- * 
- * Mixin providing functionality specific to the Google Maps API v2.
- * 
- * This API has been deprecated by Google.
- * Developers are encouraged to migrate to v3 of the API; support for this
- * is provided by <OpenLayers.Layer.Google.v3>
- */
-OpenLayers.Layer.Google.v2 = {
-    
-    /**
-     * Property: termsOfUse
-     * {DOMElement} Div for Google's copyright and terms of use link
-     */
-    termsOfUse: null, 
-
-    /**
-     * Property: poweredBy
-     * {DOMElement} Div for Google's powered by logo and link
-     */
-    poweredBy: null, 
-
-    /**
-     * Property: dragObject
-     * {GDraggableObject} Since 2.93, Google has exposed the ability to get
-     *     the maps GDraggableObject. We can now use this for smooth panning
-     */
-    dragObject: null, 
-    
-    /** 
-     * Method: loadMapObject
-     * Load the GMap and register appropriate event listeners. If we can't 
-     *     load GMap2, then display a warning message.
-     */
-    loadMapObject:function() {
-        if (!this.type) {
-            this.type = G_NORMAL_MAP;
-        }
-        var mapObject, termsOfUse, poweredBy;
-        var cache = OpenLayers.Layer.Google.cache[this.map.id];
-        if (cache) {
-            // there are already Google layers added to this map
-            mapObject = cache.mapObject;
-            termsOfUse = cache.termsOfUse;
-            poweredBy = cache.poweredBy;
-            // increment the layer count
-            ++cache.count;
-        } else {
-            // this is the first Google layer for this map
-
-            var container = this.map.viewPortDiv;
-            var div = document.createElement("div");
-            div.id = this.map.id + "_GMap2Container";
-            div.style.position = "absolute";
-            div.style.width = "100%";
-            div.style.height = "100%";
-            container.appendChild(div);
-
-            // create GMap and shuffle elements
-            try {
-                mapObject = new GMap2(div);
-                
-                // move the ToS and branding stuff up to the container div
-                termsOfUse = div.lastChild;
-                container.appendChild(termsOfUse);
-                termsOfUse.style.zIndex = "1100";
-                termsOfUse.style.right = "";
-                termsOfUse.style.bottom = "";
-                termsOfUse.className = "olLayerGoogleCopyright";
-
-                poweredBy = div.lastChild;
-                container.appendChild(poweredBy);
-                poweredBy.style.zIndex = "1100";
-                poweredBy.style.right = "";
-                poweredBy.style.bottom = "";
-                poweredBy.className = "olLayerGooglePoweredBy gmnoprint";
-                
-            } catch (e) {
-                throw(e);
-            }
-            // cache elements for use by any other google layers added to
-            // this same map
-            OpenLayers.Layer.Google.cache[this.map.id] = {
-                mapObject: mapObject,
-                termsOfUse: termsOfUse,
-                poweredBy: poweredBy,
-                count: 1
-            };
-        }
-
-        this.mapObject = mapObject;
-        this.termsOfUse = termsOfUse;
-        this.poweredBy = poweredBy;
-        
-        // ensure this layer type is one of the mapObject types
-        if (OpenLayers.Util.indexOf(this.mapObject.getMapTypes(),
-                                    this.type) === -1) {
-            this.mapObject.addMapType(this.type);
-        }
-
-        //since v 2.93 getDragObject is now available.
-        if(typeof mapObject.getDragObject == "function") {
-            this.dragObject = mapObject.getDragObject();
-        } else {
-            this.dragPanMapObject = null;
-        }
-        
-        if(this.isBaseLayer === false) {
-            this.setGMapVisibility(this.div.style.display !== "none");
-        }
-
-    },
-
-    /**
-     * APIMethod: onMapResize
-     */
-    onMapResize: function() {
-        // workaround for resizing of invisible or not yet fully loaded layers
-        // where GMap2.checkResize() does not work. We need to load the GMap
-        // for the old div size, then checkResize(), and then call
-        // layer.moveTo() to trigger GMap.setCenter() (which will finish
-        // the GMap initialization).
-        if(this.visibility && this.mapObject.isLoaded()) {
-            this.mapObject.checkResize();
-        } else {
-            if(!this._resized) {
-                var layer = this;
-                var handle = GEvent.addListener(this.mapObject, "load", function() {
-                    GEvent.removeListener(handle);
-                    delete layer._resized;
-                    layer.mapObject.checkResize();
-                    layer.moveTo(layer.map.getCenter(), layer.map.getZoom());
-                });
-            }
-            this._resized = true;
-        }
-    },
-
-    /**
-     * Method: setGMapVisibility
-     * Display the GMap container and associated elements.
-     * 
-     * Parameters:
-     * visible - {Boolean} Display the GMap elements.
-     */
-    setGMapVisibility: function(visible) {
-        var cache = OpenLayers.Layer.Google.cache[this.map.id];
-        if (cache) {
-            var container = this.mapObject.getContainer();
-            if (visible === true) {
-                this.mapObject.setMapType(this.type);
-                container.style.display = "";
-                this.termsOfUse.style.left = "";
-                this.termsOfUse.style.display = "";
-                this.poweredBy.style.display = "";            
-                cache.displayed = this.id;
-            } else {
-                if (cache.displayed === this.id) {
-                    delete cache.displayed;
-                }
-                if (!cache.displayed) {
-                    container.style.display = "none";
-                    this.termsOfUse.style.display = "none";
-                    // move ToU far to the left in addition to setting display
-                    // to "none", because at the end of the GMap2 load
-                    // sequence, display: none will be unset and ToU would be
-                    // visible after loading a map with a google layer that is
-                    // initially hidden. 
-                    this.termsOfUse.style.left = "-9999px";
-                    this.poweredBy.style.display = "none";
-                }
-            }
-        }
-    },
-    
-    /**
-     * Method: getMapContainer
-     * 
-     * Returns:
-     * {DOMElement} the GMap container's div
-     */
-    getMapContainer: function() {
-        return this.mapObject.getContainer();
-    },
-
-  //
-  // TRANSLATION: MapObject Bounds <-> OpenLayers.Bounds
-  //
-
-    /**
-     * APIMethod: getMapObjectBoundsFromOLBounds
-     * 
-     * Parameters:
-     * olBounds - {<OpenLayers.Bounds>}
-     * 
-     * Returns:
-     * {Object} A MapObject Bounds, translated from olBounds
-     *          Returns null if null value is passed in
-     */
-    getMapObjectBoundsFromOLBounds: function(olBounds) {
-        var moBounds = null;
-        if (olBounds != null) {
-            var sw = this.sphericalMercator ? 
-              this.inverseMercator(olBounds.bottom, olBounds.left) : 
-              new OpenLayers.LonLat(olBounds.bottom, olBounds.left);
-            var ne = this.sphericalMercator ? 
-              this.inverseMercator(olBounds.top, olBounds.right) : 
-              new OpenLayers.LonLat(olBounds.top, olBounds.right);
-            moBounds = new GLatLngBounds(new GLatLng(sw.lat, sw.lon),
-                                         new GLatLng(ne.lat, ne.lon));
-        }
-        return moBounds;
-    },
-
-
-    /************************************
-     *                                  *
-     *   MapObject Interface Controls   *
-     *                                  *
-     ************************************/
-
-
-  // Get&Set Center, Zoom
-
-    /** 
-     * APIMethod: setMapObjectCenter
-     * Set the mapObject to the specified center and zoom
-     * 
-     * Parameters:
-     * center - {Object} MapObject LonLat format
-     * zoom - {int} MapObject zoom format
-     */
-    setMapObjectCenter: function(center, zoom) {
-        this.mapObject.setCenter(center, zoom); 
-    },
-   
-    /**
-     * APIMethod: dragPanMapObject
-     * 
-     * Parameters:
-     * dX - {Integer}
-     * dY - {Integer}
-     */
-    dragPanMapObject: function(dX, dY) {
-        this.dragObject.moveBy(new GSize(-dX, dY));
-    },
-
-
-  // LonLat - Pixel Translation
-  
-    /**
-     * APIMethod: getMapObjectLonLatFromMapObjectPixel
-     * 
-     * Parameters:
-     * moPixel - {Object} MapObject Pixel format
-     * 
-     * Returns:
-     * {Object} MapObject LonLat translated from MapObject Pixel
-     */
-    getMapObjectLonLatFromMapObjectPixel: function(moPixel) {
-        return this.mapObject.fromContainerPixelToLatLng(moPixel);
-    },
-
-    /**
-     * APIMethod: getMapObjectPixelFromMapObjectLonLat
-     * 
-     * Parameters:
-     * moLonLat - {Object} MapObject LonLat format
-     * 
-     * Returns:
-     * {Object} MapObject Pixel transtlated from MapObject LonLat
-     */
-    getMapObjectPixelFromMapObjectLonLat: function(moLonLat) {
-        return this.mapObject.fromLatLngToContainerPixel(moLonLat);
-    },
-
-  
-  // Bounds
-  
-    /** 
-     * APIMethod: getMapObjectZoomFromMapObjectBounds
-     * 
-     * Parameters:
-     * moBounds - {Object} MapObject Bounds format
-     * 
-     * Returns:
-     * {Object} MapObject Zoom for specified MapObject Bounds
-     */
-    getMapObjectZoomFromMapObjectBounds: function(moBounds) {
-        return this.mapObject.getBoundsZoomLevel(moBounds);
-    },
-
-    /************************************
-     *                                  *
-     *       MapObject Primitives       *
-     *                                  *
-     ************************************/
-
-
-  // LonLat
-    
-    /**
-     * APIMethod: getMapObjectLonLatFromLonLat
-     * 
-     * Parameters:
-     * lon - {Float}
-     * lat - {Float}
-     * 
-     * Returns:
-     * {Object} MapObject LonLat built from lon and lat params
-     */
-    getMapObjectLonLatFromLonLat: function(lon, lat) {
-        var gLatLng;
-        if(this.sphericalMercator) {
-            var lonlat = this.inverseMercator(lon, lat);
-            gLatLng = new GLatLng(lonlat.lat, lonlat.lon);
-        } else {
-            gLatLng = new GLatLng(lat, lon);
-        }
-        return gLatLng;
-    },
-
-  // Pixel
-    
-    /**
-     * APIMethod: getMapObjectPixelFromXY
-     * 
-     * Parameters:
-     * x - {Integer}
-     * y - {Integer}
-     * 
-     * Returns:
-     * {Object} MapObject Pixel from x and y parameters
-     */
-    getMapObjectPixelFromXY: function(x, y) {
-        return new GPoint(x, y);
-    }
-    
-};
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/Google/v3.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/Google/v3.js
deleted file mode 100644
index 067b7a08..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/Google/v3.js
+++ /dev/null
@@ -1,351 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-
-/**
- * @requires OpenLayers/Layer/Google.js
- */
-
-/**
- * Constant: OpenLayers.Layer.Google.v3
- * 
- * Mixin providing functionality specific to the Google Maps API v3.
- * 
- * To use this layer, you must include the GMaps v3 API in your html.
- * 
- * Note that this layer configures the google.maps.map object with the
- * "disableDefaultUI" option set to true. Using UI controls that the Google
- * Maps API provides is not supported by the OpenLayers API.
- */
-OpenLayers.Layer.Google.v3 = {
-    
-    /**
-     * Constant: DEFAULTS
-     * {Object} It is not recommended to change the properties set here. Note
-     * that Google.v3 layers only work when sphericalMercator is set to true.
-     * 
-     * (code)
-     * {
-     *     sphericalMercator: true,
-     *     projection: "EPSG:900913"
-     * }
-     * (end)
-     */
-    DEFAULTS: {
-        sphericalMercator: true,
-        projection: "EPSG:900913"
-    },
-
-    /**
-     * APIProperty: animationEnabled
-     * {Boolean} If set to true, the transition between zoom levels will be
-     *     animated (if supported by the GMaps API for the device used). Set to
-     *     false to match the zooming experience of other layer types. Default
-     *     is true. Note that the GMaps API does not give us control over zoom
-     *     animation, so if set to false, when zooming, this will make the
-     *     layer temporarily invisible, wait until GMaps reports the map being
-     *     idle, and make it visible again. The result will be a blank layer
-     *     for a few moments while zooming.
-     */
-    animationEnabled: true, 
-
-    /** 
-     * Method: loadMapObject
-     * Load the GMap and register appropriate event listeners.
-     */
-    loadMapObject: function() {
-        if (!this.type) {
-            this.type = google.maps.MapTypeId.ROADMAP;
-        }
-        var mapObject;
-        var cache = OpenLayers.Layer.Google.cache[this.map.id];
-        if (cache) {
-            // there are already Google layers added to this map
-            mapObject = cache.mapObject;
-            // increment the layer count
-            ++cache.count;
-        } else {
-            // this is the first Google layer for this map
-            // create GMap
-            var center = this.map.getCenter();
-            var container = document.createElement('div');
-            container.className = "olForeignContainer";
-            container.style.width = '100%';
-            container.style.height = '100%';
-            mapObject = new google.maps.Map(container, {
-                center: center ?
-                    new google.maps.LatLng(center.lat, center.lon) :
-                    new google.maps.LatLng(0, 0),
-                zoom: this.map.getZoom() || 0,
-                mapTypeId: this.type,
-                disableDefaultUI: true,
-                keyboardShortcuts: false,
-                draggable: false,
-                disableDoubleClickZoom: true,
-                scrollwheel: false,
-                streetViewControl: false
-            });
-            var googleControl = document.createElement('div');
-            googleControl.style.width = '100%';
-            googleControl.style.height = '100%';
-            mapObject.controls[google.maps.ControlPosition.TOP_LEFT].push(googleControl);
-            
-            // cache elements for use by any other google layers added to
-            // this same map
-            cache = {
-                googleControl: googleControl,
-                mapObject: mapObject,
-                count: 1
-            };
-            OpenLayers.Layer.Google.cache[this.map.id] = cache;
-        }
-        this.mapObject = mapObject;
-        this.setGMapVisibility(this.visibility);
-    },
-    
-    /**
-     * APIMethod: onMapResize
-     */
-    onMapResize: function() {
-        if (this.visibility) {
-            google.maps.event.trigger(this.mapObject, "resize");
-        }
-    },
-
-    /**
-     * Method: setGMapVisibility
-     * Display the GMap container and associated elements.
-     * 
-     * Parameters:
-     * visible - {Boolean} Display the GMap elements.
-     */
-    setGMapVisibility: function(visible) {
-        var cache = OpenLayers.Layer.Google.cache[this.map.id];
-        var map = this.map;
-        if (cache) {
-            var type = this.type;
-            var layers = map.layers;
-            var layer;
-            for (var i=layers.length-1; i>=0; --i) {
-                layer = layers[i];
-                if (layer instanceof OpenLayers.Layer.Google &&
-                            layer.visibility === true && layer.inRange === true) {
-                    type = layer.type;
-                    visible = true;
-                    break;
-                }
-            }
-            var container = this.mapObject.getDiv();
-            if (visible === true) {
-                if (container.parentNode !== map.div) {
-                    if (!cache.rendered) {
-                        var me = this;
-                        google.maps.event.addListenerOnce(this.mapObject, 'tilesloaded', function() {
-                            cache.rendered = true;
-                            me.setGMapVisibility(me.getVisibility());
-                            me.moveTo(me.map.getCenter());
-                        });
-                    } else {
-                        map.div.appendChild(container);
-                        cache.googleControl.appendChild(map.viewPortDiv);
-                        google.maps.event.trigger(this.mapObject, 'resize');
-                    }
-                }
-                this.mapObject.setMapTypeId(type);                
-            } else if (cache.googleControl.hasChildNodes()) {
-                map.div.appendChild(map.viewPortDiv);
-                map.div.removeChild(container);
-            }
-        }
-    },
-    
-    /**
-     * Method: getMapContainer
-     * 
-     * Returns:
-     * {DOMElement} the GMap container's div
-     */
-    getMapContainer: function() {
-        return this.mapObject.getDiv();
-    },
-    
-  //
-  // TRANSLATION: MapObject Bounds <-> OpenLayers.Bounds
-  //
-
-    /**
-     * APIMethod: getMapObjectBoundsFromOLBounds
-     * 
-     * Parameters:
-     * olBounds - {<OpenLayers.Bounds>}
-     * 
-     * Returns:
-     * {Object} A MapObject Bounds, translated from olBounds
-     *          Returns null if null value is passed in
-     */
-    getMapObjectBoundsFromOLBounds: function(olBounds) {
-        var moBounds = null;
-        if (olBounds != null) {
-            var sw = this.sphericalMercator ? 
-              this.inverseMercator(olBounds.bottom, olBounds.left) : 
-              new OpenLayers.LonLat(olBounds.bottom, olBounds.left);
-            var ne = this.sphericalMercator ? 
-              this.inverseMercator(olBounds.top, olBounds.right) : 
-              new OpenLayers.LonLat(olBounds.top, olBounds.right);
-            moBounds = new google.maps.LatLngBounds(
-                new google.maps.LatLng(sw.lat, sw.lon),
-                new google.maps.LatLng(ne.lat, ne.lon)
-            );
-        }
-        return moBounds;
-    },
-
-
-    /************************************
-     *                                  *
-     *   MapObject Interface Controls   *
-     *                                  *
-     ************************************/
-
-
-  // LonLat - Pixel Translation
-  
-    /**
-     * APIMethod: getMapObjectLonLatFromMapObjectPixel
-     * 
-     * Parameters:
-     * moPixel - {Object} MapObject Pixel format
-     * 
-     * Returns:
-     * {Object} MapObject LonLat translated from MapObject Pixel
-     */
-    getMapObjectLonLatFromMapObjectPixel: function(moPixel) {
-        var size = this.map.getSize();
-        var lon = this.getLongitudeFromMapObjectLonLat(this.mapObject.center);
-        var lat = this.getLatitudeFromMapObjectLonLat(this.mapObject.center);
-        var res = this.map.getResolution();
-
-        var delta_x = moPixel.x - (size.w / 2);
-        var delta_y = moPixel.y - (size.h / 2);
-    
-        var lonlat = new OpenLayers.LonLat(
-            lon + delta_x * res,
-            lat - delta_y * res
-        ); 
-
-        if (this.wrapDateLine) {
-            lonlat = lonlat.wrapDateLine(this.maxExtent);
-        }
-        return this.getMapObjectLonLatFromLonLat(lonlat.lon, lonlat.lat);
-    },
-
-    /**
-     * APIMethod: getMapObjectPixelFromMapObjectLonLat
-     * 
-     * Parameters:
-     * moLonLat - {Object} MapObject LonLat format
-     * 
-     * Returns:
-     * {Object} MapObject Pixel transtlated from MapObject LonLat
-     */
-    getMapObjectPixelFromMapObjectLonLat: function(moLonLat) {
-        var lon = this.getLongitudeFromMapObjectLonLat(moLonLat);
-        var lat = this.getLatitudeFromMapObjectLonLat(moLonLat);
-        var res = this.map.getResolution();
-        var extent = this.map.getExtent();
-        return this.getMapObjectPixelFromXY((1/res * (lon - extent.left)),
-                                            (1/res * (extent.top - lat)));
-    },
-
-  
-    /** 
-     * APIMethod: setMapObjectCenter
-     * Set the mapObject to the specified center and zoom
-     * 
-     * Parameters:
-     * center - {Object} MapObject LonLat format
-     * zoom - {int} MapObject zoom format
-     */
-    setMapObjectCenter: function(center, zoom) {
-        if (this.animationEnabled === false && zoom != this.mapObject.zoom) {
-            var mapContainer = this.getMapContainer();
-            google.maps.event.addListenerOnce(
-                this.mapObject, 
-                "idle", 
-                function() {
-                    mapContainer.style.visibility = "";
-                }
-            );
-            mapContainer.style.visibility = "hidden";
-        }
-        this.mapObject.setOptions({
-            center: center,
-            zoom: zoom
-        });
-    },
-   
-    
-  // Bounds
-  
-    /** 
-     * APIMethod: getMapObjectZoomFromMapObjectBounds
-     * 
-     * Parameters:
-     * moBounds - {Object} MapObject Bounds format
-     * 
-     * Returns:
-     * {Object} MapObject Zoom for specified MapObject Bounds
-     */
-    getMapObjectZoomFromMapObjectBounds: function(moBounds) {
-        return this.mapObject.getBoundsZoomLevel(moBounds);
-    },
-
-    /************************************
-     *                                  *
-     *       MapObject Primitives       *
-     *                                  *
-     ************************************/
-
-
-  // LonLat
-    
-    /**
-     * APIMethod: getMapObjectLonLatFromLonLat
-     * 
-     * Parameters:
-     * lon - {Float}
-     * lat - {Float}
-     * 
-     * Returns:
-     * {Object} MapObject LonLat built from lon and lat params
-     */
-    getMapObjectLonLatFromLonLat: function(lon, lat) {
-        var gLatLng;
-        if(this.sphericalMercator) {
-            var lonlat = this.inverseMercator(lon, lat);
-            gLatLng = new google.maps.LatLng(lonlat.lat, lonlat.lon);
-        } else {
-            gLatLng = new google.maps.LatLng(lat, lon);
-        }
-        return gLatLng;
-    },
-    
-  // Pixel
-    
-    /**
-     * APIMethod: getMapObjectPixelFromXY
-     * 
-     * Parameters:
-     * x - {Integer}
-     * y - {Integer}
-     * 
-     * Returns:
-     * {Object} MapObject Pixel from x and y parameters
-     */
-    getMapObjectPixelFromXY: function(x, y) {
-        return new google.maps.Point(x, y);
-    }
-    
-};
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/Grid.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/Grid.js
deleted file mode 100644
index a94075f1..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/Grid.js
+++ /dev/null
@@ -1,1343 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-
-/**
- * @requires OpenLayers/Layer/HTTPRequest.js
- * @requires OpenLayers/Tile/Image.js
- */
-
-/**
- * Class: OpenLayers.Layer.Grid
- * Base class for layers that use a lattice of tiles.  Create a new grid
- * layer with the <OpenLayers.Layer.Grid> constructor.
- *
- * Inherits from:
- *  - <OpenLayers.Layer.HTTPRequest>
- */
-OpenLayers.Layer.Grid = OpenLayers.Class(OpenLayers.Layer.HTTPRequest, {
-    
-    /**
-     * APIProperty: tileSize
-     * {<OpenLayers.Size>}
-     */
-    tileSize: null,
-
-    /**
-     * Property: tileOriginCorner
-     * {String} If the <tileOrigin> property is not provided, the tile origin 
-     *     will be derived from the layer's <maxExtent>.  The corner of the 
-     *     <maxExtent> used is determined by this property.  Acceptable values
-     *     are "tl" (top left), "tr" (top right), "bl" (bottom left), and "br"
-     *     (bottom right).  Default is "bl".
-     */
-    tileOriginCorner: "bl",
-    
-    /**
-     * APIProperty: tileOrigin
-     * {<OpenLayers.LonLat>} Optional origin for aligning the grid of tiles.
-     *     If provided, requests for tiles at all resolutions will be aligned
-     *     with this location (no tiles shall overlap this location).  If
-     *     not provided, the grid of tiles will be aligned with the layer's
-     *     <maxExtent>.  Default is ``null``.
-     */
-    tileOrigin: null,
-    
-    /** APIProperty: tileOptions
-     *  {Object} optional configuration options for <OpenLayers.Tile> instances
-     *  created by this Layer, if supported by the tile class.
-     */
-    tileOptions: null,
-
-    /**
-     * APIProperty: tileClass
-     * {<OpenLayers.Tile>} The tile class to use for this layer.
-     *     Defaults is OpenLayers.Tile.Image.
-     */
-    tileClass: OpenLayers.Tile.Image,
-    
-    /**
-     * Property: grid
-     * {Array(Array(<OpenLayers.Tile>))} This is an array of rows, each row is 
-     *     an array of tiles.
-     */
-    grid: null,
-
-    /**
-     * APIProperty: singleTile
-     * {Boolean} Moves the layer into single-tile mode, meaning that one tile 
-     *     will be loaded. The tile's size will be determined by the 'ratio'
-     *     property. When the tile is dragged such that it does not cover the 
-     *     entire viewport, it is reloaded.
-     */
-    singleTile: false,
-
-    /** APIProperty: ratio
-     *  {Float} Used only when in single-tile mode, this specifies the 
-     *          ratio of the size of the single tile to the size of the map.
-     *          Default value is 1.5.
-     */
-    ratio: 1.5,
-
-    /**
-     * APIProperty: buffer
-     * {Integer} Used only when in gridded mode, this specifies the number of 
-     *           extra rows and colums of tiles on each side which will
-     *           surround the minimum grid tiles to cover the map.
-     *           For very slow loading layers, a larger value may increase
-     *           performance somewhat when dragging, but will increase bandwidth
-     *           use significantly. 
-     */
-    buffer: 0,
-
-    /**
-     * APIProperty: transitionEffect
-     * {String} The transition effect to use when the map is zoomed.
-     * Two posible values:
-     *
-     * "resize" - Existing tiles are resized on zoom to provide a visual
-     *     effect of the zoom having taken place immediately.  As the
-     *     new tiles become available, they are drawn on top of the
-     *     resized tiles (this is the default setting).
-     * "map-resize" - Existing tiles are resized on zoom and placed below the
-     *     base layer.  New tiles for the base layer will cover existing tiles.
-     *     This setting is recommended when having an overlay duplicated during
-     *     the transition is undesirable (e.g. street labels or big transparent
-     *     fills). 
-     * null - No transition effect.
-     *
-     * Using "resize" on non-opaque layers can cause undesired visual
-     * effects.  Set transitionEffect to null in this case.
-     */
-    transitionEffect: "resize",
-
-    /**
-     * APIProperty: numLoadingTiles
-     * {Integer} How many tiles are still loading?
-     */
-    numLoadingTiles: 0,
-
-    /**
-     * Property: serverResolutions
-     * {Array(Number}} This property is documented in subclasses as
-     *     an API property.
-     */
-    serverResolutions: null,
-
-    /**
-     * Property: loading
-     * {Boolean} Indicates if tiles are being loaded.
-     */
-    loading: false,
-    
-    /**
-     * Property: backBuffer
-     * {DOMElement} The back buffer.
-     */
-    backBuffer: null,
-
-    /**
-     * Property: gridResolution
-     * {Number} The resolution of the current grid. Used for backbuffer and
-     *     client zoom. This property is updated every time the grid is
-     *     initialized.
-     */
-    gridResolution: null,
-
-    /**
-     * Property: backBufferResolution
-     * {Number} The resolution of the current back buffer. This property is
-     *     updated each time a back buffer is created.
-     */
-    backBufferResolution: null,
-
-    /**
-     * Property: backBufferLonLat
-     * {Object} The top-left corner of the current back buffer. Includes lon
-     *     and lat properties. This object is updated each time a back buffer
-     *     is created.
-     */
-    backBufferLonLat: null,
-
-    /**
-     * Property: backBufferTimerId
-     * {Number} The id of the back buffer timer. This timer is used to
-     *     delay the removal of the back buffer, thereby preventing
-     *     flash effects caused by tile animation.
-     */
-    backBufferTimerId: null,
-
-    /**
-     * APIProperty: removeBackBufferDelay
-     * {Number} Delay for removing the backbuffer when all tiles have finished
-     *     loading. Can be set to 0 when no css opacity transitions for the
-     *     olTileImage class are used. Default is 0 for <singleTile> layers,
-     *     2500 for tiled layers. See <className> for more information on
-     *     tile animation.
-     */
-    removeBackBufferDelay: null,
-
-    /**
-     * APIProperty: className
-     * {String} Name of the class added to the layer div. If not set in the
-     *     options passed to the constructor then className defaults to
-     *     "olLayerGridSingleTile" for single tile layers (see <singleTile>),
-     *     and "olLayerGrid" for non single tile layers.
-     *
-     * Note:
-     *
-     * The displaying of tiles is not animated by default for single tile
-     *     layers - OpenLayers' default theme (style.css) includes this:
-     * (code)
-     * .olLayerGrid .olTileImage {
-     *     -webkit-transition: opacity 0.2s linear;
-     *     -moz-transition: opacity 0.2s linear;
-     *     -o-transition: opacity 0.2s linear;
-     *     transition: opacity 0.2s linear;
-     *  }
-     * (end)
-     * To animate tile displaying for any grid layer the following
-     *     CSS rule can be used:
-     * (code)
-     * .olTileImage {
-     *     -webkit-transition: opacity 0.2s linear;
-     *     -moz-transition: opacity 0.2s linear;
-     *     -o-transition: opacity 0.2s linear;
-     *     transition: opacity 0.2s linear;
-     * }
-     * (end)
-     * In that case, to avoid flash effects, <removeBackBufferDelay>
-     *     should not be zero.
-     */
-    className: null,
-    
-    /**
-     * Register a listener for a particular event with the following syntax:
-     * (code)
-     * layer.events.register(type, obj, listener);
-     * (end)
-     *
-     * Listeners will be called with a reference to an event object.  The
-     *     properties of this event depends on exactly what happened.
-     *
-     * All event objects have at least the following properties:
-     * object - {Object} A reference to layer.events.object.
-     * element - {DOMElement} A reference to layer.events.element.
-     *
-     * Supported event types:
-     * addtile - Triggered when a tile is added to this layer. Listeners receive
-     *     an object as first argument, which has a tile property that
-     *     references the tile that has been added.
-     * tileloadstart - Triggered when a tile starts loading. Listeners receive
-     *     an object as first argument, which has a tile property that
-     *     references the tile that starts loading.
-     * tileloaded - Triggered when each new tile is
-     *     loaded, as a means of progress update to listeners.
-     *     listeners can access 'numLoadingTiles' if they wish to keep
-     *     track of the loading progress. Listeners are called with an object
-     *     with a 'tile' property as first argument, making the loaded tile
-     *     available to the listener, and an 'aborted' property, which will be
-     *     true when loading was aborted and no tile data is available.
-     * tileerror - Triggered before the tileloaded event (i.e. when the tile is
-     *     still hidden) if a tile failed to load. Listeners receive an object
-     *     as first argument, which has a tile property that references the
-     *     tile that could not be loaded.
-     * retile - Triggered when the layer recreates its tile grid.
-     */
-
-    /**
-     * Property: gridLayout
-     * {Object} Object containing properties tilelon, tilelat, startcol,
-     * startrow
-     */
-    gridLayout: null,
-    
-    /**
-     * Property: rowSign
-     * {Number} 1 for grids starting at the top, -1 for grids starting at the
-     * bottom. This is used for several grid index and offset calculations.
-     */
-    rowSign: null,
-
-    /**
-     * Property: transitionendEvents
-     * {Array} Event names for transitionend
-     */
-    transitionendEvents: [
-        'transitionend', 'webkitTransitionEnd', 'otransitionend',
-        'oTransitionEnd'
-    ],
-
-    /**
-     * Constructor: OpenLayers.Layer.Grid
-     * Create a new grid layer
-     *
-     * Parameters:
-     * name - {String}
-     * url - {String}
-     * params - {Object}
-     * options - {Object} Hashtable of extra options to tag onto the layer
-     */
-    initialize: function(name, url, params, options) {
-        OpenLayers.Layer.HTTPRequest.prototype.initialize.apply(this, 
-                                                                arguments);
-        this.grid = [];
-        this._removeBackBuffer = OpenLayers.Function.bind(this.removeBackBuffer, this);
-
-        this.initProperties();
-
-        this.rowSign = this.tileOriginCorner.substr(0, 1) === "t" ? 1 : -1;
-    },
-
-    /**
-     * Method: initProperties
-     * Set any properties that depend on the value of singleTile.
-     * Currently sets removeBackBufferDelay and className
-     */
-    initProperties: function() {
-        if (this.options.removeBackBufferDelay === undefined) {
-            this.removeBackBufferDelay = this.singleTile ? 0 : 2500;
-        }
-
-        if (this.options.className === undefined) {
-            this.className = this.singleTile ? 'olLayerGridSingleTile' :
-                                               'olLayerGrid';
-        }
-    },
-
-    /**
-     * Method: setMap
-     *
-     * Parameters:
-     * map - {<OpenLayers.Map>} The map.
-     */
-    setMap: function(map) {
-        OpenLayers.Layer.HTTPRequest.prototype.setMap.call(this, map);
-        OpenLayers.Element.addClass(this.div, this.className);
-    },
-
-    /**
-     * Method: removeMap
-     * Called when the layer is removed from the map.
-     *
-     * Parameters:
-     * map - {<OpenLayers.Map>} The map.
-     */
-    removeMap: function(map) {
-        this.removeBackBuffer();
-    },
-
-    /**
-     * APIMethod: destroy
-     * Deconstruct the layer and clear the grid.
-     */
-    destroy: function() {
-        this.removeBackBuffer();
-        this.clearGrid();
-
-        this.grid = null;
-        this.tileSize = null;
-        OpenLayers.Layer.HTTPRequest.prototype.destroy.apply(this, arguments); 
-    },
-
-    /**
-     * APIMethod: mergeNewParams
-     * Refetches tiles with new params merged, keeping a backbuffer. Each
-     * loading new tile will have a css class of '.olTileReplacing'. If a
-     * stylesheet applies a 'display: none' style to that class, any fade-in
-     * transition will not apply, and backbuffers for each tile will be removed
-     * as soon as the tile is loaded.
-     * 
-     * Parameters:
-     * newParams - {Object}
-     *
-     * Returns:
-     * redrawn: {Boolean} whether the layer was actually redrawn.
-     */
-
-    /**
-     * Method: clearGrid
-     * Go through and remove all tiles from the grid, calling
-     *    destroy() on each of them to kill circular references
-     */
-    clearGrid:function() {
-        if (this.grid) {
-            for(var iRow=0, len=this.grid.length; iRow<len; iRow++) {
-                var row = this.grid[iRow];
-                for(var iCol=0, clen=row.length; iCol<clen; iCol++) {
-                    var tile = row[iCol];
-                    this.destroyTile(tile);
-                }
-            }
-            this.grid = [];
-            this.gridResolution = null;
-            this.gridLayout = null;
-        }
-    },
-
-   /**
-    * APIMethod: addOptions
-    * 
-    * Parameters:
-    * newOptions - {Object}
-    * reinitialize - {Boolean} If set to true, and if resolution options of the
-    *     current baseLayer were changed, the map will be recentered to make
-    *     sure that it is displayed with a valid resolution, and a
-    *     changebaselayer event will be triggered.
-    */
-    addOptions: function (newOptions, reinitialize) {
-        var singleTileChanged = newOptions.singleTile !== undefined && 
-            newOptions.singleTile !== this.singleTile;
-        OpenLayers.Layer.HTTPRequest.prototype.addOptions.apply(this, arguments);
-        if (this.map && singleTileChanged) {
-            this.initProperties();
-            this.clearGrid();
-            this.tileSize = this.options.tileSize;
-            this.setTileSize();
-            this.moveTo(null, true);
-        }
-    },
-    
-    /**
-     * APIMethod: clone
-     * Create a clone of this layer
-     *
-     * Parameters:
-     * obj - {Object} Is this ever used?
-     * 
-     * Returns:
-     * {<OpenLayers.Layer.Grid>} An exact clone of this OpenLayers.Layer.Grid
-     */
-    clone: function (obj) {
-        
-        if (obj == null) {
-            obj = new OpenLayers.Layer.Grid(this.name,
-                                            this.url,
-                                            this.params,
-                                            this.getOptions());
-        }
-
-        //get all additions from superclasses
-        obj = OpenLayers.Layer.HTTPRequest.prototype.clone.apply(this, [obj]);
-
-        // copy/set any non-init, non-simple values here
-        if (this.tileSize != null) {
-            obj.tileSize = this.tileSize.clone();
-        }
-        
-        // we do not want to copy reference to grid, so we make a new array
-        obj.grid = [];
-        obj.gridResolution = null;
-        // same for backbuffer
-        obj.backBuffer = null;
-        obj.backBufferTimerId = null;
-        obj.loading = false;
-        obj.numLoadingTiles = 0;
-
-        return obj;
-    },    
-
-    /**
-     * Method: moveTo
-     * This function is called whenever the map is moved. All the moving
-     * of actual 'tiles' is done by the map, but moveTo's role is to accept
-     * a bounds and make sure the data that that bounds requires is pre-loaded.
-     *
-     * Parameters:
-     * bounds - {<OpenLayers.Bounds>}
-     * zoomChanged - {Boolean}
-     * dragging - {Boolean}
-     */
-    moveTo:function(bounds, zoomChanged, dragging) {
-
-        OpenLayers.Layer.HTTPRequest.prototype.moveTo.apply(this, arguments);
-
-        bounds = bounds || this.map.getExtent();
-
-        if (bounds != null) {
-             
-            // if grid is empty or zoom has changed, we *must* re-tile
-            var forceReTile = !this.grid.length || zoomChanged;
-            
-            // total bounds of the tiles
-            var tilesBounds = this.getTilesBounds();            
-
-            // the new map resolution
-            var resolution = this.map.getResolution();
-
-            // the server-supported resolution for the new map resolution
-            var serverResolution = this.getServerResolution(resolution);
-
-            if (this.singleTile) {
-                
-                // We want to redraw whenever even the slightest part of the 
-                //  current bounds is not contained by our tile.
-                //  (thus, we do not specify partial -- its default is false)
-
-                if ( forceReTile ||
-                     (!dragging && !tilesBounds.containsBounds(bounds))) {
-
-                    // In single tile mode with no transition effect, we insert
-                    // a non-scaled backbuffer when the layer is moved. But if
-                    // a zoom occurs right after a move, i.e. before the new
-                    // image is received, we need to remove the backbuffer, or
-                    // an ill-positioned image will be visible during the zoom
-                    // transition.
-
-                    if(zoomChanged && this.transitionEffect !== 'resize') {
-                        this.removeBackBuffer();
-                    }
-
-                    if(!zoomChanged || this.transitionEffect === 'resize') {
-                        this.applyBackBuffer(resolution);
-                    }
-
-                    this.initSingleTile(bounds);
-                }
-            } else {
-
-                // if the bounds have changed such that they are not even 
-                // *partially* contained by our tiles (e.g. when user has 
-                // programmatically panned to the other side of the earth on
-                // zoom level 18), then moveGriddedTiles could potentially have
-                // to run through thousands of cycles, so we want to reTile
-                // instead (thus, partial true).  
-                forceReTile = forceReTile ||
-                    !tilesBounds.intersectsBounds(bounds, {
-                        worldBounds: this.map.baseLayer.wrapDateLine &&
-                            this.map.getMaxExtent()
-                    });
-
-                if(forceReTile) {
-                    if(zoomChanged && (this.transitionEffect === 'resize' ||
-                                          this.gridResolution === resolution)) {
-                        this.applyBackBuffer(resolution);
-                    }
-                    this.initGriddedTiles(bounds);
-                } else {
-                    this.moveGriddedTiles();
-                }
-            }
-        }
-    },
-
-    /**
-     * Method: getTileData
-     * Given a map location, retrieve a tile and the pixel offset within that
-     *     tile corresponding to the location.  If there is not an existing 
-     *     tile in the grid that covers the given location, null will be 
-     *     returned.
-     *
-     * Parameters:
-     * loc - {<OpenLayers.LonLat>} map location
-     *
-     * Returns:
-     * {Object} Object with the following properties: tile ({<OpenLayers.Tile>}),
-     *     i ({Number} x-pixel offset from top left), and j ({Integer} y-pixel
-     *     offset from top left).
-     */
-    getTileData: function(loc) {
-        var data = null,
-            x = loc.lon,
-            y = loc.lat,
-            numRows = this.grid.length;
-
-        if (this.map && numRows) {
-            var res = this.map.getResolution(),
-                tileWidth = this.tileSize.w,
-                tileHeight = this.tileSize.h,
-                bounds = this.grid[0][0].bounds,
-                left = bounds.left,
-                top = bounds.top;
-
-            if (x < left) {
-                // deal with multiple worlds
-                if (this.map.baseLayer.wrapDateLine) {
-                    var worldWidth = this.map.getMaxExtent().getWidth();
-                    var worldsAway = Math.ceil((left - x) / worldWidth);
-                    x += worldWidth * worldsAway;
-                }
-            }
-            // tile distance to location (fractional number of tiles);
-            var dtx = (x - left) / (res * tileWidth);
-            var dty = (top - y) / (res * tileHeight);
-            // index of tile in grid
-            var col = Math.floor(dtx);
-            var row = Math.floor(dty);
-            if (row >= 0 && row < numRows) {
-                var tile = this.grid[row][col];
-                if (tile) {
-                    data = {
-                        tile: tile,
-                        // pixel index within tile
-                        i: Math.floor((dtx - col) * tileWidth),
-                        j: Math.floor((dty - row) * tileHeight)
-                    };                    
-                }
-            }
-        }
-        return data;
-    },
-    
-    /**
-     * Method: destroyTile
-     *
-     * Parameters:
-     * tile - {<OpenLayers.Tile>}
-     */
-    destroyTile: function(tile) {
-        this.removeTileMonitoringHooks(tile);
-        tile.destroy();
-    },
-
-    /**
-     * Method: getServerResolution
-     * Return the closest server-supported resolution.
-     *
-     * Parameters:
-     * resolution - {Number} The base resolution. If undefined the
-     *     map resolution is used.
-     *
-     * Returns:
-     * {Number} The closest server resolution value.
-     */
-    getServerResolution: function(resolution) {
-        var distance = Number.POSITIVE_INFINITY;
-        resolution = resolution || this.map.getResolution();
-        if(this.serverResolutions &&
-           OpenLayers.Util.indexOf(this.serverResolutions, resolution) === -1) {
-            var i, newDistance, newResolution, serverResolution;
-            for(i=this.serverResolutions.length-1; i>= 0; i--) {
-                newResolution = this.serverResolutions[i];
-                newDistance = Math.abs(newResolution - resolution);
-                if (newDistance > distance) {
-                    break;
-                }
-                distance = newDistance;
-                serverResolution = newResolution;
-            }
-            resolution = serverResolution;
-        }
-        return resolution;
-    },
-
-    /**
-     * Method: getServerZoom
-     * Return the zoom value corresponding to the best matching server
-     * resolution, taking into account <serverResolutions> and <zoomOffset>.
-     *
-     * Returns:
-     * {Number} The closest server supported zoom. This is not the map zoom
-     *     level, but an index of the server's resolutions array.
-     */
-    getServerZoom: function() {
-        var resolution = this.getServerResolution();
-        return this.serverResolutions ?
-            OpenLayers.Util.indexOf(this.serverResolutions, resolution) :
-            this.map.getZoomForResolution(resolution) + (this.zoomOffset || 0);
-    },
-
-    /**
-     * Method: applyBackBuffer
-     * Create, insert, scale and position a back buffer for the layer.
-     *
-     * Parameters:
-     * resolution - {Number} The resolution to transition to.
-     */
-    applyBackBuffer: function(resolution) {
-        if(this.backBufferTimerId !== null) {
-            this.removeBackBuffer();
-        }
-        var backBuffer = this.backBuffer;
-        if(!backBuffer) {
-            backBuffer = this.createBackBuffer();
-            if(!backBuffer) {
-                return;
-            }
-            if (resolution === this.gridResolution) {
-                this.div.insertBefore(backBuffer, this.div.firstChild);
-            } else {
-                this.map.baseLayer.div.parentNode.insertBefore(backBuffer, this.map.baseLayer.div);
-            }
-            this.backBuffer = backBuffer;
-
-            // set some information in the instance for subsequent
-            // calls to applyBackBuffer where the same back buffer
-            // is reused
-            var topLeftTileBounds = this.grid[0][0].bounds;
-            this.backBufferLonLat = {
-                lon: topLeftTileBounds.left,
-                lat: topLeftTileBounds.top
-            };
-            this.backBufferResolution = this.gridResolution;
-        }
-        
-        var ratio = this.backBufferResolution / resolution;
-
-        // scale the tiles inside the back buffer
-        var tiles = backBuffer.childNodes, tile;
-        for (var i=tiles.length-1; i>=0; --i) {
-            tile = tiles[i];
-            tile.style.top = ((ratio * tile._i * tile._h) | 0) + 'px';
-            tile.style.left = ((ratio * tile._j * tile._w) | 0) + 'px';
-            tile.style.width = Math.round(ratio * tile._w) + 'px';
-            tile.style.height = Math.round(ratio * tile._h) + 'px';
-        }
-
-        // and position it (based on the grid's top-left corner)
-        var position = this.getViewPortPxFromLonLat(
-                this.backBufferLonLat, resolution);
-        var leftOffset = this.map.layerContainerOriginPx.x;
-        var topOffset = this.map.layerContainerOriginPx.y;
-        backBuffer.style.left = Math.round(position.x - leftOffset) + 'px';
-        backBuffer.style.top = Math.round(position.y - topOffset) + 'px';
-    },
-
-    /**
-     * Method: createBackBuffer
-     * Create a back buffer.
-     *
-     * Returns:
-     * {DOMElement} The DOM element for the back buffer, undefined if the
-     * grid isn't initialized yet.
-     */
-    createBackBuffer: function() {
-        var backBuffer;
-        if(this.grid.length > 0) {
-            backBuffer = document.createElement('div');
-            backBuffer.id = this.div.id + '_bb';
-            backBuffer.className = 'olBackBuffer';
-            backBuffer.style.position = 'absolute';
-            var map = this.map;
-            backBuffer.style.zIndex = this.transitionEffect === 'resize' ?
-                    this.getZIndex() - 1 :
-                    // 'map-resize':
-                    map.Z_INDEX_BASE.BaseLayer -
-                            (map.getNumLayers() - map.getLayerIndex(this));
-            for(var i=0, lenI=this.grid.length; i<lenI; i++) {
-                for(var j=0, lenJ=this.grid[i].length; j<lenJ; j++) {
-                    var tile = this.grid[i][j],
-                        markup = this.grid[i][j].createBackBuffer();
-                    if (markup) {
-                        markup._i = i;
-                        markup._j = j;
-                        markup._w = tile.size.w;
-                        markup._h = tile.size.h;
-                        markup.id = tile.id + '_bb';
-                        backBuffer.appendChild(markup);
-                    }
-                }
-            }
-        }
-        return backBuffer;
-    },
-
-    /**
-     * Method: removeBackBuffer
-     * Remove back buffer from DOM.
-     */
-    removeBackBuffer: function() {
-        if (this._transitionElement) {
-            for (var i=this.transitionendEvents.length-1; i>=0; --i) {
-                OpenLayers.Event.stopObserving(this._transitionElement,
-                    this.transitionendEvents[i], this._removeBackBuffer);
-            }
-            delete this._transitionElement;
-        }
-        if(this.backBuffer) {
-            if (this.backBuffer.parentNode) {
-                this.backBuffer.parentNode.removeChild(this.backBuffer);
-            }
-            this.backBuffer = null;
-            this.backBufferResolution = null;
-            if(this.backBufferTimerId !== null) {
-                window.clearTimeout(this.backBufferTimerId);
-                this.backBufferTimerId = null;
-            }
-        }
-    },
-
-    /**
-     * Method: moveByPx
-     * Move the layer based on pixel vector.
-     *
-     * Parameters:
-     * dx - {Number}
-     * dy - {Number}
-     */
-    moveByPx: function(dx, dy) {
-        if (!this.singleTile) {
-            this.moveGriddedTiles();
-        }
-    },
-
-    /**
-     * APIMethod: setTileSize
-     * Check if we are in singleTile mode and if so, set the size as a ratio
-     *     of the map size (as specified by the layer's 'ratio' property).
-     * 
-     * Parameters:
-     * size - {<OpenLayers.Size>}
-     */
-    setTileSize: function(size) { 
-        if (this.singleTile) {
-            size = this.map.getSize();
-            size.h = parseInt(size.h * this.ratio, 10);
-            size.w = parseInt(size.w * this.ratio, 10);
-        } 
-        OpenLayers.Layer.HTTPRequest.prototype.setTileSize.apply(this, [size]);
-    },
-
-    /**
-     * APIMethod: getTilesBounds
-     * Return the bounds of the tile grid.
-     *
-     * Returns:
-     * {<OpenLayers.Bounds>} A Bounds object representing the bounds of all the
-     *     currently loaded tiles (including those partially or not at all seen 
-     *     onscreen).
-     */
-    getTilesBounds: function() {    
-        var bounds = null; 
-        
-        var length = this.grid.length;
-        if (length) {
-            var bottomLeftTileBounds = this.grid[length - 1][0].bounds,
-                width = this.grid[0].length * bottomLeftTileBounds.getWidth(),
-                height = this.grid.length * bottomLeftTileBounds.getHeight();
-            
-            bounds = new OpenLayers.Bounds(bottomLeftTileBounds.left, 
-                                           bottomLeftTileBounds.bottom,
-                                           bottomLeftTileBounds.left + width, 
-                                           bottomLeftTileBounds.bottom + height);
-        }   
-        return bounds;
-    },
-
-    /**
-     * Method: initSingleTile
-     * 
-     * Parameters: 
-     * bounds - {<OpenLayers.Bounds>}
-     */
-    initSingleTile: function(bounds) {
-        this.events.triggerEvent("retile");
-
-        //determine new tile bounds
-        var center = bounds.getCenterLonLat();
-        var tileWidth = bounds.getWidth() * this.ratio;
-        var tileHeight = bounds.getHeight() * this.ratio;
-                                       
-        var tileBounds = 
-            new OpenLayers.Bounds(center.lon - (tileWidth/2),
-                                  center.lat - (tileHeight/2),
-                                  center.lon + (tileWidth/2),
-                                  center.lat + (tileHeight/2));
-  
-        var px = this.map.getLayerPxFromLonLat({
-            lon: tileBounds.left,
-            lat: tileBounds.top
-        });
-
-        if (!this.grid.length) {
-            this.grid[0] = [];
-        }
-
-        var tile = this.grid[0][0];
-        if (!tile) {
-            tile = this.addTile(tileBounds, px);
-            
-            this.addTileMonitoringHooks(tile);
-            tile.draw();
-            this.grid[0][0] = tile;
-        } else {
-            tile.moveTo(tileBounds, px);
-        }           
-        
-        //remove all but our single tile
-        this.removeExcessTiles(1,1);
-
-        // store the resolution of the grid
-        this.gridResolution = this.getServerResolution();
-    },
-
-    /** 
-     * Method: calculateGridLayout
-     * Generate parameters for the grid layout.
-     *
-     * Parameters:
-     * bounds - {<OpenLayers.Bound>|Object} OpenLayers.Bounds or an
-     *     object with a 'left' and 'top' properties.
-     * origin - {<OpenLayers.LonLat>|Object} OpenLayers.LonLat or an
-     *     object with a 'lon' and 'lat' properties.
-     * resolution - {Number}
-     *
-     * Returns:
-     * {Object} Object containing properties tilelon, tilelat, startcol,
-     * startrow
-     */
-    calculateGridLayout: function(bounds, origin, resolution) {
-        var tilelon = resolution * this.tileSize.w;
-        var tilelat = resolution * this.tileSize.h;
-        
-        var offsetlon = bounds.left - origin.lon;
-        var tilecol = Math.floor(offsetlon/tilelon) - this.buffer;
-        
-        var rowSign = this.rowSign;
-
-        var offsetlat = rowSign * (origin.lat - bounds.top + tilelat);  
-        var tilerow = Math[~rowSign ? 'floor' : 'ceil'](offsetlat/tilelat) - this.buffer * rowSign;
-        
-        return { 
-          tilelon: tilelon, tilelat: tilelat,
-          startcol: tilecol, startrow: tilerow
-        };
-
-    },
-    
-    /**
-     * Method: getTileOrigin
-     * Determine the origin for aligning the grid of tiles.  If a <tileOrigin>
-     *     property is supplied, that will be returned.  Otherwise, the origin
-     *     will be derived from the layer's <maxExtent> property.  In this case,
-     *     the tile origin will be the corner of the <maxExtent> given by the 
-     *     <tileOriginCorner> property.
-     *
-     * Returns:
-     * {<OpenLayers.LonLat>} The tile origin.
-     */
-    getTileOrigin: function() {
-        var origin = this.tileOrigin;
-        if (!origin) {
-            var extent = this.getMaxExtent();
-            var edges = ({
-                "tl": ["left", "top"],
-                "tr": ["right", "top"],
-                "bl": ["left", "bottom"],
-                "br": ["right", "bottom"]
-            })[this.tileOriginCorner];
-            origin = new OpenLayers.LonLat(extent[edges[0]], extent[edges[1]]);
-        }
-        return origin;
-    },
-
-    /**
-     * Method: getTileBoundsForGridIndex
-     *
-     * Parameters:
-     * row - {Number} The row of the grid
-     * col - {Number} The column of the grid
-     *
-     * Returns:
-     * {<OpenLayers.Bounds>} The bounds for the tile at (row, col)
-     */
-    getTileBoundsForGridIndex: function(row, col) {
-        var origin = this.getTileOrigin();
-        var tileLayout = this.gridLayout;
-        var tilelon = tileLayout.tilelon;
-        var tilelat = tileLayout.tilelat;
-        var startcol = tileLayout.startcol;
-        var startrow = tileLayout.startrow;
-        var rowSign = this.rowSign;
-        return new OpenLayers.Bounds(
-            origin.lon + (startcol + col) * tilelon,
-            origin.lat - (startrow + row * rowSign) * tilelat * rowSign,
-            origin.lon + (startcol + col + 1) * tilelon,
-            origin.lat - (startrow + (row - 1) * rowSign) * tilelat * rowSign
-        );
-    },
-
-    /**
-     * Method: initGriddedTiles
-     * 
-     * Parameters:
-     * bounds - {<OpenLayers.Bounds>}
-     */
-    initGriddedTiles:function(bounds) {
-        this.events.triggerEvent("retile");
-
-        // work out mininum number of rows and columns; this is the number of
-        // tiles required to cover the viewport plus at least one for panning
-
-        var viewSize = this.map.getSize();
-        
-        var origin = this.getTileOrigin();
-        var resolution = this.map.getResolution(),
-            serverResolution = this.getServerResolution(),
-            ratio = resolution / serverResolution,
-            tileSize = {
-                w: this.tileSize.w / ratio,
-                h: this.tileSize.h / ratio
-            };
-
-        var minRows = Math.ceil(viewSize.h/tileSize.h) + 
-                      2 * this.buffer + 1;
-        var minCols = Math.ceil(viewSize.w/tileSize.w) +
-                      2 * this.buffer + 1;
-
-        var tileLayout = this.calculateGridLayout(bounds, origin, serverResolution);
-        this.gridLayout = tileLayout;
-        
-        var tilelon = tileLayout.tilelon;
-        var tilelat = tileLayout.tilelat;
-        
-        var layerContainerDivLeft = this.map.layerContainerOriginPx.x;
-        var layerContainerDivTop = this.map.layerContainerOriginPx.y;
-
-        var tileBounds = this.getTileBoundsForGridIndex(0, 0);
-        var startPx = this.map.getViewPortPxFromLonLat(
-            new OpenLayers.LonLat(tileBounds.left, tileBounds.top)
-        );
-        startPx.x = Math.round(startPx.x) - layerContainerDivLeft;
-        startPx.y = Math.round(startPx.y) - layerContainerDivTop;
-
-        var tileData = [], center = this.map.getCenter();
-
-        var rowidx = 0;
-        do {
-            var row = this.grid[rowidx];
-            if (!row) {
-                row = [];
-                this.grid.push(row);
-            }
-            
-            var colidx = 0;
-            do {
-                tileBounds = this.getTileBoundsForGridIndex(rowidx, colidx);
-                var px = startPx.clone();
-                px.x = px.x + colidx * Math.round(tileSize.w);
-                px.y = px.y + rowidx * Math.round(tileSize.h);
-                var tile = row[colidx];
-                if (!tile) {
-                    tile = this.addTile(tileBounds, px);
-                    this.addTileMonitoringHooks(tile);
-                    row.push(tile);
-                } else {
-                    tile.moveTo(tileBounds, px, false);
-                }
-                var tileCenter = tileBounds.getCenterLonLat();
-                tileData.push({
-                    tile: tile,
-                    distance: Math.pow(tileCenter.lon - center.lon, 2) +
-                        Math.pow(tileCenter.lat - center.lat, 2)
-                });
-     
-                colidx += 1;
-            } while ((tileBounds.right <= bounds.right + tilelon * this.buffer)
-                     || colidx < minCols);
-             
-            rowidx += 1;
-        } while((tileBounds.bottom >= bounds.bottom - tilelat * this.buffer)
-                || rowidx < minRows);
-        
-        //shave off exceess rows and colums
-        this.removeExcessTiles(rowidx, colidx);
-
-        var resolution = this.getServerResolution();
-        // store the resolution of the grid
-        this.gridResolution = resolution;
-
-        //now actually draw the tiles
-        tileData.sort(function(a, b) {
-            return a.distance - b.distance; 
-        });
-        for (var i=0, ii=tileData.length; i<ii; ++i) {
-            tileData[i].tile.draw();
-        }
-    },
-
-    /**
-     * Method: getMaxExtent
-     * Get this layer's maximum extent. (Implemented as a getter for
-     *     potential specific implementations in sub-classes.)
-     *
-     * Returns:
-     * {<OpenLayers.Bounds>}
-     */
-    getMaxExtent: function() {
-        return this.maxExtent;
-    },
-    
-    /**
-     * APIMethod: addTile
-     * Create a tile, initialize it, and add it to the layer div. 
-     *
-     * Parameters
-     * bounds - {<OpenLayers.Bounds>}
-     * position - {<OpenLayers.Pixel>}
-     *
-     * Returns:
-     * {<OpenLayers.Tile>} The added OpenLayers.Tile
-     */
-    addTile: function(bounds, position) {
-        var tile = new this.tileClass(
-            this, position, bounds, null, this.tileSize, this.tileOptions
-        );
-        this.events.triggerEvent("addtile", {tile: tile});
-        return tile;
-    },
-    
-    /** 
-     * Method: addTileMonitoringHooks
-     * This function takes a tile as input and adds the appropriate hooks to 
-     *     the tile so that the layer can keep track of the loading tiles.
-     * 
-     * Parameters: 
-     * tile - {<OpenLayers.Tile>}
-     */
-    addTileMonitoringHooks: function(tile) {
-        
-        var replacingCls = 'olTileReplacing';
-
-        tile.onLoadStart = function() {
-            //if that was first tile then trigger a 'loadstart' on the layer
-            if (this.loading === false) {
-                this.loading = true;
-                this.events.triggerEvent("loadstart");
-            }
-            this.events.triggerEvent("tileloadstart", {tile: tile});
-            this.numLoadingTiles++;
-            if (!this.singleTile && this.backBuffer && this.gridResolution === this.backBufferResolution) {
-                OpenLayers.Element.addClass(tile.getTile(), replacingCls);
-            }
-        };
-      
-        tile.onLoadEnd = function(evt) {
-            this.numLoadingTiles--;
-            var aborted = evt.type === 'unload';
-            this.events.triggerEvent("tileloaded", {
-                tile: tile,
-                aborted: aborted
-            });
-            if (!this.singleTile && !aborted && this.backBuffer && this.gridResolution === this.backBufferResolution) {
-                var tileDiv = tile.getTile();
-                if (OpenLayers.Element.getStyle(tileDiv, 'display') === 'none') {
-                    var bufferTile = document.getElementById(tile.id + '_bb');
-                    if (bufferTile) {
-                        bufferTile.parentNode.removeChild(bufferTile);
-                    }
-                }
-                OpenLayers.Element.removeClass(tileDiv, replacingCls);
-            }
-            //if that was the last tile, then trigger a 'loadend' on the layer
-            if (this.numLoadingTiles === 0) {
-                if (this.backBuffer) {
-                    if (this.backBuffer.childNodes.length === 0) {
-                        // no tiles transitioning, remove immediately
-                        this.removeBackBuffer();
-                    } else {
-                        // wait until transition has ended or delay has passed
-                        this._transitionElement = aborted ?
-                            this.div.lastChild : tile.imgDiv;
-                        var transitionendEvents = this.transitionendEvents;
-                        for (var i=transitionendEvents.length-1; i>=0; --i) {
-                            OpenLayers.Event.observe(this._transitionElement,
-                                transitionendEvents[i],
-                                this._removeBackBuffer);
-                        }
-                        // the removal of the back buffer is delayed to prevent
-                        // flash effects due to the animation of tile displaying
-                        this.backBufferTimerId = window.setTimeout(
-                            this._removeBackBuffer, this.removeBackBufferDelay
-                        );
-                    }
-                }
-                this.loading = false;
-                this.events.triggerEvent("loadend");
-            }
-        };
-        
-        tile.onLoadError = function() {
-            this.events.triggerEvent("tileerror", {tile: tile});
-        };
-        
-        tile.events.on({
-            "loadstart": tile.onLoadStart,
-            "loadend": tile.onLoadEnd,
-            "unload": tile.onLoadEnd,
-            "loaderror": tile.onLoadError,
-            scope: this
-        });
-    },
-
-    /** 
-     * Method: removeTileMonitoringHooks
-     * This function takes a tile as input and removes the tile hooks 
-     *     that were added in addTileMonitoringHooks()
-     * 
-     * Parameters: 
-     * tile - {<OpenLayers.Tile>}
-     */
-    removeTileMonitoringHooks: function(tile) {
-        tile.unload();
-        tile.events.un({
-            "loadstart": tile.onLoadStart,
-            "loadend": tile.onLoadEnd,
-            "unload": tile.onLoadEnd,
-            "loaderror": tile.onLoadError,
-            scope: this
-        });
-    },
-    
-    /**
-     * Method: moveGriddedTiles
-     */
-    moveGriddedTiles: function() {
-        var buffer = this.buffer + 1;
-        while(true) {
-            var tlTile = this.grid[0][0];
-            var tlViewPort = {
-                x: tlTile.position.x +
-                    this.map.layerContainerOriginPx.x,
-                y: tlTile.position.y +
-                    this.map.layerContainerOriginPx.y
-            };
-            var ratio = this.getServerResolution() / this.map.getResolution();
-            var tileSize = {
-                w: Math.round(this.tileSize.w * ratio),
-                h: Math.round(this.tileSize.h * ratio)
-            };
-            if (tlViewPort.x > -tileSize.w * (buffer - 1)) {
-                this.shiftColumn(true, tileSize);
-            } else if (tlViewPort.x < -tileSize.w * buffer) {
-                this.shiftColumn(false, tileSize);
-            } else if (tlViewPort.y > -tileSize.h * (buffer - 1)) {
-                this.shiftRow(true, tileSize);
-            } else if (tlViewPort.y < -tileSize.h * buffer) {
-                this.shiftRow(false, tileSize);
-            } else {
-                break;
-            }
-        }
-    },
-
-    /**
-     * Method: shiftRow
-     * Shifty grid work
-     *
-     * Parameters:
-     * prepend - {Boolean} if true, prepend to beginning.
-     *                          if false, then append to end
-     * tileSize - {Object} rendered tile size; object with w and h properties
-     */
-    shiftRow: function(prepend, tileSize) {
-        var grid = this.grid;
-        var rowIndex = prepend ? 0 : (grid.length - 1);
-        var sign = prepend ? -1 : 1;
-        var rowSign = this.rowSign;
-        var tileLayout = this.gridLayout;
-        tileLayout.startrow += sign * rowSign;
-
-        var modelRow = grid[rowIndex];
-        var row = grid[prepend ? 'pop' : 'shift']();
-        for (var i=0, len=row.length; i<len; i++) {
-            var tile = row[i];
-            var position = modelRow[i].position.clone();
-            position.y += tileSize.h * sign;
-            tile.moveTo(this.getTileBoundsForGridIndex(rowIndex, i), position);
-        }
-        grid[prepend ? 'unshift' : 'push'](row);
-    },
-
-    /**
-     * Method: shiftColumn
-     * Shift grid work in the other dimension
-     *
-     * Parameters:
-     * prepend - {Boolean} if true, prepend to beginning.
-     *                          if false, then append to end
-     * tileSize - {Object} rendered tile size; object with w and h properties
-     */
-    shiftColumn: function(prepend, tileSize) {
-        var grid = this.grid;
-        var colIndex = prepend ? 0 : (grid[0].length - 1);
-        var sign = prepend ? -1 : 1;
-        var tileLayout = this.gridLayout;
-        tileLayout.startcol += sign;
-
-        for (var i=0, len=grid.length; i<len; i++) {
-            var row = grid[i];
-            var position = row[colIndex].position.clone();
-            var tile = row[prepend ? 'pop' : 'shift']();            
-            position.x += tileSize.w * sign;
-            tile.moveTo(this.getTileBoundsForGridIndex(i, colIndex), position);
-            row[prepend ? 'unshift' : 'push'](tile);
-        }
-    },
-
-    /**
-     * Method: removeExcessTiles
-     * When the size of the map or the buffer changes, we may need to
-     *     remove some excess rows and columns.
-     * 
-     * Parameters:
-     * rows - {Integer} Maximum number of rows we want our grid to have.
-     * columns - {Integer} Maximum number of columns we want our grid to have.
-     */
-    removeExcessTiles: function(rows, columns) {
-        var i, l;
-        
-        // remove extra rows
-        while (this.grid.length > rows) {
-            var row = this.grid.pop();
-            for (i=0, l=row.length; i<l; i++) {
-                var tile = row[i];
-                this.destroyTile(tile);
-            }
-        }
-        
-        // remove extra columns
-        for (i=0, l=this.grid.length; i<l; i++) {
-            while (this.grid[i].length > columns) {
-                var row = this.grid[i];
-                var tile = row.pop();
-                this.destroyTile(tile);
-            }
-        }
-    },
-
-    /**
-     * Method: onMapResize
-     * For singleTile layers, this will set a new tile size according to the
-     * dimensions of the map pane.
-     */
-    onMapResize: function() {
-        if (this.singleTile) {
-            this.clearGrid();
-            this.setTileSize();
-        }
-    },
-    
-    /**
-     * APIMethod: getTileBounds
-     * Returns The tile bounds for a layer given a pixel location.
-     *
-     * Parameters:
-     * viewPortPx - {<OpenLayers.Pixel>} The location in the viewport.
-     *
-     * Returns:
-     * {<OpenLayers.Bounds>} Bounds of the tile at the given pixel location.
-     */
-    getTileBounds: function(viewPortPx) {
-        var maxExtent = this.maxExtent;
-        var resolution = this.getResolution();
-        var tileMapWidth = resolution * this.tileSize.w;
-        var tileMapHeight = resolution * this.tileSize.h;
-        var mapPoint = this.getLonLatFromViewPortPx(viewPortPx);
-        var tileLeft = maxExtent.left + (tileMapWidth *
-                                         Math.floor((mapPoint.lon -
-                                                     maxExtent.left) /
-                                                    tileMapWidth));
-        var tileBottom = maxExtent.bottom + (tileMapHeight *
-                                             Math.floor((mapPoint.lat -
-                                                         maxExtent.bottom) /
-                                                        tileMapHeight));
-        return new OpenLayers.Bounds(tileLeft, tileBottom,
-                                     tileLeft + tileMapWidth,
-                                     tileBottom + tileMapHeight);
-    },
-
-    CLASS_NAME: "OpenLayers.Layer.Grid"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/HTTPRequest.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/HTTPRequest.js
deleted file mode 100644
index ccb0291f..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/HTTPRequest.js
+++ /dev/null
@@ -1,230 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-
-/**
- * @requires OpenLayers/Layer.js
- */
-
-/**
- * Class: OpenLayers.Layer.HTTPRequest
- * 
- * Inherits from: 
- *  - <OpenLayers.Layer>
- */
-OpenLayers.Layer.HTTPRequest = OpenLayers.Class(OpenLayers.Layer, {
-
-    /** 
-     * Constant: URL_HASH_FACTOR
-     * {Float} Used to hash URL param strings for multi-WMS server selection.
-     *         Set to the Golden Ratio per Knuth's recommendation.
-     */
-    URL_HASH_FACTOR: (Math.sqrt(5) - 1) / 2,
-
-    /** 
-     * Property: url
-     * {Array(String) or String} This is either an array of url strings or 
-     *                           a single url string. 
-     */
-    url: null,
-
-    /** 
-     * Property: params
-     * {Object} Hashtable of key/value parameters
-     */
-    params: null,
-    
-    /** 
-     * APIProperty: reproject
-     * *Deprecated*. See http://docs.openlayers.org/library/spherical_mercator.html
-     * for information on the replacement for this functionality. 
-     * {Boolean} Whether layer should reproject itself based on base layer 
-     *           locations. This allows reprojection onto commercial layers. 
-     *           Default is false: Most layers can't reproject, but layers 
-     *           which can create non-square geographic pixels can, like WMS.
-     *           
-     */
-    reproject: false,
-
-    /**
-     * Constructor: OpenLayers.Layer.HTTPRequest
-     * 
-     * Parameters:
-     * name - {String}
-     * url - {Array(String) or String}
-     * params - {Object}
-     * options - {Object} Hashtable of extra options to tag onto the layer
-     */
-    initialize: function(name, url, params, options) {
-        OpenLayers.Layer.prototype.initialize.apply(this, [name, options]);
-        this.url = url;
-        if (!this.params) {
-            this.params = OpenLayers.Util.extend({}, params);
-        }
-    },
-
-    /**
-     * APIMethod: destroy
-     */
-    destroy: function() {
-        this.url = null;
-        this.params = null;
-        OpenLayers.Layer.prototype.destroy.apply(this, arguments); 
-    },
-    
-    /**
-     * APIMethod: clone
-     * 
-     * Parameters:
-     * obj - {Object}
-     * 
-     * Returns:
-     * {<OpenLayers.Layer.HTTPRequest>} An exact clone of this 
-     *                                  <OpenLayers.Layer.HTTPRequest>
-     */
-    clone: function (obj) {
-        
-        if (obj == null) {
-            obj = new OpenLayers.Layer.HTTPRequest(this.name,
-                                                   this.url,
-                                                   this.params,
-                                                   this.getOptions());
-        }
-        
-        //get all additions from superclasses
-        obj = OpenLayers.Layer.prototype.clone.apply(this, [obj]);
-
-        // copy/set any non-init, non-simple values here
-        
-        return obj;
-    },
-
-    /** 
-     * APIMethod: setUrl
-     * 
-     * Parameters:
-     * newUrl - {String}
-     */
-    setUrl: function(newUrl) {
-        this.url = newUrl;
-    },
-
-    /**
-     * APIMethod: mergeNewParams
-     * 
-     * Parameters:
-     * newParams - {Object}
-     *
-     * Returns:
-     * redrawn: {Boolean} whether the layer was actually redrawn.
-     */
-    mergeNewParams:function(newParams) {
-        this.params = OpenLayers.Util.extend(this.params, newParams);
-        var ret = this.redraw();
-        if(this.map != null) {
-            this.map.events.triggerEvent("changelayer", {
-                layer: this,
-                property: "params"
-            });
-        }
-        return ret;
-    },
-
-    /**
-     * APIMethod: redraw
-     * Redraws the layer.  Returns true if the layer was redrawn, false if not.
-     *
-     * Parameters:
-     * force - {Boolean} Force redraw by adding random parameter.
-     *
-     * Returns:
-     * {Boolean} The layer was redrawn.
-     */
-    redraw: function(force) { 
-        if (force) {
-            return this.mergeNewParams({"_olSalt": Math.random()});
-        } else {
-            return OpenLayers.Layer.prototype.redraw.apply(this, []);
-        }
-    },
-    
-    /**
-     * Method: selectUrl
-     * selectUrl() implements the standard floating-point multiplicative
-     *     hash function described by Knuth, and hashes the contents of the 
-     *     given param string into a float between 0 and 1. This float is then
-     *     scaled to the size of the provided urls array, and used to select
-     *     a URL.
-     *
-     * Parameters:
-     * paramString - {String}
-     * urls - {Array(String)}
-     * 
-     * Returns:
-     * {String} An entry from the urls array, deterministically selected based
-     *          on the paramString.
-     */
-    selectUrl: function(paramString, urls) {
-        var product = 1;
-        for (var i=0, len=paramString.length; i<len; i++) { 
-            product *= paramString.charCodeAt(i) * this.URL_HASH_FACTOR; 
-            product -= Math.floor(product); 
-        }
-        return urls[Math.floor(product * urls.length)];
-    },
-
-    /** 
-     * Method: getFullRequestString
-     * Combine url with layer's params and these newParams. 
-     *   
-     *    does checking on the serverPath variable, allowing for cases when it 
-     *     is supplied with trailing ? or &, as well as cases where not. 
-     *
-     *    return in formatted string like this:
-     *        "server?key1=value1&key2=value2&key3=value3"
-     * 
-     * WARNING: The altUrl parameter is deprecated and will be removed in 3.0.
-     *
-     * Parameters:
-     * newParams - {Object}
-     * altUrl - {String} Use this as the url instead of the layer's url
-     *   
-     * Returns: 
-     * {String}
-     */
-    getFullRequestString:function(newParams, altUrl) {
-
-        // if not altUrl passed in, use layer's url
-        var url = altUrl || this.url;
-        
-        // create a new params hashtable with all the layer params and the 
-        // new params together. then convert to string
-        var allParams = OpenLayers.Util.extend({}, this.params);
-        allParams = OpenLayers.Util.extend(allParams, newParams);
-        var paramsString = OpenLayers.Util.getParameterString(allParams);
-        
-        // if url is not a string, it should be an array of strings, 
-        // in which case we will deterministically select one of them in 
-        // order to evenly distribute requests to different urls.
-        //
-        if (OpenLayers.Util.isArray(url)) {
-            url = this.selectUrl(paramsString, url);
-        }   
- 
-        // ignore parameters that are already in the url search string
-        var urlParams = 
-            OpenLayers.Util.upperCaseObject(OpenLayers.Util.getParameters(url));
-        for(var key in allParams) {
-            if(key.toUpperCase() in urlParams) {
-                delete allParams[key];
-            }
-        }
-        paramsString = OpenLayers.Util.getParameterString(allParams);
-        
-        return OpenLayers.Util.urlAppend(url, paramsString);
-    },
-
-    CLASS_NAME: "OpenLayers.Layer.HTTPRequest"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/Image.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/Image.js
deleted file mode 100644
index b96e369e..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/Image.js
+++ /dev/null
@@ -1,259 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
- 
-/**
- * @requires OpenLayers/Layer.js
- * @requires OpenLayers/Tile/Image.js
- */
-
-/**
- * Class: OpenLayers.Layer.Image
- * Instances of OpenLayers.Layer.Image are used to display data from a web
- * accessible image as a map layer.  Create a new image layer with the
- * <OpenLayers.Layer.Image> constructor.
- *
- * Inherits from:
- *  - <OpenLayers.Layer>
- */
-OpenLayers.Layer.Image = OpenLayers.Class(OpenLayers.Layer, {
-
-    /**
-     * Property: isBaseLayer
-     * {Boolean} The layer is a base layer.  Default is true.  Set this property
-     * in the layer options
-     */
-    isBaseLayer: true,
-    
-    /**
-     * Property: url
-     * {String} URL of the image to use
-     */
-    url: null,
-
-    /**
-     * Property: extent
-     * {<OpenLayers.Bounds>} The image bounds in map units.  This extent will
-     *     also be used as the default maxExtent for the layer.  If you wish
-     *     to have a maxExtent that is different than the image extent, set the
-     *     maxExtent property of the options argument (as with any other layer).
-     */
-    extent: null,
-    
-    /**
-     * Property: size
-     * {<OpenLayers.Size>} The image size in pixels
-     */
-    size: null,
-
-    /**
-     * Property: tile
-     * {<OpenLayers.Tile.Image>}
-     */
-    tile: null,
-
-    /**
-     * Property: aspectRatio
-     * {Float} The ratio of height/width represented by a single pixel in the
-     * graphic
-     */
-    aspectRatio: null,
-
-    /**
-     * Constructor: OpenLayers.Layer.Image
-     * Create a new image layer
-     *
-     * Parameters:
-     * name - {String} A name for the layer.
-     * url - {String} Relative or absolute path to the image
-     * extent - {<OpenLayers.Bounds>} The extent represented by the image
-     * size - {<OpenLayers.Size>} The size (in pixels) of the image
-     * options - {Object} Hashtable of extra options to tag onto the layer
-     */
-    initialize: function(name, url, extent, size, options) {
-        this.url = url;
-        this.extent = extent;
-        this.maxExtent = extent;
-        this.size = size;
-        OpenLayers.Layer.prototype.initialize.apply(this, [name, options]);
-
-        this.aspectRatio = (this.extent.getHeight() / this.size.h) /
-                           (this.extent.getWidth() / this.size.w);
-    },    
-
-    /**
-     * Method: destroy
-     * Destroy this layer
-     */
-    destroy: function() {
-        if (this.tile) {
-            this.removeTileMonitoringHooks(this.tile);
-            this.tile.destroy();
-            this.tile = null;
-        }
-        OpenLayers.Layer.prototype.destroy.apply(this, arguments);
-    },
-    
-    /**
-     * Method: clone
-     * Create a clone of this layer
-     *
-     * Paramters:
-     * obj - {Object} An optional layer (is this ever used?)
-     *
-     * Returns:
-     * {<OpenLayers.Layer.Image>} An exact copy of this layer
-     */
-    clone: function(obj) {
-        
-        if(obj == null) {
-            obj = new OpenLayers.Layer.Image(this.name,
-                                               this.url,
-                                               this.extent,
-                                               this.size,
-                                               this.getOptions());
-        }
-
-        //get all additions from superclasses
-        obj = OpenLayers.Layer.prototype.clone.apply(this, [obj]);
-
-        // copy/set any non-init, non-simple values here
-
-        return obj;
-    },    
-    
-    /**
-     * APIMethod: setMap
-     * 
-     * Parameters:
-     * map - {<OpenLayers.Map>}
-     */
-    setMap: function(map) {
-        /**
-         * If nothing to do with resolutions has been set, assume a single
-         * resolution determined by ratio*extent/size - if an image has a
-         * pixel aspect ratio different than one (as calculated above), the
-         * image will be stretched in one dimension only.
-         */
-        if( this.options.maxResolution == null ) {
-            this.options.maxResolution = this.aspectRatio *
-                                         this.extent.getWidth() /
-                                         this.size.w;
-        }
-        OpenLayers.Layer.prototype.setMap.apply(this, arguments);
-    },
-
-    /** 
-     * Method: moveTo
-     * Create the tile for the image or resize it for the new resolution
-     * 
-     * Parameters:
-     * bounds - {<OpenLayers.Bounds>}
-     * zoomChanged - {Boolean}
-     * dragging - {Boolean}
-     */
-    moveTo:function(bounds, zoomChanged, dragging) {
-        OpenLayers.Layer.prototype.moveTo.apply(this, arguments);
-
-        var firstRendering = (this.tile == null);
-
-        if(zoomChanged || firstRendering) {
-
-            //determine new tile size
-            this.setTileSize();
-
-            //determine new position (upper left corner of new bounds)
-            var ulPx = this.map.getLayerPxFromLonLat({
-                lon: this.extent.left,
-                lat: this.extent.top
-            });
-
-            if(firstRendering) {
-                //create the new tile
-                this.tile = new OpenLayers.Tile.Image(this, ulPx, this.extent, 
-                                                      null, this.tileSize);
-                this.addTileMonitoringHooks(this.tile);
-            } else {
-                //just resize the tile and set it's new position
-                this.tile.size = this.tileSize.clone();
-                this.tile.position = ulPx.clone();
-            }
-            this.tile.draw();
-        }
-    }, 
-
-    /**
-     * Set the tile size based on the map size.
-     */
-    setTileSize: function() {
-        var tileWidth = this.extent.getWidth() / this.map.getResolution();
-        var tileHeight = this.extent.getHeight() / this.map.getResolution();
-        this.tileSize = new OpenLayers.Size(tileWidth, tileHeight);
-    },
-
-    /** 
-     * Method: addTileMonitoringHooks
-     * This function takes a tile as input and adds the appropriate hooks to 
-     *     the tile so that the layer can keep track of the loading tiles.
-     * 
-     * Parameters: 
-     * tile - {<OpenLayers.Tile>}
-     */
-    addTileMonitoringHooks: function(tile) {
-        tile.onLoadStart = function() {
-            this.events.triggerEvent("loadstart");
-        };
-        tile.events.register("loadstart", this, tile.onLoadStart);
-      
-        tile.onLoadEnd = function() {
-            this.events.triggerEvent("loadend");
-        };
-        tile.events.register("loadend", this, tile.onLoadEnd);
-        tile.events.register("unload", this, tile.onLoadEnd);
-    },
-
-    /** 
-     * Method: removeTileMonitoringHooks
-     * This function takes a tile as input and removes the tile hooks 
-     *     that were added in <addTileMonitoringHooks>.
-     * 
-     * Parameters: 
-     * tile - {<OpenLayers.Tile>}
-     */
-    removeTileMonitoringHooks: function(tile) {
-        tile.unload();
-        tile.events.un({
-            "loadstart": tile.onLoadStart,
-            "loadend": tile.onLoadEnd,
-            "unload": tile.onLoadEnd,
-            scope: this
-        });
-    },
-    
-    /**
-     * APIMethod: setUrl
-     * 
-     * Parameters:
-     * newUrl - {String}
-     */
-    setUrl: function(newUrl) {
-        this.url = newUrl;
-        this.tile.draw();
-    },
-
-    /** 
-     * APIMethod: getURL
-     * The url we return is always the same (the image itself never changes)
-     *     so we can ignore the bounds parameter (it will always be the same, 
-     *     anyways) 
-     * 
-     * Parameters:
-     * bounds - {<OpenLayers.Bounds>}
-     */
-    getURL: function(bounds) {
-        return this.url;
-    },
-
-    CLASS_NAME: "OpenLayers.Layer.Image"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/KaMap.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/KaMap.js
deleted file mode 100644
index 3de2224f..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/KaMap.js
+++ /dev/null
@@ -1,192 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-
-/**
- * @requires OpenLayers/Layer/Grid.js
- */
-
-/**
- * Class: OpenLayers.Layer.KaMap
- * 
- * Inherits from:
- *  - <OpenLayers.Layer.Grid>
- */
-OpenLayers.Layer.KaMap = OpenLayers.Class(OpenLayers.Layer.Grid, {
-
-    /** 
-     * APIProperty: isBaseLayer
-     * {Boolean} KaMap Layer is always a base layer 
-     */    
-    isBaseLayer: true,
-
-    /**
-     * Constant: DEFAULT_PARAMS
-     * {Object} parameters set by default. The default parameters set 
-     * the format via the 'i' parameter to 'jpeg'.    
-     */
-    DEFAULT_PARAMS: {
-        i: 'jpeg',
-        map: ''
-    },
-        
-    /**
-     * Constructor: OpenLayers.Layer.KaMap
-     * 
-     * Parameters:
-     * name - {String}
-     * url - {String}
-     * params - {Object} Parameters to be sent to the HTTP server in the
-     *    query string for the tile. The format can be set via the 'i'
-     *    parameter (defaults to jpg) , and the map should be set via 
-     *    the 'map' parameter. It has been reported that ka-Map may behave
-     *    inconsistently if your format parameter does not match the format
-     *    parameter configured in your config.php. (See ticket #327 for more
-     *    information.)
-     * options - {Object} Additional options for the layer. Any of the 
-     *     APIProperties listed on this layer, and any layer types it
-     *     extends, can be overridden through the options parameter. 
-     */
-    initialize: function(name, url, params, options) {
-        OpenLayers.Layer.Grid.prototype.initialize.apply(this, arguments);
-        this.params = OpenLayers.Util.applyDefaults(
-            this.params, this.DEFAULT_PARAMS
-        );
-    },
-
-    /**
-     * Method: getURL
-     * 
-     * Parameters:
-     * bounds - {<OpenLayers.Bounds>} 
-     * 
-     * Returns:
-     * {String} A string with the layer's url and parameters and also the 
-     *          passed-in bounds and appropriate tile size specified as 
-     *          parameters
-     */
-    getURL: function (bounds) {
-        bounds = this.adjustBounds(bounds);
-        var mapRes = this.map.getResolution();
-        var scale = Math.round((this.map.getScale() * 10000)) / 10000;
-        var pX = Math.round(bounds.left / mapRes);
-        var pY = -Math.round(bounds.top / mapRes);
-        return this.getFullRequestString(
-                      { t: pY, 
-                        l: pX,
-                        s: scale
-                      });
-    },
-
-    /** 
-     * Method: calculateGridLayout
-     * ka-Map uses the center point of the map as an origin for 
-     * its tiles. Override calculateGridLayout to center tiles 
-     * correctly for this case.
-     *
-     * Parameters:
-     * bounds - {<OpenLayers.Bound>}
-     * origin - {<OpenLayers.LonLat>}
-     * resolution - {Number}
-     *
-     * Returns:
-     * {Object} Object containing properties tilelon, tilelat, startcol,
-     * startrow
-     */
-    calculateGridLayout: function(bounds, origin, resolution) {
-        var tilelon = resolution*this.tileSize.w;
-        var tilelat = resolution*this.tileSize.h;
-        
-        var offsetlon = bounds.left;
-        var tilecol = Math.floor(offsetlon/tilelon) - this.buffer;
-        
-        var offsetlat = bounds.top;  
-        var tilerow = Math.floor(offsetlat/tilelat) + this.buffer;
-        
-        return { 
-          tilelon: tilelon, tilelat: tilelat,
-          startcol: tilecol, startrow: tilerow
-        };
-    },    
-
-    /**
-     * Method: getTileBoundsForGridIndex
-     *
-     * Parameters:
-     * row - {Number} The row of the grid
-     * col - {Number} The column of the grid
-     *
-     * Returns:
-     * {<OpenLayers.Bounds>} The bounds for the tile at (row, col)
-     */
-    getTileBoundsForGridIndex: function(row, col) {
-        var origin = this.getTileOrigin();
-        var tileLayout = this.gridLayout;
-        var tilelon = tileLayout.tilelon;
-        var tilelat = tileLayout.tilelat;
-        var minX = (tileLayout.startcol + col) * tilelon;
-        var minY = (tileLayout.startrow - row) * tilelat;
-        return new OpenLayers.Bounds(
-            minX, minY,
-            minX + tilelon, minY + tilelat
-        );
-    },
-
-    /**
-     * APIMethod: clone
-     * 
-     * Parameters: 
-     * obj - {Object}
-     * 
-     * Returns:
-     * {<OpenLayers.Layer.Kamap>} An exact clone of this OpenLayers.Layer.KaMap
-     */
-    clone: function (obj) {
-        
-        if (obj == null) {
-            obj = new OpenLayers.Layer.KaMap(this.name,
-                                            this.url,
-                                            this.params,
-                                            this.getOptions());
-        }
-
-        //get all additions from superclasses
-        obj = OpenLayers.Layer.Grid.prototype.clone.apply(this, [obj]);
-
-        // copy/set any non-init, non-simple values here
-        if (this.tileSize != null) {
-            obj.tileSize = this.tileSize.clone();
-        }
-        
-        // we do not want to copy reference to grid, so we make a new array
-        obj.grid = [];
-
-        return obj;
-    },    
-    
-    /**
-     * APIMethod: getTileBounds
-     * Returns The tile bounds for a layer given a pixel location.
-     *
-     * Parameters:
-     * viewPortPx - {<OpenLayers.Pixel>} The location in the viewport.
-     *
-     * Returns:
-     * {<OpenLayers.Bounds>} Bounds of the tile at the given pixel location.
-     */
-    getTileBounds: function(viewPortPx) {
-        var resolution = this.getResolution();
-        var tileMapWidth = resolution * this.tileSize.w;
-        var tileMapHeight = resolution * this.tileSize.h;
-        var mapPoint = this.getLonLatFromViewPortPx(viewPortPx);
-        var tileLeft = tileMapWidth * Math.floor(mapPoint.lon / tileMapWidth);
-        var tileBottom = tileMapHeight * Math.floor(mapPoint.lat / tileMapHeight);
-        return new OpenLayers.Bounds(tileLeft, tileBottom,
-                                     tileLeft + tileMapWidth,
-                                     tileBottom + tileMapHeight);
-    },
-
-    CLASS_NAME: "OpenLayers.Layer.KaMap"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/KaMapCache.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/KaMapCache.js
deleted file mode 100644
index be6bdb0d..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/KaMapCache.js
+++ /dev/null
@@ -1,143 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-
-/**
- * @requires OpenLayers/Layer/Grid.js
- * @requires OpenLayers/Layer/KaMap.js
- */
-
-/**
- * Class: OpenLayers.Layer.KaMapCache
- * 
- * This class is designed to talk directly to a web-accessible ka-Map
- * cache generated by the precache2.php script.
- * 
- * To create a a new KaMapCache layer, you must indicate also the "i" parameter
- * (that will be used to calculate the file extension), and another special
- * parameter, object names "metaTileSize", with "h" (height) and "w" (width)
- * properties.
- * 
- *     // Create a new kaMapCache layer. 
- *     var kamap_base = new OpenLayers.Layer.KaMapCache(
- *         "Satellite",
- *         "http://www.example.org/web/acessible/cache",
- *         {g: "satellite", map: "world", i: 'png24', metaTileSize: {w: 5, h: 5} }
- *       );
- *    
- *     // Create an kaMapCache overlay layer (using "isBaseLayer: false"). 
- *     // Forces the output to be a "gif", using the "i" parameter.
- *     var kamap_overlay = new OpenLayers.Layer.KaMapCache(
- *         "Streets",
- *         "http://www.example.org/web/acessible/cache",
- *         {g: "streets", map: "world", i: "gif", metaTileSize: {w: 5, h: 5} },
- *         {isBaseLayer: false}
- *       );
- *
- * The cache URLs must look like: 
- *   var/cache/World/50000/Group_Name/def/t-440320/l20480
- * 
- * This means that the cache generated via tile.php will *not* work with
- *     this class, and should instead use the KaMap layer.
- *
- * More information is available in Ticket #1518.
- * 
- * Inherits from:
- *  - <OpenLayers.Layer.KaMap>
- *  - <OpenLayers.Layer.Grid>
- */
-OpenLayers.Layer.KaMapCache = OpenLayers.Class(OpenLayers.Layer.KaMap, {
-
-    /**
-     * Constant: IMAGE_EXTENSIONS
-     * {Object} Simple hash map to convert format to extension.
-     */
-    IMAGE_EXTENSIONS: {
-        'jpeg': 'jpg',
-        'gif' : 'gif',
-        'png' : 'png',
-        'png8' : 'png',
-        'png24' : 'png',
-        'dithered' : 'png'
-    },
-    
-    /**
-     * Constant: DEFAULT_FORMAT
-     * {Object} Simple hash map to convert format to extension.
-     */
-    DEFAULT_FORMAT: 'jpeg',
-    
-    /**
-     * Constructor: OpenLayers.Layer.KaMapCache
-     * 
-     * Parameters:
-     * name - {String}
-     * url - {String}
-     * params - {Object} Parameters to be sent to the HTTP server in the
-     *    query string for the tile. The format can be set via the 'i'
-     *    parameter (defaults to jpg) , and the map should be set via 
-     *    the 'map' parameter. It has been reported that ka-Map may behave
-     *    inconsistently if your format parameter does not match the format
-     *    parameter configured in your config.php. (See ticket #327 for more
-     *    information.)
-     * options - {Object} Additional options for the layer. Any of the 
-     *     APIProperties listed on this layer, and any layer types it
-     *     extends, can be overridden through the options parameter. 
-     */
-    initialize: function(name, url, params, options) {
-        OpenLayers.Layer.KaMap.prototype.initialize.apply(this, arguments);
-        this.extension = this.IMAGE_EXTENSIONS[this.params.i.toLowerCase() || this.DEFAULT_FORMAT];
-    },
-
-    /**
-     * Method: getURL
-     * 
-     * Parameters:
-     * bounds - {<OpenLayers.Bounds>} 
-     * 
-     * Returns:
-     * {String} A string with the layer's url and parameters and also the 
-     *          passed-in bounds and appropriate tile size specified as 
-     *          parameters
-     */
-    getURL: function (bounds) {
-        bounds = this.adjustBounds(bounds);
-        var mapRes = this.map.getResolution();
-        var scale = Math.round((this.map.getScale() * 10000)) / 10000;
-        var pX = Math.round(bounds.left / mapRes);
-        var pY = -Math.round(bounds.top / mapRes);
-
-        var metaX = Math.floor(pX / this.tileSize.w / this.params.metaTileSize.w) * this.tileSize.w * this.params.metaTileSize.w;
-        var metaY = Math.floor(pY / this.tileSize.h / this.params.metaTileSize.h) * this.tileSize.h * this.params.metaTileSize.h;
-    
-        var components = [
-            "/",
-            this.params.map,
-            "/",
-            scale,
-            "/",
-            this.params.g.replace(/\s/g, '_'),
-            "/def/t", 
-            metaY,
-            "/l",
-            metaX,
-            "/t",
-            pY,
-            "l",
-            pX,
-            ".",
-            this.extension
-          ];
-
-        var url = this.url;
-
-        if (OpenLayers.Util.isArray(url)) {
-            url = this.selectUrl(components.join(''), url);
-        }
-        return url + components.join("");
-    },
-
-    CLASS_NAME: "OpenLayers.Layer.KaMapCache"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/MapGuide.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/MapGuide.js
deleted file mode 100644
index 8f7d9792..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/MapGuide.js
+++ /dev/null
@@ -1,443 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Request/XMLHttpRequest.js
- * @requires OpenLayers/Layer/Grid.js
- */
-
-/**
- * Class: OpenLayers.Layer.MapGuide
- * Instances of OpenLayers.Layer.MapGuide are used to display
- * data from a MapGuide OS instance.
- *
- * Inherits from:
- *  - <OpenLayers.Layer.Grid>
- */
-OpenLayers.Layer.MapGuide = OpenLayers.Class(OpenLayers.Layer.Grid, {
-
-    /** 
-     * APIProperty: isBaseLayer
-     * {Boolean} Treat this layer as a base layer.  Default is true.
-     **/
-    isBaseLayer: true,
-    
-    /**
-     * APIProperty: useHttpTile
-     * {Boolean} use a tile cache exposed directly via a webserver rather than the 
-     *    via mapguide server. This does require extra configuration on the Mapguide Server,
-     *    and will only work when singleTile is false. The url for the layer must be set to the
-     *    webserver path rather than the Mapguide mapagent.
-     *    See http://trac.osgeo.org/mapguide/wiki/CodeSamples/Tiles/ServingTilesViaHttp
-     **/
-    useHttpTile: false,
-    
-    /** 
-     * APIProperty: singleTile
-     * {Boolean} use tile server or request single tile image. 
-     **/
-    singleTile: false,
-    
-    /** 
-     * APIProperty: useOverlay
-     * {Boolean} flag to indicate if the layer should be retrieved using
-     * GETMAPIMAGE (default) or using GETDYNAMICOVERLAY requests.
-     **/
-    useOverlay: false,
-    
-    /** 
-     * APIProperty: useAsyncOverlay
-     * {Boolean} indicates if the MapGuide site supports the asynchronous 
-     * GETDYNAMICOVERLAY requests which is available in MapGuide Enterprise 2010
-     * and MapGuide Open Source v2.0.3 or higher. The newer versions of MG 
-     * is called asynchronously, allows selections to be drawn separately from 
-     * the map and offers styling options.
-     * 
-     * With older versions of MapGuide, set useAsyncOverlay=false.  Note that in
-     * this case a synchronous AJAX call is issued and the mapname and session
-     * parameters must be used to initialize the layer, not the mapdefinition
-     * parameter. Also note that this will issue a synchronous AJAX request 
-     * before the image request can be issued so the users browser may lock
-     * up if the MG Web tier does not respond in a timely fashion.
-     **/
-    useAsyncOverlay: true,
-    
-    /**
-     * Constant: TILE_PARAMS
-     * {Object} Hashtable of default parameter key/value pairs for tiled layer
-     */
-    TILE_PARAMS: {
-         operation: 'GETTILEIMAGE',
-         version: '1.2.0'
-    },
-
-    /**
-     * Constant: SINGLE_TILE_PARAMS
-     * {Object} Hashtable of default parameter key/value pairs for untiled layer
-     */
-    SINGLE_TILE_PARAMS: {
-        operation: 'GETMAPIMAGE',
-        format: 'PNG',
-        locale: 'en',
-        clip: '1',
-        version: '1.0.0'
-    },
-    
-    /**
-     * Constant: OVERLAY_PARAMS
-     * {Object} Hashtable of default parameter key/value pairs for untiled layer
-     */
-    OVERLAY_PARAMS: {
-        operation: 'GETDYNAMICMAPOVERLAYIMAGE',
-        format: 'PNG',
-        locale: 'en',
-        clip: '1',
-        version: '2.0.0'
-    },
-    
-    /** 
-     * Constant: FOLDER_PARAMS
-     * {Object} Hashtable of parameter key/value pairs which describe 
-     * the folder structure for tiles as configured in the mapguide 
-     * serverconfig.ini section [TileServiceProperties]
-     */
-    FOLDER_PARAMS: {
-        tileColumnsPerFolder: 30,
-        tileRowsPerFolder: 30,
-        format: 'png',
-        querystring: null
-    },
-
-    /** 
-     * Property: defaultSize
-     * {<OpenLayers.Size>} Tile size as produced by MapGuide server
-     **/
-    defaultSize: new OpenLayers.Size(300,300),
-
-    /** 
-     * Property: tileOriginCorner
-     * {String} MapGuide tile server uses top-left as tile origin
-     **/
-    tileOriginCorner: "tl",
-
-    /**
-     * Constructor: OpenLayers.Layer.MapGuide
-     * Create a new Mapguide layer, either tiled or untiled.  
-     *
-     * For tiled layers, the 'groupName' and 'mapDefinition' values 
-     * must be specified as parameters in the constructor.
-     *
-     * For untiled base layers, specify either combination of 'mapName' and
-     * 'session', or 'mapDefinition' and 'locale'.  
-     *
-     * For older versions of MapGuide and overlay layers, set useAsyncOverlay 
-     * to false and in this case mapName and session are required parameters 
-     * for the constructor.
-     *
-     * NOTE: MapGuide OS uses a DPI value and degrees to meters conversion 
-     * factor that are different than the defaults used in OpenLayers, 
-     * so these must be adjusted accordingly in your application.  
-     * See the MapGuide example for how to set these values for MGOS.
-     *
-     * Parameters:
-     * name - {String} Name of the layer displayed in the interface
-     * url - {String} Location of the MapGuide mapagent executable
-     *            (e.g. http://localhost:8008/mapguide/mapagent/mapagent.fcgi)
-     * params - {Object} hashtable of additional parameters to use. Some
-     *     parameters may require additional code on the server. The ones that
-     *     you may want to use are: 
-     *   - mapDefinition - {String} The MapGuide resource definition
-     *            (e.g. Library://Samples/Gmap/Maps/gmapTiled.MapDefinition)
-     *   - locale - Locale setting 
-     *            (for untiled overlays layers only)
-     *   - mapName - {String} Name of the map as stored in the MapGuide session.
-     *          (for untiled layers with a session parameter only)
-     *   - session - { String} MapGuide session ID 
-     *            (for untiled overlays layers only)
-     *   - basemaplayergroupname - {String} GroupName for tiled MapGuide layers only
-     *   - format - Image format to be returned (for untiled overlay layers only)
-     *   - showLayers - {String} A comma separated list of GUID's for the
-     *       layers to display eg: 'cvc-xcv34,453-345-345sdf'.
-     *   - hideLayers - {String} A comma separated list of GUID's for the
-     *       layers to hide eg: 'cvc-xcv34,453-345-345sdf'.
-     *   - showGroups - {String} A comma separated list of GUID's for the
-     *       groups to display eg: 'cvc-xcv34,453-345-345sdf'.
-     *   - hideGroups - {String} A comma separated list of GUID's for the
-     *       groups to hide eg: 'cvc-xcv34,453-345-345sdf'
-     *   - selectionXml - {String} A selection xml string Some server plumbing
-     *       is required to read such a value.
-     * options - {Object} Hashtable of extra options to tag onto the layer; 
-     *          will vary depending if tiled or untiled maps are being requested
-     */
-    initialize: function(name, url, params, options) {
-        
-        OpenLayers.Layer.Grid.prototype.initialize.apply(this, arguments);
-        
-        // unless explicitly set in options, if the layer is transparent, 
-        // it will be an overlay
-        if (options == null || options.isBaseLayer == null) {
-            this.isBaseLayer = ((this.transparent != "true") && 
-                                (this.transparent != true));
-        }
-
-        if (options && options.useOverlay!=null) {
-          this.useOverlay = options.useOverlay;
-        }
-        
-        //initialize for untiled layers
-        if (this.singleTile) {
-          if (this.useOverlay) {
-            OpenLayers.Util.applyDefaults(
-                           this.params,
-                           this.OVERLAY_PARAMS
-                           );
-            if (!this.useAsyncOverlay) {
-              this.params.version = "1.0.0";
-            }
-          } else {
-            OpenLayers.Util.applyDefaults(
-                           this.params,
-                           this.SINGLE_TILE_PARAMS
-                           );
-          }         
-        } else {
-            //initialize for tiled layers
-            if (this.useHttpTile) {
-                OpenLayers.Util.applyDefaults(
-                               this.params,
-                               this.FOLDER_PARAMS
-                               );
-            } else {
-                OpenLayers.Util.applyDefaults(
-                               this.params,
-                               this.TILE_PARAMS
-                               );
-            }
-            this.setTileSize(this.defaultSize); 
-        }
-    },
-
-    /**
-     * Method: clone
-     * Create a clone of this layer
-     *
-     * Returns:
-     * {<OpenLayers.Layer.MapGuide>} An exact clone of this layer
-     */
-    clone: function (obj) {
-      if (obj == null) {
-            obj = new OpenLayers.Layer.MapGuide(this.name,
-                                           this.url,
-                                           this.params,
-                                           this.getOptions());
-      }
-      //get all additions from superclasses
-      obj = OpenLayers.Layer.Grid.prototype.clone.apply(this, [obj]);
-
-      return obj;
-    },
-
-    /**
-     * Method: getURL
-     * Return a query string for this layer
-     *
-     * Parameters:
-     * bounds - {<OpenLayers.Bounds>} A bounds representing the bbox 
-     *                                for the request
-     *
-     * Returns:
-     * {String} A string with the layer's url and parameters and also 
-     *          the passed-in bounds and appropriate tile size specified 
-     *          as parameters.
-     */
-    getURL: function (bounds) {
-        var url;
-        var center = bounds.getCenterLonLat();
-        var mapSize = this.map.getSize();
-
-        if (this.singleTile) {
-          //set up the call for GETMAPIMAGE or GETDYNAMICMAPOVERLAY with
-          //dynamic map parameters
-          var params = {
-            setdisplaydpi: OpenLayers.DOTS_PER_INCH,
-            setdisplayheight: mapSize.h*this.ratio,
-            setdisplaywidth: mapSize.w*this.ratio,
-            setviewcenterx: center.lon,
-            setviewcentery: center.lat,
-            setviewscale: this.map.getScale()
-          };
-          
-          if (this.useOverlay && !this.useAsyncOverlay) {
-            //first we need to call GETVISIBLEMAPEXTENT to set the extent
-            var getVisParams = {};
-            getVisParams = OpenLayers.Util.extend(getVisParams, params);
-            getVisParams.operation = "GETVISIBLEMAPEXTENT";
-            getVisParams.version = "1.0.0";
-            getVisParams.session = this.params.session;
-            getVisParams.mapName = this.params.mapName;
-            getVisParams.format = 'text/xml';
-            url = this.getFullRequestString( getVisParams );
-            
-            OpenLayers.Request.GET({url: url, async: false});
-          }
-          //construct the full URL
-          url = this.getFullRequestString( params );
-        } else {
-
-          //tiled version
-          var currentRes = this.map.getResolution();
-          var colidx = Math.floor((bounds.left-this.maxExtent.left)/currentRes);
-          colidx = Math.round(colidx/this.tileSize.w);
-          var rowidx = Math.floor((this.maxExtent.top-bounds.top)/currentRes);
-          rowidx = Math.round(rowidx/this.tileSize.h);
-
-          if (this.useHttpTile){
-              url = this.getImageFilePath(
-                   {
-                       tilecol: colidx,
-                       tilerow: rowidx,
-                       scaleindex: this.resolutions.length - this.map.zoom - 1
-                    });
-
-          } else {
-            url = this.getFullRequestString(
-                   {
-                       tilecol: colidx,
-                       tilerow: rowidx,
-                       scaleindex: this.resolutions.length - this.map.zoom - 1
-                    });
-          }
-       }
-       return url;
-    },
-
-    /**
-     * Method: getFullRequestString
-     * getFullRequestString on MapGuide layers is special, because we 
-     * do a regular expression replace on ',' in parameters to '+'.
-     * This is why it is subclassed here.
-     *
-     * Parameters:
-     * altUrl - {String} Alternative base URL to use.
-     *
-     * Returns:
-     * {String} A string with the layer's url appropriately encoded for MapGuide
-     */
-    getFullRequestString:function(newParams, altUrl) {
-        // use layer's url unless altUrl passed in
-        var url = (altUrl == null) ? this.url : altUrl;
-        
-        // if url is not a string, it should be an array of strings, 
-        //  in which case we will randomly select one of them in order
-        //  to evenly distribute requests to different urls.
-        if (typeof url == "object") {
-            url = url[Math.floor(Math.random()*url.length)];
-        }   
-        // requestString always starts with url
-        var requestString = url;        
-
-        // create a new params hashtable with all the layer params and the 
-        // new params together. then convert to string
-        var allParams = OpenLayers.Util.extend({}, this.params);
-        allParams = OpenLayers.Util.extend(allParams, newParams);
-        // ignore parameters that are already in the url search string
-        var urlParams = OpenLayers.Util.upperCaseObject(
-                            OpenLayers.Util.getParameters(url));
-        for(var key in allParams) {
-            if(key.toUpperCase() in urlParams) {
-                delete allParams[key];
-            }
-        }
-        var paramsString = OpenLayers.Util.getParameterString(allParams);
-        
-        /* MapGuide needs '+' seperating things like bounds/height/width.
-           Since typically this is URL encoded, we use a slight hack: we
-           depend on the list-like functionality of getParameterString to
-           leave ',' only in the case of list items (since otherwise it is
-           encoded) then do a regular expression replace on the , characters
-           to '+' */
-        paramsString = paramsString.replace(/,/g, "+");
-        
-        if (paramsString != "") {
-            var lastServerChar = url.charAt(url.length - 1);
-            if ((lastServerChar == "&") || (lastServerChar == "?")) {
-                requestString += paramsString;
-            } else {
-                if (url.indexOf('?') == -1) {
-                    //serverPath has no ? -- add one
-                    requestString += '?' + paramsString;
-                } else {
-                    //serverPath contains ?, so must already have paramsString at the end
-                    requestString += '&' + paramsString;
-                }
-            }
-        }
-        return requestString;
-    },
-
-     /** 
-     * Method: getImageFilePath
-     * special handler to request mapguide tiles from an http exposed tilecache 
-     *
-     * Parameters:
-     * altUrl - {String} Alternative base URL to use.
-     *
-     * Returns:
-     * {String} A string with the url for the tile image
-     */
-    getImageFilePath:function(newParams, altUrl) {
-        // use layer's url unless altUrl passed in
-        var url = (altUrl == null) ? this.url : altUrl;
-        
-        // if url is not a string, it should be an array of strings, 
-        //  in which case we will randomly select one of them in order
-        //  to evenly distribute requests to different urls.
-        if (typeof url == "object") {
-            url = url[Math.floor(Math.random()*url.length)];
-        }   
-        // requestString always starts with url
-        var requestString = url;        
-
-        var tileRowGroup = "";
-        var tileColGroup = "";
-        
-        if (newParams.tilerow < 0) {
-          tileRowGroup =  '-';
-        }
-          
-        if (newParams.tilerow == 0 ) {
-          tileRowGroup += '0';
-        } else {
-          tileRowGroup += Math.floor(Math.abs(newParams.tilerow/this.params.tileRowsPerFolder)) * this.params.tileRowsPerFolder;
-        }
-          
-        if (newParams.tilecol < 0) {
-          tileColGroup =  '-';
-        }
-        
-        if (newParams.tilecol == 0) {
-          tileColGroup += '0';
-        } else {
-          tileColGroup += Math.floor(Math.abs(newParams.tilecol/this.params.tileColumnsPerFolder)) * this.params.tileColumnsPerFolder;
-        }
-        
-        var tilePath = '/S' + Math.floor(newParams.scaleindex)
-                + '/' + this.params.basemaplayergroupname
-                + '/R' + tileRowGroup
-                + '/C' + tileColGroup
-                + '/' + (newParams.tilerow % this.params.tileRowsPerFolder) 
-                + '_' + (newParams.tilecol % this.params.tileColumnsPerFolder) 
-                + '.' + this.params.format;
-    
-        if (this.params.querystring) {
-               tilePath += "?" + this.params.querystring;
-        }
-        
-        requestString += tilePath;
-        return requestString;
-    },
-    
-    CLASS_NAME: "OpenLayers.Layer.MapGuide"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/MapServer.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/MapServer.js
deleted file mode 100644
index 713035f6..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/MapServer.js
+++ /dev/null
@@ -1,181 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Layer/Grid.js
- */
-
-/**
- * Class: OpenLayers.Layer.MapServer
- * Instances of OpenLayers.Layer.MapServer are used to display
- * data from a MapServer CGI instance.
- *
- * Inherits from:
- *  - <OpenLayers.Layer.Grid>
- */
-OpenLayers.Layer.MapServer = OpenLayers.Class(OpenLayers.Layer.Grid, {
-
-    /**
-     * Constant: DEFAULT_PARAMS
-     * {Object} Hashtable of default parameter key/value pairs 
-     */
-    DEFAULT_PARAMS: {
-        mode: "map",
-        map_imagetype: "png"
-    },
-
-    /**
-     * Constructor: OpenLayers.Layer.MapServer
-     * Create a new MapServer layer object
-     *
-     * Parameters:
-     * name - {String} A name for the layer
-     * url - {String} Base url for the MapServer CGI
-     *       (e.g. http://www2.dmsolutions.ca/cgi-bin/mapserv)
-     * params - {Object} An object with key/value pairs representing the
-     *          GetMap query string parameters and parameter values.
-     * options - {Object} Hashtable of extra options to tag onto the layer
-     */
-    initialize: function(name, url, params, options) {
-        OpenLayers.Layer.Grid.prototype.initialize.apply(this, arguments);
-
-        this.params = OpenLayers.Util.applyDefaults(
-            this.params, this.DEFAULT_PARAMS
-        );
-
-        // unless explicitly set in options, if the layer is transparent, 
-        // it will be an overlay
-        if (options == null || options.isBaseLayer == null) {
-            this.isBaseLayer = ((this.params.transparent != "true") && 
-                                (this.params.transparent != true));
-        }
-    },
-
-    /**
-     * Method: clone
-     * Create a clone of this layer
-     *
-     * Returns:
-     * {<OpenLayers.Layer.MapServer>} An exact clone of this layer
-     */
-    clone: function (obj) {
-        if (obj == null) {
-            obj = new OpenLayers.Layer.MapServer(this.name,
-                                           this.url,
-                                           this.params,
-                                           this.getOptions());
-        }
-        //get all additions from superclasses
-        obj = OpenLayers.Layer.Grid.prototype.clone.apply(this, [obj]);
-
-        // copy/set any non-init, non-simple values here
-
-        return obj;
-    },
-    
-    /**
-     * Method: getURL
-     * Return a query string for this layer
-     *
-     * Parameters:
-     * bounds - {<OpenLayers.Bounds>} A bounds representing the bbox 
-     *                                for the request
-     *
-     * Returns:
-     * {String} A string with the layer's url and parameters and also 
-     *          the passed-in bounds and appropriate tile size specified 
-     *          as parameters.
-     */
-    getURL: function (bounds) {
-        bounds = this.adjustBounds(bounds);
-        // Make a list, so that getFullRequestString uses literal "," 
-        var extent = [bounds.left, bounds. bottom, bounds.right, bounds.top];
-
-        var imageSize = this.getImageSize(); 
-        
-        // make lists, so that literal ','s are used 
-        var url = this.getFullRequestString(
-                     {mapext:   extent,
-                      imgext:   extent,
-                      map_size: [imageSize.w, imageSize.h],
-                      imgx:     imageSize.w / 2,
-                      imgy:     imageSize.h / 2,
-                      imgxy:    [imageSize.w, imageSize.h]
-                      });
-        
-        return url;
-    },
-    
-    /** 
-     * Method: getFullRequestString
-     * combine the layer's url with its params and these newParams. 
-     *   
-     * Parameters:
-     * newParams - {Object} New parameters that should be added to the 
-     *                      request string.
-     * altUrl - {String} (optional) Replace the URL in the full request  
-     *                              string with the provided URL.
-     * 
-     * Returns: 
-     * {String} A string with the layer's url and parameters embedded in it.
-     */
-    getFullRequestString:function(newParams, altUrl) {
-        // use layer's url unless altUrl passed in
-        var url = (altUrl == null) ? this.url : altUrl;
-        
-        // create a new params hashtable with all the layer params and the 
-        // new params together. then convert to string
-        var allParams = OpenLayers.Util.extend({}, this.params);
-        allParams = OpenLayers.Util.extend(allParams, newParams);
-        var paramsString = OpenLayers.Util.getParameterString(allParams);
-        
-        // if url is not a string, it should be an array of strings, 
-        // in which case we will deterministically select one of them in 
-        // order to evenly distribute requests to different urls.
-        if (OpenLayers.Util.isArray(url)) {
-            url = this.selectUrl(paramsString, url);
-        }   
-        
-        // ignore parameters that are already in the url search string
-        var urlParams = OpenLayers.Util.upperCaseObject(
-                            OpenLayers.Util.getParameters(url));
-        for(var key in allParams) {
-            if(key.toUpperCase() in urlParams) {
-                delete allParams[key];
-            }
-        }
-        paramsString = OpenLayers.Util.getParameterString(allParams);
-        
-        // requestString always starts with url
-        var requestString = url;        
-
-        // MapServer needs '+' seperating things like bounds/height/width.
-        //   Since typically this is URL encoded, we use a slight hack: we
-        //  depend on the list-like functionality of getParameterString to
-        //  leave ',' only in the case of list items (since otherwise it is
-        //  encoded) then do a regular expression replace on the , characters
-        //  to '+'
-        //
-        paramsString = paramsString.replace(/,/g, "+");
-        
-        if (paramsString != "") {
-            var lastServerChar = url.charAt(url.length - 1);
-            if ((lastServerChar == "&") || (lastServerChar == "?")) {
-                requestString += paramsString;
-            } else {
-                if (url.indexOf('?') == -1) {
-                    //serverPath has no ? -- add one
-                    requestString += '?' + paramsString;
-                } else {
-                    //serverPath contains ?, so must already have paramsString at the end
-                    requestString += '&' + paramsString;
-                }
-            }
-        }
-        return requestString;
-    },
-
-    CLASS_NAME: "OpenLayers.Layer.MapServer"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/Markers.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/Markers.js
deleted file mode 100644
index de848d49..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/Markers.js
+++ /dev/null
@@ -1,187 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-
-/**
- * @requires OpenLayers/Layer.js
- */
-
-/**
- * Class: OpenLayers.Layer.Markers
- * 
- * Inherits from:
- *  - <OpenLayers.Layer> 
- */
-OpenLayers.Layer.Markers = OpenLayers.Class(OpenLayers.Layer, {
-    
-    /** 
-     * APIProperty: isBaseLayer 
-     * {Boolean} Markers layer is never a base layer.  
-     */
-    isBaseLayer: false,
-    
-    /** 
-     * APIProperty: markers 
-     * {Array(<OpenLayers.Marker>)} internal marker list 
-     */
-    markers: null,
-
-
-    /** 
-     * Property: drawn 
-     * {Boolean} internal state of drawing. This is a workaround for the fact
-     * that the map does not call moveTo with a zoomChanged when the map is
-     * first starting up. This lets us catch the case where we have *never*
-     * drawn the layer, and draw it even if the zoom hasn't changed.
-     */
-    drawn: false,
-    
-    /**
-     * Constructor: OpenLayers.Layer.Markers 
-     * Create a Markers layer.
-     *
-     * Parameters:
-     * name - {String} 
-     * options - {Object} Hashtable of extra options to tag onto the layer
-     */
-    initialize: function(name, options) {
-        OpenLayers.Layer.prototype.initialize.apply(this, arguments);
-        this.markers = [];
-    },
-    
-    /**
-     * APIMethod: destroy 
-     */
-    destroy: function() {
-        this.clearMarkers();
-        this.markers = null;
-        OpenLayers.Layer.prototype.destroy.apply(this, arguments);
-    },
-
-    /**
-     * APIMethod: setOpacity
-     * Sets the opacity for all the markers.
-     * 
-     * Parameters:
-     * opacity - {Float}
-     */
-    setOpacity: function(opacity) {
-        if (opacity != this.opacity) {
-            this.opacity = opacity;
-            for (var i=0, len=this.markers.length; i<len; i++) {
-                this.markers[i].setOpacity(this.opacity);
-            }
-        }
-    },
-
-    /** 
-     * Method: moveTo
-     *
-     * Parameters:
-     * bounds - {<OpenLayers.Bounds>} 
-     * zoomChanged - {Boolean} 
-     * dragging - {Boolean} 
-     */
-    moveTo:function(bounds, zoomChanged, dragging) {
-        OpenLayers.Layer.prototype.moveTo.apply(this, arguments);
-
-        if (zoomChanged || !this.drawn) {
-            for(var i=0, len=this.markers.length; i<len; i++) {
-                this.drawMarker(this.markers[i]);
-            }
-            this.drawn = true;
-        }
-    },
-
-    /**
-     * APIMethod: addMarker
-     *
-     * Parameters:
-     * marker - {<OpenLayers.Marker>} 
-     */
-    addMarker: function(marker) {
-        this.markers.push(marker);
-
-        if (this.opacity < 1) {
-            marker.setOpacity(this.opacity);
-        }
-
-        if (this.map && this.map.getExtent()) {
-            marker.map = this.map;
-            this.drawMarker(marker);
-        }
-    },
-
-    /**
-     * APIMethod: removeMarker
-     *
-     * Parameters:
-     * marker - {<OpenLayers.Marker>} 
-     */
-    removeMarker: function(marker) {
-        if (this.markers && this.markers.length) {
-            OpenLayers.Util.removeItem(this.markers, marker);
-            marker.erase();
-        }
-    },
-
-    /**
-     * Method: clearMarkers
-     * This method removes all markers from a layer. The markers are not
-     * destroyed by this function, but are removed from the list of markers.
-     */
-    clearMarkers: function() {
-        if (this.markers != null) {
-            while(this.markers.length > 0) {
-                this.removeMarker(this.markers[0]);
-            }
-        }
-    },
-
-    /** 
-     * Method: drawMarker
-     * Calculate the pixel location for the marker, create it, and 
-     *    add it to the layer's div
-     *
-     * Parameters:
-     * marker - {<OpenLayers.Marker>} 
-     */
-    drawMarker: function(marker) {
-        var px = this.map.getLayerPxFromLonLat(marker.lonlat);
-        if (px == null) {
-            marker.display(false);
-        } else {
-            if (!marker.isDrawn()) {
-                var markerImg = marker.draw(px);
-                this.div.appendChild(markerImg);
-            } else if(marker.icon) {
-                marker.icon.moveTo(px);
-            }
-        }
-    },
-    
-    /** 
-     * APIMethod: getDataExtent
-     * Calculates the max extent which includes all of the markers.
-     * 
-     * Returns:
-     * {<OpenLayers.Bounds>}
-     */
-    getDataExtent: function () {
-        var maxExtent = null;
-        
-        if ( this.markers && (this.markers.length > 0)) {
-            var maxExtent = new OpenLayers.Bounds();
-            for(var i=0, len=this.markers.length; i<len; i++) {
-                var marker = this.markers[i];
-                maxExtent.extend(marker.lonlat);
-            }
-        }
-
-        return maxExtent;
-    },
-
-    CLASS_NAME: "OpenLayers.Layer.Markers"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/OSM.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/OSM.js
deleted file mode 100644
index 49150fd3..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/OSM.js
+++ /dev/null
@@ -1,123 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Layer/XYZ.js
- */
-
-/**
- * Class: OpenLayers.Layer.OSM
- * This layer allows accessing OpenStreetMap tiles. By default the OpenStreetMap
- *    hosted tile.openstreetmap.org Mapnik tileset is used. If you wish to use
- *    a different layer instead, you need to provide a different
- *    URL to the constructor. Here's an example for using OpenCycleMap:
- * 
- * (code)
- *     new OpenLayers.Layer.OSM("OpenCycleMap", 
- *       ["http://a.tile.opencyclemap.org/cycle/${z}/${x}/${y}.png",
- *        "http://b.tile.opencyclemap.org/cycle/${z}/${x}/${y}.png",
- *        "http://c.tile.opencyclemap.org/cycle/${z}/${x}/${y}.png"]); 
- * (end)
- *
- * Inherits from:
- *  - <OpenLayers.Layer.XYZ>
- */
-OpenLayers.Layer.OSM = OpenLayers.Class(OpenLayers.Layer.XYZ, {
-
-    /**
-     * APIProperty: name
-     * {String} The layer name. Defaults to "OpenStreetMap" if the first
-     * argument to the constructor is null or undefined.
-     */
-    name: "OpenStreetMap",
-
-    /**
-     * APIProperty: url
-     * {String} The tileset URL scheme. Defaults to
-     * : http://[a|b|c].tile.openstreetmap.org/${z}/${x}/${y}.png
-     * (the official OSM tileset) if the second argument to the constructor
-     * is null or undefined. To use another tileset you can have something
-     * like this:
-     * (code)
-     *     new OpenLayers.Layer.OSM("OpenCycleMap", 
-     *       ["http://a.tile.opencyclemap.org/cycle/${z}/${x}/${y}.png",
-     *        "http://b.tile.opencyclemap.org/cycle/${z}/${x}/${y}.png",
-     *        "http://c.tile.opencyclemap.org/cycle/${z}/${x}/${y}.png"]); 
-     * (end)
-     */
-    url: [
-        'http://a.tile.openstreetmap.org/${z}/${x}/${y}.png',
-        'http://b.tile.openstreetmap.org/${z}/${x}/${y}.png',
-        'http://c.tile.openstreetmap.org/${z}/${x}/${y}.png'
-    ],
-
-    /**
-     * Property: attribution
-     * {String} The layer attribution.
-     */
-    attribution: "&copy; <a href='http://www.openstreetmap.org/copyright'>OpenStreetMap</a> contributors",
-
-    /**
-     * Property: sphericalMercator
-     * {Boolean}
-     */
-    sphericalMercator: true,
-
-    /**
-     * Property: wrapDateLine
-     * {Boolean}
-     */
-    wrapDateLine: true,
-
-    /** APIProperty: tileOptions
-     *  {Object} optional configuration options for <OpenLayers.Tile> instances
-     *  created by this Layer. Default is
-     *
-     *  (code)
-     *  {crossOriginKeyword: 'anonymous'}
-     *  (end)
-     *
-     *  When using OSM tilesets other than the default ones, it may be
-     *  necessary to set this to
-     *
-     *  (code)
-     *  {crossOriginKeyword: null}
-     *  (end)
-     *
-     *  if the server does not send Access-Control-Allow-Origin headers.
-     */
-    tileOptions: null,
-
-    /**
-     * Constructor: OpenLayers.Layer.OSM
-     *
-     * Parameters:
-     * name - {String} The layer name.
-     * url - {String} The tileset URL scheme.
-     * options - {Object} Configuration options for the layer. Any inherited
-     *     layer option can be set in this object (e.g.
-     *     <OpenLayers.Layer.Grid.buffer>).
-     */
-    initialize: function(name, url, options) {
-        OpenLayers.Layer.XYZ.prototype.initialize.apply(this, arguments);
-        this.tileOptions = OpenLayers.Util.extend({
-            crossOriginKeyword: 'anonymous'
-        }, this.options && this.options.tileOptions);
-    },
-
-    /**
-     * Method: clone
-     */
-    clone: function(obj) {
-        if (obj == null) {
-            obj = new OpenLayers.Layer.OSM(
-                this.name, this.url, this.getOptions());
-        }
-        obj = OpenLayers.Layer.XYZ.prototype.clone.apply(this, [obj]);
-        return obj;
-    },
-
-    CLASS_NAME: "OpenLayers.Layer.OSM"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/PointGrid.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/PointGrid.js
deleted file mode 100644
index 10a4d022..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/PointGrid.js
+++ /dev/null
@@ -1,299 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Layer/Vector.js
- * @requires OpenLayers/Geometry/Polygon.js
- */
-
-/**
- * Class: OpenLayers.Layer.PointGrid
- * A point grid layer dynamically generates a regularly spaced grid of point
- *     features.  This is a specialty layer for cases where an application needs
- *     a regular grid of points.  It can be used, for example, in an editing
- *     environment to snap to a grid.
- *
- * Create a new vector layer with the <OpenLayers.Layer.PointGrid> constructor.
- * (code)
- * // create a grid with points spaced at 10 map units
- * var points = new OpenLayers.Layer.PointGrid({dx: 10, dy: 10});
- *
- * // create a grid with different x/y spacing rotated 15 degrees clockwise.
- * var points = new OpenLayers.Layer.PointGrid({dx: 5, dy: 10, rotation: 15});
- * (end)
- *
- * Inherits from:
- *  - <OpenLayers.Layer.Vector>
- */
-OpenLayers.Layer.PointGrid = OpenLayers.Class(OpenLayers.Layer.Vector, {
-
-    /**
-     * APIProperty: dx
-     * {Number} Point grid spacing in the x-axis direction (map units).  
-     * Read-only.  Use the <setSpacing> method to modify this value.
-     */
-    dx: null,
-
-    /**
-     * APIProperty: dy
-     * {Number} Point grid spacing in the y-axis direction (map units).  
-     * Read-only.  Use the <setSpacing> method to modify this value.
-     */
-    dy: null,
-
-    /**
-     * APIProperty: ratio
-     * {Number} Ratio of the desired grid size to the map viewport size.  
-     * Default is 1.5.  Larger ratios mean the grid is recalculated less often 
-     * while panning.  The <maxFeatures> setting has precedence when determining
-     * grid size.  Read-only.  Use the <setRatio> method to modify this value.
-     */
-    ratio: 1.5,
-
-    /**
-     * APIProperty: maxFeatures
-     * {Number} The maximum number of points to generate in the grid.  Default
-     * is 250.  Read-only.  Use the <setMaxFeatures> method to modify this value.
-     */
-    maxFeatures: 250,
-
-    /**
-     * APIProperty: rotation
-     * {Number} Grid rotation (in degrees clockwise from the positive x-axis).
-     * Default is 0.  Read-only.  Use the <setRotation> method to modify this
-     * value.
-     */
-    rotation: 0,
-
-    /**
-     * APIProperty: origin
-     * {<OpenLayers.LonLat>} Grid origin.  The grid lattice will be aligned with 
-     * the origin.  If not set at construction, the center of the map's maximum 
-     * extent is used.  Read-only.  Use the <setOrigin> method to modify this 
-     * value.
-     */
-    origin: null,
-
-    /**
-     * Property: gridBounds
-     * {<OpenLayers.Bounds>}  Internally cached grid bounds (with optional 
-     * rotation applied).
-     */
-    gridBounds: null,
-
-    /**
-     * Constructor: OpenLayers.Layer.PointGrid
-     * Creates a new point grid layer.
-     *
-     * Parameters:
-     * config - {Object} An object containing all configuration properties for
-     *     the layer.  The <dx> and <dy> properties are required to be set at 
-     *     construction.  Any other layer properties may be set in this object.
-     */
-    initialize: function(config) {
-        config = config || {};
-        OpenLayers.Layer.Vector.prototype.initialize.apply(this, [config.name, config]);
-    },
-    
-    /** 
-     * Method: setMap
-     * The layer has been added to the map. 
-     * 
-     * Parameters:
-     * map - {<OpenLayers.Map>} 
-     */
-    setMap: function(map) {        
-        OpenLayers.Layer.Vector.prototype.setMap.apply(this, arguments);
-        map.events.register("moveend", this, this.onMoveEnd);
-    },
-
-    /**
-     * Method: removeMap
-     * The layer has been removed from the map.
-     *
-     * Parameters:
-     * map - {<OpenLayers.Map>}
-     */
-    removeMap: function(map) {
-        map.events.unregister("moveend", this, this.onMoveEnd);
-        OpenLayers.Layer.Vector.prototype.removeMap.apply(this, arguments);
-    },
-    
-    /**
-     * APIMethod: setRatio
-     * Set the grid <ratio> property and update the grid.  Can only be called
-     *     after the layer has been added to a map with a center/extent.
-     *
-     * Parameters:
-     * ratio - {Number}
-     */
-    setRatio: function(ratio) {
-        this.ratio = ratio;
-        this.updateGrid(true);
-    },
-    
-    /**
-     * APIMethod: setMaxFeatures
-     * Set the grid <maxFeatures> property and update the grid.  Can only be 
-     *     called after the layer has been added to a map with a center/extent.
-     *
-     * Parameters:
-     * maxFeatures - {Number}
-     */
-    setMaxFeatures: function(maxFeatures) {
-        this.maxFeatures = maxFeatures;
-        this.updateGrid(true);
-    },
-
-    /**
-     * APIMethod: setSpacing
-     * Set the grid <dx> and <dy> properties and update the grid.  If only one
-     *     argument is provided, it will be set as <dx> and <dy>.  Can only be 
-     *     called after the layer has been added to a map with a center/extent.
-     *
-     * Parameters:
-     * dx - {Number}
-     * dy - {Number}
-     */
-    setSpacing: function(dx, dy) {
-        this.dx = dx;
-        this.dy = dy || dx;
-        this.updateGrid(true);
-    },
-    
-    /**
-     * APIMethod: setOrigin
-     * Set the grid <origin> property and update the grid.  Can only be called
-     *     after the layer has been added to a map with a center/extent.
-     *
-     * Parameters:
-     * origin - {<OpenLayers.LonLat>}
-     */
-    setOrigin: function(origin) {
-        this.origin = origin;
-        this.updateGrid(true);
-    },
-    
-    /**
-     * APIMethod: getOrigin
-     * Get the grid <origin> property.
-     *
-     * Returns:
-     * {<OpenLayers.LonLat>} The grid origin.
-     */
-    getOrigin: function() {
-        if (!this.origin) {
-            this.origin = this.map.getExtent().getCenterLonLat();
-        }
-        return this.origin;
-    },
-    
-    /**
-     * APIMethod: setRotation
-     * Set the grid <rotation> property and update the grid.  Rotation values
-     *     are in degrees clockwise from the positive x-axis (negative values
-     *     for counter-clockwise rotation).  Can only be called after the layer 
-     *     has been added to a map with a center/extent.
-     *
-     * Parameters:
-     * rotation - {Number} Degrees clockwise from the positive x-axis.
-     */
-    setRotation: function(rotation) {
-        this.rotation = rotation;
-        this.updateGrid(true);
-    },
-    
-    /**
-     * Method: onMoveEnd
-     * Listener for map "moveend" events.
-     */
-    onMoveEnd: function() {
-        this.updateGrid();
-    },
-    
-    /**
-     * Method: getViewBounds
-     * Gets the (potentially rotated) view bounds for grid calculations.
-     *
-     * Returns:
-     * {<OpenLayers.Bounds>}
-     */
-    getViewBounds: function() {
-        var bounds = this.map.getExtent();
-        if (this.rotation) {
-            var origin = this.getOrigin();
-            var rotationOrigin = new OpenLayers.Geometry.Point(origin.lon, origin.lat);
-            var rect = bounds.toGeometry();
-            rect.rotate(-this.rotation, rotationOrigin);
-            bounds = rect.getBounds();
-        }
-        return bounds;
-    },
-    
-    /**
-     * Method: updateGrid
-     * Update the grid.
-     *
-     * Parameters:
-     * force - {Boolean} Update the grid even if the previous bounds are still
-     *     valid.
-     */
-    updateGrid: function(force) {
-        if (force || this.invalidBounds()) {
-            var viewBounds = this.getViewBounds();
-            var origin = this.getOrigin();
-            var rotationOrigin = new OpenLayers.Geometry.Point(origin.lon, origin.lat);
-            var viewBoundsWidth = viewBounds.getWidth();
-            var viewBoundsHeight = viewBounds.getHeight();
-            var aspectRatio = viewBoundsWidth / viewBoundsHeight;
-            var maxHeight = Math.sqrt(this.dx * this.dy * this.maxFeatures / aspectRatio);
-            var maxWidth = maxHeight * aspectRatio; 
-            var gridWidth = Math.min(viewBoundsWidth * this.ratio, maxWidth);
-            var gridHeight = Math.min(viewBoundsHeight * this.ratio, maxHeight);
-            var center = viewBounds.getCenterLonLat();
-            this.gridBounds = new OpenLayers.Bounds(
-                center.lon - (gridWidth / 2),
-                center.lat - (gridHeight / 2),
-                center.lon + (gridWidth / 2),
-                center.lat + (gridHeight / 2)
-            );
-            var rows = Math.floor(gridHeight / this.dy);
-            var cols = Math.floor(gridWidth / this.dx);
-            var gridLeft = origin.lon + (this.dx * Math.ceil((this.gridBounds.left - origin.lon) / this.dx));
-            var gridBottom = origin.lat + (this.dy * Math.ceil((this.gridBounds.bottom - origin.lat) / this.dy));
-            var features = new Array(rows * cols);
-            var x, y, point;
-            for (var i=0; i<cols; ++i) {
-                x = gridLeft + (i * this.dx);
-                for (var j=0; j<rows; ++j) {
-                    y = gridBottom + (j * this.dy);
-                    point = new OpenLayers.Geometry.Point(x, y);
-                    if (this.rotation) {
-                        point.rotate(this.rotation, rotationOrigin);
-                    }
-                    features[(i*rows)+j] = new OpenLayers.Feature.Vector(point);
-                }
-            }
-            this.destroyFeatures(this.features, {silent: true});
-            this.addFeatures(features, {silent: true});
-        }
-    },
-
-    /**
-     * Method: invalidBounds
-     * Determine whether the previously generated point grid is invalid. 
-     *     This occurs when the map bounds extends beyond the previously 
-     *     generated grid bounds.
-     *
-     * Returns:
-     * {Boolean} 
-     */
-    invalidBounds: function() {
-        return !this.gridBounds || !this.gridBounds.containsBounds(this.getViewBounds());
-    },
-
-    CLASS_NAME: "OpenLayers.Layer.PointGrid"
-    
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/PointTrack.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/PointTrack.js
deleted file mode 100644
index accfac7d..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/PointTrack.js
+++ /dev/null
@@ -1,125 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Layer/Vector.js
- */
-
-/**
- * Class: OpenLayers.Layer.PointTrack
- * Vector layer to display ordered point features as a line, creating one
- * LineString feature for each pair of two points.
- *
- * Inherits from:
- *  - <OpenLayers.Layer.Vector> 
- */
-OpenLayers.Layer.PointTrack = OpenLayers.Class(OpenLayers.Layer.Vector, {
-  
-    /**
-     * APIProperty: dataFrom
-     *     {<OpenLayers.Layer.PointTrack.TARGET_NODE>} or
-     *     {<OpenLayers.Layer.PointTrack.SOURCE_NODE>} optional. If the lines
-     *     should get the data/attributes from one of the two points it is
-     *     composed of, which one should it be?
-     */
-    dataFrom: null,
-    
-    /**
-     * APIProperty: styleFrom
-     *     {<OpenLayers.Layer.PointTrack.TARGET_NODE>} or
-     *     {<OpenLayers.Layer.PointTrack.SOURCE_NODE>} optional. If the lines
-     *     should get the style from one of the two points it is composed of,
-     *     which one should it be?
-     */
-    styleFrom: null,
-    
-    /**
-     * Constructor: OpenLayers.PointTrack
-     * Constructor for a new OpenLayers.PointTrack instance.
-     *
-     * Parameters:
-     * name     - {String} name of the layer
-     * options  - {Object} Optional object with properties to tag onto the
-     *            instance.
-     */    
-        
-    /**
-     * APIMethod: addNodes
-     * Adds point features that will be used to create lines from, using point
-     * pairs. The first point of a pair will be the source node, the second
-     * will be the target node.
-     * 
-     * Parameters:
-     * pointFeatures - {Array(<OpenLayers.Feature>)}
-     * options - {Object}
-     * 
-     * Supported options:
-     * silent - {Boolean} true to suppress (before)feature(s)added events
-     */
-    addNodes: function(pointFeatures, options) {
-        if (pointFeatures.length < 2) {
-            throw new Error("At least two point features have to be added to " +
-                            "create a line from");
-        }
-        
-        var lines = new Array(pointFeatures.length-1);
-        
-        var pointFeature, startPoint, endPoint;
-        for(var i=0, len=pointFeatures.length; i<len; i++) {
-            pointFeature = pointFeatures[i];
-            endPoint = pointFeature.geometry;
-            
-            if (!endPoint) {
-              var lonlat = pointFeature.lonlat;
-              endPoint = new OpenLayers.Geometry.Point(lonlat.lon, lonlat.lat);
-            } else if(endPoint.CLASS_NAME != "OpenLayers.Geometry.Point") {
-                throw new TypeError("Only features with point geometries are supported.");
-            }
-            
-            if(i > 0) {
-                var attributes = (this.dataFrom != null) ?
-                        (pointFeatures[i+this.dataFrom].data ||
-                                pointFeatures[i+this.dataFrom].attributes) :
-                        null;
-                var style = (this.styleFrom != null) ?
-                        (pointFeatures[i+this.styleFrom].style) :
-                        null;
-                var line = new OpenLayers.Geometry.LineString([startPoint,
-                        endPoint]);
-                        
-                lines[i-1] = new OpenLayers.Feature.Vector(line, attributes,
-                    style);
-            }
-            
-            startPoint = endPoint;
-        }
-
-        this.addFeatures(lines, options);
-    },
-    
-    CLASS_NAME: "OpenLayers.Layer.PointTrack"
-});
-
-/**
- * Constant: OpenLayers.Layer.PointTrack.SOURCE_NODE
- * {Number} value for <OpenLayers.Layer.PointTrack.dataFrom> and
- * <OpenLayers.Layer.PointTrack.styleFrom>
- */
-OpenLayers.Layer.PointTrack.SOURCE_NODE = -1;
-
-/**
- * Constant: OpenLayers.Layer.PointTrack.TARGET_NODE
- * {Number} value for <OpenLayers.Layer.PointTrack.dataFrom> and
- * <OpenLayers.Layer.PointTrack.styleFrom>
- */
-OpenLayers.Layer.PointTrack.TARGET_NODE = 0;
-
-/**
- * Constant: OpenLayers.Layer.PointTrack.dataFrom
- * {Object} with the following keys - *deprecated*
- * - SOURCE_NODE: take data/attributes from the source node of the line
- * - TARGET_NODE: take data/attributes from the target node of the line
- */
-OpenLayers.Layer.PointTrack.dataFrom = {'SOURCE_NODE': -1, 'TARGET_NODE': 0};
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/SphericalMercator.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/SphericalMercator.js
deleted file mode 100644
index 60bb2fe7..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/SphericalMercator.js
+++ /dev/null
@@ -1,146 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Layer.js
- * @requires OpenLayers/Projection.js
- */
-
-/**
- * Class: OpenLayers.Layer.SphericalMercator
- * A mixin for layers that wraps up the pieces neccesary to have a coordinate
- *     conversion for working with commercial APIs which use a spherical
- *     mercator projection.  Using this layer as a base layer, additional
- *     layers can be used as overlays if they are in the same projection.
- *
- * A layer is given properties of this object by setting the sphericalMercator
- *     property to true.
- *
- * More projection information:
- *  - http://spatialreference.org/ref/user/google-projection/
- *
- * Proj4 Text:
- *     +proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0
- *     +k=1.0 +units=m +nadgrids=@null +no_defs
- *
- * WKT:
- *     900913=PROJCS["WGS84 / Simple Mercator", GEOGCS["WGS 84",
- *     DATUM["WGS_1984", SPHEROID["WGS_1984", 6378137.0, 298.257223563]], 
- *     PRIMEM["Greenwich", 0.0], UNIT["degree", 0.017453292519943295], 
- *     AXIS["Longitude", EAST], AXIS["Latitude", NORTH]],
- *     PROJECTION["Mercator_1SP_Google"], 
- *     PARAMETER["latitude_of_origin", 0.0], PARAMETER["central_meridian", 0.0], 
- *     PARAMETER["scale_factor", 1.0], PARAMETER["false_easting", 0.0], 
- *     PARAMETER["false_northing", 0.0], UNIT["m", 1.0], AXIS["x", EAST],
- *     AXIS["y", NORTH], AUTHORITY["EPSG","900913"]]
- */
-OpenLayers.Layer.SphericalMercator = {
-
-    /**
-     * Method: getExtent
-     * Get the map's extent.
-     *
-     * Returns:
-     * {<OpenLayers.Bounds>} The map extent.
-     */
-    getExtent: function() {
-        var extent = null;
-        if (this.sphericalMercator) {
-            extent = this.map.calculateBounds();
-        } else {
-            extent = OpenLayers.Layer.FixedZoomLevels.prototype.getExtent.apply(this);
-        }
-        return extent;
-    },
-
-    /**
-     * Method: getLonLatFromViewPortPx
-     * Get a map location from a pixel location
-     * 
-     * Parameters:
-     * viewPortPx - {<OpenLayers.Pixel>}
-     *
-     * Returns:
-     *  {<OpenLayers.LonLat>} An OpenLayers.LonLat which is the passed-in view
-     *  port OpenLayers.Pixel, translated into lon/lat by map lib
-     *  If the map lib is not loaded or not centered, returns null
-     */
-    getLonLatFromViewPortPx: function (viewPortPx) {
-        return OpenLayers.Layer.prototype.getLonLatFromViewPortPx.apply(this, arguments);
-    },
-    
-    /**
-     * Method: getViewPortPxFromLonLat
-     * Get a pixel location from a map location
-     *
-     * Parameters:
-     * lonlat - {<OpenLayers.LonLat>}
-     *
-     * Returns:
-     * {<OpenLayers.Pixel>} An OpenLayers.Pixel which is the passed-in
-     * OpenLayers.LonLat, translated into view port pixels by map lib
-     * If map lib is not loaded or not centered, returns null
-     */
-    getViewPortPxFromLonLat: function (lonlat) {
-        return OpenLayers.Layer.prototype.getViewPortPxFromLonLat.apply(this, arguments);
-    },
-
-    /** 
-     * Method: initMercatorParameters 
-     * Set up the mercator parameters on the layer: resolutions,
-     *     projection, units.
-     */
-    initMercatorParameters: function() {
-        // set up properties for Mercator - assume EPSG:900913
-        this.RESOLUTIONS = [];
-        var maxResolution = 156543.03390625;
-        for(var zoom=0; zoom<=this.MAX_ZOOM_LEVEL; ++zoom) {
-            this.RESOLUTIONS[zoom] = maxResolution / Math.pow(2, zoom);
-        }
-        this.units = "m";
-        this.projection = this.projection || "EPSG:900913";
-    },
-
-    /**
-     * APIMethod: forwardMercator
-     * Given a lon,lat in EPSG:4326, return a point in Spherical Mercator.
-     *
-     * Parameters:
-     * lon - {float} 
-     * lat - {float}
-     * 
-     * Returns:
-     * {<OpenLayers.LonLat>} The coordinates transformed to Mercator.
-     */
-    forwardMercator: (function() {
-        var gg = new OpenLayers.Projection("EPSG:4326");
-        var sm = new OpenLayers.Projection("EPSG:900913");
-        return function(lon, lat) {
-            var point = OpenLayers.Projection.transform({x: lon, y: lat}, gg, sm);
-            return new OpenLayers.LonLat(point.x, point.y);
-        };
-    })(),
-
-    /**
-     * APIMethod: inverseMercator
-     * Given a x,y in Spherical Mercator, return a point in EPSG:4326.
-     *
-     * Parameters:
-     * x - {float} A map x in Spherical Mercator.
-     * y - {float} A map y in Spherical Mercator.
-     * 
-     * Returns:
-     * {<OpenLayers.LonLat>} The coordinates transformed to EPSG:4326.
-     */
-    inverseMercator: (function() {
-        var gg = new OpenLayers.Projection("EPSG:4326");
-        var sm = new OpenLayers.Projection("EPSG:900913");
-        return function(x, y) {
-            var point = OpenLayers.Projection.transform({x: x, y: y}, sm, gg);
-            return new OpenLayers.LonLat(point.x, point.y);
-        };
-    })()
-
-};
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/TMS.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/TMS.js
deleted file mode 100644
index ab768475..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/TMS.js
+++ /dev/null
@@ -1,202 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-
-/**
- * @requires OpenLayers/Layer/Grid.js
- */
-
-/**
- * Class: OpenLayers.Layer.TMS
- * Create a layer for accessing tiles from services that conform with the 
- *     Tile Map Service Specification 
- *     (http://wiki.osgeo.org/wiki/Tile_Map_Service_Specification).
- *
- * Example:
- * (code)
- *     var layer = new OpenLayers.Layer.TMS(
- *         "My Layer", // name for display in LayerSwitcher
- *         "http://tilecache.osgeo.org/wms-c/Basic.py/", // service endpoint
- *         {layername: "basic", type: "png"} // required properties
- *     );
- * (end)
- * 
- * Inherits from:
- *  - <OpenLayers.Layer.Grid>
- */
-OpenLayers.Layer.TMS = OpenLayers.Class(OpenLayers.Layer.Grid, {
-
-    /**
-     * APIProperty: serviceVersion
-     * {String} Service version for tile requests.  Default is "1.0.0".
-     */
-    serviceVersion: "1.0.0",
-
-    /**
-     * APIProperty: layername
-     * {String} The identifier for the <TileMap> as advertised by the service.  
-     *     For example, if the service advertises a <TileMap> with 
-     *    'href="http://tms.osgeo.org/1.0.0/vmap0"', the <layername> property 
-     *     would be set to "vmap0".
-     */
-    layername: null,
-
-    /**
-     * APIProperty: type
-     * {String} The format extension corresponding to the requested tile image
-     *     type.  This is advertised in a <TileFormat> element as the 
-     *     "extension" attribute.  For example, if the service advertises a 
-     *     <TileMap> with <TileFormat width="256" height="256" mime-type="image/jpeg" extension="jpg" />,
-     *     the <type> property would be set to "jpg".
-     */
-    type: null,
-
-    /**
-     * APIProperty: isBaseLayer
-     * {Boolean} Make this layer a base layer.  Default is true.  Set false to
-     *     use the layer as an overlay.
-     */
-    isBaseLayer: true,
-
-    /**
-     * APIProperty: tileOrigin
-     * {<OpenLayers.LonLat>} Optional origin for aligning the grid of tiles.
-     *     If provided, requests for tiles at all resolutions will be aligned
-     *     with this location (no tiles shall overlap this location).  If
-     *     not provided, the grid of tiles will be aligned with the bottom-left
-     *     corner of the map's <maxExtent>.  Default is ``null``.
-     *
-     * Example:
-     * (code)
-     *     var layer = new OpenLayers.Layer.TMS(
-     *         "My Layer",
-     *         "http://tilecache.osgeo.org/wms-c/Basic.py/",
-     *         {
-     *             layername: "basic", 
-     *             type: "png",
-     *             // set if different than the bottom left of map.maxExtent
-     *             tileOrigin: new OpenLayers.LonLat(-180, -90)
-     *         }
-     *     );
-     * (end)
-     */
-    tileOrigin: null,
-
-    /**
-     * APIProperty: serverResolutions
-     * {Array} A list of all resolutions available on the server.  Only set this
-     *     property if the map resolutions differ from the server. This
-     *     property serves two purposes. (a) <serverResolutions> can include
-     *     resolutions that the server supports and that you don't want to
-     *     provide with this layer; you can also look at <zoomOffset>, which is
-     *     an alternative to <serverResolutions> for that specific purpose.
-     *     (b) The map can work with resolutions that aren't supported by
-     *     the server, i.e. that aren't in <serverResolutions>. When the
-     *     map is displayed in such a resolution data for the closest
-     *     server-supported resolution is loaded and the layer div is
-     *     stretched as necessary.
-     */
-    serverResolutions: null,
-
-    /**
-     * APIProperty: zoomOffset
-     * {Number} If your cache has more zoom levels than you want to provide
-     *     access to with this layer, supply a zoomOffset.  This zoom offset
-     *     is added to the current map zoom level to determine the level
-     *     for a requested tile.  For example, if you supply a zoomOffset
-     *     of 3, when the map is at the zoom 0, tiles will be requested from
-     *     level 3 of your cache.  Default is 0 (assumes cache level and map
-     *     zoom are equivalent).  Using <zoomOffset> is an alternative to
-     *     setting <serverResolutions> if you only want to expose a subset
-     *     of the server resolutions.
-     */
-    zoomOffset: 0,
-    
-    /**
-     * Constructor: OpenLayers.Layer.TMS
-     * 
-     * Parameters:
-     * name - {String} Title to be displayed in a <OpenLayers.Control.LayerSwitcher>
-     * url - {String} Service endpoint (without the version number).  E.g.
-     *     "http://tms.osgeo.org/".
-     * options - {Object} Additional properties to be set on the layer.  The
-     *     <layername> and <type> properties must be set here.
-     */
-    initialize: function(name, url, options) {
-        var newArguments = [];
-        newArguments.push(name, url, {}, options);
-        OpenLayers.Layer.Grid.prototype.initialize.apply(this, newArguments);
-    },    
-
-    /**
-     * APIMethod: clone
-     * Create a complete copy of this layer.
-     *
-     * Parameters:
-     * obj - {Object} Should only be provided by subclasses that call this
-     *     method.
-     * 
-     * Returns:
-     * {<OpenLayers.Layer.TMS>} An exact clone of this <OpenLayers.Layer.TMS>
-     */
-    clone: function (obj) {
-        
-        if (obj == null) {
-            obj = new OpenLayers.Layer.TMS(this.name,
-                                           this.url,
-                                           this.getOptions());
-        }
-
-        //get all additions from superclasses
-        obj = OpenLayers.Layer.Grid.prototype.clone.apply(this, [obj]);
-
-        // copy/set any non-init, non-simple values here
-
-        return obj;
-    },    
-    
-    /**
-     * Method: getURL
-     * 
-     * Parameters:
-     * bounds - {<OpenLayers.Bounds>}
-     * 
-     * Returns:
-     * {String} A string with the layer's url and parameters and also the 
-     *          passed-in bounds and appropriate tile size specified as 
-     *          parameters
-     */
-    getURL: function (bounds) {
-        bounds = this.adjustBounds(bounds);
-        var res = this.getServerResolution();
-        var x = Math.round((bounds.left - this.tileOrigin.lon) / (res * this.tileSize.w));
-        var y = Math.round((bounds.bottom - this.tileOrigin.lat) / (res * this.tileSize.h));
-        var z = this.getServerZoom();
-        var path = this.serviceVersion + "/" + this.layername + "/" + z + "/" + x + "/" + y + "." + this.type; 
-        var url = this.url;
-        if (OpenLayers.Util.isArray(url)) {
-            url = this.selectUrl(path, url);
-        }
-        return url + path;
-    },
-
-    /** 
-     * Method: setMap
-     * When the layer is added to a map, then we can fetch our origin 
-     *    (if we don't have one.) 
-     * 
-     * Parameters:
-     * map - {<OpenLayers.Map>}
-     */
-    setMap: function(map) {
-        OpenLayers.Layer.Grid.prototype.setMap.apply(this, arguments);
-        if (!this.tileOrigin) { 
-            this.tileOrigin = new OpenLayers.LonLat(this.map.maxExtent.left,
-                                                this.map.maxExtent.bottom);
-        }                                       
-    },
-
-    CLASS_NAME: "OpenLayers.Layer.TMS"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/Text.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/Text.js
deleted file mode 100644
index 4a4c9e3f..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/Text.js
+++ /dev/null
@@ -1,267 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-
-/**
- * @requires OpenLayers/Layer/Markers.js
- * @requires OpenLayers/Format/Text.js
- * @requires OpenLayers/Request/XMLHttpRequest.js
- */
-
-/**
- * Class: OpenLayers.Layer.Text
- * This layer creates markers given data in a text file.  The <location>
- *     property of the layer (specified as a property of the options argument
- *     in the <OpenLayers.Layer.Text> constructor) points to a tab delimited
- *     file with data used to create markers.
- *
- * The first row of the data file should be a header line with the column names
- *     of the data. Each column should be delimited by a tab space. The
- *     possible columns are:
- *      - *point* lat,lon of the point where a marker is to be placed
- *      - *lat*  Latitude of the point where a marker is to be placed
- *      - *lon*  Longitude of the point where a marker is to be placed
- *      - *icon* or *image* URL of marker icon to use.
- *      - *iconSize* Size of Icon to use.
- *      - *iconOffset* Where the top-left corner of the icon is to be placed
- *            relative to the latitude and longitude of the point.
- *      - *title* The text of the 'title' is placed inside an 'h2' marker
- *            inside a popup, which opens when the marker is clicked.
- *      - *description* The text of the 'description' is placed below the h2
- *            in the popup. this can be plain text or HTML.
- *
- * Example text file:
- * (code)
- * lat	lon	title	description	iconSize	iconOffset	icon
- * 10	20	title	description	21,25		-10,-25		http://www.openlayers.org/dev/img/marker.png
- * (end)
- *
- * Inherits from:
- *  - <OpenLayers.Layer.Markers>
- */
-OpenLayers.Layer.Text = OpenLayers.Class(OpenLayers.Layer.Markers, {
-
-    /**
-     * APIProperty: location 
-     * {String} URL of text file.  Must be specified in the "options" argument
-     *   of the constructor. Can not be changed once passed in. 
-     */
-    location:null,
-
-    /** 
-     * Property: features
-     * {Array(<OpenLayers.Feature>)} 
-     */
-    features: null,
-    
-    /**
-     * APIProperty: formatOptions
-     * {Object} Hash of options which should be passed to the format when it is
-     * created. Must be passed in the constructor.
-     */
-    formatOptions: null, 
-
-    /** 
-     * Property: selectedFeature
-     * {<OpenLayers.Feature>}
-     */
-    selectedFeature: null,
-
-    /**
-     * Constructor: OpenLayers.Layer.Text
-     * Create a text layer.
-     * 
-     * Parameters:
-     * name - {String} 
-     * options - {Object} Object with properties to be set on the layer.
-     *     Must include <location> property.
-     */
-    initialize: function(name, options) {
-        OpenLayers.Layer.Markers.prototype.initialize.apply(this, arguments);
-        this.features = [];
-    },
-
-    /**
-     * APIMethod: destroy 
-     */
-    destroy: function() {
-        // Warning: Layer.Markers.destroy() must be called prior to calling
-        // clearFeatures() here, otherwise we leak memory. Indeed, if
-        // Layer.Markers.destroy() is called after clearFeatures(), it won't be
-        // able to remove the marker image elements from the layer's div since
-        // the markers will have been destroyed by clearFeatures().
-        OpenLayers.Layer.Markers.prototype.destroy.apply(this, arguments);
-        this.clearFeatures();
-        this.features = null;
-    },
-    
-    /**
-     * Method: loadText
-     * Start the load of the Text data. Don't do this when we first add the layer,
-     * since we may not be visible at any point, and it would therefore be a waste.
-     */
-    loadText: function() {
-        if (!this.loaded) {
-            if (this.location != null) {
-
-                var onFail = function(e) {
-                    this.events.triggerEvent("loadend");
-                };
-
-                this.events.triggerEvent("loadstart");
-                OpenLayers.Request.GET({
-                    url: this.location,
-                    success: this.parseData,
-                    failure: onFail,
-                    scope: this
-                });
-                this.loaded = true;
-            }
-        }    
-    },    
-    
-    /**
-     * Method: moveTo
-     * If layer is visible and Text has not been loaded, load Text. 
-     * 
-     * Parameters:
-     * bounds - {Object} 
-     * zoomChanged - {Object} 
-     * minor - {Object} 
-     */
-    moveTo:function(bounds, zoomChanged, minor) {
-        OpenLayers.Layer.Markers.prototype.moveTo.apply(this, arguments);
-        if(this.visibility && !this.loaded){
-            this.loadText();
-        }
-    },
-    
-    /**
-     * Method: parseData
-     *
-     * Parameters:
-     * ajaxRequest - {<OpenLayers.Request.XMLHttpRequest>} 
-     */
-    parseData: function(ajaxRequest) {
-        var text = ajaxRequest.responseText;
-        
-        var options = {};
-        
-        OpenLayers.Util.extend(options, this.formatOptions);
-        
-        if (this.map && !this.projection.equals(this.map.getProjectionObject())) {
-            options.externalProjection = this.projection;
-            options.internalProjection = this.map.getProjectionObject();
-        }    
-        
-        var parser = new OpenLayers.Format.Text(options);
-        var features = parser.read(text);
-        for (var i=0, len=features.length; i<len; i++) {
-            var data = {};
-            var feature = features[i];
-            var location;
-            var iconSize, iconOffset;
-            
-            location = new OpenLayers.LonLat(feature.geometry.x, 
-                                             feature.geometry.y);
-            
-            if (feature.style.graphicWidth 
-                && feature.style.graphicHeight) {
-                iconSize = new OpenLayers.Size(
-                    feature.style.graphicWidth,
-                    feature.style.graphicHeight);
-            }        
-            
-            // FIXME: At the moment, we only use this if we have an 
-            // externalGraphic, because icon has no setOffset API Method.
-            /**
-             * FIXME FIRST!!
-             * The Text format does all sorts of parseFloating
-             * The result of a parseFloat for a bogus string is NaN.  That
-             * means the three possible values here are undefined, NaN, or a
-             * number.  The previous check was an identity check for null.  This
-             * means it was failing for all undefined or NaN.  A slightly better
-             * check is for undefined.  An even better check is to see if the
-             * value is a number (see #1441).
-             */
-            if (feature.style.graphicXOffset !== undefined
-                && feature.style.graphicYOffset !== undefined) {
-                iconOffset = new OpenLayers.Pixel(
-                    feature.style.graphicXOffset, 
-                    feature.style.graphicYOffset);
-            }
-            
-            if (feature.style.externalGraphic != null) {
-                data.icon = new OpenLayers.Icon(feature.style.externalGraphic, 
-                                                iconSize, 
-                                                iconOffset);
-            } else {
-                data.icon = OpenLayers.Marker.defaultIcon();
-
-                //allows for the case where the image url is not 
-                // specified but the size is. use a default icon
-                // but change the size
-                if (iconSize != null) {
-                    data.icon.setSize(iconSize);
-                }
-            }
-            
-            if ((feature.attributes.title != null) 
-                && (feature.attributes.description != null)) {
-                data['popupContentHTML'] = 
-                    '<h2>'+feature.attributes.title+'</h2>' + 
-                    '<p>'+feature.attributes.description+'</p>';
-            }
-            
-            data['overflow'] = feature.attributes.overflow || "auto"; 
-            
-            var markerFeature = new OpenLayers.Feature(this, location, data);
-            this.features.push(markerFeature);
-            var marker = markerFeature.createMarker();
-            if ((feature.attributes.title != null) 
-                && (feature.attributes.description != null)) {
-              marker.events.register('click', markerFeature, this.markerClick);
-            }
-            this.addMarker(marker);
-        }
-        this.events.triggerEvent("loadend");
-    },
-    
-    /**
-     * Property: markerClick
-     * 
-     * Parameters:
-     * evt - {Event} 
-     *
-     * Context:
-     * - {<OpenLayers.Feature>}
-     */
-    markerClick: function(evt) {
-        var sameMarkerClicked = (this == this.layer.selectedFeature);
-        this.layer.selectedFeature = (!sameMarkerClicked) ? this : null;
-        for(var i=0, len=this.layer.map.popups.length; i<len; i++) {
-            this.layer.map.removePopup(this.layer.map.popups[i]);
-        }
-        if (!sameMarkerClicked) {
-            this.layer.map.addPopup(this.createPopup()); 
-        }
-        OpenLayers.Event.stop(evt);
-    },
-
-    /**
-     * Method: clearFeatures
-     */
-    clearFeatures: function() {
-        if (this.features != null) {
-            while(this.features.length > 0) {
-                var feature = this.features[0];
-                OpenLayers.Util.removeItem(this.features, feature);
-                feature.destroy();
-            }
-        }        
-    },
-
-    CLASS_NAME: "OpenLayers.Layer.Text"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/TileCache.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/TileCache.js
deleted file mode 100644
index 5b336beb..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/TileCache.js
+++ /dev/null
@@ -1,140 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-
-/**
- * @requires OpenLayers/Layer/Grid.js
- */
-
-/**
- * Class: OpenLayers.Layer.TileCache
- * A read only TileCache layer.  Used to requests tiles cached by TileCache in
- *     a web accessible cache.  This means that you have to pre-populate your
- *     cache before this layer can be used.  It is meant only to read tiles
- *     created by TileCache, and not to make calls to TileCache for tile
- *     creation.  Create a new instance with the
- *     <OpenLayers.Layer.TileCache> constructor.
- *
- * Inherits from:
- *  - <OpenLayers.Layer.Grid>
- */
-OpenLayers.Layer.TileCache = OpenLayers.Class(OpenLayers.Layer.Grid, {
-
-    /** 
-     * APIProperty: isBaseLayer
-     * {Boolean} Treat this layer as a base layer.  Default is true.
-     */
-    isBaseLayer: true,
-    
-    /** 
-     * APIProperty: format
-     * {String} Mime type of the images returned.  Default is image/png.
-     */
-    format: 'image/png',
-
-    /**
-     * APIProperty: serverResolutions
-     * {Array} A list of all resolutions available on the server.  Only set this
-     *     property if the map resolutions differ from the server. This
-     *     property serves two purposes. (a) <serverResolutions> can include
-     *     resolutions that the server supports and that you don't want to
-     *     provide with this layer. (b) The map can work with resolutions
-     *     that aren't supported by the server, i.e. that aren't in
-     *     <serverResolutions>. When the map is displayed in such a resolution
-     *     data for the closest server-supported resolution is loaded and the
-     *     layer div is stretched as necessary.
-     */
-    serverResolutions: null,
-
-    /**
-     * Constructor: OpenLayers.Layer.TileCache
-     * Create a new read only TileCache layer.
-     *
-     * Parameters:
-     * name - {String} Name of the layer displayed in the interface
-     * url - {String} Location of the web accessible cache (not the location of
-     *     your tilecache script!)
-     * layername - {String} Layer name as defined in the TileCache 
-     *     configuration
-     * options - {Object} Optional object with properties to be set on the
-     *     layer.  Note that you should speficy your resolutions to match
-     *     your TileCache configuration.  This can be done by setting
-     *     the resolutions array directly (here or on the map), by setting
-     *     maxResolution and numZoomLevels, or by using scale based properties.
-     */
-    initialize: function(name, url, layername, options) {
-        this.layername = layername;
-        OpenLayers.Layer.Grid.prototype.initialize.apply(this,
-                                                         [name, url, {}, options]);
-        this.extension = this.format.split('/')[1].toLowerCase();
-        this.extension = (this.extension == 'jpg') ? 'jpeg' : this.extension;
-    },    
-
-    /**
-     * APIMethod: clone
-     * obj - {Object} 
-     * 
-     * Returns:
-     * {<OpenLayers.Layer.TileCache>} An exact clone of this 
-     *     <OpenLayers.Layer.TileCache>
-     */
-    clone: function (obj) {
-        
-        if (obj == null) {
-            obj = new OpenLayers.Layer.TileCache(this.name,
-                                                 this.url,
-                                                 this.layername,
-                                                 this.getOptions());
-        }
-
-        //get all additions from superclasses
-        obj = OpenLayers.Layer.Grid.prototype.clone.apply(this, [obj]);
-
-        // copy/set any non-init, non-simple values here
-
-        return obj;
-    },    
-    
-    /**
-     * Method: getURL
-     *
-     * Parameters:
-     * bounds - {<OpenLayers.Bounds>} 
-     * 
-     * Returns:
-     * {String} A string with the layer's url and parameters and also the 
-     *     passed-in bounds and appropriate tile size specified as parameters.
-     */
-    getURL: function(bounds) {
-        var res = this.getServerResolution();
-        var bbox = this.maxExtent;
-        var size = this.tileSize;
-        var tileX = Math.round((bounds.left - bbox.left) / (res * size.w));
-        var tileY = Math.round((bounds.bottom - bbox.bottom) / (res * size.h));
-        var tileZ = this.serverResolutions != null ?
-            OpenLayers.Util.indexOf(this.serverResolutions, res) :
-            this.map.getZoom();
-
-        var components = [
-            this.layername,
-            OpenLayers.Number.zeroPad(tileZ, 2),
-            OpenLayers.Number.zeroPad(parseInt(tileX / 1000000), 3),
-            OpenLayers.Number.zeroPad((parseInt(tileX / 1000) % 1000), 3),
-            OpenLayers.Number.zeroPad((parseInt(tileX) % 1000), 3),
-            OpenLayers.Number.zeroPad(parseInt(tileY / 1000000), 3),
-            OpenLayers.Number.zeroPad((parseInt(tileY / 1000) % 1000), 3),
-            OpenLayers.Number.zeroPad((parseInt(tileY) % 1000), 3) + '.' + this.extension
-        ];
-        var path = components.join('/'); 
-        var url = this.url;
-        if (OpenLayers.Util.isArray(url)) {
-            url = this.selectUrl(path, url);
-        }
-        url = (url.charAt(url.length - 1) == '/') ? url : url + '/';
-        return url + path;
-    },
-    
-    CLASS_NAME: "OpenLayers.Layer.TileCache"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/UTFGrid.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/UTFGrid.js
deleted file mode 100644
index 878cb4b4..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/UTFGrid.js
+++ /dev/null
@@ -1,184 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Layer/XYZ.js
- * @requires OpenLayers/Tile/UTFGrid.js
- */
-
-/** 
- * Class: OpenLayers.Layer.UTFGrid
- * This Layer reads from UTFGrid tiled data sources.  Since UTFGrids are 
- * essentially JSON-based ASCII art with attached attributes, they are not 
- * visibly rendered.  In order to use them in the map, you must add a 
- * <OpenLayers.Control.UTFGrid> control as well.
- *
- * Example:
- *
- * (start code)
- * var world_utfgrid = new OpenLayers.Layer.UTFGrid({
- *     url: "/tiles/world_utfgrid/${z}/${x}/${y}.json",
- *     utfgridResolution: 4,
- *     displayInLayerSwitcher: false
- * );
- * map.addLayer(world_utfgrid);
- * 
- * var control = new OpenLayers.Control.UTFGrid({
- *     layers: [world_utfgrid],
- *     handlerMode: 'move',
- *     callback: function(dataLookup) {
- *         // do something with returned data
- *     }
- * })
- * (end code)
- *
- * 
- * Inherits from:
- *  - <OpenLayers.Layer.XYZ>
- */
-OpenLayers.Layer.UTFGrid = OpenLayers.Class(OpenLayers.Layer.XYZ, {
-    
-    /**
-     * APIProperty: isBaseLayer
-     * Default is false, as UTFGrids are designed to be a transparent overlay layer. 
-     */
-    isBaseLayer: false,
-    
-    /**
-     * APIProperty: projection
-     * {<OpenLayers.Projection>}
-     * Source projection for the UTFGrids.  Default is "EPSG:900913".
-     */
-    projection: new OpenLayers.Projection("EPSG:900913"),
-
-    /**
-     * Property: useJSONP
-     * {Boolean}
-     * Should we use a JSONP script approach instead of a standard AJAX call?
-     *
-     * Set to true for using utfgrids from another server. 
-     * Avoids same-domain policy restrictions. 
-     * Note that this only works if the server accepts 
-     * the callback GET parameter and dynamically 
-     * wraps the returned json in a function call.
-     * 
-     * Default is false
-     */
-    useJSONP: false,
-    
-    /**
-     * APIProperty: url
-     * {String}
-     * URL tempate for UTFGrid tiles.  Include x, y, and z parameters.
-     * E.g. "/tiles/${z}/${x}/${y}.json"
-     */
-
-    /**
-     * APIProperty: utfgridResolution
-     * {Number}
-     * Ratio of the pixel width to the width of a UTFGrid data point.  If an 
-     *     entry in the grid represents a 4x4 block of pixels, the 
-     *     utfgridResolution would be 4.  Default is 2 (specified in 
-     *     <OpenLayers.Tile.UTFGrid>).
-     */
-
-    /**
-     * Property: tileClass
-     * {<OpenLayers.Tile>} The tile class to use for this layer.
-     *     Defaults is <OpenLayers.Tile.UTFGrid>.
-     */
-    tileClass: OpenLayers.Tile.UTFGrid,
-
-    /**
-     * Constructor: OpenLayers.Layer.UTFGrid
-     * Create a new UTFGrid layer.
-     *
-     * Parameters:
-     * config - {Object} Configuration properties for the layer.
-     *
-     * Required configuration properties:
-     * url - {String} The url template for UTFGrid tiles.  See the <url> property.
-     */
-    initialize: function(options) {
-        OpenLayers.Layer.Grid.prototype.initialize.apply(
-            this, [options.name, options.url, {}, options]
-        );
-        this.tileOptions = OpenLayers.Util.extend({
-            utfgridResolution: this.utfgridResolution
-        }, this.tileOptions);
-    },
-
-    /**
-     * Method: createBackBuffer
-     * The UTFGrid cannot create a back buffer, so this method is overriden.
-     */
-    createBackBuffer: function() {},
-    
-    /**
-     * APIMethod: clone
-     * Create a clone of this layer
-     *
-     * Parameters:
-     * obj - {Object} Only used by a subclass of this layer.
-     * 
-     * Returns:
-     * {<OpenLayers.Layer.UTFGrid>} An exact clone of this OpenLayers.Layer.UTFGrid
-     */
-    clone: function (obj) {
-        if (obj == null) {
-            obj = new OpenLayers.Layer.UTFGrid(this.getOptions());
-        }
-
-        // get all additions from superclasses
-        obj = OpenLayers.Layer.Grid.prototype.clone.apply(this, [obj]);
-
-        return obj;
-    },
-
-    /**
-     * APIProperty: getFeatureInfo
-     * Get details about a feature associated with a map location.  The object
-     *     returned will have id and data properties.  If the given location
-     *     doesn't correspond to a feature, null will be returned.
-     *
-     * Parameters:
-     * location - {<OpenLayers.LonLat>} map location
-     *
-     * Returns:
-     * {Object} Object representing the feature id and UTFGrid data 
-     *     corresponding to the given map location.  Returns null if the given
-     *     location doesn't hit a feature.
-     */
-    getFeatureInfo: function(location) {
-        var info = null;
-        var tileInfo = this.getTileData(location);
-        if (tileInfo && tileInfo.tile) {
-            info = tileInfo.tile.getFeatureInfo(tileInfo.i, tileInfo.j);
-        }
-        return info;
-    },
-
-    /**
-     * APIMethod: getFeatureId
-     * Get the identifier for the feature associated with a map location.
-     *
-     * Parameters:
-     * location - {<OpenLayers.LonLat>} map location
-     *
-     * Returns:
-     * {String} The feature identifier corresponding to the given map location.
-     *     Returns null if the location doesn't hit a feature.
-     */
-    getFeatureId: function(location) {
-        var id = null;
-        var info = this.getTileData(location);
-        if (info.tile) {
-            id = info.tile.getFeatureId(info.i, info.j);
-        }
-        return id;
-    },
-
-    CLASS_NAME: "OpenLayers.Layer.UTFGrid"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/Vector.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/Vector.js
deleted file mode 100644
index 4ef4cbf1..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/Vector.js
+++ /dev/null
@@ -1,1007 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Layer.js
- * @requires OpenLayers/Renderer.js
- * @requires OpenLayers/StyleMap.js
- * @requires OpenLayers/Feature/Vector.js
- * @requires OpenLayers/Console.js
- * @requires OpenLayers/Lang.js
- */
-
-/**
- * Class: OpenLayers.Layer.Vector
- * Instances of OpenLayers.Layer.Vector are used to render vector data from
- *     a variety of sources. Create a new vector layer with the
- *     <OpenLayers.Layer.Vector> constructor.
- *
- * Inherits from:
- *  - <OpenLayers.Layer>
- */
-OpenLayers.Layer.Vector = OpenLayers.Class(OpenLayers.Layer, {
-
-    /**
-     * APIProperty: events
-     * {<OpenLayers.Events>}
-     *
-     * Register a listener for a particular event with the following syntax:
-     * (code)
-     * layer.events.register(type, obj, listener);
-     * (end)
-     *
-     * Listeners will be called with a reference to an event object.  The
-     *     properties of this event depends on exactly what happened.
-     *
-     * All event objects have at least the following properties:
-     * object - {Object} A reference to layer.events.object.
-     * element - {DOMElement} A reference to layer.events.element.
-     *
-     * Supported map event types (in addition to those from <OpenLayers.Layer.events>):
-     * beforefeatureadded - Triggered before a feature is added.  Listeners
-     *      will receive an object with a *feature* property referencing the
-     *      feature to be added.  To stop the feature from being added, a
-     *      listener should return false.
-     * beforefeaturesadded - Triggered before an array of features is added.
-     *      Listeners will receive an object with a *features* property
-     *      referencing the feature to be added. To stop the features from
-     *      being added, a listener should return false.
-     * featureadded - Triggered after a feature is added.  The event
-     *      object passed to listeners will have a *feature* property with a
-     *      reference to the added feature.
-     * featuresadded - Triggered after features are added.  The event
-     *      object passed to listeners will have a *features* property with a
-     *      reference to an array of added features.
-     * beforefeatureremoved - Triggered before a feature is removed. Listeners
-     *      will receive an object with a *feature* property referencing the
-     *      feature to be removed.
-     * beforefeaturesremoved - Triggered before multiple features are removed. 
-     *      Listeners will receive an object with a *features* property
-     *      referencing the features to be removed.
-     * featureremoved - Triggerd after a feature is removed. The event
-     *      object passed to listeners will have a *feature* property with a
-     *      reference to the removed feature.
-     * featuresremoved - Triggered after features are removed. The event
-     *      object passed to listeners will have a *features* property with a
-     *      reference to an array of removed features.
-     * beforefeatureselected - Triggered before a feature is selected.  Listeners
-     *      will receive an object with a *feature* property referencing the
-     *      feature to be selected. To stop the feature from being selectd, a
-     *      listener should return false.
-     * featureselected - Triggered after a feature is selected.  Listeners
-     *      will receive an object with a *feature* property referencing the
-     *      selected feature.
-     * featureunselected - Triggered after a feature is unselected.
-     *      Listeners will receive an object with a *feature* property
-     *      referencing the unselected feature.
-     * beforefeaturemodified - Triggered when a feature is selected to 
-     *      be modified.  Listeners will receive an object with a *feature* 
-     *      property referencing the selected feature.
-     * featuremodified - Triggered when a feature has been modified.
-     *      Listeners will receive an object with a *feature* property referencing 
-     *      the modified feature.
-     * afterfeaturemodified - Triggered when a feature is finished being modified.
-     *      Listeners will receive an object with a *feature* property referencing 
-     *      the modified feature.
-     * vertexmodified - Triggered when a vertex within any feature geometry
-     *      has been modified.  Listeners will receive an object with a
-     *      *feature* property referencing the modified feature, a *vertex*
-     *      property referencing the vertex modified (always a point geometry),
-     *      and a *pixel* property referencing the pixel location of the
-     *      modification.
-     * vertexremoved - Triggered when a vertex within any feature geometry
-     *      has been deleted.  Listeners will receive an object with a
-     *      *feature* property referencing the modified feature, a *vertex*
-     *      property referencing the vertex modified (always a point geometry),
-     *      and a *pixel* property referencing the pixel location of the
-     *      removal.
-     * sketchstarted - Triggered when a feature sketch bound for this layer
-     *      is started.  Listeners will receive an object with a *feature*
-     *      property referencing the new sketch feature and a *vertex* property
-     *      referencing the creation point.
-     * sketchmodified - Triggered when a feature sketch bound for this layer
-     *      is modified.  Listeners will receive an object with a *vertex*
-     *      property referencing the modified vertex and a *feature* property
-     *      referencing the sketch feature.
-     * sketchcomplete - Triggered when a feature sketch bound for this layer
-     *      is complete.  Listeners will receive an object with a *feature*
-     *      property referencing the sketch feature.  By returning false, a
-     *      listener can stop the sketch feature from being added to the layer.
-     * refresh - Triggered when something wants a strategy to ask the protocol
-     *      for a new set of features.
-     */
-
-    /**
-     * APIProperty: isBaseLayer
-     * {Boolean} The layer is a base layer.  Default is false.  Set this property
-     * in the layer options.
-     */
-    isBaseLayer: false,
-
-    /** 
-     * APIProperty: isFixed
-     * {Boolean} Whether the layer remains in one place while dragging the
-     * map. Note that setting this to true will move the layer to the bottom
-     * of the layer stack.
-     */
-    isFixed: false,
-
-    /** 
-     * APIProperty: features
-     * {Array(<OpenLayers.Feature.Vector>)} 
-     */
-    features: null,
-    
-    /** 
-     * Property: filter
-     * {<OpenLayers.Filter>} The filter set in this layer,
-     *     a strategy launching read requests can combined
-     *     this filter with its own filter.
-     */
-    filter: null,
-    
-    /** 
-     * Property: selectedFeatures
-     * {Array(<OpenLayers.Feature.Vector>)} 
-     */
-    selectedFeatures: null,
-    
-    /**
-     * Property: unrenderedFeatures
-     * {Object} hash of features, keyed by feature.id, that the renderer
-     *     failed to draw
-     */
-    unrenderedFeatures: null,
-
-    /**
-     * APIProperty: reportError
-     * {Boolean} report friendly error message when loading of renderer
-     * fails.
-     */
-    reportError: true, 
-
-    /** 
-     * APIProperty: style
-     * {Object} Default style for the layer
-     */
-    style: null,
-    
-    /**
-     * Property: styleMap
-     * {<OpenLayers.StyleMap>}
-     */
-    styleMap: null,
-    
-    /**
-     * Property: strategies
-     * {Array(<OpenLayers.Strategy>})} Optional list of strategies for the layer.
-     */
-    strategies: null,
-    
-    /**
-     * Property: protocol
-     * {<OpenLayers.Protocol>} Optional protocol for the layer.
-     */
-    protocol: null,
-    
-    /**
-     * Property: renderers
-     * {Array(String)} List of supported Renderer classes. Add to this list to
-     * add support for additional renderers. This list is ordered:
-     * the first renderer which returns true for the  'supported()'
-     * method will be used, if not defined in the 'renderer' option.
-     */
-    renderers: ['SVG', 'VML', 'Canvas'],
-    
-    /** 
-     * Property: renderer
-     * {<OpenLayers.Renderer>}
-     */
-    renderer: null,
-    
-    /**
-     * APIProperty: rendererOptions
-     * {Object} Options for the renderer. See {<OpenLayers.Renderer>} for
-     *     supported options.
-     */
-    rendererOptions: null,
-    
-    /** 
-     * APIProperty: geometryType
-     * {String} geometryType allows you to limit the types of geometries this
-     * layer supports. This should be set to something like
-     * "OpenLayers.Geometry.Point" to limit types.
-     */
-    geometryType: null,
-
-    /** 
-     * Property: drawn
-     * {Boolean} Whether the Vector Layer features have been drawn yet.
-     */
-    drawn: false,
-    
-    /** 
-     * APIProperty: ratio
-     * {Float} This specifies the ratio of the size of the visiblity of the Vector Layer features to the size of the map.
-     */   
-    ratio: 1,
-
-    /**
-     * Constructor: OpenLayers.Layer.Vector
-     * Create a new vector layer
-     *
-     * Parameters:
-     * name - {String} A name for the layer
-     * options - {Object} Optional object with non-default properties to set on
-     *           the layer.
-     *
-     * Returns:
-     * {<OpenLayers.Layer.Vector>} A new vector layer
-     */
-    initialize: function(name, options) {
-        OpenLayers.Layer.prototype.initialize.apply(this, arguments);
-
-        // allow user-set renderer, otherwise assign one
-        if (!this.renderer || !this.renderer.supported()) {  
-            this.assignRenderer();
-        }
-
-        // if no valid renderer found, display error
-        if (!this.renderer || !this.renderer.supported()) {
-            this.renderer = null;
-            this.displayError();
-        } 
-
-        if (!this.styleMap) {
-            this.styleMap = new OpenLayers.StyleMap();
-        }
-
-        this.features = [];
-        this.selectedFeatures = [];
-        this.unrenderedFeatures = {};
-        
-        // Allow for custom layer behavior
-        if(this.strategies){
-            for(var i=0, len=this.strategies.length; i<len; i++) {
-                this.strategies[i].setLayer(this);
-            }
-        }
-
-    },
-
-    /**
-     * APIMethod: destroy
-     * Destroy this layer
-     */
-    destroy: function() {
-        if (this.strategies) {
-            var strategy, i, len;
-            for(i=0, len=this.strategies.length; i<len; i++) {
-                strategy = this.strategies[i];
-                if(strategy.autoDestroy) {
-                    strategy.destroy();
-                }
-            }
-            this.strategies = null;
-        }
-        if (this.protocol) {
-            if(this.protocol.autoDestroy) {
-                this.protocol.destroy();
-            }
-            this.protocol = null;
-        }
-        this.destroyFeatures();
-        this.features = null;
-        this.selectedFeatures = null;
-        this.unrenderedFeatures = null;
-        if (this.renderer) {
-            this.renderer.destroy();
-        }
-        this.renderer = null;
-        this.geometryType = null;
-        this.drawn = null;
-        OpenLayers.Layer.prototype.destroy.apply(this, arguments);  
-    },
-
-    /**
-     * Method: clone
-     * Create a clone of this layer.
-     * 
-     * Note: Features of the layer are also cloned.
-     *
-     * Returns:
-     * {<OpenLayers.Layer.Vector>} An exact clone of this layer
-     */
-    clone: function (obj) {
-        
-        if (obj == null) {
-            obj = new OpenLayers.Layer.Vector(this.name, this.getOptions());
-        }
-
-        //get all additions from superclasses
-        obj = OpenLayers.Layer.prototype.clone.apply(this, [obj]);
-
-        // copy/set any non-init, non-simple values here
-        var features = this.features;
-        var len = features.length;
-        var clonedFeatures = new Array(len);
-        for(var i=0; i<len; ++i) {
-            clonedFeatures[i] = features[i].clone();
-        }
-        obj.features = clonedFeatures;
-
-        return obj;
-    },    
-    
-    /**
-     * Method: refresh
-     * Ask the layer to request features again and redraw them.  Triggers
-     *     the refresh event if the layer is in range and visible.
-     *
-     * Parameters:
-     * obj - {Object} Optional object with properties for any listener of
-     *     the refresh event.
-     */
-    refresh: function(obj) {
-        if(this.calculateInRange() && this.visibility) {
-            this.events.triggerEvent("refresh", obj);
-        }
-    },
-
-    /** 
-     * Method: assignRenderer
-     * Iterates through the available renderer implementations and selects 
-     * and assigns the first one whose "supported()" function returns true.
-     */    
-    assignRenderer: function()  {
-        for (var i=0, len=this.renderers.length; i<len; i++) {
-            var rendererClass = this.renderers[i];
-            var renderer = (typeof rendererClass == "function") ?
-                rendererClass :
-                OpenLayers.Renderer[rendererClass];
-            if (renderer && renderer.prototype.supported()) {
-                this.renderer = new renderer(this.div, this.rendererOptions);
-                break;
-            }  
-        }  
-    },
-
-    /** 
-     * Method: displayError 
-     * Let the user know their browser isn't supported.
-     */
-    displayError: function() {
-        if (this.reportError) {
-            OpenLayers.Console.userError(OpenLayers.i18n("browserNotSupported", 
-                                     {renderers: this. renderers.join('\n')}));
-        }    
-    },
-
-    /** 
-     * Method: setMap
-     * The layer has been added to the map. 
-     * 
-     * If there is no renderer set, the layer can't be used. Remove it.
-     * Otherwise, give the renderer a reference to the map and set its size.
-     * 
-     * Parameters:
-     * map - {<OpenLayers.Map>} 
-     */
-    setMap: function(map) {        
-        OpenLayers.Layer.prototype.setMap.apply(this, arguments);
-
-        if (!this.renderer) {
-            this.map.removeLayer(this);
-        } else {
-            this.renderer.map = this.map;
-
-            var newSize = this.map.getSize();
-            newSize.w = newSize.w * this.ratio;
-            newSize.h = newSize.h * this.ratio;
-            this.renderer.setSize(newSize);
-        }
-    },
-
-    /**
-     * Method: afterAdd
-     * Called at the end of the map.addLayer sequence.  At this point, the map
-     *     will have a base layer.  Any autoActivate strategies will be
-     *     activated here.
-     */
-    afterAdd: function() {
-        if(this.strategies) {
-            var strategy, i, len;
-            for(i=0, len=this.strategies.length; i<len; i++) {
-                strategy = this.strategies[i];
-                if(strategy.autoActivate) {
-                    strategy.activate();
-                }
-            }
-        }
-    },
-
-    /**
-     * Method: removeMap
-     * The layer has been removed from the map.
-     *
-     * Parameters:
-     * map - {<OpenLayers.Map>}
-     */
-    removeMap: function(map) {
-        this.drawn = false;
-        if(this.strategies) {
-            var strategy, i, len;
-            for(i=0, len=this.strategies.length; i<len; i++) {
-                strategy = this.strategies[i];
-                if(strategy.autoActivate) {
-                    strategy.deactivate();
-                }
-            }
-        }
-    },
-    
-    /**
-     * Method: onMapResize
-     * Notify the renderer of the change in size. 
-     * 
-     */
-    onMapResize: function() {
-        OpenLayers.Layer.prototype.onMapResize.apply(this, arguments);
-        
-        var newSize = this.map.getSize();
-        newSize.w = newSize.w * this.ratio;
-        newSize.h = newSize.h * this.ratio;
-        this.renderer.setSize(newSize);
-    },
-
-    /**
-     * Method: moveTo
-     *  Reset the vector layer's div so that it once again is lined up with 
-     *   the map. Notify the renderer of the change of extent, and in the
-     *   case of a change of zoom level (resolution), have the 
-     *   renderer redraw features.
-     * 
-     *  If the layer has not yet been drawn, cycle through the layer's 
-     *   features and draw each one.
-     * 
-     * Parameters:
-     * bounds - {<OpenLayers.Bounds>} 
-     * zoomChanged - {Boolean} 
-     * dragging - {Boolean} 
-     */
-    moveTo: function(bounds, zoomChanged, dragging) {
-        OpenLayers.Layer.prototype.moveTo.apply(this, arguments);
-        
-        var coordSysUnchanged = true;
-        if (!dragging) {
-            this.renderer.root.style.visibility = 'hidden';
-
-            var viewSize = this.map.getSize(),
-                viewWidth = viewSize.w,
-                viewHeight = viewSize.h,
-                offsetLeft = (viewWidth / 2 * this.ratio) - viewWidth / 2,
-                offsetTop = (viewHeight / 2 * this.ratio) - viewHeight / 2;
-            offsetLeft += this.map.layerContainerOriginPx.x;
-            offsetLeft = -Math.round(offsetLeft);
-            offsetTop += this.map.layerContainerOriginPx.y;
-            offsetTop = -Math.round(offsetTop);
-
-            this.div.style.left = offsetLeft + 'px';
-            this.div.style.top = offsetTop + 'px';
-
-            var extent = this.map.getExtent().scale(this.ratio);
-            coordSysUnchanged = this.renderer.setExtent(extent, zoomChanged);
-
-            this.renderer.root.style.visibility = 'visible';
-
-            // Force a reflow on gecko based browsers to prevent jump/flicker.
-            // This seems to happen on only certain configurations; it was originally
-            // noticed in FF 2.0 and Linux.
-            if (OpenLayers.IS_GECKO === true) {
-                this.div.scrollLeft = this.div.scrollLeft;
-            }
-            
-            if (!zoomChanged && coordSysUnchanged) {
-                for (var i in this.unrenderedFeatures) {
-                    var feature = this.unrenderedFeatures[i];
-                    this.drawFeature(feature);
-                }
-            }
-        }
-        if (!this.drawn || zoomChanged || !coordSysUnchanged) {
-            this.drawn = true;
-            var feature;
-            for(var i=0, len=this.features.length; i<len; i++) {
-                this.renderer.locked = (i !== (len - 1));
-                feature = this.features[i];
-                this.drawFeature(feature);
-            }
-        }    
-    },
-    
-    /** 
-     * APIMethod: display
-     * Hide or show the Layer
-     * 
-     * Parameters:
-     * display - {Boolean}
-     */
-    display: function(display) {
-        OpenLayers.Layer.prototype.display.apply(this, arguments);
-        // we need to set the display style of the root in case it is attached
-        // to a foreign layer
-        var currentDisplay = this.div.style.display;
-        if(currentDisplay != this.renderer.root.style.display) {
-            this.renderer.root.style.display = currentDisplay;
-        }
-    },
-
-    /**
-     * APIMethod: addFeatures
-     * Add Features to the layer.
-     *
-     * Parameters:
-     * features - {Array(<OpenLayers.Feature.Vector>)} 
-     * options - {Object}
-     */
-    addFeatures: function(features, options) {
-        if (!(OpenLayers.Util.isArray(features))) {
-            features = [features];
-        }
-        
-        var notify = !options || !options.silent;
-        if(notify) {
-            var event = {features: features};
-            var ret = this.events.triggerEvent("beforefeaturesadded", event);
-            if(ret === false) {
-                return;
-            }
-            features = event.features;
-        }
-        
-        // Track successfully added features for featuresadded event, since
-        // beforefeatureadded can veto single features.
-        var featuresAdded = [];
-        for (var i=0, len=features.length; i<len; i++) {
-            if (i != (features.length - 1)) {
-                this.renderer.locked = true;
-            } else {
-                this.renderer.locked = false;
-            }    
-            var feature = features[i];
-            
-            if (this.geometryType &&
-              !(feature.geometry instanceof this.geometryType)) {
-                throw new TypeError('addFeatures: component should be an ' +
-                                    this.geometryType.prototype.CLASS_NAME);
-              }
-
-            //give feature reference to its layer
-            feature.layer = this;
-
-            if (!feature.style && this.style) {
-                feature.style = OpenLayers.Util.extend({}, this.style);
-            }
-
-            if (notify) {
-                if(this.events.triggerEvent("beforefeatureadded",
-                                            {feature: feature}) === false) {
-                    continue;
-                }
-                this.preFeatureInsert(feature);
-            }
-
-            featuresAdded.push(feature);
-            this.features.push(feature);
-            this.drawFeature(feature);
-            
-            if (notify) {
-                this.events.triggerEvent("featureadded", {
-                    feature: feature
-                });
-                this.onFeatureInsert(feature);
-            }
-        }
-        
-        if(notify) {
-            this.events.triggerEvent("featuresadded", {features: featuresAdded});
-        }
-    },
-
-
-    /**
-     * APIMethod: removeFeatures
-     * Remove features from the layer.  This erases any drawn features and
-     *     removes them from the layer's control.  The beforefeatureremoved
-     *     and featureremoved events will be triggered for each feature.  The
-     *     featuresremoved event will be triggered after all features have
-     *     been removed.  To supress event triggering, use the silent option.
-     * 
-     * Parameters:
-     * features - {Array(<OpenLayers.Feature.Vector>)} List of features to be
-     *     removed.
-     * options - {Object} Optional properties for changing behavior of the
-     *     removal.
-     *
-     * Valid options:
-     * silent - {Boolean} Supress event triggering.  Default is false.
-     */
-    removeFeatures: function(features, options) {
-        if(!features || features.length === 0) {
-            return;
-        }
-        if (features === this.features) {
-            return this.removeAllFeatures(options);
-        }
-        if (!(OpenLayers.Util.isArray(features))) {
-            features = [features];
-        }
-        if (features === this.selectedFeatures) {
-            features = features.slice();
-        }
-
-        var notify = !options || !options.silent;
-        
-        if (notify) {
-            this.events.triggerEvent(
-                "beforefeaturesremoved", {features: features}
-            );
-        }
-
-        for (var i = features.length - 1; i >= 0; i--) {
-            // We remain locked so long as we're not at 0
-            // and the 'next' feature has a geometry. We do the geometry check
-            // because if all the features after the current one are 'null', we
-            // won't call eraseGeometry, so we break the 'renderer functions
-            // will always be called with locked=false *last*' rule. The end result
-            // is a possible gratiutious unlocking to save a loop through the rest 
-            // of the list checking the remaining features every time. So long as
-            // null geoms are rare, this is probably okay.    
-            if (i != 0 && features[i-1].geometry) {
-                this.renderer.locked = true;
-            } else {
-                this.renderer.locked = false;
-            }
-    
-            var feature = features[i];
-            delete this.unrenderedFeatures[feature.id];
-
-            if (notify) {
-                this.events.triggerEvent("beforefeatureremoved", {
-                    feature: feature
-                });
-            }
-
-            this.features = OpenLayers.Util.removeItem(this.features, feature);
-            // feature has no layer at this point
-            feature.layer = null;
-
-            if (feature.geometry) {
-                this.renderer.eraseFeatures(feature);
-            }
-                    
-            //in the case that this feature is one of the selected features, 
-            // remove it from that array as well.
-            if (OpenLayers.Util.indexOf(this.selectedFeatures, feature) != -1){
-                OpenLayers.Util.removeItem(this.selectedFeatures, feature);
-            }
-
-            if (notify) {
-                this.events.triggerEvent("featureremoved", {
-                    feature: feature
-                });
-            }
-        }
-
-        if (notify) {
-            this.events.triggerEvent("featuresremoved", {features: features});
-        }
-    },
-    
-    /** 
-     * APIMethod: removeAllFeatures
-     * Remove all features from the layer.
-     *
-     * Parameters:
-     * options - {Object} Optional properties for changing behavior of the
-     *     removal.
-     *
-     * Valid options:
-     * silent - {Boolean} Supress event triggering.  Default is false.
-     */
-    removeAllFeatures: function(options) {
-        var notify = !options || !options.silent;
-        var features = this.features;
-        if (notify) {
-            this.events.triggerEvent(
-                "beforefeaturesremoved", {features: features}
-            );
-        }
-        var feature;
-        for (var i = features.length-1; i >= 0; i--) {
-            feature = features[i];
-            if (notify) {
-                this.events.triggerEvent("beforefeatureremoved", {
-                    feature: feature
-                });
-            }
-            feature.layer = null;
-            if (notify) {
-                this.events.triggerEvent("featureremoved", {
-                    feature: feature
-                });
-            }
-        }
-        this.renderer.clear();
-        this.features = [];
-        this.unrenderedFeatures = {};
-        this.selectedFeatures = [];
-        if (notify) {
-            this.events.triggerEvent("featuresremoved", {features: features});
-        }
-    },
-
-    /**
-     * APIMethod: destroyFeatures
-     * Erase and destroy features on the layer.
-     *
-     * Parameters:
-     * features - {Array(<OpenLayers.Feature.Vector>)} An optional array of
-     *     features to destroy.  If not supplied, all features on the layer
-     *     will be destroyed.
-     * options - {Object}
-     */
-    destroyFeatures: function(features, options) {
-        var all = (features == undefined); // evaluates to true if
-                                           // features is null
-        if(all) {
-            features = this.features;
-        }
-        if(features) {
-            this.removeFeatures(features, options);
-            for(var i=features.length-1; i>=0; i--) {
-                features[i].destroy();
-            }
-        }
-    },
-
-    /**
-     * APIMethod: drawFeature
-     * Draw (or redraw) a feature on the layer.  If the optional style argument
-     * is included, this style will be used.  If no style is included, the
-     * feature's style will be used.  If the feature doesn't have a style,
-     * the layer's style will be used.
-     * 
-     * This function is not designed to be used when adding features to 
-     * the layer (use addFeatures instead). It is meant to be used when
-     * the style of a feature has changed, or in some other way needs to 
-     * visually updated *after* it has already been added to a layer. You
-     * must add the feature to the layer for most layer-related events to 
-     * happen.
-     *
-     * Parameters: 
-     * feature - {<OpenLayers.Feature.Vector>} 
-     * style - {String | Object} Named render intent or full symbolizer object.
-     */
-    drawFeature: function(feature, style) {
-        // don't try to draw the feature with the renderer if the layer is not 
-        // drawn itself
-        if (!this.drawn) {
-            return;
-        }
-        if (typeof style != "object") {
-            if(!style && feature.state === OpenLayers.State.DELETE) {
-                style = "delete";
-            }
-            var renderIntent = style || feature.renderIntent;
-            style = feature.style || this.style;
-            if (!style) {
-                style = this.styleMap.createSymbolizer(feature, renderIntent);
-            }
-        }
-        
-        var drawn = this.renderer.drawFeature(feature, style);
-        //TODO remove the check for null when we get rid of Renderer.SVG
-        if (drawn === false || drawn === null) {
-            this.unrenderedFeatures[feature.id] = feature;
-        } else {
-            delete this.unrenderedFeatures[feature.id];
-        }
-    },
-    
-    /**
-     * Method: eraseFeatures
-     * Erase features from the layer.
-     *
-     * Parameters:
-     * features - {Array(<OpenLayers.Feature.Vector>)} 
-     */
-    eraseFeatures: function(features) {
-        this.renderer.eraseFeatures(features);
-    },
-
-    /**
-     * Method: getFeatureFromEvent
-     * Given an event, return a feature if the event occurred over one.
-     * Otherwise, return null.
-     *
-     * Parameters:
-     * evt - {Event} 
-     *
-     * Returns:
-     * {<OpenLayers.Feature.Vector>} A feature if one was under the event.
-     */
-    getFeatureFromEvent: function(evt) {
-        if (!this.renderer) {
-            throw new Error('getFeatureFromEvent called on layer with no ' +
-                            'renderer. This usually means you destroyed a ' +
-                            'layer, but not some handler which is associated ' +
-                            'with it.');
-        }
-        var feature = null;
-        var featureId = this.renderer.getFeatureIdFromEvent(evt);
-        if (featureId) {
-            if (typeof featureId === "string") {
-                feature = this.getFeatureById(featureId);
-            } else {
-                feature = featureId;
-            }
-        }
-        return feature;
-    },
-
-    /**
-     * APIMethod: getFeatureBy
-     * Given a property value, return the feature if it exists in the features array
-     *
-     * Parameters:
-     * property - {String}
-     * value - {String}
-     *
-     * Returns:
-     * {<OpenLayers.Feature.Vector>} A feature corresponding to the given
-     * property value or null if there is no such feature.
-     */
-    getFeatureBy: function(property, value) {
-        //TBD - would it be more efficient to use a hash for this.features?
-        var feature = null;
-        for(var i=0, len=this.features.length; i<len; ++i) {
-            if(this.features[i][property] == value) {
-                feature = this.features[i];
-                break;
-            }
-        }
-        return feature;
-    },
-
-    /**
-     * APIMethod: getFeatureById
-     * Given a feature id, return the feature if it exists in the features array
-     *
-     * Parameters:
-     * featureId - {String}
-     *
-     * Returns:
-     * {<OpenLayers.Feature.Vector>} A feature corresponding to the given
-     * featureId or null if there is no such feature.
-     */
-    getFeatureById: function(featureId) {
-        return this.getFeatureBy('id', featureId);
-    },
-
-    /**
-     * APIMethod: getFeatureByFid
-     * Given a feature fid, return the feature if it exists in the features array
-     *
-     * Parameters:
-     * featureFid - {String}
-     *
-     * Returns:
-     * {<OpenLayers.Feature.Vector>} A feature corresponding to the given
-     * featureFid or null if there is no such feature.
-     */
-    getFeatureByFid: function(featureFid) {
-        return this.getFeatureBy('fid', featureFid);
-    },
-    
-    /**
-     * APIMethod: getFeaturesByAttribute
-     * Returns an array of features that have the given attribute key set to the
-     * given value. Comparison of attribute values takes care of datatypes, e.g.
-     * the string '1234' is not equal to the number 1234.
-     *
-     * Parameters:
-     * attrName - {String}
-     * attrValue - {Mixed}
-     *
-     * Returns:
-     * Array({<OpenLayers.Feature.Vector>}) An array of features that have the 
-     * passed named attribute set to the given value.
-     */
-    getFeaturesByAttribute: function(attrName, attrValue) {
-        var i,
-            feature,    
-            len = this.features.length,
-            foundFeatures = [];
-        for(i = 0; i < len; i++) {            
-            feature = this.features[i];
-            if(feature && feature.attributes) {
-                if (feature.attributes[attrName] === attrValue) {
-                    foundFeatures.push(feature);
-                }
-            }
-        }
-        return foundFeatures;
-    },
-
-    /**
-     * Unselect the selected features
-     * i.e. clears the featureSelection array
-     * change the style back
-    clearSelection: function() {
-
-       var vectorLayer = this.map.vectorLayer;
-        for (var i = 0; i < this.map.featureSelection.length; i++) {
-            var featureSelection = this.map.featureSelection[i];
-            vectorLayer.drawFeature(featureSelection, vectorLayer.style);
-        }
-        this.map.featureSelection = [];
-    },
-     */
-
-
-    /**
-     * APIMethod: onFeatureInsert
-     * method called after a feature is inserted.
-     * Does nothing by default. Override this if you
-     * need to do something on feature updates.
-     *
-     * Parameters: 
-     * feature - {<OpenLayers.Feature.Vector>} 
-     */
-    onFeatureInsert: function(feature) {
-    },
-    
-    /**
-     * APIMethod: preFeatureInsert
-     * method called before a feature is inserted.
-     * Does nothing by default. Override this if you
-     * need to do something when features are first added to the
-     * layer, but before they are drawn, such as adjust the style.
-     *
-     * Parameters:
-     * feature - {<OpenLayers.Feature.Vector>} 
-     */
-    preFeatureInsert: function(feature) {
-    },
-
-    /** 
-     * APIMethod: getDataExtent
-     * Calculates the max extent which includes all of the features.
-     * 
-     * Returns:
-     * {<OpenLayers.Bounds>} or null if the layer has no features with
-     * geometries.
-     */
-    getDataExtent: function () {
-        var maxExtent = null;
-        var features = this.features;
-        if(features && (features.length > 0)) {
-            var geometry = null;
-            for(var i=0, len=features.length; i<len; i++) {
-                geometry = features[i].geometry;
-                if (geometry) {
-                    if (maxExtent === null) {
-                        maxExtent = new OpenLayers.Bounds();
-                    }
-                    maxExtent.extend(geometry.getBounds());
-                }
-            }
-        }
-        return maxExtent;
-    },
-
-    CLASS_NAME: "OpenLayers.Layer.Vector"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/Vector/RootContainer.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/Vector/RootContainer.js
deleted file mode 100644
index 075edaa7..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/Vector/RootContainer.js
+++ /dev/null
@@ -1,154 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Layer/Vector.js
- */
-
-/**
- * Class: OpenLayers.Layer.Vector.RootContainer
- * A special layer type to combine multiple vector layers inside a single
- *     renderer root container. This class is not supposed to be instantiated
- *     from user space, it is a helper class for controls that require event
- *     processing for multiple vector layers.
- *
- * Inherits from:
- *  - <OpenLayers.Layer.Vector>
- */
-OpenLayers.Layer.Vector.RootContainer = OpenLayers.Class(OpenLayers.Layer.Vector, {
-    
-    /**
-     * Property: displayInLayerSwitcher
-     * Set to false for this layer type
-     */
-    displayInLayerSwitcher: false,
-    
-    /**
-     * APIProperty: layers
-     * Layers that are attached to this container. Required config option.
-     */
-    layers: null,
-    
-    /**
-     * Constructor: OpenLayers.Layer.Vector.RootContainer
-     * Create a new root container for multiple vector layer. This constructor
-     * is not supposed to be used from user space, it is only to be used by
-     * controls that need feature selection across multiple vector layers.
-     *
-     * Parameters:
-     * name - {String} A name for the layer
-     * options - {Object} Optional object with non-default properties to set on
-     *           the layer.
-     * 
-     * Required options properties:
-     * layers - {Array(<OpenLayers.Layer.Vector>)} The layers managed by this
-     *     container
-     *
-     * Returns:
-     * {<OpenLayers.Layer.Vector.RootContainer>} A new vector layer root
-     *     container
-     */
-    
-    /**
-     * Method: display
-     */
-    display: function() {},
-    
-    /**
-     * Method: getFeatureFromEvent
-     * walk through the layers to find the feature returned by the event
-     * 
-     * Parameters:
-     * evt - {Object} event object with a feature property
-     * 
-     * Returns:
-     * {<OpenLayers.Feature.Vector>}
-     */
-    getFeatureFromEvent: function(evt) {
-        var layers = this.layers;
-        var feature;
-        for(var i=0; i<layers.length; i++) {
-            feature = layers[i].getFeatureFromEvent(evt);
-            if(feature) {
-                return feature;
-            }
-        }
-    },
-    
-    /**
-     * Method: setMap
-     * 
-     * Parameters:
-     * map - {<OpenLayers.Map>}
-     */
-    setMap: function(map) {
-        OpenLayers.Layer.Vector.prototype.setMap.apply(this, arguments);
-        this.collectRoots();
-        map.events.register("changelayer", this, this.handleChangeLayer);
-    },
-    
-    /**
-     * Method: removeMap
-     * 
-     * Parameters:
-     * map - {<OpenLayers.Map>}
-     */
-    removeMap: function(map) {
-        map.events.unregister("changelayer", this, this.handleChangeLayer);
-        this.resetRoots();
-        OpenLayers.Layer.Vector.prototype.removeMap.apply(this, arguments);
-    },
-    
-    /**
-     * Method: collectRoots
-     * Collects the root nodes of all layers this control is configured with
-     * and moveswien the nodes to this control's layer
-     */
-    collectRoots: function() {
-        var layer;
-        // walk through all map layers, because we want to keep the order
-        for(var i=0; i<this.map.layers.length; ++i) {
-            layer = this.map.layers[i];
-            if(OpenLayers.Util.indexOf(this.layers, layer) != -1) {
-                layer.renderer.moveRoot(this.renderer);
-            }
-        }
-    },
-    
-    /**
-     * Method: resetRoots
-     * Resets the root nodes back into the layers they belong to.
-     */
-    resetRoots: function() {
-        var layer;
-        for(var i=0; i<this.layers.length; ++i) {
-            layer = this.layers[i];
-            if(this.renderer && layer.renderer.getRenderLayerId() == this.id) {
-                this.renderer.moveRoot(layer.renderer);
-            }
-        }
-    },
-    
-    /**
-     * Method: handleChangeLayer
-     * Event handler for the map's changelayer event. We need to rebuild
-     * this container's layer dom if order of one of its layers changes.
-     * This handler is added with the setMap method, and removed with the
-     * removeMap method.
-     * 
-     * Parameters:
-     * evt - {Object}
-     */
-    handleChangeLayer: function(evt) {
-        var layer = evt.layer;
-        if(evt.property == "order" &&
-                        OpenLayers.Util.indexOf(this.layers, layer) != -1) {
-            this.resetRoots();
-            this.collectRoots();
-        }
-    },
-
-    CLASS_NAME: "OpenLayers.Layer.Vector.RootContainer"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/WMS.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/WMS.js
deleted file mode 100644
index 15dee2fb..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/WMS.js
+++ /dev/null
@@ -1,267 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-
-/**
- * @requires OpenLayers/Layer/Grid.js
- */
-
-/**
- * Class: OpenLayers.Layer.WMS
- * Instances of OpenLayers.Layer.WMS are used to display data from OGC Web
- *     Mapping Services. Create a new WMS layer with the <OpenLayers.Layer.WMS>
- *     constructor.
- * 
- * Inherits from:
- *  - <OpenLayers.Layer.Grid>
- */
-OpenLayers.Layer.WMS = OpenLayers.Class(OpenLayers.Layer.Grid, {
-
-    /**
-     * Constant: DEFAULT_PARAMS
-     * {Object} Hashtable of default parameter key/value pairs 
-     */
-    DEFAULT_PARAMS: { service: "WMS",
-                      version: "1.1.1",
-                      request: "GetMap",
-                      styles: "",
-                      format: "image/jpeg"
-                     },
-    
-    /**
-     * APIProperty: isBaseLayer
-     * {Boolean} Default is true for WMS layer
-     */
-    isBaseLayer: true,
-    
-    /**
-     * APIProperty: encodeBBOX
-     * {Boolean} Should the BBOX commas be encoded? The WMS spec says 'no', 
-     * but some services want it that way. Default false.
-     */
-    encodeBBOX: false,
-    
-    /** 
-     * APIProperty: noMagic 
-     * {Boolean} If true, the image format will not be automagicaly switched 
-     *     from image/jpeg to image/png or image/gif when using 
-     *     TRANSPARENT=TRUE. Also isBaseLayer will not changed by the  
-     *     constructor. Default false. 
-     */ 
-    noMagic: false,
-    
-    /**
-     * Property: yx
-     * {Object} Keys in this object are EPSG codes for which the axis order
-     *     is to be reversed (yx instead of xy, LatLon instead of LonLat), with
-     *     true as value. This is only relevant for WMS versions >= 1.3.0, and
-     *     only if yx is not set in <OpenLayers.Projection.defaults> for the
-     *     used projection.
-     */
-    yx: {},
-    
-    /**
-     * Constructor: OpenLayers.Layer.WMS
-     * Create a new WMS layer object
-     *
-     * Examples:
-     *
-     * The code below creates a simple WMS layer using the image/jpeg format.
-     * (code)
-     * var wms = new OpenLayers.Layer.WMS("NASA Global Mosaic",
-     *                                    "http://wms.jpl.nasa.gov/wms.cgi", 
-     *                                    {layers: "modis,global_mosaic"});
-     * (end)
-     * Note the 3rd argument (params). Properties added to this object will be
-     * added to the WMS GetMap requests used for this layer's tiles. The only
-     * mandatory parameter is "layers". Other common WMS params include
-     * "transparent", "styles" and "format". Note that the "srs" param will
-     * always be ignored. Instead, it will be derived from the baseLayer's or
-     * map's projection.
-     *
-     * The code below creates a transparent WMS layer with additional options.
-     * (code)
-     * var wms = new OpenLayers.Layer.WMS("NASA Global Mosaic",
-     *                                    "http://wms.jpl.nasa.gov/wms.cgi", 
-     *                                    {
-     *                                        layers: "modis,global_mosaic",
-     *                                        transparent: true
-     *                                    }, {
-     *                                        opacity: 0.5,
-     *                                        singleTile: true
-     *                                    });
-     * (end)
-     * Note that by default, a WMS layer is configured as baseLayer. Setting
-     * the "transparent" param to true will apply some magic (see <noMagic>).
-     * The default image format changes from image/jpeg to image/png, and the
-     * layer is not configured as baseLayer.
-     *
-     * Parameters:
-     * name - {String} A name for the layer
-     * url - {String} Base url for the WMS
-     *                (e.g. http://wms.jpl.nasa.gov/wms.cgi)
-     * params - {Object} An object with key/value pairs representing the
-     *                   GetMap query string parameters and parameter values.
-     * options - {Object} Hashtable of extra options to tag onto the layer.
-     *     These options include all properties listed above, plus the ones
-     *     inherited from superclasses.
-     */
-    initialize: function(name, url, params, options) {
-        var newArguments = [];
-        //uppercase params
-        params = OpenLayers.Util.upperCaseObject(params);
-        if (parseFloat(params.VERSION) >= 1.3 && !params.EXCEPTIONS) {
-            params.EXCEPTIONS = "INIMAGE";
-        } 
-        newArguments.push(name, url, params, options);
-        OpenLayers.Layer.Grid.prototype.initialize.apply(this, newArguments);
-        OpenLayers.Util.applyDefaults(
-                       this.params, 
-                       OpenLayers.Util.upperCaseObject(this.DEFAULT_PARAMS)
-                       );
-
-
-        //layer is transparent        
-        if (!this.noMagic && this.params.TRANSPARENT && 
-            this.params.TRANSPARENT.toString().toLowerCase() == "true") {
-            
-            // unless explicitly set in options, make layer an overlay
-            if ( (options == null) || (!options.isBaseLayer) ) {
-                this.isBaseLayer = false;
-            } 
-            
-            // jpegs can never be transparent, so intelligently switch the 
-            //  format, depending on the browser's capabilities
-            if (this.params.FORMAT == "image/jpeg") {
-                this.params.FORMAT = OpenLayers.Util.alphaHack() ? "image/gif"
-                                                                 : "image/png";
-            }
-        }
-
-    },    
-
-    /**
-     * Method: clone
-     * Create a clone of this layer
-     *
-     * Returns:
-     * {<OpenLayers.Layer.WMS>} An exact clone of this layer
-     */
-    clone: function (obj) {
-        
-        if (obj == null) {
-            obj = new OpenLayers.Layer.WMS(this.name,
-                                           this.url,
-                                           this.params,
-                                           this.getOptions());
-        }
-
-        //get all additions from superclasses
-        obj = OpenLayers.Layer.Grid.prototype.clone.apply(this, [obj]);
-
-        // copy/set any non-init, non-simple values here
-
-        return obj;
-    },    
-    
-    /**
-     * APIMethod: reverseAxisOrder
-     * Returns true if the axis order is reversed for the WMS version and
-     * projection of the layer.
-     * 
-     * Returns:
-     * {Boolean} true if the axis order is reversed, false otherwise.
-     */
-    reverseAxisOrder: function() {
-        var projCode = this.projection.getCode();
-        return parseFloat(this.params.VERSION) >= 1.3 && 
-            !!(this.yx[projCode] || (OpenLayers.Projection.defaults[projCode] && 
-            OpenLayers.Projection.defaults[projCode].yx));
-    },
-    
-    /**
-     * Method: getURL
-     * Return a GetMap query string for this layer
-     *
-     * Parameters:
-     * bounds - {<OpenLayers.Bounds>} A bounds representing the bbox for the
-     *                                request.
-     *
-     * Returns:
-     * {String} A string with the layer's url and parameters and also the
-     *          passed-in bounds and appropriate tile size specified as 
-     *          parameters.
-     */
-    getURL: function (bounds) {
-        bounds = this.adjustBounds(bounds);
-        
-        var imageSize = this.getImageSize();
-        var newParams = {};
-        // WMS 1.3 introduced axis order
-        var reverseAxisOrder = this.reverseAxisOrder();
-        newParams.BBOX = this.encodeBBOX ?
-            bounds.toBBOX(null, reverseAxisOrder) :
-            bounds.toArray(reverseAxisOrder);
-        newParams.WIDTH = imageSize.w;
-        newParams.HEIGHT = imageSize.h;
-        var requestString = this.getFullRequestString(newParams);
-        return requestString;
-    },
-
-    /**
-     * APIMethod: mergeNewParams
-     * Catch changeParams and uppercase the new params to be merged in
-     *     before calling changeParams on the super class.
-     * 
-     *     Once params have been changed, the tiles will be reloaded with
-     *     the new parameters.
-     * 
-     * Parameters:
-     * newParams - {Object} Hashtable of new params to use
-     */
-    mergeNewParams:function(newParams) {
-        var upperParams = OpenLayers.Util.upperCaseObject(newParams);
-        var newArguments = [upperParams];
-        return OpenLayers.Layer.Grid.prototype.mergeNewParams.apply(this, 
-                                                             newArguments);
-    },
-
-    /** 
-     * APIMethod: getFullRequestString
-     * Combine the layer's url with its params and these newParams. 
-     *   
-     *     Add the SRS parameter from projection -- this is probably
-     *     more eloquently done via a setProjection() method, but this 
-     *     works for now and always.
-     *
-     * Parameters:
-     * newParams - {Object}
-     * altUrl - {String} Use this as the url instead of the layer's url
-     * 
-     * Returns:
-     * {String} 
-     */
-    getFullRequestString:function(newParams, altUrl) {
-        var mapProjection = this.map.getProjectionObject();
-        var projectionCode = this.projection && this.projection.equals(mapProjection) ?
-            this.projection.getCode() :
-            mapProjection.getCode();
-        var value = (projectionCode == "none") ? null : projectionCode;
-        if (parseFloat(this.params.VERSION) >= 1.3) {
-            this.params.CRS = value;
-        } else {
-            this.params.SRS = value;
-        }
-        
-        if (typeof this.params.TRANSPARENT == "boolean") {
-            newParams.TRANSPARENT = this.params.TRANSPARENT ? "TRUE" : "FALSE";
-        }
-
-        return OpenLayers.Layer.Grid.prototype.getFullRequestString.apply(
-                                                    this, arguments);
-    },
-
-    CLASS_NAME: "OpenLayers.Layer.WMS"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/WMTS.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/WMTS.js
deleted file mode 100644
index 9c416293..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/WMTS.js
+++ /dev/null
@@ -1,510 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Layer/Grid.js
- */
-
-/**
- * Class: OpenLayers.Layer.WMTS
- * Instances of the WMTS class allow viewing of tiles from a service that 
- *     implements the OGC WMTS specification version 1.0.0.
- * 
- * Inherits from:
- *  - <OpenLayers.Layer.Grid>
- */
-OpenLayers.Layer.WMTS = OpenLayers.Class(OpenLayers.Layer.Grid, {
-    
-    /**
-     * APIProperty: isBaseLayer
-     * {Boolean} The layer will be considered a base layer.  Default is true.
-     */
-    isBaseLayer: true,
-
-    /**
-     * Property: version
-     * {String} WMTS version.  Default is "1.0.0".
-     */
-    version: "1.0.0",
-    
-    /**
-     * APIProperty: requestEncoding
-     * {String} Request encoding.  Can be "REST" or "KVP".  Default is "KVP".
-     */
-    requestEncoding: "KVP",
-    
-    /**
-     * APIProperty: url
-     * {String|Array(String)} The base URL or request URL template for the WMTS
-     * service. Must be provided. Array is only supported for base URLs, not
-     * for request URL templates. URL templates are only supported for
-     * REST <requestEncoding>.
-     */
-    url: null,
-
-    /**
-     * APIProperty: layer
-     * {String} The layer identifier advertised by the WMTS service.  Must be 
-     *     provided.
-     */
-    layer: null,
-    
-    /** 
-     * APIProperty: matrixSet
-     * {String} One of the advertised matrix set identifiers.  Must be provided.
-     */
-    matrixSet: null,
-
-    /** 
-     * APIProperty: style
-     * {String} One of the advertised layer styles.  Must be provided.
-     */
-    style: null,
-    
-    /** 
-     * APIProperty: format
-     * {String} The image MIME type.  Default is "image/jpeg".
-     */
-    format: "image/jpeg",
-    
-    /**
-     * APIProperty: tileOrigin
-     * {<OpenLayers.LonLat>} The top-left corner of the tile matrix in map 
-     *     units.  If the tile origin for each matrix in a set is different,
-     *     the <matrixIds> should include a topLeftCorner property.  If
-     *     not provided, the tile origin will default to the top left corner
-     *     of the layer <maxExtent>.
-     */
-    tileOrigin: null,
-    
-    /**
-     * APIProperty: tileFullExtent
-     * {<OpenLayers.Bounds>}  The full extent of the tile set.  If not supplied,
-     *     the layer's <maxExtent> property will be used.
-     */
-    tileFullExtent: null,
-
-    /**
-     * APIProperty: formatSuffix
-     * {String} For REST request encoding, an image format suffix must be 
-     *     included in the request.  If not provided, the suffix will be derived
-     *     from the <format> property.
-     */
-    formatSuffix: null,    
-
-    /**
-     * APIProperty: matrixIds
-     * {Array} A list of tile matrix identifiers.  If not provided, the matrix
-     *     identifiers will be assumed to be integers corresponding to the 
-     *     map zoom level.  If a list of strings is provided, each item should
-     *     be the matrix identifier that corresponds to the map zoom level.
-     *     Additionally, a list of objects can be provided.  Each object should
-     *     describe the matrix as presented in the WMTS capabilities.  These
-     *     objects should have the propertes shown below.
-     * 
-     * Matrix properties:
-     * identifier - {String} The matrix identifier (required).
-     * scaleDenominator - {Number} The matrix scale denominator.
-     * topLeftCorner - {<OpenLayers.LonLat>} The top left corner of the 
-     *     matrix.  Must be provided if different than the layer <tileOrigin>.
-     * tileWidth - {Number} The tile width for the matrix.  Must be provided 
-     *     if different than the width given in the layer <tileSize>.
-     * tileHeight - {Number} The tile height for the matrix.  Must be provided 
-     *     if different than the height given in the layer <tileSize>.
-     */
-    matrixIds: null,
-    
-    /**
-     * APIProperty: dimensions
-     * {Array} For RESTful request encoding, extra dimensions may be specified.
-     *     Items in this list should be property names in the <params> object.
-     *     Values of extra dimensions will be determined from the corresponding
-     *     values in the <params> object.
-     */
-    dimensions: null,
-    
-    /**
-     * APIProperty: params
-     * {Object} Extra parameters to include in tile requests.  For KVP 
-     *     <requestEncoding>, these properties will be encoded in the request 
-     *     query string.  For REST <requestEncoding>, these properties will
-     *     become part of the request path, with order determined by the 
-     *     <dimensions> list.
-     */
-    params: null,
-    
-    /**
-     * APIProperty: zoomOffset
-     * {Number} If your cache has more levels than you want to provide
-     *     access to with this layer, supply a zoomOffset.  This zoom offset
-     *     is added to the current map zoom level to determine the level
-     *     for a requested tile.  For example, if you supply a zoomOffset
-     *     of 3, when the map is at the zoom 0, tiles will be requested from
-     *     level 3 of your cache.  Default is 0 (assumes cache level and map
-     *     zoom are equivalent).  Additionally, if this layer is to be used
-     *     as an overlay and the cache has fewer zoom levels than the base
-     *     layer, you can supply a negative zoomOffset.  For example, if a
-     *     map zoom level of 1 corresponds to your cache level zero, you would
-     *     supply a -1 zoomOffset (and set the maxResolution of the layer
-     *     appropriately).  The zoomOffset value has no effect if complete
-     *     matrix definitions (including scaleDenominator) are supplied in
-     *     the <matrixIds> property.  Defaults to 0 (no zoom offset).
-     */
-    zoomOffset: 0,
-
-    /**
-     * APIProperty: serverResolutions
-     * {Array} A list of all resolutions available on the server.  Only set this
-     *     property if the map resolutions differ from the server. This
-     *     property serves two purposes. (a) <serverResolutions> can include
-     *     resolutions that the server supports and that you don't want to
-     *     provide with this layer; you can also look at <zoomOffset>, which is
-     *     an alternative to <serverResolutions> for that specific purpose.
-     *     (b) The map can work with resolutions that aren't supported by
-     *     the server, i.e. that aren't in <serverResolutions>. When the
-     *     map is displayed in such a resolution data for the closest
-     *     server-supported resolution is loaded and the layer div is
-     *     stretched as necessary.
-     */
-    serverResolutions: null,
-
-    /**
-     * Property: formatSuffixMap
-     * {Object} a map between WMTS 'format' request parameter and tile image file suffix
-     */
-    formatSuffixMap: {
-        "image/png": "png",
-        "image/png8": "png",
-        "image/png24": "png",
-        "image/png32": "png",
-        "png": "png",
-        "image/jpeg": "jpg",
-        "image/jpg": "jpg",
-        "jpeg": "jpg",
-        "jpg": "jpg"
-    },
-    
-    /**
-     * Property: matrix
-     * {Object} Matrix definition for the current map resolution.  Updated by
-     *     the <updateMatrixProperties> method.
-     */
-    matrix: null,
-    
-    /**
-     * Constructor: OpenLayers.Layer.WMTS
-     * Create a new WMTS layer.
-     *
-     * Example:
-     * (code)
-     * var wmts = new OpenLayers.Layer.WMTS({
-     *     name: "My WMTS Layer",
-     *     url: "http://example.com/wmts", 
-     *     layer: "layer_id",
-     *     style: "default",
-     *     matrixSet: "matrix_id"
-     * });
-     * (end)
-     *
-     * Parameters:
-     * config - {Object} Configuration properties for the layer.
-     *
-     * Required configuration properties:
-     * url - {String} The base url for the service.  See the <url> property.
-     * layer - {String} The layer identifier.  See the <layer> property.
-     * style - {String} The layer style identifier.  See the <style> property.
-     * matrixSet - {String} The tile matrix set identifier.  See the <matrixSet>
-     *     property.
-     *
-     * Any other documented layer properties can be provided in the config object.
-     */
-    initialize: function(config) {
-
-        // confirm required properties are supplied
-        var required = {
-            url: true,
-            layer: true,
-            style: true,
-            matrixSet: true
-        };
-        for (var prop in required) {
-            if (!(prop in config)) {
-                throw new Error("Missing property '" + prop + "' in layer configuration.");
-            }
-        }
-
-        config.params = OpenLayers.Util.upperCaseObject(config.params);
-        var args = [config.name, config.url, config.params, config];
-        OpenLayers.Layer.Grid.prototype.initialize.apply(this, args);
-        
-
-        // determine format suffix (for REST)
-        if (!this.formatSuffix) {
-            this.formatSuffix = this.formatSuffixMap[this.format] || this.format.split("/").pop();            
-        }
-
-        // expand matrixIds (may be array of string or array of object)
-        if (this.matrixIds) {
-            var len = this.matrixIds.length;
-            if (len && typeof this.matrixIds[0] === "string") {
-                var ids = this.matrixIds;
-                this.matrixIds = new Array(len);
-                for (var i=0; i<len; ++i) {
-                    this.matrixIds[i] = {identifier: ids[i]};
-                }
-            }
-        }
-
-    },
-    
-    /**
-     * Method: setMap
-     */
-    setMap: function() {
-        OpenLayers.Layer.Grid.prototype.setMap.apply(this, arguments);
-    },
-    
-    /**
-     * Method: updateMatrixProperties
-     * Called when map resolution changes to update matrix related properties.
-     */
-    updateMatrixProperties: function() {
-        this.matrix = this.getMatrix();
-        if (this.matrix) {
-            if (this.matrix.topLeftCorner) {
-                this.tileOrigin = this.matrix.topLeftCorner;
-            }
-            if (this.matrix.tileWidth && this.matrix.tileHeight) {
-                this.tileSize = new OpenLayers.Size(
-                    this.matrix.tileWidth, this.matrix.tileHeight
-                );
-            }
-            if (!this.tileOrigin) { 
-                this.tileOrigin = new OpenLayers.LonLat(
-                    this.maxExtent.left, this.maxExtent.top
-                );
-            }   
-            if (!this.tileFullExtent) { 
-                this.tileFullExtent = this.maxExtent;
-            }
-        }
-    },
-    
-    /**
-     * Method: moveTo
-     * 
-     * Parameters:
-     * bounds - {<OpenLayers.Bounds>}
-     * zoomChanged - {Boolean} Tells when zoom has changed, as layers have to
-     *     do some init work in that case.
-     * dragging - {Boolean}
-     */
-    moveTo:function(bounds, zoomChanged, dragging) {
-        if (zoomChanged || !this.matrix) {
-            this.updateMatrixProperties();
-        }
-        return OpenLayers.Layer.Grid.prototype.moveTo.apply(this, arguments);
-    },
-
-    /**
-     * APIMethod: clone
-     * 
-     * Parameters:
-     * obj - {Object}
-     * 
-     * Returns:
-     * {<OpenLayers.Layer.WMTS>} An exact clone of this <OpenLayers.Layer.WMTS>
-     */
-    clone: function(obj) {
-        if (obj == null) {
-            obj = new OpenLayers.Layer.WMTS(this.options);
-        }
-        //get all additions from superclasses
-        obj = OpenLayers.Layer.Grid.prototype.clone.apply(this, [obj]);
-        // copy/set any non-init, non-simple values here
-        return obj;
-    },
-
-    /**
-     * Method: getIdentifier
-     * Get the current index in the matrixIds array.
-     */
-    getIdentifier: function() {
-        return this.getServerZoom();
-    },
-    
-    /**
-     * Method: getMatrix
-     * Get the appropriate matrix definition for the current map resolution.
-     */
-    getMatrix: function() {
-        var matrix;
-        if (!this.matrixIds || this.matrixIds.length === 0) {
-            matrix = {identifier: this.getIdentifier()};
-        } else {
-            // get appropriate matrix given the map scale if possible
-            if ("scaleDenominator" in this.matrixIds[0]) {
-                // scale denominator calculation based on WMTS spec
-                var denom = 
-                    OpenLayers.METERS_PER_INCH * 
-                    OpenLayers.INCHES_PER_UNIT[this.units] * 
-                    this.getServerResolution() / 0.28E-3;
-                var diff = Number.POSITIVE_INFINITY;
-                var delta;
-                for (var i=0, ii=this.matrixIds.length; i<ii; ++i) {
-                    delta = Math.abs(1 - (this.matrixIds[i].scaleDenominator / denom));
-                    if (delta < diff) {
-                        diff = delta;
-                        matrix = this.matrixIds[i];
-                    }
-                }
-            } else {
-                // fall back on zoom as index
-                matrix = this.matrixIds[this.getIdentifier()];
-            }
-        }
-        return matrix;
-    },
-    
-    /** 
-     * Method: getTileInfo
-     * Get tile information for a given location at the current map resolution.
-     *
-     * Parameters:
-     * loc - {<OpenLayers.LonLat} A location in map coordinates.
-     *
-     * Returns:
-     * {Object} An object with "col", "row", "i", and "j" properties.  The col
-     *     and row values are zero based tile indexes from the top left.  The
-     *     i and j values are the number of pixels to the left and top 
-     *     (respectively) of the given location within the target tile.
-     */
-    getTileInfo: function(loc) {
-        var res = this.getServerResolution();
-        
-        var fx = (loc.lon - this.tileOrigin.lon) / (res * this.tileSize.w);
-        var fy = (this.tileOrigin.lat - loc.lat) / (res * this.tileSize.h);
-
-        var col = Math.floor(fx);
-        var row = Math.floor(fy);
-        
-        return {
-            col: col, 
-            row: row,
-            i: Math.floor((fx - col) * this.tileSize.w),
-            j: Math.floor((fy - row) * this.tileSize.h)
-        };
-    },
-    
-    /**
-     * Method: getURL
-     * 
-     * Parameters:
-     * bounds - {<OpenLayers.Bounds>}
-     * 
-     * Returns:
-     * {String} A URL for the tile corresponding to the given bounds.
-     */
-    getURL: function(bounds) {
-        bounds = this.adjustBounds(bounds);
-        var url = "";
-        if (!this.tileFullExtent || this.tileFullExtent.intersectsBounds(bounds)) {            
-
-            var center = bounds.getCenterLonLat();            
-            var info = this.getTileInfo(center);
-            var matrixId = this.matrix.identifier;
-            var dimensions = this.dimensions, params;
-
-            if (OpenLayers.Util.isArray(this.url)) {
-                url = this.selectUrl([
-                    this.version, this.style, this.matrixSet,
-                    this.matrix.identifier, info.row, info.col
-                ].join(","), this.url);
-            } else {
-                url = this.url;
-            }
-
-            if (this.requestEncoding.toUpperCase() === "REST") {
-                params = this.params;
-                if (url.indexOf("{") !== -1) {
-                    var template = url.replace(/\{/g, "${");
-                    var context = {
-                        // spec does not make clear if capital S or not
-                        style: this.style, Style: this.style,
-                        TileMatrixSet: this.matrixSet,
-                        TileMatrix: this.matrix.identifier,
-                        TileRow: info.row,
-                        TileCol: info.col
-                    };
-                    if (dimensions) {
-                        var dimension, i;
-                        for (i=dimensions.length-1; i>=0; --i) {
-                            dimension = dimensions[i];
-                            context[dimension] = params[dimension.toUpperCase()];
-                        }
-                    }
-                    url = OpenLayers.String.format(template, context);
-                } else {
-                    // include 'version', 'layer' and 'style' in tile resource url
-                    var path = this.version + "/" + this.layer + "/" + this.style + "/";
-
-                    // append optional dimension path elements
-                    if (dimensions) {
-                        for (var i=0; i<dimensions.length; i++) {
-                            if (params[dimensions[i]]) {
-                                path = path + params[dimensions[i]] + "/";
-                            }
-                        }
-                    }
-
-                    // append other required path elements
-                    path = path + this.matrixSet + "/" + this.matrix.identifier + 
-                        "/" + info.row + "/" + info.col + "." + this.formatSuffix;
-
-                    if (!url.match(/\/$/)) {
-                        url = url + "/";
-                    }
-                    url = url + path;
-                }
-            } else if (this.requestEncoding.toUpperCase() === "KVP") {
-
-                // assemble all required parameters
-                params = {
-                    SERVICE: "WMTS",
-                    REQUEST: "GetTile",
-                    VERSION: this.version,
-                    LAYER: this.layer,
-                    STYLE: this.style,
-                    TILEMATRIXSET: this.matrixSet,
-                    TILEMATRIX: this.matrix.identifier,
-                    TILEROW: info.row,
-                    TILECOL: info.col,
-                    FORMAT: this.format
-                };
-                url = OpenLayers.Layer.Grid.prototype.getFullRequestString.apply(this, [params]);
-
-            }
-        }
-        return url;    
-    },
-    
-    /**
-     * APIMethod: mergeNewParams
-     * Extend the existing layer <params> with new properties.  Tiles will be
-     *     reloaded with updated params in the request.
-     * 
-     * Parameters:
-     * newParams - {Object} Properties to extend to existing <params>.
-     */
-    mergeNewParams: function(newParams) {
-        if (this.requestEncoding.toUpperCase() === "KVP") {
-            return OpenLayers.Layer.Grid.prototype.mergeNewParams.apply(
-                this, [OpenLayers.Util.upperCaseObject(newParams)]
-            );
-        }
-    },
-
-    CLASS_NAME: "OpenLayers.Layer.WMTS"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/WorldWind.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/WorldWind.js
deleted file mode 100644
index 8581289e..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/WorldWind.js
+++ /dev/null
@@ -1,105 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-
-/**
- * @requires OpenLayers/Layer/Grid.js
- */
-
-/**
- * Class: OpenLayers.Layer.WorldWind
- * 
- * Inherits from:
- *  - <OpenLayers.Layer.Grid>
- */
-OpenLayers.Layer.WorldWind = OpenLayers.Class(OpenLayers.Layer.Grid, {
-    
-    DEFAULT_PARAMS: {
-    },
-
-    /**
-     * APIProperty: isBaseLayer
-     * {Boolean} WorldWind layer is a base layer by default.
-     */
-    isBaseLayer: true,
-
-    /** 
-     * APIProperty: lzd
-     * {Float} LevelZeroTileSizeDegrees
-     */
-    lzd: null,
-
-    /**
-     * APIProperty: zoomLevels
-     * {Integer} Number of zoom levels.
-     */
-    zoomLevels: null,
-    
-    /**
-     * Constructor: OpenLayers.Layer.WorldWind
-     * 
-     * Parameters:
-     * name - {String} Name of Layer
-     * url - {String} Base URL  
-     * lzd - {Float} Level zero tile size degrees 
-     * zoomLevels - {Integer} number of zoom levels
-     * params - {Object} additional parameters
-     * options - {Object} additional options
-     */
-    initialize: function(name, url, lzd, zoomLevels, params, options) {
-        this.lzd = lzd;
-        this.zoomLevels = zoomLevels;
-        var newArguments = [];
-        newArguments.push(name, url, params, options);
-        OpenLayers.Layer.Grid.prototype.initialize.apply(this, newArguments);
-        this.params = OpenLayers.Util.applyDefaults(
-            this.params, this.DEFAULT_PARAMS
-        );
-    },
-
-    /**
-     * Method: getZoom
-     * Convert map zoom to WW zoom.
-     */
-    getZoom: function () {
-        var zoom = this.map.getZoom();
-        var extent = this.map.getMaxExtent();
-        zoom = zoom - Math.log(this.maxResolution / (this.lzd/512))/Math.log(2);
-        return zoom;
-    },
-
-    /**
-     * Method: getURL
-     *
-     * Parameters:
-     * bounds - {<OpenLayers.Bounds>} 
-     *
-     * Returns:
-     * {String} A string with the layer's url and parameters and also the 
-     *           passed-in bounds and appropriate tile size specified as 
-     *           parameters
-     */
-    getURL: function (bounds) {
-        bounds = this.adjustBounds(bounds);
-        var zoom = this.getZoom();
-        var extent = this.map.getMaxExtent();
-        var deg = this.lzd/Math.pow(2,this.getZoom());
-        var x = Math.floor((bounds.left - extent.left)/deg);
-        var y = Math.floor((bounds.bottom - extent.bottom)/deg);
-        if (this.map.getResolution() <= (this.lzd/512)
-            && this.getZoom() <= this.zoomLevels) {
-            return this.getFullRequestString(
-              { L: zoom, 
-                X: x,
-                Y: y
-              });
-        } else {
-            return OpenLayers.Util.getImageLocation("blank.gif");
-        }
-
-    },
-
-    CLASS_NAME: "OpenLayers.Layer.WorldWind"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/XYZ.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/XYZ.js
deleted file mode 100644
index 5af5ce3b..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/XYZ.js
+++ /dev/null
@@ -1,172 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Layer/Grid.js
- */
-
-/** 
- * Class: OpenLayers.Layer.XYZ
- * The XYZ class is designed to make it easier for people who have tiles
- * arranged by a standard XYZ grid. 
- * 
- * Inherits from:
- *  - <OpenLayers.Layer.Grid>
- */
-OpenLayers.Layer.XYZ = OpenLayers.Class(OpenLayers.Layer.Grid, {
-    
-    /**
-     * APIProperty: isBaseLayer
-     * Default is true, as this is designed to be a base tile source. 
-     */
-    isBaseLayer: true,
-    
-    /**
-     * APIProperty: sphericalMercator
-     * Whether the tile extents should be set to the defaults for 
-     *    spherical mercator. Useful for things like OpenStreetMap.
-     *    Default is false, except for the OSM subclass.
-     */
-    sphericalMercator: false,
-
-    /**
-     * APIProperty: zoomOffset
-     * {Number} If your cache has more zoom levels than you want to provide
-     *     access to with this layer, supply a zoomOffset.  This zoom offset
-     *     is added to the current map zoom level to determine the level
-     *     for a requested tile.  For example, if you supply a zoomOffset
-     *     of 3, when the map is at the zoom 0, tiles will be requested from
-     *     level 3 of your cache.  Default is 0 (assumes cache level and map
-     *     zoom are equivalent).  Using <zoomOffset> is an alternative to
-     *     setting <serverResolutions> if you only want to expose a subset
-     *     of the server resolutions.
-     */
-    zoomOffset: 0,
-    
-    /**
-     * APIProperty: serverResolutions
-     * {Array} A list of all resolutions available on the server.  Only set this
-     *     property if the map resolutions differ from the server. This
-     *     property serves two purposes. (a) <serverResolutions> can include
-     *     resolutions that the server supports and that you don't want to
-     *     provide with this layer; you can also look at <zoomOffset>, which is
-     *     an alternative to <serverResolutions> for that specific purpose.
-     *     (b) The map can work with resolutions that aren't supported by
-     *     the server, i.e. that aren't in <serverResolutions>. When the
-     *     map is displayed in such a resolution data for the closest
-     *     server-supported resolution is loaded and the layer div is
-     *     stretched as necessary.
-     */
-    serverResolutions: null,
-
-    /**
-     * Constructor: OpenLayers.Layer.XYZ
-     *
-     * Parameters:
-     * name - {String}
-     * url - {String}
-     * options - {Object} Hashtable of extra options to tag onto the layer
-     */
-    initialize: function(name, url, options) {
-        if (options && options.sphericalMercator || this.sphericalMercator) {
-            options = OpenLayers.Util.extend({
-                projection: "EPSG:900913",
-                numZoomLevels: 19
-            }, options);
-        }
-        OpenLayers.Layer.Grid.prototype.initialize.apply(this, [
-            name || this.name, url || this.url, {}, options
-        ]);
-    },
-    
-    /**
-     * APIMethod: clone
-     * Create a clone of this layer
-     *
-     * Parameters:
-     * obj - {Object} Is this ever used?
-     * 
-     * Returns:
-     * {<OpenLayers.Layer.XYZ>} An exact clone of this OpenLayers.Layer.XYZ
-     */
-    clone: function (obj) {
-        
-        if (obj == null) {
-            obj = new OpenLayers.Layer.XYZ(this.name,
-                                            this.url,
-                                            this.getOptions());
-        }
-
-        //get all additions from superclasses
-        obj = OpenLayers.Layer.Grid.prototype.clone.apply(this, [obj]);
-
-        return obj;
-    },    
-
-    /**
-     * Method: getURL
-     *
-     * Parameters:
-     * bounds - {<OpenLayers.Bounds>}
-     *
-     * Returns:
-     * {String} A string with the layer's url and parameters and also the
-     *          passed-in bounds and appropriate tile size specified as
-     *          parameters
-     */
-    getURL: function (bounds) {
-        var xyz = this.getXYZ(bounds);
-        var url = this.url;
-        if (OpenLayers.Util.isArray(url)) {
-            var s = '' + xyz.x + xyz.y + xyz.z;
-            url = this.selectUrl(s, url);
-        }
-        
-        return OpenLayers.String.format(url, xyz);
-    },
-    
-    /**
-     * Method: getXYZ
-     * Calculates x, y and z for the given bounds.
-     *
-     * Parameters:
-     * bounds - {<OpenLayers.Bounds>}
-     *
-     * Returns:
-     * {Object} - an object with x, y and z properties.
-     */
-    getXYZ: function(bounds) {
-        var res = this.getServerResolution();
-        var x = Math.round((bounds.left - this.maxExtent.left) /
-            (res * this.tileSize.w));
-        var y = Math.round((this.maxExtent.top - bounds.top) /
-            (res * this.tileSize.h));
-        var z = this.getServerZoom();
-
-        if (this.wrapDateLine) {
-            var limit = Math.pow(2, z);
-            x = ((x % limit) + limit) % limit;
-        }
-
-        return {'x': x, 'y': y, 'z': z};
-    },
-    
-    /* APIMethod: setMap
-     * When the layer is added to a map, then we can fetch our origin 
-     *    (if we don't have one.) 
-     * 
-     * Parameters:
-     * map - {<OpenLayers.Map>}
-     */
-    setMap: function(map) {
-        OpenLayers.Layer.Grid.prototype.setMap.apply(this, arguments);
-        if (!this.tileOrigin) { 
-            this.tileOrigin = new OpenLayers.LonLat(this.maxExtent.left,
-                                                this.maxExtent.bottom);
-        }                                       
-    },
-
-    CLASS_NAME: "OpenLayers.Layer.XYZ"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/Zoomify.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/Zoomify.js
deleted file mode 100644
index 1c3d57dd..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Layer/Zoomify.js
+++ /dev/null
@@ -1,260 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/*
- * Development supported by a R&D grant DC08P02OUK006 - Old Maps Online
- * (www.oldmapsonline.org) from Ministry of Culture of the Czech Republic.
- */
-
-
-/**
- * @requires OpenLayers/Layer/Grid.js
- */
-
-/**
- * Class: OpenLayers.Layer.Zoomify
- *
- * Inherits from:
- *  - <OpenLayers.Layer.Grid>
- */
-OpenLayers.Layer.Zoomify = OpenLayers.Class(OpenLayers.Layer.Grid, {
-
-    /**
-     * Property: size
-     * {<OpenLayers.Size>} The Zoomify image size in pixels.
-     */
-    size: null,
-
-    /**
-     * APIProperty: isBaseLayer
-     * {Boolean}
-     */
-    isBaseLayer: true,
-
-    /**
-     * Property: standardTileSize
-     * {Integer} The size of a standard (non-border) square tile in pixels.
-     */
-    standardTileSize: 256,
-
-    /** 
-     * Property: tileOriginCorner
-     * {String} This layer uses top-left as tile origin
-     **/
-    tileOriginCorner: "tl",
-
-    /**
-     * Property: numberOfTiers
-     * {Integer} Depth of the Zoomify pyramid, number of tiers (zoom levels)
-     *                          - filled during Zoomify pyramid initialization.
-     */
-    numberOfTiers: 0,
-
-    /**
-     * Property: tileCountUpToTier
-     * {Array(Integer)} Number of tiles up to the given tier of pyramid.
-     *                          - filled during Zoomify pyramid initialization.
-     */
-    tileCountUpToTier: null,
-
-    /**
-     * Property: tierSizeInTiles
-     * {Array(<OpenLayers.Size>)} Size (in tiles) for each tier of pyramid.
-     *                          - filled during Zoomify pyramid initialization.
-     */
-    tierSizeInTiles: null,
-
-    /**
-     * Property: tierImageSize
-     * {Array(<OpenLayers.Size>)} Image size in pixels for each pyramid tier.
-     *                          - filled during Zoomify pyramid initialization.
-     */
-    tierImageSize: null,
-
-    /**
-     * Constructor: OpenLayers.Layer.Zoomify
-     *
-     * Parameters:
-     * name - {String} A name for the layer.
-     * url - {String} - Relative or absolute path to the image or more
-     *        precisly to the TileGroup[X] directories root.
-     *        Flash plugin use the variable name "zoomifyImagePath" for this.
-     * size - {<OpenLayers.Size>} The size (in pixels) of the image.
-     * options - {Object} Hashtable of extra options to tag onto the layer
-     */
-    initialize: function(name, url, size, options) {
-
-        // initilize the Zoomify pyramid for given size
-        this.initializeZoomify(size);
-
-        OpenLayers.Layer.Grid.prototype.initialize.apply(this, [
-            name, url, size, {}, options
-        ]);
-    },
-
-    /**
-     * Method: initializeZoomify
-     * It generates constants for all tiers of the Zoomify pyramid
-     *
-     * Parameters:
-     * size - {<OpenLayers.Size>} The size of the image in pixels
-     *
-     */
-    initializeZoomify: function( size ) {
-
-        var imageSize = size.clone();
-        this.size = size.clone();
-        var tiles = new OpenLayers.Size(
-            Math.ceil( imageSize.w / this.standardTileSize ),
-            Math.ceil( imageSize.h / this.standardTileSize )
-            );
-
-        this.tierSizeInTiles = [tiles];
-        this.tierImageSize = [imageSize];
-
-        while (imageSize.w > this.standardTileSize ||
-               imageSize.h > this.standardTileSize ) {
-
-            imageSize = new OpenLayers.Size(
-                Math.floor( imageSize.w / 2 ),
-                Math.floor( imageSize.h / 2 )
-                );
-            tiles = new OpenLayers.Size(
-                Math.ceil( imageSize.w / this.standardTileSize ),
-                Math.ceil( imageSize.h / this.standardTileSize )
-                );
-            this.tierSizeInTiles.push( tiles );
-            this.tierImageSize.push( imageSize );
-        }
-
-        this.tierSizeInTiles.reverse();
-        this.tierImageSize.reverse();
-
-        this.numberOfTiers = this.tierSizeInTiles.length;
-        var resolutions = [1];
-        this.tileCountUpToTier = [0];
-        for (var i = 1; i < this.numberOfTiers; i++) {
-            resolutions.unshift(Math.pow(2, i));
-            this.tileCountUpToTier.push(
-                this.tierSizeInTiles[i-1].w * this.tierSizeInTiles[i-1].h +
-                this.tileCountUpToTier[i-1]
-                );
-        }
-        if (!this.serverResolutions) {
-            this.serverResolutions = resolutions;
-        }
-    },
-
-    /**
-     * APIMethod:destroy
-     */
-    destroy: function() {
-        // for now, nothing special to do here.
-        OpenLayers.Layer.Grid.prototype.destroy.apply(this, arguments);
-
-        // Remove from memory the Zoomify pyramid - is that enough?
-        this.tileCountUpToTier.length = 0;
-        this.tierSizeInTiles.length = 0;
-        this.tierImageSize.length = 0;
-
-    },
-
-    /**
-     * APIMethod: clone
-     *
-     * Parameters:
-     * obj - {Object}
-     *
-     * Returns:
-     * {<OpenLayers.Layer.Zoomify>} An exact clone of this <OpenLayers.Layer.Zoomify>
-     */
-    clone: function (obj) {
-
-        if (obj == null) {
-            obj = new OpenLayers.Layer.Zoomify(this.name,
-                                           this.url,
-                                           this.size,
-                                           this.options);
-        }
-
-        //get all additions from superclasses
-        obj = OpenLayers.Layer.Grid.prototype.clone.apply(this, [obj]);
-
-        // copy/set any non-init, non-simple values here
-
-        return obj;
-    },
-
-    /**
-     * Method: getURL
-     *
-     * Parameters:
-     * bounds - {<OpenLayers.Bounds>}
-     *
-     * Returns:
-     * {String} A string with the layer's url and parameters and also the
-     *          passed-in bounds and appropriate tile size specified as
-     *          parameters
-     */
-    getURL: function (bounds) {
-        bounds = this.adjustBounds(bounds);
-        var res = this.getServerResolution();
-        var x = Math.round((bounds.left - this.tileOrigin.lon) / (res * this.tileSize.w));
-        var y = Math.round((this.tileOrigin.lat - bounds.top) / (res * this.tileSize.h));
-        var z = this.getZoomForResolution( res );
-
-        var tileIndex = x + y * this.tierSizeInTiles[z].w + this.tileCountUpToTier[z];
-        var path = "TileGroup" + Math.floor( (tileIndex) / 256 ) +
-            "/" + z + "-" + x + "-" + y + ".jpg";
-        var url = this.url;
-        if (OpenLayers.Util.isArray(url)) {
-            url = this.selectUrl(path, url);
-        }
-        return url + path;
-    },
-
-    /**
-     * Method: getImageSize
-     * getImageSize returns size for a particular tile. If bounds are given as
-     * first argument, size is calculated (bottom-right tiles are non square).
-     *
-     */
-    getImageSize: function() {
-        if (arguments.length > 0) {
-            var bounds = this.adjustBounds(arguments[0]);
-            var res = this.getServerResolution();
-            var x = Math.round((bounds.left - this.tileOrigin.lon) / (res * this.tileSize.w));
-            var y = Math.round((this.tileOrigin.lat - bounds.top) / (res * this.tileSize.h));
-            var z = this.getZoomForResolution( res );
-            var w = this.standardTileSize;
-            var h = this.standardTileSize;
-            if (x == this.tierSizeInTiles[z].w -1 ) {
-                var w = this.tierImageSize[z].w % this.standardTileSize;
-            }
-            if (y == this.tierSizeInTiles[z].h -1 ) {
-                var h = this.tierImageSize[z].h % this.standardTileSize;
-            }
-            return (new OpenLayers.Size(w, h));
-        } else {
-            return this.tileSize;
-        }
-    },
-
-    /**
-     * APIMethod: setMap
-     * When the layer is added to a map, then we can fetch our origin
-     *    (if we don't have one.)
-     *
-     * Parameters:
-     * map - {<OpenLayers.Map>}
-     */
-    setMap: function(map) {
-        OpenLayers.Layer.Grid.prototype.setMap.apply(this, arguments);
-        this.tileOrigin = new OpenLayers.LonLat(this.map.maxExtent.left,
-                                                this.map.maxExtent.top);
-    },
-
-    CLASS_NAME: "OpenLayers.Layer.Zoomify"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Map.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Map.js
deleted file mode 100644
index 56763fa0..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Map.js
+++ /dev/null
@@ -1,2867 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/BaseTypes/Class.js
- * @requires OpenLayers/Util.js
- * @requires OpenLayers/Util/vendorPrefix.js
- * @requires OpenLayers/Events.js
- * @requires OpenLayers/Tween.js
- * @requires OpenLayers/Projection.js
- */
-
-/**
- * Class: OpenLayers.Map
- * Instances of OpenLayers.Map are interactive maps embedded in a web page.
- * Create a new map with the <OpenLayers.Map> constructor.
- * 
- * On their own maps do not provide much functionality.  To extend a map
- * it's necessary to add controls (<OpenLayers.Control>) and 
- * layers (<OpenLayers.Layer>) to the map. 
- */
-OpenLayers.Map = OpenLayers.Class({
-    
-    /**
-     * Constant: Z_INDEX_BASE
-     * {Object} Base z-indexes for different classes of thing 
-     */
-    Z_INDEX_BASE: {
-        BaseLayer: 100,
-        Overlay: 325,
-        Feature: 725,
-        Popup: 750,
-        Control: 1000
-    },
-
-    /**
-     * APIProperty: events
-     * {<OpenLayers.Events>}
-     *
-     * Register a listener for a particular event with the following syntax:
-     * (code)
-     * map.events.register(type, obj, listener);
-     * (end)
-     *
-     * Listeners will be called with a reference to an event object.  The
-     *     properties of this event depends on exactly what happened.
-     *
-     * All event objects have at least the following properties:
-     * object - {Object} A reference to map.events.object.
-     * element - {DOMElement} A reference to map.events.element.
-     *
-     * Browser events have the following additional properties:
-     * xy - {<OpenLayers.Pixel>} The pixel location of the event (relative
-     *     to the the map viewport).
-     *
-     * Supported map event types:
-     * preaddlayer - triggered before a layer has been added.  The event
-     *     object will include a *layer* property that references the layer  
-     *     to be added. When a listener returns "false" the adding will be 
-     *     aborted.
-     * addlayer - triggered after a layer has been added.  The event object
-     *     will include a *layer* property that references the added layer.
-     * preremovelayer - triggered before a layer has been removed. The event
-     *     object will include a *layer* property that references the layer  
-     *     to be removed. When a listener returns "false" the removal will be 
-     *     aborted.
-     * removelayer - triggered after a layer has been removed.  The event
-     *     object will include a *layer* property that references the removed
-     *     layer.
-     * changelayer - triggered after a layer name change, order change,
-     *     opacity change, params change, visibility change (actual visibility,
-     *     not the layer's visibility property) or attribution change (due to
-     *     extent change). Listeners will receive an event object with *layer*
-     *     and *property* properties. The *layer* property will be a reference
-     *     to the changed layer. The *property* property will be a key to the
-     *     changed property (name, order, opacity, params, visibility or
-     *     attribution).
-     * movestart - triggered after the start of a drag, pan, or zoom. The event
-     *     object may include a *zoomChanged* property that tells whether the
-     *     zoom has changed.
-     * move - triggered after each drag, pan, or zoom
-     * moveend - triggered after a drag, pan, or zoom completes
-     * zoomend - triggered after a zoom completes
-     * mouseover - triggered after mouseover the map
-     * mouseout - triggered after mouseout the map
-     * mousemove - triggered after mousemove the map
-     * changebaselayer - triggered after the base layer changes
-     * updatesize - triggered after the <updateSize> method was executed
-     */
-
-    /**
-     * Property: id
-     * {String} Unique identifier for the map
-     */
-    id: null,
-    
-    /**
-     * Property: fractionalZoom
-     * {Boolean} For a base layer that supports it, allow the map resolution
-     *     to be set to a value between one of the values in the resolutions
-     *     array.  Default is false.
-     *
-     * When fractionalZoom is set to true, it is possible to zoom to
-     *     an arbitrary extent.  This requires a base layer from a source
-     *     that supports requests for arbitrary extents (i.e. not cached
-     *     tiles on a regular lattice).  This means that fractionalZoom
-     *     will not work with commercial layers (Google, Yahoo, VE), layers
-     *     using TileCache, or any other pre-cached data sources.
-     *
-     * If you are using fractionalZoom, then you should also use
-     *     <getResolutionForZoom> instead of layer.resolutions[zoom] as the
-     *     former works for non-integer zoom levels.
-     */
-    fractionalZoom: false,
-    
-    /**
-     * APIProperty: events
-     * {<OpenLayers.Events>} An events object that handles all 
-     *                       events on the map
-     */
-    events: null,
-    
-    /**
-     * APIProperty: allOverlays
-     * {Boolean} Allow the map to function with "overlays" only.  Defaults to
-     *     false.  If true, the lowest layer in the draw order will act as
-     *     the base layer.  In addition, if set to true, all layers will
-     *     have isBaseLayer set to false when they are added to the map.
-     *
-     * Note:
-     * If you set map.allOverlays to true, then you *cannot* use
-     *     map.setBaseLayer or layer.setIsBaseLayer.  With allOverlays true,
-     *     the lowest layer in the draw layer is the base layer.  So, to change
-     *     the base layer, use <setLayerIndex> or <raiseLayer> to set the layer
-     *     index to 0.
-     */
-    allOverlays: false,
-
-    /**
-     * APIProperty: div
-     * {DOMElement|String} The element that contains the map (or an id for
-     *     that element).  If the <OpenLayers.Map> constructor is called
-     *     with two arguments, this should be provided as the first argument.
-     *     Alternatively, the map constructor can be called with the options
-     *     object as the only argument.  In this case (one argument), a
-     *     div property may or may not be provided.  If the div property
-     *     is not provided, the map can be rendered to a container later
-     *     using the <render> method.
-     *     
-     * Note:
-     * If you are calling <render> after map construction, do not use
-     *     <maxResolution>  auto.  Instead, divide your <maxExtent> by your
-     *     maximum expected dimension.
-     */
-    div: null,
-    
-    /**
-     * Property: dragging
-     * {Boolean} The map is currently being dragged.
-     */
-    dragging: false,
-
-    /**
-     * Property: size
-     * {<OpenLayers.Size>} Size of the main div (this.div)
-     */
-    size: null,
-    
-    /**
-     * Property: viewPortDiv
-     * {HTMLDivElement} The element that represents the map viewport
-     */
-    viewPortDiv: null,
-
-    /**
-     * Property: layerContainerOrigin
-     * {<OpenLayers.LonLat>} The lonlat at which the later container was
-     *                       re-initialized (on-zoom)
-     */
-    layerContainerOrigin: null,
-
-    /**
-     * Property: layerContainerDiv
-     * {HTMLDivElement} The element that contains the layers.
-     */
-    layerContainerDiv: null,
-
-    /**
-     * APIProperty: layers
-     * {Array(<OpenLayers.Layer>)} Ordered list of layers in the map
-     */
-    layers: null,
-
-    /**
-     * APIProperty: controls
-     * {Array(<OpenLayers.Control>)} List of controls associated with the map.
-     *
-     * If not provided in the map options at construction, the map will
-     *     by default be given the following controls if present in the build:
-     *  - <OpenLayers.Control.Navigation> or <OpenLayers.Control.TouchNavigation>
-     *  - <OpenLayers.Control.Zoom> or <OpenLayers.Control.PanZoom>
-     *  - <OpenLayers.Control.ArgParser>
-     *  - <OpenLayers.Control.Attribution>
-     */
-    controls: null,
-
-    /**
-     * Property: popups
-     * {Array(<OpenLayers.Popup>)} List of popups associated with the map
-     */
-    popups: null,
-
-    /**
-     * APIProperty: baseLayer
-     * {<OpenLayers.Layer>} The currently selected base layer.  This determines
-     * min/max zoom level, projection, etc.
-     */
-    baseLayer: null,
-    
-    /**
-     * Property: center
-     * {<OpenLayers.LonLat>} The current center of the map
-     */
-    center: null,
-
-    /**
-     * Property: resolution
-     * {Float} The resolution of the map.
-     */
-    resolution: null,
-
-    /**
-     * Property: zoom
-     * {Integer} The current zoom level of the map
-     */
-    zoom: 0,    
-
-    /**
-     * Property: panRatio
-     * {Float} The ratio of the current extent within
-     *         which panning will tween.
-     */
-    panRatio: 1.5,    
-
-    /**
-     * APIProperty: options
-     * {Object} The options object passed to the class constructor. Read-only.
-     */
-    options: null,
-
-  // Options
-
-    /**
-     * APIProperty: tileSize
-     * {<OpenLayers.Size>} Set in the map options to override the default tile
-     *                     size for this map.
-     */
-    tileSize: null,
-
-    /**
-     * APIProperty: projection
-     * {String} Set in the map options to specify the default projection 
-     *          for layers added to this map. When using a projection other than EPSG:4326
-     *          (CRS:84, Geographic) or EPSG:3857 (EPSG:900913, Web Mercator),
-     *          also set maxExtent, maxResolution or resolutions.  Default is "EPSG:4326".
-     *          Note that the projection of the map is usually determined
-     *          by that of the current baseLayer (see <baseLayer> and <getProjectionObject>).
-     */
-    projection: "EPSG:4326",    
-        
-    /**
-     * APIProperty: units
-     * {String} The map units.  Possible values are 'degrees' (or 'dd'), 'm', 
-     *     'ft', 'km', 'mi', 'inches'.  Normally taken from the projection.
-     *     Only required if both map and layers do not define a projection,
-     *     or if they define a projection which does not define units
-     */
-    units: null,
-
-    /**
-     * APIProperty: resolutions
-     * {Array(Float)} A list of map resolutions (map units per pixel) in 
-     *     descending order.  If this is not set in the layer constructor, it 
-     *     will be set based on other resolution related properties 
-     *     (maxExtent, maxResolution, maxScale, etc.).
-     */
-    resolutions: null,
-
-    /**
-     * APIProperty: maxResolution
-     * {Float} Required if you are not displaying the whole world on a tile
-     * with the size specified in <tileSize>.
-     */
-    maxResolution: null,
-
-    /**
-     * APIProperty: minResolution
-     * {Float}
-     */
-    minResolution: null,
-
-    /**
-     * APIProperty: maxScale
-     * {Float}
-     */
-    maxScale: null,
-
-    /**
-     * APIProperty: minScale
-     * {Float}
-     */
-    minScale: null,
-
-    /**
-     * APIProperty: maxExtent
-     * {<OpenLayers.Bounds>|Array} If provided as an array, the array
-     *     should consist of four values (left, bottom, right, top).
-     *     The maximum extent for the map.
-     *     Default depends on projection; if this is one of those defined in OpenLayers.Projection.defaults
-     *     (EPSG:4326 or web mercator), maxExtent will be set to the value defined there;
-     *     else, defaults to null.
-     *     To restrict user panning and zooming of the map, use <restrictedExtent> instead.
-     *     The value for <maxExtent> will change calculations for tile URLs.
-     */
-    maxExtent: null,
-    
-    /**
-     * APIProperty: minExtent
-     * {<OpenLayers.Bounds>|Array} If provided as an array, the array
-     *     should consist of four values (left, bottom, right, top).
-     *     The minimum extent for the map.  Defaults to null.
-     */
-    minExtent: null,
-    
-    /**
-     * APIProperty: restrictedExtent
-     * {<OpenLayers.Bounds>|Array} If provided as an array, the array
-     *     should consist of four values (left, bottom, right, top).
-     *     Limit map navigation to this extent where possible.
-     *     If a non-null restrictedExtent is set, panning will be restricted
-     *     to the given bounds.  In addition, zooming to a resolution that
-     *     displays more than the restricted extent will center the map
-     *     on the restricted extent.  If you wish to limit the zoom level
-     *     or resolution, use maxResolution.
-     */
-    restrictedExtent: null,
-
-    /**
-     * APIProperty: numZoomLevels
-     * {Integer} Number of zoom levels for the map.  Defaults to 16.  Set a
-     *           different value in the map options if needed.
-     */
-    numZoomLevels: 16,
-
-    /**
-     * APIProperty: theme
-     * {String} Relative path to a CSS file from which to load theme styles.
-     *          Specify null in the map options (e.g. {theme: null}) if you 
-     *          want to get cascading style declarations - by putting links to 
-     *          stylesheets or style declarations directly in your page.
-     */
-    theme: null,
-    
-    /** 
-     * APIProperty: displayProjection
-     * {<OpenLayers.Projection>} Requires proj4js support for projections other
-     *     than EPSG:4326 or EPSG:900913/EPSG:3857. Projection used by
-     *     several controls to display data to user. If this property is set,
-     *     it will be set on any control which has a null displayProjection
-     *     property at the time the control is added to the map. 
-     */
-    displayProjection: null,
-
-    /**
-     * APIProperty: tileManager
-     * {<OpenLayers.TileManager>|Object} By default, and if the build contains
-     * TileManager.js, the map will use the TileManager to queue image requests
-     * and to cache tile image elements. To create a map without a TileManager
-     * configure the map with tileManager: null. To create a TileManager with
-     * non-default options, supply the options instead or alternatively supply
-     * an instance of {<OpenLayers.TileManager>}.
-     */
-
-    /**
-     * APIProperty: fallThrough
-     * {Boolean} Should OpenLayers allow events on the map to fall through to
-     *           other elements on the page, or should it swallow them? (#457)
-     *           Default is to swallow.
-     */
-    fallThrough: false,
-
-    /**
-     * APIProperty: autoUpdateSize
-     * {Boolean} Should OpenLayers automatically update the size of the map
-     * when the resize event is fired. Default is true.
-     */
-    autoUpdateSize: true,
-    
-    /**
-     * APIProperty: eventListeners
-     * {Object} If set as an option at construction, the eventListeners
-     *     object will be registered with <OpenLayers.Events.on>.  Object
-     *     structure must be a listeners object as shown in the example for
-     *     the events.on method.
-     */
-    eventListeners: null,
-
-    /**
-     * Property: panTween
-     * {<OpenLayers.Tween>} Animated panning tween object, see panTo()
-     */
-    panTween: null,
-
-    /**
-     * APIProperty: panMethod
-     * {Function} The Easing function to be used for tweening.  Default is
-     * OpenLayers.Easing.Expo.easeOut. Setting this to 'null' turns off
-     * animated panning.
-     */
-    panMethod: OpenLayers.Easing.Expo.easeOut,
-    
-    /**
-     * Property: panDuration
-     * {Integer} The number of steps to be passed to the
-     * OpenLayers.Tween.start() method when the map is
-     * panned.
-     * Default is 50.
-     */
-    panDuration: 50,
-    
-    /**
-     * Property: zoomTween
-     * {<OpenLayers.Tween>} Animated zooming tween object, see zoomTo()
-     */
-    zoomTween: null,
-
-    /**
-     * APIProperty: zoomMethod
-     * {Function} The Easing function to be used for tweening.  Default is
-     * OpenLayers.Easing.Quad.easeOut. Setting this to 'null' turns off
-     * animated zooming.
-     */
-    zoomMethod: OpenLayers.Easing.Quad.easeOut,
-    
-    /**
-     * Property: zoomDuration
-     * {Integer} The number of steps to be passed to the
-     * OpenLayers.Tween.start() method when the map is zoomed.
-     * Default is 20.
-     */
-    zoomDuration: 20,
-    
-    /**
-     * Property: paddingForPopups
-     * {<OpenLayers.Bounds>} Outside margin of the popup. Used to prevent 
-     *     the popup from getting too close to the map border.
-     */
-    paddingForPopups : null,
-    
-    /**
-     * Property: layerContainerOriginPx
-     * {Object} Cached object representing the layer container origin (in pixels).
-     */
-    layerContainerOriginPx: null,
-    
-    /**
-     * Property: minPx
-     * {Object} An object with a 'x' and 'y' values that is the lower
-     *     left of maxExtent in viewport pixel space.
-     *     Used to verify in moveByPx that the new location we're moving to
-     *     is valid. It is also used in the getLonLatFromViewPortPx function
-     *     of Layer.
-     */
-    minPx: null,
-    
-    /**
-     * Property: maxPx
-     * {Object} An object with a 'x' and 'y' values that is the top
-     *     right of maxExtent in viewport pixel space.
-     *     Used to verify in moveByPx that the new location we're moving to
-     *     is valid.
-     */
-    maxPx: null,
-    
-    /**
-     * Constructor: OpenLayers.Map
-     * Constructor for a new OpenLayers.Map instance.  There are two possible
-     *     ways to call the map constructor.  See the examples below.
-     *
-     * Parameters:
-     * div - {DOMElement|String}  The element or id of an element in your page
-     *     that will contain the map.  May be omitted if the <div> option is
-     *     provided or if you intend to call the <render> method later.
-     * options - {Object} Optional object with properties to tag onto the map.
-     *
-     * Valid options (in addition to the listed API properties):
-     * center - {<OpenLayers.LonLat>|Array} The default initial center of the map.
-     *     If provided as array, the first value is the x coordinate,
-     *     and the 2nd value is the y coordinate.
-     *     Only specify if <layers> is provided.
-     *     Note that if an ArgParser/Permalink control is present,
-     *     and the querystring contains coordinates, center will be set
-     *     by that, and this option will be ignored.
-     * zoom - {Number} The initial zoom level for the map. Only specify if
-     *     <layers> is provided.
-     *     Note that if an ArgParser/Permalink control is present,
-     *     and the querystring contains a zoom level, zoom will be set
-     *     by that, and this option will be ignored.
-     * extent - {<OpenLayers.Bounds>|Array} The initial extent of the map.
-     *     If provided as an array, the array should consist of
-     *     four values (left, bottom, right, top).
-     *     Only specify if <center> and <zoom> are not provided.
-     * 
-     * Examples:
-     * (code)
-     * // create a map with default options in an element with the id "map1"
-     * var map = new OpenLayers.Map("map1");
-     *
-     * // create a map with non-default options in an element with id "map2"
-     * var options = {
-     *     projection: "EPSG:3857",
-     *     maxExtent: new OpenLayers.Bounds(-200000, -200000, 200000, 200000),
-     *     center: new OpenLayers.LonLat(-12356463.476333, 5621521.4854095)
-     * };
-     * var map = new OpenLayers.Map("map2", options);
-     *
-     * // map with non-default options - same as above but with a single argument,
-     * // a restricted extent, and using arrays for bounds and center
-     * var map = new OpenLayers.Map({
-     *     div: "map_id",
-     *     projection: "EPSG:3857",
-     *     maxExtent: [-18924313.432222, -15538711.094146, 18924313.432222, 15538711.094146],
-     *     restrictedExtent: [-13358338.893333, -9608371.5085962, 13358338.893333, 9608371.5085962],
-     *     center: [-12356463.476333, 5621521.4854095]
-     * });
-     *
-     * // create a map without a reference to a container - call render later
-     * var map = new OpenLayers.Map({
-     *     projection: "EPSG:3857",
-     *     maxExtent: new OpenLayers.Bounds(-200000, -200000, 200000, 200000)
-     * });
-     * (end)
-     */    
-    initialize: function (div, options) {
-        
-        // If only one argument is provided, check if it is an object.
-        if(arguments.length === 1 && typeof div === "object") {
-            options = div;
-            div = options && options.div;
-        }
-
-        // Simple-type defaults are set in class definition. 
-        //  Now set complex-type defaults 
-        this.tileSize = new OpenLayers.Size(OpenLayers.Map.TILE_WIDTH,
-                                            OpenLayers.Map.TILE_HEIGHT);
-        
-        this.paddingForPopups = new OpenLayers.Bounds(15, 15, 15, 15);
-
-        this.theme = OpenLayers._getScriptLocation() + 
-                             'theme/default/style.css'; 
-
-        // backup original options
-        this.options = OpenLayers.Util.extend({}, options);
-
-        // now override default options 
-        OpenLayers.Util.extend(this, options);
-        
-        var projCode = this.projection instanceof OpenLayers.Projection ?
-            this.projection.projCode : this.projection;
-        OpenLayers.Util.applyDefaults(this, OpenLayers.Projection.defaults[projCode]);
-        
-        // allow extents and center to be arrays
-        if (this.maxExtent && !(this.maxExtent instanceof OpenLayers.Bounds)) {
-            this.maxExtent = new OpenLayers.Bounds(this.maxExtent);
-        }
-        if (this.minExtent && !(this.minExtent instanceof OpenLayers.Bounds)) {
-            this.minExtent = new OpenLayers.Bounds(this.minExtent);
-        }
-        if (this.restrictedExtent && !(this.restrictedExtent instanceof OpenLayers.Bounds)) {
-            this.restrictedExtent = new OpenLayers.Bounds(this.restrictedExtent);
-        }
-        if (this.center && !(this.center instanceof OpenLayers.LonLat)) {
-            this.center = new OpenLayers.LonLat(this.center);
-        }
-
-        // initialize layers array
-        this.layers = [];
-
-        this.id = OpenLayers.Util.createUniqueID("OpenLayers.Map_");
-
-        this.div = OpenLayers.Util.getElement(div);
-        if(!this.div) {
-            this.div = document.createElement("div");
-            this.div.style.height = "1px";
-            this.div.style.width = "1px";
-        }
-        
-        OpenLayers.Element.addClass(this.div, 'olMap');
-
-        // the viewPortDiv is the outermost div we modify
-        var id = this.id + "_OpenLayers_ViewPort";
-        this.viewPortDiv = OpenLayers.Util.createDiv(id, null, null, null,
-                                                     "relative", null,
-                                                     "hidden");
-        this.viewPortDiv.style.width = "100%";
-        this.viewPortDiv.style.height = "100%";
-        this.viewPortDiv.className = "olMapViewport";
-        this.div.appendChild(this.viewPortDiv);
-
-        this.events = new OpenLayers.Events(
-            this, this.viewPortDiv, null, this.fallThrough, 
-            {includeXY: true}
-        );
-        
-        if (OpenLayers.TileManager && this.tileManager !== null) {
-            if (!(this.tileManager instanceof OpenLayers.TileManager)) {
-                this.tileManager = new OpenLayers.TileManager(this.tileManager);
-            }
-            this.tileManager.addMap(this);
-        }
-
-        // the layerContainerDiv is the one that holds all the layers
-        id = this.id + "_OpenLayers_Container";
-        this.layerContainerDiv = OpenLayers.Util.createDiv(id);
-        this.layerContainerDiv.style.zIndex=this.Z_INDEX_BASE['Popup']-1;
-        this.layerContainerOriginPx = {x: 0, y: 0};
-        this.applyTransform();
-        
-        this.viewPortDiv.appendChild(this.layerContainerDiv);
-
-        this.updateSize();
-        if(this.eventListeners instanceof Object) {
-            this.events.on(this.eventListeners);
-        }
-
-        if (this.autoUpdateSize === true) {
-            // updateSize on catching the window's resize
-            // Note that this is ok, as updateSize() does nothing if the 
-            // map's size has not actually changed.
-            this.updateSizeDestroy = OpenLayers.Function.bind(this.updateSize, 
-                this);
-            OpenLayers.Event.observe(window, 'resize',
-                            this.updateSizeDestroy);
-        }
-        
-        // only append link stylesheet if the theme property is set
-        if(this.theme) {
-            // check existing links for equivalent url
-            var addNode = true;
-            var nodes = document.getElementsByTagName('link');
-            for(var i=0, len=nodes.length; i<len; ++i) {
-                if(OpenLayers.Util.isEquivalentUrl(nodes.item(i).href,
-                                                   this.theme)) {
-                    addNode = false;
-                    break;
-                }
-            }
-            // only add a new node if one with an equivalent url hasn't already
-            // been added
-            if(addNode) {
-                var cssNode = document.createElement('link');
-                cssNode.setAttribute('rel', 'stylesheet');
-                cssNode.setAttribute('type', 'text/css');
-                cssNode.setAttribute('href', this.theme);
-                document.getElementsByTagName('head')[0].appendChild(cssNode);
-            }
-        }
-        
-        if (this.controls == null) { // default controls
-            this.controls = [];
-            if (OpenLayers.Control != null) { // running full or lite?
-                // Navigation or TouchNavigation depending on what is in build
-                if (OpenLayers.Control.Navigation) {
-                    this.controls.push(new OpenLayers.Control.Navigation());
-                } else if (OpenLayers.Control.TouchNavigation) {
-                    this.controls.push(new OpenLayers.Control.TouchNavigation());
-                }
-                if (OpenLayers.Control.Zoom) {
-                    this.controls.push(new OpenLayers.Control.Zoom());
-                } else if (OpenLayers.Control.PanZoom) {
-                    this.controls.push(new OpenLayers.Control.PanZoom());
-                }
-
-                if (OpenLayers.Control.ArgParser) {
-                    this.controls.push(new OpenLayers.Control.ArgParser());
-                }
-                if (OpenLayers.Control.Attribution) {
-                    this.controls.push(new OpenLayers.Control.Attribution());
-                }
-            }
-        }
-
-        for(var i=0, len=this.controls.length; i<len; i++) {
-            this.addControlToMap(this.controls[i]);
-        }
-
-        this.popups = [];
-
-        this.unloadDestroy = OpenLayers.Function.bind(this.destroy, this);
-        
-
-        // always call map.destroy()
-        OpenLayers.Event.observe(window, 'unload', this.unloadDestroy);
-        
-        // add any initial layers
-        if (options && options.layers) {
-            /** 
-             * If you have set options.center, the map center property will be
-             * set at this point.  However, since setCenter has not been called,
-             * addLayers gets confused.  So we delete the map center in this 
-             * case.  Because the check below uses options.center, it will
-             * be properly set below.
-             */
-            delete this.center;
-            delete this.zoom;
-            this.addLayers(options.layers);
-            // set center (and optionally zoom)
-            if (options.center && !this.getCenter()) {
-                // zoom can be undefined here
-                this.setCenter(options.center, options.zoom);
-            }
-        }
-
-        if (this.panMethod) {
-            this.panTween = new OpenLayers.Tween(this.panMethod);
-        }
-        if (this.zoomMethod && this.applyTransform.transform) {
-            this.zoomTween = new OpenLayers.Tween(this.zoomMethod);
-        }
-    },
-
-    /** 
-     * APIMethod: getViewport
-     * Get the DOMElement representing the view port.
-     *
-     * Returns:
-     * {DOMElement}
-     */
-    getViewport: function() {
-        return this.viewPortDiv;
-    },
-    
-    /**
-     * APIMethod: render
-     * Render the map to a specified container.
-     * 
-     * Parameters:
-     * div - {String|DOMElement} The container that the map should be rendered
-     *     to. If different than the current container, the map viewport
-     *     will be moved from the current to the new container.
-     */
-    render: function(div) {
-        this.div = OpenLayers.Util.getElement(div);
-        OpenLayers.Element.addClass(this.div, 'olMap');
-        this.viewPortDiv.parentNode.removeChild(this.viewPortDiv);
-        this.div.appendChild(this.viewPortDiv);
-        this.updateSize();
-    },
-
-    /**
-     * Method: unloadDestroy
-     * Function that is called to destroy the map on page unload. stored here
-     *     so that if map is manually destroyed, we can unregister this.
-     */
-    unloadDestroy: null,
-    
-    /**
-     * Method: updateSizeDestroy
-     * When the map is destroyed, we need to stop listening to updateSize
-     *    events: this method stores the function we need to unregister in 
-     *    non-IE browsers.
-     */
-    updateSizeDestroy: null,
-
-    /**
-     * APIMethod: destroy
-     * Destroy this map.
-     *    Note that if you are using an application which removes a container
-     *    of the map from the DOM, you need to ensure that you destroy the
-     *    map *before* this happens; otherwise, the page unload handler
-     *    will fail because the DOM elements that map.destroy() wants
-     *    to clean up will be gone. (See 
-     *    http://trac.osgeo.org/openlayers/ticket/2277 for more information).
-     *    This will apply to GeoExt and also to other applications which
-     *    modify the DOM of the container of the OpenLayers Map.
-     */
-    destroy:function() {
-        // if unloadDestroy is null, we've already been destroyed
-        if (!this.unloadDestroy) {
-            return false;
-        }
-        
-        // make sure panning doesn't continue after destruction
-        if(this.panTween) {
-            this.panTween.stop();
-            this.panTween = null;
-        }
-        // make sure zooming doesn't continue after destruction
-        if(this.zoomTween) {
-            this.zoomTween.stop();
-            this.zoomTween = null;
-        }
-
-        // map has been destroyed. dont do it again!
-        OpenLayers.Event.stopObserving(window, 'unload', this.unloadDestroy);
-        this.unloadDestroy = null;
-
-        if (this.updateSizeDestroy) {
-            OpenLayers.Event.stopObserving(window, 'resize', 
-                                           this.updateSizeDestroy);
-        }
-        
-        this.paddingForPopups = null;    
-
-        if (this.controls != null) {
-            for (var i = this.controls.length - 1; i>=0; --i) {
-                this.controls[i].destroy();
-            } 
-            this.controls = null;
-        }
-        if (this.layers != null) {
-            for (var i = this.layers.length - 1; i>=0; --i) {
-                //pass 'false' to destroy so that map wont try to set a new 
-                // baselayer after each baselayer is removed
-                this.layers[i].destroy(false);
-            } 
-            this.layers = null;
-        }
-        if (this.viewPortDiv && this.viewPortDiv.parentNode) {
-            this.viewPortDiv.parentNode.removeChild(this.viewPortDiv);
-        }
-        this.viewPortDiv = null;
-        
-        if (this.tileManager) {
-            this.tileManager.removeMap(this);
-            this.tileManager = null;
-        }
-
-        if(this.eventListeners) {
-            this.events.un(this.eventListeners);
-            this.eventListeners = null;
-        }
-        this.events.destroy();
-        this.events = null;
-
-        this.options = null;
-    },
-
-    /**
-     * APIMethod: setOptions
-     * Change the map options
-     *
-     * Parameters:
-     * options - {Object} Hashtable of options to tag to the map
-     */
-    setOptions: function(options) {
-        var updatePxExtent = this.minPx &&
-            options.restrictedExtent != this.restrictedExtent;
-        OpenLayers.Util.extend(this, options);
-        // force recalculation of minPx and maxPx
-        updatePxExtent && this.moveTo(this.getCachedCenter(), this.zoom, {
-            forceZoomChange: true
-        });
-    },
-
-    /**
-     * APIMethod: getTileSize
-     * Get the tile size for the map
-     *
-     * Returns:
-     * {<OpenLayers.Size>}
-     */
-     getTileSize: function() {
-         return this.tileSize;
-     },
-
-
-    /**
-     * APIMethod: getBy
-     * Get a list of objects given a property and a match item.
-     *
-     * Parameters:
-     * array - {String} A property on the map whose value is an array.
-     * property - {String} A property on each item of the given array.
-     * match - {String | Object} A string to match.  Can also be a regular
-     *     expression literal or object.  In addition, it can be any object
-     *     with a method named test.  For reqular expressions or other, if
-     *     match.test(map[array][i][property]) evaluates to true, the item will
-     *     be included in the array returned.  If no items are found, an empty
-     *     array is returned.
-     *
-     * Returns:
-     * {Array} An array of items where the given property matches the given
-     *     criteria.
-     */
-    getBy: function(array, property, match) {
-        var test = (typeof match.test == "function");
-        var found = OpenLayers.Array.filter(this[array], function(item) {
-            return item[property] == match || (test && match.test(item[property]));
-        });
-        return found;
-    },
-
-    /**
-     * APIMethod: getLayersBy
-     * Get a list of layers with properties matching the given criteria.
-     *
-     * Parameters:
-     * property - {String} A layer property to be matched.
-     * match - {String | Object} A string to match.  Can also be a regular
-     *     expression literal or object.  In addition, it can be any object
-     *     with a method named test.  For reqular expressions or other, if
-     *     match.test(layer[property]) evaluates to true, the layer will be
-     *     included in the array returned.  If no layers are found, an empty
-     *     array is returned.
-     *
-     * Returns:
-     * {Array(<OpenLayers.Layer>)} A list of layers matching the given criteria.
-     *     An empty array is returned if no matches are found.
-     */
-    getLayersBy: function(property, match) {
-        return this.getBy("layers", property, match);
-    },
-
-    /**
-     * APIMethod: getLayersByName
-     * Get a list of layers with names matching the given name.
-     *
-     * Parameters:
-     * match - {String | Object} A layer name.  The name can also be a regular
-     *     expression literal or object.  In addition, it can be any object
-     *     with a method named test.  For reqular expressions or other, if
-     *     name.test(layer.name) evaluates to true, the layer will be included
-     *     in the list of layers returned.  If no layers are found, an empty
-     *     array is returned.
-     *
-     * Returns:
-     * {Array(<OpenLayers.Layer>)} A list of layers matching the given name.
-     *     An empty array is returned if no matches are found.
-     */
-    getLayersByName: function(match) {
-        return this.getLayersBy("name", match);
-    },
-
-    /**
-     * APIMethod: getLayersByClass
-     * Get a list of layers of a given class (CLASS_NAME).
-     *
-     * Parameters:
-     * match - {String | Object} A layer class name.  The match can also be a
-     *     regular expression literal or object.  In addition, it can be any
-     *     object with a method named test.  For reqular expressions or other,
-     *     if type.test(layer.CLASS_NAME) evaluates to true, the layer will
-     *     be included in the list of layers returned.  If no layers are
-     *     found, an empty array is returned.
-     *
-     * Returns:
-     * {Array(<OpenLayers.Layer>)} A list of layers matching the given class.
-     *     An empty array is returned if no matches are found.
-     */
-    getLayersByClass: function(match) {
-        return this.getLayersBy("CLASS_NAME", match);
-    },
-
-    /**
-     * APIMethod: getControlsBy
-     * Get a list of controls with properties matching the given criteria.
-     *
-     * Parameters:
-     * property - {String} A control property to be matched.
-     * match - {String | Object} A string to match.  Can also be a regular
-     *     expression literal or object.  In addition, it can be any object
-     *     with a method named test.  For reqular expressions or other, if
-     *     match.test(layer[property]) evaluates to true, the layer will be
-     *     included in the array returned.  If no layers are found, an empty
-     *     array is returned.
-     *
-     * Returns:
-     * {Array(<OpenLayers.Control>)} A list of controls matching the given
-     *     criteria.  An empty array is returned if no matches are found.
-     */
-    getControlsBy: function(property, match) {
-        return this.getBy("controls", property, match);
-    },
-
-    /**
-     * APIMethod: getControlsByClass
-     * Get a list of controls of a given class (CLASS_NAME).
-     *
-     * Parameters:
-     * match - {String | Object} A control class name.  The match can also be a
-     *     regular expression literal or object.  In addition, it can be any
-     *     object with a method named test.  For reqular expressions or other,
-     *     if type.test(control.CLASS_NAME) evaluates to true, the control will
-     *     be included in the list of controls returned.  If no controls are
-     *     found, an empty array is returned.
-     *
-     * Returns:
-     * {Array(<OpenLayers.Control>)} A list of controls matching the given class.
-     *     An empty array is returned if no matches are found.
-     */
-    getControlsByClass: function(match) {
-        return this.getControlsBy("CLASS_NAME", match);
-    },
-
-  /********************************************************/
-  /*                                                      */
-  /*                  Layer Functions                     */
-  /*                                                      */
-  /*     The following functions deal with adding and     */
-  /*        removing Layers to and from the Map           */
-  /*                                                      */
-  /********************************************************/         
-
-    /**
-     * APIMethod: getLayer
-     * Get a layer based on its id
-     *
-     * Parameters:
-     * id - {String} A layer id
-     *
-     * Returns:
-     * {<OpenLayers.Layer>} The Layer with the corresponding id from the map's 
-     *                      layer collection, or null if not found.
-     */
-    getLayer: function(id) {
-        var foundLayer = null;
-        for (var i=0, len=this.layers.length; i<len; i++) {
-            var layer = this.layers[i];
-            if (layer.id == id) {
-                foundLayer = layer;
-                break;
-            }
-        }
-        return foundLayer;
-    },
-
-    /**
-    * Method: setLayerZIndex
-    * 
-    * Parameters:
-    * layer - {<OpenLayers.Layer>} 
-    * zIdx - {int} 
-    */    
-    setLayerZIndex: function (layer, zIdx) {
-        layer.setZIndex(
-            this.Z_INDEX_BASE[layer.isBaseLayer ? 'BaseLayer' : 'Overlay']
-            + zIdx * 5 );
-    },
-
-    /**
-     * Method: resetLayersZIndex
-     * Reset each layer's z-index based on layer's array index
-     */
-    resetLayersZIndex: function() {
-        for (var i=0, len=this.layers.length; i<len; i++) {
-            var layer = this.layers[i];
-            this.setLayerZIndex(layer, i);
-        }
-    },
-
-    /**
-    * APIMethod: addLayer
-    *
-    * Parameters:
-    * layer - {<OpenLayers.Layer>} 
-    *
-    * Returns:
-    * {Boolean} True if the layer has been added to the map.
-    */    
-    addLayer: function (layer) {
-        for(var i = 0, len = this.layers.length; i < len; i++) {
-            if (this.layers[i] == layer) {
-                return false;
-            }
-        }
-        if (this.events.triggerEvent("preaddlayer", {layer: layer}) === false) {
-            return false;
-        }
-        if(this.allOverlays) {
-            layer.isBaseLayer = false;
-        }
-        
-        layer.div.className = "olLayerDiv";
-        layer.div.style.overflow = "";
-        this.setLayerZIndex(layer, this.layers.length);
-
-        if (layer.isFixed) {
-            this.viewPortDiv.appendChild(layer.div);
-        } else {
-            this.layerContainerDiv.appendChild(layer.div);
-        }
-        this.layers.push(layer);
-        layer.setMap(this);
-
-        if (layer.isBaseLayer || (this.allOverlays && !this.baseLayer))  {
-            if (this.baseLayer == null) {
-                // set the first baselaye we add as the baselayer
-                this.setBaseLayer(layer);
-            } else {
-                layer.setVisibility(false);
-            }
-        } else {
-            layer.redraw();
-        }
-
-        this.events.triggerEvent("addlayer", {layer: layer});
-        layer.events.triggerEvent("added", {map: this, layer: layer});
-        layer.afterAdd();
-
-        return true;
-    },
-
-    /**
-    * APIMethod: addLayers 
-    *
-    * Parameters:
-    * layers - {Array(<OpenLayers.Layer>)} 
-    */    
-    addLayers: function (layers) {
-        for (var i=0, len=layers.length; i<len; i++) {
-            this.addLayer(layers[i]);
-        }
-    },
-
-    /** 
-     * APIMethod: removeLayer
-     * Removes a layer from the map by removing its visual element (the 
-     *   layer.div property), then removing it from the map's internal list 
-     *   of layers, setting the layer's map property to null. 
-     * 
-     *   a "removelayer" event is triggered.
-     * 
-     *   very worthy of mention is that simply removing a layer from a map
-     *   will not cause the removal of any popups which may have been created
-     *   by the layer. this is due to the fact that it was decided at some
-     *   point that popups would not belong to layers. thus there is no way 
-     *   for us to know here to which layer the popup belongs.
-     *    
-     *     A simple solution to this is simply to call destroy() on the layer.
-     *     the default OpenLayers.Layer class's destroy() function
-     *     automatically takes care to remove itself from whatever map it has
-     *     been attached to. 
-     * 
-     *     The correct solution is for the layer itself to register an 
-     *     event-handler on "removelayer" and when it is called, if it 
-     *     recognizes itself as the layer being removed, then it cycles through
-     *     its own personal list of popups, removing them from the map.
-     * 
-     * Parameters:
-     * layer - {<OpenLayers.Layer>} 
-     * setNewBaseLayer - {Boolean} Default is true
-     */
-    removeLayer: function(layer, setNewBaseLayer) {
-        if (this.events.triggerEvent("preremovelayer", {layer: layer}) === false) {
-            return;
-        }
-        if (setNewBaseLayer == null) {
-            setNewBaseLayer = true;
-        }
-
-        if (layer.isFixed) {
-            this.viewPortDiv.removeChild(layer.div);
-        } else {
-            this.layerContainerDiv.removeChild(layer.div);
-        }
-        OpenLayers.Util.removeItem(this.layers, layer);
-        layer.removeMap(this);
-        layer.map = null;
-
-        // if we removed the base layer, need to set a new one
-        if(this.baseLayer == layer) {
-            this.baseLayer = null;
-            if(setNewBaseLayer) {
-                for(var i=0, len=this.layers.length; i<len; i++) {
-                    var iLayer = this.layers[i];
-                    if (iLayer.isBaseLayer || this.allOverlays) {
-                        this.setBaseLayer(iLayer);
-                        break;
-                    }
-                }
-            }
-        }
-
-        this.resetLayersZIndex();
-
-        this.events.triggerEvent("removelayer", {layer: layer});
-        layer.events.triggerEvent("removed", {map: this, layer: layer});
-    },
-
-    /**
-     * APIMethod: getNumLayers
-     * 
-     * Returns:
-     * {Int} The number of layers attached to the map.
-     */
-    getNumLayers: function () {
-        return this.layers.length;
-    },
-
-    /** 
-     * APIMethod: getLayerIndex
-     *
-     * Parameters:
-     * layer - {<OpenLayers.Layer>}
-     *
-     * Returns:
-     * {Integer} The current (zero-based) index of the given layer in the map's
-     *           layer stack. Returns -1 if the layer isn't on the map.
-     */
-    getLayerIndex: function (layer) {
-        return OpenLayers.Util.indexOf(this.layers, layer);
-    },
-    
-    /** 
-     * APIMethod: setLayerIndex
-     * Move the given layer to the specified (zero-based) index in the layer
-     *     list, changing its z-index in the map display. Use
-     *     map.getLayerIndex() to find out the current index of a layer. Note
-     *     that this cannot (or at least should not) be effectively used to
-     *     raise base layers above overlays.
-     *
-     * Parameters:
-     * layer - {<OpenLayers.Layer>} 
-     * idx - {int} 
-     */
-    setLayerIndex: function (layer, idx) {
-        var base = this.getLayerIndex(layer);
-        if (idx < 0) {
-            idx = 0;
-        } else if (idx > this.layers.length) {
-            idx = this.layers.length;
-        }
-        if (base != idx) {
-            this.layers.splice(base, 1);
-            this.layers.splice(idx, 0, layer);
-            for (var i=0, len=this.layers.length; i<len; i++) {
-                this.setLayerZIndex(this.layers[i], i);
-            }
-            this.events.triggerEvent("changelayer", {
-                layer: layer, property: "order"
-            });
-            if(this.allOverlays) {
-                if(idx === 0) {
-                    this.setBaseLayer(layer);
-                } else if(this.baseLayer !== this.layers[0]) {
-                    this.setBaseLayer(this.layers[0]);
-                }
-            }
-        }
-    },
-
-    /** 
-     * APIMethod: raiseLayer
-     * Change the index of the given layer by delta. If delta is positive, 
-     *     the layer is moved up the map's layer stack; if delta is negative,
-     *     the layer is moved down.  Again, note that this cannot (or at least
-     *     should not) be effectively used to raise base layers above overlays.
-     *
-     * Paremeters:
-     * layer - {<OpenLayers.Layer>} 
-     * delta - {int} 
-     */
-    raiseLayer: function (layer, delta) {
-        var idx = this.getLayerIndex(layer) + delta;
-        this.setLayerIndex(layer, idx);
-    },
-    
-    /** 
-     * APIMethod: setBaseLayer
-     * Allows user to specify one of the currently-loaded layers as the Map's
-     *     new base layer.
-     * 
-     * Parameters:
-     * newBaseLayer - {<OpenLayers.Layer>}
-     */
-    setBaseLayer: function(newBaseLayer) {
-        
-        if (newBaseLayer != this.baseLayer) {
-          
-            // ensure newBaseLayer is already loaded
-            if (OpenLayers.Util.indexOf(this.layers, newBaseLayer) != -1) {
-
-                // preserve center and scale when changing base layers
-                var center = this.getCachedCenter();
-                var newResolution = OpenLayers.Util.getResolutionFromScale(
-                    this.getScale(), newBaseLayer.units
-                );
-
-                // make the old base layer invisible 
-                if (this.baseLayer != null && !this.allOverlays) {
-                    this.baseLayer.setVisibility(false);
-                }
-
-                // set new baselayer
-                this.baseLayer = newBaseLayer;
-                
-                if(!this.allOverlays || this.baseLayer.visibility) {
-                    this.baseLayer.setVisibility(true);
-                    // Layer may previously have been visible but not in range.
-                    // In this case we need to redraw it to make it visible.
-                    if (this.baseLayer.inRange === false) {
-                        this.baseLayer.redraw();
-                    }
-                }
-
-                // recenter the map
-                if (center != null) {
-                    // new zoom level derived from old scale
-                    var newZoom = this.getZoomForResolution(
-                        newResolution || this.resolution, true
-                    );
-                    // zoom and force zoom change
-                    this.setCenter(center, newZoom, false, true);
-                }
-
-                this.events.triggerEvent("changebaselayer", {
-                    layer: this.baseLayer
-                });
-            }        
-        }
-    },
-
-
-  /********************************************************/
-  /*                                                      */
-  /*                 Control Functions                    */
-  /*                                                      */
-  /*     The following functions deal with adding and     */
-  /*        removing Controls to and from the Map         */
-  /*                                                      */
-  /********************************************************/         
-
-    /**
-     * APIMethod: addControl
-     * Add the passed over control to the map. Optionally 
-     *     position the control at the given pixel.
-     * 
-     * Parameters:
-     * control - {<OpenLayers.Control>}
-     * px - {<OpenLayers.Pixel>}
-     */    
-    addControl: function (control, px) {
-        this.controls.push(control);
-        this.addControlToMap(control, px);
-    },
-    
-    /**
-     * APIMethod: addControls
-     * Add all of the passed over controls to the map. 
-     *     You can pass over an optional second array
-     *     with pixel-objects to position the controls.
-     *     The indices of the two arrays should match and
-     *     you can add null as pixel for those controls 
-     *     you want to be autopositioned.   
-     *     
-     * Parameters:
-     * controls - {Array(<OpenLayers.Control>)}
-     * pixels - {Array(<OpenLayers.Pixel>)}
-     */    
-    addControls: function (controls, pixels) {
-        var pxs = (arguments.length === 1) ? [] : pixels;
-        for (var i=0, len=controls.length; i<len; i++) {
-            var ctrl = controls[i];
-            var px = (pxs[i]) ? pxs[i] : null;
-            this.addControl( ctrl, px );
-        }
-    },
-
-    /**
-     * Method: addControlToMap
-     * 
-     * Parameters:
-     * 
-     * control - {<OpenLayers.Control>}
-     * px - {<OpenLayers.Pixel>}
-     */    
-    addControlToMap: function (control, px) {
-        // If a control doesn't have a div at this point, it belongs in the
-        // viewport.
-        control.outsideViewport = (control.div != null);
-        
-        // If the map has a displayProjection, and the control doesn't, set 
-        // the display projection.
-        if (this.displayProjection && !control.displayProjection) {
-            control.displayProjection = this.displayProjection;
-        }    
-        
-        control.setMap(this);
-        var div = control.draw(px);
-        if (div) {
-            if(!control.outsideViewport) {
-                div.style.zIndex = this.Z_INDEX_BASE['Control'] +
-                                    this.controls.length;
-                this.viewPortDiv.appendChild( div );
-            }
-        }
-        if(control.autoActivate) {
-            control.activate();
-        }
-    },
-    
-    /**
-     * APIMethod: getControl
-     * 
-     * Parameters:
-     * id - {String} ID of the control to return.
-     * 
-     * Returns:
-     * {<OpenLayers.Control>} The control from the map's list of controls 
-     *                        which has a matching 'id'. If none found, 
-     *                        returns null.
-     */    
-    getControl: function (id) {
-        var returnControl = null;
-        for(var i=0, len=this.controls.length; i<len; i++) {
-            var control = this.controls[i];
-            if (control.id == id) {
-                returnControl = control;
-                break;
-            }
-        }
-        return returnControl;
-    },
-    
-    /** 
-     * APIMethod: removeControl
-     * Remove a control from the map. Removes the control both from the map 
-     *     object's internal array of controls, as well as from the map's 
-     *     viewPort (assuming the control was not added outsideViewport)
-     * 
-     * Parameters:
-     * control - {<OpenLayers.Control>} The control to remove.
-     */    
-    removeControl: function (control) {
-        //make sure control is non-null and actually part of our map
-        if ( (control) && (control == this.getControl(control.id)) ) {
-            if (control.div && (control.div.parentNode == this.viewPortDiv)) {
-                this.viewPortDiv.removeChild(control.div);
-            }
-            OpenLayers.Util.removeItem(this.controls, control);
-        }
-    },
-
-  /********************************************************/
-  /*                                                      */
-  /*                  Popup Functions                     */
-  /*                                                      */
-  /*     The following functions deal with adding and     */
-  /*        removing Popups to and from the Map           */
-  /*                                                      */
-  /********************************************************/         
-
-    /** 
-     * APIMethod: addPopup
-     * 
-     * Parameters:
-     * popup - {<OpenLayers.Popup>}
-     * exclusive - {Boolean} If true, closes all other popups first
-     */
-    addPopup: function(popup, exclusive) {
-
-        if (exclusive) {
-            //remove all other popups from screen
-            for (var i = this.popups.length - 1; i >= 0; --i) {
-                this.removePopup(this.popups[i]);
-            }
-        }
-
-        popup.map = this;
-        this.popups.push(popup);
-        var popupDiv = popup.draw();
-        if (popupDiv) {
-            popupDiv.style.zIndex = this.Z_INDEX_BASE['Popup'] +
-                                    this.popups.length;
-            this.layerContainerDiv.appendChild(popupDiv);
-        }
-    },
-    
-    /** 
-    * APIMethod: removePopup
-    * 
-    * Parameters:
-    * popup - {<OpenLayers.Popup>}
-    */
-    removePopup: function(popup) {
-        OpenLayers.Util.removeItem(this.popups, popup);
-        if (popup.div) {
-            try { this.layerContainerDiv.removeChild(popup.div); }
-            catch (e) { } // Popups sometimes apparently get disconnected
-                      // from the layerContainerDiv, and cause complaints.
-        }
-        popup.map = null;
-    },
-
-  /********************************************************/
-  /*                                                      */
-  /*              Container Div Functions                 */
-  /*                                                      */
-  /*   The following functions deal with the access to    */
-  /*    and maintenance of the size of the container div  */
-  /*                                                      */
-  /********************************************************/     
-
-    /**
-     * APIMethod: getSize
-     * 
-     * Returns:
-     * {<OpenLayers.Size>} An <OpenLayers.Size> object that represents the 
-     *                     size, in pixels, of the div into which OpenLayers 
-     *                     has been loaded. 
-     *                     Note - A clone() of this locally cached variable is
-     *                     returned, so as not to allow users to modify it.
-     */
-    getSize: function () {
-        var size = null;
-        if (this.size != null) {
-            size = this.size.clone();
-        }
-        return size;
-    },
-
-    /**
-     * APIMethod: updateSize
-     * This function should be called by any external code which dynamically
-     *     changes the size of the map div (because mozilla wont let us catch 
-     *     the "onresize" for an element)
-     */
-    updateSize: function() {
-        // the div might have moved on the page, also
-        var newSize = this.getCurrentSize();
-        if (newSize && !isNaN(newSize.h) && !isNaN(newSize.w)) {
-            this.events.clearMouseCache();
-            var oldSize = this.getSize();
-            if (oldSize == null) {
-                this.size = oldSize = newSize;
-            }
-            if (!newSize.equals(oldSize)) {
-                
-                // store the new size
-                this.size = newSize;
-    
-                //notify layers of mapresize
-                for(var i=0, len=this.layers.length; i<len; i++) {
-                    this.layers[i].onMapResize();                
-                }
-    
-                var center = this.getCachedCenter();
-    
-                if (this.baseLayer != null && center != null) {
-                    var zoom = this.getZoom();
-                    this.zoom = null;
-                    this.setCenter(center, zoom);
-                }
-    
-            }
-        }
-        this.events.triggerEvent("updatesize");
-    },
-    
-    /**
-     * Method: getCurrentSize
-     * 
-     * Returns:
-     * {<OpenLayers.Size>} A new <OpenLayers.Size> object with the dimensions 
-     *                     of the map div
-     */
-    getCurrentSize: function() {
-
-        var size = new OpenLayers.Size(this.div.clientWidth, 
-                                       this.div.clientHeight);
-
-        if (size.w == 0 && size.h == 0 || isNaN(size.w) && isNaN(size.h)) {
-            size.w = this.div.offsetWidth;
-            size.h = this.div.offsetHeight;
-        }
-        if (size.w == 0 && size.h == 0 || isNaN(size.w) && isNaN(size.h)) {
-            size.w = parseInt(this.div.style.width);
-            size.h = parseInt(this.div.style.height);
-        }
-        return size;
-    },
-
-    /** 
-     * Method: calculateBounds
-     * 
-     * Parameters:
-     * center - {<OpenLayers.LonLat>} Default is this.getCenter()
-     * resolution - {float} Default is this.getResolution() 
-     * 
-     * Returns:
-     * {<OpenLayers.Bounds>} A bounds based on resolution, center, and 
-     *                       current mapsize.
-     */
-    calculateBounds: function(center, resolution) {
-
-        var extent = null;
-        
-        if (center == null) {
-            center = this.getCachedCenter();
-        }                
-        if (resolution == null) {
-            resolution = this.getResolution();
-        }
-    
-        if ((center != null) && (resolution != null)) {
-            var halfWDeg = (this.size.w * resolution) / 2;
-            var halfHDeg = (this.size.h * resolution) / 2;
-        
-            extent = new OpenLayers.Bounds(center.lon - halfWDeg,
-                                           center.lat - halfHDeg,
-                                           center.lon + halfWDeg,
-                                           center.lat + halfHDeg);
-        }
-
-        return extent;
-    },
-
-
-  /********************************************************/
-  /*                                                      */
-  /*            Zoom, Center, Pan Functions               */
-  /*                                                      */
-  /*    The following functions handle the validation,    */
-  /*   getting and setting of the Zoom Level and Center   */
-  /*       as well as the panning of the Map              */
-  /*                                                      */
-  /********************************************************/
-    /**
-     * APIMethod: getCenter
-     * 
-     * Returns:
-     * {<OpenLayers.LonLat>}
-     */
-    getCenter: function () {
-        var center = null;
-        var cachedCenter = this.getCachedCenter();
-        if (cachedCenter) {
-            center = cachedCenter.clone();
-        }
-        return center;
-    },
-
-    /**
-     * Method: getCachedCenter
-     *
-     * Returns:
-     * {<OpenLayers.LonLat>}
-     */
-    getCachedCenter: function() {
-        if (!this.center && this.size) {
-            this.center = this.getLonLatFromViewPortPx({
-                x: this.size.w / 2,
-                y: this.size.h / 2
-            });
-        }
-        return this.center;
-    },
-
-    /**
-     * APIMethod: getZoom
-     * 
-     * Returns:
-     * {Integer}
-     */
-    getZoom: function () {
-        return this.zoom;
-    },
-    
-    /** 
-     * APIMethod: pan
-     * Allows user to pan by a value of screen pixels
-     * 
-     * Parameters:
-     * dx - {Integer}
-     * dy - {Integer}
-     * options - {Object} Options to configure panning:
-     *  - *animate* {Boolean} Use panTo instead of setCenter. Default is true.
-     *  - *dragging* {Boolean} Call setCenter with dragging true.  Default is
-     *    false.
-     */
-    pan: function(dx, dy, options) {
-        options = OpenLayers.Util.applyDefaults(options, {
-            animate: true,
-            dragging: false
-        });
-        if (options.dragging) {
-            if (dx != 0 || dy != 0) {
-                this.moveByPx(dx, dy);
-            }
-        } else {
-            // getCenter
-            var centerPx = this.getViewPortPxFromLonLat(this.getCachedCenter());
-
-            // adjust
-            var newCenterPx = centerPx.add(dx, dy);
-
-            if (this.dragging || !newCenterPx.equals(centerPx)) {
-                var newCenterLonLat = this.getLonLatFromViewPortPx(newCenterPx);
-                if (options.animate) {
-                    this.panTo(newCenterLonLat);
-                } else {
-                    this.moveTo(newCenterLonLat);
-                    if(this.dragging) {
-                        this.dragging = false;
-                        this.events.triggerEvent("moveend");
-                    }
-                }    
-            }
-        }        
-
-   },
-   
-   /** 
-     * APIMethod: panTo
-     * Allows user to pan to a new lonlat
-     * If the new lonlat is in the current extent the map will slide smoothly
-     * 
-     * Parameters:
-     * lonlat - {<OpenLayers.LonLat>}
-     */
-    panTo: function(lonlat) {
-        if (this.panTween && this.getExtent().scale(this.panRatio).containsLonLat(lonlat)) {
-            var center = this.getCachedCenter();
-
-            // center will not change, don't do nothing
-            if (lonlat.equals(center)) {
-                return;
-            }
-
-            var from = this.getPixelFromLonLat(center);
-            var to = this.getPixelFromLonLat(lonlat);
-            var vector = { x: to.x - from.x, y: to.y - from.y };
-            var last = { x: 0, y: 0 };
-
-            this.panTween.start( { x: 0, y: 0 }, vector, this.panDuration, {
-                callbacks: {
-                    eachStep: OpenLayers.Function.bind(function(px) {
-                        var x = px.x - last.x,
-                            y = px.y - last.y;
-                        this.moveByPx(x, y);
-                        last.x = Math.round(px.x);
-                        last.y = Math.round(px.y);
-                    }, this),
-                    done: OpenLayers.Function.bind(function(px) {
-                        this.moveTo(lonlat);
-                        this.dragging = false;
-                        this.events.triggerEvent("moveend");
-                    }, this)
-                }
-            });
-        } else {
-            this.setCenter(lonlat);
-        }
-    },
-
-    /**
-     * APIMethod: setCenter
-     * Set the map center (and optionally, the zoom level).
-     * 
-     * Parameters:
-     * lonlat - {<OpenLayers.LonLat>|Array} The new center location.
-     *     If provided as array, the first value is the x coordinate,
-     *     and the 2nd value is the y coordinate.
-     * zoom - {Integer} Optional zoom level.
-     * dragging - {Boolean} Specifies whether or not to trigger 
-     *                      movestart/end events
-     * forceZoomChange - {Boolean} Specifies whether or not to trigger zoom 
-     *                             change events (needed on baseLayer change)
-     *
-     * TBD: reconsider forceZoomChange in 3.0
-     */
-    setCenter: function(lonlat, zoom, dragging, forceZoomChange) {
-        if (this.panTween) {
-            this.panTween.stop();
-        }
-        if (this.zoomTween) {
-            this.zoomTween.stop();
-        }            
-        this.moveTo(lonlat, zoom, {
-            'dragging': dragging,
-            'forceZoomChange': forceZoomChange
-        });
-    },
-    
-    /** 
-     * Method: moveByPx
-     * Drag the map by pixels.
-     *
-     * Parameters:
-     * dx - {Number}
-     * dy - {Number}
-     */
-    moveByPx: function(dx, dy) {
-        var hw = this.size.w / 2;
-        var hh = this.size.h / 2;
-        var x = hw + dx;
-        var y = hh + dy;
-        var wrapDateLine = this.baseLayer.wrapDateLine;
-        var xRestriction = 0;
-        var yRestriction = 0;
-        if (this.restrictedExtent) {
-            xRestriction = hw;
-            yRestriction = hh;
-            // wrapping the date line makes no sense for restricted extents
-            wrapDateLine = false;
-        }
-        dx = wrapDateLine ||
-                    x <= this.maxPx.x - xRestriction &&
-                    x >= this.minPx.x + xRestriction ? Math.round(dx) : 0;
-        dy = y <= this.maxPx.y - yRestriction &&
-                    y >= this.minPx.y + yRestriction ? Math.round(dy) : 0;
-        if (dx || dy) {
-            if (!this.dragging) {
-                this.dragging = true;
-                this.events.triggerEvent("movestart");
-            }
-            this.center = null;
-            if (dx) {
-                this.layerContainerOriginPx.x -= dx;
-                this.minPx.x -= dx;
-                this.maxPx.x -= dx;
-            }
-            if (dy) {
-                this.layerContainerOriginPx.y -= dy;
-                this.minPx.y -= dy;
-                this.maxPx.y -= dy;
-            }
-            this.applyTransform();
-            var layer, i, len;
-            for (i=0, len=this.layers.length; i<len; ++i) {
-                layer = this.layers[i];
-                if (layer.visibility &&
-                    (layer === this.baseLayer || layer.inRange)) {
-                    layer.moveByPx(dx, dy);
-                    layer.events.triggerEvent("move");
-                }
-            }
-            this.events.triggerEvent("move");
-        }
-    },
-    
-    /**
-     * Method: adjustZoom
-     *
-     * Parameters:
-     * zoom - {Number} The zoom level to adjust
-     *
-     * Returns:
-     * {Integer} Adjusted zoom level that shows a map not wider than its
-     * <baseLayer>'s maxExtent.
-     */
-    adjustZoom: function(zoom) {
-        if (this.baseLayer && this.baseLayer.wrapDateLine) {
-            var resolution, resolutions = this.baseLayer.resolutions,
-                maxResolution = this.getMaxExtent().getWidth() / this.size.w;
-            if (this.getResolutionForZoom(zoom) > maxResolution) {
-                if (this.fractionalZoom) {
-                    zoom = this.getZoomForResolution(maxResolution);
-                } else {
-                    for (var i=zoom|0, ii=resolutions.length; i<ii; ++i) {
-                        if (resolutions[i] <= maxResolution) {
-                            zoom = i;
-                            break;
-                        }
-                    }
-                } 
-            }
-        }
-        return zoom;
-    },
-    
-    /**
-     * APIMethod: getMinZoom
-     * Returns the minimum zoom level for the current map view. If the base
-     * layer is configured with <wrapDateLine> set to true, this will be the
-     * first zoom level that shows no more than one world width in the current
-     * map viewport. Components that rely on this value (e.g. zoom sliders)
-     * should also listen to the map's "updatesize" event and call this method
-     * in the "updatesize" listener.
-     *
-     * Returns:
-     * {Number} Minimum zoom level that shows a map not wider than its
-     * <baseLayer>'s maxExtent. This is an Integer value, unless the map is
-     * configured with <fractionalZoom> set to true.
-     */
-    getMinZoom: function() {
-        return this.adjustZoom(0);
-    },
-
-    /**
-     * Method: moveTo
-     *
-     * Parameters:
-     * lonlat - {<OpenLayers.LonLat>}
-     * zoom - {Integer}
-     * options - {Object}
-     */
-    moveTo: function(lonlat, zoom, options) {
-        if (lonlat != null && !(lonlat instanceof OpenLayers.LonLat)) {
-            lonlat = new OpenLayers.LonLat(lonlat);
-        }
-        if (!options) { 
-            options = {};
-        }
-        if (zoom != null) {
-            zoom = parseFloat(zoom);
-            if (!this.fractionalZoom) {
-                zoom = Math.round(zoom);
-            }
-        }
-        var requestedZoom = zoom;
-        zoom = this.adjustZoom(zoom);
-        if (zoom !== requestedZoom) {
-            // zoom was adjusted, so keep old lonlat to avoid panning
-            lonlat = this.getCenter();
-        }
-        // dragging is false by default
-        var dragging = options.dragging || this.dragging;
-        // forceZoomChange is false by default
-        var forceZoomChange = options.forceZoomChange;
-
-        if (!this.getCachedCenter() && !this.isValidLonLat(lonlat)) {
-            lonlat = this.maxExtent.getCenterLonLat();
-            this.center = lonlat.clone();
-        }
-
-        if(this.restrictedExtent != null) {
-            // In 3.0, decide if we want to change interpretation of maxExtent.
-            if(lonlat == null) { 
-                lonlat = this.center; 
-            }
-            if(zoom == null) { 
-                zoom = this.getZoom(); 
-            }
-            var resolution = this.getResolutionForZoom(zoom);
-            var extent = this.calculateBounds(lonlat, resolution); 
-            if(!this.restrictedExtent.containsBounds(extent)) {
-                var maxCenter = this.restrictedExtent.getCenterLonLat(); 
-                if(extent.getWidth() > this.restrictedExtent.getWidth()) { 
-                    lonlat = new OpenLayers.LonLat(maxCenter.lon, lonlat.lat); 
-                } else if(extent.left < this.restrictedExtent.left) {
-                    lonlat = lonlat.add(this.restrictedExtent.left -
-                                        extent.left, 0); 
-                } else if(extent.right > this.restrictedExtent.right) { 
-                    lonlat = lonlat.add(this.restrictedExtent.right -
-                                        extent.right, 0); 
-                } 
-                if(extent.getHeight() > this.restrictedExtent.getHeight()) { 
-                    lonlat = new OpenLayers.LonLat(lonlat.lon, maxCenter.lat); 
-                } else if(extent.bottom < this.restrictedExtent.bottom) { 
-                    lonlat = lonlat.add(0, this.restrictedExtent.bottom -
-                                        extent.bottom); 
-                } 
-                else if(extent.top > this.restrictedExtent.top) { 
-                    lonlat = lonlat.add(0, this.restrictedExtent.top -
-                                        extent.top); 
-                } 
-            }
-        }
-        
-        var zoomChanged = forceZoomChange || (
-                            (this.isValidZoomLevel(zoom)) && 
-                            (zoom != this.getZoom()) );
-
-        var centerChanged = (this.isValidLonLat(lonlat)) && 
-                            (!lonlat.equals(this.center));
-
-        // if neither center nor zoom will change, no need to do anything
-        if (zoomChanged || centerChanged || dragging) {
-            dragging || this.events.triggerEvent("movestart", {
-                zoomChanged: zoomChanged
-            });
-
-            if (centerChanged) {
-                if (!zoomChanged && this.center) { 
-                    // if zoom hasnt changed, just slide layerContainer
-                    //  (must be done before setting this.center to new value)
-                    this.centerLayerContainer(lonlat);
-                }
-                this.center = lonlat.clone();
-            }
-
-            var res = zoomChanged ?
-                this.getResolutionForZoom(zoom) : this.getResolution();
-            // (re)set the layerContainerDiv's location
-            if (zoomChanged || this.layerContainerOrigin == null) {
-                this.layerContainerOrigin = this.getCachedCenter();
-                this.layerContainerOriginPx.x = 0;
-                this.layerContainerOriginPx.y = 0;
-                this.applyTransform();
-                var maxExtent = this.getMaxExtent({restricted: true});
-                var maxExtentCenter = maxExtent.getCenterLonLat();
-                var lonDelta = this.center.lon - maxExtentCenter.lon;
-                var latDelta = maxExtentCenter.lat - this.center.lat;
-                var extentWidth = Math.round(maxExtent.getWidth() / res);
-                var extentHeight = Math.round(maxExtent.getHeight() / res);
-                this.minPx = {
-                    x: (this.size.w - extentWidth) / 2 - lonDelta / res,
-                    y: (this.size.h - extentHeight) / 2 - latDelta / res
-                };
-                this.maxPx = {
-                    x: this.minPx.x + Math.round(maxExtent.getWidth() / res),
-                    y: this.minPx.y + Math.round(maxExtent.getHeight() / res)
-                };
-            }
-
-            if (zoomChanged) {
-                this.zoom = zoom;
-                this.resolution = res;
-            }    
-            
-            var bounds = this.getExtent();
-            
-            //send the move call to the baselayer and all the overlays    
-
-            if(this.baseLayer.visibility) {
-                this.baseLayer.moveTo(bounds, zoomChanged, options.dragging);
-                options.dragging || this.baseLayer.events.triggerEvent(
-                    "moveend", {zoomChanged: zoomChanged}
-                );
-            }
-            
-            bounds = this.baseLayer.getExtent();
-            
-            for (var i=this.layers.length-1; i>=0; --i) {
-                var layer = this.layers[i];
-                if (layer !== this.baseLayer && !layer.isBaseLayer) {
-                    var inRange = layer.calculateInRange();
-                    if (layer.inRange != inRange) {
-                        // the inRange property has changed. If the layer is
-                        // no longer in range, we turn it off right away. If
-                        // the layer is no longer out of range, the moveTo
-                        // call below will turn on the layer.
-                        layer.inRange = inRange;
-                        if (!inRange) {
-                            layer.display(false);
-                        }
-                        this.events.triggerEvent("changelayer", {
-                            layer: layer, property: "visibility"
-                        });
-                    }
-                    if (inRange && layer.visibility) {
-                        layer.moveTo(bounds, zoomChanged, options.dragging);
-                        options.dragging || layer.events.triggerEvent(
-                            "moveend", {zoomChanged: zoomChanged}
-                        );
-                    }
-                }                
-            }
-            
-            this.events.triggerEvent("move");
-            dragging || this.events.triggerEvent("moveend");
-
-            if (zoomChanged) {
-                //redraw popups
-                for (var i=0, len=this.popups.length; i<len; i++) {
-                    this.popups[i].updatePosition();
-                }
-                this.events.triggerEvent("zoomend");
-            }
-        }
-    },
-
-    /** 
-     * Method: centerLayerContainer
-     * This function takes care to recenter the layerContainerDiv.
-     * 
-     * Parameters:
-     * lonlat - {<OpenLayers.LonLat>}
-     */
-    centerLayerContainer: function (lonlat) {
-        var originPx = this.getViewPortPxFromLonLat(this.layerContainerOrigin);
-        var newPx = this.getViewPortPxFromLonLat(lonlat);
-
-        if ((originPx != null) && (newPx != null)) {
-            var oldLeft = this.layerContainerOriginPx.x;
-            var oldTop = this.layerContainerOriginPx.y;
-            var newLeft = Math.round(originPx.x - newPx.x);
-            var newTop = Math.round(originPx.y - newPx.y);
-            this.applyTransform(
-                (this.layerContainerOriginPx.x = newLeft),
-                (this.layerContainerOriginPx.y = newTop));
-            var dx = oldLeft - newLeft;
-            var dy = oldTop - newTop;
-            this.minPx.x -= dx;
-            this.maxPx.x -= dx;
-            this.minPx.y -= dy;
-            this.maxPx.y -= dy;
-        }        
-    },
-
-    /**
-     * Method: isValidZoomLevel
-     * 
-     * Parameters:
-     * zoomLevel - {Integer}
-     * 
-     * Returns:
-     * {Boolean} Whether or not the zoom level passed in is non-null and 
-     *           within the min/max range of zoom levels.
-     */
-    isValidZoomLevel: function(zoomLevel) {
-        return ( (zoomLevel != null) &&
-                 (zoomLevel >= 0) && 
-                 (zoomLevel < this.getNumZoomLevels()) );
-    },
-    
-    /**
-     * Method: isValidLonLat
-     * 
-     * Parameters:
-     * lonlat - {<OpenLayers.LonLat>}
-     * 
-     * Returns:
-     * {Boolean} Whether or not the lonlat passed in is non-null and within
-     *           the maxExtent bounds
-     */
-    isValidLonLat: function(lonlat) {
-        var valid = false;
-        if (lonlat != null) {
-            var maxExtent = this.getMaxExtent();
-            var worldBounds = this.baseLayer.wrapDateLine && maxExtent;
-            valid = maxExtent.containsLonLat(lonlat, {worldBounds: worldBounds});
-        }
-        return valid;
-    },
-
-  /********************************************************/
-  /*                                                      */
-  /*                 Layer Options                        */
-  /*                                                      */
-  /*    Accessor functions to Layer Options parameters    */
-  /*                                                      */
-  /********************************************************/
-    
-    /**
-     * APIMethod: getProjection
-     * This method returns a string representing the projection. In 
-     *     the case of projection support, this will be the srsCode which
-     *     is loaded -- otherwise it will simply be the string value that
-     *     was passed to the projection at startup.
-     *
-     * FIXME: In 3.0, we will remove getProjectionObject, and instead
-     *     return a Projection object from this function. 
-     * 
-     * Returns:
-     * {String} The Projection string from the base layer or null. 
-     */
-    getProjection: function() {
-        var projection = this.getProjectionObject();
-        return projection ? projection.getCode() : null;
-    },
-    
-    /**
-     * APIMethod: getProjectionObject
-     * Returns the projection obect from the baselayer.
-     *
-     * Returns:
-     * {<OpenLayers.Projection>} The Projection of the base layer.
-     */
-    getProjectionObject: function() {
-        var projection = null;
-        if (this.baseLayer != null) {
-            projection = this.baseLayer.projection;
-        }
-        return projection;
-    },
-    
-    /**
-     * APIMethod: getMaxResolution
-     * 
-     * Returns:
-     * {String} The Map's Maximum Resolution
-     */
-    getMaxResolution: function() {
-        var maxResolution = null;
-        if (this.baseLayer != null) {
-            maxResolution = this.baseLayer.maxResolution;
-        }
-        return maxResolution;
-    },
-        
-    /**
-     * APIMethod: getMaxExtent
-     *
-     * Parameters:
-     * options - {Object} 
-     * 
-     * Allowed Options:
-     * restricted - {Boolean} If true, returns restricted extent (if it is 
-     *     available.)
-     *
-     * Returns:
-     * {<OpenLayers.Bounds>} The maxExtent property as set on the current 
-     *     baselayer, unless the 'restricted' option is set, in which case
-     *     the 'restrictedExtent' option from the map is returned (if it
-     *     is set).
-     */
-    getMaxExtent: function (options) {
-        var maxExtent = null;
-        if(options && options.restricted && this.restrictedExtent){
-            maxExtent = this.restrictedExtent;
-        } else if (this.baseLayer != null) {
-            maxExtent = this.baseLayer.maxExtent;
-        }        
-        return maxExtent;
-    },
-    
-    /**
-     * APIMethod: getNumZoomLevels
-     * 
-     * Returns:
-     * {Integer} The total number of zoom levels that can be displayed by the 
-     *           current baseLayer.
-     */
-    getNumZoomLevels: function() {
-        var numZoomLevels = null;
-        if (this.baseLayer != null) {
-            numZoomLevels = this.baseLayer.numZoomLevels;
-        }
-        return numZoomLevels;
-    },
-
-  /********************************************************/
-  /*                                                      */
-  /*                 Baselayer Functions                  */
-  /*                                                      */
-  /*    The following functions, all publicly exposed     */
-  /*       in the API?, are all merely wrappers to the    */
-  /*       the same calls on whatever layer is set as     */
-  /*                the current base layer                */
-  /*                                                      */
-  /********************************************************/
-
-    /**
-     * APIMethod: getExtent
-     * 
-     * Returns:
-     * {<OpenLayers.Bounds>} A Bounds object which represents the lon/lat 
-     *                       bounds of the current viewPort. 
-     *                       If no baselayer is set, returns null.
-     */
-    getExtent: function () {
-        var extent = null;
-        if (this.baseLayer != null) {
-            extent = this.baseLayer.getExtent();
-        }
-        return extent;
-    },
-
-    /**
-     * APIMethod: getResolution
-     * 
-     * Returns:
-     * {Float} The current resolution of the map. 
-     *         If no baselayer is set, returns null.
-     */
-    getResolution: function () {
-        var resolution = null;
-        if (this.baseLayer != null) {
-            resolution = this.baseLayer.getResolution();
-        } else if(this.allOverlays === true && this.layers.length > 0) {
-            // while adding the 1st layer to the map in allOverlays mode,
-            // this.baseLayer is not set yet when we need the resolution
-            // for calculateInRange.
-            resolution = this.layers[0].getResolution();
-        }
-        return resolution;
-    },
-
-    /**
-     * APIMethod: getUnits
-     * 
-     * Returns:
-     * {Float} The current units of the map. 
-     *         If no baselayer is set, returns null.
-     */
-    getUnits: function () {
-        var units = null;
-        if (this.baseLayer != null) {
-            units = this.baseLayer.units;
-        }
-        return units;
-    },
-
-     /**
-      * APIMethod: getScale
-      * 
-      * Returns:
-      * {Float} The current scale denominator of the map. 
-      *         If no baselayer is set, returns null.
-      */
-    getScale: function () {
-        var scale = null;
-        if (this.baseLayer != null) {
-            var res = this.getResolution();
-            var units = this.baseLayer.units;
-            scale = OpenLayers.Util.getScaleFromResolution(res, units);
-        }
-        return scale;
-    },
-
-
-    /**
-     * APIMethod: getZoomForExtent
-     * 
-     * Parameters: 
-     * bounds - {<OpenLayers.Bounds>}
-     * closest - {Boolean} Find the zoom level that most closely fits the 
-     *     specified bounds. Note that this may result in a zoom that does 
-     *     not exactly contain the entire extent.
-     *     Default is false.
-     * 
-     * Returns:
-     * {Integer} A suitable zoom level for the specified bounds.
-     *           If no baselayer is set, returns null.
-     */
-    getZoomForExtent: function (bounds, closest) {
-        var zoom = null;
-        if (this.baseLayer != null) {
-            zoom = this.baseLayer.getZoomForExtent(bounds, closest);
-        }
-        return zoom;
-    },
-
-    /**
-     * APIMethod: getResolutionForZoom
-     * 
-     * Parameters:
-     * zoom - {Float}
-     * 
-     * Returns:
-     * {Float} A suitable resolution for the specified zoom.  If no baselayer
-     *     is set, returns null.
-     */
-    getResolutionForZoom: function(zoom) {
-        var resolution = null;
-        if(this.baseLayer) {
-            resolution = this.baseLayer.getResolutionForZoom(zoom);
-        }
-        return resolution;
-    },
-
-    /**
-     * APIMethod: getZoomForResolution
-     * 
-     * Parameters:
-     * resolution - {Float}
-     * closest - {Boolean} Find the zoom level that corresponds to the absolute 
-     *     closest resolution, which may result in a zoom whose corresponding
-     *     resolution is actually smaller than we would have desired (if this
-     *     is being called from a getZoomForExtent() call, then this means that
-     *     the returned zoom index might not actually contain the entire 
-     *     extent specified... but it'll be close).
-     *     Default is false.
-     * 
-     * Returns:
-     * {Integer} A suitable zoom level for the specified resolution.
-     *           If no baselayer is set, returns null.
-     */
-    getZoomForResolution: function(resolution, closest) {
-        var zoom = null;
-        if (this.baseLayer != null) {
-            zoom = this.baseLayer.getZoomForResolution(resolution, closest);
-        }
-        return zoom;
-    },
-
-  /********************************************************/
-  /*                                                      */
-  /*                  Zooming Functions                   */
-  /*                                                      */
-  /*    The following functions, all publicly exposed     */
-  /*       in the API, are all merely wrappers to the     */
-  /*               the setCenter() function               */
-  /*                                                      */
-  /********************************************************/
-  
-    /** 
-     * APIMethod: zoomTo
-     * Zoom to a specific zoom level. Zooming will be animated unless the map
-     * is configured with {zoomMethod: null}. To zoom without animation, use
-     * <setCenter> without a lonlat argument.
-     * 
-     * Parameters:
-     * zoom - {Integer}
-     */
-    zoomTo: function(zoom, xy) {
-        // non-API arguments:
-        // xy - {<OpenLayers.Pixel>} optional zoom origin
-        
-        var map = this;
-        if (map.isValidZoomLevel(zoom)) {
-            if (map.baseLayer.wrapDateLine) {
-                zoom = map.adjustZoom(zoom);
-            }
-            if (map.zoomTween) {
-                var currentRes = map.getResolution(),
-                    targetRes = map.getResolutionForZoom(zoom),
-                    start = {scale: 1},
-                    end = {scale: currentRes / targetRes};
-                if (map.zoomTween.playing && map.zoomTween.duration < 3 * map.zoomDuration) {
-                    // update the end scale, and reuse the running zoomTween
-                    map.zoomTween.finish = {
-                        scale: map.zoomTween.finish.scale * end.scale
-                    };
-                } else {
-                    if (!xy) {
-                        var size = map.getSize();
-                        xy = {x: size.w / 2, y: size.h / 2};
-                    }
-                    map.zoomTween.start(start, end, map.zoomDuration, {
-                        minFrameRate: 50, // don't spend much time zooming
-                        callbacks: {
-                            eachStep: function(data) {
-                                var containerOrigin = map.layerContainerOriginPx,
-                                    scale = data.scale,
-                                    dx = ((scale - 1) * (containerOrigin.x - xy.x)) | 0,
-                                    dy = ((scale - 1) * (containerOrigin.y - xy.y)) | 0;
-                                map.applyTransform(containerOrigin.x + dx, containerOrigin.y + dy, scale);
-                            },
-                            done: function(data) {
-                                map.applyTransform();
-                                var resolution = map.getResolution() / data.scale,
-                                    zoom = map.getZoomForResolution(resolution, true)
-                                map.moveTo(map.getZoomTargetCenter(xy, resolution), zoom, true);
-                            }
-                        }
-                    });
-                }
-            } else {
-                var center = xy ?
-                    map.getZoomTargetCenter(xy, map.getResolutionForZoom(zoom)) :
-                    null;
-                map.setCenter(center, zoom);
-            }
-        }
-    },
-        
-    /**
-     * APIMethod: zoomIn
-     * 
-     */
-    zoomIn: function() {
-        this.zoomTo(this.getZoom() + 1);
-    },
-    
-    /**
-     * APIMethod: zoomOut
-     * 
-     */
-    zoomOut: function() {
-        this.zoomTo(this.getZoom() - 1);
-    },
-
-    /**
-     * APIMethod: zoomToExtent
-     * Zoom to the passed in bounds, recenter
-     * 
-     * Parameters:
-     * bounds - {<OpenLayers.Bounds>|Array} If provided as an array, the array
-     *     should consist of four values (left, bottom, right, top).
-     * closest - {Boolean} Find the zoom level that most closely fits the 
-     *     specified bounds. Note that this may result in a zoom that does 
-     *     not exactly contain the entire extent.
-     *     Default is false.
-     * 
-     */
-    zoomToExtent: function(bounds, closest) {
-        if (!(bounds instanceof OpenLayers.Bounds)) {
-            bounds = new OpenLayers.Bounds(bounds);
-        }
-        var center = bounds.getCenterLonLat();
-        if (this.baseLayer.wrapDateLine) {
-            var maxExtent = this.getMaxExtent();
-
-            //fix straddling bounds (in the case of a bbox that straddles the 
-            // dateline, it's left and right boundaries will appear backwards. 
-            // we fix this by allowing a right value that is greater than the
-            // max value at the dateline -- this allows us to pass a valid 
-            // bounds to calculate zoom)
-            //
-            bounds = bounds.clone();
-            while (bounds.right < bounds.left) {
-                bounds.right += maxExtent.getWidth();
-            }
-            //if the bounds was straddling (see above), then the center point 
-            // we got from it was wrong. So we take our new bounds and ask it
-            // for the center.
-            //
-            center = bounds.getCenterLonLat().wrapDateLine(maxExtent);
-        }
-        this.setCenter(center, this.getZoomForExtent(bounds, closest));
-    },
-
-    /** 
-     * APIMethod: zoomToMaxExtent
-     * Zoom to the full extent and recenter.
-     *
-     * Parameters:
-     * options - {Object}
-     * 
-     * Allowed Options:
-     * restricted - {Boolean} True to zoom to restricted extent if it is 
-     *     set. Defaults to true.
-     */
-    zoomToMaxExtent: function(options) {
-        //restricted is true by default
-        var restricted = (options) ? options.restricted : true;
-
-        var maxExtent = this.getMaxExtent({
-            'restricted': restricted 
-        });
-        this.zoomToExtent(maxExtent);
-    },
-
-    /** 
-     * APIMethod: zoomToScale
-     * Zoom to a specified scale 
-     * 
-     * Parameters:
-     * scale - {float}
-     * closest - {Boolean} Find the zoom level that most closely fits the 
-     *     specified scale. Note that this may result in a zoom that does 
-     *     not exactly contain the entire extent.
-     *     Default is false.
-     * 
-     */
-    zoomToScale: function(scale, closest) {
-        var res = OpenLayers.Util.getResolutionFromScale(scale, 
-                                                         this.baseLayer.units);
-
-        var halfWDeg = (this.size.w * res) / 2;
-        var halfHDeg = (this.size.h * res) / 2;
-        var center = this.getCachedCenter();
-
-        var extent = new OpenLayers.Bounds(center.lon - halfWDeg,
-                                           center.lat - halfHDeg,
-                                           center.lon + halfWDeg,
-                                           center.lat + halfHDeg);
-        this.zoomToExtent(extent, closest);
-    },
-    
-  /********************************************************/
-  /*                                                      */
-  /*             Translation Functions                    */
-  /*                                                      */
-  /*      The following functions translate between       */
-  /*           LonLat, LayerPx, and ViewPortPx            */
-  /*                                                      */
-  /********************************************************/
-      
-  //
-  // TRANSLATION: LonLat <-> ViewPortPx
-  //
-
-    /**
-     * Method: getLonLatFromViewPortPx
-     * 
-     * Parameters:
-     * viewPortPx - {<OpenLayers.Pixel>|Object} An OpenLayers.Pixel or
-     *                                          an object with a 'x'
-     *                                          and 'y' properties.
-     * 
-     * Returns:
-     * {<OpenLayers.LonLat>} An OpenLayers.LonLat which is the passed-in view 
-     *                       port <OpenLayers.Pixel>, translated into lon/lat
-     *                       by the current base layer.
-     */
-    getLonLatFromViewPortPx: function (viewPortPx) {
-        var lonlat = null; 
-        if (this.baseLayer != null) {
-            lonlat = this.baseLayer.getLonLatFromViewPortPx(viewPortPx);
-        }
-        return lonlat;
-    },
-
-    /**
-     * APIMethod: getViewPortPxFromLonLat
-     * 
-     * Parameters:
-     * lonlat - {<OpenLayers.LonLat>}
-     * 
-     * Returns:
-     * {<OpenLayers.Pixel>} An OpenLayers.Pixel which is the passed-in 
-     *                      <OpenLayers.LonLat>, translated into view port 
-     *                      pixels by the current base layer.
-     */
-    getViewPortPxFromLonLat: function (lonlat) {
-        var px = null; 
-        if (this.baseLayer != null) {
-            px = this.baseLayer.getViewPortPxFromLonLat(lonlat);
-        }
-        return px;
-    },
-
-    /**
-     * Method: getZoomTargetCenter
-     *
-     * Parameters:
-     * xy - {<OpenLayers.Pixel>} The zoom origin pixel location on the screen
-     * resolution - {Float} The resolution we want to get the center for
-     *
-     * Returns:
-     * {<OpenLayers.LonLat>} The location of the map center after the
-     *     transformation described by the origin xy and the target resolution.
-     */
-    getZoomTargetCenter: function (xy, resolution) {
-        var lonlat = null,
-            size = this.getSize(),
-            deltaX  = size.w/2 - xy.x,
-            deltaY  = xy.y - size.h/2,
-            zoomPoint = this.getLonLatFromPixel(xy);
-        if (zoomPoint) {
-            lonlat = new OpenLayers.LonLat(
-                zoomPoint.lon + deltaX * resolution,
-                zoomPoint.lat + deltaY * resolution
-            );
-        }
-        return lonlat;
-    },
-        
-  //
-  // CONVENIENCE TRANSLATION FUNCTIONS FOR API
-  //
-
-    /**
-     * APIMethod: getLonLatFromPixel
-     * 
-     * Parameters:
-     * px - {<OpenLayers.Pixel>|Object} An OpenLayers.Pixel or an object with
-     *                                  a 'x' and 'y' properties.
-     *
-     * Returns:
-     * {<OpenLayers.LonLat>} An OpenLayers.LonLat corresponding to the given
-     *                       OpenLayers.Pixel, translated into lon/lat by the 
-     *                       current base layer
-     */
-    getLonLatFromPixel: function (px) {
-        return this.getLonLatFromViewPortPx(px);
-    },
-
-    /**
-     * APIMethod: getPixelFromLonLat
-     * Returns a pixel location given a map location.  The map location is
-     *     translated to an integer pixel location (in viewport pixel
-     *     coordinates) by the current base layer.
-     * 
-     * Parameters:
-     * lonlat - {<OpenLayers.LonLat>} A map location.
-     * 
-     * Returns: 
-     * {<OpenLayers.Pixel>} An OpenLayers.Pixel corresponding to the 
-     *     <OpenLayers.LonLat> translated into view port pixels by the current
-     *     base layer.
-     */
-    getPixelFromLonLat: function (lonlat) {
-        var px = this.getViewPortPxFromLonLat(lonlat);
-        px.x = Math.round(px.x);
-        px.y = Math.round(px.y);
-        return px;
-    },
-    
-    /**
-     * Method: getGeodesicPixelSize
-     * 
-     * Parameters:
-     * px - {<OpenLayers.Pixel>} The pixel to get the geodesic length for. If
-     *     not provided, the center pixel of the map viewport will be used.
-     * 
-     * Returns:
-     * {<OpenLayers.Size>} The geodesic size of the pixel in kilometers.
-     */
-    getGeodesicPixelSize: function(px) {
-        var lonlat = px ? this.getLonLatFromPixel(px) : (
-            this.getCachedCenter() || new OpenLayers.LonLat(0, 0));
-        var res = this.getResolution();
-        var left = lonlat.add(-res / 2, 0);
-        var right = lonlat.add(res / 2, 0);
-        var bottom = lonlat.add(0, -res / 2);
-        var top = lonlat.add(0, res / 2);
-        var dest = new OpenLayers.Projection("EPSG:4326");
-        var source = this.getProjectionObject() || dest;
-        if(!source.equals(dest)) {
-            left.transform(source, dest);
-            right.transform(source, dest);
-            bottom.transform(source, dest);
-            top.transform(source, dest);
-        }
-        
-        return new OpenLayers.Size(
-            OpenLayers.Util.distVincenty(left, right),
-            OpenLayers.Util.distVincenty(bottom, top)
-        );
-    },
-
-
-
-  //
-  // TRANSLATION: ViewPortPx <-> LayerPx
-  //
-
-    /**
-     * APIMethod: getViewPortPxFromLayerPx
-     * 
-     * Parameters:
-     * layerPx - {<OpenLayers.Pixel>}
-     * 
-     * Returns:
-     * {<OpenLayers.Pixel>} Layer Pixel translated into ViewPort Pixel 
-     *                      coordinates
-     */
-    getViewPortPxFromLayerPx:function(layerPx) {
-        var viewPortPx = null;
-        if (layerPx != null) {
-            var dX = this.layerContainerOriginPx.x;
-            var dY = this.layerContainerOriginPx.y;
-            viewPortPx = layerPx.add(dX, dY);            
-        }
-        return viewPortPx;
-    },
-    
-    /**
-     * APIMethod: getLayerPxFromViewPortPx
-     * 
-     * Parameters:
-     * viewPortPx - {<OpenLayers.Pixel>}
-     * 
-     * Returns:
-     * {<OpenLayers.Pixel>} ViewPort Pixel translated into Layer Pixel 
-     *                      coordinates
-     */
-    getLayerPxFromViewPortPx:function(viewPortPx) {
-        var layerPx = null;
-        if (viewPortPx != null) {
-            var dX = -this.layerContainerOriginPx.x;
-            var dY = -this.layerContainerOriginPx.y;
-            layerPx = viewPortPx.add(dX, dY);
-            if (isNaN(layerPx.x) || isNaN(layerPx.y)) {
-                layerPx = null;
-            }
-        }
-        return layerPx;
-    },
-    
-  //
-  // TRANSLATION: LonLat <-> LayerPx
-  //
-
-    /**
-     * Method: getLonLatFromLayerPx
-     * 
-     * Parameters:
-     * px - {<OpenLayers.Pixel>}
-     *
-     * Returns:
-     * {<OpenLayers.LonLat>}
-     */
-    getLonLatFromLayerPx: function (px) {
-       //adjust for displacement of layerContainerDiv
-       px = this.getViewPortPxFromLayerPx(px);
-       return this.getLonLatFromViewPortPx(px);         
-    },
-    
-    /**
-     * APIMethod: getLayerPxFromLonLat
-     * 
-     * Parameters:
-     * lonlat - {<OpenLayers.LonLat>} lonlat
-     *
-     * Returns:
-     * {<OpenLayers.Pixel>} An OpenLayers.Pixel which is the passed-in 
-     *                      <OpenLayers.LonLat>, translated into layer pixels 
-     *                      by the current base layer
-     */
-    getLayerPxFromLonLat: function (lonlat) {
-       //adjust for displacement of layerContainerDiv
-       var px = this.getPixelFromLonLat(lonlat);
-       return this.getLayerPxFromViewPortPx(px);         
-    },
-
-    /**
-     * Method: applyTransform
-     * Applies the given transform to the <layerContainerDiv>. This method has
-     * a 2-stage fallback from translate3d/scale3d via translate/scale to plain
-     * style.left/style.top, in which case no scaling is supported.
-     *
-     * Parameters:
-     * x - {Number} x parameter for the translation. Defaults to the x value of
-     *     the map's <layerContainerOriginPx>
-     * y - {Number} y parameter for the translation. Defaults to the y value of
-     *     the map's <layerContainerOriginPx>
-     * scale - {Number} scale. Defaults to 1 if not provided.
-     */
-     applyTransform: function(x, y, scale) {
-         scale = scale || 1;
-         var origin = this.layerContainerOriginPx,
-             needTransform = scale !== 1;
-         x = x || origin.x;
-         y = y || origin.y;
-            
-         var style = this.layerContainerDiv.style,
-             transform = this.applyTransform.transform,
-             template = this.applyTransform.template;
-        
-         if (transform === undefined) {
-             transform = OpenLayers.Util.vendorPrefix.style('transform');
-             this.applyTransform.transform = transform;
-             if (transform) {
-                 // Try translate3d, but only if the viewPortDiv has a transform
-                 // defined in a stylesheet
-                 var computedStyle = OpenLayers.Element.getStyle(this.viewPortDiv,
-                     OpenLayers.Util.vendorPrefix.css('transform'));
-                 if (!computedStyle || computedStyle !== 'none') {
-                     template = ['translate3d(', ',0) ', 'scale3d(', ',1)'];
-                     style[transform] = [template[0], '0,0', template[1]].join('');
-                 }
-                 // If no transform is defined in the stylesheet or translate3d
-                 // does not stick, use translate and scale
-                 if (!template || !~style[transform].indexOf(template[0])) {
-                     template = ['translate(', ') ', 'scale(', ')'];
-                 }
-                 this.applyTransform.template = template;
-             }
-         }
-         
-         // If we do 3d transforms, we always want to use them. If we do 2d
-         // transforms, we only use them when we need to.
-         if (transform !== null && (template[0] === 'translate3d(' || needTransform === true)) {
-             // Our 2d transforms are combined with style.left and style.top, so
-             // adjust x and y values and set the origin as left and top
-             if (needTransform === true && template[0] === 'translate(') {
-                 x -= origin.x;
-                 y -= origin.y;
-                 style.left = origin.x + 'px';
-                 style.top = origin.y + 'px';
-             }
-             style[transform] = [
-                 template[0], x, 'px,', y, 'px', template[1],
-                 template[2], scale, ',', scale, template[3]
-             ].join('');
-         } else {
-             style.left = x + 'px';
-             style.top = y + 'px';
-             // We previously might have had needTransform, so remove transform
-             if (transform !== null) {
-                 style[transform] = '';
-             }
-         }
-     },
-    
-    CLASS_NAME: "OpenLayers.Map"
-});
-
-/**
- * Constant: TILE_WIDTH
- * {Integer} 256 Default tile width (unless otherwise specified)
- */
-OpenLayers.Map.TILE_WIDTH = 256;
-/**
- * Constant: TILE_HEIGHT
- * {Integer} 256 Default tile height (unless otherwise specified)
- */
-OpenLayers.Map.TILE_HEIGHT = 256;
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Marker.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Marker.js
deleted file mode 100644
index 1dde347b..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Marker.js
+++ /dev/null
@@ -1,241 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-
-/**
- * @requires OpenLayers/BaseTypes/Class.js
- * @requires OpenLayers/Events.js
- * @requires OpenLayers/Icon.js
- */
-
-/**
- * Class: OpenLayers.Marker
- * Instances of OpenLayers.Marker are a combination of a 
- * <OpenLayers.LonLat> and an <OpenLayers.Icon>.  
- *
- * Markers are generally added to a special layer called
- * <OpenLayers.Layer.Markers>.
- *
- * Example:
- * (code)
- * var markers = new OpenLayers.Layer.Markers( "Markers" );
- * map.addLayer(markers);
- *
- * var size = new OpenLayers.Size(21,25);
- * var offset = new OpenLayers.Pixel(-(size.w/2), -size.h);
- * var icon = new OpenLayers.Icon('http://www.openlayers.org/dev/img/marker.png', size, offset);
- * markers.addMarker(new OpenLayers.Marker(new OpenLayers.LonLat(0,0),icon));
- * markers.addMarker(new OpenLayers.Marker(new OpenLayers.LonLat(0,0),icon.clone()));
- *
- * (end)
- *
- * Note that if you pass an icon into the Marker constructor, it will take
- * that icon and use it. This means that you should not share icons between
- * markers -- you use them once, but you should clone() for any additional
- * markers using that same icon.
- */
-OpenLayers.Marker = OpenLayers.Class({
-    
-    /** 
-     * Property: icon 
-     * {<OpenLayers.Icon>} The icon used by this marker.
-     */
-    icon: null,
-
-    /** 
-     * Property: lonlat 
-     * {<OpenLayers.LonLat>} location of object
-     */
-    lonlat: null,
-    
-    /** 
-     * Property: events 
-     * {<OpenLayers.Events>} the event handler.
-     */
-    events: null,
-    
-    /** 
-     * Property: map 
-     * {<OpenLayers.Map>} the map this marker is attached to
-     */
-    map: null,
-    
-    /** 
-     * Constructor: OpenLayers.Marker
-     *
-     * Parameters:
-     * lonlat - {<OpenLayers.LonLat>} the position of this marker
-     * icon - {<OpenLayers.Icon>}  the icon for this marker
-     */
-    initialize: function(lonlat, icon) {
-        this.lonlat = lonlat;
-        
-        var newIcon = (icon) ? icon : OpenLayers.Marker.defaultIcon();
-        if (this.icon == null) {
-            this.icon = newIcon;
-        } else {
-            this.icon.url = newIcon.url;
-            this.icon.size = newIcon.size;
-            this.icon.offset = newIcon.offset;
-            this.icon.calculateOffset = newIcon.calculateOffset;
-        }
-        this.events = new OpenLayers.Events(this, this.icon.imageDiv);
-    },
-    
-    /**
-     * APIMethod: destroy
-     * Destroy the marker. You must first remove the marker from any 
-     * layer which it has been added to, or you will get buggy behavior.
-     * (This can not be done within the marker since the marker does not
-     * know which layer it is attached to.)
-     */
-    destroy: function() {
-        // erase any drawn features
-        this.erase();
-
-        this.map = null;
-
-        this.events.destroy();
-        this.events = null;
-
-        if (this.icon != null) {
-            this.icon.destroy();
-            this.icon = null;
-        }
-    },
-    
-    /** 
-    * Method: draw
-    * Calls draw on the icon, and returns that output.
-    * 
-    * Parameters:
-    * px - {<OpenLayers.Pixel>}
-    * 
-    * Returns:
-    * {DOMElement} A new DOM Image with this marker's icon set at the 
-    * location passed-in
-    */
-    draw: function(px) {
-        return this.icon.draw(px);
-    }, 
-
-    /** 
-    * Method: erase
-    * Erases any drawn elements for this marker.
-    */
-    erase: function() {
-        if (this.icon != null) {
-            this.icon.erase();
-        }
-    }, 
-
-    /**
-    * Method: moveTo
-    * Move the marker to the new location.
-    *
-    * Parameters:
-    * px - {<OpenLayers.Pixel>|Object} the pixel position to move to.
-    * An OpenLayers.Pixel or an object with a 'x' and 'y' properties.
-    */
-    moveTo: function (px) {
-        if ((px != null) && (this.icon != null)) {
-            this.icon.moveTo(px);
-        }           
-        this.lonlat = this.map.getLonLatFromLayerPx(px);
-    },
-
-    /**
-     * APIMethod: isDrawn
-     * 
-     * Returns:
-     * {Boolean} Whether or not the marker is drawn.
-     */
-    isDrawn: function() {
-        var isDrawn = (this.icon && this.icon.isDrawn());
-        return isDrawn;   
-    },
-
-    /**
-     * Method: onScreen
-     *
-     * Returns:
-     * {Boolean} Whether or not the marker is currently visible on screen.
-     */
-    onScreen:function() {
-        
-        var onScreen = false;
-        if (this.map) {
-            var screenBounds = this.map.getExtent();
-            onScreen = screenBounds.containsLonLat(this.lonlat);
-        }    
-        return onScreen;
-    },
-    
-    /**
-     * Method: inflate
-     * Englarges the markers icon by the specified ratio.
-     *
-     * Parameters:
-     * inflate - {float} the ratio to enlarge the marker by (passing 2
-     *                   will double the size).
-     */
-    inflate: function(inflate) {
-        if (this.icon) {
-            this.icon.setSize({
-                w: this.icon.size.w * inflate,
-                h: this.icon.size.h * inflate
-            });
-        }        
-    },
-    
-    /** 
-     * Method: setOpacity
-     * Change the opacity of the marker by changin the opacity of 
-     *   its icon
-     * 
-     * Parameters:
-     * opacity - {float}  Specified as fraction (0.4, etc)
-     */
-    setOpacity: function(opacity) {
-        this.icon.setOpacity(opacity);
-    },
-
-    /**
-     * Method: setUrl
-     * Change URL of the Icon Image.
-     * 
-     * url - {String} 
-     */
-    setUrl: function(url) {
-        this.icon.setUrl(url);
-    },    
-
-    /** 
-     * Method: display
-     * Hide or show the icon
-     * 
-     * display - {Boolean} 
-     */
-    display: function(display) {
-        this.icon.display(display);
-    },
-
-    CLASS_NAME: "OpenLayers.Marker"
-});
-
-
-/**
- * Function: defaultIcon
- * Creates a default <OpenLayers.Icon>.
- * 
- * Returns:
- * {<OpenLayers.Icon>} A default OpenLayers.Icon to use for a marker
- */
-OpenLayers.Marker.defaultIcon = function() {
-    return new OpenLayers.Icon(OpenLayers.Util.getImageLocation("marker.png"),
-                               {w: 21, h: 25}, {x: -10.5, y: -25});
-};
-    
-
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Marker/Box.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Marker/Box.js
deleted file mode 100644
index e42e5602..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Marker/Box.js
+++ /dev/null
@@ -1,120 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-
-/**
- * @requires OpenLayers/Marker.js
- */
-
-/**
- * Class: OpenLayers.Marker.Box
- *
- * Inherits from:
- *  - <OpenLayers.Marker> 
- */
-OpenLayers.Marker.Box = OpenLayers.Class(OpenLayers.Marker, {
-
-    /** 
-     * Property: bounds 
-     * {<OpenLayers.Bounds>} 
-     */
-    bounds: null,
-
-    /** 
-     * Property: div 
-     * {DOMElement} 
-     */
-    div: null,
-    
-    /** 
-     * Constructor: OpenLayers.Marker.Box
-     *
-     * Parameters:
-     * bounds - {<OpenLayers.Bounds>} 
-     * borderColor - {String} 
-     * borderWidth - {int} 
-     */
-    initialize: function(bounds, borderColor, borderWidth) {
-        this.bounds = bounds;
-        this.div    = OpenLayers.Util.createDiv();
-        this.div.style.overflow = 'hidden';
-        this.events = new OpenLayers.Events(this, this.div);
-        this.setBorder(borderColor, borderWidth);
-    },
-
-    /**
-     * Method: destroy 
-     */    
-    destroy: function() {
-
-        this.bounds = null;
-        this.div = null;
-
-        OpenLayers.Marker.prototype.destroy.apply(this, arguments);
-    },
-
-    /** 
-     * Method: setBorder
-     * Allow the user to change the box's color and border width
-     * 
-     * Parameters:
-     * color - {String} Default is "red"
-     * width - {int} Default is 2
-     */
-    setBorder: function (color, width) {
-        if (!color) {
-            color = "red";
-        }
-        if (!width) {
-            width = 2;
-        }
-        this.div.style.border = width + "px solid " + color;
-    },
-    
-    /** 
-    * Method: draw
-    * 
-    * Parameters:
-    * px - {<OpenLayers.Pixel>} 
-    * sz - {<OpenLayers.Size>} 
-    * 
-    * Returns: 
-    * {DOMElement} A new DOM Image with this marker's icon set at the 
-    *         location passed-in
-    */
-    draw: function(px, sz) {
-        OpenLayers.Util.modifyDOMElement(this.div, null, px, sz);
-        return this.div;
-    }, 
-
-    /**
-     * Method: onScreen
-     * 
-     * Rreturn:
-     * {Boolean} Whether or not the marker is currently visible on screen.
-     */
-    onScreen:function() {
-        var onScreen = false;
-        if (this.map) {
-            var screenBounds = this.map.getExtent();
-            onScreen = screenBounds.containsBounds(this.bounds, true, true);
-        }    
-        return onScreen;
-    },
-    
-    /**
-     * Method: display
-     * Hide or show the icon
-     * 
-     * Parameters:
-     * display - {Boolean} 
-     */
-    display: function(display) {
-        this.div.style.display = (display) ? "" : "none";
-    },
-
-    CLASS_NAME: "OpenLayers.Marker.Box"
-});
-
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Popup.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Popup.js
deleted file mode 100644
index 290318ea..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Popup.js
+++ /dev/null
@@ -1,1065 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/BaseTypes/Class.js
- */
-
-
-/**
- * Class: OpenLayers.Popup
- * A popup is a small div that can opened and closed on the map.
- * Typically opened in response to clicking on a marker.  
- * See <OpenLayers.Marker>.  Popup's don't require their own
- * layer and are added the the map using the <OpenLayers.Map.addPopup>
- * method.
- *
- * Example:
- * (code)
- * popup = new OpenLayers.Popup("chicken", 
- *                    new OpenLayers.LonLat(5,40),
- *                    new OpenLayers.Size(200,200),
- *                    "example popup",
- *                    true);
- *       
- * map.addPopup(popup);
- * (end)
- */
-OpenLayers.Popup = OpenLayers.Class({
-
-    /** 
-     * Property: events  
-     * {<OpenLayers.Events>} custom event manager 
-     */
-    events: null,
-    
-    /** Property: id
-     * {String} the unique identifier assigned to this popup.
-     */
-    id: "",
-
-    /** 
-     * Property: lonlat 
-     * {<OpenLayers.LonLat>} the position of this popup on the map
-     */
-    lonlat: null,
-
-    /** 
-     * Property: div 
-     * {DOMElement} the div that contains this popup.
-     */
-    div: null,
-
-    /** 
-     * Property: contentSize 
-     * {<OpenLayers.Size>} the width and height of the content.
-     */
-    contentSize: null,    
-
-    /** 
-     * Property: size 
-     * {<OpenLayers.Size>} the width and height of the popup.
-     */
-    size: null,    
-
-    /** 
-     * Property: contentHTML 
-     * {String} An HTML string for this popup to display.
-     */
-    contentHTML: null,
-    
-    /** 
-     * Property: backgroundColor 
-     * {String} the background color used by the popup.
-     */
-    backgroundColor: "",
-    
-    /** 
-     * Property: opacity 
-     * {float} the opacity of this popup (between 0.0 and 1.0)
-     */
-    opacity: "",
-
-    /** 
-     * Property: border 
-     * {String} the border size of the popup.  (eg 2px)
-     */
-    border: "",
-    
-    /** 
-     * Property: contentDiv 
-     * {DOMElement} a reference to the element that holds the content of
-     *              the div.
-     */
-    contentDiv: null,
-    
-    /** 
-     * Property: groupDiv 
-     * {DOMElement} First and only child of 'div'. The group Div contains the
-     *     'contentDiv' and the 'closeDiv'.
-     */
-    groupDiv: null,
-
-    /** 
-     * Property: closeDiv
-     * {DOMElement} the optional closer image
-     */
-    closeDiv: null,
-
-    /** 
-     * APIProperty: autoSize
-     * {Boolean} Resize the popup to auto-fit the contents.
-     *     Default is false.
-     */
-    autoSize: false,
-
-    /**
-     * APIProperty: minSize
-     * {<OpenLayers.Size>} Minimum size allowed for the popup's contents.
-     */
-    minSize: null,
-
-    /**
-     * APIProperty: maxSize
-     * {<OpenLayers.Size>} Maximum size allowed for the popup's contents.
-     */
-    maxSize: null,
-
-    /** 
-     * Property: displayClass
-     * {String} The CSS class of the popup.
-     */
-    displayClass: "olPopup",
-
-    /** 
-     * Property: contentDisplayClass
-     * {String} The CSS class of the popup content div.
-     */
-    contentDisplayClass: "olPopupContent",
-
-    /** 
-     * Property: padding 
-     * {int or <OpenLayers.Bounds>} An extra opportunity to specify internal 
-     *     padding of the content div inside the popup. This was originally
-     *     confused with the css padding as specified in style.css's 
-     *     'olPopupContent' class. We would like to get rid of this altogether,
-     *     except that it does come in handy for the framed and anchoredbubble
-     *     popups, who need to maintain yet another barrier between their 
-     *     content and the outer border of the popup itself. 
-     * 
-     *     Note that in order to not break API, we must continue to support 
-     *     this property being set as an integer. Really, though, we'd like to 
-     *     have this specified as a Bounds object so that user can specify
-     *     distinct left, top, right, bottom paddings. With the 3.0 release
-     *     we can make this only a bounds.
-     */
-    padding: 0,
-
-    /** 
-     * Property: disableFirefoxOverflowHack
-     * {Boolean} The hack for overflow in Firefox causes all elements 
-     *     to be re-drawn, which causes Flash elements to be 
-     *     re-initialized, which is troublesome.
-     *     With this property the hack can be disabled.
-     */
-    disableFirefoxOverflowHack: false,
-
-    /**
-     * Method: fixPadding
-     * To be removed in 3.0, this function merely helps us to deal with the 
-     *     case where the user may have set an integer value for padding, 
-     *     instead of an <OpenLayers.Bounds> object.
-     */
-    fixPadding: function() {
-        if (typeof this.padding == "number") {
-            this.padding = new OpenLayers.Bounds(
-                this.padding, this.padding, this.padding, this.padding
-            );
-        }
-    },
-
-    /**
-     * APIProperty: panMapIfOutOfView
-     * {Boolean} When drawn, pan map such that the entire popup is visible in
-     *     the current viewport (if necessary).
-     *     Default is false.
-     */
-    panMapIfOutOfView: false,
-    
-    /**
-     * APIProperty: keepInMap 
-     * {Boolean} If panMapIfOutOfView is false, and this property is true, 
-     *     contrain the popup such that it always fits in the available map
-     *     space. By default, this is not set on the base class. If you are
-     *     creating popups that are near map edges and not allowing pannning,
-     *     and especially if you have a popup which has a
-     *     fixedRelativePosition, setting this to false may be a smart thing to
-     *     do. Subclasses may want to override this setting.
-     *   
-     *     Default is false.
-     */
-    keepInMap: false,
-
-    /**
-     * APIProperty: closeOnMove
-     * {Boolean} When map pans, close the popup.
-     *     Default is false.
-     */
-    closeOnMove: false,
-    
-    /** 
-     * Property: map 
-     * {<OpenLayers.Map>} this gets set in Map.js when the popup is added to the map
-     */
-    map: null,
-
-    /** 
-    * Constructor: OpenLayers.Popup
-    * Create a popup.
-    * 
-    * Parameters: 
-    * id - {String} a unqiue identifier for this popup.  If null is passed
-    *               an identifier will be automatically generated. 
-    * lonlat - {<OpenLayers.LonLat>}  The position on the map the popup will
-    *                                 be shown.
-    * contentSize - {<OpenLayers.Size>} The size of the content.
-    * contentHTML - {String}          An HTML string to display inside the   
-    *                                 popup.
-    * closeBox - {Boolean}            Whether to display a close box inside
-    *                                 the popup.
-    * closeBoxCallback - {Function}   Function to be called on closeBox click.
-    */
-    initialize:function(id, lonlat, contentSize, contentHTML, closeBox, closeBoxCallback) {
-        if (id == null) {
-            id = OpenLayers.Util.createUniqueID(this.CLASS_NAME + "_");
-        }
-
-        this.id = id;
-        this.lonlat = lonlat;
-
-        this.contentSize = (contentSize != null) ? contentSize 
-                                  : new OpenLayers.Size(
-                                                   OpenLayers.Popup.WIDTH,
-                                                   OpenLayers.Popup.HEIGHT);
-        if (contentHTML != null) { 
-             this.contentHTML = contentHTML;
-        }
-        this.backgroundColor = OpenLayers.Popup.COLOR;
-        this.opacity = OpenLayers.Popup.OPACITY;
-        this.border = OpenLayers.Popup.BORDER;
-
-        this.div = OpenLayers.Util.createDiv(this.id, null, null, 
-                                             null, null, null, "hidden");
-        this.div.className = this.displayClass;
-        
-        var groupDivId = this.id + "_GroupDiv";
-        this.groupDiv = OpenLayers.Util.createDiv(groupDivId, null, null, 
-                                                    null, "relative", null,
-                                                    "hidden");
-
-        var id = this.div.id + "_contentDiv";
-        this.contentDiv = OpenLayers.Util.createDiv(id, null, this.contentSize.clone(), 
-                                                    null, "relative");
-        this.contentDiv.className = this.contentDisplayClass;
-        this.groupDiv.appendChild(this.contentDiv);
-        this.div.appendChild(this.groupDiv);
-
-        if (closeBox) {
-            this.addCloseBox(closeBoxCallback);
-        } 
-
-        this.registerEvents();
-    },
-
-    /** 
-     * Method: destroy
-     * nullify references to prevent circular references and memory leaks
-     */
-    destroy: function() {
-
-        this.id = null;
-        this.lonlat = null;
-        this.size = null;
-        this.contentHTML = null;
-        
-        this.backgroundColor = null;
-        this.opacity = null;
-        this.border = null;
-        
-        if (this.closeOnMove && this.map) {
-            this.map.events.unregister("movestart", this, this.hide);
-        }
-
-        this.events.destroy();
-        this.events = null;
-        
-        if (this.closeDiv) {
-            OpenLayers.Event.stopObservingElement(this.closeDiv); 
-            this.groupDiv.removeChild(this.closeDiv);
-        }
-        this.closeDiv = null;
-        
-        this.div.removeChild(this.groupDiv);
-        this.groupDiv = null;
-
-        if (this.map != null) {
-            this.map.removePopup(this);
-        }
-        this.map = null;
-        this.div = null;
-        
-        this.autoSize = null;
-        this.minSize = null;
-        this.maxSize = null;
-        this.padding = null;
-        this.panMapIfOutOfView = null;
-    },
-
-    /** 
-    * Method: draw
-    * Constructs the elements that make up the popup.
-    *
-    * Parameters:
-    * px - {<OpenLayers.Pixel>} the position the popup in pixels.
-    * 
-    * Returns:
-    * {DOMElement} Reference to a div that contains the drawn popup
-    */
-    draw: function(px) {
-        if (px == null) {
-            if ((this.lonlat != null) && (this.map != null)) {
-                px = this.map.getLayerPxFromLonLat(this.lonlat);
-            }
-        }
-
-        // this assumes that this.map already exists, which is okay because 
-        // this.draw is only called once the popup has been added to the map.
-        if (this.closeOnMove) {
-            this.map.events.register("movestart", this, this.hide);
-        }
-        
-        //listen to movestart, moveend to disable overflow (FF bug)
-        if (!this.disableFirefoxOverflowHack && OpenLayers.BROWSER_NAME == 'firefox') {
-            this.map.events.register("movestart", this, function() {
-                var style = document.defaultView.getComputedStyle(
-                    this.contentDiv, null
-                );
-                var currentOverflow = style.getPropertyValue("overflow");
-                if (currentOverflow != "hidden") {
-                    this.contentDiv._oldOverflow = currentOverflow;
-                    this.contentDiv.style.overflow = "hidden";
-                }
-            });
-            this.map.events.register("moveend", this, function() {
-                var oldOverflow = this.contentDiv._oldOverflow;
-                if (oldOverflow) {
-                    this.contentDiv.style.overflow = oldOverflow;
-                    this.contentDiv._oldOverflow = null;
-                }
-            });
-        }
-
-        this.moveTo(px);
-        if (!this.autoSize && !this.size) {
-            this.setSize(this.contentSize);
-        }
-        this.setBackgroundColor();
-        this.setOpacity();
-        this.setBorder();
-        this.setContentHTML();
-        
-        if (this.panMapIfOutOfView) {
-            this.panIntoView();
-        }    
-
-        return this.div;
-    },
-
-    /** 
-     * Method: updatePosition
-     * if the popup has a lonlat and its map members set, 
-     * then have it move itself to its proper position
-     */
-    updatePosition: function() {
-        if ((this.lonlat) && (this.map)) {
-            var px = this.map.getLayerPxFromLonLat(this.lonlat);
-            if (px) {
-                this.moveTo(px);           
-            }    
-        }
-    },
-
-    /**
-     * Method: moveTo
-     * 
-     * Parameters:
-     * px - {<OpenLayers.Pixel>} the top and left position of the popup div. 
-     */
-    moveTo: function(px) {
-        if ((px != null) && (this.div != null)) {
-            this.div.style.left = px.x + "px";
-            this.div.style.top = px.y + "px";
-        }
-    },
-
-    /**
-     * Method: visible
-     *
-     * Returns:      
-     * {Boolean} Boolean indicating whether or not the popup is visible
-     */
-    visible: function() {
-        return OpenLayers.Element.visible(this.div);
-    },
-
-    /**
-     * Method: toggle
-     * Toggles visibility of the popup.
-     */
-    toggle: function() {
-        if (this.visible()) {
-            this.hide();
-        } else {
-            this.show();
-        }
-    },
-
-    /**
-     * Method: show
-     * Makes the popup visible.
-     */
-    show: function() {
-        this.div.style.display = '';
-
-        if (this.panMapIfOutOfView) {
-            this.panIntoView();
-        }    
-    },
-
-    /**
-     * Method: hide
-     * Makes the popup invisible.
-     */
-    hide: function() {
-        this.div.style.display = 'none';
-    },
-
-    /**
-     * Method: setSize
-     * Used to adjust the size of the popup. 
-     *
-     * Parameters:
-     * contentSize - {<OpenLayers.Size>} the new size for the popup's 
-     *     contents div (in pixels).
-     */
-    setSize:function(contentSize) { 
-        this.size = contentSize.clone(); 
-        
-        // if our contentDiv has a css 'padding' set on it by a stylesheet, we 
-        //  must add that to the desired "size". 
-        var contentDivPadding = this.getContentDivPadding();
-        var wPadding = contentDivPadding.left + contentDivPadding.right;
-        var hPadding = contentDivPadding.top + contentDivPadding.bottom;
-
-        // take into account the popup's 'padding' property
-        this.fixPadding();
-        wPadding += this.padding.left + this.padding.right;
-        hPadding += this.padding.top + this.padding.bottom;
-
-        // make extra space for the close div
-        if (this.closeDiv) {
-            var closeDivWidth = parseInt(this.closeDiv.style.width);
-            wPadding += closeDivWidth + contentDivPadding.right;
-        }
-
-        //increase size of the main popup div to take into account the 
-        // users's desired padding and close div.        
-        this.size.w += wPadding;
-        this.size.h += hPadding;
-
-        //now if our browser is IE, we need to actually make the contents 
-        // div itself bigger to take its own padding into effect. this makes 
-        // me want to shoot someone, but so it goes.
-        if (OpenLayers.BROWSER_NAME == "msie") {
-            this.contentSize.w += 
-                contentDivPadding.left + contentDivPadding.right;
-            this.contentSize.h += 
-                contentDivPadding.bottom + contentDivPadding.top;
-        }
-
-        if (this.div != null) {
-            this.div.style.width = this.size.w + "px";
-            this.div.style.height = this.size.h + "px";
-        }
-        if (this.contentDiv != null){
-            this.contentDiv.style.width = contentSize.w + "px";
-            this.contentDiv.style.height = contentSize.h + "px";
-        }
-    },  
-
-    /**
-     * APIMethod: updateSize
-     * Auto size the popup so that it precisely fits its contents (as 
-     *     determined by this.contentDiv.innerHTML). Popup size will, of
-     *     course, be limited by the available space on the current map
-     */
-    updateSize: function() {
-        
-        // determine actual render dimensions of the contents by putting its
-        // contents into a fake contentDiv (for the CSS) and then measuring it
-        var preparedHTML = "<div class='" + this.contentDisplayClass+ "'>" + 
-            this.contentDiv.innerHTML + 
-            "</div>";
- 
-        var containerElement = (this.map) ? this.map.div : document.body;
-        var realSize = OpenLayers.Util.getRenderedDimensions(
-            preparedHTML, null, {
-                displayClass: this.displayClass,
-                containerElement: containerElement
-            }
-        );
-
-        // is the "real" size of the div is safe to display in our map?
-        var safeSize = this.getSafeContentSize(realSize);
-
-        var newSize = null;
-        if (safeSize.equals(realSize)) {
-            //real size of content is small enough to fit on the map, 
-            // so we use real size.
-            newSize = realSize;
-
-        } else {
-
-            // make a new 'size' object with the clipped dimensions 
-            // set or null if not clipped.
-            var fixedSize = {
-                w: (safeSize.w < realSize.w) ? safeSize.w : null,
-                h: (safeSize.h < realSize.h) ? safeSize.h : null
-            };
-        
-            if (fixedSize.w && fixedSize.h) {
-                //content is too big in both directions, so we will use 
-                // max popup size (safeSize), knowing well that it will 
-                // overflow both ways.                
-                newSize = safeSize;
-            } else {
-                //content is clipped in only one direction, so we need to 
-                // run getRenderedDimensions() again with a fixed dimension
-                var clippedSize = OpenLayers.Util.getRenderedDimensions(
-                    preparedHTML, fixedSize, {
-                        displayClass: this.contentDisplayClass,
-                        containerElement: containerElement
-                    }
-                );
-                
-                //if the clipped size is still the same as the safeSize, 
-                // that means that our content must be fixed in the 
-                // offending direction. If overflow is 'auto', this means 
-                // we are going to have a scrollbar for sure, so we must 
-                // adjust for that.
-                //
-                var currentOverflow = OpenLayers.Element.getStyle(
-                    this.contentDiv, "overflow"
-                );
-                if ( (currentOverflow != "hidden") && 
-                     (clippedSize.equals(safeSize)) ) {
-                    var scrollBar = OpenLayers.Util.getScrollbarWidth();
-                    if (fixedSize.w) {
-                        clippedSize.h += scrollBar;
-                    } else {
-                        clippedSize.w += scrollBar;
-                    }
-                }
-                
-                newSize = this.getSafeContentSize(clippedSize);
-            }
-        }                        
-        this.setSize(newSize);     
-    },    
-
-    /**
-     * Method: setBackgroundColor
-     * Sets the background color of the popup.
-     *
-     * Parameters:
-     * color - {String} the background color.  eg "#FFBBBB"
-     */
-    setBackgroundColor:function(color) { 
-        if (color != undefined) {
-            this.backgroundColor = color; 
-        }
-        
-        if (this.div != null) {
-            this.div.style.backgroundColor = this.backgroundColor;
-        }
-    },  
-    
-    /**
-     * Method: setOpacity
-     * Sets the opacity of the popup.
-     * 
-     * Parameters:
-     * opacity - {float} A value between 0.0 (transparent) and 1.0 (solid).   
-     */
-    setOpacity:function(opacity) { 
-        if (opacity != undefined) {
-            this.opacity = opacity; 
-        }
-        
-        if (this.div != null) {
-            // for Mozilla and Safari
-            this.div.style.opacity = this.opacity;
-
-            // for IE
-            this.div.style.filter = 'alpha(opacity=' + this.opacity*100 + ')';
-        }
-    },  
-    
-    /**
-     * Method: setBorder
-     * Sets the border style of the popup.
-     *
-     * Parameters:
-     * border - {String} The border style value. eg 2px 
-     */
-    setBorder:function(border) { 
-        if (border != undefined) {
-            this.border = border;
-        }
-        
-        if (this.div != null) {
-            this.div.style.border = this.border;
-        }
-    },      
-    
-    /**
-     * Method: setContentHTML
-     * Allows the user to set the HTML content of the popup.
-     *
-     * Parameters:
-     * contentHTML - {String} HTML for the div.
-     */
-    setContentHTML:function(contentHTML) {
-
-        if (contentHTML != null) {
-            this.contentHTML = contentHTML;
-        }
-       
-        if ((this.contentDiv != null) && 
-            (this.contentHTML != null) &&
-            (this.contentHTML != this.contentDiv.innerHTML)) {
-       
-            this.contentDiv.innerHTML = this.contentHTML;
-       
-            if (this.autoSize) {
-                
-                //if popup has images, listen for when they finish
-                // loading and resize accordingly
-                this.registerImageListeners();
-
-                //auto size the popup to its current contents
-                this.updateSize();
-            }
-        }    
-
-    },
-    
-    /**
-     * Method: registerImageListeners
-     * Called when an image contained by the popup loaded. this function
-     *     updates the popup size, then unregisters the image load listener.
-     */   
-    registerImageListeners: function() { 
-
-        // As the images load, this function will call updateSize() to 
-        // resize the popup to fit the content div (which presumably is now
-        // bigger than when the image was not loaded).
-        // 
-        // If the 'panMapIfOutOfView' property is set, we will pan the newly
-        // resized popup back into view.
-        // 
-        // Note that this function, when called, will have 'popup' and 
-        // 'img' properties in the context.
-        //
-        var onImgLoad = function() {
-            if (this.popup.id === null) { // this.popup has been destroyed!
-                return;
-            }
-            this.popup.updateSize();
-     
-            if ( this.popup.visible() && this.popup.panMapIfOutOfView ) {
-                this.popup.panIntoView();
-            }
-
-            OpenLayers.Event.stopObserving(
-                this.img, "load", this.img._onImgLoad
-            );
-    
-        };
-
-        //cycle through the images and if their size is 0x0, that means that 
-        // they haven't been loaded yet, so we attach the listener, which 
-        // will fire when the images finish loading and will resize the 
-        // popup accordingly to its new size.
-        var images = this.contentDiv.getElementsByTagName("img");
-        for (var i = 0, len = images.length; i < len; i++) {
-            var img = images[i];
-            if (img.width == 0 || img.height == 0) {
-
-                var context = {
-                    'popup': this,
-                    'img': img
-                };
-
-                //expando this function to the image itself before registering
-                // it. This way we can easily and properly unregister it.
-                img._onImgLoad = OpenLayers.Function.bind(onImgLoad, context);
-
-                OpenLayers.Event.observe(img, 'load', img._onImgLoad);
-            }    
-        } 
-    },
-
-    /**
-     * APIMethod: getSafeContentSize
-     * 
-     * Parameters:
-     * size - {<OpenLayers.Size>} Desired size to make the popup.
-     * 
-     * Returns:
-     * {<OpenLayers.Size>} A size to make the popup which is neither smaller
-     *     than the specified minimum size, nor bigger than the maximum 
-     *     size (which is calculated relative to the size of the viewport).
-     */
-    getSafeContentSize: function(size) {
-
-        var safeContentSize = size.clone();
-
-        // if our contentDiv has a css 'padding' set on it by a stylesheet, we 
-        //  must add that to the desired "size". 
-        var contentDivPadding = this.getContentDivPadding();
-        var wPadding = contentDivPadding.left + contentDivPadding.right;
-        var hPadding = contentDivPadding.top + contentDivPadding.bottom;
-
-        // take into account the popup's 'padding' property
-        this.fixPadding();
-        wPadding += this.padding.left + this.padding.right;
-        hPadding += this.padding.top + this.padding.bottom;
-
-        if (this.closeDiv) {
-            var closeDivWidth = parseInt(this.closeDiv.style.width);
-            wPadding += closeDivWidth + contentDivPadding.right;
-        }
-
-        // prevent the popup from being smaller than a specified minimal size
-        if (this.minSize) {
-            safeContentSize.w = Math.max(safeContentSize.w, 
-                (this.minSize.w - wPadding));
-            safeContentSize.h = Math.max(safeContentSize.h, 
-                (this.minSize.h - hPadding));
-        }
-
-        // prevent the popup from being bigger than a specified maximum size
-        if (this.maxSize) {
-            safeContentSize.w = Math.min(safeContentSize.w, 
-                (this.maxSize.w - wPadding));
-            safeContentSize.h = Math.min(safeContentSize.h, 
-                (this.maxSize.h - hPadding));
-        }
-        
-        //make sure the desired size to set doesn't result in a popup that 
-        // is bigger than the map's viewport.
-        //
-        if (this.map && this.map.size) {
-            
-            var extraX = 0, extraY = 0;
-            if (this.keepInMap && !this.panMapIfOutOfView) {
-                var px = this.map.getPixelFromLonLat(this.lonlat);
-                switch (this.relativePosition) {
-                    case "tr":
-                        extraX = px.x;
-                        extraY = this.map.size.h - px.y;
-                        break;
-                    case "tl":
-                        extraX = this.map.size.w - px.x;
-                        extraY = this.map.size.h - px.y;
-                        break;
-                    case "bl":
-                        extraX = this.map.size.w - px.x;
-                        extraY = px.y;
-                        break;
-                    case "br":
-                        extraX = px.x;
-                        extraY = px.y;
-                        break;
-                    default:    
-                        extraX = px.x;
-                        extraY = this.map.size.h - px.y;
-                        break;
-                }
-            }    
-          
-            var maxY = this.map.size.h - 
-                this.map.paddingForPopups.top - 
-                this.map.paddingForPopups.bottom - 
-                hPadding - extraY;
-            
-            var maxX = this.map.size.w - 
-                this.map.paddingForPopups.left - 
-                this.map.paddingForPopups.right - 
-                wPadding - extraX;
-            
-            safeContentSize.w = Math.min(safeContentSize.w, maxX);
-            safeContentSize.h = Math.min(safeContentSize.h, maxY);
-        }
-        
-        return safeContentSize;
-    },
-    
-    /**
-     * Method: getContentDivPadding
-     * Glorious, oh glorious hack in order to determine the css 'padding' of 
-     *     the contentDiv. IE/Opera return null here unless we actually add the 
-     *     popup's main 'div' element (which contains contentDiv) to the DOM. 
-     *     So we make it invisible and then add it to the document temporarily. 
-     *
-     *     Once we've taken the padding readings we need, we then remove it 
-     *     from the DOM (it will actually get added to the DOM in 
-     *     Map.js's addPopup)
-     *
-     * Returns:
-     * {<OpenLayers.Bounds>}
-     */
-    getContentDivPadding: function() {
-
-        //use cached value if we have it
-        var contentDivPadding = this._contentDivPadding;
-        if (!contentDivPadding) {
-
-            if (this.div.parentNode == null) {
-                //make the div invisible and add it to the page        
-                this.div.style.display = "none";
-                document.body.appendChild(this.div);
-            }
-                    
-            //read the padding settings from css, put them in an OL.Bounds        
-            contentDivPadding = new OpenLayers.Bounds(
-                OpenLayers.Element.getStyle(this.contentDiv, "padding-left"),
-                OpenLayers.Element.getStyle(this.contentDiv, "padding-bottom"),
-                OpenLayers.Element.getStyle(this.contentDiv, "padding-right"),
-                OpenLayers.Element.getStyle(this.contentDiv, "padding-top")
-            );
-    
-            //cache the value
-            this._contentDivPadding = contentDivPadding;
-
-            if (this.div.parentNode == document.body) {
-                //remove the div from the page and make it visible again
-                document.body.removeChild(this.div);
-                this.div.style.display = "";
-            }
-        }
-        return contentDivPadding;
-    },
-
-    /**
-     * Method: addCloseBox
-     * 
-     * Parameters:
-     * callback - {Function} The callback to be called when the close button
-     *     is clicked.
-     */
-    addCloseBox: function(callback) {
-
-        this.closeDiv = OpenLayers.Util.createDiv(
-            this.id + "_close", null, {w: 17, h: 17}
-        );
-        this.closeDiv.className = "olPopupCloseBox"; 
-        
-        // use the content div's css padding to determine if we should
-        //  padd the close div
-        var contentDivPadding = this.getContentDivPadding();
-         
-        this.closeDiv.style.right = contentDivPadding.right + "px";
-        this.closeDiv.style.top = contentDivPadding.top + "px";
-        this.groupDiv.appendChild(this.closeDiv);
-
-        var closePopup = callback || function(e) {
-            this.hide();
-            OpenLayers.Event.stop(e);
-        };
-        OpenLayers.Event.observe(this.closeDiv, "touchend", 
-                OpenLayers.Function.bindAsEventListener(closePopup, this));
-        OpenLayers.Event.observe(this.closeDiv, "click", 
-                OpenLayers.Function.bindAsEventListener(closePopup, this));
-    },
-
-    /**
-     * Method: panIntoView
-     * Pans the map such that the popup is totaly viewable (if necessary)
-     */
-    panIntoView: function() {
-        
-        var mapSize = this.map.getSize();
-    
-        //start with the top left corner of the popup, in px, 
-        // relative to the viewport
-        var origTL = this.map.getViewPortPxFromLayerPx( new OpenLayers.Pixel(
-            parseInt(this.div.style.left),
-            parseInt(this.div.style.top)
-        ));
-        var newTL = origTL.clone();
-    
-        //new left (compare to margins, using this.size to calculate right)
-        if (origTL.x < this.map.paddingForPopups.left) {
-            newTL.x = this.map.paddingForPopups.left;
-        } else 
-        if ( (origTL.x + this.size.w) > (mapSize.w - this.map.paddingForPopups.right)) {
-            newTL.x = mapSize.w - this.map.paddingForPopups.right - this.size.w;
-        }
-        
-        //new top (compare to margins, using this.size to calculate bottom)
-        if (origTL.y < this.map.paddingForPopups.top) {
-            newTL.y = this.map.paddingForPopups.top;
-        } else 
-        if ( (origTL.y + this.size.h) > (mapSize.h - this.map.paddingForPopups.bottom)) {
-            newTL.y = mapSize.h - this.map.paddingForPopups.bottom - this.size.h;
-        }
-        
-        var dx = origTL.x - newTL.x;
-        var dy = origTL.y - newTL.y;
-        
-        this.map.pan(dx, dy);
-    },
-
-    /** 
-     * Method: registerEvents
-     * Registers events on the popup.
-     *
-     * Do this in a separate function so that subclasses can 
-     *   choose to override it if they wish to deal differently
-     *   with mouse events
-     * 
-     *   Note in the following handler functions that some special
-     *    care is needed to deal correctly with mousing and popups. 
-     *   
-     *   Because the user might select the zoom-rectangle option and
-     *    then drag it over a popup, we need a safe way to allow the
-     *    mousemove and mouseup events to pass through the popup when
-     *    they are initiated from outside. The same procedure is needed for
-     *    touchmove and touchend events.
-     * 
-     *   Otherwise, we want to essentially kill the event propagation
-     *    for all other events, though we have to do so carefully, 
-     *    without disabling basic html functionality, like clicking on 
-     *    hyperlinks or drag-selecting text.
-     */
-     registerEvents:function() {
-        this.events = new OpenLayers.Events(this, this.div, null, true);
-
-        function onTouchstart(evt) {
-            OpenLayers.Event.stop(evt, true);
-        }
-        this.events.on({
-            "mousedown": this.onmousedown,
-            "mousemove": this.onmousemove,
-            "mouseup": this.onmouseup,
-            "click": this.onclick,
-            "mouseout": this.onmouseout,
-            "dblclick": this.ondblclick,
-            "touchstart": onTouchstart,
-            scope: this
-        });
-        
-     },
-
-    /** 
-     * Method: onmousedown 
-     * When mouse goes down within the popup, make a note of
-     *   it locally, and then do not propagate the mousedown 
-     *   (but do so safely so that user can select text inside)
-     * 
-     * Parameters:
-     * evt - {Event} 
-     */
-    onmousedown: function (evt) {
-        this.mousedown = true;
-        OpenLayers.Event.stop(evt, true);
-    },
-
-    /** 
-     * Method: onmousemove
-     * If the drag was started within the popup, then 
-     *   do not propagate the mousemove (but do so safely
-     *   so that user can select text inside)
-     * 
-     * Parameters:
-     * evt - {Event} 
-     */
-    onmousemove: function (evt) {
-        if (this.mousedown) {
-            OpenLayers.Event.stop(evt, true);
-        }
-    },
-
-    /** 
-     * Method: onmouseup
-     * When mouse comes up within the popup, after going down 
-     *   in it, reset the flag, and then (once again) do not 
-     *   propagate the event, but do so safely so that user can 
-     *   select text inside
-     * 
-     * Parameters:
-     * evt - {Event} 
-     */
-    onmouseup: function (evt) {
-        if (this.mousedown) {
-            this.mousedown = false;
-            OpenLayers.Event.stop(evt, true);
-        }
-    },
-
-    /**
-     * Method: onclick
-     * Ignore clicks, but allowing default browser handling
-     * 
-     * Parameters:
-     * evt - {Event} 
-     */
-    onclick: function (evt) {
-        OpenLayers.Event.stop(evt, true);
-    },
-
-    /** 
-     * Method: onmouseout
-     * When mouse goes out of the popup set the flag to false so that
-     *   if they let go and then drag back in, we won't be confused.
-     * 
-     * Parameters:
-     * evt - {Event} 
-     */
-    onmouseout: function (evt) {
-        this.mousedown = false;
-    },
-    
-    /** 
-     * Method: ondblclick
-     * Ignore double-clicks, but allowing default browser handling
-     * 
-     * Parameters:
-     * evt - {Event} 
-     */
-    ondblclick: function (evt) {
-        OpenLayers.Event.stop(evt, true);
-    },
-
-    CLASS_NAME: "OpenLayers.Popup"
-});
-
-OpenLayers.Popup.WIDTH = 200;
-OpenLayers.Popup.HEIGHT = 200;
-OpenLayers.Popup.COLOR = "white";
-OpenLayers.Popup.OPACITY = 1;
-OpenLayers.Popup.BORDER = "0px";
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Popup/Anchored.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Popup/Anchored.js
deleted file mode 100644
index 94155469..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Popup/Anchored.js
+++ /dev/null
@@ -1,195 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-
-/**
- * @requires OpenLayers/Popup.js
- */
-
-/**
- * Class: OpenLayers.Popup.Anchored
- * 
- * Inherits from:
- *  - <OpenLayers.Popup>
- */
-OpenLayers.Popup.Anchored = 
-  OpenLayers.Class(OpenLayers.Popup, {
-
-    /** 
-     * Property: relativePosition
-     * {String} Relative position of the popup ("br", "tr", "tl" or "bl").
-     */
-    relativePosition: null,
-    
-    /**
-     * APIProperty: keepInMap 
-     * {Boolean} If panMapIfOutOfView is false, and this property is true, 
-     *     contrain the popup such that it always fits in the available map
-     *     space. By default, this is set. If you are creating popups that are
-     *     near map edges and not allowing pannning, and especially if you have
-     *     a popup which has a fixedRelativePosition, setting this to false may
-     *     be a smart thing to do.
-     *   
-     *     For anchored popups, default is true, since subclasses will
-     *     usually want this functionality.
-     */
-    keepInMap: true,
-
-    /**
-     * Property: anchor
-     * {Object} Object to which we'll anchor the popup. Must expose a 
-     *     'size' (<OpenLayers.Size>) and 'offset' (<OpenLayers.Pixel>).
-     */
-    anchor: null,
-
-    /** 
-    * Constructor: OpenLayers.Popup.Anchored
-    * 
-    * Parameters:
-    * id - {String}
-    * lonlat - {<OpenLayers.LonLat>}
-    * contentSize - {<OpenLayers.Size>}
-    * contentHTML - {String}
-    * anchor - {Object} Object which must expose a 'size' <OpenLayers.Size> 
-    *     and 'offset' <OpenLayers.Pixel> (generally an <OpenLayers.Icon>).
-    * closeBox - {Boolean}
-    * closeBoxCallback - {Function} Function to be called on closeBox click.
-    */
-    initialize:function(id, lonlat, contentSize, contentHTML, anchor, closeBox,
-                        closeBoxCallback) {
-        var newArguments = [
-            id, lonlat, contentSize, contentHTML, closeBox, closeBoxCallback
-        ];
-        OpenLayers.Popup.prototype.initialize.apply(this, newArguments);
-
-        this.anchor = (anchor != null) ? anchor 
-                                       : { size: new OpenLayers.Size(0,0),
-                                           offset: new OpenLayers.Pixel(0,0)};
-    },
-
-    /**
-     * APIMethod: destroy
-     */
-    destroy: function() {
-        this.anchor = null;
-        this.relativePosition = null;
-        
-        OpenLayers.Popup.prototype.destroy.apply(this, arguments);        
-    },
-
-    /**
-     * APIMethod: show
-     * Overridden from Popup since user might hide popup and then show() it 
-     *     in a new location (meaning we might want to update the relative
-     *     position on the show)
-     */
-    show: function() {
-        this.updatePosition();
-        OpenLayers.Popup.prototype.show.apply(this, arguments);
-    },
-
-    /**
-     * Method: moveTo
-     * Since the popup is moving to a new px, it might need also to be moved
-     *     relative to where the marker is. We first calculate the new 
-     *     relativePosition, and then we calculate the new px where we will 
-     *     put the popup, based on the new relative position. 
-     * 
-     *     If the relativePosition has changed, we must also call 
-     *     updateRelativePosition() to make any visual changes to the popup 
-     *     which are associated with putting it in a new relativePosition.
-     * 
-     * Parameters:
-     * px - {<OpenLayers.Pixel>}
-     */
-    moveTo: function(px) {
-        var oldRelativePosition = this.relativePosition;
-        this.relativePosition = this.calculateRelativePosition(px);
-
-        OpenLayers.Popup.prototype.moveTo.call(this, this.calculateNewPx(px));
-        
-        //if this move has caused the popup to change its relative position, 
-        // we need to make the appropriate cosmetic changes.
-        if (this.relativePosition != oldRelativePosition) {
-            this.updateRelativePosition();
-        }
-    },
-
-    /**
-     * APIMethod: setSize
-     * 
-     * Parameters:
-     * contentSize - {<OpenLayers.Size>} the new size for the popup's 
-     *     contents div (in pixels).
-     */
-    setSize:function(contentSize) { 
-        OpenLayers.Popup.prototype.setSize.apply(this, arguments);
-
-        if ((this.lonlat) && (this.map)) {
-            var px = this.map.getLayerPxFromLonLat(this.lonlat);
-            this.moveTo(px);
-        }
-    },  
-    
-    /** 
-     * Method: calculateRelativePosition
-     * 
-     * Parameters:
-     * px - {<OpenLayers.Pixel>}
-     * 
-     * Returns:
-     * {String} The relative position ("br" "tr" "tl" "bl") at which the popup
-     *     should be placed.
-     */
-    calculateRelativePosition:function(px) {
-        var lonlat = this.map.getLonLatFromLayerPx(px);        
-        
-        var extent = this.map.getExtent();
-        var quadrant = extent.determineQuadrant(lonlat);
-        
-        return OpenLayers.Bounds.oppositeQuadrant(quadrant);
-    }, 
-
-    /**
-     * Method: updateRelativePosition
-     * The popup has been moved to a new relative location, so we may want to 
-     *     make some cosmetic adjustments to it. 
-     * 
-     *     Note that in the classic Anchored popup, there is nothing to do 
-     *     here, since the popup looks exactly the same in all four positions.
-     *     Subclasses such as Framed, however, will want to do something
-     *     special here.
-     */
-    updateRelativePosition: function() {
-        //to be overridden by subclasses
-    },
-
-    /** 
-     * Method: calculateNewPx
-     * 
-     * Parameters:
-     * px - {<OpenLayers.Pixel>}
-     * 
-     * Returns:
-     * {<OpenLayers.Pixel>} The the new px position of the popup on the screen
-     *     relative to the passed-in px.
-     */
-    calculateNewPx:function(px) {
-        var newPx = px.offset(this.anchor.offset);
-        
-        //use contentSize if size is not already set
-        var size = this.size || this.contentSize;
-
-        var top = (this.relativePosition.charAt(0) == 't');
-        newPx.y += (top) ? -size.h : this.anchor.size.h;
-        
-        var left = (this.relativePosition.charAt(1) == 'l');
-        newPx.x += (left) ? -size.w : this.anchor.size.w;
-
-        return newPx;   
-    },
-
-    CLASS_NAME: "OpenLayers.Popup.Anchored"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Popup/Framed.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Popup/Framed.js
deleted file mode 100644
index cb2d5d9c..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Popup/Framed.js
+++ /dev/null
@@ -1,343 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Popup/Anchored.js
- */
-
-/**
- * Class: OpenLayers.Popup.Framed
- * 
- * Inherits from:
- *  - <OpenLayers.Popup.Anchored>
- */
-OpenLayers.Popup.Framed =
-  OpenLayers.Class(OpenLayers.Popup.Anchored, {
-
-    /**
-     * Property: imageSrc
-     * {String} location of the image to be used as the popup frame
-     */
-    imageSrc: null,
-
-    /**
-     * Property: imageSize
-     * {<OpenLayers.Size>} Size (measured in pixels) of the image located
-     *     by the 'imageSrc' property.
-     */
-    imageSize: null,
-
-    /**
-     * APIProperty: isAlphaImage
-     * {Boolean} The image has some alpha and thus needs to use the alpha 
-     *     image hack. Note that setting this to true will have no noticeable
-     *     effect in FF or IE7 browsers, but will all but crush the ie6 
-     *     browser. 
-     *     Default is false.
-     */
-    isAlphaImage: false,
-
-    /**
-     * Property: positionBlocks
-     * {Object} Hash of different position blocks (Object/Hashs). Each block 
-     *     will be keyed by a two-character 'relativePosition' 
-     *     code string (ie "tl", "tr", "bl", "br"). Block properties are 
-     *     'offset', 'padding' (self-explanatory), and finally the 'blocks'
-     *     parameter, which is an array of the block objects. 
-     * 
-     *     Each block object must have 'size', 'anchor', and 'position' 
-     *     properties.
-     * 
-     *     Note that positionBlocks should never be modified at runtime.
-     */
-    positionBlocks: null,
-
-    /**
-     * Property: blocks
-     * {Array[Object]} Array of objects, each of which is one "block" of the 
-     *     popup. Each block has a 'div' and an 'image' property, both of 
-     *     which are DOMElements, and the latter of which is appended to the 
-     *     former. These are reused as the popup goes changing positions for
-     *     great economy and elegance.
-     */
-    blocks: null,
-
-    /** 
-     * APIProperty: fixedRelativePosition
-     * {Boolean} We want the framed popup to work dynamically placed relative
-     *     to its anchor but also in just one fixed position. A well designed
-     *     framed popup will have the pixels and logic to display itself in 
-     *     any of the four relative positions, but (understandably), this will
-     *     not be the case for all of them. By setting this property to 'true', 
-     *     framed popup will not recalculate for the best placement each time
-     *     it's open, but will always open the same way. 
-     *     Note that if this is set to true, it is generally advisable to also
-     *     set the 'panIntoView' property to true so that the popup can be 
-     *     scrolled into view (since it will often be offscreen on open)
-     *     Default is false.
-     */
-    fixedRelativePosition: false,
-
-    /** 
-     * Constructor: OpenLayers.Popup.Framed
-     * 
-     * Parameters:
-     * id - {String}
-     * lonlat - {<OpenLayers.LonLat>}
-     * contentSize - {<OpenLayers.Size>}
-     * contentHTML - {String}
-     * anchor - {Object} Object to which we'll anchor the popup. Must expose 
-     *     a 'size' (<OpenLayers.Size>) and 'offset' (<OpenLayers.Pixel>) 
-     *     (Note that this is generally an <OpenLayers.Icon>).
-     * closeBox - {Boolean}
-     * closeBoxCallback - {Function} Function to be called on closeBox click.
-     */
-    initialize:function(id, lonlat, contentSize, contentHTML, anchor, closeBox, 
-                        closeBoxCallback) {
-
-        OpenLayers.Popup.Anchored.prototype.initialize.apply(this, arguments);
-
-        if (this.fixedRelativePosition) {
-            //based on our decided relativePostion, set the current padding
-            // this keeps us from getting into trouble 
-            this.updateRelativePosition();
-            
-            //make calculateRelativePosition always return the specified
-            // fixed position.
-            this.calculateRelativePosition = function(px) {
-                return this.relativePosition;
-            };
-        }
-
-        this.contentDiv.style.position = "absolute";
-        this.contentDiv.style.zIndex = 1;
-
-        if (closeBox) {
-            this.closeDiv.style.zIndex = 1;
-        }
-
-        this.groupDiv.style.position = "absolute";
-        this.groupDiv.style.top = "0px";
-        this.groupDiv.style.left = "0px";
-        this.groupDiv.style.height = "100%";
-        this.groupDiv.style.width = "100%";
-    },
-
-    /** 
-     * APIMethod: destroy
-     */
-    destroy: function() {
-        this.imageSrc = null;
-        this.imageSize = null;
-        this.isAlphaImage = null;
-
-        this.fixedRelativePosition = false;
-        this.positionBlocks = null;
-
-        //remove our blocks
-        for(var i = 0; i < this.blocks.length; i++) {
-            var block = this.blocks[i];
-
-            if (block.image) {
-                block.div.removeChild(block.image);
-            }
-            block.image = null;
-
-            if (block.div) {
-                this.groupDiv.removeChild(block.div);
-            }
-            block.div = null;
-        }
-        this.blocks = null;
-
-        OpenLayers.Popup.Anchored.prototype.destroy.apply(this, arguments);
-    },
-
-    /**
-     * APIMethod: setBackgroundColor
-     */
-    setBackgroundColor:function(color) {
-        //does nothing since the framed popup's entire scheme is based on a 
-        // an image -- changing the background color makes no sense. 
-    },
-
-    /**
-     * APIMethod: setBorder
-     */
-    setBorder:function() {
-        //does nothing since the framed popup's entire scheme is based on a 
-        // an image -- changing the popup's border makes no sense. 
-    },
-
-    /**
-     * Method: setOpacity
-     * Sets the opacity of the popup.
-     * 
-     * Parameters:
-     * opacity - {float} A value between 0.0 (transparent) and 1.0 (solid).   
-     */
-    setOpacity:function(opacity) {
-        //does nothing since we suppose that we'll never apply an opacity
-        // to a framed popup
-    },
-
-    /**
-     * APIMethod: setSize
-     * Overridden here, because we need to update the blocks whenever the size
-     *     of the popup has changed.
-     * 
-     * Parameters:
-     * contentSize - {<OpenLayers.Size>} the new size for the popup's 
-     *     contents div (in pixels).
-     */
-    setSize:function(contentSize) { 
-        OpenLayers.Popup.Anchored.prototype.setSize.apply(this, arguments);
-
-        this.updateBlocks();
-    },
-
-    /**
-     * Method: updateRelativePosition
-     * When the relative position changes, we need to set the new padding 
-     *     BBOX on the popup, reposition the close div, and update the blocks.
-     */
-    updateRelativePosition: function() {
-
-        //update the padding
-        this.padding = this.positionBlocks[this.relativePosition].padding;
-
-        //update the position of our close box to new padding
-        if (this.closeDiv) {
-            // use the content div's css padding to determine if we should
-            //  padd the close div
-            var contentDivPadding = this.getContentDivPadding();
-
-            this.closeDiv.style.right = contentDivPadding.right + 
-                                        this.padding.right + "px";
-            this.closeDiv.style.top = contentDivPadding.top + 
-                                      this.padding.top + "px";
-        }
-
-        this.updateBlocks();
-    },
-
-    /** 
-     * Method: calculateNewPx
-     * Besides the standard offset as determined by the Anchored class, our 
-     *     Framed popups have a special 'offset' property for each of their 
-     *     positions, which is used to offset the popup relative to its anchor.
-     * 
-     * Parameters:
-     * px - {<OpenLayers.Pixel>}
-     * 
-     * Returns:
-     * {<OpenLayers.Pixel>} The the new px position of the popup on the screen
-     *     relative to the passed-in px.
-     */
-    calculateNewPx:function(px) {
-        var newPx = OpenLayers.Popup.Anchored.prototype.calculateNewPx.apply(
-            this, arguments
-        );
-
-        newPx = newPx.offset(this.positionBlocks[this.relativePosition].offset);
-
-        return newPx;
-    },
-
-    /**
-     * Method: createBlocks
-     */
-    createBlocks: function() {
-        this.blocks = [];
-
-        //since all positions contain the same number of blocks, we can 
-        // just pick the first position and use its blocks array to create
-        // our blocks array
-        var firstPosition = null;
-        for(var key in this.positionBlocks) {
-            firstPosition = key;
-            break;
-        }
-        
-        var position = this.positionBlocks[firstPosition];
-        for (var i = 0; i < position.blocks.length; i++) {
-
-            var block = {};
-            this.blocks.push(block);
-
-            var divId = this.id + '_FrameDecorationDiv_' + i;
-            block.div = OpenLayers.Util.createDiv(divId, 
-                null, null, null, "absolute", null, "hidden", null
-            );
-
-            var imgId = this.id + '_FrameDecorationImg_' + i;
-            var imageCreator = 
-                (this.isAlphaImage) ? OpenLayers.Util.createAlphaImageDiv
-                                    : OpenLayers.Util.createImage;
-
-            block.image = imageCreator(imgId, 
-                null, this.imageSize, this.imageSrc, 
-                "absolute", null, null, null
-            );
-
-            block.div.appendChild(block.image);
-            this.groupDiv.appendChild(block.div);
-        }
-    },
-
-    /**
-     * Method: updateBlocks
-     * Internal method, called on initialize and when the popup's relative
-     *     position has changed. This function takes care of re-positioning
-     *     the popup's blocks in their appropropriate places.
-     */
-    updateBlocks: function() {
-        if (!this.blocks) {
-            this.createBlocks();
-        }
-        
-        if (this.size && this.relativePosition) {
-            var position = this.positionBlocks[this.relativePosition];
-            for (var i = 0; i < position.blocks.length; i++) {
-    
-                var positionBlock = position.blocks[i];
-                var block = this.blocks[i];
-    
-                // adjust sizes
-                var l = positionBlock.anchor.left;
-                var b = positionBlock.anchor.bottom;
-                var r = positionBlock.anchor.right;
-                var t = positionBlock.anchor.top;
-    
-                //note that we use the isNaN() test here because if the 
-                // size object is initialized with a "auto" parameter, the 
-                // size constructor calls parseFloat() on the string, 
-                // which will turn it into NaN
-                //
-                var w = (isNaN(positionBlock.size.w)) ? this.size.w - (r + l) 
-                                                      : positionBlock.size.w;
-    
-                var h = (isNaN(positionBlock.size.h)) ? this.size.h - (b + t) 
-                                                      : positionBlock.size.h;
-    
-                block.div.style.width = (w < 0 ? 0 : w) + 'px';
-                block.div.style.height = (h < 0 ? 0 : h) + 'px';
-    
-                block.div.style.left = (l != null) ? l + 'px' : '';
-                block.div.style.bottom = (b != null) ? b + 'px' : '';
-                block.div.style.right = (r != null) ? r + 'px' : '';            
-                block.div.style.top = (t != null) ? t + 'px' : '';
-    
-                block.image.style.left = positionBlock.position.x + 'px';
-                block.image.style.top = positionBlock.position.y + 'px';
-            }
-    
-            this.contentDiv.style.left = this.padding.left + "px";
-            this.contentDiv.style.top = this.padding.top + "px";
-        }
-    },
-
-    CLASS_NAME: "OpenLayers.Popup.Framed"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Popup/FramedCloud.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Popup/FramedCloud.js
deleted file mode 100644
index 8ad8b948..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Popup/FramedCloud.js
+++ /dev/null
@@ -1,227 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Popup/Framed.js
- * @requires OpenLayers/Util.js
- * @requires OpenLayers/BaseTypes/Bounds.js
- * @requires OpenLayers/BaseTypes/Pixel.js
- * @requires OpenLayers/BaseTypes/Size.js
- */
-
-/**
- * Class: OpenLayers.Popup.FramedCloud
- * 
- * Inherits from: 
- *  - <OpenLayers.Popup.Framed>
- */
-OpenLayers.Popup.FramedCloud = 
-  OpenLayers.Class(OpenLayers.Popup.Framed, {
-
-    /** 
-     * Property: contentDisplayClass
-     * {String} The CSS class of the popup content div.
-     */
-    contentDisplayClass: "olFramedCloudPopupContent",
-
-    /**
-     * APIProperty: autoSize
-     * {Boolean} Framed Cloud is autosizing by default.
-     */
-    autoSize: true,
-
-    /**
-     * APIProperty: panMapIfOutOfView
-     * {Boolean} Framed Cloud does pan into view by default.
-     */
-    panMapIfOutOfView: true,
-
-    /**
-     * APIProperty: imageSize
-     * {<OpenLayers.Size>}
-     */
-    imageSize: new OpenLayers.Size(1276, 736),
-
-    /**
-     * APIProperty: isAlphaImage
-     * {Boolean} The FramedCloud does not use an alpha image (in honor of the 
-     *     good ie6 folk out there)
-     */
-    isAlphaImage: false,
-
-    /** 
-     * APIProperty: fixedRelativePosition
-     * {Boolean} The Framed Cloud popup works in just one fixed position.
-     */
-    fixedRelativePosition: false,
-
-    /**
-     * Property: positionBlocks
-     * {Object} Hash of differen position blocks, keyed by relativePosition
-     *     two-character code string (ie "tl", "tr", "bl", "br")
-     */
-    positionBlocks: {
-        "tl": {
-            'offset': new OpenLayers.Pixel(44, 0),
-            'padding': new OpenLayers.Bounds(8, 40, 8, 9),
-            'blocks': [
-                { // top-left
-                    size: new OpenLayers.Size('auto', 'auto'),
-                    anchor: new OpenLayers.Bounds(0, 51, 22, 0),
-                    position: new OpenLayers.Pixel(0, 0)
-                },
-                { //top-right
-                    size: new OpenLayers.Size(22, 'auto'),
-                    anchor: new OpenLayers.Bounds(null, 50, 0, 0),
-                    position: new OpenLayers.Pixel(-1238, 0)
-                },
-                { //bottom-left
-                    size: new OpenLayers.Size('auto', 19),
-                    anchor: new OpenLayers.Bounds(0, 32, 22, null),
-                    position: new OpenLayers.Pixel(0, -631)
-                },
-                { //bottom-right
-                    size: new OpenLayers.Size(22, 18),
-                    anchor: new OpenLayers.Bounds(null, 32, 0, null),
-                    position: new OpenLayers.Pixel(-1238, -632)
-                },
-                { // stem
-                    size: new OpenLayers.Size(81, 35),
-                    anchor: new OpenLayers.Bounds(null, 0, 0, null),
-                    position: new OpenLayers.Pixel(0, -688)
-                }
-            ]
-        },
-        "tr": {
-            'offset': new OpenLayers.Pixel(-45, 0),
-            'padding': new OpenLayers.Bounds(8, 40, 8, 9),
-            'blocks': [
-                { // top-left
-                    size: new OpenLayers.Size('auto', 'auto'),
-                    anchor: new OpenLayers.Bounds(0, 51, 22, 0),
-                    position: new OpenLayers.Pixel(0, 0)
-                },
-                { //top-right
-                    size: new OpenLayers.Size(22, 'auto'),
-                    anchor: new OpenLayers.Bounds(null, 50, 0, 0),
-                    position: new OpenLayers.Pixel(-1238, 0)
-                },
-                { //bottom-left
-                    size: new OpenLayers.Size('auto', 19),
-                    anchor: new OpenLayers.Bounds(0, 32, 22, null),
-                    position: new OpenLayers.Pixel(0, -631)
-                },
-                { //bottom-right
-                    size: new OpenLayers.Size(22, 19),
-                    anchor: new OpenLayers.Bounds(null, 32, 0, null),
-                    position: new OpenLayers.Pixel(-1238, -631)
-                },
-                { // stem
-                    size: new OpenLayers.Size(81, 35),
-                    anchor: new OpenLayers.Bounds(0, 0, null, null),
-                    position: new OpenLayers.Pixel(-215, -687)
-                }
-            ]
-        },
-        "bl": {
-            'offset': new OpenLayers.Pixel(45, 0),
-            'padding': new OpenLayers.Bounds(8, 9, 8, 40),
-            'blocks': [
-                { // top-left
-                    size: new OpenLayers.Size('auto', 'auto'),
-                    anchor: new OpenLayers.Bounds(0, 21, 22, 32),
-                    position: new OpenLayers.Pixel(0, 0)
-                },
-                { //top-right
-                    size: new OpenLayers.Size(22, 'auto'),
-                    anchor: new OpenLayers.Bounds(null, 21, 0, 32),
-                    position: new OpenLayers.Pixel(-1238, 0)
-                },
-                { //bottom-left
-                    size: new OpenLayers.Size('auto', 21),
-                    anchor: new OpenLayers.Bounds(0, 0, 22, null),
-                    position: new OpenLayers.Pixel(0, -629)
-                },
-                { //bottom-right
-                    size: new OpenLayers.Size(22, 21),
-                    anchor: new OpenLayers.Bounds(null, 0, 0, null),
-                    position: new OpenLayers.Pixel(-1238, -629)
-                },
-                { // stem
-                    size: new OpenLayers.Size(81, 33),
-                    anchor: new OpenLayers.Bounds(null, null, 0, 0),
-                    position: new OpenLayers.Pixel(-101, -674)
-                }
-            ]
-        },
-        "br": {
-            'offset': new OpenLayers.Pixel(-44, 0),
-            'padding': new OpenLayers.Bounds(8, 9, 8, 40),
-            'blocks': [
-                { // top-left
-                    size: new OpenLayers.Size('auto', 'auto'),
-                    anchor: new OpenLayers.Bounds(0, 21, 22, 32),
-                    position: new OpenLayers.Pixel(0, 0)
-                },
-                { //top-right
-                    size: new OpenLayers.Size(22, 'auto'),
-                    anchor: new OpenLayers.Bounds(null, 21, 0, 32),
-                    position: new OpenLayers.Pixel(-1238, 0)
-                },
-                { //bottom-left
-                    size: new OpenLayers.Size('auto', 21),
-                    anchor: new OpenLayers.Bounds(0, 0, 22, null),
-                    position: new OpenLayers.Pixel(0, -629)
-                },
-                { //bottom-right
-                    size: new OpenLayers.Size(22, 21),
-                    anchor: new OpenLayers.Bounds(null, 0, 0, null),
-                    position: new OpenLayers.Pixel(-1238, -629)
-                },
-                { // stem
-                    size: new OpenLayers.Size(81, 33),
-                    anchor: new OpenLayers.Bounds(0, null, null, 0),
-                    position: new OpenLayers.Pixel(-311, -674)
-                }
-            ]
-        }
-    },
-
-    /**
-     * APIProperty: minSize
-     * {<OpenLayers.Size>}
-     */
-    minSize: new OpenLayers.Size(105, 10),
-
-    /**
-     * APIProperty: maxSize
-     * {<OpenLayers.Size>}
-     */
-    maxSize: new OpenLayers.Size(1200, 660),
-
-    /** 
-     * Constructor: OpenLayers.Popup.FramedCloud
-     * 
-     * Parameters:
-     * id - {String}
-     * lonlat - {<OpenLayers.LonLat>}
-     * contentSize - {<OpenLayers.Size>}
-     * contentHTML - {String}
-     * anchor - {Object} Object to which we'll anchor the popup. Must expose 
-     *     a 'size' (<OpenLayers.Size>) and 'offset' (<OpenLayers.Pixel>) 
-     *     (Note that this is generally an <OpenLayers.Icon>).
-     * closeBox - {Boolean}
-     * closeBoxCallback - {Function} Function to be called on closeBox click.
-     */
-    initialize:function(id, lonlat, contentSize, contentHTML, anchor, closeBox, 
-                        closeBoxCallback) {
-
-        this.imageSrc = OpenLayers.Util.getImageLocation('cloud-popup-relative.png');
-        OpenLayers.Popup.Framed.prototype.initialize.apply(this, arguments);
-        this.contentDiv.className = this.contentDisplayClass;
-    },
-
-    CLASS_NAME: "OpenLayers.Popup.FramedCloud"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Projection.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Projection.js
deleted file mode 100644
index 387e26a3..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Projection.js
+++ /dev/null
@@ -1,322 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/BaseTypes/Class.js
- * @requires OpenLayers/Util.js
- */
-
-/**
- * Namespace: OpenLayers.Projection
- * Methods for coordinate transforms between coordinate systems.  By default,
- *     OpenLayers ships with the ability to transform coordinates between
- *     geographic (EPSG:4326) and web or spherical mercator (EPSG:900913 et al.)
- *     coordinate reference systems.  See the <transform> method for details
- *     on usage.
- *
- * Additional transforms may be added by using the <proj4js at http://proj4js.org/>
- *     library.  If the proj4js library is included, the <transform> method 
- *     will work between any two coordinate reference systems with proj4js 
- *     definitions.
- *
- * If the proj4js library is not included, or if you wish to allow transforms
- *     between arbitrary coordinate reference systems, use the <addTransform>
- *     method to register a custom transform method.
- */
-OpenLayers.Projection = OpenLayers.Class({
-
-    /**
-     * Property: proj
-     * {Object} Proj4js.Proj instance.
-     */
-    proj: null,
-    
-    /**
-     * Property: projCode
-     * {String}
-     */
-    projCode: null,
-    
-    /**
-     * Property: titleRegEx
-     * {RegExp} regular expression to strip the title from a proj4js definition
-     */
-    titleRegEx: /\+title=[^\+]*/,
-
-    /**
-     * Constructor: OpenLayers.Projection
-     * This class offers several methods for interacting with a wrapped 
-     *     pro4js projection object. 
-     *
-     * Parameters:
-     * projCode - {String} A string identifying the Well Known Identifier for
-     *    the projection.
-     * options - {Object} An optional object to set additional properties
-     *     on the projection.
-     *
-     * Returns:
-     * {<OpenLayers.Projection>} A projection object.
-     */
-    initialize: function(projCode, options) {
-        OpenLayers.Util.extend(this, options);
-        this.projCode = projCode;
-        if (typeof Proj4js == "object") {
-            this.proj = new Proj4js.Proj(projCode);
-        }
-    },
-    
-    /**
-     * APIMethod: getCode
-     * Get the string SRS code.
-     *
-     * Returns:
-     * {String} The SRS code.
-     */
-    getCode: function() {
-        return this.proj ? this.proj.srsCode : this.projCode;
-    },
-   
-    /**
-     * APIMethod: getUnits
-     * Get the units string for the projection -- returns null if 
-     *     proj4js is not available.
-     *
-     * Returns:
-     * {String} The units abbreviation.
-     */
-    getUnits: function() {
-        return this.proj ? this.proj.units : null;
-    },
-
-    /**
-     * Method: toString
-     * Convert projection to string (getCode wrapper).
-     *
-     * Returns:
-     * {String} The projection code.
-     */
-    toString: function() {
-        return this.getCode();
-    },
-
-    /**
-     * Method: equals
-     * Test equality of two projection instances.  Determines equality based
-     *     soley on the projection code.
-     *
-     * Returns:
-     * {Boolean} The two projections are equivalent.
-     */
-    equals: function(projection) {
-        var p = projection, equals = false;
-        if (p) {
-            if (!(p instanceof OpenLayers.Projection)) {
-                p = new OpenLayers.Projection(p);
-            }
-            if ((typeof Proj4js == "object") && this.proj.defData && p.proj.defData) {
-                equals = this.proj.defData.replace(this.titleRegEx, "") ==
-                    p.proj.defData.replace(this.titleRegEx, "");
-            } else if (p.getCode) {
-                var source = this.getCode(), target = p.getCode();
-                equals = source == target ||
-                    !!OpenLayers.Projection.transforms[source] &&
-                    OpenLayers.Projection.transforms[source][target] ===
-                        OpenLayers.Projection.nullTransform;
-            }
-        }
-        return equals;   
-    },
-
-    /* Method: destroy
-     * Destroy projection object.
-     */
-    destroy: function() {
-        delete this.proj;
-        delete this.projCode;
-    },
-    
-    CLASS_NAME: "OpenLayers.Projection" 
-});     
-
-/**
- * Property: transforms
- * {Object} Transforms is an object, with from properties, each of which may
- * have a to property. This allows you to define projections without 
- * requiring support for proj4js to be included.
- *
- * This object has keys which correspond to a 'source' projection object.  The
- * keys should be strings, corresponding to the projection.getCode() value.
- * Each source projection object should have a set of destination projection
- * keys included in the object. 
- * 
- * Each value in the destination object should be a transformation function,
- * where the function is expected to be passed an object with a .x and a .y
- * property.  The function should return the object, with the .x and .y
- * transformed according to the transformation function.
- *
- * Note - Properties on this object should not be set directly.  To add a
- *     transform method to this object, use the <addTransform> method.  For an
- *     example of usage, see the OpenLayers.Layer.SphericalMercator file.
- */
-OpenLayers.Projection.transforms = {};
-
-/**
- * APIProperty: defaults
- * {Object} Defaults for the SRS codes known to OpenLayers (currently
- * EPSG:4326, CRS:84, urn:ogc:def:crs:EPSG:6.6:4326, EPSG:900913, EPSG:3857,
- * EPSG:102113 and EPSG:102100). Keys are the SRS code, values are units,
- * maxExtent (the validity extent for the SRS) and yx (true if this SRS is
- * known to have a reverse axis order).
- */
-OpenLayers.Projection.defaults = {
-    "EPSG:4326": {
-        units: "degrees",
-        maxExtent: [-180, -90, 180, 90],
-        yx: true
-    },
-    "CRS:84": {
-        units: "degrees",
-        maxExtent: [-180, -90, 180, 90]
-    },
-    "EPSG:900913": {
-        units: "m",
-        maxExtent: [-20037508.34, -20037508.34, 20037508.34, 20037508.34]
-    }
-};
-
-/**
- * APIMethod: addTransform
- * Set a custom transform method between two projections.  Use this method in
- *     cases where the proj4js lib is not available or where custom projections
- *     need to be handled.
- *
- * Parameters:
- * from - {String} The code for the source projection
- * to - {String} the code for the destination projection
- * method - {Function} A function that takes a point as an argument and
- *     transforms that point from the source to the destination projection
- *     in place.  The original point should be modified.
- */
-OpenLayers.Projection.addTransform = function(from, to, method) {
-    if (method === OpenLayers.Projection.nullTransform) {
-        var defaults = OpenLayers.Projection.defaults[from];
-        if (defaults && !OpenLayers.Projection.defaults[to]) {
-            OpenLayers.Projection.defaults[to] = defaults;
-        }
-    }
-    if(!OpenLayers.Projection.transforms[from]) {
-        OpenLayers.Projection.transforms[from] = {};
-    }
-    OpenLayers.Projection.transforms[from][to] = method;
-};
-
-/**
- * APIMethod: transform
- * Transform a point coordinate from one projection to another.  Note that
- *     the input point is transformed in place.
- * 
- * Parameters:
- * point - {<OpenLayers.Geometry.Point> | Object} An object with x and y
- *     properties representing coordinates in those dimensions.
- * source - {OpenLayers.Projection} Source map coordinate system
- * dest - {OpenLayers.Projection} Destination map coordinate system
- *
- * Returns:
- * point - {object} A transformed coordinate.  The original point is modified.
- */
-OpenLayers.Projection.transform = function(point, source, dest) {
-    if (source && dest) {
-        if (!(source instanceof OpenLayers.Projection)) {
-            source = new OpenLayers.Projection(source);
-        }
-        if (!(dest instanceof OpenLayers.Projection)) {
-            dest = new OpenLayers.Projection(dest);
-        }
-        if (source.proj && dest.proj) {
-            point = Proj4js.transform(source.proj, dest.proj, point);
-        } else {
-            var sourceCode = source.getCode();
-            var destCode = dest.getCode();
-            var transforms = OpenLayers.Projection.transforms;
-            if (transforms[sourceCode] && transforms[sourceCode][destCode]) {
-                transforms[sourceCode][destCode](point);
-            }
-        }
-    }
-    return point;
-};
-
-/**
- * APIFunction: nullTransform
- * A null transformation - useful for defining projection aliases when
- * proj4js is not available:
- *
- * (code)
- * OpenLayers.Projection.addTransform("EPSG:3857", "EPSG:900913",
- *     OpenLayers.Projection.nullTransform);
- * OpenLayers.Projection.addTransform("EPSG:900913", "EPSG:3857",
- *     OpenLayers.Projection.nullTransform);
- * (end)
- */
-OpenLayers.Projection.nullTransform = function(point) {
-    return point;
-};
-
-/**
- * Note: Transforms for web mercator <-> geographic
- * OpenLayers recognizes EPSG:3857, EPSG:900913, EPSG:102113 and EPSG:102100.
- * OpenLayers originally started referring to EPSG:900913 as web mercator.
- * The EPSG has declared EPSG:3857 to be web mercator.
- * ArcGIS 10 recognizes the EPSG:3857, EPSG:102113, and EPSG:102100 as
- * equivalent.  See http://blogs.esri.com/Dev/blogs/arcgisserver/archive/2009/11/20/ArcGIS-Online-moving-to-Google-_2F00_-Bing-tiling-scheme_3A00_-What-does-this-mean-for-you_3F00_.aspx#12084.
- * For geographic, OpenLayers recognizes EPSG:4326, CRS:84 and
- * urn:ogc:def:crs:EPSG:6.6:4326. OpenLayers also knows about the reverse axis
- * order for EPSG:4326. 
- */
-(function() {
-
-    var pole = 20037508.34;
-
-    function inverseMercator(xy) {
-        xy.x = 180 * xy.x / pole;
-        xy.y = 180 / Math.PI * (2 * Math.atan(Math.exp((xy.y / pole) * Math.PI)) - Math.PI / 2);
-        return xy;
-    }
-
-    function forwardMercator(xy) {
-        xy.x = xy.x * pole / 180;
-        var y = Math.log(Math.tan((90 + xy.y) * Math.PI / 360)) / Math.PI * pole;
-        xy.y = Math.max(-20037508.34, Math.min(y, 20037508.34));
-        return xy;
-    }
-
-    function map(base, codes) {
-        var add = OpenLayers.Projection.addTransform;
-        var same = OpenLayers.Projection.nullTransform;
-        var i, len, code, other, j;
-        for (i=0, len=codes.length; i<len; ++i) {
-            code = codes[i];
-            add(base, code, forwardMercator);
-            add(code, base, inverseMercator);
-            for (j=i+1; j<len; ++j) {
-                other = codes[j];
-                add(code, other, same);
-                add(other, code, same);
-            }
-        }
-    }
-    
-    // list of equivalent codes for web mercator
-    var mercator = ["EPSG:900913", "EPSG:3857", "EPSG:102113", "EPSG:102100"],
-        geographic = ["CRS:84", "urn:ogc:def:crs:EPSG:6.6:4326", "EPSG:4326"],
-        i;
-    for (i=mercator.length-1; i>=0; --i) {
-        map(mercator[i], geographic);
-    }
-    for (i=geographic.length-1; i>=0; --i) {
-        map(geographic[i], mercator);
-    }
-
-})();
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Protocol.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Protocol.js
deleted file mode 100644
index 7e63439a..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Protocol.js
+++ /dev/null
@@ -1,291 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/BaseTypes/Class.js
- */
-
-/**
- * Class: OpenLayers.Protocol
- * Abstract vector layer protocol class.  Not to be instantiated directly.  Use
- *     one of the protocol subclasses instead.
- */
-OpenLayers.Protocol = OpenLayers.Class({
-    
-    /**
-     * Property: format
-     * {<OpenLayers.Format>} The format used by this protocol.
-     */
-    format: null,
-    
-    /**
-     * Property: options
-     * {Object} Any options sent to the constructor.
-     */
-    options: null,
-
-    /**
-     * Property: autoDestroy
-     * {Boolean} The creator of the protocol can set autoDestroy to false
-     *      to fully control when the protocol is destroyed. Defaults to
-     *      true.
-     */
-    autoDestroy: true,
-   
-    /**
-     * Property: defaultFilter
-     * {<OpenLayers.Filter>} Optional default filter to read requests
-     */
-    defaultFilter: null,
-    
-    /**
-     * Constructor: OpenLayers.Protocol
-     * Abstract class for vector protocols.  Create instances of a subclass.
-     *
-     * Parameters:
-     * options - {Object} Optional object whose properties will be set on the
-     *     instance.
-     */
-    initialize: function(options) {
-        options = options || {};
-        OpenLayers.Util.extend(this, options);
-        this.options = options;
-    },
-
-    /**
-     * Method: mergeWithDefaultFilter
-     * Merge filter passed to the read method with the default one
-     *
-     * Parameters:
-     * filter - {<OpenLayers.Filter>}
-     */
-    mergeWithDefaultFilter: function(filter) {
-        var merged;
-        if (filter && this.defaultFilter) {
-            merged = new OpenLayers.Filter.Logical({
-                type: OpenLayers.Filter.Logical.AND,
-                filters: [this.defaultFilter, filter]
-            });
-        } else {
-            merged = filter || this.defaultFilter || undefined;
-        }
-        return merged;
-    },
-
-    /**
-     * APIMethod: destroy
-     * Clean up the protocol.
-     */
-    destroy: function() {
-        this.options = null;
-        this.format = null;
-    },
-    
-    /**
-     * APIMethod: read
-     * Construct a request for reading new features.
-     *
-     * Parameters:
-     * options - {Object} Optional object for configuring the request.
-     *
-     * Returns:
-     * {<OpenLayers.Protocol.Response>} An <OpenLayers.Protocol.Response>
-     * object, the same object will be passed to the callback function passed
-     * if one exists in the options object.
-     */
-    read: function(options) {
-        options = options || {};
-        options.filter = this.mergeWithDefaultFilter(options.filter);
-    },
-    
-    
-    /**
-     * APIMethod: create
-     * Construct a request for writing newly created features.
-     *
-     * Parameters:
-     * features - {Array({<OpenLayers.Feature.Vector>})} or
-     *            {<OpenLayers.Feature.Vector>}
-     * options - {Object} Optional object for configuring the request.
-     *
-     * Returns:
-     * {<OpenLayers.Protocol.Response>} An <OpenLayers.Protocol.Response>
-     * object, the same object will be passed to the callback function passed
-     * if one exists in the options object.
-     */
-    create: function() {
-    },
-    
-    /**
-     * APIMethod: update
-     * Construct a request updating modified features.
-     *
-     * Parameters:
-     * features - {Array({<OpenLayers.Feature.Vector>})} or
-     *            {<OpenLayers.Feature.Vector>}
-     * options - {Object} Optional object for configuring the request.
-     *
-     * Returns:
-     * {<OpenLayers.Protocol.Response>} An <OpenLayers.Protocol.Response>
-     * object, the same object will be passed to the callback function passed
-     * if one exists in the options object.
-     */
-    update: function() {
-    },
-    
-    /**
-     * APIMethod: delete
-     * Construct a request deleting a removed feature.
-     *
-     * Parameters:
-     * feature - {<OpenLayers.Feature.Vector>}
-     * options - {Object} Optional object for configuring the request.
-     *
-     * Returns:
-     * {<OpenLayers.Protocol.Response>} An <OpenLayers.Protocol.Response>
-     * object, the same object will be passed to the callback function passed
-     * if one exists in the options object.
-     */
-    "delete": function() {
-    },
-
-    /**
-     * APIMethod: commit
-     * Go over the features and for each take action
-     * based on the feature state. Possible actions are create,
-     * update and delete.
-     *
-     * Parameters:
-     * features - {Array({<OpenLayers.Feature.Vector>})}
-     * options - {Object} Object whose possible keys are "create", "update",
-     *      "delete", "callback" and "scope", the values referenced by the
-     *      first three are objects as passed to the "create", "update", and
-     *      "delete" methods, the value referenced by the "callback" key is
-     *      a function which is called when the commit operation is complete
-     *      using the scope referenced by the "scope" key.
-     *
-     * Returns:
-     * {Array({<OpenLayers.Protocol.Response>})} An array of
-     * <OpenLayers.Protocol.Response> objects.
-     */
-    commit: function() {
-    },
-
-    /**
-     * Method: abort
-     * Abort an ongoing request.
-     *
-     * Parameters:
-     * response - {<OpenLayers.Protocol.Response>}
-     */
-    abort: function(response) {
-    },
-   
-    /**
-     * Method: createCallback
-     * Returns a function that applies the given public method with resp and
-     *     options arguments.
-     *
-     * Parameters:
-     * method - {Function} The method to be applied by the callback.
-     * response - {<OpenLayers.Protocol.Response>} The protocol response object.
-     * options - {Object} Options sent to the protocol method
-     */
-    createCallback: function(method, response, options) {
-        return OpenLayers.Function.bind(function() {
-            method.apply(this, [response, options]);
-        }, this);
-    },
-   
-    CLASS_NAME: "OpenLayers.Protocol" 
-});
-
-/**
- * Class: OpenLayers.Protocol.Response
- * Protocols return Response objects to their users.
- */
-OpenLayers.Protocol.Response = OpenLayers.Class({
-    /**
-     * Property: code
-     * {Number} - OpenLayers.Protocol.Response.SUCCESS or
-     *            OpenLayers.Protocol.Response.FAILURE
-     */
-    code: null,
-
-    /**
-     * Property: requestType
-     * {String} The type of request this response corresponds to. Either
-     *      "create", "read", "update" or "delete".
-     */
-    requestType: null,
-
-    /**
-     * Property: last
-     * {Boolean} - true if this is the last response expected in a commit,
-     * false otherwise, defaults to true.
-     */
-    last: true,
-
-    /**
-     * Property: features
-     * {Array({<OpenLayers.Feature.Vector>})} or {<OpenLayers.Feature.Vector>}
-     * The features returned in the response by the server. Depending on the 
-     * protocol's read payload, either features or data will be populated.
-     */
-    features: null,
-
-    /**
-     * Property: data
-     * {Object}
-     * The data returned in the response by the server. Depending on the 
-     * protocol's read payload, either features or data will be populated.
-     */
-    data: null,
-
-    /**
-     * Property: reqFeatures
-     * {Array({<OpenLayers.Feature.Vector>})} or {<OpenLayers.Feature.Vector>}
-     * The features provided by the user and placed in the request by the
-     *      protocol.
-     */
-    reqFeatures: null,
-
-    /**
-     * Property: priv
-     */
-    priv: null,
-
-    /**
-     * Property: error
-     * {Object} The error object in case a service exception was encountered.
-     */
-    error: null,
-
-    /**
-     * Constructor: OpenLayers.Protocol.Response
-     *
-     * Parameters:
-     * options - {Object} Optional object whose properties will be set on the
-     *     instance.
-     */
-    initialize: function(options) {
-        OpenLayers.Util.extend(this, options);
-    },
-
-    /**
-     * Method: success
-     *
-     * Returns:
-     * {Boolean} - true on success, false otherwise
-     */
-    success: function() {
-        return this.code > 0;
-    },
-
-    CLASS_NAME: "OpenLayers.Protocol.Response"
-});
-
-OpenLayers.Protocol.Response.SUCCESS = 1;
-OpenLayers.Protocol.Response.FAILURE = 0;
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Protocol/CSW.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Protocol/CSW.js
deleted file mode 100644
index 5641182b..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Protocol/CSW.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Protocol.js
- */
-
-/**
- * Class: OpenLayers.Protocol.CSW
- * Used to create a versioned CSW protocol. Default version is 2.0.2.
- */
-OpenLayers.Protocol.CSW = function(options) {
-    options = OpenLayers.Util.applyDefaults(
-        options, OpenLayers.Protocol.CSW.DEFAULTS
-    );
-    var cls = OpenLayers.Protocol.CSW["v"+options.version.replace(/\./g, "_")];
-    if(!cls) {
-        throw "Unsupported CSW version: " + options.version;
-    }
-    return new cls(options);
-};
-
-/**
- * Constant: OpenLayers.Protocol.CSW.DEFAULTS
- */
-OpenLayers.Protocol.CSW.DEFAULTS = {
-    "version": "2.0.2"
-};
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Protocol/CSW/v2_0_2.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Protocol/CSW/v2_0_2.js
deleted file mode 100644
index 88bfd754..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Protocol/CSW/v2_0_2.js
+++ /dev/null
@@ -1,127 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Protocol/CSW.js
- * @requires OpenLayers/Format/CSWGetRecords/v2_0_2.js
- */
-
-/**
- * Class: OpenLayers.Protocol.CSW.v2_0_2
- * CS-W (Catalogue services for the Web) version 2.0.2 protocol.
- *
- * Inherits from:
- *  - <OpenLayers.Protocol>
- */
-OpenLayers.Protocol.CSW.v2_0_2 = OpenLayers.Class(OpenLayers.Protocol, {
-
-    /**
-     * Property: formatOptions
-     * {Object} Optional options for the format.  If a format is not provided,
-     *     this property can be used to extend the default format options.
-     */
-    formatOptions: null,
-
-    /**
-     * Constructor: OpenLayers.Protocol.CSW.v2_0_2
-     * A class for CSW version 2.0.2 protocol management.
-     *
-     * Parameters:
-     * options - {Object} Optional object whose properties will be set on the
-     *     instance.
-     */
-    initialize: function(options) {
-        OpenLayers.Protocol.prototype.initialize.apply(this, [options]);
-        if(!options.format) {
-            this.format = new OpenLayers.Format.CSWGetRecords.v2_0_2(OpenLayers.Util.extend({
-            }, this.formatOptions));
-        }
-    },
-
-    /**
-     * APIMethod: destroy
-     * Clean up the protocol.
-     */
-    destroy: function() {
-        if(this.options && !this.options.format) {
-            this.format.destroy();
-        }
-        this.format = null;
-        OpenLayers.Protocol.prototype.destroy.apply(this);
-    },
-
-    /**
-     * Method: read
-     * Construct a request for reading new records from the Catalogue.
-     */
-    read: function(options) {
-        options = OpenLayers.Util.extend({}, options);
-        OpenLayers.Util.applyDefaults(options, this.options || {});
-        var response = new OpenLayers.Protocol.Response({requestType: "read"});
-
-        var data = this.format.write(options.params || options);
-
-        response.priv = OpenLayers.Request.POST({
-            url: options.url,
-            callback: this.createCallback(this.handleRead, response, options),
-            params: options.params,
-            headers: options.headers,
-            data: data
-        });
-
-        return response;
-    },
-
-    /**
-     * Method: handleRead
-     * Deal with response from the read request.
-     *
-     * Parameters:
-     * response - {<OpenLayers.Protocol.Response>} The response object to pass
-     *     to the user callback.
-     *     This response is given a code property, and optionally a data property.
-     *     The latter represents the CSW records as returned by the call to
-     *     the CSW format read method.
-     * options - {Object} The user options passed to the read call.
-     */
-    handleRead: function(response, options) {
-        if(options.callback) {
-            var request = response.priv;
-            if(request.status >= 200 && request.status < 300) {
-                // success
-                response.data = this.parseData(request);
-                response.code = OpenLayers.Protocol.Response.SUCCESS;
-            } else {
-                // failure
-                response.code = OpenLayers.Protocol.Response.FAILURE;
-            }
-            options.callback.call(options.scope, response);
-        }
-    },
-
-    /**
-     * Method: parseData
-     * Read HTTP response body and return records
-     *
-     * Parameters:
-     * request - {XMLHttpRequest} The request object
-     *
-     * Returns:
-     * {Object} The CSW records as returned by the call to the format read method.
-     */
-    parseData: function(request) {
-        var doc = request.responseXML;
-        if(!doc || !doc.documentElement) {
-            doc = request.responseText;
-        }
-        if(!doc || doc.length <= 0) {
-            return null;
-        }
-        return this.format.read(doc);
-    },
-
-    CLASS_NAME: "OpenLayers.Protocol.CSW.v2_0_2"
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Protocol/HTTP.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Protocol/HTTP.js
deleted file mode 100644
index a53b4972..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Protocol/HTTP.js
+++ /dev/null
@@ -1,580 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Protocol.js
- * @requires OpenLayers/Request/XMLHttpRequest.js
- */
-
-/**
- * if application uses the query string, for example, for BBOX parameters,
- * OpenLayers/Format/QueryStringFilter.js should be included in the build config file
- */
-
-/**
- * Class: OpenLayers.Protocol.HTTP
- * A basic HTTP protocol for vector layers.  Create a new instance with the
- *     <OpenLayers.Protocol.HTTP> constructor.
- *
- * Inherits from:
- *  - <OpenLayers.Protocol>
- */
-OpenLayers.Protocol.HTTP = OpenLayers.Class(OpenLayers.Protocol, {
-
-    /**
-     * Property: url
-     * {String} Service URL, read-only, set through the options
-     *     passed to constructor.
-     */
-    url: null,
-
-    /**
-     * Property: headers
-     * {Object} HTTP request headers, read-only, set through the options
-     *     passed to the constructor,
-     *     Example: {'Content-Type': 'plain/text'}
-     */
-    headers: null,
-
-    /**
-     * Property: params
-     * {Object} Parameters of GET requests, read-only, set through the options
-     *     passed to the constructor,
-     *     Example: {'bbox': '5,5,5,5'}
-     */
-    params: null,
-    
-    /**
-     * Property: callback
-     * {Object} Function to be called when the <read>, <create>,
-     *     <update>, <delete> or <commit> operation completes, read-only,
-     *     set through the options passed to the constructor.
-     */
-    callback: null,
-
-    /**
-     * Property: scope
-     * {Object} Callback execution scope, read-only, set through the
-     *     options passed to the constructor.
-     */
-    scope: null,
-
-    /**
-     * APIProperty: readWithPOST
-     * {Boolean} true if read operations are done with POST requests
-     *     instead of GET, defaults to false.
-     */
-    readWithPOST: false,
-
-    /**
-     * APIProperty: updateWithPOST
-     * {Boolean} true if update operations are done with POST requests
-     *     defaults to false.
-     */
-    updateWithPOST: false,
-    
-    /**
-     * APIProperty: deleteWithPOST
-     * {Boolean} true if delete operations are done with POST requests
-     *     defaults to false.
-     *     if true, POST data is set to output of format.write().
-     */
-    deleteWithPOST: false,
-
-    /**
-     * Property: wildcarded.
-     * {Boolean} If true percent signs are added around values
-     *     read from LIKE filters, for example if the protocol
-     *     read method is passed a LIKE filter whose property
-     *     is "foo" and whose value is "bar" the string
-     *     "foo__ilike=%bar%" will be sent in the query string;
-     *     defaults to false.
-     */
-    wildcarded: false,
-
-    /**
-     * APIProperty: srsInBBOX
-     * {Boolean} Include the SRS identifier in BBOX query string parameter.  
-     *     Default is false.  If true and the layer has a projection object set,
-     *     any BBOX filter will be serialized with a fifth item identifying the
-     *     projection.  E.g. bbox=-1000,-1000,1000,1000,EPSG:900913
-     */
-    srsInBBOX: false,
-
-    /**
-     * Constructor: OpenLayers.Protocol.HTTP
-     * A class for giving layers generic HTTP protocol.
-     *
-     * Parameters:
-     * options - {Object} Optional object whose properties will be set on the
-     *     instance.
-     *
-     * Valid options include:
-     * url - {String}
-     * headers - {Object} 
-     * params - {Object} URL parameters for GET requests
-     * format - {<OpenLayers.Format>}
-     * callback - {Function}
-     * scope - {Object}
-     */
-    initialize: function(options) {
-        options = options || {};
-        this.params = {};
-        this.headers = {};
-        OpenLayers.Protocol.prototype.initialize.apply(this, arguments);
-
-        if (!this.filterToParams && OpenLayers.Format.QueryStringFilter) {
-            var format = new OpenLayers.Format.QueryStringFilter({
-                wildcarded: this.wildcarded,
-                srsInBBOX: this.srsInBBOX
-            });
-            this.filterToParams = function(filter, params) {
-                return format.write(filter, params);
-            };
-        }
-    },
-    
-    /**
-     * APIMethod: destroy
-     * Clean up the protocol.
-     */
-    destroy: function() {
-        this.params = null;
-        this.headers = null;
-        OpenLayers.Protocol.prototype.destroy.apply(this);
-    },
-
-    /**
-     * APIMethod: filterToParams
-     * Optional method to translate an <OpenLayers.Filter> object into an object
-     *     that can be serialized as request query string provided.  If a custom
-     *     method is not provided, the filter will be serialized using the 
-     *     <OpenLayers.Format.QueryStringFilter> class.
-     *
-     * Parameters:
-     * filter - {<OpenLayers.Filter>} filter to convert.
-     * params - {Object} The parameters object.
-     *
-     * Returns:
-     * {Object} The resulting parameters object.
-     */
-    
-    /**
-     * APIMethod: read
-     * Construct a request for reading new features.
-     *
-     * Parameters:
-     * options - {Object} Optional object for configuring the request.
-     *     This object is modified and should not be reused.
-     *
-     * Valid options:
-     * url - {String} Url for the request.
-     * params - {Object} Parameters to get serialized as a query string.
-     * headers - {Object} Headers to be set on the request.
-     * filter - {<OpenLayers.Filter>} Filter to get serialized as a
-     *     query string.
-     * readWithPOST - {Boolean} If the request should be done with POST.
-     *
-     * Returns:
-     * {<OpenLayers.Protocol.Response>} A response object, whose "priv" property
-     *     references the HTTP request, this object is also passed to the
-     *     callback function when the request completes, its "features" property
-     *     is then populated with the features received from the server.
-     */
-    read: function(options) {
-        OpenLayers.Protocol.prototype.read.apply(this, arguments);
-        options = options || {};
-        options.params = OpenLayers.Util.applyDefaults(
-            options.params, this.options.params);
-        options = OpenLayers.Util.applyDefaults(options, this.options);
-        if (options.filter && this.filterToParams) {
-            options.params = this.filterToParams(
-                options.filter, options.params
-            );
-        }
-        var readWithPOST = (options.readWithPOST !== undefined) ?
-                           options.readWithPOST : this.readWithPOST;
-        var resp = new OpenLayers.Protocol.Response({requestType: "read"});
-        if(readWithPOST) {
-            var headers = options.headers || {};
-            headers["Content-Type"] = "application/x-www-form-urlencoded";
-            resp.priv = OpenLayers.Request.POST({
-                url: options.url,
-                callback: this.createCallback(this.handleRead, resp, options),
-                data: OpenLayers.Util.getParameterString(options.params),
-                headers: headers
-            });
-        } else {
-            resp.priv = OpenLayers.Request.GET({
-                url: options.url,
-                callback: this.createCallback(this.handleRead, resp, options),
-                params: options.params,
-                headers: options.headers
-            });
-        }
-        return resp;
-    },
-
-    /**
-     * Method: handleRead
-     * Individual callbacks are created for read, create and update, should
-     *     a subclass need to override each one separately.
-     *
-     * Parameters:
-     * resp - {<OpenLayers.Protocol.Response>} The response object to pass to
-     *     the user callback.
-     * options - {Object} The user options passed to the read call.
-     */
-    handleRead: function(resp, options) {
-        this.handleResponse(resp, options);
-    },
-
-    /**
-     * APIMethod: create
-     * Construct a request for writing newly created features.
-     *
-     * Parameters:
-     * features - {Array({<OpenLayers.Feature.Vector>})} or
-     *     {<OpenLayers.Feature.Vector>}
-     * options - {Object} Optional object for configuring the request.
-     *     This object is modified and should not be reused.
-     *
-     * Returns:
-     * {<OpenLayers.Protocol.Response>} An <OpenLayers.Protocol.Response>
-     *     object, whose "priv" property references the HTTP request, this 
-     *     object is also passed to the callback function when the request
-     *     completes, its "features" property is then populated with the
-     *     the features received from the server.
-     */
-    create: function(features, options) {
-        options = OpenLayers.Util.applyDefaults(options, this.options);
-
-        var resp = new OpenLayers.Protocol.Response({
-            reqFeatures: features,
-            requestType: "create"
-        });
-
-        resp.priv = OpenLayers.Request.POST({
-            url: options.url,
-            callback: this.createCallback(this.handleCreate, resp, options),
-            headers: options.headers,
-            data: this.format.write(features)
-        });
-
-        return resp;
-    },
-
-    /**
-     * Method: handleCreate
-     * Called the the request issued by <create> is complete.  May be overridden
-     *     by subclasses.
-     *
-     * Parameters:
-     * resp - {<OpenLayers.Protocol.Response>} The response object to pass to
-     *     any user callback.
-     * options - {Object} The user options passed to the create call.
-     */
-    handleCreate: function(resp, options) {
-        this.handleResponse(resp, options);
-    },
-
-    /**
-     * APIMethod: update
-     * Construct a request updating modified feature.
-     *
-     * Parameters:
-     * feature - {<OpenLayers.Feature.Vector>}
-     * options - {Object} Optional object for configuring the request.
-     *     This object is modified and should not be reused.
-     *
-     * Returns:
-     * {<OpenLayers.Protocol.Response>} An <OpenLayers.Protocol.Response>
-     *     object, whose "priv" property references the HTTP request, this 
-     *     object is also passed to the callback function when the request
-     *     completes, its "features" property is then populated with the
-     *     the feature received from the server.
-     */
-    update: function(feature, options) {
-        options = options || {};
-        var url = options.url ||
-                  feature.url ||
-                  this.options.url + "/" + feature.fid;
-        options = OpenLayers.Util.applyDefaults(options, this.options);
-
-        var resp = new OpenLayers.Protocol.Response({
-            reqFeatures: feature,
-            requestType: "update"
-        });
-
-        var method = this.updateWithPOST ? "POST" : "PUT";
-        resp.priv = OpenLayers.Request[method]({
-            url: url,
-            callback: this.createCallback(this.handleUpdate, resp, options),
-            headers: options.headers,
-            data: this.format.write(feature)
-        });
-
-        return resp;
-    },
-
-    /**
-     * Method: handleUpdate
-     * Called the the request issued by <update> is complete.  May be overridden
-     *     by subclasses.
-     *
-     * Parameters:
-     * resp - {<OpenLayers.Protocol.Response>} The response object to pass to
-     *     any user callback.
-     * options - {Object} The user options passed to the update call.
-     */
-    handleUpdate: function(resp, options) {
-        this.handleResponse(resp, options);
-    },
-
-    /**
-     * APIMethod: delete
-     * Construct a request deleting a removed feature.
-     *
-     * Parameters:
-     * feature - {<OpenLayers.Feature.Vector>}
-     * options - {Object} Optional object for configuring the request.
-     *     This object is modified and should not be reused.
-     *
-     * Returns:
-     * {<OpenLayers.Protocol.Response>} An <OpenLayers.Protocol.Response>
-     *     object, whose "priv" property references the HTTP request, this 
-     *     object is also passed to the callback function when the request
-     *     completes.
-     */
-    "delete": function(feature, options) {
-        options = options || {};
-        var url = options.url ||
-                  feature.url ||
-                  this.options.url + "/" + feature.fid;
-        options = OpenLayers.Util.applyDefaults(options, this.options);
-
-        var resp = new OpenLayers.Protocol.Response({
-            reqFeatures: feature,
-            requestType: "delete"
-        });
-
-        var method = this.deleteWithPOST ? "POST" : "DELETE";
-        var requestOptions = {
-            url: url,
-            callback: this.createCallback(this.handleDelete, resp, options),
-            headers: options.headers
-        };
-        if (this.deleteWithPOST) {
-            requestOptions.data = this.format.write(feature);
-        }
-        resp.priv = OpenLayers.Request[method](requestOptions);
-
-        return resp;
-    },
-
-    /**
-     * Method: handleDelete
-     * Called the the request issued by <delete> is complete.  May be overridden
-     *     by subclasses.
-     *
-     * Parameters:
-     * resp - {<OpenLayers.Protocol.Response>} The response object to pass to
-     *     any user callback.
-     * options - {Object} The user options passed to the delete call.
-     */
-    handleDelete: function(resp, options) {
-        this.handleResponse(resp, options);
-    },
-
-    /**
-     * Method: handleResponse
-     * Called by CRUD specific handlers.
-     *
-     * Parameters:
-     * resp - {<OpenLayers.Protocol.Response>} The response object to pass to
-     *     any user callback.
-     * options - {Object} The user options passed to the create, read, update,
-     *     or delete call.
-     */
-    handleResponse: function(resp, options) {
-        var request = resp.priv;
-        if(options.callback) {
-            if(request.status >= 200 && request.status < 300) {
-                // success
-                if(resp.requestType != "delete") {
-                    resp.features = this.parseFeatures(request);
-                }
-                resp.code = OpenLayers.Protocol.Response.SUCCESS;
-            } else {
-                // failure
-                resp.code = OpenLayers.Protocol.Response.FAILURE;
-            }
-            options.callback.call(options.scope, resp);
-        }
-    },
-
-    /**
-     * Method: parseFeatures
-     * Read HTTP response body and return features.
-     *
-     * Parameters:
-     * request - {XMLHttpRequest} The request object
-     *
-     * Returns:
-     * {Array({<OpenLayers.Feature.Vector>})} or
-     *     {<OpenLayers.Feature.Vector>} Array of features or a single feature.
-     */
-    parseFeatures: function(request) {
-        var doc = request.responseXML;
-        if (!doc || !doc.documentElement) {
-            doc = request.responseText;
-        }
-        if (!doc || doc.length <= 0) {
-            return null;
-        }
-        return this.format.read(doc);
-    },
-
-    /**
-     * APIMethod: commit
-     * Iterate over each feature and take action based on the feature state.
-     *     Possible actions are create, update and delete.
-     *
-     * Parameters:
-     * features - {Array({<OpenLayers.Feature.Vector>})}
-     * options - {Object} Optional object for setting up intermediate commit
-     *     callbacks.
-     *
-     * Valid options:
-     * create - {Object} Optional object to be passed to the <create> method.
-     * update - {Object} Optional object to be passed to the <update> method.
-     * delete - {Object} Optional object to be passed to the <delete> method.
-     * callback - {Function} Optional function to be called when the commit
-     *     is complete.
-     * scope - {Object} Optional object to be set as the scope of the callback.
-     *
-     * Returns:
-     * {Array(<OpenLayers.Protocol.Response>)} An array of response objects,
-     *     one per request made to the server, each object's "priv" property
-     *     references the corresponding HTTP request.
-     */
-    commit: function(features, options) {
-        options = OpenLayers.Util.applyDefaults(options, this.options);
-        var resp = [], nResponses = 0;
-        
-        // Divide up features before issuing any requests.  This properly
-        // counts requests in the event that any responses come in before
-        // all requests have been issued.
-        var types = {};
-        types[OpenLayers.State.INSERT] = [];
-        types[OpenLayers.State.UPDATE] = [];
-        types[OpenLayers.State.DELETE] = [];
-        var feature, list, requestFeatures = [];
-        for(var i=0, len=features.length; i<len; ++i) {
-            feature = features[i];
-            list = types[feature.state];
-            if(list) {
-                list.push(feature);
-                requestFeatures.push(feature); 
-            }
-        }
-        // tally up number of requests
-        var nRequests = (types[OpenLayers.State.INSERT].length > 0 ? 1 : 0) +
-            types[OpenLayers.State.UPDATE].length +
-            types[OpenLayers.State.DELETE].length;
-        
-        // This response will be sent to the final callback after all the others
-        // have been fired.
-        var success = true;
-        var finalResponse = new OpenLayers.Protocol.Response({
-            reqFeatures: requestFeatures        
-        });
-        
-        function insertCallback(response) {
-            var len = response.features ? response.features.length : 0;
-            var fids = new Array(len);
-            for(var i=0; i<len; ++i) {
-                fids[i] = response.features[i].fid;
-            }   
-            finalResponse.insertIds = fids;
-            callback.apply(this, [response]);
-        }
- 
-        function callback(response) {
-            this.callUserCallback(response, options);
-            success = success && response.success();
-            nResponses++;
-            if (nResponses >= nRequests) {
-                if (options.callback) {
-                    finalResponse.code = success ? 
-                        OpenLayers.Protocol.Response.SUCCESS :
-                        OpenLayers.Protocol.Response.FAILURE;
-                    options.callback.apply(options.scope, [finalResponse]);
-                }    
-            }
-        }
-
-        // start issuing requests
-        var queue = types[OpenLayers.State.INSERT];
-        if(queue.length > 0) {
-            resp.push(this.create(
-                queue, OpenLayers.Util.applyDefaults(
-                    {callback: insertCallback, scope: this}, options.create
-                )
-            ));
-        }
-        queue = types[OpenLayers.State.UPDATE];
-        for(var i=queue.length-1; i>=0; --i) {
-            resp.push(this.update(
-                queue[i], OpenLayers.Util.applyDefaults(
-                    {callback: callback, scope: this}, options.update
-                ))
-            );
-        }
-        queue = types[OpenLayers.State.DELETE];
-        for(var i=queue.length-1; i>=0; --i) {
-            resp.push(this["delete"](
-                queue[i], OpenLayers.Util.applyDefaults(
-                    {callback: callback, scope: this}, options["delete"]
-                ))
-            );
-        }
-        return resp;
-    },
-
-    /**
-     * APIMethod: abort
-     * Abort an ongoing request, the response object passed to
-     * this method must come from this HTTP protocol (as a result
-     * of a create, read, update, delete or commit operation).
-     *
-     * Parameters:
-     * response - {<OpenLayers.Protocol.Response>}
-     */
-    abort: function(response) {
-        if (response) {
-            response.priv.abort();
-        }
-    },
-
-    /**
-     * Method: callUserCallback
-     * This method is used from within the commit method each time an
-     *     an HTTP response is received from the server, it is responsible
-     *     for calling the user-supplied callbacks.
-     *
-     * Parameters:
-     * resp - {<OpenLayers.Protocol.Response>}
-     * options - {Object} The map of options passed to the commit call.
-     */
-    callUserCallback: function(resp, options) {
-        var opt = options[resp.requestType];
-        if(opt && opt.callback) {
-            opt.callback.call(opt.scope, resp);
-        }
-    },
-
-    CLASS_NAME: "OpenLayers.Protocol.HTTP" 
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Protocol/SOS.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Protocol/SOS.js
deleted file mode 100644
index 578f3691..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Protocol/SOS.js
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Protocol.js
- */
-
-/**
- * Function: OpenLayers.Protocol.SOS
- * Used to create a versioned SOS protocol.  Default version is 1.0.0.
- *
- * Returns:
- * {<OpenLayers.Protocol>} An SOS protocol for the given version.
- */
-OpenLayers.Protocol.SOS = function(options) {
-    options = OpenLayers.Util.applyDefaults(
-        options, OpenLayers.Protocol.SOS.DEFAULTS
-    );
-    var cls = OpenLayers.Protocol.SOS["v"+options.version.replace(/\./g, "_")];
-    if(!cls) {
-        throw "Unsupported SOS version: " + options.version;
-    }
-    return new cls(options);
-};
-
-/**
- * Constant: OpenLayers.Protocol.SOS.DEFAULTS
- */
-OpenLayers.Protocol.SOS.DEFAULTS = {
-    "version": "1.0.0"
-};
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Protocol/SOS/v1_0_0.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Protocol/SOS/v1_0_0.js
deleted file mode 100644
index 9cf87f53..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Protocol/SOS/v1_0_0.js
+++ /dev/null
@@ -1,133 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Protocol/SOS.js
- * @requires OpenLayers/Format/SOSGetFeatureOfInterest.js
- */
-
-/**
- * Class: OpenLayers.Protocol.SOS.v1_0_0
- * An SOS v1.0.0 Protocol for vector layers.  Create a new instance with the
- *     <OpenLayers.Protocol.SOS.v1_0_0> constructor.
- *
- * Inherits from:
- *  - <OpenLayers.Protocol>
- */
- OpenLayers.Protocol.SOS.v1_0_0 = OpenLayers.Class(OpenLayers.Protocol, {
-
-    /**
-     * APIProperty: fois
-     * {Array(String)} Array of features of interest (foi)
-     */
-    fois: null,
-
-    /**
-     * Property: formatOptions
-     * {Object} Optional options for the format.  If a format is not provided,
-     *     this property can be used to extend the default format options.
-     */
-    formatOptions: null,
-   
-    /**
-     * Constructor: OpenLayers.Protocol.SOS
-     * A class for giving layers an SOS protocol.
-     *
-     * Parameters:
-     * options - {Object} Optional object whose properties will be set on the
-     *     instance.
-     *
-     * Valid options properties:
-     * url - {String} URL to send requests to (required).
-     * fois - {Array} The features of interest (required).
-     */
-    initialize: function(options) {
-        OpenLayers.Protocol.prototype.initialize.apply(this, [options]);
-        if(!options.format) {
-            this.format = new OpenLayers.Format.SOSGetFeatureOfInterest(
-                this.formatOptions);
-        }
-    },
-   
-    /**
-     * APIMethod: destroy
-     * Clean up the protocol.
-     */
-    destroy: function() {
-        if(this.options && !this.options.format) {
-            this.format.destroy();
-        }
-        this.format = null;
-        OpenLayers.Protocol.prototype.destroy.apply(this);
-    },
-
-    /**
-     * APIMethod: read
-     * Construct a request for reading new sensor positions. This is done by
-     *     issuing one GetFeatureOfInterest request.
-     */
-    read: function(options) {
-        options = OpenLayers.Util.extend({}, options);
-        OpenLayers.Util.applyDefaults(options, this.options || {});
-        var response = new OpenLayers.Protocol.Response({requestType: "read"});
-        var format = this.format;
-        var data = OpenLayers.Format.XML.prototype.write.apply(format,
-            [format.writeNode("sos:GetFeatureOfInterest", {fois: this.fois})]
-        );
-        response.priv = OpenLayers.Request.POST({
-            url: options.url,
-            callback: this.createCallback(this.handleRead, response, options),
-            data: data
-        });
-        return response;
-    },
-   
-    /**
-     * Method: handleRead
-     * Deal with response from the read request.
-     *
-     * Parameters:
-     * response - {<OpenLayers.Protocol.Response>} The response object to pass
-     *     to the user callback.
-     * options - {Object} The user options passed to the read call.
-     */
-    handleRead: function(response, options) {
-        if(options.callback) {
-            var request = response.priv;
-            if(request.status >= 200 && request.status < 300) {
-                // success
-                response.features = this.parseFeatures(request);
-                response.code = OpenLayers.Protocol.Response.SUCCESS;
-            } else {
-                // failure
-                response.code = OpenLayers.Protocol.Response.FAILURE;
-            }
-            options.callback.call(options.scope, response);
-        }
-    },
-
-    /**
-     * Method: parseFeatures
-     * Read HTTP response body and return features
-     *
-     * Parameters:
-     * request - {XMLHttpRequest} The request object
-     *
-     * Returns:
-     * {Array({<OpenLayers.Feature.Vector>})} Array of features
-     */
-    parseFeatures: function(request) {
-        var doc = request.responseXML;
-        if(!doc || !doc.documentElement) {
-            doc = request.responseText;
-        }
-        if(!doc || doc.length <= 0) {
-            return null;
-        }
-        return this.format.read(doc);
-    },
-
-    CLASS_NAME: "OpenLayers.Protocol.SOS.v1_0_0"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Protocol/Script.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Protocol/Script.js
deleted file mode 100644
index 93ab32a5..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Protocol/Script.js
+++ /dev/null
@@ -1,377 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Protocol.js
- * @requires OpenLayers/Feature/Vector.js
- * @requires OpenLayers/Format/GeoJSON.js
- */
-
-/**
- * if application uses the query string, for example, for BBOX parameters,
- * OpenLayers/Format/QueryStringFilter.js should be included in the build config file
- */
-
-/**
- * Class: OpenLayers.Protocol.Script
- * A basic Script protocol for vector layers.  Create a new instance with the
- *     <OpenLayers.Protocol.Script> constructor.  A script protocol is used to
- *     get around the same origin policy.  It works with services that return
- *     JSONP - that is, JSON wrapped in a client-specified callback.  The
- *     protocol handles fetching and parsing of feature data and sends parsed
- *     features to the <callback> configured with the protocol.  The protocol
- *     expects features serialized as GeoJSON by default, but can be configured
- *     to work with other formats by setting the <format> property.
- *
- * Inherits from:
- *  - <OpenLayers.Protocol>
- */
-OpenLayers.Protocol.Script = OpenLayers.Class(OpenLayers.Protocol, {
-
-    /**
-     * APIProperty: url
-     * {String} Service URL.  The service is expected to return serialized 
-     *     features wrapped in a named callback (where the callback name is
-     *     generated by this protocol).
-     *     Read-only, set through the options passed to the constructor.
-     */
-    url: null,
-
-    /**
-     * APIProperty: params
-     * {Object} Query string parameters to be appended to the URL.
-     *     Read-only, set through the options passed to the constructor.
-     *     Example: {maxFeatures: 50}
-     */
-    params: null,
-    
-    /**
-     * APIProperty: callback
-     * {Object} Function to be called when the <read> operation completes.
-     */
-    callback: null,
-
-    /**
-     * APIProperty: callbackTemplate
-     * {String} Template for creating a unique callback function name
-     * for the registry. Should include ${id}.  The ${id} variable will be
-     * replaced with a string identifier prefixed with a "c" (e.g. c1, c2).
-     * Default is "OpenLayers.Protocol.Script.registry.${id}".
-     */
-    callbackTemplate: "OpenLayers.Protocol.Script.registry.${id}",
-
-    /**
-     * APIProperty: callbackKey
-     * {String} The name of the query string parameter that the service 
-     *     recognizes as the callback identifier.  Default is "callback".
-     *     This key is used to generate the URL for the script.  For example
-     *     setting <callbackKey> to "myCallback" would result in a URL like 
-     *     http://example.com/?myCallback=...
-     */
-    callbackKey: "callback",
-
-    /**
-     * APIProperty: callbackPrefix
-     * {String} Where a service requires that the callback query string 
-     *     parameter value is prefixed by some string, this value may be set.
-     *     For example, setting <callbackPrefix> to "foo:" would result in a
-     *     URL like http://example.com/?callback=foo:...  Default is "".
-     */
-    callbackPrefix: "",
-
-    /**
-     * APIProperty: scope
-     * {Object} Optional ``this`` object for the callback. Read-only, set 
-     *     through the options passed to the constructor.
-     */
-    scope: null,
-
-    /**
-     * APIProperty: format
-     * {<OpenLayers.Format>} Format for parsing features.  Default is an 
-     *     <OpenLayers.Format.GeoJSON> format.  If an alternative is provided,
-     *     the format's read method must take an object and return an array
-     *     of features.
-     */
-    format: null,
-
-    /**
-     * Property: pendingRequests
-     * {Object} References all pending requests.  Property names are script 
-     *     identifiers and property values are script elements.
-     */
-    pendingRequests: null,
-
-    /**
-     * APIProperty: srsInBBOX
-     * {Boolean} Include the SRS identifier in BBOX query string parameter.
-     *     Setting this property has no effect if a custom filterToParams method
-     *     is provided.   Default is false.  If true and the layer has a 
-     *     projection object set, any BBOX filter will be serialized with a 
-     *     fifth item identifying the projection.  
-     *     E.g. bbox=-1000,-1000,1000,1000,EPSG:900913
-     */
-    srsInBBOX: false,
-
-    /**
-     * Constructor: OpenLayers.Protocol.Script
-     * A class for giving layers generic Script protocol.
-     *
-     * Parameters:
-     * options - {Object} Optional object whose properties will be set on the
-     *     instance.
-     *
-     * Valid options include:
-     * url - {String}
-     * params - {Object}
-     * callback - {Function}
-     * scope - {Object}
-     */
-    initialize: function(options) {
-        options = options || {};
-        this.params = {};
-        this.pendingRequests = {};
-        OpenLayers.Protocol.prototype.initialize.apply(this, arguments);
-        if (!this.format) {
-            this.format = new OpenLayers.Format.GeoJSON();
-        }
-
-        if (!this.filterToParams && OpenLayers.Format.QueryStringFilter) {
-            var format = new OpenLayers.Format.QueryStringFilter({
-                srsInBBOX: this.srsInBBOX
-            });
-            this.filterToParams = function(filter, params) {
-                return format.write(filter, params);
-            };
-        }
-    },
-    
-    /**
-     * APIMethod: read
-     * Construct a request for reading new features.
-     *
-     * Parameters:
-     * options - {Object} Optional object for configuring the request.
-     *     This object is modified and should not be reused.
-     *
-     * Valid options:
-     * url - {String} Url for the request.
-     * params - {Object} Parameters to get serialized as a query string.
-     * filter - {<OpenLayers.Filter>} Filter to get serialized as a
-     *     query string.
-     *
-     * Returns:
-     * {<OpenLayers.Protocol.Response>} A response object, whose "priv" property
-     *     references the injected script.  This object is also passed to the
-     *     callback function when the request completes, its "features" property
-     *     is then populated with the features received from the server.
-     */
-    read: function(options) {
-        OpenLayers.Protocol.prototype.read.apply(this, arguments);
-        options = OpenLayers.Util.applyDefaults(options, this.options);
-        options.params = OpenLayers.Util.applyDefaults(
-            options.params, this.options.params
-        );
-        if (options.filter && this.filterToParams) {
-            options.params = this.filterToParams(
-                options.filter, options.params
-            );
-        }
-        var response = new OpenLayers.Protocol.Response({requestType: "read"});
-        var request = this.createRequest(
-            options.url, 
-            options.params, 
-            OpenLayers.Function.bind(function(data) {
-                response.data = data;
-                this.handleRead(response, options);
-            }, this)
-        );
-        response.priv = request;
-        return response;
-    },
-
-    /** 
-     * APIMethod: filterToParams 
-     * Optional method to translate an <OpenLayers.Filter> object into an object 
-     *     that can be serialized as request query string provided.  If a custom 
-     *     method is not provided, any filter will not be serialized. 
-     * 
-     * Parameters: 
-     * filter - {<OpenLayers.Filter>} filter to convert. 
-     * params - {Object} The parameters object. 
-     * 
-     * Returns: 
-     * {Object} The resulting parameters object. 
-     */
-
-    /** 
-     * Method: createRequest
-     * Issues a request for features by creating injecting a script in the 
-     *     document head.
-     *
-     * Parameters:
-     * url - {String} Service URL.
-     * params - {Object} Query string parameters.
-     * callback - {Function} Callback to be called with resulting data.
-     *
-     * Returns:
-     * {HTMLScriptElement} The script pending execution.
-     */
-    createRequest: function(url, params, callback) {
-        var id = OpenLayers.Protocol.Script.register(callback);
-        var name = OpenLayers.String.format(this.callbackTemplate, {id: id});
-        params = OpenLayers.Util.extend({}, params);
-        params[this.callbackKey] = this.callbackPrefix + name;
-        url = OpenLayers.Util.urlAppend(
-            url, OpenLayers.Util.getParameterString(params)
-        );
-        var script = document.createElement("script");
-        script.type = "text/javascript";
-        script.src = url;
-        script.id = "OpenLayers_Protocol_Script_" + id;
-        this.pendingRequests[script.id] = script;
-        var head = document.getElementsByTagName("head")[0];
-        head.appendChild(script);
-        return script;
-    },
-    
-    /** 
-     * Method: destroyRequest
-     * Remove a script node associated with a response from the document.  Also
-     *     unregisters the callback and removes the script from the 
-     *     <pendingRequests> object.
-     *
-     * Parameters:
-     * script - {HTMLScriptElement}
-     */
-    destroyRequest: function(script) {
-        OpenLayers.Protocol.Script.unregister(script.id.split("_").pop());
-        delete this.pendingRequests[script.id];
-        if (script.parentNode) {
-            script.parentNode.removeChild(script);
-        }
-    },
-
-    /**
-     * Method: handleRead
-     * Individual callbacks are created for read, create and update, should
-     *     a subclass need to override each one separately.
-     *
-     * Parameters:
-     * response - {<OpenLayers.Protocol.Response>} The response object to pass to
-     *     the user callback.
-     * options - {Object} The user options passed to the read call.
-     */
-    handleRead: function(response, options) {
-        this.handleResponse(response, options);
-    },
-
-    /**
-     * Method: handleResponse
-     * Called by CRUD specific handlers.
-     *
-     * Parameters:
-     * response - {<OpenLayers.Protocol.Response>} The response object to pass to
-     *     any user callback.
-     * options - {Object} The user options passed to the create, read, update,
-     *     or delete call.
-     */
-    handleResponse: function(response, options) {
-        if (options.callback) {
-            if (response.data) {
-                response.features = this.parseFeatures(response.data);
-                response.code = OpenLayers.Protocol.Response.SUCCESS;
-            } else {
-                response.code = OpenLayers.Protocol.Response.FAILURE;
-            }
-            this.destroyRequest(response.priv);
-            options.callback.call(options.scope, response);
-        }
-    },
-
-    /**
-     * Method: parseFeatures
-     * Read Script response body and return features.
-     *
-     * Parameters:
-     * data - {Object} The data sent to the callback function by the server.
-     *
-     * Returns:
-     * {Array({<OpenLayers.Feature.Vector>})} or
-     *     {<OpenLayers.Feature.Vector>} Array of features or a single feature.
-     */
-    parseFeatures: function(data) {
-        return this.format.read(data);
-    },
-
-    /**
-     * APIMethod: abort
-     * Abort an ongoing request.  If no response is provided, all pending 
-     *     requests will be aborted.
-     *
-     * Parameters:
-     * response - {<OpenLayers.Protocol.Response>} The response object returned
-     *     from a <read> request.
-     */
-    abort: function(response) {
-        if (response) {
-            this.destroyRequest(response.priv);
-        } else {
-            for (var key in this.pendingRequests) {
-                this.destroyRequest(this.pendingRequests[key]);
-            }
-        }
-    },
-    
-    /**
-     * APIMethod: destroy
-     * Clean up the protocol.
-     */
-    destroy: function() {
-        this.abort();
-        delete this.params;
-        delete this.format;
-        OpenLayers.Protocol.prototype.destroy.apply(this);
-    },
-
-    CLASS_NAME: "OpenLayers.Protocol.Script" 
-});
-
-(function() {
-    var o = OpenLayers.Protocol.Script;
-    var counter = 0;
-    o.registry = {};
-    
-    /**
-     * Function: OpenLayers.Protocol.Script.register
-     * Register a callback for a newly created script.
-     *
-     * Parameters:
-     * callback - {Function} The callback to be executed when the newly added
-     *     script loads.  This callback will be called with a single argument
-     *     that is the JSON returned by the service.
-     *
-     * Returns:
-     * {Number} An identifier for retrieving the registered callback.
-     */
-    o.register = function(callback) {
-        var id = "c"+(++counter);
-        o.registry[id] = function() {
-            callback.apply(this, arguments);
-        };
-        return id;
-    };
-    
-    /**
-     * Function: OpenLayers.Protocol.Script.unregister
-     * Unregister a callback previously registered with the register function.
-     *
-     * Parameters:
-     * id - {Number} The identifer returned by the register function.
-     */
-    o.unregister = function(id) {
-        delete o.registry[id];
-    };
-})();
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Protocol/WFS.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Protocol/WFS.js
deleted file mode 100644
index 66faf43e..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Protocol/WFS.js
+++ /dev/null
@@ -1,86 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Protocol.js
- */
-
-/**
- * Class: OpenLayers.Protocol.WFS
- * Used to create a versioned WFS protocol.  Default version is 1.0.0.
- *
- * Returns:
- * {<OpenLayers.Protocol>} A WFS protocol of the given version.
- *
- * Example:
- * (code)
- *     var protocol = new OpenLayers.Protocol.WFS({
- *         version: "1.1.0",
- *         url:  "http://demo.opengeo.org/geoserver/wfs",
- *         featureType: "tasmania_roads",
- *         featureNS: "http://www.openplans.org/topp",
- *         geometryName: "the_geom"
- *     });
- * (end)
- *
- * See the protocols for specific WFS versions for more detail.
- */
-OpenLayers.Protocol.WFS = function(options) {
-    options = OpenLayers.Util.applyDefaults(
-        options, OpenLayers.Protocol.WFS.DEFAULTS
-    );
-    var cls = OpenLayers.Protocol.WFS["v"+options.version.replace(/\./g, "_")];
-    if(!cls) {
-        throw "Unsupported WFS version: " + options.version;
-    }
-    return new cls(options);
-};
-
-/**
- * Function: fromWMSLayer
- * Convenience function to create a WFS protocol from a WMS layer.  This makes
- *     the assumption that a WFS requests can be issued at the same URL as
- *     WMS requests and that a WFS featureType exists with the same name as the
- *     WMS layer.
- *     
- * This function is designed to auto-configure <url>, <featureType>,
- *     <featurePrefix> and <srsName> for WFS <version> 1.1.0. Note that
- *     srsName matching with the WMS layer will not work with WFS 1.0.0.
- * 
- * Parameters:
- * layer - {<OpenLayers.Layer.WMS>} WMS layer that has a matching WFS
- *     FeatureType at the same server url with the same typename.
- * options - {Object} Default properties to be set on the protocol.
- *
- * Returns:
- * {<OpenLayers.Protocol.WFS>}
- */
-OpenLayers.Protocol.WFS.fromWMSLayer = function(layer, options) {
-    var typeName, featurePrefix;
-    var param = layer.params["LAYERS"];
-    var parts = (OpenLayers.Util.isArray(param) ? param[0] : param).split(":");
-    if(parts.length > 1) {
-        featurePrefix = parts[0];
-    }
-    typeName = parts.pop();
-    var protocolOptions = {
-        url: layer.url,
-        featureType: typeName,
-        featurePrefix: featurePrefix,
-        srsName: layer.projection && layer.projection.getCode() ||
-                 layer.map && layer.map.getProjectionObject().getCode(),
-        version: "1.1.0"
-    };
-    return new OpenLayers.Protocol.WFS(OpenLayers.Util.applyDefaults(
-        options, protocolOptions
-    ));
-};
-
-/**
- * Constant: OpenLayers.Protocol.WFS.DEFAULTS
- */
-OpenLayers.Protocol.WFS.DEFAULTS = {
-    "version": "1.0.0"
-};
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Protocol/WFS/v1.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Protocol/WFS/v1.js
deleted file mode 100644
index 8a21d7e1..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Protocol/WFS/v1.js
+++ /dev/null
@@ -1,453 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Protocol/WFS.js
- */
-
-/**
- * Class: OpenLayers.Protocol.WFS.v1
- * Abstract class for for v1.0.0 and v1.1.0 protocol.
- *
- * Inherits from:
- *  - <OpenLayers.Protocol>
- */
-OpenLayers.Protocol.WFS.v1 = OpenLayers.Class(OpenLayers.Protocol, {
-    
-    /**
-     * Property: version
-     * {String} WFS version number.
-     */
-    version: null,
-    
-    /**
-     * Property: srsName
-     * {String} Name of spatial reference system.  Default is "EPSG:4326".
-     */
-    srsName: "EPSG:4326",
-    
-    /**
-     * Property: featureType
-     * {String} Local feature typeName.
-     */
-    featureType: null,
-    
-    /**
-     * Property: featureNS
-     * {String} Feature namespace.
-     */
-    featureNS: null,
-    
-    /**
-     * Property: geometryName
-     * {String} Name of the geometry attribute for features.  Default is
-     *     "the_geom" for WFS <version> 1.0, and null for higher versions.
-     */
-    geometryName: "the_geom",
-
-    /**
-     * Property: maxFeatures
-     * {Integer} Optional maximum number of features to retrieve.
-     */
-    
-    /**
-     * Property: schema
-     * {String} Optional schema location that will be included in the
-     *     schemaLocation attribute value.  Note that the feature type schema
-     *     is required for a strict XML validator (on transactions with an
-     *     insert for example), but is *not* required by the WFS specification
-     *     (since the server is supposed to know about feature type schemas).
-     */
-    schema: null,
-
-    /**
-     * Property: featurePrefix
-     * {String} Namespace alias for feature type.  Default is "feature".
-     */
-    featurePrefix: "feature",
-    
-    /**
-     * Property: formatOptions
-     * {Object} Optional options for the format.  If a format is not provided,
-     *     this property can be used to extend the default format options.
-     */
-    formatOptions: null,
-
-    /** 
-     * Property: readFormat 
-     * {<OpenLayers.Format>} For WFS requests it is possible to get a  
-     *     different output format than GML. In that case, we cannot parse  
-     *     the response with the default format (WFST) and we need a different 
-     *     format for reading. 
-     */ 
-    readFormat: null,
-    
-    /**
-     * Property: readOptions
-     * {Object} Optional object to pass to format's read.
-     */
-    readOptions: null,
-    
-    /**
-     * Constructor: OpenLayers.Protocol.WFS
-     * A class for giving layers WFS protocol.
-     *
-     * Parameters:
-     * options - {Object} Optional object whose properties will be set on the
-     *     instance.
-     *
-     * Valid options properties:
-     * url - {String} URL to send requests to (required).
-     * featureType - {String} Local (without prefix) feature typeName (required).
-     * featureNS - {String} Feature namespace (required, but can be autodetected
-     *     during the first query if GML is used as readFormat and
-     *     featurePrefix is provided and matches the prefix used by the server
-     *     for this featureType).
-     * featurePrefix - {String} Feature namespace alias (optional - only used
-     *     for writing if featureNS is provided).  Default is 'feature'.
-     * geometryName - {String} Name of geometry attribute.  The default is
-     *     'the_geom' for WFS <version> 1.0, and null for higher versions. If
-     *     null, it will be set to the name of the first geometry found in the
-     *     first read operation.
-     * multi - {Boolean} If set to true, geometries will be casted to Multi
-     *     geometries before they are written in a transaction. No casting will
-     *     be done when reading features.
-     */
-    initialize: function(options) {
-        OpenLayers.Protocol.prototype.initialize.apply(this, [options]);
-        if(!options.format) {
-            this.format = OpenLayers.Format.WFST(OpenLayers.Util.extend({
-                version: this.version,
-                featureType: this.featureType,
-                featureNS: this.featureNS,
-                featurePrefix: this.featurePrefix,
-                geometryName: this.geometryName,
-                srsName: this.srsName,
-                schema: this.schema
-            }, this.formatOptions));
-        }
-        if (!options.geometryName && parseFloat(this.format.version) > 1.0) {
-            this.setGeometryName(null);
-        }
-    },
-    
-    /**
-     * APIMethod: destroy
-     * Clean up the protocol.
-     */
-    destroy: function() {
-        if(this.options && !this.options.format) {
-            this.format.destroy();
-        }
-        this.format = null;
-        OpenLayers.Protocol.prototype.destroy.apply(this);
-    },
-
-    /**
-     * APIMethod: read
-     * Construct a request for reading new features.  Since WFS splits the
-     *     basic CRUD operations into GetFeature requests (for read) and
-     *     Transactions (for all others), this method does not make use of the
-     *     format's read method (that is only about reading transaction
-     *     responses).
-     *
-     * Parameters:
-     * options - {Object} Options for the read operation, in addition to the
-     *     options set on the instance (options set here will take precedence).
-     *
-     * To use a configured protocol to get e.g. a WFS hit count, applications
-     * could do the following:
-     *
-     * (code)
-     * protocol.read({
-     *     readOptions: {output: "object"},
-     *     resultType: "hits",
-     *     maxFeatures: null,
-     *     callback: function(resp) {
-     *         // process resp.numberOfFeatures here
-     *     }
-     * });
-     * (end)
-     *
-     * To use a configured protocol to use WFS paging (if supported by the
-     * server), applications could do the following:
-     *
-     * (code)
-     * protocol.read({
-     *     startIndex: 0,
-     *     count: 50
-     * });
-     * (end)
-     *
-     * To limit the attributes returned by the GetFeature request, applications
-     * can use the propertyNames option to specify the properties to include in
-     * the response:
-     *
-     * (code)
-     * protocol.read({
-     *     propertyNames: ["DURATION", "INTENSITY"]
-     * });
-     * (end)
-     */
-    read: function(options) {
-        OpenLayers.Protocol.prototype.read.apply(this, arguments);
-        options = OpenLayers.Util.extend({}, options);
-        OpenLayers.Util.applyDefaults(options, this.options || {});
-        var response = new OpenLayers.Protocol.Response({requestType: "read"});
-        
-        var data = OpenLayers.Format.XML.prototype.write.apply(
-            this.format, [this.format.writeNode("wfs:GetFeature", options)]
-        );
-
-        response.priv = OpenLayers.Request.POST({
-            url: options.url,
-            callback: this.createCallback(this.handleRead, response, options),
-            params: options.params,
-            headers: options.headers,
-            data: data
-        });
-
-        return response;
-    },
-
-    /**
-     * APIMethod: setFeatureType
-     * Change the feature type on the fly.
-     *
-     * Parameters:
-     * featureType - {String} Local (without prefix) feature typeName.
-     */
-    setFeatureType: function(featureType) {
-        this.featureType = featureType;
-        this.format.featureType = featureType;
-    },
- 
-    /**
-     * APIMethod: setGeometryName
-     * Sets the geometryName option after instantiation.
-     *
-     * Parameters:
-     * geometryName - {String} Name of geometry attribute.
-     */
-    setGeometryName: function(geometryName) {
-        this.geometryName = geometryName;
-        this.format.geometryName = geometryName;
-    },
-    
-    /**
-     * Method: handleRead
-     * Deal with response from the read request.
-     *
-     * Parameters:
-     * response - {<OpenLayers.Protocol.Response>} The response object to pass
-     *     to the user callback.
-     * options - {Object} The user options passed to the read call.
-     */
-    handleRead: function(response, options) {
-        options = OpenLayers.Util.extend({}, options);
-        OpenLayers.Util.applyDefaults(options, this.options);
-
-        if(options.callback) {
-            var request = response.priv;
-            if(request.status >= 200 && request.status < 300) {
-                // success
-                var result = this.parseResponse(request, options.readOptions);
-                if (result && result.success !== false) { 
-                    if (options.readOptions && options.readOptions.output == "object") {
-                        OpenLayers.Util.extend(response, result);
-                    } else {
-                        response.features = result;
-                    }
-                    response.code = OpenLayers.Protocol.Response.SUCCESS;
-                } else {
-                    // failure (service exception)
-                    response.code = OpenLayers.Protocol.Response.FAILURE;
-                    response.error = result;
-                }
-            } else {
-                // failure
-                response.code = OpenLayers.Protocol.Response.FAILURE;
-            }
-            options.callback.call(options.scope, response);
-        }
-    },
-
-    /**
-     * Method: parseResponse
-     * Read HTTP response body and return features
-     *
-     * Parameters:
-     * request - {XMLHttpRequest} The request object
-     * options - {Object} Optional object to pass to format's read
-     *
-     * Returns:
-     * {Object} or {Array({<OpenLayers.Feature.Vector>})} or
-     *     {<OpenLayers.Feature.Vector>} 
-     * An object with a features property, an array of features or a single 
-     * feature.
-     */
-    parseResponse: function(request, options) {
-        var doc = request.responseXML;
-        if(!doc || !doc.documentElement) {
-            doc = request.responseText;
-        }
-        if(!doc || doc.length <= 0) {
-            return null;
-        }
-        var result = (this.readFormat !== null) ? this.readFormat.read(doc) : 
-            this.format.read(doc, options);
-        if (!this.featureNS) {
-            var format = this.readFormat || this.format;
-            this.featureNS = format.featureNS;
-            // no need to auto-configure again on subsequent reads
-            format.autoConfig = false;
-            if (!this.geometryName) {
-                this.setGeometryName(format.geometryName);
-            }
-        }
-        return result;
-    },
-
-    /**
-     * Method: commit
-     * Given a list of feature, assemble a batch request for update, create,
-     *     and delete transactions.  A commit call on the prototype amounts
-     *     to writing a WFS transaction - so the write method on the format
-     *     is used.
-     *
-     * Parameters:
-     * features - {Array(<OpenLayers.Feature.Vector>)}
-     * options - {Object}
-     *
-     * Valid options properties:
-     * nativeElements - {Array({Object})} Array of objects with information for writing
-     * out <Native> elements, these objects have vendorId, safeToIgnore and
-     * value properties. The <Native> element is intended to allow access to 
-     * vendor specific capabilities of any particular web feature server or 
-     * datastore.
-     *
-     * Returns:
-     * {<OpenLayers.Protocol.Response>} A response object with a features
-     *     property containing any insertIds and a priv property referencing
-     *     the XMLHttpRequest object.
-     */
-    commit: function(features, options) {
-
-        options = OpenLayers.Util.extend({}, options);
-        OpenLayers.Util.applyDefaults(options, this.options);
-        
-        var response = new OpenLayers.Protocol.Response({
-            requestType: "commit",
-            reqFeatures: features
-        });
-        response.priv = OpenLayers.Request.POST({
-            url: options.url,
-            headers: options.headers,
-            data: this.format.write(features, options),
-            callback: this.createCallback(this.handleCommit, response, options)
-        });
-        
-        return response;
-    },
-    
-    /**
-     * Method: handleCommit
-     * Called when the commit request returns.
-     * 
-     * Parameters:
-     * response - {<OpenLayers.Protocol.Response>} The response object to pass
-     *     to the user callback.
-     * options - {Object} The user options passed to the commit call.
-     */
-    handleCommit: function(response, options) {
-        if(options.callback) {
-            var request = response.priv;
-
-            // ensure that we have an xml doc
-            var data = request.responseXML;
-            if(!data || !data.documentElement) {
-                data = request.responseText;
-            }
-            
-            var obj = this.format.read(data) || {};
-            
-            response.insertIds = obj.insertIds || [];
-            if (obj.success) {
-                response.code = OpenLayers.Protocol.Response.SUCCESS;
-            } else {
-                response.code = OpenLayers.Protocol.Response.FAILURE;
-                response.error = obj;
-            }
-            options.callback.call(options.scope, response);
-        }
-    },
-    
-    /**
-     * Method: filterDelete
-     * Send a request that deletes all features by their filter.
-     * 
-     * Parameters:
-     * filter - {<OpenLayers.Filter>} filter
-     */
-    filterDelete: function(filter, options) {
-        options = OpenLayers.Util.extend({}, options);
-        OpenLayers.Util.applyDefaults(options, this.options);    
-        
-        var response = new OpenLayers.Protocol.Response({
-            requestType: "commit"
-        });    
-        
-        var root = this.format.createElementNSPlus("wfs:Transaction", {
-            attributes: {
-                service: "WFS",
-                version: this.version
-            }
-        });
-        
-        var deleteNode = this.format.createElementNSPlus("wfs:Delete", {
-            attributes: {
-                typeName: (options.featureNS ? this.featurePrefix + ":" : "") +
-                    options.featureType
-            }
-        });       
-        
-        if(options.featureNS) {
-            deleteNode.setAttribute("xmlns:" + this.featurePrefix, options.featureNS);
-        }
-        var filterNode = this.format.writeNode("ogc:Filter", filter);
-        
-        deleteNode.appendChild(filterNode);
-        
-        root.appendChild(deleteNode);
-        
-        var data = OpenLayers.Format.XML.prototype.write.apply(
-            this.format, [root]
-        );
-        
-        return OpenLayers.Request.POST({
-            url: this.url,
-            callback : options.callback || function(){},
-            data: data
-        });   
-        
-    },
-
-    /**
-     * Method: abort
-     * Abort an ongoing request, the response object passed to
-     * this method must come from this protocol (as a result
-     * of a read, or commit operation).
-     *
-     * Parameters:
-     * response - {<OpenLayers.Protocol.Response>}
-     */
-    abort: function(response) {
-        if (response) {
-            response.priv.abort();
-        }
-    },
-  
-    CLASS_NAME: "OpenLayers.Protocol.WFS.v1" 
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Protocol/WFS/v1_0_0.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Protocol/WFS/v1_0_0.js
deleted file mode 100644
index b1e2ca16..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Protocol/WFS/v1_0_0.js
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Protocol/WFS/v1.js
- * @requires OpenLayers/Format/WFST/v1_0_0.js
- */
-
-/**
- * Class: OpenLayers.Protocol.WFS.v1_0_0
- * A WFS v1.0.0 protocol for vector layers.  Create a new instance with the
- *     <OpenLayers.Protocol.WFS.v1_0_0> constructor.
- *
- * Inherits from:
- *  - <OpenLayers.Protocol.WFS.v1>
- */
-OpenLayers.Protocol.WFS.v1_0_0 = OpenLayers.Class(OpenLayers.Protocol.WFS.v1, {
-    
-    /**
-     * Property: version
-     * {String} WFS version number.
-     */
-    version: "1.0.0",
-    
-    /**
-     * Constructor: OpenLayers.Protocol.WFS.v1_0_0
-     * A class for giving layers WFS v1.0.0 protocol.
-     *
-     * Parameters:
-     * options - {Object} Optional object whose properties will be set on the
-     *     instance.
-     *
-     * Valid options properties:
-     * featureType - {String} Local (without prefix) feature typeName (required).
-     * featureNS - {String} Feature namespace (optional).
-     * featurePrefix - {String} Feature namespace alias (optional - only used
-     *     if featureNS is provided).  Default is 'feature'.
-     * geometryName - {String} Name of geometry attribute.  Default is 'the_geom'.
-     */
-   
-    CLASS_NAME: "OpenLayers.Protocol.WFS.v1_0_0" 
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Protocol/WFS/v1_1_0.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Protocol/WFS/v1_1_0.js
deleted file mode 100644
index 97991a61..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Protocol/WFS/v1_1_0.js
+++ /dev/null
@@ -1,68 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Protocol/WFS/v1.js
- * @requires OpenLayers/Format/WFST/v1_1_0.js
- */
-
-/**
- * Class: OpenLayers.Protocol.WFS.v1_1_0
- * A WFS v1.1.0 protocol for vector layers.  Create a new instance with the
- *     <OpenLayers.Protocol.WFS.v1_1_0> constructor.
- *
- * Differences from the v1.0.0 protocol:
- *  - uses Filter Encoding 1.1.0 instead of 1.0.0
- *  - uses GML 3 instead of 2 if no format is provided
- *  
- * Inherits from:
- *  - <OpenLayers.Protocol.WFS.v1>
- */
-OpenLayers.Protocol.WFS.v1_1_0 = OpenLayers.Class(OpenLayers.Protocol.WFS.v1, {
-    
-    /**
-     * Property: version
-     * {String} WFS version number.
-     */
-    version: "1.1.0",
-    
-    /**
-     * Constructor: OpenLayers.Protocol.WFS.v1_1_0
-     * A class for giving layers WFS v1.1.0 protocol.
-     *
-     * Parameters:
-     * options - {Object} Optional object whose properties will be set on the
-     *     instance.
-     *
-     * Valid options properties:
-     * featureType - {String} Local (without prefix) feature typeName (required).
-     * featureNS - {String} Feature namespace (optional).
-     * featurePrefix - {String} Feature namespace alias (optional - only used
-     *     if featureNS is provided).  Default is 'feature'.
-     * geometryName - {String} Name of geometry attribute.  Default is 'the_geom'.
-     * outputFormat - {String} Optional output format to use for WFS GetFeature
-     *     requests. This can be any format advertized by the WFS's
-     *     GetCapabilities response. If set, an appropriate readFormat also
-     *     has to be provided, unless outputFormat is GML3, GML2 or JSON.
-     * readFormat - {<OpenLayers.Format>} An appropriate format parser if
-     *     outputFormat is none of GML3, GML2 or JSON.
-     */
-    initialize: function(options) {
-        OpenLayers.Protocol.WFS.v1.prototype.initialize.apply(this, arguments);
-        if (this.outputFormat && !this.readFormat) {
-            if (this.outputFormat.toLowerCase() == "gml2") {
-                this.readFormat = new OpenLayers.Format.GML.v2({
-                    featureType: this.featureType,
-                    featureNS: this.featureNS,
-                    geometryName: this.geometryName
-                });
-            } else if (this.outputFormat.toLowerCase() == "json") {
-                this.readFormat = new OpenLayers.Format.GeoJSON();
-            }
-        }
-    },
-   
-    CLASS_NAME: "OpenLayers.Protocol.WFS.v1_1_0"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Renderer.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Renderer.js
deleted file mode 100644
index c5c7d0d6..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Renderer.js
+++ /dev/null
@@ -1,432 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/BaseTypes/Class.js
- */
-
-/**
- * Class: OpenLayers.Renderer 
- * This is the base class for all renderers.
- *
- * This is based on a merger code written by Paul Spencer and Bertil Chapuis.
- * It is largely composed of virtual functions that are to be implemented
- * in technology-specific subclasses, but there is some generic code too.
- * 
- * The functions that *are* implemented here merely deal with the maintenance
- *  of the size and extent variables, as well as the cached 'resolution' 
- *  value. 
- * 
- * A note to the user that all subclasses should use getResolution() instead
- *  of directly accessing this.resolution in order to correctly use the 
- *  cacheing system.
- *
- */
-OpenLayers.Renderer = OpenLayers.Class({
-
-    /** 
-     * Property: container
-     * {DOMElement} 
-     */
-    container: null,
-    
-    /**
-     * Property: root
-     * {DOMElement}
-     */
-    root: null,
-
-    /** 
-     * Property: extent
-     * {<OpenLayers.Bounds>}
-     */
-    extent: null,
-
-    /**
-     * Property: locked
-     * {Boolean} If the renderer is currently in a state where many things
-     *     are changing, the 'locked' property is set to true. This means 
-     *     that renderers can expect at least one more drawFeature event to be
-     *     called with the 'locked' property set to 'true': In some renderers,
-     *     this might make sense to use as a 'only update local information'
-     *     flag. 
-     */  
-    locked: false,
-    
-    /** 
-     * Property: size
-     * {<OpenLayers.Size>} 
-     */
-    size: null,
-    
-    /**
-     * Property: resolution
-     * {Float} cache of current map resolution
-     */
-    resolution: null,
-    
-    /**
-     * Property: map  
-     * {<OpenLayers.Map>} Reference to the map -- this is set in Vector's setMap()
-     */
-    map: null,
-    
-    /**
-     * Property: featureDx
-     * {Number} Feature offset in x direction. Will be calculated for and
-     * applied to the current feature while rendering (see
-     * <calculateFeatureDx>).
-     */
-    featureDx: 0,
-    
-    /**
-     * Constructor: OpenLayers.Renderer 
-     *
-     * Parameters:
-     * containerID - {<String>} 
-     * options - {Object} options for this renderer. See sublcasses for
-     *     supported options.
-     */
-    initialize: function(containerID, options) {
-        this.container = OpenLayers.Util.getElement(containerID);
-        OpenLayers.Util.extend(this, options);
-    },
-    
-    /**
-     * APIMethod: destroy
-     */
-    destroy: function() {
-        this.container = null;
-        this.extent = null;
-        this.size =  null;
-        this.resolution = null;
-        this.map = null;
-    },
-
-    /**
-     * APIMethod: supported
-     * This should be overridden by specific subclasses
-     * 
-     * Returns:
-     * {Boolean} Whether or not the browser supports the renderer class
-     */
-    supported: function() {
-        return false;
-    },    
-    
-    /**
-     * Method: setExtent
-     * Set the visible part of the layer.
-     *
-     * Resolution has probably changed, so we nullify the resolution 
-     * cache (this.resolution) -- this way it will be re-computed when 
-     * next it is needed.
-     * We nullify the resolution cache (this.resolution) if resolutionChanged
-     * is set to true - this way it will be re-computed on the next
-     * getResolution() request.
-     *
-     * Parameters:
-     * extent - {<OpenLayers.Bounds>}
-     * resolutionChanged - {Boolean}
-     *
-     * Returns:
-     * {Boolean} true to notify the layer that the new extent does not exceed
-     *     the coordinate range, and the features will not need to be redrawn.
-     *     False otherwise.
-     */
-    setExtent: function(extent, resolutionChanged) {
-        this.extent = extent.clone();
-        if (this.map.baseLayer && this.map.baseLayer.wrapDateLine) {
-            var ratio = extent.getWidth() / this.map.getExtent().getWidth(),
-                extent = extent.scale(1 / ratio);
-            this.extent = extent.wrapDateLine(this.map.getMaxExtent()).scale(ratio);
-        }
-        if (resolutionChanged) {
-            this.resolution = null;
-        }
-        return true;
-    },
-    
-    /**
-     * Method: setSize
-     * Sets the size of the drawing surface.
-     * 
-     * Resolution has probably changed, so we nullify the resolution 
-     * cache (this.resolution) -- this way it will be re-computed when 
-     * next it is needed.
-     *
-     * Parameters:
-     * size - {<OpenLayers.Size>} 
-     */
-    setSize: function(size) {
-        this.size = size.clone();
-        this.resolution = null;
-    },
-    
-    /** 
-     * Method: getResolution
-     * Uses cached copy of resolution if available to minimize computing
-     * 
-     * Returns:
-     * {Float} The current map's resolution
-     */
-    getResolution: function() {
-        this.resolution = this.resolution || this.map.getResolution();
-        return this.resolution;
-    },
-    
-    /**
-     * Method: drawFeature
-     * Draw the feature.  The optional style argument can be used
-     * to override the feature's own style.  This method should only
-     * be called from layer.drawFeature().
-     *
-     * Parameters:
-     * feature - {<OpenLayers.Feature.Vector>} 
-     * style - {<Object>}
-     * 
-     * Returns:
-     * {Boolean} true if the feature has been drawn completely, false if not,
-     *     undefined if the feature had no geometry
-     */
-    drawFeature: function(feature, style) {
-        if(style == null) {
-            style = feature.style;
-        }
-        if (feature.geometry) {
-            var bounds = feature.geometry.getBounds();
-            if(bounds) {
-                var worldBounds;
-                if (this.map.baseLayer && this.map.baseLayer.wrapDateLine) {
-                    worldBounds = this.map.getMaxExtent();
-                }
-                if (!bounds.intersectsBounds(this.extent, {worldBounds: worldBounds})) {
-                    style = {display: "none"};
-                } else {
-                    this.calculateFeatureDx(bounds, worldBounds);
-                }
-                var rendered = this.drawGeometry(feature.geometry, style, feature.id);
-                if(style.display != "none" && style.label && rendered !== false) {
-
-                    var location = feature.geometry.getCentroid(); 
-                    if(style.labelXOffset || style.labelYOffset) {
-                        var xOffset = isNaN(style.labelXOffset) ? 0 : style.labelXOffset;
-                        var yOffset = isNaN(style.labelYOffset) ? 0 : style.labelYOffset;
-                        var res = this.getResolution();
-                        location.move(xOffset*res, yOffset*res);
-                    }
-                    this.drawText(feature.id, style, location);
-                } else {
-                    this.removeText(feature.id);
-                }
-                return rendered;
-            }
-        }
-    },
-
-    /**
-     * Method: calculateFeatureDx
-     * {Number} Calculates the feature offset in x direction. Looking at the
-     * center of the feature bounds and the renderer extent, we calculate how
-     * many world widths the two are away from each other. This distance is
-     * used to shift the feature as close as possible to the center of the
-     * current enderer extent, which ensures that the feature is visible in the
-     * current viewport.
-     *
-     * Parameters:
-     * bounds - {<OpenLayers.Bounds>} Bounds of the feature
-     * worldBounds - {<OpenLayers.Bounds>} Bounds of the world
-     */
-    calculateFeatureDx: function(bounds, worldBounds) {
-        this.featureDx = 0;
-        if (worldBounds) {
-            var worldWidth = worldBounds.getWidth(),
-                rendererCenterX = (this.extent.left + this.extent.right) / 2,
-                featureCenterX = (bounds.left + bounds.right) / 2,
-                worldsAway = Math.round((featureCenterX - rendererCenterX) / worldWidth);
-            this.featureDx = worldsAway * worldWidth;
-        }
-    },
-
-    /** 
-     * Method: drawGeometry
-     * 
-     * Draw a geometry.  This should only be called from the renderer itself.
-     * Use layer.drawFeature() from outside the renderer.
-     * virtual function
-     *
-     * Parameters:
-     * geometry - {<OpenLayers.Geometry>} 
-     * style - {Object} 
-     * featureId - {<String>} 
-     */
-    drawGeometry: function(geometry, style, featureId) {},
-        
-    /**
-     * Method: drawText
-     * Function for drawing text labels.
-     * This method is only called by the renderer itself.
-     * 
-     * Parameters: 
-     * featureId - {String}
-     * style -
-     * location - {<OpenLayers.Geometry.Point>}
-     */
-    drawText: function(featureId, style, location) {},
-
-    /**
-     * Method: removeText
-     * Function for removing text labels.
-     * This method is only called by the renderer itself.
-     * 
-     * Parameters: 
-     * featureId - {String}
-     */
-    removeText: function(featureId) {},
-    
-    /**
-     * Method: clear
-     * Clear all vectors from the renderer.
-     * virtual function.
-     */    
-    clear: function() {},
-
-    /**
-     * Method: getFeatureIdFromEvent
-     * Returns a feature id from an event on the renderer.  
-     * How this happens is specific to the renderer.  This should be
-     * called from layer.getFeatureFromEvent().
-     * Virtual function.
-     * 
-     * Parameters:
-     * evt - {<OpenLayers.Event>} 
-     *
-     * Returns:
-     * {String} A feature id or undefined.
-     */
-    getFeatureIdFromEvent: function(evt) {},
-    
-    /**
-     * Method: eraseFeatures 
-     * This is called by the layer to erase features
-     * 
-     * Parameters:
-     * features - {Array(<OpenLayers.Feature.Vector>)} 
-     */
-    eraseFeatures: function(features) {
-        if(!(OpenLayers.Util.isArray(features))) {
-            features = [features];
-        }
-        for(var i=0, len=features.length; i<len; ++i) {
-            var feature = features[i];
-            this.eraseGeometry(feature.geometry, feature.id);
-            this.removeText(feature.id);
-        }
-    },
-    
-    /**
-     * Method: eraseGeometry
-     * Remove a geometry from the renderer (by id).
-     * virtual function.
-     * 
-     * Parameters:
-     * geometry - {<OpenLayers.Geometry>} 
-     * featureId - {String}
-     */
-    eraseGeometry: function(geometry, featureId) {},
-    
-    /**
-     * Method: moveRoot
-     * moves this renderer's root to a (different) renderer.
-     * To be implemented by subclasses that require a common renderer root for
-     * feature selection.
-     * 
-     * Parameters:
-     * renderer - {<OpenLayers.Renderer>} target renderer for the moved root
-     */
-    moveRoot: function(renderer) {},
-
-    /**
-     * Method: getRenderLayerId
-     * Gets the layer that this renderer's output appears on. If moveRoot was
-     * used, this will be different from the id of the layer containing the
-     * features rendered by this renderer.
-     * 
-     * Returns:
-     * {String} the id of the output layer.
-     */
-    getRenderLayerId: function() {
-        return this.container.id;
-    },
-    
-    /**
-     * Method: applyDefaultSymbolizer
-     * 
-     * Parameters:
-     * symbolizer - {Object}
-     * 
-     * Returns:
-     * {Object}
-     */
-    applyDefaultSymbolizer: function(symbolizer) {
-        var result = OpenLayers.Util.extend({},
-            OpenLayers.Renderer.defaultSymbolizer);
-        if(symbolizer.stroke === false) {
-            delete result.strokeWidth;
-            delete result.strokeColor;
-        }
-        if(symbolizer.fill === false) {
-            delete result.fillColor;
-        }
-        OpenLayers.Util.extend(result, symbolizer);
-        return result;
-    },
-
-    CLASS_NAME: "OpenLayers.Renderer"
-});
-
-/**
- * Constant: OpenLayers.Renderer.defaultSymbolizer
- * {Object} Properties from this symbolizer will be applied to symbolizers
- *     with missing properties. This can also be used to set a global
- *     symbolizer default in OpenLayers. To be SLD 1.x compliant, add the
- *     following code before rendering any vector features:
- * (code)
- * OpenLayers.Renderer.defaultSymbolizer = {
- *     fillColor: "#808080",
- *     fillOpacity: 1,
- *     strokeColor: "#000000",
- *     strokeOpacity: 1,
- *     strokeWidth: 1,
- *     pointRadius: 3,
- *     graphicName: "square"
- * };
- * (end)
- */
-OpenLayers.Renderer.defaultSymbolizer = {
-    fillColor: "#000000",
-    strokeColor: "#000000",
-    strokeWidth: 2,
-    fillOpacity: 1,
-    strokeOpacity: 1,
-    pointRadius: 0,
-    labelAlign: 'cm'
-};
-    
-
-
-/**
- * Constant: OpenLayers.Renderer.symbol
- * Coordinate arrays for well known (named) symbols.
- */
-OpenLayers.Renderer.symbol = {
-    "star": [350,75, 379,161, 469,161, 397,215, 423,301, 350,250, 277,301,
-            303,215, 231,161, 321,161, 350,75],
-    "cross": [4,0, 6,0, 6,4, 10,4, 10,6, 6,6, 6,10, 4,10, 4,6, 0,6, 0,4, 4,4,
-            4,0],
-    "x": [0,0, 25,0, 50,35, 75,0, 100,0, 65,50, 100,100, 75,100, 50,65, 25,100, 0,100, 35,50, 0,0],
-    "square": [0,0, 0,1, 1,1, 1,0, 0,0],
-    "triangle": [0,10, 10,10, 5,0, 0,10]
-};
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Renderer/Canvas.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Renderer/Canvas.js
deleted file mode 100644
index 61a327c8..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Renderer/Canvas.js
+++ /dev/null
@@ -1,906 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Renderer.js
- */
-
-/**
- * Class: OpenLayers.Renderer.Canvas 
- * A renderer based on the 2D 'canvas' drawing element.
- * 
- * Inherits:
- *  - <OpenLayers.Renderer>
- */
-OpenLayers.Renderer.Canvas = OpenLayers.Class(OpenLayers.Renderer, {
-    
-    /**
-     * APIProperty: hitDetection
-     * {Boolean} Allow for hit detection of features.  Default is true.
-     */
-    hitDetection: true,
-    
-    /**
-     * Property: hitOverflow
-     * {Number} The method for converting feature identifiers to color values
-     *     supports 16777215 sequential values.  Two features cannot be 
-     *     predictably detected if their identifiers differ by more than this
-     *     value.  The hitOverflow allows for bigger numbers (but the 
-     *     difference in values is still limited).
-     */
-    hitOverflow: 0,
-
-    /**
-     * Property: canvas
-     * {Canvas} The canvas context object.
-     */
-    canvas: null, 
-    
-    /**
-     * Property: features
-     * {Object} Internal object of feature/style pairs for use in redrawing the layer.
-     */
-    features: null,
-    
-    /**
-     * Property: pendingRedraw
-     * {Boolean} The renderer needs a redraw call to render features added while
-     *     the renderer was locked.
-     */
-    pendingRedraw: false,
-    
-    /**
-     * Property: cachedSymbolBounds
-     * {Object} Internal cache of calculated symbol extents.
-     */
-    cachedSymbolBounds: {},
-    
-    /**
-     * Constructor: OpenLayers.Renderer.Canvas
-     *
-     * Parameters:
-     * containerID - {<String>}
-     * options - {Object} Optional properties to be set on the renderer.
-     */
-    initialize: function(containerID, options) {
-        OpenLayers.Renderer.prototype.initialize.apply(this, arguments);
-        this.root = document.createElement("canvas");
-        this.container.appendChild(this.root);
-        this.canvas = this.root.getContext("2d");
-        this.features = {};
-        if (this.hitDetection) {
-            this.hitCanvas = document.createElement("canvas");
-            this.hitContext = this.hitCanvas.getContext("2d");
-        }
-    },
-    
-    /**
-     * Method: setExtent
-     * Set the visible part of the layer.
-     *
-     * Parameters:
-     * extent - {<OpenLayers.Bounds>}
-     * resolutionChanged - {Boolean}
-     *
-     * Returns:
-     * {Boolean} true to notify the layer that the new extent does not exceed
-     *     the coordinate range, and the features will not need to be redrawn.
-     *     False otherwise.
-     */
-    setExtent: function() {
-        OpenLayers.Renderer.prototype.setExtent.apply(this, arguments);
-        // always redraw features
-        return false;
-    },
-    
-    /** 
-     * Method: eraseGeometry
-     * Erase a geometry from the renderer. Because the Canvas renderer has
-     *     'memory' of the features that it has drawn, we have to remove the
-     *     feature so it doesn't redraw.   
-     * 
-     * Parameters:
-     * geometry - {<OpenLayers.Geometry>}
-     * featureId - {String}
-     */
-    eraseGeometry: function(geometry, featureId) {
-        this.eraseFeatures(this.features[featureId][0]);
-    },
-
-    /**
-     * APIMethod: supported
-     * 
-     * Returns:
-     * {Boolean} Whether or not the browser supports the renderer class
-     */
-    supported: function() {
-        return OpenLayers.CANVAS_SUPPORTED;
-    },    
-    
-    /**
-     * Method: setSize
-     * Sets the size of the drawing surface.
-     *
-     * Once the size is updated, redraw the canvas.
-     *
-     * Parameters:
-     * size - {<OpenLayers.Size>} 
-     */
-    setSize: function(size) {
-        this.size = size.clone();
-        var root = this.root;
-        root.style.width = size.w + "px";
-        root.style.height = size.h + "px";
-        root.width = size.w;
-        root.height = size.h;
-        this.resolution = null;
-        if (this.hitDetection) {
-            var hitCanvas = this.hitCanvas;
-            hitCanvas.style.width = size.w + "px";
-            hitCanvas.style.height = size.h + "px";
-            hitCanvas.width = size.w;
-            hitCanvas.height = size.h;
-        }
-    },
-    
-    /**
-     * Method: drawFeature
-     * Draw the feature. Stores the feature in the features list,
-     * then redraws the layer. 
-     *
-     * Parameters:
-     * feature - {<OpenLayers.Feature.Vector>} 
-     * style - {<Object>} 
-     *
-     * Returns:
-     * {Boolean} The feature has been drawn completely.  If the feature has no
-     *     geometry, undefined will be returned.  If the feature is not rendered
-     *     for other reasons, false will be returned.
-     */
-    drawFeature: function(feature, style) {
-        var rendered;
-        if (feature.geometry) {
-            style = this.applyDefaultSymbolizer(style || feature.style);
-            // don't render if display none or feature outside extent
-            var bounds = feature.geometry.getBounds();
-
-            var worldBounds;
-            if (this.map.baseLayer && this.map.baseLayer.wrapDateLine) {
-                worldBounds = this.map.getMaxExtent();
-            }
-
-            var intersects = bounds && bounds.intersectsBounds(this.extent, {worldBounds: worldBounds});
-
-            rendered = (style.display !== "none") && !!bounds && intersects;
-            if (rendered) {
-                // keep track of what we have rendered for redraw
-                this.features[feature.id] = [feature, style];
-            }
-            else {
-                // remove from features tracked for redraw
-                delete(this.features[feature.id]);
-            }
-            this.pendingRedraw = true;
-        }
-        if (this.pendingRedraw && !this.locked) {
-            this.redraw();
-            this.pendingRedraw = false;
-        }
-        return rendered;
-    },
-
-    /** 
-     * Method: drawGeometry
-     * Used when looping (in redraw) over the features; draws
-     * the canvas. 
-     *
-     * Parameters:
-     * geometry - {<OpenLayers.Geometry>} 
-     * style - {Object} 
-     */
-    drawGeometry: function(geometry, style, featureId) {
-        var className = geometry.CLASS_NAME;
-        if ((className == "OpenLayers.Geometry.Collection") ||
-            (className == "OpenLayers.Geometry.MultiPoint") ||
-            (className == "OpenLayers.Geometry.MultiLineString") ||
-            (className == "OpenLayers.Geometry.MultiPolygon")) {
-            for (var i = 0; i < geometry.components.length; i++) {
-                this.drawGeometry(geometry.components[i], style, featureId);
-            }
-            return;
-        }
-        switch (geometry.CLASS_NAME) {
-            case "OpenLayers.Geometry.Point":
-                this.drawPoint(geometry, style, featureId);
-                break;
-            case "OpenLayers.Geometry.LineString":
-                this.drawLineString(geometry, style, featureId);
-                break;
-            case "OpenLayers.Geometry.LinearRing":
-                this.drawLinearRing(geometry, style, featureId);
-                break;
-            case "OpenLayers.Geometry.Polygon":
-                this.drawPolygon(geometry, style, featureId);
-                break;
-            default:
-                break;
-        }
-    },
-
-    /**
-     * Method: drawExternalGraphic
-     * Called to draw External graphics. 
-     * 
-     * Parameters: 
-     * geometry - {<OpenLayers.Geometry>}
-     * style    - {Object}
-     * featureId - {String}
-     */ 
-    drawExternalGraphic: function(geometry, style, featureId) {
-        var img = new Image();
-
-        var title = style.title || style.graphicTitle;        
-        if (title) {
-            img.title = title;           
-        }
-
-        var width = style.graphicWidth || style.graphicHeight;
-        var height = style.graphicHeight || style.graphicWidth;
-        width = width ? width : style.pointRadius * 2;
-        height = height ? height : style.pointRadius * 2;
-        var xOffset = (style.graphicXOffset != undefined) ?
-           style.graphicXOffset : -(0.5 * width);
-        var yOffset = (style.graphicYOffset != undefined) ?
-           style.graphicYOffset : -(0.5 * height);
-
-        var opacity = style.graphicOpacity || style.fillOpacity;
-        
-        var onLoad = function() {
-            if(!this.features[featureId]) {
-                return;
-            }
-            var pt = this.getLocalXY(geometry);
-            var p0 = pt[0];
-            var p1 = pt[1];
-            if(!isNaN(p0) && !isNaN(p1)) {
-                var x = (p0 + xOffset) | 0;
-                var y = (p1 + yOffset) | 0;
-                var canvas = this.canvas;
-                canvas.globalAlpha = opacity;
-                var factor = OpenLayers.Renderer.Canvas.drawImageScaleFactor ||
-                    (OpenLayers.Renderer.Canvas.drawImageScaleFactor =
-                        /android 2.1/.test(navigator.userAgent.toLowerCase()) ?
-                            // 320 is the screen width of the G1 phone, for
-                            // which drawImage works out of the box.
-                            320 / window.screen.width : 1
-                    );
-                canvas.drawImage(
-                    img, x*factor, y*factor, width*factor, height*factor
-                );
-                if (this.hitDetection) {
-                    this.setHitContextStyle("fill", featureId);
-                    this.hitContext.fillRect(x, y, width, height);
-                }
-            }
-        };
-
-        img.onload = OpenLayers.Function.bind(onLoad, this);
-        img.src = style.externalGraphic;
-    },
-
-    /**
-     * Method: drawNamedSymbol
-     * Called to draw Well Known Graphic Symbol Name. 
-     * This method is only called by the renderer itself.
-     * 
-     * Parameters: 
-     * geometry - {<OpenLayers.Geometry>}
-     * style    - {Object}
-     * featureId - {String}
-     */ 
-    drawNamedSymbol: function(geometry, style, featureId) {
-        var x, y, cx, cy, i, symbolBounds, scaling, angle;
-        var unscaledStrokeWidth;
-        var deg2rad = Math.PI / 180.0;
-        
-        var symbol = OpenLayers.Renderer.symbol[style.graphicName];
-         
-        if (!symbol) {
-            throw new Error(style.graphicName + ' is not a valid symbol name');
-        }
-        
-        if (!symbol.length || symbol.length < 2) return;
-        
-        var pt = this.getLocalXY(geometry);
-        var p0 = pt[0];
-        var p1 = pt[1];
-       
-        if (isNaN(p0) || isNaN(p1)) return;
-        
-        // Use rounded line caps
-        this.canvas.lineCap = "round";
-        this.canvas.lineJoin = "round";
-        
-        if (this.hitDetection) {
-            this.hitContext.lineCap = "round";
-            this.hitContext.lineJoin = "round";
-        }
-        
-        // Scale and rotate symbols, using precalculated bounds whenever possible.
-        if (style.graphicName in this.cachedSymbolBounds) {
-            symbolBounds = this.cachedSymbolBounds[style.graphicName];
-        } else {
-            symbolBounds = new OpenLayers.Bounds();
-            for(i = 0; i < symbol.length; i+=2) {
-                symbolBounds.extend(new OpenLayers.LonLat(symbol[i], symbol[i+1]));
-            }
-            this.cachedSymbolBounds[style.graphicName] = symbolBounds;
-        }
-        
-        // Push symbol scaling, translation and rotation onto the transformation stack in reverse order.
-        // Don't forget to apply all canvas transformations to the hitContext canvas as well(!)
-        this.canvas.save();
-        if (this.hitDetection) { this.hitContext.save(); }
-        
-        // Step 3: place symbol at the desired location
-        this.canvas.translate(p0,p1);
-        if (this.hitDetection) { this.hitContext.translate(p0,p1); }
-        
-        // Step 2a. rotate the symbol if necessary
-        angle = deg2rad * style.rotation; // will be NaN when style.rotation is undefined.
-        if (!isNaN(angle)) {
-            this.canvas.rotate(angle);
-            if (this.hitDetection) { this.hitContext.rotate(angle); }
-        }
-                
-        // // Step 2: scale symbol such that pointRadius equals half the maximum symbol dimension.
-        scaling = 2.0 * style.pointRadius / Math.max(symbolBounds.getWidth(), symbolBounds.getHeight());
-        this.canvas.scale(scaling,scaling);
-        if (this.hitDetection) { this.hitContext.scale(scaling,scaling); }
-        
-        // Step 1: center the symbol at the origin        
-        cx = symbolBounds.getCenterLonLat().lon;
-        cy = symbolBounds.getCenterLonLat().lat;
-        this.canvas.translate(-cx,-cy);
-        if (this.hitDetection) { this.hitContext.translate(-cx,-cy); }        
-
-        // Don't forget to scale stroke widths, because they are affected by canvas scale transformations as well(!)
-        // Alternative: scale symbol coordinates manually, so stroke width scaling is not needed anymore.
-        unscaledStrokeWidth = style.strokeWidth;
-        style.strokeWidth = unscaledStrokeWidth / scaling;
-            
-        if (style.fill !== false) {
-            this.setCanvasStyle("fill", style);
-            this.canvas.beginPath();
-            for (i=0; i<symbol.length; i=i+2) {
-                x = symbol[i];
-                y = symbol[i+1];
-                if (i == 0) this.canvas.moveTo(x,y);
-                this.canvas.lineTo(x,y);
-            }
-            this.canvas.closePath();
-            this.canvas.fill();
-
-            if (this.hitDetection) {
-                this.setHitContextStyle("fill", featureId, style);
-                this.hitContext.beginPath();
-                for (i=0; i<symbol.length; i=i+2) {
-                    x = symbol[i];
-                    y = symbol[i+1];
-                    if (i == 0) this.canvas.moveTo(x,y);
-                    this.hitContext.lineTo(x,y);
-                }
-                this.hitContext.closePath();
-                this.hitContext.fill();
-            }
-        }  
-        
-        if (style.stroke !== false) {
-            this.setCanvasStyle("stroke", style);
-            this.canvas.beginPath();
-            for (i=0; i<symbol.length; i=i+2) {
-                x = symbol[i];
-                y = symbol[i+1];
-                if (i == 0) this.canvas.moveTo(x,y);
-                this.canvas.lineTo(x,y);
-            }
-            this.canvas.closePath();
-            this.canvas.stroke();
-            
-            
-            if (this.hitDetection) {
-                this.setHitContextStyle("stroke", featureId, style, scaling);
-                this.hitContext.beginPath();
-                for (i=0; i<symbol.length; i=i+2) {
-                    x = symbol[i];
-                    y = symbol[i+1];
-                    if (i == 0) this.hitContext.moveTo(x,y);
-                    this.hitContext.lineTo(x,y);
-                }
-                this.hitContext.closePath();
-                this.hitContext.stroke();
-            }
-            
-        }
-        
-        style.strokeWidth = unscaledStrokeWidth;
-        this.canvas.restore();
-        if (this.hitDetection) { this.hitContext.restore(); }
-        this.setCanvasStyle("reset");  
-    },
-
-    /**
-     * Method: setCanvasStyle
-     * Prepare the canvas for drawing by setting various global settings.
-     *
-     * Parameters:
-     * type - {String} one of 'stroke', 'fill', or 'reset'
-     * style - {Object} Symbolizer hash
-     */
-    setCanvasStyle: function(type, style) {
-        if (type === "fill") {     
-            this.canvas.globalAlpha = style['fillOpacity'];
-            this.canvas.fillStyle = style['fillColor'];
-        } else if (type === "stroke") {  
-            this.canvas.globalAlpha = style['strokeOpacity'];
-            this.canvas.strokeStyle = style['strokeColor'];
-            this.canvas.lineWidth = style['strokeWidth'];
-        } else {
-            this.canvas.globalAlpha = 0;
-            this.canvas.lineWidth = 1;
-        }
-    },
-    
-    /**
-     * Method: featureIdToHex
-     * Convert a feature ID string into an RGB hex string.
-     *
-     * Parameters:
-     * featureId - {String} Feature id
-     *
-     * Returns:
-     * {String} RGB hex string.
-     */
-    featureIdToHex: function(featureId) {
-        var id = Number(featureId.split("_").pop()) + 1; // zero for no feature
-        if (id >= 16777216) {
-            this.hitOverflow = id - 16777215;
-            id = id % 16777216 + 1;
-        }
-        var hex = "000000" + id.toString(16);
-        var len = hex.length;
-        hex = "#" + hex.substring(len-6, len);
-        return hex;
-    },
-    
-    /**
-     * Method: setHitContextStyle
-     * Prepare the hit canvas for drawing by setting various global settings.
-     *
-     * Parameters:
-     * type - {String} one of 'stroke', 'fill', or 'reset'
-     * featureId - {String} The feature id.
-     * symbolizer - {<OpenLayers.Symbolizer>} The symbolizer.
-     */
-    setHitContextStyle: function(type, featureId, symbolizer, strokeScaling) {
-        var hex = this.featureIdToHex(featureId);
-        if (type == "fill") {
-            this.hitContext.globalAlpha = 1.0;
-            this.hitContext.fillStyle = hex;
-        } else if (type == "stroke") {  
-            this.hitContext.globalAlpha = 1.0;
-            this.hitContext.strokeStyle = hex;
-            // bump up stroke width to deal with antialiasing. If strokeScaling is defined, we're rendering a symbol 
-            // on a transformed canvas, so the antialias width bump has to scale as well.
-            if (typeof strokeScaling === "undefined") {
-                this.hitContext.lineWidth = symbolizer.strokeWidth + 2;
-            } else {
-                if (!isNaN(strokeScaling)) { this.hitContext.lineWidth = symbolizer.strokeWidth + 2.0 / strokeScaling; }
-            }
-        } else {
-            this.hitContext.globalAlpha = 0;
-            this.hitContext.lineWidth = 1;
-        }
-    },
-
-    /**
-     * Method: drawPoint
-     * This method is only called by the renderer itself.
-     * 
-     * Parameters: 
-     * geometry - {<OpenLayers.Geometry>}
-     * style    - {Object}
-     * featureId - {String}
-     */ 
-    drawPoint: function(geometry, style, featureId) {
-        if(style.graphic !== false) {
-            if(style.externalGraphic) {
-                this.drawExternalGraphic(geometry, style, featureId);
-            } else if (style.graphicName && (style.graphicName != "circle")) {
-                this.drawNamedSymbol(geometry, style, featureId);
-            } else {
-                var pt = this.getLocalXY(geometry);
-                var p0 = pt[0];
-                var p1 = pt[1];
-                if(!isNaN(p0) && !isNaN(p1)) {
-                    var twoPi = Math.PI*2;
-                    var radius = style.pointRadius;
-                    if(style.fill !== false) {
-                        this.setCanvasStyle("fill", style);
-                        this.canvas.beginPath();
-                        this.canvas.arc(p0, p1, radius, 0, twoPi, true);
-                        this.canvas.fill();
-                        if (this.hitDetection) {
-                            this.setHitContextStyle("fill", featureId, style);
-                            this.hitContext.beginPath();
-                            this.hitContext.arc(p0, p1, radius, 0, twoPi, true);
-                            this.hitContext.fill();
-                        }
-                    }
-
-                    if(style.stroke !== false) {
-                        this.setCanvasStyle("stroke", style);
-                        this.canvas.beginPath();
-                        this.canvas.arc(p0, p1, radius, 0, twoPi, true);
-                        this.canvas.stroke();
-                        if (this.hitDetection) {
-                            this.setHitContextStyle("stroke", featureId, style);
-                            this.hitContext.beginPath();
-                            this.hitContext.arc(p0, p1, radius, 0, twoPi, true);
-                            this.hitContext.stroke();
-                        }
-                        this.setCanvasStyle("reset");
-                    }
-                }
-            }
-        }
-    },
-    
-    /**
-     * Method: drawLineString
-     * This method is only called by the renderer itself.
-     * 
-     * Parameters: 
-     * geometry - {<OpenLayers.Geometry>}
-     * style    - {Object}
-     * featureId - {String}
-     */ 
-    drawLineString: function(geometry, style, featureId) {
-        style = OpenLayers.Util.applyDefaults({fill: false}, style);
-        this.drawLinearRing(geometry, style, featureId);
-    },    
-    
-    /**
-     * Method: drawLinearRing
-     * This method is only called by the renderer itself.
-     * 
-     * Parameters: 
-     * geometry - {<OpenLayers.Geometry>}
-     * style    - {Object}
-     * featureId - {String}
-     */ 
-    drawLinearRing: function(geometry, style, featureId) {
-        if (style.fill !== false) {
-            this.setCanvasStyle("fill", style);
-            this.renderPath(this.canvas, geometry, style, featureId, "fill");
-            if (this.hitDetection) {
-                this.setHitContextStyle("fill", featureId, style);
-                this.renderPath(this.hitContext, geometry, style, featureId, "fill");
-            }
-        }
-        if (style.stroke !== false) {
-            this.setCanvasStyle("stroke", style);
-            this.renderPath(this.canvas, geometry, style, featureId, "stroke");
-            if (this.hitDetection) {
-                this.setHitContextStyle("stroke", featureId, style);
-                this.renderPath(this.hitContext, geometry, style, featureId, "stroke");
-            }
-        }
-        this.setCanvasStyle("reset");
-    },
-    
-    /**
-     * Method: renderPath
-     * Render a path with stroke and optional fill.
-     */
-    renderPath: function(context, geometry, style, featureId, type) {
-        var components = geometry.components;
-        var len = components.length;
-        context.beginPath();
-        var start = this.getLocalXY(components[0]);
-        var x = start[0];
-        var y = start[1];
-        if (!isNaN(x) && !isNaN(y)) {
-            context.moveTo(start[0], start[1]);
-            for (var i=1; i<len; ++i) {
-                var pt = this.getLocalXY(components[i]);
-                context.lineTo(pt[0], pt[1]);
-            }
-            if (type === "fill") {
-                context.fill();
-            } else {
-                context.stroke();
-            }
-        }
-    },
-    
-    /**
-     * Method: drawPolygon
-     * This method is only called by the renderer itself.
-     * 
-     * Parameters: 
-     * geometry - {<OpenLayers.Geometry>}
-     * style    - {Object}
-     * featureId - {String}
-     */ 
-    drawPolygon: function(geometry, style, featureId) {
-        var components = geometry.components;
-        var len = components.length;
-        this.drawLinearRing(components[0], style, featureId);
-        // erase inner rings
-        for (var i=1; i<len; ++i) {
-            /** 
-             * Note that this is overly agressive.  Here we punch holes through 
-             * all previously rendered features on the same canvas.  A better 
-             * solution for polygons with interior rings would be to draw the 
-             * polygon on a sketch canvas first.  We could erase all holes 
-             * there and then copy the drawing to the layer canvas. 
-             * TODO: http://trac.osgeo.org/openlayers/ticket/3130 
-             */
-            this.canvas.globalCompositeOperation = "destination-out";
-            if (this.hitDetection) {
-                this.hitContext.globalCompositeOperation = "destination-out";
-            }
-            this.drawLinearRing(
-                components[i], 
-                OpenLayers.Util.applyDefaults({stroke: false, fillOpacity: 1.0}, style),
-                featureId
-            );
-            this.canvas.globalCompositeOperation = "source-over";
-            if (this.hitDetection) {
-                this.hitContext.globalCompositeOperation = "source-over";
-            }
-            this.drawLinearRing(
-                components[i], 
-                OpenLayers.Util.applyDefaults({fill: false}, style),
-                featureId
-            );
-        }
-    },
-    
-    /**
-     * Method: drawText
-     * This method is only called by the renderer itself.
-     *
-     * Parameters:
-     * location - {<OpenLayers.Point>}
-     * style    - {Object}
-     */
-    drawText: function(location, style) {
-        var pt = this.getLocalXY(location);
-
-        this.setCanvasStyle("reset");
-        this.canvas.fillStyle = style.fontColor;
-        this.canvas.globalAlpha = style.fontOpacity || 1.0;
-        var fontStyle = [style.fontStyle ? style.fontStyle : "normal",
-                         "normal", // "font-variant" not supported
-                         style.fontWeight ? style.fontWeight : "normal",
-                         style.fontSize ? style.fontSize : "1em",
-                         style.fontFamily ? style.fontFamily : "sans-serif"].join(" ");
-        var labelRows = style.label.split('\n');
-        var numRows = labelRows.length;
-        if (this.canvas.fillText) {
-            // HTML5
-            this.canvas.font = fontStyle;
-            this.canvas.textAlign =
-                OpenLayers.Renderer.Canvas.LABEL_ALIGN[style.labelAlign[0]] ||
-                "center";
-            this.canvas.textBaseline =
-                OpenLayers.Renderer.Canvas.LABEL_ALIGN[style.labelAlign[1]] ||
-                "middle";
-            var vfactor =
-                OpenLayers.Renderer.Canvas.LABEL_FACTOR[style.labelAlign[1]];
-            if (vfactor == null) {
-                vfactor = -.5;
-            }
-            var lineHeight =
-                this.canvas.measureText('Mg').height ||
-                this.canvas.measureText('xx').width;
-            pt[1] += lineHeight*vfactor*(numRows-1);
-            for (var i = 0; i < numRows; i++) {
-                if (style.labelOutlineWidth) {
-                    this.canvas.save();
-                    this.canvas.globalAlpha = style.labelOutlineOpacity || style.fontOpacity || 1.0;
-                    this.canvas.strokeStyle = style.labelOutlineColor;
-                    this.canvas.lineWidth = style.labelOutlineWidth;
-                    this.canvas.strokeText(labelRows[i], pt[0], pt[1] + (lineHeight*i) + 1);
-                    this.canvas.restore();
-                }
-                this.canvas.fillText(labelRows[i], pt[0], pt[1] + (lineHeight*i));
-            }
-        } else if (this.canvas.mozDrawText) {
-            // Mozilla pre-Gecko1.9.1 (<FF3.1)
-            this.canvas.mozTextStyle = fontStyle;
-            // No built-in text alignment, so we measure and adjust the position
-            var hfactor =
-                OpenLayers.Renderer.Canvas.LABEL_FACTOR[style.labelAlign[0]];
-            if (hfactor == null) {
-                hfactor = -.5;
-            }
-            var vfactor =
-                OpenLayers.Renderer.Canvas.LABEL_FACTOR[style.labelAlign[1]];
-            if (vfactor == null) {
-                vfactor = -.5;
-            }
-            var lineHeight = this.canvas.mozMeasureText('xx');
-            pt[1] += lineHeight*(1 + (vfactor*numRows));
-            for (var i = 0; i < numRows; i++) {
-                var x = pt[0] + (hfactor*this.canvas.mozMeasureText(labelRows[i]));
-                var y = pt[1] + (i*lineHeight);
-                this.canvas.translate(x, y);
-                this.canvas.mozDrawText(labelRows[i]);
-                this.canvas.translate(-x, -y);
-            }
-        }
-        this.setCanvasStyle("reset");
-    },
-    
-    /**
-     * Method: getLocalXY
-     * transform geographic xy into pixel xy
-     *
-     * Parameters: 
-     * point - {<OpenLayers.Geometry.Point>}
-     */
-    getLocalXY: function(point) {
-        var resolution = this.getResolution();
-        var extent = this.extent;
-        var x = ((point.x - this.featureDx) / resolution + (-extent.left / resolution));
-        var y = ((extent.top / resolution) - point.y / resolution);
-        return [x, y];
-    },
-
-    /**
-     * Method: clear
-     * Clear all vectors from the renderer.
-     */    
-    clear: function() {
-        var height = this.root.height;
-        var width = this.root.width;
-        this.canvas.clearRect(0, 0, width, height);
-        this.features = {};
-        if (this.hitDetection) {
-            this.hitContext.clearRect(0, 0, width, height);
-        }
-    },
-
-    /**
-     * Method: getFeatureIdFromEvent
-     * Returns a feature id from an event on the renderer.  
-     * 
-     * Parameters:
-     * evt - {<OpenLayers.Event>} 
-     *
-     * Returns:
-     * {<OpenLayers.Feature.Vector} A feature or undefined.  This method returns a 
-     *     feature instead of a feature id to avoid an unnecessary lookup on the
-     *     layer.
-     */
-    getFeatureIdFromEvent: function(evt) {
-        var featureId, feature;
-        
-        if (this.hitDetection && this.root.style.display !== "none") {
-            // this dragging check should go in the feature handler
-            if (!this.map.dragging) {
-                var xy = evt.xy;
-                var x = xy.x | 0;
-                var y = xy.y | 0;
-                var data = this.hitContext.getImageData(x, y, 1, 1).data;
-                if (data[3] === 255) { // antialiased
-                    var id = data[2] + (256 * (data[1] + (256 * data[0])));
-                    if (id) {
-                        featureId = "OpenLayers_Feature_Vector_" + (id - 1 + this.hitOverflow);
-                        try {
-                            feature = this.features[featureId][0];
-                        } catch(err) {
-                            // Because of antialiasing on the canvas, when the hit location is at a point where the edge of
-                            // one symbol intersects the interior of another symbol, a wrong hit color (and therefore id) results.
-                            // todo: set Antialiasing = 'off' on the hitContext as soon as browsers allow it.
-                        }
-                    }
-                }
-            }
-        }
-        return feature;
-    },
-    
-    /**
-     * Method: eraseFeatures 
-     * This is called by the layer to erase features; removes the feature from
-     *     the list, then redraws the layer.
-     * 
-     * Parameters:
-     * features - {Array(<OpenLayers.Feature.Vector>)} 
-     */
-    eraseFeatures: function(features) {
-        if(!(OpenLayers.Util.isArray(features))) {
-            features = [features];
-        }
-        for(var i=0; i<features.length; ++i) {
-            delete this.features[features[i].id];
-        }
-        this.redraw();
-    },
-
-    /**
-     * Method: redraw
-     * The real 'meat' of the function: any time things have changed,
-     *     redraw() can be called to loop over all the data and (you guessed
-     *     it) redraw it.  Unlike Elements-based Renderers, we can't interact
-     *     with things once they're drawn, to remove them, for example, so
-     *     instead we have to just clear everything and draw from scratch.
-     */
-    redraw: function() {
-        if (!this.locked) {
-            var height = this.root.height;
-            var width = this.root.width;
-            this.canvas.clearRect(0, 0, width, height);
-            if (this.hitDetection) {
-                this.hitContext.clearRect(0, 0, width, height);
-            }
-            var labelMap = [];
-            var feature, geometry, style;
-            var worldBounds = (this.map.baseLayer && this.map.baseLayer.wrapDateLine) && this.map.getMaxExtent();
-            for (var id in this.features) {
-                if (!this.features.hasOwnProperty(id)) { continue; }
-                feature = this.features[id][0];
-                geometry = feature.geometry;
-                this.calculateFeatureDx(geometry.getBounds(), worldBounds);
-                style = this.features[id][1];
-                this.drawGeometry(geometry, style, feature.id);
-                if(style.label) {
-                    labelMap.push([feature, style]);
-                }
-            }
-            var item;
-            for (var i=0, len=labelMap.length; i<len; ++i) {
-                item = labelMap[i];
-                this.drawText(item[0].geometry.getCentroid(), item[1]);
-            }
-        }    
-    },
-
-    CLASS_NAME: "OpenLayers.Renderer.Canvas"
-});
-
-/**
- * Constant: OpenLayers.Renderer.Canvas.LABEL_ALIGN
- * {Object}
- */
-OpenLayers.Renderer.Canvas.LABEL_ALIGN = {
-    "l": "left",
-    "r": "right",
-    "t": "top",
-    "b": "bottom"
-};
-
-/**
- * Constant: OpenLayers.Renderer.Canvas.LABEL_FACTOR
- * {Object}
- */
-OpenLayers.Renderer.Canvas.LABEL_FACTOR = {
-    "l": 0,
-    "r": -1,
-    "t": 0,
-    "b": -1
-};
-
-/**
- * Constant: OpenLayers.Renderer.Canvas.drawImageScaleFactor
- * {Number} Scale factor to apply to the canvas drawImage arguments. This
- *     is always 1 except for Android 2.1 devices, to work around
- *     http://code.google.com/p/android/issues/detail?id=5141.
- */
-OpenLayers.Renderer.Canvas.drawImageScaleFactor = null;
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Renderer/Elements.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Renderer/Elements.js
deleted file mode 100644
index 18a0d797..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Renderer/Elements.js
+++ /dev/null
@@ -1,1053 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Renderer.js
- */
-
-/**
- * Class: OpenLayers.ElementsIndexer
- * This class takes care of figuring out which order elements should be
- *     placed in the DOM based on given indexing methods. 
- */
-OpenLayers.ElementsIndexer = OpenLayers.Class({
-   
-    /**
-     * Property: maxZIndex
-     * {Integer} This is the largest-most z-index value for a node
-     *     contained within the indexer.
-     */
-    maxZIndex: null,
-    
-    /**
-     * Property: order
-     * {Array<String>} This is an array of node id's stored in the
-     *     order that they should show up on screen. Id's higher up in the
-     *     array (higher array index) represent nodes with higher z-indeces.
-     */
-    order: null, 
-    
-    /**
-     * Property: indices
-     * {Object} This is a hash that maps node ids to their z-index value
-     *     stored in the indexer. This is done to make finding a nodes z-index 
-     *     value O(1).
-     */
-    indices: null,
-    
-    /**
-     * Property: compare
-     * {Function} This is the function used to determine placement of
-     *     of a new node within the indexer. If null, this defaults to to
-     *     the Z_ORDER_DRAWING_ORDER comparison method.
-     */
-    compare: null,
-    
-    /**
-     * APIMethod: initialize
-     * Create a new indexer with 
-     * 
-     * Parameters:
-     * yOrdering - {Boolean} Whether to use y-ordering.
-     */
-    initialize: function(yOrdering) {
-
-        this.compare = yOrdering ? 
-            OpenLayers.ElementsIndexer.IndexingMethods.Z_ORDER_Y_ORDER :
-            OpenLayers.ElementsIndexer.IndexingMethods.Z_ORDER_DRAWING_ORDER;
-
-        this.clear();
-    },
-    
-    /**
-     * APIMethod: insert
-     * Insert a new node into the indexer. In order to find the correct 
-     *     positioning for the node to be inserted, this method uses a binary 
-     *     search. This makes inserting O(log(n)). 
-     * 
-     * Parameters:
-     * newNode - {DOMElement} The new node to be inserted.
-     * 
-     * Returns
-     * {DOMElement} the node before which we should insert our newNode, or
-     *     null if newNode can just be appended.
-     */
-    insert: function(newNode) {
-        // If the node is known to the indexer, remove it so we can
-        // recalculate where it should go.
-        if (this.exists(newNode)) {
-            this.remove(newNode);
-        }
-        
-        var nodeId = newNode.id;
-        
-        this.determineZIndex(newNode);       
-
-        var leftIndex = -1;
-        var rightIndex = this.order.length;
-        var middle;
-
-        while (rightIndex - leftIndex > 1) {
-            middle = parseInt((leftIndex + rightIndex) / 2);
-            
-            var placement = this.compare(this, newNode,
-                OpenLayers.Util.getElement(this.order[middle]));
-            
-            if (placement > 0) {
-                leftIndex = middle;
-            } else {
-                rightIndex = middle;
-            } 
-        }
-        
-        this.order.splice(rightIndex, 0, nodeId);
-        this.indices[nodeId] = this.getZIndex(newNode);
-        
-        // If the new node should be before another in the index
-        // order, return the node before which we have to insert the new one;
-        // else, return null to indicate that the new node can be appended.
-        return this.getNextElement(rightIndex);
-    },
-    
-    /**
-     * APIMethod: remove
-     * 
-     * Parameters:
-     * node - {DOMElement} The node to be removed.
-     */
-    remove: function(node) {
-        var nodeId = node.id;
-        var arrayIndex = OpenLayers.Util.indexOf(this.order, nodeId);
-        if (arrayIndex >= 0) {
-            // Remove it from the order array, as well as deleting the node
-            // from the indeces hash.
-            this.order.splice(arrayIndex, 1);
-            delete this.indices[nodeId];
-            
-            // Reset the maxium z-index based on the last item in the 
-            // order array.
-            if (this.order.length > 0) {
-                var lastId = this.order[this.order.length - 1];
-                this.maxZIndex = this.indices[lastId];
-            } else {
-                this.maxZIndex = 0;
-            }
-        }
-    },
-    
-    /**
-     * APIMethod: clear
-     */
-    clear: function() {
-        this.order = [];
-        this.indices = {};
-        this.maxZIndex = 0;
-    },
-    
-    /**
-     * APIMethod: exists
-     *
-     * Parameters:
-     * node - {DOMElement} The node to test for existence.
-     *
-     * Returns:
-     * {Boolean} Whether or not the node exists in the indexer?
-     */
-    exists: function(node) {
-        return (this.indices[node.id] != null);
-    },
-
-    /**
-     * APIMethod: getZIndex
-     * Get the z-index value for the current node from the node data itself.
-     * 
-     * Parameters:
-     * node - {DOMElement} The node whose z-index to get.
-     * 
-     * Returns:
-     * {Integer} The z-index value for the specified node (from the node 
-     *     data itself).
-     */
-    getZIndex: function(node) {
-        return node._style.graphicZIndex;  
-    },
-    
-    /**
-     * Method: determineZIndex
-     * Determine the z-index for the current node if there isn't one, 
-     *     and set the maximum value if we've found a new maximum.
-     * 
-     * Parameters:
-     * node - {DOMElement} 
-     */
-    determineZIndex: function(node) {
-        var zIndex = node._style.graphicZIndex;
-        
-        // Everything must have a zIndex. If none is specified,
-        // this means the user *must* (hint: assumption) want this
-        // node to succomb to drawing order. To enforce drawing order
-        // over all indexing methods, we'll create a new z-index that's
-        // greater than any currently in the indexer.
-        if (zIndex == null) {
-            zIndex = this.maxZIndex;
-            node._style.graphicZIndex = zIndex; 
-        } else if (zIndex > this.maxZIndex) {
-            this.maxZIndex = zIndex;
-        }
-    },
-
-    /**
-     * APIMethod: getNextElement
-     * Get the next element in the order stack.
-     * 
-     * Parameters:
-     * index - {Integer} The index of the current node in this.order.
-     * 
-     * Returns:
-     * {DOMElement} the node following the index passed in, or
-     *     null.
-     */
-    getNextElement: function(index) {
-        var nextIndex = index + 1;
-        if (nextIndex < this.order.length) {
-            var nextElement = OpenLayers.Util.getElement(this.order[nextIndex]);
-            if (nextElement == undefined) {
-                nextElement = this.getNextElement(nextIndex);
-            }
-            return nextElement;
-        } else {
-            return null;
-        } 
-    },
-    
-    CLASS_NAME: "OpenLayers.ElementsIndexer"
-});
-
-/**
- * Namespace: OpenLayers.ElementsIndexer.IndexingMethods
- * These are the compare methods for figuring out where a new node should be 
- *     placed within the indexer. These methods are very similar to general 
- *     sorting methods in that they return -1, 0, and 1 to specify the 
- *     direction in which new nodes fall in the ordering.
- */
-OpenLayers.ElementsIndexer.IndexingMethods = {
-    
-    /**
-     * Method: Z_ORDER
-     * This compare method is used by other comparison methods.
-     *     It can be used individually for ordering, but is not recommended,
-     *     because it doesn't subscribe to drawing order.
-     * 
-     * Parameters:
-     * indexer - {<OpenLayers.ElementsIndexer>}
-     * newNode - {DOMElement}
-     * nextNode - {DOMElement}
-     * 
-     * Returns:
-     * {Integer}
-     */
-    Z_ORDER: function(indexer, newNode, nextNode) {
-        var newZIndex = indexer.getZIndex(newNode);
-
-        var returnVal = 0;
-        if (nextNode) {
-            var nextZIndex = indexer.getZIndex(nextNode);
-            returnVal = newZIndex - nextZIndex; 
-        }
-        
-        return returnVal;
-    },
-
-    /**
-     * APIMethod: Z_ORDER_DRAWING_ORDER
-     * This method orders nodes by their z-index, but does so in a way
-     *     that, if there are other nodes with the same z-index, the newest 
-     *     drawn will be the front most within that z-index. This is the 
-     *     default indexing method.
-     * 
-     * Parameters:
-     * indexer - {<OpenLayers.ElementsIndexer>}
-     * newNode - {DOMElement}
-     * nextNode - {DOMElement}
-     * 
-     * Returns:
-     * {Integer}
-     */
-    Z_ORDER_DRAWING_ORDER: function(indexer, newNode, nextNode) {
-        var returnVal = OpenLayers.ElementsIndexer.IndexingMethods.Z_ORDER(
-            indexer, 
-            newNode, 
-            nextNode
-        );
-        
-        // Make Z_ORDER subscribe to drawing order by pushing it above
-        // all of the other nodes with the same z-index.
-        if (nextNode && returnVal == 0) {
-            returnVal = 1;
-        }
-        
-        return returnVal;
-    },
-
-    /**
-     * APIMethod: Z_ORDER_Y_ORDER
-     * This one should really be called Z_ORDER_Y_ORDER_DRAWING_ORDER, as it
-     *     best describes which ordering methods have precedence (though, the 
-     *     name would be too long). This method orders nodes by their z-index, 
-     *     but does so in a way that, if there are other nodes with the same 
-     *     z-index, the nodes with the lower y position will be "closer" than 
-     *     those with a higher y position. If two nodes have the exact same y 
-     *     position, however, then this method will revert to using drawing  
-     *     order to decide placement.
-     * 
-     * Parameters:
-     * indexer - {<OpenLayers.ElementsIndexer>}
-     * newNode - {DOMElement}
-     * nextNode - {DOMElement}
-     * 
-     * Returns:
-     * {Integer}
-     */
-    Z_ORDER_Y_ORDER: function(indexer, newNode, nextNode) {
-        var returnVal = OpenLayers.ElementsIndexer.IndexingMethods.Z_ORDER(
-            indexer, 
-            newNode, 
-            nextNode
-        );
-        
-        if (nextNode && returnVal === 0) {            
-            var result = nextNode._boundsBottom - newNode._boundsBottom;
-            returnVal = (result === 0) ? 1 : result;
-        }
-        
-        return returnVal;       
-    }
-};
-
-/**
- * Class: OpenLayers.Renderer.Elements
- * This is another virtual class in that it should never be instantiated by 
- *  itself as a Renderer. It exists because there is *tons* of shared 
- *  functionality between different vector libraries which use nodes/elements
- *  as a base for rendering vectors. 
- * 
- * The highlevel bits of code that are implemented here are the adding and 
- *  removing of geometries, which is essentially the same for any 
- *  element-based renderer. The details of creating each node and drawing the
- *  paths are of course different, but the machinery is the same. 
- * 
- * Inherits:
- *  - <OpenLayers.Renderer>
- */
-OpenLayers.Renderer.Elements = OpenLayers.Class(OpenLayers.Renderer, {
-
-    /**
-     * Property: rendererRoot
-     * {DOMElement}
-     */
-    rendererRoot: null,
-    
-    /**
-     * Property: root
-     * {DOMElement}
-     */
-    root: null,
-    
-    /**
-     * Property: vectorRoot
-     * {DOMElement}
-     */
-    vectorRoot: null,
-
-    /**
-     * Property: textRoot
-     * {DOMElement}
-     */
-    textRoot: null,
-
-    /**
-     * Property: xmlns
-     * {String}
-     */    
-    xmlns: null,
-    
-    /**
-     * Property: xOffset
-     * {Number} Offset to apply to the renderer viewport translation in x
-     * direction. If the renderer extent's center is on the right of the
-     * dateline (i.e. exceeds the world bounds), we shift the viewport to the
-     * left by one world width. This avoids that features disappear from the
-     * map viewport. Because our dateline handling logic in other places
-     * ensures that extents crossing the dateline always have a center
-     * exceeding the world bounds on the left, we need this offset to make sure
-     * that the same is true for the renderer extent in pixel space as well.
-     */
-    xOffset: 0,
-    
-    /**
-     * Property: rightOfDateLine
-     * {Boolean} Keeps track of the location of the map extent relative to the
-     * date line. The <setExtent> method compares this value (which is the one
-     * from the previous <setExtent> call) with the current position of the map
-     * extent relative to the date line and updates the xOffset when the extent
-     * has moved from one side of the date line to the other.
-     */
-    
-    /**
-     * Property: Indexer
-     * {<OpenLayers.ElementIndexer>} An instance of OpenLayers.ElementsIndexer 
-     *     created upon initialization if the zIndexing or yOrdering options
-     *     passed to this renderer's constructor are set to true.
-     */
-    indexer: null, 
-    
-    /**
-     * Constant: BACKGROUND_ID_SUFFIX
-     * {String}
-     */
-    BACKGROUND_ID_SUFFIX: "_background",
-    
-    /**
-     * Constant: LABEL_ID_SUFFIX
-     * {String}
-     */
-    LABEL_ID_SUFFIX: "_label",
-    
-    /**
-     * Constant: LABEL_OUTLINE_SUFFIX
-     * {String}
-     */
-    LABEL_OUTLINE_SUFFIX: "_outline",
-
-    /**
-     * Constructor: OpenLayers.Renderer.Elements
-     * 
-     * Parameters:
-     * containerID - {String}
-     * options - {Object} options for this renderer. 
-     *
-     * Supported options are:
-     *     yOrdering - {Boolean} Whether to use y-ordering
-     *     zIndexing - {Boolean} Whether to use z-indexing. Will be ignored
-     *         if yOrdering is set to true.
-     */
-    initialize: function(containerID, options) {
-        OpenLayers.Renderer.prototype.initialize.apply(this, arguments);
-
-        this.rendererRoot = this.createRenderRoot();
-        this.root = this.createRoot("_root");
-        this.vectorRoot = this.createRoot("_vroot");
-        this.textRoot = this.createRoot("_troot");
-        
-        this.root.appendChild(this.vectorRoot);
-        this.root.appendChild(this.textRoot);
-        
-        this.rendererRoot.appendChild(this.root);
-        this.container.appendChild(this.rendererRoot);
-        
-        if(options && (options.zIndexing || options.yOrdering)) {
-            this.indexer = new OpenLayers.ElementsIndexer(options.yOrdering);
-        }
-    },
-    
-    /**
-     * Method: destroy
-     */
-    destroy: function() {
-
-        this.clear(); 
-
-        this.rendererRoot = null;
-        this.root = null;
-        this.xmlns = null;
-
-        OpenLayers.Renderer.prototype.destroy.apply(this, arguments);
-    },
-    
-    /**
-     * Method: clear
-     * Remove all the elements from the root
-     */    
-    clear: function() {
-        var child;
-        var root = this.vectorRoot;
-        if (root) {
-            while (child = root.firstChild) {
-                root.removeChild(child);
-            }
-        }
-        root = this.textRoot;
-        if (root) {
-            while (child = root.firstChild) {
-                root.removeChild(child);
-            }
-        }
-        if (this.indexer) {
-            this.indexer.clear();
-        }
-    },
-    
-    /**
-     * Method: setExtent
-     * Set the visible part of the layer.
-     *
-     * Parameters:
-     * extent - {<OpenLayers.Bounds>}
-     * resolutionChanged - {Boolean}
-     *
-     * Returns:
-     * {Boolean} true to notify the layer that the new extent does not exceed
-     *     the coordinate range, and the features will not need to be redrawn.
-     *     False otherwise.
-     */
-    setExtent: function(extent, resolutionChanged) {
-        var coordSysUnchanged = OpenLayers.Renderer.prototype.setExtent.apply(this, arguments);
-        var resolution = this.getResolution();
-        if (this.map.baseLayer && this.map.baseLayer.wrapDateLine) {
-            var rightOfDateLine,
-                ratio = extent.getWidth() / this.map.getExtent().getWidth(),
-                extent = extent.scale(1 / ratio),
-                world = this.map.getMaxExtent();
-            if (world.right > extent.left && world.right < extent.right) {
-                rightOfDateLine = true;
-            } else if (world.left > extent.left && world.left < extent.right) {
-                rightOfDateLine = false;
-            }
-            if (rightOfDateLine !== this.rightOfDateLine || resolutionChanged) {
-                coordSysUnchanged = false;
-                this.xOffset = rightOfDateLine === true ?
-                    world.getWidth() / resolution : 0;
-            }
-            this.rightOfDateLine = rightOfDateLine;
-        }
-        return coordSysUnchanged;
-    },
-
-    /** 
-     * Method: getNodeType
-     * This function is in charge of asking the specific renderer which type
-     *     of node to create for the given geometry and style. All geometries
-     *     in an Elements-based renderer consist of one node and some
-     *     attributes. We have the nodeFactory() function which creates a node
-     *     for us, but it takes a 'type' as input, and that is precisely what
-     *     this function tells us.  
-     *  
-     * Parameters:
-     * geometry - {<OpenLayers.Geometry>}
-     * style - {Object}
-     * 
-     * Returns:
-     * {String} The corresponding node type for the specified geometry
-     */
-    getNodeType: function(geometry, style) { },
-
-    /** 
-     * Method: drawGeometry 
-     * Draw the geometry, creating new nodes, setting paths, setting style,
-     *     setting featureId on the node.  This method should only be called
-     *     by the renderer itself.
-     *
-     * Parameters:
-     * geometry - {<OpenLayers.Geometry>}
-     * style - {Object}
-     * featureId - {String}
-     * 
-     * Returns:
-     * {Boolean} true if the geometry has been drawn completely; null if
-     *     incomplete; false otherwise
-     */
-    drawGeometry: function(geometry, style, featureId) {
-        var className = geometry.CLASS_NAME;
-        var rendered = true;
-        if ((className == "OpenLayers.Geometry.Collection") ||
-            (className == "OpenLayers.Geometry.MultiPoint") ||
-            (className == "OpenLayers.Geometry.MultiLineString") ||
-            (className == "OpenLayers.Geometry.MultiPolygon")) {
-            for (var i = 0, len=geometry.components.length; i<len; i++) {
-                rendered = this.drawGeometry(
-                    geometry.components[i], style, featureId) && rendered;
-            }
-            return rendered;
-        }
-
-        rendered = false;
-        var removeBackground = false;
-        if (style.display != "none") {
-            if (style.backgroundGraphic) {
-                this.redrawBackgroundNode(geometry.id, geometry, style,
-                    featureId);
-            } else {
-                removeBackground = true;
-            }
-            rendered = this.redrawNode(geometry.id, geometry, style,
-                featureId);
-        }
-        if (rendered == false) {
-            var node = document.getElementById(geometry.id);
-            if (node) {
-                if (node._style.backgroundGraphic) {
-                    removeBackground = true;
-                }
-                node.parentNode.removeChild(node);
-            }
-        }
-        if (removeBackground) {
-            var node = document.getElementById(
-                geometry.id + this.BACKGROUND_ID_SUFFIX);
-            if (node) {
-                node.parentNode.removeChild(node);
-            }
-        }
-        return rendered;
-    },
-    
-    /**
-     * Method: redrawNode
-     * 
-     * Parameters:
-     * id - {String}
-     * geometry - {<OpenLayers.Geometry>}
-     * style - {Object}
-     * featureId - {String}
-     * 
-     * Returns:
-     * {Boolean} true if the complete geometry could be drawn, null if parts of
-     *     the geometry could not be drawn, false otherwise
-     */
-    redrawNode: function(id, geometry, style, featureId) {
-        style = this.applyDefaultSymbolizer(style);
-        // Get the node if it's already on the map.
-        var node = this.nodeFactory(id, this.getNodeType(geometry, style));
-        
-        // Set the data for the node, then draw it.
-        node._featureId = featureId;
-        node._boundsBottom = geometry.getBounds().bottom;
-        node._geometryClass = geometry.CLASS_NAME;
-        node._style = style;
-
-        var drawResult = this.drawGeometryNode(node, geometry, style);
-        if(drawResult === false) {
-            return false;
-        }
-         
-        node = drawResult.node;
-        
-        // Insert the node into the indexer so it can show us where to
-        // place it. Note that this operation is O(log(n)). If there's a
-        // performance problem (when dragging, for instance) this is
-        // likely where it would be.
-        if (this.indexer) {
-            var insert = this.indexer.insert(node);
-            if (insert) {
-                this.vectorRoot.insertBefore(node, insert);
-            } else {
-                this.vectorRoot.appendChild(node);
-            }
-        } else {
-            // if there's no indexer, simply append the node to root,
-            // but only if the node is a new one
-            if (node.parentNode !== this.vectorRoot){ 
-                this.vectorRoot.appendChild(node);
-            }
-        }
-        
-        this.postDraw(node);
-        
-        return drawResult.complete;
-    },
-    
-    /**
-     * Method: redrawBackgroundNode
-     * Redraws the node using special 'background' style properties. Basically
-     *     just calls redrawNode(), but instead of directly using the 
-     *     'externalGraphic', 'graphicXOffset', 'graphicYOffset', and 
-     *     'graphicZIndex' properties directly from the specified 'style' 
-     *     parameter, we create a new style object and set those properties 
-     *     from the corresponding 'background'-prefixed properties from 
-     *     specified 'style' parameter.
-     * 
-     * Parameters:
-     * id - {String}
-     * geometry - {<OpenLayers.Geometry>}
-     * style - {Object}
-     * featureId - {String}
-     * 
-     * Returns:
-     * {Boolean} true if the complete geometry could be drawn, null if parts of
-     *     the geometry could not be drawn, false otherwise
-     */
-    redrawBackgroundNode: function(id, geometry, style, featureId) {
-        var backgroundStyle = OpenLayers.Util.extend({}, style);
-        
-        // Set regular style attributes to apply to the background styles.
-        backgroundStyle.externalGraphic = backgroundStyle.backgroundGraphic;
-        backgroundStyle.graphicXOffset = backgroundStyle.backgroundXOffset;
-        backgroundStyle.graphicYOffset = backgroundStyle.backgroundYOffset;
-        backgroundStyle.graphicZIndex = backgroundStyle.backgroundGraphicZIndex;
-        backgroundStyle.graphicWidth = backgroundStyle.backgroundWidth || backgroundStyle.graphicWidth;
-        backgroundStyle.graphicHeight = backgroundStyle.backgroundHeight || backgroundStyle.graphicHeight;
-        
-        // Erase background styles.
-        backgroundStyle.backgroundGraphic = null;
-        backgroundStyle.backgroundXOffset = null;
-        backgroundStyle.backgroundYOffset = null;
-        backgroundStyle.backgroundGraphicZIndex = null;
-        
-        return this.redrawNode(
-            id + this.BACKGROUND_ID_SUFFIX, 
-            geometry, 
-            backgroundStyle, 
-            null
-        );
-    },
-
-    /**
-     * Method: drawGeometryNode
-     * Given a node, draw a geometry on the specified layer.
-     *     node and geometry are required arguments, style is optional.
-     *     This method is only called by the render itself.
-     *
-     * Parameters:
-     * node - {DOMElement}
-     * geometry - {<OpenLayers.Geometry>}
-     * style - {Object}
-     * 
-     * Returns:
-     * {Object} a hash with properties "node" (the drawn node) and "complete"
-     *     (null if parts of the geometry could not be drawn, false if nothing
-     *     could be drawn)
-     */
-    drawGeometryNode: function(node, geometry, style) {
-        style = style || node._style;
-
-        var options = {
-            'isFilled': style.fill === undefined ?
-                true :
-                style.fill,
-            'isStroked': style.stroke === undefined ?
-                !!style.strokeWidth :
-                style.stroke
-        };
-        var drawn;
-        switch (geometry.CLASS_NAME) {
-            case "OpenLayers.Geometry.Point":
-                if(style.graphic === false) {
-                    options.isFilled = false;
-                    options.isStroked = false;
-                }
-                drawn = this.drawPoint(node, geometry);
-                break;
-            case "OpenLayers.Geometry.LineString":
-                options.isFilled = false;
-                drawn = this.drawLineString(node, geometry);
-                break;
-            case "OpenLayers.Geometry.LinearRing":
-                drawn = this.drawLinearRing(node, geometry);
-                break;
-            case "OpenLayers.Geometry.Polygon":
-                drawn = this.drawPolygon(node, geometry);
-                break;
-            case "OpenLayers.Geometry.Rectangle":
-                drawn = this.drawRectangle(node, geometry);
-                break;
-            default:
-                break;
-        }
-
-        node._options = options; 
-
-        //set style
-        //TBD simplify this
-        if (drawn != false) {
-            return {
-                node: this.setStyle(node, style, options, geometry),
-                complete: drawn
-            };
-        } else {
-            return false;
-        }
-    },
-    
-    /**
-     * Method: postDraw
-     * Things that have do be done after the geometry node is appended
-     *     to its parent node. To be overridden by subclasses.
-     * 
-     * Parameters:
-     * node - {DOMElement}
-     */
-    postDraw: function(node) {},
-    
-    /**
-     * Method: drawPoint
-     * Virtual function for drawing Point Geometry. 
-     *     Should be implemented by subclasses.
-     *     This method is only called by the renderer itself.
-     * 
-     * Parameters: 
-     * node - {DOMElement}
-     * geometry - {<OpenLayers.Geometry>}
-     * 
-     * Returns:
-     * {DOMElement} or false if the renderer could not draw the point
-     */ 
-    drawPoint: function(node, geometry) {},
-
-    /**
-     * Method: drawLineString
-     * Virtual function for drawing LineString Geometry. 
-     *     Should be implemented by subclasses.
-     *     This method is only called by the renderer itself.
-     * 
-     * Parameters: 
-     * node - {DOMElement}
-     * geometry - {<OpenLayers.Geometry>}
-     * 
-     * Returns:
-     * {DOMElement} or null if the renderer could not draw all components of
-     *     the linestring, or false if nothing could be drawn
-     */ 
-    drawLineString: function(node, geometry) {},
-
-    /**
-     * Method: drawLinearRing
-     * Virtual function for drawing LinearRing Geometry. 
-     *     Should be implemented by subclasses.
-     *     This method is only called by the renderer itself.
-     * 
-     * Parameters: 
-     * node - {DOMElement}
-     * geometry - {<OpenLayers.Geometry>}
-     * 
-     * Returns:
-     * {DOMElement} or null if the renderer could not draw all components
-     *     of the linear ring, or false if nothing could be drawn
-     */ 
-    drawLinearRing: function(node, geometry) {},
-
-    /**
-     * Method: drawPolygon
-     * Virtual function for drawing Polygon Geometry. 
-     *    Should be implemented by subclasses.
-     *    This method is only called by the renderer itself.
-     * 
-     * Parameters: 
-     * node - {DOMElement}
-     * geometry - {<OpenLayers.Geometry>}
-     * 
-     * Returns:
-     * {DOMElement} or null if the renderer could not draw all components
-     *     of the polygon, or false if nothing could be drawn
-     */ 
-    drawPolygon: function(node, geometry) {},
-
-    /**
-     * Method: drawRectangle
-     * Virtual function for drawing Rectangle Geometry. 
-     *     Should be implemented by subclasses.
-     *     This method is only called by the renderer itself.
-     * 
-     * Parameters: 
-     * node - {DOMElement}
-     * geometry - {<OpenLayers.Geometry>}
-     * 
-     * Returns:
-     * {DOMElement} or false if the renderer could not draw the rectangle
-     */ 
-    drawRectangle: function(node, geometry) {},
-
-    /**
-     * Method: drawCircle
-     * Virtual function for drawing Circle Geometry. 
-     *     Should be implemented by subclasses.
-     *     This method is only called by the renderer itself.
-     * 
-     * Parameters: 
-     * node - {DOMElement}
-     * geometry - {<OpenLayers.Geometry>}
-     * 
-     * Returns:
-     * {DOMElement} or false if the renderer could not draw the circle
-     */ 
-    drawCircle: function(node, geometry) {},
-
-    /**
-     * Method: removeText
-     * Removes a label
-     * 
-     * Parameters:
-     * featureId - {String}
-     */
-    removeText: function(featureId) {
-        var label = document.getElementById(featureId + this.LABEL_ID_SUFFIX);
-        if (label) {
-            this.textRoot.removeChild(label);
-        }
-        var outline = document.getElementById(featureId + this.LABEL_OUTLINE_SUFFIX);
-        if (outline) {
-            this.textRoot.removeChild(outline);
-        }
-    },
-
-    /**
-     * Method: getFeatureIdFromEvent
-     * 
-     * Parameters:
-     * evt - {Object} An <OpenLayers.Event> object
-     *
-     * Returns:
-     * {String} A feature id or undefined.
-     */
-    getFeatureIdFromEvent: function(evt) {
-        var target = evt.target;
-        var useElement = target && target.correspondingUseElement;
-        var node = useElement ? useElement : (target || evt.srcElement);
-        return node._featureId;
-    },
-
-    /** 
-     * Method: eraseGeometry
-     * Erase a geometry from the renderer. In the case of a multi-geometry, 
-     *     we cycle through and recurse on ourselves. Otherwise, we look for a 
-     *     node with the geometry.id, destroy its geometry, and remove it from
-     *     the DOM.
-     * 
-     * Parameters:
-     * geometry - {<OpenLayers.Geometry>}
-     * featureId - {String}
-     */
-    eraseGeometry: function(geometry, featureId) {
-        if ((geometry.CLASS_NAME == "OpenLayers.Geometry.MultiPoint") ||
-            (geometry.CLASS_NAME == "OpenLayers.Geometry.MultiLineString") ||
-            (geometry.CLASS_NAME == "OpenLayers.Geometry.MultiPolygon") ||
-            (geometry.CLASS_NAME == "OpenLayers.Geometry.Collection")) {
-            for (var i=0, len=geometry.components.length; i<len; i++) {
-                this.eraseGeometry(geometry.components[i], featureId);
-            }
-        } else {    
-            var element = OpenLayers.Util.getElement(geometry.id);
-            if (element && element.parentNode) {
-                if (element.geometry) {
-                    element.geometry.destroy();
-                    element.geometry = null;
-                }
-                element.parentNode.removeChild(element);
-
-                if (this.indexer) {
-                    this.indexer.remove(element);
-                }
-                
-                if (element._style.backgroundGraphic) {
-                    var backgroundId = geometry.id + this.BACKGROUND_ID_SUFFIX;
-                    var bElem = OpenLayers.Util.getElement(backgroundId);
-                    if (bElem && bElem.parentNode) {
-                        // No need to destroy the geometry since the element and the background
-                        // node share the same geometry.
-                        bElem.parentNode.removeChild(bElem);
-                    }
-                }
-            }
-        }
-    },
-
-    /** 
-     * Method: nodeFactory
-     * Create new node of the specified type, with the (optional) specified id.
-     * 
-     * If node already exists with same ID and a different type, we remove it
-     *     and then call ourselves again to recreate it.
-     * 
-     * Parameters:
-     * id - {String}
-     * type - {String} type Kind of node to draw.
-     * 
-     * Returns:
-     * {DOMElement} A new node of the given type and id.
-     */
-    nodeFactory: function(id, type) {
-        var node = OpenLayers.Util.getElement(id);
-        if (node) {
-            if (!this.nodeTypeCompare(node, type)) {
-                node.parentNode.removeChild(node);
-                node = this.nodeFactory(id, type);
-            }
-        } else {
-            node = this.createNode(type, id);
-        }
-        return node;
-    },
-    
-    /** 
-     * Method: nodeTypeCompare
-     * 
-     * Parameters:
-     * node - {DOMElement}
-     * type - {String} Kind of node
-     * 
-     * Returns:
-     * {Boolean} Whether or not the specified node is of the specified type
-     *     This function must be overridden by subclasses.
-     */
-    nodeTypeCompare: function(node, type) {},
-    
-    /** 
-     * Method: createNode
-     * 
-     * Parameters:
-     * type - {String} Kind of node to draw.
-     * id - {String} Id for node.
-     * 
-     * Returns:
-     * {DOMElement} A new node of the given type and id.
-     *     This function must be overridden by subclasses.
-     */
-    createNode: function(type, id) {},
-
-    /**
-     * Method: moveRoot
-     * moves this renderer's root to a different renderer.
-     * 
-     * Parameters:
-     * renderer - {<OpenLayers.Renderer>} target renderer for the moved root
-     */
-    moveRoot: function(renderer) {
-        var root = this.root;
-        if(renderer.root.parentNode == this.rendererRoot) {
-            root = renderer.root;
-        }
-        root.parentNode.removeChild(root);
-        renderer.rendererRoot.appendChild(root);
-    },
-    
-    /**
-     * Method: getRenderLayerId
-     * Gets the layer that this renderer's output appears on. If moveRoot was
-     * used, this will be different from the id of the layer containing the
-     * features rendered by this renderer.
-     * 
-     * Returns:
-     * {String} the id of the output layer.
-     */
-    getRenderLayerId: function() {
-        return this.root.parentNode.parentNode.id;
-    },
-    
-    /**
-     * Method: isComplexSymbol
-     * Determines if a symbol cannot be rendered using drawCircle
-     * 
-     * Parameters:
-     * graphicName - {String}
-     * 
-     * Returns
-     * {Boolean} true if the symbol is complex, false if not
-     */
-    isComplexSymbol: function(graphicName) {
-        return (graphicName != "circle") && !!graphicName;
-    },
-
-    CLASS_NAME: "OpenLayers.Renderer.Elements"
-});
-
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Renderer/SVG.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Renderer/SVG.js
deleted file mode 100644
index 263aac0b..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Renderer/SVG.js
+++ /dev/null
@@ -1,1012 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Renderer/Elements.js
- */
-
-/**
- * Class: OpenLayers.Renderer.SVG
- * 
- * Inherits:
- *  - <OpenLayers.Renderer.Elements>
- */
-OpenLayers.Renderer.SVG = OpenLayers.Class(OpenLayers.Renderer.Elements, {
-
-    /** 
-     * Property: xmlns
-     * {String}
-     */
-    xmlns: "http://www.w3.org/2000/svg",
-    
-    /**
-     * Property: xlinkns
-     * {String}
-     */
-    xlinkns: "http://www.w3.org/1999/xlink",
-
-    /**
-     * Constant: MAX_PIXEL
-     * {Integer} Firefox has a limitation where values larger or smaller than  
-     *           about 15000 in an SVG document lock the browser up. This 
-     *           works around it.
-     */
-    MAX_PIXEL: 15000,
-
-    /**
-     * Property: translationParameters
-     * {Object} Hash with "x" and "y" properties
-     */
-    translationParameters: null,
-    
-    /**
-     * Property: symbolMetrics
-     * {Object} Cache for symbol metrics according to their svg coordinate
-     *     space. This is an object keyed by the symbol's id, and values are
-     *     an array of [width, centerX, centerY].
-     */
-    symbolMetrics: null,
-    
-    /**
-     * Constructor: OpenLayers.Renderer.SVG
-     * 
-     * Parameters:
-     * containerID - {String}
-     */
-    initialize: function(containerID) {
-        if (!this.supported()) { 
-            return; 
-        }
-        OpenLayers.Renderer.Elements.prototype.initialize.apply(this, 
-                                                                arguments);
-        this.translationParameters = {x: 0, y: 0};
-        
-        this.symbolMetrics = {};
-    },
-
-    /**
-     * APIMethod: supported
-     * 
-     * Returns:
-     * {Boolean} Whether or not the browser supports the SVG renderer
-     */
-    supported: function() {
-        var svgFeature = "http://www.w3.org/TR/SVG11/feature#";
-        return (document.implementation && 
-           (document.implementation.hasFeature("org.w3c.svg", "1.0") || 
-            document.implementation.hasFeature(svgFeature + "SVG", "1.1") || 
-            document.implementation.hasFeature(svgFeature + "BasicStructure", "1.1") ));
-    },    
-
-    /**
-     * Method: inValidRange
-     * See #669 for more information
-     *
-     * Parameters:
-     * x      - {Integer}
-     * y      - {Integer}
-     * xyOnly - {Boolean} whether or not to just check for x and y, which means
-     *     to not take the current translation parameters into account if true.
-     * 
-     * Returns:
-     * {Boolean} Whether or not the 'x' and 'y' coordinates are in the  
-     *           valid range.
-     */ 
-    inValidRange: function(x, y, xyOnly) {
-        var left = x + (xyOnly ? 0 : this.translationParameters.x);
-        var top = y + (xyOnly ? 0 : this.translationParameters.y);
-        return (left >= -this.MAX_PIXEL && left <= this.MAX_PIXEL &&
-                top >= -this.MAX_PIXEL && top <= this.MAX_PIXEL);
-    },
-
-    /**
-     * Method: setExtent
-     * 
-     * Parameters:
-     * extent - {<OpenLayers.Bounds>}
-     * resolutionChanged - {Boolean}
-     * 
-     * Returns:
-     * {Boolean} true to notify the layer that the new extent does not exceed
-     *     the coordinate range, and the features will not need to be redrawn.
-     *     False otherwise.
-     */
-    setExtent: function(extent, resolutionChanged) {
-        var coordSysUnchanged = OpenLayers.Renderer.Elements.prototype.setExtent.apply(this, arguments);
-        
-        var resolution = this.getResolution(),
-            left = -extent.left / resolution,
-            top = extent.top / resolution;
-
-        // If the resolution has changed, start over changing the corner, because
-        // the features will redraw.
-        if (resolutionChanged) {
-            this.left = left;
-            this.top = top;
-            // Set the viewbox
-            var extentString = "0 0 " + this.size.w + " " + this.size.h;
-
-            this.rendererRoot.setAttributeNS(null, "viewBox", extentString);
-            this.translate(this.xOffset, 0);
-            return true;
-        } else {
-            var inRange = this.translate(left - this.left + this.xOffset, top - this.top);
-            if (!inRange) {
-                // recenter the coordinate system
-                this.setExtent(extent, true);
-            }
-            return coordSysUnchanged && inRange;
-        }
-    },
-    
-    /**
-     * Method: translate
-     * Transforms the SVG coordinate system
-     * 
-     * Parameters:
-     * x - {Float}
-     * y - {Float}
-     * 
-     * Returns:
-     * {Boolean} true if the translation parameters are in the valid coordinates
-     *     range, false otherwise.
-     */
-    translate: function(x, y) {
-        if (!this.inValidRange(x, y, true)) {
-            return false;
-        } else {
-            var transformString = "";
-            if (x || y) {
-                transformString = "translate(" + x + "," + y + ")";
-            }
-            this.root.setAttributeNS(null, "transform", transformString);
-            this.translationParameters = {x: x, y: y};
-            return true;
-        }
-    },
-
-    /**
-     * Method: setSize
-     * Sets the size of the drawing surface.
-     * 
-     * Parameters:
-     * size - {<OpenLayers.Size>} The size of the drawing surface
-     */
-    setSize: function(size) {
-        OpenLayers.Renderer.prototype.setSize.apply(this, arguments);
-        
-        this.rendererRoot.setAttributeNS(null, "width", this.size.w);
-        this.rendererRoot.setAttributeNS(null, "height", this.size.h);
-    },
-
-    /** 
-     * Method: getNodeType 
-     * 
-     * Parameters:
-     * geometry - {<OpenLayers.Geometry>}
-     * style - {Object}
-     * 
-     * Returns:
-     * {String} The corresponding node type for the specified geometry
-     */
-    getNodeType: function(geometry, style) {
-        var nodeType = null;
-        switch (geometry.CLASS_NAME) {
-            case "OpenLayers.Geometry.Point":
-                if (style.externalGraphic) {
-                    nodeType = "image";
-                } else if (this.isComplexSymbol(style.graphicName)) {
-                    nodeType = "svg";
-                } else {
-                    nodeType = "circle";
-                }
-                break;
-            case "OpenLayers.Geometry.Rectangle":
-                nodeType = "rect";
-                break;
-            case "OpenLayers.Geometry.LineString":
-                nodeType = "polyline";
-                break;
-            case "OpenLayers.Geometry.LinearRing":
-                nodeType = "polygon";
-                break;
-            case "OpenLayers.Geometry.Polygon":
-            case "OpenLayers.Geometry.Curve":
-                nodeType = "path";
-                break;
-            default:
-                break;
-        }
-        return nodeType;
-    },
-
-    /** 
-     * Method: setStyle
-     * Use to set all the style attributes to a SVG node.
-     * 
-     * Takes care to adjust stroke width and point radius to be
-     * resolution-relative
-     *
-     * Parameters:
-     * node - {SVGDomElement} An SVG element to decorate
-     * style - {Object}
-     * options - {Object} Currently supported options include 
-     *                              'isFilled' {Boolean} and
-     *                              'isStroked' {Boolean}
-     */
-    setStyle: function(node, style, options) {
-        style = style  || node._style;
-        options = options || node._options;
-
-        var title = style.title || style.graphicTitle;
-        if (title) {
-            node.setAttributeNS(null, "title", title);
-            //Standards-conformant SVG
-            // Prevent duplicate nodes. See issue https://github.com/openlayers/openlayers/issues/92 
-            var titleNode = node.getElementsByTagName("title");
-            if (titleNode.length > 0) {
-                titleNode[0].firstChild.textContent = title;
-            } else {
-                var label = this.nodeFactory(null, "title");
-                label.textContent = title;
-                node.appendChild(label);
-            }
-        }
-
-        var r = parseFloat(node.getAttributeNS(null, "r"));
-        var widthFactor = 1;
-        var pos;
-        if (node._geometryClass == "OpenLayers.Geometry.Point" && r) {
-            node.style.visibility = "";
-            if (style.graphic === false) {
-                node.style.visibility = "hidden";
-            } else if (style.externalGraphic) {
-                pos = this.getPosition(node);
-                if (style.graphicWidth && style.graphicHeight) {
-                  node.setAttributeNS(null, "preserveAspectRatio", "none");
-                }
-                var width = style.graphicWidth || style.graphicHeight;
-                var height = style.graphicHeight || style.graphicWidth;
-                width = width ? width : style.pointRadius*2;
-                height = height ? height : style.pointRadius*2;
-                var xOffset = (style.graphicXOffset != undefined) ?
-                    style.graphicXOffset : -(0.5 * width);
-                var yOffset = (style.graphicYOffset != undefined) ?
-                    style.graphicYOffset : -(0.5 * height);
-
-                var opacity = style.graphicOpacity || style.fillOpacity;
-                
-                node.setAttributeNS(null, "x", (pos.x + xOffset).toFixed());
-                node.setAttributeNS(null, "y", (pos.y + yOffset).toFixed());
-                node.setAttributeNS(null, "width", width);
-                node.setAttributeNS(null, "height", height);
-                node.setAttributeNS(this.xlinkns, "xlink:href", style.externalGraphic);
-                node.setAttributeNS(null, "style", "opacity: "+opacity);
-                node.onclick = OpenLayers.Event.preventDefault;
-            } else if (this.isComplexSymbol(style.graphicName)) {
-                // the symbol viewBox is three times as large as the symbol
-                var offset = style.pointRadius * 3;
-                var size = offset * 2;
-                var src = this.importSymbol(style.graphicName);
-                pos = this.getPosition(node);
-                widthFactor = this.symbolMetrics[src.id][0] * 3 / size;
-                
-                // remove the node from the dom before we modify it. This
-                // prevents various rendering issues in Safari and FF
-                var parent = node.parentNode;
-                var nextSibling = node.nextSibling;
-                if(parent) {
-                    parent.removeChild(node);
-                }
-                
-                // The more appropriate way to implement this would be use/defs,
-                // but due to various issues in several browsers, it is safer to
-                // copy the symbols instead of referencing them. 
-                // See e.g. ticket http://trac.osgeo.org/openlayers/ticket/2985 
-                // and this email thread
-                // http://osgeo-org.1803224.n2.nabble.com/Select-Control-Ctrl-click-on-Feature-with-a-graphicName-opens-new-browser-window-tc5846039.html
-                node.firstChild && node.removeChild(node.firstChild);
-                node.appendChild(src.firstChild.cloneNode(true));
-                node.setAttributeNS(null, "viewBox", src.getAttributeNS(null, "viewBox"));
-                
-                node.setAttributeNS(null, "width", size);
-                node.setAttributeNS(null, "height", size);
-                node.setAttributeNS(null, "x", pos.x - offset);
-                node.setAttributeNS(null, "y", pos.y - offset);
-                
-                // now that the node has all its new properties, insert it
-                // back into the dom where it was
-                if(nextSibling) {
-                    parent.insertBefore(node, nextSibling);
-                } else if(parent) {
-                    parent.appendChild(node);
-                }
-            } else {
-                node.setAttributeNS(null, "r", style.pointRadius);
-            }
-
-            var rotation = style.rotation;
-            
-            if ((rotation !== undefined || node._rotation !== undefined) && pos) {
-                node._rotation = rotation;
-                rotation |= 0;
-                if (node.nodeName !== "svg") { 
-                    node.setAttributeNS(null, "transform", 
-                        "rotate(" + rotation + " " + pos.x + " " + 
-                        pos.y + ")"); 
-                } else {
-                    var metrics = this.symbolMetrics[src.id];
-                    node.firstChild.setAttributeNS(null, "transform", "rotate(" 
-                        + rotation + " " 
-                        + metrics[1] + " "
-                        + metrics[2] + ")");
-                }
-            }
-        }
-        
-        if (options.isFilled) {
-            node.setAttributeNS(null, "fill", style.fillColor);
-            node.setAttributeNS(null, "fill-opacity", style.fillOpacity);
-        } else {
-            node.setAttributeNS(null, "fill", "none");
-        }
-
-        if (options.isStroked) {
-            node.setAttributeNS(null, "stroke", style.strokeColor);
-            node.setAttributeNS(null, "stroke-opacity", style.strokeOpacity);
-            node.setAttributeNS(null, "stroke-width", style.strokeWidth * widthFactor);
-            node.setAttributeNS(null, "stroke-linecap", style.strokeLinecap || "round");
-            // Hard-coded linejoin for now, to make it look the same as in VML.
-            // There is no strokeLinejoin property yet for symbolizers.
-            node.setAttributeNS(null, "stroke-linejoin", "round");
-            style.strokeDashstyle && node.setAttributeNS(null,
-                "stroke-dasharray", this.dashStyle(style, widthFactor));
-        } else {
-            node.setAttributeNS(null, "stroke", "none");
-        }
-        
-        if (style.pointerEvents) {
-            node.setAttributeNS(null, "pointer-events", style.pointerEvents);
-        }
-                
-        if (style.cursor != null) {
-            node.setAttributeNS(null, "cursor", style.cursor);
-        }
-        
-        return node;
-    },
-
-    /** 
-     * Method: dashStyle
-     * 
-     * Parameters:
-     * style - {Object}
-     * widthFactor - {Number}
-     * 
-     * Returns:
-     * {String} A SVG compliant 'stroke-dasharray' value
-     */
-    dashStyle: function(style, widthFactor) {
-        var w = style.strokeWidth * widthFactor;
-        var str = style.strokeDashstyle;
-        switch (str) {
-            case 'solid':
-                return 'none';
-            case 'dot':
-                return [1, 4 * w].join();
-            case 'dash':
-                return [4 * w, 4 * w].join();
-            case 'dashdot':
-                return [4 * w, 4 * w, 1, 4 * w].join();
-            case 'longdash':
-                return [8 * w, 4 * w].join();
-            case 'longdashdot':
-                return [8 * w, 4 * w, 1, 4 * w].join();
-            default:
-                return OpenLayers.String.trim(str).replace(/\s+/g, ",");
-        }
-    },
-    
-    /** 
-     * Method: createNode
-     * 
-     * Parameters:
-     * type - {String} Kind of node to draw
-     * id - {String} Id for node
-     * 
-     * Returns:
-     * {DOMElement} A new node of the given type and id
-     */
-    createNode: function(type, id) {
-        var node = document.createElementNS(this.xmlns, type);
-        if (id) {
-            node.setAttributeNS(null, "id", id);
-        }
-        return node;    
-    },
-    
-    /** 
-     * Method: nodeTypeCompare
-     * 
-     * Parameters:
-     * node - {SVGDomElement} An SVG element
-     * type - {String} Kind of node
-     * 
-     * Returns:
-     * {Boolean} Whether or not the specified node is of the specified type
-     */
-    nodeTypeCompare: function(node, type) {
-        return (type == node.nodeName);
-    },
-   
-    /**
-     * Method: createRenderRoot
-     * 
-     * Returns:
-     * {DOMElement} The specific render engine's root element
-     */
-    createRenderRoot: function() {
-        var svg = this.nodeFactory(this.container.id + "_svgRoot", "svg");
-        svg.style.display = "block";
-        return svg;
-    },
-
-    /**
-     * Method: createRoot
-     * 
-     * Parameters:
-     * suffix - {String} suffix to append to the id
-     * 
-     * Returns:
-     * {DOMElement}
-     */
-    createRoot: function(suffix) {
-        return this.nodeFactory(this.container.id + suffix, "g");
-    },
-
-    /**
-     * Method: createDefs
-     *
-     * Returns:
-     * {DOMElement} The element to which we'll add the symbol definitions
-     */
-    createDefs: function() {
-        var defs = this.nodeFactory(this.container.id + "_defs", "defs");
-        this.rendererRoot.appendChild(defs);
-        return defs;
-    },
-
-    /**************************************
-     *                                    *
-     *     GEOMETRY DRAWING FUNCTIONS     *
-     *                                    *
-     **************************************/
-
-    /**
-     * Method: drawPoint
-     * This method is only called by the renderer itself.
-     * 
-     * Parameters: 
-     * node - {DOMElement}
-     * geometry - {<OpenLayers.Geometry>}
-     * 
-     * Returns:
-     * {DOMElement} or false if the renderer could not draw the point
-     */ 
-    drawPoint: function(node, geometry) {
-        return this.drawCircle(node, geometry, 1);
-    },
-
-    /**
-     * Method: drawCircle
-     * This method is only called by the renderer itself.
-     * 
-     * Parameters: 
-     * node - {DOMElement}
-     * geometry - {<OpenLayers.Geometry>}
-     * radius - {Float}
-     * 
-     * Returns:
-     * {DOMElement} or false if the renderer could not draw the circle
-     */
-    drawCircle: function(node, geometry, radius) {
-        var resolution = this.getResolution();
-        var x = ((geometry.x - this.featureDx) / resolution + this.left);
-        var y = (this.top - geometry.y / resolution);
-
-        if (this.inValidRange(x, y)) { 
-            node.setAttributeNS(null, "cx", x);
-            node.setAttributeNS(null, "cy", y);
-            node.setAttributeNS(null, "r", radius);
-            return node;
-        } else {
-            return false;
-        }    
-            
-    },
-    
-    /**
-     * Method: drawLineString
-     * This method is only called by the renderer itself.
-     * 
-     * Parameters: 
-     * node - {DOMElement}
-     * geometry - {<OpenLayers.Geometry>}
-     * 
-     * Returns:
-     * {DOMElement} or null if the renderer could not draw all components of
-     *     the linestring, or false if nothing could be drawn
-     */ 
-    drawLineString: function(node, geometry) {
-        var componentsResult = this.getComponentsString(geometry.components);
-        if (componentsResult.path) {
-            node.setAttributeNS(null, "points", componentsResult.path);
-            return (componentsResult.complete ? node : null);  
-        } else {
-            return false;
-        }
-    },
-    
-    /**
-     * Method: drawLinearRing
-     * This method is only called by the renderer itself.
-     * 
-     * Parameters: 
-     * node - {DOMElement}
-     * geometry - {<OpenLayers.Geometry>}
-     * 
-     * Returns:
-     * {DOMElement} or null if the renderer could not draw all components
-     *     of the linear ring, or false if nothing could be drawn
-     */ 
-    drawLinearRing: function(node, geometry) {
-        var componentsResult = this.getComponentsString(geometry.components);
-        if (componentsResult.path) {
-            node.setAttributeNS(null, "points", componentsResult.path);
-            return (componentsResult.complete ? node : null);  
-        } else {
-            return false;
-        }
-    },
-    
-    /**
-     * Method: drawPolygon
-     * This method is only called by the renderer itself.
-     * 
-     * Parameters: 
-     * node - {DOMElement}
-     * geometry - {<OpenLayers.Geometry>}
-     * 
-     * Returns:
-     * {DOMElement} or null if the renderer could not draw all components
-     *     of the polygon, or false if nothing could be drawn
-     */ 
-    drawPolygon: function(node, geometry) {
-        var d = "";
-        var draw = true;
-        var complete = true;
-        var linearRingResult, path;
-        for (var j=0, len=geometry.components.length; j<len; j++) {
-            d += " M";
-            linearRingResult = this.getComponentsString(
-                geometry.components[j].components, " ");
-            path = linearRingResult.path;
-            if (path) {
-                d += " " + path;
-                complete = linearRingResult.complete && complete;
-            } else {
-                draw = false;
-            }
-        }
-        d += " z";
-        if (draw) {
-            node.setAttributeNS(null, "d", d);
-            node.setAttributeNS(null, "fill-rule", "evenodd");
-            return complete ? node : null;
-        } else {
-            return false;
-        }    
-    },
-    
-    /**
-     * Method: drawRectangle
-     * This method is only called by the renderer itself.
-     * 
-     * Parameters: 
-     * node - {DOMElement}
-     * geometry - {<OpenLayers.Geometry>}
-     * 
-     * Returns:
-     * {DOMElement} or false if the renderer could not draw the rectangle
-     */ 
-    drawRectangle: function(node, geometry) {
-        var resolution = this.getResolution();
-        var x = ((geometry.x - this.featureDx) / resolution + this.left);
-        var y = (this.top - geometry.y / resolution);
-
-        if (this.inValidRange(x, y)) { 
-            node.setAttributeNS(null, "x", x);
-            node.setAttributeNS(null, "y", y);
-            node.setAttributeNS(null, "width", geometry.width / resolution);
-            node.setAttributeNS(null, "height", geometry.height / resolution);
-            return node;
-        } else {
-            return false;
-        }
-    },
-    
-    /**
-     * Method: drawText
-     * This method is only called by the renderer itself.
-     *
-     * Parameters:
-     * featureId - {String}
-     * style -
-     * location - {<OpenLayers.Geometry.Point>}
-     */
-    drawText: function(featureId, style, location) {
-        var drawOutline = (!!style.labelOutlineWidth);
-        // First draw text in halo color and size and overlay the
-        // normal text afterwards
-        if (drawOutline) {
-            var outlineStyle = OpenLayers.Util.extend({}, style);
-            outlineStyle.fontColor = outlineStyle.labelOutlineColor;
-            outlineStyle.fontStrokeColor = outlineStyle.labelOutlineColor;
-            outlineStyle.fontStrokeWidth = style.labelOutlineWidth;
-            if (style.labelOutlineOpacity) {
-                outlineStyle.fontOpacity = style.labelOutlineOpacity;
-            }
-            delete outlineStyle.labelOutlineWidth;
-            this.drawText(featureId, outlineStyle, location);
-        }
-
-        var resolution = this.getResolution();
-
-        var x = ((location.x - this.featureDx) / resolution + this.left);
-        var y = (location.y / resolution - this.top);
-
-        var suffix = (drawOutline)?this.LABEL_OUTLINE_SUFFIX:this.LABEL_ID_SUFFIX;
-        var label = this.nodeFactory(featureId + suffix, "text");
-
-        label.setAttributeNS(null, "x", x);
-        label.setAttributeNS(null, "y", -y);
-
-        if (style.fontColor) {
-            label.setAttributeNS(null, "fill", style.fontColor);
-        }
-        if (style.fontStrokeColor) {
-            label.setAttributeNS(null, "stroke", style.fontStrokeColor);
-        }
-        if (style.fontStrokeWidth) {
-            label.setAttributeNS(null, "stroke-width", style.fontStrokeWidth);
-        }
-        if (style.fontOpacity) {
-            label.setAttributeNS(null, "opacity", style.fontOpacity);
-        }
-        if (style.fontFamily) {
-            label.setAttributeNS(null, "font-family", style.fontFamily);
-        }
-        if (style.fontSize) {
-            label.setAttributeNS(null, "font-size", style.fontSize);
-        }
-        if (style.fontWeight) {
-            label.setAttributeNS(null, "font-weight", style.fontWeight);
-        }
-        if (style.fontStyle) {
-            label.setAttributeNS(null, "font-style", style.fontStyle);
-        }
-        if (style.labelSelect === true) {
-            label.setAttributeNS(null, "pointer-events", "visible");
-            label._featureId = featureId;
-        } else {
-            label.setAttributeNS(null, "pointer-events", "none");
-        }
-        var align = style.labelAlign || OpenLayers.Renderer.defaultSymbolizer.labelAlign;
-        label.setAttributeNS(null, "text-anchor",
-            OpenLayers.Renderer.SVG.LABEL_ALIGN[align[0]] || "middle");
-
-        if (OpenLayers.IS_GECKO === true) {
-            label.setAttributeNS(null, "dominant-baseline",
-                OpenLayers.Renderer.SVG.LABEL_ALIGN[align[1]] || "central");
-        }
-
-        var labelRows = style.label.split('\n');
-        var numRows = labelRows.length;
-        while (label.childNodes.length > numRows) {
-            label.removeChild(label.lastChild);
-        }
-        for (var i = 0; i < numRows; i++) {
-            var tspan = this.nodeFactory(featureId + suffix + "_tspan_" + i, "tspan");
-            if (style.labelSelect === true) {
-                tspan._featureId = featureId;
-                tspan._geometry = location;
-                tspan._geometryClass = location.CLASS_NAME;
-            }
-            if (OpenLayers.IS_GECKO === false) {
-                tspan.setAttributeNS(null, "baseline-shift",
-                    OpenLayers.Renderer.SVG.LABEL_VSHIFT[align[1]] || "-35%");
-            }
-            tspan.setAttribute("x", x);
-            if (i == 0) {
-                var vfactor = OpenLayers.Renderer.SVG.LABEL_VFACTOR[align[1]];
-                if (vfactor == null) {
-                     vfactor = -.5;
-                }
-                tspan.setAttribute("dy", (vfactor*(numRows-1)) + "em");
-            } else {
-                tspan.setAttribute("dy", "1em");
-            }
-            tspan.textContent = (labelRows[i] === '') ? ' ' : labelRows[i];
-            if (!tspan.parentNode) {
-                label.appendChild(tspan);
-            }
-        }
-
-        if (!label.parentNode) {
-            this.textRoot.appendChild(label);
-        }
-    },
-    
-    /** 
-     * Method: getComponentString
-     * 
-     * Parameters:
-     * components - {Array(<OpenLayers.Geometry.Point>)} Array of points
-     * separator - {String} character between coordinate pairs. Defaults to ","
-     * 
-     * Returns:
-     * {Object} hash with properties "path" (the string created from the
-     *     components and "complete" (false if the renderer was unable to
-     *     draw all components)
-     */
-    getComponentsString: function(components, separator) {
-        var renderCmp = [];
-        var complete = true;
-        var len = components.length;
-        var strings = [];
-        var str, component;
-        for(var i=0; i<len; i++) {
-            component = components[i];
-            renderCmp.push(component);
-            str = this.getShortString(component);
-            if (str) {
-                strings.push(str);
-            } else {
-                // The current component is outside the valid range. Let's
-                // see if the previous or next component is inside the range.
-                // If so, add the coordinate of the intersection with the
-                // valid range bounds.
-                if (i > 0) {
-                    if (this.getShortString(components[i - 1])) {
-                        strings.push(this.clipLine(components[i],
-                            components[i-1]));
-                    }
-                }
-                if (i < len - 1) {
-                    if (this.getShortString(components[i + 1])) {
-                        strings.push(this.clipLine(components[i],
-                            components[i+1]));
-                    }
-                }
-                complete = false;
-            }
-        }
-
-        return {
-            path: strings.join(separator || ","),
-            complete: complete
-        };
-    },
-    
-    /**
-     * Method: clipLine
-     * Given two points (one inside the valid range, and one outside),
-     * clips the line betweeen the two points so that the new points are both
-     * inside the valid range.
-     * 
-     * Parameters:
-     * badComponent - {<OpenLayers.Geometry.Point>} original geometry of the
-     *     invalid point
-     * goodComponent - {<OpenLayers.Geometry.Point>} original geometry of the
-     *     valid point
-     * Returns
-     * {String} the SVG coordinate pair of the clipped point (like
-     *     getShortString), or an empty string if both passed componets are at
-     *     the same point.
-     */
-    clipLine: function(badComponent, goodComponent) {
-        if (goodComponent.equals(badComponent)) {
-            return "";
-        }
-        var resolution = this.getResolution();
-        var maxX = this.MAX_PIXEL - this.translationParameters.x;
-        var maxY = this.MAX_PIXEL - this.translationParameters.y;
-        var x1 = (goodComponent.x - this.featureDx) / resolution + this.left;
-        var y1 = this.top - goodComponent.y / resolution;
-        var x2 = (badComponent.x - this.featureDx) / resolution + this.left;
-        var y2 = this.top - badComponent.y / resolution;
-        var k;
-        if (x2 < -maxX || x2 > maxX) {
-            k = (y2 - y1) / (x2 - x1);
-            x2 = x2 < 0 ? -maxX : maxX;
-            y2 = y1 + (x2 - x1) * k;
-        }
-        if (y2 < -maxY || y2 > maxY) {
-            k = (x2 - x1) / (y2 - y1);
-            y2 = y2 < 0 ? -maxY : maxY;
-            x2 = x1 + (y2 - y1) * k;
-        }
-        return x2 + "," + y2;
-    },
-
-    /** 
-     * Method: getShortString
-     * 
-     * Parameters:
-     * point - {<OpenLayers.Geometry.Point>}
-     * 
-     * Returns:
-     * {String} or false if point is outside the valid range
-     */
-    getShortString: function(point) {
-        var resolution = this.getResolution();
-        var x = ((point.x - this.featureDx) / resolution + this.left);
-        var y = (this.top - point.y / resolution);
-
-        if (this.inValidRange(x, y)) { 
-            return x + "," + y;
-        } else {
-            return false;
-        }
-    },
-    
-    /**
-     * Method: getPosition
-     * Finds the position of an svg node.
-     * 
-     * Parameters:
-     * node - {DOMElement}
-     * 
-     * Returns:
-     * {Object} hash with x and y properties, representing the coordinates
-     *     within the svg coordinate system
-     */
-    getPosition: function(node) {
-        return({
-            x: parseFloat(node.getAttributeNS(null, "cx")),
-            y: parseFloat(node.getAttributeNS(null, "cy"))
-        });
-    },
-
-    /**
-     * Method: importSymbol
-     * add a new symbol definition from the rendererer's symbol hash
-     * 
-     * Parameters:
-     * graphicName - {String} name of the symbol to import
-     * 
-     * Returns:
-     * {DOMElement} - the imported symbol
-     */      
-    importSymbol: function (graphicName)  {
-        if (!this.defs) {
-            // create svg defs tag
-            this.defs = this.createDefs();
-        }
-        var id = this.container.id + "-" + graphicName;
-        
-        // check if symbol already exists in the defs
-        var existing = document.getElementById(id);
-        if (existing != null) {
-            return existing;
-        }
-        
-        var symbol = OpenLayers.Renderer.symbol[graphicName];
-        if (!symbol) {
-            throw new Error(graphicName + ' is not a valid symbol name');
-        }
-
-        var symbolNode = this.nodeFactory(id, "symbol");
-        var node = this.nodeFactory(null, "polygon");
-        symbolNode.appendChild(node);
-        var symbolExtent = new OpenLayers.Bounds(
-                                    Number.MAX_VALUE, Number.MAX_VALUE, 0, 0);
-
-        var points = [];
-        var x,y;
-        for (var i=0; i<symbol.length; i=i+2) {
-            x = symbol[i];
-            y = symbol[i+1];
-            symbolExtent.left = Math.min(symbolExtent.left, x);
-            symbolExtent.bottom = Math.min(symbolExtent.bottom, y);
-            symbolExtent.right = Math.max(symbolExtent.right, x);
-            symbolExtent.top = Math.max(symbolExtent.top, y);
-            points.push(x, ",", y);
-        }
-        
-        node.setAttributeNS(null, "points", points.join(" "));
-        
-        var width = symbolExtent.getWidth();
-        var height = symbolExtent.getHeight();
-        // create a viewBox three times as large as the symbol itself,
-        // to allow for strokeWidth being displayed correctly at the corners.
-        var viewBox = [symbolExtent.left - width,
-                        symbolExtent.bottom - height, width * 3, height * 3];
-        symbolNode.setAttributeNS(null, "viewBox", viewBox.join(" "));
-        this.symbolMetrics[id] = [
-            Math.max(width, height),
-            symbolExtent.getCenterLonLat().lon,
-            symbolExtent.getCenterLonLat().lat
-        ];
-        
-        this.defs.appendChild(symbolNode);
-        return symbolNode;
-    },
-    
-    /**
-     * Method: getFeatureIdFromEvent
-     * 
-     * Parameters:
-     * evt - {Object} An <OpenLayers.Event> object
-     *
-     * Returns:
-     * {String} A feature id or undefined.
-     */
-    getFeatureIdFromEvent: function(evt) {
-        var featureId = OpenLayers.Renderer.Elements.prototype.getFeatureIdFromEvent.apply(this, arguments);
-        if(!featureId) {
-            var target = evt.target;
-            featureId = target.parentNode && target != this.rendererRoot ?
-                target.parentNode._featureId : undefined;
-        }
-        return featureId;
-    },
-
-    CLASS_NAME: "OpenLayers.Renderer.SVG"
-});
-
-/**
- * Constant: OpenLayers.Renderer.SVG.LABEL_ALIGN
- * {Object}
- */
-OpenLayers.Renderer.SVG.LABEL_ALIGN = {
-    "l": "start",
-    "r": "end",
-    "b": "bottom",
-    "t": "hanging"
-};
-
-/**
- * Constant: OpenLayers.Renderer.SVG.LABEL_VSHIFT
- * {Object}
- */
-OpenLayers.Renderer.SVG.LABEL_VSHIFT = {
-    // according to
-    // http://www.w3.org/Graphics/SVG/Test/20061213/htmlObjectHarness/full-text-align-02-b.html
-    // a baseline-shift of -70% shifts the text exactly from the
-    // bottom to the top of the baseline, so -35% moves the text to
-    // the center of the baseline.
-    "t": "-70%",
-    "b": "0"    
-};
-
-/**
- * Constant: OpenLayers.Renderer.SVG.LABEL_VFACTOR
- * {Object}
- */
-OpenLayers.Renderer.SVG.LABEL_VFACTOR = {
-    "t": 0,
-    "b": -1
-};
-
-/**
- * Function: OpenLayers.Renderer.SVG.preventDefault
- * *Deprecated*.  Use <OpenLayers.Event.preventDefault> method instead.
- * Used to prevent default events (especially opening images in a new tab on
- * ctrl-click) from being executed for externalGraphic symbols
- */
-OpenLayers.Renderer.SVG.preventDefault = function(e) {
-    OpenLayers.Event.preventDefault(e);
-};
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Renderer/VML.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Renderer/VML.js
deleted file mode 100644
index 8f6374b4..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Renderer/VML.js
+++ /dev/null
@@ -1,985 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Renderer/Elements.js
- */
-
-/**
- * Class: OpenLayers.Renderer.VML
- * Render vector features in browsers with VML capability.  Construct a new
- * VML renderer with the <OpenLayers.Renderer.VML> constructor.
- * 
- * Note that for all calculations in this class, we use (num | 0) to truncate a 
- * float value to an integer. This is done because it seems that VML doesn't 
- * support float values.
- *
- * Inherits from:
- *  - <OpenLayers.Renderer.Elements>
- */
-OpenLayers.Renderer.VML = OpenLayers.Class(OpenLayers.Renderer.Elements, {
-
-    /**
-     * Property: xmlns
-     * {String} XML Namespace URN
-     */
-    xmlns: "urn:schemas-microsoft-com:vml",
-    
-    /**
-     * Property: symbolCache
-     * {DOMElement} node holding symbols. This hash is keyed by symbol name,
-     *     and each value is a hash with a "path" and an "extent" property.
-     */
-    symbolCache: {},
-
-    /**
-     * Property: offset
-     * {Object} Hash with "x" and "y" properties
-     */
-    offset: null,
-    
-    /**
-     * Constructor: OpenLayers.Renderer.VML
-     * Create a new VML renderer.
-     *
-     * Parameters:
-     * containerID - {String} The id for the element that contains the renderer
-     */
-    initialize: function(containerID) {
-        if (!this.supported()) { 
-            return; 
-        }
-        if (!document.namespaces.olv) {
-            document.namespaces.add("olv", this.xmlns);
-            var style = document.createStyleSheet();
-            var shapes = ['shape','rect', 'oval', 'fill', 'stroke', 'imagedata', 'group','textbox']; 
-            for (var i = 0, len = shapes.length; i < len; i++) {
-
-                style.addRule('olv\\:' + shapes[i], "behavior: url(#default#VML); " +
-                              "position: absolute; display: inline-block;");
-            }                  
-        }
-        
-        OpenLayers.Renderer.Elements.prototype.initialize.apply(this, 
-                                                                arguments);
-    },
-
-    /**
-     * APIMethod: supported
-     * Determine whether a browser supports this renderer.
-     *
-     * Returns:
-     * {Boolean} The browser supports the VML renderer
-     */
-    supported: function() {
-        return !!(document.namespaces);
-    },    
-
-    /**
-     * Method: setExtent
-     * Set the renderer's extent
-     *
-     * Parameters:
-     * extent - {<OpenLayers.Bounds>}
-     * resolutionChanged - {Boolean}
-     * 
-     * Returns:
-     * {Boolean} true to notify the layer that the new extent does not exceed
-     *     the coordinate range, and the features will not need to be redrawn.
-     */
-    setExtent: function(extent, resolutionChanged) {
-        var coordSysUnchanged = OpenLayers.Renderer.Elements.prototype.setExtent.apply(this, arguments);
-        var resolution = this.getResolution();
-    
-        var left = (extent.left/resolution) | 0;
-        var top = (extent.top/resolution - this.size.h) | 0;
-        if (resolutionChanged || !this.offset) {
-            this.offset = {x: left, y: top};
-            left = 0;
-            top = 0;
-        } else {
-            left = left - this.offset.x;
-            top = top - this.offset.y;
-        }
-
-        
-        var org = (left - this.xOffset) + " " + top;
-        this.root.coordorigin = org;
-        var roots = [this.root, this.vectorRoot, this.textRoot];
-        var root;
-        for(var i=0, len=roots.length; i<len; ++i) {
-            root = roots[i];
-
-            var size = this.size.w + " " + this.size.h;
-            root.coordsize = size;
-            
-        }
-        // flip the VML display Y axis upside down so it 
-        // matches the display Y axis of the map
-        this.root.style.flip = "y";
-        
-        return coordSysUnchanged;
-    },
-
-
-    /**
-     * Method: setSize
-     * Set the size of the drawing surface
-     *
-     * Parameters:
-     * size - {<OpenLayers.Size>} the size of the drawing surface
-     */
-    setSize: function(size) {
-        OpenLayers.Renderer.prototype.setSize.apply(this, arguments);
-        
-        // setting width and height on all roots to avoid flicker which we
-        // would get with 100% width and height on child roots
-        var roots = [
-            this.rendererRoot,
-            this.root,
-            this.vectorRoot,
-            this.textRoot
-        ];
-        var w = this.size.w + "px";
-        var h = this.size.h + "px";
-        var root;
-        for(var i=0, len=roots.length; i<len; ++i) {
-            root = roots[i];
-            root.style.width = w;
-            root.style.height = h;
-        }
-    },
-
-    /**
-     * Method: getNodeType
-     * Get the node type for a geometry and style
-     *
-     * Parameters:
-     * geometry - {<OpenLayers.Geometry>}
-     * style - {Object}
-     *
-     * Returns:
-     * {String} The corresponding node type for the specified geometry
-     */
-    getNodeType: function(geometry, style) {
-        var nodeType = null;
-        switch (geometry.CLASS_NAME) {
-            case "OpenLayers.Geometry.Point":
-                if (style.externalGraphic) {
-                    nodeType = "olv:rect";
-                } else if (this.isComplexSymbol(style.graphicName)) {
-                    nodeType = "olv:shape";
-                } else {
-                    nodeType = "olv:oval";
-                }
-                break;
-            case "OpenLayers.Geometry.Rectangle":
-                nodeType = "olv:rect";
-                break;
-            case "OpenLayers.Geometry.LineString":
-            case "OpenLayers.Geometry.LinearRing":
-            case "OpenLayers.Geometry.Polygon":
-            case "OpenLayers.Geometry.Curve":
-                nodeType = "olv:shape";
-                break;
-            default:
-                break;
-        }
-        return nodeType;
-    },
-
-    /**
-     * Method: setStyle
-     * Use to set all the style attributes to a VML node.
-     *
-     * Parameters:
-     * node - {DOMElement} An VML element to decorate
-     * style - {Object}
-     * options - {Object} Currently supported options include 
-     *                              'isFilled' {Boolean} and
-     *                              'isStroked' {Boolean}
-     * geometry - {<OpenLayers.Geometry>}
-     */
-    setStyle: function(node, style, options, geometry) {
-        style = style  || node._style;
-        options = options || node._options;
-        var fillColor = style.fillColor;
-
-        var title = style.title || style.graphicTitle;
-        if (title) {
-            node.title = title;
-        } 
-
-        if (node._geometryClass === "OpenLayers.Geometry.Point") {
-            if (style.externalGraphic) {
-                options.isFilled = true;
-                var width = style.graphicWidth || style.graphicHeight;
-                var height = style.graphicHeight || style.graphicWidth;
-                width = width ? width : style.pointRadius*2;
-                height = height ? height : style.pointRadius*2;
-
-                var resolution = this.getResolution();
-                var xOffset = (style.graphicXOffset != undefined) ?
-                    style.graphicXOffset : -(0.5 * width);
-                var yOffset = (style.graphicYOffset != undefined) ?
-                    style.graphicYOffset : -(0.5 * height);
-                
-                node.style.left = ((((geometry.x - this.featureDx)/resolution - this.offset.x)+xOffset) | 0) + "px";
-                node.style.top = (((geometry.y/resolution - this.offset.y)-(yOffset+height)) | 0) + "px";
-                node.style.width = width + "px";
-                node.style.height = height + "px";
-                node.style.flip = "y";
-                
-                // modify fillColor and options for stroke styling below
-                fillColor = "none";
-                options.isStroked = false;
-            } else if (this.isComplexSymbol(style.graphicName)) {
-                var cache = this.importSymbol(style.graphicName);
-                node.path = cache.path;
-                node.coordorigin = cache.left + "," + cache.bottom;
-                var size = cache.size;
-                node.coordsize = size + "," + size;        
-                this.drawCircle(node, geometry, style.pointRadius);
-                node.style.flip = "y";
-            } else {
-                this.drawCircle(node, geometry, style.pointRadius);
-            }
-        }
-
-        // fill 
-        if (options.isFilled) { 
-            node.fillcolor = fillColor; 
-        } else { 
-            node.filled = "false"; 
-        }
-        var fills = node.getElementsByTagName("fill");
-        var fill = (fills.length == 0) ? null : fills[0];
-        if (!options.isFilled) {
-            if (fill) {
-                node.removeChild(fill);
-            }
-        } else {
-            if (!fill) {
-                fill = this.createNode('olv:fill', node.id + "_fill");
-            }
-            fill.opacity = style.fillOpacity;
-
-            if (node._geometryClass === "OpenLayers.Geometry.Point" &&
-                    style.externalGraphic) {
-
-                // override fillOpacity
-                if (style.graphicOpacity) {
-                    fill.opacity = style.graphicOpacity;
-                }
-                
-                fill.src = style.externalGraphic;
-                fill.type = "frame";
-                
-                if (!(style.graphicWidth && style.graphicHeight)) {
-                  fill.aspect = "atmost";
-                }                
-            }
-            if (fill.parentNode != node) {
-                node.appendChild(fill);
-            }
-        }
-
-        // additional rendering for rotated graphics or symbols
-        var rotation = style.rotation;
-        if ((rotation !== undefined || node._rotation !== undefined)) {
-            node._rotation = rotation;
-            if (style.externalGraphic) {
-                this.graphicRotate(node, xOffset, yOffset, style);
-                // make the fill fully transparent, because we now have
-                // the graphic as imagedata element. We cannot just remove
-                // the fill, because this is part of the hack described
-                // in graphicRotate
-                fill.opacity = 0;
-            } else if(node._geometryClass === "OpenLayers.Geometry.Point") {
-                node.style.rotation = rotation || 0;
-            }
-        }
-
-        // stroke 
-        var strokes = node.getElementsByTagName("stroke");
-        var stroke = (strokes.length == 0) ? null : strokes[0];
-        if (!options.isStroked) {
-            node.stroked = false;
-            if (stroke) {
-                stroke.on = false;
-            }
-        } else {
-            if (!stroke) {
-                stroke = this.createNode('olv:stroke', node.id + "_stroke");
-                node.appendChild(stroke);
-            }
-            stroke.on = true;
-            stroke.color = style.strokeColor; 
-            stroke.weight = style.strokeWidth + "px"; 
-            stroke.opacity = style.strokeOpacity;
-            stroke.endcap = style.strokeLinecap == 'butt' ? 'flat' :
-                (style.strokeLinecap || 'round');
-            if (style.strokeDashstyle) {
-                stroke.dashstyle = this.dashStyle(style);
-            }
-        }
-        
-        if (style.cursor != "inherit" && style.cursor != null) {
-            node.style.cursor = style.cursor;
-        }
-        return node;
-    },
-
-    /**
-     * Method: graphicRotate
-     * If a point is to be styled with externalGraphic and rotation, VML fills
-     * cannot be used to display the graphic, because rotation of graphic
-     * fills is not supported by the VML implementation of Internet Explorer.
-     * This method creates a olv:imagedata element inside the VML node,
-     * DXImageTransform.Matrix and BasicImage filters for rotation and
-     * opacity, and a 3-step hack to remove rendering artefacts from the
-     * graphic and preserve the ability of graphics to trigger events.
-     * Finally, OpenLayers methods are used to determine the correct
-     * insertion point of the rotated image, because DXImageTransform.Matrix
-     * does the rotation without the ability to specify a rotation center
-     * point.
-     * 
-     * Parameters:
-     * node    - {DOMElement}
-     * xOffset - {Number} rotation center relative to image, x coordinate
-     * yOffset - {Number} rotation center relative to image, y coordinate
-     * style   - {Object}
-     */
-    graphicRotate: function(node, xOffset, yOffset, style) {
-        var style = style || node._style;
-        var rotation = style.rotation || 0;
-        
-        var aspectRatio, size;
-        if (!(style.graphicWidth && style.graphicHeight)) {
-            // load the image to determine its size
-            var img = new Image();
-            img.onreadystatechange = OpenLayers.Function.bind(function() {
-                if(img.readyState == "complete" ||
-                        img.readyState == "interactive") {
-                    aspectRatio = img.width / img.height;
-                    size = Math.max(style.pointRadius * 2, 
-                        style.graphicWidth || 0,
-                        style.graphicHeight || 0);
-                    xOffset = xOffset * aspectRatio;
-                    style.graphicWidth = size * aspectRatio;
-                    style.graphicHeight = size;
-                    this.graphicRotate(node, xOffset, yOffset, style);
-                }
-            }, this);
-            img.src = style.externalGraphic;
-            
-            // will be called again by the onreadystate handler
-            return;
-        } else {
-            size = Math.max(style.graphicWidth, style.graphicHeight);
-            aspectRatio = style.graphicWidth / style.graphicHeight;
-        }
-        
-        var width = Math.round(style.graphicWidth || size * aspectRatio);
-        var height = Math.round(style.graphicHeight || size);
-        node.style.width = width + "px";
-        node.style.height = height + "px";
-        
-        // Three steps are required to remove artefacts for images with
-        // transparent backgrounds (resulting from using DXImageTransform
-        // filters on svg objects), while preserving awareness for browser
-        // events on images:
-        // - Use the fill as usual (like for unrotated images) to handle
-        //   events
-        // - specify an imagedata element with the same src as the fill
-        // - style the imagedata element with an AlphaImageLoader filter
-        //   with empty src
-        var image = document.getElementById(node.id + "_image");
-        if (!image) {
-            image = this.createNode("olv:imagedata", node.id + "_image");
-            node.appendChild(image);
-        }
-        image.style.width = width + "px";
-        image.style.height = height + "px";
-        image.src = style.externalGraphic;
-        image.style.filter =
-            "progid:DXImageTransform.Microsoft.AlphaImageLoader(" + 
-            "src='', sizingMethod='scale')";
-
-        var rot = rotation * Math.PI / 180;
-        var sintheta = Math.sin(rot);
-        var costheta = Math.cos(rot);
-
-        // do the rotation on the image
-        var filter =
-            "progid:DXImageTransform.Microsoft.Matrix(M11=" + costheta +
-            ",M12=" + (-sintheta) + ",M21=" + sintheta + ",M22=" + costheta +
-            ",SizingMethod='auto expand')\n";
-
-        // set the opacity (needed for the imagedata)
-        var opacity = style.graphicOpacity || style.fillOpacity;
-        if (opacity && opacity != 1) {
-            filter += 
-                "progid:DXImageTransform.Microsoft.BasicImage(opacity=" + 
-                opacity+")\n";
-        }
-        node.style.filter = filter;
-
-        // do the rotation again on a box, so we know the insertion point
-        var centerPoint = new OpenLayers.Geometry.Point(-xOffset, -yOffset);
-        var imgBox = new OpenLayers.Bounds(0, 0, width, height).toGeometry();
-        imgBox.rotate(style.rotation, centerPoint);
-        var imgBounds = imgBox.getBounds();
-
-        node.style.left = Math.round(
-            parseInt(node.style.left) + imgBounds.left) + "px";
-        node.style.top = Math.round(
-            parseInt(node.style.top) - imgBounds.bottom) + "px";
-    },
-
-    /**
-     * Method: postDraw
-     * Does some node postprocessing to work around browser issues:
-     * - Some versions of Internet Explorer seem to be unable to set fillcolor
-     *   and strokecolor to "none" correctly before the fill node is appended
-     *   to a visible vml node. This method takes care of that and sets
-     *   fillcolor and strokecolor again if needed.
-     * - In some cases, a node won't become visible after being drawn. Setting
-     *   style.visibility to "visible" works around that.
-     * 
-     * Parameters:
-     * node - {DOMElement}
-     */
-    postDraw: function(node) {
-        node.style.visibility = "visible";
-        var fillColor = node._style.fillColor;
-        var strokeColor = node._style.strokeColor;
-        if (fillColor == "none" &&
-                node.fillcolor != fillColor) {
-            node.fillcolor = fillColor;
-        }
-        if (strokeColor == "none" &&
-                node.strokecolor != strokeColor) {
-            node.strokecolor = strokeColor;
-        }
-    },
-
-
-    /**
-     * Method: setNodeDimension
-     * Get the geometry's bounds, convert it to our vml coordinate system, 
-     * then set the node's position, size, and local coordinate system.
-     *   
-     * Parameters:
-     * node - {DOMElement}
-     * geometry - {<OpenLayers.Geometry>}
-     */
-    setNodeDimension: function(node, geometry) {
-
-        var bbox = geometry.getBounds();
-        if(bbox) {
-            var resolution = this.getResolution();
-        
-            var scaledBox = 
-                new OpenLayers.Bounds(((bbox.left - this.featureDx)/resolution - this.offset.x) | 0,
-                                      (bbox.bottom/resolution - this.offset.y) | 0,
-                                      ((bbox.right - this.featureDx)/resolution - this.offset.x) | 0,
-                                      (bbox.top/resolution - this.offset.y) | 0);
-            
-            // Set the internal coordinate system to draw the path
-            node.style.left = scaledBox.left + "px";
-            node.style.top = scaledBox.top + "px";
-            node.style.width = scaledBox.getWidth() + "px";
-            node.style.height = scaledBox.getHeight() + "px";
-    
-            node.coordorigin = scaledBox.left + " " + scaledBox.top;
-            node.coordsize = scaledBox.getWidth()+ " " + scaledBox.getHeight();
-        }
-    },
-    
-    /** 
-     * Method: dashStyle
-     * 
-     * Parameters:
-     * style - {Object}
-     * 
-     * Returns:
-     * {String} A VML compliant 'stroke-dasharray' value
-     */
-    dashStyle: function(style) {
-        var dash = style.strokeDashstyle;
-        switch (dash) {
-            case 'solid':
-            case 'dot':
-            case 'dash':
-            case 'dashdot':
-            case 'longdash':
-            case 'longdashdot':
-                return dash;
-            default:
-                // very basic guessing of dash style patterns
-                var parts = dash.split(/[ ,]/);
-                if (parts.length == 2) {
-                    if (1*parts[0] >= 2*parts[1]) {
-                        return "longdash";
-                    }
-                    return (parts[0] == 1 || parts[1] == 1) ? "dot" : "dash";
-                } else if (parts.length == 4) {
-                    return (1*parts[0] >= 2*parts[1]) ? "longdashdot" :
-                        "dashdot";
-                }
-                return "solid";
-        }
-    },
-
-    /**
-     * Method: createNode
-     * Create a new node
-     *
-     * Parameters:
-     * type - {String} Kind of node to draw
-     * id - {String} Id for node
-     *
-     * Returns:
-     * {DOMElement} A new node of the given type and id
-     */
-    createNode: function(type, id) {
-        var node = document.createElement(type);
-        if (id) {
-            node.id = id;
-        }
-        
-        // IE hack to make elements unselectable, to prevent 'blue flash'
-        // while dragging vectors; #1410
-        node.unselectable = 'on';
-        node.onselectstart = OpenLayers.Function.False;
-        
-        return node;    
-    },
-    
-    /**
-     * Method: nodeTypeCompare
-     * Determine whether a node is of a given type
-     *
-     * Parameters:
-     * node - {DOMElement} An VML element
-     * type - {String} Kind of node
-     *
-     * Returns:
-     * {Boolean} Whether or not the specified node is of the specified type
-     */
-    nodeTypeCompare: function(node, type) {
-
-        //split type
-        var subType = type;
-        var splitIndex = subType.indexOf(":");
-        if (splitIndex != -1) {
-            subType = subType.substr(splitIndex+1);
-        }
-
-        //split nodeName
-        var nodeName = node.nodeName;
-        splitIndex = nodeName.indexOf(":");
-        if (splitIndex != -1) {
-            nodeName = nodeName.substr(splitIndex+1);
-        }
-
-        return (subType == nodeName);
-    },
-
-    /**
-     * Method: createRenderRoot
-     * Create the renderer root
-     *
-     * Returns:
-     * {DOMElement} The specific render engine's root element
-     */
-    createRenderRoot: function() {
-        return this.nodeFactory(this.container.id + "_vmlRoot", "div");
-    },
-
-    /**
-     * Method: createRoot
-     * Create the main root element
-     * 
-     * Parameters:
-     * suffix - {String} suffix to append to the id
-     *
-     * Returns:
-     * {DOMElement}
-     */
-    createRoot: function(suffix) {
-        return this.nodeFactory(this.container.id + suffix, "olv:group");
-    },
-    
-    /**************************************
-     *                                    *
-     *     GEOMETRY DRAWING FUNCTIONS     *
-     *                                    *
-     **************************************/
-    
-    /**
-     * Method: drawPoint
-     * Render a point
-     * 
-     * Parameters:
-     * node - {DOMElement}
-     * geometry - {<OpenLayers.Geometry>}
-     * 
-     * Returns:
-     * {DOMElement} or false if the point could not be drawn
-     */
-    drawPoint: function(node, geometry) {
-        return this.drawCircle(node, geometry, 1);
-    },
-
-    /**
-     * Method: drawCircle
-     * Render a circle.
-     * Size and Center a circle given geometry (x,y center) and radius
-     * 
-     * Parameters:
-     * node - {DOMElement}
-     * geometry - {<OpenLayers.Geometry>}
-     * radius - {float}
-     * 
-     * Returns:
-     * {DOMElement} or false if the circle could not ne drawn
-     */
-    drawCircle: function(node, geometry, radius) {
-        if(!isNaN(geometry.x)&& !isNaN(geometry.y)) {
-            var resolution = this.getResolution();
-
-            node.style.left = ((((geometry.x - this.featureDx) /resolution - this.offset.x) | 0) - radius) + "px";
-            node.style.top = (((geometry.y /resolution - this.offset.y) | 0) - radius) + "px";
-    
-            var diameter = radius * 2;
-            
-            node.style.width = diameter + "px";
-            node.style.height = diameter + "px";
-            return node;
-        }
-        return false;
-    },
-
-
-    /**
-     * Method: drawLineString
-     * Render a linestring.
-     * 
-     * Parameters:
-     * node - {DOMElement}
-     * geometry - {<OpenLayers.Geometry>}
-     * 
-     * Returns:
-     * {DOMElement}
-     */
-    drawLineString: function(node, geometry) {
-        return this.drawLine(node, geometry, false);
-    },
-
-    /**
-     * Method: drawLinearRing
-     * Render a linearring
-     * 
-     * Parameters:
-     * node - {DOMElement}
-     * geometry - {<OpenLayers.Geometry>}
-     * 
-     * Returns:
-     * {DOMElement}
-     */
-    drawLinearRing: function(node, geometry) {
-        return this.drawLine(node, geometry, true);
-    },
-
-    /**
-     * Method: DrawLine
-     * Render a line.
-     * 
-     * Parameters:
-     * node - {DOMElement}
-     * geometry - {<OpenLayers.Geometry>}
-     * closeLine - {Boolean} Close the line? (make it a ring?)
-     * 
-     * Returns:
-     * {DOMElement}
-     */
-    drawLine: function(node, geometry, closeLine) {
-
-        this.setNodeDimension(node, geometry);
-
-        var resolution = this.getResolution();
-        var numComponents = geometry.components.length;
-        var parts = new Array(numComponents);
-
-        var comp, x, y;
-        for (var i = 0; i < numComponents; i++) {
-            comp = geometry.components[i];
-            x = ((comp.x - this.featureDx)/resolution - this.offset.x) | 0;
-            y = (comp.y/resolution - this.offset.y) | 0;
-            parts[i] = " " + x + "," + y + " l ";
-        }
-        var end = (closeLine) ? " x e" : " e";
-        node.path = "m" + parts.join("") + end;
-        return node;
-    },
-
-    /**
-     * Method: drawPolygon
-     * Render a polygon
-     * 
-     * Parameters:
-     * node - {DOMElement}
-     * geometry - {<OpenLayers.Geometry>}
-     * 
-     * Returns:
-     * {DOMElement}
-     */
-    drawPolygon: function(node, geometry) {
-        this.setNodeDimension(node, geometry);
-
-        var resolution = this.getResolution();
-    
-        var path = [];
-        var j, jj, points, area, first, second, i, ii, comp, pathComp, x, y;
-        for (j=0, jj=geometry.components.length; j<jj; j++) {
-            path.push("m");
-            points = geometry.components[j].components;
-            // we only close paths of interior rings with area
-            area = (j === 0);
-            first = null;
-            second = null;
-            for (i=0, ii=points.length; i<ii; i++) {
-                comp = points[i];
-                x = ((comp.x - this.featureDx) / resolution - this.offset.x) | 0;
-                y = (comp.y / resolution - this.offset.y) | 0;
-                pathComp = " " + x + "," + y;
-                path.push(pathComp);
-                if (i==0) {
-                    path.push(" l");
-                }
-                if (!area) {
-                    // IE improperly renders sub-paths that have no area.
-                    // Instead of checking the area of every ring, we confirm
-                    // the ring has at least three distinct points.  This does
-                    // not catch all non-zero area cases, but it greatly improves
-                    // interior ring digitizing and is a minor performance hit
-                    // when rendering rings with many points.
-                    if (!first) {
-                        first = pathComp;
-                    } else if (first != pathComp) {
-                        if (!second) {
-                            second = pathComp;
-                        } else if (second != pathComp) {
-                            // stop looking
-                            area = true;
-                        }
-                    }
-                }
-            }
-            path.push(area ? " x " : " ");
-        }
-        path.push("e");
-        node.path = path.join("");
-        return node;
-    },
-
-    /**
-     * Method: drawRectangle
-     * Render a rectangle
-     * 
-     * Parameters:
-     * node - {DOMElement}
-     * geometry - {<OpenLayers.Geometry>}
-     * 
-     * Returns:
-     * {DOMElement}
-     */
-    drawRectangle: function(node, geometry) {
-        var resolution = this.getResolution();
-    
-        node.style.left = (((geometry.x - this.featureDx)/resolution - this.offset.x) | 0) + "px";
-        node.style.top = ((geometry.y/resolution - this.offset.y) | 0) + "px";
-        node.style.width = ((geometry.width/resolution) | 0) + "px";
-        node.style.height = ((geometry.height/resolution) | 0) + "px";
-        
-        return node;
-    },
-    
-    /**
-     * Method: drawText
-     * This method is only called by the renderer itself.
-     * 
-     * Parameters: 
-     * featureId - {String}
-     * style -
-     * location - {<OpenLayers.Geometry.Point>}
-     */
-    drawText: function(featureId, style, location) {
-        var label = this.nodeFactory(featureId + this.LABEL_ID_SUFFIX, "olv:rect");
-        var textbox = this.nodeFactory(featureId + this.LABEL_ID_SUFFIX + "_textbox", "olv:textbox");
-        
-        var resolution = this.getResolution();
-        label.style.left = (((location.x - this.featureDx)/resolution - this.offset.x) | 0) + "px";
-        label.style.top = ((location.y/resolution - this.offset.y) | 0) + "px";
-        label.style.flip = "y";
-
-        textbox.innerText = style.label;
-
-        if (style.cursor != "inherit" && style.cursor != null) {
-            textbox.style.cursor = style.cursor;
-        }
-        if (style.fontColor) {
-            textbox.style.color = style.fontColor;
-        }
-        if (style.fontOpacity) {
-            textbox.style.filter = 'alpha(opacity=' + (style.fontOpacity * 100) + ')';
-        }
-        if (style.fontFamily) {
-            textbox.style.fontFamily = style.fontFamily;
-        }
-        if (style.fontSize) {
-            textbox.style.fontSize = style.fontSize;
-        }
-        if (style.fontWeight) {
-            textbox.style.fontWeight = style.fontWeight;
-        }
-        if (style.fontStyle) {
-            textbox.style.fontStyle = style.fontStyle;
-        }
-        if(style.labelSelect === true) {
-            label._featureId = featureId;
-            textbox._featureId = featureId;
-            textbox._geometry = location;
-            textbox._geometryClass = location.CLASS_NAME;
-        }
-        textbox.style.whiteSpace = "nowrap";
-        // fun with IE: IE7 in standards compliant mode does not display any
-        // text with a left inset of 0. So we set this to 1px and subtract one
-        // pixel later when we set label.style.left
-        textbox.inset = "1px,0px,0px,0px";
-
-        if(!label.parentNode) {
-            label.appendChild(textbox);
-            this.textRoot.appendChild(label);
-        }
-
-        var align = style.labelAlign || "cm";
-        if (align.length == 1) {
-            align += "m";
-        }
-        var xshift = textbox.clientWidth *
-            (OpenLayers.Renderer.VML.LABEL_SHIFT[align.substr(0,1)]);
-        var yshift = textbox.clientHeight *
-            (OpenLayers.Renderer.VML.LABEL_SHIFT[align.substr(1,1)]);
-        label.style.left = parseInt(label.style.left)-xshift-1+"px";
-        label.style.top = parseInt(label.style.top)+yshift+"px";
-        
-    },
-    
-    /**
-     * Method: moveRoot
-     * moves this renderer's root to a different renderer.
-     * 
-     * Parameters:
-     * renderer - {<OpenLayers.Renderer>} target renderer for the moved root
-     * root - {DOMElement} optional root node. To be used when this renderer
-     *     holds roots from multiple layers to tell this method which one to
-     *     detach
-     * 
-     * Returns:
-     * {Boolean} true if successful, false otherwise
-     */
-    moveRoot: function(renderer) {
-        var layer = this.map.getLayer(renderer.container.id);
-        if(layer instanceof OpenLayers.Layer.Vector.RootContainer) {
-            layer = this.map.getLayer(this.container.id);
-        }
-        layer && layer.renderer.clear();
-        OpenLayers.Renderer.Elements.prototype.moveRoot.apply(this, arguments);
-        layer && layer.redraw();
-    },
-    
-    /**
-     * Method: importSymbol
-     * add a new symbol definition from the rendererer's symbol hash
-     * 
-     * Parameters:
-     * graphicName - {String} name of the symbol to import
-     * 
-     * Returns:
-     * {Object} - hash of {DOMElement} "symbol" and {Number} "size"
-     */      
-    importSymbol: function (graphicName)  {
-        var id = this.container.id + "-" + graphicName;
-        
-        // check if symbol already exists in the cache
-        var cache = this.symbolCache[id];
-        if (cache) {
-            return cache;
-        }
-        
-        var symbol = OpenLayers.Renderer.symbol[graphicName];
-        if (!symbol) {
-            throw new Error(graphicName + ' is not a valid symbol name');
-        }
-
-        var symbolExtent = new OpenLayers.Bounds(
-                                    Number.MAX_VALUE, Number.MAX_VALUE, 0, 0);
-        
-        var pathitems = ["m"];
-        for (var i=0; i<symbol.length; i=i+2) {
-            var x = symbol[i];
-            var y = symbol[i+1];
-            symbolExtent.left = Math.min(symbolExtent.left, x);
-            symbolExtent.bottom = Math.min(symbolExtent.bottom, y);
-            symbolExtent.right = Math.max(symbolExtent.right, x);
-            symbolExtent.top = Math.max(symbolExtent.top, y);
-
-            pathitems.push(x);
-            pathitems.push(y);
-            if (i == 0) {
-                pathitems.push("l");
-            }
-        }
-        pathitems.push("x e");
-        var path = pathitems.join(" ");
-
-        var diff = (symbolExtent.getWidth() - symbolExtent.getHeight()) / 2;
-        if(diff > 0) {
-            symbolExtent.bottom = symbolExtent.bottom - diff;
-            symbolExtent.top = symbolExtent.top + diff;
-        } else {
-            symbolExtent.left = symbolExtent.left + diff;
-            symbolExtent.right = symbolExtent.right - diff;
-        }
-        
-        cache = {
-            path: path,
-            size: symbolExtent.getWidth(), // equals getHeight() now
-            left: symbolExtent.left,
-            bottom: symbolExtent.bottom
-        };
-        this.symbolCache[id] = cache;
-        
-        return cache;
-    },
-    
-    CLASS_NAME: "OpenLayers.Renderer.VML"
-});
-
-/**
- * Constant: OpenLayers.Renderer.VML.LABEL_SHIFT
- * {Object}
- */
-OpenLayers.Renderer.VML.LABEL_SHIFT = {
-    "l": 0,
-    "c": .5,
-    "r": 1,
-    "t": 0,
-    "m": .5,
-    "b": 1
-};
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Request.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Request.js
deleted file mode 100644
index 2b28dfc8..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Request.js
+++ /dev/null
@@ -1,429 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Events.js
- * @requires OpenLayers/Request/XMLHttpRequest.js
- */
-
-/**
- * TODO: deprecate me
- * Use OpenLayers.Request.proxy instead.
- */
-OpenLayers.ProxyHost = "";
-
-/**
- * Namespace: OpenLayers.Request
- * The OpenLayers.Request namespace contains convenience methods for working
- *     with XMLHttpRequests.  These methods work with a cross-browser
- *     W3C compliant <OpenLayers.Request.XMLHttpRequest> class.
- */
-if (!OpenLayers.Request) {
-    /**
-     * This allows for OpenLayers/Request/XMLHttpRequest.js to be included
-     * before or after this script.
-     */
-    OpenLayers.Request = {};
-}
-OpenLayers.Util.extend(OpenLayers.Request, {
-    
-    /**
-     * Constant: DEFAULT_CONFIG
-     * {Object} Default configuration for all requests.
-     */
-    DEFAULT_CONFIG: {
-        method: "GET",
-        url: window.location.href,
-        async: true,
-        user: undefined,
-        password: undefined,
-        params: null,
-        proxy: OpenLayers.ProxyHost,
-        headers: {},
-        data: null,
-        callback: function() {},
-        success: null,
-        failure: null,
-        scope: null
-    },
-    
-    /**
-     * Constant: URL_SPLIT_REGEX
-     */
-    URL_SPLIT_REGEX: /([^:]*:)\/\/([^:]*:?[^@]*@)?([^:\/\?]*):?([^\/\?]*)/,
-    
-    /**
-     * APIProperty: events
-     * {<OpenLayers.Events>} An events object that handles all 
-     *     events on the {<OpenLayers.Request>} object.
-     *
-     * All event listeners will receive an event object with three properties:
-     * request - {<OpenLayers.Request.XMLHttpRequest>} The request object.
-     * config - {Object} The config object sent to the specific request method.
-     * requestUrl - {String} The request url.
-     * 
-     * Supported event types:
-     * complete - Triggered when we have a response from the request, if a
-     *     listener returns false, no further response processing will take
-     *     place.
-     * success - Triggered when the HTTP response has a success code (200-299).
-     * failure - Triggered when the HTTP response does not have a success code.
-     */
-    events: new OpenLayers.Events(this),
-    
-    /**
-     * Method: makeSameOrigin
-     * Using the specified proxy, returns a same origin url of the provided url.
-     *
-     * Parameters:
-     * url - {String} An arbitrary url
-     * proxy {String|Function} The proxy to use to make the provided url a
-     *     same origin url.
-     *
-     * Returns
-     * {String} the same origin url. If no proxy is provided, the returned url
-     *     will be the same as the provided url.
-     */
-    makeSameOrigin: function(url, proxy) {
-        var sameOrigin = url.indexOf("http") !== 0;
-        var urlParts = !sameOrigin && url.match(this.URL_SPLIT_REGEX);
-        if (urlParts) {
-            var location = window.location;
-            sameOrigin =
-                urlParts[1] == location.protocol &&
-                urlParts[3] == location.hostname;
-            var uPort = urlParts[4], lPort = location.port;
-            if (uPort != 80 && uPort != "" || lPort != "80" && lPort != "") {
-                sameOrigin = sameOrigin && uPort == lPort;
-            }
-        }
-        if (!sameOrigin) {
-            if (proxy) {
-                if (typeof proxy == "function") {
-                    url = proxy(url);
-                } else {
-                    url = proxy + encodeURIComponent(url);
-                }
-            }
-        }
-        return url;
-    },
-
-    /**
-     * APIMethod: issue
-     * Create a new XMLHttpRequest object, open it, set any headers, bind
-     *     a callback to done state, and send any data.  It is recommended that
-     *     you use one <GET>, <POST>, <PUT>, <DELETE>, <OPTIONS>, or <HEAD>.
-     *     This method is only documented to provide detail on the configuration
-     *     options available to all request methods.
-     *
-     * Parameters:
-     * config - {Object} Object containing properties for configuring the
-     *     request.  Allowed configuration properties are described below.
-     *     This object is modified and should not be reused.
-     *
-     * Allowed config properties:
-     * method - {String} One of GET, POST, PUT, DELETE, HEAD, or
-     *     OPTIONS.  Default is GET.
-     * url - {String} URL for the request.
-     * async - {Boolean} Open an asynchronous request.  Default is true.
-     * user - {String} User for relevant authentication scheme.  Set
-     *     to null to clear current user.
-     * password - {String} Password for relevant authentication scheme.
-     *     Set to null to clear current password.
-     * proxy - {String} Optional proxy.  Defaults to
-     *     <OpenLayers.ProxyHost>.
-     * params - {Object} Any key:value pairs to be appended to the
-     *     url as a query string.  Assumes url doesn't already include a query
-     *     string or hash.  Typically, this is only appropriate for <GET>
-     *     requests where the query string will be appended to the url.
-     *     Parameter values that are arrays will be
-     *     concatenated with a comma (note that this goes against form-encoding)
-     *     as is done with <OpenLayers.Util.getParameterString>.
-     * headers - {Object} Object with header:value pairs to be set on
-     *     the request.
-     * data - {String | Document} Optional data to send with the request.
-     *     Typically, this is only used with <POST> and <PUT> requests.
-     *     Make sure to provide the appropriate "Content-Type" header for your
-     *     data.  For <POST> and <PUT> requests, the content type defaults to
-     *     "application-xml".  If your data is a different content type, or
-     *     if you are using a different HTTP method, set the "Content-Type"
-     *     header to match your data type.
-     * callback - {Function} Function to call when request is done.
-     *     To determine if the request failed, check request.status (200
-     *     indicates success).
-     * success - {Function} Optional function to call if request status is in
-     *     the 200s.  This will be called in addition to callback above and
-     *     would typically only be used as an alternative.
-     * failure - {Function} Optional function to call if request status is not
-     *     in the 200s.  This will be called in addition to callback above and
-     *     would typically only be used as an alternative.
-     * scope - {Object} If callback is a public method on some object,
-     *     set the scope to that object.
-     *
-     * Returns:
-     * {XMLHttpRequest} Request object.  To abort the request before a response
-     *     is received, call abort() on the request object.
-     */
-    issue: function(config) {        
-        // apply default config - proxy host may have changed
-        var defaultConfig = OpenLayers.Util.extend(
-            this.DEFAULT_CONFIG,
-            {proxy: OpenLayers.ProxyHost}
-        );
-        config = config || {};
-        config.headers = config.headers || {};
-        config = OpenLayers.Util.applyDefaults(config, defaultConfig);
-        config.headers = OpenLayers.Util.applyDefaults(config.headers, defaultConfig.headers);
-        // Always set the "X-Requested-With" header to signal that this request
-        // was issued through the XHR-object. Since header keys are case 
-        // insensitive and we want to allow overriding of the "X-Requested-With"
-        // header through the user we cannot use applyDefaults, but have to 
-        // check manually whether we were called with a "X-Requested-With"
-        // header.
-        var customRequestedWithHeader = false,
-            headerKey;
-        for(headerKey in config.headers) {
-            if (config.headers.hasOwnProperty( headerKey )) {
-                if (headerKey.toLowerCase() === 'x-requested-with') {
-                    customRequestedWithHeader = true;
-                }
-            }
-        }
-        if (customRequestedWithHeader === false) {
-            // we did not have a custom "X-Requested-With" header
-            config.headers['X-Requested-With'] = 'XMLHttpRequest';
-        }
-
-        // create request, open, and set headers
-        var request = new OpenLayers.Request.XMLHttpRequest();
-        var url = OpenLayers.Util.urlAppend(config.url, 
-            OpenLayers.Util.getParameterString(config.params || {}));
-        url = OpenLayers.Request.makeSameOrigin(url, config.proxy);
-        request.open(
-            config.method, url, config.async, config.user, config.password
-        );
-        for(var header in config.headers) {
-            request.setRequestHeader(header, config.headers[header]);
-        }
-
-        var events = this.events;
-
-        // we want to execute runCallbacks with "this" as the
-        // execution scope
-        var self = this;
-        
-        request.onreadystatechange = function() {
-            if(request.readyState == OpenLayers.Request.XMLHttpRequest.DONE) {
-                var proceed = events.triggerEvent(
-                    "complete",
-                    {request: request, config: config, requestUrl: url}
-                );
-                if(proceed !== false) {
-                    self.runCallbacks(
-                        {request: request, config: config, requestUrl: url}
-                    );
-                }
-            }
-        };
-        
-        // send request (optionally with data) and return
-        // call in a timeout for asynchronous requests so the return is
-        // available before readyState == 4 for cached docs
-        if(config.async === false) {
-            request.send(config.data);
-        } else {
-            window.setTimeout(function(){
-                if (request.readyState !== 0) { // W3C: 0-UNSENT
-                    request.send(config.data);
-                }
-            }, 0);
-        }
-        return request;
-    },
-    
-    /**
-     * Method: runCallbacks
-     * Calls the complete, success and failure callbacks. Application
-     *    can listen to the "complete" event, have the listener 
-     *    display a confirm window and always return false, and
-     *    execute OpenLayers.Request.runCallbacks if the user
-     *    hits "yes" in the confirm window.
-     *
-     * Parameters:
-     * options - {Object} Hash containing request, config and requestUrl keys
-     */
-    runCallbacks: function(options) {
-        var request = options.request;
-        var config = options.config;
-        
-        // bind callbacks to readyState 4 (done)
-        var complete = (config.scope) ?
-            OpenLayers.Function.bind(config.callback, config.scope) :
-            config.callback;
-        
-        // optional success callback
-        var success;
-        if(config.success) {
-            success = (config.scope) ?
-                OpenLayers.Function.bind(config.success, config.scope) :
-                config.success;
-        }
-
-        // optional failure callback
-        var failure;
-        if(config.failure) {
-            failure = (config.scope) ?
-                OpenLayers.Function.bind(config.failure, config.scope) :
-                config.failure;
-        }
-
-        if (OpenLayers.Util.createUrlObject(config.url).protocol == "file:" &&
-                                                        request.responseText) {
-            request.status = 200;
-        }
-        complete(request);
-
-        if (!request.status || (request.status >= 200 && request.status < 300)) {
-            this.events.triggerEvent("success", options);
-            if(success) {
-                success(request);
-            }
-        }
-        if(request.status && (request.status < 200 || request.status >= 300)) {                    
-            this.events.triggerEvent("failure", options);
-            if(failure) {
-                failure(request);
-            }
-        }
-    },
-    
-    /**
-     * APIMethod: GET
-     * Send an HTTP GET request.  Additional configuration properties are
-     *     documented in the <issue> method, with the method property set
-     *     to GET.
-     *
-     * Parameters:
-     * config - {Object} Object with properties for configuring the request.
-     *     See the <issue> method for documentation of allowed properties.
-     *     This object is modified and should not be reused.
-     * 
-     * Returns:
-     * {XMLHttpRequest} Request object.
-     */
-    GET: function(config) {
-        config = OpenLayers.Util.extend(config, {method: "GET"});
-        return OpenLayers.Request.issue(config);
-    },
-    
-    /**
-     * APIMethod: POST
-     * Send a POST request.  Additional configuration properties are
-     *     documented in the <issue> method, with the method property set
-     *     to POST and "Content-Type" header set to "application/xml".
-     *
-     * Parameters:
-     * config - {Object} Object with properties for configuring the request.
-     *     See the <issue> method for documentation of allowed properties.  The
-     *     default "Content-Type" header will be set to "application-xml" if
-     *     none is provided.  This object is modified and should not be reused.
-     * 
-     * Returns:
-     * {XMLHttpRequest} Request object.
-     */
-    POST: function(config) {
-        config = OpenLayers.Util.extend(config, {method: "POST"});
-        // set content type to application/xml if it isn't already set
-        config.headers = config.headers ? config.headers : {};
-        if(!("CONTENT-TYPE" in OpenLayers.Util.upperCaseObject(config.headers))) {
-            config.headers["Content-Type"] = "application/xml";
-        }
-        return OpenLayers.Request.issue(config);
-    },
-    
-    /**
-     * APIMethod: PUT
-     * Send an HTTP PUT request.  Additional configuration properties are
-     *     documented in the <issue> method, with the method property set
-     *     to PUT and "Content-Type" header set to "application/xml".
-     *
-     * Parameters:
-     * config - {Object} Object with properties for configuring the request.
-     *     See the <issue> method for documentation of allowed properties.  The
-     *     default "Content-Type" header will be set to "application-xml" if
-     *     none is provided.  This object is modified and should not be reused.
-     * 
-     * Returns:
-     * {XMLHttpRequest} Request object.
-     */
-    PUT: function(config) {
-        config = OpenLayers.Util.extend(config, {method: "PUT"});
-        // set content type to application/xml if it isn't already set
-        config.headers = config.headers ? config.headers : {};
-        if(!("CONTENT-TYPE" in OpenLayers.Util.upperCaseObject(config.headers))) {
-            config.headers["Content-Type"] = "application/xml";
-        }
-        return OpenLayers.Request.issue(config);
-    },
-    
-    /**
-     * APIMethod: DELETE
-     * Send an HTTP DELETE request.  Additional configuration properties are
-     *     documented in the <issue> method, with the method property set
-     *     to DELETE.
-     *
-     * Parameters:
-     * config - {Object} Object with properties for configuring the request.
-     *     See the <issue> method for documentation of allowed properties.
-     *     This object is modified and should not be reused.
-     * 
-     * Returns:
-     * {XMLHttpRequest} Request object.
-     */
-    DELETE: function(config) {
-        config = OpenLayers.Util.extend(config, {method: "DELETE"});
-        return OpenLayers.Request.issue(config);
-    },
-  
-    /**
-     * APIMethod: HEAD
-     * Send an HTTP HEAD request.  Additional configuration properties are
-     *     documented in the <issue> method, with the method property set
-     *     to HEAD.
-     *
-     * Parameters:
-     * config - {Object} Object with properties for configuring the request.
-     *     See the <issue> method for documentation of allowed properties.
-     *     This object is modified and should not be reused.
-     * 
-     * Returns:
-     * {XMLHttpRequest} Request object.
-     */
-    HEAD: function(config) {
-        config = OpenLayers.Util.extend(config, {method: "HEAD"});
-        return OpenLayers.Request.issue(config);
-    },
-    
-    /**
-     * APIMethod: OPTIONS
-     * Send an HTTP OPTIONS request.  Additional configuration properties are
-     *     documented in the <issue> method, with the method property set
-     *     to OPTIONS.
-     *
-     * Parameters:
-     * config - {Object} Object with properties for configuring the request.
-     *     See the <issue> method for documentation of allowed properties.
-     *     This object is modified and should not be reused.
-     * 
-     * Returns:
-     * {XMLHttpRequest} Request object.
-     */
-    OPTIONS: function(config) {
-        config = OpenLayers.Util.extend(config, {method: "OPTIONS"});
-        return OpenLayers.Request.issue(config);
-    }
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Request/XMLHttpRequest.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Request/XMLHttpRequest.js
deleted file mode 100644
index 21200a6d..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Request/XMLHttpRequest.js
+++ /dev/null
@@ -1,458 +0,0 @@
-// XMLHttpRequest.js Copyright (C) 2010 Sergey Ilinsky (http://www.ilinsky.com)
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-/**
- * @requires OpenLayers/Request.js
- */
-
-(function () {
-
-    // Save reference to earlier defined object implementation (if any)
-    var oXMLHttpRequest    = window.XMLHttpRequest;
-
-    // Define on browser type
-    var bGecko    = !!window.controllers,
-        bIE        = window.document.all && !window.opera,
-        bIE7    = bIE && window.navigator.userAgent.match(/MSIE 7.0/);
-
-    // Enables "XMLHttpRequest()" call next to "new XMLHttpReques()"
-    function fXMLHttpRequest() {
-        this._object    = oXMLHttpRequest && !bIE7 ? new oXMLHttpRequest : new window.ActiveXObject("Microsoft.XMLHTTP");
-        this._listeners    = [];
-    };
-
-    // Constructor
-    function cXMLHttpRequest() {
-        return new fXMLHttpRequest;
-    };
-    cXMLHttpRequest.prototype    = fXMLHttpRequest.prototype;
-
-    // BUGFIX: Firefox with Firebug installed would break pages if not executed
-    if (bGecko && oXMLHttpRequest.wrapped)
-        cXMLHttpRequest.wrapped    = oXMLHttpRequest.wrapped;
-
-    // Constants
-    cXMLHttpRequest.UNSENT                = 0;
-    cXMLHttpRequest.OPENED                = 1;
-    cXMLHttpRequest.HEADERS_RECEIVED    = 2;
-    cXMLHttpRequest.LOADING                = 3;
-    cXMLHttpRequest.DONE                = 4;
-
-    // Public Properties
-    cXMLHttpRequest.prototype.readyState    = cXMLHttpRequest.UNSENT;
-    cXMLHttpRequest.prototype.responseText    = '';
-    cXMLHttpRequest.prototype.responseXML    = null;
-    cXMLHttpRequest.prototype.status        = 0;
-    cXMLHttpRequest.prototype.statusText    = '';
-
-    // Priority proposal
-    cXMLHttpRequest.prototype.priority        = "NORMAL";
-
-    // Instance-level Events Handlers
-    cXMLHttpRequest.prototype.onreadystatechange    = null;
-
-    // Class-level Events Handlers
-    cXMLHttpRequest.onreadystatechange    = null;
-    cXMLHttpRequest.onopen                = null;
-    cXMLHttpRequest.onsend                = null;
-    cXMLHttpRequest.onabort                = null;
-
-    // Public Methods
-    cXMLHttpRequest.prototype.open    = function(sMethod, sUrl, bAsync, sUser, sPassword) {
-        // Delete headers, required when object is reused
-        delete this._headers;
-
-        // When bAsync parameter value is omitted, use true as default
-        if (arguments.length < 3)
-            bAsync    = true;
-
-        // Save async parameter for fixing Gecko bug with missing readystatechange in synchronous requests
-        this._async        = bAsync;
-
-        // Set the onreadystatechange handler
-        var oRequest    = this,
-            nState        = this.readyState,
-            fOnUnload;
-
-        // BUGFIX: IE - memory leak on page unload (inter-page leak)
-        if (bIE && bAsync) {
-            fOnUnload = function() {
-                if (nState != cXMLHttpRequest.DONE) {
-                    fCleanTransport(oRequest);
-                    // Safe to abort here since onreadystatechange handler removed
-                    oRequest.abort();
-                }
-            };
-            window.attachEvent("onunload", fOnUnload);
-        }
-
-        // Add method sniffer
-        if (cXMLHttpRequest.onopen)
-            cXMLHttpRequest.onopen.apply(this, arguments);
-
-        if (arguments.length > 4)
-            this._object.open(sMethod, sUrl, bAsync, sUser, sPassword);
-        else
-        if (arguments.length > 3)
-            this._object.open(sMethod, sUrl, bAsync, sUser);
-        else
-            this._object.open(sMethod, sUrl, bAsync);
-
-        this.readyState    = cXMLHttpRequest.OPENED;
-        fReadyStateChange(this);
-
-        this._object.onreadystatechange    = function() {
-            if (bGecko && !bAsync)
-                return;
-
-            // Synchronize state
-            oRequest.readyState        = oRequest._object.readyState;
-
-            //
-            fSynchronizeValues(oRequest);
-
-            // BUGFIX: Firefox fires unnecessary DONE when aborting
-            if (oRequest._aborted) {
-                // Reset readyState to UNSENT
-                oRequest.readyState    = cXMLHttpRequest.UNSENT;
-
-                // Return now
-                return;
-            }
-
-            if (oRequest.readyState == cXMLHttpRequest.DONE) {
-                // Free up queue
-                delete oRequest._data;
-/*                if (bAsync)
-                    fQueue_remove(oRequest);*/
-                //
-                fCleanTransport(oRequest);
-// Uncomment this block if you need a fix for IE cache
-/*
-                // BUGFIX: IE - cache issue
-                if (!oRequest._object.getResponseHeader("Date")) {
-                    // Save object to cache
-                    oRequest._cached    = oRequest._object;
-
-                    // Instantiate a new transport object
-                    cXMLHttpRequest.call(oRequest);
-
-                    // Re-send request
-                    if (sUser) {
-                         if (sPassword)
-                            oRequest._object.open(sMethod, sUrl, bAsync, sUser, sPassword);
-                        else
-                            oRequest._object.open(sMethod, sUrl, bAsync, sUser);
-                    }
-                    else
-                        oRequest._object.open(sMethod, sUrl, bAsync);
-                    oRequest._object.setRequestHeader("If-Modified-Since", oRequest._cached.getResponseHeader("Last-Modified") || new window.Date(0));
-                    // Copy headers set
-                    if (oRequest._headers)
-                        for (var sHeader in oRequest._headers)
-                            if (typeof oRequest._headers[sHeader] == "string")    // Some frameworks prototype objects with functions
-                                oRequest._object.setRequestHeader(sHeader, oRequest._headers[sHeader]);
-
-                    oRequest._object.onreadystatechange    = function() {
-                        // Synchronize state
-                        oRequest.readyState        = oRequest._object.readyState;
-
-                        if (oRequest._aborted) {
-                            //
-                            oRequest.readyState    = cXMLHttpRequest.UNSENT;
-
-                            // Return
-                            return;
-                        }
-
-                        if (oRequest.readyState == cXMLHttpRequest.DONE) {
-                            // Clean Object
-                            fCleanTransport(oRequest);
-
-                            // get cached request
-                            if (oRequest.status == 304)
-                                oRequest._object    = oRequest._cached;
-
-                            //
-                            delete oRequest._cached;
-
-                            //
-                            fSynchronizeValues(oRequest);
-
-                            //
-                            fReadyStateChange(oRequest);
-
-                            // BUGFIX: IE - memory leak in interrupted
-                            if (bIE && bAsync)
-                                window.detachEvent("onunload", fOnUnload);
-                        }
-                    };
-                    oRequest._object.send(null);
-
-                    // Return now - wait until re-sent request is finished
-                    return;
-                };
-*/
-                // BUGFIX: IE - memory leak in interrupted
-                if (bIE && bAsync)
-                    window.detachEvent("onunload", fOnUnload);
-            }
-
-            // BUGFIX: Some browsers (Internet Explorer, Gecko) fire OPEN readystate twice
-            if (nState != oRequest.readyState)
-                fReadyStateChange(oRequest);
-
-            nState    = oRequest.readyState;
-        }
-    };
-    function fXMLHttpRequest_send(oRequest) {
-        oRequest._object.send(oRequest._data);
-
-        // BUGFIX: Gecko - missing readystatechange calls in synchronous requests
-        if (bGecko && !oRequest._async) {
-            oRequest.readyState    = cXMLHttpRequest.OPENED;
-
-            // Synchronize state
-            fSynchronizeValues(oRequest);
-
-            // Simulate missing states
-            while (oRequest.readyState < cXMLHttpRequest.DONE) {
-                oRequest.readyState++;
-                fReadyStateChange(oRequest);
-                // Check if we are aborted
-                if (oRequest._aborted)
-                    return;
-            }
-        }
-    };
-    cXMLHttpRequest.prototype.send    = function(vData) {
-        // Add method sniffer
-        if (cXMLHttpRequest.onsend)
-            cXMLHttpRequest.onsend.apply(this, arguments);
-
-        if (!arguments.length)
-            vData    = null;
-
-        // BUGFIX: Safari - fails sending documents created/modified dynamically, so an explicit serialization required
-        // BUGFIX: IE - rewrites any custom mime-type to "text/xml" in case an XMLNode is sent
-        // BUGFIX: Gecko - fails sending Element (this is up to the implementation either to standard)
-        if (vData && vData.nodeType) {
-            vData    = window.XMLSerializer ? new window.XMLSerializer().serializeToString(vData) : vData.xml;
-            if (!this._headers["Content-Type"])
-                this._object.setRequestHeader("Content-Type", "application/xml");
-        }
-
-        this._data    = vData;
-/*
-        // Add to queue
-        if (this._async)
-            fQueue_add(this);
-        else*/
-            fXMLHttpRequest_send(this);
-    };
-    cXMLHttpRequest.prototype.abort    = function() {
-        // Add method sniffer
-        if (cXMLHttpRequest.onabort)
-            cXMLHttpRequest.onabort.apply(this, arguments);
-
-        // BUGFIX: Gecko - unnecessary DONE when aborting
-        if (this.readyState > cXMLHttpRequest.UNSENT)
-            this._aborted    = true;
-
-        this._object.abort();
-
-        // BUGFIX: IE - memory leak
-        fCleanTransport(this);
-
-        this.readyState    = cXMLHttpRequest.UNSENT;
-
-        delete this._data;
-/*        if (this._async)
-            fQueue_remove(this);*/
-    };
-    cXMLHttpRequest.prototype.getAllResponseHeaders    = function() {
-        return this._object.getAllResponseHeaders();
-    };
-    cXMLHttpRequest.prototype.getResponseHeader    = function(sName) {
-        return this._object.getResponseHeader(sName);
-    };
-    cXMLHttpRequest.prototype.setRequestHeader    = function(sName, sValue) {
-        // BUGFIX: IE - cache issue
-        if (!this._headers)
-            this._headers    = {};
-        this._headers[sName]    = sValue;
-
-        return this._object.setRequestHeader(sName, sValue);
-    };
-
-    // EventTarget interface implementation
-    cXMLHttpRequest.prototype.addEventListener    = function(sName, fHandler, bUseCapture) {
-        for (var nIndex = 0, oListener; oListener = this._listeners[nIndex]; nIndex++)
-            if (oListener[0] == sName && oListener[1] == fHandler && oListener[2] == bUseCapture)
-                return;
-        // Add listener
-        this._listeners.push([sName, fHandler, bUseCapture]);
-    };
-
-    cXMLHttpRequest.prototype.removeEventListener    = function(sName, fHandler, bUseCapture) {
-        for (var nIndex = 0, oListener; oListener = this._listeners[nIndex]; nIndex++)
-            if (oListener[0] == sName && oListener[1] == fHandler && oListener[2] == bUseCapture)
-                break;
-        // Remove listener
-        if (oListener)
-            this._listeners.splice(nIndex, 1);
-    };
-
-    cXMLHttpRequest.prototype.dispatchEvent    = function(oEvent) {
-        var oEventPseudo    = {
-            'type':            oEvent.type,
-            'target':        this,
-            'currentTarget':this,
-            'eventPhase':    2,
-            'bubbles':        oEvent.bubbles,
-            'cancelable':    oEvent.cancelable,
-            'timeStamp':    oEvent.timeStamp,
-            'stopPropagation':    function() {},    // There is no flow
-            'preventDefault':    function() {},    // There is no default action
-            'initEvent':        function() {}    // Original event object should be initialized
-        };
-
-        // Execute onreadystatechange
-        if (oEventPseudo.type == "readystatechange" && this.onreadystatechange)
-            (this.onreadystatechange.handleEvent || this.onreadystatechange).apply(this, [oEventPseudo]);
-
-        // Execute listeners
-        for (var nIndex = 0, oListener; oListener = this._listeners[nIndex]; nIndex++)
-            if (oListener[0] == oEventPseudo.type && !oListener[2])
-                (oListener[1].handleEvent || oListener[1]).apply(this, [oEventPseudo]);
-    };
-
-    //
-    cXMLHttpRequest.prototype.toString    = function() {
-        return '[' + "object" + ' ' + "XMLHttpRequest" + ']';
-    };
-
-    cXMLHttpRequest.toString    = function() {
-        return '[' + "XMLHttpRequest" + ']';
-    };
-
-    // Helper function
-    function fReadyStateChange(oRequest) {
-        // Sniffing code
-        if (cXMLHttpRequest.onreadystatechange)
-            cXMLHttpRequest.onreadystatechange.apply(oRequest);
-
-        // Fake event
-        oRequest.dispatchEvent({
-            'type':            "readystatechange",
-            'bubbles':        false,
-            'cancelable':    false,
-            'timeStamp':    new Date + 0
-        });
-    };
-
-    function fGetDocument(oRequest) {
-        var oDocument    = oRequest.responseXML,
-            sResponse    = oRequest.responseText;
-        // Try parsing responseText
-        if (bIE && sResponse && oDocument && !oDocument.documentElement && oRequest.getResponseHeader("Content-Type").match(/[^\/]+\/[^\+]+\+xml/)) {
-            oDocument    = new window.ActiveXObject("Microsoft.XMLDOM");
-            oDocument.async                = false;
-            oDocument.validateOnParse    = false;
-            oDocument.loadXML(sResponse);
-        }
-        // Check if there is no error in document
-        if (oDocument)
-            if ((bIE && oDocument.parseError != 0) || !oDocument.documentElement || (oDocument.documentElement && oDocument.documentElement.tagName == "parsererror"))
-                return null;
-        return oDocument;
-    };
-
-    function fSynchronizeValues(oRequest) {
-        try {    oRequest.responseText    = oRequest._object.responseText;    } catch (e) {}
-        try {    oRequest.responseXML    = fGetDocument(oRequest._object);    } catch (e) {}
-        try {    oRequest.status            = oRequest._object.status;            } catch (e) {}
-        try {    oRequest.statusText        = oRequest._object.statusText;        } catch (e) {}
-    };
-
-    function fCleanTransport(oRequest) {
-        // BUGFIX: IE - memory leak (on-page leak)
-        oRequest._object.onreadystatechange    = new window.Function;
-    };
-/*
-    // Queue manager
-    var oQueuePending    = {"CRITICAL":[],"HIGH":[],"NORMAL":[],"LOW":[],"LOWEST":[]},
-        aQueueRunning    = [];
-    function fQueue_add(oRequest) {
-        oQueuePending[oRequest.priority in oQueuePending ? oRequest.priority : "NORMAL"].push(oRequest);
-        //
-        setTimeout(fQueue_process);
-    };
-
-    function fQueue_remove(oRequest) {
-        for (var nIndex = 0, bFound    = false; nIndex < aQueueRunning.length; nIndex++)
-            if (bFound)
-                aQueueRunning[nIndex - 1]    = aQueueRunning[nIndex];
-            else
-            if (aQueueRunning[nIndex] == oRequest)
-                bFound    = true;
-        if (bFound)
-            aQueueRunning.length--;
-        //
-        setTimeout(fQueue_process);
-    };
-
-    function fQueue_process() {
-        if (aQueueRunning.length < 6) {
-            for (var sPriority in oQueuePending) {
-                if (oQueuePending[sPriority].length) {
-                    var oRequest    = oQueuePending[sPriority][0];
-                    oQueuePending[sPriority]    = oQueuePending[sPriority].slice(1);
-                    //
-                    aQueueRunning.push(oRequest);
-                    // Send request
-                    fXMLHttpRequest_send(oRequest);
-                    break;
-                }
-            }
-        }
-    };
-*/
-    // Internet Explorer 5.0 (missing apply)
-    if (!window.Function.prototype.apply) {
-        window.Function.prototype.apply    = function(oRequest, oArguments) {
-            if (!oArguments)
-                oArguments    = [];
-            oRequest.__func    = this;
-            oRequest.__func(oArguments[0], oArguments[1], oArguments[2], oArguments[3], oArguments[4]);
-            delete oRequest.__func;
-        };
-    };
-
-    // Register new object with window
-    /**
-     * Class: OpenLayers.Request.XMLHttpRequest
-     * Standard-compliant (W3C) cross-browser implementation of the
-     *     XMLHttpRequest object.  From
-     *     http://code.google.com/p/xmlhttprequest/.
-     */
-    if (!OpenLayers.Request) {
-        /**
-         * This allows for OpenLayers/Request.js to be included
-         * before or after this script.
-         */
-        OpenLayers.Request = {};
-    }
-    OpenLayers.Request.XMLHttpRequest = cXMLHttpRequest;
-})();
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Rule.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Rule.js
deleted file mode 100644
index dbf5e688..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Rule.js
+++ /dev/null
@@ -1,236 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-
-/**
- * @requires OpenLayers/BaseTypes/Class.js
- * @requires OpenLayers/Util.js
- * @requires OpenLayers/Style.js
- */
-
-/**
- * Class: OpenLayers.Rule
- * This class represents an SLD Rule, as being used for rule-based SLD styling.
- */
-OpenLayers.Rule = OpenLayers.Class({
-    
-    /**
-     * Property: id
-     * {String} A unique id for this session.
-     */
-    id: null,
-    
-    /**
-     * APIProperty: name
-     * {String} name of this rule
-     */
-    name: null,
-    
-    /**
-     * Property: title
-     * {String} Title of this rule (set if included in SLD)
-     */
-    title: null,
-    
-    /**
-     * Property: description
-     * {String} Description of this rule (set if abstract is included in SLD)
-     */
-    description: null,
-
-    /**
-     * Property: context
-     * {Object} An optional object with properties that the rule should be
-     * evaluated against. If no context is specified, feature.attributes will
-     * be used.
-     */
-    context: null,
-    
-    /**
-     * Property: filter
-     * {<OpenLayers.Filter>} Optional filter for the rule.
-     */
-    filter: null,
-
-    /**
-     * Property: elseFilter
-     * {Boolean} Determines whether this rule is only to be applied only if
-     * no other rules match (ElseFilter according to the SLD specification). 
-     * Default is false.  For instances of OpenLayers.Rule, if elseFilter is
-     * false, the rule will always apply.  For subclasses, the else property is 
-     * ignored.
-     */
-    elseFilter: false,
-    
-    /**
-     * Property: symbolizer
-     * {Object} Symbolizer or hash of symbolizers for this rule. If hash of
-     * symbolizers, keys are one or more of ["Point", "Line", "Polygon"]. The
-     * latter if useful if it is required to style e.g. vertices of a line
-     * with a point symbolizer. Note, however, that this is not implemented
-     * yet in OpenLayers, but it is the way how symbolizers are defined in
-     * SLD.
-     */
-    symbolizer: null,
-    
-    /**
-     * Property: symbolizers
-     * {Array} Collection of symbolizers associated with this rule.  If 
-     *     provided at construction, the symbolizers array has precedence
-     *     over the deprecated symbolizer property.  Note that multiple 
-     *     symbolizers are not currently supported by the vector renderers.
-     *     Rules with multiple symbolizers are currently only useful for
-     *     maintaining elements in an SLD document.
-     */
-    symbolizers: null,
-    
-    /**
-     * APIProperty: minScaleDenominator
-     * {Number} or {String} minimum scale at which to draw the feature.
-     * In the case of a String, this can be a combination of text and
-     * propertyNames in the form "literal ${propertyName}"
-     */
-    minScaleDenominator: null,
-
-    /**
-     * APIProperty: maxScaleDenominator
-     * {Number} or {String} maximum scale at which to draw the feature.
-     * In the case of a String, this can be a combination of text and
-     * propertyNames in the form "literal ${propertyName}"
-     */
-    maxScaleDenominator: null,
-    
-    /** 
-     * Constructor: OpenLayers.Rule
-     * Creates a Rule.
-     *
-     * Parameters:
-     * options - {Object} An optional object with properties to set on the
-     *           rule
-     * 
-     * Returns:
-     * {<OpenLayers.Rule>}
-     */
-    initialize: function(options) {
-        this.symbolizer = {};
-        OpenLayers.Util.extend(this, options);
-        if (this.symbolizers) {
-            delete this.symbolizer;
-        }
-        this.id = OpenLayers.Util.createUniqueID(this.CLASS_NAME + "_");
-    },
-
-    /** 
-     * APIMethod: destroy
-     * nullify references to prevent circular references and memory leaks
-     */
-    destroy: function() {
-        for (var i in this.symbolizer) {
-            this.symbolizer[i] = null;
-        }
-        this.symbolizer = null;
-        delete this.symbolizers;
-    },
-    
-    /**
-     * APIMethod: evaluate
-     * evaluates this rule for a specific feature
-     * 
-     * Parameters:
-     * feature - {<OpenLayers.Feature>} feature to apply the rule to.
-     * 
-     * Returns:
-     * {Boolean} true if the rule applies, false if it does not.
-     * This rule is the default rule and always returns true.
-     */
-    evaluate: function(feature) {
-        var context = this.getContext(feature);
-        var applies = true;
-
-        if (this.minScaleDenominator || this.maxScaleDenominator) {
-            var scale = feature.layer.map.getScale();
-        }
-        
-        // check if within minScale/maxScale bounds
-        if (this.minScaleDenominator) {
-            applies = scale >= OpenLayers.Style.createLiteral(
-                    this.minScaleDenominator, context);
-        }
-        if (applies && this.maxScaleDenominator) {
-            applies = scale < OpenLayers.Style.createLiteral(
-                    this.maxScaleDenominator, context);
-        }
-        
-        // check if optional filter applies
-        if(applies && this.filter) {
-            // feature id filters get the feature, others get the context
-            if(this.filter.CLASS_NAME == "OpenLayers.Filter.FeatureId") {
-                applies = this.filter.evaluate(feature);
-            } else {
-                applies = this.filter.evaluate(context);
-            }
-        }
-
-        return applies;
-    },
-    
-    /**
-     * Method: getContext
-     * Gets the context for evaluating this rule
-     * 
-     * Paramters:
-     * feature - {<OpenLayers.Feature>} feature to take the context from if
-     *           none is specified.
-     */
-    getContext: function(feature) {
-        var context = this.context;
-        if (!context) {
-            context = feature.attributes || feature.data;
-        }
-        if (typeof this.context == "function") {
-            context = this.context(feature);
-        }
-        return context;
-    },
-    
-    /**
-     * APIMethod: clone
-     * Clones this rule.
-     * 
-     * Returns:
-     * {<OpenLayers.Rule>} Clone of this rule.
-     */
-    clone: function() {
-        var options = OpenLayers.Util.extend({}, this);
-        if (this.symbolizers) {
-            // clone symbolizers
-            var len = this.symbolizers.length;
-            options.symbolizers = new Array(len);
-            for (var i=0; i<len; ++i) {
-                options.symbolizers[i] = this.symbolizers[i].clone();
-            }
-        } else {
-            // clone symbolizer
-            options.symbolizer = {};
-            var value, type;
-            for(var key in this.symbolizer) {
-                value = this.symbolizer[key];
-                type = typeof value;
-                if(type === "object") {
-                    options.symbolizer[key] = OpenLayers.Util.extend({}, value);
-                } else if(type === "string") {
-                    options.symbolizer[key] = value;
-                }
-            }
-        }
-        // clone filter
-        options.filter = this.filter && this.filter.clone();
-        // clone context
-        options.context = this.context && OpenLayers.Util.extend({}, this.context);
-        return new OpenLayers.Rule(options);
-    },
-        
-    CLASS_NAME: "OpenLayers.Rule"
-});
\ No newline at end of file
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/SingleFile.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/SingleFile.js
deleted file mode 100644
index 1f210c9c..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/SingleFile.js
+++ /dev/null
@@ -1,78 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-var OpenLayers = {
-    /**
-     * Constant: VERSION_NUMBER
-     */
-    VERSION_NUMBER: "Release 2.13.1",
-
-    /**
-     * Constant: singleFile
-     * TODO: remove this in 3.0 when we stop supporting build profiles that
-     * include OpenLayers.js
-     */
-    singleFile: true,
-
-    /**
-     * Method: _getScriptLocation
-     * Return the path to this script. This is also implemented in
-     * OpenLayers.js
-     *
-     * Returns:
-     * {String} Path to this script
-     */
-    _getScriptLocation: (function() {
-        var r = new RegExp("(^|(.*?\\/))(OpenLayers[^\\/]*?\\.js)(\\?|$)"),
-            s = document.getElementsByTagName('script'),
-            src, m, l = "";
-        for(var i=0, len=s.length; i<len; i++) {
-            src = s[i].getAttribute('src');
-            if(src) {
-                m = src.match(r);
-                if(m) {
-                    l = m[1];
-                    break;
-                }
-            }
-        }
-        return (function() { return l; });
-    })(),
-    
-    /**
-     * Property: ImgPath
-     * {String} Set this to the path where control images are stored, a path  
-     * given here must end with a slash. If set to '' (which is the default) 
-     * OpenLayers will use its script location + "img/".
-     * 
-     * You will need to set this property when you have a singlefile build of 
-     * OpenLayers that either is not named "OpenLayers.js" or if you move
-     * the file in a way such that the image directory cannot be derived from 
-     * the script location.
-     * 
-     * If your custom OpenLayers build is named "my-custom-ol.js" and the images
-     * of OpenLayers are in a folder "/resources/external/images/ol" a correct
-     * way of including OpenLayers in your HTML would be:
-     * 
-     * (code)
-     *   <script src="/path/to/my-custom-ol.js" type="text/javascript"></script>
-     *   <script type="text/javascript">
-     *      // tell OpenLayers where the control images are
-     *      // remember the trailing slash
-     *      OpenLayers.ImgPath = "/resources/external/images/ol/";
-     *   </script>
-     * (end code)
-     * 
-     * Please remember that when your OpenLayers script is not named 
-     * "OpenLayers.js" you will have to make sure that the default theme is 
-     * loaded into the page by including an appropriate <link>-tag, 
-     * e.g.:
-     * 
-     * (code)
-     *   <link rel="stylesheet" href="/path/to/default/style.css"  type="text/css">
-     * (end code)
-     */
-    ImgPath : ''
-};
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Spherical.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Spherical.js
deleted file mode 100644
index 74e14a8c..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Spherical.js
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/SingleFile.js
- */
-
-/**
- * Namespace: Spherical
- * The OpenLayers.Spherical namespace includes utility functions for
- * calculations on the basis of a spherical earth (ignoring ellipsoidal
- * effects), which is accurate enough for most purposes.
- *
- * Relevant links:
- * * http://www.movable-type.co.uk/scripts/latlong.html
- * * http://code.google.com/apis/maps/documentation/javascript/reference.html#spherical
- */
-
-OpenLayers.Spherical = OpenLayers.Spherical || {};
-
-OpenLayers.Spherical.DEFAULT_RADIUS = 6378137;
-
-/**
- * APIFunction: computeDistanceBetween
- * Computes the distance between two LonLats.
- *
- * Parameters:
- * from   - {<OpenLayers.LonLat>} or {Object} Starting point. A LonLat or
- *          a JavaScript literal with lon lat properties.
- * to     - {<OpenLayers.LonLat>} or {Object} Ending point. A LonLat or a
- *          JavaScript literal with lon lat properties.
- * radius - {Float} The radius. Optional. Defaults to 6378137 meters.
- *
- * Returns:
- * {Float} The distance in meters.
- */
-OpenLayers.Spherical.computeDistanceBetween = function(from, to, radius) {
-  var R = radius || OpenLayers.Spherical.DEFAULT_RADIUS;
-  var sinHalfDeltaLon = Math.sin(Math.PI * (to.lon - from.lon) / 360);
-  var sinHalfDeltaLat = Math.sin(Math.PI * (to.lat - from.lat) / 360);
-  var a = sinHalfDeltaLat * sinHalfDeltaLat +
-      sinHalfDeltaLon * sinHalfDeltaLon * Math.cos(Math.PI * from.lat / 180) * Math.cos(Math.PI * to.lat / 180); 
-  return 2 * R * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a)); 
-};
-
-
-/**
- * APIFunction: computeHeading
- * Computes the heading from one LonLat to another LonLat.
- *
- * Parameters:
- * from   - {<OpenLayers.LonLat>} or {Object} Starting point. A LonLat or
- *          a JavaScript literal with lon lat properties.
- * to     - {<OpenLayers.LonLat>} or {Object} Ending point. A LonLat or a
- *          JavaScript literal with lon lat properties.
- *
- * Returns:
- * {Float} The heading in degrees.
- */
-OpenLayers.Spherical.computeHeading = function(from, to) {
-    var y = Math.sin(Math.PI * (from.lon - to.lon) / 180) * Math.cos(Math.PI * to.lat / 180);
-    var x = Math.cos(Math.PI * from.lat / 180) * Math.sin(Math.PI * to.lat / 180) -
-        Math.sin(Math.PI * from.lat / 180) * Math.cos(Math.PI * to.lat / 180) * Math.cos(Math.PI * (from.lon - to.lon) / 180);
-    return 180 * Math.atan2(y, x) / Math.PI;
-};
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Strategy.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Strategy.js
deleted file mode 100644
index 113deb14..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Strategy.js
+++ /dev/null
@@ -1,121 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/BaseTypes/Class.js
- */
-
-/**
- * Class: OpenLayers.Strategy
- * Abstract vector layer strategy class.  Not to be instantiated directly.  Use
- *     one of the strategy subclasses instead.
- */
-OpenLayers.Strategy = OpenLayers.Class({
-    
-    /**
-     * Property: layer
-     * {<OpenLayers.Layer.Vector>} The layer this strategy belongs to.
-     */
-    layer: null,
-    
-    /**
-     * Property: options
-     * {Object} Any options sent to the constructor.
-     */
-    options: null,
-
-    /** 
-     * Property: active 
-     * {Boolean} The control is active.
-     */
-    active: null,
-
-    /**
-     * Property: autoActivate
-     * {Boolean} The creator of the strategy can set autoActivate to false
-     *      to fully control when the protocol is activated and deactivated.
-     *      Defaults to true.
-     */
-    autoActivate: true,
-
-    /**
-     * Property: autoDestroy
-     * {Boolean} The creator of the strategy can set autoDestroy to false
-     *      to fully control when the strategy is destroyed. Defaults to
-     *      true.
-     */
-    autoDestroy: true,
-
-    /**
-     * Constructor: OpenLayers.Strategy
-     * Abstract class for vector strategies.  Create instances of a subclass.
-     *
-     * Parameters:
-     * options - {Object} Optional object whose properties will be set on the
-     *     instance.
-     */
-    initialize: function(options) {
-        OpenLayers.Util.extend(this, options);
-        this.options = options;
-        // set the active property here, so that user cannot override it
-        this.active = false;
-    },
-    
-    /**
-     * APIMethod: destroy
-     * Clean up the strategy.
-     */
-    destroy: function() {
-        this.deactivate();
-        this.layer = null;
-        this.options = null;
-    },
-
-    /**
-     * Method: setLayer
-     * Called to set the <layer> property.
-     *
-     * Parameters:
-     * layer - {<OpenLayers.Layer.Vector>}
-     */
-    setLayer: function(layer) {
-        this.layer = layer;
-    },
-    
-    /**
-     * Method: activate
-     * Activate the strategy.  Register any listeners, do appropriate setup.
-     *
-     * Returns:
-     * {Boolean} True if the strategy was successfully activated or false if
-     *      the strategy was already active.
-     */
-    activate: function() {
-        if (!this.active) {
-            this.active = true;
-            return true;
-        }
-        return false;
-    },
-    
-    /**
-     * Method: deactivate
-     * Deactivate the strategy.  Unregister any listeners, do appropriate
-     *     tear-down.
-     *
-     * Returns:
-     * {Boolean} True if the strategy was successfully deactivated or false if
-     *      the strategy was already inactive.
-     */
-    deactivate: function() {
-        if (this.active) {
-            this.active = false;
-            return true;
-        }
-        return false;
-    },
-   
-    CLASS_NAME: "OpenLayers.Strategy" 
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Strategy/BBOX.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Strategy/BBOX.js
deleted file mode 100644
index e0667645..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Strategy/BBOX.js
+++ /dev/null
@@ -1,290 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Strategy.js
- * @requires OpenLayers/Filter/Spatial.js
- */
-
-/**
- * Class: OpenLayers.Strategy.BBOX
- * A simple strategy that reads new features when the viewport invalidates
- *     some bounds.
- *
- * Inherits from:
- *  - <OpenLayers.Strategy>
- */
-OpenLayers.Strategy.BBOX = OpenLayers.Class(OpenLayers.Strategy, {
-    
-    /**
-     * Property: bounds
-     * {<OpenLayers.Bounds>} The current data bounds (in the same projection
-     *     as the layer - not always the same projection as the map).
-     */
-    bounds: null,
-    
-    /** 
-     * Property: resolution 
-     * {Float} The current data resolution. 
-     */ 
-    resolution: null, 
-           
-    /**
-     * APIProperty: ratio
-     * {Float} The ratio of the data bounds to the viewport bounds (in each
-     *     dimension).  Default is 2.
-     */
-    ratio: 2,
-
-    /** 
-     * Property: resFactor 
-     * {Float} Optional factor used to determine when previously requested 
-     *     features are invalid.  If set, the resFactor will be compared to the
-     *     resolution of the previous request to the current map resolution.
-     *     If resFactor > (old / new) and 1/resFactor < (old / new).  If you
-     *     set a resFactor of 1, data will be requested every time the
-     *     resolution changes.  If you set a resFactor of 3, data will be
-     *     requested if the old resolution is 3 times the new, or if the new is
-     *     3 times the old.  If the old bounds do not contain the new bounds
-     *     new data will always be requested (with or without considering
-     *     resFactor). 
-     */ 
-    resFactor: null, 
-    
-    /**
-     * Property: response
-     * {<OpenLayers.Protocol.Response>} The protocol response object returned
-     *      by the layer protocol.
-     */
-    response: null,
-
-    /**
-     * Constructor: OpenLayers.Strategy.BBOX
-     * Create a new BBOX strategy.
-     *
-     * Parameters:
-     * options - {Object} Optional object whose properties will be set on the
-     *     instance.
-     */
-    
-    /**
-     * Method: activate
-     * Set up strategy with regard to reading new batches of remote data.
-     * 
-     * Returns:
-     * {Boolean} The strategy was successfully activated.
-     */
-    activate: function() {
-        var activated = OpenLayers.Strategy.prototype.activate.call(this);
-        if(activated) {
-            this.layer.events.on({
-                "moveend": this.update,
-                "refresh": this.update,
-                "visibilitychanged": this.update,
-                scope: this
-            });
-            this.update();
-        }
-        return activated;
-    },
-    
-    /**
-     * Method: deactivate
-     * Tear down strategy with regard to reading new batches of remote data.
-     * 
-     * Returns:
-     * {Boolean} The strategy was successfully deactivated.
-     */
-    deactivate: function() {
-        var deactivated = OpenLayers.Strategy.prototype.deactivate.call(this);
-        if(deactivated) {
-            this.layer.events.un({
-                "moveend": this.update,
-                "refresh": this.update,
-                "visibilitychanged": this.update,
-                scope: this
-            });
-        }
-        return deactivated;
-    },
-
-    /**
-     * Method: update
-     * Callback function called on "moveend" or "refresh" layer events.
-     *
-     * Parameters:
-     * options - {Object} Optional object whose properties will determine
-     *     the behaviour of this Strategy
-     *
-     * Valid options include:
-     * force - {Boolean} if true, new data must be unconditionally read.
-     * noAbort - {Boolean} if true, do not abort previous requests.
-     */
-    update: function(options) {
-        var mapBounds = this.getMapBounds();
-        if (mapBounds !== null && ((options && options.force) ||
-          (this.layer.visibility && this.layer.calculateInRange() && this.invalidBounds(mapBounds)))) {
-            this.calculateBounds(mapBounds);
-            this.resolution = this.layer.map.getResolution(); 
-            this.triggerRead(options);
-        }
-    },
-    
-    /**
-     * Method: getMapBounds
-     * Get the map bounds expressed in the same projection as this layer.
-     *
-     * Returns:
-     * {<OpenLayers.Bounds>} Map bounds in the projection of the layer.
-     */
-    getMapBounds: function() {
-        if (this.layer.map === null) {
-            return null;
-        }
-        var bounds = this.layer.map.getExtent();
-        if(bounds && !this.layer.projection.equals(
-                this.layer.map.getProjectionObject())) {
-            bounds = bounds.clone().transform(
-                this.layer.map.getProjectionObject(), this.layer.projection
-            );
-        }
-        return bounds;
-    },
-
-    /**
-     * Method: invalidBounds
-     * Determine whether the previously requested set of features is invalid. 
-     *     This occurs when the new map bounds do not contain the previously 
-     *     requested bounds.  In addition, if <resFactor> is set, it will be 
-     *     considered.
-     *
-     * Parameters:
-     * mapBounds - {<OpenLayers.Bounds>} the current map extent, will be
-     *      retrieved from the map object if not provided
-     *
-     * Returns:
-     * {Boolean} 
-     */
-    invalidBounds: function(mapBounds) {
-        if(!mapBounds) {
-            mapBounds = this.getMapBounds();
-        }
-        var invalid = !this.bounds || !this.bounds.containsBounds(mapBounds);
-        if(!invalid && this.resFactor) {
-            var ratio = this.resolution / this.layer.map.getResolution();
-            invalid = (ratio >= this.resFactor || ratio <= (1 / this.resFactor));
-        }
-        return invalid;
-    },
- 
-    /**
-     * Method: calculateBounds
-     *
-     * Parameters:
-     * mapBounds - {<OpenLayers.Bounds>} the current map extent, will be
-     *      retrieved from the map object if not provided
-     */
-    calculateBounds: function(mapBounds) {
-        if(!mapBounds) {
-            mapBounds = this.getMapBounds();
-        }
-        var center = mapBounds.getCenterLonLat();
-        var dataWidth = mapBounds.getWidth() * this.ratio;
-        var dataHeight = mapBounds.getHeight() * this.ratio;
-        this.bounds = new OpenLayers.Bounds(
-            center.lon - (dataWidth / 2),
-            center.lat - (dataHeight / 2),
-            center.lon + (dataWidth / 2),
-            center.lat + (dataHeight / 2)
-        );
-    },
-    
-    /**
-     * Method: triggerRead
-     *
-     * Parameters:
-     * options - {Object} Additional options for the protocol's read method 
-     *     (optional)
-     *
-     * Returns:
-     * {<OpenLayers.Protocol.Response>} The protocol response object
-     *      returned by the layer protocol.
-     */
-    triggerRead: function(options) {
-        if (this.response && !(options && options.noAbort === true)) {
-            this.layer.protocol.abort(this.response);
-            this.layer.events.triggerEvent("loadend");
-        }
-        var evt = {filter: this.createFilter()};
-        this.layer.events.triggerEvent("loadstart", evt);
-        this.response = this.layer.protocol.read(
-            OpenLayers.Util.applyDefaults({
-                filter: evt.filter,
-                callback: this.merge,
-                scope: this
-        }, options));
-    },
- 
-    /**
-     * Method: createFilter
-     * Creates a spatial BBOX filter. If the layer that this strategy belongs
-     * to has a filter property, this filter will be combined with the BBOX 
-     * filter.
-     * 
-     * Returns
-     * {<OpenLayers.Filter>} The filter object.
-     */
-    createFilter: function() {
-        var filter = new OpenLayers.Filter.Spatial({
-            type: OpenLayers.Filter.Spatial.BBOX,
-            value: this.bounds,
-            projection: this.layer.projection
-        });
-        if (this.layer.filter) {
-            filter = new OpenLayers.Filter.Logical({
-                type: OpenLayers.Filter.Logical.AND,
-                filters: [this.layer.filter, filter]
-            });
-        }
-        return filter;
-    },
-   
-    /**
-     * Method: merge
-     * Given a list of features, determine which ones to add to the layer.
-     *     If the layer projection differs from the map projection, features
-     *     will be transformed from the layer projection to the map projection.
-     *
-     * Parameters:
-     * resp - {<OpenLayers.Protocol.Response>} The response object passed
-     *      by the protocol.
-     */
-    merge: function(resp) {
-        this.layer.destroyFeatures();
-        if (resp.success()) {
-            var features = resp.features;
-            if(features && features.length > 0) {
-                var remote = this.layer.projection;
-                var local = this.layer.map.getProjectionObject();
-                if(!local.equals(remote)) {
-                    var geom;
-                    for(var i=0, len=features.length; i<len; ++i) {
-                        geom = features[i].geometry;
-                        if(geom) {
-                            geom.transform(remote, local);
-                        }
-                    }
-                }
-                this.layer.addFeatures(features);
-            }
-        } else {
-            this.bounds = null;
-        }
-        this.response = null;
-        this.layer.events.triggerEvent("loadend", {response: resp});
-    },
-   
-    CLASS_NAME: "OpenLayers.Strategy.BBOX" 
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Strategy/Cluster.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Strategy/Cluster.js
deleted file mode 100644
index d478598a..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Strategy/Cluster.js
+++ /dev/null
@@ -1,283 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Strategy.js
- */
-
-/**
- * Class: OpenLayers.Strategy.Cluster
- * Strategy for vector feature clustering.
- *
- * Inherits from:
- *  - <OpenLayers.Strategy>
- */
-OpenLayers.Strategy.Cluster = OpenLayers.Class(OpenLayers.Strategy, {
-    
-    /**
-     * APIProperty: distance
-     * {Integer} Pixel distance between features that should be considered a
-     *     single cluster.  Default is 20 pixels.
-     */
-    distance: 20,
-    
-    /**
-     * APIProperty: threshold
-     * {Integer} Optional threshold below which original features will be
-     *     added to the layer instead of clusters.  For example, a threshold
-     *     of 3 would mean that any time there are 2 or fewer features in
-     *     a cluster, those features will be added directly to the layer instead
-     *     of a cluster representing those features.  Default is null (which is
-     *     equivalent to 1 - meaning that clusters may contain just one feature).
-     */
-    threshold: null,
-    
-    /**
-     * Property: features
-     * {Array(<OpenLayers.Feature.Vector>)} Cached features.
-     */
-    features: null,
-    
-    /**
-     * Property: clusters
-     * {Array(<OpenLayers.Feature.Vector>)} Calculated clusters.
-     */
-    clusters: null,
-    
-    /**
-     * Property: clustering
-     * {Boolean} The strategy is currently clustering features.
-     */
-    clustering: false,
-    
-    /**
-     * Property: resolution
-     * {Float} The resolution (map units per pixel) of the current cluster set.
-     */
-    resolution: null,
-
-    /**
-     * Constructor: OpenLayers.Strategy.Cluster
-     * Create a new clustering strategy.
-     *
-     * Parameters:
-     * options - {Object} Optional object whose properties will be set on the
-     *     instance.
-     */
-    
-    /**
-     * APIMethod: activate
-     * Activate the strategy.  Register any listeners, do appropriate setup.
-     * 
-     * Returns:
-     * {Boolean} The strategy was successfully activated.
-     */
-    activate: function() {
-        var activated = OpenLayers.Strategy.prototype.activate.call(this);
-        if(activated) {
-            this.layer.events.on({
-                "beforefeaturesadded": this.cacheFeatures,
-                "featuresremoved": this.clearCache,
-                "moveend": this.cluster,
-                scope: this
-            });
-        }
-        return activated;
-    },
-    
-    /**
-     * APIMethod: deactivate
-     * Deactivate the strategy.  Unregister any listeners, do appropriate
-     *     tear-down.
-     * 
-     * Returns:
-     * {Boolean} The strategy was successfully deactivated.
-     */
-    deactivate: function() {
-        var deactivated = OpenLayers.Strategy.prototype.deactivate.call(this);
-        if(deactivated) {
-            this.clearCache();
-            this.layer.events.un({
-                "beforefeaturesadded": this.cacheFeatures,
-                "featuresremoved": this.clearCache,
-                "moveend": this.cluster,
-                scope: this
-            });
-        }
-        return deactivated;
-    },
-    
-    /**
-     * Method: cacheFeatures
-     * Cache features before they are added to the layer.
-     *
-     * Parameters:
-     * event - {Object} The event that this was listening for.  This will come
-     *     with a batch of features to be clustered.
-     *     
-     * Returns:
-     * {Boolean} False to stop features from being added to the layer.
-     */
-    cacheFeatures: function(event) {
-        var propagate = true;
-        if(!this.clustering) {
-            this.clearCache();
-            this.features = event.features;
-            this.cluster();
-            propagate = false;
-        }
-        return propagate;
-    },
-    
-    /**
-     * Method: clearCache
-     * Clear out the cached features.
-     */
-    clearCache: function() {
-        if(!this.clustering) {
-            this.features = null;
-        }
-    },
-    
-    /**
-     * Method: cluster
-     * Cluster features based on some threshold distance.
-     *
-     * Parameters:
-     * event - {Object} The event received when cluster is called as a
-     *     result of a moveend event.
-     */
-    cluster: function(event) {
-        if((!event || event.zoomChanged) && this.features) {
-            var resolution = this.layer.map.getResolution();
-            if(resolution != this.resolution || !this.clustersExist()) {
-                this.resolution = resolution;
-                var clusters = [];
-                var feature, clustered, cluster;
-                for(var i=0; i<this.features.length; ++i) {
-                    feature = this.features[i];
-                    if(feature.geometry) {
-                        clustered = false;
-                        for(var j=clusters.length-1; j>=0; --j) {
-                            cluster = clusters[j];
-                            if(this.shouldCluster(cluster, feature)) {
-                                this.addToCluster(cluster, feature);
-                                clustered = true;
-                                break;
-                            }
-                        }
-                        if(!clustered) {
-                            clusters.push(this.createCluster(this.features[i]));
-                        }
-                    }
-                }
-                this.clustering = true;
-                this.layer.removeAllFeatures();
-                this.clustering = false;
-                if(clusters.length > 0) {
-                    if(this.threshold > 1) {
-                        var clone = clusters.slice();
-                        clusters = [];
-                        var candidate;
-                        for(var i=0, len=clone.length; i<len; ++i) {
-                            candidate = clone[i];
-                            if(candidate.attributes.count < this.threshold) {
-                                Array.prototype.push.apply(clusters, candidate.cluster);
-                            } else {
-                                clusters.push(candidate);
-                            }
-                        }
-                    }
-                    this.clustering = true;
-                    // A legitimate feature addition could occur during this
-                    // addFeatures call.  For clustering to behave well, features
-                    // should be removed from a layer before requesting a new batch.
-                    this.layer.addFeatures(clusters);
-                    this.clustering = false;
-                }
-                this.clusters = clusters;
-            }
-        }
-    },
-    
-    /**
-     * Method: clustersExist
-     * Determine whether calculated clusters are already on the layer.
-     *
-     * Returns:
-     * {Boolean} The calculated clusters are already on the layer.
-     */
-    clustersExist: function() {
-        var exist = false;
-        if(this.clusters && this.clusters.length > 0 &&
-           this.clusters.length == this.layer.features.length) {
-            exist = true;
-            for(var i=0; i<this.clusters.length; ++i) {
-                if(this.clusters[i] != this.layer.features[i]) {
-                    exist = false;
-                    break;
-                }
-            }
-        }
-        return exist;
-    },
-    
-    /**
-     * Method: shouldCluster
-     * Determine whether to include a feature in a given cluster.
-     *
-     * Parameters:
-     * cluster - {<OpenLayers.Feature.Vector>} A cluster.
-     * feature - {<OpenLayers.Feature.Vector>} A feature.
-     *
-     * Returns:
-     * {Boolean} The feature should be included in the cluster.
-     */
-    shouldCluster: function(cluster, feature) {
-        var cc = cluster.geometry.getBounds().getCenterLonLat();
-        var fc = feature.geometry.getBounds().getCenterLonLat();
-        var distance = (
-            Math.sqrt(
-                Math.pow((cc.lon - fc.lon), 2) + Math.pow((cc.lat - fc.lat), 2)
-            ) / this.resolution
-        );
-        return (distance <= this.distance);
-    },
-    
-    /**
-     * Method: addToCluster
-     * Add a feature to a cluster.
-     *
-     * Parameters:
-     * cluster - {<OpenLayers.Feature.Vector>} A cluster.
-     * feature - {<OpenLayers.Feature.Vector>} A feature.
-     */
-    addToCluster: function(cluster, feature) {
-        cluster.cluster.push(feature);
-        cluster.attributes.count += 1;
-    },
-    
-    /**
-     * Method: createCluster
-     * Given a feature, create a cluster.
-     *
-     * Parameters:
-     * feature - {<OpenLayers.Feature.Vector>}
-     *
-     * Returns:
-     * {<OpenLayers.Feature.Vector>} A cluster.
-     */
-    createCluster: function(feature) {
-        var center = feature.geometry.getBounds().getCenterLonLat();
-        var cluster = new OpenLayers.Feature.Vector(
-            new OpenLayers.Geometry.Point(center.lon, center.lat),
-            {count: 1}
-        );
-        cluster.cluster = [feature];
-        return cluster;
-    },
-
-    CLASS_NAME: "OpenLayers.Strategy.Cluster" 
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Strategy/Filter.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Strategy/Filter.js
deleted file mode 100644
index 721fe529..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Strategy/Filter.js
+++ /dev/null
@@ -1,159 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Strategy.js
- * @requires OpenLayers/Filter.js
- */
-
-/**
- * Class: OpenLayers.Strategy.Filter
- * Strategy for limiting features that get added to a layer by 
- *     evaluating a filter.  The strategy maintains a cache of
- *     all features until removeFeatures is called on the layer.
- *
- * Inherits from:
- *  - <OpenLayers.Strategy>
- */
-OpenLayers.Strategy.Filter = OpenLayers.Class(OpenLayers.Strategy, {
-    
-    /**
-     * APIProperty: filter
-     * {<OpenLayers.Filter>}  Filter for limiting features sent to the layer.
-     *     Use the <setFilter> method to update this filter after construction.
-     */
-    filter: null,
-    
-    /**
-     * Property: cache
-     * {Array(<OpenLayers.Feature.Vector>)} List of currently cached
-     *     features.
-     */
-    cache: null,
-    
-    /**
-     * Property: caching
-     * {Boolean} The filter is currently caching features.
-     */
-    caching: false,
-    
-    /**
-     * Constructor: OpenLayers.Strategy.Filter
-     * Create a new filter strategy.
-     *
-     * Parameters:
-     * options - {Object} Optional object whose properties will be set on the
-     *     instance.
-     */
-
-    /**
-     * APIMethod: activate
-     * Activate the strategy.  Register any listeners, do appropriate setup.
-     *     By default, this strategy automatically activates itself when a layer
-     *     is added to a map.
-     *
-     * Returns:
-     * {Boolean} True if the strategy was successfully activated or false if
-     *      the strategy was already active.
-     */
-    activate: function() {
-        var activated = OpenLayers.Strategy.prototype.activate.apply(this, arguments);
-        if (activated) {
-            this.cache = [];
-            this.layer.events.on({
-                "beforefeaturesadded": this.handleAdd,
-                "beforefeaturesremoved": this.handleRemove,
-                scope: this
-            });
-        }
-        return activated;
-    },
-    
-    /**
-     * APIMethod: deactivate
-     * Deactivate the strategy.  Clear the feature cache.
-     *
-     * Returns:
-     * {Boolean} True if the strategy was successfully deactivated or false if
-     *      the strategy was already inactive.
-     */
-    deactivate: function() {
-        this.cache = null;
-        if (this.layer && this.layer.events) {
-            this.layer.events.un({
-                "beforefeaturesadded": this.handleAdd,
-                "beforefeaturesremoved": this.handleRemove,
-                scope: this
-            });            
-        }
-        return OpenLayers.Strategy.prototype.deactivate.apply(this, arguments);
-    },
-    
-    /**
-     * Method: handleAdd
-     */
-    handleAdd: function(event) {
-        if (!this.caching && this.filter) {
-            var features = event.features;
-            event.features = [];
-            var feature;
-            for (var i=0, ii=features.length; i<ii; ++i) {
-                feature = features[i];
-                if (this.filter.evaluate(feature)) {
-                    event.features.push(feature);
-                } else {
-                    this.cache.push(feature);
-                }
-            }
-        }
-    },
-    
-    /**
-     * Method: handleRemove
-     */
-    handleRemove: function(event) {
-        if (!this.caching) {
-            this.cache = [];
-        }
-    },
-
-    /** 
-     * APIMethod: setFilter
-     * Update the filter for this strategy.  This will re-evaluate
-     *     any features on the layer and in the cache.  Only features
-     *     for which filter.evalute(feature) returns true will be
-     *     added to the layer.  Others will be cached by the strategy.
-     *
-     * Parameters:
-     * filter - {<OpenLayers.Filter>} A filter for evaluating features.
-     */
-    setFilter: function(filter) {
-        this.filter = filter;
-        var previousCache = this.cache;
-        this.cache = [];
-        // look through layer for features to remove from layer
-        this.handleAdd({features: this.layer.features});
-        // cache now contains features to remove from layer
-        if (this.cache.length > 0) {
-            this.caching = true;
-            this.layer.removeFeatures(this.cache.slice());
-            this.caching = false;
-        }
-        // now look through previous cache for features to add to layer
-        if (previousCache.length > 0) {
-            var event = {features: previousCache};
-            this.handleAdd(event);
-            if (event.features.length > 0) {
-                // event has features to add to layer
-                this.caching = true;
-                this.layer.addFeatures(event.features);
-                this.caching = false;
-            }
-        }
-    },
-
-    CLASS_NAME: "OpenLayers.Strategy.Filter"
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Strategy/Fixed.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Strategy/Fixed.js
deleted file mode 100644
index b06f2cd7..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Strategy/Fixed.js
+++ /dev/null
@@ -1,135 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Strategy.js
- */
-
-/**
- * Class: OpenLayers.Strategy.Fixed
- * A simple strategy that requests features once and never requests new data.
- *
- * Inherits from:
- *  - <OpenLayers.Strategy>
- */
-OpenLayers.Strategy.Fixed = OpenLayers.Class(OpenLayers.Strategy, {
-    
-    /**
-     * APIProperty: preload
-     * {Boolean} Load data before layer made visible. Enabling this may result
-     *   in considerable overhead if your application loads many data layers
-     *   that are not visible by default. Default is false.
-     */
-    preload: false,
-
-    /**
-     * Constructor: OpenLayers.Strategy.Fixed
-     * Create a new Fixed strategy.
-     *
-     * Parameters:
-     * options - {Object} Optional object whose properties will be set on the
-     *     instance.
-     */
-
-    /**
-     * Method: activate
-     * Activate the strategy: load data or add listener to load when visible
-     *
-     * Returns:
-     * {Boolean} True if the strategy was successfully activated or false if
-     *      the strategy was already active.
-     */
-    activate: function() {
-        var activated = OpenLayers.Strategy.prototype.activate.apply(this, arguments);
-        if(activated) {
-            this.layer.events.on({
-                "refresh": this.load,
-                scope: this
-            });
-            if(this.layer.visibility == true || this.preload) {
-                this.load();
-            } else {
-                this.layer.events.on({
-                    "visibilitychanged": this.load,
-                    scope: this
-                });
-            }
-        }
-        return activated;
-    },
-    
-    /**
-     * Method: deactivate
-     * Deactivate the strategy.  Undo what is done in <activate>.
-     * 
-     * Returns:
-     * {Boolean} The strategy was successfully deactivated.
-     */
-    deactivate: function() {
-        var deactivated = OpenLayers.Strategy.prototype.deactivate.call(this);
-        if(deactivated) {
-            this.layer.events.un({
-                "refresh": this.load,
-                "visibilitychanged": this.load,
-                scope: this
-            });
-        }
-        return deactivated;
-    },
-
-    /**
-     * Method: load
-     * Tells protocol to load data and unhooks the visibilitychanged event
-     *
-     * Parameters:
-     * options - {Object} options to pass to protocol read.
-     */
-    load: function(options) {
-        var layer = this.layer;
-        layer.events.triggerEvent("loadstart", {filter: layer.filter});
-        layer.protocol.read(OpenLayers.Util.applyDefaults({
-            callback: this.merge,
-            filter: layer.filter,
-            scope: this
-        }, options));
-        layer.events.un({
-            "visibilitychanged": this.load,
-            scope: this
-        });
-    },
-
-    /**
-     * Method: merge
-     * Add all features to the layer.
-     *     If the layer projection differs from the map projection, features
-     *     will be transformed from the layer projection to the map projection.
-     *
-     * Parameters:
-     * resp - {<OpenLayers.Protocol.Response>} The response object passed
-     *      by the protocol.
-     */
-    merge: function(resp) {
-        var layer = this.layer;
-        layer.destroyFeatures();
-        var features = resp.features;
-        if (features && features.length > 0) {
-            var remote = layer.projection;
-            var local = layer.map.getProjectionObject();
-            if(!local.equals(remote)) {
-                var geom;
-                for(var i=0, len=features.length; i<len; ++i) {
-                    geom = features[i].geometry;
-                    if(geom) {
-                        geom.transform(remote, local);
-                    }
-                }
-            }
-            layer.addFeatures(features);
-        }
-        layer.events.triggerEvent("loadend", {response: resp});
-    },
-
-    CLASS_NAME: "OpenLayers.Strategy.Fixed"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Strategy/Paging.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Strategy/Paging.js
deleted file mode 100644
index 22154fac..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Strategy/Paging.js
+++ /dev/null
@@ -1,233 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Strategy.js
- */
-
-/**
- * Class: OpenLayers.Strategy.Paging
- * Strategy for vector feature paging
- *
- * Inherits from:
- *  - <OpenLayers.Strategy>
- */
-OpenLayers.Strategy.Paging = OpenLayers.Class(OpenLayers.Strategy, {
-    
-    /**
-     * Property: features
-     * {Array(<OpenLayers.Feature.Vector>)} Cached features.
-     */
-    features: null,
-    
-    /**
-     * Property: length
-     * {Integer} Number of features per page.  Default is 10.
-     */
-    length: 10,
-    
-    /**
-     * Property: num
-     * {Integer} The currently displayed page number.
-     */
-    num: null,
-    
-    /**
-     * Property: paging
-     * {Boolean} The strategy is currently changing pages.
-     */
-    paging: false,
-
-    /**
-     * Constructor: OpenLayers.Strategy.Paging
-     * Create a new paging strategy.
-     *
-     * Parameters:
-     * options - {Object} Optional object whose properties will be set on the
-     *     instance.
-     */
-    
-    /**
-     * APIMethod: activate
-     * Activate the strategy.  Register any listeners, do appropriate setup.
-     * 
-     * Returns:
-     * {Boolean} The strategy was successfully activated.
-     */
-    activate: function() {
-        var activated = OpenLayers.Strategy.prototype.activate.call(this);
-        if(activated) {
-            this.layer.events.on({
-                "beforefeaturesadded": this.cacheFeatures,
-                scope: this
-            });
-        }
-        return activated;
-    },
-    
-    /**
-     * APIMethod: deactivate
-     * Deactivate the strategy.  Unregister any listeners, do appropriate
-     *     tear-down.
-     * 
-     * Returns:
-     * {Boolean} The strategy was successfully deactivated.
-     */
-    deactivate: function() {
-        var deactivated = OpenLayers.Strategy.prototype.deactivate.call(this);
-        if(deactivated) {
-            this.clearCache();
-            this.layer.events.un({
-                "beforefeaturesadded": this.cacheFeatures,
-                scope: this
-            });
-        }
-        return deactivated;
-    },
-    
-    /**
-     * Method: cacheFeatures
-     * Cache features before they are added to the layer.
-     *
-     * Parameters:
-     * event - {Object} The event that this was listening for.  This will come
-     *     with a batch of features to be paged.
-     */
-    cacheFeatures: function(event) {
-        if(!this.paging) {
-            this.clearCache();
-            this.features = event.features;
-            this.pageNext(event);
-        }
-    },
-    
-    /**
-     * Method: clearCache
-     * Clear out the cached features.  This destroys features, assuming
-     *     nothing else has a reference.
-     */
-    clearCache: function() {
-        if(this.features) {
-            for(var i=0; i<this.features.length; ++i) {
-                this.features[i].destroy();
-            }
-        }
-        this.features = null;
-        this.num = null;
-    },
-    
-    /**
-     * APIMethod: pageCount
-     * Get the total count of pages given the current cache of features.
-     *
-     * Returns:
-     * {Integer} The page count.
-     */
-    pageCount: function() {
-        var numFeatures = this.features ? this.features.length : 0;
-        return Math.ceil(numFeatures / this.length);
-    },
-
-    /**
-     * APIMethod: pageNum
-     * Get the zero based page number.
-     *
-     * Returns:
-     * {Integer} The current page number being displayed.
-     */
-    pageNum: function() {
-        return this.num;
-    },
-
-    /**
-     * APIMethod: pageLength
-     * Gets or sets page length.
-     *
-     * Parameters:
-     * newLength - {Integer} Optional length to be set.
-     *
-     * Returns:
-     * {Integer} The length of a page (number of features per page).
-     */
-    pageLength: function(newLength) {
-        if(newLength && newLength > 0) {
-            this.length = newLength;
-        }
-        return this.length;
-    },
-
-    /**
-     * APIMethod: pageNext
-     * Display the next page of features.
-     *
-     * Returns:
-     * {Boolean} A new page was displayed.
-     */
-    pageNext: function(event) {
-        var changed = false;
-        if(this.features) {
-            if(this.num === null) {
-                this.num = -1;
-            }
-            var start = (this.num + 1) * this.length;
-            changed = this.page(start, event);
-        }
-        return changed;
-    },
-
-    /**
-     * APIMethod: pagePrevious
-     * Display the previous page of features.
-     *
-     * Returns:
-     * {Boolean} A new page was displayed.
-     */
-    pagePrevious: function() {
-        var changed = false;
-        if(this.features) {
-            if(this.num === null) {
-                this.num = this.pageCount();
-            }
-            var start = (this.num - 1) * this.length;
-            changed = this.page(start);
-        }
-        return changed;
-    },
-    
-    /**
-     * Method: page
-     * Display the page starting at the given index from the cache.
-     *
-     * Returns:
-     * {Boolean} A new page was displayed.
-     */
-    page: function(start, event) {
-        var changed = false;
-        if(this.features) {
-            if(start >= 0 && start < this.features.length) {
-                var num = Math.floor(start / this.length);
-                if(num != this.num) {
-                    this.paging = true;
-                    var features = this.features.slice(start, start + this.length);
-                    this.layer.removeFeatures(this.layer.features);
-                    this.num = num;
-                    // modify the event if any
-                    if(event && event.features) {
-                        // this.was called by an event listener
-                        event.features = features;
-                    } else {
-                        // this was called directly on the strategy
-                        this.layer.addFeatures(features);
-                    }
-                    this.paging = false;
-                    changed = true;
-                }
-            }
-        }
-        return changed;
-    },
-    
-    CLASS_NAME: "OpenLayers.Strategy.Paging" 
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Strategy/Refresh.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Strategy/Refresh.js
deleted file mode 100644
index cca187c9..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Strategy/Refresh.js
+++ /dev/null
@@ -1,141 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Strategy.js
- */
-
-/**
- * Class: OpenLayers.Strategy.Refresh
- * A strategy that refreshes the layer. By default the strategy waits for a
- *     call to <refresh> before refreshing.  By configuring the strategy with 
- *     the <interval> option, refreshing can take place automatically.
- *
- * Inherits from:
- *  - <OpenLayers.Strategy>
- */
-OpenLayers.Strategy.Refresh = OpenLayers.Class(OpenLayers.Strategy, {
-    
-    /**
-     * Property: force
-     * {Boolean} Force a refresh on the layer. Default is false.
-     */
-    force: false,
-
-    /**
-     * Property: interval
-     * {Number} Auto-refresh. Default is 0.  If > 0, layer will be refreshed 
-     *     every N milliseconds.
-     */
-    interval: 0,
-    
-    /**
-     * Property: timer
-     * {Number} The id of the timer.
-     */
-    timer: null,
-
-    /**
-     * Constructor: OpenLayers.Strategy.Refresh
-     * Create a new Refresh strategy.
-     *
-     * Parameters:
-     * options - {Object} Optional object whose properties will be set on the
-     *     instance.
-     */
-   
-    /**
-     * APIMethod: activate
-     * Activate the strategy. Register any listeners, do appropriate setup.
-     * 
-     * Returns:
-     * {Boolean} True if the strategy was successfully activated.
-     */
-    activate: function() {
-        var activated = OpenLayers.Strategy.prototype.activate.call(this);
-        if(activated) {
-            if(this.layer.visibility === true) {
-                this.start();
-            } 
-            this.layer.events.on({
-                "visibilitychanged": this.reset,
-                scope: this
-            });
-        }
-        return activated;
-    },
-    
-    /**
-     * APIMethod: deactivate
-     * Deactivate the strategy. Unregister any listeners, do appropriate
-     *     tear-down.
-     * 
-     * Returns:
-     * {Boolean} True if the strategy was successfully deactivated.
-     */
-    deactivate: function() {
-        var deactivated = OpenLayers.Strategy.prototype.deactivate.call(this);
-        if(deactivated) {
-            this.stop();
-            this.layer.events.un({
-                "visibilitychanged": this.reset,
-                scope: this
-            });
-        }
-        return deactivated;
-    },
-    
-    /**
-     * Method: reset
-     * Start or cancel the refresh interval depending on the visibility of 
-     *     the layer.
-     */
-    reset: function() {
-        if(this.layer.visibility === true) {
-            this.start();
-        } else {
-            this.stop();
-        }
-    },
-    
-    /**
-     * Method: start
-     * Start the refresh interval. 
-     */
-    start: function() {
-        if(this.interval && typeof this.interval === "number" && 
-            this.interval > 0) {
-
-            this.timer = window.setInterval(
-                OpenLayers.Function.bind(this.refresh, this),
-                this.interval);
-        }
-    },
-    
-    /**
-     * APIMethod: refresh
-     * Tell the strategy to refresh which will refresh the layer.
-     */
-    refresh: function() {
-        if (this.layer && this.layer.refresh && 
-            typeof this.layer.refresh == "function") {
-
-            this.layer.refresh({force: this.force});
-        }
-    },
-   
-    /**
-     * Method: stop
-     * Cancels the refresh interval. 
-     */
-    stop: function() {
-        if(this.timer !== null) {
-            window.clearInterval(this.timer);
-            this.timer = null;
-        }
-    },
-    
-    CLASS_NAME: "OpenLayers.Strategy.Refresh" 
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Strategy/Save.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Strategy/Save.js
deleted file mode 100644
index 2211e95f..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Strategy/Save.js
+++ /dev/null
@@ -1,231 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Strategy.js
- */
-
-/**
- * Class: OpenLayers.Strategy.Save
- * A strategy that commits newly created or modified features.  By default
- *     the strategy waits for a call to <save> before persisting changes.  By
- *     configuring the strategy with the <auto> option, changes can be saved
- *     automatically.
- *
- * Inherits from:
- *  - <OpenLayers.Strategy>
- */
-OpenLayers.Strategy.Save = OpenLayers.Class(OpenLayers.Strategy, {
-    
-    /**
-     * APIProperty: events
-     * {<OpenLayers.Events>} An events object that handles all 
-     *     events on the strategy object.
-     *
-     * Register a listener for a particular event with the following syntax:
-     * (code)
-     * strategy.events.register(type, obj, listener);
-     * (end)
-     *
-     * Supported event types:
-     * start - Triggered before saving
-     * success - Triggered after a successful transaction
-     * fail - Triggered after a failed transaction
-     * 
-     */
- 
-    /** 
-     * Property: events
-     * {<OpenLayers.Events>} Events instance for triggering this protocol
-     *    events.
-     */
-    events: null,
-    
-    /**
-     * APIProperty: auto
-     * {Boolean | Number} Auto-save.  Default is false.  If true, features will be
-     *     saved immediately after being added to the layer and with each
-     *     modification or deletion.  If auto is a number, features will be
-     *     saved on an interval provided by the value (in seconds).
-     */
-    auto: false,
-    
-    /**
-     * Property: timer
-     * {Number} The id of the timer.
-     */
-    timer: null,
-
-    /**
-     * Constructor: OpenLayers.Strategy.Save
-     * Create a new Save strategy.
-     *
-     * Parameters:
-     * options - {Object} Optional object whose properties will be set on the
-     *     instance.
-     */
-    initialize: function(options) {
-        OpenLayers.Strategy.prototype.initialize.apply(this, [options]);
-        this.events = new OpenLayers.Events(this);
-    },
-   
-    /**
-     * APIMethod: activate
-     * Activate the strategy.  Register any listeners, do appropriate setup.
-     * 
-     * Returns:
-     * {Boolean} The strategy was successfully activated.
-     */
-    activate: function() {
-        var activated = OpenLayers.Strategy.prototype.activate.call(this);
-        if(activated) {
-            if(this.auto) {
-                if(typeof this.auto === "number") {
-                    this.timer = window.setInterval(
-                        OpenLayers.Function.bind(this.save, this),
-                        this.auto * 1000
-                    );
-                } else {
-                    this.layer.events.on({
-                        "featureadded": this.triggerSave,
-                        "afterfeaturemodified": this.triggerSave,
-                        scope: this
-                    });
-                }
-            }
-        }
-        return activated;
-    },
-    
-    /**
-     * APIMethod: deactivate
-     * Deactivate the strategy.  Unregister any listeners, do appropriate
-     *     tear-down.
-     * 
-     * Returns:
-     * {Boolean} The strategy was successfully deactivated.
-     */
-    deactivate: function() {
-        var deactivated = OpenLayers.Strategy.prototype.deactivate.call(this);
-        if(deactivated) {
-            if(this.auto) {
-                if(typeof this.auto === "number") {
-                    window.clearInterval(this.timer);
-                } else {
-                    this.layer.events.un({
-                        "featureadded": this.triggerSave,
-                        "afterfeaturemodified": this.triggerSave,
-                        scope: this
-                    });
-                }
-            }
-        }
-        return deactivated;
-    },
-    
-    /**
-     * Method: triggerSave
-     * Registered as a listener.  Calls save if a feature has insert, update,
-     *     or delete state.
-     *
-     * Parameters:
-     * event - {Object} The event this function is listening for.
-     */
-    triggerSave: function(event) {
-        var feature = event.feature;
-        if(feature.state === OpenLayers.State.INSERT ||
-           feature.state === OpenLayers.State.UPDATE ||
-           feature.state === OpenLayers.State.DELETE) {
-            this.save([event.feature]);
-        }
-    },
-    
-    /**
-     * APIMethod: save
-     * Tell the layer protocol to commit unsaved features.  If the layer
-     *     projection differs from the map projection, features will be
-     *     transformed into the layer projection before being committed.
-     *
-     * Parameters:
-     * features - {Array} Features to be saved.  If null, then default is all
-     *     features in the layer.  Features are assumed to be in the map
-     *     projection.
-     */
-    save: function(features) {
-        if(!features) {
-            features = this.layer.features;
-        }
-        this.events.triggerEvent("start", {features:features});
-        var remote = this.layer.projection;
-        var local = this.layer.map.getProjectionObject();
-        if(!local.equals(remote)) {
-            var len = features.length;
-            var clones = new Array(len);
-            var orig, clone;
-            for(var i=0; i<len; ++i) {
-                orig = features[i];
-                clone = orig.clone();
-                clone.fid = orig.fid;
-                clone.state = orig.state;
-                if(orig.url) {
-                    clone.url = orig.url;
-                }
-                clone._original = orig;
-                clone.geometry.transform(local, remote);
-                clones[i] = clone;
-            }
-            features = clones;
-        }
-        this.layer.protocol.commit(features, {
-            callback: this.onCommit,
-            scope: this
-        });
-    },
-    
-    /**
-     * Method: onCommit
-     * Called after protocol commit.
-     *
-     * Parameters:
-     * response - {<OpenLayers.Protocol.Response>} A response object.
-     */
-    onCommit: function(response) {
-        var evt = {"response": response};
-        if(response.success()) {
-            var features = response.reqFeatures;
-            // deal with inserts, updates, and deletes
-            var state, feature;
-            var destroys = [];
-            var insertIds = response.insertIds || [];
-            var j = 0;
-            for(var i=0, len=features.length; i<len; ++i) {
-                feature = features[i];
-                // if projection was different, we may be dealing with clones
-                feature = feature._original || feature;
-                state = feature.state;
-                if(state) {
-                    if(state == OpenLayers.State.DELETE) {
-                        destroys.push(feature);
-                    } else if(state == OpenLayers.State.INSERT) {
-                        feature.fid = insertIds[j];
-                        ++j;
-                    }
-                    feature.state = null;
-                }
-            }
-
-            if(destroys.length > 0) {
-                this.layer.destroyFeatures(destroys);
-            }
-
-            this.events.triggerEvent("success", evt);
-
-        } else {
-            this.events.triggerEvent("fail", evt);
-        }
-    },
-   
-    CLASS_NAME: "OpenLayers.Strategy.Save" 
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Style.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Style.js
deleted file mode 100644
index 39c4a48f..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Style.js
+++ /dev/null
@@ -1,448 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-
-/**
- * @requires OpenLayers/BaseTypes/Class.js
- * @requires OpenLayers/Util.js
- * @requires OpenLayers/Feature/Vector.js
- */
-
-/**
- * Class: OpenLayers.Style
- * This class represents a UserStyle obtained
- *     from a SLD, containing styling rules.
- */
-OpenLayers.Style = OpenLayers.Class({
-
-    /**
-     * Property: id
-     * {String} A unique id for this session.
-     */
-    id: null,
-    
-    /**
-     * APIProperty: name
-     * {String}
-     */
-    name: null,
-    
-    /**
-     * Property: title
-     * {String} Title of this style (set if included in SLD)
-     */
-    title: null,
-    
-    /**
-     * Property: description
-     * {String} Description of this style (set if abstract is included in SLD)
-     */
-    description: null,
-
-    /**
-     * APIProperty: layerName
-     * {<String>} name of the layer that this style belongs to, usually
-     * according to the NamedLayer attribute of an SLD document.
-     */
-    layerName: null,
-    
-    /**
-     * APIProperty: isDefault
-     * {Boolean}
-     */
-    isDefault: false,
-     
-    /** 
-     * Property: rules 
-     * {Array(<OpenLayers.Rule>)}
-     */
-    rules: null,
-    
-    /**
-     * APIProperty: context
-     * {Object} An optional object with properties that symbolizers' property
-     * values should be evaluated against. If no context is specified,
-     * feature.attributes will be used
-     */
-    context: null,
-
-    /**
-     * Property: defaultStyle
-     * {Object} hash of style properties to use as default for merging
-     * rule-based style symbolizers onto. If no rules are defined,
-     * createSymbolizer will return this style. If <defaultsPerSymbolizer> is set to
-     * true, the defaultStyle will only be taken into account if there are
-     * rules defined.
-     */
-    defaultStyle: null,
-    
-    /**
-     * Property: defaultsPerSymbolizer
-     * {Boolean} If set to true, the <defaultStyle> will extend the symbolizer
-     * of every rule. Properties of the <defaultStyle> will also be used to set
-     * missing symbolizer properties if the symbolizer has stroke, fill or
-     * graphic set to true. Default is false.
-     */
-    defaultsPerSymbolizer: false,
-    
-    /**
-     * Property: propertyStyles
-     * {Hash of Boolean} cache of style properties that need to be parsed for
-     * propertyNames. Property names are keys, values won't be used.
-     */
-    propertyStyles: null,
-    
-
-    /** 
-     * Constructor: OpenLayers.Style
-     * Creates a UserStyle.
-     *
-     * Parameters:
-     * style        - {Object} Optional hash of style properties that will be
-     *                used as default style for this style object. This style
-     *                applies if no rules are specified. Symbolizers defined in
-     *                rules will extend this default style.
-     * options - {Object} An optional object with properties to set on the
-     *     style.
-     *
-     * Valid options:
-     * rules - {Array(<OpenLayers.Rule>)} List of rules to be added to the
-     *     style.
-     * 
-     * Returns:
-     * {<OpenLayers.Style>}
-     */
-    initialize: function(style, options) {
-
-        OpenLayers.Util.extend(this, options);
-        this.rules = [];
-        if(options && options.rules) {
-            this.addRules(options.rules);
-        }
-
-        // use the default style from OpenLayers.Feature.Vector if no style
-        // was given in the constructor
-        this.setDefaultStyle(style ||
-                             OpenLayers.Feature.Vector.style["default"]);
-
-        this.id = OpenLayers.Util.createUniqueID(this.CLASS_NAME + "_");
-    },
-
-    /** 
-     * APIMethod: destroy
-     * nullify references to prevent circular references and memory leaks
-     */
-    destroy: function() {
-        for (var i=0, len=this.rules.length; i<len; i++) {
-            this.rules[i].destroy();
-            this.rules[i] = null;
-        }
-        this.rules = null;
-        this.defaultStyle = null;
-    },
-    
-    /**
-     * Method: createSymbolizer
-     * creates a style by applying all feature-dependent rules to the base
-     * style.
-     * 
-     * Parameters:
-     * feature - {<OpenLayers.Feature>} feature to evaluate rules for
-     * 
-     * Returns:
-     * {Object} symbolizer hash
-     */
-    createSymbolizer: function(feature) {
-        var style = this.defaultsPerSymbolizer ? {} : this.createLiterals(
-            OpenLayers.Util.extend({}, this.defaultStyle), feature);
-        
-        var rules = this.rules;
-
-        var rule, context;
-        var elseRules = [];
-        var appliedRules = false;
-        for(var i=0, len=rules.length; i<len; i++) {
-            rule = rules[i];
-            // does the rule apply?
-            var applies = rule.evaluate(feature);
-            
-            if(applies) {
-                if(rule instanceof OpenLayers.Rule && rule.elseFilter) {
-                    elseRules.push(rule);
-                } else {
-                    appliedRules = true;
-                    this.applySymbolizer(rule, style, feature);
-                }
-            }
-        }
-        
-        // if no other rules apply, apply the rules with else filters
-        if(appliedRules == false && elseRules.length > 0) {
-            appliedRules = true;
-            for(var i=0, len=elseRules.length; i<len; i++) {
-                this.applySymbolizer(elseRules[i], style, feature);
-            }
-        }
-
-        // don't display if there were rules but none applied
-        if(rules.length > 0 && appliedRules == false) {
-            style.display = "none";
-        }
-        
-        if (style.label != null && typeof style.label !== "string") {
-            style.label = String(style.label);
-        }
-        
-        return style;
-    },
-    
-    /**
-     * Method: applySymbolizer
-     *
-     * Parameters:
-     * rule - {<OpenLayers.Rule>}
-     * style - {Object}
-     * feature - {<OpenLayer.Feature.Vector>}
-     *
-     * Returns:
-     * {Object} A style with new symbolizer applied.
-     */
-    applySymbolizer: function(rule, style, feature) {
-        var symbolizerPrefix = feature.geometry ?
-                this.getSymbolizerPrefix(feature.geometry) :
-                OpenLayers.Style.SYMBOLIZER_PREFIXES[0];
-
-        var symbolizer = rule.symbolizer[symbolizerPrefix] || rule.symbolizer;
-        
-        if(this.defaultsPerSymbolizer === true) {
-            var defaults = this.defaultStyle;
-            OpenLayers.Util.applyDefaults(symbolizer, {
-                pointRadius: defaults.pointRadius
-            });
-            if(symbolizer.stroke === true || symbolizer.graphic === true) {
-                OpenLayers.Util.applyDefaults(symbolizer, {
-                    strokeWidth: defaults.strokeWidth,
-                    strokeColor: defaults.strokeColor,
-                    strokeOpacity: defaults.strokeOpacity,
-                    strokeDashstyle: defaults.strokeDashstyle,
-                    strokeLinecap: defaults.strokeLinecap
-                });
-            }
-            if(symbolizer.fill === true || symbolizer.graphic === true) {
-                OpenLayers.Util.applyDefaults(symbolizer, {
-                    fillColor: defaults.fillColor,
-                    fillOpacity: defaults.fillOpacity
-                });
-            }
-            if(symbolizer.graphic === true) {
-                OpenLayers.Util.applyDefaults(symbolizer, {
-                    pointRadius: this.defaultStyle.pointRadius,
-                    externalGraphic: this.defaultStyle.externalGraphic,
-                    graphicName: this.defaultStyle.graphicName,
-                    graphicOpacity: this.defaultStyle.graphicOpacity,
-                    graphicWidth: this.defaultStyle.graphicWidth,
-                    graphicHeight: this.defaultStyle.graphicHeight,
-                    graphicXOffset: this.defaultStyle.graphicXOffset,
-                    graphicYOffset: this.defaultStyle.graphicYOffset
-                });
-            }
-        }
-
-        // merge the style with the current style
-        return this.createLiterals(
-                OpenLayers.Util.extend(style, symbolizer), feature);
-    },
-    
-    /**
-     * Method: createLiterals
-     * creates literals for all style properties that have an entry in
-     * <this.propertyStyles>.
-     * 
-     * Parameters:
-     * style   - {Object} style to create literals for. Will be modified
-     *           inline.
-     * feature - {Object}
-     * 
-     * Returns:
-     * {Object} the modified style
-     */
-    createLiterals: function(style, feature) {
-        var context = OpenLayers.Util.extend({}, feature.attributes || feature.data);
-        OpenLayers.Util.extend(context, this.context);
-        
-        for (var i in this.propertyStyles) {
-            style[i] = OpenLayers.Style.createLiteral(style[i], context, feature, i);
-        }
-        return style;
-    },
-    
-    /**
-     * Method: findPropertyStyles
-     * Looks into all rules for this style and the defaultStyle to collect
-     * all the style hash property names containing ${...} strings that have
-     * to be replaced using the createLiteral method before returning them.
-     * 
-     * Returns:
-     * {Object} hash of property names that need createLiteral parsing. The
-     * name of the property is the key, and the value is true;
-     */
-    findPropertyStyles: function() {
-        var propertyStyles = {};
-
-        // check the default style
-        var style = this.defaultStyle;
-        this.addPropertyStyles(propertyStyles, style);
-
-        // walk through all rules to check for properties in their symbolizer
-        var rules = this.rules;
-        var symbolizer, value;
-        for (var i=0, len=rules.length; i<len; i++) {
-            symbolizer = rules[i].symbolizer;
-            for (var key in symbolizer) {
-                value = symbolizer[key];
-                if (typeof value == "object") {
-                    // symbolizer key is "Point", "Line" or "Polygon"
-                    this.addPropertyStyles(propertyStyles, value);
-                } else {
-                    // symbolizer is a hash of style properties
-                    this.addPropertyStyles(propertyStyles, symbolizer);
-                    break;
-                }
-            }
-        }
-        return propertyStyles;
-    },
-    
-    /**
-     * Method: addPropertyStyles
-     * 
-     * Parameters:
-     * propertyStyles - {Object} hash to add new property styles to. Will be
-     *                  modified inline
-     * symbolizer     - {Object} search this symbolizer for property styles
-     * 
-     * Returns:
-     * {Object} propertyStyles hash
-     */
-    addPropertyStyles: function(propertyStyles, symbolizer) {
-        var property;
-        for (var key in symbolizer) {
-            property = symbolizer[key];
-            if (typeof property == "string" &&
-                    property.match(/\$\{\w+\}/)) {
-                propertyStyles[key] = true;
-            }
-        }
-        return propertyStyles;
-    },
-    
-    /**
-     * APIMethod: addRules
-     * Adds rules to this style.
-     * 
-     * Parameters:
-     * rules - {Array(<OpenLayers.Rule>)}
-     */
-    addRules: function(rules) {
-        Array.prototype.push.apply(this.rules, rules);
-        this.propertyStyles = this.findPropertyStyles();
-    },
-    
-    /**
-     * APIMethod: setDefaultStyle
-     * Sets the default style for this style object.
-     * 
-     * Parameters:
-     * style - {Object} Hash of style properties
-     */
-    setDefaultStyle: function(style) {
-        this.defaultStyle = style; 
-        this.propertyStyles = this.findPropertyStyles();
-    },
-        
-    /**
-     * Method: getSymbolizerPrefix
-     * Returns the correct symbolizer prefix according to the
-     * geometry type of the passed geometry
-     * 
-     * Parameters:
-     * geometry - {<OpenLayers.Geometry>}
-     * 
-     * Returns:
-     * {String} key of the according symbolizer
-     */
-    getSymbolizerPrefix: function(geometry) {
-        var prefixes = OpenLayers.Style.SYMBOLIZER_PREFIXES;
-        for (var i=0, len=prefixes.length; i<len; i++) {
-            if (geometry.CLASS_NAME.indexOf(prefixes[i]) != -1) {
-                return prefixes[i];
-            }
-        }
-    },
-    
-    /**
-     * APIMethod: clone
-     * Clones this style.
-     * 
-     * Returns:
-     * {<OpenLayers.Style>} Clone of this style.
-     */
-    clone: function() {
-        var options = OpenLayers.Util.extend({}, this);
-        // clone rules
-        if(this.rules) {
-            options.rules = [];
-            for(var i=0, len=this.rules.length; i<len; ++i) {
-                options.rules.push(this.rules[i].clone());
-            }
-        }
-        // clone context
-        options.context = this.context && OpenLayers.Util.extend({}, this.context);
-        //clone default style
-        var defaultStyle = OpenLayers.Util.extend({}, this.defaultStyle);
-        return new OpenLayers.Style(defaultStyle, options);
-    },
-    
-    CLASS_NAME: "OpenLayers.Style"
-});
-
-
-/**
- * Function: createLiteral
- * converts a style value holding a combination of PropertyName and Literal
- * into a Literal, taking the property values from the passed features.
- * 
- * Parameters:
- * value - {String} value to parse. If this string contains a construct like
- *         "foo ${bar}", then "foo " will be taken as literal, and "${bar}"
- *         will be replaced by the value of the "bar" attribute of the passed
- *         feature.
- * context - {Object} context to take attribute values from
- * feature - {<OpenLayers.Feature.Vector>} optional feature to pass to
- *           <OpenLayers.String.format> for evaluating functions in the
- *           context.
- * property - {String} optional, name of the property for which the literal is
- *            being created for evaluating functions in the context.
- * 
- * Returns:
- * {String} the parsed value. In the example of the value parameter above, the
- * result would be "foo valueOfBar", assuming that the passed feature has an
- * attribute named "bar" with the value "valueOfBar".
- */
-OpenLayers.Style.createLiteral = function(value, context, feature, property) {
-    if (typeof value == "string" && value.indexOf("${") != -1) {
-        value = OpenLayers.String.format(value, context, [feature, property]);
-        value = (isNaN(value) || !value) ? value : parseFloat(value);
-    }
-    return value;
-};
-    
-/**
- * Constant: OpenLayers.Style.SYMBOLIZER_PREFIXES
- * {Array} prefixes of the sld symbolizers. These are the
- * same as the main geometry types
- */
-OpenLayers.Style.SYMBOLIZER_PREFIXES = ['Point', 'Line', 'Polygon', 'Text',
-    'Raster'];
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Style2.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Style2.js
deleted file mode 100644
index 672dae97..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Style2.js
+++ /dev/null
@@ -1,112 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/BaseTypes/Class.js
- * @requires OpenLayers/Rule.js
- * @requires OpenLayers/Symbolizer/Point.js
- * @requires OpenLayers/Symbolizer/Line.js
- * @requires OpenLayers/Symbolizer/Polygon.js
- * @requires OpenLayers/Symbolizer/Text.js
- * @requires OpenLayers/Symbolizer/Raster.js
- */
-
-/**
- * Class: OpenLayers.Style2
- * This class represents a collection of rules for rendering features.
- */
-OpenLayers.Style2 = OpenLayers.Class({
-
-    /**
-     * Property: id
-     * {String} A unique id for this session.
-     */
-    id: null,
-    
-    /**
-     * APIProperty: name
-     * {String} Style identifier.
-     */
-    name: null,
-    
-    /**
-     * APIProperty: title
-     * {String} Title of this style.
-     */
-    title: null,
-    
-    /**
-     * APIProperty: description
-     * {String} Description of this style.
-     */
-    description: null,
-
-    /**
-     * APIProperty: layerName
-     * {<String>} Name of the layer that this style belongs to, usually
-     *     according to the NamedLayer attribute of an SLD document.
-     */
-    layerName: null,
-    
-    /**
-     * APIProperty: isDefault
-     * {Boolean}
-     */
-    isDefault: false,
-     
-    /** 
-     * APIProperty: rules 
-     * {Array(<OpenLayers.Rule>)} Collection of rendering rules.
-     */
-    rules: null,
-    
-    /** 
-     * Constructor: OpenLayers.Style2
-     * Creates a style representing a collection of rendering rules.
-     *
-     * Parameters:
-     * config - {Object} An object containing properties to be set on the 
-     *     style.  Any documented properties may be set at construction.
-     *
-     * Returns:
-     * {<OpenLayers.Style2>} A new style object.
-     */
-    initialize: function(config) {
-        OpenLayers.Util.extend(this, config);
-        this.id = OpenLayers.Util.createUniqueID(this.CLASS_NAME + "_");
-    },
-
-    /** 
-     * APIMethod: destroy
-     * nullify references to prevent circular references and memory leaks
-     */
-    destroy: function() {
-        for (var i=0, len=this.rules.length; i<len; i++) {
-            this.rules[i].destroy();
-        }
-        delete this.rules;
-    },
-
-    /**
-     * APIMethod: clone
-     * Clones this style.
-     * 
-     * Returns:
-     * {<OpenLayers.Style2>} Clone of this style.
-     */
-    clone: function() {
-        var config = OpenLayers.Util.extend({}, this);
-        // clone rules
-        if (this.rules) {
-            config.rules = [];
-            for (var i=0, len=this.rules.length; i<len; ++i) {
-                config.rules.push(this.rules[i].clone());
-            }
-        }
-        return new OpenLayers.Style2(config);
-    },
-    
-    CLASS_NAME: "OpenLayers.Style2"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/StyleMap.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/StyleMap.js
deleted file mode 100644
index b6daca21..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/StyleMap.js
+++ /dev/null
@@ -1,161 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/BaseTypes/Class.js
- * @requires OpenLayers/Style.js
- * @requires OpenLayers/Feature/Vector.js
- */
- 
-/**
- * Class: OpenLayers.StyleMap
- */
-OpenLayers.StyleMap = OpenLayers.Class({
-    
-    /**
-     * Property: styles
-     * {Object} Hash of {<OpenLayers.Style>}, keyed by names of well known
-     * rendering intents (e.g. "default", "temporary", "select", "delete").
-     */
-    styles: null,
-    
-    /**
-     * Property: extendDefault
-     * {Boolean} if true, every render intent will extend the symbolizers
-     * specified for the "default" intent at rendering time. Otherwise, every
-     * rendering intent will be treated as a completely independent style.
-     */
-    extendDefault: true,
-    
-    /**
-     * Constructor: OpenLayers.StyleMap
-     * 
-     * Parameters:
-     * style   - {Object} Optional. Either a style hash, or a style object, or
-     *           a hash of style objects (style hashes) keyed by rendering
-     *           intent. If just one style hash or style object is passed,
-     *           this will be used for all known render intents (default,
-     *           select, temporary)
-     * options - {Object} optional hash of additional options for this
-     *           instance
-     */
-    initialize: function (style, options) {
-        this.styles = {
-            "default": new OpenLayers.Style(
-                OpenLayers.Feature.Vector.style["default"]),
-            "select": new OpenLayers.Style(
-                OpenLayers.Feature.Vector.style["select"]),
-            "temporary": new OpenLayers.Style(
-                OpenLayers.Feature.Vector.style["temporary"]),
-            "delete": new OpenLayers.Style(
-                OpenLayers.Feature.Vector.style["delete"])
-        };
-        
-        // take whatever the user passed as style parameter and convert it
-        // into parts of stylemap.
-        if(style instanceof OpenLayers.Style) {
-            // user passed a style object
-            this.styles["default"] = style;
-            this.styles["select"] = style;
-            this.styles["temporary"] = style;
-            this.styles["delete"] = style;
-        } else if(typeof style == "object") {
-            for(var key in style) {
-                if(style[key] instanceof OpenLayers.Style) {
-                    // user passed a hash of style objects
-                    this.styles[key] = style[key];
-                } else if(typeof style[key] == "object") {
-                    // user passsed a hash of style hashes
-                    this.styles[key] = new OpenLayers.Style(style[key]);
-                } else {
-                    // user passed a style hash (i.e. symbolizer)
-                    this.styles["default"] = new OpenLayers.Style(style);
-                    this.styles["select"] = new OpenLayers.Style(style);
-                    this.styles["temporary"] = new OpenLayers.Style(style);
-                    this.styles["delete"] = new OpenLayers.Style(style);
-                    break;
-                }
-            }
-        }
-        OpenLayers.Util.extend(this, options);
-    },
-
-    /**
-     * Method: destroy
-     */
-    destroy: function() {
-        for(var key in this.styles) {
-            this.styles[key].destroy();
-        }
-        this.styles = null;
-    },
-    
-    /**
-     * Method: createSymbolizer
-     * Creates the symbolizer for a feature for a render intent.
-     * 
-     * Parameters:
-     * feature - {<OpenLayers.Feature>} The feature to evaluate the rules
-     *           of the intended style against.
-     * intent  - {String} The intent determines the symbolizer that will be
-     *           used to draw the feature. Well known intents are "default"
-     *           (for just drawing the features), "select" (for selected
-     *           features) and "temporary" (for drawing features).
-     * 
-     * Returns:
-     * {Object} symbolizer hash
-     */
-    createSymbolizer: function(feature, intent) {
-        if(!feature) {
-            feature = new OpenLayers.Feature.Vector();
-        }
-        if(!this.styles[intent]) {
-            intent = "default";
-        }
-        feature.renderIntent = intent;
-        var defaultSymbolizer = {};
-        if(this.extendDefault && intent != "default") {
-            defaultSymbolizer = this.styles["default"].createSymbolizer(feature);
-        }
-        return OpenLayers.Util.extend(defaultSymbolizer,
-            this.styles[intent].createSymbolizer(feature));
-    },
-    
-    /**
-     * Method: addUniqueValueRules
-     * Convenience method to create comparison rules for unique values of a
-     * property. The rules will be added to the style object for a specified
-     * rendering intent. This method is a shortcut for creating something like
-     * the "unique value legends" familiar from well known desktop GIS systems
-     * 
-     * Parameters:
-     * renderIntent - {String} rendering intent to add the rules to
-     * property     - {String} values of feature attributes to create the
-     *                rules for
-     * symbolizers  - {Object} Hash of symbolizers, keyed by the desired
-     *                property values 
-     * context      - {Object} An optional object with properties that
-     *                symbolizers' property values should be evaluated
-     *                against. If no context is specified, feature.attributes
-     *                will be used
-     */
-    addUniqueValueRules: function(renderIntent, property, symbolizers, context) {
-        var rules = [];
-        for (var value in symbolizers) {
-            rules.push(new OpenLayers.Rule({
-                symbolizer: symbolizers[value],
-                context: context,
-                filter: new OpenLayers.Filter.Comparison({
-                    type: OpenLayers.Filter.Comparison.EQUAL_TO,
-                    property: property,
-                    value: value
-                })
-            }));
-        }
-        this.styles[renderIntent].addRules(rules);
-    },
-
-    CLASS_NAME: "OpenLayers.StyleMap"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Symbolizer.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Symbolizer.js
deleted file mode 100644
index e0d54e88..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Symbolizer.js
+++ /dev/null
@@ -1,55 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/BaseTypes/Class.js
- */
-
-/**
- * Class: OpenLayers.Symbolizer
- * Base class representing a symbolizer used for feature rendering.
- */
-OpenLayers.Symbolizer = OpenLayers.Class({
-    
-
-    /**
-     * APIProperty: zIndex
-     * {Number} The zIndex determines the rendering order for a symbolizer.
-     *     Symbolizers with larger zIndex values are rendered over symbolizers
-     *     with smaller zIndex values.  Default is 0.
-     */
-    zIndex: 0,
-    
-    /**
-     * Constructor: OpenLayers.Symbolizer
-     * Instances of this class are not useful.  See one of the subclasses.
-     *
-     * Parameters:
-     * config - {Object} An object containing properties to be set on the 
-     *     symbolizer.  Any documented symbolizer property can be set at 
-     *     construction.
-     *
-     * Returns:
-     * A new symbolizer.
-     */
-    initialize: function(config) {
-        OpenLayers.Util.extend(this, config);
-    },
-    
-    /** 
-     * APIMethod: clone
-     * Create a copy of this symbolizer.
-     *
-     * Returns a symbolizer of the same type with the same properties.
-     */
-    clone: function() {
-        var Type = eval(this.CLASS_NAME);
-        return new Type(OpenLayers.Util.extend({}, this));
-    },
-    
-    CLASS_NAME: "OpenLayers.Symbolizer"
-    
-});
-
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Symbolizer/Line.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Symbolizer/Line.js
deleted file mode 100644
index 41203e5e..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Symbolizer/Line.js
+++ /dev/null
@@ -1,74 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Symbolizer.js
- */
-
-/**
- * Class: OpenLayers.Symbolizer.Line
- * A symbolizer used to render line features.
- */
-OpenLayers.Symbolizer.Line = OpenLayers.Class(OpenLayers.Symbolizer, {
-
-    /**
-     * APIProperty: strokeColor
-     * {String} Color for line stroke.  This is a RGB hex value (e.g. "#ff0000"
-     *     for red).  
-     * 
-     * No default set here.  Use OpenLayers.Renderer.defaultRenderer for defaults.
-     */
-    
-    /**
-     * APIProperty: strokeOpacity
-     * {Number} Stroke opacity (0-1).
-     * 
-     * No default set here.  Use OpenLayers.Renderer.defaultRenderer for defaults.
-     */
-    
-    /**
-     * APIProperty: strokeWidth
-     * {Number} Pixel stroke width.
-     * 
-     * No default set here.  Use OpenLayers.Renderer.defaultRenderer for defaults.
-     */
-    
-    /**
-     * APIProperty: strokeLinecap
-     * {String} Stroke cap type ("butt", "round", or "square").
-     * 
-     * No default set here.  Use OpenLayers.Renderer.defaultRenderer for defaults.
-     */
-    
-    /**
-     * Property: strokeDashstyle
-     * {String} Stroke dash style according to the SLD spec. Note that the
-     *     OpenLayers values for strokeDashstyle ("dot", "dash", "dashdot",
-     *     "longdash", "longdashdot", or "solid") will not work in SLD, but
-     *     most SLD patterns will render correctly in OpenLayers.
-     * 
-     * No default set here.  Use OpenLayers.Renderer.defaultRenderer for defaults.
-     */
-
-    /**
-     * Constructor: OpenLayers.Symbolizer.Line
-     * Create a symbolizer for rendering lines.
-     *
-     * Parameters:
-     * config - {Object} An object containing properties to be set on the 
-     *     symbolizer.  Any documented symbolizer property can be set at 
-     *     construction.
-     *
-     * Returns:
-     * A new line symbolizer.
-     */
-    initialize: function(config) {
-        OpenLayers.Symbolizer.prototype.initialize.apply(this, arguments);
-    },
-    
-    CLASS_NAME: "OpenLayers.Symbolizer.Line"
-    
-});
-
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Symbolizer/Point.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Symbolizer/Point.js
deleted file mode 100644
index fa9d9328..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Symbolizer/Point.js
+++ /dev/null
@@ -1,157 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Symbolizer.js
- */
-
-/**
- * Class: OpenLayers.Symbolizer.Point
- * A symbolizer used to render point features.
- */
-OpenLayers.Symbolizer.Point = OpenLayers.Class(OpenLayers.Symbolizer, {
-    
-    /**
-     * APIProperty: strokeColor
-     * {String} Color for line stroke.  This is a RGB hex value (e.g. "#ff0000"
-     *     for red).
-     * 
-     * No default set here.  Use OpenLayers.Renderer.defaultRenderer for defaults.
-     */
-    
-    /**
-     * APIProperty: strokeOpacity
-     * {Number} Stroke opacity (0-1).
-     * 
-     * No default set here.  Use OpenLayers.Renderer.defaultRenderer for defaults.
-     */
-    
-    /**
-     * APIProperty: strokeWidth
-     * {Number} Pixel stroke width.
-     * 
-     * No default set here.  Use OpenLayers.Renderer.defaultRenderer for defaults.
-     */
-    
-    /**
-     * APIProperty: strokeLinecap
-     * {String} Stroke cap type ("butt", "round", or "square").
-     * 
-     * No default set here.  Use OpenLayers.Renderer.defaultRenderer for defaults.
-     */
-    
-    /**
-     * Property: strokeDashstyle
-     * {String} Stroke dash style according to the SLD spec. Note that the
-     *     OpenLayers values for strokeDashstyle ("dot", "dash", "dashdot",
-     *     "longdash", "longdashdot", or "solid") will not work in SLD, but
-     *     most SLD patterns will render correctly in OpenLayers.
-     * 
-     * No default set here.  Use OpenLayers.Renderer.defaultRenderer for defaults.
-     */
-
-    /**
-     * APIProperty: fillColor
-     * {String} RGB hex fill color (e.g. "#ff0000" for red).
-     * 
-     * No default set here.  Use OpenLayers.Renderer.defaultRenderer for defaults.
-     */
-    
-    /**
-     * APIProperty: fillOpacity
-     * {Number} Fill opacity (0-1).
-     * 
-     * No default set here.  Use OpenLayers.Renderer.defaultRenderer for defaults.
-     */
-
-    /**
-     * APIProperty: pointRadius
-     * {Number} Pixel point radius.
-     * 
-     * No default set here.  Use OpenLayers.Renderer.defaultRenderer for defaults.
-     */
-
-    /**
-     * APIProperty: externalGraphic
-     * {String} Url to an external graphic that will be used for rendering 
-     *     points.
-     * 
-     * No default set here.  Use OpenLayers.Renderer.defaultRenderer for defaults.
-     */
-    
-    /**
-     * APIProperty: graphicWidth
-     * {Number} Pixel width for sizing an external graphic.
-     * 
-     * No default set here.  Use OpenLayers.Renderer.defaultRenderer for defaults.
-     */
-    
-    /**
-     * APIProperty: graphicHeight
-     * {Number} Pixel height for sizing an external graphic.
-     * 
-     * No default set here.  Use OpenLayers.Renderer.defaultRenderer for defaults.
-     */
-    
-    /**
-     * APIProperty: graphicOpacity
-     * {Number} Opacity (0-1) for an external graphic.
-     * 
-     * No default set here.  Use OpenLayers.Renderer.defaultRenderer for defaults.
-     */
-    
-    /**
-     * APIProperty: graphicXOffset
-     * {Number} Pixel offset along the positive x axis for displacing an 
-     *     external graphic.
-     * 
-     * No default set here.  Use OpenLayers.Renderer.defaultRenderer for defaults.
-     */
-    
-    /**
-     * APIProperty: graphicYOffset
-     * {Number} Pixel offset along the positive y axis for displacing an 
-     *     external graphic.
-     * 
-     * No default set here.  Use OpenLayers.Renderer.defaultRenderer for defaults.
-     */
-
-    /**
-     * APIProperty: rotation
-     * {Number} The rotation of a graphic in the clockwise direction about its 
-     *     center point (or any point off center as specified by 
-     *     <graphicXOffset> and <graphicYOffset>).
-     * 
-     * No default set here.  Use OpenLayers.Renderer.defaultRenderer for defaults.
-     */
-    
-    /**
-     * APIProperty: graphicName
-     * {String} Named graphic to use when rendering points.  Supported values 
-     *     include "circle", "square", "star", "x", "cross", and "triangle".
-     * 
-     * No default set here.  Use OpenLayers.Renderer.defaultRenderer for defaults.
-     */
-    
-    /**
-     * Constructor: OpenLayers.Symbolizer.Point
-     * Create a symbolizer for rendering points.
-     *
-     * Parameters:
-     * config - {Object} An object containing properties to be set on the 
-     *     symbolizer.  Any documented symbolizer property can be set at 
-     *     construction.
-     *
-     * Returns:
-     * A new point symbolizer.
-     */
-    initialize: function(config) {
-        OpenLayers.Symbolizer.prototype.initialize.apply(this, arguments);
-    },
-    
-    CLASS_NAME: "OpenLayers.Symbolizer.Point"
-    
-});
-
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Symbolizer/Polygon.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Symbolizer/Polygon.js
deleted file mode 100644
index e4158c85..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Symbolizer/Polygon.js
+++ /dev/null
@@ -1,88 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Symbolizer.js
- */
-
-/**
- * Class: OpenLayers.Symbolizer.Polygon
- * A symbolizer used to render line features.
- */
-OpenLayers.Symbolizer.Polygon = OpenLayers.Class(OpenLayers.Symbolizer, {
-    
-    /**
-     * APIProperty: strokeColor
-     * {String} Color for line stroke.  This is a RGB hex value (e.g. "#ff0000"
-     *     for red).
-     * 
-     * No default set here.  Use OpenLayers.Renderer.defaultRenderer for defaults.
-     */
-    
-    /**
-     * APIProperty: strokeOpacity
-     * {Number} Stroke opacity (0-1).
-     * 
-     * No default set here.  Use OpenLayers.Renderer.defaultRenderer for defaults.
-     */
-    
-    /**
-     * APIProperty: strokeWidth
-     * {Number} Pixel stroke width.
-     * 
-     * No default set here.  Use OpenLayers.Renderer.defaultRenderer for defaults.
-     */
-    
-    /**
-     * APIProperty: strokeLinecap
-     * {String} Stroke cap type ("butt", "round", or "square").
-     * 
-     * No default set here.  Use OpenLayers.Renderer.defaultRenderer for defaults.
-     */
-    
-    /**
-     * Property: strokeDashstyle
-     * {String} Stroke dash style according to the SLD spec. Note that the
-     *     OpenLayers values for strokeDashstyle ("dot", "dash", "dashdot",
-     *     "longdash", "longdashdot", or "solid") will not work in SLD, but
-     *     most SLD patterns will render correctly in OpenLayers.
-     * 
-     * No default set here.  Use OpenLayers.Renderer.defaultRenderer for defaults.
-     */
-
-    /**
-     * APIProperty: fillColor
-     * {String} RGB hex fill color (e.g. "#ff0000" for red).
-     * 
-     * No default set here.  Use OpenLayers.Renderer.defaultRenderer for defaults.
-     */
-    
-    /**
-     * APIProperty: fillOpacity
-     * {Number} Fill opacity (0-1).
-     * 
-     * No default set here.  Use OpenLayers.Renderer.defaultRenderer for defaults.
-     */
-
-    /**
-     * Constructor: OpenLayers.Symbolizer.Polygon
-     * Create a symbolizer for rendering polygons.
-     *
-     * Parameters:
-     * config - {Object} An object containing properties to be set on the 
-     *     symbolizer.  Any documented symbolizer property can be set at 
-     *     construction.
-     *
-     * Returns:
-     * A new polygon symbolizer.
-     */
-    initialize: function(config) {
-        OpenLayers.Symbolizer.prototype.initialize.apply(this, arguments);
-    },
-    
-    CLASS_NAME: "OpenLayers.Symbolizer.Polygon"
-    
-});
-
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Symbolizer/Raster.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Symbolizer/Raster.js
deleted file mode 100644
index cf87a42c..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Symbolizer/Raster.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Symbolizer.js
- */
-
-/**
- * Class: OpenLayers.Symbolizer.Raster
- * A symbolizer used to render raster images.
- */
-OpenLayers.Symbolizer.Raster = OpenLayers.Class(OpenLayers.Symbolizer, {
-    
-    /**
-     * Constructor: OpenLayers.Symbolizer.Raster
-     * Create a symbolizer for rendering rasters.
-     *
-     * Parameters:
-     * config - {Object} An object containing properties to be set on the 
-     *     symbolizer.  Any documented symbolizer property can be set at 
-     *     construction.
-     *
-     * Returns:
-     * A new raster symbolizer.
-     */
-    initialize: function(config) {
-        OpenLayers.Symbolizer.prototype.initialize.apply(this, arguments);
-    },
-    
-    CLASS_NAME: "OpenLayers.Symbolizer.Raster"
-    
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Symbolizer/Text.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Symbolizer/Text.js
deleted file mode 100644
index 10dab203..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Symbolizer/Text.js
+++ /dev/null
@@ -1,70 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/Symbolizer.js
- */
-
-/**
- * Class: OpenLayers.Symbolizer.Text
- * A symbolizer used to render text labels for features.
- */
-OpenLayers.Symbolizer.Text = OpenLayers.Class(OpenLayers.Symbolizer, {
-    
-    /** 
-     * APIProperty: label
-     * {String} The text for the label.
-     * 
-     * No default set here.  Use OpenLayers.Renderer.defaultRenderer for defaults.
-     */
-    
-    /** 
-     * APIProperty: fontFamily
-     * {String} The font family for the label.
-     * 
-     * No default set here.  Use OpenLayers.Renderer.defaultRenderer for defaults.
-     */
-
-    /** 
-     * APIProperty: fontSize
-     * {String} The font size for the label.
-     * 
-     * No default set here.  Use OpenLayers.Renderer.defaultRenderer for defaults.
-     */
-
-    /** 
-     * APIProperty: fontWeight
-     * {String} The font weight for the label.
-     * 
-     * No default set here.  Use OpenLayers.Renderer.defaultRenderer for defaults.
-     */
-    
-    /**
-     * Property: fontStyle
-     * {String} The font style for the label.
-     * 
-     * No default set here.  Use OpenLayers.Renderer.defaultRenderer for defaults.
-     */
-
-    /**
-     * Constructor: OpenLayers.Symbolizer.Text
-     * Create a symbolizer for rendering text labels.
-     *
-     * Parameters:
-     * config - {Object} An object containing properties to be set on the 
-     *     symbolizer.  Any documented symbolizer property can be set at 
-     *     construction.
-     *
-     * Returns:
-     * A new text symbolizer.
-     */
-    initialize: function(config) {
-        OpenLayers.Symbolizer.prototype.initialize.apply(this, arguments);
-    },
-    
-    CLASS_NAME: "OpenLayers.Symbolizer.Text"
-    
-});
-
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Tile.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Tile.js
deleted file mode 100644
index b3d1ba5e..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Tile.js
+++ /dev/null
@@ -1,292 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-
-/**
- * @requires OpenLayers/BaseTypes/Class.js
- * @requires OpenLayers/Util.js
- */
-
-/**
- * Class: OpenLayers.Tile 
- * This is a class designed to designate a single tile, however
- *     it is explicitly designed to do relatively little. Tiles store 
- *     information about themselves -- such as the URL that they are related
- *     to, and their size - but do not add themselves to the layer div 
- *     automatically, for example. Create a new tile with the 
- *     <OpenLayers.Tile> constructor, or a subclass. 
- * 
- * TBD 3.0 - remove reference to url in above paragraph
- * 
- */
-OpenLayers.Tile = OpenLayers.Class({
-    
-    /**
-     * APIProperty: events
-     * {<OpenLayers.Events>} An events object that handles all 
-     *     events on the tile.
-     *
-     * Register a listener for a particular event with the following syntax:
-     * (code)
-     * tile.events.register(type, obj, listener);
-     * (end)
-     *
-     * Supported event types:
-     * beforedraw - Triggered before the tile is drawn. Used to defer
-     *     drawing to an animation queue. To defer drawing, listeners need
-     *     to return false, which will abort drawing. The queue handler needs
-     *     to call <draw>(true) to actually draw the tile.
-     * loadstart - Triggered when tile loading starts.
-     * loadend - Triggered when tile loading ends.
-     * loaderror - Triggered before the loadend event (i.e. when the tile is
-     *     still hidden) if the tile could not be loaded.
-     * reload - Triggered when an already loading tile is reloaded.
-     * unload - Triggered before a tile is unloaded.
-     */
-    events: null,
-
-    /**
-     * APIProperty: eventListeners
-     * {Object} If set as an option at construction, the eventListeners
-     *     object will be registered with <OpenLayers.Events.on>.  Object
-     *     structure must be a listeners object as shown in the example for
-     *     the events.on method.
-     *
-     * This options can be set in the ``tileOptions`` option from
-     * <OpenLayers.Layer.Grid>. For example, to be notified of the
-     * ``loadend`` event of each tiles:
-     * (code)
-     * new OpenLayers.Layer.OSM('osm', 'http://tile.openstreetmap.org/${z}/${x}/${y}.png', {
-     *     tileOptions: {
-     *         eventListeners: {
-     *             'loadend': function(evt) {
-     *                 // do something on loadend
-     *             }
-     *         }
-     *     }
-     * });
-     * (end)
-     */
-    eventListeners: null,
-
-    /**
-     * Property: id 
-     * {String} null
-     */
-    id: null,
-    
-    /** 
-     * Property: layer 
-     * {<OpenLayers.Layer>} layer the tile is attached to 
-     */
-    layer: null,
-    
-    /**
-     * Property: url
-     * {String} url of the request.
-     *
-     * TBD 3.0 
-     * Deprecated. The base tile class does not need an url. This should be 
-     * handled in subclasses. Does not belong here.
-     */
-    url: null,
-
-    /** 
-     * APIProperty: bounds 
-     * {<OpenLayers.Bounds>} null
-     */
-    bounds: null,
-    
-    /** 
-     * Property: size 
-     * {<OpenLayers.Size>} null
-     */
-    size: null,
-    
-    /** 
-     * Property: position 
-     * {<OpenLayers.Pixel>} Top Left pixel of the tile
-     */    
-    position: null,
-    
-    /**
-     * Property: isLoading
-     * {Boolean} Is the tile loading?
-     */
-    isLoading: false,
-    
-    /** TBD 3.0 -- remove 'url' from the list of parameters to the constructor.
-     *             there is no need for the base tile class to have a url.
-     */
-
-    /** 
-     * Constructor: OpenLayers.Tile
-     * Constructor for a new <OpenLayers.Tile> instance.
-     * 
-     * Parameters:
-     * layer - {<OpenLayers.Layer>} layer that the tile will go in.
-     * position - {<OpenLayers.Pixel>}
-     * bounds - {<OpenLayers.Bounds>}
-     * url - {<String>}
-     * size - {<OpenLayers.Size>}
-     * options - {Object}
-     */   
-    initialize: function(layer, position, bounds, url, size, options) {
-        this.layer = layer;
-        this.position = position.clone();
-        this.setBounds(bounds);
-        this.url = url;
-        if (size) {
-            this.size = size.clone();
-        }
-
-        //give the tile a unique id based on its BBOX.
-        this.id = OpenLayers.Util.createUniqueID("Tile_");
-
-        OpenLayers.Util.extend(this, options);
-
-        this.events = new OpenLayers.Events(this);
-        if (this.eventListeners instanceof Object) {
-            this.events.on(this.eventListeners);
-        }
-    },
-
-    /**
-     * Method: unload
-     * Call immediately before destroying if you are listening to tile
-     * events, so that counters are properly handled if tile is still
-     * loading at destroy-time. Will only fire an event if the tile is
-     * still loading.
-     */
-    unload: function() {
-       if (this.isLoading) { 
-           this.isLoading = false; 
-           this.events.triggerEvent("unload"); 
-       }
-    },
-    
-    /** 
-     * APIMethod: destroy
-     * Nullify references to prevent circular references and memory leaks.
-     */
-    destroy:function() {
-        this.layer  = null;
-        this.bounds = null;
-        this.size = null;
-        this.position = null;
-        
-        if (this.eventListeners) {
-            this.events.un(this.eventListeners);
-        }
-        this.events.destroy();
-        this.eventListeners = null;
-        this.events = null;
-    },
-    
-    /**
-     * Method: draw
-     * Clear whatever is currently in the tile, then return whether or not 
-     *     it should actually be re-drawn. This is an example implementation
-     *     that can be overridden by subclasses. The minimum thing to do here
-     *     is to call <clear> and return the result from <shouldDraw>.
-     *
-     * Parameters:
-     * force - {Boolean} If true, the tile will not be cleared and no beforedraw
-     *     event will be fired. This is used for drawing tiles asynchronously
-     *     after drawing has been cancelled by returning false from a beforedraw
-     *     listener.
-     * 
-     * Returns:
-     * {Boolean} Whether or not the tile should actually be drawn. Returns null
-     *     if a beforedraw listener returned false.
-     */
-    draw: function(force) {
-        if (!force) {
-            //clear tile's contents and mark as not drawn
-            this.clear();
-        }
-        var draw = this.shouldDraw();
-        if (draw && !force && this.events.triggerEvent("beforedraw") === false) {
-            draw = null;
-        }
-        return draw;
-    },
-    
-    /**
-     * Method: shouldDraw
-     * Return whether or not the tile should actually be (re-)drawn. The only
-     * case where we *wouldn't* want to draw the tile is if the tile is outside
-     * its layer's maxExtent
-     * 
-     * Returns:
-     * {Boolean} Whether or not the tile should actually be drawn.
-     */
-    shouldDraw: function() {        
-        var withinMaxExtent = false,
-            maxExtent = this.layer.maxExtent;
-        if (maxExtent) {
-            var map = this.layer.map;
-            var worldBounds = map.baseLayer.wrapDateLine && map.getMaxExtent();
-            if (this.bounds.intersectsBounds(maxExtent, {inclusive: false, worldBounds: worldBounds})) {
-                withinMaxExtent = true;
-            }
-        }
-        
-        return withinMaxExtent || this.layer.displayOutsideMaxExtent;
-    },
-    
-    /**
-     * Method: setBounds
-     * Sets the bounds on this instance
-     *
-     * Parameters:
-     * bounds {<OpenLayers.Bounds>}
-     */
-    setBounds: function(bounds) {
-        bounds = bounds.clone();
-        if (this.layer.map.baseLayer.wrapDateLine) {
-            var worldExtent = this.layer.map.getMaxExtent(),
-                tolerance = this.layer.map.getResolution();
-            bounds = bounds.wrapDateLine(worldExtent, {
-                leftTolerance: tolerance,
-                rightTolerance: tolerance
-            });
-        }
-        this.bounds = bounds;
-    },
-    
-    /** 
-     * Method: moveTo
-     * Reposition the tile.
-     *
-     * Parameters:
-     * bounds - {<OpenLayers.Bounds>}
-     * position - {<OpenLayers.Pixel>}
-     * redraw - {Boolean} Call draw method on tile after moving.
-     *     Default is true
-     */
-    moveTo: function (bounds, position, redraw) {
-        if (redraw == null) {
-            redraw = true;
-        }
-
-        this.setBounds(bounds);
-        this.position = position.clone();
-        if (redraw) {
-            this.draw();
-        }
-    },
-
-    /** 
-     * Method: clear
-     * Clear the tile of any bounds/position-related data so that it can 
-     *     be reused in a new location.
-     */
-    clear: function(draw) {
-        // to be extended by subclasses
-    },
-    
-    CLASS_NAME: "OpenLayers.Tile"
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Tile/Image.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Tile/Image.js
deleted file mode 100644
index 2fdffb3d..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Tile/Image.js
+++ /dev/null
@@ -1,510 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-
-/**
- * @requires OpenLayers/Tile.js
- * @requires OpenLayers/Animation.js
- * @requires OpenLayers/Util.js
- */
-
-/**
- * Class: OpenLayers.Tile.Image
- * Instances of OpenLayers.Tile.Image are used to manage the image tiles
- * used by various layers.  Create a new image tile with the
- * <OpenLayers.Tile.Image> constructor.
- *
- * Inherits from:
- *  - <OpenLayers.Tile>
- */
-OpenLayers.Tile.Image = OpenLayers.Class(OpenLayers.Tile, {
-
-    /**
-     * APIProperty: events
-     * {<OpenLayers.Events>} An events object that handles all 
-     *     events on the tile.
-     *
-     * Register a listener for a particular event with the following syntax:
-     * (code)
-     * tile.events.register(type, obj, listener);
-     * (end)
-     *
-     * Supported event types (in addition to the <OpenLayers.Tile> events):
-     * beforeload - Triggered before an image is prepared for loading, when the
-     *     url for the image is known already. Listeners may call <setImage> on
-     *     the tile instance. If they do so, that image will be used and no new
-     *     one will be created.
-     */
-
-    /** 
-     * APIProperty: url
-     * {String} The URL of the image being requested. No default. Filled in by
-     * layer.getURL() function. May be modified by loadstart listeners.
-     */
-    url: null,
-    
-    /** 
-     * Property: imgDiv
-     * {HTMLImageElement} The image for this tile.
-     */
-    imgDiv: null,
-    
-    /**
-     * Property: frame
-     * {DOMElement} The image element is appended to the frame.  Any gutter on
-     * the image will be hidden behind the frame. If no gutter is set,
-     * this will be null.
-     */ 
-    frame: null, 
-
-    /** 
-     * Property: imageReloadAttempts
-     * {Integer} Attempts to load the image.
-     */
-    imageReloadAttempts: null,
-    
-    /**
-     * Property: layerAlphaHack
-     * {Boolean} True if the png alpha hack needs to be applied on the layer's div.
-     */
-    layerAlphaHack: null,
-    
-    /**
-     * Property: asyncRequestId
-     * {Integer} ID of an request to see if request is still valid. This is a
-     * number which increments by 1 for each asynchronous request.
-     */
-    asyncRequestId: null,
-    
-    /**
-     * APIProperty: maxGetUrlLength
-     * {Number} If set, requests that would result in GET urls with more
-     * characters than the number provided will be made using form-encoded
-     * HTTP POST. It is good practice to avoid urls that are longer than 2048
-     * characters.
-     *
-     * Caution:
-     * Older versions of Gecko based browsers (e.g. Firefox < 3.5) and most
-     * Opera versions do not fully support this option. On all browsers,
-     * transition effects are not supported if POST requests are used.
-     */
-    maxGetUrlLength: null,
-
-    /**
-     * Property: canvasContext
-     * {CanvasRenderingContext2D} A canvas context associated with
-     * the tile image.
-     */
-    canvasContext: null,
-    
-    /**
-     * APIProperty: crossOriginKeyword
-     * The value of the crossorigin keyword to use when loading images. This is
-     * only relevant when using <getCanvasContext> for tiles from remote
-     * origins and should be set to either 'anonymous' or 'use-credentials'
-     * for servers that send Access-Control-Allow-Origin headers with their
-     * tiles.
-     */
-    crossOriginKeyword: null,
-
-    /** TBD 3.0 - reorder the parameters to the init function to remove 
-     *             URL. the getUrl() function on the layer gets called on 
-     *             each draw(), so no need to specify it here.
-     */
-
-    /** 
-     * Constructor: OpenLayers.Tile.Image
-     * Constructor for a new <OpenLayers.Tile.Image> instance.
-     * 
-     * Parameters:
-     * layer - {<OpenLayers.Layer>} layer that the tile will go in.
-     * position - {<OpenLayers.Pixel>}
-     * bounds - {<OpenLayers.Bounds>}
-     * url - {<String>} Deprecated. Remove me in 3.0.
-     * size - {<OpenLayers.Size>}
-     * options - {Object}
-     */   
-    initialize: function(layer, position, bounds, url, size, options) {
-        OpenLayers.Tile.prototype.initialize.apply(this, arguments);
-
-        this.url = url; //deprecated remove me
-        
-        this.layerAlphaHack = this.layer.alpha && OpenLayers.Util.alphaHack();
-
-        if (this.maxGetUrlLength != null || this.layer.gutter || this.layerAlphaHack) {
-            // only create frame if it's needed
-            this.frame = document.createElement("div");
-            this.frame.style.position = "absolute";
-            this.frame.style.overflow = "hidden";
-        }
-        if (this.maxGetUrlLength != null) {
-            OpenLayers.Util.extend(this, OpenLayers.Tile.Image.IFrame);
-        }
-    },
-    
-    /** 
-     * APIMethod: destroy
-     * nullify references to prevent circular references and memory leaks
-     */
-    destroy: function() {
-        if (this.imgDiv)  {
-            this.clear();
-            this.imgDiv = null;
-            this.frame = null;
-        }
-        // don't handle async requests any more
-        this.asyncRequestId = null;
-        OpenLayers.Tile.prototype.destroy.apply(this, arguments);
-    },
-    
-    /**
-     * Method: draw
-     * Check that a tile should be drawn, and draw it.
-     * 
-     * Returns:
-     * {Boolean} Was a tile drawn? Or null if a beforedraw listener returned
-     *     false.
-     */
-    draw: function() {
-        var shouldDraw = OpenLayers.Tile.prototype.draw.apply(this, arguments);
-        if (shouldDraw) {
-            // The layer's reproject option is deprecated.
-            if (this.layer != this.layer.map.baseLayer && this.layer.reproject) {
-                // getBoundsFromBaseLayer is defined in deprecated.js.
-                this.bounds = this.getBoundsFromBaseLayer(this.position);
-            }
-            if (this.isLoading) {
-                //if we're already loading, send 'reload' instead of 'loadstart'.
-                this._loadEvent = "reload";
-            } else {
-                this.isLoading = true;
-                this._loadEvent = "loadstart";
-            }
-            this.renderTile();
-            this.positionTile();
-        } else if (shouldDraw === false) {
-            this.unload();
-        }
-        return shouldDraw;
-    },
-    
-    /**
-     * Method: renderTile
-     * Internal function to actually initialize the image tile,
-     *     position it correctly, and set its url.
-     */
-    renderTile: function() {
-        if (this.layer.async) {
-            // Asynchronous image requests call the asynchronous getURL method
-            // on the layer to fetch an image that covers 'this.bounds'.
-            var id = this.asyncRequestId = (this.asyncRequestId || 0) + 1;
-            this.layer.getURLasync(this.bounds, function(url) {
-                if (id == this.asyncRequestId) {
-                    this.url = url;
-                    this.initImage();
-                }
-            }, this);
-        } else {
-            // synchronous image requests get the url immediately.
-            this.url = this.layer.getURL(this.bounds);
-            this.initImage();
-        }
-    },
-
-    /**
-     * Method: positionTile
-     * Using the properties currenty set on the layer, position the tile correctly.
-     * This method is used both by the async and non-async versions of the Tile.Image
-     * code.
-     */
-    positionTile: function() {
-        var style = this.getTile().style,
-            size = this.frame ? this.size :
-                this.layer.getImageSize(this.bounds),
-            ratio = 1;
-        if (this.layer instanceof OpenLayers.Layer.Grid) {
-            ratio = this.layer.getServerResolution() / this.layer.map.getResolution();
-        }
-        style.left = this.position.x + "px";
-        style.top = this.position.y + "px";
-        style.width = Math.round(ratio * size.w) + "px";
-        style.height = Math.round(ratio * size.h) + "px";
-    },
-
-    /** 
-     * Method: clear
-     * Remove the tile from the DOM, clear it of any image related data so that
-     * it can be reused in a new location.
-     */
-    clear: function() {
-        OpenLayers.Tile.prototype.clear.apply(this, arguments);
-        var img = this.imgDiv;
-        if (img) {
-            var tile = this.getTile();
-            if (tile.parentNode === this.layer.div) {
-                this.layer.div.removeChild(tile);
-            }
-            this.setImgSrc();
-            if (this.layerAlphaHack === true) {
-                img.style.filter = "";
-            }
-            OpenLayers.Element.removeClass(img, "olImageLoadError");
-        }
-        this.canvasContext = null;
-    },
-    
-    /**
-     * Method: getImage
-     * Returns or creates and returns the tile image.
-     */
-    getImage: function() {
-        if (!this.imgDiv) {
-            this.imgDiv = OpenLayers.Tile.Image.IMAGE.cloneNode(false);
-
-            var style = this.imgDiv.style;
-            if (this.frame) {
-                var left = 0, top = 0;
-                if (this.layer.gutter) {
-                    left = this.layer.gutter / this.layer.tileSize.w * 100;
-                    top = this.layer.gutter / this.layer.tileSize.h * 100;
-                }
-                style.left = -left + "%";
-                style.top = -top + "%";
-                style.width = (2 * left + 100) + "%";
-                style.height = (2 * top + 100) + "%";
-            }
-            style.visibility = "hidden";
-            style.opacity = 0;
-            if (this.layer.opacity < 1) {
-                style.filter = 'alpha(opacity=' +
-                               (this.layer.opacity * 100) +
-                               ')';
-            }
-            style.position = "absolute";
-            if (this.layerAlphaHack) {
-                // move the image out of sight
-                style.paddingTop = style.height;
-                style.height = "0";
-                style.width = "100%";
-            }
-            if (this.frame) {
-                this.frame.appendChild(this.imgDiv);
-            }
-        }
-
-        return this.imgDiv;
-    },
-    
-    /**
-     * APIMethod: setImage
-     * Sets the image element for this tile. This method should only be called
-     * from beforeload listeners.
-     *
-     * Parameters
-     * img - {HTMLImageElement} The image to use for this tile.
-     */
-    setImage: function(img) {
-        this.imgDiv = img;
-    },
-
-    /**
-     * Method: initImage
-     * Creates the content for the frame on the tile.
-     */
-    initImage: function() {
-        if (!this.url && !this.imgDiv) {
-            // fast path out - if there is no tile url and no previous image
-            this.isLoading = false;
-            return;
-        }
-        this.events.triggerEvent('beforeload');
-        this.layer.div.appendChild(this.getTile());
-        this.events.triggerEvent(this._loadEvent);
-        var img = this.getImage();
-        var src = img.getAttribute('src') || '';
-        if (this.url && OpenLayers.Util.isEquivalentUrl(src, this.url)) {
-            this._loadTimeout = window.setTimeout(
-                OpenLayers.Function.bind(this.onImageLoad, this), 0
-            );
-        } else {
-            this.stopLoading();
-            if (this.crossOriginKeyword) {
-                img.removeAttribute("crossorigin");
-            }
-            OpenLayers.Event.observe(img, "load",
-                OpenLayers.Function.bind(this.onImageLoad, this)
-            );
-            OpenLayers.Event.observe(img, "error",
-                OpenLayers.Function.bind(this.onImageError, this)
-            );
-            this.imageReloadAttempts = 0;
-            this.setImgSrc(this.url);
-        }
-    },
-    
-    /**
-     * Method: setImgSrc
-     * Sets the source for the tile image
-     *
-     * Parameters:
-     * url - {String} or undefined to hide the image
-     */
-    setImgSrc: function(url) {
-        var img = this.imgDiv;
-        if (url) {
-            img.style.visibility = 'hidden';
-            img.style.opacity = 0;
-            // don't set crossOrigin if the url is a data URL
-            if (this.crossOriginKeyword) {
-                if (url.substr(0, 5) !== 'data:') {
-                    img.setAttribute("crossorigin", this.crossOriginKeyword);
-                } else {
-                    img.removeAttribute("crossorigin");
-                }
-            }
-            img.src = url;
-        } else {
-            // Remove reference to the image, and leave it to the browser's
-            // caching and garbage collection.
-            this.stopLoading();
-            this.imgDiv = null;
-            if (img.parentNode) {
-                img.parentNode.removeChild(img);
-            }
-        }
-    },
-    
-    /**
-     * Method: getTile
-     * Get the tile's markup.
-     *
-     * Returns:
-     * {DOMElement} The tile's markup
-     */
-    getTile: function() {
-        return this.frame ? this.frame : this.getImage();
-    },
-
-    /**
-     * Method: createBackBuffer
-     * Create a backbuffer for this tile. A backbuffer isn't exactly a clone
-     * of the tile's markup, because we want to avoid the reloading of the
-     * image. So we clone the frame, and steal the image from the tile.
-     *
-     * Returns:
-     * {DOMElement} The markup, or undefined if the tile has no image
-     * or if it's currently loading.
-     */
-    createBackBuffer: function() {
-        if (!this.imgDiv || this.isLoading) {
-            return;
-        }
-        var backBuffer;
-        if (this.frame) {
-            backBuffer = this.frame.cloneNode(false);
-            backBuffer.appendChild(this.imgDiv);
-        } else {
-            backBuffer = this.imgDiv;
-        }
-        this.imgDiv = null;
-        return backBuffer;
-    },
-
-    /**
-     * Method: onImageLoad
-     * Handler for the image onload event
-     */
-    onImageLoad: function() {
-        var img = this.imgDiv;
-        this.stopLoading();
-        img.style.visibility = 'inherit';
-        img.style.opacity = this.layer.opacity;
-        this.isLoading = false;
-        this.canvasContext = null;
-        this.events.triggerEvent("loadend");
-
-        if (this.layerAlphaHack === true) {
-            img.style.filter =
-                "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" +
-                img.src + "', sizingMethod='scale')";
-        }
-    },
-    
-    /**
-     * Method: onImageError
-     * Handler for the image onerror event
-     */
-    onImageError: function() {
-        var img = this.imgDiv;
-        if (img.src != null) {
-            this.imageReloadAttempts++;
-            if (this.imageReloadAttempts <= OpenLayers.IMAGE_RELOAD_ATTEMPTS) {
-                this.setImgSrc(this.layer.getURL(this.bounds));
-            } else {
-                OpenLayers.Element.addClass(img, "olImageLoadError");
-                this.events.triggerEvent("loaderror");
-                this.onImageLoad();
-            }
-        }
-    },
-    
-    /**
-     * Method: stopLoading
-     * Stops a loading sequence so <onImageLoad> won't be executed.
-     */
-    stopLoading: function() {
-        OpenLayers.Event.stopObservingElement(this.imgDiv);
-        window.clearTimeout(this._loadTimeout);
-        delete this._loadTimeout;
-    },
-
-    /**
-     * APIMethod: getCanvasContext
-     * Returns a canvas context associated with the tile image (with
-     * the image drawn on it).
-     * Returns undefined if the browser does not support canvas, if
-     * the tile has no image or if it's currently loading.
-     *
-     * The function returns a canvas context instance but the
-     * underlying canvas is still available in the 'canvas' property:
-     * (code)
-     * var context = tile.getCanvasContext();
-     * if (context) {
-     *     var data = context.canvas.toDataURL('image/jpeg');
-     * }
-     * (end)
-     *
-     * Returns:
-     * {Boolean}
-     */
-    getCanvasContext: function() {
-        if (OpenLayers.CANVAS_SUPPORTED && this.imgDiv && !this.isLoading) {
-            if (!this.canvasContext) {
-                var canvas = document.createElement("canvas");
-                canvas.width = this.size.w;
-                canvas.height = this.size.h;
-                this.canvasContext = canvas.getContext("2d");
-                this.canvasContext.drawImage(this.imgDiv, 0, 0);
-            }
-            return this.canvasContext;
-        }
-    },
-
-    CLASS_NAME: "OpenLayers.Tile.Image"
-
-});
-
-/** 
- * Constant: OpenLayers.Tile.Image.IMAGE
- * {HTMLImageElement} The image for a tile.
- */
-OpenLayers.Tile.Image.IMAGE = (function() {
-    var img = new Image();
-    img.className = "olTileImage";
-    // avoid image gallery menu in IE6
-    img.galleryImg = "no";
-    return img;
-}());
-
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Tile/Image/IFrame.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Tile/Image/IFrame.js
deleted file mode 100644
index 9e33acc0..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Tile/Image/IFrame.js
+++ /dev/null
@@ -1,233 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-
-/**
- * @requires OpenLayers/Tile/Image.js
- */
-
-/**
- * Constant: OpenLayers.Tile.Image.IFrame
- * Mixin for tiles that use form-encoded POST requests to get images from
- * remote services. Images will be loaded using HTTP-POST into an IFrame.
- *
- * This mixin will be applied to <OpenLayers.Tile.Image> instances
- * configured with <OpenLayers.Tile.Image.maxGetUrlLength> set.
- */
-OpenLayers.Tile.Image.IFrame = {
-
-    /**
-     * Property: useIFrame
-     * {Boolean} true if we are currently using an IFrame to render POST
-     * responses, false if we are using an img element to render GET responses.
-     */ 
-    useIFrame: null,
-
-    /**
-     * Property: blankImageUrl
-     * {String} Using a data scheme url is not supported by all browsers, but
-     * we don't care because we either set it as css backgroundImage, or the
-     * image's display style is set to "none" when we use it.
-     */
-    blankImageUrl: "data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAQAIBRAA7",
-
-    /**
-     * Method: draw
-     * Set useIFrame in the instance, and operate the image/iframe switch.
-     * Then call Tile.Image.draw.
-     *
-     * Returns:
-     * {Boolean}
-     */
-    draw: function() {
-        var draw = OpenLayers.Tile.Image.prototype.shouldDraw.call(this);
-        if(draw) {
-
-            // this.url isn't set to the currect value yet, so we call getURL
-            // on the layer and store the result in a local variable
-            var url = this.layer.getURL(this.bounds);
-
-            var usedIFrame = this.useIFrame;
-            this.useIFrame = this.maxGetUrlLength !== null &&
-                             !this.layer.async &&
-                             url.length > this.maxGetUrlLength;
-
-            var fromIFrame = usedIFrame && !this.useIFrame;
-            var toIFrame = !usedIFrame && this.useIFrame;
-
-            if(fromIFrame || toIFrame) {
-
-                // Switching between GET (image) and POST (iframe).
-
-                // We remove the imgDiv (really either an image or an iframe)
-                // from the frame and set it to null to make sure initImage
-                // will call getImage.
-
-                if(this.imgDiv && this.imgDiv.parentNode === this.frame) {
-                    this.frame.removeChild(this.imgDiv);
-                }
-                this.imgDiv = null;
-
-                // And if we had an iframe we also remove the event pane.
-
-                if(fromIFrame) {
-                    this.frame.removeChild(this.frame.firstChild);
-                }
-            }
-        }
-        return OpenLayers.Tile.Image.prototype.draw.apply(this, arguments);
-    },
-
-    /**
-     * Method: getImage
-     * Creates the content for the frame on the tile.
-     */
-    getImage: function() {
-        if (this.useIFrame === true) {
-            if (!this.frame.childNodes.length) {
-                var eventPane = document.createElement("div"),
-                    style = eventPane.style;
-                style.position = "absolute";
-                style.width = "100%";
-                style.height = "100%";
-                style.zIndex = 1;
-                style.backgroundImage = "url(" + this.blankImageUrl + ")";
-                this.frame.appendChild(eventPane);
-            }
-
-            var id = this.id + '_iFrame', iframe;
-            if (parseFloat(navigator.appVersion.split("MSIE")[1]) < 9) {
-                // Older IE versions do not set the name attribute of an iFrame 
-                // properly via DOM manipulation, so we need to do it on our own with
-                // this hack.
-                iframe = document.createElement('<iframe name="'+id+'">');
-
-                // IFrames in older IE versions are not transparent, if you set
-                // the backgroundColor transparent. This is a workaround to get 
-                // transparent iframes.
-                iframe.style.backgroundColor = '#FFFFFF';
-                iframe.style.filter          = 'chroma(color=#FFFFFF)';
-            }
-            else {
-                iframe = document.createElement('iframe');
-                iframe.style.backgroundColor = 'transparent';
-
-                // iframe.name needs to be an unique id, otherwise it 
-                // could happen that other iframes are overwritten.
-                iframe.name = id;
-            }
-
-            // some special properties to avoid scaling the images and scrollbars 
-            // in the iframe
-            iframe.scrolling      = 'no';
-            iframe.marginWidth    = '0px';
-            iframe.marginHeight   = '0px';
-            iframe.frameBorder    = '0';
-
-            iframe.style.position = "absolute";
-            iframe.style.width    = "100%";
-            iframe.style.height   = "100%";
-
-            if (this.layer.opacity < 1) {
-                OpenLayers.Util.modifyDOMElement(iframe, null, null, null,
-                    null, null, null, this.layer.opacity);
-            }
-            this.frame.appendChild(iframe);
-            this.imgDiv = iframe;
-            return iframe;
-        } else {
-            return OpenLayers.Tile.Image.prototype.getImage.apply(this, arguments);
-        }
-    },
-    
-    /**
-     * Method: createRequestForm
-     * Create the html <form> element with width, height, bbox and all 
-     * parameters specified in the layer params.
-     *
-     * Returns: 
-     * {DOMElement} The form element which sends the HTTP-POST request to the
-     *              WMS. 
-     */
-    createRequestForm: function() {
-        // creation of the form element
-        var form = document.createElement('form');
-        form.method = 'POST';
-        var cacheId = this.layer.params["_OLSALT"];
-        cacheId = (cacheId ? cacheId + "_" : "") + this.bounds.toBBOX();
-        form.action = OpenLayers.Util.urlAppend(this.layer.url, cacheId);
-        form.target = this.id + '_iFrame';
-
-        // adding all parameters in layer params as hidden fields to the html
-        // form element
-        var imageSize = this.layer.getImageSize(),
-            params = OpenLayers.Util.getParameters(this.url),
-            field;
-            
-        for(var par in params) {
-            field = document.createElement('input');
-            field.type  = 'hidden';
-            field.name  = par;
-            field.value = params[par];
-            form.appendChild(field);
-        }   
-
-        return form;
-    },
-
-    /**
-     * Method: setImgSrc
-     * Sets the source for the tile image
-     *
-     * Parameters:
-     * url - {String}
-     */
-    setImgSrc: function(url) {
-        if (this.useIFrame === true) {
-            if (url) {
-                var form = this.createRequestForm();
-                this.frame.appendChild(form);
-                form.submit();
-                this.frame.removeChild(form);
-            } else if (this.imgDiv.parentNode === this.frame) {
-                // we don't reuse iframes to avoid caching issues
-                this.frame.removeChild(this.imgDiv);
-                this.imgDiv = null;
-            }
-        } else {
-            OpenLayers.Tile.Image.prototype.setImgSrc.apply(this, arguments);
-        }
-    },
-    
-    /**
-     * Method: onImageLoad
-     * Handler for the image onload event
-     */
-    onImageLoad: function() {
-        //TODO de-uglify opacity handling
-        OpenLayers.Tile.Image.prototype.onImageLoad.apply(this, arguments);
-        if (this.useIFrame === true) {
-            this.imgDiv.style.opacity = 1;
-            this.frame.style.opacity = this.layer.opacity;
-        }
-    },
-
-    /**
-     * Method: createBackBuffer
-     * Override createBackBuffer to do nothing when we use an iframe. Moving an
-     * iframe from one element to another makes it necessary to reload the iframe
-     * because its content is lost. So we just give up.
-     *
-     * Returns:
-     * {DOMElement}
-     */
-    createBackBuffer: function() {
-        var backBuffer;
-        if(this.useIFrame === false) {
-            backBuffer = OpenLayers.Tile.Image.prototype.createBackBuffer.call(this);
-        }
-        return backBuffer;
-    }
-};
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Tile/UTFGrid.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Tile/UTFGrid.js
deleted file mode 100644
index 2836ee07..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Tile/UTFGrid.js
+++ /dev/null
@@ -1,252 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-
-/**
- * @requires OpenLayers/Tile.js
- * @requires OpenLayers/Format/JSON.js
- * @requires OpenLayers/Request.js
- */
-
-/**
- * Class: OpenLayers.Tile.UTFGrid
- * Instances of OpenLayers.Tile.UTFGrid are used to manage 
- * UTFGrids. This is an unusual tile type in that it doesn't have a
- * rendered image; only a 'hit grid' that can be used to 
- * look up feature attributes.
- *
- * See the <OpenLayers.Tile.UTFGrid> constructor for details on constructing a
- * new instance.
- *
- * Inherits from:
- *  - <OpenLayers.Tile>
- */
-OpenLayers.Tile.UTFGrid = OpenLayers.Class(OpenLayers.Tile, {
-
-    /** 
-     * Property: url
-     * {String}
-     * The URL of the UTFGrid file being requested. Provided by the <getURL>
-     *     method. 
-     */
-    url: null,
-    
-    /**
-     * Property: utfgridResolution
-     * {Number}
-     * Ratio of the pixel width to the width of a UTFGrid data point.  If an 
-     *     entry in the grid represents a 4x4 block of pixels, the 
-     *     utfgridResolution would be 4.  Default is 2.
-     */
-    utfgridResolution: 2,
-    
-    /** 
-     * Property: json
-     * {Object}
-     * Stores the parsed JSON tile data structure. 
-     */
-    json: null,
-    
-    /** 
-     * Property: format
-     * {OpenLayers.Format.JSON}
-     * Parser instance used to parse JSON for cross browser support.  The native
-     *     JSON.parse method will be used where available (all except IE<8).
-     */
-    format: null,
-
-    /** 
-     * Constructor: OpenLayers.Tile.UTFGrid
-     * Constructor for a new <OpenLayers.Tile.UTFGrid> instance.
-     * 
-     * Parameters:
-     * layer - {<OpenLayers.Layer>} layer that the tile will go in.
-     * position - {<OpenLayers.Pixel>}
-     * bounds - {<OpenLayers.Bounds>}
-     * url - {<String>} Deprecated. Remove me in 3.0.
-     * size - {<OpenLayers.Size>}
-     * options - {Object}
-     */
-
-    /** 
-     * APIMethod: destroy
-     * Clean up.
-     */
-    destroy: function() {
-        this.clear();
-        OpenLayers.Tile.prototype.destroy.apply(this, arguments);
-    },
-    
-    /**
-     * Method: draw
-     * Check that a tile should be drawn, and draw it.
-     * In the case of UTFGrids, "drawing" it means fetching and
-     * parsing the json. 
-     * 
-     * Returns:
-     * {Boolean} Was a tile drawn?
-     */
-    draw: function() {
-        var drawn = OpenLayers.Tile.prototype.draw.apply(this, arguments);
-        if (drawn) {
-            if (this.isLoading) {
-                this.abortLoading();
-                //if we're already loading, send 'reload' instead of 'loadstart'.
-                this.events.triggerEvent("reload"); 
-            } else {
-                this.isLoading = true;
-                this.events.triggerEvent("loadstart");
-            }
-            this.url = this.layer.getURL(this.bounds);
-
-            if (this.layer.useJSONP) {
-                // Use JSONP method to avoid xbrowser policy
-                var ols = new OpenLayers.Protocol.Script({
-                    url: this.url,
-                    callback: function(response) {
-                        this.isLoading = false;
-                        this.events.triggerEvent("loadend");
-                        this.json = response.data;
-                    },
-                    scope: this
-                });
-                ols.read();
-                this.request = ols;
-            } else {
-                // Use standard XHR
-                this.request = OpenLayers.Request.GET({
-                    url: this.url,
-                    callback: function(response) {
-                        this.isLoading = false;
-                        this.events.triggerEvent("loadend");
-                        if (response.status === 200) {
-                            this.parseData(response.responseText);
-                        }
-                    },
-                    scope: this
-                });
-            }
-        } else {
-            this.unload();
-        }
-        return drawn;
-    },
-    
-    /**
-     * Method: abortLoading
-     * Cancel a pending request.
-     */
-    abortLoading: function() {
-        if (this.request) {
-            this.request.abort();
-            delete this.request;
-        }
-        this.isLoading = false;
-    },
-    
-    /**
-     * Method: getFeatureInfo
-     * Get feature information associated with a pixel offset.  If the pixel
-     *     offset corresponds to a feature, the returned object will have id
-     *     and data properties.  Otherwise, null will be returned.
-     *     
-     *
-     * Parameters:
-     * i - {Number} X-axis pixel offset (from top left of tile)
-     * j - {Number} Y-axis pixel offset (from top left of tile)
-     *
-     * Returns:
-     * {Object} Object with feature id and data properties corresponding to the 
-     *     given pixel offset.
-     */
-    getFeatureInfo: function(i, j) {
-        var info = null;
-        if (this.json) {
-            var id = this.getFeatureId(i, j);
-            if (id !== null) {
-                info = {id: id, data: this.json.data[id]};
-            }
-        }
-        return info;
-    },
-    
-    /**
-     * Method: getFeatureId
-     * Get the identifier for the feature associated with a pixel offset.
-     *
-     * Parameters:
-     * i - {Number} X-axis pixel offset (from top left of tile)
-     * j - {Number} Y-axis pixel offset (from top left of tile)
-     *
-     * Returns:
-     * {Object} The feature identifier corresponding to the given pixel offset.
-     *     Returns null if pixel doesn't correspond to a feature.
-     */
-    getFeatureId: function(i, j) {
-        var id = null;
-        if (this.json) {
-            var resolution = this.utfgridResolution;
-            var row = Math.floor(j / resolution);
-            var col = Math.floor(i / resolution);
-            var charCode = this.json.grid[row].charCodeAt(col);
-            var index = this.indexFromCharCode(charCode);
-            var keys = this.json.keys;
-            if (!isNaN(index) && (index in keys)) {
-                id = keys[index];
-            }
-        }
-        return id;
-    },
-    
-    /**
-     * Method: indexFromCharCode
-     * Given a character code for one of the UTFGrid "grid" characters, 
-     *     resolve the integer index for the feature id in the UTFGrid "keys"
-     *     array.
-     *
-     * Parameters:
-     * charCode - {Integer}
-     *
-     * Returns:
-     * {Integer} Index for the feature id from the keys array.
-     */
-    indexFromCharCode: function(charCode) {
-        if (charCode >= 93) {
-            charCode--;
-        }
-        if (charCode >= 35) {
-            charCode --;
-        }
-        return charCode - 32;
-    },
-    
-    /**
-     * Method: parseData
-     * Parse the JSON from a request
-     *
-     * Parameters:
-     * str - {String} UTFGrid as a JSON string. 
-     * 
-     * Returns:
-     * {Object} parsed javascript data
-     */
-    parseData: function(str) {
-        if (!this.format) {
-            this.format = new OpenLayers.Format.JSON();
-        }
-        this.json = this.format.read(str);
-    },
-    
-    /** 
-     * Method: clear
-     * Delete data stored with this tile.
-     */
-    clear: function() {
-        this.json = null;
-    },
-    
-    CLASS_NAME: "OpenLayers.Tile.UTFGrid"
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/TileManager.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/TileManager.js
deleted file mode 100644
index 5ae1666a..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/TileManager.js
+++ /dev/null
@@ -1,462 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-
-/**
- * @requires OpenLayers/Util.js
- * @requires OpenLayers/BaseTypes.js
- * @requires OpenLayers/BaseTypes/Element.js
- * @requires OpenLayers/Layer/Grid.js
- * @requires OpenLayers/Tile/Image.js
- */
-
-/**
- * Class: OpenLayers.TileManager
- * Provides queueing of image requests and caching of image elements.
- *
- * Queueing avoids unnecessary image requests while changing zoom levels
- * quickly, and helps improve dragging performance on mobile devices that show
- * a lag in dragging when loading of new images starts. <zoomDelay> and
- * <moveDelay> are the configuration options to control this behavior.
- *
- * Caching avoids setting the src on image elements for images that have already
- * been used. Several maps can share a TileManager instance, in which case each
- * map gets its own tile queue, but all maps share the same tile cache.
- */
-OpenLayers.TileManager = OpenLayers.Class({
-    
-    /**
-     * APIProperty: cacheSize
-     * {Number} Number of image elements to keep referenced in this instance's
-     * cache for fast reuse. Default is 256.
-     */
-    cacheSize: 256,
-
-    /**
-     * APIProperty: tilesPerFrame
-     * {Number} Number of queued tiles to load per frame (see <frameDelay>).
-     *     Default is 2.
-     */
-    tilesPerFrame: 2,
-
-    /**
-     * APIProperty: frameDelay
-     * {Number} Delay between tile loading frames (see <tilesPerFrame>) in
-     *     milliseconds. Default is 16.
-     */
-    frameDelay: 16,
-
-    /**
-     * APIProperty: moveDelay
-     * {Number} Delay in milliseconds after a map's move event before loading
-     * tiles. Default is 100.
-     */
-    moveDelay: 100,
-    
-    /**
-     * APIProperty: zoomDelay
-     * {Number} Delay in milliseconds after a map's zoomend event before loading
-     * tiles. Default is 200.
-     */
-    zoomDelay: 200,
-    
-    /**
-     * Property: maps
-     * {Array(<OpenLayers.Map>)} The maps to manage tiles on.
-     */
-    maps: null,
-    
-    /**
-     * Property: tileQueueId
-     * {Object} The ids of the <drawTilesFromQueue> loop, keyed by map id.
-     */
-    tileQueueId: null,
-
-    /**
-     * Property: tileQueue
-     * {Object(Array(<OpenLayers.Tile>))} Tiles queued for drawing, keyed by
-     * map id.
-     */
-    tileQueue: null,
-    
-    /**
-     * Property: tileCache
-     * {Object} Cached image elements, keyed by URL.
-     */
-    tileCache: null,
-    
-    /**
-     * Property: tileCacheIndex
-     * {Array(String)} URLs of cached tiles. First entry is the least recently
-     *    used.
-     */
-    tileCacheIndex: null,    
-    
-    /** 
-     * Constructor: OpenLayers.TileManager
-     * Constructor for a new <OpenLayers.TileManager> instance.
-     * 
-     * Parameters:
-     * options - {Object} Configuration for this instance.
-     */   
-    initialize: function(options) {
-        OpenLayers.Util.extend(this, options);
-        this.maps = [];
-        this.tileQueueId = {};
-        this.tileQueue = {};
-        this.tileCache = {};
-        this.tileCacheIndex = [];
-    },
-    
-    /**
-     * Method: addMap
-     * Binds this instance to a map
-     *
-     * Parameters:
-     * map - {<OpenLayers.Map>}
-     */
-    addMap: function(map) {
-        if (this._destroyed || !OpenLayers.Layer.Grid) {
-            return;
-        }
-        this.maps.push(map);
-        this.tileQueue[map.id] = [];
-        for (var i=0, ii=map.layers.length; i<ii; ++i) {
-            this.addLayer({layer: map.layers[i]});
-        }
-        map.events.on({
-            move: this.move,
-            zoomend: this.zoomEnd,
-            changelayer: this.changeLayer,
-            addlayer: this.addLayer,
-            preremovelayer: this.removeLayer,
-            scope: this
-        });
-    },
-    
-    /**
-     * Method: removeMap
-     * Unbinds this instance from a map
-     *
-     * Parameters:
-     * map - {<OpenLayers.Map>}
-     */
-    removeMap: function(map) {
-        if (this._destroyed || !OpenLayers.Layer.Grid) {
-            return;
-        }
-        window.clearTimeout(this.tileQueueId[map.id]);
-        if (map.layers) {
-            for (var i=0, ii=map.layers.length; i<ii; ++i) {
-                this.removeLayer({layer: map.layers[i]});
-            }
-        }
-        if (map.events) {
-            map.events.un({
-                move: this.move,
-                zoomend: this.zoomEnd,
-                changelayer: this.changeLayer,
-                addlayer: this.addLayer,
-                preremovelayer: this.removeLayer,
-                scope: this
-            });
-        }
-        delete this.tileQueue[map.id];
-        delete this.tileQueueId[map.id];
-        OpenLayers.Util.removeItem(this.maps, map);
-    },
-    
-    /**
-     * Method: move
-     * Handles the map's move event
-     *
-     * Parameters:
-     * evt - {Object} Listener argument
-     */
-    move: function(evt) {
-        this.updateTimeout(evt.object, this.moveDelay, true);
-    },
-    
-    /**
-     * Method: zoomEnd
-     * Handles the map's zoomEnd event
-     *
-     * Parameters:
-     * evt - {Object} Listener argument
-     */
-    zoomEnd: function(evt) {
-        this.updateTimeout(evt.object, this.zoomDelay);
-    },
-    
-    /**
-     * Method: changeLayer
-     * Handles the map's changeLayer event
-     *
-     * Parameters:
-     * evt - {Object} Listener argument
-     */
-    changeLayer: function(evt) {
-        if (evt.property === 'visibility' || evt.property === 'params') {
-            this.updateTimeout(evt.object, 0);
-        }
-    },
-    
-    /**
-     * Method: addLayer
-     * Handles the map's addlayer event
-     *
-     * Parameters:
-     * evt - {Object} The listener argument
-     */
-    addLayer: function(evt) {
-        var layer = evt.layer;
-        if (layer instanceof OpenLayers.Layer.Grid) {
-            layer.events.on({
-                addtile: this.addTile,
-                retile: this.clearTileQueue,
-                scope: this
-            });
-            var i, j, tile;
-            for (i=layer.grid.length-1; i>=0; --i) {
-                for (j=layer.grid[i].length-1; j>=0; --j) {
-                    tile = layer.grid[i][j];
-                    this.addTile({tile: tile});
-                    if (tile.url && !tile.imgDiv) {
-                        this.manageTileCache({object: tile});
-                    }
-                }
-            }
-        }
-    },
-    
-    /**
-     * Method: removeLayer
-     * Handles the map's preremovelayer event
-     *
-     * Parameters:
-     * evt - {Object} The listener argument
-     */
-    removeLayer: function(evt) {
-        var layer = evt.layer;
-        if (layer instanceof OpenLayers.Layer.Grid) {
-            this.clearTileQueue({object: layer});
-            if (layer.events) {
-                layer.events.un({
-                    addtile: this.addTile,
-                    retile: this.clearTileQueue,
-                    scope: this
-                });
-            }
-            if (layer.grid) {
-                var i, j, tile;
-                for (i=layer.grid.length-1; i>=0; --i) {
-                    for (j=layer.grid[i].length-1; j>=0; --j) {
-                        tile = layer.grid[i][j];
-                        this.unloadTile({object: tile});
-                    }
-                }
-            }
-        }
-    },
-    
-    /**
-     * Method: updateTimeout
-     * Applies the <moveDelay> or <zoomDelay> to the <drawTilesFromQueue> loop,
-     * and schedules more queue processing after <frameDelay> if there are still
-     * tiles in the queue.
-     *
-     * Parameters:
-     * map - {<OpenLayers.Map>} The map to update the timeout for
-     * delay - {Number} The delay to apply
-     * nice - {Boolean} If true, the timeout function will only be created if
-     *     the tilequeue is not empty. This is used by the move handler to
-     *     avoid impacts on dragging performance. For other events, the tile
-     *     queue may not be populated yet, so we need to set the timer
-     *     regardless of the queue size.
-     */
-    updateTimeout: function(map, delay, nice) {
-        window.clearTimeout(this.tileQueueId[map.id]);
-        var tileQueue = this.tileQueue[map.id];
-        if (!nice || tileQueue.length) {
-            this.tileQueueId[map.id] = window.setTimeout(
-                OpenLayers.Function.bind(function() {
-                    this.drawTilesFromQueue(map);
-                    if (tileQueue.length) {
-                        this.updateTimeout(map, this.frameDelay);
-                    }
-                }, this), delay
-            );
-        }
-    },
-    
-    /**
-     * Method: addTile
-     * Listener for the layer's addtile event
-     *
-     * Parameters:
-     * evt - {Object} The listener argument
-     */
-    addTile: function(evt) {
-        if (evt.tile instanceof OpenLayers.Tile.Image) {
-            evt.tile.events.on({
-                beforedraw: this.queueTileDraw,
-                beforeload: this.manageTileCache,
-                loadend: this.addToCache,
-                unload: this.unloadTile,
-                scope: this
-            });        
-        } else {
-            // Layer has the wrong tile type, so don't handle it any longer
-            this.removeLayer({layer: evt.tile.layer});
-        }
-    },
-    
-    /**
-     * Method: unloadTile
-     * Listener for the tile's unload event
-     *
-     * Parameters:
-     * evt - {Object} The listener argument
-     */
-    unloadTile: function(evt) {
-        var tile = evt.object;
-        tile.events.un({
-            beforedraw: this.queueTileDraw,
-            beforeload: this.manageTileCache,
-            loadend: this.addToCache,
-            unload: this.unloadTile,
-            scope: this
-        });
-        OpenLayers.Util.removeItem(this.tileQueue[tile.layer.map.id], tile);
-    },
-    
-    /**
-     * Method: queueTileDraw
-     * Adds a tile to the queue that will draw it.
-     *
-     * Parameters:
-     * evt - {Object} Listener argument of the tile's beforedraw event
-     */
-    queueTileDraw: function(evt) {
-        var tile = evt.object;
-        var queued = false;
-        var layer = tile.layer;
-        var url = layer.getURL(tile.bounds);
-        var img = this.tileCache[url];
-        if (img && img.className !== 'olTileImage') {
-            // cached image no longer valid, e.g. because we're olTileReplacing
-            delete this.tileCache[url];
-            OpenLayers.Util.removeItem(this.tileCacheIndex, url);
-            img = null;
-        }
-        // queue only if image with same url not cached already
-        if (layer.url && (layer.async || !img)) {
-            // add to queue only if not in queue already
-            var tileQueue = this.tileQueue[layer.map.id];
-            if (!~OpenLayers.Util.indexOf(tileQueue, tile)) {
-                tileQueue.push(tile);
-            }
-            queued = true;
-        }
-        return !queued;
-    },
-    
-    /**
-     * Method: drawTilesFromQueue
-     * Draws tiles from the tileQueue, and unqueues the tiles
-     */
-    drawTilesFromQueue: function(map) {
-        var tileQueue = this.tileQueue[map.id];
-        var limit = this.tilesPerFrame;
-        var animating = map.zoomTween && map.zoomTween.playing;
-        while (!animating && tileQueue.length && limit) {
-            tileQueue.shift().draw(true);
-            --limit;
-        }
-    },
-    
-    /**
-     * Method: manageTileCache
-     * Adds, updates, removes and fetches cache entries.
-     *
-     * Parameters:
-     * evt - {Object} Listener argument of the tile's beforeload event
-     */
-    manageTileCache: function(evt) {
-        var tile = evt.object;
-        var img = this.tileCache[tile.url];
-        if (img) {
-          // if image is on its layer's backbuffer, remove it from backbuffer
-          if (img.parentNode &&
-                  OpenLayers.Element.hasClass(img.parentNode, 'olBackBuffer')) {
-              img.parentNode.removeChild(img);
-              img.id = null;
-          }
-          // only use image from cache if it is not on a layer already
-          if (!img.parentNode) {
-              img.style.visibility = 'hidden';
-              img.style.opacity = 0;
-              tile.setImage(img);
-              // LRU - move tile to the end of the array to mark it as the most
-              // recently used
-              OpenLayers.Util.removeItem(this.tileCacheIndex, tile.url);
-              this.tileCacheIndex.push(tile.url);
-          }
-        }
-    },
-    
-    /**
-     * Method: addToCache
-     *
-     * Parameters:
-     * evt - {Object} Listener argument for the tile's loadend event
-     */
-    addToCache: function(evt) {
-        var tile = evt.object;
-        if (!this.tileCache[tile.url]) {
-            if (!OpenLayers.Element.hasClass(tile.imgDiv, 'olImageLoadError')) {
-                if (this.tileCacheIndex.length >= this.cacheSize) {
-                    delete this.tileCache[this.tileCacheIndex[0]];
-                    this.tileCacheIndex.shift();
-                }
-                this.tileCache[tile.url] = tile.imgDiv;
-                this.tileCacheIndex.push(tile.url);
-            }
-        }
-    },
-
-    /**
-     * Method: clearTileQueue
-     * Clears the tile queue from tiles of a specific layer
-     *
-     * Parameters:
-     * evt - {Object} Listener argument of the layer's retile event
-     */
-    clearTileQueue: function(evt) {
-        var layer = evt.object;
-        var tileQueue = this.tileQueue[layer.map.id];
-        for (var i=tileQueue.length-1; i>=0; --i) {
-            if (tileQueue[i].layer === layer) {
-                tileQueue.splice(i, 1);
-            }
-        }
-    },
-    
-    /**
-     * Method: destroy
-     */
-    destroy: function() {
-        for (var i=this.maps.length-1; i>=0; --i) {
-            this.removeMap(this.maps[i]);
-        }
-        this.maps = null;
-        this.tileQueue = null;
-        this.tileQueueId = null;
-        this.tileCache = null;
-        this.tileCacheIndex = null;
-        this._destroyed = true;
-    }
-
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Tween.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Tween.js
deleted file mode 100644
index 0432dad1..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Tween.js
+++ /dev/null
@@ -1,361 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/BaseTypes/Class.js
- * @requires OpenLayers/Animation.js
- */
-
-/**
- * Namespace: OpenLayers.Tween
- */
-OpenLayers.Tween = OpenLayers.Class({
-    
-    /**
-     * APIProperty: easing
-     * {<OpenLayers.Easing>(Function)} Easing equation used for the animation
-     *     Defaultly set to OpenLayers.Easing.Expo.easeOut
-     */
-    easing: null,
-    
-    /**
-     * APIProperty: begin
-     * {Object} Values to start the animation with
-     */
-    begin: null,
-    
-    /**
-     * APIProperty: finish
-     * {Object} Values to finish the animation with
-     */
-    finish: null,
-    
-    /**
-     * APIProperty: duration
-     * {int} duration of the tween (number of steps)
-     */
-    duration: null,
-    
-    /**
-     * APIProperty: callbacks
-     * {Object} An object with start, eachStep and done properties whose values
-     *     are functions to be call during the animation. They are passed the
-     *     current computed value as argument.
-     */
-    callbacks: null,
-    
-    /**
-     * Property: time
-     * {int} Step counter
-     */
-    time: null,
-    
-    /**
-     * APIProperty: minFrameRate
-     * {Number} The minimum framerate for animations in frames per second. After
-     * each step, the time spent in the animation is compared to the calculated
-     * time at this frame rate. If the animation runs longer than the calculated
-     * time, the next step is skipped. Default is 30.
-     */
-    minFrameRate: null,
-
-    /**
-     * Property: startTime
-     * {Number} The timestamp of the first execution step. Used for skipping
-     * frames
-     */
-    startTime: null,
-    
-    /**
-     * Property: animationId
-     * {int} Loop id returned by OpenLayers.Animation.start
-     */
-    animationId: null,
-    
-    /**
-     * Property: playing
-     * {Boolean} Tells if the easing is currently playing
-     */
-    playing: false,
-    
-    /** 
-     * Constructor: OpenLayers.Tween
-     * Creates a Tween.
-     *
-     * Parameters:
-     * easing - {<OpenLayers.Easing>(Function)} easing function method to use
-     */ 
-    initialize: function(easing) {
-        this.easing = (easing) ? easing : OpenLayers.Easing.Expo.easeOut;
-    },
-    
-    /**
-     * APIMethod: start
-     * Plays the Tween, and calls the callback method on each step
-     * 
-     * Parameters:
-     * begin - {Object} values to start the animation with
-     * finish - {Object} values to finish the animation with
-     * duration - {int} duration of the tween (number of steps)
-     * options - {Object} hash of options (callbacks (start, eachStep, done),
-     *     minFrameRate)
-     */
-    start: function(begin, finish, duration, options) {
-        this.playing = true;
-        this.begin = begin;
-        this.finish = finish;
-        this.duration = duration;
-        this.callbacks = options.callbacks;
-        this.minFrameRate = options.minFrameRate || 30;
-        this.time = 0;
-        this.startTime = new Date().getTime();
-        OpenLayers.Animation.stop(this.animationId);
-        this.animationId = null;
-        if (this.callbacks && this.callbacks.start) {
-            this.callbacks.start.call(this, this.begin);
-        }
-        this.animationId = OpenLayers.Animation.start(
-            OpenLayers.Function.bind(this.play, this)
-        );
-    },
-    
-    /**
-     * APIMethod: stop
-     * Stops the Tween, and calls the done callback
-     *     Doesn't do anything if animation is already finished
-     */
-    stop: function() {
-        if (!this.playing) {
-            return;
-        }
-        
-        if (this.callbacks && this.callbacks.done) {
-            this.callbacks.done.call(this, this.finish);
-        }
-        OpenLayers.Animation.stop(this.animationId);
-        this.animationId = null;
-        this.playing = false;
-    },
-    
-    /**
-     * Method: play
-     * Calls the appropriate easing method
-     */
-    play: function() {
-        var value = {};
-        for (var i in this.begin) {
-            var b = this.begin[i];
-            var f = this.finish[i];
-            if (b == null || f == null || isNaN(b) || isNaN(f)) {
-                throw new TypeError('invalid value for Tween');
-            }
-
-            var c = f - b;
-            value[i] = this.easing.apply(this, [this.time, b, c, this.duration]);
-        }
-        this.time++;
-        
-        if (this.callbacks && this.callbacks.eachStep) {
-            // skip frames if frame rate drops below threshold
-            if ((new Date().getTime() - this.startTime) / this.time <= 1000 / this.minFrameRate) {
-                this.callbacks.eachStep.call(this, value);
-            }
-        }
-        
-        if (this.time > this.duration) {
-            this.stop();
-        }
-    },
-    
-    /**
-     * Create empty functions for all easing methods.
-     */
-    CLASS_NAME: "OpenLayers.Tween"
-});
-
-/**
- * Namespace: OpenLayers.Easing
- * 
- * Credits:
- *      Easing Equations by Robert Penner, <http://www.robertpenner.com/easing/>
- */
-OpenLayers.Easing = {
-    /**
-     * Create empty functions for all easing methods.
-     */
-    CLASS_NAME: "OpenLayers.Easing"
-};
-
-/**
- * Namespace: OpenLayers.Easing.Linear
- */
-OpenLayers.Easing.Linear = {
-    
-    /**
-     * Function: easeIn
-     * 
-     * Parameters:
-     * t - {Float} time
-     * b - {Float} beginning position
-     * c - {Float} total change
-     * d - {Float} duration of the transition
-     *
-     * Returns:
-     * {Float}
-     */
-    easeIn: function(t, b, c, d) {
-        return c*t/d + b;
-    },
-    
-    /**
-     * Function: easeOut
-     * 
-     * Parameters:
-     * t - {Float} time
-     * b - {Float} beginning position
-     * c - {Float} total change
-     * d - {Float} duration of the transition
-     *
-     * Returns:
-     * {Float}
-     */
-    easeOut: function(t, b, c, d) {
-        return c*t/d + b;
-    },
-    
-    /**
-     * Function: easeInOut
-     * 
-     * Parameters:
-     * t - {Float} time
-     * b - {Float} beginning position
-     * c - {Float} total change
-     * d - {Float} duration of the transition
-     *
-     * Returns:
-     * {Float}
-     */
-    easeInOut: function(t, b, c, d) {
-        return c*t/d + b;
-    },
-
-    CLASS_NAME: "OpenLayers.Easing.Linear"
-};
-
-/**
- * Namespace: OpenLayers.Easing.Expo
- */
-OpenLayers.Easing.Expo = {
-    
-    /**
-     * Function: easeIn
-     * 
-     * Parameters:
-     * t - {Float} time
-     * b - {Float} beginning position
-     * c - {Float} total change
-     * d - {Float} duration of the transition
-     *
-     * Returns:
-     * {Float}
-     */
-    easeIn: function(t, b, c, d) {
-        return (t==0) ? b : c * Math.pow(2, 10 * (t/d - 1)) + b;
-    },
-    
-    /**
-     * Function: easeOut
-     * 
-     * Parameters:
-     * t - {Float} time
-     * b - {Float} beginning position
-     * c - {Float} total change
-     * d - {Float} duration of the transition
-     *
-     * Returns:
-     * {Float}
-     */
-    easeOut: function(t, b, c, d) {
-        return (t==d) ? b+c : c * (-Math.pow(2, -10 * t/d) + 1) + b;
-    },
-    
-    /**
-     * Function: easeInOut
-     * 
-     * Parameters:
-     * t - {Float} time
-     * b - {Float} beginning position
-     * c - {Float} total change
-     * d - {Float} duration of the transition
-     *
-     * Returns:
-     * {Float}
-     */
-    easeInOut: function(t, b, c, d) {
-        if (t==0) return b;
-        if (t==d) return b+c;
-        if ((t/=d/2) < 1) return c/2 * Math.pow(2, 10 * (t - 1)) + b;
-        return c/2 * (-Math.pow(2, -10 * --t) + 2) + b;
-    },
-
-    CLASS_NAME: "OpenLayers.Easing.Expo"
-};
-
-/**
- * Namespace: OpenLayers.Easing.Quad
- */
-OpenLayers.Easing.Quad = {
-    
-    /**
-     * Function: easeIn
-     * 
-     * Parameters:
-     * t - {Float} time
-     * b - {Float} beginning position
-     * c - {Float} total change
-     * d - {Float} duration of the transition
-     *
-     * Returns:
-     * {Float}
-     */
-    easeIn: function(t, b, c, d) {
-        return c*(t/=d)*t + b;
-    },
-    
-    /**
-     * Function: easeOut
-     * 
-     * Parameters:
-     * t - {Float} time
-     * b - {Float} beginning position
-     * c - {Float} total change
-     * d - {Float} duration of the transition
-     *
-     * Returns:
-     * {Float}
-     */
-    easeOut: function(t, b, c, d) {
-        return -c *(t/=d)*(t-2) + b;
-    },
-    
-    /**
-     * Function: easeInOut
-     * 
-     * Parameters:
-     * t - {Float} time
-     * b - {Float} beginning position
-     * c - {Float} total change
-     * d - {Float} duration of the transition
-     *
-     * Returns:
-     * {Float}
-     */
-    easeInOut: function(t, b, c, d) {
-        if ((t/=d/2) < 1) return c/2*t*t + b;
-        return -c/2 * ((--t)*(t-2) - 1) + b;
-    },
-
-    CLASS_NAME: "OpenLayers.Easing.Quad"
-};
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Util.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Util.js
deleted file mode 100644
index f659d3ea..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Util.js
+++ /dev/null
@@ -1,1773 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/BaseTypes.js
- * @requires OpenLayers/BaseTypes/Bounds.js
- * @requires OpenLayers/BaseTypes/Element.js
- * @requires OpenLayers/BaseTypes/LonLat.js
- * @requires OpenLayers/BaseTypes/Pixel.js
- * @requires OpenLayers/BaseTypes/Size.js
- * @requires OpenLayers/Lang.js
- */
-
-/**
- * Namespace: Util
- */
-OpenLayers.Util = OpenLayers.Util || {};
-
-/** 
- * Function: getElement
- * This is the old $() from prototype
- *
- * Parameters:
- * e - {String or DOMElement or Window}
- *
- * Returns:
- * {Array(DOMElement) or DOMElement}
- */
-OpenLayers.Util.getElement = function() {
-    var elements = [];
-
-    for (var i=0, len=arguments.length; i<len; i++) {
-        var element = arguments[i];
-        if (typeof element == 'string') {
-            element = document.getElementById(element);
-        }
-        if (arguments.length == 1) {
-            return element;
-        }
-        elements.push(element);
-    }
-    return elements;
-};
-
-/**
- * Function: isElement
- * A cross-browser implementation of "e instanceof Element".
- *
- * Parameters:
- * o - {Object} The object to test.
- *
- * Returns:
- * {Boolean}
- */
-OpenLayers.Util.isElement = function(o) {
-    return !!(o && o.nodeType === 1);
-};
-
-/**
- * Function: isArray
- * Tests that the provided object is an array.
- * This test handles the cross-IFRAME case not caught
- * by "a instanceof Array" and should be used instead.
- * 
- * Parameters:
- * a - {Object} the object test.
- * 
- * Returns:
- * {Boolean} true if the object is an array.
- */
-OpenLayers.Util.isArray = function(a) {
-    return (Object.prototype.toString.call(a) === '[object Array]');
-};
-
-/** 
- * Function: removeItem
- * Remove an object from an array. Iterates through the array
- *     to find the item, then removes it.
- *
- * Parameters:
- * array - {Array}
- * item - {Object}
- * 
- * Returns:
- * {Array} A reference to the array
- */
-OpenLayers.Util.removeItem = function(array, item) {
-    for(var i = array.length - 1; i >= 0; i--) {
-        if(array[i] == item) {
-            array.splice(i,1);
-            //break;more than once??
-        }
-    }
-    return array;
-};
-
-/** 
- * Function: indexOf
- * Seems to exist already in FF, but not in MOZ.
- * 
- * Parameters:
- * array - {Array}
- * obj - {*}
- * 
- * Returns:
- * {Integer} The index at which the first object was found in the array.
- *           If not found, returns -1.
- */
-OpenLayers.Util.indexOf = function(array, obj) {
-    // use the build-in function if available.
-    if (typeof array.indexOf == "function") {
-        return array.indexOf(obj);
-    } else {
-        for (var i = 0, len = array.length; i < len; i++) {
-            if (array[i] == obj) {
-                return i;
-            }
-        }
-        return -1;   
-    }
-};
-
-
-/**
- * Property: dotless
- * {RegExp}
- * Compiled regular expression to match dots (".").  This is used for replacing
- *     dots in identifiers.  Because object identifiers are frequently used for
- *     DOM element identifiers by the library, we avoid using dots to make for
- *     more sensible CSS selectors.
- *
- * TODO: Use a module pattern to avoid bloating the API with stuff like this.
- */
-OpenLayers.Util.dotless = /\./g;
-
-/**
- * Function: modifyDOMElement
- * 
- * Modifies many properties of a DOM element all at once.  Passing in 
- * null to an individual parameter will avoid setting the attribute.
- *
- * Parameters:
- * element - {DOMElement} DOM element to modify.
- * id - {String} The element id attribute to set.  Note that dots (".") will be
- *     replaced with underscore ("_") in setting the element id.
- * px - {<OpenLayers.Pixel>|Object} The element left and top position,
- *                                  OpenLayers.Pixel or an object with
- *                                  a 'x' and 'y' properties.
- * sz - {<OpenLayers.Size>|Object} The element width and height,
- *                                 OpenLayers.Size or an object with a
- *                                 'w' and 'h' properties.
- * position - {String}       The position attribute.  eg: absolute, 
- *                           relative, etc.
- * border - {String}         The style.border attribute.  eg:
- *                           solid black 2px
- * overflow - {String}       The style.overview attribute.  
- * opacity - {Float}         Fractional value (0.0 - 1.0)
- */
-OpenLayers.Util.modifyDOMElement = function(element, id, px, sz, position, 
-                                            border, overflow, opacity) {
-
-    if (id) {
-        element.id = id.replace(OpenLayers.Util.dotless, "_");
-    }
-    if (px) {
-        element.style.left = px.x + "px";
-        element.style.top = px.y + "px";
-    }
-    if (sz) {
-        element.style.width = sz.w + "px";
-        element.style.height = sz.h + "px";
-    }
-    if (position) {
-        element.style.position = position;
-    }
-    if (border) {
-        element.style.border = border;
-    }
-    if (overflow) {
-        element.style.overflow = overflow;
-    }
-    if (parseFloat(opacity) >= 0.0 && parseFloat(opacity) < 1.0) {
-        element.style.filter = 'alpha(opacity=' + (opacity * 100) + ')';
-        element.style.opacity = opacity;
-    } else if (parseFloat(opacity) == 1.0) {
-        element.style.filter = '';
-        element.style.opacity = '';
-    }
-};
-
-/** 
- * Function: createDiv
- * Creates a new div and optionally set some standard attributes.
- * Null may be passed to each parameter if you do not wish to
- * set a particular attribute.
- * Note - zIndex is NOT set on the resulting div.
- * 
- * Parameters:
- * id - {String} An identifier for this element.  If no id is
- *               passed an identifier will be created 
- *               automatically.  Note that dots (".") will be replaced with
- *               underscore ("_") when generating ids.
- * px - {<OpenLayers.Pixel>|Object} The element left and top position,
- *                                  OpenLayers.Pixel or an object with
- *                                  a 'x' and 'y' properties.
- * sz - {<OpenLayers.Size>|Object} The element width and height,
- *                                 OpenLayers.Size or an object with a
- *                                 'w' and 'h' properties.
- * imgURL - {String} A url pointing to an image to use as a 
- *                   background image.
- * position - {String} The style.position value. eg: absolute,
- *                     relative etc.
- * border - {String} The the style.border value. 
- *                   eg: 2px solid black
- * overflow - {String} The style.overflow value. Eg. hidden
- * opacity - {Float} Fractional value (0.0 - 1.0)
- * 
- * Returns: 
- * {DOMElement} A DOM Div created with the specified attributes.
- */
-OpenLayers.Util.createDiv = function(id, px, sz, imgURL, position, 
-                                     border, overflow, opacity) {
-
-    var dom = document.createElement('div');
-
-    if (imgURL) {
-        dom.style.backgroundImage = 'url(' + imgURL + ')';
-    }
-
-    //set generic properties
-    if (!id) {
-        id = OpenLayers.Util.createUniqueID("OpenLayersDiv");
-    }
-    if (!position) {
-        position = "absolute";
-    }
-    OpenLayers.Util.modifyDOMElement(dom, id, px, sz, position, 
-                                     border, overflow, opacity);
-
-    return dom;
-};
-
-/**
- * Function: createImage
- * Creates an img element with specific attribute values.
- *  
- * Parameters:
- * id - {String} The id field for the img.  If none assigned one will be
- *               automatically generated.
- * px - {<OpenLayers.Pixel>|Object} The element left and top position,
- *                                  OpenLayers.Pixel or an object with
- *                                  a 'x' and 'y' properties.
- * sz - {<OpenLayers.Size>|Object} The element width and height,
- *                                 OpenLayers.Size or an object with a
- *                                 'w' and 'h' properties.
- * imgURL - {String} The url to use as the image source.
- * position - {String} The style.position value.
- * border - {String} The border to place around the image.
- * opacity - {Float} Fractional value (0.0 - 1.0)
- * delayDisplay - {Boolean} If true waits until the image has been
- *                          loaded.
- * 
- * Returns:
- * {DOMElement} A DOM Image created with the specified attributes.
- */
-OpenLayers.Util.createImage = function(id, px, sz, imgURL, position, border,
-                                       opacity, delayDisplay) {
-
-    var image = document.createElement("img");
-
-    //set generic properties
-    if (!id) {
-        id = OpenLayers.Util.createUniqueID("OpenLayersDiv");
-    }
-    if (!position) {
-        position = "relative";
-    }
-    OpenLayers.Util.modifyDOMElement(image, id, px, sz, position, 
-                                     border, null, opacity);
-
-    if (delayDisplay) {
-        image.style.display = "none";
-        function display() {
-            image.style.display = "";
-            OpenLayers.Event.stopObservingElement(image);
-        }
-        OpenLayers.Event.observe(image, "load", display);
-        OpenLayers.Event.observe(image, "error", display);
-    }
-    
-    //set special properties
-    image.style.alt = id;
-    image.galleryImg = "no";
-    if (imgURL) {
-        image.src = imgURL;
-    }
-        
-    return image;
-};
-
-/**
- * Property: IMAGE_RELOAD_ATTEMPTS
- * {Integer} How many times should we try to reload an image before giving up?
- *           Default is 0
- */
-OpenLayers.IMAGE_RELOAD_ATTEMPTS = 0;
-
-/**
- * Property: alphaHackNeeded
- * {Boolean} true if the png alpha hack is necessary and possible, false otherwise.
- */
-OpenLayers.Util.alphaHackNeeded = null;
-
-/**
- * Function: alphaHack
- * Checks whether it's necessary (and possible) to use the png alpha
- * hack which allows alpha transparency for png images under Internet
- * Explorer.
- * 
- * Returns:
- * {Boolean} true if the png alpha hack is necessary and possible, false otherwise.
- */
-OpenLayers.Util.alphaHack = function() {
-    if (OpenLayers.Util.alphaHackNeeded == null) {
-        var arVersion = navigator.appVersion.split("MSIE");
-        var version = parseFloat(arVersion[1]);
-        var filter = false;
-    
-        // IEs4Lin dies when trying to access document.body.filters, because 
-        // the property is there, but requires a DLL that can't be provided. This
-        // means that we need to wrap this in a try/catch so that this can
-        // continue.
-    
-        try { 
-            filter = !!(document.body.filters);
-        } catch (e) {}    
-    
-        OpenLayers.Util.alphaHackNeeded = (filter && 
-                                           (version >= 5.5) && (version < 7));
-    }
-    return OpenLayers.Util.alphaHackNeeded;
-};
-
-/** 
- * Function: modifyAlphaImageDiv
- * 
- * Parameters:
- * div - {DOMElement} Div containing Alpha-adjusted Image
- * id - {String}
- * px - {<OpenLayers.Pixel>|Object} OpenLayers.Pixel or an object with
- *                                  a 'x' and 'y' properties.
- * sz - {<OpenLayers.Size>|Object} OpenLayers.Size or an object with
- *                                 a 'w' and 'h' properties.
- * imgURL - {String}
- * position - {String}
- * border - {String}
- * sizing - {String} 'crop', 'scale', or 'image'. Default is "scale"
- * opacity - {Float} Fractional value (0.0 - 1.0)
- */ 
-OpenLayers.Util.modifyAlphaImageDiv = function(div, id, px, sz, imgURL, 
-                                               position, border, sizing, 
-                                               opacity) {
-
-    OpenLayers.Util.modifyDOMElement(div, id, px, sz, position,
-                                     null, null, opacity);
-
-    var img = div.childNodes[0];
-
-    if (imgURL) {
-        img.src = imgURL;
-    }
-    OpenLayers.Util.modifyDOMElement(img, div.id + "_innerImage", null, sz, 
-                                     "relative", border);
-    
-    if (OpenLayers.Util.alphaHack()) {
-        if(div.style.display != "none") {
-            div.style.display = "inline-block";
-        }
-        if (sizing == null) {
-            sizing = "scale";
-        }
-        
-        div.style.filter = "progid:DXImageTransform.Microsoft" +
-                           ".AlphaImageLoader(src='" + img.src + "', " +
-                           "sizingMethod='" + sizing + "')";
-        if (parseFloat(div.style.opacity) >= 0.0 && 
-            parseFloat(div.style.opacity) < 1.0) {
-            div.style.filter += " alpha(opacity=" + div.style.opacity * 100 + ")";
-        }
-
-        img.style.filter = "alpha(opacity=0)";
-    }
-};
-
-/** 
- * Function: createAlphaImageDiv
- * 
- * Parameters:
- * id - {String}
- * px - {<OpenLayers.Pixel>|Object} OpenLayers.Pixel or an object with
- *                                  a 'x' and 'y' properties.
- * sz - {<OpenLayers.Size>|Object} OpenLayers.Size or an object with
- *                                 a 'w' and 'h' properties.
- * imgURL - {String}
- * position - {String}
- * border - {String}
- * sizing - {String} 'crop', 'scale', or 'image'. Default is "scale"
- * opacity - {Float} Fractional value (0.0 - 1.0)
- * delayDisplay - {Boolean} If true waits until the image has been
- *                          loaded.
- * 
- * Returns:
- * {DOMElement} A DOM Div created with a DOM Image inside it. If the hack is 
- *              needed for transparency in IE, it is added.
- */ 
-OpenLayers.Util.createAlphaImageDiv = function(id, px, sz, imgURL, 
-                                               position, border, sizing, 
-                                               opacity, delayDisplay) {
-    
-    var div = OpenLayers.Util.createDiv();
-    var img = OpenLayers.Util.createImage(null, null, null, null, null, null, 
-                                          null, delayDisplay);
-    img.className = "olAlphaImg";
-    div.appendChild(img);
-
-    OpenLayers.Util.modifyAlphaImageDiv(div, id, px, sz, imgURL, position, 
-                                        border, sizing, opacity);
-    
-    return div;
-};
-
-
-/** 
- * Function: upperCaseObject
- * Creates a new hashtable and copies over all the keys from the 
- *     passed-in object, but storing them under an uppercased
- *     version of the key at which they were stored.
- * 
- * Parameters: 
- * object - {Object}
- * 
- * Returns: 
- * {Object} A new Object with all the same keys but uppercased
- */
-OpenLayers.Util.upperCaseObject = function (object) {
-    var uObject = {};
-    for (var key in object) {
-        uObject[key.toUpperCase()] = object[key];
-    }
-    return uObject;
-};
-
-/** 
- * Function: applyDefaults
- * Takes an object and copies any properties that don't exist from
- *     another properties, by analogy with OpenLayers.Util.extend() from
- *     Prototype.js.
- * 
- * Parameters:
- * to - {Object} The destination object.
- * from - {Object} The source object.  Any properties of this object that
- *     are undefined in the to object will be set on the to object.
- *
- * Returns:
- * {Object} A reference to the to object.  Note that the to argument is modified
- *     in place and returned by this function.
- */
-OpenLayers.Util.applyDefaults = function (to, from) {
-    to = to || {};
-    /*
-     * FF/Windows < 2.0.0.13 reports "Illegal operation on WrappedNative
-     * prototype object" when calling hawOwnProperty if the source object is an
-     * instance of window.Event.
-     */
-    var fromIsEvt = typeof window.Event == "function"
-                    && from instanceof window.Event;
-
-    for (var key in from) {
-        if (to[key] === undefined ||
-            (!fromIsEvt && from.hasOwnProperty
-             && from.hasOwnProperty(key) && !to.hasOwnProperty(key))) {
-            to[key] = from[key];
-        }
-    }
-    /**
-     * IE doesn't include the toString property when iterating over an object's
-     * properties with the for(property in object) syntax.  Explicitly check if
-     * the source has its own toString property.
-     */
-    if(!fromIsEvt && from && from.hasOwnProperty
-       && from.hasOwnProperty('toString') && !to.hasOwnProperty('toString')) {
-        to.toString = from.toString;
-    }
-    
-    return to;
-};
-
-/**
- * Function: getParameterString
- * 
- * Parameters:
- * params - {Object}
- * 
- * Returns:
- * {String} A concatenation of the properties of an object in 
- *          http parameter notation. 
- *          (ex. <i>"key1=value1&key2=value2&key3=value3"</i>)
- *          If a parameter is actually a list, that parameter will then
- *          be set to a comma-seperated list of values (foo,bar) instead
- *          of being URL escaped (foo%3Abar). 
- */
-OpenLayers.Util.getParameterString = function(params) {
-    var paramsArray = [];
-    
-    for (var key in params) {
-      var value = params[key];
-      if ((value != null) && (typeof value != 'function')) {
-        var encodedValue;
-        if (typeof value == 'object' && value.constructor == Array) {
-          /* value is an array; encode items and separate with "," */
-          var encodedItemArray = [];
-          var item;
-          for (var itemIndex=0, len=value.length; itemIndex<len; itemIndex++) {
-            item = value[itemIndex];
-            encodedItemArray.push(encodeURIComponent(
-                (item === null || item === undefined) ? "" : item)
-            );
-          }
-          encodedValue = encodedItemArray.join(",");
-        }
-        else {
-          /* value is a string; simply encode */
-          encodedValue = encodeURIComponent(value);
-        }
-        paramsArray.push(encodeURIComponent(key) + "=" + encodedValue);
-      }
-    }
-    
-    return paramsArray.join("&");
-};
-
-/**
- * Function: urlAppend
- * Appends a parameter string to a url. This function includes the logic for
- * using the appropriate character (none, & or ?) to append to the url before
- * appending the param string.
- * 
- * Parameters:
- * url - {String} The url to append to
- * paramStr - {String} The param string to append
- * 
- * Returns:
- * {String} The new url
- */
-OpenLayers.Util.urlAppend = function(url, paramStr) {
-    var newUrl = url;
-    if(paramStr) {
-        var parts = (url + " ").split(/[?&]/);
-        newUrl += (parts.pop() === " " ?
-            paramStr :
-            parts.length ? "&" + paramStr : "?" + paramStr);
-    }
-    return newUrl;
-};
-
-/** 
- * Function: getImagesLocation
- * 
- * Returns:
- * {String} The fully formatted image location string
- */
-OpenLayers.Util.getImagesLocation = function() {
-    return OpenLayers.ImgPath || (OpenLayers._getScriptLocation() + "img/");
-};
-
-/** 
- * Function: getImageLocation
- * 
- * Returns:
- * {String} The fully formatted location string for a specified image
- */
-OpenLayers.Util.getImageLocation = function(image) {
-    return OpenLayers.Util.getImagesLocation() + image;
-};
-
-
-/** 
- * Function: Try
- * Execute functions until one of them doesn't throw an error. 
- *     Capitalized because "try" is a reserved word in JavaScript.
- *     Taken directly from OpenLayers.Util.Try()
- * 
- * Parameters:
- * [*] - {Function} Any number of parameters may be passed to Try()
- *    It will attempt to execute each of them until one of them 
- *    successfully executes. 
- *    If none executes successfully, returns null.
- * 
- * Returns:
- * {*} The value returned by the first successfully executed function.
- */
-OpenLayers.Util.Try = function() {
-    var returnValue = null;
-
-    for (var i=0, len=arguments.length; i<len; i++) {
-      var lambda = arguments[i];
-      try {
-        returnValue = lambda();
-        break;
-      } catch (e) {}
-    }
-
-    return returnValue;
-};
-
-/**
- * Function: getXmlNodeValue
- * 
- * Parameters:
- * node - {XMLNode}
- * 
- * Returns:
- * {String} The text value of the given node, without breaking in firefox or IE
- */
-OpenLayers.Util.getXmlNodeValue = function(node) {
-    var val = null;
-    OpenLayers.Util.Try( 
-        function() {
-            val = node.text;
-            if (!val) {
-                val = node.textContent;
-            }
-            if (!val) {
-                val = node.firstChild.nodeValue;
-            }
-        }, 
-        function() {
-            val = node.textContent;
-        }); 
-    return val;
-};
-
-/** 
- * Function: mouseLeft
- * 
- * Parameters:
- * evt - {Event}
- * div - {HTMLDivElement}
- * 
- * Returns:
- * {Boolean}
- */
-OpenLayers.Util.mouseLeft = function (evt, div) {
-    // start with the element to which the mouse has moved
-    var target = (evt.relatedTarget) ? evt.relatedTarget : evt.toElement;
-    // walk up the DOM tree.
-    while (target != div && target != null) {
-        target = target.parentNode;
-    }
-    // if the target we stop at isn't the div, then we've left the div.
-    return (target != div);
-};
-
-/**
- * Property: precision
- * {Number} The number of significant digits to retain to avoid
- * floating point precision errors.
- *
- * We use 14 as a "safe" default because, although IEEE 754 double floats
- * (standard on most modern operating systems) support up to about 16
- * significant digits, 14 significant digits are sufficient to represent
- * sub-millimeter accuracy in any coordinate system that anyone is likely to
- * use with OpenLayers.
- *
- * If DEFAULT_PRECISION is set to 0, the original non-truncating behavior
- * of OpenLayers <2.8 is preserved. Be aware that this will cause problems
- * with certain projections, e.g. spherical Mercator.
- *
- */
-OpenLayers.Util.DEFAULT_PRECISION = 14;
-
-/**
- * Function: toFloat
- * Convenience method to cast an object to a Number, rounded to the
- * desired floating point precision.
- *
- * Parameters:
- * number    - {Number} The number to cast and round.
- * precision - {Number} An integer suitable for use with
- *      Number.toPrecision(). Defaults to OpenLayers.Util.DEFAULT_PRECISION.
- *      If set to 0, no rounding is performed.
- *
- * Returns:
- * {Number} The cast, rounded number.
- */
-OpenLayers.Util.toFloat = function (number, precision) {
-    if (precision == null) {
-        precision = OpenLayers.Util.DEFAULT_PRECISION;
-    }
-    if (typeof number !== "number") {
-        number = parseFloat(number);
-    }
-    return precision === 0 ? number :
-                             parseFloat(number.toPrecision(precision));
-};
-
-/**
- * Function: rad
- * 
- * Parameters:
- * x - {Float}
- * 
- * Returns:
- * {Float}
- */
-OpenLayers.Util.rad = function(x) {return x*Math.PI/180;};
-
-/**
- * Function: deg
- *
- * Parameters:
- * x - {Float}
- *
- * Returns:
- * {Float}
- */
-OpenLayers.Util.deg = function(x) {return x*180/Math.PI;};
-
-/**
- * Property: VincentyConstants
- * {Object} Constants for Vincenty functions.
- */
-OpenLayers.Util.VincentyConstants = {
-    a: 6378137,
-    b: 6356752.3142,
-    f: 1/298.257223563
-};
-
-/**
- * APIFunction: distVincenty
- * Given two objects representing points with geographic coordinates, this
- *     calculates the distance between those points on the surface of an
- *     ellipsoid.
- *
- * Parameters:
- * p1 - {<OpenLayers.LonLat>} (or any object with both .lat, .lon properties)
- * p2 - {<OpenLayers.LonLat>} (or any object with both .lat, .lon properties)
- *
- * Returns:
- * {Float} The distance (in km) between the two input points as measured on an
- *     ellipsoid.  Note that the input point objects must be in geographic
- *     coordinates (decimal degrees) and the return distance is in kilometers.
- */
-OpenLayers.Util.distVincenty = function(p1, p2) {
-    var ct = OpenLayers.Util.VincentyConstants;
-    var a = ct.a, b = ct.b, f = ct.f;
-
-    var L = OpenLayers.Util.rad(p2.lon - p1.lon);
-    var U1 = Math.atan((1-f) * Math.tan(OpenLayers.Util.rad(p1.lat)));
-    var U2 = Math.atan((1-f) * Math.tan(OpenLayers.Util.rad(p2.lat)));
-    var sinU1 = Math.sin(U1), cosU1 = Math.cos(U1);
-    var sinU2 = Math.sin(U2), cosU2 = Math.cos(U2);
-    var lambda = L, lambdaP = 2*Math.PI;
-    var iterLimit = 20;
-    while (Math.abs(lambda-lambdaP) > 1e-12 && --iterLimit>0) {
-        var sinLambda = Math.sin(lambda), cosLambda = Math.cos(lambda);
-        var sinSigma = Math.sqrt((cosU2*sinLambda) * (cosU2*sinLambda) +
-        (cosU1*sinU2-sinU1*cosU2*cosLambda) * (cosU1*sinU2-sinU1*cosU2*cosLambda));
-        if (sinSigma==0) {
-            return 0;  // co-incident points
-        }
-        var cosSigma = sinU1*sinU2 + cosU1*cosU2*cosLambda;
-        var sigma = Math.atan2(sinSigma, cosSigma);
-        var alpha = Math.asin(cosU1 * cosU2 * sinLambda / sinSigma);
-        var cosSqAlpha = Math.cos(alpha) * Math.cos(alpha);
-        var cos2SigmaM = cosSigma - 2*sinU1*sinU2/cosSqAlpha;
-        var C = f/16*cosSqAlpha*(4+f*(4-3*cosSqAlpha));
-        lambdaP = lambda;
-        lambda = L + (1-C) * f * Math.sin(alpha) *
-        (sigma + C*sinSigma*(cos2SigmaM+C*cosSigma*(-1+2*cos2SigmaM*cos2SigmaM)));
-    }
-    if (iterLimit==0) {
-        return NaN;  // formula failed to converge
-    }
-    var uSq = cosSqAlpha * (a*a - b*b) / (b*b);
-    var A = 1 + uSq/16384*(4096+uSq*(-768+uSq*(320-175*uSq)));
-    var B = uSq/1024 * (256+uSq*(-128+uSq*(74-47*uSq)));
-    var deltaSigma = B*sinSigma*(cos2SigmaM+B/4*(cosSigma*(-1+2*cos2SigmaM*cos2SigmaM)-
-        B/6*cos2SigmaM*(-3+4*sinSigma*sinSigma)*(-3+4*cos2SigmaM*cos2SigmaM)));
-    var s = b*A*(sigma-deltaSigma);
-    var d = s.toFixed(3)/1000; // round to 1mm precision
-    return d;
-};
-
-/**
- * APIFunction: destinationVincenty
- * Calculate destination point given start point lat/long (numeric degrees),
- * bearing (numeric degrees) & distance (in m).
- * Adapted from Chris Veness work, see
- * http://www.movable-type.co.uk/scripts/latlong-vincenty-direct.html
- *
- * Parameters:
- * lonlat  - {<OpenLayers.LonLat>} (or any object with both .lat, .lon
- *     properties) The start point.
- * brng     - {Float} The bearing (degrees).
- * dist     - {Float} The ground distance (meters).
- *
- * Returns:
- * {<OpenLayers.LonLat>} The destination point.
- */
-OpenLayers.Util.destinationVincenty = function(lonlat, brng, dist) {
-    var u = OpenLayers.Util;
-    var ct = u.VincentyConstants;
-    var a = ct.a, b = ct.b, f = ct.f;
-
-    var lon1 = lonlat.lon;
-    var lat1 = lonlat.lat;
-
-    var s = dist;
-    var alpha1 = u.rad(brng);
-    var sinAlpha1 = Math.sin(alpha1);
-    var cosAlpha1 = Math.cos(alpha1);
-
-    var tanU1 = (1-f) * Math.tan(u.rad(lat1));
-    var cosU1 = 1 / Math.sqrt((1 + tanU1*tanU1)), sinU1 = tanU1*cosU1;
-    var sigma1 = Math.atan2(tanU1, cosAlpha1);
-    var sinAlpha = cosU1 * sinAlpha1;
-    var cosSqAlpha = 1 - sinAlpha*sinAlpha;
-    var uSq = cosSqAlpha * (a*a - b*b) / (b*b);
-    var A = 1 + uSq/16384*(4096+uSq*(-768+uSq*(320-175*uSq)));
-    var B = uSq/1024 * (256+uSq*(-128+uSq*(74-47*uSq)));
-
-    var sigma = s / (b*A), sigmaP = 2*Math.PI;
-    while (Math.abs(sigma-sigmaP) > 1e-12) {
-        var cos2SigmaM = Math.cos(2*sigma1 + sigma);
-        var sinSigma = Math.sin(sigma);
-        var cosSigma = Math.cos(sigma);
-        var deltaSigma = B*sinSigma*(cos2SigmaM+B/4*(cosSigma*(-1+2*cos2SigmaM*cos2SigmaM)-
-            B/6*cos2SigmaM*(-3+4*sinSigma*sinSigma)*(-3+4*cos2SigmaM*cos2SigmaM)));
-        sigmaP = sigma;
-        sigma = s / (b*A) + deltaSigma;
-    }
-
-    var tmp = sinU1*sinSigma - cosU1*cosSigma*cosAlpha1;
-    var lat2 = Math.atan2(sinU1*cosSigma + cosU1*sinSigma*cosAlpha1,
-        (1-f)*Math.sqrt(sinAlpha*sinAlpha + tmp*tmp));
-    var lambda = Math.atan2(sinSigma*sinAlpha1, cosU1*cosSigma - sinU1*sinSigma*cosAlpha1);
-    var C = f/16*cosSqAlpha*(4+f*(4-3*cosSqAlpha));
-    var L = lambda - (1-C) * f * sinAlpha *
-        (sigma + C*sinSigma*(cos2SigmaM+C*cosSigma*(-1+2*cos2SigmaM*cos2SigmaM)));
-
-    var revAz = Math.atan2(sinAlpha, -tmp);  // final bearing
-
-    return new OpenLayers.LonLat(lon1+u.deg(L), u.deg(lat2));
-};
-
-/**
- * Function: getParameters
- * Parse the parameters from a URL or from the current page itself into a 
- *     JavaScript Object. Note that parameter values with commas are separated
- *     out into an Array.
- * 
- * Parameters:
- * url - {String} Optional url used to extract the query string.
- *                If url is null or is not supplied, query string is taken 
- *                from the page location.
- * options - {Object} Additional options. Optional.
- *
- * Valid options:
- *   splitArgs - {Boolean} Split comma delimited params into arrays? Default is
- *       true.
- * 
- * Returns:
- * {Object} An object of key/value pairs from the query string.
- */
-OpenLayers.Util.getParameters = function(url, options) {
-    options = options || {};
-    // if no url specified, take it from the location bar
-    url = (url === null || url === undefined) ? window.location.href : url;
-
-    //parse out parameters portion of url string
-    var paramsString = "";
-    if (OpenLayers.String.contains(url, '?')) {
-        var start = url.indexOf('?') + 1;
-        var end = OpenLayers.String.contains(url, "#") ?
-                    url.indexOf('#') : url.length;
-        paramsString = url.substring(start, end);
-    }
-
-    var parameters = {};
-    var pairs = paramsString.split(/[&;]/);
-    for(var i=0, len=pairs.length; i<len; ++i) {
-        var keyValue = pairs[i].split('=');
-        if (keyValue[0]) {
-
-            var key = keyValue[0];
-            try {
-                key = decodeURIComponent(key);
-            } catch (err) {
-                key = unescape(key);
-            }
-            
-            // being liberal by replacing "+" with " "
-            var value = (keyValue[1] || '').replace(/\+/g, " ");
-
-            try {
-                value = decodeURIComponent(value);
-            } catch (err) {
-                value = unescape(value);
-            }
-            
-            // follow OGC convention of comma delimited values
-            if (options.splitArgs !== false) {
-                value = value.split(",");
-            }
-
-            //if there's only one value, do not return as array                    
-            if (value.length == 1) {
-                value = value[0];
-            }                
-            
-            parameters[key] = value;
-         }
-     }
-    return parameters;
-};
-
-/**
- * Property: lastSeqID
- * {Integer} The ever-incrementing count variable.
- *           Used for generating unique ids.
- */
-OpenLayers.Util.lastSeqID = 0;
-
-/**
- * Function: createUniqueID
- * Create a unique identifier for this session.  Each time this function
- *     is called, a counter is incremented.  The return will be the optional
- *     prefix (defaults to "id_") appended with the counter value.
- * 
- * Parameters:
- * prefix - {String} Optional string to prefix unique id. Default is "id_".
- *     Note that dots (".") in the prefix will be replaced with underscore ("_").
- * 
- * Returns:
- * {String} A unique id string, built on the passed in prefix.
- */
-OpenLayers.Util.createUniqueID = function(prefix) {
-    if (prefix == null) {
-        prefix = "id_";
-    } else {
-        prefix = prefix.replace(OpenLayers.Util.dotless, "_");
-    }
-    OpenLayers.Util.lastSeqID += 1; 
-    return prefix + OpenLayers.Util.lastSeqID;        
-};
-
-/**
- * Constant: INCHES_PER_UNIT
- * {Object} Constant inches per unit -- borrowed from MapServer mapscale.c
- * derivation of nautical miles from http://en.wikipedia.org/wiki/Nautical_mile
- * Includes the full set of units supported by CS-MAP (http://trac.osgeo.org/csmap/)
- * and PROJ.4 (http://trac.osgeo.org/proj/)
- * The hardcoded table is maintain in a CS-MAP source code module named CSdataU.c
- * The hardcoded table of PROJ.4 units are in pj_units.c.
- */
-OpenLayers.INCHES_PER_UNIT = { 
-    'inches': 1.0,
-    'ft': 12.0,
-    'mi': 63360.0,
-    'm': 39.37,
-    'km': 39370,
-    'dd': 4374754,
-    'yd': 36
-};
-OpenLayers.INCHES_PER_UNIT["in"]= OpenLayers.INCHES_PER_UNIT.inches;
-OpenLayers.INCHES_PER_UNIT["degrees"] = OpenLayers.INCHES_PER_UNIT.dd;
-OpenLayers.INCHES_PER_UNIT["nmi"] = 1852 * OpenLayers.INCHES_PER_UNIT.m;
-
-// Units from CS-Map
-OpenLayers.METERS_PER_INCH = 0.02540005080010160020;
-OpenLayers.Util.extend(OpenLayers.INCHES_PER_UNIT, {
-    "Inch": OpenLayers.INCHES_PER_UNIT.inches,
-    "Meter": 1.0 / OpenLayers.METERS_PER_INCH,   //EPSG:9001
-    "Foot": 0.30480060960121920243 / OpenLayers.METERS_PER_INCH,   //EPSG:9003
-    "IFoot": 0.30480000000000000000 / OpenLayers.METERS_PER_INCH,   //EPSG:9002
-    "ClarkeFoot": 0.3047972651151 / OpenLayers.METERS_PER_INCH,   //EPSG:9005
-    "SearsFoot": 0.30479947153867624624 / OpenLayers.METERS_PER_INCH,   //EPSG:9041
-    "GoldCoastFoot": 0.30479971018150881758 / OpenLayers.METERS_PER_INCH,   //EPSG:9094
-    "IInch": 0.02540000000000000000 / OpenLayers.METERS_PER_INCH,
-    "MicroInch": 0.00002540000000000000 / OpenLayers.METERS_PER_INCH,
-    "Mil": 0.00000002540000000000 / OpenLayers.METERS_PER_INCH,
-    "Centimeter": 0.01000000000000000000 / OpenLayers.METERS_PER_INCH,
-    "Kilometer": 1000.00000000000000000000 / OpenLayers.METERS_PER_INCH,   //EPSG:9036
-    "Yard": 0.91440182880365760731 / OpenLayers.METERS_PER_INCH,
-    "SearsYard": 0.914398414616029 / OpenLayers.METERS_PER_INCH,   //EPSG:9040
-    "IndianYard": 0.91439853074444079983 / OpenLayers.METERS_PER_INCH,   //EPSG:9084
-    "IndianYd37": 0.91439523 / OpenLayers.METERS_PER_INCH,   //EPSG:9085
-    "IndianYd62": 0.9143988 / OpenLayers.METERS_PER_INCH,   //EPSG:9086
-    "IndianYd75": 0.9143985 / OpenLayers.METERS_PER_INCH,   //EPSG:9087
-    "IndianFoot": 0.30479951 / OpenLayers.METERS_PER_INCH,   //EPSG:9080
-    "IndianFt37": 0.30479841 / OpenLayers.METERS_PER_INCH,   //EPSG:9081
-    "IndianFt62": 0.3047996 / OpenLayers.METERS_PER_INCH,   //EPSG:9082
-    "IndianFt75": 0.3047995 / OpenLayers.METERS_PER_INCH,   //EPSG:9083
-    "Mile": 1609.34721869443738887477 / OpenLayers.METERS_PER_INCH,
-    "IYard": 0.91440000000000000000 / OpenLayers.METERS_PER_INCH,   //EPSG:9096
-    "IMile": 1609.34400000000000000000 / OpenLayers.METERS_PER_INCH,   //EPSG:9093
-    "NautM": 1852.00000000000000000000 / OpenLayers.METERS_PER_INCH,   //EPSG:9030
-    "Lat-66": 110943.316488932731 / OpenLayers.METERS_PER_INCH,
-    "Lat-83": 110946.25736872234125 / OpenLayers.METERS_PER_INCH,
-    "Decimeter": 0.10000000000000000000 / OpenLayers.METERS_PER_INCH,
-    "Millimeter": 0.00100000000000000000 / OpenLayers.METERS_PER_INCH,
-    "Dekameter": 10.00000000000000000000 / OpenLayers.METERS_PER_INCH,
-    "Decameter": 10.00000000000000000000 / OpenLayers.METERS_PER_INCH,
-    "Hectometer": 100.00000000000000000000 / OpenLayers.METERS_PER_INCH,
-    "GermanMeter": 1.0000135965 / OpenLayers.METERS_PER_INCH,   //EPSG:9031
-    "CaGrid": 0.999738 / OpenLayers.METERS_PER_INCH,
-    "ClarkeChain": 20.1166194976 / OpenLayers.METERS_PER_INCH,   //EPSG:9038
-    "GunterChain": 20.11684023368047 / OpenLayers.METERS_PER_INCH,   //EPSG:9033
-    "BenoitChain": 20.116782494375872 / OpenLayers.METERS_PER_INCH,   //EPSG:9062
-    "SearsChain": 20.11676512155 / OpenLayers.METERS_PER_INCH,   //EPSG:9042
-    "ClarkeLink": 0.201166194976 / OpenLayers.METERS_PER_INCH,   //EPSG:9039
-    "GunterLink": 0.2011684023368047 / OpenLayers.METERS_PER_INCH,   //EPSG:9034
-    "BenoitLink": 0.20116782494375872 / OpenLayers.METERS_PER_INCH,   //EPSG:9063
-    "SearsLink": 0.2011676512155 / OpenLayers.METERS_PER_INCH,   //EPSG:9043
-    "Rod": 5.02921005842012 / OpenLayers.METERS_PER_INCH,
-    "IntnlChain": 20.1168 / OpenLayers.METERS_PER_INCH,   //EPSG:9097
-    "IntnlLink": 0.201168 / OpenLayers.METERS_PER_INCH,   //EPSG:9098
-    "Perch": 5.02921005842012 / OpenLayers.METERS_PER_INCH,
-    "Pole": 5.02921005842012 / OpenLayers.METERS_PER_INCH,
-    "Furlong": 201.1684023368046 / OpenLayers.METERS_PER_INCH,
-    "Rood": 3.778266898 / OpenLayers.METERS_PER_INCH,
-    "CapeFoot": 0.3047972615 / OpenLayers.METERS_PER_INCH,
-    "Brealey": 375.00000000000000000000 / OpenLayers.METERS_PER_INCH,
-    "ModAmFt": 0.304812252984505969011938 / OpenLayers.METERS_PER_INCH,
-    "Fathom": 1.8288 / OpenLayers.METERS_PER_INCH,
-    "NautM-UK": 1853.184 / OpenLayers.METERS_PER_INCH,
-    "50kilometers": 50000.0 / OpenLayers.METERS_PER_INCH,
-    "150kilometers": 150000.0 / OpenLayers.METERS_PER_INCH
-});
-
-//unit abbreviations supported by PROJ.4
-OpenLayers.Util.extend(OpenLayers.INCHES_PER_UNIT, {
-    "mm": OpenLayers.INCHES_PER_UNIT["Meter"] / 1000.0,
-    "cm": OpenLayers.INCHES_PER_UNIT["Meter"] / 100.0,
-    "dm": OpenLayers.INCHES_PER_UNIT["Meter"] * 100.0,
-    "km": OpenLayers.INCHES_PER_UNIT["Meter"] * 1000.0,
-    "kmi": OpenLayers.INCHES_PER_UNIT["nmi"],    //International Nautical Mile
-    "fath": OpenLayers.INCHES_PER_UNIT["Fathom"], //International Fathom
-    "ch": OpenLayers.INCHES_PER_UNIT["IntnlChain"],  //International Chain
-    "link": OpenLayers.INCHES_PER_UNIT["IntnlLink"], //International Link
-    "us-in": OpenLayers.INCHES_PER_UNIT["inches"], //U.S. Surveyor's Inch
-    "us-ft": OpenLayers.INCHES_PER_UNIT["Foot"], //U.S. Surveyor's Foot
-    "us-yd": OpenLayers.INCHES_PER_UNIT["Yard"], //U.S. Surveyor's Yard
-    "us-ch": OpenLayers.INCHES_PER_UNIT["GunterChain"], //U.S. Surveyor's Chain
-    "us-mi": OpenLayers.INCHES_PER_UNIT["Mile"],   //U.S. Surveyor's Statute Mile
-    "ind-yd": OpenLayers.INCHES_PER_UNIT["IndianYd37"],  //Indian Yard
-    "ind-ft": OpenLayers.INCHES_PER_UNIT["IndianFt37"],  //Indian Foot
-    "ind-ch": 20.11669506 / OpenLayers.METERS_PER_INCH  //Indian Chain
-});
-
-/** 
- * Constant: DOTS_PER_INCH
- * {Integer} 72 (A sensible default)
- */
-OpenLayers.DOTS_PER_INCH = 72;
-
-/**
- * Function: normalizeScale
- * 
- * Parameters:
- * scale - {float}
- * 
- * Returns:
- * {Float} A normalized scale value, in 1 / X format. 
- *         This means that if a value less than one ( already 1/x) is passed
- *         in, it just returns scale directly. Otherwise, it returns 
- *         1 / scale
- */
-OpenLayers.Util.normalizeScale = function (scale) {
-    var normScale = (scale > 1.0) ? (1.0 / scale) 
-                                  : scale;
-    return normScale;
-};
-
-/**
- * Function: getResolutionFromScale
- * 
- * Parameters:
- * scale - {Float}
- * units - {String} Index into OpenLayers.INCHES_PER_UNIT hashtable.
- *                  Default is degrees
- * 
- * Returns:
- * {Float} The corresponding resolution given passed-in scale and unit 
- *     parameters.  If the given scale is falsey, the returned resolution will
- *     be undefined.
- */
-OpenLayers.Util.getResolutionFromScale = function (scale, units) {
-    var resolution;
-    if (scale) {
-        if (units == null) {
-            units = "degrees";
-        }
-        var normScale = OpenLayers.Util.normalizeScale(scale);
-        resolution = 1 / (normScale * OpenLayers.INCHES_PER_UNIT[units]
-                                        * OpenLayers.DOTS_PER_INCH);        
-    }
-    return resolution;
-};
-
-/**
- * Function: getScaleFromResolution
- * 
- * Parameters:
- * resolution - {Float}
- * units - {String} Index into OpenLayers.INCHES_PER_UNIT hashtable.
- *                  Default is degrees
- * 
- * Returns:
- * {Float} The corresponding scale given passed-in resolution and unit 
- *         parameters.
- */
-OpenLayers.Util.getScaleFromResolution = function (resolution, units) {
-
-    if (units == null) {
-        units = "degrees";
-    }
-
-    var scale = resolution * OpenLayers.INCHES_PER_UNIT[units] *
-                    OpenLayers.DOTS_PER_INCH;
-    return scale;
-};
-
-/**
- * Function: pagePosition
- * Calculates the position of an element on the page (see
- * http://code.google.com/p/doctype/wiki/ArticlePageOffset)
- *
- * OpenLayers.Util.pagePosition is based on Yahoo's getXY method, which is
- * Copyright (c) 2006, Yahoo! Inc.
- * All rights reserved.
- * 
- * Redistribution and use of this software in source and binary forms, with or
- * without modification, are permitted provided that the following conditions
- * are met:
- * 
- * * Redistributions of source code must retain the above copyright notice,
- *   this list of conditions and the following disclaimer.
- * 
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- * 
- * * Neither the name of Yahoo! Inc. nor the names of its contributors may be
- *   used to endorse or promote products derived from this software without
- *   specific prior written permission of Yahoo! Inc.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * Parameters:
- * forElement - {DOMElement}
- * 
- * Returns:
- * {Array} two item array, Left value then Top value.
- */
-OpenLayers.Util.pagePosition =  function(forElement) {
-    // NOTE: If element is hidden (display none or disconnected or any the
-    // ancestors are hidden) we get (0,0) by default but we still do the
-    // accumulation of scroll position.
-
-    var pos = [0, 0];
-    var viewportElement = OpenLayers.Util.getViewportElement();
-    if (!forElement || forElement == window || forElement == viewportElement) {
-        // viewport is always at 0,0 as that defined the coordinate system for
-        // this function - this avoids special case checks in the code below
-        return pos;
-    }
-
-    // Gecko browsers normally use getBoxObjectFor to calculate the position.
-    // When invoked for an element with an implicit absolute position though it
-    // can be off by one. Therefore the recursive implementation is used in
-    // those (relatively rare) cases.
-    var BUGGY_GECKO_BOX_OBJECT =
-        OpenLayers.IS_GECKO && document.getBoxObjectFor &&
-        OpenLayers.Element.getStyle(forElement, 'position') == 'absolute' &&
-        (forElement.style.top == '' || forElement.style.left == '');
-
-    var parent = null;
-    var box;
-
-    if (forElement.getBoundingClientRect) { // IE
-        box = forElement.getBoundingClientRect();
-        var scrollTop = window.pageYOffset || viewportElement.scrollTop;
-        var scrollLeft = window.pageXOffset || viewportElement.scrollLeft;
-        
-        pos[0] = box.left + scrollLeft;
-        pos[1] = box.top + scrollTop;
-
-    } else if (document.getBoxObjectFor && !BUGGY_GECKO_BOX_OBJECT) { // gecko
-        // Gecko ignores the scroll values for ancestors, up to 1.9.  See:
-        // https://bugzilla.mozilla.org/show_bug.cgi?id=328881 and
-        // https://bugzilla.mozilla.org/show_bug.cgi?id=330619
-
-        box = document.getBoxObjectFor(forElement);
-        var vpBox = document.getBoxObjectFor(viewportElement);
-        pos[0] = box.screenX - vpBox.screenX;
-        pos[1] = box.screenY - vpBox.screenY;
-
-    } else { // safari/opera
-        pos[0] = forElement.offsetLeft;
-        pos[1] = forElement.offsetTop;
-        parent = forElement.offsetParent;
-        if (parent != forElement) {
-            while (parent) {
-                pos[0] += parent.offsetLeft;
-                pos[1] += parent.offsetTop;
-                parent = parent.offsetParent;
-            }
-        }
-
-        var browser = OpenLayers.BROWSER_NAME;
-
-        // opera & (safari absolute) incorrectly account for body offsetTop
-        if (browser == "opera" || (browser == "safari" &&
-              OpenLayers.Element.getStyle(forElement, 'position') == 'absolute')) {
-            pos[1] -= document.body.offsetTop;
-        }
-
-        // accumulate the scroll positions for everything but the body element
-        parent = forElement.offsetParent;
-        while (parent && parent != document.body) {
-            pos[0] -= parent.scrollLeft;
-            // see https://bugs.opera.com/show_bug.cgi?id=249965
-            if (browser != "opera" || parent.tagName != 'TR') {
-                pos[1] -= parent.scrollTop;
-            }
-            parent = parent.offsetParent;
-        }
-    }
-    
-    return pos;
-};
-
-/**
- * Function: getViewportElement
- * Returns die viewport element of the document. The viewport element is
- * usually document.documentElement, except in IE,where it is either
- * document.body or document.documentElement, depending on the document's
- * compatibility mode (see
- * http://code.google.com/p/doctype/wiki/ArticleClientViewportElement)
- *
- * Returns:
- * {DOMElement}
- */
-OpenLayers.Util.getViewportElement = function() {
-    var viewportElement = arguments.callee.viewportElement;
-    if (viewportElement == undefined) {
-        viewportElement = (OpenLayers.BROWSER_NAME == "msie" &&
-            document.compatMode != 'CSS1Compat') ? document.body :
-            document.documentElement;
-        arguments.callee.viewportElement = viewportElement;
-    }
-    return viewportElement;
-};
-
-/** 
- * Function: isEquivalentUrl
- * Test two URLs for equivalence. 
- * 
- * Setting 'ignoreCase' allows for case-independent comparison.
- * 
- * Comparison is based on: 
- *  - Protocol
- *  - Host (evaluated without the port)
- *  - Port (set 'ignorePort80' to ignore "80" values)
- *  - Hash ( set 'ignoreHash' to disable)
- *  - Pathname (for relative <-> absolute comparison) 
- *  - Arguments (so they can be out of order)
- *  
- * Parameters:
- * url1 - {String}
- * url2 - {String}
- * options - {Object} Allows for customization of comparison:
- *                    'ignoreCase' - Default is True
- *                    'ignorePort80' - Default is True
- *                    'ignoreHash' - Default is True
- *
- * Returns:
- * {Boolean} Whether or not the two URLs are equivalent
- */
-OpenLayers.Util.isEquivalentUrl = function(url1, url2, options) {
-    options = options || {};
-
-    OpenLayers.Util.applyDefaults(options, {
-        ignoreCase: true,
-        ignorePort80: true,
-        ignoreHash: true,
-        splitArgs: false
-    });
-
-    var urlObj1 = OpenLayers.Util.createUrlObject(url1, options);
-    var urlObj2 = OpenLayers.Util.createUrlObject(url2, options);
-
-    //compare all keys except for "args" (treated below)
-    for(var key in urlObj1) {
-        if(key !== "args") {
-            if(urlObj1[key] != urlObj2[key]) {
-                return false;
-            }
-        }
-    }
-
-    // compare search args - irrespective of order
-    for(var key in urlObj1.args) {
-        if(urlObj1.args[key] != urlObj2.args[key]) {
-            return false;
-        }
-        delete urlObj2.args[key];
-    }
-    // urlObj2 shouldn't have any args left
-    for(var key in urlObj2.args) {
-        return false;
-    }
-    
-    return true;
-};
-
-/**
- * Function: createUrlObject
- * 
- * Parameters:
- * url - {String}
- * options - {Object} A hash of options.
- *
- * Valid options:
- *   ignoreCase - {Boolean} lowercase url,
- *   ignorePort80 - {Boolean} don't include explicit port if port is 80,
- *   ignoreHash - {Boolean} Don't include part of url after the hash (#).
- *   splitArgs - {Boolean} Split comma delimited params into arrays? Default is
- *       true.
- * 
- * Returns:
- * {Object} An object with separate url, a, port, host, and args parsed out 
- *          and ready for comparison
- */
-OpenLayers.Util.createUrlObject = function(url, options) {
-    options = options || {};
-
-    // deal with relative urls first
-    if(!(/^\w+:\/\//).test(url)) {
-        var loc = window.location;
-        var port = loc.port ? ":" + loc.port : "";
-        var fullUrl = loc.protocol + "//" + loc.host.split(":").shift() + port;
-        if(url.indexOf("/") === 0) {
-            // full pathname
-            url = fullUrl + url;
-        } else {
-            // relative to current path
-            var parts = loc.pathname.split("/");
-            parts.pop();
-            url = fullUrl + parts.join("/") + "/" + url;
-        }
-    }
-  
-    if (options.ignoreCase) {
-        url = url.toLowerCase(); 
-    }
-
-    var a = document.createElement('a');
-    a.href = url;
-    
-    var urlObject = {};
-    
-    //host (without port)
-    urlObject.host = a.host.split(":").shift();
-
-    //protocol
-    urlObject.protocol = a.protocol;  
-
-    //port (get uniform browser behavior with port 80 here)
-    if(options.ignorePort80) {
-        urlObject.port = (a.port == "80" || a.port == "0") ? "" : a.port;
-    } else {
-        urlObject.port = (a.port == "" || a.port == "0") ? "80" : a.port;
-    }
-
-    //hash
-    urlObject.hash = (options.ignoreHash || a.hash === "#") ? "" : a.hash;  
-    
-    //args
-    var queryString = a.search;
-    if (!queryString) {
-        var qMark = url.indexOf("?");
-        queryString = (qMark != -1) ? url.substr(qMark) : "";
-    }
-    urlObject.args = OpenLayers.Util.getParameters(queryString,
-            {splitArgs: options.splitArgs});
-
-    // pathname
-    //
-    // This is a workaround for Internet Explorer where
-    // window.location.pathname has a leading "/", but
-    // a.pathname has no leading "/".
-    urlObject.pathname = (a.pathname.charAt(0) == "/") ? a.pathname : "/" + a.pathname;
-    
-    return urlObject; 
-};
- 
-/**
- * Function: removeTail
- * Takes a url and removes everything after the ? and #
- * 
- * Parameters:
- * url - {String} The url to process
- * 
- * Returns:
- * {String} The string with all queryString and Hash removed
- */
-OpenLayers.Util.removeTail = function(url) {
-    var head = null;
-    
-    var qMark = url.indexOf("?");
-    var hashMark = url.indexOf("#");
-
-    if (qMark == -1) {
-        head = (hashMark != -1) ? url.substr(0,hashMark) : url;
-    } else {
-        head = (hashMark != -1) ? url.substr(0,Math.min(qMark, hashMark)) 
-                                  : url.substr(0, qMark);
-    }
-    return head;
-};
-
-/**
- * Constant: IS_GECKO
- * {Boolean} True if the userAgent reports the browser to use the Gecko engine
- */
-OpenLayers.IS_GECKO = (function() {
-    var ua = navigator.userAgent.toLowerCase();
-    return ua.indexOf("webkit") == -1 && ua.indexOf("gecko") != -1;
-})();
-
-/**
- * Constant: CANVAS_SUPPORTED
- * {Boolean} True if canvas 2d is supported.
- */
-OpenLayers.CANVAS_SUPPORTED = (function() {
-    var elem = document.createElement('canvas');
-    return !!(elem.getContext && elem.getContext('2d'));
-})();
-
-/**
- * Constant: BROWSER_NAME
- * {String}
- * A substring of the navigator.userAgent property.  Depending on the userAgent
- *     property, this will be the empty string or one of the following:
- *     * "opera" -- Opera
- *     * "msie"  -- Internet Explorer
- *     * "safari" -- Safari
- *     * "firefox" -- Firefox
- *     * "mozilla" -- Mozilla
- */
-OpenLayers.BROWSER_NAME = (function() {
-    var name = "";
-    var ua = navigator.userAgent.toLowerCase();
-    if (ua.indexOf("opera") != -1) {
-        name = "opera";
-    } else if (ua.indexOf("msie") != -1) {
-        name = "msie";
-    } else if (ua.indexOf("safari") != -1) {
-        name = "safari";
-    } else if (ua.indexOf("mozilla") != -1) {
-        if (ua.indexOf("firefox") != -1) {
-            name = "firefox";
-        } else {
-            name = "mozilla";
-        }
-    }
-    return name;
-})();
-
-/**
- * Function: getBrowserName
- * 
- * Returns:
- * {String} A string which specifies which is the current 
- *          browser in which we are running. 
- * 
- *          Currently-supported browser detection and codes:
- *           * 'opera' -- Opera
- *           * 'msie'  -- Internet Explorer
- *           * 'safari' -- Safari
- *           * 'firefox' -- Firefox
- *           * 'mozilla' -- Mozilla
- * 
- *          If we are unable to property identify the browser, we 
- *           return an empty string.
- */
-OpenLayers.Util.getBrowserName = function() {
-    return OpenLayers.BROWSER_NAME;
-};
-
-/**
- * Method: getRenderedDimensions
- * Renders the contentHTML offscreen to determine actual dimensions for
- *     popup sizing. As we need layout to determine dimensions the content
- *     is rendered -9999px to the left and absolute to ensure the 
- *     scrollbars do not flicker
- *     
- * Parameters:
- * contentHTML
- * size - {<OpenLayers.Size>} If either the 'w' or 'h' properties is 
- *     specified, we fix that dimension of the div to be measured. This is 
- *     useful in the case where we have a limit in one dimension and must 
- *     therefore meaure the flow in the other dimension.
- * options - {Object}
- *
- * Allowed Options:
- *     displayClass - {String} Optional parameter.  A CSS class name(s) string
- *         to provide the CSS context of the rendered content.
- *     containerElement - {DOMElement} Optional parameter. Insert the HTML to 
- *         this node instead of the body root when calculating dimensions. 
- * 
- * Returns:
- * {<OpenLayers.Size>}
- */
-OpenLayers.Util.getRenderedDimensions = function(contentHTML, size, options) {
-    
-    var w, h;
-    
-    // create temp container div with restricted size
-    var container = document.createElement("div");
-    container.style.visibility = "hidden";
-        
-    var containerElement = (options && options.containerElement) 
-        ? options.containerElement : document.body;
-    
-    // Opera and IE7 can't handle a node with position:aboslute if it inherits
-    // position:absolute from a parent.
-    var parentHasPositionAbsolute = false;
-    var superContainer = null;
-    var parent = containerElement;
-    while (parent && parent.tagName.toLowerCase()!="body") {
-        var parentPosition = OpenLayers.Element.getStyle(parent, "position");
-        if(parentPosition == "absolute") {
-            parentHasPositionAbsolute = true;
-            break;
-        } else if (parentPosition && parentPosition != "static") {
-            break;
-        }
-        parent = parent.parentNode;
-    }
-    if(parentHasPositionAbsolute && (containerElement.clientHeight === 0 || 
-                                     containerElement.clientWidth === 0) ){
-        superContainer = document.createElement("div");
-        superContainer.style.visibility = "hidden";
-        superContainer.style.position = "absolute";
-        superContainer.style.overflow = "visible";
-        superContainer.style.width = document.body.clientWidth + "px";
-        superContainer.style.height = document.body.clientHeight + "px";
-        superContainer.appendChild(container);
-    }
-    container.style.position = "absolute";
-
-    //fix a dimension, if specified.
-    if (size) {
-        if (size.w) {
-            w = size.w;
-            container.style.width = w + "px";
-        } else if (size.h) {
-            h = size.h;
-            container.style.height = h + "px";
-        }
-    }
-
-    //add css classes, if specified
-    if (options && options.displayClass) {
-        container.className = options.displayClass;
-    }
-    
-    // create temp content div and assign content
-    var content = document.createElement("div");
-    content.innerHTML = contentHTML;
-    
-    // we need overflow visible when calculating the size
-    content.style.overflow = "visible";
-    if (content.childNodes) {
-        for (var i=0, l=content.childNodes.length; i<l; i++) {
-            if (!content.childNodes[i].style) continue;
-            content.childNodes[i].style.overflow = "visible";
-        }
-    }
-    
-    // add content to restricted container 
-    container.appendChild(content);
-    
-    // append container to body for rendering
-    if (superContainer) {
-        containerElement.appendChild(superContainer);
-    } else {
-        containerElement.appendChild(container);
-    }
-    
-    // calculate scroll width of content and add corners and shadow width
-    if (!w) {
-        w = parseInt(content.scrollWidth);
-    
-        // update container width to allow height to adjust
-        container.style.width = w + "px";
-    }        
-    // capture height and add shadow and corner image widths
-    if (!h) {
-        h = parseInt(content.scrollHeight);
-    }
-
-    // remove elements
-    container.removeChild(content);
-    if (superContainer) {
-        superContainer.removeChild(container);
-        containerElement.removeChild(superContainer);
-    } else {
-        containerElement.removeChild(container);
-    }
-    
-    return new OpenLayers.Size(w, h);
-};
-
-/**
- * APIFunction: getScrollbarWidth
- * This function has been modified by the OpenLayers from the original version,
- *     written by Matthew Eernisse and released under the Apache 2 
- *     license here:
- * 
- *     http://www.fleegix.org/articles/2006/05/30/getting-the-scrollbar-width-in-pixels
- * 
- *     It has been modified simply to cache its value, since it is physically 
- *     impossible that this code could ever run in more than one browser at 
- *     once. 
- * 
- * Returns:
- * {Integer}
- */
-OpenLayers.Util.getScrollbarWidth = function() {
-    
-    var scrollbarWidth = OpenLayers.Util._scrollbarWidth;
-    
-    if (scrollbarWidth == null) {
-        var scr = null;
-        var inn = null;
-        var wNoScroll = 0;
-        var wScroll = 0;
-    
-        // Outer scrolling div
-        scr = document.createElement('div');
-        scr.style.position = 'absolute';
-        scr.style.top = '-1000px';
-        scr.style.left = '-1000px';
-        scr.style.width = '100px';
-        scr.style.height = '50px';
-        // Start with no scrollbar
-        scr.style.overflow = 'hidden';
-    
-        // Inner content div
-        inn = document.createElement('div');
-        inn.style.width = '100%';
-        inn.style.height = '200px';
-    
-        // Put the inner div in the scrolling div
-        scr.appendChild(inn);
-        // Append the scrolling div to the doc
-        document.body.appendChild(scr);
-    
-        // Width of the inner div sans scrollbar
-        wNoScroll = inn.offsetWidth;
-    
-        // Add the scrollbar
-        scr.style.overflow = 'scroll';
-        // Width of the inner div width scrollbar
-        wScroll = inn.offsetWidth;
-    
-        // Remove the scrolling div from the doc
-        document.body.removeChild(document.body.lastChild);
-    
-        // Pixel width of the scroller
-        OpenLayers.Util._scrollbarWidth = (wNoScroll - wScroll);
-        scrollbarWidth = OpenLayers.Util._scrollbarWidth;
-    }
-
-    return scrollbarWidth;
-};
-
-/**
- * APIFunction: getFormattedLonLat
- * This function will return latitude or longitude value formatted as 
- *
- * Parameters:
- * coordinate - {Float} the coordinate value to be formatted
- * axis - {String} value of either 'lat' or 'lon' to indicate which axis is to
- *          to be formatted (default = lat)
- * dmsOption - {String} specify the precision of the output can be one of:
- *           'dms' show degrees minutes and seconds
- *           'dm' show only degrees and minutes
- *           'd' show only degrees
- * 
- * Returns:
- * {String} the coordinate value formatted as a string
- */
-OpenLayers.Util.getFormattedLonLat = function(coordinate, axis, dmsOption) {
-    if (!dmsOption) {
-        dmsOption = 'dms';    //default to show degree, minutes, seconds
-    }
-
-    coordinate = (coordinate+540)%360 - 180; // normalize for sphere being round
-
-    var abscoordinate = Math.abs(coordinate);
-    var coordinatedegrees = Math.floor(abscoordinate);
-
-    var coordinateminutes = (abscoordinate - coordinatedegrees)/(1/60);
-    var tempcoordinateminutes = coordinateminutes;
-    coordinateminutes = Math.floor(coordinateminutes);
-    var coordinateseconds = (tempcoordinateminutes - coordinateminutes)/(1/60);
-    coordinateseconds =  Math.round(coordinateseconds*10);
-    coordinateseconds /= 10;
-
-    if( coordinateseconds >= 60) { 
-        coordinateseconds -= 60; 
-        coordinateminutes += 1; 
-        if( coordinateminutes >= 60) { 
-            coordinateminutes -= 60; 
-            coordinatedegrees += 1; 
-        } 
-    }
-    
-    if( coordinatedegrees < 10 ) {
-        coordinatedegrees = "0" + coordinatedegrees;
-    }
-    var str = coordinatedegrees + "\u00B0";
-
-    if (dmsOption.indexOf('dm') >= 0) {
-        if( coordinateminutes < 10 ) {
-            coordinateminutes = "0" + coordinateminutes;
-        }
-        str += coordinateminutes + "'";
-  
-        if (dmsOption.indexOf('dms') >= 0) {
-            if( coordinateseconds < 10 ) {
-                coordinateseconds = "0" + coordinateseconds;
-            }
-            str += coordinateseconds + '"';
-        }
-    }
-    
-    if (axis == "lon") {
-        str += coordinate < 0 ? OpenLayers.i18n("W") : OpenLayers.i18n("E");
-    } else {
-        str += coordinate < 0 ? OpenLayers.i18n("S") : OpenLayers.i18n("N");
-    }
-    return str;
-};
-
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Util/vendorPrefix.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Util/vendorPrefix.js
deleted file mode 100644
index 89286d7a..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/Util/vendorPrefix.js
+++ /dev/null
@@ -1,131 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/SingleFile.js
- */
-
-OpenLayers.Util = OpenLayers.Util || {};
-/**
- * Namespace: OpenLayers.Util.vendorPrefix
- * A collection of utility functions to detect vendor prefixed features
- */
-OpenLayers.Util.vendorPrefix = (function() {
-    "use strict";
-    
-    var VENDOR_PREFIXES = ["", "O", "ms", "Moz", "Webkit"],
-        divStyle = document.createElement("div").style,
-        cssCache = {},
-        jsCache = {};
-
-    
-    /**
-     * Function: domToCss
-     * Converts a upper camel case DOM style property name to a CSS property
-     *      i.e. transformOrigin -> transform-origin
-     *      or   WebkitTransformOrigin -> -webkit-transform-origin
-     *
-     * Parameters:
-     * prefixedDom - {String} The property to convert
-     *
-     * Returns:
-     * {String} The CSS property
-     */
-    function domToCss(prefixedDom) {
-        if (!prefixedDom) { return null; }
-        return prefixedDom.
-            replace(/([A-Z])/g, function(c) { return "-" + c.toLowerCase(); }).
-            replace(/^ms-/, "-ms-");
-    }
-
-    /**
-     * APIMethod: css
-     * Detect which property is used for a CSS property
-     *
-     * Parameters:
-     * property - {String} The standard (unprefixed) CSS property name
-     *
-     * Returns:
-     * {String} The standard CSS property, prefixed property or null if not
-     *          supported
-     */
-    function css(property) {
-        if (cssCache[property] === undefined) {
-            var domProperty = property.
-                replace(/(-[\s\S])/g, function(c) { return c.charAt(1).toUpperCase(); });
-            var prefixedDom = style(domProperty);
-            cssCache[property] = domToCss(prefixedDom);
-        }
-        return cssCache[property];
-    }
-
-    /**
-     * APIMethod: js
-     * Detect which property is used for a JS property/method
-     *
-     * Parameters:
-     * obj - {Object} The object to test on
-     * property - {String} The standard (unprefixed) JS property name
-     *
-     * Returns:
-     * {String} The standard JS property, prefixed property or null if not
-     *          supported
-     */
-    function js(obj, property) {
-        if (jsCache[property] === undefined) {
-            var tmpProp,
-                i = 0,
-                l = VENDOR_PREFIXES.length,
-                prefix,
-                isStyleObj = (typeof obj.cssText !== "undefined");
-
-            jsCache[property] = null;
-            for(; i<l; i++) {
-                prefix = VENDOR_PREFIXES[i];
-                if(prefix) {
-                    if (!isStyleObj) {
-                        // js prefix should be lower-case, while style
-                        // properties have upper case on first character
-                        prefix = prefix.toLowerCase();
-                    }
-                    tmpProp = prefix + property.charAt(0).toUpperCase() + property.slice(1);
-                } else {
-                    tmpProp = property;
-                }
-
-                if(obj[tmpProp] !== undefined) {
-                    jsCache[property] = tmpProp;
-                    break;
-                }
-            }
-        }
-        return jsCache[property];
-    }
-    
-    /**
-     * APIMethod: style
-     * Detect which property is used for a DOM style property
-     *
-     * Parameters:
-     * property - {String} The standard (unprefixed) style property name
-     *
-     * Returns:
-     * {String} The standard style property, prefixed property or null if not
-     *          supported
-     */
-    function style(property) {
-        return js(divStyle, property);
-    }
-    
-    return {
-        css:      css,
-        js:       js,
-        style:    style,
-        
-        // used for testing
-        cssCache:       cssCache,
-        jsCache:        jsCache
-    };
-}());
\ No newline at end of file
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/WPSClient.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/WPSClient.js
deleted file mode 100644
index e0c8c499..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/WPSClient.js
+++ /dev/null
@@ -1,223 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/SingleFile.js
- */
-
-/**
- * @requires OpenLayers/Events.js
- * @requires OpenLayers/WPSProcess.js
- * @requires OpenLayers/Format/WPSDescribeProcess.js
- * @requires OpenLayers/Request.js
- */
-
-/**
- * Class: OpenLayers.WPSClient
- * High level API for interaction with Web Processing Services (WPS).
- * An <OpenLayers.WPSClient> instance is used to create <OpenLayers.WPSProcess>
- * instances for servers known to the WPSClient. The WPSClient also caches
- * DescribeProcess responses to reduce the number of requests sent to servers
- * when processes are created.
- */
-OpenLayers.WPSClient = OpenLayers.Class({
-    
-    /**
-     * Property: servers
-     * {Object} Service metadata, keyed by a local identifier.
-     *
-     * Properties:
-     * url - {String} the url of the server
-     * version - {String} WPS version of the server
-     * processDescription - {Object} Cache of raw DescribeProcess
-     *     responses, keyed by process identifier.
-     */
-    servers: null,
-    
-    /**
-     * Property: version
-     * {String} The default WPS version to use if none is configured. Default
-     *     is '1.0.0'.
-     */
-    version: '1.0.0',
-    
-    /**
-     * Property: lazy
-     * {Boolean} Should the DescribeProcess be deferred until a process is
-     *     fully configured? Default is false.
-     */
-    lazy: false,
-    
-    /**
-     * Property: events
-     * {<OpenLayers.Events>}
-     *
-     * Supported event types:
-     * describeprocess - Fires when the process description is available.
-     *     Listeners receive an object with a 'raw' property holding the raw
-     *     DescribeProcess response, and an 'identifier' property holding the
-     *     process identifier of the described process.
-     */
-    events: null,
-    
-    /**
-     * Constructor: OpenLayers.WPSClient
-     *
-     * Parameters:
-     * options - {Object} Object whose properties will be set on the instance.
-     *
-     * Avaliable options:
-     * servers - {Object} Mandatory. Service metadata, keyed by a local
-     *     identifier. Can either be a string with the service url or an
-     *     object literal with additional metadata:
-     *
-     *     (code)
-     *     servers: {
-     *         local: '/geoserver/wps'
-     *     }, {
-     *         opengeo: {
-     *             url: 'http://demo.opengeo.org/geoserver/wps',
-     *             version: '1.0.0'
-     *         }
-     *     }
-     *     (end)
-     *
-     * lazy - {Boolean} Optional. Set to true if DescribeProcess should not be
-     *     requested until a process is fully configured. Default is false.
-     */
-    initialize: function(options) {
-        OpenLayers.Util.extend(this, options);
-        this.events = new OpenLayers.Events(this);
-        this.servers = {};
-        for (var s in options.servers) {
-            this.servers[s] = typeof options.servers[s] == 'string' ? {
-                url: options.servers[s],
-                version: this.version,
-                processDescription: {}
-            } : options.servers[s];
-        }
-    },
-    
-    /**
-     * APIMethod: execute
-     * Shortcut to execute a process with a single function call. This is
-     * equivalent to using <getProcess> and then calling execute on the
-     * process.
-     *
-     * Parameters:
-     * options - {Object} Options for the execute operation.
-     *
-     * Available options:
-     * server - {String} Mandatory. One of the local identifiers of the
-     *     configured servers.
-     * process - {String} Mandatory. A process identifier known to the
-     *     server.
-     * inputs - {Object} The inputs for the process, keyed by input identifier.
-     *     For spatial data inputs, the value of an input is usually an
-     *     <OpenLayers.Geometry>, an <OpenLayers.Feature.Vector> or an array of
-     *     geometries or features.
-     * output - {String} The identifier of an output to parse. Optional. If not
-     *     provided, the first output will be parsed.
-     * success - {Function} Callback to call when the process is complete.
-     *     This function is called with an outputs object as argument, which
-     *     will have a property with the identifier of the requested output
-     *     (e.g. 'result'). For processes that generate spatial output, the
-     *     value will either be a single <OpenLayers.Feature.Vector> or an
-     *     array of features.
-     * scope - {Object} Optional scope for the success callback.
-     */
-    execute: function(options) {
-        var process = this.getProcess(options.server, options.process);
-        process.execute({
-            inputs: options.inputs,
-            success: options.success,
-            scope: options.scope
-        });
-    },
-    
-    /**
-     * APIMethod: getProcess
-     * Creates an <OpenLayers.WPSProcess>.
-     *
-     * Parameters:
-     * serverID - {String} Local identifier from the servers that this instance
-     *     was constructed with.
-     * processID - {String} Process identifier known to the server.
-     *
-     * Returns:
-     * {<OpenLayers.WPSProcess>}
-     */
-    getProcess: function(serverID, processID) {
-        var process = new OpenLayers.WPSProcess({
-            client: this,
-            server: serverID,
-            identifier: processID
-        });
-        if (!this.lazy) {
-            process.describe();
-        }
-        return process;
-    },
-    
-    /**
-     * Method: describeProcess
-     *
-     * Parameters:
-     * serverID - {String} Identifier of the server
-     * processID - {String} Identifier of the requested process
-     * callback - {Function} Callback to call when the description is available
-     * scope - {Object} Optional execution scope for the callback function
-     */
-    describeProcess: function(serverID, processID, callback, scope) {
-        var server = this.servers[serverID];
-        if (!server.processDescription[processID]) {
-            if (!(processID in server.processDescription)) {
-                // set to null so we know a describeFeature request is pending
-                server.processDescription[processID] = null;
-                OpenLayers.Request.GET({
-                    url: server.url,
-                    params: {
-                        SERVICE: 'WPS',
-                        VERSION: server.version,
-                        REQUEST: 'DescribeProcess',
-                        IDENTIFIER: processID
-                    },
-                    success: function(response) {
-                        server.processDescription[processID] = response.responseText;
-                        this.events.triggerEvent('describeprocess', {
-                            identifier: processID,
-                            raw: response.responseText
-                        });
-                    },
-                    scope: this
-                });
-            } else {
-                // pending request
-                this.events.register('describeprocess', this, function describe(evt) {
-                    if (evt.identifier === processID) {
-                        this.events.unregister('describeprocess', this, describe);
-                        callback.call(scope, evt.raw);
-                    }
-                });
-            }
-        } else {
-            window.setTimeout(function() {
-                callback.call(scope, server.processDescription[processID]);
-            }, 0);
-        }
-    },
-    
-    /**
-     * Method: destroy
-     */
-    destroy: function() {
-        this.events.destroy();
-        this.events = null;
-        this.servers = null;
-    },
-    
-    CLASS_NAME: 'OpenLayers.WPSClient'
-    
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/WPSProcess.js b/#pma/js/openlayers/src/openlayers/lib/OpenLayers/WPSProcess.js
deleted file mode 100644
index 874020d1..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/OpenLayers/WPSProcess.js
+++ /dev/null
@@ -1,501 +0,0 @@
-/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-/**
- * @requires OpenLayers/SingleFile.js
- */
-
-/**
- * @requires OpenLayers/Geometry.js
- * @requires OpenLayers/Feature/Vector.js
- * @requires OpenLayers/Format/WKT.js
- * @requires OpenLayers/Format/GeoJSON.js
- * @requires OpenLayers/Format/WPSExecute.js
- * @requires OpenLayers/Request.js
- */
-
-/**
- * Class: OpenLayers.WPSProcess
- * Representation of a WPS process. Usually instances of
- * <OpenLayers.WPSProcess> are created by calling 'getProcess' on an
- * <OpenLayers.WPSClient> instance.
- *
- * Currently <OpenLayers.WPSProcess> supports processes that have geometries
- * or features as output, using WKT or GeoJSON as output format. It also
- * supports chaining of processes by using the <output> method to create a
- * handle that is used as process input instead of a static value.
- */
-OpenLayers.WPSProcess = OpenLayers.Class({
-    
-    /**
-     * Property: client
-     * {<OpenLayers.WPSClient>} The client that manages this process.
-     */
-    client: null,
-    
-    /**
-     * Property: server
-     * {String} Local client identifier for this process's server.
-     */
-    server: null,
-    
-    /**
-     * Property: identifier
-     * {String} Process identifier known to the server.
-     */
-    identifier: null,
-    
-    /**
-     * Property: description
-     * {Object} DescribeProcess response for this process.
-     */
-    description: null,
-    
-    /**
-     * APIProperty: localWPS
-     * {String} Service endpoint for locally chained WPS processes. Default is
-     *     'http://geoserver/wps'.
-     */
-    localWPS: 'http://geoserver/wps',
-    
-    /**
-     * Property: formats
-     * {Object} OpenLayers.Format instances keyed by mimetype.
-     */
-    formats: null,
-    
-    /**
-     * Property: chained
-     * {Integer} Number of chained processes for pending execute requests that
-     * don't have a full configuration yet.
-     */
-    chained: 0,
-    
-    /**
-     * Property: executeCallbacks
-     * {Array} Callbacks waiting to be executed until all chained processes
-     * are configured;
-     */
-    executeCallbacks: null,
-    
-    /**
-     * Constructor: OpenLayers.WPSProcess
-     *
-     * Parameters:
-     * options - {Object} Object whose properties will be set on the instance.
-     *
-     * Avaliable options:
-     * client - {<OpenLayers.WPSClient>} Mandatory. Client that manages this
-     *     process.
-     * server - {String} Mandatory. Local client identifier of this process's
-     *     server.
-     * identifier - {String} Mandatory. Process identifier known to the server.
-     */
-    initialize: function(options) {
-        OpenLayers.Util.extend(this, options);        
-        this.executeCallbacks = [];
-        this.formats = {
-            'application/wkt': new OpenLayers.Format.WKT(),
-            'application/json': new OpenLayers.Format.GeoJSON()
-        };
-    },
-    
-    /**
-     * Method: describe
-     * Makes the client issue a DescribeProcess request asynchronously.
-     *
-     * Parameters:
-     * options - {Object} Configuration for the method call
-     *
-     * Available options:
-     * callback - {Function} Callback to execute when the description is
-     *     available. Will be called with the parsed description as argument.
-     *     Optional.
-     * scope - {Object} The scope in which the callback will be executed.
-     *     Default is the global object.
-     */
-    describe: function(options) {
-        options = options || {};
-        if (!this.description) {
-            this.client.describeProcess(this.server, this.identifier, function(description) {
-                if (!this.description) {
-                    this.parseDescription(description);
-                }
-                if (options.callback) {
-                    options.callback.call(options.scope, this.description);
-                }
-            }, this);
-        } else if (options.callback) {
-            var description = this.description;
-            window.setTimeout(function() {
-                options.callback.call(options.scope, description);
-            }, 0);
-        }
-    },
-    
-    /**
-     * APIMethod: configure
-     * Configure the process, but do not execute it. Use this for processes
-     * that are chained as input of a different process by means of the
-     * <output> method.
-     *
-     * Parameters:
-     * options - {Object}
-     *
-     * Returns:
-     * {<OpenLayers.WPSProcess>} this process.
-     *
-     * Available options:
-     * inputs - {Object} The inputs for the process, keyed by input identifier.
-     *     For spatial data inputs, the value of an input is usually an
-     *     <OpenLayers.Geometry>, an <OpenLayers.Feature.Vector> or an array of
-     *     geometries or features.
-     * callback - {Function} Callback to call when the configuration is
-     *     complete. Optional.
-     * scope - {Object} Optional scope for the callback.
-     */
-    configure: function(options) {
-        this.describe({
-            callback: function() {
-                var description = this.description,
-                    inputs = options.inputs,
-                    input, i, ii;
-                for (i=0, ii=description.dataInputs.length; i<ii; ++i) {
-                    input = description.dataInputs[i];
-                    this.setInputData(input, inputs[input.identifier]);
-                }
-                if (options.callback) {
-                    options.callback.call(options.scope);
-                }
-            },
-            scope: this
-        });
-        return this;
-    },
-    
-    /**
-     * APIMethod: execute
-     * Configures and executes the process
-     *
-     * Parameters:
-     * options - {Object}
-     *
-     * Available options:
-     * inputs - {Object} The inputs for the process, keyed by input identifier.
-     *     For spatial data inputs, the value of an input is usually an
-     *     <OpenLayers.Geometry>, an <OpenLayers.Feature.Vector> or an array of
-     *     geometries or features.
-     * output - {String} The identifier of the output to request and parse.
-     *     Optional. If not provided, the first output will be requested.
-     * success - {Function} Callback to call when the process is complete.
-     *     This function is called with an outputs object as argument, which
-     *     will have a property with the identifier of the requested output
-     *     (or 'result' if output was not configured). For processes that
-     *     generate spatial output, the value will be an array of
-     *     <OpenLayers.Feature.Vector> instances.
-     * scope - {Object} Optional scope for the success callback.
-     */
-    execute: function(options) {
-        this.configure({
-            inputs: options.inputs,
-            callback: function() {
-                var me = this;
-                //TODO For now we only deal with a single output
-                var outputIndex = this.getOutputIndex(
-                    me.description.processOutputs, options.output
-                );
-                me.setResponseForm({outputIndex: outputIndex});
-                (function callback() {
-                    OpenLayers.Util.removeItem(me.executeCallbacks, callback);
-                    if (me.chained !== 0) {
-                        // need to wait until chained processes have a
-                        // description and configuration - see chainProcess
-                        me.executeCallbacks.push(callback);
-                        return;
-                    }
-                    // all chained processes are added as references now, so
-                    // let's proceed.
-                    OpenLayers.Request.POST({
-                        url: me.client.servers[me.server].url,
-                        data: new OpenLayers.Format.WPSExecute().write(me.description),
-                        success: function(response) {
-                            var output = me.description.processOutputs[outputIndex];
-                            var mimeType = me.findMimeType(
-                                output.complexOutput.supported.formats
-                            );
-                            //TODO For now we assume a spatial output
-                            var features = me.formats[mimeType].read(response.responseText);
-                            if (features instanceof OpenLayers.Feature.Vector) {
-                                features = [features];
-                            }
-                            if (options.success) {
-                                var outputs = {};
-                                outputs[options.output || 'result'] = features;
-                                options.success.call(options.scope, outputs);
-                            }
-                        },
-                        scope: me
-                    });
-                })();
-            },
-            scope: this
-        });
-    },
-    
-    /**
-     * APIMethod: output
-     * Chain an output of a configured process (see <configure>) as input to
-     * another process.
-     *
-     * (code)
-     * intersect = client.getProcess('opengeo', 'JTS:intersection');    
-     * intersect.configure({
-     *     // ...
-     * });
-     * buffer = client.getProcess('opengeo', 'JTS:buffer');
-     * buffer.execute({
-     *     inputs: {
-     *         geom: intersect.output('result'), // <-- here we're chaining
-     *         distance: 1
-     *     },
-     *     // ...
-     * });
-     * (end)
-     *
-     * Parameters:
-     * identifier - {String} Identifier of the output that we're chaining. If
-     *     not provided, the first output will be used.
-     */
-    output: function(identifier) {
-        return new OpenLayers.WPSProcess.ChainLink({
-            process: this,
-            output: identifier
-        });
-    },
-    
-    /**
-     * Method: parseDescription
-     * Parses the DescribeProcess response
-     *
-     * Parameters:
-     * description - {Object}
-     */
-    parseDescription: function(description) {
-        var server = this.client.servers[this.server];
-        this.description = new OpenLayers.Format.WPSDescribeProcess()
-            .read(server.processDescription[this.identifier])
-            .processDescriptions[this.identifier];
-    },
-    
-    /**
-     * Method: setInputData
-     * Sets the data for a single input
-     *
-     * Parameters:
-     * input - {Object}  An entry from the dataInputs array of the process
-     *     description.
-     * data - {Mixed} For spatial data inputs, this is usually an
-     *     <OpenLayers.Geometry>, an <OpenLayers.Feature.Vector> or an array of
-     *     geometries or features.
-     */
-    setInputData: function(input, data) {
-        // clear any previous data
-        delete input.data;
-        delete input.reference;
-        if (data instanceof OpenLayers.WPSProcess.ChainLink) {
-            ++this.chained;
-            input.reference = {
-                method: 'POST',
-                href: data.process.server === this.server ?
-                    this.localWPS : this.client.servers[data.process.server].url
-            };
-            data.process.describe({
-                callback: function() {
-                    --this.chained;
-                    this.chainProcess(input, data);
-                },
-                scope: this
-            });
-        } else {
-            input.data = {};
-            var complexData = input.complexData;
-            if (complexData) {
-                var format = this.findMimeType(complexData.supported.formats);
-                input.data.complexData = {
-                    mimeType: format,
-                    value: this.formats[format].write(this.toFeatures(data))
-                };
-            } else {
-                input.data.literalData = {
-                    value: data
-                };
-            }
-        }
-    },
-    
-    /**
-     * Method: setResponseForm
-     * Sets the responseForm property of the <execute> payload.
-     *
-     * Parameters:
-     * options - {Object} See below.
-     *
-     * Available options:
-     * outputIndex - {Integer} The index of the output to use. Optional.
-     * supportedFormats - {Object} Object with supported mime types as key,
-     *     and true as value for supported types. Optional.
-     */
-    setResponseForm: function(options) {
-        options = options || {};
-        var output = this.description.processOutputs[options.outputIndex || 0];
-        this.description.responseForm = {
-            rawDataOutput: {
-                identifier: output.identifier,
-                mimeType: this.findMimeType(output.complexOutput.supported.formats, options.supportedFormats)
-            }
-        };
-    },
-    
-    /**
-     * Method: getOutputIndex
-     * Gets the index of a processOutput by its identifier
-     *
-     * Parameters:
-     * outputs - {Array} The processOutputs array to look at
-     * identifier - {String} The identifier of the output
-     *
-     * Returns
-     * {Integer} The index of the processOutput with the provided identifier
-     *     in the outputs array.
-     */
-    getOutputIndex: function(outputs, identifier) {
-        var output;
-        if (identifier) {
-            for (var i=outputs.length-1; i>=0; --i) {
-                if (outputs[i].identifier === identifier) {
-                    output = i;
-                    break;
-                }
-            }
-        } else {
-            output = 0;
-        }
-        return output;
-    },
-    
-    /**
-     * Method: chainProcess
-     * Sets a fully configured chained process as input for this process.
-     *
-     * Parameters:
-     * input - {Object} The dataInput that the chained process provides.
-     * chainLink - {<OpenLayers.WPSProcess.ChainLink>} The process to chain.
-     */
-    chainProcess: function(input, chainLink) {
-        var output = this.getOutputIndex(
-            chainLink.process.description.processOutputs, chainLink.output
-        );
-        input.reference.mimeType = this.findMimeType(
-            input.complexData.supported.formats,
-            chainLink.process.description.processOutputs[output].complexOutput.supported.formats
-        );
-        var formats = {};
-        formats[input.reference.mimeType] = true;
-        chainLink.process.setResponseForm({
-            outputIndex: output,
-            supportedFormats: formats
-        });
-        input.reference.body = chainLink.process.description;
-        while (this.executeCallbacks.length > 0) {
-            this.executeCallbacks[0]();
-        }
-    },
-    
-    /**
-     * Method: toFeatures
-     * Converts spatial input into features so it can be processed by
-     * <OpenLayers.Format> instances.
-     *
-     * Parameters:
-     * source - {Mixed} An <OpenLayers.Geometry>, an
-     *     <OpenLayers.Feature.Vector>, or an array of geometries or features
-     *
-     * Returns:
-     * {Array(<OpenLayers.Feature.Vector>)}
-     */
-    toFeatures: function(source) {
-        var isArray = OpenLayers.Util.isArray(source);
-        if (!isArray) {
-            source = [source];
-        }
-        var target = new Array(source.length),
-            current;
-        for (var i=0, ii=source.length; i<ii; ++i) {
-            current = source[i];
-            target[i] = current instanceof OpenLayers.Feature.Vector ?
-                current : new OpenLayers.Feature.Vector(current);
-        }
-        return isArray ? target : target[0];
-    },
-    
-    /**
-     * Method: findMimeType
-     * Finds a supported mime type.
-     *
-     * Parameters:
-     * sourceFormats - {Object} An object literal with mime types as key and
-     *     true as value for supported formats.
-     * targetFormats - {Object} Like <sourceFormats>, but optional to check for
-     *     supported mime types on a different target than this process.
-     *     Default is to check against this process's supported formats.
-     *
-     * Returns:
-     * {String} A supported mime type.
-     */
-    findMimeType: function(sourceFormats, targetFormats) {
-        targetFormats = targetFormats || this.formats;
-        for (var f in sourceFormats) {
-            if (f in targetFormats) {
-                return f;
-            }
-        }
-    },
-    
-    CLASS_NAME: "OpenLayers.WPSProcess"
-    
-});
-
-/**
- * Class: OpenLayers.WPSProcess.ChainLink
- * Type for chaining processes.
- */
-OpenLayers.WPSProcess.ChainLink = OpenLayers.Class({
-    
-    /**
-     * Property: process
-     * {<OpenLayers.WPSProcess>} The process to chain
-     */
-    process: null,
-    
-    /**
-     * Property: output
-     * {String} The output identifier of the output we are going to use as
-     *     input for another process.
-     */
-    output: null,
-    
-    /**
-     * Constructor: OpenLayers.WPSProcess.ChainLink
-     *
-     * Parameters:
-     * options - {Object} Properties to set on the instance.
-     */
-    initialize: function(options) {
-        OpenLayers.Util.extend(this, options);
-    },
-    
-    CLASS_NAME: "OpenLayers.WPSProcess.ChainLink"
-    
-});
diff --git a/#pma/js/openlayers/src/openlayers/lib/Rico/Color.js b/#pma/js/openlayers/src/openlayers/lib/Rico/Color.js
deleted file mode 100644
index 7d9ab6f5..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/Rico/Color.js
+++ /dev/null
@@ -1,253 +0,0 @@
-/** 
- * @requires Rico/license.js
- * @requires OpenLayers/Console.js
- * @requires OpenLayers/BaseTypes/Class.js
- * @requires OpenLayers/BaseTypes/Element.js
- */
-
-
-/*
- * This file has been edited substantially from the Rico-released version by
- * the OpenLayers development team.
- */
-
-OpenLayers.Console.warn("OpenLayers.Rico is deprecated");
-
-OpenLayers.Rico = OpenLayers.Rico || {};
-OpenLayers.Rico.Color = OpenLayers.Class({
-
-   initialize: function(red, green, blue) {
-      this.rgb = { r: red, g : green, b : blue };
-   },
-
-   setRed: function(r) {
-      this.rgb.r = r;
-   },
-
-   setGreen: function(g) {
-      this.rgb.g = g;
-   },
-
-   setBlue: function(b) {
-      this.rgb.b = b;
-   },
-
-   setHue: function(h) {
-
-      // get an HSB model, and set the new hue...
-      var hsb = this.asHSB();
-      hsb.h = h;
-
-      // convert back to RGB...
-      this.rgb = OpenLayers.Rico.Color.HSBtoRGB(hsb.h, hsb.s, hsb.b);
-   },
-
-   setSaturation: function(s) {
-      // get an HSB model, and set the new hue...
-      var hsb = this.asHSB();
-      hsb.s = s;
-
-      // convert back to RGB and set values...
-      this.rgb = OpenLayers.Rico.Color.HSBtoRGB(hsb.h, hsb.s, hsb.b);
-   },
-
-   setBrightness: function(b) {
-      // get an HSB model, and set the new hue...
-      var hsb = this.asHSB();
-      hsb.b = b;
-
-      // convert back to RGB and set values...
-      this.rgb = OpenLayers.Rico.Color.HSBtoRGB( hsb.h, hsb.s, hsb.b );
-   },
-
-   darken: function(percent) {
-      var hsb  = this.asHSB();
-      this.rgb = OpenLayers.Rico.Color.HSBtoRGB(hsb.h, hsb.s, Math.max(hsb.b - percent,0));
-   },
-
-   brighten: function(percent) {
-      var hsb  = this.asHSB();
-      this.rgb = OpenLayers.Rico.Color.HSBtoRGB(hsb.h, hsb.s, Math.min(hsb.b + percent,1));
-   },
-
-   blend: function(other) {
-      this.rgb.r = Math.floor((this.rgb.r + other.rgb.r)/2);
-      this.rgb.g = Math.floor((this.rgb.g + other.rgb.g)/2);
-      this.rgb.b = Math.floor((this.rgb.b + other.rgb.b)/2);
-   },
-
-   isBright: function() {
-      var hsb = this.asHSB();
-      return this.asHSB().b > 0.5;
-   },
-
-   isDark: function() {
-      return ! this.isBright();
-   },
-
-   asRGB: function() {
-      return "rgb(" + this.rgb.r + "," + this.rgb.g + "," + this.rgb.b + ")";
-   },
-
-   asHex: function() {
-      return "#" + this.rgb.r.toColorPart() + this.rgb.g.toColorPart() + this.rgb.b.toColorPart();
-   },
-
-   asHSB: function() {
-      return OpenLayers.Rico.Color.RGBtoHSB(this.rgb.r, this.rgb.g, this.rgb.b);
-   },
-
-   toString: function() {
-      return this.asHex();
-   }
-
-});
-
-OpenLayers.Rico.Color.createFromHex = function(hexCode) {
-  if(hexCode.length==4) {
-    var shortHexCode = hexCode; 
-    var hexCode = '#';
-    for(var i=1;i<4;i++) { 
-        hexCode += (shortHexCode.charAt(i) + 
-shortHexCode.charAt(i)); 
-    }
-  }
-   if ( hexCode.indexOf('#') == 0 ) {
-       hexCode = hexCode.substring(1);
-   }
-   var red   = hexCode.substring(0,2);
-   var green = hexCode.substring(2,4);
-   var blue  = hexCode.substring(4,6);
-   return new OpenLayers.Rico.Color( parseInt(red,16), parseInt(green,16), parseInt(blue,16) );
-};
-
-/**
- * Factory method for creating a color from the background of
- * an HTML element.
- */
-OpenLayers.Rico.Color.createColorFromBackground = function(elem) {
-
-   var actualColor = 
-      OpenLayers.Element.getStyle(OpenLayers.Util.getElement(elem), 
-                                        "backgroundColor");
-
-   if ( actualColor == "transparent" && elem.parentNode ) {
-      return OpenLayers.Rico.Color.createColorFromBackground(elem.parentNode);
-   }
-   if ( actualColor == null ) {
-      return new OpenLayers.Rico.Color(255,255,255);
-   }
-   if ( actualColor.indexOf("rgb(") == 0 ) {
-      var colors = actualColor.substring(4, actualColor.length - 1 );
-      var colorArray = colors.split(",");
-      return new OpenLayers.Rico.Color( parseInt( colorArray[0] ),
-                            parseInt( colorArray[1] ),
-                            parseInt( colorArray[2] )  );
-
-   }
-   else if ( actualColor.indexOf("#") == 0 ) {
-      return OpenLayers.Rico.Color.createFromHex(actualColor);
-   }
-   else {
-      return new OpenLayers.Rico.Color(255,255,255);
-   }
-};
-
-OpenLayers.Rico.Color.HSBtoRGB = function(hue, saturation, brightness) {
-
-   var red   = 0;
-    var green = 0;
-    var blue  = 0;
-
-   if (saturation == 0) {
-      red = parseInt(brightness * 255.0 + 0.5);
-       green = red;
-       blue = red;
-    }
-    else {
-      var h = (hue - Math.floor(hue)) * 6.0;
-      var f = h - Math.floor(h);
-      var p = brightness * (1.0 - saturation);
-      var q = brightness * (1.0 - saturation * f);
-      var t = brightness * (1.0 - (saturation * (1.0 - f)));
-
-      switch (parseInt(h)) {
-         case 0:
-            red   = (brightness * 255.0 + 0.5);
-            green = (t * 255.0 + 0.5);
-            blue  = (p * 255.0 + 0.5);
-            break;
-         case 1:
-            red   = (q * 255.0 + 0.5);
-            green = (brightness * 255.0 + 0.5);
-            blue  = (p * 255.0 + 0.5);
-            break;
-         case 2:
-            red   = (p * 255.0 + 0.5);
-            green = (brightness * 255.0 + 0.5);
-            blue  = (t * 255.0 + 0.5);
-            break;
-         case 3:
-            red   = (p * 255.0 + 0.5);
-            green = (q * 255.0 + 0.5);
-            blue  = (brightness * 255.0 + 0.5);
-            break;
-         case 4:
-            red   = (t * 255.0 + 0.5);
-            green = (p * 255.0 + 0.5);
-            blue  = (brightness * 255.0 + 0.5);
-            break;
-          case 5:
-            red   = (brightness * 255.0 + 0.5);
-            green = (p * 255.0 + 0.5);
-            blue  = (q * 255.0 + 0.5);
-            break;
-        }
-    }
-
-   return { r : parseInt(red), g : parseInt(green) , b : parseInt(blue) };
-};
-
-OpenLayers.Rico.Color.RGBtoHSB = function(r, g, b) {
-
-   var hue;
-   var saturation;
-   var brightness;
-
-   var cmax = (r > g) ? r : g;
-   if (b > cmax) {
-      cmax = b;
-   }
-   var cmin = (r < g) ? r : g;
-   if (b < cmin) {
-      cmin = b;
-   }
-   brightness = cmax / 255.0;
-   if (cmax != 0) {
-      saturation = (cmax - cmin)/cmax;
-   } else {
-      saturation = 0;
-   }
-   if (saturation == 0) {
-      hue = 0;
-   } else {
-      var redc   = (cmax - r)/(cmax - cmin);
-        var greenc = (cmax - g)/(cmax - cmin);
-        var bluec  = (cmax - b)/(cmax - cmin);
-
-        if (r == cmax) {
-           hue = bluec - greenc;
-        } else if (g == cmax) {
-           hue = 2.0 + redc - bluec;
-      } else {
-           hue = 4.0 + greenc - redc;
-      }
-        hue = hue / 6.0;
-        if (hue < 0) {
-           hue = hue + 1.0;
-        }
-   }
-
-   return { h : hue, s : saturation, b : brightness };
-};
-
diff --git a/#pma/js/openlayers/src/openlayers/lib/Rico/Corner.js b/#pma/js/openlayers/src/openlayers/lib/Rico/Corner.js
deleted file mode 100644
index e5479e5b..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/Rico/Corner.js
+++ /dev/null
@@ -1,339 +0,0 @@
-/**
- * @requires OpenLayers/Console.js
- * @requires Rico/Color.js
- */
-
-
-/*
- * This file has been edited substantially from the Rico-released
- * version by the OpenLayers development team.
- *  
- *  Copyright 2005 Sabre Airline Solutions  
- *  
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the
- *  License. You may obtain a copy of the License at
- *  
- *         http://www.apache.org/licenses/LICENSE-2.0  
- *  
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the * License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, * either express or
- * implied. See the License for the specific language governing
- * permissions * and limitations under the License.
- *
- */
-
-OpenLayers.Console.warn("OpenLayers.Rico is deprecated");
-
-OpenLayers.Rico = OpenLayers.Rico || {};
-OpenLayers.Rico.Corner = {
-
-    round: function(e, options) {
-        e = OpenLayers.Util.getElement(e);
-        this._setOptions(options);
-
-        var color = this.options.color;
-        if ( this.options.color == "fromElement" ) {
-            color = this._background(e);
-        }
-        var bgColor = this.options.bgColor;
-        if ( this.options.bgColor == "fromParent" ) {
-            bgColor = this._background(e.offsetParent);
-        }
-        this._roundCornersImpl(e, color, bgColor);
-    },
-
-    /**   This is a helper function to change the background
-    *     color of <div> that has had Rico rounded corners added.
-    *
-    *     It seems we cannot just set the background color for the
-    *     outer <div> so each <span> element used to create the
-    *     corners must have its background color set individually.
-    *
-    * @param {DOM} theDiv - A child of the outer <div> that was
-    *                        supplied to the `round` method.
-    *
-    * @param {String} newColor - The new background color to use.
-    */
-    changeColor: function(theDiv, newColor) {
-   
-        theDiv.style.backgroundColor = newColor;
-
-        var spanElements = theDiv.parentNode.getElementsByTagName("span");
-        
-        for (var currIdx = 0; currIdx < spanElements.length; currIdx++) {
-            spanElements[currIdx].style.backgroundColor = newColor;
-        }
-    }, 
-
-
-    /**   This is a helper function to change the background
-    *     opacity of <div> that has had Rico rounded corners added.
-    *
-    *     See changeColor (above) for algorithm explanation
-    *
-    * @param {DOM} theDiv A child of the outer <div> that was
-    *                        supplied to the `round` method.
-    *
-    * @param {int} newOpacity The new opacity to use (0-1).
-    */
-    changeOpacity: function(theDiv, newOpacity) {
-   
-        var mozillaOpacity = newOpacity;
-        var ieOpacity = 'alpha(opacity=' + newOpacity * 100 + ')';
-        
-        theDiv.style.opacity = mozillaOpacity;
-        theDiv.style.filter = ieOpacity;
-
-        var spanElements = theDiv.parentNode.getElementsByTagName("span");
-        
-        for (var currIdx = 0; currIdx < spanElements.length; currIdx++) {
-            spanElements[currIdx].style.opacity = mozillaOpacity;
-            spanElements[currIdx].style.filter = ieOpacity;
-        }
-
-    },
-
-    /** this function takes care of redoing the rico cornering
-    *    
-    *    you can't just call updateRicoCorners() again and pass it a 
-    *    new options string. you have to first remove the divs that 
-    *    rico puts on top and below the content div.
-    *
-    * @param {DOM} theDiv - A child of the outer <div> that was
-    *                        supplied to the `round` method.
-    *
-    * @param {Object} options - list of options
-    */
-    reRound: function(theDiv, options) {
-
-        var topRico = theDiv.parentNode.childNodes[0];
-        //theDiv would be theDiv.parentNode.childNodes[1]
-        var bottomRico = theDiv.parentNode.childNodes[2];
-       
-        theDiv.parentNode.removeChild(topRico);
-        theDiv.parentNode.removeChild(bottomRico); 
-
-        this.round(theDiv.parentNode, options);
-    }, 
-
-   _roundCornersImpl: function(e, color, bgColor) {
-      if(this.options.border) {
-         this._renderBorder(e,bgColor);
-      }
-      if(this._isTopRounded()) {
-         this._roundTopCorners(e,color,bgColor);
-      }
-      if(this._isBottomRounded()) {
-         this._roundBottomCorners(e,color,bgColor);
-      }
-   },
-
-   _renderBorder: function(el,bgColor) {
-      var borderValue = "1px solid " + this._borderColor(bgColor);
-      var borderL = "border-left: "  + borderValue;
-      var borderR = "border-right: " + borderValue;
-      var style   = "style='" + borderL + ";" + borderR +  "'";
-      el.innerHTML = "<div " + style + ">" + el.innerHTML + "</div>";
-   },
-
-   _roundTopCorners: function(el, color, bgColor) {
-      var corner = this._createCorner(bgColor);
-      for(var i=0 ; i < this.options.numSlices ; i++ ) {
-         corner.appendChild(this._createCornerSlice(color,bgColor,i,"top"));
-      }
-      el.style.paddingTop = 0;
-      el.insertBefore(corner,el.firstChild);
-   },
-
-   _roundBottomCorners: function(el, color, bgColor) {
-      var corner = this._createCorner(bgColor);
-      for(var i=(this.options.numSlices-1) ; i >= 0 ; i-- ) {
-         corner.appendChild(this._createCornerSlice(color,bgColor,i,"bottom"));
-      }
-      el.style.paddingBottom = 0;
-      el.appendChild(corner);
-   },
-
-   _createCorner: function(bgColor) {
-      var corner = document.createElement("div");
-      corner.style.backgroundColor = (this._isTransparent() ? "transparent" : bgColor);
-      return corner;
-   },
-
-   _createCornerSlice: function(color,bgColor, n, position) {
-      var slice = document.createElement("span");
-
-      var inStyle = slice.style;
-      inStyle.backgroundColor = color;
-      inStyle.display  = "block";
-      inStyle.height   = "1px";
-      inStyle.overflow = "hidden";
-      inStyle.fontSize = "1px";
-
-      var borderColor = this._borderColor(color,bgColor);
-      if ( this.options.border && n == 0 ) {
-         inStyle.borderTopStyle    = "solid";
-         inStyle.borderTopWidth    = "1px";
-         inStyle.borderLeftWidth   = "0px";
-         inStyle.borderRightWidth  = "0px";
-         inStyle.borderBottomWidth = "0px";
-         inStyle.height            = "0px"; // assumes css compliant box model
-         inStyle.borderColor       = borderColor;
-      }
-      else if(borderColor) {
-         inStyle.borderColor = borderColor;
-         inStyle.borderStyle = "solid";
-         inStyle.borderWidth = "0px 1px";
-      }
-
-      if ( !this.options.compact && (n == (this.options.numSlices-1)) ) {
-         inStyle.height = "2px";
-      }
-      this._setMargin(slice, n, position);
-      this._setBorder(slice, n, position);
-      return slice;
-   },
-
-   _setOptions: function(options) {
-      this.options = {
-         corners : "all",
-         color   : "fromElement",
-         bgColor : "fromParent",
-         blend   : true,
-         border  : false,
-         compact : false
-      };
-      OpenLayers.Util.extend(this.options, options || {});
-
-      this.options.numSlices = this.options.compact ? 2 : 4;
-      if ( this._isTransparent() ) {
-         this.options.blend = false;
-      }
-   },
-
-   _whichSideTop: function() {
-      if ( this._hasString(this.options.corners, "all", "top") ) {
-         return "";
-      }
-      if ( this.options.corners.indexOf("tl") >= 0 && this.options.corners.indexOf("tr") >= 0 ) {
-         return "";
-      }
-      if (this.options.corners.indexOf("tl") >= 0) {
-         return "left";
-      } else if (this.options.corners.indexOf("tr") >= 0) {
-          return "right";
-      }
-      return "";
-   },
-
-   _whichSideBottom: function() {
-      if ( this._hasString(this.options.corners, "all", "bottom") ) {
-         return "";
-      }
-      if ( this.options.corners.indexOf("bl")>=0 && this.options.corners.indexOf("br")>=0 ) {
-         return "";
-      }
-
-      if(this.options.corners.indexOf("bl") >=0) {
-         return "left";
-      } else if(this.options.corners.indexOf("br")>=0) {
-         return "right";
-      }
-      return "";
-   },
-
-   _borderColor : function(color,bgColor) {
-      if ( color == "transparent" ) {
-         return bgColor;
-      } else if ( this.options.border ) {
-         return this.options.border;
-      } else if ( this.options.blend ) {
-         return this._blend( bgColor, color );
-      } else {
-         return "";
-      }
-   },
-
-
-   _setMargin: function(el, n, corners) {
-      var marginSize = this._marginSize(n);
-      var whichSide = corners == "top" ? this._whichSideTop() : this._whichSideBottom();
-
-      if ( whichSide == "left" ) {
-         el.style.marginLeft = marginSize + "px"; el.style.marginRight = "0px";
-      }
-      else if ( whichSide == "right" ) {
-         el.style.marginRight = marginSize + "px"; el.style.marginLeft  = "0px";
-      }
-      else {
-         el.style.marginLeft = marginSize + "px"; el.style.marginRight = marginSize + "px";
-      }
-   },
-
-   _setBorder: function(el,n,corners) {
-      var borderSize = this._borderSize(n);
-      var whichSide = corners == "top" ? this._whichSideTop() : this._whichSideBottom();
-      if ( whichSide == "left" ) {
-         el.style.borderLeftWidth = borderSize + "px"; el.style.borderRightWidth = "0px";
-      }
-      else if ( whichSide == "right" ) {
-         el.style.borderRightWidth = borderSize + "px"; el.style.borderLeftWidth  = "0px";
-      }
-      else {
-         el.style.borderLeftWidth = borderSize + "px"; el.style.borderRightWidth = borderSize + "px";
-      }
-      if (this.options.border != false) {
-        el.style.borderLeftWidth = borderSize + "px"; el.style.borderRightWidth = borderSize + "px";
-      }
-   },
-
-   _marginSize: function(n) {
-      if ( this._isTransparent() ) {
-         return 0;
-      }
-      var marginSizes          = [ 5, 3, 2, 1 ];
-      var blendedMarginSizes   = [ 3, 2, 1, 0 ];
-      var compactMarginSizes   = [ 2, 1 ];
-      var smBlendedMarginSizes = [ 1, 0 ];
-
-      if ( this.options.compact && this.options.blend ) {
-         return smBlendedMarginSizes[n];
-      } else if ( this.options.compact ) {
-         return compactMarginSizes[n];
-      } else if ( this.options.blend ) {
-         return blendedMarginSizes[n];
-      } else {
-         return marginSizes[n];
-      }
-   },
-
-   _borderSize: function(n) {
-      var transparentBorderSizes = [ 5, 3, 2, 1 ];
-      var blendedBorderSizes     = [ 2, 1, 1, 1 ];
-      var compactBorderSizes     = [ 1, 0 ];
-      var actualBorderSizes      = [ 0, 2, 0, 0 ];
-
-      if ( this.options.compact && (this.options.blend || this._isTransparent()) ) {
-         return 1;
-      } else if ( this.options.compact ) {
-         return compactBorderSizes[n];
-      } else if ( this.options.blend ) {
-         return blendedBorderSizes[n];
-      } else if ( this.options.border ) {
-         return actualBorderSizes[n];
-      } else if ( this._isTransparent() ) {
-         return transparentBorderSizes[n];
-      }
-      return 0;
-   },
-
-   _hasString: function(str) { for(var i=1 ; i<arguments.length ; i++) if (str.indexOf(arguments[i]) >= 0) { return true; } return false; },
-   _blend: function(c1, c2) { var cc1 = OpenLayers.Rico.Color.createFromHex(c1); cc1.blend(OpenLayers.Rico.Color.createFromHex(c2)); return cc1; },
-   _background: function(el) { try { return OpenLayers.Rico.Color.createColorFromBackground(el).asHex(); } catch(err) { return "#ffffff"; } },
-   _isTransparent: function() { return this.options.color == "transparent"; },
-   _isTopRounded: function() { return this._hasString(this.options.corners, "all", "top", "tl", "tr"); },
-   _isBottomRounded: function() { return this._hasString(this.options.corners, "all", "bottom", "bl", "br"); },
-   _hasSingleTextChild: function(el) { return el.childNodes.length == 1 && el.childNodes[0].nodeType == 3; }
-};
diff --git a/#pma/js/openlayers/src/openlayers/lib/Rico/license.js b/#pma/js/openlayers/src/openlayers/lib/Rico/license.js
deleted file mode 100644
index aad5cf3a..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/Rico/license.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @license Apache 2 
- *  
- * Contains portions of Rico <http://openrico.org/>
- * 
- * Copyright 2005 Sabre Airline Solutions  
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you
- * may not use this file except in compliance with the License. You
- * may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0  
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * permissions and limitations under the License. 
- */
diff --git a/#pma/js/openlayers/src/openlayers/lib/deprecated.js b/#pma/js/openlayers/src/openlayers/lib/deprecated.js
deleted file mode 100644
index a492faa5..00000000
--- a/#pma/js/openlayers/src/openlayers/lib/deprecated.js
+++ /dev/null
@@ -1,5842 +0,0 @@
-/**
- * @requires OpenLayers/BaseTypes/Class.js
- * @requires OpenLayers/Util.js
- * @requires OpenLayers/Control.js
- * @requires OpenLayers/Format.js
- * @requires OpenLayers/Request.js
- * @requires OpenLayers/Layer/WMS.js
- * @requires OpenLayers/Layer/MapServer.js
- * @requires OpenLayers/Tile.js
- * @requires OpenLayers/Request/XMLHttpRequest.js
- * @requires OpenLayers/Layer/Vector.js
- * @requires OpenLayers/Layer/Markers.js
- * @requires OpenLayers/Console.js
- * @requires OpenLayers/Lang.js
- * @requires OpenLayers/Feature.js
- * @requires OpenLayers/Layer/EventPane.js
- * @requires OpenLayers/Layer/FixedZoomLevels.js
- * @requires OpenLayers/Layer/SphericalMercator.js
- * @requires OpenLayers/Protocol.js
- * @requires OpenLayers/Format/JSON.js
- * @requires OpenLayers/Format/WKT.js
- * @requires OpenLayers/Format/XML.js
- * @requires OpenLayers/Geometry.js
- * @requires OpenLayers/Renderer/Elements.js
- * @requires OpenLayers/Popup/Anchored.js
- * @requires Rico/Corner.js
- */
-
-/**
- * About: Deprecated
- * The deprecated.js script includes all methods, properties, and constructors
- * that are not supported as part of the long-term API.  If you use any of
- * these, you have to explicitly include this script in your application.
- *
- * For example:
- * (code)
- *     <script src="deprecated.js" type="text/javascript"></script>
- * (end)
- *
- * You are strongly encouraged to avoid using deprecated functionality.  The
- * documentation here should point you to the supported alternatives.
- */
-
-/**
- * Namespace: OpenLayers.Class
- */
-
-/**
- * Property: isPrototype
- * *Deprecated*.  This is no longer needed and will be removed at 3.0.
- */
-OpenLayers.Class.isPrototype = function () {};
-
-/**
- * APIFunction: OpenLayers.create
- * *Deprecated*.  Old method to create an OpenLayers style class.  Use the
- *     <OpenLayers.Class> constructor instead.
- *
- * Returns:
- * An OpenLayers class
- */
-OpenLayers.Class.create = function() {
-    return function() {
-        if (arguments && arguments[0] != OpenLayers.Class.isPrototype) {
-            this.initialize.apply(this, arguments);
-        }
-    };
-};
-
-/**
- * APIFunction: inherit
- * *Deprecated*.  Old method to inherit from one or more OpenLayers style
- *     classes.  Use the <OpenLayers.Class> constructor instead.
- *
- * Parameters:
- * class - One or more classes can be provided as arguments
- *
- * Returns:
- * An object prototype
- */
-OpenLayers.Class.inherit = function (P) {
-    var C = function() {
-       P.call(this);
-    };
-    var newArgs = [C].concat(Array.prototype.slice.call(arguments));
-    OpenLayers.inherit.apply(null, newArgs);
-    return C.prototype;
-};
-
-/**
- * Namespace: OpenLayers.Util
- */
-
-/**
- * Function: clearArray
- * *Deprecated*. This function will disappear in 3.0.
- * Please use "array.length = 0" instead.
- * 
- * Parameters:
- * array - {Array}
- */
-OpenLayers.Util.clearArray = function(array) {
-    OpenLayers.Console.warn(
-        OpenLayers.i18n(
-            "methodDeprecated", {'newMethod': 'array = []'}
-        )
-    );
-    array.length = 0;
-};
-
-/**
- * Function: setOpacity
- * *Deprecated*.  This function has been deprecated. Instead, please use 
- *     <OpenLayers.Util.modifyDOMElement> 
- *     or 
- *     <OpenLayers.Util.modifyAlphaImageDiv>
- * 
- * Set the opacity of a DOM Element
- *     Note that for this function to work in IE, elements must "have layout"
- *     according to:
- *     http://msdn.microsoft.com/workshop/author/dhtml/reference/properties/haslayout.asp
- *
- * Parameters:
- * element - {DOMElement} Set the opacity on this DOM element
- * opacity - {Float} Opacity value (0.0 - 1.0)
- */
-OpenLayers.Util.setOpacity = function(element, opacity) {
-    OpenLayers.Util.modifyDOMElement(element, null, null, null,
-                                     null, null, null, opacity);
-};
-
-/**
- * Function: safeStopPropagation
- * *Deprecated*. This function has been deprecated. Please use directly 
- *     <OpenLayers.Event.stop> passing 'true' as the 2nd 
- *     argument (preventDefault)
- * 
- * Safely stop the propagation of an event *without* preventing
- *   the default browser action from occurring.
- * 
- * Parameters:
- * evt - {Event}
- */
-OpenLayers.Util.safeStopPropagation = function(evt) {
-    OpenLayers.Event.stop(evt, true);
-};
-
-/**
- * Function: getArgs
- * *Deprecated*.  Will be removed in 3.0.  Please use instead
- *     <OpenLayers.Util.getParameters>
- * 
- * Parameters:
- * url - {String} Optional url used to extract the query string.
- *                If null, query string is taken from page location.
- * 
- * Returns:
- * {Object} An object of key/value pairs from the query string.
- */
-OpenLayers.Util.getArgs = function(url) {
-    OpenLayers.Console.warn(
-        OpenLayers.i18n(
-            "methodDeprecated", {'newMethod': 'OpenLayers.Util.getParameters'}
-        )
-    );
-    return OpenLayers.Util.getParameters(url);
-};
-
-/** 
- * Maintain existing definition of $.
- * 
- * The use of our $-method is deprecated and the mapping of 
- * OpenLayers.Util.getElement will eventually be removed. Do not depend on 
- * window.$ being defined by OpenLayers.
- */
-if(typeof window.$  === "undefined") {
-    window.$ = OpenLayers.Util.getElement;
-}
-
-/**
- * Namespace: OpenLayers.Ajax
- */
-
-/**
- * Function: OpenLayers.nullHandler
- * @param {} request
- */
-OpenLayers.nullHandler = function(request) {
-    OpenLayers.Console.userError(OpenLayers.i18n("unhandledRequest", {'statusText':request.statusText}));
-};
-
-/** 
- * APIFunction: OpenLayers.loadURL
- * Background load a document.
- * *Deprecated*.  Use <OpenLayers.Request.GET> method instead.
- *
- * Parameters:
- * uri - {String} URI of source doc
- * params - {String} or {Object} GET params. Either a string in the form
- *     "?hello=world&foo=bar" (do not forget the leading question mark)
- *     or an object in the form {'hello': 'world', 'foo': 'bar}
- * caller - {Object} object which gets callbacks
- * onComplete - {Function} Optional callback for success.  The callback
- *     will be called with this set to caller and will receive the request
- *     object as an argument.  Note that if you do not specify an onComplete
- *     function, <OpenLayers.nullHandler> will be called (which pops up a 
- *     user friendly error message dialog).
- * onFailure - {Function} Optional callback for failure.  In the event of
- *     a failure, the callback will be called with this set to caller and will
- *     receive the request object as an argument.  Note that if you do not
- *     specify an onComplete function, <OpenLayers.nullHandler> will be called
- *     (which pops up a user friendly error message dialog).
- *
- * Returns:
- * {<OpenLayers.Request.XMLHttpRequest>}  The request object. To abort loading,
- *     call request.abort().
- */
-OpenLayers.loadURL = function(uri, params, caller,
-                                  onComplete, onFailure) {
-    
-    if(typeof params == 'string') {
-        params = OpenLayers.Util.getParameters(params);
-    }
-    var success = (onComplete) ? onComplete : OpenLayers.nullHandler;
-    var failure = (onFailure) ? onFailure : OpenLayers.nullHandler;
-    
-    return OpenLayers.Request.GET({
-        url: uri, params: params,
-        success: success, failure: failure, scope: caller
-    });
-};
-
-/** 
- * Function: OpenLayers.parseXMLString
- * Parse XML into a doc structure
- * 
- * Parameters:
- * text - {String} 
- * 
- * Returns:
- * {?} Parsed AJAX Responsev
- */
-OpenLayers.parseXMLString = function(text) {
-
-    //MS sucks, if the server is bad it dies
-    var index = text.indexOf('<');
-    if (index > 0) {
-        text = text.substring(index);
-    }
-
-    var ajaxResponse = OpenLayers.Util.Try(
-        function() {
-            var xmldom = new ActiveXObject('Microsoft.XMLDOM');
-            xmldom.loadXML(text);
-            return xmldom;
-        },
-        function() {
-            return new DOMParser().parseFromString(text, 'text/xml');
-        },
-        function() {
-            var req = new XMLHttpRequest();
-            req.open("GET", "data:" + "text/xml" +
-                     ";charset=utf-8," + encodeURIComponent(text), false);
-            if (req.overrideMimeType) {
-                req.overrideMimeType("text/xml");
-            }
-            req.send(null);
-            return req.responseXML;
-        }
-    );
-
-    return ajaxResponse;
-};
-
-OpenLayers.Ajax = {
-
-    /**
-     * Method: emptyFunction
-     */
-    emptyFunction: function () {},
-
-    /**
-     * Method: getTransport
-     * 
-     * Returns: 
-     * {Object} Transport mechanism for whichever browser we're in, or false if
-     *          none available.
-     */
-    getTransport: function() {
-        return OpenLayers.Util.Try(
-            function() {return new XMLHttpRequest();},
-            function() {return new ActiveXObject('Msxml2.XMLHTTP');},
-            function() {return new ActiveXObject('Microsoft.XMLHTTP');}
-        ) || false;
-    },
-
-    /**
-     * Property: activeRequestCount
-     * {Integer}
-     */
-    activeRequestCount: 0
-};
-
-/**
- * Namespace: OpenLayers.Ajax.Responders
- * {Object}
- */
-OpenLayers.Ajax.Responders = {
-  
-    /**
-     * Property: responders
-     * {Array}
-     */
-    responders: [],
-
-    /**
-     * Method: register
-     *  
-     * Parameters:
-     * responderToAdd - {?}
-     */
-    register: function(responderToAdd) {
-        for (var i = 0; i < this.responders.length; i++){
-            if (responderToAdd == this.responders[i]){
-                return;
-            }
-        }
-        this.responders.push(responderToAdd);
-    },
-
-    /**
-     * Method: unregister
-     *  
-     * Parameters:
-     * responderToRemove - {?}
-     */
-    unregister: function(responderToRemove) {
-        OpenLayers.Util.removeItem(this.reponders, responderToRemove);
-    },
-
-    /**
-     * Method: dispatch
-     * 
-     * Parameters:
-     * callback - {?}
-     * request - {?}
-     * transport - {?}
-     */
-    dispatch: function(callback, request, transport) {
-        var responder;
-        for (var i = 0; i < this.responders.length; i++) {
-            responder = this.responders[i];
-     
-            if (responder[callback] && 
-                typeof responder[callback] == 'function') {
-                try {
-                    responder[callback].apply(responder, 
-                                              [request, transport]);
-                } catch (e) {}
-            }
-        }
-    }
-};
-
-OpenLayers.Ajax.Responders.register({
-    /** 
-     * Function: onCreate
-     */
-    onCreate: function() {
-        OpenLayers.Ajax.activeRequestCount++;
-    },
-
-    /**
-     * Function: onComplete
-     */
-     onComplete: function() {
-         OpenLayers.Ajax.activeRequestCount--;
-     }
-});
-
-/**
- * Class: OpenLayers.Ajax.Base
- */
-OpenLayers.Ajax.Base = OpenLayers.Class({
-      
-    /**
-     * Constructor: OpenLayers.Ajax.Base
-     * 
-     * Parameters: 
-     * options - {Object}
-     */
-    initialize: function(options) {
-        this.options = {
-            method:       'post',
-            asynchronous: true,
-            contentType:  'application/xml',
-            parameters:   ''
-        };
-        OpenLayers.Util.extend(this.options, options || {});
-        
-        this.options.method = this.options.method.toLowerCase();
-        
-        if (typeof this.options.parameters == 'string') {
-            this.options.parameters = 
-                OpenLayers.Util.getParameters(this.options.parameters);
-        }
-    }
-});
-
-/**
- * Class: OpenLayers.Ajax.Request
- * *Deprecated*.  Use <OpenLayers.Request> method instead.
- *
- * Inherit:
- *  - <OpenLayers.Ajax.Base>
- */
-OpenLayers.Ajax.Request = OpenLayers.Class(OpenLayers.Ajax.Base, {
-
-    /**
-     * Property: _complete
-     *
-     * {Boolean}
-     */
-    _complete: false,
-      
-    /**
-     * Constructor: OpenLayers.Ajax.Request
-     * 
-     * Parameters: 
-     * url - {String}
-     * options - {Object}
-     */
-    initialize: function(url, options) {
-        OpenLayers.Ajax.Base.prototype.initialize.apply(this, [options]);
-        
-        if (OpenLayers.ProxyHost && OpenLayers.String.startsWith(url, "http")) {
-            url = OpenLayers.ProxyHost + encodeURIComponent(url);
-        }
-        
-        this.transport = OpenLayers.Ajax.getTransport();
-        this.request(url);
-    },
-
-    /**
-     * Method: request
-     * 
-     * Parameters:
-     * url - {String}
-     */
-    request: function(url) {
-        this.url = url;
-        this.method = this.options.method;
-        var params = OpenLayers.Util.extend({}, this.options.parameters);
-        
-        if (this.method != 'get' && this.method != 'post') {
-            // simulate other verbs over post
-            params['_method'] = this.method;
-            this.method = 'post';
-        }
-
-        this.parameters = params;        
-        
-        if (params = OpenLayers.Util.getParameterString(params)) {
-            // when GET, append parameters to URL
-            if (this.method == 'get') {
-                this.url += ((this.url.indexOf('?') > -1) ? '&' : '?') + params;
-            } else if (/Konqueror|Safari|KHTML/.test(navigator.userAgent)) {
-                params += '&_=';
-            }
-        }
-        try {
-            var response = new OpenLayers.Ajax.Response(this);
-            if (this.options.onCreate) {
-                this.options.onCreate(response);
-            }
-            
-            OpenLayers.Ajax.Responders.dispatch('onCreate', 
-                                                this, 
-                                                response);
-    
-            this.transport.open(this.method.toUpperCase(), 
-                                this.url,
-                                this.options.asynchronous);
-    
-            if (this.options.asynchronous) {
-                window.setTimeout(
-                    OpenLayers.Function.bind(this.respondToReadyState, this, 1),
-                    10);
-            }
-            
-            this.transport.onreadystatechange = 
-                OpenLayers.Function.bind(this.onStateChange, this);    
-            this.setRequestHeaders();
-    
-            this.body =  this.method == 'post' ?
-                (this.options.postBody || params) : null;
-            this.transport.send(this.body);
-    
-            // Force Firefox to handle ready state 4 for synchronous requests
-            if (!this.options.asynchronous && 
-                this.transport.overrideMimeType) {
-                this.onStateChange();
-            }
-        } catch (e) {
-            this.dispatchException(e);
-        }
-    },
-
-    /**
-     * Method: onStateChange
-     */
-    onStateChange: function() {
-        var readyState = this.transport.readyState;
-        if (readyState > 1 && !((readyState == 4) && this._complete)) {
-            this.respondToReadyState(this.transport.readyState);
-        }
-    },
-     
-    /**
-     * Method: setRequestHeaders
-     */
-    setRequestHeaders: function() {
-        var headers = {
-            'X-Requested-With': 'XMLHttpRequest',
-            'Accept': 'text/javascript, text/html, application/xml, text/xml, */*',
-            'OpenLayers': true
-        };
-
-        if (this.method == 'post') {
-            headers['Content-type'] = this.options.contentType +
-                (this.options.encoding ? '; charset=' + this.options.encoding : '');
-    
-            /* Force "Connection: close" for older Mozilla browsers to work
-             * around a bug where XMLHttpRequest sends an incorrect
-             * Content-length header. See Mozilla Bugzilla #246651.
-             */
-            if (this.transport.overrideMimeType &&
-                (navigator.userAgent.match(/Gecko\/(\d{4})/) || [0,2005])[1] < 2005) {
-                headers['Connection'] = 'close';
-            }
-        }
-        // user-defined headers
-        if (typeof this.options.requestHeaders == 'object') {    
-            var extras = this.options.requestHeaders;
-            
-            if (typeof extras.push == 'function') {
-                for (var i = 0, length = extras.length; i < length; i += 2) {
-                    headers[extras[i]] = extras[i+1];
-                }
-            } else {
-                for (var i in extras) {
-                    headers[i] = extras[i];
-                }
-            }
-        }
-        
-        for (var name in headers) {
-            this.transport.setRequestHeader(name, headers[name]);
-        }
-    },
-    
-    /**
-     * Method: success
-     *
-     * Returns:
-     * {Boolean} - 
-     */
-    success: function() {
-        var status = this.getStatus();
-        return !status || (status >=200 && status < 300);
-    },
-    
-    /**
-     * Method: getStatus
-     *
-     * Returns:
-     * {Integer} - Status
-     */
-    getStatus: function() {
-        try {
-            return this.transport.status || 0;
-        } catch (e) {
-            return 0;
-        }
-    },
-
-    /**
-     * Method: respondToReadyState
-     *
-     * Parameters:
-     * readyState - {?}
-     */
-    respondToReadyState: function(readyState) {
-        var state = OpenLayers.Ajax.Request.Events[readyState];
-        var response = new OpenLayers.Ajax.Response(this);
-    
-        if (state == 'Complete') {
-            try {
-                this._complete = true;
-                (this.options['on' + response.status] ||
-                    this.options['on' + (this.success() ? 'Success' : 'Failure')] ||
-                    OpenLayers.Ajax.emptyFunction)(response);
-            } catch (e) {
-                this.dispatchException(e);
-            }
-    
-            var contentType = response.getHeader('Content-type');
-        }
-    
-        try {
-            (this.options['on' + state] || 
-             OpenLayers.Ajax.emptyFunction)(response);
-             OpenLayers.Ajax.Responders.dispatch('on' + state, 
-                                                 this, 
-                                                 response);
-        } catch (e) {
-            this.dispatchException(e);
-        }
-    
-        if (state == 'Complete') {
-            // avoid memory leak in MSIE: clean up
-            this.transport.onreadystatechange = OpenLayers.Ajax.emptyFunction;
-        }
-    },
-    
-    /**
-     * Method: getHeader
-     * 
-     * Parameters:
-     * name - {String} Header name
-     *
-     * Returns:
-     * {?} - response header for the given name
-     */
-    getHeader: function(name) {
-        try {
-            return this.transport.getResponseHeader(name);
-        } catch (e) {
-            return null;
-        }
-    },
-
-    /**
-     * Method: dispatchException
-     * If the optional onException function is set, execute it
-     * and then dispatch the call to any other listener registered
-     * for onException.
-     * 
-     * If no optional onException function is set, we suspect that
-     * the user may have also not used
-     * OpenLayers.Ajax.Responders.register to register a listener
-     * for the onException call.  To make sure that something
-     * gets done with this exception, only dispatch the call if there
-     * are listeners.
-     *
-     * If you explicitly want to swallow exceptions, set
-     * request.options.onException to an empty function (function(){})
-     * or register an empty function with <OpenLayers.Ajax.Responders>
-     * for onException.
-     * 
-     * Parameters:
-     * exception - {?}
-     */
-    dispatchException: function(exception) {
-        var handler = this.options.onException;
-        if(handler) {
-            // call options.onException and alert any other listeners
-            handler(this, exception);
-            OpenLayers.Ajax.Responders.dispatch('onException', this, exception);
-        } else {
-            // check if there are any other listeners
-            var listener = false;
-            var responders = OpenLayers.Ajax.Responders.responders;
-            for (var i = 0; i < responders.length; i++) {
-                if(responders[i].onException) {
-                    listener = true;
-                    break;
-                }
-            }
-            if(listener) {
-                // call all listeners
-                OpenLayers.Ajax.Responders.dispatch('onException', this, exception);
-            } else {
-                // let the exception through
-                throw exception;
-            }
-        }
-    }
-});
-
-/** 
- * Property: Events
- * {Array(String)}
- */
-OpenLayers.Ajax.Request.Events =
-  ['Uninitialized', 'Loading', 'Loaded', 'Interactive', 'Complete'];
-
-/**
- * Class: OpenLayers.Ajax.Response
- */
-OpenLayers.Ajax.Response = OpenLayers.Class({
-
-    /**
-     * Property: status
-     *
-     * {Integer}
-     */
-    status: 0,
-    
-
-    /**
-     * Property: statusText
-     *
-     * {String}
-     */
-    statusText: '',
-      
-    /**
-     * Constructor: OpenLayers.Ajax.Response
-     * 
-     * Parameters: 
-     * request - {Object}
-     */
-    initialize: function(request) {
-        this.request = request;
-        var transport = this.transport = request.transport,
-            readyState = this.readyState = transport.readyState;
-        
-        if ((readyState > 2 &&
-            !(!!(window.attachEvent && !window.opera))) ||
-            readyState == 4) {
-            this.status       = this.getStatus();
-            this.statusText   = this.getStatusText();
-            this.responseText = transport.responseText == null ?
-                '' : String(transport.responseText);
-        }
-        
-        if(readyState == 4) {
-            var xml = transport.responseXML;
-            this.responseXML  = xml === undefined ? null : xml;
-        }
-    },
-    
-    /**
-     * Method: getStatus
-     */
-    getStatus: OpenLayers.Ajax.Request.prototype.getStatus,
-    
-    /**
-     * Method: getStatustext
-     *
-     * Returns:
-     * {String} - statusText
-     */
-    getStatusText: function() {
-        try {
-            return this.transport.statusText || '';
-        } catch (e) {
-            return '';
-        }
-    },
-    
-    /**
-     * Method: getHeader
-     */
-    getHeader: OpenLayers.Ajax.Request.prototype.getHeader,
-    
-    /** 
-     * Method: getResponseHeader
-     *
-     * Returns:
-     * {?} - response header for given name
-     */
-    getResponseHeader: function(name) {
-        return this.transport.getResponseHeader(name);
-    }
-});
-
-
-/**
- * Function: getElementsByTagNameNS
- * 
- * Parameters:
- * parentnode - {?}
- * nsuri - {?}
- * nsprefix - {?}
- * tagname - {?}
- * 
- * Returns:
- * {?}
- */
-OpenLayers.Ajax.getElementsByTagNameNS  = function(parentnode, nsuri, 
-                                                   nsprefix, tagname) {
-    var elem = null;
-    if (parentnode.getElementsByTagNameNS) {
-        elem = parentnode.getElementsByTagNameNS(nsuri, tagname);
-    } else {
-        elem = parentnode.getElementsByTagName(nsprefix + ':' + tagname);
-    }
-    return elem;
-};
-
-
-/**
- * Function: serializeXMLToString
- * Wrapper function around XMLSerializer, which doesn't exist/work in
- *     IE/Safari. We need to come up with a way to serialize in those browser:
- *     for now, these browsers will just fail. #535, #536
- *
- * Parameters: 
- * xmldom {XMLNode} xml dom to serialize
- * 
- * Returns:
- * {?}
- */
-OpenLayers.Ajax.serializeXMLToString = function(xmldom) {
-    var serializer = new XMLSerializer();
-    var data = serializer.serializeToString(xmldom);
-    return data;
-};
-
-/**
- * Namespace: OpenLayers.Element
- */
-OpenLayers.Util.extend(OpenLayers.Element, {
-
-    /**
-     * APIFunction: hide
-     * *Deprecated*. Hide element(s) passed in
-     * 
-     * Parameters:
-     * element - {DOMElement} Actually user can pass any number of elements
-     */
-    hide: function() {
-        OpenLayers.Console.warn(OpenLayers.i18n("methodDeprecated", {
-            newMethod: "element.style.display = 'none';"
-        }));
-
-        for (var i=0, len=arguments.length; i<len; i++) {
-            var element = OpenLayers.Util.getElement(arguments[i]);
-            if (element) {
-                element.style.display = 'none';
-            }
-        }
-    },
-
-    /**
-     * APIFunction: show
-     * *Deprecated*. Show element(s) passed in
-     * 
-     * Parameters:
-     * element - {DOMElement} Actually user can pass any number of elements
-     */
-    show: function() {
-        OpenLayers.Console.warn(OpenLayers.i18n("methodDeprecated", {
-            newMethod: "element.style.display = '';"
-        }));
-
-        for (var i=0, len=arguments.length; i<len; i++) {
-            var element = OpenLayers.Util.getElement(arguments[i]);
-            if (element) {
-                element.style.display = '';
-            }
-        }
-    },
-
-    /**
-     * APIFunction: getDimensions
-     * *Deprecated*. Returns dimensions of the element passed in.
-     *  
-     * Parameters:
-     * element - {DOMElement}
-     * 
-     * Returns:
-     * {Object} Object with 'width' and 'height' properties which are the 
-     *          dimensions of the element passed in.
-     */
-    getDimensions: function(element) {
-        element = OpenLayers.Util.getElement(element);
-        if (OpenLayers.Element.getStyle(element, 'display') != 'none') {
-            return {width: element.offsetWidth, height: element.offsetHeight};
-        }
-    
-        // All *Width and *Height properties give 0 on elements with display none,
-        // so enable the element temporarily
-        var els = element.style;
-        var originalVisibility = els.visibility;
-        var originalPosition = els.position;
-        var originalDisplay = els.display;
-        els.visibility = 'hidden';
-        els.position = 'absolute';
-        els.display = '';
-        var originalWidth = element.clientWidth;
-        var originalHeight = element.clientHeight;
-        els.display = originalDisplay;
-        els.position = originalPosition;
-        els.visibility = originalVisibility;
-        return {width: originalWidth, height: originalHeight};
-    }
-    
-});
-
-if (!String.prototype.startsWith) {
-    /**
-     * APIMethod: String.startsWith
-     * *Deprecated*. Whether or not a string starts with another string. 
-     * 
-     * Parameters:
-     * sStart - {String} The string we're testing for.
-     *  
-     * Returns:
-     * {Boolean} Whether or not this string starts with the string passed in.
-     */
-    String.prototype.startsWith = function(sStart) {
-        OpenLayers.Console.warn(OpenLayers.i18n("methodDeprecated",
-                                {'newMethod':'OpenLayers.String.startsWith'}));
-        return OpenLayers.String.startsWith(this, sStart);
-    };
-}
-
-if (!String.prototype.contains) {
-    /**
-     * APIMethod: String.contains
-     * *Deprecated*. Whether or not a string contains another string.
-     * 
-     * Parameters:
-     * str - {String} The string that we're testing for.
-     * 
-     * Returns:
-     * {Boolean} Whether or not this string contains with the string passed in.
-     */
-    String.prototype.contains = function(str) {
-        OpenLayers.Console.warn(OpenLayers.i18n("methodDeprecated",
-                                  {'newMethod':'OpenLayers.String.contains'}));
-        return OpenLayers.String.contains(this, str);
-    };
-}
-
-if (!String.prototype.trim) {
-    /**
-     * APIMethod: String.trim
-     * *Deprecated*. Removes leading and trailing whitespace characters from a string.
-     * 
-     * Returns:
-     * {String} A trimmed version of the string - all leading and 
-     *          trailing spaces removed
-     */
-    String.prototype.trim = function() {
-        OpenLayers.Console.warn(OpenLayers.i18n("methodDeprecated",
-                                      {'newMethod':'OpenLayers.String.trim'}));
-        return OpenLayers.String.trim(this);
-    };
-}
-
-if (!String.prototype.camelize) {
-    /**
-     * APIMethod: String.camelize
-     * *Deprecated*. Camel-case a hyphenated string. 
-     *     Ex. "chicken-head" becomes "chickenHead", and
-     *     "-chicken-head" becomes "ChickenHead".
-     * 
-     * Returns:
-     * {String} The string, camelized
-     */
-    String.prototype.camelize = function() {
-        OpenLayers.Console.warn(OpenLayers.i18n("methodDeprecated",
-                                  {'newMethod':'OpenLayers.String.camelize'}));
-        return OpenLayers.String.camelize(this);
-    };
-}
-
-if (!Function.prototype.bind) {
-    /**
-     * APIMethod: Function.bind
-     * *Deprecated*. Bind a function to an object. 
-     * Method to easily create closures with 'this' altered.
-     * 
-     * Parameters:
-     * object - {Object} the this parameter
-     * 
-     * Returns:
-     * {Function} A closure with 'this' altered to the first
-     *            argument.
-     */
-    Function.prototype.bind = function() {
-        OpenLayers.Console.warn(OpenLayers.i18n("methodDeprecated",
-                                {'newMethod':'OpenLayers.Function.bind'}));
-        // new function takes the same arguments with this function up front
-        Array.prototype.unshift.apply(arguments, [this]);
-        return OpenLayers.Function.bind.apply(null, arguments);
-    };
-}
-
-if (!Function.prototype.bindAsEventListener) {
-    /**
-     * APIMethod: Function.bindAsEventListener
-     * *Deprecated*. Bind a function to an object, and configure it to receive the
-     *     event object as first parameter when called. 
-     * 
-     * Parameters:
-     * object - {Object} A reference to this.
-     * 
-     * Returns:
-     * {Function}
-     */
-    Function.prototype.bindAsEventListener = function(object) {
-        OpenLayers.Console.warn(OpenLayers.i18n("methodDeprecated",
-                        {'newMethod':'OpenLayers.Function.bindAsEventListener'}));
-        return OpenLayers.Function.bindAsEventListener(this, object);
-    };
-}
-
-// FIXME: Remove this in 3.0. In 3.0, Event.stop will no longer be provided
-// by OpenLayers.
-if (window.Event) {
-    OpenLayers.Util.applyDefaults(window.Event, OpenLayers.Event);
-} else {
-    var Event = OpenLayers.Event;
-}
-
-/**
- * Namespace: OpenLayers.Tile
- */
-OpenLayers.Util.extend(OpenLayers.Tile.prototype, {
-    /**   
-     * Method: getBoundsFromBaseLayer
-     * Take the pixel locations of the corner of the tile, and pass them to 
-     *     the base layer and ask for the location of those pixels, so that 
-     *     displaying tiles over Google works fine.
-     *
-     * Parameters:
-     * position - {<OpenLayers.Pixel>}
-     *
-     * Returns:
-     * bounds - {<OpenLayers.Bounds>} 
-     */
-    getBoundsFromBaseLayer: function(position) {
-        var msg = OpenLayers.i18n('reprojectDeprecated',
-                                              {'layerName':this.layer.name});
-        OpenLayers.Console.warn(msg);
-        var topLeft = this.layer.map.getLonLatFromLayerPx(position); 
-        var bottomRightPx = position.clone();
-        bottomRightPx.x += this.size.w;
-        bottomRightPx.y += this.size.h;
-        var bottomRight = this.layer.map.getLonLatFromLayerPx(bottomRightPx); 
-        // Handle the case where the base layer wraps around the date line.
-        // Google does this, and it breaks WMS servers to request bounds in 
-        // that fashion.  
-        if (topLeft.lon > bottomRight.lon) {
-            if (topLeft.lon < 0) {
-                topLeft.lon = -180 - (topLeft.lon+180);
-            } else {
-                bottomRight.lon = 180+bottomRight.lon+180;
-            }        
-        }
-        var bounds = new OpenLayers.Bounds(topLeft.lon, 
-                                       bottomRight.lat, 
-                                       bottomRight.lon, 
-                                       topLeft.lat);  
-        return bounds;
-    }    
-});
-
-/**
- * Class: OpenLayers.Control.MouseDefaults
- * This class is DEPRECATED in 2.4 and will be removed by 3.0.
- * If you need this functionality, use <OpenLayers.Control.Navigation> 
- * instead!!!
- *
- * Inherits from:
- *  - <OpenLayers.Control>
- */
-OpenLayers.Control.MouseDefaults = OpenLayers.Class(OpenLayers.Control, {
-
-    /** WARNING WARNING WARNING!!!
-        This class is DEPRECATED in 2.4 and will be removed by 3.0.
-        If you need this functionality, use Control.Navigation instead!!! */
-
-    /** 
-     * Property: performedDrag
-     * {Boolean}
-     */
-    performedDrag: false,
-
-    /** 
-     * Property: wheelObserver 
-     * {Function}
-     */
-    wheelObserver: null,
-
-    /** 
-     * Constructor: OpenLayers.Control.MouseDefaults
-     */
-    initialize: function() {
-        OpenLayers.Control.prototype.initialize.apply(this, arguments);
-    },
-
-    /**
-     * APIMethod: destroy
-     */    
-    destroy: function() {
-        
-        if (this.handler) {
-            this.handler.destroy();
-        }
-        this.handler = null;
-
-        this.map.events.un({
-            "click": this.defaultClick,
-            "dblclick": this.defaultDblClick,
-            "mousedown": this.defaultMouseDown,
-            "mouseup": this.defaultMouseUp,
-            "mousemove": this.defaultMouseMove,
-            "mouseout": this.defaultMouseOut,
-            scope: this
-        });
-
-        //unregister mousewheel events specifically on the window and document
-        OpenLayers.Event.stopObserving(window, "DOMMouseScroll", 
-                                        this.wheelObserver);
-        OpenLayers.Event.stopObserving(window, "mousewheel", 
-                                        this.wheelObserver);
-        OpenLayers.Event.stopObserving(document, "mousewheel", 
-                                        this.wheelObserver);
-        this.wheelObserver = null;
-                      
-        OpenLayers.Control.prototype.destroy.apply(this, arguments);        
-    },
-
-    /**
-     * Method: draw
-     */
-    draw: function() {
-        this.map.events.on({
-            "click": this.defaultClick,
-            "dblclick": this.defaultDblClick,
-            "mousedown": this.defaultMouseDown,
-            "mouseup": this.defaultMouseUp,
-            "mousemove": this.defaultMouseMove,
-            "mouseout": this.defaultMouseOut,
-            scope: this
-        });
-
-        this.registerWheelEvents();
-
-    },
-
-    /**
-     * Method: registerWheelEvents
-     */
-    registerWheelEvents: function() {
-
-        this.wheelObserver = OpenLayers.Function.bindAsEventListener(
-            this.onWheelEvent, this
-        );
-        
-        //register mousewheel events specifically on the window and document
-        OpenLayers.Event.observe(window, "DOMMouseScroll", this.wheelObserver);
-        OpenLayers.Event.observe(window, "mousewheel", this.wheelObserver);
-        OpenLayers.Event.observe(document, "mousewheel", this.wheelObserver);
-    },
-
-    /**
-     * Method: defaultClick
-     * 
-     * Parameters:
-     * evt - {Event} 
-     *
-     * Returns:
-     * {Boolean}
-     */
-    defaultClick: function (evt) {
-        if (!OpenLayers.Event.isLeftClick(evt)) {
-            return;
-        }
-        var notAfterDrag = !this.performedDrag;
-        this.performedDrag = false;
-        return notAfterDrag;
-    },
-
-    /**
-     * Method: defaultDblClick
-     * 
-     * Parameters:
-     * evt - {Event} 
-     */
-    defaultDblClick: function (evt) {
-        var newCenter = this.map.getLonLatFromViewPortPx( evt.xy ); 
-        this.map.setCenter(newCenter, this.map.zoom + 1);
-        OpenLayers.Event.stop(evt);
-        return false;
-    },
-
-    /**
-     * Method: defaultMouseDown
-     * 
-     * Parameters:
-     * evt - {Event} 
-     */
-    defaultMouseDown: function (evt) {
-        if (!OpenLayers.Event.isLeftClick(evt)) {
-            return;
-        }
-        this.mouseDragStart = evt.xy.clone();
-        this.performedDrag  = false;
-        if (evt.shiftKey) {
-            this.map.div.style.cursor = "crosshair";
-            this.zoomBox = OpenLayers.Util.createDiv('zoomBox',
-                                                     this.mouseDragStart,
-                                                     null,
-                                                     null,
-                                                     "absolute",
-                                                     "2px solid red");
-            this.zoomBox.style.backgroundColor = "white";
-            this.zoomBox.style.filter = "alpha(opacity=50)"; // IE
-            this.zoomBox.style.opacity = "0.50";
-            this.zoomBox.style.fontSize = "1px";
-            this.zoomBox.style.zIndex = this.map.Z_INDEX_BASE["Popup"] - 1;
-            this.map.viewPortDiv.appendChild(this.zoomBox);
-        }
-        document.onselectstart = OpenLayers.Function.False;
-        OpenLayers.Event.stop(evt);
-    },
-
-    /**
-     * Method: defaultMouseMove
-     *
-     * Parameters:
-     * evt - {Event} 
-     */
-    defaultMouseMove: function (evt) {
-        // record the mouse position, used in onWheelEvent
-        this.mousePosition = evt.xy.clone();
-
-        if (this.mouseDragStart != null) {
-            if (this.zoomBox) {
-                var deltaX = Math.abs(this.mouseDragStart.x - evt.xy.x);
-                var deltaY = Math.abs(this.mouseDragStart.y - evt.xy.y);
-                this.zoomBox.style.width = Math.max(1, deltaX) + "px";
-                this.zoomBox.style.height = Math.max(1, deltaY) + "px";
-                if (evt.xy.x < this.mouseDragStart.x) {
-                    this.zoomBox.style.left = evt.xy.x+"px";
-                }
-                if (evt.xy.y < this.mouseDragStart.y) {
-                    this.zoomBox.style.top = evt.xy.y+"px";
-                }
-            } else {
-                var deltaX = this.mouseDragStart.x - evt.xy.x;
-                var deltaY = this.mouseDragStart.y - evt.xy.y;
-                var size = this.map.getSize();
-                var newXY = new OpenLayers.Pixel(size.w / 2 + deltaX,
-                                                 size.h / 2 + deltaY);
-                var newCenter = this.map.getLonLatFromViewPortPx( newXY ); 
-                this.map.setCenter(newCenter, null, true);
-                this.mouseDragStart = evt.xy.clone();
-                this.map.div.style.cursor = "move";
-            }
-            this.performedDrag = true;
-        }
-    },
-
-    /**
-     * Method: defaultMouseUp
-     * 
-     * Parameters:
-     * evt - {<OpenLayers.Event>} 
-     */
-    defaultMouseUp: function (evt) {
-        if (!OpenLayers.Event.isLeftClick(evt)) {
-            return;
-        }
-        if (this.zoomBox) {
-            this.zoomBoxEnd(evt);    
-        } else {
-            if (this.performedDrag) {
-                this.map.setCenter(this.map.center);
-            }
-        }
-        document.onselectstart=null;
-        this.mouseDragStart = null;
-        this.map.div.style.cursor = "";
-    },
-
-    /**
-     * Method: defaultMouseOut
-     * 
-     * Parameters:
-     * evt - {Event} 
-     */
-    defaultMouseOut: function (evt) {
-        if (this.mouseDragStart != null && 
-            OpenLayers.Util.mouseLeft(evt, this.map.viewPortDiv)) {
-            if (this.zoomBox) {
-                this.removeZoomBox();
-            }
-            this.mouseDragStart = null;
-        }
-    },
-
-
-    /** 
-     * Method: defaultWheelUp
-     * User spun scroll wheel up
-     * 
-     */
-    defaultWheelUp: function(evt) {
-        if (this.map.getZoom() <= this.map.getNumZoomLevels()) {
-            this.map.setCenter(this.map.getLonLatFromPixel(evt.xy),
-                               this.map.getZoom() + 1);
-        }
-    },
-
-    /**
-     * Method: defaultWheelDown
-     * User spun scroll wheel down
-     */
-    defaultWheelDown: function(evt) {
-        if (this.map.getZoom() > 0) {
-            this.map.setCenter(this.map.getLonLatFromPixel(evt.xy),
-                               this.map.getZoom() - 1);
-        }
-    },
-
-    /**
-     * Method: zoomBoxEnd
-     * Zoombox function. 
-     */
-    zoomBoxEnd: function(evt) {
-        if (this.mouseDragStart != null) {
-            if (Math.abs(this.mouseDragStart.x - evt.xy.x) > 5 ||    
-                Math.abs(this.mouseDragStart.y - evt.xy.y) > 5) {   
-                var start = this.map.getLonLatFromViewPortPx( this.mouseDragStart ); 
-                var end = this.map.getLonLatFromViewPortPx( evt.xy );
-                var top = Math.max(start.lat, end.lat);
-                var bottom = Math.min(start.lat, end.lat);
-                var left = Math.min(start.lon, end.lon);
-                var right = Math.max(start.lon, end.lon);
-                var bounds = new OpenLayers.Bounds(left, bottom, right, top);
-                this.map.zoomToExtent(bounds);
-            } else {
-                var end = this.map.getLonLatFromViewPortPx( evt.xy );
-                this.map.setCenter(new OpenLayers.LonLat(
-                  (end.lon),
-                  (end.lat)
-                 ), this.map.getZoom() + 1);
-            }    
-            this.removeZoomBox();
-       }
-    },
-
-    /**
-     * Method: removeZoomBox
-     * Remove the zoombox from the screen and nullify our reference to it.
-     */
-    removeZoomBox: function() {
-        this.map.viewPortDiv.removeChild(this.zoomBox);
-        this.zoomBox = null;
-    },
-
-
-/**
- *  Mouse ScrollWheel code thanks to http://adomas.org/javascript-mouse-wheel/
- */
-
-
-    /**
-     * Method: onWheelEvent
-     * Catch the wheel event and handle it xbrowserly
-     *
-     * Parameters: 
-     * e - {Event} 
-     */
-    onWheelEvent: function(e){
-    
-        // first determine whether or not the wheeling was inside the map
-        var inMap = false;
-        var elem = OpenLayers.Event.element(e);
-        while(elem != null) {
-            if (this.map && elem == this.map.div) {
-                inMap = true;
-                break;
-            }
-            elem = elem.parentNode;
-        }
-        
-        if (inMap) {
-            
-            var delta = 0;
-            if (!e) {
-                e = window.event;
-            }
-            if (e.wheelDelta) {
-                delta = e.wheelDelta/120; 
-                if (window.opera && window.opera.version() < 9.2) {
-                    delta = -delta;
-                }
-            } else if (e.detail) {
-                delta = -e.detail / 3;
-            }
-            if (delta) {
-                // add the mouse position to the event because mozilla has a bug
-                // with clientX and clientY (see https://bugzilla.mozilla.org/show_bug.cgi?id=352179)
-                // getLonLatFromViewPortPx(e) returns wrong values
-                e.xy = this.mousePosition;
-
-                if (delta < 0) {
-                   this.defaultWheelDown(e);
-                } else {
-                   this.defaultWheelUp(e);
-                }
-            }
-            
-            //only wheel the map, not the window
-            OpenLayers.Event.stop(e);
-        }
-    },
-
-    CLASS_NAME: "OpenLayers.Control.MouseDefaults"
-});
-
-/**
- * Class: OpenLayers.Control.MouseToolbar
- * This class is DEPRECATED in 2.4 and will be removed by 3.0.
- * If you need this functionality, use <OpenLayers.Control.NavToolbar>
- * instead!!! 
- */
-OpenLayers.Control.MouseToolbar = OpenLayers.Class(
-                                            OpenLayers.Control.MouseDefaults, {
-    
-    /**
-     * Property: mode
-     */ 
-    mode: null,
-    /**
-     * Property: buttons
-     */
-    buttons: null,
-    
-    /**
-     * APIProperty: direction
-     * {String} 'vertical' or 'horizontal'
-     */
-    direction: "vertical",
-    
-    /**
-     * Property: buttonClicked
-     * {String}
-     */
-    buttonClicked: null,
-    
-    /**
-     * Constructor: OpenLayers.Control.MouseToolbar
-     *
-     * Parameters:
-     * position - {<OpenLayers.Pixel>}
-     * direction - {String}
-     */
-    initialize: function(position, direction) {
-        OpenLayers.Control.prototype.initialize.apply(this, arguments);
-        this.position = new OpenLayers.Pixel(OpenLayers.Control.MouseToolbar.X,
-                                             OpenLayers.Control.MouseToolbar.Y);
-        if (position) {
-            this.position = position;
-        }
-        if (direction) {
-            this.direction = direction; 
-        }
-        this.measureDivs = [];
-    },
-    
-    /**
-     * APIMethod: destroy 
-     */
-    destroy: function() {
-        for( var btnId in this.buttons) {
-            var btn = this.buttons[btnId];
-            btn.map = null;
-            btn.events.destroy();
-        }
-        OpenLayers.Control.MouseDefaults.prototype.destroy.apply(this, 
-                                                                 arguments);
-    },
-    
-    /**
-     * Method: draw
-     */
-    draw: function() {
-        OpenLayers.Control.prototype.draw.apply(this, arguments); 
-        OpenLayers.Control.MouseDefaults.prototype.draw.apply(this, arguments);
-        this.buttons = {};
-        var sz = new OpenLayers.Size(28,28);
-        var centered = new OpenLayers.Pixel(OpenLayers.Control.MouseToolbar.X,0);
-        this._addButton("zoombox", "drag-rectangle-off.png", "drag-rectangle-on.png", centered, sz, "Shift->Drag to zoom to area");
-        centered = centered.add((this.direction == "vertical" ? 0 : sz.w), (this.direction == "vertical" ? sz.h : 0));
-        this._addButton("pan", "panning-hand-off.png", "panning-hand-on.png", centered, sz, "Drag the map to pan.");
-        centered = centered.add((this.direction == "vertical" ? 0 : sz.w), (this.direction == "vertical" ? sz.h : 0));
-        this.switchModeTo("pan");
-
-        return this.div;
-    },
-    
-    /**
-     * Method: _addButton
-     */
-    _addButton:function(id, img, activeImg, xy, sz, title) {
-        var imgLocation = OpenLayers.Util.getImageLocation(img);
-        var activeImgLocation = OpenLayers.Util.getImageLocation(activeImg);
-        // var btn = new ol.AlphaImage("_"+id, imgLocation, xy, sz);
-        var btn = OpenLayers.Util.createAlphaImageDiv(
-                                    "OpenLayers_Control_MouseToolbar_" + id, 
-                                    xy, sz, imgLocation, "absolute");
-
-        //we want to add the outer div
-        this.div.appendChild(btn);
-        btn.imgLocation = imgLocation;
-        btn.activeImgLocation = activeImgLocation;
-        
-        btn.events = new OpenLayers.Events(this, btn, null, true);
-        btn.events.on({
-            "mousedown": this.buttonDown,
-            "mouseup": this.buttonUp,
-            "dblclick": OpenLayers.Event.stop,
-            scope: this
-        });
-        btn.action = id;
-        btn.title = title;
-        btn.alt = title;
-        btn.map = this.map;
-
-        //we want to remember/reference the outer div
-        this.buttons[id] = btn;
-        return btn;
-    },
-
-    /**
-     * Method: buttonDown
-     *
-     * Parameters:
-     * evt - {Event} 
-     */
-    buttonDown: function(evt) {
-        if (!OpenLayers.Event.isLeftClick(evt)) {
-            return;
-        }
-        this.buttonClicked = evt.element.action;
-        OpenLayers.Event.stop(evt);
-    },
-
-    /**
-     * Method: buttonUp
-     *
-     * Parameters:
-     * evt - {Event} 
-     */
-    buttonUp: function(evt) {
-        if (!OpenLayers.Event.isLeftClick(evt)) {
-            return;
-        }
-        if (this.buttonClicked != null) {
-            if (this.buttonClicked == evt.element.action) {
-                this.switchModeTo(evt.element.action);
-            }
-            OpenLayers.Event.stop(evt);
-            this.buttonClicked = null;
-        }
-    },
-    
-    /**
-     * Method: defaultDblClick 
-     *
-     * Parameters:
-     * evt - {Event} 
-     */
-    defaultDblClick: function (evt) {
-        this.switchModeTo("pan");
-        this.performedDrag = false;
-        var newCenter = this.map.getLonLatFromViewPortPx( evt.xy ); 
-        this.map.setCenter(newCenter, this.map.zoom + 1);
-        OpenLayers.Event.stop(evt);
-        return false;
-    },
-
-    /**
-     * Method: defaultMouseDown
-     *
-     * Parameters:
-     * evt - {Event} 
-     */
-    defaultMouseDown: function (evt) {
-        if (!OpenLayers.Event.isLeftClick(evt)) {
-            return;
-        }
-        this.mouseDragStart = evt.xy.clone();
-        this.performedDrag = false;
-        this.startViaKeyboard = false;
-        if (evt.shiftKey && this.mode !="zoombox") {
-            this.switchModeTo("zoombox");
-            this.startViaKeyboard = true;
-        } else if (evt.altKey && this.mode !="measure") {
-            this.switchModeTo("measure");
-        } else if (!this.mode) {
-            this.switchModeTo("pan");
-        }
-        
-        switch (this.mode) {
-            case "zoombox":
-                this.map.div.style.cursor = "crosshair";
-                this.zoomBox = OpenLayers.Util.createDiv('zoomBox',
-                                                         this.mouseDragStart,
-                                                         null,
-                                                         null,
-                                                         "absolute",
-                                                         "2px solid red");
-                this.zoomBox.style.backgroundColor = "white";
-                this.zoomBox.style.filter = "alpha(opacity=50)"; // IE
-                this.zoomBox.style.opacity = "0.50";
-                this.zoomBox.style.fontSize = "1px";
-                this.zoomBox.style.zIndex = this.map.Z_INDEX_BASE["Popup"] - 1;
-                this.map.viewPortDiv.appendChild(this.zoomBox);
-                this.performedDrag = true;
-                break;
-            case "measure":
-                var distance = "";
-                if (this.measureStart) {
-                    var measureEnd = this.map.getLonLatFromViewPortPx(this.mouseDragStart);
-                    distance = OpenLayers.Util.distVincenty(this.measureStart, measureEnd);
-                    distance = Math.round(distance * 100) / 100;
-                    distance = distance + "km";
-                    this.measureStartBox = this.measureBox;
-                }    
-                this.measureStart = this.map.getLonLatFromViewPortPx(this.mouseDragStart);;
-                this.measureBox = OpenLayers.Util.createDiv(null,
-                                                         this.mouseDragStart.add(
-                                                           -2-parseInt(this.map.layerContainerDiv.style.left),
-                                                           -2-parseInt(this.map.layerContainerDiv.style.top)),
-                                                         null,
-                                                         null,
-                                                         "absolute");
-                this.measureBox.style.width="4px";
-                this.measureBox.style.height="4px";
-                this.measureBox.style.fontSize = "1px";
-                this.measureBox.style.backgroundColor="red";
-                this.measureBox.style.zIndex = this.map.Z_INDEX_BASE["Popup"] - 1;
-                this.map.layerContainerDiv.appendChild(this.measureBox);
-                if (distance) {
-                    this.measureBoxDistance = OpenLayers.Util.createDiv(null,
-                                                         this.mouseDragStart.add(
-                                                           -2-parseInt(this.map.layerContainerDiv.style.left),
-                                                           2-parseInt(this.map.layerContainerDiv.style.top)),
-                                                         null,
-                                                         null,
-                                                         "absolute");
-                    
-                    this.measureBoxDistance.innerHTML = distance;
-                    this.measureBoxDistance.style.zIndex = this.map.Z_INDEX_BASE["Popup"] - 1;
-                    this.map.layerContainerDiv.appendChild(this.measureBoxDistance);
-                    this.measureDivs.push(this.measureBoxDistance);
-                }
-                this.measureBox.style.zIndex = this.map.Z_INDEX_BASE["Popup"] - 1;
-                this.map.layerContainerDiv.appendChild(this.measureBox);
-                this.measureDivs.push(this.measureBox);
-                break;
-            default:
-                this.map.div.style.cursor = "move";
-                break;
-        }
-        document.onselectstart = OpenLayers.Function.False;
-        OpenLayers.Event.stop(evt);
-    },
-
-    /**
-     * Method: switchModeTo 
-     *
-     * Parameters:
-     * mode - {String} 
-     */
-    switchModeTo: function(mode) {
-        if (mode != this.mode) {
-            
-
-            if (this.mode && this.buttons[this.mode]) {
-                OpenLayers.Util.modifyAlphaImageDiv(this.buttons[this.mode], null, null, null, this.buttons[this.mode].imgLocation);
-            }
-            if (this.mode == "measure" && mode != "measure") {
-                for(var i=0, len=this.measureDivs.length; i<len; i++) {
-                    if (this.measureDivs[i]) { 
-                        this.map.layerContainerDiv.removeChild(this.measureDivs[i]);
-                    }
-                }
-                this.measureDivs = [];
-                this.measureStart = null;
-            }
-            this.mode = mode;
-            if (this.buttons[mode]) {
-                OpenLayers.Util.modifyAlphaImageDiv(this.buttons[mode], null, null, null, this.buttons[mode].activeImgLocation);
-            }
-            switch (this.mode) {
-                case "zoombox":
-                    this.map.div.style.cursor = "crosshair";
-                    break;
-                default:
-                    this.map.div.style.cursor = "";
-                    break;
-            }
-
-        } 
-    }, 
-
-    /**
-     * Method: leaveMode
-     */
-    leaveMode: function() {
-        this.switchModeTo("pan");
-    },
-    
-    /**
-     * Method: defaultMouseMove
-     *
-     * Parameters:
-     * evt - {Event} 
-     */
-    defaultMouseMove: function (evt) {
-        if (this.mouseDragStart != null) {
-            switch (this.mode) {
-                case "zoombox": 
-                    var deltaX = Math.abs(this.mouseDragStart.x - evt.xy.x);
-                    var deltaY = Math.abs(this.mouseDragStart.y - evt.xy.y);
-                    this.zoomBox.style.width = Math.max(1, deltaX) + "px";
-                    this.zoomBox.style.height = Math.max(1, deltaY) + "px";
-                    if (evt.xy.x < this.mouseDragStart.x) {
-                        this.zoomBox.style.left = evt.xy.x+"px";
-                    }
-                    if (evt.xy.y < this.mouseDragStart.y) {
-                        this.zoomBox.style.top = evt.xy.y+"px";
-                    }
-                    break;
-                default:
-                    var deltaX = this.mouseDragStart.x - evt.xy.x;
-                    var deltaY = this.mouseDragStart.y - evt.xy.y;
-                    var size = this.map.getSize();
-                    var newXY = new OpenLayers.Pixel(size.w / 2 + deltaX,
-                                                     size.h / 2 + deltaY);
-                    var newCenter = this.map.getLonLatFromViewPortPx( newXY ); 
-                    this.map.setCenter(newCenter, null, true);
-                    this.mouseDragStart = evt.xy.clone();
-            }
-            this.performedDrag = true;
-        }
-    },
-
-    /**
-     * Method: defaultMouseUp
-     *
-     * Parameters:
-     * evt - {Event} 
-     */
-    defaultMouseUp: function (evt) {
-        if (!OpenLayers.Event.isLeftClick(evt)) {
-            return;
-        }
-        switch (this.mode) {
-            case "zoombox":
-                this.zoomBoxEnd(evt);
-                if (this.startViaKeyboard) {
-                    this.leaveMode();
-                }
-                break;
-            case "pan":
-                if (this.performedDrag) {
-                    this.map.setCenter(this.map.center);
-                }        
-        }
-        document.onselectstart = null;
-        this.mouseDragStart = null;
-        this.map.div.style.cursor = "default";
-    },
-
-    /**
-     * Method: defaultMouseOut
-     *
-     * Parameters:
-     * evt - {Event} 
-     */
-    defaultMouseOut: function (evt) {
-        if (this.mouseDragStart != null
-            && OpenLayers.Util.mouseLeft(evt, this.map.viewPortDiv)) {
-            if (this.zoomBox) {
-                this.removeZoomBox();
-                if (this.startViaKeyboard) {
-                    this.leaveMode();
-                }
-            }
-            this.mouseDragStart = null;
-            this.map.div.style.cursor = "default";
-        }
-    },
-
-    /**
-     * Method: defaultClick
-     *
-     * Parameters:
-     * evt - {Event} 
-     */
-    defaultClick: function (evt) {
-        if (this.performedDrag)  {
-            this.performedDrag = false;
-            return false;
-        }
-    },
-    
-    CLASS_NAME: "OpenLayers.Control.MouseToolbar"
-});
-
-OpenLayers.Control.MouseToolbar.X = 6;
-OpenLayers.Control.MouseToolbar.Y = 300;
-
-/**
- * Class: OpenLayers.Layer.Grid
- */
-
-OpenLayers.Util.extend(OpenLayers.Layer.Grid.prototype, {
-
-    /**
-     * Method: getGridBounds
-     * Deprecated. This function will be removed in 3.0. Please use 
-     *     getTilesBounds() instead.
-     * 
-     * Returns:
-     * {<OpenLayers.Bounds>} A Bounds object representing the bounds of all the
-     * currently loaded tiles (including those partially or not at all seen 
-     * onscreen)
-     */
-    getGridBounds: function() {
-        var msg = "The getGridBounds() function is deprecated. It will be " +
-                  "removed in 3.0. Please use getTilesBounds() instead.";
-        OpenLayers.Console.warn(msg);
-        return this.getTilesBounds();
-    }
-});
-
-/**
- * Class: OpenLayers.Format.XML
- */
-OpenLayers.Util.extend(OpenLayers.Format.XML.prototype, {
-
-    /**
-     * APIMethod: concatChildValues
-     * *Deprecated*. Use <getChildValue> instead.
-     *
-     * Concatenate the value of all child nodes if any exist, or return an
-     *     optional default string.  Returns an empty string if no children
-     *     exist and no default value is supplied.  Not optimized for large
-     *     numbers of child nodes.
-     *
-     * Parameters:
-     * node - {DOMElement} The element used to look for child values.
-     * def - {String} Optional string to return in the event that no
-     *     child exist.
-     *
-     * Returns:
-     * {String} The concatenated value of all child nodes of the given node.
-     */
-    concatChildValues: function(node, def) {
-        var value = "";
-        var child = node.firstChild;
-        var childValue;
-        while(child) {
-            childValue = child.nodeValue;
-            if(childValue) {
-                value += childValue;
-            }
-            child = child.nextSibling;
-        }
-        if(value == "" && def != undefined) {
-            value = def;
-        }
-        return value;
-    }
-
-});
-
-/**
- * Class: OpenLayers.Layer.WMS.Post
- * Instances of OpenLayers.Layer.WMS.Post are used to retrieve data from OGC
- * Web Mapping Services via HTTP-POST (application/x-www-form-urlencoded). 
- * Create a new WMS layer with the <OpenLayers.Layer.WMS.Post> constructor.
- *
- * *Deprecated*. Instead of this layer, use <OpenLayers.Layer.WMS> with
- * <OpenLayers.Tile.Image.maxGetUrlLength> configured in the layer's
- * <OpenLayers.Layer.WMS.tileOptions>.
- *
- * Inherits from:
- *  - <OpenLayers.Layer.WMS>
- */
-OpenLayers.Layer.WMS.Post = OpenLayers.Class(OpenLayers.Layer.WMS, {
-
-    /**
-     * APIProperty: unsupportedBrowsers
-     * {Array} Array with browsers, which should use the HTTP-GET protocol 
-     * instead of HTTP-POST for fetching tiles from a WMS .
-     * Defaults to ["mozilla", "firefox", "opera"], because Opera is not able 
-     * to show transparent images in IFrames and Firefox/Mozilla has some ugly 
-     * effects of viewport-shaking when panning the map. Both browsers, Opera
-     * and Firefox/Mozilla, have no problem with long urls, which is the reason
-     * for using POST instead of GET. The strings to pass to this array are
-     * the ones returned by <OpenLayers.BROWSER_NAME>.
-     */
-    unsupportedBrowsers: ["mozilla", "firefox", "opera"],
-
-    /**
-     * Property: SUPPORTED_TRANSITIONS
-     * {Array} 
-     * no supported transitions for this type of layer, because it is not
-     * possible to modify the initialized tiles (iframes)
-     */
-    SUPPORTED_TRANSITIONS: [],
-    
-    /**
-     * Property: usePost
-     * {Boolean}
-     */
-    usePost: null,
-
-    /**
-     * Constructor: OpenLayers.Layer.WMS.Post
-     * Creates a new WMS layer object.
-     *
-     * Example:
-     * (code)
-     * var wms = new OpenLayers.Layer.WMS.Post(
-     *  "NASA Global Mosaic",
-     *  "http://wms.jpl.nasa.gov/wms.cgi",
-     *  {layers: "modis, global_mosaic"});
-     * (end)
-     *
-     * Parameters:
-     * name - {String} A name for the layer
-     * url - {String} Base url for the WMS
-     *                (e.g. http://wms.jpl.nasa.gov/wms.cgi)
-     * params - {Object} An object with key/value pairs representing the
-     *                   GetMap query string parameters and parameter values.
-     * options - {Object} Hashtable of extra options to tag onto the layer.
-     */
-    initialize: function(name, url, params, options) {
-        var newArguments = [];
-        newArguments.push(name, url, params, options);
-        OpenLayers.Layer.WMS.prototype.initialize.apply(this, newArguments);
-
-        this.usePost = OpenLayers.Util.indexOf(
-            this.unsupportedBrowsers, OpenLayers.BROWSER_NAME) == -1;
-    },
-    
-    /**
-     * Method: addTile
-     * addTile creates a tile, initializes it and adds it as iframe to the
-     * layer div.
-     *
-     * Parameters:
-     * bounds - {<OpenLayers.Bounds>}
-     * position - {<OpenLayers.Pixel>}
-     *
-     * Returns:
-     * {<OpenLayers.Tile.Image.IFrame>} The added OpenLayers.Tile.Image.IFrame
-     */
-    addTile: function(bounds,position) {
-        return new OpenLayers.Tile.Image(
-            this, position, bounds, null, this.tileSize, {
-                maxGetUrlLength: this.usePost ? 0 : null
-            });
-    },
-
-    CLASS_NAME: 'OpenLayers.Layer.WMS.Post'
-});
-
-/**
- * Class: OpenLayers.Layer.WMS.Untiled
- * *Deprecated*.  To be removed in 3.0.  Instead use OpenLayers.Layer.WMS and 
- *     pass the option 'singleTile' as true.
- * 
- * Inherits from: 
- *  - <OpenLayers.Layer.WMS>
- */
-OpenLayers.Layer.WMS.Untiled = OpenLayers.Class(OpenLayers.Layer.WMS, {
-
-    /**
-     * APIProperty: singleTile
-     * {singleTile} Always true for untiled.
-     */
-    singleTile: true,
-
-    /**
-     * Constructor: OpenLayers.Layer.WMS.Untiled
-     *
-     * Parameters:
-     * name - {String} 
-     * url - {String} 
-     * params - {Object} 
-     * options - {Object} 
-     */
-    initialize: function(name, url, params, options) {
-        OpenLayers.Layer.WMS.prototype.initialize.apply(this, arguments);
-        
-        var msg = "The OpenLayers.Layer.WMS.Untiled class is deprecated and " +
-                  "will be removed in 3.0. Instead, you should use the " +
-                  "normal OpenLayers.Layer.WMS class, passing it the option " +
-                  "'singleTile' as true.";
-        OpenLayers.Console.warn(msg);
-    },    
-
-    /**
-     * Method: clone
-     * Create a clone of this layer
-     *
-     * Returns:
-     * {<OpenLayers.Layer.WMS.Untiled>} An exact clone of this layer
-     */
-    clone: function (obj) {
-        
-        if (obj == null) {
-            obj = new OpenLayers.Layer.WMS.Untiled(this.name,
-                                                   this.url,
-                                                   this.params,
-                                                   this.getOptions());
-        }
-
-        //get all additions from superclasses
-        obj = OpenLayers.Layer.WMS.prototype.clone.apply(this, [obj]);
-
-        // copy/set any non-init, non-simple values here
-
-        return obj;
-    }, 
-
-    CLASS_NAME: "OpenLayers.Layer.WMS.Untiled"
-});
-
-/**
- * Class: OpenLayers.Layer.MapServer.Untiled
- * *Deprecated*.  To be removed in 3.0.  Instead use OpenLayers.Layer.MapServer
- *     and pass the option 'singleTile' as true.
- * 
- * Inherits from: 
- *  - <OpenLayers.Layer.MapServer>
- */
-OpenLayers.Layer.MapServer.Untiled = OpenLayers.Class(OpenLayers.Layer.MapServer, {
-
-    /**
-     * APIProperty: singleTile
-     * {singleTile} Always true for untiled.
-     */
-    singleTile: true,
-
-    /**
-     * Constructor: OpenLayers.Layer.MapServer.Untiled
-     *
-     * Parameters:
-     * name - {String} 
-     * url - {String} 
-     * params - {Object} 
-     * options - {Object} 
-     */
-    initialize: function(name, url, params, options) {
-        OpenLayers.Layer.MapServer.prototype.initialize.apply(this, arguments);
-        
-        var msg = "The OpenLayers.Layer.MapServer.Untiled class is deprecated and " +
-                  "will be removed in 3.0. Instead, you should use the " +
-                  "normal OpenLayers.Layer.MapServer class, passing it the option " +
-                  "'singleTile' as true.";
-        OpenLayers.Console.warn(msg);
-    },    
-
-    /**
-     * Method: clone
-     * Create a clone of this layer
-     *
-     * Returns:
-     * {<OpenLayers.Layer.MapServer.Untiled>} An exact clone of this layer
-     */
-    clone: function (obj) {
-        
-        if (obj == null) {
-            obj = new OpenLayers.Layer.MapServer.Untiled(this.name,
-                                                         this.url,
-                                                         this.params,
-                                                         this.getOptions());
-        }
-
-        //get all additions from superclasses
-        obj = OpenLayers.Layer.MapServer.prototype.clone.apply(this, [obj]);
-
-        // copy/set any non-init, non-simple values here
-        
-        return obj;
-    }, 
-
-    CLASS_NAME: "OpenLayers.Layer.MapServer.Untiled"
-});
-
-/**
- * Class: OpenLayers.Tile.WFS
- * Instances of OpenLayers.Tile.WFS are used to manage the image tiles
- * used by various layers.  Create a new image tile with the
- * <OpenLayers.Tile.WFS> constructor.
- *
- * Inherits from:
- *  - <OpenLayers.Tile>
- */
-OpenLayers.Tile.WFS = OpenLayers.Class(OpenLayers.Tile, {
-
-    /**
-     * Property: features
-     * {Array(<OpenLayers.Feature>)} list of features in this tile
-     */
-    features: null,
-
-    /**
-     * Property: url
-     * {String}
-     */
-    url: null,
-
-    /**
-     * Property: request
-     * {<OpenLayers.Request.XMLHttpRequest>}
-     */
-    request: null,
-
-    /** TBD 3.0 - reorder the parameters to the init function to put URL
-     *             as last, so we can continue to call tile.initialize()
-     *             without changing the arguments.
-     *
-     * Constructor: OpenLayers.Tile.WFS
-     * Constructor for a new <OpenLayers.Tile.WFS> instance.
-     *
-     * Parameters:
-     * layer - {<OpenLayers.Layer>} layer that the tile will go in.
-     * position - {<OpenLayers.Pixel>}
-     * bounds - {<OpenLayers.Bounds>}
-     * url - {<String>}
-     * size - {<OpenLayers.Size>}
-     */
-    initialize: function(layer, position, bounds, url, size) {
-        OpenLayers.Tile.prototype.initialize.apply(this, arguments);
-        this.url = url;
-        this.features = [];
-    },
-
-    /**
-     * APIMethod: destroy
-     * nullify references to prevent circular references and memory leaks
-     */
-    destroy: function() {
-        OpenLayers.Tile.prototype.destroy.apply(this, arguments);
-        this.destroyAllFeatures();
-        this.features = null;
-        this.url = null;
-        if(this.request) {
-            this.request.abort();
-            //this.request.destroy();
-            this.request = null;
-        }
-    },
-
-    /**
-     * Method: clear
-     *  Clear the tile of any bounds/position-related data so that it can
-     *   be reused in a new location.
-     */
-    clear: function() {
-        this.destroyAllFeatures();
-    },
-
-    /**
-     * Method: draw
-     * Check that a tile should be drawn, and load features for it.
-     */
-    draw:function() {
-        if (OpenLayers.Tile.prototype.draw.apply(this, arguments)) {
-            if (this.isLoading) {
-                //if already loading, send 'reload' instead of 'loadstart'.
-                this.events.triggerEvent("reload");
-            } else {
-                this.isLoading = true;
-                this.events.triggerEvent("loadstart");
-            }
-            this.loadFeaturesForRegion(this.requestSuccess);
-        }
-    },
-
-    /**
-    * Method: loadFeaturesForRegion
-    * Abort any pending requests and issue another request for data.
-    *
-    * Input are function pointers for what to do on success and failure.
-    *
-    * Parameters:
-    * success - {function}
-    * failure - {function}
-    */
-    loadFeaturesForRegion:function(success, failure) {
-        if(this.request) {
-            this.request.abort();
-        }
-        this.request = OpenLayers.Request.GET({
-            url: this.url,
-            success: success,
-            failure: failure,
-            scope: this
-        });
-    },
-
-    /**
-    * Method: requestSuccess
-    * Called on return from request succcess. Adds results via
-    * layer.addFeatures in vector mode, addResults otherwise.
-    *
-    * Parameters:
-    * request - {<OpenLayers.Request.XMLHttpRequest>}
-    */
-    requestSuccess:function(request) {
-        if (this.features) {
-            var doc = request.responseXML;
-            if (!doc || !doc.documentElement) {
-                doc = request.responseText;
-            }
-            if (this.layer.vectorMode) {
-                this.layer.addFeatures(this.layer.formatObject.read(doc));
-            } else {
-                var xml = new OpenLayers.Format.XML();
-                if (typeof doc == "string") {
-                    doc = xml.read(doc);
-                }
-                var resultFeatures = xml.getElementsByTagNameNS(
-                    doc, "http://www.opengis.net/gml", "featureMember"
-                );
-                this.addResults(resultFeatures);
-            }
-        }
-        if (this.events) {
-            this.events.triggerEvent("loadend");
-        }
-
-        //request produced with success, we can delete the request object.
-        //this.request.destroy();
-        this.request = null;
-    },
-
-    /**
-     * Method: addResults
-     * Construct new feature via layer featureClass constructor, and add to
-     * this.features.
-     *
-     * Parameters:
-     * results - {Object}
-     */
-    addResults: function(results) {
-        for (var i=0; i < results.length; i++) {
-            var feature = new this.layer.featureClass(this.layer,
-                                                      results[i]);
-            this.features.push(feature);
-        }
-    },
-
-
-    /**
-     * Method: destroyAllFeatures
-     * Iterate through and call destroy() on each feature, removing it from
-     *   the local array
-     */
-    destroyAllFeatures: function() {
-        while(this.features.length > 0) {
-            var feature = this.features.shift();
-            feature.destroy();
-        }
-    },
-
-    CLASS_NAME: "OpenLayers.Tile.WFS"
-  }
-);
-
-/**
- * Class: OpenLayers.Feature.WFS
- * WFS handling class, for use as a featureClass on the WFS layer for handling
- * 'point' WFS types. Good for subclassing when creating a custom WFS like
- * XML application.
- *
- * Inherits from:
- *  - <OpenLayers.Feature>
- */
-OpenLayers.Feature.WFS = OpenLayers.Class(OpenLayers.Feature, {
-
-    /**
-     * Constructor: OpenLayers.Feature.WFS
-     * Create a WFS feature.
-     *
-     * Parameters:
-     * layer - {<OpenLayers.Layer>}
-     * xmlNode - {XMLNode}
-     */
-    initialize: function(layer, xmlNode) {
-        var newArguments = arguments;
-        var data = this.processXMLNode(xmlNode);
-        newArguments = new Array(layer, data.lonlat, data);
-        OpenLayers.Feature.prototype.initialize.apply(this, newArguments);
-        this.createMarker();
-        this.layer.addMarker(this.marker);
-    },
-
-    /**
-     * Method: destroy
-     * nullify references to prevent circular references and memory leaks
-     */
-    destroy: function() {
-        if (this.marker != null) {
-            this.layer.removeMarker(this.marker);
-        }
-        OpenLayers.Feature.prototype.destroy.apply(this, arguments);
-    },
-
-    /**
-     * Method: processXMLNode
-     * When passed an xmlNode, parses it for a GML point, and passes
-     * back an object describing that point.
-     *
-     * For subclasses of Feature.WFS, this is the feature to change.
-     *
-     * Parameters:
-     * xmlNode - {XMLNode}
-     *
-     * Returns:
-     * {Object} Data Object with 'id', 'lonlat', and private properties set
-     */
-    processXMLNode: function(xmlNode) {
-        //this should be overridden by subclasses
-        // must return an Object with 'id' and 'lonlat' values set
-        var point = OpenLayers.Ajax.getElementsByTagNameNS(xmlNode, "http://www.opengis.net/gml", "gml", "Point");
-        var text  = OpenLayers.Util.getXmlNodeValue(OpenLayers.Ajax.getElementsByTagNameNS(point[0], "http://www.opengis.net/gml","gml", "coordinates")[0]);
-        var floats = text.split(",");
-        return {lonlat: new OpenLayers.LonLat(parseFloat(floats[0]),
-                                              parseFloat(floats[1])),
-                id: null};
-
-    },
-
-    CLASS_NAME: "OpenLayers.Feature.WFS"
-});
-
-
-/**
- * Class: OpenLayers.Layer.WFS
- * *Deprecated*.  To be removed in 3.0.  Instead use OpenLayers.Layer.Vector
- *     with a Protocol.WFS and one or more Strategies.
- *
- * Inherits from:
- *  - <OpenLayers.Layer.Vector>
- *  - <OpenLayers.Layer.Markers>
- */
-OpenLayers.Layer.WFS = OpenLayers.Class(
-  OpenLayers.Layer.Vector, OpenLayers.Layer.Markers, {
-
-    /**
-     * APIProperty: isBaseLayer
-     * {Boolean} WFS layer is not a base layer by default.
-     */
-    isBaseLayer: false,
-
-    /**
-     * Property: tile
-     * {<OpenLayers.Tile.WFS>}
-     */
-    tile: null,
-
-    /**
-     * APIProperty: ratio
-     * {Float} The ratio property determines the size of the serverside query
-     *    relative to the map viewport size. By default, we load an area twice
-     *    as big as the map, to allow for panning without immediately reload.
-     *    Setting this to 1 will cause the area of the WFS request to match
-     *    the map area exactly. It is recommended to set this to some number
-     *    at least slightly larger than 1, otherwise accidental clicks can
-     *    cause a data reload, by moving the map only 1 pixel.
-     */
-    ratio: 2,
-
-    /**
-     * Property: DEFAULT_PARAMS
-     * {Object} Hashtable of default key/value parameters
-     */
-    DEFAULT_PARAMS: { service: "WFS",
-                      version: "1.0.0",
-                      request: "GetFeature"
-                    },
-
-    /**
-     * APIProperty: featureClass
-     * {<OpenLayers.Feature>} If featureClass is defined, an old-style markers
-     *     based WFS layer is created instead of a new-style vector layer. If
-     *     sent, this should be a subclass of OpenLayers.Feature
-     */
-    featureClass: null,
-
-    /**
-      * APIProperty: format
-      * {<OpenLayers.Format>} The format you want the data to be parsed with.
-      * Must be passed in the constructor. Should be a class, not an instance.
-      * This option can only be used if no featureClass is passed / vectorMode
-      * is false: if a featureClass is passed, then this parameter is ignored.
-      */
-    format: null,
-
-    /**
-     * Property: formatObject
-     * {<OpenLayers.Format>} Internally created/managed format object, used by
-     * the Tile to parse data.
-     */
-    formatObject: null,
-
-    /**
-     * APIProperty: formatOptions
-     * {Object} Hash of options which should be passed to the format when it is
-     * created. Must be passed in the constructor.
-     */
-    formatOptions: null,
-
-    /**
-     * Property: vectorMode
-     * {Boolean} Should be calculated automatically. Determines whether the
-     *     layer is in vector mode or marker mode.
-     */
-    vectorMode: true,
-
-    /**
-     * APIProperty: encodeBBOX
-     * {Boolean} Should the BBOX commas be encoded? The WMS spec says 'no',
-     *     but some services want it that way. Default false.
-     */
-    encodeBBOX: false,
-
-    /**
-     * APIProperty: extractAttributes
-     * {Boolean} Should the WFS layer parse attributes from the retrieved
-     *     GML? Defaults to false. If enabled, parsing is slower, but
-     *     attributes are available in the attributes property of
-     *     layer features.
-     */
-    extractAttributes: false,
-
-    /**
-     * Constructor: OpenLayers.Layer.WFS
-     *
-     * Parameters:
-     * name - {String}
-     * url - {String}
-     * params - {Object}
-     * options - {Object} Hashtable of extra options to tag onto the layer
-     */
-    initialize: function(name, url, params, options) {
-        if (options == undefined) { options = {}; }
-
-        if (options.featureClass ||
-            !OpenLayers.Layer.Vector ||
-            !OpenLayers.Feature.Vector) {
-            this.vectorMode = false;
-        }
-
-        // Uppercase params
-        params = OpenLayers.Util.upperCaseObject(params);
-
-        // Turn off error reporting, browsers like Safari may work
-        // depending on the setup, and we don't want an unneccesary alert.
-        OpenLayers.Util.extend(options, {'reportError': false});
-        var newArguments = [];
-        newArguments.push(name, options);
-        OpenLayers.Layer.Vector.prototype.initialize.apply(this, newArguments);
-        if (!this.renderer || !this.vectorMode) {
-            this.vectorMode = false;
-            if (!options.featureClass) {
-                options.featureClass = OpenLayers.Feature.WFS;
-            }
-            OpenLayers.Layer.Markers.prototype.initialize.apply(this,
-                                                                newArguments);
-        }
-
-        if (this.params && this.params.typename && !this.options.typename) {
-            this.options.typename = this.params.typename;
-        }
-
-        if (!this.options.geometry_column) {
-            this.options.geometry_column = "the_geom";
-        }
-
-        this.params = OpenLayers.Util.applyDefaults(
-            params,
-            OpenLayers.Util.upperCaseObject(this.DEFAULT_PARAMS)
-        );
-        this.url = url;
-    },
-
-
-    /**
-     * APIMethod: destroy
-     */
-    destroy: function() {
-        if (this.vectorMode) {
-            OpenLayers.Layer.Vector.prototype.destroy.apply(this, arguments);
-        } else {
-            OpenLayers.Layer.Markers.prototype.destroy.apply(this, arguments);
-        }
-        if (this.tile) {
-            this.tile.destroy();
-        }
-        this.tile = null;
-
-        this.ratio = null;
-        this.featureClass = null;
-        this.format = null;
-
-        if (this.formatObject && this.formatObject.destroy) {
-            this.formatObject.destroy();
-        }
-        this.formatObject = null;
-
-        this.formatOptions = null;
-        this.vectorMode = null;
-        this.encodeBBOX = null;
-        this.extractAttributes = null;
-    },
-
-    /**
-     * Method: setMap
-     *
-     * Parameters:
-     * map - {<OpenLayers.Map>}
-     */
-    setMap: function(map) {
-        if (this.vectorMode) {
-            OpenLayers.Layer.Vector.prototype.setMap.apply(this, arguments);
-
-            var options = {
-              'extractAttributes': this.extractAttributes
-            };
-
-            OpenLayers.Util.extend(options, this.formatOptions);
-            if (this.map && !this.projection.equals(this.map.getProjectionObject())) {
-                options.externalProjection = this.projection;
-                options.internalProjection = this.map.getProjectionObject();
-            }
-
-            this.formatObject = this.format ? new this.format(options) : new OpenLayers.Format.GML(options);
-        } else {
-            OpenLayers.Layer.Markers.prototype.setMap.apply(this, arguments);
-        }
-    },
-
-    /**
-     * Method: moveTo
-     *
-     * Parameters:
-     * bounds - {<OpenLayers.Bounds>}
-     * zoomChanged - {Boolean}
-     * dragging - {Boolean}
-     */
-    moveTo:function(bounds, zoomChanged, dragging) {
-        if (this.vectorMode) {
-            OpenLayers.Layer.Vector.prototype.moveTo.apply(this, arguments);
-        } else {
-            OpenLayers.Layer.Markers.prototype.moveTo.apply(this, arguments);
-        }
-
-        // don't load wfs features while dragging, wait for drag end
-        if (dragging) {
-            // TBD try to hide the vector layer while dragging
-            // this.setVisibility(false);
-            // this will probably help for panning performances
-            return false;
-        }
-
-        if ( zoomChanged ) {
-            if (this.vectorMode) {
-                this.renderer.clear();
-            }
-        }
-
-    //DEPRECATED - REMOVE IN 3.0
-        // don't load data if current zoom level doesn't match
-        if (this.options.minZoomLevel) {
-            OpenLayers.Console.warn(OpenLayers.i18n('minZoomLevelError'));
-
-            if (this.map.getZoom() < this.options.minZoomLevel) {
-                return null;
-            }
-        }
-
-        if (bounds == null) {
-            bounds = this.map.getExtent();
-        }
-
-        var firstRendering = (this.tile == null);
-
-        //does the new bounds to which we need to move fall outside of the
-        // current tile's bounds?
-        var outOfBounds = (!firstRendering &&
-                           !this.tile.bounds.containsBounds(bounds));
-
-        if (zoomChanged || firstRendering || (!dragging && outOfBounds)) {
-            //determine new tile bounds
-            var center = bounds.getCenterLonLat();
-            var tileWidth = bounds.getWidth() * this.ratio;
-            var tileHeight = bounds.getHeight() * this.ratio;
-            var tileBounds =
-                new OpenLayers.Bounds(center.lon - (tileWidth / 2),
-                                      center.lat - (tileHeight / 2),
-                                      center.lon + (tileWidth / 2),
-                                      center.lat + (tileHeight / 2));
-
-            //determine new tile size
-            var tileSize = this.map.getSize();
-            tileSize.w = tileSize.w * this.ratio;
-            tileSize.h = tileSize.h * this.ratio;
-
-            //determine new position (upper left corner of new bounds)
-            var ul = new OpenLayers.LonLat(tileBounds.left, tileBounds.top);
-            var pos = this.map.getLayerPxFromLonLat(ul);
-
-            //formulate request url string
-            var url = this.getFullRequestString();
-
-            var params = null;
-
-            // Cant combine "filter" and "BBOX". This is a cheap hack to help
-            // people out who can't migrate to the WFS protocol immediately.
-            var filter = this.params.filter || this.params.FILTER;
-            if (filter) {
-                params = {FILTER: filter};
-            }
-            else {
-                params = {BBOX: this.encodeBBOX ? tileBounds.toBBOX()
-                                                    : tileBounds.toArray()};
-            }
-
-            if (this.map && !this.projection.equals(this.map.getProjectionObject())) {
-                var projectedBounds = tileBounds.clone();
-                projectedBounds.transform(this.map.getProjectionObject(),
-                                          this.projection);
-                if (!filter){
-                    params.BBOX = this.encodeBBOX ? projectedBounds.toBBOX()
-                                                : projectedBounds.toArray();
-                }
-            }
-
-            url += "&" + OpenLayers.Util.getParameterString(params);
-
-            if (!this.tile) {
-                this.tile = new OpenLayers.Tile.WFS(this, pos, tileBounds,
-                                                     url, tileSize);
-                this.addTileMonitoringHooks(this.tile);
-                this.tile.draw();
-            } else {
-                if (this.vectorMode) {
-                    this.destroyFeatures();
-                    this.renderer.clear();
-                } else {
-                    this.clearMarkers();
-                }
-                this.removeTileMonitoringHooks(this.tile);
-                this.tile.destroy();
-
-                this.tile = null;
-                this.tile = new OpenLayers.Tile.WFS(this, pos, tileBounds,
-                                                     url, tileSize);
-                this.addTileMonitoringHooks(this.tile);
-                this.tile.draw();
-            }
-        }
-    },
-
-    /**
-     * Method: addTileMonitoringHooks
-     * This function takes a tile as input and adds the appropriate hooks to
-     *     the tile so that the layer can keep track of the loading tile
-     *     (making sure to check that the tile is always the layer's current
-     *     tile before taking any action).
-     *
-     * Parameters:
-     * tile - {<OpenLayers.Tile>}
-     */
-    addTileMonitoringHooks: function(tile) {
-        tile.onLoadStart = function() {
-            //if this is the the layer's current tile, then trigger
-            // a 'loadstart'
-            if (this == this.layer.tile) {
-                this.layer.events.triggerEvent("loadstart");
-            }
-        };
-        tile.events.register("loadstart", tile, tile.onLoadStart);
-
-        tile.onLoadEnd = function() {
-            //if this is the the layer's current tile, then trigger
-            // a 'tileloaded' and 'loadend'
-            if (this == this.layer.tile) {
-                this.layer.events.triggerEvent("tileloaded");
-                this.layer.events.triggerEvent("loadend");
-            }
-        };
-        tile.events.register("loadend", tile, tile.onLoadEnd);
-        tile.events.register("unload", tile, tile.onLoadEnd);
-    },
-
-    /**
-     * Method: removeTileMonitoringHooks
-     * This function takes a tile as input and removes the tile hooks
-     *     that were added in addTileMonitoringHooks()
-     *
-     * Parameters:
-     * tile - {<OpenLayers.Tile>}
-     */
-    removeTileMonitoringHooks: function(tile) {
-        tile.unload();
-        tile.events.un({
-            "loadstart": tile.onLoadStart,
-            "loadend": tile.onLoadEnd,
-            "unload": tile.onLoadEnd,
-            scope: tile
-        });
-    },
-
-    /**
-     * Method: onMapResize
-     * Call the onMapResize method of the appropriate parent class.
-     */
-    onMapResize: function() {
-        if(this.vectorMode) {
-            OpenLayers.Layer.Vector.prototype.onMapResize.apply(this,
-                                                                arguments);
-        } else {
-            OpenLayers.Layer.Markers.prototype.onMapResize.apply(this,
-                                                                 arguments);
-        }
-    },
-
-    /**
-     * Method: display
-     * Call the display method of the appropriate parent class.
-     */
-    display: function() {
-        if(this.vectorMode) {
-            OpenLayers.Layer.Vector.prototype.display.apply(this,
-                                                                arguments);
-        } else {
-            OpenLayers.Layer.Markers.prototype.display.apply(this,
-                                                                 arguments);
-        }
-    },
-
-    /**
-     * APIMethod: mergeNewParams
-     * Modify parameters for the layer and redraw.
-     *
-     * Parameters:
-     * newParams - {Object}
-     */
-    mergeNewParams:function(newParams) {
-        var upperParams = OpenLayers.Util.upperCaseObject(newParams);
-        var newArguments = [upperParams];
-        return OpenLayers.Layer.HTTPRequest.prototype.mergeNewParams.apply(this,
-                                                                 newArguments);
-    },
-
-    /**
-     * APIMethod: clone
-     *
-     * Parameters:
-     * obj - {Object}
-     *
-     * Returns:
-     * {<OpenLayers.Layer.WFS>} An exact clone of this OpenLayers.Layer.WFS
-     */
-    clone: function (obj) {
-
-        if (obj == null) {
-            obj = new OpenLayers.Layer.WFS(this.name,
-                                           this.url,
-                                           this.params,
-                                           this.getOptions());
-        }
-
-        //get all additions from superclasses
-        if (this.vectorMode) {
-            obj = OpenLayers.Layer.Vector.prototype.clone.apply(this, [obj]);
-        } else {
-            obj = OpenLayers.Layer.Markers.prototype.clone.apply(this, [obj]);
-        }
-
-        // copy/set any non-init, non-simple values here
-
-        return obj;
-    },
-
-    /**
-     * APIMethod: getFullRequestString
-     * combine the layer's url with its params and these newParams.
-     *
-     *    Add the SRS parameter from 'projection' -- this is probably
-     *     more eloquently done via a setProjection() method, but this
-     *     works for now and always.
-     *
-     * Parameters:
-     * newParams - {Object}
-     * altUrl - {String} Use this as the url instead of the layer's url
-     */
-    getFullRequestString:function(newParams, altUrl) {
-        var projectionCode = this.projection.getCode() || this.map.getProjection();
-        this.params.SRS = (projectionCode == "none") ? null : projectionCode;
-
-        return OpenLayers.Layer.Grid.prototype.getFullRequestString.apply(
-                                                    this, arguments);
-    },
-
-    /**
-     * APIMethod: commit
-     * Write out the data to a WFS server.
-     */
-    commit: function() {
-        if (!this.writer) {
-            var options = {};
-            if (this.map && !this.projection.equals(this.map.getProjectionObject())) {
-                options.externalProjection = this.projection;
-                options.internalProjection = this.map.getProjectionObject();
-            }
-
-            this.writer = new OpenLayers.Format.WFS(options,this);
-        }
-
-        var data = this.writer.write(this.features);
-
-        OpenLayers.Request.POST({
-            url: this.url,
-            data: data,
-            success: this.commitSuccess,
-            failure: this.commitFailure,
-            scope: this
-        });
-    },
-
-    /**
-     * Method: commitSuccess
-     * Called when the Ajax request returns a response
-     *
-     * Parameters:
-     * response - {XmlNode} from server
-     */
-    commitSuccess: function(request) {
-        var response = request.responseText;
-        if (response.indexOf('SUCCESS') != -1) {
-            this.commitReport(OpenLayers.i18n("commitSuccess", {'response':response}));
-
-            for(var i = 0; i < this.features.length; i++) {
-                this.features[i].state = null;
-            }
-            // TBD redraw the layer or reset the state of features
-            // foreach features: set state to null
-        } else if (response.indexOf('FAILED') != -1 ||
-            response.indexOf('Exception') != -1) {
-            this.commitReport(OpenLayers.i18n("commitFailed", {'response':response}));
-        }
-    },
-
-    /**
-     * Method: commitFailure
-     * Called when the Ajax request fails
-     *
-     * Parameters:
-     * response - {XmlNode} from server
-     */
-    commitFailure: function(request) {},
-
-    /**
-     * APIMethod: commitReport
-     * Called with a 'success' message if the commit succeeded, otherwise
-     *     a failure message, and the full request text as a second parameter.
-     *     Override this function to provide custom transaction reporting.
-     *
-     * string - {String} reporting string
-     * response - {String} full XML response
-     */
-    commitReport: function(string, response) {
-        OpenLayers.Console.userError(string);
-    },
-
-
-    /**
-     * APIMethod: refresh
-     * Refreshes all the features of the layer
-     */
-    refresh: function() {
-        if (this.tile) {
-            if (this.vectorMode) {
-                this.renderer.clear();
-                this.features.length = 0;
-            } else {
-                this.clearMarkers();
-                this.markers.length = 0;
-            }
-            this.tile.draw();
-        }
-    },
-
-    /**
-     * APIMethod: getDataExtent
-     * Calculates the max extent which includes all of the layer data.
-     *
-     * Returns:
-     * {<OpenLayers.Bounds>}
-     */
-    getDataExtent: function () {
-        var extent;
-        //get all additions from superclasses
-        if (this.vectorMode) {
-            extent = OpenLayers.Layer.Vector.prototype.getDataExtent.apply(this);
-        } else {
-            extent = OpenLayers.Layer.Markers.prototype.getDataExtent.apply(this);
-        }
-
-        return extent;
-    },
-
-    /**
-     * APIMethod: setOpacity
-     * Call the setOpacity method of the appropriate parent class to set the
-     *     opacity.
-     *
-     * Parameters:
-     * opacity - {Float}
-     */
-    setOpacity: function (opacity) {
-        if (this.vectorMode) {
-            OpenLayers.Layer.Vector.prototype.setOpacity.apply(this, [opacity]);
-        } else {
-            OpenLayers.Layer.Markers.prototype.setOpacity.apply(this, [opacity]);
-        }
-    },
-
-    CLASS_NAME: "OpenLayers.Layer.WFS"
-});
-
-/**
- * Class: OpenLayers.Layer.VirtualEarth
- * *Deprecated*. Use <OpenLayers.Layer.Bing> instead.
- *
- * Instances of OpenLayers.Layer.VirtualEarth are used to display the data from
- *     the Bing Maps AJAX Control (see e.g.
- *     http://msdn.microsoft.com/library/bb429619.aspx). Create a VirtualEarth
- *     layer with the <OpenLayers.Layer.VirtualEarth> constructor.
- *
- * Inherits from:
- *  - <OpenLayers.Layer.EventPane>
- *  - <OpenLayers.Layer.FixedZoomLevels>
- */
-OpenLayers.Layer.VirtualEarth = OpenLayers.Class(
-    OpenLayers.Layer.EventPane,
-    OpenLayers.Layer.FixedZoomLevels, {
-
-    /**
-     * Constant: MIN_ZOOM_LEVEL
-     * {Integer} 1
-     */
-    MIN_ZOOM_LEVEL: 1,
-
-    /**
-     * Constant: MAX_ZOOM_LEVEL
-     * {Integer} 19
-     */
-    MAX_ZOOM_LEVEL: 19,
-
-    /**
-     * Constant: RESOLUTIONS
-     * {Array(Float)} Hardcode these resolutions so that they are more closely
-     *                tied with the standard wms projection
-     */
-    RESOLUTIONS: [
-        1.40625,
-        0.703125,
-        0.3515625,
-        0.17578125,
-        0.087890625,
-        0.0439453125,
-        0.02197265625,
-        0.010986328125,
-        0.0054931640625,
-        0.00274658203125,
-        0.001373291015625,
-        0.0006866455078125,
-        0.00034332275390625,
-        0.000171661376953125,
-        0.0000858306884765625,
-        0.00004291534423828125,
-        0.00002145767211914062,
-        0.00001072883605957031,
-        0.00000536441802978515
-    ],
-
-    /**
-     * APIProperty: type
-     * {VEMapType}
-     */
-    type: null,
-
-    /**
-     * APIProperty: wrapDateLine
-     * {Boolean} Allow user to pan forever east/west.  Default is true.
-     *     Setting this to false only restricts panning if
-     *     <sphericalMercator> is true.
-     */
-    wrapDateLine: true,
-
-    /**
-     * APIProperty: sphericalMercator
-     * {Boolean} Should the map act as a mercator-projected map? This will
-     *     cause all interactions with the map to be in the actual map
-     *     projection, which allows support for vector drawing, overlaying
-     *     other maps, etc.
-     */
-    sphericalMercator: false,
-
-    /**
-     * APIProperty: animationEnabled
-     * {Boolean} If set to true, the transition between zoom levels will be
-     *     animated. Set to false to match the zooming experience of other
-     *     layer types. Default is true.
-     */
-    animationEnabled: true,
-
-    /**
-     * Constructor: OpenLayers.Layer.VirtualEarth
-     * Creates a new instance of a OpenLayers.Layer.VirtualEarth. If you use an
-     *     instance of OpenLayers.Layer.VirtualEarth in you map, you should set
-     *     the <OpenLayers.Map> option restrictedExtent to a meaningful value,
-     *     e.g.:
-     * (code)
-     * var map = new OpenLayers.Map( 'map', {
-     *     // other map options
-     *     restrictedExtent : OpenLayers.Bounds(-20037508, -20037508, 20037508, 20037508)
-     * } );
-     *
-     * var veLayer = new OpenLayers.Layer.VirtualEarth (
-     *     "Virtual Earth Layer"
-     * );
-     *
-     * map.addLayer( veLayer );
-     * (end)
-     *
-     * Parameters:
-     * name - {String}
-     * options - {Object}
-     */
-    initialize: function(name, options) {
-        OpenLayers.Layer.EventPane.prototype.initialize.apply(this, arguments);
-        OpenLayers.Layer.FixedZoomLevels.prototype.initialize.apply(this,
-                                                                    arguments);
-        if(this.sphericalMercator) {
-            OpenLayers.Util.extend(this, OpenLayers.Layer.SphericalMercator);
-            this.initMercatorParameters();
-        }
-    },
-
-    /**
-     * Method: loadMapObject
-     */
-    loadMapObject:function() {
-
-        // create div and set to same size as map
-        var veDiv = OpenLayers.Util.createDiv(this.name);
-        var sz = this.map.getSize();
-        veDiv.style.width = sz.w + "px";
-        veDiv.style.height = sz.h + "px";
-        this.div.appendChild(veDiv);
-
-        try { // crash prevention
-            this.mapObject = new VEMap(this.name);
-        } catch (e) { }
-
-        if (this.mapObject != null) {
-            try { // this is to catch a Mozilla bug without falling apart
-
-                // The fourth argument is whether the map is 'fixed' -- not
-                // draggable. See:
-                // http://blogs.msdn.com/virtualearth/archive/2007/09/28/locking-a-virtual-earth-map.aspx
-                //
-                this.mapObject.LoadMap(null, null, this.type, true);
-                this.mapObject.AttachEvent("onmousedown", OpenLayers.Function.True);
-
-            } catch (e) { }
-            this.mapObject.HideDashboard();
-            if(typeof this.mapObject.SetAnimationEnabled == "function") {
-                this.mapObject.SetAnimationEnabled(this.animationEnabled);
-            }
-        }
-
-        //can we do smooth panning? this is an unpublished method, so we need
-        // to be careful
-        if ( !this.mapObject ||
-             !this.mapObject.vemapcontrol ||
-             !this.mapObject.vemapcontrol.PanMap ||
-             (typeof this.mapObject.vemapcontrol.PanMap != "function")) {
-
-            this.dragPanMapObject = null;
-        }
-
-    },
-
-    /**
-     * Method: onMapResize
-     */
-    onMapResize: function() {
-        this.mapObject.Resize(this.map.size.w, this.map.size.h);
-    },
-
-    /**
-     * APIMethod: getWarningHTML
-     *
-     * Returns:
-     * {String} String with information on why layer is broken, how to get
-     *          it working.
-     */
-    getWarningHTML:function() {
-        return OpenLayers.i18n(
-            "getLayerWarning", {'layerType':'VE', 'layerLib':'VirtualEarth'}
-        );
-    },
-
-
-
-    /************************************
-     *                                  *
-     *   MapObject Interface Controls   *
-     *                                  *
-     ************************************/
-
-
-  // Get&Set Center, Zoom
-
-    /**
-     * APIMethod: setMapObjectCenter
-     * Set the mapObject to the specified center and zoom
-     *
-     * Parameters:
-     * center - {Object} MapObject LonLat format
-     * zoom - {int} MapObject zoom format
-     */
-    setMapObjectCenter: function(center, zoom) {
-        this.mapObject.SetCenterAndZoom(center, zoom);
-    },
-
-    /**
-     * APIMethod: getMapObjectCenter
-     *
-     * Returns:
-     * {Object} The mapObject's current center in Map Object format
-     */
-    getMapObjectCenter: function() {
-        return this.mapObject.GetCenter();
-    },
-
-    /**
-     * APIMethod: dragPanMapObject
-     *
-     * Parameters:
-     * dX - {Integer}
-     * dY - {Integer}
-     */
-    dragPanMapObject: function(dX, dY) {
-        this.mapObject.vemapcontrol.PanMap(dX, -dY);
-    },
-
-    /**
-     * APIMethod: getMapObjectZoom
-     *
-     * Returns:
-     * {Integer} The mapObject's current zoom, in Map Object format
-     */
-    getMapObjectZoom: function() {
-        return this.mapObject.GetZoomLevel();
-    },
-
-
-  // LonLat - Pixel Translation
-
-    /**
-     * APIMethod: getMapObjectLonLatFromMapObjectPixel
-     *
-     * Parameters:
-     * moPixel - {Object} MapObject Pixel format
-     *
-     * Returns:
-     * {Object} MapObject LonLat translated from MapObject Pixel
-     */
-    getMapObjectLonLatFromMapObjectPixel: function(moPixel) {
-        //the conditional here is to test if we are running the v6 of VE
-        return (typeof VEPixel != 'undefined')
-            ? this.mapObject.PixelToLatLong(moPixel)
-            : this.mapObject.PixelToLatLong(moPixel.x, moPixel.y);
-    },
-
-    /**
-     * APIMethod: getMapObjectPixelFromMapObjectLonLat
-     *
-     * Parameters:
-     * moLonLat - {Object} MapObject LonLat format
-     *
-     * Returns:
-     * {Object} MapObject Pixel transtlated from MapObject LonLat
-     */
-    getMapObjectPixelFromMapObjectLonLat: function(moLonLat) {
-        return this.mapObject.LatLongToPixel(moLonLat);
-    },
-
-
-    /************************************
-     *                                  *
-     *       MapObject Primitives       *
-     *                                  *
-     ************************************/
-
-
-  // LonLat
-
-    /**
-     * APIMethod: getLongitudeFromMapObjectLonLat
-     *
-     * Parameters:
-     * moLonLat - {Object} MapObject LonLat format
-     *
-     * Returns:
-     * {Float} Longitude of the given MapObject LonLat
-     */
-    getLongitudeFromMapObjectLonLat: function(moLonLat) {
-        return this.sphericalMercator ?
-            this.forwardMercator(moLonLat.Longitude, moLonLat.Latitude).lon :
-            moLonLat.Longitude;
-    },
-
-    /**
-     * APIMethod: getLatitudeFromMapObjectLonLat
-     *
-     * Parameters:
-     * moLonLat - {Object} MapObject LonLat format
-     *
-     * Returns:
-     * {Float} Latitude of the given MapObject LonLat
-     */
-    getLatitudeFromMapObjectLonLat: function(moLonLat) {
-        return this.sphericalMercator ?
-            this.forwardMercator(moLonLat.Longitude, moLonLat.Latitude).lat :
-            moLonLat.Latitude;
-    },
-
-    /**
-     * APIMethod: getMapObjectLonLatFromLonLat
-     *
-     * Parameters:
-     * lon - {Float}
-     * lat - {Float}
-     *
-     * Returns:
-     * {Object} MapObject LonLat built from lon and lat params
-     */
-    getMapObjectLonLatFromLonLat: function(lon, lat) {
-        var veLatLong;
-        if(this.sphericalMercator) {
-            var lonlat = this.inverseMercator(lon, lat);
-            veLatLong = new VELatLong(lonlat.lat, lonlat.lon);
-        } else {
-            veLatLong = new VELatLong(lat, lon);
-        }
-        return veLatLong;
-    },
-
-  // Pixel
-
-    /**
-     * APIMethod: getXFromMapObjectPixel
-     *
-     * Parameters:
-     * moPixel - {Object} MapObject Pixel format
-     *
-     * Returns:
-     * {Integer} X value of the MapObject Pixel
-     */
-    getXFromMapObjectPixel: function(moPixel) {
-        return moPixel.x;
-    },
-
-    /**
-     * APIMethod: getYFromMapObjectPixel
-     *
-     * Parameters:
-     * moPixel - {Object} MapObject Pixel format
-     *
-     * Returns:
-     * {Integer} Y value of the MapObject Pixel
-     */
-    getYFromMapObjectPixel: function(moPixel) {
-        return moPixel.y;
-    },
-
-    /**
-     * APIMethod: getMapObjectPixelFromXY
-     *
-     * Parameters:
-     * x - {Integer}
-     * y - {Integer}
-     *
-     * Returns:
-     * {Object} MapObject Pixel from x and y parameters
-     */
-    getMapObjectPixelFromXY: function(x, y) {
-        //the conditional here is to test if we are running the v6 of VE
-        return (typeof VEPixel != 'undefined') ? new VEPixel(x, y)
-                         : new Msn.VE.Pixel(x, y);
-    },
-
-    CLASS_NAME: "OpenLayers.Layer.VirtualEarth"
-});
-
-/*
- * Copyright 2007, Google Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *  1. Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *  2. Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *  3. Neither the name of Google Inc. nor the names of its contributors may be
- *     used to endorse or promote products derived from this software without
- *     specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
- * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Sets up google.gears.*, which is *the only* supported way to access Gears.
- *
- * Circumvent this file at your own risk!
- *
- * In the future, Gears may automatically define google.gears.* without this
- * file. Gears may use these objects to transparently fix bugs and compatibility
- * issues. Applications that use the code below will continue to work seamlessly
- * when that happens.
- */
-
-(function() {
-  // We are already defined. Hooray!
-  if (window.google && google.gears) {
-    return;
-  }
-
-  var factory = null;
-
-  // Firefox
-  if (typeof GearsFactory != 'undefined') {
-    factory = new GearsFactory();
-  } else {
-    // IE
-    try {
-      factory = new ActiveXObject('Gears.Factory');
-      // privateSetGlobalObject is only required and supported on WinCE.
-      if (factory.getBuildInfo().indexOf('ie_mobile') != -1) {
-        factory.privateSetGlobalObject(this);
-      }
-    } catch (e) {
-      // Safari
-      if ((typeof navigator.mimeTypes != 'undefined')
-           && navigator.mimeTypes["application/x-googlegears"]) {
-        factory = document.createElement("object");
-        factory.style.display = "none";
-        factory.width = 0;
-        factory.height = 0;
-        factory.type = "application/x-googlegears";
-        document.documentElement.appendChild(factory);
-      }
-    }
-  }
-
-  // *Do not* define any objects if Gears is not installed. This mimics the
-  // behavior of Gears defining the objects in the future.
-  if (!factory) {
-    return;
-  }
-
-  // Now set up the objects, being careful not to overwrite anything.
-  //
-  // Note: In Internet Explorer for Windows Mobile, you can't add properties to
-  // the window object. However, global objects are automatically added as
-  // properties of the window object in all browsers.
-  if (!window.google) {
-    google = {};
-  }
-
-  if (!google.gears) {
-    google.gears = {factory: factory};
-  }
-})();
-
-/**
- * Class: OpenLayers.Protocol.SQL
- * Abstract SQL protocol class.  Not to be instantiated directly.  Use
- *     one of the SQL protocol subclasses instead.
- *
- * Inherits from:
- *  - <OpenLayers.Protocol>
- */
-OpenLayers.Protocol.SQL = OpenLayers.Class(OpenLayers.Protocol, {
-
-    /**
-     * APIProperty: databaseName
-     * {String}
-     */
-    databaseName: 'ol',
-
-    /**
-     * APIProperty: tableName
-     * Name of the database table into which Features should be saved.
-     */
-    tableName: "ol_vector_features",
-
-    /**
-     * Property: postReadFiltering
-     * {Boolean} Whether the filter (if there's one) must be applied after
-     *      the features have been read from the database; for example the
-     *      BBOX strategy passes the read method a BBOX spatial filter, if
-     *      postReadFiltering is true every feature read from the database
-     *      will go through the BBOX spatial filter, which can be costly;
-     *      defaults to true.
-     */
-    postReadFiltering: true,
-
-    /**
-     * Constructor: OpenLayers.Protocol.SQL
-     */
-    initialize: function(options) {
-        OpenLayers.Protocol.prototype.initialize.apply(this, [options]);
-    },
-
-    /**
-     * APIMethod: destroy
-     * Clean up the protocol.
-     */
-    destroy: function() {
-        OpenLayers.Protocol.prototype.destroy.apply(this);
-    },
-
-    /**
-     * APIMethod: supported
-     * This should be overridden by specific subclasses
-     *
-     * Returns:
-     * {Boolean} Whether or not the browser supports the SQL backend
-     */
-    supported: function() {
-        return false;
-    },
-
-    /**
-     * Method: evaluateFilter
-     * If postReadFiltering is true evaluate the filter against the feature
-     * and return the result of the evaluation, otherwise return true.
-     *
-     * Parameters:
-     * {<OpenLayers.Feature.Vector>} The feature.
-     * {<OpenLayers.Filter>} The filter.
-     *
-     * Returns:
-     * {Boolean} true if postReadFiltering if false, the result of the
-     * filter evaluation otherwise.
-     */
-    evaluateFilter: function(feature, filter) {
-        return filter && this.postReadFiltering ?
-            filter.evaluate(feature) : true;
-    },
-
-    CLASS_NAME: "OpenLayers.Protocol.SQL"
-});
-
-/**
- * Class: OpenLayers.Protocol.SQL.Gears
- * This Protocol stores feature in the browser via the Gears Database module
- * <http://code.google.com/apis/gears/api_database.html>.
- *
- * The main advantage is that all the read, create, update and delete operations
- * can be done offline.
- *
- * Inherits from:
- *  - <OpenLayers.Protocol.SQL>
- */
-OpenLayers.Protocol.SQL.Gears = OpenLayers.Class(OpenLayers.Protocol.SQL, {
-
-    /**
-     * Property: FID_PREFIX
-     * {String}
-     */
-    FID_PREFIX: '__gears_fid__',
-
-    /**
-     * Property: NULL_GEOMETRY
-     * {String}
-     */
-    NULL_GEOMETRY: '__gears_null_geometry__',
-
-    /**
-     * Property: NULL_FEATURE_STATE
-     * {String}
-     */
-    NULL_FEATURE_STATE: '__gears_null_feature_state__',
-
-    /**
-     * Property: jsonParser
-     * {<OpenLayers.Format.JSON>}
-     */
-    jsonParser: null,
-
-    /**
-     * Property: wktParser
-     * {<OpenLayers.Format.WKT>}
-     */
-    wktParser: null,
-
-    /**
-     * Property: fidRegExp
-     * {RegExp} Regular expression to know whether a feature was
-     *      created in offline mode.
-     */
-    fidRegExp: null,
-
-    /**
-     * Property: saveFeatureState
-     * {Boolean} Whether to save the feature state (<OpenLayers.State>)
-     *      into the database, defaults to true.
-     */
-    saveFeatureState: true,
-
-    /**
-     * Property: typeOfFid
-     * {String} The type of the feature identifier, either "number" or
-     *      "string", defaults to "string".
-     */
-    typeOfFid: "string",
-
-    /**
-     * Property: db
-     * {GearsDatabase}
-     */
-    db: null,
-
-    /**
-     * Constructor: OpenLayers.Protocol.SQL.Gears
-     */
-    initialize: function(options) {
-        if (!this.supported()) {
-            return;
-        }
-        OpenLayers.Protocol.SQL.prototype.initialize.apply(this, [options]);
-        this.jsonParser = new OpenLayers.Format.JSON();
-        this.wktParser = new OpenLayers.Format.WKT();
-
-        this.fidRegExp = new RegExp('^' + this.FID_PREFIX);
-        this.initializeDatabase();
-
-
-    },
-
-    /**
-     * Method: initializeDatabase
-     */
-    initializeDatabase: function() {
-        this.db = google.gears.factory.create('beta.database');
-        this.db.open(this.databaseName);
-        this.db.execute(
-            "CREATE TABLE IF NOT EXISTS " + this.tableName +
-            " (fid TEXT UNIQUE, geometry TEXT, properties TEXT," +
-            "  state TEXT)");
-   },
-
-    /**
-     * APIMethod: destroy
-     * Clean up the protocol.
-     */
-    destroy: function() {
-        this.db.close();
-        this.db = null;
-
-        this.jsonParser = null;
-        this.wktParser = null;
-
-        OpenLayers.Protocol.SQL.prototype.destroy.apply(this);
-    },
-
-    /**
-     * APIMethod: supported
-     * Determine whether a browser supports Gears
-     *
-     * Returns:
-     * {Boolean} The browser supports Gears
-     */
-    supported: function() {
-        return !!(window.google && google.gears);
-    },
-
-    /**
-     * APIMethod: read
-     * Read all features from the database and return a
-     * <OpenLayers.Protocol.Response> instance. If the options parameter
-     * contains a callback attribute, the function is called with the response
-     * as a parameter.
-     *
-     * Parameters:
-     * options - {Object} Optional object for configuring the request; it
-     *      can have the {Boolean} property "noFeatureStateReset" which
-     *      specifies if the state of features read from the Gears
-     *      database must be reset to null, if "noFeatureStateReset"
-     *      is undefined or false then each feature's state is reset
-     *      to null, if "noFeatureStateReset" is true the feature state
-     *      is preserved.
-     *
-     * Returns:
-     * {<OpenLayers.Protocol.Response>} An <OpenLayers.Protocol.Response>
-     *      object.
-     */
-    read: function(options) {
-        OpenLayers.Protocol.prototype.read.apply(this, arguments);
-        options = OpenLayers.Util.applyDefaults(options, this.options);
-
-        var feature, features = [];
-        var rs = this.db.execute("SELECT * FROM " + this.tableName);
-        while (rs.isValidRow()) {
-            feature = this.unfreezeFeature(rs);
-            if (this.evaluateFilter(feature, options.filter)) {
-                if (!options.noFeatureStateReset) {
-                    feature.state = null;
-                }
-                features.push(feature);
-            }
-            rs.next();
-        }
-        rs.close();
-
-        var resp = new OpenLayers.Protocol.Response({
-            code: OpenLayers.Protocol.Response.SUCCESS,
-            requestType: "read",
-            features: features
-        });
-
-        if (options && options.callback) {
-            options.callback.call(options.scope, resp);
-        }
-
-        return resp;
-    },
-
-    /**
-     * Method: unfreezeFeature
-     *
-     * Parameters:
-     * row - {ResultSet}
-     *
-     * Returns:
-     * {<OpenLayers.Feature.Vector>}
-     */
-    unfreezeFeature: function(row) {
-        var feature;
-        var wkt = row.fieldByName('geometry');
-        if (wkt == this.NULL_GEOMETRY) {
-            feature = new OpenLayers.Feature.Vector();
-        } else {
-            feature = this.wktParser.read(wkt);
-        }
-
-        feature.attributes = this.jsonParser.read(
-            row.fieldByName('properties'));
-
-        feature.fid = this.extractFidFromField(row.fieldByName('fid'));
-
-        var state = row.fieldByName('state');
-        if (state == this.NULL_FEATURE_STATE) {
-            state = null;
-        }
-        feature.state = state;
-
-        return feature;
-    },
-
-    /**
-     * Method: extractFidFromField
-     *
-     * Parameters:
-     * field - {String}
-     *
-     * Returns
-     * {String} or {Number} The fid.
-     */
-    extractFidFromField: function(field) {
-        if (!field.match(this.fidRegExp) && this.typeOfFid == "number") {
-            field = parseFloat(field);
-        }
-        return field;
-    },
-
-    /**
-     * APIMethod: create
-     * Create new features into the database.
-     *
-     * Parameters:
-     * features - {Array({<OpenLayers.Feature.Vector>})} or
-     *            {<OpenLayers.Feature.Vector>} The features to create in
-     *            the database.
-     * options - {Object} Optional object for configuring the request.
-     *
-     * Returns:
-     *  {<OpenLayers.Protocol.Response>} An <OpenLayers.Protocol.Response>
-     *          object.
-     */
-    create: function(features, options) {
-        options = OpenLayers.Util.applyDefaults(options, this.options);
-
-        var resp = this.createOrUpdate(features);
-        resp.requestType = "create";
-
-        if (options && options.callback) {
-            options.callback.call(options.scope, resp);
-        }
-
-        return resp;
-    },
-
-    /**
-     * APIMethod: update
-     * Construct a request updating modified feature.
-     *
-     * Parameters:
-     * features - {Array({<OpenLayers.Feature.Vector>})} or
-     *            {<OpenLayers.Feature.Vector>} The features to update in
-     *            the database.
-     * options - {Object} Optional object for configuring the request.
-     *
-     * Returns:
-     *  {<OpenLayers.Protocol.Response>} An <OpenLayers.Protocol.Response>
-     *          object.
-     */
-    update: function(features, options) {
-        options = OpenLayers.Util.applyDefaults(options, this.options);
-
-        var resp = this.createOrUpdate(features);
-        resp.requestType = "update";
-
-        if (options && options.callback) {
-            options.callback.call(options.scope, resp);
-        }
-
-        return resp;
-    },
-
-    /**
-     * Method: createOrUpdate
-     * Construct a request for updating or creating features in the
-     * database.
-     *
-     * Parameters:
-     * features - {Array({<OpenLayers.Feature.Vector>})} or
-     *      {<OpenLayers.Feature.Vector>} The feature to create or update
-     *      in the database.
-     *
-     * Returns:
-     *  {<OpenLayers.Protocol.Response>} An <OpenLayers.Protocol.Response>
-     *          object.
-     */
-    createOrUpdate: function(features) {
-        if (!(OpenLayers.Util.isArray(features))) {
-            features = [features];
-        }
-
-        var i, len = features.length, feature;
-        var insertedFeatures = new Array(len);
-
-        for (i = 0; i < len; i++) {
-            feature = features[i];
-            var params = this.freezeFeature(feature);
-            this.db.execute(
-                "REPLACE INTO " + this.tableName +
-                " (fid, geometry, properties, state)" +
-                " VALUES (?, ?, ?, ?)",
-                params);
-
-            var clone = feature.clone();
-            clone.fid = this.extractFidFromField(params[0]);
-            insertedFeatures[i] = clone;
-        }
-
-        return new OpenLayers.Protocol.Response({
-            code: OpenLayers.Protocol.Response.SUCCESS,
-            features: insertedFeatures,
-            reqFeatures: features
-        });
-    },
-
-    /**
-     * Method: freezeFeature
-     *
-     * Parameters:
-     * feature - {<OpenLayers.Feature.Vector>}
-     * state - {String} The feature state to store in the database.
-     *
-     * Returns:
-     * {Array}
-     */
-    freezeFeature: function(feature) {
-        // 2 notes:
-        // - fid might not be a string
-        // - getFeatureStateForFreeze needs the feature fid to it's stored
-        //   in the feature here
-        feature.fid = feature.fid != null ?
-            "" + feature.fid : OpenLayers.Util.createUniqueID(this.FID_PREFIX);
-
-        var geometry = feature.geometry != null ?
-            feature.geometry.toString() : this.NULL_GEOMETRY;
-
-        var properties = this.jsonParser.write(feature.attributes);
-
-        var state = this.getFeatureStateForFreeze(feature);
-
-        return [feature.fid, geometry, properties, state];
-    },
-
-    /**
-     * Method: getFeatureStateForFreeze
-     * Get the state of the feature to store into the database.
-     *
-     * Parameters:
-     * feature - {<OpenLayers.Feature.Vector>} The feature.
-     *
-     * Returns
-     * {String} The state
-     */
-    getFeatureStateForFreeze: function(feature) {
-        var state;
-        if (!this.saveFeatureState) {
-            state = this.NULL_FEATURE_STATE;
-        } else if (this.createdOffline(feature)) {
-            // if the feature was created in offline mode, its
-            // state must remain INSERT
-            state = OpenLayers.State.INSERT;
-        } else {
-            state = feature.state;
-        }
-        return state;
-    },
-
-    /**
-     * APIMethod: delete
-     * Delete features from the database.
-     *
-     * Parameters:
-     * features - {Array({<OpenLayers.Feature.Vector>})} or
-     *            {<OpenLayers.Feature.Vector>}
-     * options - {Object} Optional object for configuring the request.
-     *       This object is modified and should not be reused.
-     *
-     * Returns:
-     *  {<OpenLayers.Protocol.Response>} An <OpenLayers.Protocol.Response>
-     *          object.
-     */
-    "delete": function(features, options) {
-        if (!(OpenLayers.Util.isArray(features))) {
-            features = [features];
-        }
-
-        options = OpenLayers.Util.applyDefaults(options, this.options);
-
-        var i, len, feature;
-        for (i = 0, len = features.length; i < len; i++) {
-            feature = features[i];
-
-            // if saveFeatureState is set to true and if the feature wasn't created
-            // in offline mode we don't delete it in the database but just update
-            // it state column
-            if (this.saveFeatureState && !this.createdOffline(feature)) {
-                var toDelete = feature.clone();
-                toDelete.fid = feature.fid;
-                if (toDelete.geometry) {
-                    toDelete.geometry.destroy();
-                    toDelete.geometry = null;
-                }
-                toDelete.state = feature.state;
-                this.createOrUpdate(toDelete);
-            } else {
-                this.db.execute(
-                    "DELETE FROM " + this.tableName +
-                    " WHERE fid = ?", [feature.fid]);
-            }
-        }
-
-        var resp = new OpenLayers.Protocol.Response({
-            code: OpenLayers.Protocol.Response.SUCCESS,
-            requestType: "delete",
-            reqFeatures: features
-        });
-
-        if (options && options.callback) {
-            options.callback.call(options.scope, resp);
-        }
-
-        return resp;
-    },
-
-    /**
-     * Method: createdOffline
-     * Returns true if the feature had a feature id when it was created in
-     *      the Gears database, false otherwise; this is determined by
-     *      checking the form of the feature's fid value.
-     *
-     * Parameters:
-     * feature - {<OpenLayers.Feature.Vector>}
-     *
-     * Returns:
-     * {Boolean}
-     */
-    createdOffline: function(feature) {
-        return (typeof feature.fid == "string" &&
-                !!(feature.fid.match(this.fidRegExp)));
-    },
-
-    /**
-     * APIMethod: commit
-     * Go over the features and for each take action
-     * based on the feature state. Possible actions are create,
-     * update and delete.
-     *
-     * Parameters:
-     * features - {Array({<OpenLayers.Feature.Vector>})}
-     * options - {Object} Object whose possible keys are "create", "update",
-     *      "delete", "callback" and "scope", the values referenced by the
-     *      first three are objects as passed to the "create", "update", and
-     *      "delete" methods, the value referenced by the "callback" key is
-     *      a function which is called when the commit operation is complete
-     *      using the scope referenced by the "scope" key.
-     *
-     * Returns:
-     * {Array({<OpenLayers.Protocol.Response>})} An array of
-     *       <OpenLayers.Protocol.Response> objects, one per request made
-     *       to the database.
-     */
-    commit: function(features, options) {
-        var opt, resp = [], nRequests = 0, nResponses = 0;
-
-        function callback(resp) {
-            if (++nResponses < nRequests) {
-                resp.last = false;
-            }
-            this.callUserCallback(options, resp);
-        }
-
-        var feature, toCreate = [], toUpdate = [], toDelete = [];
-        for (var i = features.length - 1; i >= 0; i--) {
-            feature = features[i];
-            switch (feature.state) {
-            case OpenLayers.State.INSERT:
-                toCreate.push(feature);
-                break;
-            case OpenLayers.State.UPDATE:
-                toUpdate.push(feature);
-                break;
-            case OpenLayers.State.DELETE:
-                toDelete.push(feature);
-                break;
-            }
-        }
-        if (toCreate.length > 0) {
-            nRequests++;
-            opt = OpenLayers.Util.applyDefaults(
-                {"callback": callback, "scope": this},
-                options.create
-            );
-            resp.push(this.create(toCreate, opt));
-        }
-        if (toUpdate.length > 0) {
-            nRequests++;
-            opt = OpenLayers.Util.applyDefaults(
-                {"callback": callback, "scope": this},
-                options.update
-            );
-            resp.push(this.update(toUpdate, opt));
-        }
-        if (toDelete.length > 0) {
-            nRequests++;
-            opt = OpenLayers.Util.applyDefaults(
-                {"callback": callback, "scope": this},
-                options["delete"]
-            );
-            resp.push(this["delete"](toDelete, opt));
-        }
-
-        return resp;
-    },
-
-    /**
-     * Method: clear
-     * Removes all rows of the table.
-     */
-    clear: function() {
-        this.db.execute("DELETE FROM " + this.tableName);
-    },
-
-    /**
-     * Method: callUserCallback
-     * This method is called from within commit each time a request is made
-     * to the database, it is responsible for calling the user-supplied
-     * callbacks.
-     *
-     * Parameters:
-     * options - {Object} The map of options passed to the commit call.
-     * resp - {<OpenLayers.Protocol.Response>}
-     */
-    callUserCallback: function(options, resp) {
-        var opt = options[resp.requestType];
-        if (opt && opt.callback) {
-            opt.callback.call(opt.scope, resp);
-        }
-        if (resp.last && options.callback) {
-            options.callback.call(options.scope);
-        }
-    },
-
-    CLASS_NAME: "OpenLayers.Protocol.SQL.Gears"
-});
-
-/**
- * Class: OpenLayers.Layer.Yahoo
- *
- * Inherits from:
- *  - <OpenLayers.Layer.EventPane>
- *  - <OpenLayers.Layer.FixedZoomLevels>
- */
-OpenLayers.Layer.Yahoo = OpenLayers.Class(
-  OpenLayers.Layer.EventPane, OpenLayers.Layer.FixedZoomLevels, {
-
-    /**
-     * Constant: MIN_ZOOM_LEVEL
-     * {Integer} 0
-     */
-    MIN_ZOOM_LEVEL: 0,
-
-    /**
-     * Constant: MAX_ZOOM_LEVEL
-     * {Integer} 17
-     */
-    MAX_ZOOM_LEVEL: 17,
-
-    /**
-     * Constant: RESOLUTIONS
-     * {Array(Float)} Hardcode these resolutions so that they are more closely
-     *                tied with the standard wms projection
-     */
-    RESOLUTIONS: [
-        1.40625,
-        0.703125,
-        0.3515625,
-        0.17578125,
-        0.087890625,
-        0.0439453125,
-        0.02197265625,
-        0.010986328125,
-        0.0054931640625,
-        0.00274658203125,
-        0.001373291015625,
-        0.0006866455078125,
-        0.00034332275390625,
-        0.000171661376953125,
-        0.0000858306884765625,
-        0.00004291534423828125,
-        0.00002145767211914062,
-        0.00001072883605957031
-    ],
-
-    /**
-     * APIProperty: type
-     * {YahooMapType}
-     */
-    type: null,
-
-    /**
-     * APIProperty: wrapDateLine
-     * {Boolean} Allow user to pan forever east/west.  Default is true.
-     *     Setting this to false only restricts panning if
-     *     <sphericalMercator> is true.
-     */
-    wrapDateLine: true,
-
-    /**
-     * APIProperty: sphericalMercator
-     * {Boolean} Should the map act as a mercator-projected map? This will
-     * cause all interactions with the map to be in the actual map projection,
-     * which allows support for vector drawing, overlaying other maps, etc.
-     */
-    sphericalMercator: false,
-
-    /**
-     * Constructor: OpenLayers.Layer.Yahoo
-     *
-     * Parameters:
-     * name - {String}
-     * options - {Object}
-     */
-    initialize: function(name, options) {
-        OpenLayers.Layer.EventPane.prototype.initialize.apply(this, arguments);
-        OpenLayers.Layer.FixedZoomLevels.prototype.initialize.apply(this,
-                                                                    arguments);
-        if(this.sphericalMercator) {
-            OpenLayers.Util.extend(this, OpenLayers.Layer.SphericalMercator);
-            this.initMercatorParameters();
-        }
-    },
-
-    /**
-     * Method: loadMapObject
-     */
-    loadMapObject:function() {
-        try { //do not crash!
-            var size = this.getMapObjectSizeFromOLSize(this.map.getSize());
-            this.mapObject = new YMap(this.div, this.type, size);
-            this.mapObject.disableKeyControls();
-            this.mapObject.disableDragMap();
-
-            //can we do smooth panning? (moveByXY is not an API function)
-            if ( !this.mapObject.moveByXY ||
-                 (typeof this.mapObject.moveByXY != "function" ) ) {
-
-                this.dragPanMapObject = null;
-            }
-        } catch(e) {}
-    },
-
-    /**
-     * Method: onMapResize
-     *
-     */
-    onMapResize: function() {
-        try {
-            var size = this.getMapObjectSizeFromOLSize(this.map.getSize());
-            this.mapObject.resizeTo(size);
-        } catch(e) {}
-    },
-
-
-    /**
-     * APIMethod: setMap
-     * Overridden from EventPane because we need to remove this yahoo event
-     *     pane which prohibits our drag and drop, and we can only do this
-     *     once the map has been loaded and centered.
-     *
-     * Parameters:
-     * map - {<OpenLayers.Map>}
-     */
-    setMap: function(map) {
-        OpenLayers.Layer.EventPane.prototype.setMap.apply(this, arguments);
-
-        this.map.events.register("moveend", this, this.fixYahooEventPane);
-    },
-
-    /**
-     * Method: fixYahooEventPane
-     * The map has been centered, so the mysterious yahoo eventpane has been
-     *     added. we remove it so that it doesnt mess with *our* event pane.
-     */
-    fixYahooEventPane: function() {
-        var yahooEventPane = OpenLayers.Util.getElement("ygddfdiv");
-        if (yahooEventPane != null) {
-            if (yahooEventPane.parentNode != null) {
-                yahooEventPane.parentNode.removeChild(yahooEventPane);
-            }
-            this.map.events.unregister("moveend", this,
-                                       this.fixYahooEventPane);
-        }
-    },
-
-    /**
-     * APIMethod: getWarningHTML
-     *
-     * Returns:
-     * {String} String with information on why layer is broken, how to get
-     *          it working.
-     */
-    getWarningHTML:function() {
-        return OpenLayers.i18n(
-            "getLayerWarning", {'layerType':'Yahoo', 'layerLib':'Yahoo'}
-        );
-    },
-
-  /********************************************************/
-  /*                                                      */
-  /*             Translation Functions                    */
-  /*                                                      */
-  /*    The following functions translate GMaps and OL    */
-  /*     formats for Pixel, LonLat, Bounds, and Zoom      */
-  /*                                                      */
-  /********************************************************/
-
-
-  //
-  // TRANSLATION: MapObject Zoom <-> OpenLayers Zoom
-  //
-
-    /**
-     * APIMethod: getOLZoomFromMapObjectZoom
-     *
-     * Parameters:
-     * gZoom - {Integer}
-     *
-     * Returns:
-     * {Integer} An OpenLayers Zoom level, translated from the passed in gZoom
-     *           Returns null if null value is passed in.
-     */
-    getOLZoomFromMapObjectZoom: function(moZoom) {
-        var zoom = null;
-        if (moZoom != null) {
-            zoom = OpenLayers.Layer.FixedZoomLevels.prototype.getOLZoomFromMapObjectZoom.apply(this, [moZoom]);
-            zoom = 18 - zoom;
-        }
-        return zoom;
-    },
-
-    /**
-     * APIMethod: getMapObjectZoomFromOLZoom
-     *
-     * Parameters:
-     * olZoom - {Integer}
-     *
-     * Returns:
-     * {Integer} A MapObject level, translated from the passed in olZoom
-     *           Returns null if null value is passed in
-     */
-    getMapObjectZoomFromOLZoom: function(olZoom) {
-        var zoom = null;
-        if (olZoom != null) {
-            zoom = OpenLayers.Layer.FixedZoomLevels.prototype.getMapObjectZoomFromOLZoom.apply(this, [olZoom]);
-            zoom = 18 - zoom;
-        }
-        return zoom;
-    },
-
-    /************************************
-     *                                  *
-     *   MapObject Interface Controls   *
-     *                                  *
-     ************************************/
-
-
-  // Get&Set Center, Zoom
-
-    /**
-     * APIMethod: setMapObjectCenter
-     * Set the mapObject to the specified center and zoom
-     *
-     * Parameters:
-     * center - {Object} MapObject LonLat format
-     * zoom - {int} MapObject zoom format
-     */
-    setMapObjectCenter: function(center, zoom) {
-        this.mapObject.drawZoomAndCenter(center, zoom);
-    },
-
-    /**
-     * APIMethod: getMapObjectCenter
-     *
-     * Returns:
-     * {Object} The mapObject's current center in Map Object format
-     */
-    getMapObjectCenter: function() {
-        return this.mapObject.getCenterLatLon();
-    },
-
-    /**
-     * APIMethod: dragPanMapObject
-     *
-     * Parameters:
-     * dX - {Integer}
-     * dY - {Integer}
-     */
-    dragPanMapObject: function(dX, dY) {
-        this.mapObject.moveByXY({
-            'x': -dX,
-            'y': dY
-        });
-    },
-
-    /**
-     * APIMethod: getMapObjectZoom
-     *
-     * Returns:
-     * {Integer} The mapObject's current zoom, in Map Object format
-     */
-    getMapObjectZoom: function() {
-        return this.mapObject.getZoomLevel();
-    },
-
-
-  // LonLat - Pixel Translation
-
-    /**
-     * APIMethod: getMapObjectLonLatFromMapObjectPixel
-     *
-     * Parameters:
-     * moPixel - {Object} MapObject Pixel format
-     *
-     * Returns:
-     * {Object} MapObject LonLat translated from MapObject Pixel
-     */
-    getMapObjectLonLatFromMapObjectPixel: function(moPixel) {
-        return this.mapObject.convertXYLatLon(moPixel);
-    },
-
-    /**
-     * APIMethod: getMapObjectPixelFromMapObjectLonLat
-     *
-     * Parameters:
-     * moLonLat - {Object} MapObject LonLat format
-     *
-     * Returns:
-     * {Object} MapObject Pixel transtlated from MapObject LonLat
-     */
-    getMapObjectPixelFromMapObjectLonLat: function(moLonLat) {
-        return this.mapObject.convertLatLonXY(moLonLat);
-    },
-
-
-    /************************************
-     *                                  *
-     *       MapObject Primitives       *
-     *                                  *
-     ************************************/
-
-
-  // LonLat
-
-    /**
-     * APIMethod: getLongitudeFromMapObjectLonLat
-     *
-     * Parameters:
-     * moLonLat - {Object} MapObject LonLat format
-     *
-     * Returns:
-     * {Float} Longitude of the given MapObject LonLat
-     */
-    getLongitudeFromMapObjectLonLat: function(moLonLat) {
-        return this.sphericalMercator ?
-            this.forwardMercator(moLonLat.Lon, moLonLat.Lat).lon :
-            moLonLat.Lon;
-    },
-
-    /**
-     * APIMethod: getLatitudeFromMapObjectLonLat
-     *
-     * Parameters:
-     * moLonLat - {Object} MapObject LonLat format
-     *
-     * Returns:
-     * {Float} Latitude of the given MapObject LonLat
-     */
-    getLatitudeFromMapObjectLonLat: function(moLonLat) {
-        return this.sphericalMercator ?
-            this.forwardMercator(moLonLat.Lon, moLonLat.Lat).lat :
-            moLonLat.Lat;
-    },
-
-    /**
-     * APIMethod: getMapObjectLonLatFromLonLat
-     *
-     * Parameters:
-     * lon - {Float}
-     * lat - {Float}
-     *
-     * Returns:
-     * {Object} MapObject LonLat built from lon and lat params
-     */
-    getMapObjectLonLatFromLonLat: function(lon, lat) {
-        var yLatLong;
-        if(this.sphericalMercator) {
-            var lonlat = this.inverseMercator(lon, lat);
-            yLatLong = new YGeoPoint(lonlat.lat, lonlat.lon);
-        } else {
-            yLatLong = new YGeoPoint(lat, lon);
-        }
-        return yLatLong;
-    },
-
-  // Pixel
-
-    /**
-     * APIMethod: getXFromMapObjectPixel
-     *
-     * Parameters:
-     * moPixel - {Object} MapObject Pixel format
-     *
-     * Returns:
-     * {Integer} X value of the MapObject Pixel
-     */
-    getXFromMapObjectPixel: function(moPixel) {
-        return moPixel.x;
-    },
-
-    /**
-     * APIMethod: getYFromMapObjectPixel
-     *
-     * Parameters:
-     * moPixel - {Object} MapObject Pixel format
-     *
-     * Returns:
-     * {Integer} Y value of the MapObject Pixel
-     */
-    getYFromMapObjectPixel: function(moPixel) {
-        return moPixel.y;
-    },
-
-    /**
-     * APIMethod: getMapObjectPixelFromXY
-     *
-     * Parameters:
-     * x - {Integer}
-     * y - {Integer}
-     *
-     * Returns:
-     * {Object} MapObject Pixel from x and y parameters
-     */
-    getMapObjectPixelFromXY: function(x, y) {
-        return new YCoordPoint(x, y);
-    },
-
-  // Size
-
-    /**
-     * APIMethod: getMapObjectSizeFromOLSize
-     *
-     * Parameters:
-     * olSize - {<OpenLayers.Size>}
-     *
-     * Returns:
-     * {Object} MapObject Size from olSize parameter
-     */
-    getMapObjectSizeFromOLSize: function(olSize) {
-        return new YSize(olSize.w, olSize.h);
-    },
-
-    CLASS_NAME: "OpenLayers.Layer.Yahoo"
-});
-
-/**
- * Class: OpenLayers.Layer.GML
- * Create a vector layer by parsing a GML file. The GML file is
- *     passed in as a parameter.
- * *Deprecated*.  To be removed in 3.0.  Instead use OpenLayers.Layer.Vector
- *     with Protocol.HTTP and Strategy.Fixed. Provide the protocol with a
- *     format parameter to get the parser you want for your data.
- *
- * Inherits from:
- *  - <OpenLayers.Layer.Vector>
- */
-OpenLayers.Layer.GML = OpenLayers.Class(OpenLayers.Layer.Vector, {
-
-    /**
-      * Property: loaded
-      * {Boolean} Flag for whether the GML data has been loaded yet.
-      */
-    loaded: false,
-
-    /**
-      * APIProperty: format
-      * {<OpenLayers.Format>} The format you want the data to be parsed with.
-      */
-    format: null,
-
-    /**
-     * APIProperty: formatOptions
-     * {Object} Hash of options which should be passed to the format when it is
-     * created. Must be passed in the constructor.
-     */
-    formatOptions: null,
-
-    /**
-     * Constructor: OpenLayers.Layer.GML
-     * Load and parse a single file on the web, according to the format
-     * provided via the 'format' option, defaulting to GML.
-     *
-     * Parameters:
-     * name - {String}
-     * url - {String} URL of a GML file.
-     * options - {Object} Hashtable of extra options to tag onto the layer.
-     */
-     initialize: function(name, url, options) {
-        var newArguments = [];
-        newArguments.push(name, options);
-        OpenLayers.Layer.Vector.prototype.initialize.apply(this, newArguments);
-        this.url = url;
-    },
-
-    /**
-     * APIMethod: setVisibility
-     * Set the visibility flag for the layer and hide/show&redraw accordingly.
-     * Fire event unless otherwise specified
-     * GML will be loaded if the layer is being made visible for the first
-     * time.
-     *
-     * Parameters:
-     * visible - {Boolean} Whether or not to display the layer
-     *                          (if in range)
-     * noEvent - {Boolean}
-     */
-    setVisibility: function(visibility, noEvent) {
-        OpenLayers.Layer.Vector.prototype.setVisibility.apply(this, arguments);
-        if(this.visibility && !this.loaded){
-            // Load the GML
-            this.loadGML();
-        }
-    },
-
-    /**
-     * Method: moveTo
-     * If layer is visible and GML has not been loaded, load GML, then load GML
-     * and call OpenLayers.Layer.Vector.moveTo() to redraw at the new location.
-     *
-     * Parameters:
-     * bounds - {Object}
-     * zoomChanged - {Object}
-     * minor - {Object}
-     */
-    moveTo:function(bounds, zoomChanged, minor) {
-        OpenLayers.Layer.Vector.prototype.moveTo.apply(this, arguments);
-        // Wait until initialisation is complete before loading GML
-        // otherwise we can get a race condition where the root HTML DOM is
-        // loaded after the GML is paited.
-        // See http://trac.openlayers.org/ticket/404
-        if(this.visibility && !this.loaded){
-            this.loadGML();
-        }
-    },
-
-    /**
-     * Method: loadGML
-     */
-    loadGML: function() {
-        if (!this.loaded) {
-            this.events.triggerEvent("loadstart");
-            OpenLayers.Request.GET({
-                url: this.url,
-                success: this.requestSuccess,
-                failure: this.requestFailure,
-                scope: this
-            });
-            this.loaded = true;
-        }
-    },
-
-    /**
-     * Method: setUrl
-     * Change the URL and reload the GML
-     *
-     * Parameters:
-     * url - {String} URL of a GML file.
-     */
-    setUrl:function(url) {
-        this.url = url;
-        this.destroyFeatures();
-        this.loaded = false;
-        this.loadGML();
-    },
-
-    /**
-     * Method: requestSuccess
-     * Process GML after it has been loaded.
-     * Called by initialize() and loadUrl() after the GML has been loaded.
-     *
-     * Parameters:
-     * request - {String}
-     */
-    requestSuccess:function(request) {
-        var doc = request.responseXML;
-
-        if (!doc || !doc.documentElement) {
-            doc = request.responseText;
-        }
-
-        var options = {};
-
-        OpenLayers.Util.extend(options, this.formatOptions);
-        if (this.map && !this.projection.equals(this.map.getProjectionObject())) {
-            options.externalProjection = this.projection;
-            options.internalProjection = this.map.getProjectionObject();
-        }
-
-        var gml = this.format ? new this.format(options) : new OpenLayers.Format.GML(options);
-        this.addFeatures(gml.read(doc));
-        this.events.triggerEvent("loadend");
-    },
-
-    /**
-     * Method: requestFailure
-     * Process a failed loading of GML.
-     * Called by initialize() and loadUrl() if there was a problem loading GML.
-     *
-     * Parameters:
-     * request - {String}
-     */
-    requestFailure: function(request) {
-        OpenLayers.Console.userError('Error in loading GML file ' +  this.url);
-        this.events.triggerEvent("loadend");
-    },
-
-    CLASS_NAME: "OpenLayers.Layer.GML"
-});
-
-/**
- * Class: OpenLayers.Geometry.Rectangle
- * This class is *not supported*, and probably isn't what you're looking for.
- *     Instead, most users probably want something like:
- *     (code)
- *     var poly = new OpenLayers.Bounds(0,0,10,10).toGeometry();
- *     (end)
- *     This will create a rectangular Polygon geometry. 
- * 
- * Inherits:
- *  - <OpenLayers.Geometry>
- */
-
-OpenLayers.Geometry.Rectangle = OpenLayers.Class(OpenLayers.Geometry, {
-
-    /** 
-     * Property: x
-     * {Float}
-     */
-    x: null,
-
-    /** 
-     * Property: y
-     * {Float}
-     */
-    y: null,
-
-    /** 
-     * Property: width
-     * {Float}
-     */
-    width: null,
-
-    /** 
-     * Property: height
-     * {Float}
-     */
-    height: null,
-
-    /**
-     * Constructor: OpenLayers.Geometry.Rectangle
-     * 
-     * Parameters:
-     * points - {Array(<OpenLayers.Geometry.Point>)}
-     */
-    initialize: function(x, y, width, height) {
-        OpenLayers.Geometry.prototype.initialize.apply(this, arguments);
-        
-        this.x = x;
-        this.y = y;
-
-        this.width = width;
-        this.height = height;
-    },
-    
-    /**
-     * Method: calculateBounds
-     * Recalculate the bounds for the geometry.
-     */
-    calculateBounds: function() {
-        this.bounds = new OpenLayers.Bounds(this.x, this.y,
-                                            this.x + this.width, 
-                                            this.y + this.height);
-    },
-    
-    
-    /**
-     * APIMethod: getLength
-     * 
-     * Returns:
-     * {Float} The length of the geometry
-     */
-    getLength: function() {
-        var length = (2 * this.width) + (2 * this.height);
-        return length;
-    },
-
-    /**
-     * APIMethod: getArea
-     * 
-     * Returns:
-     * {Float} The area of the geometry
-     */
-    getArea: function() {
-        var area = this.width * this.height;
-        return area;
-    },    
-
-    CLASS_NAME: "OpenLayers.Geometry.Rectangle"
-});
-
-/**
- * Class: OpenLayers.Renderer.NG
- *
- * Inherits from:
- *  - <OpenLayers.Renderer.Elements>
- */
-OpenLayers.Renderer.NG = OpenLayers.Class(OpenLayers.Renderer.Elements, {
-
-    /**
-     * Constant: labelNodeType
-     * {String} The node type for text label containers. To be defined by
-     * subclasses.
-     */
-    labelNodeType: null,
-
-    /**
-     * Constructor: OpenLayers.Renderer.NG
-     *
-     * Parameters:
-     * containerID - {String}
-     * options - {Object} options for this renderer. Supported options are:
-     *     * yOrdering - {Boolean} Whether to use y-ordering
-     *     * zIndexing - {Boolean} Whether to use z-indexing. Will be ignored
-     *         if yOrdering is set to true.
-     */
-
-    /**
-     * Method: updateDimensions
-     * To be extended by subclasses - here we set positioning related styles
-     * on HTML elements, subclasses have to do the same for renderer specific
-     * elements (e.g. viewBox, width and height of the rendererRoot)
-     *
-     * Parameters:
-     * zoomChanged - {Boolean} Has the zoom changed? If so, subclasses may have
-     *     to update feature styles/dimensions.
-     */
-    updateDimensions: function(zoomChanged) {
-        var mapExtent = this.map.getExtent();
-        var renderExtent = mapExtent.scale(3);
-        this.setExtent(renderExtent, true);
-        var res = this.getResolution();
-        var div = this.rendererRoot.parentNode;
-        var layerLeft = parseFloat(div.parentNode.style.left);
-        var layerTop = parseFloat(div.parentNode.style.top);
-        div.style.left = ((renderExtent.left - mapExtent.left) / res - layerLeft) + "px";
-        div.style.top = ((mapExtent.top - renderExtent.top) / res - layerTop) + "px";
-    },
-
-    /**
-     * Method: resize
-     */
-    setSize: function() {
-        this.map.getExtent() && this.updateDimensions();
-    },
-
-    /**
-     * Method: drawFeature
-     * Draw the feature.  The optional style argument can be used
-     * to override the feature's own style.  This method should only
-     * be called from layer.drawFeature().
-     *
-     * Parameters:
-     * feature - {<OpenLayers.Feature.Vector>}
-     * style - {<Object>}
-     *
-     * Returns:
-     * {Boolean} true if the feature has been drawn completely, false if not,
-     *     undefined if the feature had no geometry
-     */
-    drawFeature: function(feature, style) {
-        if(style == null) {
-            style = feature.style;
-        }
-        if (feature.geometry) {
-            var rendered = this.drawGeometry(feature.geometry, style, feature.id);
-            if(rendered !== false && style.label) {
-                var location = feature.geometry.getCentroid();
-                this.drawText(feature.id, style, location);
-            } else {
-                this.removeText(feature.id);
-            }
-            return rendered;
-        }
-    },
-
-    /**
-     * Method: drawText
-     * Function for drawing text labels.
-     * This method is only called by the renderer itself.
-     *
-     * Parameters:
-     * featureId - {String|DOMElement}
-     * style - {Object}
-     * location - {<OpenLayers.Geometry.Point>}, will be modified inline
-     *
-     * Returns:
-     * {DOMElement} container holding the text label (to be populated by
-     * subclasses)
-     */
-    drawText: function(featureId, style, location) {
-        var label;
-        if (typeof featureId !== "string") {
-            label = featureId;
-        } else {
-            label = this.nodeFactory(featureId + this.LABEL_ID_SUFFIX, this.labelNodeType);
-            label._featureId = featureId;
-        }
-        label._style = style;
-        label._x = location.x;
-        label._y = location.y;
-        if(style.labelXOffset || style.labelYOffset) {
-            var xOffset = isNaN(style.labelXOffset) ? 0 : style.labelXOffset;
-            var yOffset = isNaN(style.labelYOffset) ? 0 : style.labelYOffset;
-            var res = this.getResolution();
-            location.move(xOffset*res, yOffset*res);
-        }
-
-        if(label.parentNode !== this.textRoot) {
-            this.textRoot.appendChild(label);
-        }
-
-        return label;
-    },
-
-    CLASS_NAME: "OpenLayers.Renderer.NG"
-});
-
-// Monkey-patching Layer.Vector for Renderer.NG support
-(function() {
-    var moveTo = OpenLayers.Layer.Vector.prototype.moveTo;
-    OpenLayers.Layer.Vector.prototype.moveTo = function(bounds, zoomChanged, dragging) {
-        if (OpenLayers.Renderer.NG && this.renderer instanceof OpenLayers.Renderer.NG) {
-            OpenLayers.Layer.prototype.moveTo.apply(this, arguments);
-            dragging || this.renderer.updateDimensions(zoomChanged);
-            if (!this.drawn) {
-                this.drawn = true;
-                var feature;
-                for(var i=0, len=this.features.length; i<len; i++) {
-                    this.renderer.locked = (i !== (len - 1));
-                    feature = this.features[i];
-                    this.drawFeature(feature);
-                }
-            }
-        } else {
-            moveTo.apply(this, arguments);
-        }
-    }
-    var redraw = OpenLayers.Layer.Vector.prototype.redraw;
-    OpenLayers.Layer.Vector.prototype.redraw = function() {
-        if (OpenLayers.Renderer.NG && this.renderer instanceof OpenLayers.Renderer.NG) {
-            this.drawn = false;
-        }
-        redraw.apply(this, arguments);
-    }
-})();
-
-/**
- * Class: OpenLayers.Renderer.SVG2
- *
- * Inherits from:
- *  - <OpenLayers.Renderer.NG>
- */
-OpenLayers.Renderer.SVG2 = OpenLayers.Class(OpenLayers.Renderer.NG, {
-
-    /**
-     * Property: xmlns
-     * {String}
-     */
-    xmlns: "http://www.w3.org/2000/svg",
-
-    /**
-     * Property: xlinkns
-     * {String}
-     */
-    xlinkns: "http://www.w3.org/1999/xlink",
-
-    /**
-     * Property: symbolMetrics
-     * {Object} Cache for symbol metrics according to their svg coordinate
-     *     space. This is an object keyed by the symbol's id, and values are
-     *     an object with size, x and y properties.
-     */
-    symbolMetrics: null,
-
-    /**
-     * Constant: labelNodeType
-     * {String} The node type for text label containers.
-     */
-    labelNodeType: "g",
-
-    /**
-     * Constructor: OpenLayers.Renderer.SVG2
-     *
-     * Parameters:
-     * containerID - {String}
-     */
-    initialize: function(containerID) {
-        if (!this.supported()) {
-            return;
-        }
-        OpenLayers.Renderer.Elements.prototype.initialize.apply(this,
-                                                                arguments);
-
-        this.symbolMetrics = {};
-    },
-
-    /**
-     * APIMethod: supported
-     *
-     * Returns:
-     * {Boolean} Whether or not the browser supports the SVG renderer
-     */
-    supported: function() {
-        var svgFeature = "http://www.w3.org/TR/SVG11/feature#";
-        return (document.implementation &&
-           (document.implementation.hasFeature("org.w3c.svg", "1.0") ||
-            document.implementation.hasFeature(svgFeature + "SVG", "1.1") ||
-            document.implementation.hasFeature(svgFeature + "BasicStructure", "1.1") ));
-    },
-
-    /**
-     * Method: updateDimensions
-     *
-     * Parameters:
-     * zoomChanged - {Boolean}
-     */
-    updateDimensions: function(zoomChanged) {
-        OpenLayers.Renderer.NG.prototype.updateDimensions.apply(this, arguments);
-
-        var res = this.getResolution();
-
-        var width = this.extent.getWidth();
-        var height = this.extent.getHeight();
-
-        var extentString = [
-            this.extent.left,
-            -this.extent.top,
-            width,
-            height
-        ].join(" ");
-        this.rendererRoot.setAttributeNS(null, "viewBox", extentString);
-        this.rendererRoot.setAttributeNS(null, "width", width / res);
-        this.rendererRoot.setAttributeNS(null, "height", height / res);
-
-        if (zoomChanged === true) {
-            // update styles for the new resolution
-            var i, len;
-            var nodes = this.vectorRoot.childNodes;
-            for (i=0, len=nodes.length; i<len; ++i) {
-                this.setStyle(nodes[i]);
-            }
-            var textNodes = this.textRoot.childNodes;
-            var label;
-            for (i=0, len=textNodes.length; i<len; ++i) {
-                label = textNodes[i];
-                this.drawText(label, label._style,
-                    new OpenLayers.Geometry.Point(label._x, label._y)
-                );
-            }
-        }
-    },
-
-    /**
-     * Method: getNodeType
-     *
-     * Parameters:
-     * geometry - {<OpenLayers.Geometry>}
-     * style - {Object}
-     *
-     * Returns:
-     * {String} The corresponding node type for the specified geometry
-     */
-    getNodeType: function(geometry, style) {
-        var nodeType = null;
-        switch (geometry.CLASS_NAME) {
-            case "OpenLayers.Geometry.Point":
-                if (style.externalGraphic) {
-                    nodeType = "image";
-                } else if (this.isComplexSymbol(style.graphicName)) {
-                    nodeType = "svg";
-                } else {
-                    nodeType = "circle";
-                }
-                break;
-            case "OpenLayers.Geometry.Rectangle":
-                nodeType = "rect";
-                break;
-            case "OpenLayers.Geometry.LineString":
-                nodeType = "polyline";
-                break;
-            case "OpenLayers.Geometry.LinearRing":
-                nodeType = "polygon";
-                break;
-            case "OpenLayers.Geometry.Polygon":
-            case "OpenLayers.Geometry.Curve":
-                nodeType = "path";
-                break;
-            default:
-                break;
-        }
-        return nodeType;
-    },
-
-    /**
-     * Method: setStyle
-     * Use to set all the style attributes to a SVG node.
-     *
-     * Takes care to adjust stroke width and point radius to be
-     * resolution-relative
-     *
-     * Parameters:
-     * node - {SVGDomElement} An SVG element to decorate
-     * style - {Object}
-     * options - {Object} Currently supported options include
-     *                              'isFilled' {Boolean} and
-     *                              'isStroked' {Boolean}
-     */
-    setStyle: function(node, style, options) {
-        style = style  || node._style;
-        options = options || node._options;
-        var resolution = this.getResolution();
-        var r = node._radius;
-        var widthFactor = resolution;
-        if (node._geometryClass == "OpenLayers.Geometry.Point" && r) {
-            node.style.visibility = "";
-            if (style.graphic === false) {
-                node.style.visibility = "hidden";
-            } else if (style.externalGraphic) {
-
-                if (style.graphicTitle) {
-                    node.setAttributeNS(null, "title", style.graphicTitle);
-                    //Standards-conformant SVG
-                    // Prevent duplicate nodes. See issue https://github.com/openlayers/openlayers/issues/92
-                    var titleNode = node.getElementsByTagName("title");
-                    if (titleNode.length > 0) {
-                        titleNode[0].firstChild.textContent = style.graphicTitle;
-                    } else {
-                        var label = this.nodeFactory(null, "title");
-                        label.textContent = style.graphicTitle;
-                        node.appendChild(label);
-                    }
-                }
-                if (style.graphicWidth && style.graphicHeight) {
-                    node.setAttributeNS(null, "preserveAspectRatio", "none");
-                }
-                var width = style.graphicWidth || style.graphicHeight;
-                var height = style.graphicHeight || style.graphicWidth;
-                width = width ? width : style.pointRadius*2;
-                height = height ? height : style.pointRadius*2;
-                width *= resolution;
-                height *= resolution;
-
-                var xOffset = (style.graphicXOffset != undefined) ?
-                    style.graphicXOffset * resolution : -(0.5 * width);
-                var yOffset = (style.graphicYOffset != undefined) ?
-                    style.graphicYOffset * resolution : -(0.5 * height);
-
-                var opacity = style.graphicOpacity || style.fillOpacity;
-
-                node.setAttributeNS(null, "x", node._x + xOffset);
-                node.setAttributeNS(null, "y", node._y + yOffset);
-                node.setAttributeNS(null, "width", width);
-                node.setAttributeNS(null, "height", height);
-                node.setAttributeNS(this.xlinkns, "href", style.externalGraphic);
-                node.setAttributeNS(null, "style", "opacity: "+opacity);
-                node.onclick = OpenLayers.Renderer.SVG2.preventDefault;
-            } else if (this.isComplexSymbol(style.graphicName)) {
-                // the symbol viewBox is three times as large as the symbol
-                var offset = style.pointRadius * 3 * resolution;
-                var size = offset * 2;
-                var src = this.importSymbol(style.graphicName);
-                widthFactor = this.symbolMetrics[src.id].size * 3 / size * resolution;
-
-                // remove the node from the dom before we modify it. This
-                // prevents various rendering issues in Safari and FF
-                var parent = node.parentNode;
-                var nextSibling = node.nextSibling;
-                if(parent) {
-                    parent.removeChild(node);
-                }
-
-                // The more appropriate way to implement this would be use/defs,
-                // but due to various issues in several browsers, it is safer to
-                // copy the symbols instead of referencing them.
-                // See e.g. ticket http://trac.osgeo.org/openlayers/ticket/2985
-                // and this email thread
-                // http://osgeo-org.1803224.n2.nabble.com/Select-Control-Ctrl-click-on-Feature-with-a-graphicName-opens-new-browser-window-tc5846039.html
-                node.firstChild && node.removeChild(node.firstChild);
-                node.appendChild(src.firstChild.cloneNode(true));
-                node.setAttributeNS(null, "viewBox", src.getAttributeNS(null, "viewBox"));
-
-                node.setAttributeNS(null, "width", size);
-                node.setAttributeNS(null, "height", size);
-                node.setAttributeNS(null, "x", node._x - offset);
-                node.setAttributeNS(null, "y", node._y - offset);
-
-                // now that the node has all its new properties, insert it
-                // back into the dom where it was
-                if(nextSibling) {
-                    parent.insertBefore(node, nextSibling);
-                } else if(parent) {
-                    parent.appendChild(node);
-                }
-            } else {
-                node.setAttributeNS(null, "r", style.pointRadius * resolution);
-            }
-
-            var rotation = style.rotation;
-            if (rotation !== undefined || node._rotation !== undefined) {
-                node._rotation = rotation;
-                rotation |= 0;
-                if (node.nodeName !== "svg") {
-                    node.setAttributeNS(null, "transform",
-                        ["rotate(", rotation, node._x, node._y, ")"].join(" ")
-                    );
-                } else {
-                    var metrics = this.symbolMetrics[src.id];
-                    node.firstChild.setAttributeNS(null, "transform",
-                        ["rotate(", rotation, metrics.x, metrics.y, ")"].join(" ")
-                    );
-                }
-            }
-        }
-
-        if (options.isFilled) {
-            node.setAttributeNS(null, "fill", style.fillColor);
-            node.setAttributeNS(null, "fill-opacity", style.fillOpacity);
-        } else {
-            node.setAttributeNS(null, "fill", "none");
-        }
-
-        if (options.isStroked) {
-            node.setAttributeNS(null, "stroke", style.strokeColor);
-            node.setAttributeNS(null, "stroke-opacity", style.strokeOpacity);
-            node.setAttributeNS(null, "stroke-width", style.strokeWidth * widthFactor);
-            node.setAttributeNS(null, "stroke-linecap", style.strokeLinecap || "round");
-            // Hard-coded linejoin for now, to make it look the same as in VML.
-            // There is no strokeLinejoin property yet for symbolizers.
-            node.setAttributeNS(null, "stroke-linejoin", "round");
-            style.strokeDashstyle && node.setAttributeNS(null,
-                "stroke-dasharray", this.dashStyle(style, widthFactor));
-        } else {
-            node.setAttributeNS(null, "stroke", "none");
-        }
-
-        if (style.pointerEvents) {
-            node.setAttributeNS(null, "pointer-events", style.pointerEvents);
-        }
-
-        if (style.cursor != null) {
-            node.setAttributeNS(null, "cursor", style.cursor);
-        }
-
-        return node;
-    },
-
-    /**
-     * Method: dashStyle
-     *
-     * Parameters:
-     * style - {Object}
-     * widthFactor - {Number}
-     *
-     * Returns:
-     * {String} A SVG compliant 'stroke-dasharray' value
-     */
-    dashStyle: function(style, widthFactor) {
-        var w = style.strokeWidth * widthFactor;
-        var str = style.strokeDashstyle;
-        switch (str) {
-            case 'solid':
-                return 'none';
-            case 'dot':
-                return [widthFactor, 4 * w].join();
-            case 'dash':
-                return [4 * w, 4 * w].join();
-            case 'dashdot':
-                return [4 * w, 4 * w, widthFactor, 4 * w].join();
-            case 'longdash':
-                return [8 * w, 4 * w].join();
-            case 'longdashdot':
-                return [8 * w, 4 * w, widthFactor, 4 * w].join();
-            default:
-                var parts = OpenLayers.String.trim(str).split(/\s+/g);
-                for (var i=0, ii=parts.length; i<ii; i++) {
-                    parts[i] = parts[i] * widthFactor;
-                }
-                return parts.join();
-        }
-    },
-
-    /**
-     * Method: createNode
-     *
-     * Parameters:
-     * type - {String} Kind of node to draw
-     * id - {String} Id for node
-     *
-     * Returns:
-     * {DOMElement} A new node of the given type and id
-     */
-    createNode: function(type, id) {
-        var node = document.createElementNS(this.xmlns, type);
-        if (id) {
-            node.setAttributeNS(null, "id", id);
-        }
-        return node;
-    },
-
-    /**
-     * Method: nodeTypeCompare
-     *
-     * Parameters:
-     * node - {SVGDomElement} An SVG element
-     * type - {String} Kind of node
-     *
-     * Returns:
-     * {Boolean} Whether or not the specified node is of the specified type
-     */
-    nodeTypeCompare: function(node, type) {
-        return (type == node.nodeName);
-    },
-
-    /**
-     * Method: createRenderRoot
-     *
-     * Returns:
-     * {DOMElement} The specific render engine's root element
-     */
-    createRenderRoot: function() {
-        return this.nodeFactory(this.container.id + "_svgRoot", "svg");
-    },
-
-    /**
-     * Method: createRoot
-     *
-     * Parameters:
-     * suffix - {String} suffix to append to the id
-     *
-     * Returns:
-     * {DOMElement}
-     */
-    createRoot: function(suffix) {
-        return this.nodeFactory(this.container.id + suffix, "g");
-    },
-
-    /**
-     * Method: createDefs
-     *
-     * Returns:
-     * {DOMElement} The element to which we'll add the symbol definitions
-     */
-    createDefs: function() {
-        var defs = this.nodeFactory(this.container.id + "_defs", "defs");
-        this.rendererRoot.appendChild(defs);
-        return defs;
-    },
-
-    /**************************************
-     *                                    *
-     *     GEOMETRY DRAWING FUNCTIONS     *
-     *                                    *
-     **************************************/
-
-    /**
-     * Method: drawPoint
-     * This method is only called by the renderer itself.
-     *
-     * Parameters:
-     * node - {DOMElement}
-     * geometry - {<OpenLayers.Geometry>}
-     *
-     * Returns:
-     * {DOMElement} or false if the renderer could not draw the point
-     */
-    drawPoint: function(node, geometry) {
-        return this.drawCircle(node, geometry, 1);
-    },
-
-    /**
-     * Method: drawCircle
-     * This method is only called by the renderer itself.
-     *
-     * Parameters:
-     * node - {DOMElement}
-     * geometry - {<OpenLayers.Geometry>}
-     * radius - {Float}
-     *
-     * Returns:
-     * {DOMElement} or false if the renderer could not draw the circle
-     */
-    drawCircle: function(node, geometry, radius) {
-        var x = geometry.x;
-        var y = -geometry.y;
-        node.setAttributeNS(null, "cx", x);
-        node.setAttributeNS(null, "cy", y);
-        node._x = x;
-        node._y = y;
-        node._radius = radius;
-        return node;
-    },
-
-    /**
-     * Method: drawLineString
-     * This method is only called by the renderer itself.
-     *
-     * Parameters:
-     * node - {DOMElement}
-     * geometry - {<OpenLayers.Geometry>}
-     *
-     * Returns:
-     * {DOMElement} or null if the renderer could not draw all components of
-     *     the linestring, or false if nothing could be drawn
-     */
-    drawLineString: function(node, geometry) {
-        var path = this.getComponentsString(geometry.components);
-        node.setAttributeNS(null, "points", path);
-        return node;
-    },
-
-    /**
-     * Method: drawLinearRing
-     * This method is only called by the renderer itself.
-     *
-     * Parameters:
-     * node - {DOMElement}
-     * geometry - {<OpenLayers.Geometry>}
-     *
-     * Returns:
-     * {DOMElement} or null if the renderer could not draw all components
-     *     of the linear ring, or false if nothing could be drawn
-     */
-    drawLinearRing: function(node, geometry) {
-        var path = this.getComponentsString(geometry.components);
-        node.setAttributeNS(null, "points", path);
-        return node;
-    },
-
-    /**
-     * Method: drawPolygon
-     * This method is only called by the renderer itself.
-     *
-     * Parameters:
-     * node - {DOMElement}
-     * geometry - {<OpenLayers.Geometry>}
-     *
-     * Returns:
-     * {DOMElement} or null if the renderer could not draw all components
-     *     of the polygon, or false if nothing could be drawn
-     */
-    drawPolygon: function(node, geometry) {
-        var d = [];
-        var draw = true;
-        var complete = true;
-        var linearRingResult, path;
-        for (var j=0, len=geometry.components.length; j<len; j++) {
-            d.push("M");
-            path = this.getComponentsString(
-                geometry.components[j].components, " ");
-            d.push(path);
-        }
-        d.push("z");
-        node.setAttributeNS(null, "d", d.join(" "));
-        node.setAttributeNS(null, "fill-rule", "evenodd");
-        return node;
-    },
-
-    /**
-     * Method: drawRectangle
-     * This method is only called by the renderer itself.
-     *
-     * Parameters:
-     * node - {DOMElement}
-     * geometry - {<OpenLayers.Geometry>}
-     *
-     * Returns:
-     * {DOMElement} or false if the renderer could not draw the rectangle
-     */
-    drawRectangle: function(node, geometry) {
-        node.setAttributeNS(null, "x", geometry.x);
-        node.setAttributeNS(null, "y", -geometry.y);
-        node.setAttributeNS(null, "width", geometry.width);
-        node.setAttributeNS(null, "height", geometry.height);
-        return node;
-    },
-
-    /**
-     * Method: drawText
-     * Function for drawing text labels.
-     * This method is only called by the renderer itself.
-     *
-     * Parameters:
-     * featureId - {String|DOMElement}
-     * style - {Object}
-     * location - {<OpenLayers.Geometry.Point>}, will be modified inline
-     *
-     * Returns:
-     * {DOMElement} container holding the text label
-     */
-    drawText: function(featureId, style, location) {
-        var g = OpenLayers.Renderer.NG.prototype.drawText.apply(this, arguments);
-        var text = g.firstChild ||
-            this.nodeFactory(featureId + this.LABEL_ID_SUFFIX + "_text", "text");
-
-        var res = this.getResolution();
-        text.setAttributeNS(null, "x", location.x / res);
-        text.setAttributeNS(null, "y", - location.y / res);
-        g.setAttributeNS(null, "transform", "scale(" + res + ")");
-
-        if (style.fontColor) {
-            text.setAttributeNS(null, "fill", style.fontColor);
-        }
-        if (style.fontOpacity) {
-            text.setAttributeNS(null, "opacity", style.fontOpacity);
-        }
-        if (style.fontFamily) {
-            text.setAttributeNS(null, "font-family", style.fontFamily);
-        }
-        if (style.fontSize) {
-            text.setAttributeNS(null, "font-size", style.fontSize);
-        }
-        if (style.fontWeight) {
-            text.setAttributeNS(null, "font-weight", style.fontWeight);
-        }
-        if (style.fontStyle) {
-            text.setAttributeNS(null, "font-style", style.fontStyle);
-        }
-        if (style.labelSelect === true) {
-            text.setAttributeNS(null, "pointer-events", "visible");
-            text._featureId = featureId;
-        } else {
-            text.setAttributeNS(null, "pointer-events", "none");
-        }
-        var align = style.labelAlign || OpenLayers.Renderer.defaultSymbolizer.labelAlign;
-        text.setAttributeNS(null, "text-anchor",
-            OpenLayers.Renderer.SVG2.LABEL_ALIGN[align[0]] || "middle");
-
-        if (OpenLayers.IS_GECKO === true) {
-            text.setAttributeNS(null, "dominant-baseline",
-                OpenLayers.Renderer.SVG2.LABEL_ALIGN[align[1]] || "central");
-        }
-
-        var labelRows = style.label.split('\n');
-        var numRows = labelRows.length;
-        while (text.childNodes.length > numRows) {
-            text.removeChild(text.lastChild);
-        }
-        for (var i = 0; i < numRows; i++) {
-            var tspan = text.childNodes[i] ||
-                this.nodeFactory(featureId + this.LABEL_ID_SUFFIX + "_tspan_" + i, "tspan");
-            if (style.labelSelect === true) {
-                tspan._featureId = featureId;
-            }
-            if (OpenLayers.IS_GECKO === false) {
-                tspan.setAttributeNS(null, "baseline-shift",
-                    OpenLayers.Renderer.SVG2.LABEL_VSHIFT[align[1]] || "-35%");
-            }
-            tspan.setAttribute("x", location.x / res);
-            if (i == 0) {
-                var vfactor = OpenLayers.Renderer.SVG2.LABEL_VFACTOR[align[1]];
-                if (vfactor == null) {
-                    vfactor = -.5;
-                }
-                tspan.setAttribute("dy", (vfactor*(numRows-1)) + "em");
-            } else {
-                tspan.setAttribute("dy", "1em");
-            }
-            tspan.textContent = (labelRows[i] === '') ? ' ' : labelRows[i];
-            if (!tspan.parentNode) {
-                text.appendChild(tspan);
-            }
-        }
-
-        if (!text.parentNode) {
-            g.appendChild(text);
-        }
-
-        return g;
-    },
-
-    /**
-     * Method: getComponentString
-     *
-     * Parameters:
-     * components - {Array(<OpenLayers.Geometry.Point>)} Array of points
-     * separator - {String} character between coordinate pairs. Defaults to ","
-     *
-     * Returns:
-     * {Object} hash with properties "path" (the string created from the
-     *     components and "complete" (false if the renderer was unable to
-     *     draw all components)
-     */
-    getComponentsString: function(components, separator) {
-        var len = components.length;
-        var strings = new Array(len);
-        for (var i=0; i<len; i++) {
-            strings[i] = this.getShortString(components[i]);
-        }
-
-        return strings.join(separator || ",");
-    },
-
-    /**
-     * Method: getShortString
-     *
-     * Parameters:
-     * point - {<OpenLayers.Geometry.Point>}
-     *
-     * Returns:
-     * {String} or false if point is outside the valid range
-     */
-    getShortString: function(point) {
-        return point.x + "," + (-point.y);
-    },
-
-    /**
-     * Method: importSymbol
-     * add a new symbol definition from the rendererer's symbol hash
-     *
-     * Parameters:
-     * graphicName - {String} name of the symbol to import
-     *
-     * Returns:
-     * {DOMElement} - the imported symbol
-     */
-    importSymbol: function (graphicName)  {
-        if (!this.defs) {
-            // create svg defs tag
-            this.defs = this.createDefs();
-        }
-        var id = this.container.id + "-" + graphicName;
-
-        // check if symbol already exists in the defs
-        var existing = document.getElementById(id);
-        if (existing != null) {
-            return existing;
-        }
-
-        var symbol = OpenLayers.Renderer.symbol[graphicName];
-        if (!symbol) {
-            throw new Error(graphicName + ' is not a valid symbol name');
-        }
-
-        var symbolNode = this.nodeFactory(id, "symbol");
-        var node = this.nodeFactory(null, "polygon");
-        symbolNode.appendChild(node);
-        var symbolExtent = new OpenLayers.Bounds(
-                                    Number.MAX_VALUE, Number.MAX_VALUE, 0, 0);
-
-        var points = [];
-        var x,y;
-        for (var i=0, len=symbol.length; i<len; i=i+2) {
-            x = symbol[i];
-            y = symbol[i+1];
-            symbolExtent.left = Math.min(symbolExtent.left, x);
-            symbolExtent.bottom = Math.min(symbolExtent.bottom, y);
-            symbolExtent.right = Math.max(symbolExtent.right, x);
-            symbolExtent.top = Math.max(symbolExtent.top, y);
-            points.push(x, ",", y);
-        }
-
-        node.setAttributeNS(null, "points", points.join(" "));
-
-        var width = symbolExtent.getWidth();
-        var height = symbolExtent.getHeight();
-        // create a viewBox three times as large as the symbol itself,
-        // to allow for strokeWidth being displayed correctly at the corners.
-        var viewBox = [symbolExtent.left - width,
-                        symbolExtent.bottom - height, width * 3, height * 3];
-        symbolNode.setAttributeNS(null, "viewBox", viewBox.join(" "));
-        this.symbolMetrics[id] = {
-            size: Math.max(width, height),
-            x: symbolExtent.getCenterLonLat().lon,
-            y: symbolExtent.getCenterLonLat().lat
-        };
-
-        this.defs.appendChild(symbolNode);
-        return symbolNode;
-    },
-
-    /**
-     * Method: getFeatureIdFromEvent
-     *
-     * Parameters:
-     * evt - {Object} An <OpenLayers.Event> object
-     *
-     * Returns:
-     * {String} A feature id or undefined.
-     */
-    getFeatureIdFromEvent: function(evt) {
-        var featureId = OpenLayers.Renderer.Elements.prototype.getFeatureIdFromEvent.apply(this, arguments);
-        if(!featureId) {
-            var target = evt.target;
-            featureId = target.parentNode && target != this.rendererRoot ?
-                target.parentNode._featureId : undefined;
-        }
-        return featureId;
-    },
-
-    CLASS_NAME: "OpenLayers.Renderer.SVG2"
-});
-
-/**
- * Constant: OpenLayers.Renderer.SVG2.LABEL_ALIGN
- * {Object}
- */
-OpenLayers.Renderer.SVG2.LABEL_ALIGN = {
-    "l": "start",
-    "r": "end",
-    "b": "bottom",
-    "t": "hanging"
-};
-
-/**
- * Constant: OpenLayers.Renderer.SVG2.LABEL_VSHIFT
- * {Object}
- */
-OpenLayers.Renderer.SVG2.LABEL_VSHIFT = {
-    // according to
-    // http://www.w3.org/Graphics/SVG/Test/20061213/htmlObjectHarness/full-text-align-02-b.html
-    // a baseline-shift of -70% shifts the text exactly from the
-    // bottom to the top of the baseline, so -35% moves the text to
-    // the center of the baseline.
-    "t": "-70%",
-    "b": "0"
-};
-
-/**
- * Constant: OpenLayers.Renderer.SVG2.LABEL_VFACTOR
- * {Object}
- */
-OpenLayers.Renderer.SVG2.LABEL_VFACTOR = {
-    "t": 0,
-    "b": -1
-};
-
-/**
- * Function: OpenLayers.Renderer.SVG2.preventDefault
- * Used to prevent default events (especially opening images in a new tab on
- * ctrl-click) from being executed for externalGraphic and graphicName symbols
- */
-OpenLayers.Renderer.SVG2.preventDefault = function(e) {
-    e.preventDefault && e.preventDefault();
-};
-
-/**
- * Class: OpenLayers.Popup.AnchoredBubble
- * This class is *deprecated*. Use {<OpenLayers.Popup.Anchored>} and
- * round corners using CSS3's border-radius property.
- *
- * Inherits from:
- *  - <OpenLayers.Popup.Anchored>
- */
-OpenLayers.Popup.AnchoredBubble = OpenLayers.Class(OpenLayers.Popup.Anchored, {
-
-    /**
-     * Property: rounded
-     * {Boolean} Has the popup been rounded yet?
-     */
-    rounded: false,
-
-    /**
-     * Constructor: OpenLayers.Popup.AnchoredBubble
-     *
-     * Parameters:
-     * id - {String}
-     * lonlat - {<OpenLayers.LonLat>}
-     * contentSize - {<OpenLayers.Size>}
-     * contentHTML - {String}
-     * anchor - {Object} Object to which we'll anchor the popup. Must expose
-     *     a 'size' (<OpenLayers.Size>) and 'offset' (<OpenLayers.Pixel>)
-     *     (Note that this is generally an <OpenLayers.Icon>).
-     * closeBox - {Boolean}
-     * closeBoxCallback - {Function} Function to be called on closeBox click.
-     */
-    initialize:function(id, lonlat, contentSize, contentHTML, anchor, closeBox,
-                        closeBoxCallback) {
-
-        this.padding = new OpenLayers.Bounds(
-            0, OpenLayers.Popup.AnchoredBubble.CORNER_SIZE,
-            0, OpenLayers.Popup.AnchoredBubble.CORNER_SIZE
-        );
-        OpenLayers.Popup.Anchored.prototype.initialize.apply(this, arguments);
-    },
-
-    /**
-     * Method: draw
-     *
-     * Parameters:
-     * px - {<OpenLayers.Pixel>}
-     *
-     * Returns:
-     * {DOMElement} Reference to a div that contains the drawn popup.
-     */
-    draw: function(px) {
-
-        OpenLayers.Popup.Anchored.prototype.draw.apply(this, arguments);
-
-        this.setContentHTML();
-
-        //set the popup color and opacity
-        this.setBackgroundColor();
-        this.setOpacity();
-
-        return this.div;
-    },
-
-    /**
-     * Method: updateRelativePosition
-     * The popup has been moved to a new relative location, in which case
-     *     we will want to re-do the rico corners.
-     */
-    updateRelativePosition: function() {
-        this.setRicoCorners();
-    },
-
-    /**
-     * APIMethod: setSize
-     *
-     * Parameters:
-     * contentSize - {<OpenLayers.Size>} the new size for the popup's
-     *     contents div (in pixels).
-     */
-    setSize:function(contentSize) {
-        OpenLayers.Popup.Anchored.prototype.setSize.apply(this, arguments);
-
-        this.setRicoCorners();
-    },
-
-    /**
-     * APIMethod: setBackgroundColor
-     *
-     * Parameters:
-     * color - {String}
-     */
-    setBackgroundColor:function(color) {
-        if (color != undefined) {
-            this.backgroundColor = color;
-        }
-
-        if (this.div != null) {
-            if (this.contentDiv != null) {
-                this.div.style.background = "transparent";
-                OpenLayers.Rico.Corner.changeColor(this.groupDiv,
-                                                   this.backgroundColor);
-            }
-        }
-    },
-
-    /**
-     * APIMethod: setOpacity
-     *
-     * Parameters:
-     * opacity - {float}
-     */
-    setOpacity:function(opacity) {
-        OpenLayers.Popup.Anchored.prototype.setOpacity.call(this, opacity);
-
-        if (this.div != null) {
-            if (this.groupDiv != null) {
-                OpenLayers.Rico.Corner.changeOpacity(this.groupDiv,
-                                                     this.opacity);
-            }
-        }
-    },
-
-    /**
-     * Method: setBorder
-     * Always sets border to 0. Bubble Popups can not have a border.
-     *
-     * Parameters:
-     * border - {Integer}
-     */
-    setBorder:function(border) {
-        this.border = 0;
-    },
-
-    /**
-     * Method: setRicoCorners
-     * Update RICO corners according to the popup's current relative postion.
-     */
-    setRicoCorners:function() {
-
-        var corners = this.getCornersToRound(this.relativePosition);
-        var options = {corners: corners,
-                         color: this.backgroundColor,
-                       bgColor: "transparent",
-                         blend: false};
-
-        if (!this.rounded) {
-            OpenLayers.Rico.Corner.round(this.div, options);
-            this.rounded = true;
-        } else {
-            OpenLayers.Rico.Corner.reRound(this.groupDiv, options);
-            //set the popup color and opacity
-            this.setBackgroundColor();
-            this.setOpacity();
-        }
-    },
-
-    /**
-     * Method: getCornersToRound
-     *
-     * Returns:
-     * {String} The proper corners string ("tr tl bl br") for rico to round.
-     */
-    getCornersToRound:function() {
-
-        var corners = ['tl', 'tr', 'bl', 'br'];
-
-        //we want to round all the corners _except_ the opposite one.
-        var corner = OpenLayers.Bounds.oppositeQuadrant(this.relativePosition);
-        OpenLayers.Util.removeItem(corners, corner);
-
-        return corners.join(" ");
-    },
-
-    CLASS_NAME: "OpenLayers.Popup.AnchoredBubble"
-});
-
-/**
- * Constant: CORNER_SIZE
- * {Integer} 5. Border space for the RICO corners.
- */
-OpenLayers.Popup.AnchoredBubble.CORNER_SIZE = 5;
diff --git a/#pma/js/openlayers/src/readme.md b/#pma/js/openlayers/src/readme.md
deleted file mode 100644
index e8e5dcb8..00000000
--- a/#pma/js/openlayers/src/readme.md
+++ /dev/null
@@ -1,79 +0,0 @@
-# OpenLayers
-
-Copyright (c) 2005-2013 OpenLayers Contributors. See authors.txt for
-more details.
-
-OpenLayers is a JavaScript library for building map applications
-on the web. OpenLayers is made available under a BSD-license.
-Please see license.txt in this distribution for more details.
-
-## Getting OpenLayers
-
-OpenLayers lives at http://www.openlayers.org/.  Find details on downloading stable releases or the development version the [development site](http://trac.osgeo.org/openlayers/wiki/HowToDownload).
-
-## Installing OpenLayers
-
-You can use OpenLayers as-is by copying build/OpenLayers.js and the
-entire theme/ and img/ directories up to your webserver and putting them 
-in the same directory. The files can be in subdirectories on your website, 
-or right in the root of the site, as in these examples. 
-To include the OpenLayers library in your web page from the root of the site, use:
-
-    <script type="text/javascript" src="/OpenLayers.js" />
-
-As an example, using bash (with the release files in ~/openlayers):
-
-    $ cd /var/www/html
-    $ cp ~/openlayers/OpenLayers.js ./
-    $ cp -R ~/openlayers/theme ./
-    $ cp -R ~/openlayers/img ./
-
-If you want to use the multiple-file version of OpenLayers (for, say,
-debugging or development purposes), copy the lib/ directory up to your
-webserver in the same directory you put the img/ folder. Then add
-the following to your web page instead:
-
-    <script type="text/javascript" src="/lib/OpenLayers.js" />
-
-As an example, using bash (with the release files in ~/openlayers):
-
-    $ cd /var/www/html
-    $ cp -R ~/openlayers/lib ./
-    $ cp -R ~/openlayers/theme ./
-    $ cp -R ~/openlayers/img ./
-
-## Alternate OpenLayers Versions in this Release
-
-The following versions of OpenLayers single file builds are included in this release 
-and can be used in place of OpenLayers.js in any of the above instructions:
-
-1. OpenLayers.js - full build --> Includes everything except the alternate language
-    translations and deprecated classes.
-2. OpenLayers.mobile.js - a mobile focused build --> Includes a subset of the OpenLayers 
-    library to serve common mobile web app use cases. This build provides access to 
-    OpenStreetMap, Bing, WMS, WFS and vector layers; touch optimized controls; geolocation;
-    vector editing and interaction tools. The examples tagged ``mobile`` can use this build.
-3. OpenLayers.light.js - a simple use case focused build --> Includes a subset of the
-    OpenLayers library to serve the basic use case of displaying points and polygons
-    on a map. This build provides access to OpenStreetMap, Bing, Google, WMS, and 
-    vector layers; basic map controls; and vector interaction tools. The examples
-    tagged ``light`` can use this build.
-    
-## Using OpenLayers in Your Own Website
-
-The [examples directory](http://openlayers.org/dev/examples/) is full of useful examples.
-
-Documentation is available at http://trac.osgeo.org/openlayers/wiki/Documentation.
-You can generate the API documentation with http://www.naturaldocs.org/
-As an example, using bash (with the release files in ~/openlayers):
-
-    $ cd ~/openlayers/
-    $ /path/to/NaturalDocs -i lib/ -o HTML doc/ -p doc_config/ -s Default OL
-
-Information on changes in the API is available in release notes found in the notes folder.
-
-## Contributing to OpenLayers
-
-Please join the email lists at http://openlayers.org/mailman/listinfo
-Patches are welcome!
-
diff --git a/#pma/js/openlayers/theme/default/google.css b/#pma/js/openlayers/theme/default/google.css
deleted file mode 100644
index 1b748ef3..00000000
--- a/#pma/js/openlayers/theme/default/google.css
+++ /dev/null
@@ -1,9 +0,0 @@
-.olLayerGoogleCopyright {
-    right: 3px;
-    bottom: 2px;
-    left: auto;  
-}
-.olLayerGooglePoweredBy {
-    left: 2px;
-    bottom: 2px;   
-}
diff --git a/#pma/js/openlayers/theme/default/google.tidy.css b/#pma/js/openlayers/theme/default/google.tidy.css
deleted file mode 100644
index c0e07ace..00000000
--- a/#pma/js/openlayers/theme/default/google.tidy.css
+++ /dev/null
@@ -1 +0,0 @@
-.olLayerGoogleCopyright{right:3px;bottom:2px;left:auto;}.olLayerGooglePoweredBy{left:2px;bottom:2px;}
\ No newline at end of file
diff --git a/#pma/js/openlayers/theme/default/ie6-style.css b/#pma/js/openlayers/theme/default/ie6-style.css
deleted file mode 100644
index a0fd7c63..00000000
--- a/#pma/js/openlayers/theme/default/ie6-style.css
+++ /dev/null
@@ -1,10 +0,0 @@
-.olControlZoomPanel div {
-    background-image: url(img/zoom-panel-NOALPHA.png);
-}
-.olControlPanPanel div {
-    background-image: url(img/pan-panel-NOALPHA.png);
-}
-.olControlEditingToolbar {
-    width: 200px;
-}
-
diff --git a/#pma/js/openlayers/theme/default/ie6-style.tidy.css b/#pma/js/openlayers/theme/default/ie6-style.tidy.css
deleted file mode 100644
index 7a23bbc7..00000000
--- a/#pma/js/openlayers/theme/default/ie6-style.tidy.css
+++ /dev/null
@@ -1 +0,0 @@
-.olControlZoomPanel div{background-image:url(img/zoom-panel-NOALPHA.png);}.olControlPanPanel div{background-image:url(img/pan-panel-NOALPHA.png);}.olControlEditingToolbar{width:200px;}
\ No newline at end of file
diff --git a/#pma/js/openlayers/theme/default/img/add_point_off.png b/#pma/js/openlayers/theme/default/img/add_point_off.png
deleted file mode 100644
index 20baa2ef..00000000
Binary files a/#pma/js/openlayers/theme/default/img/add_point_off.png and /dev/null differ
diff --git a/#pma/js/openlayers/theme/default/img/add_point_on.png b/#pma/js/openlayers/theme/default/img/add_point_on.png
deleted file mode 100644
index 84ce5ba1..00000000
Binary files a/#pma/js/openlayers/theme/default/img/add_point_on.png and /dev/null differ
diff --git a/#pma/js/openlayers/theme/default/img/blank.gif b/#pma/js/openlayers/theme/default/img/blank.gif
deleted file mode 100644
index 4bcc753a..00000000
Binary files a/#pma/js/openlayers/theme/default/img/blank.gif and /dev/null differ
diff --git a/#pma/js/openlayers/theme/default/img/close.gif b/#pma/js/openlayers/theme/default/img/close.gif
deleted file mode 100644
index a8958de9..00000000
Binary files a/#pma/js/openlayers/theme/default/img/close.gif and /dev/null differ
diff --git a/#pma/js/openlayers/theme/default/img/drag-rectangle-off.png b/#pma/js/openlayers/theme/default/img/drag-rectangle-off.png
deleted file mode 100644
index 382a81d9..00000000
Binary files a/#pma/js/openlayers/theme/default/img/drag-rectangle-off.png and /dev/null differ
diff --git a/#pma/js/openlayers/theme/default/img/drag-rectangle-on.png b/#pma/js/openlayers/theme/default/img/drag-rectangle-on.png
deleted file mode 100644
index 2ed2d5b0..00000000
Binary files a/#pma/js/openlayers/theme/default/img/drag-rectangle-on.png and /dev/null differ
diff --git a/#pma/js/openlayers/theme/default/img/draw_line_off.png b/#pma/js/openlayers/theme/default/img/draw_line_off.png
deleted file mode 100644
index 8f68735b..00000000
Binary files a/#pma/js/openlayers/theme/default/img/draw_line_off.png and /dev/null differ
diff --git a/#pma/js/openlayers/theme/default/img/draw_line_on.png b/#pma/js/openlayers/theme/default/img/draw_line_on.png
deleted file mode 100644
index c635017c..00000000
Binary files a/#pma/js/openlayers/theme/default/img/draw_line_on.png and /dev/null differ
diff --git a/#pma/js/openlayers/theme/default/img/draw_point_off.png b/#pma/js/openlayers/theme/default/img/draw_point_off.png
deleted file mode 100644
index 2b98457d..00000000
Binary files a/#pma/js/openlayers/theme/default/img/draw_point_off.png and /dev/null differ
diff --git a/#pma/js/openlayers/theme/default/img/draw_point_on.png b/#pma/js/openlayers/theme/default/img/draw_point_on.png
deleted file mode 100644
index f9503c34..00000000
Binary files a/#pma/js/openlayers/theme/default/img/draw_point_on.png and /dev/null differ
diff --git a/#pma/js/openlayers/theme/default/img/draw_polygon_off.png b/#pma/js/openlayers/theme/default/img/draw_polygon_off.png
deleted file mode 100644
index 8881bff2..00000000
Binary files a/#pma/js/openlayers/theme/default/img/draw_polygon_off.png and /dev/null differ
diff --git a/#pma/js/openlayers/theme/default/img/draw_polygon_on.png b/#pma/js/openlayers/theme/default/img/draw_polygon_on.png
deleted file mode 100644
index c2738a69..00000000
Binary files a/#pma/js/openlayers/theme/default/img/draw_polygon_on.png and /dev/null differ
diff --git a/#pma/js/openlayers/theme/default/img/editing_tool_bar.png b/#pma/js/openlayers/theme/default/img/editing_tool_bar.png
deleted file mode 100644
index 527d4632..00000000
Binary files a/#pma/js/openlayers/theme/default/img/editing_tool_bar.png and /dev/null differ
diff --git a/#pma/js/openlayers/theme/default/img/move_feature_off.png b/#pma/js/openlayers/theme/default/img/move_feature_off.png
deleted file mode 100644
index 633d51a0..00000000
Binary files a/#pma/js/openlayers/theme/default/img/move_feature_off.png and /dev/null differ
diff --git a/#pma/js/openlayers/theme/default/img/move_feature_on.png b/#pma/js/openlayers/theme/default/img/move_feature_on.png
deleted file mode 100644
index 1015d657..00000000
Binary files a/#pma/js/openlayers/theme/default/img/move_feature_on.png and /dev/null differ
diff --git a/#pma/js/openlayers/theme/default/img/navigation_history.png b/#pma/js/openlayers/theme/default/img/navigation_history.png
deleted file mode 100644
index fc34a194..00000000
Binary files a/#pma/js/openlayers/theme/default/img/navigation_history.png and /dev/null differ
diff --git a/#pma/js/openlayers/theme/default/img/overview_replacement.gif b/#pma/js/openlayers/theme/default/img/overview_replacement.gif
deleted file mode 100644
index a82cf5fc..00000000
Binary files a/#pma/js/openlayers/theme/default/img/overview_replacement.gif and /dev/null differ
diff --git a/#pma/js/openlayers/theme/default/img/pan-panel-NOALPHA.png b/#pma/js/openlayers/theme/default/img/pan-panel-NOALPHA.png
deleted file mode 100644
index 69872688..00000000
Binary files a/#pma/js/openlayers/theme/default/img/pan-panel-NOALPHA.png and /dev/null differ
diff --git a/#pma/js/openlayers/theme/default/img/pan-panel.png b/#pma/js/openlayers/theme/default/img/pan-panel.png
deleted file mode 100644
index 42081412..00000000
Binary files a/#pma/js/openlayers/theme/default/img/pan-panel.png and /dev/null differ
diff --git a/#pma/js/openlayers/theme/default/img/pan_off.png b/#pma/js/openlayers/theme/default/img/pan_off.png
deleted file mode 100644
index d49f27a5..00000000
Binary files a/#pma/js/openlayers/theme/default/img/pan_off.png and /dev/null differ
diff --git a/#pma/js/openlayers/theme/default/img/pan_on.png b/#pma/js/openlayers/theme/default/img/pan_on.png
deleted file mode 100644
index 7eccac76..00000000
Binary files a/#pma/js/openlayers/theme/default/img/pan_on.png and /dev/null differ
diff --git a/#pma/js/openlayers/theme/default/img/panning-hand-off.png b/#pma/js/openlayers/theme/default/img/panning-hand-off.png
deleted file mode 100644
index b676ba6b..00000000
Binary files a/#pma/js/openlayers/theme/default/img/panning-hand-off.png and /dev/null differ
diff --git a/#pma/js/openlayers/theme/default/img/panning-hand-on.png b/#pma/js/openlayers/theme/default/img/panning-hand-on.png
deleted file mode 100644
index 4d33708b..00000000
Binary files a/#pma/js/openlayers/theme/default/img/panning-hand-on.png and /dev/null differ
diff --git a/#pma/js/openlayers/theme/default/img/remove_point_off.png b/#pma/js/openlayers/theme/default/img/remove_point_off.png
deleted file mode 100644
index e3ba338d..00000000
Binary files a/#pma/js/openlayers/theme/default/img/remove_point_off.png and /dev/null differ
diff --git a/#pma/js/openlayers/theme/default/img/remove_point_on.png b/#pma/js/openlayers/theme/default/img/remove_point_on.png
deleted file mode 100644
index 50d8d006..00000000
Binary files a/#pma/js/openlayers/theme/default/img/remove_point_on.png and /dev/null differ
diff --git a/#pma/js/openlayers/theme/default/img/ruler.png b/#pma/js/openlayers/theme/default/img/ruler.png
deleted file mode 100644
index e23229d0..00000000
Binary files a/#pma/js/openlayers/theme/default/img/ruler.png and /dev/null differ
diff --git a/#pma/js/openlayers/theme/default/img/save_features_off.png b/#pma/js/openlayers/theme/default/img/save_features_off.png
deleted file mode 100644
index 3d305b62..00000000
Binary files a/#pma/js/openlayers/theme/default/img/save_features_off.png and /dev/null differ
diff --git a/#pma/js/openlayers/theme/default/img/save_features_on.png b/#pma/js/openlayers/theme/default/img/save_features_on.png
deleted file mode 100644
index 5640ae88..00000000
Binary files a/#pma/js/openlayers/theme/default/img/save_features_on.png and /dev/null differ
diff --git a/#pma/js/openlayers/theme/default/img/view_next_off.png b/#pma/js/openlayers/theme/default/img/view_next_off.png
deleted file mode 100644
index e0a7ae4d..00000000
Binary files a/#pma/js/openlayers/theme/default/img/view_next_off.png and /dev/null differ
diff --git a/#pma/js/openlayers/theme/default/img/view_next_on.png b/#pma/js/openlayers/theme/default/img/view_next_on.png
deleted file mode 100644
index e41fb7bd..00000000
Binary files a/#pma/js/openlayers/theme/default/img/view_next_on.png and /dev/null differ
diff --git a/#pma/js/openlayers/theme/default/img/view_previous_off.png b/#pma/js/openlayers/theme/default/img/view_previous_off.png
deleted file mode 100644
index 0c1a05db..00000000
Binary files a/#pma/js/openlayers/theme/default/img/view_previous_off.png and /dev/null differ
diff --git a/#pma/js/openlayers/theme/default/img/view_previous_on.png b/#pma/js/openlayers/theme/default/img/view_previous_on.png
deleted file mode 100644
index c009c255..00000000
Binary files a/#pma/js/openlayers/theme/default/img/view_previous_on.png and /dev/null differ
diff --git a/#pma/js/openlayers/theme/default/img/zoom-panel-NOALPHA.png b/#pma/js/openlayers/theme/default/img/zoom-panel-NOALPHA.png
deleted file mode 100644
index 7f4919ad..00000000
Binary files a/#pma/js/openlayers/theme/default/img/zoom-panel-NOALPHA.png and /dev/null differ
diff --git a/#pma/js/openlayers/theme/default/img/zoom-panel.png b/#pma/js/openlayers/theme/default/img/zoom-panel.png
deleted file mode 100644
index ea72558a..00000000
Binary files a/#pma/js/openlayers/theme/default/img/zoom-panel.png and /dev/null differ
diff --git a/#pma/js/openlayers/theme/default/style.css b/#pma/js/openlayers/theme/default/style.css
deleted file mode 100644
index cbed84e8..00000000
--- a/#pma/js/openlayers/theme/default/style.css
+++ /dev/null
@@ -1,516 +0,0 @@
-div.olMap {
-    z-index: 0;
-    padding: 0 !important;
-    margin: 0 !important;
-    cursor: default;
-}
-
-div.olMapViewport {
-    text-align: left;
-    -ms-touch-action: none;
-}
-
-div.olLayerDiv {
-   -moz-user-select: none;
-   -khtml-user-select: none;
-}
-
-.olLayerGoogleCopyright {
-    left: 2px;
-    bottom: 2px;
-}
-.olLayerGoogleV3.olLayerGoogleCopyright {
-    right: auto !important;
-}
-.olLayerGooglePoweredBy {
-    left: 2px;
-    bottom: 15px;
-}
-.olLayerGoogleV3.olLayerGooglePoweredBy {
-    bottom: 15px !important;
-}
-/* GMaps should not set styles on its container */
-.olForeignContainer {
-    opacity: 1 !important;
-}
-.olControlAttribution {
-    font-size: smaller;
-    right: 3px;
-    bottom: 4.5em;
-    position: absolute;
-    display: block;
-}
-.olControlScale {
-    right: 3px;
-    bottom: 3em;
-    display: block;
-    position: absolute;
-    font-size: smaller;
-}
-.olControlScaleLine {
-   display: block;
-   position: absolute;
-   left: 10px;
-   bottom: 15px;
-   font-size: xx-small;
-}
-.olControlScaleLineBottom {
-   border: solid 2px black;
-   border-bottom: none;
-   margin-top:-2px;
-   text-align: center;
-}
-.olControlScaleLineTop {
-   border: solid 2px black;
-   border-top: none;
-   text-align: center;
-}
-
-.olControlPermalink {
-    right: 3px;
-    bottom: 1.5em;
-    display: block;
-    position: absolute;
-    font-size: smaller;
-}
-
-div.olControlMousePosition {
-    bottom: 0;
-    right: 3px;
-    display: block;
-    position: absolute;
-    font-family: Arial;
-    font-size: smaller;
-}
-
-.olControlOverviewMapContainer {
-    position: absolute;
-    bottom: 0;
-    right: 0;
-}
-
-.olControlOverviewMapElement {
-    padding: 10px 18px 10px 10px;
-    background-color: #00008B;
-    -moz-border-radius: 1em 0 0 0;
-}
-
-.olControlOverviewMapMinimizeButton,
-.olControlOverviewMapMaximizeButton {
-    height: 18px;
-    width: 18px;
-    right: 0;
-    bottom: 80px;
-    cursor: pointer;
-}
-
-.olControlOverviewMapExtentRectangle {
-    overflow: hidden;
-    background-image: url("img/blank.gif");
-    cursor: move;
-    border: 2px dotted red;
-}
-.olControlOverviewMapRectReplacement {
-    overflow: hidden;
-    cursor: move;
-    background-image: url("img/overview_replacement.gif");
-    background-repeat: no-repeat;
-    background-position: center;
-}
-
-.olLayerGeoRSSDescription {
-    float:left;
-    width:100%;
-    overflow:auto;
-    font-size:1.0em;
-}
-.olLayerGeoRSSClose {
-    float:right;
-    color:gray;
-    font-size:1.2em;
-    margin-right:6px;
-    font-family:sans-serif;
-}
-.olLayerGeoRSSTitle {
-    float:left;font-size:1.2em;
-}
-
-.olPopupContent {
-    padding:5px;
-    overflow: auto;
-}
-
-.olControlNavigationHistory {
-   background-image: url("img/navigation_history.png");
-   background-repeat: no-repeat;
-   width:  24px;
-   height: 24px;
-
-}
-.olControlNavigationHistoryPreviousItemActive {
-  background-position: 0 0;
-}
-.olControlNavigationHistoryPreviousItemInactive {
-   background-position: 0 -24px;
-}
-.olControlNavigationHistoryNextItemActive {
-   background-position: -24px 0;
-}
-.olControlNavigationHistoryNextItemInactive {
-   background-position: -24px -24px;
-}
-
-div.olControlSaveFeaturesItemActive {
-    background-image: url(img/save_features_on.png);
-    background-repeat: no-repeat;
-    background-position: 0 1px;
-}
-div.olControlSaveFeaturesItemInactive {
-    background-image: url(img/save_features_off.png);
-    background-repeat: no-repeat;
-    background-position: 0 1px;
-}
-
-.olHandlerBoxZoomBox {
-    border: 2px solid red;
-    position: absolute;
-    background-color: white;
-    opacity: 0.50;
-    font-size: 1px;
-    filter: alpha(opacity=50);
-}
-.olHandlerBoxSelectFeature {
-    border: 2px solid blue;
-    position: absolute;
-    background-color: white;
-    opacity: 0.50;
-    font-size: 1px;
-    filter: alpha(opacity=50);
-}
-
-.olControlPanPanel {
-    top: 10px;
-    left: 5px;
-}
-
-.olControlPanPanel div {
-    background-image: url(img/pan-panel.png);
-    height: 18px;
-    width: 18px;
-    cursor: pointer;
-    position: absolute;
-}
-
-.olControlPanPanel .olControlPanNorthItemInactive {
-    top: 0;
-    left: 9px;
-    background-position: 0 0;
-}
-.olControlPanPanel .olControlPanSouthItemInactive {
-    top: 36px;
-    left: 9px;
-    background-position: 18px 0;
-}
-.olControlPanPanel .olControlPanWestItemInactive {
-    position: absolute;
-    top: 18px;
-    left: 0;
-    background-position: 0 18px;
-}
-.olControlPanPanel .olControlPanEastItemInactive {
-    top: 18px;
-    left: 18px;
-    background-position: 18px 18px;
-}
-
-.olControlZoomPanel {
-    top: 71px;
-    left: 14px;
-}
-
-.olControlZoomPanel div {
-    background-image: url(img/zoom-panel.png);
-    position: absolute;
-    height: 18px;
-    width: 18px;
-    cursor: pointer;
-}
-
-.olControlZoomPanel .olControlZoomInItemInactive {
-    top: 0;
-    left: 0;
-    background-position: 0 0;
-}
-
-.olControlZoomPanel .olControlZoomToMaxExtentItemInactive {
-    top: 18px;
-    left: 0;
-    background-position: 0 -18px;
-}
-
-.olControlZoomPanel .olControlZoomOutItemInactive {
-    top: 36px;
-    left: 0;
-    background-position: 0 18px;
-}
-
-/*
- * When a potential text is bigger than the image it move the image
- * with some headers (closes #3154)
- */
-.olControlPanZoomBar div {
-    font-size: 1px;
-}
-
-.olPopupCloseBox {
-  background: url("img/close.gif") no-repeat;
-  cursor: pointer;
-}
-
-.olFramedCloudPopupContent {
-    padding: 5px;
-    overflow: auto;
-}
-
-.olControlNoSelect {
- -moz-user-select: none;
- -khtml-user-select: none;
-}
-
-.olImageLoadError {
-    background-color: pink;
-    opacity: 0.5;
-    filter: alpha(opacity=50); /* IE */
-}
-
-/**
- * Cursor styles
- */
-
-.olCursorWait {
-    cursor: wait;
-}
-.olDragDown {
-    cursor: move;
-}
-.olDrawBox {
-    cursor: crosshair;
-}
-.olControlDragFeatureOver {
-    cursor: move;
-}
-.olControlDragFeatureActive.olControlDragFeatureOver.olDragDown {
-    cursor: -moz-grabbing;
-}
-
-/**
- * Layer switcher
- */
-.olControlLayerSwitcher {
-    position: absolute;
-    top: 25px;
-    right: 0;
-    width: 20em;
-    font-family: sans-serif;
-    font-weight: bold;
-    margin-top: 3px;
-    margin-left: 3px;
-    margin-bottom: 3px;
-    font-size: smaller;
-    color: white;
-    background-color: transparent;
-}
-
-.olControlLayerSwitcher .layersDiv {
-    padding-top: 5px;
-    padding-left: 10px;
-    padding-bottom: 5px;
-    padding-right: 10px;
-    background-color: darkblue;
-}
-
-.olControlLayerSwitcher .layersDiv .baseLbl,
-.olControlLayerSwitcher .layersDiv .dataLbl {
-    margin-top: 3px;
-    margin-left: 3px;
-    margin-bottom: 3px;
-}
-
-.olControlLayerSwitcher .layersDiv .baseLayersDiv,
-.olControlLayerSwitcher .layersDiv .dataLayersDiv {
-    padding-left: 10px;
-}
-
-.olControlLayerSwitcher .maximizeDiv,
-.olControlLayerSwitcher .minimizeDiv {
-    width: 18px;
-    height: 18px;
-    top: 5px;
-    right: 0;
-    cursor: pointer;
-}
-
-.olBingAttribution {
-    color: #DDD;
-}
-.olBingAttribution.road {
-    color: #333;
-}
-
-.olGoogleAttribution.hybrid, .olGoogleAttribution.satellite {
-    color: #EEE;
-}
-.olGoogleAttribution {
-    color: #333;
-}
-span.olGoogleAttribution a {
-    color: #77C;
-}
-span.olGoogleAttribution.hybrid a, span.olGoogleAttribution.satellite a {
-    color: #EEE;
-}
-
-/**
- * Editing and navigation icons.
- * (using the editing_tool_bar.png sprint image)
- */
-.olControlNavToolbar ,
-.olControlEditingToolbar {
-    margin: 5px 5px 0 0;
-}
-.olControlNavToolbar div,
-.olControlEditingToolbar div {
-    background-image: url("img/editing_tool_bar.png");
-    background-repeat: no-repeat;
-    margin: 0 0 5px 5px;
-    width: 24px;
-    height: 22px;
-    cursor: pointer
-}
-/* positions */
-.olControlEditingToolbar {
-    right: 0;
-    top: 0;
-}
-.olControlNavToolbar {
-    top: 295px;
-    left: 9px;
-}
-/* layouts */
-.olControlEditingToolbar div {
-    float: right;
-}
-/* individual controls */
-.olControlNavToolbar .olControlNavigationItemInactive,
-.olControlEditingToolbar .olControlNavigationItemInactive {
-    background-position: -103px -1px;
-}
-.olControlNavToolbar .olControlNavigationItemActive ,
-.olControlEditingToolbar .olControlNavigationItemActive  {
-    background-position: -103px -24px;
-}
-.olControlNavToolbar .olControlZoomBoxItemInactive {
-    background-position: -128px -1px;
-}
-.olControlNavToolbar .olControlZoomBoxItemActive  {
-    background-position: -128px -24px;
-}
-.olControlEditingToolbar .olControlDrawFeaturePointItemInactive {
-    background-position: -77px -1px;
-}
-.olControlEditingToolbar .olControlDrawFeaturePointItemActive {
-    background-position: -77px -24px;
-}
-.olControlEditingToolbar .olControlDrawFeaturePathItemInactive {
-    background-position: -51px -1px;
-}
-.olControlEditingToolbar .olControlDrawFeaturePathItemActive {
-    background-position: -51px -24px;
-}
-.olControlEditingToolbar .olControlDrawFeaturePolygonItemInactive{
-    background-position: -26px -1px;
-}
-.olControlEditingToolbar .olControlDrawFeaturePolygonItemActive {
-    background-position: -26px -24px;
-}
-
-div.olControlZoom {
-    position: absolute;
-    top: 8px;
-    left: 8px;
-    background: rgba(255,255,255,0.4);
-    border-radius: 4px;
-    padding: 2px;
-}
-div.olControlZoom a {
-    display: block;
-    margin: 1px;
-    padding: 0;
-    color: white;
-    font-size: 18px;
-    font-family: 'Lucida Grande', Verdana, Geneva, Lucida, Arial, Helvetica, sans-serif;
-    font-weight: bold;
-    text-decoration: none;
-    text-align: center;
-    height: 22px;
-    width:22px;
-    line-height: 19px;
-    background: #130085; /* fallback for IE - IE6 requires background shorthand*/
-    background: rgba(0, 60, 136, 0.5);
-    filter: alpha(opacity=80);
-}
-div.olControlZoom a:hover {
-    background: #130085; /* fallback for IE */
-    background: rgba(0, 60, 136, 0.7);
-    filter: alpha(opacity=100);
-}
-@media only screen and (max-width: 600px) {
-    div.olControlZoom a:hover {
-        background: rgba(0, 60, 136, 0.5);
-    }
-}
-a.olControlZoomIn {
-    border-radius: 4px 4px 0 0;
-}
-a.olControlZoomOut {
-    border-radius: 0 0 4px 4px;
-}
-
-
-/**
- * Animations
- */
-
-.olLayerGrid .olTileImage {
-    -webkit-transition: opacity 0.2s linear;
-    -moz-transition: opacity 0.2s linear;
-    -o-transition: opacity 0.2s linear;
-    transition: opacity 0.2s linear;
-}
-
-/* Turn on GPU support where available */
-.olTileImage {
-    -webkit-transform: translateZ(0);
-    -moz-transform: translateZ(0);
-    -o-transform: translateZ(0);
-    -ms-transform: translateZ(0);
-    transform: translateZ(0);
-    -webkit-backface-visibility: hidden;
-    -moz-backface-visibility: hidden;
-    -ms-backface-visibility: hidden;
-    backface-visibility: hidden;
-    -webkit-perspective: 1000;
-    -moz-perspective: 1000;
-    -ms-perspective: 1000;
-    perspective: 1000;
-}
-
-/* when replacing tiles, do not show tile and backbuffer at the same time */
-.olTileReplacing {
-    display: none;
-}
-
-/* override any max-width image settings (e.g. bootstrap.css) */
-img.olTileImage {
-    max-width: none;
-}
diff --git a/#pma/js/openlayers/theme/default/style.mobile.css b/#pma/js/openlayers/theme/default/style.mobile.css
deleted file mode 100644
index 92e7d00d..00000000
--- a/#pma/js/openlayers/theme/default/style.mobile.css
+++ /dev/null
@@ -1,70 +0,0 @@
-div.olControlZoom {
-    position: absolute;
-    top: 8px;
-    left: 8px;
-    background: rgba(255,255,255,0.4);
-    border-radius: 4px;
-    padding: 2px;
-}
-* {
-    -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
-}
-div.olControlZoom a {
-    display: block;
-    margin: 1px;
-    padding: 0;
-    color: white;
-    font-size: 28px;
-    font-family: sans-serif;
-    font-weight: bold;
-    text-decoration: none;
-    text-align: center;
-    height: 32px;
-    width: 32px;
-    line-height: 28px;
-    text-shadow: 0 0 3px rgba(0,0,0,0.8);
-    background: #130085; /* fallback for IE - IE6 requires background shorthand*/
-    background: rgba(0, 60, 136, 0.5);
-    filter: alpha(opacity=80);
-}
-a.olControlZoomIn {
-    border-radius: 4px 4px 0 0;
-}
-a.olControlZoomOut {
-    border-radius: 0 0 4px 4px;
-}
-div.olControlZoom a:hover {
-    background: #130085; /* fallback for IE */
-    background: rgba(0, 60, 136, 0.7);
-    filter: alpha(opacity=100);
-}
-@media only screen and (max-width: 600px) {
-    div.olControlZoom a:hover {
-        background: rgba(0, 60, 136, 0.5);
-    }
-}
-div.olMapViewport {
-    -ms-touch-action: none;
-}
-.olLayerGrid .olTileImage {
-    -webkit-transition: opacity 0.2s linear;
-    -moz-transition: opacity 0.2s linear;
-    -o-transition: opacity 0.2s linear;
-    transition: opacity 0.2s linear;
-}
-/* Turn on GPU support where available */
-.olTileImage {
-    -webkit-transform: translateZ(0);
-    -moz-transform: translateZ(0);
-    -o-transform: translateZ(0);
-    -ms-transform: translateZ(0);
-    transform: translateZ(0);
-    -webkit-backface-visibility: hidden;
-    -moz-backface-visibility: hidden;
-    -ms-backface-visibility: hidden;
-    backface-visibility: hidden;
-    -webkit-perspective: 1000;
-    -moz-perspective: 1000;
-    -ms-perspective: 1000;
-    perspective: 1000;
-}
diff --git a/#pma/js/openlayers/theme/default/style.mobile.tidy.css b/#pma/js/openlayers/theme/default/style.mobile.tidy.css
deleted file mode 100644
index bf7eeaf3..00000000
--- a/#pma/js/openlayers/theme/default/style.mobile.tidy.css
+++ /dev/null
@@ -1 +0,0 @@
-div.olControlZoom{position:absolute;top:8px;left:8px;background:rgba(255,255,255,0.4);border-radius:4px;padding:2px;}*{-webkit-tap-highlight-color:rgba(0,0,0,0);}div.olControlZoom a{display:block;color:#FFF;font-size:28px;font-family:sans-serif;font-weight:700;text-decoration:none;text-align:center;height:32px;width:32px;line-height:28px;text-shadow:0 0 3px rgba(0,0,0,0.8);background:rgba(0,60,136,0.5);filter:alpha(opacity=80);margin:1px;padding:0;}a.olControlZoomIn{border-radius:4px 4px 0 0;}a.olControlZoomOut{border-radius:0 0 4px 4px;}div.olControlZoom a:hover{background:rgba(0,60,136,0.7);filter:alpha(opacity=100);}div.olMapViewport{-ms-touch-action:none;}.olLayerGrid .olTileImage{-webkit-transition:opacity .2s linear;-moz-transition:opacity .2s linear;-o-transition:opacity .2s linear;transition:opacity .2s linear;}.olTileImage{-webkit-transform:translateZ(0);-moz-transform:translateZ(0);-o-transform:translateZ(0);-ms-transform:translateZ(0);transform:translateZ(0);-webkit-backface-visibility:hidden;-moz-backface-visibility:hidden;-ms-backface-visibility:hidden;backface-visibility:hidden;-webkit-perspective:1000;-moz-perspective:1000;-ms-perspective:1000;perspective:1000;}@media only screen and max-width 600px{div.olControlZoom a:hover{background:rgba(0,60,136,0.5);}}
\ No newline at end of file
diff --git a/#pma/js/openlayers/theme/default/style.tidy.css b/#pma/js/openlayers/theme/default/style.tidy.css
deleted file mode 100644
index f973d450..00000000
--- a/#pma/js/openlayers/theme/default/style.tidy.css
+++ /dev/null
@@ -1 +0,0 @@
-div.olMap{z-index:0;cursor:default;margin:0!important;padding:0!important;}div.olMapViewport{text-align:left;-ms-touch-action:none;}.olLayerGoogleCopyright{left:2px;bottom:2px;}.olLayerGoogleV3.olLayerGoogleCopyright{right:auto!important;}.olLayerGooglePoweredBy{left:2px;bottom:15px;}.olLayerGoogleV3.olLayerGooglePoweredBy{bottom:15px!important;}.olForeignContainer{opacity:1!important;}.olControlAttribution{font-size:smaller;right:3px;bottom:4.5em;position:absolute;display:block;}.olControlScale{right:3px;bottom:3em;display:block;position:absolute;font-size:smaller;}.olControlScaleLine{display:block;position:absolute;left:10px;bottom:15px;font-size:xx-small;}.olControlScaleLineBottom{border:solid 2px #000;border-bottom:none;margin-top:-2px;text-align:center;}.olControlScaleLineTop{border:solid 2px #000;border-top:none;text-align:center;}.olControlPermalink{right:3px;bottom:1.5em;display:block;position:absolute;font-size:smaller;}div.olControlMousePosition{bottom:0;right:3px;display:block;position:absolute;font-family:Arial;font-size:smaller;}.olControlOverviewMapContainer{position:absolute;bottom:0;right:0;}.olControlOverviewMapElement{background-color:#00008B;-moz-border-radius:1em 0 0;padding:10px 18px 10px 10px;}.olControlOverviewMapMinimizeButton,.olControlOverviewMapMaximizeButton{height:18px;width:18px;right:0;bottom:80px;cursor:pointer;}.olControlOverviewMapExtentRectangle{overflow:hidden;background-image:url(img/blank.gif);cursor:move;border:2px dotted red;}.olControlOverviewMapRectReplacement{overflow:hidden;cursor:move;background-image:url(img/overview_replacement.gif);background-repeat:no-repeat;background-position:center;}.olLayerGeoRSSDescription{float:left;width:100%;overflow:auto;font-size:1em;}.olLayerGeoRSSClose{float:right;color:gray;font-size:1.2em;margin-right:6px;font-family:sans-serif;}.olLayerGeoRSSTitle{float:left;font-size:1.2em;}.olControlNavigationHistory{background-image:url(img/navigation_history.png);background-repeat:no-repeat;width:24px;height:24px;}.olControlNavigationHistoryPreviousItemActive{background-position:0 0;}.olControlNavigationHistoryPreviousItemInactive{background-position:0 -24px;}.olControlNavigationHistoryNextItemActive{background-position:-24px 0;}.olControlNavigationHistoryNextItemInactive{background-position:-24px -24px;}div.olControlSaveFeaturesItemActive{background-image:url(img/save_features_on.png);background-repeat:no-repeat;background-position:0 1px;}div.olControlSaveFeaturesItemInactive{background-image:url(img/save_features_off.png);background-repeat:no-repeat;background-position:0 1px;}.olHandlerBoxZoomBox{border:2px solid red;position:absolute;background-color:#FFF;opacity:.5;font-size:1px;filter:alpha(opacity=50);}.olHandlerBoxSelectFeature{border:2px solid blue;position:absolute;background-color:#FFF;opacity:.5;font-size:1px;filter:alpha(opacity=50);}.olControlPanPanel{top:10px;left:5px;}.olControlPanPanel div{background-image:url(img/pan-panel.png);height:18px;width:18px;cursor:pointer;position:absolute;}.olControlPanPanel .olControlPanNorthItemInactive{top:0;left:9px;background-position:0 0;}.olControlPanPanel .olControlPanSouthItemInactive{top:36px;left:9px;background-position:18px 0;}.olControlPanPanel .olControlPanWestItemInactive{position:absolute;top:18px;left:0;background-position:0 18px;}.olControlPanPanel .olControlPanEastItemInactive{top:18px;left:18px;background-position:18px 18px;}.olControlZoomPanel{top:71px;left:14px;}.olControlZoomPanel div{background-image:url(img/zoom-panel.png);position:absolute;height:18px;width:18px;cursor:pointer;}.olControlZoomPanel .olControlZoomInItemInactive{top:0;left:0;background-position:0 0;}.olControlZoomPanel .olControlZoomToMaxExtentItemInactive{top:18px;left:0;background-position:0 -18px;}.olControlZoomPanel .olControlZoomOutItemInactive{top:36px;left:0;background-position:0 18px;}.olControlPanZoomBar div{font-size:1px;}.olPopupCloseBox{background:url(img/close.gif) no-repeat;cursor:pointer;}.olImageLoadError{background-color:#FFC0CB;opacity:.5;filter:alpha(opacity=50);}.olCursorWait{cursor:wait;}.olDrawBox{cursor:crosshair;}.olControlDragFeatureActive.olControlDragFeatureOver.olDragDown{cursor:0;}.olControlLayerSwitcher{position:absolute;top:25px;right:0;width:20em;font-family:sans-serif;font-weight:700;margin-top:3px;margin-left:3px;margin-bottom:3px;font-size:smaller;color:#FFF;background-color:transparent;}.olControlLayerSwitcher .layersDiv{background-color:#00008B;padding:5px 10px;}.olControlLayerSwitcher .layersDiv .baseLbl,.olControlLayerSwitcher .layersDiv .dataLbl{margin-top:3px;margin-left:3px;margin-bottom:3px;}.olControlLayerSwitcher .layersDiv .baseLayersDiv,.olControlLayerSwitcher .layersDiv .dataLayersDiv{padding-left:10px;}.olControlLayerSwitcher .maximizeDiv,.olControlLayerSwitcher .minimizeDiv{width:18px;height:18px;top:5px;right:0;cursor:pointer;}.olBingAttribution{color:#DDD;}span.olGoogleAttribution a{color:#77C;}.olControlNavToolbar,.olControlEditingToolbar{margin:5px 5px 0 0;}.olControlNavToolbar div,.olControlEditingToolbar div{background-image:url(img/editing_tool_bar.png);background-repeat:no-repeat;width:24px;height:22px;cursor:pointer;margin:0 0 5px 5px;}.olControlEditingToolbar{right:0;top:0;}.olControlNavToolbar{top:295px;left:9px;}.olControlEditingToolbar div{float:right;}.olControlNavToolbar .olControlNavigationItemInactive,.olControlEditingToolbar .olControlNavigationItemInactive{background-position:-103px -1px;}.olControlNavToolbar .olControlNavigationItemActive,.olControlEditingToolbar .olControlNavigationItemActive{background-position:-103px -24px;}.olControlNavToolbar .olControlZoomBoxItemInactive{background-position:-128px -1px;}.olControlNavToolbar .olControlZoomBoxItemActive{background-position:-128px -24px;}.olControlEditingToolbar .olControlDrawFeaturePointItemInactive{background-position:-77px -1px;}.olControlEditingToolbar .olControlDrawFeaturePointItemActive{background-position:-77px -24px;}.olControlEditingToolbar .olControlDrawFeaturePathItemInactive{background-position:-51px -1px;}.olControlEditingToolbar .olControlDrawFeaturePathItemActive{background-position:-51px -24px;}.olControlEditingToolbar .olControlDrawFeaturePolygonItemInactive{background-position:-26px -1px;}.olControlEditingToolbar .olControlDrawFeaturePolygonItemActive{background-position:-26px -24px;}div.olControlZoom{position:absolute;top:8px;left:8px;background:rgba(255,255,255,0.4);border-radius:4px;padding:2px;}div.olControlZoom a{display:block;color:#FFF;font-size:18px;font-family:'Lucida Grande', Verdana, Geneva, Lucida, Arial, Helvetica, sans-serif;font-weight:700;text-decoration:none;text-align:center;height:22px;width:22px;line-height:19px;background:rgba(0,60,136,0.5);filter:alpha(opacity=80);margin:1px;padding:0;}div.olControlZoom a:hover{background:rgba(0,60,136,0.7);filter:alpha(opacity=100);}a.olControlZoomIn{border-radius:4px 4px 0 0;}a.olControlZoomOut{border-radius:0 0 4px 4px;}.olLayerGrid .olTileImage{-webkit-transition:opacity .2s linear;-moz-transition:opacity .2s linear;-o-transition:opacity .2s linear;transition:opacity .2s linear;}.olTileImage{-webkit-transform:translateZ(0);-moz-transform:translateZ(0);-o-transform:translateZ(0);-ms-transform:translateZ(0);transform:translateZ(0);-webkit-backface-visibility:hidden;-moz-backface-visibility:hidden;-ms-backface-visibility:hidden;backface-visibility:hidden;-webkit-perspective:1000;-moz-perspective:1000;-ms-perspective:1000;perspective:1000;}.olTileReplacing{display:none;}img.olTileImage{max-width:none;}div.olLayerDiv,.olControlNoSelect{-khtml-user-select:none;-moz-user-select:none;}.olPopupContent,.olFramedCloudPopupContent{overflow:auto;padding:5px;}.olDragDown,.olControlDragFeatureOver{cursor:move;}.olBingAttribution.road,.olGoogleAttribution{color:#333;}.olGoogleAttribution.hybrid,.olGoogleAttribution.satellite,span.olGoogleAttribution.hybrid a,span.olGoogleAttribution.satellite a{color:#EEE;}@media only screen and max-width 600px{div.olControlZoom a:hover{background:rgba(0,60,136,0.5);}}
\ No newline at end of file
diff --git a/#pma/js/page_settings.js b/#pma/js/page_settings.js
deleted file mode 100644
index c0055bed..00000000
--- a/#pma/js/page_settings.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * @fileoverview    function used for page-related settings
- * @name            Page-related settings
- *
- * @requires    jQuery
- * @requires    jQueryUI
- * @required    js/functions.js
- */
-
-function showSettings(selector) {
-    var buttons = {};
-    buttons[PMA_messages.strApply] = function() {
-        $('.config-form').submit();
-    };
-
-    buttons[PMA_messages.strCancel] = function () {
-        $(this).dialog('close');
-    };
-
-    // Keeping a clone to restore in case the user cancels the operation
-    var $clone = $(selector + ' .page_settings').clone(true);
-    $(selector)
-    .dialog({
-        title: PMA_messages.strPageSettings,
-        width: 700,
-        minHeight: 250,
-        modal: true,
-        open: function() {
-            $(this).dialog('option', 'maxHeight', $(window).height() - $(this).offset().top);
-        },
-        close: function() {
-            $(selector + ' .page_settings').replaceWith($clone);
-        },
-        buttons: buttons
-    });
-}
-
-function showPageSettings() {
-    showSettings('#page_settings_modal');
-}
-
-function showNaviSettings() {
-    showSettings('#pma_navigation_settings');
-}
-
-AJAX.registerTeardown('page_settings.js', function () {
-    $('#page_settings_icon').css('display', 'none');
-    $('#page_settings_icon').unbind('click');
-    $('#pma_navigation_settings_icon').unbind('click');
-});
-
-AJAX.registerOnload('page_settings.js', function () {
-    if ($('#page_settings_modal').length) {
-        $('#page_settings_icon').css('display', 'inline');
-        $('#page_settings_icon').bind('click', showPageSettings);
-    }
-    $('#pma_navigation_settings_icon').bind('click', showNaviSettings);
-});
diff --git a/#pma/js/pmd/designer_db.js b/#pma/js/pmd/designer_db.js
deleted file mode 100644
index 0ef43233..00000000
--- a/#pma/js/pmd/designer_db.js
+++ /dev/null
@@ -1,136 +0,0 @@
-var designer_tables = [{name: "pdf_pages", key: "pg_nr", auto_inc: true},
-                       {name: "table_coords", key: "id", auto_inc: true}];
-
-var DesignerOfflineDB = (function () {
-    var designerDB = {};
-    var datastore = null;
-
-    designerDB.open = function (callback) {
-        var version = 1;
-        var request = window.indexedDB.open("pma_designer", version);
-
-        request.onupgradeneeded = function (e) {
-            var db = e.target.result;
-            e.target.transaction.onerror = designerDB.onerror;
-
-            for (var t in designer_tables) {
-                if (db.objectStoreNames.contains(designer_tables[t].name)) {
-                    db.deleteObjectStore(designer_tables[t].name);
-                }
-            }
-
-            for (var t in designer_tables) {
-                db.createObjectStore(designer_tables[t].name, {
-                    keyPath: designer_tables[t].key,
-                    autoIncrement: designer_tables[t].auto_inc
-                });
-            }
-        };
-
-        request.onsuccess = function (e) {
-            datastore = e.target.result;
-            if (typeof callback !== 'undefined' && callback !== null) {
-                callback(true);
-            }
-        };
-
-        request.onerror = designerDB.onerror;
-    };
-
-    designerDB.loadObject = function (table, id, callback) {
-        var db = datastore;
-        var transaction = db.transaction([table], 'readwrite');
-        var objStore = transaction.objectStore(table);
-        var cursorRequest = objStore.get(parseInt(id));
-
-        cursorRequest.onsuccess = function (e) {
-            callback(e.target.result);
-        };
-
-        cursorRequest.onerror = designerDB.onerror;
-    };
-
-    designerDB.loadAllObjects = function (table, callback) {
-        var db = datastore;
-        var transaction = db.transaction([table], 'readwrite');
-        var objStore = transaction.objectStore(table);
-        var keyRange = IDBKeyRange.lowerBound(0);
-        var cursorRequest = objStore.openCursor(keyRange);
-        var results = [];
-
-        transaction.oncomplete = function (e) {
-            callback(results);
-        };
-
-        cursorRequest.onsuccess = function (e) {
-            var result = e.target.result;
-            if (Boolean(result) === false) {
-                return;
-            }
-            results.push(result.value);
-            result.continue();
-        };
-
-        cursorRequest.onerror = designerDB.onerror;
-    };
-
-    designerDB.loadFirstObject = function(table, callback) {
-        var db = datastore;
-        var transaction = db.transaction([table], 'readwrite');
-        var objStore = transaction.objectStore(table);
-        var keyRange = IDBKeyRange.lowerBound(0);
-        var cursorRequest = objStore.openCursor(keyRange);
-        var firstResult = null;
-
-        transaction.oncomplete = function(e) {
-            callback(firstResult);
-        };
-
-        cursorRequest.onsuccess = function(e) {
-            var result = e.target.result;
-            if (Boolean(result) === false) {
-                return;
-            }
-            firstResult = result.value;
-        };
-
-        cursorRequest.onerror = designerDB.onerror;
-    };
-
-    designerDB.addObject = function(table, obj, callback) {
-        var db = datastore;
-        var transaction = db.transaction([table], 'readwrite');
-        var objStore = transaction.objectStore(table);
-        var request = objStore.put(obj);
-
-        request.onsuccess = function(e) {
-            if (typeof callback !== 'undefined' && callback !== null) {
-                callback(e.currentTarget.result);
-            }
-        };
-
-        request.onerror = designerDB.onerror;
-    };
-
-    designerDB.deleteObject = function(table, id, callback) {
-        var db = datastore;
-        var transaction = db.transaction([table], 'readwrite');
-        var objStore = transaction.objectStore(table);
-        var request = objStore.delete(parseInt(id));
-
-        request.onsuccess = function(e) {
-            if (typeof callback !== 'undefined' && callback !== null) {
-                callback(true);
-            }
-        };
-
-        request.onerror = designerDB.onerror;
-    };
-
-    designerDB.onerror = function(e) {
-        console.log(e);
-    };
-
-    // Export the designerDB object.
-    return designerDB;
-}());
diff --git a/#pma/js/pmd/designer_objects.js b/#pma/js/pmd/designer_objects.js
deleted file mode 100644
index f9622d07..00000000
--- a/#pma/js/pmd/designer_objects.js
+++ /dev/null
@@ -1,17 +0,0 @@
-function PDFPage(db_name, page_descr, tbl_cords)
-{
-    this.pg_nr = null;
-    this.db_name = db_name;
-    this.page_descr = page_descr;
-    this.tbl_cords = tbl_cords;
-}
-
-function TableCoordinate(db_name, table_name, pdf_pg_nr, x, y)
-{
-    this.id = null;
-    this.db_name = db_name;
-    this.table_name = table_name;
-    this.pdf_pg_nr = pdf_pg_nr;
-    this.x = x;
-    this.y = y;
-}
diff --git a/#pma/js/pmd/designer_page.js b/#pma/js/pmd/designer_page.js
deleted file mode 100644
index 7730fbdf..00000000
--- a/#pma/js/pmd/designer_page.js
+++ /dev/null
@@ -1,172 +0,0 @@
-function Show_tables_in_landing_page(db)
-{
-    Load_first_page(db, function (page) {
-        if (page) {
-            Load_HTML_for_page(page.pg_nr);
-            selected_page = page.pg_nr;
-        } else {
-            Show_new_page_tables(true);
-        }
-    });
-}
-
-function Save_to_new_page(db, page_name, table_positions, callback)
-{
-    Create_new_page(db, page_name, function (page) {
-        if (page) {
-            var tbl_cords = [];
-            for (var pos = 0; pos < table_positions.length; pos++) {
-                table_positions[pos].pdf_pg_nr = page.pg_nr;
-                Save_table_positions(table_positions[pos], function (id) {
-                    tbl_cords.push(id);
-                    if (table_positions.length === tbl_cords.length) {
-                        page.tbl_cords = tbl_cords;
-                        DesignerOfflineDB.addObject('pdf_pages', page);
-                    }
-                });
-            }
-            if (typeof callback !== 'undefined') {
-                callback(page);
-            }
-        }
-    });
-}
-
-function Save_to_selected_page(db, page_id, page_name, table_positions, callback)
-{
-    Delete_page(page_id);
-    Save_to_new_page(db, page_name, table_positions, function (page) {
-        if (typeof callback !== 'undefined') {
-            callback(page);
-        }
-        selected_page = page.pg_nr;
-    });
-}
-
-function Create_new_page(db, page_name, callback)
-{
-    var newPage = new PDFPage(db, page_name);
-    DesignerOfflineDB.addObject('pdf_pages', newPage, function (pg_nr) {
-        newPage.pg_nr = pg_nr;
-        if (typeof callback !== 'undefined') {
-            callback(newPage);
-        }
-    });
-}
-
-function Save_table_positions(positions, callback)
-{
-    DesignerOfflineDB.addObject('table_coords', positions, callback);
-}
-
-function Create_page_list(db, callback)
-{
-    DesignerOfflineDB.loadAllObjects('pdf_pages', function (pages) {
-        var html = "";
-        for (var p = 0; p < pages.length; p++) {
-            var page = pages[p];
-            if (page.db_name == db) {
-                html += '<option value="' + page.pg_nr + '">';
-                html += escapeHtml(page.page_descr) + '</option>';
-            }
-        }
-        if (typeof callback !== 'undefined') {
-            callback(html);
-        }
-    });
-}
-
-function Delete_page(page_id, callback)
-{
-    DesignerOfflineDB.loadObject('pdf_pages', page_id, function (page) {
-        if (page) {
-            for (var i = 0; i < page.tbl_cords.length; i++) {
-                DesignerOfflineDB.deleteObject('table_coords', page.tbl_cords[i]);
-            }
-            DesignerOfflineDB.deleteObject('pdf_pages', page_id, callback);
-        }
-    });
-}
-
-function Load_first_page(db, callback)
-{
-    DesignerOfflineDB.loadAllObjects('pdf_pages', function (pages) {
-        var firstPage = null;
-        for (var i = 0; i < pages.length; i++) {
-            var page = pages[i];
-            if (page.db_name == db) {
-                // give preference to a page having same name as the db
-                if (page.page_descr == db) {
-                    callback(page);
-                    return;
-                }
-                if (firstPage == null) {
-                    firstPage = page;
-                }
-            }
-        }
-        callback(firstPage);
-    });
-}
-
-function Show_new_page_tables(check)
-{
-    var all_tables = $("#id_scroll_tab").find("td input:checkbox");
-    all_tables.prop('checked', check);
-    for (var tab = 0; tab < all_tables.length; tab++) {
-        var input = all_tables[tab];
-        if (input.value) {
-            var element = document.getElementById(input.value);
-            element.style.top = Get_random(550, 20) + 'px';
-            element.style.left = Get_random(700, 20) + 'px';
-            VisibleTab(input, input.value);
-        }
-    }
-    selected_page = -1;
-    $("#page_name").text(PMA_messages.strUntitled);
-    MarkUnsaved();
-}
-
-function Load_HTML_for_page(page_id)
-{
-    Show_new_page_tables(false);
-    Load_page_objects(page_id, function (page, tbl_cords) {
-        $("#name-panel").find("#page_name").text(page.page_descr);
-        MarkSaved();
-        for (var t = 0; t < tbl_cords.length; t++) {
-            var tb_id = db + '.' + tbl_cords[t].table_name;
-            var table = document.getElementById(tb_id);
-            table.style.top = tbl_cords[t].y + 'px';
-            table.style.left = tbl_cords[t].x + 'px';
-
-            var checkbox = document.getElementById("check_vis_" + tb_id);
-            checkbox.checked = true;
-            VisibleTab(checkbox, checkbox.value);
-        }
-        selected_page = page.pg_nr;
-    });
-}
-
-function Load_page_objects(page_id, callback)
-{
-    DesignerOfflineDB.loadObject('pdf_pages', page_id, function (page) {
-        var tbl_cords = [];
-        var count = page.tbl_cords.length;
-        for (var i = 0; i < count; i++) {
-            DesignerOfflineDB.loadObject('table_coords', page.tbl_cords[i], function (tbl_cord) {
-                tbl_cords.push(tbl_cord);
-                if (tbl_cords.length == count) {
-                    if (typeof callback !== 'undefined') {
-                        callback(page, tbl_cords);
-                    }
-                }
-            });
-        }
-    });
-}
-
-function Get_random(max, min)
-{
-    var val = Math.random() * (max - min) + min;
-    return Math.floor(val);
-}
diff --git a/#pma/js/pmd/history.js b/#pma/js/pmd/history.js
deleted file mode 100644
index af44d4e7..00000000
--- a/#pma/js/pmd/history.js
+++ /dev/null
@@ -1,869 +0,0 @@
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * @fileoverview    function used in this file builds history tab and generates query.
-  *
-  * @requires    jQuery
-  * @requires    moves.js
-  * @version $Id$
-  */
-
-var history_array = []; // Global array to store history objects
-var select_field = [];  // Global array to store informaation for columns which are used in select clause
-var g_index;
-var vqb_editor = null;
-
-/**
- * To display details of objects(where,rename,Having,aggregate,groupby,orderby,having)
- *
- * @param index index of history_array where change is to be made
- *
-**/
-
-function detail(index)
-{
-    var type = history_array[index].get_type();
-    var str;
-    if (type == "Where") {
-        str = 'Where ' + history_array[index].get_column_name() + history_array[index].get_obj().getrelation_operator() + history_array[index].get_obj().getquery();
-    }
-    if (type == "Rename") {
-        str = 'Rename ' + history_array[index].get_column_name() + ' To ' + history_array[index].get_obj().getrename_to();
-    }
-    if (type == "Aggregate") {
-        str = 'Select ' + history_array[index].get_obj().get_operator() + '( ' + history_array[index].get_column_name() + ' )';
-    }
-    if (type == "GroupBy") {
-        str = 'GroupBy ' + history_array[index].get_column_name();
-    }
-    if (type == "OrderBy") {
-        str = 'OrderBy ' + history_array[index].get_column_name() + ' ' + history_array[index].get_obj().get_order();
-    }
-    if (type == "Having") {
-        str = 'Having ';
-        if (history_array[index].get_obj().get_operator() != 'None') {
-            str += history_array[index].get_obj().get_operator() + '( ' + history_array[index].get_column_name() + ' )';
-            str += history_array[index].get_obj().getrelation_operator() + history_array[index].get_obj().getquery();
-        } else {
-            str = 'Having ' + history_array[index].get_column_name() + history_array[index].get_obj().getrelation_operator() + history_array[index].get_obj().getquery();
-        }
-    }
-    return str;
-}
-
-/**
- * Sorts history_array[] first,using table name as the key and then generates the HTML code for history tab,
- * clubbing all objects of same tables together
- * This function is called whenever changes are made in history_array[]
- *
- *
- * @param {int}  init starting index of unsorted array
- * @param {int} finit   last index of unsorted array
- *
-**/
-
-function display(init, finit)
-{
-    var str, i, j, k, sto, temp;
-    // this part sorts the history array based on table name,this is needed for clubbing all object of same name together.
-    for (i = init; i < finit; i++) {
-        sto = history_array[i];
-        temp = history_array[i].get_tab();//+ '.' + history_array[i].get_obj_no(); for Self JOINS
-        for (j = 0; j < i; j++) {
-            if (temp > (history_array[j].get_tab())) {//+ '.' + history_array[j].get_obj_no())) { //for Self JOINS
-                for (k = i; k > j; k--) {
-                    history_array[k] = history_array[k - 1];
-                }
-                history_array[j] = sto;
-                break;
-            }
-        }
-    }
-    // this part generates HTML code for history tab.adds delete,edit,and/or and detail features with objects.
-    str = ''; // string to store Html code for history tab
-    for (i = 0; i < history_array.length; i++) {
-        temp = history_array[i].get_tab(); //+ '.' + history_array[i].get_obj_no(); for Self JOIN
-        str += '<h3 class="tiger"><a href="#">' + temp + '</a></h3>';
-        str += '<div class="toggle_container">\n';
-        while ((history_array[i].get_tab()) == temp) { //+ '.' + history_array[i].get_obj_no()) == temp) {
-            str += '<div class="block"> <table width ="250">';
-            str += '<thead><tr><td>';
-            if (history_array[i].get_and_or()) {
-                str += '<img src="' + pmaThemeImage + 'pmd/or_icon.png" onclick="and_or(' + i + ')" title="OR"/></td>';
-            } else {
-                str += '<img src="' + pmaThemeImage + 'pmd/and_icon.png" onclick="and_or(' + i + ')" title="AND"/></td>';
-            }
-            str += '<td style="padding-left: 5px;" class="right">' + PMA_getImage('b_sbrowse.png', 'column name') + '</td>' +
-                '<td width="175" style="padding-left: 5px">' + history_array[i].get_column_name() + '<td>';
-            if (history_array[i].get_type() == "GroupBy" || history_array[i].get_type() == "OrderBy") {
-                str += '<td class="center">' + PMA_getImage('s_info.png', detail(i)) + '</td>' +
-                    '<td title="' + detail(i) + '">' + history_array[i].get_type() + '</td>' +
-                    '<td onmouseover="this.className=\'history_table\';" onmouseout="this.className=\'history_table2\'" onclick=history_delete(' + i + ')>' + PMA_getImage('b_drop.png', PMA_messages.strDelete) + '</td>';
-            } else {
-                str += '<td class="center">' + PMA_getImage('s_info.png', detail(i)) + '</td>' +
-                    '<td title="' + detail(i) + '">' + history_array[i].get_type() + '</td>' +
-                    '<td onmouseover="this.className=\'history_table\';" onmouseout="this.className=\'history_table2\'" onclick=history_edit(' + i + ')>' + PMA_getImage('b_edit.png', PMA_messages.strEdit) + '</td>' +
-                    '<td onmouseover="this.className=\'history_table\';" onmouseout="this.className=\'history_table2\'" onclick=history_delete(' + i + ')>' + PMA_getImage('b_drop.png', PMA_messages.strDelete) + '</td>';
-            }
-            str += '</tr></thead>';
-            i++;
-            if (i >= history_array.length) {
-                break;
-            }
-            str += '</table></div>';
-        }
-        i--;
-        str += '</div>';
-    }
-    return str;
-}
-
-/**
- * To change And/Or relation in history tab
- *
- *
- * @param {int} index of history_array where change is to be made
- *
-**/
-
-function and_or(index)
-{
-    if (history_array[index].get_and_or()) {
-        history_array[index].set_and_or(0);
-    } else {
-        history_array[index].set_and_or(1);
-    }
-    var existingDiv = document.getElementById('ab');
-    existingDiv.innerHTML = display(0, 0);
-    $('#ab').accordion("refresh");
-}
-
-/**
- * Deletes entry in history_array
- *
- * @param index index of history_array[] which is to be deleted
- *
-**/
-
-function history_delete(index)
-{
-    for (var k = 0; k < from_array.length; k++) {
-        if (from_array[k] == history_array[index].get_tab()) {
-            from_array.splice(k, 1);
-            break;
-        }
-    }
-    history_array.splice(index, 1);
-    var existingDiv = document.getElementById('ab');
-    existingDiv.innerHTML = display(0, 0);
-    $('#ab').accordion("refresh");
-}
-
-/**
- * To show where,rename,aggregate,having forms to edit a object
- *
- * @param{int} index index of history_array where change is to be made
- *
-**/
-
-function history_edit(index)
-{
-    g_index = index;
-    var type = history_array[index].get_type();
-    if (type == "Where") {
-        document.getElementById('eQuery').value = history_array[index].get_obj().getquery();
-        document.getElementById('erel_opt').value = history_array[index].get_obj().getrelation_operator();
-        document.getElementById('query_where').style.left =  '530px';
-        document.getElementById('query_where').style.top  = '130px';
-        document.getElementById('query_where').style.position  = 'absolute';
-        document.getElementById('query_where').style.zIndex = '103';
-        document.getElementById('query_where').style.visibility = 'visible';
-        document.getElementById('query_where').style.display = 'block';
-    }
-    if (type == "Having") {
-        document.getElementById('hQuery').value = history_array[index].get_obj().getquery();
-        document.getElementById('hrel_opt').value = history_array[index].get_obj().getrelation_operator();
-        document.getElementById('hoperator').value = history_array[index].get_obj().get_operator();
-        document.getElementById('query_having').style.left =  '530px';
-        document.getElementById('query_having').style.top  = '130px';
-        document.getElementById('query_having').style.position  = 'absolute';
-        document.getElementById('query_having').style.zIndex = '103';
-        document.getElementById('query_having').style.visibility = 'visible';
-        document.getElementById('query_having').style.display = 'block';
-    }
-    if (type == "Rename") {
-        document.getElementById('e_rename').value = history_array[index].get_obj().getrename_to();
-        document.getElementById('query_rename_to').style.left =  '530px';
-        document.getElementById('query_rename_to').style.top  = '130px';
-        document.getElementById('query_rename_to').style.position  = 'absolute';
-        document.getElementById('query_rename_to').style.zIndex = '103';
-        document.getElementById('query_rename_to').style.visibility = 'visible';
-        document.getElementById('query_rename_to').style.display = 'block';
-    }
-    if (type == "Aggregate") {
-        document.getElementById('e_operator').value = history_array[index].get_obj().get_operator();
-        document.getElementById('query_Aggregate').style.left = '530px';
-        document.getElementById('query_Aggregate').style.top  = '130px';
-        document.getElementById('query_Aggregate').style.position  = 'absolute';
-        document.getElementById('query_Aggregate').style.zIndex = '103';
-        document.getElementById('query_Aggregate').style.visibility = 'visible';
-        document.getElementById('query_Aggregate').style.display = 'block';
-    }
-}
-
-/**
- * Make changes in history_array when Edit button is clicked
- * checks for the type of object and then sets the new value
- *
- * @param index index of history_array where change is to be made
-**/
-
-function edit(type)
-{
-    if (type == "Rename") {
-        if (document.getElementById('e_rename').value !== "") {
-            history_array[g_index].get_obj().setrename_to(document.getElementById('e_rename').value);
-            document.getElementById('e_rename').value = "";
-        }
-        document.getElementById('query_rename_to').style.visibility = 'hidden';
-    }
-    if (type == "Aggregate") {
-        if (document.getElementById('e_operator').value != '---') {
-            history_array[g_index].get_obj().set_operator(document.getElementById('e_operator').value);
-            document.getElementById('e_operator').value = '---';
-        }
-        document.getElementById('query_Aggregate').style.visibility = 'hidden';
-    }
-    if (type == "Where") {
-        if (document.getElementById('erel_opt').value != '--' && document.getElementById('eQuery').value !== "") {
-            history_array[g_index].get_obj().setquery(document.getElementById('eQuery').value);
-            history_array[g_index].get_obj().setrelation_operator(document.getElementById('erel_opt').value);
-        }
-        document.getElementById('query_where').style.visibility = 'hidden';
-    }
-    if (type == "Having") {
-        if (document.getElementById('hrel_opt').value != '--' && document.getElementById('hQuery').value !== "") {
-            history_array[g_index].get_obj().setquery(document.getElementById('hQuery').value);
-            history_array[g_index].get_obj().setrelation_operator(document.getElementById('hrel_opt').value);
-            history_array[g_index].get_obj().set_operator(document.getElementById('hoperator').value);
-        }
-        document.getElementById('query_having').style.visibility = 'hidden';
-    }
-    var existingDiv = document.getElementById('ab');
-    existingDiv.innerHTML = display(0, 0);
-    $('#ab').accordion("refresh");
-}
-
-/**
- * history object closure
- *
- * @param ncolumn_name  name of the column on which conditions are put
- * @param nobj          object details(where,rename,orderby,groupby,aggregate)
- * @param ntab          table name of the column on which conditions are applied
- * @param nobj_no       object no used for inner join
- * @param ntype         type of object
- *
-**/
-
-function history_obj(ncolumn_name, nobj, ntab, nobj_no, ntype)
-{
-    var and_or;
-    var obj;
-    var tab;
-    var column_name;
-    var obj_no;
-    var type;
-    this.set_column_name = function (ncolumn_name) {
-        column_name = ncolumn_name;
-    };
-    this.get_column_name = function () {
-        return column_name;
-    };
-    this.set_and_or = function (nand_or) {
-        and_or = nand_or;
-    };
-    this.get_and_or = function () {
-        return and_or;
-    };
-    this.get_relation = function () {
-        return and_or;
-    };
-    this.set_obj = function (nobj) {
-        obj = nobj;
-    };
-    this.get_obj = function () {
-        return obj;
-    };
-    this.set_tab = function (ntab) {
-        tab = ntab;
-    };
-    this.get_tab = function () {
-        return tab;
-    };
-    this.set_obj_no = function (nobj_no) {
-        obj_no = nobj_no;
-    };
-    this.get_obj_no = function () {
-        return obj_no;
-    };
-    this.set_type = function (ntype) {
-        type = ntype;
-    };
-    this.get_type = function () {
-        return type;
-    };
-    this.set_obj_no(nobj_no);
-    this.set_tab(ntab);
-    this.set_and_or(0);
-    this.set_obj(nobj);
-    this.set_column_name(ncolumn_name);
-    this.set_type(ntype);
-}
-
-/**
- * where object closure, makes an object with all information of where
- *
- * @param nrelation_operator type of relation operator to be applied
- * @param nquery             stores value of value/sub-query
- *
-**/
-
-
-var where = function (nrelation_operator, nquery) {
-    var relation_operator;
-    var query;
-    this.setrelation_operator = function (nrelation_operator) {
-        relation_operator = nrelation_operator;
-    };
-    this.setquery = function (nquery) {
-        query = nquery;
-    };
-    this.getquery = function () {
-        return query;
-    };
-    this.getrelation_operator = function () {
-        return relation_operator;
-    };
-    this.setquery(nquery);
-    this.setrelation_operator(nrelation_operator);
-};
-
-/**
- * Orderby object closure
- *
- * @param norder order, ASC or DESC
- */
-var orderby = function(norder) {
-    var order;
-    this.set_order = function(norder) {
-        order = norder;
-    };
-    this.get_order = function() {
-        return order;
-    };
-    this.set_order(norder);
-};
-
-/**
- * Having object closure, makes an object with all information of where
- *
- * @param nrelation_operator type of relation operator to be applied
- * @param nquery             stores value of value/sub-query
- * @param noperator          operator
-**/
-
-var having = function (nrelation_operator, nquery, noperator) {
-    var relation_operator;
-    var query;
-    var operator;
-    this.set_operator = function (noperator) {
-        operator = noperator;
-    };
-    this.setrelation_operator = function (nrelation_operator) {
-        relation_operator = nrelation_operator;
-    };
-    this.setquery = function (nquery) {
-        query = nquery;
-    };
-    this.getquery = function () {
-        return query;
-    };
-    this.getrelation_operator = function () {
-        return relation_operator;
-    };
-    this.get_operator = function () {
-        return operator;
-    };
-    this.setquery(nquery);
-    this.setrelation_operator(nrelation_operator);
-    this.set_operator(noperator);
-};
-
-/**
- * rename object closure,makes an object with all information of rename
- *
- * @param nrename_to new name information
- *
-**/
-
-var rename = function (nrename_to) {
-    var rename_to;
-    this.setrename_to = function (nrename_to) {
-        rename_to = nrename_to;
-    };
-    this.getrename_to = function () {
-        return rename_to;
-    };
-    this.setrename_to(nrename_to);
-};
-
-/**
- * aggregate object closure
- *
- * @param noperator aggregte operator
- *
-**/
-
-var aggregate = function (noperator) {
-    var operator;
-    this.set_operator = function (noperator) {
-        operator = noperator;
-    };
-    this.get_operator = function () {
-        return operator;
-    };
-    this.set_operator(noperator);
-};
-
-/**
- * This function returns unique element from an array
- *
- * @param arrayName array from which duplicate elem are to be removed.
- * @return unique array
- */
-
-function unique(arrayName)
-{
-    var newArray = [];
-uniquetop:
-    for (var i = 0; i < arrayName.length; i++) {
-        for (var j = 0; j < newArray.length; j++) {
-            if (newArray[j] == arrayName[i]) {
-                continue uniquetop;
-            }
-        }
-        newArray[newArray.length] = arrayName[i];
-    }
-    return newArray;
-}
-
-/**
- * This function takes in array and a value as input and returns 1 if values is present in array
- * else returns -1
- *
- * @param arrayName array
- * @param value  value which is to be searched in the array
- */
-
-function found(arrayName, value)
-{
-    for (var i = 0; i < arrayName.length; i++) {
-        if (arrayName[i] == value) {
-            return 1;
-        }
-    }
-    return -1;
-}
-
-/**
- * This function concatenates two array
- *
- * @params add array elements of which are pushed in
- * @params arr array in which elements are added
- */
-function add_array(add, arr)
-{
-    for (var i = 0; i < add.length; i++) {
-        arr.push(add[i]);
-    }
-    return arr;
-}
-
-/* This function removes all elements present in one array from the other.
- *
- * @params rem array from which each element is removed from other array.
- * @params arr array from which elements are removed.
- *
- */
-function remove_array(rem, arr)
-{
-    for (var i = 0; i < rem.length; i++) {
-        for (var j = 0; j < arr.length; j++) {
-            if (rem[i] == arr[j]) {
-                arr.splice(j, 1);
-            }
-        }
-    }
-    return arr;
-}
-
-/**
- * This function builds the groupby clause from history object
- *
- */
-
-function query_groupby()
-{
-    var i;
-    var str = "";
-    for (i = 0; i < history_array.length;i++) {
-        if (history_array[i].get_type() == "GroupBy") {
-            str += '`' + history_array[i].get_column_name() + "`, ";
-        }
-    }
-    str = str.substr(0, str.length - 2);
-    return str;
-}
-
-/**
- * This function builds the Having clause from the history object.
- *
- */
-
-function query_having()
-{
-    var i;
-    var and = "(";
-    for (i = 0; i < history_array.length;i++) {
-        if (history_array[i].get_type() == "Having") {
-            if (history_array[i].get_obj().get_operator() != 'None') {
-                and += history_array[i].get_obj().get_operator() + "(`" + history_array[i].get_column_name() + "`) " + history_array[i].get_obj().getrelation_operator();
-                and += " " + history_array[i].get_obj().getquery() + ", ";
-            } else {
-                and += "`" + history_array[i].get_column_name() + "` " + history_array[i].get_obj().getrelation_operator() + " " + history_array[i].get_obj().getquery() + ", ";
-            }
-        }
-    }
-    if (and == "(") {
-        and = "";
-    } else {
-        and = and.substr(0, and.length - 2) + ")";
-    }
-    return and;
-}
-
-
-/**
- * This function builds the orderby clause from the history object.
- *
- */
-
-function query_orderby()
-{
-    var i;
-    var str = "";
-    for (i = 0; i < history_array.length;i++) {
-        if (history_array[i].get_type() == "OrderBy") {
-            str += "`" + history_array[i].get_column_name() + "` " +
-                history_array[i].get_obj().get_order() + ", ";
-        }
-    }
-    str = str.substr(0, str.length - 2);
-    return str;
-}
-
-
-/**
- * This function builds the Where clause from the history object.
- *
- */
-
-function query_where()
-{
-    var i;
-    var and = "(";
-    var or = "(";
-    for (i = 0; i < history_array.length;i++) {
-        if (history_array[i].get_type() == "Where") {
-            if (history_array[i].get_and_or() === 0) {
-                and += "( `" + history_array[i].get_column_name() + "` " + history_array[i].get_obj().getrelation_operator() + " " + history_array[i].get_obj().getquery() + ")";
-                and += " AND ";
-            } else {
-                or += "( `" + history_array[i].get_column_name() + "` " + history_array[i].get_obj().getrelation_operator() + " " + history_array[i].get_obj().getquery() + ")";
-                or += " OR ";
-            }
-        }
-    }
-    if (or != "(") {
-        or = or.substring(0, (or.length - 4)) + ")";
-    } else {
-        or = "";
-    }
-    if (and != "(") {
-        and = and.substring(0, (and.length - 5)) + ")";
-    } else {
-        and = "";
-    }
-    if (or !== "") {
-        and = and + " OR " + or + " )";
-    }
-    return and;
-}
-
-function check_aggregate(id_this)
-{
-    var i;
-    for (i = 0; i < history_array.length; i++) {
-        var temp = '`' + history_array[i].get_tab() + '`.`' + history_array[i].get_column_name() + '`';
-        if (temp == id_this && history_array[i].get_type() == "Aggregate") {
-            return history_array[i].get_obj().get_operator() + '(' + id_this + ')';
-        }
-    }
-    return "";
-}
-
-function check_rename(id_this)
-{
-    var i;
-    for (i = 0; i < history_array.length; i++) {
-        var temp = '`' + history_array[i].get_tab() + '`.`' + history_array[i].get_column_name() + '`';
-        if (temp == id_this && history_array[i].get_type() == "Rename") {
-            return " AS `" + history_array[i].get_obj().getrename_to() + "`";
-        }
-    }
-    return "";
-}
-
- /**
-  * This function builds from clause of query
-  * makes automatic joins.
-  *
-  *
-  */
-function query_from()
-{
-    var i;
-    var tab_left = [];
-    var tab_used = [];
-    var t_tab_used = [];
-    var t_tab_left = [];
-    var temp;
-    var query = "";
-    var quer = "";
-    var parts = [];
-    var t_array = [];
-    t_array = from_array;
-    var K = 0;
-    var k;
-    var key;
-    var key2;
-    var key3;
-    var parts1;
-
-    // the constraints that have been used in the LEFT JOIN
-    var constraints_added = [];
-
-    for (i = 0; i < history_array.length; i++) {
-        from_array.push(history_array[i].get_tab());
-    }
-    from_array = unique(from_array);
-    tab_left = from_array;
-    temp = tab_left.shift();
-    quer = '`' + temp + '`';
-    tab_used.push(temp);
-
-    // if master table (key2) matches with tab used get all keys and check if tab_left matches
-    // after this check if master table (key2) matches with tab left then check if any foreign matches with master .
-    for (i = 0; i < 2; i++) {
-        for (K in contr) {
-            for (key in contr[K]) {// contr name
-                for (key2 in contr[K][key]) {// table name
-                    parts = key2.split(".");
-                    if (found(tab_used, parts[1]) > 0) {
-                        for (key3 in contr[K][key][key2]) {
-                            parts1 = contr[K][key][key2][key3][0].split(".");
-                            if (found(tab_left, parts1[1]) > 0) {
-                                if (found(constraints_added, key) > 0) {
-                                    query += ' AND ' + '`' + parts[1] + '`.`' + key3 + '` = ';
-                                    query += '`' + parts1[1] + '`.`' + contr[K][key][key2][key3][1] + '` ';
-                                } else {
-                                    query += "\n" + 'LEFT JOIN ';
-                                    query += '`' + parts[1] + '` ON ';
-                                    query += '`' + parts1[1] + '`.`' + contr[K][key][key2][key3][1] + '` = ';
-                                    query += '`' + parts[1] + '`.`' + key3 + '` ';
-
-                                    constraints_added.push(key);
-                                }
-                                t_tab_left.push(parts[1]);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        K = 0;
-        t_tab_left = unique(t_tab_left);
-        tab_used = add_array(t_tab_left, tab_used);
-        tab_left = remove_array(t_tab_left, tab_left);
-        t_tab_left = [];
-        for (K in contr) {
-            for (key in contr[K]) {
-                for (key2 in contr[K][key]) {// table name
-                    parts = key2.split(".");
-                    if (found(tab_left, parts[1]) > 0) {
-                        for (key3 in contr[K][key][key2]) {
-                            parts1 = contr[K][key][key2][key3][0].split(".");
-                            if (found(tab_used, parts1[1]) > 0) {
-                                if (found(constraints_added, key) > 0) {
-                                    query += ' AND ' + '`' + parts[1] + '`.`' + key3 + '` = ';
-                                    query += '`' + parts1[1] + '`.`' + contr[K][key][key2][key3][1] + '` ';
-                                } else {
-                                    query += "\n" + 'LEFT JOIN ';
-                                    query += '`' + parts[1] + '` ON ';
-                                    query += '`' + parts1[1] + '`.`' + contr[K][key][key2][key3][1] + '` = ';
-                                    query += '`' + parts[1] + '`.`' + key3 + '` ';
-
-                                    constraints_added.push(key);
-                                }
-                                t_tab_left.push(parts[1]);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        t_tab_left = unique(t_tab_left);
-        tab_used = add_array(t_tab_left, tab_used);
-        tab_left = remove_array(t_tab_left, tab_left);
-        t_tab_left = [];
-    }
-    for (k in tab_left) {
-        quer += " , `" + tab_left[k] + "`";
-    }
-    query = quer + query;
-    from_array = t_array;
-    return query;
-}
-
-/**
- * This function is the main function for query building.
- * uses history object details for this.
- *
- * @ uses query_where()
- * @ uses query_groupby()
- * @ uses query_having()
- * @ uses query_orderby()
- *
- * @param formtitle title for the form
- * @param fadin
- */
-
-function build_query(formtitle, fadin)
-{
-    var q_select = "SELECT ";
-    var temp;
-    if (select_field.length > 0) {
-        for (var i = 0; i < select_field.length; i++) {
-            temp = check_aggregate(select_field[i]);
-            if (temp !== "") {
-                q_select += temp;
-                temp = check_rename(select_field[i]);
-                q_select += temp + ", ";
-            } else {
-                temp = check_rename(select_field[i]);
-                q_select += select_field[i] + temp + ", ";
-            }
-        }
-        q_select = q_select.substring(0, q_select.length - 2);
-    } else {
-        q_select += "* ";
-    }
-
-    q_select += "\nFROM " + query_from();
-
-    var q_where = query_where();
-    if (q_where !== "") {
-        q_select += "\nWHERE " + q_where;
-    }
-
-    var q_groupby = query_groupby();
-    if (q_groupby !== "") {
-        q_select += "\nGROUP BY " + q_groupby;
-    }
-
-    var q_having = query_having();
-    if (q_having !== "") {
-        q_select += "\nHAVING " + q_having;
-    }
-
-    var q_orderby = query_orderby();
-    if (q_orderby !== "") {
-        q_select += "\nORDER BY " + q_orderby;
-    }
-
-    /**
-     * @var button_options Object containing options
-     *                     for jQueryUI dialog buttons
-     */
-    var button_options = {};
-    button_options[PMA_messages.strClose] = function () {
-        $(this).dialog("close");
-    };
-    button_options[PMA_messages.strSubmit] = function () {
-        if (vqb_editor) {
-            var $elm = $ajaxDialog.find('textarea');
-            vqb_editor.save();
-            $elm.val(vqb_editor.getValue());
-        }
-        $('#vqb_form').submit();
-    };
-
-    var $ajaxDialog = $('#box').dialog({
-        appendTo: '#page_content',
-        width: 500,
-        buttons: button_options,
-        modal: true,
-        title: 'SELECT'
-    });
-    // Attach syntax highlighted editor to query dialog
-    /**
-     * @var $elm jQuery object containing the reference
-     *           to the query textarea.
-     */
-    var $elm = $ajaxDialog.find('textarea');
-    if (! vqb_editor) {
-        vqb_editor = PMA_getSQLEditor($elm);
-    }
-    if (vqb_editor) {
-        vqb_editor.setValue(q_select);
-        vqb_editor.focus();
-    } else {
-        $elm.val(q_select);
-        $elm.focus();
-    }
-}
-
-AJAX.registerTeardown('pmd/history.js', function () {
-    vqb_editor = null;
-    history_array = [];
-    select_field = [];
-    $("#ok_edit_rename").unbind('click');
-    $("#ok_edit_having").unbind('click');
-    $("#ok_edit_Aggr").unbind('click');
-    $("#ok_edit_where").unbind('click');
-});
-
-AJAX.registerOnload('pmd/history.js', function () {
-    $("#ok_edit_rename").click(function() {
-        edit('Rename');
-    });
-    $("#ok_edit_having").click(function() {
-        edit('Having');
-    });
-    $("#ok_edit_Aggr").click(function() {
-        edit('Aggregate');
-    });
-    $("#ok_edit_where").click(function() {
-        edit('Where');
-    });
-    $('#ab').accordion({collapsible : true, active : 'none'});
-});
diff --git a/#pma/js/pmd/init.js b/#pma/js/pmd/init.js
deleted file mode 100644
index ec779ea8..00000000
--- a/#pma/js/pmd/init.js
+++ /dev/null
@@ -1,41 +0,0 @@
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Initialises the data required to run PMD, then fires it up.
- */
-
-var j_tabs, h_tabs, contr, display_field, server, db, token, selected_page, pmd_tables_enabled;
-
-AJAX.registerTeardown('pmd/init.js', function () {
-    $(".trigger").unbind('click');
-});
-
-AJAX.registerOnload('pmd/init.js', function () {
-    $(".trigger").click(function () {
-        $(".panel").toggle("fast");
-        $(this).toggleClass("active");
-        $('#ab').accordion("refresh");
-        return false;
-    });
-    var tables_data = $.parseJSON($("#script_tables").html());
-
-    j_tabs             = tables_data.j_tabs;
-    h_tabs             = tables_data.h_tabs;
-    contr              = $.parseJSON($("#script_contr").html());
-    display_field      = $.parseJSON($("#script_display_field").html());
-
-    server             = $("#script_server").html();
-    db                 = $("#script_db").html();
-    token              = $("#script_token").html();
-    selected_page      = $("#script_display_page").html() === "" ? "-1" : $("#script_display_page").html();
-    pmd_tables_enabled = $("#pmd_tables_enabled").html() === "1";
-
-    Main();
-
-    if (! pmd_tables_enabled) {
-        DesignerOfflineDB.open(function(success) {
-            if (success) {
-                Show_tables_in_landing_page(db);
-            }
-        });
-    }
-});
diff --git a/#pma/js/pmd/move.js b/#pma/js/pmd/move.js
deleted file mode 100644
index 7e4413f3..00000000
--- a/#pma/js/pmd/move.js
+++ /dev/null
@@ -1,2097 +0,0 @@
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * @package PhpMyAdmin-Designer
- */
-
-/**
- * init
- */
-
-
-var _change = 0; // variable to track any change in designer layout.
-var _staying = 0; //  variable to check if the user stayed after seeing the confirmation prompt.
-var show_relation_lines = true;
-var always_show_text = false;
-
-AJAX.registerTeardown('pmd/move.js', function () {
-    if ($.FullScreen.supported) {
-        $(document).unbind($.FullScreen.prefix + 'fullscreenchange');
-    }
-
-    $('#selflink').show();
-});
-
-AJAX.registerOnload('pmd/move.js', function () {
-    $('#page_content').css({'margin-left': '3px'});
-    if ($.FullScreen.supported) {
-        $(document).fullScreenChange(function () {
-            if (! $.FullScreen.isFullScreen()) {
-                $('#page_content').removeClass('content_fullscreen')
-                    .css({'width': 'auto', 'height': 'auto'});
-                var $img = $('#toggleFullscreen').find('img');
-                var $span = $img.siblings('span');
-                $span.text($span.data('enter'));
-                $img.attr('src', $img.data('enter'))
-                    .attr('title', $span.data('enter'));
-            }
-        });
-    } else {
-        $('#toggleFullscreen').hide();
-    }
-
-    $('#selflink').hide();
-});
-
-// Below is the function to bind onbeforeunload events with the content_frame as well as the top window.
-
-/*
-FIXME: we can't register the beforeonload event because it will persist between pageloads
-
-AJAX.registerOnload('pmd/move.js', function (){
-    $(window).bind('beforeunload', function () {        // onbeforeunload for the frame window.
-        if (_change == 1 && _staying === 0) {
-            return PMA_messages.strLeavingDesigner;
-        } else if (_change == 1 && _staying == 1) {
-            _staying = 0;
-        }
-    });
-    $(window).unload(function () {
-        _change = 0;
-    });
-    window.top.onbeforeunload = function () {     // onbeforeunload for the browser main window.
-        if (_change == 1 && _staying === 0) {
-            _staying = 1;                                                   //  Helps if the user stays on the page  as there
-            setTimeout('make_zero();', 100);                    //   is no other way of knowing whether the user stayed or not.
-            return PMA_messages.strLeavingDesigner;
-        }
-    };
-});*/
-
-function make_zero() {   // Function called if the user stays after seeing the confirmation prompt.
-    _staying = 0;
-}
-
-function MarkSaved()
-{
-    _change = 0;
-    $('#saved_state').text('');
-}
-
-function MarkUnsaved()
-{
-    _change = 1;
-    $('#saved_state').text('*');
-}
-
-var dx, dy, dy2;
-var cur_click = null;
-// update in Main()
-var sm_x = 2, sm_y = 2;
-var sm_s           = 0;
-var sm_add         = 10;
-var s_left         = 0;
-var s_right        = 0;
-var ON_relation    = 0;
-var ON_grid        = 0;
-var ON_display_field = 0;
-// relation_style: 0 - angular 1 - direct
-var ON_angular_direct = 1;
-var click_field    = 0;
-var link_relation  = "";
-var id_hint;
-var canvas_width   = 0;
-var canvas_height  = 0;
-var osn_tab_width  = 0;
-var osn_tab_height = 0;
-var height_field   = 7;
-var Glob_X, Glob_Y;
-var timeoutID;
-var layer_menu_cur_click = 0;
-var step = 10;
-var old_class;
-var from_array = [];
-var downer;
-var menu_moved = false;
-var grid_size = 10;
-
-//------------------------------------------------------------------------------
-//------------------------------------------------------------------------------
-//------------------------------------------------------------------------------
-
-
-//window.captureEvents(Event.MOUSEDOWN | Event.MOUSEUP);
-//---CROSS
-document.onmousedown = MouseDown;
-document.onmouseup   = MouseUp;
-document.onmousemove = MouseMove;
-
-var isIE = document.all && !window.opera;
-
-if (isIE) {
-    window.onscroll = General_scroll;
-    document.onselectstart = function () {
-        return false;
-    };
-}
-
-//document.onmouseup = function (){General_scroll_end();}
-function MouseDown(e)
-{
-    Glob_X = dx = isIE ? e.clientX + document.body.scrollLeft : e.pageX;
-    Glob_Y = dy = isIE ? e.clientY + document.body.scrollTop : e.pageY;
-    if (cur_click !== null) {
-        document.getElementById("canvas").style.display = 'none';
-        cur_click.style.zIndex = 2;
-    }
-}
-
-function MouseMove(e)
-{
-    if (e.preventDefault) {
-        e.preventDefault();
-    }
-
-    var new_dx = isIE ? e.clientX + document.body.scrollLeft : e.pageX;
-    var new_dy = isIE ? e.clientY + document.body.scrollTop : e.pageY;
-
-    var delta_x = Glob_X - new_dx;
-    var delta_y = Glob_Y - new_dy;
-
-    Glob_X = new_dx;
-    Glob_Y = new_dy;
-
-    if (cur_click !== null) {
-        MarkUnsaved();
-
-        var $cur_click = $(cur_click);
-
-        var cur_x = parseFloat($cur_click.attr('data-left') || $cur_click.css('left'));
-        var cur_y = parseFloat($cur_click.attr('data-top') || $cur_click.css('top'));
-
-        var new_x = cur_x - delta_x;
-        var new_y = cur_y - delta_y;
-
-        dx = new_dx;
-        dy = new_dy;
-
-        $cur_click.attr('data-left', new_x);
-        $cur_click.attr('data-top', new_y);
-
-        if (ON_grid) {
-            new_x = parseInt(new_x / grid_size) * grid_size;
-            new_y = parseInt(new_y / grid_size) * grid_size;
-        }
-
-        $cur_click.css('left', new_x + 'px');
-        $cur_click.css('top', new_y + 'px');
-    }
-
-    else if (layer_menu_cur_click) {
-
-        dx = new_dx;
-        dy = new_dy;
-        if (menu_moved) {
-            delta_x = -delta_x;
-        }
-        var $layer_menu = $('#layer_menu');
-        var new_width = $layer_menu.width() + delta_x;
-        if (new_width < 150) {
-            new_width = 150;
-        }
-        else {
-            dx = e.pageX;
-        }
-        $layer_menu.width(new_width);
-    }
-
-    if (ON_relation || ON_display_field) {
-        document.getElementById('pmd_hint').style.left = (Glob_X + 20) + 'px';
-        document.getElementById('pmd_hint').style.top  = (Glob_Y + 20) + 'px';
-    }
-}
-
-function MouseUp(e)
-{
-    if (cur_click !== null) {
-        document.getElementById("canvas").style.display = 'inline-block';
-        Re_load();
-        cur_click.style.zIndex = 1;
-        cur_click = null;
-    }
-    layer_menu_cur_click = 0;
-    //window.releaseEvents(Event.MOUSEMOVE);
-}
-//------------------------------------------------------------------------------
-//------------------------------------------------------------------------------
-//------------------------------------------------------------------------------
-
-
-//function ToInt(s)
-//{
-//    return s.substring(0,s.length-2)*1; //re = /(\d+)\w*/; newstr = str.replace(re, "$1");
-//}
-
-function Canvas_pos()
-{
-    canvas_width  = document.getElementById('canvas').width  = osn_tab_width  - 3;
-    canvas_height = document.getElementById('canvas').height = osn_tab_height - 3;
-
-    if (isIE) {
-        document.getElementById('canvas').style.width  = ((osn_tab_width  - 3) ? (osn_tab_width  - 3) : 0) + 'px';
-        document.getElementById('canvas').style.height = ((osn_tab_height - 3) ? (osn_tab_height - 3) : 0) + 'px';
-    }
-}
-
-function Osn_tab_pos()
-{
-    osn_tab_width  = parseInt(document.getElementById('osn_tab').style.width, 10);
-    osn_tab_height = parseInt(document.getElementById('osn_tab').style.height, 10);
-}
-
-function setDefaultValuesFromSavedState()
-{
-    if ($('#angular_direct_button').attr('class') === 'M_butt') {
-        ON_angular_direct = 0;
-    } else {
-        ON_angular_direct = 1;
-    }
-    Angular_direct();
-
-    if ($('#grid_button').attr('class') === 'M_butt') {
-        ON_grid = 1;
-    } else {
-        ON_grid = 0;
-    }
-    Grid();
-
-    var $relLineInvert = $('#relLineInvert');
-    if ($relLineInvert.attr('class') === 'M_butt') {
-        show_relation_lines = false;
-        $relLineInvert.attr('class', 'M_butt');
-    } else {
-        show_relation_lines = true;
-        $relLineInvert.attr('class', 'M_butt_Selected_down');
-    }
-    Relation_lines_invert();
-
-    if ($('#pin_Text').attr('class') === 'M_butt_Selected_down') {
-        always_show_text = true;
-        Show_text();
-    } else {
-        always_show_text = false;
-    }
-
-    var $key_SB_all = $('#key_SB_all');
-    if ($key_SB_all.attr('class') === 'M_butt_Selected_down') {
-        $key_SB_all.click();
-        $key_SB_all.toggleClass('M_butt_Selected_down');
-        $key_SB_all.toggleClass('M_butt');
-    }
-
-    var $key_Left_Right = $('#key_Left_Right');
-    if ($key_Left_Right.attr('class') === 'M_butt_Selected_down') {
-        $key_Left_Right.click();
-    }
-
-}
-
-function Main()
-{
-    //---CROSS
-
-    document.getElementById("layer_menu").style.top = -1000 + 'px'; //fast scroll
-    // sm_x += document.getElementById('osn_tab').offsetLeft;
-    // sm_y += document.getElementById('osn_tab').offsetTop;
-    Osn_tab_pos();
-    Canvas_pos();
-    Small_tab_refresh();
-    Re_load();
-    setDefaultValuesFromSavedState();
-    id_hint = document.getElementById('pmd_hint');
-    if (isIE) {
-        General_scroll();
-    }
-}
-
-
-//-------------------------------- new -----------------------------------------
-function Rezize_osn_tab()
-{
-    var max_X = 0;
-    var max_Y = 0;
-    for (var key in j_tabs) {
-        var k_x = parseInt(document.getElementById(key).style.left, 10) + document.getElementById(key).offsetWidth;
-        var k_y = parseInt(document.getElementById(key).style.top, 10) + document.getElementById(key).offsetHeight;
-        max_X = max_X < k_x ? k_x : max_X;
-        max_Y = max_Y < k_y ? k_y : max_Y;
-    }
-
-    osn_tab_width  = max_X + 50;
-    osn_tab_height = max_Y + 50;
-    Canvas_pos();
-    document.getElementById('osn_tab').style.width = osn_tab_width + 'px';
-    document.getElementById('osn_tab').style.height = osn_tab_height + 'px';
-}
-//------------------------------------------------------------------------------
-
-/**
- * refreshes display, must be called after state changes
- */
-function Re_load()
-{
-    Rezize_osn_tab();
-    var n;
-    var x1;
-    var x2;
-    var a = [];
-    var K;
-    var key;
-    var key2;
-    var key3;
-    Clear();
-    for (K in contr) {
-        for (key in contr[K]) {
-            // contr name
-            for (key2 in contr[K][key]) {
-                // table name
-                for (key3 in contr[K][key][key2]) {
-                    // field name
-                    if (!document.getElementById("check_vis_" + key2).checked ||
-                        !document.getElementById("check_vis_" + contr[K][key][key2][key3][0]).checked) {
-                        // if hide
-                        continue;
-                    }
-                    var x1_left  = document.getElementById(key2).offsetLeft + 1;
-                    var x1_right = x1_left + document.getElementById(key2).offsetWidth;
-                    var x2_left  = document.getElementById(contr[K][key][key2][key3][0]).offsetLeft;
-                    var x2_right = x2_left + document.getElementById(contr[K][key][key2][key3][0]).offsetWidth;
-                    a[0] = Math.abs(x1_left - x2_left);
-                    a[1] = Math.abs(x1_left - x2_right);
-                    a[2] = Math.abs(x1_right - x2_left);
-                    a[3] = Math.abs(x1_right - x2_right);
-                    n = s_left = s_right = 0;
-                    for (var i = 1; i < 4; i++) {
-                        if (a[n] > a[i]) {
-                            n = i;
-                        }
-                    }
-                    if (n == 1) {
-                        x1 = x1_left - sm_s;
-                        x2 = x2_right + sm_s;
-                        if (x1 < x2) {
-                            n = 0;
-                        }
-                    }
-                    if (n == 2) {
-                        x1 = x1_right + sm_s;
-                        x2 = x2_left - sm_s;
-                        if (x1 > x2) {
-                            n = 0;
-                        }
-                    }
-                    if (n == 3) {
-                        x1 = x1_right + sm_s;
-                        x2 = x2_right + sm_s;
-                        s_right = 1;
-                    }
-                    if (n === 0) {
-                        x1 = x1_left - sm_s;
-                        x2 = x2_left - sm_s;
-                        s_left = 1;
-                    }
-
-                    var row_offset_top = 0;
-                    var tab_hide_button = document.getElementById('id_hide_tbody_' + key2);
-
-                    if (tab_hide_button.innerHTML == 'v') {
-                        var fromColumn = document.getElementById(key2 + "." + key3);
-                        if (fromColumn) {
-                            row_offset_top = fromColumn.offsetTop;
-                        } else {
-                            continue;
-                        }
-                    }
-
-                    var y1 = document.getElementById(key2).offsetTop +
-                        row_offset_top +
-                        height_field;
-
-
-                    row_offset_top = 0;
-                    tab_hide_button = document.getElementById('id_hide_tbody_' + contr[K][key][key2][key3][0]);
-                    if (tab_hide_button.innerHTML == 'v') {
-                        var toColumn = document.getElementById(contr[K][key][key2][key3][0] +
-                            '.' + contr[K][key][key2][key3][1]);
-                        if (toColumn) {
-                            row_offset_top = toColumn.offsetTop;
-                        } else {
-                            continue;
-                        }
-                    }
-
-                    var y2 =
-                        document.getElementById(contr[K][key][key2][key3][0]).offsetTop +
-                        row_offset_top +
-                        height_field;
-
-                    var osn_tab = document.getElementById('osn_tab');
-
-                    Line0(
-                        x1 + osn_tab.offsetLeft,
-                        y1 - osn_tab.offsetTop,
-                        x2 + osn_tab.offsetLeft,
-                        y2 - osn_tab.offsetTop,
-                        getColorByTarget(contr[K][key][key2][key3][0] + '.' + contr[K][key][key2][key3][1])
-                    );
-                }
-            }
-        }
-    }
-}
-
-/**
- * draws a line from x1:y1 to x2:y2 with color
- */
-function Line(x1, y1, x2, y2, color_line)
-{
-    var canvas = document.getElementById("canvas");
-    var ctx    = canvas.getContext("2d");
-    ctx.strokeStyle = color_line;
-    ctx.lineWidth = 1;
-    ctx.beginPath();
-    ctx.moveTo(x1, y1);
-    ctx.lineTo(x2, y2);
-    ctx.stroke();
-}
-
-/**
- * draws a relation/constraint line, whether angular or not
- */
-function Line0(x1, y1, x2, y2, color_line)
-{
-    if (! show_relation_lines) {
-        return;
-    }
-    Circle(x1, y1, 3, 3, color_line);
-    Rect(x2 - 1, y2 - 2, 4, 4, color_line);
-
-    if (ON_angular_direct) {
-        Line2(x1, y1, x2, y2, color_line);
-    } else {
-        Line3(x1, y1, x2, y2, color_line);
-    }
-}
-
-/**
- * draws a angular relation/constraint line
- */
-function Line2(x1, y1, x2, y2, color_line)
-{
-    var x1_ = x1;
-    var x2_ = x2;
-
-    if (s_right) {
-        x1_ += sm_add;
-        x2_ += sm_add;
-    } else if (s_left) {
-        x1_ -= sm_add;
-        x2_ -= sm_add;
-    } else if (x1 < x2) {
-        x1_ += sm_add;
-        x2_ -= sm_add;
-    } else {
-        x1_ -= sm_add;
-        x2_ += sm_add;
-    }
-
-    Line(x1, y1, x1_, y1, color_line);
-    Line(x2, y2, x2_, y2, color_line);
-    Line(x1_, y1, x2_, y2, color_line);
-}
-
-/**
- * draws a relation/constraint line
- */
-function Line3(x1, y1, x2, y2, color_line)
-{
-    var x1_ = x1;
-    var x2_ = x2;
-
-    if (s_right) {
-        if (x1 < x2) {
-            x1_ += x2 - x1 + sm_add;
-            x2_ += sm_add;
-        } else {
-            x2_ += x1 - x2 + sm_add;
-            x1_ += sm_add;
-        }
-
-        Line(x1, y1, x1_, y1, color_line);
-        Line(x2, y2, x2_, y2, color_line);
-        Line(x1_, y1, x2_, y2, color_line);
-        return;
-    }
-    if (s_left) {
-        if (x1 < x2) {
-            x2_ -= x2 - x1 + sm_add;
-            x1_ -= sm_add;
-        } else {
-            x1_ -= x1 - x2 + sm_add;
-            x2_ -= sm_add;
-        }
-
-        Line(x1, y1, x1_, y1, color_line);
-        Line(x2, y2, x2_, y2, color_line);
-        Line(x1_, y1, x2_, y2, color_line);
-        return;
-    }
-
-    var x_s = (x1 + x2) / 2;
-    Line(x1, y1, x_s, y1, color_line);
-    Line(x_s, y2, x2, y2, color_line);
-    Line(x_s, y1, x_s, y2, color_line);
-}
-
-function Circle(x, y, r, w, color)
-{
-    var ctx = document.getElementById('canvas').getContext('2d');
-    ctx.beginPath();
-    ctx.moveTo(x, y);
-    ctx.lineWidth = w;
-    ctx.strokeStyle = color;
-    ctx.arc(x, y, r, 0, 2 * Math.PI, true);
-    ctx.stroke();
-}
-
-function Clear()
-{
-    var canvas = document.getElementById("canvas");
-    var ctx    = canvas.getContext("2d");
-    ctx.clearRect(0, 0, canvas_width, canvas_height);
-}
-
-function Rect(x1, y1, w, h, color)
-{
-    var ctx = document.getElementById('canvas').getContext('2d');
-    ctx.fillStyle = color;
-    ctx.fillRect(x1, y1, w, h);
-}
-//--------------------------- FULLSCREEN -------------------------------------
-function Toggle_fullscreen()
-{
-    var value_sent = '';
-    var $img = $('#toggleFullscreen').find('img');
-    var $span = $img.siblings('span');
-    if (! $.FullScreen.isFullScreen()) {
-        $img.attr('src', $img.data('exit'))
-            .attr('title', $span.data('exit'));
-        $span.text($span.data('exit'));
-        $('#page_content')
-            .addClass('content_fullscreen')
-            .css({'width': screen.width - 5, 'height': screen.height - 5})
-            .requestFullScreen();
-        value_sent = 'on';
-    }
-    if ($.FullScreen.isFullScreen()) {
-        $.FullScreen.cancelFullScreen();
-        value_sent = 'off';
-    }
-    saveValueInConfig('full_screen', value_sent);
-}
-// ------------------------------ NEW ------------------------------------------
-
-function New()
-{
-    Prompt_to_save_current_page(function() {
-        Load_page(-1);
-    });
-}
-
-//------------------------------ SAVE ------------------------------------------
-function Save(url) // (del?) no for pdf
-{
-    for (var key in j_tabs) {
-        document.getElementById('t_x_' + key + '_').value = parseInt(document.getElementById(key).style.left, 10);
-        document.getElementById('t_y_' + key + '_').value = parseInt(document.getElementById(key).style.top, 10);
-        document.getElementById('t_v_' + key + '_').value = document.getElementById('id_tbody_' + key).style.display == 'none' ? 0 : 1;
-        document.getElementById('t_h_' + key + '_').value = document.getElementById('check_vis_' + key).checked ? 1 : 0;
-    }
-    document.form1.action = url;
-    $(document.form1).submit();
-}
-
-function Get_url_pos(forceString)
-{
-    if (pmd_tables_enabled || forceString) {
-        var poststr = '';
-        for (var key in j_tabs) {
-            poststr += '&t_x[' + key + ']=' + parseInt(document.getElementById(key).style.left, 10);
-            poststr += '&t_y[' + key + ']=' + parseInt(document.getElementById(key).style.top, 10);
-            poststr += '&t_v[' + key + ']=' + (document.getElementById('id_tbody_' + key).style.display == 'none' ? 0 : 1);
-            poststr += '&t_h[' + key + ']=' + (document.getElementById('check_vis_' + key).checked ? 1 : 0);
-        }
-        return poststr;
-    } else {
-        var coords = [];
-        for (var key in j_tabs) {
-            if (document.getElementById('check_vis_' + key).checked) {
-                var x = parseInt(document.getElementById(key).style.left, 10);
-                var y = parseInt(document.getElementById(key).style.top, 10);
-                var tbCoords = new TableCoordinate(db, key.split(".")[1], -1, x, y);
-                coords.push(tbCoords);
-            }
-        }
-        return coords;
-    }
-}
-
-function Save2(callback)
-{
-    if (pmd_tables_enabled) {
-        var poststr = '&operation=savePage&save_page=same&ajax_request=true';
-        poststr += '&server=' + server + '&db=' + db + '&token=' + token + '&selected_page=' + selected_page;
-        poststr += Get_url_pos();
-
-        var $msgbox = PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
-        $.post('db_designer.php', poststr, function (data) {
-            if (data.success === false) {
-                PMA_ajaxShowMessage(data.error, false);
-            } else {
-                PMA_ajaxRemoveMessage($msgbox);
-                PMA_ajaxShowMessage(PMA_messages.strModificationSaved);
-                MarkSaved();
-                if (typeof callback !== 'undefined') {
-                    callback();
-                }
-            }
-        });
-    } else {
-        var name = $("#page_name").html().trim();
-        Save_to_selected_page(db, selected_page, name, Get_url_pos(), function (page) {
-            MarkSaved();
-            if (typeof callback !== 'undefined') {
-                callback();
-            }
-        });
-    }
-}
-
-
-function submitSaveDialogAndClose(callback)
-{
-    var $form = $("#save_page");
-    var name = $form.find('input[name="selected_value"]').val().trim();
-    if (name === '') {
-        PMA_ajaxShowMessage(PMA_messages.strEnterValidPageName, false);
-        return;
-    }
-    $('#page_save_dialog').dialog('close');
-
-    if (pmd_tables_enabled) {
-        var $msgbox = PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
-        PMA_prepareForAjaxRequest($form);
-        $.post($form.attr('action'), $form.serialize() + Get_url_pos(), function (data) {
-            if (data.success === false) {
-                PMA_ajaxShowMessage(data.error, false);
-            } else {
-                PMA_ajaxRemoveMessage($msgbox);
-                MarkSaved();
-                if (data.id) {
-                    selected_page = data.id;
-                }
-                $('#page_name').text(name);
-                if (typeof callback !== 'undefined') {
-                    callback();
-                }
-            }
-        });
-    } else {
-        Save_to_new_page(db, name, Get_url_pos(), function (page) {
-            MarkSaved();
-            if (page.pg_nr) {
-                selected_page = page.pg_nr;
-            }
-            $('#page_name').text(page.page_descr);
-            if (typeof callback !== 'undefined') {
-                callback();
-            }
-        });
-    }
-}
-
-function Save3(callback)
-{
-    if (parseInt(selected_page) !== -1) {
-        Save2(callback);
-    } else {
-        var button_options = {};
-        button_options[PMA_messages.strGo] = function () {
-            var $form = $("#save_page");
-            $form.submit();
-        }
-        button_options[PMA_messages.strCancel] = function () {
-            $(this).dialog('close');
-        };
-
-        var $form = $('<form action="db_designer.php" method="post" name="save_page" id="save_page" class="ajax"></form>')
-            .append('<input type="hidden" name="server" value="' + server + '" />')
-            .append('<input type="hidden" name="db" value="' + db + '" />')
-            .append('<input type="hidden" name="token" value="' + token + '" />')
-            .append('<input type="hidden" name="operation" value="savePage" />')
-            .append('<input type="hidden" name="save_page" value="new" />')
-            .append('<label for="selected_value">' + PMA_messages.strPageName +
-                '</label>:<input type="text" name="selected_value" />');
-        $form.on('submit', function(e){
-            e.preventDefault();
-            submitSaveDialogAndClose(callback);
-        });
-        $('<div id="page_save_dialog"></div>')
-            .append($form)
-            .dialog({
-                appendTo: '#page_content',
-                title: PMA_messages.strSavePage,
-                width: 300,
-                modal: true,
-                buttons: button_options,
-                close: function () {
-                    $(this).remove();
-                }
-            });
-    }
-}
-
-//------------------------------ EDIT PAGES ------------------------------------------
-function Edit_pages()
-{
-    Prompt_to_save_current_page(function() {
-
-        var button_options = {};
-        button_options[PMA_messages.strGo] = function () {
-            var $form = $("#edit_delete_pages");
-            var selected = $form.find('select[name="selected_page"]').val();
-            if (selected === "0") {
-                PMA_ajaxShowMessage(PMA_messages.strSelectPage, 2000);
-                return;
-            }
-            $(this).dialog('close');
-            Load_page(selected);
-        };
-        button_options[PMA_messages.strCancel] = function () {
-            $(this).dialog('close');
-        };
-
-        var $msgbox = PMA_ajaxShowMessage();
-        var params = 'ajax_request=true&dialog=edit&server=' + server + '&token=' + token + '&db=' + db;
-        $.get("db_designer.php", params, function (data) {
-            if (data.success === false) {
-                PMA_ajaxShowMessage(data.error, false);
-            } else {
-                PMA_ajaxRemoveMessage($msgbox);
-
-                if (! pmd_tables_enabled) {
-                    Create_page_list(db, function (options) {
-                        $("#selected_page").append(options);
-                    });
-                }
-                $('<div id="page_edit_dialog"></div>')
-                    .append(data.message)
-                    .dialog({
-                        appendTo: '#page_content',
-                        title: PMA_messages.strOpenPage,
-                        width: 350,
-                        modal: true,
-                        buttons: button_options,
-                        close: function () {
-                            $(this).remove();
-                        }
-                    });
-            }
-        }); // end $.get()
-    });
-}
-
-// -----------------------------  DELETE PAGES ---------------------------------------
-function Delete_pages()
-{
-    var button_options = {};
-    button_options[PMA_messages.strGo] = function () {
-        var $form = $("#edit_delete_pages");
-        var selected = $form.find('select[name="selected_page"]').val();
-        if (selected === '0') {
-            PMA_ajaxShowMessage(PMA_messages.strSelectPage, 2000);
-            return;
-        }
-
-        var $msgbox = PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
-        var deleting_current_page = selected == selected_page;
-        PMA_prepareForAjaxRequest($form);
-
-        if (pmd_tables_enabled) {
-            $.post($form.attr('action'), $form.serialize(), function (data) {
-                if (data.success === false) {
-                    PMA_ajaxShowMessage(data.error, false);
-                } else {
-                    PMA_ajaxRemoveMessage($msgbox);
-                    if (deleting_current_page) {
-                        Load_page(null);
-                    } else {
-                        PMA_ajaxShowMessage(PMA_messages.strSuccessfulPageDelete);
-                    }
-                }
-            }); // end $.post()
-        } else {
-            Delete_page(selected, function (success) {
-                if (! success) {
-                    PMA_ajaxShowMessage("Error", false);
-                } else {
-                    PMA_ajaxRemoveMessage($msgbox);
-                    if (deleting_current_page) {
-                        Load_page(null);
-                    } else {
-                        PMA_ajaxShowMessage(PMA_messages.strSuccessfulPageDelete);
-                    }
-                }
-            });
-        }
-
-        $(this).dialog('close');
-    };
-    button_options[PMA_messages.strCancel] = function () {
-        $(this).dialog('close');
-    };
-
-    var $msgbox = PMA_ajaxShowMessage();
-    var params = 'ajax_request=true&dialog=delete&server=' + server + '&token=' + token + '&db=' + db;
-    $.get("db_designer.php", params, function (data) {
-        if (data.success === false) {
-            PMA_ajaxShowMessage(data.error, false);
-        } else {
-            PMA_ajaxRemoveMessage($msgbox);
-
-            if (! pmd_tables_enabled) {
-                Create_page_list(db, function (options) {
-                    $("#selected_page").append(options);
-                });
-            }
-
-            $('<div id="page_delete_dialog"></div>')
-                .append(data.message)
-                .dialog({
-                    appendTo: '#page_content',
-                    title: PMA_messages.strDeletePage,
-                    width: 350,
-                    modal: true,
-                    buttons: button_options,
-                    close: function () {
-                        $(this).remove();
-                    }
-                });
-        }
-    }); // end $.get()
-}
-
-//------------------------------ SAVE AS PAGES ---------------------------------------
-function Save_as()
-{
-    var button_options = {};
-    button_options[PMA_messages.strGo] = function () {
-        var $form           = $("#save_as_pages");
-        var selected_value  = $form.find('input[name="selected_value"]').val().trim();
-        var $selected_page  = $form.find('select[name="selected_page"]');
-        var choice          = $form.find('input[name="save_page"]:checked').val();
-        var name            = '';
-
-        if (choice === 'same') {
-            if ($selected_page.val() === '0') {
-                PMA_ajaxShowMessage(PMA_messages.strSelectPage, 2000);
-                return;
-            }
-            name = $selected_page.find('option:selected').text();
-        } else if (choice === 'new') {
-            if (selected_value === '') {
-                PMA_ajaxShowMessage(PMA_messages.strEnterValidPageName, 2000);
-                return;
-            }
-            name = selected_value;
-        }
-
-        var $msgbox = PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
-        if (pmd_tables_enabled) {
-            PMA_prepareForAjaxRequest($form);
-            $.post($form.attr('action'), $form.serialize() + Get_url_pos(), function (data) {
-                if (data.success === false) {
-                    PMA_ajaxShowMessage(data.error, false);
-                } else {
-                    PMA_ajaxRemoveMessage($msgbox);
-                    MarkSaved();
-                    if (data.id) {
-                        selected_page = data.id;
-                    }
-                    $('#page_name').text(name);
-                }
-            }); // end $.post()
-        } else {
-            if (choice === 'same') {
-                var selected_page_id = $selected_page.find('option:selected').val();
-                Save_to_selected_page(db, selected_page_id, name, Get_url_pos(), function (page) {
-                    PMA_ajaxRemoveMessage($msgbox);
-                    MarkSaved();
-                    if (page.pg_nr) {
-                        selected_page = page.pg_nr;
-                    }
-                    $('#page_name').text(page.page_descr);
-                });
-            } else if (choice === 'new') {
-                Save_to_new_page(db, name, Get_url_pos(), function (page) {
-                    PMA_ajaxRemoveMessage($msgbox);
-                    MarkSaved();
-                    if (page.pg_nr) {
-                        selected_page = page.pg_nr;
-                    }
-                    $('#page_name').text(page.page_descr);
-                });
-            }
-        }
-
-        $(this).dialog('close');
-    };
-    button_options[PMA_messages.strCancel] = function () {
-        $(this).dialog('close');
-    };
-
-    var $msgbox = PMA_ajaxShowMessage();
-    var params = 'ajax_request=true&dialog=save_as&server=' + server + '&token=' + token + '&db=' + db;
-    $.get("db_designer.php", params, function (data) {
-        if (data.success === false) {
-            PMA_ajaxShowMessage(data.error, false);
-        } else {
-            PMA_ajaxRemoveMessage($msgbox);
-
-            if (! pmd_tables_enabled) {
-                Create_page_list(db, function (options) {
-                    $("#selected_page").append(options);
-                });
-            }
-
-            $('<div id="page_save_as_dialog"></div>')
-                .append(data.message)
-                .dialog({
-                    appendTo: '#page_content',
-                    title: PMA_messages.strSavePageAs,
-                    width: 450,
-                    modal: true,
-                    buttons: button_options,
-                    close: function () {
-                        $(this).remove();
-                    }
-                });
-            // select current page by default
-            if (selected_page !== '-1') {
-                $('select[name="selected_page"]').val(selected_page);
-            }
-        }
-    }); // end $.get()
-}
-
-function Prompt_to_save_current_page(callback)
-{
-    if (_change == 1 || selected_page == '-1') {
-        var button_options = {};
-        button_options[PMA_messages.strYes] = function () {
-            $(this).dialog('close');
-            Save3(callback);
-        };
-        button_options[PMA_messages.strNo] = function () {
-            $(this).dialog('close');
-            callback();
-        };
-        button_options[PMA_messages.strCancel] = function () {
-            $(this).dialog('close');
-        };
-        $('<div id="prompt_save_dialog"></div>')
-            .append('<div>' + PMA_messages.strLeavingPage + '</div>')
-            .dialog({
-                appendTo: '#page_content',
-                title: PMA_messages.strSavePage,
-                width: 300,
-                modal: true,
-                buttons: button_options,
-                close: function () {
-                    $(this).remove();
-                }
-            });
-    } else {
-        callback();
-    }
-}
-
-//------------------------------ EXPORT PAGES ---------------------------------------
-function Export_pages()
-{
-    var button_options = {};
-    button_options[PMA_messages.strGo] = function () {
-        $("#id_export_pages").submit();
-        $(this).dialog('close');
-    };
-    button_options[PMA_messages.strCancel] = function () {
-        $(this).dialog('close');
-    };
-    var $msgbox = PMA_ajaxShowMessage();
-    var params = 'ajax_request=true&dialog=export&server=' + server + '&token=' + token + '&db=' + db + '&selected_page=' + selected_page;
-    $.get("db_designer.php", params, function (data) {
-        if (data.success === false) {
-            PMA_ajaxShowMessage(data.error, false);
-        } else {
-            PMA_ajaxRemoveMessage($msgbox);
-
-            var $form = $(data.message);
-            if (!pmd_tables_enabled) {
-                $form.append('<input type="hidden" name="offline_export" value="true" />');
-            }
-            $.each(Get_url_pos(true).substring(1).split('&'), function() {
-                var pair = this.split('=');
-                var input = $('<input type="hidden" />');
-                input.attr('name', pair[0]);
-                input.attr('value', pair[1]);
-                $form.append(input);
-            });
-            var $formatDropDown = $form.find('#plugins');
-            $formatDropDown.change(function() {
-                var format = $formatDropDown.val();
-                $form.find('.format_specific_options').hide();
-                $form.find('#' + format + '_options').show();
-            }).trigger('change');
-
-            $('<div id="page_export_dialog"></div>')
-                .append($form)
-                .dialog({
-                    appendTo: '#page_content',
-                    title: PMA_messages.strExportRelationalSchema,
-                    width: 550,
-                    modal: true,
-                    buttons: button_options,
-                    close: function () {
-                        $(this).remove();
-                    }
-                });
-        }
-    }); // end $.get()
-}// end export pages
-
-function Load_page(page) {
-    if (pmd_tables_enabled) {
-        var param_page = '';
-        if (page !== null) {
-            param_page = '&page=' + page;
-        }
-        $('<a href="db_designer.php?server=' + server + '&db=' + db + '&token=' + token + param_page + '"></a>')
-            .appendTo($('#page_content'))
-            .click();
-    } else {
-        if (page === null) {
-            Show_tables_in_landing_page(db);
-        } else if (page > -1) {
-            Load_HTML_for_page(page);
-        } else if (page === -1) {
-            Show_new_page_tables(true);
-        }
-    }
-    MarkSaved();
-}
-
-function Grid()
-{
-    var value_sent = '';
-    if (!ON_grid) {
-        ON_grid = 1;
-        value_sent = 'on';
-        document.getElementById('grid_button').className = 'M_butt_Selected_down';
-    } else {
-        document.getElementById('grid_button').className = 'M_butt';
-        ON_grid = 0;
-        value_sent = 'off';
-    }
-    saveValueInConfig('snap_to_grid', value_sent);
-}
-
-function Angular_direct()
-{
-    var value_sent = '';
-    if (ON_angular_direct) {
-        ON_angular_direct = 0;
-        value_sent = 'angular';
-        document.getElementById('angular_direct_button').className = 'M_butt_Selected_down';
-    } else {
-        ON_angular_direct = 1;
-        value_sent = 'direct';
-        document.getElementById('angular_direct_button').className = 'M_butt';
-    }
-    saveValueInConfig('angular_direct', value_sent);
-    Re_load();
-}
-
-function saveValueInConfig(index_sent, value_sent) {
-    $.post('db_designer.php',
-        {operation: 'save_setting_value', index: index_sent, ajax_request: true, server: server, token: token, value: value_sent},
-        function (data) {
-        if (data.success === false) {
-            PMA_ajaxShowMessage(data.error, false);
-        }
-    });
-}
-
-//++++++++++++++++++++++++++++++ RELATION ++++++++++++++++++++++++++++++++++++++
-function Start_relation()
-{
-    if (ON_display_field) {
-        return;
-    }
-
-    if (!ON_relation) {
-        document.getElementById('foreign_relation').style.display = '';
-        ON_relation = 1;
-        document.getElementById('pmd_hint').innerHTML = PMA_messages.strSelectReferencedKey;
-        document.getElementById('pmd_hint').style.display = 'block';
-        document.getElementById('rel_button').className = 'M_butt_Selected_down';
-    } else {
-        document.getElementById('pmd_hint').innerHTML = "";
-        document.getElementById('pmd_hint').style.display = 'none';
-        document.getElementById('rel_button').className = 'M_butt';
-        click_field = 0;
-        ON_relation = 0;
-    }
-}
-
-function Click_field(T, f, PK) // table field
-{
-    PK = parseInt(PK);
-    if (ON_relation) {
-        if (!click_field) {
-            //.style.display=='none'        .style.display = 'none'
-            if (!PK) {
-                alert(PMA_messages.strPleaseSelectPrimaryOrUniqueKey);
-                return;// 0;
-            }//PK
-            if (j_tabs[db + '.' + T] != '1') {
-                document.getElementById('foreign_relation').style.display = 'none';
-            }
-            click_field = 1;
-            link_relation = "T1=" + T + "&F1=" + f;
-            document.getElementById('pmd_hint').innerHTML = PMA_messages.strSelectForeignKey;
-        } else {
-            Start_relation(); // hidden hint...
-            if (j_tabs[db + '.' + T] != '1' || !PK) {
-                document.getElementById('foreign_relation').style.display = 'none';
-            }
-            var left = Glob_X - (document.getElementById('layer_new_relation').offsetWidth>>1);
-            document.getElementById('layer_new_relation').style.left = left + 'px';
-            var top = Glob_Y - document.getElementById('layer_new_relation').offsetHeight;
-            document.getElementById('layer_new_relation').style.top  = top + 'px';
-            document.getElementById('layer_new_relation').style.display = 'block';
-            link_relation += '&T2=' + T + '&F2=' + f;
-        }
-    }
-
-    if (ON_display_field) {
-        // if is display field
-        if (display_field[T] == f) {
-            old_class = 'tab_field';
-            delete display_field[T];
-        } else {
-            old_class = 'tab_field_3';
-            if (display_field[T]) {
-                document.getElementById('id_tr_' + T + '.' + display_field[T]).className = 'tab_field';
-                delete display_field[T];
-            }
-            display_field[T] = f;
-        }
-        ON_display_field = 0;
-        document.getElementById('pmd_hint').innerHTML = "";
-        document.getElementById('pmd_hint').style.display = 'none';
-        document.getElementById('display_field_button').className = 'M_butt';
-
-        var $msgbox = PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
-        $.post('db_designer.php',
-            {operation: 'setDisplayField', ajax_request: true, server: server, token: token, db: db, table: T, field: f},
-            function (data) {
-            if (data.success === false) {
-                PMA_ajaxShowMessage(data.error, false);
-            } else {
-                PMA_ajaxRemoveMessage($msgbox);
-                PMA_ajaxShowMessage(PMA_messages.strModificationSaved);
-            }
-        });
-    }
-}
-
-function New_relation()
-{
-    document.getElementById('layer_new_relation').style.display = 'none';
-    link_relation += '&server=' + server + '&db=' + db + '&token=' + token;
-    link_relation += '&on_delete=' + document.getElementById('on_delete').value + '&on_update=' + document.getElementById('on_update').value;
-    link_relation += '&operation=addNewRelation&ajax_request=true';
-
-    var $msgbox = PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
-    $.post('db_designer.php', link_relation, function (data) {
-        if (data.success === false) {
-            PMA_ajaxShowMessage(data.error, false);
-        } else {
-            PMA_ajaxRemoveMessage($msgbox);
-            Load_page(selected_page);
-        }
-    }); // end $.post()
-}
-
-//-------------------------- create tables -------------------------------------
-
-function Start_table_new()
-{
-    PMA_commonParams.set('table', '');
-    PMA_commonActions.refreshMain('tbl_create.php');
-}
-
-function Start_tab_upd(table)
-{
-    PMA_commonParams.set('table', table);
-    PMA_commonActions.refreshMain('tbl_structure.php');
-}
-//--------------------------- hide tables --------------------------------------
-
-function Small_tab_all(id_this) // max/min all tables
-{
-    var icon = id_this.children[0];
-    var key;
-    var value_sent = '';
-
-    if (icon.alt == "v") {
-        for (key in j_tabs) {
-            if (document.getElementById('id_hide_tbody_' + key).innerHTML == "v") {
-                Small_tab(key, 0);
-            }
-        }
-        icon.alt = ">";
-        icon.src = icon.dataset.right;
-        value_sent = 'v';
-    } else {
-        for (key in j_tabs) {
-            if (document.getElementById('id_hide_tbody_' + key).innerHTML != "v") {
-                Small_tab(key, 0);
-            }
-        }
-        icon.alt = "v";
-        icon.src = icon.dataset.down;
-        value_sent = '>';
-    }
-    saveValueInConfig('small_big_all', value_sent);
-    $('#key_SB_all').toggleClass('M_butt_Selected_down');
-    $('#key_SB_all').toggleClass('M_butt');
-    Re_load();
-}
-
-function Small_tab_invert() // invert max/min all tables
-{
-    for (var key in j_tabs) {
-        Small_tab(key, 0);
-    }
-    Re_load();
-}
-
-function Relation_lines_invert()
-{
-    show_relation_lines = ! show_relation_lines;
-    saveValueInConfig('relation_lines', show_relation_lines);
-    $('#relLineInvert').toggleClass('M_butt_Selected_down');
-    $('#relLineInvert').toggleClass('M_butt');
-    Re_load();
-}
-
-function Small_tab_refresh()
-{
-    for (var key in j_tabs) {
-        if (document.getElementById('id_hide_tbody_' + key).innerHTML != "v") {
-            Small_tab(key, 0);
-        }
-    }
-}
-
-function Small_tab(t, re_load)
-{
-    var id      = document.getElementById('id_tbody_' + t);
-    var id_this = document.getElementById('id_hide_tbody_' + t);
-    var id_t    = document.getElementById(t);
-    if (id_this.innerHTML == "v") {
-        //---CROSS
-        id.style.display = 'none';
-        id_this.innerHTML = '>';
-    } else {
-        id.style.display = '';
-        id_this.innerHTML = 'v';
-    }
-    if (re_load) {
-        Re_load();
-    }
-}
-//------------------------------------------------------------------------------
-function Select_tab(t)
-{
-    var id_zag = document.getElementById('id_zag_' + t);
-    if (id_zag.className != 'tab_zag_3') {
-        document.getElementById('id_zag_' + t).className = 'tab_zag_2';
-    } else {
-        document.getElementById('id_zag_' + t).className = 'tab_zag';
-    }
-    //----------
-    var id_t = document.getElementById(t);
-    window.scrollTo(parseInt(id_t.style.left, 10) - 300, parseInt(id_t.style.top, 10) - 300);
-    setTimeout(
-        function () {
-            document.getElementById('id_zag_' + t).className = 'tab_zag';
-        },
-        800
-    );
-}
-//------------------------------------------------------------------------------
-
-function Canvas_click(id, event)
-{
-    var n = 0;
-    var relation_name = 0;
-    var selected = 0;
-    var a = [];
-    var Key0, Key1, Key2, Key3, Key, x1, x2;
-    var K, key, key2, key3;
-    var Local_X = isIE ? event.clientX + document.body.scrollLeft : event.pageX;
-    var Local_Y = isIE ? event.clientY + document.body.scrollTop : event.pageY;
-    Local_X -= $('#osn_tab').offset().left;
-    Local_Y -= $('#osn_tab').offset().top;
-    Clear();
-    for (K in contr) {
-        for (key in contr[K]) {
-            for (key2 in contr[K][key]) {
-                for (key3 in contr[K][key][key2]) {
-                    if (! document.getElementById("check_vis_" + key2).checked ||
-                        ! document.getElementById("check_vis_" + contr[K][key][key2][key3][0]).checked) {
-                        continue; // if hide
-                    }
-                    var x1_left  = document.getElementById(key2).offsetLeft + 1;//document.getElementById(key2+"."+key3).offsetLeft;
-                    var x1_right = x1_left + document.getElementById(key2).offsetWidth;
-                    var x2_left  = document.getElementById(contr[K][key][key2][key3][0]).offsetLeft;//+document.getElementById(contr[K][key2][key3][0]+"."+contr[K][key2][key3][1]).offsetLeft
-                    var x2_right = x2_left + document.getElementById(contr[K][key][key2][key3][0]).offsetWidth;
-                    a[0] = Math.abs(x1_left - x2_left);
-                    a[1] = Math.abs(x1_left - x2_right);
-                    a[2] = Math.abs(x1_right - x2_left);
-                    a[3] = Math.abs(x1_right - x2_right);
-                    n = s_left = s_right = 0;
-                    for (var i = 1; i < 4; i++) {
-                        if (a[n] > a[i]) {
-                            n = i;
-                        }
-                    }
-                    if (n == 1) {
-                        x1 = x1_left - sm_s;
-                        x2 = x2_right + sm_s;
-                        if (x1 < x2) {
-                            n = 0;
-                        }
-                    }
-                    if (n == 2) {
-                        x1 = x1_right + sm_s;
-                        x2 = x2_left - sm_s;
-                        if (x1 > x2) {
-                            n = 0;
-                        }
-                    }
-                    if (n == 3) {
-                        x1 = x1_right + sm_s;
-                        x2 = x2_right + sm_s;
-                        s_right = 1;
-                    }
-                    if (n === 0) {
-                        x1 = x1_left - sm_s;
-                        x2 = x2_left - sm_s;
-                        s_left    = 1;
-                    }
-
-                    var y1 = document.getElementById(key2).offsetTop + document.getElementById(key2 + "." + key3).offsetTop + height_field;
-                    var y2 = document.getElementById(contr[K][key][key2][key3][0]).offsetTop +
-                                     document.getElementById(contr[K][key][key2][key3][0] + "." + contr[K][key][key2][key3][1]).offsetTop + height_field;
-
-                    if (!selected && Local_X > x1 - 10 && Local_X < x1 + 10 && Local_Y > y1 - 7 && Local_Y < y1 + 7) {
-                        Line0(
-                            x1 + osn_tab.offsetLeft,
-                            y1 - osn_tab.offsetTop,
-                            x2 + osn_tab.offsetLeft,
-                            y2 - osn_tab.offsetTop,
-                            "rgba(255,0,0,1)");
-
-                        selected = 1; // Rect(x1-sm_x,y1-sm_y,10,10,"rgba(0,255,0,1)");
-                        relation_name = key; //
-                        Key0 = contr[K][key][key2][key3][0];
-                        Key1 = contr[K][key][key2][key3][1];
-                        Key2 = key2;
-                        Key3 = key3;
-                        Key = K;
-                    } else {
-                        Line0(
-                            x1 + osn_tab.offsetLeft,
-                            y1 - osn_tab.offsetTop,
-                            x2 + osn_tab.offsetLeft,
-                            y2 - osn_tab.offsetTop,
-                            getColorByTarget(contr[K][key][key2][key3][0] + '.' + contr[K][key][key2][key3][1])
-                        );
-                    }
-                }
-            }
-        }
-    }
-    if (selected) {
-        // select relations
-        var left = Glob_X - (document.getElementById('layer_upd_relation').offsetWidth>>1);
-        document.getElementById('layer_upd_relation').style.left = left + 'px';
-        var top = Glob_Y - document.getElementById('layer_upd_relation').offsetHeight - 10;
-        document.getElementById('layer_upd_relation').style.top = top + 'px';
-        document.getElementById('layer_upd_relation').style.display = 'block';
-        link_relation = 'T1=' + Key0 + '&F1=' + Key1 + '&T2=' + Key2 + '&F2=' + Key3 + '&K=' + Key;
-    }
-}
-
-function Upd_relation()
-{
-    document.getElementById('layer_upd_relation').style.display = 'none';
-    link_relation += '&server=' + server + '&db=' + db + '&token=' + token;
-    link_relation += '&operation=removeRelation&ajax_request=true';
-
-    var $msgbox = PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
-    $.post('db_designer.php', link_relation, function (data) {
-        if (data.success === false) {
-            PMA_ajaxShowMessage(data.error, false);
-        } else {
-            PMA_ajaxRemoveMessage($msgbox);
-            Load_page(selected_page);
-        }
-    }); // end $.post()
-}
-
-function VisibleTab(id, t_n)
-{
-    if (id.checked) {
-        document.getElementById(t_n).style.display = 'block';
-    } else {
-        document.getElementById(t_n).style.display = 'none';
-    }
-    Re_load();
-}
-
-function Hide_tab_all(id_this) // max/min all tables
-{
-    if (id_this.alt == 'v') {
-        id_this.alt = '>';
-        id_this.src = id_this.dataset.right;
-    } else {
-        id_this.alt = 'v';
-        id_this.src = id_this.dataset.down;
-    }
-    var E = document.form1;
-    for (var i = 0; i < E.elements.length; i++) {
-        if (E.elements[i].type == "checkbox" && E.elements[i].id.substring(0, 10) == 'check_vis_') {
-            if (id_this.alt == 'v') {
-                E.elements[i].checked = true;
-                document.getElementById(E.elements[i].value).style.display = '';
-            } else {
-                E.elements[i].checked = false;
-                document.getElementById(E.elements[i].value).style.display = 'none';
-            }
-        }
-    }
-    Re_load();
-}
-
-function in_array_k(x, m)
-{
-    var b = 0;
-    for (var u in m) {
-        if (x == u) {
-            b = 1;
-            break;
-        }
-    }
-    return b;
-}
-
-function No_have_constr(id_this)
-{
-    var a = [];
-    var K, key, key2, key3;
-    for (K in contr) {
-        for (key in contr[K]) {
-            // contr name
-            for (key2 in contr[K][key]) {
-                // table name
-                for (key3 in contr[K][key][key2]) {
-                    // field name
-                    a[key2] = a[contr[K][key][key2][key3][0]] = 1; // exist constr
-                }
-            }
-        }
-    }
-
-    if (id_this.alt == 'v') {
-        id_this.alt = '>';
-        id_this.src = id_this.dataset.right;
-    } else {
-        id_this.alt = 'v';
-        id_this.src = id_this.dataset.down;
-    }
-    var E = document.form1;
-    for (var i = 0; i < E.elements.length; i++) {
-        if (E.elements[i].type == "checkbox" && E.elements[i].id.substring(0, 10) == 'check_vis_') {
-            if (!in_array_k(E.elements[i].value, a)) {
-                if (id_this.alt == 'v') {
-                    E.elements[i].checked = true;
-                    document.getElementById(E.elements[i].value).style.display = '';
-                } else {
-                    E.elements[i].checked = false;
-                    document.getElementById(E.elements[i].value).style.display = 'none';
-                }
-            }
-        }
-    }
-}
-
-function General_scroll()
-{
-    /*
-    if (!document.getElementById('show_relation_olways').checked) {
-        document.getElementById("canvas").style.display = 'none';
-        clearTimeout(timeoutID);
-        timeoutID = setTimeout(General_scroll_end, 500);
-    }
-    */
-    //if (timeoutID)
-    clearTimeout(timeoutID);
-    timeoutID = setTimeout(
-        function () {
-            document.getElementById('top_menu').style.left = document.body.scrollLeft + 'px';
-            document.getElementById('top_menu').style.top  = document.body.scrollTop + 'px';
-        },
-        200
-    );
-}
-
-/*
-function General_scroll_end()
-{
-    document.getElementById('layer_menu').style.left = document.body.scrollLeft;
-    document.getElementById('layer_menu').style.top  = document.body.scrollTop + document.getElementById('top_menu').offsetHeight;
-    if (isIE) {
-        document.getElementById('layer_menu').style.left = document.body.scrollLeft;
-        document.getElementById('layer_menu').style.top  = document.body.scrollTop + document.getElementById('top_menu').offsetHeight;
-    }
-    document.getElementById("canvas").style.display = 'block';
-}
-*/
-
-function Show_left_menu(id_this) // max/min all tables
-{
-    var icon = id_this.children[0];
-    $('#key_Show_left_menu').toggleClass('M_butt_Selected_down');
-    if (icon.alt == "v") {
-        document.getElementById("layer_menu").style.top = '0px';
-        document.getElementById("layer_menu").style.display = 'block';
-        icon.alt = ">";
-        icon.src = icon.dataset.up;
-        if (isIE) {
-            General_scroll();
-        }
-    } else {
-        document.getElementById("layer_menu").style.top = -1000 + 'px'; //fast scroll
-        document.getElementById("layer_menu").style.display = 'none';
-        icon.alt = "v";
-        icon.src = icon.dataset.down;
-    }
-}
-//------------------------------------------------------------------------------
-function Side_menu_right(id_this)
-{
-    $('#side_menu').toggleClass('right');
-    $('#layer_menu').toggleClass('left');
-    var icon = $(id_this.childNodes[0]);
-    var current = icon.attr('src');
-    icon.attr('src', icon.attr('data-right')).attr('data-right', current);
-
-    icon = $(document.getElementById('layer_menu_sizer').childNodes[0])
-        .toggleClass('floatleft')
-        .toggleClass('floatright')
-        .children();
-    current = icon.attr('src');
-    icon.attr('src', icon.attr('data-right'));
-    icon.attr('data-right', current);
-    menu_moved = !menu_moved;
-    saveValueInConfig('side_menu', $('#side_menu').hasClass('right'));
-    $('#key_Left_Right').toggleClass('M_butt_Selected_down');
-    $('#key_Left_Right').toggleClass('M_butt');
-}
-//------------------------------------------------------------------------------
-function Show_text () {
-    $('#side_menu').find('.hidable').show();
-}
-function Hide_text () {
-    if (!always_show_text) {
-        $('#side_menu').find('.hidable').hide();
-    }
-}
-function Pin_text () {
-    always_show_text = !always_show_text;
-    $('#pin_Text').toggleClass('M_butt_Selected_down');
-    $('#pin_Text').toggleClass('M_butt');
-    saveValueInConfig('pin_text', always_show_text);
-}
-//------------------------------------------------------------------------------
-function Start_display_field()
-{
-    if (ON_relation) {
-        return;
-    }
-    if (!ON_display_field) {
-        ON_display_field = 1;
-        document.getElementById('pmd_hint').innerHTML = PMA_messages.strChangeDisplay;
-        document.getElementById('pmd_hint').style.display = 'block';
-        document.getElementById('display_field_button').className = 'M_butt_Selected_down';//'#FFEE99';gray #AAAAAA
-
-        if (isIE) { // correct for IE
-            document.getElementById('display_field_button').className = 'M_butt_Selected_down_IE';
-        }
-    } else {
-        document.getElementById('pmd_hint').innerHTML = "";
-        document.getElementById('pmd_hint').style.display = 'none';
-        document.getElementById('display_field_button').className = 'M_butt';
-        ON_display_field = 0;
-    }
-}
-//------------------------------------------------------------------------------
-var TargetColors = [];
-function getColorByTarget(target)
-{
-    var color = '';  //"rgba(0,100,150,1)";
-
-    for (var a in TargetColors) {
-        if (TargetColors[a][0] == target) {
-            color = TargetColors[a][1];
-            break;
-        }
-    }
-
-    if (color.length === 0) {
-        var i = TargetColors.length + 1;
-        var d = i % 6;
-        var j = (i - d) / 6;
-        j = j % 4;
-        j++;
-        var color_case = [
-            [1, 0, 0],
-            [0, 1, 0],
-            [0, 0, 1],
-            [1, 1, 0],
-            [1, 0, 1],
-            [0, 1, 1]
-        ];
-        var a = color_case[d][0];
-        var b = color_case[d][1];
-        var c = color_case[d][2];
-        var e = (1 - (j - 1) / 6);
-
-        var r = Math.round(a * 200 * e);
-        var g = Math.round(b * 200 * e);
-        b = Math.round(c * 200 * e);
-        color = "rgba(" + r + "," + g + "," + b + ",1)";
-
-        TargetColors.push([target, color]);
-    }
-
-    return color;
-}
-
-function Click_option(id_this, column_name, table_name)
-{
-    var left = Glob_X - (document.getElementById(id_this).offsetWidth>>1);
-    document.getElementById(id_this).style.left = left + 'px';
-    // var top = Glob_Y - document.getElementById(id_this).offsetHeight - 10;
-    document.getElementById(id_this).style.top  = (screen.height / 4) + 'px';
-    document.getElementById(id_this).style.display = 'block';
-    document.getElementById('option_col_name').innerHTML = '<strong>' + PMA_sprintf(PMA_messages.strAddOption, column_name) + '</strong>';
-    col_name = column_name;
-    tab_name = table_name;
-}
-
-function Close_option()
-{
-    document.getElementById('pmd_optionse').style.display = 'none';
-}
-
-function Select_all(id_this, owner)
-{
-    var parent = document.form1;
-    downer = owner;
-    var i;
-    var k;
-    var tab = [];
-    for (i = 0; i < parent.elements.length; i++) {
-        if (parent.elements[i].type == "checkbox" && parent.elements[i].id.substring(0, (9 + id_this.length)) == 'select_' + id_this + '._') {
-            if (document.getElementById('select_all_' + id_this).checked === true) {
-                parent.elements[i].checked = true;
-                parent.elements[i].disabled = true;
-                var temp = '`' + id_this.substring(owner.length + 1) + '`.*';
-            } else {
-                parent.elements[i].checked = false;
-                parent.elements[i].disabled = false;
-            }
-        }
-    }
-    if (document.getElementById('select_all_' + id_this).checked === true) {
-        select_field.push('`' + id_this.substring(owner.length + 1) + '`.*');
-        tab = id_this.split(".");
-        from_array.push(tab[1]);
-    } else {
-        for (i = 0; i < select_field.length; i++) {
-            if (select_field[i] == ('`' + id_this.substring(owner.length + 1) + '`.*')) {
-                select_field.splice(i, 1);
-            }
-        }
-        for (k = 0; k < from_array.length; k++) {
-            if (from_array[k] == id_this) {
-                from_array.splice(k, 1);
-                break;
-            }
-        }
-    }
-    Re_load();
-}
-
-function Table_onover(id_this, val, buil)
-{
-    buil = parseInt(buil);
-    if (!val) {
-        document.getElementById("id_zag_" + id_this).className = "tab_zag_2";
-        if (buil) {
-            document.getElementById("id_zag_" + id_this + "_2").className = "tab_zag_2";
-        }
-    } else {
-        document.getElementById("id_zag_" + id_this).className = "tab_zag";
-        if (buil) {
-            document.getElementById("id_zag_" + id_this + "_2").className = "tab_zag";
-        }
-    }
-}
-
-/* This function stores selected column information in select_field[]
- * In case column is checked it add else it deletes
- *
- */
-function store_column(id_this, owner, col)
-{
-    var i;
-    var k;
-    if (document.getElementById('select_' + owner + '.' + id_this + '._' + col).checked === true) {
-        select_field.push('`' + id_this + '`.`' + col + '`');
-        from_array.push(id_this);
-    } else {
-        for (i = 0; i < select_field.length; i++) {
-            if (select_field[i] == ('`' + id_this + '`.`' + col + '`')) {
-                select_field.splice(i, 1);
-                break;
-            }
-        }
-        for (k = 0; k < from_array.length; k++) {
-            if (from_array[k] == id_this) {
-                from_array.splice(k, 1);
-                break;
-            }
-        }
-    }
-}
-
-/**
- * This function builds object and adds them to history_array
- * first it does a few checks on each object, then makes an object(where,rename,groupby,aggregate,orderby)
- * then a new history object is made and finally all these history objects are added to history_array[]
- *
-**/
-
-function add_object()
-{
-    var p, where_obj;
-    var rel = document.getElementById('rel_opt');
-    var sum = 0;
-    var init = history_array.length;
-    if (rel.value != '--') {
-        if (document.getElementById('Query').value === "") {
-            document.getElementById('pmd_hint').innerHTML = "value/subQuery is empty";
-            document.getElementById('pmd_hint').style.display = 'block';
-            return;
-        }
-        p = document.getElementById('Query');
-        where_obj = new where(rel.value, p.value);//make where object
-        history_array.push(new history_obj(col_name, where_obj, tab_name, h_tabs[downer + '.' + tab_name], "Where"));
-        sum = sum + 1;
-        rel.value = '--';
-        p.value = "";
-    }
-    if (document.getElementById('new_name').value !== "") {
-        var rename_obj = new rename(document.getElementById('new_name').value);//make Rename object
-        history_array.push(new history_obj(col_name, rename_obj, tab_name, h_tabs[downer + '.' + tab_name], "Rename"));
-        sum = sum + 1;
-        document.getElementById('new_name').value = "";
-    }
-    if (document.getElementById('operator').value != '---') {
-        var aggregate_obj = new aggregate(document.getElementById('operator').value);
-        history_array.push(new history_obj(col_name, aggregate_obj, tab_name, h_tabs[downer + '.' + tab_name], "Aggregate"));
-        sum = sum + 1;
-        document.getElementById('operator').value = '---';
-        //make aggregate operator
-    }
-    if (document.getElementById('groupby').checked === true) {
-        history_array.push(new history_obj(col_name, 'GroupBy', tab_name, h_tabs[downer + '.' + tab_name], "GroupBy"));
-        sum = sum + 1;
-        document.getElementById('groupby').checked = false;
-        //make groupby
-    }
-    if (document.getElementById('h_rel_opt').value != '--') {
-        if (document.getElementById('having').value === "") {
-            document.getElementById('pmd_hint').innerHTML = "value/subQuery is empty";
-            document.getElementById('pmd_hint').style.display = 'block';
-            return;
-        }
-        p = document.getElementById('having');
-        where_obj = new having(
-            document.getElementById('h_rel_opt').value,
-            p.value,
-            document.getElementById('h_operator').value
-        );//make where object
-        history_array.push(new history_obj(col_name, where_obj, tab_name, h_tabs[downer + '.' + tab_name], "Having"));
-        sum = sum + 1;
-        document.getElementById('h_rel_opt').value = '--';
-        document.getElementById('h_operator').value = '---';
-        p.value = ""; //make having
-    }
-    if (document.getElementById('orderby').value != '---') {
-        var oderby_obj = new orderby(document.getElementById('orderby').value);
-        history_array.push(new history_obj(col_name, oderby_obj, tab_name, h_tabs[downer + '.' + tab_name], "OrderBy"));
-        sum = sum + 1;
-        document.getElementById('orderby').value = '---';
-        //make orderby
-    }
-    PMA_ajaxShowMessage(PMA_sprintf(PMA_messages.strObjectsCreated, sum));
-    //output sum new objects created
-    var existingDiv = document.getElementById('ab');
-    existingDiv.innerHTML = display(init, history_array.length);
-    Close_option();
-    $('#ab').accordion("refresh");
-}
-
-AJAX.registerTeardown('pmd/move.js', function () {
-    $('#side_menu').off('mouseenter mouseleave');
-    $("#key_Show_left_menu").unbind('click');
-    $("#toggleFullscreen").unbind('click');
-    $("#newPage").unbind('click');
-    $("#editPage").unbind('click');
-    $("#savePos").unbind('click');
-    $("#SaveAs").unbind('click');
-    $("#delPages").unbind('click');
-    $("#StartTableNew").unbind('click');
-    $("#rel_button").unbind('click');
-    $("#StartTableNew").unbind('click');
-    $("#display_field_button").unbind('click');
-    $("#reloadPage").unbind('click');
-    $("#angular_direct_button").unbind('click');
-    $("#grid_button").unbind('click');
-    $("#key_SB_all").unbind('click');
-    $("#SmallTabInvert").unbind('click');
-    $("#relLineInvert").unbind('click');
-    $("#exportPages").unbind('click');
-    $("#query_builder").unbind('click');
-    $("#key_Left_Right").unbind('click');
-    $("#pin_Text").unbind('click');
-    $("#canvas").unbind('click');
-    $("#key_HS_all").unbind('click');
-    $("#key_HS").unbind('click');
-    $('.scroll_tab_struct').unbind('click');
-    $('.scroll_tab_checkbox').unbind('click');
-    $('#id_scroll_tab').find('tr').off('click', '.pmd_Tabs2,.pmd_Tabs');
-    $('.pmd_tab').off('click', '.select_all_1');
-    $('.pmd_tab').off('click', '.small_tab,.small_tab2');
-    $('.pmd_tab').off('click', '.small_tab_pref_1');
-    $('.tab_zag_noquery').unbind('mouseover');
-    $('.tab_zag_noquery').unbind('mouseout');
-    $('.tab_zag_query').unbind('mouseover');
-    $('.tab_zag_query').unbind('mouseout');
-    $('.pmd_tab').off('click','.tab_field_2,.tab_field_3,.tab_field');
-    $('.pmd_tab').off('click', '.select_all_store_col');
-    $('.pmd_tab').off('click', '.small_tab_pref_click_opt');
-    $("#del_button").unbind('click');
-    $("#cancel_button").unbind('click');
-    $("#ok_add_object").unbind('click');
-    $("#cancel_close_option").unbind('click');
-    $("#ok_new_rel_panel").unbind('click');
-    $("#cancel_new_rel_panel").unbind('click');
-});
-
-AJAX.registerOnload('pmd/move.js', function () {
-    $("#key_Show_left_menu").click(function() {
-        Show_left_menu(this);
-        return false;
-    });
-    $("#toggleFullscreen").click(function() {
-        Toggle_fullscreen();
-        return false;
-    });
-    $("#newPage").click(function() {
-        New();
-        return false;
-    });
-    $("#editPage").click(function() {
-        Edit_pages();
-        return false;
-    });
-    $("#savePos").click(function() {
-        Save3();
-        return false;
-    });
-    $("#SaveAs").click(function() {
-        Save_as();
-        return false;
-    });
-    $("#delPages").click(function() {
-        Delete_pages();
-        return false;
-    });
-    $("#StartTableNew").click(function() {
-        Start_table_new();
-        return false;
-    });
-    $("#rel_button").click(function() {
-        Start_relation();
-        return false;
-    });
-    $("#display_field_button").click(function() {
-        Start_display_field();
-        return false;
-    });
-    $("#reloadPage").click(function() {
-        $("#designer_tab").click();
-    });
-    $("#angular_direct_button").click(function() {
-        Angular_direct();
-        return false;
-    });
-    $("#grid_button").click(function() {
-        Grid();
-        return false;
-    });
-    $("#key_SB_all").click(function() {
-        Small_tab_all(this);
-        return false;
-    });
-    $("#SmallTabInvert").click(function() {
-        Small_tab_invert();
-        return false;
-    });
-    $("#relLineInvert").click(function() {
-        Relation_lines_invert();
-        return false;
-    });
-    $("#exportPages").click(function() {
-        Export_pages();
-        return false;
-    });
-    $("#query_builder").click(function() {
-        build_query('SQL Query on Database', 0);
-    });
-    $("#key_Left_Right").click(function() {
-        Side_menu_right(this);
-        return false;
-    });
-    $('#side_menu').hover(function () {
-        Show_text();
-        return false;
-    }, function () {
-        Hide_text();
-        return false;
-    });
-    $("#pin_Text").click(function() {
-        Pin_text(this);
-        return false;
-    });
-    $("#canvas").click(function(event) {
-        Canvas_click(this, event);
-    });
-    $("#key_HS_all").click(function() {
-        Hide_tab_all(this);
-        return false;
-    });
-    $("#key_HS").click(function() {
-        No_have_constr(this);
-        return false;
-    });
-    $('.scroll_tab_struct').click(function() {
-        Start_tab_upd($(this).attr('table_name'));
-    });
-    $('.scroll_tab_checkbox').click(function() {
-        VisibleTab(this,$(this).val());
-    });
-    $('#id_scroll_tab').find('tr').on('click', '.pmd_Tabs2,.pmd_Tabs', function() {
-        Select_tab($(this).attr('pmd_url_table_name'));
-    });
-    $('.pmd_tab').on('click', '.select_all_1', function() {
-        Select_all($(this).attr('pmd_url_table_name'), $(this).attr('pmd_out_owner'));
-    });
-    $('.pmd_tab').on('click', '.small_tab,.small_tab2', function() {
-        Small_tab($(this).attr('table_name'), 1);
-    });
-    $('.pmd_tab').on('click', '.small_tab_pref_1', function() {
-        Start_tab_upd($(this).attr('table_name_small'));
-    });
-    $('.tab_zag_noquery').mouseover(function() {
-        Table_onover($(this).attr('table_name'),0, $(this).attr('query_set'));
-    });
-    $('.tab_zag_noquery').mouseout(function() {
-        Table_onover($(this).attr('table_name'),1, $(this).attr('query_set'));
-    });
-    $('.tab_zag_query').mouseover(function() {
-        Table_onover($(this).attr('table_name'),0, 1);
-    });
-    $('.tab_zag_query').mouseout(function() {
-        Table_onover($(this).attr('table_name'),1, 1);
-    });
-    $('.pmd_tab').on('click','.tab_field_2,.tab_field_3,.tab_field', function() {
-        var params = ($(this).attr('click_field_param')).split(",");
-        Click_field(params[0], params[1], params[2]);
-    });
-    $('.pmd_tab').on('click', '.select_all_store_col', function() {
-        var params = ($(this).attr('store_column_param')).split(",");
-        store_column(params[0], params[1], params[2]);
-    });
-    $('.pmd_tab').on('click', '.small_tab_pref_click_opt', function() {
-        var params = ($(this).attr('Click_option_param')).split(",");
-        Click_option(params[0], params[1], params[2]);
-    });
-    $("input#del_button").click(function() {
-        Upd_relation();
-    });
-    $("input#cancel_button").click(function() {
-        document.getElementById('layer_upd_relation').style.display = 'none';
-        Re_load();
-    });
-    $("input#ok_add_object").click(function() {
-        add_object();
-    });
-    $("input#cancel_close_option").click(function() {
-        Close_option();
-    });
-    $("input#ok_new_rel_panel").click(function() {
-        New_relation();
-    });
-    $("input#cancel_new_rel_panel").click(function() {
-        document.getElementById('layer_new_relation').style.display = 'none';
-    });
-
-});
diff --git a/#pma/js/replication.js b/#pma/js/replication.js
deleted file mode 100644
index 06019390..00000000
--- a/#pma/js/replication.js
+++ /dev/null
@@ -1,89 +0,0 @@
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * for server_replication.php
- *
- */
-
-var random_server_id = Math.floor(Math.random() * 10000000);
-var conf_prefix = "server-id=" + random_server_id + "\nlog_bin=mysql-bin\nlog_error=mysql-bin.err\n";
-
-function update_config()
-{
-    var conf_ignore = "binlog_ignore_db=";
-    var conf_do = "binlog_do_db=";
-    var database_list = '';
-
-    if ($('#db_select option:selected').size() === 0) {
-        $('#rep').text(conf_prefix);
-    } else if ($('#db_type option:selected').val() == 'all') {
-        $('#db_select option:selected').each(function () {
-            database_list += conf_ignore + $(this).val() + "\n";
-        });
-        $('#rep').text(conf_prefix + database_list);
-    } else {
-        $('#db_select option:selected').each(function () {
-            database_list += conf_do + $(this).val() + "\n";
-        });
-        $('#rep').text(conf_prefix + database_list);
-    }
-}
-
-/**
- * Unbind all event handlers before tearing down a page
- */
-AJAX.registerTeardown('replication.js', function () {
-    $('#db_type').unbind('change');
-    $('#db_select').unbind('change');
-    $('#master_status_href').unbind('click');
-    $('#master_slaves_href').unbind('click');
-    $('#slave_status_href').unbind('click');
-    $('#slave_control_href').unbind('click');
-    $('#slave_errormanagement_href').unbind('click');
-    $('#slave_synchronization_href').unbind('click');
-    $('#db_reset_href').unbind('click');
-    $('#db_select_href').unbind('click');
-    $('#reset_slave').unbind('click');
-});
-
-AJAX.registerOnload('replication.js', function () {
-    $('#rep').text(conf_prefix);
-    $('#db_type').change(update_config);
-    $('#db_select').change(update_config);
-
-    $('#master_status_href').click(function () {
-        $('#replication_master_section').toggle();
-    });
-    $('#master_slaves_href').click(function () {
-        $('#replication_slaves_section').toggle();
-    });
-    $('#slave_status_href').click(function () {
-        $('#replication_slave_section').toggle();
-    });
-    $('#slave_control_href').click(function () {
-        $('#slave_control_gui').toggle();
-    });
-    $('#slave_errormanagement_href').click(function () {
-        $('#slave_errormanagement_gui').toggle();
-    });
-    $('#slave_synchronization_href').click(function () {
-        $('#slave_synchronization_gui').toggle();
-    });
-    $('#db_reset_href').click(function () {
-        $('#db_select option:selected').prop('selected', false);
-        $('#db_select').trigger('change');
-    });
-    $('#db_select_href').click(function () {
-        $('#db_select option').prop('selected', true);
-        $('#db_select').trigger('change');
-    });
-    $('#reset_slave').click(function (e) {
-        e.preventDefault();
-        var $anchor = $(this);
-        var question = PMA_messages.strResetSlaveWarning;
-        $anchor.PMA_confirm(question, $anchor.attr('href'), function (url) {
-            PMA_ajaxShowMessage();
-            AJAX.source = $anchor;
-            $.post(url, {'ajax_page_request': true, 'ajax_request': true}, AJAX.responseHandler);
-        });
-    });
-});
diff --git a/#pma/js/rte.js b/#pma/js/rte.js
deleted file mode 100644
index 9a189aea..00000000
--- a/#pma/js/rte.js
+++ /dev/null
@@ -1,1075 +0,0 @@
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * JavaScript functionality for Routines, Triggers and Events.
- *
- * @package PhpMyadmin
- */
-/**
- * @var RTE Contains all the JavaScript functionality
- *          for Routines, Triggers and Events
- */
-var RTE = {
-    /**
-     * Construct for the object that provides the
-     * functionality for Routines, Triggers and Events
-     */
-    object: function (type) {
-        $.extend(this, RTE.COMMON);
-        this.editorType = type;
-
-        switch (type) {
-        case 'routine':
-            $.extend(this, RTE.ROUTINE);
-            break;
-        case 'trigger':
-            // nothing extra yet for triggers
-            break;
-        case 'event':
-            $.extend(this, RTE.EVENT);
-            break;
-        default:
-            break;
-        }
-    },
-    /**
-     * @var string param_template Template for a row in the routine editor
-     */
-    param_template: ''
-};
-
-/**
- * @var RTE.COMMON a JavaScript namespace containing the functionality
- *                 for Routines, Triggers and Events
- *
- *                 This namespace is extended by the functionality required
- *                 to handle a specific item (a routine, trigger or event)
- *                 in the relevant javascript files in this folder
- */
-RTE.COMMON = {
-    /**
-     * @var $ajaxDialog Query object containing the reference to the
-     *                  dialog that contains the editor
-     */
-    $ajaxDialog: null,
-    /**
-     * @var syntaxHiglighter Reference to the codemirror editor
-     */
-    syntaxHiglighter: null,
-    /**
-     * @var buttonOptions Object containing options for
-     *                    the jQueryUI dialog buttons
-     */
-    buttonOptions: {},
-    /**
-     * @var editorType Type of the editor
-     */
-    editorType: null,
-    /**
-     * Validate editor form fields.
-     */
-    validate: function () {
-        /**
-         * @var $elm a jQuery object containing the reference
-         *           to an element that is being validated
-         */
-        var $elm = null;
-        // Common validation. At the very least the name
-        // and the definition must be provided for an item
-        $elm = $('table.rte_table').last().find('input[name=item_name]');
-        if ($elm.val() === '') {
-            $elm.focus();
-            alert(PMA_messages.strFormEmpty);
-            return false;
-        }
-        $elm = $('table.rte_table').find('textarea[name=item_definition]');
-        if ($elm.val() === '') {
-            if (this.syntaxHiglighter !== null) {
-                this.syntaxHiglighter.focus();
-            }
-            else {
-                $('textarea[name=item_definition]').last().focus();
-            }
-            alert(PMA_messages.strFormEmpty);
-            return false;
-        }
-        // The validation has so far passed, so now
-        // we can validate item-specific fields.
-        return this.validateCustom();
-    }, // end validate()
-    /**
-     * Validate custom editor form fields.
-     * This function can be overridden by
-     * other files in this folder
-     */
-    validateCustom: function () {
-        return true;
-    }, // end validateCustom()
-    /**
-     * Execute some code after the ajax
-     * dialog for the editor is shown.
-     * This function can be overridden by
-     * other files in this folder
-     */
-    postDialogShow: function () {
-        // Nothing by default
-    }, // end postDialogShow()
-
-    exportDialog: function ($this) {
-        var $msg = PMA_ajaxShowMessage();
-        if ($this.hasClass('mult_submit')) {
-            var combined = {
-                success: true,
-                title: PMA_messages.strExport,
-                message: '',
-                error: ''
-            };
-            // export anchors of all selected rows
-            var export_anchors = $('input.checkall:checked').parents('tr').find('.export_anchor');
-            var count = export_anchors.length;
-            var returnCount = 0;
-
-            // No routine is exportable (due to privilege issues)
-            if (count === 0) {
-                PMA_ajaxShowMessage(PMA_messages.NoExportable);
-            }
-
-            export_anchors.each(function () {
-                $.get($(this).attr('href'), {'ajax_request': true}, function (data) {
-                    returnCount++;
-                    if (data.success === true) {
-                        combined.message += "\n" + data.message + "\n";
-                        if (returnCount == count) {
-                            showExport(combined);
-                        }
-                    } else {
-                        // complain even if one export is failing
-                        combined.success = false;
-                        combined.error += "\n" + data.error + "\n";
-                        if (returnCount == count) {
-                            showExport(combined);
-                        }
-                    }
-                });
-            });
-        } else {
-            $.get($this.attr('href'), {'ajax_request': true}, showExport);
-        }
-        PMA_ajaxRemoveMessage($msg);
-
-        function showExport(data) {
-            if (data.success === true) {
-                PMA_ajaxRemoveMessage($msg);
-                /**
-                 * @var button_options Object containing options
-                 *                     for jQueryUI dialog buttons
-                 */
-                var button_options = {};
-                button_options[PMA_messages.strClose] = function () {
-                    $(this).dialog("close").remove();
-                };
-                /**
-                 * Display the dialog to the user
-                 */
-                data.message = '<textarea cols="40" rows="15" style="width: 100%;">' + data.message + '</textarea>';
-                var $ajaxDialog = $('<div>' + data.message + '</div>').dialog({
-                    width: 500,
-                    buttons: button_options,
-                    title: data.title
-                });
-                // Attach syntax highlighted editor to export dialog
-                /**
-                 * @var $elm jQuery object containing the reference
-                 *           to the Export textarea.
-                 */
-                var $elm = $ajaxDialog.find('textarea');
-                PMA_getSQLEditor($elm);
-            } else {
-                PMA_ajaxShowMessage(data.error, false);
-            }
-        } // end showExport()
-    },  // end exportDialog()
-    editorDialog: function (is_new, $this) {
-        var that = this;
-        /**
-         * @var $edit_row jQuery object containing the reference to
-         *                the row of the the item being edited
-         *                from the list of items
-         */
-        var $edit_row = null;
-        if ($this.hasClass('edit_anchor')) {
-            // Remeber the row of the item being edited for later,
-            // so that if the edit is successful, we can replace the
-            // row with info about the modified item.
-            $edit_row = $this.parents('tr');
-        }
-        /**
-         * @var $msg jQuery object containing the reference to
-         *           the AJAX message shown to the user
-         */
-        var $msg = PMA_ajaxShowMessage();
-        $.get($this.attr('href'), {'ajax_request': true}, function (data) {
-            if (data.success === true) {
-                // We have successfully fetched the editor form
-                PMA_ajaxRemoveMessage($msg);
-                // Now define the function that is called when
-                // the user presses the "Go" button
-                that.buttonOptions[PMA_messages.strGo] = function () {
-                    // Move the data from the codemirror editor back to the
-                    // textarea, where it can be used in the form submission.
-                    if (typeof CodeMirror != 'undefined') {
-                        that.syntaxHiglighter.save();
-                    }
-                    // Validate editor and submit request, if passed.
-                    if (that.validate()) {
-                        /**
-                         * @var data Form data to be sent in the AJAX request
-                         */
-                        var data = $('form.rte_form').last().serialize();
-                        $msg = PMA_ajaxShowMessage(
-                            PMA_messages.strProcessingRequest
-                        );
-                        var url = $('form.rte_form').last().attr('action');
-                        $.post(url, data, function (data) {
-                            if (data.success === true) {
-                                // Item created successfully
-                                PMA_ajaxRemoveMessage($msg);
-                                PMA_slidingMessage(data.message);
-                                that.$ajaxDialog.dialog('close');
-                                // If we are in 'edit' mode, we must
-                                // remove the reference to the old row.
-                                if (mode === 'edit' && $edit_row !== null ) {
-                                    $edit_row.remove();
-                                }
-                                // Sometimes, like when moving a trigger from
-                                // a table to another one, the new row should
-                                // not be inserted into the list. In this case
-                                // "data.insert" will be set to false.
-                                if (data.insert) {
-                                    // Insert the new row at the correct
-                                    // location in the list of items
-                                    /**
-                                     * @var text Contains the name of an item from
-                                     *           the list that is used in comparisons
-                                     *           to find the correct location where
-                                     *           to insert a new row.
-                                     */
-                                    var text = '';
-                                    /**
-                                     * @var inserted Whether a new item has been
-                                     *               inserted in the list or not
-                                     */
-                                    var inserted = false;
-                                    $('table.data').find('tr').each(function () {
-                                        text = $(this)
-                                                .children('td')
-                                                .eq(0)
-                                                .find('strong')
-                                                .text()
-                                                .toUpperCase();
-                                        text = $.trim(text);
-                                        if (text !== '' && text > data.name) {
-                                            $(this).before(data.new_row);
-                                            inserted = true;
-                                            return false;
-                                        }
-                                    });
-                                    if (! inserted) {
-                                        // If we didn't manage to insert the row yet,
-                                        // it must belong at the end of the list,
-                                        // so we insert it there.
-                                        $('table.data').append(data.new_row);
-                                    }
-                                    // Fade-in the new row
-                                    $('tr.ajaxInsert')
-                                        .show('slow')
-                                        .removeClass('ajaxInsert');
-                                } else if ($('table.data').find('tr').has('td').length === 0) {
-                                    // If we are not supposed to insert the new row,
-                                    // we will now check if the table is empty and
-                                    // needs to be hidden. This will be the case if
-                                    // we were editing the only item in the list,
-                                    // which we removed and will not be inserting
-                                    // something else in its place.
-                                    $('table.data').hide("slow", function () {
-                                        $('#nothing2display').show("slow");
-                                    });
-                                }
-                                // Now we have inserted the row at the correct
-                                // position, but surely at least some row classes
-                                // are wrong now. So we will itirate throught
-                                // all rows and assign correct classes to them
-                                /**
-                                 * @var ct Count of processed rows
-                                 */
-                                var ct = 0;
-                                /**
-                                 * @var rowclass Class to be attached to the row
-                                 *               that is being processed
-                                 */
-                                var rowclass = '';
-                                $('table.data').find('tr').has('td').each(function () {
-                                    rowclass = (ct % 2 === 0) ? 'odd' : 'even';
-                                    $(this).removeClass().addClass(rowclass);
-                                    ct++;
-                                });
-                                // If this is the first item being added, remove
-                                // the "No items" message and show the list.
-                                if ($('table.data').find('tr').has('td').length > 0 &&
-                                    $('#nothing2display').is(':visible')
-                                    ) {
-                                    $('#nothing2display').hide("slow", function () {
-                                        $('table.data').show("slow");
-                                    });
-                                }
-                                PMA_reloadNavigation();
-                            } else {
-                                PMA_ajaxShowMessage(data.error, false);
-                            }
-                        }); // end $.post()
-                    } // end "if (that.validate())"
-                }; // end of function that handles the submission of the Editor
-                that.buttonOptions[PMA_messages.strClose] = function () {
-                    $(this).dialog("close");
-                };
-                /**
-                 * Display the dialog to the user
-                 */
-                that.$ajaxDialog = $('<div id="rteDialog">' + data.message + '</div>').dialog({
-                    width: 700,
-                    minWidth: 500,
-                    maxHeight: $(window).height(),
-                    buttons: that.buttonOptions,
-                    title: data.title,
-                    modal: true,
-                    open: function () {
-                        if ($('#rteDialog').parents('.ui-dialog').height() > $(window).height()) {
-                            $('#rteDialog').dialog("option", "height", $(window).height());
-                        }
-                        $(this).find('input[name=item_name]').focus();
-                        $(this).find('input.datefield').each(function () {
-                            PMA_addDatepicker($(this).css('width', '95%'), 'date');
-                        });
-                        $(this).find('input.datetimefield').each(function () {
-                            PMA_addDatepicker($(this).css('width', '95%'), 'datetime');
-                        });
-                        $.datepicker.initialized = false;
-                    },
-                    close: function () {
-                        $(this).remove();
-                    }
-                });
-                /**
-                 * @var mode Used to remeber whether the editor is in
-                 *           "Edit" or "Add" mode
-                 */
-                var mode = 'add';
-                if ($('input[name=editor_process_edit]').length > 0) {
-                    mode = 'edit';
-                }
-                // Attach syntax highlighted editor to the definition
-                /**
-                 * @var elm jQuery object containing the reference to
-                 *                 the Definition textarea.
-                 */
-                var $elm = $('textarea[name=item_definition]').last();
-                var linterOptions = {};
-                linterOptions[that.editorType + '_editor'] = true;
-                that.syntaxHiglighter = PMA_getSQLEditor($elm, {}, null, linterOptions);
-
-                // Execute item-specific code
-                that.postDialogShow(data);
-            } else {
-                PMA_ajaxShowMessage(data.error, false);
-            }
-        }); // end $.get()
-    },
-
-    dropDialog: function ($this) {
-        /**
-         * @var $curr_row Object containing reference to the current row
-         */
-        var $curr_row = $this.parents('tr');
-        /**
-         * @var question String containing the question to be asked for confirmation
-         */
-        var question = $('<div/>').text(
-            $curr_row.children('td').children('.drop_sql').html()
-        );
-        // We ask for confirmation first here, before submitting the ajax request
-        $this.PMA_confirm(question, $this.attr('href'), function (url) {
-            /**
-             * @var msg jQuery object containing the reference to
-             *          the AJAX message shown to the user
-             */
-            var $msg = PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
-            $.post(url, {'is_js_confirmed': 1, 'ajax_request': true}, function (data) {
-                if (data.success === true) {
-                    /**
-                     * @var $table Object containing reference
-                     *             to the main list of elements
-                     */
-                    var $table = $curr_row.parent();
-                    // Check how many rows will be left after we remove
-                    // the one that the user has requested us to remove
-                    if ($table.find('tr').length === 3) {
-                        // If there are two rows left, it means that they are
-                        // the header of the table and the rows that we are
-                        // about to remove, so after the removal there will be
-                        // nothing to show in the table, so we hide it.
-                        $table.hide("slow", function () {
-                            $(this).find('tr.even, tr.odd').remove();
-                            $('.withSelected').remove();
-                            $('#nothing2display').show("slow");
-                        });
-                    } else {
-                        $curr_row.hide("slow", function () {
-                            $(this).remove();
-                            // Now we have removed the row from the list, but maybe
-                            // some row classes are wrong now. So we will itirate
-                            // throught all rows and assign correct classes to them.
-                            /**
-                             * @var ct Count of processed rows
-                             */
-                            var ct = 0;
-                            /**
-                             * @var rowclass Class to be attached to the row
-                             *               that is being processed
-                             */
-                            var rowclass = '';
-                            $table.find('tr').has('td').each(function () {
-                                rowclass = (ct % 2 === 1) ? 'odd' : 'even';
-                                $(this).removeClass().addClass(rowclass);
-                                ct++;
-                            });
-                        });
-                    }
-                    // Get rid of the "Loading" message
-                    PMA_ajaxRemoveMessage($msg);
-                    // Show the query that we just executed
-                    PMA_slidingMessage(data.sql_query);
-                    PMA_reloadNavigation();
-                } else {
-                    PMA_ajaxShowMessage(data.error, false);
-                }
-            }); // end $.post()
-        }); // end $.PMA_confirm()
-    },
-
-    dropMultipleDialog: function ($this) {
-        // We ask for confirmation here
-        $this.PMA_confirm(PMA_messages.strDropRTEitems, '', function (url) {
-            /**
-             * @var msg jQuery object containing the reference to
-             *          the AJAX message shown to the user
-             */
-            var $msg = PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
-
-            // drop anchors of all selected rows
-            var drop_anchors = $('input.checkall:checked').parents('tr').find('.drop_anchor');
-            var success = true;
-            var count = drop_anchors.length;
-            var returnCount = 0;
-
-            drop_anchors.each(function () {
-                var $anchor = $(this);
-                /**
-                 * @var $curr_row Object containing reference to the current row
-                 */
-                var $curr_row = $anchor.parents('tr');
-                $.post($anchor.attr('href'), {'is_js_confirmed': 1, 'ajax_request': true}, function (data) {
-                    returnCount++;
-                    if (data.success === true) {
-                        /**
-                         * @var $table Object containing reference
-                         *             to the main list of elements
-                         */
-                        var $table = $curr_row.parent();
-                        // Check how many rows will be left after we remove
-                        // the one that the user has requested us to remove
-                        if ($table.find('tr').length === 3) {
-                            // If there are two rows left, it means that they are
-                            // the header of the table and the rows that we are
-                            // about to remove, so after the removal there will be
-                            // nothing to show in the table, so we hide it.
-                            $table.hide("slow", function () {
-                                $(this).find('tr.even, tr.odd').remove();
-                                $('.withSelected').remove();
-                                $('#nothing2display').show("slow");
-                            });
-                        } else {
-                            $curr_row.hide("fast", function () {
-                                $(this).remove();
-                                // Now we have removed the row from the list, but maybe
-                                // some row classes are wrong now. So we will itirate
-                                // throught all rows and assign correct classes to them.
-                                /**
-                                 * @var ct Count of processed rows
-                                 */
-                                var ct = 0;
-                                /**
-                                 * @var rowclass Class to be attached to the row
-                                 *               that is being processed
-                                 */
-                                var rowclass = '';
-                                $table.find('tr').has('td').each(function () {
-                                    rowclass = (ct % 2 === 1) ? 'odd' : 'even';
-                                    $(this).removeClass().addClass(rowclass);
-                                    ct++;
-                                });
-                            });
-                        }
-                        if (returnCount == count) {
-                            if (success) {
-                                // Get rid of the "Loading" message
-                                PMA_ajaxRemoveMessage($msg);
-                                $('#rteListForm_checkall').prop({checked: false, indeterminate: false});
-                            }
-                            PMA_reloadNavigation();
-                        }
-                    } else {
-                        PMA_ajaxShowMessage(data.error, false);
-                        success = false;
-                        if (returnCount == count) {
-                            PMA_reloadNavigation();
-                        }
-                    }
-                }); // end $.post()
-            }); // end drop_anchors.each()
-        }); // end $.PMA_confirm()
-    }
-}; // end RTE namespace
-
-/**
- * @var RTE.EVENT JavaScript functionality for events
- */
-RTE.EVENT = {
-    validateCustom: function () {
-        /**
-         * @var elm a jQuery object containing the reference
-         *          to an element that is being validated
-         */
-        var $elm = null;
-        if (this.$ajaxDialog.find('select[name=item_type]').find(':selected').val() === 'RECURRING') {
-            // The interval field must not be empty for recurring events
-            $elm = this.$ajaxDialog.find('input[name=item_interval_value]');
-            if ($elm.val() === '') {
-                $elm.focus();
-                alert(PMA_messages.strFormEmpty);
-                return false;
-            }
-        } else {
-            // The execute_at field must not be empty for "once off" events
-            $elm = this.$ajaxDialog.find('input[name=item_execute_at]');
-            if ($elm.val() === '') {
-                $elm.focus();
-                alert(PMA_messages.strFormEmpty);
-                return false;
-            }
-        }
-        return true;
-    }
-};
-
-/**
- * @var RTE.ROUTINE JavaScript functionality for routines
- */
-RTE.ROUTINE = {
-    /**
-     * Overriding the postDialogShow() function defined in common.js
-     *
-     * @param data JSON-encoded data from the ajax request
-     */
-    postDialogShow: function (data) {
-        // Cache the template for a parameter table row
-        RTE.param_template = data.param_template;
-        var that = this;
-        // Make adjustments in the dialog to make it AJAX compatible
-        $('td.routine_param_remove').show();
-        $('input[name=routine_removeparameter]').remove();
-        $('input[name=routine_addparameter]').css('width', '100%');
-        // Enable/disable the 'options' dropdowns for parameters as necessary
-        $('table.routine_params_table').last().find('th[colspan=2]').attr('colspan', '1');
-        $('table.routine_params_table').last().find('tr').has('td').each(function () {
-            that.setOptionsForParameter(
-                $(this).find('select[name^=item_param_type]'),
-                $(this).find('input[name^=item_param_length]'),
-                $(this).find('select[name^=item_param_opts_text]'),
-                $(this).find('select[name^=item_param_opts_num]')
-            );
-        });
-        // Enable/disable the 'options' dropdowns for
-        // function return value as necessary
-        this.setOptionsForParameter(
-            $('table.rte_table').last().find('select[name=item_returntype]'),
-            $('table.rte_table').last().find('input[name=item_returnlength]'),
-            $('table.rte_table').last().find('select[name=item_returnopts_text]'),
-            $('table.rte_table').last().find('select[name=item_returnopts_num]')
-        );
-        // Allow changing parameter order
-        $('.routine_params_table tbody').sortable({
-            containment: '.routine_params_table tbody',
-            handle: '.dragHandle',
-            stop: function(event, ui) {
-                that.reindexParameters();
-            },
-        });
-    },
-    /**
-     * Reindexes the parameters after dropping a parameter or reordering parameters
-     */
-    reindexParameters: function () {
-        /**
-         * @var index Counter used for reindexing the input
-         *            fields in the routine parameters table
-         */
-        var index = 0;
-        $('table.routine_params_table tbody').find('tr').each(function () {
-            $(this).find(':input').each(function () {
-                /**
-                 * @var inputname The value of the name attribute of
-                 *                the input field being reindexed
-                 */
-                var inputname = $(this).attr('name');
-                if (inputname.substr(0, 14) === 'item_param_dir') {
-                    $(this).attr('name', inputname.substr(0, 14) + '[' + index + ']');
-                } else if (inputname.substr(0, 15) === 'item_param_name') {
-                    $(this).attr('name', inputname.substr(0, 15) + '[' + index + ']');
-                } else if (inputname.substr(0, 15) === 'item_param_type') {
-                    $(this).attr('name', inputname.substr(0, 15) + '[' + index + ']');
-                } else if (inputname.substr(0, 17) === 'item_param_length') {
-                    $(this).attr('name', inputname.substr(0, 17) + '[' + index + ']');
-                    $(this).attr('id', 'item_param_length_' + index);
-                } else if (inputname.substr(0, 20) === 'item_param_opts_text') {
-                    $(this).attr('name', inputname.substr(0, 20) + '[' + index + ']');
-                } else if (inputname.substr(0, 19) === 'item_param_opts_num') {
-                    $(this).attr('name', inputname.substr(0, 19) + '[' + index + ']');
-                }
-            });
-            index++;
-        });
-    },
-    /**
-     * Overriding the validateCustom() function defined in common.js
-     */
-    validateCustom: function () {
-        /**
-         * @var isSuccess Stores the outcome of the validation
-         */
-        var isSuccess = true;
-        /**
-         * @var inputname The value of the "name" attribute for
-         *                the field that is being processed
-         */
-        var inputname = '';
-        this.$ajaxDialog.find('table.routine_params_table').last().find('tr').each(function () {
-            // Every parameter of a routine must have
-            // a non-empty direction, name and type
-            if (isSuccess) {
-                $(this).find(':input').each(function () {
-                    inputname = $(this).attr('name');
-                    if (inputname.substr(0, 14) === 'item_param_dir' ||
-                        inputname.substr(0, 15) === 'item_param_name' ||
-                        inputname.substr(0, 15) === 'item_param_type') {
-                        if ($(this).val() === '') {
-                            $(this).focus();
-                            isSuccess = false;
-                            return false;
-                        }
-                    }
-                });
-            } else {
-                return false;
-            }
-        });
-        if (! isSuccess) {
-            alert(PMA_messages.strFormEmpty);
-            return false;
-        }
-        this.$ajaxDialog.find('table.routine_params_table').last().find('tr').each(function () {
-            // SET, ENUM, VARCHAR and VARBINARY fields must have length/values
-            var $inputtyp = $(this).find('select[name^=item_param_type]');
-            var $inputlen = $(this).find('input[name^=item_param_length]');
-            if ($inputtyp.length && $inputlen.length) {
-                if (($inputtyp.val() === 'ENUM' || $inputtyp.val() === 'SET' || $inputtyp.val().substr(0, 3) === 'VAR') &&
-                    $inputlen.val() === ''
-                   ) {
-                    $inputlen.focus();
-                    isSuccess = false;
-                    return false;
-                }
-            }
-        });
-        if (! isSuccess) {
-            alert(PMA_messages.strFormEmpty);
-            return false;
-        }
-        if (this.$ajaxDialog.find('select[name=item_type]').find(':selected').val() === 'FUNCTION') {
-            // The length/values of return variable for functions must
-            // be set, if the type is SET, ENUM, VARCHAR or VARBINARY.
-            var $returntyp = this.$ajaxDialog.find('select[name=item_returntype]');
-            var $returnlen = this.$ajaxDialog.find('input[name=item_returnlength]');
-            if (($returntyp.val() === 'ENUM' || $returntyp.val() === 'SET' || $returntyp.val().substr(0, 3) === 'VAR') &&
-                $returnlen.val() === ''
-                ) {
-                $returnlen.focus();
-                alert(PMA_messages.strFormEmpty);
-                return false;
-            }
-        }
-        if ($('select[name=item_type]').find(':selected').val() === 'FUNCTION') {
-            // A function must contain a RETURN statement in its definition
-            if (this.$ajaxDialog.find('table.rte_table').find('textarea[name=item_definition]').val().toUpperCase().indexOf('RETURN') < 0) {
-                this.syntaxHiglighter.focus();
-                alert(PMA_messages.MissingReturn);
-                return false;
-            }
-        }
-        return true;
-    },
-    /**
-     * Enable/disable the "options" dropdown and "length" input for
-     * parameters and the return variable in the routine editor
-     * as necessary.
-     *
-     * @param type a jQuery object containing the reference
-     *             to the "Type" dropdown box
-     * @param len  a jQuery object containing the reference
-     *             to the "Length" input box
-     * @param text a jQuery object containing the reference
-     *             to the dropdown box with options for
-     *             parameters of text type
-     * @param num  a jQuery object containing the reference
-     *             to the dropdown box with options for
-     *             parameters of numeric type
-     */
-    setOptionsForParameter: function ($type, $len, $text, $num) {
-        /**
-         * @var no_opts a jQuery object containing the reference
-         *              to an element to be displayed when no
-         *              options are available
-         */
-        var $no_opts = $text.parent().parent().find('.no_opts');
-        /**
-         * @var no_len a jQuery object containing the reference
-         *             to an element to be displayed when no
-         *             "length/values" field is available
-         */
-        var $no_len  = $len.parent().parent().find('.no_len');
-
-        // Process for parameter options
-        switch ($type.val()) {
-        case 'TINYINT':
-        case 'SMALLINT':
-        case 'MEDIUMINT':
-        case 'INT':
-        case 'BIGINT':
-        case 'DECIMAL':
-        case 'FLOAT':
-        case 'DOUBLE':
-        case 'REAL':
-            $text.parent().hide();
-            $num.parent().show();
-            $no_opts.hide();
-            break;
-        case 'TINYTEXT':
-        case 'TEXT':
-        case 'MEDIUMTEXT':
-        case 'LONGTEXT':
-        case 'CHAR':
-        case 'VARCHAR':
-        case 'SET':
-        case 'ENUM':
-            $text.parent().show();
-            $num.parent().hide();
-            $no_opts.hide();
-            break;
-        default:
-            $text.parent().hide();
-            $num.parent().hide();
-            $no_opts.show();
-            break;
-        }
-        // Process for parameter length
-        switch ($type.val()) {
-        case 'DATE':
-        case 'DATETIME':
-        case 'TIME':
-        case 'TINYBLOB':
-        case 'TINYTEXT':
-        case 'BLOB':
-        case 'TEXT':
-        case 'MEDIUMBLOB':
-        case 'MEDIUMTEXT':
-        case 'LONGBLOB':
-        case 'LONGTEXT':
-            $text.closest('tr').find('a:first').hide();
-            $len.parent().hide();
-            $no_len.show();
-            break;
-        default:
-            if ($type.val() == 'ENUM' || $type.val() == 'SET') {
-                $text.closest('tr').find('a:first').show();
-            } else {
-                $text.closest('tr').find('a:first').hide();
-            }
-            $len.parent().show();
-            $no_len.hide();
-            break;
-        }
-    },
-    executeDialog: function ($this) {
-        var that = this;
-        /**
-         * @var msg jQuery object containing the reference to
-         *          the AJAX message shown to the user
-         */
-        var $msg = PMA_ajaxShowMessage();
-        $.post($this.attr('href'), {'ajax_request': true}, function (data) {
-            if (data.success === true) {
-                PMA_ajaxRemoveMessage($msg);
-                // If 'data.dialog' is true we show a dialog with a form
-                // to get the input parameters for routine, otherwise
-                // we just show the results of the query
-                if (data.dialog) {
-                    // Define the function that is called when
-                    // the user presses the "Go" button
-                    that.buttonOptions[PMA_messages.strGo] = function () {
-                        /**
-                         * @var data Form data to be sent in the AJAX request
-                         */
-                        var data = $('form.rte_form').last().serialize();
-                        $msg = PMA_ajaxShowMessage(
-                            PMA_messages.strProcessingRequest
-                        );
-                        $.post('db_routines.php', data, function (data) {
-                            if (data.success === true) {
-                                // Routine executed successfully
-                                PMA_ajaxRemoveMessage($msg);
-                                PMA_slidingMessage(data.message);
-                                $ajaxDialog.dialog('close');
-                            } else {
-                                PMA_ajaxShowMessage(data.error, false);
-                            }
-                        });
-                    };
-                    that.buttonOptions[PMA_messages.strClose] = function () {
-                        $(this).dialog("close");
-                    };
-                    /**
-                     * Display the dialog to the user
-                     */
-                    var $ajaxDialog = $('<div>' + data.message + '</div>').dialog({
-                        width: 650,
-                        buttons: that.buttonOptions,
-                        title: data.title,
-                        modal: true,
-                        close: function () {
-                            $(this).remove();
-                        }
-                    });
-                    $ajaxDialog.find('input[name^=params]').first().focus();
-                    /**
-                     * Attach the datepickers to the relevant form fields
-                     */
-                    $ajaxDialog.find('input.datefield, input.datetimefield').each(function () {
-                        PMA_addDatepicker($(this).css('width', '95%'));
-                    });
-                    /*
-                    * Define the function if the user presses enter
-                    */
-                    $('form.rte_form').on('keyup', function (event) {
-                        event.preventDefault();
-                        if (event.keyCode === 13) {
-                            /**
-                            * @var data Form data to be sent in the AJAX request
-                            */
-                            var data = $(this).serialize();
-                            $msg = PMA_ajaxShowMessage(
-                                PMA_messages.strProcessingRequest
-                            );
-                            var url = $(this).attr('action');
-                            $.post(url, data, function (data) {
-                                if (data.success === true) {
-                                    // Routine executed successfully
-                                    PMA_ajaxRemoveMessage($msg);
-                                    PMA_slidingMessage(data.message);
-                                    $('form.rte_form').off('keyup');
-                                    $ajaxDialog.remove();
-                                } else {
-                                    PMA_ajaxShowMessage(data.error, false);
-                                }
-                            });
-                        }
-                    });
-                } else {
-                    // Routine executed successfully
-                    PMA_slidingMessage(data.message);
-                }
-            } else {
-                PMA_ajaxShowMessage(data.error, false);
-            }
-        }); // end $.post()
-    }
-};
-
-/**
- * Attach Ajax event handlers for the Routines, Triggers and Events editor
- */
-$(function () {
-    /**
-     * Attach Ajax event handlers for the Add/Edit functionality.
-     */
-    $(document).on('click', 'a.ajax.add_anchor, a.ajax.edit_anchor', function (event) {
-        event.preventDefault();
-        var type = $(this).attr('href').substr(0, $(this).attr('href').indexOf('?'));
-        if (type.indexOf('routine') != -1) {
-            type = 'routine';
-        } else if (type.indexOf('trigger') != -1) {
-            type = 'trigger';
-        } else if (type.indexOf('event') != -1) {
-            type = 'event';
-        } else {
-            type = '';
-        }
-        var dialog = new RTE.object(type);
-        dialog.editorDialog($(this).hasClass('add_anchor'), $(this));
-    }); // end $(document).on()
-
-    /**
-     * Attach Ajax event handlers for the Execute routine functionality
-     */
-    $(document).on('click', 'a.ajax.exec_anchor', function (event) {
-        event.preventDefault();
-        var dialog = new RTE.object('routine');
-        dialog.executeDialog($(this));
-    }); // end $(document).on()
-
-    /**
-     * Attach Ajax event handlers for Export of Routines, Triggers and Events
-     */
-    $(document).on('click', 'a.ajax.export_anchor', function (event) {
-        event.preventDefault();
-        var dialog = new RTE.object();
-        dialog.exportDialog($(this));
-    }); // end $(document).on()
-
-    $(document).on('click', '#rteListForm.ajax .mult_submit[value="export"]', function (event) {
-        event.preventDefault();
-        var dialog = new RTE.object();
-        dialog.exportDialog($(this));
-    }); // end $(document).on()
-
-    /**
-     * Attach Ajax event handlers for Drop functionality
-     * of Routines, Triggers and Events.
-     */
-    $(document).on('click', 'a.ajax.drop_anchor', function (event) {
-        event.preventDefault();
-        var dialog = new RTE.object();
-        dialog.dropDialog($(this));
-    }); // end $(document).on()
-
-    $(document).on('click', '#rteListForm.ajax .mult_submit[value="drop"]', function (event) {
-        event.preventDefault();
-        var dialog = new RTE.object();
-        dialog.dropMultipleDialog($(this));
-    }); // end $(document).on()
-
-    /**
-     * Attach Ajax event handlers for the "Change event/routine type"
-     * functionality in the events editor, so that the correct
-     * rows are shown in the editor when changing the event type
-     */
-    $(document).on('change', 'select[name=item_type]', function () {
-        $(this)
-        .closest('table')
-        .find('tr.recurring_event_row, tr.onetime_event_row, tr.routine_return_row, .routine_direction_cell')
-        .toggle();
-    }); // end $(document).on()
-
-    /**
-     * Attach Ajax event handlers for the "Change parameter type"
-     * functionality in the routines editor, so that the correct
-     * option/length fields, if any, are shown when changing
-     * a parameter type
-     */
-    $(document).on('change', 'select[name^=item_param_type]', function () {
-        /**
-         * @var row jQuery object containing the reference to
-         *          a row in the routine parameters table
-         */
-        var $row = $(this).parents('tr').first();
-        var rte = new RTE.object('routine');
-        rte.setOptionsForParameter(
-            $row.find('select[name^=item_param_type]'),
-            $row.find('input[name^=item_param_length]'),
-            $row.find('select[name^=item_param_opts_text]'),
-            $row.find('select[name^=item_param_opts_num]')
-        );
-    }); // end $(document).on()
-
-    /**
-     * Attach Ajax event handlers for the "Change the type of return
-     * variable of function" functionality, so that the correct fields,
-     * if any, are shown when changing the function return type type
-     */
-    $(document).on('change', 'select[name=item_returntype]', function () {
-        var rte = new RTE.object('routine');
-        var $table = $(this).closest('table.rte_table');
-        rte.setOptionsForParameter(
-            $table.find('select[name=item_returntype]'),
-            $table.find('input[name=item_returnlength]'),
-            $table.find('select[name=item_returnopts_text]'),
-            $table.find('select[name=item_returnopts_num]')
-        );
-    }); // end $(document).on()
-
-    /**
-     * Attach Ajax event handlers for the "Add parameter to routine" functionality
-     */
-    $(document).on('click', 'input[name=routine_addparameter]', function (event) {
-        event.preventDefault();
-        /**
-         * @var routine_params_table jQuery object containing the reference
-         *                           to the routine parameters table
-         */
-        var $routine_params_table = $(this).closest('div.ui-dialog').find('.routine_params_table');
-        /**
-         * @var new_param_row A string containing the HTML code for the
-         *                    new row for the routine parameters table
-         */
-        var new_param_row = RTE.param_template.replace(/%s/g, $routine_params_table.find('tr').length - 1);
-        // Append the new row to the parameters table
-        $routine_params_table.append(new_param_row);
-        // Make sure that the row is correctly shown according to the type of routine
-        if ($(this).closest('div.ui-dialog').find('table.rte_table select[name=item_type]').val() === 'FUNCTION') {
-            $('tr.routine_return_row').show();
-            $('td.routine_direction_cell').hide();
-        }
-        /**
-         * @var newrow jQuery object containing the reference to the newly
-         *             inserted row in the routine parameters table
-         */
-        var $newrow = $(this).closest('div.ui-dialog').find('table.routine_params_table').find('tr').has('td').last();
-        // Enable/disable the 'options' dropdowns for parameters as necessary
-        var rte = new RTE.object('routine');
-        rte.setOptionsForParameter(
-            $newrow.find('select[name^=item_param_type]'),
-            $newrow.find('input[name^=item_param_length]'),
-            $newrow.find('select[name^=item_param_opts_text]'),
-            $newrow.find('select[name^=item_param_opts_num]')
-        );
-    }); // end $(document).on()
-
-    /**
-     * Attach Ajax event handlers for the
-     * "Remove parameter from routine" functionality
-     */
-    $(document).on('click', 'a.routine_param_remove_anchor', function (event) {
-        event.preventDefault();
-        $(this).parent().parent().remove();
-        // After removing a parameter, the indices of the name attributes in
-        // the input fields lose the correct order and need to be reordered.
-        RTE.ROUTINE.reindexParameters();
-    }); // end $(document).on()
-}); // end of $()
diff --git a/#pma/js/server_databases.js b/#pma/js/server_databases.js
deleted file mode 100644
index 72633455..00000000
--- a/#pma/js/server_databases.js
+++ /dev/null
@@ -1,133 +0,0 @@
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * @fileoverview    functions used on the server databases list page
- * @name            Server Databases
- *
- * @requires    jQuery
- * @requires    jQueryUI
- * @required    js/functions.js
- */
-
-/**
- * Unbind all event handlers before tearing down a page
- */
-AJAX.registerTeardown('server_databases.js', function () {
-    $(document).off('submit', "#dbStatsForm");
-    $(document).off('submit', '#create_database_form.ajax');
-});
-
-/**
- * AJAX scripts for server_databases.php
- *
- * Actions ajaxified here:
- * Drop Databases
- *
- */
-AJAX.registerOnload('server_databases.js', function () {
-    /**
-     * Attach Event Handler for 'Drop Databases'
-     */
-    $(document).on('submit', "#dbStatsForm", function (event) {
-        event.preventDefault();
-
-        var $form = $(this);
-
-        /**
-         * @var selected_dbs Array containing the names of the checked databases
-         */
-        var selected_dbs = [];
-        // loop over all checked checkboxes, except the .checkall_box checkbox
-        $form.find('input:checkbox:checked:not(.checkall_box)').each(function () {
-            $(this).closest('tr').addClass('removeMe');
-            selected_dbs[selected_dbs.length] = 'DROP DATABASE `' + escapeHtml($(this).val()) + '`;';
-        });
-        if (! selected_dbs.length) {
-            PMA_ajaxShowMessage(
-                $('<div class="notice" />').text(
-                    PMA_messages.strNoDatabasesSelected
-                ),
-                2000
-            );
-            return;
-        }
-        /**
-         * @var question    String containing the question to be asked for confirmation
-         */
-        var question = PMA_messages.strDropDatabaseStrongWarning + ' ' +
-            PMA_sprintf(PMA_messages.strDoYouReally, selected_dbs.join('<br />'));
-
-        $(this).PMA_confirm(
-            question,
-            $form.prop('action') + '?' + $(this).serialize() +
-                '&drop_selected_dbs=1&is_js_confirmed=1&ajax_request=true',
-            function (url) {
-                PMA_ajaxShowMessage(PMA_messages.strProcessingRequest, false);
-
-                $.post(url, function (data) {
-                    if (typeof data !== 'undefined' && data.success === true) {
-                        PMA_ajaxShowMessage(data.message);
-
-                        var $rowsToRemove = $form.find('tr.removeMe');
-                        var $databasesCount = $('#databases_count');
-                        var newCount = parseInt($databasesCount.text(), 10) - $rowsToRemove.length;
-                        $databasesCount.text(newCount);
-
-                        $rowsToRemove.remove();
-                        $form.find('tbody').PMA_sort_table('.name');
-                        if ($form.find('tbody').find('tr').length === 0) {
-                            // user just dropped the last db on this page
-                            PMA_commonActions.refreshMain();
-                        }
-                        PMA_reloadNavigation();
-                    } else {
-                        $form.find('tr.removeMe').removeClass('removeMe');
-                        PMA_ajaxShowMessage(data.error, false);
-                    }
-                }); // end $.post()
-            }
-        ); // end $.PMA_confirm()
-    }); //end of Drop Database action
-
-    /**
-     * Attach Ajax event handlers for 'Create Database'.
-     */
-    $(document).on('submit', '#create_database_form.ajax', function (event) {
-        event.preventDefault();
-
-        var $form = $(this);
-
-        // TODO Remove this section when all browsers support HTML5 "required" property
-        var newDbNameInput = $form.find('input[name=new_db]');
-        if (newDbNameInput.val() === '') {
-            newDbNameInput.focus();
-            alert(PMA_messages.strFormEmpty);
-            return;
-        }
-        // end remove
-
-        PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
-        PMA_prepareForAjaxRequest($form);
-
-        $.post($form.attr('action'), $form.serialize(), function (data) {
-            if (typeof data !== 'undefined' && data.success === true) {
-                PMA_ajaxShowMessage(data.message);
-
-                var $databases_count_object = $('#databases_count');
-                var databases_count = parseInt($databases_count_object.text(), 10) + 1;
-                $databases_count_object.text(databases_count);
-                PMA_reloadNavigation();
-
-                // make ajax request to load db structure page - taken from ajax.js
-                var dbStruct_url = data.url_query;
-                dbStruct_url = dbStruct_url.replace(/amp;/ig, '');
-                var params = 'ajax_request=true&ajax_page_request=true';
-                if (! (history && history.pushState)) {
-                    params += PMA_MicroHistory.menus.getRequestParam();
-                }
-                $.get(dbStruct_url, params, AJAX.responseHandler);
-            } else {
-                PMA_ajaxShowMessage(data.error, false);
-            }
-        }); // end $.post()
-    }); // end $(document).on()
-}); // end $()
diff --git a/#pma/js/server_plugins.js b/#pma/js/server_plugins.js
deleted file mode 100644
index dde5990f..00000000
--- a/#pma/js/server_plugins.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Functions used in server plugins pages
- */
-AJAX.registerOnload('server_plugins.js', function () {
-        // Make columns sortable, but only for tables with more than 1 data row
-    var $tables = $('#plugins_plugins table:has(tbody tr + tr)');
-    $tables.tablesorter({
-        sortList: [[0, 0]],
-        headers: {
-            1: {sorter: false}
-        },
-        widgets: ['zebra']
-    });
-    $tables.find('thead th')
-        .append('<div class="sorticon"></div>');
-});
diff --git a/#pma/js/server_privileges.js b/#pma/js/server_privileges.js
deleted file mode 100644
index 6c60d264..00000000
--- a/#pma/js/server_privileges.js
+++ /dev/null
@@ -1,431 +0,0 @@
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * @fileoverview    functions used in server privilege pages
- * @name            Server Privileges
- *
- * @requires    jQuery
- * @requires    jQueryUI
- * @requires    js/functions.js
- *
- */
-
-/**
- * Validates the "add a user" form
- *
- * @return boolean  whether the form is validated or not
- */
-function checkAddUser(the_form)
-{
-    if (the_form.elements.pred_hostname.value == 'userdefined' && the_form.elements.hostname.value === '') {
-        alert(PMA_messages.strHostEmpty);
-        the_form.elements.hostname.focus();
-        return false;
-    }
-
-    if (the_form.elements.pred_username.value == 'userdefined' && the_form.elements.username.value === '') {
-        alert(PMA_messages.strUserEmpty);
-        the_form.elements.username.focus();
-        return false;
-    }
-
-    return PMA_checkPassword($(the_form));
-} // end of the 'checkAddUser()' function
-
-/**
- * AJAX scripts for server_privileges page.
- *
- * Actions ajaxified here:
- * Add user
- * Revoke a user
- * Edit privileges
- * Export privileges
- * Paginate table of users
- * Flush privileges
- *
- * @memberOf    jQuery
- * @name        document.ready
- */
-
-
-/**
- * Unbind all event handlers before tearing down a page
- */
-AJAX.registerTeardown('server_privileges.js', function () {
-    $("#fieldset_add_user_login").off('change', "input[name='username']");
-    $(document).off('click', "#fieldset_delete_user_footer #buttonGo.ajax");
-    $(document).off('click', "a.edit_user_group_anchor.ajax");
-    $(document).off('click', "button.mult_submit[value=export]");
-    $(document).off('click', "a.export_user_anchor.ajax");
-    $(document).off('click',  "#initials_table a.ajax");
-    $('#checkbox_drop_users_db').unbind('click');
-    $(document).off("click", ".checkall_box");
-    $(document).off('change', '#checkbox_SSL_priv');
-    $(document).off('change', 'input[name="ssl_type"]');
-    $(document).off('change', '#select_authentication_plugin');
-});
-
-AJAX.registerOnload('server_privileges.js', function () {
-    /**
-     * Display a warning if there is already a user by the name entered as the username.
-     */
-    $("#fieldset_add_user_login").on('change', "input[name='username']", function () {
-        var username = $(this).val();
-        var $warning = $("#user_exists_warning");
-        if ($("#select_pred_username").val() == 'userdefined' && username !== '') {
-            var href = $("form[name='usersForm']").attr('action');
-            var params = {
-                'ajax_request' : true,
-                'token' : PMA_commonParams.get('token'),
-                'server' : PMA_commonParams.get('server'),
-                'validate_username' : true,
-                'username' : username
-            };
-            $.get(href, params, function (data) {
-                if (data.user_exists) {
-                    $warning.show();
-                } else {
-                    $warning.hide();
-                }
-            });
-        } else {
-            $warning.hide();
-        }
-    });
-
-    /**
-     * Display a notice if sha256_password is selected
-     */
-    $(document).on("change", "#select_authentication_plugin", function () {
-        var selected_plugin = $(this).val();
-        if (selected_plugin === 'sha256_password') {
-            $('#ssl_reqd_warning').show();
-        } else {
-            $('#ssl_reqd_warning').hide();
-        }
-    });
-
-    /**
-     * AJAX handler for 'Revoke User'
-     *
-     * @see         PMA_ajaxShowMessage()
-     * @memberOf    jQuery
-     * @name        revoke_user_click
-     */
-    $(document).on('click', "#fieldset_delete_user_footer #buttonGo.ajax", function (event) {
-        event.preventDefault();
-
-        var $thisButton = $(this);
-        var $form = $("#usersForm");
-
-        $thisButton.PMA_confirm(PMA_messages.strDropUserWarning, $form.attr('action'), function (url) {
-
-            var $drop_users_db_checkbox = $("#checkbox_drop_users_db");
-            if ($drop_users_db_checkbox.is(':checked')) {
-                var is_confirmed = confirm(PMA_messages.strDropDatabaseStrongWarning + '\n' + PMA_sprintf(PMA_messages.strDoYouReally, 'DROP DATABASE'));
-                if (! is_confirmed) {
-                    // Uncheck the drop users database checkbox
-                    $drop_users_db_checkbox.prop('checked', false);
-                }
-            }
-
-            PMA_ajaxShowMessage(PMA_messages.strRemovingSelectedUsers);
-
-            $.post(url, $form.serialize() + "&delete=" + $thisButton.val() + "&ajax_request=true", function (data) {
-                if (typeof data !== 'undefined' && data.success === true) {
-                    PMA_ajaxShowMessage(data.message);
-                    // Refresh navigation, if we droppped some databases with the name
-                    // that is the same as the username of the deleted user
-                    if ($('#checkbox_drop_users_db:checked').length) {
-                        PMA_reloadNavigation();
-                    }
-                    //Remove the revoked user from the users list
-                    $form.find("input:checkbox:checked").parents("tr").slideUp("medium", function () {
-                        var this_user_initial = $(this).find('input:checkbox').val().charAt(0).toUpperCase();
-                        $(this).remove();
-
-                        //If this is the last user with this_user_initial, remove the link from #initials_table
-                        if ($("#tableuserrights").find('input:checkbox[value^="' + this_user_initial + '"], input:checkbox[value^="' + this_user_initial.toLowerCase() + '"]').length === 0) {
-                            $("#initials_table").find('td > a:contains(' + this_user_initial + ')').parent('td').html(this_user_initial);
-                        }
-
-                        //Re-check the classes of each row
-                        $form
-                        .find('tbody').find('tr:odd')
-                        .removeClass('even').addClass('odd')
-                        .end()
-                        .find('tr:even')
-                        .removeClass('odd').addClass('even');
-
-                        //update the checkall checkbox
-                        $(checkboxes_sel).trigger("change");
-                    });
-                } else {
-                    PMA_ajaxShowMessage(data.error, false);
-                }
-            }); // end $.post()
-
-        });
-
-    }); // end Revoke User
-
-    $(document).on('click', "a.edit_user_group_anchor.ajax", function (event) {
-        event.preventDefault();
-        $(this).parents('tr').addClass('current_row');
-        var token = $(this).parents('form').find('input[name="token"]').val();
-        var $msg = PMA_ajaxShowMessage();
-        $.get(
-            $(this).attr('href'),
-            {
-                'ajax_request': true,
-                'edit_user_group_dialog': true,
-                'token': token
-            },
-            function (data) {
-                if (typeof data !== 'undefined' && data.success === true) {
-                    PMA_ajaxRemoveMessage($msg);
-                    var buttonOptions = {};
-                    buttonOptions[PMA_messages.strGo] = function () {
-                        var usrGroup = $('#changeUserGroupDialog')
-                            .find('select[name="userGroup"]')
-                            .val();
-                        var $message = PMA_ajaxShowMessage();
-                        $.post(
-                            'server_privileges.php',
-                            $('#changeUserGroupDialog').find('form').serialize() + '&ajax_request=1',
-                            function (data) {
-                                PMA_ajaxRemoveMessage($message);
-                                if (typeof data !== 'undefined' && data.success === true) {
-                                    $("#usersForm")
-                                        .find('.current_row')
-                                        .removeClass('current_row')
-                                        .find('.usrGroup')
-                                        .text(usrGroup);
-                                } else {
-                                    PMA_ajaxShowMessage(data.error, false);
-                                    $("#usersForm")
-                                        .find('.current_row')
-                                        .removeClass('current_row');
-                                }
-                            }
-                        );
-                        $(this).dialog("close");
-                    };
-                    buttonOptions[PMA_messages.strClose] = function () {
-                        $(this).dialog("close");
-                    };
-                    var $dialog = $('<div/>')
-                        .attr('id', 'changeUserGroupDialog')
-                        .append(data.message)
-                        .dialog({
-                            width: 500,
-                            minWidth: 300,
-                            modal: true,
-                            buttons: buttonOptions,
-                            title: $('legend', $(data.message)).text(),
-                            close: function () {
-                                $(this).remove();
-                            }
-                        });
-                    $dialog.find('legend').remove();
-                } else {
-                    PMA_ajaxShowMessage(data.error, false);
-                    $("#usersForm")
-                        .find('.current_row')
-                        .removeClass('current_row');
-                }
-            }
-        );
-    });
-
-    /**
-     * AJAX handler for 'Export Privileges'
-     *
-     * @see         PMA_ajaxShowMessage()
-     * @memberOf    jQuery
-     * @name        export_user_click
-     */
-    $(document).on('click', "button.mult_submit[value=export]", function (event) {
-        event.preventDefault();
-        // can't export if no users checked
-        if ($(this.form).find("input:checked").length === 0) {
-            return;
-        }
-        var $msgbox = PMA_ajaxShowMessage();
-        var button_options = {};
-        button_options[PMA_messages.strClose] = function () {
-            $(this).dialog("close");
-        };
-        $.post(
-            $(this.form).prop('action'),
-            $(this.form).serialize() + '&submit_mult=export&ajax_request=true',
-            function (data) {
-                if (typeof data !== 'undefined' && data.success === true) {
-                    var $ajaxDialog = $('<div />')
-                    .append(data.message)
-                    .dialog({
-                        title: data.title,
-                        width: 500,
-                        buttons: button_options,
-                        close: function () {
-                            $(this).remove();
-                        }
-                    });
-                    PMA_ajaxRemoveMessage($msgbox);
-                    // Attach syntax highlighted editor to export dialog
-                    PMA_getSQLEditor($ajaxDialog.find('textarea'));
-                } else {
-                    PMA_ajaxShowMessage(data.error, false);
-                }
-            }
-        ); //end $.post
-    });
-    // if exporting non-ajax, highlight anyways
-    PMA_getSQLEditor($('textarea.export'));
-
-    $(document).on('click', "a.export_user_anchor.ajax", function (event) {
-        event.preventDefault();
-        var $msgbox = PMA_ajaxShowMessage();
-        /**
-         * @var button_options  Object containing options for jQueryUI dialog buttons
-         */
-        var button_options = {};
-        button_options[PMA_messages.strClose] = function () {
-            $(this).dialog("close");
-        };
-        $.get($(this).attr('href'), {'ajax_request': true}, function (data) {
-            if (typeof data !== 'undefined' && data.success === true) {
-                var $ajaxDialog = $('<div />')
-                .append(data.message)
-                .dialog({
-                    title: data.title,
-                    width: 500,
-                    buttons: button_options,
-                    close: function () {
-                        $(this).remove();
-                    }
-                });
-                PMA_ajaxRemoveMessage($msgbox);
-                // Attach syntax highlighted editor to export dialog
-                PMA_getSQLEditor($ajaxDialog.find('textarea'));
-            } else {
-                PMA_ajaxShowMessage(data.error, false);
-            }
-        }); //end $.get
-    }); //end export privileges
-
-    /**
-     * AJAX handler to Paginate the Users Table
-     *
-     * @see         PMA_ajaxShowMessage()
-     * @name        paginate_users_table_click
-     * @memberOf    jQuery
-     */
-    $(document).on('click', "#initials_table a.ajax", function (event) {
-        event.preventDefault();
-        var $msgbox = PMA_ajaxShowMessage();
-        $.get($(this).attr('href'), {'ajax_request' : true}, function (data) {
-            if (typeof data !== 'undefined' && data.success === true) {
-                PMA_ajaxRemoveMessage($msgbox);
-                // This form is not on screen when first entering Privileges
-                // if there are more than 50 users
-                $("div.notice").remove();
-                $("#usersForm").hide("medium").remove();
-                $("#fieldset_add_user").hide("medium").remove();
-                $("#initials_table")
-                    .prop("id", "initials_table_old")
-                    .after(data.message).show("medium")
-                    .siblings("h2").not(":first").remove();
-                // prevent double initials table
-                $("#initials_table_old").remove();
-            } else {
-                PMA_ajaxShowMessage(data.error, false);
-            }
-        }); // end $.get
-    }); // end of the paginate users table
-
-    $(document).on('change', 'input[name="ssl_type"]', function (e) {
-        var $div = $('#specified_div');
-        if ($('#ssl_type_specified').is(':checked')) {
-            $div.find('input').prop('disabled', false);
-        } else {
-            $div.find('input').prop('disabled', true);
-        }
-    });
-
-    $(document).on('change', '#checkbox_SSL_priv', function (e) {
-        var $div = $('#require_ssl_div');
-        if ($(this).is(':checked')) {
-            $div.find('input').prop('disabled', false);
-            $('#ssl_type_specified').trigger('change');
-        } else {
-            $div.find('input').prop('disabled', true);
-        }
-    });
-
-    $('#checkbox_SSL_priv').trigger('change');
-
-    /*
-     * Create submenu for simpler interface
-     */
-    var addOrUpdateSubmenu = function () {
-        var $topmenu2 = $("#topmenu2"),
-            $edit_user_dialog = $("#edit_user_dialog"),
-            submenu_label,
-            submenu_link,
-            link_number;
-
-        // if submenu exists yet, remove it first
-        if ($topmenu2.length > 0) {
-            $topmenu2.remove();
-        }
-
-        // construct a submenu from the existing fieldsets
-        $topmenu2 = $("<ul/>").prop("id", "topmenu2");
-
-        $("#edit_user_dialog .submenu-item").each(function () {
-            submenu_label = $(this).find("legend[data-submenu-label]").data("submenu-label");
-
-            submenu_link = $("<a/>")
-            .prop("href", "#")
-            .html(submenu_label);
-
-            $("<li/>")
-            .append(submenu_link)
-            .appendTo($topmenu2);
-        });
-
-        // click handlers for submenu
-        $topmenu2.find("a").click(function (e) {
-            e.preventDefault();
-            // if already active, ignore click
-            if ($(this).hasClass("tabactive")) {
-                return;
-            }
-            $topmenu2.find("a").removeClass("tabactive");
-            $(this).addClass("tabactive");
-
-            // which section to show now?
-            link_number = $topmenu2.find("a").index($(this));
-            // hide all sections but the one to show
-            $("#edit_user_dialog .submenu-item").hide().eq(link_number).show();
-        });
-
-        // make first menu item active
-        // TODO: support URL hash history
-        $topmenu2.find("> :first-child a").addClass("tabactive");
-        $edit_user_dialog.prepend($topmenu2);
-
-        // hide all sections but the first
-        $("#edit_user_dialog .submenu-item").hide().eq(0).show();
-
-        // scroll to the top
-        $('html, body').animate({scrollTop: 0}, 'fast');
-    };
-
-    $("input.autofocus").focus();
-    $(checkboxes_sel).trigger("change");
-    displayPasswordGenerateButton();
-    if ($("#edit_user_dialog").length > 0) {
-        addOrUpdateSubmenu();
-    }
-});
diff --git a/#pma/js/server_status_advisor.js b/#pma/js/server_status_advisor.js
deleted file mode 100644
index c2e3b6ba..00000000
--- a/#pma/js/server_status_advisor.js
+++ /dev/null
@@ -1,99 +0,0 @@
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Server Status Advisor
- *
- * @package PhpMyAdmin
- */
-
-/**
- * Unbind all event handlers before tearing down a page
- */
-AJAX.registerTeardown('server_status_advisor.js', function () {
-    $('a[href="#openAdvisorInstructions"]').unbind('click');
-    $('#statustabs_advisor').html('');
-    $('#advisorDialog').remove();
-    $('#instructionsDialog').remove();
-});
-
-AJAX.registerOnload('server_status_advisor.js', function () {
-
-	// if no advisor is loaded
-	if ($('#advisorData').length == 0) {
-		return;
-	}
-
-    /**** Server config advisor ****/
-    var $dialog = $('<div />').attr('id', 'advisorDialog');
-    var $instructionsDialog = $('<div />')
-        .attr('id', 'instructionsDialog')
-        .html($('#advisorInstructionsDialog').html());
-
-    $('a[href="#openAdvisorInstructions"]').click(function () {
-        var dlgBtns = {};
-        dlgBtns[PMA_messages.strClose] = function () {
-            $(this).dialog('close');
-        };
-        $instructionsDialog.dialog({
-            title: PMA_messages.strAdvisorSystem,
-            width: 700,
-            buttons: dlgBtns
-        });
-    });
-
-    var $cnt = $('#statustabs_advisor');
-    var $tbody, $tr, str, even = true;
-
-    data = $.parseJSON($('#advisorData').text());
-    $cnt.html('');
-
-    if (data.parse.errors.length > 0) {
-        $cnt.append('<b>Rules file not well formed, following errors were found:</b><br />- ');
-        $cnt.append(data.parse.errors.join('<br/>- '));
-        $cnt.append('<p></p>');
-    }
-
-    if (data.run.errors.length > 0) {
-        $cnt.append('<b>Errors occurred while executing rule expressions:</b><br />- ');
-        $cnt.append(data.run.errors.join('<br/>- '));
-        $cnt.append('<p></p>');
-    }
-
-    if (data.run.fired.length > 0) {
-        $cnt.append('<p><b>' + PMA_messages.strPerformanceIssues + '</b></p>');
-        $cnt.append('<table class="data" id="rulesFired" border="0"><thead><tr>' +
-                    '<th>' + PMA_messages.strIssuse + '</th><th>' + PMA_messages.strRecommendation +
-                    '</th></tr></thead><tbody></tbody></table>');
-        $tbody = $cnt.find('table#rulesFired');
-
-        var rc_stripped;
-
-        $.each(data.run.fired, function (key, value) {
-            // recommendation may contain links, don't show those in overview table (clicking on them redirects the user)
-            rc_stripped = $.trim($('<div>').html(value.recommendation).text());
-            $tbody.append($tr = $('<tr class="linkElem noclick ' + (even ? 'even' : 'odd') + '"><td>' +
-                                    value.issue + '</td><td>' + rc_stripped + ' </td></tr>'));
-            even = !even;
-            $tr.data('rule', value);
-
-            $tr.click(function () {
-                var rule = $(this).data('rule');
-                $dialog
-                .dialog({title: PMA_messages.strRuleDetails})
-                .html(
-                    '<p><b>' + PMA_messages.strIssuse + ':</b><br />' + rule.issue + '</p>' +
-                    '<p><b>' + PMA_messages.strRecommendation + ':</b><br />' + rule.recommendation + '</p>' +
-                    '<p><b>' + PMA_messages.strJustification + ':</b><br />' + rule.justification + '</p>' +
-                    '<p><b>' + PMA_messages.strFormula + ':</b><br />' + rule.formula + '</p>' +
-                    '<p><b>' + PMA_messages.strTest + ':</b><br />' + rule.test + '</p>'
-                );
-
-                var dlgBtns = {};
-                dlgBtns[PMA_messages.strClose] = function () {
-                    $(this).dialog('close');
-                };
-
-                $dialog.dialog({ width: 600, buttons: dlgBtns });
-            });
-        });
-    }
-});
diff --git a/#pma/js/server_status_monitor.js b/#pma/js/server_status_monitor.js
deleted file mode 100644
index 2eb37fb8..00000000
--- a/#pma/js/server_status_monitor.js
+++ /dev/null
@@ -1,2188 +0,0 @@
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-var runtime = {},
-    server_time_diff,
-    server_os,
-    is_superuser,
-    server_db_isLocal,
-    chartSize;
-AJAX.registerOnload('server_status_monitor.js', function () {
-    var $js_data_form = $('#js_data');
-    server_time_diff  = new Date().getTime() - $js_data_form.find("input[name=server_time]").val();
-    server_os =         $js_data_form.find("input[name=server_os]").val();
-    is_superuser =      $js_data_form.find("input[name=is_superuser]").val();
-    server_db_isLocal = $js_data_form.find("input[name=server_db_isLocal]").val();
-});
-
-/**
- * Unbind all event handlers before tearing down a page
- */
-AJAX.registerTeardown('server_status_monitor.js', function () {
-    $('#emptyDialog').remove();
-    $('#addChartDialog').remove();
-    $('a.popupLink').unbind('click');
-    $('body').unbind('click');
-});
-/**
- * Popup behaviour
- */
-AJAX.registerOnload('server_status_monitor.js', function () {
-    $('<div />')
-        .attr('id', 'emptyDialog')
-        .appendTo('#page_content');
-    $('#addChartDialog')
-        .appendTo('#page_content');
-
-    $('a.popupLink').click(function () {
-        var $link = $(this);
-        $('div.' + $link.attr('href').substr(1))
-            .show()
-            .offset({ top: $link.offset().top + $link.height() + 5, left: $link.offset().left })
-            .addClass('openedPopup');
-
-        return false;
-    });
-    $('body').click(function (event) {
-        $('div.openedPopup').each(function () {
-            var $cnt = $(this);
-            var pos = $cnt.offset();
-            // Hide if the mouseclick is outside the popupcontent
-            if (event.pageX < pos.left ||
-                event.pageY < pos.top ||
-                event.pageX > pos.left + $cnt.outerWidth() ||
-                event.pageY > pos.top + $cnt.outerHeight()
-            ) {
-                $cnt.hide().removeClass('openedPopup');
-            }
-        });
-    });
-});
-
-AJAX.registerTeardown('server_status_monitor.js', function () {
-    $('a[href="#rearrangeCharts"], a[href="#endChartEditMode"]').unbind('click');
-    $('div.popupContent select[name="chartColumns"]').unbind('change');
-    $('div.popupContent select[name="gridChartRefresh"]').unbind('change');
-    $('a[href="#addNewChart"]').unbind('click');
-    $('a[href="#exportMonitorConfig"]').unbind('click');
-    $('a[href="#importMonitorConfig"]').unbind('click');
-    $('a[href="#clearMonitorConfig"]').unbind('click');
-    $('a[href="#pauseCharts"]').unbind('click');
-    $('a[href="#monitorInstructionsDialog"]').unbind('click');
-    $('input[name="chartType"]').unbind('click');
-    $('input[name="useDivisor"]').unbind('click');
-    $('input[name="useUnit"]').unbind('click');
-    $('select[name="varChartList"]').unbind('click');
-    $('a[href="#kibDivisor"]').unbind('click');
-    $('a[href="#mibDivisor"]').unbind('click');
-    $('a[href="#submitClearSeries"]').unbind('click');
-    $('a[href="#submitAddSeries"]').unbind('click');
-    // $("input#variableInput").destroy();
-    $('#chartPreset').unbind('click');
-    $('#chartStatusVar').unbind('click');
-    destroyGrid();
-});
-
-AJAX.registerOnload('server_status_monitor.js', function () {
-    // Show tab links
-    $('div.tabLinks').show();
-    $('#loadingMonitorIcon').remove();
-    // Codemirror is loaded on demand so we might need to initialize it
-    if (! codemirror_editor) {
-        var $elm = $('#sqlquery');
-        if ($elm.length > 0 && typeof CodeMirror != 'undefined') {
-            codemirror_editor = CodeMirror.fromTextArea(
-                $elm[0],
-                {
-                    lineNumbers: true,
-                    matchBrackets: true,
-                    indentUnit: 4,
-                    mode: "text/x-mysql",
-                    lineWrapping: true
-                }
-            );
-        }
-    }
-    // Timepicker is loaded on demand so we need to initialize
-    // datetime fields from the 'load log' dialog
-    $('#logAnalyseDialog').find('.datetimefield').each(function () {
-        PMA_addDatepicker($(this));
-    });
-
-    /**** Monitor charting implementation ****/
-    /* Saves the previous ajax response for differential values */
-    var oldChartData = null;
-    // Holds about to be created chart
-    var newChart = null;
-    var chartSpacing;
-
-    // Whenever the monitor object (runtime.charts) or the settings object
-    // (monitorSettings) changes in a way incompatible to the previous version,
-    // increase this number. It will reset the users monitor and settings object
-    // in his localStorage to the default configuration
-    var monitorProtocolVersion = '1.0';
-
-    // Runtime parameter of the monitor, is being fully set in initGrid()
-    runtime = {
-        // Holds all visible charts in the grid
-        charts: null,
-        // Stores the timeout handler so it can be cleared
-        refreshTimeout: null,
-        // Stores the GET request to refresh the charts
-        refreshRequest: null,
-        // Chart auto increment
-        chartAI: 0,
-        // To play/pause the monitor
-        redrawCharts: false,
-        // Object that contains a list of nodes that need to be retrieved
-        // from the server for chart updates
-        dataList: [],
-        // Current max points per chart (needed for auto calculation)
-        gridMaxPoints: 20,
-        // displayed time frame
-        xmin: -1,
-        xmax: -1
-    };
-    var monitorSettings = null;
-
-    var defaultMonitorSettings = {
-        columns: 3,
-        chartSize: { width: 295, height: 250 },
-        // Max points in each chart. Settings it to 'auto' sets
-        // gridMaxPoints to (chartwidth - 40) / 12
-        gridMaxPoints: 'auto',
-        /* Refresh rate of all grid charts in ms */
-        gridRefresh: 5000
-    };
-
-    // Allows drag and drop rearrange and print/edit icons on charts
-    var editMode = false;
-
-    /* List of preconfigured charts that the user may select */
-    var presetCharts = {
-        // Query cache efficiency
-        'qce': {
-            title: PMA_messages.strQueryCacheEfficiency,
-            series: [ {
-                label: PMA_messages.strQueryCacheEfficiency
-            } ],
-            nodes: [ {
-                dataPoints: [{type: 'statusvar', name: 'Qcache_hits'}, {type: 'statusvar', name: 'Com_select'}],
-                transformFn: 'qce'
-            } ],
-            maxYLabel: 0
-        },
-        // Query cache usage
-        'qcu': {
-            title: PMA_messages.strQueryCacheUsage,
-            series: [ {
-                label: PMA_messages.strQueryCacheUsed
-            } ],
-            nodes: [ {
-                dataPoints: [{type: 'statusvar', name: 'Qcache_free_memory'}, {type: 'servervar', name: 'query_cache_size'}],
-                transformFn: 'qcu'
-            } ],
-            maxYLabel: 0
-        }
-    };
-
-    // time span selection
-    var selectionTimeDiff = [];
-    var selectionStartX, selectionStartY, selectionEndX, selectionEndY;
-    var drawTimeSpan = false;
-
-    // chart tooltip
-    var tooltipBox;
-
-    /* Add OS specific system info charts to the preset chart list */
-    switch (server_os) {
-    case 'WINNT':
-        $.extend(presetCharts, {
-            'cpu': {
-                title: PMA_messages.strSystemCPUUsage,
-                series: [ {
-                    label: PMA_messages.strAverageLoad
-                } ],
-                nodes: [ {
-                    dataPoints: [{ type: 'cpu', name: 'loadavg'}]
-                } ],
-                maxYLabel: 100
-            },
-
-            'memory': {
-                title: PMA_messages.strSystemMemory,
-                series: [ {
-                    label: PMA_messages.strTotalMemory,
-                    fill: true
-                }, {
-                    dataType: 'memory',
-                    label: PMA_messages.strUsedMemory,
-                    fill: true
-                } ],
-                nodes: [{ dataPoints: [{ type: 'memory', name: 'MemTotal' }], valueDivisor: 1024 },
-                        { dataPoints: [{ type: 'memory', name: 'MemUsed' }], valueDivisor: 1024 }
-                ],
-                maxYLabel: 0
-            },
-
-            'swap': {
-                title: PMA_messages.strSystemSwap,
-                series: [ {
-                    label: PMA_messages.strTotalSwap,
-                    fill: true
-                }, {
-                    label: PMA_messages.strUsedSwap,
-                    fill: true
-                } ],
-                nodes: [{ dataPoints: [{ type: 'memory', name: 'SwapTotal' }]},
-                        { dataPoints: [{ type: 'memory', name: 'SwapUsed' }]}
-                ],
-                maxYLabel: 0
-            }
-        });
-        break;
-
-    case 'Linux':
-        $.extend(presetCharts, {
-            'cpu': {
-                title: PMA_messages.strSystemCPUUsage,
-                series: [ {
-                    label: PMA_messages.strAverageLoad
-                } ],
-                nodes: [{ dataPoints: [{ type: 'cpu', name: 'irrelevant' }], transformFn: 'cpu-linux'}],
-                maxYLabel: 0
-            },
-            'memory': {
-                title: PMA_messages.strSystemMemory,
-                series: [
-                    { label: PMA_messages.strBufferedMemory, fill: true},
-                    { label: PMA_messages.strUsedMemory, fill: true},
-                    { label: PMA_messages.strCachedMemory, fill: true},
-                    { label: PMA_messages.strFreeMemory, fill: true}
-                ],
-                nodes: [
-                    { dataPoints: [{ type: 'memory', name: 'Buffers' }], valueDivisor: 1024 },
-                    { dataPoints: [{ type: 'memory', name: 'MemUsed' }], valueDivisor: 1024 },
-                    { dataPoints: [{ type: 'memory', name: 'Cached' }],  valueDivisor: 1024 },
-                    { dataPoints: [{ type: 'memory', name: 'MemFree' }], valueDivisor: 1024 }
-                ],
-                maxYLabel: 0
-            },
-            'swap': {
-                title: PMA_messages.strSystemSwap,
-                series: [
-                    { label: PMA_messages.strCachedSwap, fill: true},
-                    { label: PMA_messages.strUsedSwap, fill: true},
-                    { label: PMA_messages.strFreeSwap, fill: true}
-                ],
-                nodes: [
-                    { dataPoints: [{ type: 'memory', name: 'SwapCached' }], valueDivisor: 1024 },
-                    { dataPoints: [{ type: 'memory', name: 'SwapUsed' }], valueDivisor: 1024 },
-                    { dataPoints: [{ type: 'memory', name: 'SwapFree' }], valueDivisor: 1024 }
-                ],
-                maxYLabel: 0
-            }
-        });
-        break;
-
-    case 'SunOS':
-        $.extend(presetCharts, {
-            'cpu': {
-                title: PMA_messages.strSystemCPUUsage,
-                series: [ {
-                    label: PMA_messages.strAverageLoad
-                } ],
-                nodes: [ {
-                    dataPoints: [{ type: 'cpu', name: 'loadavg'}]
-                } ],
-                maxYLabel: 0
-            },
-            'memory': {
-                title: PMA_messages.strSystemMemory,
-                series: [
-                    { label: PMA_messages.strUsedMemory, fill: true },
-                    { label: PMA_messages.strFreeMemory, fill: true }
-                ],
-                nodes: [
-                    { dataPoints: [{ type: 'memory', name: 'MemUsed' }], valueDivisor: 1024 },
-                    { dataPoints: [{ type: 'memory', name: 'MemFree' }], valueDivisor: 1024 }
-                ],
-                maxYLabel: 0
-            },
-            'swap': {
-                title: PMA_messages.strSystemSwap,
-                series: [
-                    { label: PMA_messages.strUsedSwap, fill: true },
-                    { label: PMA_messages.strFreeSwap, fill: true }
-                ],
-                nodes: [
-                    { dataPoints: [{ type: 'memory', name: 'SwapUsed' }], valueDivisor: 1024 },
-                    { dataPoints: [{ type: 'memory', name: 'SwapFree' }], valueDivisor: 1024 }
-                ],
-                maxYLabel: 0
-            }
-        });
-        break;
-    }
-
-    // Default setting for the chart grid
-    var defaultChartGrid = {
-        'c0': {
-            title: PMA_messages.strQuestions,
-            series: [
-                {label: PMA_messages.strQuestions}
-            ],
-            nodes: [
-                {dataPoints: [{ type: 'statusvar', name: 'Questions' }], display: 'differential' }
-            ],
-            maxYLabel: 0
-        },
-        'c1': {
-            title: PMA_messages.strChartConnectionsTitle,
-            series: [
-                {label: PMA_messages.strConnections},
-                {label: PMA_messages.strProcesses}
-            ],
-            nodes: [
-                {dataPoints: [{ type: 'statusvar', name: 'Connections' }], display: 'differential' },
-                {dataPoints: [{ type: 'proc', name: 'processes' }] }
-            ],
-            maxYLabel: 0
-        },
-        'c2': {
-            title: PMA_messages.strTraffic,
-            series: [
-                {label: PMA_messages.strBytesSent},
-                {label: PMA_messages.strBytesReceived}
-            ],
-            nodes: [
-                {dataPoints: [{ type: 'statusvar', name: 'Bytes_sent' }], display: 'differential', valueDivisor: 1024 },
-                {dataPoints: [{ type: 'statusvar', name: 'Bytes_received' }], display: 'differential', valueDivisor: 1024 }
-            ],
-            maxYLabel: 0
-        }
-    };
-
-    // Server is localhost => We can add cpu/memory/swap to the default chart
-    if (server_db_isLocal) {
-        defaultChartGrid.c3 = presetCharts.cpu;
-        defaultChartGrid.c4 = presetCharts.memory;
-        defaultChartGrid.c5 = presetCharts.swap;
-    }
-
-    $('a[href="#rearrangeCharts"], a[href="#endChartEditMode"]').click(function (event) {
-        event.preventDefault();
-        editMode = !editMode;
-        if ($(this).attr('href') == '#endChartEditMode') {
-            editMode = false;
-        }
-
-        $('a[href="#endChartEditMode"]').toggle(editMode);
-
-        if (editMode) {
-            // Close the settings popup
-            $('div.popupContent').hide().removeClass('openedPopup');
-
-            $("#chartGrid").sortableTable({
-                ignoreRect: {
-                    top: 8,
-                    left: chartSize.width - 63,
-                    width: 54,
-                    height: 24
-                }
-            });
-
-        } else {
-            $("#chartGrid").sortableTable('destroy');
-        }
-        saveMonitor(); // Save settings
-        return false;
-    });
-
-    // global settings
-    $('div.popupContent select[name="chartColumns"]').change(function () {
-        monitorSettings.columns = parseInt(this.value, 10);
-
-        calculateChartSize();
-        // Empty cells should keep their size so you can drop onto them
-        $('#chartGrid').find('tr td').css('width', chartSize.width + 'px');
-        $('#chartGrid').find('.monitorChart').css({
-            width: chartSize.width + 'px',
-            height: chartSize.height + 'px'
-        });
-
-        /* Reorder all charts that it fills all column cells */
-        var numColumns;
-        var $tr = $('#chartGrid').find('tr:first');
-        var row = 0;
-
-        var tempManageCols = function () {
-            if (numColumns > monitorSettings.columns) {
-                if ($tr.next().length === 0) {
-                    $tr.after('<tr></tr>');
-                }
-                $tr.next().prepend($(this));
-            }
-            numColumns++;
-        };
-
-        var tempAddCol = function () {
-            if ($(this).next().length !== 0) {
-                $(this).append($(this).next().find('td:first'));
-            }
-        };
-
-        while ($tr.length !== 0) {
-            numColumns = 1;
-            // To many cells in one row => put into next row
-            $tr.find('td').each(tempManageCols);
-
-            // To little cells in one row => for each cell to little,
-            // move all cells backwards by 1
-            if ($tr.next().length > 0) {
-                var cnt = monitorSettings.columns - $tr.find('td').length;
-                for (var i = 0; i < cnt; i++) {
-                    $tr.append($tr.next().find('td:first'));
-                    $tr.nextAll().each(tempAddCol);
-                }
-            }
-
-            $tr = $tr.next();
-            row++;
-        }
-
-        if (monitorSettings.gridMaxPoints == 'auto') {
-            runtime.gridMaxPoints = Math.round((chartSize.width - 40) / 12);
-        }
-
-        runtime.xmin = new Date().getTime() - server_time_diff - runtime.gridMaxPoints * monitorSettings.gridRefresh;
-        runtime.xmax = new Date().getTime() - server_time_diff + monitorSettings.gridRefresh;
-
-        if (editMode) {
-            $("#chartGrid").sortableTable('refresh');
-        }
-
-        refreshChartGrid();
-        saveMonitor(); // Save settings
-    });
-
-    $('div.popupContent select[name="gridChartRefresh"]').change(function () {
-        monitorSettings.gridRefresh = parseInt(this.value, 10) * 1000;
-        clearTimeout(runtime.refreshTimeout);
-
-        if (runtime.refreshRequest) {
-            runtime.refreshRequest.abort();
-        }
-
-        runtime.xmin = new Date().getTime() - server_time_diff - runtime.gridMaxPoints * monitorSettings.gridRefresh;
-        // fixing chart shift towards left on refresh rate change
-        //runtime.xmax = new Date().getTime() - server_time_diff + monitorSettings.gridRefresh;
-        runtime.refreshTimeout = setTimeout(refreshChartGrid, monitorSettings.gridRefresh);
-
-        saveMonitor(); // Save settings
-    });
-
-    $('a[href="#addNewChart"]').click(function (event) {
-        event.preventDefault();
-        var dlgButtons = { };
-
-        dlgButtons[PMA_messages.strAddChart] = function () {
-            var type = $('input[name="chartType"]:checked').val();
-
-            if (type == 'preset') {
-                newChart = presetCharts[$('#addChartDialog').find('select[name="presetCharts"]').prop('value')];
-            } else {
-                // If user builds his own chart, it's being set/updated
-                // each time he adds a series
-                // So here we only warn if he didn't add a series yet
-                if (! newChart || ! newChart.nodes || newChart.nodes.length === 0) {
-                    alert(PMA_messages.strAddOneSeriesWarning);
-                    return;
-                }
-            }
-
-            newChart.title = $('input[name="chartTitle"]').val();
-            // Add a cloned object to the chart grid
-            addChart($.extend(true, {}, newChart));
-
-            newChart = null;
-
-            saveMonitor(); // Save settings
-
-            $(this).dialog("close");
-        };
-
-        dlgButtons[PMA_messages.strClose] = function () {
-            newChart = null;
-            $('span#clearSeriesLink').hide();
-            $('#seriesPreview').html('');
-            $(this).dialog("close");
-        };
-
-        var $presetList = $('#addChartDialog').find('select[name="presetCharts"]');
-        if ($presetList.html().length === 0) {
-            $.each(presetCharts, function (key, value) {
-                $presetList.append('<option value="' + key + '">' + value.title + '</option>');
-            });
-            $presetList.change(function () {
-                $('input[name="chartTitle"]').val(
-                    $presetList.find(':selected').text()
-                );
-                $('#chartPreset').prop('checked', true);
-            });
-            $('#chartPreset').click(function () {
-                $('input[name="chartTitle"]').val(
-                    $presetList.find(':selected').text()
-                );
-            });
-            $('#chartStatusVar').click(function () {
-                $('input[name="chartTitle"]').val(
-                    $('#chartSeries').find(':selected').text().replace(/_/g, " ")
-                );
-            });
-            $('#chartSeries').change(function () {
-                $('input[name="chartTitle"]').val(
-                    $('#chartSeries').find(':selected').text().replace(/_/g, " ")
-                );
-            });
-        }
-
-        $('#addChartDialog').dialog({
-            width: 'auto',
-            height: 'auto',
-            buttons: dlgButtons
-        });
-
-        $('#seriesPreview').html('<i>' + PMA_messages.strNone + '</i>');
-
-        return false;
-    });
-
-    $('a[href="#exportMonitorConfig"]').click(function (event) {
-        event.preventDefault();
-        var gridCopy = {};
-        $.each(runtime.charts, function (key, elem) {
-            gridCopy[key] = {};
-            gridCopy[key].nodes = elem.nodes;
-            gridCopy[key].settings = elem.settings;
-            gridCopy[key].title = elem.title;
-        });
-        var exportData = {
-            monitorCharts: gridCopy,
-            monitorSettings: monitorSettings
-        };
-        $('<form />', {
-            "class": "disableAjax",
-            method: "post",
-            action: "file_echo.php" + PMA_commonParams.get('common_query') + "&filename=1",
-            style: "display:none;"
-        })
-        .append(
-            $('<input />', {
-                type: "hidden",
-                name: "monitorconfig",
-                value: JSON.stringify(exportData)
-            })
-        )
-        .appendTo('body')
-        .submit()
-        .remove();
-    });
-
-    $('a[href="#importMonitorConfig"]').click(function (event) {
-        event.preventDefault();
-        $('#emptyDialog').dialog({title: PMA_messages.strImportDialogTitle});
-        $('#emptyDialog').html(PMA_messages.strImportDialogMessage + ':<br/><form action="file_echo.php' + PMA_commonParams.get('common_query') + '&import=1" method="post" enctype="multipart/form-data">' +
-            '<input type="file" name="file"> <input type="hidden" name="import" value="1"> </form>');
-
-        var dlgBtns = {};
-
-        dlgBtns[PMA_messages.strImport] = function () {
-            var $iframe, $form;
-            $('body').append($iframe = $('<iframe id="monitorConfigUpload" style="display:none;"></iframe>'));
-            var d = $iframe[0].contentWindow.document;
-            d.open();
-            d.close();
-            mew = d;
-
-            $iframe.load(function () {
-                var json;
-
-                // Try loading config
-                try {
-                    var data = $('body', $('iframe#monitorConfigUpload')[0].contentWindow.document).html();
-                    // Chrome wraps around '<pre style="word-wrap: break-word; white-space: pre-wrap;">' to any text content -.-
-                    json = $.parseJSON(data.substring(data.indexOf("{"), data.lastIndexOf("}") + 1));
-                } catch (err) {
-                    alert(PMA_messages.strFailedParsingConfig);
-                    $('#emptyDialog').dialog('close');
-                    return;
-                }
-
-                // Basic check, is this a monitor config json?
-                if (!json || ! json.monitorCharts || ! json.monitorCharts) {
-                    alert(PMA_messages.strFailedParsingConfig);
-                    $('#emptyDialog').dialog('close');
-                    return;
-                }
-
-                // If json ok, try applying config
-                try {
-                    window.localStorage.monitorCharts = JSON.stringify(json.monitorCharts);
-                    window.localStorage.monitorSettings = JSON.stringify(json.monitorSettings);
-                    rebuildGrid();
-                } catch (err) {
-                    alert(PMA_messages.strFailedBuildingGrid);
-                    // If an exception is thrown, load default again
-                    if (isStorageSupported('localStorage')) {
-                        window.localStorage.removeItem('monitorCharts');
-                        window.localStorage.removeItem('monitorSettings');
-                    }
-                    rebuildGrid();
-                }
-
-                $('#emptyDialog').dialog('close');
-            });
-
-            $("body", d).append($form = $('#emptyDialog').find('form'));
-            $form.submit();
-            $('#emptyDialog').append('<img class="ajaxIcon" src="' + pmaThemeImage + 'ajax_clock_small.gif" alt="">');
-        };
-
-        dlgBtns[PMA_messages.strCancel] = function () {
-            $(this).dialog('close');
-        };
-
-
-        $('#emptyDialog').dialog({
-            width: 'auto',
-            height: 'auto',
-            buttons: dlgBtns
-        });
-    });
-
-    $('a[href="#clearMonitorConfig"]').click(function (event) {
-        event.preventDefault();
-        if (isStorageSupported('localStorage')) {
-            window.localStorage.removeItem('monitorCharts');
-            window.localStorage.removeItem('monitorSettings');
-            window.localStorage.removeItem('monitorVersion');
-        }
-        $(this).hide();
-        rebuildGrid();
-    });
-
-    $('a[href="#pauseCharts"]').click(function (event) {
-        event.preventDefault();
-        runtime.redrawCharts = ! runtime.redrawCharts;
-        if (! runtime.redrawCharts) {
-            $(this).html(PMA_getImage('play.png') + PMA_messages.strResumeMonitor);
-        } else {
-            $(this).html(PMA_getImage('pause.png') + PMA_messages.strPauseMonitor);
-            if (! runtime.charts) {
-                initGrid();
-                $('a[href="#settingsPopup"]').show();
-            }
-        }
-        return false;
-    });
-
-    $('a[href="#monitorInstructionsDialog"]').click(function (event) {
-        event.preventDefault();
-
-        var $dialog = $('#monitorInstructionsDialog');
-
-        $dialog.dialog({
-            width: 595,
-            height: 'auto'
-        }).find('img.ajaxIcon').show();
-
-        var loadLogVars = function (getvars) {
-            var vars = { ajax_request: true, logging_vars: true };
-            if (getvars) {
-                $.extend(vars, getvars);
-            }
-
-            $.get('server_status_monitor.php' + PMA_commonParams.get('common_query'), vars,
-                function (data) {
-                    var logVars;
-                    if (typeof data !== 'undefined' && data.success === true) {
-                        logVars = data.message;
-                    } else {
-                        return serverResponseError();
-                    }
-                    var icon = PMA_getImage('s_success.png'), msg = '', str = '';
-
-                    if (logVars.general_log == 'ON') {
-                        if (logVars.slow_query_log == 'ON') {
-                            msg = PMA_messages.strBothLogOn;
-                        } else {
-                            msg = PMA_messages.strGenLogOn;
-                        }
-                    }
-
-                    if (msg.length === 0 && logVars.slow_query_log == 'ON') {
-                        msg = PMA_messages.strSlowLogOn;
-                    }
-
-                    if (msg.length === 0) {
-                        icon = PMA_getImage('s_error.png');
-                        msg = PMA_messages.strBothLogOff;
-                    }
-
-                    str = '<b>' + PMA_messages.strCurrentSettings + '</b><br/><div class="smallIndent">';
-                    str += icon + msg + '<br />';
-
-                    if (logVars.log_output != 'TABLE') {
-                        str += PMA_getImage('s_error.png') + ' ' + PMA_messages.strLogOutNotTable + '<br />';
-                    } else {
-                        str += PMA_getImage('s_success.png') + ' ' + PMA_messages.strLogOutIsTable + '<br />';
-                    }
-
-                    if (logVars.slow_query_log == 'ON') {
-                        if (logVars.long_query_time > 2) {
-                            str += PMA_getImage('s_attention.png') + ' ';
-                            str += PMA_sprintf(PMA_messages.strSmallerLongQueryTimeAdvice, logVars.long_query_time);
-                            str += '<br />';
-                        }
-
-                        if (logVars.long_query_time < 2) {
-                            str += PMA_getImage('s_success.png') + ' ';
-                            str += PMA_sprintf(PMA_messages.strLongQueryTimeSet, logVars.long_query_time);
-                            str += '<br />';
-                        }
-                    }
-
-                    str += '</div>';
-
-                    if (is_superuser) {
-                        str += '<p></p><b>' + PMA_messages.strChangeSettings + '</b>';
-                        str += '<div class="smallIndent">';
-                        str += PMA_messages.strSettingsAppliedGlobal + '<br/>';
-
-                        var varValue = 'TABLE';
-                        if (logVars.log_output == 'TABLE') {
-                            varValue = 'FILE';
-                        }
-
-                        str += '- <a class="set" href="#log_output-' + varValue + '">';
-                        str += PMA_sprintf(PMA_messages.strSetLogOutput, varValue);
-                        str += ' </a><br />';
-
-                        if (logVars.general_log != 'ON') {
-                            str += '- <a class="set" href="#general_log-ON">';
-                            str += PMA_sprintf(PMA_messages.strEnableVar, 'general_log');
-                            str += ' </a><br />';
-                        } else {
-                            str += '- <a class="set" href="#general_log-OFF">';
-                            str += PMA_sprintf(PMA_messages.strDisableVar, 'general_log');
-                            str += ' </a><br />';
-                        }
-
-                        if (logVars.slow_query_log != 'ON') {
-                            str += '- <a class="set" href="#slow_query_log-ON">';
-                            str +=  PMA_sprintf(PMA_messages.strEnableVar, 'slow_query_log');
-                            str += ' </a><br />';
-                        } else {
-                            str += '- <a class="set" href="#slow_query_log-OFF">';
-                            str +=  PMA_sprintf(PMA_messages.strDisableVar, 'slow_query_log');
-                            str += ' </a><br />';
-                        }
-
-                        varValue = 5;
-                        if (logVars.long_query_time > 2) {
-                            varValue = 1;
-                        }
-
-                        str += '- <a class="set" href="#long_query_time-' + varValue + '">';
-                        str += PMA_sprintf(PMA_messages.setSetLongQueryTime, varValue);
-                        str += ' </a><br />';
-
-                    } else {
-                        str += PMA_messages.strNoSuperUser + '<br/>';
-                    }
-
-                    str += '</div>';
-
-                    $dialog.find('div.monitorUse').toggle(
-                        logVars.log_output == 'TABLE' && (logVars.slow_query_log == 'ON' || logVars.general_log == 'ON')
-                    );
-
-                    $dialog.find('div.ajaxContent').html(str);
-                    $dialog.find('img.ajaxIcon').hide();
-                    $dialog.find('a.set').click(function () {
-                        var nameValue = $(this).attr('href').split('-');
-                        loadLogVars({ varName: nameValue[0].substr(1), varValue: nameValue[1]});
-                        $dialog.find('img.ajaxIcon').show();
-                    });
-                }
-            );
-        };
-
-
-        loadLogVars();
-
-        return false;
-    });
-
-    $('input[name="chartType"]').change(function () {
-        $('#chartVariableSettings').toggle(this.checked && this.value == 'variable');
-        var title = $('input[name="chartTitle"]').val();
-        if (title == PMA_messages.strChartTitle ||
-            title == $('label[for="' + $('input[name="chartTitle"]').data('lastRadio') + '"]').text()
-        ) {
-            $('input[name="chartTitle"]')
-                .data('lastRadio', $(this).attr('id'))
-                .val($('label[for="' + $(this).attr('id') + '"]').text());
-        }
-
-    });
-
-    $('input[name="useDivisor"]').change(function () {
-        $('span.divisorInput').toggle(this.checked);
-    });
-
-    $('input[name="useUnit"]').change(function () {
-        $('span.unitInput').toggle(this.checked);
-    });
-
-    $('select[name="varChartList"]').change(function () {
-        if (this.selectedIndex !== 0) {
-            $('#variableInput').val(this.value);
-        }
-    });
-
-    $('a[href="#kibDivisor"]').click(function (event) {
-        event.preventDefault();
-        $('input[name="valueDivisor"]').val(1024);
-        $('input[name="valueUnit"]').val(PMA_messages.strKiB);
-        $('span.unitInput').toggle(true);
-        $('input[name="useUnit"]').prop('checked', true);
-        return false;
-    });
-
-    $('a[href="#mibDivisor"]').click(function (event) {
-        event.preventDefault();
-        $('input[name="valueDivisor"]').val(1024 * 1024);
-        $('input[name="valueUnit"]').val(PMA_messages.strMiB);
-        $('span.unitInput').toggle(true);
-        $('input[name="useUnit"]').prop('checked', true);
-        return false;
-    });
-
-    $('a[href="#submitClearSeries"]').click(function (event) {
-        event.preventDefault();
-        $('#seriesPreview').html('<i>' + PMA_messages.strNone + '</i>');
-        newChart = null;
-        $('#clearSeriesLink').hide();
-    });
-
-    $('a[href="#submitAddSeries"]').click(function (event) {
-        event.preventDefault();
-        if ($('#variableInput').val() === "") {
-            return false;
-        }
-
-        if (newChart === null) {
-            $('#seriesPreview').html('');
-
-            newChart = {
-                title: $('input[name="chartTitle"]').val(),
-                nodes: [],
-                series: [],
-                maxYLabel: 0
-            };
-        }
-
-        var serie = {
-            dataPoints: [{ type: 'statusvar', name: $('#variableInput').val() }],
-            display: $('input[name="differentialValue"]').prop('checked') ? 'differential' : ''
-        };
-
-        if (serie.dataPoints[0].name == 'Processes') {
-            serie.dataPoints[0].type = 'proc';
-        }
-
-        if ($('input[name="useDivisor"]').prop('checked')) {
-            serie.valueDivisor = parseInt($('input[name="valueDivisor"]').val(), 10);
-        }
-
-        if ($('input[name="useUnit"]').prop('checked')) {
-            serie.unit = $('input[name="valueUnit"]').val();
-        }
-
-        var str = serie.display == 'differential' ? ', ' + PMA_messages.strDifferential : '';
-        str += serie.valueDivisor ? (', ' + PMA_sprintf(PMA_messages.strDividedBy, serie.valueDivisor)) : '';
-        str += serie.unit ? (', ' + PMA_messages.strUnit + ': ' + serie.unit) : '';
-
-        var newSeries = {
-            label: $('#variableInput').val().replace(/_/g, " ")
-        };
-        newChart.series.push(newSeries);
-        $('#seriesPreview').append('- ' + escapeHtml(newSeries.label + str) + '<br/>');
-        newChart.nodes.push(serie);
-        $('#variableInput').val('');
-        $('input[name="differentialValue"]').prop('checked', true);
-        $('input[name="useDivisor"]').prop('checked', false);
-        $('input[name="useUnit"]').prop('checked', false);
-        $('input[name="useDivisor"]').trigger('change');
-        $('input[name="useUnit"]').trigger('change');
-        $('select[name="varChartList"]').get(0).selectedIndex = 0;
-
-        $('#clearSeriesLink').show();
-
-        return false;
-    });
-
-    $("#variableInput").autocomplete({
-        source: variableNames
-    });
-
-    /* Initializes the monitor, called only once */
-    function initGrid() {
-
-        var i;
-
-        /* Apply default values & config */
-        if (isStorageSupported('localStorage')) {
-            if (typeof window.localStorage.monitorCharts !== 'undefined') {
-                runtime.charts = $.parseJSON(window.localStorage.monitorCharts);
-            }
-            if (typeof window.localStorage.monitorSettings !== 'undefined') {
-                monitorSettings = $.parseJSON(window.localStorage.monitorSettings);
-            }
-
-            $('a[href="#clearMonitorConfig"]').toggle(runtime.charts !== null);
-
-            if (runtime.charts !== null
-                && typeof window.localStorage.monitorVersion !== 'undefined'
-                && monitorProtocolVersion != window.localStorage.monitorVersion
-            ) {
-                $('#emptyDialog').dialog({title: PMA_messages.strIncompatibleMonitorConfig});
-                $('#emptyDialog').html(PMA_messages.strIncompatibleMonitorConfigDescription);
-
-                var dlgBtns = {};
-                dlgBtns[PMA_messages.strClose] = function () { $(this).dialog('close'); };
-
-                $('#emptyDialog').dialog({
-                    width: 400,
-                    buttons: dlgBtns
-                });
-            }
-        }
-
-        if (runtime.charts === null) {
-            runtime.charts = defaultChartGrid;
-        }
-        if (monitorSettings === null) {
-            monitorSettings = defaultMonitorSettings;
-        }
-
-        $('select[name="gridChartRefresh"]').val(monitorSettings.gridRefresh / 1000);
-        $('select[name="chartColumns"]').val(monitorSettings.columns);
-
-        if (monitorSettings.gridMaxPoints == 'auto') {
-            runtime.gridMaxPoints = Math.round((monitorSettings.chartSize.width - 40) / 12);
-        } else {
-            runtime.gridMaxPoints = monitorSettings.gridMaxPoints;
-        }
-
-        runtime.xmin = new Date().getTime() - server_time_diff - runtime.gridMaxPoints * monitorSettings.gridRefresh;
-        runtime.xmax = new Date().getTime() - server_time_diff + monitorSettings.gridRefresh;
-
-        /* Calculate how much spacing there is between each chart */
-        $('#chartGrid').html('<tr><td></td><td></td></tr><tr><td></td><td></td></tr>');
-        chartSpacing = {
-            width: $('#chartGrid').find('td:nth-child(2)').offset().left -
-                $('#chartGrid').find('td:nth-child(1)').offset().left,
-            height: $('#chartGrid').find('tr:nth-child(2) td:nth-child(2)').offset().top -
-                $('#chartGrid').find('tr:nth-child(1) td:nth-child(1)').offset().top
-        };
-        $('#chartGrid').html('');
-
-        /* Add all charts - in correct order */
-        var keys = [];
-        $.each(runtime.charts, function (key, value) {
-            keys.push(key);
-        });
-        keys.sort();
-        for (i = 0; i < keys.length; i++) {
-            addChart(runtime.charts[keys[i]], true);
-        }
-
-        /* Fill in missing cells */
-        var numCharts = $('#chartGrid').find('.monitorChart').length;
-        var numMissingCells = (monitorSettings.columns - numCharts % monitorSettings.columns) % monitorSettings.columns;
-        for (i = 0; i < numMissingCells; i++) {
-            $('#chartGrid').find('tr:last').append('<td></td>');
-        }
-
-        // Empty cells should keep their size so you can drop onto them
-        calculateChartSize();
-        $('#chartGrid').find('tr td').css('width', chartSize.width + 'px');
-
-        buildRequiredDataList();
-        refreshChartGrid();
-    }
-
-    /* Calls destroyGrid() and initGrid(), but before doing so it saves the chart
-     * data from each chart and restores it after the monitor is initialized again */
-    function rebuildGrid() {
-        var oldData = null;
-        if (runtime.charts) {
-            oldData = {};
-            $.each(runtime.charts, function (key, chartObj) {
-                for (var i = 0, l = chartObj.nodes.length; i < l; i++) {
-                    oldData[chartObj.nodes[i].dataPoint] = [];
-                    for (var j = 0, ll = chartObj.chart.series[i].data.length; j < ll; j++) {
-                        oldData[chartObj.nodes[i].dataPoint].push([chartObj.chart.series[i].data[j].x, chartObj.chart.series[i].data[j].y]);
-                    }
-                }
-            });
-        }
-
-        destroyGrid();
-        initGrid();
-    }
-
-    /* Calculactes the dynamic chart size that depends on the column width */
-    function calculateChartSize() {
-        var panelWidth;
-        if ($("body").height() > $(window).height()) { // has vertical scroll bar
-            panelWidth = $('#logTable').innerWidth();
-        } else {
-            panelWidth = $('#logTable').innerWidth() - 10; // leave some space for vertical scroll bar
-        }
-
-        var wdt = (panelWidth - monitorSettings.columns * chartSpacing.width) / monitorSettings.columns;
-        chartSize = {
-            width: Math.floor(wdt),
-            height: Math.floor(0.75 * wdt)
-        };
-    }
-
-    /* Adds a chart to the chart grid */
-    function addChart(chartObj, initialize) {
-
-        var i;
-        var settings = {
-            title: escapeHtml(chartObj.title),
-            grid: {
-                drawBorder: false,
-                shadow: false,
-                background: 'rgba(0,0,0,0)'
-            },
-            axes: {
-                xaxis: {
-                    renderer: $.jqplot.DateAxisRenderer,
-                    tickOptions: {
-                        formatString: '%H:%M:%S',
-                        showGridline: false
-                    },
-                    min: runtime.xmin,
-                    max: runtime.xmax
-                },
-                yaxis: {
-                    min: 0,
-                    max: 100,
-                    tickInterval: 20
-                }
-            },
-            seriesDefaults: {
-                rendererOptions: {
-                    smooth: true
-                },
-                showLine: true,
-                lineWidth: 2,
-                markerOptions: {
-                    size: 6
-                }
-            },
-            highlighter: {
-                show: true
-            }
-        };
-
-        if (settings.title === PMA_messages.strSystemCPUUsage ||
-            settings.title === PMA_messages.strQueryCacheEfficiency
-        ) {
-            settings.axes.yaxis.tickOptions = {
-                formatString: "%d %%"
-            };
-        } else if (settings.title === PMA_messages.strSystemMemory ||
-            settings.title === PMA_messages.strSystemSwap
-        ) {
-            settings.stackSeries = true;
-            settings.axes.yaxis.tickOptions = {
-                formatter: $.jqplot.byteFormatter(2) // MiB
-            };
-        } else if (settings.title === PMA_messages.strTraffic) {
-            settings.axes.yaxis.tickOptions = {
-                formatter: $.jqplot.byteFormatter(1) // KiB
-            };
-        } else if (settings.title === PMA_messages.strQuestions ||
-            settings.title === PMA_messages.strConnections
-        ) {
-            settings.axes.yaxis.tickOptions = {
-                formatter: function (format, val) {
-                    if (Math.abs(val) >= 1000000) {
-                        return $.jqplot.sprintf("%.3g M", val / 1000000);
-                    } else if (Math.abs(val) >= 1000) {
-                        return $.jqplot.sprintf("%.3g k", val / 1000);
-                    } else {
-                        return $.jqplot.sprintf("%d", val);
-                    }
-                }
-            };
-        }
-
-        settings.series = chartObj.series;
-
-        if ($('#' + 'gridchart' + runtime.chartAI).length === 0) {
-            var numCharts = $('#chartGrid').find('.monitorChart').length;
-
-            if (numCharts === 0 || (numCharts % monitorSettings.columns === 0)) {
-                $('#chartGrid').append('<tr></tr>');
-            }
-
-            if (!chartSize) {
-                calculateChartSize();
-            }
-            $('#chartGrid').find('tr:last').append(
-                '<td><div id="gridChartContainer' + runtime.chartAI + '" class="">' +
-                '<div class="ui-state-default monitorChart"' +
-                ' id="gridchart' + runtime.chartAI + '"' +
-                ' style="width:' + chartSize.width + 'px; height:' + chartSize.height + 'px;"></div>' +
-                '</div></td>'
-            );
-        }
-
-        // Set series' data as [0,0], smooth lines won't plot with data array having null values.
-        // also chart won't plot initially with no data and data comes on refreshChartGrid()
-        var series = [];
-        for (i in chartObj.series) {
-            series.push([[0, 0]]);
-        }
-
-        var tempTooltipContentEditor = function (str, seriesIndex, pointIndex, plot) {
-            var j;
-            // TODO: move style to theme CSS
-            var tooltipHtml = '<div style="font-size:12px;background-color:#FFFFFF;' +
-                'opacity:0.95;filter:alpha(opacity=95);padding:5px;">';
-            // x value i.e. time
-            var timeValue = str.split(",")[0];
-            var seriesValue;
-            tooltipHtml += 'Time: ' + timeValue;
-            tooltipHtml += '<span style="font-weight:bold;">';
-            // Add y values to the tooltip per series
-            for (j in plot.series) {
-                // get y value if present
-                if (plot.series[j].data.length > pointIndex) {
-                    seriesValue = plot.series[j].data[pointIndex][1];
-                } else {
-                    return;
-                }
-                var seriesLabel = plot.series[j].label;
-                var seriesColor = plot.series[j].color;
-                // format y value
-                if (plot.series[0]._yaxis.tickOptions.formatter) {
-                    // using formatter function
-                    seriesValue = plot.series[0]._yaxis.tickOptions.formatter('%s', seriesValue);
-                } else if (plot.series[0]._yaxis.tickOptions.formatString) {
-                    // using format string
-                    seriesValue = PMA_sprintf(plot.series[0]._yaxis.tickOptions.formatString, seriesValue);
-                }
-                tooltipHtml += '<br /><span style="color:' + seriesColor + '">' +
-                    seriesLabel + ': ' + seriesValue + '</span>';
-            }
-            tooltipHtml += '</span></div>';
-            return tooltipHtml;
-        };
-
-        // set Tooltip for each series
-        for (i in settings.series) {
-            settings.series[i].highlighter = {
-                show: true,
-                tooltipContentEditor: tempTooltipContentEditor
-            };
-        }
-
-        chartObj.chart = $.jqplot('gridchart' + runtime.chartAI, series, settings);
-        // remove [0,0] after plotting
-        for (i in chartObj.chart.series) {
-            chartObj.chart.series[i].data.shift();
-        }
-
-        var $legend = $('<div />').css('padding', '0.5em');
-        for (i in chartObj.chart.series) {
-            $legend.append(
-                $('<div />').append(
-                    $('<div>').css({
-                        width: '1em',
-                        height: '1em',
-                        background: chartObj.chart.seriesColors[i]
-                    }).addClass('floatleft')
-                ).append(
-                    $('<div>').text(
-                        chartObj.chart.series[i].label
-                    ).addClass('floatleft')
-                ).append(
-                    $('<div class="clearfloat">')
-                ).addClass('floatleft')
-            );
-        }
-        $('#gridchart' + runtime.chartAI)
-            .parent()
-            .append($legend);
-
-        if (initialize !== true) {
-            runtime.charts['c' + runtime.chartAI] = chartObj;
-            buildRequiredDataList();
-        }
-
-        // time span selection
-        $('#gridchart' + runtime.chartAI).bind('jqplotMouseDown', function (ev, gridpos, datapos, neighbor, plot) {
-            drawTimeSpan = true;
-            selectionTimeDiff.push(datapos.xaxis);
-            if ($('#selection_box').length) {
-                $('#selection_box').remove();
-            }
-            var selectionBox = $('<div id="selection_box" style="z-index:1000;height:205px;position:absolute;background-color:#87CEEB;opacity:0.4;filter:alpha(opacity=40);pointer-events:none;">');
-            $(document.body).append(selectionBox);
-            selectionStartX = ev.pageX;
-            selectionStartY = ev.pageY;
-            selectionBox
-                .attr({id: 'selection_box'})
-                .css({
-                    top: selectionStartY - gridpos.y,
-                    left: selectionStartX
-                })
-                .fadeIn();
-        });
-
-        $('#gridchart' + runtime.chartAI).bind('jqplotMouseUp', function (ev, gridpos, datapos, neighbor, plot) {
-            if (! drawTimeSpan || editMode) {
-                return;
-            }
-
-            selectionTimeDiff.push(datapos.xaxis);
-
-            if (selectionTimeDiff[1] <= selectionTimeDiff[0]) {
-                selectionTimeDiff = [];
-                return;
-            }
-            //get date from timestamp
-            var min = new Date(Math.ceil(selectionTimeDiff[0]));
-            var max = new Date(Math.ceil(selectionTimeDiff[1]));
-            PMA_getLogAnalyseDialog(min, max);
-            selectionTimeDiff = [];
-            drawTimeSpan = false;
-        });
-
-        $('#gridchart' + runtime.chartAI).bind('jqplotMouseMove', function (ev, gridpos, datapos, neighbor, plot) {
-            if (! drawTimeSpan || editMode) {
-                return;
-            }
-            if (selectionStartX !== undefined) {
-                $('#selection_box')
-                    .css({
-                        width: Math.ceil(ev.pageX - selectionStartX)
-                    })
-                    .fadeIn();
-            }
-        });
-
-        $('#gridchart' + runtime.chartAI).bind('jqplotMouseLeave', function (ev, gridpos, datapos, neighbor, plot) {
-            drawTimeSpan = false;
-        });
-
-        $(document.body).mouseup(function () {
-            if ($('#selection_box').length) {
-                $('#selection_box').remove();
-            }
-        });
-
-        // Edit, Print icon only in edit mode
-        $('#chartGrid').find('div svg').find('*[zIndex=20], *[zIndex=21], *[zIndex=19]').toggle(editMode);
-
-        runtime.chartAI++;
-    }
-
-    function PMA_getLogAnalyseDialog(min, max) {
-        var $logAnalyseDialog = $('#logAnalyseDialog');
-        var $dateStart = $logAnalyseDialog.find('input[name="dateStart"]');
-        var $dateEnd = $logAnalyseDialog.find('input[name="dateEnd"]');
-        $dateStart.prop("readonly", true);
-        $dateEnd.prop("readonly", true);
-
-        var dlgBtns = { };
-
-        dlgBtns[PMA_messages.strFromSlowLog] = function () {
-            loadLog('slow', min, max);
-            $(this).dialog("close");
-        };
-
-        dlgBtns[PMA_messages.strFromGeneralLog] = function () {
-            loadLog('general', min, max);
-            $(this).dialog("close");
-        };
-
-        $logAnalyseDialog.dialog({
-            width: 'auto',
-            height: 'auto',
-            buttons: dlgBtns
-        });
-
-        PMA_addDatepicker($dateStart, 'datetime', {
-            showMillisec: false,
-            showMicrosec: false,
-            timeFormat: 'HH:mm:ss'
-        });
-        PMA_addDatepicker($dateEnd, 'datetime', {
-            showMillisec: false,
-            showMicrosec: false,
-            timeFormat: 'HH:mm:ss'
-        });
-        $dateStart.datepicker('setDate', min);
-        $dateEnd.datepicker('setDate', max);
-    }
-
-    function loadLog(type, min, max) {
-        var dateStart = Date.parse($('#logAnalyseDialog').find('input[name="dateStart"]').datepicker('getDate')) || min;
-        var dateEnd = Date.parse($('#logAnalyseDialog').find('input[name="dateEnd"]').datepicker('getDate')) || max;
-
-        loadLogStatistics({
-            src: type,
-            start: dateStart,
-            end: dateEnd,
-            removeVariables: $('#removeVariables').prop('checked'),
-            limitTypes: $('#limitTypes').prop('checked')
-        });
-    }
-
-    /* Called in regular intervals, this function updates the values of each chart in the grid */
-    function refreshChartGrid() {
-        /* Send to server */
-        runtime.refreshRequest = $.post('server_status_monitor.php' + PMA_commonParams.get('common_query'), {
-            ajax_request: true,
-            chart_data: 1,
-            type: 'chartgrid',
-            requiredData: JSON.stringify(runtime.dataList)
-        }, function (data) {
-            var chartData;
-            if (typeof data !== 'undefined' && data.success === true) {
-                chartData = data.message;
-            } else {
-                return serverResponseError();
-            }
-            var value, i = 0;
-            var diff;
-            var total;
-
-            /* Update values in each graph */
-            $.each(runtime.charts, function (orderKey, elem) {
-                var key = elem.chartID;
-                // If newly added chart, we have no data for it yet
-                if (! chartData[key]) {
-                    return;
-                }
-                // Draw all series
-                total = 0;
-                for (var j = 0; j < elem.nodes.length; j++) {
-                    // Update x-axis
-                    if (i === 0 && j === 0) {
-                        if (oldChartData === null) {
-                            diff = chartData.x - runtime.xmax;
-                        } else {
-                            diff = parseInt(chartData.x - oldChartData.x, 10);
-                        }
-
-                        runtime.xmin += diff;
-                        runtime.xmax += diff;
-                    }
-
-                    //elem.chart.xAxis[0].setExtremes(runtime.xmin, runtime.xmax, false);
-                    /* Calculate y value */
-
-                    // If transform function given, use it
-                    if (elem.nodes[j].transformFn) {
-                        value = chartValueTransform(
-                            elem.nodes[j].transformFn,
-                            chartData[key][j],
-                            // Check if first iteration (oldChartData==null), or if newly added chart oldChartData[key]==null
-                            (
-                                oldChartData === null ||
-                                oldChartData[key] === null ||
-                                oldChartData[key] === undefined ? null : oldChartData[key][j]
-                            )
-                        );
-
-                    // Otherwise use original value and apply differential and divisor if given,
-                    // in this case we have only one data point per series - located at chartData[key][j][0]
-                    } else {
-                        value = parseFloat(chartData[key][j][0].value);
-
-                        if (elem.nodes[j].display == 'differential') {
-                            if (oldChartData === null ||
-                                oldChartData[key] === null ||
-                                oldChartData[key] === undefined
-                            ) {
-                                continue;
-                            }
-                            value -= oldChartData[key][j][0].value;
-                        }
-
-                        if (elem.nodes[j].valueDivisor) {
-                            value = value / elem.nodes[j].valueDivisor;
-                        }
-                    }
-
-                    // Set y value, if defined
-                    if (value !== undefined) {
-                        elem.chart.series[j].data.push([chartData.x, value]);
-                        if (value > elem.maxYLabel) {
-                            elem.maxYLabel = value;
-                        } else if (elem.maxYLabel === 0) {
-                            elem.maxYLabel = 0.5;
-                        }
-                        // free old data point values and update maxYLabel
-                        if (elem.chart.series[j].data.length > runtime.gridMaxPoints &&
-                            elem.chart.series[j].data[0][0] < runtime.xmin
-                        ) {
-                            // check if the next freeable point is highest
-                            if (elem.maxYLabel <= elem.chart.series[j].data[0][1]) {
-                                elem.chart.series[j].data.splice(0, elem.chart.series[j].data.length - runtime.gridMaxPoints);
-                                elem.maxYLabel = getMaxYLabel(elem.chart.series[j].data);
-                            } else {
-                                elem.chart.series[j].data.splice(0, elem.chart.series[j].data.length - runtime.gridMaxPoints);
-                            }
-                        }
-                        if (elem.title === PMA_messages.strSystemMemory ||
-                            elem.title === PMA_messages.strSystemSwap
-                        ) {
-                            total += value;
-                        }
-                    }
-                }
-
-                // update chart options
-                // keep ticks number/positioning consistent while refreshrate changes
-                var tickInterval = (runtime.xmax - runtime.xmin) / 5;
-                elem.chart.axes.xaxis.ticks = [(runtime.xmax - tickInterval * 4),
-                    (runtime.xmax - tickInterval * 3), (runtime.xmax - tickInterval * 2),
-                    (runtime.xmax - tickInterval), runtime.xmax];
-
-                if (elem.title !== PMA_messages.strSystemCPUUsage &&
-                    elem.title !== PMA_messages.strQueryCacheEfficiency &&
-                    elem.title !== PMA_messages.strSystemMemory &&
-                    elem.title !== PMA_messages.strSystemSwap
-                ) {
-                    elem.chart.axes.yaxis.max = Math.ceil(elem.maxYLabel * 1.1);
-                    elem.chart.axes.yaxis.tickInterval = Math.ceil(elem.maxYLabel * 1.1 / 5);
-                } else if (elem.title === PMA_messages.strSystemMemory ||
-                    elem.title === PMA_messages.strSystemSwap
-                ) {
-                    elem.chart.axes.yaxis.max = Math.ceil(total * 1.1 / 100) * 100;
-                    elem.chart.axes.yaxis.tickInterval = Math.ceil(total * 1.1 / 5);
-                }
-                i++;
-
-                if (runtime.redrawCharts) {
-                    elem.chart.replot();
-                }
-            });
-
-            oldChartData = chartData;
-
-            runtime.refreshTimeout = setTimeout(refreshChartGrid, monitorSettings.gridRefresh);
-        });
-    }
-
-    /* Function to get highest plotted point's y label, to scale the chart,
-     * TODO: make jqplot's autoscale:true work here
-     */
-    function getMaxYLabel(dataValues) {
-        var maxY = dataValues[0][1];
-        $.each(dataValues, function (k, v) {
-            maxY = (v[1] > maxY) ? v[1] : maxY;
-        });
-        return maxY;
-    }
-
-    /* Function that supplies special value transform functions for chart values */
-    function chartValueTransform(name, cur, prev) {
-        switch (name) {
-        case 'cpu-linux':
-            if (prev === null) {
-                return undefined;
-            }
-            // cur and prev are datapoint arrays, but containing
-            // only 1 element for cpu-linux
-            cur = cur[0];
-            prev = prev[0];
-
-            var diff_total = cur.busy + cur.idle - (prev.busy + prev.idle);
-            var diff_idle = cur.idle - prev.idle;
-            return 100 * (diff_total - diff_idle) / diff_total;
-
-        // Query cache efficiency (%)
-        case 'qce':
-            if (prev === null) {
-                return undefined;
-            }
-            // cur[0].value is Qcache_hits, cur[1].value is Com_select
-            var diffQHits = cur[0].value - prev[0].value;
-            // No NaN please :-)
-            if (cur[1].value - prev[1].value === 0) {
-                return 0;
-            }
-
-            return diffQHits / (cur[1].value - prev[1].value + diffQHits) * 100;
-
-        // Query cache usage (%)
-        case 'qcu':
-            if (cur[1].value === 0) {
-                return 0;
-            }
-            // cur[0].value is Qcache_free_memory, cur[1].value is query_cache_size
-            return 100 - cur[0].value / cur[1].value * 100;
-
-        }
-        return undefined;
-    }
-
-    /* Build list of nodes that need to be retrieved from server.
-     * It creates something like a stripped down version of the runtime.charts object.
-     */
-    function buildRequiredDataList() {
-        runtime.dataList = {};
-        // Store an own id, because the property name is subject of reordering,
-        // thus destroying our mapping with runtime.charts <=> runtime.dataList
-        var chartID = 0;
-        $.each(runtime.charts, function (key, chart) {
-            runtime.dataList[chartID] = [];
-            for (var i = 0, l = chart.nodes.length; i < l; i++) {
-                runtime.dataList[chartID][i] = chart.nodes[i].dataPoints;
-            }
-            runtime.charts[key].chartID = chartID;
-            chartID++;
-        });
-    }
-
-    /* Loads the log table data, generates the table and handles the filters */
-    function loadLogStatistics(opts) {
-        var tableStr = '';
-        var logRequest = null;
-
-        if (! opts.removeVariables) {
-            opts.removeVariables = false;
-        }
-        if (! opts.limitTypes) {
-            opts.limitTypes = false;
-        }
-
-        $('#emptyDialog').dialog({title: PMA_messages.strAnalysingLogsTitle});
-        $('#emptyDialog').html(PMA_messages.strAnalysingLogs +
-                                ' <img class="ajaxIcon" src="' + pmaThemeImage +
-                                'ajax_clock_small.gif" alt="">');
-        var dlgBtns = {};
-
-        dlgBtns[PMA_messages.strCancelRequest] = function () {
-            if (logRequest !== null) {
-                logRequest.abort();
-            }
-
-            $(this).dialog("close");
-        };
-
-        $('#emptyDialog').dialog({
-            width: 'auto',
-            height: 'auto',
-            buttons: dlgBtns
-        });
-
-
-        logRequest = $.get('server_status_monitor.php' + PMA_commonParams.get('common_query'),
-            {   ajax_request: true,
-                log_data: 1,
-                type: opts.src,
-                time_start: Math.round(opts.start / 1000),
-                time_end: Math.round(opts.end / 1000),
-                removeVariables: opts.removeVariables,
-                limitTypes: opts.limitTypes
-            },
-            function (data) {
-                var logData;
-                var dlgBtns = {};
-                if (typeof data !== 'undefined' && data.success === true) {
-                    logData = data.message;
-                } else {
-                    return serverResponseError();
-                }
-
-                if (logData.rows.length === 0) {
-                    $('#emptyDialog').dialog({title: PMA_messages.strNoDataFoundTitle});
-                    $('#emptyDialog').html('<p>' + PMA_messages.strNoDataFound + '</p>');
-
-                    dlgBtns[PMA_messages.strClose] = function () {
-                        $(this).dialog("close");
-                    };
-
-                    $('#emptyDialog').dialog("option", "buttons", dlgBtns);
-                    return;
-                }
-
-                runtime.logDataCols = buildLogTable(logData, opts.removeVariables);
-
-                /* Show some stats in the dialog */
-                $('#emptyDialog').dialog({title: PMA_messages.strLoadingLogs});
-                $('#emptyDialog').html('<p>' + PMA_messages.strLogDataLoaded + '</p>');
-                $.each(logData.sum, function (key, value) {
-                    key = key.charAt(0).toUpperCase() + key.slice(1).toLowerCase();
-                    if (key == 'Total') {
-                        key = '<b>' + key + '</b>';
-                    }
-                    $('#emptyDialog').append(key + ': ' + value + '<br/>');
-                });
-
-                /* Add filter options if more than a bunch of rows there to filter */
-                if (logData.numRows > 12) {
-                    $('#logTable').prepend(
-                        '<fieldset id="logDataFilter">' +
-                        '    <legend>' + PMA_messages.strFiltersForLogTable + '</legend>' +
-                        '    <div class="formelement">' +
-                        '        <label for="filterQueryText">' + PMA_messages.strFilterByWordRegexp + '</label>' +
-                        '        <input name="filterQueryText" type="text" id="filterQueryText" style="vertical-align: baseline;" />' +
-                        '    </div>' +
-                        ((logData.numRows > 250) ? ' <div class="formelement"><button name="startFilterQueryText" id="startFilterQueryText">' + PMA_messages.strFilter + '</button></div>' : '') +
-                        '    <div class="formelement">' +
-                        '       <input type="checkbox" id="noWHEREData" name="noWHEREData" value="1" /> ' +
-                        '       <label for="noWHEREData"> ' + PMA_messages.strIgnoreWhereAndGroup + '</label>' +
-                        '   </div' +
-                        '</fieldset>'
-                    );
-
-                    $('#noWHEREData').change(function () {
-                        filterQueries(true);
-                    });
-
-                    if (logData.numRows > 250) {
-                        $('#startFilterQueryText').click(filterQueries);
-                    } else {
-                        $('#filterQueryText').keyup(filterQueries);
-                    }
-
-                }
-
-                dlgBtns[PMA_messages.strJumpToTable] = function () {
-                    $(this).dialog("close");
-                    $(document).scrollTop($('#logTable').offset().top);
-                };
-
-                $('#emptyDialog').dialog("option", "buttons", dlgBtns);
-            }
-        );
-
-        /* Handles the actions performed when the user uses any of the
-         * log table filters which are the filter by name and grouping
-         * with ignoring data in WHERE clauses
-         *
-         * @param boolean Should be true when the users enabled or disabled
-         *                to group queries ignoring data in WHERE clauses
-        */
-        function filterQueries(varFilterChange) {
-            var odd_row = false, cell, textFilter;
-            var val = $('#filterQueryText').val();
-
-            if (val.length === 0) {
-                textFilter = null;
-            } else {
-                try {
-                    textFilter = new RegExp(val, 'i');
-                    $('#filterQueryText').removeClass('error');
-                } catch(e) {
-                    if (e instanceof SyntaxError) {
-                        $('#filterQueryText').addClass('error');
-                        textFilter = null;
-                    }
-                }
-            }
-
-            var rowSum = 0, totalSum = 0, i = 0, q;
-            var noVars = $('#noWHEREData').prop('checked');
-            var equalsFilter = /([^=]+)=(\d+|((\'|"|).*?[^\\])\4((\s+)|$))/gi;
-            var functionFilter = /([a-z0-9_]+)\(.+?\)/gi;
-            var filteredQueries = {}, filteredQueriesLines = {};
-            var hide = false, rowData;
-            var queryColumnName = runtime.logDataCols[runtime.logDataCols.length - 2];
-            var sumColumnName = runtime.logDataCols[runtime.logDataCols.length - 1];
-            var isSlowLog = opts.src == 'slow';
-            var columnSums = {};
-
-            // For the slow log we have to count many columns (query_time, lock_time, rows_examined, rows_sent, etc.)
-            var countRow = function (query, row) {
-                var cells = row.match(/<td>(.*?)<\/td>/gi);
-                if (!columnSums[query]) {
-                    columnSums[query] = [0, 0, 0, 0];
-                }
-
-                // lock_time and query_time and displayed in timespan format
-                columnSums[query][0] += timeToSec(cells[2].replace(/(<td>|<\/td>)/gi, ''));
-                columnSums[query][1] += timeToSec(cells[3].replace(/(<td>|<\/td>)/gi, ''));
-                // rows_examind and rows_sent are just numbers
-                columnSums[query][2] += parseInt(cells[4].replace(/(<td>|<\/td>)/gi, ''), 10);
-                columnSums[query][3] += parseInt(cells[5].replace(/(<td>|<\/td>)/gi, ''), 10);
-            };
-
-            // We just assume the sql text is always in the second last column, and that the total count is right of it
-            $('#logTable').find('table tbody tr td:nth-child(' + (runtime.logDataCols.length - 1) + ')').each(function () {
-                var $t = $(this);
-                // If query is a SELECT and user enabled or disabled to group
-                // queries ignoring data in where statements, we
-                // need to re-calculate the sums of each row
-                if (varFilterChange && $t.html().match(/^SELECT/i)) {
-                    if (noVars) {
-                        // Group on => Sum up identical columns, and hide all but 1
-
-                        q = $t.text().replace(equalsFilter, '$1=...$6').trim();
-                        q = q.replace(functionFilter, ' $1(...)');
-
-                        // Js does not specify a limit on property name length,
-                        // so we can abuse it as index :-)
-                        if (filteredQueries[q]) {
-                            filteredQueries[q] += parseInt($t.next().text(), 10);
-                            totalSum += parseInt($t.next().text(), 10);
-                            hide = true;
-                        } else {
-                            filteredQueries[q] = parseInt($t.next().text(), 10);
-                            filteredQueriesLines[q] = i;
-                            $t.text(q);
-                        }
-                        if (isSlowLog) {
-                            countRow(q, $t.parent().html());
-                        }
-
-                    } else {
-                        // Group off: Restore original columns
-
-                        rowData = $t.parent().data('query');
-                        // Restore SQL text
-                        $t.text(rowData[queryColumnName]);
-                        // Restore total count
-                        $t.next().text(rowData[sumColumnName]);
-                        // Restore slow log columns
-                        if (isSlowLog) {
-                            $t.parent().children('td:nth-child(3)').text(rowData.query_time);
-                            $t.parent().children('td:nth-child(4)').text(rowData.lock_time);
-                            $t.parent().children('td:nth-child(5)').text(rowData.rows_sent);
-                            $t.parent().children('td:nth-child(6)').text(rowData.rows_examined);
-                        }
-                    }
-                }
-
-                // If not required to be hidden, do we need
-                // to hide because of a not matching text filter?
-                if (! hide && (textFilter !== null && ! textFilter.exec($t.text()))) {
-                    hide = true;
-                }
-
-                // Now display or hide this column
-                if (hide) {
-                    $t.parent().css('display', 'none');
-                } else {
-                    totalSum += parseInt($t.next().text(), 10);
-                    rowSum++;
-
-                    odd_row = ! odd_row;
-                    $t.parent().css('display', '');
-                    if (odd_row) {
-                        $t.parent().addClass('odd');
-                        $t.parent().removeClass('even');
-                    } else {
-                        $t.parent().addClass('even');
-                        $t.parent().removeClass('odd');
-                    }
-                }
-
-                hide = false;
-                i++;
-            });
-
-            // We finished summarizing counts => Update count values of all grouped entries
-            if (varFilterChange) {
-                if (noVars) {
-                    var numCol, row, $table = $('#logTable').find('table tbody');
-                    $.each(filteredQueriesLines, function (key, value) {
-                        if (filteredQueries[key] <= 1) {
-                            return;
-                        }
-
-                        row =  $table.children('tr:nth-child(' + (value + 1) + ')');
-                        numCol = row.children(':nth-child(' + (runtime.logDataCols.length) + ')');
-                        numCol.text(filteredQueries[key]);
-
-                        if (isSlowLog) {
-                            row.children('td:nth-child(3)').text(secToTime(columnSums[key][0]));
-                            row.children('td:nth-child(4)').text(secToTime(columnSums[key][1]));
-                            row.children('td:nth-child(5)').text(columnSums[key][2]);
-                            row.children('td:nth-child(6)').text(columnSums[key][3]);
-                        }
-                    });
-                }
-
-                $('#logTable').find('table').trigger("update");
-                setTimeout(function () {
-                    $('#logTable').find('table').trigger('sorton', [[[runtime.logDataCols.length - 1, 1]]]);
-                }, 0);
-            }
-
-            // Display some stats at the bottom of the table
-            $('#logTable').find('table tfoot tr')
-                .html('<th colspan="' + (runtime.logDataCols.length - 1) + '">' +
-                      PMA_messages.strSumRows + ' ' + rowSum + '<span class="floatright">' +
-                      PMA_messages.strTotal + '</span></th><th class="right">' + totalSum + '</th>');
-        }
-    }
-
-    /* Turns a timespan (12:12:12) into a number */
-    function timeToSec(timeStr) {
-        var time = timeStr.split(':');
-        return (parseInt(time[0], 10) * 3600) + (parseInt(time[1], 10) * 60) + parseInt(time[2], 10);
-    }
-
-    /* Turns a number into a timespan (100 into 00:01:40) */
-    function secToTime(timeInt) {
-        var hours = Math.floor(timeInt / 3600);
-        timeInt -= hours * 3600;
-        var minutes = Math.floor(timeInt / 60);
-        timeInt -= minutes * 60;
-
-        if (hours < 10) {
-            hours = '0' + hours;
-        }
-        if (minutes < 10) {
-            minutes = '0' + minutes;
-        }
-        if (timeInt < 10) {
-            timeInt = '0' + timeInt;
-        }
-
-        return hours + ':' + minutes + ':' + timeInt;
-    }
-
-    /* Constructs the log table out of the retrieved server data */
-    function buildLogTable(data, groupInserts) {
-        var rows = data.rows;
-        var cols = [];
-        var $table = $('<table class="sortable"></table>');
-        var $tBody, $tRow, $tCell;
-
-        $('#logTable').html($table);
-
-        var tempPushKey = function (key, value) {
-            cols.push(key);
-        };
-
-        var formatValue = function (name, value) {
-            if (name == 'user_host') {
-                return value.replace(/(\[.*?\])+/g, '');
-            }
-            return escapeHtml(value);
-        };
-
-        for (var i = 0, l = rows.length; i < l; i++) {
-            if (i === 0) {
-                $.each(rows[0], tempPushKey);
-                $table.append('<thead>' +
-                              '<tr><th class="nowrap">' + cols.join('</th><th class="nowrap">') + '</th></tr>' +
-                              '</thead>'
-                );
-
-                $table.append($tBody = $('<tbody></tbody>'));
-            }
-
-            $tBody.append($tRow = $('<tr class="noclick"></tr>'));
-            var cl = '';
-            for (var j = 0, ll = cols.length; j < ll; j++) {
-                // Assuming the query column is the second last
-                if (j == cols.length - 2 && rows[i][cols[j]].match(/^SELECT/i)) {
-                    $tRow.append($tCell = $('<td class="linkElem">' + formatValue(cols[j], rows[i][cols[j]]) + '</td>'));
-                    $tCell.click(openQueryAnalyzer);
-                } else {
-                    $tRow.append('<td>' + formatValue(cols[j], rows[i][cols[j]]) + '</td>');
-                }
-
-                $tRow.data('query', rows[i]);
-            }
-        }
-
-        $table.append('<tfoot>' +
-                    '<tr><th colspan="' + (cols.length - 1) + '">' + PMA_messages.strSumRows +
-                    ' ' + data.numRows + '<span class="floatright">' + PMA_messages.strTotal +
-                    '</span></th><th class="right">' + data.sum.TOTAL + '</th></tr></tfoot>');
-
-        // Append a tooltip to the count column, if there exist one
-        if ($('#logTable').find('tr:first th:last').text().indexOf("#") > -1) {
-            $('#logTable').find('tr:first th:last').append('&nbsp;' + PMA_getImage('b_help.png', '', {'class': 'qroupedQueryInfoIcon'}));
-
-            var tooltipContent = PMA_messages.strCountColumnExplanation;
-            if (groupInserts) {
-                tooltipContent += '<p>' + PMA_messages.strMoreCountColumnExplanation + '</p>';
-            }
-
-            PMA_tooltip(
-                $('img.qroupedQueryInfoIcon'),
-                'img',
-                tooltipContent
-            );
-        }
-
-        $('#logTable').find('table').tablesorter({
-            sortList: [[cols.length - 1, 1]],
-            widgets: ['fast-zebra']
-        });
-
-        $('#logTable').find('table thead th')
-            .append('<div class="sorticon"></div>');
-
-        return cols;
-    }
-
-    /* Opens the query analyzer dialog */
-    function openQueryAnalyzer() {
-        var rowData = $(this).parent().data('query');
-        var query = rowData.argument || rowData.sql_text;
-
-        if (codemirror_editor) {
-            //TODO: somehow PMA_SQLPrettyPrint messes up the query, needs be fixed
-            //query = PMA_SQLPrettyPrint(query);
-            codemirror_editor.setValue(query);
-            // Codemirror is bugged, it doesn't refresh properly sometimes.
-            // Following lines seem to fix that
-            setTimeout(function () {
-                codemirror_editor.refresh();
-            }, 50);
-        }
-        else {
-            $('#sqlquery').val(query);
-        }
-
-        var profilingChart = null;
-        var dlgBtns = {};
-
-        dlgBtns[PMA_messages.strAnalyzeQuery] = function () {
-            loadQueryAnalysis(rowData);
-        };
-        dlgBtns[PMA_messages.strClose] = function () {
-            $(this).dialog('close');
-        };
-
-        $('#queryAnalyzerDialog').dialog({
-            width: 'auto',
-            height: 'auto',
-            resizable: false,
-            buttons: dlgBtns,
-            close: function () {
-                if (profilingChart !== null) {
-                    profilingChart.destroy();
-                }
-                $('#queryAnalyzerDialog').find('div.placeHolder').html('');
-                if (codemirror_editor) {
-                    codemirror_editor.setValue('');
-                } else {
-                    $('#sqlquery').val('');
-                }
-            }
-        });
-    }
-
-    /* Loads and displays the analyzed query data */
-    function loadQueryAnalysis(rowData) {
-        var db = rowData.db || '';
-
-        $('#queryAnalyzerDialog').find('div.placeHolder').html(
-            PMA_messages.strAnalyzing + ' <img class="ajaxIcon" src="' +
-            pmaThemeImage + 'ajax_clock_small.gif" alt="">');
-
-        $.post('server_status_monitor.php' + PMA_commonParams.get('common_query'), {
-            ajax_request: true,
-            query_analyzer: true,
-            query: codemirror_editor ? codemirror_editor.getValue() : $('#sqlquery').val(),
-            database: db
-        }, function (data) {
-            var i, l;
-            if (typeof data !== 'undefined' && data.success === true) {
-                data = data.message;
-            }
-            if (data.error) {
-                if (data.error.indexOf('1146') != -1 || data.error.indexOf('1046') != -1) {
-                    data.error = PMA_messages.strServerLogError;
-                }
-                $('#queryAnalyzerDialog').find('div.placeHolder').html('<div class="error">' + data.error + '</div>');
-                return;
-            }
-            var totalTime = 0;
-            // Float sux, I'll use table :(
-            $('#queryAnalyzerDialog').find('div.placeHolder')
-                .html('<table width="100%" border="0"><tr><td class="explain"></td><td class="chart"></td></tr></table>');
-
-            var explain = '<b>' + PMA_messages.strExplainOutput + '</b> ' + $('#explain_docu').html();
-            if (data.explain.length > 1) {
-                explain += ' (';
-                for (i = 0; i < data.explain.length; i++) {
-                    if (i > 0) {
-                        explain += ', ';
-                    }
-                    explain += '<a href="#showExplain-' + i + '">' + i + '</a>';
-                }
-                explain += ')';
-            }
-            explain += '<p></p>';
-
-            var tempExplain = function (key, value) {
-                value = (value === null) ? 'null' : escapeHtml(value);
-
-                if (key == 'type' && value.toLowerCase() == 'all') {
-                    value = '<span class="attention">' + value + '</span>';
-                }
-                if (key == 'Extra') {
-                    value = value.replace(/(using (temporary|filesort))/gi, '<span class="attention">$1</span>');
-                }
-                explain += key + ': ' + value + '<br />';
-            };
-
-            for (i = 0, l = data.explain.length; i < l; i++) {
-                explain += '<div class="explain-' + i + '"' + (i > 0 ?  'style="display:none;"' : '') + '>';
-                $.each(data.explain[i], tempExplain);
-                explain += '</div>';
-            }
-
-            explain += '<p><b>' + PMA_messages.strAffectedRows + '</b> ' + data.affectedRows;
-
-            $('#queryAnalyzerDialog').find('div.placeHolder td.explain').append(explain);
-
-            $('#queryAnalyzerDialog').find('div.placeHolder a[href*="#showExplain"]').click(function () {
-                var id = $(this).attr('href').split('-')[1];
-                $(this).parent().find('div[class*="explain"]').hide();
-                $(this).parent().find('div[class*="explain-' + id + '"]').show();
-            });
-
-            if (data.profiling) {
-                var chartData = [];
-                var numberTable = '<table class="queryNums"><thead><tr><th>' + PMA_messages.strStatus + '</th><th>' + PMA_messages.strTime + '</th></tr></thead><tbody>';
-                var duration;
-                var otherTime = 0;
-
-                for (i = 0, l = data.profiling.length; i < l; i++) {
-                    duration = parseFloat(data.profiling[i].duration);
-
-                    totalTime += duration;
-
-                    numberTable += '<tr><td>' + data.profiling[i].state + ' </td><td> ' + PMA_prettyProfilingNum(duration, 2) + '</td></tr>';
-                }
-
-                // Only put those values in the pie which are > 2%
-                for (i = 0, l = data.profiling.length; i < l; i++) {
-                    duration = parseFloat(data.profiling[i].duration);
-
-                    if (duration / totalTime > 0.02) {
-                        chartData.push([PMA_prettyProfilingNum(duration, 2) + ' ' + data.profiling[i].state, duration]);
-                    } else {
-                        otherTime += duration;
-                    }
-                }
-
-                if (otherTime > 0) {
-                    chartData.push([PMA_prettyProfilingNum(otherTime, 2) + ' ' + PMA_messages.strOther, otherTime]);
-                }
-
-                numberTable += '<tr><td><b>' + PMA_messages.strTotalTime + '</b></td><td>' + PMA_prettyProfilingNum(totalTime, 2) + '</td></tr>';
-                numberTable += '</tbody></table>';
-
-                $('#queryAnalyzerDialog').find('div.placeHolder td.chart').append(
-                    '<b>' + PMA_messages.strProfilingResults + ' ' + $('#profiling_docu').html() + '</b> ' +
-                    '(<a href="#showNums">' + PMA_messages.strTable + '</a>, <a href="#showChart">' + PMA_messages.strChart + '</a>)<br/>' +
-                    numberTable + ' <div id="queryProfiling"></div>');
-
-                $('#queryAnalyzerDialog').find('div.placeHolder a[href="#showNums"]').click(function () {
-                    $('#queryAnalyzerDialog').find('#queryProfiling').hide();
-                    $('#queryAnalyzerDialog').find('table.queryNums').show();
-                    return false;
-                });
-
-                $('#queryAnalyzerDialog').find('div.placeHolder a[href="#showChart"]').click(function () {
-                    $('#queryAnalyzerDialog').find('#queryProfiling').show();
-                    $('#queryAnalyzerDialog').find('table.queryNums').hide();
-                    return false;
-                });
-
-                profilingChart = PMA_createProfilingChart(
-                    'queryProfiling',
-                    chartData
-                );
-
-                //$('#queryProfiling').resizable();
-            }
-        });
-    }
-
-    /* Saves the monitor to localstorage */
-    function saveMonitor() {
-        var gridCopy = {};
-
-        $.each(runtime.charts, function (key, elem) {
-            gridCopy[key] = {};
-            gridCopy[key].nodes = elem.nodes;
-            gridCopy[key].settings = elem.settings;
-            gridCopy[key].title = elem.title;
-            gridCopy[key].series = elem.series;
-            gridCopy[key].maxYLabel = elem.maxYLabel;
-        });
-
-        if (isStorageSupported('localStorage')) {
-            window.localStorage.monitorCharts = JSON.stringify(gridCopy);
-            window.localStorage.monitorSettings = JSON.stringify(monitorSettings);
-            window.localStorage.monitorVersion = monitorProtocolVersion;
-        }
-
-        $('a[href="#clearMonitorConfig"]').show();
-    }
-});
-
-// Run the monitor once loaded
-AJAX.registerOnload('server_status_monitor.js', function () {
-    $('a[href="#pauseCharts"]').trigger('click');
-});
-
-function serverResponseError() {
-    var btns = {};
-    btns[PMA_messages.strReloadPage] = function () {
-        window.location.reload();
-    };
-    $('#emptyDialog').dialog({title: PMA_messages.strRefreshFailed});
-    $('#emptyDialog').html(
-        PMA_getImage('s_attention.png') +
-        PMA_messages.strInvalidResponseExplanation
-    );
-    $('#emptyDialog').dialog({ buttons: btns });
-}
-
-/* Destroys all monitor related resources */
-function destroyGrid() {
-    if (runtime.charts) {
-        $.each(runtime.charts, function (key, value) {
-            try {
-                value.chart.destroy();
-            } catch (err) {}
-        });
-    }
-
-    try {
-        runtime.refreshRequest.abort();
-    } catch (err) {}
-    try {
-        clearTimeout(runtime.refreshTimeout);
-    } catch (err) {}
-    $('#chartGrid').html('');
-    runtime.charts = null;
-    runtime.chartAI = 0;
-    monitorSettings = null; //TODO:this not global variable
-}
diff --git a/#pma/js/server_status_processes.js b/#pma/js/server_status_processes.js
deleted file mode 100644
index 87b14f02..00000000
--- a/#pma/js/server_status_processes.js
+++ /dev/null
@@ -1,188 +0,0 @@
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Server Status Processes
- *
- * @package PhpMyAdmin
- */
-
-// object to store process list state information
-var processList = {
-
-    // denotes whether auto refresh is on or off
-    autoRefresh: false,
-    // stores the GET request which refresh process list
-    refreshRequest: null,
-    // stores the timeout id returned by setTimeout
-    refreshTimeout: null,
-    // the refresh interval in seconds
-    refreshInterval: null,
-    // the refresh URL (required to save last used option)
-    // i.e. full or sorting url
-    refreshUrl: null,
-
-    /**
-     * Handles killing of a process
-     *
-     * @return void
-     */
-    init: function() {
-        processList.setRefreshLabel();
-        if (processList.refreshUrl === null) {
-            processList.refreshUrl = 'server_status_processes.php' +
-                PMA_commonParams.get('common_query');
-        }
-        if (processList.refreshInterval === null) {
-            processList.refreshInterval = $('#id_refreshRate').val();
-        } else {
-            $('#id_refreshRate').val(processList.refreshInterval);
-        }
-    },
-
-    /**
-     * Handles killing of a process
-     *
-     * @param object the event object
-     *
-     * @return void
-     */
-    killProcessHandler: function(event) {
-        event.preventDefault();
-        var url = $(this).attr('href');
-        // Get row element of the process to be killed.
-        var $tr = $(this).closest('tr');
-        $.getJSON(url, function(data) {
-            // Check if process was killed or not.
-            if (data.hasOwnProperty('success') && data.success) {
-                // remove the row of killed process.
-                $tr.remove();
-                // As we just removed a row, reapply odd-even classes
-                // to keep table stripes consistent
-                var $tableProcessListTr = $('#tableprocesslist').find('> tbody > tr');
-                $tableProcessListTr.filter(':even').removeClass('odd').addClass('even');
-                $tableProcessListTr.filter(':odd').removeClass('even').addClass('odd');
-                // Show process killed message
-                PMA_ajaxShowMessage(data.message, false);
-            } else {
-                // Show process error message
-                PMA_ajaxShowMessage(data.error, false);
-            }
-        });
-    },
-
-    /**
-     * Handles Auto Refreshing
-     *
-     * @param object the event object
-     *
-     * @return void
-     */
-    refresh: function(event) {
-        // abort any previous pending requests
-        // this is necessary, it may go into
-        // multiple loops causing unnecessary
-        // requests even after leaving the page.
-        processList.abortRefresh();
-        // if auto refresh is enabled
-        if (processList.autoRefresh) {
-            var interval = parseInt(processList.refreshInterval, 10) * 1000;
-            var urlParams = processList.getUrlParams();
-            processList.refreshRequest = $.get(processList.refreshUrl,
-                urlParams,
-                function(data) {
-                    if (data.hasOwnProperty('success') && data.success) {
-                        $newTable = $(data.message);
-                        $('#tableprocesslist').html($newTable.html());
-                        PMA_highlightSQL($('#tableprocesslist'));
-                    }
-                    processList.refreshTimeout = setTimeout(
-                        processList.refresh,
-                        interval
-                    );
-                });
-        }
-    },
-
-    /**
-     * Stop current request and clears timeout
-     *
-     * @return void
-     */
-    abortRefresh: function() {
-        if (processList.refreshRequest !== null) {
-            processList.refreshRequest.abort();
-            processList.refreshRequest = null;
-        }
-        clearTimeout(processList.refreshTimeout);
-    },
-
-    /**
-     * Set label of refresh button
-     * change between play & pause
-     *
-     * @return void
-     */
-    setRefreshLabel: function() {
-        var img = 'play.png';
-        var label = PMA_messages.strStartRefresh;
-        if (processList.autoRefresh) {
-            img = 'pause.png';
-            label = PMA_messages.strStopRefresh;
-            processList.refresh();
-        }
-        $('a#toggleRefresh').html(PMA_getImage(img) + escapeHtml(label));
-    },
-
-    /**
-     * Return the Url Parameters
-     * for autorefresh request,
-     * includes showExecuting if the filter is checked
-     *
-     * @return urlParams - url parameters with autoRefresh request
-     */
-    getUrlParams: function() {
-        var urlParams = { 'ajax_request': true, 'refresh': true };
-        if ($('#showExecuting').is(":checked")) {
-            urlParams.showExecuting = true;
-            return urlParams;
-        }
-        return urlParams;
-    }
-};
-
-AJAX.registerOnload('server_status_processes.js', function() {
-
-    processList.init();
-    // Bind event handler for kill_process
-    $('#tableprocesslist').on(
-        'click',
-        'a.kill_process',
-        processList.killProcessHandler
-    );
-    // Bind event handler for toggling refresh of process list
-    $('a#toggleRefresh').on('click', function(event) {
-        event.preventDefault();
-        processList.autoRefresh = !processList.autoRefresh;
-        processList.setRefreshLabel();
-    });
-    // Bind event handler for change in refresh rate
-    $('#id_refreshRate').on('change', function(event) {
-        processList.refreshInterval = $(this).val();
-        processList.refresh();
-    });
-    // Bind event handler for table header links
-    $('#tableprocesslist').on('click', 'thead a', function() {
-        processList.refreshUrl = $(this).attr('href');
-    });
-});
-
-/**
- * Unbind all event handlers before tearing down a page
- */
-AJAX.registerTeardown('server_status_processes.js', function() {
-    $('#tableprocesslist').off('click', 'a.kill_process');
-    $('a#toggleRefresh').off('click');
-    $('#id_refreshRate').off('change');
-    $('#tableprocesslist').off('click', 'thead a');
-    // stop refreshing further
-    processList.abortRefresh();
-});
diff --git a/#pma/js/server_status_queries.js b/#pma/js/server_status_queries.js
deleted file mode 100644
index a4a4e005..00000000
--- a/#pma/js/server_status_queries.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- */
-
-/**
- * Unbind all event handlers before tearing down a page
- */
-AJAX.registerTeardown('server_status_queries.js', function () {
-    var queryPieChart = $('#serverstatusquerieschart').data('queryPieChart');
-    if (queryPieChart) {
-        queryPieChart.destroy();
-    }
-});
-
-AJAX.registerOnload('server_status_queries.js', function () {
-    // Build query statistics chart
-    var cdata = [];
-    try {
-        $.each(jQuery.parseJSON($('#serverstatusquerieschart_data').text()), function (key, value) {
-            cdata.push([key, parseInt(value, 10)]);
-        });
-        $('#serverstatusquerieschart').data(
-            'queryPieChart',
-            PMA_createProfilingChart(
-                'serverstatusquerieschart',
-                cdata
-            )
-        );
-    } catch (exception) {
-        // Could not load chart, no big deal...
-    }
-
-    initTableSorter('statustabs_queries');
-});
diff --git a/#pma/js/server_status_sorter.js b/#pma/js/server_status_sorter.js
deleted file mode 100644
index b0891c16..00000000
--- a/#pma/js/server_status_sorter.js
+++ /dev/null
@@ -1,83 +0,0 @@
-// TODO: tablesorter shouldn't sort already sorted columns
-function initTableSorter(tabid) {
-    var $table, opts;
-    switch (tabid) {
-    case 'statustabs_queries':
-        $table = $('#serverstatusqueriesdetails');
-        opts = {
-            sortList: [[3, 1]],
-            widgets: ['fast-zebra'],
-            headers: {
-                1: { sorter: 'fancyNumber' },
-                2: { sorter: 'fancyNumber' }
-            }
-        };
-        break;
-    }
-    $table.tablesorter(opts);
-    $table.find('tr:first th')
-        .append('<div class="sorticon"></div>');
-}
-
-$(function () {
-    $.tablesorter.addParser({
-        id: "fancyNumber",
-        is: function (s) {
-            return (/^[0-9]?[0-9,\.]*\s?(k|M|G|T|%)?$/).test(s);
-        },
-        format: function (s) {
-            var num = jQuery.tablesorter.formatFloat(
-                s.replace(PMA_messages.strThousandsSeparator, '')
-                 .replace(PMA_messages.strDecimalSeparator, '.')
-            );
-
-            var factor = 1;
-            switch (s.charAt(s.length - 1)) {
-            case '%':
-                factor = -2;
-                break;
-            // Todo: Complete this list (as well as in the regexp a few lines up)
-            case 'k':
-                factor = 3;
-                break;
-            case 'M':
-                factor = 6;
-                break;
-            case 'G':
-                factor = 9;
-                break;
-            case 'T':
-                factor = 12;
-                break;
-            }
-
-            return num * Math.pow(10, factor);
-        },
-        type: "numeric"
-    });
-
-    $.tablesorter.addParser({
-        id: "withinSpanNumber",
-        is: function (s) {
-            return (/<span class="original"/).test(s);
-        },
-        format: function (s, table, html) {
-            var res = html.innerHTML.match(/<span(\s*style="display:none;"\s*)?\s*class="original">(.*)?<\/span>/);
-            return (res && res.length >= 3) ? res[2] : 0;
-        },
-        type: "numeric"
-    });
-
-    // faster zebra widget: no row visibility check, faster css class switching, no cssChildRow check
-    $.tablesorter.addWidget({
-        id: "fast-zebra",
-        format: function (table) {
-            $("tr:even", table.tBodies[0])
-                .removeClass(table.config.widgetZebra.css[0])
-                .addClass(table.config.widgetZebra.css[1]);
-            $("tr:odd", table.tBodies[0])
-                .removeClass(table.config.widgetZebra.css[1])
-                .addClass(table.config.widgetZebra.css[0]);
-        }
-    });
-});
diff --git a/#pma/js/server_status_variables.js b/#pma/js/server_status_variables.js
deleted file mode 100644
index 47956f84..00000000
--- a/#pma/js/server_status_variables.js
+++ /dev/null
@@ -1,111 +0,0 @@
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- *
- *
- * @package PhpMyAdmin
- */
-
-/**
- * Unbind all event handlers before tearing down a page
- */
-AJAX.registerTeardown('server_status_variables.js', function () {
-    $('#filterAlert').unbind('change');
-    $('#filterText').unbind('keyup');
-    $('#filterCategory').unbind('change');
-    $('#dontFormat').unbind('change');
-});
-
-AJAX.registerOnload('server_status_variables.js', function () {
-
-    // Filters for status variables
-    var textFilter = null;
-    var alertFilter = $('#filterAlert').prop('checked');
-    var categoryFilter = $('#filterCategory').find(':selected').val();
-    var odd_row = false;
-    var text = ''; // Holds filter text
-
-    /* 3 Filtering functions */
-    $('#filterAlert').change(function () {
-        alertFilter = this.checked;
-        filterVariables();
-    });
-
-    $('#filterCategory').change(function () {
-        categoryFilter = $(this).val();
-        filterVariables();
-    });
-
-    $('#dontFormat').change(function () {
-        // Hiding the table while changing values speeds up the process a lot
-        $('#serverstatusvariables').hide();
-        $('#serverstatusvariables').find('td.value span.original').toggle(this.checked);
-        $('#serverstatusvariables').find('td.value span.formatted').toggle(! this.checked);
-        $('#serverstatusvariables').show();
-    }).trigger('change');
-
-    $('#filterText').keyup(function (e) {
-        var word = $(this).val().replace(/_/g, ' ');
-        if (word.length === 0) {
-            textFilter = null;
-        } else {
-            try {
-                textFilter = new RegExp("(^| )" + word, 'i');
-                $(this).removeClass('error');
-            } catch(e) {
-                if (e instanceof SyntaxError) {
-                    $(this).addClass('error');
-                    textFilter = null;
-                }
-            }
-        }
-        text = word;
-        filterVariables();
-    }).trigger('keyup');
-
-    /* Filters the status variables by name/category/alert in the variables tab */
-    function filterVariables() {
-        var useful_links = 0;
-        var section = text;
-
-        if (categoryFilter.length > 0) {
-            section = categoryFilter;
-        }
-
-        if (section.length > 1) {
-            $('#linkSuggestions').find('span').each(function () {
-                if ($(this).attr('class').indexOf('status_' + section) != -1) {
-                    useful_links++;
-                    $(this).css('display', '');
-                } else {
-                    $(this).css('display', 'none');
-                }
-            });
-        }
-
-        if (useful_links > 0) {
-            $('#linkSuggestions').css('display', '');
-        } else {
-            $('#linkSuggestions').css('display', 'none');
-        }
-
-        odd_row = false;
-        $('#serverstatusvariables').find('th.name').each(function () {
-            if ((textFilter === null || textFilter.exec($(this).text())) &&
-                (! alertFilter || $(this).next().find('span.attention').length > 0) &&
-                (categoryFilter.length === 0 || $(this).parent().hasClass('s_' + categoryFilter))
-            ) {
-                odd_row = ! odd_row;
-                $(this).parent().css('display', '');
-                if (odd_row) {
-                    $(this).parent().addClass('odd');
-                    $(this).parent().removeClass('even');
-                } else {
-                    $(this).parent().addClass('even');
-                    $(this).parent().removeClass('odd');
-                }
-            } else {
-                $(this).parent().css('display', 'none');
-            }
-        });
-    }
-});
diff --git a/#pma/js/server_user_groups.js b/#pma/js/server_user_groups.js
deleted file mode 100644
index 6cd2813a..00000000
--- a/#pma/js/server_user_groups.js
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * Unbind all event handlers before tearing down a page
- */
-AJAX.registerTeardown('server_user_groups.js', function () {
-    $(document).off('click', "a.deleteUserGroup.ajax");
-});
-
-/**
- * Bind event handlers
- */
-AJAX.registerOnload('server_user_groups.js', function () {
-
-    // update the checkall checkbox on Edit user group page
-    $(checkboxes_sel).trigger("change");
-
-    $(document).on('click', "a.deleteUserGroup.ajax", function (event) {
-        event.preventDefault();
-        var $link = $(this);
-        var groupName = $link.parents('tr').find('td:first').text();
-        var buttonOptions = {};
-        buttonOptions[PMA_messages.strGo] = function () {
-            $(this).dialog("close");
-            $link.removeClass('ajax').trigger('click');
-        };
-        buttonOptions[PMA_messages.strClose] = function () {
-            $(this).dialog("close");
-        };
-        $('<div/>')
-            .attr('id', 'confirmUserGroupDeleteDialog')
-            .append(PMA_sprintf(PMA_messages.strDropUserGroupWarning, escapeHtml(groupName)))
-            .dialog({
-                width: 300,
-                minWidth: 200,
-                modal: true,
-                buttons: buttonOptions,
-                title: PMA_messages.strConfirm,
-                close: function () {
-                    $(this).remove();
-                }
-            });
-    });
-});
diff --git a/#pma/js/server_variables.js b/#pma/js/server_variables.js
deleted file mode 100644
index 404e6f26..00000000
--- a/#pma/js/server_variables.js
+++ /dev/null
@@ -1,160 +0,0 @@
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-
-/**
- * Unbind all event handlers before tearing down a page
- */
-AJAX.registerTeardown('server_variables.js', function () {
-    $('#filterText').unbind('keyup');
-    $(document).off('click', 'a.editLink');
-    $('#serverVariables').find('.var-name').find('a img').remove();
-});
-
-AJAX.registerOnload('server_variables.js', function () {
-    var $editLink = $('a.editLink');
-    var $saveLink = $('a.saveLink');
-    var $cancelLink = $('a.cancelLink');
-    var $filterField = $('#filterText');
-
-
-    $('#serverVariables').find('.var-name').find('a').append(
-        $('#docImage').clone().show()
-    );
-
-    /* Launches the variable editor */
-    $(document).on('click', 'a.editLink', function (event) {
-        event.preventDefault();
-        editVariable(this);
-    });
-
-    /* Event handler for variables filter */
-    $filterField.keyup(function () {
-        var textFilter = null, val = $(this).val();
-        if (val.length !== 0) {
-            try {
-                textFilter = new RegExp("(^| )" + val.replace(/_/g, ' '), 'i');
-                $(this).removeClass('error');
-            } catch(e) {
-                if (e instanceof SyntaxError) {
-                    $(this).addClass('error');
-                    textFilter = null;
-                }
-            }
-        }
-        filterVariables(textFilter);
-    });
-
-    /* Trigger filtering of the list based on incoming variable name */
-    if ($filterField.val()) {
-        $filterField.trigger('keyup').select();
-    }
-
-    /* Filters the rows by the user given regexp */
-    function filterVariables(textFilter) {
-        var mark_next = false, $row, odd_row = false;
-        $('#serverVariables').find('.var-row').not('.var-header').each(function () {
-            $row = $(this);
-            if (mark_next || textFilter === null ||
-                textFilter.exec($row.find('.var-name').text())
-            ) {
-                // If current global value is different from session value
-                // (has class diffSession), then display that one too
-                mark_next = $row.hasClass('diffSession') && ! mark_next;
-
-                odd_row = ! odd_row;
-                $row.css('display', '');
-                if (odd_row) {
-                    $row.addClass('odd').removeClass('even');
-                } else {
-                    $row.addClass('even').removeClass('odd');
-                }
-            } else {
-                $row.css('display', 'none');
-            }
-        });
-    }
-
-    /* Allows the user to edit a server variable */
-    function editVariable(link) {
-        var $link = $(link);
-        var $cell = $link.parent();
-        var $valueCell = $link.parents('.var-row').find('.var-value');
-        var varName = $link.data('variable');
-        var $mySaveLink = $saveLink.clone().show();
-        var $myCancelLink = $cancelLink.clone().show();
-        var $msgbox = PMA_ajaxShowMessage();
-        var $myEditLink = $cell.find('a.editLink');
-
-        $cell.addClass('edit'); // variable is being edited
-        $myEditLink.remove(); // remove edit link
-
-        $mySaveLink.click(function () {
-            var $msgbox = PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
-            $.post($(this).attr('href'), {
-                    ajax_request: true,
-                    type: 'setval',
-                    varName: varName,
-                    varValue: $valueCell.find('input').val()
-                }, function (data) {
-                    if (data.success) {
-                        $valueCell
-                            .html(data.variable)
-                            .data('content', data.variable);
-                        PMA_ajaxRemoveMessage($msgbox);
-                    } else {
-                        if (data.error == '') {
-                            PMA_ajaxShowMessage(PMA_messages.strRequestFailed, false);
-                        } else {
-                            PMA_ajaxShowMessage(data.error, false);
-                        }
-                        $valueCell.html($valueCell.data('content'));
-                    }
-                    $cell.removeClass('edit').html($myEditLink);
-                });
-            return false;
-        });
-
-        $myCancelLink.click(function () {
-            $valueCell.html($valueCell.data('content'));
-            $cell.removeClass('edit').html($myEditLink);
-            return false;
-        });
-
-        $.get($mySaveLink.attr('href'), {
-                ajax_request: true,
-                type: 'getval',
-                varName: varName
-            }, function (data) {
-                if (typeof data !== 'undefined' && data.success === true) {
-                    var $links = $('<div />')
-                        .append($myCancelLink)
-                        .append('&nbsp;&nbsp;&nbsp;')
-                        .append($mySaveLink);
-                    var $editor = $('<div />', {'class': 'serverVariableEditor'})
-                        .append(
-                            $('<div/>').append(
-                                $('<input />', {type: 'text'}).val(data.message)
-                            )
-                        );
-                    // Save and replace content
-                    $cell
-                    .html($links);
-                    $valueCell
-                    .data('content', $valueCell.html())
-                    .html($editor)
-                    .find('input')
-                    .focus()
-                    .keydown(function (event) { // Keyboard shortcuts
-                        if (event.keyCode === 13) { // Enter key
-                            $mySaveLink.trigger('click');
-                        } else if (event.keyCode === 27) { // Escape key
-                            $myCancelLink.trigger('click');
-                        }
-                    });
-                    PMA_ajaxRemoveMessage($msgbox);
-                } else {
-                    $cell.removeClass('edit').html($myEditLink);
-                    PMA_ajaxShowMessage(data.error);
-                }
-            });
-    }
-});
diff --git a/#pma/js/sprintf.js b/#pma/js/sprintf.js
deleted file mode 100644
index 56291d51..00000000
--- a/#pma/js/sprintf.js
+++ /dev/null
@@ -1,211 +0,0 @@
-function sprintf() {
-/*
- * Copyright (c) 2013 Kevin van Zonneveld (http://kvz.io)
- * and Contributors (http://phpjs.org/authors)
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is furnished to do
- * so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
-*/
-  //  discuss at: http://phpjs.org/functions/sprintf/
-  // original by: Ash Searle (http://hexmen.com/blog/)
-  // improved by: Michael White (http://getsprink.com)
-  // improved by: Jack
-  // improved by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)
-  // improved by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)
-  // improved by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)
-  // improved by: Dj
-  // improved by: Allidylls
-  //    input by: Paulo Freitas
-  //    input by: Brett Zamir (http://brett-zamir.me)
-  //   example 1: sprintf("%01.2f", 123.1);
-  //   returns 1: 123.10
-  //   example 2: sprintf("[%10s]", 'monkey');
-  //   returns 2: '[    monkey]'
-  //   example 3: sprintf("[%'#10s]", 'monkey');
-  //   returns 3: '[####monkey]'
-  //   example 4: sprintf("%d", 123456789012345);
-  //   returns 4: '123456789012345'
-  //   example 5: sprintf('%-03s', 'E');
-  //   returns 5: 'E00'
-
-  var regex = /%%|%(\d+\$)?([-+\'#0 ]*)(\*\d+\$|\*|\d+)?(\.(\*\d+\$|\*|\d+))?([scboxXuideEfFgG])/g;
-  var a = arguments;
-  var i = 0;
-  var format = a[i++];
-
-  // pad()
-  var pad = function (str, len, chr, leftJustify) {
-    if (!chr) {
-      chr = ' ';
-    }
-    var padding = (str.length >= len) ? '' : new Array(1 + len - str.length >>> 0)
-      .join(chr);
-    return leftJustify ? str + padding : padding + str;
-  };
-
-  // justify()
-  var justify = function (value, prefix, leftJustify, minWidth, zeroPad, customPadChar) {
-    var diff = minWidth - value.length;
-    if (diff > 0) {
-      if (leftJustify || !zeroPad) {
-        value = pad(value, minWidth, customPadChar, leftJustify);
-      } else {
-        value = value.slice(0, prefix.length) + pad('', diff, '0', true) + value.slice(prefix.length);
-      }
-    }
-    return value;
-  };
-
-  // formatBaseX()
-  var formatBaseX = function (value, base, prefix, leftJustify, minWidth, precision, zeroPad) {
-    // Note: casts negative numbers to positive ones
-    var number = value >>> 0;
-    prefix = prefix && number && {
-      '2': '0b',
-      '8': '0',
-      '16': '0x'
-    }[base] || '';
-    value = prefix + pad(number.toString(base), precision || 0, '0', false);
-    return justify(value, prefix, leftJustify, minWidth, zeroPad);
-  };
-
-  // formatString()
-  var formatString = function (value, leftJustify, minWidth, precision, zeroPad, customPadChar) {
-    if (precision != null) {
-      value = value.slice(0, precision);
-    }
-    return justify(value, '', leftJustify, minWidth, zeroPad, customPadChar);
-  };
-
-  // doFormat()
-  var doFormat = function (substring, valueIndex, flags, minWidth, _, precision, type) {
-    var number, prefix, method, textTransform, value;
-
-    if (substring === '%%') {
-      return '%';
-    }
-
-    // parse flags
-    var leftJustify = false;
-    var positivePrefix = '';
-    var zeroPad = false;
-    var prefixBaseX = false;
-    var customPadChar = ' ';
-    var flagsl = flags.length;
-    for (var j = 0; flags && j < flagsl; j++) {
-      switch (flags.charAt(j)) {
-      case ' ':
-        positivePrefix = ' ';
-        break;
-      case '+':
-        positivePrefix = '+';
-        break;
-      case '-':
-        leftJustify = true;
-        break;
-      case "'":
-        customPadChar = flags.charAt(j + 1);
-        break;
-      case '0':
-        zeroPad = true;
-        customPadChar = '0';
-        break;
-      case '#':
-        prefixBaseX = true;
-        break;
-      }
-    }
-
-    // parameters may be null, undefined, empty-string or real valued
-    // we want to ignore null, undefined and empty-string values
-    if (!minWidth) {
-      minWidth = 0;
-    } else if (minWidth === '*') {
-      minWidth = +a[i++];
-    } else if (minWidth.charAt(0) == '*') {
-      minWidth = +a[minWidth.slice(1, -1)];
-    } else {
-      minWidth = +minWidth;
-    }
-
-    // Note: undocumented perl feature:
-    if (minWidth < 0) {
-      minWidth = -minWidth;
-      leftJustify = true;
-    }
-
-    if (!isFinite(minWidth)) {
-      throw new Error('sprintf: (minimum-)width must be finite');
-    }
-
-    if (!precision) {
-      precision = 'fFeE'.indexOf(type) > -1 ? 6 : (type === 'd') ? 0 : undefined;
-    } else if (precision === '*') {
-      precision = +a[i++];
-    } else if (precision.charAt(0) == '*') {
-      precision = +a[precision.slice(1, -1)];
-    } else {
-      precision = +precision;
-    }
-
-    // grab value using valueIndex if required?
-    value = valueIndex ? a[valueIndex.slice(0, -1)] : a[i++];
-
-    switch (type) {
-    case 's':
-      return formatString(String(value), leftJustify, minWidth, precision, zeroPad, customPadChar);
-    case 'c':
-      return formatString(String.fromCharCode(+value), leftJustify, minWidth, precision, zeroPad);
-    case 'b':
-      return formatBaseX(value, 2, prefixBaseX, leftJustify, minWidth, precision, zeroPad);
-    case 'o':
-      return formatBaseX(value, 8, prefixBaseX, leftJustify, minWidth, precision, zeroPad);
-    case 'x':
-      return formatBaseX(value, 16, prefixBaseX, leftJustify, minWidth, precision, zeroPad);
-    case 'X':
-      return formatBaseX(value, 16, prefixBaseX, leftJustify, minWidth, precision, zeroPad)
-        .toUpperCase();
-    case 'u':
-      return formatBaseX(value, 10, prefixBaseX, leftJustify, minWidth, precision, zeroPad);
-    case 'i':
-    case 'd':
-      number = +value || 0;
-      // Plain Math.round doesn't just truncate
-      number = Math.round(number - number % 1);
-      prefix = number < 0 ? '-' : positivePrefix;
-      value = prefix + pad(String(Math.abs(number)), precision, '0', false);
-      return justify(value, prefix, leftJustify, minWidth, zeroPad);
-    case 'e':
-    case 'E':
-    case 'f': // Should handle locales (as per setlocale)
-    case 'F':
-    case 'g':
-    case 'G':
-      number = +value;
-      prefix = number < 0 ? '-' : positivePrefix;
-      method = ['toExponential', 'toFixed', 'toPrecision']['efg'.indexOf(type.toLowerCase())];
-      textTransform = ['toString', 'toUpperCase']['eEfFgG'.indexOf(type) % 2];
-      value = prefix + Math.abs(number)[method](precision);
-      return justify(value, prefix, leftJustify, minWidth, zeroPad)[textTransform]();
-    default:
-      return substring;
-    }
-  };
-
-  return format.replace(regex, doFormat);
-}
diff --git a/#pma/js/sql.js b/#pma/js/sql.js
deleted file mode 100644
index c379420d..00000000
--- a/#pma/js/sql.js
+++ /dev/null
@@ -1,916 +0,0 @@
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * @fileoverview    functions used wherever an sql query form is used
- *
- * @requires    jQuery
- * @requires    js/functions.js
- *
- */
-
-var $data_a;
-var prevScrollX = 0;
-
-/**
- * decode a string URL_encoded
- *
- * @param string str
- * @return string the URL-decoded string
- */
-function PMA_urldecode(str)
-{
-    if (typeof str !== 'undefined') {
-        return decodeURIComponent(str.replace(/\+/g, '%20'));
-    }
-}
-
-/**
- * endecode a string URL_decoded
- *
- * @param string str
- * @return string the URL-encoded string
- */
-function PMA_urlencode(str)
-{
-    if (typeof str !== 'undefined') {
-        return encodeURIComponent(str).replace(/\%20/g, '+');
-    }
-}
-
-/**
- * Saves SQL query in local storage or cooie
- *
- * @param string SQL query
- * @return void
- */
-function PMA_autosaveSQL(query)
-{
-    if (query) {
-        if (isStorageSupported('localStorage')) {
-            window.localStorage.auto_saved_sql = query;
-        } else {
-            $.cookie('auto_saved_sql', query);
-        }
-    }
-}
-
-/**
- * Get the field name for the current field.  Required to construct the query
- * for grid editing
- *
- * @param $table_results enclosing results table
- * @param $this_field    jQuery object that points to the current field's tr
- */
-function getFieldName($table_results, $this_field)
-{
-
-    var this_field_index = $this_field.index();
-    // ltr or rtl direction does not impact how the DOM was generated
-    // check if the action column in the left exist
-    var left_action_exist = !$table_results.find('th:first').hasClass('draggable');
-    // number of column span for checkbox and Actions
-    var left_action_skip = left_action_exist ? $table_results.find('th:first').attr('colspan') - 1 : 0;
-
-    // If this column was sorted, the text of the a element contains something
-    // like <small>1</small> that is useful to indicate the order in case
-    // of a sort on multiple columns; however, we dont want this as part
-    // of the column name so we strip it ( .clone() to .end() )
-    var field_name = $table_results
-        .find('thead')
-        .find('th:eq(' + (this_field_index - left_action_skip) + ') a')
-        .clone()    // clone the element
-        .children() // select all the children
-        .remove()   // remove all of them
-        .end()      // go back to the selected element
-        .text();    // grab the text
-    // happens when just one row (headings contain no a)
-    if (field_name === '') {
-        var $heading = $table_results.find('thead').find('th:eq(' + (this_field_index - left_action_skip) + ')').children('span');
-        // may contain column comment enclosed in a span - detach it temporarily to read the column name
-        var $tempColComment = $heading.children().detach();
-        field_name = $heading.text();
-        // re-attach the column comment
-        $heading.append($tempColComment);
-    }
-
-    field_name = $.trim(field_name);
-
-    return field_name;
-}
-
-/**
- * Unbind all event handlers before tearing down a page
- */
-AJAX.registerTeardown('sql.js', function () {
-    $(document).off('click', 'a.delete_row.ajax');
-    $(document).off('submit', '.bookmarkQueryForm');
-    $('input#bkm_label').unbind('keyup');
-    $(document).off('makegrid', ".sqlqueryresults");
-    $(document).off('stickycolumns', ".sqlqueryresults");
-    $("#togglequerybox").unbind('click');
-    $(document).off('click', "#button_submit_query");
-    $(document).off('change', '#id_bookmark');
-    $("input[name=bookmark_variable]").unbind("keypress");
-    $(document).off('submit', "#sqlqueryform.ajax");
-    $(document).off('click', "input[name=navig].ajax");
-    $(document).off('submit', "form[name='displayOptionsForm'].ajax");
-    $(document).off('mouseenter', 'th.column_heading.pointer');
-    $(document).off('mouseleave', 'th.column_heading.pointer');
-    $(document).off('click', 'th.column_heading.marker');
-    $(window).unbind('scroll');
-    $(document).off("keyup", ".filter_rows");
-    $(document).off('click', "#printView");
-    if (codemirror_editor) {
-        codemirror_editor.off('change');
-    } else {
-        $('#sqlquery').off('input propertychange');
-    }
-    $('body').off('click', '.navigation .showAllRows');
-    $('body').off('click','a.browse_foreign');
-    $('body').off('click', '#simulate_dml');
-    $('body').off('keyup', '#sqlqueryform');
-    $('body').off('click', 'form[name="resultsForm"].ajax button[name="submit_mult"], form[name="resultsForm"].ajax input[name="submit_mult"]');
-});
-
-/**
- * @description <p>Ajax scripts for sql and browse pages</p>
- *
- * Actions ajaxified here:
- * <ul>
- * <li>Retrieve results of an SQL query</li>
- * <li>Paginate the results table</li>
- * <li>Sort the results table</li>
- * <li>Change table according to display options</li>
- * <li>Grid editing of data</li>
- * <li>Saving a bookmark</li>
- * </ul>
- *
- * @name        document.ready
- * @memberOf    jQuery
- */
-AJAX.registerOnload('sql.js', function () {
-
-    $(function () {
-        if (codemirror_editor) {
-            codemirror_editor.on('change', function () {
-                PMA_autosaveSQL(codemirror_editor.getValue());
-            });
-        } else {
-            $('#sqlquery').on('input propertychange', function () {
-                PMA_autosaveSQL($('#sqlquery').val());
-            });
-        }
-    });
-
-    // Delete row from SQL results
-    $(document).on('click', 'a.delete_row.ajax', function (e) {
-        e.preventDefault();
-        var question =  PMA_sprintf(PMA_messages.strDoYouReally, escapeHtml($(this).closest('td').find('div').text()));
-        var $link = $(this);
-        $link.PMA_confirm(question, $link.attr('href'), function (url) {
-            $msgbox = PMA_ajaxShowMessage();
-            if ($link.hasClass('formLinkSubmit')) {
-                submitFormLink($link);
-            } else {
-                $.post(url, {'ajax_request': true, 'is_js_confirmed': true}, function (data) {
-                    if (data.success) {
-                        PMA_ajaxShowMessage(data.message);
-                        $link.closest('tr').remove();
-                    } else {
-                        PMA_ajaxShowMessage(data.error, false);
-                    }
-                });
-            }
-        });
-    });
-
-    // Ajaxification for 'Bookmark this SQL query'
-    $(document).on('submit', '.bookmarkQueryForm', function (e) {
-        e.preventDefault();
-        PMA_ajaxShowMessage();
-        $.post($(this).attr('action'), 'ajax_request=1&' + $(this).serialize(), function (data) {
-            if (data.success) {
-                PMA_ajaxShowMessage(data.message);
-            } else {
-                PMA_ajaxShowMessage(data.error, false);
-            }
-        });
-    });
-
-    /* Hides the bookmarkoptions checkboxes when the bookmark label is empty */
-    $('input#bkm_label').keyup(function () {
-        $('input#id_bkm_all_users, input#id_bkm_replace')
-            .parent()
-            .toggle($(this).val().length > 0);
-    }).trigger('keyup');
-
-    /**
-     * Attach Event Handler for 'Copy to clipbpard
-     */
-    $(document).on('click', "#copyToClipBoard", function (event) {
-        event.preventDefault();
-
-        // Print the page
-        copyToClipboard();
-    }); //end of Copy to Clipboard action
-
-    /**
-     * Attach Event Handler for 'Print' link
-     */
-    $(document).on('click', "#printView", function (event) {
-        event.preventDefault();
-
-        // Take to preview mode
-        printPreview();
-    }); //end of 'Print' action
-
-    /**
-     * Attach the {@link makegrid} function to a custom event, which will be
-     * triggered manually everytime the table of results is reloaded
-     * @memberOf    jQuery
-     */
-    $(document).on('makegrid', ".sqlqueryresults", function () {
-        $('.table_results').each(function () {
-            PMA_makegrid(this);
-        });
-    });
-
-    /*
-     * Attach a custom event for sticky column headings which will be
-     * triggered manually everytime the table of results is reloaded
-     * @memberOf    jQuery
-     */
-    $(document).on('stickycolumns', ".sqlqueryresults", function () {
-        $(".sticky_columns").remove();
-        $(".table_results").each(function () {
-            var $table_results = $(this);
-            //add sticky columns div
-            var $stick_columns = initStickyColumns($table_results);
-            rearrangeStickyColumns($stick_columns, $table_results);
-            //adjust sticky columns on scroll
-            $(window).bind('scroll', function() {
-                handleStickyColumns($stick_columns, $table_results);
-            });
-        });
-    });
-
-    /**
-     * Append the "Show/Hide query box" message to the query input form
-     *
-     * @memberOf jQuery
-     * @name    appendToggleSpan
-     */
-    // do not add this link more than once
-    if (! $('#sqlqueryform').find('a').is('#togglequerybox')) {
-        $('<a id="togglequerybox"></a>')
-        .html(PMA_messages.strHideQueryBox)
-        .appendTo("#sqlqueryform")
-        // initially hidden because at this point, nothing else
-        // appears under the link
-        .hide();
-
-        // Attach the toggling of the query box visibility to a click
-        $("#togglequerybox").bind('click', function () {
-            var $link = $(this);
-            $link.siblings().slideToggle("fast");
-            if ($link.text() == PMA_messages.strHideQueryBox) {
-                $link.text(PMA_messages.strShowQueryBox);
-                // cheap trick to add a spacer between the menu tabs
-                // and "Show query box"; feel free to improve!
-                $('#togglequerybox_spacer').remove();
-                $link.before('<br id="togglequerybox_spacer" />');
-            } else {
-                $link.text(PMA_messages.strHideQueryBox);
-            }
-            // avoid default click action
-            return false;
-        });
-    }
-
-
-    /**
-     * Event handler for sqlqueryform.ajax button_submit_query
-     *
-     * @memberOf    jQuery
-     */
-    $(document).on('click', "#button_submit_query", function (event) {
-        $(".success,.error").hide();
-        //hide already existing error or success message
-        var $form = $(this).closest("form");
-        // the Go button related to query submission was clicked,
-        // instead of the one related to Bookmarks, so empty the
-        // id_bookmark selector to avoid misinterpretation in
-        // import.php about what needs to be done
-        $form.find("select[name=id_bookmark]").val("");
-        // let normal event propagation happen
-    });
-
-    /**
-     * Event handler to show appropiate number of variable boxes
-     * based on the bookmarked query
-     */
-    $(document).on('change', '#id_bookmark', function (event) {
-
-        var varCount = $(this).find('option:selected').data('varcount');
-        if (typeof varCount == 'undefined') {
-            varCount = 0;
-        }
-
-        var $varDiv = $('#bookmark_variables');
-        $varDiv.empty();
-        for (var i = 1; i <= varCount; i++) {
-            $varDiv.append($('<label for="bookmark_variable_' + i + '">' + PMA_sprintf(PMA_messages.strBookmarkVariable, i) + '</label>'));
-            $varDiv.append($('<input type="text" size="10" name="bookmark_variable[' + i + ']" id="bookmark_variable_' + i + '"></input>'));
-        }
-
-        if (varCount == 0) {
-            $varDiv.parent('.formelement').hide();
-        } else {
-            $varDiv.parent('.formelement').show();
-        }
-    });
-
-    /**
-     * Event handler for hitting enter on sqlqueryform bookmark_variable
-     * (the Variable textfield in Bookmarked SQL query section)
-     *
-     * @memberOf    jQuery
-     */
-    $("input[name=bookmark_variable]").bind("keypress", function (event) {
-        // force the 'Enter Key' to implicitly click the #button_submit_bookmark
-        var keycode = (event.keyCode ? event.keyCode : (event.which ? event.which : event.charCode));
-        if (keycode == 13) { // keycode for enter key
-            // When you press enter in the sqlqueryform, which
-            // has 2 submit buttons, the default is to run the
-            // #button_submit_query, because of the tabindex
-            // attribute.
-            // This submits #button_submit_bookmark instead,
-            // because when you are in the Bookmarked SQL query
-            // section and hit enter, you expect it to do the
-            // same action as the Go button in that section.
-            $("#button_submit_bookmark").click();
-            return false;
-        } else  {
-            return true;
-        }
-    });
-
-    /**
-     * Ajax Event handler for 'SQL Query Submit'
-     *
-     * @see         PMA_ajaxShowMessage()
-     * @memberOf    jQuery
-     * @name        sqlqueryform_submit
-     */
-    $(document).on('submit', "#sqlqueryform.ajax", function (event) {
-        event.preventDefault();
-
-        var $form = $(this);
-        if (codemirror_editor) {
-            $form[0].elements.sql_query.value = codemirror_editor.getValue();
-        }
-        if (! checkSqlQuery($form[0])) {
-            return false;
-        }
-
-        // remove any div containing a previous error message
-        $('div.error').remove();
-
-        var $msgbox = PMA_ajaxShowMessage();
-        var $sqlqueryresultsouter = $('#sqlqueryresultsouter');
-
-        PMA_prepareForAjaxRequest($form);
-
-        $.post($form.attr('action'), $form.serialize() + '&ajax_page_request=true', function (data) {
-            if (typeof data !== 'undefined' && data.success === true) {
-                // success happens if the query returns rows or not
-
-                // show a message that stays on screen
-                if (typeof data.action_bookmark != 'undefined') {
-                    // view only
-                    if ('1' == data.action_bookmark) {
-                        $('#sqlquery').text(data.sql_query);
-                        // send to codemirror if possible
-                        setQuery(data.sql_query);
-                    }
-                    // delete
-                    if ('2' == data.action_bookmark) {
-                        $("#id_bookmark option[value='" + data.id_bookmark + "']").remove();
-                        // if there are no bookmarked queries now (only the empty option),
-                        // remove the bookmark section
-                        if ($('#id_bookmark option').length == 1) {
-                            $('#fieldsetBookmarkOptions').hide();
-                            $('#fieldsetBookmarkOptionsFooter').hide();
-                        }
-                    }
-                }
-                $sqlqueryresultsouter
-                    .show()
-                    .html(data.message);
-                PMA_highlightSQL($sqlqueryresultsouter);
-
-                if (data._menu) {
-                    if (history && history.pushState) {
-                        history.replaceState({
-                                menu : data._menu
-                            },
-                            null
-                        );
-                        AJAX.handleMenu.replace(data._menu);
-                    } else {
-                        PMA_MicroHistory.menus.replace(data._menu);
-                        PMA_MicroHistory.menus.add(data._menuHash, data._menu);
-                    }
-                } else if (data._menuHash) {
-                    if (! (history && history.pushState)) {
-                        PMA_MicroHistory.menus.replace(PMA_MicroHistory.menus.get(data._menuHash));
-                    }
-                }
-
-                if (data._params) {
-                    PMA_commonParams.setAll(data._params);
-                }
-
-                if (typeof data.ajax_reload != 'undefined') {
-                    if (data.ajax_reload.reload) {
-                        if (data.ajax_reload.table_name) {
-                            PMA_commonParams.set('table', data.ajax_reload.table_name);
-                            PMA_commonActions.refreshMain();
-                        } else {
-                            PMA_reloadNavigation();
-                        }
-                    }
-                } else if (typeof data.reload != 'undefined') {
-                    // this happens if a USE or DROP command was typed
-                    PMA_commonActions.setDb(data.db);
-                    var url;
-                    if (data.db) {
-                        if (data.table) {
-                            url = 'table_sql.php';
-                        } else {
-                            url = 'db_sql.php';
-                        }
-                    } else {
-                        url = 'server_sql.php';
-                    }
-                    PMA_commonActions.refreshMain(url, function () {
-                        $('#sqlqueryresultsouter')
-                            .show()
-                            .html(data.message);
-                        PMA_highlightSQL($('#sqlqueryresultsouter'));
-                    });
-                }
-
-                $('.sqlqueryresults').trigger('makegrid').trigger('stickycolumns');
-                $('#togglequerybox').show();
-                PMA_init_slider();
-
-                if (typeof data.action_bookmark == 'undefined') {
-                    if ($('#sqlqueryform input[name="retain_query_box"]').is(':checked') !== true) {
-                        if ($("#togglequerybox").siblings(":visible").length > 0) {
-                            $("#togglequerybox").trigger('click');
-                        }
-                    }
-                }
-            } else if (typeof data !== 'undefined' && data.success === false) {
-                // show an error message that stays on screen
-                $sqlqueryresultsouter
-                    .show()
-                    .html(data.error);
-            }
-            PMA_ajaxRemoveMessage($msgbox);
-        }); // end $.post()
-    }); // end SQL Query submit
-
-    /**
-     * Ajax Event handler for the display options
-     * @memberOf    jQuery
-     * @name        displayOptionsForm_submit
-     */
-    $(document).on('submit', "form[name='displayOptionsForm'].ajax", function (event) {
-        event.preventDefault();
-
-        $form = $(this);
-
-        var $msgbox = PMA_ajaxShowMessage();
-        $.post($form.attr('action'), $form.serialize() + '&ajax_request=true', function (data) {
-            PMA_ajaxRemoveMessage($msgbox);
-            var $sqlqueryresults = $form.parents(".sqlqueryresults");
-            $sqlqueryresults
-             .html(data.message)
-             .trigger('makegrid')
-             .trigger('stickycolumns');
-            PMA_init_slider();
-            PMA_highlightSQL($sqlqueryresults);
-        }); // end $.post()
-    }); //end displayOptionsForm handler
-
-    // Filter row handling. --STARTS--
-    $(document).on("keyup", ".filter_rows", function () {
-        var unique_id = $(this).data("for");
-        var $target_table = $(".table_results[data-uniqueId='" + unique_id + "']");
-        var $header_cells = $target_table.find("th[data-column]");
-        var target_columns = Array();
-        // To handle colspan=4, in case of edit,copy etc options.
-        var dummy_th = ($(".edit_row_anchor").length !== 0 ?
-            '<th class="hide dummy_th"></th><th class="hide dummy_th"></th><th class="hide dummy_th"></th>'
-            : '');
-        // Selecting columns that will be considered for filtering and searching.
-        $header_cells.each(function () {
-            target_columns.push($.trim($(this).text()));
-        });
-
-        var phrase = $(this).val();
-        // Set same value to both Filter rows fields.
-        $(".filter_rows[data-for='" + unique_id + "']").not(this).val(phrase);
-        // Handle colspan.
-        $target_table.find("thead > tr").prepend(dummy_th);
-        $.uiTableFilter($target_table, phrase, target_columns);
-        $target_table.find("th.dummy_th").remove();
-    });
-    // Filter row handling. --ENDS--
-
-    // Prompt to confirm on Show All
-    $('body').on('click', '.navigation .showAllRows', function (e) {
-        e.preventDefault();
-        var $form = $(this).parents('form');
-
-        if (! $(this).is(':checked')) { // already showing all rows
-            submitShowAllForm();
-        } else {
-            $form.PMA_confirm(PMA_messages.strShowAllRowsWarning, $form.attr('action'), function (url) {
-                submitShowAllForm();
-            });
-        }
-
-        function submitShowAllForm() {
-            var submitData = $form.serialize() + '&ajax_request=true&ajax_page_request=true';
-            PMA_ajaxShowMessage();
-            AJAX.source = $form;
-            $.post($form.attr('action'), submitData, AJAX.responseHandler);
-        }
-    });
-
-    $('body').on('keyup', '#sqlqueryform', function () {
-        PMA_handleSimulateQueryButton();
-    });
-
-    /**
-     * Ajax event handler for 'Simulate DML'.
-     */
-    $('body').on('click', '#simulate_dml', function () {
-        var $form = $('#sqlqueryform');
-        var query = '';
-        var delimiter = $('#id_sql_delimiter').val();
-        var db_name = $form.find('input[name="db"]').val();
-
-        if (codemirror_editor) {
-            query = codemirror_editor.getValue();
-        } else {
-            query = $('#sqlquery').val();
-        }
-
-        if (query.length === 0) {
-            alert(PMA_messages.strFormEmpty);
-            $('#sqlquery').focus();
-            return false;
-        }
-
-        var $msgbox = PMA_ajaxShowMessage();
-        $.ajax({
-            type: 'POST',
-            url: $form.attr('action'),
-            data: {
-                token: $form.find('input[name="token"]').val(),
-                db: db_name,
-                ajax_request: '1',
-                simulate_dml: '1',
-                sql_query: query,
-                sql_delimiter: delimiter
-            },
-            success: function (response) {
-                PMA_ajaxRemoveMessage($msgbox);
-                if (response.success) {
-                    var dialog_content = '<div class="preview_sql">';
-                    if (response.sql_data) {
-                        var len = response.sql_data.length;
-                        for (var i=0; i<len; i++) {
-                            dialog_content += '<strong>' + PMA_messages.strSQLQuery +
-                                '</strong>' + response.sql_data[i].sql_query +
-                                PMA_messages.strMatchedRows +
-                                ' <a href="' + response.sql_data[i].matched_rows_url +
-                                '">' + response.sql_data[i].matched_rows + '</a><br>';
-                            if (i<len-1) {
-                                dialog_content += '<hr>';
-                            }
-                        }
-                    } else {
-                        dialog_content += response.message;
-                    }
-                    dialog_content += '</div>';
-                    var $dialog_content = $(dialog_content);
-                    var button_options = {};
-                    button_options[PMA_messages.strClose] = function () {
-                        $(this).dialog('close');
-                    };
-                    var $response_dialog = $('<div />').append($dialog_content).dialog({
-                        minWidth: 540,
-                        maxHeight: 400,
-                        modal: true,
-                        buttons: button_options,
-                        title: PMA_messages.strSimulateDML,
-                        open: function () {
-                            PMA_highlightSQL($(this));
-                        },
-                        close: function () {
-                            $(this).remove();
-                        }
-                    });
-                } else {
-                    PMA_ajaxShowMessage(response.error);
-                }
-            },
-            error: function (response) {
-                PMA_ajaxShowMessage(PMA_messages.strErrorProcessingRequest);
-            }
-        });
-    });
-
-    /**
-     * Handles multi submits of results browsing page such as edit, delete and export
-     */
-    $('body').on('click', 'form[name="resultsForm"].ajax button[name="submit_mult"], form[name="resultsForm"].ajax input[name="submit_mult"]', function (e) {
-        e.preventDefault();
-        var $button = $(this);
-        var $form = $button.closest('form');
-        var submitData = $form.serialize() + '&ajax_request=true&ajax_page_request=true&submit_mult=' + $button.val();
-        PMA_ajaxShowMessage();
-        AJAX.source = $form;
-        $.post($form.attr('action'), submitData, AJAX.responseHandler);
-    });
-}); // end $()
-
-/**
- * Starting from some th, change the class of all td under it.
- * If isAddClass is specified, it will be used to determine whether to add or remove the class.
- */
-function PMA_changeClassForColumn($this_th, newclass, isAddClass)
-{
-    // index 0 is the th containing the big T
-    var th_index = $this_th.index();
-    var has_big_t = $this_th.closest('tr').children(':first').hasClass('column_action');
-    // .eq() is zero-based
-    if (has_big_t) {
-        th_index--;
-    }
-    var $table = $this_th.parents('.table_results');
-    if (! $table.length) {
-        $table = $this_th.parents('table').siblings('.table_results');
-    }
-    var $tds = $table.find('tbody tr').find('td.data:eq(' + th_index + ')');
-    if (isAddClass === undefined) {
-        $tds.toggleClass(newclass);
-    } else {
-        $tds.toggleClass(newclass, isAddClass);
-    }
-}
-
-/**
- * Handles browse foreign values modal dialog
- *
- * @param object $this_a reference to the browse foreign value link
- */
-function browseForeignDialog($this_a)
-{
-    var formId = '#browse_foreign_form';
-    var showAllId = '#foreign_showAll';
-    var tableId = '#browse_foreign_table';
-    var filterId = '#input_foreign_filter';
-    var $dialog = null;
-    $.get($this_a.attr('href'), {'ajax_request': true}, function (data) {
-        // Creates browse foreign value dialog
-        $dialog = $('<div>').append(data.message).dialog({
-            title: PMA_messages.strBrowseForeignValues,
-            width: Math.min($(window).width() - 100, 700),
-            maxHeight: $(window).height() - 100,
-            dialogClass: 'browse_foreign_modal',
-            close: function (ev, ui) {
-                // remove event handlers attached to elements related to dialog
-                $(tableId).off('click', 'td a.foreign_value');
-                $(formId).off('click', showAllId);
-                $(formId).off('submit');
-                // remove dialog itself
-                $(this).remove();
-            },
-            modal: true
-        });
-    }).done(function () {
-        var showAll = false;
-        $(tableId).on('click', 'td a.foreign_value', function (e) {
-            e.preventDefault();
-            var $input = $this_a.prev('input[type=text]');
-            // Check if input exists or get CEdit edit_box
-            if ($input.length === 0 ) {
-                $input = $this_a.closest('.edit_area').prev('.edit_box');
-            }
-            // Set selected value as input value
-            $input.val($(this).data('key'));
-            $dialog.dialog('close');
-        });
-        $(formId).on('click', showAllId, function () {
-            showAll = true;
-        });
-        $(formId).on('submit', function (e) {
-            e.preventDefault();
-            // if filter value is not equal to old value
-            // then reset page number to 1
-            if ($(filterId).val() != $(filterId).data('old')) {
-                $(formId).find('select[name=pos]').val('0');
-            }
-            var postParams = $(this).serializeArray();
-            // if showAll button was clicked to submit form then
-            // add showAll button parameter to form
-            if (showAll) {
-                postParams.push({
-                    name: $(showAllId).attr('name'),
-                    value: $(showAllId).val()
-                });
-            }
-            // updates values in dialog
-            $.post($(this).attr('action') + '?ajax_request=1', postParams, function (data) {
-                var $obj = $('<div>').html(data.message);
-                $(formId).html($obj.find(formId).html());
-                $(tableId).html($obj.find(tableId).html());
-            });
-            showAll = false;
-        });
-    });
-}
-
-AJAX.registerOnload('sql.js', function () {
-    $('body').on('click', 'a.browse_foreign', function (e) {
-        e.preventDefault();
-        browseForeignDialog($(this));
-    });
-
-    /**
-     * vertical column highlighting in horizontal mode when hovering over the column header
-     */
-    $(document).on('mouseenter', 'th.column_heading.pointer', function (e) {
-        PMA_changeClassForColumn($(this), 'hover', true);
-    });
-    $(document).on('mouseleave', 'th.column_heading.pointer', function (e) {
-        PMA_changeClassForColumn($(this), 'hover', false);
-    });
-
-    /**
-     * vertical column marking in horizontal mode when clicking the column header
-     */
-    $(document).on('click', 'th.column_heading.marker', function () {
-        PMA_changeClassForColumn($(this), 'marked');
-    });
-
-    /**
-     * create resizable table
-     */
-    $(".sqlqueryresults").trigger('makegrid').trigger('stickycolumns');
-});
-
-/*
- * Profiling Chart
- */
-function makeProfilingChart()
-{
-    if ($('#profilingchart').length === 0 ||
-        $('#profilingchart').html().length !== 0 ||
-        !$.jqplot || !$.jqplot.Highlighter || !$.jqplot.PieRenderer
-    ) {
-        return;
-    }
-
-    var data = [];
-    $.each(jQuery.parseJSON($('#profilingChartData').html()), function (key, value) {
-        data.push([key, parseFloat(value)]);
-    });
-
-    // Remove chart and data divs contents
-    $('#profilingchart').html('').show();
-    $('#profilingChartData').html('');
-
-    PMA_createProfilingChart('profilingchart', data);
-}
-
-/*
- * initialize profiling data tables
- */
-function initProfilingTables()
-{
-    if (!$.tablesorter) {
-        return;
-    }
-
-    $('#profiletable').tablesorter({
-        widgets: ['zebra'],
-        sortList: [[0, 0]],
-        textExtraction: function (node) {
-            if (node.children.length > 0) {
-                return node.children[0].innerHTML;
-            } else {
-                return node.innerHTML;
-            }
-        }
-    });
-
-    $('#profilesummarytable').tablesorter({
-        widgets: ['zebra'],
-        sortList: [[1, 1]],
-        textExtraction: function (node) {
-            if (node.children.length > 0) {
-                return node.children[0].innerHTML;
-            } else {
-                return node.innerHTML;
-            }
-        }
-    });
-}
-
-/*
- * Set position, left, top, width of sticky_columns div
- */
-function setStickyColumnsPosition($sticky_columns, $table_results, position, top, left, margin_left) {
-    $sticky_columns
-        .css("position", position)
-        .css("top", top)
-        .css("left", left ? left : "auto")
-        .css("margin-left", margin_left ? margin_left : "0px")
-        .css("width", $table_results.width());
-}
-
-/*
- * Initialize sticky columns
- */
-function initStickyColumns($table_results) {
-    return $('<table class="sticky_columns"></table>')
-            .insertBefore($table_results)
-            .css("position", "fixed")
-            .css("z-index", "99")
-            .css("width", $table_results.width())
-            .css("margin-left", $('#page_content').css("margin-left"))
-            .css("top", $('#floating_menubar').height())
-            .css("display", "none");
-}
-
-/*
- * Arrange/Rearrange columns in sticky header
- */
-function rearrangeStickyColumns($sticky_columns, $table_results) {
-    var $originalHeader = $table_results.find("thead");
-    var $originalColumns = $originalHeader.find("tr:first").children();
-    var $clonedHeader = $originalHeader.clone();
-    // clone width per cell
-    $clonedHeader.find("tr:first").children().width(function(i,val) {
-        var width = $originalColumns.eq(i).width();
-        var is_firefox = navigator.userAgent.indexOf('Firefox') > -1;
-        if (! is_firefox) {
-            width += 1;
-        }
-        return width;
-    });
-    $sticky_columns.empty().append($clonedHeader);
-}
-
-/*
- * Adjust sticky columns on horizontal/vertical scroll for all tables
- */
-function handleAllStickyColumns() {
-    $('.sticky_columns').each(function () {
-        handleStickyColumns($(this), $(this).next('.table_results'));
-    });
-}
-
-/*
- * Adjust sticky columns on horizontal/vertical scroll
- */
-function handleStickyColumns($sticky_columns, $table_results) {
-    var currentScrollX = $(window).scrollLeft();
-    var windowOffset = $(window).scrollTop();
-    var tableStartOffset = $table_results.offset().top;
-    var tableEndOffset = tableStartOffset + $table_results.height();
-    if (windowOffset >= tableStartOffset && windowOffset <= tableEndOffset) {
-        //for horizontal scrolling
-        if(prevScrollX != currentScrollX) {
-            prevScrollX = currentScrollX;
-            setStickyColumnsPosition($sticky_columns, $table_results, "absolute", $('#floating_menubar').height() + windowOffset - tableStartOffset);
-        //for vertical scrolling
-        } else {
-            setStickyColumnsPosition($sticky_columns, $table_results, "fixed", $('#floating_menubar').height(), $("#pma_navigation").width() - currentScrollX, $('#page_content').css("margin-left"));
-        }
-        $sticky_columns.show();
-    } else {
-        $sticky_columns.hide();
-    }
-}
-
-AJAX.registerOnload('sql.js', function () {
-    makeProfilingChart();
-    initProfilingTables();
-});
diff --git a/#pma/js/tbl_change.js b/#pma/js/tbl_change.js
deleted file mode 100644
index 99914f52..00000000
--- a/#pma/js/tbl_change.js
+++ /dev/null
@@ -1,725 +0,0 @@
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * @fileoverview    function used in table data manipulation pages
- *
- * @requires    jQuery
- * @requires    jQueryUI
- * @requires    js/functions.js
- *
- */
-
-/**
- * Modify form controls when the "NULL" checkbox is checked
- *
- * @param theType     string   the MySQL field type
- * @param urlField    string   the urlencoded field name - OBSOLETE
- * @param md5Field    string   the md5 hashed field name
- * @param multi_edit  string   the multi_edit row sequence number
- *
- * @return boolean  always true
- */
-function nullify(theType, urlField, md5Field, multi_edit)
-{
-    var rowForm = document.forms.insertForm;
-
-    if (typeof(rowForm.elements['funcs' + multi_edit + '[' + md5Field + ']']) != 'undefined') {
-        rowForm.elements['funcs' + multi_edit + '[' + md5Field + ']'].selectedIndex = -1;
-    }
-
-    // "ENUM" field with more than 20 characters
-    if (theType == 1) {
-        rowForm.elements['fields' + multi_edit + '[' + md5Field +  ']'][1].selectedIndex = -1;
-    }
-    // Other "ENUM" field
-    else if (theType == 2) {
-        var elts     = rowForm.elements['fields' + multi_edit + '[' + md5Field + ']'];
-        // when there is just one option in ENUM:
-        if (elts.checked) {
-            elts.checked = false;
-        } else {
-            var elts_cnt = elts.length;
-            for (var i = 0; i < elts_cnt; i++) {
-                elts[i].checked = false;
-            } // end for
-
-        } // end if
-    }
-    // "SET" field
-    else if (theType == 3) {
-        rowForm.elements['fields' + multi_edit + '[' + md5Field +  '][]'].selectedIndex = -1;
-    }
-    // Foreign key field (drop-down)
-    else if (theType == 4) {
-        rowForm.elements['fields' + multi_edit + '[' + md5Field +  ']'].selectedIndex = -1;
-    }
-    // foreign key field (with browsing icon for foreign values)
-    else if (theType == 6) {
-        rowForm.elements['fields' + multi_edit + '[' + md5Field + ']'].value = '';
-    }
-    // Other field types
-    else /*if (theType == 5)*/ {
-        rowForm.elements['fields' + multi_edit + '[' + md5Field + ']'].value = '';
-    } // end if... else if... else
-
-    return true;
-} // end of the 'nullify()' function
-
-
-/**
- * javascript DateTime format validation.
- * its used to prevent adding default (0000-00-00 00:00:00) to database when user enter wrong values
- * Start of validation part
- */
-//function checks the number of days in febuary
-function daysInFebruary(year)
-{
-    return (((year % 4 === 0) && (((year % 100 !== 0)) || (year % 400 === 0))) ? 29 : 28);
-}
-//function to convert single digit to double digit
-function fractionReplace(num)
-{
-    num = parseInt(num, 10);
-    return num >= 1 && num <= 9 ? '0' + num : '00';
-}
-
-/* function to check the validity of date
-* The following patterns are accepted in this validation (accepted in mysql as well)
-* 1) 2001-12-23
-* 2) 2001-1-2
-* 3) 02-12-23
-* 4) And instead of using '-' the following punctuations can be used (+,.,*,^,@,/) All these are accepted by mysql as well. Therefore no issues
-*/
-function isDate(val, tmstmp)
-{
-    val = val.replace(/[.|*|^|+|//|@]/g, '-');
-    var arrayVal = val.split("-");
-    for (var a = 0; a < arrayVal.length; a++) {
-        if (arrayVal[a].length == 1) {
-            arrayVal[a] = fractionReplace(arrayVal[a]);
-        }
-    }
-    val = arrayVal.join("-");
-    var pos = 2;
-    var dtexp = new RegExp(/^([0-9]{4})-(((01|03|05|07|08|10|12)-((0[0-9])|([1-2][0-9])|(3[0-1])))|((02|04|06|09|11)-((0[0-9])|([1-2][0-9])|30))|((00)-(00)))$/);
-    if (val.length == 8) {
-        pos = 0;
-    }
-    if (dtexp.test(val)) {
-        var month = parseInt(val.substring(pos + 3, pos + 5), 10);
-        var day = parseInt(val.substring(pos + 6, pos + 8), 10);
-        var year = parseInt(val.substring(0, pos + 2), 10);
-        if (month == 2 && day > daysInFebruary(year)) {
-            return false;
-        }
-        if (val.substring(0, pos + 2).length == 2) {
-            year = parseInt("20" + val.substring(0, pos + 2), 10);
-        }
-        if (tmstmp === true) {
-            if (year < 1978) {
-                return false;
-            }
-            if (year > 2038 || (year > 2037 && day > 19 && month >= 1) || (year > 2037 && month > 1)) {
-                return false;
-            }
-        }
-    } else {
-        return false;
-    }
-    return true;
-}
-
-/* function to check the validity of time
-* The following patterns are accepted in this validation (accepted in mysql as well)
-* 1) 2:3:4
-* 2) 2:23:43
-* 3) 2:23:43.123456
-*/
-function isTime(val)
-{
-    var arrayVal = val.split(":");
-    for (var a = 0, l = arrayVal.length; a < l; a++) {
-        if (arrayVal[a].length == 1) {
-            arrayVal[a] = fractionReplace(arrayVal[a]);
-        }
-    }
-    val = arrayVal.join(":");
-    var tmexp = new RegExp(/^(-)?(([0-7]?[0-9][0-9])|(8[0-2][0-9])|(83[0-8])):((0[0-9])|([1-5][0-9])):((0[0-9])|([1-5][0-9]))(\.[0-9]{1,6}){0,1}$/);
-    return tmexp.test(val);
-}
-
-/**
- * To check whether insert section is ignored or not
- */
-function checkForCheckbox(multi_edit)
-{
-    if($("#insert_ignore_"+multi_edit).length) {
-        return $("#insert_ignore_"+multi_edit).is(":unchecked");
-    }
-    return true;
-}
-
-function verificationsAfterFieldChange(urlField, multi_edit, theType)
-{
-    var evt = window.event || arguments.callee.caller.arguments[0];
-    var target = evt.target || evt.srcElement;
-    var $this_input = $(":input[name^='fields[multi_edit][" + multi_edit + "][" +
-        urlField + "]']");
-    // the function drop-down that corresponds to this input field
-    var $this_function = $("select[name='funcs[multi_edit][" + multi_edit + "][" +
-        urlField + "]']");
-    var function_selected = false;
-    if (typeof $this_function.val() !== 'undefined' &&
-        $this_function.val() !== null &&
-        $this_function.val().length > 0
-    ) {
-        function_selected = true;
-    }
-
-    //To generate the textbox that can take the salt
-    var new_salt_box = "<br><input type=text name=salt[multi_edit][" + multi_edit + "][" + urlField + "]" +
-        " id=salt_" + target.id + " placeholder='" + PMA_messages.strEncryptionKey + "'>";
-
-    //If encrypting or decrypting functions that take salt as input is selected append the new textbox for salt
-    if (target.value === 'AES_ENCRYPT' ||
-            target.value === 'AES_DECRYPT' ||
-            target.value === 'DES_ENCRYPT' ||
-            target.value === 'DES_DECRYPT' ||
-            target.value === 'ENCRYPT') {
-        if (!($("#salt_" + target.id).length)) {
-            $this_input.after(new_salt_box);
-        }
-    } else {
-        //Remove the textbox for salt
-        $('#salt_' + target.id).prev('br').remove();
-        $("#salt_" + target.id).remove();
-    }
-
-    if (target.value === 'AES_DECRYPT'
-            || target.value === 'AES_ENCRYPT'
-            || target.value === 'MD5') {
-        $('#' + target.id).rules("add", {
-            validationFunctionForFuns: {
-                param: $this_input,
-                depends: function() {
-                    return checkForCheckbox(multi_edit);
-                }
-            }
-        });
-    }
-
-    // Unchecks the corresponding "NULL" control
-    $("input[name='fields_null[multi_edit][" + multi_edit + "][" + urlField + "]']").prop('checked', false);
-
-    // Unchecks the Ignore checkbox for the current row
-    $("input[name='insert_ignore_" + multi_edit + "']").prop('checked', false);
-
-    var charExceptionHandling;
-    if (theType.substring(0,4) === "char") {
-        charExceptionHandling = theType.substring(5,6);
-    }
-    else if (theType.substring(0,7) === "varchar") {
-        charExceptionHandling = theType.substring(8,9);
-    }
-    if (function_selected) {
-        $this_input.removeAttr('min');
-        $this_input.removeAttr('max');
-        // @todo: put back attributes if corresponding function is deselected
-    }
-
-    if ($this_input.data('rulesadded') == null && ! function_selected) {
-
-        //call validate before adding rules
-        $($this_input[0].form).validate();
-        // validate for date time
-        if (theType == "datetime" || theType == "time" || theType == "date" || theType == "timestamp") {
-            $this_input.rules("add", {
-                validationFunctionForDateTime: {
-                    param: theType,
-                    depends: function() {
-                        return checkForCheckbox(multi_edit);
-                    }
-                }
-            });
-        }
-        //validation for integer type
-        if ($this_input.data('type') === 'INT') {
-            var mini = parseInt($this_input.attr('min'));
-            var maxi = parseInt($this_input.attr('max'));
-            $this_input.rules("add", {
-                number: {
-                    param : true,
-                    depends: function() {
-                        return checkForCheckbox(multi_edit);
-                    }
-                },
-                min: {
-                    param: mini,
-                    depends: function() {
-                        if (isNaN($this_input.val())) {
-                            return false;
-                        } else {
-                            return checkForCheckbox(multi_edit);
-                        }
-                    }
-                },
-                max: {
-                    param: maxi,
-                    depends: function() {
-                        if (isNaN($this_input.val())) {
-                            return false;
-                        } else {
-                            return checkForCheckbox(multi_edit);
-                        }
-                    }
-                }
-            });
-            //validation for CHAR types
-        } else if ($this_input.data('type') === 'CHAR') {
-            var maxlen = $this_input.data('maxlength');
-            if (typeof maxlen !== 'undefined') {
-                if (maxlen <=4) {
-                    maxlen=charExceptionHandling;
-                }
-                $this_input.rules("add", {
-                    maxlength: {
-                        param: maxlen,
-                        depends: function() {
-                            return checkForCheckbox(multi_edit);
-                        }
-                    }
-                });
-            }
-            // validate binary & blob types
-        } else if ($this_input.data('type') === 'HEX') {
-            $this_input.rules("add", {
-                validationFunctionForHex: {
-                    param: true,
-                    depends: function() {
-                        return checkForCheckbox(multi_edit);
-                    }
-                }
-            });
-        }
-        $this_input.data('rulesadded', true);
-    } else if ($this_input.data('rulesadded') == true && function_selected) {
-        // remove any rules added
-        $this_input.rules("remove");
-        // remove any error messages
-        $this_input
-            .removeClass('error')
-            .removeAttr('aria-invalid')
-            .siblings('.error')
-            .remove();
-        $this_input.data('rulesadded', null);
-    }
-}
-/* End of fields validation*/
-
-/**
- * Unbind all event handlers before tearing down a page
- */
-AJAX.registerTeardown('tbl_change.js', function () {
-    $(document).off('click', 'span.open_gis_editor');
-    $(document).off('click', "input[name^='insert_ignore_']");
-    $(document).off('click', "input[name='gis_data[save]']");
-    $(document).off('click', 'input.checkbox_null');
-    $('select[name="submit_type"]').unbind('change');
-    $(document).off('change', "#insert_rows");
-});
-
-/**
- * Ajax handlers for Change Table page
- *
- * Actions Ajaxified here:
- * Submit Data to be inserted into the table.
- * Restart insertion with 'N' rows.
- */
-AJAX.registerOnload('tbl_change.js', function () {
-
-    if($("#insertForm").length) {
-        // validate the comment form when it is submitted
-        $("#insertForm").validate();
-        jQuery.validator.addMethod("validationFunctionForHex", function(value, element) {
-            return value.match(/^[a-f0-9]*$/i) !== null;
-        });
-
-        jQuery.validator.addMethod("validationFunctionForFuns", function(value, element, options) {
-            if (value.substring(0, 3) === "AES" && options.data('type') !== 'HEX') {
-                return false;
-            }
-
-            return !(value.substring(0, 3) === "MD5" &&
-                typeof options.data('maxlength') !== 'undefined' &&
-                options.data('maxlength') < 32);
-        });
-
-        jQuery.validator.addMethod("validationFunctionForDateTime", function(value, element, options) {
-            var dt_value = value;
-            var theType = options;
-            if (theType == "date") {
-                return isDate(dt_value);
-
-            } else if (theType == "time") {
-                return isTime(dt_value);
-
-            } else if (theType == "datetime" || theType == "timestamp") {
-                var tmstmp = false;
-                dt_value = dt_value.trim();
-                if (dt_value == "CURRENT_TIMESTAMP") {
-                    return true;
-                }
-                if (theType == "timestamp") {
-                    tmstmp = true;
-                }
-                if (dt_value == "0000-00-00 00:00:00") {
-                    return true;
-                }
-                var dv = dt_value.indexOf(" ");
-                if (dv == -1) { // Only the date component, which is valid
-                    return isDate(dt_value, tmstmp);
-                }
-
-                return isDate(dt_value.substring(0, dv), tmstmp) &&
-                    isTime(dt_value.substring(dv + 1));
-            }
-        });
-        /*
-         * message extending script must be run
-         * after initiation of functions
-         */
-        extendingValidatorMessages();
-    }
-
-    $.datepicker.initialized = false;
-
-    $(document).on('click', 'span.open_gis_editor', function (event) {
-        event.preventDefault();
-
-        var $span = $(this);
-        // Current value
-        var value = $span.parent('td').children("input[type='text']").val();
-        // Field name
-        var field = $span.parents('tr').children('td:first').find("input[type='hidden']").val();
-        // Column type
-        var type = $span.parents('tr').find('span.column_type').text();
-        // Names of input field and null checkbox
-        var input_name = $span.parent('td').children("input[type='text']").attr('name');
-        //Token
-        var token = $("input[name='token']").val();
-
-        openGISEditor();
-        if (!gisEditorLoaded) {
-            loadJSAndGISEditor(value, field, type, input_name, token);
-        } else {
-            loadGISEditor(value, field, type, input_name, token);
-        }
-    });
-
-    /**
-     * Forced validation check of fields
-     */
-    $(document).on('click',"input[name^='insert_ignore_']", function (event) {
-        $("#insertForm").valid();
-    });
-
-    /**
-     * Uncheck the null checkbox as geometry data is placed on the input field
-     */
-    $(document).on('click', "input[name='gis_data[save]']", function (event) {
-        var input_name = $('form#gis_data_editor_form').find("input[name='input_name']").val();
-        var $null_checkbox = $("input[name='" + input_name + "']").parents('tr').find('.checkbox_null');
-        $null_checkbox.prop('checked', false);
-    });
-
-    /**
-     * Handles all current checkboxes for Null; this only takes care of the
-     * checkboxes on currently displayed rows as the rows generated by
-     * "Continue insertion" are handled in the "Continue insertion" code
-     *
-     */
-    $(document).on('click', 'input.checkbox_null', function () {
-        nullify(
-            // use hidden fields populated by tbl_change.php
-            $(this).siblings('.nullify_code').val(),
-            $(this).closest('tr').find('input:hidden').first().val(),
-            $(this).siblings('.hashed_field').val(),
-            $(this).siblings('.multi_edit').val()
-        );
-    });
-
-    /**
-     * Reset the auto_increment column to 0 when selecting any of the
-     * insert options in submit_type-dropdown. Only perform the reset
-     * when we are in edit-mode, and not in insert-mode(no previous value
-     * available).
-     */
-    $('select[name="submit_type"]').bind('change', function () {
-        var thisElemSubmitTypeVal = $(this).val();
-        var $table = $('table.insertRowTable');
-        var auto_increment_column = $table.find('input[name^="auto_increment"]');
-        auto_increment_column.each(function () {
-            var $thisElemAIField = $(this);
-            var thisElemName = $thisElemAIField.attr('name');
-
-            var prev_value_field = $table.find('input[name="' + thisElemName.replace('auto_increment', 'fields_prev') + '"]');
-            var value_field = $table.find('input[name="' + thisElemName.replace('auto_increment', 'fields') + '"]');
-            var previous_value = $(prev_value_field).val();
-            if (previous_value !== undefined) {
-                if (thisElemSubmitTypeVal == 'insert'
-                    || thisElemSubmitTypeVal == 'insertignore'
-                    || thisElemSubmitTypeVal == 'showinsert'
-                ) {
-                    $(value_field).val(0);
-                } else {
-                    $(value_field).val(previous_value);
-                }
-            }
-        });
-
-    });
-
-    /**
-     * Continue Insertion form
-     */
-    $(document).on('change', "#insert_rows", function (event) {
-        event.preventDefault();
-        /**
-         * @var columnCount   Number of number of columns table has.
-         */
-        var columnCount = $("table.insertRowTable:first").find("tr").has("input[name*='fields_name']").length;
-        /**
-         * @var curr_rows   Number of current insert rows already on page
-         */
-        var curr_rows = $("table.insertRowTable").length;
-        /**
-         * @var target_rows Number of rows the user wants
-         */
-        var target_rows = $("#insert_rows").val();
-
-        // remove all datepickers
-        $('input.datefield, input.datetimefield').each(function () {
-            $(this).datepicker('destroy');
-        });
-
-        if (curr_rows < target_rows) {
-
-            var tempIncrementIndex = function () {
-
-                var $this_element = $(this);
-                /**
-                 * Extract the index from the name attribute for all input/select fields and increment it
-                 * name is of format funcs[multi_edit][10][<long random string of alphanum chars>]
-                 */
-
-                /**
-                 * @var this_name   String containing name of the input/select elements
-                 */
-                var this_name = $this_element.attr('name');
-                /** split {@link this_name} at [10], so we have the parts that can be concatenated later */
-                var name_parts = this_name.split(/\[\d+\]/);
-                /** extract the [10] from  {@link name_parts} */
-                var old_row_index_string = this_name.match(/\[\d+\]/)[0];
-                /** extract 10 - had to split into two steps to accomodate double digits */
-                var old_row_index = parseInt(old_row_index_string.match(/\d+/)[0], 10);
-
-                /** calculate next index i.e. 11 */
-                new_row_index = old_row_index + 1;
-                /** generate the new name i.e. funcs[multi_edit][11][foobarbaz] */
-                var new_name = name_parts[0] + '[' + new_row_index + ']' + name_parts[1];
-
-                var hashed_field = name_parts[1].match(/\[(.+)\]/)[1];
-                $this_element.attr('name', new_name);
-
-                /** If element is select[name*='funcs'], update id */
-                if ($this_element.is("select[name*='funcs']")) {
-                    var this_id = $this_element.attr("id");
-                    var id_parts = this_id.split(/\_/);
-                    var old_id_index = id_parts[1];
-                    var prevSelectedValue = $("#field_" + old_id_index + "_1").val();
-                    var new_id_index = parseInt(old_id_index) + columnCount;
-                    var new_id = 'field_' + new_id_index + '_1';
-                    $this_element.attr('id', new_id);
-                    $this_element.find("option").filter(function () {
-                        return $(this).text() === prevSelectedValue;
-                    }).attr("selected","selected");
-
-                    // If salt field is there then update its id.
-                    var nextSaltInput = $this_element.parent().next("td").next("td").find("input[name*='salt']");
-                    if (nextSaltInput.length !== 0) {
-                        nextSaltInput.attr("id", "salt_" + new_id);
-                    }
-                }
-
-                // handle input text fields and textareas
-                if ($this_element.is('.textfield') || $this_element.is('.char') || $this_element.is('textarea')) {
-                    // do not remove the 'value' attribute for ENUM columns
-                    // special handling for radio fields after updating ids to unique - see below
-                    if ($this_element.closest('tr').find('span.column_type').html() != 'enum') {
-                        $this_element.val($this_element.closest('tr').find('span.default_value').html());
-                    }
-                    $this_element
-                        .unbind('change')
-                        // Remove onchange attribute that was placed
-                        // by tbl_change.php; it refers to the wrong row index
-                        .attr('onchange', null)
-                        // Keep these values to be used when the element
-                        // will change
-                        .data('hashed_field', hashed_field)
-                        .data('new_row_index', new_row_index)
-                        .bind('change', function () {
-                            var $changed_element = $(this);
-                            verificationsAfterFieldChange(
-                                $changed_element.data('hashed_field'),
-                                $changed_element.data('new_row_index'),
-                                $changed_element.closest('tr').find('span.column_type').html()
-                            );
-                        });
-                }
-
-                if ($this_element.is('.checkbox_null')) {
-                    $this_element
-                        // this event was bound earlier by jQuery but
-                        // to the original row, not the cloned one, so unbind()
-                        .unbind('click')
-                        // Keep these values to be used when the element
-                        // will be clicked
-                        .data('hashed_field', hashed_field)
-                        .data('new_row_index', new_row_index)
-                        .bind('click', function () {
-                            var $changed_element = $(this);
-                            nullify(
-                                $changed_element.siblings('.nullify_code').val(),
-                                $this_element.closest('tr').find('input:hidden').first().val(),
-                                $changed_element.data('hashed_field'),
-                                '[multi_edit][' + $changed_element.data('new_row_index') + ']'
-                            );
-                        });
-                }
-            };
-
-            var tempReplaceAnchor = function () {
-                var $anchor = $(this);
-                var new_value = 'rownumber=' + new_row_index;
-                // needs improvement in case something else inside
-                // the href contains this pattern
-                var new_href = $anchor.attr('href').replace(/rownumber=\d+/, new_value);
-                $anchor.attr('href', new_href);
-            };
-
-            while (curr_rows < target_rows) {
-
-                /**
-                 * @var $last_row    Object referring to the last row
-                 */
-                var $last_row = $("#insertForm").find(".insertRowTable:last");
-
-                // need to access this at more than one level
-                // (also needs improvement because it should be calculated
-                //  just once per cloned row, not once per column)
-                var new_row_index = 0;
-
-                //Clone the insert tables
-                $last_row
-                .clone(true, true)
-                .insertBefore("#actions_panel")
-                .find('input[name*=multi_edit],select[name*=multi_edit],textarea[name*=multi_edit]')
-                .each(tempIncrementIndex)
-                .end()
-                .find('.foreign_values_anchor')
-                .each(tempReplaceAnchor);
-
-                //Insert/Clone the ignore checkboxes
-                if (curr_rows == 1) {
-                    $('<input id="insert_ignore_1" type="checkbox" name="insert_ignore_1" checked="checked" />')
-                    .insertBefore("table.insertRowTable:last")
-                    .after('<label for="insert_ignore_1">' + PMA_messages.strIgnore + '</label>');
-                } else {
-
-                    /**
-                     * @var $last_checkbox   Object reference to the last checkbox in #insertForm
-                     */
-                    var $last_checkbox = $("#insertForm").children('input:checkbox:last');
-
-                    /** name of {@link $last_checkbox} */
-                    var last_checkbox_name = $last_checkbox.attr('name');
-                    /** index of {@link $last_checkbox} */
-                    var last_checkbox_index = parseInt(last_checkbox_name.match(/\d+/), 10);
-                    /** name of new {@link $last_checkbox} */
-                    var new_name = last_checkbox_name.replace(/\d+/, last_checkbox_index + 1);
-
-                    $('<br/><div class="clearfloat"></div>')
-                    .insertBefore("table.insertRowTable:last");
-
-                    $last_checkbox
-                    .clone()
-                    .attr({'id': new_name, 'name': new_name})
-                    .prop('checked', true)
-                    .insertBefore("table.insertRowTable:last");
-
-                    $('label[for^=insert_ignore]:last')
-                    .clone()
-                    .attr('for', new_name)
-                    .insertBefore("table.insertRowTable:last");
-
-                    $('<br/>')
-                    .insertBefore("table.insertRowTable:last");
-                }
-                curr_rows++;
-            }
-            // recompute tabindex for text fields and other controls at footer;
-            // IMO it's not really important to handle the tabindex for
-            // function and Null
-            var tabindex = 0;
-            $('.textfield, .char, textarea')
-            .each(function () {
-                tabindex++;
-                $(this).attr('tabindex', tabindex);
-                // update the IDs of textfields to ensure that they are unique
-                $(this).attr('id', "field_" + tabindex + "_3");
-
-                // special handling for radio fields after updating ids to unique
-                if ($(this).closest('tr').find('span.column_type').html() === 'enum') {
-                    if ($(this).val() === $(this).closest('tr').find('span.default_value').html()) {
-                        $(this).prop('checked', true);
-                    } else {
-                        $(this).prop('checked', false);
-                    }
-                }
-            });
-            $('.control_at_footer')
-            .each(function () {
-                tabindex++;
-                $(this).attr('tabindex', tabindex);
-            });
-        } else if (curr_rows > target_rows) {
-            while (curr_rows > target_rows) {
-                $("input[id^=insert_ignore]:last")
-                .nextUntil("fieldset")
-                .addBack()
-                .remove();
-                curr_rows--;
-            }
-        }
-        // Add all the required datepickers back
-        addDateTimePicker();
-    });
-});
-
-function changeValueFieldType(elem, searchIndex)
-{
-    var fieldsValue = $("select#fieldID_" + searchIndex);
-    if (0 === fieldsValue.size()) {
-        return;
-    }
-
-    var type = $(elem).val();
-    if ('IN (...)' == type ||
-        'NOT IN (...)' == type ||
-        'BETWEEN' == type ||
-        'NOT BETWEEN' == type
-    ) {
-        $("#fieldID_" + searchIndex).attr('multiple', '');
-    } else {
-        $("#fieldID_" + searchIndex).removeAttr('multiple');
-    }
-}
diff --git a/#pma/js/tbl_chart.js b/#pma/js/tbl_chart.js
deleted file mode 100644
index 41ff2964..00000000
--- a/#pma/js/tbl_chart.js
+++ /dev/null
@@ -1,415 +0,0 @@
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-
-var chart_data = {};
-var temp_chart_title;
-
-var currentChart = null;
-var currentSettings = null;
-
-var dateTimeCols = [];
-var numericCols = [];
-
-function extractDate(dateString) {
-    var matches, match;
-    var dateTimeRegExp = /[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}/;
-    var dateRegExp = /[0-9]{4}-[0-9]{2}-[0-9]{2}/;
-
-    matches = dateTimeRegExp.exec(dateString);
-    if (matches !== null && matches.length > 0) {
-        match = matches[0];
-        return new Date(match.substr(0, 4), parseInt(match.substr(5, 2), 10) - 1, match.substr(8, 2), match.substr(11, 2), match.substr(14, 2), match.substr(17, 2));
-    } else {
-        matches = dateRegExp.exec(dateString);
-        if (matches !== null && matches.length > 0) {
-            match = matches[0];
-            return new Date(match.substr(0, 4), parseInt(match.substr(5, 2), 10) - 1, match.substr(8, 2));
-        }
-    }
-    return null;
-}
-
-function PMA_queryChart(data, columnNames, settings) {
-    if ($('#querychart').length === 0) {
-        return;
-    }
-
-    var plotSettings = {
-        title : {
-            text : settings.title,
-            escapeHtml: true
-        },
-        grid : {
-            drawBorder : false,
-            shadow : false,
-            background : 'rgba(0,0,0,0)'
-        },
-        legend : {
-            show : true,
-            placement : 'outsideGrid',
-            location : 'e'
-        },
-        axes : {
-            xaxis : {
-                label : escapeHtml(settings.xaxisLabel)
-            },
-            yaxis : {
-                label : settings.yaxisLabel
-            }
-        },
-        stackSeries : settings.stackSeries
-    };
-
-    // create the chart
-    var factory = new JQPlotChartFactory();
-    var chart = factory.createChart(settings.type, "querychart");
-
-    // create the data table and add columns
-    var dataTable = new DataTable();
-    if (settings.type == 'timeline') {
-        dataTable.addColumn(ColumnType.DATE, columnNames[settings.mainAxis]);
-    } else if (settings.type == 'scatter') {
-        dataTable.addColumn(ColumnType.NUMBER, columnNames[settings.mainAxis]);
-    } else {
-        dataTable.addColumn(ColumnType.STRING, columnNames[settings.mainAxis]);
-    }
-
-    var i;
-    if (settings.seriesColumn === null) {
-        $.each(settings.selectedSeries, function (index, element) {
-            dataTable.addColumn(ColumnType.NUMBER, columnNames[element]);
-        });
-
-        // set data to the data table
-        var columnsToExtract = [ settings.mainAxis ];
-        $.each(settings.selectedSeries, function (index, element) {
-            columnsToExtract.push(element);
-        });
-        var values = [], newRow, row, col;
-        for (i = 0; i < data.length; i++) {
-            row = data[i];
-            newRow = [];
-            for (var j = 0; j < columnsToExtract.length; j++) {
-                col = columnNames[columnsToExtract[j]];
-                if (j === 0) {
-                    if (settings.type == 'timeline') { // first column is date type
-                        newRow.push(extractDate(row[col]));
-                    } else if (settings.type == 'scatter') {
-                        newRow.push(parseFloat(row[col]));
-                    } else { // first column is string type
-                        newRow.push(row[col]);
-                    }
-                } else { // subsequent columns are of type, number
-                    newRow.push(parseFloat(row[col]));
-                }
-            }
-            values.push(newRow);
-        }
-        dataTable.setData(values);
-    } else {
-        var seriesNames = {}, seriesNumber = 1;
-        var seriesColumnName = columnNames[settings.seriesColumn];
-        for (i = 0; i < data.length; i++) {
-            if (! seriesNames[data[i][seriesColumnName]]) {
-                seriesNames[data[i][seriesColumnName]] = seriesNumber;
-                seriesNumber++;
-            }
-        }
-
-        $.each(seriesNames, function (seriesName, seriesNumber) {
-            dataTable.addColumn(ColumnType.NUMBER, seriesName);
-        });
-
-        var valueMap = {}, xValue, value;
-        var mainAxisName = columnNames[settings.mainAxis];
-        var valueColumnName = columnNames[settings.valueColumn];
-        for (i = 0; i < data.length; i++) {
-            xValue = data[i][mainAxisName];
-            value = valueMap[xValue];
-            if (! value) {
-                value = [xValue];
-                valueMap[xValue] = value;
-            }
-            seriesNumber = seriesNames[data[i][seriesColumnName]];
-            value[seriesNumber] = parseFloat(data[i][valueColumnName]);
-        }
-
-        var values = [];
-        $.each(valueMap, function(index, value) {
-            values.push(value);
-        });
-        dataTable.setData(values);
-    }
-
-    // draw the chart and return the chart object
-    chart.draw(dataTable, plotSettings);
-    return chart;
-}
-
-function drawChart() {
-    currentSettings.width = $('#resizer').width() - 20;
-    currentSettings.height = $('#resizer').height() - 20;
-
-    // TODO: a better way using .redraw() ?
-    if (currentChart !== null) {
-        currentChart.destroy();
-    }
-
-    var columnNames = [];
-    $('select[name="chartXAxis"] option').each(function () {
-        columnNames.push(escapeHtml($(this).text()));
-    });
-    try {
-        currentChart = PMA_queryChart(chart_data, columnNames, currentSettings);
-        if (currentChart != null) {
-            $('#saveChart').attr('href', currentChart.toImageString());
-        }
-    } catch (err) {
-        PMA_ajaxShowMessage(err.message, false);
-    }
-}
-
-function getSelectedSeries() {
-    var val = $('select[name="chartSeries"]').val() || [];
-    var ret = [];
-    $.each(val, function (i, v) {
-        ret.push(parseInt(v, 10));
-    });
-    return ret;
-}
-
-function onXAxisChange() {
-    var $xAxisSelect = $('select[name="chartXAxis"]');
-    currentSettings.mainAxis = parseInt($xAxisSelect.val(), 10);
-    if (dateTimeCols.indexOf(currentSettings.mainAxis) != -1) {
-        $('span.span_timeline').show();
-    } else {
-        $('span.span_timeline').hide();
-        if (currentSettings.type == 'timeline') {
-            $('input#radio_line').prop('checked', true);
-            currentSettings.type = 'line';
-        }
-    }
-    if (numericCols.indexOf(currentSettings.mainAxis) != -1) {
-        $('span.span_scatter').show();
-    } else {
-        $('span.span_scatter').hide();
-        if (currentSettings.type == 'scatter') {
-            $('input#radio_line').prop('checked', true);
-            currentSettings.type = 'line';
-        }
-    }
-    var xaxis_title = $xAxisSelect.children('option:selected').text();
-    $('input[name="xaxis_label"]').val(xaxis_title);
-    currentSettings.xaxisLabel = xaxis_title;
-}
-
-function onDataSeriesChange() {
-    var $seriesSelect = $('select[name="chartSeries"]');
-    currentSettings.selectedSeries = getSelectedSeries();
-    var yaxis_title;
-    if (currentSettings.selectedSeries.length == 1) {
-        $('span.span_pie').show();
-        yaxis_title = $seriesSelect.children('option:selected').text();
-    } else {
-        $('span.span_pie').hide();
-        if (currentSettings.type == 'pie') {
-            $('input#radio_line').prop('checked', true);
-            currentSettings.type = 'line';
-        }
-        yaxis_title = PMA_messages.strYValues;
-    }
-    $('input[name="yaxis_label"]').val(yaxis_title);
-    currentSettings.yaxisLabel = yaxis_title;
-}
-
-/**
- * Unbind all event handlers before tearing down a page
- */
-AJAX.registerTeardown('tbl_chart.js', function () {
-    $('input[name="chartType"]').unbind('click');
-    $('input[name="barStacked"]').unbind('click');
-    $('input[name="chkAlternative"]').unbind('click');
-    $('input[name="chartTitle"]').unbind('focus').unbind('keyup').unbind('blur');
-    $('select[name="chartXAxis"]').unbind('change');
-    $('select[name="chartSeries"]').unbind('change');
-    $('select[name="chartSeriesColumn"]').unbind('change');
-    $('select[name="chartValueColumn"]').unbind('change');
-    $('input[name="xaxis_label"]').unbind('keyup');
-    $('input[name="yaxis_label"]').unbind('keyup');
-    $('#resizer').unbind('resizestop');
-    $('#tblchartform').unbind('submit');
-});
-
-AJAX.registerOnload('tbl_chart.js', function () {
-
-    // handle manual resize
-    $('#resizer').bind('resizestop', function (event, ui) {
-        // make room so that the handle will still appear
-        $('#querychart').height($('#resizer').height() * 0.96);
-        $('#querychart').width($('#resizer').width() * 0.96);
-        if (currentChart !== null) {
-            currentChart.redraw({
-                resetAxes : true
-            });
-        }
-    });
-
-    // handle chart type changes
-    $('input[name="chartType"]').click(function () {
-        var type = currentSettings.type = $(this).val();
-        if (type == 'bar' || type == 'column' || type == 'area') {
-            $('span.barStacked').show();
-        } else {
-            $('input[name="barStacked"]').prop('checked', false);
-            $.extend(true, currentSettings, {stackSeries : false});
-            $('span.barStacked').hide();
-        }
-        drawChart();
-    });
-
-    // handle chosing alternative data format
-    $('input[name="chkAlternative"]').click(function () {
-        var $seriesColumn = $('select[name="chartSeriesColumn"]');
-        var $valueColumn  = $('select[name="chartValueColumn"]');
-        var $chartSeries  = $('select[name="chartSeries"]');
-        if ($(this).is(':checked')) {
-            $seriesColumn.prop('disabled', false);
-            $valueColumn.prop('disabled', false);
-            $chartSeries.prop('disabled', true);
-            currentSettings.seriesColumn = parseInt($seriesColumn.val(), 10);
-            currentSettings.valueColumn = parseInt($valueColumn.val(), 10);
-        } else {
-            $seriesColumn.prop('disabled', true);
-            $valueColumn.prop('disabled', true);
-            $chartSeries.prop('disabled', false);
-            currentSettings.seriesColumn = null;
-            currentSettings.valueColumn = null;
-        }
-        drawChart();
-    });
-
-    // handle stacking for bar, column and area charts
-    $('input[name="barStacked"]').click(function () {
-        if ($(this).is(':checked')) {
-            $.extend(true, currentSettings, {stackSeries : true});
-        } else {
-            $.extend(true, currentSettings, {stackSeries : false});
-        }
-        drawChart();
-    });
-
-    // handle changes in chart title
-    $('input[name="chartTitle"]')
-    .focus(function () {
-        temp_chart_title = $(this).val();
-    })
-    .keyup(function () {
-        currentSettings.title = $('input[name="chartTitle"]').val();
-        drawChart();
-    })
-    .blur(function () {
-        if ($(this).val() != temp_chart_title) {
-            drawChart();
-        }
-    });
-
-    // handle changing the x-axis
-    $('select[name="chartXAxis"]').change(function () {
-        onXAxisChange();
-        drawChart();
-    });
-
-    // handle changing the selected data series
-    $('select[name="chartSeries"]').change(function () {
-        onDataSeriesChange();
-        drawChart();
-    });
-
-    // handle changing the series column
-    $('select[name="chartSeriesColumn"]').change(function () {
-        currentSettings.seriesColumn = parseInt($(this).val(), 10);
-        drawChart();
-    });
-
-    // handle changing the value column
-    $('select[name="chartValueColumn"]').change(function () {
-        currentSettings.valueColumn = parseInt($(this).val(), 10);
-        drawChart();
-    });
-
-    // handle manual changes to the chart x-axis labels
-    $('input[name="xaxis_label"]').keyup(function () {
-        currentSettings.xaxisLabel = $(this).val();
-        drawChart();
-    });
-
-    // handle manual changes to the chart y-axis labels
-    $('input[name="yaxis_label"]').keyup(function () {
-        currentSettings.yaxisLabel = $(this).val();
-        drawChart();
-    });
-
-    // handler for ajax form submission
-    $('#tblchartform').submit(function (event) {
-
-        var $form = $(this);
-        if (codemirror_editor) {
-            $form[0].elements.sql_query.value = codemirror_editor.getValue();
-        }
-        if (!checkSqlQuery($form[0])) {
-            return false;
-        }
-
-        var $msgbox = PMA_ajaxShowMessage();
-        PMA_prepareForAjaxRequest($form);
-        $.post($form.attr('action'), $form.serialize(), function (data) {
-            if (typeof data !== 'undefined' &&
-                    data.success === true &&
-                    typeof data.chartData !== 'undefined') {
-                chart_data = jQuery.parseJSON(data.chartData);
-                drawChart();
-                PMA_ajaxRemoveMessage($msgbox);
-            } else {
-                PMA_ajaxShowMessage(data.error, false);
-            }
-        }, "json"); // end $.post()
-
-        return false;
-    });
-
-    // from jQuery UI
-    $('#resizer').resizable({
-        minHeight: 240,
-        minWidth: 300
-    })
-    .width($('#div_view_options').width() - 50)
-    .trigger('resizestop');
-
-    currentSettings = {
-        type : 'line',
-        width : $('#resizer').width() - 20,
-        height : $('#resizer').height() - 20,
-        xaxisLabel : $('input[name="xaxis_label"]').val(),
-        yaxisLabel : $('input[name="yaxis_label"]').val(),
-        title : $('input[name="chartTitle"]').val(),
-        stackSeries : false,
-        mainAxis : parseInt($('select[name="chartXAxis"]').val(), 10),
-        selectedSeries : getSelectedSeries(),
-        seriesColumn : null
-    };
-
-    var vals = $('input[name="dateTimeCols"]').val().split(' ');
-    $.each(vals, function (i, v) {
-        dateTimeCols.push(parseInt(v, 10));
-    });
-
-    vals = $('input[name="numericCols"]').val().split(' ');
-    $.each(vals, function (i, v) {
-        numericCols.push(parseInt(v, 10));
-    });
-
-    onXAxisChange();
-    onDataSeriesChange();
-
-    $("#tblchartform").submit();
-});
diff --git a/#pma/js/tbl_find_replace.js b/#pma/js/tbl_find_replace.js
deleted file mode 100644
index c164bac2..00000000
--- a/#pma/js/tbl_find_replace.js
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * Unbind all event handlers before tearing down a page
- */
-AJAX.registerTeardown('tbl_find_replace.js', function () {
-    $('#find_replace_form').unbind('submit');
-    $('#toggle_find').unbind('click');
-});
-
-/**
- * Bind events
- */
-AJAX.registerOnload('tbl_find_replace.js', function () {
-
-    $('<div id="toggle_find_div"><a id="toggle_find"></a></div>')
-        .insertAfter('#find_replace_form')
-        .hide();
-
-    $('#toggle_find')
-        .html(PMA_messages.strHideFindNReplaceCriteria)
-        .click(function () {
-            var $link = $(this);
-            $('#find_replace_form').slideToggle();
-            if ($link.text() == PMA_messages.strHideFindNReplaceCriteria) {
-                $link.text(PMA_messages.strShowFindNReplaceCriteria);
-            } else {
-                $link.text(PMA_messages.strHideFindNReplaceCriteria);
-            }
-            return false;
-        });
-
-    $('#find_replace_form').submit(function (e) {
-        e.preventDefault();
-        var findReplaceForm = $('#find_replace_form');
-        PMA_prepareForAjaxRequest(findReplaceForm);
-        var $msgbox = PMA_ajaxShowMessage();
-        $.post(findReplaceForm.attr('action'), findReplaceForm.serialize(), function (data) {
-            PMA_ajaxRemoveMessage($msgbox);
-            if (data.success === true) {
-                $('#toggle_find_div').show();
-                $('#toggle_find').click();
-                $("#sqlqueryresultsouter").html(data.preview);
-            } else {
-                $("#sqlqueryresultsouter").html(data.error);
-            }
-        });
-    });
-});
diff --git a/#pma/js/tbl_gis_visualization.js b/#pma/js/tbl_gis_visualization.js
deleted file mode 100644
index f2216921..00000000
--- a/#pma/js/tbl_gis_visualization.js
+++ /dev/null
@@ -1,365 +0,0 @@
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * @fileoverview    functions used for visualizing GIS data
- *
- * @requires    jquery
- * @requires    jquery/jquery.svg.js
- * @requires    jquery/jquery.mousewheel.js
- * @requires    jquery/jquery.event.drag-2.2.js
- */
-
-// Constants
-var zoomFactor = 1.5;
-var defaultX = 0;
-var defaultY = 0;
-
-// Variables
-var x = 0;
-var y = 0;
-var scale = 1;
-
-var svg;
-
-/**
- * Zooms and pans the visualization.
- */
-function zoomAndPan()
-{
-    var g = svg.getElementById('groupPanel');
-    if (!g) {
-        return;
-    }
-
-    g.setAttribute('transform', 'translate(' + x + ', ' + y + ') scale(' + scale + ')');
-    var id;
-    var circle;
-    $('circle.vector').each(function () {
-        id = $(this).attr('id');
-        circle = svg.getElementById(id);
-        svg.change(circle, {
-            r : (3 / scale),
-            "stroke-width" : (2 / scale)
-        });
-    });
-
-    var line;
-    $('polyline.vector').each(function () {
-        id = $(this).attr('id');
-        line = svg.getElementById(id);
-        svg.change(line, {
-            "stroke-width" : (2 / scale)
-        });
-    });
-
-    var polygon;
-    $('path.vector').each(function () {
-        id = $(this).attr('id');
-        polygon = svg.getElementById(id);
-        svg.change(polygon, {
-            "stroke-width" : (0.5 / scale)
-        });
-    });
-}
-
-/**
- * Initially loads either SVG or OSM visualization based on the choice.
- */
-function selectVisualization() {
-    if ($('#choice').prop('checked') !== true) {
-        $('#openlayersmap').hide();
-    } else {
-        $('#placeholder').hide();
-    }
-}
-
-/**
- * Adds necessary styles to the div that coontains the openStreetMap.
- */
-function styleOSM() {
-    var $placeholder = $('#placeholder');
-    var cssObj = {
-        'border' : '1px solid #aaa',
-        'width' : $placeholder.width(),
-        'height' : $placeholder.height(),
-        'float' : 'right'
-    };
-    $('#openlayersmap').css(cssObj);
-}
-
-/**
- * Loads the SVG element and make a reference to it.
- */
-function loadSVG() {
-    var $placeholder = $('#placeholder');
-
-    $placeholder.svg({
-        onLoad: function (svg_ref) {
-            svg = svg_ref;
-        }
-    });
-
-    // Removes the second SVG element unnecessarily added due to the above command
-    $placeholder.find('svg:nth-child(2)').remove();
-}
-
-/**
- * Adds controllers for zooming and panning.
- */
-function addZoomPanControllers() {
-    var $placeholder = $('#placeholder');
-    if ($("#placeholder").find("svg").length > 0) {
-        var pmaThemeImage = $('#pmaThemeImage').val();
-        // add panning arrows
-        $('<img class="button" id="left_arrow" src="' + pmaThemeImage + 'west-mini.png">').appendTo($placeholder);
-        $('<img class="button" id="right_arrow" src="' + pmaThemeImage + 'east-mini.png">').appendTo($placeholder);
-        $('<img class="button" id="up_arrow" src="' + pmaThemeImage + 'north-mini.png">').appendTo($placeholder);
-        $('<img class="button" id="down_arrow" src="' + pmaThemeImage + 'south-mini.png">').appendTo($placeholder);
-        // add zooming controls
-        $('<img class="button" id="zoom_in" src="' + pmaThemeImage + 'zoom-plus-mini.png">').appendTo($placeholder);
-        $('<img class="button" id="zoom_world" src="' + pmaThemeImage + 'zoom-world-mini.png">').appendTo($placeholder);
-        $('<img class="button" id="zoom_out" src="' + pmaThemeImage + 'zoom-minus-mini.png">').appendTo($placeholder);
-    }
-}
-
-/**
- * Resizes the GIS visualization to fit into the space available.
- */
-function resizeGISVisualization() {
-    var $placeholder = $('#placeholder');
-    var old_width = $placeholder.width();
-    var visWidth = $('#div_view_options').width() - 48;
-
-    // Assign new value for width
-    $placeholder.width(visWidth);
-    $('svg').attr('width', visWidth);
-
-    // Assign the offset created due to resizing to defaultX and center the svg.
-    defaultX = (visWidth - old_width) / 2;
-    x = defaultX;
-    y = 0;
-    scale = 1;
-}
-
-/**
- * Initialize the GIS visualization.
- */
-function initGISVisualization() {
-    // Loads either SVG or OSM visualization based on the choice
-    selectVisualization();
-    // Resizes the GIS visualization to fit into the space available
-    resizeGISVisualization();
-    if (typeof OpenLayers !== 'undefined') {
-        // Configure OpenLayers
-        OpenLayers._getScriptLocation = function() {return './js/openlayers/';};
-        // Adds necessary styles to the div that coontains the openStreetMap
-        styleOSM();
-        // Draws openStreetMap with openLayers
-        drawOpenLayers();
-    }
-    // Loads the SVG element and make a reference to it
-    loadSVG();
-    // Adds controllers for zooming and panning
-    addZoomPanControllers();
-    zoomAndPan();
-}
-
-function getRelativeCoords(e) {
-    var position = $('#placeholder').offset();
-    return {
-        x : e.pageX - position.left,
-        y : e.pageY - position.top
-    };
-}
-
-/**
- * Ajax handlers for GIS visualization page
- *
- * Actions Ajaxified here:
- *
- * Zooming in and zooming out on mousewheel movement.
- * Panning the visualization on dragging.
- * Zooming in on double clicking.
- * Zooming out on clicking the zoom out button.
- * Panning on clicking the arrow buttons.
- * Displaying tooltips for GIS objects.
- */
-
-/**
- * Unbind all event handlers before tearing down a page
- */
-AJAX.registerTeardown('tbl_gis_visualization.js', function () {
-    $(document).off('click', '#choice');
-    $(document).off('mousewheel', '#placeholder');
-    $(document).off('dragstart', 'svg');
-    $(document).off('mouseup', 'svg');
-    $(document).off('drag', 'svg');
-    $(document).off('dblclick', '#placeholder');
-    $(document).off('click', '#zoom_in');
-    $(document).off('click', '#zoom_world');
-    $(document).off('click', '#zoom_out');
-    $(document).off('click', '#left_arrow');
-    $(document).off('click', '#right_arrow');
-    $(document).off('click', '#up_arrow');
-    $(document).off('click', '#down_arrow');
-    $('.vector').unbind('mousemove').unbind('mouseout');
-});
-
-AJAX.registerOnload('tbl_gis_visualization.js', function () {
-
-    // If we are in GIS visualization, initialize it
-    if ($('#gis_div').length > 0) {
-        initGISVisualization();
-    }
-
-    if (typeof OpenLayers === 'undefined') {
-        $('#choice, #labelChoice').hide();
-    }
-    $(document).on('click', '#choice', function () {
-        if ($(this).prop('checked') === false) {
-            $('#placeholder').show();
-            $('#openlayersmap').hide();
-        } else {
-            $('#placeholder').hide();
-            $('#openlayersmap').show();
-        }
-    });
-
-    $(document).on('mousewheel', '#placeholder', function (event, delta) {
-        event.preventDefault();
-        var relCoords = getRelativeCoords(event);
-        if (delta > 0) {
-            //zoom in
-            scale *= zoomFactor;
-            // zooming in keeping the position under mouse pointer unmoved.
-            x = relCoords.x - (relCoords.x - x) * zoomFactor;
-            y = relCoords.y - (relCoords.y - y) * zoomFactor;
-            zoomAndPan();
-        } else {
-            //zoom out
-            scale /= zoomFactor;
-            // zooming out keeping the position under mouse pointer unmoved.
-            x = relCoords.x - (relCoords.x - x) / zoomFactor;
-            y = relCoords.y - (relCoords.y - y) / zoomFactor;
-            zoomAndPan();
-        }
-        return true;
-    });
-
-    var dragX = 0;
-    var dragY = 0;
-
-    $(document).on('dragstart', 'svg', function (event, dd) {
-        $('#placeholder').addClass('placeholderDrag');
-        dragX = Math.round(dd.offsetX);
-        dragY = Math.round(dd.offsetY);
-    });
-
-    $(document).on('mouseup', 'svg', function (event) {
-        $('#placeholder').removeClass('placeholderDrag');
-    });
-
-    $(document).on('drag', 'svg', function (event, dd) {
-        var newX = Math.round(dd.offsetX);
-        x +=  newX - dragX;
-        dragX = newX;
-        var newY = Math.round(dd.offsetY);
-        y +=  newY - dragY;
-        dragY = newY;
-        zoomAndPan();
-    });
-
-    $(document).on('dblclick', '#placeholder', function (event) {
-        scale *= zoomFactor;
-        // zooming in keeping the position under mouse pointer unmoved.
-        var relCoords = getRelativeCoords(event);
-        x = relCoords.x - (relCoords.x - x) * zoomFactor;
-        y = relCoords.y - (relCoords.y - y) * zoomFactor;
-        zoomAndPan();
-    });
-
-    $(document).on('click', '#zoom_in', function (e) {
-        e.preventDefault();
-        //zoom in
-        scale *= zoomFactor;
-
-        var $placeholder = $('#placeholder').find('svg');
-        width = $placeholder.attr('width');
-        height = $placeholder.attr('height');
-        // zooming in keeping the center unmoved.
-        x = width / 2 - (width / 2 - x) * zoomFactor;
-        y = height / 2 - (height / 2 - y) * zoomFactor;
-        zoomAndPan();
-    });
-
-    $(document).on('click', '#zoom_world', function (e) {
-        e.preventDefault();
-        scale = 1;
-        x = defaultX;
-        y = defaultY;
-        zoomAndPan();
-    });
-
-    $(document).on('click', '#zoom_out', function (e) {
-        e.preventDefault();
-        //zoom out
-        scale /= zoomFactor;
-
-        var $placeholder = $('#placeholder').find('svg');
-        width = $placeholder.attr('width');
-        height = $placeholder.attr('height');
-        // zooming out keeping the center unmoved.
-        x = width / 2 - (width / 2 - x) / zoomFactor;
-        y = height / 2 - (height / 2 - y) / zoomFactor;
-        zoomAndPan();
-    });
-
-    $(document).on('click', '#left_arrow', function (e) {
-        e.preventDefault();
-        x += 100;
-        zoomAndPan();
-    });
-
-    $(document).on('click', '#right_arrow', function (e) {
-        e.preventDefault();
-        x -= 100;
-        zoomAndPan();
-    });
-
-    $(document).on('click', '#up_arrow', function (e) {
-        e.preventDefault();
-        y += 100;
-        zoomAndPan();
-    });
-
-    $(document).on('click', '#down_arrow', function (e) {
-        e.preventDefault();
-        y -= 100;
-        zoomAndPan();
-    });
-
-    /**
-     * Detect the mousemove event and show tooltips.
-     */
-    $('.vector').bind('mousemove', function (event) {
-        var contents = $.trim(escapeHtml($(this).attr('name')));
-        $("#tooltip").remove();
-        if (contents !== '') {
-            $('<div id="tooltip">' + contents + '</div>').css({
-                position : 'absolute',
-                top : event.pageY + 10,
-                left : event.pageX + 10,
-                border : '1px solid #fdd',
-                padding : '2px',
-                'background-color' : '#fee',
-                opacity : 0.90
-            }).appendTo("body").fadeIn(200);
-        }
-    });
-
-    /**
-     * Detect the mouseout event and hide tooltips.
-     */
-    $('.vector').bind('mouseout', function (event) {
-        $("#tooltip").remove();
-    });
-});
diff --git a/#pma/js/tbl_operations.js b/#pma/js/tbl_operations.js
deleted file mode 100644
index a188a968..00000000
--- a/#pma/js/tbl_operations.js
+++ /dev/null
@@ -1,304 +0,0 @@
-/**
- * Unbind all event handlers before tearing down a page
- */
-AJAX.registerTeardown('tbl_operations.js', function () {
-    $(document).off('submit', "#copyTable.ajax");
-    $(document).off('submit', "#moveTableForm");
-    $(document).off('submit', "#tableOptionsForm");
-    $(document).off('submit', "#partitionsForm");
-    $(document).off('click', "#tbl_maintenance li a.maintain_action.ajax");
-    $(document).off('click', "#drop_tbl_anchor.ajax");
-    $(document).off('click', "#drop_view_anchor.ajax");
-    $(document).off('click', "#truncate_tbl_anchor.ajax");
-});
-
-/**
- * jQuery coding for 'Table operations'.  Used on tbl_operations.php
- * Attach Ajax Event handlers for Table operations
- */
-AJAX.registerOnload('tbl_operations.js', function () {
-    /**
-     *Ajax action for submitting the "Copy table"
-     **/
-    $(document).on('submit', "#copyTable.ajax", function (event) {
-        event.preventDefault();
-        var $form = $(this);
-        PMA_prepareForAjaxRequest($form);
-        $.post($form.attr('action'), $form.serialize() + "&submit_copy=Go", function (data) {
-            if (typeof data !== 'undefined' && data.success === true) {
-                if ($form.find("input[name='switch_to_new']").prop('checked')) {
-                    PMA_commonParams.set(
-                        'db',
-                        $form.find("select[name='target_db']").val()
-                    );
-                    PMA_commonParams.set(
-                        'table',
-                        $form.find("input[name='new_name']").val()
-                    );
-                    PMA_commonActions.refreshMain(false, function () {
-                        PMA_ajaxShowMessage(data.message);
-                    });
-                } else {
-                    PMA_ajaxShowMessage(data.message);
-                }
-                // Refresh navigation when the table is copied
-                PMA_reloadNavigation();
-            } else {
-                PMA_ajaxShowMessage(data.error, false);
-            }
-        }); // end $.post()
-    });//end of copyTable ajax submit
-
-    /**
-     *Ajax action for submitting the "Move table"
-     */
-    $(document).on('submit', "#moveTableForm", function (event) {
-        event.preventDefault();
-        var $form = $(this);
-        var db = $form.find('select[name=target_db]').val();
-        var tbl = $form.find('input[name=new_name]').val();
-        PMA_prepareForAjaxRequest($form);
-        $.post($form.attr('action'), $form.serialize() + "&submit_move=1", function (data) {
-            if (typeof data !== 'undefined' && data.success === true) {
-                PMA_commonParams.set('db', db);
-                PMA_commonParams.set('table', tbl);
-                PMA_commonActions.refreshMain(false, function () {
-                    PMA_ajaxShowMessage(data.message);
-                });
-                // Refresh navigation when the table is copied
-                PMA_reloadNavigation();
-            } else {
-                PMA_ajaxShowMessage(data.error, false);
-            }
-        }); // end $.post()
-    });
-
-    /**
-     * Ajax action for submitting the "Table options"
-     */
-    $(document).on('submit', "#tableOptionsForm", function (event) {
-        event.preventDefault();
-        event.stopPropagation();
-        var $form = $(this);
-        var $tblNameField = $form.find('input[name=new_name]');
-        var $tblCollationField = $form.find('select[name=tbl_collation]');
-        var collationOrigValue = $('select[name="tbl_collation"] option[selected]').val();
-        var $changeAllColumnCollationsCheckBox = $('#checkbox_change_all_collations');
-        var question = PMA_messages.strChangeAllColumnCollationsWarning;
-
-        if ($tblNameField.val() !== $tblNameField[0].defaultValue) {
-            // reload page and navigation if the table has been renamed
-            PMA_prepareForAjaxRequest($form);
-
-            if ($tblCollationField.val() !== collationOrigValue && $changeAllColumnCollationsCheckBox.is(':checked')) {
-                $form.PMA_confirm(question, $form.attr('action'), function (url) {
-                    submitOptionsForm();
-                });
-            } else {
-                submitOptionsForm();
-            }
-        } else {
-
-            if ($tblCollationField.val() !== collationOrigValue && $changeAllColumnCollationsCheckBox.is(':checked')) {
-                $form.PMA_confirm(question, $form.attr('action'), function (url) {
-                    $form.removeClass('ajax').submit().addClass('ajax');
-                });
-            } else {
-                $form.removeClass('ajax').submit().addClass('ajax');
-            }
-        }
-
-        function submitOptionsForm() {
-            $.post($form.attr('action'), $form.serialize(), function (data) {
-                if (typeof data !== 'undefined' && data.success === true) {
-                    PMA_commonParams.set('table', data._params.table);
-                    PMA_commonActions.refreshMain(false, function () {
-                        $('#page_content').html(data.message);
-                        PMA_highlightSQL($('#page_content'));
-                    });
-                    // Refresh navigation when the table is renamed
-                    PMA_reloadNavigation();
-                } else {
-                    PMA_ajaxShowMessage(data.error, false);
-                }
-            }); // end $.post()
-        }
-    });
-
-    /**
-     *Ajax events for actions in the "Table maintenance"
-    **/
-    $(document).on('click', "#tbl_maintenance li a.maintain_action.ajax", function (event) {
-        event.preventDefault();
-        if ($(".sqlqueryresults").length !== 0) {
-            $(".sqlqueryresults").remove();
-        }
-        if ($(".result_query").length !== 0) {
-            $(".result_query").remove();
-        }
-        //variables which stores the common attributes
-        $.post($(this).attr('href'), { ajax_request: 1 }, function (data) {
-            function scrollToTop() {
-                $('html, body').animate({ scrollTop: 0 });
-            }
-            var $temp_div;
-            if (typeof data !== 'undefined' && data.success === true && data.sql_query !== undefined) {
-                PMA_ajaxShowMessage(data.message);
-                $("<div class='sqlqueryresults ajax'></div>").prependTo("#page_content");
-                $(".sqlqueryresults").html(data.sql_query);
-                PMA_highlightSQL($('#page_content'));
-                scrollToTop();
-            } else if (typeof data !== 'undefined' && data.success === true) {
-                var $temp_div = $("<div id='temp_div'></div>");
-                $temp_div.html(data.message);
-                var $success = $temp_div.find(".result_query .success");
-                PMA_ajaxShowMessage($success);
-                $("<div class='sqlqueryresults ajax'></div>").prependTo("#page_content");
-                $(".sqlqueryresults").html(data.message);
-                PMA_highlightSQL($('#page_content'));
-                PMA_init_slider();
-                $(".sqlqueryresults").children("fieldset,br").remove();
-                scrollToTop();
-            } else {
-                $temp_div = $("<div id='temp_div'></div>");
-                $temp_div.html(data.error);
-                var $error = $temp_div.find("code").addClass("error");
-                PMA_ajaxShowMessage($error, false);
-            }
-        }); // end $.post()
-    });//end of table maintenance ajax click
-
-    /**
-     * Ajax action for submitting the "Partition Maintenance"
-     * Also, asks for confirmation when DROP partition is submitted
-     */
-    $(document).on('submit', "#partitionsForm", function (event) {
-        event.preventDefault();
-        var $form = $(this);
-
-        function submitPartitionMaintenance() {
-            var submitData = $form.serialize() + '&ajax_request=true&ajax_page_request=true';
-            PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
-            AJAX.source = $form;
-            $.post($form.attr('action'), submitData, AJAX.responseHandler);
-        }
-
-        if ($('#partition_operation_DROP').is(':checked')) {
-            var question = PMA_messages.strDropPartitionWarning;
-            $form.PMA_confirm(question, $form.attr('action'), function (url) {
-                submitPartitionMaintenance();
-            });
-        } else if ($('#partition_operation_TRUNCATE').is(':checked')) {
-            var question = PMA_messages.strTruncatePartitionWarning;
-            $form.PMA_confirm(question, $form.attr('action'), function (url) {
-                submitPartitionMaintenance();
-            });
-        } else {
-            submitPartitionMaintenance();
-        }
-    });
-
-    $(document).on('click', "#drop_tbl_anchor.ajax", function (event) {
-        event.preventDefault();
-        /**
-         * @var question    String containing the question to be asked for confirmation
-         */
-        var question = PMA_messages.strDropTableStrongWarning + ' ';
-        question += PMA_sprintf(
-            PMA_messages.strDoYouReally,
-            'DROP TABLE ' + escapeHtml(PMA_commonParams.get('table'))
-        ) + getForeignKeyCheckboxLoader();
-
-        $(this).PMA_confirm(question, $(this).attr('href'), function (url) {
-
-            var $msgbox = PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
-
-            var params = getJSConfirmCommonParam(this);
-
-            $.post(url, params, function (data) {
-                if (typeof data !== 'undefined' && data.success === true) {
-                    PMA_ajaxRemoveMessage($msgbox);
-                    // Table deleted successfully, refresh both the frames
-                    PMA_reloadNavigation();
-                    PMA_commonParams.set('table', '');
-                    PMA_commonActions.refreshMain(
-                        PMA_commonParams.get('opendb_url'),
-                        function () {
-                            PMA_ajaxShowMessage(data.message);
-                        }
-                    );
-                } else {
-                    PMA_ajaxShowMessage(data.error, false);
-                }
-            }); // end $.post()
-        }, loadForeignKeyCheckbox); // end $.PMA_confirm()
-    }); //end of Drop Table Ajax action
-
-    $(document).on('click', "#drop_view_anchor.ajax", function (event) {
-        event.preventDefault();
-        /**
-         * @var question    String containing the question to be asked for confirmation
-         */
-        var question = PMA_messages.strDropTableStrongWarning + ' ';
-        question += PMA_sprintf(
-            PMA_messages.strDoYouReally,
-            'DROP VIEW ' + escapeHtml(PMA_commonParams.get('table'))
-        );
-
-        $(this).PMA_confirm(question, $(this).attr('href'), function (url) {
-
-            var $msgbox = PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
-            $.post(url, {'is_js_confirmed': '1', 'ajax_request': true}, function (data) {
-                if (typeof data !== 'undefined' && data.success === true) {
-                    PMA_ajaxRemoveMessage($msgbox);
-                    // Table deleted successfully, refresh both the frames
-                    PMA_reloadNavigation();
-                    PMA_commonParams.set('table', '');
-                    PMA_commonActions.refreshMain(
-                        PMA_commonParams.get('opendb_url'),
-                        function () {
-                            PMA_ajaxShowMessage(data.message);
-                        }
-                    );
-                } else {
-                    PMA_ajaxShowMessage(data.error, false);
-                }
-            }); // end $.post()
-        }); // end $.PMA_confirm()
-    }); //end of Drop View Ajax action
-
-    $(document).on('click', "#truncate_tbl_anchor.ajax", function (event) {
-        event.preventDefault();
-        /**
-         * @var question    String containing the question to be asked for confirmation
-         */
-        var question = PMA_messages.strTruncateTableStrongWarning + ' ';
-        question += PMA_sprintf(
-            PMA_messages.strDoYouReally,
-            'TRUNCATE ' + escapeHtml(PMA_commonParams.get('table'))
-        ) + getForeignKeyCheckboxLoader();
-        $(this).PMA_confirm(question, $(this).attr('href'), function (url) {
-            PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
-
-            var params = getJSConfirmCommonParam(this);
-
-            $.post(url, params, function (data) {
-                if ($(".sqlqueryresults").length !== 0) {
-                    $(".sqlqueryresults").remove();
-                }
-                if ($(".result_query").length !== 0) {
-                    $(".result_query").remove();
-                }
-                if (typeof data !== 'undefined' && data.success === true) {
-                    PMA_ajaxShowMessage(data.message);
-                    $("<div class='sqlqueryresults ajax'></div>").prependTo("#page_content");
-                    $(".sqlqueryresults").html(data.sql_query);
-                    PMA_highlightSQL($('#page_content'));
-                } else {
-                    PMA_ajaxShowMessage(data.error, false);
-                }
-            }); // end $.post()
-        }, loadForeignKeyCheckbox); // end $.PMA_confirm()
-    }); //end of Truncate Table Ajax action
-
-}); //end $(document).ready for 'Table operations'
diff --git a/#pma/js/tbl_relation.js b/#pma/js/tbl_relation.js
deleted file mode 100644
index e6498ee5..00000000
--- a/#pma/js/tbl_relation.js
+++ /dev/null
@@ -1,234 +0,0 @@
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * for tbl_relation.php
- *
- */
-function show_hide_clauses($thisDropdown)
-{
-    if ($thisDropdown.val() === '') {
-        $thisDropdown.parent().nextAll('span').hide();
-    } else {
-        if ($thisDropdown.is('select[name^="destination_foreign_column"]')) {
-            $thisDropdown.parent().nextAll('span').show();
-        }
-    }
-}
-
-/**
- * Sets dropdown options to values
- */
-function setDropdownValues($dropdown, values, selectedValue) {
-    $dropdown.empty();
-    var optionsAsString = '';
-    // add an empty string to the beginning for empty selection
-    values.unshift('');
-    $.each(values, function () {
-        optionsAsString += "<option value='" + escapeHtml(this) + "'" + (selectedValue == this ? " selected='selected'" : "") + ">" + escapeHtml(this) + "</option>";
-    });
-    $dropdown.append($(optionsAsString));
-}
-
-/**
- * Retrieves and populates dropdowns to the left based on the selected value
- *
- * @param $dropdown the dropdown whose value got changed
- */
-function getDropdownValues($dropdown) {
-    var foreignDb = null, foreignTable = null;
-    var $databaseDd, $tableDd, $columnDd;
-    var foreign = '';
-    // if the changed dropdown is for foreign key constraints
-    if ($dropdown.is('select[name^="destination_foreign"]')) {
-        $databaseDd = $dropdown.parent().parent().parent().find('select[name^="destination_foreign_db"]');
-        $tableDd    = $dropdown.parent().parent().parent().find('select[name^="destination_foreign_table"]');
-        $columnDd   = $dropdown.parent().parent().parent().find('select[name^="destination_foreign_column"]');
-        foreign = '_foreign';
-    } else { // internal relations
-        $databaseDd = $dropdown.parent().find('select[name^="destination_db"]');
-        $tableDd    = $dropdown.parent().find('select[name^="destination_table"]');
-        $columnDd   = $dropdown.parent().find('select[name^="destination_column"]');
-    }
-
-    // if the changed dropdown is a database selector
-    if ($dropdown.is('select[name^="destination' + foreign + '_db"]')) {
-        foreignDb = $dropdown.val();
-        // if no database is selected empty table and column dropdowns
-        if (foreignDb === '') {
-            setDropdownValues($tableDd, []);
-            setDropdownValues($columnDd, []);
-            return;
-        }
-    } else { // if a table selector
-        foreignDb = $databaseDd.val();
-        foreignTable = $dropdown.val();
-         // if no table is selected empty the column dropdown
-        if (foreignTable === '') {
-            setDropdownValues($columnDd, []);
-            return;
-        }
-    }
-    var $msgbox = PMA_ajaxShowMessage();
-    var $form = $dropdown.parents('form');
-    var url = 'tbl_relation.php?getDropdownValues=true&ajax_request=true' +
-        '&token=' + $form.find('input[name="token"]').val() +
-        '&db=' + $form.find('input[name="db"]').val() +
-        '&table=' + $form.find('input[name="table"]').val() +
-        '&foreign=' + (foreign !== '') +
-        '&foreignDb=' + encodeURIComponent(foreignDb) +
-        (foreignTable !== null ?
-            '&foreignTable=' + encodeURIComponent(foreignTable) : ''
-        );
-    var $server = $form.find('input[name="server"]');
-    if ($server.length > 0) {
-        url += '&server=' + $form.find('input[name="server"]').val();
-    }
-    $.ajax({
-        url: url,
-        datatype: 'json',
-        success: function (data) {
-            PMA_ajaxRemoveMessage($msgbox);
-            if (typeof data !== 'undefined' && data.success) {
-                // if the changed dropdown is a database selector
-                if (foreignTable === null) {
-                    // set values for table and column dropdowns
-                    setDropdownValues($tableDd, data.tables);
-                    setDropdownValues($columnDd, []);
-                } else { // if a table selector
-                    // set values for the column dropdown
-                    var primary = null;
-                    if (typeof data.primary !== 'undefined'
-                        && 1 === data.primary.length
-                    ) {
-                        primary = data.primary[0];
-                    }
-                    setDropdownValues($columnDd, data.columns, primary);
-                }
-            } else {
-                PMA_ajaxShowMessage(data.error, false);
-            }
-        }
-    });
-}
-
-/**
- * Unbind all event handlers before tearing down a page
- */
-AJAX.registerTeardown('tbl_relation.js', function () {
-    $('body').off('change',
-        'select[name^="destination_db"], ' +
-        'select[name^="destination_table"], ' +
-        'select[name^="destination_foreign_db"], ' +
-        'select[name^="destination_foreign_table"]'
-    );
-    $('body').off('click', 'a.add_foreign_key_field');
-    $('body').off('click', 'a.add_foreign_key');
-    $('a.drop_foreign_key_anchor.ajax').off('click');
-});
-
-AJAX.registerOnload('tbl_relation.js', function () {
-
-    /**
-     * Ajax event handler to fetch table/column dropdown values.
-     */
-    $('body').on('change',
-        'select[name^="destination_db"], ' +
-        'select[name^="destination_table"], ' +
-        'select[name^="destination_foreign_db"], ' +
-        'select[name^="destination_foreign_table"]',
-        function () {
-            getDropdownValues($(this));
-        }
-    );
-
-    /**
-     * Ajax event handler to add a column to a foreign key constraint.
-     */
-    $('body').on('click', 'a.add_foreign_key_field', function (event) {
-        event.preventDefault();
-        event.stopPropagation();
-
-        // Add field.
-        $(this)
-        .prev('span')
-        .clone(true, true)
-        .insertBefore($(this))
-        .find('select')
-        .val('');
-
-        // Add foreign field.
-        var $source_elem = $('select[name^="destination_foreign_column[' +
-            $(this).attr('data-index') + ']"]:last').parent();
-        $source_elem
-        .clone(true, true)
-        .insertAfter($source_elem)
-        .find('select')
-        .val('');
-    });
-
-    /**
-     * Ajax event handler to add a foreign key constraint.
-     */
-    $('body').on('click', 'a.add_foreign_key', function (event) {
-        event.preventDefault();
-        event.stopPropagation();
-
-        var $prev_row = $(this).closest('tr').prev('tr');
-        var odd_even = ($prev_row.attr('class') == 'odd') ? 'even' : 'odd';
-        var $new_row = $prev_row.clone(true, true).attr('class', odd_even);
-
-        // Update serial number.
-        var curr_index = $new_row
-            .find('a.add_foreign_key_field')
-            .attr('data-index');
-        var new_index = parseInt(curr_index) + 1;
-        $new_row.find('a.add_foreign_key_field').attr('data-index', new_index);
-
-        // Update form parameter names.
-        $new_row.find('select[name^="foreign_key_fields_name"]:not(:first), ' +
-            'select[name^="destination_foreign_column"]:not(:first)'
-        ).each(function () {
-            $(this).parent().remove();
-        });
-        $new_row.find('input, select').each(function () {
-            $(this).attr('name',
-                $(this).attr('name').replace(/\d/, new_index)
-            );
-        });
-
-        // Finally add the row.
-        $new_row.insertAfter($prev_row);
-    });
-
-    /**
-     * Ajax Event handler for 'Drop Foreign key'
-     */
-    $('a.drop_foreign_key_anchor.ajax').on('click', function (event) {
-        event.preventDefault();
-        var $anchor = $(this);
-
-        // Object containing reference to the current field's row
-        var $curr_row = $anchor.parents('tr');
-
-        var drop_query = escapeHtml(
-            $curr_row.children('td')
-                .children('.drop_foreign_key_msg')
-                .val()
-        );
-
-        var question = PMA_sprintf(PMA_messages.strDoYouReally, drop_query);
-
-        $anchor.PMA_confirm(question, $anchor.attr('href'), function (url) {
-            var $msg = PMA_ajaxShowMessage(PMA_messages.strDroppingForeignKey, false);
-            $.post(url, {'is_js_confirmed': 1, 'ajax_request': true}, function (data) {
-                if (data.success === true) {
-                    PMA_ajaxRemoveMessage($msg);
-                    PMA_commonActions.refreshMain(false, function () {
-                        // Do nothing
-                    });
-                } else {
-                    PMA_ajaxShowMessage(PMA_messages.strErrorProcessingRequest + " : " + data.error, false);
-                }
-            }); // end $.post()
-        }); // end $.PMA_confirm()
-    }); //end Drop Foreign key
-});
diff --git a/#pma/js/tbl_select.js b/#pma/js/tbl_select.js
deleted file mode 100644
index b035ff24..00000000
--- a/#pma/js/tbl_select.js
+++ /dev/null
@@ -1,407 +0,0 @@
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * @fileoverview JavaScript functions used on tbl_select.php
- *
- * @requires    jQuery
- * @requires    js/functions.js
- */
-
-/**
- * Ajax event handlers for this page
- *
- * Actions ajaxified here:
- * Table search
- */
-
-/**
- * Checks if given data-type is numeric or date.
- *
- * @param string data_type Column data-type
- *
- * @return bool|string
- */
-function PMA_checkIfDataTypeNumericOrDate(data_type)
-{
-    // To test for numeric data-types.
-    var numeric_re = new RegExp(
-        'TINYINT|SMALLINT|MEDIUMINT|INT|BIGINT|DECIMAL|FLOAT|DOUBLE|REAL',
-        'i'
-    );
-
-    // To test for date data-types.
-    var date_re = new RegExp(
-        'DATETIME|DATE|TIMESTAMP|TIME|YEAR',
-        'i'
-    );
-
-    // Return matched data-type
-    if (numeric_re.test(data_type)) {
-        return numeric_re.exec(data_type)[0];
-    }
-
-    if (date_re.test(data_type)) {
-        return date_re.exec(data_type)[0];
-    }
-
-    return false;
-}
-
-/**
- * Unbind all event handlers before tearing down a page
- */
-AJAX.registerTeardown('tbl_select.js', function () {
-    $('#togglesearchformlink').unbind('click');
-    $(document).off('submit', "#tbl_search_form.ajax");
-    $('select.geom_func').unbind('change');
-    $(document).off('click', 'span.open_search_gis_editor');
-    $('body').off('click', 'select[name*="criteriaColumnOperators"]');
-});
-
-AJAX.registerOnload('tbl_select.js', function () {
-    /**
-     * Prepare a div containing a link, otherwise it's incorrectly displayed
-     * after a couple of clicks
-     */
-    $('<div id="togglesearchformdiv"><a id="togglesearchformlink"></a></div>')
-        .insertAfter('#tbl_search_form')
-        // don't show it until we have results on-screen
-        .hide();
-
-    $('#togglesearchformlink')
-        .html(PMA_messages.strShowSearchCriteria)
-        .bind('click', function () {
-            var $link = $(this);
-            $('#tbl_search_form').slideToggle();
-            if ($link.text() == PMA_messages.strHideSearchCriteria) {
-                $link.text(PMA_messages.strShowSearchCriteria);
-            } else {
-                $link.text(PMA_messages.strHideSearchCriteria);
-            }
-            // avoid default click action
-            return false;
-        });
-
-    /**
-     * Ajax event handler for Table search
-     */
-    $(document).on('submit', "#tbl_search_form.ajax", function (event) {
-        var unaryFunctions = [
-            'IS NULL',
-            'IS NOT NULL',
-            "= ''",
-            "!= ''"
-        ];
-
-        var geomUnaryFunctions = [
-            'IsEmpty',
-            'IsSimple',
-            'IsRing',
-            'IsClosed',
-        ];
-
-        // jQuery object to reuse
-        var $search_form = $(this);
-        event.preventDefault();
-
-        // empty previous search results while we are waiting for new results
-        $("#sqlqueryresultsouter").empty();
-        var $msgbox = PMA_ajaxShowMessage(PMA_messages.strSearching, false);
-
-        PMA_prepareForAjaxRequest($search_form);
-
-        var values = {};
-        $search_form.find(':input').each(function () {
-            var $input = $(this);
-            if ($input.attr('type') == 'checkbox' || $input.attr('type') == 'radio') {
-                if ($input.is(':checked')) {
-                    values[this.name] = $input.val();
-                }
-            } else {
-                values[this.name] = $input.val();
-            }
-        });
-        var columnCount = $('select[name="columnsToDisplay[]"] option').length;
-        // Submit values only for the columns that have unary column operator or a search criteria
-        for (var a = 0; a < columnCount; a++) {
-            if ($.inArray(values['criteriaColumnOperators[' + a + ']'], unaryFunctions) >= 0) {
-                continue;
-            }
-
-            if (values['geom_func[' + a + ']'] &&
-                $.isArray(values['geom_func[' + a + ']'], geomUnaryFunctions) >= 0) {
-            	continue;
-            }
-
-            if (values['criteriaValues[' + a + ']'] === '' || values['criteriaValues[' + a + ']'] === null) {
-                delete values['criteriaValues[' + a + ']'];
-                delete values['criteriaColumnOperators[' + a + ']'];
-                delete values['criteriaColumnNames[' + a + ']'];
-                delete values['criteriaColumnTypes[' + a + ']'];
-                delete values['criteriaColumnCollations[' + a + ']'];
-            }
-        }
-        // If all columns are selected, use a single parameter to indicate that
-        if (values['columnsToDisplay[]'] !== null) {
-            if (values['columnsToDisplay[]'].length == columnCount) {
-                delete values['columnsToDisplay[]'];
-                values.displayAllColumns = true;
-            }
-        } else {
-            values.displayAllColumns = true;
-        }
-
-        $.post($search_form.attr('action'), values, function (data) {
-            PMA_ajaxRemoveMessage($msgbox);
-            if (typeof data !== 'undefined' && data.success === true) {
-                if (typeof data.sql_query !== 'undefined') { // zero rows
-                    $("#sqlqueryresultsouter").html(data.sql_query);
-                } else { // results found
-                    $("#sqlqueryresultsouter").html(data.message);
-                    $(".sqlqueryresults").trigger('makegrid').trigger('stickycolumns');
-                }
-                $('#tbl_search_form')
-                    // workaround for bug #3168569 - Issue on toggling the "Hide search criteria" in chrome.
-                    .slideToggle()
-                    .hide();
-                $('#togglesearchformlink')
-                    // always start with the Show message
-                    .text(PMA_messages.strShowSearchCriteria);
-                $('#togglesearchformdiv')
-                    // now it's time to show the div containing the link
-                    .show();
-                // needed for the display options slider in the results
-                PMA_init_slider();
-                $('html, body').animate({scrollTop: 0}, 'fast');
-            } else {
-                $("#sqlqueryresultsouter").html(data.error);
-            }
-            PMA_highlightSQL($('#sqlqueryresultsouter'));
-        }); // end $.post()
-    });
-
-    // Following section is related to the 'function based search' for geometry data types.
-    // Initialy hide all the open_gis_editor spans
-    $('span.open_search_gis_editor').hide();
-
-    $('select.geom_func').bind('change', function () {
-        var $geomFuncSelector = $(this);
-
-        var binaryFunctions = [
-            'Contains',
-            'Crosses',
-            'Disjoint',
-            'Equals',
-            'Intersects',
-            'Overlaps',
-            'Touches',
-            'Within',
-            'MBRContains',
-            'MBRDisjoint',
-            'MBREquals',
-            'MBRIntersects',
-            'MBROverlaps',
-            'MBRTouches',
-            'MBRWithin',
-            'ST_Contains',
-            'ST_Crosses',
-            'ST_Disjoint',
-            'ST_Equals',
-            'ST_Intersects',
-            'ST_Overlaps',
-            'ST_Touches',
-            'ST_Within'
-        ];
-
-        var tempArray = [
-            'Envelope',
-            'EndPoint',
-            'StartPoint',
-            'ExteriorRing',
-            'Centroid',
-            'PointOnSurface'
-        ];
-        var outputGeomFunctions = binaryFunctions.concat(tempArray);
-
-        // If the chosen function takes two geometry objects as parameters
-        var $operator = $geomFuncSelector.parents('tr').find('td:nth-child(5)').find('select');
-        if ($.inArray($geomFuncSelector.val(), binaryFunctions) >= 0) {
-            $operator.prop('readonly', true);
-        } else {
-            $operator.prop('readonly', false);
-        }
-
-        // if the chosen function's output is a geometry, enable GIS editor
-        var $editorSpan = $geomFuncSelector.parents('tr').find('span.open_search_gis_editor');
-        if ($.inArray($geomFuncSelector.val(), outputGeomFunctions) >= 0) {
-            $editorSpan.show();
-        } else {
-            $editorSpan.hide();
-        }
-
-    });
-
-    $(document).on('click', 'span.open_search_gis_editor', function (event) {
-        event.preventDefault();
-
-        var $span = $(this);
-        // Current value
-        var value = $span.parent('td').children("input[type='text']").val();
-        // Field name
-        var field = 'Parameter';
-        // Column type
-        var geom_func = $span.parents('tr').find('.geom_func').val();
-        var type;
-        if (geom_func == 'Envelope') {
-            type = 'polygon';
-        } else if (geom_func == 'ExteriorRing') {
-            type = 'linestring';
-        } else {
-            type = 'point';
-        }
-        // Names of input field and null checkbox
-        var input_name = $span.parent('td').children("input[type='text']").attr('name');
-        //Token
-        var token = $("input[name='token']").val();
-
-        openGISEditor();
-        if (!gisEditorLoaded) {
-            loadJSAndGISEditor(value, field, type, input_name, token);
-        } else {
-            loadGISEditor(value, field, type, input_name, token);
-        }
-    });
-
-    /**
-     * Ajax event handler for Range-Search.
-     */
-    $('body').on('click', 'select[name*="criteriaColumnOperators"]', function () {
-        $source_select = $(this);
-        // Get the column name.
-        var column_name = $(this)
-            .closest('tr')
-            .find('th:first')
-            .text();
-
-        // Get the data-type of column excluding size.
-        var data_type = $(this)
-            .closest('tr')
-            .find('td[data-type]')
-            .attr('data-type');
-        data_type = PMA_checkIfDataTypeNumericOrDate(data_type);
-
-        // Get the operator.
-        var operator = $(this).val();
-
-        if ((operator == 'BETWEEN' || operator == 'NOT BETWEEN')
-            && data_type
-        ) {
-            var $msgbox = PMA_ajaxShowMessage();
-            $.ajax({
-                url: 'tbl_select.php',
-                type: 'POST',
-                data: {
-                    token: $('input[name="token"]').val(),
-                    ajax_request: 1,
-                    db: $('input[name="db"]').val(),
-                    table: $('input[name="table"]').val(),
-                    column: column_name,
-                    range_search: 1
-                },
-                success: function (response) {
-                    PMA_ajaxRemoveMessage($msgbox);
-                    if (response.success) {
-                        // Get the column min value.
-                        var min = response.column_data.min
-                            ? '(' + PMA_messages.strColumnMin +
-                                ' ' + response.column_data.min + ')'
-                            : '';
-                        // Get the column max value.
-                        var max = response.column_data.max
-                            ? '(' + PMA_messages.strColumnMax +
-                                ' ' + response.column_data.max + ')'
-                            : '';
-                        var button_options = {};
-                        button_options[PMA_messages.strGo] = function () {
-                            var min_value = $('#min_value').val();
-                            var max_value = $('#max_value').val();
-                            var final_value = '';
-                            if (min_value.length && max_value.length) {
-                                final_value = min_value + ', ' +
-                                    max_value;
-                            }
-                            var $target_field = $source_select.closest('tr')
-                                .find('[name*="criteriaValues"]');
-
-                            // If target field is a select list.
-                            if ($target_field.is('select')) {
-                                $target_field.val(final_value);
-                                var $options = $target_field.find('option');
-                                var $closest_min = null;
-                                var $closest_max = null;
-                                // Find closest min and max value.
-                                $options.each(function () {
-                                    if (
-                                        $closest_min === null
-                                        || Math.abs($(this).val() - min_value) < Math.abs($closest_min.val() - min_value)
-                                    ) {
-                                        $closest_min = $(this);
-                                    }
-
-                                    if (
-                                        $closest_max === null
-                                        || Math.abs($(this).val() - max_value) < Math.abs($closest_max.val() - max_value)
-                                    ) {
-                                        $closest_max = $(this);
-                                    }
-                                });
-
-                                $closest_min.attr('selected', 'selected');
-                                $closest_max.attr('selected', 'selected');
-                            } else {
-                                $target_field.val(final_value);
-                            }
-                            $(this).dialog("close");
-                        };
-                        button_options[PMA_messages.strCancel] = function () {
-                            $(this).dialog("close");
-                        };
-
-                        // Display dialog box.
-                        $('<div/>').append(
-                            '<fieldset>' +
-                            '<legend>' + operator + '</legend>' +
-                            '<label for="min_value">' + PMA_messages.strMinValue +
-                            '</label>' +
-                            '<input type="text" id="min_value" />' + '<br>' +
-                            '<span class="small_font">' + min + '</span>' + '<br>' +
-                            '<label for="max_value">' + PMA_messages.strMaxValue +
-                            '</label>' +
-                            '<input type="text" id="max_value" />' + '<br>' +
-                            '<span class="small_font">' + max + '</span>' +
-                            '</fieldset>'
-                        ).dialog({
-                            minWidth: 500,
-                            maxHeight: 400,
-                            modal: true,
-                            buttons: button_options,
-                            title: PMA_messages.strRangeSearch,
-                            open: function () {
-                                // Add datepicker wherever required.
-                                PMA_addDatepicker($('#min_value'), data_type);
-                                PMA_addDatepicker($('#max_value'), data_type);
-                            },
-                            close: function () {
-                                $(this).remove();
-                            }
-                        });
-                    } else {
-                        PMA_ajaxShowMessage(response.error);
-                    }
-                },
-                error: function (response) {
-                    PMA_ajaxShowMessage(PMA_messages.strErrorProcessingRequest);
-                }
-            });
-        }
-    });
-});
diff --git a/#pma/js/tbl_structure.js b/#pma/js/tbl_structure.js
deleted file mode 100644
index 279bb42d..00000000
--- a/#pma/js/tbl_structure.js
+++ /dev/null
@@ -1,515 +0,0 @@
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * @fileoverview    functions used on the table structure page
- * @name            Table Structure
- *
- * @requires    jQuery
- * @requires    jQueryUI
- * @required    js/functions.js
- */
-
-/**
- * AJAX scripts for tbl_structure.php
- *
- * Actions ajaxified here:
- * Drop Column
- * Add Primary Key
- * Drop Primary Key/Index
- *
- */
-
-/**
- * This function returns the horizontal space available for the menu in pixels.
- * To calculate this value we start we the width of the main panel, then we
- * substract the margin of the page content, then we substract any cellspacing
- * that the table may have (original theme only) and finally we substract the
- * width of all columns of the table except for the last one (which is where
- * the menu will go). What we should end up with is the distance between the
- * start of the last column on the table and the edge of the page, again this
- * is the space available for the menu.
- *
- * In the case where the table cell where the menu will be displayed is already
- * off-screen (the table is wider than the page), a negative value will be returned,
- * but this will be treated as a zero by the menuResizer plugin.
- *
- * @return int
- */
-function PMA_tbl_structure_menu_resizer_callback() {
-    var pagewidth = $('body').width();
-    var $page = $('#page_content');
-    pagewidth -= $page.outerWidth(true) - $page.outerWidth();
-    var columnsWidth = 0;
-    var $columns = $('#tablestructure').find('tr:eq(1)').find('td,th');
-    $columns.not(':last').each(function () {
-        columnsWidth += $(this).outerWidth(true);
-    });
-    var totalCellSpacing = $('#tablestructure').width();
-    $columns.each(function () {
-        totalCellSpacing -= $(this).outerWidth(true);
-    });
-    return pagewidth - columnsWidth - totalCellSpacing - 15; // 15px extra margin
-}
-
-/**
- * Reload fields table
- */
-function reloadFieldForm() {
-    $.post($("#fieldsForm").attr('action'), $("#fieldsForm").serialize() + "&ajax_request=true", function (form_data) {
-        var $temp_div = $("<div id='temp_div'><div>").append(form_data.message);
-        $("#fieldsForm").replaceWith($temp_div.find("#fieldsForm"));
-        $("#addColumns").replaceWith($temp_div.find("#addColumns"));
-        $('#move_columns_dialog').find('ul').replaceWith($temp_div.find("#move_columns_dialog ul"));
-        $("#moveColumns").removeClass("move-active");
-        /* reinitialise the more options in table */
-        if ($('#fieldsForm').hasClass('HideStructureActions')) {
-            $('#fieldsForm').find('ul.table-structure-actions').menuResizer(PMA_tbl_structure_menu_resizer_callback);
-        }
-    });
-    $('#page_content').show();
-}
-
-function checkFirst() {
-    if ($("select[name=after_field] option:selected").data('pos') === 'first') {
-        $("input[name=field_where]").val('first');
-    } else {
-        $("input[name=field_where]").val('after');
-    }
-}
-/**
- * Unbind all event handlers before tearing down a page
- */
-AJAX.registerTeardown('tbl_structure.js', function () {
-    $(document).off('click', "a.drop_column_anchor.ajax");
-    $(document).off('click', "a.add_key.ajax");
-    $(document).off('click', "#move_columns_anchor");
-    $(document).off('click', "#printView");
-    $(document).off('submit', ".append_fields_form.ajax");
-    $('body').off('click', '#fieldsForm.ajax button[name="submit_mult"], #fieldsForm.ajax input[name="submit_mult"]');
-    $(document).off('click', 'a[name^=partition_action].ajax');
-    $(document).off('click', '#remove_partitioning.ajax');
-});
-
-AJAX.registerOnload('tbl_structure.js', function () {
-
-    // Re-initialize variables.
-    primary_indexes = [];
-    indexes = [];
-    fulltext_indexes = [];
-    spatial_indexes = [];
-
-    /**
-     *Ajax action for submitting the "Column Change" and "Add Column" form
-     */
-    $(".append_fields_form.ajax").off();
-    $(document).on('submit', ".append_fields_form.ajax", function (event) {
-        event.preventDefault();
-        /**
-         * @var    the_form    object referring to the export form
-         */
-        var $form = $(this);
-        var field_cnt = $form.find('input[name=orig_num_fields]').val();
-
-
-        function submitForm(){
-            $msg = PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
-            $.post($form.attr('action'), $form.serialize() + '&do_save_data=1', function (data) {
-                if ($(".sqlqueryresults").length !== 0) {
-                    $(".sqlqueryresults").remove();
-                } else if ($(".error:not(.tab)").length !== 0) {
-                    $(".error:not(.tab)").remove();
-                }
-                if (typeof data.success != 'undefined' && data.success === true) {
-                    $("#page_content")
-                        .empty()
-                        .append(data.message)
-                        .show();
-                    PMA_highlightSQL($('#page_content'));
-                    $(".result_query .notice").remove();
-                    reloadFieldForm();
-                    $form.remove();
-                    PMA_ajaxRemoveMessage($msg);
-                    PMA_init_slider();
-                    PMA_reloadNavigation();
-                } else {
-                    PMA_ajaxShowMessage(data.error, false);
-                }
-            }); // end $.post()
-        }
-
-        function checkIfConfirmRequired($form, $field_cnt) {
-            var i = 0, id, elm, val, name_orig, elm_orig, val_orig;
-            var checkRequired = false;
-            for (i = 0; i < field_cnt; i++) {
-                id = "#field_" + i + "_5";
-                elm = $(id);
-                val = elm.val();
-
-                name_orig = "input[name=field_collation_orig\\[" + i + "\\]]";
-                elm_orig = $form.find(name_orig);
-                val_orig = elm_orig.val();
-
-                if (val && val_orig && val !== val_orig){
-                    checkRequired = true;
-                    break;
-                }
-            }
-            return checkRequired;
-        }
-
-        /*
-         * First validate the form; if there is a problem, avoid submitting it
-         *
-         * checkTableEditForm() needs a pure element and not a jQuery object,
-         * this is why we pass $form[0] as a parameter (the jQuery object
-         * is actually an array of DOM elements)
-         */
-        if (checkTableEditForm($form[0], field_cnt)) {
-            // OK, form passed validation step
-
-            PMA_prepareForAjaxRequest($form);
-            if (PMA_checkReservedWordColumns($form)) {
-                //User wants to submit the form
-
-                // If Collation is changed, Warn and Confirm
-                if (checkIfConfirmRequired($form, field_cnt)){
-                    var question = sprintf(
-                        PMA_messages.strChangeColumnCollation, 'https://wiki.phpmyadmin.net/pma/Garbled_data'
-                    );
-                    $form.PMA_confirm(question, $form.attr('action'), function (url) {
-                        submitForm();
-                    });
-                } else {
-                    submitForm();
-                }
-            }
-        }
-    }); // end change table button "do_save_data"
-
-    /**
-     * Attach Event Handler for 'Drop Column'
-     */
-    $(document).on('click', "a.drop_column_anchor.ajax", function (event) {
-        event.preventDefault();
-        /**
-         * @var curr_table_name String containing the name of the current table
-         */
-        var curr_table_name = $(this).closest('form').find('input[name=table]').val();
-        /**
-         * @var curr_row    Object reference to the currently selected row (i.e. field in the table)
-         */
-        var $curr_row = $(this).parents('tr');
-        /**
-         * @var curr_column_name    String containing name of the field referred to by {@link curr_row}
-         */
-        var curr_column_name = $curr_row.children('th').children('label').text().trim();
-        curr_column_name = escapeHtml(curr_column_name);
-        /**
-         * @var $after_field_item    Corresponding entry in the 'After' field.
-         */
-        var $after_field_item = $("select[name='after_field'] option[value='" + curr_column_name + "']");
-        /**
-         * @var question    String containing the question to be asked for confirmation
-         */
-        var question = PMA_sprintf(PMA_messages.strDoYouReally, 'ALTER TABLE `' + escapeHtml(curr_table_name) + '` DROP `' + escapeHtml(curr_column_name) + '`;');
-        $(this).PMA_confirm(question, $(this).attr('href'), function (url) {
-            var $msg = PMA_ajaxShowMessage(PMA_messages.strDroppingColumn, false);
-            $.post(url, {'is_js_confirmed' : 1, 'ajax_request' : true, 'ajax_page_request' : true}, function (data) {
-                if (typeof data !== 'undefined' && data.success === true) {
-                    PMA_ajaxRemoveMessage($msg);
-                    if ($('.result_query').length) {
-                        $('.result_query').remove();
-                    }
-                    if (data.sql_query) {
-                        $('<div class="result_query"></div>')
-                            .html(data.sql_query)
-                            .prependTo('#structure_content');
-                        PMA_highlightSQL($('#page_content'));
-                    }
-                    toggleRowColors($curr_row.next());
-                    // Adjust the row numbers
-                    for (var $row = $curr_row.next(); $row.length > 0; $row = $row.next()) {
-                        var new_val = parseInt($row.find('td:nth-child(2)').text(), 10) - 1;
-                        $row.find('td:nth-child(2)').text(new_val);
-                    }
-                    $after_field_item.remove();
-                    $curr_row.hide("medium").remove();
-
-                    // Remove the dropped column from select menu for 'after field'
-                    $("select[name=after_field]").find(
-                        '[value="' + curr_column_name + '"]'
-                    ).remove();
-
-                    // by default select the (new) last option to add new column
-                    // (in case last column is dropped)
-                    $("select[name=after_field] option:last").attr("selected","selected");
-
-                    //refresh table stats
-                    if (data.tableStat) {
-                        $('#tablestatistics').html(data.tableStat);
-                    }
-                    // refresh the list of indexes (comes from sql.php)
-                    $('.index_info').replaceWith(data.indexes_list);
-                    PMA_reloadNavigation();
-                } else {
-                    PMA_ajaxShowMessage(PMA_messages.strErrorProcessingRequest + " : " + data.error, false);
-                }
-            }); // end $.post()
-        }); // end $.PMA_confirm()
-    }); //end of Drop Column Anchor action
-
-    /**
-     * Attach Event Handler for 'Print' link
-     */
-    $(document).on('click', "#printView", function (event) {
-        event.preventDefault();
-
-        // Take to preview mode
-        printPreview();
-    }); //end of Print View action
-
-    /**
-     * Ajax Event handler for adding keys
-     */
-    $(document).on('click', "a.add_key.ajax", function (event) {
-        event.preventDefault();
-
-        var $this = $(this);
-        var curr_table_name = $this.closest('form').find('input[name=table]').val();
-        var curr_column_name = $this.parents('tr').children('th').children('label').text().trim();
-
-        var add_clause = '';
-        if ($this.is('.add_primary_key_anchor')) {
-            add_clause = 'ADD PRIMARY KEY';
-        } else if ($this.is('.add_index_anchor')) {
-            add_clause = 'ADD INDEX';
-        } else if ($this.is('.add_unique_anchor')) {
-            add_clause = 'ADD UNIQUE';
-        } else if ($this.is('.add_spatial_anchor')) {
-            add_clause = 'ADD SPATIAL';
-        } else if ($this.is('.add_fulltext_anchor')) {
-            add_clause = 'ADD FULLTEXT';
-        }
-        var question = PMA_sprintf(PMA_messages.strDoYouReally, 'ALTER TABLE `' +
-                escapeHtml(curr_table_name) + '` ' + add_clause + '(`' + escapeHtml(curr_column_name) + '`);');
-
-        $(this).PMA_confirm(question, $(this).attr('href'), function (url) {
-            PMA_ajaxShowMessage();
-            AJAX.source = $this;
-            $.post(url, {'ajax_request' : true, 'ajax_page_request' : true}, AJAX.responseHandler);
-        }); // end $.PMA_confirm()
-    }); //end Add key
-
-    /**
-     * Inline move columns
-    **/
-    $(document).on('click', "#move_columns_anchor", function (e) {
-        e.preventDefault();
-
-        if ($(this).hasClass("move-active")) {
-            return;
-        }
-
-        /**
-         * @var    button_options  Object that stores the options passed to jQueryUI
-         *                          dialog
-         */
-        var button_options = {};
-
-        button_options[PMA_messages.strGo] = function (event) {
-            event.preventDefault();
-            var $msgbox = PMA_ajaxShowMessage();
-            var $this = $(this);
-            var $form = $this.find("form");
-            var serialized = $form.serialize();
-
-            // check if any columns were moved at all
-            if (serialized == $form.data("serialized-unmoved")) {
-                PMA_ajaxRemoveMessage($msgbox);
-                $this.dialog('close');
-                return;
-            }
-
-            $.post($form.prop("action"), serialized + "&ajax_request=true", function (data) {
-                if (data.success === false) {
-                    PMA_ajaxRemoveMessage($msgbox);
-                    $this
-                    .clone()
-                    .html(data.error)
-                    .dialog({
-                        title: $(this).prop("title"),
-                        height: 230,
-                        width: 900,
-                        modal: true,
-                        buttons: button_options_error
-                    }); // end dialog options
-                } else {
-                    if ($('#fieldsForm').hasClass('HideStructureActions')) {
-                        $('#fieldsForm').find('ul.table-structure-actions').menuResizer('destroy');
-                    }
-                    // sort the fields table
-                    var $fields_table = $("table#tablestructure tbody");
-                    // remove all existing rows and remember them
-                    var $rows = $fields_table.find("tr").remove();
-                    // loop through the correct order
-                    for (var i in data.columns) {
-                        var the_column = data.columns[i];
-                        var $the_row = $rows
-                            .find("input:checkbox[value=" + the_column + "]")
-                            .closest("tr");
-                        // append the row for this column to the table
-                        $fields_table.append($the_row);
-                    }
-                    var $firstrow = $fields_table.find("tr").eq(0);
-                    // Adjust the row numbers and colors
-                    for (var $row = $firstrow; $row.length > 0; $row = $row.next()) {
-                        $row
-                        .find('td:nth-child(2)')
-                        .text($row.index() + 1)
-                        .end()
-                        .removeClass("odd even")
-                        .addClass($row.index() % 2 === 0 ? "odd" : "even");
-                    }
-                    PMA_ajaxShowMessage(data.message);
-                    $this.dialog('close');
-                    if ($('#fieldsForm').hasClass('HideStructureActions')) {
-                        $('#fieldsForm').find('ul.table-structure-actions').menuResizer(PMA_tbl_structure_menu_resizer_callback);
-                    }
-                }
-            });
-        };
-        button_options[PMA_messages.strCancel] = function () {
-            $(this).dialog('close');
-        };
-
-        var button_options_error = {};
-        button_options_error[PMA_messages.strOK] = function () {
-            $(this).dialog('close').remove();
-        };
-
-        var columns = [];
-
-        $("#tablestructure").find("tbody tr").each(function () {
-            var col_name = $(this).find("input:checkbox").eq(0).val();
-            var hidden_input = $("<input/>")
-                .prop({
-                    name: "move_columns[]",
-                    type: "hidden"
-                })
-                .val(col_name);
-            columns[columns.length] = $("<li/>")
-                .addClass("placeholderDrag")
-                .text(col_name)
-                .append(hidden_input);
-        });
-
-        var col_list = $("#move_columns_dialog").find("ul")
-            .find("li").remove().end();
-        for (var i in columns) {
-            col_list.append(columns[i]);
-        }
-        col_list.sortable({
-            axis: 'y',
-            containment: $("#move_columns_dialog").find("div"),
-            tolerance: 'pointer'
-        }).disableSelection();
-        var $form = $("#move_columns_dialog").find("form");
-        $form.data("serialized-unmoved", $form.serialize());
-
-        $("#move_columns_dialog").dialog({
-            modal: true,
-            buttons: button_options,
-            open: function () {
-                if ($('#move_columns_dialog').parents('.ui-dialog').height() > $(window).height()) {
-                    $('#move_columns_dialog').dialog("option", "height", $(window).height());
-                }
-            },
-            beforeClose: function () {
-                $("#move_columns_anchor").removeClass("move-active");
-            }
-        });
-    });
-
-    /**
-     * Handles multi submits in table structure page such as change, browse, drop, primary etc.
-     */
-    $('body').on('click', '#fieldsForm.ajax button[name="submit_mult"], #fieldsForm.ajax input[name="submit_mult"]', function (e) {
-        e.preventDefault();
-        var $button = $(this);
-        var $form = $button.parents('form');
-        var submitData = $form.serialize() + '&ajax_request=true&ajax_page_request=true&submit_mult=' + $button.val();
-        PMA_ajaxShowMessage();
-        AJAX.source = $form;
-        $.post($form.attr('action'), submitData, AJAX.responseHandler);
-    });
-
-    /**
-     * Handles clicks on Action links in partition table
-     */
-    $(document).on('click', 'a[name^=partition_action].ajax', function (e) {
-        e.preventDefault();
-        var $link = $(this);
-
-        function submitPartitionAction(url) {
-            var submitData = '&ajax_request=true&ajax_page_request=true';
-            PMA_ajaxShowMessage();
-            AJAX.source = $link;
-            $.post(url, submitData, AJAX.responseHandler);
-        }
-
-        if ($link.is('#partition_action_DROP')) {
-            var question = PMA_messages.strDropPartitionWarning;
-            $link.PMA_confirm(question, $link.attr('href'), function (url) {
-                submitPartitionAction(url);
-            });
-        } else if ($link.is('#partition_action_TRUNCATE')) {
-            var question = PMA_messages.strTruncatePartitionWarning;
-            $link.PMA_confirm(question, $link.attr('href'), function (url) {
-                submitPartitionAction(url);
-            });
-        } else {
-            submitPartitionAction($link.attr('href'));
-        }
-    });
-
-    /**
-     * Handles remove partitioning
-     */
-    $(document).on('click', '#remove_partitioning.ajax', function (e) {
-        e.preventDefault();
-        var $link = $(this);
-        var question = PMA_messages.strRemovePartitioningWarning;
-        $link.PMA_confirm(question, $link.attr('href'), function (url) {
-            var submitData = '&ajax_request=true&ajax_page_request=true';
-            PMA_ajaxShowMessage();
-            AJAX.source = $link;
-            $.post(url, submitData, AJAX.responseHandler);
-        });
-    });
-});
-
-/** Handler for "More" dropdown in structure table rows */
-AJAX.registerOnload('tbl_structure.js', function () {
-    if ($('#fieldsForm').hasClass('HideStructureActions')) {
-        $('#fieldsForm').find('ul.table-structure-actions').menuResizer(PMA_tbl_structure_menu_resizer_callback);
-    } else {
-        $('.table-structure-actions').width(function () {
-            var width = 5;
-            $(this).find('li').each(function () {
-                width += $(this).outerWidth(true);
-            });
-            return width;
-        });
-    }
-});
-AJAX.registerTeardown('tbl_structure.js', function () {
-    if ($('#fieldsForm').hasClass('HideStructureActions')) {
-        $('#fieldsForm').find('ul.table-structure-actions').menuResizer('destroy');
-    }
-});
-$(function () {
-    $(window).resize($.throttle(function () {
-        if ($('#fieldsForm').length && $('#fieldsForm').hasClass('HideStructureActions')) {
-            $('#fieldsForm').find('ul.table-structure-actions').menuResizer('resize');
-        }
-    }));
-});
diff --git a/#pma/js/tbl_tracking.js b/#pma/js/tbl_tracking.js
deleted file mode 100644
index 920a9225..00000000
--- a/#pma/js/tbl_tracking.js
+++ /dev/null
@@ -1,100 +0,0 @@
-/**
- * Unbind all event handlers before tearing down the page
- */
-AJAX.registerTeardown('tbl_tracking.js', function () {
-    $('body').off('click', '#versionsForm.ajax button[name="submit_mult"], #versionsForm.ajax input[name="submit_mult"]');
-    $('body').off('click', 'a.delete_version_anchor.ajax');
-    $('body').off('click', 'a.delete_entry_anchor.ajax');
-});
-
-/**
- * Bind event handlers
- */
-AJAX.registerOnload('tbl_tracking.js', function () {
-
-    $('#versions tr:first th').append($('<div class="sorticon"></div>'));
-    $('#versions').tablesorter({
-        sortList: [[1, 0]],
-        headers: {
-            0: {sorter: false},
-            1: {sorter: "integer"},
-            5: {sorter: false},
-            6: {sorter: false}
-        }
-    });
-
-    if ($('#ddl_versions tbody tr').length > 0) {
-        $('#ddl_versions tr:first th').append($('<div class="sorticon"></div>'));
-        $('#ddl_versions').tablesorter({
-            sortList: [[0, 0]],
-            headers: {
-                0: {sorter: "integer"},
-                3: {sorter: false},
-                4: {sorter: false}
-            }
-        });
-    }
-
-    if ($('#dml_versions tbody tr').length > 0) {
-        $('#dml_versions tr:first th').append($('<div class="sorticon"></div>'));
-        $('#dml_versions').tablesorter({
-            sortList: [[0, 0]],
-            headers: {
-                0: {sorter: "integer"},
-                3: {sorter: false},
-                4: {sorter: false}
-            }
-        });
-    }
-
-    /**
-     * Handles multi submit for tracking versions
-     */
-    $('body').on('click', '#versionsForm.ajax button[name="submit_mult"], #versionsForm.ajax input[name="submit_mult"]', function (e) {
-        e.preventDefault();
-        var $button = $(this);
-        var $form = $button.parent('form');
-        var submitData = $form.serialize() + '&ajax_request=true&ajax_page_request=true&submit_mult=' + $button.val();
-
-        if ($button.val() == 'delete_version') {
-            var question = PMA_messages.strDeleteTrackingVersionMultiple;
-            $button.PMA_confirm(question, $form.attr('action'), function (url) {
-                PMA_ajaxShowMessage();
-                AJAX.source = $form;
-                $.post(url, submitData, AJAX.responseHandler);
-            });
-        } else {
-            PMA_ajaxShowMessage();
-            AJAX.source = $form;
-            $.post($form.attr('action'), submitData, AJAX.responseHandler);
-        }
-    });
-
-    /**
-     * Ajax Event handler for 'Delete version'
-     */
-    $('body').on('click', 'a.delete_version_anchor.ajax', function (e) {
-        e.preventDefault();
-        var $anchor = $(this);
-        var question = PMA_messages.strDeleteTrackingVersion;
-        $anchor.PMA_confirm(question, $anchor.attr('href'), function (url) {
-            PMA_ajaxShowMessage();
-            AJAX.source = $anchor;
-            $.post(url, {'ajax_page_request': true, 'ajax_request': true}, AJAX.responseHandler);
-        });
-    });
-
-    /**
-     * Ajax Event handler for 'Delete tracking report entry'
-     */
-    $('body').on('click', 'a.delete_entry_anchor.ajax', function (e) {
-        e.preventDefault();
-        var $anchor = $(this);
-        var question = PMA_messages.strDeletingTrackingEntry;
-        $anchor.PMA_confirm(question, $anchor.attr('href'), function (url) {
-            PMA_ajaxShowMessage();
-            AJAX.source = $anchor;
-            $.post(url, {'ajax_page_request': true, 'ajax_request': true}, AJAX.responseHandler);
-        });
-    });
-});
\ No newline at end of file
diff --git a/#pma/js/tbl_zoom_plot_jqplot.js b/#pma/js/tbl_zoom_plot_jqplot.js
deleted file mode 100644
index d4344d3e..00000000
--- a/#pma/js/tbl_zoom_plot_jqplot.js
+++ /dev/null
@@ -1,645 +0,0 @@
-// TODO: change the axis
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- ** @fileoverview JavaScript functions used on tbl_select.php
- **
- ** @requires    jQuery
- ** @requires    js/functions.js
- **/
-
-
-/**
- **  Display Help/Info
- **/
-function displayHelp() {
-    $('<div />')
-        .append(PMA_messages.strDisplayHelp)
-        .appendTo('#page_content')
-        .dialog({
-            width: 450,
-            height: 'auto',
-            title: PMA_messages.strHelpTitle
-        });
-    return false;
-}
-
-/**
- ** Extend the array object for max function
- ** @param array
- **/
-Array.max = function (array) {
-    return Math.max.apply(Math, array);
-};
-
-/**
- ** Extend the array object for min function
- ** @param array
- **/
-Array.min = function (array) {
-    return Math.min.apply(Math, array);
-};
-
-/**
- ** Checks if a string contains only numeric value
- ** @param n: String (to be checked)
- **/
-function isNumeric(n) {
-    return !isNaN(parseFloat(n)) && isFinite(n);
-}
-
-/**
- ** Checks if an object is empty
- ** @param n: Object (to be checked)
- **/
-function isEmpty(obj) {
-    var name;
-    for (name in obj) {
-        return false;
-    }
-    return true;
-}
-
-/**
- ** Converts a date/time into timestamp
- ** @param val  String Date
- ** @param type Sring  Field type(datetime/timestamp/time/date)
- **/
-function getTimeStamp(val, type) {
-    if (type.toString().search(/datetime/i) != -1 ||
-        type.toString().search(/timestamp/i) != -1
-    ) {
-        return $.datepicker.parseDateTime('yy-mm-dd', 'HH:mm:ss', val);
-    }
-    else if (type.toString().search(/time/i) != -1) {
-        return $.datepicker.parseDateTime('yy-mm-dd', 'HH:mm:ss', '1970-01-01 ' + val);
-    }
-    else if (type.toString().search(/date/i) != -1) {
-        return $.datepicker.parseDate('yy-mm-dd', val);
-    }
-}
-
-/**
- ** Classifies the field type into numeric,timeseries or text
- ** @param field: field type (as in database structure)
- **/
-function getType(field) {
-    if (field.toString().search(/int/i) != -1 ||
-        field.toString().search(/decimal/i) != -1 ||
-        field.toString().search(/year/i) != -1
-    ) {
-        return 'numeric';
-    } else if (field.toString().search(/time/i) != -1 ||
-        field.toString().search(/date/i) != -1
-    ) {
-        return 'time';
-    } else {
-        return 'text';
-    }
-}
-/**
- ** Converts a categorical array into numeric array
- ** @param array categorical values array
- **/
-function getCord(arr) {
-    var newCord = [];
-    var original = $.extend(true, [], arr);
-    arr = jQuery.unique(arr).sort();
-    $.each(original, function (index, value) {
-        newCord.push(jQuery.inArray(value, arr));
-    });
-    return [newCord, arr, original];
-}
-
-/**
- ** Scrolls the view to the display section
- **/
-function scrollToChart() {
-    var x = $('#dataDisplay').offset().top - 100; // 100 provides buffer in viewport
-    $('html,body').animate({scrollTop: x}, 500);
-}
-
-/**
- * Unbind all event handlers before tearing down a page
- */
-AJAX.registerTeardown('tbl_zoom_plot_jqplot.js', function () {
-    $('#tableid_0').unbind('change');
-    $('#tableid_1').unbind('change');
-    $('#tableid_2').unbind('change');
-    $('#tableid_3').unbind('change');
-    $('#inputFormSubmitId').unbind('click');
-    $('#togglesearchformlink').unbind('click');
-    $(document).off('keydown', "#dataDisplay :input");
-    $('button.button-reset').unbind('click');
-    $('div#resizer').unbind('resizestop');
-    $('div#querychart').unbind('jqplotDataClick');
-});
-
-AJAX.registerOnload('tbl_zoom_plot_jqplot.js', function () {
-    var cursorMode = ($("input[name='mode']:checked").val() == 'edit') ? 'crosshair' : 'pointer';
-    var currentChart = null;
-    var searchedDataKey = null;
-    var xLabel = $('#tableid_0').val();
-    var yLabel = $('#tableid_1').val();
-    // will be updated via Ajax
-    var xType = $('#types_0').val();
-    var yType = $('#types_1').val();
-    var dataLabel = $('#dataLabel').val();
-    var lastX;
-    var lastY;
-    var zoomRatio = 1;
-
-
-    // Get query result
-    var searchedData;
-    try {
-        searchedData = jQuery.parseJSON($('#querydata').html());
-    } catch (err) {
-        searchedData = null;
-    }
-
-    /**
-     ** Input form submit on field change
-     **/
-
-    // first column choice corresponds to the X axis
-    $('#tableid_0').change(function () {
-        //AJAX request for field type, collation, operators, and value field
-        $.post('tbl_zoom_select.php', {
-            'ajax_request' : true,
-            'change_tbl_info' : true,
-            'server' : PMA_commonParams.get('server'),
-            'db' : PMA_commonParams.get('db'),
-            'table' : PMA_commonParams.get('table'),
-            'field' : $('#tableid_0').val(),
-            'it' : 0,
-            'token' : PMA_commonParams.get('token')
-        }, function (data) {
-            $('#tableFieldsId').find('tr:eq(1) td:eq(0)').html(data.field_type);
-            $('#tableFieldsId').find('tr:eq(1) td:eq(1)').html(data.field_collation);
-            $('#tableFieldsId').find('tr:eq(1) td:eq(2)').html(data.field_operators);
-            $('#tableFieldsId').find('tr:eq(1) td:eq(3)').html(data.field_value);
-            xLabel = $('#tableid_0').val();
-            $('#types_0').val(data.field_type);
-            xType = data.field_type;
-            $('#collations_0').val(data.field_collations);
-            addDateTimePicker();
-        });
-    });
-
-    // second column choice corresponds to the Y axis
-    $('#tableid_1').change(function () {
-        //AJAX request for field type, collation, operators, and value field
-        $.post('tbl_zoom_select.php', {
-            'ajax_request' : true,
-            'change_tbl_info' : true,
-            'server' : PMA_commonParams.get('server'),
-            'db' : PMA_commonParams.get('db'),
-            'table' : PMA_commonParams.get('table'),
-            'field' : $('#tableid_1').val(),
-            'it' : 1,
-            'token' : PMA_commonParams.get('token')
-        }, function (data) {
-            $('#tableFieldsId').find('tr:eq(3) td:eq(0)').html(data.field_type);
-            $('#tableFieldsId').find('tr:eq(3) td:eq(1)').html(data.field_collation);
-            $('#tableFieldsId').find('tr:eq(3) td:eq(2)').html(data.field_operators);
-            $('#tableFieldsId').find('tr:eq(3) td:eq(3)').html(data.field_value);
-            yLabel = $('#tableid_1').val();
-            $('#types_1').val(data.field_type);
-            yType = data.field_type;
-            $('#collations_1').val(data.field_collations);
-            addDateTimePicker();
-        });
-    });
-
-    $('#tableid_2').change(function () {
-        //AJAX request for field type, collation, operators, and value field
-        $.post('tbl_zoom_select.php', {
-            'ajax_request' : true,
-            'change_tbl_info' : true,
-            'server' : PMA_commonParams.get('server'),
-            'db' : PMA_commonParams.get('db'),
-            'table' : PMA_commonParams.get('table'),
-            'field' : $('#tableid_2').val(),
-            'it' : 2,
-            'token' : PMA_commonParams.get('token')
-        }, function (data) {
-            $('#tableFieldsId').find('tr:eq(6) td:eq(0)').html(data.field_type);
-            $('#tableFieldsId').find('tr:eq(6) td:eq(1)').html(data.field_collation);
-            $('#tableFieldsId').find('tr:eq(6) td:eq(2)').html(data.field_operators);
-            $('#tableFieldsId').find('tr:eq(6) td:eq(3)').html(data.field_value);
-            $('#types_2').val(data.field_type);
-            $('#collations_2').val(data.field_collations);
-            addDateTimePicker();
-        });
-    });
-
-    $('#tableid_3').change(function () {
-        //AJAX request for field type, collation, operators, and value field
-        $.post('tbl_zoom_select.php', {
-            'ajax_request' : true,
-            'change_tbl_info' : true,
-            'server' : PMA_commonParams.get('server'),
-            'db' : PMA_commonParams.get('db'),
-            'table' : PMA_commonParams.get('table'),
-            'field' : $('#tableid_3').val(),
-            'it' : 3,
-            'token' : PMA_commonParams.get('token')
-        }, function (data) {
-            $('#tableFieldsId').find('tr:eq(8) td:eq(0)').html(data.field_type);
-            $('#tableFieldsId').find('tr:eq(8) td:eq(1)').html(data.field_collation);
-            $('#tableFieldsId').find('tr:eq(8) td:eq(2)').html(data.field_operators);
-            $('#tableFieldsId').find('tr:eq(8) td:eq(3)').html(data.field_value);
-            $('#types_3').val(data.field_type);
-            $('#collations_3').val(data.field_collations);
-            addDateTimePicker();
-        });
-    });
-
-    /**
-     * Input form validation
-     **/
-    $('#inputFormSubmitId').click(function () {
-        if ($('#tableid_0').get(0).selectedIndex === 0 || $('#tableid_1').get(0).selectedIndex === 0) {
-            PMA_ajaxShowMessage(PMA_messages.strInputNull);
-        } else if (xLabel == yLabel) {
-            PMA_ajaxShowMessage(PMA_messages.strSameInputs);
-        }
-    });
-
-    /**
-      ** Prepare a div containing a link, otherwise it's incorrectly displayed
-      ** after a couple of clicks
-      **/
-    $('<div id="togglesearchformdiv"><a id="togglesearchformlink"></a></div>')
-        .insertAfter('#zoom_search_form')
-        // don't show it until we have results on-screen
-        .hide();
-
-    $('#togglesearchformlink')
-        .html(PMA_messages.strShowSearchCriteria)
-        .bind('click', function () {
-            var $link = $(this);
-            $('#zoom_search_form').slideToggle();
-            if ($link.text() == PMA_messages.strHideSearchCriteria) {
-                $link.text(PMA_messages.strShowSearchCriteria);
-            } else {
-                $link.text(PMA_messages.strHideSearchCriteria);
-            }
-            // avoid default click action
-            return false;
-        });
-
-    /**
-     ** Set dialog properties for the data display form
-     **/
-    var buttonOptions = {};
-    /*
-     * Handle saving of a row in the editor
-     */
-    buttonOptions[PMA_messages.strSave] = function () {
-        //Find changed values by comparing form values with selectedRow Object
-        var newValues = {};//Stores the values changed from original
-        var sqlTypes = {};
-        var it = 0;
-        var xChange = false;
-        var yChange = false;
-        var key;
-        var tempGetVal = function () {
-            return $(this).val();
-        };
-        for (key in selectedRow) {
-            var oldVal = selectedRow[key];
-            var newVal = ($('#edit_fields_null_id_' + it).prop('checked')) ? null : $('#edit_fieldID_' + it).val();
-            if (newVal instanceof Array) { // when the column is of type SET
-                newVal =  $('#edit_fieldID_' + it).map(tempGetVal).get().join(",");
-            }
-            if (oldVal != newVal) {
-                selectedRow[key] = newVal;
-                newValues[key] = newVal;
-                if (key == xLabel) {
-                    xChange = true;
-                    searchedData[searchedDataKey][xLabel] = newVal;
-                } else if (key == yLabel) {
-                    yChange = true;
-                    searchedData[searchedDataKey][yLabel] = newVal;
-                }
-            }
-            var $input = $('#edit_fieldID_' + it);
-            if ($input.hasClass('bit')) {
-                sqlTypes[key] = 'bit';
-            } else {
-                sqlTypes[key] = null;
-            }
-            it++;
-        } //End data update
-
-        //Update the chart series and replot
-        if (xChange || yChange) {
-            //Logic similar to plot generation, replot only if xAxis changes or yAxis changes.
-            //Code includes a lot of checks so as to replot only when necessary
-            if (xChange) {
-                xCord[searchedDataKey] = selectedRow[xLabel];
-                // [searchedDataKey][0] contains the x value
-                if (xType == 'numeric') {
-                    series[0][searchedDataKey][0] = selectedRow[xLabel];
-                } else if (xType == 'time') {
-                    series[0][searchedDataKey][0] =
-                        getTimeStamp(selectedRow[xLabel], $('#types_0').val());
-                } else {
-                    series[0][searchedDataKey][0] = '';
-                    // TODO: text values
-                }
-                currentChart.series[0].data = series[0];
-                // TODO: axis changing
-                currentChart.replot();
-
-            }
-            if (yChange) {
-                yCord[searchedDataKey] = selectedRow[yLabel];
-                // [searchedDataKey][1] contains the y value
-                if (yType == 'numeric') {
-                    series[0][searchedDataKey][1] = selectedRow[yLabel];
-                } else if (yType == 'time') {
-                    series[0][searchedDataKey][1] =
-                        getTimeStamp(selectedRow[yLabel], $('#types_1').val());
-                } else {
-                    series[0][searchedDataKey][1] = '';
-                    // TODO: text values
-                }
-                currentChart.series[0].data = series[0];
-                // TODO: axis changing
-                currentChart.replot();
-            }
-        } //End plot update
-
-        //Generate SQL query for update
-        if (!isEmpty(newValues)) {
-            var sql_query = 'UPDATE `' + PMA_commonParams.get('table') + '` SET ';
-            for (key in newValues) {
-                sql_query += '`' + key + '`=';
-                var value = newValues[key];
-
-                // null
-                if (value === null) {
-                    sql_query += 'NULL, ';
-
-                // empty
-                } else if ($.trim(value) === '') {
-                    sql_query += "'', ";
-
-                // other
-                } else {
-                    // type explicitly identified
-                    if (sqlTypes[key] !== null) {
-                        if (sqlTypes[key] == 'bit') {
-                            sql_query += "b'" + value + "', ";
-                        }
-                    // type not explicitly identified
-                    } else {
-                        if (!isNumeric(value)) {
-                            sql_query += "'" + value + "', ";
-                        } else {
-                            sql_query += value + ', ';
-                        }
-                    }
-                }
-            }
-            // remove two extraneous characters ', '
-            sql_query = sql_query.substring(0, sql_query.length - 2);
-            sql_query += ' WHERE ' + PMA_urldecode(searchedData[searchedDataKey].where_clause);
-
-            //Post SQL query to sql.php
-            $.post('sql.php', {
-                    'token' : PMA_commonParams.get('token'),
-                    'server' : PMA_commonParams.get('server'),
-                    'db' : PMA_commonParams.get('db'),
-                    'ajax_request' : true,
-                    'sql_query' : sql_query,
-                    'inline_edit' : false
-                }, function (data) {
-                    if (typeof data !== 'undefined' && data.success === true) {
-                        $('#sqlqueryresultsouter').html(data.sql_query);
-                        PMA_highlightSQL($('#sqlqueryresultsouter'));
-                    } else {
-                        PMA_ajaxShowMessage(data.error, false);
-                    }
-                }); //End $.post
-        }//End database update
-        $("#dataDisplay").dialog('close');
-    };
-    buttonOptions[PMA_messages.strCancel] = function () {
-        $(this).dialog('close');
-    };
-    $("#dataDisplay").dialog({
-        autoOpen: false,
-        title: PMA_messages.strDataPointContent,
-        modal: true,
-        buttons: buttonOptions,
-        width: $('#dataDisplay').width() + 80,
-        open: function () {
-            $(this).find('input[type=checkbox]').css('margin', '0.5em');
-        }
-    });
-    /**
-     * Attach Ajax event handlers for input fields
-     * in the dialog. Used to submit the Ajax
-     * request when the ENTER key is pressed.
-     */
-    $(document).on('keydown', "#dataDisplay :input", function (e) {
-        if (e.which === 13) { // 13 is the ENTER key
-            e.preventDefault();
-            if (typeof buttonOptions[PMA_messages.strSave] === 'function') {
-                buttonOptions[PMA_messages.strSave].call();
-            }
-        }
-    });
-
-
-    /*
-     * Generate plot using jqplot
-     */
-
-    if (searchedData !== null) {
-        $('#zoom_search_form')
-         .slideToggle()
-         .hide();
-        $('#togglesearchformlink')
-         .text(PMA_messages.strShowSearchCriteria);
-        $('#togglesearchformdiv').show();
-        var selectedRow;
-        var colorCodes = ['#FF0000', '#00FFFF', '#0000FF', '#0000A0', '#FF0080', '#800080', '#FFFF00', '#00FF00', '#FF00FF'];
-        var series = [];
-        var xCord = [];
-        var yCord = [];
-        var tempX, tempY;
-        var it = 0;
-        var xMax; // xAxis extreme max
-        var xMin; // xAxis extreme min
-        var yMax; // yAxis extreme max
-        var yMin; // yAxis extreme min
-        var xVal;
-        var yVal;
-        var format;
-
-        var options = {
-            series: [
-                // for a scatter plot
-                { showLine: false }
-            ],
-            grid: {
-                drawBorder: false,
-                shadow: false,
-                background: 'rgba(0,0,0,0)'
-            },
-            axes: {
-                xaxis: {
-                    label: $('#tableid_0').val(),
-                    labelRenderer: $.jqplot.CanvasAxisLabelRenderer
-                },
-                yaxis: {
-                    label: $('#tableid_1').val(),
-                    labelRenderer: $.jqplot.CanvasAxisLabelRenderer
-                }
-            },
-            highlighter: {
-                show: true,
-                tooltipAxes: 'y',
-                yvalues: 2,
-                // hide the first y value
-                formatString: '<span class="hide">%s</span>%s'
-            },
-            cursor: {
-                show: true,
-                zoom: true,
-                showTooltip: false
-            }
-        };
-
-        // If data label is not set, do not show tooltips
-        if (dataLabel === '') {
-            options.highlighter.show = false;
-        }
-
-        // Classify types as either numeric,time,text
-        xType = getType(xType);
-        yType = getType(yType);
-
-        // could have multiple series but we'll have just one
-        series[0] = [];
-
-        if (xType == 'time') {
-            var originalXType = $('#types_0').val();
-            if (originalXType == 'date') {
-                format = '%Y-%m-%d';
-            }
-            // TODO: does not seem to work
-            //else if (originalXType == 'time') {
-              //  format = '%H:%M';
-            //} else {
-            //    format = '%Y-%m-%d %H:%M';
-            //}
-            $.extend(options.axes.xaxis, {
-                renderer: $.jqplot.DateAxisRenderer,
-                tickOptions: {
-                    formatString: format
-                }
-            });
-        }
-        if (yType == 'time') {
-            var originalYType = $('#types_1').val();
-            if (originalYType == 'date') {
-                format = '%Y-%m-%d';
-            }
-            $.extend(options.axes.yaxis, {
-                renderer: $.jqplot.DateAxisRenderer,
-                tickOptions: {
-                    formatString: format
-                }
-            });
-        }
-
-        $.each(searchedData, function (key, value) {
-            if (xType == 'numeric') {
-                xVal = parseFloat(value[xLabel]);
-            }
-            if (xType == 'time') {
-                xVal = getTimeStamp(value[xLabel], originalXType);
-            }
-            if (yType == 'numeric') {
-                yVal = parseFloat(value[yLabel]);
-            }
-            if (yType == 'time') {
-                yVal = getTimeStamp(value[yLabel], originalYType);
-            }
-            series[0].push([
-                xVal,
-                yVal,
-                // extra Y values
-                value[dataLabel], // for highlighter
-                                  // (may set an undefined value)
-                value.where_clause, // for click on point
-                key               // key from searchedData
-            ]);
-        });
-
-        // under IE 8, the initial display is mangled; after a manual
-        // resizing, it's ok
-        // under IE 9, everything is fine
-        currentChart = $.jqplot('querychart', series, options);
-        currentChart.resetZoom();
-
-        $('button.button-reset').click(function (event) {
-            event.preventDefault();
-            currentChart.resetZoom();
-        });
-
-        $('div#resizer').resizable();
-        $('div#resizer').bind('resizestop', function (event, ui) {
-            // make room so that the handle will still appear
-            $('div#querychart').height($('div#resizer').height() * 0.96);
-            $('div#querychart').width($('div#resizer').width() * 0.96);
-            currentChart.replot({resetAxes: true});
-        });
-
-        $('div#querychart').bind('jqplotDataClick',
-            function (event, seriesIndex, pointIndex, data) {
-                searchedDataKey = data[4]; // key from searchedData (global)
-                var field_id = 0;
-                var post_params = {
-                    'ajax_request' : true,
-                    'get_data_row' : true,
-                    'server' : PMA_commonParams.get('server'),
-                    'db' : PMA_commonParams.get('db'),
-                    'table' : PMA_commonParams.get('table'),
-                    'where_clause' : data[3],
-                    'token' : PMA_commonParams.get('token')
-                };
-
-                $.post('tbl_zoom_select.php', post_params, function (data) {
-                    // Row is contained in data.row_info,
-                    // now fill the displayResultForm with row values
-                    var key;
-                    for (key in data.row_info) {
-                        var $field = $('#edit_fieldID_' + field_id);
-                        var $field_null = $('#edit_fields_null_id_' + field_id);
-                        if (data.row_info[key] === null) {
-                            $field_null.prop('checked', true);
-                            $field.val('');
-                        } else {
-                            $field_null.prop('checked', false);
-                            if ($field.attr('multiple')) { // when the column is of type SET
-                                $field.val(data.row_info[key].split(','));
-                            } else {
-                                $field.val(data.row_info[key]);
-                            }
-                        }
-                        field_id++;
-                    }
-                    selectedRow = data.row_info;
-                });
-
-                $("#dataDisplay").dialog("open");
-            }
-        );
-    }
-});
diff --git a/#pma/js/tracekit/tracekit.js b/#pma/js/tracekit/tracekit.js
deleted file mode 100644
index 78bb33be..00000000
--- a/#pma/js/tracekit/tracekit.js
+++ /dev/null
@@ -1,1114 +0,0 @@
-/*
- TraceKit - Cross brower stack traces - github.com/occ/TraceKit
- MIT license
-*/
-
-;(function(window, undefined) {
-
-
-var TraceKit = {};
-var _oldTraceKit = window.TraceKit;
-
-// global reference to slice
-var _slice = [].slice;
-var UNKNOWN_FUNCTION = '?';
-
-
-/**
- * _has, a better form of hasOwnProperty
- * Example: _has(MainHostObject, property) === true/false
- *
- * @param {Object} host object to check property
- * @param {string} key to check
- */
-function _has(object, key) {
-    return Object.prototype.hasOwnProperty.call(object, key);
-}
-
-function _isUndefined(what) {
-    return typeof what === 'undefined';
-}
-
-/**
- * TraceKit.noConflict: Export TraceKit out to another variable
- * Example: var TK = TraceKit.noConflict()
- */
-TraceKit.noConflict = function noConflict() {
-    window.TraceKit = _oldTraceKit;
-    return TraceKit;
-};
-
-/**
- * TraceKit.wrap: Wrap any function in a TraceKit reporter
- * Example: func = TraceKit.wrap(func);
- *
- * @param {Function} func Function to be wrapped
- * @return {Function} The wrapped func
- */
-TraceKit.wrap = function traceKitWrapper(func) {
-    function wrapped() {
-        try {
-            return func.apply(this, arguments);
-        } catch (e) {
-            TraceKit.report(e);
-            throw e;
-        }
-    }
-    return wrapped;
-};
-
-/**
- * TraceKit.report: cross-browser processing of unhandled exceptions
- *
- * Syntax:
- *   TraceKit.report.subscribe(function(stackInfo) { ... })
- *   TraceKit.report.unsubscribe(function(stackInfo) { ... })
- *   TraceKit.report(exception)
- *   try { ...code... } catch(ex) { TraceKit.report(ex); }
- *
- * Supports:
- *   - Firefox: full stack trace with line numbers, plus column number
- *              on top frame; column number is not guaranteed
- *   - Opera:   full stack trace with line and column numbers
- *   - Chrome:  full stack trace with line and column numbers
- *   - Safari:  line and column number for the top frame only; some frames
- *              may be missing, and column number is not guaranteed
- *   - IE:      line and column number for the top frame only; some frames
- *              may be missing, and column number is not guaranteed
- *
- * In theory, TraceKit should work on all of the following versions:
- *   - IE5.5+ (only 8.0 tested)
- *   - Firefox 0.9+ (only 3.5+ tested)
- *   - Opera 7+ (only 10.50 tested; versions 9 and earlier may require
- *     Exceptions Have Stacktrace to be enabled in opera:config)
- *   - Safari 3+ (only 4+ tested)
- *   - Chrome 1+ (only 5+ tested)
- *   - Konqueror 3.5+ (untested)
- *
- * Requires TraceKit.computeStackTrace.
- *
- * Tries to catch all unhandled exceptions and report them to the
- * subscribed handlers. Please note that TraceKit.report will rethrow the
- * exception. This is REQUIRED in order to get a useful stack trace in IE.
- * If the exception does not reach the top of the browser, you will only
- * get a stack trace from the point where TraceKit.report was called.
- *
- * Handlers receive a stackInfo object as described in the
- * TraceKit.computeStackTrace docs.
- */
-TraceKit.report = (function reportModuleWrapper() {
-    var handlers = [],
-        lastException = null,
-        lastExceptionStack = null;
-
-    /**
-     * Add a crash handler.
-     * @param {Function} handler
-     */
-    function subscribe(handler) {
-        installGlobalHandler();
-        handlers.push(handler);
-    }
-
-    /**
-     * Remove a crash handler.
-     * @param {Function} handler
-     */
-    function unsubscribe(handler) {
-        for (var i = handlers.length - 1; i >= 0; --i) {
-            if (handlers[i] === handler) {
-                handlers.splice(i, 1);
-            }
-        }
-    }
-
-    /**
-     * Dispatch stack information to all handlers.
-     * @param {Object.<string, *>} stack
-     */
-    function notifyHandlers(stack, windowError) {
-        var exception = null;
-        if (windowError && !TraceKit.collectWindowErrors) {
-          return;
-        }
-        for (var i in handlers) {
-            if (_has(handlers, i)) {
-                try {
-                    handlers[i].apply(null, [stack].concat(_slice.call(arguments, 2)));
-                } catch (inner) {
-                    exception = inner;
-                }
-            }
-        }
-
-        if (exception) {
-            throw exception;
-        }
-    }
-
-    var _oldOnerrorHandler, _onErrorHandlerInstalled;
-
-    /**
-     * Ensures all global unhandled exceptions are recorded.
-     * Supported by Gecko and IE.
-     * @param {string} message Error message.
-     * @param {string} url URL of script that generated the exception.
-     * @param {(number|string)} lineNo The line number at which the error
-     * occurred.
-     */
-    function traceKitWindowOnError(message, url, lineNo) {
-        var stack = null;
-
-        if (lastExceptionStack) {
-            TraceKit.computeStackTrace.augmentStackTraceWithInitialElement(lastExceptionStack, url, lineNo, message);
-            stack = lastExceptionStack;
-            lastExceptionStack = null;
-            lastException = null;
-        } else {
-            var location = {
-                'url': url,
-                'line': lineNo
-            };
-            location.func = TraceKit.computeStackTrace.guessFunctionName(location.url, location.line);
-            location.context = TraceKit.computeStackTrace.gatherContext(location.url, location.line);
-            stack = {
-                'mode': 'onerror',
-                'message': message,
-                'url': document.location.href,
-                'stack': [location],
-                'useragent': navigator.userAgent
-            };
-        }
-
-        notifyHandlers(stack, 'from window.onerror');
-
-        if (_oldOnerrorHandler) {
-            return _oldOnerrorHandler.apply(this, arguments);
-        }
-
-        return false;
-    }
-
-    function installGlobalHandler ()
-    {
-        if (_onErrorHandlerInstalled === true) {
-            return;
-        }
-        _oldOnerrorHandler = window.onerror;
-        window.onerror = traceKitWindowOnError;
-        _onErrorHandlerInstalled = true;
-    }
-
-    /**
-     * Reports an unhandled Error to TraceKit.
-     * @param {Error} ex
-     */
-    function report(ex) {
-        var args = _slice.call(arguments, 1);
-        if (lastExceptionStack) {
-            if (lastException === ex) {
-                return; // already caught by an inner catch block, ignore
-            } else {
-                var s = lastExceptionStack;
-                lastExceptionStack = null;
-                lastException = null;
-                notifyHandlers.apply(null, [s, null].concat(args));
-            }
-        }
-
-        var stack = TraceKit.computeStackTrace(ex);
-        lastExceptionStack = stack;
-        lastException = ex;
-
-        // If the stack trace is incomplete, wait for 2 seconds for
-        // slow slow IE to see if onerror occurs or not before reporting
-        // this exception; otherwise, we will end up with an incomplete
-        // stack trace
-        window.setTimeout(function () {
-            if (lastException === ex) {
-                lastExceptionStack = null;
-                lastException = null;
-                notifyHandlers.apply(null, [stack, null].concat(args));
-            }
-        }, (stack.incomplete ? 2000 : 0));
-
-        throw ex; // re-throw to propagate to the top level (and cause window.onerror)
-    }
-
-    report.subscribe = subscribe;
-    report.unsubscribe = unsubscribe;
-    return report;
-}());
-
-/**
- * TraceKit.computeStackTrace: cross-browser stack traces in JavaScript
- *
- * Syntax:
- *   s = TraceKit.computeStackTrace.ofCaller([depth])
- *   s = TraceKit.computeStackTrace(exception) // consider using TraceKit.report instead (see below)
- * Returns:
- *   s.name              - exception name
- *   s.message           - exception message
- *   s.stack[i].url      - JavaScript or HTML file URL
- *   s.stack[i].func     - function name, or empty for anonymous functions (if guessing did not work)
- *   s.stack[i].args     - arguments passed to the function, if known
- *   s.stack[i].line     - line number, if known
- *   s.stack[i].column   - column number, if known
- *   s.stack[i].context  - an array of source code lines; the middle element corresponds to the correct line#
- *   s.mode              - 'stack', 'stacktrace', 'multiline', 'callers', 'onerror', or 'failed' -- method used to collect the stack trace
- *
- * Supports:
- *   - Firefox:  full stack trace with line numbers and unreliable column
- *               number on top frame
- *   - Opera 10: full stack trace with line and column numbers
- *   - Opera 9-: full stack trace with line numbers
- *   - Chrome:   full stack trace with line and column numbers
- *   - Safari:   line and column number for the topmost stacktrace element
- *               only
- *   - IE:       no line numbers whatsoever
- *
- * Tries to guess names of anonymous functions by looking for assignments
- * in the source code. In IE and Safari, we have to guess source file names
- * by searching for function bodies inside all page scripts. This will not
- * work for scripts that are loaded cross-domain.
- * Here be dragons: some function names may be guessed incorrectly, and
- * duplicate functions may be mismatched.
- *
- * TraceKit.computeStackTrace should only be used for tracing purposes.
- * Logging of unhandled exceptions should be done with TraceKit.report,
- * which builds on top of TraceKit.computeStackTrace and provides better
- * IE support by utilizing the window.onerror event to retrieve information
- * about the top of the stack.
- *
- * Note: In IE and Safari, no stack trace is recorded on the Error object,
- * so computeStackTrace instead walks its *own* chain of callers.
- * This means that:
- *  * in Safari, some methods may be missing from the stack trace;
- *  * in IE, the topmost function in the stack trace will always be the
- *    caller of computeStackTrace.
- *
- * This is okay for tracing (because you are likely to be calling
- * computeStackTrace from the function you want to be the topmost element
- * of the stack trace anyway), but not okay for logging unhandled
- * exceptions (because your catch block will likely be far away from the
- * inner function that actually caused the exception).
- *
- * Tracing example:
- *     function trace(message) {
- *         var stackInfo = TraceKit.computeStackTrace.ofCaller();
- *         var data = message + "\n";
- *         for(var i in stackInfo.stack) {
- *             var item = stackInfo.stack[i];
- *             data += (item.func || '[anonymous]') + "() in " + item.url + ":" + (item.line || '0') + "\n";
- *         }
- *         if (window.console)
- *             console.info(data);
- *         else
- *             alert(data);
- *     }
- */
-TraceKit.computeStackTrace = (function computeStackTraceWrapper() {
-    var debug = false,
-        sourceCache = {};
-
-    /**
-     * Attempts to retrieve source code via XMLHttpRequest, which is used
-     * to look up anonymous function names.
-     * @param {string} url URL of source code.
-     * @return {string} Source contents.
-     */
-    function loadSource(url) {
-        if (!TraceKit.remoteFetching) { //Only attempt request if remoteFetching is on.
-            return '';
-        }
-        try {
-            function getXHR() {
-                try {
-                    return new window.XMLHttpRequest();
-                } catch (e) {
-                    // explicitly bubble up the exception if not found
-                    return new window.ActiveXObject('Microsoft.XMLHTTP');
-                }
-            }
-
-            var request = getXHR();
-            request.open('GET', url, false);
-            request.send('');
-            return request.responseText;
-        } catch (e) {
-            return '';
-        }
-    }
-
-    /**
-     * Retrieves source code from the source code cache.
-     * @param {string} url URL of source code.
-     * @return {Array.<string>} Source contents.
-     */
-    function getSource(url) {
-        if (!_has(sourceCache, url)) {
-            // URL needs to be able to fetched within the acceptable domain.  Otherwise,
-            // cross-domain errors will be triggered.
-            var source = '';
-            if (url.indexOf(document.domain) !== -1) {
-                source = loadSource(url);
-            }
-            sourceCache[url] = source ? source.split('\n') : [];
-        }
-
-        return sourceCache[url];
-    }
-
-    /**
-     * Tries to use an externally loaded copy of source code to determine
-     * the name of a function by looking at the name of the variable it was
-     * assigned to, if any.
-     * @param {string} url URL of source code.
-     * @param {(string|number)} lineNo Line number in source code.
-     * @return {string} The function name, if discoverable.
-     */
-    function guessFunctionName(url, lineNo) {
-        var reFunctionArgNames = /function ([^(]*)\(([^)]*)\)/,
-            reGuessFunction = /['"]?([0-9A-Za-z$_]+)['"]?\s*[:=]\s*(function|eval|new Function)/,
-            line = '',
-            maxLines = 10,
-            source = getSource(url),
-            m;
-
-        if (!source.length) {
-            return UNKNOWN_FUNCTION;
-        }
-
-        // Walk backwards from the first line in the function until we find the line which
-        // matches the pattern above, which is the function definition
-        for (var i = 0; i < maxLines; ++i) {
-            line = source[lineNo - i] + line;
-
-            if (!_isUndefined(line)) {
-                if ((m = reGuessFunction.exec(line))) {
-                    return m[1];
-                } else if ((m = reFunctionArgNames.exec(line))) {
-                    return m[1];
-                }
-            }
-        }
-
-        return UNKNOWN_FUNCTION;
-    }
-
-    /**
-     * Retrieves the surrounding lines from where an exception occurred.
-     * @param {string} url URL of source code.
-     * @param {(string|number)} line Line number in source code to centre
-     * around for context.
-     * @return {?Array.<string>} Lines of source code.
-     */
-    function gatherContext(url, line) {
-        var source = getSource(url);
-
-        if (!source.length) {
-            return null;
-        }
-
-        var context = [],
-            // linesBefore & linesAfter are inclusive with the offending line.
-            // if linesOfContext is even, there will be one extra line
-            //   *before* the offending line.
-            linesBefore = Math.floor(TraceKit.linesOfContext / 2),
-            // Add one extra line if linesOfContext is odd
-            linesAfter = linesBefore + (TraceKit.linesOfContext % 2),
-            start = Math.max(0, line - linesBefore - 1),
-            end = Math.min(source.length, line + linesAfter - 1);
-
-        line -= 1; // convert to 0-based index
-
-        for (var i = start; i < end; ++i) {
-            if (!_isUndefined(source[i])) {
-                context.push(source[i]);
-            }
-        }
-
-        return context.length > 0 ? context : null;
-    }
-
-    /**
-     * Escapes special characters, except for whitespace, in a string to be
-     * used inside a regular expression as a string literal.
-     * @param {string} text The string.
-     * @return {string} The escaped string literal.
-     */
-    function escapeRegExp(text) {
-        return text.replace(/[\-\[\]{}()*+?.,\\\^$|#]/g, '\\$&');
-    }
-
-    /**
-     * Escapes special characters in a string to be used inside a regular
-     * expression as a string literal. Also ensures that HTML entities will
-     * be matched the same as their literal friends.
-     * @param {string} body The string.
-     * @return {string} The escaped string.
-     */
-    function escapeCodeAsRegExpForMatchingInsideHTML(body) {
-        return escapeRegExp(body).replace('<', '(?:<|&lt;)').replace('>', '(?:>|&gt;)').replace('&', '(?:&|&amp;)').replace('"', '(?:"|&quot;)').replace(/\s+/g, '\\s+');
-    }
-
-    /**
-     * Determines where a code fragment occurs in the source code.
-     * @param {RegExp} re The function definition.
-     * @param {Array.<string>} urls A list of URLs to search.
-     * @return {?Object.<string, (string|number)>} An object containing
-     * the url, line, and column number of the defined function.
-     */
-    function findSourceInUrls(re, urls) {
-        var source, m;
-        for (var i = 0, j = urls.length; i < j; ++i) {
-            // console.log('searching', urls[i]);
-            if ((source = getSource(urls[i])).length) {
-                source = source.join('\n');
-                if ((m = re.exec(source))) {
-                    // console.log('Found function in ' + urls[i]);
-
-                    return {
-                        'url': urls[i],
-                        'line': source.substring(0, m.index).split('\n').length,
-                        'column': m.index - source.lastIndexOf('\n', m.index) - 1
-                    };
-                }
-            }
-        }
-
-        // console.log('no match');
-
-        return null;
-    }
-
-    /**
-     * Determines at which column a code fragment occurs on a line of the
-     * source code.
-     * @param {string} fragment The code fragment.
-     * @param {string} url The URL to search.
-     * @param {(string|number)} line The line number to examine.
-     * @return {?number} The column number.
-     */
-    function findSourceInLine(fragment, url, line) {
-        var source = getSource(url),
-            re = new RegExp('\\b' + escapeRegExp(fragment) + '\\b'),
-            m;
-
-        line -= 1;
-
-        if (source && source.length > line && (m = re.exec(source[line]))) {
-            return m.index;
-        }
-
-        return null;
-    }
-
-    /**
-     * Determines where a function was defined within the source code.
-     * @param {(Function|string)} func A function reference or serialized
-     * function definition.
-     * @return {?Object.<string, (string|number)>} An object containing
-     * the url, line, and column number of the defined function.
-     */
-    function findSourceByFunctionBody(func) {
-        var urls = [window.location.href],
-            scripts = document.getElementsByTagName('script'),
-            body,
-            code = '' + func,
-            codeRE = /^function(?:\s+([\w$]+))?\s*\(([\w\s,]*)\)\s*\{\s*(\S[\s\S]*\S)\s*\}\s*$/,
-            eventRE = /^function on([\w$]+)\s*\(event\)\s*\{\s*(\S[\s\S]*\S)\s*\}\s*$/,
-            re,
-            parts,
-            result;
-
-        for (var i = 0; i < scripts.length; ++i) {
-            var script = scripts[i];
-            if (script.src) {
-                urls.push(script.src);
-            }
-        }
-
-        if (!(parts = codeRE.exec(code))) {
-            re = new RegExp(escapeRegExp(code).replace(/\s+/g, '\\s+'));
-        }
-
-        // not sure if this is really necessary, but I don’t have a test
-        // corpus large enough to confirm that and it was in the original.
-        else {
-            var name = parts[1] ? '\\s+' + parts[1] : '',
-                args = parts[2].split(',').join('\\s*,\\s*');
-
-            body = escapeRegExp(parts[3]).replace(/;$/, ';?'); // semicolon is inserted if the function ends with a comment.replace(/\s+/g, '\\s+');
-            re = new RegExp('function' + name + '\\s*\\(\\s*' + args + '\\s*\\)\\s*{\\s*' + body + '\\s*}');
-        }
-
-        // look for a normal function definition
-        if ((result = findSourceInUrls(re, urls))) {
-            return result;
-        }
-
-        // look for an old-school event handler function
-        if ((parts = eventRE.exec(code))) {
-            var event = parts[1];
-            body = escapeCodeAsRegExpForMatchingInsideHTML(parts[2]);
-
-            // look for a function defined in HTML as an onXXX handler
-            re = new RegExp('on' + event + '=[\\\'"]\\s*' + body + '\\s*[\\\'"]', 'i');
-
-            if ((result = findSourceInUrls(re, urls[0]))) {
-                return result;
-            }
-
-            // look for ???
-            re = new RegExp(body);
-
-            if ((result = findSourceInUrls(re, urls))) {
-                return result;
-            }
-        }
-
-        return null;
-    }
-
-    // Contents of Exception in various browsers.
-    //
-    // SAFARI:
-    // ex.message = Can't find variable: qq
-    // ex.line = 59
-    // ex.sourceId = 580238192
-    // ex.sourceURL = http://...
-    // ex.expressionBeginOffset = 96
-    // ex.expressionCaretOffset = 98
-    // ex.expressionEndOffset = 98
-    // ex.name = ReferenceError
-    //
-    // FIREFOX:
-    // ex.message = qq is not defined
-    // ex.fileName = http://...
-    // ex.lineNumber = 59
-    // ex.stack = ...stack trace... (see the example below)
-    // ex.name = ReferenceError
-    //
-    // CHROME:
-    // ex.message = qq is not defined
-    // ex.name = ReferenceError
-    // ex.type = not_defined
-    // ex.arguments = ['aa']
-    // ex.stack = ...stack trace...
-    //
-    // INTERNET EXPLORER:
-    // ex.message = ...
-    // ex.name = ReferenceError
-    //
-    // OPERA:
-    // ex.message = ...message... (see the example below)
-    // ex.name = ReferenceError
-    // ex.opera#sourceloc = 11  (pretty much useless, duplicates the info in ex.message)
-    // ex.stacktrace = n/a; see 'opera:config#UserPrefs|Exceptions Have Stacktrace'
-
-    /**
-     * Computes stack trace information from the stack property.
-     * Chrome and Gecko use this property.
-     * @param {Error} ex
-     * @return {?Object.<string, *>} Stack trace information.
-     */
-    function computeStackTraceFromStackProp(ex) {
-        if (!ex.stack) {
-            return null;
-        }
-
-        var chrome = /^\s*at (?:((?:\[object object\])?\S+(?: \[as \S+\])?) )?\(?((?:file|http|https):.*?):(\d+)(?::(\d+))?\)?\s*$/i,
-            gecko = /^\s*(\S*)(?:\((.*?)\))?@((?:file|http|https).*?):(\d+)(?::(\d+))?\s*$/i,
-            lines = ex.stack.split('\n'),
-            stack = [],
-            parts,
-            element,
-            reference = /^(.*) is undefined$/.exec(ex.message);
-
-        for (var i = 0, j = lines.length; i < j; ++i) {
-            if ((parts = gecko.exec(lines[i]))) {
-                element = {
-                    'url': parts[3],
-                    'func': parts[1] || UNKNOWN_FUNCTION,
-                    'args': parts[2] ? parts[2].split(',') : '',
-                    'line': +parts[4],
-                    'column': parts[5] ? +parts[5] : null
-                };
-            } else if ((parts = chrome.exec(lines[i]))) {
-                element = {
-                    'url': parts[2],
-                    'func': parts[1] || UNKNOWN_FUNCTION,
-                    'line': +parts[3],
-                    'column': parts[4] ? +parts[4] : null
-                };
-            } else {
-                continue;
-            }
-
-            if (!element.func && element.line) {
-                element.func = guessFunctionName(element.url, element.line);
-            }
-
-            if (element.line) {
-                element.context = gatherContext(element.url, element.line);
-            }
-
-            stack.push(element);
-        }
-
-        if (stack[0] && stack[0].line && !stack[0].column && reference) {
-            stack[0].column = findSourceInLine(reference[1], stack[0].url, stack[0].line);
-        }
-
-        if (!stack.length) {
-            return null;
-        }
-
-        return {
-            'mode': 'stack',
-            'name': ex.name,
-            'message': ex.message,
-            'url': document.location.href,
-            'stack': stack,
-            'useragent': navigator.userAgent
-        };
-    }
-
-    /**
-     * Computes stack trace information from the stacktrace property.
-     * Opera 10 uses this property.
-     * @param {Error} ex
-     * @return {?Object.<string, *>} Stack trace information.
-     */
-    function computeStackTraceFromStacktraceProp(ex) {
-        // Access and store the stacktrace property before doing ANYTHING
-        // else to it because Opera is not very good at providing it
-        // reliably in other circumstances.
-        var stacktrace = ex.stacktrace;
-
-        var testRE = / line (\d+), column (\d+) in (?:<anonymous function: ([^>]+)>|([^\)]+))\((.*)\) in (.*):\s*$/i,
-            lines = stacktrace.split('\n'),
-            stack = [],
-            parts;
-
-        for (var i = 0, j = lines.length; i < j; i += 2) {
-            if ((parts = testRE.exec(lines[i]))) {
-                var element = {
-                    'line': +parts[1],
-                    'column': +parts[2],
-                    'func': parts[3] || parts[4],
-                    'args': parts[5] ? parts[5].split(',') : [],
-                    'url': parts[6]
-                };
-
-                if (!element.func && element.line) {
-                    element.func = guessFunctionName(element.url, element.line);
-                }
-                if (element.line) {
-                    try {
-                        element.context = gatherContext(element.url, element.line);
-                    } catch (exc) {}
-                }
-
-                if (!element.context) {
-                    element.context = [lines[i + 1]];
-                }
-
-                stack.push(element);
-            }
-        }
-
-        if (!stack.length) {
-            return null;
-        }
-
-        return {
-            'mode': 'stacktrace',
-            'name': ex.name,
-            'message': ex.message,
-            'url': document.location.href,
-            'stack': stack,
-            'useragent': navigator.userAgent
-        };
-    }
-
-    /**
-     * NOT TESTED.
-     * Computes stack trace information from an error message that includes
-     * the stack trace.
-     * Opera 9 and earlier use this method if the option to show stack
-     * traces is turned on in opera:config.
-     * @param {Error} ex
-     * @return {?Object.<string, *>} Stack information.
-     */
-    function computeStackTraceFromOperaMultiLineMessage(ex) {
-        // Opera includes a stack trace into the exception message. An example is:
-        //
-        // Statement on line 3: Undefined variable: undefinedFunc
-        // Backtrace:
-        //   Line 3 of linked script file://localhost/Users/andreyvit/Projects/TraceKit/javascript-client/sample.js: In function zzz
-        //         undefinedFunc(a);
-        //   Line 7 of inline#1 script in file://localhost/Users/andreyvit/Projects/TraceKit/javascript-client/sample.html: In function yyy
-        //           zzz(x, y, z);
-        //   Line 3 of inline#1 script in file://localhost/Users/andreyvit/Projects/TraceKit/javascript-client/sample.html: In function xxx
-        //           yyy(a, a, a);
-        //   Line 1 of function script
-        //     try { xxx('hi'); return false; } catch(ex) { TraceKit.report(ex); }
-        //   ...
-
-        var lines = ex.message.split('\n');
-        if (lines.length < 4) {
-            return null;
-        }
-
-        var lineRE1 = /^\s*Line (\d+) of linked script ((?:file|http|https)\S+)(?:: in function (\S+))?\s*$/i,
-            lineRE2 = /^\s*Line (\d+) of inline#(\d+) script in ((?:file|http|https)\S+)(?:: in function (\S+))?\s*$/i,
-            lineRE3 = /^\s*Line (\d+) of function script\s*$/i,
-            stack = [],
-            scripts = document.getElementsByTagName('script'),
-            inlineScriptBlocks = [],
-            parts,
-            i,
-            len,
-            source;
-
-        for (i in scripts) {
-            if (_has(scripts, i) && !scripts[i].src) {
-                inlineScriptBlocks.push(scripts[i]);
-            }
-        }
-
-        for (i = 2, len = lines.length; i < len; i += 2) {
-            var item = null;
-            if ((parts = lineRE1.exec(lines[i]))) {
-                item = {
-                    'url': parts[2],
-                    'func': parts[3],
-                    'line': +parts[1]
-                };
-            } else if ((parts = lineRE2.exec(lines[i]))) {
-                item = {
-                    'url': parts[3],
-                    'func': parts[4]
-                };
-                var relativeLine = (+parts[1]); // relative to the start of the <SCRIPT> block
-                var script = inlineScriptBlocks[parts[2] - 1];
-                if (script) {
-                    source = getSource(item.url);
-                    if (source) {
-                        source = source.join('\n');
-                        var pos = source.indexOf(script.innerText);
-                        if (pos >= 0) {
-                            item.line = relativeLine + source.substring(0, pos).split('\n').length;
-                        }
-                    }
-                }
-            } else if ((parts = lineRE3.exec(lines[i]))) {
-                var url = window.location.href.replace(/#.*$/, ''),
-                    line = parts[1];
-                var re = new RegExp(escapeCodeAsRegExpForMatchingInsideHTML(lines[i + 1]));
-                source = findSourceInUrls(re, [url]);
-                item = {
-                    'url': url,
-                    'line': source ? source.line : line,
-                    'func': ''
-                };
-            }
-
-            if (item) {
-                if (!item.func) {
-                    item.func = guessFunctionName(item.url, item.line);
-                }
-                var context = gatherContext(item.url, item.line);
-                var midline = (context ? context[Math.floor(context.length / 2)] : null);
-                if (context && midline.replace(/^\s*/, '') === lines[i + 1].replace(/^\s*/, '')) {
-                    item.context = context;
-                } else {
-                    // if (context) alert("Context mismatch. Correct midline:\n" + lines[i+1] + "\n\nMidline:\n" + midline + "\n\nContext:\n" + context.join("\n") + "\n\nURL:\n" + item.url);
-                    item.context = [lines[i + 1]];
-                }
-                stack.push(item);
-            }
-        }
-        if (!stack.length) {
-            return null; // could not parse multiline exception message as Opera stack trace
-        }
-
-        return {
-            'mode': 'multiline',
-            'name': ex.name,
-            'message': lines[0],
-            'url': document.location.href,
-            'stack': stack,
-            'useragent': navigator.userAgent
-        };
-    }
-
-    /**
-     * Adds information about the first frame to incomplete stack traces.
-     * Safari and IE require this to get complete data on the first frame.
-     * @param {Object.<string, *>} stackInfo Stack trace information from
-     * one of the compute* methods.
-     * @param {string} url The URL of the script that caused an error.
-     * @param {(number|string)} lineNo The line number of the script that
-     * caused an error.
-     * @param {string=} message The error generated by the browser, which
-     * hopefully contains the name of the object that caused the error.
-     * @return {boolean} Whether or not the stack information was
-     * augmented.
-     */
-    function augmentStackTraceWithInitialElement(stackInfo, url, lineNo, message) {
-        var initial = {
-            'url': url,
-            'line': lineNo
-        };
-
-        if (initial.url && initial.line) {
-            stackInfo.incomplete = false;
-
-            if (!initial.func) {
-                initial.func = guessFunctionName(initial.url, initial.line);
-            }
-
-            if (!initial.context) {
-                initial.context = gatherContext(initial.url, initial.line);
-            }
-
-            var reference = / '([^']+)' /.exec(message);
-            if (reference) {
-                initial.column = findSourceInLine(reference[1], initial.url, initial.line);
-            }
-
-            if (stackInfo.stack.length > 0) {
-                if (stackInfo.stack[0].url === initial.url) {
-                    if (stackInfo.stack[0].line === initial.line) {
-                        return false; // already in stack trace
-                    } else if (!stackInfo.stack[0].line && stackInfo.stack[0].func === initial.func) {
-                        stackInfo.stack[0].line = initial.line;
-                        stackInfo.stack[0].context = initial.context;
-                        return false;
-                    }
-                }
-            }
-
-            stackInfo.stack.unshift(initial);
-            stackInfo.partial = true;
-            return true;
-        } else {
-            stackInfo.incomplete = true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Computes stack trace information by walking the arguments.caller
-     * chain at the time the exception occurred. This will cause earlier
-     * frames to be missed but is the only way to get any stack trace in
-     * Safari and IE. The top frame is restored by
-     * {@link augmentStackTraceWithInitialElement}.
-     * @param {Error} ex
-     * @return {?Object.<string, *>} Stack trace information.
-     */
-    function computeStackTraceByWalkingCallerChain(ex, depth) {
-        var functionName = /function\s+([_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*)?\s*\(/i,
-            stack = [],
-            funcs = {},
-            recursion = false,
-            parts,
-            item,
-            source;
-
-        for (var curr = computeStackTraceByWalkingCallerChain.caller; curr && !recursion; curr = curr.caller) {
-            if (curr === computeStackTrace || curr === TraceKit.report) {
-                // console.log('skipping internal function');
-                continue;
-            }
-
-            item = {
-                'url': null,
-                'func': UNKNOWN_FUNCTION,
-                'line': null,
-                'column': null
-            };
-
-            if (curr.name) {
-                item.func = curr.name;
-            } else if ((parts = functionName.exec(curr.toString()))) {
-                item.func = parts[1];
-            }
-
-            if ((source = findSourceByFunctionBody(curr))) {
-                item.url = source.url;
-                item.line = source.line;
-
-                if (item.func === UNKNOWN_FUNCTION) {
-                    item.func = guessFunctionName(item.url, item.line);
-                }
-
-                var reference = / '([^']+)' /.exec(ex.message || ex.description);
-                if (reference) {
-                    item.column = findSourceInLine(reference[1], source.url, source.line);
-                }
-            }
-
-            if (funcs['' + curr]) {
-                recursion = true;
-            }else{
-                funcs['' + curr] = true;
-            }
-
-            stack.push(item);
-        }
-
-        if (depth) {
-            // console.log('depth is ' + depth);
-            // console.log('stack is ' + stack.length);
-            stack.splice(0, depth);
-        }
-
-        var result = {
-            'mode': 'callers',
-            'name': ex.name,
-            'message': ex.message,
-            'url': document.location.href,
-            'stack': stack,
-            'useragent': navigator.userAgent
-        };
-        augmentStackTraceWithInitialElement(result, ex.sourceURL || ex.fileName, ex.line || ex.lineNumber, ex.message || ex.description);
-        return result;
-    }
-
-    /**
-     * Computes a stack trace for an exception.
-     * @param {Error} ex
-     * @param {(string|number)=} depth
-     */
-    function computeStackTrace(ex, depth) {
-        var stack = null;
-        depth = (depth == null ? 0 : +depth);
-
-        try {
-            // This must be tried first because Opera 10 *destroys*
-            // its stacktrace property if you try to access the stack
-            // property first!!
-            stack = computeStackTraceFromStacktraceProp(ex);
-            if (stack) {
-                return stack;
-            }
-        } catch (e) {
-            if (debug) {
-                throw e;
-            }
-        }
-
-        try {
-            stack = computeStackTraceFromStackProp(ex);
-            if (stack) {
-                return stack;
-            }
-        } catch (e) {
-            if (debug) {
-                throw e;
-            }
-        }
-
-        try {
-            stack = computeStackTraceFromOperaMultiLineMessage(ex);
-            if (stack) {
-                return stack;
-            }
-        } catch (e) {
-            if (debug) {
-                throw e;
-            }
-        }
-
-        try {
-            stack = computeStackTraceByWalkingCallerChain(ex, depth + 1);
-            if (stack) {
-                return stack;
-            }
-        } catch (e) {
-            if (debug) {
-                throw e;
-            }
-        }
-
-        return {
-            'mode': 'failed'
-        };
-    }
-
-    /**
-     * Logs a stacktrace starting from the previous call and working down.
-     * @param {(number|string)=} depth How many frames deep to trace.
-     * @return {Object.<string, *>} Stack trace information.
-     */
-    function computeStackTraceOfCaller(depth) {
-        depth = (depth == null ? 0 : +depth) + 1; // "+ 1" because "ofCaller" should drop one frame
-        try {
-            throw new Error();
-        } catch (ex) {
-            return computeStackTrace(ex, depth + 1);
-        }
-
-        return null;
-    }
-
-    computeStackTrace.augmentStackTraceWithInitialElement = augmentStackTraceWithInitialElement;
-    computeStackTrace.guessFunctionName = guessFunctionName;
-    computeStackTrace.gatherContext = gatherContext;
-    computeStackTrace.ofCaller = computeStackTraceOfCaller;
-
-    return computeStackTrace;
-}());
-
-/**
- * Extends support for global error handling for asynchronous browser
- * functions. Adopted from Closure Library's errorhandler.js
- */
-(function extendToAsynchronousCallbacks() {
-    var _helper = function _helper(fnName) {
-        var originalFn = window[fnName];
-        window[fnName] = function traceKitAsyncExtension() {
-            // Make a copy of the arguments
-            var args = _slice.call(arguments);
-            var originalCallback = args[0];
-            if (typeof (originalCallback) === 'function') {
-                args[0] = TraceKit.wrap(originalCallback);
-            }
-            // IE < 9 doesn't support .call/.apply on setInterval/setTimeout, but it
-            // also only supports 2 argument and doesn't care what "this" is, so we
-            // can just call the original function directly.
-            if (originalFn.apply) {
-                return originalFn.apply(this, args);
-            } else {
-                return originalFn(args[0], args[1]);
-            }
-        };
-    };
-
-    _helper('setTimeout');
-    _helper('setInterval');
-}());
-
-//Default options:
-if (!TraceKit.remoteFetching) {
-  TraceKit.remoteFetching = true;
-}
-if (!TraceKit.collectWindowErrors) {
-  TraceKit.collectWindowErrors = true;
-}
-if (!TraceKit.linesOfContext || TraceKit.linesOfContext < 1) {
-  // 5 lines before, the offending line, 5 lines after
-  TraceKit.linesOfContext = 11;
-}
-
-
-
-// Export to global object
-window.TraceKit = TraceKit;
-
-}(window));
diff --git a/#pma/js/transformations/image_upload.js b/#pma/js/transformations/image_upload.js
deleted file mode 100644
index d0c2b928..00000000
--- a/#pma/js/transformations/image_upload.js
+++ /dev/null
@@ -1,28 +0,0 @@
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Image upload transformations plugin js
- *
- * @package PhpMyAdmin
- */
-
-AJAX.registerOnload('transformations/image_upload.js', function() {
-    // Change thumbnail when image file is selected
-    // through file upload dialog
-    $('input.image-upload').on('change', function(event) {
-        if (this.files && this.files[0]) {
-            var reader = new FileReader();
-            var $input = $(this);
-            reader.onload = function (e) {
-                $input.prevAll('img').attr('src', e.target.result);
-            };
-            reader.readAsDataURL(this.files[0]);
-        }
-    });
-});
-
-/**
- * Unbind all event handlers before tearing down a page
- */
-AJAX.registerTeardown('transformations/image_upload.js', function() {
-    $('input.image-upload').off('change');
-});
diff --git a/#pma/js/transformations/json.js b/#pma/js/transformations/json.js
deleted file mode 100644
index 98c4b33c..00000000
--- a/#pma/js/transformations/json.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * JSON syntax highlighting transformation plugin
- */
-AJAX.registerOnload('transformations/json.js', function() {
-    var $elm = $('#page_content').find('code.json');
-    $elm.each(function () {
-        var $json = $(this);
-        var $pre = $json.find('pre');
-        /* We only care about visible elements to avoid double processing */
-        if ($pre.is(":visible")) {
-            var $highlight = $('<div class="json-highlight cm-s-default"></div>');
-            $json.append($highlight);
-            CodeMirror.runMode($json.text(), 'application/json', $highlight[0]);
-            $pre.hide();
-        }
-    });
-});
\ No newline at end of file
diff --git a/#pma/js/transformations/json_editor.js b/#pma/js/transformations/json_editor.js
deleted file mode 100644
index 040d5f32..00000000
--- a/#pma/js/transformations/json_editor.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * JSON syntax highlighting transformation plugin
- *
- * @package PhpMyAdmin
- */
-AJAX.registerOnload('transformations/json_editor.js', function() {
-    $('textarea.transform_json_editor').each(function () {
-        CodeMirror.fromTextArea(this, {
-            lineNumbers: true,
-            matchBrackets: true,
-            indentUnit: 4,
-            mode: "application/json",
-            lineWrapping: true
-        });
-    });
-});
diff --git a/#pma/js/transformations/sql_editor.js b/#pma/js/transformations/sql_editor.js
deleted file mode 100644
index 83e560e8..00000000
--- a/#pma/js/transformations/sql_editor.js
+++ /dev/null
@@ -1,12 +0,0 @@
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * SQL syntax highlighting transformation plugin js
- *
- * @package PhpMyAdmin
- */
-AJAX.registerOnload('transformations/sql_editor.js', function() {
-
-    $('textarea.transform_sql_editor').each(function () {
-        PMA_getSQLEditor($(this), {}, 'both');
-    });
-});
diff --git a/#pma/js/transformations/xml.js b/#pma/js/transformations/xml.js
deleted file mode 100644
index dd4eef66..00000000
--- a/#pma/js/transformations/xml.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * XML syntax highlighting transformation plugin
- */
-AJAX.registerOnload('transformations/xml.js', function() {
-    var $elm = $('#page_content').find('code.xml');
-    $elm.each(function () {
-        var $json = $(this);
-        var $pre = $json.find('pre');
-        /* We only care about visible elements to avoid double processing */
-        if ($pre.is(":visible")) {
-            var $highlight = $('<div class="xml-highlight cm-s-default"></div>');
-            $json.append($highlight);
-            CodeMirror.runMode($json.text(), 'application/xml', $highlight[0]);
-            $pre.hide();
-        }
-    });
-});
diff --git a/#pma/js/transformations/xml_editor.js b/#pma/js/transformations/xml_editor.js
deleted file mode 100644
index 4492b9e7..00000000
--- a/#pma/js/transformations/xml_editor.js
+++ /dev/null
@@ -1,16 +0,0 @@
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * XML editor plugin
- *
- * @package PhpMyAdmin
- */
-AJAX.registerOnload('transformations/xml_editor.js', function() {
-    $('textarea.transform_xml_editor').each( function () {
-        CodeMirror.fromTextArea(this, {
-            lineNumbers: true,
-            indentUnit: 4,
-            mode: "application/xml",
-            lineWrapping: true
-        });
-    });
-});
diff --git a/#pma/js/whitelist.php b/#pma/js/whitelist.php
deleted file mode 100644
index 9c3da3e2..00000000
--- a/#pma/js/whitelist.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Exporting of $goto_whitelist from PHP to Javascript
- *
- * @package PhpMyAdmin
- */
-
-chdir('..');
-
-// Send correct type:
-header('Content-Type: text/javascript; charset=UTF-8');
-
-// Cache output in client - the nocache query parameter makes sure that this
-// file is reloaded when config changes
-header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 3600) . ' GMT');
-
-// Avoid loading the full common.inc.php because this would add many
-// non-js-compatible stuff like DOCTYPE
-define('PMA_MINIMUM_COMMON', true);
-define('PMA_PATH_TO_BASEDIR', '../');
-require_once './libraries/common.inc.php';
-// Close session early as we won't write anything there
-session_write_close();
-
-$buffer = PMA\libraries\OutputBuffering::getInstance();
-$buffer->start();
-register_shutdown_function(
-    function () {
-        echo PMA\libraries\OutputBuffering::getInstance()->getContents();
-    }
-);
-
-echo "var PMA_gotoWhitelist = new Array();\n";
-$i = -1;
-foreach ($GLOBALS['goto_whitelist'] as $one_whitelist) {
-    $i++;
-    echo 'PMA_gotoWhitelist[' , $i , ']="' , $one_whitelist , '";' , "\n";
-}
diff --git a/#pma/libraries/Advisor.php b/#pma/libraries/Advisor.php
deleted file mode 100644
index 68814bc1..00000000
--- a/#pma/libraries/Advisor.php
+++ /dev/null
@@ -1,557 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * A simple rules engine, that parses and executes the rules in advisory_rules.txt.
- * Adjusted to phpMyAdmin.
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries;
-
-use \Exception;
-
-require_once 'libraries/advisor.lib.php';
-
-/**
- * Advisor class
- *
- * @package PhpMyAdmin
- */
-class Advisor
-{
-    protected $variables;
-    protected $parseResult;
-    protected $runResult;
-
-    /**
-     * Get variables
-     *
-     * @return mixed
-     */
-    public function getVariables()
-    {
-        return $this->variables;
-    }
-
-    /**
-     * Set variables
-     *
-     * @param array $variables Variables
-     *
-     * @return Advisor
-     */
-    public function setVariables($variables)
-    {
-        $this->variables = $variables;
-
-        return $this;
-    }
-
-    /**
-     * Set a variable and its value
-     *
-     * @param string|int $variable Variable to set
-     * @param mixed      $value    Value to set
-     *
-     * @return $this
-     */
-    public function setVariable($variable, $value)
-    {
-        $this->variables[$variable] = $value;
-
-        return $this;
-    }
-
-    /**
-     * Get parseResult
-     *
-     * @return mixed
-     */
-    public function getParseResult()
-    {
-        return $this->parseResult;
-    }
-
-    /**
-     * Set parseResult
-     *
-     * @param array $parseResult Parse result
-     *
-     * @return Advisor
-     */
-    public function setParseResult($parseResult)
-    {
-        $this->parseResult = $parseResult;
-
-        return $this;
-    }
-
-    /**
-     * Get runResult
-     *
-     * @return mixed
-     */
-    public function getRunResult()
-    {
-        return $this->runResult;
-    }
-
-    /**
-     * Set runResult
-     *
-     * @param array $runResult Run result
-     *
-     * @return Advisor
-     */
-    public function setRunResult($runResult)
-    {
-        $this->runResult = $runResult;
-
-        return $this;
-    }
-
-    /**
-     * Parses and executes advisor rules
-     *
-     * @return array with run and parse results
-     */
-    public function run()
-    {
-        // HowTo: A simple Advisory system in 3 easy steps.
-
-        // Step 1: Get some variables to evaluate on
-        $this->setVariables(
-            array_merge(
-                $GLOBALS['dbi']->fetchResult('SHOW GLOBAL STATUS', 0, 1),
-                $GLOBALS['dbi']->fetchResult('SHOW GLOBAL VARIABLES', 0, 1)
-            )
-        );
-
-        // Add total memory to variables as well
-        include_once 'libraries/sysinfo.lib.php';
-        $sysinfo = PMA_getSysInfo();
-        $memory  = $sysinfo->memory();
-        $this->variables['system_memory']
-            = isset($memory['MemTotal']) ? $memory['MemTotal'] : 0;
-
-        // Step 2: Read and parse the list of rules
-        $this->setParseResult(static::parseRulesFile());
-        // Step 3: Feed the variables to the rules and let them fire. Sets
-        // $runResult
-        $this->runRules();
-
-        return array(
-            'parse' => array('errors' => $this->parseResult['errors']),
-            'run'   => $this->runResult
-        );
-    }
-
-    /**
-     * Stores current error in run results.
-     *
-     * @param string    $description description of an error.
-     * @param Exception $exception   exception raised
-     *
-     * @return void
-     */
-    public function storeError($description, $exception)
-    {
-        $this->runResult['errors'][] = $description
-            . ' '
-            . sprintf(
-                __('PHP threw following error: %s'),
-                $exception->getMessage()
-            );
-    }
-
-    /**
-     * Executes advisor rules
-     *
-     * @return boolean
-     */
-    public function runRules()
-    {
-        $this->setRunResult(
-            array(
-                'fired'     => array(),
-                'notfired'  => array(),
-                'unchecked' => array(),
-                'errors'    => array(),
-            )
-        );
-
-        foreach ($this->parseResult['rules'] as $rule) {
-            $this->variables['value'] = 0;
-            $precond = true;
-
-            if (isset($rule['precondition'])) {
-                try {
-                     $precond = $this->ruleExprEvaluate($rule['precondition']);
-                } catch (Exception $e) {
-                    $this->storeError(
-                        sprintf(
-                            __('Failed evaluating precondition for rule \'%s\'.'),
-                            $rule['name']
-                        ),
-                        $e
-                    );
-                    continue;
-                }
-            }
-
-            if (! $precond) {
-                $this->addRule('unchecked', $rule);
-            } else {
-                try {
-                    $value = $this->ruleExprEvaluate($rule['formula']);
-                } catch (Exception $e) {
-                    $this->storeError(
-                        sprintf(
-                            __('Failed calculating value for rule \'%s\'.'),
-                            $rule['name']
-                        ),
-                        $e
-                    );
-                    continue;
-                }
-
-                $this->variables['value'] = $value;
-
-                try {
-                    if ($this->ruleExprEvaluate($rule['test'])) {
-                        $this->addRule('fired', $rule);
-                    } else {
-                        $this->addRule('notfired', $rule);
-                    }
-                } catch (Exception $e) {
-                    $this->storeError(
-                        sprintf(
-                            __('Failed running test for rule \'%s\'.'),
-                            $rule['name']
-                        ),
-                        $e
-                    );
-                }
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Escapes percent string to be used in format string.
-     *
-     * @param string $str string to escape
-     *
-     * @return string
-     */
-    public static function escapePercent($str)
-    {
-        return preg_replace('/%( |,|\.|$|\(|\)|<|>)/', '%%\1', $str);
-    }
-
-    /**
-     * Wrapper function for translating.
-     *
-     * @param string $str   the string
-     * @param string $param the parameters
-     *
-     * @return string
-     */
-    public function translate($str, $param = null)
-    {
-        $string = _gettext(self::escapePercent($str));
-        if (! is_null($param)) {
-            $params = $this->ruleExprEvaluate('array(' . $param . ')');
-        } else {
-            $params = array();
-        }
-        return vsprintf($string, $params);
-    }
-
-    /**
-     * Splits justification to text and formula.
-     *
-     * @param array $rule the rule
-     *
-     * @return string[]
-     */
-    public static function splitJustification($rule)
-    {
-        $jst = preg_split('/\s*\|\s*/', $rule['justification'], 2);
-        if (count($jst) > 1) {
-            return array($jst[0], $jst[1]);
-        }
-        return array($rule['justification']);
-    }
-
-    /**
-     * Adds a rule to the result list
-     *
-     * @param string $type type of rule
-     * @param array  $rule rule itself
-     *
-     * @return void
-     */
-    public function addRule($type, $rule)
-    {
-        switch ($type) {
-        case 'notfired':
-        case 'fired':
-            $jst = self::splitJustification($rule);
-            if (count($jst) > 1) {
-                try {
-                    /* Translate */
-                    $str = $this->translate($jst[0], $jst[1]);
-                } catch (Exception $e) {
-                    $this->storeError(
-                        sprintf(
-                            __('Failed formatting string for rule \'%s\'.'),
-                            $rule['name']
-                        ),
-                        $e
-                    );
-                    return;
-                }
-
-                $rule['justification'] = $str;
-            } else {
-                $rule['justification'] = $this->translate($rule['justification']);
-            }
-            $rule['id'] = $rule['name'];
-            $rule['name'] = $this->translate($rule['name']);
-            $rule['issue'] = $this->translate($rule['issue']);
-
-            // Replaces {server_variable} with 'server_variable'
-            // linking to server_variables.php
-            $rule['recommendation'] = preg_replace(
-                '/\{([a-z_0-9]+)\}/Ui',
-                '<a href="server_variables.php' . PMA_URL_getCommon()
-                . '&filter=\1">\1</a>',
-                $this->translate($rule['recommendation'])
-            );
-
-            // Replaces external Links with PMA_linkURL() generated links
-            $rule['recommendation'] = preg_replace_callback(
-                '#href=("|\')(https?://[^\1]+)\1#i',
-                array($this, 'replaceLinkURL'),
-                $rule['recommendation']
-            );
-            break;
-        }
-
-        $this->runResult[$type][] = $rule;
-    }
-
-    /**
-     * Callback for wrapping links with PMA_linkURL
-     *
-     * @param array $matches List of matched elements form preg_replace_callback
-     *
-     * @return string Replacement value
-     */
-    private function replaceLinkURL($matches)
-    {
-        return 'href="' . PMA_linkURL($matches[2]) . '" target="_blank" rel="noopener noreferrer"';
-    }
-
-    /**
-     * Callback for evaluating fired() condition.
-     *
-     * @param array $matches List of matched elements form preg_replace_callback
-     *
-     * @return string Replacement value
-     */
-    private function ruleExprEvaluateFired($matches)
-    {
-        // No list of fired rules
-        if (!isset($this->runResult['fired'])) {
-            return '0';
-        }
-
-        // Did matching rule fire?
-        foreach ($this->runResult['fired'] as $rule) {
-            if ($rule['id'] == $matches[2]) {
-                return '1';
-            }
-        }
-
-        return '0';
-    }
-
-    /**
-     * Callback for evaluating variables in expression.
-     *
-     * @param array $matches List of matched elements form preg_replace_callback
-     *
-     * @return string Replacement value
-     */
-    private function ruleExprEvaluateVariable($matches)
-    {
-        if (! isset($this->variables[$matches[1]])) {
-            return $matches[1];
-        }
-        if (is_numeric($this->variables[$matches[1]])) {
-            return $this->variables[$matches[1]];
-        } else {
-            return '\'' . addslashes($this->variables[$matches[1]]) . '\'';
-        }
-    }
-
-    /**
-     * Runs a code expression, replacing variable names with their respective
-     * values
-     *
-     * @param string $expr expression to evaluate
-     *
-     * @return integer result of evaluated expression
-     *
-     * @throws Exception
-     */
-    public function ruleExprEvaluate($expr)
-    {
-        // Evaluate fired() conditions
-        $expr = preg_replace_callback(
-            '/fired\s*\(\s*(\'|")(.*)\1\s*\)/Ui',
-            array($this, 'ruleExprEvaluateFired'),
-            $expr
-        );
-        // Evaluate variables
-        $expr = preg_replace_callback(
-            '/\b(\w+)\b/',
-            array($this, 'ruleExprEvaluateVariable'),
-            $expr
-        );
-        $value = 0;
-        $err = 0;
-
-        // Actually evaluate the code
-        ob_start();
-        try {
-            eval('$value = ' . $expr . ';');
-            $err = ob_get_contents();
-        } catch (Exception $e) {
-            // In normal operation, there is just output in the buffer,
-            // but when running under phpunit, error in eval raises exception
-            $err = $e->getMessage();
-        }
-        ob_end_clean();
-
-        // Error handling
-        if ($err) {
-            throw new Exception(
-                strip_tags($err)
-                . '<br />Executed code: $value = ' . htmlspecialchars($expr) . ';'
-            );
-        }
-        return $value;
-    }
-
-    /**
-     * Reads the rule file into an array, throwing errors messages on syntax
-     * errors.
-     *
-     * @return array with parsed data
-     */
-    public static function parseRulesFile()
-    {
-        $filename = 'libraries/advisory_rules.txt';
-        $file = file($filename, FILE_IGNORE_NEW_LINES);
-
-        $errors = array();
-        $rules = array();
-        $lines = array();
-
-        if ($file === FALSE) {
-            $errors[] = sprintf(
-                __('Error in reading file: The file \'%s\' does not exist or is not readable!'),
-                $filename
-            );
-            return array('rules' => $rules, 'lines' => $lines, 'errors' => $errors);
-        }
-
-        $ruleSyntax = array(
-            'name', 'formula', 'test', 'issue', 'recommendation', 'justification'
-        );
-        $numRules = count($ruleSyntax);
-        $numLines = count($file);
-        $ruleNo = -1;
-        $ruleLine = -1;
-
-        for ($i = 0; $i < $numLines; $i++) {
-            $line = $file[$i];
-            if ($line == "" || $line[0] == '#') {
-                continue;
-            }
-
-            // Reading new rule
-            if (substr($line, 0, 4) == 'rule') {
-                if ($ruleLine > 0) {
-                    $errors[] = sprintf(
-                        __(
-                            'Invalid rule declaration on line %1$s, expected line '
-                            . '%2$s of previous rule.'
-                        ),
-                        $i + 1,
-                        $ruleSyntax[$ruleLine++]
-                    );
-                    continue;
-                }
-                if (preg_match("/rule\s'(.*)'( \[(.*)\])?$/", $line, $match)) {
-                    $ruleLine = 1;
-                    $ruleNo++;
-                    $rules[$ruleNo] = array('name' => $match[1]);
-                    $lines[$ruleNo] = array('name' => $i + 1);
-                    if (isset($match[3])) {
-                        $rules[$ruleNo]['precondition'] = $match[3];
-                        $lines[$ruleNo]['precondition'] = $i + 1;
-                    }
-                } else {
-                    $errors[] = sprintf(
-                        __('Invalid rule declaration on line %s.'),
-                        $i + 1
-                    );
-                }
-                continue;
-            } else {
-                if ($ruleLine == -1) {
-                    $errors[] = sprintf(
-                        __('Unexpected characters on line %s.'),
-                        $i + 1
-                    );
-                }
-            }
-
-            // Reading rule lines
-            if ($ruleLine > 0) {
-                if (!isset($line[0])) {
-                    continue; // Empty lines are ok
-                }
-                // Non tabbed lines are not
-                if ($line[0] != "\t") {
-                    $errors[] = sprintf(
-                        __(
-                            'Unexpected character on line %1$s. Expected tab, but '
-                            . 'found "%2$s".'
-                        ),
-                        $i + 1,
-                        $line[0]
-                    );
-                    continue;
-                }
-                $rules[$ruleNo][$ruleSyntax[$ruleLine]] = chop(
-                    mb_substr($line, 1)
-                );
-                $lines[$ruleNo][$ruleSyntax[$ruleLine]] = $i + 1;
-                ++$ruleLine;
-            }
-
-            // Rule complete
-            if ($ruleLine == $numRules) {
-                $ruleLine = -1;
-            }
-        }
-
-        return array('rules' => $rules, 'lines' => $lines, 'errors' => $errors);
-    }
-}
diff --git a/#pma/libraries/Config.php b/#pma/libraries/Config.php
deleted file mode 100644
index bfdc6c6e..00000000
--- a/#pma/libraries/Config.php
+++ /dev/null
@@ -1,1699 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Configuration handling.
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries;
-
-use DirectoryIterator;
-
-/**
- * Indication for error handler (see end of this file).
- */
-$GLOBALS['pma_config_loading'] = false;
-
-/**
- * Configuration class
- *
- * @package PhpMyAdmin
- */
-class Config
-{
-    /**
-     * @var string  default config source
-     */
-    var $default_source = './libraries/config.default.php';
-
-    /**
-     * @var array   default configuration settings
-     */
-    var $default = array();
-
-    /**
-     * @var array   configuration settings, without user preferences applied
-     */
-    var $base_settings = array();
-
-    /**
-     * @var array   configuration settings
-     */
-    var $settings = array();
-
-    /**
-     * @var string  config source
-     */
-    var $source = '';
-
-    /**
-     * @var int     source modification time
-     */
-    var $source_mtime = 0;
-    var $default_source_mtime = 0;
-    var $set_mtime = 0;
-
-    /**
-     * @var boolean
-     */
-    var $error_config_file = false;
-
-    /**
-     * @var boolean
-     */
-    var $error_config_default_file = false;
-
-    /**
-     * @var array
-     */
-    var $default_server = array();
-
-    /**
-     * @var boolean whether init is done or not
-     * set this to false to force some initial checks
-     * like checking for required functions
-     */
-    var $done = false;
-
-    /**
-     * constructor
-     *
-     * @param string $source source to read config from
-     */
-    public function __construct($source = null)
-    {
-        $this->settings = array();
-
-        // functions need to refresh in case of config file changed goes in
-        // PMA\libraries\Config::load()
-        $this->load($source);
-
-        // other settings, independent from config file, comes in
-        $this->checkSystem();
-
-        $this->base_settings = $this->settings;
-    }
-
-    /**
-     * sets system and application settings
-     *
-     * @return void
-     */
-    public function checkSystem()
-    {
-        $this->set('PMA_VERSION', '4.6.5.2');
-        /**
-         * @deprecated
-         */
-        $this->set('PMA_THEME_VERSION', 2);
-        /**
-         * @deprecated
-         */
-        $this->set('PMA_THEME_GENERATION', 2);
-
-        $this->checkWebServerOs();
-        $this->checkWebServer();
-        $this->checkGd2();
-        $this->checkClient();
-        $this->checkUpload();
-        $this->checkUploadSize();
-        $this->checkOutputCompression();
-    }
-
-    /**
-     * whether to use gzip output compression or not
-     *
-     * @return void
-     */
-    public function checkOutputCompression()
-    {
-        // If zlib output compression is set in the php configuration file, no
-        // output buffering should be run
-        if (@ini_get('zlib.output_compression')) {
-            $this->set('OBGzip', false);
-        }
-
-        // disable output-buffering (if set to 'auto') for IE6, else enable it.
-        if (strtolower($this->get('OBGzip')) == 'auto') {
-            if ($this->get('PMA_USR_BROWSER_AGENT') == 'IE'
-                && $this->get('PMA_USR_BROWSER_VER') >= 6
-                && $this->get('PMA_USR_BROWSER_VER') < 7
-            ) {
-                $this->set('OBGzip', false);
-            } else {
-                $this->set('OBGzip', true);
-            }
-        }
-    }
-
-    /**
-     * Sets the client platform based on user agent
-     *
-     * @param string $user_agent the user agent
-     *
-     * @return void
-     */
-    private function _setClientPlatform($user_agent)
-    {
-        if (mb_strstr($user_agent, 'Win')) {
-            $this->set('PMA_USR_OS', 'Win');
-        } elseif (mb_strstr($user_agent, 'Mac')) {
-            $this->set('PMA_USR_OS', 'Mac');
-        } elseif (mb_strstr($user_agent, 'Linux')) {
-            $this->set('PMA_USR_OS', 'Linux');
-        } elseif (mb_strstr($user_agent, 'Unix')) {
-            $this->set('PMA_USR_OS', 'Unix');
-        } elseif (mb_strstr($user_agent, 'OS/2')) {
-            $this->set('PMA_USR_OS', 'OS/2');
-        } else {
-            $this->set('PMA_USR_OS', 'Other');
-        }
-    }
-
-    /**
-     * Determines platform (OS), browser and version of the user
-     * Based on a phpBuilder article:
-     *
-     * @see http://www.phpbuilder.net/columns/tim20000821.php
-     *
-     * @return void
-     */
-    public function checkClient()
-    {
-        if (PMA_getenv('HTTP_USER_AGENT')) {
-            $HTTP_USER_AGENT = PMA_getenv('HTTP_USER_AGENT');
-        } else {
-            $HTTP_USER_AGENT = '';
-        }
-
-        // 1. Platform
-        $this->_setClientPlatform($HTTP_USER_AGENT);
-
-        // 2. browser and version
-        // (must check everything else before Mozilla)
-
-        $is_mozilla = preg_match(
-            '@Mozilla/([0-9]\.[0-9]{1,2})@',
-            $HTTP_USER_AGENT,
-            $mozilla_version
-        );
-
-        if (preg_match(
-            '@Opera(/| )([0-9]\.[0-9]{1,2})@',
-            $HTTP_USER_AGENT,
-            $log_version
-        )) {
-            $this->set('PMA_USR_BROWSER_VER', $log_version[2]);
-            $this->set('PMA_USR_BROWSER_AGENT', 'OPERA');
-        } elseif (preg_match(
-            '@(MS)?IE ([0-9]{1,2}\.[0-9]{1,2})@',
-            $HTTP_USER_AGENT,
-            $log_version
-        )) {
-            $this->set('PMA_USR_BROWSER_VER', $log_version[2]);
-            $this->set('PMA_USR_BROWSER_AGENT', 'IE');
-        } elseif (preg_match(
-            '@Trident/(7)\.0@',
-            $HTTP_USER_AGENT,
-            $log_version
-        )) {
-            $this->set('PMA_USR_BROWSER_VER', intval($log_version[1]) + 4);
-            $this->set('PMA_USR_BROWSER_AGENT', 'IE');
-        } elseif (preg_match(
-            '@OmniWeb/([0-9]{1,3})@',
-            $HTTP_USER_AGENT,
-            $log_version
-        )) {
-            $this->set('PMA_USR_BROWSER_VER', $log_version[1]);
-            $this->set('PMA_USR_BROWSER_AGENT', 'OMNIWEB');
-            // Konqueror 2.2.2 says Konqueror/2.2.2
-            // Konqueror 3.0.3 says Konqueror/3
-        } elseif (preg_match(
-            '@(Konqueror/)(.*)(;)@',
-            $HTTP_USER_AGENT,
-            $log_version
-        )) {
-            $this->set('PMA_USR_BROWSER_VER', $log_version[2]);
-            $this->set('PMA_USR_BROWSER_AGENT', 'KONQUEROR');
-            // must check Chrome before Safari
-        } elseif ($is_mozilla
-            && preg_match('@Chrome/([0-9.]*)@', $HTTP_USER_AGENT, $log_version)
-        ) {
-            $this->set('PMA_USR_BROWSER_VER', $log_version[1]);
-            $this->set('PMA_USR_BROWSER_AGENT', 'CHROME');
-            // newer Safari
-        } elseif ($is_mozilla
-            && preg_match('@Version/(.*) Safari@', $HTTP_USER_AGENT, $log_version)
-        ) {
-            $this->set(
-                'PMA_USR_BROWSER_VER', $log_version[1]
-            );
-            $this->set('PMA_USR_BROWSER_AGENT', 'SAFARI');
-            // older Safari
-        } elseif ($is_mozilla
-            && preg_match('@Safari/([0-9]*)@', $HTTP_USER_AGENT, $log_version)
-        ) {
-            $this->set(
-                'PMA_USR_BROWSER_VER', $mozilla_version[1] . '.' . $log_version[1]
-            );
-            $this->set('PMA_USR_BROWSER_AGENT', 'SAFARI');
-            // Firefox
-        } elseif (! mb_strstr($HTTP_USER_AGENT, 'compatible')
-            && preg_match('@Firefox/([\w.]+)@', $HTTP_USER_AGENT, $log_version)
-        ) {
-            $this->set(
-                'PMA_USR_BROWSER_VER', $log_version[1]
-            );
-            $this->set('PMA_USR_BROWSER_AGENT', 'FIREFOX');
-        } elseif (preg_match('@rv:1\.9(.*)Gecko@', $HTTP_USER_AGENT)) {
-            $this->set('PMA_USR_BROWSER_VER', '1.9');
-            $this->set('PMA_USR_BROWSER_AGENT', 'GECKO');
-        } elseif ($is_mozilla) {
-            $this->set('PMA_USR_BROWSER_VER', $mozilla_version[1]);
-            $this->set('PMA_USR_BROWSER_AGENT', 'MOZILLA');
-        } else {
-            $this->set('PMA_USR_BROWSER_VER', 0);
-            $this->set('PMA_USR_BROWSER_AGENT', 'OTHER');
-        }
-    }
-
-    /**
-     * Whether GD2 is present
-     *
-     * @return void
-     */
-    public function checkGd2()
-    {
-        if ($this->get('GD2Available') == 'yes') {
-            $this->set('PMA_IS_GD2', 1);
-            return;
-        }
-
-        if ($this->get('GD2Available') == 'no') {
-            $this->set('PMA_IS_GD2', 0);
-            return;
-        }
-
-        if (!@function_exists('imagecreatetruecolor')) {
-            $this->set('PMA_IS_GD2', 0);
-            return;
-        }
-
-        if (@function_exists('gd_info')) {
-            $gd_nfo = gd_info();
-            if (mb_strstr($gd_nfo["GD Version"], '2.')) {
-                $this->set('PMA_IS_GD2', 1);
-            } else {
-                $this->set('PMA_IS_GD2', 0);
-            }
-        } else {
-            $this->set('PMA_IS_GD2', 0);
-        }
-    }
-
-    /**
-     * Whether the Web server php is running on is IIS
-     *
-     * @return void
-     */
-    public function checkWebServer()
-    {
-        // some versions return Microsoft-IIS, some Microsoft/IIS
-        // we could use a preg_match() but it's slower
-        if (PMA_getenv('SERVER_SOFTWARE')
-            && stristr(PMA_getenv('SERVER_SOFTWARE'), 'Microsoft')
-            && stristr(PMA_getenv('SERVER_SOFTWARE'), 'IIS')
-        ) {
-            $this->set('PMA_IS_IIS', 1);
-        } else {
-            $this->set('PMA_IS_IIS', 0);
-        }
-    }
-
-    /**
-     * Whether the os php is running on is windows or not
-     *
-     * @return void
-     */
-    public function checkWebServerOs()
-    {
-        // Default to Unix or Equiv
-        $this->set('PMA_IS_WINDOWS', 0);
-        // If PHP_OS is defined then continue
-        if (defined('PHP_OS')) {
-            if (stristr(PHP_OS, 'win') && !stristr(PHP_OS, 'darwin')) {
-                // Is it some version of Windows
-                $this->set('PMA_IS_WINDOWS', 1);
-            } elseif (stristr(PHP_OS, 'OS/2')) {
-                // Is it OS/2 (No file permissions like Windows)
-                $this->set('PMA_IS_WINDOWS', 1);
-            }
-        }
-    }
-
-    /**
-     * detects if Git revision
-     *
-     * @return boolean
-     */
-    public function isGitRevision()
-    {
-        if (!$this->get('ShowGitRevision')) {
-            return false;
-        }
-
-        // caching
-        if (isset($_SESSION['is_git_revision'])) {
-            if ($_SESSION['is_git_revision']) {
-                $this->set('PMA_VERSION_GIT', 1);
-            }
-            return $_SESSION['is_git_revision'];
-        }
-        // find out if there is a .git folder
-        $git_folder = '.git';
-        if (! @file_exists($git_folder)
-            || ! @file_exists($git_folder . '/config')
-        ) {
-            $_SESSION['is_git_revision'] = false;
-            return false;
-        }
-        $_SESSION['is_git_revision'] = true;
-        return true;
-    }
-
-    /**
-     * detects Git revision, if running inside repo
-     *
-     * @return void
-     */
-    public function checkGitRevision()
-    {
-        // find out if there is a .git folder
-        $git_folder = '.git';
-        if (! $this->isGitRevision()) {
-            return;
-        }
-
-        if (! $ref_head = @file_get_contents($git_folder . '/HEAD')) {
-            return;
-        }
-
-        $branch = false;
-        // are we on any branch?
-        if (strstr($ref_head, '/')) {
-            // remove ref: prefix
-            $ref_head = substr(trim($ref_head), 5);
-            if (substr($ref_head, 0, 11) === 'refs/heads/') {
-                $branch = substr($ref_head, 11);
-            } else {
-                $branch = basename($ref_head);
-            }
-
-            $ref_file = $git_folder . '/' . $ref_head;
-            if (@file_exists($ref_file)) {
-                $hash = @file_get_contents($ref_file);
-                if (! $hash) {
-                    return;
-                }
-                $hash = trim($hash);
-            } else {
-                // deal with packed refs
-                $packed_refs = @file_get_contents($git_folder . '/packed-refs');
-                if (! $packed_refs) {
-                    return;
-                }
-                // split file to lines
-                $ref_lines = explode("\n", $packed_refs);
-                foreach ($ref_lines as $line) {
-                    // skip comments
-                    if ($line[0] == '#') {
-                        continue;
-                    }
-                    // parse line
-                    $parts = explode(' ', $line);
-                    // care only about named refs
-                    if (count($parts) != 2) {
-                        continue;
-                    }
-                    // have found our ref?
-                    if ($parts[1] == $ref_head) {
-                        $hash = $parts[0];
-                        break;
-                    }
-                }
-                if (! isset($hash)) {
-                    // Could not find ref
-                    return;
-                }
-            }
-        } else {
-            $hash = trim($ref_head);
-        }
-
-        $commit = false;
-        if (! preg_match('/^[0-9a-f]{40}$/i', $hash)) {
-            $commit = false;
-        } elseif (isset($_SESSION['PMA_VERSION_COMMITDATA_' . $hash])) {
-            $commit = $_SESSION['PMA_VERSION_COMMITDATA_' . $hash];
-        } elseif (function_exists('gzuncompress')) {
-            $git_file_name = $git_folder . '/objects/'
-                . substr($hash, 0, 2) . '/' . substr($hash, 2);
-            if (file_exists($git_file_name) ) {
-                if (! $commit = @file_get_contents($git_file_name)) {
-                    return;
-                }
-                $commit = explode("\0", gzuncompress($commit), 2);
-                $commit = explode("\n", $commit[1]);
-                $_SESSION['PMA_VERSION_COMMITDATA_' . $hash] = $commit;
-            } else {
-                $pack_names = array();
-                // work with packed data
-                $packs_file = $git_folder . '/objects/info/packs';
-                if (file_exists($packs_file)
-                    && $packs = @file_get_contents($packs_file)
-                ) {
-                    // File exists. Read it, parse the file to get the names of the
-                    // packs. (to look for them in .git/object/pack directory later)
-                    foreach (explode("\n", $packs) as $line) {
-                        // skip blank lines
-                        if (strlen(trim($line)) == 0) {
-                            continue;
-                        }
-                        // skip non pack lines
-                        if ($line[0] != 'P') {
-                            continue;
-                        }
-                        // parse names
-                        $pack_names[] = substr($line, 2);
-                    }
-                } else {
-                    // '.git/objects/info/packs' file can be missing
-                    // (atlease in mysGit)
-                    // File missing. May be we can look in the .git/object/pack
-                    // directory for all the .pack files and use that list of
-                    // files instead
-                    $dirIterator = new DirectoryIterator(
-                        $git_folder . '/objects/pack'
-                    );
-                    foreach ($dirIterator as $file_info) {
-                        $file_name = $file_info->getFilename();
-                        // if this is a .pack file
-                        if ($file_info->isFile() && substr($file_name, -5) == '.pack'
-                        ) {
-                            $pack_names[] = $file_name;
-                        }
-                    }
-                }
-                $hash = strtolower($hash);
-                foreach ($pack_names as $pack_name) {
-                    $index_name = str_replace('.pack', '.idx', $pack_name);
-
-                    // load index
-                    $index_data = @file_get_contents(
-                        $git_folder . '/objects/pack/' . $index_name
-                    );
-                    if (! $index_data) {
-                        continue;
-                    }
-                    // check format
-                    if (substr($index_data, 0, 4) != "\377tOc") {
-                        continue;
-                    }
-                    // check version
-                    $version = unpack('N', substr($index_data, 4, 4));
-                    if ($version[1] != 2) {
-                        continue;
-                    }
-                    // parse fanout table
-                    $fanout = unpack(
-                        "N*",
-                        substr($index_data, 8, 256 * 4)
-                    );
-
-                    // find where we should search
-                    $firstbyte = intval(substr($hash, 0, 2), 16);
-                    // array is indexed from 1 and we need to get
-                    // previous entry for start
-                    if ($firstbyte == 0) {
-                        $start = 0;
-                    } else {
-                        $start = $fanout[$firstbyte];
-                    }
-                    $end = $fanout[$firstbyte + 1];
-
-                    // stupid linear search for our sha
-                    $found = false;
-                    $offset = 8 + (256 * 4);
-                    for ($position = $start; $position < $end; $position++) {
-                        $sha = strtolower(
-                            bin2hex(
-                                substr($index_data, $offset + ($position * 20), 20)
-                            )
-                        );
-                        if ($sha == $hash) {
-                            $found = true;
-                            break;
-                        }
-                    }
-                    if (! $found) {
-                        continue;
-                    }
-                    // read pack offset
-                    $offset = 8 + (256 * 4) + (24 * $fanout[256]);
-                    $pack_offset = unpack(
-                        'N',
-                        substr($index_data, $offset + ($position * 4), 4)
-                    );
-                    $pack_offset = $pack_offset[1];
-
-                    // open pack file
-                    $pack_file = fopen(
-                        $git_folder . '/objects/pack/' . $pack_name, 'rb'
-                    );
-                    if ($pack_file === false) {
-                        continue;
-                    }
-                    // seek to start
-                    fseek($pack_file, $pack_offset);
-
-                    // parse header
-                    $header = ord(fread($pack_file, 1));
-                    $type = ($header >> 4) & 7;
-                    $hasnext = ($header & 128) >> 7;
-                    $size = $header & 0xf;
-                    $offset = 4;
-
-                    while ($hasnext) {
-                        $byte = ord(fread($pack_file, 1));
-                        $size |= ($byte & 0x7f) << $offset;
-                        $hasnext = ($byte & 128) >> 7;
-                        $offset += 7;
-                    }
-
-                    // we care only about commit objects
-                    if ($type != 1) {
-                        continue;
-                    }
-
-                    // read data
-                    $commit = fread($pack_file, $size);
-                    $commit = gzuncompress($commit);
-                    $commit = explode("\n", $commit);
-                    $_SESSION['PMA_VERSION_COMMITDATA_' . $hash] = $commit;
-                    fclose($pack_file);
-                }
-            }
-        }
-
-        // check if commit exists in Github
-        if ($commit !== false
-            && isset($_SESSION['PMA_VERSION_REMOTECOMMIT_' . $hash])
-        ) {
-            $is_remote_commit = $_SESSION['PMA_VERSION_REMOTECOMMIT_' . $hash];
-        } else {
-            $link = 'https://api.github.com/repos/phpmyadmin/phpmyadmin/git/commits/'
-                . $hash;
-            $is_found = $this->checkHTTP($link, ! $commit);
-            switch($is_found) {
-            case false:
-                $is_remote_commit = false;
-                $_SESSION['PMA_VERSION_REMOTECOMMIT_' . $hash] = false;
-                break;
-            case null:
-                // no remote link for now, but don't cache this as Github is down
-                $is_remote_commit = false;
-                break;
-            default:
-                $is_remote_commit = true;
-                $_SESSION['PMA_VERSION_REMOTECOMMIT_' . $hash] = true;
-                if ($commit === false) {
-                    // if no local commit data, try loading from Github
-                    $commit_json = json_decode($is_found);
-                }
-                break;
-            }
-        }
-
-        $is_remote_branch = false;
-        if ($is_remote_commit && $branch !== false) {
-            // check if branch exists in Github
-            if (isset($_SESSION['PMA_VERSION_REMOTEBRANCH_' . $hash])) {
-                $is_remote_branch = $_SESSION['PMA_VERSION_REMOTEBRANCH_' . $hash];
-            } else {
-                $link = 'https://api.github.com/repos/phpmyadmin/phpmyadmin'
-                    . '/git/trees/' . $branch;
-                $is_found = $this->checkHTTP($link);
-                switch($is_found) {
-                case true:
-                    $is_remote_branch = true;
-                    $_SESSION['PMA_VERSION_REMOTEBRANCH_' . $hash] = true;
-                    break;
-                case false:
-                    $is_remote_branch = false;
-                    $_SESSION['PMA_VERSION_REMOTEBRANCH_' . $hash] = false;
-                    break;
-                case null:
-                    // no remote link for now, but don't cache this as Github is down
-                    $is_remote_branch = false;
-                    break;
-                }
-            }
-        }
-
-        if ($commit !== false) {
-            $author = array('name' => '', 'email' => '', 'date' => '');
-            $committer = array('name' => '', 'email' => '', 'date' => '');
-
-            do {
-                $dataline = array_shift($commit);
-                $datalinearr = explode(' ', $dataline, 2);
-                $linetype = $datalinearr[0];
-                if (in_array($linetype, array('author', 'committer'))) {
-                    $user = $datalinearr[1];
-                    preg_match('/([^<]+)<([^>]+)> ([0-9]+)( [^ ]+)?/', $user, $user);
-                    $user2 = array(
-                        'name' => trim($user[1]),
-                        'email' => trim($user[2]),
-                        'date' => date('Y-m-d H:i:s', $user[3]));
-                    if (isset($user[4])) {
-                        $user2['date'] .= $user[4];
-                    }
-                    $$linetype = $user2;
-                }
-            } while ($dataline != '');
-            $message = trim(implode(' ', $commit));
-
-        } elseif (isset($commit_json)) {
-            $author = array(
-                'name' => $commit_json->author->name,
-                'email' => $commit_json->author->email,
-                'date' => $commit_json->author->date);
-            $committer = array(
-                'name' => $commit_json->committer->name,
-                'email' => $commit_json->committer->email,
-                'date' => $commit_json->committer->date);
-            $message = trim($commit_json->message);
-        } else {
-            return;
-        }
-
-        $this->set('PMA_VERSION_GIT', 1);
-        $this->set('PMA_VERSION_GIT_COMMITHASH', $hash);
-        $this->set('PMA_VERSION_GIT_BRANCH', $branch);
-        $this->set('PMA_VERSION_GIT_MESSAGE', $message);
-        $this->set('PMA_VERSION_GIT_AUTHOR', $author);
-        $this->set('PMA_VERSION_GIT_COMMITTER', $committer);
-        $this->set('PMA_VERSION_GIT_ISREMOTECOMMIT', $is_remote_commit);
-        $this->set('PMA_VERSION_GIT_ISREMOTEBRANCH', $is_remote_branch);
-    }
-
-    /**
-     * Checks if given URL is 200 or 404, optionally returns data
-     *
-     * @param string  $link     the URL to check
-     * @param boolean $get_body whether to retrieve body of document
-     *
-     * @return string|boolean test result or data
-     */
-    public function checkHTTP($link, $get_body = false)
-    {
-        if (! function_exists('curl_init')) {
-            return null;
-        }
-        $handle = curl_init($link);
-        if ($handle === false) {
-            return null;
-        }
-        Util::configureCurl($handle);
-        curl_setopt($handle, CURLOPT_FOLLOWLOCATION, 0);
-        curl_setopt($handle, CURLOPT_RETURNTRANSFER, 1);
-        curl_setopt($handle, CURLOPT_SSL_VERIFYHOST, '2');
-        curl_setopt($handle, CURLOPT_SSL_VERIFYPEER, '1');
-        curl_setopt($handle, CURLOPT_CONNECTTIMEOUT, 5);
-        curl_setopt($handle, CURLOPT_TIMEOUT, 5);
-        curl_setopt($handle, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);
-        if (! defined('TESTSUITE')) {
-            session_write_close();
-        }
-        $data = @curl_exec($handle);
-        if (! defined('TESTSUITE')) {
-            session_start();
-        }
-        if ($data === false) {
-            return null;
-        }
-        $http_status = curl_getinfo($handle, CURLINFO_HTTP_CODE);
-
-        if ($http_status == 200) {
-            return $get_body ? $data : true;
-        }
-
-        if ($http_status == 404) {
-            return false;
-        }
-        return null;
-    }
-
-    /**
-     * loads default values from default source
-     *
-     * @return boolean     success
-     */
-    public function loadDefaults()
-    {
-        $cfg = array();
-        if (! @file_exists($this->default_source)) {
-            $this->error_config_default_file = true;
-            return false;
-        }
-        include $this->default_source;
-
-        $this->default_source_mtime = filemtime($this->default_source);
-
-        $this->default_server = $cfg['Servers'][1];
-        unset($cfg['Servers']);
-
-        $this->default = $cfg;
-        $this->settings = array_replace_recursive($this->settings, $cfg);
-
-        $this->error_config_default_file = false;
-
-        return true;
-    }
-
-    /**
-     * loads configuration from $source, usually the config file
-     * should be called on object creation
-     *
-     * @param string $source config file
-     *
-     * @return bool
-     */
-    public function load($source = null)
-    {
-        $this->loadDefaults();
-
-        if (null !== $source) {
-            $this->setSource($source);
-        }
-
-        /**
-         * We check and set the font size at this point, to make the font size
-         * selector work also for users without a config.inc.php
-         */
-        $this->checkFontsize();
-
-        if (! $this->checkConfigSource()) {
-            // even if no config file, set collation_connection
-            $this->checkCollationConnection();
-            return false;
-        }
-
-        $cfg = array();
-
-        /**
-         * Parses the configuration file, we throw away any errors or
-         * output.
-         */
-        $old_error_reporting = error_reporting(0);
-        ob_start();
-        $GLOBALS['pma_config_loading'] = true;
-        $eval_result = include $this->getSource();
-        $GLOBALS['pma_config_loading'] = false;
-        ob_end_clean();
-        error_reporting($old_error_reporting);
-
-        if ($eval_result === false) {
-            $this->error_config_file = true;
-        } else {
-            $this->error_config_file = false;
-            $this->source_mtime = filemtime($this->getSource());
-        }
-
-        /**
-         * Backward compatibility code
-         */
-        if (!empty($cfg['DefaultTabTable'])) {
-            $cfg['DefaultTabTable'] = str_replace(
-                '_properties',
-                '',
-                str_replace(
-                    'tbl_properties.php',
-                    'tbl_sql.php',
-                    $cfg['DefaultTabTable']
-                )
-            );
-        }
-        if (!empty($cfg['DefaultTabDatabase'])) {
-            $cfg['DefaultTabDatabase'] = str_replace(
-                '_details',
-                '',
-                str_replace(
-                    'db_details.php',
-                    'db_sql.php',
-                    $cfg['DefaultTabDatabase']
-                )
-            );
-        }
-
-        $this->settings = array_replace_recursive($this->settings, $cfg);
-
-        // Handling of the collation must be done after merging of $cfg
-        // (from config.inc.php) so that $cfg['DefaultConnectionCollation']
-        // can have an effect.
-        $this->checkCollationConnection();
-
-        return true;
-    }
-
-    /**
-     * Saves the connection collation
-     *
-     * @param array $config_data configuration data from user preferences
-     *
-     * @return void
-     */
-    private function _saveConnectionCollation($config_data)
-    {
-        // just to shorten the lines
-        $collation = 'collation_connection';
-        if (isset($GLOBALS[$collation])
-            && (isset($_COOKIE['pma_collation_connection'])
-            || isset($_POST[$collation]))
-        ) {
-            if ((! isset($config_data[$collation])
-                && $GLOBALS[$collation] != 'utf8_general_ci')
-                || isset($config_data[$collation])
-                && $GLOBALS[$collation] != $config_data[$collation]
-            ) {
-                $this->setUserValue(
-                    null,
-                    $collation,
-                    $GLOBALS[$collation],
-                    'utf8_general_ci'
-                );
-            }
-        } else {
-            // read collation from settings
-            if (isset($config_data[$collation])) {
-                $GLOBALS[$collation]
-                    = $config_data[$collation];
-                $this->setCookie(
-                    'pma_collation_connection',
-                    $GLOBALS[$collation]
-                );
-            }
-        }
-    }
-
-    /**
-     * Loads user preferences and merges them with current config
-     * must be called after control connection has been established
-     *
-     * @return void
-     */
-    public function loadUserPreferences()
-    {
-        // index.php should load these settings, so that phpmyadmin.css.php
-        // will have everything available in session cache
-        $server = isset($GLOBALS['server'])
-            ? $GLOBALS['server']
-            : (!empty($GLOBALS['cfg']['ServerDefault'])
-                ? $GLOBALS['cfg']['ServerDefault']
-                : 0);
-        $cache_key = 'server_' . $server;
-        if ($server > 0 && !defined('PMA_MINIMUM_COMMON')) {
-            $config_mtime = max($this->default_source_mtime, $this->source_mtime);
-            // cache user preferences, use database only when needed
-            if (! isset($_SESSION['cache'][$cache_key]['userprefs'])
-                || $_SESSION['cache'][$cache_key]['config_mtime'] < $config_mtime
-            ) {
-                // load required libraries
-                include_once './libraries/user_preferences.lib.php';
-                $prefs = PMA_loadUserprefs();
-                $_SESSION['cache'][$cache_key]['userprefs']
-                    = PMA_applyUserprefs($prefs['config_data']);
-                $_SESSION['cache'][$cache_key]['userprefs_mtime'] = $prefs['mtime'];
-                $_SESSION['cache'][$cache_key]['userprefs_type'] = $prefs['type'];
-                $_SESSION['cache'][$cache_key]['config_mtime'] = $config_mtime;
-            }
-        } elseif ($server == 0
-            || ! isset($_SESSION['cache'][$cache_key]['userprefs'])
-        ) {
-            $this->set('user_preferences', false);
-            return;
-        }
-        $config_data = $_SESSION['cache'][$cache_key]['userprefs'];
-        // type is 'db' or 'session'
-        $this->set(
-            'user_preferences',
-            $_SESSION['cache'][$cache_key]['userprefs_type']
-        );
-        $this->set(
-            'user_preferences_mtime',
-            $_SESSION['cache'][$cache_key]['userprefs_mtime']
-        );
-
-        // backup some settings
-        $org_fontsize = '';
-        if (isset($this->settings['fontsize'])) {
-            $org_fontsize = $this->settings['fontsize'];
-        }
-        // load config array
-        $this->settings = array_replace_recursive($this->settings, $config_data);
-        $GLOBALS['cfg'] = array_replace_recursive($GLOBALS['cfg'], $config_data);
-        if (defined('PMA_MINIMUM_COMMON')) {
-            return;
-        }
-
-        // settings below start really working on next page load, but
-        // changes are made only in index.php so everything is set when
-        // in frames
-
-        // save theme
-        /** @var ThemeManager $tmanager */
-        $tmanager = $_SESSION['PMA_Theme_Manager'];
-        if ($tmanager->getThemeCookie() || isset($_REQUEST['set_theme'])) {
-            if ((! isset($config_data['ThemeDefault'])
-                && $tmanager->theme->getId() != 'original')
-                || isset($config_data['ThemeDefault'])
-                && $config_data['ThemeDefault'] != $tmanager->theme->getId()
-            ) {
-                // new theme was set in common.inc.php
-                $this->setUserValue(
-                    null,
-                    'ThemeDefault',
-                    $tmanager->theme->getId(),
-                    'original'
-                );
-            }
-        } else {
-            // no cookie - read default from settings
-            if ($this->settings['ThemeDefault'] != $tmanager->theme->getId()
-                && $tmanager->checkTheme($this->settings['ThemeDefault'])
-            ) {
-                $tmanager->setActiveTheme($this->settings['ThemeDefault']);
-                $tmanager->setThemeCookie();
-            }
-        }
-
-        // save font size
-        if ((! isset($config_data['fontsize'])
-            && $org_fontsize != '82%')
-            || isset($config_data['fontsize'])
-            && $org_fontsize != $config_data['fontsize']
-        ) {
-            $this->setUserValue(null, 'fontsize', $org_fontsize, '82%');
-        }
-
-        // save language
-        if (isset($_COOKIE['pma_lang']) || isset($_POST['lang'])) {
-            if ((! isset($config_data['lang'])
-                && $GLOBALS['lang'] != 'en')
-                || isset($config_data['lang'])
-                && $GLOBALS['lang'] != $config_data['lang']
-            ) {
-                $this->setUserValue(null, 'lang', $GLOBALS['lang'], 'en');
-            }
-        } else {
-            // read language from settings
-            if (isset($config_data['lang'])) {
-                $language = LanguageManager::getInstance()->getLanguage(
-                    $config_data['lang']
-                );
-                if ($language !== false) {
-                    $language->activate();
-                    $this->setCookie('pma_lang', $language->getCode());
-                }
-            }
-        }
-
-        // save connection collation
-        $this->_saveConnectionCollation($config_data);
-    }
-
-    /**
-     * Sets config value which is stored in user preferences (if available)
-     * or in a cookie.
-     *
-     * If user preferences are not yet initialized, option is applied to
-     * global config and added to a update queue, which is processed
-     * by {@link loadUserPreferences()}
-     *
-     * @param string $cookie_name   can be null
-     * @param string $cfg_path      configuration path
-     * @param mixed  $new_cfg_value new value
-     * @param mixed  $default_value default value
-     *
-     * @return void
-     */
-    public function setUserValue($cookie_name, $cfg_path, $new_cfg_value,
-        $default_value = null
-    ) {
-        // use permanent user preferences if possible
-        $prefs_type = $this->get('user_preferences');
-        if ($prefs_type) {
-            include_once './libraries/user_preferences.lib.php';
-            if ($default_value === null) {
-                $default_value = PMA_arrayRead($cfg_path, $this->default);
-            }
-            PMA_persistOption($cfg_path, $new_cfg_value, $default_value);
-        }
-        if ($prefs_type != 'db' && $cookie_name) {
-            // fall back to cookies
-            if ($default_value === null) {
-                $default_value = PMA_arrayRead($cfg_path, $this->settings);
-            }
-            $this->setCookie($cookie_name, $new_cfg_value, $default_value);
-        }
-        PMA_arrayWrite($cfg_path, $GLOBALS['cfg'], $new_cfg_value);
-        PMA_arrayWrite($cfg_path, $this->settings, $new_cfg_value);
-    }
-
-    /**
-     * Reads value stored by {@link setUserValue()}
-     *
-     * @param string $cookie_name cookie name
-     * @param mixed  $cfg_value   config value
-     *
-     * @return mixed
-     */
-    public function getUserValue($cookie_name, $cfg_value)
-    {
-        $cookie_exists = isset($_COOKIE) && !empty($_COOKIE[$cookie_name]);
-        $prefs_type = $this->get('user_preferences');
-        if ($prefs_type == 'db') {
-            // permanent user preferences value exists, remove cookie
-            if ($cookie_exists) {
-                $this->removeCookie($cookie_name);
-            }
-        } else if ($cookie_exists) {
-            return $_COOKIE[$cookie_name];
-        }
-        // return value from $cfg array
-        return $cfg_value;
-    }
-
-    /**
-     * set source
-     *
-     * @param string $source source
-     *
-     * @return void
-     */
-    public function setSource($source)
-    {
-        $this->source = trim($source);
-    }
-
-    /**
-     * check config source
-     *
-     * @return boolean whether source is valid or not
-     */
-    public function checkConfigSource()
-    {
-        if (! $this->getSource()) {
-            // no configuration file set at all
-            return false;
-        }
-
-        if (! @file_exists($this->getSource())) {
-            $this->source_mtime = 0;
-            return false;
-        }
-
-        if (! @is_readable($this->getSource())) {
-            // manually check if file is readable
-            // might be bug #3059806 Supporting running from CIFS/Samba shares
-
-            $contents = false;
-            $handle = @fopen($this->getSource(), 'r');
-            if ($handle !== false) {
-                $contents = @fread($handle, 1); // reading 1 byte is enough to test
-                fclose($handle);
-            }
-            if ($contents === false) {
-                $this->source_mtime = 0;
-                PMA_fatalError(
-                    sprintf(
-                        function_exists('__')
-                        ? __('Existing configuration file (%s) is not readable.')
-                        : 'Existing configuration file (%s) is not readable.',
-                        $this->getSource()
-                    )
-                );
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * verifies the permissions on config file (if asked by configuration)
-     * (must be called after config.inc.php has been merged)
-     *
-     * @return void
-     */
-    public function checkPermissions()
-    {
-        // Check for permissions (on platforms that support it):
-        if ($this->get('CheckConfigurationPermissions')) {
-            $perms = @fileperms($this->getSource());
-            if (!($perms === false) && ($perms & 2)) {
-                // This check is normally done after loading configuration
-                $this->checkWebServerOs();
-                if ($this->get('PMA_IS_WINDOWS') == 0) {
-                    $this->source_mtime = 0;
-                    PMA_fatalError(
-                        __(
-                            'Wrong permissions on configuration file, '
-                            . 'should not be world writable!'
-                        )
-                    );
-                }
-            }
-        }
-    }
-
-    /**
-     * returns specific config setting
-     *
-     * @param string $setting config setting
-     *
-     * @return mixed value
-     */
-    public function get($setting)
-    {
-        if (isset($this->settings[$setting])) {
-            return $this->settings[$setting];
-        }
-        return null;
-    }
-
-    /**
-     * sets configuration variable
-     *
-     * @param string $setting configuration option
-     * @param mixed  $value   new value for configuration option
-     *
-     * @return void
-     */
-    public function set($setting, $value)
-    {
-        if (! isset($this->settings[$setting])
-            || $this->settings[$setting] !== $value
-        ) {
-            $this->settings[$setting] = $value;
-            $this->set_mtime = time();
-        }
-    }
-
-    /**
-     * returns source for current config
-     *
-     * @return string  config source
-     */
-    public function getSource()
-    {
-        return $this->source;
-    }
-
-    /**
-     * returns a unique value to force a CSS reload if either the config
-     * or the theme changes
-     * must also check the pma_fontsize cookie in case there is no
-     * config file
-     *
-     * @return int Summary of unix timestamps and fontsize,
-     * to be unique on theme parameters change
-     */
-    public function getThemeUniqueValue()
-    {
-        if (null !== $this->get('fontsize')) {
-            $fontsize = intval($this->get('fontsize'));
-        } elseif (isset($_COOKIE['pma_fontsize'])) {
-            $fontsize = intval($_COOKIE['pma_fontsize']);
-        } else {
-            $fontsize = 0;
-        }
-        return (
-            $fontsize +
-            $this->source_mtime +
-            $this->default_source_mtime +
-            $this->get('user_preferences_mtime') +
-            $_SESSION['PMA_Theme']->mtime_info +
-            $_SESSION['PMA_Theme']->filesize_info);
-    }
-
-    /**
-     * Sets collation_connection based on user preference. First is checked
-     * value from request, then cookies with fallback to default.
-     *
-     * After setting it here, cookie is set in common.inc.php to persist
-     * the selection.
-     *
-     * @todo check validity of collation string
-     *
-     * @return void
-     */
-    public function checkCollationConnection()
-    {
-        if (! empty($_REQUEST['collation_connection'])) {
-            $collation = htmlspecialchars(
-                strip_tags($_REQUEST['collation_connection'])
-            );
-        } elseif (! empty($_COOKIE['pma_collation_connection'])) {
-            $collation = htmlspecialchars(
-                strip_tags($_COOKIE['pma_collation_connection'])
-            );
-        } else {
-            $collation = $this->get('DefaultConnectionCollation');
-        }
-        $this->set('collation_connection', $collation);
-    }
-
-    /**
-     * checks for font size configuration, and sets font size as requested by user
-     *
-     * @return void
-     */
-    public function checkFontsize()
-    {
-        $new_fontsize = '';
-
-        if (isset($_GET['set_fontsize'])) {
-            $new_fontsize = $_GET['set_fontsize'];
-        } elseif (isset($_POST['set_fontsize'])) {
-            $new_fontsize = $_POST['set_fontsize'];
-        } elseif (isset($_COOKIE['pma_fontsize'])) {
-            $new_fontsize = $_COOKIE['pma_fontsize'];
-        }
-
-        if (preg_match('/^[0-9.]+(px|em|pt|\%)$/', $new_fontsize)) {
-            $this->set('fontsize', $new_fontsize);
-        } elseif (! $this->get('fontsize')) {
-            // 80% would correspond to the default browser font size
-            // of 16, but use 82% to help read the monoface font
-            $this->set('fontsize', '82%');
-        }
-
-        $this->setCookie('pma_fontsize', $this->get('fontsize'), '82%');
-    }
-
-    /**
-     * checks if upload is enabled
-     *
-     * @return void
-     */
-    public function checkUpload()
-    {
-        if (!ini_get('file_uploads')) {
-            $this->set('enable_upload', false);
-            return;
-        }
-
-        $this->set('enable_upload', true);
-        // if set "php_admin_value file_uploads Off" in httpd.conf
-        // ini_get() also returns the string "Off" in this case:
-        if ('off' == strtolower(ini_get('file_uploads'))) {
-            $this->set('enable_upload', false);
-        }
-    }
-
-    /**
-     * Maximum upload size as limited by PHP
-     * Used with permission from Moodle (http://moodle.org) by Martin Dougiamas
-     *
-     * this section generates $max_upload_size in bytes
-     *
-     * @return void
-     */
-    public function checkUploadSize()
-    {
-        if (! $filesize = ini_get('upload_max_filesize')) {
-            $filesize = "5M";
-        }
-
-        if ($postsize = ini_get('post_max_size')) {
-            $this->set(
-                'max_upload_size',
-                min(PMA_getRealSize($filesize), PMA_getRealSize($postsize))
-            );
-        } else {
-            $this->set('max_upload_size', PMA_getRealSize($filesize));
-        }
-    }
-
-    /**
-     * Checks if protocol is https
-     *
-     * This function checks if the https protocol on the active connection.
-     *
-     * @return bool
-     */
-    public function isHttps()
-    {
-
-        if (null !== $this->get('is_https')) {
-            return $this->get('is_https');
-        }
-
-        $url = $this->get('PmaAbsoluteUri');
-
-        $is_https = false;
-        if (! empty($url) && parse_url($url, PHP_URL_SCHEME) === 'https') {
-            $is_https = true;
-        } elseif (strtolower(PMA_getenv('HTTP_SCHEME')) == 'https') {
-            $is_https = true;
-        } elseif (strtolower(PMA_getenv('HTTPS')) == 'on') {
-            $is_https = true;
-        } elseif (substr(strtolower(PMA_getenv('REQUEST_URI')), 0, 6) == 'https:') {
-            $is_https = true;
-        } elseif (strtolower(PMA_getenv('HTTP_HTTPS_FROM_LB')) == 'on') {
-            // A10 Networks load balancer
-            $is_https = true;
-        } elseif (strtolower(PMA_getenv('HTTP_FRONT_END_HTTPS')) == 'on') {
-            $is_https = true;
-        } elseif (strtolower(PMA_getenv('HTTP_X_FORWARDED_PROTO')) == 'https') {
-            $is_https = true;
-        } elseif (PMA_getenv('SERVER_PORT') == 443) {
-            $is_https = true;
-        }
-
-        $this->set('is_https', $is_https);
-
-        return $is_https;
-    }
-
-    /**
-     * Get phpMyAdmin root path
-     *
-     * @return string
-     */
-    public function getRootPath()
-    {
-        static $cookie_path = null;
-
-        if (null !== $cookie_path && !defined('TESTSUITE')) {
-            return $cookie_path;
-        }
-
-        $url = $this->get('PmaAbsoluteUri');
-
-        if (! empty($url)) {
-            $path = parse_url($url, PHP_URL_PATH);
-            if (! empty($path)) {
-                if (substr($path, -1) != '/') {
-                    return $path . '/';
-                }
-                return $path;
-            }
-        }
-
-        $parsed_url = parse_url($GLOBALS['PMA_PHP_SELF']);
-
-        $parts = explode(
-            '/',
-            rtrim(str_replace('\\', '/', $parsed_url['path']), '/')
-        );
-
-        /* Remove filename */
-        if (substr($parts[count($parts) - 1], -4) == '.php') {
-            $parts = array_slice($parts, 0, count($parts) - 1);
-        }
-
-        /* Remove extra path from javascript calls */
-        if (defined('PMA_PATH_TO_BASEDIR')) {
-            $parts = array_slice($parts, 0, count($parts) - 1);
-        }
-
-        $parts[] = '';
-
-        return implode('/', $parts);
-    }
-
-    /**
-     * enables backward compatibility
-     *
-     * @return void
-     */
-    public function enableBc()
-    {
-        $GLOBALS['cfg']             = $this->settings;
-        $GLOBALS['default_server']  = $this->default_server;
-        unset($this->default_server);
-        $GLOBALS['collation_connection'] = $this->get('collation_connection');
-        $GLOBALS['is_upload']       = $this->get('enable_upload');
-        $GLOBALS['max_upload_size'] = $this->get('max_upload_size');
-        $GLOBALS['is_https']        = $this->get('is_https');
-
-        $defines = array(
-            'PMA_VERSION',
-            'PMA_THEME_VERSION',
-            'PMA_THEME_GENERATION',
-            'PMA_IS_WINDOWS',
-            'PMA_IS_IIS',
-            'PMA_IS_GD2',
-            'PMA_USR_OS',
-            'PMA_USR_BROWSER_VER',
-            'PMA_USR_BROWSER_AGENT'
-            );
-
-        foreach ($defines as $define) {
-            if (! defined($define)) {
-                define($define, $this->get($define));
-            }
-        }
-    }
-
-    /**
-     * returns options for font size selection
-     *
-     * @param string $current_size current selected font size with unit
-     *
-     * @return array selectable font sizes
-     */
-    protected static function getFontsizeOptions($current_size = '82%')
-    {
-        $unit = preg_replace('/[0-9.]*/', '', $current_size);
-        $value = preg_replace('/[^0-9.]*/', '', $current_size);
-
-        $factors = array();
-        $options = array();
-        $options["$value"] = $value . $unit;
-
-        if ($unit === '%') {
-            $factors[] = 1;
-            $factors[] = 5;
-            $factors[] = 10;
-        } elseif ($unit === 'em') {
-            $factors[] = 0.05;
-            $factors[] = 0.2;
-            $factors[] = 1;
-        } elseif ($unit === 'pt') {
-            $factors[] = 0.5;
-            $factors[] = 2;
-        } elseif ($unit === 'px') {
-            $factors[] = 1;
-            $factors[] = 5;
-            $factors[] = 10;
-        } else {
-            //unknown font size unit
-            $factors[] = 0.05;
-            $factors[] = 0.2;
-            $factors[] = 1;
-            $factors[] = 5;
-            $factors[] = 10;
-        }
-
-        foreach ($factors as $key => $factor) {
-            $option_inc = $value + $factor;
-            $option_dec = $value - $factor;
-            while (count($options) < 21) {
-                $options["$option_inc"] = $option_inc . $unit;
-                if ($option_dec > $factors[0]) {
-                    $options["$option_dec"] = $option_dec . $unit;
-                }
-                $option_inc += $factor;
-                $option_dec -= $factor;
-                if (isset($factors[$key + 1])
-                    && $option_inc >= $value + $factors[$key + 1]
-                ) {
-                    break;
-                }
-            }
-        }
-        ksort($options);
-        return $options;
-    }
-
-    /**
-     * returns html selectbox for font sizes
-     *
-     * @return string html selectbox
-     */
-    protected static function getFontsizeSelection()
-    {
-        $current_size = $GLOBALS['PMA_Config']->get('fontsize');
-        // for the case when there is no config file (this is supported)
-        if (empty($current_size)) {
-            if (isset($_COOKIE['pma_fontsize'])) {
-                $current_size = htmlspecialchars($_COOKIE['pma_fontsize']);
-            } else {
-                $current_size = '82%';
-            }
-        }
-        $options = Config::getFontsizeOptions($current_size);
-
-        $return = '<label for="select_fontsize">' . __('Font size')
-            . ':</label>' . "\n"
-            . '<select name="set_fontsize" id="select_fontsize"'
-            . ' class="autosubmit">' . "\n";
-        foreach ($options as $option) {
-            $return .= '<option value="' . $option . '"';
-            if ($option == $current_size) {
-                $return .= ' selected="selected"';
-            }
-            $return .= '>' . $option . '</option>' . "\n";
-        }
-        $return .= '</select>';
-
-        return $return;
-    }
-
-    /**
-     * return complete font size selection form
-     *
-     * @return string html selectbox
-     */
-    public static function getFontsizeForm()
-    {
-        return '<form name="form_fontsize_selection" id="form_fontsize_selection"'
-            . ' method="get" action="index.php" class="disableAjax">' . "\n"
-            . PMA_URL_getHiddenInputs() . "\n"
-            . Config::getFontsizeSelection() . "\n"
-            . '</form>';
-    }
-
-    /**
-     * removes cookie
-     *
-     * @param string $cookie name of cookie to remove
-     *
-     * @return boolean result of setcookie()
-     */
-    public function removeCookie($cookie)
-    {
-        if (defined('TESTSUITE')) {
-            if (isset($_COOKIE[$cookie])) {
-                unset($_COOKIE[$cookie]);
-            }
-            return true;
-        }
-        return setcookie(
-            $cookie,
-            '',
-            time() - 3600,
-            $this->getRootPath(),
-            '',
-            $this->isHttps()
-        );
-    }
-
-    /**
-     * sets cookie if value is different from current cookie value,
-     * or removes if value is equal to default
-     *
-     * @param string $cookie   name of cookie to remove
-     * @param mixed  $value    new cookie value
-     * @param string $default  default value
-     * @param int    $validity validity of cookie in seconds (default is one month)
-     * @param bool   $httponly whether cookie is only for HTTP (and not for scripts)
-     *
-     * @return boolean result of setcookie()
-     */
-    public function setCookie($cookie, $value, $default = null,
-        $validity = null, $httponly = true
-    ) {
-        if (mb_strlen($value) && null !== $default && $value === $default
-        ) {
-            // default value is used
-            if (isset($_COOKIE[$cookie])) {
-                // remove cookie
-                return $this->removeCookie($cookie);
-            }
-            return false;
-        }
-
-        if (!mb_strlen($value) && isset($_COOKIE[$cookie])) {
-            // remove cookie, value is empty
-            return $this->removeCookie($cookie);
-        }
-
-        if (! isset($_COOKIE[$cookie]) || $_COOKIE[$cookie] !== $value) {
-            // set cookie with new value
-            /* Calculate cookie validity */
-            if ($validity === null) {
-                $validity = time() + 2592000;
-            } elseif ($validity == 0) {
-                $validity = 0;
-            } else {
-                $validity = time() + $validity;
-            }
-            if (defined('TESTSUITE')) {
-                $_COOKIE[$cookie] = $value;
-                return true;
-            }
-            return setcookie(
-                $cookie,
-                $value,
-                $validity,
-                $this->getRootPath(),
-                '',
-                $this->isHttps(),
-                $httponly
-            );
-        }
-
-        // cookie has already $value as value
-        return true;
-    }
-
-
-    /**
-     * Error handler to catch fatal errors when loading configuration
-     * file
-     *
-     *
-     * PMA_Config_fatalErrorHandler
-     * @return void
-     */
-    public static function fatalErrorHandler()
-    {
-        if (!isset($GLOBALS['pma_config_loading'])
-            || !$GLOBALS['pma_config_loading']
-        ) {
-            return;
-        }
-
-        $error = error_get_last();
-        if ($error === null) {
-            return;
-        }
-
-        PMA_fatalError(
-            sprintf(
-                'Failed to load phpMyAdmin configuration (%s:%s): %s',
-                Error::relPath($error['file']),
-                $error['line'],
-                $error['message']
-            )
-        );
-    }
-}
-
-if (!defined('TESTSUITE')) {
-    register_shutdown_function(array('PMA\libraries\Config', 'fatalErrorHandler'));
-}
diff --git a/#pma/libraries/Console.php b/#pma/libraries/Console.php
deleted file mode 100644
index 7ce772c9..00000000
--- a/#pma/libraries/Console.php
+++ /dev/null
@@ -1,389 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Used to render the console of PMA's pages
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries;
-
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
-require_once 'libraries/bookmark.lib.php';
-
-/**
- * Class used to output the console
- *
- * @package PhpMyAdmin
- */
-class Console
-{
-    /**
-     * Whether to display anything
-     *
-     * @access private
-     * @var bool
-     */
-    private $_isEnabled;
-
-    /**
-     * Creates a new class instance
-     */
-    public function __construct()
-    {
-        $this->_isEnabled = true;
-    }
-
-    /**
-     * Whether we are servicing an ajax request.
-     * We can't simply use $GLOBALS['is_ajax_request']
-     * here since it may have not been initialised yet.
-     *
-     * @access private
-     * @var bool
-     */
-    private $_isAjax;
-
-    /**
-     * Set the ajax flag to indicate whether
-     * we are servicing an ajax request
-     *
-     * @param bool $isAjax Whether we are servicing an ajax request
-     *
-     * @return void
-     */
-    public function setAjax($isAjax)
-    {
-        $this->_isAjax = (boolean) $isAjax;
-    }
-
-    /**
-     * Disables the rendering of the footer
-     *
-     * @return void
-     */
-    public function disable()
-    {
-        $this->_isEnabled = false;
-    }
-
-    /**
-     * Renders the bookmark content
-     *
-     * @access public
-     * @return string
-     */
-    public static function getBookmarkContent()
-    {
-        $output = '';
-        $cfgBookmark = PMA_Bookmark_getParams();
-        if ($cfgBookmark) {
-
-            $tpl_bookmark_actions
-                = '<span class="action collapse">' . __('Collapse') . '</span> '
-                . '<span class="action expand">' . __('Expand') . '</span> '
-                . '<span class="action requery">' . __('Requery') . '</span> '
-                . '<span class="action edit_bookmark">' . __('Edit') . '</span> '
-                .  '<span class="action delete_bookmark">' . __('Delete')
-                . '</span> '
-                . '<span class="text targetdb">' . __('Database')
-                . ': <span>%s</span></span>';
-
-            $bookmarks = PMA_Bookmark_getList();
-            $output .= '<div class="message welcome"><span>';
-            $count_bookmarks = count($bookmarks);
-            if ($count_bookmarks > 0) {
-                $output .= sprintf(
-                    _ngettext(
-                        'Showing %1$d bookmark (both private and shared)',
-                        'Showing %1$d bookmarks (both private and shared)',
-                        $count_bookmarks
-                    ),
-                    $count_bookmarks
-                );
-            } else {
-                $output .= __('No bookmarks');
-            }
-            unset($count_bookmarks, $private_message, $shared_message);
-            $output .= '</span></div>';
-            foreach ($bookmarks as $val) {
-                $output .= '<div class="message collapsed bookmark" bookmarkid="'
-                .  $val['id'] . '" targetdb="' . htmlspecialchars($val['db'])
-                .  '"><div class="action_content">'
-                .  sprintf($tpl_bookmark_actions, htmlspecialchars($val['db']))
-                .  '</div><span class="bookmark_label '
-                . ($val['shared'] ? 'shared' : '') . '">'
-                .  htmlspecialchars($val['label'])
-                .  '</span> <span class="query">'
-                .  htmlspecialchars($val['query'])
-                .  '</span></div>';
-            }
-        }
-        return $output;
-    }
-
-    /**
-     * Returns the list of JS scripts required by console
-     *
-     * @return array list of scripts
-     */
-    public function getScripts()
-    {
-        return array('console.js');
-    }
-
-    /**
-     * Gets the history
-     *
-     * @param string $tpl_query_actions the template for query actions
-     *
-     * @return string $output the generated HTML for history
-     *
-     * @access  private
-     *
-     */
-    private function _getHistory($tpl_query_actions)
-    {
-        $output = '';
-
-        $_sql_history = PMA_getHistory($GLOBALS['cfg']['Server']['user']);
-        if (! empty($_sql_history)) {
-            foreach (array_reverse($_sql_history) as $record) {
-                $isSelect = preg_match(
-                    '@^SELECT[[:space:]]+@i', $record['sqlquery']
-                );
-                $output .= '<div class="message history collapsed hide'
-                        . ($isSelect ? ' select' : '')
-                        . '" targetdb="'
-                        . htmlspecialchars($record['db'])
-                        . '" targettable="' . htmlspecialchars($record['table'])
-                        . '"><div class="action_content">'
-                        . sprintf(
-                            $tpl_query_actions,
-                            htmlspecialchars($record['db']),
-                            (isset($record['timevalue'])
-                                ? $record['timevalue']
-                                : __('During current session')
-                            )
-                        )
-                        . '</div><span class="query">'
-                        . htmlspecialchars($record['sqlquery'])
-                        . '</span></div>';
-            }
-        }
-        return $output;
-    }
-
-    /**
-     * Renders the console
-     *
-     * @access public
-     * @return string
-     */
-    public function getDisplay()
-    {
-        $output  = '';
-        if ((! $this->_isAjax) && $this->_isEnabled) {
-            $cfgBookmark = PMA_Bookmark_getParams();
-            $output .= '<div id="pma_console_container"><div id="pma_console">';
-
-            // The templates, use sprintf() to output them
-            // There're white space at the end of every <span>,
-            // for double-click selection
-            $tpl_query_actions = '<span class="action collapse">' . __('Collapse')
-                . '</span> '
-                . '<span class="action expand">' . __('Expand') . '</span> '
-                . '<span class="action requery">' . __('Requery') . '</span> '
-                . '<span class="action edit">' . __('Edit') . '</span> '
-                . '<span class="action explain">' . __('Explain') . '</span> '
-                . '<span class="action profiling">' . __('Profiling') . '</span> '
-                . ($cfgBookmark ? '<span class="action bookmark">'
-                . __('Bookmark') . '</span> ' : '')
-                . '<span class="text failed">' . __('Query failed') . '</span> '
-                . '<span class="text targetdb">' . __('Database')
-                . ': <span>%s</span></span> '
-                . '<span class="text query_time">' . __(
-                    'Queried time'
-                ) . ': <span>%s</span></span> ';
-
-            // Console toolbar
-            $output .= '<div class="toolbar collapsed">';
-
-            $output .= '<div class="switch_button console_switch">';
-            $output .= Util::getImage('console.png', __('SQL Query Console'));
-            $output .= '<span>' . __('Console') . '</span></div>';
-
-            $output .= '<div class="button clear"><span>'
-                    . __('Clear') . '</span></div>';
-
-            $output .= '<div class="button history"><span>'
-                    . __('History') . '</span></div>';
-
-            $output .= '<div class="button options"><span>'
-                    . __('Options') . '</span></div>';
-
-            if ($cfgBookmark) {
-                $output .= '<div class="button bookmarks"><span>'
-                        . __('Bookmarks') . '</span></div>';
-            }
-
-            $output .= '<div class="button debug hide"><span>'
-                    . __('Debug SQL') . '</span></div>';
-
-            $output .= '</div>'; // Toolbar end
-
-            // Console messages
-            $output .= '<div class="content">';
-            $output .= '<div class="console_message_container">'
-                    .  '<div class="message welcome"><span>'
-                    .  '<span id="instructions-0">'
-                    .  __('Press Ctrl+Enter to execute query') . '</span>'
-                    .  '<span class="hide" id="instructions-1">'
-                    .  __('Press Enter to execute query') . '</span>'
-                    .  '</span></div>';
-
-            $output .= $this->_getHistory($tpl_query_actions);
-
-            $output .= '</div>'; // .console_message_container
-            $output .= '<div class="query_input">'
-                    . '<span class="console_query_input"></span>'
-                    . '</div>';
-            $output .= '</div>'; // Messages end
-
-            // Dark the console while other cards cover it
-            $output .= '<div class="mid_layer"></div>';
-
-            // Debug SQL card
-            $output .= '<div class="card" id="debug_console">';
-            $output .= '<div class="toolbar">'
-                . '<div class="button order order_asc">'
-                . '<span>' . __('ascending') . '</span>'
-                . '</div>'
-                . '<div class="button order order_desc">'
-                . '<span>' . __('descending') . '</span>'
-                . '</div>'
-                . '<div class="text">'
-                . '<span>' . __('Order:') . '</span>'
-                . '</div>'
-                . '<div class="switch_button">'
-                . '<span>' . __('Debug SQL') . '</span>'
-                . '</div>'
-                . '<div class="button order_by sort_count">'
-                . '<span>' . __('Count') . '</span>'
-                . '</div>'
-                . '<div class="button order_by sort_exec">'
-                . '<span>' . __('Execution order') . '</span>'
-                . '</div>'
-                . '<div class="button order_by sort_time">'
-                . '<span>' . __('Time taken') . '</span>'
-                . '</div>'
-                . '<div class="text">'
-                . '<span>' . __('Order by:') . '</span>'
-                . '</div>'
-                . '<div class="button group_queries">'
-                . '<span>' . __('Group queries') . '</span>'
-                . '</div>'
-                . '<div class="button ungroup_queries">'
-                . '<span>' . __('Ungroup queries') . '</span>'
-                . '</div>'
-                . '</div>'; // Toolbar
-            $output .= '<div class="content debug">';
-            $output .= '<div class="message welcome"></div>';
-            $output .= '<div class="debugLog"></div>';
-            $output .= '</div>'; // Content
-            $output .= '<div class="templates">'
-                . '<div class="debug_query action_content">'
-                . '<span class="action collapse">' . __('Collapse') . '</span> '
-                . '<span class="action expand">' . __('Expand') . '</span> '
-                . '<span class="action dbg_show_trace">' . __('Show trace')
-                . '</span> '
-                . '<span class="action dbg_hide_trace">' . __('Hide trace')
-                . '</span> '
-                . '<span class="text count hide">' . __('Count:')
-                . ' <span></span></span>'
-                . '<span class="text time">' . __('Time taken:')
-                . ' <span></span></span>'
-                . '</div>'
-                . '</div>'; // Template
-            $output .= '</div>'; // Debug SQL card
-
-            // Bookmarks card:
-
-            if ($cfgBookmark) {
-                $output .= '<div class="card" id="pma_bookmarks">';
-                $output .= '<div class="toolbar">'
-                        .  '<div class="switch_button"><span>' . __('Bookmarks')
-                        .  '</span></div>';
-
-                $output .= '<div class="button refresh"><span>'
-                        . __('Refresh') . '</span></div>';
-
-                $output .= '<div class="button add"><span>'
-                        . __('Add') . '</span></div>';
-
-                $output .= '</div><div class="content bookmark">';
-                $output .= static::getBookmarkContent();
-                $output .= '</div>';
-                    $output .= '<div class="mid_layer"></div>';
-                    $output .= '<div class="card add">';
-                    $output .= '<div class="toolbar">'
-                            . '<div class="switch_button"><span>'
-                            . __('Add bookmark')
-                            . '</span></div>';
-                    $output .= '</div><div class="content add_bookmark">'
-                            . '<div class="options">'
-                            . '<label>' . __('Label')
-                            . ': <input type="text" name="label"></label> '
-                            . '<label>' . __('Target database')
-                            . ': <input type="text" name="targetdb"></label> '
-                            . '<label><input type="checkbox" name="shared">'
-                            . __('Share this bookmark') . '</label>'
-                            . '<button type="submit" name="submit">Ok</button>'
-                            . '</div>' // .options
-                            . '<div class="query_input">'
-                            . '<span class="bookmark_add_input"></span></div>';
-                    $output .= '</div>';
-                    $output .= '</div>'; // Add bookmark card
-                $output .= '</div>'; // Bookmarks card
-            }
-
-            // Options card:
-            $output .= '<div class="card" id="pma_console_options">';
-            $output .= '<div class="toolbar">'
-                    .  '<div class="switch_button"><span>' . __('Options')
-                    . '</span></div>';
-
-            $output .= '<div class="button default"><span>'
-                    . __('Set default') . '</span></div>';
-
-            $output .= '</div><div class="content">'
-                    .  '<label><input type="checkbox" name="always_expand">'
-                    .  __('Always expand query messages') . '</label><br>'
-                    .  '<label><input type="checkbox" name="start_history">'
-                    .  __('Show query history at start') . '</label><br>'
-                    .  '<label><input type="checkbox" name="current_query">'
-                    .  __('Show current browsing query') . '</label><br>'
-                    .  '<label><input type="checkbox" name="enter_executes">'
-                    .  __(
-                        'Execute queries on Enter and insert new line with Shift + '
-                        . 'Enter. To make this permanent, view settings.'
-                    ) . '</label><br>'
-                    .  '<label><input type="checkbox" name="dark_theme">'
-                    .  __('Switch to dark theme') . '</label><br>'
-                    .  '</div>';
-            $output .= '</div>'; // Options card
-
-            $output .= '<div class="templates">'
-            // Templates for console message actions
-                    .  '<div class="query_actions">'
-                    .  sprintf($tpl_query_actions, '', '')
-                    .  '</div>'
-                    .  '</div>';
-            $output .= '</div></div>'; // #console and #pma_console_container ends
-        }
-        return $output;
-    }
-
-}
diff --git a/#pma/libraries/DatabaseInterface.php b/#pma/libraries/DatabaseInterface.php
deleted file mode 100644
index 96f40abb..00000000
--- a/#pma/libraries/DatabaseInterface.php
+++ /dev/null
@@ -1,2788 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Main interface for database interactions
- *
- * @package PhpMyAdmin-DBI
- */
-namespace PMA\libraries;
-
-use PMA\libraries\dbi\DBIExtension;
-use PMA\libraries\LanguageManager;
-
-require_once './libraries/logging.lib.php';
-require_once './libraries/util.lib.php';
-
-/**
- * Main interface for database interactions
- *
- * @package PhpMyAdmin-DBI
- */
-class DatabaseInterface
-{
-    /**
-     * Force STORE_RESULT method, ignored by classic MySQL.
-     */
-    const QUERY_STORE = 1;
-    /**
-     * Do not read whole query.
-     */
-    const QUERY_UNBUFFERED = 2;
-    /**
-     * Get session variable.
-     */
-    const GETVAR_SESSION = 1;
-    /**
-     * Get global variable.
-     */
-    const GETVAR_GLOBAL = 2;
-
-    /**
-     * @var DBIExtension
-     */
-    private $_extension;
-
-    /**
-     * @var array Table data cache
-     */
-    private $_table_cache;
-
-    /**
-     * Constructor
-     *
-     * @param DBIExtension $ext Object to be used for database queries
-     */
-    public function __construct($ext)
-    {
-        $this->_extension = $ext;
-        $this->_table_cache = array();
-    }
-
-    /**
-     * Checks whether database extension is loaded
-     *
-     * @param string $extension mysql extension to check
-     *
-     * @return bool
-     */
-    public static function checkDbExtension($extension = 'mysql')
-    {
-        if (function_exists($extension . '_connect')) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * runs a query
-     *
-     * @param string $query               SQL query to execute
-     * @param mixed  $link                optional database link to use
-     * @param int    $options             optional query options
-     * @param bool   $cache_affected_rows whether to cache affected rows
-     *
-     * @return mixed
-     */
-    public function query($query, $link = null, $options = 0,
-        $cache_affected_rows = true
-    ) {
-        $res = $this->tryQuery($query, $link, $options, $cache_affected_rows)
-            or Util::mysqlDie($this->getError($link), $query);
-        return $res;
-    }
-
-    /**
-     * Get a cached value from table cache.
-     *
-     * @param array $contentPath Array of the name of the target value
-     * @param mixed $default     Return value on cache miss
-     *
-     * @return mixed cached value or default
-     */
-    public function getCachedTableContent($contentPath, $default = null)
-    {
-        return \PMA\Util\get($this->_table_cache, $contentPath, $default);
-    }
-
-    /**
-     * Set an item in table cache using dot notation.
-     *
-     * @param array $contentPath Array with the target path
-     * @param mixed $value       Target value
-     *
-     * @return void
-     */
-    public function cacheTableContent($contentPath, $value)
-    {
-        $loc = &$this->_table_cache;
-
-        if (!isset($contentPath)) {
-            $loc = $value;
-            return;
-        }
-
-        while (count($contentPath) > 1) {
-            $key = array_shift($contentPath);
-
-            // If the key doesn't exist at this depth, we will just create an empty
-            // array to hold the next value, allowing us to create the arrays to hold
-            // final values at the correct depth. Then we'll keep digging into the
-            // array.
-            if (!isset($loc[$key]) || !is_array($loc[$key])) {
-                $loc[$key] = array();
-            }
-            $loc = &$loc[$key];
-        }
-
-        $loc[array_shift($contentPath)] = $value;
-    }
-
-    /**
-     * Clear the table cache.
-     *
-     * @return void
-     */
-    public function clearTableCache()
-    {
-        $this->_table_cache = array();
-    }
-
-    /**
-     * Caches table data so Table does not require to issue
-     * SHOW TABLE STATUS again
-     *
-     * @param array  $tables information for tables of some databases
-     * @param string $table  table name
-     *
-     * @return void
-     */
-    private function _cacheTableData($tables, $table)
-    {
-        // Note: I don't see why we would need array_merge_recursive() here,
-        // as it creates double entries for the same table (for example a double
-        // entry for Comment when changing the storage engine in Operations)
-        // Note 2: Instead of array_merge(), simply use the + operator because
-        //  array_merge() renumbers numeric keys starting with 0, therefore
-        //  we would lose a db name that consists only of numbers
-
-        foreach ($tables as $one_database => $its_tables) {
-            if (isset($this->_table_cache[$one_database])) {
-                // the + operator does not do the intended effect
-                // when the cache for one table already exists
-                if ($table
-                    && isset($this->_table_cache[$one_database][$table])
-                ) {
-                    unset($this->_table_cache[$one_database][$table]);
-                }
-                $this->_table_cache[$one_database]
-                    = $this->_table_cache[$one_database] + $tables[$one_database];
-            } else {
-                $this->_table_cache[$one_database] = $tables[$one_database];
-            }
-        }
-    }
-
-    /**
-     * Stores query data into session data for debugging purposes
-     *
-     * @param string         $query  Query text
-     * @param object         $link   database link
-     * @param object|boolean $result Query result
-     * @param integer        $time   Time to execute query
-     *
-     * @return void
-     */
-    private function _dbgQuery($query, $link, $result, $time)
-    {
-        $dbgInfo = array();
-        $error_message = $this->getError($link);
-        if ($result == false && is_string($error_message)) {
-            $dbgInfo['error']
-                = '<span style="color:red">'
-                . htmlspecialchars($error_message) . '</span>';
-        }
-        $dbgInfo['query'] = htmlspecialchars($query);
-        $dbgInfo['time'] = $time;
-        // Get and slightly format backtrace, this is used
-        // in the javascript console.
-        // Strip call to _dbgQuery
-        $dbgInfo['trace'] = Error::processBacktrace(
-            array_slice(debug_backtrace(), 1)
-        );
-        $dbgInfo['hash'] = md5($query);
-
-        $_SESSION['debug']['queries'][] = $dbgInfo;
-    }
-
-    /**
-     * runs a query and returns the result
-     *
-     * @param string  $query               query to run
-     * @param object  $link                mysql link resource
-     * @param integer $options             query options
-     * @param bool    $cache_affected_rows whether to cache affected row
-     *
-     * @return mixed
-     */
-    public function tryQuery($query, $link = null, $options = 0,
-        $cache_affected_rows = true
-    ) {
-        $link = $this->getLink($link);
-        if ($link === false) {
-            return false;
-        }
-
-        if ($GLOBALS['cfg']['DBG']['sql']) {
-            $time = microtime(true);
-        }
-
-        $result = $this->_extension->realQuery($query, $link, $options);
-
-        if ($cache_affected_rows) {
-            $GLOBALS['cached_affected_rows'] = $this->affectedRows($link, false);
-        }
-
-        if ($GLOBALS['cfg']['DBG']['sql']) {
-            $time = microtime(true) - $time;
-            $this->_dbgQuery($query, $link, $result, $time);
-        }
-
-        if ((!empty($result)) && (Tracker::isActive())) {
-            Tracker::handleQuery($query);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Run multi query statement and return results
-     *
-     * @param string $multi_query multi query statement to execute
-     * @param mysqli $link        mysqli object
-     *
-     * @return mysqli_result collection | boolean(false)
-     */
-    public function tryMultiQuery($multi_query = '', $link = null)
-    {
-        $link = $this->getLink($link);
-        if ($link === false) {
-            return false;
-        }
-
-        return $this->_extension->realMultiQuery($link, $multi_query);
-    }
-
-    /**
-     * returns array with table names for given db
-     *
-     * @param string $database name of database
-     * @param mixed  $link     mysql link resource|object
-     *
-     * @return array   tables names
-     */
-    public function getTables($database, $link = null)
-    {
-        return $this->fetchResult(
-            'SHOW TABLES FROM ' . Util::backquote($database) . ';',
-            null,
-            0,
-            $link,
-            self::QUERY_STORE
-        );
-    }
-
-    /**
-     * returns a segment of the SQL WHERE clause regarding table name and type
-     *
-     * @param string  $table        table
-     * @param boolean $tbl_is_group $table is a table group
-     * @param string  $table_type   whether table or view
-     *
-     * @return string a segment of the WHERE clause
-     */
-    private function _getTableCondition($table, $tbl_is_group, $table_type)
-    {
-        // get table information from information_schema
-        if ($table) {
-            if (true === $tbl_is_group) {
-                $sql_where_table = 'AND t.`TABLE_NAME` LIKE \''
-                    . Util::escapeMysqlWildcards(
-                        $GLOBALS['dbi']->escapeString($table)
-                    )
-                    . '%\'';
-            } else {
-                $sql_where_table = 'AND t.`TABLE_NAME` '
-                    . Util::getCollateForIS() . ' = \''
-                    . $GLOBALS['dbi']->escapeString($table) . '\'';
-            }
-        } else {
-            $sql_where_table = '';
-        }
-
-        if ($table_type) {
-            if ($table_type == 'view') {
-                $sql_where_table .= " AND t.`TABLE_TYPE` != 'BASE TABLE'";
-            } else if ($table_type == 'table') {
-                $sql_where_table .= " AND t.`TABLE_TYPE` = 'BASE TABLE'";
-            }
-        }
-        return $sql_where_table;
-    }
-
-    /**
-     * returns the beginning of the SQL statement to fetch the list of tables
-     *
-     * @param string[] $this_databases  databases to list
-     * @param string   $sql_where_table additional condition
-     *
-     * @return string the SQL statement
-     */
-    private function _getSqlForTablesFull($this_databases, $sql_where_table)
-    {
-        $sql = '
-            SELECT *,
-                `TABLE_SCHEMA`       AS `Db`,
-                `TABLE_NAME`         AS `Name`,
-                `TABLE_TYPE`         AS `TABLE_TYPE`,
-                `ENGINE`             AS `Engine`,
-                `ENGINE`             AS `Type`,
-                `VERSION`            AS `Version`,
-                `ROW_FORMAT`         AS `Row_format`,
-                `TABLE_ROWS`         AS `Rows`,
-                `AVG_ROW_LENGTH`     AS `Avg_row_length`,
-                `DATA_LENGTH`        AS `Data_length`,
-                `MAX_DATA_LENGTH`    AS `Max_data_length`,
-                `INDEX_LENGTH`       AS `Index_length`,
-                `DATA_FREE`          AS `Data_free`,
-                `AUTO_INCREMENT`     AS `Auto_increment`,
-                `CREATE_TIME`        AS `Create_time`,
-                `UPDATE_TIME`        AS `Update_time`,
-                `CHECK_TIME`         AS `Check_time`,
-                `TABLE_COLLATION`    AS `Collation`,
-                `CHECKSUM`           AS `Checksum`,
-                `CREATE_OPTIONS`     AS `Create_options`,
-                `TABLE_COMMENT`      AS `Comment`
-            FROM `information_schema`.`TABLES` t
-            WHERE `TABLE_SCHEMA` ' . Util::getCollateForIS() . '
-                IN (\'' . implode("', '", $this_databases) . '\')
-                ' . $sql_where_table;
-
-        return $sql;
-    }
-
-    /**
-     * returns array of all tables in given db or dbs
-     * this function expects unquoted names:
-     * RIGHT: my_database
-     * WRONG: `my_database`
-     * WRONG: my\_database
-     * if $tbl_is_group is true, $table is used as filter for table names
-     *
-     * <code>
-     * $GLOBALS['dbi']->getTablesFull('my_database');
-     * $GLOBALS['dbi']->getTablesFull('my_database', 'my_table'));
-     * $GLOBALS['dbi']->getTablesFull('my_database', 'my_tables_', true));
-     * </code>
-     *
-     * @param string          $database     database
-     * @param string          $table        table name
-     * @param boolean         $tbl_is_group $table is a table group
-     * @param mixed           $link         mysql link
-     * @param integer         $limit_offset zero-based offset for the count
-     * @param boolean|integer $limit_count  number of tables to return
-     * @param string          $sort_by      table attribute to sort by
-     * @param string          $sort_order   direction to sort (ASC or DESC)
-     * @param string          $table_type   whether table or view
-     *
-     * @todo    move into Table
-     *
-     * @return array           list of tables in given db(s)
-     */
-    public function getTablesFull($database, $table = '',
-        $tbl_is_group = false,  $link = null, $limit_offset = 0,
-        $limit_count = false, $sort_by = 'Name', $sort_order = 'ASC',
-        $table_type = null
-    ) {
-        if (true === $limit_count) {
-            $limit_count = $GLOBALS['cfg']['MaxTableList'];
-        }
-        // prepare and check parameters
-        if (! is_array($database)) {
-            $databases = array($database);
-        } else {
-            $databases = $database;
-        }
-
-        $tables = array();
-
-        if (! $GLOBALS['cfg']['Server']['DisableIS']) {
-            $sql_where_table = $this->_getTableCondition(
-                $table, $tbl_is_group, $table_type
-            );
-
-            // for PMA bc:
-            // `SCHEMA_FIELD_NAME` AS `SHOW_TABLE_STATUS_FIELD_NAME`
-            //
-            // on non-Windows servers,
-            // added BINARY in the WHERE clause to force a case sensitive
-            // comparison (if we are looking for the db Aa we don't want
-            // to find the db aa)
-            $this_databases = array_map(
-                array($this, 'escapeString'),
-                $databases
-            );
-
-            $sql = $this->_getSqlForTablesFull($this_databases, $sql_where_table);
-
-            // Sort the tables
-            $sql .= " ORDER BY $sort_by $sort_order";
-
-            if ($limit_count) {
-                $sql .= ' LIMIT ' . $limit_count . ' OFFSET ' . $limit_offset;
-            }
-
-            $tables = $this->fetchResult(
-                $sql, array('TABLE_SCHEMA', 'TABLE_NAME'), null, $link
-            );
-
-            if ($sort_by == 'Name' && $GLOBALS['cfg']['NaturalOrder']) {
-                // here, the array's first key is by schema name
-                foreach ($tables as $one_database_name => $one_database_tables) {
-                    uksort($one_database_tables, 'strnatcasecmp');
-
-                    if ($sort_order == 'DESC') {
-                        $one_database_tables = array_reverse($one_database_tables);
-                    }
-                    $tables[$one_database_name] = $one_database_tables;
-                }
-            } elseif ($sort_by == 'Data_length') {
-                // Size = Data_length + Index_length
-                foreach ($tables as $one_database_name => $one_database_tables) {
-                    uasort(
-                        $one_database_tables,
-                        function ($a, $b) {
-                            $aLength = $a['Data_length'] + $a['Index_length'];
-                            $bLength = $b['Data_length'] + $b['Index_length'];
-                            return ($aLength == $bLength)
-                                ? 0
-                                : ($aLength < $bLength) ? -1 : 1;
-                        }
-                    );
-
-                    if ($sort_order == 'DESC') {
-                        $one_database_tables = array_reverse($one_database_tables);
-                    }
-                    $tables[$one_database_name] = $one_database_tables;
-                }
-            }
-        } // end (get information from table schema)
-
-        // If permissions are wrong on even one database directory,
-        // information_schema does not return any table info for any database
-        // this is why we fall back to SHOW TABLE STATUS even for MySQL >= 50002
-        if (empty($tables)) {
-            foreach ($databases as $each_database) {
-                if ($table || (true === $tbl_is_group) || ! empty($table_type)) {
-                    $sql = 'SHOW TABLE STATUS FROM '
-                        . Util::backquote($each_database)
-                        . ' WHERE';
-                    $needAnd = false;
-                    if ($table || (true === $tbl_is_group)) {
-                        $sql .= " `Name` LIKE '"
-                            . Util::escapeMysqlWildcards(
-                                $this->escapeString($table, $link)
-                            )
-                            . "%'";
-                        $needAnd = true;
-                    }
-                    if (! empty($table_type)) {
-                        if ($needAnd) {
-                            $sql .= " AND";
-                        }
-                        if ($table_type == 'view') {
-                            $sql .= " `Comment` = 'VIEW'";
-                        } else if ($table_type == 'table') {
-                            $sql .= " `Comment` != 'VIEW'";
-                        }
-                    }
-                } else {
-                    $sql = 'SHOW TABLE STATUS FROM '
-                        . Util::backquote($each_database);
-                }
-
-                $useStatusCache = false;
-
-                if (extension_loaded('apc')
-                    && isset($GLOBALS['cfg']['Server']['StatusCacheDatabases'])
-                    && ! empty($GLOBALS['cfg']['Server']['StatusCacheLifetime'])
-                ) {
-                    $statusCacheDatabases
-                        = (array) $GLOBALS['cfg']['Server']['StatusCacheDatabases'];
-                    if (in_array($each_database, $statusCacheDatabases)) {
-                        $useStatusCache = true;
-                    }
-                }
-
-                $each_tables = null;
-
-                if ($useStatusCache) {
-                    $cacheKey = 'phpMyAdmin_tableStatus_'
-                        . sha1($GLOBALS['cfg']['Server']['host'] . '_' . $sql);
-
-                    $each_tables = apc_fetch($cacheKey);
-                }
-
-                if (! $each_tables) {
-                    $each_tables = $this->fetchResult($sql, 'Name', null, $link);
-                }
-
-                if ($useStatusCache) {
-                    apc_store(
-                        $cacheKey, $each_tables,
-                        $GLOBALS['cfg']['Server']['StatusCacheLifetime']
-                    );
-                }
-
-                // Sort naturally if the config allows it and we're sorting
-                // the Name column.
-                if ($sort_by == 'Name' && $GLOBALS['cfg']['NaturalOrder']) {
-                    uksort($each_tables, 'strnatcasecmp');
-
-                    if ($sort_order == 'DESC') {
-                        $each_tables = array_reverse($each_tables);
-                    }
-                } else {
-                    // Prepare to sort by creating array of the selected sort
-                    // value to pass to array_multisort
-
-                    // Size = Data_length + Index_length
-                    if ($sort_by == 'Data_length') {
-                        foreach ($each_tables as $table_name => $table_data) {
-                            ${$sort_by}[$table_name] = strtolower(
-                                $table_data['Data_length']
-                                + $table_data['Index_length']
-                            );
-                        }
-                    } else {
-                        foreach ($each_tables as $table_name => $table_data) {
-                            ${$sort_by}[$table_name]
-                                = strtolower($table_data[$sort_by]);
-                        }
-                    }
-
-                    if (! empty($$sort_by)) {
-                        if ($sort_order == 'DESC') {
-                            array_multisort($$sort_by, SORT_DESC, $each_tables);
-                        } else {
-                            array_multisort($$sort_by, SORT_ASC, $each_tables);
-                        }
-                    }
-
-                    // cleanup the temporary sort array
-                    unset($$sort_by);
-                }
-
-                if ($limit_count) {
-                    $each_tables = array_slice(
-                        $each_tables, $limit_offset, $limit_count
-                    );
-                }
-
-                foreach ($each_tables as $table_name => $each_table) {
-                    if (! isset($each_tables[$table_name]['Type'])
-                        && isset($each_tables[$table_name]['Engine'])
-                    ) {
-                        // pma BC, same parts of PMA still uses 'Type'
-                        $each_tables[$table_name]['Type']
-                            =& $each_tables[$table_name]['Engine'];
-                    } elseif (! isset($each_tables[$table_name]['Engine'])
-                        && isset($each_tables[$table_name]['Type'])
-                    ) {
-                        // old MySQL reports Type, newer MySQL reports Engine
-                        $each_tables[$table_name]['Engine']
-                            =& $each_tables[$table_name]['Type'];
-                    }
-
-                    // MySQL forward compatibility
-                    // so pma could use this array as if every server
-                    // is of version >5.0
-                    // todo : remove and check usage in the rest of the code,
-                    // MySQL 5.0 is required by current PMA version
-                    $each_tables[$table_name]['TABLE_SCHEMA']
-                        = $each_database;
-                    $each_tables[$table_name]['TABLE_NAME']
-                        =& $each_tables[$table_name]['Name'];
-                    $each_tables[$table_name]['ENGINE']
-                        =& $each_tables[$table_name]['Engine'];
-                    $each_tables[$table_name]['VERSION']
-                        =& $each_tables[$table_name]['Version'];
-                    $each_tables[$table_name]['ROW_FORMAT']
-                        =& $each_tables[$table_name]['Row_format'];
-                    $each_tables[$table_name]['TABLE_ROWS']
-                        =& $each_tables[$table_name]['Rows'];
-                    $each_tables[$table_name]['AVG_ROW_LENGTH']
-                        =& $each_tables[$table_name]['Avg_row_length'];
-                    $each_tables[$table_name]['DATA_LENGTH']
-                        =& $each_tables[$table_name]['Data_length'];
-                    $each_tables[$table_name]['MAX_DATA_LENGTH']
-                        =& $each_tables[$table_name]['Max_data_length'];
-                    $each_tables[$table_name]['INDEX_LENGTH']
-                        =& $each_tables[$table_name]['Index_length'];
-                    $each_tables[$table_name]['DATA_FREE']
-                        =& $each_tables[$table_name]['Data_free'];
-                    $each_tables[$table_name]['AUTO_INCREMENT']
-                        =& $each_tables[$table_name]['Auto_increment'];
-                    $each_tables[$table_name]['CREATE_TIME']
-                        =& $each_tables[$table_name]['Create_time'];
-                    $each_tables[$table_name]['UPDATE_TIME']
-                        =& $each_tables[$table_name]['Update_time'];
-                    $each_tables[$table_name]['CHECK_TIME']
-                        =& $each_tables[$table_name]['Check_time'];
-                    $each_tables[$table_name]['TABLE_COLLATION']
-                        =& $each_tables[$table_name]['Collation'];
-                    $each_tables[$table_name]['CHECKSUM']
-                        =& $each_tables[$table_name]['Checksum'];
-                    $each_tables[$table_name]['CREATE_OPTIONS']
-                        =& $each_tables[$table_name]['Create_options'];
-                    $each_tables[$table_name]['TABLE_COMMENT']
-                        =& $each_tables[$table_name]['Comment'];
-
-                    if (strtoupper($each_tables[$table_name]['Comment']) === 'VIEW'
-                        && $each_tables[$table_name]['Engine'] == null
-                    ) {
-                        $each_tables[$table_name]['TABLE_TYPE'] = 'VIEW';
-                    } elseif ($each_database == 'information_schema') {
-                        $each_tables[$table_name]['TABLE_TYPE'] = 'SYSTEM VIEW';
-                    } else {
-                        /**
-                         * @todo difference between 'TEMPORARY' and 'BASE TABLE'
-                         * but how to detect?
-                         */
-                        $each_tables[$table_name]['TABLE_TYPE'] = 'BASE TABLE';
-                    }
-                }
-
-                $tables[$each_database] = $each_tables;
-            }
-        }
-
-        // cache table data
-        // so Table does not require to issue SHOW TABLE STATUS again
-        $this->_cacheTableData($tables, $table);
-
-        if (is_array($database)) {
-            return $tables;
-        }
-
-        if (isset($tables[$database])) {
-            return $tables[$database];
-        }
-
-        if (isset($tables[mb_strtolower($database)])) {
-            // on windows with lower_case_table_names = 1
-            // MySQL returns
-            // with SHOW DATABASES or information_schema.SCHEMATA: `Test`
-            // but information_schema.TABLES gives `test`
-            // bug #2036
-            // https://sourceforge.net/p/phpmyadmin/bugs/2036/
-            return $tables[mb_strtolower($database)];
-        }
-
-        return $tables;
-    }
-
-    /**
-     * Copies the table properties to the set of property names used by PMA.
-     *
-     * @param array  $tables   array of table properties
-     * @param string $database database name
-     *
-     * @return array array with added properties
-     */
-    public function copyTableProperties($tables, $database)
-    {
-        foreach ($tables as $table_name => $each_table) {
-            if (! isset($tables[$table_name]['Type'])
-                && isset($tables[$table_name]['Engine'])
-            ) {
-                // pma BC, same parts of PMA still uses 'Type'
-                $tables[$table_name]['Type']
-                    =& $tables[$table_name]['Engine'];
-            } elseif (! isset($tables[$table_name]['Engine'])
-                && isset($tables[$table_name]['Type'])
-            ) {
-                // old MySQL reports Type, newer MySQL reports Engine
-                $tables[$table_name]['Engine']
-                    =& $tables[$table_name]['Type'];
-            }
-
-            // MySQL forward compatibility
-            // so pma could use this array as if every server
-            // is of version >5.0
-            // todo : remove and check usage in the rest of the code,
-            // MySQL 5.0 is required by current PMA version
-            $tables[$table_name]['TABLE_SCHEMA']
-                = $database;
-            $tables[$table_name]['TABLE_NAME']
-                =& $tables[$table_name]['Name'];
-            $tables[$table_name]['ENGINE']
-                =& $tables[$table_name]['Engine'];
-            $tables[$table_name]['VERSION']
-                =& $tables[$table_name]['Version'];
-            $tables[$table_name]['ROW_FORMAT']
-                =& $tables[$table_name]['Row_format'];
-            $tables[$table_name]['TABLE_ROWS']
-                =& $tables[$table_name]['Rows'];
-            $tables[$table_name]['AVG_ROW_LENGTH']
-                =& $tables[$table_name]['Avg_row_length'];
-            $tables[$table_name]['DATA_LENGTH']
-                =& $tables[$table_name]['Data_length'];
-            $tables[$table_name]['MAX_DATA_LENGTH']
-                =& $tables[$table_name]['Max_data_length'];
-            $tables[$table_name]['INDEX_LENGTH']
-                =& $tables[$table_name]['Index_length'];
-            $tables[$table_name]['DATA_FREE']
-                =& $tables[$table_name]['Data_free'];
-            $tables[$table_name]['AUTO_INCREMENT']
-                =& $tables[$table_name]['Auto_increment'];
-            $tables[$table_name]['CREATE_TIME']
-                =& $tables[$table_name]['Create_time'];
-            $tables[$table_name]['UPDATE_TIME']
-                =& $tables[$table_name]['Update_time'];
-            $tables[$table_name]['CHECK_TIME']
-                =& $tables[$table_name]['Check_time'];
-            $tables[$table_name]['TABLE_COLLATION']
-                =& $tables[$table_name]['Collation'];
-            $tables[$table_name]['CHECKSUM']
-                =& $tables[$table_name]['Checksum'];
-            $tables[$table_name]['CREATE_OPTIONS']
-                =& $tables[$table_name]['Create_options'];
-            $tables[$table_name]['TABLE_COMMENT']
-                =& $tables[$table_name]['Comment'];
-
-            $commentUpper = mb_strtoupper(
-                $tables[$table_name]['Comment']
-            );
-            if ($commentUpper === 'VIEW'
-                && $tables[$table_name]['Engine'] == null
-            ) {
-                $tables[$table_name]['TABLE_TYPE'] = 'VIEW';
-            } else {
-                /**
-                 * @todo difference between 'TEMPORARY' and 'BASE TABLE'
-                 * but how to detect?
-                 */
-                $tables[$table_name]['TABLE_TYPE'] = 'BASE TABLE';
-            }
-        }
-        return $tables;
-    }
-
-    /**
-     * Get VIEWs in a particular database
-     *
-     * @param string $db Database name to look in
-     *
-     * @return array $views Set of VIEWs inside the database
-     */
-    public function getVirtualTables($db)
-    {
-
-        $tables_full = $this->getTablesFull($db);
-        $views = array();
-
-        foreach ($tables_full as $table=>$tmp) {
-
-            $_table = $this->getTable($db, $table);
-            if ($_table->isView()) {
-                $views[] = $table;
-            }
-
-        }
-
-        return $views;
-
-    }
-
-
-    /**
-     * returns array with databases containing extended infos about them
-     *
-     * @param string   $database     database
-     * @param boolean  $force_stats  retrieve stats also for MySQL < 5
-     * @param object   $link         mysql link
-     * @param string   $sort_by      column to order by
-     * @param string   $sort_order   ASC or DESC
-     * @param integer  $limit_offset starting offset for LIMIT
-     * @param bool|int $limit_count  row count for LIMIT or true
-     *                               for $GLOBALS['cfg']['MaxDbList']
-     *
-     * @todo    move into ListDatabase?
-     *
-     * @return array $databases
-     */
-    public function getDatabasesFull($database = null, $force_stats = false,
-        $link = null, $sort_by = 'SCHEMA_NAME', $sort_order = 'ASC',
-        $limit_offset = 0, $limit_count = false
-    ) {
-        $sort_order = strtoupper($sort_order);
-
-        if (true === $limit_count) {
-            $limit_count = $GLOBALS['cfg']['MaxDbList'];
-        }
-
-        $apply_limit_and_order_manual = true;
-
-        if (! $GLOBALS['cfg']['Server']['DisableIS']) {
-            /**
-             * if $GLOBALS['cfg']['NaturalOrder'] is enabled, we cannot use LIMIT
-             * cause MySQL does not support natural ordering,
-             * we have to do it afterward
-             */
-            $limit = '';
-            if (! $GLOBALS['cfg']['NaturalOrder']) {
-                if ($limit_count) {
-                    $limit = ' LIMIT ' . $limit_count . ' OFFSET ' . $limit_offset;
-                }
-
-                $apply_limit_and_order_manual = false;
-            }
-
-            // get table information from information_schema
-            if (! empty($database)) {
-                $sql_where_schema = 'WHERE `SCHEMA_NAME` LIKE \''
-                    . $this->escapeString($database, $link) . '\'';
-            } else {
-                $sql_where_schema = '';
-            }
-
-            $sql  = 'SELECT *,
-                    CAST(BIN_NAME AS CHAR CHARACTER SET utf8) AS SCHEMA_NAME
-                FROM (';
-            $sql .= 'SELECT
-                BINARY s.SCHEMA_NAME AS BIN_NAME,
-                s.DEFAULT_COLLATION_NAME';
-            if ($force_stats) {
-                $sql .= ',
-                    COUNT(t.TABLE_SCHEMA)  AS SCHEMA_TABLES,
-                    SUM(t.TABLE_ROWS)      AS SCHEMA_TABLE_ROWS,
-                    SUM(t.DATA_LENGTH)     AS SCHEMA_DATA_LENGTH,
-                    SUM(t.MAX_DATA_LENGTH) AS SCHEMA_MAX_DATA_LENGTH,
-                    SUM(t.INDEX_LENGTH)    AS SCHEMA_INDEX_LENGTH,
-                    SUM(t.DATA_LENGTH + t.INDEX_LENGTH)
-                                           AS SCHEMA_LENGTH,
-                    SUM(IF(t.ENGINE <> \'InnoDB\', t.DATA_FREE, 0))
-                                           AS SCHEMA_DATA_FREE';
-            }
-            $sql .= '
-                   FROM `information_schema`.SCHEMATA s';
-            if ($force_stats) {
-                $sql .= '
-                    LEFT JOIN `information_schema`.TABLES t
-                        ON BINARY t.TABLE_SCHEMA = BINARY s.SCHEMA_NAME';
-            }
-            $sql .= $sql_where_schema . '
-                    GROUP BY BINARY s.SCHEMA_NAME, s.DEFAULT_COLLATION_NAME
-                    ORDER BY ';
-            if ($sort_by == 'SCHEMA_NAME'
-                || $sort_by == 'DEFAULT_COLLATION_NAME'
-            ) {
-                $sql .= 'BINARY ';
-            }
-            $sql .= Util::backquote($sort_by)
-                . ' ' . $sort_order
-                . $limit;
-            $sql .= ') a';
-
-            $databases = $this->fetchResult($sql, 'SCHEMA_NAME', null, $link);
-
-            $mysql_error = $this->getError($link);
-            if (! count($databases) && $GLOBALS['errno']) {
-                Util::mysqlDie($mysql_error, $sql);
-            }
-
-            // display only databases also in official database list
-            // f.e. to apply hide_db and only_db
-            $drops = array_diff(
-                array_keys($databases), (array) $GLOBALS['dblist']->databases
-            );
-            foreach ($drops as $drop) {
-                unset($databases[$drop]);
-            }
-        } else {
-            $databases = array();
-            foreach ($GLOBALS['dblist']->databases as $database_name) {
-                // MySQL forward compatibility
-                // so pma could use this array as if every server is of version >5.0
-                // todo : remove and check the rest of the code for usage,
-                // MySQL 5.0 or higher is required for current PMA version
-                $databases[$database_name]['SCHEMA_NAME']      = $database_name;
-
-                include_once './libraries/mysql_charsets.inc.php';
-                $databases[$database_name]['DEFAULT_COLLATION_NAME']
-                    = PMA_getDbCollation($database_name);
-
-                if (!$force_stats) {
-                    continue;
-                }
-
-                // get additional info about tables
-                $databases[$database_name]['SCHEMA_TABLES']          = 0;
-                $databases[$database_name]['SCHEMA_TABLE_ROWS']      = 0;
-                $databases[$database_name]['SCHEMA_DATA_LENGTH']     = 0;
-                $databases[$database_name]['SCHEMA_MAX_DATA_LENGTH'] = 0;
-                $databases[$database_name]['SCHEMA_INDEX_LENGTH']    = 0;
-                $databases[$database_name]['SCHEMA_LENGTH']          = 0;
-                $databases[$database_name]['SCHEMA_DATA_FREE']       = 0;
-
-                $res = $this->query(
-                    'SHOW TABLE STATUS FROM '
-                    . Util::backquote($database_name) . ';'
-                );
-
-                if ($res === false) {
-                    unset($res);
-                    continue;
-                }
-
-                while ($row = $this->fetchAssoc($res)) {
-                    $databases[$database_name]['SCHEMA_TABLES']++;
-                    $databases[$database_name]['SCHEMA_TABLE_ROWS']
-                        += $row['Rows'];
-                    $databases[$database_name]['SCHEMA_DATA_LENGTH']
-                        += $row['Data_length'];
-                    $databases[$database_name]['SCHEMA_MAX_DATA_LENGTH']
-                        += $row['Max_data_length'];
-                    $databases[$database_name]['SCHEMA_INDEX_LENGTH']
-                        += $row['Index_length'];
-
-                    // for InnoDB, this does not contain the number of
-                    // overhead bytes but the total free space
-                    if ('InnoDB' != $row['Engine']) {
-                        $databases[$database_name]['SCHEMA_DATA_FREE']
-                            += $row['Data_free'];
-                    }
-                    $databases[$database_name]['SCHEMA_LENGTH']
-                        += $row['Data_length'] + $row['Index_length'];
-                }
-                $this->freeResult($res);
-                unset($res);
-            }
-        }
-
-        /**
-         * apply limit and order manually now
-         * (caused by older MySQL < 5 or $GLOBALS['cfg']['NaturalOrder'])
-         */
-        if ($apply_limit_and_order_manual) {
-            $GLOBALS['callback_sort_order'] = $sort_order;
-            $GLOBALS['callback_sort_by'] = $sort_by;
-            usort(
-                $databases,
-                array('PMA\libraries\DatabaseInterface', '_usortComparisonCallback')
-            );
-            unset($GLOBALS['callback_sort_order'], $GLOBALS['callback_sort_by']);
-
-            /**
-             * now apply limit
-             */
-            if ($limit_count) {
-                $databases = array_slice($databases, $limit_offset, $limit_count);
-            }
-        }
-
-        return $databases;
-    }
-
-    /**
-     * usort comparison callback
-     *
-     * @param string $a first argument to sort
-     * @param string $b second argument to sort
-     *
-     * @return integer  a value representing whether $a should be before $b in the
-     *                   sorted array or not
-     *
-     * @access  private
-     */
-    private static function _usortComparisonCallback($a, $b)
-    {
-        if ($GLOBALS['cfg']['NaturalOrder']) {
-            $sorter = 'strnatcasecmp';
-        } else {
-            $sorter = 'strcasecmp';
-        }
-        /* No sorting when key is not present */
-        if (! isset($a[$GLOBALS['callback_sort_by']])
-            || ! isset($b[$GLOBALS['callback_sort_by']])
-        ) {
-            return 0;
-        }
-        // produces f.e.:
-        // return -1 * strnatcasecmp($a["SCHEMA_TABLES"], $b["SCHEMA_TABLES"])
-        return ($GLOBALS['callback_sort_order'] == 'ASC' ? 1 : -1) * $sorter(
-            $a[$GLOBALS['callback_sort_by']], $b[$GLOBALS['callback_sort_by']]
-        );
-    } // end of the '_usortComparisonCallback()' method
-
-    /**
-     * returns detailed array with all columns for sql
-     *
-     * @param string $sql_query    target SQL query to get columns
-     * @param array  $view_columns alias for columns
-     *
-     * @return array
-     */
-    public function getColumnMapFromSql($sql_query, $view_columns = array())
-    {
-        $result = $this->tryQuery($sql_query);
-
-        if ($result === false) {
-            return array();
-        }
-
-        $meta = $this->getFieldsMeta(
-            $result
-        );
-
-        $nbFields = count($meta);
-        if ($nbFields <= 0) {
-            return array();
-        }
-
-        $column_map = array();
-        $nbColumns = count($view_columns);
-
-        for ($i=0; $i < $nbFields; $i++) {
-
-            $map = array();
-            $map['table_name'] = $meta[$i]->table;
-            $map['refering_column'] = $meta[$i]->name;
-
-            if ($nbColumns > 1) {
-                $map['real_column'] = $view_columns[$i];
-            }
-
-            $column_map[] = $map;
-        }
-
-        return $column_map;
-    }
-
-    /**
-     * returns detailed array with all columns for given table in database,
-     * or all tables/databases
-     *
-     * @param string $database name of database
-     * @param string $table    name of table to retrieve columns from
-     * @param string $column   name of specific column
-     * @param mixed  $link     mysql link resource
-     *
-     * @return array
-     */
-    public function getColumnsFull($database = null, $table = null,
-        $column = null, $link = null
-    ) {
-        if (! $GLOBALS['cfg']['Server']['DisableIS']) {
-            $sql_wheres = array();
-            $array_keys = array();
-
-            // get columns information from information_schema
-            if (null !== $database) {
-                $sql_wheres[] = '`TABLE_SCHEMA` = \''
-                    . $this->escapeString($database, $link) . '\' ';
-            } else {
-                $array_keys[] = 'TABLE_SCHEMA';
-            }
-            if (null !== $table) {
-                $sql_wheres[] = '`TABLE_NAME` = \''
-                    . $this->escapeString($table, $link) . '\' ';
-            } else {
-                $array_keys[] = 'TABLE_NAME';
-            }
-            if (null !== $column) {
-                $sql_wheres[] = '`COLUMN_NAME` = \''
-                    . $this->escapeString($column, $link) . '\' ';
-            } else {
-                $array_keys[] = 'COLUMN_NAME';
-            }
-
-            // for PMA bc:
-            // `[SCHEMA_FIELD_NAME]` AS `[SHOW_FULL_COLUMNS_FIELD_NAME]`
-            $sql = '
-                 SELECT *,
-                        `COLUMN_NAME`       AS `Field`,
-                        `COLUMN_TYPE`       AS `Type`,
-                        `COLLATION_NAME`    AS `Collation`,
-                        `IS_NULLABLE`       AS `Null`,
-                        `COLUMN_KEY`        AS `Key`,
-                        `COLUMN_DEFAULT`    AS `Default`,
-                        `EXTRA`             AS `Extra`,
-                        `PRIVILEGES`        AS `Privileges`,
-                        `COLUMN_COMMENT`    AS `Comment`
-                   FROM `information_schema`.`COLUMNS`';
-
-            if (count($sql_wheres)) {
-                $sql .= "\n" . ' WHERE ' . implode(' AND ', $sql_wheres);
-            }
-            return $this->fetchResult($sql, $array_keys, null, $link);
-        } else {
-            $columns = array();
-            if (null === $database) {
-                foreach ($GLOBALS['dblist']->databases as $database) {
-                    $columns[$database] = $this->getColumnsFull(
-                        $database, null, null, $link
-                    );
-                }
-                return $columns;
-            } elseif (null === $table) {
-                $tables = $this->getTables($database);
-                foreach ($tables as $table) {
-                    $columns[$table] = $this->getColumnsFull(
-                        $database, $table, null, $link
-                    );
-                }
-                return $columns;
-            }
-            $sql = 'SHOW FULL COLUMNS FROM '
-                . Util::backquote($database) . '.' . Util::backquote($table);
-            if (null !== $column) {
-                $sql .= " LIKE '" . $this->escapeString($column, $link) . "'";
-            }
-
-            $columns = $this->fetchResult($sql, 'Field', null, $link);
-            $ordinal_position = 1;
-            foreach ($columns as $column_name => $each_column) {
-
-                // MySQL forward compatibility
-                // so pma could use this array as if every server is of version >5.0
-                // todo : remove and check the rest of the code for usage,
-                // MySQL 5.0 or higher is required for current PMA version
-                $columns[$column_name]['COLUMN_NAME']
-                    =& $columns[$column_name]['Field'];
-                $columns[$column_name]['COLUMN_TYPE']
-                    =& $columns[$column_name]['Type'];
-                $columns[$column_name]['COLLATION_NAME']
-                    =& $columns[$column_name]['Collation'];
-                $columns[$column_name]['IS_NULLABLE']
-                    =& $columns[$column_name]['Null'];
-                $columns[$column_name]['COLUMN_KEY']
-                    =& $columns[$column_name]['Key'];
-                $columns[$column_name]['COLUMN_DEFAULT']
-                    =& $columns[$column_name]['Default'];
-                $columns[$column_name]['EXTRA']
-                    =& $columns[$column_name]['Extra'];
-                $columns[$column_name]['PRIVILEGES']
-                    =& $columns[$column_name]['Privileges'];
-                $columns[$column_name]['COLUMN_COMMENT']
-                    =& $columns[$column_name]['Comment'];
-
-                $columns[$column_name]['TABLE_CATALOG'] = null;
-                $columns[$column_name]['TABLE_SCHEMA'] = $database;
-                $columns[$column_name]['TABLE_NAME'] = $table;
-                $columns[$column_name]['ORDINAL_POSITION'] = $ordinal_position;
-                $columns[$column_name]['DATA_TYPE']
-                    = substr(
-                        $columns[$column_name]['COLUMN_TYPE'],
-                        0,
-                        strpos($columns[$column_name]['COLUMN_TYPE'], '(')
-                    );
-                /**
-                 * @todo guess CHARACTER_MAXIMUM_LENGTH from COLUMN_TYPE
-                */
-                $columns[$column_name]['CHARACTER_MAXIMUM_LENGTH'] = null;
-                /**
-                 * @todo guess CHARACTER_OCTET_LENGTH from CHARACTER_MAXIMUM_LENGTH
-                 */
-                $columns[$column_name]['CHARACTER_OCTET_LENGTH'] = null;
-                $columns[$column_name]['NUMERIC_PRECISION'] = null;
-                $columns[$column_name]['NUMERIC_SCALE'] = null;
-                $columns[$column_name]['CHARACTER_SET_NAME']
-                    = substr(
-                        $columns[$column_name]['COLLATION_NAME'],
-                        0,
-                        strpos($columns[$column_name]['COLLATION_NAME'], '_')
-                    );
-
-                $ordinal_position++;
-            }
-
-            if (null !== $column) {
-                return reset($columns);
-            }
-
-            return $columns;
-        }
-    }
-
-    /**
-     * Returns SQL query for fetching columns for a table
-     *
-     * The 'Key' column is not calculated properly, use $GLOBALS['dbi']->getColumns()
-     * to get correct values.
-     *
-     * @param string  $database name of database
-     * @param string  $table    name of table to retrieve columns from
-     * @param string  $column   name of column, null to show all columns
-     * @param boolean $full     whether to return full info or only column names
-     *
-     * @see getColumns()
-     *
-     * @return string
-     */
-    public function getColumnsSql($database, $table, $column = null, $full = false)
-    {
-        $sql = 'SHOW ' . ($full ? 'FULL' : '') . ' COLUMNS FROM '
-            . Util::backquote($database) . '.' . Util::backquote($table)
-            . (($column !== null) ? "LIKE '"
-            . $GLOBALS['dbi']->escapeString($column) . "'" : '');
-
-        return $sql;
-    }
-
-    /**
-     * Returns descriptions of columns in given table (all or given by $column)
-     *
-     * @param string  $database name of database
-     * @param string  $table    name of table to retrieve columns from
-     * @param string  $column   name of column, null to show all columns
-     * @param boolean $full     whether to return full info or only column names
-     * @param mixed   $link     mysql link resource
-     *
-     * @return array array indexed by column names or,
-     *               if $column is given, flat array description
-     */
-    public function getColumns($database, $table, $column = null, $full = false,
-        $link = null
-    ) {
-        $sql = $this->getColumnsSql($database, $table, $column, $full);
-        $fields = $this->fetchResult($sql, 'Field', null, $link);
-        if (! is_array($fields) || count($fields) == 0) {
-            return array();
-        }
-        // Check if column is a part of multiple-column index and set its 'Key'.
-        $indexes = Index::getFromTable($table, $database);
-        foreach ($fields as $field => $field_data) {
-            if (!empty($field_data['Key'])) {
-                continue;
-            }
-
-            foreach ($indexes as $index) {
-                /** @var Index $index */
-                if (!$index->hasColumn($field)) {
-                    continue;
-                }
-
-                $index_columns = $index->getColumns();
-                if ($index_columns[$field]->getSeqInIndex() > 1) {
-                    if ($index->isUnique()) {
-                        $fields[$field]['Key'] = 'UNI';
-                    } else {
-                        $fields[$field]['Key'] = 'MUL';
-                    }
-                }
-            }
-        }
-
-        return ($column != null) ? array_shift($fields) : $fields;
-    }
-
-    /**
-     * Returns all column names in given table
-     *
-     * @param string $database name of database
-     * @param string $table    name of table to retrieve columns from
-     * @param mixed  $link     mysql link resource
-     *
-     * @return null|array
-     */
-    public function getColumnNames($database, $table, $link = null)
-    {
-        $sql = $this->getColumnsSql($database, $table);
-        // We only need the 'Field' column which contains the table's column names
-        $fields = array_keys($this->fetchResult($sql, 'Field', null, $link));
-
-        if (! is_array($fields) || count($fields) == 0) {
-            return null;
-        }
-        return $fields;
-    }
-
-    /**
-    * Returns SQL for fetching information on table indexes (SHOW INDEXES)
-    *
-    * @param string $database name of database
-    * @param string $table    name of the table whose indexes are to be retrieved
-    * @param string $where    additional conditions for WHERE
-    *
-    * @return string SQL for getting indexes
-    */
-    public function getTableIndexesSql($database, $table, $where = null)
-    {
-        $sql = 'SHOW INDEXES FROM ' . Util::backquote($database) . '.'
-            . Util::backquote($table);
-        if ($where) {
-            $sql .= ' WHERE (' . $where . ')';
-        }
-        return $sql;
-    }
-
-    /**
-     * Returns indexes of a table
-     *
-     * @param string $database name of database
-     * @param string $table    name of the table whose indexes are to be retrieved
-     * @param mixed  $link     mysql link resource
-     *
-     * @return array   $indexes
-     */
-    public function getTableIndexes($database, $table, $link = null)
-    {
-        $sql = $this->getTableIndexesSql($database, $table);
-        $indexes = $this->fetchResult($sql, null, null, $link);
-
-        if (! is_array($indexes) || count($indexes) < 1) {
-            return array();
-        }
-        return $indexes;
-    }
-
-    /**
-     * returns value of given mysql server variable
-     *
-     * @param string $var  mysql server variable name
-     * @param int    $type DatabaseInterface::GETVAR_SESSION |
-     *                     DatabaseInterface::GETVAR_GLOBAL
-     * @param mixed  $link mysql link resource|object
-     *
-     * @return mixed   value for mysql server variable
-     */
-    public function getVariable(
-        $var, $type = self::GETVAR_SESSION, $link = null
-    ) {
-        $link = $this->getLink($link);
-        if ($link === false) {
-            return false;
-        }
-
-        switch ($type) {
-        case self::GETVAR_SESSION:
-            $modifier = ' SESSION';
-            break;
-        case self::GETVAR_GLOBAL:
-            $modifier = ' GLOBAL';
-            break;
-        default:
-            $modifier = '';
-        }
-        return $this->fetchValue(
-            'SHOW' . $modifier . ' VARIABLES LIKE \'' . $var . '\';', 0, 1, $link
-        );
-    }
-
-    /**
-     * Sets new value for a variable if it is different from the current value
-     *
-     * @param string $var   variable name
-     * @param string $value value to set
-     * @param mixed  $link  mysql link resource|object
-     *
-     * @return bool whether query was a successful
-     */
-    public function setVariable($var, $value, $link = null)
-    {
-        $link = $this->getLink($link);
-        if ($link === false) {
-            return false;
-        }
-        $current_value = $GLOBALS['dbi']->getVariable(
-            $var, self::GETVAR_SESSION, $link
-        );
-        if ($current_value == $value) {
-            return true;
-        }
-
-        return $this->query("SET " . $var . " = " . $value . ';', $link);
-    }
-
-    /**
-     * Function called just after a connection to the MySQL database server has
-     * been established. It sets the connection collation, and determines the
-     * version of MySQL which is running.
-     *
-     * @param mixed $link mysql link resource|object
-     *
-     * @return void
-     */
-    public function postConnect($link)
-    {
-        if (! defined('PMA_MYSQL_INT_VERSION')) {
-            $version = $this->fetchSingleRow(
-                'SELECT @@version, @@version_comment',
-                'ASSOC',
-                $link
-            );
-
-            if ($version) {
-                $match = explode('.', $version['@@version']);
-                define('PMA_MYSQL_MAJOR_VERSION', (int)$match[0]);
-                define(
-                    'PMA_MYSQL_INT_VERSION',
-                    (int) sprintf(
-                        '%d%02d%02d', $match[0], $match[1], intval($match[2])
-                    )
-                );
-                define('PMA_MYSQL_STR_VERSION', $version['@@version']);
-                define(
-                    'PMA_MYSQL_VERSION_COMMENT',
-                    $version['@@version_comment']
-                );
-            } else {
-                define('PMA_MYSQL_INT_VERSION', 50501);
-                define('PMA_MYSQL_MAJOR_VERSION', 5);
-                define('PMA_MYSQL_STR_VERSION', '5.05.01');
-                define('PMA_MYSQL_VERSION_COMMENT', '');
-            }
-            /* Detect MariaDB */
-            if (mb_strpos(PMA_MYSQL_STR_VERSION, 'MariaDB') !== false) {
-                define('PMA_MARIADB', true);
-            } else {
-                define('PMA_MARIADB', false);
-            }
-        }
-
-        if (PMA_MYSQL_INT_VERSION >  50503) {
-            $default_charset = 'utf8mb4';
-            $default_collation = 'utf8mb4_general_ci';
-        } else {
-            $default_charset = 'utf8';
-            $default_collation = 'utf8_general_ci';
-        }
-        if (! empty($GLOBALS['collation_connection'])) {
-            $this->query(
-                "SET CHARACTER SET '$default_charset';",
-                $link,
-                self::QUERY_STORE
-            );
-            /* Automatically adjust collation to mb4 variant */
-            if ($default_charset == 'utf8mb4'
-                && strncmp('utf8_', $GLOBALS['collation_connection'], 5) == 0
-            ) {
-                $GLOBALS['collation_connection'] = 'utf8mb4_' . substr(
-                    $GLOBALS['collation_connection'],
-                    5
-                );
-            }
-            $result = $this->tryQuery(
-                "SET collation_connection = '"
-                . $this->escapeString($GLOBALS['collation_connection'], $link)
-                . "';",
-                $link,
-                self::QUERY_STORE
-            );
-            if ($result === false) {
-                trigger_error(
-                    __('Failed to set configured collation connection!'),
-                    E_USER_WARNING
-                );
-                $this->query(
-                    "SET collation_connection = '"
-                    . $this->escapeString($GLOBALS['collation_connection'], $link)
-                    . "';",
-                    $link,
-                    self::QUERY_STORE
-                );
-            }
-        } else {
-            $this->query(
-                "SET NAMES '$default_charset' COLLATE '$default_collation';",
-                $link,
-                self::QUERY_STORE
-            );
-        }
-
-        /* Locale for messages */
-        $locale = LanguageManager::getInstance()->getCurrentLanguage()->getMySQLLocale();
-        if (! empty($locale)) {
-            $this->query(
-                "SET lc_messages = '" . $locale . "';",
-                $link,
-                self::QUERY_STORE
-            );
-        }
-    }
-
-    /**
-     * returns a single value from the given result or query,
-     * if the query or the result has more than one row or field
-     * the first field of the first row is returned
-     *
-     * <code>
-     * $sql = 'SELECT `name` FROM `user` WHERE `id` = 123';
-     * $user_name = $GLOBALS['dbi']->fetchValue($sql);
-     * // produces
-     * // $user_name = 'John Doe'
-     * </code>
-     *
-     * @param string         $query      The query to execute
-     * @param integer        $row_number row to fetch the value from,
-     *                                   starting at 0, with 0 being default
-     * @param integer|string $field      field to fetch the value from,
-     *                                   starting at 0, with 0 being default
-     * @param object         $link       mysql link
-     *
-     * @return mixed value of first field in first row from result
-     *               or false if not found
-     */
-    public function fetchValue($query, $row_number = 0, $field = 0, $link = null)
-    {
-        $value = false;
-
-        $result = $this->tryQuery(
-            $query,
-            $link,
-            self::QUERY_STORE,
-            false
-        );
-        if ($result === false) {
-            return false;
-        }
-
-        // return false if result is empty or false
-        // or requested row is larger than rows in result
-        if ($this->numRows($result) < ($row_number + 1)) {
-            return $value;
-        }
-
-        // if $field is an integer use non associative mysql fetch function
-        if (is_int($field)) {
-            $fetch_function = 'fetchRow';
-        } else {
-            $fetch_function = 'fetchAssoc';
-        }
-
-        // get requested row
-        for ($i = 0; $i <= $row_number; $i++) {
-            $row = $this->$fetch_function($result);
-        }
-        $this->freeResult($result);
-
-        // return requested field
-        if (isset($row[$field])) {
-            $value = $row[$field];
-        }
-
-        return $value;
-    }
-
-    /**
-     * returns only the first row from the result
-     *
-     * <code>
-     * $sql = 'SELECT * FROM `user` WHERE `id` = 123';
-     * $user = $GLOBALS['dbi']->fetchSingleRow($sql);
-     * // produces
-     * // $user = array('id' => 123, 'name' => 'John Doe')
-     * </code>
-     *
-     * @param string $query The query to execute
-     * @param string $type  NUM|ASSOC|BOTH returned array should either
-     *                      numeric associative or both
-     * @param object $link  mysql link
-     *
-     * @return array|boolean first row from result
-     *                       or false if result is empty
-     */
-    public function fetchSingleRow($query, $type = 'ASSOC', $link = null)
-    {
-        $result = $this->tryQuery(
-            $query,
-            $link,
-            self::QUERY_STORE,
-            false
-        );
-        if ($result === false) {
-            return false;
-        }
-
-        // return false if result is empty or false
-        if (! $this->numRows($result)) {
-            return false;
-        }
-
-        switch ($type) {
-        case 'NUM' :
-            $fetch_function = 'fetchRow';
-            break;
-        case 'ASSOC' :
-            $fetch_function = 'fetchAssoc';
-            break;
-        case 'BOTH' :
-        default :
-            $fetch_function = 'fetchArray';
-            break;
-        }
-
-        $row = $this->$fetch_function($result);
-        $this->freeResult($result);
-        return $row;
-    }
-
-    /**
-     * Returns row or element of a row
-     *
-     * @param array       $row   Row to process
-     * @param string|null $value Which column to return
-     *
-     * @return mixed
-     */
-    private function _fetchValue($row, $value)
-    {
-        if (is_null($value)) {
-            return $row;
-        } else {
-            return $row[$value];
-        }
-    }
-
-    /**
-     * returns all rows in the resultset in one array
-     *
-     * <code>
-     * $sql = 'SELECT * FROM `user`';
-     * $users = $GLOBALS['dbi']->fetchResult($sql);
-     * // produces
-     * // $users[] = array('id' => 123, 'name' => 'John Doe')
-     *
-     * $sql = 'SELECT `id`, `name` FROM `user`';
-     * $users = $GLOBALS['dbi']->fetchResult($sql, 'id');
-     * // produces
-     * // $users['123'] = array('id' => 123, 'name' => 'John Doe')
-     *
-     * $sql = 'SELECT `id`, `name` FROM `user`';
-     * $users = $GLOBALS['dbi']->fetchResult($sql, 0);
-     * // produces
-     * // $users['123'] = array(0 => 123, 1 => 'John Doe')
-     *
-     * $sql = 'SELECT `id`, `name` FROM `user`';
-     * $users = $GLOBALS['dbi']->fetchResult($sql, 'id', 'name');
-     * // or
-     * $users = $GLOBALS['dbi']->fetchResult($sql, 0, 1);
-     * // produces
-     * // $users['123'] = 'John Doe'
-     *
-     * $sql = 'SELECT `name` FROM `user`';
-     * $users = $GLOBALS['dbi']->fetchResult($sql);
-     * // produces
-     * // $users[] = 'John Doe'
-     *
-     * $sql = 'SELECT `group`, `name` FROM `user`'
-     * $users = $GLOBALS['dbi']->fetchResult($sql, array('group', null), 'name');
-     * // produces
-     * // $users['admin'][] = 'John Doe'
-     *
-     * $sql = 'SELECT `group`, `name` FROM `user`'
-     * $users = $GLOBALS['dbi']->fetchResult($sql, array('group', 'name'), 'id');
-     * // produces
-     * // $users['admin']['John Doe'] = '123'
-     * </code>
-     *
-     * @param string               $query   query to execute
-     * @param string|integer|array $key     field-name or offset
-     *                                      used as key for array
-     *                                      or array of those
-     * @param string|integer       $value   value-name or offset
-     *                                      used as value for array
-     * @param object               $link    mysql link
-     * @param integer              $options query options
-     *
-     * @return array resultrows or values indexed by $key
-     */
-    public function fetchResult($query, $key = null, $value = null,
-        $link = null, $options = 0
-    ) {
-        $resultrows = array();
-
-        $result = $this->tryQuery($query, $link, $options, false);
-
-        // return empty array if result is empty or false
-        if ($result === false) {
-            return $resultrows;
-        }
-
-        $fetch_function = 'fetchAssoc';
-
-        // no nested array if only one field is in result
-        if (null === $key && 1 === $this->numFields($result)) {
-            $value = 0;
-            $fetch_function = 'fetchRow';
-        }
-
-        // if $key is an integer use non associative mysql fetch function
-        if (is_int($key)) {
-            $fetch_function = 'fetchRow';
-        }
-
-        if (null === $key) {
-            while ($row = $this->$fetch_function($result)) {
-                $resultrows[] = $this->_fetchValue($row, $value);
-            }
-        } else {
-            if (is_array($key)) {
-                while ($row = $this->$fetch_function($result)) {
-                    $result_target =& $resultrows;
-                    foreach ($key as $key_index) {
-                        if (null === $key_index) {
-                            $result_target =& $result_target[];
-                            continue;
-                        }
-
-                        if (! isset($result_target[$row[$key_index]])) {
-                            $result_target[$row[$key_index]] = array();
-                        }
-                        $result_target =& $result_target[$row[$key_index]];
-                    }
-                    $result_target = $this->_fetchValue($row, $value);
-                }
-            } else {
-                while ($row = $this->$fetch_function($result)) {
-                    $resultrows[$row[$key]] = $this->_fetchValue($row, $value);
-                }
-            }
-        }
-
-        $this->freeResult($result);
-        return $resultrows;
-    }
-
-    /**
-     * Get supported SQL compatibility modes
-     *
-     * @return array supported SQL compatibility modes
-     */
-    public function getCompatibilities()
-    {
-        $compats = array('NONE');
-        $compats[] = 'ANSI';
-        $compats[] = 'DB2';
-        $compats[] = 'MAXDB';
-        $compats[] = 'MYSQL323';
-        $compats[] = 'MYSQL40';
-        $compats[] = 'MSSQL';
-        $compats[] = 'ORACLE';
-        // removed; in MySQL 5.0.33, this produces exports that
-        // can't be read by POSTGRESQL (see our bug #1596328)
-        //$compats[] = 'POSTGRESQL';
-        $compats[] = 'TRADITIONAL';
-
-        return $compats;
-    }
-
-    /**
-     * returns warnings for last query
-     *
-     * @param object $link mysql link resource
-     *
-     * @return array warnings
-     */
-    public function getWarnings($link = null)
-    {
-        $link = $this->getLink($link);
-        if ($link === false) {
-            return false;
-        }
-
-        return $this->fetchResult('SHOW WARNINGS', null, null, $link);
-    }
-
-    /**
-     * returns an array of PROCEDURE or FUNCTION names for a db
-     *
-     * @param string $db    db name
-     * @param string $which PROCEDURE | FUNCTION
-     * @param object $link  mysql link
-     *
-     * @return array the procedure names or function names
-     */
-    public function getProceduresOrFunctions($db, $which, $link = null)
-    {
-        $shows = $this->fetchResult(
-            'SHOW ' . $which . ' STATUS;', null, null, $link
-        );
-        $result = array();
-        foreach ($shows as $one_show) {
-            if ($one_show['Db'] == $db && $one_show['Type'] == $which) {
-                $result[] = $one_show['Name'];
-            }
-        }
-        return($result);
-    }
-
-    /**
-     * returns the definition of a specific PROCEDURE, FUNCTION, EVENT or VIEW
-     *
-     * @param string $db    db name
-     * @param string $which PROCEDURE | FUNCTION | EVENT | VIEW
-     * @param string $name  the procedure|function|event|view name
-     * @param object $link  MySQL link
-     *
-     * @return string the definition
-     */
-    public function getDefinition($db, $which, $name, $link = null)
-    {
-        $returned_field = array(
-            'PROCEDURE' => 'Create Procedure',
-            'FUNCTION'  => 'Create Function',
-            'EVENT'     => 'Create Event',
-            'VIEW'      => 'Create View'
-        );
-        $query = 'SHOW CREATE ' . $which . ' '
-            . Util::backquote($db) . '.'
-            . Util::backquote($name);
-        return($this->fetchValue($query, 0, $returned_field[$which], $link));
-    }
-
-    /**
-     * returns details about the PROCEDUREs or FUNCTIONs for a specific database
-     * or details about a specific routine
-     *
-     * @param string $db    db name
-     * @param string $which PROCEDURE | FUNCTION or null for both
-     * @param string $name  name of the routine (to fetch a specific routine)
-     *
-     * @return array information about ROCEDUREs or FUNCTIONs
-     */
-    public function getRoutines($db, $which = null, $name = '')
-    {
-        $routines = array();
-        if (! $GLOBALS['cfg']['Server']['DisableIS']) {
-            $query = "SELECT"
-                . " `ROUTINE_SCHEMA` AS `Db`,"
-                . " `SPECIFIC_NAME` AS `Name`,"
-                . " `ROUTINE_TYPE` AS `Type`,"
-                . " `DEFINER` AS `Definer`,"
-                . " `LAST_ALTERED` AS `Modified`,"
-                . " `CREATED` AS `Created`,"
-                . " `SECURITY_TYPE` AS `Security_type`,"
-                . " `ROUTINE_COMMENT` AS `Comment`,"
-                . " `CHARACTER_SET_CLIENT` AS `character_set_client`,"
-                . " `COLLATION_CONNECTION` AS `collation_connection`,"
-                . " `DATABASE_COLLATION` AS `Database Collation`,"
-                . " `DTD_IDENTIFIER`"
-                . " FROM `information_schema`.`ROUTINES`"
-                . " WHERE `ROUTINE_SCHEMA` " . Util::getCollateForIS()
-                . " = '" . $GLOBALS['dbi']->escapeString($db) . "'";
-            if (PMA_isValid($which, array('FUNCTION','PROCEDURE'))) {
-                $query .= " AND `ROUTINE_TYPE` = '" . $which . "'";
-            }
-            if (! empty($name)) {
-                $query .= " AND `SPECIFIC_NAME`"
-                    . " = '" . $GLOBALS['dbi']->escapeString($name) . "'";
-            }
-            $result = $this->fetchResult($query);
-            if (!empty($result)) {
-                $routines = $result;
-            }
-        } else {
-            if ($which == 'FUNCTION' || $which == null) {
-                $query = "SHOW FUNCTION STATUS"
-                    . " WHERE `Db` = '" . $GLOBALS['dbi']->escapeString($db) . "'";
-                if (! empty($name)) {
-                    $query .= " AND `Name` = '"
-                        . $GLOBALS['dbi']->escapeString($name) . "'";
-                }
-                $result = $this->fetchResult($query);
-                if (!empty($result)) {
-                    $routines = array_merge($routines, $result);
-                }
-            }
-            if ($which == 'PROCEDURE' || $which == null) {
-                $query = "SHOW PROCEDURE STATUS"
-                    . " WHERE `Db` = '" . $GLOBALS['dbi']->escapeString($db) . "'";
-                if (! empty($name)) {
-                    $query .= " AND `Name` = '"
-                        . $GLOBALS['dbi']->escapeString($name) . "'";
-                }
-                $result = $this->fetchResult($query);
-                if (!empty($result)) {
-                    $routines = array_merge($routines, $result);
-                }
-            }
-        }
-
-        $ret = array();
-        foreach ($routines as $routine) {
-            $one_result = array();
-            $one_result['db'] = $routine['Db'];
-            $one_result['name'] = $routine['Name'];
-            $one_result['type'] = $routine['Type'];
-            $one_result['definer'] = $routine['Definer'];
-            $one_result['returns'] = isset($routine['DTD_IDENTIFIER'])
-                ? $routine['DTD_IDENTIFIER'] : "";
-            $ret[] = $one_result;
-        }
-
-        // Sort results by name
-        $name = array();
-        foreach ($ret as $value) {
-            $name[] = $value['name'];
-        }
-        array_multisort($name, SORT_ASC, $ret);
-
-        return($ret);
-    }
-
-    /**
-     * returns details about the EVENTs for a specific database
-     *
-     * @param string $db   db name
-     * @param string $name event name
-     *
-     * @return array information about EVENTs
-     */
-    public function getEvents($db, $name = '')
-    {
-        if (! $GLOBALS['cfg']['Server']['DisableIS']) {
-            $query = "SELECT"
-                . " `EVENT_SCHEMA` AS `Db`,"
-                . " `EVENT_NAME` AS `Name`,"
-                . " `DEFINER` AS `Definer`,"
-                . " `TIME_ZONE` AS `Time zone`,"
-                . " `EVENT_TYPE` AS `Type`,"
-                . " `EXECUTE_AT` AS `Execute at`,"
-                . " `INTERVAL_VALUE` AS `Interval value`,"
-                . " `INTERVAL_FIELD` AS `Interval field`,"
-                . " `STARTS` AS `Starts`,"
-                . " `ENDS` AS `Ends`,"
-                . " `STATUS` AS `Status`,"
-                . " `ORIGINATOR` AS `Originator`,"
-                . " `CHARACTER_SET_CLIENT` AS `character_set_client`,"
-                . " `COLLATION_CONNECTION` AS `collation_connection`, "
-                . "`DATABASE_COLLATION` AS `Database Collation`"
-                . " FROM `information_schema`.`EVENTS`"
-                . " WHERE `EVENT_SCHEMA` " . Util::getCollateForIS()
-                . " = '" . $GLOBALS['dbi']->escapeString($db) . "'";
-            if (! empty($name)) {
-                $query .= " AND `EVENT_NAME`"
-                    . " = '" . $GLOBALS['dbi']->escapeString($name) . "'";
-            }
-        } else {
-            $query = "SHOW EVENTS FROM " . Util::backquote($db);
-            if (! empty($name)) {
-                $query .= " AND `Name` = '"
-                    . $GLOBALS['dbi']->escapeString($name) . "'";
-            }
-        }
-
-        $result = array();
-        if ($events = $this->fetchResult($query)) {
-            foreach ($events as $event) {
-                $one_result = array();
-                $one_result['name'] = $event['Name'];
-                $one_result['type'] = $event['Type'];
-                $one_result['status'] = $event['Status'];
-                $result[] = $one_result;
-            }
-        }
-
-        // Sort results by name
-        $name = array();
-        foreach ($result as $value) {
-            $name[] = $value['name'];
-        }
-        array_multisort($name, SORT_ASC, $result);
-
-        return $result;
-    }
-
-    /**
-     * returns details about the TRIGGERs for a specific table or database
-     *
-     * @param string $db        db name
-     * @param string $table     table name
-     * @param string $delimiter the delimiter to use (may be empty)
-     *
-     * @return array information about triggers (may be empty)
-     */
-    public function getTriggers($db, $table = '', $delimiter = '//')
-    {
-        $result = array();
-        if (! $GLOBALS['cfg']['Server']['DisableIS']) {
-            $query = 'SELECT TRIGGER_SCHEMA, TRIGGER_NAME, EVENT_MANIPULATION'
-                . ', EVENT_OBJECT_TABLE, ACTION_TIMING, ACTION_STATEMENT'
-                . ', EVENT_OBJECT_SCHEMA, EVENT_OBJECT_TABLE, DEFINER'
-                . ' FROM information_schema.TRIGGERS'
-                . ' WHERE EVENT_OBJECT_SCHEMA ' . Util::getCollateForIS() . '='
-                . ' \'' . $GLOBALS['dbi']->escapeString($db) . '\'';
-
-            if (! empty($table)) {
-                $query .= " AND EVENT_OBJECT_TABLE " . Util::getCollateForIS()
-                    . " = '" . $GLOBALS['dbi']->escapeString($table) . "';";
-            }
-        } else {
-            $query = "SHOW TRIGGERS FROM " . Util::backquote($db);
-            if (! empty($table)) {
-                $query .= " LIKE '" . $GLOBALS['dbi']->escapeString($table) . "';";
-            }
-        }
-
-        if ($triggers = $this->fetchResult($query)) {
-            foreach ($triggers as $trigger) {
-                if ($GLOBALS['cfg']['Server']['DisableIS']) {
-                    $trigger['TRIGGER_NAME'] = $trigger['Trigger'];
-                    $trigger['ACTION_TIMING'] = $trigger['Timing'];
-                    $trigger['EVENT_MANIPULATION'] = $trigger['Event'];
-                    $trigger['EVENT_OBJECT_TABLE'] = $trigger['Table'];
-                    $trigger['ACTION_STATEMENT'] = $trigger['Statement'];
-                    $trigger['DEFINER'] = $trigger['Definer'];
-                }
-                $one_result = array();
-                $one_result['name'] = $trigger['TRIGGER_NAME'];
-                $one_result['table'] = $trigger['EVENT_OBJECT_TABLE'];
-                $one_result['action_timing'] = $trigger['ACTION_TIMING'];
-                $one_result['event_manipulation'] = $trigger['EVENT_MANIPULATION'];
-                $one_result['definition'] = $trigger['ACTION_STATEMENT'];
-                $one_result['definer'] = $trigger['DEFINER'];
-
-                // do not prepend the schema name; this way, importing the
-                // definition into another schema will work
-                $one_result['full_trigger_name'] = Util::backquote(
-                    $trigger['TRIGGER_NAME']
-                );
-                $one_result['drop'] = 'DROP TRIGGER IF EXISTS '
-                    . $one_result['full_trigger_name'];
-                $one_result['create'] = 'CREATE TRIGGER '
-                    . $one_result['full_trigger_name'] . ' '
-                    . $trigger['ACTION_TIMING'] . ' '
-                    . $trigger['EVENT_MANIPULATION']
-                    . ' ON ' . Util::backquote($trigger['EVENT_OBJECT_TABLE'])
-                    . "\n" . ' FOR EACH ROW '
-                    . $trigger['ACTION_STATEMENT'] . "\n" . $delimiter . "\n";
-
-                $result[] = $one_result;
-            }
-        }
-
-        // Sort results by name
-        $name = array();
-        foreach ($result as $value) {
-            $name[] = $value['name'];
-        }
-        array_multisort($name, SORT_ASC, $result);
-
-        return($result);
-    }
-
-    /**
-     * Formats database error message in a friendly way.
-     * This is needed because some errors messages cannot
-     * be obtained by mysql_error().
-     *
-     * @param int    $error_number  Error code
-     * @param string $error_message Error message as returned by server
-     *
-     * @return string HML text with error details
-     */
-    public function formatError($error_number, $error_message)
-    {
-        $error_message = htmlspecialchars($error_message);
-
-        $error = '#' . ((string) $error_number);
-        $separator = ' &mdash; ';
-
-        if ($error_number == 2002) {
-            $error .= ' - ' . $error_message;
-            $error .= $separator;
-            $error .= __(
-                'The server is not responding (or the local server\'s socket'
-                . ' is not correctly configured).'
-            );
-        } elseif ($error_number == 2003) {
-            $error .= ' - ' . $error_message;
-            $error .= $separator . __('The server is not responding.');
-        } elseif ($error_number == 1005) {
-            if (strpos($error_message, 'errno: 13') !== false) {
-                $error .= ' - ' . $error_message;
-                $error .= $separator
-                    . __(
-                        'Please check privileges of directory containing database.'
-                    );
-            } else {
-                /* InnoDB constraints, see
-                 * https://dev.mysql.com/doc/refman/5.0/en/
-                 *  innodb-foreign-key-constraints.html
-                 */
-                $error .= ' - ' . $error_message .
-                    ' (<a href="server_engines.php' .
-                    PMA_URL_getCommon(
-                        array('engine' => 'InnoDB', 'page' => 'Status')
-                    ) . '">' . __('Details…') . '</a>)';
-            }
-        } else {
-            $error .= ' - ' . $error_message;
-        }
-
-        return $error;
-    }
-
-    /**
-     * gets the current user with host
-     *
-     * @return string the current user i.e. user@host
-     */
-    public function getCurrentUser()
-    {
-        if (Util::cacheExists('mysql_cur_user')) {
-            return Util::cacheGet('mysql_cur_user');
-        }
-        $user = $GLOBALS['dbi']->fetchValue('SELECT USER();');
-        if ($user !== false) {
-            Util::cacheSet('mysql_cur_user', $user);
-            return Util::cacheGet('mysql_cur_user');
-        }
-        return '';
-    }
-
-    /**
-     * Checks if current user is superuser
-     *
-     * @return bool Whether user is a superuser
-     */
-    public function isSuperuser()
-    {
-        return self::isUserType('super');
-    }
-
-    /**
-     * Checks if current user has global create user/grant privilege
-     * or is a superuser (i.e. SELECT on mysql.users)
-     * while caching the result in session.
-     *
-     * @param string $type type of user to check for
-     *                     i.e. 'create', 'grant', 'super'
-     *
-     * @return bool Whether user is a given type of user
-     */
-    public function isUserType($type)
-    {
-        if (Util::cacheExists('is_' . $type . 'user')) {
-            return Util::cacheGet('is_' . $type . 'user');
-        }
-
-        // when connection failed we don't have a $userlink
-        if (! isset($GLOBALS['userlink'])) {
-            Util::cacheSet('is_' . $type . 'user', false);
-            return Util::cacheGet('is_' . $type . 'user');
-        }
-
-        if (! $GLOBALS['cfg']['Server']['DisableIS'] || $type === 'super') {
-            // Prepare query for each user type check
-            $query = '';
-            if ($type === 'super') {
-                $query = 'SELECT 1 FROM mysql.user LIMIT 1';
-            } elseif ($type === 'create') {
-                list($user, $host) = $this->_getCurrentUserAndHost();
-                $query = "SELECT 1 FROM `INFORMATION_SCHEMA`.`USER_PRIVILEGES` "
-                    . "WHERE `PRIVILEGE_TYPE` = 'CREATE USER' AND "
-                    . "'''" . $user . "''@''" . $host . "''' LIKE `GRANTEE` LIMIT 1";
-            } elseif ($type === 'grant') {
-                list($user, $host) = $this->_getCurrentUserAndHost();
-                $query = "SELECT 1 FROM ("
-                    . "SELECT `GRANTEE`, `IS_GRANTABLE` FROM "
-                    . "`INFORMATION_SCHEMA`.`COLUMN_PRIVILEGES` UNION "
-                    . "SELECT `GRANTEE`, `IS_GRANTABLE` FROM "
-                    . "`INFORMATION_SCHEMA`.`TABLE_PRIVILEGES` UNION "
-                    . "SELECT `GRANTEE`, `IS_GRANTABLE` FROM "
-                    . "`INFORMATION_SCHEMA`.`SCHEMA_PRIVILEGES` UNION "
-                    . "SELECT `GRANTEE`, `IS_GRANTABLE` FROM "
-                    . "`INFORMATION_SCHEMA`.`USER_PRIVILEGES`) t "
-                    . "WHERE `IS_GRANTABLE` = 'YES' AND "
-                    . "'''" . $user . "''@''" . $host . "''' LIKE `GRANTEE` LIMIT 1";
-            }
-
-            $is = false;
-            $result = $GLOBALS['dbi']->tryQuery(
-                $query,
-                $GLOBALS['userlink'],
-                self::QUERY_STORE
-            );
-            if ($result) {
-                $is = (bool) $GLOBALS['dbi']->numRows($result);
-            }
-            $GLOBALS['dbi']->freeResult($result);
-
-            Util::cacheSet('is_' . $type . 'user', $is);
-        } else {
-            $is = false;
-            $grants = $GLOBALS['dbi']->fetchResult(
-                "SHOW GRANTS FOR CURRENT_USER();",
-                null,
-                null,
-                $GLOBALS['userlink'],
-                self::QUERY_STORE
-            );
-            if ($grants) {
-                foreach ($grants as $grant) {
-                    if ($type === 'create') {
-                        if (strpos($grant, "ALL PRIVILEGES ON *.*") !== false
-                            || strpos($grant, "CREATE USER") !== false
-                        ) {
-                            $is = true;
-                            break;
-                        }
-                    } elseif ($type === 'grant') {
-                        if (strpos($grant, "WITH GRANT OPTION") !== false) {
-                            $is = true;
-                            break;
-                        }
-                    }
-                }
-            }
-
-            Util::cacheSet('is_' . $type . 'user', $is);
-        }
-
-        return Util::cacheGet('is_' . $type . 'user');
-    }
-
-    /**
-     * Get the current user and host
-     *
-     * @return array array of username and hostname
-     */
-    private function _getCurrentUserAndHost()
-    {
-        $user = $GLOBALS['dbi']->fetchValue("SELECT CURRENT_USER();");
-        return explode("@", $user);
-    }
-
-    /**
-     * Get the list of system schemas
-     *
-     * @return array list of system schemas
-     */
-    public function getSystemSchemas()
-    {
-        $schemas = array(
-            'information_schema', 'performance_schema', 'mysql', 'sys'
-        );
-        $systemSchemas = array();
-        foreach ($schemas as $schema) {
-            if ($this->isSystemSchema($schema, true)) {
-                $systemSchemas[] = $schema;
-            }
-        }
-        return $systemSchemas;
-    }
-
-    /**
-     * Checks whether given schema is a system schema
-     *
-     * @param string $schema_name        Name of schema (database) to test
-     * @param bool   $testForMysqlSchema Whether 'mysql' schema should
-     *                                   be treated the same as IS and DD
-     *
-     * @return bool
-     */
-    public function isSystemSchema($schema_name, $testForMysqlSchema = false)
-    {
-        $schema_name = strtolower($schema_name);
-        return $schema_name == 'information_schema'
-            || $schema_name == 'performance_schema'
-            || ($schema_name == 'mysql' && $testForMysqlSchema)
-            || $schema_name == 'sys';
-    }
-
-    /**
-     * connects to the database server
-     *
-     * @param string $user                 user name
-     * @param string $password             user password
-     * @param bool   $is_controluser       whether this is a control user connection
-     * @param array  $server               host/port/socket/persistent
-     * @param bool   $auxiliary_connection (when true, don't go back to login if
-     *                                     connection fails)
-     *
-     * @return mixed false on error or a connection object on success
-     */
-    public function connect(
-        $user, $password, $is_controluser = false, $server = null,
-        $auxiliary_connection = false
-    ) {
-        // Do not show location and backtrace for connection errors
-        $GLOBALS['error_handler']->setHideLocation(true);
-        $result = $this->_extension->connect(
-            $user, $password, $is_controluser, $server, $auxiliary_connection
-        );
-        $GLOBALS['error_handler']->setHideLocation(false);
-
-        if ($result) {
-            if (! $auxiliary_connection && ! $is_controluser) {
-                $GLOBALS['dbi']->postConnect($result);
-            }
-            return $result;
-        }
-
-        if ($is_controluser) {
-            trigger_error(
-                __(
-                    'Connection for controluser as defined in your '
-                    . 'configuration failed.'
-                ),
-                E_USER_WARNING
-            );
-            return false;
-        }
-
-        // Do not go back to main login if connection failed
-        // (currently used only in unit testing)
-        if ($auxiliary_connection) {
-            return false;
-        }
-
-        PMA_logUser($user, 'mysql-denied');
-        $GLOBALS['auth_plugin']->authFails();
-
-        return $result;
-    }
-
-    /**
-     * selects given database
-     *
-     * @param string $dbname database name to select
-     * @param object $link   connection object
-     *
-     * @return boolean
-     */
-    public function selectDb($dbname, $link = null)
-    {
-        $link = $this->getLink($link);
-        if ($link === false) {
-            return false;
-        }
-        return $this->_extension->selectDb($dbname, $link);
-    }
-
-    /**
-     * returns array of rows with associative and numeric keys from $result
-     *
-     * @param object $result result set identifier
-     *
-     * @return array
-     */
-    public function fetchArray($result)
-    {
-        return $this->_extension->fetchArray($result);
-    }
-
-    /**
-     * returns array of rows with associative keys from $result
-     *
-     * @param object $result result set identifier
-     *
-     * @return array
-     */
-    public function fetchAssoc($result)
-    {
-        return $this->_extension->fetchAssoc($result);
-    }
-
-    /**
-     * returns array of rows with numeric keys from $result
-     *
-     * @param object $result result set identifier
-     *
-     * @return array
-     */
-    public function fetchRow($result)
-    {
-        return $this->_extension->fetchRow($result);
-    }
-
-    /**
-     * Adjusts the result pointer to an arbitrary row in the result
-     *
-     * @param object  $result database result
-     * @param integer $offset offset to seek
-     *
-     * @return bool true on success, false on failure
-     */
-    public function dataSeek($result, $offset)
-    {
-        return $this->_extension->dataSeek($result, $offset);
-    }
-
-    /**
-     * Frees memory associated with the result
-     *
-     * @param object $result database result
-     *
-     * @return void
-     */
-    public function freeResult($result)
-    {
-        $this->_extension->freeResult($result);
-    }
-
-    /**
-     * Check if there are any more query results from a multi query
-     *
-     * @param object $link the connection object
-     *
-     * @return bool true or false
-     */
-    public function moreResults($link = null)
-    {
-        $link = $this->getLink($link);
-        if ($link === false) {
-            return false;
-        }
-        return $this->_extension->moreResults($link);
-    }
-
-    /**
-     * Prepare next result from multi_query
-     *
-     * @param object $link the connection object
-     *
-     * @return bool true or false
-     */
-    public function nextResult($link = null)
-    {
-        $link = $this->getLink($link);
-        if ($link === false) {
-            return false;
-        }
-        return $this->_extension->nextResult($link);
-    }
-
-    /**
-     * Store the result returned from multi query
-     *
-     * @param object $link the connection object
-     *
-     * @return mixed false when empty results / result set when not empty
-     */
-    public function storeResult($link = null)
-    {
-        $link = $this->getLink($link);
-        if ($link === false) {
-            return false;
-        }
-        return $this->_extension->storeResult($link);
-    }
-
-    /**
-     * Returns a string representing the type of connection used
-     *
-     * @param object $link mysql link
-     *
-     * @return string type of connection used
-     */
-    public function getHostInfo($link = null)
-    {
-        $link = $this->getLink($link);
-        if ($link === false) {
-            return false;
-        }
-        return $this->_extension->getHostInfo($link);
-    }
-
-    /**
-     * Returns the version of the MySQL protocol used
-     *
-     * @param object $link mysql link
-     *
-     * @return integer version of the MySQL protocol used
-     */
-    public function getProtoInfo($link = null)
-    {
-        $link = $this->getLink($link);
-        if ($link === false) {
-            return false;
-        }
-        return $this->_extension->getProtoInfo($link);
-    }
-
-    /**
-     * returns a string that represents the client library version
-     *
-     * @return string MySQL client library version
-     */
-    public function getClientInfo()
-    {
-        return $this->_extension->getClientInfo();
-    }
-
-    /**
-     * returns last error message or false if no errors occurred
-     *
-     * @param object $link connection link
-     *
-     * @return string|bool $error or false
-     */
-    public function getError($link = null)
-    {
-        $link = $this->getLink($link);
-        return $this->_extension->getError($link);
-    }
-
-    /**
-     * returns the number of rows returned by last query
-     *
-     * @param object $result result set identifier
-     *
-     * @return string|int
-     */
-    public function numRows($result)
-    {
-        return $this->_extension->numRows($result);
-    }
-
-    /**
-     * returns last inserted auto_increment id for given $link
-     * or $GLOBALS['userlink']
-     *
-     * @param object $link the connection object
-     *
-     * @return int|boolean
-     */
-    public function insertId($link = null)
-    {
-        $link = $this->getLink($link);
-        if ($link === false) {
-            return false;
-        }
-        // If the primary key is BIGINT we get an incorrect result
-        // (sometimes negative, sometimes positive)
-        // and in the present function we don't know if the PK is BIGINT
-        // so better play safe and use LAST_INSERT_ID()
-        //
-        // When no controluser is defined, using mysqli_insert_id($link)
-        // does not always return the last insert id due to a mixup with
-        // the tracking mechanism, but this works:
-        return $GLOBALS['dbi']->fetchValue('SELECT LAST_INSERT_ID();', 0, 0, $link);
-    }
-
-    /**
-     * returns the number of rows affected by last query
-     *
-     * @param object $link           the connection object
-     * @param bool   $get_from_cache whether to retrieve from cache
-     *
-     * @return int|boolean
-     */
-    public function affectedRows($link = null, $get_from_cache = true)
-    {
-        $link = $this->getLink($link);
-        if ($link === false) {
-            return false;
-        }
-
-        if ($get_from_cache) {
-            return $GLOBALS['cached_affected_rows'];
-        } else {
-            return $this->_extension->affectedRows($link);
-        }
-    }
-
-    /**
-     * returns metainfo for fields in $result
-     *
-     * @param object $result result set identifier
-     *
-     * @return array meta info for fields in $result
-     */
-    public function getFieldsMeta($result)
-    {
-        return $this->_extension->getFieldsMeta($result);
-    }
-
-    /**
-     * return number of fields in given $result
-     *
-     * @param object $result result set identifier
-     *
-     * @return int field count
-     */
-    public function numFields($result)
-    {
-        return $this->_extension->numFields($result);
-    }
-
-    /**
-     * returns the length of the given field $i in $result
-     *
-     * @param object $result result set identifier
-     * @param int    $i      field
-     *
-     * @return int length of field
-     */
-    public function fieldLen($result, $i)
-    {
-        return $this->_extension->fieldLen($result, $i);
-    }
-
-    /**
-     * returns name of $i. field in $result
-     *
-     * @param object $result result set identifier
-     * @param int    $i      field
-     *
-     * @return string name of $i. field in $result
-     */
-    public function fieldName($result, $i)
-    {
-        return $this->_extension->fieldName($result, $i);
-    }
-
-    /**
-     * returns concatenated string of human readable field flags
-     *
-     * @param object $result result set identifier
-     * @param int    $i      field
-     *
-     * @return string field flags
-     */
-    public function fieldFlags($result, $i)
-    {
-        return $this->_extension->fieldFlags($result, $i);
-    }
-
-    /**
-     * returns properly escaped string for use in MySQL queries
-     *
-     * @param string $str  string to be escaped
-     * @param mixed  $link optional database link to use
-     *
-     * @return string a MySQL escaped string
-     */
-    public function escapeString($str, $link = null)
-    {
-        if ($link === null) {
-            $link = $this->getLink();
-        }
-
-        if ($this->_extension === null) {
-            return $str;
-        }
-
-        return $this->_extension->escapeString($link, $str);
-    }
-
-    /**
-     * Gets server connection port
-     *
-     * @param array|null $server host/port/socket/persistent
-     *
-     * @return int
-     */
-    public function getServerPort($server = null)
-    {
-        if (is_null($server)) {
-            $server = &$GLOBALS['cfg']['Server'];
-        }
-
-        if (empty($server['port'])) {
-            return 0;
-        }
-        return intval($server['port']);
-    }
-
-    /**
-     * Gets server connection socket
-     *
-     * @param array|null $server host/port/socket/persistent
-     *
-     * @return null|string
-     */
-    public function getServerSocket($server = null)
-    {
-        if (is_null($server)) {
-            $server = &$GLOBALS['cfg']['Server'];
-        }
-
-        if (empty($server['socket'])) {
-            return null;
-        } else {
-            return $server['socket'];
-        }
-    }
-
-    /**
-     * Gets correct link object.
-     *
-     * @param object $link optional database link to use
-     *
-     * @return object|boolean
-     */
-    public function getLink($link = null)
-    {
-        if (! is_null($link) && $link !== false) {
-            return $link;
-        }
-
-        if (isset($GLOBALS['userlink']) && !is_null($GLOBALS['userlink'])) {
-            return $GLOBALS['userlink'];
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Checks if this database server is running on Amazon RDS.
-     *
-     * @return boolean
-     */
-    public function isAmazonRds()
-    {
-        if (Util::cacheExists('is_amazon_rds')) {
-            return Util::cacheGet('is_amazon_rds');
-        }
-        $sql = 'SELECT @@basedir';
-        $result = $this->fetchResult($sql);
-        $rds = ($result[0] == '/rdsdbbin/mysql/');
-        Util::cacheSet('is_amazon_rds', $rds);
-
-        return $rds;
-    }
-
-    /**
-     * Gets SQL for killing a process.
-     *
-     * @param int $process Process ID
-     *
-     * @return string
-     */
-    public function getKillQuery($process)
-    {
-        if ($this->isAmazonRds()) {
-            return 'CALL mysql.rds_kill(' . $process . ');';
-        } else {
-            return 'KILL ' . $process . ';';
-        }
-    }
-
-    /**
-     * Get the phpmyadmin database manager
-     *
-     * @return SystemDatabase
-     */
-    public function getSystemDatabase()
-    {
-        return new SystemDatabase($this);
-    }
-
-    /**
-     * Get a table with database name and table name
-     *
-     * @param string $db_name    DB name
-     * @param string $table_name Table name
-     *
-     * @return Table
-     */
-    public function getTable($db_name, $table_name)
-    {
-        return new Table($table_name, $db_name, $this);
-    }
-}
diff --git a/#pma/libraries/DbList.php b/#pma/libraries/DbList.php
deleted file mode 100644
index 330258ac..00000000
--- a/#pma/libraries/DbList.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * holds the DbList class
- *
- * @package PhpMyAdmin
- *
- */
-namespace PMA\libraries;
-
-/**
- * holds the DbList class
- *
- * @package PhpMyAdmin
- *
- * @property object $userlink
- * @property object $controllink
- */
-class DbList
-{
-    /**
-     * Holds database list
-     *
-     * @var ListDatabase
-     */
-    protected $databases = null;
-
-    /**
-     * DBMS user link
-     *
-     * @var object
-     */
-    protected $userlink = null;
-
-    /**
-     * DBMS control link
-     *
-     * @var object
-     */
-    protected $controllink = null;
-
-    /**
-     * magic access to protected/inaccessible members/properties
-     *
-     * @param string $param parameter name
-     *
-     * @return mixed
-     * @see https://php.net/language.oop5.overloading
-     */
-    public function __get($param)
-    {
-        switch ($param) {
-        case 'databases' :
-            return $this->getDatabaseList();
-        case 'userlink' :
-            return $this->userlink;
-        case 'controllink' :
-            return $this->controllink;
-        }
-
-        return null;
-    }
-
-    /**
-     * magic access to protected/inaccessible members/properties
-     *
-     * @param string $param parameter name
-     * @param mixed  $value value to set
-     *
-     * @return void
-     * @see https://php.net/language.oop5.overloading
-     */
-    public function __set($param, $value)
-    {
-        switch ($param) {
-        case 'userlink' :
-            $this->userlink = $value;
-            break;
-        case 'controllink' :
-            $this->controllink = $value;
-            break;
-        }
-    }
-
-    /**
-     * Accessor to PMA::$databases
-     *
-     * @return ListDatabase
-     */
-    public function getDatabaseList()
-    {
-        if (null === $this->databases) {
-            $this->databases = new ListDatabase(
-                $this->userlink
-            );
-        }
-
-        return $this->databases;
-    }
-}
diff --git a/#pma/libraries/DbQbe.php b/#pma/libraries/DbQbe.php
deleted file mode 100644
index 08eb4cc5..00000000
--- a/#pma/libraries/DbQbe.php
+++ /dev/null
@@ -1,1983 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Handles DB QBE search
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries;
-
-/**
- * Class to handle database QBE search
- *
- * @package PhpMyAdmin
- */
-class DbQbe
-{
-    /**
-     * Database name
-     *
-     * @access private
-     * @var string
-     */
-    private $_db;
-    /**
-     * Table Names (selected/non-selected)
-     *
-     * @access private
-     * @var array
-     */
-    private $_criteriaTables;
-    /**
-     * Column Names
-     *
-     * @access private
-     * @var array
-     */
-    private $_columnNames;
-    /**
-     * Number of columns
-     *
-     * @access private
-     * @var integer
-     */
-    private $_criteria_column_count;
-    /**
-     * Number of Rows
-     *
-     * @access private
-     * @var integer
-     */
-    private $_criteria_row_count;
-    /**
-     * Whether to insert a new column
-     *
-     * @access private
-     * @var array
-     */
-    private $_criteriaColumnInsert;
-    /**
-     * Whether to delete a column
-     *
-     * @access private
-     * @var array
-     */
-    private $_criteriaColumnDelete;
-    /**
-     * Whether to insert a new row
-     *
-     * @access private
-     * @var array
-     */
-    private $_criteriaRowInsert;
-    /**
-     * Whether to delete a row
-     *
-     * @access private
-     * @var array
-     */
-    private $_criteriaRowDelete;
-    /**
-     * Already set criteria values
-     *
-     * @access private
-     * @var array
-     */
-    private $_criteria;
-    /**
-     * Previously set criteria values
-     *
-     * @access private
-     * @var array
-     */
-    private $_prev_criteria;
-    /**
-     * AND/OR relation b/w criteria columns
-     *
-     * @access private
-     * @var array
-     */
-    private $_criteriaAndOrColumn;
-    /**
-     * AND/OR relation b/w criteria rows
-     *
-     * @access private
-     * @var array
-     */
-    private $_criteriaAndOrRow;
-    /**
-     * Large width of a column
-     *
-     * @access private
-     * @var string
-     */
-    private $_realwidth;
-    /**
-     * Minimum width of a column
-     *
-     * @access private
-     * @var int
-     */
-    private $_form_column_width;
-    /**
-     * Selected columns in the form
-     *
-     * @access private
-     * @var array
-     */
-    private $_formColumns;
-    /**
-     * Entered aliases in the form
-     *
-     * @access private
-     * @var array
-     */
-    private $_formAliases;
-    /**
-     * Chosen sort options in the form
-     *
-     * @access private
-     * @var array
-     */
-    private $_formSorts;
-    /**
-     * Chosen sort orders in the form
-     *
-     * @access private
-     * @var array
-     */
-    private $_formSortOrders;
-    /**
-     * Show checkboxes in the form
-     *
-     * @access private
-     * @var array
-     */
-    private $_formShows;
-    /**
-     * Entered criteria values in the form
-     *
-     * @access private
-     * @var array
-     */
-    private $_formCriterions;
-    /**
-     * AND/OR column radio buttons in the form
-     *
-     * @access private
-     * @var array
-     */
-    private $_formAndOrCols;
-    /**
-     * AND/OR row radio buttons in the form
-     *
-     * @access private
-     * @var array
-     */
-    private $_formAndOrRows;
-    /**
-     * New column count in case of add/delete
-     *
-     * @access private
-     * @var integer
-     */
-    private $_new_column_count;
-    /**
-     * New row count in case of add/delete
-     *
-     * @access private
-     * @var integer
-     */
-    private $_new_row_count;
-    /**
-     * List of saved searches
-     *
-     * @access private
-     * @var array
-     */
-    private $_savedSearchList = null;
-    /**
-     * Current search
-     *
-     * @access private
-     * @var SavedSearches
-     */
-    private $_currentSearch = null;
-
-    /**
-     * Initialize criterias
-     *
-     * @return static
-     */
-    private function _loadCriterias()
-    {
-        if (null === $this->_currentSearch
-            || null === $this->_currentSearch->getCriterias()
-        ) {
-            return $this;
-        }
-
-        $criterias = $this->_currentSearch->getCriterias();
-        $_REQUEST = $criterias + $_REQUEST;
-
-        return $this;
-    }
-
-    /**
-     * Getter for current search
-     *
-     * @return SavedSearches
-     */
-    private function _getCurrentSearch()
-    {
-        return $this->_currentSearch;
-    }
-
-    /**
-     * Public Constructor
-     *
-     * @param string        $dbname          Database name
-     * @param array         $savedSearchList List of saved searches
-     * @param SavedSearches $currentSearch   Current search id
-     */
-    public function __construct(
-        $dbname, $savedSearchList = array(), $currentSearch = null
-    ) {
-        $this->_db = $dbname;
-        $this->_savedSearchList = $savedSearchList;
-        $this->_currentSearch = $currentSearch;
-        $this->_loadCriterias();
-        // Sets criteria parameters
-        $this->_setSearchParams();
-        $this->_setCriteriaTablesAndColumns();
-    }
-
-    /**
-     * Sets search parameters
-     *
-     * @return void
-     */
-    private function _setSearchParams()
-    {
-        $criteriaColumnCount = $this->_initializeCriteriasCount();
-
-        $this->_criteriaColumnInsert = PMA_ifSetOr(
-            $_REQUEST['criteriaColumnInsert'],
-            null,
-            'array'
-        );
-        $this->_criteriaColumnDelete = PMA_ifSetOr(
-            $_REQUEST['criteriaColumnDelete'],
-            null,
-            'array'
-        );
-
-        $this->_prev_criteria = isset($_REQUEST['prev_criteria'])
-            ? $_REQUEST['prev_criteria']
-            : array();
-        $this->_criteria = isset($_REQUEST['criteria'])
-            ? $_REQUEST['criteria']
-            : array_fill(0, $criteriaColumnCount, '');
-
-        $this->_criteriaRowInsert = isset($_REQUEST['criteriaRowInsert'])
-            ? $_REQUEST['criteriaRowInsert']
-            : array_fill(0, $criteriaColumnCount, '');
-        $this->_criteriaRowDelete = isset($_REQUEST['criteriaRowDelete'])
-            ? $_REQUEST['criteriaRowDelete']
-            : array_fill(0, $criteriaColumnCount, '');
-        $this->_criteriaAndOrRow = isset($_REQUEST['criteriaAndOrRow'])
-            ? $_REQUEST['criteriaAndOrRow']
-            : array_fill(0, $criteriaColumnCount, '');
-        $this->_criteriaAndOrColumn = isset($_REQUEST['criteriaAndOrColumn'])
-            ? $_REQUEST['criteriaAndOrColumn']
-            : array_fill(0, $criteriaColumnCount, '');
-        // sets minimum width
-        $this->_form_column_width = 12;
-        $this->_formColumns = array();
-        $this->_formSorts = array();
-        $this->_formShows = array();
-        $this->_formCriterions = array();
-        $this->_formAndOrRows = array();
-        $this->_formAndOrCols = array();
-    }
-
-    /**
-     * Sets criteria tables and columns
-     *
-     * @return void
-     */
-    private function _setCriteriaTablesAndColumns()
-    {
-        // The tables list sent by a previously submitted form
-        if (PMA_isValid($_REQUEST['TableList'], 'array')) {
-            foreach ($_REQUEST['TableList'] as $each_table) {
-                $this->_criteriaTables[$each_table] = ' selected="selected"';
-            }
-        } // end if
-        $all_tables = $GLOBALS['dbi']->query(
-            'SHOW TABLES FROM ' . Util::backquote($this->_db) . ';',
-            null,
-            DatabaseInterface::QUERY_STORE
-        );
-        $all_tables_count = $GLOBALS['dbi']->numRows($all_tables);
-        if (0 == $all_tables_count) {
-            Message::error(__('No tables found in database.'))->display();
-            exit;
-        }
-        // The tables list gets from MySQL
-        while (list($table) = $GLOBALS['dbi']->fetchRow($all_tables)) {
-            $columns = $GLOBALS['dbi']->getColumns($this->_db, $table);
-
-            if (empty($this->_criteriaTables[$table])
-                && ! empty($_REQUEST['TableList'])
-            ) {
-                $this->_criteriaTables[$table] = '';
-            } else {
-                $this->_criteriaTables[$table] = ' selected="selected"';
-            } //  end if
-
-            // The fields list per selected tables
-            if ($this->_criteriaTables[$table] == ' selected="selected"') {
-                $each_table = Util::backquote($table);
-                $this->_columnNames[]  = $each_table . '.*';
-                foreach ($columns as $each_column) {
-                    $each_column = $each_table . '.'
-                        . Util::backquote($each_column['Field']);
-                    $this->_columnNames[] = $each_column;
-                    // increase the width if necessary
-                    $this->_form_column_width = max(
-                        mb_strlen($each_column),
-                        $this->_form_column_width
-                    );
-                } // end foreach
-            } // end if
-        } // end while
-        $GLOBALS['dbi']->freeResult($all_tables);
-
-        // sets the largest width found
-        $this->_realwidth = $this->_form_column_width . 'ex';
-    }
-    /**
-     * Provides select options list containing column names
-     *
-     * @param integer $column_number Column Number (0,1,2) or more
-     * @param string  $selected      Selected criteria column name
-     *
-     * @return string HTML for select options
-     */
-    private function _showColumnSelectCell($column_number, $selected = '')
-    {
-        $html_output = '';
-        $html_output .= '<td class="center">';
-        $html_output .= '<select name="criteriaColumn[' . $column_number
-            . ']" size="1">';
-        $html_output .= '<option value="">&nbsp;</option>';
-        foreach ($this->_columnNames as $column) {
-            $html_output .= '<option value="' . htmlspecialchars($column) . '"'
-                . (($column === $selected) ? ' selected="selected"' : '') . '>'
-                . str_replace(' ', '&nbsp;', htmlspecialchars($column))
-                . '</option>';
-        }
-        $html_output .= '</select>';
-        $html_output .= '</td>';
-        return $html_output;
-    }
-
-    /**
-     * Provides select options list containing sort options (ASC/DESC)
-     *
-     * @param integer $column_number Column Number (0,1,2) or more
-     * @param string  $asc_selected  Selected criteria 'Ascending'
-     * @param string  $desc_selected Selected criteria 'Descending'
-     *
-     * @return string HTML for select options
-     */
-    private function _getSortSelectCell($column_number, $asc_selected = '',
-        $desc_selected = ''
-    ) {
-        $html_output = '<td class="center">';
-        $html_output .= '<select style="width: ' . $this->_realwidth
-            . '" name="criteriaSort[' . $column_number . ']" size="1">';
-        $html_output .= '<option value="">&nbsp;</option>';
-        $html_output .= '<option value="ASC"' . $asc_selected . '>'
-            . __('Ascending')
-            . '</option>';
-        $html_output .= '<option value="DESC"' . $desc_selected . '>'
-            . __('Descending')
-            . '</option>';
-        $html_output .= '</select>';
-        $html_output .= '</td>';
-        return $html_output;
-    }
-
-    /**
-     * Provides select options list containing sort order
-     *
-     * @param integer $columnNumber Column Number (0,1,2) or more
-     * @param integer $sortOrder    Sort order
-     *
-     * @return string HTML for select options
-     */
-    private function _getSortOrderSelectCell($columnNumber, $sortOrder)
-    {
-        $totalColumnCount = $this->_getNewColumnCount();
-        $html_output  = '<td class="center">';
-        $html_output .= '<select name="criteriaSortOrder[' . $columnNumber . ']">';
-        $html_output .= '<option value="1000">'
-            . '&nbsp;</option>';
-        for ($a = 1; $a <= $totalColumnCount; $a++) {
-            $html_output .= '<option value="' . $a . '"';
-            if ($a == $sortOrder) {
-                $html_output .= ' selected="selected"';
-            }
-            $html_output .= '>' . $a . '</option>';
-        }
-        $html_output .= '</select>';
-        $html_output .= '</td>';
-        return $html_output;
-    }
-
-    /**
-     * Returns the new column count after adding and removing columns as instructed
-     *
-     * @return int new column count
-     */
-    private function _getNewColumnCount()
-    {
-        $totalColumnCount = $this->_criteria_column_count;
-        if (! empty($this->_criteriaColumnInsert)) {
-            $totalColumnCount += count($this->_criteriaColumnInsert);
-        }
-        if (! empty($this->_criteriaColumnDelete)) {
-            $totalColumnCount -= count($this->_criteriaColumnDelete);
-        }
-        return $totalColumnCount;
-    }
-
-    /**
-     * Provides search form's row containing column select options
-     *
-     * @return string HTML for search table's row
-     */
-    private function _getColumnNamesRow()
-    {
-        $html_output = '<tr class="odd noclick">';
-        $html_output .= '<th>' . __('Column:') . '</th>';
-        $new_column_count = 0;
-        for (
-            $column_index = 0;
-            $column_index < $this->_criteria_column_count;
-            $column_index++
-        ) {
-            if (isset($this->_criteriaColumnInsert[$column_index])
-                && $this->_criteriaColumnInsert[$column_index] == 'on'
-            ) {
-                $html_output .= $this->_showColumnSelectCell(
-                    $new_column_count
-                );
-                $new_column_count++;
-            }
-            if (! empty($this->_criteriaColumnDelete)
-                && isset($this->_criteriaColumnDelete[$column_index])
-                && $this->_criteriaColumnDelete[$column_index] == 'on'
-            ) {
-                continue;
-            }
-            $selected = '';
-            if (isset($_REQUEST['criteriaColumn'][$column_index])) {
-                $selected = $_REQUEST['criteriaColumn'][$column_index];
-                $this->_formColumns[$new_column_count]
-                    = $_REQUEST['criteriaColumn'][$column_index];
-            }
-            $html_output .= $this->_showColumnSelectCell(
-                $new_column_count,
-                $selected
-            );
-            $new_column_count++;
-        } // end for
-        $this->_new_column_count = $new_column_count;
-        $html_output .= '</tr>';
-        return $html_output;
-    }
-
-    /**
-     * Provides search form's row containing column aliases
-     *
-     * @return string HTML for search table's row
-     */
-    private function _getColumnAliasRow()
-    {
-        $html_output = '<tr class="even noclick">';
-        $html_output .= '<th>' . __('Alias:') . '</th>';
-        $new_column_count = 0;
-
-        for (
-        $colInd = 0;
-        $colInd < $this->_criteria_column_count;
-        $colInd++
-        ) {
-            if (! empty($this->_criteriaColumnInsert)
-                && isset($this->_criteriaColumnInsert[$colInd])
-                && $this->_criteriaColumnInsert[$colInd] == 'on'
-            ) {
-                $html_output .= '<td class="center">';
-                $html_output .= '<input type="text"'
-                    . ' name="criteriaAlias[' . $new_column_count . ']"'
-                    . ' value="" />';
-                $html_output .= '</td>';
-                $new_column_count++;
-            } // end if
-
-            if (! empty($this->_criteriaColumnDelete)
-                && isset($this->_criteriaColumnDelete[$colInd])
-                && $this->_criteriaColumnDelete[$colInd] == 'on'
-            ) {
-                continue;
-            }
-
-            $tmp_alias = '';
-            if (! empty($_REQUEST['criteriaAlias'][$colInd])) {
-                $tmp_alias
-                    = $this->_formAliases[$new_column_count]
-                        = $_REQUEST['criteriaAlias'][$colInd];
-            }// end if
-
-            $html_output .= '<td class="center">';
-            $html_output .= '<input type="text"'
-                . ' name="criteriaAlias[' . $new_column_count . ']"'
-                . ' value="' . htmlspecialchars($tmp_alias) . '" />';
-            $html_output .= '</td>';
-            $new_column_count++;
-        } // end for
-        $html_output .= '</tr>';
-        return $html_output;
-    }
-
-    /**
-     * Provides search form's row containing sort(ASC/DESC) select options
-     *
-     * @return string HTML for search table's row
-     */
-    private function _getSortRow()
-    {
-        $html_output = '<tr class="even noclick">';
-        $html_output .= '<th>' . __('Sort:') . '</th>';
-        $new_column_count = 0;
-
-        for (
-            $colInd = 0;
-            $colInd < $this->_criteria_column_count;
-            $colInd++
-        ) {
-            if (! empty($this->_criteriaColumnInsert)
-                && isset($this->_criteriaColumnInsert[$colInd])
-                && $this->_criteriaColumnInsert[$colInd] == 'on'
-            ) {
-                $html_output .= $this->_getSortSelectCell($new_column_count);
-                $new_column_count++;
-            } // end if
-
-            if (! empty($this->_criteriaColumnDelete)
-                && isset($this->_criteriaColumnDelete[$colInd])
-                && $this->_criteriaColumnDelete[$colInd] == 'on'
-            ) {
-                continue;
-            }
-            // If they have chosen all fields using the * selector,
-            // then sorting is not available, Fix for Bug #570698
-            if (isset($_REQUEST['criteriaSort'][$colInd])
-                && isset($_REQUEST['criteriaColumn'][$colInd])
-                && mb_substr($_REQUEST['criteriaColumn'][$colInd], -2) == '.*'
-            ) {
-                $_REQUEST['criteriaSort'][$colInd] = '';
-            } //end if
-
-            $asc_selected = ''; $desc_selected = '';
-            if (isset($_REQUEST['criteriaSort'][$colInd])) {
-                $this->_formSorts[$new_column_count]
-                    = $_REQUEST['criteriaSort'][$colInd];
-                // Set asc_selected
-                if ($_REQUEST['criteriaSort'][$colInd] == 'ASC') {
-                    $asc_selected = ' selected="selected"';
-                } // end if
-                // Set desc selected
-                if ($_REQUEST['criteriaSort'][$colInd] == 'DESC') {
-                    $desc_selected = ' selected="selected"';
-                } // end if
-            } else {
-                $this->_formSorts[$new_column_count] = '';
-            }
-
-            $html_output .= $this->_getSortSelectCell(
-                $new_column_count, $asc_selected, $desc_selected
-            );
-            $new_column_count++;
-        } // end for
-        $html_output .= '</tr>';
-        return $html_output;
-    }
-
-    /**
-     * Provides search form's row containing sort order
-     *
-     * @return string HTML for search table's row
-     */
-    private function _getSortOrder()
-    {
-        $html_output = '<tr class="even noclick">';
-        $html_output .= '<th>' . __('Sort order:') . '</th>';
-        $new_column_count = 0;
-
-        for (
-        $colInd = 0;
-        $colInd < $this->_criteria_column_count;
-        $colInd++
-        ) {
-            if (! empty($this->_criteriaColumnInsert)
-                && isset($this->_criteriaColumnInsert[$colInd])
-                && $this->_criteriaColumnInsert[$colInd] == 'on'
-            ) {
-                $html_output .= $this->_getSortOrderSelectCell(
-                    $new_column_count, null
-                );
-                $new_column_count++;
-            } // end if
-
-            if (! empty($this->_criteriaColumnDelete)
-                && isset($this->_criteriaColumnDelete[$colInd])
-                && $this->_criteriaColumnDelete[$colInd] == 'on'
-            ) {
-                continue;
-            }
-
-            $sortOrder = null;
-            if (! empty($_REQUEST['criteriaSortOrder'][$colInd])) {
-                $sortOrder
-                    = $this->_formSortOrders[$new_column_count]
-                        = $_REQUEST['criteriaSortOrder'][$colInd];
-            }
-
-            $html_output .= $this->_getSortOrderSelectCell(
-                $new_column_count, $sortOrder
-            );
-            $new_column_count++;
-        } // end for
-        $html_output .= '</tr>';
-        return $html_output;
-    }
-
-    /**
-     * Provides search form's row containing SHOW checkboxes
-     *
-     * @return string HTML for search table's row
-     */
-    private function _getShowRow()
-    {
-        $html_output = '<tr class="odd noclick">';
-        $html_output .= '<th>' . __('Show:') . '</th>';
-        $new_column_count = 0;
-        for (
-            $column_index = 0;
-            $column_index < $this->_criteria_column_count;
-            $column_index++
-        ) {
-            if (! empty($this->_criteriaColumnInsert)
-                && isset($this->_criteriaColumnInsert[$column_index])
-                && $this->_criteriaColumnInsert[$column_index] == 'on'
-            ) {
-                $html_output .= '<td class="center">';
-                $html_output .= '<input type="checkbox"'
-                    . ' name="criteriaShow[' . $new_column_count . ']" />';
-                $html_output .= '</td>';
-                $new_column_count++;
-            } // end if
-            if (! empty($this->_criteriaColumnDelete)
-                && isset($this->_criteriaColumnDelete[$column_index])
-                && $this->_criteriaColumnDelete[$column_index] == 'on'
-            ) {
-                continue;
-            }
-            if (isset($_REQUEST['criteriaShow'][$column_index])) {
-                $checked_options = ' checked="checked"';
-                $this->_formShows[$new_column_count]
-                    = $_REQUEST['criteriaShow'][$column_index];
-            } else {
-                $checked_options = '';
-            }
-            $html_output .= '<td class="center">';
-            $html_output .= '<input type="checkbox"'
-                . ' name="criteriaShow[' . $new_column_count . ']"'
-                . $checked_options . ' />';
-            $html_output .= '</td>';
-            $new_column_count++;
-        } // end for
-        $html_output .= '</tr>';
-        return $html_output;
-    }
-
-    /**
-     * Provides search form's row containing criteria Inputboxes
-     *
-     * @return string HTML for search table's row
-     */
-    private function _getCriteriaInputboxRow()
-    {
-        $html_output = '<tr class="even noclick">';
-        $html_output .= '<th>' . __('Criteria:') . '</th>';
-        $new_column_count = 0;
-        for (
-            $column_index = 0;
-            $column_index < $this->_criteria_column_count;
-            $column_index++
-        ) {
-            if (! empty($this->_criteriaColumnInsert)
-                && isset($this->_criteriaColumnInsert[$column_index])
-                && $this->_criteriaColumnInsert[$column_index] == 'on'
-            ) {
-                $html_output .= '<td class="center">';
-                $html_output .= '<input type="text"'
-                    . ' name="criteria[' . $new_column_count . ']"'
-                    . ' value=""'
-                    . ' class="textfield"'
-                    . ' style="width: ' . $this->_realwidth . '"'
-                    . ' size="20" />';
-                $html_output .= '</td>';
-                $new_column_count++;
-            } // end if
-            if (! empty($this->_criteriaColumnDelete)
-                && isset($this->_criteriaColumnDelete[$column_index])
-                && $this->_criteriaColumnDelete[$column_index] == 'on'
-            ) {
-                continue;
-            }
-            if (isset($this->_criteria[$column_index])) {
-                $tmp_criteria = $this->_criteria[$column_index];
-            }
-            if ((empty($this->_prev_criteria)
-                || ! isset($this->_prev_criteria[$column_index]))
-                || $this->_prev_criteria[$column_index] != htmlspecialchars($tmp_criteria)
-            ) {
-                $this->_formCriterions[$new_column_count] = $tmp_criteria;
-            } else {
-                $this->_formCriterions[$new_column_count]
-                    = $this->_prev_criteria[$column_index];
-            }
-            $html_output .= '<td class="center">';
-            $html_output .= '<input type="hidden"'
-                . ' name="prev_criteria[' . $new_column_count . ']"'
-                . ' value="'
-                . htmlspecialchars($this->_formCriterions[$new_column_count])
-                . '" />';
-            $html_output .= '<input type="text"'
-                . ' name="criteria[' . $new_column_count . ']"'
-                . ' value="' . htmlspecialchars($tmp_criteria) . '"'
-                . ' class="textfield"'
-                . ' style="width: ' . $this->_realwidth . '"'
-                . ' size="20" />';
-            $html_output .= '</td>';
-            $new_column_count++;
-        } // end for
-        $html_output .= '</tr>';
-        return $html_output;
-    }
-
-    /**
-     * Provides footer options for adding/deleting row/columns
-     *
-     * @param string $type Whether row or column
-     *
-     * @return string HTML for footer options
-     */
-    private function _getFootersOptions($type)
-    {
-        $html_output = '<div class="floatleft">';
-        $html_output .= (($type == 'row')
-            ? __('Add/Delete criteria rows') : __('Add/Delete columns'));
-        $html_output .= ':<select size="1" name="'
-            . (($type == 'row') ? 'criteriaRowAdd' : 'criteriaColumnAdd') . '">';
-        $html_output .= '<option value="-3">-3</option>';
-        $html_output .= '<option value="-2">-2</option>';
-        $html_output .= '<option value="-1">-1</option>';
-        $html_output .= '<option value="0" selected="selected">0</option>';
-        $html_output .= '<option value="1">1</option>';
-        $html_output .= '<option value="2">2</option>';
-        $html_output .= '<option value="3">3</option>';
-        $html_output .= '</select>';
-        $html_output .= '</div>';
-        return $html_output;
-    }
-
-    /**
-     * Provides search form table's footer options
-     *
-     * @return string HTML for table footer
-     */
-    private function _getTableFooters()
-    {
-        $html_output = '<fieldset class="tblFooters">';
-        $html_output .= $this->_getFootersOptions("row");
-        $html_output .= $this->_getFootersOptions("column");
-        $html_output .= '<div class="floatleft">';
-        $html_output .= '<input type="submit" name="modify"'
-            . 'value="' . __('Update Query') . '" />';
-        $html_output .= '</div>';
-        $html_output .= '</fieldset>';
-        return $html_output;
-    }
-
-    /**
-     * Provides a select list of database tables
-     *
-     * @return string HTML for table select list
-     */
-    private function _getTablesList()
-    {
-        $html_output = '<div class="floatleft">';
-        $html_output .= '<fieldset>';
-        $html_output .= '<legend>' . __('Use Tables') . '</legend>';
-        // Build the options list for each table name
-        $options = '';
-        $numTableListOptions = 0;
-        foreach ($this->_criteriaTables as $key => $val) {
-            $options .= '<option value="' . htmlspecialchars($key) . '"' . $val . '>'
-                . (str_replace(' ', '&nbsp;', htmlspecialchars($key))) . '</option>';
-            $numTableListOptions++;
-        }
-        $html_output .= '<select name="TableList[]"'
-            . ' multiple="multiple" id="listTable"'
-            . ' size="' . (($numTableListOptions > 30) ? '15' : '7') . '">';
-        $html_output .= $options;
-        $html_output .= '</select>';
-        $html_output .= '</fieldset>';
-        $html_output .= '<fieldset class="tblFooters">';
-        $html_output .= '<input type="submit" name="modify" value="'
-            . __('Update Query') . '" />';
-        $html_output .= '</fieldset>';
-        $html_output .= '</div>';
-        return $html_output;
-    }
-
-    /**
-     * Provides And/Or modification cell along with Insert/Delete options
-     * (For modifying search form's table columns)
-     *
-     * @param integer $column_number Column Number (0,1,2) or more
-     * @param array   $selected      Selected criteria column name
-     * @param bool    $last_column   Whether this is the last column
-     *
-     * @return string HTML for modification cell
-     */
-    private function _getAndOrColCell(
-        $column_number, $selected = null, $last_column = false
-    ) {
-        $html_output = '<td class="center">';
-        if (! $last_column) {
-            $html_output .= '<strong>' . __('Or:') . '</strong>';
-            $html_output .= '<input type="radio"'
-                . ' name="criteriaAndOrColumn[' . $column_number . ']"'
-                . ' value="or"' . $selected['or'] . ' />';
-            $html_output .= '&nbsp;&nbsp;<strong>' . __('And:') . '</strong>';
-            $html_output .= '<input type="radio"'
-                . ' name="criteriaAndOrColumn[' . $column_number . ']"'
-                . ' value="and"' . $selected['and'] . ' />';
-        }
-        $html_output .= '<br />' . __('Ins');
-        $html_output .= '<input type="checkbox"'
-            . ' name="criteriaColumnInsert[' . $column_number . ']" />';
-        $html_output .= '&nbsp;&nbsp;' . __('Del');
-        $html_output .= '<input type="checkbox"'
-            . ' name="criteriaColumnDelete[' . $column_number . ']" />';
-        $html_output .= '</td>';
-        return $html_output;
-    }
-
-    /**
-     * Provides search form's row containing column modifications options
-     * (For modifying search form's table columns)
-     *
-     * @return string HTML for search table's row
-     */
-    private function _getModifyColumnsRow()
-    {
-        $html_output = '<tr class="even noclick">';
-        $html_output .= '<th>' . __('Modify:') . '</th>';
-        $new_column_count = 0;
-        for (
-        $column_index = 0;
-        $column_index < $this->_criteria_column_count;
-        $column_index++
-        ) {
-            if (! empty($this->_criteriaColumnInsert)
-                && isset($this->_criteriaColumnInsert[$column_index])
-                && $this->_criteriaColumnInsert[$column_index] == 'on'
-            ) {
-                $html_output .= $this->_getAndOrColCell($new_column_count);
-                $new_column_count++;
-            } // end if
-
-            if (! empty($this->_criteriaColumnDelete)
-                && isset($this->_criteriaColumnDelete[$column_index])
-                && $this->_criteriaColumnDelete[$column_index] == 'on'
-            ) {
-                continue;
-            }
-
-            if (isset($this->_criteriaAndOrColumn[$column_index])) {
-                $this->_formAndOrCols[$new_column_count]
-                    = $this->_criteriaAndOrColumn[$column_index];
-            }
-            $checked_options = array();
-            if (isset($this->_criteriaAndOrColumn[$column_index])
-                && $this->_criteriaAndOrColumn[$column_index] == 'or'
-            ) {
-                $checked_options['or']  = ' checked="checked"';
-                $checked_options['and'] = '';
-            } else {
-                $checked_options['and'] = ' checked="checked"';
-                $checked_options['or']  = '';
-            }
-            $html_output .= $this->_getAndOrColCell(
-                $new_column_count,
-                $checked_options,
-                ($column_index + 1 == $this->_criteria_column_count)
-            );
-            $new_column_count++;
-        } // end for
-        $html_output .= '</tr>';
-        return $html_output;
-    }
-
-    /**
-     * Provides Insert/Delete options for criteria inputbox
-     * with AND/OR relationship modification options
-     *
-     * @param integer $row_index       Number of criteria row
-     * @param array   $checked_options If checked
-     *
-     * @return string HTML
-     */
-    private function _getInsDelAndOrCell($row_index, $checked_options)
-    {
-        $html_output = '<td class="' . $GLOBALS['cell_align_right'] . ' nowrap">';
-        $html_output .= '<!-- Row controls -->';
-        $html_output .= '<table class="nospacing nopadding">';
-        $html_output .= '<tr>';
-        $html_output .= '<td class="' . $GLOBALS['cell_align_right'] . ' nowrap">';
-        $html_output .= '<small>' . __('Ins:') . '</small>';
-        $html_output .= '<input type="checkbox"'
-            . ' name="criteriaRowInsert[' . $row_index . ']" />';
-        $html_output .= '</td>';
-        $html_output .= '<td class="' . $GLOBALS['cell_align_right'] . '">';
-        $html_output .= '<strong>' . __('And:') . '</strong>';
-        $html_output .= '</td>';
-        $html_output .= '<td>';
-        $html_output .= '<input type="radio"'
-            . ' name="criteriaAndOrRow[' . $row_index . ']" value="and"'
-            . $checked_options['and'] . ' />';
-        $html_output .= '</td>';
-        $html_output .= '</tr>';
-        $html_output .= '<tr>';
-        $html_output .= '<td class="' . $GLOBALS['cell_align_right'] . ' nowrap">';
-        $html_output .= '<small>' . __('Del:') . '</small>';
-        $html_output .= '<input type="checkbox"'
-            . ' name="criteriaRowDelete[' . $row_index . ']" />';
-        $html_output .= '</td>';
-        $html_output .= '<td class="' . $GLOBALS['cell_align_right'] . '">';
-        $html_output .= '<strong>' . __('Or:') . '</strong>';
-        $html_output .= '</td>';
-        $html_output .= '<td>';
-        $html_output .= '<input type="radio"'
-            . ' name="criteriaAndOrRow[' . $row_index . ']"'
-            . ' value="or"' . $checked_options['or'] . ' />';
-        $html_output .= '</td>';
-        $html_output .= '</tr>';
-        $html_output .= '</table>';
-        $html_output .= '</td>';
-        return $html_output;
-    }
-
-    /**
-     * Provides rows for criteria inputbox Insert/Delete options
-     * with AND/OR relationship modification options
-     *
-     * @param integer $new_row_index New row index if rows are added/deleted
-     *
-     * @return string HTML table rows
-     */
-    private function _getInputboxRow($new_row_index)
-    {
-        $html_output = '';
-        $new_column_count = 0;
-        for (
-            $column_index = 0;
-            $column_index < $this->_criteria_column_count;
-            $column_index++
-        ) {
-            if (!empty($this->_criteriaColumnInsert)
-                && isset($this->_criteriaColumnInsert[$column_index])
-                && $this->_criteriaColumnInsert[$column_index] == 'on'
-            ) {
-                $orFieldName = 'Or' . $new_row_index . '[' . $new_column_count . ']';
-                $html_output .= '<td class="center">';
-                $html_output .= '<input type="text"'
-                    . ' name="Or' . $orFieldName . '" class="textfield"'
-                    . ' style="width: ' . $this->_realwidth . '" size="20" />';
-                $html_output .= '</td>';
-                $new_column_count++;
-            } // end if
-            if (!empty($this->_criteriaColumnDelete)
-                && isset($this->_criteriaColumnDelete[$column_index])
-                && $this->_criteriaColumnDelete[$column_index] == 'on'
-            ) {
-                continue;
-            }
-            $or = 'Or' . $new_row_index;
-            if (! empty($_REQUEST[$or]) && isset($_REQUEST[$or][$column_index])) {
-                $tmp_or = $_REQUEST[$or][$column_index];
-            } else {
-                $tmp_or     = '';
-            }
-            $html_output .= '<td class="center">';
-            $html_output .= '<input type="text"'
-                . ' name="Or' . $new_row_index . '[' . $new_column_count . ']' . '"'
-                . ' value="' . htmlspecialchars($tmp_or) . '" class="textfield"'
-                . ' style="width: ' . $this->_realwidth . '" size="20" />';
-            $html_output .= '</td>';
-            if (!empty(${$or}) && isset(${$or}[$column_index])) {
-                $GLOBALS[${'cur' . $or}][$new_column_count]
-                    = ${$or}[$column_index];
-            }
-            $new_column_count++;
-        } // end for
-        return $html_output;
-    }
-
-    /**
-     * Provides rows for criteria inputbox Insert/Delete options
-     * with AND/OR relationship modification options
-     *
-     * @return string HTML table rows
-     */
-    private function _getInsDelAndOrCriteriaRows()
-    {
-        $html_output = '';
-        $new_row_count = 0;
-        $odd_row = true;
-        $checked_options = array();
-        for (
-        $row_index = 0;
-        $row_index <= $this->_criteria_row_count;
-        $row_index++
-        ) {
-            if (isset($this->_criteriaRowInsert[$row_index])
-                && $this->_criteriaRowInsert[$row_index] == 'on'
-            ) {
-                $checked_options['or']  = ' checked="checked"';
-                $checked_options['and'] = '';
-                $html_output .= '<tr class="' . ($odd_row ? 'odd' : 'even')
-                    . ' noclick">';
-                $html_output .= $this->_getInsDelAndOrCell(
-                    $new_row_count, $checked_options
-                );
-                $html_output .= $this->_getInputboxRow(
-                    $new_row_count
-                );
-                $new_row_count++;
-                $html_output .= '</tr>';
-                $odd_row =! $odd_row;
-            } // end if
-            if (isset($this->_criteriaRowDelete[$row_index])
-                && $this->_criteriaRowDelete[$row_index] == 'on'
-            ) {
-                continue;
-            }
-            if (isset($this->_criteriaAndOrRow[$row_index])) {
-                $this->_formAndOrRows[$new_row_count]
-                    = $this->_criteriaAndOrRow[$row_index];
-            }
-            if (isset($this->_criteriaAndOrRow[$row_index])
-                && $this->_criteriaAndOrRow[$row_index] == 'and'
-            ) {
-                $checked_options['and'] =  ' checked="checked"';
-                $checked_options['or']  =  '';
-            } else {
-                $checked_options['or']  =  ' checked="checked"';
-                $checked_options['and'] =  '';
-            }
-            $html_output .= '<tr class="' . ($odd_row ? 'odd' : 'even')
-                . ' noclick">';
-            $html_output .= $this->_getInsDelAndOrCell(
-                $new_row_count, $checked_options
-            );
-            $html_output .= $this->_getInputboxRow(
-                $new_row_count
-            );
-            $new_row_count++;
-            $html_output .= '</tr>';
-            $odd_row =! $odd_row;
-        } // end for
-        $this->_new_row_count = $new_row_count;
-        return $html_output;
-    }
-
-    /**
-     * Provides SELECT clause for building SQL query
-     *
-     * @return string Select clause
-     */
-    private function _getSelectClause()
-    {
-        $select_clause = '';
-        $select_clauses = array();
-        for (
-            $column_index = 0;
-            $column_index < $this->_criteria_column_count;
-            $column_index++
-        ) {
-            if (! empty($this->_formColumns[$column_index])
-                && isset($this->_formShows[$column_index])
-                && $this->_formShows[$column_index] == 'on'
-            ) {
-                $select = $this->_formColumns[$column_index];
-                if (! empty($this->_formAliases[$column_index])) {
-                    $select .= " AS "
-                        . Util::backquote($this->_formAliases[$column_index]);
-                }
-                $select_clauses[] = $select;
-            }
-        } // end for
-        if (!empty($select_clauses)) {
-            $select_clause = 'SELECT '
-                . htmlspecialchars(implode(", ", $select_clauses)) . "\n";
-        }
-        return $select_clause;
-    }
-
-    /**
-     * Provides WHERE clause for building SQL query
-     *
-     * @return string Where clause
-     */
-    private function _getWhereClause()
-    {
-        $where_clause = '';
-        $criteria_cnt = 0;
-        for (
-        $column_index = 0;
-        $column_index < $this->_criteria_column_count;
-        $column_index++
-        ) {
-            if (! empty($this->_formColumns[$column_index])
-                && ! empty($this->_formCriterions[$column_index])
-                && $column_index
-                && isset($last_where)
-                && isset($this->_formAndOrCols)
-            ) {
-                $where_clause .= ' '
-                    . mb_strtoupper($this->_formAndOrCols[$last_where])
-                    . ' ';
-            }
-            if (! empty($this->_formColumns[$column_index])
-                && ! empty($this->_formCriterions[$column_index])
-            ) {
-                $where_clause .= '(' . $this->_formColumns[$column_index] . ' '
-                    . $this->_formCriterions[$column_index] . ')';
-                $last_where = $column_index;
-                $criteria_cnt++;
-            }
-        } // end for
-        if ($criteria_cnt > 1) {
-            $where_clause = '(' . $where_clause . ')';
-        }
-        // OR rows ${'cur' . $or}[$column_index]
-        if (! isset($this->_formAndOrRows)) {
-            $this->_formAndOrRows = array();
-        }
-        for (
-        $row_index = 0;
-        $row_index <= $this->_criteria_row_count;
-        $row_index++
-        ) {
-            $criteria_cnt = 0;
-            $qry_orwhere = '';
-            $last_orwhere = '';
-            for (
-            $column_index = 0;
-            $column_index < $this->_criteria_column_count;
-            $column_index++
-            ) {
-                if (! empty($this->_formColumns[$column_index])
-                    && ! empty($_REQUEST['Or' . $row_index][$column_index])
-                    && $column_index
-                ) {
-                    $qry_orwhere .= ' '
-                        . mb_strtoupper(
-                            $this->_formAndOrCols[$last_orwhere]
-                        )
-                        . ' ';
-                }
-                if (! empty($this->_formColumns[$column_index])
-                    && ! empty($_REQUEST['Or' . $row_index][$column_index])
-                ) {
-                    $qry_orwhere .= '(' . $this->_formColumns[$column_index]
-                        .  ' '
-                        .  $_REQUEST['Or' . $row_index][$column_index]
-                        .  ')';
-                    $last_orwhere = $column_index;
-                    $criteria_cnt++;
-                }
-            } // end for
-            if ($criteria_cnt > 1) {
-                $qry_orwhere      = '(' . $qry_orwhere . ')';
-            }
-            if (! empty($qry_orwhere)) {
-                $where_clause .= "\n"
-                    .  mb_strtoupper(
-                        isset($this->_formAndOrRows[$row_index])
-                        ? $this->_formAndOrRows[$row_index] . ' '
-                        : ''
-                    )
-                    .  $qry_orwhere;
-            } // end if
-        } // end for
-
-        if (! empty($where_clause) && $where_clause != '()') {
-            $where_clause = 'WHERE ' . htmlspecialchars($where_clause) . "\n";
-        } // end if
-        return $where_clause;
-    }
-
-    /**
-     * Provides ORDER BY clause for building SQL query
-     *
-     * @return string Order By clause
-     */
-    private function _getOrderByClause()
-    {
-        $orderby_clause = '';
-        $orderby_clauses = array();
-
-        // Create copy of instance variables
-        $columns = $this->_formColumns;
-        $sort = $this->_formSorts;
-        $sortOrder = $this->_formSortOrders;
-        if (!empty($sortOrder)
-            && count($sortOrder) == count($sort)
-            && count($sortOrder) == count($columns)
-        ) {
-            // Sort all three arrays based on sort order
-            array_multisort($sortOrder, $sort, $columns);
-        }
-
-        for (
-            $column_index = 0;
-            $column_index < $this->_criteria_column_count;
-            $column_index++
-        ) {
-            // if all columns are chosen with * selector,
-            // then sorting isn't available
-            // Fix for Bug #570698
-            if (empty($columns[$column_index])
-                && empty($sort[$column_index])
-            ) {
-                continue;
-            }
-
-            if (mb_substr($columns[$column_index], -2) == '.*') {
-                continue;
-            }
-
-            if (! empty($sort[$column_index])) {
-                $orderby_clauses[] = $columns[$column_index] . ' '
-                    . $sort[$column_index];
-            }
-        } // end for
-        if (!empty($orderby_clauses)) {
-            $orderby_clause = 'ORDER BY '
-                . htmlspecialchars(implode(", ", $orderby_clauses)) . "\n";
-        }
-        return $orderby_clause;
-    }
-
-    /**
-     * Provides UNIQUE columns and INDEX columns present in criteria tables
-     *
-     * @param array $search_tables        Tables involved in the search
-     * @param array $search_columns       Columns involved in the search
-     * @param array $where_clause_columns Columns having criteria where clause
-     *
-     * @return array having UNIQUE and INDEX columns
-     */
-    private function _getIndexes($search_tables, $search_columns,
-        $where_clause_columns
-    ) {
-        $unique_columns = array();
-        $index_columns = array();
-
-        foreach ($search_tables as $table) {
-            $indexes = $GLOBALS['dbi']->getTableIndexes($this->_db, $table);
-            foreach ($indexes as $index) {
-                $column = $table . '.' . $index['Column_name'];
-                if (isset($search_columns[$column])) {
-                    if ($index['Non_unique'] == 0) {
-                        if (isset($where_clause_columns[$column])) {
-                            $unique_columns[$column] = 'Y';
-                        } else {
-                            $unique_columns[$column] = 'N';
-                        }
-                    } else {
-                        if (isset($where_clause_columns[$column])) {
-                            $index_columns[$column] = 'Y';
-                        } else {
-                            $index_columns[$column] = 'N';
-                        }
-                    }
-                }
-            } // end while (each index of a table)
-        } // end while (each table)
-
-        return array(
-            'unique' => $unique_columns,
-            'index' => $index_columns
-        );
-    }
-
-    /**
-     * Provides UNIQUE columns and INDEX columns present in criteria tables
-     *
-     * @param array $search_tables        Tables involved in the search
-     * @param array $search_columns       Columns involved in the search
-     * @param array $where_clause_columns Columns having criteria where clause
-     *
-     * @return array having UNIQUE and INDEX columns
-     */
-    private function _getLeftJoinColumnCandidates($search_tables, $search_columns,
-        $where_clause_columns
-    ) {
-        $GLOBALS['dbi']->selectDb($this->_db);
-
-        // Get unique columns and index columns
-        $indexes = $this->_getIndexes(
-            $search_tables, $search_columns, $where_clause_columns
-        );
-        $unique_columns = $indexes['unique'];
-        $index_columns = $indexes['index'];
-
-        list($candidate_columns, $needsort)
-            = $this->_getLeftJoinColumnCandidatesBest(
-                $search_tables,
-                $where_clause_columns,
-                $unique_columns,
-                $index_columns
-            );
-
-        // If we came up with $unique_columns (very good) or $index_columns (still
-        // good) as $candidate_columns we want to check if we have any 'Y' there
-        // (that would mean that they were also found in the whereclauses
-        // which would be great). if yes, we take only those
-        if ($needsort != 1) {
-            return $candidate_columns;
-        }
-
-        $very_good = array();
-        $still_good = array();
-        foreach ($candidate_columns as $column => $is_where) {
-            $table = explode('.', $column);
-            $table = $table[0];
-            if ($is_where == 'Y') {
-                $very_good[$column] = $table;
-            } else {
-                $still_good[$column] = $table;
-            }
-        }
-        if (count($very_good) > 0) {
-            $candidate_columns = $very_good;
-            // Candidates restricted in index+where
-        } else {
-            $candidate_columns = $still_good;
-            // None of the candidates where in a where-clause
-        }
-
-        return $candidate_columns;
-    }
-
-    /**
-     * Provides the main table to form the LEFT JOIN clause
-     *
-     * @param array $search_tables        Tables involved in the search
-     * @param array $search_columns       Columns involved in the search
-     * @param array $where_clause_columns Columns having criteria where clause
-     * @param array $where_clause_tables  Tables having criteria where clause
-     *
-     * @return string table name
-     */
-    private function _getMasterTable($search_tables, $search_columns,
-        $where_clause_columns, $where_clause_tables
-    ) {
-        if (count($where_clause_tables) == 1) {
-            // If there is exactly one column that has a decent where-clause
-            // we will just use this
-            $master = key($where_clause_tables);
-            return $master;
-        }
-
-        // Now let's find out which of the tables has an index
-        // (When the control user is the same as the normal user
-        // because he is using one of his databases as pmadb,
-        // the last db selected is not always the one where we need to work)
-        $candidate_columns = $this->_getLeftJoinColumnCandidates(
-            $search_tables, $search_columns, $where_clause_columns
-        );
-
-        // Generally, we need to display all the rows of foreign (referenced)
-        // table, whether they have any matching row in child table or not.
-        // So we select candidate tables which are foreign tables.
-        $foreign_tables = array();
-        foreach ($candidate_columns as $one_table) {
-            $foreigners = PMA_getForeigners($this->_db, $one_table);
-            foreach ($foreigners as $key => $foreigner) {
-                if ($key != 'foreign_keys_data') {
-                    if (in_array($foreigner['foreign_table'], $candidate_columns)) {
-                        $foreign_tables[$foreigner['foreign_table']]
-                            = $foreigner['foreign_table'];
-                    }
-                    continue;
-                }
-                foreach ($foreigner as $one_key) {
-                    if (in_array($one_key['ref_table_name'], $candidate_columns)) {
-                        $foreign_tables[$one_key['ref_table_name']]
-                            = $one_key['ref_table_name'];
-                    }
-                }
-            }
-        }
-        if (count($foreign_tables)) {
-            $candidate_columns = $foreign_tables;
-        }
-
-        // If our array of candidates has more than one member we'll just
-        // find the smallest table.
-        // Of course the actual query would be faster if we check for
-        // the Criteria which gives the smallest result set in its table,
-        // but it would take too much time to check this
-        if (!(count($candidate_columns) > 1)) {
-            // Only one single candidate
-            return reset($candidate_columns);
-        }
-
-        // Of course we only want to check each table once
-        $checked_tables = $candidate_columns;
-        $tsize = array();
-        $csize = array();
-        foreach ($candidate_columns as $table) {
-            if ($checked_tables[$table] != 1) {
-                $_table = new Table($table, $this->_db);
-                $tsize[$table] = $_table->countRecords();
-                $checked_tables[$table] = 1;
-            }
-            $csize[$table] = $tsize[$table];
-        }
-        // Return largest table
-        return array_search(max($csize), $csize);
-    }
-
-    /**
-     * Provides columns and tables that have valid where clause criteria
-     *
-     * @return array
-     */
-    private function _getWhereClauseTablesAndColumns()
-    {
-        $where_clause_columns = array();
-        $where_clause_tables = array();
-
-        // Now we need all tables that we have in the where clause
-        for (
-            $column_index = 0, $nb = count($this->_criteria);
-            $column_index < $nb;
-            $column_index++
-        ) {
-            $current_table = explode('.', $_POST['criteriaColumn'][$column_index]);
-            if (empty($current_table[0]) || empty($current_table[1])) {
-                continue;
-            } // end if
-            $table = str_replace('`', '', $current_table[0]);
-            $column = str_replace('`', '', $current_table[1]);
-            $column = $table . '.' . $column;
-            // Now we know that our array has the same numbers as $criteria
-            // we can check which of our columns has a where clause
-            if (! empty($this->_criteria[$column_index])) {
-                if (mb_substr($this->_criteria[$column_index], 0, 1) == '='
-                    || stristr($this->_criteria[$column_index], 'is')
-                ) {
-                    $where_clause_columns[$column] = $column;
-                    $where_clause_tables[$table]  = $table;
-                }
-            } // end if
-        } // end for
-        return array(
-            'where_clause_tables' => $where_clause_tables,
-            'where_clause_columns' => $where_clause_columns
-        );
-    }
-
-    /**
-     * Provides FROM clause for building SQL query
-     *
-     * @param array $formColumns List of selected columns in the form
-     *
-     * @return string FROM clause
-     */
-    private function _getFromClause($formColumns)
-    {
-        $from_clause = '';
-        if (empty($formColumns)) {
-            return $from_clause;
-        }
-
-        // Initialize some variables
-        $search_tables = $search_columns = array();
-
-        // We only start this if we have fields, otherwise it would be dumb
-        foreach ($formColumns as $value) {
-            $parts = explode('.', $value);
-            if (! empty($parts[0]) && ! empty($parts[1])) {
-                $table = str_replace('`', '', $parts[0]);
-                $search_tables[$table] = $table;
-                $search_columns[] = $table . '.' . str_replace(
-                    '`', '', $parts[1]
-                );
-            }
-        } // end while
-
-        // Create LEFT JOINS out of Relations
-        $from_clause = $this->_getJoinForFromClause(
-            $search_tables, $search_columns
-        );
-
-        // In case relations are not defined, just generate the FROM clause
-        // from the list of tables, however we don't generate any JOIN
-        if (empty($from_clause)) {
-            // Create cartesian product
-            $from_clause = implode(
-                ", ", array_map('PMA\libraries\Util::backquote', $search_tables)
-            );
-        }
-
-        return $from_clause;
-    }
-
-    /**
-     * Formulates the WHERE clause by JOINing tables
-     *
-     * @param array $searchTables  Tables involved in the search
-     * @param array $searchColumns Columns involved in the search
-     *
-     * @return string table name
-     */
-    private function _getJoinForFromClause($searchTables, $searchColumns)
-    {
-        // $relations[master_table][foreign_table] => clause
-        $relations = array();
-
-        // Fill $relations with inter table relationship data
-        foreach ($searchTables as $oneTable) {
-            $this->_loadRelationsForTable($relations, $oneTable);
-        }
-
-        // Get tables and columns with valid where clauses
-        $validWhereClauses = $this->_getWhereClauseTablesAndColumns();
-        $whereClauseTables = $validWhereClauses['where_clause_tables'];
-        $whereClauseColumns = $validWhereClauses['where_clause_columns'];
-
-        // Get master table
-        $master = $this->_getMasterTable(
-            $searchTables, $searchColumns,
-            $whereClauseColumns, $whereClauseTables
-        );
-
-        // Will include master tables and all tables that can be combined into
-        // a cluster by their relation
-        $finalized = array();
-        if (mb_strlen($master) > 0) {
-            // Add master tables
-            $finalized[$master] = '';
-        }
-        // Fill the $finalized array with JOIN clauses for each table
-        $this->_fillJoinClauses($finalized, $relations, $searchTables);
-
-        // JOIN clause
-        $join = '';
-
-        // Tables that can not be combined with the table cluster
-        // which includes master table
-        $unfinalized = array_diff($searchTables, array_keys($finalized));
-        if (count($unfinalized) > 0) {
-
-            // We need to look for intermediary tables to JOIN unfinalized tables
-            // Heuristic to chose intermediary tables is to look for tables
-            // having relationships with unfinalized tables
-            foreach ($unfinalized as $oneTable) {
-
-                $references = PMA_getChildReferences($this->_db, $oneTable);
-                foreach ($references as $column => $columnReferences) {
-                    foreach ($columnReferences as $reference) {
-
-                        // Only from this schema
-                        if ($reference['table_schema'] != $this->_db) {
-                            continue;
-                        }
-
-                        $table = $reference['table_name'];
-
-                        $this->_loadRelationsForTable($relations, $table);
-
-                        // Make copies
-                        $tempFinalized = $finalized;
-                        $tempSearchTables = $searchTables;
-                        $tempSearchTables[] = $table;
-
-                        // Try joining with the added table
-                        $this->_fillJoinClauses(
-                            $tempFinalized, $relations, $tempSearchTables
-                        );
-
-                        $tempUnfinalized = array_diff(
-                            $tempSearchTables, array_keys($tempFinalized)
-                        );
-                        // Take greedy approach.
-                        // If the unfinalized count drops we keep the new table
-                        // and switch temporary varibles with the original ones
-                        if (count($tempUnfinalized) < count($unfinalized)) {
-                            $finalized = $tempFinalized;
-                            $searchTables = $tempSearchTables;
-                        }
-
-                        // We are done if no unfinalized tables anymore
-                        if (count($tempUnfinalized) == 0) {
-                            break 3;
-                        }
-                    }
-                }
-            }
-
-            $unfinalized = array_diff($searchTables, array_keys($finalized));
-            // If there are still unfinalized tables
-            if (count($unfinalized) > 0) {
-                // Add these tables as cartesian product before joined tables
-                $join .= implode(
-                    ', ', array_map('Util::backquote', $unfinalized)
-                );
-            }
-        }
-
-        $first = true;
-        // Add joined tables
-        foreach ($finalized as $table => $clause) {
-            if ($first) {
-                if (! empty($join)) {
-                    $join .= ", ";
-                }
-                $join .= Util::backquote($table);
-                $first = false;
-            } else {
-                $join .= "\n    LEFT JOIN " . Util::backquote(
-                    $table
-                ) . " ON " . $clause;
-            }
-        }
-
-        return $join;
-    }
-
-    /**
-     * Loads relations for a given table into the $relations array
-     *
-     * @param array  &$relations array of relations
-     * @param string $oneTable   the table
-     *
-     * @return void
-     */
-    private function _loadRelationsForTable(&$relations, $oneTable)
-    {
-        $relations[$oneTable] = array();
-
-        $foreigners = PMA_getForeigners($GLOBALS['db'], $oneTable);
-        foreach ($foreigners as $field => $foreigner) {
-            // Foreign keys data
-            if ($field == 'foreign_keys_data') {
-                foreach ($foreigner as $oneKey) {
-                    $clauses = array();
-                    // There may be multiple column relations
-                    foreach ($oneKey['index_list'] as $index => $oneField) {
-                        $clauses[]
-                            = Util::backquote($oneTable) . "."
-                            . Util::backquote($oneField) . " = "
-                            . Util::backquote($oneKey['ref_table_name']) . "."
-                            . Util::backquote($oneKey['ref_index_list'][$index]);
-                    }
-                    // Combine multiple column relations with AND
-                    $relations[$oneTable][$oneKey['ref_table_name']]
-                        = implode(" AND ", $clauses);
-                }
-            } else { // Internal relations
-                $relations[$oneTable][$foreigner['foreign_table']]
-                    = Util::backquote($oneTable) . "."
-                    . Util::backquote($field) . " = "
-                    . Util::backquote($foreigner['foreign_table']) . "."
-                    . Util::backquote($foreigner['foreign_field']);
-            }
-        }
-    }
-
-    /**
-     * Fills the $finalized arrays with JOIN clauses for each of the tables
-     *
-     * @param array &$finalized   JOIN clauses for each table
-     * @param array $relations    Relations among tables
-     * @param array $searchTables Tables involved in the search
-     *
-     * @return void
-     */
-    private function _fillJoinClauses(&$finalized, $relations, $searchTables)
-    {
-        while (true) {
-            $added = false;
-            foreach ($searchTables as $masterTable) {
-                $foreignData = $relations[$masterTable];
-                foreach ($foreignData as $foreignTable => $clause) {
-                    if (! isset($finalized[$masterTable])
-                        && isset($finalized[$foreignTable])
-                    ) {
-                        $finalized[$masterTable] = $clause;
-                        $added = true;
-                    } elseif (! isset($finalized[$foreignTable])
-                        && isset($finalized[$masterTable])
-                        && in_array($foreignTable, $searchTables)
-                    ) {
-                        $finalized[$foreignTable] = $clause;
-                        $added = true;
-                    }
-                    if ($added) {
-                        // We are done if all tables are in $finalized
-                        if (count($finalized) == count($searchTables)) {
-                            return;
-                        }
-                    }
-                }
-            }
-            // If no new tables were added during this iteration, break;
-            if (! $added) {
-                return;
-            }
-        }
-    }
-
-    /**
-     * Provides the generated SQL query
-     *
-     * @param array $formColumns List of selected columns in the form
-     *
-     * @return string SQL query
-     */
-    private function _getSQLQuery($formColumns)
-    {
-        $sql_query = '';
-        // get SELECT clause
-        $sql_query .= $this->_getSelectClause();
-        // get FROM clause
-        $from_clause = $this->_getFromClause($formColumns);
-        if (! empty($from_clause)) {
-            $sql_query .= 'FROM ' . htmlspecialchars($from_clause) . "\n";
-        }
-        // get WHERE clause
-        $sql_query .= $this->_getWhereClause();
-        // get ORDER BY clause
-        $sql_query .= $this->_getOrderByClause();
-        return $sql_query;
-    }
-
-    /**
-     * Provides the generated QBE form
-     *
-     * @return string QBE form
-     */
-    public function getSelectionForm()
-    {
-        $html_output = '<form action="db_qbe.php" method="post" id="formQBE" '
-            . 'class="lock-page">';
-        $html_output .= '<fieldset>';
-
-        if ($GLOBALS['cfgRelation']['savedsearcheswork']) {
-            $html_output .= $this->_getSavedSearchesField();
-        }
-
-        $html_output .= '<table class="data" style="width: 100%;">';
-        // Get table's <tr> elements
-        $html_output .= $this->_getColumnNamesRow();
-        $html_output .= $this->_getColumnAliasRow();
-        $html_output .= $this->_getShowRow();
-        $html_output .= $this->_getSortRow();
-        $html_output .= $this->_getSortOrder();
-        $html_output .= $this->_getCriteriaInputboxRow();
-        $html_output .= $this->_getInsDelAndOrCriteriaRows();
-        $html_output .= $this->_getModifyColumnsRow();
-        $html_output .= '</table>';
-        $this->_new_row_count--;
-        $url_params = array();
-        $url_params['db'] = $this->_db;
-        $url_params['criteriaColumnCount'] = $this->_new_column_count;
-        $url_params['rows'] = $this->_new_row_count;
-        $html_output .= PMA_URL_getHiddenInputs($url_params);
-        $html_output .= '</fieldset>';
-        // get footers
-        $html_output .= $this->_getTableFooters();
-        // get tables select list
-        $html_output .= $this->_getTablesList();
-        $html_output .= '</form>';
-        $html_output .= '<form action="db_qbe.php" method="post" class="lock-page">';
-        $html_output .= PMA_URL_getHiddenInputs(array('db' => $this->_db));
-        // get SQL query
-        $html_output .= '<div class="floatleft" style="width:50%">';
-        $html_output .= '<fieldset>';
-        $html_output .= '<legend>'
-            . sprintf(
-                __('SQL query on database <b>%s</b>:'),
-                Util::getDbLink($this->_db)
-            );
-        $html_output .= '</legend>';
-        $text_dir = 'ltr';
-        $html_output .= '<textarea cols="80" name="sql_query" id="textSqlquery"'
-            . ' rows="' . ((count($this->_criteriaTables) > 30) ? '15' : '7') . '"'
-            . ' dir="' . $text_dir . '">';
-
-        if (empty($this->_formColumns)) {
-            $this->_formColumns = array();
-        }
-        $html_output .= $this->_getSQLQuery($this->_formColumns);
-
-        $html_output .= '</textarea>';
-        $html_output .= '</fieldset>';
-        // displays form's footers
-        $html_output .= '<fieldset class="tblFooters">';
-        $html_output .= '<input type="hidden" name="submit_sql" value="1" />';
-        $html_output .= '<input type="submit" value="' . __('Submit Query') . '" />';
-        $html_output .= '</fieldset>';
-        $html_output .= '</div>';
-        $html_output .= '</form>';
-        return $html_output;
-    }
-
-    /**
-     * Get fields to display
-     *
-     * @return string
-     */
-    private function _getSavedSearchesField()
-    {
-        $html_output = __('Saved bookmarked search:');
-        $html_output .= ' <select name="searchId" id="searchId">';
-        $html_output .= '<option value="">' . __('New bookmark') . '</option>';
-
-        $currentSearch = $this->_getCurrentSearch();
-        $currentSearchId = null;
-        $currentSearchName = null;
-        if (null != $currentSearch) {
-            $currentSearchId = $currentSearch->getId();
-            $currentSearchName = $currentSearch->getSearchName();
-        }
-
-        foreach ($this->_savedSearchList as $id => $name) {
-            $html_output .= '<option value="' . htmlspecialchars($id)
-                . '" ' . (
-                $id == $currentSearchId
-                    ? 'selected="selected" '
-                    : ''
-                )
-                . '>'
-                . htmlspecialchars($name)
-                . '</option>';
-        }
-        $html_output .= '</select>';
-        $html_output .= '<input type="text" name="searchName" id="searchName" '
-            . 'value="' . htmlspecialchars($currentSearchName) . '" />';
-        $html_output .= '<input type="hidden" name="action" id="action" value="" />';
-        $html_output .= '<input type="submit" name="saveSearch" id="saveSearch" '
-            . 'value="' . __('Create bookmark') . '" />';
-        if (null !== $currentSearchId) {
-            $html_output .= '<input type="submit" name="updateSearch" '
-                . 'id="updateSearch" value="' . __('Update bookmark') . '" />';
-            $html_output .= '<input type="submit" name="deleteSearch" '
-                . 'id="deleteSearch" value="' . __('Delete bookmark') . '" />';
-        }
-
-        return $html_output;
-    }
-
-    /**
-     * Initialize _criteria_column_count
-     *
-     * @return int Previous number of columns
-     */
-    private function _initializeCriteriasCount()
-    {
-        // sets column count
-        $criteriaColumnCount = PMA_ifSetOr(
-            $_REQUEST['criteriaColumnCount'],
-            3,
-            'numeric'
-        );
-        $criteriaColumnAdd = PMA_ifSetOr(
-            $_REQUEST['criteriaColumnAdd'],
-            0,
-            'numeric'
-        );
-        $this->_criteria_column_count = max(
-            $criteriaColumnCount + $criteriaColumnAdd,
-            0
-        );
-
-        // sets row count
-        $rows = PMA_ifSetOr($_REQUEST['rows'], 0, 'numeric');
-        $criteriaRowAdd = PMA_ifSetOr($_REQUEST['criteriaRowAdd'], 0, 'numeric');
-        $this->_criteria_row_count = min(
-            100,
-            max($rows + $criteriaRowAdd, 0)
-        );
-
-        return $criteriaColumnCount;
-    }
-
-    /**
-     * Get best
-     *
-     * @param array $search_tables        Tables involved in the search
-     * @param array $where_clause_columns Columns with where clause
-     * @param array $unique_columns       Unique columns
-     * @param array $index_columns        Indexed columns
-     *
-     * @return array
-     */
-    private function _getLeftJoinColumnCandidatesBest(
-        $search_tables, $where_clause_columns, $unique_columns, $index_columns
-    ) {
-        // now we want to find the best.
-        if (isset($unique_columns) && count($unique_columns) > 0) {
-            $candidate_columns = $unique_columns;
-            $needsort = 1;
-            return array($candidate_columns, $needsort);
-        } elseif (isset($index_columns) && count($index_columns) > 0) {
-            $candidate_columns = $index_columns;
-            $needsort = 1;
-            return array($candidate_columns, $needsort);
-        } elseif (isset($where_clause_columns) && count($where_clause_columns) > 0) {
-            $candidate_columns = $where_clause_columns;
-            $needsort = 0;
-            return array($candidate_columns, $needsort);
-        } else {
-            $candidate_columns = $search_tables;
-            $needsort = 0;
-            return array($candidate_columns, $needsort);
-        }
-    }
-}
diff --git a/#pma/libraries/DbSearch.php b/#pma/libraries/DbSearch.php
deleted file mode 100644
index 38f64885..00000000
--- a/#pma/libraries/DbSearch.php
+++ /dev/null
@@ -1,490 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Handles Database Search
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries;
-
-/**
- * Class to handle database search
- *
- * @package PhpMyAdmin
- */
-class DbSearch
-{
-    /**
-     * Database name
-     *
-     * @access private
-     * @var string
-     */
-    private $_db;
-    /**
-     * Table Names
-     *
-     * @access private
-     * @var array
-     */
-    private $_tables_names_only;
-    /**
-     * Type of search
-     *
-     * @access private
-     * @var array
-     */
-    private $_searchTypes;
-    /**
-     * Already set search type
-     *
-     * @access private
-     * @var integer
-     */
-    private $_criteriaSearchType;
-    /**
-     * Already set search type's description
-     *
-     * @access private
-     * @var string
-     */
-    private $_searchTypeDescription;
-    /**
-     * Search string/regexp
-     *
-     * @access private
-     * @var string
-     */
-    private $_criteriaSearchString;
-    /**
-     * Criteria Tables to search in
-     *
-     * @access private
-     * @var array
-     */
-    private $_criteriaTables;
-    /**
-     * Restrict the search to this column
-     *
-     * @access private
-     * @var string
-     */
-    private $_criteriaColumnName;
-
-    /**
-     * Public Constructor
-     *
-     * @param string $db Database name
-     */
-    public function __construct($db)
-    {
-        $this->_db = $db;
-        // Sets criteria parameters
-        $this->_setSearchParams();
-    }
-
-    /**
-     * Sets search parameters
-     *
-     * @return void
-     */
-    private function _setSearchParams()
-    {
-        $this->_tables_names_only = $GLOBALS['dbi']->getTables($this->_db);
-
-        $this->_searchTypes = array(
-            '1' => __('at least one of the words'),
-            '2' => __('all words'),
-            '3' => __('the exact phrase'),
-            '4' => __('as regular expression'),
-        );
-
-        if (empty($_REQUEST['criteriaSearchType'])
-            || ! is_string($_REQUEST['criteriaSearchType'])
-            || ! array_key_exists(
-                $_REQUEST['criteriaSearchType'],
-                $this->_searchTypes
-            )
-        ) {
-            $this->_criteriaSearchType = 1;
-            unset($_REQUEST['submit_search']);
-        } else {
-            $this->_criteriaSearchType = (int) $_REQUEST['criteriaSearchType'];
-            $this->_searchTypeDescription
-                = $this->_searchTypes[$_REQUEST['criteriaSearchType']];
-        }
-
-        if (empty($_REQUEST['criteriaSearchString'])
-            || ! is_string($_REQUEST['criteriaSearchString'])
-        ) {
-            $this->_criteriaSearchString = '';
-            unset($_REQUEST['submit_search']);
-        } else {
-            $this->_criteriaSearchString = $_REQUEST['criteriaSearchString'];
-        }
-
-        $this->_criteriaTables = array();
-        if (empty($_REQUEST['criteriaTables'])
-            || ! is_array($_REQUEST['criteriaTables'])
-        ) {
-            unset($_REQUEST['submit_search']);
-        } else {
-            $this->_criteriaTables = array_intersect(
-                $_REQUEST['criteriaTables'], $this->_tables_names_only
-            );
-        }
-
-        if (empty($_REQUEST['criteriaColumnName'])
-            || ! is_string($_REQUEST['criteriaColumnName'])
-        ) {
-            unset($this->_criteriaColumnName);
-        } else {
-            $this->_criteriaColumnName = $GLOBALS['dbi']->escapeString(
-                $_REQUEST['criteriaColumnName'], true
-            );
-        }
-    }
-
-    /**
-     * Builds the SQL search query
-     *
-     * @param string $table The table name
-     *
-     * @return array 3 SQL queries (for count, display and delete results)
-     *
-     * @todo    can we make use of fulltextsearch IN BOOLEAN MODE for this?
-     * PMA_backquote
-     * DatabaseInterface::freeResult
-     * DatabaseInterface::fetchAssoc
-     * $GLOBALS['db']
-     * explode
-     * count
-     * strlen
-     */
-    private function _getSearchSqls($table)
-    {
-        // Statement types
-        $sqlstr_select = 'SELECT';
-        $sqlstr_delete = 'DELETE';
-        // Table to use
-        $sqlstr_from = ' FROM '
-            . Util::backquote($GLOBALS['db']) . '.'
-            . Util::backquote($table);
-        // Gets where clause for the query
-        $where_clause = $this->_getWhereClause($table);
-        // Builds complete queries
-        $sql = array();
-        $sql['select_columns'] = $sqlstr_select . ' * ' . $sqlstr_from
-            . $where_clause;
-        // here, I think we need to still use the COUNT clause, even for
-        // VIEWs, anyway we have a WHERE clause that should limit results
-        $sql['select_count']  = $sqlstr_select . ' COUNT(*) AS `count`'
-            . $sqlstr_from . $where_clause;
-        $sql['delete']        = $sqlstr_delete . $sqlstr_from . $where_clause;
-
-        return $sql;
-    }
-
-    /**
-     * Provides where clause for building SQL query
-     *
-     * @param string $table The table name
-     *
-     * @return string The generated where clause
-     */
-    private function _getWhereClause($table)
-    {
-        // Columns to select
-        $allColumns = $GLOBALS['dbi']->getColumns($GLOBALS['db'], $table);
-        $likeClauses = array();
-        // Based on search type, decide like/regex & '%'/''
-        $like_or_regex   = (($this->_criteriaSearchType == 4) ? 'REGEXP' : 'LIKE');
-        $automatic_wildcard   = (($this->_criteriaSearchType < 3) ? '%' : '');
-        // For "as regular expression" (search option 4), LIKE won't be used
-        // Usage example: If user is searching for a literal $ in a regexp search,
-        // he should enter \$ as the value.
-        $criteriaSearchStringEscaped = $GLOBALS['dbi']->escapeString(
-            $this->_criteriaSearchString
-        );
-        // Extract search words or pattern
-        $search_words = (($this->_criteriaSearchType > 2)
-            ? array($criteriaSearchStringEscaped)
-            : explode(' ', $criteriaSearchStringEscaped));
-
-        foreach ($search_words as $search_word) {
-            // Eliminates empty values
-            if (mb_strlen($search_word) === 0) {
-                continue;
-            }
-            $likeClausesPerColumn = array();
-            // for each column in the table
-            foreach ($allColumns as $column) {
-                if (! isset($this->_criteriaColumnName)
-                    || mb_strlen($this->_criteriaColumnName) == 0
-                    || $column['Field'] == $this->_criteriaColumnName
-                ) {
-                    $column = 'CONVERT(' . Util::backquote($column['Field'])
-                            . ' USING utf8)';
-                    $likeClausesPerColumn[] = $column . ' ' . $like_or_regex . ' '
-                        . "'"
-                        . $automatic_wildcard . $search_word . $automatic_wildcard
-                        . "'";
-                }
-            } // end for
-            if (count($likeClausesPerColumn) > 0) {
-                $likeClauses[] = implode(' OR ', $likeClausesPerColumn);
-            }
-        } // end for
-        // Use 'OR' if 'at least one word' is to be searched, else use 'AND'
-        $implode_str  = ($this->_criteriaSearchType == 1 ? ' OR ' : ' AND ');
-        if (empty($likeClauses)) {
-            // this could happen when the "inside column" does not exist
-            // in any selected tables
-            $where_clause = ' WHERE FALSE';
-        } else {
-            $where_clause = ' WHERE ('
-                . implode(') ' . $implode_str . ' (', $likeClauses)
-                . ')';
-        }
-        return $where_clause;
-    }
-
-    /**
-     * Displays database search results
-     *
-     * @return string HTML for search results
-     */
-    public function getSearchResults()
-    {
-        $html_output = '';
-        // Displays search string
-        $html_output .= '<br />'
-            . '<table class="data">'
-            . '<caption class="tblHeaders">'
-            . sprintf(
-                __('Search results for "<i>%s</i>" %s:'),
-                htmlspecialchars($this->_criteriaSearchString),
-                $this->_searchTypeDescription
-            )
-            . '</caption>';
-
-        $num_search_result_total = 0;
-        $odd_row = true;
-        // For each table selected as search criteria
-        foreach ($this->_criteriaTables as $each_table) {
-            // Gets the SQL statements
-            $newsearchsqls = $this->_getSearchSqls($each_table);
-            // Executes the "COUNT" statement
-            $res_cnt = $GLOBALS['dbi']->fetchValue($newsearchsqls['select_count']);
-            $num_search_result_total += $res_cnt;
-            // Gets the result row's HTML for a table
-            $html_output .= $this->_getResultsRow(
-                $each_table, $newsearchsqls, $odd_row, $res_cnt
-            );
-            $odd_row = ! $odd_row;
-        } // end for
-        $html_output .= '</table>';
-        // Displays total number of matches
-        if (count($this->_criteriaTables) > 1) {
-            $html_output .= '<p>';
-            $html_output .= sprintf(
-                _ngettext(
-                    '<b>Total:</b> <i>%s</i> match',
-                    '<b>Total:</b> <i>%s</i> matches',
-                    $num_search_result_total
-                ),
-                $num_search_result_total
-            );
-            $html_output .= '</p>';
-        }
-        return $html_output;
-    }
-
-    /**
-     * Provides search results row with browse/delete links.
-     * (for a table)
-     *
-     * @param string  $each_table    One of the tables on which search was performed
-     * @param array   $newsearchsqls Contains SQL queries
-     * @param bool    $odd_row       For displaying contrasting table rows
-     * @param integer $res_cnt       Number of results found
-     *
-     * @return string HTML row
-     */
-    private function _getResultsRow($each_table, $newsearchsqls, $odd_row, $res_cnt)
-    {
-        $this_url_params = array(
-            'db'    => $GLOBALS['db'],
-            'table' => $each_table,
-            'goto'  => 'db_sql.php',
-            'pos'   => 0,
-            'is_js_confirmed' => 0,
-        );
-        // Start forming search results row
-        $html_output = '<tr class="noclick ' . ($odd_row ? 'odd' : 'even') . '">';
-        // Displays results count for a table
-        $html_output .= '<td>';
-        $html_output .= sprintf(
-            _ngettext(
-                '%1$s match in <strong>%2$s</strong>',
-                '%1$s matches in <strong>%2$s</strong>', $res_cnt
-            ),
-            $res_cnt, htmlspecialchars($each_table)
-        );
-        $html_output .= '</td>';
-        // Displays browse/delete link if result count > 0
-        if ($res_cnt > 0) {
-            $this_url_params['db'] = htmlspecialchars($GLOBALS['db']);
-            $this_url_params['table'] = htmlspecialchars($each_table);
-            $browse_result_path = 'sql.php' . PMA_URL_getCommon($this_url_params);
-            $html_output .= '<td><a name="browse_search" '
-                . ' class="ajax browse_results" href="'
-                . $browse_result_path . '" '
-                . 'data-browse-sql="'
-                . htmlspecialchars($newsearchsqls['select_columns']). '" '
-                . 'data-table-name="' . htmlspecialchars($each_table) . '" >'
-                . __('Browse') . '</a></td>';
-
-            $delete_result_path = $browse_result_path;
-            $html_output .= '<td><a name="delete_search" class="ajax delete_results"'
-                . ' href="' . $delete_result_path . '"'
-                . ' data-delete-sql="' . htmlspecialchars($newsearchsqls['delete']) . '"'
-                . ' data-table-name="' . htmlspecialchars($each_table) . '" >'
-                . __('Delete') . '</a></td>';
-        } else {
-            $html_output .= '<td>&nbsp;</td>'
-                . '<td>&nbsp;</td>';
-        }// end if else
-        $html_output .= '</tr>';
-        return $html_output;
-    }
-
-    /**
-     * Provides the main search form's html
-     *
-     * @return string HTML for selection form
-     */
-    public function getSelectionForm()
-    {
-        $html_output = '<a id="db_search"></a>';
-        $html_output .= '<form id="db_search_form"'
-            . ' class="ajax lock-page"'
-            . ' method="post" action="db_search.php" name="db_search">';
-        $html_output .= PMA_URL_getHiddenInputs($GLOBALS['db']);
-        $html_output .= '<fieldset>';
-        // set legend caption
-        $html_output .= '<legend>' . __('Search in database') . '</legend>';
-        $html_output .= '<table class="formlayout">';
-        // inputbox for search phrase
-        $html_output .= '<tr>';
-        $html_output .= '<td>' . __('Words or values to search for (wildcard: "%"):')
-            . '</td>';
-        $html_output .= '<td><input type="text"'
-            . ' name="criteriaSearchString" size="60"'
-            . ' value="' . htmlspecialchars($this->_criteriaSearchString) . '" />';
-        $html_output .= '</td>';
-        $html_output .= '</tr>';
-        // choices for types of search
-        $html_output .= '<tr>';
-        $html_output .= '<td class="right vtop">' . __('Find:') . '</td>';
-        $html_output .= '<td>';
-        $choices = array(
-            '1' => __('at least one of the words')
-                . Util::showHint(
-                    __('Words are separated by a space character (" ").')
-                ),
-            '2' => __('all words')
-                . Util::showHint(
-                    __('Words are separated by a space character (" ").')
-                ),
-            '3' => __('the exact phrase'),
-            '4' => __('as regular expression') . ' '
-                . Util::showMySQLDocu('Regexp')
-        );
-        // 4th parameter set to true to add line breaks
-        // 5th parameter set to false to avoid htmlspecialchars() escaping
-        // in the label since we have some HTML in some labels
-        $html_output .= Util::getRadioFields(
-            'criteriaSearchType', $choices, $this->_criteriaSearchType, true, false
-        );
-        $html_output .= '</td></tr>';
-        // displays table names as select options
-        $html_output .= '<tr>';
-        $html_output .= '<td class="right vtop">' . __('Inside tables:') . '</td>';
-        $html_output .= '<td rowspan="2">';
-        $html_output .= '<select name="criteriaTables[]" size="6"'
-            . ' multiple="multiple">';
-        foreach ($this->_tables_names_only as $each_table) {
-            if (in_array($each_table, $this->_criteriaTables)) {
-                $is_selected = ' selected="selected"';
-            } else {
-                $is_selected = '';
-            }
-            $html_output .= '<option value="' . htmlspecialchars($each_table) . '"'
-                . $is_selected . '>'
-                . str_replace(' ', '&nbsp;', htmlspecialchars($each_table))
-                . '</option>';
-        } // end for
-        $html_output .= '</select>';
-        $html_output .= '</td></tr>';
-        // Displays 'select all' and 'unselect all' links
-        $alter_select = '<a href="#" '
-            . 'onclick="setSelectOptions(\'db_search\','
-            . ' \'criteriaTables[]\', true); return false;">'
-            . __('Select all') . '</a> &nbsp;/&nbsp;';
-        $alter_select .= '<a href="#" '
-            . 'onclick="setSelectOptions(\'db_search\','
-            . ' \'criteriaTables[]\', false); return false;">'
-            . __('Unselect all') . '</a>';
-        $html_output .= '<tr><td class="right vbottom">'
-            . $alter_select . '</td></tr>';
-        // Inputbox for column name entry
-        $html_output .= '<tr>';
-        $html_output .= '<td class="right">' . __('Inside column:') . '</td>';
-        $html_output .= '<td><input type="text" name="criteriaColumnName" size="60"'
-            . 'value="'
-            . (! empty($this->_criteriaColumnName)
-                ? htmlspecialchars($this->_criteriaColumnName)
-                : '')
-            . '" /></td>';
-        $html_output .= '</tr>';
-        $html_output .= '</table>';
-        $html_output .= '</fieldset>';
-        $html_output .= '<fieldset class="tblFooters">';
-        $html_output .= '<input type="submit" name="submit_search" value="'
-            . __('Go') . '" id="buttonGo" />';
-        $html_output .= '</fieldset>';
-        $html_output .= '</form>';
-        $html_output .= '<div id="togglesearchformdiv">'
-            . '<a id="togglesearchformlink"></a></div>';
-
-        return $html_output;
-    }
-
-    /**
-     * Provides div tags for browsing search results and sql query form.
-     *
-     * @return string div tags
-     */
-    public function getResultDivs()
-    {
-        $html_output = '<!-- These two table-image and table-link elements display'
-            . ' the table name in browse search results  -->';
-        $html_output .= '<div id="table-info">';
-        $html_output .= '<a class="item" id="table-link" ></a>';
-        $html_output .= '</div>';
-        // div for browsing results
-        $html_output .= '<div id="browse-results">';
-        $html_output .= '<!-- this browse-results div is used to load the browse'
-            . ' and delete results in the db search -->';
-        $html_output .= '</div>';
-        $html_output .= '<br class="clearfloat" />';
-        $html_output .= '<div id="sqlqueryform">';
-        $html_output .= '<!-- this sqlqueryform div is used to load the delete'
-            . ' form in the db search -->';
-        $html_output .= '</div>';
-        $html_output .= '<!--  toggle query box link-->';
-        $html_output .= '<a id="togglequerybox"></a>';
-        return $html_output;
-    }
-}
diff --git a/#pma/libraries/DisplayResults.php b/#pma/libraries/DisplayResults.php
deleted file mode 100644
index 98a3804a..00000000
--- a/#pma/libraries/DisplayResults.php
+++ /dev/null
@@ -1,5832 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Hold the PMA\libraries\DisplayResults class
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries;
-
-use SqlParser\Utils\Query;
-use PMA\libraries\plugins\transformations\Text_Plain_Link;
-
-require_once './libraries/transformations.lib.php';
-
-/**
- * Handle all the functionalities related to displaying results
- * of sql queries, stored procedure, browsing sql processes or
- * displaying binary log.
- *
- * @package PhpMyAdmin
- */
-class DisplayResults
-{
-
-    // Define constants
-    const NO_EDIT_OR_DELETE = 'nn';
-    const UPDATE_ROW = 'ur';
-    const DELETE_ROW = 'dr';
-    const KILL_PROCESS = 'kp';
-
-    const POSITION_LEFT = 'left';
-    const POSITION_RIGHT = 'right';
-    const POSITION_BOTH = 'both';
-    const POSITION_NONE = 'none';
-
-    const PLACE_TOP_DIRECTION_DROPDOWN = 'top_direction_dropdown';
-    const PLACE_BOTTOM_DIRECTION_DROPDOWN = 'bottom_direction_dropdown';
-
-    const DISPLAY_FULL_TEXT = 'F';
-    const DISPLAY_PARTIAL_TEXT = 'P';
-
-    const HEADER_FLIP_TYPE_AUTO = 'auto';
-    const HEADER_FLIP_TYPE_CSS = 'css';
-    const HEADER_FLIP_TYPE_FAKE = 'fake';
-
-    const DATE_FIELD = 'date';
-    const DATETIME_FIELD = 'datetime';
-    const TIMESTAMP_FIELD = 'timestamp';
-    const TIME_FIELD = 'time';
-    const STRING_FIELD = 'string';
-    const GEOMETRY_FIELD = 'geometry';
-    const BLOB_FIELD = 'BLOB';
-    const BINARY_FIELD = 'BINARY';
-
-    const RELATIONAL_KEY = 'K';
-    const RELATIONAL_DISPLAY_COLUMN = 'D';
-
-    const GEOMETRY_DISP_GEOM = 'GEOM';
-    const GEOMETRY_DISP_WKT = 'WKT';
-    const GEOMETRY_DISP_WKB = 'WKB';
-
-    const SMART_SORT_ORDER = 'SMART';
-    const ASCENDING_SORT_DIR = 'ASC';
-    const DESCENDING_SORT_DIR = 'DESC';
-
-    const TABLE_TYPE_INNO_DB = 'InnoDB';
-    const ALL_ROWS = 'all';
-    const QUERY_TYPE_SELECT = 'SELECT';
-
-    const ROUTINE_PROCEDURE = 'procedure';
-    const ROUTINE_FUNCTION = 'function';
-
-    const ACTION_LINK_CONTENT_ICONS = 'icons';
-    const ACTION_LINK_CONTENT_TEXT = 'text';
-
-
-    // Declare global fields
-
-    /** array with properties of the class */
-    private $_property_array = array(
-
-        /** string Database name */
-        'db' => null,
-
-        /** string Table name */
-        'table' => null,
-
-        /** string the URL to go back in case of errors */
-        'goto' => null,
-
-        /** string the SQL query */
-        'sql_query' => null,
-
-        /**
-         * integer the total number of rows returned by the SQL query without any
-         *         appended "LIMIT" clause programmatically
-         */
-        'unlim_num_rows' => null,
-
-        /** array meta information about fields */
-        'fields_meta' => null,
-
-        /** boolean */
-        'is_count' => null,
-
-        /** integer */
-        'is_export' => null,
-
-        /** boolean */
-        'is_func' => null,
-
-        /** integer */
-        'is_analyse' => null,
-
-        /** integer the total number of rows returned by the SQL query */
-        'num_rows' => null,
-
-        /** integer the total number of fields returned by the SQL query */
-        'fields_cnt' => null,
-
-        /** double time taken for execute the SQL query */
-        'querytime' => null,
-
-        /** string path for theme images directory */
-        'pma_theme_image' => null,
-
-        /** string */
-        'text_dir' => null,
-
-        /** boolean */
-        'is_maint' => null,
-
-        /** boolean */
-        'is_explain' => null,
-
-        /** boolean */
-        'is_show' => null,
-
-        /** boolean */
-        'is_browse_distinct' => null,
-
-        /** array table definitions */
-        'showtable' => null,
-
-        /** string */
-        'printview' => null,
-
-        /** string URL query */
-        'url_query' => null,
-
-        /** array column names to highlight */
-        'highlight_columns' => null,
-
-        /** array holding various display information */
-        'display_params' => null,
-
-        /** array mime types information of fields */
-        'mime_map' => null,
-
-        /** boolean */
-        'editable' => null,
-
-        /** random unique ID to distinguish result set */
-        'unique_id' => null,
-
-        /** where clauses for each row, each table in the row */
-        'whereClauseMap' => array(),
-    );
-
-    /**
-     * This variable contains the column transformation information
-     * for some of the system databases.
-     * One element of this array represent all relevant columns in all tables in
-     * one specific database
-     */
-    public $transformation_info;
-
-
-    /**
-     * Get any property of this class
-     *
-     * @param string $property name of the property
-     *
-     * @return mixed|void if property exist, value of the relevant property
-     */
-    public function __get($property)
-    {
-        if (array_key_exists($property, $this->_property_array)) {
-            return $this->_property_array[$property];
-        }
-    }
-
-
-    /**
-     * Set values for any property of this class
-     *
-     * @param string $property name of the property
-     * @param mixed  $value    value to set
-     *
-     * @return void
-     */
-    public function __set($property, $value)
-    {
-        if (array_key_exists($property, $this->_property_array)) {
-            $this->_property_array[$property] = $value;
-        }
-    }
-
-
-    /**
-     * Constructor for DisplayResults class
-     *
-     * @param string $db        the database name
-     * @param string $table     the table name
-     * @param string $goto      the URL to go back in case of errors
-     * @param string $sql_query the SQL query
-     *
-     * @access  public
-     */
-    public function __construct($db, $table, $goto, $sql_query)
-    {
-        $this->_setDefaultTransformations();
-
-        $this->__set('db', $db);
-        $this->__set('table', $table);
-        $this->__set('goto', $goto);
-        $this->__set('sql_query', $sql_query);
-        $this->__set('unique_id', rand());
-    }
-
-    /**
-     * Sets default transformations for some columns
-     *
-     * @return void
-     */
-    private  function _setDefaultTransformations()
-    {
-        $json_highlighting_data = array(
-            'libraries/plugins/transformations/output/Text_Plain_Json.php',
-            'PMA\libraries\plugins\transformations\output\Text_Plain_Json',
-            'Text_Plain'
-        );
-        $sql_highlighting_data = array(
-            'libraries/plugins/transformations/output/Text_Plain_Sql.php',
-            'PMA\libraries\plugins\transformations\output\Text_Plain_Sql',
-            'Text_Plain'
-        );
-        $blob_sql_highlighting_data = array(
-            'libraries/plugins/transformations/output/Text_Octetstream_Sql.php',
-            'PMA\libraries\plugins\transformations\output\Text_Octetstream_Sql',
-            'Text_Octetstream'
-        );
-        $link_data = array(
-            'libraries/plugins/transformations/Text_Plain_Link.php',
-            'PMA\libraries\plugins\transformations\Text_Plain_Link',
-            'Text_Plain'
-        );
-        $this->transformation_info = array(
-            'information_schema' => array(
-                'events' => array(
-                    'event_definition' => $sql_highlighting_data
-                ),
-                'processlist' => array(
-                    'info' => $sql_highlighting_data
-                ),
-                'routines' => array(
-                    'routine_definition' => $sql_highlighting_data
-                ),
-                'triggers' => array(
-                    'action_statement' => $sql_highlighting_data
-                ),
-                'views' => array(
-                    'view_definition' => $sql_highlighting_data
-                )
-            ),
-            'mysql' => array(
-                'event' => array(
-                    'body' => $blob_sql_highlighting_data,
-                    'body_utf8' => $blob_sql_highlighting_data
-                ),
-                'general_log' => array(
-                    'argument' => $sql_highlighting_data
-                ),
-                'help_category' => array(
-                    'url' => $link_data
-                ),
-                'help_topic' => array(
-                    'example' => $sql_highlighting_data,
-                    'url' => $link_data
-                ),
-                'proc' => array(
-                    'param_list' => $blob_sql_highlighting_data,
-                    'returns' => $blob_sql_highlighting_data,
-                    'body' => $blob_sql_highlighting_data,
-                    'body_utf8' => $blob_sql_highlighting_data
-                ),
-                'slow_log' => array(
-                    'sql_text' => $sql_highlighting_data
-                )
-            )
-        );
-
-        $cfgRelation = PMA_getRelationsParam();
-        if ($cfgRelation['db']) {
-            $this->transformation_info[$cfgRelation['db']] = array();
-            $relDb = &$this->transformation_info[$cfgRelation['db']];
-            if (! empty($cfgRelation['history'])) {
-                $relDb[$cfgRelation['history']] = array(
-                    'sqlquery' => $sql_highlighting_data
-                );
-            }
-            if (! empty($cfgRelation['bookmark'])) {
-                $relDb[$cfgRelation['bookmark']] = array(
-                    'query' => $sql_highlighting_data
-                );
-            }
-            if (! empty($cfgRelation['tracking'])) {
-                $relDb[$cfgRelation['tracking']] = array(
-                    'schema_sql' => $sql_highlighting_data,
-                    'data_sql' => $sql_highlighting_data
-                );
-            }
-            if (! empty($cfgRelation['favorite'])) {
-                $relDb[$cfgRelation['favorite']] = array(
-                    'tables' => $json_highlighting_data
-                );
-            }
-            if (! empty($cfgRelation['recent'])) {
-                $relDb[$cfgRelation['recent']] = array(
-                    'tables' => $json_highlighting_data
-                );
-            }
-            if (! empty($cfgRelation['savedsearches'])) {
-                $relDb[$cfgRelation['savedsearches']] = array(
-                    'search_data' => $json_highlighting_data
-                );
-            }
-            if (! empty($cfgRelation['designer_settings'])) {
-                $relDb[$cfgRelation['designer_settings']] = array(
-                    'settings_data' => $json_highlighting_data
-                );
-            }
-            if (! empty($cfgRelation['table_uiprefs'])) {
-                $relDb[$cfgRelation['table_uiprefs']] = array(
-                    'prefs' => $json_highlighting_data
-                );
-            }
-            if (! empty($cfgRelation['userconfig'])) {
-                $relDb[$cfgRelation['userconfig']] = array(
-                    'config_data' => $json_highlighting_data
-                );
-            }
-            if (! empty($cfgRelation['export_templates'])) {
-                $relDb[$cfgRelation['export_templates']] = array(
-                    'template_data' => $json_highlighting_data
-                );
-            }
-        }
-    }
-
-    /**
-     * Set properties which were not initialized at the constructor
-     *
-     * @param integer $unlim_num_rows the total number of rows returned by
-     *                                     the SQL query without any appended
-     *                                     "LIMIT" clause programmatically
-     * @param array   $fields_meta    meta information about fields
-     * @param boolean $is_count       statement is SELECT COUNT
-     * @param integer $is_export      statement contains INTO OUTFILE
-     * @param boolean $is_func        statement contains a function like SUM()
-     * @param integer $is_analyse     statement contains PROCEDURE ANALYSE
-     * @param integer $num_rows       total no. of rows returned by SQL query
-     * @param integer $fields_cnt     total no.of fields returned by SQL query
-     * @param double  $querytime      time taken for execute the SQL query
-     * @param string  $pmaThemeImage  path for theme images directory
-     * @param string  $text_dir       text direction
-     * @param boolean $is_maint       statement contains a maintenance command
-     * @param boolean $is_explain     statement contains EXPLAIN
-     * @param boolean $is_show        statement contains SHOW
-     * @param array   $showtable      table definitions
-     * @param string  $printview      print view was requested
-     * @param string  $url_query      URL query
-     * @param boolean $editable       whether the results set is editable
-     * @param boolean $is_browse_dist whether browsing distinct values
-     *
-     * @return void
-     *
-     * @see     sql.php
-     */
-    public function setProperties(
-        $unlim_num_rows, $fields_meta, $is_count, $is_export, $is_func,
-        $is_analyse, $num_rows, $fields_cnt, $querytime, $pmaThemeImage, $text_dir,
-        $is_maint, $is_explain, $is_show, $showtable, $printview, $url_query,
-        $editable, $is_browse_dist
-    ) {
-
-        $this->__set('unlim_num_rows', $unlim_num_rows);
-        $this->__set('fields_meta', $fields_meta);
-        $this->__set('is_count', $is_count);
-        $this->__set('is_export', $is_export);
-        $this->__set('is_func', $is_func);
-        $this->__set('is_analyse', $is_analyse);
-        $this->__set('num_rows', $num_rows);
-        $this->__set('fields_cnt', $fields_cnt);
-        $this->__set('querytime', $querytime);
-        $this->__set('pma_theme_image', $pmaThemeImage);
-        $this->__set('text_dir', $text_dir);
-        $this->__set('is_maint', $is_maint);
-        $this->__set('is_explain', $is_explain);
-        $this->__set('is_show', $is_show);
-        $this->__set('showtable', $showtable);
-        $this->__set('printview', $printview);
-        $this->__set('url_query', $url_query);
-        $this->__set('editable', $editable);
-        $this->__set('is_browse_distinct', $is_browse_dist);
-
-    } // end of the 'setProperties()' function
-
-
-    /**
-     * Defines the parts to display for a print view
-     *
-     * @param array $displayParts the parts to display
-     *
-     * @return array $displayParts the modified display parts
-     *
-     * @access  private
-     *
-     */
-    private function _setDisplayPartsForPrintView($displayParts)
-    {
-        // set all elements to false!
-        $displayParts['edit_lnk']  = self::NO_EDIT_OR_DELETE; // no edit link
-        $displayParts['del_lnk']   = self::NO_EDIT_OR_DELETE; // no delete link
-        $displayParts['sort_lnk']  = (string) '0';
-        $displayParts['nav_bar']   = (string) '0';
-        $displayParts['bkm_form']  = (string) '0';
-        $displayParts['text_btn']  = (string) '0';
-        $displayParts['pview_lnk'] = (string) '0';
-
-        return $displayParts;
-    }
-
-    /**
-     * Defines the parts to display for a SHOW statement
-     *
-     * @param array $displayParts the parts to display
-     *
-     * @return array $displayParts the modified display parts
-     *
-     * @access  private
-     *
-     */
-    private function _setDisplayPartsForShow($displayParts)
-    {
-        preg_match(
-            '@^SHOW[[:space:]]+(VARIABLES|(FULL[[:space:]]+)?'
-            . 'PROCESSLIST|STATUS|TABLE|GRANTS|CREATE|LOGS|DATABASES|FIELDS'
-            . ')@i',
-            $this->__get('sql_query'), $which
-        );
-
-        $bIsProcessList = isset($which[1]);
-        if ($bIsProcessList) {
-            $str = ' ' . strtoupper($which[1]);
-            $bIsProcessList = $bIsProcessList
-                && strpos($str, 'PROCESSLIST') > 0;
-        }
-
-        if ($bIsProcessList) {
-            // no edit link
-            $displayParts['edit_lnk'] = self::NO_EDIT_OR_DELETE;
-            // "kill process" type edit link
-            $displayParts['del_lnk']  = self::KILL_PROCESS;
-        } else {
-            // Default case -> no links
-            // no edit link
-            $displayParts['edit_lnk'] = self::NO_EDIT_OR_DELETE;
-            // no delete link
-            $displayParts['del_lnk']  = self::NO_EDIT_OR_DELETE;
-        }
-        // Other settings
-        $displayParts['sort_lnk']  = (string) '0';
-        $displayParts['nav_bar']   = (string) '0';
-        $displayParts['bkm_form']  = (string) '1';
-        $displayParts['text_btn']  = (string) '1';
-        $displayParts['pview_lnk'] = (string) '1';
-
-        return $displayParts;
-    }
-
-    /**
-     * Defines the parts to display for statements not related to data
-     *
-     * @param array $displayParts the parts to display
-     *
-     * @return array $displayParts the modified display parts
-     *
-     * @access  private
-     *
-     */
-    private function _setDisplayPartsForNonData($displayParts)
-    {
-        // Statement is a "SELECT COUNT", a
-        // "CHECK/ANALYZE/REPAIR/OPTIMIZE/CHECKSUM", an "EXPLAIN" one or
-        // contains a "PROC ANALYSE" part
-        $displayParts['edit_lnk']  = self::NO_EDIT_OR_DELETE; // no edit link
-        $displayParts['del_lnk']   = self::NO_EDIT_OR_DELETE; // no delete link
-        $displayParts['sort_lnk']  = (string) '0';
-        $displayParts['nav_bar']   = (string) '0';
-        $displayParts['bkm_form']  = (string) '1';
-
-        if ($this->__get('is_maint')) {
-            $displayParts['text_btn']  = (string) '1';
-        } else {
-            $displayParts['text_btn']  = (string) '0';
-        }
-        $displayParts['pview_lnk'] = (string) '1';
-
-        return $displayParts;
-    }
-
-    /**
-     * Defines the parts to display for other statements (probably SELECT)
-     *
-     * @param array $displayParts the parts to display
-     *
-     * @return array $displayParts the modified display parts
-     *
-     * @access  private
-     *
-     */
-    private function _setDisplayPartsForSelect($displayParts)
-    {
-        // Other statements (ie "SELECT" ones) -> updates
-        // $displayParts['edit_lnk'], $displayParts['del_lnk'] and
-        // $displayParts['text_btn'] (keeps other default values)
-
-        $fields_meta = $this->__get('fields_meta');
-        $prev_table = '';
-        $displayParts['text_btn']  = (string) '1';
-        $number_of_columns = $this->__get('fields_cnt');
-
-        for ($i = 0; $i < $number_of_columns; $i++) {
-
-            $is_link = ($displayParts['edit_lnk'] != self::NO_EDIT_OR_DELETE)
-                || ($displayParts['del_lnk'] != self::NO_EDIT_OR_DELETE)
-                || ($displayParts['sort_lnk'] != '0');
-
-            // Displays edit/delete/sort/insert links?
-            if ($is_link
-                && $prev_table != ''
-                && $fields_meta[$i]->table != ''
-                && $fields_meta[$i]->table != $prev_table
-            ) {
-                // don't display links
-                $displayParts['edit_lnk'] = self::NO_EDIT_OR_DELETE;
-                $displayParts['del_lnk']  = self::NO_EDIT_OR_DELETE;
-                /**
-                 * @todo May be problematic with same field names
-                 * in two joined table.
-                 */
-                // $displayParts['sort_lnk'] = (string) '0';
-                if ($displayParts['text_btn'] == '1') {
-                    break;
-                }
-            } // end if
-
-            // Always display print view link
-            $displayParts['pview_lnk'] = (string) '1';
-            if ($fields_meta[$i]->table != '') {
-                $prev_table = $fields_meta[$i]->table;
-            }
-        } // end for
-
-        if ($prev_table == '') { // no table for any of the columns
-            // don't display links
-            $displayParts['edit_lnk'] = self::NO_EDIT_OR_DELETE;
-            $displayParts['del_lnk']  = self::NO_EDIT_OR_DELETE;
-        }
-
-        return $displayParts;
-    }
-
-    /**
-     * Defines the parts to display for the results of a SQL query
-     * and the total number of rows
-     *
-     * @param array $displayParts the parts to display (see a few
-     *                            lines above for explanations)
-     *
-     * @return array the first element is an array with explicit indexes
-     *               for all the display elements
-     *               the second element is the total number of rows returned
-     *               by the SQL query without any programmatically appended
-     *               LIMIT clause (just a copy of $unlim_num_rows if it exists,
-     *               else computed inside this function)
-     *
-     *
-     * @access  private
-     *
-     * @see     getTable()
-     */
-    private function _setDisplayPartsAndTotal($displayParts)
-    {
-        $the_total = 0;
-
-        // 1. Following variables are needed for use in isset/empty or
-        //    use with array indexes or safe use in foreach
-        $db = $this->__get('db');
-        $table = $this->__get('table');
-        $unlim_num_rows = $this->__get('unlim_num_rows');
-        $num_rows = $this->__get('num_rows');
-        $printview = $this->__get('printview');
-
-        // 2. Updates the display parts
-        if ($printview == '1') {
-            $displayParts = $this->_setDisplayPartsForPrintView($displayParts);
-
-        } elseif ($this->__get('is_count') || $this->__get('is_analyse')
-            || $this->__get('is_maint') || $this->__get('is_explain')
-        ) {
-            $displayParts = $this->_setDisplayPartsForNonData($displayParts);
-
-        } elseif ($this->__get('is_show')) {
-            $displayParts = $this->_setDisplayPartsForShow($displayParts);
-
-        } else {
-            $displayParts = $this->_setDisplayPartsForSelect($displayParts);
-        } // end if..elseif...else
-
-        // 3. Gets the total number of rows if it is unknown
-        if (isset($unlim_num_rows) && $unlim_num_rows != '') {
-            $the_total = $unlim_num_rows;
-        } elseif ((($displayParts['nav_bar'] == '1')
-            || ($displayParts['sort_lnk'] == '1'))
-            && (mb_strlen($db) && !empty($table))
-        ) {
-            $the_total = $GLOBALS['dbi']->getTable($db, $table)->countRecords();
-        }
-
-        // if for COUNT query, number of rows returned more than 1
-        // (may be being used GROUP BY)
-        if ($this->__get('is_count') && isset($num_rows) && $num_rows > 1) {
-            $displayParts['nav_bar']   = (string) '1';
-            $displayParts['sort_lnk']  = (string) '1';
-        }
-        // 4. If navigation bar or sorting fields names URLs should be
-        //    displayed but there is only one row, change these settings to
-        //    false
-        if ($displayParts['nav_bar'] == '1' || $displayParts['sort_lnk'] == '1') {
-
-            // - Do not display sort links if less than 2 rows.
-            // - For a VIEW we (probably) did not count the number of rows
-            //   so don't test this number here, it would remove the possibility
-            //   of sorting VIEW results.
-            $_table = new Table($table, $db);
-            if (isset($unlim_num_rows)
-                && ($unlim_num_rows < 2)
-                && ! $_table->isView()
-            ) {
-                $displayParts['sort_lnk'] = (string) '0';
-            }
-        } // end if (3)
-
-        return array($displayParts, $the_total);
-
-    } // end of the 'setDisplayPartsAndTotal()' function
-
-
-    /**
-     * Return true if we are executing a query in the form of
-     * "SELECT * FROM <a table> ..."
-     *
-     * @param array $analyzed_sql_results analyzed sql results
-     *
-     * @return boolean
-     *
-     * @access  private
-     *
-     * @see     _getTableHeaders(), _getColumnParams()
-     */
-    private function _isSelect($analyzed_sql_results)
-    {
-        return ! ($this->__get('is_count')
-                || $this->__get('is_export')
-                || $this->__get('is_func')
-                || $this->__get('is_analyse'))
-            && !empty($analyzed_sql_results['select_from'])
-            && !empty($analyzed_sql_results['statement']->from)
-            && (count($analyzed_sql_results['statement']->from) == 1)
-            && !empty($analyzed_sql_results['statement']->from[0]->table);
-    }
-
-
-    /**
-     * Get a navigation button
-     *
-     * @param string  $caption            iconic caption for button
-     * @param string  $title              text for button
-     * @param integer $pos                position for next query
-     * @param string  $html_sql_query     query ready for display
-     * @param boolean $back               whether 'begin' or 'previous'
-     * @param string  $onsubmit           optional onsubmit clause
-     * @param string  $input_for_real_end optional hidden field for special treatment
-     * @param string  $onclick            optional onclick clause
-     *
-     * @return string                     html content
-     *
-     * @access  private
-     *
-     * @see     _getMoveBackwardButtonsForTableNavigation(),
-     *          _getMoveForwardButtonsForTableNavigation()
-     */
-    private function _getTableNavigationButton(
-        $caption, $title, $pos, $html_sql_query, $back, $onsubmit = '',
-        $input_for_real_end = '', $onclick = ''
-    ) {
-
-        $caption_output = '';
-        if ($back) {
-            if (Util::showIcons('TableNavigationLinksMode')) {
-                $caption_output .= $caption;
-            }
-            if (Util::showText('TableNavigationLinksMode')) {
-                $caption_output .= '&nbsp;' . $title;
-            }
-        } else {
-            if (Util::showText('TableNavigationLinksMode')) {
-                $caption_output .= $title;
-            }
-            if (Util::showIcons('TableNavigationLinksMode')) {
-                $caption_output .= '&nbsp;' . $caption;
-            }
-        }
-        $title_output = ' title="' . $title . '"';
-
-        return '<td>'
-            . '<form action="sql.php" method="post" ' . $onsubmit . '>'
-            . PMA_URL_getHiddenInputs(
-                $this->__get('db'), $this->__get('table')
-            )
-            . '<input type="hidden" name="sql_query" value="'
-            . $html_sql_query . '" />'
-            . '<input type="hidden" name="pos" value="' . $pos . '" />'
-            . '<input type="hidden" name="is_browse_distinct" value="'
-            . $this->__get('is_browse_distinct') . '" />'
-            . '<input type="hidden" name="goto" value="' . $this->__get('goto')
-            . '" />'
-            . $input_for_real_end
-            . '<input type="submit" name="navig"'
-            . ' class="ajax" '
-            . 'value="' . $caption_output . '" ' . $title_output . $onclick . ' />'
-            . '</form>'
-            . '</td>';
-
-    } // end function _getTableNavigationButton()
-
-
-    /**
-     * Possibly return a page selector for table navigation
-     *
-     * @param string $table_navigation_html the current navigation HTML
-     *
-     * @return array ($table_navigation_html, $nbTotalPage)
-     *
-     * @access  private
-     *
-     */
-    private function _getHtmlPageSelector($table_navigation_html)
-    {
-        $pageNow = @floor(
-            $_SESSION['tmpval']['pos']
-            / $_SESSION['tmpval']['max_rows']
-        ) + 1;
-
-        $nbTotalPage = @ceil(
-            $this->__get('unlim_num_rows')
-            / $_SESSION['tmpval']['max_rows']
-        );
-
-        if ($nbTotalPage > 1) {
-            $table_navigation_html .= '<td>';
-            $_url_params = array(
-                'db'                 => $this->__get('db'),
-                'table'              => $this->__get('table'),
-                'sql_query'          => $this->__get('sql_query'),
-                'goto'               => $this->__get('goto'),
-                'is_browse_distinct' => $this->__get('is_browse_distinct'),
-            );
-
-            //<form> to keep the form alignment of button < and <<
-            // and also to know what to execute when the selector changes
-            $table_navigation_html .= '<form action="sql.php'
-                . PMA_URL_getCommon($_url_params)
-                . '" method="post">';
-
-            $table_navigation_html .= Util::pageselector(
-                'pos',
-                $_SESSION['tmpval']['max_rows'],
-                $pageNow, $nbTotalPage, 200, 5, 5, 20, 10
-            );
-
-            $table_navigation_html .= '</form>'
-                . '</td>';
-        }
-        return array($table_navigation_html, $nbTotalPage);
-    }
-
-    /**
-     * Get a navigation bar to browse among the results of a SQL query
-     *
-     * @param integer $pos_next         the offset for the "next" page
-     * @param integer $pos_prev         the offset for the "previous" page
-     * @param boolean $is_innodb        whether its InnoDB or not
-     * @param string  $sort_by_key_html the sort by key dialog
-     *
-     * @return string                            html content
-     *
-     * @access  private
-     *
-     * @see     _getTable()
-     */
-    private function _getTableNavigation(
-        $pos_next, $pos_prev, $is_innodb, $sort_by_key_html
-    ) {
-
-        $table_navigation_html = '';
-
-        // here, using htmlentities() would cause problems if the query
-        // contains accented characters
-        $html_sql_query = htmlspecialchars($this->__get('sql_query'));
-
-        // Navigation bar
-        $table_navigation_html
-            .= '<table class="navigation nospacing nopadding print_ignore">'
-            . '<tr>'
-            . '<td class="navigation_separator"></td>';
-
-        // Move to the beginning or to the previous page
-        if ($_SESSION['tmpval']['pos']
-            && ($_SESSION['tmpval']['max_rows'] != self::ALL_ROWS)
-        ) {
-
-            $table_navigation_html
-                .= $this->_getMoveBackwardButtonsForTableNavigation(
-                    $html_sql_query, $pos_prev
-                );
-
-        } // end move back
-
-        $nbTotalPage = 1;
-        //page redirection
-        // (unless we are showing all records)
-        if ($_SESSION['tmpval']['max_rows'] != self::ALL_ROWS) {
-            list(
-                $table_navigation_html,
-                $nbTotalPage
-            ) = $this->_getHtmlPageSelector($table_navigation_html);
-        }
-
-        $showing_all = false;
-        if ($_SESSION['tmpval']['max_rows'] == self::ALL_ROWS) {
-            $showing_all = true;
-        }
-
-        // Move to the next page or to the last one
-        $endpos = $_SESSION['tmpval']['pos']
-            + $_SESSION['tmpval']['max_rows'];
-
-        if ($this->__get('unlim_num_rows') === false // view with unknown number of rows
-            || ($endpos < $this->__get('unlim_num_rows')
-            && $this->__get('num_rows') >= $_SESSION['tmpval']['max_rows']
-            && $_SESSION['tmpval']['max_rows'] != self::ALL_ROWS)
-        ) {
-
-            $table_navigation_html
-                .= $this->_getMoveForwardButtonsForTableNavigation(
-                    $html_sql_query, $pos_next, $is_innodb
-                );
-
-        } // end move toward
-
-        // show separator if pagination happen
-        if ($nbTotalPage > 1) {
-            $table_navigation_html
-                .= '<td><div class="navigation_separator">|</div></td>';
-        }
-
-        // Display the "Show all" button if allowed
-        if ($GLOBALS['cfg']['ShowAll'] || ($this->__get('unlim_num_rows') <= 500) ) {
-
-            $table_navigation_html .= $this->_getShowAllCheckboxForTableNavigation(
-                $showing_all, $html_sql_query
-            );
-
-            $table_navigation_html
-                .= '<td><div class="navigation_separator">|</div></td>';
-
-        } // end show all
-
-        $table_navigation_html .= '<td>'
-            . '<div class="save_edited hide">'
-            . '<input type="submit" value="' . __('Save edited data') . '" />'
-            . '<div class="navigation_separator">|</div>'
-            . '</div>'
-            . '</td>'
-            . '<td>'
-            . '<div class="restore_column hide">'
-            . '<input type="submit" value="' . __('Restore column order') . '" />'
-            . '<div class="navigation_separator">|</div>'
-            . '</div>'
-            . '</td>';
-
-        // if displaying a VIEW, $unlim_num_rows could be zero because
-        // of $cfg['MaxExactCountViews']; in this case, avoid passing
-        // the 5th parameter to checkFormElementInRange()
-        // (this means we can't validate the upper limit
-        $table_navigation_html .= '<td class="navigation_goto">';
-
-        $table_navigation_html .= '<form action="sql.php" method="post" '
-            . 'onsubmit="return '
-                . '(checkFormElementInRange('
-                    . 'this, '
-                    . '\'session_max_rows\', '
-                    . '\''
-                    . str_replace('\'', '\\\'', __('%d is not valid row number.'))
-                    . '\', '
-                    . '1)'
-                . ' &amp;&amp; '
-                . 'checkFormElementInRange('
-                    . 'this, '
-                    . '\'pos\', '
-                    . '\''
-                    . str_replace('\'', '\\\'', __('%d is not valid row number.'))
-                    . '\', '
-                    . '0'
-                    . (($this->__get('unlim_num_rows') > 0)
-                        ? ', ' . ($this->__get('unlim_num_rows') - 1)
-                        : ''
-                    )
-                    . ')'
-                . ')'
-            . '">';
-
-        $table_navigation_html .= PMA_URL_getHiddenInputs(
-            $this->__get('db'), $this->__get('table')
-        );
-
-        $table_navigation_html .= $this->_getAdditionalFieldsForTableNavigation(
-            $html_sql_query
-        );
-
-        $table_navigation_html .= '</form>'
-            . '</td>'
-            . '<td class="navigation_separator"></td>'
-            . '<td>'
-            . '<span>' . __('Filter rows') . ':</span>'
-            . '<input type="text" class="filter_rows"'
-            . ' placeholder="' . __('Search this table') . '"'
-            . ' data-for="' . $this->__get('unique_id') . '" />'
-            . '</td>';
-
-        $table_navigation_html .= '<td>' . $sort_by_key_html . '</td>';
-
-        $table_navigation_html .= '<td class="navigation_separator"></td>'
-            . '</tr>'
-            . '</table>';
-
-        return $table_navigation_html;
-
-    } // end of the '_getTableNavigation()' function
-
-
-    /**
-     * Prepare move backward buttons - previous and first
-     *
-     * @param string  $html_sql_query the sql encoded by html special characters
-     * @param integer $pos_prev       the offset for the "previous" page
-     *
-     * @return  string                  html content
-     *
-     * @access  private
-     *
-     * @see     _getTableNavigation()
-     */
-    private function _getMoveBackwardButtonsForTableNavigation(
-        $html_sql_query, $pos_prev
-    ) {
-        return $this->_getTableNavigationButton(
-            '&lt;&lt;', _pgettext('First page', 'Begin'), 0, $html_sql_query, true
-        )
-        . $this->_getTableNavigationButton(
-            '&lt;', _pgettext('Previous page', 'Previous'), $pos_prev,
-            $html_sql_query, true
-        );
-    } // end of the '_getMoveBackwardButtonsForTableNavigation()' function
-
-
-    /**
-     * Prepare Show All checkbox for table navigation
-     *
-     * @param bool   $showing_all    whether all rows are shown currently
-     * @param string $html_sql_query the sql encoded by html special characters
-     *
-     * @return  string                          html content
-     *
-     * @access  private
-     *
-     * @see     _getTableNavigation()
-     */
-    private function _getShowAllCheckboxForTableNavigation(
-        $showing_all, $html_sql_query
-    ) {
-        return "\n"
-            . '<td>'
-            . '<form action="sql.php" method="post">'
-            . PMA_URL_getHiddenInputs(
-                $this->__get('db'), $this->__get('table')
-            )
-            . '<input type="hidden" name="sql_query" value="'
-            . $html_sql_query . '" />'
-            . '<input type="hidden" name="pos" value="0" />'
-            . '<input type="hidden" name="is_browse_distinct" value="'
-            . $this->__get('is_browse_distinct') . '" />'
-            . '<input type="hidden" name="session_max_rows" value="'
-            . (! $showing_all ? 'all' : intval($GLOBALS['cfg']['MaxRows'])) . '" />'
-            . '<input type="hidden" name="goto" value="' . $this->__get('goto')
-            . '" />'
-            . '<input type="checkbox" name="navig"'
-            . ' id="showAll_' . $this->__get('unique_id') . '" class="showAllRows"'
-            . (! $showing_all ? '' : ' checked="checked"') . ' value="all" />'
-            . '<label for="showAll_' . $this->__get('unique_id') . '">'
-            . __('Show all') . '</label>'
-            . '</form>'
-            . '</td>';
-    } // end of the '_getShowAllButtonForTableNavigation()' function
-
-
-    /**
-     * Prepare move forward buttons - next and last
-     *
-     * @param string  $html_sql_query the sql encoded by htmlspecialchars()
-     * @param integer $pos_next       the offset for the "next" page
-     * @param boolean $is_innodb      whether it's InnoDB or not
-     *
-     * @return  string  $buttons_html   html content
-     *
-     * @access  private
-     *
-     * @see     _getTableNavigation()
-     */
-    private function _getMoveForwardButtonsForTableNavigation(
-        $html_sql_query, $pos_next, $is_innodb
-    ) {
-
-        // display the Next button
-        $buttons_html = $this->_getTableNavigationButton(
-            '&gt;',
-            _pgettext('Next page', 'Next'),
-            $pos_next,
-            $html_sql_query,
-            false
-        );
-
-        // prepare some options for the End button
-        if ($is_innodb
-            && $this->__get('unlim_num_rows') > $GLOBALS['cfg']['MaxExactCount']
-        ) {
-            $input_for_real_end = '<input id="real_end_input" type="hidden" '
-                . 'name="find_real_end" value="1" />';
-            // no backquote around this message
-            $onclick = '';
-        } else {
-            $input_for_real_end = $onclick = '';
-        }
-
-        $maxRows = $_SESSION['tmpval']['max_rows'];
-        $onsubmit = 'onsubmit="return '
-            . (($_SESSION['tmpval']['pos']
-                + $maxRows
-                < $this->__get('unlim_num_rows')
-                && $this->__get('num_rows') >= $maxRows)
-            ? 'true'
-            : 'false') . '"';
-
-        // display the End button
-        $buttons_html .= $this->_getTableNavigationButton(
-            '&gt;&gt;',
-            _pgettext('Last page', 'End'),
-            @((ceil(
-                $this->__get('unlim_num_rows')
-                / $_SESSION['tmpval']['max_rows']
-            )- 1) * $maxRows),
-            $html_sql_query, false, $onsubmit, $input_for_real_end, $onclick
-        );
-
-        return $buttons_html;
-
-    } // end of the '_getMoveForwardButtonsForTableNavigation()' function
-
-
-    /**
-     * Prepare fields for table navigation
-     * Number of rows
-     *
-     * @param string $html_sql_query the sql encoded by htmlspecialchars()
-     *
-     * @return  string  $additional_fields_html html content
-     *
-     * @access  private
-     *
-     * @see     _getTableNavigation()
-     */
-    private function _getAdditionalFieldsForTableNavigation(
-        $html_sql_query
-    ) {
-
-        $additional_fields_html = '';
-
-        $additional_fields_html .= '<input type="hidden" name="sql_query" '
-            . 'value="' . $html_sql_query . '" />'
-            . '<input type="hidden" name="goto" value="' . $this->__get('goto')
-            . '" />'
-            . '<input type="hidden" name="pos" size="3" value="'
-            // Do not change the position when changing the number of rows
-            . $_SESSION['tmpval']['pos'] . '" />'
-            . '<input type="hidden" name="is_browse_distinct" value="'
-            . $this->__get('is_browse_distinct') . '" />'  ;
-
-        $numberOfRowsPlaceholder = null;
-        if ($_SESSION['tmpval']['max_rows'] == self::ALL_ROWS) {
-            $numberOfRowsPlaceholder = __('All');
-        }
-
-        $numberOfRowsChoices = array(
-            '25'  => 25,
-            '50'  => 50,
-            '100' => 100,
-            '250' => 250,
-            '500' => 500
-        );
-        $additional_fields_html .= __('Number of rows:') . ' ';
-        $additional_fields_html .= Util::getDropdown(
-            'session_max_rows', $numberOfRowsChoices,
-            $_SESSION['tmpval']['max_rows'], '',
-            'autosubmit', $numberOfRowsPlaceholder
-        );
-
-        return $additional_fields_html;
-
-    } // end of the '_getAdditionalFieldsForTableNavigation()' function
-
-
-    /**
-     * Get the headers of the results table, for all of the columns
-     *
-     * @param array   $displayParts                which elements to display
-     * @param array   $analyzed_sql_results        analyzed sql results
-     * @param array   $sort_expression             sort expression
-     * @param string  $sort_expression_nodirection sort expression
-     *                                             without direction
-     * @param string  $sort_direction              sort direction
-     * @param boolean $is_limited_display          with limited operations
-     *                                             or not
-     * @param string  $unsorted_sql_query          query without the sort part
-     *
-     * @return string html content
-     *
-     * @access private
-     *
-     * @see    getTableHeaders()
-     */
-    private function _getTableHeadersForColumns(
-        $displayParts, $analyzed_sql_results, $sort_expression,
-        $sort_expression_nodirection, $sort_direction, $is_limited_display,
-        $unsorted_sql_query
-    ) {
-        $html = '';
-
-        // required to generate sort links that will remember whether the
-        // "Show all" button has been clicked
-        $sql_md5 = md5($this->__get('sql_query'));
-        $session_max_rows = $is_limited_display
-            ? 0
-            : $_SESSION['tmpval']['query'][$sql_md5]['max_rows'];
-
-        // Following variable are needed for use in isset/empty or
-        // use with array indexes/safe use in the for loop
-        $highlight_columns = $this->__get('highlight_columns');
-        $fields_meta = $this->__get('fields_meta');
-
-        // Prepare Display column comments if enabled
-        // ($GLOBALS['cfg']['ShowBrowseComments']).
-        $comments_map = $this->_getTableCommentsArray($analyzed_sql_results);
-
-        list($col_order, $col_visib) = $this->_getColumnParams(
-            $analyzed_sql_results
-        );
-
-        // optimize: avoid calling a method on each iteration
-        $number_of_columns = $this->__get('fields_cnt');
-
-        for ($j = 0; $j < $number_of_columns; $j++) {
-
-            // assign $i with the appropriate column order
-            $i = $col_order ? $col_order[$j] : $j;
-
-            //  See if this column should get highlight because it's used in the
-            //  where-query.
-            $name = $fields_meta[$i]->name;
-            $condition_field = (isset($highlight_columns[$name])
-                || isset($highlight_columns[Util::backquote($name)]))
-                ? true
-                : false;
-
-            // Prepare comment-HTML-wrappers for each row, if defined/enabled.
-            $comments = $this->_getCommentForRow($comments_map, $fields_meta[$i]);
-            $display_params = $this->__get('display_params');
-
-            if (($displayParts['sort_lnk'] == '1') && ! $is_limited_display) {
-
-                list($order_link, $sorted_header_html)
-                    = $this->_getOrderLinkAndSortedHeaderHtml(
-                        $fields_meta[$i], $sort_expression,
-                        $sort_expression_nodirection, $i, $unsorted_sql_query,
-                        $session_max_rows, $comments,
-                        $sort_direction, $col_visib,
-                        $col_visib[$j]
-                    );
-
-                $html .= $sorted_header_html;
-
-                $display_params['desc'][] = '    <th '
-                    . 'class="draggable'
-                    . ($condition_field ? ' condition' : '')
-                    . '" data-column="' . htmlspecialchars($fields_meta[$i]->name)
-                    . '">' . "\n" . $order_link . $comments . '    </th>' . "\n";
-            } else {
-                // Results can't be sorted
-                $html
-                    .= $this->_getDraggableClassForNonSortableColumns(
-                        $col_visib, $col_visib[$j], $condition_field,
-                        $fields_meta[$i], $comments
-                    );
-
-                $display_params['desc'][] = '    <th '
-                    . 'class="draggable'
-                    . ($condition_field ? ' condition"' : '')
-                    . '" data-column="' . htmlspecialchars($fields_meta[$i]->name)
-                    . '">' . '        '
-                    . htmlspecialchars($fields_meta[$i]->name)
-                    . $comments . '    </th>';
-            } // end else
-
-            $this->__set('display_params', $display_params);
-
-        } // end for
-        return $html;
-    }
-
-    /**
-     * Get the headers of the results table
-     *
-     * @param array   &$displayParts               which elements to display
-     * @param array   $analyzed_sql_results        analyzed sql results
-     * @param string  $unsorted_sql_query          the unsorted sql query
-     * @param array   $sort_expression             sort expression
-     * @param string  $sort_expression_nodirection sort expression
-     *                                             without direction
-     * @param string  $sort_direction              sort direction
-     * @param boolean $is_limited_display          with limited operations
-     *                                             or not
-     *
-     * @return string html content
-     *
-     * @access private
-     *
-     * @see    getTable()
-     */
-    private function _getTableHeaders(
-        &$displayParts, $analyzed_sql_results, $unsorted_sql_query,
-        $sort_expression = array(), $sort_expression_nodirection = '',
-        $sort_direction = '', $is_limited_display = false
-    ) {
-
-        $table_headers_html = '';
-        // Needed for use in isset/empty or
-        // use with array indexes/safe use in foreach
-        $printview = $this->__get('printview');
-        $display_params = $this->__get('display_params');
-
-        // Output data needed for grid editing
-        $table_headers_html .= '<input class="save_cells_at_once" type="hidden"'
-            . ' value="' . $GLOBALS['cfg']['SaveCellsAtOnce'] . '" />'
-            . '<div class="common_hidden_inputs">'
-            . PMA_URL_getHiddenInputs(
-                $this->__get('db'), $this->__get('table')
-            )
-            . '</div>';
-
-        // Output data needed for column reordering and show/hide column
-        if ($this->_isSelect($analyzed_sql_results)) {
-            $table_headers_html .= $this->_getDataForResettingColumnOrder();
-        }
-
-        $display_params['emptypre']   = 0;
-        $display_params['emptyafter'] = 0;
-        $display_params['textbtn']    = '';
-        $full_or_partial_text_link = null;
-
-        $this->__set('display_params', $display_params);
-
-        // Display options (if we are not in print view)
-        if (! (isset($printview) && ($printview == '1')) && ! $is_limited_display) {
-
-            $table_headers_html .= $this->_getOptionsBlock();
-
-            // prepare full/partial text button or link
-            $full_or_partial_text_link = $this->_getFullOrPartialTextButtonOrLink();
-        }
-
-        // Start of form for multi-rows edit/delete/export
-        $table_headers_html .= $this->_getFormForMultiRowOperations(
-            $displayParts['del_lnk']
-        );
-
-        // 1. Set $colspan and generate html with full/partial
-        // text button or link
-        list($colspan, $button_html)
-            = $this->_getFieldVisibilityParams(
-                $displayParts, $full_or_partial_text_link
-            );
-
-        $table_headers_html .= $button_html;
-
-        // 2. Displays the fields' name
-        // 2.0 If sorting links should be used, checks if the query is a "JOIN"
-        //     statement (see 2.1.3)
-
-        // See if we have to highlight any header fields of a WHERE query.
-        // Uses SQL-Parser results.
-        $this->_setHighlightedColumnGlobalField($analyzed_sql_results);
-
-        // Get the headers for all of the columns
-        $table_headers_html .= $this->_getTableHeadersForColumns(
-            $displayParts, $analyzed_sql_results, $sort_expression,
-            $sort_expression_nodirection, $sort_direction,
-            $is_limited_display, $unsorted_sql_query
-        );
-
-        // Display column at rightside - checkboxes or empty column
-        if (! $printview) {
-            $table_headers_html .= $this->_getColumnAtRightSide(
-                $displayParts, $full_or_partial_text_link, $colspan
-            );
-        }
-        $table_headers_html .= '</tr>' . '</thead>';
-
-        return $table_headers_html;
-
-    } // end of the '_getTableHeaders()' function
-
-
-    /**
-     * Prepare unsorted sql query and sort by key drop down
-     *
-     * @param array  $analyzed_sql_results analyzed sql results
-     * @param string $sort_expression      sort expression
-     *
-     * @return  array   two element array - $unsorted_sql_query, $drop_down_html
-     *
-     * @access  private
-     *
-     * @see     _getTableHeaders()
-     */
-    private function _getUnsortedSqlAndSortByKeyDropDown(
-        $analyzed_sql_results, $sort_expression
-    ) {
-        $drop_down_html = '';
-
-        $unsorted_sql_query = Query::replaceClause(
-            $analyzed_sql_results['statement'],
-            $analyzed_sql_results['parser']->list,
-            'ORDER BY',
-            ''
-        );
-
-        // Data is sorted by indexes only if it there is only one table.
-        if ($this->_isSelect($analyzed_sql_results)) {
-            // grab indexes data:
-            $indexes = Index::getFromTable(
-                $this->__get('table'),
-                $this->__get('db')
-            );
-
-            // do we have any index?
-            if (! empty($indexes)) {
-                $drop_down_html = $this->_getSortByKeyDropDown(
-                    $indexes, $sort_expression,
-                    $unsorted_sql_query
-                );
-            }
-        }
-
-        return array($unsorted_sql_query, $drop_down_html);
-
-    } // end of the '_getUnsortedSqlAndSortByKeyDropDown()' function
-
-    /**
-     * Prepare sort by key dropdown - html code segment
-     *
-     * @param Index[] $indexes            the indexes of the table for sort criteria
-     * @param string  $sort_expression    the sort expression
-     * @param string  $unsorted_sql_query the unsorted sql query
-     *
-     * @return  string  $drop_down_html         html content
-     *
-     * @access  private
-     *
-     * @see     _getTableHeaders()
-     */
-    private function _getSortByKeyDropDown(
-        $indexes, $sort_expression, $unsorted_sql_query
-    ) {
-
-        $drop_down_html = '';
-
-        $drop_down_html .= '<form action="sql.php" method="post" ' .
-            'class="print_ignore">' . "\n"
-            . PMA_URL_getHiddenInputs(
-                $this->__get('db'), $this->__get('table')
-            )
-            // to avoid calling PMA_handleSortOrder() later
-            . PMA_getHiddenFields(array('sort_by_key' => '1'))
-            . __('Sort by key')
-            . ': <select name="sql_query" class="autosubmit">' . "\n";
-
-        $used_index = false;
-        $local_order = (isset($sort_expression) ? $sort_expression : '');
-
-        foreach ($indexes as $index) {
-
-            $asc_sort = '`'
-                . implode('` ASC, `', array_keys($index->getColumns()))
-                . '` ASC';
-
-            $desc_sort = '`'
-                . implode('` DESC, `', array_keys($index->getColumns()))
-                . '` DESC';
-
-            $used_index = $used_index
-                || ($local_order == $asc_sort)
-                || ($local_order == $desc_sort);
-
-            if (preg_match(
-                '@(.*)([[:space:]](LIMIT (.*)|PROCEDURE (.*)|'
-                . 'FOR UPDATE|LOCK IN SHARE MODE))@is',
-                $unsorted_sql_query, $my_reg
-            )) {
-                $unsorted_sql_query_first_part = $my_reg[1];
-                $unsorted_sql_query_second_part = $my_reg[2];
-            } else {
-                $unsorted_sql_query_first_part = $unsorted_sql_query;
-                $unsorted_sql_query_second_part = '';
-            }
-
-            $drop_down_html .= '<option value="'
-                . htmlspecialchars(
-                    $unsorted_sql_query_first_part  . "\n"
-                    . ' ORDER BY ' . $asc_sort
-                    . $unsorted_sql_query_second_part
-                )
-                . '"' . ($local_order == $asc_sort
-                    ? ' selected="selected"'
-                    : '')
-                . '>' . htmlspecialchars($index->getName()) . ' (ASC)</option>';
-
-            $drop_down_html .= '<option value="'
-                . htmlspecialchars(
-                    $unsorted_sql_query_first_part . "\n"
-                    . ' ORDER BY ' . $desc_sort
-                    . $unsorted_sql_query_second_part
-                )
-                . '"' . ($local_order == $desc_sort
-                    ? ' selected="selected"'
-                    : '')
-                . '>' . htmlspecialchars($index->getName()) . ' (DESC)</option>';
-        }
-
-        $drop_down_html .= '<option value="' . htmlspecialchars($unsorted_sql_query)
-            . '"' . ($used_index ? '' : ' selected="selected"') . '>' . __('None')
-            . '</option>'
-            . '</select>' . "\n"
-            . '</form>' . "\n";
-
-        return $drop_down_html;
-
-    } // end of the '_getSortByKeyDropDown()' function
-
-
-    /**
-     * Set column span, row span and prepare html with full/partial
-     * text button or link
-     *
-     * @param array  &$displayParts             which elements to display
-     * @param string $full_or_partial_text_link full/partial link or text button
-     *
-     * @return  array   2 element array - $colspan, $button_html
-     *
-     * @access  private
-     *
-     * @see     _getTableHeaders()
-     */
-    private function _getFieldVisibilityParams(
-        &$displayParts, $full_or_partial_text_link
-    ) {
-
-        $button_html = '';
-        $display_params = $this->__get('display_params');
-
-        // 1. Displays the full/partial text button (part 1)...
-        $button_html .= '<thead><tr>' . "\n";
-
-        $colspan = (($displayParts['edit_lnk'] != self::NO_EDIT_OR_DELETE)
-            && ($displayParts['del_lnk'] != self::NO_EDIT_OR_DELETE))
-            ? ' colspan="4"'
-            : '';
-
-        //     ... before the result table
-        if ((($displayParts['edit_lnk'] == self::NO_EDIT_OR_DELETE)
-            && ($displayParts['del_lnk'] == self::NO_EDIT_OR_DELETE))
-            && ($displayParts['text_btn'] == '1')
-        ) {
-
-            $display_params['emptypre']
-                = (($displayParts['edit_lnk'] != self::NO_EDIT_OR_DELETE)
-                && ($displayParts['del_lnk'] != self::NO_EDIT_OR_DELETE)) ? 4 : 0;
-
-        } elseif ((($GLOBALS['cfg']['RowActionLinks'] == self::POSITION_LEFT)
-            || ($GLOBALS['cfg']['RowActionLinks'] == self::POSITION_BOTH))
-            && ($displayParts['text_btn'] == '1')
-        ) {
-            //     ... at the left column of the result table header if possible
-            //     and required
-
-            $display_params['emptypre']
-                = (($displayParts['edit_lnk'] != self::NO_EDIT_OR_DELETE)
-                && ($displayParts['del_lnk'] != self::NO_EDIT_OR_DELETE)) ? 4 : 0;
-
-            $button_html .= '<th class="column_action print_ignore" ' . $colspan
-                . '>' . $full_or_partial_text_link . '</th>';
-
-        } elseif ((($GLOBALS['cfg']['RowActionLinks'] == self::POSITION_LEFT)
-            || ($GLOBALS['cfg']['RowActionLinks'] == self::POSITION_BOTH))
-            && (($displayParts['edit_lnk'] != self::NO_EDIT_OR_DELETE)
-            || ($displayParts['del_lnk'] != self::NO_EDIT_OR_DELETE))
-        ) {
-            //     ... elseif no button, displays empty(ies) col(s) if required
-
-            $display_params['emptypre']
-                = (($displayParts['edit_lnk'] != self::NO_EDIT_OR_DELETE)
-                && ($displayParts['del_lnk'] != self::NO_EDIT_OR_DELETE)) ? 4 : 0;
-
-            $button_html .= '<td ' . $colspan . '></td>';
-
-        } elseif (($GLOBALS['cfg']['RowActionLinks'] == self::POSITION_NONE)) {
-            // ... elseif display an empty column if the actions links are
-            //  disabled to match the rest of the table
-            $button_html .= '<th class="column_action"></th>';
-        }
-
-        $this->__set('display_params', $display_params);
-
-        return array($colspan, $button_html);
-
-    } // end of the '_getFieldVisibilityParams()' function
-
-
-    /**
-     * Get table comments as array
-     *
-     * @param array $analyzed_sql_results analyzed sql results
-     *
-     * @return array $comments_map table comments
-     *
-     * @access  private
-     *
-     * @see     _getTableHeaders()
-     */
-    private function _getTableCommentsArray($analyzed_sql_results)
-    {
-        if ((!$GLOBALS['cfg']['ShowBrowseComments'])
-            || (empty($analyzed_sql_results['statement']->from))
-        ) {
-            return array();
-        }
-
-        $ret = array();
-        foreach ($analyzed_sql_results['statement']->from as $field) {
-            if (empty($field->table)) {
-                continue;
-            }
-            $ret[$field->table] = PMA_getComments(
-                empty($field->database) ? $this->__get('db') : $field->database,
-                $field->table
-            );
-        }
-
-        return $ret;
-
-    } // end of the '_getTableCommentsArray()' function
-
-
-    /**
-     * Set global array for store highlighted header fields
-     *
-     * @param array $analyzed_sql_results analyzed sql results
-     *
-     * @return  void
-     *
-     * @access  private
-     *
-     * @see     _getTableHeaders()
-     */
-    private function _setHighlightedColumnGlobalField($analyzed_sql_results)
-    {
-        $highlight_columns = array();
-
-        if (!empty($analyzed_sql_results['statement']->where)) {
-            foreach ($analyzed_sql_results['statement']->where as $expr) {
-                foreach ($expr->identifiers as $identifier) {
-                    $highlight_columns[$identifier] = 'true';
-                }
-            }
-        }
-
-        $this->__set('highlight_columns', $highlight_columns);
-
-    } // end of the '_setHighlightedColumnGlobalField()' function
-
-
-    /**
-     * Prepare data for column restoring and show/hide
-     *
-     * @return  string  $data_html      html content
-     *
-     * @access  private
-     *
-     * @see     _getTableHeaders()
-     */
-    private function _getDataForResettingColumnOrder()
-    {
-
-        $data_html = '';
-
-        // generate the column order, if it is set
-        $pmatable = new Table($this->__get('table'), $this->__get('db'));
-        $col_order = $pmatable->getUiProp(Table::PROP_COLUMN_ORDER);
-
-        if ($col_order) {
-            $data_html .= '<input class="col_order" type="hidden" value="'
-                . implode(',', $col_order) . '" />';
-        }
-
-        $col_visib = $pmatable->getUiProp(Table::PROP_COLUMN_VISIB);
-
-        if ($col_visib) {
-            $data_html .= '<input class="col_visib" type="hidden" value="'
-                . implode(',', $col_visib) . '" />';
-        }
-
-        // generate table create time
-        $table = new Table($this->__get('table'), $this->__get('db'));
-        if (! $table->isView()) {
-            $data_html .= '<input class="table_create_time" type="hidden" value="'
-                . $GLOBALS['dbi']->getTable(
-                    $this->__get('db'), $this->__get('table')
-                )->getStatusInfo('Create_time')
-                . '" />';
-        }
-
-        return $data_html;
-
-    } // end of the '_getDataForResettingColumnOrder()' function
-
-
-    /**
-     * Prepare option fields block
-     *
-     * @return  string  $options_html   html content
-     *
-     * @access  private
-     *
-     * @see     _getTableHeaders()
-     */
-    private function _getOptionsBlock()
-    {
-
-        $options_html = '';
-
-        $options_html .= '<form method="post" action="sql.php" '
-            . 'name="displayOptionsForm"';
-
-        $options_html .= ' class="ajax print_ignore" ';
-
-        $options_html .= '>';
-        $url_params = array(
-            'db' => $this->__get('db'),
-            'table' => $this->__get('table'),
-            'sql_query' => $this->__get('sql_query'),
-            'goto' => $this->__get('goto'),
-            'display_options_form' => 1
-        );
-
-        $options_html .= PMA_URL_getHiddenInputs($url_params)
-            . '<br />'
-            . Util::getDivForSliderEffect(
-                '', __('Options')
-            )
-            . '<fieldset>';
-
-        $options_html .= '<div class="formelement">';
-        $choices = array(
-            'P'   => __('Partial texts'),
-            'F'   => __('Full texts')
-        );
-
-        // pftext means "partial or full texts" (done to reduce line lengths)
-        $options_html .= Util::getRadioFields(
-            'pftext', $choices,
-            $_SESSION['tmpval']['pftext'],
-            true, true, '', 'pftext_' . $this->__get('unique_id')
-        )
-        . '</div>';
-
-        if ($GLOBALS['cfgRelation']['relwork']
-            && $GLOBALS['cfgRelation']['displaywork']
-        ) {
-            $options_html .= '<div class="formelement">';
-            $choices = array(
-                'K'   => __('Relational key'),
-                'D'   => __('Display column for relations')
-            );
-
-            $options_html .= Util::getRadioFields(
-                'relational_display', $choices,
-                $_SESSION['tmpval']['relational_display'],
-                true, true, '', 'relational_display_' . $this->__get('unique_id')
-            )
-            . '</div>';
-        }
-
-        $options_html .= '<div class="formelement">'
-            . Util::getCheckbox(
-                'display_binary', __('Show binary contents'),
-                ! empty($_SESSION['tmpval']['display_binary']), false,
-                'display_binary_' . $this->__get('unique_id')
-            )
-            . '<br />'
-            . Util::getCheckbox(
-                'display_blob', __('Show BLOB contents'),
-                ! empty($_SESSION['tmpval']['display_blob']), false,
-                'display_blob_' . $this->__get('unique_id')
-            )
-            . '</div>';
-
-        // I would have preferred to name this "display_transformation".
-        // This is the only way I found to be able to keep this setting sticky
-        // per SQL query, and at the same time have a default that displays
-        // the transformations.
-        $options_html .= '<div class="formelement">'
-            . Util::getCheckbox(
-                'hide_transformation', __('Hide browser transformation'),
-                ! empty($_SESSION['tmpval']['hide_transformation']), false,
-                'hide_transformation_' . $this->__get('unique_id')
-            )
-            . '</div>';
-
-        $options_html .= '<div class="formelement">';
-        $choices = array(
-            'GEOM'  => __('Geometry'),
-            'WKT'   => __('Well Known Text'),
-            'WKB'   => __('Well Known Binary')
-        );
-
-        $options_html .= Util::getRadioFields(
-            'geoOption', $choices,
-            $_SESSION['tmpval']['geoOption'],
-            true, true, '', 'geoOption_' . $this->__get('unique_id')
-        );
-        $options_html .= '</div>';
-
-        $options_html .= '<div class="clearfloat"></div>'
-            . '</fieldset>';
-
-        $options_html .= '<fieldset class="tblFooters">'
-            . '<input type="submit" value="' . __('Go') . '" />'
-            . '</fieldset>'
-            . '</div>'
-            . '</form>';
-
-        return $options_html;
-
-    } // end of the '_getOptionsBlock()' function
-
-
-    /**
-     * Get full/partial text button or link
-     *
-     * @return string html content
-     *
-     * @access  private
-     *
-     * @see     _getTableHeaders()
-     */
-    private function _getFullOrPartialTextButtonOrLink()
-    {
-
-        $url_params_full_text = array(
-            'db' => $this->__get('db'),
-            'table' => $this->__get('table'),
-            'sql_query' => $this->__get('sql_query'),
-            'goto' => $this->__get('goto'),
-            'full_text_button' => 1
-        );
-
-        if ($_SESSION['tmpval']['pftext'] == self::DISPLAY_FULL_TEXT) {
-            // currently in fulltext mode so show the opposite link
-            $tmp_image_file = $this->__get('pma_theme_image') . 's_partialtext.png';
-            $tmp_txt = __('Partial texts');
-            $url_params_full_text['pftext'] = self::DISPLAY_PARTIAL_TEXT;
-        } else {
-            $tmp_image_file = $this->__get('pma_theme_image') . 's_fulltext.png';
-            $tmp_txt = __('Full texts');
-            $url_params_full_text['pftext'] = self::DISPLAY_FULL_TEXT;
-        }
-
-        $tmp_image = '<img class="fulltext" src="' . $tmp_image_file . '" alt="'
-                     . $tmp_txt . '" title="' . $tmp_txt . '" />';
-        $tmp_url = 'sql.php' . PMA_URL_getCommon($url_params_full_text);
-
-        return Util::linkOrButton(
-            $tmp_url, $tmp_image, array(), false
-        );
-
-    } // end of the '_getFullOrPartialTextButtonOrLink()' function
-
-
-    /**
-     * Prepare html form for multi row operations
-     *
-     * @param string $del_lnk the delete link of current row
-     *
-     * @return  string  $form_html          html content
-     *
-     * @access  private
-     *
-     * @see     _getTableHeaders()
-     */
-    private function _getFormForMultiRowOperations($del_lnk)
-    {
-
-        $form_html = '';
-
-        if (($del_lnk == self::DELETE_ROW) || ($del_lnk == self::KILL_PROCESS)) {
-
-            $form_html .= '<form method="post" action="tbl_row_action.php" '
-                . 'name="resultsForm"'
-                . ' id="resultsForm_' . $this->__get('unique_id') . '"';
-
-            $form_html .= ' class="ajax" ';
-
-            $form_html .= '>'
-                . PMA_URL_getHiddenInputs(
-                    $this->__get('db'), $this->__get('table'), 1
-                )
-                . '<input type="hidden" name="goto" value="sql.php" />';
-        }
-
-        $form_html .= '<table class="table_results data ajax"';
-        $form_html .= ' data-uniqueId="' . $this->__get('unique_id') . '"';
-        $form_html .= '>';
-
-        return $form_html;
-
-    } // end of the '_getFormForMultiRowOperations()' function
-
-
-    /**
-     * Get comment for row
-     *
-     * @param array $comments_map comments array
-     * @param array $fields_meta  set of field properties
-     *
-     * @return  string  $comment        html content
-     *
-     * @access  private
-     *
-     * @see     _getTableHeaders()
-     */
-    private function _getCommentForRow($comments_map, $fields_meta)
-    {
-        $comments = '';
-        if (isset($comments_map[$fields_meta->table])
-            && isset($comments_map[$fields_meta->table][$fields_meta->name])
-        ) {
-            $sanitized_comments = htmlspecialchars(
-                $comments_map[$fields_meta->table][$fields_meta->name]
-            );
-
-            $comments = '<span class="tblcomment" title="'
-                . $sanitized_comments . '">';
-            $limitChars = $GLOBALS['cfg']['LimitChars'];
-            if (mb_strlen($sanitized_comments) > $limitChars) {
-                $sanitized_comments = mb_substr(
-                    $sanitized_comments, 0, $limitChars
-                ) . '…';
-            }
-            $comments .= $sanitized_comments;
-            $comments .= '</span>';
-        }
-        return $comments;
-    } // end of the '_getCommentForRow()' function
-
-
-    /**
-     * Prepare parameters and html for sorted table header fields
-     *
-     * @param array   $fields_meta                 set of field properties
-     * @param array   $sort_expression             sort expression
-     * @param string  $sort_expression_nodirection sort expression without direction
-     * @param integer $column_index                the index of the column
-     * @param string  $unsorted_sql_query          the unsorted sql query
-     * @param integer $session_max_rows            maximum rows resulted by sql
-     * @param string  $comments                    comment for row
-     * @param string  $sort_direction              sort direction
-     * @param boolean $col_visib                   column is visible(false)
-     *        array                                column isn't visible(string array)
-     * @param string  $col_visib_j                 element of $col_visib array
-     *
-     * @return  array   2 element array - $order_link, $sorted_header_html
-     *
-     * @access  private
-     *
-     * @see     _getTableHeaders()
-     */
-    private function _getOrderLinkAndSortedHeaderHtml(
-        $fields_meta, $sort_expression, $sort_expression_nodirection,
-        $column_index, $unsorted_sql_query, $session_max_rows,
-        $comments, $sort_direction, $col_visib, $col_visib_j
-    ) {
-
-        $sorted_header_html = '';
-
-        // Checks if the table name is required; it's the case
-        // for a query with a "JOIN" statement and if the column
-        // isn't aliased, or in queries like
-        // SELECT `1`.`master_field` , `2`.`master_field`
-        // FROM `PMA_relation` AS `1` , `PMA_relation` AS `2`
-
-        $sort_tbl = (isset($fields_meta->table)
-            && mb_strlen($fields_meta->table)
-            && $fields_meta->orgname == $fields_meta->name)
-            ? Util::backquote(
-                $fields_meta->table
-            ) . '.'
-            : '';
-
-        $name_to_use_in_sort = $fields_meta->name;
-
-        // Generates the orderby clause part of the query which is part
-        // of URL
-        list($single_sort_order, $multi_sort_order, $order_img)
-            = $this->_getSingleAndMultiSortUrls(
-                $sort_expression, $sort_expression_nodirection, $sort_tbl,
-                $name_to_use_in_sort, $sort_direction, $fields_meta, $column_index
-            );
-
-        if (preg_match(
-            '@(.*)([[:space:]](LIMIT (.*)|PROCEDURE (.*)|FOR UPDATE|'
-            . 'LOCK IN SHARE MODE))@is',
-            $unsorted_sql_query, $regs3
-        )) {
-            $single_sorted_sql_query = $regs3[1] . $single_sort_order . $regs3[2];
-            $multi_sorted_sql_query = $regs3[1] . $multi_sort_order . $regs3[2];
-        } else {
-            $single_sorted_sql_query = $unsorted_sql_query . $single_sort_order;
-            $multi_sorted_sql_query = $unsorted_sql_query . $multi_sort_order;
-        }
-
-        $_single_url_params = array(
-            'db'                 => $this->__get('db'),
-            'table'              => $this->__get('table'),
-            'sql_query'          => $single_sorted_sql_query,
-            'session_max_rows'   => $session_max_rows,
-            'is_browse_distinct' => $this->__get('is_browse_distinct'),
-        );
-
-        $_multi_url_params = array(
-            'db'                 => $this->__get('db'),
-            'table'              => $this->__get('table'),
-            'sql_query'          => $multi_sorted_sql_query,
-            'session_max_rows'   => $session_max_rows,
-            'is_browse_distinct' => $this->__get('is_browse_distinct'),
-        );
-        $single_order_url  = 'sql.php' . PMA_URL_getCommon($_single_url_params);
-        $multi_order_url = 'sql.php' . PMA_URL_getCommon($_multi_url_params);
-
-        // Displays the sorting URL
-        // enable sort order swapping for image
-        $order_link = $this->_getSortOrderLink(
-            $order_img, $column_index,
-            $fields_meta, $single_order_url, $multi_order_url
-        );
-
-        $sorted_header_html .= $this->_getDraggableClassForSortableColumns(
-            $col_visib, $col_visib_j,
-            $fields_meta, $order_link, $comments
-        );
-
-        return array($order_link, $sorted_header_html);
-
-    } // end of the '_getOrderLinkAndSortedHeaderHtml()' function
-
-    /**
-     * Prepare parameters and html for sorted table header fields
-     *
-     * @param array   $sort_expression             sort expression
-     * @param string  $sort_expression_nodirection sort expression without direction
-     * @param string  $sort_tbl                    The name of the table to which
-     *                                             the current column belongs to
-     * @param string  $name_to_use_in_sort         The current column under
-     *                                             consideration
-     * @param string  $sort_direction              sort direction
-     * @param array   $fields_meta                 set of field properties
-     * @param integer $column_index                The index number to current column
-     *
-     * @return  array   3 element array - $single_sort_order, $sort_order, $order_img
-     *
-     * @access  private
-     *
-     * @see     _getOrderLinkAndSortedHeaderHtml()
-     */
-    private function _getSingleAndMultiSortUrls(
-        $sort_expression, $sort_expression_nodirection, $sort_tbl,
-        $name_to_use_in_sort, $sort_direction, $fields_meta, $column_index
-    ) {
-        $sort_order = "";
-        // Check if the current column is in the order by clause
-        $is_in_sort = $this->_isInSorted(
-            $sort_expression, $sort_expression_nodirection,
-            $sort_tbl, $name_to_use_in_sort
-        );
-        $current_name = $name_to_use_in_sort;
-        if ($sort_expression_nodirection[0] == '' || !$is_in_sort) {
-            $special_index = $sort_expression_nodirection[0] == ''
-                ? 0
-                : count($sort_expression_nodirection);
-            $sort_expression_nodirection[$special_index]
-                = Util::backquote(
-                    $current_name
-                );
-            $sort_direction[$special_index] = (preg_match(
-                '@time|date@i',
-                $fields_meta->type
-            )) ? self::DESCENDING_SORT_DIR : self::ASCENDING_SORT_DIR;
-
-        }
-
-        $sort_expression_nodirection = array_filter($sort_expression_nodirection);
-        $single_sort_order = null;
-        foreach ($sort_expression_nodirection as $index=>$expression) {
-            // check if this is the first clause,
-            // if it is then we have to add "order by"
-            $is_first_clause = ($index == 0);
-            $name_to_use_in_sort = $expression;
-            $sort_tbl_new = $sort_tbl;
-            // Test to detect if the column name is a standard name
-            // Standard name has the table name prefixed to the column name
-            if (mb_strpos($name_to_use_in_sort, '.') !== false) {
-                $matches = explode('.', $name_to_use_in_sort);
-                // Matches[0] has the table name
-                // Matches[1] has the column name
-                $name_to_use_in_sort = $matches[1];
-                $sort_tbl_new = $matches[0];
-            }
-
-            // $name_to_use_in_sort might contain a space due to
-            // formatting of function expressions like "COUNT(name )"
-            // so we remove the space in this situation
-            $name_to_use_in_sort = str_replace(' )', ')', $name_to_use_in_sort);
-            $name_to_use_in_sort = str_replace('``', '`', $name_to_use_in_sort);
-            $name_to_use_in_sort = trim($name_to_use_in_sort, '`');
-
-            // If this the first column name in the order by clause add
-            // order by clause to the  column name
-            $query_head = $is_first_clause ? "\nORDER BY " : "";
-            // Again a check to see if the given column is a aggregate column
-            if (mb_strpos($name_to_use_in_sort, '(') !== false) {
-                $sort_order .=  $query_head  . $name_to_use_in_sort . ' ' ;
-            } else {
-                if (mb_strlen($sort_tbl_new) > 0) {
-                    $sort_tbl_new .= ".";
-                }
-                $sort_order .=  $query_head  . $sort_tbl_new
-                  . Util::backquote(
-                      $name_to_use_in_sort
-                  ) .  ' ' ;
-            }
-
-            // For a special case where the code generates two dots between
-            // column name and table name.
-            $sort_order = preg_replace("/\.\./", ".", $sort_order);
-            // Incase this is the current column save $single_sort_order
-            if ($current_name == $name_to_use_in_sort) {
-                if (mb_strpos($current_name, '(') !== false) {
-                    $single_sort_order = "\n" . 'ORDER BY ' . $current_name . ' ';
-                } else {
-                    $single_sort_order = "\n" . 'ORDER BY ' . $sort_tbl
-                        . Util::backquote(
-                            $current_name
-                        ) . ' ';
-                }
-                if ($is_in_sort) {
-                    list($single_sort_order, $order_img)
-                        = $this->_getSortingUrlParams(
-                            $sort_direction, $single_sort_order,
-                            $column_index, $index
-                        );
-                } else {
-                    $single_sort_order .= strtoupper($sort_direction[$index]);
-                }
-            }
-            if ($current_name == $name_to_use_in_sort && $is_in_sort) {
-                // We need to generate the arrow button and related html
-                list($sort_order, $order_img) = $this->_getSortingUrlParams(
-                    $sort_direction, $sort_order, $column_index, $index
-                );
-                $order_img .= " <small>" . ($index + 1) . "</small>";
-            } else {
-                $sort_order .= strtoupper($sort_direction[$index]);
-            }
-            // Separate columns by a comma
-            $sort_order .= ", ";
-
-            unset($name_to_use_in_sort);
-        }
-        // remove the comma from the last column name in the newly
-        // constructed clause
-        $sort_order = mb_substr(
-            $sort_order,
-            0,
-            mb_strlen($sort_order)-2
-        );
-        if (empty($order_img)) {
-            $order_img = '';
-        }
-        return array($single_sort_order, $sort_order, $order_img);
-    }
-
-    /**
-     * Check whether the column is sorted
-     *
-     * @param array  $sort_expression             sort expression
-     * @param array  $sort_expression_nodirection sort expression without direction
-     * @param string $sort_tbl                    the table name
-     * @param string $name_to_use_in_sort         the sorting column name
-     *
-     * @return boolean $is_in_sort                   the column sorted or not
-     *
-     * @access  private
-     *
-     * @see     _getTableHeaders()
-     */
-    private function _isInSorted(
-        $sort_expression, $sort_expression_nodirection, $sort_tbl,
-        $name_to_use_in_sort
-    ) {
-
-        $index_in_expression = 0;
-
-        foreach ($sort_expression_nodirection as $index => $clause) {
-            if (mb_strpos($clause, '.') !== false) {
-                $fragments = explode('.', $clause);
-                $clause2 = $fragments[0] . "." . str_replace('`', '', $fragments[1]);
-            } else {
-                $clause2 = $sort_tbl . str_replace('`', '', $clause);
-            }
-            if ($clause2 === $sort_tbl . $name_to_use_in_sort) {
-                $index_in_expression = $index;
-                break;
-            }
-        }
-        if (empty($sort_expression[$index_in_expression])) {
-            $is_in_sort = false;
-        } else {
-            // Field name may be preceded by a space, or any number
-            // of characters followed by a dot (tablename.fieldname)
-            // so do a direct comparison for the sort expression;
-            // this avoids problems with queries like
-            // "SELECT id, count(id)..." and clicking to sort
-            // on id or on count(id).
-            // Another query to test this:
-            // SELECT p.*, FROM_UNIXTIME(p.temps) FROM mytable AS p
-            // (and try clicking on each column's header twice)
-            $noSortTable = empty($sort_tbl) || mb_strpos(
-                $sort_expression_nodirection[$index_in_expression], $sort_tbl
-            ) === false;
-            $noOpenParenthesis = mb_strpos(
-                $sort_expression_nodirection[$index_in_expression], '('
-            ) === false;
-            if (! empty($sort_tbl) && $noSortTable && $noOpenParenthesis) {
-                $new_sort_expression_nodirection = $sort_tbl
-                    . $sort_expression_nodirection[$index_in_expression];
-            } else {
-                $new_sort_expression_nodirection
-                    = $sort_expression_nodirection[$index_in_expression];
-            }
-
-            //Back quotes are removed in next comparison, so remove them from value
-            //to compare.
-            $name_to_use_in_sort = str_replace('`', '', $name_to_use_in_sort);
-
-            $is_in_sort = false;
-            $sort_name = str_replace('`', '', $sort_tbl) . $name_to_use_in_sort;
-
-            if ($sort_name == str_replace('`', '', $new_sort_expression_nodirection)
-                || $sort_name == str_replace('`', '', $sort_expression_nodirection[$index_in_expression])
-            ) {
-                $is_in_sort = true;
-            }
-        }
-
-        return $is_in_sort;
-
-    } // end of the '_isInSorted()' function
-
-
-    /**
-     * Get sort url parameters - sort order and order image
-     *
-     * @param array   $sort_direction the sort direction
-     * @param string  $sort_order     the sorting order
-     * @param integer $column_index   the index of the column
-     * @param integer $index          the index of sort direction array.
-     *
-     * @return  array                       2 element array - $sort_order, $order_img
-     *
-     * @access  private
-     *
-     * @see     _getSingleAndMultiSortUrls()
-     */
-    private function _getSortingUrlParams(
-        $sort_direction, $sort_order, $column_index, $index
-    ) {
-        if (strtoupper(trim($sort_direction[$index])) == self::DESCENDING_SORT_DIR) {
-            $sort_order .= ' ASC';
-            $order_img   = ' ' . Util::getImage(
-                's_desc.png', __('Descending'),
-                array('class' => "soimg$column_index", 'title' => '')
-            );
-            $order_img  .= ' ' . Util::getImage(
-                's_asc.png', __('Ascending'),
-                array('class' => "soimg$column_index hide", 'title' => '')
-            );
-        } else {
-            $sort_order .= ' DESC';
-            $order_img   = ' ' . Util::getImage(
-                's_asc.png', __('Ascending'),
-                array('class' => "soimg$column_index", 'title' => '')
-            );
-            $order_img  .=  ' ' . Util::getImage(
-                's_desc.png', __('Descending'),
-                array('class' => "soimg$column_index hide", 'title' => '')
-            );
-        }
-        return array($sort_order, $order_img);
-    } // end of the '_getSortingUrlParams()' function
-
-
-    /**
-     * Get sort order link
-     *
-     * @param string  $order_img       the sort order image
-     * @param integer $col_index       the index of the column
-     * @param array   $fields_meta     set of field properties
-     * @param string  $order_url       the url for sort
-     * @param string  $multi_order_url the url for sort
-     *
-     * @return  string                      the sort order link
-     *
-     * @access  private
-     *
-     * @see     _getTableHeaders()
-     */
-    private function _getSortOrderLink(
-        $order_img, $col_index,
-        $fields_meta, $order_url, $multi_order_url
-    ) {
-        $order_link_params = array();
-        if (isset($order_img) && ($order_img != '')) {
-            if (mb_strstr($order_img, 'asc')) {
-                $order_link_params['onmouseover'] = "$('.soimg$col_index').toggle()";
-                $order_link_params['onmouseout']  = "$('.soimg$col_index').toggle()";
-            } elseif (mb_strstr($order_img, 'desc')) {
-                $order_link_params['onmouseover'] = "$('.soimg$col_index').toggle()";
-                $order_link_params['onmouseout']  = "$('.soimg$col_index').toggle()";
-            }
-        }
-
-        $order_link_content = htmlspecialchars($fields_meta->name);
-        $inner_link_content = $order_link_content . $order_img
-            . '<input type="hidden" value="' .  $multi_order_url . '" />';
-
-        return Util::linkOrButton(
-            $order_url, $inner_link_content,
-            $order_link_params, false, true
-        );
-
-    } // end of the '_getSortOrderLink()' function
-
-    /**
-     * Check if the column contains numeric data. If yes, then set the
-     * column header's alignment right
-     *
-     * @param array $fields_meta set of field properties
-     * @param array &$th_class   array containing classes
-     *
-     * @return void
-     *
-     * @see  _getDraggableClassForSortableColumns()
-     */
-    private function _getClassForNumericColumnType($fields_meta,&$th_class)
-    {
-        if (preg_match(
-            '@int|decimal|float|double|real|bit|boolean|serial@i',
-            $fields_meta->type
-        )) {
-            $th_class[] = 'right';
-        }
-    }
-
-    /**
-     * Prepare columns to draggable effect for sortable columns
-     *
-     * @param boolean $col_visib   the column is visible (false)
-     *        array                the column is not visible (string array)
-     * @param string  $col_visib_j element of $col_visib array
-     * @param array   $fields_meta set of field properties
-     * @param string  $order_link  the order link
-     * @param string  $comments    the comment for the column
-     *
-     * @return  string  $draggable_html     html content
-     *
-     * @access  private
-     *
-     * @see     _getTableHeaders()
-     */
-    private function _getDraggableClassForSortableColumns(
-        $col_visib, $col_visib_j, $fields_meta,
-        $order_link, $comments
-    ) {
-
-        $draggable_html = '<th';
-        $th_class = array();
-        $th_class[] = 'draggable';
-        $this->_getClassForNumericColumnType($fields_meta, $th_class);
-        if ($col_visib && !$col_visib_j) {
-            $th_class[] = 'hide';
-        }
-
-        $th_class[] = 'column_heading';
-        if ($GLOBALS['cfg']['BrowsePointerEnable'] == true) {
-            $th_class[] = 'pointer';
-        }
-
-        if ($GLOBALS['cfg']['BrowseMarkerEnable'] == true) {
-            $th_class[] = 'marker';
-        }
-
-        $draggable_html .= ' class="' . implode(' ', $th_class) . '"';
-
-        $draggable_html .= ' data-column="' . htmlspecialchars($fields_meta->name)
-            . '">' . $order_link . $comments . '</th>';
-
-        return $draggable_html;
-
-    } // end of the '_getDraggableClassForSortableColumns()' function
-
-
-    /**
-     * Prepare columns to draggable effect for non sortable columns
-     *
-     * @param boolean $col_visib       the column is visible (false)
-     *        array                    the column is not visible (string array)
-     * @param string  $col_visib_j     element of $col_visib array
-     * @param boolean $condition_field whether to add CSS class condition
-     * @param array   $fields_meta     set of field properties
-     * @param string  $comments        the comment for the column
-     *
-     * @return  string  $draggable_html         html content
-     *
-     * @access  private
-     *
-     * @see     _getTableHeaders()
-     */
-    private function _getDraggableClassForNonSortableColumns(
-        $col_visib, $col_visib_j, $condition_field,
-        $fields_meta, $comments
-    ) {
-
-        $draggable_html = '<th';
-        $th_class = array();
-        $th_class[] = 'draggable';
-        $this->_getClassForNumericColumnType($fields_meta, $th_class);
-        if ($col_visib && !$col_visib_j) {
-            $th_class[] = 'hide';
-        }
-
-        if ($condition_field) {
-            $th_class[] = 'condition';
-        }
-
-        $draggable_html .= ' class="' . implode(' ', $th_class) . '"';
-
-        $draggable_html .= ' data-column="'
-            . htmlspecialchars($fields_meta->name) . '">';
-
-        $draggable_html .= htmlspecialchars($fields_meta->name);
-
-        $draggable_html .= "\n" . $comments . '</th>';
-
-        return $draggable_html;
-
-    } // end of the '_getDraggableClassForNonSortableColumns()' function
-
-
-    /**
-     * Prepare column to show at right side - check boxes or empty column
-     *
-     * @param array  &$displayParts             which elements to display
-     * @param string $full_or_partial_text_link full/partial link or text button
-     * @param string $colspan                   column span of table header
-     *
-     * @return  string  html content
-     *
-     * @access  private
-     *
-     * @see     _getTableHeaders()
-     */
-    private function _getColumnAtRightSide(
-        &$displayParts, $full_or_partial_text_link, $colspan
-    ) {
-
-        $right_column_html = '';
-        $display_params = $this->__get('display_params');
-
-        // Displays the needed checkboxes at the right
-        // column of the result table header if possible and required...
-        if ((($GLOBALS['cfg']['RowActionLinks'] == self::POSITION_RIGHT)
-            || ($GLOBALS['cfg']['RowActionLinks'] == self::POSITION_BOTH))
-            && (($displayParts['edit_lnk'] != self::NO_EDIT_OR_DELETE)
-            || ($displayParts['del_lnk'] != self::NO_EDIT_OR_DELETE))
-            && ($displayParts['text_btn'] == '1')
-        ) {
-
-            $display_params['emptyafter']
-                = (($displayParts['edit_lnk'] != self::NO_EDIT_OR_DELETE)
-                && ($displayParts['del_lnk'] != self::NO_EDIT_OR_DELETE)) ? 4 : 1;
-
-            $right_column_html .= "\n"
-                . '<th class="column_action print_ignore" ' . $colspan . '>'
-                . $full_or_partial_text_link
-                . '</th>';
-
-        } elseif ((($GLOBALS['cfg']['RowActionLinks'] == self::POSITION_LEFT)
-            || ($GLOBALS['cfg']['RowActionLinks'] == self::POSITION_BOTH))
-            && (($displayParts['edit_lnk'] == self::NO_EDIT_OR_DELETE)
-            && ($displayParts['del_lnk'] == self::NO_EDIT_OR_DELETE))
-            && (! isset($GLOBALS['is_header_sent']) || ! $GLOBALS['is_header_sent'])
-        ) {
-            //     ... elseif no button, displays empty columns if required
-            // (unless coming from Browse mode print view)
-
-            $display_params['emptyafter']
-                = (($displayParts['edit_lnk'] != self::NO_EDIT_OR_DELETE)
-                && ($displayParts['del_lnk'] != self::NO_EDIT_OR_DELETE)) ? 4 : 1;
-
-            $right_column_html .= "\n" . '<td class="print_ignore" ' . $colspan
-                . '></td>';
-        }
-
-        $this->__set('display_params', $display_params);
-
-        return $right_column_html;
-
-    } // end of the '_getColumnAtRightSide()' function
-
-
-    /**
-     * Prepares the display for a value
-     *
-     * @param string $class           class of table cell
-     * @param bool   $condition_field whether to add CSS class condition
-     * @param string $value           value to display
-     *
-     * @return string  the td
-     *
-     * @access  private
-     *
-     * @see     _getDataCellForGeometryColumns(),
-     *          _getDataCellForNonNumericColumns()
-     */
-    private function _buildValueDisplay($class, $condition_field, $value)
-    {
-        return '<td class="left ' . $class . ($condition_field ? ' condition' : '')
-            . '">' . $value . '</td>';
-    } // end of the '_buildValueDisplay()' function
-
-
-    /**
-     * Prepares the display for a null value
-     *
-     * @param string $class           class of table cell
-     * @param bool   $condition_field whether to add CSS class condition
-     * @param object $meta            the meta-information about this field
-     * @param string $align           cell alignment
-     *
-     * @return string  the td
-     *
-     * @access  private
-     *
-     * @see     _getDataCellForNumericColumns(),
-     *          _getDataCellForGeometryColumns(),
-     *          _getDataCellForNonNumericColumns()
-     */
-    private function _buildNullDisplay($class, $condition_field, $meta, $align = '')
-    {
-        // the null class is needed for grid editing
-        $decimals = isset($meta->decimals) ? $meta->decimals : '-1';
-        return '<td ' . $align . ' data-decimals="' . $decimals
-            . '" data-type="' . $meta->type . '"  class="'
-            . $this->_addClass(
-                $class, $condition_field, $meta, ''
-            )
-            . ' null"><i>NULL</i></td>';
-    } // end of the '_buildNullDisplay()' function
-
-
-    /**
-     * Prepares the display for an empty value
-     *
-     * @param string $class           class of table cell
-     * @param bool   $condition_field whether to add CSS class condition
-     * @param object $meta            the meta-information about this field
-     * @param string $align           cell alignment
-     *
-     * @return string  the td
-     *
-     * @access  private
-     *
-     * @see     _getDataCellForNumericColumns(),
-     *          _getDataCellForGeometryColumns(),
-     *          _getDataCellForNonNumericColumns()
-     */
-    private function _buildEmptyDisplay($class, $condition_field, $meta, $align = '')
-    {
-        return '<td ' . $align . ' class="'
-            . $this->_addClass(
-                $class, $condition_field, $meta, 'nowrap'
-            )
-            . '"></td>';
-    } // end of the '_buildEmptyDisplay()' function
-
-
-    /**
-     * Adds the relevant classes.
-     *
-     * @param string        $class                 class of table cell
-     * @param bool          $condition_field       whether to add CSS class
-     *                                             condition
-     * @param object        $meta                  the meta-information about the
-     *                                             field
-     * @param string        $nowrap                avoid wrapping
-     * @param bool          $is_field_truncated    is field truncated (display ...)
-     * @param object|string $transformation_plugin transformation plugin.
-     *                                             Can also be the default function:
-     *                                             PMA_mimeDefaultFunction
-     * @param string        $default_function      default transformation function
-     *
-     * @return string  the list of classes
-     *
-     * @access  private
-     *
-     * @see     _buildNullDisplay(), _getRowData()
-     */
-    private function _addClass(
-        $class, $condition_field, $meta, $nowrap, $is_field_truncated = false,
-        $transformation_plugin = '', $default_function = ''
-    ) {
-        $classes = array(
-            $class,
-            $nowrap,
-        );
-
-        if (isset($meta->mimetype)) {
-            $classes[] = preg_replace('/\//', '_', $meta->mimetype);
-        }
-
-        if ($condition_field) {
-            $classes[] = 'condition';
-        }
-
-        if ($is_field_truncated) {
-            $classes[] = 'truncated';
-        }
-
-        $mime_map = $this->__get('mime_map');
-        $orgFullColName = $this->__get('db') . '.' . $meta->orgtable
-            . '.' . $meta->orgname;
-        if ($transformation_plugin != $default_function
-            || !empty($mime_map[$orgFullColName]['input_transformation'])
-        ) {
-            $classes[] = 'transformed';
-        }
-
-        // Define classes to be added to this data field based on the type of data
-        $matches = array(
-            'enum' => 'enum',
-            'set' => 'set',
-            'binary' => 'hex',
-        );
-
-        foreach ($matches as $key => $value) {
-            if (mb_strpos($meta->flags, $key) !== false) {
-                $classes[] = $value;
-            }
-        }
-
-        if (mb_strpos($meta->type, 'bit') !== false) {
-            $classes[] = 'bit';
-        }
-
-        return implode(' ', $classes);
-    } // end of the '_addClass()' function
-
-    /**
-     * Prepare the body of the results table
-     *
-     * @param integer &$dt_result           the link id associated to the query
-     *                                      which results have to be displayed which
-     *                                      results have to be displayed
-     * @param array   &$displayParts        which elements to display
-     * @param array   $map                  the list of relations
-     * @param array   $analyzed_sql_results analyzed sql results
-     * @param boolean $is_limited_display   with limited operations or not
-     *
-     * @return string $table_body_html  html content
-     *
-     * @global array  $row                  current row data
-     *
-     * @access  private
-     *
-     * @see     getTable()
-     */
-    private function _getTableBody(
-        &$dt_result, &$displayParts, $map, $analyzed_sql_results,
-        $is_limited_display = false
-    ) {
-
-        global $row; // mostly because of browser transformations,
-                     // to make the row-data accessible in a plugin
-
-        $table_body_html = '';
-
-        // query without conditions to shorten URLs when needed, 200 is just
-        // guess, it should depend on remaining URL length
-        $url_sql_query = $this->_getUrlSqlQuery($analyzed_sql_results);
-
-        $display_params = $this->__get('display_params');
-
-        if (! is_array($map)) {
-            $map = array();
-        }
-
-        $row_no                       = 0;
-        $display_params['edit']       = array();
-        $display_params['copy']       = array();
-        $display_params['delete']     = array();
-        $display_params['data']       = array();
-        $display_params['row_delete'] = array();
-        $this->__set('display_params', $display_params);
-
-        // name of the class added to all grid editable elements;
-        // if we don't have all the columns of a unique key in the result set,
-        //  do not permit grid editing
-        if ($is_limited_display || ! $this->__get('editable')) {
-            $grid_edit_class = '';
-        } else {
-            switch ($GLOBALS['cfg']['GridEditing']) {
-            case 'double-click':
-                // trying to reduce generated HTML by using shorter
-                // classes like click1 and click2
-                $grid_edit_class = 'grid_edit click2';
-                break;
-            case 'click':
-                $grid_edit_class = 'grid_edit click1';
-                break;
-            default: // 'disabled'
-                $grid_edit_class = '';
-                break;
-            }
-        }
-
-        // prepare to get the column order, if available
-        list($col_order, $col_visib) = $this->_getColumnParams(
-            $analyzed_sql_results
-        );
-
-        // Correction University of Virginia 19991216 in the while below
-        // Previous code assumed that all tables have keys, specifically that
-        // the phpMyAdmin GUI should support row delete/edit only for such
-        // tables.
-        // Although always using keys is arguably the prescribed way of
-        // defining a relational table, it is not required. This will in
-        // particular be violated by the novice.
-        // We want to encourage phpMyAdmin usage by such novices. So the code
-        // below has been changed to conditionally work as before when the
-        // table being displayed has one or more keys; but to display
-        // delete/edit options correctly for tables without keys.
-
-        $odd_row = true;
-
-        $whereClauseMap = $this->__get('whereClauseMap');
-        while ($row = $GLOBALS['dbi']->fetchRow($dt_result)) {
-
-            // add repeating headers
-            if ((($row_no != 0) && ($_SESSION['tmpval']['repeat_cells'] != 0))
-                && !($row_no % $_SESSION['tmpval']['repeat_cells'])
-            ) {
-                $table_body_html .= $this->_getRepeatingHeaders(
-                    $display_params
-                );
-            }
-
-            $tr_class = array();
-            if ($GLOBALS['cfg']['BrowsePointerEnable'] != true) {
-                $tr_class[] = 'nopointer';
-            }
-            if ($GLOBALS['cfg']['BrowseMarkerEnable'] != true) {
-                $tr_class[] = 'nomarker';
-            }
-            $tr_class[] = ($odd_row ? 'odd' : 'even');
-            $odd_row = ! $odd_row;
-
-            // pointer code part
-            $table_body_html .= '<tr class="' . implode(' ', $tr_class) . '">';
-
-            // 1. Prepares the row
-
-            // In print view these variable needs to be initialized
-            $del_url = $del_str = $edit_anchor_class
-                = $edit_str = $js_conf = $copy_url = $copy_str = $edit_url = null;
-
-            // 1.2 Defines the URLs for the modify/delete link(s)
-
-            if (($displayParts['edit_lnk'] != self::NO_EDIT_OR_DELETE)
-                || ($displayParts['del_lnk'] != self::NO_EDIT_OR_DELETE)
-            ) {
-
-                // Results from a "SELECT" statement -> builds the
-                // WHERE clause to use in links (a unique key if possible)
-                /**
-                 * @todo $where_clause could be empty, for example a table
-                 *       with only one field and it's a BLOB; in this case,
-                 *       avoid to display the delete and edit links
-                 */
-                list($where_clause, $clause_is_unique, $condition_array)
-                    = Util::getUniqueCondition(
-                        $dt_result, // handle
-                        $this->__get('fields_cnt'), // fields_cnt
-                        $this->__get('fields_meta'), // fields_meta
-                        $row, // row
-                        false, // force_unique
-                        $this->__get('table'), // restrict_to_table
-                        $analyzed_sql_results // analyzed_sql_results
-                    );
-                $whereClauseMap[$row_no][$this->__get('table')] = $where_clause;
-                $this->__set('whereClauseMap', $whereClauseMap);
-
-                $where_clause_html = htmlspecialchars($where_clause);
-
-                // 1.2.1 Modify link(s) - update row case
-                if ($displayParts['edit_lnk'] == self::UPDATE_ROW) {
-
-                    list($edit_url, $copy_url, $edit_str, $copy_str,
-                        $edit_anchor_class)
-                            = $this->_getModifiedLinks(
-                                $where_clause,
-                                $clause_is_unique, $url_sql_query
-                            );
-
-                } // end if (1.2.1)
-
-                // 1.2.2 Delete/Kill link(s)
-                list($del_url, $del_str, $js_conf)
-                    = $this->_getDeleteAndKillLinks(
-                        $where_clause, $clause_is_unique,
-                        $url_sql_query, $displayParts['del_lnk'],
-                        $row
-                    );
-
-                // 1.3 Displays the links at left if required
-                if (($GLOBALS['cfg']['RowActionLinks'] == self::POSITION_LEFT)
-                    || ($GLOBALS['cfg']['RowActionLinks'] == self::POSITION_BOTH)
-                ) {
-
-                    $table_body_html .= $this->_getPlacedLinks(
-                        self::POSITION_LEFT, $del_url, $displayParts, $row_no,
-                        $where_clause, $where_clause_html, $condition_array,
-                        $edit_url, $copy_url, $edit_anchor_class,
-                        $edit_str, $copy_str, $del_str, $js_conf
-                    );
-
-                } elseif ($GLOBALS['cfg']['RowActionLinks'] == self::POSITION_NONE) {
-
-                    $table_body_html .= $this->_getPlacedLinks(
-                        self::POSITION_NONE, $del_url, $displayParts, $row_no,
-                        $where_clause, $where_clause_html, $condition_array,
-                        $edit_url, $copy_url, $edit_anchor_class,
-                        $edit_str, $copy_str, $del_str, $js_conf
-                    );
-
-                } // end if (1.3)
-            } // end if (1)
-
-            // 2. Displays the rows' values
-            if (is_null($this->__get('mime_map'))) {
-                $this->_setMimeMap();
-            }
-            $table_body_html .= $this->_getRowValues(
-                $dt_result,
-                $row,
-                $row_no,
-                $col_order,
-                $map,
-                $grid_edit_class,
-                $col_visib,
-                $url_sql_query,
-                $analyzed_sql_results
-            );
-
-            // 3. Displays the modify/delete links on the right if required
-            if (($displayParts['edit_lnk'] != self::NO_EDIT_OR_DELETE)
-                || ($displayParts['del_lnk'] != self::NO_EDIT_OR_DELETE)
-            ) {
-                if (($GLOBALS['cfg']['RowActionLinks'] == self::POSITION_RIGHT)
-                    || ($GLOBALS['cfg']['RowActionLinks'] == self::POSITION_BOTH)
-                ) {
-
-                    $table_body_html .= $this->_getPlacedLinks(
-                        self::POSITION_RIGHT, $del_url, $displayParts, $row_no,
-                        $where_clause, $where_clause_html, $condition_array,
-                        $edit_url, $copy_url, $edit_anchor_class,
-                        $edit_str, $copy_str, $del_str, $js_conf
-                    );
-
-                }
-            } // end if (3)
-
-            $table_body_html .= '</tr>';
-            $table_body_html .= "\n";
-            $row_no++;
-
-        } // end while
-
-        return $table_body_html;
-
-    } // end of the '_getTableBody()' function
-
-    /**
-     * Sets the MIME details of the columns in the results set
-     *
-     * @return void
-     */
-    private function _setMimeMap()
-    {
-        $fields_meta = $this->__get('fields_meta');
-        $mimeMap = array();
-        $added = array();
-
-        for ($currentColumn = 0;
-                $currentColumn < $this->__get('fields_cnt');
-                ++$currentColumn) {
-
-            $meta = $fields_meta[$currentColumn];
-            $orgFullTableName = $this->__get('db') . '.' . $meta->orgtable;
-
-            if ($GLOBALS['cfgRelation']['commwork']
-                && $GLOBALS['cfgRelation']['mimework']
-                && $GLOBALS['cfg']['BrowseMIME']
-                && ! $_SESSION['tmpval']['hide_transformation']
-                && empty($added[$orgFullTableName])
-            ) {
-                $mimeMap = array_merge(
-                    $mimeMap,
-                    PMA_getMIME($this->__get('db'), $meta->orgtable, false, true)
-                );
-                $added[$orgFullTableName] = true;
-            }
-        }
-
-        // special browser transformation for some SHOW statements
-        if ($this->__get('is_show')
-            && ! $_SESSION['tmpval']['hide_transformation']
-        ) {
-            preg_match(
-                '@^SHOW[[:space:]]+(VARIABLES|(FULL[[:space:]]+)?'
-                . 'PROCESSLIST|STATUS|TABLE|GRANTS|CREATE|LOGS|DATABASES|FIELDS'
-                . ')@i',
-                $this->__get('sql_query'), $which
-            );
-
-            if (isset($which[1])) {
-                $str = ' ' . strtoupper($which[1]);
-                $isShowProcessList = strpos($str, 'PROCESSLIST') > 0;
-                if ($isShowProcessList) {
-                    $mimeMap['..Info'] = array(
-                        'mimetype' => 'Text_Plain',
-                        'transformation' => 'output/Text_Plain_Sql.php',
-                    );
-                }
-
-                $isShowCreateTable = preg_match(
-                    '@CREATE[[:space:]]+TABLE@i', $this->__get('sql_query')
-                );
-                if ($isShowCreateTable) {
-                    $mimeMap['..Create Table'] = array(
-                        'mimetype' => 'Text_Plain',
-                        'transformation' => 'output/Text_Plain_Sql.php',
-                    );
-                }
-            }
-        }
-
-        $this->__set('mime_map', $mimeMap);
-    }
-
-    /**
-     * Get the values for one data row
-     *
-     * @param integer              &$dt_result           the link id associated to
-     *                                                   the query which results
-     *                                                   have to be displayed which
-     *                                                   results have to be
-     *                                                   displayed
-     * @param array                $row                  current row data
-     * @param integer              $row_no               the index of current row
-     * @param array                $col_order            the column order false when
-     *                                                   a property not found false
-     *                                                   when a property not found
-     * @param array                $map                  the list of relations
-     * @param string               $grid_edit_class      the class for all editable
-     *                                                   columns
-     * @param boolean|array|string $col_visib            column is visible(false);
-     *                                                   column isn't visible(string
-     *                                                   array)
-     * @param string               $url_sql_query        the analyzed sql query
-     * @param array                $analyzed_sql_results analyzed sql results
-     *
-     * @return  string $row_values_html  html content
-     *
-     * @access  private
-     *
-     * @see     _getTableBody()
-     */
-    private function _getRowValues(
-        &$dt_result, $row, $row_no, $col_order, $map,
-        $grid_edit_class, $col_visib,
-        $url_sql_query, $analyzed_sql_results
-    ) {
-        $row_values_html = '';
-
-        // Following variable are needed for use in isset/empty or
-        // use with array indexes/safe use in foreach
-        $sql_query = $this->__get('sql_query');
-        $fields_meta = $this->__get('fields_meta');
-        $highlight_columns = $this->__get('highlight_columns');
-        $mime_map = $this->__get('mime_map');
-
-        $row_info = $this->_getRowInfoForSpecialLinks($row, $col_order);
-
-        $whereClauseMap = $this->__get('whereClauseMap');
-
-        $columnCount = $this->__get('fields_cnt');
-        for ($currentColumn = 0;
-                $currentColumn < $columnCount;
-                ++$currentColumn) {
-
-            // assign $i with appropriate column order
-            $i = $col_order ? $col_order[$currentColumn] : $currentColumn;
-
-            $meta    = $fields_meta[$i];
-            $orgFullColName
-                = $this->__get('db') . '.' . $meta->orgtable . '.' . $meta->orgname;
-
-            $not_null_class = $meta->not_null ? 'not_null' : '';
-            $relation_class = isset($map[$meta->name]) ? 'relation' : '';
-            $hide_class = ($col_visib && ! $col_visib[$currentColumn])
-                ? 'hide'
-                : '';
-            $grid_edit = $meta->orgtable != '' ? $grid_edit_class : '';
-
-            // handle datetime-related class, for grid editing
-            $field_type_class
-                = $this->_getClassForDateTimeRelatedFields($meta->type);
-
-            $is_field_truncated = false;
-            // combine all the classes applicable to this column's value
-            $class = $this->_getClassesForColumn(
-                $grid_edit, $not_null_class, $relation_class,
-                $hide_class, $field_type_class
-            );
-
-            //  See if this column should get highlight because it's used in the
-            //  where-query.
-            $condition_field = (isset($highlight_columns)
-                && (isset($highlight_columns[$meta->name])
-                || isset($highlight_columns[Util::backquote($meta->name)])))
-                ? true
-                : false;
-
-            // Wrap MIME-transformations. [MIME]
-            $default_function = 'PMA_mimeDefaultFunction'; // default_function
-            $transformation_plugin = $default_function;
-            $transform_options = array();
-
-            if ($GLOBALS['cfgRelation']['mimework']
-                && $GLOBALS['cfg']['BrowseMIME']
-            ) {
-
-                if (isset($mime_map[$orgFullColName]['mimetype'])
-                    && !empty($mime_map[$orgFullColName]['transformation'])
-                ) {
-
-                    $file = $mime_map[$orgFullColName]['transformation'];
-                    $include_file = 'libraries/plugins/transformations/' . $file;
-
-                    if (file_exists($include_file)) {
-
-                        include_once $include_file;
-                        $class_name = PMA_getTransformationClassName($include_file);
-                        // todo add $plugin_manager
-                        $plugin_manager = null;
-                        $transformation_plugin = new $class_name(
-                            $plugin_manager
-                        );
-
-                        $transform_options  = PMA_Transformation_getOptions(
-                            isset(
-                                $mime_map[$orgFullColName]
-                                ['transformation_options']
-                            )
-                            ? $mime_map[$orgFullColName]
-                            ['transformation_options']
-                            : ''
-                        );
-
-                        $meta->mimetype = str_replace(
-                            '_', '/',
-                            $mime_map[$orgFullColName]['mimetype']
-                        );
-
-                    } // end if file_exists
-                } // end if transformation is set
-            } // end if mime/transformation works.
-
-            // Check whether the field needs to display with syntax highlighting
-
-            $dbLower = mb_strtolower($this->__get('db'));
-            $tblLower = mb_strtolower($meta->orgtable);
-            $nameLower = mb_strtolower($meta->orgname);
-            if (! empty($this->transformation_info[$dbLower][$tblLower][$nameLower])
-                && (trim($row[$i]) != '')
-                && ! $_SESSION['tmpval']['hide_transformation']
-            ) {
-                include_once $this->transformation_info
-                    [$dbLower][$tblLower][$nameLower][0];
-                $transformation_plugin = new $this->transformation_info
-                    [$dbLower][$tblLower][$nameLower][1](null);
-
-                $transform_options  = PMA_Transformation_getOptions(
-                    isset($mime_map[$orgFullColName]['transformation_options'])
-                    ? $mime_map[$orgFullColName]['transformation_options']
-                    : ''
-                );
-
-                $meta->mimetype = str_replace(
-                    '_', '/',
-                    $this->transformation_info[$dbLower]
-                    [mb_strtolower($meta->orgtable)]
-                    [mb_strtolower($meta->orgname)][2]
-                );
-
-            }
-
-            // Check for the predefined fields need to show as link in schemas
-            include_once 'libraries/special_schema_links.lib.php';
-
-            if (isset($GLOBALS['special_schema_links'])
-                && (! empty($GLOBALS['special_schema_links'][$dbLower][$tblLower][$nameLower]))
-            ) {
-
-                $linking_url = $this->_getSpecialLinkUrl(
-                    $row[$i], $row_info, mb_strtolower($meta->orgname)
-                );
-                $transformation_plugin = new Text_Plain_Link();
-
-                $transform_options  = array(
-                    0 => $linking_url,
-                    2 => true
-                );
-
-                $meta->mimetype = str_replace(
-                    '_', '/',
-                    'Text/Plain'
-                );
-
-            }
-
-            /*
-             * The result set can have columns from more than one table,
-             * this is why we have to check for the unique conditions
-             * related to this table; however getUniqueCondition() is
-             * costly and does not need to be called if we already know
-             * the conditions for the current table.
-             */
-            if (! isset($whereClauseMap[$row_no][$meta->orgtable])) {
-                $unique_conditions = Util::getUniqueCondition(
-                    $dt_result, // handle
-                    $this->__get('fields_cnt'), // fields_cnt
-                    $this->__get('fields_meta'), // fields_meta
-                    $row, // row
-                    false, // force_unique
-                    $meta->orgtable, // restrict_to_table
-                    $analyzed_sql_results // analyzed_sql_results
-                );
-                $whereClauseMap[$row_no][$meta->orgtable] = $unique_conditions[0];
-            }
-
-            $_url_params = array(
-                'db'            => $this->__get('db'),
-                'table'         => $meta->orgtable,
-                'where_clause'  => $whereClauseMap[$row_no][$meta->orgtable],
-                'transform_key' => $meta->orgname
-            );
-
-            if (! empty($sql_query)) {
-                $_url_params['sql_query'] = $url_sql_query;
-            }
-
-            $transform_options['wrapper_link']
-                = PMA_URL_getCommon($_url_params);
-
-            $display_params = $this->__get('display_params');
-
-            // in some situations (issue 11406), numeric returns 1
-            // even for a string type
-            if ($meta->numeric == 1 && $meta->type != 'string') {
-                // n u m e r i c
-
-                $display_params['data'][$row_no][$i]
-                    = $this->_getDataCellForNumericColumns(
-                        $row[$i],
-                        $class,
-                        $condition_field,
-                        $meta,
-                        $map,
-                        $is_field_truncated,
-                        $analyzed_sql_results,
-                        $transformation_plugin,
-                        $default_function,
-                        $transform_options
-                    );
-
-            } elseif ($meta->type == self::GEOMETRY_FIELD) {
-                // g e o m e t r y
-
-                // Remove 'grid_edit' from $class as we do not allow to
-                // inline-edit geometry data.
-                $class = str_replace('grid_edit', '', $class);
-
-                $display_params['data'][$row_no][$i]
-                    = $this->_getDataCellForGeometryColumns(
-                        $row[$i],
-                        $class,
-                        $meta,
-                        $map,
-                        $_url_params,
-                        $condition_field,
-                        $transformation_plugin,
-                        $default_function,
-                        $transform_options,
-                        $analyzed_sql_results
-                    );
-
-            } else {
-                // n o t   n u m e r i c
-
-                $display_params['data'][$row_no][$i]
-                    = $this->_getDataCellForNonNumericColumns(
-                        $row[$i],
-                        $class,
-                        $meta,
-                        $map,
-                        $_url_params,
-                        $condition_field,
-                        $transformation_plugin,
-                        $default_function,
-                        $transform_options,
-                        $is_field_truncated,
-                        $analyzed_sql_results,
-                        $dt_result,
-                        $i
-                    );
-
-            }
-
-            // output stored cell
-            $row_values_html .= $display_params['data'][$row_no][$i];
-
-            if (isset($display_params['rowdata'][$i][$row_no])) {
-                $display_params['rowdata'][$i][$row_no]
-                    .= $display_params['data'][$row_no][$i];
-            } else {
-                $display_params['rowdata'][$i][$row_no]
-                    = $display_params['data'][$row_no][$i];
-            }
-
-            $this->__set('display_params', $display_params);
-
-        } // end for
-
-        return $row_values_html;
-
-    } // end of the '_getRowValues()' function
-
-    /**
-     * Get link for display special schema links
-     *
-     * @param string $column_value column value
-     * @param array  $row_info     information about row
-     * @param string $field_name   column name
-     *
-     * @return string generated link
-     */
-    private function _getSpecialLinkUrl($column_value, $row_info, $field_name)
-    {
-
-        $linking_url_params = array();
-        $link_relations = $GLOBALS['special_schema_links']
-            [mb_strtolower($this->__get('db'))]
-            [mb_strtolower($this->__get('table'))]
-            [$field_name];
-
-        if (! is_array($link_relations['link_param'])) {
-            $linking_url_params[$link_relations['link_param']] = $column_value;
-        } else {
-            // Consider only the case of creating link for column field
-            // sql query that needs to be passed as url param
-            $sql = 'SELECT `' . $column_value . '` FROM `'
-                . $row_info[$link_relations['link_param'][1]] . '`.`'
-                . $row_info[$link_relations['link_param'][2]] . '`';
-            $linking_url_params[$link_relations['link_param'][0]] = $sql;
-        }
-
-        $divider = strpos($link_relations['default_page'], '?') ? '&' : '?';
-        if (empty($link_relations['link_dependancy_params'])) {
-            return $link_relations['default_page']
-                . PMA_URL_getCommon($linking_url_params, 'raw', $divider);
-        }
-
-        foreach ($link_relations['link_dependancy_params'] as $new_param) {
-
-            // If param_info is an array, set the key and value
-            // from that array
-            if (is_array($new_param['param_info'])) {
-                $linking_url_params[$new_param['param_info'][0]]
-                    = $new_param['param_info'][1];
-                continue;
-            }
-
-            $linking_url_params[$new_param['param_info']]
-                = $row_info[mb_strtolower($new_param['column_name'])];
-
-            // Special case 1 - when executing routines, according
-            // to the type of the routine, url param changes
-            if (empty($row_info['routine_type'])) {
-                continue;
-            }
-        }
-
-        return $link_relations['default_page']
-            . PMA_URL_getCommon($linking_url_params, 'raw', $divider);
-    }
-
-
-    /**
-     * Prepare row information for display special links
-     *
-     * @param array $row       current row data
-     * @param array $col_order the column order
-     *
-     * @return array $row_info associative array with column nama -> value
-     */
-    private function _getRowInfoForSpecialLinks($row, $col_order)
-    {
-
-        $row_info = array();
-        $fields_meta = $this->__get('fields_meta');
-
-        for ($n = 0; $n < $this->__get('fields_cnt'); ++$n) {
-            $m = $col_order ? $col_order[$n] : $n;
-            $row_info[mb_strtolower($fields_meta[$m]->name)]
-                = $row[$m];
-        }
-
-        return $row_info;
-
-    }
-
-    /**
-     * Get url sql query without conditions to shorten URLs
-     *
-     * @param array $analyzed_sql_results analyzed sql results
-     *
-     * @return  string  $url_sql        analyzed sql query
-     *
-     * @access  private
-     *
-     * @see     _getTableBody()
-     */
-    private function _getUrlSqlQuery($analyzed_sql_results)
-    {
-        if (($analyzed_sql_results['querytype'] != 'SELECT')
-            || (mb_strlen($this->__get('sql_query')) < 200)
-        ) {
-            return $this->__get('sql_query');
-        }
-
-        $query = 'SELECT ' . Query::getClause(
-            $analyzed_sql_results['statement'],
-            $analyzed_sql_results['parser']->list,
-            'SELECT'
-        );
-
-        $from_clause = Query::getClause(
-            $analyzed_sql_results['statement'],
-            $analyzed_sql_results['parser']->list,
-            'FROM'
-        );
-
-        if (!empty($from_clause)) {
-            $query .= ' FROM ' . $from_clause;
-        }
-
-        return $query;
-
-    } // end of the '_getUrlSqlQuery()' function
-
-
-    /**
-     * Get column order and column visibility
-     *
-     * @param array $analyzed_sql_results analyzed sql results
-     *
-     * @return  array           2 element array - $col_order, $col_visib
-     *
-     * @access  private
-     *
-     * @see     _getTableBody()
-     */
-    private function _getColumnParams($analyzed_sql_results)
-    {
-        if ($this->_isSelect($analyzed_sql_results)) {
-            $pmatable = new Table($this->__get('table'), $this->__get('db'));
-            $col_order = $pmatable->getUiProp(Table::PROP_COLUMN_ORDER);
-            $col_visib = $pmatable->getUiProp(Table::PROP_COLUMN_VISIB);
-        } else {
-            $col_order = false;
-            $col_visib = false;
-        }
-
-        return array($col_order, $col_visib);
-    } // end of the '_getColumnParams()' function
-
-
-    /**
-     * Get HTML for repeating headers
-     *
-     * @param array $display_params holds various display info
-     *
-     * @return  string  $header_html    html content
-     *
-     * @access  private
-     *
-     * @see     _getTableBody()
-     */
-    private function _getRepeatingHeaders(
-        $display_params
-    ) {
-        $header_html = '<tr>' . "\n";
-
-        if ($display_params['emptypre'] > 0) {
-
-            $header_html .= '    <th colspan="'
-                . $display_params['emptypre'] . '">'
-                . "\n" . '        &nbsp;</th>' . "\n";
-
-        } else if ($GLOBALS['cfg']['RowActionLinks'] == self::POSITION_NONE) {
-            $header_html .= '    <th></th>' . "\n";
-        }
-
-        foreach ($display_params['desc'] as $val) {
-            $header_html .= $val;
-        }
-
-        if ($display_params['emptyafter'] > 0) {
-            $header_html
-                .= '    <th colspan="' . $display_params['emptyafter']
-                . '">'
-                . "\n" . '        &nbsp;</th>' . "\n";
-        }
-        $header_html .= '</tr>' . "\n";
-
-        return $header_html;
-
-    } // end of the '_getRepeatingHeaders()' function
-
-
-    /**
-     * Get modified links
-     *
-     * @param string  $where_clause     the where clause of the sql
-     * @param boolean $clause_is_unique the unique condition of clause
-     * @param string  $url_sql_query    the analyzed sql query
-     *
-     * @return  array                   5 element array - $edit_url, $copy_url,
-     *                                  $edit_str, $copy_str, $edit_anchor_class
-     *
-     * @access  private
-     *
-     * @see     _getTableBody()
-     */
-    private function _getModifiedLinks(
-        $where_clause, $clause_is_unique, $url_sql_query
-    ) {
-
-        $_url_params = array(
-                'db'               => $this->__get('db'),
-                'table'            => $this->__get('table'),
-                'where_clause'     => $where_clause,
-                'clause_is_unique' => $clause_is_unique,
-                'sql_query'        => $url_sql_query,
-                'goto'             => 'sql.php',
-            );
-
-        $edit_url = 'tbl_change.php'
-            . PMA_URL_getCommon(
-                $_url_params + array('default_action' => 'update')
-            );
-
-        $copy_url = 'tbl_change.php'
-            . PMA_URL_getCommon(
-                $_url_params + array('default_action' => 'insert')
-            );
-
-        $edit_str = $this->_getActionLinkContent(
-            'b_edit.png', __('Edit')
-        );
-        $copy_str = $this->_getActionLinkContent(
-            'b_insrow.png', __('Copy')
-        );
-
-        // Class definitions required for grid editing jQuery scripts
-        $edit_anchor_class = "edit_row_anchor";
-        if ($clause_is_unique == 0) {
-            $edit_anchor_class .= ' nonunique';
-        }
-
-        return array($edit_url, $copy_url, $edit_str, $copy_str, $edit_anchor_class);
-
-    } // end of the '_getModifiedLinks()' function
-
-
-    /**
-     * Get delete and kill links
-     *
-     * @param string  $where_clause     the where clause of the sql
-     * @param boolean $clause_is_unique the unique condition of clause
-     * @param string  $url_sql_query    the analyzed sql query
-     * @param string  $del_lnk          the delete link of current row
-     * @param array   $row              the current row
-     *
-     * @return  array                       3 element array
-     *                                      $del_url, $del_str, $js_conf
-     *
-     * @access  private
-     *
-     * @see     _getTableBody()
-     */
-    private function _getDeleteAndKillLinks(
-        $where_clause, $clause_is_unique, $url_sql_query, $del_lnk, $row
-    ) {
-
-        $goto = $this->__get('goto');
-
-        if ($del_lnk == self::DELETE_ROW) { // delete row case
-
-            $_url_params = array(
-                'db'        => $this->__get('db'),
-                'table'     => $this->__get('table'),
-                'sql_query' => $url_sql_query,
-                'message_to_show' => __('The row has been deleted.'),
-                'goto'      => (empty($goto) ? 'tbl_sql.php' : $goto),
-            );
-
-            $lnk_goto = 'sql.php' . PMA_URL_getCommon($_url_params, 'text');
-
-            $del_query = 'DELETE FROM '
-                . Util::backquote($this->__get('table'))
-                . ' WHERE ' . $where_clause .
-                ($clause_is_unique ? '' : ' LIMIT 1');
-
-            $_url_params = array(
-                    'db'        => $this->__get('db'),
-                    'table'     => $this->__get('table'),
-                    'sql_query' => $del_query,
-                    'message_to_show' => __('The row has been deleted.'),
-                    'goto'      => $lnk_goto,
-                );
-            $del_url  = 'sql.php' . PMA_URL_getCommon($_url_params);
-
-            $js_conf  = 'DELETE FROM ' . PMA_jsFormat($this->__get('table'))
-                . ' WHERE ' . PMA_jsFormat($where_clause, false)
-                . ($clause_is_unique ? '' : ' LIMIT 1');
-
-            $del_str = $this->_getActionLinkContent('b_drop.png', __('Delete'));
-
-        } elseif ($del_lnk == self::KILL_PROCESS) { // kill process case
-
-            $_url_params = array(
-                    'db'        => $this->__get('db'),
-                    'table'     => $this->__get('table'),
-                    'sql_query' => $url_sql_query,
-                    'goto'      => 'index.php',
-                );
-
-            $lnk_goto = 'sql.php'
-                . PMA_URL_getCommon(
-                    $_url_params, 'text'
-                );
-
-            $kill = $GLOBALS['dbi']->getKillQuery($row[0]);
-
-            $_url_params = array(
-                    'db'        => 'mysql',
-                    'sql_query' => $kill,
-                    'goto'      => $lnk_goto,
-                );
-
-            $del_url  = 'sql.php' . PMA_URL_getCommon($_url_params);
-            $js_conf  = $kill;
-            $del_str = Util::getIcon(
-                'b_drop.png', __('Kill')
-            );
-        } else {
-            $del_url = $del_str = $js_conf = null;
-        }
-
-        return array($del_url, $del_str, $js_conf);
-
-    } // end of the '_getDeleteAndKillLinks()' function
-
-
-    /**
-     * Get content inside the table row action links (Edit/Copy/Delete)
-     *
-     * @param string $icon         The name of the file to get
-     * @param string $display_text The text displaying after the image icon
-     *
-     * @return  string
-     *
-     * @access  private
-     *
-     * @see     _getModifiedLinks(), _getDeleteAndKillLinks()
-     */
-    private function _getActionLinkContent($icon, $display_text)
-    {
-
-        $linkContent = '';
-
-        if (isset($GLOBALS['cfg']['RowActionType'])
-            && $GLOBALS['cfg']['RowActionType'] == self::ACTION_LINK_CONTENT_ICONS
-        ) {
-
-            $linkContent .= '<span class="nowrap">'
-                . Util::getImage(
-                    $icon, $display_text
-                )
-                . '</span>';
-
-        } else if (isset($GLOBALS['cfg']['RowActionType'])
-            && $GLOBALS['cfg']['RowActionType'] == self::ACTION_LINK_CONTENT_TEXT
-        ) {
-
-            $linkContent .= '<span class="nowrap">' . $display_text . '</span>';
-
-        } else {
-
-            $linkContent .= Util::getIcon(
-                $icon, $display_text
-            );
-
-        }
-
-        return $linkContent;
-
-    }
-
-
-    /**
-     * Prepare placed links
-     *
-     * @param string  $dir               the direction of links should place
-     * @param string  $del_url           the url for delete row
-     * @param array   $displayParts      which elements to display
-     * @param integer $row_no            the index of current row
-     * @param string  $where_clause      the where clause of the sql
-     * @param string  $where_clause_html the html encoded where clause
-     * @param array   $condition_array   array of keys (primary, unique, condition)
-     * @param string  $edit_url          the url for edit row
-     * @param string  $copy_url          the url for copy row
-     * @param string  $edit_anchor_class the class for html element for edit
-     * @param string  $edit_str          the label for edit row
-     * @param string  $copy_str          the label for copy row
-     * @param string  $del_str           the label for delete row
-     * @param string  $js_conf           text for the JS confirmation
-     *
-     * @return  string                      html content
-     *
-     * @access  private
-     *
-     * @see     _getTableBody()
-     */
-    private function _getPlacedLinks(
-        $dir, $del_url, $displayParts, $row_no, $where_clause, $where_clause_html,
-        $condition_array, $edit_url, $copy_url,
-        $edit_anchor_class, $edit_str, $copy_str, $del_str, $js_conf
-    ) {
-
-        if (! isset($js_conf)) {
-            $js_conf = '';
-        }
-
-        return $this->_getCheckboxAndLinks(
-            $dir, $del_url, $displayParts,
-            $row_no, $where_clause, $where_clause_html, $condition_array,
-            $edit_url, $copy_url, $edit_anchor_class,
-            $edit_str, $copy_str, $del_str, $js_conf
-        );
-
-    } // end of the '_getPlacedLinks()' function
-
-
-    /**
-     * Get the combined classes for a column
-     *
-     * @param string $grid_edit_class  the class for all editable columns
-     * @param string $not_null_class   the class for not null columns
-     * @param string $relation_class   the class for relations in a column
-     * @param string $hide_class       the class for visibility of a column
-     * @param string $field_type_class the class related to type of the field
-     *
-     * @return string $class the combined classes
-     *
-     * @access  private
-     *
-     * @see     _getTableBody()
-     */
-    private function _getClassesForColumn(
-        $grid_edit_class, $not_null_class, $relation_class,
-        $hide_class, $field_type_class
-    ) {
-        $class = 'data ' . $grid_edit_class . ' ' . $not_null_class . ' '
-            . $relation_class . ' ' . $hide_class . ' ' . $field_type_class;
-
-        return $class;
-
-    } // end of the '_getClassesForColumn()' function
-
-
-    /**
-     * Get class for datetime related fields
-     *
-     * @param string $type the type of the column field
-     *
-     * @return  string  $field_type_class   the class for the column
-     *
-     * @access  private
-     *
-     * @see     _getTableBody()
-     */
-    private function _getClassForDateTimeRelatedFields($type)
-    {
-        if ((substr($type, 0, 9) == self::TIMESTAMP_FIELD)
-            || ($type == self::DATETIME_FIELD)
-        ) {
-            $field_type_class = 'datetimefield';
-        } elseif ($type == self::DATE_FIELD) {
-            $field_type_class = 'datefield';
-        } elseif ($type == self::TIME_FIELD) {
-            $field_type_class = 'timefield';
-        } elseif ($type == self::STRING_FIELD) {
-            $field_type_class = 'text';
-        } else {
-            $field_type_class = '';
-        }
-        return $field_type_class;
-    } // end of the '_getClassForDateTimeRelatedFields()' function
-
-
-    /**
-     * Prepare data cell for numeric type fields
-     *
-     * @param string        $column                the column's value
-     * @param string        $class                 the html class for column
-     * @param boolean       $condition_field       the column should highlighted
-     *                                             or not
-     * @param object        $meta                  the meta-information about this
-     *                                             field
-     * @param array         $map                   the list of relations
-     * @param boolean       $is_field_truncated    the condition for blob data
-     *                                             replacements
-     * @param array         $analyzed_sql_results  the analyzed query
-     * @param object|string $transformation_plugin the name of transformation plugin
-     * @param string        $default_function      the default transformation
-     *                                             function
-     * @param string        $transform_options     the transformation parameters
-     *
-     * @return  string  $cell the prepared cell, html content
-     *
-     * @access  private
-     *
-     * @see     _getTableBody()
-     */
-    private function _getDataCellForNumericColumns(
-        $column, $class, $condition_field, $meta, $map, $is_field_truncated,
-        $analyzed_sql_results, $transformation_plugin, $default_function,
-        $transform_options
-    ) {
-
-        if (! isset($column) || is_null($column)) {
-
-            $cell = $this->_buildNullDisplay(
-                'right ' . $class, $condition_field, $meta, ''
-            );
-
-        } elseif ($column != '') {
-
-            $nowrap = ' nowrap';
-            $where_comparison = ' = ' . $column;
-
-            $cell = $this->_getRowData(
-                'right ' . $class, $condition_field,
-                $analyzed_sql_results, $meta, $map, $column,
-                $transformation_plugin, $default_function, $nowrap,
-                $where_comparison, $transform_options,
-                $is_field_truncated, ''
-            );
-        } else {
-
-            $cell = $this->_buildEmptyDisplay(
-                'right ' . $class, $condition_field, $meta, ''
-            );
-        }
-
-        return $cell;
-
-    } // end of the '_getDataCellForNumericColumns()' function
-
-
-    /**
-     * Get data cell for geometry type fields
-     *
-     * @param string        $column                the relevant column in data row
-     * @param string        $class                 the html class for column
-     * @param object        $meta                  the meta-information about
-     *                                             this field
-     * @param array         $map                   the list of relations
-     * @param array         $_url_params           the parameters for generate url
-     * @param boolean       $condition_field       the column should highlighted
-     *                                             or not
-     * @param object|string $transformation_plugin the name of transformation
-     *                                             function
-     * @param string        $default_function      the default transformation
-     *                                             function
-     * @param string        $transform_options     the transformation parameters
-     * @param array         $analyzed_sql_results  the analyzed query
-     *
-     * @return  string  $cell                  the prepared data cell, html content
-     *
-     * @access  private
-     *
-     * @see     _getTableBody()
-     */
-    private function _getDataCellForGeometryColumns(
-        $column, $class, $meta, $map, $_url_params, $condition_field,
-        $transformation_plugin, $default_function, $transform_options,
-        $analyzed_sql_results
-    ) {
-        if (! isset($column) || is_null($column)) {
-            $cell = $this->_buildNullDisplay($class, $condition_field, $meta);
-            return $cell;
-        }
-
-        if ($column == '') {
-            $cell = $this->_buildEmptyDisplay($class, $condition_field, $meta);
-            return $cell;
-        }
-
-        // Display as [GEOMETRY - (size)]
-        if ($_SESSION['tmpval']['geoOption'] == self::GEOMETRY_DISP_GEOM) {
-            $geometry_text = $this->_handleNonPrintableContents(
-                strtoupper(self::GEOMETRY_FIELD), $column, $transformation_plugin,
-                $transform_options, $default_function, $meta, $_url_params
-            );
-
-            $cell = $this->_buildValueDisplay(
-                $class, $condition_field, $geometry_text
-            );
-            return $cell;
-        }
-
-        if ($_SESSION['tmpval']['geoOption'] == self::GEOMETRY_DISP_WKT) {
-            // Prepare in Well Known Text(WKT) format.
-            $where_comparison = ' = ' . $column;
-
-            // Convert to WKT format
-            $wktval = Util::asWKT($column);
-            list(
-                $is_field_truncated,
-                $wktval,
-                // skip 3rd param
-            ) = $this->_getPartialText($wktval);
-
-            $cell = $this->_getRowData(
-                $class, $condition_field, $analyzed_sql_results, $meta, $map,
-                $wktval, $transformation_plugin, $default_function, '',
-                $where_comparison, $transform_options,
-                $is_field_truncated, ''
-            );
-            return $cell;
-        }
-
-        // Prepare in  Well Known Binary (WKB) format.
-
-        if ($_SESSION['tmpval']['display_binary']) {
-            $where_comparison = ' = ' . $column;
-
-            $wkbval = substr(bin2hex($column), 8);
-            list(
-                $is_field_truncated,
-                $wkbval,
-                // skip 3rd param
-            ) = $this->_getPartialText($wkbval);
-
-            $cell = $this->_getRowData(
-                $class, $condition_field,
-                $analyzed_sql_results, $meta, $map, $wkbval,
-                $transformation_plugin, $default_function, '',
-                $where_comparison, $transform_options,
-                $is_field_truncated, ''
-            );
-            return $cell;
-        }
-
-        $wkbval = $this->_handleNonPrintableContents(
-            self::BINARY_FIELD, $column, $transformation_plugin,
-            $transform_options, $default_function, $meta,
-            $_url_params
-        );
-
-        $cell = $this->_buildValueDisplay(
-            $class, $condition_field, $wkbval
-        );
-
-        return $cell;
-
-    } // end of the '_getDataCellForGeometryColumns()' function
-
-
-    /**
-     * Get data cell for non numeric type fields
-     *
-     * @param string        $column                the relevant column in data row
-     * @param string        $class                 the html class for column
-     * @param object        $meta                  the meta-information about
-     *                                             the field
-     * @param array         $map                   the list of relations
-     * @param array         $_url_params           the parameters for generate
-     *                                             url
-     * @param boolean       $condition_field       the column should highlighted
-     *                                             or not
-     * @param object|string $transformation_plugin the name of transformation
-     *                                             function
-     * @param string        $default_function      the default transformation
-     *                                             function
-     * @param string        $transform_options     the transformation parameters
-     * @param boolean       $is_field_truncated    is data truncated due to
-     *                                             LimitChars
-     * @param array         $analyzed_sql_results  the analyzed query
-     * @param integer       &$dt_result            the link id associated to
-     *                                             the query which results
-     *                                             have to be displayed
-     * @param integer       $col_index             the column index
-     *
-     * @return  string  $cell the prepared data cell, html content
-     *
-     * @access  private
-     *
-     * @see     _getTableBody()
-     */
-    private function _getDataCellForNonNumericColumns(
-        $column, $class, $meta, $map, $_url_params, $condition_field,
-        $transformation_plugin, $default_function, $transform_options,
-        $is_field_truncated, $analyzed_sql_results, &$dt_result, $col_index
-    ) {
-        $original_length = 0;
-
-        $is_analyse = $this->__get('is_analyse');
-        $field_flags = $GLOBALS['dbi']->fieldFlags($dt_result, $col_index);
-
-        $bIsText = gettype($transformation_plugin) === 'object'
-            && strpos($transformation_plugin->getMIMEtype(), 'Text')
-            === false;
-
-        // disable inline grid editing
-        // if binary fields are protected
-        // or transformation plugin is of non text type
-        // such as image
-        if ((stristr($field_flags, self::BINARY_FIELD)
-            && ($GLOBALS['cfg']['ProtectBinary'] === 'all'
-            || ($GLOBALS['cfg']['ProtectBinary'] === 'noblob'
-            && !stristr($meta->type, self::BLOB_FIELD))
-            || ($GLOBALS['cfg']['ProtectBinary'] === 'blob'
-            && stristr($meta->type, self::BLOB_FIELD))))
-            || $bIsText
-        ) {
-            $class = str_replace('grid_edit', '', $class);
-        }
-
-        if (! isset($column) || is_null($column)) {
-            $cell = $this->_buildNullDisplay($class, $condition_field, $meta);
-            return $cell;
-        }
-
-        if ($column == '') {
-            $cell = $this->_buildEmptyDisplay($class, $condition_field, $meta);
-            return $cell;
-        }
-
-        // Cut all fields to $GLOBALS['cfg']['LimitChars']
-        // (unless it's a link-type transformation or binary)
-        if (!(gettype($transformation_plugin) === "object"
-            && strpos($transformation_plugin->getName(), 'Link') !== false)
-            && !stristr($field_flags, self::BINARY_FIELD)
-        ) {
-            list(
-                $is_field_truncated,
-                $column,
-                $original_length
-            ) = $this->_getPartialText($column);
-        }
-
-        $formatted = false;
-        if (isset($meta->_type) && $meta->_type === MYSQLI_TYPE_BIT) {
-
-            $column = Util::printableBitValue(
-                $column, $meta->length
-            );
-
-            // some results of PROCEDURE ANALYSE() are reported as
-            // being BINARY but they are quite readable,
-            // so don't treat them as BINARY
-        } elseif (stristr($field_flags, self::BINARY_FIELD)
-            && !(isset($is_analyse) && $is_analyse)
-        ) {
-            // we show the BINARY or BLOB message and field's size
-            // (or maybe use a transformation)
-            $binary_or_blob = self::BLOB_FIELD;
-            if ($meta->type === self::STRING_FIELD) {
-                $binary_or_blob = self::BINARY_FIELD;
-            }
-            $column = $this->_handleNonPrintableContents(
-                $binary_or_blob, $column, $transformation_plugin,
-                $transform_options, $default_function,
-                $meta, $_url_params, $is_field_truncated
-            );
-            $class = $this->_addClass(
-                $class, $condition_field, $meta, '',
-                $is_field_truncated, $transformation_plugin, $default_function
-            );
-            $result = strip_tags($column);
-            // disable inline grid editing
-            // if binary or blob data is not shown
-            if (stristr($result, $binary_or_blob)) {
-                $class = str_replace('grid_edit', '', $class);
-            }
-            $formatted = true;
-        }
-
-        if ($formatted) {
-            $cell = $this->_buildValueDisplay(
-                $class, $condition_field, $column
-            );
-            return $cell;
-        }
-
-        // transform functions may enable no-wrapping:
-        $function_nowrap = 'applyTransformationNoWrap';
-
-        $bool_nowrap = (($default_function != $transformation_plugin)
-            && function_exists($transformation_plugin->$function_nowrap()))
-            ? $transformation_plugin->$function_nowrap($transform_options)
-            : false;
-
-        // do not wrap if date field type
-        $nowrap = (preg_match('@DATE|TIME@i', $meta->type)
-            || $bool_nowrap) ? ' nowrap' : '';
-
-        $where_comparison = ' = \''
-            . $GLOBALS['dbi']->escapeString($column)
-            . '\'';
-
-        $cell = $this->_getRowData(
-            $class, $condition_field,
-            $analyzed_sql_results, $meta, $map, $column,
-            $transformation_plugin, $default_function, $nowrap,
-            $where_comparison, $transform_options,
-            $is_field_truncated, $original_length
-        );
-
-        return $cell;
-
-    } // end of the '_getDataCellForNonNumericColumns()' function
-
-    /**
-     * Checks the posted options for viewing query results
-     * and sets appropriate values in the session.
-     *
-     * @todo    make maximum remembered queries configurable
-     * @todo    move/split into SQL class!?
-     * @todo    currently this is called twice unnecessary
-     * @todo    ignore LIMIT and ORDER in query!?
-     *
-     * @return void
-     *
-     * @access  public
-     *
-     * @see     sql.php file
-     */
-    public function setConfigParamsForDisplayTable()
-    {
-
-        $sql_md5 = md5($this->__get('sql_query'));
-        $query = array();
-        if (isset($_SESSION['tmpval']['query'][$sql_md5])) {
-            $query = $_SESSION['tmpval']['query'][$sql_md5];
-        }
-
-        $query['sql'] = $this->__get('sql_query');
-
-        if (empty($query['repeat_cells'])) {
-            $query['repeat_cells'] = $GLOBALS['cfg']['RepeatCells'];
-        }
-
-        // as this is a form value, the type is always string so we cannot
-        // use PMA_isValid($_REQUEST['session_max_rows'], 'integer')
-        if (PMA_isValid($_REQUEST['session_max_rows'], 'numeric')) {
-            $query['max_rows'] = (int)$_REQUEST['session_max_rows'];
-            unset($_REQUEST['session_max_rows']);
-        } elseif ($_REQUEST['session_max_rows'] == self::ALL_ROWS) {
-            $query['max_rows'] = self::ALL_ROWS;
-            unset($_REQUEST['session_max_rows']);
-        } elseif (empty($query['max_rows'])) {
-            $query['max_rows'] = intval($GLOBALS['cfg']['MaxRows']);
-        }
-
-        if (PMA_isValid($_REQUEST['pos'], 'numeric')) {
-            $query['pos'] = $_REQUEST['pos'];
-            unset($_REQUEST['pos']);
-        } elseif (empty($query['pos'])) {
-            $query['pos'] = 0;
-        }
-
-        if (PMA_isValid(
-            $_REQUEST['pftext'],
-            array(
-                self::DISPLAY_PARTIAL_TEXT, self::DISPLAY_FULL_TEXT
-            )
-        )
-        ) {
-            $query['pftext'] = $_REQUEST['pftext'];
-            unset($_REQUEST['pftext']);
-        } elseif (empty($query['pftext'])) {
-            $query['pftext'] = self::DISPLAY_PARTIAL_TEXT;
-        }
-
-        if (PMA_isValid(
-            $_REQUEST['relational_display'],
-            array(
-                self::RELATIONAL_KEY, self::RELATIONAL_DISPLAY_COLUMN
-            )
-        )
-        ) {
-            $query['relational_display'] = $_REQUEST['relational_display'];
-            unset($_REQUEST['relational_display']);
-        } elseif (empty($query['relational_display'])) {
-            // The current session value has priority over a
-            // change via Settings; this change will be apparent
-            // starting from the next session
-            $query['relational_display'] = $GLOBALS['cfg']['RelationalDisplay'];
-        }
-
-        if (PMA_isValid(
-            $_REQUEST['geoOption'],
-            array(
-                self::GEOMETRY_DISP_WKT, self::GEOMETRY_DISP_WKB,
-                self::GEOMETRY_DISP_GEOM
-            )
-        )
-        ) {
-            $query['geoOption'] = $_REQUEST['geoOption'];
-            unset($_REQUEST['geoOption']);
-        } elseif (empty($query['geoOption'])) {
-            $query['geoOption'] = self::GEOMETRY_DISP_GEOM;
-        }
-
-        if (isset($_REQUEST['display_binary'])) {
-            $query['display_binary'] = true;
-            unset($_REQUEST['display_binary']);
-        } elseif (isset($_REQUEST['display_options_form'])) {
-            // we know that the checkbox was unchecked
-            unset($query['display_binary']);
-        } elseif (isset($_REQUEST['full_text_button'])) {
-            // do nothing to keep the value that is there in the session
-        } else {
-            // selected by default because some operations like OPTIMIZE TABLE
-            // and all queries involving functions return "binary" contents,
-            // according to low-level field flags
-            $query['display_binary'] = true;
-        }
-
-        if (isset($_REQUEST['display_blob'])) {
-            $query['display_blob'] = true;
-            unset($_REQUEST['display_blob']);
-        } elseif (isset($_REQUEST['display_options_form'])) {
-            // we know that the checkbox was unchecked
-            unset($query['display_blob']);
-        }
-
-        if (isset($_REQUEST['hide_transformation'])) {
-            $query['hide_transformation'] = true;
-            unset($_REQUEST['hide_transformation']);
-        } elseif (isset($_REQUEST['display_options_form'])) {
-            // we know that the checkbox was unchecked
-            unset($query['hide_transformation']);
-        }
-
-        // move current query to the last position, to be removed last
-        // so only least executed query will be removed if maximum remembered
-        // queries limit is reached
-        unset($_SESSION['tmpval']['query'][$sql_md5]);
-        $_SESSION['tmpval']['query'][$sql_md5] = $query;
-
-        // do not exceed a maximum number of queries to remember
-        if (count($_SESSION['tmpval']['query']) > 10) {
-            array_shift($_SESSION['tmpval']['query']);
-            //echo 'deleting one element ...';
-        }
-
-        // populate query configuration
-        $_SESSION['tmpval']['pftext']
-            = $query['pftext'];
-        $_SESSION['tmpval']['relational_display']
-            = $query['relational_display'];
-        $_SESSION['tmpval']['geoOption']
-            = $query['geoOption'];
-        $_SESSION['tmpval']['display_binary'] = isset(
-            $query['display_binary']
-        );
-        $_SESSION['tmpval']['display_blob'] = isset(
-            $query['display_blob']
-        );
-        $_SESSION['tmpval']['hide_transformation'] = isset(
-            $query['hide_transformation']
-        );
-        $_SESSION['tmpval']['pos']
-            = $query['pos'];
-        $_SESSION['tmpval']['max_rows']
-            = $query['max_rows'];
-        $_SESSION['tmpval']['repeat_cells']
-            = $query['repeat_cells'];
-    }
-
-    /**
-     * Prepare a table of results returned by a SQL query.
-     *
-     * @param integer &$dt_result           the link id associated to the query
-     *                                      which results have to be displayed
-     * @param array   &$displayParts        the parts to display
-     * @param array   $analyzed_sql_results analyzed sql results
-     * @param boolean $is_limited_display   With limited operations or not
-     *
-     * @return  string   $table_html   Generated HTML content for resulted table
-     *
-     * @access  public
-     *
-     * @see     sql.php file
-     */
-    public function getTable(
-        &$dt_result, &$displayParts, $analyzed_sql_results,
-        $is_limited_display = false
-    ) {
-
-        /**
-         * The statement this table is built for.
-         * @var \SqlParser\Statements\SelectStatement
-         */
-        $statement = $analyzed_sql_results['statement'];
-
-        $table_html = '';
-        // Following variable are needed for use in isset/empty or
-        // use with array indexes/safe use in foreach
-        $fields_meta = $this->__get('fields_meta');
-        $showtable = $this->__get('showtable');
-        $printview = $this->__get('printview');
-
-        // why was this called here? (already called from sql.php)
-        //$this->setConfigParamsForDisplayTable();
-
-        /**
-         * @todo move this to a central place
-         * @todo for other future table types
-         */
-        $is_innodb = (isset($showtable['Type'])
-            && $showtable['Type'] == self::TABLE_TYPE_INNO_DB);
-
-        if ($is_innodb
-            && PMA_isJustBrowsing($analyzed_sql_results, true)
-        ) {
-            // "j u s t   b r o w s i n g"
-            $pre_count = '~';
-            $after_count = Util::showHint(
-                PMA_sanitize(
-                    __('May be approximate. See [doc@faq3-11]FAQ 3.11[/doc].')
-                )
-            );
-        } else {
-            $pre_count = '';
-            $after_count = '';
-        }
-
-        // 1. ----- Prepares the work -----
-
-        // 1.1 Gets the information about which functionalities should be
-        //     displayed
-
-        list(
-            $displayParts,
-            $total
-        )  = $this->_setDisplayPartsAndTotal($displayParts);
-
-        // 1.2 Defines offsets for the next and previous pages
-        if ($displayParts['nav_bar'] == '1') {
-            list($pos_next, $pos_prev) = $this->_getOffsets();
-        } // end if
-
-        // 1.3 Extract sorting expressions.
-        //     we need $sort_expression and $sort_expression_nodirection
-        //     even if there are many table references
-        $sort_expression = array();
-        $sort_expression_nodirection = array();
-        $sort_direction = array();
-
-        if (!empty($statement->order)) {
-            foreach ($statement->order as $o) {
-                $sort_expression[] = $o->expr->expr . ' ' . $o->type;
-                $sort_expression_nodirection[] = $o->expr->expr;
-                $sort_direction[] = $o->type;
-            }
-        } else {
-            $sort_expression[] = '';
-            $sort_expression_nodirection[] = '';
-            $sort_direction[] = '';
-        }
-
-        $number_of_columns = count($sort_expression_nodirection);
-
-        // 1.4 Prepares display of first and last value of the sorted column
-        $sorted_column_message = '';
-        for ( $i = 0; $i < $number_of_columns; $i++ ) {
-            $sorted_column_message .= $this->_getSortedColumnMessage(
-                $dt_result, $sort_expression_nodirection[$i]
-            );
-        }
-
-        // 2. ----- Prepare to display the top of the page -----
-
-        // 2.1 Prepares a messages with position information
-        if (($displayParts['nav_bar'] == '1') && isset($pos_next)) {
-
-            $message = $this->_setMessageInformation(
-                $sorted_column_message,
-                $analyzed_sql_results,
-                $total,
-                $pos_next,
-                $pre_count,
-                $after_count
-            );
-
-            $table_html .= Util::getMessage(
-                $message, $this->__get('sql_query'), 'success'
-            );
-
-        } elseif ((!isset($printview) || ($printview != '1')) && !$is_limited_display) {
-
-            $table_html .= Util::getMessage(
-                __('Your SQL query has been executed successfully.'),
-                $this->__get('sql_query'), 'success'
-            );
-        }
-
-        // 2.3 Prepare the navigation bars
-        if (!mb_strlen($this->__get('table'))) {
-
-            if ($analyzed_sql_results['querytype'] == 'SELECT') {
-                // table does not always contain a real table name,
-                // for example in MySQL 5.0.x, the query SHOW STATUS
-                // returns STATUS as a table name
-                $this->__set('table', $fields_meta[0]->table);
-            } else {
-                $this->__set('table', '');
-            }
-
-        }
-
-        // can the result be sorted?
-        if ($displayParts['sort_lnk'] == '1') {
-
-            // At this point, $sort_expression is an array but we only verify
-            // the first element in case we could find that the table is
-            // sorted by one of the choices listed in the
-            // "Sort by key" drop-down
-            list($unsorted_sql_query, $sort_by_key_html)
-                = $this->_getUnsortedSqlAndSortByKeyDropDown(
-                    $analyzed_sql_results, $sort_expression[0]
-                );
-
-        } else {
-            $sort_by_key_html = $unsorted_sql_query = '';
-        }
-
-        if (($displayParts['nav_bar'] == '1') && (empty($statement->limit))) {
-            $table_html .= $this->_getPlacedTableNavigations(
-                $pos_next, $pos_prev, self::PLACE_TOP_DIRECTION_DROPDOWN,
-                $is_innodb, $sort_by_key_html
-            );
-        }
-
-        // 2b ----- Get field references from Database -----
-        // (see the 'relation' configuration variable)
-
-        // initialize map
-        $map = array();
-
-        $target = array();
-        if (!empty($statement->from)) {
-            foreach ($statement->from as $field) {
-                if (!empty($field->table)) {
-                    $target[] = $field->table;
-                }
-            }
-        }
-
-        if (mb_strlen($this->__get('table'))) {
-            // This method set the values for $map array
-            $this->_setParamForLinkForeignKeyRelatedTables($map);
-
-            // Coming from 'Distinct values' action of structure page
-            // We manipulate relations mechanism to show a link to related rows.
-            if ($this->__get('is_browse_distinct')) {
-                $map[$fields_meta[1]->name] = array(
-                    $this->__get('table'),
-                    $fields_meta[1]->name,
-                    '',
-                    $this->__get('db')
-                );
-            }
-        } // end if
-        // end 2b
-
-        // 3. ----- Prepare the results table -----
-        if ($is_limited_display) {
-            $table_html .= "<br>";
-        }
-
-        $table_html .= $this->_getTableHeaders(
-            $displayParts,
-            $analyzed_sql_results,
-            $unsorted_sql_query,
-            $sort_expression,
-            $sort_expression_nodirection,
-            $sort_direction,
-            $is_limited_display
-        );
-
-        $table_html .= '<tbody>' . "\n";
-
-        $table_html .= $this->_getTableBody(
-            $dt_result,
-            $displayParts,
-            $map,
-            $analyzed_sql_results,
-            $is_limited_display
-        );
-
-        $this->__set('display_params', null);
-
-        $table_html .= '</tbody>' . "\n" . '</table>';
-
-        // 4. ----- Prepares the link for multi-fields edit and delete
-
-        if ($displayParts['del_lnk'] == self::DELETE_ROW
-            && $displayParts['del_lnk'] != self::KILL_PROCESS
-        ) {
-
-            $table_html .= $this->_getMultiRowOperationLinks(
-                $dt_result,
-                $analyzed_sql_results,
-                $displayParts['del_lnk']
-            );
-
-        }
-
-        // 5. ----- Get the navigation bar at the bottom if required -----
-        if (($displayParts['nav_bar'] == '1') && empty($statement->limit)) {
-            $table_html .= $this->_getPlacedTableNavigations(
-                $pos_next, $pos_prev, self::PLACE_BOTTOM_DIRECTION_DROPDOWN,
-                $is_innodb, $sort_by_key_html
-            );
-        } elseif (! isset($printview) || ($printview != '1')) {
-            $table_html .= "\n" . '<br /><br />' . "\n";
-        }
-
-        // 6. ----- Prepare "Query results operations"
-        if ((! isset($printview) || ($printview != '1')) && ! $is_limited_display) {
-            $table_html .= $this->_getResultsOperations(
-                $displayParts, $analyzed_sql_results
-            );
-        }
-
-        return $table_html;
-
-    } // end of the 'getTable()' function
-
-
-    /**
-     * Get offsets for next page and previous page
-     *
-     * @return  array           array with two elements - $pos_next, $pos_prev
-     *
-     * @access  private
-     *
-     * @see     getTable()
-     */
-    private function _getOffsets()
-    {
-
-        if ($_SESSION['tmpval']['max_rows'] == self::ALL_ROWS) {
-            $pos_next     = 0;
-            $pos_prev     = 0;
-        } else {
-
-            $pos_next     = $_SESSION['tmpval']['pos']
-                            + $_SESSION['tmpval']['max_rows'];
-
-            $pos_prev     = $_SESSION['tmpval']['pos']
-                            - $_SESSION['tmpval']['max_rows'];
-
-            if ($pos_prev < 0) {
-                $pos_prev = 0;
-            }
-        }
-
-        return array($pos_next, $pos_prev);
-
-    } // end of the '_getOffsets()' function
-
-
-    /**
-     * Prepare sorted column message
-     *
-     * @param integer &$dt_result                  the link id associated to the
-     *                                              query which results have to
-     *                                              be displayed
-     * @param string  $sort_expression_nodirection sort expression without direction
-     *
-     * @return  string                              html content
-     *          null                                if not found sorted column
-     *
-     * @access  private
-     *
-     * @see     getTable()
-     */
-    private function _getSortedColumnMessage(
-        &$dt_result, $sort_expression_nodirection
-    ) {
-
-        $fields_meta = $this->__get('fields_meta'); // To use array indexes
-
-        if (empty($sort_expression_nodirection)) {
-            return null;
-        }
-
-        if (mb_strpos($sort_expression_nodirection, '.') === false) {
-            $sort_table = $this->__get('table');
-            $sort_column = $sort_expression_nodirection;
-        } else {
-            list($sort_table, $sort_column)
-                = explode('.', $sort_expression_nodirection);
-        }
-
-        $sort_table = Util::unQuote($sort_table);
-        $sort_column = Util::unQuote($sort_column);
-
-        // find the sorted column index in row result
-        // (this might be a multi-table query)
-        $sorted_column_index = false;
-
-        foreach ($fields_meta as $key => $meta) {
-            if (($meta->table == $sort_table) && ($meta->name == $sort_column)) {
-                $sorted_column_index = $key;
-                break;
-            }
-        }
-
-        if ($sorted_column_index === false) {
-            return null;
-        }
-
-        // fetch first row of the result set
-        $row = $GLOBALS['dbi']->fetchRow($dt_result);
-
-        // initializing default arguments
-        $default_function = 'PMA_mimeDefaultFunction';
-        $transformation_plugin = $default_function;
-        $transform_options = array();
-
-        // check for non printable sorted row data
-        $meta = $fields_meta[$sorted_column_index];
-
-        if (stristr($meta->type, self::BLOB_FIELD)
-            || ($meta->type == self::GEOMETRY_FIELD)
-        ) {
-
-            $column_for_first_row = $this->_handleNonPrintableContents(
-                $meta->type, $row[$sorted_column_index],
-                $transformation_plugin, $transform_options,
-                $default_function, $meta
-            );
-
-        } else {
-            $column_for_first_row = $row[$sorted_column_index];
-        }
-
-        $column_for_first_row = mb_strtoupper(
-            mb_substr(
-                $column_for_first_row, 0, $GLOBALS['cfg']['LimitChars']
-            ) . '...'
-        );
-
-        // fetch last row of the result set
-        $GLOBALS['dbi']->dataSeek($dt_result, $this->__get('num_rows') - 1);
-        $row = $GLOBALS['dbi']->fetchRow($dt_result);
-
-        // check for non printable sorted row data
-        $meta = $fields_meta[$sorted_column_index];
-        if (stristr($meta->type, self::BLOB_FIELD)
-            || ($meta->type == self::GEOMETRY_FIELD)
-        ) {
-
-            $column_for_last_row = $this->_handleNonPrintableContents(
-                $meta->type, $row[$sorted_column_index],
-                $transformation_plugin, $transform_options,
-                $default_function, $meta
-            );
-
-        } else {
-            $column_for_last_row = $row[$sorted_column_index];
-        }
-
-        $column_for_last_row = mb_strtoupper(
-            mb_substr(
-                $column_for_last_row, 0, $GLOBALS['cfg']['LimitChars']
-            ) . '...'
-        );
-
-        // reset to first row for the loop in _getTableBody()
-        $GLOBALS['dbi']->dataSeek($dt_result, 0);
-
-        // we could also use here $sort_expression_nodirection
-        return ' [' . htmlspecialchars($sort_column)
-            . ': <strong>' . htmlspecialchars($column_for_first_row) . ' - '
-            . htmlspecialchars($column_for_last_row) . '</strong>]';
-    } // end of the '_getSortedColumnMessage()' function
-
-
-    /**
-     * Set the content that needs to be shown in message
-     *
-     * @param string  $sorted_column_message the message for sorted column
-     * @param array   $analyzed_sql_results  the analyzed query
-     * @param integer $total                 the total number of rows returned by
-     *                                       the SQL query without any
-     *                                       programmatically appended LIMIT clause
-     * @param integer $pos_next              the offset for next page
-     * @param string  $pre_count             the string renders before row count
-     * @param string  $after_count           the string renders after row count
-     *
-     * @return Message $message an object of Message
-     *
-     * @access  private
-     *
-     * @see     getTable()
-     */
-    private function _setMessageInformation(
-        $sorted_column_message, $analyzed_sql_results, $total,
-        $pos_next, $pre_count, $after_count
-    ) {
-
-        $unlim_num_rows = $this->__get('unlim_num_rows'); // To use in isset()
-
-        if (!empty($analyzed_sql_results['statement']->limit)) {
-
-            $first_shown_rec = $analyzed_sql_results['statement']->limit->offset;
-            $row_count = $analyzed_sql_results['statement']->limit->rowCount;
-
-            if ($row_count < $total) {
-                $last_shown_rec = $first_shown_rec + $row_count - 1;
-            } else {
-                $last_shown_rec = $first_shown_rec + $total - 1;
-            }
-
-        } elseif (($_SESSION['tmpval']['max_rows'] == self::ALL_ROWS)
-            || ($pos_next > $total)
-        ) {
-
-            $first_shown_rec = $_SESSION['tmpval']['pos'];
-            $last_shown_rec  = $total - 1;
-
-        } else {
-
-            $first_shown_rec = $_SESSION['tmpval']['pos'];
-            $last_shown_rec  = $pos_next - 1;
-
-        }
-
-        $table = new Table($this->__get('table'), $this->__get('db'));
-        if ($table->isView()
-            && ($total == $GLOBALS['cfg']['MaxExactCountViews'])
-        ) {
-
-            $message = Message::notice(
-                __(
-                    'This view has at least this number of rows. '
-                    . 'Please refer to %sdocumentation%s.'
-                )
-            );
-
-            $message->addParam('[doc@cfg_MaxExactCount]');
-            $message->addParam('[/doc]');
-            $message_view_warning = Util::showHint($message);
-
-        } else {
-            $message_view_warning = false;
-        }
-
-        $message = Message::success(__('Showing rows %1s - %2s'));
-        $message->addParam($first_shown_rec);
-
-        if ($message_view_warning !== false) {
-            $message->addParam('... ' . $message_view_warning, false);
-        } else {
-            $message->addParam($last_shown_rec);
-        }
-
-        $message->addMessage('(');
-
-        if ($message_view_warning === false) {
-
-            if (isset($unlim_num_rows) && ($unlim_num_rows != $total)) {
-                $message_total = Message::notice(
-                    $pre_count . __('%1$d total, %2$d in query')
-                );
-                $message_total->addParam($total);
-                $message_total->addParam($unlim_num_rows);
-            } else {
-                $message_total = Message::notice($pre_count . __('%d total'));
-                $message_total->addParam($total);
-            }
-
-            if (!empty($after_count)) {
-                $message_total->addMessage($after_count);
-            }
-            $message->addMessage($message_total, '');
-
-            $message->addMessage(', ', '');
-        }
-
-        $message_qt = Message::notice(__('Query took %01.4f seconds.') . ')');
-        $message_qt->addParam($this->__get('querytime'));
-
-        $message->addMessage($message_qt, '');
-        if (! is_null($sorted_column_message)) {
-            $message->addMessage($sorted_column_message, '');
-        }
-
-        return $message;
-
-    } // end of the '_setMessageInformation()' function
-
-
-    /**
-     * Set the value of $map array for linking foreign key related tables
-     *
-     * @param array &$map the list of relations
-     *
-     * @return  void
-     *
-     * @access  private
-     *
-     * @see      getTable()
-     */
-    private function _setParamForLinkForeignKeyRelatedTables(&$map)
-    {
-
-        // To be able to later display a link to the related table,
-        // we verify both types of relations: either those that are
-        // native foreign keys or those defined in the phpMyAdmin
-        // configuration storage. If no PMA storage, we won't be able
-        // to use the "column to display" notion (for example show
-        // the name related to a numeric id).
-        $exist_rel = PMA_getForeigners(
-            $this->__get('db'), $this->__get('table'), '', self::POSITION_BOTH
-        );
-
-        if (! empty($exist_rel)) {
-
-            foreach ($exist_rel as $master_field => $rel) {
-                if ($master_field != 'foreign_keys_data') {
-                    $display_field = PMA_getDisplayField(
-                        $rel['foreign_db'], $rel['foreign_table']
-                    );
-                    $map[$master_field] = array(
-                        $rel['foreign_table'],
-                        $rel['foreign_field'],
-                        $display_field,
-                        $rel['foreign_db']
-                    );
-                } else {
-                    foreach ($rel as $key => $one_key) {
-                        foreach ($one_key['index_list'] as $index => $one_field) {
-                            $display_field = PMA_getDisplayField(
-                                isset($one_key['ref_db_name'])
-                                ? $one_key['ref_db_name']
-                                : $GLOBALS['db'],
-                                $one_key['ref_table_name']
-                            );
-
-                            $map[$one_field] = array(
-                                $one_key['ref_table_name'],
-                                $one_key['ref_index_list'][$index],
-                                $display_field,
-                                isset($one_key['ref_db_name'])
-                                ? $one_key['ref_db_name']
-                                : $GLOBALS['db']
-                            );
-                        }
-                    }
-                }
-            } // end while
-        } // end if
-
-    } // end of the '_setParamForLinkForeignKeyRelatedTables()' function
-
-
-    /**
-     * Prepare multi field edit/delete links
-     *
-     * @param integer &$dt_result           the link id associated to the query which
-     *                                      results have to be displayed
-     * @param array   $analyzed_sql_results analyzed sql results
-     * @param string  $del_link             the display element - 'del_link'
-     *
-     * @return string $links_html html content
-     *
-     * @access  private
-     *
-     * @see     getTable()
-     */
-    private function _getMultiRowOperationLinks(
-        &$dt_result, $analyzed_sql_results, $del_link
-    ) {
-
-        $links_html = '<div class="print_ignore" >';
-        $url_query = $this->__get('url_query');
-        $delete_text = ($del_link == self::DELETE_ROW) ? __('Delete') : __('Kill');
-
-        $links_html .= '<img class="selectallarrow" width="38" height="22"'
-            . ' src="' . $this->__get('pma_theme_image') . 'arrow_'
-            . $this->__get('text_dir') . '.png' . '"'
-            . ' alt="' . __('With selected:') . '" />';
-
-        $links_html .= '<input type="checkbox" '
-            . 'id="resultsForm_' . $this->__get('unique_id') . '_checkall" '
-            . 'class="checkall_box" title="' . __('Check all') . '" /> '
-            . '<label for="resultsForm_' . $this->__get('unique_id') . '_checkall">'
-            . __('Check all') . '</label> '
-            . '<i style="margin-left: 2em">' . __('With selected:') . '</i>' . "\n";
-
-        $links_html .= Util::getButtonOrImage(
-            'submit_mult', 'mult_submit', 'submit_mult_change',
-            __('Edit'), 'b_edit.png', 'edit'
-        );
-
-        $links_html .= Util::getButtonOrImage(
-            'submit_mult', 'mult_submit', 'submit_mult_copy',
-            __('Copy'), 'b_insrow.png', 'copy'
-        );
-
-        $links_html .= Util::getButtonOrImage(
-            'submit_mult', 'mult_submit', 'submit_mult_delete',
-            $delete_text, 'b_drop.png', 'delete'
-        );
-
-        if ($analyzed_sql_results['querytype'] == 'SELECT') {
-            $links_html .= Util::getButtonOrImage(
-                'submit_mult', 'mult_submit', 'submit_mult_export',
-                __('Export'), 'b_tblexport.png', 'export'
-            );
-        }
-
-        $links_html .= "</div>\n";
-
-        $links_html .= '<input type="hidden" name="sql_query"'
-            . ' value="' . htmlspecialchars($this->__get('sql_query')) . '" />'
-            . "\n";
-
-        if (! empty($url_query)) {
-            $links_html .= '<input type="hidden" name="url_query"'
-                . ' value="' . $url_query . '" />' . "\n";
-        }
-
-        // fetch last row of the result set
-        $GLOBALS['dbi']->dataSeek($dt_result, $this->__get('num_rows') - 1);
-        $row = $GLOBALS['dbi']->fetchRow($dt_result);
-
-        // $clause_is_unique is needed by getTable() to generate the proper param
-        // in the multi-edit and multi-delete form
-        list($where_clause, $clause_is_unique, $condition_array)
-            = Util::getUniqueCondition(
-                $dt_result, // handle
-                $this->__get('fields_cnt'), // fields_cnt
-                $this->__get('fields_meta'), // fields_meta
-                $row, // row
-                false, // force_unique
-                false, // restrict_to_table
-                $analyzed_sql_results // analyzed_sql_results
-            );
-        unset($where_clause, $condition_array);
-
-        // reset to first row for the loop in _getTableBody()
-        $GLOBALS['dbi']->dataSeek($dt_result, 0);
-
-        $links_html .= '<input type="hidden" name="clause_is_unique"'
-            . ' value="' . $clause_is_unique . '" />' . "\n";
-
-        $links_html .= '</form>' . "\n";
-
-        return $links_html;
-
-    } // end of the '_getMultiRowOperationLinks()' function
-
-
-    /**
-     * Prepare table navigation bar at the top or bottom
-     *
-     * @param integer $pos_next         the offset for the "next" page
-     * @param integer $pos_prev         the offset for the "previous" page
-     * @param string  $place            the place to show navigation
-     * @param boolean $is_innodb        whether its InnoDB or not
-     * @param string  $sort_by_key_html the sort by key dialog
-     *
-     * @return  string  html content of navigation bar
-     *
-     * @access  private
-     *
-     * @see     _getTable()
-     */
-    private function _getPlacedTableNavigations(
-        $pos_next, $pos_prev, $place, $is_innodb, $sort_by_key_html
-    ) {
-
-        $navigation_html = '';
-
-        if ($place == self::PLACE_BOTTOM_DIRECTION_DROPDOWN) {
-            $navigation_html .= '<br />' . "\n";
-        }
-
-        $navigation_html .= $this->_getTableNavigation(
-            $pos_next, $pos_prev, $is_innodb, $sort_by_key_html
-        );
-
-        if ($place == self::PLACE_TOP_DIRECTION_DROPDOWN) {
-            $navigation_html .= "\n";
-        }
-
-        return $navigation_html;
-
-    } // end of the '_getPlacedTableNavigations()' function
-
-    /**
-     * Generates HTML to display the Create view in span tag
-     *
-     * @param array  $analyzed_sql_results analyzed sql results
-     * @param string $url_query            String with URL Parameters
-     *
-     * @return string
-     *
-     * @access private
-     *
-     * @see _getResultsOperations()
-     */
-    private function _getLinkForCreateView($analyzed_sql_results, $url_query)
-    {
-        $results_operations_html = '';
-        if (empty($analyzed_sql_results['procedure'])) {
-
-            $ajax_class = ' ajax';
-
-            $results_operations_html .= '<span>'
-                . Util::linkOrButton(
-                    'view_create.php' . $url_query,
-                    Util::getIcon(
-                        'b_view_add.png', __('Create view'), true
-                    ),
-                    array('class' => 'create_view' . $ajax_class), true, true, ''
-                )
-                . '</span>' . "\n";
-        }
-        return $results_operations_html;
-
-    }
-
-    /**
-     * Calls the _getResultsOperations with $only_view as true
-     *
-     * @param array $analyzed_sql_results analyzed sql results
-     *
-     * @return string
-     *
-     * @access public
-     *
-     */
-    public function getCreateViewQueryResultOp($analyzed_sql_results)
-    {
-
-        $results_operations_html = '';
-        //calling to _getResultOperations with a fake $displayParts
-        //and setting only_view parameter to be true to generate just view
-        $results_operations_html .= $this->_getResultsOperations(
-            array(),
-            $analyzed_sql_results,
-            true
-        );
-        return $results_operations_html;
-    }
-
-    /**
-     * Get copy to clipboard links for results operations
-     *
-     * @return string $html
-     *
-     * @access  private
-     */
-    private function _getCopytoclipboardLinks()
-    {
-        $html = Util::linkOrButton(
-            '#',
-            Util::getIcon(
-                'b_insrow.png', __('Copy to clipboard'), true
-            ),
-            array('id' => 'copyToClipBoard'),
-            true,
-            true,
-            'copy_to_clip_board'
-        );
-
-        return $html;
-    }
-
-    /**
-     * Get printview links for results operations
-     *
-     * @return string $html
-     *
-     * @access  private
-     */
-    private function _getPrintviewLinks()
-    {
-        $html = Util::linkOrButton(
-            '#',
-            Util::getIcon(
-                'b_print.png', __('Print'), true
-            ),
-            array('id' => 'printView'),
-            true,
-            true,
-            'print_view'
-        );
-
-        return $html;
-    }
-
-    /**
-     * Get operations that are available on results.
-     *
-     * @param array   $displayParts         the parts to display
-     * @param array   $analyzed_sql_results analyzed sql results
-     * @param boolean $only_view            Whether to show only view
-     *
-     * @return string $results_operations_html  html content
-     *
-     * @access  private
-     *
-     * @see     getTable()
-     */
-    private function _getResultsOperations(
-        $displayParts, $analyzed_sql_results, $only_view = false
-    ) {
-        global $printview;
-
-        $results_operations_html = '';
-        $fields_meta = $this->__get('fields_meta'); // To safe use in foreach
-        $header_shown = false;
-        $header = '<fieldset class="print_ignore" ><legend>'
-            . __('Query results operations') . '</legend>';
-
-        $_url_params = array(
-                    'db'        => $this->__get('db'),
-                    'table'     => $this->__get('table'),
-                    'printview' => '1',
-                    'sql_query' => $this->__get('sql_query'),
-                );
-        $url_query = PMA_URL_getCommon($_url_params);
-
-        if (!$header_shown) {
-            $results_operations_html .= $header;
-            $header_shown = true;
-        }
-        // if empty result set was produced we need to
-        // show only view and not other options
-        if ($only_view) {
-            $results_operations_html .= $this->_getLinkForCreateView(
-                $analyzed_sql_results, $url_query
-            );
-
-            if ($header_shown) {
-                $results_operations_html .= '</fieldset><br />';
-            }
-            return $results_operations_html;
-        }
-
-        // Displays "printable view" link if required
-        if ($displayParts['pview_lnk'] == '1') {
-            $results_operations_html .= $this->_getPrintviewLinks();
-            $results_operations_html .= $this->_getCopytoclipboardLinks();
-        } // end displays "printable view"
-
-        // Export link
-        // (the url_query has extra parameters that won't be used to export)
-        // (the single_table parameter is used in PMA_getExportDisplay()
-        //  to hide the SQL and the structure export dialogs)
-        // If the parser found a PROCEDURE clause
-        // (most probably PROCEDURE ANALYSE()) it makes no sense to
-        // display the Export link).
-        if (($analyzed_sql_results['querytype'] == self::QUERY_TYPE_SELECT)
-            && ! isset($printview)
-            && empty($analyzed_sql_results['procedure'])
-        ) {
-
-            if (count($analyzed_sql_results['select_tables']) == 1) {
-                $_url_params['single_table'] = 'true';
-            }
-
-            if (! $header_shown) {
-                $results_operations_html .= $header;
-                $header_shown = true;
-            }
-
-            $_url_params['unlim_num_rows'] = $this->__get('unlim_num_rows');
-
-            /**
-             * At this point we don't know the table name; this can happen
-             * for example with a query like
-             * SELECT bike_code FROM (SELECT bike_code FROM bikes) tmp
-             * As a workaround we set in the table parameter the name of the
-             * first table of this database, so that tbl_export.php and
-             * the script it calls do not fail
-             */
-            if (empty($_url_params['table']) && ! empty($_url_params['db'])) {
-                $_url_params['table'] = $GLOBALS['dbi']->fetchValue("SHOW TABLES");
-                /* No result (probably no database selected) */
-                if ($_url_params['table'] === false) {
-                    unset($_url_params['table']);
-                }
-            }
-
-            $results_operations_html .= Util::linkOrButton(
-                'tbl_export.php' . PMA_URL_getCommon($_url_params),
-                Util::getIcon(
-                    'b_tblexport.png', __('Export'), true
-                ),
-                '',
-                true,
-                true,
-                ''
-            )
-            . "\n";
-
-            // prepare chart
-            $results_operations_html .= Util::linkOrButton(
-                'tbl_chart.php' . PMA_URL_getCommon($_url_params),
-                Util::getIcon(
-                    'b_chart.png', __('Display chart'), true
-                ),
-                '',
-                true,
-                true,
-                ''
-            )
-            . "\n";
-
-            // prepare GIS chart
-            $geometry_found = false;
-            // If at least one geometry field is found
-            foreach ($fields_meta as $meta) {
-                if ($meta->type == self::GEOMETRY_FIELD) {
-                    $geometry_found = true;
-                    break;
-                }
-            }
-
-            if ($geometry_found) {
-                $results_operations_html
-                    .= Util::linkOrButton(
-                        'tbl_gis_visualization.php'
-                        . PMA_URL_getCommon($_url_params),
-                        Util::getIcon(
-                            'b_globe.gif', __('Visualize GIS data'), true
-                        ),
-                        '',
-                        true,
-                        true,
-                        ''
-                    )
-                    . "\n";
-            }
-        }
-
-        // CREATE VIEW
-        /**
-         *
-         * @todo detect privileges to create a view
-         *       (but see 2006-01-19 note in display_create_table.lib.php,
-         *        I think we cannot detect db-specific privileges reliably)
-         * Note: we don't display a Create view link if we found a PROCEDURE clause
-         */
-        if (!$header_shown) {
-            $results_operations_html .= $header;
-            $header_shown = true;
-        }
-
-        $results_operations_html .= $this->_getLinkForCreateView(
-            $analyzed_sql_results, $url_query
-        );
-
-        if ($header_shown) {
-            $results_operations_html .= '</fieldset><br />';
-        }
-
-        return $results_operations_html;
-
-    } // end of the '_getResultsOperations()' function
-
-
-    /**
-     * Verifies what to do with non-printable contents (binary or BLOB)
-     * in Browse mode.
-     *
-     * @param string  $category              BLOB|BINARY|GEOMETRY
-     * @param string  $content               the binary content
-     * @param mixed   $transformation_plugin transformation plugin.
-     *                                       Can also be the default function:
-     *                                       PMA_mimeDefaultFunction
-     * @param string  $transform_options     transformation parameters
-     * @param string  $default_function      default transformation function
-     * @param object  $meta                  the meta-information about the field
-     * @param array   $url_params            parameters that should go to the
-     *                                       download link
-     * @param boolean &$is_truncated         the result is truncated or not
-     *
-     * @return mixed  string or float
-     *
-     * @access  private
-     *
-     * @see     _getDataCellForGeometryColumns(),
-     *          _getDataCellForNonNumericColumns(),
-     *          _getSortedColumnMessage()
-     */
-    private function _handleNonPrintableContents(
-        $category, $content, $transformation_plugin, $transform_options,
-        $default_function, $meta, $url_params = array(), &$is_truncated = null
-    ) {
-
-        $is_truncated = false;
-        $result = '[' . $category;
-
-        if (isset($content)) {
-
-            $size = strlen($content);
-            $display_size = Util::formatByteDown($size, 3, 1);
-            $result .= ' - ' . $display_size[0] . ' ' . $display_size[1];
-
-        } else {
-
-            $result .= ' - NULL';
-            $size = 0;
-
-        }
-
-        $result .= ']';
-
-        // if we want to use a text transformation on a BLOB column
-        if (gettype($transformation_plugin) === "object") {
-            $posMimeOctetstream = strpos(
-                $transformation_plugin->getMIMESubtype(),
-                'Octetstream'
-            );
-            $posMimeText = strpos($transformation_plugin->getMIMEtype(), 'Text');
-            if ($posMimeOctetstream
-                || $posMimeText !== false
-            ) {
-                // Applying Transformations on hex string of binary data
-                // seems more appropriate
-                $result = pack("H*", bin2hex($content));
-            }
-        }
-
-        if ($size <= 0) {
-            return($result);
-        }
-
-        if ($default_function != $transformation_plugin) {
-            $result = $transformation_plugin->applyTransformation(
-                $result,
-                $transform_options,
-                $meta
-            );
-            return($result);
-        }
-
-        $result = $default_function($result, array(), $meta);
-        if (($_SESSION['tmpval']['display_binary']
-            && $meta->type === self::STRING_FIELD)
-            || ($_SESSION['tmpval']['display_blob']
-            && stristr($meta->type, self::BLOB_FIELD))
-        ) {
-            // in this case, restart from the original $content
-            if (mb_check_encoding($content, 'utf-8')
-                && !preg_match('/[\x00-\x08\x0B\x0C\x0E-\x1F\x80-\x9F]/u', $content)
-            ) {
-                // show as text if it's valid utf-8
-                $result = htmlspecialchars($content);
-            } else {
-                $result = '0x' . bin2hex($content);
-            }
-            list(
-                $is_truncated,
-                $result,
-                // skip 3rd param
-            ) = $this->_getPartialText($result);
-        }
-
-        /* Create link to download */
-
-        // in PHP < 5.5, empty() only checks variables
-        $tmpdb = $this->__get('db');
-        if (count($url_params) > 0
-            && (!empty($tmpdb) && !empty($meta->orgtable))
-        ) {
-            $result = '<a href="tbl_get_field.php'
-                . PMA_URL_getCommon($url_params)
-                . '" class="disableAjax">'
-                . $result . '</a>';
-        }
-
-        return($result);
-
-    } // end of the '_handleNonPrintableContents()' function
-
-
-    /**
-     * Retrieves the associated foreign key info for a data cell
-     *
-     * @param array  $map              the list of relations
-     * @param object $meta             the meta-information about the field
-     * @param string $where_comparison data for the where clause
-     *
-     * @return string  formatted data
-     *
-     * @access  private
-     *
-     */
-    private function _getFromForeign($map, $meta, $where_comparison)
-    {
-        $dispsql = 'SELECT '
-            . Util::backquote($map[$meta->name][2])
-            . ' FROM '
-            . Util::backquote($map[$meta->name][3])
-            . '.'
-            . Util::backquote($map[$meta->name][0])
-            . ' WHERE '
-            . Util::backquote($map[$meta->name][1])
-            . $where_comparison;
-
-        $dispresult = $GLOBALS['dbi']->tryQuery(
-            $dispsql,
-            null,
-            DatabaseInterface::QUERY_STORE
-        );
-
-        if ($dispresult && $GLOBALS['dbi']->numRows($dispresult) > 0) {
-            list($dispval) = $GLOBALS['dbi']->fetchRow($dispresult, 0);
-        } else {
-            $dispval = __('Link not found!');
-        }
-
-        $GLOBALS['dbi']->freeResult($dispresult);
-
-        return $dispval;
-    }
-
-    /**
-     * Prepares the displayable content of a data cell in Browse mode,
-     * taking into account foreign key description field and transformations
-     *
-     * @param string        $class                 css classes for the td element
-     * @param bool          $condition_field       whether the column is a part of
-     *                                             the where clause
-     * @param array         $analyzed_sql_results  the analyzed query
-     * @param object        $meta                  the meta-information about the
-     *                                             field
-     * @param array         $map                   the list of relations
-     * @param string        $data                  data
-     * @param object|string $transformation_plugin transformation plugin.
-     *                                             Can also be the default function:
-     *                                             PMA_mimeDefaultFunction
-     * @param string        $default_function      default function
-     * @param string        $nowrap                'nowrap' if the content should
-     *                                             not be wrapped
-     * @param string        $where_comparison      data for the where clause
-     * @param array         $transform_options     options for transformation
-     * @param bool          $is_field_truncated    whether the field is truncated
-     * @param string        $original_length       of a truncated column, or ''
-     *
-     * @return string  formatted data
-     *
-     * @access  private
-     *
-     * @see     _getDataCellForNumericColumns(), _getDataCellForGeometryColumns(),
-     *          _getDataCellForNonNumericColumns(),
-     *
-     */
-    private function _getRowData(
-        $class, $condition_field, $analyzed_sql_results, $meta, $map, $data,
-        $transformation_plugin, $default_function, $nowrap, $where_comparison,
-        $transform_options, $is_field_truncated, $original_length=''
-    ) {
-        $relational_display = $_SESSION['tmpval']['relational_display'];
-        $printview = $this->__get('printview');
-        $decimals = isset($meta->decimals) ? $meta->decimals : '-1';
-        $result = '<td data-decimals="' . $decimals . '"'
-            . ' data-type="' . $meta->type . '"';
-
-        if (! empty($original_length)) {
-            // cannot use data-original-length
-            $result .= ' data-originallength="' . $original_length . '"';
-        }
-
-        $result .= ' class="'
-            . $this->_addClass(
-                $class, $condition_field, $meta, $nowrap,
-                $is_field_truncated, $transformation_plugin, $default_function
-            )
-            . '">';
-
-        if (!empty($analyzed_sql_results['statement']->expr)) {
-            foreach ($analyzed_sql_results['statement']->expr as $expr) {
-                if ((empty($expr->alias)) || (empty($expr->column))) {
-                    continue;
-                }
-                if (strcasecmp($meta->name, $expr->alias) == 0) {
-                    $meta->name = $expr->column;
-                }
-            }
-        }
-
-        if (isset($map[$meta->name])) {
-
-            // Field to display from the foreign table?
-            if (isset($map[$meta->name][2])
-                && mb_strlen($map[$meta->name][2])
-            ) {
-                $dispval = $this->_getFromForeign(
-                    $map, $meta, $where_comparison
-                );
-            } else {
-                $dispval = '';
-            } // end if... else...
-
-            if (isset($printview) && ($printview == '1')) {
-
-                $result .= ($transformation_plugin != $default_function
-                    ? $transformation_plugin->applyTransformation(
-                        $data,
-                        $transform_options,
-                        $meta
-                    )
-                    : $default_function($data)
-                )
-                . ' <code>[-&gt;' . $dispval . ']</code>';
-
-            } else {
-
-                if ($relational_display == self::RELATIONAL_KEY) {
-
-                    // user chose "relational key" in the display options, so
-                    // the title contains the display field
-                    $title = (! empty($dispval))
-                        ? ' title="' . htmlspecialchars($dispval) . '"'
-                        : '';
-
-                } else {
-                    $title = ' title="' . htmlspecialchars($data) . '"';
-                }
-
-                $_url_params = array(
-                    'db'    => $map[$meta->name][3],
-                    'table' => $map[$meta->name][0],
-                    'pos'   => '0',
-                    'sql_query' => 'SELECT * FROM '
-                        . Util::backquote($map[$meta->name][3]) . '.'
-                        . Util::backquote($map[$meta->name][0])
-                        . ' WHERE '
-                        . Util::backquote($map[$meta->name][1])
-                        . $where_comparison,
-                );
-
-                $result .= '<a class="ajax" href="sql.php'
-                    . PMA_URL_getCommon($_url_params)
-                    . '"' . $title . '>';
-
-                if ($transformation_plugin != $default_function) {
-                    // always apply a transformation on the real data,
-                    // not on the display field
-                    $result .= $transformation_plugin->applyTransformation(
-                        $data,
-                        $transform_options,
-                        $meta
-                    );
-                } else {
-
-                    if ($relational_display == self::RELATIONAL_DISPLAY_COLUMN
-                        && ! empty($map[$meta->name][2])
-                    ) {
-                        // user chose "relational display field" in the
-                        // display options, so show display field in the cell
-                        $result .= $default_function($dispval);
-                    } else {
-                        // otherwise display data in the cell
-                        $result .= $default_function($data);
-                    }
-
-                }
-                $result .= '</a>';
-            }
-
-        } else {
-            $result .= ($transformation_plugin != $default_function
-                ? $transformation_plugin->applyTransformation(
-                    $data,
-                    $transform_options,
-                    $meta
-                )
-                : $default_function($data)
-            );
-        }
-
-        $result .= '</td>' . "\n";
-
-        return $result;
-
-    } // end of the '_getRowData()' function
-
-
-    /**
-     * Prepares a checkbox for multi-row submits
-     *
-     * @param string $del_url           delete url
-     * @param array  $displayParts      array with explicit indexes for all
-     *                                  the display elements
-     * @param string $row_no            the row number
-     * @param string $where_clause_html url encoded where clause
-     * @param array  $condition_array   array of conditions in the where clause
-     * @param string $id_suffix         suffix for the id
-     * @param string $class             css classes for the td element
-     *
-     * @return string  the generated HTML
-     *
-     * @access  private
-     *
-     * @see     _getTableBody(), _getCheckboxAndLinks()
-     */
-    private function _getCheckboxForMultiRowSubmissions(
-        $del_url, $displayParts, $row_no, $where_clause_html, $condition_array,
-        $id_suffix, $class
-    ) {
-
-        $ret = '';
-
-        if (! empty($del_url) && $displayParts['del_lnk'] != self::KILL_PROCESS) {
-
-            $ret .= '<td ';
-            if (! empty($class)) {
-                $ret .= 'class="' . $class . '"';
-            }
-
-            $ret .= ' class="center print_ignore">'
-                . '<input type="checkbox" id="id_rows_to_delete'
-                . $row_no . $id_suffix
-                . '" name="rows_to_delete[' . $row_no . ']"'
-                . ' class="multi_checkbox checkall"'
-                . ' value="' . $where_clause_html . '" '
-                . ' />'
-                . '<input type="hidden" class="condition_array" value="'
-                . htmlspecialchars(json_encode($condition_array)) . '" />'
-                . '    </td>';
-        }
-
-        return $ret;
-
-    } // end of the '_getCheckboxForMultiRowSubmissions()' function
-
-
-    /**
-     * Prepares an Edit link
-     *
-     * @param string $edit_url          edit url
-     * @param string $class             css classes for td element
-     * @param string $edit_str          text for the edit link
-     * @param string $where_clause      where clause
-     * @param string $where_clause_html url encoded where clause
-     *
-     * @return string  the generated HTML
-     *
-     * @access  private
-     *
-     * @see     _getTableBody(), _getCheckboxAndLinks()
-     */
-    private function _getEditLink(
-        $edit_url, $class, $edit_str, $where_clause, $where_clause_html
-    ) {
-
-        $ret = '';
-        if (! empty($edit_url)) {
-
-            $ret .= '<td class="' . $class . ' center print_ignore" '
-                . ' ><span class="nowrap">'
-                . Util::linkOrButton(
-                    $edit_url, $edit_str, array(), false
-                );
-            /*
-             * Where clause for selecting this row uniquely is provided as
-             * a hidden input. Used by jQuery scripts for handling grid editing
-             */
-            if (! empty($where_clause)) {
-                $ret .= '<input type="hidden" class="where_clause" value ="'
-                    . $where_clause_html . '" />';
-            }
-            $ret .= '</span></td>';
-        }
-
-        return $ret;
-
-    } // end of the '_getEditLink()' function
-
-
-    /**
-     * Prepares an Copy link
-     *
-     * @param string $copy_url          copy url
-     * @param string $copy_str          text for the copy link
-     * @param string $where_clause      where clause
-     * @param string $where_clause_html url encoded where clause
-     * @param string $class             css classes for the td element
-     *
-     * @return string  the generated HTML
-     *
-     * @access  private
-     *
-     * @see     _getTableBody(), _getCheckboxAndLinks()
-     */
-    private function _getCopyLink(
-        $copy_url, $copy_str, $where_clause, $where_clause_html, $class
-    ) {
-
-        $ret = '';
-        if (! empty($copy_url)) {
-
-            $ret .= '<td class="';
-            if (! empty($class)) {
-                $ret .= $class . ' ';
-            }
-
-            $ret .= 'center print_ignore" ' . ' ><span class="nowrap">'
-               . Util::linkOrButton(
-                   $copy_url, $copy_str, array(), false
-               );
-
-            /*
-             * Where clause for selecting this row uniquely is provided as
-             * a hidden input. Used by jQuery scripts for handling grid editing
-             */
-            if (! empty($where_clause)) {
-                $ret .= '<input type="hidden" class="where_clause" value="'
-                    . $where_clause_html . '" />';
-            }
-            $ret .= '</span></td>';
-        }
-
-        return $ret;
-
-    } // end of the '_getCopyLink()' function
-
-
-    /**
-     * Prepares a Delete link
-     *
-     * @param string $del_url delete url
-     * @param string $del_str text for the delete link
-     * @param string $js_conf text for the JS confirmation
-     * @param string $class   css classes for the td element
-     *
-     * @return string  the generated HTML
-     *
-     * @access  private
-     *
-     * @see     _getTableBody(), _getCheckboxAndLinks()
-     */
-    private function _getDeleteLink($del_url, $del_str, $js_conf, $class)
-    {
-
-        $ret = '';
-        if (empty($del_url)) {
-            return $ret;
-        }
-
-        $ret .= '<td class="';
-        if (! empty($class)) {
-            $ret .= $class . ' ';
-        }
-        $ajax = Response::getInstance()->isAjax() ? ' ajax' : '';
-        $ret .= 'center print_ignore" ' . ' >'
-            . Util::linkOrButton(
-                $del_url,
-                $del_str,
-                array('class' => 'delete_row requireConfirm' . $ajax),
-                false
-            )
-            . '<div class="hide">' . $js_conf . '</div>'
-            . '</td>';
-
-        return $ret;
-
-    } // end of the '_getDeleteLink()' function
-
-
-    /**
-     * Prepare checkbox and links at some position (left or right)
-     * (only called for horizontal mode)
-     *
-     * @param string $position          the position of the checkbox and links
-     * @param string $del_url           delete url
-     * @param array  $displayParts      array with explicit indexes for all the
-     *                                  display elements
-     * @param string $row_no            row number
-     * @param string $where_clause      where clause
-     * @param string $where_clause_html url encoded where clause
-     * @param array  $condition_array   array of conditions in the where clause
-     * @param string $edit_url          edit url
-     * @param string $copy_url          copy url
-     * @param string $class             css classes for the td elements
-     * @param string $edit_str          text for the edit link
-     * @param string $copy_str          text for the copy link
-     * @param string $del_str           text for the delete link
-     * @param string $js_conf           text for the JS confirmation
-     *
-     * @return string  the generated HTML
-     *
-     * @access  private
-     *
-     * @see     _getPlacedLinks()
-     */
-    private function _getCheckboxAndLinks(
-        $position, $del_url, $displayParts, $row_no, $where_clause,
-        $where_clause_html, $condition_array,
-        $edit_url, $copy_url, $class, $edit_str, $copy_str, $del_str, $js_conf
-    ) {
-
-        $ret = '';
-
-        if ($position == self::POSITION_LEFT) {
-
-            $ret .= $this->_getCheckboxForMultiRowSubmissions(
-                $del_url, $displayParts, $row_no, $where_clause_html,
-                $condition_array, '_left', ''
-            );
-
-            $ret .= $this->_getEditLink(
-                $edit_url, $class, $edit_str, $where_clause, $where_clause_html
-            );
-
-            $ret .= $this->_getCopyLink(
-                $copy_url, $copy_str, $where_clause, $where_clause_html, ''
-            );
-
-            $ret .= $this->_getDeleteLink($del_url, $del_str, $js_conf, '');
-
-        } elseif ($position == self::POSITION_RIGHT) {
-
-            $ret .= $this->_getDeleteLink($del_url, $del_str, $js_conf, '');
-
-            $ret .= $this->_getCopyLink(
-                $copy_url, $copy_str, $where_clause, $where_clause_html, ''
-            );
-
-            $ret .= $this->_getEditLink(
-                $edit_url, $class, $edit_str, $where_clause, $where_clause_html
-            );
-
-            $ret .= $this->_getCheckboxForMultiRowSubmissions(
-                $del_url, $displayParts, $row_no, $where_clause_html,
-                $condition_array, '_right', ''
-            );
-
-        } else { // $position == self::POSITION_NONE
-
-            $ret .= $this->_getCheckboxForMultiRowSubmissions(
-                $del_url, $displayParts, $row_no, $where_clause_html,
-                $condition_array, '_left', ''
-            );
-        }
-
-        return $ret;
-
-    } // end of the '_getCheckboxAndLinks()' function
-
-    /**
-     * Truncates given string based on LimitChars configuration
-     * and Session pftext variable
-     * (string is truncated only if necessary)
-     *
-     * @param string $str string to be truncated
-     *
-     * @return mixed
-     *
-     * @access  private
-     *
-     * @see     _handleNonPrintableContents(), _getDataCellForGeometryColumns(),
-     *          _getDataCellForNonNumericColumns
-     */
-    private function _getPartialText($str)
-    {
-        $original_length = mb_strlen($str);
-        if ($original_length > $GLOBALS['cfg']['LimitChars']
-            && $_SESSION['tmpval']['pftext'] === self::DISPLAY_PARTIAL_TEXT
-        ) {
-            $str = mb_substr(
-                $str, 0, $GLOBALS['cfg']['LimitChars']
-            ) . '...';
-            $truncated = true;
-        } else {
-            $truncated = false;
-        }
-
-        return array($truncated, $str, $original_length);
-    }
-}
diff --git a/#pma/libraries/Error.php b/#pma/libraries/Error.php
deleted file mode 100644
index 7a008386..00000000
--- a/#pma/libraries/Error.php
+++ /dev/null
@@ -1,507 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Holds class PMA\libraries\Error
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries;
-
-use Exception;
-
-/**
- * a single error
- *
- * @package PhpMyAdmin
- */
-class Error extends Message
-{
-    /**
-     * Error types
-     *
-     * @var array
-     */
-    static public $errortype = array (
-        0                    => 'Internal error',
-        E_ERROR              => 'Error',
-        E_WARNING            => 'Warning',
-        E_PARSE              => 'Parsing Error',
-        E_NOTICE             => 'Notice',
-        E_CORE_ERROR         => 'Core Error',
-        E_CORE_WARNING       => 'Core Warning',
-        E_COMPILE_ERROR      => 'Compile Error',
-        E_COMPILE_WARNING    => 'Compile Warning',
-        E_USER_ERROR         => 'User Error',
-        E_USER_WARNING       => 'User Warning',
-        E_USER_NOTICE        => 'User Notice',
-        E_STRICT             => 'Runtime Notice',
-        E_DEPRECATED         => 'Deprecation Notice',
-        E_RECOVERABLE_ERROR  => 'Catchable Fatal Error',
-    );
-
-    /**
-     * Error levels
-     *
-     * @var array
-     */
-    static public $errorlevel = array (
-        0                    => 'error',
-        E_ERROR              => 'error',
-        E_WARNING            => 'error',
-        E_PARSE              => 'error',
-        E_NOTICE             => 'notice',
-        E_CORE_ERROR         => 'error',
-        E_CORE_WARNING       => 'error',
-        E_COMPILE_ERROR      => 'error',
-        E_COMPILE_WARNING    => 'error',
-        E_USER_ERROR         => 'error',
-        E_USER_WARNING       => 'error',
-        E_USER_NOTICE        => 'notice',
-        E_STRICT             => 'notice',
-        E_DEPRECATED         => 'notice',
-        E_RECOVERABLE_ERROR  => 'error',
-    );
-
-    /**
-     * The file in which the error occurred
-     *
-     * @var string
-     */
-    protected $file = '';
-
-    /**
-     * The line in which the error occurred
-     *
-     * @var integer
-     */
-    protected $line = 0;
-
-    /**
-     * Holds the backtrace for this error
-     *
-     * @var array
-     */
-    protected $backtrace = array();
-
-    /**
-     * Hide location of errors
-     */
-    protected $hide_location = false;
-
-    /**
-     * Constructor
-     *
-     * @param integer $errno   error number
-     * @param string  $errstr  error message
-     * @param string  $errfile file
-     * @param integer $errline line
-     */
-    public function __construct($errno, $errstr, $errfile, $errline)
-    {
-        $this->setNumber($errno);
-        $this->setMessage($errstr, false);
-        $this->setFile($errfile);
-        $this->setLine($errline);
-
-        $backtrace = debug_backtrace();
-        // remove last three calls:
-        // debug_backtrace(), handleError() and addError()
-        $backtrace = array_slice($backtrace, 3);
-
-        $this->setBacktrace($backtrace);
-    }
-
-    /**
-     * Process backtrace to avoid path disclossures, objects and so on
-     *
-     * @param array $backtrace backtrace
-     *
-     * @return array
-     */
-    public static function processBacktrace($backtrace)
-    {
-        $result = array();
-
-        $members = array('line', 'function', 'class', 'type');
-
-        foreach ($backtrace as $idx => $step) {
-            /* Create new backtrace entry */
-            $result[$idx] = array();
-
-            /* Make path relative */
-            if (isset($step['file'])) {
-                $result[$idx]['file'] = Error::relPath($step['file']);
-            }
-
-            /* Store members we want */
-            foreach ($members as $name) {
-                if (isset($step[$name])) {
-                    $result[$idx][$name] = $step[$name];
-                }
-            }
-
-            /* Store simplified args */
-            if (isset($step['args'])) {
-                foreach ($step['args'] as $key => $arg) {
-                    $result[$idx]['args'][$key] = Error::getArg($arg, $step['function']);
-                }
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Toggles location hiding
-     *
-     * @param boolean $hide Whether to hide
-     *
-     * @return void
-     */
-    public function setHideLocation($hide)
-    {
-        $this->hide_location = $hide;
-    }
-
-    /**
-     * sets PMA\libraries\Error::$_backtrace
-     *
-     * We don't store full arguments to avoid wakeup or memory problems.
-     *
-     * @param array $backtrace backtrace
-     *
-     * @return void
-     */
-    public function setBacktrace($backtrace)
-    {
-        $this->backtrace = Error::processBacktrace($backtrace);
-    }
-
-    /**
-     * sets PMA\libraries\Error::$_line
-     *
-     * @param integer $line the line
-     *
-     * @return void
-     */
-    public function setLine($line)
-    {
-        $this->line = $line;
-    }
-
-    /**
-     * sets PMA\libraries\Error::$_file
-     *
-     * @param string $file the file
-     *
-     * @return void
-     */
-    public function setFile($file)
-    {
-        $this->file = Error::relPath($file);
-    }
-
-
-    /**
-     * returns unique PMA\libraries\Error::$hash, if not exists it will be created
-     *
-     * @return string PMA\libraries\Error::$hash
-     */
-    public function getHash()
-    {
-        try {
-            $backtrace = serialize($this->getBacktrace());
-        } catch(Exception $e) {
-            $backtrace = '';
-        }
-        if ($this->hash === null) {
-            $this->hash = md5(
-                $this->getNumber() .
-                $this->getMessage() .
-                $this->getFile() .
-                $this->getLine() .
-                $backtrace
-            );
-        }
-
-        return $this->hash;
-    }
-
-    /**
-     * returns PMA\libraries\Error::$_backtrace for first $count frames
-     * pass $count = -1 to get full backtrace.
-     * The same can be done by not passing $count at all.
-     *
-     * @param integer $count Number of stack frames.
-     *
-     * @return array PMA\libraries\Error::$_backtrace
-     */
-    public function getBacktrace($count = -1)
-    {
-        if ($count != -1) {
-            return array_slice($this->backtrace, 0, $count);
-        }
-        return $this->backtrace;
-    }
-
-    /**
-     * returns PMA\libraries\Error::$file
-     *
-     * @return string PMA\libraries\Error::$file
-     */
-    public function getFile()
-    {
-        return $this->file;
-    }
-
-    /**
-     * returns PMA\libraries\Error::$line
-     *
-     * @return integer PMA\libraries\Error::$line
-     */
-    public function getLine()
-    {
-        return $this->line;
-    }
-
-    /**
-     * returns type of error
-     *
-     * @return string  type of error
-     */
-    public function getType()
-    {
-        return Error::$errortype[$this->getNumber()];
-    }
-
-    /**
-     * returns level of error
-     *
-     * @return string  level of error
-     */
-    public function getLevel()
-    {
-        return Error::$errorlevel[$this->getNumber()];
-    }
-
-    /**
-     * returns title prepared for HTML Title-Tag
-     *
-     * @return string   HTML escaped and truncated title
-     */
-    public function getHtmlTitle()
-    {
-        return htmlspecialchars(
-            mb_substr($this->getTitle(), 0, 100)
-        );
-    }
-
-    /**
-     * returns title for error
-     *
-     * @return string
-     */
-    public function getTitle()
-    {
-        return $this->getType() . ': ' . $this->getMessage();
-    }
-
-    /**
-     * Get HTML backtrace
-     *
-     * @return string
-     */
-    public function getBacktraceDisplay()
-    {
-        return Error::formatBacktrace(
-            $this->getBacktrace(),
-            "<br />\n",
-            "<br />\n"
-        );
-    }
-
-    /**
-     * return formatted backtrace field
-     *
-     * @param array  $backtrace Backtrace data
-     * @param string $separator Arguments separator to use
-     * @param string $lines     Lines separator to use
-     *
-     * @return string formatted backtrace
-     */
-    public static function formatBacktrace($backtrace, $separator, $lines)
-    {
-        $retval = '';
-
-        foreach ($backtrace as $step) {
-            if (isset($step['file']) && isset($step['line'])) {
-                $retval .= Error::relPath($step['file'])
-                    . '#' . $step['line'] . ': ';
-            }
-            if (isset($step['class'])) {
-                $retval .= $step['class'] . $step['type'];
-            }
-            $retval .= Error::getFunctionCall($step, $separator);
-            $retval .= $lines;
-        }
-
-        return $retval;
-    }
-
-    /**
-     * Formats function call in a backtrace
-     *
-     * @param array  $step      backtrace step
-     * @param string $separator Arguments separator to use
-     *
-     * @return string
-     */
-    public static function getFunctionCall($step, $separator)
-    {
-        $retval = $step['function'] . '(';
-        if (isset($step['args'])) {
-            if (count($step['args']) > 1) {
-                $retval .= $separator;
-                foreach ($step['args'] as $arg) {
-                    $retval .= "\t";
-                    $retval .= $arg;
-                    $retval .= ',' . $separator;
-                }
-            } elseif (count($step['args']) > 0) {
-                foreach ($step['args'] as $arg) {
-                    $retval .= $arg;
-                }
-            }
-        }
-        $retval .= ')';
-        return $retval;
-    }
-
-    /**
-     * Get a single function argument
-     *
-     * if $function is one of include/require
-     * the $arg is converted to a relative path
-     *
-     * @param string $arg      argument to process
-     * @param string $function function name
-     *
-     * @return string
-     */
-    public static function getArg($arg, $function)
-    {
-        $retval = '';
-        $include_functions = array(
-            'include',
-            'include_once',
-            'require',
-            'require_once',
-        );
-        $connect_functions = array(
-            'mysql_connect',
-            'mysql_pconnect',
-            'mysqli_connect',
-            'mysqli_real_connect',
-            'connect',
-            '_realConnect'
-        );
-
-        if (in_array($function, $include_functions)) {
-            $retval .= Error::relPath($arg);
-        } elseif (in_array($function, $connect_functions)
-            && getType($arg) === 'string'
-        ) {
-            $retval .= getType($arg) . ' ********';
-        } elseif (is_scalar($arg)) {
-            $retval .= getType($arg) . ' '
-                . htmlspecialchars(var_export($arg, true));
-        } elseif (is_object($arg)) {
-            $retval .= '<Class:' . get_class($arg) . '>';
-        } else {
-            $retval .= getType($arg);
-        }
-
-        return $retval;
-    }
-
-    /**
-     * Gets the error as string of HTML
-     *
-     * @return string
-     */
-    public function getDisplay()
-    {
-        $this->isDisplayed(true);
-        $retval = '<div class="' . $this->getLevel() . '">';
-        if (! $this->isUserError()) {
-            $retval .= '<strong>' . $this->getType() . '</strong>';
-            $retval .= ' in ' . $this->getFile() . '#' . $this->getLine();
-            $retval .= "<br />\n";
-        }
-        $retval .= $this->getMessage();
-        if (! $this->isUserError()) {
-            $retval .= "<br />\n";
-            $retval .= "<br />\n";
-            $retval .= "<strong>Backtrace</strong><br />\n";
-            $retval .= "<br />\n";
-            $retval .= $this->getBacktraceDisplay();
-        }
-        $retval .= '</div>';
-
-        return $retval;
-    }
-
-    /**
-     * whether this error is a user error
-     *
-     * @return boolean
-     */
-    public function isUserError()
-    {
-        return $this->hide_location ||
-            ($this->getNumber() & (E_USER_WARNING | E_USER_ERROR | E_USER_NOTICE));
-    }
-
-    /**
-     * return short relative path to phpMyAdmin basedir
-     *
-     * prevent path disclosure in error message,
-     * and make users feel safe to submit error reports
-     *
-     * @param string $path path to be shorten
-     *
-     * @return string shortened path
-     */
-    public static function relPath($path)
-    {
-        $dest = @realpath($path);
-
-        /* Probably affected by open_basedir */
-        if ($dest === FALSE) {
-            return basename($path);
-        }
-
-        $Ahere = explode(
-            DIRECTORY_SEPARATOR,
-            realpath(__DIR__ . DIRECTORY_SEPARATOR . '..')
-        );
-        $Adest = explode(DIRECTORY_SEPARATOR, $dest);
-
-        $result = '.';
-        // && count ($Adest)>0 && count($Ahere)>0 )
-        while (implode(DIRECTORY_SEPARATOR, $Adest) != implode(DIRECTORY_SEPARATOR, $Ahere)) {
-            if (count($Ahere) > count($Adest)) {
-                array_pop($Ahere);
-                $result .= DIRECTORY_SEPARATOR . '..';
-            } else {
-                array_pop($Adest);
-            }
-        }
-        $path = $result . str_replace(implode(DIRECTORY_SEPARATOR, $Adest), '', $dest);
-        return str_replace(
-            DIRECTORY_SEPARATOR . PATH_SEPARATOR,
-            DIRECTORY_SEPARATOR,
-            $path
-        );
-    }
-}
diff --git a/#pma/libraries/ErrorHandler.php b/#pma/libraries/ErrorHandler.php
deleted file mode 100644
index b3e6cf4e..00000000
--- a/#pma/libraries/ErrorHandler.php
+++ /dev/null
@@ -1,580 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Holds class PMA\libraries\ErrorHandler
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries;
-
-use PMA\libraries\Error;
-
-/**
- * handling errors
- *
- * @package PhpMyAdmin
- */
-class ErrorHandler
-{
-    /**
-     * holds errors to be displayed or reported later ...
-     *
-     * @var Error[]
-     */
-    protected $errors = array();
-
-    /**
-     * Hide location of errors
-     */
-    protected $hide_location = false;
-
-    /**
-     * Constructor - set PHP error handler
-     *
-     */
-    public function __construct()
-    {
-        /**
-         * Do not set ourselves as error handler in case of testsuite.
-         *
-         * This behavior is not tested there and breaks other tests as they
-         * rely on PHPUnit doing it's own error handling which we break here.
-         */
-        if (!defined('TESTSUITE')) {
-            set_error_handler(array($this, 'handleError'));
-        }
-    }
-
-    /**
-     * Destructor
-     *
-     * stores errors in session
-     *
-     */
-    public function __destruct()
-    {
-        if (isset($_SESSION)) {
-            if (! isset($_SESSION['errors'])) {
-                $_SESSION['errors'] = array();
-            }
-
-            // remember only not displayed errors
-            foreach ($this->errors as $key => $error) {
-                /**
-                 * We don't want to store all errors here as it would
-                 * explode user session.
-                 */
-                if (count($_SESSION['errors']) >= 10) {
-                    $error = new Error(
-                        0,
-                        __('Too many error messages, some are not displayed.'),
-                        __FILE__,
-                        __LINE__
-                    );
-                    $_SESSION['errors'][$error->getHash()] = $error;
-                    break;
-                } else if (($error instanceof Error)
-                    && ! $error->isDisplayed()
-                ) {
-                    $_SESSION['errors'][$key] = $error;
-                }
-            }
-        }
-    }
-
-    /**
-     * Toggles location hiding
-     *
-     * @param boolean $hide Whether to hide
-     *
-     * @return void
-     */
-    public function setHideLocation($hide)
-    {
-        $this->hide_location = $hide;
-    }
-
-    /**
-     * returns array with all errors
-     *
-     * @param $check bool Whether to check for session errors
-     *
-     * @return Error[]
-     */
-    public function getErrors($check=true)
-    {
-        if ($check) {
-            $this->checkSavedErrors();
-        }
-        return $this->errors;
-    }
-
-    /**
-    * returns the errors occurred in the current run only.
-    * Does not include the errors save din the SESSION
-    *
-    * @return Error[]
-    */
-    public function getCurrentErrors()
-    {
-        return $this->errors;
-    }
-
-    /**
-     * Pops recent erros from the storage
-     *
-     * @param int $count Old error count
-     *
-     * @return Error[]
-     */
-    public function sliceErrors($count)
-    {
-        $errors = $this->getErrors(false);
-        $this->errors = array_splice($errors, 0, $count);
-        return array_splice($errors, $count);
-    }
-
-    /**
-     * Error handler - called when errors are triggered/occurred
-     *
-     * This calls the addError() function, escaping the error string
-     * Ignores the errors wherever Error Control Operator (@) is used.
-     *
-     * @param integer $errno   error number
-     * @param string  $errstr  error string
-     * @param string  $errfile error file
-     * @param integer $errline error line
-     *
-     * @return void
-     */
-    public function handleError($errno, $errstr, $errfile, $errline)
-    {
-        // check if Error Control Operator (@) was used.
-        if (error_reporting() == 0) {
-            return;
-        }
-        $this->addError($errstr, $errno, $errfile, $errline, true);
-    }
-
-    /**
-     * Add an error; can also be called directly (with or without escaping)
-     *
-     * The following error types cannot be handled with a user defined function:
-     * E_ERROR, E_PARSE, E_CORE_ERROR, E_CORE_WARNING, E_COMPILE_ERROR,
-     * E_COMPILE_WARNING,
-     * and most of E_STRICT raised in the file where set_error_handler() is called.
-     *
-     * Do not use the context parameter as we want to avoid storing the
-     * complete $GLOBALS inside $_SESSION['errors']
-     *
-     * @param string  $errstr  error string
-     * @param integer $errno   error number
-     * @param string  $errfile error file
-     * @param integer $errline error line
-     * @param boolean $escape  whether to escape the error string
-     *
-     * @return void
-     */
-    public function addError($errstr, $errno, $errfile, $errline, $escape = true)
-    {
-        if ($escape) {
-            $errstr = htmlspecialchars($errstr);
-        }
-        // create error object
-        $error = new Error(
-            $errno,
-            $errstr,
-            $errfile,
-            $errline
-        );
-        $error->setHideLocation($this->hide_location);
-
-        // do not repeat errors
-        $this->errors[$error->getHash()] = $error;
-
-        switch ($error->getNumber()) {
-        case E_STRICT:
-        case E_DEPRECATED:
-        case E_NOTICE:
-        case E_WARNING:
-        case E_CORE_WARNING:
-        case E_COMPILE_WARNING:
-        case E_RECOVERABLE_ERROR:
-            /* Avoid rendering BB code in PHP errors */
-            $error->setBBCode(false);
-            break;
-        case E_USER_NOTICE:
-        case E_USER_WARNING:
-        case E_USER_ERROR:
-            // just collect the error
-            // display is called from outside
-            break;
-        case E_ERROR:
-        case E_PARSE:
-        case E_CORE_ERROR:
-        case E_COMPILE_ERROR:
-        default:
-            // FATAL error, display it and exit
-            $this->dispFatalError($error);
-            exit;
-        }
-    }
-
-    /**
-     * trigger a custom error
-     *
-     * @param string  $errorInfo   error message
-     * @param integer $errorNumber error number
-     *
-     * @return void
-     */
-    public function triggerError($errorInfo, $errorNumber = null)
-    {
-        // we could also extract file and line from backtrace
-        // and call handleError() directly
-        trigger_error($errorInfo, $errorNumber);
-    }
-
-    /**
-     * display fatal error and exit
-     *
-     * @param Error $error the error
-     *
-     * @return void
-     */
-    protected function dispFatalError($error)
-    {
-        if (! headers_sent()) {
-            $this->dispPageStart($error);
-        }
-        $error->display();
-        $this->dispPageEnd();
-        exit;
-    }
-
-    /**
-     * Displays user errors not displayed
-     *
-     * @return void
-     */
-    public function dispUserErrors()
-    {
-        echo $this->getDispUserErrors();
-    }
-
-    /**
-     * Renders user errors not displayed
-     *
-     * @return string
-     */
-    public function getDispUserErrors()
-    {
-        $retval = '';
-        foreach ($this->getErrors() as $error) {
-            if ($error->isUserError() && ! $error->isDisplayed()) {
-                $retval .= $error->getDisplay();
-            }
-        }
-        return $retval;
-    }
-
-    /**
-     * display HTML header
-     *
-     * @param Error $error the error
-     *
-     * @return void
-     */
-    protected function dispPageStart($error = null)
-    {
-        Response::getInstance()->disable();
-        echo '<html><head><title>';
-        if ($error) {
-            echo $error->getTitle();
-        } else {
-            echo 'phpMyAdmin error reporting page';
-        }
-        echo '</title></head>';
-    }
-
-    /**
-     * display HTML footer
-     *
-     * @return void
-     */
-    protected function dispPageEnd()
-    {
-        echo '</body></html>';
-    }
-
-    /**
-     * renders errors not displayed
-     *
-     * @return string
-     */
-    public function getDispErrors()
-    {
-        // Not sure why but seen in reports.phpmyadmin.net
-        if (empty($GLOBALS['cfg']['SendErrorReports'])) {
-            $GLOBALS['cfg']['SendErrorReports'] = 'ask';
-        }
-        $retval = '';
-        // display errors if SendErrorReports is set to 'ask'.
-        if ($GLOBALS['cfg']['SendErrorReports'] != 'never') {
-            foreach ($this->getErrors() as $error) {
-                if ($error instanceof Error) {
-                    if (! $error->isDisplayed()) {
-                        $retval .= $error->getDisplay();
-                    }
-                } else {
-                    $retval .= var_export($error, true);
-                }
-            }
-        } else {
-            $retval .= $this->getDispUserErrors();
-        }
-        // if preference is not 'never' and
-        // there are 'actual' errors to be reported
-        if ($GLOBALS['cfg']['SendErrorReports'] != 'never'
-            &&  $this->countErrors() !=  $this->countUserErrors()
-        ) {
-            // add report button.
-            $retval .= '<form method="post" action="error_report.php"'
-                    . ' id="pma_report_errors_form"';
-            if ($GLOBALS['cfg']['SendErrorReports'] == 'always') {
-                // in case of 'always', generate 'invisible' form.
-                $retval .= ' style="display:none;"';
-            }
-            $retval .=  '>'
-                    . '<input type="hidden" name="token" value="'
-                    . $_SESSION[' PMA_token ']
-                    . '"/>'
-                    . '<input type="hidden" name="exception_type" value="php"/>'
-                    . '<input type="hidden" name="send_error_report" value="1" />'
-                    . '<input type="submit" value="'
-                    . __('Report')
-                    . '" id="pma_report_errors" class="floatright">'
-                    . '<input type="checkbox" name="always_send"'
-                    . ' id="always_send_checkbox" value="true"/>'
-                    . '<label for="always_send_checkbox">'
-                    . __('Automatically send report next time')
-                    . '</label>';
-
-            if ($GLOBALS['cfg']['SendErrorReports'] == 'ask') {
-                // add ignore buttons
-                $retval .= '<input type="submit" value="'
-                        . __('Ignore')
-                        . '" id="pma_ignore_errors_bottom" class="floatright">';
-            }
-            $retval .= '<input type="submit" value="'
-                    . __('Ignore All')
-                    . '" id="pma_ignore_all_errors_bottom" class="floatright">';
-            $retval .= '</form>';
-        }
-        return $retval;
-    }
-
-    /**
-     * displays errors not displayed
-     *
-     * @return void
-     */
-    public function dispErrors()
-    {
-        echo $this->getDispErrors();
-    }
-
-    /**
-     * look in session for saved errors
-     *
-     * @return void
-     */
-    protected function checkSavedErrors()
-    {
-        if (isset($_SESSION['errors'])) {
-
-            // restore saved errors
-            foreach ($_SESSION['errors'] as $hash => $error) {
-                if ($error instanceof Error && ! isset($this->errors[$hash])) {
-                    $this->errors[$hash] = $error;
-                }
-            }
-            //$this->errors = array_merge($_SESSION['errors'], $this->errors);
-
-            // delete stored errors
-            $_SESSION['errors'] = array();
-            unset($_SESSION['errors']);
-        }
-    }
-
-    /**
-     * return count of errors
-     *
-     * @param $check bool Whether to check for session errors
-     *
-     * @return integer number of errors occurred
-     */
-    public function countErrors($check=true)
-    {
-        return count($this->getErrors($check));
-    }
-
-    /**
-     * return count of user errors
-     *
-     * @return integer number of user errors occurred
-     */
-    public function countUserErrors()
-    {
-        $count = 0;
-        if ($this->countErrors()) {
-            foreach ($this->getErrors() as $error) {
-                if ($error->isUserError()) {
-                    $count++;
-                }
-            }
-        }
-
-        return $count;
-    }
-
-    /**
-     * whether use errors occurred or not
-     *
-     * @return boolean
-     */
-    public function hasUserErrors()
-    {
-        return (bool) $this->countUserErrors();
-    }
-
-    /**
-     * whether errors occurred or not
-     *
-     * @return boolean
-     */
-    public function hasErrors()
-    {
-        return (bool) $this->countErrors();
-    }
-
-    /**
-     * number of errors to be displayed
-     *
-     * @return integer number of errors to be displayed
-     */
-    public function countDisplayErrors()
-    {
-        if ($GLOBALS['cfg']['SendErrorReports'] != 'never') {
-            return $this->countErrors();
-        } else {
-            return $this->countUserErrors();
-        }
-    }
-
-    /**
-     * whether there are errors to display or not
-     *
-     * @return boolean
-     */
-    public function hasDisplayErrors()
-    {
-        return (bool) $this->countDisplayErrors();
-    }
-
-    /**
-    * Deletes previously stored errors in SESSION.
-    * Saves current errors in session as previous errors.
-    * Required to save current errors in case  'ask'
-    *
-    * @return void
-    */
-    public function savePreviousErrors()
-    {
-        unset($_SESSION['prev_errors']);
-        $_SESSION['prev_errors'] = $GLOBALS['error_handler']->getCurrentErrors();
-    }
-
-    /**
-     * Function to check if there are any errors to be prompted.
-     * Needed because user warnings raised are
-     *      also collected by global error handler.
-     * This distinguishes between the actual errors
-     *      and user errors raised to warn user.
-     *
-     *@return boolean true if there are errors to be "prompted", false otherwise
-     */
-    public function hasErrorsForPrompt()
-    {
-        return (
-            $GLOBALS['cfg']['SendErrorReports'] != 'never'
-            && $this->countErrors() !=  $this->countUserErrors()
-        );
-    }
-
-    /**
-     * Function to report all the collected php errors.
-     * Must be called at the end of each script
-     *      by the $GLOBALS['error_handler'] only.
-     *
-     * @return void
-     */
-    public function reportErrors()
-    {
-        // if there're no actual errors,
-        if (!$this->hasErrors()
-            || $this->countErrors() ==  $this->countUserErrors()
-        ) {
-            // then simply return.
-            return;
-        }
-        // Delete all the prev_errors in session & store new prev_errors in session
-        $this->savePreviousErrors();
-        $response = Response::getInstance();
-        $jsCode = '';
-        if ($GLOBALS['cfg']['SendErrorReports'] == 'always') {
-            if ($response->isAjax()) {
-                // set flag for automatic report submission.
-                $response->addJSON('_sendErrorAlways', '1');
-            } else {
-                // send the error reports asynchronously & without asking user
-                $jsCode .= '$("#pma_report_errors_form").submit();'
-                        . 'PMA_ajaxShowMessage(
-                            PMA_messages["phpErrorsBeingSubmitted"], false
-                        );';
-                // js code to appropriate focusing,
-                $jsCode .= '$("html, body").animate({
-                                scrollTop:$(document).height()
-                            }, "slow");';
-            }
-        } elseif ($GLOBALS['cfg']['SendErrorReports'] == 'ask') {
-            //ask user whether to submit errors or not.
-            if (!$response->isAjax()) {
-                // js code to show appropriate msgs, event binding & focusing.
-                $jsCode = 'PMA_ajaxShowMessage(PMA_messages["phpErrorsFound"]);'
-                        . '$("#pma_ignore_errors_popup").bind("click", function() {
-                            PMA_ignorePhpErrors()
-                        });'
-                        . '$("#pma_ignore_all_errors_popup").bind("click",
-                            function() {
-                                PMA_ignorePhpErrors(false)
-                            });'
-                        . '$("#pma_ignore_errors_bottom").bind("click", function(e) {
-                            e.preventDefaulut();
-                            PMA_ignorePhpErrors()
-                        });'
-                        . '$("#pma_ignore_all_errors_bottom").bind("click",
-                            function(e) {
-                                e.preventDefault();
-                                PMA_ignorePhpErrors(false)
-                            });'
-                        . '$("html, body").animate({
-                            scrollTop:$(document).height()
-                        }, "slow");';
-            }
-        }
-        // The errors are already sent from the response.
-        // Just focus on errors division upon load event.
-        $response->getFooter()->getScripts()->addCode($jsCode);
-    }
-}
diff --git a/#pma/libraries/File.php b/#pma/libraries/File.php
deleted file mode 100644
index 4d71dc3f..00000000
--- a/#pma/libraries/File.php
+++ /dev/null
@@ -1,745 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * file upload functions
- *
- * @package PMA\libraries
- */
-namespace PMA\libraries;
-
-/**
- * File wrapper class
- *
- * @todo when uploading a file into a blob field, should we also consider using
- *       chunks like in import? UPDATE `table` SET `field` = `field` + [chunk]
- *
- * @package PMA\libraries
- */
-class File
-{
-    /**
-     * @var string the temporary file name
-     * @access protected
-     */
-    var $_name = null;
-
-    /**
-     * @var string the content
-     * @access protected
-     */
-    var $_content = null;
-
-    /**
-     * @var string the error message
-     * @access protected
-     */
-    var $_error_message = '';
-
-    /**
-     * @var bool whether the file is temporary or not
-     * @access protected
-     */
-    var $_is_temp = false;
-
-    /**
-     * @var string type of compression
-     * @access protected
-     */
-    var $_compression = null;
-
-    /**
-     * @var integer
-     */
-    var $_offset = 0;
-
-    /**
-     * @var integer size of chunk to read with every step
-     */
-    var $_chunk_size = 32768;
-
-    /**
-     * @var resource file handle
-     */
-    var $_handle = null;
-
-    /**
-     * @var boolean whether to decompress content before returning
-     */
-    var $_decompress = false;
-
-    /**
-     * @var string charset of file
-     */
-    var $_charset = null;
-
-    /**
-     * constructor
-     *
-     * @param boolean|string $name file name or false
-     *
-     * @access public
-     */
-    public function __construct($name = false)
-    {
-        if ($name && is_string($name)) {
-            $this->setName($name);
-        }
-    }
-
-    /**
-     * destructor
-     *
-     * @see     File::cleanUp()
-     * @access  public
-     */
-    public function __destruct()
-    {
-        $this->cleanUp();
-    }
-
-    /**
-     * deletes file if it is temporary, usually from a moved upload file
-     *
-     * @access  public
-     * @return boolean success
-     */
-    public function cleanUp()
-    {
-        if ($this->isTemp()) {
-            return $this->delete();
-        }
-
-        return true;
-    }
-
-    /**
-     * deletes the file
-     *
-     * @access  public
-     * @return boolean success
-     */
-    public function delete()
-    {
-        return unlink($this->getName());
-    }
-
-    /**
-     * checks or sets the temp flag for this file
-     * file objects with temp flags are deleted with object destruction
-     *
-     * @param boolean $is_temp sets the temp flag
-     *
-     * @return boolean File::$_is_temp
-     * @access  public
-     */
-    public function isTemp($is_temp = null)
-    {
-        if (null !== $is_temp) {
-            $this->_is_temp = (bool) $is_temp;
-        }
-
-        return $this->_is_temp;
-    }
-
-    /**
-     * accessor
-     *
-     * @param string $name file name
-     *
-     * @return void
-     * @access  public
-     */
-    public function setName($name)
-    {
-        $this->_name = trim($name);
-    }
-
-    /**
-     * Gets file content
-     *
-     * @return string|false the binary file content as a string,
-     *                      or false if no content
-     *
-     * @access  public
-     */
-    public function getContent()
-    {
-        if (null === $this->_content) {
-            if ($this->isUploaded() && ! $this->checkUploadedFile()) {
-                return false;
-            }
-
-            if (! $this->isReadable()) {
-                return false;
-            }
-
-            if (function_exists('file_get_contents')) {
-                $this->_content = file_get_contents($this->getName());
-            } elseif ($size = filesize($this->getName())) {
-                $this->_content = fread(fopen($this->getName(), 'rb'), $size);
-            }
-        }
-
-        return '0x' . bin2hex($this->_content);
-    }
-
-    /**
-     * Whether file is uploaded.
-     *
-     * @access  public
-     *
-     * @return bool
-     */
-    public function isUploaded()
-    {
-        return is_uploaded_file($this->getName());
-    }
-
-    /**
-     * accessor
-     *
-     * @access  public
-     * @return string  File::$_name
-     */
-    public function getName()
-    {
-        return $this->_name;
-    }
-
-    /**
-     * Initializes object from uploaded file.
-     *
-     * @param string $name name of file uploaded
-     *
-     * @return boolean success
-     * @access  public
-     */
-    public function setUploadedFile($name)
-    {
-        $this->setName($name);
-
-        if (! $this->isUploaded()) {
-            $this->setName(null);
-            $this->_error_message = __('File was not an uploaded file.');
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Loads uploaded file from table change request.
-     *
-     * @param string $key       the md5 hash of the column name
-     * @param string $rownumber number of row to process
-     *
-     * @return boolean success
-     * @access  public
-     */
-    public function setUploadedFromTblChangeRequest($key, $rownumber)
-    {
-        if (! isset($_FILES['fields_upload'])
-            || empty($_FILES['fields_upload']['name']['multi_edit'][$rownumber][$key])
-        ) {
-            return false;
-        }
-        $file = File::fetchUploadedFromTblChangeRequestMultiple(
-            $_FILES['fields_upload'],
-            $rownumber,
-            $key
-        );
-
-        // check for file upload errors
-        switch ($file['error']) {
-        // we do not use the PHP constants here cause not all constants
-        // are defined in all versions of PHP - but the correct constants names
-        // are given as comment
-        case 0: //UPLOAD_ERR_OK:
-            return $this->setUploadedFile($file['tmp_name']);
-        case 4: //UPLOAD_ERR_NO_FILE:
-            break;
-        case 1: //UPLOAD_ERR_INI_SIZE:
-            $this->_error_message = __(
-                'The uploaded file exceeds the upload_max_filesize directive in '
-                . 'php.ini.'
-            );
-            break;
-        case 2: //UPLOAD_ERR_FORM_SIZE:
-            $this->_error_message = __(
-                'The uploaded file exceeds the MAX_FILE_SIZE directive that was '
-                . 'specified in the HTML form.'
-            );
-            break;
-        case 3: //UPLOAD_ERR_PARTIAL:
-            $this->_error_message = __(
-                'The uploaded file was only partially uploaded.'
-            );
-            break;
-        case 6: //UPLOAD_ERR_NO_TMP_DIR:
-            $this->_error_message = __('Missing a temporary folder.');
-            break;
-        case 7: //UPLOAD_ERR_CANT_WRITE:
-            $this->_error_message = __('Failed to write file to disk.');
-            break;
-        case 8: //UPLOAD_ERR_EXTENSION:
-            $this->_error_message = __('File upload stopped by extension.');
-            break;
-        default:
-            $this->_error_message = __('Unknown error in file upload.');
-        } // end switch
-
-        return false;
-    }
-
-    /**
-     * strips some dimension from the multi-dimensional array from $_FILES
-     *
-     * <code>
-     * $file['name']['multi_edit'][$rownumber][$key] = [value]
-     * $file['type']['multi_edit'][$rownumber][$key] = [value]
-     * $file['size']['multi_edit'][$rownumber][$key] = [value]
-     * $file['tmp_name']['multi_edit'][$rownumber][$key] = [value]
-     * $file['error']['multi_edit'][$rownumber][$key] = [value]
-     *
-     * // becomes:
-     *
-     * $file['name'] = [value]
-     * $file['type'] = [value]
-     * $file['size'] = [value]
-     * $file['tmp_name'] = [value]
-     * $file['error'] = [value]
-     * </code>
-     *
-     * @param array  $file      the array
-     * @param string $rownumber number of row to process
-     * @param string $key       key to process
-     *
-     * @return array
-     * @access  public
-     * @static
-     */
-    public function fetchUploadedFromTblChangeRequestMultiple(
-        $file, $rownumber, $key
-    ) {
-        $new_file = array(
-            'name' => $file['name']['multi_edit'][$rownumber][$key],
-            'type' => $file['type']['multi_edit'][$rownumber][$key],
-            'size' => $file['size']['multi_edit'][$rownumber][$key],
-            'tmp_name' => $file['tmp_name']['multi_edit'][$rownumber][$key],
-            'error' => $file['error']['multi_edit'][$rownumber][$key],
-        );
-
-        return $new_file;
-    }
-
-    /**
-     * sets the name if the file to the one selected in the tbl_change form
-     *
-     * @param string $key       the md5 hash of the column name
-     * @param string $rownumber number of row to process
-     *
-     * @return boolean success
-     * @access  public
-     */
-    public function setSelectedFromTblChangeRequest($key, $rownumber = null)
-    {
-        if (! empty($_REQUEST['fields_uploadlocal']['multi_edit'][$rownumber][$key])
-            && is_string($_REQUEST['fields_uploadlocal']['multi_edit'][$rownumber][$key])
-        ) {
-            // ... whether with multiple rows ...
-            return $this->setLocalSelectedFile(
-                $_REQUEST['fields_uploadlocal']['multi_edit'][$rownumber][$key]
-            );
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Returns possible error message.
-     *
-     * @access  public
-     * @return string  error message
-     */
-    public function getError()
-    {
-        return $this->_error_message;
-    }
-
-    /**
-     * Checks whether there was any error.
-     *
-     * @access  public
-     * @return boolean whether an error occurred or not
-     */
-    public function isError()
-    {
-        return ! empty($this->_error_message);
-    }
-
-    /**
-     * checks the superglobals provided if the tbl_change form is submitted
-     * and uses the submitted/selected file
-     *
-     * @param string $key       the md5 hash of the column name
-     * @param string $rownumber number of row to process
-     *
-     * @return boolean success
-     * @access  public
-     */
-    public function checkTblChangeForm($key, $rownumber)
-    {
-        if ($this->setUploadedFromTblChangeRequest($key, $rownumber)) {
-            // well done ...
-            $this->_error_message = '';
-            return true;
-        } elseif ($this->setSelectedFromTblChangeRequest($key, $rownumber)) {
-            // well done ...
-            $this->_error_message = '';
-            return true;
-        }
-        // all failed, whether just no file uploaded/selected or an error
-
-        return false;
-    }
-
-    /**
-     * Sets named file to be read from UploadDir.
-     *
-     * @param string $name file name
-     *
-     * @return boolean success
-     * @access  public
-     */
-    public function setLocalSelectedFile($name)
-    {
-        if (empty($GLOBALS['cfg']['UploadDir'])) {
-            return false;
-        }
-
-        $this->setName(
-            Util::userDir($GLOBALS['cfg']['UploadDir']) . PMA_securePath($name)
-        );
-        if (@is_link($this->getName())) {
-            $this->_error_message = __('File is a symbolic link');
-            $this->setName(null);
-            return false;
-        }
-        if (! $this->isReadable()) {
-            $this->_error_message = __('File could not be read!');
-            $this->setName(null);
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Checks whether file can be read.
-     *
-     * @access  public
-     * @return boolean whether the file is readable or not
-     */
-    public function isReadable()
-    {
-        // suppress warnings from being displayed, but not from being logged
-        // any file access outside of open_basedir will issue a warning
-        return @is_readable($this->getName());
-    }
-
-    /**
-     * If we are on a server with open_basedir, we must move the file
-     * before opening it. The FAQ 1.11 explains how to create the "./tmp"
-     * directory - if needed
-     *
-     * @todo move check of $cfg['TempDir'] into Config?
-     * @access  public
-     * @return boolean whether uploaded file is fine or not
-     */
-    public function checkUploadedFile()
-    {
-        if ($this->isReadable()) {
-            return true;
-        }
-
-        if (empty($GLOBALS['cfg']['TempDir'])
-            || ! @is_writable($GLOBALS['cfg']['TempDir'])
-        ) {
-            // cannot create directory or access, point user to FAQ 1.11
-            $this->_error_message = __(
-                'Error moving the uploaded file, see [doc@faq1-11]FAQ 1.11[/doc].'
-            );
-            return false;
-        }
-
-        $new_file_to_upload = tempnam(
-            realpath($GLOBALS['cfg']['TempDir']),
-            basename($this->getName())
-        );
-
-        // suppress warnings from being displayed, but not from being logged
-        // any file access outside of open_basedir will issue a warning
-        ob_start();
-        $move_uploaded_file_result = move_uploaded_file(
-            $this->getName(),
-            $new_file_to_upload
-        );
-        ob_end_clean();
-        if (! $move_uploaded_file_result) {
-            $this->_error_message = __('Error while moving uploaded file.');
-            return false;
-        }
-
-        $this->setName($new_file_to_upload);
-        $this->isTemp(true);
-
-        if (! $this->isReadable()) {
-            $this->_error_message = __('Cannot read uploaded file.');
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Detects what compression the file uses
-     *
-     * @todo    move file read part into readChunk() or getChunk()
-     * @todo    add support for compression plugins
-     * @access  protected
-     * @return  string|false false on error, otherwise string MIME type of
-     *                       compression, none for none
-     */
-    protected function detectCompression()
-    {
-        // suppress warnings from being displayed, but not from being logged
-        // f.e. any file access outside of open_basedir will issue a warning
-        ob_start();
-        $file = fopen($this->getName(), 'rb');
-        ob_end_clean();
-
-        if (! $file) {
-            $this->_error_message = __('File could not be read!');
-            return false;
-        }
-
-        /**
-         * @todo
-         * get registered plugins for file compression
-
-        foreach (PMA_getPlugins($type = 'compression') as $plugin) {
-            if ($plugin['classname']::canHandle($this->getName())) {
-                $this->setCompressionPlugin($plugin);
-                break;
-            }
-        }
-         */
-
-        $this->_compression = Util::getCompressionMimeType($file);
-        return $this->_compression;
-    }
-
-    /**
-     * Sets whether the content should be decompressed before returned
-     *
-     * @param boolean $decompress whether to decompress
-     *
-     * @return void
-     */
-    public function setDecompressContent($decompress)
-    {
-        $this->_decompress = (bool) $decompress;
-    }
-
-    /**
-     * Returns the file handle
-     *
-     * @return resource file handle
-     */
-    public function getHandle()
-    {
-        if (null === $this->_handle) {
-            $this->open();
-        }
-        return $this->_handle;
-    }
-
-    /**
-     * Sets the file handle
-     *
-     * @param object $handle file handle
-     *
-     * @return void
-     */
-    public function setHandle($handle)
-    {
-        $this->_handle = $handle;
-    }
-
-
-    /**
-     * Sets error message for unsupported compression.
-     *
-     * @return void
-     */
-    public function errorUnsupported()
-    {
-        $this->_error_message = sprintf(
-            __(
-                'You attempted to load file with unsupported compression (%s). '
-                . 'Either support for it is not implemented or disabled by your '
-                . 'configuration.'
-            ),
-            $this->getCompression()
-        );
-    }
-
-    /**
-     * Attempts to open the file.
-     *
-     * @return bool
-     */
-    public function open()
-    {
-        if (! $this->_decompress) {
-            $this->_handle = @fopen($this->getName(), 'r');
-        }
-
-        switch ($this->getCompression()) {
-        case false:
-            return false;
-        case 'application/bzip2':
-            if ($GLOBALS['cfg']['BZipDump'] && @function_exists('bzopen')) {
-                $this->_handle = @bzopen($this->getName(), 'r');
-            } else {
-                $this->errorUnsupported();
-                return false;
-            }
-            break;
-        case 'application/gzip':
-            if ($GLOBALS['cfg']['GZipDump'] && @function_exists('gzopen')) {
-                $this->_handle = @gzopen($this->getName(), 'r');
-            } else {
-                $this->errorUnsupported();
-                return false;
-            }
-            break;
-        case 'application/zip':
-            if ($GLOBALS['cfg']['ZipDump'] && @function_exists('zip_open')) {
-                include_once './libraries/zip_extension.lib.php';
-                $result = PMA_getZipContents($this->getName());
-                if (! empty($result['error'])) {
-                    $this->_error_message = Message::rawError($result['error']);
-                    return false;
-                }
-                unset($result);
-            } else {
-                $this->errorUnsupported();
-                return false;
-            }
-            break;
-        case 'none':
-            $this->_handle = @fopen($this->getName(), 'r');
-            break;
-        default:
-            $this->errorUnsupported();
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Returns the character set of the file
-     *
-     * @return string character set of the file
-     */
-    public function getCharset()
-    {
-        return $this->_charset;
-    }
-
-    /**
-     * Sets the character set of the file
-     *
-     * @param string $charset character set of the file
-     *
-     * @return void
-     */
-    public function setCharset($charset)
-    {
-        $this->_charset = $charset;
-    }
-
-    /**
-     * Returns compression used by file.
-     *
-     * @return string MIME type of compression, none for none
-     * @access  public
-     */
-    public function getCompression()
-    {
-        if (null === $this->_compression) {
-            return $this->detectCompression();
-        }
-
-        return $this->_compression;
-    }
-
-    /**
-     * Returns the offset
-     *
-     * @return integer the offset
-     */
-    public function getOffset()
-    {
-        return $this->_offset;
-    }
-
-    /**
-     * Returns the chunk size
-     *
-     * @return integer the chunk size
-     */
-    public function getChunkSize()
-    {
-        return $this->_chunk_size;
-    }
-
-    /**
-     * Sets the chunk size
-     *
-     * @param integer $chunk_size the chunk size
-     *
-     * @return void
-     */
-    public function setChunkSize($chunk_size)
-    {
-        $this->_chunk_size = (int) $chunk_size;
-    }
-
-    /**
-     * Returns the length of the content in the file
-     *
-     * @return integer the length of the file content
-     */
-    public function getContentLength()
-    {
-        return mb_strlen($this->_content);
-    }
-
-    /**
-     * Returns whether the end of the file has been reached
-     *
-     * @return boolean whether the end of the file has been reached
-     */
-    public function eof()
-    {
-        if ($this->getHandle()) {
-            return feof($this->getHandle());
-        } else {
-            return ($this->getOffset() >= $this->getContentLength());
-        }
-
-    }
-}
diff --git a/#pma/libraries/Font.php b/#pma/libraries/Font.php
deleted file mode 100644
index dd4bd810..00000000
--- a/#pma/libraries/Font.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Class with Font related methods.
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries;
-
-/**
- * Class with Font related methods.
- *
- * @package PhpMyAdmin
- */
-class Font
-{
-    /**
-     * Get list with characters and the corresponding width modifiers.
-     *
-     * @return array with characters and corresponding width modifier
-     * @access public
-     */
-    public static function getCharLists()
-    {
-        // list of characters and their width modifiers
-        $charLists = array();
-
-        //ijl
-        $charLists[] = array("chars" => array("i", "j", "l"), "modifier" => 0.23);
-        //f
-        $charLists[] = array("chars" => array("f"), "modifier" => 0.27);
-        //tI
-        $charLists[] = array("chars" => array("t", "I"), "modifier" => 0.28);
-        //r
-        $charLists[] = array("chars" => array("r"), "modifier" => 0.34);
-        //1
-        $charLists[] = array("chars" => array("1"), "modifier" => 0.49);
-        //cksvxyzJ
-        $charLists[] = array(
-            "chars" => array("c", "k", "s", "v", "x", "y", "z", "J"),
-            "modifier" => 0.5
-        );
-        //abdeghnopquL023456789
-        $charLists[] = array(
-            "chars" => array(
-                "a", "b", "d", "e", "g", "h", "n", "o", "p", "q", "u", "L",
-                "0", "2", "3", "4", "5", "6", "7", "8", "9"
-            ),
-            "modifier" => 0.56
-        );
-        //FTZ
-        $charLists[] = array("chars" => array("F", "T", "Z"), "modifier" => 0.61);
-        //ABEKPSVXY
-        $charLists[] = array(
-            "chars" => array("A", "B", "E", "K", "P", "S", "V", "X", "Y"),
-            "modifier" => 0.67
-        );
-        //wCDHNRU
-        $charLists[] = array(
-            "chars" => array("w", "C", "D", "H", "N", "R", "U"),
-            "modifier" => 0.73
-        );
-        //GOQ
-        $charLists[] = array("chars" => array("G", "O", "Q"), "modifier" => 0.78);
-        //mM
-        $charLists[] = array("chars" => array("m", "M"), "modifier" => 0.84);
-        //W
-        $charLists[] = array("chars" => array("W"), "modifier" => 0.95);
-        //" "
-        $charLists[] = array("chars" => array(" "), "modifier" => 0.28);
-
-        return $charLists;
-    }
-
-    /**
-     * Get width of string/text
-     *
-     * The text element width is calculated depending on font name
-     * and font size.
-     *
-     * @param string  $text      string of which the width will be calculated
-     * @param string  $font      name of the font like Arial,sans-serif etc
-     * @param integer $fontSize  size of font
-     * @param array   $charLists list of characters and their width modifiers
-     *
-     * @return integer width of the text
-     * @access public
-     */
-    public static function getStringWidth($text, $font, $fontSize, $charLists = null)
-    {
-        if (empty($charLists) || !is_array($charLists)
-            || !isset($charLists[0]["chars"]) || !is_array($charLists[0]["chars"])
-            || !isset($charLists[0]["modifier"])
-        ) {
-            $charLists = self::getCharLists();
-        }
-
-        /*
-         * Start by counting the width, giving each character a modifying value
-         */
-        $count = 0;
-
-        foreach ($charLists as $charList) {
-            $count += ((mb_strlen($text)
-                - mb_strlen(str_replace($charList["chars"], "", $text))
-                ) * $charList["modifier"]);
-        }
-
-        $text  = str_replace(" ", "", $text);//remove the " "'s
-        //all other chars
-        $count = $count
-            + (mb_strlen(preg_replace("/[a-z0-9]/i", "", $text)) * 0.3);
-
-        $modifier = 1;
-        $font = mb_strtolower($font);
-        switch ($font) {
-        /*
-         * no modifier for arial and sans-serif
-         */
-        case 'arial':
-        case 'sans-serif':
-            break;
-        /*
-         * .92 modifier for time, serif, brushscriptstd, and californian fb
-         */
-        case 'times':
-        case 'serif':
-        case 'brushscriptstd':
-        case 'californian fb':
-            $modifier = .92;
-            break;
-        /*
-         * 1.23 modifier for broadway
-         */
-        case 'broadway':
-            $modifier = 1.23;
-            break;
-        }
-        $textWidth = $count * $fontSize;
-        return (int)ceil($textWidth * $modifier);
-    }
-}
diff --git a/#pma/libraries/Footer.php b/#pma/libraries/Footer.php
deleted file mode 100644
index d362f182..00000000
--- a/#pma/libraries/Footer.php
+++ /dev/null
@@ -1,373 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Used to render the footer of PMA's pages
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries;
-
-use Traversable;
-
-/**
- * Class used to output the footer
- *
- * @package PhpMyAdmin
- */
-class Footer
-{
-    /**
-     * Scripts instance
-     *
-     * @access private
-     * @var Scripts
-     */
-    private $_scripts;
-    /**
-     * Whether we are servicing an ajax request.
-     * We can't simply use $GLOBALS['is_ajax_request']
-     * here since it may have not been initialised yet.
-     *
-     * @access private
-     * @var bool
-     */
-    private $_isAjax;
-    /**
-     * Whether to only close the BODY and HTML tags
-     * or also include scripts, errors and links
-     *
-     * @access private
-     * @var bool
-     */
-    private $_isMinimal;
-    /**
-     * Whether to display anything
-     *
-     * @access private
-     * @var bool
-     */
-    private $_isEnabled;
-
-    /**
-     * Creates a new class instance
-     */
-    public function __construct()
-    {
-        $this->_isEnabled = true;
-        $this->_scripts   = new Scripts();
-        $this->_isMinimal = false;
-    }
-
-    /**
-     * Returns the message for demo server to error messages
-     *
-     * @return string
-     */
-    private function _getDemoMessage()
-    {
-        $message = '<a href="/">' . __('phpMyAdmin Demo Server') . '</a>: ';
-        if (file_exists('./revision-info.php')) {
-            include './revision-info.php';
-            $message .= sprintf(
-                __('Currently running Git revision %1$s from the %2$s branch.'),
-                '<a target="_blank" rel="noopener noreferrer" href="' . $repobase . $fullrevision . '">'
-                . $revision . '</a>',
-                '<a target="_blank" rel="noopener noreferrer" href="' . $repobranchbase . $branch . '">'
-                . $branch . '</a>'
-            );
-        } else {
-            $message .= __('Git information missing!');
-        }
-
-        return Message::notice($message)->getDisplay();
-    }
-
-    /**
-     * Remove recursions and iterator objects from an object
-     *
-     * @param object|array &$object Object to clean
-     * @param array        $stack   Stack used to keep track of recursion,
-     *                              need not be passed for the first time
-     *
-     * @return object Reference passed object
-     */
-    private static function _removeRecursion(&$object, $stack = array())
-    {
-        if ((is_object($object) || is_array($object)) && $object) {
-            if ($object instanceof Traversable) {
-                $object = "***ITERATOR***";
-            } else if (!in_array($object, $stack, true)) {
-                $stack[] = $object;
-                foreach ($object as &$subobject) {
-                    self::_removeRecursion($subobject, $stack);
-                }
-            } else {
-                $object = "***RECURSION***";
-            }
-        }
-        return $object;
-    }
-
-    /**
-     * Renders the debug messages
-     *
-     * @return string
-     */
-    public function getDebugMessage()
-    {
-        $retval = '\'null\'';
-        if ($GLOBALS['cfg']['DBG']['sql']
-            && empty($_REQUEST['no_debug'])
-            && !empty($_SESSION['debug'])
-        ) {
-            // Remove recursions and iterators from $_SESSION['debug']
-            self::_removeRecursion($_SESSION['debug']);
-
-            $retval = JSON_encode($_SESSION['debug']);
-            $_SESSION['debug'] = array();
-            return json_last_error() ? '\'false\'' : $retval;
-        }
-        $_SESSION['debug'] = array();
-        return $retval;
-    }
-
-    /**
-     * Returns the url of the current page
-     *
-     * @param string|null $encode See PMA_URL_getCommon()
-     *
-     * @return string
-     */
-    public function getSelfUrl($encode = 'html')
-    {
-        $db = ! empty($GLOBALS['db']) ? $GLOBALS['db'] : '';
-        $table = ! empty($GLOBALS['table']) ? $GLOBALS['table'] : '';
-        $target = ! empty($_REQUEST['target']) ? $_REQUEST['target'] : '';
-        $params = array(
-            'db' => $db,
-            'table' => $table,
-            'server' => $GLOBALS['server'],
-            'target' => $target
-        );
-        // needed for server privileges tabs
-        if (isset($_REQUEST['viewing_mode'])
-            && in_array($_REQUEST['viewing_mode'], array('server', 'db', 'table'))
-        ) {
-            $params['viewing_mode'] = $_REQUEST['viewing_mode'];
-        }
-        /*
-         * @todo    coming from server_privileges.php, here $db is not set,
-         *          add the following condition below when that is fixed
-         *          && $_REQUEST['checkprivsdb'] == $db
-         */
-        if (isset($_REQUEST['checkprivsdb'])
-        ) {
-            $params['checkprivsdb'] = $_REQUEST['checkprivsdb'];
-        }
-        /*
-         * @todo    coming from server_privileges.php, here $table is not set,
-         *          add the following condition below when that is fixed
-         *          && $_REQUEST['checkprivstable'] == $table
-         */
-        if (isset($_REQUEST['checkprivstable'])
-        ) {
-            $params['checkprivstable'] = $_REQUEST['checkprivstable'];
-        }
-        if (isset($_REQUEST['single_table'])
-            && in_array($_REQUEST['single_table'], array(true, false))
-        ) {
-            $params['single_table'] = $_REQUEST['single_table'];
-        }
-        return basename(PMA_getenv('SCRIPT_NAME')) . PMA_URL_getCommon(
-            $params,
-            $encode
-        );
-    }
-
-    /**
-     * Renders the link to open a new page
-     *
-     * @param string $url The url of the page
-     *
-     * @return string
-     */
-    private function _getSelfLink($url)
-    {
-        $retval  = '';
-        $retval .= '<div id="selflink" class="print_ignore">';
-        $retval .= '<a href="' . $url . '"'
-            . ' title="' . __('Open new phpMyAdmin window') . '" target="_blank" rel="noopener noreferrer">';
-        if (Util::showIcons('TabsMode')) {
-            $retval .= Util::getImage(
-                'window-new.png',
-                __('Open new phpMyAdmin window')
-            );
-        } else {
-            $retval .=  __('Open new phpMyAdmin window');
-        }
-        $retval .= '</a>';
-        $retval .= '</div>';
-        return $retval;
-    }
-
-    /**
-     * Renders the link to open a new page
-     *
-     * @return string
-     */
-    public function getErrorMessages()
-    {
-        $retval = '';
-        if ($GLOBALS['error_handler']->hasDisplayErrors()) {
-            $retval .= $GLOBALS['error_handler']->getDispErrors();
-        }
-
-        /**
-         * Report php errors
-         */
-        $GLOBALS['error_handler']->reportErrors();
-
-        return $retval;
-    }
-
-    /**
-     * Saves query in history
-     *
-     * @return void
-     */
-    private function _setHistory()
-    {
-        if (! PMA_isValid($_REQUEST['no_history'])
-            && empty($GLOBALS['error_message'])
-            && ! empty($GLOBALS['sql_query'])
-            && (isset($GLOBALS['dbi'])
-            && ($GLOBALS['dbi']->getLink()
-            || isset($GLOBALS['controllink'])
-            && $GLOBALS['controllink']))
-        ) {
-            PMA_setHistory(
-                PMA_ifSetOr($GLOBALS['db'], ''),
-                PMA_ifSetOr($GLOBALS['table'], ''),
-                $GLOBALS['cfg']['Server']['user'],
-                $GLOBALS['sql_query']
-            );
-        }
-    }
-
-    /**
-     * Disables the rendering of the footer
-     *
-     * @return void
-     */
-    public function disable()
-    {
-        $this->_isEnabled = false;
-    }
-
-    /**
-     * Set the ajax flag to indicate whether
-     * we are servicing an ajax request
-     *
-     * @param bool $isAjax Whether we are servicing an ajax request
-     *
-     * @return void
-     */
-    public function setAjax($isAjax)
-    {
-        $this->_isAjax = (boolean) $isAjax;
-    }
-
-    /**
-     * Turn on minimal display mode
-     *
-     * @return void
-     */
-    public function setMinimal()
-    {
-        $this->_isMinimal = true;
-    }
-
-    /**
-     * Returns the Scripts object
-     *
-     * @return Scripts object
-     */
-    public function getScripts()
-    {
-        return $this->_scripts;
-    }
-
-    /**
-     * Renders the footer
-     *
-     * @return string
-     */
-    public function getDisplay()
-    {
-        $retval = '';
-        $this->_setHistory();
-        if ($this->_isEnabled) {
-            if (! $this->_isAjax) {
-                $retval .= "</div>";
-            }
-            if (! $this->_isAjax && ! $this->_isMinimal) {
-                if (PMA_getenv('SCRIPT_NAME')
-                    && empty($_POST)
-                    && empty($GLOBALS['checked_special'])
-                    && ! $this->_isAjax
-                ) {
-                    $url = $this->getSelfUrl('unencoded');
-                    $header = Response::getInstance()->getHeader();
-                    $scripts = $header->getScripts()->getFiles();
-                    $menuHash = $header->getMenu()->getHash();
-                    // prime the client-side cache
-                    $this->_scripts->addCode(
-                        sprintf(
-                            'if (! (history && history.pushState)) '
-                            . 'PMA_MicroHistory.primer = {'
-                            . ' url: "%s",'
-                            . ' scripts: %s,'
-                            . ' menuHash: "%s"'
-                            . '};',
-                            PMA_escapeJsString($url),
-                            json_encode($scripts),
-                            PMA_escapeJsString($menuHash)
-                        )
-                    );
-                }
-                if (PMA_getenv('SCRIPT_NAME')
-                    && ! $this->_isAjax
-                ) {
-                    $url = $this->getSelfUrl();
-                    $retval .= $this->_getSelfLink($url);
-                }
-                $this->_scripts->addCode(
-                    'var debugSQLInfo = ' . $this->getDebugMessage() . ';'
-                );
-                $retval .= '<div class="clearfloat" id="pma_errors">';
-                $retval .= $this->getErrorMessages();
-                $retval .= '</div>';
-                $retval .= $this->_scripts->getDisplay();
-                if ($GLOBALS['cfg']['DBG']['demo']) {
-                    $retval .= '<div id="pma_demo">';
-                    $retval .= $this->_getDemoMessage();
-                    $retval .= '</div>';
-                }
-                // Include possible custom footers
-                if (file_exists(CUSTOM_FOOTER_FILE)) {
-                    $retval .= '<div id="pma_footer">';
-                    ob_start();
-                    include CUSTOM_FOOTER_FILE;
-                    $retval .= ob_get_contents();
-                    ob_end_clean();
-                    $retval .= '</div>';
-                }
-            }
-            if (! $this->_isAjax) {
-                $retval .= "</body></html>";
-            }
-        }
-
-        return $retval;
-    }
-}
diff --git a/#pma/libraries/Header.php b/#pma/libraries/Header.php
deleted file mode 100644
index 12ed44f6..00000000
--- a/#pma/libraries/Header.php
+++ /dev/null
@@ -1,813 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Used to render the header of PMA's pages
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries;
-
-use PMA\libraries\navigation\Navigation;
-
-require_once 'libraries/js_escape.lib.php';
-require_once 'libraries/url_generating.lib.php';
-
-/**
- * Class used to output the HTTP and HTML headers
- *
- * @package PhpMyAdmin
- */
-class Header
-{
-    /**
-     * Scripts instance
-     *
-     * @access private
-     * @var Scripts
-     */
-    private $_scripts;
-    /**
-     * PMA\libraries\Console instance
-     *
-     * @access private
-     * @var Console
-     */
-    private $_console;
-    /**
-     * Menu instance
-     *
-     * @access private
-     * @var Menu
-     */
-    private $_menu;
-    /**
-     * Whether to offer the option of importing user settings
-     *
-     * @access private
-     * @var bool
-     */
-    private $_userprefsOfferImport;
-    /**
-     * The page title
-     *
-     * @access private
-     * @var string
-     */
-    private $_title;
-    /**
-     * The value for the id attribute for the body tag
-     *
-     * @access private
-     * @var string
-     */
-    private $_bodyId;
-    /**
-     * Whether to show the top menu
-     *
-     * @access private
-     * @var bool
-     */
-    private $_menuEnabled;
-    /**
-     * Whether to show the warnings
-     *
-     * @access private
-     * @var bool
-     */
-    private $_warningsEnabled;
-    /**
-     * Whether the page is in 'print view' mode
-     *
-     * @access private
-     * @var bool
-     */
-    private $_isPrintView;
-    /**
-     * Whether we are servicing an ajax request.
-     * We can't simply use $GLOBALS['is_ajax_request']
-     * here since it may have not been initialised yet.
-     *
-     * @access private
-     * @var bool
-     */
-    private $_isAjax;
-    /**
-     * Whether to display anything
-     *
-     * @access private
-     * @var bool
-     */
-    private $_isEnabled;
-    /**
-     * Whether the HTTP headers (and possibly some HTML)
-     * have already been sent to the browser
-     *
-     * @access private
-     * @var bool
-     */
-    private $_headerIsSent;
-
-    /**
-     * Creates a new class instance
-     */
-    public function __construct()
-    {
-        $this->_isEnabled = true;
-        $this->_isAjax = false;
-        $this->_bodyId = '';
-        $this->_title  = '';
-        $this->_console = new Console();
-        $db = ! empty($GLOBALS['db']) ? $GLOBALS['db'] : '';
-        $table = ! empty($GLOBALS['table']) ? $GLOBALS['table'] : '';
-        $this->_menu   = new Menu(
-            $GLOBALS['server'],
-            $db,
-            $table
-        );
-        $this->_menuEnabled = true;
-        $this->_warningsEnabled = true;
-        $this->_isPrintView = false;
-        $this->_scripts     = new Scripts();
-        $this->_addDefaultScripts();
-        $this->_headerIsSent = false;
-        // if database storage for user preferences is transient,
-        // offer to load exported settings from localStorage
-        // (detection will be done in JavaScript)
-        $this->_userprefsOfferImport = false;
-        if ($GLOBALS['PMA_Config']->get('user_preferences') == 'session'
-            && ! isset($_SESSION['userprefs_autoload'])
-        ) {
-            $this->_userprefsOfferImport = true;
-        }
-    }
-
-    /**
-     * Loads common scripts
-     *
-     * @return void
-     */
-    private function _addDefaultScripts()
-    {
-        // Localised strings
-        $params = array('lang' => $GLOBALS['lang']);
-        if (isset($GLOBALS['db'])) {
-            $params['db'] = $GLOBALS['db'];
-        }
-        $this->_scripts->addFile('jquery/jquery-2.1.4.min.js');
-        $this->_scripts->addFile(
-            'whitelist.php' . PMA_URL_getCommon($params), false, true
-        );
-        $this->_scripts->addFile('sprintf.js');
-        $this->_scripts->addFile('ajax.js');
-        $this->_scripts->addFile('keyhandler.js');
-        $this->_scripts->addFile('jquery/jquery-ui-1.11.4.min.js');
-        $this->_scripts->addFile('jquery/jquery.cookie.js');
-        $this->_scripts->addFile('jquery/jquery.mousewheel.js');
-        $this->_scripts->addFile('jquery/jquery.event.drag-2.2.js');
-        $this->_scripts->addFile('jquery/jquery-ui-timepicker-addon.js');
-        $this->_scripts->addFile('jquery/jquery.ba-hashchange-1.3.js');
-        $this->_scripts->addFile('jquery/jquery.debounce-1.0.5.js');
-        $this->_scripts->addFile('menu-resizer.js');
-
-        // Cross-framing protection
-        if ($GLOBALS['cfg']['AllowThirdPartyFraming'] === false) {
-            $this->_scripts->addFile('cross_framing_protection.js');
-        }
-
-        $this->_scripts->addFile('rte.js');
-        if ($GLOBALS['cfg']['SendErrorReports'] !== 'never') {
-            $this->_scripts->addFile('tracekit/tracekit.js');
-            $this->_scripts->addFile('error_report.js');
-        }
-
-        // Here would not be a good place to add CodeMirror because
-        // the user preferences have not been merged at this point
-
-        $this->_scripts->addFile('messages.php' . PMA_URL_getCommon($params));
-        // Append the theme id to this url to invalidate
-        // the cache on a theme change. Though this might be
-        // unavailable for fatal errors.
-        if (isset($_SESSION['PMA_Theme'])) {
-            $theme_id = urlencode($_SESSION['PMA_Theme']->getId());
-        } else {
-            $theme_id = 'default';
-        }
-        $this->_scripts->addFile(
-            'get_image.js.php?theme=' . $theme_id
-        );
-        $this->_scripts->addFile('config.js');
-        $this->_scripts->addFile('doclinks.js');
-        $this->_scripts->addFile('functions.js');
-        $this->_scripts->addFile('navigation.js');
-        $this->_scripts->addFile('indexes.js');
-        $this->_scripts->addFile('common.js');
-        $this->_scripts->addFile('page_settings.js');
-        $this->_scripts->addCode($this->getJsParamsCode());
-    }
-
-    /**
-     * Returns, as an array, a list of parameters
-     * used on the client side
-     *
-     * @return array
-     */
-    public function getJsParams()
-    {
-        $db = ! empty($GLOBALS['db']) ? $GLOBALS['db'] : '';
-        $table = ! empty($GLOBALS['table']) ? $GLOBALS['table'] : '';
-        $pftext = ! empty($_SESSION['tmpval']['pftext'])
-            ? $_SESSION['tmpval']['pftext'] : '';
-
-        // not sure when this happens, but it happens
-        if (! isset($GLOBALS['collation_connection'])) {
-            $GLOBALS['collation_connection'] = 'utf8_general_ci';
-        }
-
-        $params = array(
-            'common_query' => PMA_URL_getCommon(array(), 'text'),
-            'opendb_url' => Util::getScriptNameForOption(
-                $GLOBALS['cfg']['DefaultTabDatabase'], 'database'
-            ),
-            'safari_browser' => PMA_USR_BROWSER_AGENT == 'SAFARI' ? 1 : 0,
-            'collation_connection' => $GLOBALS['collation_connection'],
-            'lang' => $GLOBALS['lang'],
-            'server' => $GLOBALS['server'],
-            'table' => $table,
-            'db'    => $db,
-            'token' => $_SESSION[' PMA_token '],
-            'text_dir' => $GLOBALS['text_dir'],
-            'show_databases_navigation_as_tree' => $GLOBALS['cfg']['ShowDatabasesNavigationAsTree'],
-            'pma_text_default_tab' => Util::getTitleForTarget(
-                $GLOBALS['cfg']['DefaultTabTable']
-            ),
-            'pma_text_left_default_tab' => Util::getTitleForTarget(
-                $GLOBALS['cfg']['NavigationTreeDefaultTabTable']
-            ),
-            'pma_text_left_default_tab2' => Util::getTitleForTarget(
-                $GLOBALS['cfg']['NavigationTreeDefaultTabTable2']
-            ),
-            'LimitChars' => $GLOBALS['cfg']['LimitChars'],
-            'pftext' => $pftext,
-            'confirm' => $GLOBALS['cfg']['Confirm'],
-            'LoginCookieValidity' => $GLOBALS['cfg']['LoginCookieValidity'],
-            'logged_in' => isset($GLOBALS['userlink']) ? true : false,
-            'PMA_VERSION' => PMA_VERSION
-        );
-        if (isset($GLOBALS['cfg']['Server'])
-            && isset($GLOBALS['cfg']['Server']['auth_type'])
-        ) {
-            $params['auth_type'] = $GLOBALS['cfg']['Server']['auth_type'];
-        }
-
-        return $params;
-    }
-
-    /**
-     * Returns, as a string, a list of parameters
-     * used on the client side
-     *
-     * @return string
-     */
-    public function getJsParamsCode()
-    {
-        $params = $this->getJsParams();
-        foreach ($params as $key => $value) {
-            $params[$key] = $key . ':"' . PMA_escapeJsString($value) . '"';
-        }
-        return 'PMA_commonParams.setAll({' . implode(',', $params) . '});';
-    }
-
-    /**
-     * Disables the rendering of the header
-     *
-     * @return void
-     */
-    public function disable()
-    {
-        $this->_isEnabled = false;
-    }
-
-    /**
-     * Set the ajax flag to indicate whether
-     * we are servicing an ajax request
-     *
-     * @param bool $isAjax Whether we are servicing an ajax request
-     *
-     * @return void
-     */
-    public function setAjax($isAjax)
-    {
-        $this->_isAjax = (boolean) $isAjax;
-        $this->_console->setAjax($isAjax);
-    }
-
-    /**
-     * Returns the Scripts object
-     *
-     * @return Scripts object
-     */
-    public function getScripts()
-    {
-        return $this->_scripts;
-    }
-
-    /**
-     * Returns the Menu object
-     *
-     * @return Menu object
-     */
-    public function getMenu()
-    {
-        return $this->_menu;
-    }
-
-    /**
-     * Setter for the ID attribute in the BODY tag
-     *
-     * @param string $id Value for the ID attribute
-     *
-     * @return void
-     */
-    public function setBodyId($id)
-    {
-        $this->_bodyId = htmlspecialchars($id);
-    }
-
-    /**
-     * Setter for the title of the page
-     *
-     * @param string $title New title
-     *
-     * @return void
-     */
-    public function setTitle($title)
-    {
-        $this->_title = htmlspecialchars($title);
-    }
-
-    /**
-     * Disables the display of the top menu
-     *
-     * @return void
-     */
-    public function disableMenuAndConsole()
-    {
-        $this->_menuEnabled = false;
-        $this->_console->disable();
-    }
-
-    /**
-     * Disables the display of the top menu
-     *
-     * @return void
-     */
-    public function disableWarnings()
-    {
-        $this->_warningsEnabled = false;
-    }
-
-    /**
-     * Turns on 'print view' mode
-     *
-     * @return void
-     */
-    public function enablePrintView()
-    {
-        $this->disableMenuAndConsole();
-        $this->setTitle(__('Print view') . ' - phpMyAdmin ' . PMA_VERSION);
-        $this->_isPrintView = true;
-    }
-
-    /**
-     * Generates the header
-     *
-     * @return string The header
-     */
-    public function getDisplay()
-    {
-        $retval = '';
-        if (! $this->_headerIsSent) {
-            if (! $this->_isAjax && $this->_isEnabled) {
-                $this->sendHttpHeaders();
-                $retval .= $this->_getHtmlStart();
-                $retval .= $this->_getMetaTags();
-                $retval .= $this->_getLinkTags();
-                $retval .= $this->getTitleTag();
-
-                // The user preferences have been merged at this point
-                // so we can conditionally add CodeMirror
-                if ($GLOBALS['cfg']['CodemirrorEnable']) {
-                    $this->_scripts->addFile('codemirror/lib/codemirror.js');
-                    $this->_scripts->addFile('codemirror/mode/sql/sql.js');
-                    $this->_scripts->addFile('codemirror/addon/runmode/runmode.js');
-                    $this->_scripts->addFile('codemirror/addon/hint/show-hint.js');
-                    $this->_scripts->addFile('codemirror/addon/hint/sql-hint.js');
-                    if ($GLOBALS['cfg']['LintEnable']) {
-                        $this->_scripts->addFile('codemirror/addon/lint/lint.js');
-                        $this->_scripts->addFile(
-                            'codemirror/addon/lint/sql-lint.js'
-                        );
-                    }
-                }
-                $this->_scripts->addCode(
-                    'ConsoleEnterExecutes='
-                    . ($GLOBALS['cfg']['ConsoleEnterExecutes'] ? 'true' : 'false')
-                );
-                $this->_scripts->addFiles($this->_console->getScripts());
-                if ($this->_userprefsOfferImport) {
-                    $this->_scripts->addFile('config.js');
-                }
-                $retval .= $this->_scripts->getDisplay();
-                $retval .= '<noscript>';
-                $retval .= '<style>html{display:block}</style>';
-                $retval .= '</noscript>';
-                $retval .= $this->_getBodyStart();
-                if ($this->_menuEnabled && $GLOBALS['server'] > 0) {
-                    $nav = new Navigation();
-                    $retval .= $nav->getDisplay();
-                }
-                // Include possible custom headers
-                if (file_exists(CUSTOM_HEADER_FILE)) {
-                    $retval .= '<div id="pma_header">';
-                    ob_start();
-                    include CUSTOM_HEADER_FILE;
-                    $retval .= ob_get_contents();
-                    ob_end_clean();
-                    $retval .= '</div>';
-                }
-                // offer to load user preferences from localStorage
-                if ($this->_userprefsOfferImport) {
-                    include_once './libraries/user_preferences.lib.php';
-                    $retval .= PMA_userprefsAutoloadGetHeader();
-                }
-                // pass configuration for hint tooltip display
-                // (to be used by PMA_tooltip() in js/functions.js)
-                if (! $GLOBALS['cfg']['ShowHint']) {
-                    $retval .= '<span id="no_hint" class="hide"></span>';
-                }
-                $retval .= $this->_getWarnings();
-                if ($this->_menuEnabled && $GLOBALS['server'] > 0) {
-                    $retval .= $this->_menu->getDisplay();
-                    $retval .= '<span id="page_nav_icons">';
-                    $retval .= '<span id="lock_page_icon"></span>';
-                    $retval .= '<span id="page_settings_icon">'
-                        . Util::getImage(
-                            's_cog.png',
-                            __('Page-related settings')
-                        )
-                        . '</span>';
-                    $retval .= sprintf(
-                        '<a id="goto_pagetop" href="#">%s</a>',
-                        Util::getImage(
-                            's_top.png',
-                            __('Click on the bar to scroll to top of page')
-                        )
-                    );
-                    $retval .= '</span>';
-                }
-                $retval .= $this->_console->getDisplay();
-                $retval .= '<div id="page_content">';
-                $retval .= $this->getMessage();
-            }
-            if ($this->_isEnabled && empty($_REQUEST['recent_table'])) {
-                $retval .= $this->_addRecentTable(
-                    $GLOBALS['db'],
-                    $GLOBALS['table']
-                );
-            }
-        }
-        return $retval;
-    }
-
-    /**
-     * Returns the message to be displayed at the top of
-     * the page, including the executed SQL query, if any.
-     *
-     * @return string
-     */
-    public function getMessage()
-    {
-        $retval = '';
-        $message = '';
-        if (! empty($GLOBALS['message'])) {
-            $message = $GLOBALS['message'];
-            unset($GLOBALS['message']);
-        } else if (! empty($_REQUEST['message'])) {
-            $message = $_REQUEST['message'];
-        }
-        if (! empty($message)) {
-            if (isset($GLOBALS['buffer_message'])) {
-                $buffer_message = $GLOBALS['buffer_message'];
-            }
-            $retval .= Util::getMessage($message);
-            if (isset($buffer_message)) {
-                $GLOBALS['buffer_message'] = $buffer_message;
-            }
-        }
-        return $retval;
-    }
-
-    /**
-     * Sends out the HTTP headers
-     *
-     * @return void
-     */
-    public function sendHttpHeaders()
-    {
-        if (defined('TESTSUITE') && ! defined('PMA_TEST_HEADERS')) {
-            return;
-        }
-        $map_tile_urls = ' *.tile.openstreetmap.org';
-
-        /**
-         * Sends http headers
-         */
-        $GLOBALS['now'] = gmdate('D, d M Y H:i:s') . ' GMT';
-        if (!empty($GLOBALS['cfg']['CaptchaLoginPrivateKey'])
-            && !empty($GLOBALS['cfg']['CaptchaLoginPublicKey'])
-        ) {
-            $captcha_url
-                = ' https://apis.google.com https://www.google.com/recaptcha/'
-                . ' https://www.gstatic.com/recaptcha/ https://ssl.gstatic.com/ ';
-        } else {
-            $captcha_url = '';
-        }
-        /* Prevent against ClickJacking by disabling framing */
-        if (! $GLOBALS['cfg']['AllowThirdPartyFraming']) {
-            header(
-                'X-Frame-Options: DENY'
-            );
-        }
-        header(
-            "Content-Security-Policy: default-src 'self' "
-            . $captcha_url
-            . $GLOBALS['cfg']['CSPAllow'] . ';'
-            . "script-src 'self' 'unsafe-inline' 'unsafe-eval' "
-            . $captcha_url
-            . $GLOBALS['cfg']['CSPAllow'] . ';'
-            . ";"
-            . "style-src 'self' 'unsafe-inline' "
-            . $captcha_url
-            . $GLOBALS['cfg']['CSPAllow']
-            . ";"
-            . "referrer no-referrer;"
-            . "img-src 'self' data: "
-            . $GLOBALS['cfg']['CSPAllow']
-            . $map_tile_urls
-            . $captcha_url
-            . ";"
-        );
-        header(
-            "X-Content-Security-Policy: default-src 'self' "
-            . $captcha_url
-            . $GLOBALS['cfg']['CSPAllow'] . ';'
-            . "options inline-script eval-script;"
-            . "referrer no-referrer;"
-            . "img-src 'self' data: "
-            . $GLOBALS['cfg']['CSPAllow']
-            . $map_tile_urls
-            . $captcha_url
-            . ";"
-        );
-        header(
-            "X-WebKit-CSP: default-src 'self' "
-            . $captcha_url
-            . $GLOBALS['cfg']['CSPAllow'] . ';'
-            . "script-src 'self' "
-            . $captcha_url
-            . $GLOBALS['cfg']['CSPAllow']
-            . " 'unsafe-inline' 'unsafe-eval';"
-            . "referrer no-referrer;"
-            . "style-src 'self' 'unsafe-inline' "
-            . $captcha_url
-            . ';'
-            . "img-src 'self' data: "
-            . $GLOBALS['cfg']['CSPAllow']
-            . $map_tile_urls
-            . $captcha_url
-            . ";"
-        );
-        // Re-enable possible disabled XSS filters
-        // see https://www.owasp.org/index.php/List_of_useful_HTTP_headers
-        header(
-            'X-XSS-Protection: 1; mode=block'
-        );
-        // "nosniff", prevents Internet Explorer and Google Chrome from MIME-sniffing
-        // a response away from the declared content-type
-        // see https://www.owasp.org/index.php/List_of_useful_HTTP_headers
-        header(
-            'X-Content-Type-Options: nosniff'
-        );
-        // Adobe cross-domain-policies
-        // see http://www.adobe.com/devnet/articles/crossdomain_policy_file_spec.html
-        header(
-            'X-Permitted-Cross-Domain-Policies: none'
-        );
-        // Robots meta tag
-        // see https://developers.google.com/webmasters/control-crawl-index/docs/robots_meta_tag
-        header(
-            'X-Robots-Tag: noindex, nofollow'
-        );
-        PMA_noCacheHeader();
-        if (! defined('IS_TRANSFORMATION_WRAPPER')) {
-            // Define the charset to be used
-            header('Content-Type: text/html; charset=utf-8');
-        }
-        $this->_headerIsSent = true;
-    }
-
-    /**
-     * Returns the DOCTYPE and the start HTML tag
-     *
-     * @return string DOCTYPE and HTML tags
-     */
-    private function _getHtmlStart()
-    {
-        $lang = $GLOBALS['lang'];
-        $dir  = $GLOBALS['text_dir'];
-
-        $retval  = "<!DOCTYPE HTML>";
-        $retval .= "<html lang='$lang' dir='$dir' class='";
-        $retval .= mb_strtolower(PMA_USR_BROWSER_AGENT) . " ";
-        $retval .= mb_strtolower(PMA_USR_BROWSER_AGENT)
-            . intval(PMA_USR_BROWSER_VER) . "'>";
-        $retval .= '<head>';
-
-        return $retval;
-    }
-
-    /**
-     * Returns the META tags
-     *
-     * @return string the META tags
-     */
-    private function _getMetaTags()
-    {
-        $retval  = '<meta charset="utf-8" />';
-        $retval .= '<meta name="referrer" content="no-referrer" />';
-        $retval .= '<meta name="robots" content="noindex,nofollow" />';
-        $retval .= '<meta http-equiv="X-UA-Compatible" content="IE=Edge">';
-        if (! $GLOBALS['cfg']['AllowThirdPartyFraming']) {
-            $retval .= '<style id="cfs-style">html{display: none;}</style>';
-        }
-        return $retval;
-    }
-
-    /**
-     * Returns the LINK tags for the favicon and the stylesheets
-     *
-     * @return string the LINK tags
-     */
-    private function _getLinkTags()
-    {
-        $retval = '<link rel="icon" href="favicon.ico" '
-            . 'type="image/x-icon" />'
-            . '<link rel="shortcut icon" href="favicon.ico" '
-            . 'type="image/x-icon" />';
-        // stylesheets
-        $basedir    = defined('PMA_PATH_TO_BASEDIR') ? PMA_PATH_TO_BASEDIR : '';
-        $theme_id   = $GLOBALS['PMA_Config']->getThemeUniqueValue();
-        $theme_path = $GLOBALS['pmaThemePath'];
-        $v          = self::getVersionParameter();
-
-        if ($this->_isPrintView) {
-            $retval .= '<link rel="stylesheet" type="text/css" href="'
-                . $basedir . 'print.css?' . $v . '" />';
-        } else {
-            // load jQuery's CSS prior to our theme's CSS, to let the theme
-            // override jQuery's CSS
-            $retval .= '<link rel="stylesheet" type="text/css" href="'
-                . $theme_path . '/jquery/jquery-ui-1.11.4.css" />';
-            $retval .= '<link rel="stylesheet" type="text/css" href="'
-                . $basedir . 'js/codemirror/lib/codemirror.css?' . $v . '" />';
-            $retval .= '<link rel="stylesheet" type="text/css" href="'
-                . $basedir . 'js/codemirror/addon/hint/show-hint.css?' . $v . '" />';
-            $retval .= '<link rel="stylesheet" type="text/css" href="'
-                . $basedir . 'js/codemirror/addon/lint/lint.css?' . $v . '" />';
-            $retval .= '<link rel="stylesheet" type="text/css" href="'
-                . $basedir . 'phpmyadmin.css.php?'
-                . 'nocache=' . $theme_id . $GLOBALS['text_dir'] . '" />';
-            // load Print view's CSS last, so that it overrides all other CSS while
-            // 'printing'
-            $retval .= '<link rel="stylesheet" type="text/css" href="'
-                . $theme_path . '/css/printview.css?' . $v . '" media="print" id="printcss"/>';
-        }
-
-        return $retval;
-    }
-
-    /**
-     * Returns the TITLE tag
-     *
-     * @return string the TITLE tag
-     */
-    public function getTitleTag()
-    {
-        $retval  = "<title>";
-        $retval .= $this->_getPageTitle();
-        $retval .= "</title>";
-        return $retval;
-    }
-
-    /**
-     * If the page is missing the title, this function
-     * will set it to something reasonable
-     *
-     * @return string
-     */
-    private function _getPageTitle()
-    {
-        if (empty($this->_title)) {
-            if ($GLOBALS['server'] > 0) {
-                if (! empty($GLOBALS['table'])) {
-                    $temp_title = $GLOBALS['cfg']['TitleTable'];
-                } else if (! empty($GLOBALS['db'])) {
-                    $temp_title = $GLOBALS['cfg']['TitleDatabase'];
-                } elseif (! empty($GLOBALS['cfg']['Server']['host'])) {
-                    $temp_title = $GLOBALS['cfg']['TitleServer'];
-                } else {
-                    $temp_title = $GLOBALS['cfg']['TitleDefault'];
-                }
-                $this->_title = htmlspecialchars(
-                    Util::expandUserString($temp_title)
-                );
-            } else {
-                $this->_title = 'phpMyAdmin';
-            }
-        }
-        return $this->_title;
-    }
-
-    /**
-     * Returns the close tag to the HEAD
-     * and the start tag for the BODY
-     *
-     * @return string HEAD and BODY tags
-     */
-    private function _getBodyStart()
-    {
-        $retval = "</head><body";
-        if (! empty($this->_bodyId)) {
-            $retval .= " id='" . $this->_bodyId . "'";
-        }
-        $retval .= ">";
-        return $retval;
-    }
-
-    /**
-     * Returns some warnings to be displayed at the top of the page
-     *
-     * @return string The warnings
-     */
-    private function _getWarnings()
-    {
-        $retval = '';
-        if ($this->_warningsEnabled) {
-            $retval .= "<noscript>";
-            $retval .= Message::error(
-                __("Javascript must be enabled past this point!")
-            )->getDisplay();
-            $retval .= "</noscript>";
-        }
-        return $retval;
-    }
-
-    /**
-     * Add recently used table and reload the navigation.
-     *
-     * @param string $db    Database name where the table is located.
-     * @param string $table The table name
-     *
-     * @return string
-     */
-    private function _addRecentTable($db, $table)
-    {
-        $retval = '';
-        if ($this->_menuEnabled
-            && mb_strlen($table)
-            && $GLOBALS['cfg']['NumRecentTables'] > 0
-        ) {
-            $tmp_result = RecentFavoriteTable::getInstance('recent')
-                              ->add($db, $table);
-            if ($tmp_result === true) {
-                $retval = RecentFavoriteTable::getHtmlUpdateRecentTables();
-            } else {
-                $error  = $tmp_result;
-                $retval = $error->getDisplay();
-            }
-        }
-        return $retval;
-    }
-
-    /**
-     * Returns the phpMyAdmin version to be appended to the url to avoid caching
-     * between versions
-     *
-     * @return string urlenocded pma version as a parameter
-     */
-    public static function getVersionParameter()
-    {
-        return "v=" . urlencode(PMA_VERSION);
-    }
-}
-
diff --git a/#pma/libraries/Index.php b/#pma/libraries/Index.php
deleted file mode 100644
index 2f3987b7..00000000
--- a/#pma/libraries/Index.php
+++ /dev/null
@@ -1,887 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * holds the database index class
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries;
-
-/**
- * Index manipulation class
- *
- * @package PhpMyAdmin
- * @since   phpMyAdmin 3.0.0
- */
-class Index
-{
-    const PRIMARY  = 1;
-    const UNIQUE   = 2;
-    const INDEX    = 4;
-    const SPATIAL  = 8;
-    const FULLTEXT = 16;
-
-    /**
-     * Class-wide storage container for indexes (caching, singleton)
-     *
-     * @var array
-     */
-    private static $_registry = array();
-
-    /**
-     * @var string The name of the schema
-     */
-    private $_schema = '';
-
-    /**
-     * @var string The name of the table
-     */
-    private $_table = '';
-
-    /**
-     * @var string The name of the index
-     */
-    private $_name = '';
-
-    /**
-     * Columns in index
-     *
-     * @var array
-     */
-    private $_columns = array();
-
-    /**
-     * The index method used (BTREE, HASH, RTREE).
-     *
-     * @var string
-     */
-    private $_type = '';
-
-    /**
-     * The index choice (PRIMARY, UNIQUE, INDEX, SPATIAL, FULLTEXT)
-     *
-     * @var string
-     */
-    private $_choice = '';
-
-    /**
-     * Various remarks.
-     *
-     * @var string
-     */
-    private $_remarks = '';
-
-    /**
-     * Any comment provided for the index with a COMMENT attribute when the
-     * index was created.
-     *
-     * @var string
-     */
-    private $_comment = '';
-
-    /**
-     * @var integer 0 if the index cannot contain duplicates, 1 if it can.
-     */
-    private $_non_unique = 0;
-
-    /**
-     * Indicates how the key is packed. NULL if it is not.
-     *
-     * @var string
-     */
-    private $_packed = null;
-
-    /**
-     * Block size for the index
-     *
-     * @var int
-     */
-    private $_key_block_size = null;
-
-    /**
-     * Parser option for the index
-     *
-     * @var string
-     */
-    private $_parser = null;
-
-    /**
-     * Constructor
-     *
-     * @param array $params parameters
-     */
-    public function __construct($params = array())
-    {
-        $this->set($params);
-    }
-
-    /**
-     * Creates(if not already created) and returns the corresponding Index object
-     *
-     * @param string $schema     database name
-     * @param string $table      table name
-     * @param string $index_name index name
-     *
-     * @return Index corresponding Index object
-     */
-    static public function singleton($schema, $table, $index_name = '')
-    {
-        Index::_loadIndexes($table, $schema);
-        if (! isset(Index::$_registry[$schema][$table][$index_name])) {
-            $index = new Index;
-            if (mb_strlen($index_name)) {
-                $index->setName($index_name);
-                Index::$_registry[$schema][$table][$index->getName()] = $index;
-            }
-            return $index;
-        } else {
-            return Index::$_registry[$schema][$table][$index_name];
-        }
-    }
-
-    /**
-     * returns an array with all indexes from the given table
-     *
-     * @param string $table  table
-     * @param string $schema schema
-     *
-     * @return Index[]  array of indexes
-     */
-    static public function getFromTable($table, $schema)
-    {
-        Index::_loadIndexes($table, $schema);
-
-        if (isset(Index::$_registry[$schema][$table])) {
-            return Index::$_registry[$schema][$table];
-        } else {
-            return array();
-        }
-    }
-
-    /**
-     * Returns an array with all indexes from the given table of the requested types
-     *
-     * @param string $table   table
-     * @param string $schema  schema
-     * @param int    $choices choices
-     *
-     * @return Index[] array of indexes
-     */
-    static public function getFromTableByChoice($table, $schema, $choices = 31)
-    {
-        $indexes = array();
-        foreach (self::getFromTable($table, $schema) as $index) {
-            if (($choices & Index::PRIMARY)
-                && $index->getChoice() == 'PRIMARY'
-            ) {
-                $indexes[] = $index;
-            }
-            if (($choices & Index::UNIQUE)
-                && $index->getChoice() == 'UNIQUE'
-            ) {
-                $indexes[] = $index;
-            }
-            if (($choices & Index::INDEX)
-                && $index->getChoice() == 'INDEX'
-            ) {
-                $indexes[] = $index;
-            }
-            if (($choices & Index::SPATIAL)
-                && $index->getChoice() == 'SPATIAL'
-            ) {
-                $indexes[] = $index;
-            }
-            if (($choices & Index::FULLTEXT)
-                && $index->getChoice() == 'FULLTEXT'
-            ) {
-                $indexes[] = $index;
-            }
-        }
-        return $indexes;
-    }
-
-    /**
-     * return primary if set, false otherwise
-     *
-     * @param string $table  table
-     * @param string $schema schema
-     *
-     * @return mixed primary index or false if no one exists
-     */
-    static public function getPrimary($table, $schema)
-    {
-        Index::_loadIndexes($table, $schema);
-
-        if (isset(Index::$_registry[$schema][$table]['PRIMARY'])) {
-            return Index::$_registry[$schema][$table]['PRIMARY'];
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Load index data for table
-     *
-     * @param string $table  table
-     * @param string $schema schema
-     *
-     * @return boolean whether loading was successful
-     */
-    static private function _loadIndexes($table, $schema)
-    {
-        if (isset(Index::$_registry[$schema][$table])) {
-            return true;
-        }
-
-        $_raw_indexes = $GLOBALS['dbi']->getTableIndexes($schema, $table);
-        foreach ($_raw_indexes as $_each_index) {
-            $_each_index['Schema'] = $schema;
-            $keyName = $_each_index['Key_name'];
-            if (! isset(Index::$_registry[$schema][$table][$keyName])) {
-                $key = new Index($_each_index);
-                Index::$_registry[$schema][$table][$keyName] = $key;
-            } else {
-                $key = Index::$_registry[$schema][$table][$keyName];
-            }
-
-            $key->addColumn($_each_index);
-        }
-
-        return true;
-    }
-
-    /**
-     * Add column to index
-     *
-     * @param array $params column params
-     *
-     * @return void
-     */
-    public function addColumn($params)
-    {
-        if (isset($params['Column_name'])
-            && mb_strlen($params['Column_name'])
-        ) {
-            $this->_columns[$params['Column_name']] = new IndexColumn($params);
-        }
-    }
-
-    /**
-     * Adds a list of columns to the index
-     *
-     * @param array $columns array containing details about the columns
-     *
-     * @return void
-     */
-    public function addColumns($columns)
-    {
-        $_columns = array();
-
-        if (isset($columns['names'])) {
-            // coming from form
-            // $columns[names][]
-            // $columns[sub_parts][]
-            foreach ($columns['names'] as $key => $name) {
-                $sub_part = isset($columns['sub_parts'][$key])
-                    ? $columns['sub_parts'][$key] : '';
-                $_columns[] = array(
-                    'Column_name'   => $name,
-                    'Sub_part'      => $sub_part,
-                );
-            }
-        } else {
-            // coming from SHOW INDEXES
-            // $columns[][name]
-            // $columns[][sub_part]
-            // ...
-            $_columns = $columns;
-        }
-
-        foreach ($_columns as $column) {
-            $this->addColumn($column);
-        }
-    }
-
-    /**
-     * Returns true if $column indexed in this index
-     *
-     * @param string $column the column
-     *
-     * @return boolean  true if $column indexed in this index
-     */
-    public function hasColumn($column)
-    {
-        return isset($this->_columns[$column]);
-    }
-
-    /**
-     * Sets index details
-     *
-     * @param array $params index details
-     *
-     * @return void
-     */
-    public function set($params)
-    {
-        if (isset($params['columns'])) {
-            $this->addColumns($params['columns']);
-        }
-        if (isset($params['Schema'])) {
-            $this->_schema = $params['Schema'];
-        }
-        if (isset($params['Table'])) {
-            $this->_table = $params['Table'];
-        }
-        if (isset($params['Key_name'])) {
-            $this->_name = $params['Key_name'];
-        }
-        if (isset($params['Index_type'])) {
-            $this->_type = $params['Index_type'];
-        }
-        if (isset($params['Comment'])) {
-            $this->_remarks = $params['Comment'];
-        }
-        if (isset($params['Index_comment'])) {
-            $this->_comment = $params['Index_comment'];
-        }
-        if (isset($params['Non_unique'])) {
-            $this->_non_unique = $params['Non_unique'];
-        }
-        if (isset($params['Packed'])) {
-            $this->_packed = $params['Packed'];
-        }
-        if (isset($params['Index_choice'])) {
-            $this->_choice = $params['Index_choice'];
-        } else {
-            if ('PRIMARY' == $this->_name) {
-                $this->_choice = 'PRIMARY';
-            } elseif ('FULLTEXT' == $this->_type) {
-                $this->_choice = 'FULLTEXT';
-                $this->_type = '';
-            } elseif ('SPATIAL' == $this->_type) {
-                $this->_choice = 'SPATIAL';
-                $this->_type = '';
-            } elseif ('0' == $this->_non_unique) {
-                $this->_choice = 'UNIQUE';
-            } else {
-                $this->_choice = 'INDEX';
-            }
-        }
-        if (isset($params['Key_block_size'])) {
-            $this->_key_block_size = $params['Key_block_size'];
-        }
-        if (isset($params['Parser'])) {
-            $this->_parser = $params['Parser'];
-        }
-    }
-
-    /**
-     * Returns the number of columns of the index
-     *
-     * @return integer the number of the columns
-     */
-    public function getColumnCount()
-    {
-        return count($this->_columns);
-    }
-
-    /**
-     * Returns the index comment
-     *
-     * @return string index comment
-     */
-    public function getComment()
-    {
-        return $this->_comment;
-    }
-
-    /**
-     * Returns index remarks
-     *
-     * @return string index remarks
-     */
-    public function getRemarks()
-    {
-        return $this->_remarks;
-    }
-
-    /**
-     * Return the key block size
-     *
-     * @return number
-     */
-    public function getKeyBlockSize()
-    {
-        return $this->_key_block_size;
-    }
-
-    /**
-     * Return the parser
-     *
-     * @return string
-     */
-    public function getParser()
-    {
-        return $this->_parser;
-    }
-
-    /**
-     * Returns concatenated remarks and comment
-     *
-     * @return string concatenated remarks and comment
-     */
-    public function getComments()
-    {
-        $comments = $this->getRemarks();
-        if (mb_strlen($comments)) {
-            $comments .= "\n";
-        }
-        $comments .= $this->getComment();
-
-        return $comments;
-    }
-
-    /**
-     * Returns index type (BTREE, HASH, RTREE)
-     *
-     * @return string index type
-     */
-    public function getType()
-    {
-        return $this->_type;
-    }
-
-    /**
-     * Returns index choice (PRIMARY, UNIQUE, INDEX, SPATIAL, FULLTEXT)
-     *
-     * @return string index choice
-     */
-    public function getChoice()
-    {
-        return $this->_choice;
-    }
-
-    /**
-     * Return a list of all index choices
-     *
-     * @return string[] index choices
-     */
-    static public function getIndexChoices()
-    {
-        return array(
-            'PRIMARY',
-            'INDEX',
-            'UNIQUE',
-            'SPATIAL',
-            'FULLTEXT',
-        );
-    }
-
-    /**
-     * Returns a lit of all index types
-     *
-     * @return string[] index types
-     */
-    static public function getIndexTypes()
-    {
-        return array(
-            'BTREE',
-            'HASH'
-        );
-    }
-
-    /**
-     * Returns HTML for the index choice selector
-     *
-     * @param boolean $edit_table whether this is table editing
-     *
-     * @return string HTML for the index choice selector
-     */
-    public function generateIndexChoiceSelector($edit_table)
-    {
-        $html_options = '<select name="index[Index_choice]"'
-            . ' id="select_index_choice" '
-            . ($edit_table ? 'disabled="disabled"' : '') . '>';
-
-        foreach (Index::getIndexChoices() as $each_index_choice) {
-            if ($each_index_choice === 'PRIMARY'
-                && $this->_choice !== 'PRIMARY'
-                && Index::getPrimary($this->_table, $this->_schema)
-            ) {
-                // skip PRIMARY if there is already one in the table
-                continue;
-            }
-            $html_options .= '<option value="' . $each_index_choice . '"'
-                 . (($this->_choice == $each_index_choice)
-                 ? ' selected="selected"'
-                 : '')
-                 . '>' . $each_index_choice . '</option>' . "\n";
-        }
-        $html_options .= '</select>';
-
-        return $html_options;
-    }
-
-    /**
-     * Returns HTML for the index type selector
-     *
-     * @return string HTML for the index type selector
-     */
-    public function generateIndexTypeSelector()
-    {
-        $types = array("" => "--");
-        foreach (Index::getIndexTypes() as $type) {
-            $types[$type] = $type;
-        }
-
-        return Util::getDropdown(
-            "index[Index_type]", $types,
-            $this->_type, "select_index_type"
-        );
-    }
-
-    /**
-     * Returns how the index is packed
-     *
-     * @return string how the index is packed
-     */
-    public function getPacked()
-    {
-        return $this->_packed;
-    }
-
-    /**
-     * Returns 'No'/false if the index is not packed,
-     * how the index is packed if packed
-     *
-     * @param boolean $as_text whether to output should be in text
-     *
-     * @return mixed how index is packed
-     */
-    public function isPacked($as_text = false)
-    {
-        if ($as_text) {
-            $r = array(
-                '0' => __('No'),
-                '1' => __('Yes'),
-            );
-        } else {
-            $r = array(
-                '0' => false,
-                '1' => true,
-            );
-        }
-
-        if (null === $this->_packed) {
-            return $r[0];
-        }
-
-        return $this->_packed;
-    }
-
-    /**
-     * Returns integer 0 if the index cannot contain duplicates, 1 if it can
-     *
-     * @return integer 0 if the index cannot contain duplicates, 1 if it can
-     */
-    public function getNonUnique()
-    {
-        return $this->_non_unique;
-    }
-
-    /**
-     * Returns whether the index is a 'Unique' index
-     *
-     * @param boolean $as_text whether to output should be in text
-     *
-     * @return mixed whether the index is a 'Unique' index
-     */
-    public function isUnique($as_text = false)
-    {
-        if ($as_text) {
-            $r = array(
-                '0' => __('Yes'),
-                '1' => __('No'),
-            );
-        } else {
-            $r = array(
-                '0' => true,
-                '1' => false,
-            );
-        }
-
-        return $r[$this->_non_unique];
-    }
-
-    /**
-     * Returns the name of the index
-     *
-     * @return string the name of the index
-     */
-    public function getName()
-    {
-        return $this->_name;
-    }
-
-    /**
-     * Sets the name of the index
-     *
-     * @param string $name index name
-     *
-     * @return void
-     */
-    public function setName($name)
-    {
-        $this->_name = (string) $name;
-    }
-
-    /**
-     * Returns the columns of the index
-     *
-     * @return IndexColumn[] the columns of the index
-     */
-    public function getColumns()
-    {
-        return $this->_columns;
-    }
-
-    /**
-     * Show index data
-     *
-     * @param string  $table      The table name
-     * @param string  $schema     The schema name
-     * @param boolean $print_mode Whether the output is for the print mode
-     *
-     * @return string HTML for showing index
-     *
-     * @access  public
-     */
-    static public function getHtmlForIndexes($table, $schema, $print_mode = false)
-    {
-        $indexes = Index::getFromTable($table, $schema);
-
-        $no_indexes_class = count($indexes) > 0 ? ' hide' : '';
-        $no_indexes  = "<div class='no_indexes_defined$no_indexes_class'>";
-        $no_indexes .= Message::notice(__('No index defined!'))->getDisplay();
-        $no_indexes .= '</div>';
-
-        if (! $print_mode) {
-            $r  = '<fieldset class="index_info">';
-            $r .= '<legend id="index_header">' . __('Indexes');
-            $r .= Util::showMySQLDocu('optimizing-database-structure');
-
-            $r .= '</legend>';
-            $r .= $no_indexes;
-            if (count($indexes) < 1) {
-                $r .= '</fieldset>';
-                return $r;
-            }
-            $r .= Index::findDuplicates($table, $schema);
-        } else {
-            $r  = '<h3>' . __('Indexes') . '</h3>';
-            $r .= $no_indexes;
-            if (count($indexes) < 1) {
-                return $r;
-            }
-        }
-        $r .= '<table id="table_index">';
-        $r .= '<thead>';
-        $r .= '<tr>';
-        if (! $print_mode) {
-            $r .= '<th colspan="2" class="print_ignore">' . __('Action') . '</th>';
-        }
-        $r .= '<th>' . __('Keyname') . '</th>';
-        $r .= '<th>' . __('Type') . '</th>';
-        $r .= '<th>' . __('Unique') . '</th>';
-        $r .= '<th>' . __('Packed') . '</th>';
-        $r .= '<th>' . __('Column') . '</th>';
-        $r .= '<th>' . __('Cardinality') . '</th>';
-        $r .= '<th>' . __('Collation') . '</th>';
-        $r .= '<th>' . __('Null') . '</th>';
-        $r .= '<th>' . __('Comment') . '</th>';
-        $r .= '</tr>';
-        $r .= '</thead>';
-        $r .= '<tbody>';
-
-        $odd_row = true;
-        foreach ($indexes as $index) {
-            $row_span = ' rowspan="' . $index->getColumnCount() . '" ';
-
-            $r .= '<tr class="noclick ' . ($odd_row ? 'odd' : 'even') . '">';
-
-            if (! $print_mode) {
-                $this_params = $GLOBALS['url_params'];
-                $this_params['index'] = $index->getName();
-                $r .= '<td class="edit_index print_ignore';
-                $r .= ' ajax';
-                $r .= '" ' . $row_span . '>'
-                   . '    <a class="';
-                $r .= 'ajax';
-                $r .= '" href="tbl_indexes.php' . PMA_URL_getCommon($this_params)
-                   . '">' . Util::getIcon('b_edit.png', __('Edit')) . '</a>'
-                   . '</td>' . "\n";
-                $this_params = $GLOBALS['url_params'];
-                if ($index->getName() == 'PRIMARY') {
-                    $this_params['sql_query'] = 'ALTER TABLE '
-                        . Util::backquote($table)
-                        . ' DROP PRIMARY KEY;';
-                    $this_params['message_to_show']
-                        = __('The primary key has been dropped.');
-                    $js_msg = PMA_jsFormat(
-                        'ALTER TABLE ' . $table . ' DROP PRIMARY KEY'
-                    );
-                } else {
-                    $this_params['sql_query'] = 'ALTER TABLE '
-                        . Util::backquote($table) . ' DROP INDEX '
-                        . Util::backquote($index->getName()) . ';';
-                    $this_params['message_to_show'] = sprintf(
-                        __('Index %s has been dropped.'), htmlspecialchars($index->getName())
-                    );
-
-                    $js_msg = PMA_jsFormat(
-                        'ALTER TABLE ' . $table . ' DROP INDEX '
-                        . $index->getName() . ';'
-                    );
-
-                }
-
-                $r .= '<td ' . $row_span . ' class="print_ignore">';
-                $r .= '<input type="hidden" class="drop_primary_key_index_msg"'
-                    . ' value="' . $js_msg . '" />';
-                $r .= '    <a class="drop_primary_key_index_anchor';
-                $r .= ' ajax';
-                $r .= '" href="sql.php' . PMA_URL_getCommon($this_params)
-                   . '" >'
-                   . Util::getIcon('b_drop.png', __('Drop'))  . '</a>'
-                   . '</td>' . "\n";
-            }
-
-            if (! $print_mode) {
-                $r .= '<th ' . $row_span . '>'
-                    . htmlspecialchars($index->getName())
-                    . '</th>';
-            } else {
-                $r .= '<td ' . $row_span . '>'
-                    . htmlspecialchars($index->getName())
-                    . '</td>';
-            }
-            $r .= '<td ' . $row_span . '>';
-            $type = $index->getType();
-            if (! empty($type)) {
-                $r .= htmlspecialchars($type);
-            } else {
-                $r .= htmlspecialchars($index->getChoice());
-            }
-            $r .= '</td>';
-            $r .= '<td ' . $row_span . '>' . $index->isUnique(true) . '</td>';
-            $r .= '<td ' . $row_span . '>' . $index->isPacked(true) . '</td>';
-
-            foreach ($index->getColumns() as $column) {
-                if ($column->getSeqInIndex() > 1) {
-                    $r .= '<tr class="noclick ' . ($odd_row ? 'odd' : 'even') . '">';
-                }
-                $r .= '<td>' . htmlspecialchars($column->getName());
-                if ($column->getSubPart()) {
-                    $r .= ' (' . htmlspecialchars($column->getSubPart()) . ')';
-                }
-                $r .= '</td>';
-                $r .= '<td>'
-                    . htmlspecialchars($column->getCardinality())
-                    . '</td>';
-                $r .= '<td>'
-                    . htmlspecialchars($column->getCollation())
-                    . '</td>';
-                $r .= '<td>'
-                    . htmlspecialchars($column->getNull(true))
-                    . '</td>';
-
-                if ($column->getSeqInIndex() == 1
-                ) {
-                    $r .= '<td ' . $row_span . '>'
-                        . htmlspecialchars($index->getComments()) . '</td>';
-                }
-                $r .= '</tr>';
-            } // end foreach $index['Sequences']
-
-            $odd_row = ! $odd_row;
-        } // end while
-        $r .= '</tbody>';
-        $r .= '</table>';
-        if (! $print_mode) {
-            $r .= '</fieldset>';
-        }
-
-        return $r;
-    }
-
-    /**
-     * Gets the properties in an array for comparison purposes
-     *
-     * @return array an array containing the properties of the index
-     */
-    public function getCompareData()
-    {
-        $data = array(
-            // 'Non_unique'    => $this->_non_unique,
-            'Packed'        => $this->_packed,
-            'Index_choice'    => $this->_choice,
-        );
-
-        foreach ($this->_columns as $column) {
-            $data['columns'][] = $column->getCompareData();
-        }
-
-        return $data;
-    }
-
-    /**
-     * Function to check over array of indexes and look for common problems
-     *
-     * @param string $table  table name
-     * @param string $schema schema name
-     *
-     * @return string  Output HTML
-     * @access  public
-     */
-    static public function findDuplicates($table, $schema)
-    {
-        $indexes = Index::getFromTable($table, $schema);
-
-        $output  = '';
-
-        // count($indexes) < 2:
-        //   there is no need to check if there less than two indexes
-        if (count($indexes) < 2) {
-            return $output;
-        }
-
-        // remove last index from stack and ...
-        while ($while_index = array_pop($indexes)) {
-            // ... compare with every remaining index in stack
-            foreach ($indexes as $each_index) {
-                if ($each_index->getCompareData() !== $while_index->getCompareData()
-                ) {
-                    continue;
-                }
-
-                // did not find any difference
-                // so it makes no sense to have this two equal indexes
-
-                $message = Message::notice(
-                    __(
-                        'The indexes %1$s and %2$s seem to be equal and one of them '
-                        . 'could possibly be removed.'
-                    )
-                );
-                $message->addParam($each_index->getName());
-                $message->addParam($while_index->getName());
-                $output .= $message->getDisplay();
-
-                // there is no need to check any further indexes if we have already
-                // found that this one has a duplicate
-                continue 2;
-            }
-        }
-        return $output;
-    }
-}
diff --git a/#pma/libraries/IndexColumn.php b/#pma/libraries/IndexColumn.php
deleted file mode 100644
index 2ca024b9..00000000
--- a/#pma/libraries/IndexColumn.php
+++ /dev/null
@@ -1,186 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * holds the database index columns class
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries;
-
-/**
- * Index column wrapper
- *
- * @package PhpMyAdmin
- */
-class IndexColumn
-{
-    /**
-     * @var string The column name
-     */
-    private $_name = '';
-
-    /**
-     * @var integer The column sequence number in the index, starting with 1.
-     */
-    private $_seq_in_index = 1;
-
-    /**
-     * @var string How the column is sorted in the index. “A” (Ascending) or
-     * NULL (Not sorted)
-     */
-    private $_collation = null;
-
-    /**
-     * The number of indexed characters if the column is only partly indexed,
-     * NULL if the entire column is indexed.
-     *
-     * @var integer
-     */
-    private $_sub_part = null;
-
-    /**
-     * Contains YES if the column may contain NULL.
-     * If not, the column contains NO.
-     *
-     * @var string
-     */
-    private $_null = '';
-
-    /**
-     * An estimate of the number of unique values in the index. This is updated
-     * by running ANALYZE TABLE or myisamchk -a. Cardinality is counted based on
-     * statistics stored as integers, so the value is not necessarily exact even
-     * for small tables. The higher the cardinality, the greater the chance that
-     * MySQL uses the index when doing joins.
-     *
-     * @var integer
-     */
-    private $_cardinality = null;
-
-    /**
-     * Constructor
-     *
-     * @param array $params an array containing the parameters of the index column
-     */
-    public function __construct($params = array())
-    {
-        $this->set($params);
-    }
-
-    /**
-     * Sets parameters of the index column
-     *
-     * @param array $params an array containing the parameters of the index column
-     *
-     * @return void
-     */
-    public function set($params)
-    {
-        if (isset($params['Column_name'])) {
-            $this->_name = $params['Column_name'];
-        }
-        if (isset($params['Seq_in_index'])) {
-            $this->_seq_in_index = $params['Seq_in_index'];
-        }
-        if (isset($params['Collation'])) {
-            $this->_collation = $params['Collation'];
-        }
-        if (isset($params['Cardinality'])) {
-            $this->_cardinality = $params['Cardinality'];
-        }
-        if (isset($params['Sub_part'])) {
-            $this->_sub_part = $params['Sub_part'];
-        }
-        if (isset($params['Null'])) {
-            $this->_null = $params['Null'];
-        }
-    }
-
-    /**
-     * Returns the column name
-     *
-     * @return string column name
-     */
-    public function getName()
-    {
-        return $this->_name;
-    }
-
-    /**
-     * Return the column collation
-     *
-     * @return string column collation
-     */
-    public function getCollation()
-    {
-        return $this->_collation;
-    }
-
-    /**
-     * Returns the cardinality of the column
-     *
-     * @return int cardinality of the column
-     */
-    public function getCardinality()
-    {
-        return $this->_cardinality;
-    }
-
-    /**
-     * Returns whether the column is nullable
-     *
-     * @param boolean $as_text whether to returned the string representation
-     *
-     * @return mixed nullability of the column. True/false or Yes/No depending
-     *               on the value of the $as_text parameter
-     */
-    public function getNull($as_text = false)
-    {
-        if ($as_text) {
-            if (!$this->_null || $this->_null == 'NO') {
-                return __('No');
-            } else {
-                return __('Yes');
-            }
-        } else {
-            return $this->_null;
-        }
-    }
-
-    /**
-     * Returns the sequence number of the column in the index
-     *
-     * @return int sequence number of the column in the index
-     */
-    public function getSeqInIndex()
-    {
-        return $this->_seq_in_index;
-    }
-
-    /**
-     * Returns the number of indexed characters if the column is only
-     * partly indexed
-     *
-     * @return int the number of indexed characters
-     */
-    public function getSubPart()
-    {
-        return $this->_sub_part;
-    }
-
-    /**
-     * Gets the properties in an array for comparison purposes
-     *
-     * @return array an array containing the properties of the index column
-     */
-    public function getCompareData()
-    {
-        return array(
-            'Column_name'   => $this->_name,
-            'Seq_in_index'  => $this->_seq_in_index,
-            'Collation'     => $this->_collation,
-            'Sub_part'      => $this->_sub_part,
-            'Null'          => $this->_null,
-        );
-    }
-}
diff --git a/#pma/libraries/Language.php b/#pma/libraries/Language.php
deleted file mode 100644
index 866c82b4..00000000
--- a/#pma/libraries/Language.php
+++ /dev/null
@@ -1,200 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Hold the PMA\libraries\LanguageManager class
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries;
-
-use PMA\libraries\LanguageManager;
-
-
-/**
- * Language object
- *
- * @package PhpMyAdmin
- */
-class Language
-{
-    protected $code;
-    protected $name;
-    protected $native;
-    protected $regex;
-    protected $mysql;
-
-    /**
-     * Constructs the Language object
-     *
-     * @param string $code   Language code
-     * @param string $name   English name
-     * @param string $native Native name
-     * @param string $regex  Match regullar expression
-     * @param string $mysql  MySQL locale code
-     *
-     */
-    public function __construct($code, $name, $native, $regex, $mysql)
-    {
-        $this->code = $code;
-        $this->name = $name;
-        $this->native = $native;
-        if (strpos($regex, '[-_]') === false) {
-            $regex = str_replace('|', '([-_][[:alpha:]]{2,3})?|', $regex);
-        }
-        $this->regex = $regex;
-        $this->mysql = $mysql;
-    }
-
-    /**
-     * Returns native name for language
-     *
-     * @return string
-     */
-    public function getNativeName()
-    {
-        return $this->native;
-    }
-
-    /**
-     * Returns English name for language
-     *
-     * @return string
-     */
-    public function getEnglishName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * Returns verbose name for language
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        if (! empty($this->native)) {
-            return $this->native . ' - ' . $this->name;
-        } else {
-            return $this->name;
-        }
-    }
-
-    /**
-     * Returns language code
-     *
-     * @return string
-     */
-    public function getCode()
-    {
-        return $this->code;
-    }
-
-    /**
-     * Returns MySQL locale code, can be empty
-     *
-     * @return string
-     */
-    public function getMySQLLocale()
-    {
-        return $this->mysql;
-    }
-
-    /**
-     * Compare function used for sorting
-     *
-     * @param Language $other Other object to compare
-     *
-     * @return int same as strcmp
-     */
-    public function cmp($other)
-    {
-        return strcmp($this->name, $other->name);
-    }
-
-    /**
-     * Checks whether language is currently active.
-     *
-     * @return bool
-     */
-    public function isActive()
-    {
-        return $GLOBALS['lang'] == $this->code;
-    }
-
-    /**
-     * Checks whether language matches HTTP header Accept-Language.
-     *
-     * @param string $header Header content
-     *
-     * @return bool
-     */
-    public function matchesAcceptLanguage($header)
-    {
-        $pattern = '/^('
-            . addcslashes($this->regex, '/')
-            . ')(;q=[0-9]\\.[0-9])?$/i';
-        return preg_match($pattern, $header);
-    }
-
-    /**
-     * Checks whether language matches HTTP header User-Agent
-     *
-     * @param string $header Header content
-     *
-     * @return bool
-     */
-    public function matchesUserAgent($header)
-    {
-        $pattern = '/(\(|\[|;[[:space:]])('
-            . addcslashes($this->regex, '/')
-            . ')(;|\]|\))/i';
-        return preg_match($pattern, $header);
-    }
-
-    /**
-     * Checks whether langauge is RTL
-     *
-     * @return bool
-     */
-    public function isRTL()
-    {
-        return in_array($this->code, array('ar', 'fa', 'he', 'ur'));
-    }
-
-    /**
-     * Activates given translation
-     *
-     * @return bool
-     */
-    public function activate()
-    {
-        $GLOBALS['lang'] = $this->code;
-
-        // Set locale
-        _setlocale(LC_MESSAGES, $this->code);
-        _bindtextdomain('phpmyadmin', LOCALE_PATH);
-        _bind_textdomain_codeset('phpmyadmin', 'UTF-8');
-        _textdomain('phpmyadmin');
-
-        /* Text direction for language */
-        if ($this->isRTL()) {
-            $GLOBALS['text_dir'] = 'rtl';
-        } else {
-            $GLOBALS['text_dir'] = 'ltr';
-        }
-
-        /* TCPDF */
-        $GLOBALS['l'] = array();
-
-        /* TCPDF settings */
-        $GLOBALS['l']['a_meta_charset'] = 'UTF-8';
-        $GLOBALS['l']['a_meta_dir'] = $GLOBALS['text_dir'];
-        $GLOBALS['l']['a_meta_language'] = $this->code;
-
-        /* TCPDF translations */
-        $GLOBALS['l']['w_page'] = __('Page number:');
-
-        /* Show possible warnings from langauge selection */
-        LanguageManager::getInstance()->showWarnings();
-    }
-}
diff --git a/#pma/libraries/LanguageManager.php b/#pma/libraries/LanguageManager.php
deleted file mode 100644
index 6003948e..00000000
--- a/#pma/libraries/LanguageManager.php
+++ /dev/null
@@ -1,871 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Hold the PMA\libraries\LanguageManager class
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries;
-
-use PMA\libraries\Language;
-
-/**
- * Language selection manager
- *
- * @package PhpMyAdmin
- */
-class LanguageManager
-{
-    /**
-     * @var array Definition data for languages
-     *
-     * Each member contains:
-     * - Language code
-     * - English language name
-     * - Native language name
-     * - Match regullar expression
-     * - MySQL locale
-     */
-    private static $_language_data = array(
-        'af' => array(
-            'af',
-            'Afrikaans',
-            '',
-            'af|afrikaans',
-            '',
-        ),
-        'ar' => array(
-            'ar',
-            'Arabic',
-            '&#1575;&#1604;&#1593;&#1585;&#1576;&#1610;&#1577;',
-            'ar|arabic',
-            'ar_AE',
-        ),
-        'az' => array(
-            'az',
-            'Azerbaijani',
-            'Az&#601;rbaycanca',
-            'az|azerbaijani',
-            '',
-        ),
-        'bn' => array(
-            'bn',
-            'Bangla',
-            'বাংলা',
-            'bn|bangla',
-            '',
-        ),
-        'be' => array(
-            'be',
-            'Belarusian',
-            '&#1041;&#1077;&#1083;&#1072;&#1088;&#1091;&#1089;&#1082;&#1072;&#1103;',
-            'be|belarusian',
-            'be_BY',
-        ),
-        'be@latin' => array(
-            'be@latin',
-            'Belarusian (latin)',
-            'Bie&#0322;aruskaja',
-            'be[-_]lat|be@latin|belarusian latin',
-            '',
-        ),
-        'bg' => array(
-            'bg',
-            'Bulgarian',
-            '&#1041;&#1098;&#1083;&#1075;&#1072;&#1088;&#1089;&#1082;&#1080;',
-            'bg|bulgarian',
-            'bg_BG',
-        ),
-        'bs' => array(
-            'bs',
-            'Bosnian',
-            'Bosanski',
-            'bs|bosnian',
-            '',
-        ),
-        'br' => array(
-            'br',
-            'Breton',
-            'Brezhoneg',
-            'br|breton',
-            '',
-        ),
-        'brx' => array(
-            'brx',
-            'Bodo',
-            'बड़ो',
-            'brx|bodo',
-            '',
-        ),
-        'ca' => array(
-            'ca',
-            'Catalan',
-            'Catal&agrave;',
-            'ca|catalan',
-            'ca_ES',
-        ),
-        'ckb' => array(
-            'ckb',
-            'Sorani',
-            'سۆرانی',
-            'ckb|sorani',
-            '',
-        ),
-        'cs' => array(
-            'cs',
-            'Czech',
-            'Čeština',
-            'cs|czech',
-            'cs_CZ',
-        ),
-        'cy' => array(
-            'cy',
-            'Welsh',
-            'Cymraeg',
-            'cy|welsh',
-            '',
-        ),
-        'da' => array(
-            'da',
-            'Danish',
-            'Dansk',
-            'da|danish',
-            'da_DK',
-        ),
-        'de' => array(
-            'de',
-            'German',
-            'Deutsch',
-            'de|german',
-            'de_DE',
-        ),
-        'el' => array(
-            'el',
-            'Greek',
-            '&Epsilon;&lambda;&lambda;&eta;&nu;&iota;&kappa;&#940;',
-            'el|greek',
-            '',
-        ),
-        'en' => array(
-            'en',
-            'English',
-            '',
-            'en|english',
-            'en_US',
-        ),
-        'en_gb' => array(
-            'en_GB',
-            'English (United Kingdom)',
-            '',
-            'en[_-]gb|english (United Kingdom)',
-            'en_GB',
-        ),
-        'eo' => array(
-            'eo',
-            'Esperanto',
-            'Esperanto',
-            'eo|esperanto',
-            '',
-        ),
-        'es' => array(
-            'es',
-            'Spanish',
-            'Espa&ntilde;ol',
-            'es|spanish',
-            'es_ES',
-        ),
-        'et' => array(
-            'et',
-            'Estonian',
-            'Eesti',
-            'et|estonian',
-            'et_EE',
-        ),
-        'eu' => array(
-            'eu',
-            'Basque',
-            'Euskara',
-            'eu|basque',
-            'eu_ES',
-        ),
-        'fa' => array(
-            'fa',
-            'Persian',
-            '&#1601;&#1575;&#1585;&#1587;&#1740;',
-            'fa|persian',
-            '',
-        ),
-        'fi' => array(
-            'fi',
-            'Finnish',
-            'Suomi',
-            'fi|finnish',
-            'fi_FI',
-        ),
-        'fr' => array(
-            'fr',
-            'French',
-            'Fran&ccedil;ais',
-            'fr|french',
-            'fr_FR',
-        ),
-        'fy' => array(
-            'fy',
-            'Frisian',
-            'Frysk',
-            'fy|frisian',
-            '',
-        ),
-        'gl' => array(
-            'gl',
-            'Galician',
-            'Galego',
-            'gl|galician',
-            'gl_ES',
-        ),
-        'gu' => array(
-            'gu',
-            'Gujarati',
-            'ગુજરાતી',
-            'gu|gujarati',
-            'gu_IN',
-        ),
-        'he' => array(
-            'he',
-            'Hebrew',
-            '&#1506;&#1489;&#1512;&#1497;&#1514;',
-            'he|hebrew',
-            'he_IL',
-        ),
-        'hi' => array(
-            'hi',
-            'Hindi',
-            '&#2361;&#2367;&#2344;&#2381;&#2342;&#2368;',
-            'hi|hindi',
-            'hi_IN',
-        ),
-        'hr' => array(
-            'hr',
-            'Croatian',
-            'Hrvatski',
-            'hr|croatian',
-            'hr_HR',
-        ),
-        'hu' => array(
-            'hu',
-            'Hungarian',
-            'Magyar',
-            'hu|hungarian',
-            'hu_HU',
-        ),
-        'hy' => array(
-            'hy',
-            'Armenian',
-            'Հայերէն',
-            'hy|armenian',
-            '',
-        ),
-        'ia' => array(
-            'ia',
-            'Interlingua',
-            '',
-            'ia|interlingua',
-            '',
-        ),
-        'id' => array(
-            'id',
-            'Indonesian',
-            'Bahasa Indonesia',
-            'id|indonesian',
-            'id_ID',
-        ),
-        'it' => array(
-            'it',
-            'Italian',
-            'Italiano',
-            'it|italian',
-            'it_IT',
-        ),
-        'ja' => array(
-            'ja',
-            'Japanese',
-            '&#26085;&#26412;&#35486;',
-            'ja|japanese',
-            'ja_JP',
-        ),
-        'ko' => array(
-            'ko',
-            'Korean',
-            '&#54620;&#44397;&#50612;',
-            'ko|korean',
-            'ko_KR',
-        ),
-        'ka' => array(
-            'ka',
-            'Georgian',
-            '&#4325;&#4304;&#4320;&#4311;&#4323;&#4314;&#4312;',
-            'ka|georgian',
-            '',
-        ),
-        'kk' => array(
-            'kk',
-            'Kazakh',
-            'Қазақ',
-            'kk|kazakh',
-            '',
-        ),
-        'km' => array(
-            'km',
-            'Khmer',
-            'ខ្មែរ',
-            'km|khmer',
-            '',
-        ),
-        'kn' => array(
-            'kn',
-            'Kannada',
-            'ಕನ್ನಡ',
-            'kn|kannada',
-            '',
-        ),
-        'ksh' => array(
-            'ksh',
-            'Colognian',
-            'Kölsch',
-            'ksh|colognian',
-            '',
-        ),
-        'ky' => array(
-            'ky',
-            'Kyrgyz',
-            'Кыргызча',
-            'ky|kyrgyz',
-            '',
-        ),
-        'li' => array(
-            'li',
-            'Limburgish',
-            'Lèmbörgs',
-            'li|limburgish',
-            '',
-        ),
-        'lt' => array(
-            'lt',
-            'Lithuanian',
-            'Lietuvi&#371;',
-            'lt|lithuanian',
-            'lt_LT',
-        ),
-        'lv' => array(
-            'lv',
-            'Latvian',
-            'Latvie&scaron;u',
-            'lv|latvian',
-            'lv_LV',
-        ),
-        'mk' => array(
-            'mk',
-            'Macedonian',
-            'Macedonian',
-            'mk|macedonian',
-            'mk_MK',
-        ),
-        'ml' => array(
-            'ml',
-            'Malayalam',
-            'Malayalam',
-            'ml|malayalam',
-            '',
-        ),
-        'mn' => array(
-            'mn',
-            'Mongolian',
-            '&#1052;&#1086;&#1085;&#1075;&#1086;&#1083;',
-            'mn|mongolian',
-            'mn_MN',
-        ),
-        'ms' => array(
-            'ms',
-            'Malay',
-            'Bahasa Melayu',
-            'ms|malay',
-            'ms_MY',
-        ),
-        'ne' => array(
-            'ne',
-            'Nepali',
-            'नेपाली',
-            'ne|nepali',
-            '',
-        ),
-        'nb' => array(
-            'nb',
-            'Norwegian',
-            'Norsk',
-            'nb|norwegian',
-            'nb_NO',
-        ),
-        'nl' => array(
-            'nl',
-            'Dutch',
-            'Nederlands',
-            'nl|dutch',
-            'nl_NL',
-        ),
-        'pa' => array(
-            'pa',
-            'Punjabi',
-            'ਪੰਜਾਬੀ',
-            'pa|punjabi',
-            '',
-        ),
-        'pl' => array(
-            'pl',
-            'Polish',
-            'Polski',
-            'pl|polish',
-            'pl_PL',
-        ),
-        'pt_br' => array(
-            'pt_BR',
-            'Brazilian Portuguese',
-            'Portugu&ecirc;s',
-            'pt[-_]br|brazilian portuguese',
-            'pt_BR',
-        ),
-        'pt' => array(
-            'pt',
-            'Portuguese',
-            'Portugu&ecirc;s',
-            'pt|portuguese',
-            'pt_PT',
-        ),
-        'ro' => array(
-            'ro',
-            'Romanian',
-            'Rom&acirc;n&#259;',
-            'ro|romanian',
-            'ro_RO',
-        ),
-        'ru' => array(
-            'ru',
-            'Russian',
-            '&#1056;&#1091;&#1089;&#1089;&#1082;&#1080;&#1081;',
-            'ru|russian',
-            'ru_RU',
-        ),
-        'si' => array(
-            'si',
-            'Sinhala',
-            '&#3523;&#3538;&#3458;&#3524;&#3517;',
-            'si|sinhala',
-            '',
-        ),
-        'sk' => array(
-            'sk',
-            'Slovak',
-            'Sloven&#269;ina',
-            'sk|slovak',
-            'sk_SK',
-        ),
-        'sl' => array(
-            'sl',
-            'Slovenian',
-            'Sloven&scaron;&#269;ina',
-            'sl|slovenian',
-            'sl_SI',
-        ),
-        'sq' => array(
-            'sq',
-            'Slbanian',
-            'Shqip',
-            'sq|albanian',
-            'sq_AL',
-        ),
-        'sr@latin' => array(
-            'sr@latin',
-            'Serbian (latin)',
-            'Srpski',
-            'sr[-_]lat|sr@latin|serbian latin',
-            'sr_YU',
-        ),
-        'sr' => array(
-            'sr',
-            'Serbian',
-            '&#1057;&#1088;&#1087;&#1089;&#1082;&#1080;',
-            'sr|serbian',
-            'sr_YU',
-        ),
-        'sv' => array(
-            'sv',
-            'Swedish',
-            'Svenska',
-            'sv|swedish',
-            'sv_SE',
-        ),
-        'ta' => array(
-            'ta',
-            'Tamil',
-            'தமிழ்',
-            'ta|tamil',
-            'ta_IN',
-        ),
-        'te' => array(
-            'te',
-            'Telugu',
-            'తెలుగు',
-            'te|telugu',
-            'te_IN',
-        ),
-        'th' => array(
-            'th',
-            'Thai',
-            '&#3616;&#3634;&#3625;&#3634;&#3652;&#3607;&#3618;',
-            'th|thai',
-            'th_TH',
-        ),
-        'tk' => array(
-            'tk',
-            'Turkmen',
-            'Türkmençe',
-            'tk|turkmen',
-            '',
-        ),
-        'tr' => array(
-            'tr',
-            'Turkish',
-            'T&uuml;rk&ccedil;e',
-            'tr|turkish',
-            'tr_TR',
-        ),
-        'tt' => array(
-            'tt',
-            'Tatarish',
-            'Tatar&ccedil;a',
-            'tt|tatarish',
-            '',
-        ),
-        'ug' => array(
-            'ug',
-            'Uyghur',
-            'ئۇيغۇرچە',
-            'ug|uyghur',
-            '',
-        ),
-        'uk' => array(
-            'uk',
-            'Ukrainian',
-            '&#1059;&#1082;&#1088;&#1072;&#1111;&#1085;&#1089;&#1100;&#1082;&#1072;',
-            'uk|ukrainian',
-            'uk_UA',
-        ),
-        'ur' => array(
-            'ur',
-            'Urdu',
-            'اُردوُ',
-            'ur|urdu',
-            'ur_PK',
-        ),
-        'uz@latin' => array(
-            'uz@latin',
-            'Uzbek (latin)',
-            'O&lsquo;zbekcha',
-            'uz[-_]lat|uz@latin|uzbek-latin',
-            '',
-        ),
-        'uz' => array(
-            'uz',
-            'Uzbek (cyrillic)',
-            '&#1038;&#1079;&#1073;&#1077;&#1082;&#1095;&#1072;',
-            'uz[-_]cyr|uz@cyrillic|uzbek-cyrillic',
-            '',
-        ),
-        'vi' => array(
-            'vi',
-            'Vietnamese',
-            'Tiếng Việt',
-            'vi|vietnamese',
-            'vi_VN',
-        ),
-        'vls' => array(
-            'vls',
-            'Flemish',
-            'West-Vlams',
-            'vls|flemish',
-            '',
-        ),
-        'zh_tw' => array(
-            'zh_TW',
-            'Chinese traditional',
-            '&#20013;&#25991;',
-            'zh[-_](tw|hk)|chinese traditional',
-            'zh_TW',
-        ),
-        // only TW and HK use traditional Chinese while others (CN, SG, MY)
-        // use simplified Chinese
-        'zh_cn' => array(
-            'zh_CN',
-            'Chinese simplified',
-            '&#20013;&#25991;',
-            'zh(?![-_](tw|hk))([-_][[:alpha:]]{2,3})?|chinese simplified',
-            'zh_CN',
-        ),
-    );
-
-    private $_available_locales;
-    private $_available_languages;
-    private $_lang_failed_cfg;
-    private $_lang_failed_cookie;
-    private $_lang_failed_request;
-    private static $instance;
-
-    /**
-     * Returns LanguageManager singleton
-     *
-     * @return LanguageManager
-     */
-    public static function getInstance()
-    {
-        if (self::$instance === NULL) {
-            self::$instance = new LanguageManager;
-        }
-        return self::$instance;
-    }
-
-    /**
-     * Returns list of available locales
-     *
-     * @return array
-     */
-    public function listLocaleDir()
-    {
-        $result = array('en');
-
-        /* Check for existing directory */
-        if (!is_dir(LOCALE_PATH)) {
-            return $result;
-        }
-
-        /* Open the directory */
-        $handle = @opendir(LOCALE_PATH);
-        /* This can happen if the kit is English-only */
-        if ($handle === false) {
-            return $result;
-        }
-
-        /* Process all files */
-        while (false !== ($file = readdir($handle))) {
-            $path = LOCALE_PATH
-                . '/' . $file
-                . '/LC_MESSAGES/phpmyadmin.mo';
-            if ($file != "."
-                && $file != ".."
-                && @file_exists($path)
-            ) {
-                $result[] = $file;
-            }
-        }
-        /* Close the handle */
-        closedir($handle);
-
-        return $result;
-    }
-
-    /**
-     * Returns (cached) list of all available locales
-     *
-     * @return array of strings
-     */
-    public function availableLocales()
-    {
-        if (! $this->_available_locales) {
-
-            if (empty($GLOBALS['cfg']['FilterLanguages'])) {
-                $this->_available_locales = $this->listLocaleDir();
-            } else {
-                $this->_available_locales = preg_grep(
-                    '@' . $GLOBALS['cfg']['FilterLanguages'] . '@',
-                    $this->listLocaleDir()
-                );
-            }
-        }
-        return $this->_available_locales;
-    }
-
-    /**
-     * Returns (cached) list of all available languages
-     *
-     * @return array of Language objects
-     */
-    public function availableLanguages()
-    {
-        if (! $this->_available_languages) {
-            $this->_available_languages = array();
-
-            foreach($this->availableLocales() as $lang) {
-                $lang = strtolower($lang);
-                if (isset($this::$_language_data[$lang])) {
-                    $data = $this::$_language_data[$lang];
-                    $this->_available_languages[$lang] = new Language(
-                        $data[0],
-                        $data[1],
-                        $data[2],
-                        $data[3],
-                        $data[4]
-                    );
-                } else {
-                    $this->_available_languages[$lang] = new Language(
-                        $lang,
-                        ucfirst($lang),
-                        ucfirst($lang),
-                        $lang,
-                        ''
-                    );
-                }
-            }
-        }
-        return $this->_available_languages;
-    }
-
-    /**
-     * Returns (cached) list of all available languages sorted
-     * by name
-     *
-     * @return array of Language objects
-     */
-    public function sortedLanguages()
-    {
-        $this->availableLanguages();
-        uasort($this->_available_languages, function($a, $b)
-            {
-                return $a->cmp($b);
-            }
-        );
-        return $this->_available_languages;
-    }
-
-    /**
-     * Return Language object for given code
-     *
-     * @param string $code Language code
-     *
-     * @return object|false Language object or false on failure
-     */
-    public function getLanguage($code)
-    {
-        $code = strtolower($code);
-        $langs = $this->availableLanguages();
-        if (isset($langs[$code])) {
-            return $langs[$code];
-        }
-        return false;
-    }
-
-    /**
-     * Return currently active Language object
-     *
-     * @return object Language object
-     */
-    public function getCurrentLanguage()
-    {
-        return $this->_available_languages[strtolower($GLOBALS['lang'])];
-    }
-
-    /**
-     * Activates language based on configuration, user preferences or
-     * browser
-     *
-     * @return Language
-     */
-    public function selectLanguage()
-    {
-        // check forced language
-        if (! empty($GLOBALS['cfg']['Lang'])) {
-            $lang = $this->getLanguage($GLOBALS['cfg']['Lang']);
-            if ($lang !== false) {
-                return $lang;
-            }
-            $this->_lang_failed_cfg = true;
-        }
-
-        // Don't use REQUEST in following code as it might be confused by cookies
-        // with same name. Check user requested language (POST)
-        if (! empty($_POST['lang'])) {
-            $lang = $this->getLanguage($_POST['lang']);
-            if ($lang !== false) {
-                return $lang;
-            }
-            $this->_lang_failed_request = true;
-        }
-
-        // check user requested language (GET)
-        if (! empty($_GET['lang'])) {
-            $lang = $this->getLanguage($_GET['lang']);
-            if ($lang !== false) {
-                return $lang;
-            }
-            $this->_lang_failed_request = true;
-        }
-
-        // check previous set language
-        if (! empty($_COOKIE['pma_lang'])) {
-            $lang = $this->getLanguage($_COOKIE['pma_lang']);
-            if ($lang !== false) {
-                return $lang;
-            }
-            $this->_lang_failed_cookie = true;
-        }
-
-        $langs = $this->availableLanguages();
-
-        // try to find out user's language by checking its HTTP_ACCEPT_LANGUAGE variable;
-        $accepted_languages = PMA_getenv('HTTP_ACCEPT_LANGUAGE');
-        if ($accepted_languages) {
-            foreach (explode(',', $accepted_languages) as $header) {
-                foreach ($langs as $language) {
-                    if ($language->matchesAcceptLanguage($header)) {
-                        return $language;
-                    }
-                }
-            }
-        }
-
-        // try to find out user's language by checking its HTTP_USER_AGENT variable
-        $user_agent = PMA_getenv('HTTP_USER_AGENT');
-        if (! empty($user_agent)) {
-            foreach ($langs as $language) {
-                if ($language->matchesUserAgent($user_agent)) {
-                    return $language;
-                }
-            }
-        }
-
-        // Didn't catch any valid lang : we use the default settings
-        if (isset($langs[$GLOBALS['cfg']['DefaultLang']])) {
-            return $langs[$GLOBALS['cfg']['DefaultLang']];
-        }
-
-        // Fallback to English
-        return $langs['en'];
-    }
-
-    /**
-     * Displays warnings about invalid languages. This needs to be postponed
-     * to show messages at time when language is initialized.
-     *
-     * @return void
-     */
-    public function showWarnings()
-    {
-        // now, that we have loaded the language strings we can send the errors
-        if ($this->_lang_failed_cfg
-            || $this->_lang_failed_cookie
-            || $this->_lang_failed_request
-        ) {
-            trigger_error(
-                __('Ignoring unsupported language code.'),
-                E_USER_ERROR
-            );
-        }
-    }
-}
diff --git a/#pma/libraries/Linter.php b/#pma/libraries/Linter.php
deleted file mode 100644
index ed53ce21..00000000
--- a/#pma/libraries/Linter.php
+++ /dev/null
@@ -1,180 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Analyzes a query and gives user feedback.
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries;
-
-use SqlParser\Lexer;
-use SqlParser\Parser;
-use SqlParser\UtfString;
-use SqlParser\Utils\Error as ParserError;
-
-/**
- * The linter itself.
- *
- * @package PhpMyAdmin
- */
-class Linter
-{
-
-    /**
-     * Gets the starting position of each line.
-     *
-     * @param string $str String to be analyzed.
-     *
-     * @return array
-     */
-    public static function getLines($str)
-    {
-        if ((!($str instanceof UtfString))
-            && (defined('USE_UTF_STRINGS')) && (USE_UTF_STRINGS)
-        ) {
-            // If the lexer uses UtfString for processing then the position will
-            // represent the position of the character and not the position of
-            // the byte.
-            $str = new UtfString($str);
-        }
-
-        // The reason for using the strlen is that the length
-        // required is the length in bytes, not characters.
-        //
-        // Given the following string: `????+`, where `?` represents a
-        // multi-byte character (lets assume that every `?` is a 2-byte
-        // character) and `+` is a newline, the first value of `$i` is `0`
-        // and the last one is `4` (because there are 5 characters). Bytes
-        // `$str[0]` and `$str[1]` are the first character, `$str[2]` and
-        // `$str[3]` are the second one and `$str[4]` is going to be the
-        // first byte of the third character. The fourth and the last one
-        // (which is actually a new line) aren't going to be processed at
-        // all.
-        $len = ($str instanceof UtfString) ?
-            $str->length() : strlen($str);
-
-        $lines = array(0);
-        for ($i = 0; $i < $len; ++$i) {
-            if ($str[$i] === "\n") {
-                $lines[] = $i + 1;
-            }
-        }
-        return $lines;
-    }
-
-    /**
-     * Computes the number of the line and column given an absolute position.
-     *
-     * @param array $lines The starting position of each line.
-     * @param int   $pos   The absolute position
-     *
-     * @return array
-     */
-    public static function findLineNumberAndColumn($lines, $pos)
-    {
-        $line = 0;
-        foreach ($lines as $lineNo => $lineStart) {
-            if ($lineStart > $pos) {
-                break;
-            }
-            $line = $lineNo;
-        }
-        return array($line, $pos - $lines[$line]);
-    }
-
-    /**
-     * Runs the linting process.
-     *
-     * @param string $query The query to be checked.
-     *
-     * @return array
-     */
-    public static function lint($query)
-    {
-        // Disabling lint for huge queries to save some resources.
-        if (mb_strlen($query) > 10000) {
-            return array(
-                array(
-                    'message' => __(
-                        'Linting is disabled for this query because it exceeds the '
-                        . 'maximum length.'
-                    ),
-                    'fromLine' => 0,
-                    'fromColumn' => 0,
-                    'toLine' => 0,
-                    'toColumn' => 0,
-                    'severity' => 'warning',
-                )
-            );
-        }
-
-        /**
-         * Lexer used for tokenizing the query.
-         *
-         * @var Lexer
-         */
-        $lexer = new Lexer($query);
-
-        /**
-         * Parsed used for analysing the query.
-         *
-         * @var Parser
-         */
-        $parser = new Parser($lexer->list);
-
-        /**
-         * Array containing all errors.
-         *
-         * @var array
-         */
-        $errors = ParserError::get(array($lexer, $parser));
-
-        /**
-         * The response containing of all errors.
-         *
-         * @var array
-         */
-        $response = array();
-
-        /**
-         * The starting position for each line.
-         *
-         * CodeMirror requires relative position to line, but the parser stores
-         * only the absolute position of the character in string.
-         *
-         * @var array
-         */
-        $lines = static::getLines($query);
-
-        // Building the response.
-        foreach ($errors as $idx => $error) {
-
-            // Starting position of the string that caused the error.
-            list($fromLine, $fromColumn) = static::findLineNumberAndColumn(
-                $lines, $error[3]
-            );
-
-            // Ending position of the string that caused the error.
-            list($toLine, $toColumn) = static::findLineNumberAndColumn(
-                $lines, $error[3] + mb_strlen($error[2])
-            );
-
-            // Building the response.
-            $response[] = array(
-                'message' => sprintf(
-                    __('%1$s (near <code>%2$s</code>)'),
-                    $error[0], $error[2]
-                ),
-                'fromLine' => $fromLine,
-                'fromColumn' => $fromColumn,
-                'toLine' => $toLine,
-                'toColumn' => $toColumn,
-                'severity' => 'error',
-            );
-        }
-
-        // Sending back the answer.
-        return $response;
-    }
-
-}
diff --git a/#pma/libraries/ListAbstract.php b/#pma/libraries/ListAbstract.php
deleted file mode 100644
index f557c177..00000000
--- a/#pma/libraries/ListAbstract.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * hold the ListAbstract base class
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries;
-
-use ArrayObject;
-
-/**
- * Generic list class
- *
- * @todo add caching
- * @abstract
- * @package PhpMyAdmin
- * @since   phpMyAdmin 2.9.10
- */
-abstract class ListAbstract extends ArrayObject
-{
-    /**
-     * @var mixed   empty item
-     */
-    protected $item_empty = '';
-
-    /**
-     * ListAbstract constructor
-     *
-     * @param array  $array          The input parameter accepts an array or an
-     *                               Object.
-     * @param int    $flags          Flags to control the behaviour of the
-     *                               ArrayObject object.
-     * @param string $iterator_class Specify the class that will be used for
-     *                               iteration of the ArrayObject object.
-     *                               ArrayIterator is the default class used.
-     */
-    public function __construct(
-        $array = array(), $flags = 0, $iterator_class = "ArrayIterator"
-    ) {
-        parent::__construct($array, $flags, $iterator_class);
-    }
-
-    /**
-     * defines what is an empty item (0, '', false or null)
-     *
-     * @return mixed   an empty item
-     */
-    public function getEmpty()
-    {
-        return $this->item_empty;
-    }
-
-    /**
-     * checks if the given db names exists in the current list, if there is
-     * missing at least one item it returns false otherwise true
-     *
-     * @return boolean true if all items exists, otherwise false
-     */
-    public function exists()
-    {
-        $this_elements = $this->getArrayCopy();
-        foreach (func_get_args() as $result) {
-            if (! in_array($result, $this_elements)) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * returns HTML <option>-tags to be used inside <select></select>
-     *
-     * @param mixed   $selected                   the selected db or true for
-     *                                            selecting current db
-     * @param boolean $include_information_schema whether include information schema
-     *
-     * @return string  HTML option tags
-     */
-    public function getHtmlOptions(
-        $selected = '', $include_information_schema = true
-    ) {
-        if (true === $selected) {
-            $selected = $this->getDefault();
-        }
-
-        $options = '';
-        foreach ($this as $each_item) {
-            if (false === $include_information_schema
-                && $GLOBALS['dbi']->isSystemSchema($each_item)
-            ) {
-                continue;
-            }
-            $options .= '<option value="' . htmlspecialchars($each_item) . '"';
-            if ($selected === $each_item) {
-                $options .= ' selected="selected"';
-            }
-            $options .= '>' . htmlspecialchars($each_item) . '</option>' . "\n";
-        }
-
-        return $options;
-    }
-
-    /**
-     * returns default item
-     *
-     * @return string  default item
-     */
-    public function getDefault()
-    {
-        return $this->getEmpty();
-    }
-
-    /**
-     * builds up the list
-     *
-     * @return void
-     */
-    abstract public function build();
-}
diff --git a/#pma/libraries/ListDatabase.php b/#pma/libraries/ListDatabase.php
deleted file mode 100644
index 468a528b..00000000
--- a/#pma/libraries/ListDatabase.php
+++ /dev/null
@@ -1,185 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * holds the ListDatabase class
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries;
-
-require_once './libraries/check_user_privileges.lib.php';
-
-/**
- * handles database lists
- *
- * <code>
- * $ListDatabase = new ListDatabase($userlink);
- * </code>
- *
- * @todo this object should be attached to the PMA_Server object
- *
- * @package PhpMyAdmin
- * @since   phpMyAdmin 2.9.10
- */
-class ListDatabase extends ListAbstract
-{
-    /**
-     * @var mixed   database link resource|object to be used
-     * @access protected
-     */
-    protected $db_link = null;
-
-    /**
-     * @var mixed   user database link resource|object
-     * @access protected
-     */
-    protected $db_link_user = null;
-
-    /**
-     * Constructor
-     *
-     * @param mixed $db_link_user user database link resource|object
-     */
-    public function __construct($db_link_user = null)
-    {
-        $this->db_link = $db_link_user;
-        $this->db_link_user = $db_link_user;
-
-        parent::__construct();
-        $this->build();
-    }
-
-    /**
-     * checks if the configuration wants to hide some databases
-     *
-     * @return void
-     */
-    protected function checkHideDatabase()
-    {
-        if (empty($GLOBALS['cfg']['Server']['hide_db'])) {
-            return;
-        }
-
-        foreach ($this->getArrayCopy() as $key => $db) {
-            if (preg_match('/' . $GLOBALS['cfg']['Server']['hide_db'] . '/', $db)) {
-                $this->offsetUnset($key);
-            }
-        }
-    }
-
-    /**
-     * retrieves database list from server
-     *
-     * @param string $like_db_name usually a db_name containing wildcards
-     *
-     * @return array
-     */
-    protected function retrieve($like_db_name = null)
-    {
-        $database_list = array();
-        $command = "";
-        if (! $GLOBALS['cfg']['Server']['DisableIS']) {
-            $command .= "SELECT `SCHEMA_NAME` FROM `INFORMATION_SCHEMA`.`SCHEMATA`";
-            if (null !== $like_db_name) {
-                $command .= " WHERE `SCHEMA_NAME` LIKE '" . $like_db_name . "'";
-            }
-        } else {
-            if ($GLOBALS['dbs_to_test'] === false || null !== $like_db_name) {
-                $command .= "SHOW DATABASES";
-                if (null !== $like_db_name) {
-                    $command .= " LIKE '" . $like_db_name . "'";
-                }
-            } else {
-                foreach ($GLOBALS['dbs_to_test'] as $db) {
-                    $database_list = array_merge(
-                        $database_list, $this->retrieve($db)
-                    );
-                }
-            }
-        }
-
-        if ($command) {
-            $database_list = $GLOBALS['dbi']->fetchResult(
-                $command, null, null, $this->db_link
-            );
-        }
-
-        if ($GLOBALS['cfg']['NaturalOrder']) {
-            natsort($database_list);
-        } else {
-            // need to sort anyway, otherwise information_schema
-            // goes at the top
-            sort($database_list);
-        }
-
-        return $database_list;
-    }
-
-    /**
-     * builds up the list
-     *
-     * @return void
-     */
-    public function build()
-    {
-        if (! $this->checkOnlyDatabase()) {
-            $items = $this->retrieve();
-            $this->exchangeArray($items);
-        }
-
-        $this->checkHideDatabase();
-    }
-
-    /**
-     * checks the only_db configuration
-     *
-     * @return boolean false if there is no only_db, otherwise true
-     */
-    protected function checkOnlyDatabase()
-    {
-        if (is_string($GLOBALS['cfg']['Server']['only_db'])
-            && mb_strlen($GLOBALS['cfg']['Server']['only_db'])
-        ) {
-            $GLOBALS['cfg']['Server']['only_db'] = array(
-                $GLOBALS['cfg']['Server']['only_db']
-            );
-        }
-
-        if (! is_array($GLOBALS['cfg']['Server']['only_db'])) {
-            return false;
-        }
-
-        $items = array();
-
-        foreach ($GLOBALS['cfg']['Server']['only_db'] as $each_only_db) {
-
-            // check if the db name contains wildcard,
-            // thus containing not escaped _ or %
-            if (! preg_match('/(^|[^\\\\])(_|%)/', $each_only_db)) {
-                // ... not contains wildcard
-                $items[] = Util::unescapeMysqlWildcards($each_only_db);
-                continue;
-            }
-
-            $items = array_merge($items, $this->retrieve($each_only_db));
-        }
-
-        $this->exchangeArray($items);
-
-        return true;
-    }
-
-    /**
-     * returns default item
-     *
-     * @return string default item
-     */
-    public function getDefault()
-    {
-        if (mb_strlen($GLOBALS['db'])) {
-            return $GLOBALS['db'];
-        }
-
-        return $this->getEmpty();
-    }
-}
diff --git a/#pma/libraries/Menu.php b/#pma/libraries/Menu.php
deleted file mode 100644
index 39be2ad2..00000000
--- a/#pma/libraries/Menu.php
+++ /dev/null
@@ -1,635 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Generates and renders the top menu
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries;
-
-/**
- * Class for generating the top menu
- *
- * @package PhpMyAdmin
- */
-class Menu
-{
-    /**
-     * Server id
-     *
-     * @access private
-     * @var int
-     */
-    private $_server;
-    /**
-     * Database name
-     *
-     * @access private
-     * @var string
-     */
-    private $_db;
-    /**
-     * Table name
-     *
-     * @access private
-     * @var string
-     */
-    private $_table;
-
-    /**
-     * Creates a new instance of Menu
-     *
-     * @param int    $server Server id
-     * @param string $db     Database name
-     * @param string $table  Table name
-     */
-    public function __construct($server, $db, $table)
-    {
-        $this->_server = $server;
-        $this->_db     = $db;
-        $this->_table  = $table;
-    }
-
-    /**
-     * Prints the menu and the breadcrumbs
-     *
-     * @return void
-     */
-    public function display()
-    {
-        echo $this->getDisplay();
-    }
-
-    /**
-     * Returns the menu and the breadcrumbs as a string
-     *
-     * @return string
-     */
-    public function getDisplay()
-    {
-        $retval  = $this->_getBreadcrumbs();
-        $retval .= $this->_getMenu();
-        return $retval;
-    }
-
-    /**
-     * Returns hash for the menu and the breadcrumbs
-     *
-     * @return string
-     */
-    public function getHash()
-    {
-        return substr(
-            md5($this->_getMenu() . $this->_getBreadcrumbs()),
-            0,
-            8
-        );
-    }
-
-    /**
-     * Returns the menu as HTML
-     *
-     * @return string HTML formatted menubar
-     */
-    private function _getMenu()
-    {
-        $url_params = array('db' => $this->_db);
-
-        if (mb_strlen($this->_table)) {
-            $tabs = $this->_getTableTabs();
-            $url_params['table'] = $this->_table;
-            $level = 'table';
-        } else if (mb_strlen($this->_db)) {
-            $tabs = $this->_getDbTabs();
-            $level = 'db';
-        } else {
-            $tabs = $this->_getServerTabs();
-            $level = 'server';
-        }
-
-        $allowedTabs = $this->_getAllowedTabs($level);
-        foreach ($tabs as $key => $value) {
-            if (! array_key_exists($key, $allowedTabs)) {
-                unset($tabs[$key]);
-            }
-        }
-        return Util::getHtmlTabs($tabs, $url_params, 'topmenu', true);
-    }
-
-    /**
-     * Returns a list of allowed tabs for the current user for the given level
-     *
-     * @param string $level 'server', 'db' or 'table' level
-     *
-     * @return array list of allowed tabs
-     */
-    private function _getAllowedTabs($level)
-    {
-        $allowedTabs = Util::getMenuTabList($level);
-        $cfgRelation = PMA_getRelationsParam();
-        if ($cfgRelation['menuswork']) {
-            $groupTable = Util::backquote($cfgRelation['db'])
-                . "."
-                . Util::backquote($cfgRelation['usergroups']);
-            $userTable = Util::backquote($cfgRelation['db'])
-                . "." . Util::backquote($cfgRelation['users']);
-
-            $sql_query = "SELECT `tab` FROM " . $groupTable
-                . " WHERE `allowed` = 'N'"
-                . " AND `tab` LIKE '" . $level . "%'"
-                . " AND `usergroup` = (SELECT usergroup FROM "
-                . $userTable . " WHERE `username` = '"
-                . $GLOBALS['dbi']->escapeString($GLOBALS['cfg']['Server']['user']) . "')";
-
-            $result = PMA_queryAsControlUser($sql_query, false);
-            if ($result) {
-                while ($row = $GLOBALS['dbi']->fetchAssoc($result)) {
-                    $tabName = mb_substr(
-                        $row['tab'],
-                        mb_strpos($row['tab'], '_') + 1
-                    );
-                    unset($allowedTabs[$tabName]);
-                }
-            }
-        }
-        return $allowedTabs;
-    }
-
-    /**
-     * Returns the breadcrumbs as HTML
-     *
-     * @return string HTML formatted breadcrumbs
-     */
-    private function _getBreadcrumbs()
-    {
-        $retval = '';
-        $tbl_is_view = $GLOBALS['dbi']->getTable($this->_db, $this->_table)
-            ->isView();
-        if (empty($GLOBALS['cfg']['Server']['host'])) {
-            $GLOBALS['cfg']['Server']['host'] = '';
-        }
-        $server_info = ! empty($GLOBALS['cfg']['Server']['verbose'])
-            ? $GLOBALS['cfg']['Server']['verbose']
-            : $GLOBALS['cfg']['Server']['host'];
-        $server_info .= empty($GLOBALS['cfg']['Server']['port'])
-            ? ''
-            : ':' . $GLOBALS['cfg']['Server']['port'];
-
-        $separator = "<span class='separator item'>&nbsp;»</span>";
-        $item = '<a href="%1$s%2$s" class="item">';
-
-        if (Util::showText('TabsMode')) {
-            $item .= '%4$s: ';
-        }
-        $item .= '%3$s</a>';
-        $retval .= "<div id='floating_menubar'></div>";
-        $retval .= "<div id='serverinfo'>";
-        if (Util::showIcons('TabsMode')) {
-            $retval .= Util::getImage(
-                's_host.png',
-                '',
-                array('class' => 'item')
-            );
-        }
-        $retval .= sprintf(
-            $item,
-            Util::getScriptNameForOption(
-                $GLOBALS['cfg']['DefaultTabServer'], 'server'
-            ),
-            PMA_URL_getCommon(),
-            htmlspecialchars($server_info),
-            __('Server')
-        );
-
-        if (mb_strlen($this->_db)) {
-            $retval .= $separator;
-            if (Util::showIcons('TabsMode')) {
-                $retval .= Util::getImage(
-                    's_db.png',
-                    '',
-                    array('class' => 'item')
-                );
-            }
-            $retval .= sprintf(
-                $item,
-                Util::getScriptNameForOption(
-                    $GLOBALS['cfg']['DefaultTabDatabase'], 'database'
-                ),
-                PMA_URL_getCommon(array('db' => $this->_db)),
-                htmlspecialchars($this->_db),
-                __('Database')
-            );
-            // if the table is being dropped, $_REQUEST['purge'] is set to '1'
-            // so do not display the table name in upper div
-            if (mb_strlen($this->_table)
-                && ! (isset($_REQUEST['purge']) && $_REQUEST['purge'] == '1')
-            ) {
-                include './libraries/tbl_info.inc.php';
-
-                $retval .= $separator;
-                if (Util::showIcons('TabsMode')) {
-                    $icon = $tbl_is_view ? 'b_views.png' : 's_tbl.png';
-                    $retval .= Util::getImage(
-                        $icon,
-                        '',
-                        array('class' => 'item')
-                    );
-                }
-                $retval .= sprintf(
-                    $item,
-                    Util::getScriptNameForOption(
-                        $GLOBALS['cfg']['DefaultTabTable'], 'table'
-                    ),
-                    PMA_URL_getCommon(
-                        array(
-                            'db' => $this->_db, 'table' => $this->_table
-                        )
-                    ),
-                    str_replace(' ', '&nbsp;', htmlspecialchars($this->_table)),
-                    $tbl_is_view ? __('View') : __('Table')
-                );
-
-                /**
-                 * Displays table comment
-                 */
-                if (! empty($show_comment)
-                    && ! isset($GLOBALS['avoid_show_comment'])
-                ) {
-                    if (mb_strstr($show_comment, '; InnoDB free')) {
-                        $show_comment = preg_replace(
-                            '@; InnoDB free:.*?$@',
-                            '',
-                            $show_comment
-                        );
-                    }
-                    $retval .= '<span class="table_comment"';
-                    $retval .= ' id="span_table_comment">&quot;';
-                    $retval .= htmlspecialchars($show_comment);
-                    $retval .= '&quot;</span>';
-                } // end if
-            } else {
-                // no table selected, display database comment if present
-                $cfgRelation = PMA_getRelationsParam();
-
-                // Get additional information about tables for tooltip is done
-                // in Util::getDbInfo() only once
-                if ($cfgRelation['commwork']) {
-                    $comment = PMA_getDbComment($this->_db);
-                    /**
-                     * Displays table comment
-                     */
-                    if (! empty($comment)) {
-                        $retval .= '<span class="table_comment"'
-                            . ' id="span_table_comment">&quot;'
-                            . htmlspecialchars($comment)
-                            . '&quot;</span>';
-                    } // end if
-                }
-            }
-        }
-        $retval .= '<div class="clearfloat"></div>';
-        $retval .= '</div>';
-        return $retval;
-    }
-
-    /**
-     * Returns the table tabs as an array
-     *
-     * @return array Data for generating table tabs
-     */
-    private function _getTableTabs()
-    {
-        $db_is_system_schema = $GLOBALS['dbi']->isSystemSchema($this->_db);
-        $tbl_is_view = $GLOBALS['dbi']->getTable($this->_db, $this->_table)
-            ->isView();
-        $updatable_view = false;
-        if ($tbl_is_view) {
-            $updatable_view = $GLOBALS['dbi']->getTable($this->_db, $this->_table)
-                ->isUpdatableView();
-        }
-        $is_superuser = $GLOBALS['dbi']->isSuperuser();
-        $isCreateOrGrantUser = $GLOBALS['dbi']->isUserType('grant')
-            || $GLOBALS['dbi']->isUserType('create');
-
-        $tabs = array();
-
-        $tabs['browse']['icon'] = 'b_browse.png';
-        $tabs['browse']['text'] = __('Browse');
-        $tabs['browse']['link'] = 'sql.php';
-        $tabs['browse']['args']['pos'] = 0;
-
-        $tabs['structure']['icon'] = 'b_props.png';
-        $tabs['structure']['link'] = 'tbl_structure.php';
-        $tabs['structure']['text'] = __('Structure');
-        $tabs['structure']['active'] = in_array(
-            basename($GLOBALS['PMA_PHP_SELF']),
-            array('tbl_structure.php', 'tbl_relation.php')
-        );
-
-        $tabs['sql']['icon'] = 'b_sql.png';
-        $tabs['sql']['link'] = 'tbl_sql.php';
-        $tabs['sql']['text'] = __('SQL');
-
-        $tabs['search']['icon'] = 'b_search.png';
-        $tabs['search']['text'] = __('Search');
-        $tabs['search']['link'] = 'tbl_select.php';
-        $tabs['search']['active'] = in_array(
-            basename($GLOBALS['PMA_PHP_SELF']),
-            array('tbl_select.php', 'tbl_zoom_select.php', 'tbl_find_replace.php')
-        );
-
-        if (! $db_is_system_schema && (! $tbl_is_view || $updatable_view)) {
-            $tabs['insert']['icon'] = 'b_insrow.png';
-            $tabs['insert']['link'] = 'tbl_change.php';
-            $tabs['insert']['text'] = __('Insert');
-        }
-
-        $tabs['export']['icon'] = 'b_tblexport.png';
-        $tabs['export']['link'] = 'tbl_export.php';
-        $tabs['export']['args']['single_table'] = 'true';
-        $tabs['export']['text'] = __('Export');
-
-        /**
-         * Don't display "Import" for views and information_schema
-         */
-        if (! $tbl_is_view && ! $db_is_system_schema) {
-            $tabs['import']['icon'] = 'b_tblimport.png';
-            $tabs['import']['link'] = 'tbl_import.php';
-            $tabs['import']['text'] = __('Import');
-        }
-        if (($is_superuser || $isCreateOrGrantUser)
-            && ! $db_is_system_schema
-        ) {
-            $tabs['privileges']['link'] = 'server_privileges.php';
-            $tabs['privileges']['args']['checkprivsdb'] = $this->_db;
-            $tabs['privileges']['args']['checkprivstable'] = $this->_table;
-            // stay on table view
-            $tabs['privileges']['args']['viewing_mode'] = 'table';
-            $tabs['privileges']['text'] = __('Privileges');
-            $tabs['privileges']['icon'] = 's_rights.png';
-        }
-        /**
-         * Don't display "Operations" for views and information_schema
-         */
-        if (! $tbl_is_view && ! $db_is_system_schema) {
-            $tabs['operation']['icon'] = 'b_tblops.png';
-            $tabs['operation']['link'] = 'tbl_operations.php';
-            $tabs['operation']['text'] = __('Operations');
-        }
-        /**
-         * Views support a limited number of operations
-         */
-        if ($tbl_is_view && ! $db_is_system_schema) {
-            $tabs['operation']['icon'] = 'b_tblops.png';
-            $tabs['operation']['link'] = 'view_operations.php';
-            $tabs['operation']['text'] = __('Operations');
-        }
-
-        if (Tracker::isActive() && ! $db_is_system_schema) {
-            $tabs['tracking']['icon'] = 'eye.png';
-            $tabs['tracking']['text'] = __('Tracking');
-            $tabs['tracking']['link'] = 'tbl_tracking.php';
-        }
-        if (! $db_is_system_schema
-            && Util::currentUserHasPrivilege(
-                'TRIGGER',
-                $this->_db,
-                $this->_table
-            )
-            && ! $tbl_is_view
-        ) {
-            $tabs['triggers']['link'] = 'tbl_triggers.php';
-            $tabs['triggers']['text'] = __('Triggers');
-            $tabs['triggers']['icon'] = 'b_triggers.png';
-        }
-
-        return $tabs;
-    }
-
-    /**
-     * Returns the db tabs as an array
-     *
-     * @return array Data for generating db tabs
-     */
-    private function _getDbTabs()
-    {
-        $db_is_system_schema = $GLOBALS['dbi']->isSystemSchema($this->_db);
-        $num_tables = count($GLOBALS['dbi']->getTables($this->_db));
-        $is_superuser = $GLOBALS['dbi']->isSuperuser();
-        $isCreateOrGrantUser = $GLOBALS['dbi']->isUserType('grant')
-            || $GLOBALS['dbi']->isUserType('create');
-
-        /**
-         * Gets the relation settings
-         */
-        $cfgRelation = PMA_getRelationsParam();
-
-        $tabs = array();
-
-        $tabs['structure']['link'] = 'db_structure.php';
-        $tabs['structure']['text'] = __('Structure');
-        $tabs['structure']['icon'] = 'b_props.png';
-
-        $tabs['sql']['link'] = 'db_sql.php';
-        $tabs['sql']['text'] = __('SQL');
-        $tabs['sql']['icon'] = 'b_sql.png';
-
-        $tabs['search']['text'] = __('Search');
-        $tabs['search']['icon'] = 'b_search.png';
-        $tabs['search']['link'] = 'db_search.php';
-        if ($num_tables == 0) {
-            $tabs['search']['warning'] = __('Database seems to be empty!');
-        }
-
-        $tabs['qbe']['text'] = __('Query');
-        $tabs['qbe']['icon'] = 's_db.png';
-        $tabs['qbe']['link'] = 'db_qbe.php';
-        if ($num_tables == 0) {
-            $tabs['qbe']['warning'] = __('Database seems to be empty!');
-        }
-
-        $tabs['export']['text'] = __('Export');
-        $tabs['export']['icon'] = 'b_export.png';
-        $tabs['export']['link'] = 'db_export.php';
-        if ($num_tables == 0) {
-            $tabs['export']['warning'] = __('Database seems to be empty!');
-        }
-
-        if (! $db_is_system_schema) {
-            $tabs['import']['link'] = 'db_import.php';
-            $tabs['import']['text'] = __('Import');
-            $tabs['import']['icon'] = 'b_import.png';
-
-            $tabs['operation']['link'] = 'db_operations.php';
-            $tabs['operation']['text'] = __('Operations');
-            $tabs['operation']['icon'] = 'b_tblops.png';
-
-            if (($is_superuser || $isCreateOrGrantUser)) {
-                $tabs['privileges']['link'] = 'server_privileges.php';
-                $tabs['privileges']['args']['checkprivsdb'] = $this->_db;
-                // stay on database view
-                $tabs['privileges']['args']['viewing_mode'] = 'db';
-                $tabs['privileges']['text'] = __('Privileges');
-                $tabs['privileges']['icon'] = 's_rights.png';
-            }
-
-            $tabs['routines']['link'] = 'db_routines.php';
-            $tabs['routines']['text'] = __('Routines');
-            $tabs['routines']['icon'] = 'b_routines.png';
-
-            if (Util::currentUserHasPrivilege('EVENT', $this->_db)) {
-                $tabs['events']['link'] = 'db_events.php';
-                $tabs['events']['text'] = __('Events');
-                $tabs['events']['icon'] = 'b_events.png';
-            }
-
-            if (Util::currentUserHasPrivilege('TRIGGER', $this->_db)) {
-                $tabs['triggers']['link'] = 'db_triggers.php';
-                $tabs['triggers']['text'] = __('Triggers');
-                $tabs['triggers']['icon'] = 'b_triggers.png';
-            }
-        }
-
-        if (Tracker::isActive() && ! $db_is_system_schema) {
-            $tabs['tracking']['text'] = __('Tracking');
-            $tabs['tracking']['icon'] = 'eye.png';
-            $tabs['tracking']['link'] = 'db_tracking.php';
-        }
-
-        if (! $db_is_system_schema) {
-            $tabs['designer']['text'] = __('Designer');
-            $tabs['designer']['icon'] = 'b_relations.png';
-            $tabs['designer']['link'] = 'db_designer.php';
-            $tabs['designer']['id'] = 'designer_tab';
-        }
-
-        if (! $db_is_system_schema
-            && $cfgRelation['centralcolumnswork']
-        ) {
-            $tabs['central_columns']['text'] = __('Central columns');
-            $tabs['central_columns']['icon'] = 'centralColumns.png';
-            $tabs['central_columns']['link'] = 'db_central_columns.php';
-        }
-        return $tabs;
-    }
-
-    /**
-     * Returns the server tabs as an array
-     *
-     * @return array Data for generating server tabs
-     */
-    private function _getServerTabs()
-    {
-        $is_superuser = $GLOBALS['dbi']->isSuperuser();
-        $isCreateOrGrantUser = $GLOBALS['dbi']->isUserType('grant')
-            || $GLOBALS['dbi']->isUserType('create');
-        if (Util::cacheExists('binary_logs')) {
-            $binary_logs = Util::cacheGet('binary_logs');
-        } else {
-            $binary_logs = $GLOBALS['dbi']->fetchResult(
-                'SHOW MASTER LOGS',
-                'Log_name',
-                null,
-                null,
-                DatabaseInterface::QUERY_STORE
-            );
-            Util::cacheSet('binary_logs', $binary_logs);
-        }
-
-        $tabs = array();
-
-        $tabs['databases']['icon'] = 's_db.png';
-        $tabs['databases']['link'] = 'server_databases.php';
-        $tabs['databases']['text'] = __('Databases');
-
-        $tabs['sql']['icon'] = 'b_sql.png';
-        $tabs['sql']['link'] = 'server_sql.php';
-        $tabs['sql']['text'] = __('SQL');
-
-        $tabs['status']['icon'] = 's_status.png';
-        $tabs['status']['link'] = 'server_status.php';
-        $tabs['status']['text'] = __('Status');
-        $tabs['status']['active'] = in_array(
-            basename($GLOBALS['PMA_PHP_SELF']),
-            array(
-                'server_status.php',
-                'server_status_advisor.php',
-                'server_status_monitor.php',
-                'server_status_queries.php',
-                'server_status_variables.php',
-                'server_status_processes.php'
-            )
-        );
-
-        if ($is_superuser || $isCreateOrGrantUser) {
-            $tabs['rights']['icon'] = 's_rights.png';
-            $tabs['rights']['link'] = 'server_privileges.php';
-            $tabs['rights']['text'] = __('User accounts');
-            $tabs['rights']['active'] = in_array(
-                basename($GLOBALS['PMA_PHP_SELF']),
-                array('server_privileges.php', 'server_user_groups.php')
-            );
-            $tabs['rights']['args']['viewing_mode'] = 'server';
-        }
-
-        $tabs['export']['icon'] = 'b_export.png';
-        $tabs['export']['link'] = 'server_export.php';
-        $tabs['export']['text'] = __('Export');
-
-        $tabs['import']['icon'] = 'b_import.png';
-        $tabs['import']['link'] = 'server_import.php';
-        $tabs['import']['text'] = __('Import');
-
-        $tabs['settings']['icon']   = 'b_tblops.png';
-        $tabs['settings']['link']   = 'prefs_manage.php';
-        $tabs['settings']['text']   = __('Settings');
-        $tabs['settings']['active'] = in_array(
-            basename($GLOBALS['PMA_PHP_SELF']),
-            array('prefs_forms.php', 'prefs_manage.php')
-        );
-
-        if (! empty($binary_logs)) {
-            $tabs['binlog']['icon'] = 's_tbl.png';
-            $tabs['binlog']['link'] = 'server_binlog.php';
-            $tabs['binlog']['text'] = __('Binary log');
-        }
-
-        if ($is_superuser) {
-            $tabs['replication']['icon'] = 's_replication.png';
-            $tabs['replication']['link'] = 'server_replication.php';
-            $tabs['replication']['text'] = __('Replication');
-        }
-
-        $tabs['vars']['icon'] = 's_vars.png';
-        $tabs['vars']['link'] = 'server_variables.php';
-        $tabs['vars']['text'] = __('Variables');
-
-        $tabs['charset']['icon'] = 's_asci.png';
-        $tabs['charset']['link'] = 'server_collations.php';
-        $tabs['charset']['text'] = __('Charsets');
-
-        $tabs['engine']['icon'] = 'b_engine.png';
-        $tabs['engine']['link'] = 'server_engines.php';
-        $tabs['engine']['text'] = __('Engines');
-
-        $tabs['plugins']['icon'] = 'b_plugin.png';
-        $tabs['plugins']['link'] = 'server_plugins.php';
-        $tabs['plugins']['text'] = __('Plugins');
-
-        return $tabs;
-    }
-
-    /**
-     * Set current table
-     *
-     * @param string $table Current table
-     *
-     * @return $this
-     */
-    public function setTable($table)
-    {
-        $this->_table = $table;
-        return $this;
-    }
-}
-
diff --git a/#pma/libraries/Message.php b/#pma/libraries/Message.php
deleted file mode 100644
index fefd50ff..00000000
--- a/#pma/libraries/Message.php
+++ /dev/null
@@ -1,782 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Holds class Message
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries;
-
-/**
- * a single message
- *
- * simple usage examples:
- * <code>
- * // display simple error message 'Error'
- * Message::error()->display();
- *
- * // get simple success message 'Success'
- * $message = Message::success();
- *
- * // get special notice
- * $message = Message::notice(__('This is a localized notice'));
- * </code>
- *
- * more advanced usage example:
- * <code>
- * // create a localized success message
- * $message = Message::success('strSomeLocaleMessage');
- *
- * // create another message, a hint, with a localized string which expects
- * // two parameters: $strSomeTooltip = 'Read the %smanual%s'
- * $hint = Message::notice('strSomeTooltip');
- * // replace placeholders with the following params
- * $hint->addParam('[doc@cfg_Example]');
- * $hint->addParam('[/doc]');
- * // add this hint as a tooltip
- * $hint = showHint($hint);
- *
- * // add the retrieved tooltip reference to the original message
- * $message->addMessage($hint);
- *
- * // create another message ...
- * $more = Message::notice('strSomeMoreLocale');
- * $more->addString('strSomeEvenMoreLocale', '<br />');
- * $more->addParam('parameter for strSomeMoreLocale');
- * $more->addParam('more parameter for strSomeMoreLocale');
- *
- * // and add it also to the original message
- * $message->addMessage($more);
- * // finally add another raw message
- * $message->addMessage('some final words', ' - ');
- *
- * // display() will now print all messages in the same order as they are added
- * $message->display();
- * // strSomeLocaleMessage <sup>1</sup> strSomeMoreLocale<br />
- * // strSomeEvenMoreLocale - some final words
- * </code>
- *
- * @package PhpMyAdmin
- */
-class Message
-{
-    const SUCCESS = 1; // 0001
-    const NOTICE  = 2; // 0010
-    const ERROR   = 8; // 1000
-
-    const SANITIZE_NONE   = 0;  // 0000 0000
-    const SANITIZE_STRING = 16; // 0001 0000
-    const SANITIZE_PARAMS = 32; // 0010 0000
-    const SANITIZE_BOOTH  = 48; // 0011 0000
-
-    /**
-     * message levels
-     *
-     * @var array
-     */
-    static public $level = array (
-        Message::SUCCESS => 'success',
-        Message::NOTICE  => 'notice',
-        Message::ERROR   => 'error',
-    );
-
-    /**
-     * The message number
-     *
-     * @access  protected
-     * @var     integer
-     */
-    protected $number = Message::NOTICE;
-
-    /**
-     * The locale string identifier
-     *
-     * @access  protected
-     * @var     string
-     */
-    protected $string = '';
-
-    /**
-     * The formatted message
-     *
-     * @access  protected
-     * @var     string
-     */
-    protected $message = '';
-
-    /**
-     * Whether the message was already displayed
-     *
-     * @access  protected
-     * @var     boolean
-     */
-    protected $isDisplayed = false;
-
-    /**
-     * Whether to use BB code when displaying.
-     *
-     * @access  protected
-     * @var     boolean
-     */
-    protected $useBBCode = true;
-
-    /**
-     * Unique id
-     *
-     * @access  protected
-     * @var string
-     */
-    protected $hash = null;
-
-    /**
-     * holds parameters
-     *
-     * @access  protected
-     * @var     array
-     */
-    protected $params = array();
-
-    /**
-     * holds additional messages
-     *
-     * @access  protected
-     * @var     array
-     */
-    protected $addedMessages = array();
-
-    /**
-     * Constructor
-     *
-     * @param string  $string   The message to be displayed
-     * @param integer $number   A numeric representation of the type of message
-     * @param array   $params   An array of parameters to use in the message
-     * @param integer $sanitize A flag to indicate what to sanitize, see
-     *                          constant definitions above
-     */
-    public function __construct($string = '', $number = Message::NOTICE,
-        $params = array(), $sanitize = Message::SANITIZE_NONE
-    ) {
-        $this->setString($string, $sanitize & Message::SANITIZE_STRING);
-        $this->setNumber($number);
-        $this->setParams($params, $sanitize & Message::SANITIZE_PARAMS);
-    }
-
-    /**
-     * magic method: return string representation for this object
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->getMessage();
-    }
-
-    /**
-     * get Message of type success
-     *
-     * shorthand for getting a simple success message
-     *
-     * @param string $string A localized string
-     *                       e.g. __('Your SQL query has been
-     *                       executed successfully')
-     *
-     * @return Message
-     * @static
-     */
-    static public function success($string = '')
-    {
-        if (empty($string)) {
-            $string = __('Your SQL query has been executed successfully.');
-        }
-
-        return new Message($string, Message::SUCCESS);
-    }
-
-    /**
-     * get Message of type error
-     *
-     * shorthand for getting a simple error message
-     *
-     * @param string $string A localized string e.g. __('Error')
-     *
-     * @return Message
-     * @static
-     */
-    static public function error($string = '')
-    {
-        if (empty($string)) {
-            $string = __('Error');
-        }
-
-        return new Message($string, Message::ERROR);
-    }
-
-    /**
-     * get Message of type notice
-     *
-     * shorthand for getting a simple notice message
-     *
-     * @param string $string A localized string
-     *                       e.g. __('The additional features for working with
-     *                       linked tables have been deactivated. To find out
-     *                       why click %shere%s.')
-     *
-     * @return Message
-     * @static
-     */
-    static public function notice($string)
-    {
-        return new Message($string, Message::NOTICE);
-    }
-
-    /**
-     * get Message with customized content
-     *
-     * shorthand for getting a customized message
-     *
-     * @param string  $message A localized string
-     * @param integer $type    A numeric representation of the type of message
-     *
-     * @return Message
-     * @static
-     */
-    static public function raw($message, $type = Message::NOTICE)
-    {
-        $r = new Message('', $type);
-        $r->setMessage($message);
-        $r->setBBCode(false);
-        return $r;
-    }
-
-    /**
-     * get Message for number of affected rows
-     *
-     * shorthand for getting a customized message
-     *
-     * @param integer $rows Number of rows
-     *
-     * @return Message
-     * @static
-     */
-    static public function getMessageForAffectedRows($rows)
-    {
-        $message = Message::success(
-            _ngettext('%1$d row affected.', '%1$d rows affected.', $rows)
-        );
-        $message->addParam($rows);
-        return $message;
-    }
-
-    /**
-     * get Message for number of deleted rows
-     *
-     * shorthand for getting a customized message
-     *
-     * @param integer $rows Number of rows
-     *
-     * @return Message
-     * @static
-     */
-    static public function getMessageForDeletedRows($rows)
-    {
-        $message = Message::success(
-            _ngettext('%1$d row deleted.', '%1$d rows deleted.', $rows)
-        );
-        $message->addParam($rows);
-        return $message;
-    }
-
-    /**
-     * get Message for number of inserted rows
-     *
-     * shorthand for getting a customized message
-     *
-     * @param integer $rows Number of rows
-     *
-     * @return Message
-     * @static
-     */
-    static public function getMessageForInsertedRows($rows)
-    {
-        $message = Message::success(
-            _ngettext('%1$d row inserted.', '%1$d rows inserted.', $rows)
-        );
-        $message->addParam($rows);
-        return $message;
-    }
-
-    /**
-     * get Message of type error with custom content
-     *
-     * shorthand for getting a customized error message
-     *
-     * @param string $message A localized string
-     *
-     * @return Message
-     * @static
-     */
-    static public function rawError($message)
-    {
-        return Message::raw($message, Message::ERROR);
-    }
-
-    /**
-     * get Message of type notice with custom content
-     *
-     * shorthand for getting a customized notice message
-     *
-     * @param string $message A localized string
-     *
-     * @return Message
-     * @static
-     */
-    static public function rawNotice($message)
-    {
-        return Message::raw($message, Message::NOTICE);
-    }
-
-    /**
-     * get Message of type success with custom content
-     *
-     * shorthand for getting a customized success message
-     *
-     * @param string $message A localized string
-     *
-     * @return Message
-     * @static
-     */
-    static public function rawSuccess($message)
-    {
-        return Message::raw($message, Message::SUCCESS);
-    }
-
-    /**
-     * returns whether this message is a success message or not
-     * and optionally makes this message a success message
-     *
-     * @param boolean $set Whether to make this message of SUCCESS type
-     *
-     * @return boolean whether this is a success message or not
-     */
-    public function isSuccess($set = false)
-    {
-        if ($set) {
-            $this->setNumber(Message::SUCCESS);
-        }
-
-        return $this->getNumber() === Message::SUCCESS;
-    }
-
-    /**
-     * returns whether this message is a notice message or not
-     * and optionally makes this message a notice message
-     *
-     * @param boolean $set Whether to make this message of NOTICE type
-     *
-     * @return boolean whether this is a notice message or not
-     */
-    public function isNotice($set = false)
-    {
-        if ($set) {
-            $this->setNumber(Message::NOTICE);
-        }
-
-        return $this->getNumber() === Message::NOTICE;
-    }
-
-    /**
-     * returns whether this message is an error message or not
-     * and optionally makes this message an error message
-     *
-     * @param boolean $set Whether to make this message of ERROR type
-     *
-     * @return boolean Whether this is an error message or not
-     */
-    public function isError($set = false)
-    {
-        if ($set) {
-            $this->setNumber(Message::ERROR);
-        }
-
-        return $this->getNumber() === Message::ERROR;
-    }
-
-    /**
-     * Set whether we should use BB Code when rendering.
-     *
-     * @param boolean $useBBCode Use BB Code?
-     *
-     * @return void
-     */
-    public function setBBCode($useBBCode)
-    {
-        $this->useBBCode = $useBBCode;
-    }
-
-    /**
-     * set raw message (overrides string)
-     *
-     * @param string  $message  A localized string
-     * @param boolean $sanitize Whether to sanitize $message or not
-     *
-     * @return void
-     */
-    public function setMessage($message, $sanitize = false)
-    {
-        if ($sanitize) {
-            $message = Message::sanitize($message);
-        }
-        $this->message = $message;
-    }
-
-    /**
-     * set string (does not take effect if raw message is set)
-     *
-     * @param string  $string   string to set
-     * @param boolean $sanitize whether to sanitize $string or not
-     *
-     * @return void
-     */
-    public function setString($string, $sanitize = true)
-    {
-        if ($sanitize) {
-            $string = Message::sanitize($string);
-        }
-        $this->string = $string;
-    }
-
-    /**
-     * set message type number
-     *
-     * @param integer $number message type number to set
-     *
-     * @return void
-     */
-    public function setNumber($number)
-    {
-        $this->number = $number;
-    }
-
-    /**
-     * add parameter, usually in conjunction with strings
-     *
-     * usage
-     * <code>
-     * $message->addParam('strLocale', false);
-     * $message->addParam('[em]some string[/em]');
-     * $message->addParam('<img src="img" />', false);
-     * </code>
-     *
-     * @param mixed   $param parameter to add
-     * @param boolean $raw   whether parameter should be passed as is
-     *                       without html escaping
-     *
-     * @return void
-     */
-    public function addParam($param, $raw = true)
-    {
-        if ($param instanceof Message) {
-            $this->params[] = $param;
-        } elseif ($raw) {
-            $this->params[] = htmlspecialchars($param);
-        } else {
-            $this->params[] = Message::notice($param);
-        }
-    }
-
-    /**
-     * add another string to be concatenated on displaying
-     *
-     * @param string $string    to be added
-     * @param string $separator to use between this and previous string/message
-     *
-     * @return void
-     */
-    public function addString($string, $separator = ' ')
-    {
-        $this->addedMessages[] = $separator;
-        $this->addedMessages[] = Message::notice($string);
-    }
-
-    /**
-     * add a bunch of messages at once
-     *
-     * @param array  $messages  to be added
-     * @param string $separator to use between this and previous string/message
-     *
-     * @return void
-     */
-    public function addMessages($messages, $separator = ' ')
-    {
-        foreach ($messages as $message) {
-            $this->addMessage($message, $separator);
-        }
-    }
-
-    /**
-     * add another raw message to be concatenated on displaying
-     *
-     * @param mixed  $message   to be added
-     * @param string $separator to use between this and previous string/message
-     *
-     * @return void
-     */
-    public function addMessage($message, $separator = ' ')
-    {
-        if (mb_strlen($separator)) {
-            $this->addedMessages[] = $separator;
-        }
-
-        if ($message instanceof Message) {
-            $this->addedMessages[] = $message;
-        } else {
-            $this->addedMessages[] = Message::rawNotice($message);
-        }
-    }
-
-    /**
-     * set all params at once, usually used in conjunction with string
-     *
-     * @param array|string $params   parameters to set
-     * @param boolean      $sanitize whether to sanitize params
-     *
-     * @return void
-     */
-    public function setParams($params, $sanitize = false)
-    {
-        if ($sanitize) {
-            $params = Message::sanitize($params);
-        }
-        $this->params = $params;
-    }
-
-    /**
-     * return all parameters
-     *
-     * @return array
-     */
-    public function getParams()
-    {
-        return $this->params;
-    }
-
-    /**
-     * return all added messages
-     *
-     * @return array
-     */
-    public function getAddedMessages()
-    {
-        return $this->addedMessages;
-    }
-
-    /**
-     * Sanitizes $message
-     *
-     * @param mixed $message the message(s)
-     *
-     * @return mixed  the sanitized message(s)
-     * @access  public
-     * @static
-     */
-    static public function sanitize($message)
-    {
-        if (is_array($message)) {
-            foreach ($message as $key => $val) {
-                $message[$key] = Message::sanitize($val);
-            }
-
-            return $message;
-        }
-
-        return htmlspecialchars($message);
-    }
-
-    /**
-     * decode $message, taking into account our special codes
-     * for formatting
-     *
-     * @param string $message the message
-     *
-     * @return string  the decoded message
-     * @access  public
-     * @static
-     */
-    static public function decodeBB($message)
-    {
-        return PMA_sanitize($message, false, true);
-    }
-
-    /**
-     * wrapper for sprintf()
-     *
-     * @return string formatted
-     */
-    static public function format()
-    {
-        $params = func_get_args();
-        if (isset($params[1]) && is_array($params[1])) {
-            array_unshift($params[1], $params[0]);
-            $params = $params[1];
-        }
-
-        return call_user_func_array('sprintf', $params);
-    }
-
-    /**
-     * returns unique Message::$hash, if not exists it will be created
-     *
-     * @return string Message::$hash
-     */
-    public function getHash()
-    {
-        if (null === $this->hash) {
-            $this->hash = md5(
-                $this->getNumber() .
-                $this->string .
-                $this->message
-            );
-        }
-
-        return $this->hash;
-    }
-
-    /**
-     * returns compiled message
-     *
-     * @return string complete message
-     */
-    public function getMessage()
-    {
-        $message = $this->message;
-
-        if (0 === mb_strlen($message)) {
-            $string = $this->getString();
-            if (isset($GLOBALS[$string])) {
-                $message = $GLOBALS[$string];
-            } elseif (0 === mb_strlen($string)) {
-                $message = '';
-            } else {
-                $message = $string;
-            }
-        }
-
-        if ($this->isDisplayed()) {
-            $message = $this->getMessageWithIcon($message);
-        }
-        if (count($this->getParams()) > 0) {
-            $message = Message::format($message, $this->getParams());
-        }
-
-        if ($this->useBBCode) {
-            $message = Message::decodeBB($message);
-        }
-
-        foreach ($this->getAddedMessages() as $add_message) {
-            $message .= $add_message;
-        }
-
-        return $message;
-    }
-
-    /**
-    * Returns only message string without image & other HTML.
-    *
-    * @return string
-    */
-    public function getOnlyMessage()
-    {
-        return $this->message;
-    }
-
-
-    /**
-     * returns Message::$string
-     *
-     * @return string Message::$string
-     */
-    public function getString()
-    {
-        return $this->string;
-    }
-
-    /**
-     * returns Message::$number
-     *
-     * @return integer Message::$number
-     */
-    public function getNumber()
-    {
-        return $this->number;
-    }
-
-    /**
-     * returns level of message
-     *
-     * @return string  level of message
-     */
-    public function getLevel()
-    {
-        return Message::$level[$this->getNumber()];
-    }
-
-    /**
-     * Displays the message in HTML
-     *
-     * @return void
-     */
-    public function display()
-    {
-        echo $this->getDisplay();
-        $this->isDisplayed(true);
-    }
-
-    /**
-     * returns HTML code for displaying this message
-     *
-     * @return string whole message box
-     */
-    public function getDisplay()
-    {
-        $this->isDisplayed(true);
-        return '<div class="' . $this->getLevel() . '">'
-            . $this->getMessage() . '</div>';
-    }
-
-    /**
-     * sets and returns whether the message was displayed or not
-     *
-     * @param boolean $isDisplayed whether to set displayed flag
-     *
-     * @return boolean Message::$isDisplayed
-     */
-    public function isDisplayed($isDisplayed = false)
-    {
-        if ($isDisplayed) {
-            $this->isDisplayed = true;
-        }
-
-        return $this->isDisplayed;
-    }
-
-    /**
-     * Returns the message with corresponding image icon
-     *
-     * @param string $message the message(s)
-     *
-     * @return string message with icon
-     */
-    public function getMessageWithIcon($message)
-    {
-        if ('error' == $this->getLevel()) {
-            $image = 's_error.png';
-        } elseif ('success' == $this->getLevel()) {
-            $image = 's_success.png';
-        } else {
-            $image = 's_notice.png';
-        }
-        $message = Message::notice(Util::getImage($image)) . " " . $message;
-        return $message;
-
-    }
-}
diff --git a/#pma/libraries/OutputBuffering.php b/#pma/libraries/OutputBuffering.php
deleted file mode 100644
index f232cf2b..00000000
--- a/#pma/libraries/OutputBuffering.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php /* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Output buffering wrapper
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries;
-
-/**
- * Output buffering wrapper class
- *
- * @package PhpMyAdmin
- */
-class OutputBuffering
-{
-    private static $_instance;
-    private $_mode;
-    private $_content;
-    private $_on;
-
-    /**
-     * Initializes class
-     */
-    private function __construct()
-    {
-        $this->_mode = $this->_getMode();
-        $this->_on = false;
-    }
-
-    /**
-     * This function could be used eventually to support more modes.
-     *
-     * @return integer  the output buffer mode
-     */
-    private function _getMode()
-    {
-        $mode = 0;
-        if ($GLOBALS['cfg']['OBGzip'] && function_exists('ob_start')) {
-            if (ini_get('output_handler') == 'ob_gzhandler') {
-                // If a user sets the output_handler in php.ini to ob_gzhandler, then
-                // any right frame file in phpMyAdmin will not be handled properly by
-                // the browser. My fix was to check the ini file within the
-                // PMA_outBufferModeGet() function.
-                $mode = 0;
-            } elseif (function_exists('ob_get_level') && ob_get_level() > 0) {
-                // happens when php.ini's output_buffering is not Off
-                ob_end_clean();
-                $mode = 1;
-            } else {
-                $mode = 1;
-            }
-        }
-        // Zero (0) is no mode or in other words output buffering is OFF.
-        // Follow 2^0, 2^1, 2^2, 2^3 type values for the modes.
-        // Useful if we ever decide to combine modes.  Then a bitmask field of
-        // the sum of all modes will be the natural choice.
-        return $mode;
-    }
-
-    /**
-     * Returns the singleton OutputBuffering object
-     *
-     * @return OutputBuffering object
-     */
-    public static function getInstance()
-    {
-        if (empty(self::$_instance)) {
-            self::$_instance = new OutputBuffering();
-        }
-        return self::$_instance;
-    }
-
-    /**
-     * This function will need to run at the top of all pages if output
-     * output buffering is turned on.  It also needs to be passed $mode from
-     * the PMA_outBufferModeGet() function or it will be useless.
-     *
-     * @return void
-     */
-    public function start()
-    {
-        if (! $this->_on) {
-            if ($this->_mode && function_exists('ob_gzhandler')) {
-                ob_start('ob_gzhandler');
-            }
-            ob_start();
-            if (! defined('TESTSUITE')) {
-                header('X-ob_mode: ' . $this->_mode);
-            }
-            register_shutdown_function(
-                array('PMA\libraries\OutputBuffering', 'stop')
-            );
-            $this->_on = true;
-        }
-    }
-
-    /**
-     * This function will need to run at the bottom of all pages if output
-     * buffering is turned on.  It also needs to be passed $mode from the
-     * PMA_outBufferModeGet() function or it will be useless.
-     *
-     * @return void
-     */
-    public static function stop()
-    {
-        $buffer = OutputBuffering::getInstance();
-        if ($buffer->_on) {
-            $buffer->_on = false;
-            $buffer->_content = ob_get_contents();
-            ob_end_clean();
-        }
-    }
-
-    /**
-     * Gets buffer content
-     *
-     * @return string buffer content
-     */
-    public function getContents()
-    {
-        return $this->_content;
-    }
-
-    /**
-     * Flushes output buffer
-     *
-     * @return void
-     */
-    public function flush()
-    {
-        if (ob_get_status() && $this->_mode) {
-            ob_flush();
-        } else {
-            flush();
-        }
-    }
-}
-
diff --git a/#pma/libraries/PDF.php b/#pma/libraries/PDF.php
deleted file mode 100644
index fb690c6f..00000000
--- a/#pma/libraries/PDF.php
+++ /dev/null
@@ -1,150 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * TCPDF wrapper class.
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries;
-
-use TCPDF;
-use TCPDF_FONTS;
-
-require_once TCPDF_INC;
-
-/**
- * PDF export base class providing basic configuration.
- *
- * @package PhpMyAdmin
- */
-class PDF extends TCPDF
-{
-    var $footerset;
-    var $Alias = array();
-
-    /**
-     * PDF font to use.
-     */
-    const PMA_PDF_FONT = 'DejaVuSans';
-
-    /**
-     * Constructs PDF and configures standard parameters.
-     *
-     * @param string  $orientation page orientation
-     * @param string  $unit        unit
-     * @param string  $format      the format used for pages
-     * @param boolean $unicode     true means that the input text is unicode
-     * @param string  $encoding    charset encoding; default is UTF-8.
-     * @param boolean $diskcache   if true reduce the RAM memory usage by caching
-     *                             temporary data on filesystem (slower).
-     * @param boolean $pdfa        If TRUE set the document to PDF/A mode.
-     *
-     * @access public
-     */
-    public function __construct($orientation = 'P', $unit = 'mm', $format = 'A4',
-        $unicode = true, $encoding = 'UTF-8', $diskcache = false, $pdfa=false
-    ) {
-        parent::__construct(
-            $orientation, $unit, $format, $unicode,
-            $encoding, $diskcache, $pdfa
-        );
-        $this->SetAuthor('phpMyAdmin ' . PMA_VERSION);
-        $this->AddFont('DejaVuSans', '', 'dejavusans.php');
-        $this->AddFont('DejaVuSans', 'B', 'dejavusansb.php');
-        $this->SetFont(PDF::PMA_PDF_FONT, '', 14);
-        $this->setFooterFont(array(PDF::PMA_PDF_FONT, '', 14));
-    }
-
-    /**
-     * This function must be named "Footer" to work with the TCPDF library
-     *
-     * @return void
-     */
-    public function Footer()
-    {
-        // Check if footer for this page already exists
-        if (!isset($this->footerset[$this->page])) {
-            $this->SetY(-15);
-            $this->SetFont(PDF::PMA_PDF_FONT, '', 14);
-            $this->Cell(
-                0, 6,
-                __('Page number:') . ' '
-                . $this->getAliasNumPage() . '/' .  $this->getAliasNbPages(),
-                'T', 0, 'C'
-            );
-            $this->Cell(0, 6, Util::localisedDate(), 0, 1, 'R');
-            $this->SetY(20);
-
-            // set footerset
-            $this->footerset[$this->page] = 1;
-        }
-    }
-
-    /**
-     * Function to set alias which will be expanded on page rendering.
-     *
-     * @param string $name  name of the alias
-     * @param string $value value of the alias
-     *
-     * @return void
-     */
-    public function SetAlias($name, $value)
-    {
-        $name = TCPDF_FONTS::UTF8ToUTF16BE(
-            $name, false, true, $this->CurrentFont
-        );
-        $this->Alias[$name] = TCPDF_FONTS::UTF8ToUTF16BE(
-            $value, false, true, $this->CurrentFont
-        );
-    }
-
-    /**
-     * Improved with alias expanding.
-     *
-     * @return void
-     */
-    public function _putpages()
-    {
-        if (count($this->Alias) > 0) {
-            $nbPages = count($this->pages);
-            for ($n = 1; $n <= $nbPages; $n++) {
-                $this->pages[$n] = strtr($this->pages[$n], $this->Alias);
-            }
-        }
-        parent::_putpages();
-    }
-
-    /**
-     * Displays an error message
-     *
-     * @param string $error_message the error message
-     *
-     * @return void
-     */
-    public function Error($error_message = '')
-    {
-        Message::error(
-            __('Error while creating PDF:') . ' ' . $error_message
-        )->display();
-        exit;
-    }
-
-    /**
-     * Sends file as a download to user.
-     *
-     * @param string $filename file name
-     *
-     * @return void
-     */
-    public function Download($filename)
-    {
-        $pdfData = $this->getPDFData();
-        Response::getInstance()->disable();
-        PMA_downloadHeader(
-            $filename,
-            'application/pdf',
-            strlen($pdfData)
-        );
-        echo $pdfData;
-    }
-}
diff --git a/#pma/libraries/Partition.php b/#pma/libraries/Partition.php
deleted file mode 100644
index 141dcb7b..00000000
--- a/#pma/libraries/Partition.php
+++ /dev/null
@@ -1,264 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Library for extracting information about the partitions
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries;
-
-/**
- * base Partition Class
- *
- * @package PhpMyAdmin
- */
-class Partition extends SubPartition
-{
-    /**
-     * @var string partition description
-     */
-    protected $description;
-    /**
-     * @var SubPartition[] sub partitions
-     */
-    protected $subPartitions = array();
-
-    /**
-     * Loads data from the fetched row from information_schema.PARTITIONS
-     *
-     * @param array $row fetched row
-     *
-     * @return void
-     */
-    protected function loadData($row)
-    {
-        $this->name = $row['PARTITION_NAME'];
-        $this->ordinal = $row['PARTITION_ORDINAL_POSITION'];
-        $this->method = $row['PARTITION_METHOD'];
-        $this->expression = $row['PARTITION_EXPRESSION'];
-        $this->description = $row['PARTITION_DESCRIPTION'];
-        // no sub partitions, load all data to this object
-        if (empty($row['SUBPARTITION_NAME'])) {
-            $this->loadCommonData($row);
-        }
-    }
-
-    /**
-     * Returns the partiotion description
-     *
-     * @return string partition description
-     */
-    public function getDescription()
-    {
-        return $this->description;
-    }
-
-    /**
-     * Add a sub partition
-     *
-     * @param SubPartition $partition Sub partition
-     *
-     * @return void
-     */
-    public function addSubPartition(SubPartition $partition)
-    {
-        $this->subPartitions[] = $partition;
-    }
-
-    /**
-     * Whether there are sub partitions
-     *
-     * @return boolean
-     */
-    public function hasSubPartitions()
-    {
-        return ! empty($this->subPartitions);
-    }
-
-    /**
-     * Returns the number of data rows
-     *
-     * @return integer number of rows
-     */
-    public function getRows()
-    {
-        if (empty($this->subPartitions)) {
-            return $this->rows;
-        } else {
-            $rows = 0;
-            foreach ($this->subPartitions as $subPartition) {
-                $rows += $subPartition->rows;
-            }
-            return $rows;
-        }
-    }
-
-    /**
-     * Returns the total data length
-     *
-     * @return integer data length
-     */
-    public function getDataLength()
-    {
-        if (empty($this->subPartitions)) {
-            return $this->dataLength;
-        } else {
-            $dataLength = 0;
-            foreach ($this->subPartitions as $subPartition) {
-                $dataLength += $subPartition->dataLength;
-            }
-            return $dataLength;
-        }
-    }
-
-    /**
-     * Returns the tatal index length
-     *
-     * @return integer index length
-     */
-    public function getIndexLength()
-    {
-        if (empty($this->subPartitions)) {
-            return $this->indexLength;
-        } else {
-            $indexLength = 0;
-            foreach ($this->subPartitions as $subPartition) {
-                $indexLength += $subPartition->indexLength;
-            }
-            return $indexLength;
-        }
-    }
-
-    /**
-     * Returns the list of sub partitions
-     *
-     * @return SubPartition[]
-     */
-    public function getSubPartitions()
-    {
-        return $this->subPartitions;
-    }
-
-    /**
-     * Returns array of partitions for a specific db/table
-     *
-     * @param string $db    database name
-     * @param string $table table name
-     *
-     * @access  public
-     * @return Partition[]
-     */
-    static public function getPartitions($db, $table)
-    {
-        if (Partition::havePartitioning()) {
-            $result = $GLOBALS['dbi']->fetchResult(
-                "SELECT * FROM `information_schema`.`PARTITIONS`"
-                . " WHERE `TABLE_SCHEMA` = '" . $GLOBALS['dbi']->escapeString($db)
-                . "' AND `TABLE_NAME` = '" . $GLOBALS['dbi']->escapeString($table) . "'"
-            );
-            if ($result) {
-                $partitionMap = array();
-                foreach ($result as $row) {
-                    if (isset($partitionMap[$row['PARTITION_NAME']])) {
-                        $partition = $partitionMap[$row['PARTITION_NAME']];
-                    } else {
-                        $partition = new Partition($row);
-                        $partitionMap[$row['PARTITION_NAME']] = $partition;
-                    }
-
-                    if (! empty($row['SUBPARTITION_NAME'])) {
-                        $parentPartition = $partition;
-                        $partition = new SubPartition($row);
-                        $parentPartition->addSubPartition($partition);
-                    }
-                }
-                return array_values($partitionMap);
-            }
-            return array();
-        } else {
-            return array();
-        }
-    }
-
-    /**
-     * returns array of partition names for a specific db/table
-     *
-     * @param string $db    database name
-     * @param string $table table name
-     *
-     * @access  public
-     * @return array   of partition names
-     */
-    static public function getPartitionNames($db, $table)
-    {
-        if (Partition::havePartitioning()) {
-            return $GLOBALS['dbi']->fetchResult(
-                "SELECT DISTINCT `PARTITION_NAME` FROM `information_schema`.`PARTITIONS`"
-                . " WHERE `TABLE_SCHEMA` = '" . $GLOBALS['dbi']->escapeString($db)
-                . "' AND `TABLE_NAME` = '" . $GLOBALS['dbi']->escapeString($table) . "'"
-            );
-        } else {
-            return array();
-        }
-    }
-
-    /**
-     * returns the partition method used by the table.
-     *
-     * @param string $db    database name
-     * @param string $table table name
-     *
-     * @return string partition method
-     */
-    static public function getPartitionMethod($db, $table)
-    {
-        if (Partition::havePartitioning()) {
-            $partition_method = $GLOBALS['dbi']->fetchResult(
-                "SELECT `PARTITION_METHOD` FROM `information_schema`.`PARTITIONS`"
-                . " WHERE `TABLE_SCHEMA` = '" . $GLOBALS['dbi']->escapeString($db) . "'"
-                . " AND `TABLE_NAME` = '" . $GLOBALS['dbi']->escapeString($table) . "'"
-                . " LIMIT 1"
-            );
-            if (! empty($partition_method)) {
-                return $partition_method[0];
-            }
-        }
-        return null;
-    }
-
-    /**
-     * checks if MySQL server supports partitioning
-     *
-     * @static
-     * @staticvar boolean $have_partitioning
-     * @staticvar boolean $already_checked
-     * @access  public
-     * @return boolean
-     */
-    static public function havePartitioning()
-    {
-        static $have_partitioning = false;
-        static $already_checked = false;
-
-        if (! $already_checked) {
-            if (PMA_MYSQL_INT_VERSION < 50600) {
-                if ($GLOBALS['dbi']->fetchValue(
-                    "SELECT @@have_partitioning;"
-                )) {
-                    $have_partitioning = true;
-                }
-            } else {
-                // see https://dev.mysql.com/doc/refman/5.6/en/partitioning.html
-                $plugins = $GLOBALS['dbi']->fetchResult("SHOW PLUGINS");
-                foreach ($plugins as $value) {
-                    if ($value['Name'] == 'partition') {
-                        $have_partitioning = true;
-                        break;
-                    }
-                }
-            }
-            $already_checked = true;
-        }
-        return $have_partitioning;
-    }
-}
diff --git a/#pma/libraries/Psr4Autoloader.php b/#pma/libraries/Psr4Autoloader.php
deleted file mode 100644
index e62d9797..00000000
--- a/#pma/libraries/Psr4Autoloader.php
+++ /dev/null
@@ -1,171 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Holds the Autoloader class
- *
- * @package PhpMyAdmin
- */
-
-namespace PMA;
-
-/**
- * Holds the Autoloader class
- *
- * @package PhpMyAdmin
- */
-class Psr4Autoloader
-{
-    protected static $instance = null;
-    /**
-     * An associative array where the key is a namespace prefix and the value
-     * is an array of base directories for classes in that namespace.
-     *
-     * @var array
-     */
-    protected $prefixes = array();
-
-    /**
-     * Get instance
-     *
-     * @return Psr4Autoloader
-     */
-    public static function getInstance()
-    {
-        if (null === self::$instance) {
-            self::$instance = new self();
-        }
-        return self::$instance;
-    }
-
-    /**
-     * Register loader with SPL autoloader stack.
-     *
-     * @return void
-     */
-    public function register()
-    {
-        spl_autoload_register(array($this, 'loadClass'));
-    }
-
-    /**
-     * Adds a base directory for a namespace prefix.
-     *
-     * @param string $prefix   The namespace prefix.
-     * @param string $base_dir A base directory for class files in the
-     *                         namespace.
-     * @param bool   $prepend  If true, prepend the base directory to the stack
-     *                         instead of appending it; this causes it to be
-     *                         searched first rather than last.
-     *
-     * @return void
-     */
-    public function addNamespace($prefix, $base_dir, $prepend = false)
-    {
-        // normalize namespace prefix
-        $prefix = trim($prefix, '\\') . '\\';
-
-        // normalize the base directory with a trailing separator
-        $base_dir = rtrim($base_dir, DIRECTORY_SEPARATOR) . '/';
-
-        // initialize the namespace prefix array
-        if (isset($this->prefixes[$prefix]) === false) {
-            $this->prefixes[$prefix] = array();
-        }
-
-        // retain the base directory for the namespace prefix
-        if ($prepend) {
-            array_unshift($this->prefixes[$prefix], $base_dir);
-        } else {
-            array_push($this->prefixes[$prefix], $base_dir);
-        }
-    }
-
-    /**
-     * Loads the class file for a given class name.
-     *
-     * @param string $class The fully-qualified class name.
-     *
-     * @return mixed The mapped file name on success, or boolean false on
-     * failure.
-     */
-    public function loadClass($class)
-    {
-        // the current namespace prefix
-        $prefix = $class;
-
-        // work backwards through the namespace names of the fully-qualified
-        // class name to find a mapped file name
-        while (false !== $pos = strrpos($prefix, '\\')) {
-            // retain the trailing namespace separator in the prefix
-            $prefix = substr($class, 0, $pos + 1);
-
-            // the rest is the relative class name
-            $relative_class = substr($class, $pos + 1);
-
-            // try to load a mapped file for the prefix and relative class
-            $mapped_file = $this->loadMappedFile($prefix, $relative_class);
-            if ($mapped_file) {
-                return $mapped_file;
-            }
-
-            // remove the trailing namespace separator for the next iteration
-            // of strrpos()
-            $prefix = rtrim($prefix, '\\');
-        }
-
-        // never found a mapped file
-        return false;
-    }
-
-    /**
-     * Load the mapped file for a namespace prefix and relative class.
-     *
-     * @param string $prefix         The namespace prefix.
-     * @param string $relative_class The relative class name.
-     *
-     * @return mixed Boolean false if no mapped file can be loaded, or the
-     * name of the mapped file that was loaded.
-     */
-    protected function loadMappedFile($prefix, $relative_class)
-    {
-        // are there any base directories for this namespace prefix?
-        if (isset($this->prefixes[$prefix]) === false) {
-            return false;
-        }
-
-        // look through base directories for this namespace prefix
-        foreach ($this->prefixes[$prefix] as $base_dir) {
-            // replace the namespace prefix with the base directory,
-            // replace namespace separators with directory separators
-            // in the relative class name, append with .php
-            $file = $base_dir
-                . str_replace('\\', '/', $relative_class)
-                . '.php';
-
-            // if the mapped file exists, require it
-            if ($this->requireFile($file)) {
-                // yes, we're done
-                return $file;
-            }
-        }
-
-        // never found it
-        return false;
-    }
-
-    /**
-     * If a file exists, require it from the file system.
-     *
-     * @param string $file The file to require.
-     *
-     * @return bool True if the file exists, false if not.
-     */
-    protected function requireFile($file)
-    {
-        if (file_exists($file)) {
-            include $file;
-            return true;
-        }
-        return false;
-    }
-}
\ No newline at end of file
diff --git a/#pma/libraries/RecentFavoriteTable.php b/#pma/libraries/RecentFavoriteTable.php
deleted file mode 100644
index 5c209bfe..00000000
--- a/#pma/libraries/RecentFavoriteTable.php
+++ /dev/null
@@ -1,390 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Recent and Favorite table list handling
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries;
-
-/**
- * Handles the recently used and favorite tables.
- *
- * @TODO Change the release version in table pma_recent
- * (#recent in documentation)
- *
- * @package PhpMyAdmin
- */
-class RecentFavoriteTable
-{
-    /**
-     * Reference to session variable containing recently used or favorite tables.
-     *
-     * @access private
-     * @var array
-     */
-    private $_tables;
-
-    /**
-     * Defines type of action, Favorite or Recent table.
-     *
-     * @access private
-     * @var string
-     */
-    private $_tableType;
-
-    /**
-     * RecentFavoriteTable instances.
-     *
-     * @access private
-     * @var array
-     */
-    private static $_instances = array();
-
-    /**
-     * Creates a new instance of RecentFavoriteTable
-     *
-     * @param string $type the table type
-     *
-     * @access private
-     */
-    private function __construct($type)
-    {
-        $this->_tableType = $type;
-        $server_id = $GLOBALS['server'];
-        if (! isset($_SESSION['tmpval'][$this->_tableType . '_tables'][$server_id])
-        ) {
-            $_SESSION['tmpval'][$this->_tableType . '_tables'][$server_id]
-                = $this->_getPmaTable() ? $this->getFromDb() : array();
-        }
-        $this->_tables
-            =& $_SESSION['tmpval'][$this->_tableType . '_tables'][$server_id];
-    }
-
-    /**
-     * Returns class instance.
-     *
-     * @param string $type the table type
-     *
-     * @return RecentFavoriteTable
-     */
-    public static function getInstance($type)
-    {
-        if (! array_key_exists($type, self::$_instances)) {
-            self::$_instances[$type] = new RecentFavoriteTable($type);
-        }
-        return self::$_instances[$type];
-    }
-
-    /**
-     * Returns the recent/favorite tables array
-     *
-     * @return array
-     */
-    public function getTables()
-    {
-        return $this->_tables;
-    }
-
-    /**
-     * Returns recently used tables or favorite from phpMyAdmin database.
-     *
-     * @return array
-     */
-    public function getFromDb()
-    {
-        // Read from phpMyAdmin database, if recent tables is not in session
-        $sql_query
-            = " SELECT `tables` FROM " . $this->_getPmaTable() .
-            " WHERE `username` = '" . $GLOBALS['dbi']->escapeString($GLOBALS['cfg']['Server']['user']) . "'";
-
-        $return = array();
-        $result = PMA_queryAsControlUser($sql_query, false);
-        if ($result) {
-            $row = $GLOBALS['dbi']->fetchArray($result);
-            if (isset($row[0])) {
-                $return = json_decode($row[0], true);
-            }
-        }
-        return $return;
-    }
-
-    /**
-     * Save recent/favorite tables into phpMyAdmin database.
-     *
-     * @return true|Message
-     */
-    public function saveToDb()
-    {
-        $username = $GLOBALS['cfg']['Server']['user'];
-        $sql_query
-            = " REPLACE INTO " . $this->_getPmaTable() . " (`username`, `tables`)" .
-                " VALUES ('" . $GLOBALS['dbi']->escapeString($username) . "', '"
-                . $GLOBALS['dbi']->escapeString(
-                    json_encode($this->_tables)
-                ) . "')";
-
-        $success = $GLOBALS['dbi']->tryQuery($sql_query, $GLOBALS['controllink']);
-
-        if (! $success) {
-            $error_msg = '';
-            switch ($this->_tableType) {
-            case 'recent':
-                $error_msg = __('Could not save recent table!');
-                break;
-
-            case 'favorite':
-                $error_msg = __('Could not save favorite table!');
-                break;
-            }
-            $message = Message::error($error_msg);
-            $message->addMessage('<br /><br />');
-            $message->addMessage(
-                Message::rawError(
-                    $GLOBALS['dbi']->getError($GLOBALS['controllink'])
-                )
-            );
-            return $message;
-        }
-        return true;
-    }
-
-    /**
-     * Trim recent.favorite table according to the
-     * NumRecentTables/NumFavoriteTables configuration.
-     *
-     * @return boolean True if trimming occurred
-     */
-    public function trim()
-    {
-        $max = max(
-            $GLOBALS['cfg']['Num' . ucfirst($this->_tableType) . 'Tables'], 0
-        );
-        $trimming_occurred = count($this->_tables) > $max;
-        while (count($this->_tables) > $max) {
-            array_pop($this->_tables);
-        }
-        return $trimming_occurred;
-    }
-
-    /**
-     * Return HTML ul.
-     *
-     * @return string
-     */
-    public function getHtmlList()
-    {
-        $html = '';
-        if (count($this->_tables)) {
-            if ($this->_tableType == 'recent') {
-                foreach ($this->_tables as $table) {
-                    $html .= '<li class="warp_link">';
-                    $recent_params = array(
-                        'db'    => $table['db'],
-                        'table' => $table['table']
-                    );
-                    $recent_url = 'tbl_recent_favorite.php'
-                        . PMA_URL_getCommon($recent_params);
-                    $html .= '<a href="' . $recent_url . '">`'
-                          . htmlspecialchars($table['db']) . '`.`'
-                          . htmlspecialchars($table['table']) . '`</a>';
-                    $html .= '</li>';
-                }
-            } else {
-                foreach ($this->_tables as $table) {
-                    $html .= '<li class="warp_link">';
-
-                    $html .= '<a class="ajax favorite_table_anchor" ';
-                    $fav_params = array(
-                        'db'              => $table['db'],
-                        'ajax_request'    => true,
-                        'favorite_table'  => $table['table'],
-                        'remove_favorite' => true
-                    );
-                    $fav_rm_url = 'db_structure.php'
-                        . PMA_URL_getCommon($fav_params);
-                    $html .= 'href="' . $fav_rm_url
-                        . '" title="' . __("Remove from Favorites")
-                        . '" data-favtargetn="'
-                        . md5($table['db'] . "." . $table['table'])
-                        . '" >'
-                        . Util::getIcon('b_favorite.png')
-                        . '</a>';
-
-                    $fav_params = array(
-                        'db'    => $table['db'],
-                        'table' => $table['table']
-                    );
-                    $table_url = 'tbl_recent_favorite.php'
-                        . PMA_URL_getCommon($fav_params);
-                    $html .= '<a href="' . $table_url . '">`'
-                        . htmlspecialchars($table['db']) . '`.`'
-                        . htmlspecialchars($table['table']) . '`</a>';
-                    $html .= '</li>';
-                }
-            }
-        } else {
-            $html .= '<li class="warp_link">'
-                  . ($this->_tableType == 'recent'
-                    ?__('There are no recent tables.')
-                    :__('There are no favorite tables.'))
-                  . '</li>';
-        }
-        return $html;
-    }
-
-    /**
-     * Return HTML.
-     *
-     * @return string
-     */
-    public function getHtml()
-    {
-        $html  = '<div class="drop_list">';
-        if ($this->_tableType == 'recent') {
-            $html .= '<span title="' . __('Recent tables')
-                . '" class="drop_button">'
-                . __('Recent') . '</span><ul id="pma_recent_list">';
-        } else {
-            $html .= '<span title="' . __('Favorite tables')
-                . '" class="drop_button">'
-                . __('Favorites') . '</span><ul id="pma_favorite_list">';
-        }
-        $html .= $this->getHtmlList();
-        $html .= '</ul></div>';
-        return $html;
-    }
-
-    /**
-     * Add recently used or favorite tables.
-     *
-     * @param string $db    database name where the table is located
-     * @param string $table table name
-     *
-     * @return true|Message True if success, Message if not
-     */
-    public function add($db, $table)
-    {
-        // If table does not exist, do not add._getPmaTable()
-        if (! $GLOBALS['dbi']->getColumns($db, $table)) {
-            return true;
-        }
-
-        $table_arr = array();
-        $table_arr['db'] = $db;
-        $table_arr['table'] = $table;
-
-        // add only if this is new table
-        if (! isset($this->_tables[0]) || $this->_tables[0] != $table_arr) {
-            array_unshift($this->_tables, $table_arr);
-            $this->_tables = array_merge(array_unique($this->_tables, SORT_REGULAR));
-            $this->trim();
-            if ($this->_getPmaTable()) {
-                return $this->saveToDb();
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Removes recent/favorite tables that don't exist.
-     *
-     * @param string $db    database
-     * @param string $table table
-     *
-     * @return boolean|Message True if invalid and removed, False if not invalid,
-     *                            Message if error while removing
-     */
-    public function removeIfInvalid($db, $table)
-    {
-        foreach ($this->_tables as $tbl) {
-            if ($tbl['db'] == $db && $tbl['table'] == $table) {
-                // TODO Figure out a better way to find the existence of a table
-                if (! $GLOBALS['dbi']->getColumns($tbl['db'], $tbl['table'])) {
-                    return $this->remove($tbl['db'], $tbl['table']);
-                }
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Remove favorite tables.
-     *
-     * @param string $db    database name where the table is located
-     * @param string $table table name
-     *
-     * @return true|Message True if success, Message if not
-     */
-    public function remove($db, $table)
-    {
-        $table_arr = array();
-        $table_arr['db'] = $db;
-        $table_arr['table'] = $table;
-        foreach ($this->_tables as $key => $value) {
-            if ($value['db'] == $db && $value['table'] == $table) {
-                unset($this->_tables[$key]);
-            }
-        }
-        if ($this->_getPmaTable()) {
-            return $this->saveToDb();
-        }
-        return true;
-    }
-
-    /**
-     * Generate Html for sync Favorite tables anchor. (from localStorage to pmadb)
-     *
-     * @return string
-     */
-    public function getHtmlSyncFavoriteTables()
-    {
-        $retval = '';
-        $server_id = $GLOBALS['server'];
-        if ($server_id == 0) {
-            return '';
-        }
-        // Not to show this once list is synchronized.
-        $is_synced = isset($_SESSION['tmpval']['favorites_synced'][$server_id]) ?
-            true : false;
-        if (!$is_synced) {
-            $params  = array('ajax_request' => true, 'favorite_table' => true,
-                'sync_favorite_tables' => true);
-            $url     = 'db_structure.php' . PMA_URL_getCommon($params);
-            $retval  = '<a class="hide" id="sync_favorite_tables"';
-            $retval .= ' href="' . $url . '"></a>';
-        }
-        return $retval;
-    }
-
-    /**
-     * Generate Html to update recent tables.
-     *
-     * @return string html
-     */
-    public static function getHtmlUpdateRecentTables()
-    {
-        $params  = array('ajax_request' => true, 'recent_table' => true);
-        $url     = 'index.php' . PMA_URL_getCommon($params);
-        $retval  = '<a class="hide" id="update_recent_tables"';
-        $retval .= ' href="' . $url . '"></a>';
-        return $retval;
-    }
-
-    /**
-     * Reutrn the name of the configuration storage table
-     *
-     * @return string pma table name
-     */
-    private function _getPmaTable()
-    {
-        $cfgRelation = PMA_getRelationsParam();
-        if (! empty($cfgRelation['db'])
-            && ! empty($cfgRelation[$this->_tableType])
-        ) {
-            return Util::backquote($cfgRelation['db']) . "."
-                . Util::backquote($cfgRelation[$this->_tableType]);
-        }
-        return null;
-    }
-}
diff --git a/#pma/libraries/Response.php b/#pma/libraries/Response.php
deleted file mode 100644
index 6c2daad8..00000000
--- a/#pma/libraries/Response.php
+++ /dev/null
@@ -1,468 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Manages the rendering of pages in PMA
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries;
-
-/**
- * Singleton class used to manage the rendering of pages in PMA
- *
- * @package PhpMyAdmin
- */
-class Response
-{
-    /**
-     * Response instance
-     *
-     * @access private
-     * @static
-     * @var Response
-     */
-    private static $_instance;
-    /**
-     * Header instance
-     *
-     * @access private
-     * @var Header
-     */
-    private $_header;
-    /**
-     * HTML data to be used in the response
-     *
-     * @access private
-     * @var string
-     */
-    private $_HTML;
-    /**
-     * An array of JSON key-value pairs
-     * to be sent back for ajax requests
-     *
-     * @access private
-     * @var array
-     */
-    private $_JSON;
-    /**
-     * PMA\libraries\Footer instance
-     *
-     * @access private
-     * @var Footer
-     */
-    private $_footer;
-    /**
-     * Whether we are servicing an ajax request.
-     * We can't simply use $GLOBALS['is_ajax_request']
-     * here since it may have not been initialised yet.
-     *
-     * @access private
-     * @var bool
-     */
-    private $_isAjax;
-    /**
-     * Whether response object is disabled
-     *
-     * @access private
-     * @var bool
-     */
-    private $_isDisabled;
-    /**
-     * Whether we are servicing an ajax request for a page
-     * that was fired using the generic page handler in JS.
-     *
-     * @access private
-     * @var bool
-     */
-    private $_isAjaxPage;
-    /**
-     * Whether there were any errors during the processing of the request
-     * Only used for ajax responses
-     *
-     * @access private
-     * @var bool
-     */
-    private $_isSuccess;
-    /**
-     * Workaround for PHP bug
-     *
-     * @access private
-     * @var string|bool
-     */
-    private $_CWD;
-
-    /**
-     * Creates a new class instance
-     */
-    private function __construct()
-    {
-        if (! defined('TESTSUITE')) {
-            $buffer = OutputBuffering::getInstance();
-            $buffer->start();
-            register_shutdown_function(array('PMA\libraries\Response', 'response'));
-        }
-        $this->_header = new Header();
-        $this->_HTML   = '';
-        $this->_JSON   = array();
-        $this->_footer = new Footer();
-
-        $this->_isSuccess  = true;
-        $this->_isAjax     = false;
-        $this->_isAjaxPage = false;
-        $this->_isDisabled = false;
-        if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
-            $this->_isAjax = true;
-        }
-        if (isset($_REQUEST['ajax_page_request'])
-            && $_REQUEST['ajax_page_request'] == true
-        ) {
-            $this->_isAjaxPage = true;
-        }
-        $this->_header->setAjax($this->_isAjax);
-        $this->_footer->setAjax($this->_isAjax);
-        $this->_CWD = getcwd();
-    }
-
-    /**
-     * Returns the singleton Response object
-     *
-     * @return Response object
-     */
-    public static function getInstance()
-    {
-        if (empty(self::$_instance)) {
-            self::$_instance = new Response();
-        }
-        return self::$_instance;
-    }
-
-    /**
-     * Set the status of an ajax response,
-     * whether it is a success or an error
-     *
-     * @param bool $state Whether the request was successfully processed
-     *
-     * @return void
-     */
-    public function setRequestStatus($state)
-    {
-        $this->_isSuccess = ($state == true);
-    }
-
-    /**
-     * Returns true or false depending on whether
-     * we are servicing an ajax request
-     *
-     * @return bool
-     */
-    public function isAjax()
-    {
-        return $this->_isAjax;
-    }
-
-    /**
-     * Returns the path to the current working directory
-     * Necessary to work around a PHP bug where the CWD is
-     * reset after the initial script exits
-     *
-     * @return string
-     */
-    public function getCWD()
-    {
-        return $this->_CWD;
-    }
-
-    /**
-     * Disables the rendering of the header
-     * and the footer in responses
-     *
-     * @return void
-     */
-    public function disable()
-    {
-        $this->_header->disable();
-        $this->_footer->disable();
-        $this->_isDisabled = true;
-    }
-
-    /**
-     * Returns a PMA\libraries\Header object
-     *
-     * @return Header
-     */
-    public function getHeader()
-    {
-        return $this->_header;
-    }
-
-    /**
-     * Returns a PMA\libraries\Footer object
-     *
-     * @return Footer
-     */
-    public function getFooter()
-    {
-        return $this->_footer;
-    }
-
-    /**
-     * Add HTML code to the response
-     *
-     * @param string $content A string to be appended to
-     *                        the current output buffer
-     *
-     * @return void
-     */
-    public function addHTML($content)
-    {
-        if (is_array($content)) {
-            foreach ($content as $msg) {
-                $this->addHTML($msg);
-            }
-        } elseif ($content instanceof Message) {
-            $this->_HTML .= $content->getDisplay();
-        } else {
-            $this->_HTML .= $content;
-        }
-    }
-
-    /**
-     * Add JSON code to the response
-     *
-     * @param mixed $json  Either a key (string) or an
-     *                     array or key-value pairs
-     * @param mixed $value Null, if passing an array in $json otherwise
-     *                     it's a string value to the key
-     *
-     * @return void
-     */
-    public function addJSON($json, $value = null)
-    {
-        if (is_array($json)) {
-            foreach ($json as $key => $value) {
-                $this->addJSON($key, $value);
-            }
-        } else {
-            if ($value instanceof Message) {
-                $this->_JSON[$json] = $value->getDisplay();
-            } else {
-                $this->_JSON[$json] = $value;
-            }
-        }
-
-    }
-
-    /**
-     * Renders the HTML response text
-     *
-     * @return string
-     */
-    private function _getDisplay()
-    {
-        // The header may contain nothing at all,
-        // if its content was already rendered
-        // and, in this case, the header will be
-        // in the content part of the request
-        $retval  = $this->_header->getDisplay();
-        $retval .= $this->_HTML;
-        $retval .= $this->_footer->getDisplay();
-        return $retval;
-    }
-
-    /**
-     * Sends an HTML response to the browser
-     *
-     * @return void
-     */
-    private function _htmlResponse()
-    {
-        echo $this->_getDisplay();
-    }
-
-    /**
-     * Sends a JSON response to the browser
-     *
-     * @return void
-     */
-    private function _ajaxResponse()
-    {
-        /* Avoid wrapping in case we're disabled */
-        if ($this->_isDisabled) {
-            echo $this->_getDisplay();
-            return;
-        }
-
-        if (! isset($this->_JSON['message'])) {
-            $this->_JSON['message'] = $this->_getDisplay();
-        } else if ($this->_JSON['message'] instanceof Message) {
-            $this->_JSON['message'] = $this->_JSON['message']->getDisplay();
-        }
-
-        if ($this->_isSuccess) {
-            $this->_JSON['success'] = true;
-        } else {
-            $this->_JSON['success'] = false;
-            $this->_JSON['error']   = $this->_JSON['message'];
-            unset($this->_JSON['message']);
-        }
-
-        if ($this->_isSuccess) {
-            // Note: the old judge sentence is:
-            // $this->_isAjaxPage && $this->_isSuccess
-            // Removal the first, because console need log all queries
-            $this->addJSON('_title', $this->getHeader()->getTitleTag());
-
-            if (isset($GLOBALS['dbi'])) {
-                $menuHash = $this->getHeader()->getMenu()->getHash();
-                $this->addJSON('_menuHash', $menuHash);
-                $hashes = array();
-                if (isset($_REQUEST['menuHashes'])) {
-                    $hashes = explode('-', $_REQUEST['menuHashes']);
-                }
-                if (! in_array($menuHash, $hashes)) {
-                    $this->addJSON(
-                        '_menu',
-                        $this->getHeader()
-                            ->getMenu()
-                            ->getDisplay()
-                    );
-                }
-            }
-
-            $this->addJSON('_scripts', $this->getHeader()->getScripts()->getFiles());
-            $this->addJSON('_selflink', $this->getFooter()->getSelfUrl('unencoded'));
-            $this->addJSON('_displayMessage', $this->getHeader()->getMessage());
-
-            $debug = $this->_footer->getDebugMessage();
-            if (empty($_REQUEST['no_debug'])
-                && mb_strlen($debug)
-            ) {
-                $this->addJSON('_debug', $debug);
-            }
-
-            $errors = $this->_footer->getErrorMessages();
-            if (mb_strlen($errors)) {
-                $this->addJSON('_errors', $errors);
-            }
-            $promptPhpErrors = $GLOBALS['error_handler']->hasErrorsForPrompt();
-            $this->addJSON('_promptPhpErrors', $promptPhpErrors);
-
-            if (empty($GLOBALS['error_message'])) {
-                // set current db, table and sql query in the querywindow
-                // (this is for the bottom console)
-                $query = '';
-                $maxChars = $GLOBALS['cfg']['MaxCharactersInDisplayedSQL'];
-                if (isset($GLOBALS['sql_query'])
-                    && mb_strlen($GLOBALS['sql_query']) < $maxChars
-                ) {
-                    $query = $GLOBALS['sql_query'];
-                }
-                $this->addJSON(
-                    '_reloadQuerywindow',
-                    array(
-                        'db' => PMA_ifSetOr($GLOBALS['db'], ''),
-                        'table' => PMA_ifSetOr($GLOBALS['table'], ''),
-                        'sql_query' => $query
-                    )
-                );
-                if (! empty($GLOBALS['focus_querywindow'])) {
-                    $this->addJSON('_focusQuerywindow', $query);
-                }
-                if (! empty($GLOBALS['reload'])) {
-                    $this->addJSON('_reloadNavigation', 1);
-                }
-                $this->addJSON('_params', $this->getHeader()->getJsParams());
-            }
-        }
-
-        // Set the Content-Type header to JSON so that jQuery parses the
-        // response correctly.
-        PMA_headerJSON();
-
-        $result = json_encode($this->_JSON);
-        if ($result === false) {
-            switch (json_last_error()) {
-                case JSON_ERROR_NONE:
-                    $error = 'No errors';
-                break;
-                case JSON_ERROR_DEPTH:
-                    $error = 'Maximum stack depth exceeded';
-                break;
-                case JSON_ERROR_STATE_MISMATCH:
-                    $error = 'Underflow or the modes mismatch';
-                break;
-                case JSON_ERROR_CTRL_CHAR:
-                    $error = 'Unexpected control character found';
-                break;
-                case JSON_ERROR_SYNTAX:
-                    $error = 'Syntax error, malformed JSON';
-                break;
-                case JSON_ERROR_UTF8:
-                    $error = 'Malformed UTF-8 characters, possibly incorrectly encoded';
-                break;
-                case JSON_ERROR_RECURSION:
-                    $error = 'One or more recursive references in the value to be encoded';
-                break;
-                case JSON_ERROR_INF_OR_NAN:
-                    $error = 'One or more NAN or INF values in the value to be encoded';
-                break;
-                case JSON_ERROR_UNSUPPORTED_TYPE:
-                    $error = 'A value of a type that cannot be encoded was given';
-                default:
-                    $error = 'Unknown error';
-                break;
-            }
-            echo json_encode(
-                array(
-                    'success' => false,
-                    'error' => 'JSON encoding failed: ' . $error,
-                )
-            );
-        } else {
-            echo $result;
-        }
-    }
-
-    /**
-     * Sends an HTML response to the browser
-     *
-     * @static
-     * @return void
-     */
-    public static function response()
-    {
-        $response = Response::getInstance();
-        chdir($response->getCWD());
-        $buffer = OutputBuffering::getInstance();
-        if (empty($response->_HTML)) {
-            $response->_HTML = $buffer->getContents();
-        }
-        if ($response->isAjax()) {
-            $response->_ajaxResponse();
-        } else {
-            $response->_htmlResponse();
-        }
-        $buffer->flush();
-        exit;
-    }
-
-    /**
-     * Wrapper around PHP's header() function.
-     *
-     * @return void
-     */
-    public function header($text)
-    {
-        header($text);
-    }
-
-    /**
-     * Wrapper around PHP's headers_sent() function.
-     *
-     * @return bool
-     */
-    public function headersSent()
-    {
-        return headers_sent();
-    }
-}
diff --git a/#pma/libraries/SavedSearches.php b/#pma/libraries/SavedSearches.php
deleted file mode 100644
index 9cd652af..00000000
--- a/#pma/libraries/SavedSearches.php
+++ /dev/null
@@ -1,457 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Saved searches managing
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries;
-
-/**
- * Saved searches managing
- *
- * @package PhpMyAdmin
- */
-class SavedSearches
-{
-    /**
-     * Global configuration
-     * @var array
-     */
-    private $_config = null;
-
-    /**
-     * Id
-     * @var int|null
-     */
-    private $_id = null;
-
-    /**
-     * Username
-     * @var string
-     */
-    private $_username = null;
-
-    /**
-     * DB name
-     * @var string
-     */
-    private $_dbname = null;
-
-    /**
-     * Saved search name
-     * @var string
-     */
-    private $_searchName = null;
-
-    /**
-     * Setter of id
-     *
-     * @param int|null $searchId Id of search
-     *
-     * @return static
-     */
-    public function setId($searchId)
-    {
-        $searchId = (int)$searchId;
-        if (empty($searchId)) {
-            $searchId = null;
-        }
-
-        $this->_id = $searchId;
-        return $this;
-    }
-
-    /**
-     * Getter of id
-     *
-     * @return int|null
-     */
-    public function getId()
-    {
-        return $this->_id;
-    }
-
-    /**
-     * Setter of searchName
-     *
-     * @param string $searchName Saved search name
-     *
-     * @return static
-     */
-    public function setSearchName($searchName)
-    {
-        $this->_searchName = $searchName;
-        return $this;
-    }
-
-    /**
-     * Getter of searchName
-     *
-     * @return string
-     */
-    public function getSearchName()
-    {
-        return $this->_searchName;
-    }
-
-    /**
-     * Criterias
-     * @var array
-     */
-    private $_criterias = null;
-
-    /**
-     * Setter of config
-     *
-     * @param array $config Global configuration
-     *
-     * @return static
-     */
-    public function setConfig($config)
-    {
-        $this->_config = $config;
-        return $this;
-    }
-
-    /**
-     * Getter of config
-     *
-     * @return array
-     */
-    public function getConfig()
-    {
-        return $this->_config;
-    }
-
-    /**
-     * Setter for criterias
-     *
-     * @param array|string $criterias Criterias of saved searches
-     * @param bool         $json      Criterias are in JSON format
-     *
-     * @return static
-     */
-    public function setCriterias($criterias, $json = false)
-    {
-        if (true === $json && is_string($criterias)) {
-            $this->_criterias = json_decode($criterias, true);
-            return $this;
-        }
-
-        $aListFieldsToGet = array(
-            'criteriaColumn',
-            'criteriaSort',
-            'criteriaShow',
-            'criteria',
-            'criteriaAndOrRow',
-            'criteriaAndOrColumn',
-            'rows',
-            'TableList'
-        );
-
-        $data = array();
-
-        $data['criteriaColumnCount'] = count($criterias['criteriaColumn']);
-
-        foreach ($aListFieldsToGet as $field) {
-            if (isset($criterias[$field])) {
-                $data[$field] = $criterias[$field];
-            }
-        }
-
-        /* Limit amount of rows */
-        if (!isset($data['rows'])) {
-            $data['rows'] = 0;
-        } else {
-            $data['rows'] = min(
-                max(0, intval($data['rows'])),
-                100
-            );
-        }
-
-        for ($i = 0; $i <= $data['rows']; $i++) {
-            $data['Or' . $i] = $criterias['Or' . $i];
-        }
-
-        $this->_criterias = $data;
-        return $this;
-    }
-
-    /**
-     * Getter for criterias
-     *
-     * @return array
-     */
-    public function getCriterias()
-    {
-        return $this->_criterias;
-    }
-
-    /**
-     * Setter for username
-     *
-     * @param string $username Username
-     *
-     * @return static
-     */
-    public function setUsername($username)
-    {
-        $this->_username = $username;
-        return $this;
-    }
-
-    /**
-     * Getter for username
-     *
-     * @return string
-     */
-    public function getUsername()
-    {
-        return $this->_username;
-    }
-
-    /**
-     * Setter for DB name
-     *
-     * @param string $dbname DB name
-     *
-     * @return static
-     */
-    public function setDbname($dbname)
-    {
-        $this->_dbname = $dbname;
-        return $this;
-    }
-
-    /**
-     * Getter for DB name
-     *
-     * @return string
-     */
-    public function getDbname()
-    {
-        return $this->_dbname;
-    }
-
-    /**
-     * Public constructor
-     *
-     * @param array $config Global configuration
-     */
-    public function __construct($config)
-    {
-        $this->setConfig($config);
-    }
-
-    /**
-     * Save the search
-     *
-     * @return boolean
-     */
-    public function save()
-    {
-        if (null == $this->getSearchName()) {
-            $message = Message::error(
-                __('Please provide a name for this bookmarked search.')
-            );
-            $response = Response::getInstance();
-            $response->setRequestStatus($message->isSuccess());
-            $response->addJSON('fieldWithError', 'searchName');
-            $response->addJSON('message', $message);
-            exit;
-        }
-
-        if (null == $this->getUsername()
-            || null == $this->getDbname()
-            || null == $this->getSearchName()
-            || null == $this->getCriterias()
-        ) {
-            $message = Message::error(
-                __('Missing information to save the bookmarked search.')
-            );
-            $response = Response::getInstance();
-            $response->setRequestStatus($message->isSuccess());
-            $response->addJSON('message', $message);
-            exit;
-        }
-
-        $savedSearchesTbl
-            = Util::backquote($this->_config['cfgRelation']['db']) . "."
-            . Util::backquote($this->_config['cfgRelation']['savedsearches']);
-
-        //If it's an insert.
-        if (null === $this->getId()) {
-            $wheres = array(
-                "search_name = '" . $GLOBALS['dbi']->escapeString($this->getSearchName())
-                . "'"
-            );
-            $existingSearches = $this->getList($wheres);
-
-            if (!empty($existingSearches)) {
-                $message = Message::error(
-                    __('An entry with this name already exists.')
-                );
-                $response = Response::getInstance();
-                $response->setRequestStatus($message->isSuccess());
-                $response->addJSON('fieldWithError', 'searchName');
-                $response->addJSON('message', $message);
-                exit;
-            }
-
-            $sqlQuery = "INSERT INTO " . $savedSearchesTbl
-                . "(`username`, `db_name`, `search_name`, `search_data`)"
-                . " VALUES ("
-                . "'" . $GLOBALS['dbi']->escapeString($this->getUsername()) . "',"
-                . "'" . $GLOBALS['dbi']->escapeString($this->getDbname()) . "',"
-                . "'" . $GLOBALS['dbi']->escapeString($this->getSearchName()) . "',"
-                . "'" . $GLOBALS['dbi']->escapeString(json_encode($this->getCriterias()))
-                . "')";
-
-            $result = (bool)PMA_queryAsControlUser($sqlQuery);
-            if (!$result) {
-                return false;
-            }
-
-            $this->setId($GLOBALS['dbi']->insertId());
-
-            return true;
-        }
-
-        //Else, it's an update.
-        $wheres = array(
-            "id != " . $this->getId(),
-            "search_name = '" . $GLOBALS['dbi']->escapeString($this->getSearchName()) . "'"
-        );
-        $existingSearches = $this->getList($wheres);
-
-        if (!empty($existingSearches)) {
-            $message = Message::error(
-                __('An entry with this name already exists.')
-            );
-            $response = Response::getInstance();
-            $response->setRequestStatus($message->isSuccess());
-            $response->addJSON('fieldWithError', 'searchName');
-            $response->addJSON('message', $message);
-            exit;
-        }
-
-        $sqlQuery = "UPDATE " . $savedSearchesTbl
-            . "SET `search_name` = '"
-            . $GLOBALS['dbi']->escapeString($this->getSearchName()) . "', "
-            . "`search_data` = '"
-            . $GLOBALS['dbi']->escapeString(json_encode($this->getCriterias())) . "' "
-            . "WHERE id = " . $this->getId();
-        return (bool)PMA_queryAsControlUser($sqlQuery);
-    }
-
-    /**
-     * Delete the search
-     *
-     * @return boolean
-     */
-    public function delete()
-    {
-        if (null == $this->getId()) {
-            $message = Message::error(
-                __('Missing information to delete the search.')
-            );
-            $response = Response::getInstance();
-            $response->setRequestStatus($message->isSuccess());
-            $response->addJSON('fieldWithError', 'searchId');
-            $response->addJSON('message', $message);
-            exit;
-        }
-
-        $savedSearchesTbl
-            = Util::backquote($this->_config['cfgRelation']['db']) . "."
-            . Util::backquote($this->_config['cfgRelation']['savedsearches']);
-
-        $sqlQuery = "DELETE FROM " . $savedSearchesTbl
-            . "WHERE id = '" . $GLOBALS['dbi']->escapeString($this->getId()) . "'";
-
-        return (bool)PMA_queryAsControlUser($sqlQuery);
-    }
-
-    /**
-     * Load the current search from an id.
-     *
-     * @return bool Success
-     */
-    public function load()
-    {
-        if (null == $this->getId()) {
-            $message = Message::error(
-                __('Missing information to load the search.')
-            );
-            $response = Response::getInstance();
-            $response->setRequestStatus($message->isSuccess());
-            $response->addJSON('fieldWithError', 'searchId');
-            $response->addJSON('message', $message);
-            exit;
-        }
-
-        $savedSearchesTbl = Util::backquote($this->_config['cfgRelation']['db'])
-            . "."
-            . Util::backquote($this->_config['cfgRelation']['savedsearches']);
-        $sqlQuery = "SELECT id, search_name, search_data "
-            . "FROM " . $savedSearchesTbl . " "
-            . "WHERE id = '" . $GLOBALS['dbi']->escapeString($this->getId()) . "' ";
-
-        $resList = PMA_queryAsControlUser($sqlQuery);
-
-        if (false === ($oneResult = $GLOBALS['dbi']->fetchArray($resList))) {
-            $message = Message::error(__('Error while loading the search.'));
-            $response = Response::getInstance();
-            $response->setRequestStatus($message->isSuccess());
-            $response->addJSON('fieldWithError', 'searchId');
-            $response->addJSON('message', $message);
-            exit;
-        }
-
-        $this->setSearchName($oneResult['search_name'])
-            ->setCriterias($oneResult['search_data'], true);
-
-        return true;
-    }
-
-    /**
-     * Get the list of saved searches of a user on a DB
-     *
-     * @param string[] $wheres List of filters
-     *
-     * @return array List of saved searches or empty array on failure
-     */
-    public function getList(array $wheres = array())
-    {
-        if (null == $this->getUsername()
-            || null == $this->getDbname()
-        ) {
-            return array();
-        }
-
-        $savedSearchesTbl = Util::backquote($this->_config['cfgRelation']['db'])
-            . "."
-            . Util::backquote($this->_config['cfgRelation']['savedsearches']);
-        $sqlQuery = "SELECT id, search_name "
-            . "FROM " . $savedSearchesTbl . " "
-            . "WHERE "
-            . "username = '" . $GLOBALS['dbi']->escapeString($this->getUsername()) . "' "
-            . "AND db_name = '" . $GLOBALS['dbi']->escapeString($this->getDbname()) . "' ";
-
-        foreach ($wheres as $where) {
-            $sqlQuery .= "AND " . $where . " ";
-        }
-
-        $sqlQuery .= "order by search_name ASC ";
-
-        $resList = PMA_queryAsControlUser($sqlQuery);
-
-        $list = array();
-        while ($oneResult = $GLOBALS['dbi']->fetchArray($resList)) {
-            $list[$oneResult['id']] = $oneResult['search_name'];
-        }
-
-        return $list;
-    }
-}
diff --git a/#pma/libraries/Scripts.php b/#pma/libraries/Scripts.php
deleted file mode 100644
index 00d8d0cf..00000000
--- a/#pma/libraries/Scripts.php
+++ /dev/null
@@ -1,259 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * JavaScript management
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries;
-
-/**
- * Collects information about which JavaScript
- * files and objects are necessary to render
- * the page and generates the relevant code.
- *
- * @package PhpMyAdmin
- */
-class Scripts
-{
-    /**
-     * An array of SCRIPT tags
-     *
-     * @access private
-     * @var array of strings
-     */
-    private $_files;
-    /**
-     * An array of discrete javascript code snippets
-     *
-     * @access private
-     * @var array of strings
-     */
-    private $_code;
-
-    /**
-     * Returns HTML code to include javascript file.
-     *
-     * @param array $files The list of js file to include
-     *
-     * @return string HTML code for javascript inclusion.
-     */
-    private function _includeFiles($files)
-    {
-        $first_dynamic_scripts = "";
-        $dynamic_scripts = "";
-        $scripts = array();
-        $separator = PMA_URL_getArgSeparator();
-        foreach ($files as $value) {
-            if (mb_strpos($value['filename'], "?") !== false) {
-                $file_name = $value['filename'] . $separator
-                    . Header::getVersionParameter();
-                if ($value['before_statics'] === true) {
-                    $first_dynamic_scripts
-                        .= "<script data-cfasync='false' type='text/javascript' "
-                        . "src='js/" . $file_name . "'></script>";
-                } else {
-                    $dynamic_scripts .= "<script data-cfasync='false' "
-                        . "type='text/javascript' src='js/" . $file_name
-                        . "'></script>";
-                }
-                continue;
-            }
-            $include = true;
-            if ($value['conditional_ie'] !== false
-                && PMA_USR_BROWSER_AGENT === 'IE'
-            ) {
-                if ($value['conditional_ie'] === true) {
-                    $include = true;
-                } else if ($value['conditional_ie'] == PMA_USR_BROWSER_VER) {
-                    $include = true;
-                } else {
-                    $include = false;
-                }
-            }
-            if ($include) {
-                $scripts[] = "scripts%5B%5D=" . $value['filename'];
-            }
-        }
-        $separator = PMA_URL_getArgSeparator();
-        $static_scripts = '';
-        // Using chunks of 10 files to avoid too long URLs
-        // as some servers are set to 512 bytes URL limit
-        $script_chunks = array_chunk($scripts, 10);
-        foreach ($script_chunks as $script_chunk) {
-            $url = 'js/get_scripts.js.php?'
-                . implode($separator, $script_chunk)
-                . $separator . Header::getVersionParameter();
-
-            $static_scripts .= sprintf(
-                '<script data-cfasync="false" type="text/javascript" src="%s">' .
-                '</script>',
-                htmlspecialchars($url)
-            );
-        }
-        return $first_dynamic_scripts . $static_scripts . $dynamic_scripts;
-    }
-
-    /**
-     * Generates new Scripts objects
-     *
-     */
-    public function __construct()
-    {
-        $this->_files  = array();
-        $this->_code   = '';
-
-    }
-
-    /**
-     * Adds a new file to the list of scripts
-     *
-     * @param string $filename       The name of the file to include
-     * @param bool   $conditional_ie Whether to wrap the script tag in
-     *                               conditional comments for IE
-     * @param bool   $before_statics Whether this dynamic script should be
-     *                               included before the static ones
-     *
-     * @return void
-     */
-    public function addFile(
-        $filename,
-        $conditional_ie = false,
-        $before_statics = false
-    ) {
-        $hash = md5($filename);
-        if (!empty($this->_files[$hash])) {
-            return;
-        }
-
-        $has_onload = $this->_eventBlacklist($filename);
-        $this->_files[$hash] = array(
-            'has_onload' => $has_onload,
-            'filename' => $filename,
-            'conditional_ie' => $conditional_ie,
-            'before_statics' => $before_statics
-        );
-    }
-
-    /**
-     * Add new files to the list of scripts
-     *
-     * @param array $filelist       The array of file names
-     * @param bool  $conditional_ie Whether to wrap the script tag in
-     *                              conditional comments for IE
-     *
-     * @return void
-     */
-    public function addFiles($filelist, $conditional_ie = false)
-    {
-        foreach ($filelist as $filename) {
-            $this->addFile($filename, $conditional_ie);
-        }
-    }
-
-    /**
-     * Determines whether to fire up an onload event for a file
-     *
-     * @param string $filename The name of the file to be checked
-     *                         against the blacklist
-     *
-     * @return int 1 to fire up the event, 0 not to
-     */
-    private function _eventBlacklist($filename)
-    {
-        if (strpos($filename, 'jquery') !== false
-            || strpos($filename, 'codemirror') !== false
-            || strpos($filename, 'messages.php') !== false
-            || strpos($filename, 'ajax.js') !== false
-            || strpos($filename, 'get_image.js.php') !== false
-            || strpos($filename, 'cross_framing_protection.js') !== false
-        ) {
-            return 0;
-        }
-
-        return 1;
-    }
-
-    /**
-     * Adds a new code snippet to the code to be executed
-     *
-     * @param string $code The JS code to be added
-     *
-     * @return void
-     */
-    public function addCode($code)
-    {
-        $this->_code .= "$code\n";
-    }
-
-    /**
-     * Returns a list with filenames and a flag to indicate
-     * whether to register onload events for this file
-     *
-     * @return array
-     */
-    public function getFiles()
-    {
-        $retval = array();
-        foreach ($this->_files as $file) {
-            //If filename contains a "?", continue.
-            if (strpos($file['filename'], "?") !== false) {
-                continue;
-            }
-
-            if (! $file['conditional_ie'] || PMA_USR_BROWSER_AGENT == 'IE') {
-                $retval[] = array(
-                    'name' => $file['filename'],
-                    'fire' => $file['has_onload']
-                );
-            }
-        }
-        return $retval;
-    }
-
-    /**
-     * Renders all the JavaScript file inclusions, code and events
-     *
-     * @return string
-     */
-    public function getDisplay()
-    {
-        $retval = '';
-
-        if (count($this->_files) > 0) {
-            $retval .= $this->_includeFiles(
-                $this->_files
-            );
-        }
-
-        $code = 'AJAX.scriptHandler';
-        foreach ($this->_files as $file) {
-            $code .= sprintf(
-                '.add("%s",%d)',
-                PMA_escapeJsString($file['filename']),
-                $file['has_onload'] ? 1 : 0
-            );
-        }
-        $code .= ';';
-        $this->addCode($code);
-
-        $code = '$(function() {';
-        foreach ($this->_files as $file) {
-            if ($file['has_onload']) {
-                $code .= 'AJAX.fireOnload("';
-                $code .= PMA_escapeJsString($file['filename']);
-                $code .= '");';
-            }
-        }
-        $code .= '});';
-        $this->addCode($code);
-
-        $retval .= '<script data-cfasync="false" type="text/javascript">';
-        $retval .= "// <![CDATA[\n";
-        $retval .= $this->_code;
-        $retval .= '// ]]>';
-        $retval .= '</script>';
-
-        return $retval;
-    }
-}
diff --git a/#pma/libraries/ServerStatusData.php b/#pma/libraries/ServerStatusData.php
deleted file mode 100644
index 8fcdf463..00000000
--- a/#pma/libraries/ServerStatusData.php
+++ /dev/null
@@ -1,502 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * ServerStatusData class
- * Used by server_status_*.php pages
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries;
-
-/**
- * This class provides data about the server status
- *
- * All properties of the class are read-only
- *
- * TODO: Use lazy initialisation for some of the properties
- *       since not all of the server_status_*.php pages need
- *       all the data that this class provides.
- *
- * @package PhpMyAdmin
- */
-class ServerStatusData
-{
-    public $status;
-    public $sections;
-    public $variables;
-    public $used_queries;
-    public $allocationMap;
-    public $links;
-    public $db_isLocal;
-    public $section;
-    public $sectionUsed;
-    public $selfUrl;
-    public $dataLoaded;
-
-    /**
-     * An empty setter makes the above properties read-only
-     *
-     * @param string $a key
-     * @param mixed  $b value
-     *
-     * @return void
-     */
-    public function __set($a, $b)
-    {
-        // Discard everything
-    }
-
-    /**
-     * Gets the allocations for constructor
-     *
-     * @return array
-     */
-    private function _getAllocations()
-    {
-        return array(
-            // variable name => section
-            // variable names match when they begin with the given string
-
-            'Com_'              => 'com',
-            'Innodb_'           => 'innodb',
-            'Ndb_'              => 'ndb',
-            'Handler_'          => 'handler',
-            'Qcache_'           => 'qcache',
-            'Threads_'          => 'threads',
-            'Slow_launch_threads' => 'threads',
-
-            'Binlog_cache_'     => 'binlog_cache',
-            'Created_tmp_'      => 'created_tmp',
-            'Key_'              => 'key',
-
-            'Delayed_'          => 'delayed',
-            'Not_flushed_delayed_rows' => 'delayed',
-
-            'Flush_commands'    => 'query',
-            'Last_query_cost'   => 'query',
-            'Slow_queries'      => 'query',
-            'Queries'           => 'query',
-            'Prepared_stmt_count' => 'query',
-
-            'Select_'           => 'select',
-            'Sort_'             => 'sort',
-
-            'Open_tables'       => 'table',
-            'Opened_tables'     => 'table',
-            'Open_table_definitions' => 'table',
-            'Opened_table_definitions' => 'table',
-            'Table_locks_'      => 'table',
-
-            'Rpl_status'        => 'repl',
-            'Slave_'            => 'repl',
-
-            'Tc_'               => 'tc',
-
-            'Ssl_'              => 'ssl',
-
-            'Open_files'        => 'files',
-            'Open_streams'      => 'files',
-            'Opened_files'      => 'files',
-        );
-    }
-
-    /**
-     * Gets the sections for constructor
-     *
-     * @return array
-     */
-    private function _getSections()
-    {
-        return array(
-            // section => section name (description)
-            'com'           => 'Com',
-            'query'         => __('SQL query'),
-            'innodb'        => 'InnoDB',
-            'ndb'           => 'NDB',
-            'handler'       => __('Handler'),
-            'qcache'        => __('Query cache'),
-            'threads'       => __('Threads'),
-            'binlog_cache'  => __('Binary log'),
-            'created_tmp'   => __('Temporary data'),
-            'delayed'       => __('Delayed inserts'),
-            'key'           => __('Key cache'),
-            'select'        => __('Joins'),
-            'repl'          => __('Replication'),
-            'sort'          => __('Sorting'),
-            'table'         => __('Tables'),
-            'tc'            => __('Transaction coordinator'),
-            'files'         => __('Files'),
-            'ssl'           => 'SSL',
-            'other'         => __('Other')
-        );
-    }
-
-    /**
-     * Gets the links for constructor
-     *
-     * @return array
-     */
-    private function _getLinks()
-    {
-        $links = array();
-        // variable or section name => (name => url)
-
-        $links['table'][__('Flush (close) all tables')] = $this->selfUrl
-            . PMA_URL_getCommon(
-                array(
-                    'flush' => 'TABLES'
-                )
-            );
-        $links['table'][__('Show open tables')]
-            = 'sql.php' . PMA_URL_getCommon(
-                array(
-                    'sql_query' => 'SHOW OPEN TABLES',
-                    'goto' => $this->selfUrl,
-                )
-            );
-
-        if ($GLOBALS['replication_info']['master']['status']) {
-            $links['repl'][__('Show slave hosts')]
-                = 'sql.php' . PMA_URL_getCommon(
-                    array(
-                        'sql_query' => 'SHOW SLAVE HOSTS',
-                        'goto' => $this->selfUrl,
-                    )
-                );
-            $links['repl'][__('Show master status')] = '#replication_master';
-        }
-        if ($GLOBALS['replication_info']['slave']['status']) {
-            $links['repl'][__('Show slave status')] = '#replication_slave';
-        }
-
-        $links['repl']['doc'] = 'replication';
-
-        $links['qcache'][__('Flush query cache')]
-            = $this->selfUrl
-            . PMA_URL_getCommon(
-                array(
-                    'flush' => 'QUERY CACHE'
-                )
-            );
-        $links['qcache']['doc'] = 'query_cache';
-
-        $links['threads']['doc'] = 'mysql_threads';
-
-        $links['key']['doc'] = 'myisam_key_cache';
-
-        $links['binlog_cache']['doc'] = 'binary_log';
-
-        $links['Slow_queries']['doc'] = 'slow_query_log';
-
-        $links['innodb'][__('Variables')]
-            = 'server_engines.php?engine=InnoDB&amp;'
-            . PMA_URL_getCommon(array(), 'html', '');
-        $links['innodb'][__('InnoDB Status')]
-            = 'server_engines.php'
-            . PMA_URL_getCommon(
-                array(
-                    'engine' => 'InnoDB',
-                    'page' => 'Status'
-                )
-            );
-        $links['innodb']['doc'] = 'innodb';
-
-        return($links);
-    }
-
-    /**
-     * Calculate some values
-     *
-     * @param array $server_status    contains results of SHOW GLOBAL STATUS
-     * @param array $server_variables contains results of SHOW GLOBAL VARIABLES
-     *
-     * @return array $server_status
-     */
-    private function _calculateValues($server_status, $server_variables)
-    {
-        // Key_buffer_fraction
-        if (isset($server_status['Key_blocks_unused'])
-            && isset($server_variables['key_cache_block_size'])
-            && isset($server_variables['key_buffer_size'])
-            && $server_variables['key_buffer_size'] != 0
-        ) {
-            $server_status['Key_buffer_fraction_%']
-                = 100
-                - $server_status['Key_blocks_unused']
-                * $server_variables['key_cache_block_size']
-                / $server_variables['key_buffer_size']
-                * 100;
-        } elseif (isset($server_status['Key_blocks_used'])
-            && isset($server_variables['key_buffer_size'])
-            && $server_variables['key_buffer_size'] != 0
-        ) {
-            $server_status['Key_buffer_fraction_%']
-                = $server_status['Key_blocks_used']
-                * 1024
-                / $server_variables['key_buffer_size'];
-        }
-
-        // Ratio for key read/write
-        if (isset($server_status['Key_writes'])
-            && isset($server_status['Key_write_requests'])
-            && $server_status['Key_write_requests'] > 0
-        ) {
-            $key_writes = $server_status['Key_writes'];
-            $key_write_requests = $server_status['Key_write_requests'];
-            $server_status['Key_write_ratio_%']
-                = 100 * $key_writes / $key_write_requests;
-        }
-
-        if (isset($server_status['Key_reads'])
-            && isset($server_status['Key_read_requests'])
-            && $server_status['Key_read_requests'] > 0
-        ) {
-            $key_reads = $server_status['Key_reads'];
-            $key_read_requests = $server_status['Key_read_requests'];
-            $server_status['Key_read_ratio_%']
-                = 100 * $key_reads / $key_read_requests;
-        }
-
-        // Threads_cache_hitrate
-        if (isset($server_status['Threads_created'])
-            && isset($server_status['Connections'])
-            && $server_status['Connections'] > 0
-        ) {
-
-            $server_status['Threads_cache_hitrate_%']
-                = 100 - $server_status['Threads_created']
-                / $server_status['Connections'] * 100;
-        }
-        return $server_status;
-    }
-
-    /**
-     * Sort variables into arrays
-     *
-     * @param array $server_status contains results of SHOW GLOBAL STATUS
-     * @param array $allocations   allocations for sections
-     * @param array $allocationMap map variables to their section
-     * @param array $sectionUsed   is a section used?
-     * @param array $used_queries  used queries
-     *
-     * @return array ($allocationMap, $sectionUsed, $used_queries)
-     */
-    private function _sortVariables(
-        $server_status, $allocations, $allocationMap, $sectionUsed,
-        $used_queries
-    ) {
-        foreach ($server_status as $name => $value) {
-            $section_found = false;
-            foreach ($allocations as $filter => $section) {
-                if (mb_strpos($name, $filter) !== false) {
-                    $allocationMap[$name] = $section;
-                    $sectionUsed[$section] = true;
-                    $section_found = true;
-                    if ($section == 'com' && $value > 0) {
-                        $used_queries[$name] = $value;
-                    }
-                    break; // Only exits inner loop
-                }
-            }
-            if (! $section_found) {
-                $allocationMap[$name] = 'other';
-                $sectionUsed['other'] = true;
-            }
-        }
-        return array($allocationMap, $sectionUsed, $used_queries);
-    }
-
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        $this->selfUrl = basename($GLOBALS['PMA_PHP_SELF']);
-
-        // get status from server
-        $server_status_result = $GLOBALS['dbi']->tryQuery('SHOW GLOBAL STATUS');
-        $server_status = array();
-        if ($server_status_result === false) {
-            $this->dataLoaded = false;
-        } else {
-            $this->dataLoaded = true;
-            while ($arr = $GLOBALS['dbi']->fetchRow($server_status_result)) {
-                $server_status[$arr[0]] = $arr[1];
-            }
-            $GLOBALS['dbi']->freeResult($server_status_result);
-        }
-
-        // for some calculations we require also some server settings
-        $server_variables = $GLOBALS['dbi']->fetchResult(
-            'SHOW GLOBAL VARIABLES', 0, 1
-        );
-
-        // cleanup of some deprecated values
-        $server_status = self::cleanDeprecated($server_status);
-
-        // calculate some values
-        $server_status = $this->_calculateValues(
-            $server_status, $server_variables
-        );
-
-        // split variables in sections
-        $allocations = $this->_getAllocations();
-
-        $sections = $this->_getSections();
-
-        // define some needful links/commands
-        $links = $this->_getLinks();
-
-        // Variable to contain all com_ variables (query statistics)
-        $used_queries = array();
-
-        // Variable to map variable names to their respective section name
-        // (used for js category filtering)
-        $allocationMap = array();
-
-        // Variable to mark used sections
-        $sectionUsed = array();
-
-        // sort vars into arrays
-        list(
-            $allocationMap, $sectionUsed, $used_queries
-        ) = $this->_sortVariables(
-            $server_status, $allocations, $allocationMap, $sectionUsed,
-            $used_queries
-        );
-
-        // admin commands are not queries (e.g. they include COM_PING,
-        // which is excluded from $server_status['Questions'])
-        unset($used_queries['Com_admin_commands']);
-
-        // Set all class properties
-        $this->db_isLocal = false;
-        $serverHostToLower = mb_strtolower(
-            $GLOBALS['cfg']['Server']['host']
-        );
-        if ($serverHostToLower === 'localhost'
-            || $GLOBALS['cfg']['Server']['host'] === '127.0.0.1'
-            || $GLOBALS['cfg']['Server']['host'] === '::1'
-        ) {
-            $this->db_isLocal = true;
-        }
-        $this->status = $server_status;
-        $this->sections = $sections;
-        $this->variables = $server_variables;
-        $this->used_queries = $used_queries;
-        $this->allocationMap = $allocationMap;
-        $this->links = $links;
-        $this->sectionUsed = $sectionUsed;
-    }
-
-    /**
-     * cleanup of some deprecated values
-     *
-     * @param array $server_status status array to process
-     *
-     * @return array
-     */
-    public static function cleanDeprecated($server_status)
-    {
-        $deprecated = array(
-            'Com_prepare_sql' => 'Com_stmt_prepare',
-            'Com_execute_sql' => 'Com_stmt_execute',
-            'Com_dealloc_sql' => 'Com_stmt_close',
-        );
-        foreach ($deprecated as $old => $new) {
-            if (isset($server_status[$old]) && isset($server_status[$new])) {
-                unset($server_status[$old]);
-            }
-        }
-        return $server_status;
-    }
-
-    /**
-     * Generates menu HTML
-     *
-     * @return string
-     */
-    public function getMenuHtml()
-    {
-        $url_params = PMA_URL_getCommon();
-        $items = array(
-            array(
-                'name' => __('Server'),
-                'url' => 'server_status.php'
-            ),
-            array(
-                'name' => __('Processes'),
-                'url' => 'server_status_processes.php'
-            ),
-            array(
-                'name' => __('Query statistics'),
-                'url' => 'server_status_queries.php'
-            ),
-            array(
-                'name' => __('All status variables'),
-                'url' => 'server_status_variables.php'
-            ),
-            array(
-                'name' => __('Monitor'),
-                'url' => 'server_status_monitor.php'
-            ),
-            array(
-                'name' => __('Advisor'),
-                'url' => 'server_status_advisor.php'
-            )
-        );
-
-        $retval  = '<ul id="topmenu2">';
-        foreach ($items as $item) {
-            $class = '';
-            if ($item['url'] === $this->selfUrl) {
-                $class = ' class="tabactive"';
-            }
-            $retval .= '<li>';
-            $retval .= '<a' . $class;
-            $retval .= ' href="' . $item['url'] . $url_params . '">';
-            $retval .= $item['name'];
-            $retval .= '</a>';
-            $retval .= '</li>';
-        }
-        $retval .= '</ul>';
-        $retval .= '<div class="clearfloat"></div>';
-
-        return $retval;
-    }
-
-    /**
-     * Builds a <select> list for refresh rates
-     *
-     * @param string $name         Name of select
-     * @param int    $defaultRate  Currently chosen rate
-     * @param array  $refreshRates List of refresh rates
-     *
-     * @return string
-     */
-    public static function getHtmlForRefreshList($name,
-        $defaultRate = 5,
-        $refreshRates = Array(1, 2, 5, 10, 20, 40, 60, 120, 300, 600)
-    ) {
-        $return = '<select name="' . $name . '" id="id_' . $name
-            . '" class="refreshRate">';
-        foreach ($refreshRates as $rate) {
-            $selected = ($rate == $defaultRate)?' selected="selected"':'';
-            $return .= '<option value="' . $rate . '"' . $selected . '>';
-            if ($rate < 60) {
-                $return .= sprintf(
-                    _ngettext('%d second', '%d seconds', $rate), $rate
-                );
-            } else {
-                $rate = $rate / 60;
-                $return .= sprintf(
-                    _ngettext('%d minute', '%d minutes', $rate), $rate
-                );
-            }
-            $return .=  '</option>';
-        }
-        $return .= '</select>';
-        return $return;
-    }
-}
-
diff --git a/#pma/libraries/StorageEngine.php b/#pma/libraries/StorageEngine.php
deleted file mode 100644
index 71aa8ef0..00000000
--- a/#pma/libraries/StorageEngine.php
+++ /dev/null
@@ -1,463 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Library for extracting information about the available storage engines
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries;
-
-/**
- * defines
- */
-use PMA\libraries\engines\Bdb;
-use PMA\libraries\engines\Berkeleydb;
-use PMA\libraries\engines\Binlog;
-use PMA\libraries\engines\Innobase;
-use PMA\libraries\engines\Innodb;
-use PMA\libraries\engines\Memory;
-use PMA\libraries\engines\Merge;
-use PMA\libraries\engines\Mrg_Myisam;
-use PMA\libraries\engines\Myisam;
-use PMA\libraries\engines\Ndbcluster;
-use PMA\libraries\engines\Pbxt;
-use PMA\libraries\engines\Performance_Schema;
-
-define('PMA_ENGINE_SUPPORT_NO', 0);
-define('PMA_ENGINE_SUPPORT_DISABLED', 1);
-define('PMA_ENGINE_SUPPORT_YES', 2);
-define('PMA_ENGINE_SUPPORT_DEFAULT', 3);
-
-define('PMA_ENGINE_DETAILS_TYPE_PLAINTEXT', 0);
-define('PMA_ENGINE_DETAILS_TYPE_SIZE',      1);
-define('PMA_ENGINE_DETAILS_TYPE_NUMERIC',   2); //Has no effect yet...
-define('PMA_ENGINE_DETAILS_TYPE_BOOLEAN',   3); // 'ON' or 'OFF'
-
-/**
- * Base Storage Engine Class
- *
- * @package PhpMyAdmin
- */
-class StorageEngine
-{
-    /**
-     * @var string engine name
-     */
-    var $engine  = 'dummy';
-
-    /**
-     * @var string engine title/description
-     */
-    var $title   = 'PMA Dummy Engine Class';
-
-    /**
-     * @var string engine lang description
-     */
-    var $comment
-        = 'If you read this text inside phpMyAdmin, something went wrong...';
-
-    /**
-     * @var integer engine supported by current server
-     */
-    var $support = PMA_ENGINE_SUPPORT_NO;
-
-    /**
-     * Constructor
-     *
-     * @param string $engine The engine ID
-     */
-    public function __construct($engine)
-    {
-        $storage_engines = StorageEngine::getStorageEngines();
-        if (! empty($storage_engines[$engine])) {
-            $this->engine  = $engine;
-            $this->title   = $storage_engines[$engine]['Engine'];
-            $this->comment = (isset($storage_engines[$engine]['Comment'])
-                ? $storage_engines[$engine]['Comment']
-                : '');
-            switch ($storage_engines[$engine]['Support']) {
-            case 'DEFAULT':
-                $this->support = PMA_ENGINE_SUPPORT_DEFAULT;
-                break;
-            case 'YES':
-                $this->support = PMA_ENGINE_SUPPORT_YES;
-                break;
-            case 'DISABLED':
-                $this->support = PMA_ENGINE_SUPPORT_DISABLED;
-                break;
-            case 'NO':
-            default:
-                $this->support = PMA_ENGINE_SUPPORT_NO;
-            }
-        }
-    }
-
-    /**
-     * Returns array of storage engines
-     *
-     * @static
-     * @staticvar array $storage_engines storage engines
-     * @access public
-     * @return string[] array of storage engines
-     */
-    static public function getStorageEngines()
-    {
-        static $storage_engines = null;
-
-        if (null == $storage_engines) {
-            $storage_engines
-                = $GLOBALS['dbi']->fetchResult('SHOW STORAGE ENGINES', 'Engine');
-            if (PMA_MYSQL_INT_VERSION >= 50708) {
-                $disabled = Util::cacheGet(
-                    'disabled_storage_engines',
-                    function () {
-                        return $GLOBALS['dbi']->fetchValue(
-                            'SELECT @@disabled_storage_engines'
-                        );
-                    }
-                );
-                foreach (explode(",", $disabled) as $engine) {
-                    if (isset($storage_engines[$engine])) {
-                        $storage_engines[$engine]['Support'] = 'DISABLED';
-                    }
-                }
-            }
-        }
-
-        return $storage_engines;
-    }
-
-    /**
-     * Returns HTML code for storage engine select box
-     *
-     * @param string  $name                    The name of the select form element
-     * @param string  $id                      The ID of the form field
-     * @param string  $selected                The selected engine
-     * @param boolean $offerUnavailableEngines Should unavailable storage
-     *                                         engines be offered?
-     * @param boolean $addEmpty                Whether to provide empty option
-     *
-     * @static
-     * @return string html selectbox
-     */
-    static public function getHtmlSelect(
-        $name = 'engine', $id = null,
-        $selected = null, $offerUnavailableEngines = false,
-        $addEmpty = false
-    ) {
-        $selected   = mb_strtolower($selected);
-        $output     = '<select name="' . $name . '"'
-            . (empty($id) ? '' : ' id="' . $id . '"') . '>' . "\n";
-
-        if ($addEmpty) {
-            $output .= '<option value=""></option>';
-        }
-
-        foreach (StorageEngine::getStorageEngines() as $key => $details) {
-            // Don't show PERFORMANCE_SCHEMA engine (MySQL 5.5)
-            if (! $offerUnavailableEngines
-                && ($details['Support'] == 'NO'
-                || $details['Support'] == 'DISABLED'
-                || $details['Engine'] == 'PERFORMANCE_SCHEMA')
-            ) {
-                continue;
-            }
-
-            $output .= '    <option value="' . htmlspecialchars($key) . '"'
-                . (empty($details['Comment'])
-                    ? '' : ' title="' . htmlspecialchars($details['Comment']) . '"')
-                . (mb_strtolower($key) == $selected
-                    || (empty($selected) && $details['Support'] == 'DEFAULT' && ! $addEmpty)
-                    ? ' selected="selected"' : '')
-                . '>' . "\n"
-                . '        ' . htmlspecialchars($details['Engine']) . "\n"
-                . '    </option>' . "\n";
-        }
-        $output .= '</select>' . "\n";
-        return $output;
-    }
-
-    /**
-     * Loads the corresponding engine plugin, if available.
-     *
-     * @param string $engine The engine ID
-     *
-     * @return StorageEngine The engine plugin
-     * @static
-     */
-    static public function getEngine($engine)
-    {
-        switch(strtolower($engine)) {
-        case 'bdb':
-            return new Bdb($engine);
-        case 'berkeleydb':
-            return new Berkeleydb($engine);
-        case 'binlog':
-            return new Binlog($engine);
-        case 'innobase':
-            return new Innobase($engine);
-        case 'innodb':
-            return new Innodb($engine);
-        case 'memory':
-            return new Memory($engine);
-        case 'merge':
-            return new Merge($engine);
-        case 'mrg_myisam':
-            return new Mrg_Myisam($engine);
-        case 'myisam':
-            return new Myisam($engine);
-        case 'ndbcluster':
-            return new Ndbcluster($engine);
-        case 'pbxt':
-            return new Pbxt($engine);
-        case 'performance_schema':
-            return new Performance_Schema($engine);
-        default:
-            return new StorageEngine($engine);
-        }
-    }
-
-    /**
-     * Returns true if given engine name is supported/valid, otherwise false
-     *
-     * @param string $engine name of engine
-     *
-     * @static
-     * @return boolean whether $engine is valid or not
-     */
-    static public function isValid($engine)
-    {
-        if ($engine == "PBMS") {
-            return true;
-        }
-        $storage_engines = StorageEngine::getStorageEngines();
-        return isset($storage_engines[$engine]);
-    }
-
-    /**
-     * Returns as HTML table of the engine's server variables
-     *
-     * @return string The table that was generated based on the retrieved
-     *                information
-     */
-    public function getHtmlVariables()
-    {
-        $odd_row    = false;
-        $ret        = '';
-
-        foreach ($this->getVariablesStatus() as $details) {
-            $ret .= '<tr class="' . ($odd_row ? 'odd' : 'even') . '">' . "\n"
-                  . '    <td>' . "\n";
-            if (! empty($details['desc'])) {
-                $ret .= '        '
-                    . Util::showHint($details['desc'])
-                    . "\n";
-            }
-            $ret .= '    </td>' . "\n"
-                  . '    <th>' . htmlspecialchars($details['title']) . '</th>'
-                  . "\n"
-                  . '    <td class="value">';
-            switch ($details['type']) {
-            case PMA_ENGINE_DETAILS_TYPE_SIZE:
-                $parsed_size = $this->resolveTypeSize($details['value']);
-                $ret .= $parsed_size[0] . '&nbsp;' . $parsed_size[1];
-                unset($parsed_size);
-                break;
-            case PMA_ENGINE_DETAILS_TYPE_NUMERIC:
-                $ret .= Util::formatNumber($details['value']) . ' ';
-                break;
-            default:
-                $ret .= htmlspecialchars($details['value']) . '   ';
-            }
-            $ret .= '</td>' . "\n"
-                  . '</tr>' . "\n";
-            $odd_row = ! $odd_row;
-        }
-
-        if (! $ret) {
-            $ret = '<p>' . "\n"
-                . '    '
-                . __(
-                    'There is no detailed status information available for this '
-                    . 'storage engine.'
-                )
-                . "\n"
-                . '</p>' . "\n";
-        } else {
-            $ret = '<table class="data">' . "\n" . $ret . '</table>' . "\n";
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Returns the engine specific handling for
-     * PMA_ENGINE_DETAILS_TYPE_SIZE type variables.
-     *
-     * This function should be overridden when
-     * PMA_ENGINE_DETAILS_TYPE_SIZE type needs to be
-     * handled differently for a particular engine.
-     *
-     * @param integer $value Value to format
-     *
-     * @return string the formatted value and its unit
-     */
-    public function resolveTypeSize($value)
-    {
-        return Util::formatByteDown($value);
-    }
-
-    /**
-     * Returns array with detailed info about engine specific server variables
-     *
-     * @return array array with detailed info about specific engine server variables
-     */
-    public function getVariablesStatus()
-    {
-        $variables = $this->getVariables();
-        $like = $this->getVariablesLikePattern();
-
-        if ($like) {
-            $like = " LIKE '" . $like . "' ";
-        } else {
-            $like = '';
-        }
-
-        $mysql_vars = array();
-
-        $sql_query = 'SHOW GLOBAL VARIABLES ' . $like . ';';
-        $res = $GLOBALS['dbi']->query($sql_query);
-        while ($row = $GLOBALS['dbi']->fetchAssoc($res)) {
-            if (isset($variables[$row['Variable_name']])) {
-                $mysql_vars[$row['Variable_name']]
-                    = $variables[$row['Variable_name']];
-            } elseif (! $like
-                && mb_strpos(mb_strtolower($row['Variable_name']), mb_strtolower($this->engine)) !== 0
-            ) {
-                continue;
-            }
-            $mysql_vars[$row['Variable_name']]['value'] = $row['Value'];
-
-            if (empty($mysql_vars[$row['Variable_name']]['title'])) {
-                $mysql_vars[$row['Variable_name']]['title'] = $row['Variable_name'];
-            }
-
-            if (! isset($mysql_vars[$row['Variable_name']]['type'])) {
-                $mysql_vars[$row['Variable_name']]['type']
-                    = PMA_ENGINE_DETAILS_TYPE_PLAINTEXT;
-            }
-        }
-        $GLOBALS['dbi']->freeResult($res);
-
-        return $mysql_vars;
-    }
-
-    /**
-     * Reveals the engine's title
-     *
-     * @return string The title
-     */
-    public function getTitle()
-    {
-        return $this->title;
-    }
-
-    /**
-     * Fetches the server's comment about this engine
-     *
-     * @return string The comment
-     */
-    public function getComment()
-    {
-        return $this->comment;
-    }
-
-    /**
-     * Information message on whether this storage engine is supported
-     *
-     * @return string The localized message.
-     */
-    public function getSupportInformationMessage()
-    {
-        switch ($this->support) {
-        case PMA_ENGINE_SUPPORT_DEFAULT:
-            $message = __('%s is the default storage engine on this MySQL server.');
-            break;
-        case PMA_ENGINE_SUPPORT_YES:
-            $message = __('%s is available on this MySQL server.');
-            break;
-        case PMA_ENGINE_SUPPORT_DISABLED:
-            $message = __('%s has been disabled for this MySQL server.');
-            break;
-        case PMA_ENGINE_SUPPORT_NO:
-        default:
-            $message = __(
-                'This MySQL server does not support the %s storage engine.'
-            );
-        }
-        return sprintf($message, htmlspecialchars($this->title));
-    }
-
-    /**
-     * Generates a list of MySQL variables that provide information about this
-     * engine. This function should be overridden when extending this class
-     * for a particular engine.
-     *
-     * @return array The list of variables.
-     */
-    public function getVariables()
-    {
-        return array();
-    }
-
-    /**
-     * Returns string with filename for the MySQL helppage
-     * about this storage engine
-     *
-     * @return string MySQL help page filename
-     */
-    public function getMysqlHelpPage()
-    {
-        return $this->engine . '-storage-engine';
-    }
-
-    /**
-     * Returns the pattern to be used in the query for SQL variables
-     * related to the storage engine
-     *
-     * @return string SQL query LIKE pattern
-     */
-    public function getVariablesLikePattern()
-    {
-        return '';
-    }
-
-    /**
-     * Returns a list of available information pages with labels
-     *
-     * @return string[] The list
-     */
-    public function getInfoPages()
-    {
-        return array();
-    }
-
-    /**
-     * Generates the requested information page
-     *
-     * @param string $id page id
-     *
-     * @return string html output
-     */
-    public function getPage($id)
-    {
-        if (! array_key_exists($id, $this->getInfoPages())) {
-            return '';
-        }
-
-        $id = 'getPage' . $id;
-
-        return $this->$id();
-    }
-}
-
diff --git a/#pma/libraries/SubPartition.php b/#pma/libraries/SubPartition.php
deleted file mode 100644
index fda338ce..00000000
--- a/#pma/libraries/SubPartition.php
+++ /dev/null
@@ -1,180 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Library for extracting information about the sub-partitions
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries;
-
-/**
- * Represents a sub partition of a table
- *
- * @package PhpMyAdmin
- */
-class SubPartition
-{
-    /**
-     * @var string the database
-     */
-    protected $db;
-    /**
-     * @var string the table
-     */
-    protected $table;
-    /**
-     * @var string partition name
-     */
-    protected $name;
-    /**
-     * @var integer ordinal
-     */
-    protected $ordinal;
-    /**
-     * @var string partition method
-     */
-    protected $method;
-    /**
-     * @var string partition expression
-     */
-    protected $expression;
-    /**
-     * @var integer no of table rows in the partition
-     */
-    protected $rows;
-    /**
-     * @var integer data length
-     */
-    protected $dataLength;
-    /**
-     * @var integer index length
-     */
-    protected $indexLength;
-    /**
-     * @var string partition comment
-     */
-    protected $comment;
-
-    /**
-     * Constructs a partition
-     *
-     * @param array $row fetched row from information_schema.PARTITIONS
-     */
-    public function __construct($row)
-    {
-        $this->db = $row['TABLE_SCHEMA'];
-        $this->table = $row['TABLE_NAME'];
-        $this->loadData($row);
-    }
-
-    /**
-     * Loads data from the fetched row from information_schema.PARTITIONS
-     *
-     * @param array $row fetched row
-     *
-     * @return void
-     */
-    protected function loadData($row)
-    {
-        $this->name = $row['SUBPARTITION_NAME'];
-        $this->ordinal = $row['SUBPARTITION_ORDINAL_POSITION'];
-        $this->method = $row['SUBPARTITION_METHOD'];
-        $this->expression = $row['SUBPARTITION_EXPRESSION'];
-        $this->loadCommonData($row);
-    }
-
-    /**
-     * Loads some data that is common to both partitions and sub partitions
-     *
-     * @param array $row fetched row
-     *
-     * @return void
-     */
-    protected function loadCommonData($row)
-    {
-        $this->rows = $row['TABLE_ROWS'];
-        $this->dataLength = $row['DATA_LENGTH'];
-        $this->indexLength = $row['INDEX_LENGTH'];
-        $this->comment = $row['PARTITION_COMMENT'];
-    }
-
-    /**
-     * Return the partition name
-     *
-     * @return string partition name
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * Return the ordinal of the partition
-     *
-     * @return number the ordinal
-     */
-    public function getOrdinal()
-    {
-        return $this->ordinal;
-    }
-
-    /**
-     * Returns the partition method
-     *
-     * @return string partition method
-     */
-    public function getMethod()
-    {
-        return $this->method;
-    }
-
-    /**
-     * Returns the partition expression
-     *
-     * @return string partition expression
-     */
-    public function getExpression()
-    {
-        return $this->expression;
-    }
-
-    /**
-     * Returns the number of data rows
-     *
-     * @return integer number of rows
-     */
-    public function getRows()
-    {
-        return $this->rows;
-    }
-
-    /**
-     * Returns the data length
-     *
-     * @return integer data length
-     */
-    public function getDataLength()
-    {
-        return $this->dataLength;
-    }
-
-    /**
-     * Returns the index length
-     *
-     * @return integer index length
-     */
-    public function getIndexLength()
-    {
-        return $this->indexLength;
-    }
-
-    /**
-     * Returns the partition comment
-     *
-     * @return string partition comment
-     */
-    public function getComment()
-    {
-        return $this->comment;
-    }
-}
\ No newline at end of file
diff --git a/#pma/libraries/SysInfo.php b/#pma/libraries/SysInfo.php
deleted file mode 100644
index 0339d28f..00000000
--- a/#pma/libraries/SysInfo.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Hold PMA\libraries\SysInfo class
- *
- * @package PMA
- */
-namespace PMA\libraries;
-
-/**
- * Basic sysinfo class not providing any real data.
- *
- * @package PhpMyAdmin-sysinfo
- */
-class SysInfo
-{
-    public $os = PHP_OS;
-
-    /**
-     * Gets load information
-     *
-     * @return array with load data
-     */
-    public function loadavg()
-    {
-        return array('loadavg' => 0);
-    }
-
-    /**
-     * Gets information about memory usage
-     *
-     * @return array with memory usage data
-     */
-    public function memory()
-    {
-        return array();
-    }
-
-    /**
-     * Checks whether class is supported in this environment
-     *
-     * @return true on success
-     */
-    public function supported()
-    {
-        return true;
-    }
-}
\ No newline at end of file
diff --git a/#pma/libraries/SysInfoLinux.php b/#pma/libraries/SysInfoLinux.php
deleted file mode 100644
index 6d66c9c2..00000000
--- a/#pma/libraries/SysInfoLinux.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Hold PMA\libraries\SysInfoLinux class
- *
- * @package PMA
- */
-namespace PMA\libraries;
-
-/**
- * Linux based SysInfo class
- *
- * @package PhpMyAdmin-sysinfo
- */
-class SysInfoLinux extends \PMA\libraries\SysInfo
-{
-    public $os = 'Linux';
-
-    /**
-     * Gets load information
-     *
-     * @return array with load data
-     */
-    function loadavg()
-    {
-        $buf = file_get_contents('/proc/stat');
-        $nums = preg_split(
-            "/\s+/",
-            mb_substr(
-                $buf,
-                0,
-                mb_strpos($buf, "\n")
-            )
-        );
-
-        return Array(
-            'busy' => $nums[1] + $nums[2] + $nums[3],
-            'idle' => intval($nums[4]),
-        );
-    }
-
-    /**
-     * Checks whether class is supported in this environment
-     *
-     * @return true on success
-     */
-    public function supported()
-    {
-        return @is_readable('/proc/meminfo') && @is_readable('/proc/stat');
-    }
-
-    /**
-     * Gets information about memory usage
-     *
-     * @return array with memory usage data
-     */
-    function memory()
-    {
-        preg_match_all(
-            MEMORY_REGEXP,
-            file_get_contents('/proc/meminfo'),
-            $matches
-        );
-
-        $mem = array_combine($matches[1], $matches[2]);
-
-        $defaults = array(
-            'MemTotal'   => 0,
-            'MemFree'    => 0,
-            'Cached'     => 0,
-            'Buffers'    => 0,
-            'SwapTotal'  => 0,
-            'SwapFree'   => 0,
-            'SwapCached' => 0,
-        );
-
-        $mem = array_merge($defaults, $mem);
-
-        $mem['MemUsed'] = $mem['MemTotal']
-            - $mem['MemFree'] - $mem['Cached'] - $mem['Buffers'];
-
-        $mem['SwapUsed'] = $mem['SwapTotal']
-            - $mem['SwapFree'] - $mem['SwapCached'];
-
-        foreach ($mem as $idx => $value) {
-            $mem[$idx] = intval($value);
-        }
-
-        return $mem;
-    }
-}
diff --git a/#pma/libraries/SysInfoSunOS.php b/#pma/libraries/SysInfoSunOS.php
deleted file mode 100644
index bca40cae..00000000
--- a/#pma/libraries/SysInfoSunOS.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Hold PMA\libraries\SysInfoSunOS class
- *
- * @package PMA
- */
-namespace PMA\libraries;
-
-/**
- * SunOS based SysInfo class
- *
- * @package PhpMyAdmin-sysinfo
- */
-class SysInfoSunOS extends \PMA\libraries\SysInfo
-{
-    public $os = 'SunOS';
-
-    /**
-     * Read value from kstat
-     *
-     * @param string $key Key to read
-     *
-     * @return string with value
-     */
-    private function _kstat($key)
-    {
-        if ($m = shell_exec('kstat -p d ' . $key)) {
-            list(, $value) = preg_split("/\t/", trim($m), 2);
-
-            return $value;
-        } else {
-            return '';
-        }
-    }
-
-    /**
-     * Gets load information
-     *
-     * @return array with load data
-     */
-    public function loadavg()
-    {
-        $load1 = $this->_kstat('unix:0:system_misc:avenrun_1min');
-
-        return array('loadavg' => $load1);
-    }
-
-    /**
-     * Checks whether class is supported in this environment
-     *
-     * @return true on success
-     */
-    public function supported()
-    {
-        return @is_readable('/proc/meminfo');
-    }
-
-    /**
-     * Gets information about memory usage
-     *
-     * @return array with memory usage data
-     */
-    public function memory()
-    {
-        $pagesize = $this->_kstat('unix:0:seg_cache:slab_size');
-        $mem = array();
-        $mem['MemTotal']
-            = $this->_kstat('unix:0:system_pages:pagestotal') * $pagesize;
-        $mem['MemUsed']
-            = $this->_kstat('unix:0:system_pages:pageslocked') * $pagesize;
-        $mem['MemFree']
-            = $this->_kstat('unix:0:system_pages:pagesfree') * $pagesize;
-        $mem['SwapTotal'] = $this->_kstat('unix:0:vminfo:swap_avail') / 1024;
-        $mem['SwapUsed'] = $this->_kstat('unix:0:vminfo:swap_alloc') / 1024;
-        $mem['SwapFree'] = $this->_kstat('unix:0:vminfo:swap_free') / 1024;
-
-        return $mem;
-    }
-}
\ No newline at end of file
diff --git a/#pma/libraries/SysInfoWINNT.php b/#pma/libraries/SysInfoWINNT.php
deleted file mode 100644
index c56ddbb0..00000000
--- a/#pma/libraries/SysInfoWINNT.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Hold PMA\libraries\SysInfoWINNT class
- *
- * @package PMA
- */
-namespace PMA\libraries;
-
-use COM;
-
-/**
- * Windows NT based SysInfo class
- *
- * @package PhpMyAdmin-sysinfo
- */
-class SysInfoWINNT extends \PMA\libraries\SysInfo
-{
-    private $_wmi;
-    public $os = 'WINNT';
-
-    /**
-     * Constructor to access to wmi database.
-     */
-    public function __construct()
-    {
-        if (!class_exists('COM')) {
-            $this->_wmi = null;
-        } else {
-            // initialize the wmi object
-            $objLocator = new COM('WbemScripting.SWbemLocator');
-            $this->_wmi = $objLocator->ConnectServer();
-        }
-    }
-
-    /**
-     * Gets load information
-     *
-     * @return array with load data
-     */
-    function loadavg()
-    {
-        $loadavg = "";
-        $sum = 0;
-        $buffer = $this->_getWMI('Win32_Processor', array('LoadPercentage'));
-
-        foreach ($buffer as $load) {
-            $value = $load['LoadPercentage'];
-            $loadavg .= $value . ' ';
-            $sum += $value;
-        }
-
-        return array('loadavg' => $sum / count($buffer));
-    }
-
-    /**
-     * Checks whether class is supported in this environment
-     *
-     * @return true on success
-     */
-    public function supported()
-    {
-        return !is_null($this->_wmi);
-    }
-
-    /**
-     * Reads data from WMI
-     *
-     * @param string $strClass Class to read
-     * @param array  $strValue Values to read
-     *
-     * @return array with results
-     */
-    private function _getWMI($strClass, $strValue = array())
-    {
-        $arrData = array();
-
-        $objWEBM = $this->_wmi->Get($strClass);
-        $arrProp = $objWEBM->Properties_;
-        $arrWEBMCol = $objWEBM->Instances_();
-        foreach ($arrWEBMCol as $objItem) {
-            $arrInstance = array();
-            foreach ($arrProp as $propItem) {
-                $name = $propItem->Name;
-                if (empty($strValue) || in_array($name, $strValue)) {
-                    $value = $objItem->$name;
-                    $arrInstance[$name] = trim($value);
-                }
-            }
-            $arrData[] = $arrInstance;
-        }
-
-        return $arrData;
-    }
-
-    /**
-     * Gets information about memory usage
-     *
-     * @return array with memory usage data
-     */
-    function memory()
-    {
-        $buffer = $this->_getWMI(
-            "Win32_OperatingSystem",
-            array('TotalVisibleMemorySize', 'FreePhysicalMemory')
-        );
-        $mem = Array();
-        $mem['MemTotal'] = $buffer[0]['TotalVisibleMemorySize'];
-        $mem['MemFree'] = $buffer[0]['FreePhysicalMemory'];
-        $mem['MemUsed'] = $mem['MemTotal'] - $mem['MemFree'];
-
-        $buffer = $this->_getWMI('Win32_PageFileUsage');
-
-        $mem['SwapTotal'] = 0;
-        $mem['SwapUsed'] = 0;
-        $mem['SwapPeak'] = 0;
-
-        foreach ($buffer as $swapdevice) {
-            $mem['SwapTotal'] += $swapdevice['AllocatedBaseSize'] * 1024;
-            $mem['SwapUsed'] += $swapdevice['CurrentUsage'] * 1024;
-            $mem['SwapPeak'] += $swapdevice['PeakUsage'] * 1024;
-        }
-
-        return $mem;
-    }
-}
diff --git a/#pma/libraries/SystemDatabase.php b/#pma/libraries/SystemDatabase.php
deleted file mode 100644
index 7e39e462..00000000
--- a/#pma/libraries/SystemDatabase.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * hold PMA\libraries\SystemDatabase class
- *
- * @package PMA
- */
-namespace PMA\libraries;
-
-require_once 'libraries/database_interface.inc.php';
-
-/**
- * Class SystemDatabase
- *
- * @package PMA
- */
-class SystemDatabase
-{
-    /**
-     * @var DatabaseInterface
-     */
-    protected $dbi;
-
-    /**
-     * Get instance of SystemDatabase
-     *
-     * @param DatabaseInterface $dbi Database interface for the system database
-     *
-     */
-    function __construct(DatabaseInterface $dbi)
-    {
-        $this->dbi = $dbi;
-    }
-
-    /**
-     * Get existing data on transformations applied for
-     * columns in a particular table
-     *
-     * @param string $db Database name looking for
-     *
-     * @return \mysqli_result Result of executed SQL query
-     */
-    public function getExistingTransformationData($db)
-    {
-        $cfgRelation = \PMA_getRelationsParam();
-
-        // Get the existing transformation details of the same database
-        // from pma__column_info table
-        $pma_transformation_sql = sprintf(
-            "SELECT * FROM %s.%s WHERE `db_name` = '%s'",
-            Util::backquote($cfgRelation['db']),
-            Util::backquote($cfgRelation['column_info']),
-            $GLOBALS['dbi']->escapeString($db)
-        );
-
-        return $this->dbi->tryQuery($pma_transformation_sql);
-    }
-
-    /**
-     * Get SQL query for store new transformation details of a VIEW
-     *
-     * @param object $pma_transformation_data Result set of SQL execution
-     * @param array  $column_map              Details of VIEW columns
-     * @param string $view_name               Name of the VIEW
-     * @param string $db                      Database name of the VIEW
-     *
-     * @return string $new_transformations_sql SQL query for new transformations
-     */
-    function getNewTransformationDataSql(
-        $pma_transformation_data, $column_map, $view_name, $db
-    ) {
-        $cfgRelation = \PMA_getRelationsParam();
-
-        // Need to store new transformation details for VIEW
-        $new_transformations_sql = sprintf(
-            "INSERT INTO %s.%s ("
-            . "`db_name`, `table_name`, `column_name`, "
-            . "`comment`, `mimetype`, `transformation`, "
-            . "`transformation_options`) VALUES",
-            Util::backquote($cfgRelation['db']),
-            Util::backquote($cfgRelation['column_info'])
-        );
-
-        $column_count = 0;
-        $add_comma = false;
-
-        while ($data_row = $this->dbi->fetchAssoc($pma_transformation_data)) {
-
-            foreach ($column_map as $column) {
-
-                if ($data_row['table_name'] != $column['table_name']
-                    || $data_row['column_name'] != $column['refering_column']
-                ) {
-                    continue;
-                }
-
-                $new_transformations_sql .= sprintf(
-                    "%s ('%s', '%s', '%s', '%s', '%s', '%s', '%s')",
-                    $add_comma ? ', ' : '',
-                    $db,
-                    $view_name,
-                    isset($column['real_column'])
-                    ? $column['real_column']
-                    : $column['refering_column'],
-                    $data_row['comment'],
-                    $data_row['mimetype'],
-                    $data_row['transformation'],
-                    $GLOBALS['dbi']->escapeString(
-                        $data_row['transformation_options']
-                    )
-                );
-
-                $add_comma = true;
-                $column_count++;
-                break;
-            }
-
-            if ($column_count == count($column_map)) {
-                break;
-            }
-        }
-
-        return ($column_count > 0) ? $new_transformations_sql : '';
-    }
-}
diff --git a/#pma/libraries/Table.php b/#pma/libraries/Table.php
deleted file mode 100644
index 4067dfd8..00000000
--- a/#pma/libraries/Table.php
+++ /dev/null
@@ -1,2535 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Holds the Table class
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries;
-
-use PMA\libraries\plugins\export\ExportSql;
-use SqlParser\Components\Expression;
-use SqlParser\Components\OptionsArray;
-use SqlParser\Context;
-use SqlParser\Parser;
-use SqlParser\Statements\DropStatement;
-
-/**
- * Handles everything related to tables
- *
- * @todo make use of Message and Error
- * @package PhpMyAdmin
- */
-class Table
-{
-    /**
-     * UI preferences properties
-     */
-    const PROP_SORTED_COLUMN = 'sorted_col';
-    const PROP_COLUMN_ORDER = 'col_order';
-    const PROP_COLUMN_VISIB = 'col_visib';
-
-    /**
-     * @var string  engine (innodb, myisam, bdb, ...)
-     */
-    var $engine = '';
-
-    /**
-     * @var string  type (view, base table, system view)
-     */
-    var $type = '';
-
-    /**
-     * @var array UI preferences
-     */
-    var $uiprefs;
-
-    /**
-     * @var array errors occurred
-     */
-    var $errors = array();
-
-    /**
-     * @var array messages
-     */
-    var $messages = array();
-
-    /**
-     * @var string  table name
-     */
-    protected $_name = '';
-
-    /**
-     * @var string  database name
-     */
-    protected $_db_name = '';
-
-    /**
-     * @var DatabaseInterface
-     */
-    protected $_dbi;
-
-    /**
-     * Constructor
-     *
-     * @param string            $table_name table name
-     * @param string            $db_name    database name
-     * @param DatabaseInterface $dbi        database interface for the table
-     */
-    function __construct($table_name, $db_name, DatabaseInterface $dbi = null)
-    {
-        if (empty($dbi)) {
-            $dbi = $GLOBALS['dbi'];
-        }
-        $this->_dbi = $dbi;
-        $this->_name = $table_name;
-        $this->_db_name = $db_name;
-    }
-
-    /**
-     * returns table name
-     *
-     * @see Table::getName()
-     * @return string  table name
-     */
-    function __toString()
-    {
-        return $this->getName();
-    }
-
-    /**
-     * return the last error
-     *
-     * @return string the last error
-     */
-    function getLastError()
-    {
-        return end($this->errors);
-    }
-
-    /**
-     * return the last message
-     *
-     * @return string the last message
-     */
-    function getLastMessage()
-    {
-        return end($this->messages);
-    }
-
-    /**
-     * returns table name
-     *
-     * @param boolean $backquoted whether to quote name with backticks ``
-     *
-     * @return string  table name
-     */
-    function getName($backquoted = false)
-    {
-        if ($backquoted) {
-            return Util::backquote($this->_name);
-        }
-        return $this->_name;
-    }
-
-    /**
-     * returns database name for this table
-     *
-     * @param boolean $backquoted whether to quote name with backticks ``
-     *
-     * @return string  database name for this table
-     */
-    function getDbName($backquoted = false)
-    {
-        if ($backquoted) {
-            return Util::backquote($this->_db_name);
-        }
-        return $this->_db_name;
-    }
-
-    /**
-     * returns full name for table, including database name
-     *
-     * @param boolean $backquoted whether to quote name with backticks ``
-     *
-     * @return string
-     */
-    function getFullName($backquoted = false)
-    {
-        return $this->getDbName($backquoted) . '.'
-        . $this->getName($backquoted);
-    }
-
-    /**
-     * returns whether the table is actually a view
-     *
-     * @return boolean whether the given is a view
-     */
-    public function isView()
-    {
-        $db = $this->_db_name;
-        $table = $this->_name;
-        if (empty($db) || empty($table)) {
-            return false;
-        }
-
-        // use cached data or load information with SHOW command
-        if ($this->_dbi->getCachedTableContent(array($db, $table)) != null
-            || $GLOBALS['cfg']['Server']['DisableIS']
-        ) {
-            $type = $this->getStatusInfo('TABLE_TYPE');
-            return $type == 'VIEW' || $type == 'SYSTEM VIEW';
-        }
-
-        // information_schema tables are 'SYSTEM VIEW's
-        if ($db == 'information_schema') {
-            return true;
-        }
-
-        // query information_schema
-        $result = $this->_dbi->fetchResult(
-            "SELECT TABLE_NAME
-            FROM information_schema.VIEWS
-            WHERE TABLE_SCHEMA = '" . $GLOBALS['dbi']->escapeString($db) . "'
-                AND TABLE_NAME = '" . $GLOBALS['dbi']->escapeString($table) . "'"
-        );
-        return $result ? true : false;
-    }
-
-    /**
-     * Returns whether the table is actually an updatable view
-     *
-     * @return boolean whether the given is an updatable view
-     */
-    public function isUpdatableView()
-    {
-        if (empty($this->_db_name) || empty($this->_name)) {
-            return false;
-        }
-
-        $result = $this->_dbi->fetchResult(
-            "SELECT TABLE_NAME
-            FROM information_schema.VIEWS
-            WHERE TABLE_SCHEMA = '" . $GLOBALS['dbi']->escapeString($this->_db_name) . "'
-                AND TABLE_NAME = '" . $GLOBALS['dbi']->escapeString($this->_name) . "'
-                AND IS_UPDATABLE = 'YES'"
-        );
-        return $result ? true : false;
-    }
-
-    /**
-     * Returns the analysis of 'SHOW CREATE TABLE' query for the table.
-     * In case of a view, the values are taken from the information_schema.
-     *
-     * @return array analysis of 'SHOW CREATE TABLE' query for the table
-     */
-    public function analyzeStructure()
-    {
-        if (empty($this->_db_name) || empty($this->_name)) {
-            return false;
-        }
-
-        $analyzed_sql = array();
-        if ($this->isView()) {
-            // For a view, 'SHOW CREATE TABLE' returns the definition,
-            // but the structure of the view. So, we try to mock
-            // the result of analyzing 'SHOW CREATE TABLE' query.
-            $analyzed_sql[0] = array();
-            $analyzed_sql[0]['create_table_fields'] = array();
-
-            $results = $this->_dbi->fetchResult(
-                "SELECT COLUMN_NAME, DATA_TYPE
-                FROM information_schema.COLUMNS
-                WHERE TABLE_SCHEMA = '" . $GLOBALS['dbi']->escapeString($this->_db_name)
-                . " AND TABLE_NAME = '" . $GLOBALS['dbi']->escapeString($this->_name) . "'"
-            );
-
-            foreach ($results as $result) {
-                $analyzed_sql[0]['create_table_fields'][$result['COLUMN_NAME']]
-                    = array(
-                        'type' => mb_strtoupper($result['DATA_TYPE'])
-                    );
-            }
-        } else {
-            $show_create_table = $this->_dbi->fetchValue(
-                'SHOW CREATE TABLE '
-                . Util::backquote($this->_db_name)
-                . '.' . Util::backquote($this->_name),
-                0,
-                1
-            );
-            $analyzed_sql = PMA_SQP_analyze(PMA_SQP_parse($show_create_table));
-        }
-        return $analyzed_sql;
-    }
-
-    /**
-     * Checks if this is a merge table
-     *
-     * If the ENGINE of the table is MERGE or MRG_MYISAM (alias),
-     * this is a merge table.
-     *
-     *
-     * @return boolean  true if it is a merge table
-     */
-    public function isMerge()
-    {
-        $engine = null;
-        // if called static, with parameters
-        if (! empty($this->_db_name) && ! empty($this->_name)) {
-            $engine = $this->getStatusInfo('ENGINE', null, true);
-        }
-
-        // did we get engine?
-        if (empty($engine)) {
-            return false;
-        }
-
-        // any of known merge engines?
-        return in_array(
-            mb_strtoupper($engine),
-            array('MERGE', 'MRG_MYISAM')
-        );
-    }
-
-    /**
-     * Returns full table status info, or specific if $info provided
-     * this info is collected from information_schema
-     *
-     * @param string  $info          specific information to be fetched
-     * @param boolean $force_read    read new rather than serving from cache
-     * @param boolean $disable_error if true, disables error message
-     *
-     * @todo DatabaseInterface::getTablesFull needs to be merged
-     * somehow into this class or at least better documented
-     *
-     * @return mixed
-     */
-    public function getStatusInfo(
-        $info = null,
-        $force_read = false,
-        $disable_error = false
-    ) {
-        $db = $this->_db_name;
-        $table = $this->_name;
-
-        if (! empty($_SESSION['is_multi_query'])) {
-            $disable_error = true;
-        }
-
-        // sometimes there is only one entry (ExactRows) so
-        // we have to get the table's details
-        if ($this->_dbi->getCachedTableContent(array($db, $table)) == null
-            || $force_read
-            || count($this->_dbi->getCachedTableContent(array($db, $table))) == 1
-        ) {
-            $this->_dbi->getTablesFull($db, $table);
-        }
-
-        if ($this->_dbi->getCachedTableContent(array($db, $table)) == null) {
-            // happens when we enter the table creation dialog
-            // or when we really did not get any status info, for example
-            // when $table == 'TABLE_NAMES' after the user tried SHOW TABLES
-            return '';
-        }
-
-        if (null === $info) {
-            return $this->_dbi->getCachedTableContent(array($db, $table));
-        }
-
-        // array_key_exists allows for null values
-        if (!array_key_exists(
-            $info, $this->_dbi->getCachedTableContent(array($db, $table))
-        )
-        ) {
-            if (! $disable_error) {
-                trigger_error(
-                    __('Unknown table status:') . ' ' . $info,
-                    E_USER_WARNING
-                );
-            }
-            return false;
-        }
-
-        return $this->_dbi->getCachedTableContent(array($db, $table, $info));
-    }
-
-    /**
-     * generates column specification for ALTER or CREATE TABLE syntax
-     *
-     * @param string      $name          name
-     * @param string      $type          type ('INT', 'VARCHAR', 'BIT', ...)
-     * @param string      $length        length ('2', '5,2', '', ...)
-     * @param string      $attribute     attribute
-     * @param string      $collation     collation
-     * @param bool|string $null          with 'NULL' or 'NOT NULL'
-     * @param string      $default_type  whether default is CURRENT_TIMESTAMP,
-     *                                   NULL, NONE, USER_DEFINED
-     * @param string      $default_value default value for USER_DEFINED
-     *                                   default type
-     * @param string      $extra         'AUTO_INCREMENT'
-     * @param string      $comment       field comment
-     * @param string      $virtuality    virtuality of the column
-     * @param string      $expression    expression for the virtual column
-     * @param string      $move_to       new position for column
-     *
-     * @todo    move into class PMA_Column
-     * @todo on the interface, some js to clear the default value when the
-     * default current_timestamp is checked
-     *
-     * @return string  field specification
-     */
-    static function generateFieldSpec($name, $type, $length = '',
-        $attribute = '', $collation = '', $null = false,
-        $default_type = 'USER_DEFINED', $default_value = '',  $extra = '',
-        $comment = '', $virtuality = '', $expression = '', $move_to = ''
-    ) {
-        $is_timestamp = mb_strpos(
-            mb_strtoupper($type),
-            'TIMESTAMP'
-        ) !== false;
-
-        $query = Util::backquote($name) . ' ' . $type;
-
-        // allow the possibility of a length for TIME, DATETIME and TIMESTAMP
-        // (will work on MySQL >= 5.6.4)
-        //
-        // MySQL permits a non-standard syntax for FLOAT and DOUBLE,
-        // see https://dev.mysql.com/doc/refman/5.5/en/floating-point-types.html
-        //
-        $pattern = '@^(DATE|TINYBLOB|TINYTEXT|BLOB|TEXT|'
-            . 'MEDIUMBLOB|MEDIUMTEXT|LONGBLOB|LONGTEXT|SERIAL|BOOLEAN|UUID)$@i';
-        if (strlen($length) !== 0 && ! preg_match($pattern, $type)) {
-            // Note: The variable $length here can contain several other things
-            // besides length - ENUM/SET value or length of DECIMAL (eg. 12,3)
-            // so we can't just convert it to integer
-            $query .= '(' . $length . ')';
-        }
-
-        if ($virtuality) {
-            $query .= ' AS (' . $expression . ') ' . $virtuality;
-        } else {
-            if ($attribute != '') {
-                $query .= ' ' . $attribute;
-
-                if ($is_timestamp
-                    && preg_match('/TIMESTAMP/i', $attribute)
-                    && $length !== 0
-                ) {
-                    $query .= '(' . $length . ')';
-                }
-            }
-
-            $matches = preg_match(
-                '@^(TINYTEXT|TEXT|MEDIUMTEXT|LONGTEXT|VARCHAR|CHAR|ENUM|SET)$@i',
-                $type
-            );
-            if (! empty($collation) && $collation != 'NULL' && $matches) {
-                $query .= PMA_generateCharsetQueryPart($collation, true);
-            }
-
-            if ($null !== false) {
-                if ($null == 'NULL') {
-                    $query .= ' NULL';
-                } else {
-                    $query .= ' NOT NULL';
-                }
-            }
-
-            switch ($default_type) {
-            case 'USER_DEFINED' :
-                if ($is_timestamp && $default_value === '0') {
-                    // a TIMESTAMP does not accept DEFAULT '0'
-                    // but DEFAULT 0 works
-                    $query .= ' DEFAULT 0';
-                } elseif ($type == 'BIT') {
-                    $query .= ' DEFAULT b\''
-                        . preg_replace('/[^01]/', '0', $default_value)
-                        . '\'';
-                } elseif ($type == 'BOOLEAN') {
-                    if (preg_match('/^1|T|TRUE|YES$/i', $default_value)) {
-                        $query .= ' DEFAULT TRUE';
-                    } elseif (preg_match('/^0|F|FALSE|NO$/i', $default_value)) {
-                        $query .= ' DEFAULT FALSE';
-                    } else {
-                        // Invalid BOOLEAN value
-                        $query .= ' DEFAULT \''
-                            . $GLOBALS['dbi']->escapeString($default_value) . '\'';
-                    }
-                } elseif ($type == 'BINARY' || $type == 'VARBINARY') {
-                    $query .= ' DEFAULT 0x' . $default_value;
-                } else {
-                    $query .= ' DEFAULT \''
-                        . $GLOBALS['dbi']->escapeString($default_value) . '\'';
-                }
-                break;
-            /** @noinspection PhpMissingBreakStatementInspection */
-            case 'NULL' :
-                // If user uncheck null checkbox and not change default value null,
-                // default value will be ignored.
-                if ($null !== false && $null !== 'NULL') {
-                    break;
-                }
-                // else fall-through intended, no break here
-            case 'CURRENT_TIMESTAMP' :
-                $query .= ' DEFAULT ' . $default_type;
-                if ($length !== 0 && $is_timestamp) {
-                    $query .= '(' . $length . ')';
-                }
-                break;
-            case 'NONE' :
-            default :
-                break;
-            }
-
-            if (!empty($extra)) {
-                $query .= ' ' . $extra;
-            }
-        }
-        if (!empty($comment)) {
-            $query .= " COMMENT '" . $GLOBALS['dbi']->escapeString($comment) . "'";
-        }
-
-        // move column
-        if ($move_to == '-first') { // dash can't appear as part of column name
-            $query .= ' FIRST';
-        } elseif ($move_to != '') {
-            $query .= ' AFTER ' . Util::backquote($move_to);
-        }
-        return $query;
-    } // end function
-
-    /**
-     * Checks if the number of records in a table is at least equal to
-     * $min_records
-     *
-     * @param int $min_records Number of records to check for in a table
-     *
-     * @return bool True, if at least $min_records exist, False otherwise.
-     */
-    public function checkIfMinRecordsExist($min_records = 0)
-    {
-        $check_query = 'SELECT ';
-        $fieldsToSelect = '';
-
-        $uniqueFields = $this->getUniqueColumns(true, false);
-        if (count($uniqueFields) > 0) {
-            $fieldsToSelect = implode(', ', $uniqueFields);
-        } else {
-            $indexedCols = $this->getIndexedColumns(true, false);
-            if (count($indexedCols) > 0) {
-                $fieldsToSelect = implode(', ', $indexedCols);
-            } else {
-                $fieldsToSelect = '*';
-            }
-        }
-
-        $check_query .= $fieldsToSelect
-            . ' FROM ' . $this->getFullName(true)
-            . ' LIMIT ' . $min_records;
-
-        $res = $GLOBALS['dbi']->tryQuery(
-            $check_query
-        );
-
-        if ($res !== false) {
-            $num_records = $GLOBALS['dbi']->numRows($res);
-            if ($num_records >= $min_records) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Counts and returns (or displays) the number of records in a table
-     *
-     * @param bool $force_exact whether to force an exact count
-     *
-     * @return mixed the number of records if "retain" param is true,
-     *               otherwise true
-     */
-    public function countRecords($force_exact = false)
-    {
-        $is_view = $this->isView();
-        $db = $this->_db_name;
-        $table = $this->_name;
-
-        if ($this->_dbi->getCachedTableContent(array($db, $table, 'ExactRows')) != null) {
-            $row_count = $this->_dbi->getCachedTableContent(
-                array($db, $table, 'ExactRows')
-            );
-            return $row_count;
-        }
-        $row_count = false;
-
-        if (! $force_exact) {
-            if (($this->_dbi->getCachedTableContent(array($db, $table, 'Rows')) == null)
-                && !$is_view
-            ) {
-                $tmp_tables = $this->_dbi->getTablesFull($db, $table);
-                if (isset($tmp_tables[$table])) {
-                    $this->_dbi->cacheTableContent(
-                        array($db, $table),
-                        $tmp_tables[$table]
-                    );
-                }
-            }
-            if ($this->_dbi->getCachedTableContent(array($db, $table, 'Rows')) != null) {
-                $row_count = $this->_dbi->getCachedTableContent(
-                    array($db, $table, 'Rows')
-                );
-            } else {
-                $row_count = false;
-            }
-        }
-        // for a VIEW, $row_count is always false at this point
-        if (false !== $row_count
-            && $row_count >= $GLOBALS['cfg']['MaxExactCount']
-        ) {
-            return $row_count;
-        }
-
-        if (! $is_view) {
-            $row_count = $this->_dbi->fetchValue(
-                'SELECT COUNT(*) FROM ' . Util::backquote($db) . '.'
-                . Util::backquote($table)
-            );
-        } else {
-            // For complex views, even trying to get a partial record
-            // count could bring down a server, so we offer an
-            // alternative: setting MaxExactCountViews to 0 will bypass
-            // completely the record counting for views
-
-            if ($GLOBALS['cfg']['MaxExactCountViews'] == 0) {
-                $row_count = false;
-            } else {
-                // Counting all rows of a VIEW could be too long,
-                // so use a LIMIT clause.
-                // Use try_query because it can fail (when a VIEW is
-                // based on a table that no longer exists)
-                $result = $this->_dbi->tryQuery(
-                    'SELECT 1 FROM ' . Util::backquote($db) . '.'
-                    . Util::backquote($table) . ' LIMIT '
-                    . $GLOBALS['cfg']['MaxExactCountViews'],
-                    null,
-                    DatabaseInterface::QUERY_STORE
-                );
-                if (!$this->_dbi->getError()) {
-                    $row_count = $this->_dbi->numRows($result);
-                    $this->_dbi->freeResult($result);
-                }
-            }
-        }
-        if ($row_count) {
-            $this->_dbi->cacheTableContent(array($db, $table, 'ExactRows'), $row_count);
-        }
-
-        return $row_count;
-    } // end of the 'Table::countRecords()' function
-
-    /**
-     * Generates column specification for ALTER syntax
-     *
-     * @param string      $oldcol        old column name
-     * @param string      $newcol        new column name
-     * @param string      $type          type ('INT', 'VARCHAR', 'BIT', ...)
-     * @param string      $length        length ('2', '5,2', '', ...)
-     * @param string      $attribute     attribute
-     * @param string      $collation     collation
-     * @param bool|string $null          with 'NULL' or 'NOT NULL'
-     * @param string      $default_type  whether default is CURRENT_TIMESTAMP,
-     *                                   NULL, NONE, USER_DEFINED
-     * @param string      $default_value default value for USER_DEFINED default
-     *                                   type
-     * @param string      $extra         'AUTO_INCREMENT'
-     * @param string      $comment       field comment
-     * @param string      $virtuality    virtuality of the column
-     * @param string      $expression    expression for the virtual column
-     * @param string      $move_to       new position for column
-     *
-     * @see Table::generateFieldSpec()
-     *
-     * @return string  field specification
-     */
-    static public function generateAlter($oldcol, $newcol, $type, $length,
-        $attribute, $collation, $null, $default_type, $default_value,
-        $extra, $comment, $virtuality, $expression, $move_to
-    ) {
-        return Util::backquote($oldcol) . ' '
-        . Table::generateFieldSpec(
-            $newcol, $type, $length, $attribute,
-            $collation, $null, $default_type, $default_value, $extra,
-            $comment, $virtuality, $expression, $move_to
-        );
-    } // end function
-
-    /**
-     * Inserts existing entries in a PMA_* table by reading a value from an old
-     * entry
-     *
-     * @param string $work         The array index, which Relation feature to
-     *                             check ('relwork', 'commwork', ...)
-     * @param string $pma_table    The array index, which PMA-table to update
-     *                             ('bookmark', 'relation', ...)
-     * @param array  $get_fields   Which fields will be SELECT'ed from the old entry
-     * @param array  $where_fields Which fields will be used for the WHERE query
-     *                             (array('FIELDNAME' => 'FIELDVALUE'))
-     * @param array  $new_fields   Which fields will be used as new VALUES.
-     *                             These are the important keys which differ
-     *                             from the old entry
-     *                             (array('FIELDNAME' => 'NEW FIELDVALUE'))
-     *
-     * @global relation variable
-     *
-     * @return int|true
-     */
-    static public function duplicateInfo($work, $pma_table, $get_fields,
-        $where_fields, $new_fields
-    ) {
-        $last_id = -1;
-
-        if (!isset($GLOBALS['cfgRelation']) || !$GLOBALS['cfgRelation'][$work]) {
-            return true;
-        }
-
-        $select_parts = array();
-        $row_fields = array();
-        foreach ($get_fields as $get_field) {
-            $select_parts[] = Util::backquote($get_field);
-            $row_fields[$get_field] = 'cc';
-        }
-
-        $where_parts = array();
-        foreach ($where_fields as $_where => $_value) {
-            $where_parts[] = Util::backquote($_where) . ' = \''
-                . $GLOBALS['dbi']->escapeString($_value) . '\'';
-        }
-
-        $new_parts = array();
-        $new_value_parts = array();
-        foreach ($new_fields as $_where => $_value) {
-            $new_parts[] = Util::backquote($_where);
-            $new_value_parts[] = $GLOBALS['dbi']->escapeString($_value);
-        }
-
-        $table_copy_query = '
-            SELECT ' . implode(', ', $select_parts) . '
-              FROM ' . Util::backquote($GLOBALS['cfgRelation']['db']) . '.'
-              . Util::backquote($GLOBALS['cfgRelation'][$pma_table]) . '
-             WHERE ' . implode(' AND ', $where_parts);
-
-        // must use DatabaseInterface::QUERY_STORE here, since we execute
-        // another query inside the loop
-        $table_copy_rs = PMA_queryAsControlUser(
-            $table_copy_query, true, DatabaseInterface::QUERY_STORE
-        );
-
-        while ($table_copy_row = @$GLOBALS['dbi']->fetchAssoc($table_copy_rs)) {
-            $value_parts = array();
-            foreach ($table_copy_row as $_key => $_val) {
-                if (isset($row_fields[$_key]) && $row_fields[$_key] == 'cc') {
-                    $value_parts[] = $GLOBALS['dbi']->escapeString($_val);
-                }
-            }
-
-            $new_table_query = 'INSERT IGNORE INTO '
-                . Util::backquote($GLOBALS['cfgRelation']['db'])
-                . '.' . Util::backquote($GLOBALS['cfgRelation'][$pma_table])
-                . ' (' . implode(', ', $select_parts) . ', '
-                . implode(', ', $new_parts) . ') VALUES (\''
-                . implode('\', \'', $value_parts) . '\', \''
-                . implode('\', \'', $new_value_parts) . '\')';
-
-            PMA_queryAsControlUser($new_table_query);
-            $last_id = $GLOBALS['dbi']->insertId();
-        } // end while
-
-        $GLOBALS['dbi']->freeResult($table_copy_rs);
-
-        return $last_id;
-    } // end of 'Table::duplicateInfo()' function
-
-    /**
-     * Copies or renames table
-     *
-     * @param string $source_db    source database
-     * @param string $source_table source table
-     * @param string $target_db    target database
-     * @param string $target_table target table
-     * @param string $what         what to be moved or copied (data, dataonly)
-     * @param bool   $move         whether to move
-     * @param string $mode         mode
-     *
-     * @return bool true if success, false otherwise
-     */
-    static public function moveCopy($source_db, $source_table, $target_db,
-        $target_table, $what, $move, $mode
-    ) {
-
-        global $err_url;
-
-        // Try moving the tables directly, using native `RENAME` statement.
-        if ($move && $what == 'data') {
-            $tbl = new Table($source_table, $source_db);
-            if ($tbl->rename($target_table, $target_db)) {
-                $GLOBALS['message'] = $tbl->getLastMessage();
-                return true;
-            }
-        }
-
-        // Setting required export settings.
-        $GLOBALS['sql_backquotes'] = 1;
-        $GLOBALS['asfile']         = 1;
-
-        // Ensuring the target database is valid.
-        if (! $GLOBALS['dblist']->databases->exists($source_db, $target_db)) {
-            if (! $GLOBALS['dblist']->databases->exists($source_db)) {
-                $GLOBALS['message'] = Message::rawError(
-                    sprintf(
-                        __('Source database `%s` was not found!'),
-                        htmlspecialchars($source_db)
-                    )
-                );
-            }
-            if (! $GLOBALS['dblist']->databases->exists($target_db)) {
-                $GLOBALS['message'] = Message::rawError(
-                    sprintf(
-                        __('Target database `%s` was not found!'),
-                        htmlspecialchars($target_db)
-                    )
-                );
-            }
-            return false;
-        }
-
-        /**
-         * The full name of source table, quoted.
-         * @var string $source
-         */
-        $source = Util::backquote($source_db)
-            . '.' . Util::backquote($source_table);
-
-        // If the target database is not specified, the operation is taking
-        // place in the same database.
-        if (! isset($target_db) || ! mb_strlen($target_db)) {
-            $target_db = $source_db;
-        }
-
-        // Selecting the database could avoid some problems with replicated
-        // databases, when moving table from replicated one to not replicated one.
-        $GLOBALS['dbi']->selectDb($target_db);
-
-        /**
-         * The full name of target table, quoted.
-         * @var string $target
-         */
-        $target = Util::backquote($target_db)
-            . '.' . Util::backquote($target_table);
-
-        // No table is created when this is a data-only operation.
-        if ($what != 'dataonly') {
-
-            include_once "libraries/plugin_interface.lib.php";
-
-            /**
-             * Instance used for exporting the current structure of the table.
-             *
-             * @var \PMA\libraries\plugins\export\ExportSql
-             */
-            $export_sql_plugin = PMA_getPlugin(
-                "export",
-                "sql",
-                'libraries/plugins/export/',
-                array(
-                    'export_type' => 'table',
-                    'single_table' => false,
-                )
-            );
-
-            $no_constraints_comments = true;
-            $GLOBALS['sql_constraints_query'] = '';
-            // set the value of global sql_auto_increment variable
-            if (isset($_POST['sql_auto_increment'])) {
-                $GLOBALS['sql_auto_increment'] = $_POST['sql_auto_increment'];
-            }
-
-            /**
-             * The old structure of the table..
-             * @var string $sql_structure
-             */
-            $sql_structure = $export_sql_plugin->getTableDef(
-                $source_db, $source_table, "\n", $err_url, false, false
-            );
-
-            unset($no_constraints_comments);
-
-            // -----------------------------------------------------------------
-            // Phase 0: Preparing structures used.
-
-            /**
-             * The destination where the table is moved or copied to.
-             * @var Expression
-             */
-            $destination = new Expression(
-                $target_db, $target_table, ''
-            );
-
-            // Find server's SQL mode so the builder can generate correct
-            // queries.
-            // One of the options that alters the behaviour is `ANSI_QUOTES`.
-            Context::setMode(
-                $GLOBALS['dbi']->fetchValue("SELECT @@sql_mode")
-            );
-
-            // -----------------------------------------------------------------
-            // Phase 1: Dropping existent element of the same name (if exists
-            // and required).
-
-            if (isset($_REQUEST['drop_if_exists'])
-                && $_REQUEST['drop_if_exists'] == 'true'
-            ) {
-
-                /**
-                 * Drop statement used for building the query.
-                 * @var DropStatement $statement
-                 */
-                $statement = new DropStatement();
-
-                $tbl = new Table($target_db, $target_table);
-
-                $statement->options = new OptionsArray(
-                    array(
-                        $tbl->isView() ? 'VIEW' : 'TABLE',
-                        'IF EXISTS',
-                    )
-                );
-
-                $statement->fields = array($destination);
-
-                // Building the query.
-                $drop_query = $statement->build() . ';';
-
-                // Executing it.
-                $GLOBALS['dbi']->query($drop_query);
-                $GLOBALS['sql_query'] .= "\n" . $drop_query;
-
-                // If an existing table gets deleted, maintain any entries for
-                // the PMA_* tables.
-                $maintain_relations = true;
-            }
-
-            // -----------------------------------------------------------------
-            // Phase 2: Generating the new query of this structure.
-
-            /**
-             * The parser responsible for parsing the old queries.
-             * @var Parser $parser
-             */
-            $parser = new Parser($sql_structure);
-
-            if (!empty($parser->statements[0])) {
-
-                /**
-                 * The CREATE statement of this structure.
-                 * @var \SqlParser\Statements\CreateStatement $statement
-                 */
-                $statement = $parser->statements[0];
-
-                // Changing the destination.
-                $statement->name = $destination;
-
-                // Building back the query.
-                $sql_structure = $statement->build() . ';';
-
-                // Executing it.
-                $GLOBALS['dbi']->query($sql_structure);
-                $GLOBALS['sql_query'] .= "\n" . $sql_structure;
-            }
-
-            // -----------------------------------------------------------------
-            // Phase 3: Adding constraints.
-            // All constraint names are removed because they must be unique.
-
-            if (($move || isset($GLOBALS['add_constraints']))
-                && !empty($GLOBALS['sql_constraints_query'])
-            ) {
-
-                $parser = new Parser($GLOBALS['sql_constraints_query']);
-
-                /**
-                 * The ALTER statement that generates the constraints.
-                 * @var \SqlParser\Statements\AlterStatement $statement
-                 */
-                $statement = $parser->statements[0];
-
-                // Changing the altered table to the destination.
-                $statement->table = $destination;
-
-                // Removing the name of the constraints.
-                foreach ($statement->altered as $idx => $altered) {
-                    // All constraint names are removed because they must be unique.
-                    if ($altered->options->has('CONSTRAINT')) {
-                        $altered->field = null;
-                    }
-                }
-
-                // Building back the query.
-                $GLOBALS['sql_constraints_query'] = $statement->build() . ';';
-
-                // Executing it.
-                if ($mode == 'one_table') {
-                    $GLOBALS['dbi']->query($GLOBALS['sql_constraints_query']);
-                }
-                $GLOBALS['sql_query'] .= "\n" . $GLOBALS['sql_constraints_query'];
-                if ($mode == 'one_table') {
-                    unset($GLOBALS['sql_constraints_query']);
-                }
-            }
-
-            // -----------------------------------------------------------------
-            // Phase 4: Adding indexes.
-            // View phase 3.
-
-            if (!empty($GLOBALS['sql_indexes'])) {
-
-                $parser = new Parser($GLOBALS['sql_indexes']);
-
-                $GLOBALS['sql_indexes'] = '';
-                /**
-                 * The ALTER statement that generates the indexes.
-                 * @var \SqlParser\Statements\AlterStatement $statement
-                 */
-                foreach ($parser->statements as $statement) {
-
-                    // Changing the altered table to the destination.
-                    $statement->table = $destination;
-
-                    // Removing the name of the constraints.
-                    foreach ($statement->altered as $idx => $altered) {
-                        // All constraint names are removed because they must be unique.
-                        if ($altered->options->has('CONSTRAINT')) {
-                            $altered->field = null;
-                        }
-                    }
-
-                    // Building back the query.
-                    $sql_index = $statement->build() . ';';
-
-                    // Executing it.
-                    if ($mode == 'one_table' || $mode == 'db_copy') {
-                        $GLOBALS['dbi']->query($sql_index);
-                    }
-
-                    $GLOBALS['sql_indexes'] .= $sql_index;
-                }
-
-                $GLOBALS['sql_query'] .= "\n" . $GLOBALS['sql_indexes'];
-                if ($mode == 'one_table' || $mode == 'db_copy') {
-                    unset($GLOBALS['sql_indexes']);
-                }
-            }
-
-            // -----------------------------------------------------------------
-            // Phase 5: Adding AUTO_INCREMENT.
-
-            if (! empty($GLOBALS['sql_auto_increments'])) {
-                if ($mode == 'one_table' || $mode == 'db_copy') {
-
-                    $parser =  new Parser($GLOBALS['sql_auto_increments']);
-
-                    /**
-                     * The ALTER statement that alters the AUTO_INCREMENT value.
-                     * @var \SqlParser\Statements\AlterStatement $statement
-                     */
-                    $statement = $parser->statements[0];
-
-                    // Changing the altered table to the destination.
-                    $statement->table = $destination;
-
-                    // Building back the query.
-                    $GLOBALS['sql_auto_increments'] = $statement->build() . ';';
-
-                    // Executing it.
-                    $GLOBALS['dbi']->query($GLOBALS['sql_auto_increments']);
-                    $GLOBALS['sql_query'] .= "\n" . $GLOBALS['sql_auto_increments'];
-                    unset($GLOBALS['sql_auto_increments']);
-                }
-            }
-        } else {
-            $GLOBALS['sql_query'] = '';
-        }
-
-        $_table = new Table($target_table, $target_db);
-        // Copy the data unless this is a VIEW
-        if (($what == 'data' || $what == 'dataonly')
-            && ! $_table->isView()
-        ) {
-            $sql_set_mode = "SET SQL_MODE='NO_AUTO_VALUE_ON_ZERO'";
-            $GLOBALS['dbi']->query($sql_set_mode);
-            $GLOBALS['sql_query'] .= "\n\n" . $sql_set_mode . ';';
-
-            $_old_table = new Table($source_table, $source_db);
-            $nonGeneratedCols = $_old_table->getNonGeneratedColumns(true);
-            if (count($nonGeneratedCols) > 0) {
-                $sql_insert_data = 'INSERT INTO ' . $target . '('
-                    . implode(', ', $nonGeneratedCols)
-                    . ') SELECT ' . implode(', ', $nonGeneratedCols)
-                    . ' FROM ' . $source;
-
-                $GLOBALS['dbi']->query($sql_insert_data);
-                $GLOBALS['sql_query'] .= "\n\n" . $sql_insert_data . ';';
-            }
-        }
-
-        PMA_getRelationsParam();
-
-        // Drops old table if the user has requested to move it
-        if ($move) {
-
-            // This could avoid some problems with replicated databases, when
-            // moving table from replicated one to not replicated one
-            $GLOBALS['dbi']->selectDb($source_db);
-
-            $_source_table = new Table($source_table, $source_db);
-            if ($_source_table->isView()) {
-                $sql_drop_query = 'DROP VIEW';
-            } else {
-                $sql_drop_query = 'DROP TABLE';
-            }
-            $sql_drop_query .= ' ' . $source;
-            $GLOBALS['dbi']->query($sql_drop_query);
-
-            // Renable table in configuration storage
-            PMA_REL_renameTable(
-                $source_db, $target_db,
-                $source_table, $target_table
-            );
-
-            $GLOBALS['sql_query'] .= "\n\n" . $sql_drop_query . ';';
-            // end if ($move)
-            return true;
-        }
-
-        // we are copying
-        // Create new entries as duplicates from old PMA DBs
-        if ($what == 'dataonly' || isset($maintain_relations)) {
-            return true;
-        }
-
-        if ($GLOBALS['cfgRelation']['commwork']) {
-            // Get all comments and MIME-Types for current table
-            $comments_copy_rs = PMA_queryAsControlUser(
-                'SELECT column_name, comment'
-                . ($GLOBALS['cfgRelation']['mimework']
-                ? ', mimetype, transformation, transformation_options'
-                : '')
-                . ' FROM '
-                . Util::backquote($GLOBALS['cfgRelation']['db'])
-                . '.'
-                . Util::backquote($GLOBALS['cfgRelation']['column_info'])
-                . ' WHERE '
-                . ' db_name = \''
-                . $GLOBALS['dbi']->escapeString($source_db) . '\''
-                . ' AND '
-                . ' table_name = \''
-                . $GLOBALS['dbi']->escapeString($source_table) . '\''
-            );
-
-            // Write every comment as new copied entry. [MIME]
-            while ($comments_copy_row
-                = $GLOBALS['dbi']->fetchAssoc($comments_copy_rs)) {
-                $new_comment_query = 'REPLACE INTO '
-                    . Util::backquote($GLOBALS['cfgRelation']['db'])
-                    . '.' . Util::backquote(
-                        $GLOBALS['cfgRelation']['column_info']
-                    )
-                    . ' (db_name, table_name, column_name, comment'
-                    . ($GLOBALS['cfgRelation']['mimework']
-                        ? ', mimetype, transformation, transformation_options'
-                        : '')
-                    . ') ' . ' VALUES(' . '\'' . $GLOBALS['dbi']->escapeString($target_db)
-                    . '\',\'' . $GLOBALS['dbi']->escapeString($target_table) . '\',\''
-                    . $GLOBALS['dbi']->escapeString($comments_copy_row['column_name'])
-                    . '\''
-                    . ($GLOBALS['cfgRelation']['mimework']
-                        ? ',\'' . $GLOBALS['dbi']->escapeString(
-                            $comments_copy_row['comment']
-                        )
-                        . '\',' . '\'' . $GLOBALS['dbi']->escapeString(
-                            $comments_copy_row['mimetype']
-                        )
-                        . '\',' . '\'' . $GLOBALS['dbi']->escapeString(
-                            $comments_copy_row['transformation']
-                        )
-                        . '\',' . '\'' . $GLOBALS['dbi']->escapeString(
-                            $comments_copy_row['transformation_options']
-                        )
-                        . '\''
-                        : '')
-                    . ')';
-                PMA_queryAsControlUser($new_comment_query);
-            } // end while
-            $GLOBALS['dbi']->freeResult($comments_copy_rs);
-            unset($comments_copy_rs);
-        }
-
-        // duplicating the bookmarks must not be done here, but
-        // just once per db
-
-        $get_fields = array('display_field');
-        $where_fields = array(
-            'db_name' => $source_db,
-            'table_name' => $source_table
-        );
-        $new_fields = array(
-            'db_name' => $target_db,
-            'table_name' => $target_table
-        );
-        Table::duplicateInfo(
-            'displaywork',
-            'table_info',
-            $get_fields,
-            $where_fields,
-            $new_fields
-        );
-
-        /**
-         * @todo revise this code when we support cross-db relations
-         */
-        $get_fields = array(
-            'master_field',
-            'foreign_table',
-            'foreign_field'
-        );
-        $where_fields = array(
-            'master_db' => $source_db,
-            'master_table' => $source_table
-        );
-        $new_fields = array(
-            'master_db' => $target_db,
-            'foreign_db' => $target_db,
-            'master_table' => $target_table
-        );
-        Table::duplicateInfo(
-            'relwork',
-            'relation',
-            $get_fields,
-            $where_fields,
-            $new_fields
-        );
-
-        $get_fields = array(
-            'foreign_field',
-            'master_table',
-            'master_field'
-        );
-        $where_fields = array(
-            'foreign_db' => $source_db,
-            'foreign_table' => $source_table
-        );
-        $new_fields = array(
-            'master_db' => $target_db,
-            'foreign_db' => $target_db,
-            'foreign_table' => $target_table
-        );
-        Table::duplicateInfo(
-            'relwork',
-            'relation',
-            $get_fields,
-            $where_fields,
-            $new_fields
-        );
-
-        /**
-         * @todo Can't get duplicating PDFs the right way. The
-         * page numbers always get screwed up independently from
-         * duplication because the numbers do not seem to be stored on a
-         * per-database basis. Would the author of pdf support please
-         * have a look at it?
-         *
-        $get_fields = array('page_descr');
-        $where_fields = array('db_name' => $source_db);
-        $new_fields = array('db_name' => $target_db);
-        $last_id = Table::duplicateInfo(
-            'pdfwork',
-            'pdf_pages',
-            $get_fields,
-            $where_fields,
-            $new_fields
-        );
-
-        if (isset($last_id) && $last_id >= 0) {
-            $get_fields = array('x', 'y');
-            $where_fields = array(
-                'db_name' => $source_db,
-                'table_name' => $source_table
-            );
-            $new_fields = array(
-                'db_name' => $target_db,
-                'table_name' => $target_table,
-                'pdf_page_number' => $last_id
-            );
-            Table::duplicateInfo(
-                'pdfwork',
-                'table_coords',
-                $get_fields,
-                $where_fields,
-                $new_fields
-            );
-        }
-         */
-
-        return true;
-    }
-
-    /**
-     * checks if given name is a valid table name,
-     * currently if not empty, trailing spaces, '.', '/' and '\'
-     *
-     * @param string  $table_name    name to check
-     * @param boolean $is_backquoted whether this name is used inside backquotes or not
-     *
-     * @todo add check for valid chars in filename on current system/os
-     * @see  https://dev.mysql.com/doc/refman/5.0/en/legal-names.html
-     *
-     * @return boolean whether the string is valid or not
-     */
-    static function isValidName($table_name, $is_backquoted = false)
-    {
-        if ($table_name !== rtrim($table_name)) {
-            // trailing spaces not allowed even in backquotes
-            return false;
-        }
-
-        if (! mb_strlen($table_name)) {
-            // zero length
-            return false;
-        }
-
-        if (! $is_backquoted && $table_name !== trim($table_name)) {
-            // spaces at the start or in between only allowed inside backquotes
-            return false;
-        }
-
-        if (! $is_backquoted && preg_match('/^[a-zA-Z0-9_$]+$/', $table_name)) {
-            // only allow the above regex in unquoted identifiers
-            // see : http://dev.mysql.com/doc/refman/5.7/en/identifiers.html
-            return true;
-        } else if ($is_backquoted) {
-            // If backquoted, all characters should be allowed (except w/ trailing spaces)
-            return true;
-        }
-
-        // If not backquoted and doesn't follow the above regex
-        return false;
-    }
-
-    /**
-     * renames table
-     *
-     * @param string $new_name new table name
-     * @param string $new_db   new database name
-     *
-     * @return bool success
-     */
-    function rename($new_name, $new_db = null)
-    {
-        $lowerCaseTableNames = Util::cacheGet(
-            'lower_case_table_names',
-            function () {
-                return $GLOBALS['dbi']->fetchValue(
-                    "SELECT @@lower_case_table_names"
-                );
-            }
-        );
-        if ($lowerCaseTableNames) {
-            $new_name = strtolower($new_name);
-        }
-
-        if (null !== $new_db && $new_db !== $this->getDbName()) {
-            // Ensure the target is valid
-            if (! $GLOBALS['dblist']->databases->exists($new_db)) {
-                $this->errors[] = __('Invalid database:') . ' ' . $new_db;
-                return false;
-            }
-        } else {
-            $new_db = $this->getDbName();
-        }
-
-        $new_table = new Table($new_name, $new_db);
-
-        if ($this->getFullName() === $new_table->getFullName()) {
-            return true;
-        }
-
-        // Allow whitespaces (not trailing) in $new_name,
-        // since we are using $backquoted in getting the fullName of table
-        // below to be used in the query
-        if (! Table::isValidName($new_name, true)) {
-            $this->errors[] = __('Invalid table name:') . ' '
-                . $new_table->getFullName();
-            return false;
-        }
-
-        // If the table is moved to a different database drop its triggers first
-        $triggers = $this->_dbi->getTriggers(
-            $this->getDbName(), $this->getName(), ''
-        );
-        $handle_triggers = $this->getDbName() != $new_db && $triggers;
-        if ($handle_triggers) {
-            foreach ($triggers as $trigger) {
-                $sql = 'DROP TRIGGER IF EXISTS '
-                    . Util::backquote($this->getDbName())
-                    . '.' . Util::backquote($trigger['name']) . ';';
-                $this->_dbi->query($sql);
-            }
-        }
-
-        /*
-         * tested also for a view, in MySQL 5.0.92, 5.1.55 and 5.5.13
-         */
-        $GLOBALS['sql_query'] = '
-            RENAME TABLE ' . $this->getFullName(true) . '
-                  TO ' . $new_table->getFullName(true) . ';';
-        // I don't think a specific error message for views is necessary
-        if (! $this->_dbi->query($GLOBALS['sql_query'])) {
-            // Restore triggers in the old database
-            if ($handle_triggers) {
-                $this->_dbi->selectDb($this->getDbName());
-                foreach ($triggers as $trigger) {
-                    $this->_dbi->query($trigger['create']);
-                }
-            }
-            $this->errors[] = sprintf(
-                __('Failed to rename table %1$s to %2$s!'),
-                $this->getFullName(),
-                $new_table->getFullName()
-            );
-            return false;
-        }
-
-        $old_name = $this->getName();
-        $old_db = $this->getDbName();
-        $this->_name = $new_name;
-        $this->_db_name = $new_db;
-
-        // Renable table in configuration storage
-        PMA_REL_renameTable(
-            $old_db, $new_db,
-            $old_name, $new_name
-        );
-
-        $this->messages[] = sprintf(
-            __('Table %1$s has been renamed to %2$s.'),
-            htmlspecialchars($old_name),
-            htmlspecialchars($new_name)
-        );
-        return true;
-    }
-
-    /**
-     * Get all unique columns
-     *
-     * returns an array with all columns with unique content, in fact these are
-     * all columns being single indexed in PRIMARY or UNIQUE
-     *
-     * e.g.
-     *  - PRIMARY(id) // id
-     *  - UNIQUE(name) // name
-     *  - PRIMARY(fk_id1, fk_id2) // NONE
-     *  - UNIQUE(x,y) // NONE
-     *
-     * @param bool $backquoted whether to quote name with backticks ``
-     * @param bool $fullName   whether to include full name of the table as a prefix
-     *
-     * @return array
-     */
-    public function getUniqueColumns($backquoted = true, $fullName = true)
-    {
-        $sql = $this->_dbi->getTableIndexesSql(
-            $this->getDbName(),
-            $this->getName(),
-            'Non_unique = 0'
-        );
-        $uniques = $this->_dbi->fetchResult(
-            $sql,
-            array('Key_name', null),
-            'Column_name'
-        );
-
-        $return = array();
-        foreach ($uniques as $index) {
-            if (count($index) > 1) {
-                continue;
-            }
-            if ($fullName) {
-                $possible_column = $this->getFullName($backquoted) . '.';
-            } else {
-                $possible_column = '';
-            }
-            if ($backquoted) {
-                $possible_column .= Util::backquote($index[0]);
-            } else {
-                $possible_column .= $index[0];
-            }
-            // a column might have a primary and an unique index on it
-            if (! in_array($possible_column, $return)) {
-                $return[] = $possible_column;
-            }
-        }
-
-        return $return;
-    }
-
-    /**
-     * Get all indexed columns
-     *
-     * returns an array with all columns that make use of an index
-     *
-     * e.g. index(col1, col2) would return col1, col2
-     *
-     * @param bool $backquoted whether to quote name with backticks ``
-     * @param bool $fullName   whether to include full name of the table as a prefix
-     *
-     * @return array
-     */
-    public function getIndexedColumns($backquoted = true, $fullName = true)
-    {
-        $sql = $this->_dbi->getTableIndexesSql(
-            $this->getDbName(),
-            $this->getName(),
-            ''
-        );
-        $indexed = $this->_dbi->fetchResult($sql, 'Column_name', 'Column_name');
-
-        $return = array();
-        foreach ($indexed as $column) {
-            $return[] = ($fullName ? $this->getFullName($backquoted) . '.' : '')
-                . ($backquoted ? Util::backquote($column) : $column);
-        }
-
-        return $return;
-    }
-
-    /**
-     * Get all columns
-     *
-     * returns an array with all columns
-     *
-     * @param bool $backquoted whether to quote name with backticks ``
-     * @param bool $fullName   whether to include full name of the table as a prefix
-     *
-     * @return array
-     */
-    public function getColumns($backquoted = true, $fullName = true)
-    {
-        $sql = 'SHOW COLUMNS FROM ' . $this->getFullName(true);
-        $indexed = $this->_dbi->fetchResult($sql, 'Field', 'Field');
-
-        $return = array();
-        foreach ($indexed as $column) {
-            $return[] = ($fullName ? $this->getFullName($backquoted) . '.' : '')
-                . ($backquoted ? Util::backquote($column) : $column);
-        }
-
-        return $return;
-    }
-
-    /**
-     * Get meta info for fields in table
-     *
-     * @return mixed
-     */
-    public function getColumnsMeta()
-    {
-        $move_columns_sql_query = sprintf(
-            'SELECT * FROM %s.%s LIMIT 1',
-            Util::backquote($this->_db_name),
-            Util::backquote($this->_name)
-        );
-        $move_columns_sql_result = $this->_dbi->tryQuery($move_columns_sql_query);
-        if ($move_columns_sql_result !== false) {
-            return $this->_dbi->getFieldsMeta($move_columns_sql_result);
-        } else {
-            // unsure how to reproduce but it was seen on the reporting server
-            return array();
-        }
-    }
-
-    /**
-     * Get non-generated columns in table
-     *
-     * @param bool $backquoted whether to quote name with backticks ``
-     *
-     * @return array
-     */
-    public function getNonGeneratedColumns($backquoted = true)
-    {
-        $columns_meta_query = 'SHOW COLUMNS FROM ' . $this->getFullName(true);
-        $ret = array();
-
-        $columns_meta_query_result = $this->_dbi->fetchResult(
-            $columns_meta_query
-        );
-
-        if ($columns_meta_query_result
-            && $columns_meta_query_result !== false
-        ) {
-            foreach ($columns_meta_query_result as $column) {
-                $value = $column['Field'];
-                if ($backquoted === true) {
-                    $value = Util::backquote($value);
-                }
-
-                if (strpos($column['Extra'], 'GENERATED') === false) {
-                    array_push($ret, $value);
-                }
-            }
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Return UI preferences for this table from phpMyAdmin database.
-     *
-     * @return array
-     */
-    protected function getUiPrefsFromDb()
-    {
-        $cfgRelation = PMA_getRelationsParam();
-        $pma_table = Util::backquote($cfgRelation['db']) . "."
-            . Util::backquote($cfgRelation['table_uiprefs']);
-
-        // Read from phpMyAdmin database
-        $sql_query = " SELECT `prefs` FROM " . $pma_table
-            . " WHERE `username` = '" . $GLOBALS['dbi']->escapeString($GLOBALS['cfg']['Server']['user']) . "'"
-            . " AND `db_name` = '" . $GLOBALS['dbi']->escapeString($this->_db_name) . "'"
-            . " AND `table_name` = '" . $GLOBALS['dbi']->escapeString($this->_name) . "'";
-
-        $row = $this->_dbi->fetchArray(PMA_queryAsControlUser($sql_query));
-        if (isset($row[0])) {
-            return json_decode($row[0], true);
-        } else {
-            return array();
-        }
-    }
-
-    /**
-     * Save this table's UI preferences into phpMyAdmin database.
-     *
-     * @return true|Message
-     */
-    protected function saveUiPrefsToDb()
-    {
-        $cfgRelation = PMA_getRelationsParam();
-        $pma_table = Util::backquote($cfgRelation['db']) . "."
-            . Util::backquote($cfgRelation['table_uiprefs']);
-
-        $secureDbName = $GLOBALS['dbi']->escapeString($this->_db_name);
-
-        $username = $GLOBALS['cfg']['Server']['user'];
-        $sql_query = " REPLACE INTO " . $pma_table
-            . " (username, db_name, table_name, prefs) VALUES ('"
-            . $GLOBALS['dbi']->escapeString($username) . "', '" . $secureDbName
-            . "', '" . $GLOBALS['dbi']->escapeString($this->_name) . "', '"
-            . $GLOBALS['dbi']->escapeString(json_encode($this->uiprefs)) . "')";
-
-        $success = $this->_dbi->tryQuery($sql_query, $GLOBALS['controllink']);
-
-        if (!$success) {
-            $message = Message::error(
-                __('Could not save table UI preferences!')
-            );
-            $message->addMessage('<br /><br />');
-            $message->addMessage(
-                Message::rawError(
-                    $this->_dbi->getError($GLOBALS['controllink'])
-                )
-            );
-            return $message;
-        }
-
-        // Remove some old rows in table_uiprefs if it exceeds the configured
-        // maximum rows
-        $sql_query = 'SELECT COUNT(*) FROM ' . $pma_table;
-        $rows_count = $this->_dbi->fetchValue($sql_query);
-        $max_rows = $GLOBALS['cfg']['Server']['MaxTableUiprefs'];
-        if ($rows_count > $max_rows) {
-            $num_rows_to_delete = $rows_count - $max_rows;
-            $sql_query
-                = ' DELETE FROM ' . $pma_table .
-                ' ORDER BY last_update ASC' .
-                ' LIMIT ' . $num_rows_to_delete;
-            $success = $this->_dbi->tryQuery(
-                $sql_query, $GLOBALS['controllink']
-            );
-
-            if (!$success) {
-                $message = Message::error(
-                    sprintf(
-                        __(
-                            'Failed to cleanup table UI preferences (see ' .
-                            '$cfg[\'Servers\'][$i][\'MaxTableUiprefs\'] %s)'
-                        ),
-                        Util::showDocu('config', 'cfg_Servers_MaxTableUiprefs')
-                    )
-                );
-                $message->addMessage('<br /><br />');
-                $message->addMessage(
-                    Message::rawError(
-                        $this->_dbi->getError($GLOBALS['controllink'])
-                    )
-                );
-                return $message;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Loads the UI preferences for this table.
-     * If pmadb and table_uiprefs is set, it will load the UI preferences from
-     * phpMyAdmin database.
-     *
-     * @return void
-     */
-    protected function loadUiPrefs()
-    {
-        $cfgRelation = PMA_getRelationsParam();
-        $server_id = $GLOBALS['server'];
-
-        // set session variable if it's still undefined
-        if (!isset($_SESSION['tmpval']['table_uiprefs'][$server_id][$this->_db_name][$this->_name])) {
-            // check whether we can get from pmadb
-            $_SESSION['tmpval']['table_uiprefs'][$server_id][$this->_db_name]
-            [$this->_name] = $cfgRelation['uiprefswork']
-                ?  $this->getUiPrefsFromDb()
-                : array();
-        }
-        $this->uiprefs =& $_SESSION['tmpval']['table_uiprefs'][$server_id]
-        [$this->_db_name][$this->_name];
-    }
-
-    /**
-     * Get a property from UI preferences.
-     * Return false if the property is not found.
-     * Available property:
-     * - PROP_SORTED_COLUMN
-     * - PROP_COLUMN_ORDER
-     * - PROP_COLUMN_VISIB
-     *
-     * @param string $property property
-     *
-     * @return mixed
-     */
-    public function getUiProp($property)
-    {
-        if (! isset($this->uiprefs)) {
-            $this->loadUiPrefs();
-        }
-
-        // do checking based on property
-        if ($property == self::PROP_SORTED_COLUMN) {
-            if (!isset($this->uiprefs[$property])) {
-                return false;
-            }
-
-            if (!isset($_REQUEST['discard_remembered_sort'])) {
-                // check if the column name exists in this table
-                $tmp = explode(' ', $this->uiprefs[$property]);
-                $colname = $tmp[0];
-                //remove backquoting from colname
-                $colname = str_replace('`', '', $colname);
-                //get the available column name without backquoting
-                $avail_columns = $this->getColumns(false);
-
-                foreach ($avail_columns as $each_col) {
-                    // check if $each_col ends with $colname
-                    if (substr_compare(
-                        $each_col,
-                        $colname,
-                        mb_strlen($each_col) - mb_strlen($colname)
-                    ) === 0
-                    ) {
-                        return $this->uiprefs[$property];
-                    }
-                }
-            }
-            // remove the property, since it no longer exists in database
-            $this->removeUiProp(self::PROP_SORTED_COLUMN);
-            return false;
-        }
-
-        if ($property == self::PROP_COLUMN_ORDER
-            || $property == self::PROP_COLUMN_VISIB
-        ) {
-            if ($this->isView() || !isset($this->uiprefs[$property])) {
-                return false;
-            }
-
-            // check if the table has not been modified
-            if ($this->getStatusInfo('Create_time') == $this->uiprefs['CREATE_TIME']
-            ) {
-                return $this->uiprefs[$property];
-            }
-
-            // remove the property, since the table has been modified
-            $this->removeUiProp(self::PROP_COLUMN_ORDER);
-            return false;
-        }
-
-        // default behaviour for other property:
-        return isset($this->uiprefs[$property]) ? $this->uiprefs[$property] : false;
-    }
-
-    /**
-     * Set a property from UI preferences.
-     * If pmadb and table_uiprefs is set, it will save the UI preferences to
-     * phpMyAdmin database.
-     * Available property:
-     * - PROP_SORTED_COLUMN
-     * - PROP_COLUMN_ORDER
-     * - PROP_COLUMN_VISIB
-     *
-     * @param string $property          Property
-     * @param mixed  $value             Value for the property
-     * @param string $table_create_time Needed for PROP_COLUMN_ORDER
-     *                                  and PROP_COLUMN_VISIB
-     *
-     * @return boolean|Message
-     */
-    public function setUiProp($property, $value, $table_create_time = null)
-    {
-        if (! isset($this->uiprefs)) {
-            $this->loadUiPrefs();
-        }
-        // we want to save the create time if the property is PROP_COLUMN_ORDER
-        if (! $this->isView()
-            && ($property == self::PROP_COLUMN_ORDER
-            || $property == self::PROP_COLUMN_VISIB)
-        ) {
-            $curr_create_time = $this->getStatusInfo('CREATE_TIME');
-            if (isset($table_create_time)
-                && $table_create_time == $curr_create_time
-            ) {
-                $this->uiprefs['CREATE_TIME'] = $curr_create_time;
-            } else {
-                // there is no $table_create_time, or
-                // supplied $table_create_time is older than current create time,
-                // so don't save
-                return Message::error(
-                    sprintf(
-                        __(
-                            'Cannot save UI property "%s". The changes made will ' .
-                            'not be persistent after you refresh this page. ' .
-                            'Please check if the table structure has been changed.'
-                        ),
-                        $property
-                    )
-                );
-            }
-        }
-        // save the value
-        $this->uiprefs[$property] = $value;
-
-        // check if pmadb is set
-        $cfgRelation = PMA_getRelationsParam();
-        if ($cfgRelation['uiprefswork']) {
-            return $this->saveUiprefsToDb();
-        }
-        return true;
-    }
-
-    /**
-     * Remove a property from UI preferences.
-     *
-     * @param string $property the property
-     *
-     * @return true|Message
-     */
-    public function removeUiProp($property)
-    {
-        if (! isset($this->uiprefs)) {
-            $this->loadUiPrefs();
-        }
-        if (isset($this->uiprefs[$property])) {
-            unset($this->uiprefs[$property]);
-
-            // check if pmadb is set
-            $cfgRelation = PMA_getRelationsParam();
-            if ($cfgRelation['uiprefswork']) {
-                return $this->saveUiprefsToDb();
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Get all column names which are MySQL reserved words
-     *
-     * @return array
-     * @access public
-     */
-    public function getReservedColumnNames()
-    {
-        $columns = $this->getColumns(false);
-        $return = array();
-        foreach ($columns as $column) {
-            $temp = explode('.', $column);
-            $column_name = $temp[2];
-            if (Context::isKeyword($column_name, true)) {
-                $return[] = $column_name;
-            }
-        }
-        return $return;
-    }
-
-    /**
-     * Function to get the name and type of the columns of a table
-     *
-     * @return array
-     */
-    public function getNameAndTypeOfTheColumns()
-    {
-        $columns = array();
-        foreach ($this->_dbi->getColumnsFull(
-            $this->_db_name, $this->_name
-        ) as $row) {
-            if (preg_match('@^(set|enum)\((.+)\)$@i', $row['Type'], $tmp)) {
-                $tmp[2] = mb_substr(
-                    preg_replace('@([^,])\'\'@', '\\1\\\'', ',' . $tmp[2]), 1
-                );
-                $columns[$row['Field']] = $tmp[1] . '('
-                    . str_replace(',', ', ', $tmp[2]) . ')';
-            } else {
-                $columns[$row['Field']] = $row['Type'];
-            }
-        }
-        return $columns;
-    }
-
-    /**
-     * Get index with index name
-     *
-     * @param string $index Index name
-     *
-     * @return Index
-     */
-    public function getIndex($index)
-    {
-        return Index::singleton($this->_db_name, $this->_name, $index);
-    }
-
-    /**
-     * Function to get the sql query for index creation or edit
-     *
-     * @param Index $index  current index
-     * @param bool  &$error whether error occurred or not
-     *
-     * @return string
-     */
-    public function getSqlQueryForIndexCreateOrEdit($index, &$error)
-    {
-        // $sql_query is the one displayed in the query box
-        $sql_query = sprintf(
-            'ALTER TABLE %s.%s',
-            Util::backquote($this->_db_name),
-            Util::backquote($this->_name)
-        );
-
-        // Drops the old index
-        if (! empty($_REQUEST['old_index'])) {
-            if ($_REQUEST['old_index'] == 'PRIMARY') {
-                $sql_query .= ' DROP PRIMARY KEY,';
-            } else {
-                $sql_query .= sprintf(
-                    ' DROP INDEX %s,',
-                    Util::backquote($_REQUEST['old_index'])
-                );
-            }
-        } // end if
-
-        // Builds the new one
-        switch ($index->getChoice()) {
-        case 'PRIMARY':
-            if ($index->getName() == '') {
-                $index->setName('PRIMARY');
-            } elseif ($index->getName() != 'PRIMARY') {
-                $error = Message::error(
-                    __('The name of the primary key must be "PRIMARY"!')
-                );
-            }
-            $sql_query .= ' ADD PRIMARY KEY';
-            break;
-        case 'FULLTEXT':
-        case 'UNIQUE':
-        case 'INDEX':
-        case 'SPATIAL':
-            if ($index->getName() == 'PRIMARY') {
-                $error = Message::error(
-                    __('Can\'t rename index to PRIMARY!')
-                );
-            }
-            $sql_query .= sprintf(
-                ' ADD %s ',
-                $index->getChoice()
-            );
-            if ($index->getName()) {
-                $sql_query .= Util::backquote($index->getName());
-            }
-            break;
-        } // end switch
-
-        $index_fields = array();
-        foreach ($index->getColumns() as $key => $column) {
-            $index_fields[$key] = Util::backquote($column->getName());
-            if ($column->getSubPart()) {
-                $index_fields[$key] .= '(' . $column->getSubPart() . ')';
-            }
-        } // end while
-
-        if (empty($index_fields)) {
-            $error = Message::error(__('No index parts defined!'));
-        } else {
-            $sql_query .= ' (' . implode(', ', $index_fields) . ')';
-        }
-
-        $keyBlockSizes = $index->getKeyBlockSize();
-        if (! empty($keyBlockSizes)) {
-            $sql_query .= sprintf(
-                ' KEY_BLOCK_SIZE = ',
-                $GLOBALS['dbi']->escapeString($keyBlockSizes)
-            );
-        }
-
-        // specifying index type is allowed only for primary, unique and index only
-        $type = $index->getType();
-        if ($index->getChoice() != 'SPATIAL'
-            && $index->getChoice() != 'FULLTEXT'
-            && in_array($type, Index::getIndexTypes())
-        ) {
-            $sql_query .= ' USING ' . $type;
-        }
-
-        $parser = $index->getParser();
-        if ($index->getChoice() == 'FULLTEXT' && ! empty($parser)) {
-            $sql_query .= ' WITH PARSER ' . $GLOBALS['dbi']->escapeString($parser);
-        }
-
-        $comment = $index->getComment();
-        if (! empty($comment)) {
-            $sql_query .= sprintf(
-                " COMMENT '%s'",
-                $GLOBALS['dbi']->escapeString($comment)
-            );
-        }
-
-        $sql_query .= ';';
-
-        return $sql_query;
-    }
-
-    /**
-     * Function to handle update for display field
-     *
-     * @param string $disp          current display field
-     * @param string $display_field display field
-     * @param array  $cfgRelation   configuration relation
-     *
-     * @return boolean True on update succeed or False on failure
-     */
-    public function updateDisplayField($disp, $display_field, $cfgRelation)
-    {
-        $upd_query = false;
-        if ($disp) {
-            if ($display_field == '') {
-                $upd_query = 'DELETE FROM '
-                    . Util::backquote($GLOBALS['cfgRelation']['db'])
-                    . '.' . Util::backquote($cfgRelation['table_info'])
-                    . ' WHERE db_name  = \''
-                    . $GLOBALS['dbi']->escapeString($this->_db_name) . '\''
-                    . ' AND table_name = \''
-                    . $GLOBALS['dbi']->escapeString($this->_name) . '\'';
-            } elseif ($disp != $display_field) {
-                $upd_query = 'UPDATE '
-                    . Util::backquote($GLOBALS['cfgRelation']['db'])
-                    . '.' . Util::backquote($cfgRelation['table_info'])
-                    . ' SET display_field = \''
-                    . $GLOBALS['dbi']->escapeString($display_field) . '\''
-                    . ' WHERE db_name  = \''
-                    . $GLOBALS['dbi']->escapeString($this->_db_name) . '\''
-                    . ' AND table_name = \''
-                    . $GLOBALS['dbi']->escapeString($this->_name) . '\'';
-            }
-        } elseif ($display_field != '') {
-            $upd_query = 'INSERT INTO '
-                . Util::backquote($GLOBALS['cfgRelation']['db'])
-                . '.' . Util::backquote($cfgRelation['table_info'])
-                . '(db_name, table_name, display_field) VALUES('
-                . '\'' . $GLOBALS['dbi']->escapeString($this->_db_name) . '\','
-                . '\'' . $GLOBALS['dbi']->escapeString($this->_name) . '\','
-                . '\'' . $GLOBALS['dbi']->escapeString($display_field) . '\')';
-        }
-
-        if ($upd_query) {
-            $this->_dbi->query(
-                $upd_query,
-                $GLOBALS['controllink'],
-                0,
-                false
-            );
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Function to get update query for updating internal relations
-     *
-     * @param array      $multi_edit_columns_name multi edit column names
-     * @param array      $destination_db          destination tables
-     * @param array      $destination_table       destination tables
-     * @param array      $destination_column      destination columns
-     * @param array      $cfgRelation             configuration relation
-     * @param array|null $existrel                db, table, column
-     *
-     * @return boolean
-     */
-    public function updateInternalRelations($multi_edit_columns_name,
-        $destination_db, $destination_table, $destination_column,
-        $cfgRelation, $existrel
-    ) {
-        $updated = false;
-        foreach ($destination_db as $master_field_md5 => $foreign_db) {
-            $upd_query = null;
-            // Map the fieldname's md5 back to its real name
-            $master_field = $multi_edit_columns_name[$master_field_md5];
-            $foreign_table = $destination_table[$master_field_md5];
-            $foreign_field = $destination_column[$master_field_md5];
-            if (! empty($foreign_db)
-                && ! empty($foreign_table)
-                && ! empty($foreign_field)
-            ) {
-                if (! isset($existrel[$master_field])) {
-                    $upd_query  = 'INSERT INTO '
-                        . Util::backquote($GLOBALS['cfgRelation']['db'])
-                        . '.' . Util::backquote($cfgRelation['relation'])
-                        . '(master_db, master_table, master_field, foreign_db,'
-                        . ' foreign_table, foreign_field)'
-                        . ' values('
-                        . '\'' . $GLOBALS['dbi']->escapeString($this->_db_name) . '\', '
-                        . '\'' . $GLOBALS['dbi']->escapeString($this->_name) . '\', '
-                        . '\'' . $GLOBALS['dbi']->escapeString($master_field) . '\', '
-                        . '\'' . $GLOBALS['dbi']->escapeString($foreign_db) . '\', '
-                        . '\'' . $GLOBALS['dbi']->escapeString($foreign_table) . '\','
-                        . '\'' . $GLOBALS['dbi']->escapeString($foreign_field) . '\')';
-
-                } elseif ($existrel[$master_field]['foreign_db'] != $foreign_db
-                    || $existrel[$master_field]['foreign_table'] != $foreign_table
-                    || $existrel[$master_field]['foreign_field'] != $foreign_field
-                ) {
-                    $upd_query  = 'UPDATE '
-                        . Util::backquote($GLOBALS['cfgRelation']['db'])
-                        . '.' . Util::backquote($cfgRelation['relation'])
-                        . ' SET foreign_db       = \''
-                        . $GLOBALS['dbi']->escapeString($foreign_db) . '\', '
-                        . ' foreign_table    = \''
-                        . $GLOBALS['dbi']->escapeString($foreign_table) . '\', '
-                        . ' foreign_field    = \''
-                        . $GLOBALS['dbi']->escapeString($foreign_field) . '\' '
-                        . ' WHERE master_db  = \''
-                        . $GLOBALS['dbi']->escapeString($this->_db_name) . '\''
-                        . ' AND master_table = \''
-                        . $GLOBALS['dbi']->escapeString($this->_name) . '\''
-                        . ' AND master_field = \''
-                        . $GLOBALS['dbi']->escapeString($master_field) . '\'';
-                } // end if... else....
-            } elseif (isset($existrel[$master_field])) {
-                $upd_query = 'DELETE FROM '
-                    . Util::backquote($GLOBALS['cfgRelation']['db'])
-                    . '.' . Util::backquote($cfgRelation['relation'])
-                    . ' WHERE master_db  = \''
-                    . $GLOBALS['dbi']->escapeString($this->_db_name) . '\''
-                    . ' AND master_table = \''
-                    . $GLOBALS['dbi']->escapeString($this->_name) . '\''
-                    . ' AND master_field = \''
-                    . $GLOBALS['dbi']->escapeString($master_field) . '\'';
-            } // end if... else....
-
-            if (isset($upd_query)) {
-                $this->_dbi->query(
-                    $upd_query,
-                    $GLOBALS['controllink'],
-                    0,
-                    false
-                );
-                $updated = true;
-            }
-        }
-        return $updated;
-    }
-
-    /**
-     * Function to handle foreign key updates
-     *
-     * @param array  $destination_foreign_db     destination foreign database
-     * @param array  $multi_edit_columns_name    multi edit column names
-     * @param array  $destination_foreign_table  destination foreign table
-     * @param array  $destination_foreign_column destination foreign column
-     * @param array  $options_array              options array
-     * @param string $table                      current table
-     * @param array  $existrel_foreign           db, table, column
-     *
-     * @return array
-     */
-    public function updateForeignKeys($destination_foreign_db,
-        $multi_edit_columns_name, $destination_foreign_table,
-        $destination_foreign_column, $options_array, $table, $existrel_foreign
-    ) {
-        $html_output = '';
-        $preview_sql_data = '';
-        $display_query = '';
-        $seen_error = false;
-
-        foreach ($destination_foreign_db as $master_field_md5 => $foreign_db) {
-            $create = false;
-            $drop = false;
-
-            // Map the fieldname's md5 back to its real name
-            $master_field = $multi_edit_columns_name[$master_field_md5];
-
-            $foreign_table = $destination_foreign_table[$master_field_md5];
-            $foreign_field = $destination_foreign_column[$master_field_md5];
-
-            if (isset($existrel_foreign[$master_field_md5]['ref_db_name'])) {
-                $ref_db_name = $existrel_foreign[$master_field_md5]['ref_db_name'];
-            } else {
-                $ref_db_name = $GLOBALS['db'];
-            }
-
-            $empty_fields = false;
-            foreach ($master_field as $key => $one_field) {
-                if ((! empty($one_field) && empty($foreign_field[$key]))
-                    || (empty($one_field) && ! empty($foreign_field[$key]))
-                ) {
-                    $empty_fields = true;
-                }
-
-                if (empty($one_field) && empty($foreign_field[$key])) {
-                    unset($master_field[$key]);
-                    unset($foreign_field[$key]);
-                }
-            }
-
-            if (! empty($foreign_db)
-                && ! empty($foreign_table)
-                && ! $empty_fields
-            ) {
-                if (isset($existrel_foreign[$master_field_md5])) {
-                    $constraint_name
-                        = $existrel_foreign[$master_field_md5]['constraint'];
-                    $on_delete = !empty(
-                        $existrel_foreign[$master_field_md5]['on_delete']
-                    )
-                        ? $existrel_foreign[$master_field_md5]['on_delete']
-                        : 'RESTRICT';
-                    $on_update = ! empty(
-                        $existrel_foreign[$master_field_md5]['on_update']
-                    )
-                        ? $existrel_foreign[$master_field_md5]['on_update']
-                        : 'RESTRICT';
-
-                    if ($ref_db_name != $foreign_db
-                        || $existrel_foreign[$master_field_md5]['ref_table_name'] != $foreign_table
-                        || $existrel_foreign[$master_field_md5]['ref_index_list'] != $foreign_field
-                        || $existrel_foreign[$master_field_md5]['index_list'] != $master_field
-                        || $_REQUEST['constraint_name'][$master_field_md5] != $constraint_name
-                        || ($_REQUEST['on_delete'][$master_field_md5] != $on_delete)
-                        || ($_REQUEST['on_update'][$master_field_md5] != $on_update)
-                    ) {
-                        // another foreign key is already defined for this field
-                        // or an option has been changed for ON DELETE or ON UPDATE
-                        $drop = true;
-                        $create = true;
-                    } // end if... else....
-                } else {
-                    // no key defined for this field(s)
-                    $create = true;
-                }
-            } elseif (isset($existrel_foreign[$master_field_md5])) {
-                $drop = true;
-            } // end if... else....
-
-            $tmp_error_drop = false;
-            if ($drop) {
-                $drop_query = 'ALTER TABLE ' . Util::backquote($table)
-                    . ' DROP FOREIGN KEY '
-                    . Util::backquote(
-                        $existrel_foreign[$master_field_md5]['constraint']
-                    )
-                    . ';';
-
-                if (! isset($_REQUEST['preview_sql'])) {
-                    $display_query .= $drop_query . "\n";
-                    $this->_dbi->tryQuery($drop_query);
-                    $tmp_error_drop = $this->_dbi->getError();
-
-                    if (! empty($tmp_error_drop)) {
-                        $seen_error = true;
-                        $html_output .= Util::mysqlDie(
-                            $tmp_error_drop, $drop_query, false, '', false
-                        );
-                        continue;
-                    }
-                } else {
-                    $preview_sql_data .= $drop_query . "\n";
-                }
-            }
-            $tmp_error_create = false;
-            if (!$create) {
-                continue;
-            }
-
-            $create_query = $this->_getSQLToCreateForeignKey(
-                $table, $master_field, $foreign_db, $foreign_table, $foreign_field,
-                $_REQUEST['constraint_name'][$master_field_md5],
-                $options_array[$_REQUEST['on_delete'][$master_field_md5]],
-                $options_array[$_REQUEST['on_update'][$master_field_md5]]
-            );
-
-            if (! isset($_REQUEST['preview_sql'])) {
-                $display_query .= $create_query . "\n";
-                $this->_dbi->tryQuery($create_query);
-                $tmp_error_create = $this->_dbi->getError();
-                if (! empty($tmp_error_create)) {
-                    $seen_error = true;
-
-                    if (substr($tmp_error_create, 1, 4) == '1005') {
-                        $message = Message::error(
-                            __(
-                                'Error creating foreign key on %1$s (check data ' .
-                                'types)'
-                            )
-                        );
-                        $message->addParam(implode(', ', $master_field));
-                        $html_output .= $message->getDisplay();
-                    } else {
-                        $html_output .= Util::mysqlDie(
-                            $tmp_error_create, $create_query, false, '', false
-                        );
-                    }
-                    $html_output .= Util::showMySQLDocu(
-                        'InnoDB_foreign_key_constraints'
-                    ) . "\n";
-                }
-            } else {
-                $preview_sql_data .= $create_query . "\n";
-            }
-
-            // this is an alteration and the old constraint has been dropped
-            // without creation of a new one
-            if ($drop && $create && empty($tmp_error_drop)
-                && ! empty($tmp_error_create)
-            ) {
-                // a rollback may be better here
-                $sql_query_recreate = '# Restoring the dropped constraint...' . "\n";
-                $sql_query_recreate .= $this->_getSQLToCreateForeignKey(
-                    $table,
-                    $master_field,
-                    $existrel_foreign[$master_field_md5]['ref_db_name'],
-                    $existrel_foreign[$master_field_md5]['ref_table_name'],
-                    $existrel_foreign[$master_field_md5]['ref_index_list'],
-                    $existrel_foreign[$master_field_md5]['constraint'],
-                    $options_array[$existrel_foreign[$master_field_md5]['on_delete']],
-                    $options_array[$existrel_foreign[$master_field_md5]['on_update']]
-                );
-                if (! isset($_REQUEST['preview_sql'])) {
-                    $display_query .= $sql_query_recreate . "\n";
-                    $this->_dbi->tryQuery($sql_query_recreate);
-                } else {
-                    $preview_sql_data .= $sql_query_recreate;
-                }
-            }
-        } // end foreach
-
-        return array(
-            $html_output,
-            $preview_sql_data,
-            $display_query,
-            $seen_error
-        );
-    }
-
-    /**
-     * Returns the SQL query for foreign key constraint creation
-     *
-     * @param string $table        table name
-     * @param array  $field        field names
-     * @param string $foreignDb    foreign database name
-     * @param string $foreignTable foreign table name
-     * @param array  $foreignField foreign field names
-     * @param string $name         name of the constraint
-     * @param string $onDelete     on delete action
-     * @param string $onUpdate     on update action
-     *
-     * @return string SQL query for foreign key constraint creation
-     */
-    private function _getSQLToCreateForeignKey(
-        $table,
-        $field,
-        $foreignDb,
-        $foreignTable,
-        $foreignField,
-        $name = null,
-        $onDelete = null,
-        $onUpdate = null
-    ) {
-        $sql_query  = 'ALTER TABLE ' . Util::backquote($table) . ' ADD ';
-        // if user entered a constraint name
-        if (! empty($name)) {
-            $sql_query .= ' CONSTRAINT ' . Util::backquote($name);
-        }
-
-        foreach ($field as $key => $one_field) {
-            $field[$key] = Util::backquote($one_field);
-        }
-        foreach ($foreignField as $key => $one_field) {
-            $foreignField[$key] = Util::backquote($one_field);
-        }
-        $sql_query .= ' FOREIGN KEY (' . implode(', ', $field) . ') REFERENCES '
-            . ($this->_db_name != $foreignDb
-                ? Util::backquote($foreignDb) . '.' : '')
-            . Util::backquote($foreignTable)
-            . '(' . implode(', ', $foreignField) . ')';
-
-        if (! empty($onDelete)) {
-            $sql_query .= ' ON DELETE ' . $onDelete;
-        }
-        if (! empty($onUpdate)) {
-            $sql_query .= ' ON UPDATE ' . $onUpdate;
-        }
-        $sql_query .= ';';
-
-        return $sql_query;
-    }
-
-    /**
-     * Returns the generation expression for virtual columns
-     *
-     * @param string $column name of the column
-     *
-     * @return array|boolean associative array of column name and their expressions
-     *                       or false on failure
-     */
-    public function getColumnGenerationExpression($column = null)
-    {
-        $serverType = Util::getServerType();
-        if ($serverType == 'MySQL'
-            && PMA_MYSQL_INT_VERSION > 50705
-            && ! $GLOBALS['cfg']['Server']['DisableIS']
-        ) {
-            $sql
-                = "SELECT
-                `COLUMN_NAME` AS `Field`,
-                `GENERATION_EXPRESSION` AS `Expression`
-                FROM
-                `information_schema`.`COLUMNS`
-                WHERE
-                `TABLE_SCHEMA` = '" . $GLOBALS['dbi']->escapeString($this->_db_name) . "'
-                AND `TABLE_NAME` = '" . $GLOBALS['dbi']->escapeString($this->_name) . "'";
-            if ($column != null) {
-                $sql .= " AND  `COLUMN_NAME` = '" . $GLOBALS['dbi']->escapeString($column)
-                    . "'";
-            }
-            $columns = $this->_dbi->fetchResult($sql, 'Field', 'Expression');
-            return $columns;
-        }
-
-        $createTable = $this->showCreate();
-        if (!$createTable) {
-            return false;
-        }
-
-        $parser = new Parser($createTable);
-        /**
-         * @var \SqlParser\Statements\CreateStatement $stmt
-        */
-        $stmt = $parser->statements[0];
-        $fields = Table::getFields($stmt);
-        if ($column != null) {
-            $expression = isset($fields[$column]['expr']) ?
-                substr($fields[$column]['expr'], 1, -1) : '';
-            return array($column => $expression);
-        }
-
-        $ret = array();
-        foreach ($fields as $field => $options) {
-            if (isset($options['expr'])) {
-                $ret[$field] = substr($options['expr'], 1, -1);
-            }
-        }
-        return $ret;
-    }
-
-    /**
-     * Returns the CREATE statement for this table
-     *
-     * @return mixed
-     */
-    public function showCreate()
-    {
-        return $this->_dbi->fetchValue(
-            'SHOW CREATE TABLE ' . Util::backquote($this->_db_name) . '.'
-            . Util::backquote($this->_name),
-            0, 1
-        );
-    }
-
-    /**
-     * Returns the real row count for a table
-     *
-     * @return number
-     */
-    function getRealRowCountTable()
-    {
-        // SQL query to get row count for a table.
-        $result = $this->_dbi->fetchSingleRow(
-            sprintf(
-                'SELECT COUNT(*) AS %s FROM %s.%s',
-                Util::backquote('row_count'),
-                Util::backquote($this->_db_name),
-                Util::backquote($this->_name)
-            )
-        );
-        return $result['row_count'];
-    }
-
-    /**
-     * Get columns with indexes
-     *
-     * @param int $types types bitmask
-     *
-     * @return array an array of columns
-     */
-    function getColumnsWithIndex($types)
-    {
-        $columns_with_index = array();
-        foreach (
-            Index::getFromTableByChoice(
-                $this->_name,
-                $this->_db_name,
-                $types
-            ) as $index
-        ) {
-            $columns = $index->getColumns();
-            foreach ($columns as $column_name => $dummy) {
-                $columns_with_index[] = $column_name;
-            }
-        }
-        return $columns_with_index;
-    }
-}
diff --git a/#pma/libraries/Template.php b/#pma/libraries/Template.php
deleted file mode 100644
index 6f2faa0e..00000000
--- a/#pma/libraries/Template.php
+++ /dev/null
@@ -1,167 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * hold PMA\libraries\Template class
- *
- * @package PMA\libraries
- */
-namespace PMA\libraries;
-
-/**
- * Class Template
- *
- * Handle front end templating
- *
- * @package PMA\libraries
- */
-class Template
-{
-    /**
-     * Name of the template
-     */
-    protected $name = null;
-
-    /**
-     * Data associated with the template
-     */
-    protected $data;
-
-    /**
-     * Helper functions for the template
-     */
-    protected $helperFunctions;
-
-    const BASE_PATH = 'templates/';
-
-    /**
-     * Template constructor
-     *
-     * @param string $name Template name
-     * @param array $data Variables to be provided to the template
-     * @param array $helperFunctions Helper functions to be used by template
-     */
-    protected function __construct($name, $data = array(), $helperFunctions = array())
-    {
-        $this->name = $name;
-        $this->data = $data;
-        $this->helperFunctions = $helperFunctions;
-    }
-
-    /**
-     * Template getter
-     *
-     * @param string $name Template name
-     * @param array $data Variables to be provided to the template
-     * @param array $helperFunctions Helper functions to be used by template
-     *
-     * @return Template
-     */
-    public static function get($name, $data = array(), $helperFunctions = array())
-    {
-        return new Template($name, $data, $helperFunctions);
-    }
-
-    /**
-     * Adds more entries to the data for this template
-     *
-     * @param array|string $data containing data array or data key
-     * @param string       $value containing data value
-     */
-    public function set($data, $value = null)
-    {
-        if(is_array($data) && ! $value) {
-            $this->data = array_merge(
-                $this->data,
-                $data
-            );
-        } else if (is_string($data)) {
-            $this->data[$data] = $value;
-        }
-    }
-
-    /**
-     * Adds a function for use by the template
-     *
-     * @param string $funcName function name
-     * @param callable $funcDef function definition
-     */
-    public function setHelper($funcName, $funcDef)
-    {
-        if (! isset($this->helperFunctions[$funcName])) {
-            $this->helperFunctions[$funcName] = $funcDef;
-        } else {
-            throw new \LogicException(
-                'The function "' . $funcName . '" is already associated with the template.'
-            );
-        }
-    }
-
-    /**
-     * Removes a function
-     *
-     * @param string $funcName function name
-     */
-    public function removeHelper($funcName)
-    {
-        if (isset($this->helperFunctions[$funcName])) {
-            unset($this->helperFunctions[$funcName]);
-        } else {
-            throw new \LogicException(
-                'The function "' . $funcName . '" is not associated with the template.'
-            );
-        }
-    }
-
-    /**
-     * Magic call to locally inaccessible but associated helper functions
-     *
-     * @param string $funcName function name
-     * @param array  $arguments function arguments
-     */
-    public function __call($funcName, $arguments)
-    {
-        if (isset($this->helperFunctions[$funcName])) {
-            return call_user_func_array($this->helperFunctions[$funcName], $arguments);
-        } else {
-            throw new \LogicException(
-                'The function "' . $funcName . '" is not associated with the template.'
-            );
-        }
-    }
-
-    /**
-     * Render template
-     *
-     * @param array $data Variables to be provided to the template
-     * @param bool  $trim Trim content (does nothing, removed in future)
-     * @param array $helperFunctions Helper functions to be used by template
-     *
-     * @return string
-     */
-    public function render($data = array(), $trim = true, $helperFunctions = array())
-    {
-        $template = static::BASE_PATH . $this->name . '.phtml';
-        try {
-            $this->set($data);
-            $this->helperFunctions = array_merge(
-                $this->helperFunctions,
-                $helperFunctions
-            );
-            extract($this->data);
-            ob_start();
-            if (file_exists($template)) {
-                include $template;
-            } else {
-                throw new \LogicException(
-                    'The template "' . $template . '" not found.'
-                );
-            }
-            $content = ob_get_clean();
-
-            return $content;
-        } catch (\LogicException $e) {
-            ob_end_clean();
-            throw new \LogicException($e->getMessage());
-        }
-    }
-}
diff --git a/#pma/libraries/Theme.php b/#pma/libraries/Theme.php
deleted file mode 100644
index 0762cce1..00000000
--- a/#pma/libraries/Theme.php
+++ /dev/null
@@ -1,482 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * hold Theme class
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries;
-
-/**
- * handles theme
- *
- * @todo add the possibility to make a theme depend on another theme
- * and by default on original
- * @todo make all components optional - get missing components from 'parent' theme
- *
- * @package PhpMyAdmin
- */
-class Theme
-{
-    /**
-     * @var string theme version
-     * @access  protected
-     */
-    var $version = '0.0.0.0';
-
-    /**
-     * @var string theme name
-     * @access  protected
-     */
-    var $name = '';
-
-    /**
-     * @var string theme id
-     * @access  protected
-     */
-    var $id = '';
-
-    /**
-     * @var string theme path
-     * @access  protected
-     */
-    var $path = '';
-
-    /**
-     * @var string image path
-     * @access  protected
-     */
-    var $img_path = '';
-
-    /**
-     * @var integer last modification time for info file
-     * @access  protected
-     */
-    var $mtime_info = 0;
-
-    /**
-     * needed because sometimes, the mtime for different themes
-     * is identical
-     * @var integer filesize for info file
-     * @access  protected
-     */
-    var $filesize_info = 0;
-
-    /**
-     * @var array List of css files to load
-     * @access private
-     */
-    private $_cssFiles = array(
-        'common',
-        'enum_editor',
-        'gis',
-        'navigation',
-        'pmd',
-        'rte',
-        'codemirror',
-        'jqplot',
-        'resizable-menu'
-    );
-
-    /**
-     * Loads theme information
-     *
-     * @return boolean whether loading them info was successful or not
-     * @access  public
-     */
-    function loadInfo()
-    {
-        if (! file_exists($this->getPath() . '/info.inc.php')) {
-            return false;
-        }
-
-        if ($this->mtime_info === filemtime($this->getPath() . '/info.inc.php')) {
-            return true;
-        }
-
-        @include $this->getPath() . '/info.inc.php';
-
-        // was it set correctly?
-        if (! isset($theme_name)) {
-            return false;
-        }
-
-        $this->mtime_info = filemtime($this->getPath() . '/info.inc.php');
-        $this->filesize_info = filesize($this->getPath() . '/info.inc.php');
-
-        if (isset($theme_full_version)) {
-            $this->setVersion($theme_full_version);
-        } elseif (isset($theme_generation, $theme_version)) {
-            $this->setVersion($theme_generation . '.' . $theme_version);
-        }
-        $this->setName($theme_name);
-
-        return true;
-    }
-
-    /**
-     * returns theme object loaded from given folder
-     * or false if theme is invalid
-     *
-     * @param string $folder path to theme
-     *
-     * @return Theme|false
-     * @static
-     * @access public
-     */
-    static public function load($folder)
-    {
-        $theme = new Theme();
-
-        $theme->setPath($folder);
-
-        if (! $theme->loadInfo()) {
-            return false;
-        }
-
-        $theme->checkImgPath();
-
-        return $theme;
-    }
-
-    /**
-     * checks image path for existence - if not found use img from fallback theme
-     *
-     * @access public
-     * @return bool
-     */
-    public function checkImgPath()
-    {
-        // try current theme first
-        if (is_dir($this->getPath() . '/img/')) {
-            $this->setImgPath($this->getPath() . '/img/');
-            return true;
-        }
-
-        // try fallback theme
-        $fallback = $GLOBALS['cfg']['ThemePath'] . '/'
-            . ThemeManager::FALLBACK_THEME
-            . '/img/';
-        if (is_dir($fallback)) {
-            $this->setImgPath($fallback);
-            return true;
-        }
-
-        // we failed
-        trigger_error(
-            sprintf(
-                __('No valid image path for theme %s found!'),
-                $this->getName()
-            ),
-            E_USER_ERROR
-        );
-        return false;
-    }
-
-    /**
-     * returns path to theme
-     *
-     * @access public
-     * @return string path to theme
-     */
-    public function getPath()
-    {
-        return $this->path;
-    }
-
-    /**
-     * returns layout file
-     *
-     * @access public
-     * @return string layout file
-     */
-    public function getLayoutFile()
-    {
-        return $this->getPath() . '/layout.inc.php';
-    }
-
-    /**
-     * set path to theme
-     *
-     * @param string $path path to theme
-     *
-     * @return void
-     * @access public
-     */
-    public function setPath($path)
-    {
-        $this->path = trim($path);
-    }
-
-    /**
-     * sets version
-     *
-     * @param string $version version to set
-     *
-     * @return void
-     * @access public
-     */
-    public function setVersion($version)
-    {
-        $this->version = trim($version);
-    }
-
-    /**
-     * returns version
-     *
-     * @return string version
-     * @access public
-     */
-    public function getVersion()
-    {
-        return $this->version;
-    }
-
-    /**
-     * checks theme version against $version
-     * returns true if theme version is equal or higher to $version
-     *
-     * @param string $version version to compare to
-     *
-     * @return boolean true if theme version is equal or higher to $version
-     * @access public
-     */
-    public function checkVersion($version)
-    {
-        return version_compare($this->getVersion(), $version, 'lt');
-    }
-
-    /**
-     * sets name
-     *
-     * @param string $name name to set
-     *
-     * @return void
-     * @access public
-     */
-    public function setName($name)
-    {
-        $this->name = trim($name);
-    }
-
-    /**
-     * returns name
-     *
-     * @access  public
-     * @return string name
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * sets id
-     *
-     * @param string $id new id
-     *
-     * @return void
-     * @access public
-     */
-    public function setId($id)
-    {
-        $this->id = trim($id);
-    }
-
-    /**
-     * returns id
-     *
-     * @return string id
-     * @access public
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * Sets path to images for the theme
-     *
-     * @param string $path path to images for this theme
-     *
-     * @return void
-     * @access public
-     */
-    public function setImgPath($path)
-    {
-        $this->img_path = $path;
-    }
-
-    /**
-     * Returns the path to image for the theme.
-     * If filename is given, it possibly fallbacks to fallback
-     * theme for it if image does not exist.
-     *
-     * @param string $file file name for image
-     *
-     * @access public
-     * @return string image path for this theme
-     */
-    public function getImgPath($file = null)
-    {
-        if (is_null($file)) {
-            return $this->img_path;
-        }
-
-        if (is_readable($this->img_path . $file)) {
-            return $this->img_path . $file;
-        }
-
-        return $GLOBALS['cfg']['ThemePath'] . '/'
-            . ThemeManager::FALLBACK_THEME . '/img/' . $file;
-    }
-
-    /**
-     * load css (send to stdout, normally the browser)
-     *
-     * @return bool
-     * @access  public
-     */
-    public function loadCss()
-    {
-        $success = true;
-
-        if ($GLOBALS['text_dir'] === 'ltr') {
-            $right = 'right';
-            $left = 'left';
-        } else {
-            $right = 'left';
-            $left = 'right';
-        }
-
-        foreach ($this->_cssFiles as $file) {
-            $path = $this->getPath() . "/css/$file.css.php";
-            $fallback = "./themes/"
-                . ThemeManager::FALLBACK_THEME .  "/css/$file.css.php";
-
-            if (is_readable($path)) {
-                echo "\n/* FILE: " , $file , ".css.php */\n";
-                include $path;
-            } else if (is_readable($fallback)) {
-                echo "\n/* FILE: " , $file , ".css.php */\n";
-                include $fallback;
-            } else {
-                $success = false;
-            }
-        }
-
-        include './themes/sprites.css.php';
-
-        return $success;
-    }
-
-    /**
-     * Renders the preview for this theme
-     *
-     * @return string
-     * @access public
-     */
-    public function getPrintPreview()
-    {
-        $url_params = array('set_theme' => $this->getId());
-        $url = 'index.php' . PMA_URL_getCommon($url_params);
-
-        $retval  = '<div class="theme_preview">';
-        $retval .= '<h2>';
-        $retval .= htmlspecialchars($this->getName());
-        $retval .= ' (' . htmlspecialchars($this->getVersion()) . ') ';
-        $retval .= '</h2>';
-        $retval .= '<p>';
-        $retval .= '<a class="take_theme" ';
-        $retval .= 'name="' . htmlspecialchars($this->getId()) . '" ';
-        $retval .=  'href="' . $url . '">';
-        if (@file_exists($this->getPath() . '/screen.png')) {
-            // if screen exists then output
-            $retval .= '<img src="' . $this->getPath() . '/screen.png" border="1"';
-            $retval .= ' alt="' . htmlspecialchars($this->getName()) . '"';
-            $retval .= ' title="' . htmlspecialchars($this->getName()) . '" />';
-            $retval .= '<br />';
-        } else {
-            $retval .= __('No preview available.');
-        }
-        $retval .= '[ <strong>' . __('take it') . '</strong> ]';
-        $retval .= '</a>';
-        $retval .= '</p>';
-        $retval .= '</div>';
-        return $retval;
-    }
-
-    /**
-     * Remove filter for IE.
-     *
-     * @return string CSS code.
-     */
-    function getCssIEClearFilter()
-    {
-        return PMA_USR_BROWSER_AGENT == 'IE'
-            && PMA_USR_BROWSER_VER >= 6
-            && PMA_USR_BROWSER_VER <= 8
-            ? 'filter: none'
-            : '';
-    }
-
-    /**
-     * Gets currently configured font size.
-     *
-     * @return String with font size.
-     */
-    function getFontSize()
-    {
-        $fs = $GLOBALS['PMA_Config']->get('fontsize');
-        if (!is_null($fs)) {
-            return $fs;
-        }
-        if (isset($_COOKIE['pma_fontsize'])) {
-            return htmlspecialchars($_COOKIE['pma_fontsize']);
-        }
-        return '82%';
-    }
-
-    /**
-     * Generates code for CSS gradient using various browser extensions.
-     *
-     * @param string $start_color Color of gradient start, hex value without #
-     * @param string $end_color   Color of gradient end, hex value without #
-     *
-     * @return string CSS code.
-     */
-    function getCssGradient($start_color, $end_color)
-    {
-        $result = array();
-        // Opera 9.5+, IE 9
-        $result[] = 'background-image: url(./themes/svg_gradient.php?from='
-            . $start_color . '&to=' . $end_color . ');';
-        $result[] = 'background-size: 100% 100%;';
-        // Safari 4-5, Chrome 1-9
-        $result[] = 'background: '
-            . '-webkit-gradient(linear, left top, left bottom, from(#'
-            . $start_color . '), to(#' . $end_color . '));';
-        // Safari 5.1, Chrome 10+
-        $result[] = 'background: -webkit-linear-gradient(top, #'
-            . $start_color . ', #' . $end_color . ');';
-        // Firefox 3.6+
-        $result[] = 'background: -moz-linear-gradient(top, #'
-            . $start_color . ', #' . $end_color . ');';
-        // IE 10
-        $result[] = 'background: -ms-linear-gradient(top, #'
-            . $start_color . ', #' . $end_color . ');';
-        // Opera 11.10
-        $result[] = 'background: -o-linear-gradient(top, #'
-            . $start_color . ', #' . $end_color . ');';
-        // IE 6-8
-        if (PMA_USR_BROWSER_AGENT == 'IE'
-            && PMA_USR_BROWSER_VER >= 6
-            && PMA_USR_BROWSER_VER <= 8
-        ) {
-            $result[] = 'filter: '
-                . 'progid:DXImageTransform.Microsoft.gradient(startColorstr="#'
-                . $start_color . '", endColorstr="#' . $end_color . '");';
-        }
-        return implode("\n", $result);
-    }
-}
diff --git a/#pma/libraries/ThemeManager.php b/#pma/libraries/ThemeManager.php
deleted file mode 100644
index 8a1ed451..00000000
--- a/#pma/libraries/ThemeManager.php
+++ /dev/null
@@ -1,526 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * phpMyAdmin theme manager
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries;
-
-/**
- * phpMyAdmin theme manager
- *
- * @package PhpMyAdmin
- */
-class ThemeManager
-{
-    /**
-     * @var string path to theme folder
-     * @access protected
-     */
-    private $_themes_path;
-
-    /**
-     * @var array available themes
-     */
-    var $themes = array();
-
-    /**
-     * @var string  cookie name
-     */
-    var $cookie_name = 'pma_theme';
-
-    /**
-     * @var boolean
-     */
-    var $per_server = false;
-
-    /**
-     * @var string name of active theme
-     */
-    var $active_theme = '';
-
-    /**
-     * @var Theme Theme active theme
-     */
-    var $theme = null;
-
-    /**
-     * @var string
-     */
-    var $theme_default;
-
-    /**
-     * @const string The name of the fallback theme
-     */
-    const FALLBACK_THEME = 'pmahomme';
-
-    /**
-     * Constructor for Theme Manager class
-     *
-     * @access public
-     */
-    public function __construct()
-    {
-        $this->init();
-    }
-
-    /**
-     * sets path to folder containing the themes
-     *
-     * @param string $path path to themes folder
-     *
-     * @access public
-     * @return boolean success
-     */
-    public function setThemesPath($path)
-    {
-        if (! $this->_checkThemeFolder($path)) {
-            return false;
-        }
-
-        $this->_themes_path = trim($path);
-        return true;
-    }
-
-    /**
-     * Returns path to folder containing themes
-     *
-     * @access public
-     * @return string theme path
-     */
-    public function getThemesPath()
-    {
-        return $this->_themes_path;
-    }
-
-    /**
-     * sets if there are different themes per server
-     *
-     * @param boolean $per_server Whether to enable per server flag
-     *
-     * @access public
-     * @return void
-     */
-    public function setThemePerServer($per_server)
-    {
-        $this->per_server  = (bool) $per_server;
-    }
-
-    /**
-     * Initialise the class
-     *
-     * @access public
-     * @return void
-     */
-    public function init()
-    {
-        $this->themes = array();
-        $this->theme_default = self::FALLBACK_THEME;
-        $this->active_theme = '';
-
-        if (! $this->setThemesPath($GLOBALS['cfg']['ThemePath'])) {
-            return;
-        }
-
-        $this->setThemePerServer($GLOBALS['cfg']['ThemePerServer']);
-
-        $this->loadThemes();
-
-        $this->theme = new Theme;
-
-        if (! $this->checkTheme($GLOBALS['cfg']['ThemeDefault'])) {
-            trigger_error(
-                sprintf(
-                    __('Default theme %s not found!'),
-                    htmlspecialchars($GLOBALS['cfg']['ThemeDefault'])
-                ),
-                E_USER_ERROR
-            );
-            $GLOBALS['cfg']['ThemeDefault'] = false;
-        }
-
-        $this->theme_default = $GLOBALS['cfg']['ThemeDefault'];
-
-        // check if user have a theme cookie
-        if (! $this->getThemeCookie()
-            || ! $this->setActiveTheme($this->getThemeCookie())
-        ) {
-            if ($GLOBALS['cfg']['ThemeDefault']) {
-                // otherwise use default theme
-                $this->setActiveTheme($this->theme_default);
-            } else {
-                // or fallback theme
-                $this->setActiveTheme(self::FALLBACK_THEME);
-            }
-        }
-    }
-
-    /**
-     * Checks configuration
-     *
-     * @access public
-     * @return void
-     */
-    public function checkConfig()
-    {
-        if ($this->_themes_path != trim($GLOBALS['cfg']['ThemePath'])
-            || $this->theme_default != $GLOBALS['cfg']['ThemeDefault']
-        ) {
-            $this->init();
-        } else {
-            // at least the theme path needs to be checked every time for new
-            // themes, as there is no other way at the moment to keep track of
-            // new or removed themes
-            $this->loadThemes();
-        }
-    }
-
-    /**
-     * Sets active theme
-     *
-     * @param string $theme theme name
-     *
-     * @access public
-     * @return bool true on success
-     */
-    public function setActiveTheme($theme = null)
-    {
-        if (! $this->checkTheme($theme)) {
-            trigger_error(
-                sprintf(
-                    __('Theme %s not found!'),
-                    htmlspecialchars($theme)
-                ),
-                E_USER_ERROR
-            );
-            return false;
-        }
-
-        $this->active_theme = $theme;
-        $this->theme = $this->themes[$theme];
-
-        // need to set later
-        //$this->setThemeCookie();
-
-        return true;
-    }
-
-    /**
-     * Returns name for storing theme
-     *
-     * @return string cookie name
-     * @access public
-     */
-    public function getThemeCookieName()
-    {
-        // Allow different theme per server
-        if (isset($GLOBALS['server']) && $this->per_server) {
-            return $this->cookie_name . '-' . $GLOBALS['server'];
-        } else {
-            return $this->cookie_name;
-        }
-    }
-
-    /**
-     * returns name of theme stored in the cookie
-     *
-     * @return string  theme name from cookie
-     * @access public
-     */
-    public function getThemeCookie()
-    {
-        if (isset($_COOKIE[$this->getThemeCookieName()])) {
-            return $_COOKIE[$this->getThemeCookieName()];
-        }
-
-        return false;
-    }
-
-    /**
-     * save theme in cookie
-     *
-     * @return bool true
-     * @access public
-     */
-    public function setThemeCookie()
-    {
-        $GLOBALS['PMA_Config']->setCookie(
-            $this->getThemeCookieName(),
-            $this->theme->id,
-            $this->theme_default
-        );
-        // force a change of a dummy session variable to avoid problems
-        // with the caching of phpmyadmin.css.php
-        $GLOBALS['PMA_Config']->set('theme-update', $this->theme->id);
-        return true;
-    }
-
-    /**
-     * Checks whether folder is valid for storing themes
-     *
-     * @param string $folder Folder name to test
-     *
-     * @return boolean
-     * @access private
-     */
-    private function _checkThemeFolder($folder)
-    {
-        if (! is_dir($folder)) {
-            trigger_error(
-                sprintf(
-                    __('Theme path not found for theme %s!'),
-                    htmlspecialchars($folder)
-                ),
-                E_USER_ERROR
-            );
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * read all themes
-     *
-     * @return bool true
-     * @access public
-     */
-    public function loadThemes()
-    {
-        $this->themes = array();
-
-        if (false === ($handleThemes = opendir($this->getThemesPath()))) {
-            trigger_error(
-                'phpMyAdmin-ERROR: cannot open themes folder: '
-                . $this->getThemesPath(),
-                E_USER_WARNING
-            );
-            return false;
-        }
-
-        // check for themes directory
-        while (false !== ($PMA_Theme = readdir($handleThemes))) {
-            // Skip non dirs, . and ..
-            if ($PMA_Theme == '.'
-                || $PMA_Theme == '..'
-                || ! is_dir($this->getThemesPath() . '/' . $PMA_Theme)
-            ) {
-                continue;
-            }
-            if (array_key_exists($PMA_Theme, $this->themes)) {
-                continue;
-            }
-            $new_theme = Theme::load(
-                $this->getThemesPath() . '/' . $PMA_Theme
-            );
-            if ($new_theme) {
-                $new_theme->setId($PMA_Theme);
-                $this->themes[$PMA_Theme] = $new_theme;
-            }
-        } // end get themes
-        closedir($handleThemes);
-
-        ksort($this->themes);
-        return true;
-    }
-
-    /**
-     * checks if given theme name is a known theme
-     *
-     * @param string $theme name fo theme to check for
-     *
-     * @return bool
-     * @access public
-     */
-    public function checkTheme($theme)
-    {
-        if (! array_key_exists($theme, $this->themes)) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * returns HTML selectbox, with or without form enclosed
-     *
-     * @param boolean $form whether enclosed by from tags or not
-     *
-     * @return string
-     * @access public
-     */
-    public function getHtmlSelectBox($form = true)
-    {
-        $select_box = '';
-
-        if ($form) {
-            $select_box .= '<form name="setTheme" method="get"';
-            $select_box .= ' action="index.php" class="disableAjax">';
-            $select_box .=  PMA_URL_getHiddenInputs();
-        }
-
-        $theme_preview_path= './themes.php';
-        $theme_preview_href = '<a href="'
-            . $theme_preview_path . '" target="themes" class="themeselect">';
-        $select_box .=  $theme_preview_href . __('Theme:') . '</a>' . "\n";
-
-        $select_box .=  '<select name="set_theme" lang="en" dir="ltr"'
-            . ' class="autosubmit">';
-        foreach ($this->themes as $each_theme_id => $each_theme) {
-            $select_box .=  '<option value="' . $each_theme_id . '"';
-            if ($this->active_theme === $each_theme_id) {
-                $select_box .=  ' selected="selected"';
-            }
-            $select_box .=  '>' . htmlspecialchars($each_theme->getName())
-                . '</option>';
-        }
-        $select_box .=  '</select>';
-
-        if ($form) {
-            $select_box .=  '</form>';
-        }
-
-        return $select_box;
-    }
-
-    /**
-     * enables backward compatibility
-     *
-     * @return void
-     * @access public
-     */
-    public function makeBc()
-    {
-        $GLOBALS['theme']           = $this->theme->getId();
-        $GLOBALS['pmaThemePath']    = $this->theme->getPath();
-        $GLOBALS['pmaThemeImage']   = $this->theme->getImgPath();
-
-        /**
-         * load layout file if exists
-         */
-        if (file_exists($this->theme->getLayoutFile())) {
-            include $this->theme->getLayoutFile();
-        }
-    }
-
-    /**
-     * Renders the previews for all themes
-     *
-     * @return string
-     * @access public
-     */
-    public function getPrintPreviews()
-    {
-        $retval = '';
-        foreach ($this->themes as $each_theme) {
-            $retval .= $each_theme->getPrintPreview();
-        } // end 'open themes'
-        return $retval;
-    }
-
-    /**
-     * returns Theme object for fall back theme
-     *
-     * @return Theme fall back theme
-     * @access public
-     */
-    public function getFallBackTheme()
-    {
-        if (isset($this->themes[self::FALLBACK_THEME])) {
-            return $this->themes[self::FALLBACK_THEME];
-        }
-
-        return false;
-    }
-
-    /**
-     * prints css data
-     *
-     * @return bool
-     * @access public
-     */
-    public function printCss()
-    {
-        if ($this->theme->loadCss()) {
-            return true;
-        }
-
-        // if loading css for this theme failed, try default theme css
-        $fallback_theme = $this->getFallBackTheme();
-        if ($fallback_theme && $fallback_theme->loadCss()) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Theme initialization
-     *
-     * @return void
-     * @access public
-     */
-    public static function initializeTheme()
-    {
-        /**
-         * @global ThemeManager $_SESSION['ThemeManager']
-         */
-        if (! isset($_SESSION['PMA_Theme_Manager'])) {
-            $_SESSION['PMA_Theme_Manager'] = new ThemeManager;
-        } else {
-            /**
-             * @todo move all __wakeup() functionality into session.inc.php
-             */
-            $_SESSION['PMA_Theme_Manager']->checkConfig();
-        }
-
-        // for the theme per server feature
-        if (isset($_REQUEST['server']) && ! isset($_REQUEST['set_theme'])) {
-            $GLOBALS['server'] = $_REQUEST['server'];
-            $tmp = $_SESSION['PMA_Theme_Manager']->getThemeCookie();
-            if (empty($tmp)) {
-                $tmp = $_SESSION['PMA_Theme_Manager']->theme_default;
-            }
-            $_SESSION['PMA_Theme_Manager']->setActiveTheme($tmp);
-        }
-        /**
-         * @todo move into ThemeManager::__wakeup()
-         */
-        if (isset($_REQUEST['set_theme'])) {
-            // if user selected a theme
-            $_SESSION['PMA_Theme_Manager']->setActiveTheme($_REQUEST['set_theme']);
-        }
-
-        /**
-         * the theme object
-         *
-        *@global Theme $_SESSION['PMA_Theme']
-         */
-        $_SESSION['PMA_Theme'] = $_SESSION['PMA_Theme_Manager']->theme;
-
-        // BC
-        /**
-         * the active theme
-         * @global string $GLOBALS['theme']
-         */
-        $GLOBALS['theme']           = $_SESSION['PMA_Theme']->getName();
-        /**
-         * the theme path
-         * @global string $GLOBALS['pmaThemePath']
-         */
-        $GLOBALS['pmaThemePath']    = $_SESSION['PMA_Theme']->getPath();
-        /**
-         * the theme image path
-         * @global string $GLOBALS['pmaThemeImage']
-         */
-        $GLOBALS['pmaThemeImage']   = $_SESSION['PMA_Theme']->getImgPath();
-
-        /**
-         * load layout file if exists
-         */
-        if (@file_exists($_SESSION['PMA_Theme']->getLayoutFile())) {
-            include $_SESSION['PMA_Theme']->getLayoutFile();
-        }
-    }
-}
diff --git a/#pma/libraries/Tracker.php b/#pma/libraries/Tracker.php
deleted file mode 100644
index 06b77d03..00000000
--- a/#pma/libraries/Tracker.php
+++ /dev/null
@@ -1,959 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Tracking changes on databases, tables and views
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries;
-
-use PMA\libraries\plugins\export\ExportSql;
-
-/**
- * This class tracks changes on databases, tables and views.
- *
- * @package PhpMyAdmin
- *
- * @todo use stristr instead of strstr
- */
-class Tracker
-{
-    /**
-     * Whether tracking is ready.
-     */
-    static protected $enabled = false;
-
-    /**
-     * Actually enables tracking. This needs to be done after all
-     * underlaying code is initialized.
-     *
-     * @static
-     *
-     * @return void
-     */
-    static public function enable()
-    {
-        self::$enabled = true;
-    }
-
-    /**
-     * Gets the on/off value of the Tracker module, starts initialization.
-     *
-     * @static
-     *
-     * @return boolean (true=on|false=off)
-     */
-    static public function isActive()
-    {
-        if (! self::$enabled) {
-            return false;
-        }
-        /* We need to avoid attempt to track any queries
-         * from PMA_getRelationsParam
-         */
-        self::$enabled = false;
-        $cfgRelation = PMA_getRelationsParam();
-        /* Restore original state */
-        self::$enabled = true;
-        if (! $cfgRelation['trackingwork']) {
-            return false;
-        }
-
-        $pma_table = self::_getTrackingTable();
-        if (isset($pma_table)) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Parses the name of a table from a SQL statement substring.
-     *
-     * @param string $string part of SQL statement
-     *
-     * @static
-     *
-     * @return string the name of table
-     */
-    static protected function getTableName($string)
-    {
-        if (mb_strstr($string, '.')) {
-            $temp = explode('.', $string);
-            $tablename = $temp[1];
-        } else {
-            $tablename = $string;
-        }
-
-        $str = explode("\n", $tablename);
-        $tablename = $str[0];
-
-        $tablename = str_replace(';', '', $tablename);
-        $tablename = str_replace('`', '', $tablename);
-        $tablename = trim($tablename);
-
-        return $tablename;
-    }
-
-
-    /**
-     * Gets the tracking status of a table, is it active or deactive ?
-     *
-     * @param string $dbname    name of database
-     * @param string $tablename name of table
-     *
-     * @static
-     *
-     * @return boolean true or false
-     */
-    static public function isTracked($dbname, $tablename)
-    {
-        if (! self::$enabled) {
-            return false;
-        }
-        /* We need to avoid attempt to track any queries
-         * from PMA_getRelationsParam
-         */
-        self::$enabled = false;
-        $cfgRelation = PMA_getRelationsParam();
-        /* Restore original state */
-        self::$enabled = true;
-        if (! $cfgRelation['trackingwork']) {
-            return false;
-        }
-
-        $sql_query = " SELECT tracking_active FROM " . self::_getTrackingTable() .
-        " WHERE db_name = '" . $GLOBALS['dbi']->escapeString($dbname) . "' " .
-        " AND table_name = '" . $GLOBALS['dbi']->escapeString($tablename) . "' " .
-        " ORDER BY version DESC";
-
-        $row = $GLOBALS['dbi']->fetchArray(PMA_queryAsControlUser($sql_query));
-
-        if (isset($row['tracking_active']) && $row['tracking_active'] == 1) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Returns the comment line for the log.
-     *
-     * @return string Comment, contains date and username
-     */
-    static public function getLogComment()
-    {
-        $date = date('Y-m-d H:i:s');
-        $user = preg_replace('/\s+/', ' ', $GLOBALS['cfg']['Server']['user']);
-
-        return "# log " . $date . " " . $user . "\n";
-    }
-
-    /**
-     * Creates tracking version of a table / view
-     * (in other words: create a job to track future changes on the table).
-     *
-     * @param string $dbname       name of database
-     * @param string $tablename    name of table
-     * @param string $version      version
-     * @param string $tracking_set set of tracking statements
-     * @param bool   $is_view      if table is a view
-     *
-     * @static
-     *
-     * @return int result of version insertion
-     */
-    static public function createVersion($dbname, $tablename, $version,
-        $tracking_set = '', $is_view = false
-    ) {
-        global $sql_backquotes, $export_type;
-
-        if ($tracking_set == '') {
-            $tracking_set
-                = $GLOBALS['cfg']['Server']['tracking_default_statements'];
-        }
-
-        // get Export SQL instance
-        include_once "libraries/plugin_interface.lib.php";
-        /* @var $export_sql_plugin \PMA\libraries\plugins\export\ExportSql */
-        $export_sql_plugin = PMA_getPlugin(
-            "export",
-            "sql",
-            'libraries/plugins/export/',
-            array(
-                'export_type' => $export_type,
-                'single_table' => false,
-            )
-        );
-
-        $sql_backquotes = true;
-
-        $date = date('Y-m-d H:i:s');
-
-        // Get data definition snapshot of table
-
-        $columns = $GLOBALS['dbi']->getColumns($dbname, $tablename, null, true);
-        // int indices to reduce size
-        $columns = array_values($columns);
-        // remove Privileges to reduce size
-        for ($i = 0, $nb = count($columns); $i < $nb; $i++) {
-            unset($columns[$i]['Privileges']);
-        }
-
-        $indexes = $GLOBALS['dbi']->getTableIndexes($dbname, $tablename);
-
-        $snapshot = array('COLUMNS' => $columns, 'INDEXES' => $indexes);
-        $snapshot = serialize($snapshot);
-
-        // Get DROP TABLE / DROP VIEW and CREATE TABLE SQL statements
-        $sql_backquotes = true;
-
-        $create_sql  = "";
-
-        if ($GLOBALS['cfg']['Server']['tracking_add_drop_table'] == true
-            && $is_view == false
-        ) {
-            $create_sql .= self::getLogComment()
-                . 'DROP TABLE IF EXISTS ' . Util::backquote($tablename) . ";\n";
-
-        }
-
-        if ($GLOBALS['cfg']['Server']['tracking_add_drop_view'] == true
-            && $is_view == true
-        ) {
-            $create_sql .= self::getLogComment()
-                . 'DROP VIEW IF EXISTS ' . Util::backquote($tablename) . ";\n";
-        }
-
-        $create_sql .= self::getLogComment() .
-            $export_sql_plugin->getTableDef($dbname, $tablename, "\n", "");
-
-        // Save version
-
-        $sql_query = "/*NOTRACK*/\n" .
-        "INSERT INTO " . self::_getTrackingTable() . " (" .
-        "db_name, " .
-        "table_name, " .
-        "version, " .
-        "date_created, " .
-        "date_updated, " .
-        "schema_snapshot, " .
-        "schema_sql, " .
-        "data_sql, " .
-        "tracking " .
-        ") " .
-        "values (
-        '" . $GLOBALS['dbi']->escapeString($dbname) . "',
-        '" . $GLOBALS['dbi']->escapeString($tablename) . "',
-        '" . $GLOBALS['dbi']->escapeString($version) . "',
-        '" . $GLOBALS['dbi']->escapeString($date) . "',
-        '" . $GLOBALS['dbi']->escapeString($date) . "',
-        '" . $GLOBALS['dbi']->escapeString($snapshot) . "',
-        '" . $GLOBALS['dbi']->escapeString($create_sql) . "',
-        '" . $GLOBALS['dbi']->escapeString("\n") . "',
-        '" . $GLOBALS['dbi']->escapeString($tracking_set)
-        . "' )";
-
-        $result = PMA_queryAsControlUser($sql_query);
-
-        if ($result) {
-            // Deactivate previous version
-            self::deactivateTracking($dbname, $tablename, ($version - 1));
-        }
-
-        return $result;
-    }
-
-
-    /**
-     * Removes all tracking data for a table or a version of a table
-     *
-     * @param string $dbname    name of database
-     * @param string $tablename name of table
-     * @param string $version   version
-     *
-     * @static
-     *
-     * @return int result of version insertion
-     */
-    static public function deleteTracking($dbname, $tablename, $version = '')
-    {
-        $sql_query = "/*NOTRACK*/\n"
-            . "DELETE FROM " . self::_getTrackingTable()
-            . " WHERE `db_name` = '"
-            . $GLOBALS['dbi']->escapeString($dbname) . "'"
-            . " AND `table_name` = '"
-            . $GLOBALS['dbi']->escapeString($tablename) . "'";
-        if ($version) {
-            $sql_query .= " AND `version` = '"
-                . $GLOBALS['dbi']->escapeString($version) . "'";
-        }
-        $result = PMA_queryAsControlUser($sql_query);
-
-        return $result;
-    }
-
-    /**
-     * Creates tracking version of a database
-     * (in other words: create a job to track future changes on the database).
-     *
-     * @param string $dbname       name of database
-     * @param string $version      version
-     * @param string $query        query
-     * @param string $tracking_set set of tracking statements
-     *
-     * @static
-     *
-     * @return int result of version insertion
-     */
-    static public function createDatabaseVersion($dbname, $version, $query,
-        $tracking_set = 'CREATE DATABASE,ALTER DATABASE,DROP DATABASE'
-    ) {
-        $date = date('Y-m-d H:i:s');
-
-        if ($tracking_set == '') {
-            $tracking_set
-                = $GLOBALS['cfg']['Server']['tracking_default_statements'];
-        }
-
-        $create_sql  = "";
-
-        if ($GLOBALS['cfg']['Server']['tracking_add_drop_database'] == true) {
-            $create_sql .= self::getLogComment()
-                . 'DROP DATABASE IF EXISTS ' . Util::backquote($dbname) . ";\n";
-        }
-
-        $create_sql .= self::getLogComment() . $query;
-
-        // Save version
-        $sql_query = "/*NOTRACK*/\n" .
-        "INSERT INTO " . self::_getTrackingTable() . " (" .
-        "db_name, " .
-        "table_name, " .
-        "version, " .
-        "date_created, " .
-        "date_updated, " .
-        "schema_snapshot, " .
-        "schema_sql, " .
-        "data_sql, " .
-        "tracking " .
-        ") " .
-        "values (
-        '" . $GLOBALS['dbi']->escapeString($dbname) . "',
-        '" . $GLOBALS['dbi']->escapeString('') . "',
-        '" . $GLOBALS['dbi']->escapeString($version) . "',
-        '" . $GLOBALS['dbi']->escapeString($date) . "',
-        '" . $GLOBALS['dbi']->escapeString($date) . "',
-        '" . $GLOBALS['dbi']->escapeString('') . "',
-        '" . $GLOBALS['dbi']->escapeString($create_sql) . "',
-        '" . $GLOBALS['dbi']->escapeString("\n") . "',
-        '" . $GLOBALS['dbi']->escapeString($tracking_set)
-        . "' )";
-
-        $result = PMA_queryAsControlUser($sql_query);
-
-        return $result;
-    }
-
-
-
-    /**
-     * Changes tracking of a table.
-     *
-     * @param string  $dbname    name of database
-     * @param string  $tablename name of table
-     * @param string  $version   version
-     * @param integer $new_state the new state of tracking
-     *
-     * @static
-     *
-     * @return int result of SQL query
-     */
-    static private function _changeTracking($dbname, $tablename,
-        $version, $new_state
-    ) {
-
-        $sql_query = " UPDATE " . self::_getTrackingTable() .
-        " SET `tracking_active` = '" . $new_state . "' " .
-        " WHERE `db_name` = '" . $GLOBALS['dbi']->escapeString($dbname) . "' " .
-        " AND `table_name` = '" . $GLOBALS['dbi']->escapeString($tablename) . "' " .
-        " AND `version` = '" . $GLOBALS['dbi']->escapeString($version) . "' ";
-
-        $result = PMA_queryAsControlUser($sql_query);
-
-        return $result;
-    }
-
-    /**
-     * Changes tracking data of a table.
-     *
-     * @param string       $dbname    name of database
-     * @param string       $tablename name of table
-     * @param string       $version   version
-     * @param string       $type      type of data(DDL || DML)
-     * @param string|array $new_data  the new tracking data
-     *
-     * @static
-     *
-     * @return bool result of change
-     */
-    static public function changeTrackingData($dbname, $tablename,
-        $version, $type, $new_data
-    ) {
-        if ($type == 'DDL') {
-            $save_to = 'schema_sql';
-        } elseif ($type == 'DML') {
-            $save_to = 'data_sql';
-        } else {
-            return false;
-        }
-        $date  = date('Y-m-d H:i:s');
-
-        $new_data_processed = '';
-        if (is_array($new_data)) {
-            foreach ($new_data as $data) {
-                $new_data_processed .= '# log ' . $date . ' ' . $data['username']
-                    . $GLOBALS['dbi']->escapeString($data['statement']) . "\n";
-            }
-        } else {
-            $new_data_processed = $new_data;
-        }
-
-        $sql_query = " UPDATE " . self::_getTrackingTable() .
-        " SET `" . $save_to . "` = '" . $new_data_processed . "' " .
-        " WHERE `db_name` = '" . $GLOBALS['dbi']->escapeString($dbname) . "' " .
-        " AND `table_name` = '" . $GLOBALS['dbi']->escapeString($tablename) . "' " .
-        " AND `version` = '" . $GLOBALS['dbi']->escapeString($version) . "' ";
-
-        $result = PMA_queryAsControlUser($sql_query);
-
-        return (boolean) $result;
-    }
-
-    /**
-     * Activates tracking of a table.
-     *
-     * @param string $dbname    name of database
-     * @param string $tablename name of table
-     * @param string $version   version
-     *
-     * @static
-     *
-     * @return int result of SQL query
-     */
-    static public function activateTracking($dbname, $tablename, $version)
-    {
-        return self::_changeTracking($dbname, $tablename, $version, 1);
-    }
-
-
-    /**
-     * Deactivates tracking of a table.
-     *
-     * @param string $dbname    name of database
-     * @param string $tablename name of table
-     * @param string $version   version
-     *
-     * @static
-     *
-     * @return int result of SQL query
-     */
-    static public function deactivateTracking($dbname, $tablename, $version)
-    {
-        return self::_changeTracking($dbname, $tablename, $version, 0);
-    }
-
-
-    /**
-     * Gets the newest version of a tracking job
-     * (in other words: gets the HEAD version).
-     *
-     * @param string $dbname    name of database
-     * @param string $tablename name of table
-     * @param string $statement tracked statement
-     *
-     * @static
-     *
-     * @return int (-1 if no version exists | >  0 if a version exists)
-     */
-    static public function getVersion($dbname, $tablename, $statement = null)
-    {
-        $sql_query = " SELECT MAX(version) FROM " . self::_getTrackingTable() .
-        " WHERE `db_name` = '" . $GLOBALS['dbi']->escapeString($dbname) . "' " .
-        " AND `table_name` = '" . $GLOBALS['dbi']->escapeString($tablename) . "' ";
-
-        if ($statement != "") {
-            $sql_query .= " AND FIND_IN_SET('"
-                . $statement . "',tracking) > 0" ;
-        }
-        $row = $GLOBALS['dbi']->fetchArray(PMA_queryAsControlUser($sql_query));
-        return isset($row[0])
-            ? $row[0]
-            : -1;
-    }
-
-
-    /**
-     * Gets the record of a tracking job.
-     *
-     * @param string $dbname    name of database
-     * @param string $tablename name of table
-     * @param string $version   version number
-     *
-     * @static
-     *
-     * @return mixed record DDM log, DDL log, structure snapshot, tracked
-     *         statements.
-     */
-    static public function getTrackedData($dbname, $tablename, $version)
-    {
-        $sql_query = " SELECT * FROM " . self::_getTrackingTable() .
-            " WHERE `db_name` = '" . $GLOBALS['dbi']->escapeString($dbname) . "' ";
-        if (! empty($tablename)) {
-            $sql_query .= " AND `table_name` = '"
-                . $GLOBALS['dbi']->escapeString($tablename) . "' ";
-        }
-        $sql_query .= " AND `version` = '" . $GLOBALS['dbi']->escapeString($version)
-            . "' " . " ORDER BY `version` DESC LIMIT 1";
-
-        $mixed = $GLOBALS['dbi']->fetchAssoc(PMA_queryAsControlUser($sql_query));
-
-        // Parse log
-        $log_schema_entries = explode('# log ',  $mixed['schema_sql']);
-        $log_data_entries   = explode('# log ',  $mixed['data_sql']);
-
-        $ddl_date_from = $date = date('Y-m-d H:i:s');
-
-        $ddlog = array();
-        $first_iteration = true;
-
-        // Iterate tracked data definition statements
-        // For each log entry we want to get date, username and statement
-        foreach ($log_schema_entries as $log_entry) {
-            if (trim($log_entry) != '') {
-                $date      = mb_substr($log_entry, 0, 19);
-                $username  = mb_substr(
-                    $log_entry, 20, mb_strpos($log_entry, "\n") - 20
-                );
-                if ($first_iteration) {
-                    $ddl_date_from = $date;
-                    $first_iteration = false;
-                }
-                $statement = rtrim(mb_strstr($log_entry, "\n"));
-
-                $ddlog[] = array( 'date' => $date,
-                                  'username'=> $username,
-                                  'statement' => $statement );
-            }
-        }
-
-        $date_from = $ddl_date_from;
-        $ddl_date_to = $date;
-
-        $dml_date_from = $date_from;
-
-        $dmlog = array();
-        $first_iteration = true;
-
-        // Iterate tracked data manipulation statements
-        // For each log entry we want to get date, username and statement
-        foreach ($log_data_entries as $log_entry) {
-            if (trim($log_entry) != '') {
-                $date      = mb_substr($log_entry, 0, 19);
-                $username  = mb_substr(
-                    $log_entry, 20, mb_strpos($log_entry, "\n") - 20
-                );
-                if ($first_iteration) {
-                    $dml_date_from = $date;
-                    $first_iteration = false;
-                }
-                $statement = rtrim(mb_strstr($log_entry, "\n"));
-
-                $dmlog[] = array( 'date' => $date,
-                                  'username' => $username,
-                                  'statement' => $statement );
-            }
-        }
-
-        $dml_date_to = $date;
-
-        // Define begin and end of date range for both logs
-        $data = array();
-        if (strtotime($ddl_date_from) <= strtotime($dml_date_from)) {
-            $data['date_from'] = $ddl_date_from;
-        } else {
-            $data['date_from'] = $dml_date_from;
-        }
-        if (strtotime($ddl_date_to) >= strtotime($dml_date_to)) {
-            $data['date_to'] = $ddl_date_to;
-        } else {
-            $data['date_to'] = $dml_date_to;
-        }
-        $data['ddlog']           = $ddlog;
-        $data['dmlog']           = $dmlog;
-        $data['tracking']        = $mixed['tracking'];
-        $data['schema_snapshot'] = $mixed['schema_snapshot'];
-
-        return $data;
-    }
-
-
-    /**
-     * Parses a query. Gets
-     *  - statement identifier (UPDATE, ALTER TABLE, ...)
-     *  - type of statement, is it part of DDL or DML ?
-     *  - tablename
-     *
-     * @param string $query query
-     *
-     * @static
-     * @todo: using PMA SQL Parser when possible
-     * @todo: support multi-table/view drops
-     *
-     * @return mixed Array containing identifier, type and tablename.
-     *
-     */
-    static public function parseQuery($query)
-    {
-        // Usage of PMA_SQP does not work here
-        //
-        // require_once("libraries/sqlparser.lib.php");
-        // $parsed_sql = PMA_SQP_parse($query);
-        // $sql_info = PMA_SQP_analyze($parsed_sql);
-
-        $query = str_replace("\n", " ", $query);
-        $query = str_replace("\r", " ", $query);
-
-        $query = trim($query);
-        $query = trim($query, ' -');
-
-        $tokens = explode(" ", $query);
-        foreach ($tokens as $key => $value) {
-            $tokens[$key] = mb_strtoupper($value);
-        }
-
-        // Parse USE statement, need it for SQL dump imports
-        if (mb_substr($query, 0, 4) == 'USE ') {
-            $prefix = explode('USE ', $query);
-            $GLOBALS['db'] = self::getTableName($prefix[1]);
-        }
-
-        /*
-         * DDL statements
-         */
-
-        $result         = array();
-        $result['type'] = 'DDL';
-
-        // Parse CREATE VIEW statement
-        if (in_array('CREATE', $tokens) == true
-            && in_array('VIEW', $tokens) == true
-            && in_array('AS', $tokens) == true
-        ) {
-            $result['identifier'] = 'CREATE VIEW';
-
-            $index = array_search('VIEW', $tokens);
-
-            $result['tablename'] = mb_strtolower(
-                self::getTableName($tokens[$index + 1])
-            );
-        }
-
-        // Parse ALTER VIEW statement
-        if (in_array('ALTER', $tokens) == true
-            && in_array('VIEW', $tokens) == true
-            && in_array('AS', $tokens) == true
-            && ! isset($result['identifier'])
-        ) {
-            $result['identifier'] = 'ALTER VIEW';
-
-            $index = array_search('VIEW', $tokens);
-
-            $result['tablename'] = mb_strtolower(
-                self::getTableName($tokens[$index + 1])
-            );
-        }
-
-        // Parse DROP VIEW statement
-        if (! isset($result['identifier'])
-            && substr($query, 0, 10) == 'DROP VIEW '
-        ) {
-            $result['identifier'] = 'DROP VIEW';
-
-            $prefix  = explode('DROP VIEW ', $query);
-            $str = str_replace('IF EXISTS', '', $prefix[1]);
-            $result['tablename'] = self::getTableName($str);
-        }
-
-        // Parse CREATE DATABASE statement
-        if (! isset($result['identifier'])
-            && substr($query, 0, 15) == 'CREATE DATABASE'
-        ) {
-            $result['identifier'] = 'CREATE DATABASE';
-            $str = str_replace('CREATE DATABASE', '', $query);
-            $str = str_replace('IF NOT EXISTS', '', $str);
-
-            $prefix = explode('DEFAULT ', $str);
-
-            $result['tablename'] = '';
-            $GLOBALS['db'] = self::getTableName($prefix[0]);
-        }
-
-        // Parse ALTER DATABASE statement
-        if (! isset($result['identifier'])
-            && substr($query, 0, 14) == 'ALTER DATABASE'
-        ) {
-            $result['identifier'] = 'ALTER DATABASE';
-            $result['tablename'] = '';
-        }
-
-        // Parse DROP DATABASE statement
-        if (! isset($result['identifier'])
-            && substr($query, 0, 13) == 'DROP DATABASE'
-        ) {
-            $result['identifier'] = 'DROP DATABASE';
-            $str = str_replace('DROP DATABASE', '', $query);
-            $str = str_replace('IF EXISTS', '', $str);
-            $GLOBALS['db'] = self::getTableName($str);
-            $result['tablename'] = '';
-        }
-
-        // Parse CREATE TABLE statement
-        if (! isset($result['identifier'])
-            && substr($query, 0, 12) == 'CREATE TABLE'
-        ) {
-            $result['identifier'] = 'CREATE TABLE';
-            $query   = str_replace('IF NOT EXISTS', '', $query);
-            $prefix  = explode('CREATE TABLE ', $query);
-            $suffix  = explode('(', $prefix[1]);
-            $result['tablename'] = self::getTableName($suffix[0]);
-        }
-
-        // Parse ALTER TABLE statement
-        if (! isset($result['identifier'])
-            && substr($query, 0, 12) == 'ALTER TABLE '
-        ) {
-            $result['identifier'] = 'ALTER TABLE';
-
-            $prefix  = explode('ALTER TABLE ', $query);
-            $suffix  = explode(' ', $prefix[1]);
-            $result['tablename']  = self::getTableName($suffix[0]);
-        }
-
-        // Parse DROP TABLE statement
-        if (! isset($result['identifier'])
-            && substr($query, 0, 11) == 'DROP TABLE '
-        ) {
-            $result['identifier'] = 'DROP TABLE';
-
-            $prefix  = explode('DROP TABLE ', $query);
-            $str = str_replace('IF EXISTS', '', $prefix[1]);
-            $result['tablename'] = self::getTableName($str);
-        }
-
-        // Parse CREATE INDEX statement
-        if (! isset($result['identifier'])
-            && (substr($query, 0, 12) == 'CREATE INDEX'
-            || substr($query, 0, 19) == 'CREATE UNIQUE INDEX'
-            || substr($query, 0, 20) == 'CREATE SPATIAL INDEX')
-        ) {
-             $result['identifier'] = 'CREATE INDEX';
-             $prefix = explode('ON ', $query);
-             $suffix = explode('(', $prefix[1]);
-             $result['tablename'] = self::getTableName($suffix[0]);
-        }
-
-        // Parse DROP INDEX statement
-        if (! isset($result['identifier'])
-            && substr($query, 0, 10) == 'DROP INDEX'
-        ) {
-             $result['identifier'] = 'DROP INDEX';
-             $prefix = explode('ON ', $query);
-             $result['tablename'] = self::getTableName($prefix[1]);
-        }
-
-        // Parse RENAME TABLE statement
-        if (! isset($result['identifier'])
-            && substr($query, 0, 13) == 'RENAME TABLE '
-        ) {
-            $result['identifier'] = 'RENAME TABLE';
-            $prefix = explode('RENAME TABLE ', $query);
-            $names  = explode(' TO ', $prefix[1]);
-            $result['tablename']      = self::getTableName($names[0]);
-            $result["tablename_after_rename"]  = self::getTableName($names[1]);
-        }
-
-        /*
-         * DML statements
-         */
-
-        if (! isset($result['identifier'])) {
-            $result["type"]       = 'DML';
-        }
-        // Parse UPDATE statement
-        if (! isset($result['identifier'])
-            && substr($query, 0, 6) == 'UPDATE'
-        ) {
-            $result['identifier'] = 'UPDATE';
-            $prefix  = explode('UPDATE ', $query);
-            $suffix  = explode(' ', $prefix[1]);
-            $result['tablename'] = self::getTableName($suffix[0]);
-        }
-
-        // Parse INSERT INTO statement
-        if (! isset($result['identifier'])
-            && substr($query, 0, 11) == 'INSERT INTO'
-        ) {
-            $result['identifier'] = 'INSERT';
-            $prefix  = explode('INSERT INTO', $query);
-            $suffix  = explode('(', $prefix[1]);
-            $result['tablename'] = self::getTableName($suffix[0]);
-        }
-
-        // Parse DELETE statement
-        if (! isset($result['identifier'])
-            && substr($query, 0, 6) == 'DELETE'
-        ) {
-            $result['identifier'] = 'DELETE';
-            $prefix  = explode('FROM ', $query);
-            $suffix  = explode(' ', $prefix[1]);
-            $result['tablename'] = self::getTableName($suffix[0]);
-        }
-
-        // Parse TRUNCATE statement
-        if (! isset($result['identifier'])
-            && substr($query, 0, 8) == 'TRUNCATE'
-        ) {
-            $result['identifier'] = 'TRUNCATE';
-            $prefix  = explode('TRUNCATE', $query);
-            $result['tablename'] = self::getTableName($prefix[1]);
-        }
-
-        return $result;
-    }
-
-
-    /**
-     * Analyzes a given SQL statement and saves tracking data.
-     *
-     * @param string $query a SQL query
-     *
-     * @static
-     *
-     * @return void
-     */
-    static public function handleQuery($query)
-    {
-        // If query is marked as untouchable, leave
-        if (mb_strstr($query, "/*NOTRACK*/")) {
-            return;
-        }
-
-        if (! (substr($query, -1) == ';')) {
-            $query = $query . ";\n";
-        }
-        // Get some information about query
-        $result = self::parseQuery($query);
-
-        // Get database name
-        $dbname = trim(isset($GLOBALS['db']) ? $GLOBALS['db'] : '', '`');
-        // $dbname can be empty, for example when coming from Synchronize
-        // and this is a query for the remote server
-        if (empty($dbname)) {
-            return;
-        }
-
-        // If we found a valid statement
-        if (isset($result['identifier'])) {
-            $version = self::getVersion(
-                $dbname, $result['tablename'], $result['identifier']
-            );
-
-            // If version not exists and auto-creation is enabled
-            if ($GLOBALS['cfg']['Server']['tracking_version_auto_create'] == true
-                && self::isTracked($dbname, $result['tablename']) == false
-                && $version == -1
-            ) {
-                // Create the version
-
-                switch ($result['identifier']) {
-                case 'CREATE TABLE':
-                    self::createVersion($dbname, $result['tablename'], '1');
-                    break;
-                case 'CREATE VIEW':
-                    self::createVersion(
-                        $dbname, $result['tablename'], '1', '', true
-                    );
-                    break;
-                case 'CREATE DATABASE':
-                    self::createDatabaseVersion($dbname, '1', $query);
-                    break;
-                } // end switch
-            }
-
-            // If version exists
-            if (self::isTracked($dbname, $result['tablename']) && $version != -1) {
-                if ($result['type'] == 'DDL') {
-                    $save_to = 'schema_sql';
-                } elseif ($result['type'] == 'DML') {
-                    $save_to = 'data_sql';
-                } else {
-                    $save_to = '';
-                }
-                $date  = date('Y-m-d H:i:s');
-
-                // Cut off `dbname`. from query
-                $query = preg_replace(
-                    '/`' . preg_quote($dbname, '/') . '`\s?\./',
-                    '',
-                    $query
-                );
-
-                // Add log information
-                $query = self::getLogComment() . $query ;
-
-                // Mark it as untouchable
-                $sql_query = " /*NOTRACK*/\n"
-                    . " UPDATE " . self::_getTrackingTable()
-                    . " SET " . Util::backquote($save_to)
-                    . " = CONCAT( " . Util::backquote($save_to) . ",'\n"
-                    . $GLOBALS['dbi']->escapeString($query) . "') ,"
-                    . " `date_updated` = '" . $date . "' ";
-
-                // If table was renamed we have to change
-                // the tablename attribute in pma_tracking too
-                if ($result['identifier'] == 'RENAME TABLE') {
-                    $sql_query .= ', `table_name` = \''
-                        . $GLOBALS['dbi']->escapeString($result['tablename_after_rename'])
-                        . '\' ';
-                }
-
-                // Save the tracking information only for
-                //     1. the database
-                //     2. the table / view
-                //     3. the statements
-                // we want to track
-                $sql_query .=
-                " WHERE FIND_IN_SET('" . $result['identifier'] . "',tracking) > 0" .
-                " AND `db_name` = '" . $GLOBALS['dbi']->escapeString($dbname) . "' " .
-                " AND `table_name` = '"
-                . $GLOBALS['dbi']->escapeString($result['tablename']) . "' " .
-                " AND `version` = '" . $GLOBALS['dbi']->escapeString($version) . "' ";
-
-                PMA_queryAsControlUser($sql_query);
-            }
-        }
-    }
-
-    /**
-     * Returns the tracking table
-     *
-     * @return string tracking table
-     */
-    private static function _getTrackingTable()
-    {
-        $cfgRelation = PMA_getRelationsParam();
-        return Util::backquote($cfgRelation['db'])
-            . '.' . Util::backquote($cfgRelation['tracking']);
-    }
-}
diff --git a/#pma/libraries/Types.php b/#pma/libraries/Types.php
deleted file mode 100644
index 49416add..00000000
--- a/#pma/libraries/Types.php
+++ /dev/null
@@ -1,296 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * SQL data types definition
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries;
-
-/**
- * Generic class holding type definitions.
- *
- * @package PhpMyAdmin
- */
-class Types
-{
-    /**
-     * Returns list of unary operators.
-     *
-     * @return string[]
-     */
-    public function getUnaryOperators()
-    {
-        return array(
-            'IS NULL',
-            'IS NOT NULL',
-            "= ''",
-            "!= ''",
-        );
-    }
-
-    /**
-     * Check whether operator is unary.
-     *
-     * @param string $op operator name
-     *
-     * @return boolean
-     */
-    public function isUnaryOperator($op)
-    {
-        return in_array($op, $this->getUnaryOperators());
-    }
-
-    /**
-     * Returns list of operators checking for NULL.
-     *
-     * @return string[]
-     */
-    public function getNullOperators()
-    {
-        return array(
-            'IS NULL',
-            'IS NOT NULL',
-        );
-    }
-
-    /**
-     * ENUM search operators
-     *
-     * @return string[]
-     */
-    public function getEnumOperators()
-    {
-        return array(
-            '=',
-            '!=',
-        );
-    }
-
-    /**
-     * TEXT search operators
-     *
-     * @return string[]
-     */
-    public function getTextOperators()
-    {
-        return array(
-            'LIKE',
-            'LIKE %...%',
-            'NOT LIKE',
-            '=',
-            '!=',
-            'REGEXP',
-            'REGEXP ^...$',
-            'NOT REGEXP',
-            "= ''",
-            "!= ''",
-            'IN (...)',
-            'NOT IN (...)',
-            'BETWEEN',
-            'NOT BETWEEN',
-        );
-    }
-
-    /**
-     * Number search operators
-     *
-     * @return string[]
-     */
-    public function getNumberOperators()
-    {
-        return array(
-            '=',
-            '>',
-            '>=',
-            '<',
-            '<=',
-            '!=',
-            'LIKE',
-            'LIKE %...%',
-            'NOT LIKE',
-            'IN (...)',
-            'NOT IN (...)',
-            'BETWEEN',
-            'NOT BETWEEN',
-        );
-    }
-
-    /**
-     * Returns operators for given type
-     *
-     * @param string  $type Type of field
-     * @param boolean $null Whether field can be NULL
-     *
-     * @return string[]
-     */
-    public function getTypeOperators($type, $null)
-    {
-        $ret = array();
-        $class = $this->getTypeClass($type);
-
-        if (strncasecmp($type, 'enum', 4) == 0) {
-            $ret = array_merge($ret, $this->getEnumOperators());
-        } elseif ($class == 'CHAR') {
-            $ret = array_merge($ret, $this->getTextOperators());
-        } else {
-            $ret = array_merge($ret, $this->getNumberOperators());
-        }
-
-        if ($null) {
-            $ret = array_merge($ret, $this->getNullOperators());
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Returns operators for given type as html options
-     *
-     * @param string  $type             Type of field
-     * @param boolean $null             Whether field can be NULL
-     * @param string  $selectedOperator Option to be selected
-     *
-     * @return string Generated Html
-     */
-    public function getTypeOperatorsHtml($type, $null, $selectedOperator = null)
-    {
-        $html = '';
-
-        foreach ($this->getTypeOperators($type, $null) as $fc) {
-            if (isset($selectedOperator) && $selectedOperator == $fc) {
-                $selected = ' selected="selected"';
-            } else {
-                $selected = '';
-            }
-            $html .= '<option value="' . htmlspecialchars($fc)  . '"'
-                . $selected . '>'
-                . htmlspecialchars($fc)  . '</option>';
-        }
-
-        return $html;
-    }
-
-    /**
-     * Returns the data type description.
-     *
-     * @param string $type The data type to get a description.
-     *
-     * @return string
-     *
-     */
-    public function getTypeDescription($type)
-    {
-        return '';
-    }
-
-    /**
-     * Returns class of a type, used for functions available for type
-     * or default values.
-     *
-     * @param string $type The data type to get a class.
-     *
-     * @return string
-     *
-     */
-    public function getTypeClass($type)
-    {
-        return '';
-    }
-
-    /**
-     * Returns array of functions available for a class.
-     *
-     * @param string $class The class to get function list.
-     *
-     * @return string[]
-     *
-     */
-    public function getFunctionsClass($class)
-    {
-        return array();
-    }
-
-    /**
-     * Returns array of functions available for a type.
-     *
-     * @param string $type The data type to get function list.
-     *
-     * @return string[]
-     *
-     */
-    public function getFunctions($type)
-    {
-        $class = $this->getTypeClass($type);
-        return $this->getFunctionsClass($class);
-    }
-
-    /**
-     * Returns array of all functions available.
-     *
-     * @return string[]
-     *
-     */
-    public function getAllFunctions()
-    {
-        $ret = array_merge(
-            $this->getFunctionsClass('CHAR'),
-            $this->getFunctionsClass('NUMBER'),
-            $this->getFunctionsClass('DATE'),
-            $this->getFunctionsClass('UUID')
-        );
-        sort($ret);
-        return $ret;
-    }
-
-    /**
-     * Returns array of all attributes available.
-     *
-     * @return string[]
-     *
-     */
-    public function getAttributes()
-    {
-        return array();
-    }
-
-    /**
-     * Returns array of all column types available.
-     *
-     * @return string[]
-     *
-     */
-    public function getColumns()
-    {
-        // most used types
-        return array(
-            'INT',
-            'VARCHAR',
-            'TEXT',
-            'DATE',
-        );
-    }
-
-    /**
-     * Returns an array of integer types
-     *
-     * @return string[] integer types
-     */
-    public function getIntegerTypes()
-    {
-        return array();
-    }
-
-    /**
-     * Returns the min and max values of a given integer type
-     *
-     * @param string  $type   integer type
-     * @param boolean $signed whether signed
-     *
-     * @return string[] min and max values
-     */
-    public function getIntegerRange($type, $signed = true)
-    {
-        return array('', '');
-    }
-}
diff --git a/#pma/libraries/TypesMySQL.php b/#pma/libraries/TypesMySQL.php
deleted file mode 100644
index a1ee7bac..00000000
--- a/#pma/libraries/TypesMySQL.php
+++ /dev/null
@@ -1,590 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * SQL data types definition
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries;
-
-/**
- * Class holding type definitions for MySQL.
- *
- * @package PhpMyAdmin
- */
-class TypesMySQL extends Types
-{
-    /**
-     * Returns the data type description.
-     *
-     * @param string $type The data type to get a description.
-     *
-     * @return string
-     *
-     */
-    public function getTypeDescription($type)
-    {
-        $type = mb_strtoupper($type);
-        switch ($type) {
-        case 'TINYINT':
-            return __(
-                'A 1-byte integer, signed range is -128 to 127, unsigned range is ' .
-                '0 to 255'
-            );
-        case 'SMALLINT':
-            return __(
-                'A 2-byte integer, signed range is -32,768 to 32,767, unsigned ' .
-                'range is 0 to 65,535'
-            );
-        case 'MEDIUMINT':
-            return __(
-                'A 3-byte integer, signed range is -8,388,608 to 8,388,607, ' .
-                'unsigned range is 0 to 16,777,215'
-            );
-        case 'INT':
-            return __(
-                'A 4-byte integer, signed range is ' .
-                '-2,147,483,648 to 2,147,483,647, unsigned range is 0 to ' .
-                '4,294,967,295'
-            );
-        case 'BIGINT':
-            return __(
-                'An 8-byte integer, signed range is -9,223,372,036,854,775,808 ' .
-                'to 9,223,372,036,854,775,807, unsigned range is 0 to ' .
-                '18,446,744,073,709,551,615'
-            );
-        case 'DECIMAL':
-            return __(
-                'A fixed-point number (M, D) - the maximum number of digits (M) ' .
-                'is 65 (default 10), the maximum number of decimals (D) is 30 ' .
-                '(default 0)'
-            );
-        case 'FLOAT':
-            return __(
-                'A small floating-point number, allowable values are ' .
-                '-3.402823466E+38 to -1.175494351E-38, 0, and 1.175494351E-38 to ' .
-                '3.402823466E+38'
-            );
-        case 'DOUBLE':
-            return __(
-                'A double-precision floating-point number, allowable values are ' .
-                '-1.7976931348623157E+308 to -2.2250738585072014E-308, 0, and ' .
-                '2.2250738585072014E-308 to 1.7976931348623157E+308'
-            );
-        case 'REAL':
-            return __(
-                'Synonym for DOUBLE (exception: in REAL_AS_FLOAT SQL mode it is ' .
-                'a synonym for FLOAT)'
-            );
-        case 'BIT':
-            return __(
-                'A bit-field type (M), storing M of bits per value (default is 1, ' .
-                'maximum is 64)'
-            );
-        case 'BOOLEAN':
-            return __(
-                'A synonym for TINYINT(1), a value of zero is considered false, ' .
-                'nonzero values are considered true'
-            );
-        case 'SERIAL':
-            return __('An alias for BIGINT UNSIGNED NOT NULL AUTO_INCREMENT UNIQUE');
-        case 'DATE':
-            return sprintf(
-                __('A date, supported range is %1$s to %2$s'), '1000-01-01',
-                '9999-12-31'
-            );
-        case 'DATETIME':
-            return sprintf(
-                __('A date and time combination, supported range is %1$s to %2$s'),
-                '1000-01-01 00:00:00', '9999-12-31 23:59:59'
-            );
-        case 'TIMESTAMP':
-            return __(
-                'A timestamp, range is 1970-01-01 00:00:01 UTC to 2038-01-09 ' .
-                '03:14:07 UTC, stored as the number of seconds since the epoch ' .
-                '(1970-01-01 00:00:00 UTC)'
-            );
-        case 'TIME':
-            return sprintf(
-                __('A time, range is %1$s to %2$s'), '-838:59:59', '838:59:59'
-            );
-        case 'YEAR':
-            return __(
-                "A year in four-digit (4, default) or two-digit (2) format, the " .
-                "allowable values are 70 (1970) to 69 (2069) or 1901 to 2155 and " .
-                "0000"
-            );
-        case 'CHAR':
-            return __(
-                'A fixed-length (0-255, default 1) string that is always ' .
-                'right-padded with spaces to the specified length when stored'
-            );
-        case 'VARCHAR':
-            return sprintf(
-                __(
-                    'A variable-length (%s) string, the effective maximum length ' .
-                    'is subject to the maximum row size'
-                ), '0-65,535'
-            );
-        case 'TINYTEXT':
-            return __(
-                'A TEXT column with a maximum length of 255 (2^8 - 1) characters, ' .
-                'stored with a one-byte prefix indicating the length of the value ' .
-                'in bytes'
-            );
-        case 'TEXT':
-            return __(
-                'A TEXT column with a maximum length of 65,535 (2^16 - 1) ' .
-                'characters, stored with a two-byte prefix indicating the length ' .
-                'of the value in bytes'
-            );
-        case 'MEDIUMTEXT':
-            return __(
-                'A TEXT column with a maximum length of 16,777,215 (2^24 - 1) ' .
-                'characters, stored with a three-byte prefix indicating the ' .
-                'length of the value in bytes'
-            );
-        case 'LONGTEXT':
-            return __(
-                'A TEXT column with a maximum length of 4,294,967,295 or 4GiB ' .
-                '(2^32 - 1) characters, stored with a four-byte prefix indicating ' .
-                'the length of the value in bytes'
-            );
-        case 'BINARY':
-            return __(
-                'Similar to the CHAR type, but stores binary byte strings rather ' .
-                'than non-binary character strings'
-            );
-        case 'VARBINARY':
-            return __(
-                'Similar to the VARCHAR type, but stores binary byte strings ' .
-                'rather than non-binary character strings'
-            );
-        case 'TINYBLOB':
-            return __(
-                'A BLOB column with a maximum length of 255 (2^8 - 1) bytes, ' .
-                'stored with a one-byte prefix indicating the length of the value'
-            );
-        case 'MEDIUMBLOB':
-            return __(
-                'A BLOB column with a maximum length of 16,777,215 (2^24 - 1) ' .
-                'bytes, stored with a three-byte prefix indicating the length of ' .
-                'the value'
-            );
-        case 'BLOB':
-            return __(
-                'A BLOB column with a maximum length of 65,535 (2^16 - 1) bytes, ' .
-                'stored with a two-byte prefix indicating the length of the value'
-            );
-        case 'LONGBLOB':
-            return __(
-                'A BLOB column with a maximum length of 4,294,967,295 or 4GiB ' .
-                '(2^32 - 1) bytes, stored with a four-byte prefix indicating the ' .
-                'length of the value'
-            );
-        case 'ENUM':
-            return __(
-                "An enumeration, chosen from the list of up to 65,535 values or " .
-                "the special '' error value"
-            );
-        case 'SET':
-            return __("A single value chosen from a set of up to 64 members");
-        case 'GEOMETRY':
-            return __('A type that can store a geometry of any type');
-        case 'POINT':
-            return __('A point in 2-dimensional space');
-        case 'LINESTRING':
-            return __('A curve with linear interpolation between points');
-        case 'POLYGON':
-            return __('A polygon');
-        case 'MULTIPOINT':
-            return __('A collection of points');
-        case 'MULTILINESTRING':
-            return __(
-                'A collection of curves with linear interpolation between points'
-            );
-        case 'MULTIPOLYGON':
-            return __('A collection of polygons');
-        case 'GEOMETRYCOLLECTION':
-            return __('A collection of geometry objects of any type');
-        case 'JSON':
-            return __(
-                'Stores and enables efficient access to data in JSON'
-                . ' (JavaScript Object Notation) documents'
-            );
-        }
-        return '';
-    }
-
-    /**
-     * Returns class of a type, used for functions available for type
-     * or default values.
-     *
-     * @param string $type The data type to get a class.
-     *
-     * @return string
-     *
-     */
-    public function getTypeClass($type)
-    {
-        $type = mb_strtoupper($type);
-        switch ($type) {
-        case 'TINYINT':
-        case 'SMALLINT':
-        case 'MEDIUMINT':
-        case 'INT':
-        case 'BIGINT':
-        case 'DECIMAL':
-        case 'FLOAT':
-        case 'DOUBLE':
-        case 'REAL':
-        case 'BIT':
-        case 'BOOLEAN':
-        case 'SERIAL':
-            return 'NUMBER';
-
-        case 'DATE':
-        case 'DATETIME':
-        case 'TIMESTAMP':
-        case 'TIME':
-        case 'YEAR':
-            return 'DATE';
-
-        case 'CHAR':
-        case 'VARCHAR':
-        case 'TINYTEXT':
-        case 'TEXT':
-        case 'MEDIUMTEXT':
-        case 'LONGTEXT':
-        case 'BINARY':
-        case 'VARBINARY':
-        case 'TINYBLOB':
-        case 'MEDIUMBLOB':
-        case 'BLOB':
-        case 'LONGBLOB':
-        case 'ENUM':
-        case 'SET':
-            return 'CHAR';
-
-        case 'GEOMETRY':
-        case 'POINT':
-        case 'LINESTRING':
-        case 'POLYGON':
-        case 'MULTIPOINT':
-        case 'MULTILINESTRING':
-        case 'MULTIPOLYGON':
-        case 'GEOMETRYCOLLECTION':
-            return 'SPATIAL';
-
-        case 'JSON':
-            return 'JSON';
-        }
-
-        return '';
-    }
-
-    /**
-     * Returns array of functions available for a class.
-     *
-     * @param string $class The class to get function list.
-     *
-     * @return string[]
-     *
-     */
-    public function getFunctionsClass($class)
-    {
-        switch ($class) {
-        case 'CHAR':
-            $ret = array(
-                'AES_DECRYPT',
-                'AES_ENCRYPT',
-                'BIN',
-                'CHAR',
-                'COMPRESS',
-                'CURRENT_USER',
-                'DATABASE',
-                'DAYNAME',
-                'DES_DECRYPT',
-                'DES_ENCRYPT',
-                'ENCRYPT',
-                'HEX',
-                'INET6_NTOA',
-                'INET_NTOA',
-                'LOAD_FILE',
-                'LOWER',
-                'LTRIM',
-                'MD5',
-                'MONTHNAME',
-                'OLD_PASSWORD',
-                'PASSWORD',
-                'QUOTE',
-                'REVERSE',
-                'RTRIM',
-                'SHA1',
-                'SOUNDEX',
-                'SPACE',
-                'TRIM',
-                'UNCOMPRESS',
-                'UNHEX',
-                'UPPER',
-                'USER',
-                'UUID',
-                'VERSION',
-            );
-
-            if ((PMA_MARIADB && PMA_MYSQL_INT_VERSION < 100012)
-                || PMA_MYSQL_INT_VERSION < 50603
-            ) {
-                $ret = array_diff($ret, array('INET6_NTOA'));
-            }
-            return $ret;
-
-        case 'DATE':
-            return array(
-                'CURRENT_DATE',
-                'CURRENT_TIME',
-                'DATE',
-                'FROM_DAYS',
-                'FROM_UNIXTIME',
-                'LAST_DAY',
-                'NOW',
-                'SEC_TO_TIME',
-                'SYSDATE',
-                'TIME',
-                'TIMESTAMP',
-                'UTC_DATE',
-                'UTC_TIME',
-                'UTC_TIMESTAMP',
-                'YEAR',
-            );
-
-        case 'NUMBER':
-            $ret = array(
-                'ABS',
-                'ACOS',
-                'ASCII',
-                'ASIN',
-                'ATAN',
-                'BIT_LENGTH',
-                'BIT_COUNT',
-                'CEILING',
-                'CHAR_LENGTH',
-                'CONNECTION_ID',
-                'COS',
-                'COT',
-                'CRC32',
-                'DAYOFMONTH',
-                'DAYOFWEEK',
-                'DAYOFYEAR',
-                'DEGREES',
-                'EXP',
-                'FLOOR',
-                'HOUR',
-                'INET6_ATON',
-                'INET_ATON',
-                'LENGTH',
-                'LN',
-                'LOG',
-                'LOG2',
-                'LOG10',
-                'MICROSECOND',
-                'MINUTE',
-                'MONTH',
-                'OCT',
-                'ORD',
-                'PI',
-                'QUARTER',
-                'RADIANS',
-                'RAND',
-                'ROUND',
-                'SECOND',
-                'SIGN',
-                'SIN',
-                'SQRT',
-                'TAN',
-                'TO_DAYS',
-                'TO_SECONDS',
-                'TIME_TO_SEC',
-                'UNCOMPRESSED_LENGTH',
-                'UNIX_TIMESTAMP',
-                'UUID_SHORT',
-                'WEEK',
-                'WEEKDAY',
-                'WEEKOFYEAR',
-                'YEARWEEK',
-            );
-            if ((PMA_MARIADB && PMA_MYSQL_INT_VERSION < 100012)
-                || PMA_MYSQL_INT_VERSION < 50603
-            ) {
-                $ret = array_diff($ret, array('INET6_ATON'));
-            }
-            return $ret;
-
-        case 'SPATIAL':
-            return array(
-                'GeomFromText',
-                'GeomFromWKB',
-
-                'GeomCollFromText',
-                'LineFromText',
-                'MLineFromText',
-                'PointFromText',
-                'MPointFromText',
-                'PolyFromText',
-                'MPolyFromText',
-
-                'GeomCollFromWKB',
-                'LineFromWKB',
-                'MLineFromWKB',
-                'PointFromWKB',
-                'MPointFromWKB',
-                'PolyFromWKB',
-                'MPolyFromWKB',
-            );
-
-        }
-        return array();
-    }
-
-    /**
-     * Returns array of all attributes available.
-     *
-     * @return string[]
-     *
-     */
-    public function getAttributes()
-    {
-        return array(
-            '',
-            'BINARY',
-            'UNSIGNED',
-            'UNSIGNED ZEROFILL',
-            'on update CURRENT_TIMESTAMP',
-        );
-    }
-
-    /**
-     * Returns array of all column types available.
-     *
-     * VARCHAR, TINYINT, TEXT and DATE are listed first, based on
-     * estimated popularity.
-     *
-     * @return string[]
-     *
-     */
-    public function getColumns()
-    {
-        $ret = parent::getColumns();
-        // numeric
-        $ret[_pgettext('numeric types', 'Numeric')] = array(
-            'TINYINT',
-            'SMALLINT',
-            'MEDIUMINT',
-            'INT',
-            'BIGINT',
-            '-',
-            'DECIMAL',
-            'FLOAT',
-            'DOUBLE',
-            'REAL',
-            '-',
-            'BIT',
-            'BOOLEAN',
-            'SERIAL',
-        );
-
-        // Date/Time
-        $ret[_pgettext('date and time types', 'Date and time')] = array(
-            'DATE',
-            'DATETIME',
-            'TIMESTAMP',
-            'TIME',
-            'YEAR',
-        );
-
-        // Text
-        $ret[_pgettext('string types', 'String')] = array(
-            'CHAR',
-            'VARCHAR',
-            '-',
-            'TINYTEXT',
-            'TEXT',
-            'MEDIUMTEXT',
-            'LONGTEXT',
-            '-',
-            'BINARY',
-            'VARBINARY',
-            '-',
-            'TINYBLOB',
-            'MEDIUMBLOB',
-            'BLOB',
-            'LONGBLOB',
-            '-',
-            'ENUM',
-            'SET',
-        );
-
-        $ret[_pgettext('spatial types', 'Spatial')] = array(
-            'GEOMETRY',
-            'POINT',
-            'LINESTRING',
-            'POLYGON',
-            'MULTIPOINT',
-            'MULTILINESTRING',
-            'MULTIPOLYGON',
-            'GEOMETRYCOLLECTION',
-        );
-
-        if (PMA_MYSQL_INT_VERSION >= 50708
-            && \PMA\libraries\Util::getServerType() != 'MariaDB'
-        ) {
-          $ret['JSON'] = array(
-              'JSON',
-          );
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Returns an array of integer types
-     *
-     * @return string[] integer types
-     */
-    public function getIntegerTypes()
-    {
-        return array('tinyint', 'smallint', 'mediumint', 'int', 'bigint');
-    }
-
-    /**
-     * Returns the min and max values of a given integer type
-     *
-     * @param string  $type   integer type
-     * @param boolean $signed whether signed
-     *
-     * @return string[] min and max values
-     */
-    public function getIntegerRange($type, $signed = true)
-    {
-        static $min_max_data = array(
-            'unsigned' => array(
-                'tinyint'   => array('0', '255'),
-                'smallint'  => array('0', '65535'),
-                'mediumint' => array('0', '16777215'),
-                'int'       => array('0', '4294967295'),
-                'bigint'    => array('0', '18446744073709551615')
-            ),
-            'signed' => array(
-                'tinyint'   => array('-128', '127'),
-                'smallint'  => array('-32768', '32767'),
-                'mediumint' => array('-8388608', '8388607'),
-                'int'       => array('-2147483648', '2147483647'),
-                'bigint'    => array('-9223372036854775808', '9223372036854775807')
-            )
-        );
-        $relevantArray = $signed
-            ? $min_max_data['signed']
-            : $min_max_data['unsigned'];
-        return isset($relevantArray[$type]) ? $relevantArray[$type] : array('', '');
-    }
-}
diff --git a/#pma/libraries/Util.php b/#pma/libraries/Util.php
deleted file mode 100644
index 7832ec8a..00000000
--- a/#pma/libraries/Util.php
+++ /dev/null
@@ -1,4978 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Hold the PMA\libraries\Util class
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries;
-
-use PMA\libraries\plugins\ImportPlugin;
-use SqlParser\Context;
-use SqlParser\Lexer;
-use SqlParser\Parser;
-use SqlParser\Token;
-use stdClass;
-use SqlParser\Utils\Error as ParserError;
-
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
-/**
- * Misc functions used all over the scripts.
- *
- * @package PhpMyAdmin
- */
-class Util
-{
-
-    /**
-     * Detects which function to use for pow.
-     *
-     * @return string Function name.
-     */
-    public static function detectPow()
-    {
-        if (function_exists('bcpow')) {
-            // BCMath Arbitrary Precision Mathematics Function
-            return 'bcpow';
-        } elseif (function_exists('gmp_pow')) {
-            // GMP Function
-            return 'gmp_pow';
-        } else {
-            // PHP function
-            return 'pow';
-        }
-    }
-
-    /**
-     * Exponential expression / raise number into power
-     *
-     * @param string $base         base to raise
-     * @param string $exp          exponent to use
-     * @param string $use_function pow function to use, or false for auto-detect
-     *
-     * @return mixed string or float
-     */
-    public static function pow($base, $exp, $use_function = '')
-    {
-        static $pow_function = null;
-
-        if ($pow_function == null) {
-            $pow_function = self::detectPow();
-        }
-
-        if (! $use_function) {
-            if ($exp < 0) {
-                $use_function = 'pow';
-            } else {
-                $use_function = $pow_function;
-            }
-        }
-
-        if (($exp < 0) && ($use_function != 'pow')) {
-            return false;
-        }
-
-        switch ($use_function) {
-        case 'bcpow' :
-            // bcscale() needed for testing pow() with base values < 1
-            bcscale(10);
-            $pow = bcpow($base, $exp);
-            break;
-        case 'gmp_pow' :
-             $pow = gmp_strval(gmp_pow($base, $exp));
-            break;
-        case 'pow' :
-            $base = $base;
-            $exp = (int) $exp;
-            $pow = pow($base, $exp);
-            break;
-        default:
-            $pow = $use_function($base, $exp);
-        }
-
-        return $pow;
-    }
-
-    /**
-     * Checks whether configuration value tells to show icons.
-     *
-     * @param string $value Configuration option name
-     *
-     * @return boolean Whether to show icons.
-     */
-    public static function showIcons($value)
-    {
-        return in_array($GLOBALS['cfg'][$value], array('icons', 'both'));
-    }
-
-    /**
-     * Checks whether configuration value tells to show text.
-     *
-     * @param string $value Configuration option name
-     *
-     * @return boolean Whether to show text.
-     */
-    public static function showText($value)
-    {
-        return in_array($GLOBALS['cfg'][$value], array('text', 'both'));
-    }
-
-    /**
-     * Returns an HTML IMG tag for a particular icon from a theme,
-     * which may be an actual file or an icon from a sprite.
-     * This function takes into account the ActionLinksMode
-     * configuration setting and wraps the image tag in a span tag.
-     *
-     * @param string  $icon          name of icon file
-     * @param string  $alternate     alternate text
-     * @param boolean $force_text    whether to force alternate text to be displayed
-     * @param boolean $menu_icon     whether this icon is for the menu bar or not
-     * @param string  $control_param which directive controls the display
-     *
-     * @return string an html snippet
-     */
-    public static function getIcon(
-        $icon,
-        $alternate = '',
-        $force_text = false,
-        $menu_icon = false,
-        $control_param = 'ActionLinksMode'
-    ) {
-        $include_icon = $include_text = false;
-        if (self::showIcons($control_param)) {
-            $include_icon = true;
-        }
-        if ($force_text
-            || self::showText($control_param)
-        ) {
-            $include_text = true;
-        }
-        // Sometimes use a span (we rely on this in js/sql.js). But for menu bar
-        // we don't need a span
-        $button = $menu_icon ? '' : '<span class="nowrap">';
-        if ($include_icon) {
-            $button .= self::getImage($icon, $alternate);
-        }
-        if ($include_icon && $include_text) {
-            $button .= '&nbsp;';
-        }
-        if ($include_text) {
-            $button .= $alternate;
-        }
-        $button .= $menu_icon ? '' : '</span>';
-
-        return $button;
-    }
-
-    /**
-     * Returns an HTML IMG tag for a particular image from a theme,
-     * which may be an actual file or an icon from a sprite
-     *
-     * @param string $image      The name of the file to get
-     * @param string $alternate  Used to set 'alt' and 'title' attributes
-     *                           of the image
-     * @param array  $attributes An associative array of other attributes
-     *
-     * @return string an html IMG tag
-     */
-    public static function getImage($image, $alternate = '', $attributes = array())
-    {
-        static $sprites; // cached list of available sprites (if any)
-        if (defined('TESTSUITE')) {
-            // prevent caching in testsuite
-            unset($sprites);
-        }
-
-        $is_sprite = false;
-        $alternate = htmlspecialchars($alternate);
-
-        // If it's the first time this function is called
-        if (! isset($sprites)) {
-            $sprites = array();
-            // Try to load the list of sprites
-            if (isset($_SESSION['PMA_Theme'])) {
-                $sprite_file = $_SESSION['PMA_Theme']->getPath() . '/sprites.lib.php';
-                if (is_readable($sprite_file)) {
-                    include_once $sprite_file;
-                    $sprites = PMA_sprites();
-                }
-            }
-        }
-
-        // Check if we have the requested image as a sprite
-        //  and set $url accordingly
-        $class = str_replace(array('.gif','.png'), '', $image);
-        if (array_key_exists($class, $sprites)) {
-            $is_sprite = true;
-            $url = (defined('PMA_TEST_THEME') ? '../' : '') . 'themes/dot.gif';
-        } elseif (isset($GLOBALS['pmaThemeImage'])) {
-            $url = $GLOBALS['pmaThemeImage'] . $image;
-        } else {
-            $url = './themes/pmahomme/' . $image;
-        }
-
-        // set class attribute
-        if ($is_sprite) {
-            if (isset($attributes['class'])) {
-                $attributes['class'] = "icon ic_$class " . $attributes['class'];
-            } else {
-                $attributes['class'] = "icon ic_$class";
-            }
-        }
-
-        // set all other attributes
-        $attr_str = '';
-        foreach ($attributes as $key => $value) {
-            if (! in_array($key, array('alt', 'title'))) {
-                $attr_str .= " $key=\"$value\"";
-            }
-        }
-
-        // override the alt attribute
-        if (isset($attributes['alt'])) {
-            $alt = $attributes['alt'];
-        } else {
-            $alt = $alternate;
-        }
-
-        // override the title attribute
-        if (isset($attributes['title'])) {
-            $title = $attributes['title'];
-        } else {
-            $title = $alternate;
-        }
-
-        // generate the IMG tag
-        $template = '<img src="%s" title="%s" alt="%s"%s />';
-        $retval = sprintf($template, $url, $title, $alt, $attr_str);
-
-        return $retval;
-    }
-
-    /**
-     * Returns the formatted maximum size for an upload
-     *
-     * @param integer $max_upload_size the size
-     *
-     * @return string the message
-     *
-     * @access  public
-     */
-    public static function getFormattedMaximumUploadSize($max_upload_size)
-    {
-        // I have to reduce the second parameter (sensitiveness) from 6 to 4
-        // to avoid weird results like 512 kKib
-        list($max_size, $max_unit) = self::formatByteDown($max_upload_size, 4);
-        return '(' . sprintf(__('Max: %s%s'), $max_size, $max_unit) . ')';
-    }
-
-    /**
-     * Generates a hidden field which should indicate to the browser
-     * the maximum size for upload
-     *
-     * @param integer $max_size the size
-     *
-     * @return string the INPUT field
-     *
-     * @access  public
-     */
-    public static function generateHiddenMaxFileSize($max_size)
-    {
-        return '<input type="hidden" name="MAX_FILE_SIZE" value="'
-            . $max_size . '" />';
-    }
-
-    /**
-     * Add slashes before "_" and "%" characters for using them in MySQL
-     * database, table and field names.
-     * Note: This function does not escape backslashes!
-     *
-     * @param string $name the string to escape
-     *
-     * @return string the escaped string
-     *
-     * @access  public
-     */
-    public static function escapeMysqlWildcards($name)
-    {
-        return strtr($name, array('_' => '\\_', '%' => '\\%'));
-    } // end of the 'escapeMysqlWildcards()' function
-
-    /**
-     * removes slashes before "_" and "%" characters
-     * Note: This function does not unescape backslashes!
-     *
-     * @param string $name the string to escape
-     *
-     * @return string   the escaped string
-     *
-     * @access  public
-     */
-    public static function unescapeMysqlWildcards($name)
-    {
-        return strtr($name, array('\\_' => '_', '\\%' => '%'));
-    } // end of the 'unescapeMysqlWildcards()' function
-
-    /**
-     * removes quotes (',",`) from a quoted string
-     *
-     * checks if the string is quoted and removes this quotes
-     *
-     * @param string $quoted_string string to remove quotes from
-     * @param string $quote         type of quote to remove
-     *
-     * @return string unqoted string
-     */
-    public static function unQuote($quoted_string, $quote = null)
-    {
-        $quotes = array();
-
-        if ($quote === null) {
-            $quotes[] = '`';
-            $quotes[] = '"';
-            $quotes[] = "'";
-        } else {
-            $quotes[] = $quote;
-        }
-
-        foreach ($quotes as $quote) {
-            if (mb_substr($quoted_string, 0, 1) === $quote
-                && mb_substr($quoted_string, -1, 1) === $quote
-            ) {
-                $unquoted_string = mb_substr($quoted_string, 1, -1);
-                // replace escaped quotes
-                $unquoted_string = str_replace(
-                    $quote . $quote,
-                    $quote,
-                    $unquoted_string
-                );
-                return $unquoted_string;
-            }
-        }
-
-        return $quoted_string;
-    }
-
-    /**
-     * format sql strings
-     *
-     * @param string  $sqlQuery raw SQL string
-     * @param boolean $truncate truncate the query if it is too long
-     *
-     * @return string the formatted sql
-     *
-     * @global array  $cfg the configuration array
-     *
-     * @access  public
-     * @todo    move into PMA_Sql
-     */
-    public static function formatSql($sqlQuery, $truncate = false)
-    {
-        global $cfg;
-
-        if ($truncate
-            && mb_strlen($sqlQuery) > $cfg['MaxCharactersInDisplayedSQL']
-        ) {
-            $sqlQuery = mb_substr(
-                $sqlQuery,
-                0,
-                $cfg['MaxCharactersInDisplayedSQL']
-            ) . '[...]';
-        }
-        return '<code class="sql"><pre>' . "\n"
-            . htmlspecialchars($sqlQuery) . "\n"
-            . '</pre></code>';
-    } // end of the "formatSql()" function
-
-    /**
-     * Displays a link to the documentation as an icon
-     *
-     * @param string  $link   documentation link
-     * @param string  $target optional link target
-     * @param boolean $bbcode optional flag indicating whether to output bbcode
-     *
-     * @return string the html link
-     *
-     * @access public
-     */
-    public static function showDocLink($link, $target = 'documentation', $bbcode = false)
-    {
-        if($bbcode){
-            return "[a@$link@$target][dochelpicon][/a]";
-        }else{
-            return '<a href="' . $link . '" target="' . $target . '">'
-                . self::getImage('b_help.png', __('Documentation'))
-                . '</a>';
-        }
-    } // end of the 'showDocLink()' function
-
-    /**
-     * Get a URL link to the official MySQL documentation
-     *
-     * @param string $link   contains name of page/anchor that is being linked
-     * @param string $anchor anchor to page part
-     *
-     * @return string  the URL link
-     *
-     * @access  public
-     */
-    public static function getMySQLDocuURL($link, $anchor = '')
-    {
-        // Fixup for newly used names:
-        $link = str_replace('_', '-', mb_strtolower($link));
-
-        if (empty($link)) {
-            $link = 'index';
-        }
-        $mysql = '5.5';
-        $lang = 'en';
-        if (defined('PMA_MYSQL_INT_VERSION')) {
-            if (PMA_MYSQL_INT_VERSION >= 50700) {
-                $mysql = '5.7';
-            } elseif (PMA_MYSQL_INT_VERSION >= 50600) {
-                $mysql = '5.6';
-            } elseif (PMA_MYSQL_INT_VERSION >= 50500) {
-                $mysql = '5.5';
-            }
-        }
-        $url = 'https://dev.mysql.com/doc/refman/'
-            . $mysql . '/' . $lang . '/' . $link . '.html';
-        if (! empty($anchor)) {
-            $url .= '#' . $anchor;
-        }
-
-        return PMA_linkURL($url);
-    }
-
-    /**
-     * Displays a link to the official MySQL documentation
-     *
-     * @param string $link      contains name of page/anchor that is being linked
-     * @param bool   $big_icon  whether to use big icon (like in left frame)
-     * @param string $anchor    anchor to page part
-     * @param bool   $just_open whether only the opening <a> tag should be returned
-     *
-     * @return string  the html link
-     *
-     * @access  public
-     */
-    public static function showMySQLDocu(
-        $link,
-        $big_icon = false,
-        $anchor = '',
-        $just_open = false
-    ) {
-        $url = self::getMySQLDocuURL($link, $anchor);
-        $open_link = '<a href="' . $url . '" target="mysql_doc">';
-        if ($just_open) {
-            return $open_link;
-        } elseif ($big_icon) {
-            return $open_link
-                . self::getImage('b_sqlhelp.png', __('Documentation')) . '</a>';
-        } else {
-            return self::showDocLink($url, 'mysql_doc');
-        }
-    } // end of the 'showMySQLDocu()' function
-
-    /**
-     * Returns link to documentation.
-     *
-     * @param string $page   Page in documentation
-     * @param string $anchor Optional anchor in page
-     *
-     * @return string URL
-     */
-    public static function getDocuLink($page, $anchor = '')
-    {
-        /* Construct base URL */
-        $url =  $page . '.html';
-        if (!empty($anchor)) {
-            $url .= '#' . $anchor;
-        }
-
-        /* Check if we have built local documentation */
-        if (defined('TESTSUITE')) {
-            /* Provide consistent URL for testsuite */
-            return PMA_linkURL('https://docs.phpmyadmin.net/en/latest/' . $url);
-        } elseif (@file_exists('doc/html/index.html')) {
-            if (defined('PMA_SETUP')) {
-                return '../doc/html/' . $url;
-            } else {
-                return './doc/html/' . $url;
-            }
-        } else {
-            /* TODO: Should link to correct branch for released versions */
-            return PMA_linkURL('https://docs.phpmyadmin.net/en/latest/' . $url);
-        }
-    }
-
-    /**
-     * Displays a link to the phpMyAdmin documentation
-     *
-     * @param string  $page   Page in documentation
-     * @param string  $anchor Optional anchor in page
-     * @param boolean $bbcode Optional flag indicating whether to output bbcode
-     *
-     * @return string  the html link
-     *
-     * @access  public
-     */
-    public static function showDocu($page, $anchor = '', $bbcode = false)
-    {
-        return self::showDocLink(self::getDocuLink($page, $anchor), 'documentation', $bbcode);
-    } // end of the 'showDocu()' function
-
-    /**
-     * Displays a link to the PHP documentation
-     *
-     * @param string $target anchor in documentation
-     *
-     * @return string  the html link
-     *
-     * @access  public
-     */
-    public static function showPHPDocu($target)
-    {
-        $url = PMA_getPHPDocLink($target);
-
-        return self::showDocLink($url);
-    } // end of the 'showPHPDocu()' function
-
-    /**
-     * Returns HTML code for a tooltip
-     *
-     * @param string $message the message for the tooltip
-     *
-     * @return string
-     *
-     * @access  public
-     */
-    public static function showHint($message)
-    {
-        if ($GLOBALS['cfg']['ShowHint']) {
-            $classClause = ' class="pma_hint"';
-        } else {
-            $classClause = '';
-        }
-        return '<span' . $classClause . '>'
-            . self::getImage('b_help.png')
-            . '<span class="hide">' . $message . '</span>'
-            . '</span>';
-    }
-
-    /**
-     * Displays a MySQL error message in the main panel when $exit is true.
-     * Returns the error message otherwise.
-     *
-     * @param string|bool $server_msg     Server's error message.
-     * @param string      $sql_query      The SQL query that failed.
-     * @param bool        $is_modify_link Whether to show a "modify" link or not.
-     * @param string      $back_url       URL for the "back" link (full path is
-     *                                    not required).
-     * @param bool        $exit           Whether execution should be stopped or
-     *                                    the error message should be returned.
-     *
-     * @return string
-     *
-     * @global string $table The current table.
-     * @global string $db    The current database.
-     *
-     * @access public
-     */
-    public static function mysqlDie(
-        $server_msg = '',
-        $sql_query = '',
-        $is_modify_link = true,
-        $back_url = '',
-        $exit = true
-    ) {
-        global $table, $db;
-
-        /**
-         * Error message to be built.
-         * @var string $error_msg
-         */
-        $error_msg = '';
-
-        // Checking for any server errors.
-        if (empty($server_msg)) {
-            $server_msg = $GLOBALS['dbi']->getError();
-        }
-
-        // Finding the query that failed, if not specified.
-        if ((empty($sql_query) && (!empty($GLOBALS['sql_query'])))) {
-            $sql_query = $GLOBALS['sql_query'];
-        }
-        $sql_query = trim($sql_query);
-
-        /**
-         * The lexer used for analysis.
-         * @var Lexer $lexer
-         */
-        $lexer = new Lexer($sql_query);
-
-        /**
-         * The parser used for analysis.
-         * @var Parser $parser
-         */
-        $parser = new Parser($lexer->list);
-
-        /**
-         * The errors found by the lexer and the parser.
-         * @var array $errors
-         */
-        $errors = ParserError::get(array($lexer, $parser));
-
-        if (empty($sql_query)) {
-            $formatted_sql = '';
-        } elseif (count($errors)) {
-            $formatted_sql = htmlspecialchars($sql_query);
-        } else {
-            $formatted_sql = self::formatSql($sql_query, true);
-        }
-
-        $error_msg .= '<div class="error"><h1>' . __('Error') . '</h1>';
-
-        // For security reasons, if the MySQL refuses the connection, the query
-        // is hidden so no details are revealed.
-        if ((!empty($sql_query)) && (!(mb_strstr($sql_query, 'connect')))) {
-            // Static analysis errors.
-            if (!empty($errors)) {
-                $error_msg .= '<p><strong>' . __('Static analysis:')
-                    . '</strong></p>';
-                $error_msg .= '<p>' . sprintf(
-                    __('%d errors were found during analysis.'),
-                    count($errors)
-                ) . '</p>';
-                $error_msg .= '<p><ol>';
-                $error_msg .= implode(
-                    ParserError::format(
-                        $errors,
-                        '<li>%2$s (near "%4$s" at position %5$d)</li>'
-                    )
-                );
-                $error_msg .= '</ol></p>';
-            }
-
-            // Display the SQL query and link to MySQL documentation.
-            $error_msg .= '<p><strong>' . __('SQL query:') . '</strong>' . "\n";
-            $formattedSqlToLower = mb_strtolower($formatted_sql);
-
-            // TODO: Show documentation for all statement types.
-            if (mb_strstr($formattedSqlToLower, 'select')) {
-                // please show me help to the error on select
-                $error_msg .= self::showMySQLDocu('SELECT');
-            }
-
-            if ($is_modify_link) {
-                $_url_params = array(
-                    'sql_query' => $sql_query,
-                    'show_query' => 1,
-                );
-                if (mb_strlen($table)) {
-                    $_url_params['db'] = $db;
-                    $_url_params['table'] = $table;
-                    $doedit_goto = '<a href="tbl_sql.php'
-                        . PMA_URL_getCommon($_url_params) . '">';
-                } elseif (mb_strlen($db)) {
-                    $_url_params['db'] = $db;
-                    $doedit_goto = '<a href="db_sql.php'
-                        . PMA_URL_getCommon($_url_params) . '">';
-                } else {
-                    $doedit_goto = '<a href="server_sql.php'
-                        . PMA_URL_getCommon($_url_params) . '">';
-                }
-
-                $error_msg .= $doedit_goto
-                   . self::getIcon('b_edit.png', __('Edit'))
-                   . '</a>';
-            }
-
-            $error_msg .= '    </p>' . "\n"
-                . '<p>' . "\n"
-                . $formatted_sql . "\n"
-                . '</p>' . "\n";
-        }
-
-        // Display server's error.
-        if (!empty($server_msg)) {
-            $server_msg = preg_replace(
-                "@((\015\012)|(\015)|(\012)){3,}@",
-                "\n\n",
-                $server_msg
-            );
-
-            // Adds a link to MySQL documentation.
-            $error_msg .= '<p>' . "\n"
-                . '    <strong>' . __('MySQL said: ') . '</strong>'
-                . self::showMySQLDocu('Error-messages-server')
-                . "\n"
-                . '</p>' . "\n";
-
-            // The error message will be displayed within a CODE segment.
-            // To preserve original formatting, but allow word-wrapping,
-            // a couple of replacements are done.
-            // All non-single blanks and  TAB-characters are replaced with their
-            // HTML-counterpart
-            $server_msg = str_replace(
-                array('  ', "\t"),
-                array('&nbsp;&nbsp;', '&nbsp;&nbsp;&nbsp;&nbsp;'),
-                $server_msg
-            );
-
-            // Replace line breaks
-            $server_msg = nl2br($server_msg);
-
-            $error_msg .= '<code>' . $server_msg . '</code><br/>';
-        }
-
-        $error_msg .= '</div>';
-        $_SESSION['Import_message']['message'] = $error_msg;
-
-        if (!$exit) {
-            return $error_msg;
-        }
-
-        /**
-         * If this is an AJAX request, there is no "Back" link and
-         * `Response()` is used to send the response.
-         */
-        if (!empty($GLOBALS['is_ajax_request'])) {
-            $response = Response::getInstance();
-            $response->setRequestStatus(false);
-            $response->addJSON('message', $error_msg);
-            exit;
-        }
-
-        if (!empty($back_url)) {
-            if (mb_strstr($back_url, '?')) {
-                $back_url .= '&amp;no_history=true';
-            } else {
-                $back_url .= '?no_history=true';
-            }
-
-            $_SESSION['Import_message']['go_back_url'] = $back_url;
-
-            $error_msg .= '<fieldset class="tblFooters">'
-                . '[ <a href="' . $back_url . '">' . __('Back') . '</a> ]'
-                . '</fieldset>' . "\n\n";
-        }
-
-        exit($error_msg);
-    }
-
-    /**
-     * Check the correct row count
-     *
-     * @param string $db    the db name
-     * @param array  $table the table infos
-     *
-     * @return int $rowCount the possibly modified row count
-     *
-     */
-    private static function _checkRowCount($db, $table)
-    {
-        $rowCount = 0;
-
-        if ($table['Rows'] === null) {
-            // Do not check exact row count here,
-            // if row count is invalid possibly the table is defect
-            // and this would break the navigation panel;
-            // but we can check row count if this is a view or the
-            // information_schema database
-            // since Table::countRecords() returns a limited row count
-            // in this case.
-
-            // set this because Table::countRecords() can use it
-            $tbl_is_view = $table['TABLE_TYPE'] == 'VIEW';
-
-            if ($tbl_is_view || $GLOBALS['dbi']->isSystemSchema($db)) {
-                $rowCount = $GLOBALS['dbi']
-                    ->getTable($db, $table['Name'])
-                    ->countRecords();
-            }
-        }
-        return $rowCount;
-    }
-
-    /**
-     * returns array with tables of given db with extended information and grouped
-     *
-     * @param string   $db           name of db
-     * @param string   $tables       name of tables
-     * @param integer  $limit_offset list offset
-     * @param int|bool $limit_count  max tables to return
-     *
-     * @return array    (recursive) grouped table list
-     */
-    public static function getTableList(
-        $db,
-        $tables = null,
-        $limit_offset = 0,
-        $limit_count = false
-    ) {
-        $sep = $GLOBALS['cfg']['NavigationTreeTableSeparator'];
-
-        if ($tables === null) {
-            $tables = $GLOBALS['dbi']->getTablesFull(
-                $db,
-                '',
-                false,
-                null,
-                $limit_offset,
-                $limit_count
-            );
-            if ($GLOBALS['cfg']['NaturalOrder']) {
-                uksort($tables, 'strnatcasecmp');
-            }
-        }
-
-        if (count($tables) < 1) {
-            return $tables;
-        }
-
-        $default = array(
-            'Name'      => '',
-            'Rows'      => 0,
-            'Comment'   => '',
-            'disp_name' => '',
-        );
-
-        $table_groups = array();
-
-        foreach ($tables as $table_name => $table) {
-            $table['Rows'] = self::_checkRowCount($db, $table);
-
-            // in $group we save the reference to the place in $table_groups
-            // where to store the table info
-            if ($GLOBALS['cfg']['NavigationTreeEnableGrouping']
-                && $sep && mb_strstr($table_name, $sep)
-            ) {
-                $parts = explode($sep, $table_name);
-
-                $group =& $table_groups;
-                $i = 0;
-                $group_name_full = '';
-                $parts_cnt = count($parts) - 1;
-
-                while (($i < $parts_cnt)
-                    && ($i < $GLOBALS['cfg']['NavigationTreeTableLevel'])
-                ) {
-                    $group_name = $parts[$i] . $sep;
-                    $group_name_full .= $group_name;
-
-                    if (! isset($group[$group_name])) {
-                        $group[$group_name] = array();
-                        $group[$group_name]['is' . $sep . 'group'] = true;
-                        $group[$group_name]['tab' . $sep . 'count'] = 1;
-                        $group[$group_name]['tab' . $sep . 'group']
-                            = $group_name_full;
-
-                    } elseif (! isset($group[$group_name]['is' . $sep . 'group'])) {
-                        $table = $group[$group_name];
-                        $group[$group_name] = array();
-                        $group[$group_name][$group_name] = $table;
-                        $group[$group_name]['is' . $sep . 'group'] = true;
-                        $group[$group_name]['tab' . $sep . 'count'] = 1;
-                        $group[$group_name]['tab' . $sep . 'group']
-                            = $group_name_full;
-
-                    } else {
-                        $group[$group_name]['tab' . $sep . 'count']++;
-                    }
-
-                    $group =& $group[$group_name];
-                    $i++;
-                }
-
-            } else {
-                if (! isset($table_groups[$table_name])) {
-                    $table_groups[$table_name] = array();
-                }
-                $group =& $table_groups;
-            }
-
-            $table['disp_name'] = $table['Name'];
-            $group[$table_name] = array_merge($default, $table);
-        }
-
-        return $table_groups;
-    }
-
-    /* ----------------------- Set of misc functions ----------------------- */
-
-    /**
-     * Adds backquotes on both sides of a database, table or field name.
-     * and escapes backquotes inside the name with another backquote
-     *
-     * example:
-     * <code>
-     * echo backquote('owner`s db'); // `owner``s db`
-     *
-     * </code>
-     *
-     * @param mixed   $a_name the database, table or field name to "backquote"
-     *                        or array of it
-     * @param boolean $do_it  a flag to bypass this function (used by dump
-     *                        functions)
-     *
-     * @return mixed    the "backquoted" database, table or field name
-     *
-     * @access  public
-     */
-    public static function backquote($a_name, $do_it = true)
-    {
-        if (is_array($a_name)) {
-            foreach ($a_name as &$data) {
-                $data = self::backquote($data, $do_it);
-            }
-            return $a_name;
-        }
-
-        if (! $do_it) {
-            if (!(Context::isKeyword($a_name) & Token::FLAG_KEYWORD_RESERVED)
-            ) {
-                return $a_name;
-            }
-        }
-
-        // '0' is also empty for php :-(
-        if (mb_strlen($a_name) && $a_name !== '*') {
-            return '`' . str_replace('`', '``', $a_name) . '`';
-        } else {
-            return $a_name;
-        }
-    } // end of the 'backquote()' function
-
-    /**
-     * Adds backquotes on both sides of a database, table or field name.
-     * in compatibility mode
-     *
-     * example:
-     * <code>
-     * echo backquoteCompat('owner`s db'); // `owner``s db`
-     *
-     * </code>
-     *
-     * @param mixed   $a_name        the database, table or field name to
-     *                               "backquote" or array of it
-     * @param string  $compatibility string compatibility mode (used by dump
-     *                               functions)
-     * @param boolean $do_it         a flag to bypass this function (used by dump
-     *                               functions)
-     *
-     * @return mixed the "backquoted" database, table or field name
-     *
-     * @access  public
-     */
-    public static function backquoteCompat(
-        $a_name,
-        $compatibility = 'MSSQL',
-        $do_it = true
-    ) {
-        if (is_array($a_name)) {
-            foreach ($a_name as &$data) {
-                $data = self::backquoteCompat($data, $compatibility, $do_it);
-            }
-            return $a_name;
-        }
-
-        if (! $do_it) {
-            if (!Context::isKeyword($a_name)) {
-                return $a_name;
-            }
-        }
-
-        // @todo add more compatibility cases (ORACLE for example)
-        switch ($compatibility) {
-        case 'MSSQL':
-            $quote = '"';
-            break;
-        default:
-            $quote = "`";
-            break;
-        }
-
-        // '0' is also empty for php :-(
-        if (mb_strlen($a_name) && $a_name !== '*') {
-            return $quote . $a_name . $quote;
-        } else {
-            return $a_name;
-        }
-    } // end of the 'backquoteCompat()' function
-
-    /**
-     * Defines the <CR><LF> value depending on the user OS.
-     *
-     * @return string   the <CR><LF> value to use
-     *
-     * @access  public
-     */
-    public static function whichCrlf()
-    {
-        // The 'PMA_USR_OS' constant is defined in "libraries/Config.php"
-        // Win case
-        if (PMA_USR_OS == 'Win') {
-            $the_crlf = "\r\n";
-        } else {
-            // Others
-            $the_crlf = "\n";
-        }
-
-        return $the_crlf;
-    } // end of the 'whichCrlf()' function
-
-    /**
-     * Prepare the message and the query
-     * usually the message is the result of the query executed
-     *
-     * @param Message|string $message   the message to display
-     * @param string         $sql_query the query to display
-     * @param string         $type      the type (level) of the message
-     *
-     * @return string
-     *
-     * @access  public
-     */
-    public static function getMessage(
-        $message,
-        $sql_query = null,
-        $type = 'notice'
-    ) {
-        global $cfg;
-        $retval = '';
-
-        if (null === $sql_query) {
-            if (! empty($GLOBALS['display_query'])) {
-                $sql_query = $GLOBALS['display_query'];
-            } elseif (! empty($GLOBALS['unparsed_sql'])) {
-                $sql_query = $GLOBALS['unparsed_sql'];
-            } elseif (! empty($GLOBALS['sql_query'])) {
-                $sql_query = $GLOBALS['sql_query'];
-            } else {
-                $sql_query = '';
-            }
-        }
-
-        $render_sql = $cfg['ShowSQL'] == true && ! empty($sql_query) && $sql_query !== ';';
-
-        if (isset($GLOBALS['using_bookmark_message'])) {
-            $retval .= $GLOBALS['using_bookmark_message']->getDisplay();
-            unset($GLOBALS['using_bookmark_message']);
-        }
-
-        if ($render_sql) {
-            $retval .= '<div class="result_query"'
-                . ' style="text-align: ' . $GLOBALS['cell_align_left'] . '"'
-                . '>' . "\n";
-        }
-
-        if ($message instanceof Message) {
-            if (isset($GLOBALS['special_message'])) {
-                $message->addMessage($GLOBALS['special_message']);
-                unset($GLOBALS['special_message']);
-            }
-            $retval .= $message->getDisplay();
-        } else {
-            $retval .= '<div class="' . $type . '">';
-            $retval .= PMA_sanitize($message);
-            if (isset($GLOBALS['special_message'])) {
-                $retval .= PMA_sanitize($GLOBALS['special_message']);
-                unset($GLOBALS['special_message']);
-            }
-            $retval .= '</div>';
-        }
-
-        if ($render_sql) {
-            // Html format the query to be displayed
-            // If we want to show some sql code it is easiest to create it here
-            /* SQL-Parser-Analyzer */
-
-            if (! empty($GLOBALS['show_as_php'])) {
-                $new_line = '\\n"<br />' . "\n"
-                    . '&nbsp;&nbsp;&nbsp;&nbsp;. "';
-                $query_base = htmlspecialchars(addslashes($sql_query));
-                $query_base = preg_replace(
-                    '/((\015\012)|(\015)|(\012))/',
-                    $new_line,
-                    $query_base
-                );
-            } else {
-                $query_base = $sql_query;
-            }
-
-            $query_too_big = false;
-
-            $queryLength = mb_strlen($query_base);
-            if ($queryLength > $cfg['MaxCharactersInDisplayedSQL']) {
-                // when the query is large (for example an INSERT of binary
-                // data), the parser chokes; so avoid parsing the query
-                $query_too_big = true;
-                $shortened_query_base = nl2br(
-                    htmlspecialchars(
-                        mb_substr(
-                            $sql_query,
-                            0,
-                            $cfg['MaxCharactersInDisplayedSQL']
-                        ) . '[...]'
-                    )
-                );
-            }
-
-            if (! empty($GLOBALS['show_as_php'])) {
-                $query_base = '$sql  = \'' . $query_base;
-                $query_base = '<code class="php"><pre>' . "\n"
-                    . $query_base;
-            } elseif (isset($query_base)) {
-                $query_base = self::formatSql($query_base);
-            }
-
-            // Prepares links that may be displayed to edit/explain the query
-            // (don't go to default pages, we must go to the page
-            // where the query box is available)
-
-            // Basic url query part
-            $url_params = array();
-            if (! isset($GLOBALS['db'])) {
-                $GLOBALS['db'] = '';
-            }
-            if (mb_strlen($GLOBALS['db'])) {
-                $url_params['db'] = $GLOBALS['db'];
-                if (mb_strlen($GLOBALS['table'])) {
-                    $url_params['table'] = $GLOBALS['table'];
-                    $edit_link = 'tbl_sql.php';
-                } else {
-                    $edit_link = 'db_sql.php';
-                }
-            } else {
-                $edit_link = 'server_sql.php';
-            }
-
-            // Want to have the query explained
-            // but only explain a SELECT (that has not been explained)
-            /* SQL-Parser-Analyzer */
-            $explain_link = '';
-            $is_select = preg_match('@^SELECT[[:space:]]+@i', $sql_query);
-            if (! empty($cfg['SQLQuery']['Explain']) && ! $query_too_big) {
-                $explain_params = $url_params;
-                if ($is_select) {
-                    $explain_params['sql_query'] = 'EXPLAIN ' . $sql_query;
-                    $explain_link = ' ['
-                        . self::linkOrButton(
-                            'import.php' . PMA_URL_getCommon($explain_params),
-                            __('Explain SQL')
-                        ) . ']';
-                } elseif (preg_match(
-                    '@^EXPLAIN[[:space:]]+SELECT[[:space:]]+@i',
-                    $sql_query
-                )) {
-                    $explain_params['sql_query']
-                        = mb_substr($sql_query, 8);
-                    $explain_link = ' ['
-                        . self::linkOrButton(
-                            'import.php' . PMA_URL_getCommon($explain_params),
-                            __('Skip Explain SQL')
-                        ) . ']';
-                    $url = 'https://mariadb.org/explain_analyzer/analyze/'
-                        . '?client=phpMyAdmin&raw_explain='
-                        . urlencode(self::_generateRowQueryOutput($sql_query));
-                    $explain_link .= ' ['
-                        . self::linkOrButton(
-                            htmlspecialchars('url.php?url=' . urlencode($url)),
-                            sprintf(__('Analyze Explain at %s'), 'mariadb.org'),
-                            array(),
-                            true,
-                            false,
-                            '_blank'
-                        ) . ']';
-                }
-            } //show explain
-
-            $url_params['sql_query']  = $sql_query;
-            $url_params['show_query'] = 1;
-
-            // even if the query is big and was truncated, offer the chance
-            // to edit it (unless it's enormous, see linkOrButton() )
-            if (! empty($cfg['SQLQuery']['Edit'])
-                && empty($GLOBALS['show_as_php'])
-            ) {
-                $edit_link .= PMA_URL_getCommon($url_params) . '#querybox';
-                $edit_link = ' ['
-                    . self::linkOrButton($edit_link, __('Edit'))
-                    . ']';
-            } else {
-                $edit_link = '';
-            }
-
-            // Also we would like to get the SQL formed in some nice
-            // php-code
-            if (! empty($cfg['SQLQuery']['ShowAsPHP']) && ! $query_too_big) {
-
-                if (! empty($GLOBALS['show_as_php'])) {
-                    $php_link = ' ['
-                        . self::linkOrButton(
-                            'import.php' . PMA_URL_getCommon($url_params),
-                            __('Without PHP code'),
-                            array(),
-                            true,
-                            false,
-                            '',
-                            true
-                        )
-                        . ']';
-
-                    $php_link .= ' ['
-                        . self::linkOrButton(
-                            'import.php' . PMA_URL_getCommon($url_params),
-                            __('Submit query'),
-                            array(),
-                            true,
-                            false,
-                            '',
-                            true
-                        )
-                        . ']';
-                } else {
-                    $php_params = $url_params;
-                    $php_params['show_as_php'] = 1;
-                    $_message = __('Create PHP code');
-                    $php_link = ' ['
-                        . self::linkOrButton(
-                            'import.php' . PMA_URL_getCommon($php_params),
-                            $_message
-                        )
-                        . ']';
-                }
-            } else {
-                $php_link = '';
-            } //show as php
-
-            // Refresh query
-            if (! empty($cfg['SQLQuery']['Refresh'])
-                && ! isset($GLOBALS['show_as_php']) // 'Submit query' does the same
-                && preg_match('@^(SELECT|SHOW)[[:space:]]+@i', $sql_query)
-            ) {
-                $refresh_link = 'import.php' . PMA_URL_getCommon($url_params);
-                $refresh_link = ' ['
-                    . self::linkOrButton($refresh_link, __('Refresh')) . ']';
-            } else {
-                $refresh_link = '';
-            } //refresh
-
-            $retval .= '<div class="sqlOuter">';
-            if ($query_too_big) {
-                $retval .= $shortened_query_base;
-            } else {
-                $retval .= $query_base;
-            }
-
-            //Clean up the end of the PHP
-            if (! empty($GLOBALS['show_as_php'])) {
-                $retval .= '\';' . "\n"
-                    . '</pre></code>';
-            }
-            $retval .= '</div>';
-
-            $retval .= '<div class="tools print_ignore">';
-            $retval .= '<form action="sql.php" method="post">';
-            $retval .= PMA_URL_getHiddenInputs($GLOBALS['db'], $GLOBALS['table']);
-            $retval .= '<input type="hidden" name="sql_query" value="'
-                . htmlspecialchars($sql_query) . '" />';
-
-            // avoid displaying a Profiling checkbox that could
-            // be checked, which would reexecute an INSERT, for example
-            if (! empty($refresh_link) && self::profilingSupported()) {
-                $retval .= '<input type="hidden" name="profiling_form" value="1" />';
-                $retval .= self::getCheckbox(
-                    'profiling',
-                    __('Profiling'),
-                    isset($_SESSION['profiling']),
-                    true
-                );
-            }
-            $retval .= '</form>';
-
-            /**
-             * TODO: Should we have $cfg['SQLQuery']['InlineEdit']?
-             */
-            if (! empty($cfg['SQLQuery']['Edit'])
-                && ! $query_too_big
-                && empty($GLOBALS['show_as_php'])
-            ) {
-                $inline_edit_link = ' ['
-                    . self::linkOrButton(
-                        '#',
-                        _pgettext('Inline edit query', 'Edit inline'),
-                        array('class' => 'inline_edit_sql')
-                    )
-                    . ']';
-            } else {
-                $inline_edit_link = '';
-            }
-            $retval .= $inline_edit_link . $edit_link . $explain_link . $php_link
-                . $refresh_link;
-            $retval .= '</div>';
-
-            $retval .= '</div>';
-        }
-
-
-        return $retval;
-    } // end of the 'getMessage()' function
-
-    /**
-     * Execute an EXPLAIN query and formats results similar to MySQL command line
-     * utility.
-     *
-     * @param string $sqlQuery EXPLAIN query
-     *
-     * @return string query resuls
-     */
-    private static function _generateRowQueryOutput($sqlQuery)
-    {
-        $ret = '';
-        $result = $GLOBALS['dbi']->query($sqlQuery);
-        if ($result) {
-            $devider = '+';
-            $columnNames = '|';
-            $fieldsMeta = $GLOBALS['dbi']->getFieldsMeta($result);
-            foreach ($fieldsMeta as $meta) {
-                $devider .= '---+';
-                $columnNames .= ' ' . $meta->name . ' |';
-            }
-            $devider .= "\n";
-
-            $ret .= $devider . $columnNames . "\n" . $devider;
-            while ($row = $GLOBALS['dbi']->fetchRow($result)) {
-                $values = '|';
-                foreach ($row as $value) {
-                    if (is_null($value)) {
-                        $value = 'NULL';
-                    }
-                    $values .= ' ' . $value . ' |';
-                }
-                $ret .= $values . "\n";
-            }
-            $ret .= $devider;
-        }
-        return $ret;
-    }
-
-    /**
-     * Verifies if current MySQL server supports profiling
-     *
-     * @access  public
-     *
-     * @return boolean whether profiling is supported
-     */
-    public static function profilingSupported()
-    {
-        if (!self::cacheExists('profiling_supported')) {
-            // 5.0.37 has profiling but for example, 5.1.20 does not
-            // (avoid a trip to the server for MySQL before 5.0.37)
-            // and do not set a constant as we might be switching servers
-            if (defined('PMA_MYSQL_INT_VERSION')
-                && $GLOBALS['dbi']->fetchValue("SELECT @@have_profiling")
-            ) {
-                self::cacheSet('profiling_supported', true);
-            } else {
-                self::cacheSet('profiling_supported', false);
-            }
-        }
-
-        return self::cacheGet('profiling_supported');
-    }
-
-    /**
-     * Formats $value to byte view
-     *
-     * @param double|int $value the value to format
-     * @param int        $limes the sensitiveness
-     * @param int        $comma the number of decimals to retain
-     *
-     * @return array    the formatted value and its unit
-     *
-     * @access  public
-     */
-    public static function formatByteDown($value, $limes = 6, $comma = 0)
-    {
-        if ($value === null) {
-            return null;
-        }
-
-        $byteUnits = array(
-            /* l10n: shortcuts for Byte */
-            __('B'),
-            /* l10n: shortcuts for Kilobyte */
-            __('KiB'),
-            /* l10n: shortcuts for Megabyte */
-            __('MiB'),
-            /* l10n: shortcuts for Gigabyte */
-            __('GiB'),
-            /* l10n: shortcuts for Terabyte */
-            __('TiB'),
-            /* l10n: shortcuts for Petabyte */
-            __('PiB'),
-            /* l10n: shortcuts for Exabyte */
-            __('EiB')
-        );
-
-        $dh   = self::pow(10, $comma);
-        $li   = self::pow(10, $limes);
-        $unit = $byteUnits[0];
-
-        for ($d = 6, $ex = 15; $d >= 1; $d--, $ex-=3) {
-            $unitSize = $li * self::pow(10, $ex);
-            if (isset($byteUnits[$d]) && $value >= $unitSize) {
-                // use 1024.0 to avoid integer overflow on 64-bit machines
-                $value = round($value / (self::pow(1024, $d) / $dh)) /$dh;
-                $unit = $byteUnits[$d];
-                break 1;
-            } // end if
-        } // end for
-
-        if ($unit != $byteUnits[0]) {
-            // if the unit is not bytes (as represented in current language)
-            // reformat with max length of 5
-            // 4th parameter=true means do not reformat if value < 1
-            $return_value = self::formatNumber($value, 5, $comma, true);
-        } else {
-            // do not reformat, just handle the locale
-            $return_value = self::formatNumber($value, 0);
-        }
-
-        return array(trim($return_value), $unit);
-    } // end of the 'formatByteDown' function
-
-    /**
-     * Changes thousands and decimal separators to locale specific values.
-     *
-     * @param string $value the value
-     *
-     * @return string
-     */
-    public static function localizeNumber($value)
-    {
-        return str_replace(
-            array(',', '.'),
-            array(
-                /* l10n: Thousands separator */
-                __(','),
-                /* l10n: Decimal separator */
-                __('.'),
-            ),
-            $value
-        );
-    }
-
-    /**
-     * Formats $value to the given length and appends SI prefixes
-     * with a $length of 0 no truncation occurs, number is only formatted
-     * to the current locale
-     *
-     * examples:
-     * <code>
-     * echo formatNumber(123456789, 6);     // 123,457 k
-     * echo formatNumber(-123456789, 4, 2); //    -123.46 M
-     * echo formatNumber(-0.003, 6);        //      -3 m
-     * echo formatNumber(0.003, 3, 3);      //       0.003
-     * echo formatNumber(0.00003, 3, 2);    //       0.03 m
-     * echo formatNumber(0, 6);             //       0
-     * </code>
-     *
-     * @param double  $value          the value to format
-     * @param integer $digits_left    number of digits left of the comma
-     * @param integer $digits_right   number of digits right of the comma
-     * @param boolean $only_down      do not reformat numbers below 1
-     * @param boolean $noTrailingZero removes trailing zeros right of the comma
-     *                                (default: true)
-     *
-     * @return string   the formatted value and its unit
-     *
-     * @access  public
-     */
-    public static function formatNumber(
-        $value,
-        $digits_left = 3,
-        $digits_right = 0,
-        $only_down = false,
-        $noTrailingZero = true
-    ) {
-        if ($value == 0) {
-            return '0';
-        }
-
-        $originalValue = $value;
-        //number_format is not multibyte safe, str_replace is safe
-        if ($digits_left === 0) {
-            $value = number_format($value, $digits_right);
-            if (($originalValue != 0) && (floatval($value) == 0)) {
-                $value = ' <' . (1 / self::pow(10, $digits_right));
-            }
-            return self::localizeNumber($value);
-        }
-
-        // this units needs no translation, ISO
-        $units = array(
-            -8 => 'y',
-            -7 => 'z',
-            -6 => 'a',
-            -5 => 'f',
-            -4 => 'p',
-            -3 => 'n',
-            -2 => '&micro;',
-            -1 => 'm',
-            0 => ' ',
-            1 => 'k',
-            2 => 'M',
-            3 => 'G',
-            4 => 'T',
-            5 => 'P',
-            6 => 'E',
-            7 => 'Z',
-            8 => 'Y'
-        );
-
-        // check for negative value to retain sign
-        if ($value < 0) {
-            $sign = '-';
-            $value = abs($value);
-        } else {
-            $sign = '';
-        }
-
-        $dh = self::pow(10, $digits_right);
-
-        /*
-         * This gives us the right SI prefix already,
-         * but $digits_left parameter not incorporated
-         */
-        $d = floor(log10($value) / 3);
-        /*
-         * Lowering the SI prefix by 1 gives us an additional 3 zeros
-         * So if we have 3,6,9,12.. free digits ($digits_left - $cur_digits)
-         * to use, then lower the SI prefix
-         */
-        $cur_digits = floor(log10($value / self::pow(1000, $d, 'pow'))+1);
-        if ($digits_left > $cur_digits) {
-            $d -= floor(($digits_left - $cur_digits)/3);
-        }
-
-        if ($d < 0 && $only_down) {
-            $d = 0;
-        }
-
-        $value = round($value / (self::pow(1000, $d, 'pow') / $dh)) /$dh;
-        $unit = $units[$d];
-
-        // number_format is not multibyte safe, str_replace is safe
-        $formattedValue = number_format($value, $digits_right);
-        // If we don't want any zeros, remove them now
-        if ($noTrailingZero && strpos($formattedValue, '.') !== false) {
-            $formattedValue = preg_replace('/\.?0+$/', '', $formattedValue);
-        }
-        $localizedValue = self::localizeNumber($formattedValue);
-
-        if ($originalValue != 0 && floatval($value) == 0) {
-            return ' <' . self::localizeNumber((1 / self::pow(10, $digits_right)))
-            . ' ' . $unit;
-        }
-
-        return $sign . $localizedValue . ' ' . $unit;
-    } // end of the 'formatNumber' function
-
-    /**
-     * Returns the number of bytes when a formatted size is given
-     *
-     * @param string $formatted_size the size expression (for example 8MB)
-     *
-     * @return integer  The numerical part of the expression (for example 8)
-     */
-    public static function extractValueFromFormattedSize($formatted_size)
-    {
-        $return_value = -1;
-
-        if (preg_match('/^[0-9]+GB$/', $formatted_size)) {
-            $return_value = mb_substr($formatted_size, 0, -2)
-                * self::pow(1024, 3);
-        } elseif (preg_match('/^[0-9]+MB$/', $formatted_size)) {
-            $return_value = mb_substr($formatted_size, 0, -2)
-                * self::pow(1024, 2);
-        } elseif (preg_match('/^[0-9]+K$/', $formatted_size)) {
-            $return_value = mb_substr($formatted_size, 0, -1)
-                * self::pow(1024, 1);
-        }
-        return $return_value;
-    }// end of the 'extractValueFromFormattedSize' function
-
-    /**
-     * Writes localised date
-     *
-     * @param integer $timestamp the current timestamp
-     * @param string  $format    format
-     *
-     * @return string   the formatted date
-     *
-     * @access  public
-     */
-    public static function localisedDate($timestamp = -1, $format = '')
-    {
-        $month = array(
-            /* l10n: Short month name */
-            __('Jan'),
-            /* l10n: Short month name */
-            __('Feb'),
-            /* l10n: Short month name */
-            __('Mar'),
-            /* l10n: Short month name */
-            __('Apr'),
-            /* l10n: Short month name */
-            _pgettext('Short month name', 'May'),
-            /* l10n: Short month name */
-            __('Jun'),
-            /* l10n: Short month name */
-            __('Jul'),
-            /* l10n: Short month name */
-            __('Aug'),
-            /* l10n: Short month name */
-            __('Sep'),
-            /* l10n: Short month name */
-            __('Oct'),
-            /* l10n: Short month name */
-            __('Nov'),
-            /* l10n: Short month name */
-            __('Dec'));
-        $day_of_week = array(
-            /* l10n: Short week day name */
-            _pgettext('Short week day name', 'Sun'),
-            /* l10n: Short week day name */
-            __('Mon'),
-            /* l10n: Short week day name */
-            __('Tue'),
-            /* l10n: Short week day name */
-            __('Wed'),
-            /* l10n: Short week day name */
-            __('Thu'),
-            /* l10n: Short week day name */
-            __('Fri'),
-            /* l10n: Short week day name */
-            __('Sat'));
-
-        if ($format == '') {
-            /* l10n: See http://www.php.net/manual/en/function.strftime.php */
-            $format = __('%B %d, %Y at %I:%M %p');
-        }
-
-        if ($timestamp == -1) {
-            $timestamp = time();
-        }
-
-        $date = preg_replace(
-            '@%[aA]@',
-            $day_of_week[(int)strftime('%w', $timestamp)],
-            $format
-        );
-        $date = preg_replace(
-            '@%[bB]@',
-            $month[(int)strftime('%m', $timestamp)-1],
-            $date
-        );
-
-        $ret = strftime($date, $timestamp);
-        // Some OSes such as Win8.1 Traditional Chinese version did not produce UTF-8
-        // output here. See https://sourceforge.net/p/phpmyadmin/bugs/4207/
-        if (mb_detect_encoding($ret, 'UTF-8', true) != 'UTF-8') {
-            $ret = date('Y-m-d H:i:s', $timestamp);
-        }
-
-        return $ret;
-    } // end of the 'localisedDate()' function
-
-    /**
-     * returns a tab for tabbed navigation.
-     * If the variables $link and $args ar left empty, an inactive tab is created
-     *
-     * @param array $tab        array with all options
-     * @param array $url_params tab specific URL parameters
-     *
-     * @return string  html code for one tab, a link if valid otherwise a span
-     *
-     * @access  public
-     */
-    public static function getHtmlTab($tab, $url_params = array())
-    {
-        // default values
-        $defaults = array(
-            'text'      => '',
-            'class'     => '',
-            'active'    => null,
-            'link'      => '',
-            'sep'       => '?',
-            'attr'      => '',
-            'args'      => '',
-            'warning'   => '',
-            'fragment'  => '',
-            'id'        => '',
-        );
-
-        $tab = array_merge($defaults, $tab);
-
-        // determine additional style-class
-        if (empty($tab['class'])) {
-            if (! empty($tab['active'])
-                || PMA_isValid($GLOBALS['active_page'], 'identical', $tab['link'])
-            ) {
-                $tab['class'] = 'active';
-            } elseif (is_null($tab['active']) && empty($GLOBALS['active_page'])
-                && (basename($GLOBALS['PMA_PHP_SELF']) == $tab['link'])
-            ) {
-                $tab['class'] = 'active';
-            }
-        }
-
-        // If there are any tab specific URL parameters, merge those with
-        // the general URL parameters
-        if (! empty($tab['url_params']) && is_array($tab['url_params'])) {
-            $url_params = array_merge($url_params, $tab['url_params']);
-        }
-
-        // build the link
-        if (! empty($tab['link'])) {
-            $tab['link'] = htmlentities($tab['link']);
-            $tab['link'] = $tab['link'] . PMA_URL_getCommon($url_params);
-            if (! empty($tab['args'])) {
-                foreach ($tab['args'] as $param => $value) {
-                    $tab['link'] .= PMA_URL_getArgSeparator('html')
-                        . urlencode($param) . '=' . urlencode($value);
-                }
-            }
-        }
-
-        if (! empty($tab['fragment'])) {
-            $tab['link'] .= $tab['fragment'];
-        }
-
-        // display icon
-        if (isset($tab['icon'])) {
-            // avoid generating an alt tag, because it only illustrates
-            // the text that follows and if browser does not display
-            // images, the text is duplicated
-            $tab['text'] = self::getIcon(
-                $tab['icon'],
-                $tab['text'],
-                false,
-                true,
-                'TabsMode'
-            );
-
-        } elseif (empty($tab['text'])) {
-            // check to not display an empty link-text
-            $tab['text'] = '?';
-            trigger_error(
-                'empty linktext in function ' . __FUNCTION__ . '()',
-                E_USER_NOTICE
-            );
-        }
-
-        //Set the id for the tab, if set in the params
-        $tabId = (empty($tab['id']) ? null : $tab['id']);
-
-        $item = array();
-        if (!empty($tab['link'])) {
-            $item = array(
-                'content' => $tab['text'],
-                'url' => array(
-                    'href' => empty($tab['link']) ? null : $tab['link'],
-                    'id' => $tabId,
-                    'class' => 'tab' . htmlentities($tab['class']),
-                ),
-            );
-        } else {
-            $item['content'] = '<span class="tab' . htmlentities($tab['class']) . '"'
-                . $tabId . '>' . $tab['text'] . '</span>';
-        }
-
-        $item['class'] = $tab['class'] == 'active' ? 'active' : '';
-
-        return Template::get('list/item')
-            ->render($item);
-    } // end of the 'getHtmlTab()' function
-
-    /**
-     * returns html-code for a tab navigation
-     *
-     * @param array  $tabs       one element per tab
-     * @param array  $url_params additional URL parameters
-     * @param string $menu_id    HTML id attribute for the menu container
-     * @param bool   $resizable  whether to add a "resizable" class
-     *
-     * @return string  html-code for tab-navigation
-     */
-    public static function getHtmlTabs(
-        $tabs,
-        $url_params,
-        $menu_id,
-        $resizable = false
-    ) {
-        $class = '';
-        if ($resizable) {
-            $class = ' class="resizable-menu"';
-        }
-
-        $tab_navigation = '<div id="' . htmlentities($menu_id)
-            . 'container" class="menucontainer">'
-            . '<ul id="' . htmlentities($menu_id) . '" ' . $class . '>';
-
-        foreach ($tabs as $tab) {
-            $tab_navigation .= self::getHtmlTab($tab, $url_params);
-        }
-
-        $tab_navigation .=
-              '<div class="clearfloat"></div>'
-            . '</ul>' . "\n"
-            . '</div>' . "\n";
-
-        return $tab_navigation;
-    }
-
-    /**
-     * Displays a link, or a button if the link's URL is too large, to
-     * accommodate some browsers' limitations
-     *
-     * @param string  $url          the URL
-     * @param string  $message      the link message
-     * @param mixed   $tag_params   string: js confirmation
-     *                              array: additional tag params (f.e. style="")
-     * @param boolean $new_form     we set this to false when we are already in
-     *                              a  form, to avoid generating nested forms
-     * @param boolean $strip_img    whether to strip the image
-     * @param string  $target       target
-     * @param boolean $force_button use a button even when the URL is not too long
-     *
-     * @return string  the results to be echoed or saved in an array
-     */
-    public static function linkOrButton(
-        $url, $message, $tag_params = array(),
-        $new_form = true, $strip_img = false, $target = '', $force_button = false
-    ) {
-        $url_length = mb_strlen($url);
-        // with this we should be able to catch case of image upload
-        // into a (MEDIUM) BLOB; not worth generating even a form for these
-        if ($url_length > $GLOBALS['cfg']['LinkLengthLimit'] * 100) {
-            return '';
-        }
-
-        if (! is_array($tag_params)) {
-            $tmp = $tag_params;
-            $tag_params = array();
-            if (! empty($tmp)) {
-                $tag_params['onclick'] = 'return confirmLink(this, \''
-                    . PMA_escapeJsString($tmp) . '\')';
-            }
-            unset($tmp);
-        }
-        if (! empty($target)) {
-            $tag_params['target'] = htmlentities($target);
-            if ($target === '_blank' && strncmp($url, 'url.php?', 8) == 0) {
-                $tag_params['rel'] = 'noopener noreferrer';
-            }
-        }
-
-        $displayed_message = '';
-        // Add text if not already added
-        if (stristr($message, '<img')
-            && (! $strip_img || ($GLOBALS['cfg']['ActionLinksMode'] == 'icons'))
-            && (strip_tags($message) == $message)
-        ) {
-            $displayed_message = '<span>'
-                . htmlspecialchars(
-                    preg_replace('/^.*\salt="([^"]*)".*$/si', '\1', $message)
-                )
-                . '</span>';
-        }
-
-        // Suhosin: Check that each query parameter is not above maximum
-        $in_suhosin_limits = true;
-        if ($url_length <= $GLOBALS['cfg']['LinkLengthLimit']) {
-            $suhosin_get_MaxValueLength = ini_get('suhosin.get.max_value_length');
-            if ($suhosin_get_MaxValueLength) {
-                $query_parts = self::splitURLQuery($url);
-                foreach ($query_parts as $query_pair) {
-                    if (strpos($query_pair, '=') === false) {
-                        continue;
-                    }
-
-                    list(, $eachval) = explode('=', $query_pair);
-                    if (mb_strlen($eachval) > $suhosin_get_MaxValueLength
-                    ) {
-                        $in_suhosin_limits = false;
-                        break;
-                    }
-                }
-            }
-        }
-
-        if (($url_length <= $GLOBALS['cfg']['LinkLengthLimit'])
-            && $in_suhosin_limits
-            && ! $force_button
-        ) {
-            $tag_params_strings = array();
-            foreach ($tag_params as $par_name => $par_value) {
-                // htmlspecialchars() only on non javascript
-                $par_value = mb_substr($par_name, 0, 2) == 'on'
-                    ? $par_value
-                    : htmlspecialchars($par_value);
-                $tag_params_strings[] = $par_name . '="' . $par_value . '"';
-            }
-
-            // no whitespace within an <a> else Safari will make it part of the link
-            $ret = "\n" . '<a href="' . $url . '" '
-                . implode(' ', $tag_params_strings) . '>'
-                . $message . $displayed_message . '</a>' . "\n";
-        } else {
-            // no spaces (line breaks) at all
-            // or after the hidden fields
-            // IE will display them all
-
-            if (! isset($query_parts)) {
-                $query_parts = self::splitURLQuery($url);
-            }
-            $url_parts   = parse_url($url);
-
-            if ($new_form) {
-                if ($target) {
-                    $target = ' target="' . $target . '"';
-                }
-                $ret = '<form action="' . $url_parts['path'] . '" class="link"'
-                     . ' method="post"' . $target . ' style="display: inline;">';
-                $subname_open   = '';
-                $subname_close  = '';
-                $submit_link    = '#';
-            } else {
-                $query_parts[] = 'redirect=' . $url_parts['path'];
-                if (empty($GLOBALS['subform_counter'])) {
-                    $GLOBALS['subform_counter'] = 0;
-                }
-                $GLOBALS['subform_counter']++;
-                $ret            = '';
-                $subname_open   = 'subform[' . $GLOBALS['subform_counter'] . '][';
-                $subname_close  = ']';
-                $submit_link    = '#usesubform[' . $GLOBALS['subform_counter']
-                    . ']=1';
-            }
-
-            foreach ($query_parts as $query_pair) {
-                list($eachvar, $eachval) = explode('=', $query_pair);
-                $ret .= '<input type="hidden" name="' . $subname_open . $eachvar
-                    . $subname_close . '" value="'
-                    . htmlspecialchars(urldecode($eachval)) . '" />';
-            } // end while
-
-            if (empty($tag_params['class'])) {
-                $tag_params['class'] = 'formLinkSubmit';
-            } else {
-                $tag_params['class'] .= ' formLinkSubmit';
-            }
-
-            $tag_params_strings = array();
-            foreach ($tag_params as $par_name => $par_value) {
-                // htmlspecialchars() only on non javascript
-                $par_value = mb_substr($par_name, 0, 2) == 'on'
-                    ? $par_value
-                    : htmlspecialchars($par_value);
-                $tag_params_strings[] = $par_name . '="' . $par_value . '"';
-            }
-
-            $ret .= "\n" . '<a href="' . $submit_link . '" '
-                . implode(' ', $tag_params_strings) . '>'
-                . $message . ' ' . $displayed_message . '</a>' . "\n";
-
-            if ($new_form) {
-                $ret .= '</form>';
-            }
-        } // end if... else...
-
-        return $ret;
-    } // end of the 'linkOrButton()' function
-
-    /**
-     * Splits a URL string by parameter
-     *
-     * @param string $url the URL
-     *
-     * @return array  the parameter/value pairs, for example [0] db=sakila
-     */
-    public static function splitURLQuery($url)
-    {
-        // decode encoded url separators
-        $separator = PMA_URL_getArgSeparator();
-        // on most places separator is still hard coded ...
-        if ($separator !== '&') {
-            // ... so always replace & with $separator
-            $url = str_replace(htmlentities('&'), $separator, $url);
-            $url = str_replace('&', $separator, $url);
-        }
-
-        $url = str_replace(htmlentities($separator), $separator, $url);
-        // end decode
-
-        $url_parts = parse_url($url);
-
-        if (! empty($url_parts['query'])) {
-            return explode($separator, $url_parts['query']);
-        } else {
-            return array();
-        }
-    }
-
-    /**
-     * Returns a given timespan value in a readable format.
-     *
-     * @param int $seconds the timespan
-     *
-     * @return string  the formatted value
-     */
-    public static function timespanFormat($seconds)
-    {
-        $days = floor($seconds / 86400);
-        if ($days > 0) {
-            $seconds -= $days * 86400;
-        }
-
-        $hours = floor($seconds / 3600);
-        if ($days > 0 || $hours > 0) {
-            $seconds -= $hours * 3600;
-        }
-
-        $minutes = floor($seconds / 60);
-        if ($days > 0 || $hours > 0 || $minutes > 0) {
-            $seconds -= $minutes * 60;
-        }
-
-        return sprintf(
-            __('%s days, %s hours, %s minutes and %s seconds'),
-            (string)$days,
-            (string)$hours,
-            (string)$minutes,
-            (string)$seconds
-        );
-    }
-
-    /**
-     * Takes a string and outputs each character on a line for itself. Used
-     * mainly for horizontalflipped display mode.
-     * Takes care of special html-characters.
-     * Fulfills https://sourceforge.net/p/phpmyadmin/feature-requests/164/
-     *
-     * @param string $string    The string
-     * @param string $Separator The Separator (defaults to "<br />\n")
-     *
-     * @access  public
-     * @todo    add a multibyte safe function $GLOBALS['String']->split()
-     *
-     * @return string      The flipped string
-     */
-    public static function flipstring($string, $Separator = "<br />\n")
-    {
-        $format_string = '';
-        $charbuff = false;
-
-        for ($i = 0, $str_len = mb_strlen($string);
-             $i < $str_len;
-             $i++
-        ) {
-            $char = $string{$i};
-            $append = false;
-
-            if ($char == '&') {
-                $format_string .= $charbuff;
-                $charbuff = $char;
-            } elseif ($char == ';' && ! empty($charbuff)) {
-                $format_string .= $charbuff . $char;
-                $charbuff = false;
-                $append = true;
-            } elseif (! empty($charbuff)) {
-                $charbuff .= $char;
-            } else {
-                $format_string .= $char;
-                $append = true;
-            }
-
-            // do not add separator after the last character
-            if ($append && ($i != $str_len - 1)) {
-                $format_string .= $Separator;
-            }
-        }
-
-        return $format_string;
-    }
-
-    /**
-     * Function added to avoid path disclosures.
-     * Called by each script that needs parameters, it displays
-     * an error message and, by default, stops the execution.
-     *
-     * Not sure we could use a strMissingParameter message here,
-     * would have to check if the error message file is always available
-     *
-     * @param string[] $params  The names of the parameters needed by the calling
-     *                          script
-     * @param bool     $request Whether to include this list in checking for
-     *                          special params
-     *
-     * @return void
-     *
-     * @global boolean $checked_special flag whether any special variable
-     *                                       was required
-     *
-     * @access public
-     */
-    public static function checkParameters($params, $request = true)
-    {
-        global $checked_special;
-
-        if (! isset($checked_special)) {
-            $checked_special = false;
-        }
-
-        $reported_script_name = basename($GLOBALS['PMA_PHP_SELF']);
-        $found_error = false;
-        $error_message = '';
-
-        foreach ($params as $param) {
-            if ($request && ($param != 'db') && ($param != 'table')) {
-                $checked_special = true;
-            }
-
-            if (! isset($GLOBALS[$param])) {
-                $error_message .= $reported_script_name
-                    . ': ' . __('Missing parameter:') . ' '
-                    . $param
-                    . self::showDocu('faq', 'faqmissingparameters',true)
-                    . '[br]';
-                $found_error = true;
-            }
-        }
-        if ($found_error) {
-            PMA_fatalError($error_message, null, false);
-        }
-    } // end function
-
-    /**
-     * Function to generate unique condition for specified row.
-     *
-     * @param resource       $handle               current query result
-     * @param integer        $fields_cnt           number of fields
-     * @param array          $fields_meta          meta information about fields
-     * @param array          $row                  current row
-     * @param boolean        $force_unique         generate condition only on pk
-     *                                             or unique
-     * @param string|boolean $restrict_to_table    restrict the unique condition
-     *                                             to this table or false if
-     *                                             none
-     * @param array          $analyzed_sql_results the analyzed query
-     *
-     * @access public
-     *
-     * @return array the calculated condition and whether condition is unique
-     */
-    public static function getUniqueCondition(
-        $handle, $fields_cnt, $fields_meta, $row, $force_unique = false,
-        $restrict_to_table = false, $analyzed_sql_results = null
-    ) {
-        $primary_key          = '';
-        $unique_key           = '';
-        $nonprimary_condition = '';
-        $preferred_condition = '';
-        $primary_key_array    = array();
-        $unique_key_array     = array();
-        $nonprimary_condition_array = array();
-        $condition_array = array();
-
-        for ($i = 0; $i < $fields_cnt; ++$i) {
-
-            $con_val     = '';
-            $field_flags = $GLOBALS['dbi']->fieldFlags($handle, $i);
-            $meta        = $fields_meta[$i];
-
-            // do not use a column alias in a condition
-            if (! isset($meta->orgname) || ! mb_strlen($meta->orgname)) {
-                $meta->orgname = $meta->name;
-
-                if (!empty($analyzed_sql_results['statement']->expr)) {
-                    foreach ($analyzed_sql_results['statement']->expr as $expr) {
-                        if ((empty($expr->alias)) || (empty($expr->column))) {
-                            continue;
-                        }
-                        if (strcasecmp($meta->name, $expr->alias) == 0) {
-                            $meta->orgname = $expr->column;
-                            break;
-                        }
-                    }
-                }
-            }
-
-            // Do not use a table alias in a condition.
-            // Test case is:
-            // select * from galerie x WHERE
-            //(select count(*) from galerie y where y.datum=x.datum)>1
-            //
-            // But orgtable is present only with mysqli extension so the
-            // fix is only for mysqli.
-            // Also, do not use the original table name if we are dealing with
-            // a view because this view might be updatable.
-            // (The isView() verification should not be costly in most cases
-            // because there is some caching in the function).
-            if (isset($meta->orgtable)
-                && ($meta->table != $meta->orgtable)
-                && ! $GLOBALS['dbi']->getTable($GLOBALS['db'], $meta->table)->isView()
-            ) {
-                $meta->table = $meta->orgtable;
-            }
-
-            // If this field is not from the table which the unique clause needs
-            // to be restricted to.
-            if ($restrict_to_table && $restrict_to_table != $meta->table) {
-                continue;
-            }
-
-            // to fix the bug where float fields (primary or not)
-            // can't be matched because of the imprecision of
-            // floating comparison, use CONCAT
-            // (also, the syntax "CONCAT(field) IS NULL"
-            // that we need on the next "if" will work)
-            if ($meta->type == 'real') {
-                $con_key = 'CONCAT(' . self::backquote($meta->table) . '.'
-                    . self::backquote($meta->orgname) . ')';
-            } else {
-                $con_key = self::backquote($meta->table) . '.'
-                    . self::backquote($meta->orgname);
-            } // end if... else...
-            $condition = ' ' . $con_key . ' ';
-
-            if (! isset($row[$i]) || is_null($row[$i])) {
-                $con_val = 'IS NULL';
-            } else {
-                // timestamp is numeric on some MySQL 4.1
-                // for real we use CONCAT above and it should compare to string
-                if ($meta->numeric
-                    && ($meta->type != 'timestamp')
-                    && ($meta->type != 'real')
-                ) {
-                    $con_val = '= ' . $row[$i];
-                } elseif ((($meta->type == 'blob') || ($meta->type == 'string'))
-                    && stristr($field_flags, 'BINARY')
-                    && ! empty($row[$i])
-                ) {
-                    // hexify only if this is a true not empty BLOB or a BINARY
-
-                    // do not waste memory building a too big condition
-                    if (mb_strlen($row[$i]) < 1000) {
-                        // use a CAST if possible, to avoid problems
-                        // if the field contains wildcard characters % or _
-                        $con_val = '= CAST(0x' . bin2hex($row[$i]) . ' AS BINARY)';
-                    } elseif ($fields_cnt == 1) {
-                        // when this blob is the only field present
-                        // try settling with length comparison
-                        $condition = ' CHAR_LENGTH(' . $con_key . ') ';
-                        $con_val = ' = ' .  mb_strlen($row[$i]);
-                    } else {
-                        // this blob won't be part of the final condition
-                        $con_val = null;
-                    }
-                } elseif (in_array($meta->type, self::getGISDatatypes())
-                    && ! empty($row[$i])
-                ) {
-                    // do not build a too big condition
-                    if (mb_strlen($row[$i]) < 5000) {
-                        $condition .= '=0x' . bin2hex($row[$i]) . ' AND';
-                    } else {
-                        $condition = '';
-                    }
-                } elseif ($meta->type == 'bit') {
-                    $con_val = "= b'"
-                        . self::printableBitValue($row[$i], $meta->length) . "'";
-                } else {
-                    $con_val = '= \''
-                        . $GLOBALS['dbi']->escapeString($row[$i]) . '\'';
-                }
-            }
-
-            if ($con_val != null) {
-
-                $condition .= $con_val . ' AND';
-
-                if ($meta->primary_key > 0) {
-                    $primary_key .= $condition;
-                    $primary_key_array[$con_key] = $con_val;
-                } elseif ($meta->unique_key > 0) {
-                    $unique_key  .= $condition;
-                    $unique_key_array[$con_key] = $con_val;
-                }
-
-                $nonprimary_condition .= $condition;
-                $nonprimary_condition_array[$con_key] = $con_val;
-            }
-        } // end for
-
-        // Correction University of Virginia 19991216:
-        // prefer primary or unique keys for condition,
-        // but use conjunction of all values if no primary key
-        $clause_is_unique = true;
-
-        if ($primary_key) {
-            $preferred_condition = $primary_key;
-            $condition_array = $primary_key_array;
-
-        } elseif ($unique_key) {
-            $preferred_condition = $unique_key;
-            $condition_array = $unique_key_array;
-
-        } elseif (! $force_unique) {
-            $preferred_condition = $nonprimary_condition;
-            $condition_array = $nonprimary_condition_array;
-            $clause_is_unique = false;
-        }
-
-        $where_clause = trim(preg_replace('|\s?AND$|', '', $preferred_condition));
-        return(array($where_clause, $clause_is_unique, $condition_array));
-    } // end function
-
-    /**
-     * Generate a button or image tag
-     *
-     * @param string $button_name  name of button element
-     * @param string $button_class class of button or image element
-     * @param string $image_name   name of image element
-     * @param string $text         text to display
-     * @param string $image        image to display
-     * @param string $value        value
-     *
-     * @return string              html content
-     *
-     * @access  public
-     */
-    public static function getButtonOrImage(
-        $button_name, $button_class, $image_name, $text, $image, $value = ''
-    ) {
-        if ($value == '') {
-            $value = $text;
-        }
-
-        if ($GLOBALS['cfg']['ActionLinksMode'] == 'text') {
-            return ' <input type="submit" name="' . $button_name . '"'
-                . ' value="' . htmlspecialchars($value) . '"'
-                . ' title="' . htmlspecialchars($text) . '" />' . "\n";
-        }
-
-        /* Opera has trouble with <input type="image"> */
-        /* IE (before version 9) has trouble with <button> */
-        if (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER < 9) {
-            return '<input type="image" name="' . $image_name
-                . '" class="' . $button_class
-                . '" value="' . htmlspecialchars($value)
-                . '" title="' . htmlspecialchars($text)
-                . '" src="' . $GLOBALS['pmaThemeImage'] . $image . '" />'
-                . ($GLOBALS['cfg']['ActionLinksMode'] == 'both'
-                    ? '&nbsp;' . htmlspecialchars($text)
-                    : '') . "\n";
-        } else {
-            return '<button class="' . $button_class . '" type="submit"'
-                . ' name="' . $button_name . '" value="' . htmlspecialchars($value)
-                . '" title="' . htmlspecialchars($text) . '">' . "\n"
-                . self::getIcon($image, $text)
-                . '</button>' . "\n";
-        }
-    } // end function
-
-    /**
-     * Generate a pagination selector for browsing resultsets
-     *
-     * @param string $name        The name for the request parameter
-     * @param int    $rows        Number of rows in the pagination set
-     * @param int    $pageNow     current page number
-     * @param int    $nbTotalPage number of total pages
-     * @param int    $showAll     If the number of pages is lower than this
-     *                            variable, no pages will be omitted in pagination
-     * @param int    $sliceStart  How many rows at the beginning should always
-     *                            be shown?
-     * @param int    $sliceEnd    How many rows at the end should always be shown?
-     * @param int    $percent     Percentage of calculation page offsets to hop to a
-     *                            next page
-     * @param int    $range       Near the current page, how many pages should
-     *                            be considered "nearby" and displayed as well?
-     * @param string $prompt      The prompt to display (sometimes empty)
-     *
-     * @return string
-     *
-     * @access  public
-     */
-    public static function pageselector(
-        $name, $rows, $pageNow = 1, $nbTotalPage = 1, $showAll = 200,
-        $sliceStart = 5,
-        $sliceEnd = 5, $percent = 20, $range = 10, $prompt = ''
-    ) {
-        $increment = floor($nbTotalPage / $percent);
-        $pageNowMinusRange = ($pageNow - $range);
-        $pageNowPlusRange = ($pageNow + $range);
-
-        $gotopage = $prompt . ' <select class="pageselector ajax"';
-
-        $gotopage .= ' name="' . $name . '" >';
-        if ($nbTotalPage < $showAll) {
-            $pages = range(1, $nbTotalPage);
-        } else {
-            $pages = array();
-
-            // Always show first X pages
-            for ($i = 1; $i <= $sliceStart; $i++) {
-                $pages[] = $i;
-            }
-
-            // Always show last X pages
-            for ($i = $nbTotalPage - $sliceEnd; $i <= $nbTotalPage; $i++) {
-                $pages[] = $i;
-            }
-
-            // Based on the number of results we add the specified
-            // $percent percentage to each page number,
-            // so that we have a representing page number every now and then to
-            // immediately jump to specific pages.
-            // As soon as we get near our currently chosen page ($pageNow -
-            // $range), every page number will be shown.
-            $i = $sliceStart;
-            $x = $nbTotalPage - $sliceEnd;
-            $met_boundary = false;
-
-            while ($i <= $x) {
-                if ($i >= $pageNowMinusRange && $i <= $pageNowPlusRange) {
-                    // If our pageselector comes near the current page, we use 1
-                    // counter increments
-                    $i++;
-                    $met_boundary = true;
-                } else {
-                    // We add the percentage increment to our current page to
-                    // hop to the next one in range
-                    $i += $increment;
-
-                    // Make sure that we do not cross our boundaries.
-                    if ($i > $pageNowMinusRange && ! $met_boundary) {
-                        $i = $pageNowMinusRange;
-                    }
-                }
-
-                if ($i > 0 && $i <= $x) {
-                    $pages[] = $i;
-                }
-            }
-
-            /*
-            Add page numbers with "geometrically increasing" distances.
-
-            This helps me a lot when navigating through giant tables.
-
-            Test case: table with 2.28 million sets, 76190 pages. Page of interest
-            is between 72376 and 76190.
-            Selecting page 72376.
-            Now, old version enumerated only +/- 10 pages around 72376 and the
-            percentage increment produced steps of about 3000.
-
-            The following code adds page numbers +/- 2,4,8,16,32,64,128,256 etc.
-            around the current page.
-            */
-            $i = $pageNow;
-            $dist = 1;
-            while ($i < $x) {
-                $dist = 2 * $dist;
-                $i = $pageNow + $dist;
-                if ($i > 0 && $i <= $x) {
-                    $pages[] = $i;
-                }
-            }
-
-            $i = $pageNow;
-            $dist = 1;
-            while ($i > 0) {
-                $dist = 2 * $dist;
-                $i = $pageNow - $dist;
-                if ($i > 0 && $i <= $x) {
-                    $pages[] = $i;
-                }
-            }
-
-            // Since because of ellipsing of the current page some numbers may be
-            // double, we unify our array:
-            sort($pages);
-            $pages = array_unique($pages);
-        }
-
-        foreach ($pages as $i) {
-            if ($i == $pageNow) {
-                $selected = 'selected="selected" style="font-weight: bold"';
-            } else {
-                $selected = '';
-            }
-            $gotopage .= '                <option ' . $selected
-                . ' value="' . (($i - 1) * $rows) . '">' . $i . '</option>' . "\n";
-        }
-
-        $gotopage .= ' </select>';
-
-        return $gotopage;
-    } // end function
-
-    /**
-     * Prepare navigation for a list
-     *
-     * @param int      $count       number of elements in the list
-     * @param int      $pos         current position in the list
-     * @param array    $_url_params url parameters
-     * @param string   $script      script name for form target
-     * @param string   $frame       target frame
-     * @param int      $max_count   maximum number of elements to display from
-     *                              the list
-     * @param string   $name        the name for the request parameter
-     * @param string[] $classes     additional classes for the container
-     *
-     * @return string $list_navigator_html the  html content
-     *
-     * @access  public
-     *
-     * @todo    use $pos from $_url_params
-     */
-    public static function getListNavigator(
-        $count, $pos, $_url_params, $script, $frame, $max_count, $name = 'pos',
-        $classes = array()
-    ) {
-
-        $class = $frame == 'frame_navigation' ? ' class="ajax"' : '';
-
-        $list_navigator_html = '';
-
-        if ($max_count < $count) {
-
-            $classes[] = 'pageselector';
-            $list_navigator_html .= '<div class="' . implode(' ', $classes) . '">';
-
-            if ($frame != 'frame_navigation') {
-                $list_navigator_html .= __('Page number:');
-            }
-
-            // Move to the beginning or to the previous page
-            if ($pos > 0) {
-                $caption1 = ''; $caption2 = '';
-                if (self::showIcons('TableNavigationLinksMode')) {
-                    $caption1 .= '&lt;&lt; ';
-                    $caption2 .= '&lt; ';
-                }
-                if (self::showText('TableNavigationLinksMode')) {
-                    $caption1 .= _pgettext('First page', 'Begin');
-                    $caption2 .= _pgettext('Previous page', 'Previous');
-                }
-                $title1 = ' title="' . _pgettext('First page', 'Begin') . '"';
-                $title2 = ' title="' . _pgettext('Previous page', 'Previous') . '"';
-
-                $_url_params[$name] = 0;
-                $list_navigator_html .= '<a' . $class . $title1 . ' href="' . $script
-                    . PMA_URL_getCommon($_url_params) . '">' . $caption1
-                    . '</a>';
-
-                $_url_params[$name] = $pos - $max_count;
-                $list_navigator_html .= ' <a' . $class . $title2
-                    . ' href="' . $script . PMA_URL_getCommon($_url_params) . '">'
-                    . $caption2 . '</a>';
-            }
-
-            $list_navigator_html .= '<form action="' . basename($script)
-                . '" method="post">';
-
-            $list_navigator_html .= PMA_URL_getHiddenInputs($_url_params);
-            $list_navigator_html .= self::pageselector(
-                $name,
-                $max_count,
-                floor(($pos + 1) / $max_count) + 1,
-                ceil($count / $max_count)
-            );
-            $list_navigator_html .= '</form>';
-
-            if ($pos + $max_count < $count) {
-                $caption3 = ''; $caption4 = '';
-                if (self::showText('TableNavigationLinksMode')) {
-                    $caption3 .= _pgettext('Next page', 'Next');
-                    $caption4 .= _pgettext('Last page', 'End');
-                }
-                if (self::showIcons('TableNavigationLinksMode')) {
-                    $caption3 .= ' &gt;';
-                    $caption4 .= ' &gt;&gt;';
-                    if (! self::showText('TableNavigationLinksMode')) {
-
-                    }
-                }
-                $title3 = ' title="' . _pgettext('Next page', 'Next') . '"';
-                $title4 = ' title="' . _pgettext('Last page', 'End') . '"';
-
-                $_url_params[$name] = $pos + $max_count;
-                $list_navigator_html .= '<a' . $class . $title3 . ' href="' . $script
-                    . PMA_URL_getCommon($_url_params) . '" >' . $caption3
-                    . '</a>';
-
-                $_url_params[$name] = floor($count / $max_count) * $max_count;
-                if ($_url_params[$name] == $count) {
-                    $_url_params[$name] = $count - $max_count;
-                }
-
-                $list_navigator_html .= ' <a' . $class . $title4
-                    . ' href="' . $script . PMA_URL_getCommon($_url_params) . '" >'
-                    . $caption4 . '</a>';
-            }
-            $list_navigator_html .= '</div>' . "\n";
-        }
-
-        return $list_navigator_html;
-    }
-
-    /**
-     * replaces %u in given path with current user name
-     *
-     * example:
-     * <code>
-     * $user_dir = userDir('/var/pma_tmp/%u/'); // '/var/pma_tmp/root/'
-     *
-     * </code>
-     *
-     * @param string $dir with wildcard for user
-     *
-     * @return string  per user directory
-     */
-    public static function userDir($dir)
-    {
-        // add trailing slash
-        if (mb_substr($dir, -1) != '/') {
-            $dir .= '/';
-        }
-
-        return str_replace('%u', PMA_securePath($GLOBALS['cfg']['Server']['user']), $dir);
-    }
-
-    /**
-     * returns html code for db link to default db page
-     *
-     * @param string $database database
-     *
-     * @return string  html link to default db page
-     */
-    public static function getDbLink($database = null)
-    {
-        if (! mb_strlen($database)) {
-            if (! mb_strlen($GLOBALS['db'])) {
-                return '';
-            }
-            $database = $GLOBALS['db'];
-        } else {
-            $database = self::unescapeMysqlWildcards($database);
-        }
-
-        return '<a href="'
-            . Util::getScriptNameForOption(
-                $GLOBALS['cfg']['DefaultTabDatabase'], 'database'
-            )
-            . PMA_URL_getCommon(array('db' => $database)) . '" title="'
-            . htmlspecialchars(
-                sprintf(
-                    __('Jump to database "%s".'),
-                    $database
-                )
-            )
-            . '">' . htmlspecialchars($database) . '</a>';
-    }
-
-    /**
-     * Prepare a lightbulb hint explaining a known external bug
-     * that affects a functionality
-     *
-     * @param string $functionality   localized message explaining the func.
-     * @param string $component       'mysql' (eventually, 'php')
-     * @param string $minimum_version of this component
-     * @param string $bugref          bug reference for this component
-     *
-     * @return String
-     */
-    public static function getExternalBug(
-        $functionality, $component, $minimum_version, $bugref
-    ) {
-        $ext_but_html = '';
-        if (($component == 'mysql') && (PMA_MYSQL_INT_VERSION < $minimum_version)) {
-            $ext_but_html .= self::showHint(
-                sprintf(
-                    __('The %s functionality is affected by a known bug, see %s'),
-                    $functionality,
-                    PMA_linkURL('https://bugs.mysql.com/') . $bugref
-                )
-            );
-        }
-        return $ext_but_html;
-    }
-
-    /**
-     * Returns a HTML checkbox
-     *
-     * @param string  $html_field_name the checkbox HTML field
-     * @param string  $label           label for checkbox
-     * @param boolean $checked         is it initially checked?
-     * @param boolean $onclick         should it submit the form on click?
-     * @param string  $html_field_id   id for the checkbox
-     *
-     * @return string                  HTML for the checkbox
-     */
-    public static function getCheckbox(
-        $html_field_name, $label, $checked, $onclick, $html_field_id = ''
-    ) {
-        return '<input type="checkbox" name="' . $html_field_name . '"'
-            . ($html_field_id ? ' id="' . $html_field_id . '"' : '')
-            . ($checked ? ' checked="checked"' : '')
-            . ($onclick ? ' class="autosubmit"' : '') . ' />'
-            . '<label' . ($html_field_id ? ' for="' . $html_field_id . '"' : '')
-            . '>' . $label . '</label>';
-    }
-
-    /**
-     * Generates a set of radio HTML fields
-     *
-     * @param string  $html_field_name the radio HTML field
-     * @param array   $choices         the choices values and labels
-     * @param string  $checked_choice  the choice to check by default
-     * @param boolean $line_break      whether to add HTML line break after a choice
-     * @param boolean $escape_label    whether to use htmlspecialchars() on label
-     * @param string  $class           enclose each choice with a div of this class
-     * @param string  $id_prefix       prefix for the id attribute, name will be
-     *                                 used if this is not supplied
-     *
-     * @return string                  set of html radio fiels
-     */
-    public static function getRadioFields(
-        $html_field_name, $choices, $checked_choice = '',
-        $line_break = true, $escape_label = true, $class = '',
-        $id_prefix = ''
-    ) {
-        $radio_html = '';
-
-        foreach ($choices as $choice_value => $choice_label) {
-
-            if (! empty($class)) {
-                $radio_html .= '<div class="' . $class . '">';
-            }
-
-            if (! $id_prefix) {
-                $id_prefix = $html_field_name;
-            }
-            $html_field_id = $id_prefix . '_' . $choice_value;
-            $radio_html .= '<input type="radio" name="' . $html_field_name . '" id="'
-                        . $html_field_id . '" value="'
-                        . htmlspecialchars($choice_value) . '"';
-
-            if ($choice_value == $checked_choice) {
-                $radio_html .= ' checked="checked"';
-            }
-
-            $radio_html .= ' />' . "\n"
-                        . '<label for="' . $html_field_id . '">'
-                        . ($escape_label
-                        ? htmlspecialchars($choice_label)
-                        : $choice_label)
-                        . '</label>';
-
-            if ($line_break) {
-                $radio_html .= '<br />';
-            }
-
-            if (! empty($class)) {
-                $radio_html .= '</div>';
-            }
-            $radio_html .= "\n";
-        }
-
-        return $radio_html;
-    }
-
-    /**
-     * Generates and returns an HTML dropdown
-     *
-     * @param string $select_name   name for the select element
-     * @param array  $choices       choices values
-     * @param string $active_choice the choice to select by default
-     * @param string $id            id of the select element; can be different in
-     *                              case the dropdown is present more than once
-     *                              on the page
-     * @param string $class         class for the select element
-     * @param string $placeholder   Placeholder for dropdown if nothing else
-     *                              is selected
-     *
-     * @return string               html content
-     *
-     * @todo    support titles
-     */
-    public static function getDropdown(
-        $select_name, $choices, $active_choice, $id, $class = '', $placeholder = null
-    ) {
-        $result = '<select'
-            . ' name="' . htmlspecialchars($select_name) . '"'
-            . ' id="' . htmlspecialchars($id) . '"'
-            . (! empty($class) ? ' class="' . htmlspecialchars($class) . '"' : '')
-            . '>';
-
-        $resultOptions = '';
-        $selected = false;
-
-        foreach ($choices as $one_choice_value => $one_choice_label) {
-            $resultOptions .= '<option value="'
-                . htmlspecialchars($one_choice_value) . '"';
-
-            if ($one_choice_value == $active_choice) {
-                $resultOptions .= ' selected="selected"';
-                $selected = true;
-            }
-            $resultOptions .= '>' . htmlspecialchars($one_choice_label)
-                . '</option>';
-        }
-
-        if (!empty($placeholder)) {
-            $resultOptions = '<option value="" disabled="disabled"'
-                . ( !$selected ? ' selected="selected"' : '' )
-                . '>' . $placeholder . '</option>'
-                . $resultOptions;
-        }
-
-        $result .= $resultOptions
-            . '</select>';
-
-        return $result;
-    }
-
-    /**
-     * Generates a slider effect (jQjuery)
-     * Takes care of generating the initial <div> and the link
-     * controlling the slider; you have to generate the </div> yourself
-     * after the sliding section.
-     *
-     * @param string $id      the id of the <div> on which to apply the effect
-     * @param string $message the message to show as a link
-     *
-     * @return string         html div element
-     *
-     */
-    public static function getDivForSliderEffect($id = '', $message = '')
-    {
-        if ($GLOBALS['cfg']['InitialSlidersState'] == 'disabled') {
-            return '<div' . ($id ? ' id="' . $id . '"' : '') . '>';
-        }
-        /**
-         * Bad hack on the next line. document.write() conflicts with jQuery,
-         * hence, opening the <div> with PHP itself instead of JavaScript.
-         *
-         * @todo find a better solution that uses $.append(), the recommended
-         * method maybe by using an additional param, the id of the div to
-         * append to
-         */
-
-        return '<div'
-             . ($id ? ' id="' . $id . '"' : '')
-            . (($GLOBALS['cfg']['InitialSlidersState'] == 'closed')
-                ? ' style="display: none; overflow:auto;"'
-                : '')
-            . ' class="pma_auto_slider"'
-            . ($message ? ' title="' . htmlspecialchars($message) . '"' : '')
-            . '>';
-    }
-
-    /**
-     * Creates an AJAX sliding toggle button
-     * (or and equivalent form when AJAX is disabled)
-     *
-     * @param string $action      The URL for the request to be executed
-     * @param string $select_name The name for the dropdown box
-     * @param array  $options     An array of options (see rte_footer.lib.php)
-     * @param string $callback    A JS snippet to execute when the request is
-     *                            successfully processed
-     *
-     * @return string   HTML code for the toggle button
-     */
-    public static function toggleButton($action, $select_name, $options, $callback)
-    {
-        // Do the logic first
-        $link = "$action&amp;" . urlencode($select_name) . "=";
-        $link_on = $link . urlencode($options[1]['value']);
-        $link_off = $link . urlencode($options[0]['value']);
-
-        if ($options[1]['selected'] == true) {
-            $state = 'on';
-        } else if ($options[0]['selected'] == true) {
-            $state = 'off';
-        } else {
-            $state = 'on';
-        }
-
-        // Generate output
-        return "<!-- TOGGLE START -->\n"
-            . "<div class='wrapper toggleAjax hide'>\n"
-            . "    <div class='toggleButton'>\n"
-            . "        <div title='" . __('Click to toggle')
-            . "' class='container $state'>\n"
-            . "           <img src='" . htmlspecialchars($GLOBALS['pmaThemeImage'])
-            . "toggle-" . htmlspecialchars($GLOBALS['text_dir']) . ".png'\n"
-            . "                 alt='' />\n"
-            . "            <table class='nospacing nopadding'>\n"
-            . "                <tbody>\n"
-            . "                <tr>\n"
-            . "                <td class='toggleOn'>\n"
-            . "                    <span class='hide'>$link_on</span>\n"
-            . "                    <div>"
-            . str_replace(' ', '&nbsp;', htmlspecialchars($options[1]['label']))
-            . "\n" . "                    </div>\n"
-            . "                </td>\n"
-            . "                <td><div>&nbsp;</div></td>\n"
-            . "                <td class='toggleOff'>\n"
-            . "                    <span class='hide'>$link_off</span>\n"
-            . "                    <div>"
-            . str_replace(' ', '&nbsp;', htmlspecialchars($options[0]['label']))
-            . "\n" . "                    </div>\n"
-            . "                </tr>\n"
-            . "                </tbody>\n"
-            . "            </table>\n"
-            . "            <span class='hide callback'>"
-            . htmlspecialchars($callback) . "</span>\n"
-            . "            <span class='hide text_direction'>"
-            . htmlspecialchars($GLOBALS['text_dir']) . "</span>\n"
-            . "        </div>\n"
-            . "    </div>\n"
-            . "</div>\n"
-            . "<!-- TOGGLE END -->";
-
-    } // end toggleButton()
-
-    /**
-     * Clears cache content which needs to be refreshed on user change.
-     *
-     * @return void
-     */
-    public static function clearUserCache()
-    {
-        self::cacheUnset('is_superuser');
-        self::cacheUnset('is_createuser');
-        self::cacheUnset('is_grantuser');
-    }
-
-    /**
-     * Verifies if something is cached in the session
-     *
-     * @param string $var variable name
-     *
-     * @return boolean
-     */
-    public static function cacheExists($var)
-    {
-        return isset($_SESSION['cache']['server_' . $GLOBALS['server']][$var]);
-    }
-
-    /**
-     * Gets cached information from the session
-     *
-     * @param string   $var      variable name
-     * @param \Closure $callback callback to fetch the value
-     *
-     * @return mixed
-     */
-    public static function cacheGet($var, $callback = null)
-    {
-        if (self::cacheExists($var)) {
-            return $_SESSION['cache']['server_' . $GLOBALS['server']][$var];
-        } else {
-            if ($callback) {
-                $val = $callback();
-                self::cacheSet($var, $val);
-                return $val;
-            }
-            return null;
-        }
-    }
-
-    /**
-     * Caches information in the session
-     *
-     * @param string $var variable name
-     * @param mixed  $val value
-     *
-     * @return mixed
-     */
-    public static function cacheSet($var, $val = null)
-    {
-        $_SESSION['cache']['server_' . $GLOBALS['server']][$var] = $val;
-    }
-
-    /**
-     * Removes cached information from the session
-     *
-     * @param string $var variable name
-     *
-     * @return void
-     */
-    public static function cacheUnset($var)
-    {
-        unset($_SESSION['cache']['server_' . $GLOBALS['server']][$var]);
-    }
-
-    /**
-     * Converts a bit value to printable format;
-     * in MySQL a BIT field can be from 1 to 64 bits so we need this
-     * function because in PHP, decbin() supports only 32 bits
-     * on 32-bit servers
-     *
-     * @param integer $value  coming from a BIT field
-     * @param integer $length length
-     *
-     * @return string  the printable value
-     */
-    public static function printableBitValue($value, $length)
-    {
-        // if running on a 64-bit server or the length is safe for decbin()
-        if (PHP_INT_SIZE == 8 || $length < 33) {
-            $printable = decbin($value);
-        } else {
-            // FIXME: does not work for the leftmost bit of a 64-bit value
-            $i = 0;
-            $printable = '';
-            while ($value >= pow(2, $i)) {
-                ++$i;
-            }
-            if ($i != 0) {
-                --$i;
-            }
-
-            while ($i >= 0) {
-                if ($value - pow(2, $i) < 0) {
-                    $printable = '0' . $printable;
-                } else {
-                    $printable = '1' . $printable;
-                    $value = $value - pow(2, $i);
-                }
-                --$i;
-            }
-            $printable = strrev($printable);
-        }
-        $printable = str_pad($printable, $length, '0', STR_PAD_LEFT);
-        return $printable;
-    }
-
-    /**
-     * Verifies whether the value contains a non-printable character
-     *
-     * @param string $value value
-     *
-     * @return integer
-     */
-    public static function containsNonPrintableAscii($value)
-    {
-        return preg_match('@[^[:print:]]@', $value);
-    }
-
-    /**
-     * Converts a BIT type default value
-     * for example, b'010' becomes 010
-     *
-     * @param string $bit_default_value value
-     *
-     * @return string the converted value
-     */
-    public static function convertBitDefaultValue($bit_default_value)
-    {
-        return rtrim(ltrim($bit_default_value, "b'"), "'");
-    }
-
-    /**
-     * Extracts the various parts from a column spec
-     *
-     * @param string $columnspec Column specification
-     *
-     * @return array associative array containing type, spec_in_brackets
-     *          and possibly enum_set_values (another array)
-     */
-    public static function extractColumnSpec($columnspec)
-    {
-        $first_bracket_pos = mb_strpos($columnspec, '(');
-        if ($first_bracket_pos) {
-            $spec_in_brackets = chop(
-                mb_substr(
-                    $columnspec,
-                    $first_bracket_pos + 1,
-                    mb_strrpos($columnspec, ')') - $first_bracket_pos - 1
-                )
-            );
-            // convert to lowercase just to be sure
-            $type = mb_strtolower(
-                chop(mb_substr($columnspec, 0, $first_bracket_pos))
-            );
-        } else {
-            // Split trailing attributes such as unsigned,
-            // binary, zerofill and get data type name
-            $type_parts = explode(' ', $columnspec);
-            $type = mb_strtolower($type_parts[0]);
-            $spec_in_brackets = '';
-        }
-
-        if ('enum' == $type || 'set' == $type) {
-            // Define our working vars
-            $enum_set_values = self::parseEnumSetValues($columnspec, false);
-            $printtype = $type
-                . '(' .  str_replace("','", "', '", $spec_in_brackets) . ')';
-            $binary = false;
-            $unsigned = false;
-            $zerofill = false;
-        } else {
-            $enum_set_values = array();
-
-            /* Create printable type name */
-            $printtype = mb_strtolower($columnspec);
-
-            // Strip the "BINARY" attribute, except if we find "BINARY(" because
-            // this would be a BINARY or VARBINARY column type;
-            // by the way, a BLOB should not show the BINARY attribute
-            // because this is not accepted in MySQL syntax.
-            if (preg_match('@binary@', $printtype)
-                && ! preg_match('@binary[\(]@', $printtype)
-            ) {
-                $printtype = preg_replace('@binary@', '', $printtype);
-                $binary = true;
-            } else {
-                $binary = false;
-            }
-
-            $printtype = preg_replace(
-                '@zerofill@', '', $printtype, -1, $zerofill_cnt
-            );
-            $zerofill = ($zerofill_cnt > 0);
-            $printtype = preg_replace(
-                '@unsigned@', '', $printtype, -1, $unsigned_cnt
-            );
-            $unsigned = ($unsigned_cnt > 0);
-            $printtype = trim($printtype);
-        }
-
-        $attribute     = ' ';
-        if ($binary) {
-            $attribute = 'BINARY';
-        }
-        if ($unsigned) {
-            $attribute = 'UNSIGNED';
-        }
-        if ($zerofill) {
-            $attribute = 'UNSIGNED ZEROFILL';
-        }
-
-        $can_contain_collation = false;
-        if (! $binary
-            && preg_match(
-                "@^(char|varchar|text|tinytext|mediumtext|longtext|set|enum)@", $type
-            )
-        ) {
-            $can_contain_collation = true;
-        }
-
-        // for the case ENUM('&#8211;','&ldquo;')
-        $displayed_type = htmlspecialchars($printtype);
-        if (mb_strlen($printtype) > $GLOBALS['cfg']['LimitChars']) {
-            $displayed_type  = '<abbr title="' . htmlspecialchars($printtype) . '">';
-            $displayed_type .= htmlspecialchars(
-                mb_substr(
-                    $printtype, 0, $GLOBALS['cfg']['LimitChars']
-                ) . '...'
-            );
-            $displayed_type .= '</abbr>';
-        }
-
-        return array(
-            'type' => $type,
-            'spec_in_brackets' => $spec_in_brackets,
-            'enum_set_values'  => $enum_set_values,
-            'print_type' => $printtype,
-            'binary' => $binary,
-            'unsigned' => $unsigned,
-            'zerofill' => $zerofill,
-            'attribute' => $attribute,
-            'can_contain_collation' => $can_contain_collation,
-            'displayed_type' => $displayed_type
-        );
-    }
-
-    /**
-     * Verifies if this table's engine supports foreign keys
-     *
-     * @param string $engine engine
-     *
-     * @return boolean
-     */
-    public static function isForeignKeySupported($engine)
-    {
-        $engine = strtoupper($engine);
-        if (($engine == 'INNODB') || ($engine == 'PBXT')) {
-            return true;
-        } elseif ($engine == 'NDBCLUSTER' || $engine == 'NDB') {
-            $ndbver = strtolower(
-                $GLOBALS['dbi']->fetchValue("SELECT @@ndb_version_string")
-            );
-            if (substr($ndbver, 0, 4) == 'ndb-') {
-                $ndbver = substr($ndbver, 4);
-            }
-            return version_compare($ndbver, 7.3, '>=');
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Is Foreign key check enabled?
-     *
-     * @return bool
-     */
-    public static function isForeignKeyCheck()
-    {
-        if ($GLOBALS['cfg']['DefaultForeignKeyChecks'] === 'enable') {
-            return true;
-        } else if ($GLOBALS['cfg']['DefaultForeignKeyChecks'] === 'disable') {
-            return false;
-        }
-        return ($GLOBALS['dbi']->getVariable('FOREIGN_KEY_CHECKS') == 'ON');
-    }
-
-    /**
-    * Get HTML for Foreign key check checkbox
-    *
-    * @return string HTML for checkbox
-    */
-    public static function getFKCheckbox()
-    {
-        $checked = self::isForeignKeyCheck();
-        $html = '<input type="hidden" name="fk_checks" value="0" />';
-        $html .= '<input type="checkbox" name="fk_checks"'
-            . ' id="fk_checks" value="1"'
-            . ($checked ? ' checked="checked"' : '') . '/>';
-        $html .= '<label for="fk_checks">' . __('Enable foreign key checks')
-            . '</label>';
-        return $html;
-    }
-
-    /**
-     * Handle foreign key check request
-     *
-     * @return bool Default foreign key checks value
-     */
-    public static function handleDisableFKCheckInit()
-    {
-        $default_fk_check_value
-            = $GLOBALS['dbi']->getVariable('FOREIGN_KEY_CHECKS') == 'ON';
-        if (isset($_REQUEST['fk_checks'])) {
-            if (empty($_REQUEST['fk_checks'])) {
-                // Disable foreign key checks
-                $GLOBALS['dbi']->setVariable('FOREIGN_KEY_CHECKS', 'OFF');
-            } else {
-                // Enable foreign key checks
-                $GLOBALS['dbi']->setVariable('FOREIGN_KEY_CHECKS', 'ON');
-            }
-        } // else do nothing, go with default
-        return $default_fk_check_value;
-    }
-
-    /**
-     * Cleanup changes done for foreign key check
-     *
-     * @param bool $default_fk_check_value original value for 'FOREIGN_KEY_CHECKS'
-     *
-     * @return void
-     */
-    public static function handleDisableFKCheckCleanup($default_fk_check_value)
-    {
-        $GLOBALS['dbi']->setVariable(
-            'FOREIGN_KEY_CHECKS', $default_fk_check_value ? 'ON' : 'OFF'
-        );
-    }
-
-    /**
-     * Replaces some characters by a displayable equivalent
-     *
-     * @param string $content content
-     *
-     * @return string the content with characters replaced
-     */
-    public static function replaceBinaryContents($content)
-    {
-        $result = str_replace("\x00", '\0', $content);
-        $result = str_replace("\x08", '\b', $result);
-        $result = str_replace("\x0a", '\n', $result);
-        $result = str_replace("\x0d", '\r', $result);
-        $result = str_replace("\x1a", '\Z', $result);
-        return $result;
-    }
-
-    /**
-     * Converts GIS data to Well Known Text format
-     *
-     * @param string $data        GIS data
-     * @param bool   $includeSRID Add SRID to the WKT
-     *
-     * @return string GIS data in Well Know Text format
-     */
-    public static function asWKT($data, $includeSRID = false)
-    {
-        // Convert to WKT format
-        $hex = bin2hex($data);
-        $wktsql     = "SELECT ASTEXT(x'" . $hex . "')";
-        if ($includeSRID) {
-            $wktsql .= ", SRID(x'" . $hex . "')";
-        }
-
-        $wktresult  = $GLOBALS['dbi']->tryQuery(
-            $wktsql, null, DatabaseInterface::QUERY_STORE
-        );
-        $wktarr     = $GLOBALS['dbi']->fetchRow($wktresult, 0);
-        $wktval     = $wktarr[0];
-
-        if ($includeSRID) {
-            $srid = $wktarr[1];
-            $wktval = "'" . $wktval . "'," . $srid;
-        }
-        @$GLOBALS['dbi']->freeResult($wktresult);
-
-        return $wktval;
-    }
-
-    /**
-     * If the string starts with a \r\n pair (0x0d0a) add an extra \n
-     *
-     * @param string $string string
-     *
-     * @return string with the chars replaced
-     */
-    public static function duplicateFirstNewline($string)
-    {
-        $first_occurence = mb_strpos($string, "\r\n");
-        if ($first_occurence === 0) {
-            $string = "\n" . $string;
-        }
-        return $string;
-    }
-
-    /**
-     * Get the action word corresponding to a script name
-     * in order to display it as a title in navigation panel
-     *
-     * @param string $target a valid value for $cfg['NavigationTreeDefaultTabTable'],
-     *                       $cfg['NavigationTreeDefaultTabTable2'],
-     *                       $cfg['DefaultTabTable'] or $cfg['DefaultTabDatabase']
-     *
-     * @return string Title for the $cfg value
-     */
-    public static function getTitleForTarget($target)
-    {
-        $mapping = array(
-            'structure' =>  __('Structure'),
-            'sql' => __('SQL'),
-            'search' =>__('Search'),
-            'insert' =>__('Insert'),
-            'browse' => __('Browse'),
-            'operations' => __('Operations'),
-
-            // For backward compatiblity
-
-            // Values for $cfg['DefaultTabTable']
-            'tbl_structure.php' =>  __('Structure'),
-            'tbl_sql.php' => __('SQL'),
-            'tbl_select.php' =>__('Search'),
-            'tbl_change.php' =>__('Insert'),
-            'sql.php' => __('Browse'),
-            // Values for $cfg['DefaultTabDatabase']
-            'db_structure.php' => __('Structure'),
-            'db_sql.php' => __('SQL'),
-            'db_search.php' => __('Search'),
-            'db_operations.php' => __('Operations'),
-        );
-        return isset($mapping[$target]) ? $mapping[$target] : false;
-    }
-
-    /**
-     * Get the script name corresponding to a plain English config word
-     * in order to append in links on navigation and main panel
-     *
-     * @param string $target   a valid value for
-     *                         $cfg['NavigationTreeDefaultTabTable'],
-     *                         $cfg['NavigationTreeDefaultTabTable2'],
-     *                         $cfg['DefaultTabTable'], $cfg['DefaultTabDatabase'] or
-     *                         $cfg['DefaultTabServer']
-     * @param string $location one out of 'server', 'table', 'database'
-     *
-     * @return string script name corresponding to the config word
-     */
-    public static function getScriptNameForOption($target, $location)
-    {
-        if ($location == 'server') {
-            // Values for $cfg['DefaultTabServer']
-            switch ($target) {
-            case 'welcome':
-                return 'index.php';
-            case 'databases':
-                return 'server_databases.php';
-            case 'status':
-                return 'server_status.php';
-            case 'variables':
-                return 'server_variables.php';
-            case 'privileges':
-                return 'server_privileges.php';
-            }
-        } elseif ($location == 'database') {
-            // Values for $cfg['DefaultTabDatabase']
-            switch ($target) {
-            case 'structure':
-                return 'db_structure.php';
-            case 'sql':
-                return 'db_sql.php';
-            case 'search':
-                return 'db_search.php';
-            case 'operations':
-                return 'db_operations.php';
-            }
-        } elseif ($location == 'table') {
-            // Values for $cfg['DefaultTabTable'],
-            // $cfg['NavigationTreeDefaultTabTable'] and
-            // $cfg['NavigationTreeDefaultTabTable2']
-            switch ($target) {
-            case 'structure':
-                return 'tbl_structure.php';
-            case 'sql':
-                return 'tbl_sql.php';
-            case 'search':
-                return 'tbl_select.php';
-            case 'insert':
-                return 'tbl_change.php';
-            case 'browse':
-                return 'sql.php';
-            }
-        }
-
-        return $target;
-    }
-
-    /**
-     * Formats user string, expanding @VARIABLES@, accepting strftime format
-     * string.
-     *
-     * @param string       $string  Text where to do expansion.
-     * @param array|string $escape  Function to call for escaping variable values.
-     *                          Can also be an array of:
-     *                          - the escape method name
-     *                          - the class that contains the method
-     *                          - location of the class (for inclusion)
-     * @param array        $updates Array with overrides for default parameters
-     *                     (obtained from GLOBALS).
-     *
-     * @return string
-     */
-    public static function expandUserString(
-        $string, $escape = null, $updates = array()
-    ) {
-        /* Content */
-        $vars = array();
-        $vars['http_host'] = PMA_getenv('HTTP_HOST');
-        $vars['server_name'] = $GLOBALS['cfg']['Server']['host'];
-        $vars['server_verbose'] = $GLOBALS['cfg']['Server']['verbose'];
-
-        if (empty($GLOBALS['cfg']['Server']['verbose'])) {
-            $vars['server_verbose_or_name'] = $GLOBALS['cfg']['Server']['host'];
-        } else {
-            $vars['server_verbose_or_name'] = $GLOBALS['cfg']['Server']['verbose'];
-        }
-
-        $vars['database'] = $GLOBALS['db'];
-        $vars['table'] = $GLOBALS['table'];
-        $vars['phpmyadmin_version'] = 'phpMyAdmin ' . PMA_VERSION;
-
-        /* Update forced variables */
-        foreach ($updates as $key => $val) {
-            $vars[$key] = $val;
-        }
-
-        /* Replacement mapping */
-        /*
-         * The __VAR__ ones are for backward compatibility, because user
-         * might still have it in cookies.
-         */
-        $replace = array(
-            '@HTTP_HOST@' => $vars['http_host'],
-            '@SERVER@' => $vars['server_name'],
-            '__SERVER__' => $vars['server_name'],
-            '@VERBOSE@' => $vars['server_verbose'],
-            '@VSERVER@' => $vars['server_verbose_or_name'],
-            '@DATABASE@' => $vars['database'],
-            '__DB__' => $vars['database'],
-            '@TABLE@' => $vars['table'],
-            '__TABLE__' => $vars['table'],
-            '@PHPMYADMIN@' => $vars['phpmyadmin_version'],
-            );
-
-        /* Optional escaping */
-        if (! is_null($escape)) {
-            if (is_array($escape)) {
-                $escape_class = new $escape[1];
-                $escape_method = $escape[0];
-            }
-            foreach ($replace as $key => $val) {
-                if (is_array($escape)) {
-                    $replace[$key] = $escape_class->$escape_method($val);
-                } else {
-                    $replace[$key] = ($escape == 'backquote')
-                        ? self::$escape($val)
-                        : $escape($val);
-                }
-            }
-        }
-
-        /* Backward compatibility in 3.5.x */
-        if (mb_strpos($string, '@FIELDS@') !== false) {
-            $string = strtr($string, array('@FIELDS@' => '@COLUMNS@'));
-        }
-
-        /* Fetch columns list if required */
-        if (mb_strpos($string, '@COLUMNS@') !== false) {
-            $columns_list = $GLOBALS['dbi']->getColumns(
-                $GLOBALS['db'], $GLOBALS['table']
-            );
-
-            // sometimes the table no longer exists at this point
-            if (! is_null($columns_list)) {
-                $column_names = array();
-                foreach ($columns_list as $column) {
-                    if (! is_null($escape)) {
-                        $column_names[] = self::$escape($column['Field']);
-                    } else {
-                        $column_names[] = $column['Field'];
-                    }
-                }
-                $replace['@COLUMNS@'] = implode(',', $column_names);
-            } else {
-                $replace['@COLUMNS@'] = '*';
-            }
-        }
-
-        /* Do the replacement */
-        return strtr(strftime($string), $replace);
-    }
-
-    /**
-     * Prepare the form used to browse anywhere on the local server for a file to
-     * import
-     *
-     * @param string $max_upload_size maximum upload size
-     *
-     * @return String
-     */
-    public static function getBrowseUploadFileBlock($max_upload_size)
-    {
-        $block_html = '';
-
-        if ($GLOBALS['is_upload'] && ! empty($GLOBALS['cfg']['UploadDir'])) {
-            $block_html .= '<label for="radio_import_file">';
-        } else {
-            $block_html .= '<label for="input_import_file">';
-        }
-
-        $block_html .= __("Browse your computer:") . '</label>'
-            . '<div id="upload_form_status" style="display: none;"></div>'
-            . '<div id="upload_form_status_info" style="display: none;"></div>'
-            . '<input type="file" name="import_file" id="input_import_file" />'
-            . self::getFormattedMaximumUploadSize($max_upload_size) . "\n"
-            // some browsers should respect this :)
-            . self::generateHiddenMaxFileSize($max_upload_size) . "\n";
-
-        return $block_html;
-    }
-
-    /**
-     * Prepare the form used to select a file to import from the server upload
-     * directory
-     *
-     * @param ImportPlugin[] $import_list array of import plugins
-     * @param string         $uploaddir   upload directory
-     *
-     * @return String
-     */
-    public static function getSelectUploadFileBlock($import_list, $uploaddir)
-    {
-        $block_html = '';
-        $block_html .= '<label for="radio_local_import_file">'
-            . sprintf(
-                __("Select from the web server upload directory <b>%s</b>:"),
-                htmlspecialchars(self::userDir($uploaddir))
-            )
-            . '</label>';
-
-        $extensions = '';
-        foreach ($import_list as $import_plugin) {
-            if (! empty($extensions)) {
-                $extensions .= '|';
-            }
-            $extensions .= $import_plugin->getProperties()->getExtension();
-        }
-
-        $matcher = '@\.(' . $extensions . ')(\.('
-            . PMA_supportedDecompressions() . '))?$@';
-
-        $active = (isset($GLOBALS['timeout_passed']) && $GLOBALS['timeout_passed']
-            && isset($GLOBALS['local_import_file']))
-            ? $GLOBALS['local_import_file']
-            : '';
-
-        $files = PMA_getFileSelectOptions(
-            self::userDir($uploaddir),
-            $matcher,
-            $active
-        );
-
-        if ($files === false) {
-            Message::error(
-                __('The directory you set for upload work cannot be reached.')
-            )->display();
-        } elseif (! empty($files)) {
-            $block_html .= "\n"
-                . '    <select style="margin: 5px" size="1" '
-                . 'name="local_import_file" '
-                . 'id="select_local_import_file">' . "\n"
-                . '        <option value="">&nbsp;</option>' . "\n"
-                . $files
-                . '    </select>' . "\n";
-        } elseif (empty($files)) {
-            $block_html .= '<i>' . __('There are no files to upload!') . '</i>';
-        }
-
-        return $block_html;
-
-    }
-
-    /**
-     * Build titles and icons for action links
-     *
-     * @return array   the action titles
-     */
-    public static function buildActionTitles()
-    {
-        $titles = array();
-
-        $titles['Browse']     = self::getIcon('b_browse.png', __('Browse'));
-        $titles['NoBrowse']   = self::getIcon('bd_browse.png', __('Browse'));
-        $titles['Search']     = self::getIcon('b_select.png', __('Search'));
-        $titles['NoSearch']   = self::getIcon('bd_select.png', __('Search'));
-        $titles['Insert']     = self::getIcon('b_insrow.png', __('Insert'));
-        $titles['NoInsert']   = self::getIcon('bd_insrow.png', __('Insert'));
-        $titles['Structure']  = self::getIcon('b_props.png', __('Structure'));
-        $titles['Drop']       = self::getIcon('b_drop.png', __('Drop'));
-        $titles['NoDrop']     = self::getIcon('bd_drop.png', __('Drop'));
-        $titles['Empty']      = self::getIcon('b_empty.png', __('Empty'));
-        $titles['NoEmpty']    = self::getIcon('bd_empty.png', __('Empty'));
-        $titles['Edit']       = self::getIcon('b_edit.png', __('Edit'));
-        $titles['NoEdit']     = self::getIcon('bd_edit.png', __('Edit'));
-        $titles['Export']     = self::getIcon('b_export.png', __('Export'));
-        $titles['NoExport']   = self::getIcon('bd_export.png', __('Export'));
-        $titles['Execute']    = self::getIcon('b_nextpage.png', __('Execute'));
-        $titles['NoExecute']  = self::getIcon('bd_nextpage.png', __('Execute'));
-        // For Favorite/NoFavorite, we need icon only.
-        $titles['Favorite']  = self::getIcon('b_favorite.png', '');
-        $titles['NoFavorite']= self::getIcon('b_no_favorite.png', '');
-
-        return $titles;
-    }
-
-    /**
-     * This function processes the datatypes supported by the DB,
-     * as specified in Types->getColumns() and either returns an array
-     * (useful for quickly checking if a datatype is supported)
-     * or an HTML snippet that creates a drop-down list.
-     *
-     * @param bool   $html     Whether to generate an html snippet or an array
-     * @param string $selected The value to mark as selected in HTML mode
-     *
-     * @return mixed   An HTML snippet or an array of datatypes.
-     *
-     */
-    public static function getSupportedDatatypes($html = false, $selected = '')
-    {
-        if ($html) {
-
-            // NOTE: the SELECT tag in not included in this snippet.
-            $retval = '';
-
-            foreach ($GLOBALS['PMA_Types']->getColumns() as $key => $value) {
-                if (is_array($value)) {
-                    $retval .= "<optgroup label='" . htmlspecialchars($key) . "'>";
-                    foreach ($value as $subvalue) {
-                        if ($subvalue == $selected) {
-                            $retval .= sprintf(
-                                '<option selected="selected" title="%s">%s</option>',
-                                $GLOBALS['PMA_Types']->getTypeDescription($subvalue),
-                                $subvalue
-                            );
-                        } else if ($subvalue === '-') {
-                            $retval .= '<option disabled="disabled">';
-                            $retval .= $subvalue;
-                            $retval .= '</option>';
-                        } else {
-                            $retval .= sprintf(
-                                '<option title="%s">%s</option>',
-                                $GLOBALS['PMA_Types']->getTypeDescription($subvalue),
-                                $subvalue
-                            );
-                        }
-                    }
-                    $retval .= '</optgroup>';
-                } else {
-                    if ($selected == $value) {
-                        $retval .= sprintf(
-                            '<option selected="selected" title="%s">%s</option>',
-                            $GLOBALS['PMA_Types']->getTypeDescription($value),
-                            $value
-                        );
-                    } else {
-                        $retval .= sprintf(
-                            '<option title="%s">%s</option>',
-                            $GLOBALS['PMA_Types']->getTypeDescription($value),
-                            $value
-                        );
-                    }
-                }
-            }
-        } else {
-            $retval = array();
-            foreach ($GLOBALS['PMA_Types']->getColumns() as $value) {
-                if (is_array($value)) {
-                    foreach ($value as $subvalue) {
-                        if ($subvalue !== '-') {
-                            $retval[] = $subvalue;
-                        }
-                    }
-                } else {
-                    if ($value !== '-') {
-                        $retval[] = $value;
-                    }
-                }
-            }
-        }
-
-        return $retval;
-    } // end getSupportedDatatypes()
-
-    /**
-     * Returns a list of datatypes that are not (yet) handled by PMA.
-     * Used by: tbl_change.php and libraries/db_routines.inc.php
-     *
-     * @return array   list of datatypes
-     */
-    public static function unsupportedDatatypes()
-    {
-        $no_support_types = array();
-        return $no_support_types;
-    }
-
-    /**
-     * Return GIS data types
-     *
-     * @param bool $upper_case whether to return values in upper case
-     *
-     * @return string[] GIS data types
-     */
-    public static function getGISDatatypes($upper_case = false)
-    {
-        $gis_data_types = array(
-            'geometry',
-            'point',
-            'linestring',
-            'polygon',
-            'multipoint',
-            'multilinestring',
-            'multipolygon',
-            'geometrycollection'
-        );
-        if ($upper_case) {
-            for ($i = 0, $nb = count($gis_data_types); $i < $nb; $i++) {
-                $gis_data_types[$i]
-                    = mb_strtoupper($gis_data_types[$i]);
-            }
-        }
-        return $gis_data_types;
-    }
-
-    /**
-     * Generates GIS data based on the string passed.
-     *
-     * @param string $gis_string GIS string
-     *
-     * @return string GIS data enclosed in 'GeomFromText' function
-     */
-    public static function createGISData($gis_string)
-    {
-        $gis_string = trim($gis_string);
-        $geom_types = '(POINT|MULTIPOINT|LINESTRING|MULTILINESTRING|'
-            . 'POLYGON|MULTIPOLYGON|GEOMETRYCOLLECTION)';
-        if (preg_match("/^'" . $geom_types . "\(.*\)',[0-9]*$/i", $gis_string)) {
-            return 'GeomFromText(' . $gis_string . ')';
-        } elseif (preg_match("/^" . $geom_types . "\(.*\)$/i", $gis_string)) {
-            return "GeomFromText('" . $gis_string . "')";
-        } else {
-            return $gis_string;
-        }
-    }
-
-    /**
-     * Returns the names and details of the functions
-     * that can be applied on geometry data types.
-     *
-     * @param string $geom_type if provided the output is limited to the functions
-     *                          that are applicable to the provided geometry type.
-     * @param bool   $binary    if set to false functions that take two geometries
-     *                          as arguments will not be included.
-     * @param bool   $display   if set to true separators will be added to the
-     *                          output array.
-     *
-     * @return array names and details of the functions that can be applied on
-     *               geometry data types.
-     */
-    public static function getGISFunctions(
-        $geom_type = null, $binary = true, $display = false
-    ) {
-        $funcs = array();
-        if ($display) {
-            $funcs[] = array('display' => ' ');
-        }
-
-        // Unary functions common to all geometry types
-        $funcs['Dimension']    = array('params' => 1, 'type' => 'int');
-        $funcs['Envelope']     = array('params' => 1, 'type' => 'Polygon');
-        $funcs['GeometryType'] = array('params' => 1, 'type' => 'text');
-        $funcs['SRID']         = array('params' => 1, 'type' => 'int');
-        $funcs['IsEmpty']      = array('params' => 1, 'type' => 'int');
-        $funcs['IsSimple']     = array('params' => 1, 'type' => 'int');
-
-        $geom_type = trim(mb_strtolower($geom_type));
-        if ($display && $geom_type != 'geometry' && $geom_type != 'multipoint') {
-            $funcs[] = array('display' => '--------');
-        }
-
-        // Unary functions that are specific to each geometry type
-        if ($geom_type == 'point') {
-            $funcs['X'] = array('params' => 1, 'type' => 'float');
-            $funcs['Y'] = array('params' => 1, 'type' => 'float');
-
-        } elseif ($geom_type == 'multipoint') {
-            // no functions here
-        } elseif ($geom_type == 'linestring') {
-            $funcs['EndPoint']   = array('params' => 1, 'type' => 'point');
-            $funcs['GLength']    = array('params' => 1, 'type' => 'float');
-            $funcs['NumPoints']  = array('params' => 1, 'type' => 'int');
-            $funcs['StartPoint'] = array('params' => 1, 'type' => 'point');
-            $funcs['IsRing']     = array('params' => 1, 'type' => 'int');
-
-        } elseif ($geom_type == 'multilinestring') {
-            $funcs['GLength']  = array('params' => 1, 'type' => 'float');
-            $funcs['IsClosed'] = array('params' => 1, 'type' => 'int');
-
-        } elseif ($geom_type == 'polygon') {
-            $funcs['Area']         = array('params' => 1, 'type' => 'float');
-            $funcs['ExteriorRing'] = array('params' => 1, 'type' => 'linestring');
-            $funcs['NumInteriorRings'] = array('params' => 1, 'type' => 'int');
-
-        } elseif ($geom_type == 'multipolygon') {
-            $funcs['Area']     = array('params' => 1, 'type' => 'float');
-            $funcs['Centroid'] = array('params' => 1, 'type' => 'point');
-            // Not yet implemented in MySQL
-            //$funcs['PointOnSurface'] = array('params' => 1, 'type' => 'point');
-
-        } elseif ($geom_type == 'geometrycollection') {
-            $funcs['NumGeometries'] = array('params' => 1, 'type' => 'int');
-        }
-
-        // If we are asked for binary functions as well
-        if ($binary) {
-            // section separator
-            if ($display) {
-                $funcs[] = array('display' => '--------');
-            }
-
-            if (PMA_MYSQL_INT_VERSION < 50601) {
-                $funcs['Crosses']    = array('params' => 2, 'type' => 'int');
-                $funcs['Contains']   = array('params' => 2, 'type' => 'int');
-                $funcs['Disjoint']   = array('params' => 2, 'type' => 'int');
-                $funcs['Equals']     = array('params' => 2, 'type' => 'int');
-                $funcs['Intersects'] = array('params' => 2, 'type' => 'int');
-                $funcs['Overlaps']   = array('params' => 2, 'type' => 'int');
-                $funcs['Touches']    = array('params' => 2, 'type' => 'int');
-                $funcs['Within']     = array('params' => 2, 'type' => 'int');
-            } else {
-                // If MySQl version is greater than or equal 5.6.1,
-                // use the ST_ prefix.
-                $funcs['ST_Crosses']    = array('params' => 2, 'type' => 'int');
-                $funcs['ST_Contains']   = array('params' => 2, 'type' => 'int');
-                $funcs['ST_Disjoint']   = array('params' => 2, 'type' => 'int');
-                $funcs['ST_Equals']     = array('params' => 2, 'type' => 'int');
-                $funcs['ST_Intersects'] = array('params' => 2, 'type' => 'int');
-                $funcs['ST_Overlaps']   = array('params' => 2, 'type' => 'int');
-                $funcs['ST_Touches']    = array('params' => 2, 'type' => 'int');
-                $funcs['ST_Within']     = array('params' => 2, 'type' => 'int');
-            }
-
-            if ($display) {
-                $funcs[] = array('display' => '--------');
-            }
-            // Minimum bounding rectangle functions
-            $funcs['MBRContains']   = array('params' => 2, 'type' => 'int');
-            $funcs['MBRDisjoint']   = array('params' => 2, 'type' => 'int');
-            $funcs['MBREquals']     = array('params' => 2, 'type' => 'int');
-            $funcs['MBRIntersects'] = array('params' => 2, 'type' => 'int');
-            $funcs['MBROverlaps']   = array('params' => 2, 'type' => 'int');
-            $funcs['MBRTouches']    = array('params' => 2, 'type' => 'int');
-            $funcs['MBRWithin']     = array('params' => 2, 'type' => 'int');
-        }
-        return $funcs;
-    }
-
-    /**
-     * Returns default function for a particular column.
-     *
-     * @param array $field       Data about the column for which
-     *                           to generate the dropdown
-     * @param bool  $insert_mode Whether the operation is 'insert'
-     *
-     * @global   array    $cfg            PMA configuration
-     * @global   mixed    $data           data of currently edited row
-     *                                    (used to detect whether to choose defaults)
-     *
-     * @return string   An HTML snippet of a dropdown list with function
-     *                    names appropriate for the requested column.
-     */
-    public static function getDefaultFunctionForField($field, $insert_mode)
-    {
-        /*
-         * @todo Except for $cfg, no longer use globals but pass as parameters
-         *       from higher levels
-         */
-        global $cfg, $data;
-
-        $default_function   = '';
-
-        // Can we get field class based values?
-        $current_class = $GLOBALS['PMA_Types']->getTypeClass($field['True_Type']);
-        if (! empty($current_class)) {
-            if (isset($cfg['DefaultFunctions']['FUNC_' . $current_class])) {
-                $default_function
-                    = $cfg['DefaultFunctions']['FUNC_' . $current_class];
-            }
-        }
-
-        // what function defined as default?
-        // for the first timestamp we don't set the default function
-        // if there is a default value for the timestamp
-        // (not including CURRENT_TIMESTAMP)
-        // and the column does not have the
-        // ON UPDATE DEFAULT TIMESTAMP attribute.
-        if (($field['True_Type'] == 'timestamp')
-            && $field['first_timestamp']
-            && empty($field['Default'])
-            && empty($data)
-            && $field['Extra'] != 'on update CURRENT_TIMESTAMP'
-            && $field['Null'] == 'NO'
-        ) {
-            $default_function = $cfg['DefaultFunctions']['first_timestamp'];
-        }
-
-        // For primary keys of type char(36) or varchar(36) UUID if the default
-        // function
-        // Only applies to insert mode, as it would silently trash data on updates.
-        if ($insert_mode
-            && $field['Key'] == 'PRI'
-            && ($field['Type'] == 'char(36)' || $field['Type'] == 'varchar(36)')
-        ) {
-             $default_function = $cfg['DefaultFunctions']['FUNC_UUID'];
-        }
-
-        return $default_function;
-    }
-
-    /**
-     * Creates a dropdown box with MySQL functions for a particular column.
-     *
-     * @param array $field       Data about the column for which
-     *                           to generate the dropdown
-     * @param bool  $insert_mode Whether the operation is 'insert'
-     *
-     * @return string   An HTML snippet of a dropdown list with function
-     *                    names appropriate for the requested column.
-     */
-    public static function getFunctionsForField($field, $insert_mode, $foreignData)
-    {
-        $default_function = self::getDefaultFunctionForField($field, $insert_mode);
-        $dropdown_built = array();
-
-        // Create the output
-        $retval = '<option></option>' . "\n";
-        // loop on the dropdown array and print all available options for that
-        // field.
-        $functions = $GLOBALS['PMA_Types']->getFunctions($field['True_Type']);
-        foreach ($functions as $function) {
-            $retval .= '<option';
-            if (isset($foreignData['foreign_link']) && $foreignData['foreign_link'] !== false && $default_function === $function) {
-                $retval .= ' selected="selected"';
-            }
-            $retval .= '>' . $function . '</option>' . "\n";
-            $dropdown_built[$function] = true;
-        }
-
-        // Create separator before all functions list
-        if (count($functions) > 0) {
-            $retval .= '<option value="" disabled="disabled">--------</option>'
-                . "\n";
-        }
-
-        // For compatibility's sake, do not let out all other functions. Instead
-        // print a separator (blank) and then show ALL functions which weren't
-        // shown yet.
-        $functions = $GLOBALS['PMA_Types']->getAllFunctions();
-        foreach ($functions as $function) {
-            // Skip already included functions
-            if (isset($dropdown_built[$function])) {
-                continue;
-            }
-            $retval .= '<option';
-            if ($default_function === $function) {
-                $retval .= ' selected="selected"';
-            }
-            $retval .= '>' . $function . '</option>' . "\n";
-        } // end for
-
-        return $retval;
-    } // end getFunctionsForField()
-
-    /**
-     * Checks if the current user has a specific privilege and returns true if the
-     * user indeed has that privilege or false if (s)he doesn't. This function must
-     * only be used for features that are available since MySQL 5, because it
-     * relies on the INFORMATION_SCHEMA database to be present.
-     *
-     * Example:   currentUserHasPrivilege('CREATE ROUTINE', 'mydb');
-     *            // Checks if the currently logged in user has the global
-     *            // 'CREATE ROUTINE' privilege or, if not, checks if the
-     *            // user has this privilege on database 'mydb'.
-     *
-     * @param string $priv The privilege to check
-     * @param mixed  $db   null, to only check global privileges
-     *                     string, db name where to also check for privileges
-     * @param mixed  $tbl  null, to only check global/db privileges
-     *                     string, table name where to also check for privileges
-     *
-     * @return bool
-     */
-    public static function currentUserHasPrivilege($priv, $db = null, $tbl = null)
-    {
-        // Get the username for the current user in the format
-        // required to use in the information schema database.
-        $user = $GLOBALS['dbi']->fetchValue("SELECT CURRENT_USER();");
-        if ($user === false) {
-            return false;
-        }
-
-        if ($user == '@') { // MySQL is started with --skip-grant-tables
-            return true;
-        }
-
-        $user = explode('@', $user);
-        $username  = "''";
-        $username .= str_replace("'", "''", $user[0]);
-        $username .= "''@''";
-        $username .= str_replace("'", "''", $user[1]);
-        $username .= "''";
-
-        // Prepare the query
-        $query = "SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`.`%s` "
-               . "WHERE GRANTEE='%s' AND PRIVILEGE_TYPE='%s'";
-
-        // Check global privileges first.
-        $user_privileges = $GLOBALS['dbi']->fetchValue(
-            sprintf(
-                $query,
-                'USER_PRIVILEGES',
-                $username,
-                $priv
-            )
-        );
-        if ($user_privileges) {
-            return true;
-        }
-        // If a database name was provided and user does not have the
-        // required global privilege, try database-wise permissions.
-        if ($db !== null) {
-            $query .= " AND '%s' LIKE `TABLE_SCHEMA`";
-            $schema_privileges = $GLOBALS['dbi']->fetchValue(
-                sprintf(
-                    $query,
-                    'SCHEMA_PRIVILEGES',
-                    $username,
-                    $priv,
-                    $GLOBALS['dbi']->escapeString($db)
-                )
-            );
-            if ($schema_privileges) {
-                return true;
-            }
-        } else {
-            // There was no database name provided and the user
-            // does not have the correct global privilege.
-            return false;
-        }
-        // If a table name was also provided and we still didn't
-        // find any valid privileges, try table-wise privileges.
-        if ($tbl !== null) {
-            // need to escape wildcards in db and table names, see bug #3518484
-            $tbl = str_replace(array('%', '_'), array('\%', '\_'), $tbl);
-            $query .= " AND TABLE_NAME='%s'";
-            $table_privileges = $GLOBALS['dbi']->fetchValue(
-                sprintf(
-                    $query,
-                    'TABLE_PRIVILEGES',
-                    $username,
-                    $priv,
-                    $GLOBALS['dbi']->escapeString($db),
-                    $GLOBALS['dbi']->escapeString($tbl)
-                )
-            );
-            if ($table_privileges) {
-                return true;
-            }
-        }
-        // If we reached this point, the user does not
-        // have even valid table-wise privileges.
-        return false;
-    }
-
-    /**
-     * Returns server type for current connection
-     *
-     * Known types are: MariaDB and MySQL (default)
-     *
-     * @return string
-     */
-    public static function getServerType()
-    {
-        $server_type = 'MySQL';
-
-        if (mb_stripos(PMA_MYSQL_STR_VERSION, 'mariadb') !== false) {
-            $server_type = 'MariaDB';
-            return $server_type;
-        }
-
-        if (mb_stripos(PMA_MYSQL_VERSION_COMMENT, 'percona') !== false) {
-            $server_type = 'Percona Server';
-            return $server_type;
-        }
-
-        return $server_type;
-    }
-
-    /**
-     * Prepare HTML code for display button.
-     *
-     * @return String
-     */
-    public static function getButton()
-    {
-        return '<p class="print_ignore">'
-            . '<input type="button" class="button" id="print" value="'
-            . __('Print') . '" />'
-            . '</p>';
-    }
-
-    /**
-     * Parses ENUM/SET values
-     *
-     * @param string $definition The definition of the column
-     *                           for which to parse the values
-     * @param bool   $escapeHtml Whether to escape html entities
-     *
-     * @return array
-     */
-    public static function parseEnumSetValues($definition, $escapeHtml = true)
-    {
-        $values_string = htmlentities($definition, ENT_COMPAT, "UTF-8");
-        // There is a JS port of the below parser in functions.js
-        // If you are fixing something here,
-        // you need to also update the JS port.
-        $values = array();
-        $in_string = false;
-        $buffer = '';
-
-        for ($i = 0, $length = mb_strlen($values_string);
-             $i < $length;
-             $i++
-        ) {
-            $curr = mb_substr($values_string, $i, 1);
-            $next = ($i == mb_strlen($values_string) - 1)
-                ? ''
-                : mb_substr($values_string, $i + 1, 1);
-
-            if (! $in_string && $curr == "'") {
-                $in_string = true;
-            } else if (($in_string && $curr == "\\") && $next == "\\") {
-                $buffer .= "&#92;";
-                $i++;
-            } else if (($in_string && $next == "'")
-                && ($curr == "'" || $curr == "\\")
-            ) {
-                $buffer .= "&#39;";
-                $i++;
-            } else if ($in_string && $curr == "'") {
-                $in_string = false;
-                $values[] = $buffer;
-                $buffer = '';
-            } else if ($in_string) {
-                 $buffer .= $curr;
-            }
-
-        }
-
-        if (mb_strlen($buffer) > 0) {
-            // The leftovers in the buffer are the last value (if any)
-            $values[] = $buffer;
-        }
-
-        if (! $escapeHtml) {
-            foreach ($values as $key => $value) {
-                $values[$key] = html_entity_decode($value, ENT_QUOTES, 'UTF-8');
-            }
-        }
-
-        return $values;
-    }
-
-    /**
-     * Get regular expression which occur first inside the given sql query.
-     *
-     * @param array  $regex_array Comparing regular expressions.
-     * @param String $query       SQL query to be checked.
-     *
-     * @return String Matching regular expression.
-     */
-    public static function getFirstOccurringRegularExpression($regex_array, $query)
-    {
-        $minimum_first_occurence_index = null;
-        $regex = null;
-
-        foreach ($regex_array as $test_regex) {
-            if (preg_match($test_regex, $query, $matches, PREG_OFFSET_CAPTURE)) {
-                if (is_null($minimum_first_occurence_index)
-                    || ($matches[0][1] < $minimum_first_occurence_index)
-                ) {
-                    $regex = $test_regex;
-                    $minimum_first_occurence_index = $matches[0][1];
-                }
-            }
-        }
-        return $regex;
-    }
-
-    /**
-     * Return the list of tabs for the menu with corresponding names
-     *
-     * @param string $level 'server', 'db' or 'table' level
-     *
-     * @return array list of tabs for the menu
-     */
-    public static function getMenuTabList($level = null)
-    {
-        $tabList = array(
-            'server' => array(
-                'databases'   => __('Databases'),
-                'sql'         => __('SQL'),
-                'status'      => __('Status'),
-                'rights'      => __('Users'),
-                'export'      => __('Export'),
-                'import'      => __('Import'),
-                'settings'    => __('Settings'),
-                'binlog'      => __('Binary log'),
-                'replication' => __('Replication'),
-                'vars'        => __('Variables'),
-                'charset'     => __('Charsets'),
-                'plugins'     => __('Plugins'),
-                'engine'      => __('Engines')
-            ),
-            'db'     => array(
-                'structure'   => __('Structure'),
-                'sql'         => __('SQL'),
-                'search'      => __('Search'),
-                'qbe'         => __('Query'),
-                'export'      => __('Export'),
-                'import'      => __('Import'),
-                'operation'   => __('Operations'),
-                'privileges'  => __('Privileges'),
-                'routines'    => __('Routines'),
-                'events'      => __('Events'),
-                'triggers'    => __('Triggers'),
-                'tracking'    => __('Tracking'),
-                'designer'    => __('Designer'),
-                'central_columns' => __('Central columns')
-            ),
-            'table'  => array(
-                'browse'      => __('Browse'),
-                'structure'   => __('Structure'),
-                'sql'         => __('SQL'),
-                'search'      => __('Search'),
-                'insert'      => __('Insert'),
-                'export'      => __('Export'),
-                'import'      => __('Import'),
-                'privileges'  => __('Privileges'),
-                'operation'   => __('Operations'),
-                'tracking'    => __('Tracking'),
-                'triggers'    => __('Triggers'),
-            )
-        );
-
-        if ($level == null) {
-            return $tabList;
-        } else if (array_key_exists($level, $tabList)) {
-            return $tabList[$level];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Returns information with regards to handling the http request
-     *
-     * @param array $context Data about the context for which
-     *                       to http request is sent
-     *
-     * @return array of updated context information
-     */
-    public static function handleContext(array $context)
-    {
-        if (mb_strlen($GLOBALS['cfg']['ProxyUrl'])) {
-            $context['http'] = array(
-                'proxy' => $GLOBALS['cfg']['ProxyUrl'],
-                'request_fulluri' => true
-            );
-            if (mb_strlen($GLOBALS['cfg']['ProxyUser'])) {
-                $auth = base64_encode(
-                    $GLOBALS['cfg']['ProxyUser'] . ':' . $GLOBALS['cfg']['ProxyPass']
-                );
-                $context['http']['header'] .= 'Proxy-Authorization: Basic '
-                    . $auth . "\r\n";
-            }
-        }
-        return $context;
-    }
-    /**
-     * Updates an existing curl as necessary
-     *
-     * @param resource $curl_handle A curl_handle resource
-     *                              created by curl_init which should
-     *                              have several options set
-     *
-     * @return resource curl_handle with updated options
-     */
-    public static function configureCurl($curl_handle)
-    {
-        if (mb_strlen($GLOBALS['cfg']['ProxyUrl'])) {
-            curl_setopt($curl_handle, CURLOPT_PROXY, $GLOBALS['cfg']['ProxyUrl']);
-            if (mb_strlen($GLOBALS['cfg']['ProxyUser'])) {
-                curl_setopt(
-                    $curl_handle,
-                    CURLOPT_PROXYUSERPWD,
-                    $GLOBALS['cfg']['ProxyUser'] . ':' . $GLOBALS['cfg']['ProxyPass']
-                );
-            }
-        }
-        curl_setopt($curl_handle, CURLOPT_USERAGENT, 'phpMyAdmin/' . PMA_VERSION);
-        return $curl_handle;
-    }
-
-    /**
-     * Add fractional seconds to time, datetime and timestamp strings.
-     * If the string contains fractional seconds,
-     * pads it with 0s up to 6 decimal places.
-     *
-     * @param string $value time, datetime or timestamp strings
-     *
-     * @return string time, datetime or timestamp strings with fractional seconds
-     */
-    public static function addMicroseconds($value)
-    {
-        if (empty($value) || $value == 'CURRENT_TIMESTAMP') {
-            return $value;
-        }
-
-        if (mb_strpos($value, '.') === false) {
-            return $value . '.000000';
-        }
-
-        $value .= '000000';
-        return mb_substr(
-            $value,
-            0,
-            mb_strpos($value, '.') + 7
-        );
-    }
-
-    /**
-     * Reads the file, detects the compression MIME type, closes the file
-     * and returns the MIME type
-     *
-     * @param resource $file the file handle
-     *
-     * @return string the MIME type for compression, or 'none'
-     */
-    public static function getCompressionMimeType($file)
-    {
-        $test = fread($file, 4);
-        $len = strlen($test);
-        fclose($file);
-        if ($len >= 2 && $test[0] == chr(31) && $test[1] == chr(139)) {
-            return 'application/gzip';
-        }
-        if ($len >= 3 && substr($test, 0, 3) == 'BZh') {
-            return 'application/bzip2';
-        }
-        if ($len >= 4 && $test == "PK\003\004") {
-            return 'application/zip';
-        }
-        return 'none';
-    }
-
-    /**
-     * Renders a single link for the top of the navigation panel
-     *
-     * @param string  $link        The url for the link
-     * @param bool    $showText    Whether to show the text or to
-     *                             only use it for title attributes
-     * @param string  $text        The text to display and use for title attributes
-     * @param bool    $showIcon    Whether to show the icon
-     * @param string  $icon        The filename of the icon to show
-     * @param string  $linkId      Value to use for the ID attribute
-     * @param boolean $disableAjax Whether to disable ajax page loading for this link
-     * @param string  $linkTarget  The name of the target frame for the link
-     * @param array   $classes     HTML classes to apply
-     *
-     * @return string HTML code for one link
-     */
-    public static function getNavigationLink(
-        $link,
-        $showText,
-        $text,
-        $showIcon,
-        $icon,
-        $linkId = '',
-        $disableAjax = false,
-        $linkTarget = '',
-        $classes = array()
-    ) {
-        $retval = '<a href="' . $link . '"';
-        if (! empty($linkId)) {
-            $retval .= ' id="' . $linkId . '"';
-        }
-        if (! empty($linkTarget)) {
-            $retval .= ' target="' . $linkTarget . '"';
-        }
-        if ($disableAjax) {
-            $classes[] = 'disableAjax';
-        }
-        if (!empty($classes)) {
-            $retval .= ' class="' . join(" ", $classes) . '"';
-        }
-        $retval .= ' title="' . $text . '">';
-        if ($showIcon) {
-            $retval .= Util::getImage(
-                $icon,
-                $text
-            );
-        }
-        if ($showText) {
-            $retval .= $text;
-        }
-        $retval .= '</a>';
-        if ($showText) {
-            $retval .= '<br />';
-        }
-        return $retval;
-    }
-
-    /**
-     * Provide COLLATE clause, if required, to perform case sensitive comparisons
-     * for queries on information_schema.
-     *
-     * @return string COLLATE clause if needed or empty string.
-     */
-    public static function getCollateForIS()
-    {
-        $lowerCaseTableNames = self::cacheGet(
-            'lower_case_table_names',
-            function () {
-                return $GLOBALS['dbi']->fetchValue(
-                    "SELECT @@lower_case_table_names"
-                );
-            }
-        );
-
-        if ($lowerCaseTableNames === '0' // issue #10961
-            || $lowerCaseTableNames === '2' // issue #11461
-        ) {
-            return "COLLATE utf8_bin";
-        }
-        return "";
-    }
-
-    /**
-     * Process the index data.
-     *
-     * @param array $indexes index data
-     *
-     * @return array processes index data
-     */
-    public static function processIndexData($indexes)
-    {
-        $lastIndex    = '';
-
-        $primary      = '';
-        $pk_array     = array(); // will be use to emphasis prim. keys in the table
-        $indexes_info = array();
-        $indexes_data = array();
-
-        // view
-        foreach ($indexes as $row) {
-            // Backups the list of primary keys
-            if ($row['Key_name'] == 'PRIMARY') {
-                $primary   .= $row['Column_name'] . ', ';
-                $pk_array[$row['Column_name']] = 1;
-            }
-            // Retains keys informations
-            if ($row['Key_name'] != $lastIndex) {
-                $indexes[] = $row['Key_name'];
-                $lastIndex = $row['Key_name'];
-            }
-            $indexes_info[$row['Key_name']]['Sequences'][] = $row['Seq_in_index'];
-            $indexes_info[$row['Key_name']]['Non_unique'] = $row['Non_unique'];
-            if (isset($row['Cardinality'])) {
-                $indexes_info[$row['Key_name']]['Cardinality'] = $row['Cardinality'];
-            }
-            // I don't know what does following column mean....
-            // $indexes_info[$row['Key_name']]['Packed']          = $row['Packed'];
-
-            $indexes_info[$row['Key_name']]['Comment'] = $row['Comment'];
-
-            $indexes_data[$row['Key_name']][$row['Seq_in_index']]['Column_name']
-                = $row['Column_name'];
-            if (isset($row['Sub_part'])) {
-                $indexes_data[$row['Key_name']][$row['Seq_in_index']]['Sub_part']
-                    = $row['Sub_part'];
-            }
-
-        } // end while
-
-        return array($primary, $pk_array, $indexes_info, $indexes_data);
-    }
-
-    /**
-     * Returns the HTML for check all check box and with selected text
-     * for multi submits
-     *
-     * @param string $pmaThemeImage path to theme's image folder
-     * @param string $text_dir      text direction
-     * @param string $formName      name of the enclosing form
-     *
-     * @return string HTML
-     */
-    public static function getWithSelected($pmaThemeImage, $text_dir, $formName)
-    {
-        $html = '<img class="selectallarrow" '
-            . 'src="' . $pmaThemeImage . 'arrow_' . $text_dir . '.png" '
-            . 'width="38" height="22" alt="' . __('With selected:') . '" />';
-        $html .= '<input type="checkbox" id="' . $formName . '_checkall" '
-            . 'class="checkall_box" title="' . __('Check all') . '" />'
-            . '<label for="' . $formName . '_checkall">' . __('Check all')
-            . '</label>';
-        $html .= '<i style="margin-left: 2em">'
-            . __('With selected:') . '</i>';
-
-        return $html;
-    }
-
-    /**
-     * Function to get html for the start row and number of rows panel
-     *
-     * @param string $sql_query sql query
-     *
-     * @return string html
-     */
-    public static function getStartAndNumberOfRowsPanel($sql_query)
-    {
-        $pos = isset($_REQUEST['pos'])
-            ? $_REQUEST['pos']
-            : $_SESSION['tmpval']['pos'];
-        if (isset($_REQUEST['session_max_rows'])) {
-            $rows = $_REQUEST['session_max_rows'];
-        } else {
-            if ($_SESSION['tmpval']['max_rows'] != 'all') {
-                $rows = $_SESSION['tmpval']['max_rows'];
-            } else {
-                $rows = $GLOBALS['cfg']['MaxRows'];
-            }
-        }
-
-        return Template::get('startAndNumberOfRowsPanel')
-            ->render(
-                array(
-                    'pos' => $pos,
-                    'unlim_num_rows' => intval($_REQUEST['unlim_num_rows']),
-                    'rows' => $rows,
-                    'sql_query' => $sql_query,
-                )
-            );
-    }
-
-    /**
-     * Returns whether the database server supports virtual columns
-     *
-     * @return bool
-     */
-    public static function isVirtualColumnsSupported()
-    {
-        $serverType = self::getServerType();
-        return $serverType == 'MySQL' && PMA_MYSQL_INT_VERSION >= 50705
-             || ($serverType == 'MariaDB' && PMA_MYSQL_INT_VERSION >= 50200);
-    }
-
-    /**
-     * Returns the proper class clause according to the column type
-     *
-     * @param string $type the column type
-     *
-     * @return string $class_clause the HTML class clause
-     */
-    public static function getClassForType($type)
-    {
-        if ('set' == $type
-            || 'enum' == $type
-        ) {
-            $class_clause = '';
-        } else {
-            $class_clause = ' class="nowrap"';
-        }
-        return $class_clause;
-    }
-
-    /**
-     * Gets the list of tables in the current db and information about these
-     * tables if possible
-     *
-     * @param string $db       database name
-     * @param string $sub_part part of script name
-     *
-     * @return array
-     *
-     */
-    public static function getDbInfo($db, $sub_part)
-    {
-        global $cfg;
-
-        /**
-         * limits for table list
-         */
-        if (! isset($_SESSION['tmpval']['table_limit_offset'])
-            || $_SESSION['tmpval']['table_limit_offset_db'] != $db
-        ) {
-            $_SESSION['tmpval']['table_limit_offset'] = 0;
-            $_SESSION['tmpval']['table_limit_offset_db'] = $db;
-        }
-        if (isset($_REQUEST['pos'])) {
-            $_SESSION['tmpval']['table_limit_offset'] = (int) $_REQUEST['pos'];
-        }
-        $pos = $_SESSION['tmpval']['table_limit_offset'];
-
-        /**
-         * whether to display extended stats
-         */
-        $is_show_stats = $cfg['ShowStats'];
-
-        /**
-         * whether selected db is information_schema
-         */
-        $db_is_system_schema = false;
-
-        if ($GLOBALS['dbi']->isSystemSchema($db)) {
-            $is_show_stats = false;
-            $db_is_system_schema = true;
-        }
-
-        /**
-         * information about tables in db
-         */
-        $tables = array();
-
-        $tooltip_truename = array();
-        $tooltip_aliasname = array();
-
-        // Special speedup for newer MySQL Versions (in 4.0 format changed)
-        if (true === $cfg['SkipLockedTables']) {
-            $db_info_result = $GLOBALS['dbi']->query(
-                'SHOW OPEN TABLES FROM ' . Util::backquote($db) . ';'
-            );
-
-            // Blending out tables in use
-            if ($db_info_result && $GLOBALS['dbi']->numRows($db_info_result) > 0) {
-                $tables = self::getTablesWhenOpen($db, $db_info_result);
-
-            } elseif ($db_info_result) {
-                $GLOBALS['dbi']->freeResult($db_info_result);
-            }
-        }
-
-        if (empty($tables)) {
-            // Set some sorting defaults
-            $sort = 'Name';
-            $sort_order = 'ASC';
-
-            if (isset($_REQUEST['sort'])) {
-                $sortable_name_mappings = array(
-                    'table'       => 'Name',
-                    'records'     => 'Rows',
-                    'type'        => 'Engine',
-                    'collation'   => 'Collation',
-                    'size'        => 'Data_length',
-                    'overhead'    => 'Data_free',
-                    'creation'    => 'Create_time',
-                    'last_update' => 'Update_time',
-                    'last_check'  => 'Check_time',
-                    'comment'     => 'Comment',
-                );
-
-                // Make sure the sort type is implemented
-                if (isset($sortable_name_mappings[$_REQUEST['sort']])) {
-                    $sort = $sortable_name_mappings[$_REQUEST['sort']];
-                    if ($_REQUEST['sort_order'] == 'DESC') {
-                        $sort_order = 'DESC';
-                    }
-                }
-            }
-
-            $groupWithSeparator = false;
-            $tbl_type = null;
-            $limit_offset = 0;
-            $limit_count = false;
-            $groupTable = array();
-
-            if (! empty($_REQUEST['tbl_group']) || ! empty($_REQUEST['tbl_type'])) {
-                if (! empty($_REQUEST['tbl_type'])) {
-                    // only tables for selected type
-                    $tbl_type = $_REQUEST['tbl_type'];
-                }
-                if (! empty($_REQUEST['tbl_group'])) {
-                    // only tables for selected group
-                    $tbl_group = $_REQUEST['tbl_group'];
-                    // include the table with the exact name of the group if such
-                    // exists
-                    $groupTable = $GLOBALS['dbi']->getTablesFull(
-                        $db, $tbl_group, false, null, $limit_offset,
-                        $limit_count, $sort, $sort_order, $tbl_type
-                    );
-                    $groupWithSeparator = $tbl_group
-                        . $GLOBALS['cfg']['NavigationTreeTableSeparator'];
-                }
-            } else {
-                // all tables in db
-                // - get the total number of tables
-                //  (needed for proper working of the MaxTableList feature)
-                $tables = $GLOBALS['dbi']->getTables($db);
-                $total_num_tables = count($tables);
-                if (isset($sub_part) && $sub_part == '_export') {
-                    // (don't fetch only a subset if we are coming from
-                    // db_export.php, because I think it's too risky to display only
-                    // a subset of the table names when exporting a db)
-                    /**
-                     *
-                     * @todo Page selector for table names?
-                     */
-                } else {
-                    // fetch the details for a possible limited subset
-                    $limit_offset = $pos;
-                    $limit_count = true;
-                }
-            }
-            $tables = array_merge(
-                $groupTable,
-                $GLOBALS['dbi']->getTablesFull(
-                    $db, $groupWithSeparator, ($groupWithSeparator !== false), null,
-                    $limit_offset, $limit_count, $sort, $sort_order, $tbl_type
-                )
-            );
-        }
-
-        $num_tables = count($tables);
-        //  (needed for proper working of the MaxTableList feature)
-        if (! isset($total_num_tables)) {
-            $total_num_tables = $num_tables;
-        }
-
-        /**
-         * If coming from a Show MySQL link on the home page,
-         * put something in $sub_part
-         */
-        if (empty($sub_part)) {
-            $sub_part = '_structure';
-        }
-
-        return array(
-            $tables,
-            $num_tables,
-            $total_num_tables,
-            $sub_part,
-            $is_show_stats,
-            $db_is_system_schema,
-            $tooltip_truename,
-            $tooltip_aliasname,
-            $pos
-        );
-    }
-
-    /**
-     * Gets the list of tables in the current db, taking into account
-     * that they might be "in use"
-     *
-     * @param string $db             database name
-     * @param object $db_info_result result set
-     *
-     * @return array $tables list of tables
-     *
-     */
-    public static function getTablesWhenOpen($db, $db_info_result)
-    {
-        $sot_cache = $tables = array();
-
-        while ($tmp = $GLOBALS['dbi']->fetchAssoc($db_info_result)) {
-            // if in use, memorize table name
-            if ($tmp['In_use'] > 0) {
-                $sot_cache[$tmp['Table']] = true;
-            }
-        }
-        $GLOBALS['dbi']->freeResult($db_info_result);
-
-        // is there at least one "in use" table?
-        if (isset($sot_cache)) {
-            $tblGroupSql = "";
-            $whereAdded = false;
-            if (PMA_isValid($_REQUEST['tbl_group'])) {
-                $group = Util::escapeMysqlWildcards($_REQUEST['tbl_group']);
-                $groupWithSeparator = Util::escapeMysqlWildcards(
-                    $_REQUEST['tbl_group']
-                    . $GLOBALS['cfg']['NavigationTreeTableSeparator']
-                );
-                $tblGroupSql .= " WHERE ("
-                    . Util::backquote('Tables_in_' . $db)
-                    . " LIKE '" . $groupWithSeparator . "%'"
-                    . " OR "
-                    . Util::backquote('Tables_in_' . $db)
-                    . " LIKE '" . $group . "')";
-                $whereAdded = true;
-            }
-            if (PMA_isValid($_REQUEST['tbl_type'], array('table', 'view'))) {
-                $tblGroupSql .= $whereAdded ? " AND" : " WHERE";
-                if ($_REQUEST['tbl_type'] == 'view') {
-                    $tblGroupSql .= " `Table_type` != 'BASE TABLE'";
-                } else {
-                    $tblGroupSql .= " `Table_type` = 'BASE TABLE'";
-                }
-            }
-            $db_info_result = $GLOBALS['dbi']->query(
-                'SHOW FULL TABLES FROM ' . Util::backquote($db) . $tblGroupSql,
-                null, DatabaseInterface::QUERY_STORE
-            );
-            unset($tblGroupSql, $whereAdded);
-
-            if ($db_info_result && $GLOBALS['dbi']->numRows($db_info_result) > 0) {
-                while ($tmp = $GLOBALS['dbi']->fetchRow($db_info_result)) {
-                    if (! isset($sot_cache[$tmp[0]])) {
-                        $sts_result = $GLOBALS['dbi']->query(
-                            "SHOW TABLE STATUS FROM " . Util::backquote($db)
-                            . " LIKE '" . $GLOBALS['dbi']->escapeString($tmp[0])
-                            . "';"
-                        );
-                        $sts_tmp = $GLOBALS['dbi']->fetchAssoc($sts_result);
-                        $GLOBALS['dbi']->freeResult($sts_result);
-                        unset($sts_result);
-
-                        $tableArray = $GLOBALS['dbi']->copyTableProperties(
-                            array($sts_tmp), $db
-                        );
-                                $tables[$sts_tmp['Name']] = $tableArray[0];
-                    } else { // table in use
-                        $tables[$tmp[0]] = array(
-                            'TABLE_NAME' => $tmp[0],
-                            'ENGINE' => '',
-                            'TABLE_TYPE' => '',
-                            'TABLE_ROWS' => 0,
-                            'TABLE_COMMENT' => '',
-                        );
-                    }
-                } // end while
-                if ($GLOBALS['cfg']['NaturalOrder']) {
-                    uksort($tables, 'strnatcasecmp');
-                }
-
-            } elseif ($db_info_result) {
-                $GLOBALS['dbi']->freeResult($db_info_result);
-            }
-            unset($sot_cache);
-        }
-        return $tables;
-    }
-
-    /**
-     * Returs list of used PHP extensions.
-     *
-     * @return array of strings
-     */
-    public static function listPHPExtensions()
-    {
-        $result = array();
-        if (DatabaseInterface::checkDbExtension('mysqli')) {
-            $result[] = 'mysqli';
-        } else {
-            $result[] = 'mysql';
-        }
-
-        if (extension_loaded('curl')) {
-            $result[] = 'curl';
-        }
-
-        if (extension_loaded('mbstring')) {
-            $result[] = 'mbstring';
-        }
-
-        return $result;
-    }
-
-    /**
-     * Converts given (request) paramter to string
-     *
-     * @param mixed $value Value to convert
-     *
-     * @return string
-     */
-    public static function requestString($value)
-    {
-        while (is_array($value) || is_object($value)) {
-            $value = reset($value);
-        }
-        return trim((string)$value);
-    }
-}
-
diff --git a/#pma/libraries/VersionInformation.php b/#pma/libraries/VersionInformation.php
deleted file mode 100644
index f256ef70..00000000
--- a/#pma/libraries/VersionInformation.php
+++ /dev/null
@@ -1,278 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Responsible for retrieving version information and notifiying about latest version
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries;
-
-use PMA\libraries\Util;
-use stdClass;
-
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
-/**
- * Responsible for retrieving version information and notifiying about latest version
- *
- * @package PhpMyAdmin
- *
- */
-class VersionInformation
-{
-    /**
-     * Returns information with latest version from phpmyadmin.net
-     *
-     * @return object JSON decoded object with the data
-     */
-    public function getLatestVersion()
-    {
-        if (!$GLOBALS['cfg']['VersionCheck']) {
-            return null;
-        }
-
-        // wait 3s at most for server response, it's enough to get information
-        // from a working server
-        $connection_timeout = 3;
-
-        $response = '{}';
-        // Get response text from phpmyadmin.net or from the session
-        // Update cache every 6 hours
-        if (isset($_SESSION['cache']['version_check'])
-            && time() < $_SESSION['cache']['version_check']['timestamp'] + 3600 * 6
-        ) {
-            $save = false;
-            $response = $_SESSION['cache']['version_check']['response'];
-        } else {
-            $save = true;
-            if (! defined('TESTSUITE')) {
-                session_write_close();
-            }
-            $file = 'https://www.phpmyadmin.net/home_page/version.json';
-            if (function_exists('curl_init')) {
-                $curl_handle = curl_init($file);
-                if ($curl_handle === false) {
-                    return null;
-                }
-                $curl_handle = Util::configureCurl($curl_handle);
-                curl_setopt(
-                    $curl_handle,
-                    CURLOPT_HEADER,
-                    false
-                );
-                curl_setopt(
-                    $curl_handle,
-                    CURLOPT_RETURNTRANSFER,
-                    true
-                );
-                curl_setopt(
-                    $curl_handle,
-                    CURLOPT_TIMEOUT,
-                    $connection_timeout
-                );
-                $response = @curl_exec($curl_handle);
-            } else if (ini_get('allow_url_fopen')) {
-                $context = array(
-                    'http' => array(
-                        'request_fulluri' => true,
-                        'timeout' => $connection_timeout,
-                    )
-                );
-                $context = Util::handleContext($context);
-                $response = @file_get_contents(
-                    $file,
-                    false,
-                    stream_context_create($context)
-                );
-            }
-            // Check possible failure of getting data
-            if ($response === false) {
-                $response = '{}';
-            }
-        }
-
-        /* Parse response */
-        $data = json_decode($response);
-
-        /* Basic sanity checking */
-        if (! is_object($data)
-            || empty($data->version)
-            || empty($data->releases)
-            || empty($data->date)
-        ) {
-            return null;
-        }
-
-        if ($save) {
-            if (! isset($_SESSION) && ! defined('TESTSUITE')) {
-                session_start();
-            }
-            $_SESSION['cache']['version_check'] = array(
-                'response' => $response,
-                'timestamp' => time()
-            );
-        }
-        return $data;
-    }
-
-    /**
-     * Calculates numerical equivalent of phpMyAdmin version string
-     *
-     * @param string $version version
-     *
-     * @return mixed false on failure, integer on success
-     */
-    public function versionToInt($version)
-    {
-        $parts = explode('-', $version);
-        if (count($parts) > 1) {
-            $suffix = $parts[1];
-        } else {
-            $suffix = '';
-        }
-        $parts = explode('.', $parts[0]);
-
-        $result = 0;
-
-        if (count($parts) >= 1 && is_numeric($parts[0])) {
-            $result += 1000000 * $parts[0];
-        }
-
-        if (count($parts) >= 2 && is_numeric($parts[1])) {
-            $result += 10000 * $parts[1];
-        }
-
-        if (count($parts) >= 3 && is_numeric($parts[2])) {
-            $result += 100 * $parts[2];
-        }
-
-        if (count($parts) >= 4 && is_numeric($parts[3])) {
-            $result += 1 * $parts[3];
-        }
-
-        if (!empty($suffix)) {
-            $matches = array();
-            if (preg_match('/^(\D+)(\d+)$/', $suffix, $matches)) {
-                $suffix = $matches[1];
-                $result += intval($matches[2]);
-            }
-            switch ($suffix) {
-            case 'pl':
-                $result += 60;
-                break;
-            case 'rc':
-                $result += 30;
-                break;
-            case 'beta':
-                $result += 20;
-                break;
-            case 'alpha':
-                $result += 10;
-                break;
-            case 'dev':
-                $result += 0;
-                break;
-            }
-        } else {
-            $result += 50; // for final
-        }
-
-        return $result;
-    }
-
-    /**
-     * Returns the version and date of the latest phpMyAdmin version compatible
-     * with the available PHP and MySQL versions
-     *
-     * @param array $releases array of information related to each version
-     *
-     * @return array containing the version and date of latest compatible version
-     */
-    public function getLatestCompatibleVersion($releases)
-    {
-        foreach ($releases as $release) {
-            $phpVersions = $release->php_versions;
-            $phpConditions = explode(",", $phpVersions);
-            foreach ($phpConditions as $phpCondition) {
-                if (! $this->evaluateVersionCondition("PHP", $phpCondition)) {
-                    continue 2;
-                }
-            }
-
-            // We evalute MySQL version constraint if there are only
-            // one server configured.
-            if (count($GLOBALS['cfg']['Servers']) == 1) {
-                $mysqlVersions = $release->mysql_versions;
-                $mysqlConditions = explode(",", $mysqlVersions);
-                foreach ($mysqlConditions as $mysqlCondition) {
-                    if (!$this->evaluateVersionCondition('MySQL', $mysqlCondition)) {
-                        continue 2;
-                    }
-                }
-            }
-
-            return array(
-                'version' => $release->version,
-                'date' => $release->date,
-            );
-        }
-
-        // no compatible version
-        return null;
-    }
-
-    /**
-     * Checks whether PHP or MySQL version meets supplied version condition
-     *
-     * @param string $type      PHP or MySQL
-     * @param string $condition version condition
-     *
-     * @return boolean whether the condition is met
-     */
-    public function evaluateVersionCondition($type, $condition)
-    {
-        $operator = null;
-        $operators = array("<=", ">=", "!=", "<>", "<", ">", "="); // preserve order
-        foreach ($operators as $oneOperator) {
-            if (strpos($condition, $oneOperator) === 0) {
-                $operator = $oneOperator;
-                $version = substr($condition, strlen($oneOperator));
-                break;
-            }
-        }
-
-        $myVersion = null;
-        if ($type == 'PHP') {
-            $myVersion = $this->getPHPVersion();
-        } elseif ($type == 'MySQL') {
-            $myVersion = $this->getMySQLVersion();
-        }
-
-        if ($myVersion != null && $operator != null) {
-            return version_compare($myVersion, $version, $operator);
-        }
-        return false;
-    }
-
-    /**
-     * Returns the PHP version
-     *
-     * @return string PHP version
-     */
-    protected function getPHPVersion()
-    {
-        return PHP_VERSION;
-    }
-
-    /**
-     * Returns the MySQL version
-     *
-     * @return string MySQL version
-     */
-    protected function getMySQLVersion()
-    {
-        return PMA_MYSQL_STR_VERSION;
-    }
-}
diff --git a/#pma/libraries/ZipFile.php b/#pma/libraries/ZipFile.php
deleted file mode 100644
index 652d0eaf..00000000
--- a/#pma/libraries/ZipFile.php
+++ /dev/null
@@ -1,206 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Zip file creation
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries;
-
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
-/**
- * Zip file creation class.
- * Makes zip files.
- *
- * @access  public
- * @package PhpMyAdmin
- * @see     Official ZIP file format: https://www.pkware.com/support/zip-app-note
- */
-class ZipFile
-{
-    /**
-     * Whether to echo zip as it's built or return as string from -> file
-     *
-     * @var  boolean $doWrite
-     */
-    var $doWrite = false;
-    /**
-     * Array to store compressed data
-     *
-     * @var  array $datasec
-     */
-    var $datasec = array();
-    /**
-     * Central directory
-     *
-     * @var  array $ctrl_dir
-     */
-    var $ctrl_dir = array();
-    /**
-     * End of central directory record
-     *
-     * @var  string $eof_ctrl_dir
-     */
-    var $eof_ctrl_dir = "\x50\x4b\x05\x06\x00\x00\x00\x00";
-    /**
-     * Last offset position
-     *
-     * @var  integer $old_offset
-     */
-    var $old_offset = 0;
-
-    /**
-     * Sets member variable this -> doWrite to true
-     * - Should be called immediately after class instantiation
-     * - If set to true, then ZIP archive are echo'ed to STDOUT as each
-     *   file is added via this -> addfile(), and central directories are
-     *   echoed to STDOUT on final call to this -> file().  Also,
-     *   this -> file() returns an empty string so it is safe to issue a
-     *   "echo $zipfile;" command
-     *
-     * @access public
-     *
-     * @return void
-     */
-    function setDoWrite()
-    {
-        $this->doWrite = true;
-    } // end of the 'setDoWrite()' method
-
-    /**
-     * Converts an Unix timestamp to a four byte DOS date and time format (date
-     * in high two bytes, time in low two bytes allowing magnitude comparison).
-     *
-     * @param integer $unixtime the current Unix timestamp
-     *
-     * @return integer the current date in a four byte DOS format
-     *
-     * @access private
-     */
-    function unix2DosTime($unixtime = 0)
-    {
-        $timearray = ($unixtime == 0) ? getdate() : getdate($unixtime);
-
-        if ($timearray['year'] < 1980) {
-            $timearray['year'] = 1980;
-            $timearray['mon'] = 1;
-            $timearray['mday'] = 1;
-            $timearray['hours'] = 0;
-            $timearray['minutes'] = 0;
-            $timearray['seconds'] = 0;
-        } // end if
-
-        return (($timearray['year'] - 1980) << 25)
-        | ($timearray['mon'] << 21)
-        | ($timearray['mday'] << 16)
-        | ($timearray['hours'] << 11)
-        | ($timearray['minutes'] << 5)
-        | ($timearray['seconds'] >> 1);
-    } // end of the 'unix2DosTime()' method
-
-    /**
-     * Adds "file" to archive
-     *
-     * @param string  $data file contents
-     * @param string  $name name of the file in the archive (may contains the path)
-     * @param integer $time the current timestamp
-     *
-     * @access public
-     *
-     * @return void
-     */
-    function addFile($data, $name, $time = 0)
-    {
-        $name = str_replace('\\', '/', $name);
-
-        $hexdtime = pack('V', $this->unix2DosTime($time));
-
-        $fr = "\x50\x4b\x03\x04";
-        $fr .= "\x14\x00";            // ver needed to extract
-        $fr .= "\x00\x00";            // gen purpose bit flag
-        $fr .= "\x08\x00";            // compression method
-        $fr .= $hexdtime;             // last mod time and date
-
-        // "local file header" segment
-        $unc_len = strlen($data);
-        $crc = crc32($data);
-        $zdata = gzcompress($data);
-        $zdata = substr(substr($zdata, 0, strlen($zdata) - 4), 2); // fix crc bug
-        $c_len = strlen($zdata);
-        $fr .= pack('V', $crc);             // crc32
-        $fr .= pack('V', $c_len);           // compressed filesize
-        $fr .= pack('V', $unc_len);         // uncompressed filesize
-        $fr .= pack('v', strlen($name));    // length of filename
-        $fr .= pack('v', 0);                // extra field length
-        $fr .= $name;
-
-        // "file data" segment
-        $fr .= $zdata;
-
-        // echo this entry on the fly, ...
-        if ($this->doWrite) {
-            echo $fr;
-        } else {                     // ... OR add this entry to array
-            $this->datasec[] = $fr;
-        }
-
-        // now add to central directory record
-        $cdrec = "\x50\x4b\x01\x02";
-        $cdrec .= "\x00\x00";                // version made by
-        $cdrec .= "\x14\x00";                // version needed to extract
-        $cdrec .= "\x00\x00";                // gen purpose bit flag
-        $cdrec .= "\x08\x00";                // compression method
-        $cdrec .= $hexdtime;                 // last mod time & date
-        $cdrec .= pack('V', $crc);           // crc32
-        $cdrec .= pack('V', $c_len);         // compressed filesize
-        $cdrec .= pack('V', $unc_len);       // uncompressed filesize
-        $cdrec .= pack('v', strlen($name)); // length of filename
-        $cdrec .= pack('v', 0);             // extra field length
-        $cdrec .= pack('v', 0);             // file comment length
-        $cdrec .= pack('v', 0);             // disk number start
-        $cdrec .= pack('v', 0);             // internal file attributes
-        $cdrec .= pack('V', 32);            // external file attributes
-        // - 'archive' bit set
-
-        $cdrec .= pack('V', $this->old_offset); // relative offset of local header
-        $this->old_offset += strlen($fr);
-
-        $cdrec .= $name;
-
-        // optional extra field, file comment goes here
-        // save to central directory
-        $this->ctrl_dir[] = $cdrec;
-    } // end of the 'addFile()' method
-
-    /**
-     * Echo central dir if ->doWrite==true, else build string to return
-     *
-     * @return string  if ->doWrite {empty string} else the ZIP file contents
-     *
-     * @access public
-     */
-    function file()
-    {
-        $ctrldir = implode('', $this->ctrl_dir);
-        $header = $ctrldir .
-            $this->eof_ctrl_dir .
-            pack('v', sizeof($this->ctrl_dir)) . //total #of entries "on this disk"
-            pack('v', sizeof($this->ctrl_dir)) . //total #of entries overall
-            pack('V', strlen($ctrldir)) .          //size of central dir
-            pack('V', $this->old_offset) .       //offset to start of central dir
-            "\x00\x00";                            //.zip file comment length
-
-        if ($this->doWrite) { // Send central directory & end ctrl dir to STDOUT
-            echo $header;
-
-            return "";            // Return empty string
-        } else {                  // Return entire ZIP archive as string
-            $data = implode('', $this->datasec);
-
-            return $data . $header;
-        }
-    } // end of the 'file()' method
-} // end of the 'PMA\libraries\ZipFile' class
diff --git a/#pma/libraries/advisor.lib.php b/#pma/libraries/advisor.lib.php
deleted file mode 100644
index cacd2963..00000000
--- a/#pma/libraries/advisor.lib.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Contains Advisor functions
- *
- * @package PhpMyAdmin
- */
-
-/**
- * Formats interval like 10 per hour
- *
- * @param integer $num       number to format
- * @param integer $precision required precision
- *
- * @return string formatted string
- */
-function ADVISOR_bytime($num, $precision)
-{
-    if ($num >= 1) { // per second
-        $per = __('per second');
-    } elseif ($num * 60 >= 1) { // per minute
-        $num = $num * 60;
-        $per = __('per minute');
-    } elseif ($num * 60 * 60 >= 1 ) { // per hour
-        $num = $num * 60 * 60;
-        $per = __('per hour');
-    } else {
-        $num = $num * 60 * 60 * 24;
-        $per = __('per day');
-    }
-
-    $num = round($num, $precision);
-
-    if ($num == 0) {
-        $num = '<' . PMA\libraries\Util::pow(10, -$precision);
-    }
-
-    return "$num $per";
-}
-
-/**
- * Wrapper for PMA\libraries\Util::timespanFormat
- *
- * This function is used when evaluating advisory_rules.txt
- *
- * @param int $seconds the timespan
- *
- * @return string  the formatted value
- */
-function ADVISOR_timespanFormat($seconds)
-{
-    return PMA\libraries\Util::timespanFormat($seconds);
-}
-
-/**
- * Wrapper around PMA\libraries\Util::formatByteDown
- *
- * This function is used when evaluating advisory_rules.txt
- *
- * @param double $value the value to format
- * @param int    $limes the sensitiveness
- * @param int    $comma the number of decimals to retain
- *
- * @return string the formatted value with unit
- */
-function ADVISOR_formatByteDown($value, $limes = 6, $comma = 0)
-{
-    return implode(' ', PMA\libraries\Util::formatByteDown($value, $limes, $comma));
-}
diff --git a/#pma/libraries/advisory_rules.txt b/#pma/libraries/advisory_rules.txt
deleted file mode 100644
index 46446c0b..00000000
--- a/#pma/libraries/advisory_rules.txt
+++ /dev/null
@@ -1,452 +0,0 @@
-# phpMyAdmin Advisory rules file
-#
-# Use only UNIX style newlines
-#
-# This file is being parsed by Advisor.php, which should handle syntax
-# errors correctly. However, PHP Warnings and the like are being consumed by
-# the phpMyAdmin error handler, so those won't show up E.g.: Justification line
-# is empty because you used an unescape percent sign, sprintf() returns an
-# empty string and no warning/error is shown
-#
-# Rule Syntax:
-# 'rule' identifier[the name of the rule] eexpr [an optional precondition]
-#	expr		[variable or value calculation used for the test]
-#	expr		[test, if evaluted to 'true' it fires the rule. Use 'value' to insert the calculated value (without quotes)]
-#	string		[the issue (what is the problem?)]
-#	string		[the recommendation (how do i fix it?)]
-#	formatted-string '|' comma-seperated-expr		[the justification  (result of the calculated value / why did this rule fire?)]
-
-# comma-seperated-expr: expr(,expr)*
-# eexpr: [expr]		- expr enclosed in []
-# expr: a php code literal with extras:
-#       - variable names are replaced with their respective values
-#       - fired('name of rule') is replaced with true/false when given rule has
-#         been fired. Note however that this is a very simple rules engine.
-#         Rules are only checked in sequential order as they are written down
-#         here. If given rule has not been checked yet, fired() will always
-#         evaluate to false
-#       - 'value' is replaced with the calculated value. If it is a string, it
-#         will be put within single quotes
-#       - other than that you may use any php function, initialized variable or
-#         constant
-#
-# identifier: A string enclosed in single quotes
-# string: A quoteless string, may contain HTML. Variable names enclosed in
-#         curly braces are replaced with links to directly edit this variable.
-#         e.g. {tmp_table_size}
-# formatted-string: You may use classic php sprintf() string formatting here,
-#                   the arguments must be appended after a trailing pipe (|) as
-#                   mentioned in above syntax percent signs (%) are
-#                   automatically escaped (%%) in the following cases: When
-#                   followed by a space, dot or comma and at the end of the
-#                   line)
-#
-# Comments start with #
-#
-
-# Queries
-
-rule 'Uptime below one day'
-	Uptime
-	value < 86400
-	Uptime is less than 1 day, performance tuning may not be accurate.
-	To have more accurate averages it is recommended to let the server run for longer than a day before running this analyzer
-	The uptime is only %s | ADVISOR_timespanFormat(Uptime)
-
-rule 'Questions below 1,000'
-	Questions
-	value < 1000
-	Fewer than 1,000 questions have been run against this server. The recommendations may not be accurate.
-	Let the server run for a longer time until it has executed a greater amount of queries.
-	Current amount of Questions: %s | Questions
-
-rule 'Percentage of slow queries' [Questions > 0]
-	Slow_queries / Questions * 100
-	value >= 5
-	There is a lot of slow queries compared to the overall amount of Queries.
-	You might want to increase {long_query_time} or optimize the queries listed in the slow query log
-	The slow query rate should be below 5%, your value is %s%. | round(value,2)
-
-rule 'Slow query rate' [Questions > 0]
-	(Slow_queries / Questions * 100) / Uptime
-	value * 60 * 60 > 1
-	There is a high percentage of slow queries compared to the server uptime.
-	You might want to increase {long_query_time} or optimize the queries listed in the slow query log
-	You have a slow query rate of %s per hour, you should have less than 1% per hour. | ADVISOR_bytime(value,2)
-
-rule 'Long query time'
-	long_query_time
-	value >= 10
-	{long_query_time} is set to 10 seconds or more, thus only slow queries that take above 10 seconds are logged.
-	It is suggested to set {long_query_time} to a lower value, depending on your environment. Usually a value of 1-5 seconds is suggested.
-	long_query_time is currently set to %ds. | value
-
-rule 'Slow query logging' [PMA_MYSQL_INT_VERSION < 50600]
-	log_slow_queries
-	value == 'OFF'
-	The slow query log is disabled.
-	Enable slow query logging by setting {log_slow_queries} to 'ON'. This will help troubleshooting badly performing queries.
-	log_slow_queries is set to 'OFF'
-
-rule 'Slow query logging' [PMA_MYSQL_INT_VERSION >= 50600]
-	slow_query_log
-	value == 'OFF'
-	The slow query log is disabled.
-	Enable slow query logging by setting {slow_query_log} to 'ON'. This will help troubleshooting badly performing queries.
-	slow_query_log is set to 'OFF'
-
-#
-# versions
-rule 'Release Series'
-	version
-	substr(value,0,2) <= '5.' && substr(value,2,1) < 1
-	The MySQL server version less than 5.1.
-	You should upgrade, as MySQL 5.1 has improved performance, and MySQL 5.5 even more so.
-	Current version: %s | value
-
-rule 'Minor Version' [! fired('Release Series')]
-	version
-	substr(value,0,2) <= '5.' && substr(value,2,1) <= 1 && substr(value,4,2) < 30
-	Version less than 5.1.30 (the first GA release of 5.1).
-	You should upgrade, as recent versions of MySQL 5.1 have improved performance and MySQL 5.5 even more so.
-	Current version: %s | value
-
-rule 'Minor Version' [! fired('Release Series')]
-	version
-	substr(value,0,1) == 5 && substr(value,2,1) == 5 && substr(value,4,2) < 8
-	Version less than 5.5.8 (the first GA release of 5.5).
-	You should upgrade, to a stable version of MySQL 5.5.
-	Current version: %s | value
-
-rule 'Distribution'
-	version_comment
-	preg_match('/source/i',value)
-	Version is compiled from source, not a MySQL official binary.
-	If you did not compile from source, you may be using a package modified by a distribution. The MySQL manual only is accurate for official MySQL binaries, not any package distributions (such as RedHat, Debian/Ubuntu etc).
-	'source' found in version_comment
-
-rule 'Distribution'
-	version_comment
-	preg_match('/percona/i',value)
-	The MySQL manual only is accurate for official MySQL binaries.
-	Percona documentation is at <a href="https://www.percona.com/software/documentation/">https://www.percona.com/software/documentation/</a>
-	'percona' found in version_comment
-
-rule 'MySQL Architecture'
-	system_memory
-	value > 3072*1024 && !preg_match('/64/',version_compile_machine) && !preg_match('/64/',version_compile_os)
-	MySQL is not compiled as a 64-bit package.
-	Your memory capacity is above 3 GiB (assuming the Server is on localhost), so MySQL might not be able to access all of your memory. You might want to consider installing the 64-bit version of MySQL.
-	Available memory on this host: %s | ADVISOR_formatByteDown(value*1024, 2, 2)
-
-#
-# Query cache
-
-# Lame: 'ON' == 0 is true, so you need to compare 'ON' == '0'
-rule 'Query cache disabled'
-	query_cache_size
-	value == 0 || query_cache_type == 'OFF' || query_cache_type == '0'
-	The query cache is not enabled.
-	The query cache is known to greatly improve performance if configured correctly. Enable it by setting {query_cache_size} to a 2 digit MiB value and setting {query_cache_type} to 'ON'. <b>Note:</b> If you are using memcached, ignore this recommendation.
-	query_cache_size is set to 0 or query_cache_type is set to 'OFF'
-
-rule 'Query caching method' [!fired('Query cache disabled')]
-	Questions / Uptime
-	value > 100
-	Suboptimal caching method.
-	You are using the MySQL Query cache with a fairly high traffic database. It might be worth considering to use <a href="https://dev.mysql.com/doc/refman/5.5/en/ha-memcached.html">memcached</a> instead of the MySQL Query cache, especially if you have multiple slaves.
-	The query cache is enabled and the server receives %d queries per second. This rule fires if there is more than 100 queries per second. | round(value,1)
-
-rule 'Query cache efficiency (%)' [Com_select + Qcache_hits > 0 && !fired('Query cache disabled')]
-	Qcache_hits / (Com_select + Qcache_hits) * 100
-	value  < 20
-	Query cache not running efficiently, it has a low hit rate.
-	Consider increasing {query_cache_limit}.
-	The current query cache hit rate of %s% is below 20% | round(value,1)
-
-rule 'Query Cache usage' [!fired('Query cache disabled')]
-	100 - Qcache_free_memory / query_cache_size * 100
-	value < 80
-	Less than 80% of the query cache is being utilized.
-	This might be caused by {query_cache_limit} being too low. Flushing the query cache might help as well.
-	The current ratio of free query cache memory to total query cache size is %s%. It should be above 80% | round(value,1)
-
-rule 'Query cache fragmentation' [!fired('Query cache disabled')]
-	Qcache_free_blocks / (Qcache_total_blocks / 2) * 100
-	value > 20
-	The query cache is considerably fragmented.
-	Severe fragmentation is likely to (further) increase Qcache_lowmem_prunes. This might be caused by many Query cache low memory prunes due to {query_cache_size} being too small. For a immediate but short lived fix you can flush the query cache (might lock the query cache for a long time). Carefully adjusting {query_cache_min_res_unit} to a lower value might help too, e.g. you can set it to the average size of your queries in the cache using this formula: (query_cache_size - qcache_free_memory) / qcache_queries_in_cache
-	The cache is currently fragmented by %s% , with 100% fragmentation meaning that the query cache is an alternating pattern of free and used blocks. This value should be below 20%. | round(value,1)
-
-rule 'Query cache low memory prunes' [Qcache_inserts > 0 && !fired('Query cache disabled')]
-	Qcache_lowmem_prunes / Qcache_inserts * 100
-	value > 0.1
-	Cached queries are removed due to low query cache memory from the query cache.
-	You might want to increase {query_cache_size}, however keep in mind that the overhead of maintaining the cache is likely to increase with its size, so do this in small increments and monitor the results.
-	The ratio of removed queries to inserted queries is %s%. The lower this value is, the better (This rules firing limit: 0.1%) | round(value,1)
-
-rule 'Query cache max size' [!fired('Query cache disabled')]
-	query_cache_size
-	value > 1024 * 1024 * 128
-	The query cache size is above 128 MiB. Big query caches may cause significant overhead that is required to maintain the cache.
-	Depending on your environment, it might be performance increasing to reduce this value.
-	Current query cache size: %s | ADVISOR_formatByteDown(value, 2, 2)
-
-rule 'Query cache min result size' [!fired('Query cache disabled')]
-	query_cache_limit
-	value == 1024*1024
-	The max size of the result set in the query cache is the default of 1 MiB.
-	Changing {query_cache_limit} (usually by increasing) may increase efficiency. This variable determines the maximum size a query result may have to be inserted into the query cache. If there are many query results above 1 MiB that are well cacheable (many reads, little writes) then increasing {query_cache_limit} will increase efficiency. Whereas in the case of many query results being above 1 MiB that are not very well cacheable (often invalidated due to table updates) increasing {query_cache_limit} might reduce efficiency.
-	query_cache_limit is set to 1 MiB
-
-#
-# Sorts
-rule 'Percentage of sorts that cause temporary tables' [Sort_scan + Sort_range > 0]
-	Sort_merge_passes / (Sort_scan + Sort_range) * 100
-	value > 10
-	Too many sorts are causing temporary tables.
-	Consider increasing {sort_buffer_size} and/or {read_rnd_buffer_size}, depending on your system memory limits.
-	%s% of all sorts cause temporary tables, this value should be lower than 10%. | round(value,1)
-
-rule 'Rate of sorts that cause temporary tables'
-	Sort_merge_passes / Uptime
-	value * 60 * 60 > 1
-	Too many sorts are causing temporary tables.
-	Consider increasing {sort_buffer_size} and/or {read_rnd_buffer_size}, depending on your system memory limits.
-	Temporary tables average: %s, this value should be less than 1 per hour. | ADVISOR_bytime(value,2)
-
-rule 'Sort rows'
-	Sort_rows / Uptime
-	value * 60 >= 1
-	There are lots of rows being sorted.
-	While there is nothing wrong with a high amount of row sorting, you might want to make sure that the queries which require a lot of sorting use indexed columns in the ORDER BY clause, as this will result in much faster sorting.
-	Sorted rows average: %s | ADVISOR_bytime(value,2)
-
-# Joins, scans
-rule 'Rate of joins without indexes'
-	(Select_range_check + Select_scan + Select_full_join) / Uptime
-	value * 60 * 60 > 1
-	There are too many joins without indexes.
-	This means that joins are doing full table scans. Adding indexes for the columns being used in the join conditions will greatly speed up table joins.
-	Table joins average: %s, this value should be less than 1 per hour | ADVISOR_bytime(value,2)
-
-rule 'Rate of reading first index entry'
-	Handler_read_first / Uptime
-	value * 60 * 60 > 1
-	The rate of reading the first index entry is high.
-	This usually indicates frequent full index scans. Full index scans are faster than table scans but require lots of CPU cycles in big tables, if those tables that have or had high volumes of UPDATEs and DELETEs, running 'OPTIMIZE TABLE' might reduce the amount of and/or speed up full index scans. Other than that full index scans can only be reduced by rewriting queries.
-	Index scans average: %s, this value should be less than 1 per hour | ADVISOR_bytime(value,2)
-
-rule 'Rate of reading fixed position'
-	Handler_read_rnd / Uptime
-	value * 60 * 60 > 1
-	The rate of reading data from a fixed position is high.
-	This indicates that many queries need to sort results and/or do a full table scan, including join queries that do not use indexes. Add indexes where applicable.
-	Rate of reading fixed position average: %s, this value should be less than 1 per hour | ADVISOR_bytime(value,2)
-
-rule 'Rate of reading next table row'
-	Handler_read_rnd_next / Uptime
-	value * 60 * 60 > 1
-	The rate of reading the next table row is high.
-	This indicates that many queries are doing full table scans. Add indexes where applicable.
-	Rate of reading next table row: %s, this value should be less than 1 per hour | ADVISOR_bytime(value,2)
-
-# temp tables
-rule 'Different tmp_table_size and max_heap_table_size'
-	tmp_table_size - max_heap_table_size
-	value !=0
-	{tmp_table_size} and {max_heap_table_size} are not the same.
-	If you have deliberately changed one of either: The server uses the lower value of either to determine the maximum size of in-memory tables. So if you wish to increase the in-memory table limit you will have to increase the other value as well.
-	Current values are tmp_table_size: %s, max_heap_table_size: %s | ADVISOR_formatByteDown(tmp_table_size, 2, 2), ADVISOR_formatByteDown(max_heap_table_size, 2, 2)
-
-rule 'Percentage of temp tables on disk' [Created_tmp_tables + Created_tmp_disk_tables > 0]
-	Created_tmp_disk_tables / (Created_tmp_tables + Created_tmp_disk_tables) * 100
-	value > 25
-	Many temporary tables are being written to disk instead of being kept in memory.
-	Increasing {max_heap_table_size} and {tmp_table_size} might help. However some temporary tables are always being written to disk, independent of the value of these variables. To eliminate these you will have to rewrite your queries to avoid those conditions (Within a temporary table: Presence of a BLOB or TEXT column or presence of a column bigger than 512 bytes) as mentioned in the beginning of an <a href="https://www.facebook.com/note.php?note_id=10150111255065841&comments">Article by the Pythian Group</a>
-	%s% of all temporary tables are being written to disk, this value should be below 25% | round(value,1)
-
-rule 'Temp disk rate' [!fired('Percentage of temp tables on disk')]
-	Created_tmp_disk_tables / Uptime
-	value * 60 * 60 > 1
-	Many temporary tables are being written to disk instead of being kept in memory.
-	Increasing {max_heap_table_size} and {tmp_table_size} might help. However some temporary tables are always being written to disk, independent of the value of these variables. To eliminate these you will have to rewrite your queries to avoid those conditions (Within a temporary table: Presence of a BLOB or TEXT column or presence of a column bigger than 512 bytes) as mentioned in the <a href="https://dev.mysql.com/doc/refman/5.5/en/internal-temporary-tables.html">MySQL Documentation</a>
-	Rate of temporary tables being written to disk: %s, this value should be less than 1 per hour | ADVISOR_bytime(value,2)
-
-#
-# MyISAM index cache
-rule 'MyISAM key buffer size'
-	key_buffer_size
-	value == 0
-	Key buffer is not initialized. No MyISAM indexes will be cached.
-	Set {key_buffer_size} depending on the size of your MyISAM indexes. 64M is a good start.
-	key_buffer_size is 0
-
-rule 'Max % MyISAM key buffer ever used' [key_buffer_size > 0]
-	Key_blocks_used * key_cache_block_size / key_buffer_size * 100
-	value < 95
-	MyISAM key buffer (index cache) % used is low.
-	You may need to decrease the size of {key_buffer_size}, re-examine your tables to see if indexes have been removed, or examine queries and expectations about what indexes are being used.
-	max % MyISAM key buffer ever used: %s%, this value should be above 95% | round(value,1)
-
-# Don't fire if above rule fired - we don't need the same advice twice
-rule 'Percentage of MyISAM key buffer used' [key_buffer_size > 0 && !fired('Max % MyISAM key buffer ever used')]
-	( 1 - Key_blocks_unused * key_cache_block_size / key_buffer_size) * 100
-	value < 95
-	MyISAM key buffer (index cache) % used is low.
-	You may need to decrease the size of {key_buffer_size}, re-examine your tables to see if indexes have been removed, or examine queries and expectations about what indexes are being used.
-	% MyISAM key buffer used: %s%, this value should be above 95% | round(value,1)
-
-rule 'Percentage of index reads from memory' [Key_read_requests > 0]
-	100 - (Key_reads / Key_read_requests * 100)
-	value < 95
-	The % of indexes that use the MyISAM key buffer is low.
-	You may need to increase {key_buffer_size}.
-	Index reads from memory: %s%, this value should be above 95% | round(value,1)
-
-#
-# other caches
-rule 'Rate of table open'
-	Opened_tables / Uptime
-	value*60*60 > 10
-	The rate of opening tables is high.
-	Opening tables requires disk I/O which is costly. Increasing {table_open_cache} might avoid this.
-	Opened table rate: %s, this value should be less than 10 per hour | ADVISOR_bytime(value,2)
-
-rule 'Percentage of used open files limit'
-	Open_files / open_files_limit * 100
-	value > 85
-	The number of open files is approaching the max number of open files.  You may get a "Too many open files" error.
-	Consider increasing {open_files_limit}, and check the error log when restarting after changing {open_files_limit}.
-	The number of opened files is at %s% of the limit. It should be below 85% | round(value,1)
-
-rule 'Rate of open files'
-	Open_files / Uptime
-	value * 60 * 60 > 5
-	The rate of opening files is high.
-	Consider increasing {open_files_limit}, and check the error log when restarting after changing {open_files_limit}.
-	Opened files rate: %s, this value should be less than 5 per hour | ADVISOR_bytime(value,2)
-
-rule 'Immediate table locks %' [Table_locks_waited + Table_locks_immediate > 0]
-	Table_locks_immediate / (Table_locks_waited + Table_locks_immediate) * 100
-	value < 95
-	Too many table locks were not granted immediately.
-	Optimize queries and/or use InnoDB to reduce lock wait.
-	Immediate table locks: %s%, this value should be above 95% | round(value,1)
-
-rule 'Table lock wait rate'
-	Table_locks_waited / Uptime
-	value * 60 * 60 > 1
-	Too many table locks were not granted immediately.
-	Optimize queries and/or use InnoDB to reduce lock wait.
-	Table lock wait rate: %s, this value should be less than 1 per hour | ADVISOR_bytime(value,2)
-
-rule 'Thread cache'
-	thread_cache_size
-	value < 1
-	Thread cache is disabled, resulting in more overhead from new connections to MySQL.
-	Enable the thread cache by setting {thread_cache_size} > 0.
-	The thread cache is set to 0
-
-rule 'Thread cache hit rate %' [thread_cache_size > 0]
-	100 - Threads_created / Connections
-	value < 80
-	Thread cache is not efficient.
-	Increase {thread_cache_size}.
-	Thread cache hitrate: %s%, this value should be above 80% | round(value,1)
-
-rule 'Threads that are slow to launch' [slow_launch_time > 0]
-	Slow_launch_threads
-	value > 0
-	There are too many threads that are slow to launch.
-	This generally happens in case of general system overload as it is pretty simple operations. You might want to monitor your system load carefully.
-	%s thread(s) took longer than %s seconds to start, it should be 0 | value, slow_launch_time
-
-rule 'Slow launch time'
-	slow_launch_time
-	value > 2
-	Slow_launch_time is above 2s.
-	Set {slow_launch_time} to 1s or 2s to correctly count threads that are slow to launch.
-	slow_launch_time is set to %s | value
-
-#
-#Connections
-rule 'Percentage of used connections'
-	Max_used_connections / max_connections * 100
-	value > 80
-	The maximum amount of used connections is getting close to the value of {max_connections}.
-	Increase {max_connections}, or decrease {wait_timeout} so that connections that do not close database handlers properly get killed sooner. Make sure the code closes database handlers properly.
-	Max_used_connections is at %s% of max_connections, it should be below 80% | round(value,1)
-
-rule 'Percentage of aborted connections'
-	Aborted_connects / Connections * 100
-	value > 1
-	Too many connections are aborted.
-	Connections are usually aborted when they cannot be authorized. <a href="https://www.percona.com/blog/2008/08/23/how-to-track-down-the-source-of-aborted_connects/">This article</a> might help you track down the source.
-	%s% of all connections are aborted. This value should be below 1% | round(value,1)
-
-rule 'Rate of aborted connections'
-	Aborted_connects / Uptime
-	value * 60 * 60 > 1
-	Too many connections are aborted.
-	Connections are usually aborted when they cannot be authorized. <a href="https://www.percona.com/blog/2008/08/23/how-to-track-down-the-source-of-aborted_connects/">This article</a> might help you track down the source.
-	Aborted connections rate is at %s, this value should be less than 1 per hour | ADVISOR_bytime(value,2)
-
-rule 'Percentage of aborted clients'
-	Aborted_clients / Connections * 100
-	value > 2
-	Too many clients are aborted.
-	Clients are usually aborted when they did not close their connection to MySQL properly. This can be due to network issues or code not closing a database handler properly. Check your network and code.
-	%s% of all clients are aborted. This value should be below 2% | round(value,1)
-
-rule 'Rate of aborted clients'
-	Aborted_clients / Uptime
-	value * 60 * 60 > 1
-	Too many clients are aborted.
-	Clients are usually aborted when they did not close their connection to MySQL properly. This can be due to network issues or code not closing a database handler properly. Check your network and code.
-	Aborted client rate is at %s, this value should be less than 1 per hour | ADVISOR_bytime(value,2)
-
-#
-# InnoDB
-rule 'Is InnoDB disabled?' [PMA_MYSQL_INT_VERSION < 50600]
-	have_innodb
-	value != "YES"
-	You do not have InnoDB enabled.
-	InnoDB is usually the better choice for table engines.
-	have_innodb is set to 'value'
-
-rule 'InnoDB log size' [innodb_buffer_pool_size > 0]
-	innodb_log_file_size / innodb_buffer_pool_size * 100
-	value < 20 && innodb_log_file_size / (1024 * 1024) < 256
-	The InnoDB log file size is not an appropriate size, in relation to the InnoDB buffer pool.
-	Especially on a system with a lot of writes to InnoDB tables you should set {innodb_log_file_size} to 25% of {innodb_buffer_pool_size}. However the bigger this value, the longer the recovery time will be when database crashes, so this value should not be set much higher than 256 MiB. Please note however that you cannot simply change the value of this variable. You need to shutdown the server, remove the InnoDB log files, set the new value in my.cnf, start the server, then check the error logs if everything went fine. See also <a href="https://mysqldatabaseadministration.blogspot.com/2007/01/increase-innodblogfilesize-proper-way.html">this blog entry</a>
-	Your InnoDB log size is at %s% in relation to the InnoDB buffer pool size, it should not be below 20% | round(value,1)
-
-rule 'Max InnoDB log size' [innodb_buffer_pool_size > 0 && innodb_log_file_size / innodb_buffer_pool_size * 100 < 30]
-	innodb_log_file_size / (1024 * 1024)
-	value > 256
-	The InnoDB log file size is inadequately large.
-	It is usually sufficient to set {innodb_log_file_size} to 25% of the size of {innodb_buffer_pool_size}. A very big {innodb_log_file_size} slows down the recovery time after a database crash considerably. See also <a href="https://www.percona.com/blog/2006/07/03/choosing-proper-innodb_log_file_size/">this Article</a>. You need to shutdown the server, remove the InnoDB log files, set the new value in my.cnf, start the server, then check the error logs if everything went fine. See also <a href="https://mysqldatabaseadministration.blogspot.com/2007/01/increase-innodblogfilesize-proper-way.html">this blog entry</a>
-	Your absolute InnoDB log size is %s MiB | round(value,1)
-
-rule 'InnoDB buffer pool size' [system_memory > 0]
-	innodb_buffer_pool_size / system_memory * 100
-	value < 60
-	Your InnoDB buffer pool is fairly small.
-	The InnoDB buffer pool has a profound impact on performance for InnoDB tables. Assign all your remaining memory to this buffer. For database servers that use solely InnoDB as storage engine and have no other services (e.g. a web server) running, you may set this as high as 80% of your available memory. If that is not the case, you need to carefully assess the memory consumption of your other services and non-InnoDB-Tables and set this variable accordingly. If it is set too high, your system will start swapping, which decreases performance significantly. See also <a href="https://www.percona.com/blog/2007/11/03/choosing-innodb_buffer_pool_size/">this article</a>
-	You are currently using %s% of your memory for the InnoDB buffer pool. This rule fires if you are assigning less than 60%, however this might be perfectly adequate for your system if you don't have much InnoDB tables or other services running on the same machine. | value
-
-#
-# other
-rule 'MyISAM concurrent inserts'
-	concurrent_insert
-	value === 0 || value === 'NEVER'
-	Enable {concurrent_insert} by setting it to 1
-	Setting {concurrent_insert} to 1 reduces contention between readers and writers for a given table. See also <a href="https://dev.mysql.com/doc/refman/5.5/en/concurrent-inserts.html">MySQL Documentation</a>
-	concurrent_insert is set to 0
-
-# INSERT DELAYED USAGE
-#Delayed_errors 0
-#Delayed_insert_threads 0
-#Delayed_writes 0
-#Not_flushed_delayed_rows
diff --git a/#pma/libraries/autoloader.php b/#pma/libraries/autoloader.php
deleted file mode 100644
index dfc4c21e..00000000
--- a/#pma/libraries/autoloader.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Load class autoloader
- *
- * @package PhpMyAdmin
- */
-
-require_once './libraries/Psr4Autoloader.php';
-
-// instantiate the loader
-$loader = \PMA\Psr4Autoloader::getInstance();
-
-// register the autoloader
-$loader->register();
-
-// register the base directories for the namespace prefix
-$loader->addNamespace('PMA', '.');
-$loader->addNamespace('SqlParser', './libraries/sql-parser/src');
-$loader->addNamespace('phpseclib', PHPSECLIB_INC_DIR);
diff --git a/#pma/libraries/bfShapeFiles/ShapeFile.lib.php b/#pma/libraries/bfShapeFiles/ShapeFile.lib.php
deleted file mode 100644
index 5afd8229..00000000
--- a/#pma/libraries/bfShapeFiles/ShapeFile.lib.php
+++ /dev/null
@@ -1,680 +0,0 @@
-<?php
-/**
- * BytesFall ShapeFiles library
- *
- * The library implements the 2D variants of the ShapeFile format as defined in
- * http://www.esri.com/library/whitepapers/pdfs/shapefile.pdf.
- * The library currently supports reading and editing of ShapeFiles and the
- * Associated information (DBF file).
- *
- * @package bfShapeFiles
- * @version 0.0.2
- * @link http://bfshapefiles.sourceforge.net/
- * @license http://www.gnu.org/licenses/gpl-2.0.html GPLv2-or-later
- *
- * Copyright 2006-2007 Ovidio <ovidio AT users.sourceforge.net>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, you can download one from
- * http://www.gnu.org/copyleft/gpl.html.
- *
- */
-  function loadData($type, $data) {
-    if (!$data) return $data;
-    $tmp = unpack($type, $data);
-    return current($tmp);
-  }
-
-  function swap($binValue) {
-    $result = $binValue{strlen($binValue) - 1};
-    for($i = strlen($binValue) - 2; $i >= 0 ; $i--) {
-      $result .= $binValue{$i};
-    }
-
-    return $result;
-  }
-
-  function packDouble($value, $mode = 'LE') {
-    $value = (double)$value;
-    $bin = pack("d", $value);
-
-    //We test if the conversion of an integer (1) is done as LE or BE by default
-    switch (pack ('L', 1)) {
-      case pack ('V', 1): //Little Endian
-        $result = ($mode == 'LE') ? $bin : swap($bin);
-      break;
-      case pack ('N', 1): //Big Endian
-        $result = ($mode == 'BE') ? $bin : swap($bin);
-      break;
-      default: //Some other thing, we just return false
-        $result = FALSE;
-    }
-
-    return $result;
-  }
-/**
- * ShapeFile class
- *
- * @package bfShapeFiles
- */
-  class ShapeFile {
-    var $FileName;
-
-    var $SHPFile;
-    var $SHXFile;
-    var $DBFFile;
-
-    var $DBFHeader;
-
-    var $lastError = "";
-
-    var $boundingBox = array("xmin" => 0.0, "ymin" => 0.0, "xmax" => 0.0, "ymax" => 0.0);
-    var $fileLength = 0;
-    var $shapeType = 0;
-
-    var $records;
-
-    public function __construct($shapeType, $boundingBox = array("xmin" => 0.0, "ymin" => 0.0, "xmax" => 0.0, "ymax" => 0.0), $FileName = NULL) {
-      $this->shapeType = $shapeType;
-      $this->boundingBox = $boundingBox;
-      $this->FileName = $FileName;
-      $this->fileLength = 50;
-    }
-
-    function loadFromFile($FileName) {
-      $this->FileName = $FileName;
-
-      if (($this->_openSHPFile()) && ($this->_openDBFFile())) {
-        $this->_loadHeaders();
-        $this->_loadRecords();
-        $this->_closeSHPFile();
-        $this->_closeDBFFile();
-      } else {
-        return false;
-      }
-    }
-
-    function saveToFile($FileName = NULL) {
-      if ($FileName != NULL) $this->FileName = $FileName;
-
-      if (($this->_openSHPFile(TRUE)) && ($this->_openSHXFile(TRUE)) && ($this->_openDBFFile(TRUE))) {
-        $this->_saveHeaders();
-        $this->_saveRecords();
-        $this->_closeSHPFile();
-        $this->_closeSHXFile();
-        $this->_closeDBFFile();
-      } else {
-        return false;
-      }
-    }
-
-    function addRecord($record) {
-      if ((isset($this->DBFHeader)) && (is_array($this->DBFHeader))) {
-        $record->updateDBFInfo($this->DBFHeader);
-      }
-
-      $this->fileLength += ($record->getContentLength() + 4);
-      $this->records[] = $record;
-      $this->records[count($this->records) - 1]->recordNumber = count($this->records);
-
-      return (count($this->records) - 1);
-    }
-
-    function deleteRecord($index) {
-      if (isset($this->records[$index])) {
-        $this->fileLength -= ($this->records[$index]->getContentLength() + 4);
-        for ($i = $index; $i < (count($this->records) - 1); $i++) {
-          $this->records[$i] = $this->records[$i + 1];
-        }
-        unset($this->records[count($this->records) - 1]);
-        $this->_deleteRecordFromDBF($index);
-      }
-    }
-
-    function getDBFHeader() {
-      return $this->DBFHeader;
-    }
-
-    function setDBFHeader($header) {
-      $this->DBFHeader = $header;
-
-      for ($i = 0; $i < count($this->records); $i++) {
-        $this->records[$i]->updateDBFInfo($header);
-      }
-    }
-
-    function getIndexFromDBFData($field, $value) {
-      $result = -1;
-      for ($i = 0; $i < (count($this->records) - 1); $i++) {
-        if (isset($this->records[$i]->DBFData[$field]) && (strtoupper($this->records[$i]->DBFData[$field]) == strtoupper($value))) {
-          $result = $i;
-        }
-      }
-
-      return $result;
-    }
-
-    function _loadDBFHeader() {
-      $DBFFile = fopen(str_replace('.*', '.dbf', $this->FileName), 'r');
-
-      $result = array();
-      $buff32 = array();
-      $i = 1;
-      $inHeader = true;
-
-      while ($inHeader) {
-        if (!feof($DBFFile)) {
-          $buff32 = fread($DBFFile, 32);
-          if ($i > 1) {
-            if (substr($buff32, 0, 1) == chr(13)) {
-              $inHeader = false;
-            } else {
-              $pos = strpos(substr($buff32, 0, 10), chr(0));
-              $pos = ($pos == 0 ? 10 : $pos);
-
-              $fieldName = substr($buff32, 0, $pos);
-              $fieldType = substr($buff32, 11, 1);
-              $fieldLen = ord(substr($buff32, 16, 1));
-              $fieldDec = ord(substr($buff32, 17, 1));
-
-              array_push($result, array($fieldName, $fieldType, $fieldLen, $fieldDec));
-            }
-          }
-          $i++;
-        } else {
-          $inHeader = false;
-        }
-      }
-
-      fclose($DBFFile);
-      return($result);
-    }
-
-    function _deleteRecordFromDBF($index) {
-      if (@dbase_delete_record($this->DBFFile, $index)) {
-        @dbase_pack($this->DBFFile);
-      }
-    }
-
-    function _loadHeaders() {
-      fseek($this->SHPFile, 24, SEEK_SET);
-      $this->fileLength = loadData("N", fread($this->SHPFile, 4));
-
-      fseek($this->SHPFile, 32, SEEK_SET);
-      $this->shapeType = loadData("V", fread($this->SHPFile, 4));
-
-      $this->boundingBox = array();
-      $this->boundingBox["xmin"] = loadData("d", fread($this->SHPFile, 8));
-      $this->boundingBox["ymin"] = loadData("d", fread($this->SHPFile, 8));
-      $this->boundingBox["xmax"] = loadData("d", fread($this->SHPFile, 8));
-      $this->boundingBox["ymax"] = loadData("d", fread($this->SHPFile, 8));
-
-      $this->DBFHeader = $this->_loadDBFHeader();
-    }
-
-    function _saveHeaders() {
-      fwrite($this->SHPFile, pack("NNNNNN", 9994, 0, 0, 0, 0, 0));
-      fwrite($this->SHPFile, pack("N", $this->fileLength));
-      fwrite($this->SHPFile, pack("V", 1000));
-      fwrite($this->SHPFile, pack("V", $this->shapeType));
-      fwrite($this->SHPFile, packDouble($this->boundingBox['xmin']));
-      fwrite($this->SHPFile, packDouble($this->boundingBox['ymin']));
-      fwrite($this->SHPFile, packDouble($this->boundingBox['xmax']));
-      fwrite($this->SHPFile, packDouble($this->boundingBox['ymax']));
-      fwrite($this->SHPFile, pack("dddd", 0, 0, 0, 0));
-
-      fwrite($this->SHXFile, pack("NNNNNN", 9994, 0, 0, 0, 0, 0));
-      fwrite($this->SHXFile, pack("N", 50 + 4*count($this->records)));
-      fwrite($this->SHXFile, pack("V", 1000));
-      fwrite($this->SHXFile, pack("V", $this->shapeType));
-      fwrite($this->SHXFile, packDouble($this->boundingBox['xmin']));
-      fwrite($this->SHXFile, packDouble($this->boundingBox['ymin']));
-      fwrite($this->SHXFile, packDouble($this->boundingBox['xmax']));
-      fwrite($this->SHXFile, packDouble($this->boundingBox['ymax']));
-      fwrite($this->SHXFile, pack("dddd", 0, 0, 0, 0));
-    }
-
-    function _loadRecords() {
-      fseek($this->SHPFile, 100);
-      while (!feof($this->SHPFile)) {
-        $bByte = ftell($this->SHPFile);
-        $record = new ShapeRecord(-1);
-        $record->loadFromFile($this->SHPFile, $this->DBFFile);
-        $eByte = ftell($this->SHPFile);
-        if (($eByte <= $bByte) || ($record->lastError != "")) {
-          return false;
-        }
-
-        $this->records[] = $record;
-      }
-    }
-
-    function _saveRecords() {
-      if (file_exists(str_replace('.*', '.dbf', $this->FileName))) {
-        @unlink(str_replace('.*', '.dbf', $this->FileName));
-      }
-      if (!($this->DBFFile = @dbase_create(str_replace('.*', '.dbf', $this->FileName), $this->DBFHeader))) {
-        return $this->setError(sprintf("It wasn't possible to create the DBase file '%s'", str_replace('.*', '.dbf', $this->FileName)));
-      }
-
-      $offset = 50;
-      if (is_array($this->records) && (count($this->records) > 0)) {
-        reset($this->records);
-        while (list($index, $record) = each($this->records)) {
-          //Save the record to the .shp file
-          $record->saveToFile($this->SHPFile, $this->DBFFile, $index + 1);
-
-          //Save the record to the .shx file
-          fwrite($this->SHXFile, pack("N", $offset));
-          fwrite($this->SHXFile, pack("N", $record->getContentLength()));
-          $offset += (4 + $record->getContentLength());
-        }
-      }
-      @dbase_pack($this->DBFFile);
-    }
-
-    function _openSHPFile($toWrite = false) {
-      $this->SHPFile = @fopen(str_replace('.*', '.shp', $this->FileName), ($toWrite ? "wb+" : "rb"));
-      if (!$this->SHPFile) {
-        return $this->setError(sprintf("It wasn't possible to open the Shape file '%s'", str_replace('.*', '.shp', $this->FileName)));
-      }
-
-      return TRUE;
-    }
-
-    function _closeSHPFile() {
-      if ($this->SHPFile) {
-        fclose($this->SHPFile);
-        $this->SHPFile = NULL;
-      }
-    }
-
-    function _openSHXFile($toWrite = false) {
-      $this->SHXFile = @fopen(str_replace('.*', '.shx', $this->FileName), ($toWrite ? "wb+" : "rb"));
-      if (!$this->SHXFile) {
-        return $this->setError(sprintf("It wasn't possible to open the Index file '%s'", str_replace('.*', '.shx', $this->FileName)));
-      }
-
-      return TRUE;
-    }
-
-    function _closeSHXFile() {
-      if ($this->SHXFile) {
-        fclose($this->SHXFile);
-        $this->SHXFile = NULL;
-      }
-    }
-
-    function _openDBFFile($toWrite = false) {
-      $checkFunction = $toWrite ? "is_writable" : "is_readable";
-      if (($toWrite) && (!file_exists(str_replace('.*', '.dbf', $this->FileName)))) {
-        if (!@dbase_create(str_replace('.*', '.dbf', $this->FileName), $this->DBFHeader)) {
-          return $this->setError(sprintf("It wasn't possible to create the DBase file '%s'", str_replace('.*', '.dbf', $this->FileName)));
-        }
-      }
-      if ($checkFunction(str_replace('.*', '.dbf', $this->FileName))) {
-        $this->DBFFile = dbase_open(str_replace('.*', '.dbf', $this->FileName), ($toWrite ? 2 : 0));
-        if (!$this->DBFFile) {
-          return $this->setError(sprintf("It wasn't possible to open the DBase file '%s'", str_replace('.*', '.dbf', $this->FileName)));
-        }
-      } else {
-        return $this->setError(sprintf("It wasn't possible to find the DBase file '%s'", str_replace('.*', '.dbf', $this->FileName)));
-      }
-      return TRUE;
-    }
-
-    function _closeDBFFile() {
-      if ($this->DBFFile) {
-        dbase_close($this->DBFFile);
-        $this->DBFFile = NULL;
-      }
-    }
-
-    function setError($error) {
-      $this->lastError = $error;
-      return false;
-    }
-  }
-
-  class ShapeRecord {
-    var $SHPFile = NULL;
-    var $DBFFile = NULL;
-
-    var $recordNumber = NULL;
-    var $shapeType = NULL;
-
-    var $lastError = "";
-
-    var $SHPData = array();
-    var $DBFData = array();
-
-    public function __construct($shapeType) {
-      $this->shapeType = $shapeType;
-    }
-
-    function loadFromFile(&$SHPFile, &$DBFFile) {
-      $this->SHPFile = $SHPFile;
-      $this->DBFFile = $DBFFile;
-      $this->_loadHeaders();
-
-      switch ($this->shapeType) {
-        case 0:
-          $this->_loadNullRecord();
-        break;
-        case 1:
-          $this->_loadPointRecord();
-        break;
-        case 3:
-          $this->_loadPolyLineRecord();
-        break;
-        case 5:
-          $this->_loadPolygonRecord();
-        break;
-        case 8:
-          $this->_loadMultiPointRecord();
-        break;
-        default:
-          $this->setError(sprintf("The Shape Type '%s' is not supported.", $this->shapeType));
-        break;
-      }
-      $this->_loadDBFData();
-    }
-
-    function saveToFile(&$SHPFile, &$DBFFile, $recordNumber) {
-      $this->SHPFile = $SHPFile;
-      $this->DBFFile = $DBFFile;
-      $this->recordNumber = $recordNumber;
-      $this->_saveHeaders();
-
-      switch ($this->shapeType) {
-        case 0:
-          $this->_saveNullRecord();
-        break;
-        case 1:
-          $this->_savePointRecord();
-        break;
-        case 3:
-          $this->_savePolyLineRecord();
-        break;
-        case 5:
-          $this->_savePolygonRecord();
-        break;
-        case 8:
-          $this->_saveMultiPointRecord();
-        break;
-        default:
-          $this->setError(sprintf("The Shape Type '%s' is not supported.", $this->shapeType));
-        break;
-      }
-      $this->_saveDBFData();
-    }
-
-    function updateDBFInfo($header) {
-      $tmp = $this->DBFData;
-      unset($this->DBFData);
-      $this->DBFData = array();
-      reset($header);
-      while (list($key, $value) = each($header)) {
-        $this->DBFData[$value[0]] = (isset($tmp[$value[0]])) ? $tmp[$value[0]] : "";
-      }
-    }
-
-    function _loadHeaders() {
-      $this->recordNumber = loadData("N", fread($this->SHPFile, 4));
-      $tmp = loadData("N", fread($this->SHPFile, 4)); //We read the length of the record
-      $this->shapeType = loadData("V", fread($this->SHPFile, 4));
-    }
-
-    function _saveHeaders() {
-      fwrite($this->SHPFile, pack("N", $this->recordNumber));
-      fwrite($this->SHPFile, pack("N", $this->getContentLength()));
-      fwrite($this->SHPFile, pack("V", $this->shapeType));
-    }
-
-    function _loadPoint() {
-      $data = array();
-
-      $data["x"] = loadData("d", fread($this->SHPFile, 8));
-      $data["y"] = loadData("d", fread($this->SHPFile, 8));
-
-      return $data;
-    }
-
-    function _savePoint($data) {
-      fwrite($this->SHPFile, packDouble($data["x"]));
-      fwrite($this->SHPFile, packDouble($data["y"]));
-    }
-
-    function _loadNullRecord() {
-      $this->SHPData = array();
-    }
-
-    function _saveNullRecord() {
-      //Don't save anything
-    }
-
-    function _loadPointRecord() {
-      $this->SHPData = $this->_loadPoint();
-    }
-
-    function _savePointRecord() {
-      $this->_savePoint($this->SHPData);
-    }
-
-    function _loadMultiPointRecord() {
-      $this->SHPData = array();
-      $this->SHPData["xmin"] = loadData("d", fread($this->SHPFile, 8));
-      $this->SHPData["ymin"] = loadData("d", fread($this->SHPFile, 8));
-      $this->SHPData["xmax"] = loadData("d", fread($this->SHPFile, 8));
-      $this->SHPData["ymax"] = loadData("d", fread($this->SHPFile, 8));
-
-      $this->SHPData["numpoints"] = loadData("V", fread($this->SHPFile, 4));
-
-      for ($i = 0; $i <= $this->SHPData["numpoints"]; $i++) {
-        $this->SHPData["points"][] = $this->_loadPoint();
-      }
-    }
-
-    function _saveMultiPointRecord() {
-      fwrite($this->SHPFile, pack("dddd", $this->SHPData["xmin"], $this->SHPData["ymin"], $this->SHPData["xmax"], $this->SHPData["ymax"]));
-
-      fwrite($this->SHPFile, pack("V", $this->SHPData["numpoints"]));
-
-      for ($i = 0; $i <= $this->SHPData["numpoints"]; $i++) {
-        $this->_savePoint($this->SHPData["points"][$i]);
-      }
-    }
-
-    function _loadPolyLineRecord() {
-      $this->SHPData = array();
-      $this->SHPData["xmin"] = loadData("d", fread($this->SHPFile, 8));
-      $this->SHPData["ymin"] = loadData("d", fread($this->SHPFile, 8));
-      $this->SHPData["xmax"] = loadData("d", fread($this->SHPFile, 8));
-      $this->SHPData["ymax"] = loadData("d", fread($this->SHPFile, 8));
-
-      $this->SHPData["numparts"]  = loadData("V", fread($this->SHPFile, 4));
-      $this->SHPData["numpoints"] = loadData("V", fread($this->SHPFile, 4));
-
-      for ($i = 0; $i < $this->SHPData["numparts"]; $i++) {
-        $this->SHPData["parts"][$i] = loadData("V", fread($this->SHPFile, 4));
-      }
-
-      $firstIndex = ftell($this->SHPFile);
-      $readPoints = 0;
-      reset($this->SHPData["parts"]);
-      while (list($partIndex, $partData) = each($this->SHPData["parts"])) {
-        if (!isset($this->SHPData["parts"][$partIndex]["points"]) || !is_array($this->SHPData["parts"][$partIndex]["points"])) {
-          $this->SHPData["parts"][$partIndex] = array();
-          $this->SHPData["parts"][$partIndex]["points"] = array();
-        }
-        while (!in_array($readPoints, $this->SHPData["parts"]) && ($readPoints < ($this->SHPData["numpoints"])) && !feof($this->SHPFile)) {
-          $this->SHPData["parts"][$partIndex]["points"][] = $this->_loadPoint();
-          $readPoints++;
-        }
-      }
-
-      fseek($this->SHPFile, $firstIndex + ($readPoints*16));
-    }
-
-    function _savePolyLineRecord() {
-      fwrite($this->SHPFile, pack("dddd", $this->SHPData["xmin"], $this->SHPData["ymin"], $this->SHPData["xmax"], $this->SHPData["ymax"]));
-
-      fwrite($this->SHPFile, pack("VV", $this->SHPData["numparts"], $this->SHPData["numpoints"]));
-
-      for ($i = 0; $i < $this->SHPData["numparts"]; $i++) {
-        fwrite($this->SHPFile, pack("V", count($this->SHPData["parts"][$i])));
-      }
-
-      foreach ($this->SHPData["parts"] as $partData){
-        reset($partData["points"]);
-        while (list($pointIndex, $pointData) = each($partData["points"])) {
-          $this->_savePoint($pointData);
-        }
-      }
-    }
-
-    function _loadPolygonRecord() {
-      $this->_loadPolyLineRecord();
-    }
-
-    function _savePolygonRecord() {
-      $this->_savePolyLineRecord();
-    }
-
-    function addPoint($point, $partIndex = 0) {
-      switch ($this->shapeType) {
-        case 0:
-          //Don't add anything
-        break;
-        case 1:
-          //Substitutes the value of the current point
-          $this->SHPData = $point;
-        break;
-        case 3:
-        case 5:
-          //Adds a new point to the selected part
-          if (!isset($this->SHPData["xmin"]) || ($this->SHPData["xmin"] > $point["x"])) $this->SHPData["xmin"] = $point["x"];
-          if (!isset($this->SHPData["ymin"]) || ($this->SHPData["ymin"] > $point["y"])) $this->SHPData["ymin"] = $point["y"];
-          if (!isset($this->SHPData["xmax"]) || ($this->SHPData["xmax"] < $point["x"])) $this->SHPData["xmax"] = $point["x"];
-          if (!isset($this->SHPData["ymax"]) || ($this->SHPData["ymax"] < $point["y"])) $this->SHPData["ymax"] = $point["y"];
-
-          $this->SHPData["parts"][$partIndex]["points"][] = $point;
-
-          $this->SHPData["numparts"] = count($this->SHPData["parts"]);
-          $this->SHPData["numpoints"]++;
-        break;
-        case 8:
-          //Adds a new point
-          if (!isset($this->SHPData["xmin"]) || ($this->SHPData["xmin"] > $point["x"])) $this->SHPData["xmin"] = $point["x"];
-          if (!isset($this->SHPData["ymin"]) || ($this->SHPData["ymin"] > $point["y"])) $this->SHPData["ymin"] = $point["y"];
-          if (!isset($this->SHPData["xmax"]) || ($this->SHPData["xmax"] < $point["x"])) $this->SHPData["xmax"] = $point["x"];
-          if (!isset($this->SHPData["ymax"]) || ($this->SHPData["ymax"] < $point["y"])) $this->SHPData["ymax"] = $point["y"];
-
-          $this->SHPData["points"][] = $point;
-          $this->SHPData["numpoints"]++;
-        break;
-        default:
-          $this->setError(sprintf("The Shape Type '%s' is not supported.", $this->shapeType));
-        break;
-      }
-    }
-
-    function deletePoint($pointIndex = 0, $partIndex = 0) {
-      switch ($this->shapeType) {
-        case 0:
-          //Don't delete anything
-        break;
-        case 1:
-          //Sets the value of the point to zero
-          $this->SHPData["x"] = 0.0;
-          $this->SHPData["y"] = 0.0;
-        break;
-        case 3:
-        case 5:
-          //Deletes the point from the selected part, if exists
-          if (isset($this->SHPData["parts"][$partIndex]) && isset($this->SHPData["parts"][$partIndex]["points"][$pointIndex])) {
-            for ($i = $pointIndex; $i < (count($this->SHPData["parts"][$partIndex]["points"]) - 1); $i++) {
-              $this->SHPData["parts"][$partIndex]["points"][$i] = $this->SHPData["parts"][$partIndex]["points"][$i + 1];
-            }
-            unset($this->SHPData["parts"][$partIndex]["points"][count($this->SHPData["parts"][$partIndex]["points"]) - 1]);
-
-            $this->SHPData["numparts"] = count($this->SHPData["parts"]);
-            $this->SHPData["numpoints"]--;
-          }
-        break;
-        case 8:
-          //Deletes the point, if exists
-          if (isset($this->SHPData["points"][$pointIndex])) {
-            for ($i = $pointIndex; $i < (count($this->SHPData["points"]) - 1); $i++) {
-              $this->SHPData["points"][$i] = $this->SHPData["points"][$i + 1];
-            }
-            unset($this->SHPData["points"][count($this->SHPData["points"]) - 1]);
-
-            $this->SHPData["numpoints"]--;
-          }
-        break;
-        default:
-          $this->setError(sprintf("The Shape Type '%s' is not supported.", $this->shapeType));
-        break;
-      }
-    }
-
-    function getContentLength() {
-      switch ($this->shapeType) {
-        case 0:
-          $result = 0;
-        break;
-        case 1:
-          $result = 10;
-        break;
-        case 3:
-        case 5:
-          $result = 22 + 2*count($this->SHPData["parts"]);
-          for ($i = 0; $i < count($this->SHPData["parts"]); $i++) {
-            $result += 8*count($this->SHPData["parts"][$i]["points"]);
-          }
-        break;
-        case 8:
-          $result = 20 + 8*count($this->SHPData["points"]);
-        break;
-        default:
-          $result = false;
-          $this->setError(sprintf("The Shape Type '%s' is not supported.", $this->shapeType));
-        break;
-      }
-      return $result;
-    }
-
-    function _loadDBFData() {
-      $this->DBFData = @dbase_get_record_with_names($this->DBFFile, $this->recordNumber);
-      unset($this->DBFData["deleted"]);
-    }
-
-    function _saveDBFData() {
-      unset($this->DBFData["deleted"]);
-      if ($this->recordNumber <= dbase_numrecords($this->DBFFile)) {
-        if (!dbase_replace_record($this->DBFFile, array_values($this->DBFData), $this->recordNumber)) {
-          $this->setError("I wasn't possible to update the information in the DBF file.");
-        }
-      } else {
-        if (!dbase_add_record($this->DBFFile, array_values($this->DBFData))) {
-          $this->setError("I wasn't possible to add the information to the DBF file.");
-        }
-      }
-    }
-
-    function setError($error) {
-      $this->lastError = $error;
-      return false;
-    }
-  }
-
diff --git a/#pma/libraries/bookmark.lib.php b/#pma/libraries/bookmark.lib.php
deleted file mode 100644
index 872b0da2..00000000
--- a/#pma/libraries/bookmark.lib.php
+++ /dev/null
@@ -1,289 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Set of functions used with the bookmark feature
- *
- * @package PhpMyAdmin
- */
-
-/**
- * Defines the bookmark parameters for the current user
- *
- * @return array    the bookmark parameters for the current user
- * @access  public
- */
-function PMA_Bookmark_getParams()
-{
-    static $cfgBookmark = null;
-
-    if (null !== $cfgBookmark) {
-        return $cfgBookmark;
-    }
-
-    $cfgRelation = PMA_getRelationsParam();
-
-    if ($cfgRelation['bookmarkwork']) {
-        $cfgBookmark = array(
-            'user'  => $GLOBALS['cfg']['Server']['user'],
-            'db'    => $cfgRelation['db'],
-            'table' => $cfgRelation['bookmark'],
-        );
-    } else {
-        $cfgBookmark = false;
-    }
-
-    return $cfgBookmark;
-} // end of the 'PMA_Bookmark_getParams()' function
-
-
-/**
- * Gets the list of bookmarks defined for the current database
- *
- * @param string|bool $db the current database name or false
- *
- * @return array the bookmarks list (key as index, label as value),
- *               or if param is empty, function will give more information,
- *               array will be unindexed,
- *               each struct: [db, id, label, shared, query]
- *
- * @access public
- *
- * @global resource $controllink the controluser db connection handle
- */
-function PMA_Bookmark_getList($db = false)
-{
-    global $controllink;
-
-    $cfgBookmark = PMA_Bookmark_getParams();
-
-    if (empty($cfgBookmark)) {
-        return array();
-    }
-
-    if ($db !== false) {
-        $query = 'SELECT query, label, id FROM ' . PMA\libraries\Util::backquote(
-            $cfgBookmark['db']
-        ) . '.' . PMA\libraries\Util::backquote($cfgBookmark['table'])
-        . ' WHERE dbase = \'' . $GLOBALS['dbi']->escapeString($db) . '\''
-        . ' AND user = \'' . $GLOBALS['dbi']->escapeString($cfgBookmark['user'])
-            . '\''
-        . ' ORDER BY label';
-        $per_user = $GLOBALS['dbi']->fetchResult(
-            $query,
-            'id',
-            null,
-            $controllink,
-            PMA\libraries\DatabaseInterface::QUERY_STORE
-        );
-
-        $query = 'SELECT query, label, id FROM ' . PMA\libraries\Util::backquote(
-            $cfgBookmark['db']
-        ) . '.' . PMA\libraries\Util::backquote($cfgBookmark['table'])
-        . ' WHERE dbase = \'' . $GLOBALS['dbi']->escapeString($db) . '\''
-        . ' AND user = \'\''
-        . ' ORDER BY label';
-        $global = $GLOBALS['dbi']->fetchResult(
-            $query,
-            'id',
-            null,
-            $controllink,
-            PMA\libraries\DatabaseInterface::QUERY_STORE
-        );
-
-        foreach ($global as $key => $val) {
-            $global[$key]['label'] = $val['label'] . ' (' . __('shared') . ')';
-        }
-
-        $ret = $global + $per_user;
-
-        asort($ret);
-    } else {
-        $query = "SELECT `label`, `id`, `query`, `dbase` AS `db`,"
-            . " IF (`user` = '', true, false) AS `shared`"
-            . " FROM " . PMA\libraries\Util::backquote($cfgBookmark['db'])
-            . "." . PMA\libraries\Util::backquote($cfgBookmark['table'])
-            . " WHERE `user` = '' OR"
-            . " `user` = '" . $GLOBALS['dbi']->escapeString($cfgBookmark['user'])
-            . "'";
-
-        $ret = $GLOBALS['dbi']->fetchResult(
-            $query,
-            null,
-            null,
-            $controllink,
-            PMA\libraries\DatabaseInterface::QUERY_STORE
-        );
-    }
-
-    return $ret;
-} // end of the 'PMA_Bookmark_getList()' function
-
-
-/**
- * Gets the sql command from a bookmark
- *
- * @param string  $db                  the current database name
- * @param mixed   $id                  the id of the bookmark to get
- * @param string  $id_field            which field to look up the $id
- * @param boolean $action_bookmark_all true: get all bookmarks regardless
- *                                     of the owning user
- * @param boolean $exact_user_match    whether to ignore bookmarks with no user
- *
- * @return string    the sql query
- *
- * @access  public
- *
- * @global  resource $controllink the controluser db connection handle
- *
- */
-function PMA_Bookmark_get($db, $id, $id_field = 'id', $action_bookmark_all = false,
-    $exact_user_match = false
-) {
-    global $controllink;
-
-    $cfgBookmark = PMA_Bookmark_getParams();
-
-    if (empty($cfgBookmark)) {
-        return '';
-    }
-
-    $query = 'SELECT query FROM ' . PMA\libraries\Util::backquote($cfgBookmark['db'])
-        . '.' . PMA\libraries\Util::backquote($cfgBookmark['table'])
-        . ' WHERE dbase = \'' . $GLOBALS['dbi']->escapeString($db) . '\'';
-
-    if (! $action_bookmark_all) {
-        $query .= ' AND (user = \''
-            . $GLOBALS['dbi']->escapeString($cfgBookmark['user']) . '\'';
-        if (! $exact_user_match) {
-            $query .= ' OR user = \'\'';
-        }
-        $query .= ')';
-    }
-
-    $query .= ' AND ' . PMA\libraries\Util::backquote($id_field) . ' = ' . $id;
-
-    return $GLOBALS['dbi']->fetchValue($query, 0, 0, $controllink);
-} // end of the 'PMA_Bookmark_get()' function
-
-/**
- * Adds a bookmark
- *
- * @param array   $bkm_fields the properties of the bookmark to add; here,
- *                            $bkm_fields['bkm_sql_query'] is urlencoded
- * @param boolean $all_users  whether to make the bookmark available for all users
- *
- * @return boolean   whether the INSERT succeeds or not
- *
- * @access  public
- *
- * @global  resource $controllink the controluser db connection handle
- */
-function PMA_Bookmark_save($bkm_fields, $all_users = false)
-{
-    global $controllink;
-
-    $cfgBookmark = PMA_Bookmark_getParams();
-
-    if (!(isset($bkm_fields['bkm_sql_query']) && isset($bkm_fields['bkm_label'])
-        && mb_strlen($bkm_fields['bkm_sql_query']) > 0
-        && mb_strlen($bkm_fields['bkm_label']) > 0)
-    ) {
-        return false;
-    }
-
-    $query = 'INSERT INTO ' . PMA\libraries\Util::backquote($cfgBookmark['db'])
-        . '.' . PMA\libraries\Util::backquote($cfgBookmark['table'])
-        . ' (id, dbase, user, query, label)'
-        . ' VALUES (NULL, \''
-        . $GLOBALS['dbi']->escapeString($bkm_fields['bkm_database']) . '\', '
-        . '\''
-        . ($all_users
-            ? ''
-            : $GLOBALS['dbi']->escapeString(
-                $bkm_fields['bkm_user']
-            ))
-        . '\', '
-        . '\''
-        . $GLOBALS['dbi']->escapeString($bkm_fields['bkm_sql_query'])
-        . '\', '
-        . '\'' . $GLOBALS['dbi']->escapeString($bkm_fields['bkm_label']) . '\')';
-    return $GLOBALS['dbi']->query($query, $controllink);
-} // end of the 'PMA_Bookmark_save()' function
-
-
-/**
- * Deletes a bookmark
- *
- * @param integer $id the id of the bookmark to delete
- *
- * @return bool true if successful
- *
- * @access  public
- *
- * @global  resource $controllink the controluser db connection handle
- */
-function PMA_Bookmark_delete($id)
-{
-    global $controllink;
-
-    $cfgBookmark = PMA_Bookmark_getParams();
-
-    if (empty($cfgBookmark)) {
-        return false;
-    }
-
-    $query  = 'DELETE FROM ' . PMA\libraries\Util::backquote($cfgBookmark['db'])
-        . '.' . PMA\libraries\Util::backquote($cfgBookmark['table'])
-        . ' WHERE (user = \''
-        . $GLOBALS['dbi']->escapeString($cfgBookmark['user']) . '\''
-        . '        OR user = \'\')'
-        . ' AND id = ' . $id;
-    return $GLOBALS['dbi']->tryQuery($query, $controllink);
-} // end of the 'PMA_Bookmark_delete()' function
-
-/**
- * Returns the number of variables in a bookmark
- *
- * @param string $query bookmarked query
- *
- * @return number number of variables
- */
-function PMA_Bookmark_getVariableCount($query)
-{
-    $matches = array();
-    preg_match_all("/\[VARIABLE[0-9]*\]/", $query, $matches, PREG_SET_ORDER);
-    return count($matches);
-}
-
-/**
- * Replace the placeholders in the bookmark query with variables
- *
- * @param string $query bookmarked query
- *
- * @return string query with variables applied
- */
-function PMA_Bookmark_applyVariables($query)
-{
-    // remove comments that encloses a variable placeholder
-    $query = preg_replace(
-        '|/\*(.*\[VARIABLE[0-9]*\].*)\*/|imsU',
-        '${1}',
-        $query
-    );
-    // replace variable placeholders with values
-    $number_of_variables = PMA_Bookmark_getVariableCount($query);
-    for ($i = 1; $i <= $number_of_variables; $i++) {
-        $var = '';
-        if (! empty($_REQUEST['bookmark_variable'][$i])) {
-            $var = $GLOBALS['dbi']->escapeString(
-                $_REQUEST['bookmark_variable'][$i]
-            );
-        }
-        $query = str_replace('[VARIABLE' . $i . ']', $var, $query);
-        // backward compatibility
-        if ($i == 1) {
-            $query = str_replace('[VARIABLE]', $var, $query);
-        }
-    }
-    return $query;
-}
diff --git a/#pma/libraries/browse_foreigners.lib.php b/#pma/libraries/browse_foreigners.lib.php
deleted file mode 100644
index b83296d5..00000000
--- a/#pma/libraries/browse_foreigners.lib.php
+++ /dev/null
@@ -1,345 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Contains functions used by browse_foreigners.php
- *
- * @package PhpMyAdmin
- */
-
-/**
- * Function to get html for one relational key
- *
- * @param integer $horizontal_count   the current horizontal count
- * @param string  $header             table header
- * @param boolean $odd_row            for the row background color
- * @param array   $keys               all the keys
- * @param integer $indexByKeyname     index by keyname
- * @param array   $descriptions       descriptions
- * @param integer $indexByDescription index by description
- * @param string  $current_value      current value on the edit form
- *
- * @return string $html the generated html
- */
-function PMA_getHtmlForOneKey($horizontal_count, $header, $odd_row, $keys,
-    $indexByKeyname, $descriptions, $indexByDescription, $current_value
-) {
-    $horizontal_count++;
-    $output = '';
-
-    // whether the key name corresponds to the selected value in the form
-    $rightKeynameIsSelected = false;
-    $leftKeynameIsSelected = false;
-
-    if ($GLOBALS['cfg']['RepeatCells'] > 0
-        && $horizontal_count > $GLOBALS['cfg']['RepeatCells']
-    ) {
-        $output .= $header;
-        $horizontal_count = 0;
-        $odd_row = true;
-    }
-
-    // key names and descriptions for the left section,
-    // sorted by key names
-    $leftKeyname = $keys[$indexByKeyname];
-    list(
-        $leftDescription,
-        $leftDescriptionTitle
-    ) = PMA_getDescriptionAndTitle($descriptions[$indexByKeyname]);
-
-    // key names and descriptions for the right section,
-    // sorted by descriptions
-    $rightKeyname = $keys[$indexByDescription];
-    list(
-        $rightDescription,
-        $rightDescriptionTitle
-    ) = PMA_getDescriptionAndTitle($descriptions[$indexByDescription]);
-
-    $indexByDescription++;
-
-    if (! empty($current_value)) {
-        $rightKeynameIsSelected = $rightKeyname == $current_value;
-        $leftKeynameIsSelected = $leftKeyname == $current_value;
-    }
-
-    $output .= '<tr class="noclick ' . ($odd_row ? 'odd' : 'even') . '">';
-    $odd_row = ! $odd_row;
-
-    $output .= PMA_getHtmlForColumnElement(
-        'class="nowrap"', $leftKeynameIsSelected,
-        $leftKeyname, $leftDescription,
-        $leftDescriptionTitle
-    );
-
-    $output .= PMA_getHtmlForColumnElement(
-        '', $leftKeynameIsSelected, $leftKeyname,
-        $leftDescription, $leftDescriptionTitle
-    );
-
-    $output .= '<td width="20%">'
-        . '<img src="' . $GLOBALS['pmaThemeImage'] . 'spacer.png" alt=""'
-        . ' width="1" height="1" /></td>';
-
-    $output .= PMA_getHtmlForColumnElement(
-        '', $rightKeynameIsSelected, $rightKeyname,
-        $rightDescription, $rightDescriptionTitle
-    );
-
-    $output .= PMA_getHtmlForColumnElement(
-        'class="nowrap"', $rightKeynameIsSelected,
-        $rightKeyname, $rightDescription,
-        $rightDescriptionTitle
-    );
-    $output .= '</tr>';
-
-    return array($output, $horizontal_count, $odd_row, $indexByDescription);
-}
-
-/**
- * Function to get html for relational field selection
- *
- * @param string $db            current database
- * @param string $table         current table
- * @param string $field         field
- * @param array  $foreignData   foreign column data
- * @param string $fieldkey      field key
- * @param string $current_value current columns's value
- *
- * @return string
- */
-function PMA_getHtmlForRelationalFieldSelection($db, $table, $field, $foreignData,
-    $fieldkey, $current_value
-) {
-    $gotopage = PMA_getHtmlForGotoPage($foreignData);
-    $showall = PMA_getHtmlForShowAll($foreignData);
-
-    $output = '<form class="ajax" '
-        . 'id="browse_foreign_form" name="browse_foreign_from" '
-        . 'action="browse_foreigners.php" method="post">'
-        . '<fieldset>'
-        . PMA_URL_getHiddenInputs($db, $table)
-        . '<input type="hidden" name="field" value="' . htmlspecialchars($field)
-        . '" />'
-        . '<input type="hidden" name="fieldkey" value="'
-        . (isset($fieldkey) ? htmlspecialchars($fieldkey) : '') . '" />';
-
-    if (isset($_REQUEST['rownumber'])) {
-        $output .= '<input type="hidden" name="rownumber" value="'
-            . htmlspecialchars($_REQUEST['rownumber']) . '" />';
-    }
-    $filter_value = (isset($_REQUEST['foreign_filter'])
-        ? htmlspecialchars($_REQUEST['foreign_filter'])
-        : '');
-    $output .= '<span class="formelement">'
-        . '<label for="input_foreign_filter">' . __('Search:') . '</label>'
-        . '<input type="text" name="foreign_filter" '
-        . 'id="input_foreign_filter" '
-        . 'value="' . $filter_value . '" data-old="' . $filter_value . '" '
-        . '/>'
-        . '<input type="submit" name="submit_foreign_filter" value="'
-        .  __('Go') . '" />'
-        . '</span>'
-        . '<span class="formelement">' . $gotopage . '</span>'
-        . '<span class="formelement">' . $showall . '</span>'
-        . '</fieldset>'
-        . '</form>';
-
-    $output .= '<table width="100%" id="browse_foreign_table">';
-
-    if (!is_array($foreignData['disp_row'])) {
-        $output .= '</tbody>'
-            . '</table>';
-
-        return $output;
-    }
-
-    $header = '<tr>
-        <th>' . __('Keyname') . '</th>
-        <th>' . __('Description') . '</th>
-        <td width="20%"></td>
-        <th>' . __('Description') . '</th>
-        <th>' . __('Keyname') . '</th>
-    </tr>';
-
-    $output .= '<thead>' . $header . '</thead>' . "\n"
-        . '<tfoot>' . $header . '</tfoot>' . "\n"
-        . '<tbody>' . "\n";
-
-    $descriptions = array();
-    $keys   = array();
-    foreach ($foreignData['disp_row'] as $relrow) {
-        if ($foreignData['foreign_display'] != false) {
-            $descriptions[] = $relrow[$foreignData['foreign_display']];
-        } else {
-            $descriptions[] = '';
-        }
-
-        $keys[] = $relrow[$foreignData['foreign_field']];
-    }
-
-    asort($keys);
-
-    $horizontal_count = 0;
-    $odd_row = true;
-    $indexByDescription = 0;
-
-    foreach ($keys as $indexByKeyname => $value) {
-        list(
-            $html,
-            $horizontal_count,
-            $odd_row,
-            $indexByDescription
-        ) = PMA_getHtmlForOneKey(
-            $horizontal_count, $header, $odd_row, $keys, $indexByKeyname,
-            $descriptions, $indexByDescription, $current_value
-        );
-        $output .= $html;
-    }
-
-    $output .= '</tbody>'
-        . '</table>';
-
-    return $output;
-}
-
-/**
- * Get the description (possibly truncated) and the title
- *
- * @param string $description the key name's description
- *
- * @return array the new description and title
- */
-function PMA_getDescriptionAndTitle($description)
-{
-    $limitChars = $GLOBALS['cfg']['LimitChars'];
-    if (mb_strlen($description) <= $limitChars) {
-        $description = htmlspecialchars(
-            $description
-        );
-        $descriptionTitle = '';
-    } else {
-        $descriptionTitle = htmlspecialchars(
-            $description
-        );
-        $description = htmlspecialchars(
-            mb_substr(
-                $description, 0, $limitChars
-            )
-            . '...'
-        );
-    }
-    return array($description, $descriptionTitle);
-}
-
-/**
- * Function to get html for each column element
- *
- * @param string $cssClass    class="nowrap" or ''
- * @param bool   $isSelected  whether current equals form's value
- * @param string $keyname     current key
- * @param string $description current value
- * @param string $title       current title
- *
- * @return string
- */
-function PMA_getHtmlForColumnElement($cssClass, $isSelected, $keyname,
-    $description, $title
-) {
-    $keyname = htmlspecialchars($keyname);
-    $output = '<td';
-    if (! empty($cssClass)) {
-        $output .= ' ' . $cssClass;
-    }
-    $output .= '>'
-        . ($isSelected ? '<strong>' : '')
-        . '<a class="foreign_value" data-key="' . $keyname . '" '
-        . 'href="#" title="' . __('Use this value')
-        . ($title != ''
-            ? ': ' . $title
-            : '')
-        . '">';
-    if ($cssClass !== '') {
-        $output .= $keyname;
-    } else {
-        $output .= $description;
-    }
-
-    $output .=  '</a>' . ($isSelected ? '</strong>' : '') . '</td>';
-
-    return $output;
-}
-
-/**
- * Function to get html for show all case
- *
- * @param array $foreignData foreign data
- *
- * @return string
- */
-function PMA_getHtmlForShowAll($foreignData)
-{
-    $showall = '';
-    if (is_array($foreignData['disp_row'])) {
-        if ($GLOBALS['cfg']['ShowAll']
-            && ($foreignData['the_total'] > $GLOBALS['cfg']['MaxRows'])
-        ) {
-            $showall = '<input type="submit" id="foreign_showAll" '
-                . 'name="foreign_showAll" '
-                . 'value="' . __('Show all') . '" />';
-        }
-    }
-
-    return $showall;
-}
-
-/**
- * Function to get html for the goto page option
- *
- * @param array $foreignData foreign data
- *
- * @return string
- */
-function PMA_getHtmlForGotoPage($foreignData)
-{
-    $gotopage = '';
-    isset($_REQUEST['pos']) ? $pos = $_REQUEST['pos'] : $pos = 0;
-    if (!is_array($foreignData['disp_row'])) {
-        return $gotopage;
-    }
-
-    $session_max_rows = $GLOBALS['cfg']['MaxRows'];
-    $pageNow = @floor($pos / $session_max_rows) + 1;
-    $nbTotalPage = @ceil($foreignData['the_total'] / $session_max_rows);
-
-    if ($foreignData['the_total'] > $GLOBALS['cfg']['MaxRows']) {
-        $gotopage = PMA\libraries\Util::pageselector(
-            'pos',
-            $session_max_rows,
-            $pageNow,
-            $nbTotalPage,
-            200,
-            5,
-            5,
-            20,
-            10,
-            __('Page number:')
-        );
-    }
-
-    return $gotopage;
-}
-
-/**
- * Function to get foreign limit
- *
- * @param string $foreign_showAll foreign navigation
- *
- * @return string
- */
-function PMA_getForeignLimit($foreign_showAll)
-{
-    if (isset($foreign_showAll) && $foreign_showAll == __('Show all')) {
-        return null;
-    }
-    isset($_REQUEST['pos']) ? $pos = $_REQUEST['pos'] : $pos = 0;
-    return 'LIMIT ' . $pos . ', ' . intval($GLOBALS['cfg']['MaxRows']) . ' ';
-}
diff --git a/#pma/libraries/central_columns.lib.php b/#pma/libraries/central_columns.lib.php
deleted file mode 100644
index ea8012fb..00000000
--- a/#pma/libraries/central_columns.lib.php
+++ /dev/null
@@ -1,1405 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Functions for displaying user preferences pages
- *
- * @package PhpMyAdmin
- */
-use PMA\libraries\Message;
-use PMA\libraries\Util;
-
-/**
- * Defines the central_columns parameters for the current user
- *
- * @return array    the central_columns parameters for the current user
- * @access  public
- */
-function PMA_centralColumnsGetParams()
-{
-    static $cfgCentralColumns = null;
-
-    if (null !== $cfgCentralColumns) {
-        return $cfgCentralColumns;
-    }
-
-    $cfgRelation = PMA_getRelationsParam();
-
-    if ($cfgRelation['centralcolumnswork']) {
-        $cfgCentralColumns = array(
-            'user'  => $GLOBALS['cfg']['Server']['user'],
-            'db'    => $cfgRelation['db'],
-            'table' => $cfgRelation['central_columns'],
-        );
-    } else {
-        $cfgCentralColumns = false;
-    }
-
-    return $cfgCentralColumns;
-}
-
-/**
- * get $num columns of given database from central columns list
- * starting at offset $from
- *
- * @param string $db   selected database
- * @param int    $from starting offset of first result
- * @param int    $num  maximum number of results to return
- *
- * @return array list of $num columns present in central columns list
- * starting at offset $from for the given database
- */
-function PMA_getColumnsList($db, $from=0, $num=25)
-{
-    $cfgCentralColumns = PMA_centralColumnsGetParams();
-    if (empty($cfgCentralColumns)) {
-        return array();
-    }
-    $pmadb = $cfgCentralColumns['db'];
-    $GLOBALS['dbi']->selectDb($pmadb, $GLOBALS['controllink']);
-    $central_list_table = $cfgCentralColumns['table'];
-    //get current values of $db from central column list
-    if ($num == 0) {
-        $query = 'SELECT * FROM ' . Util::backquote($central_list_table) . ' '
-            . 'WHERE db_name = \'' . $GLOBALS['dbi']->escapeString($db) . '\';';
-    } else {
-        $query = 'SELECT * FROM ' . Util::backquote($central_list_table) . ' '
-            . 'WHERE db_name = \'' . $GLOBALS['dbi']->escapeString($db) . '\' '
-            . 'LIMIT ' . $from . ', ' . $num . ';';
-    }
-    $has_list = (array) $GLOBALS['dbi']->fetchResult(
-        $query, null, null, $GLOBALS['controllink']
-    );
-    PMA_handleColumnExtra($has_list);
-    return $has_list;
-}
-
-/**
- * get the number of columns present in central list for given db
- *
- * @param string $db current database
- *
- * @return int number of columns in central list of columns for $db
- */
-function PMA_getCentralColumnsCount($db)
-{
-    $cfgCentralColumns = PMA_centralColumnsGetParams();
-    if (empty($cfgCentralColumns)) {
-        return 0;
-    }
-    $pmadb = $cfgCentralColumns['db'];
-    $GLOBALS['dbi']->selectDb($pmadb, $GLOBALS['controllink']);
-    $central_list_table = $cfgCentralColumns['table'];
-    $query = 'SELECT count(db_name) FROM ' .
-        Util::backquote($central_list_table) . ' '
-        . 'WHERE db_name = \'' . $GLOBALS['dbi']->escapeString($db) . '\';';
-    $res = $GLOBALS['dbi']->fetchResult(
-        $query, null, null, $GLOBALS['controllink']
-    );
-    if (isset($res[0])) {
-        return $res[0];
-    } else {
-        return 0;
-    }
-}
-/**
- * return the existing columns in central list among the given list of columns
- *
- * @param string  $db        the selected database
- * @param string  $cols      comma separated list of given columns
- * @param boolean $allFields set if need all the fields of existing columns,
- * otherwise only column_name is returned
- *
- * @return array list of columns in central columns among given set of columns
- */
-function PMA_findExistingColNames($db, $cols, $allFields=false)
-{
-    $cfgCentralColumns = PMA_centralColumnsGetParams();
-    if (empty($cfgCentralColumns)) {
-        return array();
-    }
-    $pmadb = $cfgCentralColumns['db'];
-    $GLOBALS['dbi']->selectDb($pmadb, $GLOBALS['controllink']);
-    $central_list_table = $cfgCentralColumns['table'];
-    if ($allFields) {
-        $query = 'SELECT * FROM ' . Util::backquote($central_list_table) . ' '
-            . 'WHERE db_name = \'' . $GLOBALS['dbi']->escapeString($db) . '\' AND col_name IN (' . $cols . ');';
-        $has_list = (array) $GLOBALS['dbi']->fetchResult(
-            $query, null, null, $GLOBALS['controllink']
-        );
-        PMA_handleColumnExtra($has_list);
-    } else {
-        $query = 'SELECT col_name FROM '
-            . Util::backquote($central_list_table) . ' '
-            . 'WHERE db_name = \'' . $GLOBALS['dbi']->escapeString($db) . '\' AND col_name IN (' . $cols . ');';
-        $has_list = (array) $GLOBALS['dbi']->fetchResult(
-            $query, null, null, $GLOBALS['controllink']
-        );
-    }
-
-    return $has_list;
-}
-
-/**
- * return error message to be displayed if central columns
- * configuration storage is not completely configured
- *
- * @return Message
- */
-function PMA_configErrorMessage()
-{
-    return Message::error(
-        __(
-            'The configuration storage is not ready for the central list'
-            . ' of columns feature.'
-        )
-    );
-}
-
-/**
- * build the insert query for central columns list given PMA storage
- * db, central_columns table, column name and corresponding definition to be added
- *
- * @param string $column             column to add into central list
- * @param array  $def                list of attributes of the column being added
- * @param string $db                 PMA configuration storage database name
- * @param string $central_list_table central columns configuration storage table name
- *
- * @return string query string to insert the given column
- * with definition into central list
- */
-function PMA_getInsertQuery($column, $def, $db, $central_list_table)
-{
-    $type = "";
-    $length = 0;
-    $attribute = "";
-    if (isset($def['Type'])) {
-        $extracted_columnspec = Util::extractColumnSpec($def['Type']);
-        $attribute = trim($extracted_columnspec[ 'attribute']);
-        $type = $extracted_columnspec['type'];
-        $length = $extracted_columnspec['spec_in_brackets'];
-    }
-    if (isset($def['Attribute'])) {
-        $attribute = $def['Attribute'];
-    };
-    $collation = isset($def['Collation'])?$def['Collation']:"";
-    $isNull = ($def['Null'] == "NO")?0:1;
-    $extra = isset($def['Extra'])?$def['Extra']:"";
-    $default = isset($def['Default'])?$def['Default']:"";
-    $insQuery = 'INSERT INTO '
-        . Util::backquote($central_list_table) . ' '
-        . 'VALUES ( \'' . $GLOBALS['dbi']->escapeString($db) . '\' ,'
-        . '\'' . $GLOBALS['dbi']->escapeString($column) . '\',\''
-        . $GLOBALS['dbi']->escapeString($type) . '\','
-        . '\'' . $GLOBALS['dbi']->escapeString($length) . '\',\''
-        . $GLOBALS['dbi']->escapeString($collation) . '\','
-        . '\'' . $GLOBALS['dbi']->escapeString($isNull) . '\','
-        . '\'' . implode(',', array($extra, $attribute))
-        . '\',\'' . $GLOBALS['dbi']->escapeString($default) . '\');';
-    return $insQuery;
-}
-
-/**
- * If $isTable is true then unique columns from given tables as $field_select
- * are added to central list otherwise the $field_select is considered as
- * list of columns and these columns are added to central list if not already added
- *
- * @param array  $field_select if $isTable is true selected tables list
- * otherwise selected columns list
- * @param bool   $isTable      if passed array is of tables or columns
- * @param string $table        if $isTable is false,
- * then table name to which columns belong
- *
- * @return true|PMA\libraries\Message
- */
-function PMA_syncUniqueColumns($field_select, $isTable=true, $table=null)
-{
-    $cfgCentralColumns = PMA_centralColumnsGetParams();
-    if (empty($cfgCentralColumns)) {
-        return PMA_configErrorMessage();
-    }
-    $db = $_REQUEST['db'];
-    $pmadb = $cfgCentralColumns['db'];
-    $central_list_table = $cfgCentralColumns['table'];
-    $GLOBALS['dbi']->selectDb($db, $GLOBALS['userlink']);
-    $existingCols = array();
-    $cols = "";
-    $insQuery = array();
-    $fields = array();
-    $message = true;
-    if ($isTable) {
-        foreach ($field_select as $table) {
-            $fields[$table] = (array) $GLOBALS['dbi']->getColumns(
-                $db, $table, null, true, $GLOBALS['userlink']
-            );
-            foreach ($fields[$table] as $field => $def) {
-                $cols .= "'" . $GLOBALS['dbi']->escapeString($field) . "',";
-            }
-        }
-
-        $has_list = PMA_findExistingColNames($db, trim($cols, ','));
-        foreach ($field_select as $table) {
-            foreach ($fields[$table] as $field => $def) {
-                if (!in_array($field, $has_list)) {
-                    $has_list[] = $field;
-                    $insQuery[] = PMA_getInsertQuery(
-                        $field, $def, $db, $central_list_table
-                    );
-                } else {
-                    $existingCols[] = "'" . $field . "'";
-                }
-            }
-        }
-    } else {
-        if ($table === null) {
-            $table = $_REQUEST['table'];
-        }
-        foreach ($field_select as $column) {
-            $cols .= "'" . $GLOBALS['dbi']->escapeString($column) . "',";
-        }
-        $has_list = PMA_findExistingColNames($db, trim($cols, ','));
-        foreach ($field_select as $column) {
-            if (!in_array($column, $has_list)) {
-                $has_list[] = $column;
-                $field = (array) $GLOBALS['dbi']->getColumns(
-                    $db, $table, $column,
-                    true, $GLOBALS['userlink']
-                );
-                $insQuery[] = PMA_getInsertQuery(
-                    $column, $field, $db, $central_list_table
-                );
-            } else {
-                $existingCols[] = "'" . $column . "'";
-            }
-        }
-    }
-    if (! empty($existingCols)) {
-        $existingCols = implode(",", array_unique($existingCols));
-        $message = Message::notice(
-            sprintf(
-                __(
-                    'Could not add %1$s as they already exist in central list!'
-                ), htmlspecialchars($existingCols)
-            )
-        );
-        $message->addMessage(
-            Message::notice(
-                "Please remove them first "
-                . "from central list if you want to update above columns"
-            )
-        );
-    }
-    $GLOBALS['dbi']->selectDb($pmadb, $GLOBALS['controllink']);
-    if (! empty($insQuery)) {
-        foreach ($insQuery as $query) {
-            if (!$GLOBALS['dbi']->tryQuery($query, $GLOBALS['controllink'])) {
-                $message = Message::error(__('Could not add columns!'));
-                $message->addMessage(
-                    Message::rawError(
-                        $GLOBALS['dbi']->getError($GLOBALS['controllink'])
-                    )
-                );
-                break;
-            }
-        }
-    }
-    return $message;
-}
-
-/**
- * if $isTable is true it removes all columns of given tables as $field_select from
- * central columns list otherwise $field_select is columns list and it removes
- * given columns if present in central list
- *
- * @param array $field_select if $isTable selected list of tables otherwise
- * selected list of columns to remove from central list
- * @param bool  $isTable      if passed array is of tables or columns
- *
- * @return true|PMA\libraries\Message
- */
-function PMA_deleteColumnsFromList($field_select, $isTable=true)
-{
-    $cfgCentralColumns = PMA_centralColumnsGetParams();
-    if (empty($cfgCentralColumns)) {
-        return PMA_configErrorMessage();
-    }
-    $db = $_REQUEST['db'];
-    $pmadb = $cfgCentralColumns['db'];
-    $central_list_table = $cfgCentralColumns['table'];
-    $GLOBALS['dbi']->selectDb($db, $GLOBALS['userlink']);
-    $message = true;
-    $colNotExist = array();
-    $fields = array();
-    if ($isTable) {
-        $cols = '';
-        foreach ($field_select as $table) {
-            $fields[$table] = (array) $GLOBALS['dbi']->getColumnNames(
-                $db, $table, $GLOBALS['userlink']
-            );
-            foreach ($fields[$table] as $col_select) {
-                $cols .= '\'' . $GLOBALS['dbi']->escapeString($col_select) . '\',';
-            }
-        }
-        $cols = trim($cols, ',');
-        $has_list = PMA_findExistingColNames($db, $cols);
-        foreach ($field_select as $table) {
-            foreach ($fields[$table] as $column) {
-                if (!in_array($column, $has_list)) {
-                    $colNotExist[] = "'" . $column . "'";
-                }
-            }
-        }
-
-    } else {
-        $cols = '';
-        foreach ($field_select as $col_select) {
-            $cols .= '\'' . $GLOBALS['dbi']->escapeString($col_select) . '\',';
-        }
-        $cols = trim($cols, ',');
-        $has_list = PMA_findExistingColNames($db, $cols);
-        foreach ($field_select as $column) {
-            if (!in_array($column, $has_list)) {
-                $colNotExist[] = "'" . $column . "'";
-            }
-        }
-    }
-    if (!empty($colNotExist)) {
-        $colNotExist = implode(",", array_unique($colNotExist));
-        $message = Message::notice(
-            sprintf(
-                __(
-                    'Couldn\'t remove Column(s) %1$s '
-                    . 'as they don\'t exist in central columns list!'
-                ), htmlspecialchars($colNotExist)
-            )
-        );
-    }
-    $GLOBALS['dbi']->selectDb($pmadb, $GLOBALS['controllink']);
-
-    $query = 'DELETE FROM ' . Util::backquote($central_list_table) . ' '
-        . 'WHERE db_name = \'' . $GLOBALS['dbi']->escapeString($db) . '\' AND col_name IN (' . $cols . ');';
-
-    if (!$GLOBALS['dbi']->tryQuery($query, $GLOBALS['controllink'])) {
-        $message = Message::error(__('Could not remove columns!'));
-        $message->addMessage('<br />' . htmlspecialchars($cols) . '<br />');
-        $message->addMessage(
-            Message::rawError(
-                $GLOBALS['dbi']->getError($GLOBALS['controllink'])
-            )
-        );
-    }
-    return $message;
-}
-
-/**
- * make the columns of given tables consistent with central list of columns.
- * Updates only those columns which are not being referenced.
- *
- * @param string $db              current database
- * @param array  $selected_tables list of selected tables.
- *
- * @return true|PMA\libraries\Message
- */
-function PMA_makeConsistentWithList($db, $selected_tables)
-{
-    $message = true;
-    foreach ($selected_tables as $table) {
-        $query = 'ALTER TABLE ' . Util::backquote($table);
-        $has_list = PMA_getCentralColumnsFromTable($db, $table, true);
-        $GLOBALS['dbi']->selectDb($db, $GLOBALS['userlink']);
-        foreach ($has_list as $column) {
-            $column_status = PMA_checkChildForeignReferences(
-                $db, $table, $column['col_name']
-            );
-            //column definition can only be changed if
-            //it is not referenced by another column
-            if ($column_status['isEditable']) {
-                $query .= ' MODIFY ' . Util::backquote($column['col_name']) . ' '
-                    . $GLOBALS['dbi']->escapeString($column['col_type']);
-                if ($column['col_length']) {
-                    $query .= '(' . $column['col_length'] . ')';
-                }
-
-                $query .= ' ' . $column['col_attribute'];
-                if ($column['col_isNull']) {
-                    $query .= ' NULL';
-                } else {
-                    $query .= ' NOT NULL';
-                }
-
-                $query .= ' ' . $column['col_extra'];
-                if ($column['col_default']) {
-                    if ($column['col_default'] != 'CURRENT_TIMESTAMP') {
-                        $query .= ' DEFAULT \'' . $GLOBALS['dbi']->escapeString(
-                            $column['col_default']
-                        ) . '\'';
-                    } else {
-                        $query .= ' DEFAULT ' . $GLOBALS['dbi']->escapeString(
-                            $column['col_default']
-                        );
-                    }
-                }
-                $query .= ',';
-            }
-        }
-        $query = trim($query, " ,") . ";";
-        if (!$GLOBALS['dbi']->tryQuery($query, $GLOBALS['userlink'])) {
-            if ($message === true) {
-                $message = Message::error(
-                    $GLOBALS['dbi']->getError($GLOBALS['userlink'])
-                );
-            } else {
-                $message->addMessage('<br />');
-                $message->addMessage(
-                    $GLOBALS['dbi']->getError($GLOBALS['userlink'])
-                );
-            }
-        }
-    }
-    return $message;
-}
-
-/**
- * return the columns present in central list of columns for a given
- * table of a given database
- *
- * @param string  $db        given database
- * @param string  $table     given table
- * @param boolean $allFields set if need all the fields of existing columns,
- * otherwise only column_name is returned
- *
- * @return array columns present in central list from given table of given db.
- */
-function PMA_getCentralColumnsFromTable($db, $table, $allFields=false)
-{
-    $cfgCentralColumns = PMA_centralColumnsGetParams();
-    if (empty($cfgCentralColumns)) {
-        return array();
-    }
-    $GLOBALS['dbi']->selectDb($db, $GLOBALS['userlink']);
-    $fields = (array) $GLOBALS['dbi']->getColumnNames(
-        $db, $table, $GLOBALS['userlink']
-    );
-    $cols = '';
-    foreach ($fields as $col_select) {
-        $cols .= '\'' . $GLOBALS['dbi']->escapeString($col_select) . '\',';
-    }
-    $cols = trim($cols, ',');
-    $has_list = PMA_findExistingColNames($db, $cols, $allFields);
-    if (! empty($has_list)) {
-        return (array)$has_list;
-    } else {
-        return array();
-    }
-}
-
-/**
- * update a column in central columns list if a edit is requested
- *
- * @param string $db            current database
- * @param string $orig_col_name original column name before edit
- * @param string $col_name      new column name
- * @param string $col_type      new column type
- * @param string $col_attribute new column attribute
- * @param string $col_length    new column length
- * @param int    $col_isNull    value 1 if new column isNull is true, 0 otherwise
- * @param string $collation     new column collation
- * @param string $col_extra     new column extra property
- * @param string $col_default   new column default value
- *
- * @return true|PMA\libraries\Message
- */
-function PMA_updateOneColumn($db, $orig_col_name, $col_name, $col_type,
-    $col_attribute,$col_length, $col_isNull, $collation, $col_extra, $col_default
-) {
-    $cfgCentralColumns = PMA_centralColumnsGetParams();
-    if (empty($cfgCentralColumns)) {
-        return PMA_configErrorMessage();
-    }
-    $centralTable = $cfgCentralColumns['table'];
-    $GLOBALS['dbi']->selectDb($cfgCentralColumns['db'], $GLOBALS['controllink']);
-    if ($orig_col_name == "") {
-        $def = array();
-        $def['Type'] = $col_type;
-        if ($col_length) {
-            $def['Type'] .= '(' . $col_length . ')';
-        }
-        $def['Collation'] = $collation;
-        $def['Null'] = $col_isNull?__('YES'):__('NO');
-        $def['Extra'] = $col_extra;
-        $def['Attribute'] = $col_attribute;
-        $def['Default'] = $col_default;
-        $query = PMA_getInsertQuery($col_name, $def, $db, $centralTable);
-    } else {
-        $query = 'UPDATE ' . Util::backquote($centralTable)
-            . ' SET col_type = \'' . $GLOBALS['dbi']->escapeString($col_type) . '\''
-            . ', col_name = \'' . $GLOBALS['dbi']->escapeString($col_name) . '\''
-            . ', col_length = \'' . $GLOBALS['dbi']->escapeString($col_length) . '\''
-            . ', col_isNull = ' . $col_isNull
-            . ', col_collation = \'' . $GLOBALS['dbi']->escapeString($collation) . '\''
-            . ', col_extra = \''
-            . implode(',', array($col_extra, $col_attribute)) . '\''
-            . ', col_default = \'' . $GLOBALS['dbi']->escapeString($col_default) . '\''
-            . ' WHERE db_name = \'' . $GLOBALS['dbi']->escapeString($db) . '\' '
-            . 'AND col_name = \'' . $GLOBALS['dbi']->escapeString($orig_col_name)
-            . '\'';
-    }
-    if (!$GLOBALS['dbi']->tryQuery($query, $GLOBALS['controllink'])) {
-        return Message::error(
-            $GLOBALS['dbi']->getError($GLOBALS['controllink'])
-        );
-    }
-    return true;
-}
-
-/**
- * Update Multiple column in central columns list if a chnage is requested
- *
- * @return true|PMA\libraries\Message
- */
-function PMA_updateMultipleColumn()
-{
-    $db = $_POST['db'];
-    $col_name = $_POST['field_name'];
-    $orig_col_name = $_POST['orig_col_name'];
-    $col_default = $_POST['field_default_type'];
-    $col_length = $_POST['field_length'];
-    $col_attribute = $_POST['field_attribute'];
-    $col_type = $_POST['field_type'];
-    $collation = $_POST['field_collation'];
-    $col_isNull = array();
-    $col_extra = array();
-    $num_central_fields = count($orig_col_name);
-    for ($i = 0; $i < $num_central_fields ; $i++) {
-        $col_isNull[$i] = isset($_POST['field_null'][$i]) ? 1 : 0;
-        $col_extra[$i] = isset($_POST['col_extra'][$i])
-            ? $_POST['col_extra'][$i] : '';
-
-        if ($col_default[$i] == 'NONE') {
-            $col_default[$i] = "";
-        } else if ($col_default[$i] == 'USER_DEFINED') {
-            $col_default[$i] = $_POST['field_default_value'][$i];
-        }
-
-        $message = PMA_updateOneColumn(
-            $db, $orig_col_name[$i], $col_name[$i], $col_type[$i],
-            $col_attribute[$i], $col_length[$i], $col_isNull[$i], $collation[$i],
-            $col_extra[$i], $col_default[$i]
-        );
-        if (!is_bool($message)) {
-            return $message;
-        }
-    }
-    return true;
-}
-
-/**
- * get the html for table navigation in Central columns page
- *
- * @param int    $total_rows total number of rows in complete result set
- * @param int    $pos        offset of first result with complete result set
- * @param string $db         current database
- *
- * @return string html for table navigation in Central columns page
- */
-function PMA_getHTMLforTableNavigation($total_rows, $pos, $db)
-{
-    $max_rows = $GLOBALS['cfg']['MaxRows'];
-    $pageNow = ($pos / $max_rows) + 1;
-    $nbTotalPage = ceil($total_rows / $max_rows);
-    $table_navigation_html = '<table style="display:inline-block;max-width:49%" '
-        . 'class="navigation nospacing nopadding">'
-        . '<tr>'
-        . '<td class="navigation_separator"></td>';
-    if ($pos - $max_rows >= 0) {
-        $table_navigation_html .= '<td>'
-            . '<form action="db_central_columns.php" method="post">'
-            . PMA_URL_getHiddenInputs(
-                $db
-            )
-            . '<input type="hidden" name="pos" value="' . ($pos - $max_rows) . '" />'
-            . '<input type="hidden" name="total_rows" value="' . $total_rows . '"/>'
-            . '<input type="submit" name="navig"'
-            . ' class="ajax" '
-            . 'value="&lt" />'
-            . '</form>'
-            . '</td>';
-    }
-    if ($nbTotalPage > 1) {
-        $table_navigation_html .= '<td>';
-        $table_navigation_html .= '<form action="db_central_columns.php'
-            . '" method="post">'
-            . PMA_URL_getHiddenInputs(
-                $db
-            )
-            . '<input type="hidden" name="total_rows" value="' . $total_rows . '"/>';
-        $table_navigation_html .= Util::pageselector(
-            'pos', $max_rows, $pageNow, $nbTotalPage
-        );
-        $table_navigation_html .= '</form>'
-            . '</td>';
-    }
-    if ($pos + $max_rows < $total_rows) {
-        $table_navigation_html .= '<td>'
-            . '<form action="db_central_columns.php" method="post">'
-            . PMA_URL_getHiddenInputs(
-                $db
-            )
-            . '<input type="hidden" name="pos" value="' . ($pos + $max_rows) . '" />'
-            . '<input type="hidden" name="total_rows" value="' . $total_rows . '"/>'
-            . '<input type="submit" name="navig"'
-            . ' class="ajax" '
-            . 'value="&gt" />'
-            . '</form>'
-            . '</td>';
-    }
-    $table_navigation_html .= '</form>'
-        . '</td>'
-        . '<td class="navigation_separator"></td>'
-        . '<td>'
-        . '<span>' . __('Filter rows') . ':</span>'
-        . '<input type="text" class="filter_rows" placeholder="'
-        . __('Search this table') . '">'
-        . '</td>'
-        . '<td class="navigation_separator"></td>'
-        . '</tr>'
-        . '</table>';
-
-    return $table_navigation_html;
-}
-
-/**
- * function generate and return the table header for central columns page
- *
- * @param string  $class       styling class of 'th' elements
- * @param string  $title       title of the 'th' elements
- * @param integer $actionCount number of actions
- *
- * @return string html for table header in central columns view/edit page
- */
-function PMA_getCentralColumnsTableHeader($class='', $title='', $actionCount=0)
-{
-    $action = '';
-    if ($actionCount > 0) {
-        $action .= '<th class="column_action" colspan="' . $actionCount . '">'
-            . __('Action') . '</th>';
-    }
-    $tableheader = '<thead>';
-    $tableheader .= '<tr>'
-        . '<th class="' . $class . '"></th>'
-        . '<th class="" style="display:none"></th>'
-        . $action
-        . '<th class="' . $class . '" title="' . $title . '" data-column="name">'
-        . __('Name') . '<div class="sorticon"></div></th>'
-        . '<th class="' . $class . '" title="' . $title . '" data-column="type">'
-        . __('Type') . '<div class="sorticon"></div></th>'
-        . '<th class="' . $class . '" title="' . $title . '" data-column="length">'
-        . __('Length/Values') . '<div class="sorticon"></div></th>'
-        . '<th class="' . $class . '" title="' . $title . '" data-column="default">'
-        . __('Default') . '<div class="sorticon"></div></th>'
-        . '<th class="' . $class . '" title="' . $title . '" data-column="collation"'
-        . '>' . __('Collation') . '<div class="sorticon"></div></th>'
-        . '<th class="' . $class . '" title="' . $title
-        . '" data-column="attribute">'
-        . __('Attribute') . '<div class="sorticon"></div></th>'
-        . '<th class="' . $class . '" title="' . $title . '" data-column="isnull">'
-        . __('Null') . '<div class="sorticon"></div></th>'
-        . '<th class="' . $class . '" title="' . $title . '" data-column="extra">'
-        . __('A_I') . '<div class="sorticon"></div></th>'
-        . '</tr>';
-    $tableheader .= '</thead>';
-    return $tableheader;
-}
-
-/**
- * Function generate and return the table header for
- * multiple edit central columns page
- *
- * @param array $header_cells headers list
- *
- * @return string html for table header in central columns multi edit page
- */
-function PMA_getCentralColumnsEditTableHeader($header_cells)
-{
-    $html = '<table id="table_columns" class="noclick"'
-        . ' style="min-width: 100%;">';
-    $html .= '<caption class="tblHeaders">' . __('Structure');
-    $html .= '<tr>';
-    foreach ($header_cells as $header_val) {
-        $html .= '<th>' . $header_val . '</th>';
-    }
-    $html .= '</tr>';
-    return $html;
-}
-
-/**
- * build the dropdown select html for tables of given database
- *
- * @param string $db current database
- *
- * @return string html dropdown for selecting table
- */
-function PMA_getHTMLforTableDropdown($db)
-{
-    $GLOBALS['dbi']->selectDb($db, $GLOBALS['userlink']);
-    $tables = $GLOBALS['dbi']->getTables($db, $GLOBALS['userlink']);
-    $selectHtml = '<select name="table-select" id="table-select">'
-        . '<option value="" disabled="disabled" selected="selected">'
-        . __('Select a table') . '</option>';
-    foreach ($tables as $table) {
-        $selectHtml .= '<option value="' . htmlspecialchars($table) . '">'
-            . htmlspecialchars($table) . '</option>';
-    }
-    $selectHtml .= '</select>';
-    return $selectHtml;
-}
-
-/**
- * build dropdown select html to select column in selected table,
- * include only columns which are not already in central list
- *
- * @param string $db           current database to which selected table belongs
- * @param string $selected_tbl selected table
- *
- * @return string html to select column
- */
-function PMA_getHTMLforColumnDropdown($db, $selected_tbl)
-{
-    $existing_cols = PMA_getCentralColumnsFromTable($db, $selected_tbl);
-    $GLOBALS['dbi']->selectDb($db, $GLOBALS['userlink']);
-    $columns = (array) $GLOBALS['dbi']->getColumnNames(
-        $db, $selected_tbl, $GLOBALS['userlink']
-    );
-    $selectColHtml = "";
-    foreach ($columns as $column) {
-        if (!in_array($column, $existing_cols)) {
-            $selectColHtml .= '<option value="' . htmlspecialchars($column) . '">'
-                . htmlspecialchars($column)
-                . '</option>';
-        }
-    }
-    return $selectColHtml;
-}
-
-/**
- * html to display the form that let user to add a column on Central columns page
- *
- * @param int    $total_rows total number of rows in complete result set
- * @param int    $pos        offset of first result with complete result set
- * @param string $db         current database
- *
- * @return string html to add a column in the central list
- */
-function PMA_getHTMLforAddCentralColumn($total_rows, $pos, $db)
-{
-    $columnAdd = '<table style="display:inline-block;margin-left:1%;max-width:50%" '
-        . 'class="navigation nospacing nopadding">'
-        . '<tr>'
-        . '<td class="navigation_separator"></td>'
-        . '<td style="padding:1.5% 0em">'
-        . Util::getIcon(
-            'centralColumns_add.png',
-            __('Add column')
-        )
-        . '<form id="add_column" action="db_central_columns.php" method="post">'
-        . PMA_URL_getHiddenInputs(
-            $db
-        )
-        . '<input type="hidden" name="add_column" value="add">'
-        . '<input type="hidden" name="pos" value="' . $pos . '" />'
-        . '<input type="hidden" name="total_rows" value="' . $total_rows . '"/>'
-        . PMA_getHTMLforTableDropdown($db)
-        . '<select name="column-select" id="column-select">'
-        . '<option value="" selected="selected">'
-        . __('Select a column.') . '</option>'
-        . '</select></form>'
-        . '</td>'
-        . '<td class="navigation_separator"></td>'
-        . '</tr>'
-        . '</table>';
-
-    return $columnAdd;
-}
-
-/**
- * build html for a row in central columns table
- *
- * @param array   $row     array contains complete information of
- * a particular row of central list table
- * @param boolean $odd_row set true if the row is at odd number position
- * @param int     $row_num position the row in the table
- * @param string  $db      current database
- *
- * @return string html of a particular row in the central columns table.
- */
-function PMA_getHTMLforCentralColumnsTableRow($row, $odd_row, $row_num, $db)
-{
-    $tableHtml = '<tr data-rownum="' . $row_num . '" id="f_' . $row_num . '" '
-        . 'class="' . ($odd_row ? 'odd' : 'even') . '">'
-        . PMA_URL_getHiddenInputs(
-            $db
-        )
-        . '<input type="hidden" name="edit_save" value="save">'
-        . '<td class="nowrap">'
-        . '<input type="checkbox" class="checkall" name="selected_fld[]" '
-        . 'value="' . htmlspecialchars($row['col_name']) . '" '
-        . 'id="checkbox_row_' . $row_num . '"/>'
-        . '</td>'
-        . '<td id="edit_' . $row_num . '" class="edit center">'
-        . '<a href="#">' . Util::getIcon('b_edit.png', __('Edit')) . '</a></td>'
-        . '<td class="del_row" data-rownum = "' . $row_num . '">'
-        . '<a hrf="#">' . Util::getIcon('b_drop.png', __('Delete')) . '</a>'
-        . '<input type="submit" data-rownum = "' . $row_num . '"'
-        . ' class="edit_cancel_form" value="Cancel"></td>'
-        . '<td id="save_' . $row_num . '" style="display:none">'
-        . '<input type="submit" data-rownum = "' . $row_num . '"'
-        . ' class="edit_save_form" value="Save"></td>';
-
-    $tableHtml .=
-        '<td name="col_name" class="nowrap">'
-        . '<span>' . htmlspecialchars($row['col_name']) . '</span>'
-        . '<input name="orig_col_name" type="hidden" '
-        . 'value="' . htmlspecialchars($row['col_name']) . '">'
-        . PMA\libraries\Template::get('columns_definitions/column_name')
-            ->render(
-                array(
-                'columnNumber' => $row_num,
-                'ci' => 0,
-                'ci_offset' => 0,
-                'columnMeta' => array(
-                    'Field'=>$row['col_name']
-                ),
-                'cfgRelation' => array(
-                    'centralcolumnswork' => false
-                )
-                )
-            )
-        . '</td>';
-    $tableHtml .=
-        '<td name = "col_type" class="nowrap"><span>'
-        . htmlspecialchars($row['col_type']) . '</span>'
-        . PMA\libraries\Template::get('columns_definitions/column_type')
-            ->render(
-                array(
-                'columnNumber' => $row_num,
-                'ci' => 1,
-                'ci_offset' => 0,
-                'type_upper' => mb_strtoupper($row['col_type']),
-                'columnMeta' => array()
-                )
-            )
-        . '</td>';
-    $tableHtml .=
-        '<td class="nowrap" name="col_length">'
-        . '<span>' . ($row['col_length']?htmlspecialchars($row['col_length']):"")
-        . '</span>'
-        . PMA\libraries\Template::get('columns_definitions/column_length')->render(
-            array(
-                'columnNumber' => $row_num,
-                'ci' => 2,
-                'ci_offset' => 0,
-                'length_values_input_size' => 8,
-                'length_to_display' => $row['col_length']
-            )
-        )
-        . '</td>';
-
-    $meta = array();
-    if (!isset($row['col_default']) || $row['col_default'] == '') {
-        $meta['DefaultType'] = 'NONE';
-    } else {
-        if ($row['col_default'] == 'CURRENT_TIMESTAMP'
-            || $row['col_default'] == 'NULL'
-        ) {
-            $meta['DefaultType'] = $row['col_default'];
-        } else {
-            $meta['DefaultType'] = 'USER_DEFINED';
-            $meta['DefaultValue'] = $row['col_default'];
-        }
-    }
-    $tableHtml .=
-        '<td class="nowrap" name="col_default"><span>' . (isset($row['col_default'])
-            ? htmlspecialchars($row['col_default']) : 'None')
-        . '</span>'
-        . PMA\libraries\Template::get('columns_definitions/column_default')
-            ->render(
-                array(
-                'columnNumber' => $row_num,
-                'ci' => 3,
-                'ci_offset' => 0,
-                'type_upper' => mb_strtoupper($row['col_type']),
-                'columnMeta' => $meta
-                )
-            )
-        . '</td>';
-
-    $tableHtml .=
-        '<td name="collation" class="nowrap">'
-        . '<span>' . htmlspecialchars($row['col_collation']) . '</span>'
-        . PMA_generateCharsetDropdownBox(
-            PMA_CSDROPDOWN_COLLATION, 'field_collation[' . $row_num . ']',
-            'field_' . $row_num . '_4', $row['col_collation'], false
-        )
-        . '</td>';
-    $tableHtml .=
-        '<td class="nowrap" name="col_attribute">'
-        . '<span>' .
-        ($row['col_attribute']
-            ? htmlspecialchars($row['col_attribute']) : "" )
-        . '</span>'
-        . PMA\libraries\Template::get('columns_definitions/column_attribute')
-            ->render(
-                array(
-                'columnNumber' => $row_num,
-                'ci' => 5,
-                'ci_offset' => 0,
-                'extracted_columnspec' => array(),
-                'columnMeta' => $row['col_attribute'],
-                'submit_attribute' => false,
-                )
-            )
-        . '</td>';
-    $tableHtml .=
-        '<td class="nowrap" name="col_isNull">'
-        . '<span>' . ($row['col_isNull'] ? __('Yes') : __('No'))
-        . '</span>'
-        . PMA\libraries\Template::get('columns_definitions/column_null')
-            ->render(
-                array(
-                'columnNumber' => $row_num,
-                'ci' => 6,
-                'ci_offset' => 0,
-                'columnMeta' => array(
-                    'Null' => $row['col_isNull']
-                )
-                )
-            )
-        . '</td>';
-
-    $tableHtml .=
-        '<td class="nowrap" name="col_extra"><span>'
-        . htmlspecialchars($row['col_extra']) . '</span>'
-        . PMA\libraries\Template::get('columns_definitions/column_extra')->render(
-            array(
-                'columnNumber' => $row_num,
-                'ci' => 7,
-                'ci_offset' => 0,
-                'columnMeta' => array('Extra'=>$row['col_extra'])
-            )
-        )
-        . '</td>';
-
-    $tableHtml .= '</tr>';
-
-    return $tableHtml;
-}
-
-/**
- * build html for editing a row in central columns table
- *
- * @param array   $row     array contains complete information of
- * a particular row of central list table
- * @param boolean $odd_row set true if the row is at odd number position
- * @param int     $row_num position the row in the table
- *
- * @return string html of a particular row in the central columns table.
- */
-function PMA_getHTMLforCentralColumnsEditTableRow($row, $odd_row, $row_num)
-{
-    $tableHtml = '<tr class="' . ($odd_row ? 'odd' : 'even') . '">'
-        . '<input name="orig_col_name[' . $row_num . ']" type="hidden" '
-        . 'value="' . htmlspecialchars($row['col_name']) . '">'
-        . '<td name="col_name" class="nowrap">'
-        . PMA\libraries\Template::get('columns_definitions/column_name')
-            ->render(
-                array(
-                'columnNumber' => $row_num,
-                'ci' => 0,
-                'ci_offset' => 0,
-                'columnMeta' => array(
-                    'Field' => $row['col_name']
-                ),
-                'cfgRelation' => array(
-                    'centralcolumnswork' => false
-                )
-                )
-            )
-        . '</td>';
-    $tableHtml .=
-        '<td name = "col_type" class="nowrap">'
-        . PMA\libraries\Template::get('columns_definitions/column_type')
-            ->render(
-                array(
-                'columnNumber' => $row_num,
-                'ci' => 1,
-                'ci_offset' => 0,
-                'type_upper' => mb_strtoupper($row['col_type']),
-                'columnMeta' => array()
-                )
-            )
-        . '</td>';
-    $tableHtml .=
-        '<td class="nowrap" name="col_length">'
-        . PMA\libraries\Template::get('columns_definitions/column_length')->render(
-            array(
-                'columnNumber' => $row_num,
-                'ci' => 2,
-                'ci_offset' => 0,
-                'length_values_input_size' => 8,
-                'length_to_display' => $row['col_length']
-            )
-        )
-        . '</td>';
-    $meta = array();
-    if (!isset($row['col_default']) || $row['col_default'] == '') {
-        $meta['DefaultType'] = 'NONE';
-    } else {
-        if ($row['col_default'] == 'CURRENT_TIMESTAMP'
-            || $row['col_default'] == 'NULL'
-        ) {
-            $meta['DefaultType'] = $row['col_default'];
-        } else {
-            $meta['DefaultType'] = 'USER_DEFINED';
-            $meta['DefaultValue'] = $row['col_default'];
-        }
-    }
-    $tableHtml .=
-        '<td class="nowrap" name="col_default">'
-        . PMA\libraries\Template::get('columns_definitions/column_default')
-            ->render(
-                array(
-                'columnNumber' => $row_num,
-                'ci' => 3,
-                'ci_offset' => 0,
-                'type_upper' => mb_strtoupper($row['col_default']),
-                'columnMeta' => $meta
-                )
-            )
-        . '</td>';
-    $tableHtml .=
-        '<td name="collation" class="nowrap">'
-        . PMA_generateCharsetDropdownBox(
-            PMA_CSDROPDOWN_COLLATION, 'field_collation[' . $row_num . ']',
-            'field_' . $row_num . '_4', $row['col_collation'], false
-        )
-        . '</td>';
-    $tableHtml .=
-        '<td class="nowrap" name="col_attribute">'
-        . PMA\libraries\Template::get('columns_definitions/column_attribute')
-            ->render(
-                array(
-                'columnNumber' => $row_num,
-                'ci' => 5,
-                'ci_offset' => 0,
-                'extracted_columnspec' => array(
-                    'attribute' => $row['col_attribute']
-                ),
-                'columnMeta' => array(),
-                'submit_attribute' => false,
-                )
-            )
-        . '</td>';
-    $tableHtml .=
-        '<td class="nowrap" name="col_isNull">'
-        . PMA\libraries\Template::get('columns_definitions/column_null')
-            ->render(
-                array(
-                'columnNumber' => $row_num,
-                'ci' => 6,
-                'ci_offset' => 0,
-                'columnMeta' => array(
-                    'Null' => $row['col_isNull']
-                )
-                )
-            )
-        . '</td>';
-
-    $tableHtml .=
-        '<td class="nowrap" name="col_extra">'
-        . PMA\libraries\Template::get('columns_definitions/column_extra')->render(
-            array(
-                'columnNumber' => $row_num,
-                'ci' => 7,
-                'ci_offset' => 0,
-                'columnMeta' => array('Extra' => $row['col_extra'])
-            )
-        )
-        . '</td>';
-    $tableHtml .= '</tr>';
-    return $tableHtml;
-}
-
-/**
- * get the list of columns in given database excluding
- * the columns present in current table
- *
- * @param string $db    selected database
- * @param string $table current table name
- *
- * @return string encoded list of columns present in central list for the given
- *                database
- */
-function PMA_getCentralColumnsListRaw($db, $table)
-{
-    $cfgCentralColumns = PMA_centralColumnsGetParams();
-    if (empty($cfgCentralColumns)) {
-        return json_encode(array());
-    }
-    $centralTable = $cfgCentralColumns['table'];
-    if (empty($table) || $table == '') {
-        $query = 'SELECT * FROM ' . Util::backquote($centralTable) . ' '
-            . 'WHERE db_name = \'' . $GLOBALS['dbi']->escapeString($db) . '\';';
-    } else {
-        $GLOBALS['dbi']->selectDb($db, $GLOBALS['userlink']);
-        $columns = (array) $GLOBALS['dbi']->getColumnNames(
-            $db, $table, $GLOBALS['userlink']
-        );
-        $cols = '';
-        foreach ($columns as $col_select) {
-            $cols .= '\'' . $GLOBALS['dbi']->escapeString($col_select) . '\',';
-        }
-        $cols = trim($cols, ',');
-        $query = 'SELECT * FROM ' . Util::backquote($centralTable) . ' '
-            . 'WHERE db_name = \'' . $GLOBALS['dbi']->escapeString($db) . '\'';
-        if ($cols) {
-            $query .= ' AND col_name NOT IN (' . $cols . ')';
-        }
-        $query .= ';';
-    }
-    $GLOBALS['dbi']->selectDb($cfgCentralColumns['db'], $GLOBALS['controllink']);
-    $columns_list = (array)$GLOBALS['dbi']->fetchResult(
-        $query, null, null, $GLOBALS['controllink']
-    );
-    PMA_handleColumnExtra($columns_list);
-    return json_encode($columns_list);
-}
-
-/**
- * Get HTML for "check all" check box with "with selected" dropdown
- *
- * @param string $pmaThemeImage pma theme image url
- * @param string $text_dir      url for text directory
- *
- * @return string $html_output
- */
-function PMA_getCentralColumnsTableFooter($pmaThemeImage, $text_dir)
-{
-    $html_output = Util::getWithSelected(
-        $pmaThemeImage, $text_dir, "tableslistcontainer"
-    );
-    $html_output .= Util::getButtonOrImage(
-        'edit_central_columns', 'mult_submit change_central_columns',
-        'submit_mult_change', __('Edit'), 'b_edit.png', 'edit central columns'
-    );
-    $html_output .= Util::getButtonOrImage(
-        'delete_central_columns', 'mult_submit',
-        'submit_mult_central_columns_remove',
-        __('Delete'), 'b_drop.png',
-        'remove_from_central_columns'
-    );
-    return $html_output;
-}
-
-/**
- * function generate and return the table footer for
- * multiple edit central columns page
- *
- * @return string html for table footer in central columns multi edit page
- */
-function PMA_getCentralColumnsEditTableFooter()
-{
-    $html_output = '<fieldset class="tblFooters">'
-        . '<input type="submit" '
-        . 'name="save_multi_central_column_edit" value="' . __('Save') . '" />'
-        . '</fieldset>';
-    return $html_output;
-}
-/**
- * Column `col_extra` is used to store both extra and attributes for a column.
- * This method separates them.
- *
- * @param array &$columns_list columns list
- *
- * @return void
- */
-function PMA_handleColumnExtra(&$columns_list)
-{
-    foreach ($columns_list as &$row) {
-        $vals = explode(',', $row['col_extra']);
-
-        if (in_array('BINARY', $vals)) {
-            $row['col_attribute'] = 'BINARY';
-        } elseif (in_array('UNSIGNED', $vals)) {
-            $row['col_attribute'] = 'UNSIGNED';
-        } elseif (in_array('UNSIGNED ZEROFILL', $vals)) {
-            $row['col_attribute'] = 'UNSIGNED ZEROFILL';
-        } elseif (in_array('on update CURRENT_TIMESTAMP', $vals)) {
-            $row['col_attribute'] = 'on update CURRENT_TIMESTAMP';
-        } else {
-            $row['col_attribute'] = '';
-        }
-
-        if (in_array('auto_increment', $vals)) {
-            $row['col_extra'] = 'auto_increment';
-        } else {
-            $row['col_extra'] = '';
-        }
-    }
-}
-
-/**
- * build html for adding a new user defined column to central list
- *
- * @param string $db current database
- *
- * @return string html of the form to let user add a new user defined column to the
- *                list
- */
-function PMA_getHTMLforAddNewColumn($db)
-{
-    $addNewColumn = '<div id="add_col_div"><a href="#">'
-        . '<span>+</span> ' . __('Add new column') . '</a>'
-        . '<form id="add_new" style="min-width:100%;display:none" '
-        . 'method="post" action="db_central_columns.php">'
-        . PMA_URL_getHiddenInputs(
-            $db
-        )
-        . '<input type="hidden" name="add_new_column" value="add_new_column">'
-        . '<table>';
-    $addNewColumn .= PMA_getCentralColumnsTableHeader();
-    $addNewColumn .= '<tr>'
-        . '<td></td>'
-        . '<td name="col_name" class="nowrap">'
-        . PMA\libraries\Template::get('columns_definitions/column_name')
-            ->render(
-                array(
-                'columnNumber' => 0,
-                'ci' => 0,
-                'ci_offset' => 0,
-                'columnMeta' => array(),
-                'cfgRelation' => array(
-                    'centralcolumnswork' => false
-                )
-                )
-            )
-        . '</td>'
-        . '<td name = "col_type" class="nowrap">'
-        . PMA\libraries\Template::get('columns_definitions/column_type')
-            ->render(
-                array(
-                'columnNumber' => 0,
-                'ci' => 1,
-                'ci_offset' => 0,
-                'type_upper' => '',
-                'columnMeta' => array()
-                )
-            )
-        . '</td>'
-        . '<td class="nowrap" name="col_length">'
-        . PMA\libraries\Template::get('columns_definitions/column_length')->render(
-            array(
-                'columnNumber' => 0,
-                'ci' => 2,
-                'ci_offset' => 0,
-                'length_values_input_size' => 8,
-                'length_to_display' => ''
-            )
-        )
-        . '</td>'
-        . '<td class="nowrap" name="col_default">'
-        . PMA\libraries\Template::get('columns_definitions/column_default')
-            ->render(
-                array(
-                'columnNumber' => 0,
-                'ci' => 3,
-                'ci_offset' => 0,
-                'type_upper' => '',
-                'columnMeta' => array()
-                )
-            )
-        . '</td>'
-        . '<td name="collation" class="nowrap">'
-        . PMA_generateCharsetDropdownBox(
-            PMA_CSDROPDOWN_COLLATION, 'field_collation[0]',
-            'field_0_4', null, false
-        )
-        . '</td>'
-        . '<td class="nowrap" name="col_attribute">'
-        . PMA\libraries\Template::get('columns_definitions/column_attribute')
-            ->render(
-                array(
-                'columnNumber' => 0,
-                'ci' => 5,
-                'ci_offset' => 0,
-                'extracted_columnspec' => array(),
-                'columnMeta' => array(),
-                'submit_attribute' => false,
-                )
-            )
-        . '</td>'
-        . '<td class="nowrap" name="col_isNull">'
-        . PMA\libraries\Template::get('columns_definitions/column_null')
-            ->render(
-                array(
-                'columnNumber' => 0,
-                'ci' => 6,
-                'ci_offset' => 0,
-                'columnMeta' => array()
-                )
-            )
-        . '</td>'
-        . '<td class="nowrap" name="col_extra">'
-        . PMA\libraries\Template::get('columns_definitions/column_extra')->render(
-            array(
-                'columnNumber' => 0,
-                'ci' => 7,
-                'ci_offset' => 0,
-                'columnMeta' => array()
-            )
-        )
-        . '</td>'
-        . ' <td>'
-        . '<input id="add_column_save" type="submit" '
-        . ' value="Save"/></td>'
-        . '</tr>';
-    $addNewColumn .= '</table></form></div>';
-    return $addNewColumn;
-}
-
-/**
- * Get HTML for editing page central columns
- *
- * @param array  $selected_fld Array containing the selected fields
- * @param string $selected_db  String containing the name of database
- *
- * @return string HTML for complete editing page for central columns
- */
-function PMA_getHTMLforEditingPage($selected_fld,$selected_db)
-{
-    $html = '<form id="multi_edit_central_columns">';
-    $header_cells = array(
-        __('Name'), __('Type'), __('Length/Values'), __('Default'),
-        __('Collation'), __('Attributes'), __('Null'), __('A_I')
-    );
-    $html .= PMA_getCentralColumnsEditTableHeader($header_cells);
-    $selected_fld_safe = array();
-    foreach ($selected_fld as $key) {
-        $selected_fld_safe[] = $GLOBALS['dbi']->escapeString($key);
-    }
-    $columns_list = implode("','", $selected_fld_safe);
-    $columns_list = "'" . $columns_list . "'";
-    $list_detail_cols = PMA_findExistingColNames($selected_db, $columns_list, true);
-    $odd_row = false;
-    $row_num = 0;
-    foreach ($list_detail_cols as $row) {
-        $tableHtmlRow = PMA_getHTMLforCentralColumnsEditTableRow(
-            $row, $odd_row, $row_num
-        );
-        $html .= $tableHtmlRow;
-        $odd_row = !$odd_row;
-        $row_num++;
-    }
-    $html .= '</table>';
-    $html .= PMA_getCentralColumnsEditTableFooter();
-    $html .= '</form>';
-    return $html;
-}
diff --git a/#pma/libraries/charset_conversion.lib.php b/#pma/libraries/charset_conversion.lib.php
deleted file mode 100644
index 5d2e076a..00000000
--- a/#pma/libraries/charset_conversion.lib.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Charset conversion functions.
- *
- * @package PhpMyAdmin
- */
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
-define('PMA_CHARSET_NONE', 0);
-define('PMA_CHARSET_ICONV', 1);
-define('PMA_CHARSET_RECODE', 2);
-define('PMA_CHARSET_ICONV_AIX', 3);
-define('PMA_CHARSET_MB', 4);
-
-if (! isset($GLOBALS['cfg']['RecodingEngine'])) {
-    $GLOBALS['cfg']['RecodingEngine'] = '';
-}
-// Finally detect which function we will use:
-if ($GLOBALS['cfg']['RecodingEngine'] == 'iconv') {
-    if (@function_exists('iconv')) {
-        $PMA_recoding_engine = PMA_getIconvRecodingEngine();
-    } else {
-        $PMA_recoding_engine = PMA_CHARSET_NONE;
-        PMA_warnMissingExtension('iconv');
-    }
-} elseif ($GLOBALS['cfg']['RecodingEngine'] == 'recode') {
-    if (@function_exists('recode_string')) {
-        $PMA_recoding_engine = PMA_CHARSET_RECODE;
-    } else {
-        $PMA_recoding_engine = PMA_CHARSET_NONE;
-        PMA_warnMissingExtension('recode');
-    }
-} elseif ($GLOBALS['cfg']['RecodingEngine'] == 'mb') {
-    if (@function_exists('mb_convert_encoding')) {
-        $PMA_recoding_engine = PMA_CHARSET_MB;
-    } else {
-        $PMA_recoding_engine = PMA_CHARSET_NONE;
-        PMA_warnMissingExtension('mbstring');
-    }
-} elseif ($GLOBALS['cfg']['RecodingEngine'] == 'auto') {
-    /*
-     * We also need to verify iconv works, see
-     * https://github.com/phpmyadmin/phpmyadmin/issues/11787/
-     * and
-     * https://bugs.php.net/bug.php?id=44096
-     */
-    if (@function_exists('iconv') && @iconv_strlen('', 'cp1250') !== false) {
-        $PMA_recoding_engine = PMA_getIconvRecodingEngine();
-    } elseif (@function_exists('recode_string')) {
-        $PMA_recoding_engine = PMA_CHARSET_RECODE;
-    } elseif (@function_exists('mb_convert_encoding')) {
-        $PMA_recoding_engine = PMA_CHARSET_MB;
-    } else {
-        $PMA_recoding_engine = PMA_CHARSET_NONE;
-    }
-} else {
-    $PMA_recoding_engine = PMA_CHARSET_NONE;
-}
-
-/* Load AIX iconv wrapper if needed */
-if ($PMA_recoding_engine == PMA_CHARSET_ICONV_AIX) {
-    include_once './libraries/iconv_wrapper.lib.php';
-}
-
-/**
- * Determines the correct recoding engine to use
- *
- * @return int $PMA_recoding_engine
- *
- * @access  public
- *
- */
-function PMA_getIconvRecodingEngine()
-{
-    if ((@stristr(PHP_OS, 'AIX'))
-        && (@strcasecmp(ICONV_IMPL, 'unknown') == 0)
-        && (@strcasecmp(ICONV_VERSION, 'unknown') == 0)
-    ) {
-        return PMA_CHARSET_ICONV_AIX;
-    } else {
-        return PMA_CHARSET_ICONV;
-    }
-}
-
-/**
- * Converts encoding of text according to parameters with detected
- * conversion function.
- *
- * @param string $src_charset  source charset
- * @param string $dest_charset target charset
- * @param string $what         what to convert
- *
- * @return string   converted text
- *
- * @access  public
- *
- */
-function PMA_convertString($src_charset, $dest_charset, $what)
-{
-    if ($src_charset == $dest_charset) {
-        return $what;
-    }
-    switch ($GLOBALS['PMA_recoding_engine']) {
-    case PMA_CHARSET_RECODE:
-        return recode_string($src_charset . '..'  . $dest_charset, $what);
-    case PMA_CHARSET_ICONV:
-        return iconv(
-            $src_charset, $dest_charset . $GLOBALS['cfg']['IconvExtraParams'], $what
-        );
-    case PMA_CHARSET_ICONV_AIX:
-        return PMA_convertAIXIconv(
-            $src_charset, $dest_charset . $GLOBALS['cfg']['IconvExtraParams'], $what
-        );
-    case PMA_CHARSET_MB:
-        return mb_convert_encoding(
-            $what, $dest_charset, $src_charset
-        );
-    default:
-        return $what;
-    }
-} //  end of the "PMA_convertString()" function
-
diff --git a/#pma/libraries/check_user_privileges.lib.php b/#pma/libraries/check_user_privileges.lib.php
deleted file mode 100644
index f0ef0b4b..00000000
--- a/#pma/libraries/check_user_privileges.lib.php
+++ /dev/null
@@ -1,316 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Get user's global privileges and some db-specific privileges
- *
- * @package PhpMyAdmin
- */
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
-/**
- *
- */
-$GLOBALS['is_superuser'] = $GLOBALS['dbi']->isSuperuser();
-
-
-function PMA_getItemsFromShowGrantsRow($row)
-{
-    $db_name_offset = mb_strpos($row, ' ON ') + 4;
-    $show_grants_dbname = mb_substr(
-        $row, $db_name_offset,
-        mb_strpos($row, '.', $db_name_offset) - $db_name_offset
-    );
-
-    $show_grants_dbname = PMA\libraries\Util::unQuote($show_grants_dbname, '`');
-
-    $show_grants_str    = mb_substr(
-        $row,
-        6,
-        (mb_strpos($row, ' ON ') - 6)
-    );
-
-    // extrac table from GRANT sytax
-    $tblname_start_offset = mb_strpos($row, '.') + 1;
-    $tblname_end_offset = mb_strpos($row, ' TO ');
-
-    $show_grants_tblname = mb_substr(
-        $row, $tblname_start_offset,
-        $tblname_end_offset - $tblname_start_offset
-    );
-    $show_grants_tblname = PMA\libraries\Util::unQuote($show_grants_tblname, '`');
-
-    return array(
-        $show_grants_str,
-        $show_grants_dbname,
-        $show_grants_tblname
-    );
-}
-
-/**
- * Check if user has required privileges for
- * performing 'Adjust privileges' operations
- *
- * @param string $show_grants_str     string containing grants for user
- * @param string $show_grants_dbname  name of db extracted from grant string
- * @param string $show_grants_tblname name of table extracted from grant string
- *
- * @return void
- */
-function PMA_checkRequiredPrivilegesForAdjust(
-    $show_grants_str,
-    $show_grants_dbname,
-    $show_grants_tblname
-) {
-    // '... ALL PRIVILEGES ON *.* ...' OR '... ALL PRIVILEGES ON `mysql`.* ..'
-    // OR
-    // SELECT, INSERT, UPDATE, DELETE .... ON *.* OR `mysql`.*
-    if ($show_grants_str == 'ALL'
-        || $show_grants_str == 'ALL PRIVILEGES'
-        || (mb_strpos(
-                $show_grants_str, 'SELECT, INSERT, UPDATE, DELETE'
-            ) !== false)
-    ) {
-        if ($show_grants_dbname == '*'
-            && $show_grants_tblname == '*'
-        ) {
-            $GLOBALS['col_priv'] = true;
-            $GLOBALS['db_priv'] = true;
-            $GLOBALS['proc_priv'] = true;
-            $GLOBALS['table_priv'] = true;
-
-            if ($show_grants_str == 'ALL PRIVILEGES'
-                || $show_grants_str == 'ALL'
-            ) {
-                $GLOBALS['is_reload_priv'] = true;
-            }
-        }
-
-        // check for specific tables in `mysql` db
-        // Ex. '... ALL PRIVILEGES on `mysql`.`columns_priv` .. '
-        if ($show_grants_dbname == 'mysql') {
-            switch ($show_grants_tblname) {
-                case "columns_priv":
-                    $GLOBALS['col_priv'] = true;
-                    break;
-                case "db":
-                    $GLOBALS['db_priv'] = true;
-                    break;
-                case "procs_priv":
-                    $GLOBALS['proc_priv'] = true;
-                    break;
-                case "tables_priv":
-                    $GLOBALS['table_priv'] = true;
-                    break;
-                case "*":
-                    $GLOBALS['col_priv'] = true;
-                    $GLOBALS['db_priv'] = true;
-                    $GLOBALS['proc_priv'] = true;
-                    $GLOBALS['table_priv'] = true;
-                    break;
-                default:
-            }
-        }
-    }
-}
-
-/**
- * sets privilege information extracted from SHOW GRANTS result
- *
- * Detection for some CREATE privilege.
- *
- * Since MySQL 4.1.2, we can easily detect current user's grants using $userlink
- * (no control user needed) and we don't have to try any other method for
- * detection
- *
- * @todo fix to get really all privileges, not only explicitly defined for this user
- * from MySQL manual: (https://dev.mysql.com/doc/refman/5.0/en/show-grants.html)
- * SHOW GRANTS displays only the privileges granted explicitly to the named
- * account. Other privileges might be available to the account, but they are not
- * displayed. For example, if an anonymous account exists, the named account
- * might be able to use its privileges, but SHOW GRANTS will not display them.
- *
- * @return void
- */
-function PMA_analyseShowGrant()
-{
-    if (PMA\libraries\Util::cacheExists('is_create_db_priv')) {
-        $GLOBALS['is_create_db_priv'] = PMA\libraries\Util::cacheGet(
-            'is_create_db_priv'
-        );
-        $GLOBALS['is_reload_priv'] = PMA\libraries\Util::cacheGet(
-            'is_reload_priv'
-        );
-        $GLOBALS['db_to_create'] = PMA\libraries\Util::cacheGet(
-            'db_to_create'
-        );
-        $GLOBALS['dbs_where_create_table_allowed'] = PMA\libraries\Util::cacheGet(
-            'dbs_where_create_table_allowed'
-        );
-        $GLOBALS['dbs_to_test'] = PMA\libraries\Util::cacheGet(
-            'dbs_to_test'
-        );
-
-        $GLOBALS['db_priv'] = PMA\libraries\Util::cacheGet(
-            'db_priv'
-        );
-        $GLOBALS['col_priv'] = PMA\libraries\Util::cacheGet(
-            'col_priv'
-        );
-        $GLOBALS['table_priv'] = PMA\libraries\Util::cacheGet(
-            'table_priv'
-        );
-        $GLOBALS['proc_priv'] = PMA\libraries\Util::cacheGet(
-            'proc_priv'
-        );
-
-        return;
-    }
-
-    // defaults
-    $GLOBALS['is_create_db_priv']  = false;
-    $GLOBALS['is_reload_priv']     = false;
-    $GLOBALS['db_to_create']       = '';
-    $GLOBALS['dbs_where_create_table_allowed'] = array();
-    $GLOBALS['dbs_to_test']        = $GLOBALS['dbi']->getSystemSchemas();
-    $GLOBALS['proc_priv'] = false;
-    $GLOBALS['db_priv'] = false;
-    $GLOBALS['col_priv'] = false;
-    $GLOBALS['table_priv'] = false;
-
-    $rs_usr = $GLOBALS['dbi']->tryQuery('SHOW GRANTS');
-
-    if (! $rs_usr) {
-        return;
-    }
-
-    $re0 = '(^|(\\\\\\\\)+|[^\\\\])'; // non-escaped wildcards
-    $re1 = '(^|[^\\\\])(\\\)+'; // escaped wildcards
-
-    while ($row = $GLOBALS['dbi']->fetchRow($rs_usr)) {
-        list(
-            $show_grants_str,
-            $show_grants_dbname,
-            $show_grants_tblname
-        ) = PMA_getItemsFromShowGrantsRow($row[0]);
-
-        if ($show_grants_dbname == '*') {
-            if ($show_grants_str != 'USAGE') {
-                $GLOBALS['dbs_to_test'] = false;
-            }
-        } elseif ($GLOBALS['dbs_to_test'] !== false) {
-            $GLOBALS['dbs_to_test'][] = $show_grants_dbname;
-        }
-
-        if (
-            mb_strpos($show_grants_str,'RELOAD') !== false
-        ) {
-            $GLOBALS['is_reload_priv'] = true;
-        }
-
-        // check for the required privileges for adjust
-        PMA_checkRequiredPrivilegesForAdjust(
-            $show_grants_str,
-            $show_grants_dbname,
-            $show_grants_tblname
-        );
-
-        /**
-         * @todo if we find CREATE VIEW but not CREATE, do not offer
-         * the create database dialog box
-         */
-        if ($show_grants_str == 'ALL'
-            || $show_grants_str == 'ALL PRIVILEGES'
-            || $show_grants_str == 'CREATE'
-            || strpos($show_grants_str, 'CREATE,') !== false
-        ) {
-            if ($show_grants_dbname == '*') {
-                // a global CREATE privilege
-                $GLOBALS['is_create_db_priv'] = true;
-                $GLOBALS['is_reload_priv'] = true;
-                $GLOBALS['db_to_create']   = '';
-                $GLOBALS['dbs_where_create_table_allowed'][] = '*';
-                // @todo we should not break here, cause GRANT ALL *.*
-                // could be revoked by a later rule like GRANT SELECT ON db.*
-                break;
-            } else {
-                // this array may contain wildcards
-                $GLOBALS['dbs_where_create_table_allowed'][] = $show_grants_dbname;
-
-                $dbname_to_test = PMA\libraries\Util::backquote($show_grants_dbname);
-
-                if ($GLOBALS['is_create_db_priv']) {
-                    // no need for any more tests if we already know this
-                    continue;
-                }
-
-                // does this db exist?
-                if ((preg_match('/' . $re0 . '%|_/', $show_grants_dbname)
-                    && ! preg_match('/\\\\%|\\\\_/', $show_grants_dbname))
-                    || (! $GLOBALS['dbi']->tryQuery(
-                        'USE ' .  preg_replace(
-                            '/' . $re1 . '(%|_)/', '\\1\\3', $dbname_to_test
-                        )
-                    )
-                    && mb_substr($GLOBALS['dbi']->getError(), 1, 4) != 1044)
-                ) {
-                    /**
-                     * Do not handle the underscore wildcard
-                     * (this case must be rare anyway)
-                     */
-                    $GLOBALS['db_to_create'] = preg_replace(
-                        '/' . $re0 . '%/',     '\\1',
-                        $show_grants_dbname
-                    );
-                    $GLOBALS['db_to_create'] = preg_replace(
-                        '/' . $re1 . '(%|_)/', '\\1\\3',
-                        $GLOBALS['db_to_create']
-                    );
-                    $GLOBALS['is_create_db_priv'] = true;
-
-                    /**
-                     * @todo collect $GLOBALS['db_to_create'] into an array,
-                     * to display a drop-down in the "Create database" dialog
-                     */
-                     // we don't break, we want all possible databases
-                     //break;
-                } // end if
-            } // end elseif
-        } // end if
-
-    } // end while
-
-    $GLOBALS['dbi']->freeResult($rs_usr);
-
-    // must also cacheUnset() them in
-    // libraries/plugins/auth/AuthenticationCookie.php
-    PMA\libraries\Util::cacheSet('is_create_db_priv', $GLOBALS['is_create_db_priv']);
-    PMA\libraries\Util::cacheSet('is_reload_priv', $GLOBALS['is_reload_priv']);
-    PMA\libraries\Util::cacheSet('db_to_create', $GLOBALS['db_to_create']);
-    PMA\libraries\Util::cacheSet(
-        'dbs_where_create_table_allowed',
-        $GLOBALS['dbs_where_create_table_allowed']
-    );
-    PMA\libraries\Util::cacheSet('dbs_to_test', $GLOBALS['dbs_to_test']);
-
-    PMA\libraries\Util::cacheSet('proc_priv', $GLOBALS['proc_priv']);
-    PMA\libraries\Util::cacheSet('table_priv', $GLOBALS['table_priv']);
-    PMA\libraries\Util::cacheSet('col_priv', $GLOBALS['col_priv']);
-    PMA\libraries\Util::cacheSet('db_priv', $GLOBALS['db_priv']);
-} // end function
-
-$user = $GLOBALS['dbi']->fetchValue("SELECT CURRENT_USER();");
-if ($user == '@') { // MySQL is started with --skip-grant-tables
-    $GLOBALS['is_create_db_priv'] = true;
-    $GLOBALS['is_reload_priv']    = true;
-    $GLOBALS['db_to_create']      = '';
-    $GLOBALS['dbs_where_create_table_allowed'] = array('*');
-    $GLOBALS['dbs_to_test']       = false;
-    $GLOBALS['db_priv'] = true;
-    $GLOBALS['col_priv'] = true;
-    $GLOBALS['table_priv'] = true;
-    $GLOBALS['proc_priv'] = true;
-} else {
-    PMA_analyseShowGrant();
-}
diff --git a/#pma/libraries/cleanup.lib.php b/#pma/libraries/cleanup.lib.php
deleted file mode 100644
index 678f2fd7..00000000
--- a/#pma/libraries/cleanup.lib.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Functions for cleanup of user input.
- *
- * @package PhpMyAdmin
- */
-
-/**
- * Removes all variables from request except whitelisted ones.
- *
- * @param string &$whitelist list of variables to allow
- *
- * @return void
- * @access public
- */
-function PMA_removeRequestVars(&$whitelist)
-{
-    // do not check only $_REQUEST because it could have been overwritten
-    // and use type casting because the variables could have become
-    // strings
-    $keys = array_keys(
-        array_merge((array)$_REQUEST, (array)$_GET, (array)$_POST, (array)$_COOKIE)
-    );
-
-    foreach ($keys as $key) {
-        if (! in_array($key, $whitelist)) {
-            unset($_REQUEST[$key], $_GET[$key], $_POST[$key]);
-            continue;
-        }
-
-        // allowed stuff could be compromised so escape it
-        // we require it to be a string
-        if (isset($_REQUEST[$key]) && ! is_string($_REQUEST[$key])) {
-            unset($_REQUEST[$key]);
-        }
-        if (isset($_POST[$key]) && ! is_string($_POST[$key])) {
-            unset($_POST[$key]);
-        }
-        if (isset($_COOKIE[$key]) && ! is_string($_COOKIE[$key])) {
-            unset($_COOKIE[$key]);
-        }
-        if (isset($_GET[$key]) && ! is_string($_GET[$key])) {
-            unset($_GET[$key]);
-        }
-    }
-}
diff --git a/#pma/libraries/common.inc.php b/#pma/libraries/common.inc.php
deleted file mode 100644
index 8a2cbbf8..00000000
--- a/#pma/libraries/common.inc.php
+++ /dev/null
@@ -1,1134 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Misc stuff and REQUIRED by ALL the scripts.
- * MUST be included by every script
- *
- * Among other things, it contains the advanced authentication work.
- *
- * Order of sections for common.inc.php:
- *
- * the authentication libraries must be before the connection to db
- *
- * ... so the required order is:
- *
- * LABEL_variables_init
- *  - initialize some variables always needed
- * LABEL_parsing_config_file
- *  - parsing of the configuration file
- * LABEL_loading_language_file
- *  - loading language file
- * LABEL_setup_servers
- *  - check and setup configured servers
- * LABEL_theme_setup
- *  - setting up themes
- *
- * - load of MySQL extension (if necessary)
- * - loading of an authentication library
- * - db connection
- * - authentication work
- *
- * @package PhpMyAdmin
- */
-use PMA\libraries\Config;
-use PMA\libraries\DatabaseInterface;
-use PMA\libraries\ErrorHandler;
-use PMA\libraries\Message;
-use PMA\libraries\plugins\AuthenticationPlugin;
-use PMA\libraries\DbList;
-use PMA\libraries\ThemeManager;
-use PMA\libraries\Tracker;
-use PMA\libraries\Response;
-use PMA\libraries\TypesMySQL;
-use PMA\libraries\Util;
-use PMA\libraries\LanguageManager;
-
-/**
- * block attempts to directly run this script
- */
-if (getcwd() == dirname(__FILE__)) {
-    die('Attack stopped');
-}
-
-/**
- * Minimum PHP version; can't call PMA_fatalError() which uses a
- * PHP 5 function, so cannot easily localize this message.
- */
-if (version_compare(PHP_VERSION, '5.5.0', 'lt')) {
-    die(
-        'PHP 5.5+ is required. <br /> Currently installed version is: '
-        . phpversion()
-    );
-}
-
-/**
- * for verification in all procedural scripts under libraries
- */
-define('PHPMYADMIN', true);
-
-/**
- * Load vendor configuration.
- */
-require_once './libraries/vendor_config.php';
-
-/**
- * Load gettext functions.
- */
-require_once GETTEXT_INC;
-
-/**
- * Activate autoloader
- */
-require_once './libraries/autoloader.php';
-
-/**
- * initialize the error handler
- */
-$GLOBALS['error_handler'] = new ErrorHandler();
-
-/**
- * core functions
- */
-require './libraries/core.lib.php';
-
-/**
- * Input sanitizing
- */
-require './libraries/sanitizing.lib.php';
-
-/**
- * Warning about missing PHP extensions.
- */
-PMA_checkExtensions();
-
-/**
- * Set utf-8 encoding for PHP
- */
-ini_set('default_charset', 'utf-8');
-mb_internal_encoding('utf-8');
-
-/**
- * Set precision to sane value, with higher values
- * things behave slightly unexpectedly, for example
- * round(1.2, 2) returns 1.199999999999999956.
- */
-ini_set('precision', 14);
-
-/**
- * the relation lib, tracker needs it
- */
-require './libraries/relation.lib.php';
-
-if (! defined('PMA_MINIMUM_COMMON') || defined('PMA_SETUP')) {
-    /**
-     * JavaScript escaping.
-     */
-    include_once './libraries/js_escape.lib.php';
-
-    /**
-     * Include URL/hidden inputs generating.
-     */
-    include_once './libraries/url_generating.lib.php';
-}
-
-/******************************************************************************/
-/* start procedural code                       label_start_procedural         */
-
-PMA_cleanupPathInfo();
-
-/**
- * just to be sure there was no import (registering) before here
- * we empty the global space (but avoid unsetting $variables_list
- * and $key in the foreach (), we still need them!)
- */
-$variables_whitelist = array (
-    'GLOBALS',
-    '_SERVER',
-    '_GET',
-    '_POST',
-    '_REQUEST',
-    '_FILES',
-    '_ENV',
-    '_COOKIE',
-    '_SESSION',
-    'error_handler',
-    'PMA_PHP_SELF',
-    'variables_whitelist',
-    'key',
-    /* gettext globals */
-    'text_domains', 'default_domain', 'LC_CATEGORIES', 'EMULATEGETTEXT', 'CURRENTLOCALE',
-);
-
-foreach (get_defined_vars() as $key => $value) {
-    if (! in_array($key, $variables_whitelist)) {
-        unset($$key);
-    }
-}
-unset($key, $value, $variables_whitelist);
-
-/**
- * @global boolean $GLOBALS['is_ajax_request']
- * @todo should this be moved to the variables init section above?
- *
- * Check if the current request is an AJAX request, and set is_ajax_request
- * accordingly.  Suppress headers, footers and unnecessary output if set to
- * true
- */
-if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
-    $GLOBALS['is_ajax_request'] = true;
-} else {
-    $GLOBALS['is_ajax_request'] = false;
-}
-
-
-/**
- * Subforms - some functions need to be called by form, cause of the limited URL
- * length, but if this functions inside another form you cannot just open a new
- * form - so phpMyAdmin uses 'arrays' inside this form
- *
- * <code>
- * <form ...>
- * ... main form elements ...
- * <input type="hidden" name="subform[action1][id]" value="1" />
- * ... other subform data ...
- * <input type="submit" name="usesubform[action1]" value="do action1" />
- * ... other subforms ...
- * <input type="hidden" name="subform[actionX][id]" value="X" />
- * ... other subform data ...
- * <input type="submit" name="usesubform[actionX]" value="do actionX" />
- * ... main form elements ...
- * <input type="submit" name="main_action" value="submit form" />
- * </form>
- * </code>
- *
- * so we now check if a subform is submitted
- */
-$__redirect = null;
-if (isset($_POST['usesubform']) && ! defined('PMA_MINIMUM_COMMON')) {
-    // if a subform is present and should be used
-    // the rest of the form is deprecated
-    $subform_id = key($_POST['usesubform']);
-    $subform    = $_POST['subform'][$subform_id];
-    $_POST      = $subform;
-    $_REQUEST   = $subform;
-    /**
-     * some subforms need another page than the main form, so we will just
-     * include this page at the end of this script - we use $__redirect to
-     * track this
-     */
-    if (isset($_POST['redirect'])
-        && $_POST['redirect'] != basename($PMA_PHP_SELF)
-    ) {
-        $__redirect = $_POST['redirect'];
-        unset($_POST['redirect']);
-    }
-    unset($subform_id, $subform);
-} else {
-    // Note: here we overwrite $_REQUEST so that it does not contain cookies,
-    // because another application for the same domain could have set
-    // a cookie (with a compatible path) that overrides a variable
-    // we expect from GET or POST.
-    // We'll refer to cookies explicitly with the $_COOKIE syntax.
-    $_REQUEST = array_merge($_GET, $_POST);
-}
-// end check if a subform is submitted
-
-/**
- * check timezone setting
- * this could produce an E_WARNING - but only once,
- * if not done here it will produce E_WARNING on every date/time function
- */
-date_default_timezone_set(@date_default_timezone_get());
-
-/******************************************************************************/
-/* parsing configuration file                  LABEL_parsing_config_file      */
-
-/**
- * @global Config $GLOBALS['PMA_Config']
- * force reading of config file, because we removed sensitive values
- * in the previous iteration
- */
-$GLOBALS['PMA_Config'] = new Config(CONFIG_FILE);
-
-/**
- * BC - enable backward compatibility
- * exports all configuration settings into $GLOBALS ($GLOBALS['cfg'])
- */
-$GLOBALS['PMA_Config']->enableBc();
-
-/**
- * clean cookies on upgrade
- * when changing something related to PMA cookies, increment the cookie version
- */
-$pma_cookie_version = 5;
-if (isset($_COOKIE)) {
-    if (! isset($_COOKIE['pmaCookieVer'])
-        || $_COOKIE['pmaCookieVer'] != $pma_cookie_version
-    ) {
-        // delete all cookies
-        foreach ($_COOKIE as $cookie_name => $tmp) {
-            $GLOBALS['PMA_Config']->removeCookie($cookie_name);
-        }
-        $_COOKIE = array();
-        $GLOBALS['PMA_Config']->setCookie('pmaCookieVer', $pma_cookie_version);
-    }
-}
-
-/**
- * include session handling after the globals, to prevent overwriting
- */
-require './libraries/session.inc.php';
-
-/**
- * init some variables LABEL_variables_init
- */
-
-/**
- * holds parameters to be passed to next page
- * @global array $GLOBALS['url_params']
- */
-$GLOBALS['url_params'] = array();
-
-/**
- * the whitelist for $GLOBALS['goto']
- * @global array $goto_whitelist
- */
-$goto_whitelist = array(
-    //'browse_foreigners.php',
-    //'changelog.php',
-    //'chk_rel.php',
-    'db_datadict.php',
-    'db_sql.php',
-    'db_events.php',
-    'db_export.php',
-    'db_importdocsql.php',
-    'db_qbe.php',
-    'db_structure.php',
-    'db_import.php',
-    'db_operations.php',
-    'db_search.php',
-    'db_routines.php',
-    'export.php',
-    'import.php',
-    //'index.php',
-    //'navigation.php',
-    //'license.php',
-    'index.php',
-    'pdf_pages.php',
-    'pdf_schema.php',
-    'server_binlog.php',
-    'server_collations.php',
-    'server_databases.php',
-    'server_engines.php',
-    'server_export.php',
-    'server_import.php',
-    'server_privileges.php',
-    'server_sql.php',
-    'server_status.php',
-    'server_status_advisor.php',
-    'server_status_monitor.php',
-    'server_status_queries.php',
-    'server_status_variables.php',
-    'server_variables.php',
-    'sql.php',
-    'tbl_addfield.php',
-    'tbl_change.php',
-    'tbl_create.php',
-    'tbl_import.php',
-    'tbl_indexes.php',
-    'tbl_sql.php',
-    'tbl_export.php',
-    'tbl_operations.php',
-    'tbl_structure.php',
-    'tbl_relation.php',
-    'tbl_replace.php',
-    'tbl_row_action.php',
-    'tbl_select.php',
-    'tbl_zoom_select.php',
-    //'themes.php',
-    'transformation_overview.php',
-    'transformation_wrapper.php',
-    'user_password.php',
-);
-
-/**
- * check $__redirect against whitelist
- */
-if (! PMA_checkPageValidity($__redirect, $goto_whitelist)) {
-    $__redirect = null;
-}
-
-/**
- * holds page that should be displayed
- * @global string $GLOBALS['goto']
- */
-$GLOBALS['goto'] = '';
-// Security fix: disallow accessing serious server files via "?goto="
-if (PMA_checkPageValidity($_REQUEST['goto'], $goto_whitelist)) {
-    $GLOBALS['goto'] = $_REQUEST['goto'];
-    $GLOBALS['url_params']['goto'] = $_REQUEST['goto'];
-} else {
-    unset($_REQUEST['goto'], $_GET['goto'], $_POST['goto'], $_COOKIE['goto']);
-}
-
-/**
- * returning page
- * @global string $GLOBALS['back']
- */
-if (PMA_checkPageValidity($_REQUEST['back'], $goto_whitelist)) {
-    $GLOBALS['back'] = $_REQUEST['back'];
-} else {
-    unset($_REQUEST['back'], $_GET['back'], $_POST['back'], $_COOKIE['back']);
-}
-
-/**
- * Check whether user supplied token is valid, if not remove any possibly
- * dangerous stuff from request.
- *
- * remember that some objects in the session with session_start and __wakeup()
- * could access this variables before we reach this point
- * f.e. PMA\libraries\Config: fontsize
- *
- * @todo variables should be handled by their respective owners (objects)
- * f.e. lang, server, collation_connection in PMA\libraries\Config
- */
-$token_mismatch = true;
-$token_provided = false;
-if (PMA_isValid($_REQUEST['token'])) {
-    $token_provided = true;
-    $token_mismatch = ! hash_equals($_SESSION[' PMA_token '], $_REQUEST['token']);
-}
-
-if ($token_mismatch) {
-    /**
-     *  List of parameters which are allowed from unsafe source
-     */
-    $allow_list = array(
-        /* needed for direct access, see FAQ 1.34
-         * also, server needed for cookie login screen (multi-server)
-         */
-        'server', 'db', 'table', 'target', 'lang',
-        /* Session ID */
-        'phpMyAdmin',
-        /* Cookie preferences */
-        'pma_lang', 'pma_collation_connection',
-        /* Possible login form */
-        'pma_servername', 'pma_username', 'pma_password',
-        'g-recaptcha-response',
-        /* Needed to send the correct reply */
-        'ajax_request',
-        /* Permit to log out even if there is a token mismatch */
-        'old_usr',
-        /* Permit redirection with token-mismatch in url.php */
-        'url',
-        /* Permit session expiry flag */
-        'session_expired',
-        /* JS loading */
-        'scripts', 'call_done'
-    );
-    /**
-     * Allow changing themes in test/theme.php
-     */
-    if (defined('PMA_TEST_THEME')) {
-        $allow_list[] = 'set_theme';
-    }
-    /**
-     * Require cleanup functions
-     */
-    include './libraries/cleanup.lib.php';
-    /**
-     * Do actual cleanup
-     */
-    PMA_removeRequestVars($allow_list);
-
-}
-
-
-/**
- * current selected database
- * @global string $GLOBALS['db']
- */
-PMA_setGlobalDbOrTable('db');
-
-/**
- * current selected table
- * @global string $GLOBALS['table']
- */
-PMA_setGlobalDbOrTable('table');
-
-/**
- * Store currently selected recent table.
- * Affect $GLOBALS['db'] and $GLOBALS['table']
- */
-if (PMA_isValid($_REQUEST['selected_recent_table'])) {
-    $recent_table = json_decode($_REQUEST['selected_recent_table'], true);
-
-    $GLOBALS['db']
-        = (array_key_exists('db', $recent_table) && is_string($recent_table['db'])) ?
-            $recent_table['db'] : '';
-    $GLOBALS['url_params']['db'] = $GLOBALS['db'];
-
-    $GLOBALS['table']
-        = (array_key_exists('table', $recent_table) && is_string($recent_table['table'])) ?
-            $recent_table['table'] : '';
-    $GLOBALS['url_params']['table'] = $GLOBALS['table'];
-}
-
-/**
- * SQL query to be executed
- * @global string $GLOBALS['sql_query']
- */
-$GLOBALS['sql_query'] = '';
-if (PMA_isValid($_REQUEST['sql_query'])) {
-    $GLOBALS['sql_query'] = $_REQUEST['sql_query'];
-}
-
-//$_REQUEST['set_theme'] // checked later in this file LABEL_theme_setup
-//$_REQUEST['server']; // checked later in this file
-//$_REQUEST['lang'];   // checked by LABEL_loading_language_file
-
-/******************************************************************************/
-/* loading language file                       LABEL_loading_language_file    */
-
-/**
- * lang detection is done here
- */
-$language = LanguageManager::getInstance()->selectLanguage();
-$language->activate();
-
-// Defines the cell alignment values depending on text direction
-if ($GLOBALS['text_dir'] == 'ltr') {
-    $GLOBALS['cell_align_left']  = 'left';
-    $GLOBALS['cell_align_right'] = 'right';
-} else {
-    $GLOBALS['cell_align_left']  = 'right';
-    $GLOBALS['cell_align_right'] = 'left';
-}
-
-/**
- * check for errors occurred while loading configuration
- * this check is done here after loading language files to present errors in locale
- */
-$GLOBALS['PMA_Config']->checkPermissions();
-
-if ($GLOBALS['PMA_Config']->error_config_file) {
-    $error = '[strong]' . __('Failed to read configuration file!') . '[/strong]'
-        . '[br][br]'
-        . __(
-            'This usually means there is a syntax error in it, '
-            . 'please check any errors shown below.'
-        )
-        . '[br][br]'
-        . '[conferr]';
-    trigger_error($error, E_USER_ERROR);
-}
-if ($GLOBALS['PMA_Config']->error_config_default_file) {
-    $error = sprintf(
-        __('Could not load default configuration from: %1$s'),
-        $GLOBALS['PMA_Config']->default_source
-    );
-    trigger_error($error, E_USER_ERROR);
-}
-
-/**
- * As we try to handle charsets by ourself, mbstring overloads just
- * break it, see bug 1063821.
- */
-if (@extension_loaded('mbstring') && @ini_get('mbstring.func_overload') != '0') {
-    PMA_fatalError(
-        __(
-            'You have enabled mbstring.func_overload in your PHP '
-            . 'configuration. This option is incompatible with phpMyAdmin '
-            . 'and might cause some data to be corrupted!'
-        )
-    );
-}
-
-
-/******************************************************************************/
-/* setup servers                                       LABEL_setup_servers    */
-
-/**
- * current server
- * @global integer $GLOBALS['server']
- */
-$GLOBALS['server'] = 0;
-
-/**
- * Servers array fixups.
- * $default_server comes from PMA\libraries\Config::enableBc()
- * @todo merge into PMA\libraries\Config
- */
-// Do we have some server?
-if (! isset($cfg['Servers']) || count($cfg['Servers']) == 0) {
-    // No server => create one with defaults
-    $cfg['Servers'] = array(1 => $default_server);
-} else {
-    // We have server(s) => apply default configuration
-    $new_servers = array();
-
-    foreach ($cfg['Servers'] as $server_index => $each_server) {
-
-        // Detect wrong configuration
-        if (!is_int($server_index) || $server_index < 1) {
-            trigger_error(
-                sprintf(__('Invalid server index: %s'), $server_index),
-                E_USER_ERROR
-            );
-        }
-
-        $each_server = array_merge($default_server, $each_server);
-
-        // Don't use servers with no hostname
-        if ($each_server['connect_type'] == 'tcp' && empty($each_server['host'])) {
-            trigger_error(
-                sprintf(
-                    __(
-                        'Invalid hostname for server %1$s. '
-                        . 'Please review your configuration.'
-                    ),
-                    $server_index
-                ),
-                E_USER_ERROR
-            );
-        }
-
-        // Final solution to bug #582890
-        // If we are using a socket connection
-        // and there is nothing in the verbose server name
-        // or the host field, then generate a name for the server
-        // in the form of "Server 2", localized of course!
-        if ($each_server['connect_type'] == 'socket'
-            && empty($each_server['host'])
-            && empty($each_server['verbose'])
-        ) {
-            $each_server['verbose'] = sprintf(__('Server %d'), $server_index);
-        }
-
-        $new_servers[$server_index] = $each_server;
-    }
-    $cfg['Servers'] = $new_servers;
-    unset($new_servers, $server_index, $each_server);
-}
-
-// Cleanup
-unset($default_server);
-
-
-/******************************************************************************/
-/* setup themes                                          LABEL_theme_setup    */
-
-ThemeManager::initializeTheme();
-
-if (! defined('PMA_MINIMUM_COMMON')) {
-    /**
-     * Character set conversion.
-     */
-    include_once './libraries/charset_conversion.lib.php';
-
-    /**
-     * Lookup server by name
-     * (see FAQ 4.8)
-     */
-    if (! empty($_REQUEST['server'])
-        && is_string($_REQUEST['server'])
-        && ! is_numeric($_REQUEST['server'])
-    ) {
-        foreach ($cfg['Servers'] as $i => $server) {
-            $verboseToLower = mb_strtolower($server['verbose']);
-            $serverToLower = mb_strtolower($_REQUEST['server']);
-            if ($server['host'] == $_REQUEST['server']
-                || $server['verbose'] == $_REQUEST['server']
-                || $verboseToLower == $serverToLower
-                || md5($verboseToLower) === $serverToLower
-            ) {
-                $_REQUEST['server'] = $i;
-                break;
-            }
-        }
-        if (is_string($_REQUEST['server'])) {
-            unset($_REQUEST['server']);
-        }
-        unset($i);
-    }
-
-    /**
-     * If no server is selected, make sure that $cfg['Server'] is empty (so
-     * that nothing will work), and skip server authentication.
-     * We do NOT exit here, but continue on without logging into any server.
-     * This way, the welcome page will still come up (with no server info) and
-     * present a choice of servers in the case that there are multiple servers
-     * and '$cfg['ServerDefault'] = 0' is set.
-     */
-
-    if (isset($_REQUEST['server'])
-        && (is_string($_REQUEST['server']) || is_numeric($_REQUEST['server']))
-        && ! empty($_REQUEST['server'])
-        && ! empty($cfg['Servers'][$_REQUEST['server']])
-    ) {
-        $GLOBALS['server'] = $_REQUEST['server'];
-        $cfg['Server'] = $cfg['Servers'][$GLOBALS['server']];
-    } else {
-        if (!empty($cfg['Servers'][$cfg['ServerDefault']])) {
-            $GLOBALS['server'] = $cfg['ServerDefault'];
-            $cfg['Server'] = $cfg['Servers'][$GLOBALS['server']];
-        } else {
-            $GLOBALS['server'] = 0;
-            $cfg['Server'] = array();
-        }
-    }
-    $GLOBALS['url_params']['server'] = $GLOBALS['server'];
-
-    /**
-     * Kanji encoding convert feature appended by Y.Kawada (2002/2/20)
-     */
-    if (function_exists('mb_convert_encoding')
-        && $lang == 'ja'
-    ) {
-        include_once './libraries/kanji-encoding.lib.php';
-    } // end if
-
-    /**
-     * save some settings in cookies
-     * @todo should be done in PMA\libraries\Config
-     */
-    $GLOBALS['PMA_Config']->setCookie('pma_lang', $GLOBALS['lang']);
-    if (isset($GLOBALS['collation_connection'])) {
-        $GLOBALS['PMA_Config']->setCookie(
-            'pma_collation_connection',
-            $GLOBALS['collation_connection']
-        );
-    }
-
-    $_SESSION['PMA_Theme_Manager']->setThemeCookie();
-
-    if (! empty($cfg['Server'])) {
-
-        /**
-         * Loads the proper database interface for this server
-         */
-        include_once './libraries/database_interface.inc.php';
-
-        include_once './libraries/logging.lib.php';
-
-        // get LoginCookieValidity from preferences cache
-        // no generic solution for loading preferences from cache as some settings
-        // need to be kept for processing in
-        // PMA\libraries\Config::loadUserPreferences()
-        $cache_key = 'server_' . $GLOBALS['server'];
-        if (isset($_SESSION['cache'][$cache_key]['userprefs']['LoginCookieValidity'])
-        ) {
-            $value
-                = $_SESSION['cache'][$cache_key]['userprefs']['LoginCookieValidity'];
-            $GLOBALS['PMA_Config']->set('LoginCookieValidity', $value);
-            $GLOBALS['cfg']['LoginCookieValidity'] = $value;
-            unset($value);
-        }
-        unset($cache_key);
-
-        // Gets the authentication library that fits the $cfg['Server'] settings
-        // and run authentication
-
-        // to allow HTTP or http
-        $cfg['Server']['auth_type']
-            = mb_strtolower($cfg['Server']['auth_type']);
-
-        /**
-         * the required auth type plugin
-         */
-        $auth_class = "Authentication" . ucfirst($cfg['Server']['auth_type']);
-        if (! file_exists(
-            './libraries/plugins/auth/'
-            . $auth_class . '.php'
-        )) {
-            PMA_fatalError(
-                __('Invalid authentication method set in configuration:')
-                . ' ' . $cfg['Server']['auth_type']
-            );
-        }
-        if (isset($_REQUEST['pma_password'])) {
-            $_REQUEST['pma_password'] = substr($_REQUEST['pma_password'], 0, 256);
-        }
-        $fqnAuthClass = 'PMA\libraries\plugins\auth\\' . $auth_class;
-        // todo: add plugin manager
-        $plugin_manager = null;
-        /** @var AuthenticationPlugin $auth_plugin */
-        $auth_plugin = new $fqnAuthClass($plugin_manager);
-
-        if (! $auth_plugin->authCheck()) {
-            /* Force generating of new session on login */
-            PMA_secureSession();
-            $auth_plugin->auth();
-        } else {
-            $auth_plugin->authSetUser();
-        }
-
-        // Check IP-based Allow/Deny rules as soon as possible to reject the
-        // user based on mod_access in Apache
-        if (isset($cfg['Server']['AllowDeny'])
-            && isset($cfg['Server']['AllowDeny']['order'])
-        ) {
-
-            /**
-             * ip based access library
-             */
-            include_once './libraries/ip_allow_deny.lib.php';
-
-            $allowDeny_forbidden         = false; // default
-            if ($cfg['Server']['AllowDeny']['order'] == 'allow,deny') {
-                $allowDeny_forbidden     = true;
-                if (PMA_allowDeny('allow')) {
-                    $allowDeny_forbidden = false;
-                }
-                if (PMA_allowDeny('deny')) {
-                    $allowDeny_forbidden = true;
-                }
-            } elseif ($cfg['Server']['AllowDeny']['order'] == 'deny,allow') {
-                if (PMA_allowDeny('deny')) {
-                    $allowDeny_forbidden = true;
-                }
-                if (PMA_allowDeny('allow')) {
-                    $allowDeny_forbidden = false;
-                }
-            } elseif ($cfg['Server']['AllowDeny']['order'] == 'explicit') {
-                if (PMA_allowDeny('allow') && ! PMA_allowDeny('deny')) {
-                    $allowDeny_forbidden = false;
-                } else {
-                    $allowDeny_forbidden = true;
-                }
-            } // end if ... elseif ... elseif
-
-            // Ejects the user if banished
-            if ($allowDeny_forbidden) {
-                PMA_logUser($cfg['Server']['user'], 'allow-denied');
-                $auth_plugin->authFails();
-            }
-        } // end if
-
-        // is root allowed?
-        if (! $cfg['Server']['AllowRoot'] && $cfg['Server']['user'] == 'root') {
-            $allowDeny_forbidden = true;
-            PMA_logUser($cfg['Server']['user'], 'root-denied');
-            $auth_plugin->authFails();
-        }
-
-        // is a login without password allowed?
-        if (! $cfg['Server']['AllowNoPassword']
-            && $cfg['Server']['password'] == ''
-        ) {
-            $login_without_password_is_forbidden = true;
-            PMA_logUser($cfg['Server']['user'], 'empty-denied');
-            $auth_plugin->authFails();
-        }
-
-        // if using TCP socket is not needed
-        if (mb_strtolower($cfg['Server']['connect_type']) == 'tcp') {
-            $cfg['Server']['socket'] = '';
-        }
-
-        // Try to connect MySQL with the control user profile (will be used to
-        // get the privileges list for the current user but the true user link
-        // must be open after this one so it would be default one for all the
-        // scripts)
-        $controllink = false;
-        if ($cfg['Server']['controluser'] != '') {
-            if (! empty($cfg['Server']['controlhost'])
-                || ! empty($cfg['Server']['controlport'])
-            ) {
-                $server_details = array();
-                if (! empty($cfg['Server']['controlhost'])) {
-                    $server_details['host'] = $cfg['Server']['controlhost'];
-                } else {
-                    $server_details['host'] = $cfg['Server']['host'];
-                }
-                if (! empty($cfg['Server']['controlport'])) {
-                    $server_details['port'] = $cfg['Server']['controlport'];
-                } elseif ($server_details['host'] == $cfg['Server']['host']) {
-                    // Evaluates to true when controlhost == host
-                    // or controlhost is not defined (hence it defaults to host)
-                    // In such case we can use the value of port.
-                    $server_details['port'] = $cfg['Server']['port'];
-                }
-                // otherwise we leave the $server_details['port'] unset,
-                // allowing it to take default mysql port
-
-                $controllink = $GLOBALS['dbi']->connect(
-                    $cfg['Server']['controluser'],
-                    $cfg['Server']['controlpass'],
-                    true,
-                    $server_details
-                );
-            } else {
-                $controllink = $GLOBALS['dbi']->connect(
-                    $cfg['Server']['controluser'],
-                    $cfg['Server']['controlpass'],
-                    true
-                );
-            }
-        }
-
-        // Connects to the server (validates user's login)
-        /** @var DatabaseInterface $userlink */
-        $userlink = $GLOBALS['dbi']->connect(
-            $cfg['Server']['user'], $cfg['Server']['password'], false
-        );
-
-        // Set timestamp for the session, if required.
-        if ($cfg['Server']['SessionTimeZone'] != '') {
-            $sql_query_tz = 'SET ' . Util::backquote('time_zone') . ' = '
-                . '\''
-                . $GLOBALS['dbi']->escapeString($cfg['Server']['SessionTimeZone'])
-                . '\'';
-
-            if (! $userlink->query($sql_query_tz)) {
-                $error_message_tz = sprintf(
-                    __(
-                        'Unable to use timezone %1$s for server %2$d. '
-                        . 'Please check your configuration setting for '
-                        . '[em]$cfg[\'Servers\'][%3$d][\'SessionTimeZone\'][/em]. '
-                        . 'phpMyAdmin is currently using the default time zone '
-                        . 'of the database server.'
-                    ),
-                    $cfg['Servers'][$GLOBALS['server']]['SessionTimeZone'],
-                    $GLOBALS['server'],
-                    $GLOBALS['server']
-                );
-
-                $GLOBALS['error_handler']->addError(
-                    $error_message_tz,
-                    E_USER_WARNING,
-                    '',
-                    '',
-                    false
-                );
-            }
-        }
-
-        if (! $controllink) {
-            /*
-             * Open separate connection for control queries, this is needed
-             * to avoid problems with table locking used in main connection
-             * and phpMyAdmin issuing queries to configuration storage, which
-             * is not locked by that time.
-             */
-            $controllink = $GLOBALS['dbi']->connect(
-                $cfg['Server']['user'], $cfg['Server']['password'], false
-            );
-        }
-
-        $auth_plugin->storeUserCredentials();
-
-        /* Log success */
-        PMA_logUser($cfg['Server']['user']);
-
-        if (PMA_MYSQL_INT_VERSION < $cfg['MysqlMinVersion']['internal']) {
-            PMA_fatalError(
-                __('You should upgrade to %s %s or later.'),
-                array('MySQL', $cfg['MysqlMinVersion']['human'])
-            );
-        }
-
-        /**
-         * Type handling object.
-         */
-        $GLOBALS['PMA_Types'] = new TypesMySQL();
-
-        /**
-         * Charset information
-         */
-        include_once './libraries/mysql_charsets.inc.php';
-
-        if (!isset($mysql_charsets)) {
-            $mysql_charsets = array();
-            $mysql_collations_flat = array();
-        }
-
-        /**
-         * Initializes the SQL parsing library.
-         */
-        include_once SQL_PARSER_AUTOLOAD;
-
-        // Loads closest context to this version.
-        SqlParser\Context::loadClosest('MySql' . PMA_MYSQL_INT_VERSION);
-
-        // Sets the default delimiter (if specified).
-        if (!empty($_REQUEST['sql_delimiter'])) {
-            SqlParser\Lexer::$DEFAULT_DELIMITER = $_REQUEST['sql_delimiter'];
-        }
-
-        // TODO: Set SQL modes too.
-
-        /**
-         * the DbList class as a stub for the ListDatabase class
-         */
-        $dblist = new DbList;
-        $dblist->userlink = $userlink;
-        $dblist->controllink = $controllink;
-
-        /**
-         * some resetting has to be done when switching servers
-         */
-        if (isset($_SESSION['tmpval']['previous_server'])
-            && $_SESSION['tmpval']['previous_server'] != $GLOBALS['server']
-        ) {
-            unset($_SESSION['tmpval']['navi_limit_offset']);
-        }
-        $_SESSION['tmpval']['previous_server'] = $GLOBALS['server'];
-
-    } else { // end server connecting
-        // No need to check for 'PMA_BYPASS_GET_INSTANCE' since this execution path
-        // applies only to initial login
-        $response = Response::getInstance();
-        $response->getHeader()->disableMenuAndConsole();
-        $response->getFooter()->setMinimal();
-    }
-
-    /**
-     * check if profiling was requested and remember it
-     * (note: when $cfg['ServerDefault'] = 0, constant is not defined)
-     */
-    if (isset($_REQUEST['profiling'])
-        && Util::profilingSupported()
-    ) {
-        $_SESSION['profiling'] = true;
-    } elseif (isset($_REQUEST['profiling_form'])) {
-        // the checkbox was unchecked
-        unset($_SESSION['profiling']);
-    }
-
-    // load user preferences
-    $GLOBALS['PMA_Config']->loadUserPreferences();
-
-    /**
-     * Inclusion of profiling scripts is needed on various
-     * pages like sql, tbl_sql, db_sql, tbl_select
-     */
-    if (! defined('PMA_BYPASS_GET_INSTANCE')) {
-        $response = Response::getInstance();
-    }
-    if (isset($_SESSION['profiling'])) {
-        $header   = $response->getHeader();
-        $scripts  = $header->getScripts();
-        $scripts->addFile('chart.js');
-        $scripts->addFile('jqplot/jquery.jqplot.js');
-        $scripts->addFile('jqplot/plugins/jqplot.pieRenderer.js');
-        $scripts->addFile('jqplot/plugins/jqplot.highlighter.js');
-        $scripts->addFile('jquery/jquery.tablesorter.js');
-    }
-
-    /*
-     * There is no point in even attempting to process
-     * an ajax request if there is a token mismatch
-     */
-    if (isset($response) && $response->isAjax() && $token_mismatch) {
-        $response->setRequestStatus(false);
-        $response->addJSON(
-            'message',
-            Message::error(__('Error: Token mismatch'))
-        );
-        exit;
-    }
-} else { // end if !defined('PMA_MINIMUM_COMMON')
-    // load user preferences
-    $GLOBALS['PMA_Config']->loadUserPreferences();
-}
-
-// remove sensitive values from session
-$GLOBALS['PMA_Config']->set('blowfish_secret', '');
-$GLOBALS['PMA_Config']->set('Servers', '');
-$GLOBALS['PMA_Config']->set('default_server', '');
-
-/* Tell tracker that it can actually work */
-Tracker::enable();
-
-if (isset($_REQUEST['GLOBALS']) || isset($_FILES['GLOBALS'])) {
-    PMA_fatalError(__("GLOBALS overwrite attempt"));
-}
-
-/**
- * protect against possible exploits - there is no need to have so much variables
- */
-if (count($_REQUEST) > 1000) {
-    PMA_fatalError(__('possible exploit'));
-}
-
-/**
- * Check for numeric keys
- * (if register_globals is on, numeric key can be found in $GLOBALS)
- */
-foreach ($GLOBALS as $key => $dummy) {
-    if (is_numeric($key)) {
-        PMA_fatalError(__('numeric key detected'));
-    }
-}
-unset($dummy);
-
-// here, the function does not exist with this configuration:
-// $cfg['ServerDefault'] = 0;
-$GLOBALS['is_superuser']
-    = isset($GLOBALS['dbi']) && $GLOBALS['dbi']->isSuperuser();
-
-if (!empty($__redirect) && in_array($__redirect, $goto_whitelist)) {
-    /**
-     * include subform target page
-     */
-    include $__redirect;
-    exit();
-}
-
-// If Zero configuration mode enabled, check PMA tables in current db.
-if (! defined('PMA_MINIMUM_COMMON')
-    && ! empty($GLOBALS['server'])
-    && isset($GLOBALS['cfg']['ZeroConf'])
-    && $GLOBALS['cfg']['ZeroConf'] == true
-) {
-    if (! empty($GLOBALS['db'])) {
-        $cfgRelation = PMA_getRelationsParam();
-        if (empty($cfgRelation['db'])) {
-            PMA_fixPMATables($GLOBALS['db'], false);
-        }
-    }
-    $cfgRelation = PMA_getRelationsParam();
-    if (empty($cfgRelation['db'])) {
-        foreach ($GLOBALS['dblist']->databases as $database) {
-            if ($database == 'phpmyadmin') {
-                PMA_fixPMATables($database, false);
-            }
-        }
-    }
-}
-
-if (! defined('PMA_MINIMUM_COMMON')) {
-    include_once 'libraries/config/messages.inc.php';
-    include 'libraries/config/user_preferences.forms.php';
-    include_once 'libraries/config/page_settings.forms.php';
-}
-
-/**
- * @global array MySQL charsets map
- */
-$GLOBALS['mysql_charset_map'] = array(
-    'big5'         => 'big5',
-    'cp-866'       => 'cp866',
-    'euc-jp'       => 'ujis',
-    'euc-kr'       => 'euckr',
-    'gb2312'       => 'gb2312',
-    'gbk'          => 'gbk',
-    'iso-8859-1'   => 'latin1',
-    'iso-8859-2'   => 'latin2',
-    'iso-8859-7'   => 'greek',
-    'iso-8859-8'   => 'hebrew',
-    'iso-8859-8-i' => 'hebrew',
-    'iso-8859-9'   => 'latin5',
-    'iso-8859-13'  => 'latin7',
-    'iso-8859-15'  => 'latin1',
-    'koi8-r'       => 'koi8r',
-    'shift_jis'    => 'sjis',
-    'tis-620'      => 'tis620',
-    'utf-8'        => 'utf8',
-    'windows-1250' => 'cp1250',
-    'windows-1251' => 'cp1251',
-    'windows-1252' => 'latin1',
-    'windows-1256' => 'cp1256',
-    'windows-1257' => 'cp1257',
-);
diff --git a/#pma/libraries/config.default.php b/#pma/libraries/config.default.php
deleted file mode 100644
index 2d68231c..00000000
--- a/#pma/libraries/config.default.php
+++ /dev/null
@@ -1,3139 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * <code>
- * N   N  OOO  !!   DDDD   OOO    N   N  OOO  TTTTT   EEEE DDDD  I TTTTT !!
- * NN  N O   O !!   D   D O   O   NN  N O   O   T     E    D   D I   T   !!
- * N N N O   O !!   D   D O   O   N N N O   O   T     EEEE D   D I   T   !!
- * N  NN O   O      D   D O   O   N  NN O   O   T     E    D   D I   T
- * N   N  OOO  !!   DDDD   OOO    N   N  OOO    T     EEEE DDDD  I   T   !!
- * </code>
- *
- * DO NOT EDIT THIS FILE, EDIT config.inc.php INSTEAD !!!
- *
- * phpMyAdmin default configuration, you can copy values from here to your
- * config.inc.php
- *
- * All directives are explained in the documentation
- *
- * @package PhpMyAdmin
- */
-
-/**
- * Your phpMyAdmin URL.
- *
- * Complete the variable below with the full URL ie
- *    https://example.com/path_to_your_phpMyAdmin_directory/
- *
- * It must contain characters that are valid for a URL, and the path is
- * case sensitive on some Web servers, for example Unix-based servers.
- *
- * In most cases you can leave this variable empty, as the correct value
- * will be detected automatically. However, we recommend that you do
- * test to see that the auto-detection code works in your system. A good
- * test is to browse a table, then edit a row and save it.  There will be
- * an error message if phpMyAdmin cannot auto-detect the correct value.
- *
- * @global string $cfg['PmaAbsoluteUri']
- */
-$cfg['PmaAbsoluteUri'] = '';
-
-/**
- * Disable the default warning that is displayed on the DB Details Structure page if
- * any of the required Tables for the configuration storage could not be found
- *
- * @global boolean $cfg['PmaNoRelation_DisableWarning']
- */
-$cfg['PmaNoRelation_DisableWarning'] = false;
-
-/**
- * Disable the default warning that is displayed if Suhosin is detected
- *
- * @global boolean $cfg['SuhosinDisableWarning']
- */
-$cfg['SuhosinDisableWarning'] = false;
-
-/**
- * Disable the default warning that is displayed if session.gc_maxlifetime
- * is less than `LoginCookieValidity`
- *
- * @global boolean $cfg['LoginCookieValidityDisableWarning']
- */
-$cfg['LoginCookieValidityDisableWarning'] = false;
-
-/**
- * Disable the default warning that is displayed if a difference between
- * the MySQL library and server is detected.
- *
- * @global boolean $cfg['['ServerLibraryDifference_DisableWarning']']
- */
-$cfg['ServerLibraryDifference_DisableWarning'] = false;
-
-/**
- * Disable the default warning about MySQL reserved words in column names
- *
- * @global boolean $cfg['ReservedWordDisableWarning']
- */
-$cfg['ReservedWordDisableWarning'] = false;
-
-/**
- * Show warning about incomplete translations on certain threshold.
- *
- * @global boolean $cfg['TranslationWarningThreshold']
- */
-$cfg['TranslationWarningThreshold'] = 80;
-
-/**
- * Allows phpMyAdmin to be included from a other document in a frame;
- * setting this to true is a potential security hole
- *
- * @global boolean $cfg['AllowThirdPartyFraming']
- */
-$cfg['AllowThirdPartyFraming'] = false;
-
-/**
- * The 'cookie' auth_type uses AES algorithm to encrypt the password. If
- * at least one server configuration uses 'cookie' auth_type, enter here a
- * pass phrase that will be used by AES. The maximum length seems to be 46
- * characters.
- *
- * @global string $cfg['blowfish_secret']
- */
-$cfg['blowfish_secret'] = '';
-
-
-/*******************************************************************************
- * Server(s) configuration
- *
- * The $cfg['Servers'] array starts with $cfg['Servers'][1].  Do not use
- * $cfg['Servers'][0]. You can disable a server configuration entry by setting host
- * to ''. If you want more than one server, just copy following section
- * (including $i incrementation) several times. There is no need to define
- * full server array, just define values you need to change.
- *
- * @global array $cfg['Servers']
- */
-$cfg['Servers'] = array();
-
-$i = 1;
-
-/**
- * MySQL hostname or IP address
- *
- * @global string $cfg['Servers'][$i]['host']
- */
-$cfg['Servers'][$i]['host'] = 'localhost';
-
-/**
- * MySQL port - leave blank for default port
- *
- * @global string $cfg['Servers'][$i]['port']
- */
-$cfg['Servers'][$i]['port'] = '';
-
-/**
- * Path to the socket - leave blank for default socket
- *
- * @global string $cfg['Servers'][$i]['socket']
- */
-$cfg['Servers'][$i]['socket'] = '';
-
-/**
- * Use SSL for connecting to MySQL server?
- *
- * @global boolean $cfg['Servers'][$i]['ssl']
- */
-$cfg['Servers'][$i]['ssl'] = false;
-
-/**
- * Path to the key file when using SSL for connecting to the MySQL server
- *
- * @global string $cfg['Servers'][$i]['ssl_key']
- */
-$cfg['Servers'][$i]['ssl_key'] = null;
-
-/**
- * Path to the cert file when using SSL for connecting to the MySQL server
- *
- * @global string $cfg['Servers'][$i]['ssl_cert']
- */
-$cfg['Servers'][$i]['ssl_cert'] = null;
-
-/**
- * Path to the CA file when using SSL for connecting to the MySQL server
- *
- * @global string $cfg['Servers'][$i]['ssl_ca']
- */
-$cfg['Servers'][$i]['ssl_ca'] = null;
-
-/**
- * Directory containing trusted SSL CA certificates in PEM format
- *
- * @global string $cfg['Servers'][$i]['ssl_ca_path']
- */
-$cfg['Servers'][$i]['ssl_ca_path'] = null;
-
-/**
- * List of allowable ciphers for SSL connections to the MySQL server
- *
- * @global string $cfg['Servers'][$i]['ssl_ciphers']
- */
-$cfg['Servers'][$i]['ssl_ciphers'] = null;
-
-/**
- * MySQL 5.6 or later triggers the mysqlnd driver in PHP to validate the
- * peer_name of the SSL certifcate
- * For most self-signed certificates this is a problem. Setting this to false
- * will disable the check and allow the connection (PHP 5.6.16 or later)
- *
- * @link https://bugs.php.net/68344
- * @global string $cfg['Servers'][$i]['ssl_verify']
- */
-$cfg['Servers'][$i]['ssl_verify'] = true;
-
-/**
- * How to connect to MySQL server ('tcp' or 'socket')
- *
- * @global string $cfg['Servers'][$i]['connect_type']
- */
-$cfg['Servers'][$i]['connect_type'] = 'tcp';
-
-/**
- * Use compressed protocol for the MySQL connection
- *
- * @global boolean $cfg['Servers'][$i]['compress']
- */
-$cfg['Servers'][$i]['compress'] = false;
-
-/**
- * MySQL control host. This permits to use a host different than the
- * main host, for the phpMyAdmin configuration storage. If left empty,
- * $cfg['Servers'][$i]['host'] is used instead.
- *
- * @global string $cfg['Servers'][$i]['controlhost']
- */
-$cfg['Servers'][$i]['controlhost'] = '';
-
-/**
- * MySQL control port. This permits to use a port different than the
- * main port, for the phpMyAdmin configuration storage. If left empty,
- * $cfg['Servers'][$i]['port'] is used instead.
- *
- * @global string $cfg['Servers'][$i]['controlport']
- */
-$cfg['Servers'][$i]['controlport'] = '';
-
-/**
- * MySQL control user settings (this user must have read-only
- * access to the "mysql/user" and "mysql/db" tables). The controluser is also
- * used for all relational features (pmadb)
- *
- * @global string $cfg['Servers'][$i]['controluser']
- */
-$cfg['Servers'][$i]['controluser'] = '';
-
-/**
- * MySQL control user settings (this user must have read-only
- * access to the "mysql/user" and "mysql/db" tables). The controluser is also
- * used for all relational features (pmadb)
- *
- * @global string $cfg['Servers'][$i]['controlpass']
- */
-$cfg['Servers'][$i]['controlpass'] = '';
-
-/**
- * Authentication method (valid choices: config, http, signon or cookie)
- *
- * @global string $cfg['Servers'][$i]['auth_type']
- */
-$cfg['Servers'][$i]['auth_type'] = 'cookie';
-
-/**
- * HTTP Basic Auth Realm name to display (only used with 'HTTP' auth_type)
- *
- * @global string $cfg['Servers'][$i]['auth_http_realm']
- */
-$cfg['Servers'][$i]['auth_http_realm'] = '';
-
-/**
- * MySQL user
- *
- * @global string $cfg['Servers'][$i]['user']
- */
-$cfg['Servers'][$i]['user'] = 'root';
-
-/**
- * MySQL password (only needed with 'config' auth_type)
- *
- * @global string $cfg['Servers'][$i]['password']
- */
-$cfg['Servers'][$i]['password'] = '';
-
-/**
- * Session to use for 'signon' authentication method
- *
- * @global string $cfg['Servers'][$i]['SignonSession']
- */
-$cfg['Servers'][$i]['SignonSession'] = '';
-
-/**
- * PHP script to use for 'signon' authentication method
- *
- * @global string $cfg['Servers'][$i]['SignonScript']
- */
-$cfg['Servers'][$i]['SignonScript'] = '';
-
-/**
- * URL where to redirect user to login for 'signon' authentication method
- *
- * @global string $cfg['Servers'][$i]['SignonURL']
- */
-$cfg['Servers'][$i]['SignonURL'] = '';
-
-/**
- * URL where to redirect user after logout
- *
- * @global string $cfg['Servers'][$i]['LogoutURL']
- */
-$cfg['Servers'][$i]['LogoutURL'] = '';
-
-/**
- * Whether to try to connect without password
- *
- * @global boolean $cfg['Servers'][$i]['nopassword']
- */
-$cfg['Servers'][$i]['nopassword'] = false;
-
-/**
- * If set to a db-name, only this db is displayed in navigation panel
- * It may also be an array of db-names
- *
- * @global string $cfg['Servers'][$i]['only_db']
- */
-$cfg['Servers'][$i]['only_db'] = '';
-
-/**
- * Database name to be hidden from listings
- *
- * @global string $cfg['Servers'][$i]['hide_db']
- */
-$cfg['Servers'][$i]['hide_db'] = '';
-
-/**
- * Verbose name for this host - leave blank to show the hostname
- * (for HTTP authentication, all non-US-ASCII characters will be stripped)
- *
- * @global string $cfg['Servers'][$i]['verbose']
- */
-$cfg['Servers'][$i]['verbose'] = '';
-
-/**
- * Database used for Relation, Bookmark and PDF Features
- * (see sql/create_tables.sql)
- *   - leave blank for no support
- *     SUGGESTED: 'phpmyadmin'
- *
- * @global string $cfg['Servers'][$i]['pmadb']
- */
-$cfg['Servers'][$i]['pmadb'] = '';
-
-/**
- * Bookmark table
- *   - leave blank for no bookmark support
- *     SUGGESTED: 'pma__bookmark'
- *
- * @global string $cfg['Servers'][$i]['bookmarktable']
- */
-$cfg['Servers'][$i]['bookmarktable'] = '';
-
-/**
- * table to describe the relation between links (see doc)
- *   - leave blank for no relation-links support
- *     SUGGESTED: 'pma__relation'
- *
- * @global string $cfg['Servers'][$i]['relation']
- */
-$cfg['Servers'][$i]['relation'] = '';
-
-/**
- * table to describe the display fields
- *   - leave blank for no display fields support
- *     SUGGESTED: 'pma__table_info'
- *
- * @global string $cfg['Servers'][$i]['table_info']
- */
-$cfg['Servers'][$i]['table_info'] = '';
-
-/**
- * table to describe the tables position for the designer and PDF schema
- *   - leave blank for no PDF schema support
- *     SUGGESTED: 'pma__table_coords'
- *
- * @global string $cfg['Servers'][$i]['table_coords']
- */
-$cfg['Servers'][$i]['table_coords'] = '';
-
-/**
- * table to describe pages of relationpdf
- *   - leave blank if you don't want to use this
- *     SUGGESTED: 'pma__pdf_pages'
- *
- * @global string $cfg['Servers'][$i]['pdf_pages']
- */
-$cfg['Servers'][$i]['pdf_pages'] = '';
-
-/**
- * table to store column information
- *   - leave blank for no column comments/mime types
- *     SUGGESTED: 'pma__column_info'
- *
- * @global string $cfg['Servers'][$i]['column_info']
- */
-$cfg['Servers'][$i]['column_info'] = '';
-
-/**
- * table to store SQL history
- *   - leave blank for no SQL query history
- *     SUGGESTED: 'pma__history'
- *
- * @global string $cfg['Servers'][$i]['history']
- */
-$cfg['Servers'][$i]['history'] = '';
-
-/**
- * table to store recently used tables
- *   - leave blank for no "persistent" recently used tables
- *     SUGGESTED: 'pma__recent'
- */
-$cfg['Servers'][$i]['recent'] = '';
-
-/**
- * table to store favorite tables
- *   - leave blank for no favorite tables
- *     SUGGESTED: 'pma__favorite'
- */
-$cfg['Servers'][$i]['favorite'] = '';
-
-/**
- * table to store UI preferences for tables
- *   - leave blank for no "persistent" UI preferences
- *     SUGGESTED: 'pma__table_uiprefs'
- */
-$cfg['Servers'][$i]['table_uiprefs'] = '';
-
-/**
- * table to store SQL tracking
- *   - leave blank for no SQL tracking
- *     SUGGESTED: 'pma__tracking'
- *
- * @global string $cfg['Servers'][$i]['tracking']
- */
-$cfg['Servers'][$i]['tracking'] = '';
-
-/**
- * table to store user preferences
- *   - leave blank to disable server storage
- *     SUGGESTED: 'pma__userconfig'
- *
- * @global string $cfg['Servers'][$i]['userconfig']
- */
-$cfg['Servers'][$i]['userconfig'] = '';
-
-/**
- * table to store users and their assignment to user groups
- *   - leave blank to disable configurable menus feature
- *     SUGGESTED: 'pma__users'
- *
- * @global string $cfg['Servers'][$i]['users']
- */
-$cfg['Servers'][$i]['users'] = '';
-
-/**
- * table to store allowed menu items for each user group
- *   - leave blank to disable configurable menus feature
- *     SUGGESTED: 'pma__usergroups'
- *
- * @global string $cfg['Servers'][$i]['usergroups']
- */
-$cfg['Servers'][$i]['usergroups'] = '';
-
-/**
- * table to store information about item hidden from navigation tree
- *   - leave blank to disable hide/show navigation items feature
- *     SUGGESTED: 'pma__navigationhiding'
- *
- * @global string $cfg['Servers'][$i]['navigationhiding']
- */
-$cfg['Servers'][$i]['navigationhiding'] = '';
-
-/**
- * table to store information about saved searches from query-by-example on a db
- *   - leave blank to disable saved searches feature
- *     SUGGESTED: 'pma__savedsearches'
- *
- * @global string $cfg['Servers'][$i]['savedsearches']
- */
-$cfg['Servers'][$i]['savedsearches'] = '';
-
-/**
- * table to store central list of columns per database
- *   - leave blank to disable central list of columns feature
- *     SUGGESTED: 'pma__central_columns'
- *
- * @global string $cfg['Servers'][$i]['central_columns']
- */
-$cfg['Servers'][$i]['central_columns'] = '';
-
-/**
- * table to store designer settings
- *   - leave blank to disable the storage of designer settings
- *     SUGGESTED: 'pma__designer_settings'
- *
- * @global string $cfg['Servers'][$i]['designer_settings']
- */
-$cfg['Servers'][$i]['designer_settings'] = '';
-
-/**
- * table to store export templates
- *   - leave blank to disable saved searches feature
- *     SUGGESTED: 'pma__export_templates'
- *
- * @global string $cfg['Servers'][$i]['export_templates']
- */
-$cfg['Servers'][$i]['export_templates'] = '';
-
-/**
- * Maximum number of records saved in $cfg['Servers'][$i]['table_uiprefs'] table.
- *
- * In case where tables in databases is modified (e.g. dropped or renamed),
- * table_uiprefs may contains invalid data (referring to tables which are not
- * exist anymore).
- * This configuration make sure that we only keep N (N = MaxTableUiprefs)
- * newest record in table_uiprefs and automatically delete older records.
- *
- * @global integer $cfg['Servers'][$i]['userconfig'] = '';
- */
-$cfg['Servers'][$i]['MaxTableUiprefs'] = 100;
-
-/**
- * Sets the time zone used by phpMyAdmin. Possible values are explained at
- * https://dev.mysql.com/doc/refman/5.7/en/time-zone-support.html
- *
- * @global string $cfg['Servers'][$i]['SessionTimeZone'] = ''
- */
-$cfg['Servers'][$i]['SessionTimeZone'] = '';
-
-/**
- * whether to allow root login
- *
- * @global boolean $cfg['Servers'][$i]['AllowRoot']
- */
-$cfg['Servers'][$i]['AllowRoot'] = true;
-
-/**
- * whether to allow login of any user without a password
- *
- * @global boolean $cfg['Servers'][$i]['AllowNoPassword']
- */
-$cfg['Servers'][$i]['AllowNoPassword'] = false;
-
-/**
- * Host authentication order, leave blank to not use
- *
- * @global string $cfg['Servers'][$i]['AllowDeny']['order']
- */
-$cfg['Servers'][$i]['AllowDeny']['order'] = '';
-
-/**
- * Host authentication rules, leave blank for defaults
- *
- * @global array $cfg['Servers'][$i]['AllowDeny']['rules']
- */
-$cfg['Servers'][$i]['AllowDeny']['rules'] = array();
-
-/**
- * Disable use of INFORMATION_SCHEMA.
- *
- * @see https://sourceforge.net/p/phpmyadmin/bugs/2606/
- * @see https://bugs.mysql.com/19588
- * @global boolean $cfg['Servers'][$i]['DisableIS']
- */
-$cfg['Servers'][$i]['DisableIS'] = false;
-
-/**
- * Whether the tracking mechanism creates
- * versions for tables and views automatically.
- *
- * @global bool $cfg['Servers'][$i]['tracking_version_auto_create']
- */
-$cfg['Servers'][$i]['tracking_version_auto_create'] = false;
-
-/**
- * Defines the list of statements
- * the auto-creation uses for new versions.
- *
- * @global string $cfg['Servers'][$i]['tracking_default_statements']
- */
-$cfg['Servers'][$i]['tracking_default_statements']
-    = 'CREATE TABLE,ALTER TABLE,DROP TABLE,RENAME TABLE,CREATE INDEX,' .
-      'DROP INDEX,INSERT,UPDATE,DELETE,TRUNCATE,REPLACE,CREATE VIEW,' .
-      'ALTER VIEW,DROP VIEW,CREATE DATABASE,ALTER DATABASE,DROP DATABASE';
-
-/**
- * Whether a DROP VIEW IF EXISTS statement will be added
- * as first line to the log when creating a view.
- *
- * @global bool $cfg['Servers'][$i]['tracking_add_drop_view']
- */
-$cfg['Servers'][$i]['tracking_add_drop_view'] = true;
-
-/**
- * Whether a DROP TABLE IF EXISTS statement will be added
- * as first line to the log when creating a table.
- *
- * @global bool $cfg['Servers'][$i]['tracking_add_drop_table']
- */
-$cfg['Servers'][$i]['tracking_add_drop_table'] = true;
-
-/**
- * Whether a DROP DATABASE IF EXISTS statement will be added
- * as first line to the log when creating a database.
- *
- * @global bool $cfg['Servers'][$i]['tracking_add_drop_database']
- */
-$cfg['Servers'][$i]['tracking_add_drop_database'] = true;
-
-/**
- * Default server (0 = no default server)
- *
- * If you have more than one server configured, you can set $cfg['ServerDefault']
- * to any one of them to auto-connect to that server when phpMyAdmin is started,
- * or set it to 0 to be given a list of servers without logging in
- * If you have only one server configured, $cfg['ServerDefault'] *MUST* be
- * set to that server.
- *
- * @global integer $cfg['ServerDefault']
- */
-$cfg['ServerDefault'] = 1;
-
-/*
- * Other core phpMyAdmin settings
- */
-
-/**
- * whether version check is active
- *
- * @global boolean $cfg['VersionCheck']
- */
-if (defined('VERSION_CHECK_DEFAULT')) {
-    $cfg['VersionCheck'] = VERSION_CHECK_DEFAULT;
-} else {
-    $cfg['VersionCheck'] = true;
-}
-
-/**
- * The url of the proxy to be used when retrieving the information about
- * the latest version of phpMyAdmin or error reporting. You need this if
- * the server where phpMyAdmin is installed does not have direct access to
- * the internet.
- * The format is: "hostname:portnumber"
- *
- * @global string $cfg['ProxyUrl']
- */
-$cfg['ProxyUrl'] = "";
-
-/**
- * The username for authenticating with the proxy. By default, no
- * authentication is performed. If a username is supplied, Basic
- * Authentication will be performed. No other types of authentication
- * are currently supported.
- *
- * @global string $cfg['ProxyUser']
- */
-$cfg['ProxyUser'] = "";
-
-/**
- * The password for authenticating with the proxy.
- *
- * @global string $cfg['ProxyPass']
- */
-$cfg['ProxyPass'] = "";
-
-/**
- * maximum number of db's displayed in database list
- *
- * @global integer $cfg['MaxDbList']
- */
-$cfg['MaxDbList'] = 100;
-
-/**
- * maximum number of tables displayed in table list
- *
- * @global integer $cfg['MaxTableList']
- */
-$cfg['MaxTableList'] = 250;
-
-/**
- * whether to show hint or not
- *
- * @global boolean $cfg['ShowHint']
- */
-$cfg['ShowHint'] = true;
-
-/**
- * maximum number of characters when a SQL query is displayed
- *
- * @global integer $cfg['MaxCharactersInDisplayedSQL']
- */
-$cfg['MaxCharactersInDisplayedSQL'] = 1000;
-
-/**
- * use GZIP output buffering if possible (true|false|'auto')
- *
- * @global string $cfg['OBGzip']
- */
-$cfg['OBGzip'] = 'auto';
-
-/**
- * use persistent connections to MySQL database
- *
- * @global boolean $cfg['PersistentConnections']
- */
-$cfg['PersistentConnections'] = false;
-
-/**
- * maximum execution time in seconds (0 for no limit)
- *
- * @global integer $cfg['ExecTimeLimit']
- */
-$cfg['ExecTimeLimit'] = 300;
-
-/**
- * Path for storing session data (session_save_path PHP parameter).
- *
- * @global integer $cfg['SessionSavePath']
- */
-$cfg['SessionSavePath'] = '';
-
-/**
- * maximum allocated bytes ('-1' for no limit, '0' for no change)
- * this is a string because '16M' is a valid value; we must put here
- * a string as the default value so that /setup accepts strings
- *
- * @global string $cfg['MemoryLimit']
- */
-$cfg['MemoryLimit'] = '-1';
-
-/**
- * mark used tables, make possible to show locked tables (since MySQL 3.23.30)
- *
- * @global boolean $cfg['SkipLockedTables']
- */
-$cfg['SkipLockedTables'] = false;
-
-/**
- * show SQL queries as run
- *
- * @global boolean $cfg['ShowSQL']
- */
-$cfg['ShowSQL'] = true;
-
-/**
- * retain SQL input on Ajax execute
- *
- * @global boolean $cfg['RetainQueryEditor']
- */
-$cfg['RetainQueryBox'] = false;
-
-/**
- * use CodeMirror syntax highlighting for editing SQL
- *
- * @global boolean $cfg['CodemirrorEnable']
- */
-$cfg['CodemirrorEnable'] = true;
-
-/**
- * use the parser to find any errors in the query before executing
- *
- * @global boolean $cfg['LintEnable']
- */
-$cfg['LintEnable'] = true;
-
-/**
- * show a 'Drop database' link to normal users
- *
- * @global boolean $cfg['AllowUserDropDatabase']
- */
-$cfg['AllowUserDropDatabase'] = false;
-
-/**
- * confirm some commands that can result in loss of data
- *
- * @global boolean $cfg['Confirm']
- */
-$cfg['Confirm'] = true;
-
-/**
- * recall previous login in cookie authentication mode or not
- *
- * @global boolean $cfg['LoginCookieRecall']
- */
-$cfg['LoginCookieRecall'] = true;
-
-/**
- * validity of cookie login (in seconds; 1440 matches php.ini's
- * session.gc_maxlifetime)
- *
- * @global integer $cfg['LoginCookieValidity']
- */
-$cfg['LoginCookieValidity'] = 1440;
-
-/**
- * how long login cookie should be stored (in seconds)
- *
- * @global integer $cfg['LoginCookieStore']
- */
-$cfg['LoginCookieStore'] = 0;
-
-/**
- * whether to delete all login cookies on logout
- *
- * @global boolean $cfg['LoginCookieDeleteAll']
- */
-$cfg['LoginCookieDeleteAll'] = true;
-
-/**
- * whether to enable the "database search" feature or not
- *
- * @global boolean $cfg['UseDbSearch']
- */
-$cfg['UseDbSearch'] = true;
-
-/**
- * if set to true, PMA continues computing multiple-statement queries
- * even if one of the queries failed
- *
- * @global boolean $cfg['IgnoreMultiSubmitErrors']
- */
-$cfg['IgnoreMultiSubmitErrors'] = false;
-
-/**
- * allow login to any user entered server in cookie based authentication
- *
- * @global boolean $cfg['AllowArbitraryServer']
- */
-$cfg['AllowArbitraryServer'] = false;
-
-/**
- * restrict by IP (with regular expression) the MySQL servers the user can enter
- * when $cfg['AllowArbitraryServer'] = true
- *
- * @global string $cfg['ArbitraryServerRegexp']
- */
-$cfg['ArbitraryServerRegexp'] = '';
-
-/**
- * if reCaptcha is enabled it needs public key to connect with the service
- *
- * @global string $cfg['CaptchaLoginPublicKey']
- */
-$cfg['CaptchaLoginPublicKey'] = '';
-
-/**
- * if reCaptcha is enabled it needs private key to connect with the service
- *
- * @global string $cfg['CaptchaLoginPrivateKey']
- */
-$cfg['CaptchaLoginPrivateKey'] = '';
-
-/*******************************************************************************
- * Navigation panel setup
- */
-
-/**
- * In the navigation panel, replaces the database tree with a selector
- *
- * @global boolean $cfg['ShowDatabasesNavigationAsTree']
- */
-$cfg['ShowDatabasesNavigationAsTree'] = true;
-
-/**
- * maximum number of first level databases displayed in navigation panel
- *
- * @global integer $cfg['FirstLevelNavigationItems']
- */
-$cfg['FirstLevelNavigationItems'] = 100;
-
-/**
- * maximum number of items displayed in navigation panel
- *
- * @global integer $cfg['MaxNavigationItems']
- */
-$cfg['MaxNavigationItems'] = 50;
-
-/**
- * turn the select-based light menu into a tree
- *
- * @global boolean $cfg['NavigationTreeEnableGrouping']
- */
-$cfg['NavigationTreeEnableGrouping'] = true;
-
-/**
- * the separator to sub-tree the select-based light menu tree
- *
- * @global string $cfg['NavigationTreeDbSeparator']
- */
-$cfg['NavigationTreeDbSeparator'] = '_';
-
-/**
- * Which string will be used to generate table prefixes
- * to split/nest tables into multiple categories
- *
- * @global string $cfg['NavigationTreeTableSeparator']
- */
-$cfg['NavigationTreeTableSeparator'] = '__';
-
-/**
- * How many sublevels should be displayed when splitting up tables
- * by the above Separator
- *
- * @global integer $cfg['NavigationTreeTableLevel']
- */
-$cfg['NavigationTreeTableLevel'] = 1;
-
-/**
- * link with main panel by highlighting the current db/table
- *
- * @global boolean $cfg['NavigationLinkWithMainPanel']
- */
-$cfg['NavigationLinkWithMainPanel'] = true;
-
-/**
- * display logo at top of navigation panel
- *
- * @global boolean $cfg['NavigationDisplayLogo']
- */
-$cfg['NavigationDisplayLogo'] = true;
-
-/**
- * where should logo link point to (can also contain an external URL)
- *
- * @global string $cfg['NavigationLogoLink']
- */
-$cfg['NavigationLogoLink'] = 'index.php';
-
-/**
- * whether to open the linked page in the main window ('main') or
- * in a new window ('new')
- *
- * @global string $cfg['NavigationLogoLinkWindow']
- */
-$cfg['NavigationLogoLinkWindow'] = 'main';
-
-/**
- * number of recently used tables displayed in the navigation panel
- *
- * @global integer $cfg['NumRecentTables']
- */
-$cfg['NumRecentTables'] = 10;
-
-/**
- * number of favorite tables displayed in the navigation panel
- *
- * @global integer $cfg['NumFavoriteTables']
- */
-$cfg['NumFavoriteTables'] = 10;
-
-/**
- * display a JavaScript table filter in the navigation panel
- * when more then x tables are present
- *
- * @global boolean $cfg['NavigationTreeDisplayItemFilterMinimum']
- */
-$cfg['NavigationTreeDisplayItemFilterMinimum'] = 30;
-
-/**
- * display server choice at top of navigation panel
- *
- * @global boolean $cfg['NavigationDisplayServers']
- */
-$cfg['NavigationDisplayServers'] = true;
-
-/**
- * server choice as links
- *
- * @global boolean $cfg['DisplayServersList']
- */
-$cfg['DisplayServersList'] = false;
-
-/**
- * display a JavaScript database filter in the navigation panel
- * when more then x databases are present
- *
- * @global boolean $cfg['NavigationTreeDisplayDbFilterMinimum']
- */
-$cfg['NavigationTreeDisplayDbFilterMinimum'] = 30;
-
-/**
- * target of the navigation panel quick access icon
- *
- * Possible values:
- * 'structure.php' = fields list
- * 'sql' = SQL form
- * 'search' = search page
- * 'insert' = insert row page
- * 'browse' = browse page
- *
- * @global string $cfg['NavigationTreeDefaultTabTable']
- */
-$cfg['NavigationTreeDefaultTabTable'] = 'structure';
-
-/**
- * target of the navigation panel quick second access icon
- *
- * Possible values:
- * 'structure' = fields list
- * 'sql' = SQL form
- * 'search' = search page
- * 'insert' = insert row page
- * 'browse' = browse page
- * '' = no link
- *
- * @global string $cfg['NavigationTreeDefaultTabTable2']
- */
-$cfg['NavigationTreeDefaultTabTable2'] = '';
-
-/**
- * Enables the possibility of navigation tree expansion
- *
- * @global boolean $cfg['NavigationTreeEnableExpansion']
- */
-$cfg['NavigationTreeEnableExpansion'] = true;
-
-/**
- * Show tables in navigation panel
- *
- * @global boolean $cfg['NavigationTreeShowTables']
- */
-$cfg['NavigationTreeShowTables'] = true;
-
-/**
- * Show views in navigation panel
- *
- * @global boolean $cfg['NavigationTreeShowViews']
- */
-$cfg['NavigationTreeShowViews'] = true;
-
-/**
- * Show functions in navigation panel
- *
- * @global boolean $cfg['NavigationTreeShowFunctions']
- */
-$cfg['NavigationTreeShowFunctions'] = true;
-
-/**
- * Show procedures in navigation panel
- *
- * @global boolean $cfg['NavigationTreeShowProcedures']
- */
-$cfg['NavigationTreeShowProcedures'] = true;
-
-/**
- * Show events in navigation panel
- *
- * @global boolean $cfg['NavigationTreeShowEvents']
- */
-$cfg['NavigationTreeShowEvents'] = true;
-
-/*******************************************************************************
- * In the main panel, at startup...
- */
-
-/**
- * allow to display statistics and space usage in the pages about database
- * details and table properties
- *
- * @global boolean $cfg['ShowStats']
- */
-$cfg['ShowStats'] = true;
-
-/**
- * show MySQL server and web server information
- *
- * @global boolean $cfg['ShowServerInfo']
- */
-$cfg['ShowServerInfo'] = true;
-
-/**
- * show change password link
- *
- * @global boolean $cfg['ShowChgPassword']
- */
-$cfg['ShowChgPassword'] = true;
-
-/**
- * show create database form
- *
- * @global boolean $cfg['ShowCreateDb']
- */
-$cfg['ShowCreateDb'] = true;
-
-
-/*******************************************************************************
- * Database structure
- */
-
-/**
- * show comment column in database structure (true|false)?
- *
- * @global boolean $cfg['ShowDbStructureComment']
- */
-$cfg['ShowDbStructureComment'] = false;
-
-/**
- * show creation timestamp column in database structure (true|false)?
- *
- * @global boolean $cfg['ShowDbStructureCreation']
- */
-$cfg['ShowDbStructureCreation'] = false;
-
-/**
- * show last update timestamp column in database structure (true|false)?
- *
- * @global boolean $cfg['ShowDbStructureLastUpdate']
- */
-$cfg['ShowDbStructureLastUpdate'] = false;
-
-/**
- * show last check timestamp column in database structure (true|false)?
- *
- * @global boolean $cfg['ShowDbStructureLastCheck']
- */
-$cfg['ShowDbStructureLastCheck'] = false;
-
-/**
- * allow hide action columns to drop down menu in database structure (true|false)?
- *
- * @global boolean $cfg['HideStructureActions']
- */
-$cfg['HideStructureActions'] = true;
-
-/**
- * Show column comments in table structure view (true|false)?
- *
- * @global boolean $cfg['ShowColumnComments']
- */
-$cfg['ShowColumnComments'] = true;
-
-
-/*******************************************************************************
- * In browse mode...
- */
-
-/**
- * Use icons instead of text for the navigation bar buttons (table browse)
- * ('text'|'icons'|'both')
- *
- * @global string $cfg['TableNavigationLinksMode']
- */
-$cfg['TableNavigationLinksMode'] = 'icons';
-
-/**
- * Defines whether a user should be displayed a "show all (records)"
- * button in browse mode or not.
- *
- * @global boolean $cfg['ShowAll']
- */
-$cfg['ShowAll'] = false;
-
-/**
- * Number of rows displayed when browsing a result set. If the result
- * set contains more rows, "Previous" and "Next".
- * Possible values: 25,50,100,250,500
- *
- * @global integer $cfg['MaxRows']
- */
-$cfg['MaxRows'] = 25;
-
-/**
- * default for 'ORDER BY' clause (valid values are 'ASC', 'DESC' or 'SMART' -ie
- * descending order for fields of type TIME, DATE, DATETIME & TIMESTAMP,
- * ascending order else-)
- *
- * @global string $cfg['Order']
- */
-$cfg['Order'] = 'SMART';
-
-/**
- * grid editing: save edited cell(s) in browse-mode at once
- *
- * @global boolean $cfg['SaveCellsAtOnce']
- */
-$cfg['SaveCellsAtOnce'] = false;
-
-/**
- * grid editing: which action triggers it, or completely disable the feature
- *
- * Possible values:
- * 'click'
- * 'double-click'
- * 'disabled'
- *
- * @global string $cfg['GridEditing']
- */
-$cfg['GridEditing'] ='double-click';
-
-/**
- * Options > Relational display
- *
- * Possible values:
- * 'K' for key value
- * 'D' for display column
- *
- * @global string $cfg['RelationalDisplay']
- *
- */
-$cfg['RelationalDisplay'] = 'K';
-
-
-/*******************************************************************************
- * In edit mode...
- */
-
-/**
- * disallow editing of binary fields
- * valid values are:
- *   false    allow editing
- *   'blob'   allow editing except for BLOB fields
- *   'noblob' disallow editing except for BLOB fields
- *   'all'    disallow editing
- *
- * @global string $cfg['ProtectBinary']
- */
-$cfg['ProtectBinary'] = 'blob';
-
-/**
- * Display the function fields in edit/insert mode
- *
- * @global boolean $cfg['ShowFunctionFields']
- */
-$cfg['ShowFunctionFields'] = true;
-
-/**
- * Display the type fields in edit/insert mode
- *
- * @global boolean $cfg['ShowFieldTypesInDataEditView']
- */
-$cfg['ShowFieldTypesInDataEditView'] = true;
-
-/**
- * Which editor should be used for CHAR/VARCHAR fields:
- *  input - allows limiting of input length
- *  textarea - allows newlines in fields
- *
- * @global string $cfg['CharEditing']
- */
-$cfg['CharEditing'] = 'input';
-
-/**
- * The minimum size for character input fields
- *
- * @global integer $cfg['MinSizeForInputField']
- */
-$cfg['MinSizeForInputField'] = 4;
-
-/**
- * The maximum size for character input fields
- *
- * @global integer $cfg['MinSizeForInputField']
- */
-$cfg['MaxSizeForInputField'] = 60;
-
-/**
- * How many rows can be inserted at one time
- *
- * @global integer $cfg['InsertRows']
- */
-$cfg['InsertRows'] = 2;
-
-/**
- * Sort order for items in a foreign-key drop-down list.
- * 'content' is the referenced data, 'id' is the key value.
- *
- * @global array $cfg['ForeignKeyDropdownOrder']
- */
-$cfg['ForeignKeyDropdownOrder'] = array('content-id', 'id-content');
-
-/**
- * A drop-down list will be used if fewer items are present
- *
- * @global integer $cfg['ForeignKeyMaxLimit']
- */
-$cfg['ForeignKeyMaxLimit'] = 100;
-
-/**
- * Whether to disable foreign key checks while importing
- *
- * @global boolean $cfg['DefaultForeignKeyChecks']
- */
-$cfg['DefaultForeignKeyChecks'] = 'default';
-
-/*******************************************************************************
- * For the export features...
- */
-
-/**
- * Allow for the use of zip compression (requires zip support to be enabled)
- *
- * @global boolean $cfg['ZipDump']
- */
-$cfg['ZipDump'] = true;
-
-/**
- * Allow for the use of gzip compression (requires zlib)
- *
- * @global boolean $cfg['GZipDump']
- */
-$cfg['GZipDump'] = true;
-
-/**
- * Allow for the use of bzip2 decompression (requires bz2 extension)
- *
- * @global boolean $cfg['BZipDump']
- */
-$cfg['BZipDump'] = true;
-
-/**
- * Will compress gzip exports on the fly without the need for much memory.
- * If you encounter problems with created gzip files disable this feature.
- *
- * @global boolean $cfg['CompressOnFly']
- */
-$cfg['CompressOnFly'] = true;
-
-
-/*******************************************************************************
- * Tabs display settings
- */
-
-/**
- * How to display the menu tabs ('icons'|'text'|'both')
- *
- * @global boolean $cfg['TabsMode']
- */
-$cfg['TabsMode'] = 'both';
-
-/**
- * How to display various action links ('icons'|'text'|'both')
- *
- * @global boolean $cfg['ActionLinksMode']
- */
-$cfg['ActionLinksMode'] = 'both';
-
-/**
- * How many columns should be used for table display of a database?
- * (a value larger than 1 results in some information being hidden)
- *
- * @global integer $cfg['PropertiesNumColumns']
- */
-$cfg['PropertiesNumColumns'] = 1;
-
-/**
- * Possible values:
- * 'welcome' = the welcome page
- * (recommended for multiuser setups)
- * 'databases' = list of databases
- * 'status' = runtime information
- * 'variables' = MySQL server variables
- * 'privileges' = user management
- *
- * @global string $cfg['DefaultTabServer']
- */
-$cfg['DefaultTabServer'] = 'welcome';
-
-/**
- * Possible values:
- * 'structure' = tables list
- * 'sql' = SQL form
- * 'search' = search query
- * 'operations' = operations on database
- *
- * @global string $cfg['DefaultTabDatabase']
- */
-$cfg['DefaultTabDatabase'] = 'structure';
-
-/**
- * Possible values:
- * 'structure' = fields list
- * 'sql' = SQL form
- * 'search' = search page
- * 'insert' = insert row page
- * 'browse' = browse page
- *
- * @global string $cfg['DefaultTabTable']
- */
-$cfg['DefaultTabTable'] = 'browse';
-
-/**
- * Whether to display image or text or both image and text in table row
- * action segment. Value can be either of ``image``, ``text`` or ``both``.
- */
-$cfg['RowActionType'] = 'both';
-
-/*******************************************************************************
- * Export defaults
- */
-$cfg['Export'] = array();
-
-/**
- * codegen/csv/excel/htmlexcel/htmlword/latex/ods/odt/pdf/sql/texytext/xls/xml/yaml
- *
- * @global string $cfg['Export']['format']
- */
-$cfg['Export']['format'] = 'sql';
-
-/**
- * quick/custom/custom-no-form
- *
- * @global string $cfg['Export']['format']
- */
-$cfg['Export']['method'] = 'quick';
-
-/**
- * none/zip/gzip
- *
- * @global string $cfg['Export']['compression']
- */
-$cfg['Export']['compression'] = 'none';
-
-/**
- * Whether to LOCK TABLES before exporting
- *
- * @global boolean $cfg['Export']['lock_tables']
- */
-$cfg['Export']['lock_tables'] = false;
-
-/**
- * Whether to export databases/tables as separate files
- *
- * @global boolean $cfg['Export']['as_separate_files']
- */
-$cfg['Export']['as_separate_files'] = false;
-
-/**
- *
- *
- * @global boolean $cfg['Export']['asfile']
- */
-$cfg['Export']['asfile'] = true;
-
-/**
- *
- *
- * @global string $cfg['Export']['charset']
- */
-$cfg['Export']['charset'] = '';
-
-/**
- *
- *
- * @global boolean $cfg['Export']['onserver']
- */
-$cfg['Export']['onserver'] = false;
-
-/**
- *
- *
- * @global boolean $cfg['Export']['onserver_overwrite']
- */
-$cfg['Export']['onserver_overwrite'] = false;
-
-/**
- *
- *
- * @global boolean $cfg['Export']['quick_export_onserver']
- */
-$cfg['Export']['quick_export_onserver'] = false;
-
-/**
- *
- *
- * @global boolean $cfg['Export']['quick_export_onserver_overwrite']
- */
-$cfg['Export']['quick_export_onserver_overwrite'] = false;
-
-/**
- *
- *
- * @global boolean $cfg['Export']['remember_file_template']
- */
-$cfg['Export']['remember_file_template'] = true;
-
-/**
- *
- *
- * @global string $cfg['Export']['file_template_table']
- */
-$cfg['Export']['file_template_table'] = '@TABLE@';
-
-/**
- *
- *
- * @global string $cfg['Export']['file_template_database']
- */
-$cfg['Export']['file_template_database'] = '@DATABASE@';
-
-/**
- *
- *
- * @global string $cfg['Export']['file_template_server']
- */
-$cfg['Export']['file_template_server'] = '@SERVER@';
-
-/**
- *
- *
- * @global string $cfg['Export']['codegen_structure_or_data']
- */
-$cfg['Export']['codegen_structure_or_data'] = 'data';
-
-/**
- *
- *
- * @global $cfg['Export']['codegen_format']
- */
-$cfg['Export']['codegen_format'] = 0;
-
-/**
- *
- *
- * @global boolean $cfg['Export']['ods_columns']
- */
-$cfg['Export']['ods_columns'] = false;
-
-/**
- *
- *
- * @global string $cfg['Export']['ods_null']
- */
-$cfg['Export']['ods_null'] = 'NULL';
-
-/**
- *
- *
- * @global string $cfg['Export']['odt_structure_or_data']
- */
-$cfg['Export']['odt_structure_or_data'] = 'structure_and_data';
-
-/**
- *
- *
- * @global boolean $cfg['Export']['odt_columns']
- */
-$cfg['Export']['odt_columns'] = true;
-
-/**
- *
- *
- * @global boolean $cfg['Export']['odt_relation']
- */
-$cfg['Export']['odt_relation'] = true;
-
-/**
- *
- *
- * @global boolean $cfg['Export']['odt_comments']
- */
-$cfg['Export']['odt_comments'] = true;
-
-/**
- *
- *
- * @global boolean $cfg['Export']['odt_mime']
- */
-$cfg['Export']['odt_mime'] = true;
-
-/**
- *
- *
- * @global string $cfg['Export']['odt_null']
- */
-$cfg['Export']['odt_null'] = 'NULL';
-
-/**
- *
- *
- * @global boolean $cfg['Export']['htmlword_structure_or_data']
- */
-$cfg['Export']['htmlword_structure_or_data'] = 'structure_and_data';
-
-/**
- *
- *
- * @global boolean $cfg['Export']['htmlword_columns']
- */
-$cfg['Export']['htmlword_columns'] = false;
-
-/**
- *
- *
- * @global string $cfg['Export']['htmlword_null']
- */
-$cfg['Export']['htmlword_null'] = 'NULL';
-
-/**
- *
- *
- * @global string $cfg['Export']['texytext_structure_or_data']
- */
-$cfg['Export']['texytext_structure_or_data'] = 'structure_and_data';
-
-/**
- *
- *
- * @global boolean $cfg['Export']['texytext_columns']
- */
-$cfg['Export']['texytext_columns'] = false;
-
-/**
- *
- *
- * @global string $cfg['Export']['texytext_null']
- */
-$cfg['Export']['texytext_null'] = 'NULL';
-
-/**
- *
- *
- * @global boolean $cfg['Export']['xls_columns']
- */
-$cfg['Export']['xls_columns'] = false;
-
-/**
- *
- *
- * @global string $cfg['Export']['xls_structure_or_data']
- */
-$cfg['Export']['xls_structure_or_data'] = 'data';
-
-/**
- *
- *
- * @global string $cfg['Export']['xls_null']
- */
-$cfg['Export']['xls_null'] = 'NULL';
-
-/**
- *
- *
- * @global boolean $cfg['Export']['xlsx_columns']
- */
-$cfg['Export']['xlsx_columns'] = false;
-
-/**
- *
- *
- * @global string $cfg['Export']['xlsx_structure_or_data']
- */
-$cfg['Export']['xlsx_structure_or_data'] = 'data';
-
-/**
- *
- *
- * @global string $cfg['Export']['xlsx_null']
- */
-$cfg['Export']['xlsx_null'] = 'NULL';
-
-/**
- *
- *
- * @global boolean $cfg['Export']['csv_columns']
- */
-$cfg['Export']['csv_columns'] = false;
-
-/**
- *
- *
- * @global string $cfg['Export']['csv_structure_or_data']
- */
-$cfg['Export']['csv_structure_or_data'] = 'data';
-
-/**
- *
- *
- * @global string $cfg['Export']['csv_null']
- */
-$cfg['Export']['csv_null'] = 'NULL';
-
-/**
- *
- *
- * @global string $cfg['Export']['csv_separator']
- */
-$cfg['Export']['csv_separator'] = ',';
-
-/**
- *
- *
- * @global string $cfg['Export']['csv_enclosed']
- */
-$cfg['Export']['csv_enclosed'] = '"';
-
-/**
- *
- *
- * @global string $cfg['Export']['csv_escaped']
- */
-$cfg['Export']['csv_escaped'] = '"';
-
-/**
- *
- *
- * @global string $cfg['Export']['csv_terminated']
- */
-$cfg['Export']['csv_terminated'] = 'AUTO';
-
-/**
- *
- *
- * @global string $cfg['Export']['csv_removeCRLF']
- */
-$cfg['Export']['csv_removeCRLF'] = false;
-
-/**
- *
- *
- * @global boolean $cfg['Export']['excel_columns']
- */
-$cfg['Export']['excel_columns'] = false;
-
-/**
- *
- *
- * @global string $cfg['Export']['excel_null']
- */
-$cfg['Export']['excel_null'] = 'NULL';
-
-/**
- * win/mac
- *
- * @global string $cfg['Export']['excel_edition']
- */
-$cfg['Export']['excel_edition'] = 'win';
-
-/**
- *
- *
- * @global string $cfg['Export']['excel_removeCRLF']
- */
-$cfg['Export']['excel_removeCRLF'] = false;
-
-/**
- *
- *
- * @global string $cfg['Export']['excel_structure_or_data']
- */
-$cfg['Export']['excel_structure_or_data'] = 'data';
-
-/**
- *
- *
- * @global string $cfg['Export']['latex_structure_or_data']
- */
-$cfg['Export']['latex_structure_or_data'] = 'structure_and_data';
-
-/**
- *
- *
- * @global boolean $cfg['Export']['latex_columns']
- */
-$cfg['Export']['latex_columns'] = true;
-
-/**
- *
- *
- * @global boolean $cfg['Export']['latex_relation']
- */
-$cfg['Export']['latex_relation'] = true;
-
-/**
- *
- *
- * @global boolean $cfg['Export']['latex_comments']
- */
-$cfg['Export']['latex_comments'] = true;
-
-/**
- *
- *
- * @global boolean $cfg['Export']['latex_mime']
- */
-$cfg['Export']['latex_mime'] = true;
-
-/**
- *
- *
- * @global string $cfg['Export']['latex_null']
- */
-$cfg['Export']['latex_null'] = '\textit{NULL}';
-
-/**
- *
- *
- * @global boolean $cfg['Export']['latex_caption']
- */
-$cfg['Export']['latex_caption'] = true;
-
-/**
- *
- *
- * @global string $cfg['Export']['latex_structure_caption']
- */
-$cfg['Export']['latex_structure_caption'] = 'strLatexStructure';
-
-/**
- *
- *
- * @global string $cfg['Export']['latex_structure_continued_caption']
- */
-$cfg['Export']['latex_structure_continued_caption']
-    = 'strLatexStructure strLatexContinued';
-
-/**
- *
- *
- * @global string $cfg['Export']['latex_data_caption']
- */
-$cfg['Export']['latex_data_caption'] = 'strLatexContent';
-
-/**
- *
- *
- * @global string $cfg['Export']['latex_data_continued_caption']
- */
-$cfg['Export']['latex_data_continued_caption'] = 'strLatexContent strLatexContinued';
-
-/**
- *
- *
- * @global string $cfg['Export']['latex_data_label']
- */
-$cfg['Export']['latex_data_label'] = 'tab:@TABLE@-data';
-
-/**
- *
- *
- * @global string $cfg['Export']['latex_structure_label']
- */
-$cfg['Export']['latex_structure_label'] = 'tab:@TABLE@-structure';
-
-/**
- *
- *
- * @global string $cfg['Export']['mediawiki_structure_or_data']
- */
-$cfg['Export']['mediawiki_structure_or_data'] = 'data';
-
-/**
- *
- *
- * @global boolean $cfg['Export']['mediawiki_caption']
- */
-$cfg['Export']['mediawiki_caption'] = true;
-
-/**
- *
- *
- * @global boolean $cfg['Export']['mediawiki_headers']
- */
-$cfg['Export']['mediawiki_headers'] = true;
-
-/**
- *
- *
- * @global string $cfg['Export']['ods_structure_or_data']
- */
-$cfg['Export']['ods_structure_or_data'] = 'data';
-
-/**
- *
- *
- * @global string $cfg['Export']['pdf_structure_or_data']
- */
-$cfg['Export']['pdf_structure_or_data'] = 'data';
-
-/**
- *
- *
- * @global string $cfg['Export']['phparray_structure_or_data']
- */
-$cfg['Export']['phparray_structure_or_data'] = 'data';
-
-/**
- *
- *
- * @global string $cfg['Export']['json_structure_or_data']
- */
-$cfg['Export']['json_structure_or_data'] = 'data';
-
-/**
- * Export functions
- *
- * @global string $cfg['Export']['json_pretty_print']
- */
-$cfg['Export']['json_pretty_print'] = false;
-
-/**
- *
- *
- * @global string $cfg['Export']['sql_structure_or_data']
- */
-$cfg['Export']['sql_structure_or_data'] = 'structure_and_data';
-
-/**
- *
- *
- * @global string $cfg['Export']['sql_compatibility']
- */
-$cfg['Export']['sql_compatibility'] = 'NONE';
-
-/**
- * Whether to include comments in SQL export.
- *
- * @global string $cfg['Export']['sql_include_comments']
- */
-$cfg['Export']['sql_include_comments'] = true;
-
-/**
- *
- *
- * @global boolean $cfg['Export']['sql_disable_fk']
- */
-$cfg['Export']['sql_disable_fk'] = false;
-
-/**
- *
- *
- * @global boolean $cfg['Export']['sql_views_as_tables']
- */
-$cfg['Export']['sql_views_as_tables'] = false;
-
-/**
- *
- *
- * @global boolean $cfg['Export']['sql_metadata']
- */
-$cfg['Export']['sql_metadata'] = false;
-
-/**
- *
- *
- * @global boolean $cfg['Export']['sql_use_transaction']
- */
-$cfg['Export']['sql_use_transaction'] = false;
-
-/**
- *
- *
- * @global boolean $cfg['Export']['sql_create_database']
- */
-$cfg['Export']['sql_create_database'] = false;
-
-/**
- *
- *
- * @global boolean $cfg['Export']['sql_drop_database']
- */
-$cfg['Export']['sql_drop_database'] = false;
-
-/**
- *
- *
- * @global boolean $cfg['Export']['sql_drop_table']
- */
-$cfg['Export']['sql_drop_table'] = false;
-
-/**
- *
- *
- * true by default for correct behavior when dealing with exporting
- * of VIEWs and the stand-in table
- * @global boolean $cfg['Export']['sql_if_not_exists']
- */
-$cfg['Export']['sql_if_not_exists'] = false;
-
-/**
- *
- *
- * @global boolean $cfg['Export']['sql_procedure_function']
- */
-$cfg['Export']['sql_procedure_function'] = true;
-
-/**
- *
- *
- * @global boolean $cfg['Export']['sql_create_table']
- */
-$cfg['Export']['sql_create_table'] = true;
-
-/**
- *
- *
- * @global boolean $cfg['Export']['sql_create_view']
- */
-$cfg['Export']['sql_create_view'] = true;
-
-/**
- *
- *
- * @global boolean $cfg['Export']['sql_create_trigger']
- */
-$cfg['Export']['sql_create_trigger'] = true;
-
-/**
- *
- *
- * @global boolean $cfg['Export']['sql_auto_increment']
- */
-$cfg['Export']['sql_auto_increment'] = true;
-
-/**
- *
- *
- * @global boolean $cfg['Export']['sql_backquotes']
- */
-$cfg['Export']['sql_backquotes'] = true;
-
-/**
- *
- *
- * @global boolean $cfg['Export']['sql_dates']
- */
-$cfg['Export']['sql_dates'] = false;
-
-/**
- *
- *
- * @global boolean $cfg['Export']['sql_relation']
- */
-$cfg['Export']['sql_relation'] = false;
-
-/**
- *
- *
- * @global boolean $cfg['Export']['sql_truncate']
- */
-$cfg['Export']['sql_truncate'] = false;
-
-/**
- *
- *
- * @global boolean $cfg['Export']['sql_delayed']
- */
-$cfg['Export']['sql_delayed'] = false;
-
-/**
- *
- *
- * @global boolean $cfg['Export']['sql_ignore']
- */
-$cfg['Export']['sql_ignore'] = false;
-
-/**
- * Export time in UTC.
- *
- * @global boolean $cfg['Export']['sql_utc_time']
- */
-$cfg['Export']['sql_utc_time'] = true;
-
-/**
- *
- *
- * @global boolean $cfg['Export']['sql_hex_for_binary']
- */
-$cfg['Export']['sql_hex_for_binary'] = true;
-
-/**
- * insert/update/replace
- *
- * @global string $cfg['Export']['sql_type']
- */
-$cfg['Export']['sql_type'] = 'INSERT';
-
-/**
- *
- *
- * @global integer $cfg['Export']['sql_max_query_size']
- */
-$cfg['Export']['sql_max_query_size'] = 50000;
-
-/**
- *
- *
- * @global boolean $cfg['Export']['sql_mime']
- */
-$cfg['Export']['sql_mime'] = false;
-
-/**
- * \n is replaced by new line
- *
- * @global string $cfg['Export']['sql_header_comment']
- */
-$cfg['Export']['sql_header_comment'] = '';
-
-/**
- * Whether to use complete inserts, extended inserts, both, or neither
- *
- * @global string $cfg['Export']['sql_insert_syntax']
- */
-$cfg['Export']['sql_insert_syntax'] = 'both';
-
-/**
- *
- *
- * @global string $cfg['Export']['pdf_report_title']
- */
-$cfg['Export']['pdf_report_title'] = '';
-
-/**
- *
- *
- *@global string $cfg['Export']['xml_structure_or_data']
- */
-$cfg['Export']['xml_structure_or_data'] = 'data';
-
-/**
- * Export schema for each structure
- *
- * @global string $cfg['Export']['xml_export_struc']
- */
-$cfg['Export']['xml_export_struc'] = true;
-
-/**
- * Export events
- *
- * @global string $cfg['Export']['xml_export_events']
- */
-$cfg['Export']['xml_export_events'] = true;
-
-/**
- * Export functions
- *
- * @global string $cfg['Export']['xml_export_functions']
- */
-$cfg['Export']['xml_export_functions'] = true;
-
-/**
- * Export procedures
- *
- * @global string $cfg['Export']['xml_export_procedures']
- */
-$cfg['Export']['xml_export_procedures'] = true;
-
-/**
- * Export schema for each table
- *
- * @global string $cfg['Export']['xml_export_tables']
- */
-$cfg['Export']['xml_export_tables'] = true;
-
-/**
- * Export triggers
- *
- * @global string $cfg['Export']['xml_export_triggers']
- */
-$cfg['Export']['xml_export_triggers'] = true;
-
-/**
- * Export views
- *
- * @global string $cfg['Export']['xml_export_views']
- */
-$cfg['Export']['xml_export_views'] = true;
-
-/**
- * Export contents data
- *
- * @global string $cfg['Export']['xml_export_contents']
- */
-$cfg['Export']['xml_export_contents'] = true;
-
-/**
- *
- *
- * @global string $cfg['Export']['yaml_structure_or_data']
- */
-$cfg['Export']['yaml_structure_or_data'] = 'data';
-
-/*******************************************************************************
- * Import defaults
- */
-$cfg['Import'] = array();
-
-/**
- *
- *
- * @global string $cfg['Import']['format']
- */
-$cfg['Import']['format'] = 'sql';
-
-/**
- * Default charset for import.
- *
- * @global string $cfg['Import']['charset']
- */
-$cfg['Import']['charset'] = '';
-
-/**
- *
- *
- * @global boolean $cfg['Import']['allow_interrupt']
- */
-$cfg['Import']['allow_interrupt'] = true;
-
-/**
- *
- *
- * @global integer $cfg['Import']['skip_queries']
- */
-$cfg['Import']['skip_queries'] = 0;
-
-/**
- *
- *
- * @global string $cfg['Import']['sql_compatibility']
- */
-$cfg['Import']['sql_compatibility'] = 'NONE';
-
-/**
- *
- *
- * @global string $cfg['Import']['sql_no_auto_value_on_zero']
- */
-$cfg['Import']['sql_no_auto_value_on_zero'] = true;
-
-/**
- *
- *
- * @global string $cfg['Import']['sql_read_as_multibytes']
- */
-$cfg['Import']['sql_read_as_multibytes'] = false;
-
-/**
- *
- *
- * @global boolean $cfg['Import']['csv_replace']
- */
-$cfg['Import']['csv_replace'] = false;
-
-/**
- *
- *
- * @global boolean $cfg['Import']['csv_ignore']
- */
-$cfg['Import']['csv_ignore'] = false;
-
-/**
- *
- *
- * @global string $cfg['Import']['csv_terminated']
- */
-$cfg['Import']['csv_terminated'] = ',';
-
-/**
- *
- *
- * @global string $cfg['Import']['csv_enclosed']
- */
-$cfg['Import']['csv_enclosed'] = '"';
-
-/**
- *
- *
- * @global string $cfg['Import']['csv_escaped']
- */
-$cfg['Import']['csv_escaped'] = '"';
-
-/**
- *
- *
- * @global string $cfg['Import']['csv_new_line']
- */
-$cfg['Import']['csv_new_line'] = 'auto';
-
-/**
- *
- *
- * @global string $cfg['Import']['csv_columns']
- */
-$cfg['Import']['csv_columns'] = '';
-
-/**
- *
- *
- * @global string $cfg['Import']['csv_col_names']
- */
-$cfg['Import']['csv_col_names'] = false;
-
-/**
- *
- *
- * @global boolean $cfg['Import']['ldi_replace']
- */
-$cfg['Import']['ldi_replace'] = false;
-
-/**
- *
- *
- * @global boolean $cfg['Import']['ldi_ignore']
- */
-$cfg['Import']['ldi_ignore'] = false;
-
-/**
- *
- *
- * @global string $cfg['Import']['ldi_terminated']
- */
-$cfg['Import']['ldi_terminated'] = ';';
-
-/**
- *
- *
- * @global string $cfg['Import']['ldi_enclosed']
- */
-$cfg['Import']['ldi_enclosed'] = '"';
-
-/**
- *
- *
- * @global string $cfg['Import']['ldi_escaped']
- */
-$cfg['Import']['ldi_escaped'] = '\\';
-
-/**
- *
- *
- * @global string $cfg['Import']['ldi_new_line']
- */
-$cfg['Import']['ldi_new_line'] = 'auto';
-
-/**
- *
- *
- * @global string $cfg['Import']['ldi_columns']
- */
-$cfg['Import']['ldi_columns'] = '';
-
-/**
- * 'auto' for auto-detection, true or false for forcing
- *
- * @global string $cfg['Import']['ldi_local_option']
- */
-$cfg['Import']['ldi_local_option'] = 'auto';
-
-/**
- *
- *
- * @global string $cfg['Import']['ods_col_names']
- */
-$cfg['Import']['ods_col_names'] = false;
-
-/**
- *
- *
- * @global string $cfg['Import']['ods_empty_rows']
- */
-$cfg['Import']['ods_empty_rows'] = true;
-
-/**
- *
- *
- * @global string $cfg['Import']['ods_recognize_percentages']
- */
-$cfg['Import']['ods_recognize_percentages'] = true;
-
-/**
- *
- *
- * @global string $cfg['Import']['ods_recognize_currency']
- */
-$cfg['Import']['ods_recognize_currency'] = true;
-
-/**
- *
- *
- * @global string $cfg['Import']['xml_col_names']
- */
-$cfg['Import']['xls_col_names'] = false;
-
-/**
- *
- *
- * @global string $cfg['Import']['xml_empty_rows']
- */
-$cfg['Import']['xls_empty_rows'] = true;
-
-/**
- *
- *
- * @global string $cfg['Import']['xlsx_col_names']
- */
-$cfg['Import']['xlsx_col_names'] = false;
-
-/*******************************************************************************
- * Schema export defaults
-*/
-$cfg['Schema'] = array();
-
-/**
- * pdf/eps/dia/svg
- *
- * @global string $cfg['Schema']['format']
-*/
-$cfg['Schema']['format'] = 'pdf';
-
-/**
- *
- *
- * @global string $cfg['Schema']['pdf_show_color']
- */
-$cfg['Schema']['pdf_show_color'] = true;
-
-/**
- *
- *
- * @global string $cfg['Schema']['pdf_show_keys']
- */
-$cfg['Schema']['pdf_show_keys'] = false;
-
-/**
- *
- *
- * @global string $cfg['Schema']['pdf_all_tables_same_width']
- */
-$cfg['Schema']['pdf_all_tables_same_width'] = false;
-
-/**
- * L/P
- *
- * @global string $cfg['Schema']['pdf_orientation']
- */
-$cfg['Schema']['pdf_orientation'] = 'L';
-
-/**
- *
- *
- * @global string $cfg['Schema']['pdf_paper']
- */
-$cfg['Schema']['pdf_paper'] = 'A4';
-
-/**
- *
- *
- * @global string $cfg['Schema']['pdf_show_grid']
- */
-$cfg['Schema']['pdf_show_grid'] = false;
-
-/**
- *
- *
- * @global string $cfg['Schema']['pdf_with_doc']
- */
-$cfg['Schema']['pdf_with_doc'] = true;
-
-/**
- *
- *
- * @global string $cfg['Schema']['pdf_table_order']
- */
-$cfg['Schema']['pdf_table_order'] = '';
-
-/**
- *
- *
- * @global string $cfg['Schema']['dia_show_color']
- */
-$cfg['Schema']['dia_show_color'] = true;
-
-/**
- *
- *
- * @global string $cfg['Schema']['dia_show_keys']
- */
-$cfg['Schema']['dia_show_keys'] = false;
-
-/**
- * L/P
- *
- * @global string $cfg['Schema']['dia_orientation']
- */
-$cfg['Schema']['dia_orientation'] = 'L';
-
-/**
- *
- *
- * @global string $cfg['Schema']['dia_paper']
- */
-$cfg['Schema']['dia_paper'] = 'A4';
-
-/**
- *
- *
- * @global string $cfg['Schema']['eps_show_color']
- */
-$cfg['Schema']['eps_show_color'] = true;
-
-/**
- *
- *
- * @global string $cfg['Schema']['eps_show_keys']
- */
-$cfg['Schema']['eps_show_keys'] = false;
-
-/**
- *
- *
- * @global string $cfg['Schema']['eps_all_tables_same_width']
- */
-$cfg['Schema']['eps_all_tables_same_width'] = false;
-
-/**
- * L/P
- *
- * @global string $cfg['Schema']['eps_orientation']
- */
-$cfg['Schema']['eps_orientation'] = 'L';
-
-/**
- *
- *
- * @global string $cfg['Schema']['svg_show_color']
- */
-$cfg['Schema']['svg_show_color'] = true;
-
-/**
- *
- *
- * @global string $cfg['Schema']['svg_show_keys']
- */
-$cfg['Schema']['svg_show_keys'] = false;
-
-/**
- *
- *
- * @global string $cfg['Schema']['svg_all_tables_same_width']
- */
-$cfg['Schema']['svg_all_tables_same_width'] = false;
-
-/*******************************************************************************
- * PDF options
- */
-
-/**
- *
- *
- * @global array $cfg['PDFPageSizes']
- */
-$cfg['PDFPageSizes'] = array('A3', 'A4', 'A5', 'letter', 'legal');
-
-/**
- *
- *
- * @global string $cfg['PDFDefaultPageSize']
- */
-$cfg['PDFDefaultPageSize'] = 'A4';
-
-
-/*******************************************************************************
- * Language and character set conversion settings
- */
-
-/**
- * Default language to use, if not browser-defined or user-defined
- *
- * @global string $cfg['DefaultLang']
- */
-$cfg['DefaultLang'] = 'en';
-
-/**
- * Default connection collation
- *
- * @global string $cfg['DefaultConnectionCollation']
- */
-$cfg['DefaultConnectionCollation'] = 'utf8_unicode_ci';
-
-/**
- * Force: always use this language, e.g. 'en'
- *
- * @global string $cfg['Lang']
- */
-$cfg['Lang'] = '';
-
-/**
- * Regular expression to limit listed languages, e.g. '^(cs|en)' for Czech and
- * English only
- *
- * @global string $cfg['FilterLanguages']
- */
-$cfg['FilterLanguages'] = '';
-
-/**
- * You can select here which functions will be used for character set conversion.
- * Possible values are:
- *      auto   - automatically use available one (first is tested iconv, then
- *               recode)
- *      iconv  - use iconv or libiconv functions
- *      recode - use recode_string function
- *      mb     - use mbstring extension
- *      none   - disable encoding conversion
- *
- * @global string $cfg['RecodingEngine']
- */
-$cfg['RecodingEngine'] = 'auto';
-
-/**
- * Specify some parameters for iconv used in character set conversion. See iconv
- * documentation for details:
- * https://www.gnu.org/software/libiconv/documentation/libiconv/iconv_open.3.html
- *
- * @global string $cfg['IconvExtraParams']
- */
-$cfg['IconvExtraParams'] = '//TRANSLIT';
-
-/**
- * Available character sets for MySQL conversion. currently contains all which could
- * be found in lang/* files and few more.
- * Character sets will be shown in same order as here listed, so if you frequently
- * use some of these move them to the top.
- *
- * @global array $cfg['AvailableCharsets']
- */
-$cfg['AvailableCharsets'] = array(
-    'iso-8859-1',
-    'iso-8859-2',
-    'iso-8859-3',
-    'iso-8859-4',
-    'iso-8859-5',
-    'iso-8859-6',
-    'iso-8859-7',
-    'iso-8859-8',
-    'iso-8859-9',
-    'iso-8859-10',
-    'iso-8859-11',
-    'iso-8859-12',
-    'iso-8859-13',
-    'iso-8859-14',
-    'iso-8859-15',
-    'windows-1250',
-    'windows-1251',
-    'windows-1252',
-    'windows-1256',
-    'windows-1257',
-    'koi8-r',
-    'big5',
-    'gb2312',
-    'utf-16',
-    'utf-8',
-    'utf-7',
-    'x-user-defined',
-    'euc-jp',
-    'ks_c_5601-1987',
-    'tis-620',
-    'SHIFT_JIS'
-);
-
-
-/*******************************************************************************
- * Customization & design
- *
- * The graphical settings are now located in themes/theme-name/layout.inc.php
- */
-
-/**
- * enable the left panel pointer
- * see also LeftPointerColor
- * in layout.inc.php
- *
- * @global boolean $cfg['NavigationTreePointerEnable']
- */
-$cfg['NavigationTreePointerEnable'] = true;
-
-/**
- * enable the browse pointer
- * see also BrowsePointerColor
- * in layout.inc.php
- *
- * @global boolean $cfg['BrowsePointerEnable']
- */
-$cfg['BrowsePointerEnable'] = true;
-
-/**
- * enable the browse marker
- * see also BrowseMarkerColor
- * in layout.inc.php
- *
- * @global boolean $cfg['BrowseMarkerEnable']
- */
-$cfg['BrowseMarkerEnable'] = true;
-
-/**
- * textarea size (columns) in edit mode
- * (this value will be emphasized (*2) for SQL
- * query textareas and (*1.25) for query window)
- *
- * @global integer $cfg['TextareaCols']
- */
-$cfg['TextareaCols'] = 40;
-
-/**
- * textarea size (rows) in edit mode
- *
- * @global integer $cfg['TextareaRows']
- */
-$cfg['TextareaRows'] = 15;
-
-/**
- * double size of textarea size for LONGTEXT columns
- *
- * @global boolean $cfg['LongtextDoubleTextarea']
- */
-$cfg['LongtextDoubleTextarea'] = true;
-
-/**
- * auto-select when clicking in the textarea of the query-box
- *
- * @global boolean $cfg['TextareaAutoSelect']
- */
-$cfg['TextareaAutoSelect'] = false;
-
-/**
- * textarea size (columns) for CHAR/VARCHAR
- *
- * @global integer $cfg['CharTextareaCols']
- */
-$cfg['CharTextareaCols'] = 40;
-
-/**
- * textarea size (rows) for CHAR/VARCHAR
- *
- * @global integer $cfg['CharTextareaRows']
- */
-$cfg['CharTextareaRows'] = 2;
-
-/**
- * Max field data length in browse mode for all non-numeric fields
- *
- * @global integer $cfg['LimitChars']
- */
-$cfg['LimitChars'] = 50;
-
-/**
- * Where to show the edit/copy/delete links in browse mode
- * Possible values are 'left', 'right', 'both' and 'none'.
- *
- * @global string $cfg['RowActionLinks']
- */
-$cfg['RowActionLinks'] = 'left';
-
-/**
- * Whether to show row links (Edit, Copy, Delete) and checkboxes for
- * multiple row operations even when the selection does not have a unique key.
- *
- * @global boolean $cfg['RowActionLinksWithoutUnique']
- */
-$cfg['RowActionLinksWithoutUnique'] = false;
-
-/**
- * Default sort order by primary key.
- * @global string $cfg['TablePrimaryKeyOrder']
- */
-$cfg['TablePrimaryKeyOrder'] = 'NONE';
-
-/**
- * remember the last way a table sorted
- *
- * @global string $cfg['RememberSorting']
- */
-$cfg['RememberSorting'] = true;
-
-/**
- * shows column comments in 'browse' mode.
- *
- * @global boolean $cfg['ShowBrowseComments']
- */
-$cfg['ShowBrowseComments'] = true;
-
-/**
- * shows column comments in 'table property' mode.
- *
- * @global boolean $cfg['ShowPropertyComments']
- */
-$cfg['ShowPropertyComments']= true;
-
-/**
- * repeat header names every X cells? (0 = deactivate)
- *
- * @global integer $cfg['RepeatCells']
- */
-$cfg['RepeatCells'] = 100;
-
-/**
- * Set to true if you want DB-based query history.If false, this utilizes
- * JS-routines to display query history (lost by window close)
- *
- * @global boolean $cfg['QueryHistoryDB']
- */
-$cfg['QueryHistoryDB'] = false;
-
-/**
- * When using DB-based query history, how many entries should be kept?
- *
- * @global integer $cfg['QueryHistoryMax']
- */
-$cfg['QueryHistoryMax'] = 25;
-
-/**
- * Use MIME-Types (stored in column comments table) for
- *
- * @global boolean $cfg['BrowseMIME']
- */
-$cfg['BrowseMIME'] = true;
-
-/**
- * When approximate count < this, PMA will get exact count for table rows.
- *
- * @global integer $cfg['MaxExactCount']
- */
-$cfg['MaxExactCount'] = 500000;
-
-/**
- * Zero means that no row count is done for views; see the doc
- *
- * @global integer $cfg['MaxExactCountViews']
- */
-$cfg['MaxExactCountViews'] = 0;
-
-/**
- * Sort table and database in natural order
- *
- * @global boolean $cfg['NaturalOrder']
- */
-$cfg['NaturalOrder'] = true;
-
-/**
- * Initial state for sliders
- * (open | closed | disabled)
- *
- * @global string $cfg['InitialSlidersState']
- */
-$cfg['InitialSlidersState'] = 'closed';
-
-/**
- * User preferences: disallow these settings
- * For possible setting names look in libraries/config/user_preferences.forms.php
- *
- * @global array $cfg['UserprefsDisallow']
- */
-$cfg['UserprefsDisallow'] = array();
-
-/**
- * User preferences: enable the Developer tab
- */
-$cfg['UserprefsDeveloperTab'] = false;
-
-/*******************************************************************************
- * Window title settings
- */
-
-/**
- * title of browser window when a table is selected
- *
- * @global string $cfg['TitleTable']
- */
-$cfg['TitleTable'] = '@HTTP_HOST@ / @VSERVER@ / @DATABASE@ / @TABLE@ | @PHPMYADMIN@';
-
-/**
- * title of browser window when a database is selected
- *
- * @global string $cfg['TitleDatabase']
- */
-$cfg['TitleDatabase'] = '@HTTP_HOST@ / @VSERVER@ / @DATABASE@ | @PHPMYADMIN@';
-
-/**
- * title of browser window when a server is selected
- *
- * @global string $cfg['TitleServer']
- */
-$cfg['TitleServer'] = '@HTTP_HOST@ / @VSERVER@ | @PHPMYADMIN@';
-
-/**
- * title of browser window when nothing is selected
- * @global string $cfg['TitleDefault']
- */
-$cfg['TitleDefault'] = '@HTTP_HOST@ | @PHPMYADMIN@';
-
-
-/*******************************************************************************
- * theme manager
- */
-
-/**
- * using themes manager please set up here the path to 'themes' else leave empty
- *
- * @global string $cfg['ThemePath']
- */
-$cfg['ThemePath'] = './themes';
-
-/**
- * if you want to use selectable themes and if ThemesPath not empty
- * set it to true, else set it to false (default is false);
- *
- * @global boolean $cfg['ThemeManager']
- */
-$cfg['ThemeManager'] = true;
-
-/**
- * set up default theme, if ThemePath not empty you can set up here an valid
- * path to themes or 'original' for the original pma-theme
- *
- * @global string $cfg['ThemeDefault']
- */
-$cfg['ThemeDefault'] = 'pmahomme';
-
-/**
- * allow different theme for each configured server
- *
- * @global boolean $cfg['ThemePerServer']
- */
-$cfg['ThemePerServer'] = false;
-
-
-/*******************************************************************************
- *
- */
-
-/**
- * Default query for table
- *
- * @global string $cfg['DefaultQueryTable']
- */
-$cfg['DefaultQueryTable'] = 'SELECT * FROM @TABLE@ WHERE 1';
-
-/**
- * Default query for database
- *
- * @global string $cfg['DefaultQueryDatabase']
- */
-$cfg['DefaultQueryDatabase'] = '';
-
-
-/*******************************************************************************
- * SQL Query box settings
- * These are the links display in all of the SQL Query boxes
- *
- * @global array $cfg['SQLQuery']
- */
-$cfg['SQLQuery'] = array();
-
-/**
- * Display an "Edit" link on the results page to change a query
- *
- * @global boolean $cfg['SQLQuery']['Edit']
- */
-$cfg['SQLQuery']['Edit'] = true;
-
-/**
- * Display an "Explain SQL" link on the results page
- *
- * @global boolean $cfg['SQLQuery']['Explain']
- */
-$cfg['SQLQuery']['Explain'] = true;
-
-/**
- * Display a "Create PHP code" link on the results page to wrap a query in PHP
- *
- * @global boolean $cfg['SQLQuery']['ShowAsPHP']
- */
-$cfg['SQLQuery']['ShowAsPHP'] = true;
-
-/**
- * Display a "Refresh" link on the results page
- *
- * @global boolean $cfg['SQLQuery']['Refresh']
- */
-$cfg['SQLQuery']['Refresh'] = true;
-
-/**
- * Enables autoComplete for table & column names in SQL queries
- *
- * default = 'true'
- */
-$cfg['EnableAutocompleteForTablesAndColumns'] = true;
-
-
-/*******************************************************************************
- * Web server upload/save/import directories
- */
-
-/**
- * Directory for uploaded files that can be executed by phpMyAdmin.
- * For example './upload'. Leave empty for no upload directory support.
- * Use %u for username inclusion.
- *
- * @global string $cfg['UploadDir']
- */
-$cfg['UploadDir'] = '';
-
-/**
- * Directory where phpMyAdmin can save exported data on server.
- * For example './save'. Leave empty for no save directory support.
- * Use %u for username inclusion.
- *
- * @global string $cfg['SaveDir']
- */
-$cfg['SaveDir'] = '';
-
-/**
- * Directory where phpMyAdmin can save temporary files.
- *
- * @global string $cfg['TempDir']
- */
-$cfg['TempDir'] = '';
-
-
-/**
- * Misc. settings
- */
-
-/**
- * Is GD >= 2 available? Set to yes/no/auto. 'auto' does auto-detection,
- * which is the only safe way to determine GD version.
- *
- * @global string $cfg['GD2Available']
- */
-$cfg['GD2Available'] = 'auto';
-
-/**
- * Lists proxy IP and HTTP header combinations which are trusted for IP allow/deny
- *
- * @global array $cfg['TrustedProxies']
- */
-$cfg['TrustedProxies'] = array();
-
-/**
- * We normally check the permissions on the configuration file to ensure
- * it's not world writable. However, phpMyAdmin could be installed on
- * a NTFS filesystem mounted on a non-Windows server, in which case the
- * permissions seems wrong but in fact cannot be detected. In this case
- * a sysadmin would set the following to false.
- */
-$cfg['CheckConfigurationPermissions'] = true;
-
-/**
- * Limit for length of URL in links. When length would be above this limit, it
- * is replaced by form with button.
- * This is required as some web servers (IIS) have problems with long URLs.
- * The recommended limit is 2000
- * (see https://www.boutell.com/newfaq/misc/urllength.html) but we put
- * 1000 to accommodate Suhosin, see bug #3358750.
- */
-$cfg['LinkLengthLimit'] = 1000;
-
-/**
- * Additional string to allow in CSP headers.
- */
- $cfg['CSPAllow'] = '';
-
-/**
- * Disable the table maintenance mass operations, like optimizing or
- * repairing the selected tables of a database. An accidental execution
- * of such a maintenance task can enormously slow down a bigger database.
- */
-$cfg['DisableMultiTableMaintenance'] = false;
-
-/**
- * Whether or not to query the user before sending the error report to
- * the phpMyAdmin team when a JavaScript error occurs
- *
- * Available options
- * (ask | always | never)
- *
- * @global string $cfg['SendErrorReports']
- */
-$cfg['SendErrorReports'] = 'ask';
-
-/**
- * Whether Enter or Ctrl+Enter executes queries in the console.
- *
- * @global boolean $cfg['ConsoleEnterExecutes']
- */
-$cfg['ConsoleEnterExecutes'] = false;
-
-/**
- * Zero Configuration mode.
- *
- * @global boolean $cfg['ZeroConf']
- */
-$cfg['ZeroConf'] = true;
-
-/*******************************************************************************
- * Developers ONLY!
- *
- * @global array $cfg['DBG']
- */
-$cfg['DBG'] = array();
-
-/**
- * Output executed queries and their execution times
- *
- * @global boolean $cfg['DBG']['sql']
- */
-$cfg['DBG']['sql'] = false;
-
-/**
- * Enable to let server present itself as demo server.
- *
- * @global boolean $cfg['DBG']['demo']
- */
-$cfg['DBG']['demo'] = false;
-
-
-/*******************************************************************************
- * MySQL settings
- */
-
-/**
- * Default functions for above defined groups
- *
- * @global array $cfg['DefaultFunctions']
- */
-$cfg['DefaultFunctions'] = array(
-    'FUNC_CHAR' => '',
-    'FUNC_DATE' => '',
-    'FUNC_NUMBER' => '',
-    'FUNC_SPATIAL' => 'GeomFromText',
-    'FUNC_UUID' => 'UUID',
-    'first_timestamp' => 'NOW',
-);
-
-/**
- * Max rows retrieved for zoom search
- */
-$cfg['maxRowPlotLimit'] = 500;
-
-/**
- * Show Git revision if applicable
- *
- * @global boolean $cfg['ShowGitRevision']
- */
-$cfg['ShowGitRevision'] = true;
-
-/**
- * MySQL minimal version required
- *
- * @global array $cfg['MysqlMinVersion']
- */
-$cfg['MysqlMinVersion'] = array(
-    'internal' => 50500,
-    'human' => '5.5.0'
-);
diff --git a/#pma/libraries/config.values.php b/#pma/libraries/config.values.php
deleted file mode 100644
index bc7786fc..00000000
--- a/#pma/libraries/config.values.php
+++ /dev/null
@@ -1,277 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Database with allowed values for configuration stored in the $cfg array,
- * used by setup script and user preferences to generate forms.
- *
- * @package PhpMyAdmin
- */
-
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
-/**
- * Value meaning:
- * o array - select field, array contains allowed values
- * o string - type override
- *
- * Use normal array, paths won't be expanded
- */
-$cfg_db = array();
-
-$cfg_db['Servers'] = array(
-    1 => array(
-        'port'         => 'integer',
-        'connect_type' => array('tcp', 'socket'),
-        'auth_type'    => array('config', 'http', 'signon', 'cookie'),
-        'AllowDeny'    => array(
-            'order' => array('', 'deny,allow', 'allow,deny', 'explicit')
-        ),
-        'only_db'      => 'array'
-    )
-);
-$cfg_db['RecodingEngine'] = array('auto', 'iconv', 'recode', 'mb', 'none');
-$cfg_db['OBGzip'] = array('auto', true, false);
-$cfg_db['MemoryLimit'] = 'short_string';
-$cfg_db['NavigationLogoLinkWindow'] = array('main', 'new');
-$cfg_db['NavigationTreeDefaultTabTable'] = array(
-    'structure' => __('Structure'), // fields list
-    'sql' => __('SQL'),             // SQL form
-    'search' => __('Search'),       // search page
-    'insert' => __('Insert'),       // insert row page
-    'browse' => __('Browse')        // browse page
-);
-$cfg_db['NavigationTreeDefaultTabTable2'] = array(
-    '' => '', //don't display
-    'structure' => __('Structure'), // fields list
-    'sql' => __('SQL'),             // SQL form
-    'search' => __('Search'),       // search page
-    'insert' => __('Insert'),       // insert row page
-    'browse' => __('Browse')        // browse page
-);
-$cfg_db['NavigationTreeDbSeparator'] = 'short_string';
-$cfg_db['NavigationTreeTableSeparator'] = 'short_string';
-$cfg_db['TableNavigationLinksMode'] = array(
-    'icons' => __('Icons'),
-    'text'  => __('Text'),
-    'both'  => __('Both')
-);
-$cfg_db['MaxRows'] = array(25, 50, 100, 250, 500);
-$cfg_db['Order'] = array('ASC', 'DESC', 'SMART');
-$cfg_db['RowActionLinks'] = array(
-    'none'  => __('Nowhere'),
-    'left'  => __('Left'),
-    'right' => __('Right'),
-    'both'  => __('Both')
-);
-$cfg_db['TablePrimaryKeyOrder'] = array(
-    'NONE'  => __('None'),
-    'ASC'   => __('Ascending'),
-    'DESC'  => __('Descending')
-);
-$cfg_db['ProtectBinary'] = array(false, 'blob', 'noblob', 'all');
-$cfg_db['CharEditing'] = array('input', 'textarea');
-$cfg_db['TabsMode'] = array(
-    'icons' => __('Icons'),
-    'text'  => __('Text'),
-    'both'  => __('Both')
-);
-$cfg_db['PDFDefaultPageSize'] = array(
-    'A3'     => 'A3',
-    'A4'     => 'A4',
-    'A5'     => 'A5',
-    'letter' => 'letter',
-    'legal'  => 'legal'
-);
-$cfg_db['ActionLinksMode'] = array(
-    'icons' => __('Icons'),
-    'text'  => __('Text'),
-    'both'  => __('Both')
-);
-$cfg_db['GridEditing'] = array(
-    'click' => __('Click'),
-    'double-click' => __('Double click'),
-    'disabled' => __('Disabled'),
-);
-$cfg_db['RelationalDisplay'] = array(
-    'K' => __('key'),
-    'D' => __('display column')
-);
-$cfg_db['DefaultTabServer'] = array(
-    // the welcome page (recommended for multiuser setups)
-    'welcome' => __('Welcome'),
-    'databases' => __('Databases'),    // list of databases
-    'status' => __('Status'),          // runtime information
-    'variables' => __('Variables'),    // MySQL server variables
-    'privileges' => __('Privileges')   // user management
-);
-$cfg_db['DefaultTabDatabase'] = array(
-    'structure' => __('Structure'),   // tables list
-    'sql' => __('SQL'),               // SQL form
-    'search' => __('Search'),         // search query
-    'operations' => __('Operations')  // operations on database
-);
-$cfg_db['DefaultTabTable'] = array(
-    'structure' => __('Structure'),  // fields list
-    'sql' => __('SQL'),              // SQL form
-    'search' => __('Search'),        // search page
-    'insert' => __('Insert'),        // insert row page
-    'browse' => __('Browse')         // browse page
-);
-$cfg_db['InitialSlidersState'] = array(
-    'open'     => __('Open'),
-    'closed'   => __('Closed'),
-    'disabled' => __('Disabled')
-);
-$cfg_db['SendErrorReports'] = array(
-    'ask'     => __('Ask before sending error reports'),
-    'always'   => __('Always send error reports'),
-    'never' => __('Never send error reports')
-);
-$cfg_db['DefaultForeignKeyChecks'] = array(
-    'default'   => __('Server default'),
-    'enable'    => __('Enable'),
-    'disable'   => __('Disable')
-);
-$cfg_db['Import']['format'] = array(
-    'csv',    // CSV
-    'docsql', // DocSQL
-    'ldi',    // CSV using LOAD DATA
-    'sql'     // SQL
-);
-$cfg_db['Import']['charset'] = array_merge(
-    array(''),
-    $GLOBALS['cfg']['AvailableCharsets']
-);
-$cfg_db['Import']['sql_compatibility']
-    = $cfg_db['Export']['sql_compatibility'] = array(
-        'NONE', 'ANSI', 'DB2', 'MAXDB', 'MYSQL323',
-        'MYSQL40', 'MSSQL', 'ORACLE',
-        // removed; in MySQL 5.0.33, this produces exports that
-        // can't be read by POSTGRESQL (see our bug #1596328)
-        //'POSTGRESQL',
-        'TRADITIONAL'
-    );
-$cfg_db['Import']['csv_terminated'] = 'short_string';
-$cfg_db['Import']['csv_enclosed'] = 'short_string';
-$cfg_db['Import']['csv_escaped'] = 'short_string';
-$cfg_db['Import']['ldi_terminated'] = 'short_string';
-$cfg_db['Import']['ldi_enclosed'] = 'short_string';
-$cfg_db['Import']['ldi_escaped'] = 'short_string';
-$cfg_db['Import']['ldi_local_option'] = array('auto', true, false);
-$cfg_db['Export']['_sod_select'] = array(
-    'structure'          => __('structure'),
-    'data'               => __('data'),
-    'structure_and_data' => __('structure and data')
-);
-$cfg_db['Export']['method'] = array(
-    'quick'          => __('Quick - display only the minimal options to configure'),
-    'custom'         => __('Custom - display all possible options to configure'),
-    'custom-no-form' => __(
-        'Custom - like above, but without the quick/custom choice'
-    ),
-);
-$cfg_db['Export']['format'] = array(
-    'codegen', 'csv', 'excel', 'htmlexcel','htmlword', 'latex', 'ods',
-    'odt', 'pdf', 'sql', 'texytext', 'xls', 'xml', 'yaml'
-);
-$cfg_db['Export']['compression'] = array('none', 'zip', 'gzip');
-$cfg_db['Export']['charset'] = array_merge(
-    array(''),
-    $GLOBALS['cfg']['AvailableCharsets']
-);
-$cfg_db['Export']['codegen_format'] = array(
-    '#', 'NHibernate C# DO', 'NHibernate XML'
-);
-$cfg_db['Export']['csv_separator'] = 'short_string';
-$cfg_db['Export']['csv_terminated'] = 'short_string';
-$cfg_db['Export']['csv_enclosed'] = 'short_string';
-$cfg_db['Export']['csv_escaped'] = 'short_string';
-$cfg_db['Export']['csv_null'] = 'short_string';
-$cfg_db['Export']['excel_null'] = 'short_string';
-$cfg_db['Export']['excel_edition'] = array(
-    'win'           => 'Windows',
-    'mac_excel2003' => 'Excel 2003 / Macintosh',
-    'mac_excel2008' => 'Excel 2008 / Macintosh'
-);
-$cfg_db['Export']['sql_structure_or_data'] = $cfg_db['Export']['_sod_select'];
-$cfg_db['Export']['sql_type'] = array('INSERT', 'UPDATE', 'REPLACE');
-$cfg_db['Export']['sql_insert_syntax'] = array(
-    'complete' => __('complete inserts'),
-    'extended' => __('extended inserts'),
-    'both'     => __('both of the above'),
-    'none'     => __('neither of the above')
-);
-$cfg_db['Export']['xls_null'] = 'short_string';
-$cfg_db['Export']['xlsx_null'] = 'short_string';
-$cfg_db['Export']['htmlword_structure_or_data'] = $cfg_db['Export']['_sod_select'];
-$cfg_db['Export']['htmlword_null'] = 'short_string';
-$cfg_db['Export']['ods_null'] = 'short_string';
-$cfg_db['Export']['odt_null'] = 'short_string';
-$cfg_db['Export']['odt_structure_or_data'] = $cfg_db['Export']['_sod_select'];
-$cfg_db['Export']['texytext_structure_or_data'] = $cfg_db['Export']['_sod_select'];
-$cfg_db['Export']['texytext_null'] = 'short_string';
-
-/**
- * Default values overrides
- * Use only full paths
- */
-$cfg_db['_overrides'] = array();
-
-/**
- * Basic validator assignments (functions from libraries/config/Validator.php
- * and 'validators' object in js/config.js)
- * Use only full paths and form ids
- */
-$cfg_db['_validators'] = array(
-    'CharTextareaCols' => 'validatePositiveNumber',
-    'CharTextareaRows' => 'validatePositiveNumber',
-    'ExecTimeLimit' => 'validateNonNegativeNumber',
-    'Export/sql_max_query_size' => 'validatePositiveNumber',
-    'FirstLevelNavigationItems' => 'validatePositiveNumber',
-    'ForeignKeyMaxLimit' => 'validatePositiveNumber',
-    'Import/csv_enclosed' => array(array('validateByRegex', '/^.?$/')),
-    'Import/csv_escaped' => array(array('validateByRegex', '/^.$/')),
-    'Import/csv_terminated' => array(array('validateByRegex', '/^.$/')),
-    'Import/ldi_enclosed' => array(array('validateByRegex', '/^.?$/')),
-    'Import/ldi_escaped' => array(array('validateByRegex', '/^.$/')),
-    'Import/ldi_terminated' => array(array('validateByRegex', '/^.$/')),
-    'Import/skip_queries' => 'validateNonNegativeNumber',
-    'InsertRows' => 'validatePositiveNumber',
-    'NumRecentTables' => 'validateNonNegativeNumber',
-    'NumFavoriteTables' => 'validateNonNegativeNumber',
-    'LimitChars' => 'validatePositiveNumber',
-    'LoginCookieValidity' => 'validatePositiveNumber',
-    'LoginCookieStore' => 'validateNonNegativeNumber',
-    'MaxDbList' => 'validatePositiveNumber',
-    'MaxNavigationItems' => 'validatePositiveNumber',
-    'MaxCharactersInDisplayedSQL' => 'validatePositiveNumber',
-    'MaxRows' => 'validatePositiveNumber',
-    'MaxTableList' => 'validatePositiveNumber',
-    'MemoryLimit' => array(array('validateByRegex', '/^(-1|(\d+(?:[kmg])?))$/i')),
-    'NavigationTreeTableLevel' => 'validatePositiveNumber',
-    'QueryHistoryMax' => 'validatePositiveNumber',
-    'RepeatCells' => 'validateNonNegativeNumber',
-    'Server' => 'validateServer',
-    'Server_pmadb' => 'validatePMAStorage',
-    'Servers/1/port' => 'validatePortNumber',
-    'Servers/1/hide_db' => 'validateRegex',
-    'TextareaCols' => 'validatePositiveNumber',
-    'TextareaRows' => 'validatePositiveNumber',
-    'TrustedProxies' => 'validateTrustedProxies');
-
-/**
- * Additional validators used for user preferences
- */
-$cfg_db['_userValidators'] = array(
-    'MaxDbList'       => array(
-        array('validateUpperBound', 'value:MaxDbList')
-    ),
-    'MaxTableList'    => array(
-        array('validateUpperBound', 'value:MaxTableList')
-    ),
-    'QueryHistoryMax' => array(
-        array('validateUpperBound', 'value:QueryHistoryMax')
-    )
-);
diff --git a/#pma/libraries/config/ConfigFile.php b/#pma/libraries/config/ConfigFile.php
deleted file mode 100644
index b74c1cc8..00000000
--- a/#pma/libraries/config/ConfigFile.php
+++ /dev/null
@@ -1,542 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Config file management
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries\config;
-
-use PMA\libraries\Config;
-
-/**
- * Config file management class.
- * Stores its data in $_SESSION
- *
- * @package PhpMyAdmin
- */
-class ConfigFile
-{
-    /**
-     * Stores default PMA config from config.default.php
-     * @var array
-     */
-    private $_defaultCfg;
-
-    /**
-     * Stores allowed values for non-standard fields
-     * @var array
-     */
-    private $_cfgDb;
-
-    /**
-     * Stores original PMA config, not modified by user preferences
-     * @var Config
-     */
-    private $_baseCfg;
-
-    /**
-     * Whether we are currently working in PMA Setup context
-     * @var bool
-     */
-    private $_isInSetup;
-
-    /**
-     * Keys which will be always written to config file
-     * @var array
-     */
-    private $_persistKeys = array();
-
-    /**
-     * Changes keys while updating config in {@link updateWithGlobalConfig()}
-     * or reading by {@link getConfig()} or {@link getConfigArray()}
-     * @var array
-     */
-    private $_cfgUpdateReadMapping = array();
-
-    /**
-     * Key filter for {@link set()}
-     * @var array|null
-     */
-    private $_setFilter;
-
-    /**
-     * Instance id (key in $_SESSION array, separate for each server -
-     * ConfigFile{server id})
-     * @var string
-     */
-    private $_id;
-
-    /**
-     * Result for {@link _flattenArray()}
-     * @var array|null
-     */
-    private $_flattenArrayResult;
-
-    /**
-     * Constructor
-     *
-     * @param array $base_config base configuration read from
-     *                           {@link PMA\libraries\Config::$base_config},
-     *                           use only when not in PMA Setup
-     */
-    public function __construct(array $base_config = null)
-    {
-        // load default config values
-        $cfg = &$this->_defaultCfg;
-        include './libraries/config.default.php';
-        $cfg['fontsize'] = '82%';
-
-        // load additional config information
-        $cfg_db = &$this->_cfgDb;
-        include './libraries/config.values.php';
-
-        // apply default values overrides
-        if (count($cfg_db['_overrides'])) {
-            foreach ($cfg_db['_overrides'] as $path => $value) {
-                PMA_arrayWrite($path, $cfg, $value);
-            }
-        }
-
-        $this->_baseCfg = $base_config;
-        $this->_isInSetup = is_null($base_config);
-        $this->_id = 'ConfigFile' . $GLOBALS['server'];
-        if (!isset($_SESSION[$this->_id])) {
-            $_SESSION[$this->_id] = array();
-        }
-    }
-
-    /**
-     * Sets names of config options which will be placed in config file even if
-     * they are set to their default values (use only full paths)
-     *
-     * @param array $keys the names of the config options
-     *
-     * @return void
-     */
-    public function setPersistKeys(array $keys)
-    {
-        // checking key presence is much faster than searching so move values
-        // to keys
-        $this->_persistKeys = array_flip($keys);
-    }
-
-    /**
-     * Returns flipped array set by {@link setPersistKeys()}
-     *
-     * @return array
-     */
-    public function getPersistKeysMap()
-    {
-        return $this->_persistKeys;
-    }
-
-    /**
-     * By default ConfigFile allows setting of all configuration keys, use
-     * this method to set up a filter on {@link set()} method
-     *
-     * @param array|null $keys array of allowed keys or null to remove filter
-     *
-     * @return void
-     */
-    public function setAllowedKeys($keys)
-    {
-        if ($keys === null) {
-            $this->_setFilter = null;
-            return;
-        }
-        // checking key presence is much faster than searching so move values
-        // to keys
-        $this->_setFilter = array_flip($keys);
-    }
-
-    /**
-     * Sets path mapping for updating config in
-     * {@link updateWithGlobalConfig()} or reading
-     * by {@link getConfig()} or {@link getConfigArray()}
-     *
-     * @param array $mapping Contains the mapping of "Server/config options"
-     *                       to "Server/1/config options"
-     *
-     * @return void
-     */
-    public function setCfgUpdateReadMapping(array $mapping)
-    {
-        $this->_cfgUpdateReadMapping = $mapping;
-    }
-
-    /**
-     * Resets configuration data
-     *
-     * @return void
-     */
-    public function resetConfigData()
-    {
-        $_SESSION[$this->_id] = array();
-    }
-
-    /**
-     * Sets configuration data (overrides old data)
-     *
-     * @param array $cfg Configuration options
-     *
-     * @return void
-     */
-    public function setConfigData(array $cfg)
-    {
-        $_SESSION[$this->_id] = $cfg;
-    }
-
-    /**
-     * Sets config value
-     *
-     * @param string $path           Path
-     * @param mixed  $value          Value
-     * @param string $canonical_path Canonical path
-     *
-     * @return void
-     */
-    public function set($path, $value, $canonical_path = null)
-    {
-        if ($canonical_path === null) {
-            $canonical_path = $this->getCanonicalPath($path);
-        }
-        // apply key whitelist
-        if ($this->_setFilter !== null
-            && ! isset($this->_setFilter[$canonical_path])
-        ) {
-            return;
-        }
-        // if the path isn't protected it may be removed
-        if (isset($this->_persistKeys[$canonical_path])) {
-            PMA_arrayWrite($path, $_SESSION[$this->_id], $value);
-            return;
-        }
-
-        $default_value = $this->getDefault($canonical_path);
-        $remove_path = $value === $default_value;
-        if ($this->_isInSetup) {
-            // remove if it has a default value or is empty
-            $remove_path = $remove_path
-                || (empty($value) && empty($default_value));
-        } else {
-            // get original config values not overwritten by user
-            // preferences to allow for overwriting options set in
-            // config.inc.php with default values
-            $instance_default_value = PMA_arrayRead(
-                $canonical_path,
-                $this->_baseCfg
-            );
-            // remove if it has a default value and base config (config.inc.php)
-            // uses default value
-            $remove_path = $remove_path
-                && ($instance_default_value === $default_value);
-        }
-        if ($remove_path) {
-            PMA_arrayRemove($path, $_SESSION[$this->_id]);
-            return;
-        }
-
-        PMA_arrayWrite($path, $_SESSION[$this->_id], $value);
-    }
-
-    /**
-     * Flattens multidimensional array, changes indices to paths
-     * (eg. 'key/subkey').
-     * Used as array_walk() callback.
-     *
-     * @param mixed $value  Value
-     * @param mixed $key    Key
-     * @param mixed $prefix Prefix
-     *
-     * @return void
-     */
-    private function _flattenArray($value, $key, $prefix)
-    {
-        // no recursion for numeric arrays
-        if (is_array($value) && !isset($value[0])) {
-            $prefix .= $key . '/';
-            array_walk($value, array($this, '_flattenArray'), $prefix);
-        } else {
-            $this->_flattenArrayResult[$prefix . $key] = $value;
-        }
-    }
-
-    /**
-     * Returns default config in a flattened array
-     *
-     * @return array
-     */
-    public function getFlatDefaultConfig()
-    {
-        $this->_flattenArrayResult = array();
-        array_walk($this->_defaultCfg, array($this, '_flattenArray'), '');
-        $flat_cfg = $this->_flattenArrayResult;
-        $this->_flattenArrayResult = null;
-        return $flat_cfg;
-    }
-
-    /**
-     * Updates config with values read from given array
-     * (config will contain differences to defaults from config.defaults.php).
-     *
-     * @param array $cfg Configuration
-     *
-     * @return void
-     */
-    public function updateWithGlobalConfig(array $cfg)
-    {
-        // load config array and flatten it
-        $this->_flattenArrayResult = array();
-        array_walk($cfg, array($this, '_flattenArray'), '');
-        $flat_cfg = $this->_flattenArrayResult;
-        $this->_flattenArrayResult = null;
-
-        // save values map for translating a few user preferences paths,
-        // should be complemented by code reading from generated config
-        // to perform inverse mapping
-        foreach ($flat_cfg as $path => $value) {
-            if (isset($this->_cfgUpdateReadMapping[$path])) {
-                $path = $this->_cfgUpdateReadMapping[$path];
-            }
-            $this->set($path, $value, $path);
-        }
-    }
-
-    /**
-     * Returns config value or $default if it's not set
-     *
-     * @param string $path    Path of config file
-     * @param mixed  $default Default values
-     *
-     * @return mixed
-     */
-    public function get($path, $default = null)
-    {
-        return PMA_arrayRead($path, $_SESSION[$this->_id], $default);
-    }
-
-    /**
-     * Returns default config value or $default it it's not set ie. it doesn't
-     * exist in config.default.php ($cfg) and config.values.php
-     * ($_cfg_db['_overrides'])
-     *
-     * @param string $canonical_path Canonical path
-     * @param mixed  $default        Default value
-     *
-     * @return mixed
-     */
-    public function getDefault($canonical_path, $default = null)
-    {
-        return PMA_arrayRead($canonical_path, $this->_defaultCfg, $default);
-    }
-
-    /**
-     * Returns config value, if it's not set uses the default one; returns
-     * $default if the path isn't set and doesn't contain a default value
-     *
-     * @param string $path    Path
-     * @param mixed  $default Default value
-     *
-     * @return mixed
-     */
-    public function getValue($path, $default = null)
-    {
-        $v = PMA_arrayRead($path, $_SESSION[$this->_id], null);
-        if ($v !== null) {
-            return $v;
-        }
-        $path = $this->getCanonicalPath($path);
-        return $this->getDefault($path, $default);
-    }
-
-    /**
-     * Returns canonical path
-     *
-     * @param string $path Path
-     *
-     * @return string
-     */
-    public function getCanonicalPath($path)
-    {
-        return preg_replace('#^Servers/([\d]+)/#', 'Servers/1/', $path);
-    }
-
-    /**
-     * Returns config database entry for $path ($cfg_db in config_info.php)
-     *
-     * @param string $path    path of the variable in config db
-     * @param mixed  $default default value
-     *
-     * @return mixed
-     */
-    public function getDbEntry($path, $default = null)
-    {
-        return PMA_arrayRead($path, $this->_cfgDb, $default);
-    }
-
-    /**
-     * Returns server count
-     *
-     * @return int
-     */
-    public function getServerCount()
-    {
-        return isset($_SESSION[$this->_id]['Servers'])
-            ? count($_SESSION[$this->_id]['Servers'])
-            : 0;
-    }
-
-    /**
-     * Returns server list
-     *
-     * @return array|null
-     */
-    public function getServers()
-    {
-        return isset($_SESSION[$this->_id]['Servers'])
-            ? $_SESSION[$this->_id]['Servers']
-            : null;
-    }
-
-    /**
-     * Returns DSN of given server
-     *
-     * @param integer $server server index
-     *
-     * @return string
-     */
-    public function getServerDSN($server)
-    {
-        if (!isset($_SESSION[$this->_id]['Servers'][$server])) {
-            return '';
-        }
-
-        $path = 'Servers/' . $server;
-        $dsn = 'mysqli://';
-        if ($this->getValue("$path/auth_type") == 'config') {
-            $dsn .= $this->getValue("$path/user");
-            if (! $this->getValue("$path/nopassword")
-                || ! empty($this->getValue("$path/password"))
-            ) {
-                $dsn .= ':***';
-            }
-            $dsn .= '@';
-        }
-        if ($this->getValue("$path/connect_type") == 'tcp') {
-            $dsn .= $this->getValue("$path/host");
-            $port = $this->getValue("$path/port");
-            if ($port) {
-                $dsn .= ':' . $port;
-            }
-        } else {
-            $dsn .= $this->getValue("$path/socket");
-        }
-        return $dsn;
-    }
-
-    /**
-     * Returns server name
-     *
-     * @param int $id server index
-     *
-     * @return string
-     */
-    public function getServerName($id)
-    {
-        if (!isset($_SESSION[$this->_id]['Servers'][$id])) {
-            return '';
-        }
-        $verbose = $this->get("Servers/$id/verbose");
-        if (!empty($verbose)) {
-            return $verbose;
-        }
-        $host = $this->get("Servers/$id/host");
-        return empty($host) ? 'localhost' : $host;
-    }
-
-    /**
-     * Removes server
-     *
-     * @param int $server server index
-     *
-     * @return void
-     */
-    public function removeServer($server)
-    {
-        if (!isset($_SESSION[$this->_id]['Servers'][$server])) {
-            return;
-        }
-        $last_server = $this->getServerCount();
-
-        for ($i = $server; $i < $last_server; $i++) {
-            $_SESSION[$this->_id]['Servers'][$i]
-                = $_SESSION[$this->_id]['Servers'][$i + 1];
-        }
-        unset($_SESSION[$this->_id]['Servers'][$last_server]);
-
-        if (isset($_SESSION[$this->_id]['ServerDefault'])
-            && $_SESSION[$this->_id]['ServerDefault'] == $last_server
-        ) {
-            unset($_SESSION[$this->_id]['ServerDefault']);
-        }
-    }
-
-    /**
-     * Returns config file path, relative to phpMyAdmin's root path
-     *
-     * @return string
-     */
-    public function getFilePath()
-    {
-        return SETUP_CONFIG_FILE;
-    }
-
-    /**
-     * Returns configuration array (full, multidimensional format)
-     *
-     * @return array
-     */
-    public function getConfig()
-    {
-        $c = $_SESSION[$this->_id];
-        foreach ($this->_cfgUpdateReadMapping as $map_to => $map_from) {
-            // if the key $c exists in $map_to
-            if (PMA_arrayRead($map_to, $c) !== null) {
-                PMA_arrayWrite($map_to, $c, PMA_arrayRead($map_from, $c));
-                PMA_arrayRemove($map_from, $c);
-            }
-        }
-        return $c;
-    }
-
-    /**
-     * Returns configuration array (flat format)
-     *
-     * @return array
-     */
-    public function getConfigArray()
-    {
-        $this->_flattenArrayResult = array();
-        array_walk($_SESSION[$this->_id], array($this, '_flattenArray'), '');
-        $c = $this->_flattenArrayResult;
-        $this->_flattenArrayResult = null;
-
-        $persistKeys = array_diff(
-            array_keys($this->_persistKeys),
-            array_keys($c)
-        );
-        foreach ($persistKeys as $k) {
-            $c[$k] = $this->getDefault($this->getCanonicalPath($k));
-        }
-
-        foreach ($this->_cfgUpdateReadMapping as $map_to => $map_from) {
-            if (!isset($c[$map_from])) {
-                continue;
-            }
-            $c[$map_to] = $c[$map_from];
-            unset($c[$map_from]);
-        }
-        return $c;
-    }
-}
diff --git a/#pma/libraries/config/Form.php b/#pma/libraries/config/Form.php
deleted file mode 100644
index 8c4f8262..00000000
--- a/#pma/libraries/config/Form.php
+++ /dev/null
@@ -1,231 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Form handling code.
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries\config;
-
-/**
- * Base class for forms, loads default configuration options, checks allowed
- * values etc.
- *
- * @package PhpMyAdmin
- */
-class Form
-{
-    /**
-     * Form name
-     * @var string
-     */
-    public $name;
-
-    /**
-     * Arbitrary index, doesn't affect class' behavior
-     * @var int
-     */
-    public $index;
-
-    /**
-     * Form fields (paths), filled by {@link readFormPaths()}, indexed by field name
-     * @var array
-     */
-    public $fields;
-
-    /**
-     * Stores default values for some fields (eg. pmadb tables)
-     * @var array
-     */
-    public $default;
-
-    /**
-     * Caches field types, indexed by field names
-     * @var array
-     */
-    private $_fieldsTypes;
-
-    /**
-     * ConfigFile instance
-     * @var ConfigFile
-     */
-    private $_configFile;
-
-    /**
-     * Constructor, reads default config values
-     *
-     * @param string     $form_name Form name
-     * @param array      $form      Form data
-     * @param ConfigFile $cf        Config file instance
-     * @param int        $index     arbitrary index, stored in Form::$index
-     */
-    public function __construct(
-        $form_name, array $form, ConfigFile $cf, $index = null
-    ) {
-        $this->index = $index;
-        $this->_configFile = $cf;
-        $this->loadForm($form_name, $form);
-    }
-
-    /**
-     * Returns type of given option
-     *
-     * @param string $option_name path or field name
-     *
-     * @return string|null  one of: boolean, integer, double, string, select, array
-     */
-    public function getOptionType($option_name)
-    {
-        $key = ltrim(
-            mb_substr(
-                $option_name,
-                mb_strrpos($option_name, '/')
-            ),
-            '/'
-        );
-        return isset($this->_fieldsTypes[$key])
-            ? $this->_fieldsTypes[$key]
-            : null;
-    }
-
-    /**
-     * Returns allowed values for select fields
-     *
-     * @param string $option_path Option path
-     *
-     * @return array
-     */
-    public function getOptionValueList($option_path)
-    {
-        $value = $this->_configFile->getDbEntry($option_path);
-        if ($value === null) {
-            trigger_error("$option_path - select options not defined", E_USER_ERROR);
-            return array();
-        }
-        if (!is_array($value)) {
-            trigger_error("$option_path - not a static value list", E_USER_ERROR);
-            return array();
-        }
-        // convert array('#', 'a', 'b') to array('a', 'b')
-        if (isset($value[0]) && $value[0] === '#') {
-            // remove first element ('#')
-            array_shift($value);
-            // $value has keys and value names, return it
-            return $value;
-        }
-
-        // convert value list array('a', 'b') to array('a' => 'a', 'b' => 'b')
-        $has_string_keys = false;
-        $keys = array();
-        for ($i = 0, $nb = count($value); $i < $nb; $i++) {
-            if (!isset($value[$i])) {
-                $has_string_keys = true;
-                break;
-            }
-            $keys[] = is_bool($value[$i]) ? (int)$value[$i] : $value[$i];
-        }
-        if (! $has_string_keys) {
-            $value = array_combine($keys, $value);
-        }
-
-        // $value has keys and value names, return it
-        return $value;
-    }
-
-    /**
-     * array_walk callback function, reads path of form fields from
-     * array (see file comment in setup.forms.php or user_preferences.forms.inc)
-     *
-     * @param mixed $value  Value
-     * @param mixed $key    Key
-     * @param mixed $prefix Prefix
-     *
-     * @return void
-     */
-    private function _readFormPathsCallback($value, $key, $prefix)
-    {
-        static $group_counter = 0;
-
-        if (is_array($value)) {
-            $prefix .= $key . '/';
-            array_walk($value, array($this, '_readFormPathsCallback'), $prefix);
-            return;
-        }
-
-        if (!is_int($key)) {
-            $this->default[$prefix . $key] = $value;
-            $value = $key;
-        }
-        // add unique id to group ends
-        if ($value == ':group:end') {
-            $value .= ':' . $group_counter++;
-        }
-        $this->fields[] = $prefix . $value;
-    }
-
-    /**
-     * Reads form paths to {@link $fields}
-     *
-     * @param array $form Form
-     *
-     * @return void
-     */
-    protected function readFormPaths($form)
-    {
-        // flatten form fields' paths and save them to $fields
-        $this->fields = array();
-        array_walk($form, array($this, '_readFormPathsCallback'), '');
-
-        // $this->fields is an array of the form: [0..n] => 'field path'
-        // change numeric indexes to contain field names (last part of the path)
-        $paths = $this->fields;
-        $this->fields = array();
-        foreach ($paths as $path) {
-            $key = ltrim(
-                mb_substr($path, mb_strrpos($path, '/')),
-                '/'
-            );
-            $this->fields[$key] = $path;
-        }
-        // now $this->fields is an array of the form: 'field name' => 'field path'
-    }
-
-    /**
-     * Reads fields' types to $this->_fieldsTypes
-     *
-     * @return void
-     */
-    protected function readTypes()
-    {
-        $cf = $this->_configFile;
-        foreach ($this->fields as $name => $path) {
-            if (mb_strpos($name, ':group:') === 0) {
-                $this->_fieldsTypes[$name] = 'group';
-                continue;
-            }
-            $v = $cf->getDbEntry($path);
-            if ($v !== null) {
-                $type = is_array($v) ? 'select' : $v;
-            } else {
-                $type = gettype($cf->getDefault($path));
-            }
-            $this->_fieldsTypes[$name] = $type;
-        }
-    }
-
-    /**
-     * Reads form settings and prepares class to work with given subset of
-     * config file
-     *
-     * @param string $form_name Form name
-     * @param array  $form      Form
-     *
-     * @return void
-     */
-    public function loadForm($form_name, $form)
-    {
-        $this->name = $form_name;
-        $this->readFormPaths($form);
-        $this->readTypes();
-    }
-}
diff --git a/#pma/libraries/config/FormDisplay.php b/#pma/libraries/config/FormDisplay.php
deleted file mode 100644
index a88a10f8..00000000
--- a/#pma/libraries/config/FormDisplay.php
+++ /dev/null
@@ -1,887 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Form management class, displays and processes forms
- *
- * Explanation of used terms:
- * o work_path - original field path, eg. Servers/4/verbose
- * o system_path - work_path modified so that it points to the first server,
- *                 eg. Servers/1/verbose
- * o translated_path - work_path modified for HTML field name, a path with
- *                     slashes changed to hyphens, eg. Servers-4-verbose
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries\config;
-
-/**
- * Core libraries.
- */
-use PMA\libraries\Util;
-
-require_once './libraries/js_escape.lib.php';
-require_once './libraries/config/FormDisplay.tpl.php';
-
-/**
- * Form management class, displays and processes forms
- *
- * @package PhpMyAdmin
- */
-class FormDisplay
-{
-    /**
-     * ConfigFile instance
-     * @var ConfigFile
-     */
-    private $_configFile;
-
-    /**
-     * Form list
-     * @var Form[]
-     */
-    private $_forms = array();
-
-    /**
-     * Stores validation errors, indexed by paths
-     * [ Form_name ] is an array of form errors
-     * [path] is a string storing error associated with single field
-     * @var array
-     */
-    private $_errors = array();
-
-    /**
-     * Paths changed so that they can be used as HTML ids, indexed by paths
-     * @var array
-     */
-    private $_translatedPaths = array();
-
-    /**
-     * Server paths change indexes so we define maps from current server
-     * path to the first one, indexed by work path
-     * @var array
-     */
-    private $_systemPaths = array();
-
-    /**
-     * Language strings which will be sent to PMA_messages JS variable
-     * Will be looked up in $GLOBALS: str{value} or strSetup{value}
-     * @var array
-     */
-    private $_jsLangStrings = array();
-
-    /**
-     * Tells whether forms have been validated
-     * @var bool
-     */
-    private $_isValidated = true;
-
-    /**
-     * Dictionary with user preferences keys
-     * @var array|null
-     */
-    private $_userprefsKeys;
-
-    /**
-     * Dictionary with disallowed user preferences keys
-     * @var array
-     */
-    private $_userprefsDisallow;
-
-    /**
-     * Constructor
-     *
-     * @param ConfigFile $cf Config file instance
-     */
-    public function __construct(ConfigFile $cf)
-    {
-        $this->_jsLangStrings = array(
-            'error_nan_p' => __('Not a positive number!'),
-            'error_nan_nneg' => __('Not a non-negative number!'),
-            'error_incorrect_port' => __('Not a valid port number!'),
-            'error_invalid_value' => __('Incorrect value!'),
-            'error_value_lte' => __('Value must be equal or lower than %s!'));
-        $this->_configFile = $cf;
-        // initialize validators
-        Validator::getValidators($this->_configFile);
-    }
-
-    /**
-     * Returns {@link ConfigFile} associated with this instance
-     *
-     * @return ConfigFile
-     */
-    public function getConfigFile()
-    {
-        return $this->_configFile;
-    }
-
-    /**
-     * Registers form in form manager
-     *
-     * @param string $form_name Form name
-     * @param array  $form      Form data
-     * @param int    $server_id 0 if new server, validation; >= 1 if editing a server
-     *
-     * @return void
-     */
-    public function registerForm($form_name, array $form, $server_id = null)
-    {
-        $this->_forms[$form_name] = new Form(
-            $form_name, $form, $this->_configFile, $server_id
-        );
-        $this->_isValidated = false;
-        foreach ($this->_forms[$form_name]->fields as $path) {
-            $work_path = $server_id === null
-                ? $path
-                : str_replace('Servers/1/', "Servers/$server_id/", $path);
-            $this->_systemPaths[$work_path] = $path;
-            $this->_translatedPaths[$work_path] = str_replace('/', '-', $work_path);
-        }
-    }
-
-    /**
-     * Processes forms, returns true on successful save
-     *
-     * @param bool $allow_partial_save allows for partial form saving
-     *                                 on failed validation
-     * @param bool $check_form_submit  whether check for $_POST['submit_save']
-     *
-     * @return boolean whether processing was successful
-     */
-    public function process($allow_partial_save = true, $check_form_submit = true)
-    {
-        if ($check_form_submit && !isset($_POST['submit_save'])) {
-            return false;
-        }
-
-        // save forms
-        if (count($this->_forms) > 0) {
-            return $this->save(array_keys($this->_forms), $allow_partial_save);
-        }
-        return false;
-    }
-
-    /**
-     * Runs validation for all registered forms
-     *
-     * @return void
-     */
-    private function _validate()
-    {
-        if ($this->_isValidated) {
-            return;
-        }
-
-        $paths = array();
-        $values = array();
-        foreach ($this->_forms as $form) {
-            /* @var $form Form */
-            $paths[] = $form->name;
-            // collect values and paths
-            foreach ($form->fields as $path) {
-                $work_path = array_search($path, $this->_systemPaths);
-                $values[$path] = $this->_configFile->getValue($work_path);
-                $paths[] = $path;
-            }
-        }
-
-        // run validation
-        $errors = Validator::validate(
-            $this->_configFile, $paths, $values, false
-        );
-
-        // change error keys from canonical paths to work paths
-        if (is_array($errors) && count($errors) > 0) {
-            $this->_errors = array();
-            foreach ($errors as $path => $error_list) {
-                $work_path = array_search($path, $this->_systemPaths);
-                // field error
-                if (! $work_path) {
-                    // form error, fix path
-                    $work_path = $path;
-                }
-                $this->_errors[$work_path] = $error_list;
-            }
-        }
-        $this->_isValidated = true;
-    }
-
-    /**
-     * Outputs HTML for the forms under the menu tab
-     *
-     * @param bool  $show_restore_default whether to show "restore default"
-     *                                    button besides the input field
-     * @param array &$js_default          stores JavaScript code
-     *                                    to be displayed
-     * @param array &$js                  will be updated with javascript code
-     * @param bool  $show_buttons         whether show submit and reset button
-     *
-     * @return string $htmlOutput
-     */
-    private function _displayForms(
-        $show_restore_default, array &$js_default, array &$js, $show_buttons
-    ) {
-        $htmlOutput = '';
-        $validators = Validator::getValidators($this->_configFile);
-
-        foreach ($this->_forms as $form) {
-            /* @var $form Form */
-            $form_desc = isset($GLOBALS["strConfigForm_{$form->name}_desc"])
-                ? PMA_lang("Form_{$form->name}_desc")
-                : '';
-            $form_errors = isset($this->_errors[$form->name])
-                ? $this->_errors[$form->name] : null;
-            $htmlOutput .= PMA_displayFieldsetTop(
-                PMA_lang("Form_$form->name"),
-                $form_desc,
-                $form_errors,
-                array('id' => $form->name)
-            );
-
-            foreach ($form->fields as $field => $path) {
-                $work_path = array_search($path, $this->_systemPaths);
-                $translated_path = $this->_translatedPaths[$work_path];
-                // always true/false for user preferences display
-                // otherwise null
-                $userprefs_allow = isset($this->_userprefsKeys[$path])
-                    ? !isset($this->_userprefsDisallow[$path])
-                    : null;
-                // display input
-                $htmlOutput .= $this->_displayFieldInput(
-                    $form,
-                    $field,
-                    $path,
-                    $work_path,
-                    $translated_path,
-                    $show_restore_default,
-                    $userprefs_allow,
-                    $js_default
-                );
-                // register JS validators for this field
-                if (isset($validators[$path])) {
-                    PMA_addJsValidate($translated_path, $validators[$path], $js);
-                }
-            }
-            $htmlOutput .= PMA_displayFieldsetBottom($show_buttons);
-        }
-        return $htmlOutput;
-    }
-
-    /**
-     * Outputs HTML for forms
-     *
-     * @param bool   $tabbed_form          if true, use a form with tabs
-     * @param bool   $show_restore_default whether show "restore default" button
-     *                                     besides the input field
-     * @param bool   $show_buttons         whether show submit and reset button
-     * @param string $form_action          action attribute for the form
-     * @param array  $hidden_fields        array of form hidden fields (key: field
-     *                                     name)
-     *
-     * @return string HTML for forms
-     */
-    public function getDisplay(
-        $tabbed_form = false,
-        $show_restore_default = false,
-        $show_buttons = true,
-        $form_action = null,
-        $hidden_fields = null
-    ) {
-        static $js_lang_sent = false;
-
-        $htmlOutput = '';
-
-        $js = array();
-        $js_default = array();
-
-        $htmlOutput .= PMA_displayFormTop($form_action, 'post', $hidden_fields);
-
-        if ($tabbed_form) {
-            $tabs = array();
-            foreach ($this->_forms as $form) {
-                $tabs[$form->name] = PMA_lang("Form_$form->name");
-            }
-            $htmlOutput .= PMA_displayTabsTop($tabs);
-        }
-
-        // validate only when we aren't displaying a "new server" form
-        $is_new_server = false;
-        foreach ($this->_forms as $form) {
-            /* @var $form Form */
-            if ($form->index === 0) {
-                $is_new_server = true;
-                break;
-            }
-        }
-        if (! $is_new_server) {
-            $this->_validate();
-        }
-
-        // user preferences
-        $this->_loadUserprefsInfo();
-
-        // display forms
-        $htmlOutput .= $this->_displayForms(
-            $show_restore_default, $js_default, $js, $show_buttons
-        );
-
-        if ($tabbed_form) {
-            $htmlOutput .= PMA_displayTabsBottom();
-        }
-        $htmlOutput .= PMA_displayFormBottom();
-
-        // if not already done, send strings used for validation to JavaScript
-        if (! $js_lang_sent) {
-            $js_lang_sent = true;
-            $js_lang = array();
-            foreach ($this->_jsLangStrings as $strName => $strValue) {
-                $js_lang[] = "'$strName': '" . PMA_jsFormat($strValue, false) . '\'';
-            }
-            $js[] = "$.extend(PMA_messages, {\n\t"
-                . implode(",\n\t", $js_lang) . '})';
-        }
-
-        $js[] = "$.extend(defaultValues, {\n\t"
-            . implode(",\n\t", $js_default) . '})';
-        $htmlOutput .= PMA_displayJavascript($js);
-
-        return $htmlOutput;
-    }
-
-    /**
-     * Prepares data for input field display and outputs HTML code
-     *
-     * @param Form      $form                 Form object
-     * @param string    $field                field name as it appears in $form
-     * @param string    $system_path          field path, eg. Servers/1/verbose
-     * @param string    $work_path            work path, eg. Servers/4/verbose
-     * @param string    $translated_path      work path changed so that it can be
-     *                                        used as XHTML id
-     * @param bool      $show_restore_default whether show "restore default" button
-     *                                        besides the input field
-     * @param bool|null $userprefs_allow      whether user preferences are enabled
-     *                                        for this field (null - no support,
-     *                                        true/false - enabled/disabled)
-     * @param array     &$js_default          array which stores JavaScript code
-     *                                        to be displayed
-     *
-     * @return string HTML for input field
-     */
-    private function _displayFieldInput(
-        Form $form, $field, $system_path, $work_path,
-        $translated_path, $show_restore_default, $userprefs_allow, array &$js_default
-    ) {
-        $name = PMA_langName($system_path);
-        $description = PMA_langName($system_path, 'desc', '');
-
-        $value = $this->_configFile->get($work_path);
-        $value_default = $this->_configFile->getDefault($system_path);
-        $value_is_default = false;
-        if ($value === null || $value === $value_default) {
-            $value = $value_default;
-            $value_is_default = true;
-        }
-
-        $opts = array(
-            'doc' => $this->getDocLink($system_path),
-            'show_restore_default' => $show_restore_default,
-            'userprefs_allow' => $userprefs_allow,
-            'userprefs_comment' => PMA_langName($system_path, 'cmt', ''));
-        if (isset($form->default[$system_path])) {
-            $opts['setvalue'] = $form->default[$system_path];
-        }
-
-        if (isset($this->_errors[$work_path])) {
-            $opts['errors'] = $this->_errors[$work_path];
-        }
-
-        $type = '';
-        switch ($form->getOptionType($field)) {
-        case 'string':
-            $type = 'text';
-            break;
-        case 'short_string':
-            $type = 'short_text';
-            break;
-        case 'double':
-        case 'integer':
-            $type = 'number_text';
-            break;
-        case 'boolean':
-            $type = 'checkbox';
-            break;
-        case 'select':
-            $type = 'select';
-            $opts['values'] = $form->getOptionValueList($form->fields[$field]);
-            break;
-        case 'array':
-            $type = 'list';
-            $value = (array) $value;
-            $value_default = (array) $value_default;
-            break;
-        case 'group':
-            // :group:end is changed to :group:end:{unique id} in Form class
-            $htmlOutput = '';
-            if (mb_substr($field, 7, 4) != 'end:') {
-                $htmlOutput .= PMA_displayGroupHeader(
-                    mb_substr($field, 7)
-                );
-            } else {
-                PMA_displayGroupFooter();
-            }
-            return $htmlOutput;
-        case 'NULL':
-            trigger_error("Field $system_path has no type", E_USER_WARNING);
-            return null;
-        }
-
-        // detect password fields
-        if ($type === 'text'
-            && (mb_substr($translated_path, -9) === '-password'
-               || mb_substr($translated_path, -4) === 'pass'
-               || mb_substr($translated_path, -4) === 'Pass')
-        ) {
-            $type = 'password';
-        }
-
-        // TrustedProxies requires changes before displaying
-        if ($system_path == 'TrustedProxies') {
-            foreach ($value as $ip => &$v) {
-                if (!preg_match('/^-\d+$/', $ip)) {
-                    $v = $ip . ': ' . $v;
-                }
-            }
-        }
-        $this->_setComments($system_path, $opts);
-
-        // send default value to form's JS
-        $js_line = '\'' . $translated_path . '\': ';
-        switch ($type) {
-        case 'text':
-        case 'short_text':
-        case 'number_text':
-        case 'password':
-            $js_line .= '\'' . PMA_escapeJsString($value_default) . '\'';
-            break;
-        case 'checkbox':
-            $js_line .= $value_default ? 'true' : 'false';
-            break;
-        case 'select':
-            $value_default_js = is_bool($value_default)
-                ? (int) $value_default
-                : $value_default;
-            $js_line .= '[\'' . PMA_escapeJsString($value_default_js) . '\']';
-            break;
-        case 'list':
-            $js_line .= '\'' . PMA_escapeJsString(implode("\n", $value_default))
-                . '\'';
-            break;
-        }
-        $js_default[] = $js_line;
-
-        return PMA_displayInput(
-            $translated_path, $name, $type, $value,
-            $description, $value_is_default, $opts
-        );
-    }
-
-    /**
-     * Displays errors
-     *
-     * @return string HTML for errors
-     */
-    public function displayErrors()
-    {
-        $this->_validate();
-        if (count($this->_errors) == 0) {
-            return null;
-        }
-
-        $htmlOutput = '';
-
-        foreach ($this->_errors as $system_path => $error_list) {
-            if (isset($this->_systemPaths[$system_path])) {
-                $path = $this->_systemPaths[$system_path];
-                $name = PMA_langName($path);
-            } else {
-                $name = $GLOBALS["strConfigForm_$system_path"];
-            }
-            $htmlOutput .= PMA_displayErrors($name, $error_list);
-        }
-
-        return $htmlOutput;
-    }
-
-    /**
-     * Reverts erroneous fields to their default values
-     *
-     * @return void
-     */
-    public function fixErrors()
-    {
-        $this->_validate();
-        if (count($this->_errors) == 0) {
-            return;
-        }
-
-        $cf = $this->_configFile;
-        foreach (array_keys($this->_errors) as $work_path) {
-            if (!isset($this->_systemPaths[$work_path])) {
-                continue;
-            }
-            $canonical_path = $this->_systemPaths[$work_path];
-            $cf->set($work_path, $cf->getDefault($canonical_path));
-        }
-    }
-
-    /**
-     * Validates select field and casts $value to correct type
-     *
-     * @param string &$value  Current value
-     * @param array  $allowed List of allowed values
-     *
-     * @return bool
-     */
-    private function _validateSelect(&$value, array $allowed)
-    {
-        $value_cmp = is_bool($value)
-            ? (int) $value
-            : $value;
-        foreach ($allowed as $vk => $v) {
-            // equality comparison only if both values are numeric or not numeric
-            // (allows to skip 0 == 'string' equalling to true)
-            // or identity (for string-string)
-            if (($vk == $value && !(is_numeric($value_cmp) xor is_numeric($vk)))
-                || $vk === $value
-            ) {
-                // keep boolean value as boolean
-                if (!is_bool($value)) {
-                    settype($value, gettype($vk));
-                }
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Validates and saves form data to session
-     *
-     * @param array|string $forms              array of form names
-     * @param bool         $allow_partial_save allows for partial form saving on
-     *                                         failed validation
-     *
-     * @return boolean true on success (no errors and all saved)
-     */
-    public function save($forms, $allow_partial_save = true)
-    {
-        $result = true;
-        $forms = (array) $forms;
-
-        $values = array();
-        $to_save = array();
-        $is_setup_script = defined('PMA_SETUP');
-        if ($is_setup_script) {
-            $this->_loadUserprefsInfo();
-        }
-
-        $this->_errors = array();
-        foreach ($forms as $form_name) {
-            /* @var $form Form */
-            if (isset($this->_forms[$form_name])) {
-                $form = $this->_forms[$form_name];
-            } else {
-                continue;
-            }
-            // get current server id
-            $change_index = $form->index === 0
-                ? $this->_configFile->getServerCount() + 1
-                : false;
-            // grab POST values
-            foreach ($form->fields as $field => $system_path) {
-                $work_path = array_search($system_path, $this->_systemPaths);
-                $key = $this->_translatedPaths[$work_path];
-                $type = $form->getOptionType($field);
-
-                // skip groups
-                if ($type == 'group') {
-                    continue;
-                }
-
-                // ensure the value is set
-                if (!isset($_POST[$key])) {
-                    // checkboxes aren't set by browsers if they're off
-                    if ($type == 'boolean') {
-                        $_POST[$key] = false;
-                    } else {
-                        $this->_errors[$form->name][] = sprintf(
-                            __('Missing data for %s'),
-                            '<i>' . PMA_langName($system_path) . '</i>'
-                        );
-                        $result = false;
-                        continue;
-                    }
-                }
-
-                // user preferences allow/disallow
-                if ($is_setup_script
-                    && isset($this->_userprefsKeys[$system_path])
-                ) {
-                    if (isset($this->_userprefsDisallow[$system_path])
-                        && isset($_POST[$key . '-userprefs-allow'])
-                    ) {
-                        unset($this->_userprefsDisallow[$system_path]);
-                    } else if (!isset($_POST[$key . '-userprefs-allow'])) {
-                        $this->_userprefsDisallow[$system_path] = true;
-                    }
-                }
-
-                // cast variables to correct type
-                switch ($type) {
-                case 'double':
-                    $_POST[$key] = Util::requestString($_POST[$key]);
-                    settype($_POST[$key], 'float');
-                    break;
-                case 'boolean':
-                case 'integer':
-                    if ($_POST[$key] !== '') {
-                        $_POST[$key] = Util::requestString($_POST[$key]);
-                        settype($_POST[$key], $type);
-                    }
-                    break;
-                case 'select':
-                    $successfully_validated = $this->_validateSelect(
-                        $_POST[$key],
-                        $form->getOptionValueList($system_path)
-                    );
-                    if (! $successfully_validated) {
-                        $this->_errors[$work_path][] = __('Incorrect value!');
-                        $result = false;
-                        continue;
-                    }
-                    break;
-                case 'string':
-                case 'short_string':
-                    $_POST[$key] = Util::requestString($_POST[$key]);
-                    break;
-                case 'array':
-                    // eliminate empty values and ensure we have an array
-                    $post_values = is_array($_POST[$key])
-                        ? $_POST[$key]
-                        : explode("\n", $_POST[$key]);
-                    $_POST[$key] = array();
-                    $this->_fillPostArrayParameters($post_values, $key);
-                    break;
-                }
-
-                // now we have value with proper type
-                $values[$system_path] = $_POST[$key];
-                if ($change_index !== false) {
-                    $work_path = str_replace(
-                        "Servers/$form->index/",
-                        "Servers/$change_index/", $work_path
-                    );
-                }
-                $to_save[$work_path] = $system_path;
-            }
-        }
-
-        // save forms
-        if (!$allow_partial_save && !empty($this->_errors)) {
-            // don't look for non-critical errors
-            $this->_validate();
-            return $result;
-        }
-
-        foreach ($to_save as $work_path => $path) {
-            // TrustedProxies requires changes before saving
-            if ($path == 'TrustedProxies') {
-                $proxies = array();
-                $i = 0;
-                foreach ($values[$path] as $value) {
-                    $matches = array();
-                    $match = preg_match(
-                        "/^(.+):(?:[ ]?)(\\w+)$/", $value, $matches
-                    );
-                    if ($match) {
-                        // correct 'IP: HTTP header' pair
-                        $ip = trim($matches[1]);
-                        $proxies[$ip] = trim($matches[2]);
-                    } else {
-                        // save also incorrect values
-                        $proxies["-$i"] = $value;
-                        $i++;
-                    }
-                }
-                $values[$path] = $proxies;
-            }
-            $this->_configFile->set($work_path, $values[$path], $path);
-        }
-        if ($is_setup_script) {
-            $this->_configFile->set(
-                'UserprefsDisallow',
-                array_keys($this->_userprefsDisallow)
-            );
-        }
-
-        // don't look for non-critical errors
-        $this->_validate();
-
-        return $result;
-    }
-
-    /**
-     * Tells whether form validation failed
-     *
-     * @return boolean
-     */
-    public function hasErrors()
-    {
-        return count($this->_errors) > 0;
-    }
-
-
-    /**
-     * Returns link to documentation
-     *
-     * @param string $path Path to documentation
-     *
-     * @return string
-     */
-    public function getDocLink($path)
-    {
-        $test = mb_substr($path, 0, 6);
-        if ($test == 'Import' || $test == 'Export') {
-            return '';
-        }
-        return Util::getDocuLink(
-            'config',
-            'cfg_' .  $this->_getOptName($path)
-        );
-    }
-
-    /**
-     * Changes path so it can be used in URLs
-     *
-     * @param string $path Path
-     *
-     * @return string
-     */
-    private function _getOptName($path)
-    {
-        return str_replace(array('Servers/1/', '/'), array('Servers/', '_'), $path);
-    }
-
-    /**
-     * Fills out {@link userprefs_keys} and {@link userprefs_disallow}
-     *
-     * @return void
-     */
-    private function _loadUserprefsInfo()
-    {
-        if ($this->_userprefsKeys !== null) {
-            return;
-        }
-
-        $this->_userprefsKeys = array_flip(PMA_readUserprefsFieldNames());
-        // read real config for user preferences display
-        $userprefs_disallow = defined('PMA_SETUP')
-            ? $this->_configFile->get('UserprefsDisallow', array())
-            : $GLOBALS['cfg']['UserprefsDisallow'];
-        $this->_userprefsDisallow = array_flip($userprefs_disallow);
-    }
-
-    /**
-     * Sets field comments and warnings based on current environment
-     *
-     * @param string $system_path Path to settings
-     * @param array  &$opts       Chosen options
-     *
-     * @return void
-     */
-    private function _setComments($system_path, array &$opts)
-    {
-        // RecodingEngine - mark unavailable types
-        if ($system_path == 'RecodingEngine') {
-            $comment = '';
-            if (!function_exists('iconv')) {
-                $opts['values']['iconv'] .= ' (' . __('unavailable') . ')';
-                $comment = sprintf(
-                    __('"%s" requires %s extension'), 'iconv', 'iconv'
-                );
-            }
-            if (!function_exists('recode_string')) {
-                $opts['values']['recode'] .= ' (' . __('unavailable') . ')';
-                $comment .= ($comment ? ", " : '') . sprintf(
-                    __('"%s" requires %s extension'),
-                    'recode', 'recode'
-                );
-            }
-            if (!function_exists('mb_convert_encoding')) {
-                $opts['values']['mb'] .= ' (' . __('unavailable') . ')';
-                $comment .= ($comment ? ", " : '') . sprintf(
-                    __('"%s" requires %s extension'),
-                    'mb', 'mbstring'
-                );
-            }
-            $opts['comment'] = $comment;
-            $opts['comment_warning'] = true;
-        }
-        // ZipDump, GZipDump, BZipDump - check function availability
-        if ($system_path == 'ZipDump'
-            || $system_path == 'GZipDump'
-            || $system_path == 'BZipDump'
-        ) {
-            $comment = '';
-            $funcs = array(
-                'ZipDump'  => array('zip_open', 'gzcompress'),
-                'GZipDump' => array('gzopen', 'gzencode'),
-                'BZipDump' => array('bzopen', 'bzcompress'));
-            if (!function_exists($funcs[$system_path][0])) {
-                $comment = sprintf(
-                    __(
-                        'Compressed import will not work due to missing function %s.'
-                    ),
-                    $funcs[$system_path][0]
-                );
-            }
-            if (!function_exists($funcs[$system_path][1])) {
-                $comment .= ($comment ? '; ' : '') . sprintf(
-                    __(
-                        'Compressed export will not work due to missing function %s.'
-                    ),
-                    $funcs[$system_path][1]
-                );
-            }
-            $opts['comment'] = $comment;
-            $opts['comment_warning'] = true;
-        }
-        if (!defined('PMA_SETUP')) {
-            if (($system_path == 'MaxDbList' || $system_path == 'MaxTableList'
-                || $system_path == 'QueryHistoryMax')
-            ) {
-                $opts['comment'] = sprintf(
-                    __('maximum %s'), $GLOBALS['cfg'][$system_path]
-                );
-            }
-        }
-    }
-
-    /**
-     * Copy items of an array to $_POST variable
-     *
-     * @param array  $post_values List of parameters
-     * @param string $key         Array key
-     *
-     * @return void
-     */
-    private function _fillPostArrayParameters($post_values, $key)
-    {
-        foreach ($post_values as $v) {
-            $v = Util::requestString($v);
-            if ($v !== '') {
-                $_POST[$key][] = $v;
-            }
-        }
-    }
-}
diff --git a/#pma/libraries/config/FormDisplay.tpl.php b/#pma/libraries/config/FormDisplay.tpl.php
deleted file mode 100644
index 66af3ac6..00000000
--- a/#pma/libraries/config/FormDisplay.tpl.php
+++ /dev/null
@@ -1,526 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Form templates
- *
- * @package PhpMyAdmin
- */
-use PMA\libraries\Template;
-use PMA\libraries\Util;
-
-/**
- * Displays top part of the form
- *
- * @param string $action        default: $_SERVER['REQUEST_URI']
- * @param string $method        'post' or 'get'
- * @param array  $hidden_fields array of form hidden fields (key: field name)
- *
- * @return string
- */
-function PMA_displayFormTop($action = null, $method = 'post', $hidden_fields = null)
-{
-    static $has_check_page_refresh = false;
-
-    if ($action === null) {
-        $action = $_SERVER['REQUEST_URI'];
-    }
-    if ($method != 'post') {
-        $method = 'get';
-    }
-    $htmlOutput = '<form method="' . $method . '" action="'
-        . htmlspecialchars($action) . '" class="config-form disableAjax">';
-    $htmlOutput .= '<input type="hidden" name="tab_hash" value="" />';
-    // we do validation on page refresh when browser remembers field values,
-    // add a field with known value which will be used for checks
-    if (! $has_check_page_refresh) {
-        $has_check_page_refresh = true;
-        $htmlOutput .= '<input type="hidden" name="check_page_refresh" '
-            . ' id="check_page_refresh" value="" />' . "\n";
-    }
-    $htmlOutput .= PMA_URL_getHiddenInputs('', '', 0, 'server') . "\n";
-    $htmlOutput .= PMA_getHiddenFields((array)$hidden_fields);
-    return $htmlOutput;
-}
-
-/**
- * Displays form tabs which are given by an array indexed by fieldset id
- * ({@link PMA_displayFieldsetTop}), with values being tab titles.
- *
- * @param array $tabs tab names
- *
- * @return string
- */
-function PMA_displayTabsTop($tabs)
-{
-    $items = array();
-    foreach ($tabs as $tab_id => $tab_name) {
-        $items[] = array(
-            'content' => htmlspecialchars($tab_name),
-            'url' => array(
-                'href' => '#' . $tab_id,
-            ),
-        );
-    }
-
-    $htmlOutput = Template::get('list/unordered')->render(
-        array(
-            'class' => 'tabs',
-            'items' => $items,
-        )
-    );
-    $htmlOutput .= '<br clear="right" />';
-    $htmlOutput .= '<div class="tabs_contents">';
-    return $htmlOutput;
-}
-
-
-/**
- * Displays top part of a fieldset
- *
- * @param string $title       title of fieldset
- * @param string $description description shown on top of fieldset
- * @param array  $errors      error messages to display
- * @param array  $attributes  optional extra attributes of fieldset
- *
- * @return string
- */
-function PMA_displayFieldsetTop($title = '', $description = '', $errors = null,
-    $attributes = array()
-) {
-    global $_FormDisplayGroup;
-
-    $_FormDisplayGroup = 0;
-
-    $attributes = array_merge(array('class' => 'optbox'), $attributes);
-    foreach ($attributes as $k => &$attr) {
-        $attr = $k . '="' . htmlspecialchars($attr) . '"';
-    }
-
-    $htmlOutput = '<fieldset ' . implode(' ', $attributes) . '>';
-    $htmlOutput .= '<legend>' . $title . '</legend>';
-    if (!empty($description)) {
-        $htmlOutput .= '<p>' . $description . '</p>';
-    }
-    // this must match with displayErrors() in scripts.js
-    if (is_array($errors) && count($errors) > 0) {
-        $htmlOutput .= '<dl class="errors">';
-        foreach ($errors as $error) {
-            $htmlOutput .= '<dd>' . $error . '</dd>';
-        }
-        $htmlOutput .= '</dl>';
-    }
-    $htmlOutput .= '<table width="100%" cellspacing="0">';
-    return $htmlOutput;
-}
-
-/**
- * Displays input field
- *
- * $opts keys:
- * o doc - (string) documentation link
- * o errors - error array
- * o setvalue - (string) shows button allowing to set predefined value
- * o show_restore_default - (boolean) whether show "restore default" button
- * o userprefs_allow - whether user preferences are enabled for this field
- *                    (null - no support, true/false - enabled/disabled)
- * o userprefs_comment - (string) field comment
- * o values - key - value pairs for <select> fields
- * o values_escaped - (boolean) tells whether values array is already escaped
- *                    (defaults to false)
- * o values_disabled -  (array)list of disabled values (keys from values)
- * o comment - (string) tooltip comment
- * o comment_warning - (bool) whether this comments warns about something
- *
- * @param string $path             config option path
- * @param string $name             config option name
- * @param string $type             type of config option
- * @param mixed  $value            current value
- * @param string $description      verbose description
- * @param bool   $value_is_default whether value is default
- * @param array  $opts             see above description
- *
- * @return string
- */
-function PMA_displayInput($path, $name, $type, $value, $description = '',
-    $value_is_default = true, $opts = null
-) {
-    global $_FormDisplayGroup;
-    static $icons;    // An array of IMG tags used further below in the function
-
-    if (defined('TESTSUITE')) {
-        $icons = null;
-    }
-
-    $is_setup_script = defined('PMA_SETUP');
-    if ($icons === null) { // if the static variables have not been initialised
-        $icons = array();
-        // Icon definitions:
-        // The same indexes will be used in the $icons array.
-        // The first element contains the filename and the second
-        // element is used for the "alt" and "title" attributes.
-        $icon_init = array(
-            'edit'   => array('b_edit.png',   ''),
-            'help'   => array('b_help.png',   __('Documentation')),
-            'reload' => array('s_reload.png', ''),
-            'tblops' => array('b_tblops.png', '')
-        );
-        if ($is_setup_script) {
-            // When called from the setup script, we don't have access to the
-            // sprite-aware getImage() function because the PMA_theme class
-            // has not been loaded, so we generate the img tags manually.
-            foreach ($icon_init as $k => $v) {
-                $title = '';
-                if (! empty($v[1])) {
-                    $title = ' title="' . $v[1] . '"';
-                }
-                $icons[$k] = sprintf(
-                    '<img alt="%s" src="%s"%s />',
-                    $v[1],
-                    ".{$GLOBALS['cfg']['ThemePath']}/original/img/{$v[0]}",
-                    $title
-                );
-            }
-        } else {
-            // In this case we just use getImage() because it's available
-            foreach ($icon_init as $k => $v) {
-                $icons[$k] = Util::getImage(
-                    $v[0], $v[1]
-                );
-            }
-        }
-    }
-    $has_errors = isset($opts['errors']) && !empty($opts['errors']);
-    $option_is_disabled = ! $is_setup_script && isset($opts['userprefs_allow'])
-        && ! $opts['userprefs_allow'];
-    $name_id = 'name="' . htmlspecialchars($path) . '" id="'
-        . htmlspecialchars($path) . '"';
-    $field_class = $type == 'checkbox' ? 'checkbox' : '';
-    if (! $value_is_default) {
-        $field_class .= ($field_class == '' ? '' : ' ')
-            . ($has_errors ? 'custom field-error' : 'custom');
-    }
-    $field_class = $field_class ? ' class="' . $field_class . '"' : '';
-    $tr_class = $_FormDisplayGroup > 0
-        ? 'group-field group-field-' . $_FormDisplayGroup
-        : '';
-    if (isset($opts['setvalue']) && $opts['setvalue'] == ':group') {
-        unset($opts['setvalue']);
-        $_FormDisplayGroup++;
-        $tr_class = 'group-header-field group-header-' . $_FormDisplayGroup;
-    }
-    if ($option_is_disabled) {
-        $tr_class .= ($tr_class ? ' ' : '') . 'disabled-field';
-    }
-    $tr_class = $tr_class ? ' class="' . $tr_class . '"' : '';
-
-    $htmlOutput = '<tr' . $tr_class . '>';
-    $htmlOutput .= '<th>';
-    $htmlOutput .= '<label for="' . htmlspecialchars($path) . '">' . $name
-        . '</label>';
-
-    if (! empty($opts['doc'])) {
-        $htmlOutput .= '<span class="doc">';
-        $htmlOutput .= '<a href="' . $opts['doc']
-            . '" target="documentation">' . $icons['help'] . '</a>';
-        $htmlOutput .= "\n";
-        $htmlOutput .= '</span>';
-    }
-
-    if ($option_is_disabled) {
-        $htmlOutput .= '<span class="disabled-notice" title="';
-        $htmlOutput .= __(
-            'This setting is disabled, it will not be applied to your configuration.'
-        );
-        $htmlOutput .= '">' . __('Disabled') . "</span>";
-    }
-
-    if (!empty($description)) {
-        $htmlOutput .= '<small>' . $description . '</small>';
-    }
-
-    $htmlOutput .= '</th>';
-    $htmlOutput .= '<td>';
-
-    switch ($type) {
-    case 'text':
-        $htmlOutput .= '<input type="text" size="40" ' . $name_id . $field_class
-            . ' value="' . htmlspecialchars($value) . '" />';
-        break;
-    case 'password':
-        $htmlOutput .= '<input type="password" size="40" ' . $name_id . $field_class
-            . ' value="' . htmlspecialchars($value) . '" />';
-        break;
-    case 'short_text':
-        // As seen in the reporting server (#15042) we sometimes receive
-        // an array here. No clue about its origin nor content, so let's avoid
-        // a notice on htmlspecialchars().
-        if (! is_array($value)) {
-            $htmlOutput .= '<input type="text" size="25" ' . $name_id
-                . $field_class . ' value="' . htmlspecialchars($value)
-                . '" />';
-        }
-        break;
-    case 'number_text':
-        $htmlOutput .= '<input type="number" ' . $name_id . $field_class
-            . ' value="' . htmlspecialchars($value) . '" />';
-        break;
-    case 'checkbox':
-        $htmlOutput .= '<span' . $field_class . '><input type="checkbox" ' . $name_id
-          . ($value ? ' checked="checked"' : '') . ' /></span>';
-        break;
-    case 'select':
-        $htmlOutput .= '<select ' . $name_id . $field_class . '>';
-        $escape = !(isset($opts['values_escaped']) && $opts['values_escaped']);
-        $values_disabled = isset($opts['values_disabled'])
-            ? array_flip($opts['values_disabled']) : array();
-        foreach ($opts['values'] as $opt_value_key => $opt_value) {
-            // set names for boolean values
-            if (is_bool($opt_value)) {
-                $opt_value = mb_strtolower(
-                    $opt_value ? __('Yes') : __('No')
-                );
-            }
-            // escape if necessary
-            if ($escape) {
-                $display = htmlspecialchars($opt_value);
-                $display_value = htmlspecialchars($opt_value_key);
-            } else {
-                $display = $opt_value;
-                $display_value = $opt_value_key;
-            }
-            // compare with selected value
-            // boolean values are cast to integers when used as array keys
-            $selected = is_bool($value)
-                ? (int) $value === $opt_value_key
-                : $opt_value_key === $value;
-            $htmlOutput .= '<option value="' . $display_value . '"';
-            if ($selected) {
-                $htmlOutput .= ' selected="selected"';
-            }
-            if (isset($values_disabled[$opt_value_key])) {
-                $htmlOutput .= ' disabled="disabled"';
-            }
-            $htmlOutput .= '>' . $display . '</option>';
-        }
-        $htmlOutput .= '</select>';
-        break;
-    case 'list':
-        $htmlOutput .= '<textarea cols="40" rows="5" ' . $name_id . $field_class
-            . '>' . htmlspecialchars(implode("\n", $value)) . '</textarea>';
-        break;
-    }
-    if (isset($opts['comment']) && $opts['comment']) {
-        $class = 'field-comment-mark';
-        if (isset($opts['comment_warning']) && $opts['comment_warning']) {
-            $class .= ' field-comment-warning';
-        }
-        $htmlOutput .= '<span class="' . $class . '" title="'
-            . htmlspecialchars($opts['comment']) . '">i</span>';
-    }
-    if ($is_setup_script
-        && isset($opts['userprefs_comment'])
-        && $opts['userprefs_comment']
-    ) {
-        $htmlOutput .= '<a class="userprefs-comment" title="'
-            . htmlspecialchars($opts['userprefs_comment']) . '">'
-            . $icons['tblops'] . '</a>';
-    }
-    if (isset($opts['setvalue']) && $opts['setvalue']) {
-        $htmlOutput .= '<a class="set-value" href="#'
-            . htmlspecialchars("$path={$opts['setvalue']}") . '" title="'
-            . sprintf(__('Set value: %s'), htmlspecialchars($opts['setvalue']))
-            . '" style="display:none">' . $icons['edit'] . '</a>';
-    }
-    if (isset($opts['show_restore_default']) && $opts['show_restore_default']) {
-        $htmlOutput .= '<a class="restore-default" href="#' . $path . '" title="'
-            .  __('Restore default value') . '" style="display:none">'
-            . $icons['reload'] . '</a>';
-    }
-    // this must match with displayErrors() in scripts/config.js
-    if ($has_errors) {
-        $htmlOutput .= "\n        <dl class=\"inline_errors\">";
-        foreach ($opts['errors'] as $error) {
-            $htmlOutput .= '<dd>' . htmlspecialchars($error) . '</dd>';
-        }
-        $htmlOutput .= '</dl>';
-    }
-    $htmlOutput .= '</td>';
-    if ($is_setup_script && isset($opts['userprefs_allow'])) {
-        $htmlOutput .= '<td class="userprefs-allow" title="' .
-            __('Allow users to customize this value') . '">';
-        $htmlOutput .= '<input type="checkbox" name="' . $path
-            . '-userprefs-allow" ';
-        if ($opts['userprefs_allow']) {
-            $htmlOutput .= 'checked="checked"';
-        };
-        $htmlOutput .= '/>';
-        $htmlOutput .= '</td>';
-    } else if ($is_setup_script) {
-        $htmlOutput .= '<td>&nbsp;</td>';
-    }
-    $htmlOutput .= '</tr>';
-    return $htmlOutput;
-}
-
-/**
- * Display group header
- *
- * @param string $header_text Text of header
- *
- * @return string|void
- */
-function PMA_displayGroupHeader($header_text)
-{
-    global $_FormDisplayGroup;
-
-    $_FormDisplayGroup++;
-    if (! $header_text) {
-        return null;
-    }
-    $colspan = defined('PMA_SETUP')
-        ? 3
-        : 2;
-    $htmlOutput = '<tr class="group-header group-header-' . $_FormDisplayGroup
-        . '">';
-    $htmlOutput .= '<th colspan="' . $colspan . '">';
-    $htmlOutput .= $header_text;
-    $htmlOutput .= '</th>';
-    $htmlOutput .= '</tr>';
-    return $htmlOutput;
-}
-
-/**
- * Display group footer
- *
- * @return void
- */
-function PMA_displayGroupFooter()
-{
-    global $_FormDisplayGroup;
-
-    $_FormDisplayGroup--;
-}
-
-/**
- * Displays bottom part of a fieldset
- *
- * @param bool $show_buttons whether show submit and reset button
- *
- * @return string
- */
-function PMA_displayFieldsetBottom($show_buttons = true)
-{
-    $colspan = 2;
-    if (defined('PMA_SETUP')) {
-        $colspan++;
-    }
-    $htmlOutput = '';
-    if ($show_buttons) {
-        $htmlOutput .= '<tr>';
-        $htmlOutput .= '<td colspan="' . $colspan . '" class="lastrow">';
-        $htmlOutput .= '<input type="submit" name="submit_save" value="'
-            . __('Apply') . '" class="green" />';
-        $htmlOutput .= '<input type="button" name="submit_reset" value="'
-            . __('Reset') . '" />';
-        $htmlOutput .= '</td>';
-        $htmlOutput .= '</tr>';
-    }
-    $htmlOutput .= '</table>';
-    $htmlOutput .= '</fieldset>';
-    return $htmlOutput;
-}
-
-/**
- * Displays simple bottom part of a fieldset (without submit buttons)
- *
- * @return string
- */
-function PMA_displayFieldsetBottomSimple()
-{
-    $htmlOutput = '</table>';
-    $htmlOutput .= '</fieldset>';
-    return $htmlOutput;
-}
-
-/**
- * Closes form tabs
- *
- * @return string
- */
-function PMA_displayTabsBottom()
-{
-    $htmlOutput = "</div>\n";
-    return $htmlOutput;
-}
-
-/**
- * Displays bottom part of the form
- *
- * @return string
- */
-function PMA_displayFormBottom()
-{
-    $htmlOutput = "</form>\n";
-    return $htmlOutput;
-}
-
-/**
- * Appends JS validation code to $js_array
- *
- * @param string       $field_id   ID of field to validate
- * @param string|array $validators validators callback
- * @param array        &$js_array  will be updated with javascript code
- *
- * @return void
- */
-function PMA_addJsValidate($field_id, $validators, &$js_array)
-{
-    foreach ((array)$validators as $validator) {
-        $validator = (array)$validator;
-        $v_name = array_shift($validator);
-        $v_name = "PMA_" . $v_name;
-        $v_args = array();
-        foreach ($validator as $arg) {
-            $v_args[] = PMA_escapeJsString($arg);
-        }
-        $v_args = $v_args ? ", ['" . implode("', '", $v_args) . "']" : '';
-        $js_array[] = "validateField('$field_id', '$v_name', true$v_args)";
-    }
-}
-
-/**
- * Displays JavaScript code
- *
- * @param array $js_array lines of javascript code
- *
- * @return string
- */
-function PMA_displayJavascript($js_array)
-{
-    if (empty($js_array)) {
-        return null;
-    }
-
-    return Template::get('javascript/display')->render(
-        array('js_array' => $js_array,)
-    );
-}
-
-/**
- * Displays error list
- *
- * @param string $name       name of item with errors
- * @param array  $error_list list of errors to show
- *
- * @return string HTML for errors
- */
-function PMA_displayErrors($name, $error_list)
-{
-    $htmlOutput = '<dl>';
-    $htmlOutput .= '<dt>' . htmlspecialchars($name) . '</dt>';
-    foreach ($error_list as $error) {
-        $htmlOutput .= '<dd>' . htmlspecialchars($error) . '</dd>';
-    }
-    $htmlOutput .= '</dl>';
-    return $htmlOutput;
-}
diff --git a/#pma/libraries/config/PageSettings.php b/#pma/libraries/config/PageSettings.php
deleted file mode 100644
index 5aeddab4..00000000
--- a/#pma/libraries/config/PageSettings.php
+++ /dev/null
@@ -1,231 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Page-related settings
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries\config;
-
-use PMA\libraries\Message;
-use PMA\libraries\Response;
-
-require_once 'libraries/user_preferences.lib.php';
-require_once 'libraries/config/config_functions.lib.php';
-require_once 'libraries/config/messages.inc.php';
-require 'libraries/config/user_preferences.forms.php';
-require 'libraries/config/page_settings.forms.php';
-
-/**
- * Page-related settings
- *
- * @package PhpMyAdmin
- */
-class PageSettings
-{
-
-    /**
-     * Contains id of the form element
-     * @var string
-     */
-    private $_elemId = 'page_settings_modal';
-
-    /**
-     * Name of the group to show
-     * @var string
-     */
-    private $_groupName = '';
-
-    /**
-     * Contains HTML of errors
-     * @var string
-     */
-    private $_errorHTML = '';
-
-    /**
-     * Contains HTML of settings
-     * @var string
-     */
-    private $_HTML = '';
-
-    /**
-     * Constructor
-     *
-     * @param string $formGroupName The name of config form group to display
-     * @param string $elemId        Id of the div containing settings
-     */
-    public function __construct($formGroupName, $elemId = null)
-    {
-        global $forms;
-        if (empty($forms[$formGroupName])) {
-            return;
-        }
-
-        if (isset($_REQUEST['printview']) && $_REQUEST['printview'] == '1') {
-            return;
-        }
-
-        if (!empty($elemId)) {
-            $this->_elemId = $elemId;
-        }
-        $this->_groupName = $formGroupName;
-
-        $cf = new ConfigFile($GLOBALS['PMA_Config']->base_settings);
-        PMA_userprefsPageInit($cf);
-
-        $form_display = new FormDisplay($cf);
-        foreach ($forms[$formGroupName] as $form_name => $form) {
-            // skip Developer form if no setting is available
-            if ($form_name == 'Developer'
-                && !$GLOBALS['cfg']['UserprefsDeveloperTab']
-            ) {
-                continue;
-            }
-            $form_display->registerForm($form_name, $form, 1);
-        }
-
-        // Process form
-        $error = null;
-        if (isset($_POST['submit_save'])
-            && $_POST['submit_save'] == $formGroupName
-        ) {
-            $this->_processPageSettings($form_display, $cf, $error);
-        }
-
-        // Display forms
-        $this->_HTML = $this->_getPageSettingsDisplay($form_display, $error);
-    }
-
-    /**
-     * Process response to form
-     *
-     * @param FormDisplay  &$form_display Form
-     * @param ConfigFile   &$cf           Configuration file
-     * @param Message|null &$error        Error message
-     *
-     * @return void
-     */
-    private function _processPageSettings(&$form_display, &$cf, &$error)
-    {
-        if ($form_display->process(false) && !$form_display->hasErrors()) {
-            // save settings
-            $result = PMA_saveUserprefs($cf->getConfigArray());
-            if ($result === true) {
-                // reload page
-                header('Location: ' . $_SERVER['REQUEST_URI']);
-                exit();
-            } else {
-                $error = $result;
-            }
-        }
-    }
-
-    /**
-     * Store errors in _errorHTML
-     *
-     * @param FormDisplay  &$form_display Form
-     * @param Message|null &$error        Error message
-     *
-     * @return void
-     */
-    private function _storeError(&$form_display, &$error)
-    {
-        $retval = '';
-        if ($error) {
-            $retval .= $error->getDisplay();
-        }
-        if ($form_display->hasErrors()) {
-            // form has errors
-            $retval .= '<div class="error config-form">'
-                . '<b>' . __(
-                    'Cannot save settings, submitted configuration form contains '
-                    . 'errors!'
-                ) . '</b>'
-                . $form_display->displayErrors()
-                . '</div>';
-        }
-        $this->_errorHTML = $retval;
-    }
-
-    /**
-     * Display page-related settings
-     *
-     * @param FormDisplay &$form_display Form
-     * @param Message     &$error        Error message
-     *
-     * @return string
-     */
-    private function _getPageSettingsDisplay(&$form_display, &$error)
-    {
-        $response = Response::getInstance();
-
-        $retval = '';
-
-        $this->_storeError($form_display, $error);
-
-        $retval .= '<div id="' . $this->_elemId . '">';
-        $retval .= '<div class="page_settings">';
-        $retval .= $form_display->getDisplay(
-            true,
-            true,
-            false,
-            $response->getFooter()->getSelfUrl('unencoded'),
-            array(
-                'submit_save' => $this->_groupName
-            )
-        );
-        $retval .= '</div>';
-        $retval .= '</div>';
-
-        return $retval;
-    }
-
-    /**
-     * Get HTML output
-     *
-     * @return string
-     */
-    public function getHTML()
-    {
-        return $this->_HTML;
-    }
-
-    /**
-     * Get error HTML output
-     *
-     * @return string
-     */
-    public function getErrorHTML()
-    {
-        return $this->_errorHTML;
-    }
-
-    /**
-     * Group to show for Page-related settings
-     * @param string $formGroupName The name of config form group to display
-     * @return PageSettings
-     */
-    public static function showGroup($formGroupName)
-    {
-        $object = new PageSettings($formGroupName);
-
-        $response = Response::getInstance();
-        $response->addHTML($object->getErrorHTML());
-        $response->addHTML($object->getHTML());
-
-        return $object;
-    }
-
-    /**
-     * Get HTML for navigation settings
-     * @return string
-     */
-    public static function getNaviSettings()
-    {
-        $object = new PageSettings('Navi_panel', 'pma_navigation_settings');
-
-        $response = Response::getInstance();
-        $response->addHTML($object->getErrorHTML());
-        return $object->getHTML();
-    }
-}
diff --git a/#pma/libraries/config/ServerConfigChecks.php b/#pma/libraries/config/ServerConfigChecks.php
deleted file mode 100644
index 495f7bff..00000000
--- a/#pma/libraries/config/ServerConfigChecks.php
+++ /dev/null
@@ -1,646 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Server config checks management
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries\config;
-
-/**
- * Performs various compatibility, security and consistency checks on current config
- *
- * Outputs results to message list, must be called between PMA_messagesBegin()
- * and PMA_messagesEnd()
- *
- * @package PhpMyAdmin
- */
-class ServerConfigChecks
-{
-    /**
-     * @var ConfigFile configurations being checked
-     */
-    protected $cfg;
-
-    /**
-     * Constructor.
-     *
-     * @param ConfigFile $cfg Configuration
-     */
-    public function __construct(ConfigFile $cfg)
-    {
-        $this->cfg = $cfg;
-    }
-
-    /**
-     * Perform config checks
-     *
-     * @return void
-     */
-    public function performConfigChecks()
-    {
-        $blowfishSecret = $this->cfg->get('blowfish_secret');
-        $blowfishSecretSet = false;
-        $cookieAuthUsed = false;
-
-        list(
-            $sAllowArbitraryServerWarn, $sBlowfishSecretMsg,
-            $sBZipDumpWarn, $sDirectoryNotice,
-            $sGZipDumpWarn, $sLoginCookieValidityWarn,
-            $sLoginCookieValidityWarn2, $sLoginCookieValidityWarn3,
-            $sSecurityInfoMsg, $sSrvAuthCfgMsg, $sZipDumpExportWarn,
-            $sZipDumpImportWarn
-        ) = self::defineMessages();
-
-        list($cookieAuthUsed, $blowfishSecret, $blowfishSecretSet)
-            = $this->performConfigChecksServers(
-                $cookieAuthUsed, $blowfishSecret, $sSrvAuthCfgMsg,
-                $sSecurityInfoMsg, $blowfishSecretSet
-            );
-
-        $this->performConfigChecksCookieAuthUsed(
-            $cookieAuthUsed, $blowfishSecretSet, $sBlowfishSecretMsg,
-            $blowfishSecret
-        );
-
-        //
-        // $cfg['AllowArbitraryServer']
-        // should be disabled
-        //
-        if ($this->cfg->getValue('AllowArbitraryServer')) {
-            PMA_messagesSet(
-                'notice',
-                'AllowArbitraryServer',
-                PMA_lang(PMA_langName('AllowArbitraryServer')),
-                PMA_lang($sAllowArbitraryServerWarn)
-            );
-        }
-
-        $this->performConfigChecksLoginCookie(
-            $sLoginCookieValidityWarn, $sLoginCookieValidityWarn2,
-            $sLoginCookieValidityWarn3
-        );
-
-        //
-        // $cfg['SaveDir']
-        // should not be world-accessible
-        //
-        if ($this->cfg->getValue('SaveDir') != '') {
-            PMA_messagesSet(
-                'notice',
-                'SaveDir',
-                PMA_lang(PMA_langName('SaveDir')),
-                PMA_lang($sDirectoryNotice)
-            );
-        }
-
-        //
-        // $cfg['TempDir']
-        // should not be world-accessible
-        //
-        if ($this->cfg->getValue('TempDir') != '') {
-            PMA_messagesSet(
-                'notice',
-                'TempDir',
-                PMA_lang(PMA_langName('TempDir')),
-                PMA_lang($sDirectoryNotice)
-            );
-        }
-
-        $this->performConfigChecksZips(
-            $sGZipDumpWarn, $sBZipDumpWarn, $sZipDumpImportWarn,
-            $sZipDumpExportWarn
-        );
-    }
-
-    /**
-     * Check config of servers
-     *
-     * @param boolean $cookieAuthUsed    Cookie auth is used
-     * @param string  $blowfishSecret    Blowfish secret
-     * @param string  $sServerAuthCfgMsg Message for server auth config
-     * @param string  $sSecurityInfoMsg  Message for security information
-     * @param boolean $blowfishSecretSet Blowfish secret set
-     *
-     * @return array
-     */
-    protected function performConfigChecksServers(
-        $cookieAuthUsed, $blowfishSecret, $sServerAuthCfgMsg,
-        $sSecurityInfoMsg, $blowfishSecretSet
-    ) {
-        $serverCnt = $this->cfg->getServerCount();
-        for ($i = 1; $i <= $serverCnt; $i++) {
-            $cookieAuthServer
-                = ($this->cfg->getValue("Servers/$i/auth_type") == 'cookie');
-            $cookieAuthUsed |= $cookieAuthServer;
-            $serverName = $this->performConfigChecksServersGetServerName(
-                $this->cfg->getServerName($i), $i
-            );
-            $serverName = htmlspecialchars($serverName);
-
-            list($blowfishSecret, $blowfishSecretSet)
-                = $this->performConfigChecksServersSetBlowfishSecret(
-                    $blowfishSecret, $cookieAuthServer, $blowfishSecretSet
-                );
-
-            //
-            // $cfg['Servers'][$i]['ssl']
-            // should be enabled if possible
-            //
-            if (!$this->cfg->getValue("Servers/$i/ssl")) {
-                $title = PMA_lang(PMA_langName('Servers/1/ssl')) . " ($serverName)";
-                PMA_messagesSet(
-                    'notice',
-                    "Servers/$i/ssl",
-                    $title,
-                    __(
-                        'You should use SSL connections if your database server '
-                        . 'supports it.'
-                    )
-                );
-            }
-
-            //
-            // $cfg['Servers'][$i]['auth_type']
-            // warn about full user credentials if 'auth_type' is 'config'
-            //
-            if ($this->cfg->getValue("Servers/$i/auth_type") == 'config'
-                && $this->cfg->getValue("Servers/$i/user") != ''
-                && $this->cfg->getValue("Servers/$i/password") != ''
-            ) {
-                $title = PMA_lang(PMA_langName('Servers/1/auth_type'))
-                    . " ($serverName)";
-                PMA_messagesSet(
-                    'notice',
-                    "Servers/$i/auth_type",
-                    $title,
-                    PMA_lang($sServerAuthCfgMsg, $i) . ' '
-                    . PMA_lang($sSecurityInfoMsg, $i)
-                );
-            }
-
-            //
-            // $cfg['Servers'][$i]['AllowRoot']
-            // $cfg['Servers'][$i]['AllowNoPassword']
-            // serious security flaw
-            //
-            if ($this->cfg->getValue("Servers/$i/AllowRoot")
-                && $this->cfg->getValue("Servers/$i/AllowNoPassword")
-            ) {
-                $title = PMA_lang(PMA_langName('Servers/1/AllowNoPassword'))
-                    . " ($serverName)";
-                PMA_messagesSet(
-                    'notice',
-                    "Servers/$i/AllowNoPassword",
-                    $title,
-                    __('You allow for connecting to the server without a password.')
-                    . ' ' . PMA_lang($sSecurityInfoMsg, $i)
-                );
-            }
-        }
-        return array($cookieAuthUsed, $blowfishSecret, $blowfishSecretSet);
-    }
-
-    /**
-     * Set blowfish secret
-     *
-     * @param string  $blowfishSecret    Blowfish secret
-     * @param boolean $cookieAuthServer  Cookie auth is used
-     * @param boolean $blowfishSecretSet Blowfish secret set
-     *
-     * @return array
-     */
-    protected function performConfigChecksServersSetBlowfishSecret(
-        $blowfishSecret, $cookieAuthServer, $blowfishSecretSet
-    ) {
-        if ($cookieAuthServer && $blowfishSecret === null) {
-            $blowfishSecret = '';
-            if (! function_exists('openssl_random_pseudo_bytes')) {
-                $random_func = 'phpseclib\\Crypt\\Random::string';
-            } else {
-                $random_func = 'openssl_random_pseudo_bytes';
-            }
-            while (strlen($blowfishSecret) < 32) {
-                $byte = $random_func(1);
-                // We want only ASCII chars
-                if (ord($byte) > 32 && ord($byte) < 127) {
-                    $blowfishSecret .= $byte;
-                }
-            }
-
-            $blowfishSecretSet = true;
-            $this->cfg->set('blowfish_secret', $blowfishSecret);
-        }
-        return array($blowfishSecret, $blowfishSecretSet);
-    }
-
-    /**
-     * Define server name
-     *
-     * @param string $serverName Server name
-     * @param int    $serverId   Server id
-     *
-     * @return string Server name
-     */
-    protected function performConfigChecksServersGetServerName(
-        $serverName, $serverId
-    ) {
-        if ($serverName == 'localhost') {
-            $serverName .= " [$serverId]";
-            return $serverName;
-        }
-        return $serverName;
-    }
-
-    /**
-     * Perform config checks for zip part.
-     *
-     * @param string $sGZipDumpWarning   Gzip dump warning
-     * @param string $sBZipDumpWarning   Bzip dump warning
-     * @param string $sZipDumpImportWarn Zip dump import warning
-     * @param string $sZipDumpExportWarn Zip dump export warning
-     *
-     * @return void
-     */
-    protected function performConfigChecksZips(
-        $sGZipDumpWarning, $sBZipDumpWarning, $sZipDumpImportWarn,
-        $sZipDumpExportWarn
-    ) {
-        $this->performConfigChecksServerGZipdump($sGZipDumpWarning);
-        $this->performConfigChecksServerBZipdump($sBZipDumpWarning);
-        $this->performConfigChecksServersZipdump(
-            $sZipDumpImportWarn, $sZipDumpExportWarn
-        );
-    }
-
-    /**
-     * Perform config checks for zip part.
-     *
-     * @param string $sZipDumpImportWarn Zip dump import warning
-     * @param string $sZipDumpExportWarn Zip dump export warning
-     *
-     * @return void
-     */
-    protected function performConfigChecksServersZipdump(
-        $sZipDumpImportWarn, $sZipDumpExportWarn
-    ) {
-        //
-        // $cfg['ZipDump']
-        // requires zip_open in import
-        //
-        if ($this->cfg->getValue('ZipDump') && !@function_exists('zip_open')) {
-            PMA_messagesSet(
-                'error',
-                'ZipDump_import',
-                PMA_lang(PMA_langName('ZipDump')),
-                PMA_lang($sZipDumpImportWarn, 'zip_open')
-            );
-        }
-
-        //
-        // $cfg['ZipDump']
-        // requires gzcompress in export
-        //
-        if ($this->cfg->getValue('ZipDump') && !@function_exists('gzcompress')) {
-            PMA_messagesSet(
-                'error',
-                'ZipDump_export',
-                PMA_lang(PMA_langName('ZipDump')),
-                PMA_lang($sZipDumpExportWarn, 'gzcompress')
-            );
-        }
-    }
-
-    /**
-     * Check config of servers
-     *
-     * @param boolean $cookieAuthUsed     Cookie auth is used
-     * @param boolean $blowfishSecretSet  Blowfish secret set
-     * @param string  $sBlowfishSecretMsg Blowfish secret message
-     * @param string  $blowfishSecret     Blowfish secret
-     *
-     * @return array
-     */
-    protected function performConfigChecksCookieAuthUsed(
-        $cookieAuthUsed, $blowfishSecretSet, $sBlowfishSecretMsg,
-        $blowfishSecret
-    ) {
-        //
-        // $cfg['blowfish_secret']
-        // it's required for 'cookie' authentication
-        //
-        if ($cookieAuthUsed) {
-            if ($blowfishSecretSet) {
-                // 'cookie' auth used, blowfish_secret was generated
-                PMA_messagesSet(
-                    'notice',
-                    'blowfish_secret_created',
-                    PMA_lang(PMA_langName('blowfish_secret')),
-                    PMA_lang($sBlowfishSecretMsg)
-                );
-            } else {
-                $blowfishWarnings = array();
-                // check length
-                if (strlen($blowfishSecret) < 32) {
-                    // too short key
-                    $blowfishWarnings[] = __(
-                        'Key is too short, it should have at least 32 characters.'
-                    );
-                }
-                // check used characters
-                $hasDigits = (bool)preg_match('/\d/', $blowfishSecret);
-                $hasChars = (bool)preg_match('/\S/', $blowfishSecret);
-                $hasNonword = (bool)preg_match('/\W/', $blowfishSecret);
-                if (!$hasDigits || !$hasChars || !$hasNonword) {
-                    $blowfishWarnings[] = PMA_lang(
-                        __(
-                            'Key should contain letters, numbers [em]and[/em] '
-                            . 'special characters.'
-                        )
-                    );
-                }
-                if (!empty($blowfishWarnings)) {
-                    PMA_messagesSet(
-                        'error',
-                        'blowfish_warnings' . count($blowfishWarnings),
-                        PMA_lang(PMA_langName('blowfish_secret')),
-                        implode('<br />', $blowfishWarnings)
-                    );
-                }
-            }
-        }
-    }
-
-    /**
-     * Define all messages
-     *
-     * @return array
-     */
-    protected static function defineMessages()
-    {
-        $sAllowArbitraryServerWarn = __(
-            'This %soption%s should be disabled as it allows attackers to '
-            . 'bruteforce login to any MySQL server. If you feel this is necessary, '
-            . 'use %srestrict login to MySQL server%s or %strusted proxies list%s. '
-            . 'However, IP-based protection with trusted proxies list may not be '
-            . 'reliable if your IP belongs to an ISP where thousands of users, '
-            . 'including you, are connected to.'
-        );
-        $sAllowArbitraryServerWarn = sprintf(
-            $sAllowArbitraryServerWarn,
-            '[a@?page=form' . PMA_URL_getCommon(array(), 'html', '&')
-            . '&amp;formset=Features#tab_Security]',
-            '[/a]',
-            '[a@?page=form' . PMA_URL_getCommon(array(), 'html', '&')
-            . '&amp;formset=Features#tab_Security]',
-            '[/a]',
-            '[a@?page=form' . PMA_URL_getCommon(array(), 'html', '&')
-            . '&amp;formset=Features#tab_Security]',
-            '[/a]'
-        );
-        $sBlowfishSecretMsg = __(
-            'You didn\'t have blowfish secret set and have enabled '
-            . '[kbd]cookie[/kbd] authentication, so a key was automatically '
-            . 'generated for you. It is used to encrypt cookies; you don\'t need to '
-            . 'remember it.'
-        );
-        $sBZipDumpWarning = __(
-            '%sBzip2 compression and decompression%s requires functions (%s) which '
-            . 'are unavailable on this system.'
-        );
-        $sBZipDumpWarning = sprintf(
-            $sBZipDumpWarning,
-            '[a@?page=form' . PMA_URL_getCommon(array(), 'html', '&')
-            . '&amp;formset=Features#tab_Import_export]',
-            '[/a]', '%s'
-        );
-        $sDirectoryNotice = __(
-            'This value should be double checked to ensure that this directory is '
-            . 'neither world accessible nor readable or writable by other users on '
-            . 'your server.'
-        );
-        $sGZipDumpWarning = __(
-            '%sGZip compression and decompression%s requires functions (%s) which '
-            . 'are unavailable on this system.'
-        );
-        $sGZipDumpWarning = sprintf(
-            $sGZipDumpWarning,
-            '[a@?page=form' . PMA_URL_getCommon(array(), 'html', '&')
-            . '&amp;formset=Features#tab_Import_export]',
-            '[/a]',
-            '%s'
-        );
-        $sLoginCookieValidityWarn = __(
-            '%sLogin cookie validity%s greater than %ssession.gc_maxlifetime%s may '
-            . 'cause random session invalidation (currently session.gc_maxlifetime '
-            . 'is %d).'
-        );
-        $sLoginCookieValidityWarn = sprintf(
-            $sLoginCookieValidityWarn,
-            '[a@?page=form' . PMA_URL_getCommon(array(), 'html', '&')
-            . '&amp;formset=Features#tab_Security]',
-            '[/a]',
-            '[a@' . PMA_getPHPDocLink(
-                'session.configuration.php#ini.session.gc-maxlifetime'
-            ) . ']',
-            '[/a]',
-            ini_get('session.gc_maxlifetime')
-        );
-        $sLoginCookieValidityWarn2 = __(
-            '%sLogin cookie validity%s should be set to 1800 seconds (30 minutes) '
-            . 'at most. Values larger than 1800 may pose a security risk such as '
-            . 'impersonation.'
-        );
-        $sLoginCookieValidityWarn2 = sprintf(
-            $sLoginCookieValidityWarn2,
-            '[a@?page=form' . PMA_URL_getCommon(array(), 'html', '&')
-            . '&amp;formset=Features#tab_Security]',
-            '[/a]'
-        );
-        $sLoginCookieValidityWarn3 = __(
-            'If using [kbd]cookie[/kbd] authentication and %sLogin cookie store%s '
-            . 'is not 0, %sLogin cookie validity%s must be set to a value less or '
-            . 'equal to it.'
-        );
-        $sLoginCookieValidityWarn3 = sprintf(
-            $sLoginCookieValidityWarn3,
-            '[a@?page=form' . PMA_URL_getCommon(array(), 'html', '&')
-            . '&amp;formset=Features#tab_Security]',
-            '[/a]',
-            '[a@?page=form' . PMA_URL_getCommon(array(), 'html', '&')
-            . '&amp;formset=Features#tab_Security]',
-            '[/a]'
-        );
-        $sSecurityInfoMsg = __(
-            'If you feel this is necessary, use additional protection settings - '
-            . '%shost authentication%s settings and %strusted proxies list%s. '
-            . 'However, IP-based protection may not be reliable if your IP belongs '
-            . 'to an ISP where thousands of users, including you, are connected to.'
-        );
-        $sSecurityInfoMsg = sprintf(
-            $sSecurityInfoMsg,
-            '[a@?page=servers' . PMA_URL_getCommon(array(), 'html', '&')
-            . '&amp;mode=edit&amp;id=%1$d#tab_Server_config]',
-            '[/a]',
-            '[a@?page=form' . PMA_URL_getCommon(array(), 'html', '&')
-            . '&amp;formset=Features#tab_Security]',
-            '[/a]'
-        );
-        $sServerAuthConfigMsg = __(
-            'You set the [kbd]config[/kbd] authentication type and included '
-            . 'username and password for auto-login, which is not a desirable '
-            . 'option for live hosts. Anyone who knows or guesses your phpMyAdmin '
-            . 'URL can directly access your phpMyAdmin panel. Set %sauthentication '
-            . 'type%s to [kbd]cookie[/kbd] or [kbd]http[/kbd].'
-        );
-        $sServerAuthConfigMsg = sprintf(
-            $sServerAuthConfigMsg,
-            '[a@?page=servers' . PMA_URL_getCommon(array(), 'html', '&')
-            . '&amp;mode=edit&amp;id=%1$d#tab_Server]',
-            '[/a]'
-        );
-        $sZipDumpExportWarn = __(
-            '%sZip compression%s requires functions (%s) which are unavailable on '
-            . 'this system.'
-        );
-        $sZipDumpExportWarn = sprintf(
-            $sZipDumpExportWarn,
-            '[a@?page=form' . PMA_URL_getCommon(array(), 'html', '&')
-            . '&amp;formset=Features#tab_Import_export]',
-            '[/a]',
-            '%s'
-        );
-        $sZipDumpImportWarn = __(
-            '%sZip decompression%s requires functions (%s) which are unavailable '
-            . 'on this system.'
-        );
-        $sZipDumpImportWarn = sprintf(
-            $sZipDumpImportWarn,
-            '[a@?page=form' . PMA_URL_getCommon(array(), 'html', '&')
-            . '&amp;formset=Features#tab_Import_export]',
-            '[/a]',
-            '%s'
-        );
-        return array(
-            $sAllowArbitraryServerWarn, $sBlowfishSecretMsg, $sBZipDumpWarning,
-            $sDirectoryNotice, $sGZipDumpWarning,
-            $sLoginCookieValidityWarn, $sLoginCookieValidityWarn2,
-            $sLoginCookieValidityWarn3, $sSecurityInfoMsg, $sServerAuthConfigMsg,
-            $sZipDumpExportWarn, $sZipDumpImportWarn
-        );
-    }
-
-    /**
-     * Check configuration for login cookie
-     *
-     * @param string $sLoginCookieValidityWarn  Warning 1 for login cookie validity
-     * @param string $sLoginCookieValidityWarn2 Warning 2 for login cookie validity
-     * @param string $sLoginCookieValidityWarn3 Warning 3 for login cookie validity
-     *
-     * @return void
-     */
-    protected function performConfigChecksLoginCookie(
-        $sLoginCookieValidityWarn, $sLoginCookieValidityWarn2,
-        $sLoginCookieValidityWarn3
-    ) {
-        //
-        // $cfg['LoginCookieValidity']
-        // value greater than session.gc_maxlifetime will cause
-        // random session invalidation after that time
-        $loginCookieValidity = $this->cfg->getValue('LoginCookieValidity');
-        if ($loginCookieValidity > ini_get('session.gc_maxlifetime')
-        ) {
-            PMA_messagesSet(
-                'error',
-                'LoginCookieValidity',
-                PMA_lang(PMA_langName('LoginCookieValidity')),
-                PMA_lang($sLoginCookieValidityWarn)
-            );
-        }
-
-        //
-        // $cfg['LoginCookieValidity']
-        // should be at most 1800 (30 min)
-        //
-        if ($loginCookieValidity > 1800) {
-            PMA_messagesSet(
-                'notice',
-                'LoginCookieValidity',
-                PMA_lang(PMA_langName('LoginCookieValidity')),
-                PMA_lang($sLoginCookieValidityWarn2)
-            );
-        }
-
-        //
-        // $cfg['LoginCookieValidity']
-        // $cfg['LoginCookieStore']
-        // LoginCookieValidity must be less or equal to LoginCookieStore
-        //
-        if (($this->cfg->getValue('LoginCookieStore') != 0)
-            && ($loginCookieValidity > $this->cfg->getValue('LoginCookieStore'))
-        ) {
-            PMA_messagesSet(
-                'error',
-                'LoginCookieValidity',
-                PMA_lang(PMA_langName('LoginCookieValidity')),
-                PMA_lang($sLoginCookieValidityWarn3)
-            );
-        }
-    }
-
-    /**
-     * Check GZipDump configuration
-     *
-     * @param string $sBZipDumpWarn Warning for BZipDumpWarning
-     *
-     * @return void
-     */
-    protected function performConfigChecksServerBZipdump($sBZipDumpWarn)
-    {
-        //
-        // $cfg['BZipDump']
-        // requires bzip2 functions
-        //
-        if ($this->cfg->getValue('BZipDump')
-            && (!@function_exists('bzopen') || !@function_exists('bzcompress'))
-        ) {
-            $functions = @function_exists('bzopen')
-                ? '' :
-                'bzopen';
-            $functions .= @function_exists('bzcompress')
-                ? ''
-                : ($functions ? ', ' : '') . 'bzcompress';
-            PMA_messagesSet(
-                'error',
-                'BZipDump',
-                PMA_lang(PMA_langName('BZipDump')),
-                PMA_lang($sBZipDumpWarn, $functions)
-            );
-        }
-    }
-
-    /**
-     * Check GZipDump configuration
-     *
-     * @param string $sGZipDumpWarn Warning for GZipDumpWarning
-     *
-     * @return void
-     */
-    protected function performConfigChecksServerGZipdump($sGZipDumpWarn)
-    {
-        //
-        // $cfg['GZipDump']
-        // requires zlib functions
-        //
-        if ($this->cfg->getValue('GZipDump')
-            && (@!function_exists('gzopen') || @!function_exists('gzencode'))
-        ) {
-            PMA_messagesSet(
-                'error',
-                'GZipDump',
-                PMA_lang(PMA_langName('GZipDump')),
-                PMA_lang($sGZipDumpWarn, 'gzencode')
-            );
-        }
-    }
-}
diff --git a/#pma/libraries/config/Validator.php b/#pma/libraries/config/Validator.php
deleted file mode 100644
index faa115e8..00000000
--- a/#pma/libraries/config/Validator.php
+++ /dev/null
@@ -1,599 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Form validation for configuration editor
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries\config;
-
-use PMA\libraries\DatabaseInterface;
-use PMA\libraries\Util;
-
-/**
- * Validation class for various validation functions
- *
- * Validation function takes two argument: id for which it is called
- * and array of fields' values (usually values for entire formset, as defined
- * in forms.inc.php).
- * The function must always return an array with an error (or error array)
- * assigned to a form element (formset name or field path). Even if there are
- * no errors, key must be set with an empty value.
- *
- * Validation functions are assigned in $cfg_db['_validators'] (config.values.php).
- *
- * @package PhpMyAdmin
- */
-class Validator
-{
-    /**
-     * Returns validator list
-     *
-     * @param ConfigFile $cf Config file instance
-     *
-     * @return array
-     */
-    public static function getValidators(ConfigFile $cf)
-    {
-        static $validators = null;
-
-        if ($validators !== null) {
-            return $validators;
-        }
-
-        $validators = $cf->getDbEntry('_validators', array());
-        if (defined('PMA_SETUP')) {
-            return $validators;
-        }
-
-        // not in setup script: load additional validators for user
-        // preferences we need original config values not overwritten
-        // by user preferences, creating a new PMA\libraries\Config instance is a
-        // better idea than hacking into its code
-        $uvs = $cf->getDbEntry('_userValidators', array());
-        foreach ($uvs as $field => $uv_list) {
-            $uv_list = (array)$uv_list;
-            foreach ($uv_list as &$uv) {
-                if (!is_array($uv)) {
-                    continue;
-                }
-                for ($i = 1, $nb = count($uv); $i < $nb; $i++) {
-                    if (mb_substr($uv[$i], 0, 6) == 'value:') {
-                        $uv[$i] = PMA_arrayRead(
-                            mb_substr($uv[$i], 6),
-                            $GLOBALS['PMA_Config']->base_settings
-                        );
-                    }
-                }
-            }
-            $validators[$field] = isset($validators[$field])
-                ? array_merge((array)$validators[$field], $uv_list)
-                : $uv_list;
-        }
-        return $validators;
-    }
-
-    /**
-     * Runs validation $validator_id on values $values and returns error list.
-     *
-     * Return values:
-     * o array, keys - field path or formset id, values - array of errors
-     *   when $isPostSource is true values is an empty array to allow for error list
-     *   cleanup in HTML document
-     * o false - when no validators match name(s) given by $validator_id
-     *
-     * @param ConfigFile   $cf           Config file instance
-     * @param string|array $validator_id ID of validator(s) to run
-     * @param array        &$values      Values to validate
-     * @param bool         $isPostSource tells whether $values are directly from
-     *                                   POST request
-     *
-     * @return bool|array
-     */
-    public static function validate(
-        ConfigFile $cf, $validator_id, &$values, $isPostSource
-    ) {
-        // find validators
-        $validator_id = (array) $validator_id;
-        $validators = static::getValidators($cf);
-        $vids = array();
-        foreach ($validator_id as &$vid) {
-            $vid = $cf->getCanonicalPath($vid);
-            if (isset($validators[$vid])) {
-                $vids[] = $vid;
-            }
-        }
-        if (empty($vids)) {
-            return false;
-        }
-
-        // create argument list with canonical paths and remember path mapping
-        $arguments = array();
-        $key_map = array();
-        foreach ($values as $k => $v) {
-            $k2 = $isPostSource ? str_replace('-', '/', $k) : $k;
-            $k2 = mb_strpos($k2, '/')
-                ? $cf->getCanonicalPath($k2)
-                : $k2;
-            $key_map[$k2] = $k;
-            $arguments[$k2] = $v;
-        }
-
-        // validate
-        $result = array();
-        foreach ($vids as $vid) {
-            // call appropriate validation functions
-            foreach ((array)$validators[$vid] as $validator) {
-                $vdef = (array) $validator;
-                $vname = array_shift($vdef);
-                $vname = 'PMA\libraries\config\Validator::' . $vname;
-                $args = array_merge(array($vid, &$arguments), $vdef);
-                $r = call_user_func_array($vname, $args);
-
-                // merge results
-                if (!is_array($r)) {
-                    continue;
-                }
-
-                foreach ($r as $key => $error_list) {
-                    // skip empty values if $isPostSource is false
-                    if (! $isPostSource && empty($error_list)) {
-                        continue;
-                    }
-                    if (! isset($result[$key])) {
-                        $result[$key] = array();
-                    }
-                    $result[$key] = array_merge(
-                        $result[$key], (array)$error_list
-                    );
-                }
-            }
-        }
-
-        // restore original paths
-        $new_result = array();
-        foreach ($result as $k => $v) {
-            $k2 = isset($key_map[$k]) ? $key_map[$k] : $k;
-            $new_result[$k2] = $v;
-        }
-        return empty($new_result) ? true : $new_result;
-    }
-
-    /**
-     * Test database connection
-     *
-     * @param string $connect_type 'tcp' or 'socket'
-     * @param string $host         host name
-     * @param string $port         tcp port to use
-     * @param string $socket       socket to use
-     * @param string $user         username to use
-     * @param string $pass         password to use
-     * @param string $error_key    key to use in return array
-     *
-     * @return bool|array
-     */
-    public static function testDBConnection(
-        $connect_type,
-        $host,
-        $port,
-        $socket,
-        $user,
-        $pass = null,
-        $error_key = 'Server'
-    ) {
-        //    static::testPHPErrorMsg();
-        $error = null;
-        $host = PMA_sanitizeMySQLHost($host);
-
-        if (DatabaseInterface::checkDbExtension('mysqli')) {
-            $socket = empty($socket) || $connect_type == 'tcp' ? null : $socket;
-            $port = empty($port) || $connect_type == 'socket' ? null : $port;
-            $extension = 'mysqli';
-        } else {
-            $socket = empty($socket) || $connect_type == 'tcp'
-                ? null
-                : ':' . ($socket[0] == '/' ? '' : '/') . $socket;
-            $port = empty($port) || $connect_type == 'socket' ? null : ':' . $port;
-            $extension = 'mysql';
-        }
-
-        if ($extension == 'mysql') {
-            $conn = @mysql_connect($host . $port . $socket, $user, $pass);
-            if (! $conn) {
-                $error = __('Could not connect to the database server!');
-            } else {
-                mysql_close($conn);
-            }
-        } else {
-            $conn = @mysqli_connect($host, $user, $pass, null, $port, $socket);
-            if (! $conn) {
-                $error = __('Could not connect to the database server!');
-            } else {
-                mysqli_close($conn);
-            }
-        }
-        //    static::testPHPErrorMsg(false);
-        if (isset($php_errormsg)) {
-            $error .= " - $php_errormsg";
-        }
-        return is_null($error) ? true : array($error_key => $error);
-    }
-
-    /**
-     * Validate server config
-     *
-     * @param string $path   path to config, not used
-     *                       keep this parameter since the method is invoked using
-     *                       reflection along with other similar methods
-     * @param array  $values config values
-     *
-     * @return array
-     */
-    public static function validateServer($path, $values)
-    {
-        $result = array(
-            'Server' => '',
-            'Servers/1/user' => '',
-            'Servers/1/SignonSession' => '',
-            'Servers/1/SignonURL' => ''
-        );
-        $error = false;
-        if (empty($values['Servers/1/auth_type'])) {
-            $values['Servers/1/auth_type'] = '';
-            $result['Servers/1/auth_type'] = __('Invalid authentication type!');
-            $error = true;
-        }
-        if ($values['Servers/1/auth_type'] == 'config'
-            && empty($values['Servers/1/user'])
-        ) {
-            $result['Servers/1/user'] = __(
-                'Empty username while using [kbd]config[/kbd] authentication method!'
-            );
-            $error = true;
-        }
-        if ($values['Servers/1/auth_type'] == 'signon'
-            && empty($values['Servers/1/SignonSession'])
-        ) {
-            $result['Servers/1/SignonSession'] = __(
-                'Empty signon session name '
-                . 'while using [kbd]signon[/kbd] authentication method!'
-            );
-            $error = true;
-        }
-        if ($values['Servers/1/auth_type'] == 'signon'
-            && empty($values['Servers/1/SignonURL'])
-        ) {
-            $result['Servers/1/SignonURL'] = __(
-                'Empty signon URL while using [kbd]signon[/kbd] authentication '
-                . 'method!'
-            );
-            $error = true;
-        }
-
-        if (! $error && $values['Servers/1/auth_type'] == 'config') {
-            $password = '';
-            if (! empty($values['Servers/1/password'])) {
-                $password = $values['Servers/1/password'];
-            }
-            $test = static::testDBConnection(
-                empty($values['Servers/1/connect_type']) ? '' : $values['Servers/1/connect_type'],
-                empty($values['Servers/1/host']) ? '' : $values['Servers/1/host'],
-                empty($values['Servers/1/port']) ? '' : $values['Servers/1/port'],
-                empty($values['Servers/1/socket']) ? '' : $values['Servers/1/socket'],
-                empty($values['Servers/1/user']) ? '' : $values['Servers/1/user'],
-                $password,
-                'Server'
-            );
-
-            // If failed 'with' password, try 'without' password
-            if ($test !== true
-                && !empty($values['Servers/1/nopassword'])
-                && $values['Servers/1/nopassword']
-            ) {
-                $password = '';
-                $test = static::testDBConnection(
-                    empty($values['Servers/1/connect_type']) ? '' : $values['Servers/1/connect_type'],
-                    empty($values['Servers/1/host']) ? '' : $values['Servers/1/host'],
-                    empty($values['Servers/1/port']) ? '' : $values['Servers/1/port'],
-                    empty($values['Servers/1/socket']) ? '' : $values['Servers/1/socket'],
-                    empty($values['Servers/1/user']) ? '' : $values['Servers/1/user'],
-                    $password,
-                    'Server'
-                );
-            }
-
-            if ($test !== true) {
-                $result = array_merge($result, $test);
-            }
-        }
-        return $result;
-    }
-
-    /**
-     * Validate pmadb config
-     *
-     * @param string $path   path to config, not used
-     *                       keep this parameter since the method is invoked using
-     *                       reflection along with other similar methods
-     * @param array  $values config values
-     *
-     * @return array
-     */
-    public static function validatePMAStorage($path, $values)
-    {
-        $result = array(
-            'Server_pmadb' => '',
-            'Servers/1/controluser' => '',
-            'Servers/1/controlpass' => ''
-        );
-        $error = false;
-
-        if (empty($values['Servers/1/pmadb'])) {
-            return $result;
-        }
-
-        $result = array();
-        if (empty($values['Servers/1/controluser'])) {
-            $result['Servers/1/controluser'] = __(
-                'Empty phpMyAdmin control user while using phpMyAdmin configuration '
-                . 'storage!'
-            );
-            $error = true;
-        }
-        if (empty($values['Servers/1/controlpass'])) {
-            $result['Servers/1/controlpass'] = __(
-                'Empty phpMyAdmin control user password while using phpMyAdmin '
-                . 'configuration storage!'
-            );
-            $error = true;
-        }
-        if (! $error) {
-            $test = static::testDBConnection(
-                empty($values['Servers/1/connect_type']) ? '' : $values['Servers/1/connect_type'],
-                empty($values['Servers/1/host']) ? '' : $values['Servers/1/host'],
-                empty($values['Servers/1/port']) ? '' : $values['Servers/1/port'],
-                empty($values['Servers/1/socket']) ? '' : $values['Servers/1/socket'],
-                empty($values['Servers/1/controluser']) ? '' : $values['Servers/1/controluser'],
-                empty($values['Servers/1/controlpass']) ? '' : $values['Servers/1/controlpass'],
-                'Server_pmadb'
-            );
-            if ($test !== true) {
-                $result = array_merge($result, $test);
-            }
-        }
-        return $result;
-    }
-
-
-    /**
-     * Validates regular expression
-     *
-     * @param string $path   path to config
-     * @param array  $values config values
-     *
-     * @return array
-     */
-    public static function validateRegex($path, $values)
-    {
-        $result = array($path => '');
-
-        if (empty($values[$path])) {
-            return $result;
-        }
-
-        if (function_exists('error_clear_last')) {
-            /* PHP 7 only code */
-            error_clear_last();
-            $last_error = null;
-        } else {
-            // As fallback we trigger another error to ensure
-            // that preg error will be different
-            @strpos();
-            $last_error = error_get_last();
-        }
-
-        $matches = array();
-        // in libraries/ListDatabase.php _checkHideDatabase(),
-        // a '/' is used as the delimiter for hide_db
-        @preg_match('/' . Util::requestString($values[$path]) . '/', '', $matches);
-
-        $current_error = error_get_last();
-
-        if ($current_error !== $last_error) {
-            $error = preg_replace('/^preg_match\(\): /', '', $current_error['message']);
-            return array($path => $error);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Validates TrustedProxies field
-     *
-     * @param string $path   path to config
-     * @param array  $values config values
-     *
-     * @return array
-     */
-    public static function validateTrustedProxies($path, $values)
-    {
-        $result = array($path => array());
-
-        if (empty($values[$path])) {
-            return $result;
-        }
-
-        if (is_array($values[$path]) || is_object($values[$path])) {
-            // value already processed by FormDisplay::save
-            $lines = array();
-            foreach ($values[$path] as $ip => $v) {
-                $v = Util::requestString($v);
-                $lines[] = preg_match('/^-\d+$/', $ip)
-                    ? $v
-                    : $ip . ': ' . $v;
-            }
-        } else {
-            // AJAX validation
-            $lines = explode("\n", $values[$path]);
-        }
-        foreach ($lines as $line) {
-            $line = trim($line);
-            $matches = array();
-            // we catch anything that may (or may not) be an IP
-            if (!preg_match("/^(.+):(?:[ ]?)\\w+$/", $line, $matches)) {
-                $result[$path][] = __('Incorrect value:') . ' '
-                    . htmlspecialchars($line);
-                continue;
-            }
-            // now let's check whether we really have an IP address
-            if (filter_var($matches[1], FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) === false
-                && filter_var($matches[1], FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) === false
-            ) {
-                $ip = htmlspecialchars(trim($matches[1]));
-                $result[$path][] = sprintf(__('Incorrect IP address: %s'), $ip);
-                continue;
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Tests integer value
-     *
-     * @param string $path         path to config
-     * @param array  $values       config values
-     * @param bool   $allow_neg    allow negative values
-     * @param bool   $allow_zero   allow zero
-     * @param int    $max_value    max allowed value
-     * @param string $error_string error message key:
-     *                             $GLOBALS["strConfig$error_lang_key"]
-     *
-     * @return string  empty string if test is successful
-     */
-    public static function validateNumber(
-        $path,
-        $values,
-        $allow_neg,
-        $allow_zero,
-        $max_value,
-        $error_string
-    ) {
-        if (empty($values[$path])) {
-            return '';
-        }
-
-        $value = Util::requestString($values[$path]);
-
-        if (intval($value) != $value
-            || (! $allow_neg && $value < 0)
-            || (! $allow_zero && $value == 0)
-            || $value > $max_value
-        ) {
-            return $error_string;
-        }
-
-        return '';
-    }
-
-    /**
-     * Validates port number
-     *
-     * @param string $path   path to config
-     * @param array  $values config values
-     *
-     * @return array
-     */
-    public static function validatePortNumber($path, $values)
-    {
-        return array(
-            $path => static::validateNumber(
-                $path,
-                $values,
-                false,
-                false,
-                65535,
-                __('Not a valid port number!')
-            )
-        );
-    }
-
-    /**
-     * Validates positive number
-     *
-     * @param string $path   path to config
-     * @param array  $values config values
-     *
-     * @return array
-     */
-    public static function validatePositiveNumber($path, $values)
-    {
-        return array(
-            $path => static::validateNumber(
-                $path,
-                $values,
-                false,
-                false,
-                PHP_INT_MAX,
-                __('Not a positive number!')
-            )
-        );
-    }
-
-    /**
-     * Validates non-negative number
-     *
-     * @param string $path   path to config
-     * @param array  $values config values
-     *
-     * @return array
-     */
-    public static function validateNonNegativeNumber($path, $values)
-    {
-        return array(
-            $path => static::validateNumber(
-                $path,
-                $values,
-                false,
-                true,
-                PHP_INT_MAX,
-                __('Not a non-negative number!')
-            )
-        );
-    }
-
-    /**
-     * Validates value according to given regular expression
-     * Pattern and modifiers must be a valid for PCRE <b>and</b> JavaScript RegExp
-     *
-     * @param string $path   path to config
-     * @param array  $values config values
-     * @param string $regex  regular expression to match
-     *
-     * @return array
-     */
-    public static function validateByRegex($path, $values, $regex)
-    {
-        if (!isset($values[$path])) {
-            return '';
-        }
-        $result = preg_match($regex, Util::requestString($values[$path]));
-        return array($path => ($result ? '' : __('Incorrect value!')));
-    }
-
-    /**
-     * Validates upper bound for numeric inputs
-     *
-     * @param string $path      path to config
-     * @param array  $values    config values
-     * @param int    $max_value maximal allowed value
-     *
-     * @return array
-     */
-    public static function validateUpperBound($path, $values, $max_value)
-    {
-        $result = $values[$path] <= $max_value;
-        return array($path => ($result ? ''
-            : sprintf(__('Value must be equal or lower than %s!'), $max_value)));
-    }
-}
diff --git a/#pma/libraries/config/config_functions.lib.php b/#pma/libraries/config/config_functions.lib.php
deleted file mode 100644
index 74c8cacf..00000000
--- a/#pma/libraries/config/config_functions.lib.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Common config manipulation functions
- *
- * @package PhpMyAdmin
- */
-
-/**
- * Returns sanitized language string, taking into account our special codes
- * for formatting. Takes variable number of arguments.
- * Based on PMA_sanitize from sanitize.lib.php.
- *
- * @param string $lang_key key in $GLOBALS WITHOUT 'strSetup' prefix
- *
- * @return string
- */
-function PMA_lang($lang_key)
-{
-    $message = isset($GLOBALS["strConfig$lang_key"])
-        ? $GLOBALS["strConfig$lang_key"] : $lang_key;
-
-    $message = PMA_sanitize($message);
-
-    if (func_num_args() == 1) {
-        return $message;
-    } else {
-        $args = func_get_args();
-        array_shift($args);
-        return vsprintf($message, $args);
-    }
-}
-
-/**
- * Returns translated field name/description or comment
- *
- * @param string $canonical_path path to handle
- * @param string $type           'name', 'desc' or 'cmt'
- * @param mixed  $default        default value
- *
- * @return string
- */
-function PMA_langName($canonical_path, $type = 'name', $default = 'key')
-{
-    $lang_key = str_replace(
-        array('Servers/1/', '/'),
-        array('Servers/', '_'),
-        $canonical_path
-    ) . '_' . $type;
-    return isset($GLOBALS["strConfig$lang_key"])
-        ? ($type == 'desc' ? PMA_lang($lang_key) : $GLOBALS["strConfig$lang_key"])
-        : ($default == 'key' ? $lang_key : $default);
-}
diff --git a/#pma/libraries/config/messages.inc.php b/#pma/libraries/config/messages.inc.php
deleted file mode 100644
index 418bfdd6..00000000
--- a/#pma/libraries/config/messages.inc.php
+++ /dev/null
@@ -1,995 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Messages for phpMyAdmin.
- *
- * This file defines variables in a special format suited for the
- * configuration subsystem, with $strConfig as a prefix, _desc or _name
- * as a suffix, and the directive name in between.
- *
- * @package PhpMyAdmin
- */
-
-if (!function_exists('__')) {
-    exit();
-}
-
-$strConfigAllowArbitraryServer_desc = __(
-    'If enabled, user can enter any MySQL server in login form for cookie auth.'
-);
-$strConfigAllowArbitraryServer_name = __('Allow login to any MySQL server');
-$strConfigArbitraryServerRegexp_desc = __(
-    'Restricts the MySQL servers the user can enter when a login to an arbitrary '
-    . 'MySQL server is enabled by matching the IP or hostname of the MySQL server ' .
-    'to the given regular expression.'
-);
-$strConfigArbitraryServerRegexp_name = __('Restrict login to MySQL server');
-$strConfigAllowThirdPartyFraming_desc = __(
-    'Enabling this allows a page located on a different domain to call phpMyAdmin '
-    . 'inside a frame, and is a potential [strong]security hole[/strong] allowing '
-    . 'cross-frame scripting (XSS) attacks.'
-);
-$strConfigAllowThirdPartyFraming_name = __('Allow third party framing');
-$strConfigAllowUserDropDatabase_name
-    = __('Show "Drop database" link to normal users');
-$strConfigblowfish_secret_desc = __(
-    'Secret passphrase used for encrypting cookies in [kbd]cookie[/kbd] '
-    . 'authentication.'
-);
-$strConfigblowfish_secret_name = __('Blowfish secret');
-$strConfigBrowseMarkerEnable_desc = __('Highlight selected rows.');
-$strConfigBrowseMarkerEnable_name = __('Row marker');
-$strConfigBrowsePointerEnable_desc = __(
-    'Highlight row pointed by the mouse cursor.'
-);
-$strConfigBrowsePointerEnable_name = __('Highlight pointer');
-$strConfigBZipDump_desc = __(
-    'Enable bzip2 compression for'
-    . ' import operations.'
-);
-$strConfigBZipDump_name = __('Bzip2');
-$strConfigCharEditing_desc = __(
-    'Defines which type of editing controls should be used for CHAR and VARCHAR '
-    . 'columns; [kbd]input[/kbd] - allows limiting of input length, '
-    . '[kbd]textarea[/kbd] - allows newlines in columns.'
-);
-$strConfigCharEditing_name = __('CHAR columns editing');
-$strConfigCodemirrorEnable_desc = __(
-    'Use user-friendly editor for editing SQL queries '
-    . '(CodeMirror) with syntax highlighting and '
-    . 'line numbers.'
-);
-$strConfigCodemirrorEnable_name = __('Enable CodeMirror');
-$strConfigLintEnable_desc = __(
-    'Find any errors in the query before executing it.'
-    . ' Requires CodeMirror to be enabled.'
-);
-$strConfigLintEnable_name = __('Enable linter');
-$strConfigMinSizeForInputField_desc = __(
-    'Defines the minimum size for input fields generated for CHAR and VARCHAR '
-    . 'columns.'
-);
-$strConfigMinSizeForInputField_name = __('Minimum size for input field');
-$strConfigMaxSizeForInputField_desc = __(
-    'Defines the maximum size for input fields generated for CHAR and VARCHAR '
-    . 'columns.'
-);
-$strConfigMaxSizeForInputField_name = __('Maximum size for input field');
-$strConfigCharTextareaCols_desc = __(
-    'Number of columns for CHAR/VARCHAR textareas.'
-);
-$strConfigCharTextareaCols_name = __('CHAR textarea columns');
-$strConfigCharTextareaRows_desc = __('Number of rows for CHAR/VARCHAR textareas.');
-$strConfigCharTextareaRows_name = __('CHAR textarea rows');
-$strConfigCheckConfigurationPermissions_name = __('Check config file permissions');
-$strConfigCompressOnFly_desc = __(
-    'Compress gzip exports on the fly without the need for much memory; if '
-    . 'you encounter problems with created gzip files disable this feature.'
-);
-$strConfigCompressOnFly_name = __('Compress on the fly');
-$strConfigConfigurationFile = __('Configuration file');
-$strConfigConfirm_desc = __(
-    'Whether a warning ("Are your really sure…") should be displayed '
-    . 'when you\'re about to lose data.'
-);
-$strConfigConfirm_name = __('Confirm DROP queries');
-$strConfigDBG_sql_desc = __(
-    'Log SQL queries and their execution time, to be displayed in the console'
-);
-$strConfigDBG_sql_name = __('Debug SQL');
-$strConfigDefaultTabDatabase_desc
-    = __('Tab that is displayed when entering a database.');
-$strConfigDefaultTabDatabase_name = __('Default database tab');
-$strConfigDefaultTabServer_desc = __(
-    'Tab that is displayed when entering a server.'
-);
-$strConfigDefaultTabServer_name = __('Default server tab');
-$strConfigDefaultTabTable_desc = __('Tab that is displayed when entering a table.');
-$strConfigDefaultTabTable_name = __('Default table tab');
-$strConfigEnableAutocompleteForTablesAndColumns_desc = __(
-    'Autocomplete of the table and column names in the SQL queries.'
-);
-$strConfigEnableAutocompleteForTablesAndColumns_name = __(
-    'Enable autocomplete for table and column names'
-);
-$strConfigHideStructureActions_desc
-    = __('Whether the table structure actions should be hidden.');
-$strConfigShowColumnComments_name = __('Show column comments');
-$strConfigShowColumnComments_desc
-    = __('Whether column comments should be shown in table structure view');
-$strConfigHideStructureActions_name = __('Hide table structure actions');
-$strConfigDisplayServersList_desc
-    = __('Show server listing as a list instead of a drop down.');
-$strConfigDisplayServersList_name = __('Display servers as a list');
-$strConfigDisableMultiTableMaintenance_desc = __(
-    'Disable the table maintenance mass operations, like optimizing or repairing '
-    . 'the selected tables of a database.'
-);
-$strConfigDisableMultiTableMaintenance_name = __('Disable multi table maintenance');
-$strConfigExecTimeLimit_desc = __(
-    'Set the number of seconds a script is allowed to run ([kbd]0[/kbd] for no '
-    . 'limit).'
-);
-$strConfigExecTimeLimit_name = __('Maximum execution time');
-$strConfigExport_lock_tables_name = sprintf(
-    __('Use %s statement'), '<code>LOCK TABLES</code>'
-);
-$strConfigExport_asfile_name = __('Save as file');
-$strConfigExport_charset_name = __('Character set of the file');
-$strConfigExport_codegen_format_name = __('Format');
-$strConfigExport_compression_name = __('Compression');
-$strConfigExport_csv_columns_name = __('Put columns names in the first row');
-$strConfigExport_csv_enclosed_name = __('Columns enclosed with');
-$strConfigExport_csv_escaped_name = __('Columns escaped with');
-$strConfigExport_csv_null_name = __('Replace NULL with');
-$strConfigExport_csv_removeCRLF_name = __('Remove CRLF characters within columns');
-$strConfigExport_csv_separator_name = __('Columns terminated with');
-$strConfigExport_csv_terminated_name = __('Lines terminated with');
-$strConfigExport_excel_columns_name = __('Put columns names in the first row');
-$strConfigExport_excel_edition_name = __('Excel edition');
-$strConfigExport_excel_null_name = __('Replace NULL with');
-$strConfigExport_excel_removeCRLF_name = __('Remove CRLF characters within columns');
-$strConfigExport_file_template_database_name = __('Database name template');
-$strConfigExport_file_template_server_name = __('Server name template');
-$strConfigExport_file_template_table_name = __('Table name template');
-$strConfigExport_format_name = __('Format');
-$strConfigExport_htmlword_columns_name = __('Put columns names in the first row');
-$strConfigExport_htmlword_null_name = __('Replace NULL with');
-$strConfigExport_htmlword_structure_or_data_name = __('Dump table');
-$strConfigExport_latex_caption_name = __('Include table caption');
-$strConfigExport_latex_columns_name = __('Put columns names in the first row');
-$strConfigExport_latex_comments_name = __('Comments');
-$strConfigExport_latex_data_caption_name = __('Table caption');
-$strConfigExport_latex_data_continued_caption_name = __('Continued table caption');
-$strConfigExport_latex_data_label_name = __('Label key');
-$strConfigExport_latex_mime_name = __('MIME type');
-$strConfigExport_latex_null_name = __('Replace NULL with');
-$strConfigExport_latex_relation_name = __('Relations');
-$strConfigExport_latex_structure_caption_name = __('Table caption');
-$strConfigExport_latex_structure_continued_caption_name
-    = __('Continued table caption');
-$strConfigExport_latex_structure_label_name = __('Label key');
-$strConfigExport_latex_structure_or_data_name = __('Dump table');
-$strConfigExport_method_name = __('Export method');
-$strConfigExport_ods_columns_name = __('Put columns names in the first row');
-$strConfigExport_ods_null_name = __('Replace NULL with');
-$strConfigExport_odt_columns_name = __('Put columns names in the first row');
-$strConfigExport_odt_comments_name = __('Comments');
-$strConfigExport_odt_mime_name = __('MIME type');
-$strConfigExport_odt_null_name = __('Replace NULL with');
-$strConfigExport_odt_relation_name = __('Relations');
-$strConfigExport_odt_structure_or_data_name = __('Dump table');
-$strConfigExport_onserver_name = __('Save on server');
-$strConfigExport_onserver_overwrite_name = __('Overwrite existing file(s)');
-$strConfigExport_as_separate_files_name = __('Export as separate files');
-$strConfigExport_quick_export_onserver_name = __('Save on server');
-$strConfigExport_quick_export_onserver_overwrite_name
-    = __('Overwrite existing file(s)');
-$strConfigExport_remember_file_template_name = __('Remember file name template');
-$strConfigExport_sql_auto_increment_name = __('Add AUTO_INCREMENT value');
-$strConfigExport_sql_backquotes_name
-    = __('Enclose table and column names with backquotes');
-$strConfigExport_sql_compatibility_name = __('SQL compatibility mode');
-$strConfigExport_sql_dates_name = __('Creation/Update/Check dates');
-$strConfigExport_sql_delayed_name = __('Use delayed inserts');
-$strConfigExport_sql_disable_fk_name = __('Disable foreign key checks');
-$strConfigExport_sql_views_as_tables_name = __('Export views as tables');
-$strConfigExport_sql_metadata_name = __(
-    'Export related metadata from phpMyAdmin configuration storage'
-);
-$strConfigExport_sql_create_database_name = sprintf(__('Add %s'), 'CREATE DATABASE / USE');
-$strConfigExport_sql_drop_database_name = sprintf(__('Add %s'), 'DROP DATABASE');
-$strConfigExport_sql_drop_table_name = sprintf(
-    __('Add %s'), 'DROP TABLE / VIEW / PROCEDURE / FUNCTION / EVENT / TRIGGER'
-);
-$strConfigExport_sql_create_table_name = sprintf(__('Add %s'), 'CREATE TABLE');
-$strConfigExport_sql_create_view_name = sprintf(__('Add %s'), 'CREATE VIEW');
-$strConfigExport_sql_create_trigger_name
-    = sprintf(__('Add %s'), 'CREATE TRIGGER');
-$strConfigExport_sql_hex_for_binary_name = __('Use hexadecimal for BINARY & BLOB');
-$strConfigExport_sql_if_not_exists_name = __(
-    'Add IF NOT EXISTS (less efficient as indexes will be generated during'
-    . ' table creation)'
-);
-$strConfigExport_sql_ignore_name = __('Use ignore inserts');
-$strConfigExport_sql_include_comments_name = __('Comments');
-$strConfigExport_sql_insert_syntax_name = __('Syntax to use when inserting data');
-$strConfigExport_sql_max_query_size_name = __('Maximal length of created query');
-$strConfigExport_sql_mime_name = __('MIME type');
-$strConfigExport_sql_procedure_function_name
-    = sprintf(__('Add %s'), 'CREATE PROCEDURE / FUNCTION / EVENT');
-$strConfigExport_sql_relation_name = __('Relations');
-$strConfigExport_sql_structure_or_data_name = __('Dump table');
-$strConfigExport_sql_type_name = __('Export type');
-$strConfigExport_sql_use_transaction_name = __('Enclose export in a transaction');
-$strConfigExport_sql_utc_time_name = __('Export time in UTC');
-$strConfigExport_texytext_columns_name = __('Put columns names in the first row');
-$strConfigExport_texytext_null_name = __('Replace NULL with');
-$strConfigExport_texytext_structure_or_data_name = __('Dump table');
-$strConfigExport_xls_columns_name = __('Put columns names in the first row');
-$strConfigExport_xls_null_name = __('Replace NULL with');
-$strConfigExport_xlsx_columns_name = __('Put columns names in the first row');
-$strConfigExport_xlsx_null_name = __('Replace NULL with');
-$strConfigForeignKeyDropdownOrder_desc = __(
-    'Sort order for items in a foreign-key dropdown box; [kbd]content[/kbd] is '
-    . 'the referenced data, [kbd]id[/kbd] is the key value.'
-);
-$strConfigForeignKeyDropdownOrder_name = __('Foreign key dropdown order');
-$strConfigForeignKeyMaxLimit_desc
-    = __('A dropdown will be used if fewer items are present.');
-$strConfigForeignKeyMaxLimit_name = __('Foreign key limit');
-$strConfigDefaultForeignKeyChecks_desc = __(
-    'Default value for foreign key checks checkbox for some queries.'
-);
-$strConfigDefaultForeignKeyChecks_name = __('Foreign key checks');
-$strConfigForm_Browse = __('Browse mode');
-$strConfigForm_Browse_desc = __('Customize browse mode.');
-$strConfigForm_CodeGen = 'CodeGen';
-$strConfigForm_CodeGen_desc = __('Customize default options.');
-$strConfigForm_Csv = __('CSV');
-$strConfigForm_Csv_desc = __('Customize default options.');
-$strConfigForm_Developer = __('Developer');
-$strConfigForm_Developer_desc = __('Settings for phpMyAdmin developers.');
-$strConfigForm_Edit = __('Edit mode');
-$strConfigForm_Edit_desc = __('Customize edit mode.');
-$strConfigForm_Export = __('Export');
-$strConfigForm_Export_defaults = __('Export defaults');
-$strConfigForm_Export_defaults_desc = __('Customize default export options.');
-$strConfigForm_Features = __('Features');
-$strConfigForm_General = __('General');
-$strConfigForm_General_desc = __('Set some commonly used options.');
-$strConfigForm_Import = __('Import');
-$strConfigForm_Import_defaults = __('Import defaults');
-$strConfigForm_Import_defaults_desc = __('Customize default common import options.');
-$strConfigForm_Import_export = __('Import / export');
-$strConfigForm_Import_export_desc
-    = __('Set import and export directories and compression options.');
-$strConfigForm_Latex = __('LaTeX');
-$strConfigForm_Latex_desc = __('Customize default options.');
-$strConfigForm_Navi_databases = __('Databases');
-$strConfigForm_Navi_databases_desc = __('Databases display options.');
-$strConfigForm_Navi_panel = __('Navigation panel');
-$strConfigForm_Navi_panel_desc = __('Customize appearance of the navigation panel.');
-$strConfigForm_Navi_tree = __('Navigation tree');
-$strConfigForm_Navi_tree_desc = __('Customize the navigation tree.');
-$strConfigForm_Navi_servers = __('Servers');
-$strConfigForm_Navi_servers_desc = __('Servers display options.');
-$strConfigForm_Navi_tables = __('Tables');
-$strConfigForm_Navi_tables_desc = __('Tables display options.');
-$strConfigForm_Main_panel = __('Main panel');
-$strConfigForm_Microsoft_Office = __('Microsoft Office');
-$strConfigForm_Microsoft_Office_desc = __('Customize default options.');
-$strConfigForm_Open_Document = 'OpenDocument';
-$strConfigForm_Open_Document_desc = __('Customize default options.');
-$strConfigForm_Other_core_settings = __('Other core settings');
-$strConfigForm_Other_core_settings_desc
-    = __('Settings that didn\'t fit anywhere else.');
-$strConfigForm_Page_titles = __('Page titles');
-$strConfigForm_Page_titles_desc = __(
-    'Specify browser\'s title bar text. Refer to '
-    . '[doc@faq6-27]documentation[/doc] for magic strings that can be used '
-    . 'to get special values.'
-);
-$strConfigForm_Security = __('Security');
-$strConfigForm_Security_desc = __(
-    'Please note that phpMyAdmin is just a user interface and its features do not '
-    . 'limit MySQL.'
-);
-$strConfigForm_Server = __('Basic settings');
-$strConfigForm_Server_auth = __('Authentication');
-$strConfigForm_Server_auth_desc = __('Authentication settings.');
-$strConfigForm_Server_config = __('Server configuration');
-$strConfigForm_Server_config_desc = __(
-    'Advanced server configuration, do not change these options unless you know '
-    . 'what they are for.'
-);
-$strConfigForm_Server_desc = __('Enter server connection parameters.');
-$strConfigForm_Server_pmadb = __('Configuration storage');
-$strConfigForm_Server_pmadb_desc = __(
-    'Configure phpMyAdmin configuration storage to gain access to additional '
-    . 'features, see [doc@linked-tables]phpMyAdmin configuration storage[/doc] in '
-    . 'documentation.'
-);
-$strConfigForm_Server_tracking = __('Changes tracking');
-$strConfigForm_Server_tracking_desc = __(
-    'Tracking of changes made in database. Requires the phpMyAdmin configuration '
-    . 'storage.'
-);
-$strConfigFormset_Export = __('Customize export options');
-$strConfigFormset_Features = __('Features');
-$strConfigFormset_Import = __('Customize import defaults');
-$strConfigFormset_Navi_panel = __('Customize navigation panel');
-$strConfigFormset_Main_panel = __('Customize main panel');
-$strConfigFormset_Sql_queries = __('SQL queries');
-$strConfigForm_Sql = __('SQL');
-$strConfigForm_Sql_box = __('SQL Query box');
-$strConfigForm_Sql_box_desc = __('Customize links shown in SQL Query boxes.');
-$strConfigForm_Sql_desc = __('Customize default options.');
-$strConfigForm_Sql_queries = __('SQL queries');
-$strConfigForm_Sql_queries_desc = __('SQL queries settings.');
-$strConfigForm_Startup = __('Startup');
-$strConfigForm_Startup_desc = __('Customize startup page.');
-$strConfigForm_DbStructure = __('Database structure');
-$strConfigForm_DbStructure_desc
-    = __('Choose which details to show in the database structure (list of tables).');
-$strConfigForm_TableStructure = __('Table structure');
-$strConfigForm_TableStructure_desc
-    = __('Settings for the table structure (list of columns).');
-$strConfigForm_Tabs = __('Tabs');
-$strConfigForm_Tabs_desc = __('Choose how you want tabs to work.');
-$strConfigForm_DisplayRelationalSchema = __('Display relational schema');
-$strConfigForm_DisplayRelationalSchema_desc = '';
-$strConfigPDFDefaultPageSize_name = __('Paper size');
-$strConfigPDFDefaultPageSize_desc = '';
-$strConfigForm_Databases = __('Databases');
-$strConfigForm_Text_fields = __('Text fields');
-$strConfigForm_Text_fields_desc = __('Customize text input fields.');
-$strConfigForm_Texy = __('Texy! text');
-$strConfigForm_Texy_desc = __('Customize default options');
-$strConfigForm_Warnings = __('Warnings');
-$strConfigForm_Warnings_desc
-    = __('Disable some of the warnings shown by phpMyAdmin.');
-$strConfigGZipDump_desc = __(
-    'Enable gzip compression for import '
-    . 'and export operations.'
-);
-$strConfigGZipDump_name = __('GZip');
-$strConfigIconvExtraParams_name = __('Extra parameters for iconv');
-$strConfigIgnoreMultiSubmitErrors_desc = __(
-    'If enabled, phpMyAdmin continues computing multiple-statement queries even if '
-    . 'one of the queries failed.'
-);
-$strConfigIgnoreMultiSubmitErrors_name = __('Ignore multiple statement errors');
-$strConfigImport_allow_interrupt_desc = __(
-    'Allow interrupt of import in case script detects it is close to time limit. '
-    . 'This might be a good way to import large files, however it can break '
-    . 'transactions.'
-);
-$strConfigImport_allow_interrupt_name = __('Partial import: allow interrupt');
-$strConfigImport_charset_name = __('Character set of the file');
-$strConfigImport_csv_col_names_name = __('Lines terminated with');
-$strConfigImport_csv_enclosed_name = __('Columns enclosed with');
-$strConfigImport_csv_escaped_name = __('Columns escaped with');
-$strConfigImport_csv_ignore_name = __('Do not abort on INSERT error');
-$strConfigImport_csv_replace_name = __('Add ON DUPLICATE KEY UPDATE');
-$strConfigImport_csv_replace_desc = __(
-    'Update data when duplicate keys found on import'
-);
-$strConfigImport_csv_terminated_name = __('Columns terminated with');
-$strConfigImport_format_desc = __(
-    'Default format; be aware that this list depends on location (database, table) '
-    . 'and only SQL is always available.'
-);
-$strConfigImport_format_name = __('Format of imported file');
-$strConfigImport_ldi_enclosed_name = __('Columns enclosed with');
-$strConfigImport_ldi_escaped_name = __('Columns escaped with');
-$strConfigImport_ldi_ignore_name = __('Do not abort on INSERT error');
-$strConfigImport_ldi_local_option_name = __('Use LOCAL keyword');
-$strConfigImport_ldi_replace_name = __('Add ON DUPLICATE KEY UPDATE');
-$strConfigImport_ldi_replace_desc = __(
-    'Update data when duplicate keys found on import'
-);
-$strConfigImport_ldi_terminated_name = __('Columns terminated with');
-$strConfigImport_ods_col_names_name = __('Column names in first row');
-$strConfigImport_ods_empty_rows_name = __('Do not import empty rows');
-$strConfigImport_ods_recognize_currency_name
-    = __('Import currencies ($5.00 to 5.00)');
-$strConfigImport_ods_recognize_percentages_name
-    = __('Import percentages as proper decimals (12.00% to .12)');
-$strConfigImport_skip_queries_desc = __('Number of queries to skip from start.');
-$strConfigImport_skip_queries_name = __('Partial import: skip queries');
-$strConfigImport_sql_compatibility_name = __('SQL compatibility mode');
-$strConfigImport_sql_no_auto_value_on_zero_name
-    = __('Do not use AUTO_INCREMENT for zero values');
-$strConfigImport_sql_read_as_multibytes_name = __('Read as multibytes');
-$strConfigImport_xls_col_names_name = __('Column names in first row');
-$strConfigImport_xlsx_col_names_name = __('Column names in first row');
-$strConfigInitialSlidersState_name = __('Initial state for sliders');
-$strConfigInsertRows_desc = __('How many rows can be inserted at one time.');
-$strConfigInsertRows_name = __('Number of inserted rows');
-$strConfigLimitChars_desc = __(
-    'Maximum number of characters shown in any non-numeric column on browse view.'
-);
-$strConfigLimitChars_name = __('Limit column characters');
-$strConfigLoginCookieDeleteAll_desc = __(
-    'If TRUE, logout deletes cookies for all servers; when set to FALSE, logout '
-    . 'only occurs for the current server. Setting this to FALSE makes it easy to '
-    . 'forget to log out from other servers when connected to multiple servers.'
-);
-$strConfigLoginCookieDeleteAll_name = __('Delete all cookies on logout');
-$strConfigLoginCookieRecall_desc = __(
-    'Define whether the previous login should be recalled or not in '
-    . '[kbd]cookie[/kbd] authentication mode.'
-);
-$strConfigLoginCookieRecall_name = __('Recall user name');
-$strConfigLoginCookieStore_desc = __(
-    'Defines how long (in seconds) a login cookie should be stored in browser. '
-    . 'The default of 0 means that it will be kept for the existing session only, '
-    . 'and will be deleted as soon as you close the browser window. This is '
-    . 'recommended for non-trusted environments.'
-);
-$strConfigLoginCookieStore_name = __('Login cookie store');
-$strConfigLoginCookieValidity_desc
-    = __('Define how long (in seconds) a login cookie is valid.');
-$strConfigLoginCookieValidity_name = __('Login cookie validity');
-$strConfigLongtextDoubleTextarea_desc
-    = __('Double size of textarea for LONGTEXT columns.');
-$strConfigLongtextDoubleTextarea_name = __('Bigger textarea for LONGTEXT');
-$strConfigMaxCharactersInDisplayedSQL_desc
-    = __('Maximum number of characters used when a SQL query is displayed.');
-$strConfigMaxCharactersInDisplayedSQL_name = __('Maximum displayed SQL length');
-$strConfigMaxDbList_cmt = __('Users cannot set a higher value');
-$strConfigMaxDbList_desc
-    = __('Maximum number of databases displayed in database list.');
-$strConfigMaxDbList_name = __('Maximum databases');
-$strConfigFirstLevelNavigationItems_desc = __(
-    'The number of items that can be displayed on each page on the first level'
-    . ' of the navigation tree.'
-);
-$strConfigFirstLevelNavigationItems_name = __('Maximum items on first level');
-$strConfigMaxNavigationItems_desc = __(
-    'The number of items that can be displayed on each page of the navigation tree.'
-);
-$strConfigMaxNavigationItems_name = __('Maximum items in branch');
-$strConfigMaxRows_desc = __(
-    'Number of rows displayed when browsing a result set. If the result set '
-    . 'contains more rows, "Previous" and "Next" links will be '
-    . 'shown.'
-);
-$strConfigMaxRows_name = __('Maximum number of rows to display');
-$strConfigMaxTableList_cmt = __('Users cannot set a higher value');
-$strConfigMaxTableList_desc = __(
-    'Maximum number of tables displayed in table list.'
-);
-$strConfigMaxTableList_name = __('Maximum tables');
-$strConfigMemoryLimit_desc = __(
-    'The number of bytes a script is allowed to allocate, eg. [kbd]32M[/kbd] '
-    . '([kbd]-1[/kbd] for no limit and [kbd]0[/kbd] for no change).'
-);
-$strConfigMemoryLimit_name = __('Memory limit');
-$strConfigShowDatabasesNavigationAsTree_desc = __(
-    'In the navigation panel, replaces the database tree with a selector'
-);
-$strConfigShowDatabasesNavigationAsTree_name = __(
-    'Show databases navigation as tree'
-);
-$strConfigNavigationLinkWithMainPanel_desc = __(
-    'Link with main panel by highlighting the current database or table.'
-);
-$strConfigNavigationLinkWithMainPanel_name = __('Link with main panel');
-$strConfigNavigationDisplayLogo_desc = __('Show logo in navigation panel.');
-$strConfigNavigationDisplayLogo_name = __('Display logo');
-$strConfigNavigationLogoLink_desc
-    = __('URL where logo in the navigation panel will point to.');
-$strConfigNavigationLogoLink_name = __('Logo link URL');
-$strConfigNavigationLogoLinkWindow_desc = __(
-    'Open the linked page in the main window ([kbd]main[/kbd]) or in a new one '
-    . '([kbd]new[/kbd]).'
-);
-$strConfigNavigationLogoLinkWindow_name = __('Logo link target');
-$strConfigNavigationDisplayServers_desc
-    = __('Display server choice at the top of the navigation panel.');
-$strConfigNavigationDisplayServers_name = __('Display servers selection');
-$strConfigNavigationTreeDefaultTabTable_name = __('Target for quick access icon');
-$strConfigNavigationTreeDefaultTabTable2_name = __(
-    'Target for second quick access icon'
-);
-$strConfigNavigationTreeDisplayItemFilterMinimum_desc = __(
-    'Defines the minimum number of items (tables, views, routines and events) to '
-    . 'display a filter box.'
-);
-$strConfigNavigationTreeDisplayItemFilterMinimum_name
-    = __('Minimum number of items to display the filter box');
-$strConfigNavigationTreeDisplayDbFilterMinimum_name
-    = __('Minimum number of databases to display the database filter box');
-$strConfigNavigationTreeEnableGrouping_desc = __(
-    'Group items in the navigation tree (determined by the separator defined in ' .
-    'the Databases and Tables tabs above).'
-);
-$strConfigNavigationTreeEnableGrouping_name = __('Group items in the tree');
-$strConfigNavigationTreeDbSeparator_desc
-    = __('String that separates databases into different tree levels.');
-$strConfigNavigationTreeDbSeparator_name = __('Database tree separator');
-$strConfigNavigationTreeTableSeparator_desc
-    = __('String that separates tables into different tree levels.');
-$strConfigNavigationTreeTableSeparator_name = __('Table tree separator');
-$strConfigNavigationTreeTableLevel_name = __('Maximum table tree depth');
-$strConfigNavigationTreePointerEnable_desc
-    = __('Highlight server under the mouse cursor.');
-$strConfigNavigationTreePointerEnable_name = __('Enable highlighting');
-$strConfigNavigationTreeEnableExpansion_desc = __(
-    'Whether to offer the possibility of tree expansion in the navigation panel.'
-);
-$strConfigNavigationTreeEnableExpansion_name
-    = __('Enable navigation tree expansion');
-$strConfigNavigationTreeShowTables_name = __('Show tables in tree');
-$strConfigNavigationTreeShowTables_desc
-    = __('Whether to show tables under database in the navigation tree');
-$strConfigNavigationTreeShowViews_name = __('Show views in tree');
-$strConfigNavigationTreeShowViews_desc
-    = __('Whether to show views under database in the navigation tree');
-$strConfigNavigationTreeShowFunctions_name = __('Show functions in tree');
-$strConfigNavigationTreeShowFunctions_desc
-    = __('Whether to show functions under database in the navigation tree');
-$strConfigNavigationTreeShowProcedures_name = __('Show procedures in tree');
-$strConfigNavigationTreeShowProcedures_desc
-    = __('Whether to show procedures under database in the navigation tree');
-$strConfigNavigationTreeShowEvents_name = __('Show events in tree');
-$strConfigNavigationTreeShowEvents_desc
-    = __('Whether to show events under database in the navigation tree');
-$strConfigNumRecentTables_desc
-    = __('Maximum number of recently used tables; set 0 to disable.');
-$strConfigNumFavoriteTables_desc
-    = __('Maximum number of favorite tables; set 0 to disable.');
-$strConfigNumRecentTables_name = __('Recently used tables');
-$strConfigNumFavoriteTables_name = __('Favorite tables');
-$strConfigRowActionLinks_desc = __('These are Edit, Copy and Delete links.');
-$strConfigRowActionLinks_name = __('Where to show the table row links');
-$strConfigRowActionLinksWithoutUnique_desc = __(
-    'Whether to show row links even in the absence of a unique key.'
-);
-$strConfigRowActionLinksWithoutUnique_name = __('Show row links anyway');
-$strConfigNaturalOrder_desc
-    = __('Use natural order for sorting table and database names.');
-$strConfigNaturalOrder_name = __('Natural order');
-$strConfigTableNavigationLinksMode_desc = __('Use only icons, only text or both.');
-$strConfigTableNavigationLinksMode_name = __('Table navigation bar');
-$strConfigOBGzip_desc
-    = __('Use GZip output buffering for increased speed in HTTP transfers.');
-$strConfigOBGzip_name = __('GZip output buffering');
-$strConfigOrder_desc = __(
-    '[kbd]SMART[/kbd] - i.e. descending order for columns of type TIME, DATE, '
-    . 'DATETIME and TIMESTAMP, ascending order otherwise.'
-);
-$strConfigOrder_name = __('Default sorting order');
-$strConfigPersistentConnections_desc
-    = __('Use persistent connections to MySQL databases.');
-$strConfigPersistentConnections_name = __('Persistent connections');
-$strConfigPmaNoRelation_DisableWarning_desc = __(
-    'Disable the default warning that is displayed on the database details '
-    . 'Structure page if any of the required tables for the phpMyAdmin '
-    . 'configuration storage could not be found.'
-);
-$strConfigPmaNoRelation_DisableWarning_name
-    = __('Missing phpMyAdmin configuration storage tables');
-$strConfigServerLibraryDifference_DisableWarning_desc = __(
-    'Disable the default warning that is displayed if a difference between the '
-    . 'MySQL library and server is detected.'
-);
-$strConfigServerLibraryDifference_DisableWarning_name
-    = __('Server/library difference warning');
-$strConfigReservedWordDisableWarning_desc = __(
-    'Disable the default warning that is displayed on the Structure page if column '
-    . 'names in a table are reserved MySQL words.'
-);
-$strConfigReservedWordDisableWarning_name = __('MySQL reserved word warning');
-$strConfigTabsMode_desc = __('Use only icons, only text or both.');
-$strConfigTabsMode_name = __('How to display the menu tabs');
-$strConfigActionLinksMode_desc = __('Use only icons, only text or both.');
-$strConfigActionLinksMode_name = __('How to display various action links');
-$strConfigProtectBinary_desc = __('Disallow BLOB and BINARY columns from editing.');
-$strConfigProtectBinary_name = __('Protect binary columns');
-$strConfigQueryHistoryDB_desc = __(
-    'Enable if you want DB-based query history (requires phpMyAdmin configuration '
-    . 'storage). If disabled, this utilizes JS-routines to display query history '
-    . '(lost by window close).'
-);
-$strConfigQueryHistoryDB_name = __('Permanent query history');
-$strConfigQueryHistoryMax_cmt = __('Users cannot set a higher value');
-$strConfigQueryHistoryMax_desc = __('How many queries are kept in history.');
-$strConfigQueryHistoryMax_name = __('Query history length');
-$strConfigRecodingEngine_desc
-    = __('Select which functions will be used for character set conversion.');
-$strConfigRecodingEngine_name = __('Recoding engine');
-$strConfigRememberSorting_desc
-    = __('When browsing tables, the sorting of each table is remembered.');
-$strConfigRememberSorting_name = __('Remember table\'s sorting');
-$strConfigTablePrimaryKeyOrder_desc = __(
-    'Default sort order for tables with a primary key.'
-);
-$strConfigTablePrimaryKeyOrder_name = __('Primary key default sort order');
-$strConfigRepeatCells_desc
-    = __('Repeat the headers every X cells, [kbd]0[/kbd] deactivates this feature.');
-$strConfigRepeatCells_name = __('Repeat headers');
-$strConfigRestoreDefaultValue = __('Restore default value');
-$strConfigGridEditing_name = __('Grid editing: trigger action');
-$strConfigRelationalDisplay_name = __('Relational display');
-$strConfigRelationalDisplay_desc = __('For display Options');
-$strConfigSaveCellsAtOnce_name = __('Grid editing: save all edited cells at once');
-$strConfigSaveDir_desc = __('Directory where exports can be saved on server.');
-$strConfigSaveDir_name = __('Save directory');
-$strConfigServers_AllowDeny_order_desc = __('Leave blank if not used.');
-$strConfigServers_AllowDeny_order_name = __('Host authorization order');
-$strConfigServers_AllowDeny_rules_desc = __('Leave blank for defaults.');
-$strConfigServers_AllowDeny_rules_name = __('Host authorization rules');
-$strConfigServers_AllowNoPassword_name = __('Allow logins without a password');
-$strConfigServers_AllowRoot_name = __('Allow root login');
-$strConfigServers_SessionTimeZone_name = __('Session timezone');
-$strConfigServers_SessionTimeZone_desc = __(
-    'Sets the effective timezone; possibly different than the one from your ' .
-    'database server'
-);
-$strConfigServers_auth_http_realm_desc
-    = __('HTTP Basic Auth Realm name to display when doing HTTP Auth.');
-$strConfigServers_auth_http_realm_name = __('HTTP Realm');
-$strConfigServers_auth_type_desc = __('Authentication method to use.');
-$strConfigServers_auth_type_name = __('Authentication type');
-$strConfigServers_bookmarktable_desc = __(
-    'Leave blank for no [doc@bookmarks@]bookmark[/doc] '
-    . 'support, suggested: [kbd]pma__bookmark[/kbd]'
-);
-$strConfigServers_bookmarktable_name = __('Bookmark table');
-$strConfigServers_column_info_desc = __(
-    'Leave blank for no column comments/mime types, suggested: '
-    . '[kbd]pma__column_info[/kbd].'
-);
-$strConfigServers_column_info_name = __('Column information table');
-$strConfigServers_compress_desc = __('Compress connection to MySQL server.');
-$strConfigServers_compress_name = __('Compress connection');
-$strConfigServers_connect_type_desc
-    = __('How to connect to server, keep [kbd]tcp[/kbd] if unsure.');
-$strConfigServers_connect_type_name = __('Connection type');
-$strConfigServers_controlpass_name = __('Control user password');
-$strConfigServers_controluser_desc = __(
-    'A special MySQL user configured with limited permissions, more information '
-    . 'available on [doc@linked-tables]documentation[/doc].'
-);
-$strConfigServers_controluser_name = __('Control user');
-$strConfigServers_controlhost_desc = __(
-    'An alternate host to hold the configuration storage; leave blank to use the '
-    . 'already defined host.'
-);
-$strConfigServers_controlhost_name = __('Control host');
-$strConfigServers_controlport_desc = __(
-    'An alternate port to connect to the host that holds the configuration storage; '
-    . 'leave blank to use the default port, or the already defined port, if the '
-    . 'controlhost equals host.'
-);
-$strConfigServers_controlport_name = __('Control port');
-$strConfigServers_hide_db_desc
-    = __('Hide databases matching regular expression (PCRE).');
-$strConfigServers_DisableIS_desc = __(
-    'More information on [a@https://sourceforge.net/p/phpmyadmin/bugs/2606/]PMA ' .
-    'bug tracker[/a] and [a@https://bugs.mysql.com/19588]MySQL Bugs[/a]'
-);
-$strConfigServers_DisableIS_name = __('Disable use of INFORMATION_SCHEMA');
-$strConfigServers_hide_db_name = __('Hide databases');
-$strConfigServers_history_desc = __(
-    'Leave blank for no SQL query history support, suggested: '
-    . '[kbd]pma__history[/kbd].'
-);
-$strConfigServers_history_name = __('SQL query history table');
-$strConfigServers_host_desc = __('Hostname where MySQL server is running.');
-$strConfigServers_host_name = __('Server hostname');
-$strConfigServers_LogoutURL_name = __('Logout URL');
-$strConfigServers_MaxTableUiprefs_desc = __(
-    'Limits number of table preferences which are stored in database, the oldest '
-    . 'records are automatically removed.'
-);
-$strConfigServers_MaxTableUiprefs_name
-    = __('Maximal number of table preferences to store');
-$strConfigServers_savedsearches_name = __('QBE saved searches table');
-$strConfigServers_savedsearches_desc = __(
-    'Leave blank for no QBE saved searches support, suggested: '
-    . '[kbd]pma__savedsearches[/kbd].'
-);
-$strConfigServers_export_templates_name = __('Export templates table');
-$strConfigServers_export_templates_desc = __(
-    'Leave blank for no export template support, suggested: '
-    . '[kbd]pma__export_templates[/kbd].'
-);
-$strConfigServers_central_columns_name = __('Central columns table');
-$strConfigServers_central_columns_desc = __(
-    'Leave blank for no central columns support, suggested: '
-    . '[kbd]pma__central_columns[/kbd].'
-);
-$strConfigServers_nopassword_desc = __('Try to connect without password.');
-$strConfigServers_nopassword_name = __('Connect without password');
-$strConfigServers_only_db_desc = __(
-    'You can use MySQL wildcard characters (% and _), escape them if you want to '
-    . 'use their literal instances, i.e. use [kbd]\'my\_db\'[/kbd] and not '
-    . '[kbd]\'my_db\'[/kbd].'
-);
-$strConfigServers_only_db_name = __('Show only listed databases');
-$strConfigServers_password_desc = __('Leave empty if not using config auth.');
-$strConfigServers_password_name = __('Password for config auth');
-$strConfigServers_pdf_pages_desc = __(
-    'Leave blank for no PDF schema support, suggested: [kbd]pma__pdf_pages[/kbd].'
-);
-$strConfigServers_pdf_pages_name = __('PDF schema: pages table');
-$strConfigServers_pmadb_desc = __(
-    'Database used for relations, bookmarks, and PDF features. See '
-    . '[doc@linked-tables]pmadb[/doc] for complete information. '
-    . 'Leave blank for no support. Suggested: [kbd]phpmyadmin[/kbd].'
-);
-$strConfigServers_pmadb_name = __('Database name');
-$strConfigServers_port_desc
-    = __('Port on which MySQL server is listening, leave empty for default.');
-$strConfigServers_port_name = __('Server port');
-$strConfigServers_recent_desc = __(
-    'Leave blank for no "persistent" recently used tables across sessions, '
-    . 'suggested: [kbd]pma__recent[/kbd].'
-);
-$strConfigServers_recent_name = __('Recently used table');
-$strConfigServers_favorite_desc = __(
-    'Leave blank for no "persistent" favorite tables across sessions, '
-    . 'suggested: [kbd]pma__favorite[/kbd].'
-);
-$strConfigServers_favorite_name = __('Favorites table');
-$strConfigServers_relation_desc = __(
-    'Leave blank for no '
-    . '[doc@relations@]relation-links[/doc] support, '
-    . 'suggested: [kbd]pma__relation[/kbd].'
-);
-$strConfigServers_relation_name = __('Relation table');
-$strConfigServers_SignonSession_desc = __(
-    'See [doc@authentication-modes]authentication '
-    . 'types[/doc] for an example.'
-);
-$strConfigServers_SignonSession_name = __('Signon session name');
-$strConfigServers_SignonURL_name = __('Signon URL');
-$strConfigServers_socket_desc
-    = __('Socket on which MySQL server is listening, leave empty for default.');
-$strConfigServers_socket_name = __('Server socket');
-$strConfigServers_ssl_desc = __('Enable SSL for connection to MySQL server.');
-$strConfigServers_ssl_name = __('Use SSL');
-$strConfigServers_table_coords_desc = __(
-    'Leave blank for no PDF schema support, suggested: [kbd]pma__table_coords[/kbd].'
-);
-$strConfigServers_table_coords_name = __(
-    'Designer and PDF schema: table coordinates'
-);
-$strConfigServers_table_info_desc = __(
-    'Table to describe the display columns, leave blank for no support; '
-    . 'suggested: [kbd]pma__table_info[/kbd].'
-);
-$strConfigServers_table_info_name = __('Display columns table');
-$strConfigServers_table_uiprefs_desc = __(
-    'Leave blank for no "persistent" tables\' UI preferences across sessions, '
-    . 'suggested: [kbd]pma__table_uiprefs[/kbd].'
-);
-$strConfigServers_table_uiprefs_name = __('UI preferences table');
-$strConfigServers_tracking_add_drop_database_desc = __(
-    'Whether a DROP DATABASE IF EXISTS statement will be added as first line to '
-    . 'the log when creating a database.'
-);
-$strConfigServers_tracking_add_drop_database_name = __('Add DROP DATABASE');
-$strConfigServers_tracking_add_drop_table_desc = __(
-    'Whether a DROP TABLE IF EXISTS statement will be added as first line to the '
-    . 'log when creating a table.'
-);
-$strConfigServers_tracking_add_drop_table_name = __('Add DROP TABLE');
-$strConfigServers_tracking_add_drop_view_desc = __(
-    'Whether a DROP VIEW IF EXISTS statement will be added as first line to the '
-    . 'log when creating a view.'
-);
-$strConfigServers_tracking_add_drop_view_name = __('Add DROP VIEW');
-$strConfigServers_tracking_default_statements_desc
-    = __('Defines the list of statements the auto-creation uses for new versions.');
-$strConfigServers_tracking_default_statements_name = __('Statements to track');
-$strConfigServers_tracking_desc = __(
-    'Leave blank for no SQL query tracking support, suggested: '
-    . '[kbd]pma__tracking[/kbd].'
-);
-$strConfigServers_tracking_name = __('SQL query tracking table');
-$strConfigServers_tracking_version_auto_create_desc = __(
-    'Whether the tracking mechanism creates versions for tables and views '
-    . 'automatically.'
-);
-$strConfigServers_tracking_version_auto_create_name
-    = __('Automatically create versions');
-$strConfigServers_userconfig_desc = __(
-    'Leave blank for no user preferences storage in database, suggested: ' .
-    '[kbd]pma__userconfig[/kbd].'
-);
-$strConfigServers_userconfig_name = __('User preferences storage table');
-$strConfigServers_users_desc = __(
-    'Both this table and the user groups table are required to enable the ' .
-    'configurable menus feature; leaving either one of them blank will disable ' .
-    'this feature, suggested: [kbd]pma__users[/kbd].'
-);
-$strConfigServers_users_name = __('Users table');
-$strConfigServers_usergroups_desc = __(
-    'Both this table and the users table are required to enable the configurable ' .
-    'menus feature; leaving either one of them blank will disable this feature, ' .
-    'suggested: [kbd]pma__usergroups[/kbd].'
-);
-$strConfigServers_usergroups_name = __('User groups table');
-$strConfigServers_navigationhiding_desc = __(
-    'Leave blank to disable the feature to hide and show navigation items, ' .
-    'suggested: [kbd]pma__navigationhiding[/kbd].'
-);
-$strConfigServers_navigationhiding_name = __('Hidden navigation items table');
-$strConfigServers_user_desc = __('Leave empty if not using config auth.');
-$strConfigServers_user_name = __('User for config auth');
-$strConfigServers_verbose_desc = __(
-    'A user-friendly description of this server. Leave blank to display the ' .
-    'hostname instead.'
-);
-$strConfigServers_verbose_name = __('Verbose name of this server');
-$strConfigShowAll_desc = __(
-    'Whether a user should be displayed a "show all (rows)" button.'
-);
-$strConfigShowAll_name = __('Allow to display all the rows');
-$strConfigShowChgPassword_desc = __(
-    'Please note that enabling this has no effect with [kbd]config[/kbd] ' .
-    'authentication mode because the password is hard coded in the configuration ' .
-    'file; this does not limit the ability to execute the same command directly.'
-);
-$strConfigShowChgPassword_name = __('Show password change form');
-$strConfigShowCreateDb_name = __('Show create database form');
-$strConfigShowDbStructureComment_desc = __(
-    'Show or hide a column displaying the comments for all tables.'
-);
-$strConfigShowDbStructureComment_name = __('Show table comments');
-$strConfigShowDbStructureCreation_desc = __(
-    'Show or hide a column displaying the Creation timestamp for all tables.'
-);
-$strConfigShowDbStructureCreation_name = __('Show creation timestamp');
-$strConfigShowDbStructureLastUpdate_desc = __(
-    'Show or hide a column displaying the Last update timestamp for all tables.'
-);
-$strConfigShowDbStructureLastUpdate_name = __('Show last update timestamp');
-$strConfigShowDbStructureLastCheck_desc = __(
-    'Show or hide a column displaying the Last check timestamp for all tables.'
-);
-$strConfigShowDbStructureLastCheck_name = __('Show last check timestamp');
-$strConfigShowFieldTypesInDataEditView_desc = __(
-    'Defines whether or not type fields should be initially displayed in ' .
-    'edit/insert mode.'
-);
-$strConfigShowFieldTypesInDataEditView_name = __('Show field types');
-$strConfigShowFunctionFields_desc = __(
-    'Display the function fields in edit/insert mode.'
-);
-$strConfigShowFunctionFields_name = __('Show function fields');
-$strConfigShowHint_desc = __('Whether to show hint or not.');
-$strConfigShowHint_name = __('Show hint');
-$strConfigShowServerInfo_name = __('Show detailed MySQL server information');
-$strConfigShowSQL_desc = __(
-    'Defines whether SQL queries generated by phpMyAdmin should be displayed.'
-);
-$strConfigShowSQL_name = __('Show SQL queries');
-$strConfigRetainQueryBox_desc = __(
-    'Defines whether the query box should stay on-screen after its submission.'
-);
-$strConfigRetainQueryBox_name = __('Retain query box');
-$strConfigShowStats_desc = __(
-    'Allow to display database and table statistics (eg. space usage).'
-);
-$strConfigShowStats_name = __('Show statistics');
-$strConfigSkipLockedTables_desc = __(
-    'Mark used tables and make it possible to show databases with locked tables.'
-);
-$strConfigSkipLockedTables_name = __('Skip locked tables');
-$strConfigSQLQuery_Edit_name = __('Edit');
-$strConfigSQLQuery_Explain_name = __('Explain SQL');
-$strConfigSQLQuery_Refresh_name = __('Refresh');
-$strConfigSQLQuery_ShowAsPHP_name = __('Create PHP code');
-$strConfigSuhosinDisableWarning_desc = __(
-    'Disable the default warning that is displayed on the main page if Suhosin is ' .
-    'detected.'
-);
-$strConfigSuhosinDisableWarning_name = __('Suhosin warning');
-$strConfigLoginCookieValidityDisableWarning_desc = __(
-    'Disable the default warning that is displayed on the main page if the value ' .
-    'of the PHP setting session.gc_maxlifetime is less than the value of ' .
-    '`LoginCookieValidity`.'
-);
-$strConfigLoginCookieValidityDisableWarning_name = __(
-    'Login cookie validity warning'
-);
-$strConfigTextareaCols_desc = __(
-    'Textarea size (columns) in edit mode, this value will be emphasized for SQL ' .
-    'query textareas (*2).'
-);
-$strConfigTextareaCols_name = __('Textarea columns');
-$strConfigTextareaRows_desc = __(
-    'Textarea size (rows) in edit mode, this value will be emphasized for SQL ' .
-    'query textareas (*2).'
-);
-$strConfigTextareaRows_name = __('Textarea rows');
-$strConfigTitleDatabase_desc = __(
-    'Title of browser window when a database is selected.'
-);
-$strConfigTitleDatabase_name = __('Database');
-$strConfigTitleDefault_desc = __(
-    'Title of browser window when nothing is selected.'
-);
-$strConfigTitleDefault_name = __('Default title');
-$strConfigTitleServer_desc = __(
-    'Title of browser window when a server is selected.'
-);
-$strConfigTitleServer_name = __('Server');
-$strConfigTitleTable_desc = __('Title of browser window when a table is selected.');
-$strConfigTitleTable_name = __('Table');
-$strConfigTrustedProxies_desc = __(
-    'Input proxies as [kbd]IP: trusted HTTP header[/kbd]. The following example ' .
-    'specifies that phpMyAdmin should trust a HTTP_X_FORWARDED_FOR ' .
-    '(X-Forwarded-For) header coming from the proxy 1.2.3.4:[br][kbd]1.2.3.4: ' .
-    'HTTP_X_FORWARDED_FOR[/kbd].'
-);
-$strConfigTrustedProxies_name = __('List of trusted proxies for IP allow/deny');
-$strConfigUploadDir_desc = __(
-    'Directory on server where you can upload files for import.'
-);
-$strConfigUploadDir_name = __('Upload directory');
-$strConfigUseDbSearch_desc = __('Allow for searching inside the entire database.');
-$strConfigUseDbSearch_name = __('Use database search');
-$strConfigUserprefsDeveloperTab_desc = __(
-    'When disabled, users cannot set any of the options below, regardless of the ' .
-    'checkbox on the right.'
-);
-$strConfigUserprefsDeveloperTab_name = __('Enable the Developer tab in settings');
-$strConfigVersionCheckLink = __('Check for latest version');
-$strConfigVersionCheck_desc = __(
-    'Enables check for latest version on main phpMyAdmin page.'
-);
-$strConfigVersionCheck_name = __('Version check');
-$strConfigProxyUrl_desc = __(
-    'The url of the proxy to be used when retrieving the information about the ' .
-    'latest version of phpMyAdmin or when submitting error reports. You need this ' .
-    'if the server where phpMyAdmin is installed does not have direct access to ' .
-    'the internet. The format is: "hostname:portnumber".'
-);
-$strConfigProxyUrl_name = __('Proxy url');
-$strConfigProxyUser_desc = __(
-    'The username for authenticating with the proxy. By default, no ' .
-    'authentication is performed. If a username is supplied, Basic ' .
-    'Authentication will be performed. No other types of authentication are ' .
-    'currently supported.'
-);
-$strConfigProxyUser_name = __('Proxy username');
-$strConfigProxyPass_desc = __('The password for authenticating with the proxy.');
-$strConfigProxyPass_name = __('Proxy password');
-
-$strConfigZipDump_desc = __(
-    'Enable ZIP ' .
-    'compression for import and export operations.'
-);
-$strConfigZipDump_name = __('ZIP');
-$strConfigCaptchaLoginPublicKey_desc = __(
-    'Enter your public key for your domain reCaptcha service.'
-);
-$strConfigCaptchaLoginPublicKey_name = __('Public key for reCaptcha');
-$strConfigCaptchaLoginPrivateKey_desc = __(
-    'Enter your private key for your domain reCaptcha service.'
-);
-$strConfigCaptchaLoginPrivateKey_name = __('Private key for reCaptcha');
-
-$strConfigSendErrorReports_desc = __(
-    'Choose the default action when sending error reports.'
-);
-$strConfigSendErrorReports_name = __('Send error reports');
-
-$strConfigConsoleEnterExecutes_desc = __(
-    'Queries are executed by pressing Enter (instead of Ctrl+Enter). New lines ' .
-    'will be inserted with Shift+Enter.'
-);
-$strConfigConsoleEnterExecutes_name = __('Enter executes queries in console');
-
-$strConfigZeroConf_desc = __(
-    'Enable Zero Configuration mode which lets you setup phpMyAdmin '
-    . 'configuration storage tables automatically.'
-);
-$strConfigZeroConf_name = __('Enable Zero Configuration mode');
diff --git a/#pma/libraries/config/page_settings.forms.php b/#pma/libraries/config/page_settings.forms.php
deleted file mode 100644
index 2b925df5..00000000
--- a/#pma/libraries/config/page_settings.forms.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Used for page-related settings
- *
- * Extends groups defined in user_preferences.forms.php
- * specific to page-related settings
- *
- * See more info in user_preferences.forms.php
- *
- * @package PhpMyAdmin
- */
-
-if (!is_array($forms)) {
-    $forms = array();
-}
-
-$forms['Browse'] = array();
-$forms['Browse']['Browse'] = $forms['Main_panel']['Browse'];
-
-$forms['DbStructure'] = array();
-$forms['DbStructure']['DbStructure'] = $forms['Main_panel']['DbStructure'];
-
-$forms['Edit'] = array();
-$forms['Edit']['Edit'] = $forms['Main_panel']['Edit'];
-$forms['Edit']['Text_fields'] = $forms['Features']['Text_fields'];
-
-$forms['TableStructure'] = array();
-$forms['TableStructure']['TableStructure'] = $forms['Main_panel']['TableStructure'];
diff --git a/#pma/libraries/config/setup.forms.php b/#pma/libraries/config/setup.forms.php
deleted file mode 100644
index c8743d4e..00000000
--- a/#pma/libraries/config/setup.forms.php
+++ /dev/null
@@ -1,395 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * List of available forms, each form is described as an array of fields to display.
- * Fields MUST have their counterparts in the $cfg array.
- *
- * There are two possible notations:
- * $forms['Form group']['Form name'] = array('Servers' => array(1 => array('host')));
- * can be written as
- * $forms['Form group']['Form name'] = array('Servers/1/host');
- *
- * You can assign default values set by special button ("set value: ..."), eg.:
- * 'Servers/1/pmadb' => 'phpmyadmin'
- *
- * To group options, use:
- * ':group:' . __('group name') // just define a group
- * or
- * 'option' => ':group' // group starting from this option
- * End group blocks with:
- * ':group:end'
- *
- * @package PhpMyAdmin-Setup
- */
-
-$forms = array();
-$forms['_config.php'] = array(
-    'DefaultLang',
-    'ServerDefault');
-$forms['Servers']['Server'] = array('Servers' => array(1 => array(
-    'verbose',
-    'host',
-    'port',
-    'socket',
-    'ssl',
-    'connect_type',
-    'compress',
-    'nopassword')));
-$forms['Servers']['Server_auth'] = array('Servers' => array(1 => array(
-    'auth_type',
-    ':group:' . __('Config authentication'),
-        'user',
-        'password',
-        ':group:end',
-    ':group:' . __('HTTP authentication'),
-        'auth_http_realm',
-        ':group:end',
-    ':group:' . __('Signon authentication'),
-        'SignonSession',
-        'SignonURL',
-        'LogoutURL')));
-$forms['Servers']['Server_config'] = array('Servers' => array(1 => array(
-    'only_db',
-    'hide_db',
-    'AllowRoot',
-    'AllowNoPassword',
-    'DisableIS',
-    'AllowDeny/order',
-    'AllowDeny/rules',
-    'SessionTimeZone')));
-$forms['Servers']['Server_pmadb'] = array('Servers' => array(1 => array(
-    'pmadb' => 'phpmyadmin',
-    'controlhost',
-    'controlport',
-    'controluser',
-    'controlpass',
-    'bookmarktable' => 'pma__bookmark',
-    'relation' => 'pma__relation',
-    'userconfig' => 'pma__userconfig',
-    'users' => 'pma__users',
-    'usergroups' => 'pma__usergroups',
-    'navigationhiding' => 'pma__navigationhiding',
-    'table_info' => 'pma__table_info',
-    'column_info' => 'pma__column_info',
-    'history' => 'pma__history',
-    'recent' => 'pma__recent',
-    'favorite' => 'pma__favorite',
-    'table_uiprefs' => 'pma__table_uiprefs',
-    'tracking' => 'pma__tracking',
-    'table_coords' => 'pma__table_coords',
-    'pdf_pages' => 'pma__pdf_pages',
-    'savedsearches' => 'pma__savedsearches',
-    'central_columns' => 'pma__central_columns',
-    'designer_settings' => 'pma__designer_settings',
-    'export_templates' => 'pma__export_templates',
-    'MaxTableUiprefs' => 100)));
-$forms['Servers']['Server_tracking'] = array('Servers' => array(1 => array(
-    'tracking_version_auto_create',
-    'tracking_default_statements',
-    'tracking_add_drop_view',
-    'tracking_add_drop_table',
-    'tracking_add_drop_database',
-)));
-$forms['Features']['Import_export'] = array(
-    'UploadDir',
-    'SaveDir',
-    'RecodingEngine' => ':group',
-        'IconvExtraParams',
-        ':group:end',
-    'ZipDump',
-    'GZipDump',
-    'BZipDump',
-    'CompressOnFly');
-$forms['Features']['Security'] = array(
-    'blowfish_secret',
-    'CheckConfigurationPermissions',
-    'TrustedProxies',
-    'AllowUserDropDatabase',
-    'AllowArbitraryServer',
-    'ArbitraryServerRegexp',
-    'LoginCookieRecall',
-    'LoginCookieValidity',
-    'LoginCookieStore',
-    'LoginCookieDeleteAll',
-    'CaptchaLoginPublicKey',
-    'CaptchaLoginPrivateKey');
-$forms['Features']['Page_titles'] = array(
-    'TitleDefault',
-    'TitleTable',
-    'TitleDatabase',
-    'TitleServer');
-$forms['Features']['Warnings'] = array(
-    'ServerLibraryDifference_DisableWarning',
-    'PmaNoRelation_DisableWarning',
-    'SuhosinDisableWarning',
-    'LoginCookieValidityDisableWarning');
-$forms['Features']['Developer'] = array(
-    'UserprefsDeveloperTab',
-    'DBG/sql');
-$forms['Features']['Other_core_settings'] = array(
-    'NaturalOrder',
-    'InitialSlidersState',
-    'MaxDbList',
-    'MaxTableList',
-    'NumFavoriteTables',
-    'ShowHint',
-    'OBGzip',
-    'PersistentConnections',
-    'ExecTimeLimit',
-    'MemoryLimit',
-    'SkipLockedTables',
-    'DisableMultiTableMaintenance',
-    'UseDbSearch',
-    'VersionCheck',
-    'SendErrorReports',
-    'ConsoleEnterExecutes',
-    'ProxyUrl',
-    'ProxyUser',
-    'ProxyPass',
-    'AllowThirdPartyFraming',
-    'ZeroConf'
-);
-$forms['Sql_queries']['Sql_queries'] = array(
-    'ShowSQL',
-    'Confirm',
-    'QueryHistoryDB',
-    'QueryHistoryMax',
-    'IgnoreMultiSubmitErrors',
-    'MaxCharactersInDisplayedSQL',
-    'RetainQueryBox',
-    'CodemirrorEnable',
-    'LintEnable',
-    'EnableAutocompleteForTablesAndColumns',
-    'DefaultForeignKeyChecks');
-$forms['Sql_queries']['Sql_box'] = array('SQLQuery' => array(
-    'Edit',
-    'Explain',
-    'ShowAsPHP',
-    'Refresh'));
-$forms['Navi_panel']['Navi_panel'] = array(
-    'ShowDatabasesNavigationAsTree',
-    'NavigationLinkWithMainPanel',
-    'NavigationDisplayLogo',
-    'NavigationLogoLink',
-    'NavigationLogoLinkWindow',
-    'NavigationTreePointerEnable',
-    'FirstLevelNavigationItems',
-    'NavigationTreeDisplayItemFilterMinimum',
-    'NumRecentTables',
-    'NumFavoriteTables'
-);
-$forms['Navi_panel']['Navi_tree'] = array(
-    'MaxNavigationItems',
-    'NavigationTreeEnableGrouping',
-    'NavigationTreeEnableExpansion',
-    'NavigationTreeShowTables',
-    'NavigationTreeShowViews',
-    'NavigationTreeShowFunctions',
-    'NavigationTreeShowProcedures',
-    'NavigationTreeShowEvents'
-);
-$forms['Navi_panel']['Navi_servers'] = array(
-    'NavigationDisplayServers',
-    'DisplayServersList');
-$forms['Navi_panel']['Navi_databases'] = array(
-    'NavigationTreeDbSeparator');
-$forms['Navi_panel']['Navi_tables'] = array(
-    'NavigationTreeDefaultTabTable',
-    'NavigationTreeDefaultTabTable2',
-    'NavigationTreeTableSeparator',
-    'NavigationTreeTableLevel',
-);
-$forms['Main_panel']['Startup'] = array(
-    'ShowCreateDb',
-    'ShowStats',
-    'ShowServerInfo',
-    'ShowChgPassword');
-$forms['Main_panel']['DbStructure'] = array(
-    'ShowDbStructureComment',
-    'ShowDbStructureCreation',
-    'ShowDbStructureLastUpdate',
-    'ShowDbStructureLastCheck');
-$forms['Main_panel']['TableStructure'] = array(
-    'HideStructureActions',
-    'ShowColumnComments');
-$forms['Main_panel']['Browse'] = array(
-    'TableNavigationLinksMode',
-    'ShowAll',
-    'MaxRows',
-    'Order',
-    'BrowsePointerEnable',
-    'BrowseMarkerEnable',
-    'GridEditing',
-    'SaveCellsAtOnce',
-    'RepeatCells',
-    'LimitChars',
-    'RowActionLinks',
-    'RowActionLinksWithoutUnique',
-    'TablePrimaryKeyOrder',
-    'RememberSorting',
-    'RelationalDisplay');
-$forms['Main_panel']['Edit'] = array(
-    'ProtectBinary',
-    'ShowFunctionFields',
-    'ShowFieldTypesInDataEditView',
-    'CharEditing',
-    'MinSizeForInputField',
-    'MaxSizeForInputField',
-    'CharTextareaCols',
-    'CharTextareaRows',
-    'TextareaCols',
-    'TextareaRows',
-    'LongtextDoubleTextarea',
-    'InsertRows',
-    'ForeignKeyDropdownOrder',
-    'ForeignKeyMaxLimit');
-$forms['Main_panel']['Tabs'] = array(
-    'TabsMode',
-    'ActionLinksMode',
-    'DefaultTabServer',
-    'DefaultTabDatabase',
-    'DefaultTabTable'
-);
-$forms['Import']['Import_defaults'] = array('Import' => array(
-    'format',
-    'charset',
-    'allow_interrupt',
-    'skip_queries'));
-$forms['Import']['Sql'] = array('Import' => array(
-    'sql_compatibility',
-    'sql_no_auto_value_on_zero'));
-$forms['Import']['Csv'] = array('Import' => array(
-    ':group:' . __('CSV'),
-        'csv_replace',
-        'csv_ignore',
-        'csv_terminated',
-        'csv_enclosed',
-        'csv_escaped',
-        'csv_col_names',
-        ':group:end',
-    ':group:' . __('CSV using LOAD DATA'),
-        'ldi_replace',
-        'ldi_ignore',
-        'ldi_terminated',
-        'ldi_enclosed',
-        'ldi_escaped',
-        'ldi_local_option',
-        ':group:end'));
-$forms['Import']['Open_Document'] = array('Import' => array(
-    ':group:' . __('OpenDocument Spreadsheet'),
-        'ods_col_names',
-        'ods_empty_rows',
-        'ods_recognize_percentages',
-        'ods_recognize_currency'));
-$forms['Export']['Export_defaults'] = array('Export' => array(
-    'method',
-    ':group:' . __('Quick'),
-        'quick_export_onserver',
-        'quick_export_onserver_overwrite',
-        ':group:end',
-    ':group:' . __('Custom'),
-        'format',
-        'compression',
-        'charset',
-        'lock_tables',
-        'as_separate_files',
-        'asfile' => ':group',
-            'onserver',
-            'onserver_overwrite',
-            ':group:end',
-        'remember_file_template',
-        'file_template_table',
-        'file_template_database',
-        'file_template_server'));
-$forms['Export']['Sql'] = array('Export' => array(
-    'sql_include_comments' => ':group',
-        'sql_dates',
-        'sql_relation',
-        'sql_mime',
-        ':group:end',
-    'sql_use_transaction',
-    'sql_disable_fk',
-    'sql_views_as_tables',
-    'sql_metadata',
-    'sql_compatibility',
-    'sql_structure_or_data',
-    ':group:' . __('Structure'),
-        'sql_drop_database',
-        'sql_create_database',
-        'sql_drop_table',
-        'sql_procedure_function',
-        'sql_create_table' => ':group',
-            'sql_if_not_exists',
-            'sql_auto_increment',
-            ':group:end',
-        'sql_create_view',
-        'sql_create_trigger',
-        'sql_backquotes',
-        ':group:end',
-    ':group:' . __('Data'),
-        'sql_delayed',
-        'sql_ignore',
-        'sql_type',
-        'sql_insert_syntax',
-        'sql_max_query_size',
-        'sql_hex_for_binary',
-        'sql_utc_time'));
-$forms['Export']['CodeGen'] = array('Export' => array(
-    'codegen_format'));
-$forms['Export']['Csv'] = array('Export' => array(
-    ':group:' . __('CSV'),
-        'csv_separator',
-        'csv_enclosed',
-        'csv_escaped',
-        'csv_terminated',
-        'csv_null',
-        'csv_removeCRLF',
-        'csv_columns',
-        ':group:end',
-    ':group:' . __('CSV for MS Excel'),
-        'excel_null',
-        'excel_removeCRLF',
-        'excel_columns',
-        'excel_edition'));
-$forms['Export']['Latex'] = array('Export' => array(
-    'latex_caption',
-    'latex_structure_or_data',
-    ':group:' . __('Structure'),
-        'latex_structure_caption',
-        'latex_structure_continued_caption',
-        'latex_structure_label',
-        'latex_relation',
-        'latex_comments',
-        'latex_mime',
-        ':group:end',
-    ':group:' . __('Data'),
-        'latex_columns',
-        'latex_data_caption',
-        'latex_data_continued_caption',
-        'latex_data_label',
-        'latex_null'));
-$forms['Export']['Microsoft_Office'] = array('Export' => array(
-    ':group:' . __('Microsoft Word 2000'),
-        'htmlword_structure_or_data',
-        'htmlword_null',
-        'htmlword_columns'));
-$forms['Export']['Open_Document'] = array('Export' => array(
-    ':group:' . __('OpenDocument Spreadsheet'),
-        'ods_columns',
-        'ods_null',
-        ':group:end',
-    ':group:' . __('OpenDocument Text'),
-        'odt_structure_or_data',
-        ':group:' . __('Structure'),
-            'odt_relation',
-            'odt_comments',
-            'odt_mime',
-            ':group:end',
-        ':group:' . __('Data'),
-            'odt_columns',
-            'odt_null'));
-$forms['Export']['Texy'] = array('Export' => array(
-    'texytext_structure_or_data',
-    ':group:' . __('Data'),
-        'texytext_null',
-        'texytext_columns'));
diff --git a/#pma/libraries/config/user_preferences.forms.php b/#pma/libraries/config/user_preferences.forms.php
deleted file mode 100644
index e403da65..00000000
--- a/#pma/libraries/config/user_preferences.forms.php
+++ /dev/null
@@ -1,298 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * List of available forms, each form is described as an array of fields to display.
- * Fields MUST have their counterparts in the $cfg array.
- *
- * To define form field, use the notation below:
- * $forms['Form group']['Form name'] = array('Option/path');
- *
- * You can assign default values set by special button ("set value: ..."), eg.:
- * 'Servers/1/pmadb' => 'phpmyadmin'
- *
- * To group options, use:
- * ':group:' . __('group name') // just define a group
- * or
- * 'option' => ':group' // group starting from this option
- * End group blocks with:
- * ':group:end'
- *
- * @package PhpMyAdmin
- */
-
-$forms = array();
-$forms['Features']['General'] = array(
-    'VersionCheck',
-    'NaturalOrder',
-    'InitialSlidersState',
-    'LoginCookieValidity',
-    'SkipLockedTables',
-    'DisableMultiTableMaintenance',
-    'MaxTableList',
-    'ShowHint',
-    'SendErrorReports',
-    'ConsoleEnterExecutes'
-);
-$forms['Features']['Databases'] = array(
-    'Servers/1/only_db', // saves to Server/only_db
-    'Servers/1/hide_db', // saves to Server/hide_db
-    'MaxDbList'
-);
-$forms['Features']['Text_fields'] = array(
-    'CharEditing',
-    'MinSizeForInputField',
-    'MaxSizeForInputField',
-    'CharTextareaCols',
-    'CharTextareaRows',
-    'TextareaCols',
-    'TextareaRows',
-    'LongtextDoubleTextarea');
-$forms['Features']['Page_titles'] = array(
-    'TitleDefault',
-    'TitleTable',
-    'TitleDatabase',
-    'TitleServer');
-$forms['Features']['Warnings'] = array(
-    'ServerLibraryDifference_DisableWarning',
-    'PmaNoRelation_DisableWarning',
-    'SuhosinDisableWarning',
-    'LoginCookieValidityDisableWarning',
-    'ReservedWordDisableWarning');
-// settings from this form are treated specially,
-// see prefs_forms.php and user_preferences.lib.php
-$forms['Features']['Developer'] = array(
-    'DBG/sql');
-$forms['Sql_queries']['Sql_queries'] = array(
-    'ShowSQL',
-    'Confirm',
-    'QueryHistoryMax',
-    'IgnoreMultiSubmitErrors',
-    'MaxCharactersInDisplayedSQL',
-    'RetainQueryBox',
-    'CodemirrorEnable',
-    'LintEnable',
-    'EnableAutocompleteForTablesAndColumns',
-    'DefaultForeignKeyChecks');
-$forms['Sql_queries']['Sql_box'] = array(
-    'SQLQuery/Edit',
-    'SQLQuery/Explain',
-    'SQLQuery/ShowAsPHP',
-    'SQLQuery/Refresh');
-$forms['Navi_panel']['Navi_panel'] = array(
-    'ShowDatabasesNavigationAsTree',
-    'NavigationLinkWithMainPanel',
-    'NavigationDisplayLogo',
-    'NavigationLogoLink',
-    'NavigationLogoLinkWindow',
-    'NavigationTreePointerEnable',
-    'FirstLevelNavigationItems',
-    'NavigationTreeDisplayItemFilterMinimum',
-    'NumRecentTables',
-    'NumFavoriteTables'
-);
-$forms['Navi_panel']['Navi_tree'] = array(
-    'MaxNavigationItems',
-    'NavigationTreeEnableGrouping',
-    'NavigationTreeEnableExpansion',
-    'NavigationTreeShowTables',
-    'NavigationTreeShowViews',
-    'NavigationTreeShowFunctions',
-    'NavigationTreeShowProcedures',
-    'NavigationTreeShowEvents'
-);
-$forms['Navi_panel']['Navi_databases'] = array(
-    'NavigationTreeDisplayDbFilterMinimum',
-    'NavigationTreeDbSeparator');
-$forms['Navi_panel']['Navi_tables'] = array(
-    'NavigationTreeDefaultTabTable',
-    'NavigationTreeDefaultTabTable2',
-    'NavigationTreeTableSeparator',
-    'NavigationTreeTableLevel',
-);
-$forms['Main_panel']['Startup'] = array(
-    'ShowCreateDb',
-    'ShowStats',
-    'ShowServerInfo');
-$forms['Main_panel']['DbStructure'] = array(
-    'ShowDbStructureComment',
-    'ShowDbStructureCreation',
-    'ShowDbStructureLastUpdate',
-    'ShowDbStructureLastCheck');
-$forms['Main_panel']['TableStructure'] = array(
-    'HideStructureActions',
-    'ShowColumnComments');
-$forms['Main_panel']['Browse'] = array(
-    'TableNavigationLinksMode',
-    'ActionLinksMode',
-    'ShowAll',
-    'MaxRows',
-    'Order',
-    'BrowsePointerEnable',
-    'BrowseMarkerEnable',
-    'GridEditing',
-    'SaveCellsAtOnce',
-    'RepeatCells',
-    'LimitChars',
-    'RowActionLinks',
-    'RowActionLinksWithoutUnique',
-    'TablePrimaryKeyOrder',
-    'RememberSorting',
-    'RelationalDisplay');
-$forms['Main_panel']['Edit'] = array(
-    'ProtectBinary',
-    'ShowFunctionFields',
-    'ShowFieldTypesInDataEditView',
-    'InsertRows',
-    'ForeignKeyDropdownOrder',
-    'ForeignKeyMaxLimit');
-$forms['Main_panel']['Tabs'] = array(
-    'TabsMode',
-    'DefaultTabServer',
-    'DefaultTabDatabase',
-    'DefaultTabTable');
-$forms['Main_panel']['DisplayRelationalSchema'] = array(
-    'PDFDefaultPageSize');
-
-$forms['Import']['Import_defaults'] = array(
-    'Import/format',
-    'Import/charset',
-    'Import/allow_interrupt',
-    'Import/skip_queries'
-);
-$forms['Import']['Sql'] = array(
-    'Import/sql_compatibility',
-    'Import/sql_no_auto_value_on_zero',
-    'Import/sql_read_as_multibytes');
-$forms['Import']['Csv'] = array(
-    ':group:' . __('CSV'),
-        'Import/csv_replace',
-        'Import/csv_ignore',
-        'Import/csv_terminated',
-        'Import/csv_enclosed',
-        'Import/csv_escaped',
-        'Import/csv_col_names',
-        ':group:end',
-    ':group:' . __('CSV using LOAD DATA'),
-        'Import/ldi_replace',
-        'Import/ldi_ignore',
-        'Import/ldi_terminated',
-        'Import/ldi_enclosed',
-        'Import/ldi_escaped',
-        'Import/ldi_local_option');
-$forms['Import']['Open_Document'] = array(
-    ':group:' . __('OpenDocument Spreadsheet'),
-        'Import/ods_col_names',
-        'Import/ods_empty_rows',
-        'Import/ods_recognize_percentages',
-        'Import/ods_recognize_currency');
-$forms['Export']['Export_defaults'] = array(
-    'Export/method',
-    ':group:' . __('Quick'),
-        'Export/quick_export_onserver',
-        'Export/quick_export_onserver_overwrite',
-        ':group:end',
-    ':group:' . __('Custom'),
-        'Export/format',
-        'Export/compression',
-        'Export/charset',
-        'Export/lock_tables',
-        'Export/as_separate_files',
-        'Export/asfile' => ':group',
-            'Export/onserver',
-            'Export/onserver_overwrite',
-            ':group:end',
-        'Export/file_template_table',
-        'Export/file_template_database',
-        'Export/file_template_server');
-$forms['Export']['Sql'] = array(
-    'Export/sql_include_comments' => ':group',
-        'Export/sql_dates',
-        'Export/sql_relation',
-        'Export/sql_mime',
-        ':group:end',
-    'Export/sql_use_transaction',
-    'Export/sql_disable_fk',
-    'Export/sql_views_as_tables',
-    'Export/sql_metadata',
-    'Export/sql_compatibility',
-    'Export/sql_structure_or_data',
-    ':group:' . __('Structure'),
-        'Export/sql_drop_database',
-        'Export/sql_create_database',
-        'Export/sql_drop_table',
-        'Export/sql_create_table' => ':group',
-            'Export/sql_if_not_exists',
-            'Export/sql_auto_increment',
-            ':group:end',
-        'Export/sql_create_view',
-        'Export/sql_procedure_function',
-        'Export/sql_create_trigger',
-        'Export/sql_backquotes',
-        ':group:end',
-    ':group:' . __('Data'),
-        'Export/sql_delayed',
-        'Export/sql_ignore',
-        'Export/sql_type',
-        'Export/sql_insert_syntax',
-        'Export/sql_max_query_size',
-        'Export/sql_hex_for_binary',
-        'Export/sql_utc_time');
-$forms['Export']['CodeGen'] = array(
-    'Export/codegen_format');
-$forms['Export']['Csv'] = array(
-    ':group:' . __('CSV'),
-        'Export/csv_separator',
-        'Export/csv_enclosed',
-        'Export/csv_escaped',
-        'Export/csv_terminated',
-        'Export/csv_null',
-        'Export/csv_removeCRLF',
-        'Export/csv_columns',
-        ':group:end',
-    ':group:' . __('CSV for MS Excel'),
-        'Export/excel_null',
-        'Export/excel_removeCRLF',
-        'Export/excel_columns',
-        'Export/excel_edition');
-$forms['Export']['Latex'] = array(
-    'Export/latex_caption',
-    'Export/latex_structure_or_data',
-    ':group:' . __('Structure'),
-        'Export/latex_structure_caption',
-        'Export/latex_structure_continued_caption',
-        'Export/latex_structure_label',
-        'Export/latex_relation',
-        'Export/latex_comments',
-        'Export/latex_mime',
-        ':group:end',
-    ':group:' . __('Data'),
-        'Export/latex_columns',
-        'Export/latex_data_caption',
-        'Export/latex_data_continued_caption',
-        'Export/latex_data_label',
-        'Export/latex_null');
-$forms['Export']['Microsoft_Office'] = array(
-    ':group:' . __('Microsoft Word 2000'),
-        'Export/htmlword_structure_or_data',
-        'Export/htmlword_null',
-        'Export/htmlword_columns');
-$forms['Export']['Open_Document'] = array(
-    ':group:' . __('OpenDocument Spreadsheet'),
-        'Export/ods_columns',
-        'Export/ods_null',
-        ':group:end',
-    ':group:' . __('OpenDocument Text'),
-        'Export/odt_structure_or_data',
-        ':group:' . __('Structure'),
-            'Export/odt_relation',
-            'Export/odt_comments',
-            'Export/odt_mime',
-            ':group:end',
-        ':group:' . __('Data'),
-            'Export/odt_columns',
-            'Export/odt_null');
-$forms['Export']['Texy'] = array(
-    'Export/texytext_structure_or_data',
-    ':group:' . __('Data'),
-        'Export/texytext_null',
-        'Export/texytext_columns');
diff --git a/#pma/libraries/controllers/Controller.php b/#pma/libraries/controllers/Controller.php
deleted file mode 100644
index cbb18357..00000000
--- a/#pma/libraries/controllers/Controller.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Holds the PMA\TableController
- *
- * @package PMA
- */
-namespace PMA\libraries\controllers;
-
-use PMA\libraries\DatabaseInterface;
-use PMA\libraries\di\Container;
-use PMA\libraries\Response;
-
-require_once 'libraries/database_interface.inc.php';
-
-/**
- * Base class for all of controller
- *
- * @package PhpMyAdmin
- */
-abstract class Controller
-{
-
-    /**
-     * @var Response
-     */
-    protected $response;
-
-    /**
-     * @var DatabaseInterface
-     */
-    protected $dbi;
-
-    /**
-     * @var \PMA\libraries\di\Container
-     */
-    protected $container;
-
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        $container = Container::getDefaultContainer();
-        $this->container = $container;
-        $this->dbi = $this->container->get('dbi');
-        $this->response = $this->container->get('response');
-    }
-}
diff --git a/#pma/libraries/controllers/DatabaseController.php b/#pma/libraries/controllers/DatabaseController.php
deleted file mode 100644
index 7cc44161..00000000
--- a/#pma/libraries/controllers/DatabaseController.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Holds the PMA\DatabaseController
- *
- * @package PMA
- */
-namespace PMA\libraries\controllers;
-
-/**
- * Handles database related logic
- *
- * @package PhpMyAdmin
- */
-abstract class DatabaseController extends Controller
-{
-    /**
-     * @var string $db
-     */
-    protected $db;
-
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        parent::__construct();
-        $this->db = $this->container->get('db');
-    }
-}
diff --git a/#pma/libraries/controllers/TableController.php b/#pma/libraries/controllers/TableController.php
deleted file mode 100644
index a0839a83..00000000
--- a/#pma/libraries/controllers/TableController.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Holds the PMA\TableController
- *
- * @package PMA
- */
-namespace PMA\libraries\controllers;
-
-/**
- * Handles table related logic
- *
- * @package PhpMyAdmin
- */
-abstract class TableController extends Controller
-{
-    /**
-     * @var string $db
-     */
-    protected $db;
-
-    /**
-     * @var string $table
-     */
-    protected $table;
-
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        parent::__construct();
-        $this->db = $this->container->get('db');
-        $this->table = $this->container->get('table');
-    }
-}
diff --git a/#pma/libraries/controllers/database/DatabaseStructureController.php b/#pma/libraries/controllers/database/DatabaseStructureController.php
deleted file mode 100644
index cd22393f..00000000
--- a/#pma/libraries/controllers/database/DatabaseStructureController.php
+++ /dev/null
@@ -1,1073 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-
-/**
- * Holds the PMA\libraries\controllers\database\DatabaseStructureController
- *
- * @package PMA
- */
-
-namespace PMA\libraries\controllers\database;
-
-use PMA\libraries\config\PageSettings;
-use PMA\libraries\controllers\DatabaseController;
-use PMA\libraries\Message;
-use PMA\libraries\RecentFavoriteTable;
-use PMA\libraries\Template;
-use PMA\libraries\Tracker;
-use PMA\libraries\Util;
-
-require_once 'libraries/mysql_charsets.inc.php';
-require_once 'libraries/display_create_table.lib.php';
-require_once 'libraries/config/messages.inc.php';
-require_once 'libraries/config/user_preferences.forms.php';
-require_once 'libraries/config/page_settings.forms.php';
-
-/**
- * Handles database structure logic
- *
- * @package PhpMyAdmin
- */
-class DatabaseStructureController extends DatabaseController
-{
-    /**
-     * @var string  The URL query string
-     */
-    protected $_url_query;
-    /**
-     * @var int Number of tables
-     */
-    protected $_num_tables;
-    /**
-     * @var int Current position in the list
-     */
-    protected $_pos;
-    /**
-     * @var bool DB is information_schema
-     */
-    protected $_db_is_system_schema;
-    /**
-     * @var int Number of tables
-     */
-    protected $_total_num_tables;
-    /**
-     * @var array Tables in the database
-     */
-    protected $_tables;
-    /**
-     * @var bool whether stats show or not
-     */
-    protected $_is_show_stats;
-
-    /**
-     * DatabaseStructureController constructor
-     *
-     * @param string $url_query URL query
-     */
-    public function __construct($url_query) {
-        parent::__construct();
-
-        $this->_url_query = $url_query;
-    }
-
-    /**
-     * Retrieves databse information for further use
-     *
-     * @param string $sub_part Page part name
-     *
-     * @return void
-     */
-    private function _getDbInfo($sub_part)
-    {
-        list(
-            $tables,
-            $num_tables,
-            $total_num_tables,
-            ,
-            $is_show_stats,
-            $db_is_system_schema,
-            ,
-            ,
-            $pos
-        ) = Util::getDbInfo($this->db, $sub_part);
-
-        $this->_tables = $tables;
-        $this->_num_tables = $num_tables;
-        $this->_pos = $pos;
-        $this->_db_is_system_schema = $db_is_system_schema;
-        $this->_total_num_tables = $total_num_tables;
-        $this->_is_show_stats = $is_show_stats;
-    }
-
-    /**
-     * Index action
-     *
-     * @return void
-     */
-    public function indexAction()
-    {
-        // Add/Remove favorite tables using Ajax request.
-        if ($GLOBALS['is_ajax_request'] && !empty($_REQUEST['favorite_table'])) {
-            $this->addRemoveFavoriteTablesAction();
-            return;
-        }
-
-        // If there is an Ajax request for real row count of a table.
-        if ($GLOBALS['is_ajax_request']
-            && isset($_REQUEST['real_row_count'])
-            && $_REQUEST['real_row_count'] == true
-        ) {
-            $this->handleRealRowCountRequestAction();
-            return;
-        }
-
-        // Drops/deletes/etc. multiple tables if required
-        if ((! empty($_POST['submit_mult']) && isset($_POST['selected_tbl']))
-            || isset($_POST['mult_btn'])
-        ) {
-            $this->multiSubmitAction();
-        }
-
-        $this->response->getHeader()->getScripts()->addFiles(
-            array(
-                'db_structure.js',
-                'tbl_change.js',
-                'jquery/jquery-ui-timepicker-addon.js'
-            )
-        );
-
-        $this->_url_query .= '&amp;goto=db_structure.php';
-
-        // Gets the database structure
-        $this->_getDbInfo('_structure');
-
-        include_once 'libraries/replication.inc.php';
-
-        PageSettings::showGroup('DbStructure');
-
-        // 1. No tables
-        if ($this->_num_tables == 0) {
-            $this->response->addHTML(
-                Message::notice(__('No tables found in database.'))
-            );
-            if (empty($this->_db_is_system_schema)) {
-                $this->response->addHTML(PMA_getHtmlForCreateTable($this->db));
-            }
-            return;
-        }
-
-        // else
-        // 2. Shows table information
-        /**
-         * Displays the tables list
-         */
-        $this->response->addHTML('<div id="tableslistcontainer">');
-        $_url_params = array(
-            'pos' => $this->_pos,
-            'db'  => $this->db);
-
-        // Add the sort options if they exists
-        if (isset($_REQUEST['sort'])) {
-            $_url_params['sort'] = $_REQUEST['sort'];
-        }
-
-        if (isset($_REQUEST['sort_order'])) {
-            $_url_params['sort_order'] = $_REQUEST['sort_order'];
-        }
-
-        $this->response->addHTML(
-            Util::getListNavigator(
-                $this->_total_num_tables, $this->_pos, $_url_params,
-                'db_structure.php', 'frame_content', $GLOBALS['cfg']['MaxTableList']
-            )
-        );
-
-        $this->displayTableList();
-
-        // display again the table list navigator
-        $this->response->addHTML(
-            Util::getListNavigator(
-                $this->_total_num_tables, $this->_pos, $_url_params,
-                'db_structure.php', 'frame_content',
-                $GLOBALS['cfg']['MaxTableList']
-            )
-        );
-
-        $this->response->addHTML('</div><hr />');
-
-        /**
-         * Work on the database
-         */
-        /* DATABASE WORK */
-        /* Printable view of a table */
-        $this->response->addHTML(
-            Template::get('database/structure/print_view_data_dictionary_link')
-                ->render(array('url_query' => $this->_url_query))
-        );
-
-        if (empty($this->_db_is_system_schema)) {
-            $this->response->addHTML(PMA_getHtmlForCreateTable($this->db));
-        }
-    }
-
-    /**
-     * Add or remove favorite tables
-     *
-     * @return void
-     */
-    public function addRemoveFavoriteTablesAction()
-    {
-        $fav_instance = RecentFavoriteTable::getInstance('favorite');
-        if (isset($_REQUEST['favorite_tables'])) {
-            $favorite_tables = json_decode($_REQUEST['favorite_tables'], true);
-        } else {
-            $favorite_tables = array();
-        }
-        // Required to keep each user's preferences separate.
-        $user = sha1($GLOBALS['cfg']['Server']['user']);
-
-        // Request for Synchronization of favorite tables.
-        if (isset($_REQUEST['sync_favorite_tables'])) {
-            $this->synchronizeFavoriteTables($fav_instance, $user, $favorite_tables);
-            return;
-        }
-        $changes = true;
-        $titles = Util::buildActionTitles();
-        $favorite_table = $_REQUEST['favorite_table'];
-        $already_favorite = $this->checkFavoriteTable($favorite_table);
-
-        if (isset($_REQUEST['remove_favorite'])) {
-            if ($already_favorite) {
-                // If already in favorite list, remove it.
-                $fav_instance->remove($this->db, $favorite_table);
-                $already_favorite = false; // for favorite_anchor template
-            }
-        } elseif (isset($_REQUEST['add_favorite'])) {
-            if (!$already_favorite) {
-                $nbTables = count($fav_instance->getTables());
-                if ($nbTables == $GLOBALS['cfg']['NumFavoriteTables']) {
-                    $changes = false;
-                } else {
-                    // Otherwise add to favorite list.
-                    $fav_instance->add($this->db, $favorite_table);
-                    $already_favorite = true;  // for favorite_anchor template
-                }
-            }
-        }
-
-        $favorite_tables[$user] = $fav_instance->getTables();
-        $this->response->addJSON('changes', $changes);
-        if (!$changes) {
-            $this->response->addJSON(
-                'message',
-                Template::get('components/error_message')
-                    ->render(
-                        array(
-                            'msg' => __("Favorite List is full!")
-                        )
-                    )
-            );
-            return;
-        }
-        $this->response->addJSON(
-            array(
-                'user' => $user,
-                'favorite_tables' => json_encode($favorite_tables),
-                'list' => $fav_instance->getHtmlList(),
-                'anchor' => Template::get('database/structure/favorite_anchor')
-                    ->render(
-                        array(
-                            'db' => $this->db,
-                            'current_table' => array(
-                                'TABLE_NAME' => $favorite_table
-                            ),
-                            'titles' => $titles,
-                            'already_favorite' => $already_favorite
-                        )
-                    )
-            )
-        );
-    }
-
-    /**
-     * Handles request for real row count on database level view page.
-     *
-     * @return boolean true
-     */
-    public function handleRealRowCountRequestAction()
-    {
-        $ajax_response = $this->response;
-        // If there is a request to update all table's row count.
-        if (!isset($_REQUEST['real_row_count_all'])) {
-            // Get the real row count for the table.
-            $real_row_count = $this->dbi
-                ->getTable($this->db, $_REQUEST['table'])
-                ->getRealRowCountTable();
-            // Format the number.
-            $real_row_count = Util::formatNumber($real_row_count, 0);
-            $ajax_response->addJSON('real_row_count', $real_row_count);
-            return;
-        }
-
-        // Array to store the results.
-        $real_row_count_all = array();
-        // Iterate over each table and fetch real row count.
-        foreach ($this->_tables as $table) {
-            $row_count = $this->dbi
-                ->getTable($this->db, $table['TABLE_NAME'])
-                ->getRealRowCountTable();
-            $real_row_count_all[] = array(
-                'table' => $table['TABLE_NAME'],
-                'row_count' => $row_count
-            );
-        }
-
-        $ajax_response->addJSON(
-            'real_row_count_all',
-            json_encode($real_row_count_all)
-        );
-    }
-
-    /**
-     * Handles actions related to multiple tables
-     *
-     * @return void
-     */
-    public function multiSubmitAction()
-    {
-        $action = 'db_structure.php';
-        $err_url = 'db_structure.php' . PMA_URL_getCommon(
-            array('db' => $this->db)
-        );
-
-        // see bug #2794840; in this case, code path is:
-        // db_structure.php -> libraries/mult_submits.inc.php -> sql.php
-        // -> db_structure.php and if we got an error on the multi submit,
-        // we must display it here and not call again mult_submits.inc.php
-        if (! isset($_POST['error']) || false === $_POST['error']) {
-            include 'libraries/mult_submits.inc.php';
-        }
-        if (empty($_POST['message'])) {
-            $_POST['message'] = Message::success();
-        }
-    }
-
-    /**
-     * Displays the list of tables
-     *
-     * @return void
-     */
-    protected function displayTableList()
-    {
-        // table form
-        $this->response->addHTML(
-            Template::get('database/structure/table_header')
-                ->render(
-                    array(
-                        'db'                  => $this->db,
-                        'db_is_system_schema' => $this->_db_is_system_schema,
-                        'replication'         => $GLOBALS['replication_info']['slave']['status'],
-                    )
-                )
-        );
-
-        $i = $sum_entries = 0;
-        $overhead_check = '';
-        $create_time_all = '';
-        $update_time_all = '';
-        $check_time_all = '';
-        $num_columns = $GLOBALS['cfg']['PropertiesNumColumns'] > 1
-            ? ceil($this->_num_tables / $GLOBALS['cfg']['PropertiesNumColumns']) + 1
-            : 0;
-        $row_count      = 0;
-        $sum_size       = 0;
-        $overhead_size  = 0;
-
-        $hidden_fields = array();
-        $odd_row       = true;
-        $overall_approx_rows = false;
-        foreach ($this->_tables as $keyname => $current_table) {
-            // Get valid statistics whatever is the table type
-
-            $drop_query = '';
-            $drop_message = '';
-            $overhead = '';
-
-            $table_is_view = false;
-            $table_encoded = urlencode($current_table['TABLE_NAME']);
-            // Sets parameters for links
-            $tbl_url_query = $this->_url_query . '&amp;table=' . $table_encoded;
-            // do not list the previous table's size info for a view
-
-            list($current_table, $formatted_size, $unit, $formatted_overhead,
-                $overhead_unit, $overhead_size, $table_is_view, $sum_size)
-                    = $this->getStuffForEngineTypeTable(
-                        $current_table, $sum_size, $overhead_size
-                    );
-
-            $curTable = $this->dbi
-                ->getTable($this->db, $current_table['TABLE_NAME']);
-            if (!$curTable->isMerge()) {
-                $sum_entries += $current_table['TABLE_ROWS'];
-            }
-
-            if (isset($current_table['Collation'])) {
-                $collation = '<dfn title="'
-                    . PMA_getCollationDescr($current_table['Collation']) . '">'
-                    . $current_table['Collation'] . '</dfn>';
-            } else {
-                $collation = '---';
-            }
-
-            if ($this->_is_show_stats) {
-                if ($formatted_overhead != '') {
-                    $overhead = '<a href="tbl_structure.php'
-                        . $tbl_url_query . '#showusage">'
-                        . '<span>' . $formatted_overhead . '</span>&nbsp;'
-                        . '<span class="unit">' . $overhead_unit . '</span>'
-                        . '</a>' . "\n";
-                    $overhead_check .=
-                        "markAllRows('row_tbl_" . ($i + 1) . "');";
-                } else {
-                    $overhead = '-';
-                }
-            } // end if
-
-            if ($GLOBALS['cfg']['ShowDbStructureCreation']) {
-                $create_time = isset($current_table['Create_time'])
-                    ? $current_table['Create_time'] : '';
-                if ($create_time
-                    && (!$create_time_all
-                    || $create_time < $create_time_all)
-                ) {
-                    $create_time_all = $create_time;
-                }
-            }
-
-            if ($GLOBALS['cfg']['ShowDbStructureLastUpdate']) {
-                $update_time = isset($current_table['Update_time'])
-                    ? $current_table['Update_time'] : '';
-                if ($update_time
-                    && (!$update_time_all
-                    || $update_time < $update_time_all)
-                ) {
-                    $update_time_all = $update_time;
-                }
-            }
-
-            if ($GLOBALS['cfg']['ShowDbStructureLastCheck']) {
-                $check_time = isset($current_table['Check_time'])
-                    ? $current_table['Check_time'] : '';
-                if ($check_time
-                    && (!$check_time_all
-                    || $check_time < $check_time_all)
-                ) {
-                    $check_time_all = $check_time;
-                }
-            }
-
-            $truename = htmlspecialchars(
-                (!empty($tooltip_truename)
-                    && isset($tooltip_truename[$current_table['TABLE_NAME']]))
-                ? $tooltip_truename[$current_table['TABLE_NAME']]
-                : $current_table['TABLE_NAME']
-            );
-            $truename = str_replace(' ', '&nbsp;', $truename);
-
-            $i++;
-
-            $row_count++;
-            if ($table_is_view) {
-                $hidden_fields[] = '<input type="hidden" name="views[]" value="'
-                    .  htmlspecialchars($current_table['TABLE_NAME']) . '" />';
-            }
-
-            /*
-             * Always activate links for Browse, Search and Empty, even if
-             * the icons are greyed, because
-             * 1. for views, we don't know the number of rows at this point
-             * 2. for tables, another source could have populated them since the
-             *    page was generated
-             *
-             * I could have used the PHP ternary conditional operator but I find
-             * the code easier to read without this operator.
-             */
-            $may_have_rows = $current_table['TABLE_ROWS'] > 0 || $table_is_view;
-            $titles = Util::buildActionTitles();
-
-            $browse_table = Template::get('database/structure/browse_table')
-                ->render(
-                    array(
-                        'tbl_url_query' => $tbl_url_query,
-                        'title'         => $may_have_rows ? $titles['Browse']
-                            : $titles['NoBrowse'],
-                    )
-                );
-
-            $search_table = Template::get('database/structure/search_table')
-                ->render(
-                    array(
-                        'tbl_url_query' => $tbl_url_query,
-                        'title'         => $may_have_rows ? $titles['Search']
-                            : $titles['NoSearch'],
-                    )
-                );
-
-            $browse_table_label = Template::get(
-                'database/structure/browse_table_label'
-            )
-                ->render(
-                    array(
-                        'tbl_url_query' => $tbl_url_query,
-                        'title'         => htmlspecialchars(
-                            $current_table['TABLE_COMMENT']
-                        ),
-                        'truename'      => $truename,
-                    )
-                );
-
-            $empty_table = '';
-            if (!$this->_db_is_system_schema) {
-                $empty_table = '&nbsp;';
-                if (!$table_is_view) {
-                    $empty_table = Template::get('database/structure/empty_table')
-                        ->render(
-                            array(
-                                'tbl_url_query' => $tbl_url_query,
-                                'sql_query' => urlencode(
-                                    'TRUNCATE ' . Util::backquote(
-                                        $current_table['TABLE_NAME']
-                                    )
-                                ),
-                                'message_to_show' => urlencode(
-                                    sprintf(
-                                        __('Table %s has been emptied.'),
-                                        htmlspecialchars(
-                                            $current_table['TABLE_NAME']
-                                        )
-                                    )
-                                ),
-                                'title' => $may_have_rows ? $titles['Empty']
-                                    : $titles['NoEmpty'],
-                            )
-                        );
-                }
-                $drop_query = sprintf(
-                    'DROP %s %s',
-                    ($table_is_view || $current_table['ENGINE'] == null) ? 'VIEW'
-                    : 'TABLE',
-                    Util::backquote(
-                        $current_table['TABLE_NAME']
-                    )
-                );
-                $drop_message = sprintf(
-                    (($table_is_view || $current_table['ENGINE'] == null)
-                        ? __('View %s has been dropped.')
-                        : __('Table %s has been dropped.')),
-                    str_replace(
-                        ' ', '&nbsp;',
-                        htmlspecialchars($current_table['TABLE_NAME'])
-                    )
-                );
-            }
-
-            if ($num_columns > 0
-                && $this->_num_tables > $num_columns
-                && ($row_count % $num_columns) == 0
-            ) {
-                $row_count = 1;
-                $odd_row = true;
-
-                $this->response->addHTML(
-                    '</tr></tbody></table></form>'
-                );
-
-                $this->response->addHTML(
-                    Template::get('database/structure/table_header')->render(
-                        array(
-                            'db' => $this->db,
-                            'db_is_system_schema' => $this->_db_is_system_schema,
-                            'replication' => $GLOBALS['replication_info']['slave']['status']
-                        )
-                    )
-                );
-            }
-
-            list($approx_rows, $show_superscript) = $this->isRowCountApproximated(
-                $current_table, $table_is_view
-            );
-
-            list($do, $ignored) = $this->getReplicationStatus($truename);
-
-            $this->response->addHTML(
-                Template::get('database/structure/structure_table_row')
-                    ->render(
-                        array(
-                            'db'                    => $this->db,
-                            'curr'                  => $i,
-                            'odd_row'               => $odd_row,
-                            'table_is_view'         => $table_is_view,
-                            'current_table'         => $current_table,
-                            'browse_table_label'    => $browse_table_label,
-                            'tracking_icon'         => $this->getTrackingIcon($truename),
-                            'server_slave_status'   => $GLOBALS['replication_info']['slave']['status'],
-                            'browse_table'          => $browse_table,
-                            'tbl_url_query'         => $tbl_url_query,
-                            'search_table'          => $search_table,
-                            'db_is_system_schema'   => $this->_db_is_system_schema,
-                            'titles'                => $titles,
-                            'empty_table'           => $empty_table,
-                            'drop_query'            => $drop_query,
-                            'drop_message'          => $drop_message,
-                            'collation'             => $collation,
-                            'formatted_size'        => $formatted_size,
-                            'unit'                  => $unit,
-                            'overhead'              => $overhead,
-                            'create_time'           => isset($create_time)
-                                ? $create_time : '',
-                            'update_time'           => isset($update_time)
-                                ? $update_time : '',
-                            'check_time'            => isset($check_time)
-                                ? $check_time : '',
-                            'is_show_stats'         => $this->_is_show_stats,
-                            'ignored'               => $ignored,
-                            'do'                    => $do,
-                            'colspan_for_structure' => $GLOBALS['colspan_for_structure'],
-                            'approx_rows'           => $approx_rows,
-                            'show_superscript'      => $show_superscript,
-                            'already_favorite'      => $this->checkFavoriteTable(
-                                $current_table['TABLE_NAME']
-                            ),
-                        )
-                    )
-            );
-
-            $odd_row = ! $odd_row;
-            $overall_approx_rows = $overall_approx_rows || $approx_rows;
-        } // end foreach
-
-        $this->response->addHTML('</tbody>');
-
-        $db_collation = PMA_getDbCollation($this->db);
-
-        // Show Summary
-        $this->response->addHTML(
-            Template::get('database/structure/body_for_table_summary')->render(
-                array(
-                    'num_tables' => $this->_num_tables,
-                    'server_slave_status' => $GLOBALS['replication_info']['slave']['status'],
-                    'db_is_system_schema' => $this->_db_is_system_schema,
-                    'sum_entries' => $sum_entries,
-                    'db_collation' => $db_collation,
-                    'is_show_stats' => $this->_is_show_stats,
-                    'sum_size' => $sum_size,
-                    'overhead_size' => $overhead_size,
-                    'create_time_all' => $create_time_all,
-                    'update_time_all' => $update_time_all,
-                    'check_time_all' => $check_time_all,
-                    'approx_rows' => $overall_approx_rows
-                )
-            )
-        );
-        $this->response->addHTML('</table>');
-
-        //check all
-        $this->response->addHTML(
-            Template::get('database/structure/check_all_tables')->render(
-                array(
-                    'pmaThemeImage' => $GLOBALS['pmaThemeImage'],
-                    'text_dir' => $GLOBALS['text_dir'],
-                    'overhead_check' => $overhead_check,
-                    'db_is_system_schema' => $this->_db_is_system_schema,
-                    'hidden_fields' => $hidden_fields
-                )
-            )
-        );
-        $this->response->addHTML('</form>'); //end of form
-    }
-
-    /**
-     * Returns the tracking icon if the table is tracked
-     *
-     * @param string $table table name
-     *
-     * @return string HTML for tracking icon
-     */
-    protected function getTrackingIcon($table)
-    {
-        $tracking_icon = '';
-        if (Tracker::isActive()) {
-            $is_tracked = Tracker::isTracked($this->db, $table);
-            if ($is_tracked
-                || Tracker::getVersion($this->db, $table) > 0
-            ) {
-                $tracking_icon = Template::get(
-                    'database/structure/tracking_icon'
-                )
-                ->render(
-                    array(
-                        'url_query' => $this->_url_query,
-                        'truename' => $table,
-                        'is_tracked' => $is_tracked,
-                    )
-                );
-            }
-        }
-        return $tracking_icon;
-    }
-
-    /**
-     * Returns whether the row count is approximated
-     *
-     * @param array   $current_table array containing details about the table
-     * @param boolean $table_is_view whether the table is a view
-     *
-     * @return array
-     */
-    protected function isRowCountApproximated($current_table, $table_is_view)
-    {
-        $approx_rows = false;
-        $show_superscript = '';
-
-        // there is a null value in the ENGINE
-        // - when the table needs to be repaired, or
-        // - when it's a view
-        //  so ensure that we'll display "in use" below for a table
-        //  that needs to be repaired
-        if (isset($current_table['TABLE_ROWS'])
-            && ($current_table['ENGINE'] != null || $table_is_view)
-        ) {
-            // InnoDB table: we did not get an accurate row count
-            $approx_rows = !$table_is_view
-                && $current_table['ENGINE'] == 'InnoDB'
-                && !$current_table['COUNTED'];
-
-            if ($table_is_view
-                && $current_table['TABLE_ROWS'] >= $GLOBALS['cfg']['MaxExactCountViews']
-            ) {
-                $approx_rows = true;
-                $show_superscript = Util::showHint(
-                    PMA_sanitize(
-                        sprintf(
-                            __(
-                                'This view has at least this number of '
-                                . 'rows. Please refer to %sdocumentation%s.'
-                            ),
-                            '[doc@cfg_MaxExactCountViews]', '[/doc]'
-                        )
-                    )
-                );
-            }
-        }
-
-        return array($approx_rows, $show_superscript);
-    }
-
-    /**
-     * Returns the replication status of the table.
-     *
-     * @param string $table table name
-     *
-     * @return array
-     */
-    protected function getReplicationStatus($table)
-    {
-        $do = $ignored = false;
-        if ($GLOBALS['replication_info']['slave']['status']) {
-
-            $nbServSlaveDoDb = count(
-                $GLOBALS['replication_info']['slave']['Do_DB']
-            );
-            $nbServSlaveIgnoreDb = count(
-                $GLOBALS['replication_info']['slave']['Ignore_DB']
-            );
-            $searchDoDBInTruename = array_search(
-                $table, $GLOBALS['replication_info']['slave']['Do_DB']
-            );
-            $searchDoDBInDB = array_search(
-                $this->db, $GLOBALS['replication_info']['slave']['Do_DB']
-            );
-
-            $do = strlen($searchDoDBInTruename) > 0
-                || strlen($searchDoDBInDB) > 0
-                || ($nbServSlaveDoDb == 0 && $nbServSlaveIgnoreDb == 0)
-                || $this->hasTable(
-                    $GLOBALS['replication_info']['slave']['Wild_Do_Table'],
-                    $table
-                );
-
-            $searchDb = array_search(
-                $this->db,
-                $GLOBALS['replication_info']['slave']['Ignore_DB']
-            );
-            $searchTable = array_search(
-                $table,
-                $GLOBALS['replication_info']['slave']['Ignore_Table']
-            );
-            $ignored = strlen($searchTable) > 0
-                || strlen($searchDb) > 0
-                || $this->hasTable(
-                    $GLOBALS['replication_info']['slave']['Wild_Ignore_Table'],
-                    $table
-                );
-        }
-
-        return array($do, $ignored);
-    }
-
-    /**
-     * Synchronize favorite tables
-     *
-     *
-     * @param RecentFavoriteTable $fav_instance    Instance of this class
-     * @param string              $user            The user hash
-     * @param array               $favorite_tables Existing favorites
-     *
-     * @return void
-     */
-    protected function synchronizeFavoriteTables(
-        $fav_instance,
-        $user,
-        $favorite_tables
-    ) {
-        $fav_instance_tables = $fav_instance->getTables();
-
-        if (empty($fav_instance_tables)
-            && isset($favorite_tables[$user])
-        ) {
-            foreach ($favorite_tables[$user] as $key => $value) {
-                $fav_instance->add($value['db'], $value['table']);
-            }
-        }
-        $favorite_tables[$user] = $fav_instance->getTables();
-
-        $this->response->addJSON(
-            array(
-                'favorite_tables' => json_encode($favorite_tables),
-                'list' => $fav_instance->getHtmlList()
-            )
-        );
-        $server_id = $GLOBALS['server'];
-        // Set flag when localStorage and pmadb(if present) are in sync.
-        $_SESSION['tmpval']['favorites_synced'][$server_id] = true;
-    }
-
-    /**
-     * Function to check if a table is already in favorite list.
-     *
-     * @param string $current_table current table
-     *
-     * @return true|false
-     */
-    protected function checkFavoriteTable($current_table)
-    {
-        // ensure $_SESSION['tmpval']['favorite_tables'] is initialized
-        RecentFavoriteTable::getInstance('favorite');
-        foreach (
-            $_SESSION['tmpval']['favorite_tables'][$GLOBALS['server']] as $value
-        ) {
-            if ($value['db'] == $this->db && $value['table'] == $current_table) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Find table with truename
-     *
-     * @param array  $db       DB to look into
-     * @param string $truename Table name
-     *
-     * @return bool
-     */
-    protected function hasTable($db, $truename)
-    {
-        foreach ($db as $db_table) {
-            if ($this->db == PMA_extractDbOrTable($db_table)
-                && preg_match(
-                    "@^" .
-                    mb_substr(PMA_extractDbOrTable($db_table, 'table'), 0, -1) . "@",
-                    $truename
-                )
-            ) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Get the value set for ENGINE table,
-     *
-     * @param array   $current_table current table
-     * @param integer $sum_size      total table size
-     * @param integer $overhead_size overhead size
-     *
-     * @return array
-     * @internal param bool $table_is_view whether table is view or not
-     */
-    protected function getStuffForEngineTypeTable(
-        $current_table, $sum_size, $overhead_size
-    ) {
-        $formatted_size = '-';
-        $unit = '';
-        $formatted_overhead = '';
-        $overhead_unit = '';
-        $table_is_view = false;
-
-        switch ( $current_table['ENGINE']) {
-        // MyISAM, ISAM or Heap table: Row count, data size and index size
-        // are accurate; data size is accurate for ARCHIVE
-        case 'MyISAM' :
-        case 'ISAM' :
-        case 'HEAP' :
-        case 'MEMORY' :
-        case 'ARCHIVE' :
-        case 'Aria' :
-        case 'Maria' :
-        case 'TokuDB' :
-            list($current_table, $formatted_size, $unit, $formatted_overhead,
-                $overhead_unit, $overhead_size, $sum_size)
-                    = $this->getValuesForAriaTable(
-                        $current_table, $sum_size, $overhead_size,
-                        $formatted_size, $unit, $formatted_overhead, $overhead_unit
-                    );
-            break;
-        case 'InnoDB' :
-        case 'PBMS' :
-            // InnoDB table: Row count is not accurate but data and index sizes are.
-            // PBMS table in Drizzle: TABLE_ROWS is taken from table cache,
-            // so it may be unavailable
-            list($current_table, $formatted_size, $unit, $sum_size)
-                = $this->getValuesForInnodbTable(
-                    $current_table, $sum_size
-                );
-            break;
-        // Mysql 5.0.x (and lower) uses MRG_MyISAM
-        // and MySQL 5.1.x (and higher) uses MRG_MYISAM
-        // Both are aliases for MERGE
-        case 'MRG_MyISAM' :
-        case 'MRG_MYISAM' :
-        case 'MERGE' :
-        case 'BerkeleyDB' :
-            // Merge or BerkleyDB table: Only row count is accurate.
-            if ($this->_is_show_stats) {
-                $formatted_size =  ' - ';
-                $unit          =  '';
-            }
-            break;
-        // for a view, the ENGINE is sometimes reported as null,
-        // or on some servers it's reported as "SYSTEM VIEW"
-        case null :
-        case 'SYSTEM VIEW' :
-            // possibly a view, do nothing
-            break;
-        default :
-            // Unknown table type.
-            if ($this->_is_show_stats) {
-                $formatted_size =  __('unknown');
-                $unit          =  '';
-            }
-        } // end switch
-
-        if ($current_table['TABLE_TYPE'] == 'VIEW'
-            || $current_table['TABLE_TYPE'] == 'SYSTEM VIEW'
-        ) {
-            // countRecords() takes care of $cfg['MaxExactCountViews']
-            $current_table['TABLE_ROWS'] = $this->dbi
-                ->getTable($this->db, $current_table['TABLE_NAME'])
-                ->countRecords(true);
-            $table_is_view = true;
-        }
-
-        return array($current_table, $formatted_size, $unit, $formatted_overhead,
-            $overhead_unit, $overhead_size, $table_is_view, $sum_size
-        );
-    }
-
-    /**
-     * Get values for ARIA/MARIA tables
-     *
-     * @param array   $current_table      current table
-     * @param integer $sum_size           sum size
-     * @param integer $overhead_size      overhead size
-     * @param integer $formatted_size     formatted size
-     * @param string  $unit               unit
-     * @param integer $formatted_overhead overhead formatted
-     * @param string  $overhead_unit      overhead unit
-     *
-     * @return array
-     */
-    protected function getValuesForAriaTable(
-        $current_table, $sum_size, $overhead_size, $formatted_size, $unit,
-        $formatted_overhead, $overhead_unit
-    ) {
-        if ($this->_db_is_system_schema) {
-            $current_table['Rows'] = $this->dbi
-                ->getTable($this->db, $current_table['Name'])
-                ->countRecords();
-        }
-
-        if ($this->_is_show_stats) {
-            $tblsize = $current_table['Data_length']
-                + $current_table['Index_length'];
-            $sum_size += $tblsize;
-            list($formatted_size, $unit) = Util::formatByteDown(
-                $tblsize, 3, ($tblsize > 0) ? 1 : 0
-            );
-            if (isset($current_table['Data_free'])
-                && $current_table['Data_free'] > 0
-            ) {
-                // here, the value 4 as the second parameter
-                // would transform 6.1MiB into 6,224.6KiB
-                list($formatted_overhead, $overhead_unit)
-                    = Util::formatByteDown(
-                        $current_table['Data_free'], 4,
-                        (($current_table['Data_free'] > 0) ? 1 : 0)
-                    );
-                $overhead_size += $current_table['Data_free'];
-            }
-        }
-        return array($current_table, $formatted_size, $unit, $formatted_overhead,
-            $overhead_unit, $overhead_size, $sum_size
-        );
-    }
-
-    /**
-     * Get values for InnoDB table
-     *
-     * @param array   $current_table current table
-     * @param integer $sum_size      sum size
-     *
-     * @return array
-     */
-    protected function getValuesForInnodbTable(
-        $current_table, $sum_size
-    ) {
-        $formatted_size = $unit = '';
-
-        if (($current_table['ENGINE'] == 'InnoDB'
-            && $current_table['TABLE_ROWS'] < $GLOBALS['cfg']['MaxExactCount'])
-            || !isset($current_table['TABLE_ROWS'])
-        ) {
-            $current_table['COUNTED'] = true;
-            $current_table['TABLE_ROWS'] = $this->dbi
-                ->getTable($this->db, $current_table['TABLE_NAME'])
-                ->countRecords(true);
-        } else {
-            $current_table['COUNTED'] = false;
-        }
-
-        if ($this->_is_show_stats) {
-            $tblsize = $current_table['Data_length']
-                + $current_table['Index_length'];
-            $sum_size += $tblsize;
-            list($formatted_size, $unit) = Util::formatByteDown(
-                $tblsize, 3, (($tblsize > 0) ? 1 : 0)
-            );
-        }
-
-        return array($current_table, $formatted_size, $unit, $sum_size);
-    }
-}
diff --git a/#pma/libraries/controllers/server/ServerBinlogController.php b/#pma/libraries/controllers/server/ServerBinlogController.php
deleted file mode 100644
index c1165ec5..00000000
--- a/#pma/libraries/controllers/server/ServerBinlogController.php
+++ /dev/null
@@ -1,262 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-
-/**
- * Holds the PMA\libraries\controllers\server\ServerBinlogController
- *
- * @package PMA\libraries\controllers\server
- */
-
-namespace PMA\libraries\controllers\server;
-
-use PMA\libraries\controllers\Controller;
-use PMA\libraries\DatabaseInterface;
-use PMA\libraries\Message;
-use PMA\libraries\Util;
-use PMA\libraries\Template;
-
-/**
- * Handles viewing binary logs
- *
- * @package PMA\libraries\controllers\server
- */
-class ServerBinlogController extends Controller
-{
-    /**
-     * array binary log files
-     */
-    protected $binary_logs;
-
-    /**
-     * Constructs ServerBinlogController
-     */
-    public function __construct()
-    {
-        parent::__construct();
-        $this->binary_logs = $this->dbi->fetchResult(
-            'SHOW MASTER LOGS',
-            'Log_name',
-            null,
-            null,
-            DatabaseInterface::QUERY_STORE
-        );
-    }
-
-    /**
-     * Index action
-     *
-     * @return void
-     */
-    public function indexAction()
-    {
-        /**
-         * Does the common work
-         */
-        include_once 'libraries/server_common.inc.php';
-
-        $url_params = array();
-        if (! isset($_REQUEST['log'])
-            || ! array_key_exists($_REQUEST['log'], $this->binary_logs)
-        ) {
-            $_REQUEST['log'] = '';
-        } else {
-            $url_params['log'] = $_REQUEST['log'];
-        }
-
-        if (!empty($_REQUEST['dontlimitchars'])) {
-            $url_params['dontlimitchars'] = 1;
-        }
-
-        $this->response->addHTML(PMA_getHtmlForSubPageHeader('binlog'));
-        $this->response->addHTML($this->_getLogSelector($url_params));
-        $this->response->addHTML($this->_getLogInfo($url_params));
-    }
-
-    /**
-     * Returns the html for log selector.
-     *
-     * @param array $url_params links parameters
-     *
-     * @return string
-     */
-    private function _getLogSelector($url_params)
-    {
-        return Template::get('server/binlog/log_selector')->render(
-            array(
-                'url_params' => $url_params,
-                'binary_logs' => $this->binary_logs,
-            )
-        );
-    }
-
-    /**
-     * Returns the html for binary log information.
-     *
-     * @param array $url_params links parameters
-     *
-     * @return string
-     */
-    private function _getLogInfo($url_params)
-    {
-        /**
-         * Need to find the real end of rows?
-         */
-        if (! isset($_REQUEST['pos'])) {
-            $pos = 0;
-        } else {
-            /* We need this to be a integer */
-            $pos = (int) $_REQUEST['pos'];
-        }
-
-        $sql_query = 'SHOW BINLOG EVENTS';
-        if (! empty($_REQUEST['log'])) {
-            $sql_query .= ' IN \'' . $_REQUEST['log'] . '\'';
-        }
-        $sql_query .= ' LIMIT ' . $pos . ', ' . intval($GLOBALS['cfg']['MaxRows']);
-
-        /**
-         * Sends the query
-         */
-        $result = $this->dbi->query($sql_query);
-
-        /**
-         * prepare some vars for displaying the result table
-         */
-        // Gets the list of fields properties
-        if (isset($result) && $result) {
-            $num_rows = $this->dbi->numRows($result);
-        } else {
-            $num_rows = 0;
-        }
-
-        if (empty($_REQUEST['dontlimitchars'])) {
-            $dontlimitchars = false;
-        } else {
-            $dontlimitchars = true;
-            $url_params['dontlimitchars'] = 1;
-        }
-
-        //html output
-        $html  = Util::getMessage(Message::success(), $sql_query);
-        $html .= '<table id="binlogTable">'
-            . '<thead>'
-            . '<tr>'
-            . '<td colspan="6" class="center">';
-
-        $html .= $this->_getNavigationRow($url_params, $pos, $num_rows, $dontlimitchars);
-
-        $html .=  '</td>'
-            . '</tr>'
-            . '<tr>'
-            . '<th>' . __('Log name') . '</th>'
-            . '<th>' . __('Position') . '</th>'
-            . '<th>' . __('Event type') . '</th>'
-            . '<th>' . __('Server ID') . '</th>'
-            . '<th>' . __('Original position') . '</th>'
-            . '<th>' . __('Information') . '</th>'
-            . '</tr>'
-            . '</thead>'
-            . '<tbody>';
-
-        $html .= $this->_getAllLogItemInfo($result, $dontlimitchars);
-
-        $html .= '</tbody>'
-            . '</table>';
-
-        return $html;
-    }
-
-    /**
-     * Returns the html for Navigation Row.
-     *
-     * @param array $url_params     Links parameters
-     * @param int   $pos            Position to display
-     * @param int   $num_rows       Number of results row
-     * @param bool  $dontlimitchars Whether limit chars
-     *
-     * @return string
-     */
-    private function _getNavigationRow($url_params, $pos, $num_rows, $dontlimitchars)
-    {
-        $html = "";
-        // we do not know how much rows are in the binlog
-        // so we can just force 'NEXT' button
-        if ($pos > 0) {
-            $this_url_params = $url_params;
-            if ($pos > $GLOBALS['cfg']['MaxRows']) {
-                $this_url_params['pos'] = $pos - $GLOBALS['cfg']['MaxRows'];
-            }
-
-            $html .= '<a href="server_binlog.php'
-                . PMA_URL_getCommon($this_url_params) . '"';
-            if (Util::showIcons('TableNavigationLinksMode')) {
-                $html .= ' title="' . _pgettext('Previous page', 'Previous') . '">';
-            } else {
-                $html .= '>' . _pgettext('Previous page', 'Previous');
-            } // end if... else...
-            $html .= ' &lt; </a> - ';
-        }
-
-        $this_url_params = $url_params;
-        if ($pos > 0) {
-            $this_url_params['pos'] = $pos;
-        }
-        if ($dontlimitchars) {
-            unset($this_url_params['dontlimitchars']);
-            $tempTitle = __('Truncate Shown Queries');
-            $tempImgMode = 'partial';
-        } else {
-            $this_url_params['dontlimitchars'] = 1;
-            $tempTitle = __('Show Full Queries');
-            $tempImgMode = 'full';
-        }
-        $html .= '<a href="server_binlog.php' . PMA_URL_getCommon($this_url_params)
-            . '" title="' . $tempTitle . '">'
-            . '<img src="' . $GLOBALS['pmaThemeImage'] . 's_' . $tempImgMode
-            . 'text.png" alt="' . $tempTitle . '" /></a>';
-
-        // we do not now how much rows are in the binlog
-        // so we can just force 'NEXT' button
-        if ($num_rows >= $GLOBALS['cfg']['MaxRows']) {
-            $this_url_params = $url_params;
-            $this_url_params['pos'] = $pos + $GLOBALS['cfg']['MaxRows'];
-            $html .= ' - <a href="server_binlog.php'
-                . PMA_URL_getCommon($this_url_params)
-                . '"';
-            if (Util::showIcons('TableNavigationLinksMode')) {
-                $html .= ' title="' . _pgettext('Next page', 'Next') . '">';
-            } else {
-                $html .= '>' . _pgettext('Next page', 'Next');
-            } // end if... else...
-            $html .= ' &gt; </a>';
-        }
-
-        return $html;
-    }
-
-    /**
-     * Returns the html for all binary log items.
-     *
-     * @param resource $result         MySQL Query result
-     * @param bool     $dontlimitchars Whether limit chars
-     *
-     * @return string
-     */
-    private function _getAllLogItemInfo($result, $dontlimitchars)
-    {
-        $html = "";
-        $odd_row = true;
-        while ($value = $this->dbi->fetchAssoc($result)) {
-            $html .= Template::get('server/binlog/log_row')->render(
-                array(
-                    'odd_row' => $odd_row,
-                    'value' => $value,
-                    'dontlimitchars' => $dontlimitchars,
-                )
-            );
-
-            $odd_row = !$odd_row;
-        }
-        return $html;
-    }
-}
diff --git a/#pma/libraries/controllers/server/ServerCollationsController.php b/#pma/libraries/controllers/server/ServerCollationsController.php
deleted file mode 100644
index 09b23f0a..00000000
--- a/#pma/libraries/controllers/server/ServerCollationsController.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-
-/**
- * Holds the PMA\libraries\controllers\server\ServerCollationsController
- *
- * @package PMA\libraries\controllers\server
- */
-
-namespace PMA\libraries\controllers\server;
-
-use PMA\libraries\controllers\Controller;
-use PMA\libraries\Template;
-
-/**
- * Handles viewing character sets and collations
- *
- * @package PMA\libraries\controllers\server
- */
-class ServerCollationsController extends Controller
-{
-    /**
-     * Index action
-     *
-     * @return void
-     */
-    public function indexAction()
-    {
-        /**
-         * Does the common work
-         */
-        include_once 'libraries/server_common.inc.php';
-        /**
-         * Includes the required charset library
-         */
-        include_once 'libraries/mysql_charsets.inc.php';
-
-        $this->response->addHTML(PMA_getHtmlForSubPageHeader('collations'));
-        $this->response->addHTML(
-            $this->_getHtmlForCharsets(
-                $GLOBALS['mysql_charsets'],
-                $GLOBALS['mysql_collations'],
-                $GLOBALS['mysql_charsets_descriptions'],
-                $GLOBALS['mysql_default_collations'],
-                $GLOBALS['mysql_collations_available']
-            )
-        );
-    }
-
-    /**
-     * Returns the html for server Character Sets and Collations.
-     *
-     * @param array $mysqlCharsets      Mysql Charsets list
-     * @param array $mysqlCollations    Mysql Collations list
-     * @param array $mysqlCharsetsDesc  Charsets descriptions
-     * @param array $mysqlDftCollations Default Collations list
-     * @param array $mysqlCollAvailable Available Collations list
-     *
-     * @return string
-     */
-    function _getHtmlForCharsets($mysqlCharsets, $mysqlCollations,
-        $mysqlCharsetsDesc, $mysqlDftCollations, $mysqlCollAvailable
-    ) {
-        return Template::get('server/collations/charsets')->render(
-            array(
-                'mysqlCharsets' => $mysqlCharsets,
-                'mysqlCollations' => $mysqlCollations,
-                'mysqlCharsetsDesc' => $mysqlCharsetsDesc,
-                'mysqlDftCollations' => $mysqlDftCollations,
-                'mysqlCollAvailable' => $mysqlCollAvailable,
-            )
-        );
-    }
-}
diff --git a/#pma/libraries/controllers/server/ServerDatabasesController.php b/#pma/libraries/controllers/server/ServerDatabasesController.php
deleted file mode 100644
index 402813cb..00000000
--- a/#pma/libraries/controllers/server/ServerDatabasesController.php
+++ /dev/null
@@ -1,587 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-
-/**
- * Holds the PMA\libraries\controllers\server\ServerDatabasesController
- *
- * @package PMA\libraries\controllers\server
- */
-
-namespace PMA\libraries\controllers\server;
-
-use PMA\libraries\controllers\Controller;
-use PMA\libraries\Message;
-use PMA\libraries\Template;
-use PMA\libraries\Util;
-
-/**
- * Handles viewing and creating and deleting databases
- *
- * @package PMA\libraries\controllers\server
- */
-class ServerDatabasesController extends Controller
-{
-    /**
-     * @var array array of database details
-     */
-    private $_databases;
-    /**
-     * @var int number of databases
-     */
-    private $_database_count;
-    /**
-     * @var string sort by column
-     */
-    private $_sort_by;
-    /**
-     * @var string sort order of databases
-     */
-    private $_sort_order;
-    /**
-     * @var boolean whether to show database statistics
-     */
-    private $_dbstats;
-    /**
-     * @var int position in list navigation
-     */
-    private $_pos;
-
-    /**
-     * Index action
-     *
-     * @return void
-     */
-    public function indexAction()
-    {
-        include_once 'libraries/check_user_privileges.lib.php';
-
-        if (isset($_REQUEST['drop_selected_dbs'])
-            && $GLOBALS['is_ajax_request']
-            && ($GLOBALS['is_superuser'] || $GLOBALS['cfg']['AllowUserDropDatabase'])
-        ) {
-            $this->dropDatabasesAction();
-            return;
-        }
-
-        include_once 'libraries/replication.inc.php';
-        include_once 'libraries/mysql_charsets.inc.php';
-
-        if (! empty($_POST['new_db'])
-            && $GLOBALS['is_ajax_request']
-        ) {
-            $this->createDatabaseAction();
-            return;
-        }
-
-        include_once 'libraries/server_common.inc.php';
-
-        $header  = $this->response->getHeader();
-        $scripts = $header->getScripts();
-        $scripts->addFile('server_databases.js');
-
-        $this->_setSortDetails();
-        $this->_dbstats = empty($_REQUEST['dbstats']) ? false : true;
-        $this->_pos     = empty($_REQUEST['pos']) ? 0 : (int) $_REQUEST['pos'];
-
-        /**
-         * Displays the sub-page heading
-         */
-        $header_type = $this->_dbstats ? "database_statistics" : "databases";
-        $this->response->addHTML(PMA_getHtmlForSubPageHeader($header_type));
-
-        /**
-         * Displays For Create database.
-         */
-        $html = '';
-        if ($GLOBALS['cfg']['ShowCreateDb']) {
-            $html .= Template::get('server/databases/create')->render();
-        }
-
-        /**
-         * Gets the databases list
-         */
-        if ($GLOBALS['server'] > 0) {
-            $this->_databases = $this->dbi->getDatabasesFull(
-                null, $this->_dbstats, null, $this->_sort_by,
-                $this->_sort_order, $this->_pos, true
-            );
-            $this->_database_count = count($GLOBALS['dblist']->databases);
-        } else {
-            $this->_database_count = 0;
-        }
-
-        /**
-         * Displays the page
-         */
-        if ($this->_database_count > 0 && ! empty($this->_databases)) {
-            $html .= $this->_getHtmlForDatabases($replication_types);
-        } else {
-            $html .= __('No databases');
-        }
-
-        $this->response->addHTML($html);
-    }
-
-    /**
-     * Handles creating a new database
-     *
-     * @return void
-     */
-    public function createDatabaseAction()
-    {
-        /**
-         * Builds and executes the db creation sql query
-         */
-        $sql_query = 'CREATE DATABASE ' . Util::backquote($_POST['new_db']);
-        if (! empty($_POST['db_collation'])) {
-            list($db_charset) = explode('_', $_POST['db_collation']);
-            if (in_array($db_charset, $GLOBALS['mysql_charsets'])
-                && in_array($_POST['db_collation'], $GLOBALS['mysql_collations'][$db_charset])
-            ) {
-                $sql_query .= ' DEFAULT'
-                    . PMA_generateCharsetQueryPart($_POST['db_collation']);
-            }
-        }
-        $sql_query .= ';';
-
-        $result = $GLOBALS['dbi']->tryQuery($sql_query);
-
-        if (! $result) {
-            // avoid displaying the not-created db name in header or navi panel
-            $GLOBALS['db'] = '';
-
-            $message = Message::rawError($GLOBALS['dbi']->getError());
-            $this->response->setRequestStatus(false);
-            $this->response->addJSON('message', $message);
-        } else {
-            $GLOBALS['db'] = $_POST['new_db'];
-
-            $message = Message::success(__('Database %1$s has been created.'));
-            $message->addParam($_POST['new_db']);
-            $this->response->addJSON('message', $message);
-            $this->response->addJSON(
-                'sql_query', Util::getMessage(null, $sql_query, 'success')
-            );
-
-            $url_query = PMA_URL_getCommon(array('db' => $_POST['new_db']));
-            $this->response->addJSON(
-                'url_query',
-                Util::getScriptNameForOption(
-                    $GLOBALS['cfg']['DefaultTabDatabase'], 'database'
-                )
-                . $url_query . '&amp;db='
-                . urlencode($_POST['new_db'])
-            );
-        }
-    }
-
-    /**
-     * Handles dropping multiple databases
-     *
-     * @return void
-     */
-    public function dropDatabasesAction()
-    {
-        if (! isset($_REQUEST['selected_dbs'])) {
-            $message = Message::error(__('No databases selected.'));
-        } else {
-            $action = 'server_databases.php';
-            $err_url = $action . PMA_URL_getCommon();
-
-            $GLOBALS['submit_mult'] = 'drop_db';
-            $GLOBALS['mult_btn'] = __('Yes');
-
-            include 'libraries/mult_submits.inc.php';
-
-            if (empty($message)) { // no error message
-                $number_of_databases = count($selected);
-                $message = Message::success(
-                    _ngettext(
-                        '%1$d database has been dropped successfully.',
-                        '%1$d databases have been dropped successfully.',
-                        $number_of_databases
-                    )
-                );
-                $message->addParam($number_of_databases);
-            }
-        }
-
-        if ($message instanceof Message) {
-            $this->response->setRequestStatus($message->isSuccess());
-            $this->response->addJSON('message', $message);
-        }
-    }
-
-    /**
-     * Extracts parameters $sort_order and $sort_by
-     *
-     * @return void
-     */
-    private function _setSortDetails()
-    {
-        if (empty($_REQUEST['sort_by'])) {
-            $this->_sort_by = 'SCHEMA_NAME';
-        } else {
-            $sort_by_whitelist = array(
-                'SCHEMA_NAME',
-                'DEFAULT_COLLATION_NAME',
-                'SCHEMA_TABLES',
-                'SCHEMA_TABLE_ROWS',
-                'SCHEMA_DATA_LENGTH',
-                'SCHEMA_INDEX_LENGTH',
-                'SCHEMA_LENGTH',
-                'SCHEMA_DATA_FREE'
-            );
-            if (in_array($_REQUEST['sort_by'], $sort_by_whitelist)) {
-                $this->_sort_by = $_REQUEST['sort_by'];
-            } else {
-                $this->_sort_by = 'SCHEMA_NAME';
-            }
-        }
-
-        if (isset($_REQUEST['sort_order'])
-            && mb_strtolower($_REQUEST['sort_order']) == 'desc'
-        ) {
-            $this->_sort_order = 'desc';
-        } else {
-            $this->_sort_order = 'asc';
-        }
-    }
-
-    /**
-     * Returns the html for Database List
-     *
-     * @param array $replication_types replication types
-     *
-     * @return string
-     */
-    private function _getHtmlForDatabases($replication_types)
-    {
-
-        $html = '<div id="tableslistcontainer">';
-        $first_database = reset($this->_databases);
-        // table col order
-        $column_order = $this->_getColumnOrder();
-
-        $_url_params = array(
-            'pos' => $this->_pos,
-            'dbstats' => $this->_dbstats,
-            'sort_by' => $this->_sort_by,
-            'sort_order' => $this->_sort_order,
-        );
-
-        $html .= Util::getListNavigator(
-            $this->_database_count, $this->_pos, $_url_params,
-            'server_databases.php', 'frame_content', $GLOBALS['cfg']['MaxDbList']
-        );
-
-        $_url_params['pos'] = $this->_pos;
-
-        $html .= '<form class="ajax" action="server_databases.php" ';
-        $html .= 'method="post" name="dbStatsForm" id="dbStatsForm">' . "\n";
-        $html .= PMA_URL_getHiddenInputs($_url_params);
-
-        $_url_params['sort_by'] = 'SCHEMA_NAME';
-        $_url_params['sort_order']
-            = ($this->_sort_by == 'SCHEMA_NAME' && $this->_sort_order == 'asc')
-            ? 'desc' : 'asc';
-
-        // calculate aggregate stats to display in footer
-        foreach ($this->_databases as $current) {
-            foreach ($column_order as $stat_name => $stat) {
-                if (array_key_exists($stat_name, $current)
-                    && is_numeric($stat['footer'])
-                ) {
-                    $column_order[$stat_name]['footer'] += $current[$stat_name];
-                }
-            }
-        }
-
-        // database table
-        $html .= '<table id="tabledatabases" class="data">' . "\n";
-        $html .= $this->_getHtmlForTableHeader(
-            $_url_params, $column_order, $first_database
-        );
-        $html .= $this->_getHtmlForTableBody($column_order, $replication_types);
-        $html .= $this->_getHtmlForTableFooter($column_order, $first_database);
-        $html .= '</table>' . "\n";
-
-        $html .= $this->_getHtmlForTableFooterButtons();
-
-        if (empty($this->_dbstats)) {
-            //we should put notice above database list
-            $html .= $this->_getHtmlForNoticeEnableStatistics();
-        }
-        $html .= '</form>';
-        $html .= '</div>';
-
-        return $html;
-    }
-
-    /**
-     * Prepares the $column_order array
-     *
-     * @return array
-     */
-    private function _getColumnOrder()
-    {
-        $column_order = array();
-        $column_order['DEFAULT_COLLATION_NAME'] = array(
-            'disp_name' => __('Collation'),
-            'description_function' => 'PMA_getCollationDescr',
-            'format'    => 'string',
-            'footer'    => PMA_getServerCollation(),
-        );
-        $column_order['SCHEMA_TABLES'] = array(
-            'disp_name' => __('Tables'),
-            'format'    => 'number',
-            'footer'    => 0,
-        );
-        $column_order['SCHEMA_TABLE_ROWS'] = array(
-            'disp_name' => __('Rows'),
-            'format'    => 'number',
-            'footer'    => 0,
-        );
-        $column_order['SCHEMA_DATA_LENGTH'] = array(
-            'disp_name' => __('Data'),
-            'format'    => 'byte',
-            'footer'    => 0,
-        );
-        $column_order['SCHEMA_INDEX_LENGTH'] = array(
-            'disp_name' => __('Indexes'),
-            'format'    => 'byte',
-            'footer'    => 0,
-        );
-        $column_order['SCHEMA_LENGTH'] = array(
-            'disp_name' => __('Total'),
-            'format'    => 'byte',
-            'footer'    => 0,
-        );
-        $column_order['SCHEMA_DATA_FREE'] = array(
-            'disp_name' => __('Overhead'),
-            'format'    => 'byte',
-            'footer'    => 0,
-        );
-
-        return $column_order;
-    }
-
-    /**
-     * Returns the html for Table footer buttons
-     *
-     * @return string
-     */
-    private function _getHtmlForTableFooterButtons()
-    {
-        if (! $GLOBALS['is_superuser']
-            && ! $GLOBALS['cfg']['AllowUserDropDatabase']
-        ) {
-            return '';
-        }
-
-        $html = Util::getWithSelected(
-            $GLOBALS['pmaThemeImage'], $GLOBALS['text_dir'], "dbStatsForm"
-        );
-        $html .= Util::getButtonOrImage(
-            '',
-            'mult_submit' . ' ajax',
-            'drop_selected_dbs',
-            __('Drop'), 'b_deltbl.png'
-        );
-
-        return $html;
-    }
-
-    /**
-     * Returns the html for Table footer
-     *
-     * @param string $column_order   column order
-     * @param string $first_database first database
-     *
-     * @return string
-     */
-    private function _getHtmlForTableFooter($column_order, $first_database)
-    {
-        return Template::get('server/databases/table_footer')->render(
-            array(
-                'column_order' => $column_order,
-                'first_database' => $first_database,
-                'master_replication' => $GLOBALS['replication_info']['master']['status'],
-                'slave_replication' => $GLOBALS['replication_info']['slave']['status'],
-                'databaseCount' => $this->_database_count,
-            )
-        );
-    }
-
-    /**
-     * Returns the html for Database List
-     *
-     * @param array $column_order      column order
-     * @param array $replication_types replication types
-     *
-     * @return string
-     */
-    private function _getHtmlForTableBody($column_order, $replication_types)
-    {
-        $odd_row = true;
-        $html = '<tbody>' . "\n";
-
-        foreach ($this->_databases as $current) {
-            $tr_class = $odd_row ? 'odd' : 'even';
-            if ($this->dbi->isSystemSchema($current['SCHEMA_NAME'], true)) {
-                $tr_class .= ' noclick';
-            }
-            $odd_row = ! $odd_row;
-
-            $generated_html = $this->_buildHtmlForDb(
-                $current,
-                $GLOBALS['url_query'],
-                $column_order,
-                $replication_types,
-                $GLOBALS['replication_info'],
-                $tr_class
-            );
-            $html .= $generated_html;
-        } // end foreach ($this->_databases as $key => $current)
-        $html .= '</tbody>';
-
-        return $html;
-    }
-
-    /**
-     * Builds the HTML for one database to display in the list
-     * of databases from server_databases.php
-     *
-     * @param array  $current           current database
-     * @param string $url_query         url query
-     * @param array  $column_order      column order
-     * @param array  $replication_types replication types
-     * @param array  $replication_info  replication info
-     * @param string $tr_class          HTMl class for the row
-     *
-     * @return array $column_order, $out
-     */
-    function _buildHtmlForDb(
-        $current, $url_query, $column_order,
-        $replication_types, $replication_info, $tr_class = ''
-    ) {
-        $master_replication = $slave_replication = '';
-        foreach ($replication_types as $type) {
-            if ($replication_info[$type]['status']) {
-                $out = '';
-                $key = array_search(
-                    $current["SCHEMA_NAME"],
-                    $replication_info[$type]['Ignore_DB']
-                );
-                if (mb_strlen($key) > 0) {
-                    $out = Util::getIcon(
-                        's_cancel.png',
-                        __('Not replicated')
-                    );
-                } else {
-                    $key = array_search(
-                        $current["SCHEMA_NAME"], $replication_info[$type]['Do_DB']
-                    );
-
-                    if (mb_strlen($key) > 0
-                        || count($replication_info[$type]['Do_DB']) == 0
-                    ) {
-                        // if ($key != null) did not work for index "0"
-                        $out = Util::getIcon(
-                            's_success.png',
-                            __('Replicated')
-                        );
-                    }
-                }
-
-                if ($type == 'master') {
-                    $master_replication = $out;
-                } elseif ($type == 'slave') {
-                    $slave_replication = $out;
-                }
-            }
-        }
-
-        return Template::get('server/databases/table_row')->render(
-            array(
-                'current' => $current,
-                'tr_class' => $tr_class,
-                'url_query' => $url_query,
-                'column_order' => $column_order,
-                'master_replication_status'
-                    => $GLOBALS['replication_info']['master']['status'],
-                'master_replication' => $master_replication,
-                'slave_replication_status'
-                    => $GLOBALS['replication_info']['slave']['status'],
-                'slave_replication' => $slave_replication,
-            )
-        );
-    }
-
-    /**
-     * Returns the html for table header
-     *
-     * @param array $_url_params    url params
-     * @param array $column_order   column order
-     * @param array $first_database database to show
-     *
-     * @return string
-     */
-    private function _getHtmlForTableHeader(
-        $_url_params, $column_order, $first_database
-    ) {
-        return Template::get('server/databases/table_header')->render(
-            array(
-                '_url_params' => $_url_params,
-                'sort_by' => $this->_sort_by,
-                'sort_order' => $this->_sort_order,
-                'sort_order_text' => ($this->_sort_order == 'asc'
-                    ? __('Ascending') : __('Descending')),
-                'column_order' => $column_order,
-                'first_database' => $first_database,
-                'master_replication'
-                    => $GLOBALS['replication_info']['master']['status'],
-                'slave_replication'
-                    => $GLOBALS['replication_info']['slave']['status'],
-            )
-        );
-    }
-
-
-    /**
-     * Returns the html for Enable Statistics
-     *
-     * @return string
-     */
-    private function _getHtmlForNoticeEnableStatistics()
-    {
-        $html = '';
-
-        $notice = Message::notice(
-            __(
-                'Note: Enabling the database statistics here might cause '
-                . 'heavy traffic between the web server and the MySQL server.'
-            )
-        )->getDisplay();
-        $html .= $notice;
-
-        $items = array();
-        $items[] = array(
-            'content' => '<strong>' . "\n"
-                . __('Enable statistics')
-                . '</strong><br />' . "\n",
-            'class' => 'li_switch_dbstats',
-            'url' => array(
-                'href' => 'server_databases.php'
-                    . $GLOBALS['url_query'] . '&amp;dbstats=1',
-                'title' => __('Enable statistics')
-            ),
-        );
-
-        $html .= Template::get('list/unordered')->render(
-            array('items' => $items,)
-        );
-
-        return $html;
-    }
-}
diff --git a/#pma/libraries/controllers/server/ServerEnginesController.php b/#pma/libraries/controllers/server/ServerEnginesController.php
deleted file mode 100644
index 5f29a918..00000000
--- a/#pma/libraries/controllers/server/ServerEnginesController.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-
-/**
- * Holds the PMA\libraries\controllers\server\ServerEnginesController
- *
- * @package PMA\libraries\controllers\server
- */
-
-namespace PMA\libraries\controllers\server;
-
-use PMA\libraries\controllers\Controller;
-use PMA\libraries\StorageEngine;
-use PMA\libraries\Template;
-use PMA\libraries\Util;
-
-/**
- * Handles viewing storage engine details
- *
- * @package PMA\libraries\controllers\server
- */
-class ServerEnginesController extends Controller
-{
-    /**
-     * Index action
-     *
-     * @return void
-     */
-    public function indexAction()
-    {
-        /**
-         * Does the common work
-         */
-        require 'libraries/server_common.inc.php';
-
-        /**
-         * Displays the sub-page heading
-         */
-        $this->response->addHTML(PMA_getHtmlForSubPageHeader('engines'));
-
-        /**
-         * Did the user request information about a certain storage engine?
-         */
-        if (empty($_REQUEST['engine'])
-            || ! StorageEngine::isValid($_REQUEST['engine'])
-        ) {
-            $this->response->addHTML($this->_getHtmlForAllServerEngines());
-        } else {
-            $engine = StorageEngine::getEngine($_REQUEST['engine']);
-            $this->response->addHTML($this->_getHtmlForServerEngine($engine));
-        }
-    }
-
-    /**
-     * Return HTML with all Storage Engine information
-     *
-     * @return string
-     */
-    private function _getHtmlForAllServerEngines()
-    {
-        return Template::get('server/engines/engines')->render(
-            array('engines' => StorageEngine::getStorageEngines())
-        );
-    }
-
-    /**
-     * Return HTML for a given Storage Engine
-     *
-     * @param StorageEngine $engine storage engine
-     *
-     * @return string
-     */
-    private function _getHtmlForServerEngine($engine)
-    {
-        $pageOutput = ! empty($_REQUEST['page'])
-            ? $engine->getPage($_REQUEST['page']) : '';
-
-        /**
-         * Displays details about a given Storage Engine
-         */
-        return Template::get('server/engines/engine')->render(
-            array(
-                'title' => $engine->getTitle(),
-                'helpPage' => $engine->getMysqlHelpPage(),
-                'comment' => $engine->getComment(),
-                'infoPages' => $engine->getInfoPages(),
-                'support' => $engine->getSupportInformationMessage(),
-                'variables' => $engine->getHtmlVariables(),
-                'pageOutput' => $pageOutput,
-            )
-        );
-    }
-}
\ No newline at end of file
diff --git a/#pma/libraries/controllers/server/ServerPluginsController.php b/#pma/libraries/controllers/server/ServerPluginsController.php
deleted file mode 100644
index a824eb37..00000000
--- a/#pma/libraries/controllers/server/ServerPluginsController.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-
-/**
- * Holds the PMA\libraries\controllers\server\ServerPluginsController
-*
-* @package PMA\libraries\controllers\server
-*/
-
-namespace PMA\libraries\controllers\server;
-
-use PMA\libraries\controllers\Controller;
-use PMA\libraries\Template;
-
-/**
- * Handles viewing server plugin details
- *
- * @package PMA\libraries\controllers\server
- */
-class ServerPluginsController extends Controller
-{
-    /**
-     * @var array plugin details
-     */
-    protected $plugins;
-
-    /**
-     * Constructs ServerPluginsController
-     */
-    public function __construct()
-    {
-        parent::__construct();
-        $this->_setServerPlugins();
-    }
-
-    /**
-     * Index action
-     *
-     * @return void
-     */
-    public function indexAction()
-    {
-        include 'libraries/server_common.inc.php';
-
-        $header  = $this->response->getHeader();
-        $scripts = $header->getScripts();
-        $scripts->addFile('jquery/jquery.tablesorter.js');
-        $scripts->addFile('server_plugins.js');
-
-        /**
-         * Displays the page
-        */
-        $this->response->addHTML(PMA_getHtmlForSubPageHeader('plugins'));
-        $this->response->addHTML($this->_getPluginsHtml());
-    }
-
-    /**
-     * Sets details about server plugins
-     *
-     * @return void
-     */
-    private function _setServerPlugins()
-    {
-        $sql = "SELECT plugin_name,
-                       plugin_type,
-                       (plugin_status = 'ACTIVE') AS is_active,
-                       plugin_type_version,
-                       plugin_author,
-                       plugin_description,
-                       plugin_license
-                FROM information_schema.plugins
-                ORDER BY plugin_type, plugin_name";
-
-        $res = $this->dbi->query($sql);
-        $this->plugins = array();
-        while ($row = $this->dbi->fetchAssoc($res)) {
-            $this->plugins[$row['plugin_type']][] = $row;
-        }
-        $this->dbi->freeResult($res);
-        ksort($this->plugins);
-    }
-
-    /**
-     * Returns the html for plugin Tab.
-     *
-     * @return string
-     */
-    private function _getPluginsHtml()
-    {
-        $html  = '<div id="plugins_plugins">';
-        $html .= Template::get('server/plugins/section_links')
-            ->render(array('plugins' => $this->plugins));
-
-        foreach ($this->plugins as $plugin_type => $plugin_list) {
-            $html .= Template::get('server/plugins/section')
-                ->render(
-                    array(
-                        'plugin_type' => $plugin_type,
-                        'plugin_list' => $plugin_list,
-                    )
-                );
-        }
-        $html .= '</div>';
-        return $html;
-    }
-}
\ No newline at end of file
diff --git a/#pma/libraries/controllers/server/ServerVariablesController.php b/#pma/libraries/controllers/server/ServerVariablesController.php
deleted file mode 100644
index 2572eb99..00000000
--- a/#pma/libraries/controllers/server/ServerVariablesController.php
+++ /dev/null
@@ -1,2519 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-
-/**
- * Holds the PMA\libraries\controllers\server\ServerVariablesController
- *
- * @package PMA\libraries\controllers\server
- */
-
-namespace PMA\libraries\controllers\server;
-
-use PMA\libraries\controllers\Controller;
-use PMA\libraries\Message;
-use PMA\libraries\Template;
-use PMA\libraries\Util;
-
-/**
- * Handles viewing and editing server variables
- *
- * @package PMA\libraries\controllers\server
- */
-class ServerVariablesController extends Controller
-{
-    /**
-     * @var array Documentation links for variables
-     */
-    protected $variable_doc_links;
-
-    /**
-     * Constructs ServerVariablesController
-     */
-    public function __construct()
-    {
-        parent::__construct();
-
-        $this->variable_doc_links = $this->_getDocumentLinks();
-    }
-
-    /**
-     * Index action
-     *
-     * @return void
-     */
-    public function indexAction()
-    {
-        if (! empty($_REQUEST['ajax_request'])
-            && isset($_REQUEST['type'])
-            && $_REQUEST['type'] === 'getval'
-        ) {
-            $this->getValueAction();
-            return;
-        }
-
-        if (! empty($_REQUEST['ajax_request'])
-            && isset($_REQUEST['type'])
-            && $_REQUEST['type'] === 'setval'
-        ) {
-            $this->setValueAction();
-            return;
-        }
-
-        include 'libraries/server_common.inc.php';
-
-        $header   = $this->response->getHeader();
-        $scripts  = $header->getScripts();
-        $scripts->addFile('server_variables.js');
-
-        /**
-         * Displays the sub-page heading
-         */
-        $doc_link = Util::showMySQLDocu('server_system_variables');
-        $this->response->addHtml(
-            PMA_getHtmlForSubPageHeader('variables', $doc_link)
-        );
-
-        /**
-         * Sends the queries and buffers the results
-         */
-        $serverVarsResult = $this->dbi->tryQuery('SHOW SESSION VARIABLES;');
-
-        if ($serverVarsResult !== false) {
-
-            $serverVarsSession = array();
-            while ($arr = $this->dbi->fetchRow($serverVarsResult)) {
-                $serverVarsSession[$arr[0]] = $arr[1];
-            }
-            $this->dbi->freeResult($serverVarsResult);
-
-            $serverVars = $this->dbi->fetchResult('SHOW GLOBAL VARIABLES;', 0, 1);
-
-            /**
-             * Link templates
-            */
-            $this->response->addHtml($this->_getHtmlForLinkTemplates());
-
-            /**
-             * Displays the page
-            */
-            $this->response->addHtml(
-                $this->_getHtmlForServerVariables($serverVars, $serverVarsSession)
-            );
-        } else {
-            /**
-             * Display the error message
-             */
-            $this->response->addHTML(
-                Message::error(
-                    sprintf(
-                        __(
-                            'Not enough privilege to view server variables and '
-                            . 'settings. %s'
-                        ),
-                        Util::showMySQLDocu(
-                            'server-system-variables',
-                            false,
-                            'sysvar_show_compatibility_56'
-                        )
-                    )
-                )->getDisplay()
-            );
-        }
-    }
-
-    /**
-     * Handle the AJAX request for a single variable value
-     *
-     * @return void
-     */
-    public function getValueAction()
-    {
-        // Send with correct charset
-        header('Content-Type: text/html; charset=UTF-8');
-        // Do not use double quotes inside the query to avoid a problem
-        // when server is running in ANSI_QUOTES sql_mode
-        $varValue = $this->dbi->fetchSingleRow(
-            'SHOW GLOBAL VARIABLES WHERE Variable_name=\''
-            . $GLOBALS['dbi']->escapeString($_REQUEST['varName']) . '\';',
-            'NUM'
-        );
-
-        if (isset($this->variable_doc_links[$_REQUEST['varName']][3])
-            && $this->variable_doc_links[$_REQUEST['varName']][3] == 'byte'
-        ) {
-            $this->response->addJSON(
-                'message',
-                implode(
-                    ' ', Util::formatByteDown($varValue[1], 3, 3)
-                )
-            );
-        } else {
-            $this->response->addJSON(
-                'message',
-                $varValue[1]
-            );
-        }
-    }
-
-    /**
-     * Handle the AJAX request for setting value for a single variable
-     *
-     * @return void
-     */
-    public function setValueAction()
-    {
-        $value = $_REQUEST['varValue'];
-        $matches = array();
-
-        if (isset($this->variable_doc_links[$_REQUEST['varName']][3])
-            && $this->variable_doc_links[$_REQUEST['varName']][3] == 'byte'
-            && preg_match(
-                '/^\s*(\d+(\.\d+)?)\s*(mb|kb|mib|kib|gb|gib)\s*$/i',
-                $value,
-                $matches
-            )
-        ) {
-            $exp = array(
-                'kb' => 1,
-                'kib' => 1,
-                'mb' => 2,
-                'mib' => 2,
-                'gb' => 3,
-                'gib' => 3
-            );
-            $value = floatval($matches[1]) * Util::pow(
-                1024,
-                $exp[mb_strtolower($matches[3])]
-            );
-        } else {
-            $value = $GLOBALS['dbi']->escapeString($value);
-        }
-
-        if (! is_numeric($value)) {
-            $value="'" . $value . "'";
-        }
-
-        if (! preg_match("/[^a-zA-Z0-9_]+/", $_REQUEST['varName'])
-            && $this->dbi->query(
-                'SET GLOBAL ' . $_REQUEST['varName'] . ' = ' . $value
-            )
-        ) {
-            // Some values are rounded down etc.
-            $varValue = $this->dbi->fetchSingleRow(
-                'SHOW GLOBAL VARIABLES WHERE Variable_name="'
-                . $GLOBALS['dbi']->escapeString($_REQUEST['varName'])
-                . '";', 'NUM'
-            );
-            $this->response->addJSON(
-                'variable',
-                htmlspecialchars(
-                    $this->_formatVariable(
-                        $_REQUEST['varName'],
-                        $varValue[1]
-                    )
-                )
-            );
-        } else {
-            $this->response->setRequestStatus(false);
-            $this->response->addJSON(
-                'error',
-                __('Setting variable failed')
-            );
-        }
-    }
-
-    /**
-     * Format Variable
-     *
-     * @param string  $name  variable name
-     * @param integer $value variable value
-     *
-     * @return string formatted string
-     */
-    private function _formatVariable($name, $value)
-    {
-        if (is_numeric($value)) {
-            if (isset($this->variable_doc_links[$name][3])
-                && $this->variable_doc_links[$name][3]=='byte'
-            ) {
-                return '<abbr title="'
-                    . Util::formatNumber($value, 0) . '">'
-                    . implode(' ', Util::formatByteDown($value, 3, 3))
-                    . '</abbr>';
-            } else {
-                return Util::formatNumber($value, 0);
-            }
-        }
-        return $value;
-    }
-
-    /**
-     * Prints link templates
-     *
-     * @return string
-     */
-    private function _getHtmlForLinkTemplates()
-    {
-        $url = 'server_variables.php' . PMA_URL_getCommon();
-        return Template::get('server/variables/link_template')
-            ->render(array('url' => $url));
-    }
-
-    /**
-     * Prints Html for Server Variables
-     *
-     * @param array $serverVars        global variables
-     * @param array $serverVarsSession session variables
-     *
-     * @return string
-     */
-    private function _getHtmlForServerVariables($serverVars, $serverVarsSession)
-    {
-        // filter
-        $filterValue = ! empty($_REQUEST['filter']) ? $_REQUEST['filter'] : '';
-        $output = Template::get('server/variables/variable_filter')
-            ->render(array('filterValue' => $filterValue));
-
-        $output .= '<table id="serverVariables" class="data filteredData noclick">';
-        $output .= Template::get('server/variables/variable_table_head')->render();
-        $output .= '<tbody>';
-
-        $output .= $this->_getHtmlForServerVariablesItems(
-            $serverVars, $serverVarsSession
-        );
-
-        $output .= '</tbody>';
-        $output .= '</table>';
-
-        return $output;
-    }
-
-
-    /**
-     * Prints Html for Server Variables Items
-     *
-     * @param array $serverVars        global variables
-     * @param array $serverVarsSession session variables
-     *
-     * @return string
-     */
-    private function _getHtmlForServerVariablesItems(
-        $serverVars, $serverVarsSession
-    ) {
-        // list of static system variables
-        $static_variables = $this->_getStaticSystemVariables();
-
-        $output = '';
-        $odd_row = true;
-        foreach ($serverVars as $name => $value) {
-            $has_session_value = isset($serverVarsSession[$name])
-                && $serverVarsSession[$name] != $value;
-            $row_class = ($odd_row ? ' odd' : ' even')
-                . ($has_session_value ? ' diffSession' : '');
-            $docLink = isset($this->variable_doc_links[$name])
-                ? $this->variable_doc_links[$name] : null;
-            $formattedValue = $this->_formatVariable($name, $value);
-
-            $output .= Template::get('server/variables/variable_row')
-                ->render(
-                    array(
-                        'rowClass'    => $row_class,
-                        'editable'    => !in_array(
-                            strtolower($name),
-                            $static_variables
-                        ),
-                        'docLink'     => $docLink,
-                        'name'        => $name,
-                        'value'       => $formattedValue,
-                        'isSuperuser' => $this->dbi->isSuperuser(),
-                    )
-                );
-
-            if ($has_session_value) {
-                $formattedValue = $this->_formatVariable(
-                    $name, $serverVarsSession[$name]
-                );
-                $output .= Template::get('server/variables/session_variable_row')
-                    ->render(
-                        array(
-                            'rowClass' => $row_class,
-                            'value'    => $formattedValue,
-                        )
-                    );
-            }
-
-            $odd_row = ! $odd_row;
-        }
-
-        return $output;
-    }
-
-    /**
-     * Returns Array of documentation links
-     *
-     * $variable_doc_links[string $name] = array(
-     *    string $name,
-     *    string $anchor,
-     *    string $chapter,
-     *    string $type,
-     *    string $format);
-     * string $name: name of the system variable
-     * string $anchor: anchor to the documentation page
-     * string $chapter: chapter of "HTML, one page per chapter" documentation
-     * string $type: type of system variable
-     * string $format: if set to 'byte' it will format the variable
-     * with Util::formatByteDown()
-     *
-     * @return array
-     */
-    private function _getDocumentLinks()
-    {
-        $variable_doc_links = array();
-        $variable_doc_links['auto_increment_increment'] = array(
-            'auto_increment_increment',
-            'replication-options-master',
-            'sysvar');
-        $variable_doc_links['auto_increment_offset'] = array(
-            'auto_increment_offset',
-            'replication-options-master',
-            'sysvar');
-        $variable_doc_links['autocommit'] = array(
-            'autocommit',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['automatic_sp_privileges'] = array(
-            'automatic_sp_privileges',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['back_log'] = array(
-            'back_log',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['basedir'] = array(
-            'basedir',
-            'server-options',
-            'option_mysqld');
-        $variable_doc_links['big_tables'] = array(
-            'big-tables',
-            'server-options',
-            'option_mysqld');
-        $variable_doc_links['bind_address'] = array(
-            'bind-address',
-            'server-options',
-            'option_mysqld');
-        $variable_doc_links['binlog_cache_size'] = array(
-            'binlog_cache_size',
-            'replication-options-binary-log',
-            'sysvar',
-            'byte');
-        $variable_doc_links['binlog_checksum'] = array(
-            'binlog_checksum',
-            'replication-options-binary-log',
-            'sysvar');
-        $variable_doc_links['binlog_direct_non_transactional_updates'] = array(
-            'binlog_direct_non_transactional_updates',
-            'replication-options-binary-log',
-            'sysvar');
-        $variable_doc_links['binlog_format'] = array(
-            'binlog-format',
-            'server-options',
-            'sysvar');
-        $variable_doc_links['binlog_max_flush_queue_time'] = array(
-            'binlog_max_flush_queue_time',
-            'replication-options-binary-log',
-            'sysvar');
-        $variable_doc_links['binlog_order_commits'] = array(
-            'binlog_order_commits',
-            'replication-options-binary-log',
-            'sysvar');
-        $variable_doc_links['binlog_row_image'] = array(
-            'binlog_row_image',
-            'replication-options-binary-log',
-            'sysvar');
-        $variable_doc_links['binlog_rows_query_log_events'] = array(
-            'binlog_rows_query_log_events',
-            'replication-options-binary-log',
-            'sysvar');
-        $variable_doc_links['binlog_stmt_cache_size'] = array(
-            'binlog_stmt_cache_size',
-            'replication-options-binary-log',
-            'sysvar',
-            'byte');
-        $variable_doc_links['block_encryption_mode'] = array(
-            'block_encryption_mode',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['bulk_insert_buffer_size'] = array(
-            'bulk_insert_buffer_size',
-            'server-system-variables',
-            'sysvar',
-            'byte');
-        $variable_doc_links['character_set_client'] = array(
-            'character_set_client',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['character_set_connection'] = array(
-            'character_set_connection',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['character_set_database'] = array(
-            'character_set_database',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['character_set_filesystem'] = array(
-            'character-set-filesystem',
-            'server-options',
-            'option_mysqld');
-        $variable_doc_links['character_set_results'] = array(
-            'character_set_results',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['character_set_server'] = array(
-            'character-set-server',
-            'server-options',
-            'option_mysqld');
-        $variable_doc_links['character_set_system'] = array(
-            'character_set_system',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['character_sets_dir'] = array(
-            'character-sets-dir',
-            'server-options',
-            'option_mysqld');
-        $variable_doc_links['collation_connection'] = array(
-            'collation_connection',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['collation_database'] = array(
-            'collation_database',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['collation_server'] = array(
-            'collation-server',
-            'server-options',
-            'option_mysqld');
-        $variable_doc_links['completion_type'] = array(
-            'completion_type',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['concurrent_insert'] = array(
-            'concurrent_insert',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['connect_timeout'] = array(
-            'connect_timeout',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['core_file'] = array(
-            'core_file',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['datadir'] = array(
-            'datadir',
-            'server-options',
-            'option_mysqld');
-        $variable_doc_links['date_format'] = array(
-            'date_format',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['datetime_format'] = array(
-            'datetime_format',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['debug'] = array(
-            'debug',
-            'server-options',
-            'option_mysqld');
-        $variable_doc_links['debug_sync'] = array(
-            'debug_sync',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['default_storage_engine'] = array(
-            'default-storage-engine',
-            'server-options',
-            'option_mysqld');
-        $variable_doc_links['default_tmp_storage_engine'] = array(
-            'default_tmp_storage_engine',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['default_week_format'] = array(
-            'default_week_format',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['delay_key_write'] = array(
-            'delay-key-write',
-            'server-options',
-            'option_mysqld');
-        $variable_doc_links['delayed_insert_limit'] = array(
-            'delayed_insert_limit',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['delayed_insert_timeout'] = array(
-            'delayed_insert_timeout',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['delayed_queue_size'] = array(
-            'delayed_queue_size',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['disconnect_on_expired_password'] = array(
-            'disconnect_on_expired_password',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['div_precision_increment'] = array(
-            'div_precision_increment',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['end_markers_in_json'] = array(
-            'end_markers_in_json',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['enforce_gtid_consistency'] = array(
-            'enforce_gtid_consistency',
-            'replication-options-gtids',
-            'sysvar');
-        $variable_doc_links['eq_range_index_dive_limit'] = array(
-            'eq_range_index_dive_limit',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['engine_condition_pushdown'] = array(
-            'engine-condition-pushdown',
-            'server-options',
-            'option_mysqld');
-        $variable_doc_links['error_count'] = array(
-            'error_count',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['event_scheduler'] = array(
-            'event-scheduler',
-            'server-options',
-            'option_mysqld');
-        $variable_doc_links['expire_logs_days'] = array(
-            'expire_logs_days',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['explicit_defaults_for_timestamp'] = array(
-            'explicit_defaults_for_timestamp',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['external_user'] = array(
-            'external_user',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['flush'] = array(
-            'flush',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['flush_time'] = array(
-            'flush_time',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['foreign_key_checks'] = array(
-            'foreign_key_checks',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['ft_boolean_syntax'] = array(
-            'ft_boolean_syntax',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['ft_max_word_len'] = array(
-            'ft_max_word_len',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['ft_min_word_len'] = array(
-            'ft_min_word_len',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['ft_query_expansion_limit'] = array(
-            'ft_query_expansion_limit',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['ft_stopword_file'] = array(
-            'ft_stopword_file',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['general_log'] = array(
-            'general-log',
-            'server-options',
-            'option_mysqld');
-        $variable_doc_links['general_log_file'] = array(
-            'general_log_file',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['group_concat_max_len'] = array(
-            'group_concat_max_len',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['gtid_executed'] = array(
-            'gtid_executed',
-            'replication-options-gtids',
-            'sysvar');
-        $variable_doc_links['gtid_mode'] = array(
-            'gtid_mode',
-            'replication-options-gtids',
-            'sysvar');
-        $variable_doc_links['gtid_owned'] = array(
-            'gtid_owned',
-            'replication-options-gtids',
-            'sysvar');
-        $variable_doc_links['gtid_purged'] = array(
-            'gtid_purged',
-            'replication-options-gtids',
-            'sysvar');
-        $variable_doc_links['have_compress'] = array(
-            'have_compress',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['have_crypt'] = array(
-            'have_crypt',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['have_csv'] = array(
-            'have_csv',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['have_dynamic_loading'] = array(
-            'have_dynamic_loading',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['have_geometry'] = array(
-            'have_geometry',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['have_innodb'] = array(
-            'have_innodb',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['have_ndbcluster'] = array(
-            'have_ndbcluster',
-            'mysql-cluster-system-variables',
-            'sysvar');
-        $variable_doc_links['have_openssl'] = array(
-            'have_openssl',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['have_partitioning'] = array(
-            'have_partitioning',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['have_profiling'] = array(
-            'have_profiling',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['have_query_cache'] = array(
-            'have_query_cache',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['have_rtree_keys'] = array(
-            'have_rtree_keys',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['have_ssl'] = array(
-            'have_ssl',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['have_symlink'] = array(
-            'have_symlink',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['host_cache_size'] = array(
-            'host_cache_size',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['hostname'] = array(
-            'hostname',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['identity'] = array(
-            'identity',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['ignore_builtin_innodb'] = array(
-            'ignore-builtin-innodb',
-            'innodb-parameters',
-            'option_mysqld');
-        $variable_doc_links['ignore_db_dirs'] = array(
-            'ignore_db_dirs',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['init_connect'] = array(
-            'init_connect',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['init_file'] = array(
-            'init-file',
-            'server-options',
-            'option_mysqld');
-        $variable_doc_links['init_slave'] = array(
-            'init_slave',
-            'replication-options-slave',
-            'sysvar');
-        $variable_doc_links['innodb_adaptive_flushing'] = array(
-            'innodb_adaptive_flushing',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_adaptive_flushing_lwm'] = array(
-            'innodb_adaptive_flushing_lwm',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_adaptive_hash_index'] = array(
-            'innodb_adaptive_hash_index',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_adaptive_max_sleep_delay'] = array(
-            'innodb_adaptive_max_sleep_delay',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_additional_mem_pool_size'] = array(
-            'innodb_additional_mem_pool_size',
-            'innodb-parameters',
-            'sysvar',
-            'byte');
-        $variable_doc_links['innodb_api_bk_commit_interval'] = array(
-            'innodb_api_bk_commit_interval',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_api_disable_rowlock'] = array(
-            'innodb_api_disable_rowlock',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_api_enable_binlog'] = array(
-            'innodb_api_enable_binlog',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_api_enable_mdl'] = array(
-            'innodb_api_enable_mdl',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_api_trx_level'] = array(
-            'innodb_api_trx_level',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_autoextend_increment'] = array(
-            'innodb_autoextend_increment',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_autoinc_lock_mode'] = array(
-            'innodb_autoinc_lock_mode',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_buffer_pool_dump_at_shutdown'] = array(
-            'innodb_buffer_pool_dump_at_shutdown',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_buffer_pool_dump_now'] = array(
-            'innodb_buffer_pool_dump_now',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_buffer_pool_filename'] = array(
-            'innodb_buffer_pool_filename',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_buffer_pool_instances'] = array(
-            'innodb_buffer_pool_instances',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_buffer_pool_load_abort'] = array(
-            'innodb_buffer_pool_load_abort',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_buffer_pool_load_at_startup'] = array(
-            'innodb_buffer_pool_load_at_startup',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_buffer_pool_load_now'] = array(
-            'innodb_buffer_pool_load_now',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_buffer_pool_size'] = array(
-            'innodb_buffer_pool_size',
-            'innodb-parameters',
-            'sysvar',
-            'byte');
-        $variable_doc_links['innodb_change_buffer_max_size'] = array(
-            'innodb_change_buffer_max_size',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_change_buffering'] = array(
-            'innodb_change_buffering',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_checksum_algorithm'] = array(
-            'innodb_checksum_algorithm',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_checksums'] = array(
-            'innodb_checksums',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_cmp_per_index_enabled'] = array(
-            'innodb_cmp_per_index_enabled',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_commit_concurrency'] = array(
-            'innodb_commit_concurrency',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_compression_failure_threshold_pct'] = array(
-            'innodb_compression_failure_threshold_pct',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_compression_level'] = array(
-            'innodb_compression_level',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_compression_pad_pct_max'] = array(
-            'innodb_compression_pad_pct_max',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_concurrency_tickets'] = array(
-            'innodb_concurrency_tickets',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_data_file_path'] = array(
-            'innodb_data_file_path',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_data_home_dir'] = array(
-            'innodb_data_home_dir',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_disable_sort_file_cache'] = array(
-            'innodb_disable_sort_file_cache',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_doublewrite'] = array(
-            'innodb_doublewrite',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_fast_shutdown'] = array(
-            'innodb_fast_shutdown',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_file_format'] = array(
-            'innodb_file_format',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_file_format_check'] = array(
-            'innodb_file_format_check',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_file_format_max'] = array(
-            'innodb_file_format_max',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_file_per_table'] = array(
-            'innodb_file_per_table',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_flush_log_at_timeout'] = array(
-            'innodb_flush_log_at_timeout',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_flush_log_at_trx_commit'] = array(
-            'innodb_flush_log_at_trx_commit',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_flush_method'] = array(
-            'innodb_flush_method',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_flush_neighbors'] = array(
-            'innodb_flush_neighbors',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_flushing_avg_loops'] = array(
-            'innodb_flushing_avg_loops',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_force_load_corrupted'] = array(
-            'innodb_force_load_corrupted',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_force_recovery'] = array(
-            'innodb_force_recovery',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_ft_aux_table'] = array(
-            'innodb_ft_aux_table',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_ft_cache_size'] = array(
-            'innodb_ft_cache_size',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_ft_enable_diag_print'] = array(
-            'innodb_ft_enable_diag_print',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_ft_enable_stopword'] = array(
-            'innodb_ft_enable_stopword',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_ft_max_token_size'] = array(
-            'innodb_ft_max_token_size',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_ft_min_token_size'] = array(
-            'innodb_ft_min_token_size',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_ft_num_word_optimize'] = array(
-            'innodb_ft_num_word_optimize',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_ft_result_cache_limit'] = array(
-            'innodb_ft_result_cache_limit',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_ft_server_stopword_table'] = array(
-            'innodb_ft_server_stopword_table',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_ft_sort_pll_degree'] = array(
-            'innodb_ft_sort_pll_degree',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_ft_total_cache_size'] = array(
-            'innodb_ft_total_cache_size',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_ft_user_stopword_table'] = array(
-            'innodb_ft_user_stopword_table',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_io_capacity'] = array(
-            'innodb_io_capacity',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_io_capacity_max'] = array(
-            'innodb_io_capacity_max',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_large_prefix'] = array(
-            'innodb_large_prefix',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_lock_wait_timeout'] = array(
-            'innodb_lock_wait_timeout',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_locks_unsafe_for_binlog'] = array(
-            'innodb_locks_unsafe_for_binlog',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_log_buffer_size'] = array(
-            'innodb_log_buffer_size',
-            'innodb-parameters',
-            'sysvar',
-            'byte');
-        $variable_doc_links['innodb_log_compressed_pages'] = array(
-            'innodb_log_compressed_pages',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_log_file_size'] = array(
-            'innodb_log_file_size',
-            'innodb-parameters',
-            'sysvar',
-            'byte');
-        $variable_doc_links['innodb_log_files_in_group'] = array(
-            'innodb_log_files_in_group',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_log_group_home_dir'] = array(
-            'innodb_log_group_home_dir',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_lru_scan_depth'] = array(
-            'innodb_lru_scan_depth',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_max_dirty_pages_pct'] = array(
-            'innodb_max_dirty_pages_pct',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_max_dirty_pages_pct_lwm'] = array(
-            'innodb_max_dirty_pages_pct_lwm',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_max_purge_lag'] = array(
-            'innodb_max_purge_lag',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_max_purge_lag_delay'] = array(
-            'innodb_max_purge_lag_delay',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_mirrored_log_groups'] = array(
-            'innodb_mirrored_log_groups',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_monitor_disable'] = array(
-            'innodb_monitor_disable',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_monitor_enable'] = array(
-            'innodb_monitor_enable',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_monitor_reset'] = array(
-            'innodb_monitor_reset',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_monitor_reset_all'] = array(
-            'innodb_monitor_reset_all',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_old_blocks_pct'] = array(
-            'innodb_old_blocks_pct',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_old_blocks_time'] = array(
-            'innodb_old_blocks_time',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_online_alter_log_max_size'] = array(
-            'innodb_online_alter_log_max_size',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_open_files'] = array(
-            'innodb_open_files',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_optimize_fulltext_only'] = array(
-            'innodb_optimize_fulltext_only',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_page_size'] = array(
-            'innodb_page_size',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_print_all_deadlocks'] = array(
-            'innodb_print_all_deadlocks',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_purge_batch_size'] = array(
-            'innodb_purge_batch_size',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_purge_threads'] = array(
-            'innodb_purge_threads',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_random_read_ahead'] = array(
-            'innodb_random_read_ahead',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_read_ahead_threshold'] = array(
-            'innodb_read_ahead_threshold',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_read_io_threads'] = array(
-            'innodb_read_io_threads',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_read_only'] = array(
-            'innodb_read_only',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_replication_delay'] = array(
-            'innodb_replication_delay',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_rollback_on_timeout'] = array(
-            'innodb_rollback_on_timeout',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_rollback_segments'] = array(
-            'innodb_rollback_segments',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_sort_buffer_size'] = array(
-            'innodb_sort_buffer_size',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_spin_wait_delay'] = array(
-            'innodb_spin_wait_delay',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_stats_auto_recalc'] = array(
-            'innodb_stats_auto_recalc',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_stats_method'] = array(
-            'innodb_stats_method',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_stats_on_metadata'] = array(
-            'innodb_stats_on_metadata',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_stats_persistent'] = array(
-            'innodb_stats_persistent',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_stats_persistent_sample_pages'] = array(
-            'innodb_stats_persistent_sample_pages',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_stats_sample_pages'] = array(
-            'innodb_stats_sample_pages',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_stats_transient_sample_pages'] = array(
-            'innodb_stats_transient_sample_pages',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_status_output'] = array(
-            'innodb_status_output',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_status_output_locks'] = array(
-            'innodb_status_output_locks',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_strict_mode'] = array(
-            'innodb_strict_mode',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_support_xa'] = array(
-            'innodb_support_xa',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_sync_array_size'] = array(
-            'innodb_sync_array_size',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_sync_spin_loops'] = array(
-            'innodb_sync_spin_loops',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_table_locks'] = array(
-            'innodb_table_locks',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_thread_concurrency'] = array(
-            'innodb_thread_concurrency',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_thread_sleep_delay'] = array(
-            'innodb_thread_sleep_delay',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_undo_directory'] = array(
-            'innodb_undo_directory',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_undo_logs'] = array(
-            'innodb_undo_logs',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_undo_tablespaces'] = array(
-            'innodb_undo_tablespaces',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_use_native_aio'] = array(
-            'innodb_use_native_aio',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_use_sys_malloc'] = array(
-            'innodb_use_sys_malloc',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_version'] = array(
-            'innodb_version',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_write_io_threads'] = array(
-            'innodb_write_io_threads',
-            'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['insert_id'] = array(
-            'insert_id',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['interactive_timeout'] = array(
-            'interactive_timeout',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['join_buffer_size'] = array(
-            'join_buffer_size',
-            'server-system-variables',
-            'sysvar',
-            'byte');
-        $variable_doc_links['keep_files_on_create'] = array(
-            'keep_files_on_create',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['key_buffer_size'] = array(
-            'key_buffer_size',
-            'server-system-variables',
-            'sysvar',
-            'byte');
-        $variable_doc_links['key_cache_age_threshold'] = array(
-            'key_cache_age_threshold',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['key_cache_block_size'] = array(
-            'key_cache_block_size',
-            'server-system-variables',
-            'sysvar',
-            'byte');
-        $variable_doc_links['key_cache_division_limit'] = array(
-            'key_cache_division_limit',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['language'] = array(
-            'language',
-            'server-options',
-            'option_mysqld');
-        $variable_doc_links['large_files_support'] = array(
-            'large_files_support',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['large_page_size'] = array(
-            'large_page_size',
-            'server-system-variables',
-            'sysvar',
-            'byte');
-        $variable_doc_links['large_pages'] = array(
-            'large-pages',
-            'server-options',
-            'option_mysqld');
-        $variable_doc_links['last_insert_id'] = array(
-            'last_insert_id',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['lc_messages'] = array(
-            'lc-messages',
-            'server-options',
-            'option_mysqld');
-        $variable_doc_links['lc_messages_dir'] = array(
-            'lc-messages-dir',
-            'server-options',
-            'option_mysqld');
-        $variable_doc_links['lc_time_names'] = array(
-            'lc_time_names',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['license'] = array(
-            'license',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['local_infile'] = array(
-            'local_infile',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['lock_wait_timeout'] = array(
-            'lock_wait_timeout',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['locked_in_memory'] = array(
-            'locked_in_memory',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['log'] = array(
-            'log',
-            'server-options',
-            'option_mysqld');
-        $variable_doc_links['log_bin'] = array(
-            'log_bin',
-            'replication-options-binary-log',
-            'sysvar');
-        $variable_doc_links['log-bin'] = array(
-            'log-bin',
-            'replication-options-binary-log',
-            'option_mysqld');
-        $variable_doc_links['log_bin_basename'] = array(
-            'log_bin_basename',
-            'replication-options-binary-log',
-            'sysvar');
-        $variable_doc_links['log_bin_index'] = array(
-            'log_bin_index',
-            'replication-options-binary-log',
-            'sysvar');
-        $variable_doc_links['log_bin_trust_function_creators'] = array(
-            'log-bin-trust-function-creators',
-            'replication-options-binary-log',
-            'option_mysqld');
-        $variable_doc_links['log_bin_use_v1_row_events'] = array(
-            'log_bin_use_v1_row_events',
-            'replication-options-binary-log',
-            'sysvar');
-        $variable_doc_links['log_error'] = array(
-            'log-error',
-            'server-options',
-            'option_mysqld');
-        $variable_doc_links['log_output'] = array(
-            'log-output',
-            'server-options',
-            'option_mysqld');
-        $variable_doc_links['log_queries_not_using_indexes'] = array(
-            'log-queries-not-using-indexes',
-            'server-options',
-            'option_mysqld');
-        $variable_doc_links['log_slave_updates'] = array(
-            'log-slave-updates',
-            'replication-options-slave',
-            'option_mysqld');
-        $variable_doc_links['log_slow_admin_statements'] = array(
-            'log_slow_admin_statements',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['log_slow_slave_statements'] = array(
-            'log_slow_slave_statements',
-            'replication-options-slave',
-            'sysvar');
-        $variable_doc_links['log_throttle_queries_not_using_indexes'] = array(
-            'log_throttle_queries_not_using_indexes',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['log_slow_queries'] = array(
-            'log-slow-queries',
-            'server-options',
-            'option_mysqld');
-        $variable_doc_links['log_warnings'] = array(
-            'log-warnings',
-            'server-options',
-            'option_mysqld');
-        $variable_doc_links['long_query_time'] = array(
-            'long_query_time',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['low_priority_updates'] = array(
-            'low-priority-updates',
-            'server-options',
-            'option_mysqld');
-        $variable_doc_links['lower_case_file_system'] = array(
-            'lower_case_file_system',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['lower_case_table_names'] = array(
-            'lower_case_table_names',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['master_info_repository'] = array(
-            'master_info_repository',
-            'replication-options-slave',
-            'sysvar');
-        $variable_doc_links['master_verify_checksum'] = array(
-            'master_verify_checksum',
-            'replication-options-binary-log',
-            'sysvar');
-        $variable_doc_links['master-bind'] = array(
-            '',
-            'replication-options',
-            0);
-        $variable_doc_links['max_allowed_packet'] = array(
-            'max_allowed_packet',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['max_binlog_cache_size'] = array(
-            'max_binlog_cache_size',
-            'replication-options-binary-log',
-            'sysvar',
-            'byte');
-        $variable_doc_links['max_binlog_size'] = array(
-            'max_binlog_size',
-            'replication-options-binary-log',
-            'sysvar',
-            'byte');
-        $variable_doc_links['max_binlog_stmt_cache_size'] = array(
-            'max_binlog_stmt_cache_size',
-            'replication-options-binary-log',
-            'sysvar',
-            'byte');
-        $variable_doc_links['max_connect_errors'] = array(
-            'max_connect_errors',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['max_connections'] = array(
-            'max_connections',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['max_delayed_threads'] = array(
-            'max_delayed_threads',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['max_error_count'] = array(
-            'max_error_count',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['max_heap_table_size'] = array(
-            'max_heap_table_size',
-            'server-system-variables',
-            'sysvar',
-            'byte');
-        $variable_doc_links['max_insert_delayed_threads'] = array(
-            'max_insert_delayed_threads',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['max_join_size'] = array(
-            'max_join_size',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['max_length_for_sort_data'] = array(
-            'max_length_for_sort_data',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['max_long_data_size'] = array(
-            'max_long_data_size',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['max_prepared_stmt_count'] = array(
-            'max_prepared_stmt_count',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['max_relay_log_size'] = array(
-            'max_relay_log_size',
-            'server-system-variables',
-            'sysvar',
-            'byte');
-        $variable_doc_links['max_seeks_for_key'] = array(
-            'max_seeks_for_key',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['max_sort_length'] = array(
-            'max_sort_length',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['max_sp_recursion_depth'] = array(
-            'max_sp_recursion_depth',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['max_tmp_tables'] = array(
-            'max_tmp_tables',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['max_user_connections'] = array(
-            'max_user_connections',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['max_write_lock_count'] = array(
-            'max_write_lock_count',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['metadata_locks_cache_size'] = array(
-            'metadata_locks_cache_size',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['metadata_locks_hash_instances'] = array(
-            'metadata_locks_hash_instances',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['memlock'] = array(
-            'memlock',
-            'server-options',
-            'option_mysqld');
-        $variable_doc_links['min_examined_row_limit'] = array(
-            'min-examined-row-limit',
-            'server-options',
-            'option_mysqld');
-        $variable_doc_links['multi_range_count'] = array(
-            'multi_range_count',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['myisam_data_pointer_size'] = array(
-            'myisam_data_pointer_size',
-            'server-system-variables',
-            'sysvar',
-            'byte');
-        $variable_doc_links['myisam_max_sort_file_size'] = array(
-            'myisam_max_sort_file_size',
-            'server-system-variables',
-            'sysvar',
-            'byte');
-        $variable_doc_links['myisam_mmap_size'] = array(
-            'myisam_mmap_size',
-            'server-system-variables',
-            'sysvar',
-            'byte');
-        $variable_doc_links['myisam_recover_options'] = array(
-            'myisam_recover_options',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['myisam_repair_threads'] = array(
-            'myisam_repair_threads',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['myisam_sort_buffer_size'] = array(
-            'myisam_sort_buffer_size',
-            'server-system-variables',
-            'sysvar',
-            'byte');
-        $variable_doc_links['myisam_stats_method'] = array(
-            'myisam_stats_method',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['myisam_use_mmap'] = array(
-            'myisam_use_mmap',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['named_pipe'] = array(
-            'named_pipe',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['net_buffer_length'] = array(
-            'net_buffer_length',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['net_read_timeout'] = array(
-            'net_read_timeout',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['net_retry_count'] = array(
-            'net_retry_count',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['net_write_timeout'] = array(
-            'net_write_timeout',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['new'] = array(
-            'new',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['old'] = array(
-            'old',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['old_alter_table'] = array(
-            'old-alter-table',
-            'server-options',
-            'option_mysqld');
-        $variable_doc_links['old_passwords'] = array(
-            'old-passwords',
-            'server-options',
-            'option_mysqld');
-        $variable_doc_links['open_files_limit'] = array(
-            'open-files-limit',
-            'server-options',
-            'option_mysqld');
-        $variable_doc_links['optimizer_prune_level'] = array(
-            'optimizer_prune_level',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['optimizer_search_depth'] = array(
-            'optimizer_search_depth',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['optimizer_switch'] = array(
-            'optimizer_switch',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['optimizer_trace'] = array(
-            'optimizer_trace',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['optimizer_trace_features'] = array(
-            'optimizer_trace_features',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['optimizer_trace_limit'] = array(
-            'optimizer_trace_limit',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['optimizer_trace_max_mem_size'] = array(
-            'optimizer_trace_max_mem_size',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['optimizer_trace_offset'] = array(
-            'optimizer_trace_offset',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['partition'] = array(
-            'partition',
-            'server-options',
-            'option_mysqld');
-        $variable_doc_links['performance_schema'] = array(
-            'performance_schema',
-            'performance-schema-system-variables',
-            'sysvar');
-        $variable_doc_links['performance_schema_accounts_size'] = array(
-            'performance_schema_accounts_size',
-            'performance-schema-system-variables',
-            'sysvar');
-        $variable_doc_links['performance_schema_digests_size'] = array(
-            'performance_schema_digests_size',
-            'performance-schema-system-variables',
-            'sysvar');
-        $variable_doc_links['performance_schema_events_stages_history_long_size']
-            = array(
-                'performance_schema_events_stages_history_long_size',
-                'performance-schema-system-variables',
-                'sysvar',
-            );
-        $variable_doc_links['performance_schema_events_stages_history_size'] = array(
-            'performance_schema_events_stages_history_size',
-            'performance-schema-system-variables',
-            'sysvar');
-        $variable_doc_links['performance_schema_events_statements_history_long_size']
-            = array(
-                'performance_schema_events_statements_history_long_size',
-                'performance-schema-system-variables',
-                'sysvar',
-            );
-        $variable_doc_links['performance_schema_events_statements_history_size']
-            = array(
-                'performance_schema_events_statements_history_size',
-                'performance-schema-system-variables',
-                'sysvar',
-            );
-        $variable_doc_links['performance_schema_events_waits_history_long_size']
-            = array(
-                'performance_schema_events_waits_history_long_size',
-                'performance-schema-system-variables',
-                'sysvar',
-            );
-        $variable_doc_links['performance_schema_events_waits_history_size'] = array(
-            'performance_schema_events_waits_history_size',
-            'performance-schema-system-variables',
-            'sysvar');
-        $variable_doc_links['performance_schema_hosts_size'] = array(
-            'performance_schema_hosts_size',
-            'performance-schema-system-variables',
-            'sysvar');
-        $variable_doc_links['performance_schema_max_cond_classes'] = array(
-            'performance_schema_max_cond_classes',
-            'performance-schema-system-variables',
-            'sysvar');
-        $variable_doc_links['performance_schema_max_cond_instances'] = array(
-            'performance_schema_max_cond_instances',
-            'performance-schema-system-variables',
-            'sysvar');
-        $variable_doc_links['performance_schema_max_file_classes'] = array(
-            'performance_schema_max_file_classes',
-            'performance-schema-system-variables',
-            'sysvar');
-        $variable_doc_links['performance_schema_max_file_handles'] = array(
-            'performance_schema_max_file_handles',
-            'performance-schema-system-variables',
-            'sysvar');
-        $variable_doc_links['performance_schema_max_file_instances'] = array(
-            'performance_schema_max_file_instances',
-            'performance-schema-system-variables',
-            'sysvar');
-        $variable_doc_links['performance_schema_max_mutex_classes'] = array(
-            'performance_schema_max_mutex_classes',
-            'performance-schema-system-variables',
-            'sysvar');
-        $variable_doc_links['performance_schema_max_mutex_instances'] = array(
-            'performance_schema_max_mutex_instances',
-            'performance-schema-system-variables',
-            'sysvar');
-        $variable_doc_links['performance_schema_max_rwlock_classes'] = array(
-            'performance_schema_max_rwlock_classes',
-            'performance-schema-system-variables',
-            'sysvar');
-        $variable_doc_links['performance_schema_max_rwlock_instances'] = array(
-            'performance_schema_max_rwlock_instances',
-            'performance-schema-system-variables',
-            'sysvar');
-        $variable_doc_links['performance_schema_max_socket_classes'] = array(
-            'performance_schema_max_socket_classes',
-            'performance-schema-system-variables',
-            'sysvar');
-        $variable_doc_links['performance_schema_max_socket_instances'] = array(
-            'performance_schema_max_socket_instances',
-            'performance-schema-system-variables',
-            'sysvar');
-        $variable_doc_links['performance_schema_max_stage_classes'] = array(
-            'performance_schema_max_stage_classes',
-            'performance-schema-system-variables',
-            'sysvar');
-        $variable_doc_links['performance_schema_max_statement_classes'] = array(
-            'performance_schema_max_statement_classes',
-            'performance-schema-system-variables',
-            'sysvar');
-        $variable_doc_links['performance_schema_max_table_handles'] = array(
-            'performance_schema_max_table_handles',
-            'performance-schema-system-variables',
-            'sysvar');
-        $variable_doc_links['performance_schema_max_table_instances'] = array(
-            'performance_schema_max_table_instances',
-            'performance-schema-system-variables',
-            'sysvar');
-        $variable_doc_links['performance_schema_max_thread_classes'] = array(
-            'performance_schema_max_thread_classes',
-            'performance-schema-system-variables',
-            'sysvar');
-        $variable_doc_links['performance_schema_max_thread_instances'] = array(
-            'performance_schema_max_thread_instances',
-            'performance-schema-system-variables',
-            'sysvar');
-        $variable_doc_links['performance_schema_session_connect_attrs_size'] = array(
-            'performance_schema_session_connect_attrs_size',
-            'performance-schema-system-variables',
-            'sysvar');
-        $variable_doc_links['performance_schema_setup_actors_size'] = array(
-            'performance_schema_setup_actors_size',
-            'performance-schema-system-variables',
-            'sysvar');
-        $variable_doc_links['performance_schema_setup_objects_size'] = array(
-            'performance_schema_setup_objects_size',
-            'performance-schema-system-variables',
-            'sysvar');
-        $variable_doc_links['performance_schema_users_size'] = array(
-            'performance_schema_users_size',
-            'performance-schema-system-variables',
-            'sysvar');
-        $variable_doc_links['pid_file'] = array(
-            'pid-file',
-            'server-options',
-            'option_mysqld');
-        $variable_doc_links['plugin_dir'] = array(
-            'plugin_dir',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['port'] = array(
-            'port',
-            'server-options',
-            'option_mysqld');
-        $variable_doc_links['preload_buffer_size'] = array(
-            'preload_buffer_size',
-            'server-system-variables',
-            'sysvar',
-            'byte');
-        $variable_doc_links['profiling'] = array(
-            'profiling',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['profiling_history_size'] = array(
-            'profiling_history_size',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['protocol_version'] = array(
-            'protocol_version',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['proxy_user'] = array(
-            'proxy_user',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['pseudo_thread_id'] = array(
-            'pseudo_thread_id',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['query_alloc_block_size'] = array(
-            'query_alloc_block_size',
-            'server-system-variables',
-            'sysvar',
-            'byte');
-        $variable_doc_links['query_cache_limit'] = array(
-            'query_cache_limit',
-            'server-system-variables',
-            'sysvar',
-            'byte');
-        $variable_doc_links['query_cache_min_res_unit'] = array(
-            'query_cache_min_res_unit',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['query_cache_size'] = array(
-            'query_cache_size',
-            'server-system-variables',
-            'sysvar',
-            'byte');
-        $variable_doc_links['query_cache_type'] = array(
-            'query_cache_type',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['query_cache_wlock_invalidate'] = array(
-            'query_cache_wlock_invalidate',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['query_prealloc_size'] = array(
-            'query_prealloc_size',
-            'server-system-variables',
-            'sysvar',
-            'byte');
-        $variable_doc_links['rand_seed1'] = array(
-            'rand_seed1',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['rand_seed2'] = array(
-            'rand_seed2',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['range_alloc_block_size'] = array(
-            'range_alloc_block_size',
-            'server-system-variables',
-            'sysvar',
-            'byte');
-        $variable_doc_links['read_buffer_size'] = array(
-            'read_buffer_size',
-            'server-system-variables',
-            'sysvar',
-            'byte');
-        $variable_doc_links['read_only'] = array(
-            'read_only',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['read_rnd_buffer_size'] = array(
-            'read_rnd_buffer_size',
-            'server-system-variables',
-            'sysvar',
-            'byte');
-        $variable_doc_links['relay_log'] = array(
-            'relay_log',
-            'replication-options-slave',
-            'sysvar');
-        $variable_doc_links['relay_log_basename'] = array(
-            'relay_log_basename',
-            'replication-options-slave',
-            'sysvar');
-        $variable_doc_links['relay-log-index'] = array(
-            'relay-log-index',
-            'replication-options-slave',
-            'option_mysqld');
-        $variable_doc_links['relay_log_index'] = array(
-            'relay_log_index',
-            'replication-options-slave',
-            'sysvar');
-        $variable_doc_links['relay_log_info_file'] = array(
-            'relay_log_info_file',
-            'replication-options-slave',
-            'sysvar');
-        $variable_doc_links['relay_log_info_repository'] = array(
-            'relay_log_info_repository',
-            'replication-options-slave',
-            'sysvar');
-        $variable_doc_links['relay_log_purge'] = array(
-            'relay_log_purge',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['relay_log_recovery'] = array(
-            'relay_log_recovery',
-            'replication-options-slave',
-            'sysvar');
-        $variable_doc_links['relay_log_space_limit'] = array(
-            'relay_log_space_limit',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['report_host'] = array(
-            'report-host',
-            'replication-options-slave',
-            'option_mysqld');
-        $variable_doc_links['report_password'] = array(
-            'report-password',
-            'replication-options-slave',
-            'option_mysqld');
-        $variable_doc_links['report_port'] = array(
-            'report-port',
-            'replication-options-slave',
-            'option_mysqld');
-        $variable_doc_links['report_user'] = array(
-            'report-user',
-            'replication-options-slave',
-            'option_mysqld');
-        $variable_doc_links['rpl_stop_slave_timeout'] = array(
-            'rpl_stop_slave_timeout',
-            'replication-options-slave',
-            'sysvar');
-        $variable_doc_links['rpl_recovery_rank'] = array(
-            'rpl_recovery_rank',
-            'replication-options-slave',
-            'option_mysqld');
-        $variable_doc_links['rpl_semi_sync_master_enabled'] = array(
-            'rpl_semi_sync_master_enabled',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['rpl_semi_sync_master_timeout'] = array(
-            'rpl_semi_sync_master_timeout',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['rpl_semi_sync_master_trace_level'] = array(
-            'rpl_semi_sync_master_trace_level',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['rpl_semi_sync_master_wait_no_slave'] = array(
-            'rpl_semi_sync_master_wait_no_slave',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['rpl_semi_sync_slave_enabled'] = array(
-            'rpl_semi_sync_slave_enabled',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['rpl_semi_sync_slave_trace_level'] = array(
-            'rpl_semi_sync_slave_trace_level',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['safe_show_database'] = array(
-            'safe-show-database',
-            'server-options',
-            'option_mysqld');
-        $variable_doc_links['secure_auth'] = array(
-            'secure-auth',
-            'server-options',
-            'option_mysqld');
-        $variable_doc_links['secure_file_priv'] = array(
-            'secure-file-priv',
-            'server-options',
-            'option_mysqld');
-        $variable_doc_links['server_id'] = array(
-            'server-id',
-            'replication-options',
-            'option_mysqld');
-        $variable_doc_links['server_id_bits'] = array(
-            'server_id_bits',
-            'mysql-cluster-system-variables',
-            'sysvar');
-        $variable_doc_links['server_uuid'] = array(
-            'server_uuid',
-            'replication-options',
-            'sysvar');
-        $variable_doc_links['shared_memory'] = array(
-            'shared_memory',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['shared_memory_base_name'] = array(
-            'shared_memory_base_name',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['skip_external_locking'] = array(
-            'skip-external-locking',
-            'server-options',
-            'option_mysqld');
-        $variable_doc_links['skip_name_resolve'] = array(
-            'skip-name-resolve',
-            'server-options',
-            'option_mysqld');
-        $variable_doc_links['skip_networking'] = array(
-            'skip-networking',
-            'server-options',
-            'option_mysqld');
-        $variable_doc_links['skip_show_database'] = array(
-            'skip-show-database',
-            'server-options',
-            'option_mysqld');
-        $variable_doc_links['slave_allow_batching'] = array(
-            'slave_allow_batching',
-            'mysql-cluster-system-variables',
-            'sysvar');
-        $variable_doc_links['slave_checkpoint_group'] = array(
-            'slave_checkpoint_group',
-            'replication-options-slave',
-            'sysvar');
-        $variable_doc_links['slave_checkpoint_period'] = array(
-            'slave_checkpoint_period',
-            'replication-options-slave',
-            'sysvar');
-        $variable_doc_links['slave_compressed_protocol'] = array(
-            'slave_compressed_protocol',
-            'replication-options-slave',
-            'sysvar');
-        $variable_doc_links['slave_exec_mode'] = array(
-            'slave_exec_mode',
-            'replication-options-slave',
-            'sysvar');
-        $variable_doc_links['slave_load_tmpdir'] = array(
-            'slave-load-tmpdir',
-            'replication-options-slave',
-            'option_mysqld');
-        $variable_doc_links['slave_max_allowed_packet'] = array(
-            'slave_max_allowed_packet',
-            'replication-options-slave',
-            'sysvar');
-        $variable_doc_links['slave_net_timeout'] = array(
-            'slave-net-timeout',
-            'replication-options-slave',
-            'option_mysqld');
-        $variable_doc_links['slave_parallel_workers'] = array(
-            'slave_parallel_workers',
-            'replication-options-slave',
-            'sysvar');
-        $variable_doc_links['slave_pending_jobs_size_max'] = array(
-            'slave_pending_jobs_size_max',
-            'replication-options-slave',
-            'sysvar');
-        $variable_doc_links['slave_rows_search_algorithms'] = array(
-            'slave_rows_search_algorithms',
-            'replication-options-slave',
-            'sysvar');
-        $variable_doc_links['slave_skip_errors'] = array(
-            'slave-skip-errors',
-            'replication-options-slave',
-            'option_mysqld');
-        $variable_doc_links['slave_sql_verify_checksum'] = array(
-            'slave_sql_verify_checksum',
-            'replication-options-slave',
-            'sysvar');
-        $variable_doc_links['slave_transaction_retries'] = array(
-            'slave_transaction_retries',
-            'replication-options-slave',
-            'sysvar');
-        $variable_doc_links['slave_type_conversions'] = array(
-            'slave_type_conversions',
-            'replication-options-slave',
-            'sysvar');
-        $variable_doc_links['slow_launch_time'] = array(
-            'slow_launch_time',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['slow_query_log'] = array(
-            'slow-query-log',
-            'server-options',
-            'server-system-variables');
-        $variable_doc_links['slow_query_log_file'] = array(
-            'slow_query_log_file',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['socket'] = array(
-            'socket',
-            'server-options',
-            'option_mysqld');
-        $variable_doc_links['sort_buffer_size'] = array(
-            'sort_buffer_size',
-            'server-system-variables',
-            'sysvar',
-            'byte');
-        $variable_doc_links['sql_auto_is_null'] = array(
-            'sql_auto_is_null',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['sql_big_selects'] = array(
-            'sql_big_selects',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['sql_big_tables'] = array(
-            'big-tables',
-            'server-options',
-            'server-system-variables');
-        $variable_doc_links['sql_buffer_result'] = array(
-            'sql_buffer_result',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['sql_log_bin'] = array(
-            'sql_log_bin',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['sql_log_off'] = array(
-            'sql_log_off',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['sql_log_update'] = array(
-            'sql_log_update',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['sql_low_priority_updates'] = array(
-            'sql_low_priority_updates',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['sql_max_join_size'] = array(
-            'sql_max_join_size',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['sql_mode'] = array(
-            'sql-mode',
-            'server-options',
-            'option_mysqld');
-        $variable_doc_links['sql_notes'] = array(
-            'sql_notes',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['sql_quote_show_create'] = array(
-            'sql_quote_show_create',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['sql_safe_updates'] = array(
-            'sql_safe_updates',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['sql_select_limit'] = array(
-            'sql_select_limit',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['sql_slave_skip_counter'] = array(
-            'sql_slave_skip_counter',
-            'replication-options-slave',
-            'sysvar');
-        $variable_doc_links['sql_warnings'] = array(
-            'sql_warnings',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['ssl_ca'] = array(
-            'ssl-ca',
-            'ssl-options',
-            'option_general');
-        $variable_doc_links['ssl_capath'] = array(
-            'ssl-capath',
-            'ssl-options',
-            'option_general');
-        $variable_doc_links['ssl_cert'] = array(
-            'ssl-cert',
-            'ssl-options',
-            'option_general');
-        $variable_doc_links['ssl_cipher'] = array(
-            'ssl-cipher',
-            'ssl-options',
-            'option_general');
-        $variable_doc_links['ssl_crl'] = array(
-            'ssl_crl',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['ssl_crlpath'] = array(
-            'ssl_crlpath',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['ssl_key'] = array(
-            'ssl-key',
-            'ssl-options',
-            'option_general');
-        $variable_doc_links['storage_engine'] = array(
-            'storage_engine',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['stored_program_cache'] = array(
-            'stored_program_cache',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['sync_binlog'] = array(
-            'sync_binlog',
-            'replication-options-binary-log',
-            'sysvar');
-        $variable_doc_links['sync_frm'] = array(
-            'sync_frm',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['sync_master_info'] = array(
-            'sync_master_info',
-            'replication-options-slave',
-            'sysvar');
-        $variable_doc_links['sync_relay_log'] = array(
-            'sync_relay_log',
-            'replication-options-slave',
-            'sysvar');
-        $variable_doc_links['sync_relay_log_info'] = array(
-            'sync_relay_log_info',
-            'replication-options-slave',
-            'sysvar');
-        $variable_doc_links['system_time_zone'] = array(
-            'system_time_zone',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['table_definition_cache'] = array(
-            'table_definition_cache',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['table_lock_wait_timeout'] = array(
-            'table_lock_wait_timeout',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['table_open_cache'] = array(
-            'table_open_cache',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['table_open_cache_instances'] = array(
-            'table_open_cache_instances',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['table_type'] = array(
-            'table_type',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['thread_cache_size'] = array(
-            'thread_cache_size',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['thread_concurrency'] = array(
-            'thread_concurrency',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['thread_handling'] = array(
-            'thread_handling',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['thread_stack'] = array(
-            'thread_stack',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['time_format'] = array(
-            'time_format',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['time_zone'] = array(
-            'time_zone',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['timed_mutexes'] = array(
-            'timed_mutexes',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['timestamp'] = array(
-            'timestamp',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['tmp_table_size'] = array(
-            'tmp_table_size',
-            'server-system-variables',
-            'sysvar',
-            'byte');
-        $variable_doc_links['tmpdir'] = array(
-            'tmpdir',
-            'server-options',
-            'option_mysqld');
-        $variable_doc_links['transaction_alloc_block_size'] = array(
-            'transaction_alloc_block_size',
-            'server-system-variables',
-            'sysvar',
-            'byte');
-        $variable_doc_links['transaction_prealloc_size'] = array(
-            'transaction_prealloc_size',
-            'server-system-variables',
-            'sysvar',
-            'byte');
-        $variable_doc_links['tx_isolation'] = array(
-            'tx_isolation',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['tx_read_only'] = array(
-            'tx_read_only',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['unique_checks'] = array(
-            'unique_checks',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['updatable_views_with_limit'] = array(
-            'updatable_views_with_limit',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['version'] = array(
-            'version',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['version_comment'] = array(
-            'version_comment',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['version_compile_machine'] = array(
-            'version_compile_machine',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['version_compile_os'] = array(
-            'version_compile_os',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['wait_timeout'] = array(
-            'wait_timeout',
-            'server-system-variables',
-            'sysvar');
-        $variable_doc_links['warning_count'] = array(
-            'warning_count',
-            'server-system-variables',
-            'sysvar');
-        return $variable_doc_links;
-    }
-
-    /**
-     * Returns array of static system variables (i.e. read-only)
-     *
-     * @return array
-     */
-    private function _getStaticSystemVariables()
-    {
-        $static_variables = array(
-            'back_log',
-            'basedir',
-            'bind_address',
-            'binlog_row_image',
-            'character_set_system',
-            'character_sets_dir',
-            'core_file',
-            'datadir',
-            'date_format',
-            'datetime_format',
-            'disconnect_on_expired_password',
-            'engine_condition_pushdown',
-            'error_count',
-            'explicit_defaults_for_timestamp',
-            'external_user',
-            'ft_max_word_len',
-            'ft_min_word_len',
-            'ft_query_expansion_limit',
-            'ft_stopword_file',
-            'gtid_executed',
-            'gtid_owned',
-            'have_compress',
-            'have_crypt',
-            'have_csv',
-            'have_dynamic_loading',
-            'have_geometry',
-            'have_innodb',
-            'have_ndbcluster',
-            'have_openssl',
-            'have_partitioning',
-            'have_profiling',
-            'have_query_cache',
-            'have_rtree_keys',
-            'have_ssl',
-            'have_symlink',
-            'hostname',
-            'ignore_builtin_innodb',
-            'ignore_db_dirs',
-            'init_file',
-            'innodb_additional_mem_pool_size',
-            'innodb_api_disable_rowlock',
-            'innodb_api_enable_binlog',
-            'innodb_api_enable_mdl',
-            'innodb_autoinc_lock_mode',
-            'innodb_buffer_pool_instances',
-            'innodb_buffer_pool_load_at_startup',
-            'innodb_checksums',
-            'innodb_data_file_path',
-            'innodb_data_home_dir',
-            'innodb_doublewrite',
-            'innodb_file_format_check',
-            'innodb_flush_method',
-            'innodb_force_load_corrupted',
-            'innodb_force_recovery',
-            'innodb_ft_cache_size',
-            'innodb_ft_max_token_size',
-            'innodb_ft_min_token_size',
-            'innodb_ft_sort_pll_degree',
-            'innodb_ft_total_cache_size',
-            'innodb_locks_unsafe_for_binlog',
-            'innodb_log_buffer_size',
-            'innodb_log_file_size',
-            'innodb_log_files_in_group',
-            'innodb_log_group_home_dir',
-            'innodb_mirrored_log_groups',
-            'innodb_open_files',
-            'innodb_page_size',
-            'innodb_purge_threads',
-            'innodb_read_io_threads',
-            'innodb_read_only',
-            'innodb_rollback_on_timeout',
-            'innodb_sort_buffer_size',
-            'innodb_sync_array_size',
-            'innodb_undo_directory',
-            'innodb_undo_tablespaces',
-            'innodb_use_native_aio',
-            'innodb_use_sys_malloc',
-            'innodb_version',
-            'innodb_write_io_threads',
-            'language',
-            'large_files_support',
-            'large_page_size',
-            'large_pages',
-            'lc_messages_dir',
-            'license',
-            'locked_in_memory',
-            'log',
-            'log_bin',
-            'log-bin',
-            'log_bin_basename',
-            'log_bin_index',
-            'log_bin_use_v1_row_events',
-            'log_error',
-            'log_slave_updates',
-            'log_slow_queries',
-            'lower_case_file_system',
-            'lower_case_table_names',
-            'master-bind',
-            'max_long_data_size',
-            'max_tmp_tables',
-            'metadata_locks_cache_size',
-            'metadata_locks_hash_instances',
-            'memlock',
-            'multi_range_count',
-            'myisam_mmap_size',
-            'myisam_recover_options',
-            'named_pipe',
-            'old',
-            'open_files_limit',
-            'partition',
-            'performance_schema',
-            'performance_schema_accounts_size',
-            'performance_schema_digests_size',
-            'performance_schema_events_stages_history_long_size',
-            'performance_schema_events_stages_history_size',
-            'performance_schema_events_statements_history_long_size',
-            'performance_schema_events_statements_history_size',
-            'performance_schema_events_waits_history_long_size',
-            'performance_schema_events_waits_history_size',
-            'performance_schema_hosts_size',
-            'performance_schema_max_cond_classes',
-            'performance_schema_max_cond_instances',
-            'performance_schema_max_file_classes',
-            'performance_schema_max_file_handles',
-            'performance_schema_max_file_instances',
-            'performance_schema_max_mutex_classes',
-            'performance_schema_max_mutex_instances',
-            'performance_schema_max_rwlock_classes',
-            'performance_schema_max_rwlock_instances',
-            'performance_schema_max_socket_classes',
-            'performance_schema_max_socket_instances',
-            'performance_schema_max_stage_classes',
-            'performance_schema_max_statement_classes',
-            'performance_schema_max_table_handles',
-            'performance_schema_max_table_instances',
-            'performance_schema_max_thread_classes',
-            'performance_schema_max_thread_instances',
-            'performance_schema_session_connect_attrs_size',
-            'performance_schema_setup_actors_size',
-            'performance_schema_setup_objects_size',
-            'performance_schema_users_size',
-            'pid_file',
-            'plugin_dir',
-            'port',
-            'protocol_version',
-            'proxy_user',
-            'relay_log',
-            'relay_log_basename',
-            'relay-log-index',
-            'relay_log_index',
-            'relay_log_info_file',
-            'relay_log_recovery',
-            'relay_log_space_limit',
-            'report_host',
-            'report_password',
-            'report_port',
-            'report_user',
-            'rpl_recovery_rank',
-            'safe_show_database',
-            'secure_file_priv',
-            'server_id_bits',
-            'server_uuid',
-            'shared_memory',
-            'shared_memory_base_name',
-            'skip_external_locking',
-            'skip_name_resolve',
-            'skip_networking',
-            'skip_show_database',
-            'slave_checkpoint_group',
-            'slave_checkpoint_period',
-            'slave_load_tmpdir',
-            'slave_rows_search_algorithms',
-            'slave_skip_errors',
-            'slave_type_conversions',
-            'socket',
-            'sql_big_tables',
-            'sql_log_update',
-            'sql_low_priority_updates',
-            'sql_max_join_size',
-            'ssl_ca',
-            'ssl_capath',
-            'ssl_cert',
-            'ssl_cipher',
-            'ssl_crl',
-            'ssl_crlpath',
-            'ssl_key',
-            'system_time_zone',
-            'table_lock_wait_timeout',
-            'table_open_cache_instances',
-            'table_type',
-            'thread_concurrency',
-            'thread_handling',
-            'thread_stack',
-            'time_format',
-            'tmpdir',
-            'version',
-            'version_comment',
-            'version_compile_machine',
-            'version_compile_os',
-            'warning_count',
-        );
-
-        return $static_variables;
-    }
-}
diff --git a/#pma/libraries/controllers/table/TableChartController.php b/#pma/libraries/controllers/table/TableChartController.php
deleted file mode 100644
index cedec3d3..00000000
--- a/#pma/libraries/controllers/table/TableChartController.php
+++ /dev/null
@@ -1,229 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-
-/**
- * Holds the PMA\TableChartController
- *
- * @package PMA
- */
-
-namespace PMA\libraries\controllers\table;
-
-use PMA\libraries\controllers\TableController;
-use PMA\libraries\Message;
-use PMA\libraries\Template;
-use PMA\libraries\Util;
-
-
-/**
- * Handles table related logic
- *
- * @package PhpMyAdmin
- */
-class TableChartController extends TableController
-{
-
-    /**
-     * @var string $sql_query
-     */
-    protected $sql_query;
-
-    /**
-     * @var string $url_query
-     */
-    protected $url_query;
-
-    /**
-     * @var array $cfg
-     */
-    protected $cfg;
-
-    /**
-     * Constructor
-     *
-     * @param string $sql_query Query
-     * @param string $url_query Query URL
-     * @param array  $cfg       Configuration
-     */
-    public function __construct($sql_query, $url_query, $cfg)
-    {
-        parent::__construct();
-
-        $this->sql_query = $sql_query;
-        $this->url_query = $url_query;
-        $this->cfg = $cfg;
-    }
-
-    /**
-     * Execute the query and return the result
-     *
-     * @return void
-     */
-    public function indexAction()
-    {
-        if (isset($_REQUEST['ajax_request'])
-            && isset($_REQUEST['pos'])
-            && isset($_REQUEST['session_max_rows'])
-        ) {
-            $this->ajaxAction();
-            return;
-        }
-
-        // Throw error if no sql query is set
-        if (!isset($this->sql_query) || $this->sql_query == '') {
-            $this->response->setRequestStatus(false);
-            $this->response->addHTML(
-                Message::error(__('No SQL query was set to fetch data.'))
-            );
-            return;
-        }
-
-        $this->response->getHeader()->getScripts()->addFiles(
-            array(
-                'chart.js',
-                'tbl_chart.js',
-                'jqplot/jquery.jqplot.js',
-                'jqplot/plugins/jqplot.barRenderer.js',
-                'jqplot/plugins/jqplot.canvasAxisLabelRenderer.js',
-                'jqplot/plugins/jqplot.canvasTextRenderer.js',
-                'jqplot/plugins/jqplot.categoryAxisRenderer.js',
-                'jqplot/plugins/jqplot.dateAxisRenderer.js',
-                'jqplot/plugins/jqplot.pointLabels.js',
-                'jqplot/plugins/jqplot.pieRenderer.js',
-                'jqplot/plugins/jqplot.highlighter.js'
-            )
-        );
-
-        /**
-         * Extract values for common work
-         * @todo Extract common files
-         */
-        $db = &$this->db;
-        $table = &$this->table;
-        $url_params = array();
-
-        /**
-         * Runs common work
-         */
-        if (mb_strlen($this->table)) {
-            $url_params['goto'] = Util::getScriptNameForOption(
-                $this->cfg['DefaultTabTable'], 'table'
-            );
-            $url_params['back'] = 'tbl_sql.php';
-            include 'libraries/tbl_common.inc.php';
-            include 'libraries/tbl_info.inc.php';
-        } elseif (mb_strlen($this->db)) {
-            $url_params['goto'] = Util::getScriptNameForOption(
-                $this->cfg['DefaultTabDatabase'], 'database'
-            );
-            $url_params['back'] = 'sql.php';
-            include 'libraries/db_common.inc.php';
-        } else {
-            $url_params['goto'] = Util::getScriptNameForOption(
-                $this->cfg['DefaultTabServer'], 'server'
-            );
-            $url_params['back'] = 'sql.php';
-            include 'libraries/server_common.inc.php';
-        }
-
-        $data = array();
-
-        $result = $this->dbi->tryQuery($this->sql_query);
-        $fields_meta = $this->dbi->getFieldsMeta($result);
-        while ($row = $this->dbi->fetchAssoc($result)) {
-            $data[] = $row;
-        }
-
-        $keys = array_keys($data[0]);
-
-        $numeric_types = array('int', 'real');
-        $numeric_column_count = 0;
-        foreach ($keys as $idx => $key) {
-            if (in_array($fields_meta[$idx]->type, $numeric_types)) {
-                $numeric_column_count++;
-            }
-        }
-
-        if ($numeric_column_count == 0) {
-            $this->response->setRequestStatus(false);
-            $this->response->addJSON(
-                'message',
-                __('No numeric columns present in the table to plot.')
-            );
-            return;
-        }
-
-        $url_params['db'] = $this->db;
-        $url_params['reload'] = 1;
-
-        /**
-         * Displays the page
-         */
-        $this->response->addHTML(
-            Template::get('table/chart/tbl_chart')->render(
-                array(
-                    'url_query' => $this->url_query,
-                    'url_params' => $url_params,
-                    'keys' => $keys,
-                    'fields_meta' => $fields_meta,
-                    'numeric_types' => $numeric_types,
-                    'numeric_column_count' => $numeric_column_count,
-                    'sql_query' => $this->sql_query
-                )
-            )
-        );
-    }
-
-    /**
-     * Handle ajax request
-     *
-     * @return void
-     */
-    public function ajaxAction()
-    {
-        /**
-         * Extract values for common work
-         * @todo Extract common files
-         */
-        $db = &$this->db;
-        $table = &$this->table;
-
-        $tableLength = mb_strlen($this->table);
-        $dbLength = mb_strlen($this->db);
-        if ($tableLength && $dbLength) {
-            include './libraries/tbl_common.inc.php';
-        }
-
-        $sql_with_limit = sprintf(
-            'SELECT * FROM(%s) AS `temp_res` LIMIT %s, %s',
-            $this->sql_query,
-            $_REQUEST['pos'],
-            $_REQUEST['session_max_rows']
-        );
-        $data = array();
-        $result = $this->dbi->tryQuery($sql_with_limit);
-        while ($row = $this->dbi->fetchAssoc($result)) {
-            $data[] = $row;
-        }
-
-        if (empty($data)) {
-            $this->response->setRequestStatus(false);
-            $this->response->addJSON('message', __('No data to display'));
-            return;
-        }
-        $sanitized_data = array();
-
-        foreach ($data as $data_row_number => $data_row) {
-            $tmp_row = array();
-            foreach ($data_row as $data_column => $data_value) {
-                $tmp_row[htmlspecialchars($data_column)] = htmlspecialchars(
-                    $data_value
-                );
-            }
-            $sanitized_data[] = $tmp_row;
-        }
-        $this->response->setRequestStatus(true);
-        $this->response->addJSON('message', null);
-        $this->response->addJSON('chartData', json_encode($sanitized_data));
-    }
-}
diff --git a/#pma/libraries/controllers/table/TableGisVisualizationController.php b/#pma/libraries/controllers/table/TableGisVisualizationController.php
deleted file mode 100644
index b4ea9acd..00000000
--- a/#pma/libraries/controllers/table/TableGisVisualizationController.php
+++ /dev/null
@@ -1,213 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-
-/**
- * Holds the PMA\TableIndexesController
- *
- * @package PMA
- */
-
-namespace PMA\libraries\controllers\table;
-
-use PMA\libraries\controllers\TableController;
-use PMA\libraries\Message;
-use PMA\libraries\Template;
-use PMA\libraries\gis\GISVisualization;
-
-require_once 'libraries/common.inc.php';
-require_once 'libraries/db_common.inc.php';
-
-/**
- * Class TableGisVisualizationController
- *
- * @package PMA\libraries\controllers\table
- */
-class TableGisVisualizationController extends TableController
-{
-
-    /**
-     * @var array $url_params
-     */
-    protected $url_params;
-
-    /**
-     * @var string $sql_query
-     */
-    protected $sql_query;
-
-    /**
-     * @var array $visualizationSettings
-     */
-    protected $visualizationSettings;
-
-    /**
-     * @var \PMA\libraries\gis\GISVisualization $visualization
-     */
-    protected $visualization;
-
-    /**
-     * Constructor
-     *
-     * @param string $sql_query             SQL query for retrieving GIS data
-     * @param array  $url_params            array of URL parameters
-     * @param string $goto                  goto script
-     * @param string $back                  back script
-     * @param array  $visualizationSettings visualization settings
-     */
-    public function __construct(
-        $sql_query,
-        $url_params,
-        $goto,
-        $back,
-        $visualizationSettings
-    ) {
-        parent::__construct();
-
-        $this->sql_query = $sql_query;
-        $this->url_params = $url_params;
-        $this->url_params['goto'] = $goto;
-        $this->url_params['back'] = $back;
-        $this->visualizationSettings = $visualizationSettings;
-    }
-
-    /**
-     * Save to file
-     *
-     * @return void
-     */
-    public function saveToFileAction()
-    {
-        $this->response->disable();
-        $file_name = $this->visualizationSettings['spatialColumn'];
-        $save_format = $_REQUEST['fileFormat'];
-        $this->visualization->toFile($file_name, $save_format);
-    }
-
-    /**
-     * Index
-     *
-     * @return void
-     */
-    public function indexAction()
-    {
-        // Throw error if no sql query is set
-        if (! isset($this->sql_query) || $this->sql_query == '') {
-            $this->response->setRequestStatus(false);
-            $this->response->addHTML(
-                Message::error(__('No SQL query was set to fetch data.'))
-            );
-            return;
-        }
-
-        // Execute the query and return the result
-        $result = $this->dbi->tryQuery($this->sql_query);
-        // Get the meta data of results
-        $meta = $this->dbi->getFieldsMeta($result);
-
-        // Find the candidate fields for label column and spatial column
-        $labelCandidates = array();
-        $spatialCandidates = array();
-        foreach ($meta as $column_meta) {
-            if ($column_meta->type == 'geometry') {
-                $spatialCandidates[] = $column_meta->name;
-            } else {
-                $labelCandidates[] = $column_meta->name;
-            }
-        }
-
-        // Get settings if any posted
-        if (PMA_isValid($_REQUEST['visualizationSettings'], 'array')) {
-            $this->visualizationSettings = $_REQUEST['visualizationSettings'];
-        }
-
-        if (!isset($this->visualizationSettings['labelColumn'])
-            && isset($labelCandidates[0])
-        ) {
-            $this->visualizationSettings['labelColumn'] = '';
-        }
-
-        // If spatial column is not set, use first geometric column as spatial column
-        if (! isset($this->visualizationSettings['spatialColumn'])) {
-            $this->visualizationSettings['spatialColumn'] = $spatialCandidates[0];
-        }
-
-        // Convert geometric columns from bytes to text.
-        $pos = isset($_REQUEST['pos']) ? $_REQUEST['pos']
-            : $_SESSION['tmpval']['pos'];
-        if (isset($_REQUEST['session_max_rows'])) {
-            $rows = $_REQUEST['session_max_rows'];
-        } else {
-            if ($_SESSION['tmpval']['max_rows'] != 'all') {
-                $rows = $_SESSION['tmpval']['max_rows'];
-            } else {
-                $rows = $GLOBALS['cfg']['MaxRows'];
-            }
-        }
-        $this->visualization = GISVisualization::get(
-            $this->sql_query,
-            $this->visualizationSettings,
-            $rows,
-            $pos
-        );
-
-        if (isset($_REQUEST['saveToFile'])) {
-            $this->saveToFileAction();
-            return;
-        }
-
-        $this->response->getHeader()->getScripts()->addFiles(
-            array(
-                'openlayers/OpenLayers.js',
-                'jquery/jquery.svg.js',
-                'tbl_gis_visualization.js',
-            )
-        );
-
-        // If all the rows contain SRID, use OpenStreetMaps on the initial loading.
-        if (! isset($_REQUEST['displayVisualization'])) {
-            if ($this->visualization->hasSrid()) {
-                $this->visualizationSettings['choice'] = 'useBaseLayer';
-            } else {
-                unset($this->visualizationSettings['choice']);
-            }
-        }
-
-        $this->visualization->setUserSpecifiedSettings($this->visualizationSettings);
-        if ($this->visualizationSettings != null) {
-            foreach ($this->visualization->getSettings() as $setting => $val) {
-                if (! isset($this->visualizationSettings[$setting])) {
-                    $this->visualizationSettings[$setting] = $val;
-                }
-            }
-        }
-
-        /**
-         * Displays the page
-         */
-        $this->url_params['sql_query'] = $this->sql_query;
-        $downloadUrl = 'tbl_gis_visualization.php' . PMA_URL_getCommon(
-            array_merge(
-                $this->url_params,
-                array(
-                    'saveToFile' => true,
-                    'session_max_rows' => $rows,
-                    'pos' => $pos
-                )
-            )
-        );
-        $html = Template::get('table/gis_visualization/gis_visualization')->render(
-            array(
-                'url_params' => $this->url_params,
-                'downloadUrl' => $downloadUrl,
-                'labelCandidates' => $labelCandidates,
-                'spatialCandidates' => $spatialCandidates,
-                'visualizationSettings' => $this->visualizationSettings,
-                'sql_query' => $this->sql_query,
-                'visualization' => $this->visualization->toImage('svg'),
-                'drawOl' => $this->visualization->asOl()
-            )
-        );
-
-        $this->response->addHTML($html);
-    }
-}
diff --git a/#pma/libraries/controllers/table/TableIndexesController.php b/#pma/libraries/controllers/table/TableIndexesController.php
deleted file mode 100644
index a9a2fe11..00000000
--- a/#pma/libraries/controllers/table/TableIndexesController.php
+++ /dev/null
@@ -1,173 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-
-/**
- * Holds the PMA\TableIndexesController
- *
- * @package PMA
- */
-
-namespace PMA\libraries\controllers\table;
-
-use PMA\libraries\controllers\TableController;
-use PMA\libraries\Index;
-use PMA\libraries\Message;
-use PMA\libraries\Template;
-use PMA\libraries\Util;
-
-
-/**
- * Class TableIndexesController
- *
- * @package PMA\libraries\controllers\table
- */
-class TableIndexesController extends TableController
-{
-    /**
-     * @var Index $index
-     */
-    protected $index;
-
-    /**
-     * Constructor
-     *
-     * @param Index $index Index
-     */
-    public function __construct($index)
-    {
-        parent::__construct();
-
-        $this->index = $index;
-    }
-
-    /**
-     * Index
-     *
-     * @return void
-     */
-    public function indexAction()
-    {
-        if (isset($_REQUEST['do_save_data'])) {
-            $this->doSaveDataAction();
-            return;
-        } // end builds the new index
-
-        $this->displayFormAction();
-    }
-
-    /**
-     * Display the form to edit/create an index
-     *
-     * @return void
-     */
-    public function displayFormAction()
-    {
-        include_once 'libraries/tbl_info.inc.php';
-
-        $add_fields = 0;
-        if (isset($_REQUEST['index']) && is_array($_REQUEST['index'])) {
-            // coming already from form
-            if (isset($_REQUEST['index']['columns']['names'])) {
-                $add_fields = count($_REQUEST['index']['columns']['names'])
-                    - $this->index->getColumnCount();
-            }
-            if (isset($_REQUEST['add_fields'])) {
-                $add_fields += $_REQUEST['added_fields'];
-            }
-        } elseif (isset($_REQUEST['create_index'])) {
-            $add_fields = $_REQUEST['added_fields'];
-        } // end preparing form values
-
-        // Get fields and stores their name/type
-        if (isset($_REQUEST['create_edit_table'])) {
-            $fields = json_decode($_REQUEST['columns'], true);
-            $index_params = array(
-                'Non_unique' => ($_REQUEST['index']['Index_choice'] == 'UNIQUE')
-                    ? '0' : '1',
-            );
-            $this->index->set($index_params);
-            $add_fields = count($fields);
-        } else {
-            $fields = $this->dbi->getTable($this->db, $this->table)
-                ->getNameAndTypeOfTheColumns();
-        }
-
-        $form_params = array(
-            'db' => $this->db,
-            'table' => $this->table,
-        );
-
-        if (isset($_REQUEST['create_index'])) {
-            $form_params['create_index'] = 1;
-        } elseif (isset($_REQUEST['old_index'])) {
-            $form_params['old_index'] = $_REQUEST['old_index'];
-        } elseif (isset($_REQUEST['index'])) {
-            $form_params['old_index'] = $_REQUEST['index'];
-        }
-
-        $this->response->getHeader()->getScripts()->addFile('indexes.js');
-
-        $this->response->addHTML(
-            Template::get('table/index_form')->render(
-                array(
-                    'fields' => $fields,
-                    'index' => $this->index,
-                    'form_params' => $form_params,
-                    'add_fields' => $add_fields
-                )
-            )
-        );
-    }
-
-    /**
-     * Process the data from the edit/create index form,
-     * run the query to build the new index
-     * and moves back to "tbl_sql.php"
-     *
-     * @return void
-     */
-    public function doSaveDataAction()
-    {
-        $error = false;
-
-        $sql_query = $this->dbi->getTable($this->db, $this->table)
-            ->getSqlQueryForIndexCreateOrEdit($this->index, $error);
-
-        // If there is a request for SQL previewing.
-        if (isset($_REQUEST['preview_sql'])) {
-
-            $this->response->addJSON(
-                'sql_data',
-                Template::get('preview_sql')
-                    ->render(
-                        array(
-                            'query_data' => $sql_query
-                        )
-                    )
-            );
-        } elseif (!$error) {
-
-            $this->dbi->query($sql_query);
-            if ($GLOBALS['is_ajax_request'] == true) {
-                $message = Message::success(
-                    __('Table %1$s has been altered successfully.')
-                );
-                $message->addParam($this->table);
-                $this->response->addJSON(
-                    'message', Util::getMessage($message, $sql_query, 'success')
-                );
-                $this->response->addJSON(
-                    'index_table',
-                    Index::getHtmlForIndexes(
-                        $this->table, $this->db
-                    )
-                );
-            } else {
-                include 'tbl_structure.php';
-            }
-        } else {
-            $this->response->setRequestStatus(false);
-            $this->response->addJSON('message', $error);
-        }
-    }
-}
diff --git a/#pma/libraries/controllers/table/TableRelationController.php b/#pma/libraries/controllers/table/TableRelationController.php
deleted file mode 100644
index bf561a8f..00000000
--- a/#pma/libraries/controllers/table/TableRelationController.php
+++ /dev/null
@@ -1,362 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Holds the PMA\TableRelationController
- *
- * @package PMA
- */
-
-namespace PMA\libraries\controllers\table;
-
-require_once 'libraries/index.lib.php';
-
-use PMA\libraries\controllers\TableController;
-use PMA\libraries\DatabaseInterface;
-use PMA\libraries\Index;
-use PMA\libraries\Table;
-use PMA\libraries\Template;
-use PMA\libraries\Util;
-
-/**
- * Handles table relation logic
- *
- * @package PhpMyAdmin
- */
-class TableRelationController extends TableController
-{
-    /**
-     * @var array $options_array
-     */
-    protected $options_array;
-
-    /**
-     * @var array $cfgRelation
-     */
-    protected $cfgRelation;
-
-    /**
-     * @var array $existrel
-     */
-    protected $existrel;
-
-    /**
-     * @var string $disp
-     */
-    protected $disp;
-
-    /**
-     * @var string $tbl_storage_engine
-     */
-    protected $tbl_storage_engine;
-
-    /**
-     * @var array $existrel_foreign
-     */
-    protected $existrel_foreign;
-
-    /**
-     * @var Table $udp_query
-     */
-    protected $upd_query;
-
-    /**
-     * Constructor
-     *
-     * @param array  $options_array      Options
-     * @param array  $cfgRelation        Config relation
-     * @param string $tbl_storage_engine Table storage engine
-     * @param array  $existrel           Relations
-     * @param array  $existrel_foreign   External relations
-     * @param string $disp               Display
-     * @param string $upd_query          Update query
-     */
-    public function __construct($options_array, $cfgRelation, $tbl_storage_engine,
-        $existrel, $existrel_foreign, $disp, $upd_query
-    ) {
-        parent::__construct();
-
-        $this->options_array = $options_array;
-        $this->cfgRelation = $cfgRelation;
-        $this->tbl_storage_engine = $tbl_storage_engine;
-        $this->existrel = $existrel;
-        $this->existrel_foreign = $existrel_foreign;
-        $this->disp = $disp;
-        $this->upd_query = $upd_query;
-    }
-
-    /**
-     * Index
-     *
-     * @return void
-     */
-    public function indexAction()
-    {
-        // Send table of column names to populate corresponding dropdowns depending
-        // on the current selection
-        if (isset($_REQUEST['getDropdownValues'])
-            && $_REQUEST['getDropdownValues'] === 'true'
-        ) {
-            // if both db and table are selected
-            if (isset($_REQUEST['foreignTable'])) {
-                $this->getDropdownValueForTableAction();
-            } else { // if only the db is selected
-                $this->getDropdownValueForDbAction();
-            }
-            return;
-        }
-
-        $this->response->getHeader()->getScripts()->addFiles(
-            array(
-                'tbl_relation.js',
-                'indexes.js'
-            )
-        );
-
-        // Gets tables information
-        include_once 'libraries/tbl_info.inc.php';
-
-        // updates for Internal relations
-        if (isset($_POST['destination_db']) && $this->cfgRelation['relwork']) {
-            $this->updateForInternalRelationAction();
-        }
-
-        // updates for foreign keys
-        if (isset($_POST['destination_foreign_db'])) {
-            $this->updateForForeignKeysAction();
-        }
-
-        // Updates for display field
-        if ($this->cfgRelation['displaywork'] && isset($_POST['display_field'])) {
-            $this->updateForDisplayField();
-        }
-
-        // If we did an update, refresh our data
-        if (isset($_POST['destination_db']) && $this->cfgRelation['relwork']) {
-            $this->existrel = PMA_getForeigners(
-                $this->db, $this->table, '', 'internal'
-            );
-        }
-        if (isset($_POST['destination_foreign_db'])
-            && Util::isForeignKeySupported($this->tbl_storage_engine)
-        ) {
-            $this->existrel_foreign = PMA_getForeigners(
-                $this->db, $this->table, '', 'foreign'
-            );
-        }
-
-        if ($this->cfgRelation['displaywork']) {
-            $this->disp = PMA_getDisplayField($this->db, $this->table);
-        }
-
-        // display secondary level tabs if necessary
-        $engine = $this->dbi->getTable($this->db, $this->table)
-            ->getStatusInfo('ENGINE');
-
-        $this->response->addHTML(
-            Template::get('table/secondary_tabs')->render(
-                array(
-                    'url_params' => array(
-                        'db' => $GLOBALS['db'],
-                        'table' => $GLOBALS['table']
-                    ),
-                    'engine' => $engine
-                )
-            )
-        );
-        $this->response->addHTML('<div id="structure_content">');
-
-        /**
-         * Dialog
-         */
-        // Now find out the columns of our $table
-        // need to use DatabaseInterface::QUERY_STORE with $this->dbi->numRows()
-        // in mysqli
-        $columns = $this->dbi->getColumns($this->db, $this->table);
-
-        // common form
-        $this->response->addHTML(
-            Template::get('table/relation/common_form')->render(
-                array(
-                    'db' => $this->db,
-                    'table' => $this->table,
-                    'columns' => $columns,
-                    'cfgRelation' => $this->cfgRelation,
-                    'tbl_storage_engine' => $this->tbl_storage_engine,
-                    'existrel' => isset($this->existrel) ? $this->existrel : array(),
-                    'existrel_foreign' => isset($this->existrel_foreign)
-                        ? $this->existrel_foreign['foreign_keys_data'] : array(),
-                    'options_array' => $this->options_array
-                )
-            )
-        );
-
-        if (Util::isForeignKeySupported($this->tbl_storage_engine)) {
-            $this->response->addHTML(PMA_getHtmlForDisplayIndexes());
-        }
-        $this->response->addHTML('</div>');
-    }
-
-    /**
-     * Update for display field
-     *
-     * @return void
-     */
-    public function updateForDisplayField()
-    {
-        if ($this->upd_query->updateDisplayField(
-            $this->disp, $_POST['display_field'], $this->cfgRelation
-        )
-        ) {
-            $this->response->addHTML(
-                Util::getMessage(
-                    __('Display column was successfully updated.'),
-                    '', 'success'
-                )
-            );
-        }
-    }
-
-    /**
-     * Update for FK
-     *
-     * @return void
-     */
-    public function updateForForeignKeysAction()
-    {
-        $multi_edit_columns_name = isset($_REQUEST['foreign_key_fields_name'])
-            ? $_REQUEST['foreign_key_fields_name']
-            : null;
-
-        // (for now, one index name only; we keep the definitions if the
-        // foreign db is not the same)
-        list($html, $preview_sql_data, $display_query, $seen_error)
-            = $this->upd_query->updateForeignKeys(
-                $_POST['destination_foreign_db'],
-                $multi_edit_columns_name, $_POST['destination_foreign_table'],
-                $_POST['destination_foreign_column'], $this->options_array,
-                $this->table,
-                isset($this->existrel_foreign)
-                ? $this->existrel_foreign['foreign_keys_data']
-                : null
-            );
-        $this->response->addHTML($html);
-
-        // If there is a request for SQL previewing.
-        if (isset($_REQUEST['preview_sql'])) {
-            PMA_previewSQL($preview_sql_data);
-        }
-
-        if (!empty($display_query) && !$seen_error) {
-            $GLOBALS['display_query'] = $display_query;
-            $this->response->addHTML(
-                Util::getMessage(
-                    __('Your SQL query has been executed successfully.'),
-                    null, 'success'
-                )
-            );
-        }
-    }
-
-    /**
-     * Update for internal relation
-     *
-     * @return void
-     */
-    public function updateForInternalRelationAction()
-    {
-        $multi_edit_columns_name = isset($_REQUEST['fields_name'])
-            ? $_REQUEST['fields_name']
-            : null;
-
-        if ($this->upd_query->updateInternalRelations(
-            $multi_edit_columns_name,
-            $_POST['destination_db'],
-            $_POST['destination_table'],
-            $_POST['destination_column'],
-            $this->cfgRelation,
-            isset($this->existrel) ? $this->existrel : null
-        )
-        ) {
-            $this->response->addHTML(
-                Util::getMessage(
-                    __('Internal relations were successfully updated.'),
-                    '', 'success'
-                )
-            );
-        }
-    }
-
-    /**
-     * Send table columns for foreign table dropdown
-     *
-     * @return void
-     *
-     */
-    public function getDropdownValueForTableAction()
-    {
-        $foreignTable = $_REQUEST['foreignTable'];
-        $table_obj = $this->dbi->getTable($_REQUEST['foreignDb'], $foreignTable);
-        // Since views do not have keys defined on them provide the full list of
-        // columns
-        if ($table_obj->isView()) {
-            $columnList = $table_obj->getColumns(false, false);
-        } else {
-            $columnList = $table_obj->getIndexedColumns(false, false);
-        }
-        $columns = array();
-        foreach ($columnList as $column) {
-            $columns[] = htmlspecialchars($column);
-        }
-        $this->response->addJSON('columns', $columns);
-
-        // @todo should be: $server->db($db)->table($table)->primary()
-        $primary = Index::getPrimary($foreignTable, $_REQUEST['foreignDb']);
-        if (false === $primary) {
-            return;
-        }
-
-        $this->response->addJSON('primary', array_keys($primary->getColumns()));
-    }
-
-    /**
-     * Send database selection values for dropdown
-     *
-     * @return void
-     *
-     */
-    public function getDropdownValueForDbAction()
-    {
-        $tables = array();
-        $foreign = isset($_REQUEST['foreign']) && $_REQUEST['foreign'] === 'true';
-
-        if ($foreign) {
-            $query = 'SHOW TABLE STATUS FROM '
-                . Util::backquote($_REQUEST['foreignDb']);
-            $tables_rs = $this->dbi->query(
-                $query,
-                null,
-                DatabaseInterface::QUERY_STORE
-            );
-
-            while ($row = $this->dbi->fetchArray($tables_rs)) {
-                if (isset($row['Engine'])
-                    &&  mb_strtoupper($row['Engine']) == $this->tbl_storage_engine
-                ) {
-                    $tables[] = htmlspecialchars($row['Name']);
-                }
-            }
-        } else {
-            $query = 'SHOW TABLES FROM '
-                . Util::backquote($_REQUEST['foreignDb']);
-            $tables_rs = $this->dbi->query(
-                $query,
-                null,
-                DatabaseInterface::QUERY_STORE
-            );
-            while ($row = $this->dbi->fetchArray($tables_rs)) {
-                $tables[] = htmlspecialchars($row[0]);
-            }
-        }
-        $this->response->addJSON('tables', $tables);
-    }
-}
diff --git a/#pma/libraries/controllers/table/TableSearchController.php b/#pma/libraries/controllers/table/TableSearchController.php
deleted file mode 100644
index 2166585c..00000000
--- a/#pma/libraries/controllers/table/TableSearchController.php
+++ /dev/null
@@ -1,1214 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Holds the PMA\libraries\controllers\table\TableSearchController
- *
- * @package PMA\libraries\controllers\table
- */
-
-namespace PMA\libraries\controllers\table;
-
-use PMA\libraries\Util;
-use PMA\libraries\Template;
-use PMA\libraries\controllers\TableController;
-use PMA\libraries\DatabaseInterface;
-
-require_once 'libraries/mysql_charsets.inc.php';
-require_once 'libraries/sql.lib.php';
-require_once 'libraries/bookmark.lib.php';
-
-/**
- * Class TableSearchController
- *
- * @package PhpMyAdmin
- */
-class TableSearchController extends TableController
-{
-    /**
-     * Normal search or Zoom search
-     *
-     * @access private
-     * @var string
-     */
-    private $_searchType;
-    /**
-     * Names of columns
-     *
-     * @access private
-     * @var array
-     */
-    private $_columnNames;
-    /**
-     * Types of columns
-     *
-     * @access private
-     * @var array
-     */
-    private $_columnTypes;
-    /**
-     * Collations of columns
-     *
-     * @access private
-     * @var array
-     */
-    private $_columnCollations;
-    /**
-     * Null Flags of columns
-     *
-     * @access private
-     * @var array
-     */
-    private $_columnNullFlags;
-    /**
-     * Whether a geometry column is present
-     *
-     * @access private
-     * @var boolean
-     */
-    private $_geomColumnFlag;
-    /**
-     * Foreign Keys
-     *
-     * @access private
-     * @var array
-     */
-    private $_foreigners;
-    /**
-     * Connection charset
-     *
-     * @access private
-     * @var string
-     */
-    private $_connectionCharSet;
-
-    protected $url_query;
-
-    /**
-     * Constructor
-     *
-     * @param string $searchType Search type
-     * @param string $url_query  URL query
-     */
-    public function __construct($searchType, $url_query)
-    {
-        parent::__construct();
-
-        $this->url_query = $url_query;
-        $this->_searchType = $searchType;
-        $this->_columnNames = array();
-        $this->_columnNullFlags = array();
-        $this->_columnTypes = array();
-        $this->_columnCollations = array();
-        $this->_geomColumnFlag = false;
-        $this->_foreigners = array();
-        // Loads table's information
-        $this->_loadTableInfo();
-        $this->_connectionCharSet = $this->dbi->fetchValue(
-            "SELECT @@character_set_connection"
-        );
-    }
-
-    /**
-     * Gets all the columns of a table along with their types, collations
-     * and whether null or not.
-     *
-     * @return void
-     */
-    private function _loadTableInfo()
-    {
-        // Gets the list and number of columns
-        $columns = $this->dbi->getColumns(
-            $this->db, $this->table, null, true
-        );
-        // Get details about the geometry functions
-        $geom_types = Util::getGISDatatypes();
-
-        foreach ($columns as $row) {
-            // set column name
-            $this->_columnNames[] = $row['Field'];
-
-            $type = $row['Type'];
-            // check whether table contains geometric columns
-            if (in_array($type, $geom_types)) {
-                $this->_geomColumnFlag = true;
-            }
-            // reformat mysql query output
-            if (strncasecmp($type, 'set', 3) == 0
-                || strncasecmp($type, 'enum', 4) == 0
-            ) {
-                $type = str_replace(',', ', ', $type);
-            } else {
-                // strip the "BINARY" attribute, except if we find "BINARY(" because
-                // this would be a BINARY or VARBINARY column type
-                if (! preg_match('@BINARY[\(]@i', $type)) {
-                    $type = preg_replace('@BINARY@i', '', $type);
-                }
-                $type = preg_replace('@ZEROFILL@i', '', $type);
-                $type = preg_replace('@UNSIGNED@i', '', $type);
-                $type = mb_strtolower($type);
-            }
-            if (empty($type)) {
-                $type = '&nbsp;';
-            }
-            $this->_columnTypes[] = $type;
-            $this->_columnNullFlags[] = $row['Null'];
-            $this->_columnCollations[]
-                = ! empty($row['Collation']) && $row['Collation'] != 'NULL'
-                ? $row['Collation']
-                : '';
-        } // end for
-
-        // Retrieve foreign keys
-        $this->_foreigners = PMA_getForeigners($this->db, $this->table);
-    }
-
-    /**
-     * Index action
-     *
-     * @return void
-     */
-    public function indexAction()
-    {
-        switch ($this->_searchType) {
-        case 'replace':
-            if (isset($_POST['find'])) {
-                $this->findAction();
-
-                return;
-            }
-            $this->response
-                ->getHeader()
-                ->getScripts()
-                ->addFile('tbl_find_replace.js');
-
-            // Show secondary level of tabs
-            $this->response->addHTML(
-                Template::get('secondary_tabs')
-                    ->render(
-                        array(
-                            'url_params' => array(
-                                'db'    => $this->db,
-                                'table' => $this->table,
-                            ),
-                            'sub_tabs'   => $this->_getSubTabs(),
-                        )
-                    )
-            );
-
-            if (isset($_POST['replace'])) {
-                $this->replaceAction();
-            }
-
-            if (!isset($goto)) {
-                $goto = Util::getScriptNameForOption(
-                    $GLOBALS['cfg']['DefaultTabTable'], 'table'
-                );
-            }
-
-            // Displays the find and replace form
-            $this->response->addHTML(
-                Template::get('table/search/selection_form')
-                    ->render(
-                        array(
-                            'searchType'       => $this->_searchType,
-                            'db'               => $this->db,
-                            'table'            => $this->table,
-                            'goto'             => $goto,
-                            'self'             => $this,
-                            'geomColumnFlag'   => $this->_geomColumnFlag,
-                            'columnNames'      => $this->_columnNames,
-                            'columnTypes'      => $this->_columnTypes,
-                            'columnCollations' => $this->_columnCollations,
-                            'dataLabel'        => null,
-                        )
-                    )
-            );
-            break;
-
-        case 'normal':
-            $this->response->getHeader()
-                ->getScripts()
-                ->addFiles(
-                    array(
-                        'makegrid.js',
-                        'sql.js',
-                        'tbl_select.js',
-                        'tbl_change.js',
-                        'jquery/jquery-ui-timepicker-addon.js',
-                        'jquery/jquery.uitablefilter.js',
-                        'gis_data_editor.js',
-                    )
-                );
-
-            if (isset($_REQUEST['range_search'])) {
-                $this->rangeSearchAction();
-
-                return;
-            }
-
-            /**
-             * No selection criteria received -> display the selection form
-             */
-            if (!isset($_POST['columnsToDisplay'])
-                && !isset($_POST['displayAllColumns'])
-            ) {
-                $this->displaySelectionFormAction();
-            } else {
-                $this->doSelectionAction();
-            }
-            break;
-
-        case 'zoom':
-            $this->response->getHeader()
-                ->getScripts()
-                ->addFiles(
-                    array(
-                        'makegrid.js',
-                        'sql.js',
-                        'jqplot/jquery.jqplot.js',
-                        'jqplot/plugins/jqplot.canvasTextRenderer.js',
-                        'jqplot/plugins/jqplot.canvasAxisLabelRenderer.js',
-                        'jqplot/plugins/jqplot.dateAxisRenderer.js',
-                        'jqplot/plugins/jqplot.highlighter.js',
-                        'jqplot/plugins/jqplot.cursor.js',
-                        'jquery/jquery-ui-timepicker-addon.js',
-                        'tbl_zoom_plot_jqplot.js',
-                        'tbl_change.js',
-                    )
-                );
-
-            /**
-             * Handle AJAX request for data row on point select
-             *
-             * @var boolean Object containing parameters for the POST request
-             */
-            if (isset($_REQUEST['get_data_row'])
-                && $_REQUEST['get_data_row'] == true
-            ) {
-                $this->getDataRowAction();
-
-                return;
-            }
-            /**
-             * Handle AJAX request for changing field information
-             * (value,collation,operators,field values) in input form
-             *
-             * @var boolean Object containing parameters for the POST request
-             */
-            if (isset($_REQUEST['change_tbl_info'])
-                && $_REQUEST['change_tbl_info'] == true
-            ) {
-                $this->changeTableInfoAction();
-
-                return;
-            }
-
-            $this->url_query .= '&amp;goto=tbl_select.php&amp;back=tbl_select.php';
-
-            // Gets tables information
-            include_once './libraries/tbl_info.inc.php';
-
-            if (!isset($goto)) {
-                $goto = Util::getScriptNameForOption(
-                    $GLOBALS['cfg']['DefaultTabTable'], 'table'
-                );
-            }
-
-            //Set default datalabel if not selected
-            if (!isset($_POST['zoom_submit']) || $_POST['dataLabel'] == '') {
-                $dataLabel = PMA_getDisplayField($this->db, $this->table);
-            } else {
-                $dataLabel = $_POST['dataLabel'];
-            }
-
-            // Displays the zoom search form
-            $this->response->addHTML(
-                Template::get('secondary_tabs')
-                    ->render(
-                        array(
-                            'url_params' => array(
-                                'db'    => $this->db,
-                                'table' => $this->table,
-                            ),
-                            'sub_tabs'   => $this->_getSubTabs(),
-                        )
-                    )
-            );
-            $this->response->addHTML(
-                Template::get('table/search/selection_form')
-                    ->render(
-                        array(
-                            'searchType'       => $this->_searchType,
-                            'db'               => $this->db,
-                            'table'            => $this->table,
-                            'goto'             => $goto,
-                            'self'             => $this,
-                            'geomColumnFlag'   => $this->_geomColumnFlag,
-                            'columnNames'      => $this->_columnNames,
-                            'columnTypes'      => $this->_columnTypes,
-                            'columnCollations' => $this->_columnCollations,
-                            'dataLabel'        => $dataLabel,
-                        )
-                    )
-            );
-
-            /*
-             * Handle the input criteria and generate the query result
-             * Form for displaying query results
-             */
-            if (isset($_POST['zoom_submit'])
-                && $_POST['criteriaColumnNames'][0] != 'pma_null'
-                && $_POST['criteriaColumnNames'][1] != 'pma_null'
-                && $_POST['criteriaColumnNames'][0] != $_POST['criteriaColumnNames'][1]
-            ) {
-                $this->zoomSubmitAction($dataLabel, $goto);
-            }
-            break;
-        }
-    }
-
-    /**
-     * Zoom submit action
-     *
-     * @param string $dataLabel Data label
-     * @param string $goto      Goto
-     *
-     * @return void
-     */
-    public function zoomSubmitAction($dataLabel, $goto)
-    {
-        //Query generation part
-        $sql_query = $this->_buildSqlQuery();
-        $sql_query .= ' LIMIT ' . $_POST['maxPlotLimit'];
-
-        //Query execution part
-        $result = $this->dbi->query(
-            $sql_query . ";", null, DatabaseInterface::QUERY_STORE
-        );
-        $fields_meta = $this->dbi->getFieldsMeta($result);
-        $data = array();
-        while ($row = $this->dbi->fetchAssoc($result)) {
-            //Need a row with indexes as 0,1,2 for the getUniqueCondition
-            // hence using a temporary array
-            $tmpRow = array();
-            foreach ($row as $val) {
-                $tmpRow[] = $val;
-            }
-            //Get unique condition on each row (will be needed for row update)
-            $uniqueCondition = Util::getUniqueCondition(
-                $result, // handle
-                count($this->_columnNames), // fields_cnt
-                $fields_meta, // fields_meta
-                $tmpRow, // row
-                true, // force_unique
-                false, // restrict_to_table
-                null // analyzed_sql_results
-            );
-            //Append it to row array as where_clause
-            $row['where_clause'] = $uniqueCondition[0];
-
-            $tmpData = array(
-                $_POST['criteriaColumnNames'][0] =>
-                    $row[$_POST['criteriaColumnNames'][0]],
-                $_POST['criteriaColumnNames'][1] =>
-                    $row[$_POST['criteriaColumnNames'][1]],
-                'where_clause' => $uniqueCondition[0]
-            );
-            $tmpData[$dataLabel] = ($dataLabel) ? $row[$dataLabel] : '';
-            $data[] = $tmpData;
-        }
-        unset($tmpData);
-
-        //Displays form for point data and scatter plot
-        $titles = array(
-            'Browse' => Util::getIcon(
-                'b_browse.png',
-                __('Browse foreign values')
-            )
-        );
-        $this->response->addHTML(
-            Template::get('table/search/zoom_result_form')
-                ->render(
-                    array(
-                        '_db'              => $this->db,
-                        '_table'           => $this->table,
-                        '_columnNames'     => $this->_columnNames,
-                        '_foreigners'      => $this->_foreigners,
-                        '_columnNullFlags' => $this->_columnNullFlags,
-                        '_columnTypes'     => $this->_columnTypes,
-                        'titles'           => $titles,
-                        'goto'             => $goto,
-                        'data'             => $data,
-                    )
-                )
-        );
-    }
-
-    /**
-     * Change table info action
-     *
-     * @return void
-     */
-    public function changeTableInfoAction()
-    {
-        $field = $_REQUEST['field'];
-        if ($field == 'pma_null') {
-            $this->response->addJSON('field_type', '');
-            $this->response->addJSON('field_collation', '');
-            $this->response->addJSON('field_operators', '');
-            $this->response->addJSON('field_value', '');
-            return;
-        }
-        $key = array_search($field, $this->_columnNames);
-        $search_index
-            = ((isset($_REQUEST['it']) && is_numeric($_REQUEST['it']))
-                ? intval($_REQUEST['it']) : 0);
-
-        $properties = $this->getColumnProperties($search_index, $key);
-        $this->response->addJSON(
-            'field_type', htmlspecialchars($properties['type'])
-        );
-        $this->response->addJSON('field_collation', $properties['collation']);
-        $this->response->addJSON('field_operators', $properties['func']);
-        $this->response->addJSON('field_value', $properties['value']);
-    }
-
-    /**
-     * Get data row action
-     *
-     * @return void
-     */
-    public function getDataRowAction()
-    {
-        $extra_data = array();
-        $row_info_query = 'SELECT * FROM `' . $_REQUEST['db'] . '`.`'
-            . $_REQUEST['table'] . '` WHERE ' .  $_REQUEST['where_clause'];
-        $result = $this->dbi->query(
-            $row_info_query . ";", null, DatabaseInterface::QUERY_STORE
-        );
-        $fields_meta = $this->dbi->getFieldsMeta($result);
-        while ($row = $this->dbi->fetchAssoc($result)) {
-            // for bit fields we need to convert them to printable form
-            $i = 0;
-            foreach ($row as $col => $val) {
-                if ($fields_meta[$i]->type == 'bit') {
-                    $row[$col] = Util::printableBitValue(
-                        $val, $fields_meta[$i]->length
-                    );
-                }
-                $i++;
-            }
-            $extra_data['row_info'] = $row;
-        }
-        $this->response->addJSON($extra_data);
-    }
-
-    /**
-     * Do selection action
-     *
-     * @return void
-     */
-    public function doSelectionAction()
-    {
-        /**
-         * Selection criteria have been submitted -> do the work
-         */
-        $sql_query = $this->_buildSqlQuery();
-
-        /**
-         * Add this to ensure following procedures included running correctly.
-         */
-        $db = $this->db;
-
-        PMA_executeQueryAndSendQueryResponse(
-            null, // analyzed_sql_results
-            false, // is_gotofile
-            $this->db, // db
-            $this->table, // table
-            null, // find_real_end
-            null, // sql_query_for_bookmark
-            null, // extra_data
-            null, // message_to_show
-            null, // message
-            null, // sql_data
-            $GLOBALS['goto'], // goto
-            $GLOBALS['pmaThemeImage'], // pmaThemeImage
-            null, // disp_query
-            null, // disp_message
-            null, // query_type
-            $sql_query, // sql_query
-            null, // selectedTables
-            null // complete_query
-        );
-    }
-
-    /**
-     * Display selection form action
-     *
-     * @return void
-     */
-    public function displaySelectionFormAction()
-    {
-        $this->url_query .= '&amp;goto=tbl_select.php&amp;back=tbl_select.php';
-
-        include_once 'libraries/tbl_info.inc.php';
-        if (! isset($goto)) {
-            $goto = Util::getScriptNameForOption(
-                $GLOBALS['cfg']['DefaultTabTable'], 'table'
-            );
-        }
-        // Displays the table search form
-        $this->response->addHTML(
-            Template::get('secondary_tabs')
-                ->render(
-                    array(
-                        'url_params' => array(
-                            'db'    => $this->db,
-                            'table' => $this->table,
-                        ),
-                        'sub_tabs'   => $this->_getSubTabs(),
-                    )
-                )
-        );
-        $this->response->addHTML(
-            Template::get('table/search/selection_form')
-                ->render(
-                    array(
-                        'searchType'       => $this->_searchType,
-                        'db'               => $this->db,
-                        'table'            => $this->table,
-                        'goto'             => $goto,
-                        'self'             => $this,
-                        'geomColumnFlag'   => $this->_geomColumnFlag,
-                        'columnNames'      => $this->_columnNames,
-                        'columnTypes'      => $this->_columnTypes,
-                        'columnCollations' => $this->_columnCollations,
-                        'dataLabel'        => null,
-                    )
-                )
-        );
-    }
-
-    /**
-     * Range search action
-     *
-     * @return void
-     */
-    public function rangeSearchAction()
-    {
-        $min_max = $this->getColumnMinMax($_REQUEST['column']);
-        $this->response->addJSON('column_data', $min_max);
-    }
-
-    /**
-     * Find action
-     *
-     * @return void
-     */
-    public function findAction()
-    {
-        $useRegex = array_key_exists('useRegex', $_POST)
-            && $_POST['useRegex'] == 'on';
-
-        $preview = $this->getReplacePreview(
-            $_POST['columnIndex'],
-            $_POST['find'],
-            $_POST['replaceWith'],
-            $useRegex,
-            $this->_connectionCharSet
-        );
-        $this->response->addJSON('preview', $preview);
-    }
-
-    /**
-     * Replace action
-     *
-     * @return void
-     */
-    public function replaceAction()
-    {
-        $this->replace(
-            $_POST['columnIndex'],
-            $_POST['findString'],
-            $_POST['replaceWith'],
-            $_POST['useRegex'],
-            $this->_connectionCharSet
-        );
-        $this->response->addHTML(
-            Util::getMessage(
-                __('Your SQL query has been executed successfully.'),
-                null, 'success'
-            )
-        );
-    }
-
-    /**
-     * Returns HTML for previewing strings found and their replacements
-     *
-     * @param int     $columnIndex index of the column
-     * @param string  $find        string to find in the column
-     * @param string  $replaceWith string to replace with
-     * @param boolean $useRegex    to use Regex replace or not
-     * @param string  $charSet     character set of the connection
-     *
-     * @return string HTML for previewing strings found and their replacements
-     */
-    function getReplacePreview(
-        $columnIndex, $find, $replaceWith, $useRegex, $charSet
-    ) {
-        $column = $this->_columnNames[$columnIndex];
-        if ($useRegex) {
-            $result = $this->_getRegexReplaceRows(
-                $columnIndex, $find, $replaceWith, $charSet
-            );
-        } else {
-            $sql_query = "SELECT "
-                . Util::backquote($column) . ","
-                . " REPLACE("
-                . Util::backquote($column) . ", '" . $find . "', '"
-                . $replaceWith
-                . "'),"
-                . " COUNT(*)"
-                . " FROM " . Util::backquote($this->db)
-                . "." . Util::backquote($this->table)
-                . " WHERE " . Util::backquote($column)
-                . " LIKE '%" . $find . "%' COLLATE " . $charSet . "_bin"; // here we
-            // change the collation of the 2nd operand to a case sensitive
-            // binary collation to make sure that the comparison
-            // is case sensitive
-            $sql_query .= " GROUP BY " . Util::backquote($column)
-                . " ORDER BY " . Util::backquote($column) . " ASC";
-
-            $result = $this->dbi->fetchResult($sql_query, 0);
-        }
-
-        return Template::get('table/search/replace_preview')->render(
-            array(
-                'db' => $this->db,
-                'table' => $this->table,
-                'columnIndex' => $columnIndex,
-                'find' => $find,
-                'replaceWith' => $replaceWith,
-                'useRegex' => $useRegex,
-                'result' => $result
-            )
-        );
-    }
-
-    /**
-     * Finds and returns Regex pattern and their replacements
-     *
-     * @param int    $columnIndex index of the column
-     * @param string $find        string to find in the column
-     * @param string $replaceWith string to replace with
-     * @param string $charSet     character set of the connection
-     *
-     * @return array Array containing original values, replaced values and count
-     */
-    private function _getRegexReplaceRows(
-        $columnIndex, $find, $replaceWith, $charSet
-    ) {
-        $column = $this->_columnNames[$columnIndex];
-        $sql_query = "SELECT "
-            . Util::backquote($column) . ","
-            . " 1," // to add an extra column that will have replaced value
-            . " COUNT(*)"
-            . " FROM " . Util::backquote($this->db)
-            . "." . Util::backquote($this->table)
-            . " WHERE " . Util::backquote($column)
-            . " RLIKE '" . $GLOBALS['dbi']->escapeString($find) . "' COLLATE "
-            . $charSet . "_bin"; // here we
-        // change the collation of the 2nd operand to a case sensitive
-        // binary collation to make sure that the comparison is case sensitive
-        $sql_query .= " GROUP BY " . Util::backquote($column)
-            . " ORDER BY " . Util::backquote($column) . " ASC";
-
-        $result = $this->dbi->fetchResult($sql_query, 0);
-
-        if (is_array($result)) {
-            /* Iterate over possible delimiters to get one */
-            $delimiters = array('/', '@', '#', '~', '!', '$', '%', '^', '&', '_');
-            $found = false;
-            for ($i = 0, $l = count($delimiters); $i < $l; $i++) {
-                if (strpos($find, $delimiters[$i]) === false) {
-                    $found = true;
-                    break;
-                }
-            }
-            if (! $found) {
-                return false;
-            }
-            $find = $delimiters[$i] . $find . $delimiters[$i];
-            foreach ($result as $index=>$row) {
-                $result[$index][1] = preg_replace(
-                    $find,
-                    $replaceWith,
-                    $row[0]
-                );
-            }
-        }
-        return $result;
-    }
-
-    /**
-     * Replaces a given string in a column with a give replacement
-     *
-     * @param int     $columnIndex index of the column
-     * @param string  $find        string to find in the column
-     * @param string  $replaceWith string to replace with
-     * @param boolean $useRegex    to use Regex replace or not
-     * @param string  $charSet     character set of the connection
-     *
-     * @return void
-     */
-    public function replace($columnIndex, $find, $replaceWith, $useRegex,
-        $charSet
-    ) {
-        $column = $this->_columnNames[$columnIndex];
-        if ($useRegex) {
-            $toReplace = $this->_getRegexReplaceRows(
-                $columnIndex, $find, $replaceWith, $charSet
-            );
-            $sql_query = "UPDATE " . Util::backquote($this->table)
-                . " SET " . Util::backquote($column) . " = CASE";
-            if (is_array($toReplace)) {
-                foreach ($toReplace as $row) {
-                    $sql_query .= "\n WHEN " . Util::backquote($column)
-                        . " = '" . $GLOBALS['dbi']->escapeString($row[0])
-                        . "' THEN '" . $GLOBALS['dbi']->escapeString($row[1]) . "'";
-                }
-            }
-            $sql_query .= " END"
-                . " WHERE " . Util::backquote($column)
-                . " RLIKE '" . $GLOBALS['dbi']->escapeString($find) . "' COLLATE "
-                . $charSet . "_bin"; // here we
-            // change the collation of the 2nd operand to a case sensitive
-            // binary collation to make sure that the comparison
-            // is case sensitive
-        } else {
-            $sql_query = "UPDATE " . Util::backquote($this->table)
-                . " SET " . Util::backquote($column) . " ="
-                . " REPLACE("
-                . Util::backquote($column) . ", '" . $find . "', '"
-                . $replaceWith
-                . "')"
-                . " WHERE " . Util::backquote($column)
-                . " LIKE '%" . $find . "%' COLLATE " . $charSet . "_bin"; // here we
-            // change the collation of the 2nd operand to a case sensitive
-            // binary collation to make sure that the comparison
-            // is case sensitive
-        }
-        $this->dbi->query(
-            $sql_query, null, DatabaseInterface::QUERY_STORE
-        );
-        $GLOBALS['sql_query'] = $sql_query;
-    }
-
-    /**
-     * Finds minimum and maximum value of a given column.
-     *
-     * @param string $column Column name
-     *
-     * @return array
-     */
-    public function getColumnMinMax($column)
-    {
-        $sql_query = 'SELECT MIN(' . Util::backquote($column) . ') AS `min`, '
-            . 'MAX(' . Util::backquote($column) . ') AS `max` '
-            . 'FROM ' . Util::backquote($this->db) . '.'
-            . Util::backquote($this->table);
-
-        $result = $this->dbi->fetchSingleRow($sql_query);
-
-        return $result;
-    }
-
-    /**
-     * Returns an array with necessary configurations to create
-     * sub-tabs in the table_select page.
-     *
-     * @return array Array containing configuration (icon, text, link, id, args)
-     * of sub-tabs
-     */
-    private function _getSubTabs()
-    {
-        $subtabs = array();
-        $subtabs['search']['icon'] = 'b_search.png';
-        $subtabs['search']['text'] = __('Table search');
-        $subtabs['search']['link'] = 'tbl_select.php';
-        $subtabs['search']['id'] = 'tbl_search_id';
-        $subtabs['search']['args']['pos'] = 0;
-
-        $subtabs['zoom']['icon'] = 'b_select.png';
-        $subtabs['zoom']['link'] = 'tbl_zoom_select.php';
-        $subtabs['zoom']['text'] = __('Zoom search');
-        $subtabs['zoom']['id'] = 'zoom_search_id';
-
-        $subtabs['replace']['icon'] = 'b_find_replace.png';
-        $subtabs['replace']['link'] = 'tbl_find_replace.php';
-        $subtabs['replace']['text'] = __('Find and replace');
-        $subtabs['replace']['id'] = 'find_replace_id';
-
-        return $subtabs;
-    }
-
-    /**
-     * Builds the sql search query from the post parameters
-     *
-     * @return string the generated SQL query
-     */
-    private function _buildSqlQuery()
-    {
-        $sql_query = 'SELECT ';
-
-        // If only distinct values are needed
-        $is_distinct = (isset($_POST['distinct'])) ? 'true' : 'false';
-        if ($is_distinct == 'true') {
-            $sql_query .= 'DISTINCT ';
-        }
-
-        // if all column names were selected to display, we do a 'SELECT *'
-        // (more efficient and this helps prevent a problem in IE
-        // if one of the rows is edited and we come back to the Select results)
-        if (isset($_POST['zoom_submit']) || ! empty($_POST['displayAllColumns'])) {
-            $sql_query .= '* ';
-        } else {
-            $sql_query .= implode(
-                ', ',
-                Util::backquote($_POST['columnsToDisplay'])
-            );
-        } // end if
-
-        $sql_query .= ' FROM '
-            . Util::backquote($_POST['table']);
-        $whereClause = $this->_generateWhereClause();
-        $sql_query .= $whereClause;
-
-        // if the search results are to be ordered
-        if (isset($_POST['orderByColumn']) && $_POST['orderByColumn'] != '--nil--') {
-            $sql_query .= ' ORDER BY '
-                . Util::backquote($_POST['orderByColumn'])
-                . ' ' . $_POST['order'];
-        } // end if
-        return $sql_query;
-    }
-
-    /**
-     * Provides a column's type, collation, operators list, and criteria value
-     * to display in table search form
-     *
-     * @param integer $search_index Row number in table search form
-     * @param integer $column_index Column index in ColumnNames array
-     *
-     * @return array Array containing column's properties
-     */
-    public function getColumnProperties($search_index, $column_index)
-    {
-        $selected_operator = (isset($_POST['criteriaColumnOperators'])
-            ? $_POST['criteriaColumnOperators'][$search_index] : '');
-        $entered_value = (isset($_POST['criteriaValues'])
-            ? $_POST['criteriaValues'] : '');
-        $titles = array(
-            'Browse' => Util::getIcon(
-                'b_browse.png', __('Browse foreign values')
-            )
-        );
-        //Gets column's type and collation
-        $type = $this->_columnTypes[$column_index];
-        $collation = $this->_columnCollations[$column_index];
-        //Gets column's comparison operators depending on column type
-        $func = Template::get('table/search/column_comparison_operators')->render(
-            array(
-                'search_index' => $search_index,
-                'columnTypes' => $this->_columnTypes,
-                'column_index' => $column_index,
-                'columnNullFlags' => $this->_columnNullFlags,
-                'selected_operator' => $selected_operator
-            )
-        );
-        //Gets link to browse foreign data(if any) and criteria inputbox
-        $foreignData = PMA_getForeignData(
-            $this->_foreigners, $this->_columnNames[$column_index], false, '', ''
-        );
-        $value = Template::get('table/search/input_box')->render(
-            array(
-                'str' => '',
-                'column_type' => (string) $type,
-                'column_id' => 'fieldID_',
-                'in_zoom_search_edit' => false,
-                '_foreigners' => $this->_foreigners,
-                'column_name' => $this->_columnNames[$column_index],
-                'foreignData' => $foreignData,
-                'table' => $this->table,
-                'column_index' => $search_index,
-                'foreignMaxLimit' => $GLOBALS['cfg']['ForeignKeyMaxLimit'],
-                'criteriaValues' => $entered_value,
-                'db' => $this->db,
-                'titles' => $titles,
-                'in_fbs' => true
-            )
-        );
-        return array(
-            'type' => $type,
-            'collation' => $collation,
-            'func' => $func,
-            'value' => $value
-        );
-    }
-
-    /**
-     * Generates the where clause for the SQL search query to be executed
-     *
-     * @return string the generated where clause
-     */
-    private function _generateWhereClause()
-    {
-        if (isset($_POST['customWhereClause'])
-            && trim($_POST['customWhereClause']) != ''
-        ) {
-            return ' WHERE ' . $_POST['customWhereClause'];
-        }
-
-        // If there are no search criteria set or no unary criteria operators,
-        // return
-        if (! isset($_POST['criteriaValues'])
-            && ! isset($_POST['criteriaColumnOperators'])
-            && ! isset($_POST['geom_func'])
-        ) {
-            return '';
-        }
-
-        // else continue to form the where clause from column criteria values
-        $fullWhereClause = array();
-        foreach ($_POST['criteriaColumnOperators'] as $column_index => $operator) {
-            $unaryFlag =  $GLOBALS['PMA_Types']->isUnaryOperator($operator);
-            $tmp_geom_func = isset($_POST['geom_func'][$column_index])
-                ? $_POST['geom_func'][$column_index] : null;
-
-            $whereClause = $this->_getWhereClause(
-                $_POST['criteriaValues'][$column_index],
-                $_POST['criteriaColumnNames'][$column_index],
-                $_POST['criteriaColumnTypes'][$column_index],
-                $operator,
-                $unaryFlag,
-                $tmp_geom_func
-            );
-
-            if ($whereClause) {
-                $fullWhereClause[] = $whereClause;
-            }
-        } // end foreach
-
-        if (!empty($fullWhereClause)) {
-            return ' WHERE ' . implode(' AND ', $fullWhereClause);
-        }
-        return '';
-    }
-
-    /**
-     * Return the where clause in case column's type is ENUM.
-     *
-     * @param mixed  $criteriaValues Search criteria input
-     * @param string $func_type      Search function/operator
-     *
-     * @return string part of where clause.
-     */
-    private function _getEnumWhereClause($criteriaValues, $func_type)
-    {
-        if (! is_array($criteriaValues)) {
-            $criteriaValues = explode(',', $criteriaValues);
-        }
-        $enum_selected_count = count($criteriaValues);
-        if ($func_type == '=' && $enum_selected_count > 1) {
-            $func_type    = 'IN';
-            $parens_open  = '(';
-            $parens_close = ')';
-
-        } elseif ($func_type == '!=' && $enum_selected_count > 1) {
-            $func_type    = 'NOT IN';
-            $parens_open  = '(';
-            $parens_close = ')';
-
-        } else {
-            $parens_open  = '';
-            $parens_close = '';
-        }
-        $enum_where = '\''
-            . $GLOBALS['dbi']->escapeString($criteriaValues[0]) . '\'';
-        for ($e = 1; $e < $enum_selected_count; $e++) {
-            $enum_where .= ', \''
-                . $GLOBALS['dbi']->escapeString($criteriaValues[$e]) . '\'';
-        }
-
-        return ' ' . $func_type . ' ' . $parens_open
-        . $enum_where . $parens_close;
-    }
-
-    /**
-     * Return the where clause for a geometrical column.
-     *
-     * @param mixed  $criteriaValues Search criteria input
-     * @param string $names          Name of the column on which search is submitted
-     * @param string $func_type      Search function/operator
-     * @param string $types          Type of the field
-     * @param bool   $geom_func      Whether geometry functions should be applied
-     *
-     * @return string part of where clause.
-     */
-    private function _getGeomWhereClause($criteriaValues, $names,
-        $func_type, $types, $geom_func = null
-    ) {
-        $geom_unary_functions = array(
-            'IsEmpty' => 1,
-            'IsSimple' => 1,
-            'IsRing' => 1,
-            'IsClosed' => 1,
-        );
-        $where = '';
-
-        // Get details about the geometry functions
-        $geom_funcs = Util::getGISFunctions($types, true, false);
-
-        // If the function takes multiple parameters
-        if ($geom_funcs[$geom_func]['params'] > 1) {
-            // create gis data from the criteria input
-            $gis_data = Util::createGISData($criteriaValues);
-            $where = $geom_func . '(' . Util::backquote($names)
-                . ', ' . $gis_data . ')';
-            return $where;
-        }
-
-        // New output type is the output type of the function being applied
-        $type = $geom_funcs[$geom_func]['type'];
-        $geom_function_applied = $geom_func
-            . '(' . Util::backquote($names) . ')';
-
-        // If the where clause is something like 'IsEmpty(`spatial_col_name`)'
-        if (isset($geom_unary_functions[$geom_func])
-            && trim($criteriaValues) == ''
-        ) {
-            $where = $geom_function_applied;
-
-        } elseif (in_array($type, Util::getGISDatatypes())
-            && ! empty($criteriaValues)
-        ) {
-            // create gis data from the criteria input
-            $gis_data = Util::createGISData($criteriaValues);
-            $where = $geom_function_applied . " " . $func_type . " " . $gis_data;
-
-        } elseif (mb_strlen($criteriaValues) > 0) {
-            $where = $geom_function_applied . " "
-                . $func_type . " '" . $criteriaValues . "'";
-        }
-        return $where;
-    }
-
-    /**
-     * Return the where clause for query generation based on the inputs provided.
-     *
-     * @param mixed  $criteriaValues Search criteria input
-     * @param string $names          Name of the column on which search is submitted
-     * @param string $types          Type of the field
-     * @param string $func_type      Search function/operator
-     * @param bool   $unaryFlag      Whether operator unary or not
-     * @param bool   $geom_func      Whether geometry functions should be applied
-     *
-     * @return string generated where clause.
-     */
-    private function _getWhereClause($criteriaValues, $names, $types,
-        $func_type, $unaryFlag, $geom_func = null
-    ) {
-        // If geometry function is set
-        if (! empty($geom_func)) {
-            return $this->_getGeomWhereClause(
-                $criteriaValues, $names, $func_type, $types, $geom_func
-            );
-        }
-
-        $backquoted_name = Util::backquote($names);
-        $where = '';
-        if ($unaryFlag) {
-            $where = $backquoted_name . ' ' . $func_type;
-
-        } elseif (strncasecmp($types, 'enum', 4) == 0 && ! empty($criteriaValues)) {
-            $where = $backquoted_name;
-            $where .= $this->_getEnumWhereClause($criteriaValues, $func_type);
-
-        } elseif ($criteriaValues != '') {
-            // For these types we quote the value. Even if it's another type
-            // (like INT), for a LIKE we always quote the value. MySQL converts
-            // strings to numbers and numbers to strings as necessary
-            // during the comparison
-            if (preg_match('@char|binary|blob|text|set|date|time|year@i', $types)
-                || mb_strpos(' ' . $func_type, 'LIKE')
-            ) {
-                $quot = '\'';
-            } else {
-                $quot = '';
-            }
-
-            // LIKE %...%
-            if ($func_type == 'LIKE %...%') {
-                $func_type = 'LIKE';
-                $criteriaValues = '%' . $criteriaValues . '%';
-            }
-            if ($func_type == 'REGEXP ^...$') {
-                $func_type = 'REGEXP';
-                $criteriaValues = '^' . $criteriaValues . '$';
-            }
-
-            if ('IN (...)' != $func_type
-                && 'NOT IN (...)' != $func_type
-                && 'BETWEEN' != $func_type
-                && 'NOT BETWEEN' != $func_type
-            ) {
-                return $backquoted_name . ' ' . $func_type . ' ' . $quot
-                        . $GLOBALS['dbi']->escapeString($criteriaValues) . $quot;
-            }
-            $func_type = str_replace(' (...)', '', $func_type);
-
-            //Don't explode if this is already an array
-            //(Case for (NOT) IN/BETWEEN.)
-            if (is_array($criteriaValues)) {
-                $values = $criteriaValues;
-            } else {
-                $values = explode(',', $criteriaValues);
-            }
-            // quote values one by one
-            $emptyKey = false;
-            foreach ($values as $key => &$value) {
-                if ('' === $value) {
-                    $emptyKey = $key;
-                    $value = 'NULL';
-                    continue;
-                }
-                $value = $quot . $GLOBALS['dbi']->escapeString(trim($value))
-                    . $quot;
-            }
-
-            if ('BETWEEN' == $func_type || 'NOT BETWEEN' == $func_type) {
-                $where = $backquoted_name . ' ' . $func_type . ' '
-                    . (isset($values[0]) ? $values[0] : '')
-                    . ' AND ' . (isset($values[1]) ? $values[1] : '');
-            } else { //[NOT] IN
-                if (false !== $emptyKey) {
-                    unset($values[$emptyKey]);
-                }
-                $wheres = array();
-                if (!empty($values)) {
-                    $wheres[] = $backquoted_name . ' ' . $func_type
-                        . ' (' . implode(',', $values) . ')';
-                }
-                if (false !== $emptyKey) {
-                    $wheres[] = $backquoted_name . ' IS NULL';
-                }
-                $where = implode(' OR ', $wheres);
-                if (1 < count($wheres)) {
-                    $where = '(' . $where . ')';
-                }
-            }
-        } // end if
-
-        return $where;
-    }
-}
diff --git a/#pma/libraries/controllers/table/TableStructureController.php b/#pma/libraries/controllers/table/TableStructureController.php
deleted file mode 100644
index 86105d51..00000000
--- a/#pma/libraries/controllers/table/TableStructureController.php
+++ /dev/null
@@ -1,1485 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-
-/**
- * Holds the PMA\TableStructureController
- *
- * @package PMA
- */
-
-namespace PMA\libraries\controllers\table;
-
-use PMA\libraries\config\PageSettings;
-use PMA\libraries\Index;
-use PMA\libraries\Message;
-use PMA\libraries\Template;
-use PMA\libraries\Util;
-use PMA\Util as Util_lib;
-use SqlParser;
-use SqlParser\Statements\CreateStatement;
-use SqlParser\Utils\Table as SqlTable;
-use PMA\libraries\Table;
-use PMA\libraries\controllers\TableController;
-
-require_once 'libraries/mysql_charsets.inc.php';
-require_once 'libraries/transformations.lib.php';
-require_once 'libraries/util.lib.php';
-require_once 'libraries/config/messages.inc.php';
-require_once 'libraries/config/user_preferences.forms.php';
-require_once 'libraries/config/page_settings.forms.php';
-
-/**
- * Handles table structure logic
- *
- * @package PhpMyAdmin
- */
-class TableStructureController extends TableController
-{
-    /**
-     * @var Table  The table object
-     */
-    protected $table_obj;
-    /**
-     * @var string  The URL query string
-     */
-    protected $_url_query;
-    /**
-     * @var bool DB is information_schema
-     */
-    protected $_db_is_system_schema;
-    /**
-     * @var bool Table is a view
-     */
-    protected $_tbl_is_view;
-    /**
-     * @var string Table storage engine
-     */
-    protected $_tbl_storage_engine;
-    /**
-     * @var int Number of rows
-     */
-    protected $_table_info_num_rows;
-    /**
-     * @var string Table collation
-     */
-    protected $_tbl_collation;
-    /**
-     * @var array Show table info
-     */
-    protected $_showtable;
-
-    /**
-     * TableStructureController constructor
-     *
-     * @param string $type                Indicate the db_structure or tbl_structure
-     * @param string $db                  DB name
-     * @param string $table               Table name
-     * @param string $url_query           URL query
-     * @param int    $num_tables          Number of tables
-     * @param int    $pos                 Current position in the list
-     * @param bool   $db_is_system_schema DB is information_schema
-     * @param int    $total_num_tables    Number of tables
-     * @param array  $tables              Tables in the DB
-     * @param bool   $is_show_stats       Whether stats show or not
-     * @param bool   $tbl_is_view         Table is a view
-     * @param string $tbl_storage_engine  Table storage engine
-     * @param int    $table_info_num_rows Number of rows
-     * @param string $tbl_collation       Table collation
-     * @param array  $showtable           Show table info
-     */
-    public function __construct(
-        $type, $db, $table, $url_query, $num_tables, $pos, $db_is_system_schema,
-        $total_num_tables, $tables, $is_show_stats, $tbl_is_view,
-        $tbl_storage_engine, $table_info_num_rows, $tbl_collation, $showtable
-    ) {
-        parent::__construct();
-
-        $this->_db_is_system_schema = $db_is_system_schema;
-        $this->_url_query = $url_query;
-        $this->_tbl_is_view = $tbl_is_view;
-        $this->_tbl_storage_engine = $tbl_storage_engine;
-        $this->_table_info_num_rows = $table_info_num_rows;
-        $this->_tbl_collation = $tbl_collation;
-        $this->_showtable = $showtable;
-        $this->table_obj = $this->dbi->getTable($this->db, $this->table);
-    }
-
-    /**
-     * Index action
-     *
-     * @return void
-     */
-    public function indexAction()
-    {
-        PageSettings::showGroup('TableStructure');
-
-        /**
-         * Function implementations for this script
-         */
-        include_once 'libraries/check_user_privileges.lib.php';
-        include_once 'libraries/index.lib.php';
-        include_once 'libraries/sql.lib.php';
-        include_once 'libraries/bookmark.lib.php';
-
-        $this->response->getHeader()->getScripts()->addFiles(
-            array(
-                'tbl_structure.js',
-                'indexes.js'
-            )
-        );
-
-        /**
-         * Handle column moving
-         */
-        if (isset($_REQUEST['move_columns'])
-            && is_array($_REQUEST['move_columns'])
-            && $this->response->isAjax()
-        ) {
-            $this->moveColumns();
-            return;
-        }
-
-        /**
-         * handle MySQL reserved words columns check
-         */
-        if (isset($_REQUEST['reserved_word_check'])) {
-            if ($GLOBALS['cfg']['ReservedWordDisableWarning'] === false) {
-                $columns_names = $_REQUEST['field_name'];
-                $reserved_keywords_names = array();
-                foreach ($columns_names as $column) {
-                    if (SqlParser\Context::isKeyword(trim($column), true)) {
-                        $reserved_keywords_names[] = trim($column);
-                    }
-                }
-                if (SqlParser\Context::isKeyword(trim($this->table), true)) {
-                    $reserved_keywords_names[] = trim($this->table);
-                }
-                if (count($reserved_keywords_names) == 0) {
-                    $this->response->setRequestStatus(false);
-                }
-                $this->response->addJSON(
-                    'message', sprintf(
-                        _ngettext(
-                            'The name \'%s\' is a MySQL reserved keyword.',
-                            'The names \'%s\' are MySQL reserved keywords.',
-                            count($reserved_keywords_names)
-                        ),
-                        implode(',', $reserved_keywords_names)
-                    )
-                );
-            } else {
-                $this->response->setRequestStatus(false);
-            }
-            return;
-        }
-        /**
-         * A click on Change has been made for one column
-         */
-        if (isset($_REQUEST['change_column'])) {
-            $this->displayHtmlForColumnChange(null, 'tbl_structure.php');
-            return;
-        }
-
-        /**
-         * Adding or editing partitioning of the table
-         */
-        if (isset($_REQUEST['edit_partitioning'])
-            && ! isset($_REQUEST['save_partitioning'])
-        ) {
-            $this->displayHtmlForPartitionChange();
-            return;
-        }
-
-        /**
-         * handle multiple field commands if required
-         *
-         * submit_mult_*_x comes from IE if <input type="img" ...> is used
-         */
-        $submit_mult = $this->getMultipleFieldCommandType();
-
-        if (! empty($submit_mult)) {
-            if (isset($_REQUEST['selected_fld'])) {
-                if ($submit_mult == 'browse') {
-                    // browsing the table displaying only selected columns
-                    $this->displayTableBrowseForSelectedColumns(
-                        $GLOBALS['goto'], $GLOBALS['pmaThemeImage']
-                    );
-                } else {
-                    // handle multiple field commands
-                    // handle confirmation of deleting multiple columns
-                    $action = 'tbl_structure.php';
-                    $GLOBALS['selected'] = $_REQUEST['selected_fld'];
-                    list(
-                        $what_ret, $query_type_ret, $is_unset_submit_mult,
-                        $mult_btn_ret, $centralColsError
-                        )
-                            = $this->getDataForSubmitMult(
-                                $submit_mult, $_REQUEST['selected_fld'], $action
-                            );
-                    //update the existing variables
-                    // todo: refactor mult_submits.inc.php such as
-                    // below globals are not needed anymore
-                    if (isset($what_ret)) {
-                        $GLOBALS['what'] = $what_ret;
-                        global $what;
-                    }
-                    if (isset($query_type_ret)) {
-                        $GLOBALS['query_type'] = $query_type_ret;
-                        global $query_type;
-                    }
-                    if ($is_unset_submit_mult) {
-                        unset($submit_mult);
-                    }
-                    if (isset($mult_btn_ret)) {
-                        $GLOBALS['mult_btn'] = $mult_btn_ret;
-                        global $mult_btn;
-                    }
-                    include 'libraries/mult_submits.inc.php';
-                    /**
-                     * if $submit_mult == 'change', execution will have stopped
-                     * at this point
-                     */
-                    if (empty($message)) {
-                        $message = Message::success();
-                    }
-                    $this->response->addHTML(
-                        Util::getMessage($message, $sql_query)
-                    );
-                }
-            } else {
-                $this->response->setRequestStatus(false);
-                $this->response->addJSON('message', __('No column selected.'));
-            }
-        }
-
-        // display secondary level tabs if necessary
-        $engine = $this->table_obj->getStatusInfo('ENGINE');
-        $this->response->addHTML(
-            Template::get('table/secondary_tabs')->render(
-                array(
-                    'url_params' => array(
-                        'db' => $this->db,
-                        'table' => $this->table
-                    ),
-                    'engine' => $engine
-                )
-            )
-        );
-        $this->response->addHTML('<div id="structure_content">');
-
-        /**
-         * Modifications have been submitted -> updates the table
-         */
-        if (isset($_REQUEST['do_save_data'])) {
-            $regenerate = $this->updateColumns();
-            if ($regenerate) {
-                // This happens when updating failed
-                // @todo: do something appropriate
-            } else {
-                // continue to show the table's structure
-                unset($_REQUEST['selected']);
-            }
-        }
-
-        /**
-         * Modifications to the partitioning have been submitted -> updates the table
-         */
-        if (isset($_REQUEST['save_partitioning'])) {
-            $this->updatePartitioning();
-        }
-
-        /**
-         * Adding indexes
-         */
-        if (isset($_REQUEST['add_key'])
-            || isset($_REQUEST['partition_maintenance'])
-        ) {
-            //todo: set some variables for sql.php include, to be eliminated
-            //after refactoring sql.php
-            $db = $this->db;
-            $table = $this->table;
-            $cfg = $GLOBALS['cfg'];
-            $is_superuser = $GLOBALS['dbi']->isSuperuser();
-            $pmaThemeImage = $GLOBALS['pmaThemeImage'];
-            include 'sql.php';
-            $GLOBALS['reload'] = true;
-        }
-
-        /**
-         * Gets the relation settings
-         */
-        $cfgRelation = PMA_getRelationsParam();
-
-        /**
-         * Runs common work
-         */
-        // set db, table references, for require_once that follows
-        // got to be eliminated in long run
-        $db = &$this->db;
-        $table = &$this->table;
-        $url_params = array();
-        include_once 'libraries/tbl_common.inc.php';
-        $this->_db_is_system_schema = $db_is_system_schema;
-        $this->_url_query = $url_query
-            . '&amp;goto=tbl_structure.php&amp;back=tbl_structure.php';
-        /* The url_params array is initialized in above include */
-        $url_params['goto'] = 'tbl_structure.php';
-        $url_params['back'] = 'tbl_structure.php';
-
-        /**
-         * Gets tables information
-         */
-        include_once 'libraries/tbl_info.inc.php';
-
-        // 2. Gets table keys and retains them
-        // @todo should be: $server->db($db)->table($table)->primary()
-        $primary = Index::getPrimary($this->table, $this->db);
-        $columns_with_index = $this->dbi
-            ->getTable($this->db, $this->table)
-            ->getColumnsWithIndex(
-                Index::UNIQUE | Index::INDEX | Index::SPATIAL
-                | Index::FULLTEXT
-            );
-        $columns_with_unique_index = $this->dbi
-            ->getTable($this->db, $this->table)
-            ->getColumnsWithIndex(Index::UNIQUE);
-
-        // 3. Get fields
-        $fields = (array)$this->dbi->getColumns(
-            $this->db, $this->table, null, true
-        );
-
-        //display table structure
-        $this->response->addHTML(
-            $this->displayStructure(
-                $cfgRelation, $columns_with_unique_index, $url_params,
-                $primary, $fields, $columns_with_index
-            )
-        );
-
-        $this->response->addHTML('</div>');
-    }
-
-    /**
-     * Moves columns in the table's structure based on $_REQUEST
-     *
-     * @return void
-     */
-    protected function moveColumns()
-    {
-        $this->dbi->selectDb($this->db);
-
-        /*
-         * load the definitions for all columns
-         */
-        $columns = $this->dbi->getColumnsFull($this->db, $this->table);
-        $column_names = array_keys($columns);
-        $changes = array();
-
-        // move columns from first to last
-        for ($i = 0, $l = count($_REQUEST['move_columns']); $i < $l; $i++) {
-            $column = $_REQUEST['move_columns'][$i];
-            // is this column already correctly placed?
-            if ($column_names[$i] == $column) {
-                continue;
-            }
-
-            // it is not, let's move it to index $i
-            $data = $columns[$column];
-            $extracted_columnspec = Util::extractColumnSpec($data['Type']);
-            if (isset($data['Extra'])
-                && $data['Extra'] == 'on update CURRENT_TIMESTAMP'
-            ) {
-                $extracted_columnspec['attribute'] = $data['Extra'];
-                unset($data['Extra']);
-            }
-            $current_timestamp = ($data['Type'] == 'timestamp'
-                    || $data['Type'] == 'datetime')
-                && $data['Default'] == 'CURRENT_TIMESTAMP';
-
-            if ($data['Null'] === 'YES' && $data['Default'] === null) {
-                $default_type = 'NULL';
-            } elseif ($current_timestamp) {
-                $default_type = 'CURRENT_TIMESTAMP';
-            } elseif ($data['Default'] === null) {
-                $default_type = 'NONE';
-            } else {
-                $default_type = 'USER_DEFINED';
-            }
-
-            $virtual = array(
-                'VIRTUAL', 'PERSISTENT', 'VIRTUAL GENERATED', 'STORED GENERATED'
-            );
-            $data['Virtuality'] = '';
-            $data['Expression'] = '';
-            if (isset($data['Extra']) && in_array($data['Extra'], $virtual)) {
-                $data['Virtuality'] = str_replace(' GENERATED', '', $data['Extra']);
-                $expressions = $this->table->getColumnGenerationExpression($column);
-                $data['Expression'] = $expressions[$column];
-            }
-
-            $changes[] = 'CHANGE ' . Table::generateAlter(
-                $column,
-                $column,
-                mb_strtoupper($extracted_columnspec['type']),
-                $extracted_columnspec['spec_in_brackets'],
-                $extracted_columnspec['attribute'],
-                isset($data['Collation']) ? $data['Collation'] : '',
-                $data['Null'] === 'YES' ? 'NULL' : 'NOT NULL',
-                $default_type,
-                $current_timestamp ? '' : $data['Default'],
-                isset($data['Extra']) && $data['Extra'] !== '' ? $data['Extra']
-                : false,
-                isset($data['COLUMN_COMMENT']) && $data['COLUMN_COMMENT'] !== ''
-                ? $data['COLUMN_COMMENT'] : false,
-                $data['Virtuality'],
-                $data['Expression'],
-                $i === 0 ? '-first' : $column_names[$i - 1]
-            );
-            // update current column_names array, first delete old position
-            for ($j = 0, $ll = count($column_names); $j < $ll; $j++) {
-                if ($column_names[$j] == $column) {
-                    unset($column_names[$j]);
-                }
-            }
-            // insert moved column
-            array_splice($column_names, $i, 0, $column);
-        }
-        if (empty($changes)) { // should never happen
-            $this->response->setRequestStatus(false);
-            return;
-        }
-        // move columns
-        $this->dbi->tryQuery(
-            sprintf(
-                'ALTER TABLE %s %s',
-                Util::backquote($this->table),
-                implode(', ', $changes)
-            )
-        );
-        $tmp_error = $this->dbi->getError();
-        if ($tmp_error) {
-            $this->response->setRequestStatus(false);
-            $this->response->addJSON('message', Message::error($tmp_error));
-        } else {
-            $message = Message::success(
-                __('The columns have been moved successfully.')
-            );
-            $this->response->addJSON('message', $message);
-            $this->response->addJSON('columns', $column_names);
-        }
-    }
-
-    /**
-     * Displays HTML for changing one or more columns
-     *
-     * @param array  $selected the selected columns
-     * @param string $action   target script to call
-     *
-     * @return boolean $regenerate true if error occurred
-     *
-     */
-    protected function displayHtmlForColumnChange($selected, $action)
-    {
-        // $selected comes from mult_submits.inc.php
-        if (empty($selected)) {
-            $selected[] = $_REQUEST['field'];
-            $selected_cnt = 1;
-        } else { // from a multiple submit
-            $selected_cnt = count($selected);
-        }
-
-        /**
-         * @todo optimize in case of multiple fields to modify
-         */
-        $fields_meta = array();
-        for ($i = 0; $i < $selected_cnt; $i++) {
-            $fields_meta[] = $this->dbi->getColumns(
-                $this->db, $this->table, $selected[$i], true
-            );
-        }
-        $num_fields = count($fields_meta);
-        // set these globals because tbl_columns_definition_form.inc.php
-        // verifies them
-        // @todo: refactor tbl_columns_definition_form.inc.php so that it uses
-        // protected function params
-        $GLOBALS['action'] = $action;
-        $GLOBALS['num_fields'] = $num_fields;
-
-        /**
-         * Form for changing properties.
-         */
-        include_once 'libraries/check_user_privileges.lib.php';
-        include 'libraries/tbl_columns_definition_form.inc.php';
-    }
-
-    /**
-     * Displays HTML for partition change
-     *
-     * @return string HTML for partition change
-     */
-    protected function displayHtmlForPartitionChange()
-    {
-        $partitionDetails = null;
-        if (! isset($_REQUEST['partition_by'])) {
-            $partitionDetails = $this->_extractPartitionDetails();
-        }
-
-        include_once 'libraries/StorageEngine.php';
-        $this->response->addHTML(
-            Template::get('table/structure/partition_definition_form')
-                ->render(
-                    array(
-                        'db' => $this->db,
-                        'table' => $this->table,
-                        'partitionDetails' => $partitionDetails
-                    )
-                )
-        );
-    }
-
-    /**
-     * Extracts partition details from CREATE TABLE statement
-     *
-     * @return array[] array of partition details
-     */
-    private function _extractPartitionDetails()
-    {
-        $createTable = (new Table($this->table, $this->db))->showCreate();
-        if (! $createTable) {
-            return null;
-        }
-
-        $parser = new SqlParser\Parser($createTable);
-        /**
-         * @var $stmt SqlParser\Statements\CreateStatement
-         */
-        $stmt = $parser->statements[0];
-
-        $partitionDetails = array();
-
-        $partitionDetails['partition_by'] = '';
-        $partitionDetails['partition_expr'] = '';
-        $partitionDetails['partition_count'] = '';
-
-        if (! empty($stmt->partitionBy)) {
-            $openPos = strpos($stmt->partitionBy, "(");
-            $closePos = strrpos($stmt->partitionBy, ")");
-
-            $partitionDetails['partition_by']
-                = trim(substr($stmt->partitionBy, 0, $openPos));
-            $partitionDetails['partition_expr']
-                = trim(substr($stmt->partitionBy, $openPos + 1, $closePos - ($openPos + 1)));
-            if (isset($stmt->partitionsNum)) {
-                $count = $stmt->partitionsNum;
-            } else {
-                $count = count($stmt->partitions);
-            }
-            $partitionDetails['partition_count'] = $count;
-        }
-
-        $partitionDetails['subpartition_by'] = '';
-        $partitionDetails['subpartition_expr'] = '';
-        $partitionDetails['subpartition_count'] = '';
-
-        if (! empty($stmt->subpartitionBy)) {
-            $openPos = strpos($stmt->subpartitionBy, "(");
-            $closePos = strrpos($stmt->subpartitionBy, ")");
-
-            $partitionDetails['subpartition_by']
-                = trim(substr($stmt->subpartitionBy, 0, $openPos));
-            $partitionDetails['subpartition_expr']
-                = trim(substr($stmt->subpartitionBy, $openPos + 1, $closePos - ($openPos + 1)));
-            if (isset($stmt->subpartitionsNum)) {
-                $count = $stmt->subpartitionsNum;
-            } else {
-                $count = count($stmt->partitions[0]->subpartitions);
-            }
-            $partitionDetails['subpartition_count'] = $count;
-        }
-
-        // Only LIST and RANGE type parameters allow subpartitioning
-        $partitionDetails['can_have_subpartitions']
-            = $partitionDetails['partition_count'] > 1
-                && ($partitionDetails['partition_by'] == 'RANGE'
-                || $partitionDetails['partition_by'] == 'RANGE COLUMNS'
-                || $partitionDetails['partition_by'] == 'LIST'
-                || $partitionDetails['partition_by'] == 'LIST COLUMNS');
-
-        // Values are specified only for LIST and RANGE type partitions
-        $partitionDetails['value_enabled'] = isset($partitionDetails['partition_by'])
-            && ($partitionDetails['partition_by'] == 'RANGE'
-            || $partitionDetails['partition_by'] == 'RANGE COLUMNS'
-            || $partitionDetails['partition_by'] == 'LIST'
-            || $partitionDetails['partition_by'] == 'LIST COLUMNS');
-
-        $partitionDetails['partitions'] = array();
-
-        for ($i = 0; $i < intval($partitionDetails['partition_count']); $i++) {
-
-            if (! isset($stmt->partitions[$i])) {
-                $partitionDetails['partitions'][$i] = array(
-                    'name' => 'p' . $i,
-                    'value_type' => '',
-                    'value' => '',
-                    'engine' => '',
-                    'comment' => '',
-                    'data_directory' => '',
-                    'index_directory' => '',
-                    'max_rows' => '',
-                    'min_rows' => '',
-                    'tablespace' => '',
-                    'node_group' => '',
-                );
-            } else {
-                $p = $stmt->partitions[$i];
-                $type = $p->type;
-                $expr = trim($p->expr, '()');
-                if ($expr == 'MAXVALUE') {
-                    $type .= ' MAXVALUE';
-                    $expr = '';
-                }
-                $partitionDetails['partitions'][$i] = array(
-                    'name' => $p->name,
-                    'value_type' => $type,
-                    'value' => $expr,
-                    'engine' => $p->options->has('ENGINE', true),
-                    'comment' => trim($p->options->has('COMMENT', true), "'"),
-                    'data_directory' => trim($p->options->has('DATA DIRECTORY', true), "'"),
-                    'index_directory' => trim($p->options->has('INDEX_DIRECTORY', true), "'"),
-                    'max_rows' => $p->options->has('MAX_ROWS', true),
-                    'min_rows' => $p->options->has('MIN_ROWS', true),
-                    'tablespace' => $p->options->has('TABLESPACE', true),
-                    'node_group' => $p->options->has('NODEGROUP', true),
-                );
-            }
-
-            $partition =& $partitionDetails['partitions'][$i];
-            $partition['prefix'] = 'partitions[' . $i . ']';
-
-            if ($partitionDetails['subpartition_count'] > 1) {
-                $partition['subpartition_count'] = $partitionDetails['subpartition_count'];
-                $partition['subpartitions'] = array();
-
-                for ($j = 0; $j < intval($partitionDetails['subpartition_count']); $j++) {
-                    if (! isset($stmt->partitions[$i]->subpartitions[$j])) {
-                        $partition['subpartitions'][$j] = array(
-                            'name' => $partition['name'] . '_s' . $j,
-                            'engine' => '',
-                            'comment' => '',
-                            'data_directory' => '',
-                            'index_directory' => '',
-                            'max_rows' => '',
-                            'min_rows' => '',
-                            'tablespace' => '',
-                            'node_group' => '',
-                        );
-                    } else {
-                        $sp = $stmt->partitions[$i]->subpartitions[$j];
-                        $partition['subpartitions'][$j] = array(
-                            'name' => $sp->name,
-                            'engine' => $sp->options->has('ENGINE', true),
-                            'comment' => trim($sp->options->has('COMMENT', true), "'"),
-                            'data_directory' => trim($sp->options->has('DATA DIRECTORY', true), "'"),
-                            'index_directory' => trim($sp->options->has('INDEX_DIRECTORY', true), "'"),
-                            'max_rows' => $sp->options->has('MAX_ROWS', true),
-                            'min_rows' => $sp->options->has('MIN_ROWS', true),
-                            'tablespace' => $sp->options->has('TABLESPACE', true),
-                            'node_group' => $sp->options->has('NODEGROUP', true),
-                        );
-                    }
-
-                    $subpartition =& $partition['subpartitions'][$j];
-                    $subpartition['prefix'] = 'partitions[' . $i . ']'
-                        . '[subpartitions][' . $j . ']';
-                }
-            }
-        }
-
-        return $partitionDetails;
-    }
-
-    /**
-     * Update the table's partitioning based on $_REQUEST
-     *
-     * @return void
-     */
-    protected function updatePartitioning()
-    {
-        include_once 'libraries/create_addfield.lib.php';
-
-        $sql_query = "ALTER TABLE " . Util::backquote($this->table) . " "
-            . PMA_getPartitionsDefinition();
-
-        // Execute alter query
-        $result = $this->dbi->tryQuery($sql_query);
-
-        if ($result !== false) {
-            $message = Message::success(
-                __('Table %1$s has been altered successfully.')
-            );
-            $message->addParam($this->table);
-            $this->response->addHTML(
-                Util::getMessage($message, $sql_query, 'success')
-            );
-        } else {
-            $this->response->setRequestStatus(false);
-            $this->response->addJSON(
-                'message',
-                Message::rawError(
-                    __('Query error') . ':<br />' . $this->dbi->getError()
-                )
-            );
-        }
-    }
-
-    /**
-     * Function to get the type of command for multiple field handling
-     *
-     * @return string
-     */
-    protected function getMultipleFieldCommandType()
-    {
-        $types = array(
-            'change', 'drop', 'primary',
-            'index', 'unique', 'spatial',
-            'fulltext', 'browse'
-        );
-
-        foreach ($types as $type) {
-            if (isset($_REQUEST['submit_mult_' . $type . '_x'])) {
-                return $type;
-            }
-        }
-
-        if (isset($_REQUEST['submit_mult'])) {
-            return $_REQUEST['submit_mult'];
-        } elseif (isset($_REQUEST['mult_btn'])
-            && $_REQUEST['mult_btn'] == __('Yes')
-        ) {
-            if (isset($_REQUEST['selected'])) {
-                $_REQUEST['selected_fld'] = $_REQUEST['selected'];
-            }
-            return 'row_delete';
-        }
-
-        return null;
-    }
-
-    /**
-     * Function to display table browse for selected columns
-     *
-     * @param string $goto          goto page url
-     * @param string $pmaThemeImage URI of the pma theme image
-     *
-     * @return void
-     */
-    protected function displayTableBrowseForSelectedColumns($goto, $pmaThemeImage)
-    {
-        $GLOBALS['active_page'] = 'sql.php';
-        $fields = array();
-        foreach ($_REQUEST['selected_fld'] as $sval) {
-            $fields[] = Util::backquote($sval);
-        }
-        $sql_query = sprintf(
-            'SELECT %s FROM %s.%s',
-            implode(', ', $fields),
-            Util::backquote($this->db),
-            Util::backquote($this->table)
-        );
-
-        // Parse and analyze the query
-        $db = &$this->db;
-        include_once 'libraries/parse_analyze.lib.php';
-        list(
-            $analyzed_sql_results,
-            $db,
-        ) = PMA_parseAnalyze($sql_query, $db);
-        // @todo: possibly refactor
-        extract($analyzed_sql_results);
-
-        include_once 'libraries/sql.lib.php';
-
-        $this->response->addHTML(
-            PMA_executeQueryAndGetQueryResponse(
-                isset($analyzed_sql_results) ? $analyzed_sql_results : '',
-                false, // is_gotofile
-                $this->db, // db
-                $this->table, // table
-                null, // find_real_end
-                null, // sql_query_for_bookmark
-                null, // extra_data
-                null, // message_to_show
-                null, // message
-                null, // sql_data
-                $goto, // goto
-                $pmaThemeImage, // pmaThemeImage
-                null, // disp_query
-                null, // disp_message
-                null, // query_type
-                $sql_query, // sql_query
-                null, // selectedTables
-                null // complete_query
-            )
-        );
-    }
-
-    /**
-     * Update the table's structure based on $_REQUEST
-     *
-     * @return boolean $regenerate              true if error occurred
-     *
-     */
-    protected function updateColumns()
-    {
-        $err_url = 'tbl_structure.php' . PMA_URL_getCommon(
-            array(
-                'db' => $this->db, 'table' => $this->table
-            )
-        );
-        $regenerate = false;
-        $field_cnt = count($_REQUEST['field_name']);
-        $changes = array();
-        $adjust_privileges = array();
-
-        for ($i = 0; $i < $field_cnt; $i++) {
-            if (!$this->columnNeedsAlterTable($i)) {
-                continue;
-            }
-
-            $changes[] = 'CHANGE ' . Table::generateAlter(
-                Util_lib\get($_REQUEST, "field_orig.${i}", ''),
-                $_REQUEST['field_name'][$i],
-                $_REQUEST['field_type'][$i],
-                $_REQUEST['field_length'][$i],
-                $_REQUEST['field_attribute'][$i],
-                Util_lib\get($_REQUEST, "field_collation.${i}", ''),
-                Util_lib\get($_REQUEST, "field_null.${i}", 'NOT NULL'),
-                $_REQUEST['field_default_type'][$i],
-                $_REQUEST['field_default_value'][$i],
-                Util_lib\get($_REQUEST, "field_extra.${i}", false),
-                Util_lib\get($_REQUEST, "field_comments.${i}", ''),
-                Util_lib\get($_REQUEST, "field_virtuality.${i}", ''),
-                Util_lib\get($_REQUEST, "field_expression.${i}", ''),
-                Util_lib\get($_REQUEST, "field_move_to.${i}", '')
-            );
-
-            // find the remembered sort expression
-            $sorted_col = $this->table_obj->getUiProp(
-                Table::PROP_SORTED_COLUMN
-            );
-            // if the old column name is part of the remembered sort expression
-            if (mb_strpos(
-                $sorted_col,
-                Util::backquote($_REQUEST['field_orig'][$i])
-            ) !== false) {
-                // delete the whole remembered sort expression
-                $this->table_obj->removeUiProp(Table::PROP_SORTED_COLUMN);
-            }
-
-            if (isset($_REQUEST['field_adjust_privileges'][$i])
-                && ! empty($_REQUEST['field_adjust_privileges'][$i])
-                && $_REQUEST['field_orig'][$i] != $_REQUEST['field_name'][$i]
-            ) {
-                $adjust_privileges[$_REQUEST['field_orig'][$i]]
-                    = $_REQUEST['field_name'][$i];
-            }
-        } // end for
-
-        if (count($changes) > 0 || isset($_REQUEST['preview_sql'])) {
-            // Builds the primary keys statements and updates the table
-            $key_query = '';
-            /**
-             * this is a little bit more complex
-             *
-             * @todo if someone selects A_I when altering a column we need to check:
-             *  - no other column with A_I
-             *  - the column has an index, if not create one
-             *
-             */
-
-            // To allow replication, we first select the db to use
-            // and then run queries on this db.
-            if (!$this->dbi->selectDb($this->db)) {
-                Util::mysqlDie(
-                    $this->dbi->getError(),
-                    'USE ' . Util::backquote($this->db) . ';',
-                    false,
-                    $err_url
-                );
-            }
-            $sql_query = 'ALTER TABLE ' . Util::backquote($this->table) . ' ';
-            $sql_query .= implode(', ', $changes) . $key_query;
-            $sql_query .= ';';
-
-            // If there is a request for SQL previewing.
-            if (isset($_REQUEST['preview_sql'])) {
-                PMA_previewSQL(count($changes) > 0 ? $sql_query : '');
-            }
-
-            $columns_with_index = $this->dbi
-                ->getTable($this->db, $this->table)
-                ->getColumnsWithIndex(
-                    Index::PRIMARY | Index::UNIQUE | Index::INDEX
-                    | Index::SPATIAL | Index::FULLTEXT
-                );
-
-            $changedToBlob = array();
-            // While changing the Column Collation
-            // First change to BLOB
-            for ($i = 0; $i < $field_cnt; $i++ ) {
-                if (isset($_REQUEST['field_collation'][$i])
-                    && isset($_REQUEST['field_collation_orig'][$i])
-                    && $_REQUEST['field_collation'][$i] !== $_REQUEST['field_collation_orig'][$i]
-                    && ! in_array($_REQUEST['field_orig'][$i], $columns_with_index)
-                ) {
-                    $secondary_query = 'ALTER TABLE ' . Util::backquote(
-                        $this->table
-                    )
-                    . ' CHANGE ' . Util::backquote(
-                        $_REQUEST['field_orig'][$i]
-                    )
-                    . ' ' . Util::backquote($_REQUEST['field_orig'][$i])
-                    . ' BLOB;';
-                    $this->dbi->query($secondary_query);
-                    $changedToBlob[$i] = true;
-                } else {
-                    $changedToBlob[$i] = false;
-                }
-            }
-
-            // Then make the requested changes
-            $result = $this->dbi->tryQuery($sql_query);
-
-            if ($result !== false) {
-                $changed_privileges = $this->adjustColumnPrivileges(
-                    $adjust_privileges
-                );
-
-                if ($changed_privileges) {
-                    $message = Message::success(
-                        __(
-                            'Table %1$s has been altered successfully. Privileges ' .
-                            'have been adjusted.'
-                        )
-                    );
-                } else {
-                    $message = Message::success(
-                        __('Table %1$s has been altered successfully.')
-                    );
-                }
-                $message->addParam($this->table);
-
-                $this->response->addHTML(
-                    Util::getMessage($message, $sql_query, 'success')
-                );
-            } else {
-                // An error happened while inserting/updating a table definition
-
-                // Save the Original Error
-                $orig_error = $this->dbi->getError();
-                $changes_revert = array();
-
-                // Change back to Original Collation and data type
-                for ($i = 0; $i < $field_cnt; $i++) {
-                    if ($changedToBlob[$i]) {
-                        $changes_revert[] = 'CHANGE ' . Table::generateAlter(
-                            Util_lib\get($_REQUEST, "field_orig.${i}", ''),
-                            $_REQUEST['field_name'][$i],
-                            $_REQUEST['field_type_orig'][$i],
-                            $_REQUEST['field_length_orig'][$i],
-                            $_REQUEST['field_attribute_orig'][$i],
-                            Util_lib\get($_REQUEST, "field_collation_orig.${i}", ''),
-                            Util_lib\get($_REQUEST, "field_null_orig.${i}", 'NOT NULL'),
-                            $_REQUEST['field_default_type_orig'][$i],
-                            $_REQUEST['field_default_value_orig'][$i],
-                            Util_lib\get($_REQUEST, "field_extra_orig.${i}", false),
-                            Util_lib\get($_REQUEST, "field_comments_orig.${i}", ''),
-                            Util_lib\get($_REQUEST, "field_virtuality_orig.${i}", ''),
-                            Util_lib\get($_REQUEST, "field_expression_orig.${i}", ''),
-                            Util_lib\get($_REQUEST, "field_move_to_orig.${i}", '')
-                        );
-                    }
-                }
-
-                $revert_query = 'ALTER TABLE ' . Util::backquote($this->table)
-                    . ' ';
-                $revert_query .= implode(', ', $changes_revert) . '';
-                $revert_query .= ';';
-
-                // Column reverted back to original
-                $this->dbi->query($revert_query);
-
-                $this->response->setRequestStatus(false);
-                $this->response->addJSON(
-                    'message',
-                    Message::rawError(
-                        __('Query error') . ':<br />' . $orig_error
-                    )
-                );
-                $regenerate = true;
-            }
-        }
-
-        // update field names in relation
-        if (isset($_REQUEST['field_orig']) && is_array($_REQUEST['field_orig'])) {
-            foreach ($_REQUEST['field_orig'] as $fieldindex => $fieldcontent) {
-                if ($_REQUEST['field_name'][$fieldindex] != $fieldcontent) {
-                    PMA_REL_renameField(
-                        $this->db, $this->table, $fieldcontent,
-                        $_REQUEST['field_name'][$fieldindex]
-                    );
-                }
-            }
-        }
-
-        // update mime types
-        if (isset($_REQUEST['field_mimetype'])
-            && is_array($_REQUEST['field_mimetype'])
-            && $GLOBALS['cfg']['BrowseMIME']
-        ) {
-            foreach ($_REQUEST['field_mimetype'] as $fieldindex => $mimetype) {
-                if (isset($_REQUEST['field_name'][$fieldindex])
-                    && mb_strlen(
-                        $_REQUEST['field_name'][$fieldindex]
-                    )
-                ) {
-                    PMA_setMIME(
-                        $this->db, $this->table,
-                        $_REQUEST['field_name'][$fieldindex],
-                        $mimetype,
-                        $_REQUEST['field_transformation'][$fieldindex],
-                        $_REQUEST['field_transformation_options'][$fieldindex],
-                        $_REQUEST['field_input_transformation'][$fieldindex],
-                        $_REQUEST['field_input_transformation_options'][$fieldindex]
-                    );
-                }
-            }
-        }
-        return $regenerate;
-    }
-
-    /**
-     * Adjusts the Privileges for all the columns whose names have changed
-     *
-     * @param array $adjust_privileges assoc array of old col names mapped to new
-     *                                 cols
-     *
-     * @return boolean $changed  boolean whether at least one column privileges
-     * adjusted
-     */
-    protected function adjustColumnPrivileges($adjust_privileges)
-    {
-        $changed = false;
-
-        if (Util_lib\get($GLOBALS, 'col_priv', false)
-            && Util_lib\get($GLOBALS, 'is_reload_priv', false)
-        ) {
-            $this->dbi->selectDb('mysql');
-
-            // For Column specific privileges
-            foreach ($adjust_privileges as $oldCol => $newCol) {
-
-                $this->dbi->query(
-                    sprintf(
-                        'UPDATE %s SET Column_name = "%s"
-                        WHERE Db = "%s"
-                        AND Table_name = "%s"
-                        AND Column_name = "%s";',
-                        Util::backquote('columns_priv'),
-                        $newCol, $this->db, $this->table, $oldCol
-                    )
-                );
-
-                // i.e. if atleast one column privileges adjusted
-                $changed = true;
-            }
-
-            if ($changed) {
-                // Finally FLUSH the new privileges
-                $this->dbi->query("FLUSH PRIVILEGES;");
-            }
-        }
-
-        return $changed;
-    }
-
-    /**
-     * Verifies if some elements of a column have changed
-     *
-     * @param integer $i column index in the request
-     *
-     * @return boolean $alterTableNeeded true if we need to generate ALTER TABLE
-     *
-     */
-    protected function columnNeedsAlterTable($i)
-    {
-        // these two fields are checkboxes so might not be part of the
-        // request; therefore we define them to avoid notices below
-        if (! isset($_REQUEST['field_null'][$i])) {
-            $_REQUEST['field_null'][$i] = 'NO';
-        }
-        if (! isset($_REQUEST['field_extra'][$i])) {
-            $_REQUEST['field_extra'][$i] = '';
-        }
-
-        // field_name does not follow the convention (corresponds to field_orig)
-        if ($_REQUEST['field_name'][$i] != $_REQUEST['field_orig'][$i]) {
-            return true;
-        }
-
-        $fields = array(
-            'field_attribute', 'field_collation', 'field_comments',
-            'field_default_value', 'field_default_type', 'field_extra',
-            'field_length', 'field_null', 'field_type'
-        );
-        foreach ($fields as $field) {
-            if ($_REQUEST[$field][$i] != $_REQUEST[$field . '_orig'][$i]) {
-                return true;
-            }
-        }
-        return !empty($_REQUEST['field_move_to'][$i]);
-    }
-
-    /**
-     * Displays the table structure ('show table' works correct since 3.23.03)
-     *
-     * @param array       $cfgRelation               current relation parameters
-     * @param array       $columns_with_unique_index Columns with unique index
-     * @param mixed       $url_params                Contains an associative
-     *                                               array with url params
-     * @param Index|false $primary_index             primary index or false if
-     *                                               no one exists
-     * @param array       $fields                    Fields
-     * @param array       $columns_with_index        Columns with index
-     *
-     * @return string
-     */
-    protected function displayStructure(
-        $cfgRelation, $columns_with_unique_index, $url_params,
-        $primary_index, $fields, $columns_with_index
-    ) {
-        /* TABLE INFORMATION */
-        $HideStructureActions = '';
-        if ($GLOBALS['cfg']['HideStructureActions'] === true) {
-            $HideStructureActions .= ' HideStructureActions';
-        }
-
-        // prepare comments
-        $comments_map = array();
-        $mime_map = array();
-
-        if ($GLOBALS['cfg']['ShowPropertyComments']) {
-            include_once 'libraries/transformations.lib.php';
-            $comments_map = PMA_getComments($this->db, $this->table);
-            if ($cfgRelation['mimework'] && $GLOBALS['cfg']['BrowseMIME']) {
-                $mime_map = PMA_getMIME($this->db, $this->table, true);
-            }
-        }
-        include_once 'libraries/central_columns.lib.php';
-        $central_list = PMA_getCentralColumnsFromTable($this->db, $this->table);
-        $columns_list = array();
-
-        $titles = array(
-            'Change' => Util::getIcon('b_edit.png', __('Change')),
-            'Drop' => Util::getIcon('b_drop.png', __('Drop')),
-            'NoDrop' => Util::getIcon('b_drop.png', __('Drop')),
-            'Primary' => Util::getIcon('b_primary.png', __('Primary')),
-            'Index' => Util::getIcon('b_index.png', __('Index')),
-            'Unique' => Util::getIcon('b_unique.png', __('Unique')),
-            'Spatial' => Util::getIcon('b_spatial.png', __('Spatial')),
-            'IdxFulltext' => Util::getIcon('b_ftext.png', __('Fulltext')),
-            'NoPrimary' => Util::getIcon('bd_primary.png', __('Primary')),
-            'NoIndex' => Util::getIcon('bd_index.png', __('Index')),
-            'NoUnique' => Util::getIcon('bd_unique.png', __('Unique')),
-            'NoSpatial' => Util::getIcon('bd_spatial.png', __('Spatial')),
-            'NoIdxFulltext' => Util::getIcon('bd_ftext.png', __('Fulltext')),
-            'DistinctValues' => Util::getIcon(
-                'b_browse.png',
-                __('Distinct values')
-            ),
-        );
-
-        /**
-         * Work on the table
-         */
-        if ($this->_tbl_is_view && ! $this->_db_is_system_schema) {
-            $item = $this->dbi->fetchSingleRow(
-                sprintf(
-                    "SELECT `VIEW_DEFINITION`, `CHECK_OPTION`, `DEFINER`,
-                      `SECURITY_TYPE`
-                    FROM `INFORMATION_SCHEMA`.`VIEWS`
-                    WHERE TABLE_SCHEMA='%s'
-                    AND TABLE_NAME='%s';",
-                    $GLOBALS['dbi']->escapeString($this->db),
-                    $GLOBALS['dbi']->escapeString($this->table)
-                )
-            );
-
-            $createView = $this->dbi->getTable($this->db, $this->table)
-                ->showCreate();
-            // get algorithm from $createView of the form
-            // CREATE ALGORITHM=<ALGORITHM> DE...
-            $parts = explode(" ", substr($createView, 17));
-            $item['ALGORITHM'] = $parts[0];
-
-            $view = array(
-                'operation' => 'alter',
-                'definer' => $item['DEFINER'],
-                'sql_security' => $item['SECURITY_TYPE'],
-                'name' => $this->table,
-                'as' => $item['VIEW_DEFINITION'],
-                'with' => $item['CHECK_OPTION'],
-                'algorithm' => $item['ALGORITHM'],
-            );
-
-            $edit_view_url = 'view_create.php'
-                . PMA_URL_getCommon($url_params) . '&amp;'
-                . implode(
-                    '&amp;',
-                    array_map(
-                        function ($key, $val) {
-                            return 'view[' . urlencode($key) . ']=' . urlencode(
-                                $val
-                            );
-                        },
-                        array_keys($view), $view
-                    )
-                );
-        }
-
-        /**
-         * Displays Space usage and row statistics
-         */
-        // BEGIN - Calc Table Space
-        // Get valid statistics whatever is the table type
-        if ($GLOBALS['cfg']['ShowStats']) {
-            //get table stats in HTML format
-            $tablestats = $this->getTableStats();
-            //returning the response in JSON format to be used by Ajax
-            $this->response->addJSON('tableStat', $tablestats);
-        }
-        // END - Calc Table Space
-
-        return Template::get('table/structure/display_structure')->render(
-            array(
-                'HideStructureActions' => $HideStructureActions,
-                'db' => $this->db,
-                'table' => $this->table,
-                'db_is_system_schema' => $this->_db_is_system_schema,
-                'tbl_is_view' => $this->_tbl_is_view,
-                'mime_map' => $mime_map,
-                'url_query' => $this->_url_query,
-                'titles' => $titles,
-                'tbl_storage_engine' => $this->_tbl_storage_engine,
-                'primary' => $primary_index,
-                'columns_with_unique_index' => $columns_with_unique_index,
-                'edit_view_url' => isset($edit_view_url) ? $edit_view_url : null,
-                'columns_list' => $columns_list,
-                'tablestats' => isset($tablestats) ? $tablestats : null,
-                'fields' => $fields,
-                'columns_with_index' => $columns_with_index,
-                'central_list' => $central_list,
-                'comments_map' => $comments_map
-            )
-        );
-    }
-
-    /**
-     * Get HTML snippet for display table statistics
-     *
-     * @return string $html_output
-     */
-    protected function getTableStats()
-    {
-        if (empty($this->_showtable)) {
-            $this->_showtable = $this->dbi->getTable(
-                $this->db, $this->table
-            )->getStatusInfo(null, true);
-        }
-
-        if (empty($this->_showtable['Data_length'])) {
-            $this->_showtable['Data_length'] = 0;
-        }
-        if (empty($this->_showtable['Index_length'])) {
-            $this->_showtable['Index_length'] = 0;
-        }
-
-        $is_innodb = (isset($this->_showtable['Type'])
-            && $this->_showtable['Type'] == 'InnoDB');
-
-        $mergetable = $this->table_obj->isMerge();
-
-        // this is to display for example 261.2 MiB instead of 268k KiB
-        $max_digits = 3;
-        $decimals = 1;
-        list($data_size, $data_unit) = Util::formatByteDown(
-            $this->_showtable['Data_length'], $max_digits, $decimals
-        );
-        if ($mergetable == false) {
-            list($index_size, $index_unit) = Util::formatByteDown(
-                $this->_showtable['Index_length'], $max_digits, $decimals
-            );
-        }
-        // InnoDB returns a huge value in Data_free, do not use it
-        if (! $is_innodb && isset($this->_showtable['Data_free'])
-            && $this->_showtable['Data_free'] > 0
-        ) {
-            list($free_size, $free_unit) = Util::formatByteDown(
-                $this->_showtable['Data_free'], $max_digits, $decimals
-            );
-            list($effect_size, $effect_unit) = Util::formatByteDown(
-                $this->_showtable['Data_length']
-                + $this->_showtable['Index_length']
-                - $this->_showtable['Data_free'],
-                $max_digits, $decimals
-            );
-        } else {
-            list($effect_size, $effect_unit) = Util::formatByteDown(
-                $this->_showtable['Data_length']
-                + $this->_showtable['Index_length'],
-                $max_digits, $decimals
-            );
-        }
-        list($tot_size, $tot_unit) = Util::formatByteDown(
-            $this->_showtable['Data_length'] + $this->_showtable['Index_length'],
-            $max_digits, $decimals
-        );
-        if ($this->_table_info_num_rows > 0) {
-            list($avg_size, $avg_unit) = Util::formatByteDown(
-                ($this->_showtable['Data_length']
-                + $this->_showtable['Index_length'])
-                / $this->_showtable['Rows'],
-                6,
-                1
-            );
-        } else {
-            $avg_size = $avg_unit = '';
-        }
-
-        return Template::get('table/structure/display_table_stats')->render(
-            array(
-                'showtable' => $this->_showtable,
-                'table_info_num_rows' => $this->_table_info_num_rows,
-                'tbl_is_view' => $this->_tbl_is_view,
-                'db_is_system_schema' => $this->_db_is_system_schema,
-                'tbl_storage_engine' => $this->_tbl_storage_engine,
-                'url_query' => $this->_url_query,
-                'tbl_collation' => $this->_tbl_collation,
-                'is_innodb' => $is_innodb,
-                'mergetable' => $mergetable,
-                'avg_size' => isset($avg_size) ? $avg_size : null,
-                'avg_unit' => isset($avg_unit) ? $avg_unit : null,
-                'data_size' => $data_size,
-                'data_unit' => $data_unit,
-                'index_size' => isset($index_size) ? $index_size : null,
-                'index_unit' => isset($index_unit) ? $index_unit : null,
-                'free_size' => isset($free_size) ? $free_size : null,
-                'free_unit' => isset($free_unit) ? $free_unit : null,
-                'effect_size' => $effect_size,
-                'effect_unit' => $effect_unit,
-                'tot_size' => $tot_size,
-                'tot_unit' => $tot_unit
-            )
-        );
-    }
-
-    /**
-     * Gets table primary key
-     *
-     * @return string
-     */
-    protected function getKeyForTablePrimary()
-    {
-        $this->dbi->selectDb($this->db);
-        $result = $this->dbi->query(
-            'SHOW KEYS FROM ' . Util::backquote($this->table) . ';'
-        );
-        $primary = '';
-        while ($row = $this->dbi->fetchAssoc($result)) {
-            // Backups the list of primary keys
-            if ($row['Key_name'] == 'PRIMARY') {
-                $primary .= $row['Column_name'] . ', ';
-            }
-        } // end while
-        $this->dbi->freeResult($result);
-
-        return $primary;
-    }
-
-    /**
-     * Get List of information for Submit Mult
-     *
-     * @param string $submit_mult mult_submit type
-     * @param array  $selected    the selected columns
-     * @param string $action      action type
-     *
-     * @return array
-     */
-    protected function getDataForSubmitMult($submit_mult, $selected, $action)
-    {
-        $what = null;
-        $query_type = null;
-        $is_unset_submit_mult = false;
-        $mult_btn = null;
-        $centralColsError = null;
-        switch ($submit_mult) {
-        case 'drop':
-            $what     = 'drop_fld';
-            break;
-        case 'primary':
-            // Gets table primary key
-            $primary = $this->getKeyForTablePrimary();
-            if (empty($primary)) {
-                // no primary key, so we can safely create new
-                $is_unset_submit_mult = true;
-                $query_type = 'primary_fld';
-                $mult_btn   = __('Yes');
-            } else {
-                // primary key exists, so lets as user
-                $what = 'primary_fld';
-            }
-            break;
-        case 'index':
-            $is_unset_submit_mult = true;
-            $query_type = 'index_fld';
-            $mult_btn   = __('Yes');
-            break;
-        case 'unique':
-            $is_unset_submit_mult = true;
-            $query_type = 'unique_fld';
-            $mult_btn   = __('Yes');
-            break;
-        case 'spatial':
-            $is_unset_submit_mult = true;
-            $query_type = 'spatial_fld';
-            $mult_btn   = __('Yes');
-            break;
-        case 'ftext':
-            $is_unset_submit_mult = true;
-            $query_type = 'fulltext_fld';
-            $mult_btn   = __('Yes');
-            break;
-        case 'add_to_central_columns':
-            include_once 'libraries/central_columns.lib.php';
-            $centralColsError = PMA_syncUniqueColumns($selected, false);
-            break;
-        case 'remove_from_central_columns':
-            include_once 'libraries/central_columns.lib.php';
-            $centralColsError = PMA_deleteColumnsFromList($selected, false);
-            break;
-        case 'change':
-            $this->displayHtmlForColumnChange($selected, $action);
-            // execution stops here but PMA\libraries\Response correctly finishes
-            // the rendering
-            exit;
-        case 'browse':
-            // this should already be handled by tbl_structure.php
-        }
-
-        return array(
-            $what, $query_type, $is_unset_submit_mult, $mult_btn,
-            $centralColsError
-        );
-    }
-}
diff --git a/#pma/libraries/core.lib.php b/#pma/libraries/core.lib.php
deleted file mode 100644
index cb7161d2..00000000
--- a/#pma/libraries/core.lib.php
+++ /dev/null
@@ -1,1144 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Core functions used all over the scripts.
- * This script is distinct from libraries/common.inc.php because this
- * script is called from /test.
- *
- * @package PhpMyAdmin
- */
-use PMA\libraries\Message;
-
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
-/**
- * String handling (security)
- */
-require_once 'libraries/string.lib.php';
-
-/**
- * checks given $var and returns it if valid, or $default of not valid
- * given $var is also checked for type being 'similar' as $default
- * or against any other type if $type is provided
- *
- * <code>
- * // $_REQUEST['db'] not set
- * echo PMA_ifSetOr($_REQUEST['db'], ''); // ''
- * // $_REQUEST['sql_query'] not set
- * echo PMA_ifSetOr($_REQUEST['sql_query']); // null
- * // $cfg['EnableFoo'] not set
- * echo PMA_ifSetOr($cfg['EnableFoo'], false, 'boolean'); // false
- * echo PMA_ifSetOr($cfg['EnableFoo']); // null
- * // $cfg['EnableFoo'] set to 1
- * echo PMA_ifSetOr($cfg['EnableFoo'], false, 'boolean'); // false
- * echo PMA_ifSetOr($cfg['EnableFoo'], false, 'similar'); // 1
- * echo PMA_ifSetOr($cfg['EnableFoo'], false); // 1
- * // $cfg['EnableFoo'] set to true
- * echo PMA_ifSetOr($cfg['EnableFoo'], false, 'boolean'); // true
- * </code>
- *
- * @param mixed &$var    param to check
- * @param mixed $default default value
- * @param mixed $type    var type or array of values to check against $var
- *
- * @return mixed   $var or $default
- *
- * @see     PMA_isValid()
- */
-function PMA_ifSetOr(&$var, $default = null, $type = 'similar')
-{
-    if (! PMA_isValid($var, $type, $default)) {
-        return $default;
-    }
-
-    return $var;
-}
-
-/**
- * checks given $var against $type or $compare
- *
- * $type can be:
- * - false       : no type checking
- * - 'scalar'    : whether type of $var is integer, float, string or boolean
- * - 'numeric'   : whether type of $var is any number representation
- * - 'length'    : whether type of $var is scalar with a string length > 0
- * - 'similar'   : whether type of $var is similar to type of $compare
- * - 'equal'     : whether type of $var is identical to type of $compare
- * - 'identical' : whether $var is identical to $compare, not only the type!
- * - or any other valid PHP variable type
- *
- * <code>
- * // $_REQUEST['doit'] = true;
- * PMA_isValid($_REQUEST['doit'], 'identical', 'true'); // false
- * // $_REQUEST['doit'] = 'true';
- * PMA_isValid($_REQUEST['doit'], 'identical', 'true'); // true
- * </code>
- *
- * NOTE: call-by-reference is used to not get NOTICE on undefined vars,
- * but the var is not altered inside this function, also after checking a var
- * this var exists nut is not set, example:
- * <code>
- * // $var is not set
- * isset($var); // false
- * functionCallByReference($var); // false
- * isset($var); // true
- * functionCallByReference($var); // true
- * </code>
- *
- * to avoid this we set this var to null if not isset
- *
- * @param mixed &$var    variable to check
- * @param mixed $type    var type or array of valid values to check against $var
- * @param mixed $compare var to compare with $var
- *
- * @return boolean whether valid or not
- *
- * @todo add some more var types like hex, bin, ...?
- * @see     https://php.net/gettype
- */
-function PMA_isValid(&$var, $type = 'length', $compare = null)
-{
-    if (! isset($var)) {
-        // var is not even set
-        return false;
-    }
-
-    if ($type === false) {
-        // no vartype requested
-        return true;
-    }
-
-    if (is_array($type)) {
-        return in_array($var, $type);
-    }
-
-    // allow some aliases of var types
-    $type = strtolower($type);
-    switch ($type) {
-    case 'identic' :
-        $type = 'identical';
-        break;
-    case 'len' :
-        $type = 'length';
-        break;
-    case 'bool' :
-        $type = 'boolean';
-        break;
-    case 'float' :
-        $type = 'double';
-        break;
-    case 'int' :
-        $type = 'integer';
-        break;
-    case 'null' :
-        $type = 'NULL';
-        break;
-    }
-
-    if ($type === 'identical') {
-        return $var === $compare;
-    }
-
-    // whether we should check against given $compare
-    if ($type === 'similar') {
-        switch (gettype($compare)) {
-        case 'string':
-        case 'boolean':
-            $type = 'scalar';
-            break;
-        case 'integer':
-        case 'double':
-            $type = 'numeric';
-            break;
-        default:
-            $type = gettype($compare);
-        }
-    } elseif ($type === 'equal') {
-        $type = gettype($compare);
-    }
-
-    // do the check
-    if ($type === 'length' || $type === 'scalar') {
-        $is_scalar = is_scalar($var);
-        if ($is_scalar && $type === 'length') {
-            return (bool) mb_strlen($var);
-        }
-        return $is_scalar;
-    }
-
-    if ($type === 'numeric') {
-        return is_numeric($var);
-    }
-
-    if (gettype($var) === $type) {
-        return true;
-    }
-
-    return false;
-}
-
-/**
- * Removes insecure parts in a path; used before include() or
- * require() when a part of the path comes from an insecure source
- * like a cookie or form.
- *
- * @param string $path The path to check
- *
- * @return string  The secured path
- *
- * @access  public
- */
-function PMA_securePath($path)
-{
-    // change .. to .
-    $path = preg_replace('@\.\.*@', '.', $path);
-
-    return $path;
-} // end function
-
-/**
- * displays the given error message on phpMyAdmin error page in foreign language,
- * ends script execution and closes session
- *
- * loads language file if not loaded already
- *
- * @param string       $error_message  the error message or named error message
- * @param string|array $message_args   arguments applied to $error_message
- * @param boolean      $delete_session whether to delete session cookie
- *
- * @return void
- */
-function PMA_fatalError(
-    $error_message, $message_args = null, $delete_session = true
-) {
-    /* Use format string if applicable */
-    if (is_string($message_args)) {
-        $error_message = sprintf($error_message, $message_args);
-    } elseif (is_array($message_args)) {
-        $error_message = vsprintf($error_message, $message_args);
-    }
-
-    if (! empty($GLOBALS['is_ajax_request']) && $GLOBALS['is_ajax_request']) {
-        $response = PMA\libraries\Response::getInstance();
-        $response->setRequestStatus(false);
-        $response->addJSON('message', PMA\libraries\Message::error($error_message));
-    } else {
-        $error_message = strtr($error_message, array('<br />' => '[br]'));
-
-        /* Load gettext for fatal errors */
-        if (!function_exists('__')) {
-            // It is possible that PMA_fatalError() is called before including
-            // vendor_config.php which defines GETTEXT_INC. See bug #4557
-            if (defined(GETTEXT_INC)) {
-                include_once GETTEXT_INC;
-            } else {
-                include_once './libraries/php-gettext/gettext.inc';
-            }
-        }
-
-        // these variables are used in the included file libraries/error.inc.php
-        //first check if php-mbstring is available
-        if (function_exists('mb_detect_encoding')) {
-            //If present use gettext
-            $error_header = __('Error');
-        } else {
-            $error_header = 'Error';
-        }
-        $lang = isset($GLOBALS['lang']) ? $GLOBALS['lang'] : 'en';
-        $dir = isset($GLOBALS['text_dir']) ? $GLOBALS['text_dir'] : 'ltr';
-
-        // on fatal errors it cannot hurt to always delete the current session
-        if ($delete_session
-            && isset($GLOBALS['session_name'])
-            && isset($_COOKIE[$GLOBALS['session_name']])
-        ) {
-            $GLOBALS['PMA_Config']->removeCookie($GLOBALS['session_name']);
-        }
-
-        // Displays the error message
-        include './libraries/error.inc.php';
-    }
-    if (! defined('TESTSUITE')) {
-        exit;
-    }
-}
-
-/**
- * Returns a link to the PHP documentation
- *
- * @param string $target anchor in documentation
- *
- * @return string  the URL
- *
- * @access  public
- */
-function PMA_getPHPDocLink($target)
-{
-    /* List of PHP documentation translations */
-    $php_doc_languages = array(
-        'pt_BR', 'zh', 'fr', 'de', 'it', 'ja', 'pl', 'ro', 'ru', 'fa', 'es', 'tr'
-    );
-
-    $lang = 'en';
-    if (in_array($GLOBALS['lang'], $php_doc_languages)) {
-        $lang = $GLOBALS['lang'];
-    }
-
-    return PMA_linkURL('https://php.net/manual/' . $lang . '/' . $target);
-}
-
-/**
- * Warn or fail on missing extension.
- *
- * @param string $extension Extension name
- * @param bool   $fatal     Whether the error is fatal.
- * @param string $extra     Extra string to append to message.
- *
- * @return void
- */
-function PMA_warnMissingExtension($extension, $fatal = false, $extra = '')
-{
-    /* Gettext does not have to be loaded yet here */
-    if (function_exists('__')) {
-        $message = __(
-            'The %s extension is missing. Please check your PHP configuration.'
-        );
-    } else {
-        $message
-            = 'The %s extension is missing. Please check your PHP configuration.';
-    }
-    $doclink = PMA_getPHPDocLink('book.' . $extension . '.php');
-    $message = sprintf(
-        $message,
-        '[a@' . $doclink . '@Documentation][em]' . $extension . '[/em][/a]'
-    );
-    if ($extra != '') {
-        $message .= ' ' . $extra;
-    }
-    if ($fatal) {
-        PMA_fatalError($message);
-        return;
-    }
-
-    $GLOBALS['error_handler']->addError(
-        $message,
-        E_USER_WARNING,
-        '',
-        '',
-        false
-    );
-}
-
-/**
- * returns count of tables in given db
- *
- * @param string $db database to count tables for
- *
- * @return integer count of tables in $db
- */
-function PMA_getTableCount($db)
-{
-    $tables = $GLOBALS['dbi']->tryQuery(
-        'SHOW TABLES FROM ' . PMA\libraries\Util::backquote($db) . ';',
-        null, PMA\libraries\DatabaseInterface::QUERY_STORE
-    );
-    if ($tables) {
-        $num_tables = $GLOBALS['dbi']->numRows($tables);
-        $GLOBALS['dbi']->freeResult($tables);
-    } else {
-        $num_tables = 0;
-    }
-
-    return $num_tables;
-}
-
-/**
- * Converts numbers like 10M into bytes
- * Used with permission from Moodle (https://moodle.org) by Martin Dougiamas
- * (renamed with PMA prefix to avoid double definition when embedded
- * in Moodle)
- *
- * @param string|int $size size (Default = 0)
- *
- * @return integer $size
- */
-function PMA_getRealSize($size = 0)
-{
-    if (! $size) {
-        return 0;
-    }
-
-    $scan = array(
-        'gb' => 1073741824, //1024 * 1024 * 1024,
-        'g'  => 1073741824, //1024 * 1024 * 1024,
-        'mb' =>    1048576,
-        'm'  =>    1048576,
-        'kb' =>       1024,
-        'k'  =>       1024,
-        'b'  =>          1,
-    );
-
-    foreach ($scan as $unit => $factor) {
-        $sizeLength = strlen($size);
-        $unitLength = strlen($unit);
-        if ($sizeLength > $unitLength
-            && strtolower(
-                substr(
-                    $size,
-                    $sizeLength - $unitLength
-                )
-            ) == $unit
-        ) {
-            return substr(
-                $size,
-                0,
-                $sizeLength - $unitLength
-            ) * $factor;
-        }
-    }
-
-    return $size;
-} // end function PMA_getRealSize()
-
-/**
- * boolean phpMyAdmin.PMA_checkPageValidity(string &$page, array $whitelist)
- *
- * checks given $page against given $whitelist and returns true if valid
- * it optionally ignores query parameters in $page (script.php?ignored)
- *
- * @param string &$page     page to check
- * @param array  $whitelist whitelist to check page against
- *
- * @return boolean whether $page is valid or not (in $whitelist or not)
- */
-function PMA_checkPageValidity(&$page, $whitelist)
-{
-    if (! isset($page) || !is_string($page)) {
-        return false;
-    }
-
-    if (in_array($page, $whitelist)) {
-        return true;
-    }
-
-    $_page = mb_substr(
-        $page,
-        0,
-        mb_strpos($page . '?', '?')
-    );
-    if (in_array($_page, $whitelist)) {
-        return true;
-    }
-
-    $_page = urldecode($page);
-    $_page = mb_substr(
-        $_page,
-        0,
-        mb_strpos($_page . '?', '?')
-    );
-    if (in_array($_page, $whitelist)) {
-        return true;
-    }
-
-    return false;
-}
-
-/**
- * tries to find the value for the given environment variable name
- *
- * searches in $_SERVER, $_ENV then tries getenv() and apache_getenv()
- * in this order
- *
- * @param string $var_name variable name
- *
- * @return string  value of $var or empty string
- */
-function PMA_getenv($var_name)
-{
-    if (isset($_SERVER[$var_name])) {
-        return $_SERVER[$var_name];
-    }
-
-    if (isset($_ENV[$var_name])) {
-        return $_ENV[$var_name];
-    }
-
-    if (getenv($var_name)) {
-        return getenv($var_name);
-    }
-
-    if (function_exists('apache_getenv')
-        && apache_getenv($var_name, true)
-    ) {
-        return apache_getenv($var_name, true);
-    }
-
-    return '';
-}
-
-/**
- * Send HTTP header, taking IIS limits into account (600 seems ok)
- *
- * @param string $uri         the header to send
- * @param bool   $use_refresh whether to use Refresh: header when running on IIS
- *
- * @return void
- */
-function PMA_sendHeaderLocation($uri, $use_refresh = false)
-{
-    if (PMA_IS_IIS && mb_strlen($uri) > 600) {
-        include_once './libraries/js_escape.lib.php';
-        PMA\libraries\Response::getInstance()->disable();
-
-        echo PMA\libraries\Template::get('header_location')
-            ->render(array('uri' => $uri));
-
-        return;
-    }
-
-    /*
-     * Avoid relative path redirect problems in case user entered URL
-     * like /phpmyadmin/index.php/ which some web servers happily accept.
-     */
-    if ($uri[0] == '.') {
-        $uri = $GLOBALS['PMA_Config']->getRootPath() . substr($uri, 2);
-    }
-
-    $response = PMA\libraries\Response::getInstance();
-
-    session_write_close();
-    if ($response->headersSent()) {
-        trigger_error(
-            'PMA_sendHeaderLocation called when headers are already sent!',
-            E_USER_ERROR
-        );
-    }
-    // bug #1523784: IE6 does not like 'Refresh: 0', it
-    // results in a blank page
-    // but we need it when coming from the cookie login panel)
-    if (PMA_IS_IIS && $use_refresh) {
-        $response->header('Refresh: 0; ' . $uri);
-    } else {
-        $response->header('Location: ' . $uri);
-    }
-}
-
-/**
- * Outputs application/json headers. This includes no caching.
- *
- * @return void
- */
-function PMA_headerJSON()
-{
-    if (defined('TESTSUITE') && ! defined('PMA_TEST_HEADERS')) {
-        return;
-    }
-    // No caching
-    PMA_noCacheHeader();
-    // MIME type
-    header('Content-Type: application/json; charset=UTF-8');
-    // Disable content sniffing in browser
-    // This is needed in case we include HTML in JSON, browser might assume it's
-    // html to display
-    header('X-Content-Type-Options: nosniff');
-}
-
-/**
- * Outputs headers to prevent caching in browser (and on the way).
- *
- * @return void
- */
-function PMA_noCacheHeader()
-{
-    if (defined('TESTSUITE') && ! defined('PMA_TEST_HEADERS')) {
-        return;
-    }
-    // rfc2616 - Section 14.21
-    header('Expires: ' . gmdate(DATE_RFC1123));
-    // HTTP/1.1
-    header(
-        'Cache-Control: no-store, no-cache, must-revalidate,'
-        . '  pre-check=0, post-check=0, max-age=0'
-    );
-    if (PMA_USR_BROWSER_AGENT == 'IE') {
-        /* On SSL IE sometimes fails with:
-         *
-         * Internet Explorer was not able to open this Internet site. The
-         * requested site is either unavailable or cannot be found. Please
-         * try again later.
-         *
-         * Adding Pragma: public fixes this.
-         */
-        header('Pragma: public');
-        return;
-    }
-
-    header('Pragma: no-cache'); // HTTP/1.0
-    // test case: exporting a database into a .gz file with Safari
-    // would produce files not having the current time
-    // (added this header for Safari but should not harm other browsers)
-    header('Last-Modified: ' . gmdate(DATE_RFC1123));
-}
-
-
-/**
- * Sends header indicating file download.
- *
- * @param string $filename Filename to include in headers if empty,
- *                         none Content-Disposition header will be sent.
- * @param string $mimetype MIME type to include in headers.
- * @param int    $length   Length of content (optional)
- * @param bool   $no_cache Whether to include no-caching headers.
- *
- * @return void
- */
-function PMA_downloadHeader($filename, $mimetype, $length = 0, $no_cache = true)
-{
-    if ($no_cache) {
-        PMA_noCacheHeader();
-    }
-    /* Replace all possibly dangerous chars in filename */
-    $filename = str_replace(array(';', '"', "\n", "\r"), '-', $filename);
-    if (!empty($filename)) {
-        header('Content-Description: File Transfer');
-        header('Content-Disposition: attachment; filename="' . $filename . '"');
-    }
-    header('Content-Type: ' . $mimetype);
-    // inform the server that compression has been done,
-    // to avoid a double compression (for example with Apache + mod_deflate)
-    $notChromeOrLessThan43 = PMA_USR_BROWSER_AGENT != 'CHROME' // see bug #4942
-        || (PMA_USR_BROWSER_AGENT == 'CHROME' && PMA_USR_BROWSER_VER < 43);
-    if (strpos($mimetype, 'gzip') !== false && $notChromeOrLessThan43) {
-        header('Content-Encoding: gzip');
-    }
-    header('Content-Transfer-Encoding: binary');
-    if ($length > 0) {
-        header('Content-Length: ' . $length);
-    }
-}
-
-/**
- * Returns value of an element in $array given by $path.
- * $path is a string describing position of an element in an associative array,
- * eg. Servers/1/host refers to $array[Servers][1][host]
- *
- * @param string $path    path in the array
- * @param array  $array   the array
- * @param mixed  $default default value
- *
- * @return mixed    array element or $default
- */
-function PMA_arrayRead($path, $array, $default = null)
-{
-    $keys = explode('/', $path);
-    $value =& $array;
-    foreach ($keys as $key) {
-        if (! isset($value[$key])) {
-            return $default;
-        }
-        $value =& $value[$key];
-    }
-    return $value;
-}
-
-/**
- * Stores value in an array
- *
- * @param string $path   path in the array
- * @param array  &$array the array
- * @param mixed  $value  value to store
- *
- * @return void
- */
-function PMA_arrayWrite($path, &$array, $value)
-{
-    $keys = explode('/', $path);
-    $last_key = array_pop($keys);
-    $a =& $array;
-    foreach ($keys as $key) {
-        if (! isset($a[$key])) {
-            $a[$key] = array();
-        }
-        $a =& $a[$key];
-    }
-    $a[$last_key] = $value;
-}
-
-/**
- * Removes value from an array
- *
- * @param string $path   path in the array
- * @param array  &$array the array
- *
- * @return void
- */
-function PMA_arrayRemove($path, &$array)
-{
-    $keys = explode('/', $path);
-    $keys_last = array_pop($keys);
-    $path = array();
-    $depth = 0;
-
-    $path[0] =& $array;
-    $found = true;
-    // go as deep as required or possible
-    foreach ($keys as $key) {
-        if (! isset($path[$depth][$key])) {
-            $found = false;
-            break;
-        }
-        $depth++;
-        $path[$depth] =& $path[$depth - 1][$key];
-    }
-    // if element found, remove it
-    if ($found) {
-        unset($path[$depth][$keys_last]);
-        $depth--;
-    }
-
-    // remove empty nested arrays
-    for (; $depth >= 0; $depth--) {
-        if (! isset($path[$depth+1]) || count($path[$depth+1]) == 0) {
-            unset($path[$depth][$keys[$depth]]);
-        } else {
-            break;
-        }
-    }
-}
-
-/**
- * Returns link to (possibly) external site using defined redirector.
- *
- * @param string $url URL where to go.
- *
- * @return string URL for a link.
- */
-function PMA_linkURL($url)
-{
-    if (!preg_match('#^https?://#', $url)) {
-        return $url;
-    }
-
-    if (!function_exists('PMA_URL_getCommon')) {
-        include_once './libraries/url_generating.lib.php';
-    }
-    $params = array();
-    $params['url'] = $url;
-
-    $url = PMA_URL_getCommon($params);
-    //strip off token and such sensitive information. Just keep url.
-    $arr = parse_url($url);
-    parse_str($arr["query"], $vars);
-    $query = http_build_query(array("url" => $vars["url"]));
-
-    if (defined('PMA_SETUP')) {
-        $url = '../url.php?' . $query;
-    } else {
-        $url = './url.php?' . $query;
-    }
-
-    return $url;
-}
-
-/**
- * Checks whether domain of URL is whitelisted domain or not.
- * Use only for URLs of external sites.
- *
- * @param string $url URL of external site.
- *
- * @return boolean True: if domain of $url is allowed domain,
- *                 False: otherwise.
- */
-function PMA_isAllowedDomain($url)
-{
-    $arr = parse_url($url);
-    // We need host to be set
-    if (! isset($arr['host']) || strlen($arr['host']) == 0) {
-        return false;
-    }
-    // We do not want these to be present
-    $blocked = array('user', 'pass', 'port');
-    foreach ($blocked as $part) {
-        if (isset($arr[$part]) && strlen($arr[$part]) != 0) {
-            return false;
-        }
-    }
-    $domain = $arr["host"];
-    $domainWhiteList = array(
-        /* Include current domain */
-        $_SERVER['SERVER_NAME'],
-        /* phpMyAdmin domains */
-        'wiki.phpmyadmin.net', 'www.phpmyadmin.net', 'phpmyadmin.net',
-        'demo.phpmyadmin.net',
-        'docs.phpmyadmin.net',
-        'demo.phpmyadmin.net',
-        /* mysql.com domains */
-        'dev.mysql.com','bugs.mysql.com',
-        /* mariadb domains */
-        'mariadb.org', 'mariadb.com',
-        /* php.net domains */
-        'php.net',
-        /* sourceforge.net domain */
-        'sourceforge.net',
-        /* Github domains*/
-        'github.com','www.github.com',
-        /* Percona domains */
-        'www.percona.com',
-        /* Following are doubtful ones. */
-        'mysqldatabaseadministration.blogspot.com',
-    );
-    if (in_array($domain, $domainWhiteList)) {
-        return true;
-    }
-
-    return false;
-}
-
-
-/**
- * Adds JS code snippets to be displayed by the PMA\libraries\Response class.
- * Adds a newline to each snippet.
- *
- * @param string $str Js code to be added (e.g. "token=1234;")
- *
- * @return void
- */
-function PMA_addJSCode($str)
-{
-    $response = PMA\libraries\Response::getInstance();
-    $header   = $response->getHeader();
-    $scripts  = $header->getScripts();
-    $scripts->addCode($str);
-}
-
-/**
- * Adds JS code snippet for variable assignment
- * to be displayed by the PMA\libraries\Response class.
- *
- * @param string $key    Name of value to set
- * @param mixed  $value  Value to set, can be either string or array of strings
- * @param bool   $escape Whether to escape value or keep it as it is
- *                       (for inclusion of js code)
- *
- * @return void
- */
-function PMA_addJSVar($key, $value, $escape = true)
-{
-    PMA_addJSCode(PMA_getJsValue($key, $value, $escape));
-}
-
-/**
- * Replace some html-unfriendly stuff
- *
- * @param string $buffer String to process
- *
- * @return string Escaped and cleaned up text suitable for html
- */
-function PMA_mimeDefaultFunction($buffer)
-{
-    $buffer = htmlspecialchars($buffer);
-    $buffer = str_replace('  ', ' &nbsp;', $buffer);
-    $buffer = preg_replace("@((\015\012)|(\015)|(\012))@", '<br />' . "\n", $buffer);
-
-    return $buffer;
-}
-
-/**
- * Displays SQL query before executing.
- *
- * @param array|string $query_data Array containing queries or query itself
- *
- * @return void
- */
-function PMA_previewSQL($query_data)
-{
-    $retval = '<div class="preview_sql">';
-    if (empty($query_data)) {
-        $retval .= __('No change');
-    } elseif (is_array($query_data)) {
-        foreach ($query_data as $query) {
-            $retval .= PMA\libraries\Util::formatSql($query);
-        }
-    } else {
-        $retval .= PMA\libraries\Util::formatSql($query_data);
-    }
-    $retval .= '</div>';
-    $response = PMA\libraries\Response::getInstance();
-    $response->addJSON('sql_data', $retval);
-    exit;
-}
-
-/**
- * recursively check if variable is empty
- *
- * @param mixed $value the variable
- *
- * @return bool true if empty
- */
-function PMA_emptyRecursive($value)
-{
-    $empty = true;
-    if (is_array($value)) {
-        array_walk_recursive(
-            $value,
-            function ($item) use (&$empty) {
-                $empty = $empty && empty($item);
-            }
-        );
-    } else {
-        $empty = empty($value);
-    }
-    return $empty;
-}
-
-/**
- * Creates some globals from $_POST variables matching a pattern
- *
- * @param array $post_patterns The patterns to search for
- *
- * @return void
- */
-function PMA_setPostAsGlobal($post_patterns)
-{
-    foreach (array_keys($_POST) as $post_key) {
-        foreach ($post_patterns as $one_post_pattern) {
-            if (preg_match($one_post_pattern, $post_key)) {
-                $GLOBALS[$post_key] = $_POST[$post_key];
-            }
-        }
-    }
-}
-
-/**
- * Creates some globals from $_REQUEST
- *
- * @param string $param db|table
- *
- * @return void
- */
-function PMA_setGlobalDbOrTable($param)
-{
-    $GLOBALS[$param] = '';
-    if (PMA_isValid($_REQUEST[$param])) {
-        // can we strip tags from this?
-        // only \ and / is not allowed in db names for MySQL
-        $GLOBALS[$param] = $_REQUEST[$param];
-        $GLOBALS['url_params'][$param] = $GLOBALS[$param];
-    }
-}
-
-/**
- * PATH_INFO could be compromised if set, so remove it from PHP_SELF
- * and provide a clean PHP_SELF here
- *
- * @return void
- */
-function PMA_cleanupPathInfo()
-{
-    global $PMA_PHP_SELF;
-
-    $PMA_PHP_SELF = PMA_getenv('PHP_SELF');
-    if (empty($PMA_PHP_SELF)) {
-        $PMA_PHP_SELF = urldecode(PMA_getenv('REQUEST_URI'));
-    }
-    $_PATH_INFO = PMA_getenv('PATH_INFO');
-    if (! empty($_PATH_INFO) && ! empty($PMA_PHP_SELF)) {
-        $path_info_pos = mb_strrpos($PMA_PHP_SELF, $_PATH_INFO);
-        if ($path_info_pos !== false) {
-            $path_info_part = mb_substr($PMA_PHP_SELF, $path_info_pos, mb_strlen($_PATH_INFO));
-            if ($path_info_part == $_PATH_INFO) {
-                $PMA_PHP_SELF = mb_substr($PMA_PHP_SELF, 0, $path_info_pos);
-            }
-        }
-    }
-    $PMA_PHP_SELF = htmlspecialchars($PMA_PHP_SELF);
-}
-
-/**
- * Checks that required PHP extensions are there.
- * @return void
- */
-function PMA_checkExtensions()
-{
-    /**
-     * Warning about mbstring.
-     */
-    if (! function_exists('mb_detect_encoding')) {
-        PMA_warnMissingExtension('mbstring', true);
-    }
-
-    /**
-     * We really need this one!
-     */
-    if (! function_exists('preg_replace')) {
-        PMA_warnMissingExtension('pcre', true);
-    }
-
-    /**
-     * JSON is required in several places.
-     */
-    if (! function_exists('json_encode')) {
-        PMA_warnMissingExtension('json', true);
-    }
-}
-
-/* Compatibility with PHP < 5.6 */
-if(! function_exists('hash_equals')) {
-    function hash_equals($a, $b) {
-        $ret = strlen($a) ^ strlen($b);
-        $ret |= array_sum(unpack("C*", $a ^ $b));
-        return ! $ret;
-    }
-}
-/* Compatibility with PHP < 5.1 or PHP without hash extension */
-if (! function_exists('hash_hmac')) {
-    function hash_hmac($algo, $data, $key, $raw_output = false)
-    {
-        $algo = strtolower($algo);
-        $pack = 'H'.strlen($algo('test'));
-        $size = 64;
-        $opad = str_repeat(chr(0x5C), $size);
-        $ipad = str_repeat(chr(0x36), $size);
-
-        if (strlen($key) > $size) {
-            $key = str_pad(pack($pack, $algo($key)), $size, chr(0x00));
-        } else {
-            $key = str_pad($key, $size, chr(0x00));
-        }
-
-        for ($i = 0; $i < strlen($key) - 1; $i++) {
-            $opad[$i] = $opad[$i] ^ $key[$i];
-            $ipad[$i] = $ipad[$i] ^ $key[$i];
-        }
-
-        $output = $algo($opad.pack($pack, $algo($ipad.$data)));
-
-        return ($raw_output) ? pack($pack, $output) : $output;
-    }
-}
-
-/**
- * Sanitizes MySQL hostname
- *
- * * strips p: prefix(es)
- *
- * @param string $name User given hostname
- *
- * @return string
- */
-function PMA_sanitizeMySQLHost($name)
-{
-    while (strtolower(substr($name, 0, 2)) == 'p:') {
-        $name = substr($name, 2);
-    }
-
-    return $name;
-}
-
-/**
- * Sanitizes MySQL username
- *
- * * strips part behind null byte
- *
- * @param string $name User given username
- *
- * @return string
- */
-function PMA_sanitizeMySQLUser($name)
-{
-    $position = strpos($name, chr(0));
-    if ($position !== false) {
-        return substr($name, 0, $position);
-    }
-    return $name;
-}
-
-/**
- * Safe unserializer wrapper
- *
- * It does not unserialize data containing objects
- *
- * @param string $data Data to unserialize
- *
- * @return mixed
- */
-function PMA_safeUnserialize($data)
-{
-    if (! is_string($data)) {
-        return null;
-    }
-
-    /* validate serialized data */
-    $length = strlen($data);
-    $depth = 0;
-    for ($i = 0; $i < $length; $i++) {
-        $value = $data[$i];
-
-        switch ($value)
-        {
-            case '}':
-                /* end of array */
-                if ($depth <= 0) {
-                    return null;
-                }
-                $depth--;
-                break;
-            case 's':
-                /* string */
-                // parse sting length
-                $strlen = intval(substr($data, $i + 2));
-                // string start
-                $i = strpos($data, ':', $i + 2);
-                if ($i === false) {
-                    return null;
-                }
-                // skip string, quotes and ;
-                $i += 2 + $strlen + 1;
-                if ($data[$i] != ';') {
-                    return null;
-                }
-                break;
-
-            case 'b':
-            case 'i':
-            case 'd':
-                /* bool, integer or double */
-                // skip value to sepearator
-                $i = strpos($data, ';', $i);
-                if ($i === false) {
-                    return null;
-                }
-                break;
-            case 'a':
-                /* array */
-                // find array start
-                $i = strpos($data, '{', $i);
-                if ($i === false) {
-                    return null;
-                }
-                // remember nesting
-                $depth++;
-                break;
-            case 'N':
-                /* null */
-                // skip to end
-                $i = strpos($data, ';', $i);
-                if ($i === false) {
-                    return null;
-                }
-                break;
-            default:
-                /* any other elements are not wanted */
-                return null;
-        }
-    }
-
-    // check unterminated arrays
-    if ($depth > 0) {
-        return null;
-    }
-
-    return unserialize($data);
-}
diff --git a/#pma/libraries/create_addfield.lib.php b/#pma/libraries/create_addfield.lib.php
deleted file mode 100644
index 4eb649f5..00000000
--- a/#pma/libraries/create_addfield.lib.php
+++ /dev/null
@@ -1,494 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * set of functions for tbl_create.php and tbl_addfield.php
- *
- * @package PhpMyAdmin
- */
-use PMA\libraries\Table;
-
-/**
- * Transforms the radio button field_key into 4 arrays
- *
- * @return array An array of arrays which represents column keys for each index type
- */
-function PMA_getIndexedColumns()
-{
-    $field_cnt      = count($_REQUEST['field_name']);
-    $field_primary  = json_decode($_REQUEST['primary_indexes'], true);
-    $field_index    = json_decode($_REQUEST['indexes'], true);
-    $field_unique   = json_decode($_REQUEST['unique_indexes'], true);
-    $field_fulltext = json_decode($_REQUEST['fulltext_indexes'], true);
-    $field_spatial = json_decode($_REQUEST['spatial_indexes'], true);
-
-    return array(
-        $field_cnt, $field_primary, $field_index, $field_unique,
-        $field_fulltext, $field_spatial
-    );
-}
-
-/**
- * Initiate the column creation statement according to the table creation or
- * add columns to a existing table
- *
- * @param int     $field_cnt     number of columns
- * @param boolean $is_create_tbl true if requirement is to get the statement
- *                               for table creation
- *
- * @return array  $definitions An array of initial sql statements
- *                             according to the request
- */
-function PMA_buildColumnCreationStatement(
-    $field_cnt, $is_create_tbl = true
-) {
-    $definitions = array();
-    for ($i = 0; $i < $field_cnt; ++$i) {
-        // '0' is also empty for php :-(
-        if (empty($_REQUEST['field_name'][$i])
-            && $_REQUEST['field_name'][$i] != '0'
-        ) {
-            continue;
-        }
-
-        $definition = PMA_getStatementPrefix($is_create_tbl) .
-                Table::generateFieldSpec(
-                    trim($_REQUEST['field_name'][$i]),
-                    $_REQUEST['field_type'][$i],
-                    $_REQUEST['field_length'][$i],
-                    $_REQUEST['field_attribute'][$i],
-                    isset($_REQUEST['field_collation'][$i])
-                    ? $_REQUEST['field_collation'][$i]
-                    : '',
-                    isset($_REQUEST['field_null'][$i])
-                    ? $_REQUEST['field_null'][$i]
-                    : 'NOT NULL',
-                    $_REQUEST['field_default_type'][$i],
-                    $_REQUEST['field_default_value'][$i],
-                    isset($_REQUEST['field_extra'][$i])
-                    ? $_REQUEST['field_extra'][$i]
-                    : false,
-                    isset($_REQUEST['field_comments'][$i])
-                    ? $_REQUEST['field_comments'][$i]
-                    : '',
-                    isset($_REQUEST['field_virtuality'][$i])
-                    ? $_REQUEST['field_virtuality'][$i]
-                    : '',
-                    isset($_REQUEST['field_expression'][$i])
-                    ? $_REQUEST['field_expression'][$i]
-                    : ''
-                );
-
-        $definition .= PMA_setColumnCreationStatementSuffix($i, $is_create_tbl);
-        $definitions[] = $definition;
-    } // end for
-
-    return $definitions;
-}
-
-/**
- * Set column creation suffix according to requested position of the new column
- *
- * @param int     $current_field_num current column number
- * @param boolean $is_create_tbl     true if requirement is to get the statement
- *                                   for table creation
- *
- * @return string $sql_suffix suffix
- */
-function PMA_setColumnCreationStatementSuffix($current_field_num,
-    $is_create_tbl = true
-) {
-    // no suffix is needed if request is a table creation
-    $sql_suffix = ' ';
-    if ($is_create_tbl) {
-        return $sql_suffix;
-    }
-
-    if ((string) $_REQUEST['field_where'] === 'last') {
-        return $sql_suffix;
-    }
-
-    // Only the first field can be added somewhere other than at the end
-    if ((int) $current_field_num === 0) {
-        if ((string) $_REQUEST['field_where'] === 'first') {
-            $sql_suffix .= ' FIRST';
-        } else {
-            $sql_suffix .= ' AFTER '
-                    . PMA\libraries\Util::backquote($_REQUEST['after_field']);
-        }
-    } else {
-        $sql_suffix .= ' AFTER '
-                . PMA\libraries\Util::backquote(
-                    $_REQUEST['field_name'][$current_field_num - 1]
-                );
-    }
-
-    return $sql_suffix;
-}
-
-/**
- * Create relevant index statements
- *
- * @param array   $index         an array of index columns
- * @param string  $index_choice  index choice that which represents
- *                               the index type of $indexed_fields
- * @param boolean $is_create_tbl true if requirement is to get the statement
- *                               for table creation
- *
- * @return array an array of sql statements for indexes
- */
-function PMA_buildIndexStatements($index, $index_choice,
-    $is_create_tbl = true
-) {
-    $statement = array();
-    if (!count($index)) {
-        return $statement;
-    }
-
-    $sql_query = PMA_getStatementPrefix($is_create_tbl)
-        . ' ' . $index_choice;
-
-    if (! empty($index['Key_name']) && $index['Key_name'] != 'PRIMARY') {
-        $sql_query .= ' ' . PMA\libraries\Util::backquote($index['Key_name']);
-    }
-
-    $index_fields = array();
-    foreach ($index['columns'] as $key => $column) {
-        $index_fields[$key] = PMA\libraries\Util::backquote(
-            $_REQUEST['field_name'][$column['col_index']]
-        );
-        if ($column['size']) {
-            $index_fields[$key] .= '(' . $column['size'] . ')';
-        }
-    } // end while
-
-    $sql_query .= ' (' . implode(', ', $index_fields) . ')';
-
-    $keyBlockSizes = $index['Key_block_size'];
-    if (! empty($keyBlockSizes)) {
-        $sql_query .= " KEY_BLOCK_SIZE = "
-             . $GLOBALS['dbi']->escapeString($keyBlockSizes);
-    }
-
-    // specifying index type is allowed only for primary, unique and index only
-    $type = $index['Index_type'];
-    if ($index['Index_choice'] != 'SPATIAL'
-        && $index['Index_choice'] != 'FULLTEXT'
-        && in_array($type, PMA\libraries\Index::getIndexTypes())
-    ) {
-        $sql_query .= ' USING ' . $type;
-    }
-
-    $parser = $index['Parser'];
-    if ($index['Index_choice'] == 'FULLTEXT' && ! empty($parser)) {
-        $sql_query .= " WITH PARSER " . $GLOBALS['dbi']->escapeString($parser);
-    }
-
-    $comment = $index['Index_comment'];
-    if (! empty($comment)) {
-        $sql_query .= " COMMENT '" . $GLOBALS['dbi']->escapeString($comment)
-            . "'";
-    }
-
-    $statement[] = $sql_query;
-
-    return $statement;
-}
-
-/**
- * Statement prefix for the PMA_buildColumnCreationStatement()
- *
- * @param boolean $is_create_tbl true if requirement is to get the statement
- *                               for table creation
- *
- * @return string $sql_prefix prefix
- */
-function PMA_getStatementPrefix($is_create_tbl = true)
-{
-    $sql_prefix = " ";
-    if (! $is_create_tbl) {
-        $sql_prefix = ' ADD ';
-    }
-    return $sql_prefix;
-}
-
-/**
- * Merge index definitions for one type of index
- *
- * @param array   $definitions     the index definitions to merge to
- * @param boolean $is_create_tbl   true if requirement is to get the statement
- *                                 for table creation
- * @param array   $indexed_columns the columns for one type of index
- * @param string  $index_keyword   the index keyword to use in the definition
- *
- * @return array $index_definitions
- */
-function PMA_mergeIndexStatements(
-    $definitions, $is_create_tbl, $indexed_columns, $index_keyword
-) {
-    foreach ($indexed_columns as $index) {
-        $statements = PMA_buildIndexStatements(
-            $index, " " . $index_keyword . " ", $is_create_tbl
-        );
-        $definitions = array_merge($definitions, $statements);
-    }
-    return $definitions;
-}
-
-/**
- * Returns sql statement according to the column and index specifications as
- * requested
- *
- * @param boolean $is_create_tbl true if requirement is to get the statement
- *                               for table creation
- *
- * @return string sql statement
- */
-function PMA_getColumnCreationStatements($is_create_tbl = true)
-{
-    $sql_statement = "";
-    list($field_cnt, $field_primary, $field_index,
-            $field_unique, $field_fulltext, $field_spatial
-            ) = PMA_getIndexedColumns();
-    $definitions = PMA_buildColumnCreationStatement(
-        $field_cnt, $is_create_tbl
-    );
-
-    // Builds the PRIMARY KEY statements
-    $primary_key_statements = PMA_buildIndexStatements(
-        isset($field_primary[0]) ? $field_primary[0] : array(),
-        " PRIMARY KEY ",
-        $is_create_tbl
-    );
-    $definitions = array_merge($definitions, $primary_key_statements);
-
-    // Builds the INDEX statements
-    $definitions = PMA_mergeIndexStatements(
-        $definitions, $is_create_tbl, $field_index, "INDEX"
-    );
-
-    // Builds the UNIQUE statements
-    $definitions = PMA_mergeIndexStatements(
-        $definitions, $is_create_tbl, $field_unique, "UNIQUE"
-    );
-
-    // Builds the FULLTEXT statements
-    $definitions = PMA_mergeIndexStatements(
-        $definitions, $is_create_tbl, $field_fulltext, "FULLTEXT"
-    );
-
-    // Builds the SPATIAL statements
-    $definitions = PMA_mergeIndexStatements(
-        $definitions, $is_create_tbl, $field_spatial, "SPATIAL"
-    );
-
-    if (count($definitions)) {
-        $sql_statement = implode(', ', $definitions);
-    }
-    $sql_statement = preg_replace('@, $@', '', $sql_statement);
-
-    return $sql_statement;
-
-}
-
-/**
- * Returns the partitioning clause
- *
- * @return string partitioning clause
- */
-function PMA_getPartitionsDefinition()
-{
-    $sql_query = "";
-    if (! empty($_REQUEST['partition_by'])
-        && ! empty($_REQUEST['partition_expr'])
-        && ! empty($_REQUEST['partition_count'])
-        && $_REQUEST['partition_count'] > 1
-    ) {
-        $sql_query .= " PARTITION BY " . $_REQUEST['partition_by']
-            . " (" . $_REQUEST['partition_expr'] . ")"
-            . " PARTITIONS " . $_REQUEST['partition_count'];
-    }
-
-    if (! empty($_REQUEST['subpartition_by'])
-        && ! empty($_REQUEST['subpartition_expr'])
-        && ! empty($_REQUEST['subpartition_count'])
-        && $_REQUEST['subpartition_count'] > 1
-    ) {
-        $sql_query .= " SUBPARTITION BY " . $_REQUEST['subpartition_by']
-           . " (" . $_REQUEST['subpartition_expr'] . ")"
-           . " SUBPARTITIONS " . $_REQUEST['subpartition_count'];
-    }
-
-    if (! empty($_REQUEST['partitions'])) {
-        $i = 0;
-        $partitions = array();
-        foreach ($_REQUEST['partitions'] as $partition) {
-            $partitions[] = PMA_getPartitionDefinition($partition);
-            $i++;
-        }
-        $sql_query .= " (" . implode(", ", $partitions) . ")";
-    }
-
-    return $sql_query;
-}
-
-/**
- * Returns the definition of a partition/subpartition
- *
- * @param array   $partition      array of partition/subpartition detiails
- * @param boolean $isSubPartition whether a subpartition
- *
- * @return string partition/subpartition definition
- */
-function PMA_getPartitionDefinition($partition, $isSubPartition = false)
-{
-    $sql_query = " " . ($isSubPartition ? "SUB" : "") . "PARTITION ";
-    $sql_query .= $partition['name'];
-
-    if (! empty($partition['value_type'])) {
-        $sql_query .= " VALUES " . $partition['value_type'];
-
-        if ($partition['value_type'] != 'LESS THAN MAXVALUE') {
-            $sql_query .= " (" . $partition['value'] . ")";
-        }
-    }
-
-    if (! empty($partition['engine'])) {
-        $sql_query .= " ENGINE = " . $partition['engine'];
-    }
-    if (! empty($partition['comment'])) {
-        $sql_query .= " COMMENT = '" . $partition['comment'] . "'";
-    }
-    if (! empty($partition['data_directory'])) {
-        $sql_query .= " DATA DIRECTORY = '" . $partition['data_directory'] . "'";
-    }
-    if (! empty($partition['index_directory'])) {
-        $sql_query .= " INDEX_DIRECTORY = '" . $partition['index_directory'] . "'";
-    }
-    if (! empty($partition['max_rows'])) {
-        $sql_query .= " MAX_ROWS = " . $partition['max_rows'];
-    }
-    if (! empty($partition['min_rows'])) {
-        $sql_query .= " MIN_ROWS = " . $partition['min_rows'];
-    }
-    if (! empty($partition['tablespace'])) {
-        $sql_query .= " TABLESPACE = " . $partition['tablespace'];
-    }
-    if (! empty($partition['node_group'])) {
-        $sql_query .= " NODEGROUP = " . $partition['node_group'];
-    }
-
-    if (! empty($partition['subpartitions'])) {
-        $j = 0;
-        $subpartitions = array();
-        foreach ($partition['subpartitions'] as $subpartition) {
-            $subpartitions[] = PMA_getPartitionDefinition(
-                $subpartition,
-                true
-            );
-            $j++;
-        }
-        $sql_query .= " (" . implode(", ", $subpartitions) . ")";
-    }
-
-    return $sql_query;
-}
-
-/**
- * Function to get table creation sql query
- *
- * @param string $db    database name
- * @param string $table table name
- *
- * @return string
- */
-function PMA_getTableCreationQuery($db, $table)
-{
-    // get column addition statements
-    $sql_statement = PMA_getColumnCreationStatements(true);
-
-    // Builds the 'create table' statement
-    $sql_query = 'CREATE TABLE ' . PMA\libraries\Util::backquote($db) . '.'
-        . PMA\libraries\Util::backquote(trim($table)) . ' (' . $sql_statement . ')';
-
-    // Adds table type, character set, comments and partition definition
-    if (!empty($_REQUEST['tbl_storage_engine'])
-        && ($_REQUEST['tbl_storage_engine'] != 'Default')
-    ) {
-        $sql_query .= ' ENGINE = ' . $_REQUEST['tbl_storage_engine'];
-    }
-    if (!empty($_REQUEST['tbl_collation'])) {
-        $sql_query .= PMA_generateCharsetQueryPart($_REQUEST['tbl_collation']);
-    }
-    if (! empty($_REQUEST['connection'])
-        && ! empty($_REQUEST['tbl_storage_engine'])
-        && $_REQUEST['tbl_storage_engine'] == 'FEDERATED'
-    ) {
-        $sql_query .= " CONNECTION = '"
-            . $GLOBALS['dbi']->escapeString($_REQUEST['connection']) . "'";
-    }
-    if (!empty($_REQUEST['comment'])) {
-        $sql_query .= ' COMMENT = \''
-            . $GLOBALS['dbi']->escapeString($_REQUEST['comment']) . '\'';
-    }
-    $sql_query .= PMA_getPartitionsDefinition();
-    $sql_query .= ';';
-
-    return $sql_query;
-}
-
-/**
- * Function to get the number of fields for the table creation form
- *
- * @return int
- */
-function PMA_getNumberOfFieldsFromRequest()
-{
-    if (isset($_REQUEST['submit_num_fields'])) { // adding new fields
-        $num_fields = min(
-            4096,
-            intval($_REQUEST['orig_num_fields']) + intval($_REQUEST['added_fields'])
-        );
-    } elseif (isset($_REQUEST['orig_num_fields'])) { // retaining existing fields
-        $num_fields = min(4096, intval($_REQUEST['orig_num_fields']));
-    } elseif (isset($_REQUEST['num_fields'])
-        && intval($_REQUEST['num_fields']) > 0
-    ) { // new table with specified number of fields
-        $num_fields = min(4096, intval($_REQUEST['num_fields']));
-    } else { // new table with unspecified number of fields
-        $num_fields = 4;
-    }
-
-    return $num_fields;
-}
-
-/**
- * Function to execute the column creation statement
- *
- * @param string $db      current database
- * @param string $table   current table
- * @param string $err_url error page url
- *
- * @return array
- */
-function PMA_tryColumnCreationQuery($db, $table, $err_url)
-{
-    // get column addition statements
-    $sql_statement = PMA_getColumnCreationStatements(false);
-
-    // To allow replication, we first select the db to use and then run queries
-    // on this db.
-    if (!($GLOBALS['dbi']->selectDb($db))) {
-        PMA\libraries\Util::mysqlDie(
-            $GLOBALS['dbi']->getError(),
-            'USE ' . PMA\libraries\Util::backquote($db), false,
-            $err_url
-        );
-    }
-    $sql_query    = 'ALTER TABLE ' .
-        PMA\libraries\Util::backquote($table) . ' ' . $sql_statement . ';';
-    // If there is a request for SQL previewing.
-    if (isset($_REQUEST['preview_sql'])) {
-        PMA_previewSQL($sql_query);
-    }
-    return array($GLOBALS['dbi']->tryQuery($sql_query) , $sql_query);
-}
diff --git a/#pma/libraries/database_interface.inc.php b/#pma/libraries/database_interface.inc.php
deleted file mode 100644
index def0b777..00000000
--- a/#pma/libraries/database_interface.inc.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Creates the database interface required for database interactions
- * and add it to GLOBALS.
- *
- * @package PhpMyAdmin-DBI
- */
-use PMA\libraries\dbi\DBIDummy;
-use PMA\libraries\di\Container;
-use PMA\libraries\DatabaseInterface;
-use PMA\libraries\dbi\DBIMysql;
-use PMA\libraries\dbi\DBIMysqli;
-
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
-if (defined('TESTSUITE')) {
-    /**
-     * For testsuite we use dummy driver which can fake some queries.
-     */
-    $extension = new DBIDummy();
-} else {
-
-    /**
-     * First check for the mysqli extension, as it's the one recommended
-     * for the MySQL server's version that we support
-     * (if PHP 7+, it's the only one supported)
-     */
-    $extension = 'mysqli';
-    if (!DatabaseInterface::checkDbExtension($extension)) {
-
-        $docurl = PMA\libraries\Util::getDocuLink('faq', 'faqmysql');
-        $doclink = sprintf(
-            __('See %sour documentation%s for more information.'),
-            '[a@' . $docurl  . '@documentation]',
-            '[/a]'
-        );
-
-        if (PHP_VERSION_ID < 70000) {
-            $extension = 'mysql';
-            if (! PMA\libraries\DatabaseInterface::checkDbExtension($extension)) {
-                // warn about both extensions missing and exit
-                PMA_warnMissingExtension(
-                    'mysqli',
-                    true,
-                    $doclink
-                );
-            } elseif (empty($_SESSION['mysqlwarning'])) {
-                trigger_error(
-                    __(
-                        'You are using the mysql extension which is deprecated in '
-                        . 'phpMyAdmin. Please consider installing the mysqli '
-                        . 'extension.'
-                    ) . ' ' . $doclink,
-                    E_USER_WARNING
-                );
-                // tell the user just once per session
-                $_SESSION['mysqlwarning'] = true;
-            }
-        } else {
-            // mysql extension is not part of PHP 7+, so warn and exit
-            PMA_warnMissingExtension(
-                'mysqli',
-                true,
-                $doclink
-            );
-        }
-    }
-
-    /**
-     * Including The DBI Plugin
-     */
-    switch($extension) {
-    case 'mysql' :
-        $extension = new DBIMysql();
-        break;
-    case 'mysqli' :
-        include_once 'libraries/dbi/DBIMysqli.lib.php';
-        $extension = new DBIMysqli();
-        break;
-    }
-}
-$GLOBALS['dbi'] = new DatabaseInterface($extension);
-
-$container = Container::getDefaultContainer();
-$container->set('PMA_DatabaseInterface', $GLOBALS['dbi']);
-$container->alias('dbi', 'PMA_DatabaseInterface');
diff --git a/#pma/libraries/db_common.inc.php b/#pma/libraries/db_common.inc.php
deleted file mode 100644
index 3aa615f6..00000000
--- a/#pma/libraries/db_common.inc.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Common includes for the database level views
- *
- * @package PhpMyAdmin
- */
-use PMA\libraries\Message;
-use PMA\libraries\Response;
-
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
-/**
- * Gets some core libraries
- */
-require_once './libraries/bookmark.lib.php';
-
-PMA\libraries\Util::checkParameters(array('db'));
-
-global $cfg;
-global $db;
-
-$is_show_stats = $cfg['ShowStats'];
-
-$db_is_system_schema = $GLOBALS['dbi']->isSystemSchema($db);
-if ($db_is_system_schema) {
-    $is_show_stats = false;
-}
-
-/**
- * Defines the urls to return to in case of error in a sql statement
- */
-$err_url_0 = 'index.php' . PMA_URL_getCommon();
-
-$err_url = PMA\libraries\Util::getScriptNameForOption(
-    $GLOBALS['cfg']['DefaultTabDatabase'], 'database'
-)
-    . PMA_URL_getCommon(array('db' => $db));
-
-/**
- * Ensures the database exists (else move to the "parent" script) and displays
- * headers
- */
-if (! isset($is_db) || ! $is_db) {
-    if (mb_strlen($db)) {
-        $is_db = $GLOBALS['dbi']->selectDb($db);
-        // This "Command out of sync" 2014 error may happen, for example
-        // after calling a MySQL procedure; at this point we can't select
-        // the db but it's not necessarily wrong
-        if ($GLOBALS['dbi']->getError() && $GLOBALS['errno'] == 2014) {
-            $is_db = true;
-            unset($GLOBALS['errno']);
-        }
-    } else {
-        $is_db = false;
-    }
-    // Not a valid db name -> back to the welcome page
-    $uri = './index.php'
-        . PMA_URL_getCommon(array(), 'text')
-        . (isset($message) ? '&message=' . urlencode($message) : '') . '&reload=1';
-    if (!mb_strlen($db) || ! $is_db) {
-        $response = PMA\libraries\Response::getInstance();
-        if ($response->isAjax()) {
-            $response->setRequestStatus(false);
-            $response->addJSON(
-                'message',
-                Message::error(__('No databases selected.'))
-            );
-        } else {
-            PMA_sendHeaderLocation($uri);
-        }
-        exit;
-    }
-} // end if (ensures db exists)
-
-/**
- * Changes database charset if requested by the user
- */
-if (isset($_REQUEST['submitcollation'])
-    && isset($_REQUEST['db_collation'])
-    && ! empty($_REQUEST['db_collation'])
-) {
-    list($db_charset) = explode('_', $_REQUEST['db_collation']);
-    $sql_query        = 'ALTER DATABASE '
-        . PMA\libraries\Util::backquote($db)
-        . ' DEFAULT' . PMA_generateCharsetQueryPart($_REQUEST['db_collation']);
-    $result           = $GLOBALS['dbi']->query($sql_query);
-    $message          = Message::success();
-    unset($db_charset);
-
-    /**
-     * If we are in an Ajax request, let us stop the execution here. Necessary for
-     * db charset change action on db_operations.php.  If this causes a bug on
-     * other pages, we might have to move this to a different location.
-     */
-    if ($GLOBALS['is_ajax_request'] == true) {
-        $response = PMA\libraries\Response::getInstance();
-        $response->setRequestStatus($message->isSuccess());
-        $response->addJSON('message', $message);
-        exit;
-    }
-}
-
-/**
- * Set parameters for links
- */
-$url_query = PMA_URL_getCommon(array('db' => $db));
-
diff --git a/#pma/libraries/db_designer.lib.php b/#pma/libraries/db_designer.lib.php
deleted file mode 100644
index 10d80957..00000000
--- a/#pma/libraries/db_designer.lib.php
+++ /dev/null
@@ -1,406 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Set of functions related to designer
- *
- * @package PhpMyAdmin
- */
-use PMA\libraries\Message;
-use PMA\libraries\plugins\SchemaPlugin;
-
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
-require_once 'libraries/relation.lib.php';
-
-/**
- * Function to get html to display a page selector
- *
- * @param array  $cfgRelation information about the configuration storage
- * @param string $db          database name
- *
- * @return string html content
- */
-function PMA_getHtmlForPageSelector($cfgRelation, $db)
-{
-    return PMA\libraries\Template::get('database/designer/page_selector')
-        ->render(
-            array(
-                'db' => $db,
-                'cfgRelation' => $cfgRelation
-            )
-        );
-}
-
-/**
- * Function to get html for displaying the page edit/delete form
- *
- * @param string $db        database name
- * @param string $operation 'edit' or 'delete' depending on the operation
- *
- * @return string html content
- */
-function PMA_getHtmlForEditOrDeletePages($db, $operation)
-{
-    return PMA\libraries\Template::get('database/designer/edit_delete_pages')
-        ->render(
-            array(
-                'db' => $db,
-                'operation' => $operation
-            )
-        );
-}
-
-/**
- * Function to get html for displaying the page save as form
- *
- * @param string $db database name
- *
- * @return string html content
- */
-function PMA_getHtmlForPageSaveAs($db)
-{
-    return PMA\libraries\Template::get('database/designer/page_save_as')
-        ->render(
-            array(
-                'db' => $db
-            )
-        );
-}
-
-/**
- * Retrieve IDs and names of schema pages
- *
- * @param string $db database name
- *
- * @return array array of schema page id and names
- */
-function PMA_getPageIdsAndNames($db)
-{
-    $cfgRelation = PMA_getRelationsParam();
-    $page_query = "SELECT `page_nr`, `page_descr` FROM "
-        . PMA\libraries\Util::backquote($cfgRelation['db']) . "."
-        . PMA\libraries\Util::backquote($cfgRelation['pdf_pages'])
-        . " WHERE db_name = '" . $GLOBALS['dbi']->escapeString($db) . "'"
-        . " ORDER BY `page_descr`";
-    $page_rs = PMA_queryAsControlUser(
-        $page_query, false, PMA\libraries\DatabaseInterface::QUERY_STORE
-    );
-
-    $result = array();
-    while ($curr_page = $GLOBALS['dbi']->fetchAssoc($page_rs)) {
-        $result[intval($curr_page['page_nr'])] = $curr_page['page_descr'];
-    }
-    return $result;
-}
-
-/**
- * Function to get html for displaying the schema export
- *
- * @param string $db   database name
- * @param int    $page the page to be exported
- *
- * @return string
- */
-function PMA_getHtmlForSchemaExport($db, $page)
-{
-    /* Scan for schema plugins */
-    /* @var $export_list SchemaPlugin[] */
-    $export_list = PMA_getPlugins(
-        "schema",
-        'libraries/plugins/schema/',
-        null
-    );
-
-    /* Fail if we didn't find any schema plugin */
-    if (empty($export_list)) {
-        return Message::error(
-            __('Could not load schema plugins, please check your installation!')
-        )->getDisplay();
-    }
-
-    return PMA\libraries\Template::get('database/designer/schema_export')
-        ->render(
-            array(
-                'db' => $db,
-                'page' => $page,
-                'export_list' => $export_list
-            )
-        );
-}
-
-/**
- * Returns HTML for including some variable to be accessed by JavaScript
- *
- * @param array $script_tables        array on foreign key support for each table
- * @param array $script_contr         initialization data array
- * @param array $script_display_field display fields of each table
- * @param int   $display_page         page number of the selected page
- *
- * @return string html
- */
-function PMA_getHtmlForJSFields(
-    $script_tables, $script_contr, $script_display_field, $display_page
-) {
-    return PMA\libraries\Template::get('database/designer/js_fields')
-        ->render(
-            array(
-                'script_tables' => $script_tables,
-                'script_contr' => $script_contr,
-                'script_display_field' => $script_display_field,
-                'display_page' => $display_page
-            )
-        );
-}
-
-/**
- * Returns HTML for the menu bar of the designer page
- *
- * @param boolean $visualBuilder whether this is visual query builder
- * @param string  $selected_page name of the selected page
- * @param array   $params_array  array with class name for various buttons on side
- *                               menu
- *
- * @return string html
- */
-function PMA_getDesignerPageMenu($visualBuilder, $selected_page, $params_array)
-{
-    return PMA\libraries\Template::get('database/designer/side_menu')
-        ->render(
-            array(
-                'visualBuilder' => $visualBuilder,
-                'selected_page' => $selected_page,
-                'params_array' => $params_array
-            )
-        );
-}
-
-/**
- * Returns array of stored values of Designer Settings
- *
- * @return array stored values
- */
-function PMA_getSideMenuParamsArray()
-{
-    $params = array();
-
-    $cfgRelation = PMA_getRelationsParam();
-
-    if ($GLOBALS['cfgRelation']['designersettingswork']) {
-
-        $query = 'SELECT `settings_data` FROM '
-            . PMA\libraries\Util::backquote($cfgRelation['db']) . '.'
-            . PMA\libraries\Util::backquote($cfgRelation['designer_settings'])
-            . ' WHERE ' . PMA\libraries\Util::backquote('username') . ' = "'
-            . $GLOBALS['cfg']['Server']['user'] . '";';
-
-        $result = $GLOBALS['dbi']->fetchSingleRow($query);
-
-        $params = json_decode($result['settings_data'], true);
-    }
-
-    return $params;
-}
-
-/**
- * Returns class names for various buttons on Designer Side Menu
- *
- * @return array class names of various buttons
- */
-function PMA_returnClassNamesFromMenuButtons()
-{
-    $classes_array = array();
-    $params_array = PMA_getSideMenuParamsArray();
-
-    if (isset($params_array['angular_direct'])
-        && $params_array['angular_direct'] == 'angular'
-    ) {
-        $classes_array['angular_direct'] = 'M_butt_Selected_down';
-    } else {
-        $classes_array['angular_direct'] = 'M_butt';
-    }
-
-    if (isset($params_array['snap_to_grid'])
-        && $params_array['snap_to_grid'] == 'on'
-    ) {
-        $classes_array['snap_to_grid'] = 'M_butt_Selected_down';
-    } else {
-        $classes_array['snap_to_grid'] = 'M_butt';
-    }
-
-    if (isset($params_array['pin_text'])
-        && $params_array['pin_text'] == 'true'
-    ) {
-        $classes_array['pin_text'] = 'M_butt_Selected_down';
-    } else {
-        $classes_array['pin_text'] = 'M_butt';
-    }
-
-    if (isset($params_array['relation_lines'])
-        && $params_array['relation_lines'] == 'false'
-    ) {
-        $classes_array['relation_lines'] = 'M_butt_Selected_down';
-    } else {
-        $classes_array['relation_lines'] = 'M_butt';
-    }
-
-    if (isset($params_array['small_big_all'])
-        && $params_array['small_big_all'] == 'v'
-    ) {
-        $classes_array['small_big_all'] = 'M_butt_Selected_down';
-    } else {
-        $classes_array['small_big_all'] = 'M_butt';
-    }
-
-    if (isset($params_array['side_menu'])
-        && $params_array['side_menu'] == 'true'
-    ) {
-        $classes_array['side_menu'] = 'M_butt_Selected_down';
-    } else {
-        $classes_array['side_menu'] = 'M_butt';
-    }
-
-    return $classes_array;
-}
-
-/**
- * Returns HTML for the canvas element
- *
- * @return string html
- */
-function PMA_getHTMLCanvas()
-{
-    return PMA\libraries\Template::get('database/designer/canvas')->render();
-}
-
-/**
- * Return HTML for the table list
- *
- * @param array $tab_pos      table positions
- * @param int   $display_page page number of the selected page
- *
- * @return string html
- */
-function PMA_getHTMLTableList($tab_pos, $display_page)
-{
-    return PMA\libraries\Template::get('database/designer/table_list')
-        ->render(
-            array(
-                'tab_pos' => $tab_pos,
-                'display_page' => $display_page
-            )
-        );
-}
-
-/**
- * Get HTML to display tables on designer page
- *
- * @param array $tab_pos                  tables positions
- * @param int   $display_page             page number of the selected page
- * @param array $tab_column               table column info
- * @param array $tables_all_keys          all indices
- * @param array $tables_pk_or_unique_keys unique or primary indices
- *
- * @return string html
- */
-function PMA_getDatabaseTables(
-    $tab_pos, $display_page, $tab_column, $tables_all_keys, $tables_pk_or_unique_keys
-) {
-    return PMA\libraries\Template::get('database/designer/database_tables')
-        ->render(
-            array(
-                'tab_pos' => $tab_pos,
-                'display_page' => $display_page,
-                'tab_column' => $tab_column,
-                'tables_all_keys' => $tables_all_keys,
-                'tables_pk_or_unique_keys' => $tables_pk_or_unique_keys
-            )
-        );
-}
-
-/**
- * Returns HTML for the new relations panel.
- *
- * @return string html
- */
-function PMA_getNewRelationPanel()
-{
-    return PMA\libraries\Template::get('database/designer/new_relation_panel')
-        ->render();
-}
-
-/**
- * Returns HTML for the relations delete panel
- *
- * @return string html
- */
-function PMA_getDeleteRelationPanel()
-{
-    return PMA\libraries\Template::get('database/designer/delete_relation_panel')
-        ->render();
-}
-
-/**
- * Returns HTML for the options panel
- *
- * @return string html
- */
-function PMA_getOptionsPanel()
-{
-    return PMA\libraries\Template::get('database/designer/options_panel')->render();
-}
-
-/**
- * Get HTML for the 'rename to' panel
- *
- * @return string html
- */
-function PMA_getRenameToPanel()
-{
-    return PMA\libraries\Template::get('database/designer/rename_to_panel')
-        ->render();
-}
-
-/**
- * Returns HTML for the 'having' panel
- *
- * @return string html
- */
-function PMA_getHavingQueryPanel()
-{
-    return PMA\libraries\Template::get('database/designer/having_query_panel')
-        ->render();
-}
-
-/**
- * Returns HTML for the 'aggregate' panel
- *
- * @return string html
- */
-function PMA_getAggregateQueryPanel()
-{
-    return PMA\libraries\Template::get('database/designer/aggregate_query_panel')
-        ->render();
-}
-
-/**
- * Returns HTML for the 'where' panel
- *
- * @return string html
- */
-function PMA_getWhereQueryPanel()
-{
-    return PMA\libraries\Template::get('database/designer/where_query_panel')
-        ->render();
-}
-
-/**
- * Returns HTML for the query details panel
- *
- * @return string html
- */
-function PMA_getQueryDetails()
-{
-    return PMA\libraries\Template::get('database/designer/query_details')->render();
-}
diff --git a/#pma/libraries/db_table_exists.lib.php b/#pma/libraries/db_table_exists.lib.php
deleted file mode 100644
index 8407a2b7..00000000
--- a/#pma/libraries/db_table_exists.lib.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Ensure the database and the table exist (else move to the "parent" script)
- * and display headers
- *
- * @package PhpMyAdmin
- */
-use PMA\libraries\Message;
-
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
-if (empty($is_db)) {
-    if (mb_strlen($db)) {
-        $is_db = @$GLOBALS['dbi']->selectDb($db);
-    } else {
-        $is_db = false;
-    }
-
-    if (! $is_db) {
-        // not a valid db name -> back to the welcome page
-        if (! defined('IS_TRANSFORMATION_WRAPPER')) {
-            $response = PMA\libraries\Response::getInstance();
-            if ($response->isAjax()) {
-                $response->setRequestStatus(false);
-                $response->addJSON(
-                    'message',
-                    Message::error(__('No databases selected.'))
-                );
-            } else {
-                $url_params = array('reload' => 1);
-                if (isset($message)) {
-                    $url_params['message'] = $message;
-                }
-                if (! empty($sql_query)) {
-                    $url_params['sql_query'] = $sql_query;
-                }
-                if (isset($show_as_php)) {
-                    $url_params['show_as_php'] = $show_as_php;
-                }
-                PMA_sendHeaderLocation(
-                    './index.php'
-                    . PMA_URL_getCommon($url_params, 'text')
-                );
-            }
-            exit;
-        }
-    }
-} // end if (ensures db exists)
-
-if (empty($is_table)
-    && !defined('PMA_SUBMIT_MULT')
-    && !defined('TABLE_MAY_BE_ABSENT')
-) {
-    // Not a valid table name -> back to the db_sql.php
-
-    if (mb_strlen($table)) {
-        $is_table = $GLOBALS['dbi']->getCachedTableContent(array($db, $table), false);
-
-        if (! $is_table) {
-            $_result = $GLOBALS['dbi']->tryQuery(
-                'SHOW TABLES LIKE \''
-                . $GLOBALS['dbi']->escapeString($table) . '\';',
-                null, PMA\libraries\DatabaseInterface::QUERY_STORE
-            );
-            $is_table = @$GLOBALS['dbi']->numRows($_result);
-            $GLOBALS['dbi']->freeResult($_result);
-        }
-    } else {
-        $is_table = false;
-    }
-
-    if (! $is_table) {
-        if (!defined('IS_TRANSFORMATION_WRAPPER')) {
-            if (mb_strlen($table)) {
-                // SHOW TABLES doesn't show temporary tables, so try select
-                // (as it can happen just in case temporary table, it should be
-                // fast):
-
-                /**
-                 * @todo should this check really
-                 * only happen if IS_TRANSFORMATION_WRAPPER?
-                 */
-                $_result = $GLOBALS['dbi']->tryQuery(
-                    'SELECT COUNT(*) FROM ' . PMA\libraries\Util::backquote($table)
-                    . ';',
-                    null,
-                    PMA\libraries\DatabaseInterface::QUERY_STORE
-                );
-                $is_table = ($_result && @$GLOBALS['dbi']->numRows($_result));
-                $GLOBALS['dbi']->freeResult($_result);
-            }
-
-            if (! $is_table) {
-                include './db_sql.php';
-                exit;
-            }
-        }
-
-        if (! $is_table) {
-            exit;
-        }
-    }
-} // end if (ensures table exists)
diff --git a/#pma/libraries/dbi/DBIDummy.php b/#pma/libraries/dbi/DBIDummy.php
deleted file mode 100644
index d8f108aa..00000000
--- a/#pma/libraries/dbi/DBIDummy.php
+++ /dev/null
@@ -1,1272 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Fake database driver for testing purposes
- *
- * It has hardcoded results for given queries what makes easy to use it
- * in testsuite. Feel free to include other queries which your test will
- * need.
- *
- * @package    PhpMyAdmin-DBI
- * @subpackage Dummy
- */
-namespace PMA\libraries\dbi;
-
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
-/**
- * Array of queries this "driver" supports
- */
-$GLOBALS['dummy_queries'] = array(
-    array('query' => 'SELECT 1', 'result' => array(array('1'))),
-    array(
-        'query'  => 'SELECT CURRENT_USER();',
-        'result' => array(array('pma_test@localhost')),
-    ),
-    array(
-        'query'  => "SHOW VARIABLES LIKE 'lower_case_table_names'",
-        'result' => array(array('lower_case_table_names', '1')),
-    ),
-    array(
-        'query'  => 'SELECT 1 FROM mysql.user LIMIT 1',
-        'result' => array(array('1')),
-    ),
-    array(
-        'query'  => "SELECT 1 FROM `INFORMATION_SCHEMA`.`USER_PRIVILEGES`"
-            . " WHERE `PRIVILEGE_TYPE` = 'CREATE USER'"
-            . " AND '''pma_test''@''localhost''' LIKE `GRANTEE` LIMIT 1",
-        'result' => array(array('1')),
-    ),
-    array(
-        'query'  => "SELECT 1 FROM (SELECT `GRANTEE`, `IS_GRANTABLE`"
-            . " FROM `INFORMATION_SCHEMA`.`COLUMN_PRIVILEGES`"
-            . " UNION SELECT `GRANTEE`, `IS_GRANTABLE`"
-            . " FROM `INFORMATION_SCHEMA`.`TABLE_PRIVILEGES`"
-            . " UNION SELECT `GRANTEE`, `IS_GRANTABLE`"
-            . " FROM `INFORMATION_SCHEMA`.`SCHEMA_PRIVILEGES`"
-            . " UNION SELECT `GRANTEE`, `IS_GRANTABLE`"
-            . " FROM `INFORMATION_SCHEMA`.`USER_PRIVILEGES`) t"
-            . " WHERE `IS_GRANTABLE` = 'YES'"
-            . " AND '''pma_test''@''localhost''' LIKE `GRANTEE` LIMIT 1",
-        'result' => array(array('1')),
-    ),
-    array(
-        'query'  => 'SHOW MASTER LOGS',
-        'result' => false,
-    ),
-    array(
-        'query'  => 'SHOW STORAGE ENGINES',
-        'result' => array(
-            array(
-                'Engine'  => 'dummy',
-                'Support' => 'YES',
-                'Comment' => 'dummy comment',
-            ),
-            array(
-                'Engine'  => 'dummy2',
-                'Support' => 'NO',
-                'Comment' => 'dummy2 comment',
-            ),
-            array(
-                'Engine'  => 'FEDERATED',
-                'Support' => 'NO',
-                'Comment' => 'Federated MySQL storage engine',
-            ),
-        ),
-    ),
-    array(
-        'query'  => 'SHOW STATUS WHERE Variable_name'
-            . ' LIKE \'Innodb\\_buffer\\_pool\\_%\''
-            . ' OR Variable_name = \'Innodb_page_size\';',
-        'result' => array(
-            array('Innodb_buffer_pool_pages_data', 0),
-            array('Innodb_buffer_pool_pages_dirty', 0),
-            array('Innodb_buffer_pool_pages_flushed', 0),
-            array('Innodb_buffer_pool_pages_free', 0),
-            array('Innodb_buffer_pool_pages_misc', 0),
-            array('Innodb_buffer_pool_pages_total', 4096),
-            array('Innodb_buffer_pool_read_ahead_rnd', 0),
-            array('Innodb_buffer_pool_read_ahead', 0),
-            array('Innodb_buffer_pool_read_ahead_evicted', 0),
-            array('Innodb_buffer_pool_read_requests', 64),
-            array('Innodb_buffer_pool_reads', 32),
-            array('Innodb_buffer_pool_wait_free', 0),
-            array('Innodb_buffer_pool_write_requests', 64),
-            array('Innodb_page_size', 16384),
-        ),
-    ),
-    array(
-        'query'  => 'SHOW ENGINE INNODB STATUS;',
-        'result' => false,
-    ),
-    array(
-        'query'  => 'SELECT @@innodb_version;',
-        'result' => array(
-            array('1.1.8'),
-        ),
-    ),
-    array(
-        'query'  => 'SELECT @@disabled_storage_engines',
-        'result' => array(
-            array(''),
-        ),
-    ),
-    array(
-        'query'  => 'SHOW GLOBAL VARIABLES LIKE \'innodb_file_per_table\';',
-        'result' => array(
-            array('innodb_file_per_table', 'OFF'),
-        ),
-    ),
-    array(
-        'query'  => 'SHOW GLOBAL VARIABLES LIKE \'innodb_file_format\';',
-        'result' => array(
-            array('innodb_file_format', 'Antelope'),
-        ),
-    ),
-    array(
-        'query'  => 'SELECT @@collation_server',
-        'result' => array(
-            array('utf8_general_ci'),
-        ),
-    ),
-    array(
-        'query'  => 'SELECT @@lc_messages;',
-        'result' => array(),
-    ),
-    array(
-        'query'  => 'SHOW SESSION VARIABLES LIKE \'FOREIGN_KEY_CHECKS\';',
-        'result' => array(
-            array('foreign_key_checks', 'ON'),
-        ),
-    ),
-    array(
-        'query'  => 'SHOW TABLES FROM `pma_test`;',
-        'result' => array(
-            array('table1'),
-            array('table2'),
-        ),
-    ),
-    array(
-        'query'  => 'SHOW TABLES FROM `pmadb`',
-        'result' => array(
-            array('column_info'),
-        ),
-    ),
-    array(
-        'query'   => 'SHOW COLUMNS FROM `pma_test`.`table1`',
-        'columns' => array(
-            'Field',
-            'Type',
-            'Null',
-            'Key',
-            'Default',
-            'Extra',
-        ),
-        'result'  => array(
-            array('i', 'int(11)', 'NO', 'PRI', 'NULL', 'auto_increment'),
-            array('o', 'int(11)', 'NO', 'MUL', 'NULL', ''),
-        ),
-    ),
-    array(
-        'query'  => 'SHOW INDEXES FROM `pma_test`.`table1` WHERE (Non_unique = 0)',
-        'result' => array(),
-    ),
-    array(
-        'query'   => 'SHOW COLUMNS FROM `pma_test`.`table2`',
-        'columns' => array(
-            'Field',
-            'Type',
-            'Null',
-            'Key',
-            'Default',
-            'Extra',
-        ),
-        'result'  => array(
-            array('i', 'int(11)', 'NO', 'PRI', 'NULL', 'auto_increment'),
-            array('o', 'int(11)', 'NO', 'MUL', 'NULL', ''),
-        ),
-    ),
-    array(
-        'query'  => 'SHOW INDEXES FROM `pma_test`.`table1`',
-        'result' => array(),
-    ),
-    array(
-        'query'  => 'SHOW INDEXES FROM `pma_test`.`table2`',
-        'result' => array(),
-    ),
-    array(
-        'query'   => 'SHOW COLUMNS FROM `pma`.`table1`',
-        'columns' => array(
-            'Field',
-            'Type',
-            'Null',
-            'Key',
-            'Default',
-            'Extra',
-            'Privileges',
-            'Comment',
-        ),
-        'result'  => array(
-            array(
-                'i',
-                'int(11)',
-                'NO',
-                'PRI',
-                'NULL',
-                'auto_increment',
-                'select,insert,update,references',
-                '',
-            ),
-            array(
-                'o',
-                'varchar(100)',
-                'NO',
-                'MUL',
-                'NULL',
-                '',
-                'select,insert,update,references',
-                '',
-            ),
-        ),
-    ),
-    array(
-        'query'   => 'SELECT * FROM information_schema.CHARACTER_SETS',
-        'columns' => array(
-            'CHARACTER_SET_NAME',
-            'DEFAULT_COLLATE_NAME',
-            'DESCRIPTION',
-            'MAXLEN',
-        ),
-        'result'  => array(
-            array('utf8', 'utf8_general_ci', 'UTF-8 Unicode', 3),
-        ),
-    ),
-    array(
-        'query'   => 'SELECT * FROM information_schema.COLLATIONS',
-        'columns' => array(
-            'COLLATION_NAME',
-            'CHARACTER_SET_NAME',
-            'ID',
-            'IS_DEFAULT',
-            'IS_COMPILED',
-            'SORTLEN',
-        ),
-        'result'  => array(
-            array('utf8_general_ci', 'utf8', 33, 'Yes', 'Yes', 1),
-            array('utf8_bin', 'utf8', 83, '', 'Yes', 1),
-        ),
-    ),
-    array(
-        'query'  => 'SELECT `TABLE_NAME` FROM `INFORMATION_SCHEMA`.`TABLES`'
-            . ' WHERE `TABLE_SCHEMA`=\'pma_test\' AND `TABLE_TYPE`=\'BASE TABLE\'',
-        'result' => array(),
-    ),
-    array(
-        'query'   => 'SELECT `column_name`, `mimetype`, `transformation`,'
-            . ' `transformation_options`, `input_transformation`,'
-            . ' `input_transformation_options`'
-            . ' FROM `pmadb`.`column_info`'
-            . ' WHERE `db_name` = \'pma_test\' AND `table_name` = \'table1\''
-            . ' AND ( `mimetype` != \'\' OR `transformation` != \'\''
-            . ' OR `transformation_options` != \'\''
-            . ' OR `input_transformation` != \'\''
-            . ' OR `input_transformation_options` != \'\')',
-        'columns' => array(
-            'column_name',
-            'mimetype',
-            'transformation',
-            'transformation_options',
-            'input_transformation',
-            'input_transformation_options',
-        ),
-        'result'  => array(
-            array('o', 'text/plain', 'sql', '', 'regex', '/pma/i'),
-            array('col', 't', 'o/p', '', 'i/p', ''),
-        ),
-    ),
-    array(
-        'query'  => 'SELECT TABLE_NAME FROM information_schema.VIEWS'
-            . ' WHERE TABLE_SCHEMA = \'pma_test\' AND TABLE_NAME = \'table1\'',
-        'result' => array(),
-    ),
-    array(
-        'query'   => 'SELECT *, `TABLE_SCHEMA` AS `Db`, `TABLE_NAME` AS `Name`,'
-            . ' `TABLE_TYPE` AS `TABLE_TYPE`, `ENGINE` AS `Engine`,'
-            . ' `ENGINE` AS `Type`, `VERSION` AS `Version`,'
-            . ' `ROW_FORMAT` AS `Row_format`, `TABLE_ROWS` AS `Rows`,'
-            . ' `AVG_ROW_LENGTH` AS `Avg_row_length`,'
-            . ' `DATA_LENGTH` AS `Data_length`,'
-            . ' `MAX_DATA_LENGTH` AS `Max_data_length`,'
-            . ' `INDEX_LENGTH` AS `Index_length`, `DATA_FREE` AS `Data_free`,'
-            . ' `AUTO_INCREMENT` AS `Auto_increment`,'
-            . ' `CREATE_TIME` AS `Create_time`, `UPDATE_TIME` AS `Update_time`,'
-            . ' `CHECK_TIME` AS `Check_time`, `TABLE_COLLATION` AS `Collation`,'
-            . ' `CHECKSUM` AS `Checksum`, `CREATE_OPTIONS` AS `Create_options`,'
-            . ' `TABLE_COMMENT` AS `Comment`'
-            . ' FROM `information_schema`.`TABLES` t'
-            . ' WHERE `TABLE_SCHEMA` IN (\'pma_test\')'
-            . ' AND t.`TABLE_NAME` = \'table1\' ORDER BY Name ASC',
-        'columns' => array(
-            'TABLE_CATALOG',
-            'TABLE_SCHEMA',
-            'TABLE_NAME',
-            'TABLE_TYPE',
-            'ENGINE',
-            'VERSION',
-            'ROW_FORMAT',
-            'TABLE_ROWS',
-            'AVG_ROW_LENGTH',
-            'DATA_LENGTH',
-            'MAX_DATA_LENGTH',
-            'INDEX_LENGTH',
-            'DATA_FREE',
-            'AUTO_INCREMENT',
-            'CREATE_TIME',
-            'UPDATE_TIME',
-            'CHECK_TIME',
-            'TABLE_COLLATION',
-            'CHECKSUM',
-            'CREATE_OPTIONS',
-            'TABLE_COMMENT',
-            'Db',
-            'Name',
-            'TABLE_TYPE',
-            'Engine',
-            'Type',
-            'Version',
-            'Row_format',
-            'Rows',
-            'Avg_row_length',
-            'Data_length',
-            'Max_data_length',
-            'Index_length',
-            'Data_free',
-            'Auto_increment',
-            'Create_time',
-            'Update_time',
-            'Check_time',
-            'Collation',
-            'Checksum',
-            'Create_options',
-            'Comment',
-        ),
-        'result'  => array(
-            array(
-                'def',
-                'smash',
-                'issues_issue',
-                'BASE TABLE',
-                'InnoDB',
-                '10',
-                'Compact',
-                '9136',
-                '862',
-                '7880704',
-                '0',
-                '1032192',
-                '420478976',
-                '155862',
-                '2012-08-29 13:28:28',
-                'NULL',
-                'NULL',
-                'utf8_general_ci',
-                'NULL',
-                '',
-                '',
-                'smash',
-                'issues_issue',
-                'BASE TABLE',
-                'InnoDB',
-                'InnoDB',
-                '10',
-                'Compact',
-                '9136',
-                '862',
-                '7880704',
-                '0',
-                '1032192',
-                '420478976',
-                '155862',
-                '2012-08-29 13:28:28',
-                'NULL',
-                'NULL',
-                'utf8_general_ci',
-                'NULL',
-            ),
-        ),
-    ),
-    array(
-        'query'   => 'SELECT *, `TABLE_SCHEMA` AS `Db`, `TABLE_NAME` AS `Name`,'
-            . ' `TABLE_TYPE` AS `TABLE_TYPE`, `ENGINE` AS `Engine`,'
-            . ' `ENGINE` AS `Type`, `VERSION` AS `Version`,'
-            . ' `ROW_FORMAT` AS `Row_format`, `TABLE_ROWS` AS `Rows`,'
-            . ' `AVG_ROW_LENGTH` AS `Avg_row_length`,'
-            . ' `DATA_LENGTH` AS `Data_length`,'
-            . ' `MAX_DATA_LENGTH` AS `Max_data_length`,'
-            . ' `INDEX_LENGTH` AS `Index_length`, `DATA_FREE` AS `Data_free`,'
-            . ' `AUTO_INCREMENT` AS `Auto_increment`,'
-            . ' `CREATE_TIME` AS `Create_time`, `UPDATE_TIME` AS `Update_time`,'
-            . ' `CHECK_TIME` AS `Check_time`, `TABLE_COLLATION` AS `Collation`,'
-            . ' `CHECKSUM` AS `Checksum`, `CREATE_OPTIONS` AS `Create_options`,'
-            . ' `TABLE_COMMENT` AS `Comment`'
-            . ' FROM `information_schema`.`TABLES` t'
-            . ' WHERE `TABLE_SCHEMA` IN (\'pma_test\')'
-            . ' AND t.`TABLE_NAME` = \'table1\' ORDER BY Name ASC',
-        'columns' => array(
-            'TABLE_CATALOG',
-            'TABLE_SCHEMA',
-            'TABLE_NAME',
-            'TABLE_TYPE',
-            'ENGINE',
-            'VERSION',
-            'ROW_FORMAT',
-            'TABLE_ROWS',
-            'AVG_ROW_LENGTH',
-            'DATA_LENGTH',
-            'MAX_DATA_LENGTH',
-            'INDEX_LENGTH',
-            'DATA_FREE',
-            'AUTO_INCREMENT',
-            'CREATE_TIME',
-            'UPDATE_TIME',
-            'CHECK_TIME',
-            'TABLE_COLLATION',
-            'CHECKSUM',
-            'CREATE_OPTIONS',
-            'TABLE_COMMENT',
-            'Db',
-            'Name',
-            'TABLE_TYPE',
-            'Engine',
-            'Type',
-            'Version',
-            'Row_format',
-            'Rows',
-            'Avg_row_length',
-            'Data_length',
-            'Max_data_length',
-            'Index_length',
-            'Data_free',
-            'Auto_increment',
-            'Create_time',
-            'Update_time',
-            'Check_time',
-            'Collation',
-            'Checksum',
-            'Create_options',
-            'Comment',
-        ),
-        'result'  => array(
-            array(
-                'def',
-                'smash',
-                'issues_issue',
-                'BASE TABLE',
-                'InnoDB',
-                '10',
-                'Compact',
-                '9136',
-                '862',
-                '7880704',
-                '0',
-                '1032192',
-                '420478976',
-                '155862',
-                '2012-08-29 13:28:28',
-                'NULL',
-                'NULL',
-                'utf8_general_ci',
-                'NULL',
-                '',
-                '',
-                'smash',
-                'issues_issue',
-                'BASE TABLE',
-                'InnoDB',
-                'InnoDB',
-                '10',
-                'Compact',
-                '9136',
-                '862',
-                '7880704',
-                '0',
-                '1032192',
-                '420478976',
-                '155862',
-                '2012-08-29 13:28:28',
-                'NULL',
-                'NULL',
-                'utf8_general_ci',
-                'NULL',
-            ),
-        ),
-    ),
-    array(
-        'query'  => 'SELECT COUNT(*) FROM `pma_test`.`table1`',
-        'result' => array(array(0)),
-    ),
-    array(
-        'query'  => 'SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`.'
-            . '`USER_PRIVILEGES`'
-            . ' WHERE GRANTEE=\'\'\'pma_test\'\'@\'\'localhost\'\'\''
-            . ' AND PRIVILEGE_TYPE=\'TRIGGER\'',
-        'result' => array(),
-    ),
-    array(
-        'query'  => 'SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`.'
-            . '`SCHEMA_PRIVILEGES`'
-            . ' WHERE GRANTEE=\'\'\'pma_test\'\'@\'\'localhost\'\'\''
-            . ' AND PRIVILEGE_TYPE=\'TRIGGER\' AND \'pma_test\''
-            . ' LIKE `TABLE_SCHEMA`',
-        'result' => array(),
-    ),
-    array(
-        'query'  => 'SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`.'
-            . '`TABLE_PRIVILEGES`'
-            . ' WHERE GRANTEE=\'\'\'pma_test\'\'@\'\'localhost\'\'\''
-            . ' AND PRIVILEGE_TYPE=\'TRIGGER\' AND \'pma_test\''
-            . ' LIKE `TABLE_SCHEMA` AND TABLE_NAME=\'table1\'',
-        'result' => array(),
-    ),
-    array(
-        'query'  => 'SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`.'
-            . '`USER_PRIVILEGES`'
-            . ' WHERE GRANTEE=\'\'\'pma_test\'\'@\'\'localhost\'\'\''
-            . ' AND PRIVILEGE_TYPE=\'EVENT\'',
-        'result' => array(),
-    ),
-    array(
-        'query'  => 'SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`.'
-            . '`SCHEMA_PRIVILEGES`'
-            . ' WHERE GRANTEE=\'\'\'pma_test\'\'@\'\'localhost\'\'\''
-            . ' AND PRIVILEGE_TYPE=\'EVENT\' AND \'pma_test\''
-            . ' LIKE `TABLE_SCHEMA`',
-        'result' => array(),
-    ),
-    array(
-        'query'  => 'SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`.'
-            . '`TABLE_PRIVILEGES`'
-            . ' WHERE GRANTEE=\'\'\'pma_test\'\'@\'\'localhost\'\'\''
-            . ' AND PRIVILEGE_TYPE=\'EVENT\''
-            . ' AND TABLE_SCHEMA=\'pma\\\\_test\' AND TABLE_NAME=\'table1\'',
-        'result' => array(),
-    ),
-    array(
-        'query'  => 'RENAME TABLE `pma_test`.`table1` TO `pma_test`.`table3`;',
-        'result' => array(),
-    ),
-    array(
-        'query'  => 'SELECT TRIGGER_SCHEMA, TRIGGER_NAME, EVENT_MANIPULATION,'
-            . ' EVENT_OBJECT_TABLE, ACTION_TIMING, ACTION_STATEMENT, '
-            . 'EVENT_OBJECT_SCHEMA, EVENT_OBJECT_TABLE, DEFINER'
-            . ' FROM information_schema.TRIGGERS'
-            . ' WHERE EVENT_OBJECT_SCHEMA= \'pma_test\''
-            . ' AND EVENT_OBJECT_TABLE = \'table1\';',
-        'result' => array(),
-    ),
-    array(
-        'query'  => 'SHOW TABLES FROM `pma`;',
-        'result' => array(),
-    ),
-    array(
-        'query'  => "SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`."
-            . "`SCHEMA_PRIVILEGES` WHERE GRANTEE='''pma_test''@''localhost'''"
-            . " AND PRIVILEGE_TYPE='EVENT' AND TABLE_SCHEMA='pma'",
-        'result' => array(),
-    ),
-    array(
-        'query'  => "SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`."
-            . "`SCHEMA_PRIVILEGES` WHERE GRANTEE='''pma_test''@''localhost'''"
-            . " AND PRIVILEGE_TYPE='TRIGGER' AND TABLE_SCHEMA='pma'",
-        'result' => array(),
-    ),
-    array(
-        'query'   => 'SELECT DEFAULT_COLLATION_NAME FROM information_schema.SCHEMATA'
-            . ' WHERE SCHEMA_NAME = \'pma_test\' LIMIT 1',
-        'columns' => array('DEFAULT_COLLATION_NAME'),
-        'result'  => array(
-            array('utf8_general_ci'),
-        ),
-    ),
-    array(
-        'query'   => 'SELECT @@collation_database',
-        'columns' => array('@@collation_database'),
-        'result'  => array(
-            array('bar'),
-        ),
-    ),
-    array(
-        'query'  => "SHOW TABLES FROM `phpmyadmin`",
-        'result' => array(),
-    ),
-    array(
-        'query'   => "SELECT tracking_active FROM `pmadb`.`tracking`" .
-            " WHERE db_name = 'pma_test_db'" .
-            " AND table_name = 'pma_test_table'" .
-            " ORDER BY version DESC",
-        'columns' => array('tracking_active'),
-        'result'  => array(
-            array(1),
-        ),
-    ),
-    array(
-        'query'  => "SELECT tracking_active FROM `pmadb`.`tracking`" .
-            " WHERE db_name = 'pma_test_db'" .
-            " AND table_name = 'pma_test_table2'" .
-            " ORDER BY version DESC",
-        'result' => array(),
-    ),
-    array(
-        'query'  => "SHOW SLAVE STATUS",
-        'result' => array(
-            array(
-                'Slave_IO_State'              => 'running',
-                'Master_Host'                 => 'locahost',
-                'Master_User'                 => 'Master_User',
-                'Master_Port'                 => '1002',
-                'Connect_Retry'               => 'Connect_Retry',
-                'Master_Log_File'             => 'Master_Log_File',
-                'Read_Master_Log_Pos'         => 'Read_Master_Log_Pos',
-                'Relay_Log_File'              => 'Relay_Log_File',
-                'Relay_Log_Pos'               => 'Relay_Log_Pos',
-                'Relay_Master_Log_File'       => 'Relay_Master_Log_File',
-                'Slave_IO_Running'            => 'NO',
-                'Slave_SQL_Running'           => 'NO',
-                'Replicate_Do_DB'             => 'Replicate_Do_DB',
-                'Replicate_Ignore_DB'         => 'Replicate_Ignore_DB',
-                'Replicate_Do_Table'          => 'Replicate_Do_Table',
-                'Replicate_Ignore_Table'      => 'Replicate_Ignore_Table',
-                'Replicate_Wild_Do_Table'     => 'Replicate_Wild_Do_Table',
-                'Replicate_Wild_Ignore_Table' => 'Replicate_Wild_Ignore_Table',
-                'Last_Errno'                  => 'Last_Errno',
-                'Last_Error'                  => 'Last_Error',
-                'Skip_Counter'                => 'Skip_Counter',
-                'Exec_Master_Log_Pos'         => 'Exec_Master_Log_Pos',
-                'Relay_Log_Space'             => 'Relay_Log_Space',
-                'Until_Condition'             => 'Until_Condition',
-                'Until_Log_File'              => 'Until_Log_File',
-                'Until_Log_Pos'               => 'Until_Log_Pos',
-                'Master_SSL_Allowed'          => 'Master_SSL_Allowed',
-                'Master_SSL_CA_File'          => 'Master_SSL_CA_File',
-                'Master_SSL_CA_Path'          => 'Master_SSL_CA_Path',
-                'Master_SSL_Cert'             => 'Master_SSL_Cert',
-                'Master_SSL_Cipher'           => 'Master_SSL_Cipher',
-                'Master_SSL_Key'              => 'Master_SSL_Key',
-                'Seconds_Behind_Master'       => 'Seconds_Behind_Master',
-            ),
-        ),
-    ),
-    array(
-        'query'  => "SHOW MASTER STATUS",
-        'result' => array(
-            array(
-                "File"             => "master-bin.000030",
-                "Position"         => "107",
-                "Binlog_Do_DB"     => "Binlog_Do_DB",
-                "Binlog_Ignore_DB" => "Binlog_Ignore_DB",
-            ),
-        ),
-    ),
-    array(
-        'query'  => "SHOW GRANTS",
-        'result' => array(),
-    ),
-    array(
-        'query'  => "SELECT `SCHEMA_NAME` FROM `INFORMATION_SCHEMA`.`SCHEMATA`, "
-            . "(SELECT DB_first_level FROM ( SELECT DISTINCT "
-            . "SUBSTRING_INDEX(SCHEMA_NAME, '_', 1) DB_first_level "
-            . "FROM INFORMATION_SCHEMA.SCHEMATA WHERE TRUE ) t ORDER BY "
-            . "DB_first_level ASC LIMIT 0, 100) t2 WHERE TRUE AND 1 = LOCATE("
-            . "CONCAT(DB_first_level, '_'), CONCAT(SCHEMA_NAME, '_')) "
-            . "ORDER BY SCHEMA_NAME ASC",
-        'result' => array(
-            "test",
-        ),
-    ),
-    array(
-        'query'  => "SELECT COUNT(*) FROM ( SELECT DISTINCT SUBSTRING_INDEX("
-            . "SCHEMA_NAME, '_', 1) DB_first_level "
-            . "FROM INFORMATION_SCHEMA.SCHEMATA WHERE TRUE ) t",
-        'result' => array(
-            array(1),
-        ),
-    ),
-    array(
-        'query'  => "SELECT `PARTITION_METHOD` "
-            . "FROM `information_schema`.`PARTITIONS` "
-            . "WHERE `TABLE_SCHEMA` = 'db' AND `TABLE_NAME` = 'table' LIMIT 1",
-        'result' => array(),
-    ),
-    array(
-        'query'  => "SHOW PLUGINS",
-        'result' => array(
-            array('Name' => 'partition'),
-        ),
-    ),
-    array(
-        'query'  => "SHOW FULL TABLES FROM `default` WHERE `Table_type`='BASE TABLE'",
-        'result' => array(
-            array("test1", "BASE TABLE"),
-            array("test2", "BASE TABLE"),
-        ),
-    ),
-    array(
-        'query'  => "SHOW FULL TABLES FROM `default` "
-            . "WHERE `Table_type`!='BASE TABLE'",
-        'result' => array(),
-    ),
-    array(
-        'query'  => "SHOW FUNCTION STATUS WHERE `Db`='default'",
-        'result' => array(array("Name" => "testFunction")),
-    ),
-    array(
-        'query'  => "SHOW PROCEDURE STATUS WHERE `Db`='default'",
-        'result' => array(),
-    ),
-    array(
-        'query'  => "SHOW EVENTS FROM `default`",
-        'result' => array(),
-    ),
-    array(
-        'query'  => "FLUSH PRIVILEGES",
-        'result' => array(),
-    ),
-    array(
-        'query'  => "SELECT * FROM `mysql`.`db` LIMIT 1",
-        'result' => array(),
-    ),
-    array(
-        'query'  => "SELECT * FROM `mysql`.`columns_priv` LIMIT 1",
-        'result' => array(),
-    ),
-    array(
-        'query'  => "SELECT * FROM `mysql`.`tables_priv` LIMIT 1",
-        'result' => array(),
-    ),
-    array(
-        'query'  => "SELECT * FROM `mysql`.`procs_priv` LIMIT 1",
-        'result' => array(),
-    ),
-    array(
-        'query' => 'DELETE FROM `mysql`.`db` WHERE `host` = "" '
-            . 'AND `Db` = "" AND `User` = ""',
-        'result' => true
-    ),
-    array(
-        'query' => 'DELETE FROM `mysql`.`columns_priv` WHERE '
-            . '`host` = "" AND `Db` = "" AND `User` = ""',
-        'result' => true
-    ),
-    array(
-        'query' => 'DELETE FROM `mysql`.`tables_priv` WHERE '
-            . '`host` = "" AND `Db` = "" AND `User` = "" AND Table_name = ""',
-        'result' => true
-    ),
-    array(
-        'query'  => 'DELETE FROM `mysql`.`procs_priv` WHERE '
-            . '`host` = "" AND `Db` = "" AND `User` = "" AND `Routine_name` = "" '
-            . 'AND `Routine_type` = ""',
-        'result' => true
-    ),
-    array(
-        'query' => 'SELECT `plugin` FROM `mysql`.`user` WHERE '
-            . '`User` = "pma_username" AND `Host` = "pma_hostname" LIMIT 1',
-        'result' => array()
-    ),
-    array(
-        'query'  => 'SELECT @@default_authentication_plugin',
-        'result' => array(
-            array('@@default_authentication_plugin' => 'mysql_native_password'),
-        ),
-    ),
-    array(
-        'query'  => "SELECT TABLE_NAME FROM information_schema.VIEWS WHERE "
-            . "TABLE_SCHEMA = 'db' AND TABLE_NAME = 'table'",
-        'result' => array(),
-    ),
-    array(
-        'query'  => "SELECT *, `TABLE_SCHEMA` AS `Db`, "
-            . "`TABLE_NAME` AS `Name`, `TABLE_TYPE` AS `TABLE_TYPE`, "
-            . "`ENGINE` AS `Engine`, `ENGINE` AS `Type`, "
-            . "`VERSION` AS `Version`, `ROW_FORMAT` AS `Row_format`, "
-            . "`TABLE_ROWS` AS `Rows`, `AVG_ROW_LENGTH` AS `Avg_row_length`, "
-            . "`DATA_LENGTH` AS `Data_length`, "
-            . "`MAX_DATA_LENGTH` AS `Max_data_length`, "
-            . "`INDEX_LENGTH` AS `Index_length`, `DATA_FREE` AS `Data_free`, "
-            . "`AUTO_INCREMENT` AS `Auto_increment`, "
-            . "`CREATE_TIME` AS `Create_time`, "
-            . "`UPDATE_TIME` AS `Update_time`, `CHECK_TIME` AS `Check_time`, "
-            . "`TABLE_COLLATION` AS `Collation`, `CHECKSUM` AS `Checksum`, "
-            . "`CREATE_OPTIONS` AS `Create_options`, "
-            . "`TABLE_COMMENT` AS `Comment` "
-            . "FROM `information_schema`.`TABLES` t "
-            . "WHERE `TABLE_SCHEMA` IN ('db') "
-            . "AND t.`TABLE_NAME` = 'table' ORDER BY Name ASC",
-        'result' => array(),
-    ),
-    array(
-        'query'  => "SHOW TABLE STATUS FROM `db` WHERE `Name` LIKE 'table%'",
-        'result' => array(),
-    ),
-    array(
-        'query'  => "SELECT @@have_partitioning;",
-        'result' => array(),
-    ),
-    array(
-        'query'  => "SELECT @@lower_case_table_names",
-        'result' => array(),
-    ),
-    array(
-        'query'  => "SELECT `PLUGIN_NAME`, `PLUGIN_DESCRIPTION` "
-            . "FROM `information_schema`.`PLUGINS` "
-            . "WHERE `PLUGIN_TYPE` = 'AUTHENTICATION';",
-        'result' => array(),
-    ),
-    array(
-        'query'  => "SHOW TABLES FROM `db`;",
-        'result' => array(),
-    ),
-    array(
-        'query'  => "SELECT `PRIVILEGE_TYPE` FROM "
-            . "`INFORMATION_SCHEMA`.`SCHEMA_PRIVILEGES` "
-            . "WHERE GRANTEE='''pma_test''@''localhost''' "
-            . "AND PRIVILEGE_TYPE='EVENT' AND 'db' LIKE `TABLE_SCHEMA`",
-        'result' => array(),
-    ),
-    array(
-        'query'  => "SELECT `PRIVILEGE_TYPE` FROM "
-            . "`INFORMATION_SCHEMA`.`SCHEMA_PRIVILEGES` "
-            . "WHERE GRANTEE='''pma_test''@''localhost''' "
-            . "AND PRIVILEGE_TYPE='TRIGGER' AND 'db' LIKE `TABLE_SCHEMA`",
-        'result' => array(),
-    ),
-    array(
-        'query'  => "SELECT (COUNT(DB_first_level) DIV 100) * 100 from "
-            . "( SELECT distinct SUBSTRING_INDEX(SCHEMA_NAME, '_', 1) "
-            . "DB_first_level FROM INFORMATION_SCHEMA.SCHEMATA "
-            . "WHERE `SCHEMA_NAME` < 'db' ) t",
-        'result' => array(),
-    ),
-    array(
-        'query'  => "SELECT `SCHEMA_NAME` FROM "
-            . "`INFORMATION_SCHEMA`.`SCHEMATA`, "
-            . "(SELECT DB_first_level FROM ( SELECT DISTINCT "
-            . "SUBSTRING_INDEX(SCHEMA_NAME, '_', 1) DB_first_level FROM "
-            . "INFORMATION_SCHEMA.SCHEMATA WHERE TRUE ) t "
-            . "ORDER BY DB_first_level ASC LIMIT , 100) t2 WHERE TRUE AND "
-            . "1 = LOCATE(CONCAT(DB_first_level, '_'), "
-            . "CONCAT(SCHEMA_NAME, '_')) ORDER BY SCHEMA_NAME ASC",
-        'result' => array(),
-    ),
-    array(
-        'query' => 'SELECT @@ndb_version_string',
-        'result' => array(array('ndb-7.4.10')),
-    ),
-);
-/**
- * Current database.
- */
-$GLOBALS['dummy_db'] = '';
-
-/* Some basic setup for dummy driver */
-$GLOBALS['userlink'] = 1;
-$GLOBALS['controllink'] = 2;
-$GLOBALS['cfg']['DBG']['sql'] = false;
-if (!defined('PMA_MARIADB')) {
-    define('PMA_MARIADB', 0);
-}
-
-/**
- * Fake database driver for testing purposes
- *
- * It has hardcoded results for given queries what makes easy to use it
- * in testsuite. Feel free to include other queries which your test will
- * need.
- *
- * @package    PhpMyAdmin-DBI
- * @subpackage Dummy
- */
-class DBIDummy implements DBIExtension
-{
-    /**
-     * connects to the database server
-     *
-     * @param string $user                 mysql user name
-     * @param string $password             mysql user password
-     * @param bool   $is_controluser       whether this is a control user connection
-     * @param array  $server               host/port/socket/persistent
-     * @param bool   $auxiliary_connection (when true, don't go back to login if
-     *                                     connection fails)
-     *
-     * @return mixed false on error or a mysqli object on success
-     */
-    public function connect(
-        $user,
-        $password,
-        $is_controluser = false,
-        $server = null,
-        $auxiliary_connection = false
-    ) {
-        return true;
-    }
-
-    /**
-     * selects given database
-     *
-     * @param string   $dbname name of db to select
-     * @param resource $link   mysql link resource
-     *
-     * @return bool
-     */
-    public function selectDb($dbname, $link)
-    {
-        $GLOBALS['dummy_db'] = $dbname;
-
-        return true;
-    }
-
-    /**
-     * runs a query and returns the result
-     *
-     * @param string   $query   query to run
-     * @param resource $link    mysql link resource
-     * @param int      $options query options
-     *
-     * @return mixed
-     */
-    public function realQuery($query, $link = null, $options = 0)
-    {
-        $query = trim(preg_replace('/  */', ' ', str_replace("\n", ' ', $query)));
-        for ($i = 0, $nb = count($GLOBALS['dummy_queries']); $i < $nb; $i++) {
-            if ($GLOBALS['dummy_queries'][$i]['query'] != $query) {
-                continue;
-            }
-
-            $GLOBALS['dummy_queries'][$i]['pos'] = 0;
-            if (!is_array($GLOBALS['dummy_queries'][$i]['result'])) {
-                return false;
-            }
-
-            return $i;
-        }
-        echo "Not supported query: $query\n";
-
-        return false;
-    }
-
-    /**
-     * Run the multi query and output the results
-     *
-     * @param resource $link  connection object
-     * @param string   $query multi query statement to execute
-     *
-     * @return array|bool
-     */
-    public function realMultiQuery($link, $query)
-    {
-        return false;
-    }
-
-    /**
-     * returns result data from $result
-     *
-     * @param object $result MySQL result
-     *
-     * @return array
-     */
-    public function fetchAny($result)
-    {
-        $query_data = $GLOBALS['dummy_queries'][$result];
-        if ($query_data['pos'] >= count($query_data['result'])) {
-            return false;
-        }
-        $ret = $query_data['result'][$query_data['pos']];
-        $GLOBALS['dummy_queries'][$result]['pos'] += 1;
-
-        return $ret;
-    }
-
-    /**
-     * returns array of rows with associative and numeric keys from $result
-     *
-     * @param object $result result  MySQL result
-     *
-     * @return array
-     */
-    public function fetchArray($result)
-    {
-        $data = $this->fetchAny($result);
-        if (!is_array($data)
-            || !isset($GLOBALS['dummy_queries'][$result]['columns'])
-        ) {
-            return $data;
-        }
-
-        foreach ($data as $key => $val) {
-            $data[$GLOBALS['dummy_queries'][$result]['columns'][$key]] = $val;
-        }
-
-        return $data;
-    }
-
-    /**
-     * returns array of rows with associative keys from $result
-     *
-     * @param object $result MySQL result
-     *
-     * @return array
-     */
-    public function fetchAssoc($result)
-    {
-        $data = $this->fetchAny($result);
-        if (!is_array($data)
-            || !isset($GLOBALS['dummy_queries'][$result]['columns'])
-        ) {
-            return $data;
-        }
-
-        $ret = array();
-        foreach ($data as $key => $val) {
-            $ret[$GLOBALS['dummy_queries'][$result]['columns'][$key]] = $val;
-        }
-
-        return $ret;
-    }
-
-    /**
-     * returns array of rows with numeric keys from $result
-     *
-     * @param object $result MySQL result
-     *
-     * @return array
-     */
-    public function fetchRow($result)
-    {
-        $data = $this->fetchAny($result);
-
-        return $data;
-    }
-
-    /**
-     * Adjusts the result pointer to an arbitrary row in the result
-     *
-     * @param object  $result database result
-     * @param integer $offset offset to seek
-     *
-     * @return bool true on success, false on failure
-     */
-    public function dataSeek($result, $offset)
-    {
-        if ($offset > count($GLOBALS['dummy_queries'][$result]['result'])) {
-            return false;
-        }
-        $GLOBALS['dummy_queries'][$result]['pos'] = $offset;
-
-        return true;
-    }
-
-    /**
-     * Frees memory associated with the result
-     *
-     * @param object $result database result
-     *
-     * @return void
-     */
-    public function freeResult($result)
-    {
-        return;
-    }
-
-    /**
-     * Check if there are any more query results from a multi query
-     *
-     * @param resource $link the connection object
-     *
-     * @return bool false
-     */
-    public function moreResults($link)
-    {
-        return false;
-    }
-
-    /**
-     * Prepare next result from multi_query
-     *
-     * @param resource $link the connection object
-     *
-     * @return boolean false
-     */
-    public function nextResult($link)
-    {
-        return false;
-    }
-
-    /**
-     * Store the result returned from multi query
-     *
-     * @param resource $link the connection object
-     *
-     * @return mixed false when empty results / result set when not empty
-     */
-    public function storeResult($link)
-    {
-        return false;
-    }
-
-    /**
-     * Returns a string representing the type of connection used
-     *
-     * @param resource $link mysql link
-     *
-     * @return string type of connection used
-     */
-    public function getHostInfo($link)
-    {
-        return '';
-    }
-
-    /**
-     * Returns the version of the MySQL protocol used
-     *
-     * @param resource $link mysql link
-     *
-     * @return integer version of the MySQL protocol used
-     */
-    public function getProtoInfo($link)
-    {
-        return -1;
-    }
-
-    /**
-     * returns a string that represents the client library version
-     *
-     * @return string MySQL client library version
-     */
-    public function getClientInfo()
-    {
-        return '';
-    }
-
-    /**
-     * returns last error message or false if no errors occurred
-     *
-     * @param resource $link connection link
-     *
-     * @return string|bool $error or false
-     */
-    public function getError($link)
-    {
-        return false;
-    }
-
-    /**
-     * returns the number of rows returned by last query
-     *
-     * @param object $result MySQL result
-     *
-     * @return string|int
-     */
-    public function numRows($result)
-    {
-        if (is_bool($result)) {
-            return 0;
-        }
-
-        return count($GLOBALS['dummy_queries'][$result]['result']);
-    }
-
-    /**
-     * returns the number of rows affected by last query
-     *
-     * @param resource $link           the mysql object
-     * @param bool     $get_from_cache whether to retrieve from cache
-     *
-     * @return string|int
-     */
-    public function affectedRows($link = null, $get_from_cache = true)
-    {
-        return 0;
-    }
-
-    /**
-     * returns metainfo for fields in $result
-     *
-     * @param object $result result set identifier
-     *
-     * @return array meta info for fields in $result
-     */
-    public function getFieldsMeta($result)
-    {
-        return array();
-    }
-
-    /**
-     * return number of fields in given $result
-     *
-     * @param object $result MySQL result
-     *
-     * @return int  field count
-     */
-    public function numFields($result)
-    {
-        if (!isset($GLOBALS['dummy_queries'][$result]['columns'])) {
-            return 0;
-        }
-
-        return count($GLOBALS['dummy_queries'][$result]['columns']);
-    }
-
-    /**
-     * returns the length of the given field $i in $result
-     *
-     * @param object $result result set identifier
-     * @param int    $i      field
-     *
-     * @return int length of field
-     */
-    public function fieldLen($result, $i)
-    {
-        return -1;
-    }
-
-    /**
-     * returns name of $i. field in $result
-     *
-     * @param object $result result set identifier
-     * @param int    $i      field
-     *
-     * @return string name of $i. field in $result
-     */
-    public function fieldName($result, $i)
-    {
-        return '';
-    }
-
-    /**
-     * returns concatenated string of human readable field flags
-     *
-     * @param object $result result set identifier
-     * @param int    $i      field
-     *
-     * @return string field flags
-     */
-    public function fieldFlags($result, $i)
-    {
-        return '';
-    }
-
-    /**
-     * returns properly escaped string for use in MySQL queries
-     *
-     * @param mixed  $link database link
-     * @param string $str  string to be escaped
-     *
-     * @return string a MySQL escaped string
-     */
-    public function escapeString($link, $str)
-    {
-        return $str;
-    }
-}
diff --git a/#pma/libraries/dbi/DBIExtension.lib.php b/#pma/libraries/dbi/DBIExtension.lib.php
deleted file mode 100644
index 5e270c73..00000000
--- a/#pma/libraries/dbi/DBIExtension.lib.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * Contract for every database extension supported by phpMyAdmin
- *
- * @package PhpMyAdmin-DBI
- */
-
-/**
- * Defines PMA_MYSQL_CLIENT_API if it does not exist based
- * on MySQL client version.
- *
- * @param string $version MySQL version string
- *
- * @return void
- */
-function PMA_defineClientAPI($version)
-{
-    if (!defined('PMA_MYSQL_CLIENT_API')) {
-        $client_api = explode('.', $version);
-        define(
-            'PMA_MYSQL_CLIENT_API',
-            (int)sprintf(
-                '%d%02d%02d',
-                $client_api[0], $client_api[1], intval($client_api[2])
-            )
-        );
-    }
-}
diff --git a/#pma/libraries/dbi/DBIExtension.php b/#pma/libraries/dbi/DBIExtension.php
deleted file mode 100644
index 3a5eb7de..00000000
--- a/#pma/libraries/dbi/DBIExtension.php
+++ /dev/null
@@ -1,248 +0,0 @@
-<?php
-/**
- * Contract for every database extension supported by phpMyAdmin
- *
- * @package PhpMyAdmin-DBI
- */
-namespace PMA\libraries\dbi;
-
-require_once 'libraries/dbi/DBIExtension.lib.php';
-
-/**
- * Contract for every database extension supported by phpMyAdmin
- *
- * @package PhpMyAdmin-DBI
- */
-interface DBIExtension
-{
-    /**
-     * connects to the database server
-     *
-     * @param string $user                 user name
-     * @param string $password             user password
-     * @param bool   $is_controluser       whether this is a control user connection
-     * @param array  $server               host/port/socket/persistent
-     * @param bool   $auxiliary_connection (when true, don't go back to login if
-     *                                     connection fails)
-     *
-     * @return mixed false on error or a connection object on success
-     */
-    public function connect(
-        $user, $password, $is_controluser = false, $server = null,
-        $auxiliary_connection = false
-    );
-
-    /**
-     * selects given database
-     *
-     * @param string   $dbname database name to select
-     * @param resource $link   connection object
-     *
-     * @return boolean
-     */
-    public function selectDb($dbname, $link);
-
-    /**
-     * runs a query and returns the result
-     *
-     * @param string   $query   query to execute
-     * @param resource $link    connection object
-     * @param int      $options query options
-     *
-     * @return mixed result
-     */
-    public function realQuery($query, $link, $options);
-
-    /**
-     * Run the multi query and output the results
-     *
-     * @param resource $link  connection object
-     * @param string   $query multi query statement to execute
-     *
-     * @return array|bool
-     */
-    public function realMultiQuery($link, $query);
-
-    /**
-     * returns array of rows with associative and numeric keys from $result
-     *
-     * @param object $result result set identifier
-     *
-     * @return array
-     */
-    public function fetchArray($result);
-
-    /**
-     * returns array of rows with associative keys from $result
-     *
-     * @param object $result result set identifier
-     *
-     * @return array
-     */
-    public function fetchAssoc($result);
-
-    /**
-     * returns array of rows with numeric keys from $result
-     *
-     * @param object $result result set identifier
-     *
-     * @return array
-     */
-    public function fetchRow($result);
-
-    /**
-     * Adjusts the result pointer to an arbitrary row in the result
-     *
-     * @param object  $result database result
-     * @param integer $offset offset to seek
-     *
-     * @return bool true on success, false on failure
-     */
-    public function dataSeek($result, $offset);
-
-    /**
-     * Frees memory associated with the result
-     *
-     * @param object $result database result
-     *
-     * @return void
-     */
-    public function freeResult($result);
-
-    /**
-     * Check if there are any more query results from a multi query
-     *
-     * @param resource $link the connection object
-     *
-     * @return bool true or false
-     */
-    public function moreResults($link);
-
-    /**
-     * Prepare next result from multi_query
-     *
-     * @param resource $link the connection object
-     *
-     * @return bool true or false
-     */
-    public function nextResult($link);
-
-    /**
-     * Store the result returned from multi query
-     *
-     * @param resource $link mysql link
-     *
-     * @return mixed false when empty results / result set when not empty
-     */
-    public function storeResult($link);
-
-    /**
-     * Returns a string representing the type of connection used
-     *
-     * @param resource $link mysql link
-     *
-     * @return string type of connection used
-     */
-    public function getHostInfo($link);
-
-    /**
-     * Returns the version of the MySQL protocol used
-     *
-     * @param resource $link mysql link
-     *
-     * @return integer version of the MySQL protocol used
-     */
-    public function getProtoInfo($link);
-
-    /**
-     * returns a string that represents the client library version
-     *
-     * @return string MySQL client library version
-     */
-    public function getClientInfo();
-
-    /**
-     * returns last error message or false if no errors occurred
-     *
-     * @param resource $link connection link
-     *
-     * @return string|bool $error or false
-     */
-    public function getError($link);
-
-    /**
-     * returns the number of rows returned by last query
-     *
-     * @param object $result result set identifier
-     *
-     * @return string|int
-     */
-    public function numRows($result);
-
-    /**
-     * returns the number of rows affected by last query
-     *
-     * @param resource $link the connection object
-     *
-     * @return int
-     */
-    public function affectedRows($link);
-
-    /**
-     * returns metainfo for fields in $result
-     *
-     * @param object $result result set identifier
-     *
-     * @return array meta info for fields in $result
-     */
-    public function getFieldsMeta($result);
-
-    /**
-     * return number of fields in given $result
-     *
-     * @param object $result result set identifier
-     *
-     * @return int field count
-     */
-    public function numFields($result);
-
-    /**
-     * returns the length of the given field $i in $result
-     *
-     * @param object $result result set identifier
-     * @param int    $i      field
-     *
-     * @return int length of field
-     */
-    public function fieldLen($result, $i);
-
-    /**
-     * returns name of $i. field in $result
-     *
-     * @param object $result result set identifier
-     * @param int    $i      field
-     *
-     * @return string name of $i. field in $result
-     */
-    public function fieldName($result, $i);
-
-    /**
-     * returns concatenated string of human readable field flags
-     *
-     * @param object $result result set identifier
-     * @param int    $i      field
-     *
-     * @return string field flags
-     */
-    public function fieldFlags($result, $i);
-
-    /**
-     * returns properly escaped string for use in MySQL queries
-     *
-     * @param mixed  $link database link
-     * @param string $str  string to be escaped
-     *
-     * @return string a MySQL escaped string
-     */
-    public function escapeString($link, $str);
-}
diff --git a/#pma/libraries/dbi/DBIMysql.php b/#pma/libraries/dbi/DBIMysql.php
deleted file mode 100644
index e274b908..00000000
--- a/#pma/libraries/dbi/DBIMysql.php
+++ /dev/null
@@ -1,487 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Interface to the classic MySQL extension
- *
- * @package    PhpMyAdmin-DBI
- * @subpackage MySQL
- */
-namespace PMA\libraries\dbi;
-
-use PMA\libraries\DatabaseInterface;
-
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
-if (! extension_loaded('mysql')) {
-    // The old MySQL extension is deprecated as of PHP 5.5.0, and will be
-    // removed in the future. Instead, the `MySQLi` or `PDO_MySQL` extension
-    // should be used.
-    return;
-}
-
-require_once 'libraries/dbi/DBIExtension.lib.php';
-
-/**
- * MySQL client API
- */
-PMA_defineClientAPI(mysql_get_client_info());
-
-/**
- * Interface to the classic MySQL extension
- *
- * @package    PhpMyAdmin-DBI
- * @subpackage MySQL
- */
-class DBIMysql implements DBIExtension
-{
-    /**
-     * Helper function for connecting to the database server
-     *
-     * @param string $server       host/port/socket
-     * @param string $user         mysql user name
-     * @param string $password     mysql user password
-     * @param int    $client_flags client flags of connection
-     * @param bool   $persistent   whether to use persistent connection
-     *
-     * @return mixed   false on error or a mysql connection resource on success
-     */
-    private function _realConnect($server, $user, $password, $client_flags,
-        $persistent = false
-    ) {
-        global $cfg;
-
-        if (empty($client_flags)) {
-            if ($cfg['PersistentConnections'] || $persistent) {
-                $link = @mysql_pconnect($server, $user, $password);
-            } else {
-                $link = @mysql_connect($server, $user, $password);
-            }
-        } else {
-            if ($cfg['PersistentConnections'] || $persistent) {
-                $link = @mysql_pconnect($server, $user, $password, $client_flags);
-            } else {
-                $link = @mysql_connect(
-                    $server, $user, $password, false, $client_flags
-                );
-            }
-        }
-
-        return $link;
-    }
-
-    /**
-     * Run the multi query and output the results
-     *
-     * @param mysqli $link  mysqli object
-     * @param string $query multi query statement to execute
-     *
-     * @return boolean false always false since mysql extension not support
-     *                       for multi query executions
-     */
-    public function realMultiQuery($link, $query)
-    {
-        // N.B.: PHP's 'mysql' extension does not support
-        // multi_queries so this function will always
-        // return false. Use the 'mysqli' extension, if
-        // you need support for multi_queries.
-        return false;
-    }
-
-    /**
-     * connects to the database server
-     *
-     * @param string $user                 mysql user name
-     * @param string $password             mysql user password
-     * @param bool   $is_controluser       whether this is a control user connection
-     * @param array  $server               host/port/socket/persistent
-     * @param bool   $auxiliary_connection (when true, don't go back to login if
-     *                                     connection fails)
-     *
-     * @return mixed false on error or a mysqli object on success
-     */
-    public function connect(
-        $user, $password, $is_controluser = false, $server = null,
-        $auxiliary_connection = false
-    ) {
-        global $cfg;
-
-        $server_port = $GLOBALS['dbi']->getServerPort($server);
-        $server_socket = $GLOBALS['dbi']->getServerSocket($server);
-
-        if ($server_port === 0) {
-            $server_port = '';
-        } else {
-            $server_port = ':' . $server_port;
-        }
-
-        if (is_null($server_socket)) {
-            $server_socket = '';
-        } else {
-            $server_socket = ':' . $server_socket;
-        }
-
-        $client_flags = 0;
-
-        if (defined('PMA_ENABLE_LDI')) {
-            // use CLIENT_LOCAL_FILES as defined in mysql_com.h
-            // for the case where the client library was not compiled
-            // with --enable-local-infile
-            $client_flags |= 128;
-        }
-
-        /* Optionally compress connection */
-        if (defined('MYSQL_CLIENT_COMPRESS') && $cfg['Server']['compress']) {
-            $client_flags |= MYSQL_CLIENT_COMPRESS;
-        }
-
-        /* Optionally enable SSL */
-        if (defined('MYSQL_CLIENT_SSL') && $cfg['Server']['ssl']) {
-            $client_flags |= MYSQL_CLIENT_SSL;
-        }
-
-        if (! $server) {
-            $link = $this->_realConnect(
-                $cfg['Server']['host'] . $server_port . $server_socket,
-                $user, $password, empty($client_flags) ? null : $client_flags
-            );
-
-            // Retry with empty password if we're allowed to
-            if (empty($link) && $cfg['Server']['nopassword'] && ! $is_controluser) {
-                $link = $this->_realConnect(
-                    $cfg['Server']['host'] . $server_port . $server_socket,
-                    $user, '', empty($client_flags) ? null : $client_flags
-                );
-            }
-        } else {
-            if (!isset($server['host'])) {
-                $link = $this->_realConnect($server_socket, $user, $password, null);
-            } else {
-                $link = $this->_realConnect(
-                    $server['host'] . $server_port . $server_socket,
-                    $user, $password, null
-                );
-            }
-        }
-        return $link;
-    }
-
-    /**
-     * selects given database
-     *
-     * @param string        $dbname name of db to select
-     * @param resource|null $link   mysql link resource
-     *
-     * @return bool
-     */
-    public function selectDb($dbname, $link)
-    {
-        return mysql_select_db($dbname, $link);
-    }
-
-    /**
-     * runs a query and returns the result
-     *
-     * @param string        $query   query to run
-     * @param resource|null $link    mysql link resource
-     * @param int           $options query options
-     *
-     * @return mixed
-     */
-    public function realQuery($query, $link, $options)
-    {
-        if ($options == ($options | DatabaseInterface::QUERY_STORE)) {
-            return mysql_query($query, $link);
-        } elseif ($options == ($options | DatabaseInterface::QUERY_UNBUFFERED)) {
-            return mysql_unbuffered_query($query, $link);
-        } else {
-            return mysql_query($query, $link);
-        }
-    }
-
-    /**
-     * returns array of rows with associative and numeric keys from $result
-     *
-     * @param resource $result result  MySQL result
-     *
-     * @return array
-     */
-    public function fetchArray($result)
-    {
-        return mysql_fetch_array($result, MYSQL_BOTH);
-    }
-
-    /**
-     * returns array of rows with associative keys from $result
-     *
-     * @param resource $result MySQL result
-     *
-     * @return array
-     */
-    public function fetchAssoc($result)
-    {
-        return mysql_fetch_array($result, MYSQL_ASSOC);
-    }
-
-    /**
-     * returns array of rows with numeric keys from $result
-     *
-     * @param resource $result MySQL result
-     *
-     * @return array
-     */
-    public function fetchRow($result)
-    {
-        return mysql_fetch_array($result, MYSQL_NUM);
-    }
-
-    /**
-     * Adjusts the result pointer to an arbitrary row in the result
-     *
-     * @param resource $result database result
-     * @param integer  $offset offset to seek
-     *
-     * @return bool true on success, false on failure
-     */
-    public function dataSeek($result, $offset)
-    {
-        return mysql_data_seek($result, $offset);
-    }
-
-    /**
-     * Frees memory associated with the result
-     *
-     * @param resource $result database result
-     *
-     * @return void
-     */
-    public function freeResult($result)
-    {
-        if (is_resource($result) && get_resource_type($result) === 'mysql result') {
-            mysql_free_result($result);
-        }
-    }
-
-    /**
-     * Check if there are any more query results from a multi query
-     *
-     * @param resource $link the connection object
-     *
-     * @return bool false
-     */
-    public function moreResults($link)
-    {
-        // N.B.: PHP's 'mysql' extension does not support
-        // multi_queries so this function will always
-        // return false. Use the 'mysqli' extension, if
-        // you need support for multi_queries.
-        return false;
-    }
-
-    /**
-     * Prepare next result from multi_query
-     *
-     * @param resource $link the connection object
-     *
-     * @return boolean false
-     */
-    public function nextResult($link)
-    {
-        // N.B.: PHP's 'mysql' extension does not support
-        // multi_queries so this function will always
-        // return false. Use the 'mysqli' extension, if
-        // you need support for multi_queries.
-        return false;
-    }
-
-    /**
-     * Returns a string representing the type of connection used
-     *
-     * @param resource|null $link mysql link
-     *
-     * @return string type of connection used
-     */
-    public function getHostInfo($link)
-    {
-        return mysql_get_host_info($link);
-    }
-
-    /**
-     * Returns the version of the MySQL protocol used
-     *
-     * @param resource|null $link mysql link
-     *
-     * @return int version of the MySQL protocol used
-     */
-    public function getProtoInfo($link)
-    {
-        return mysql_get_proto_info($link);
-    }
-
-    /**
-     * returns a string that represents the client library version
-     *
-     * @return string MySQL client library version
-     */
-    public function getClientInfo()
-    {
-        return mysql_get_client_info();
-    }
-
-    /**
-     * returns last error message or false if no errors occurred
-     *
-     * @param resource|null $link mysql link
-     *
-     * @return string|bool $error or false
-     */
-    public function getError($link)
-    {
-        $GLOBALS['errno'] = 0;
-
-        if (null !== $link && false !== $link) {
-            $error_number = mysql_errno($link);
-            $error_message = mysql_error($link);
-        } else {
-            $error_number = mysql_errno();
-            $error_message = mysql_error();
-        }
-        if (0 == $error_number) {
-            return false;
-        }
-
-        // keep the error number for further check after
-        // the call to getError()
-        $GLOBALS['errno'] = $error_number;
-
-        return $GLOBALS['dbi']->formatError($error_number, $error_message);
-    }
-
-    /**
-     * returns the number of rows returned by last query
-     *
-     * @param resource $result MySQL result
-     *
-     * @return string|int
-     */
-    public function numRows($result)
-    {
-        if (is_bool($result)) {
-            return 0;
-        }
-
-        return mysql_num_rows($result);
-    }
-
-    /**
-     * returns the number of rows affected by last query
-     *
-     * @param resource|null $link the mysql object
-     *
-     * @return int
-     */
-    public function affectedRows($link)
-    {
-        return mysql_affected_rows($link);
-    }
-
-    /**
-     * returns metainfo for fields in $result
-     *
-     * @param resource $result MySQL result
-     *
-     * @return array meta info for fields in $result
-     *
-     * @todo add missing keys like in mysqli_query (decimals)
-     */
-    public function getFieldsMeta($result)
-    {
-        $fields       = array();
-        $num_fields   = mysql_num_fields($result);
-        for ($i = 0; $i < $num_fields; $i++) {
-            $field = mysql_fetch_field($result, $i);
-            $field->flags = mysql_field_flags($result, $i);
-            $field->orgtable = mysql_field_table($result, $i);
-            $field->orgname = mysql_field_name($result, $i);
-            $fields[] = $field;
-        }
-        return $fields;
-    }
-
-    /**
-     * return number of fields in given $result
-     *
-     * @param resource $result MySQL result
-     *
-     * @return int  field count
-     */
-    public function numFields($result)
-    {
-        return mysql_num_fields($result);
-    }
-
-    /**
-     * returns the length of the given field $i in $result
-     *
-     * @param resource $result MySQL result
-     * @param int      $i      field
-     *
-     * @return int length of field
-     */
-    public function fieldLen($result, $i)
-    {
-        return mysql_field_len($result, $i);
-    }
-
-    /**
-     * returns name of $i. field in $result
-     *
-     * @param resource $result MySQL result
-     * @param int      $i      field
-     *
-     * @return string name of $i. field in $result
-     */
-    public function fieldName($result, $i)
-    {
-        return mysql_field_name($result, $i);
-    }
-
-    /**
-     * returns concatenated string of human readable field flags
-     *
-     * @param resource $result MySQL result
-     * @param int      $i      field
-     *
-     * @return string field flags
-     */
-    public function fieldFlags($result, $i)
-    {
-        return mysql_field_flags($result, $i);
-    }
-
-    /**
-     * Store the result returned from multi query
-     *
-     * @param resource $result MySQL result
-     *
-     * @return false
-     */
-    public function storeResult($result)
-    {
-        return false;
-    }
-
-    /**
-     * returns properly escaped string for use in MySQL queries
-     *
-     * @param mixed  $link database link
-     * @param string $str  string to be escaped
-     *
-     * @return string a MySQL escaped string
-     */
-    public function escapeString($link, $str)
-    {
-        return mysql_real_escape_string($str, $link);
-    }
-}
diff --git a/#pma/libraries/dbi/DBIMysqli.lib.php b/#pma/libraries/dbi/DBIMysqli.lib.php
deleted file mode 100644
index 291eb58e..00000000
--- a/#pma/libraries/dbi/DBIMysqli.lib.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Interface to the improved MySQL extension (MySQLi)
- *
- * @package    PhpMyAdmin-DBI
- * @subpackage MySQLi
- */
-
-/**
- * Names of field flags.
- */
-$pma_mysqli_flag_names = array(
-    MYSQLI_NUM_FLAG => 'num',
-    MYSQLI_PART_KEY_FLAG => 'part_key',
-    MYSQLI_SET_FLAG => 'set',
-    MYSQLI_TIMESTAMP_FLAG => 'timestamp',
-    MYSQLI_AUTO_INCREMENT_FLAG => 'auto_increment',
-    MYSQLI_ENUM_FLAG => 'enum',
-    MYSQLI_ZEROFILL_FLAG => 'zerofill',
-    MYSQLI_UNSIGNED_FLAG => 'unsigned',
-    MYSQLI_BLOB_FLAG => 'blob',
-    MYSQLI_MULTIPLE_KEY_FLAG => 'multiple_key',
-    MYSQLI_UNIQUE_KEY_FLAG => 'unique_key',
-    MYSQLI_PRI_KEY_FLAG => 'primary_key',
-    MYSQLI_NOT_NULL_FLAG => 'not_null',
-);
\ No newline at end of file
diff --git a/#pma/libraries/dbi/DBIMysqli.php b/#pma/libraries/dbi/DBIMysqli.php
deleted file mode 100644
index 0769b739..00000000
--- a/#pma/libraries/dbi/DBIMysqli.php
+++ /dev/null
@@ -1,631 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Interface to the improved MySQL extension (MySQLi)
- *
- * @package    PhpMyAdmin-DBI
- * @subpackage MySQLi
- */
-namespace PMA\libraries\dbi;
-
-use PMA\libraries\DatabaseInterface;
-
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
-require_once 'libraries/dbi/DBIExtension.lib.php';
-
-/**
- * MySQL client API
- */
-PMA_defineClientAPI(mysqli_get_client_info());
-
-/**
- * some PHP versions are reporting extra messages like "No index used in query"
- */
-
-mysqli_report(MYSQLI_REPORT_OFF);
-
-/**
- * some older mysql client libs are missing these constants ...
- */
-if (! defined('MYSQLI_BINARY_FLAG')) {
-    define('MYSQLI_BINARY_FLAG', 128);
-}
-
-/**
- * @see https://bugs.php.net/36007
- */
-if (! defined('MYSQLI_TYPE_NEWDECIMAL')) {
-    define('MYSQLI_TYPE_NEWDECIMAL', 246);
-}
-if (! defined('MYSQLI_TYPE_BIT')) {
-    define('MYSQLI_TYPE_BIT', 16);
-}
-if (! defined('MYSQLI_TYPE_JSON')) {
-    define('MYSQLI_TYPE_JSON', 245);
-}
-
-
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Interface to the improved MySQL extension (MySQLi)
- *
- * @package    PhpMyAdmin-DBI
- * @subpackage MySQLi
- */
-class DBIMysqli implements DBIExtension
-{
-    /**
-     * Helper function for connecting to the database server
-     *
-     * @param mysqli $link          connection link
-     * @param string $host          mysql hostname
-     * @param string $user          mysql user name
-     * @param string $password      mysql user password
-     * @param int    $server_port   server port
-     * @param string $server_socket server socket
-     * @param int    $client_flags  client flags of connection
-     * @param bool   $persistent    whether to use persistent connection
-     *
-     * @return bool
-     */
-    private function _realConnect(
-        $link, $host, $user, $password, $server_port,
-        $server_socket, $client_flags = null, $persistent = false
-    ) {
-        global $cfg;
-
-        // mysqli persistent connections
-        if ($cfg['PersistentConnections'] || $persistent) {
-            $host = 'p:' . $host;
-        }
-
-        if ($client_flags === null) {
-            return mysqli_real_connect(
-                $link,
-                $host,
-                $user,
-                $password,
-                '',
-                $server_port,
-                $server_socket
-            );
-        } else {
-            return mysqli_real_connect(
-                $link,
-                $host,
-                $user,
-                $password,
-                '',
-                $server_port,
-                $server_socket,
-                $client_flags
-            );
-        }
-    }
-
-    /**
-     * connects to the database server
-     *
-     * @param string $user                 mysql user name
-     * @param string $password             mysql user password
-     * @param bool   $is_controluser       whether this is a control user connection
-     * @param array  $server               host/port/socket/persistent
-     * @param bool   $auxiliary_connection (when true, don't go back to login if
-     *                                     connection fails)
-     *
-     * @return mixed false on error or a mysqli object on success
-     */
-    public function connect(
-        $user, $password, $is_controluser = false, $server = null,
-        $auxiliary_connection = false
-    ) {
-        global $cfg;
-
-        $server_port = $GLOBALS['dbi']->getServerPort($server);
-        $server_socket = $GLOBALS['dbi']->getServerSocket($server);
-
-        if ($server) {
-            $server['host'] = (empty($server['host']))
-                ? 'localhost'
-                : $server['host'];
-        }
-
-        // NULL enables connection to the default socket
-
-        $link = mysqli_init();
-
-        if (defined('PMA_ENABLE_LDI')) {
-            mysqli_options($link, MYSQLI_OPT_LOCAL_INFILE, true);
-        } else {
-            mysqli_options($link, MYSQLI_OPT_LOCAL_INFILE, false);
-        }
-
-        $client_flags = 0;
-
-        /* Optionally compress connection */
-        if ($cfg['Server']['compress'] && defined('MYSQLI_CLIENT_COMPRESS')) {
-            $client_flags |= MYSQLI_CLIENT_COMPRESS;
-        }
-
-        /* Optionally enable SSL */
-        if ($cfg['Server']['ssl']) {
-            $client_flags |= MYSQLI_CLIENT_SSL;
-            if (!empty($cfg['Server']['ssl_key'])) {
-                mysqli_ssl_set(
-                    $link,
-                    $cfg['Server']['ssl_key'],
-                    $cfg['Server']['ssl_cert'],
-                    $cfg['Server']['ssl_ca'],
-                    $cfg['Server']['ssl_ca_path'],
-                    $cfg['Server']['ssl_ciphers']
-                );
-            }
-            /*
-             * disables SSL certificate validation on mysqlnd for MySQL 5.6 or later
-             * @link https://bugs.php.net/bug.php?id=68344
-             * @link https://github.com/phpmyadmin/phpmyadmin/pull/11838
-             */
-            if (! $cfg['Server']['ssl_verify']) {
-                mysqli_options(
-                    $link,
-                    MYSQLI_OPT_SSL_VERIFY_SERVER_CERT,
-                    $cfg['Server']['ssl_verify']
-                );
-                $client_flags |= MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT;
-            }
-        }
-
-        if (! $server) {
-            $return_value = $this->_realConnect(
-                $link,
-                $cfg['Server']['host'],
-                $user,
-                $password,
-                $server_port,
-                $server_socket,
-                $client_flags
-            );
-            // Retry with empty password if we're allowed to
-            if ($return_value == false
-                && isset($cfg['Server']['nopassword'])
-                && $cfg['Server']['nopassword']
-                && ! $is_controluser
-            ) {
-                $return_value = $this->_realConnect(
-                    $link,
-                    $cfg['Server']['host'],
-                    $user,
-                    '',
-                    $server_port,
-                    $server_socket,
-                    $client_flags
-                );
-            }
-        } else {
-            $return_value = $this->_realConnect(
-                $link,
-                $server['host'],
-                $user,
-                $password,
-                $server_port,
-                $server_socket
-            );
-        }
-
-        if ($return_value === false || is_null($return_value)) {
-            return false;
-        }
-
-        return $link;
-    }
-
-    /**
-     * selects given database
-     *
-     * @param string $dbname database name to select
-     * @param mysqli $link   the mysqli object
-     *
-     * @return boolean
-     */
-    public function selectDb($dbname, $link)
-    {
-        return mysqli_select_db($link, $dbname);
-    }
-
-    /**
-     * runs a query and returns the result
-     *
-     * @param string $query   query to execute
-     * @param mysqli $link    mysqli object
-     * @param int    $options query options
-     *
-     * @return mysqli_result|bool
-     */
-    public function realQuery($query, $link, $options)
-    {
-        if ($options == ($options | DatabaseInterface::QUERY_STORE)) {
-            $method = MYSQLI_STORE_RESULT;
-        } elseif ($options == ($options | DatabaseInterface::QUERY_UNBUFFERED)) {
-            $method = MYSQLI_USE_RESULT;
-        } else {
-            $method = 0;
-        }
-
-        return mysqli_query($link, $query, $method);
-    }
-
-    /**
-     * Run the multi query and output the results
-     *
-     * @param mysqli $link  mysqli object
-     * @param string $query multi query statement to execute
-     *
-     * @return mysqli_result collection | boolean(false)
-     */
-    public function realMultiQuery($link, $query)
-    {
-        return mysqli_multi_query($link, $query);
-    }
-
-    /**
-     * returns array of rows with associative and numeric keys from $result
-     *
-     * @param mysqli_result $result result set identifier
-     *
-     * @return array
-     */
-    public function fetchArray($result)
-    {
-        return mysqli_fetch_array($result, MYSQLI_BOTH);
-    }
-
-    /**
-     * returns array of rows with associative keys from $result
-     *
-     * @param mysqli_result $result result set identifier
-     *
-     * @return array
-     */
-    public function fetchAssoc($result)
-    {
-        return mysqli_fetch_array($result, MYSQLI_ASSOC);
-    }
-
-    /**
-     * returns array of rows with numeric keys from $result
-     *
-     * @param mysqli_result $result result set identifier
-     *
-     * @return array
-     */
-    public function fetchRow($result)
-    {
-        return mysqli_fetch_array($result, MYSQLI_NUM);
-    }
-
-    /**
-     * Adjusts the result pointer to an arbitrary row in the result
-     *
-     * @param mysqli_result $result database result
-     * @param integer       $offset offset to seek
-     *
-     * @return bool true on success, false on failure
-     */
-    public function dataSeek($result, $offset)
-    {
-        return mysqli_data_seek($result, $offset);
-    }
-
-    /**
-     * Frees memory associated with the result
-     *
-     * @param mysqli_result $result database result
-     *
-     * @return void
-     */
-    public function freeResult($result)
-    {
-        if ($result instanceof mysqli_result) {
-            mysqli_free_result($result);
-        }
-    }
-
-    /**
-     * Check if there are any more query results from a multi query
-     *
-     * @param mysqli $link the mysqli object
-     *
-     * @return bool true or false
-     */
-    public function moreResults($link)
-    {
-        return mysqli_more_results($link);
-    }
-
-    /**
-     * Prepare next result from multi_query
-     *
-     * @param mysqli $link the mysqli object
-     *
-     * @return bool true or false
-     */
-    public function nextResult($link)
-    {
-        return mysqli_next_result($link);
-    }
-
-    /**
-     * Store the result returned from multi query
-     *
-     * @param mysqli $link the mysqli object
-     *
-     * @return mixed false when empty results / result set when not empty
-     */
-    public function storeResult($link)
-    {
-        return mysqli_store_result($link);
-    }
-
-    /**
-     * Returns a string representing the type of connection used
-     *
-     * @param resource $link mysql link
-     *
-     * @return string type of connection used
-     */
-    public function getHostInfo($link)
-    {
-        return mysqli_get_host_info($link);
-    }
-
-    /**
-     * Returns the version of the MySQL protocol used
-     *
-     * @param resource $link mysql link
-     *
-     * @return integer version of the MySQL protocol used
-     */
-    public function getProtoInfo($link)
-    {
-        return mysqli_get_proto_info($link);
-    }
-
-    /**
-     * returns a string that represents the client library version
-     *
-     * @return string MySQL client library version
-     */
-    public function getClientInfo()
-    {
-        return mysqli_get_client_info();
-    }
-
-    /**
-     * returns last error message or false if no errors occurred
-     *
-     * @param resource $link mysql link
-     *
-     * @return string|bool $error or false
-     */
-    public function getError($link)
-    {
-        $GLOBALS['errno'] = 0;
-
-        if (null !== $link && false !== $link) {
-            $error_number = mysqli_errno($link);
-            $error_message = mysqli_error($link);
-        } else {
-            $error_number = mysqli_connect_errno();
-            $error_message = mysqli_connect_error();
-        }
-        if (0 == $error_number) {
-            return false;
-        }
-
-        // keep the error number for further check after
-        // the call to getError()
-        $GLOBALS['errno'] = $error_number;
-
-        return $GLOBALS['dbi']->formatError($error_number, $error_message);
-    }
-
-    /**
-     * returns the number of rows returned by last query
-     *
-     * @param mysqli_result $result result set identifier
-     *
-     * @return string|int
-     */
-    public function numRows($result)
-    {
-        // see the note for tryQuery();
-        if (is_bool($result)) {
-            return 0;
-        }
-
-        return @mysqli_num_rows($result);
-    }
-
-    /**
-     * returns the number of rows affected by last query
-     *
-     * @param mysqli $link the mysqli object
-     *
-     * @return int
-     */
-    public function affectedRows($link)
-    {
-        return mysqli_affected_rows($link);
-    }
-
-    /**
-     * returns metainfo for fields in $result
-     *
-     * @param mysqli_result $result result set identifier
-     *
-     * @return array meta info for fields in $result
-     */
-    public function getFieldsMeta($result)
-    {
-        // Build an associative array for a type look up
-        $typeAr = array();
-        $typeAr[MYSQLI_TYPE_DECIMAL]     = 'real';
-        $typeAr[MYSQLI_TYPE_NEWDECIMAL]  = 'real';
-        $typeAr[MYSQLI_TYPE_BIT]         = 'int';
-        $typeAr[MYSQLI_TYPE_TINY]        = 'int';
-        $typeAr[MYSQLI_TYPE_SHORT]       = 'int';
-        $typeAr[MYSQLI_TYPE_LONG]        = 'int';
-        $typeAr[MYSQLI_TYPE_FLOAT]       = 'real';
-        $typeAr[MYSQLI_TYPE_DOUBLE]      = 'real';
-        $typeAr[MYSQLI_TYPE_NULL]        = 'null';
-        $typeAr[MYSQLI_TYPE_TIMESTAMP]   = 'timestamp';
-        $typeAr[MYSQLI_TYPE_LONGLONG]    = 'int';
-        $typeAr[MYSQLI_TYPE_INT24]       = 'int';
-        $typeAr[MYSQLI_TYPE_DATE]        = 'date';
-        $typeAr[MYSQLI_TYPE_TIME]        = 'time';
-        $typeAr[MYSQLI_TYPE_DATETIME]    = 'datetime';
-        $typeAr[MYSQLI_TYPE_YEAR]        = 'year';
-        $typeAr[MYSQLI_TYPE_NEWDATE]     = 'date';
-        $typeAr[MYSQLI_TYPE_ENUM]        = 'unknown';
-        $typeAr[MYSQLI_TYPE_SET]         = 'unknown';
-        $typeAr[MYSQLI_TYPE_TINY_BLOB]   = 'blob';
-        $typeAr[MYSQLI_TYPE_MEDIUM_BLOB] = 'blob';
-        $typeAr[MYSQLI_TYPE_LONG_BLOB]   = 'blob';
-        $typeAr[MYSQLI_TYPE_BLOB]        = 'blob';
-        $typeAr[MYSQLI_TYPE_VAR_STRING]  = 'string';
-        $typeAr[MYSQLI_TYPE_STRING]      = 'string';
-        // MySQL returns MYSQLI_TYPE_STRING for CHAR
-        // and MYSQLI_TYPE_CHAR === MYSQLI_TYPE_TINY
-        // so this would override TINYINT and mark all TINYINT as string
-        // https://sourceforge.net/p/phpmyadmin/bugs/2205/
-        //$typeAr[MYSQLI_TYPE_CHAR]        = 'string';
-        $typeAr[MYSQLI_TYPE_GEOMETRY]    = 'geometry';
-        $typeAr[MYSQLI_TYPE_BIT]         = 'bit';
-        $typeAr[MYSQLI_TYPE_JSON]        = 'json';
-
-        $fields = mysqli_fetch_fields($result);
-
-        // this happens sometimes (seen under MySQL 4.0.25)
-        if (!is_array($fields)) {
-            return false;
-        }
-
-        foreach ($fields as $k => $field) {
-            $fields[$k]->_type = $field->type;
-            $fields[$k]->type = $typeAr[$field->type];
-            $fields[$k]->_flags = $field->flags;
-            $fields[$k]->flags = $this->fieldFlags($result, $k);
-
-            // Enhance the field objects for mysql-extension compatibility
-            //$flags = explode(' ', $fields[$k]->flags);
-            //array_unshift($flags, 'dummy');
-            $fields[$k]->multiple_key
-                = (int) (bool) ($fields[$k]->_flags & MYSQLI_MULTIPLE_KEY_FLAG);
-            $fields[$k]->primary_key
-                = (int) (bool) ($fields[$k]->_flags & MYSQLI_PRI_KEY_FLAG);
-            $fields[$k]->unique_key
-                = (int) (bool) ($fields[$k]->_flags & MYSQLI_UNIQUE_KEY_FLAG);
-            $fields[$k]->not_null
-                = (int) (bool) ($fields[$k]->_flags & MYSQLI_NOT_NULL_FLAG);
-            $fields[$k]->unsigned
-                = (int) (bool) ($fields[$k]->_flags & MYSQLI_UNSIGNED_FLAG);
-            $fields[$k]->zerofill
-                = (int) (bool) ($fields[$k]->_flags & MYSQLI_ZEROFILL_FLAG);
-            $fields[$k]->numeric
-                = (int) (bool) ($fields[$k]->_flags & MYSQLI_NUM_FLAG);
-            $fields[$k]->blob
-                = (int) (bool) ($fields[$k]->_flags & MYSQLI_BLOB_FLAG);
-        }
-        return $fields;
-    }
-
-    /**
-     * return number of fields in given $result
-     *
-     * @param mysqli_result $result result set identifier
-     *
-     * @return int field count
-     */
-    public function numFields($result)
-    {
-        return mysqli_num_fields($result);
-    }
-
-    /**
-     * returns the length of the given field $i in $result
-     *
-     * @param mysqli_result $result result set identifier
-     * @param int           $i      field
-     *
-     * @return int length of field
-     */
-    public function fieldLen($result, $i)
-    {
-        return mysqli_fetch_field_direct($result, $i)->length;
-    }
-
-    /**
-     * returns name of $i. field in $result
-     *
-     * @param mysqli_result $result result set identifier
-     * @param int           $i      field
-     *
-     * @return string name of $i. field in $result
-     */
-    public function fieldName($result, $i)
-    {
-        return mysqli_fetch_field_direct($result, $i)->name;
-    }
-
-    /**
-     * returns concatenated string of human readable field flags
-     *
-     * @param mysqli_result $result result set identifier
-     * @param int           $i      field
-     *
-     * @return string field flags
-     */
-    public function fieldFlags($result, $i)
-    {
-        $f = mysqli_fetch_field_direct($result, $i);
-        $type = $f->type;
-        $charsetnr = $f->charsetnr;
-        $f = $f->flags;
-        $flags = array();
-        foreach ($GLOBALS['pma_mysqli_flag_names'] as $flag => $name) {
-            if ($f & $flag) {
-                $flags[] = $name;
-            }
-        }
-        // See https://dev.mysql.com/doc/refman/6.0/en/c-api-datatypes.html:
-        // to determine if a string is binary, we should not use MYSQLI_BINARY_FLAG
-        // but instead the charsetnr member of the MYSQL_FIELD
-        // structure. Watch out: some types like DATE returns 63 in charsetnr
-        // so we have to check also the type.
-        // Unfortunately there is no equivalent in the mysql extension.
-        if (($type == MYSQLI_TYPE_TINY_BLOB || $type == MYSQLI_TYPE_BLOB
-            || $type == MYSQLI_TYPE_MEDIUM_BLOB || $type == MYSQLI_TYPE_LONG_BLOB
-            || $type == MYSQLI_TYPE_VAR_STRING || $type == MYSQLI_TYPE_STRING)
-            && 63 == $charsetnr
-        ) {
-            $flags[] = 'binary';
-        }
-        return implode(' ', $flags);
-    }
-
-    /**
-     * returns properly escaped string for use in MySQL queries
-     *
-     * @param mixed  $link database link
-     * @param string $str  string to be escaped
-     *
-     * @return string a MySQL escaped string
-     */
-    public function escapeString($link, $str)
-    {
-        return mysqli_real_escape_string($link, $str);
-    }
-}
diff --git a/#pma/libraries/di/AliasItem.php b/#pma/libraries/di/AliasItem.php
deleted file mode 100644
index 9dd93be1..00000000
--- a/#pma/libraries/di/AliasItem.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Holds the PMA\libraries\di\AliasItem class
- *
- * @package PMA
- */
-namespace PMA\libraries\di;
-
-/**
- * Class AliasItem
- *
- * @package PMA\libraries\di
- */
-class AliasItem implements Item
-{
-
-    /** @var Container */
-    protected $container;
-
-    /** @var string */
-    protected $target;
-
-    /**
-     * Constructor
-     *
-     * @param Container $container Container
-     * @param string    $target    Target
-     */
-    public function __construct(Container $container, $target)
-    {
-        $this->container = $container;
-        $this->target = $target;
-    }
-
-    /**
-     * Get the target item
-     *
-     * @param array $params Parameters
-     * @return mixed
-     */
-    public function get($params = array())
-    {
-        return $this->container->get($this->target, $params);
-    }
-}
diff --git a/#pma/libraries/di/Container.php b/#pma/libraries/di/Container.php
deleted file mode 100644
index ff2bab83..00000000
--- a/#pma/libraries/di/Container.php
+++ /dev/null
@@ -1,167 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Holds the PMA\libraries\di\Container class
- *
- * @package PMA
- */
-namespace PMA\libraries\di;
-
-/**
- * Class Container
- *
- * @package PMA\libraries\di
- */
-class Container
-{
-
-    /**
-     * @var Item[] $content
-     */
-    protected $content = array();
-
-    /**
-     * @var Container
-     */
-    protected static $defaultContainer;
-
-    /**
-     * Create a dependency injection container
-     *
-     * @param Container $base Container
-     */
-    public function __construct(Container $base = null)
-    {
-        if (isset($base)) {
-            $this->content = $base->content;
-        } else {
-            $this->alias('container', 'Container');
-        }
-        $this->set('Container', $this);
-    }
-
-    /**
-     * Get an object with given name and parameters
-     *
-     * @param string $name   Name
-     * @param array  $params Paramters
-     *
-     * @return mixed
-     */
-    public function get($name, $params = array())
-    {
-        if (isset($this->content[$name])) {
-            return $this->content[$name]->get($params);
-        }
-
-        if (isset($GLOBALS[$name])) {
-            return $GLOBALS[$name];
-        }
-
-        return null;
-    }
-
-    /**
-     * Remove an object from container
-     *
-     * @param string $name Name
-     *
-     * @return void
-     */
-    public function remove($name)
-    {
-        unset($this->content[$name]);
-    }
-
-    /**
-     * Rename an object in container
-     *
-     * @param string $name    Name
-     * @param string $newName New name
-     *
-     * @return void
-     */
-    public function rename($name, $newName)
-    {
-        $this->content[$newName] = $this->content[$name];
-        $this->remove($name);
-    }
-
-    /**
-     * Set values in the container
-     *
-     * @param string|array $name  Name
-     * @param mixed        $value Value
-     *
-     * @return void
-     */
-    public function set($name, $value = null)
-    {
-        if (is_array($name)) {
-            foreach ($name as $key => $val) {
-                $this->set($key, $val);
-            }
-            return;
-        }
-        $this->content[$name] = new ValueItem($value);
-    }
-
-    /**
-     * Register a service in the container
-     *
-     * @param string $name    Name
-     * @param mixed  $service Service
-     *
-     * @return void
-     */
-    public function service($name, $service = null)
-    {
-        if (!isset($service)) {
-            $service = $name;
-        }
-        $this->content[$name] = new ServiceItem($this, $service);
-    }
-
-    /**
-     * Register a factory in the container
-     *
-     * @param string $name    Name
-     * @param mixed  $factory Factory
-     *
-     * @return void
-     */
-    public function factory($name, $factory = null)
-    {
-        if (!isset($factory)) {
-            $factory = $name;
-        }
-        $this->content[$name] = new FactoryItem($this, $factory);
-    }
-
-    /**
-     * Register an alias in the container
-     *
-     * @param string $name   Name
-     * @param string $target Target
-     *
-     * @return void
-     */
-    public function alias($name, $target)
-    {
-        // The target may be not defined yet
-        $this->content[$name] = new AliasItem($this, $target);
-    }
-
-    /**
-     * Get the global default container
-     *
-     * @return Container
-     */
-    public static function getDefaultContainer()
-    {
-        if (!isset(static::$defaultContainer)) {
-            static::$defaultContainer = new Container();
-        }
-        return static::$defaultContainer;
-    }
-}
diff --git a/#pma/libraries/di/FactoryItem.php b/#pma/libraries/di/FactoryItem.php
deleted file mode 100644
index b79ab294..00000000
--- a/#pma/libraries/di/FactoryItem.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Holds the PMA\libraries\di\FactoryItem class
- *
- * @package PMA
- */
-namespace PMA\libraries\di;
-
-/**
- * Factory manager
- *
- * @package PMA\libraries\di
- */
-class FactoryItem extends ReflectorItem
-{
-
-    /**
-     * Construct an instance
-     *
-     * @param array $params Parameters
-     *
-     * @return mixed
-     */
-    public function get($params = array())
-    {
-        return $this->invoke($params);
-    }
-}
diff --git a/#pma/libraries/di/Item.php b/#pma/libraries/di/Item.php
deleted file mode 100644
index 4958ddd3..00000000
--- a/#pma/libraries/di/Item.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Holds the PMA\libraries\di\Item class
- *
- * @package PMA
- */
-namespace PMA\libraries\di;
-
-/**
- * Interface Item
- *
- * @package PMA\libraries\di
- */
-interface Item
-{
-
-    /**
-     * Get a value from the item
-     *
-     * @param array $params Parameters
-     * @return mixed
-     */
-    public function get($params = array());
-}
diff --git a/#pma/libraries/di/ReflectorItem.php b/#pma/libraries/di/ReflectorItem.php
deleted file mode 100644
index eb73b5d9..00000000
--- a/#pma/libraries/di/ReflectorItem.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Holds the PMA\libraries\di\ReflectorItem class
- *
- * @package PMA
- */
-namespace PMA\libraries\di;
-
-/**
- * Reflector manager
- *
- * @package PMA\libraries\di
- */
-abstract class ReflectorItem implements Item
-{
-
-    /** @var Container */
-    private $_container;
-
-    /** @var \Reflector */
-    private $_reflector;
-
-    /**
-     * Constructor
-     *
-     * @param Container $container  Container
-     * @param mixed     $definition Definition
-     */
-    public function __construct(Container $container, $definition)
-    {
-        $this->_container = $container;
-        $this->_reflector = self::_resolveReflector($definition);
-    }
-
-    /**
-     * Invoke the reflector with given parameters
-     *
-     * @param array $params Parameters
-     * @return mixed
-     */
-    protected function invoke($params = array())
-    {
-        $args = array();
-        $reflector = $this->_reflector;
-        if ($reflector instanceof \ReflectionClass) {
-            $constructor = $reflector->getConstructor();
-            if (isset($constructor)) {
-                $args = $this->_resolveArgs(
-                    $constructor->getParameters(),
-                    $params
-                );
-            }
-            return $reflector->newInstanceArgs($args);
-        }
-        /** @var \ReflectionFunctionAbstract $reflector */
-        $args = $this->_resolveArgs(
-            $reflector->getParameters(),
-            $params
-        );
-        if ($reflector instanceof \ReflectionMethod) {
-            /** @var \ReflectionMethod $reflector */
-            return $reflector->invokeArgs(null, $args);
-        }
-        /** @var \ReflectionFunction $reflector */
-        return $reflector->invokeArgs($args);
-    }
-
-    /**
-     * Getting required arguments with given parameters
-     *
-     * @param \ReflectionParameter[] $required Arguments
-     * @param array                  $params   Parameters
-     *
-*@return array
-     */
-    private function _resolveArgs($required, $params = array())
-    {
-        $args = array();
-        foreach ($required as $param) {
-            $name = $param->getName();
-            $type = $param->getClass();
-            if (isset($type)) {
-                $type = $type->getName();
-            }
-            if (isset($params[$name])) {
-                $args[] = $params[$name];
-            } elseif (is_string($type) && isset($params[$type])) {
-                $args[] = $params[$type];
-            } else {
-                $content = $this->_container->get($name);
-                if (isset($content)) {
-                    $args[] = $content;
-                } elseif (is_string($type)) {
-                    $args[] = $this->_container->get($type);
-                } else {
-                    $args[] = null;
-                }
-            }
-        }
-        return $args;
-    }
-
-    /**
-     * Resolve the reflection
-     *
-     * @param mixed $definition Definition
-     *
-     * @return \Reflector
-     */
-    private static function _resolveReflector($definition)
-    {
-        if (function_exists($definition)) {
-            return new \ReflectionFunction($definition);
-        }
-        if (is_string($definition)) {
-            $definition = explode('::', $definition);
-        }
-        if (!isset($definition[1])) {
-            return new \ReflectionClass($definition[0]);
-        }
-        return new \ReflectionMethod($definition[0], $definition[1]);
-    }
-}
diff --git a/#pma/libraries/di/ServiceItem.php b/#pma/libraries/di/ServiceItem.php
deleted file mode 100644
index e834dd6b..00000000
--- a/#pma/libraries/di/ServiceItem.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Holds the PMA\libraries\di\ServiceItem class
- *
- * @package PMA
- */
-namespace PMA\libraries\di;
-
-/**
- * Service manager
- *
- * @package PMA\libraries\di
- */
-class ServiceItem extends ReflectorItem
-{
-
-    /** @var mixed */
-    protected $instance;
-
-    /**
-     * Get the instance of the service
-     *
-     * @param array $params Parameters
-     * @return mixed
-     */
-    public function get($params = array())
-    {
-        if (!isset($this->instance)) {
-            $this->instance = $this->invoke();
-        }
-        return $this->instance;
-    }
-}
diff --git a/#pma/libraries/di/ValueItem.php b/#pma/libraries/di/ValueItem.php
deleted file mode 100644
index e0f1402b..00000000
--- a/#pma/libraries/di/ValueItem.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Holds the PMA\libraries\di\ValueItem class
- *
- * @package PMA
- */
-namespace PMA\libraries\di;
-
-/**
- * Value manager
- *
- * @package PMA\libraries\di
- */
-class ValueItem implements Item
-{
-
-    /** @var mixed */
-    protected $value;
-
-    /**
-     * Constructor
-     *
-     * @param mixed $value Value
-     */
-    public function __construct($value)
-    {
-        $this->value = $value;
-    }
-
-    /**
-     * Get the value
-     *
-     * @param array $params Parameters
-     * @return mixed
-     */
-    public function get($params = array())
-    {
-        return $this->value;
-    }
-}
diff --git a/#pma/libraries/display_change_password.lib.php b/#pma/libraries/display_change_password.lib.php
deleted file mode 100644
index d72009bc..00000000
--- a/#pma/libraries/display_change_password.lib.php
+++ /dev/null
@@ -1,151 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Displays form for password change
- *
- * @package PhpMyAdmin
- */
-use PMA\libraries\Message;
-
-/**
-  * Get HTML for the Change password dialog
-  *
-  * @param string $mode     where is the function being called?
-  *                         values : 'change_pw' or 'edit_other'
-  * @param string $username username
-  * @param string $hostname hostname
-  *
-  * @return string html snippet
-  */
-function PMA_getHtmlForChangePassword($mode, $username, $hostname)
-{
-    /**
-     * autocomplete feature of IE kills the "onchange" event handler and it
-     * must be replaced by the "onpropertychange" one in this case
-     */
-    $chg_evt_handler = (PMA_USR_BROWSER_AGENT == 'IE'
-        && PMA_USR_BROWSER_VER >= 5
-        && PMA_USR_BROWSER_VER < 7)
-                 ? 'onpropertychange'
-                 : 'onchange';
-
-    $is_privileges = basename($_SERVER['SCRIPT_NAME']) === 'server_privileges.php';
-
-    $html = '<form method="post" id="change_password_form" '
-        . 'action="' . basename($GLOBALS['PMA_PHP_SELF']) . '" '
-        . 'name="chgPassword" '
-        . 'class="' . ($is_privileges ? 'submenu-item' : '') . '">';
-
-    $html .= PMA_URL_getHiddenInputs();
-
-    if (strpos($GLOBALS['PMA_PHP_SELF'], 'server_privileges') !== false) {
-        $html .= '<input type="hidden" name="username" '
-            . 'value="' . htmlspecialchars($username) . '" />'
-            . '<input type="hidden" name="hostname" '
-            . 'value="' . htmlspecialchars($hostname) . '" />';
-    }
-    $html .= '<fieldset id="fieldset_change_password">'
-        . '<legend'
-        . ($is_privileges
-            ? ' data-submenu-label="' . __('Change password') . '"'
-            : ''
-        )
-        . '>' . __('Change password') . '</legend>'
-        . '<table class="data noclick">'
-        . '<tr class="odd">'
-        . '<td colspan="2">'
-        . '<input type="radio" name="nopass" value="1" id="nopass_1" '
-        . 'onclick="pma_pw.value = \'\'; pma_pw2.value = \'\'; '
-        . 'this.checked = true" />'
-        . '<label for="nopass_1">' . __('No Password') . '</label>'
-        . '</td>'
-        . '</tr>'
-        . '<tr class="even vmiddle">'
-        . '<td>'
-        . '<input type="radio" name="nopass" value="0" id="nopass_0" '
-        . 'onclick="document.getElementById(\'text_pma_pw\').focus();" '
-        . 'checked="checked" />'
-        . '<label for="nopass_0">' . __('Password:') . '&nbsp;</label>'
-        . '</td>'
-        . '<td>'
-        . '<input type="password" name="pma_pw" id="text_pma_pw" size="10" '
-        . 'class="textfield"'
-        . $chg_evt_handler . '="nopass[1].checked = true" />'
-        . '&nbsp;&nbsp;' . __('Re-type:') . '&nbsp;'
-        . '<input type="password" name="pma_pw2" id="text_pma_pw2" size="10" '
-        . 'class="textfield"'
-        . $chg_evt_handler . '="nopass[1].checked = true" />'
-        . '</td>'
-        . '</tr>';
-
-    $serverType = PMA\libraries\Util::getServerType();
-    $orig_auth_plugin = PMA_getCurrentAuthenticationPlugin(
-        'change',
-        $username,
-        $hostname
-    );
-    $is_superuser = $GLOBALS['dbi']->isSuperuser();
-
-    if (($serverType == 'MySQL'
-        && PMA_MYSQL_INT_VERSION >= 50507)
-        || ($serverType == 'MariaDB'
-        && PMA_MYSQL_INT_VERSION >= 50200)
-    ) {
-        // Provide this option only for 5.7.6+
-        // OR for privileged users in 5.5.7+
-        if (($serverType == 'MySQL'
-            && PMA_MYSQL_INT_VERSION >= 50706)
-            || ($is_superuser && $mode == 'edit_other')
-        ) {
-            $auth_plugin_dropdown = PMA_getHtmlForAuthPluginsDropdown(
-                $orig_auth_plugin, 'change_pw', 'new'
-            );
-
-            $html .= '<tr class="vmiddle">'
-                . '<td>' . __('Password Hashing:') . '</td><td>';
-            $html .= $auth_plugin_dropdown;
-            $html .= '</td></tr>'
-                . '<tr id="tr_element_before_generate_password"></tr>'
-                . '</table>';
-
-            $html .= '<div '
-                . ($orig_auth_plugin != 'sha256_password'
-                    ? 'style="display:none"'
-                    : '')
-                . ' id="ssl_reqd_warning_cp">'
-                . Message::notice(
-                    __(
-                        'This method requires using an \'<i>SSL connection</i>\' '
-                        . 'or an \'<i>unencrypted connection that encrypts the '
-                        . 'password using RSA</i>\'; while connecting to the server.'
-                    )
-                    . PMA\libraries\Util::showMySQLDocu(
-                        'sha256-authentication-plugin'
-                    )
-                )
-                    ->getDisplay()
-                . '</div>';
-        } else {
-            $html .= '<tr id="tr_element_before_generate_password"></tr>'
-                . '</table>';
-        }
-    } else {
-        $auth_plugin_dropdown = PMA_getHtmlForAuthPluginsDropdown(
-            $orig_auth_plugin, 'change_pw', 'old'
-        );
-
-        $html .= '<tr class="vmiddle">'
-            . '<td>' . __('Password Hashing:') . '</td><td>';
-        $html .= $auth_plugin_dropdown . '</td></tr>'
-            . '<tr id="tr_element_before_generate_password"></tr>'
-            . '</table>';
-    }
-
-    $html .= '</fieldset>'
-        . '<fieldset id="fieldset_change_password_footer" class="tblFooters">'
-        . '<input type="hidden" name="change_pw" value="1" />'
-        . '<input type="submit" value="' . __('Go') . '" />'
-        . '</fieldset>'
-        . '</form>';
-    return $html;
-}
diff --git a/#pma/libraries/display_create_table.lib.php b/#pma/libraries/display_create_table.lib.php
deleted file mode 100644
index d2b59617..00000000
--- a/#pma/libraries/display_create_table.lib.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Displays form for creating a table (if user has privileges for that)
- *
- * for MySQL >= 4.1.0, we should be able to detect if user has a CREATE
- * privilege by looking at SHOW GRANTS output;
- * for < 4.1.0, it could be more difficult because the logic tries to
- * detect the current host and it might be expressed in many ways; also
- * on a shared server, the user might be unable to define a controluser
- * that has the proper rights to the "mysql" db;
- * so we give up and assume that user has the right to create a table
- *
- * Note: in this case we could even skip the following "foreach" logic
- *
- * Addendum, 2006-01-19: ok, I give up. We got some reports about servers
- * where the hostname field in mysql.user is not the same as the one
- * in mysql.db for a user. In this case, SHOW GRANTS does not return
- * the db-specific privileges. And probably, those users are on a shared
- * server, so can't set up a control user with rights to the "mysql" db.
- * We cannot reliably detect the db-specific privileges, so no more
- * warnings about the lack of privileges for CREATE TABLE. Tested
- * on MySQL 5.0.18.
- *
- * @package PhpMyAdmin
- */
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
-/**
- *
- */
-require_once './libraries/check_user_privileges.lib.php';
-
-/**
- * Returns the html for create table.
- *
- * @param string $db database name
- *
- * @return string
- */
-function PMA_getHtmlForCreateTable($db)
-{
-    return PMA\libraries\Template::get('database/create_table')->render(
-        array('db' => $db)
-    );
-}
diff --git a/#pma/libraries/display_export.lib.php b/#pma/libraries/display_export.lib.php
deleted file mode 100644
index d0b55cc5..00000000
--- a/#pma/libraries/display_export.lib.php
+++ /dev/null
@@ -1,1181 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-
-/**
- * functions for displaying server, database and table export
- *
- * @package PhpMyAdmin
- */
-use PMA\libraries\Message;
-use PMA\libraries\plugins\ExportPlugin;
-use PMA\libraries\Table;
-
-/**
- * Outputs appropriate checked statement for checkbox.
- *
- * @param string $str option name
- *
- * @return string
- */
-function PMA_exportCheckboxCheck($str)
-{
-    if (isset($GLOBALS['cfg']['Export'][$str]) && $GLOBALS['cfg']['Export'][$str]) {
-        return ' checked="checked"';
-    }
-
-    return null;
-}
-
-/**
- * Prints Html For Export Selection Options
- *
- * @param String $tmp_select Tmp selected method of export
- *
- * @return string
- */
-function PMA_getHtmlForExportSelectOptions($tmp_select = '')
-{
-    $multi_values  = '<div>';
-    $multi_values .= '<a href="#"';
-    $multi_values .= ' onclick="setSelectOptions'
-        . '(\'dump\', \'db_select[]\', true); return false;">';
-    $multi_values .= __('Select all');
-    $multi_values .= '</a>';
-    $multi_values .= ' / ';
-    $multi_values .= '<a href="#"';
-    $multi_values .= ' onclick="setSelectOptions'
-        . '(\'dump\', \'db_select[]\', false); return false;">';
-    $multi_values .= __('Unselect all') . '</a><br />';
-
-    $multi_values .= '<select name="db_select[]" '
-        . 'id="db_select" size="10" multiple="multiple">';
-    $multi_values .= "\n";
-
-    // Check if the selected databases are defined in $_GET
-    // (from clicking Back button on export.php)
-    if (isset($_GET['db_select'])) {
-        $_GET['db_select'] = urldecode($_GET['db_select']);
-        $_GET['db_select'] = explode(",", $_GET['db_select']);
-    }
-
-    foreach ($GLOBALS['dblist']->databases as $current_db) {
-        if ($GLOBALS['dbi']->isSystemSchema($current_db, true)) {
-            continue;
-        }
-        if (isset($_GET['db_select'])) {
-            if (in_array($current_db, $_GET['db_select'])) {
-                $is_selected = ' selected="selected"';
-            } else {
-                $is_selected = '';
-            }
-        } elseif (!empty($tmp_select)) {
-            if (mb_strpos(
-                ' ' . $tmp_select,
-                '|' . $current_db . '|'
-            )) {
-                $is_selected = ' selected="selected"';
-            } else {
-                $is_selected = '';
-            }
-        } else {
-            $is_selected = ' selected="selected"';
-        }
-        $current_db   = htmlspecialchars($current_db);
-        $multi_values .= '                <option value="' . $current_db . '"'
-            . $is_selected . '>' . $current_db . '</option>' . "\n";
-    } // end while
-    $multi_values .= "\n";
-    $multi_values .= '</select></div>';
-
-    return $multi_values;
-}
-
-/**
- * Prints Html For Export Hidden Input
- *
- * @param String $export_type  Selected Export Type
- * @param String $db           Selected DB
- * @param String $table        Selected Table
- * @param String $single_table Single Table
- * @param String $sql_query    Sql Query
- *
- * @return string
- */
-function PMA_getHtmlForHiddenInput(
-    $export_type, $db, $table, $single_table, $sql_query
-) {
-    global $cfg;
-    $html = "";
-    if ($export_type == 'server') {
-        $html .= PMA_URL_getHiddenInputs('', '', 1);
-    } elseif ($export_type == 'database') {
-        $html .= PMA_URL_getHiddenInputs($db, '', 1);
-    } else {
-        $html .= PMA_URL_getHiddenInputs($db, $table, 1);
-    }
-
-    // just to keep this value for possible next display of this form after saving
-    // on server
-    if (!empty($single_table)) {
-        $html .= '<input type="hidden" name="single_table" value="TRUE" />'
-            . "\n";
-    }
-
-    $html .= '<input type="hidden" name="export_type" value="'
-        . $export_type . '" />';
-    $html .= "\n";
-
-    // If the export method was not set, the default is quick
-    if (isset($_GET['export_method'])) {
-        $cfg['Export']['method'] = $_GET['export_method'];
-    } elseif (! isset($cfg['Export']['method'])) {
-        $cfg['Export']['method'] = 'quick';
-    }
-    // The export method (quick, custom or custom-no-form)
-    $html .= '<input type="hidden" name="export_method" value="'
-        . htmlspecialchars($cfg['Export']['method']) . '" />';
-
-    if (! empty($sql_query)) {
-        $html .= '<input type="hidden" name="sql_query" value="'
-            . htmlspecialchars($sql_query) . '" />' . "\n";
-    } elseif (isset($_GET['sql_query'])) {
-        $html .= '<input type="hidden" name="sql_query" value="'
-            . htmlspecialchars($_GET['sql_query']) . '" />' . "\n";
-    }
-
-    $html .= '<input type="hidden" name="template_id"' . ' value="'
-        . (isset($_GET['template_id'])
-            ?  htmlspecialchars($_GET['template_id'])
-            : '')
-        . '" />';
-
-    return $html;
-}
-
-/**
- * Prints Html For Export Options Header
- *
- * @param String $export_type Selected Export Type
- * @param String $db          Selected DB
- * @param String $table       Selected Table
- *
- * @return string
- */
-function PMA_getHtmlForExportOptionHeader($export_type, $db, $table)
-{
-    $html  = '<div class="exportoptions" id="header">';
-    $html .= '<h2>';
-    $html .= PMA\libraries\Util::getImage('b_export.png', __('Export'));
-    if ($export_type == 'server') {
-        $html .= __('Exporting databases from the current server');
-    } elseif ($export_type == 'database') {
-        $html .= sprintf(
-            __('Exporting tables from "%s" database'),
-            htmlspecialchars($db)
-        );
-    } else {
-        $html .= sprintf(
-            __('Exporting rows from "%s" table'),
-            htmlspecialchars($table)
-        );
-    }
-    $html .= '</h2>';
-    $html .= '</div>';
-
-    return $html;
-}
-
-/**
- * Returns HTML for export template operations
- *
- * @param string $export_type export type - server, database, or table
- *
- * @return string HTML for export template operations
- */
-function PMA_getHtmlForExportTemplateLoading($export_type)
-{
-    $html  = '<div class="exportoptions" id="export_templates">';
-    $html .= '<h3>' . __('Export templates:') . '</h3>';
-
-    $html .= '<div class="floatleft">';
-    $html .= '<form method="post" action="tbl_export.php" id="newTemplateForm"'
-        . ' class="ajax">';
-    $html .= '<h4>' . __('New template:') . '</h4>';
-    $html .= '<input type="text" name="templateName" id="templateName" '
-        . 'maxlength="64"' . 'required="required" '
-        . 'placeholder="' . __('Template name') . '" />';
-    $html .= '<input type="submit" name="createTemplate" id="createTemplate" '
-        . 'value="' . __('Create') . '" />';
-    $html .= '</form>';
-    $html .= '</div>';
-
-    $html .= '<div class="floatleft" style="margin-left: 50px;">';
-    $html .= '<form method="post" action="tbl_export.php"'
-        . ' id="existingTemplatesForm" class="ajax">';
-    $html .= '<h4>' . __('Existing templates:') . '</h4>';
-    $html .= '<label for="template">' . __('Template:') . '</label>';
-    $html .= '<select required="required" name="template" id="template">';
-    $html .= PMA_getOptionsForExportTemplates($export_type);
-    $html .= '</select>';
-    $html .= '<input type="submit" name="updateTemplate" '
-        . 'id="updateTemplate" value="' . __('Update') . '" />';
-    $html .= '<input type="submit" name="deleteTemplate" '
-        . 'id="deleteTemplate" value="' . __('Delete') . '" />';
-    $html .= '</form>';
-    $html .= '</div>';
-
-    $html .= '<div class="clearfloat"></div>';
-
-    $html .= '</div>';
-
-    return $html;
-}
-
-/**
- * Returns HTML for the options in teplate dropdown
- *
- * @param string $export_type export type - server, database, or table
- *
- * @return string HTML for the options in teplate dropdown
- */
-function PMA_getOptionsForExportTemplates($export_type)
-{
-    $ret = '<option value="">-- ' . __('Select a template') . ' --</option>';
-
-    // Get the relation settings
-    $cfgRelation = PMA_getRelationsParam();
-
-    $query = "SELECT `id`, `template_name` FROM "
-       . PMA\libraries\Util::backquote($cfgRelation['db']) . '.'
-       . PMA\libraries\Util::backquote($cfgRelation['export_templates'])
-       . " WHERE `username` = "
-       . "'" . $GLOBALS['dbi']->escapeString($GLOBALS['cfg']['Server']['user'])
-        . "' AND `export_type` = '" . $GLOBALS['dbi']->escapeString($export_type) . "'"
-       . " ORDER BY `template_name`;";
-
-    $result = PMA_queryAsControlUser($query);
-    if (!$result) {
-        return $ret;
-    }
-
-    while ($row = $GLOBALS['dbi']->fetchAssoc($result, $GLOBALS['controllink'])) {
-        $ret .= '<option value="' . htmlspecialchars($row['id']) . '"';
-        if (!empty($_GET['template_id']) && $_GET['template_id'] == $row['id']) {
-            $ret .= ' selected="selected"';
-        }
-        $ret .= '>';
-        $ret .=  htmlspecialchars($row['template_name']) . '</option>';
-    }
-
-    return $ret;
-}
-
-/**
- * Prints Html For Export Options Method
- *
- * @return string
- */
-function PMA_getHtmlForExportOptionsMethod()
-{
-    global $cfg;
-    if (isset($_GET['quick_or_custom'])) {
-        $export_method = $_GET['quick_or_custom'];
-    } else {
-        $export_method = $cfg['Export']['method'];
-    }
-
-    if ($export_method == 'custom-no-form') {
-        return '';
-    }
-
-    $html  = '<div class="exportoptions" id="quick_or_custom">';
-    $html .= '<h3>' . __('Export method:') . '</h3>';
-    $html .= '<ul>';
-    $html .= '<li>';
-    $html .= '<input type="radio" name="quick_or_custom" value="quick" '
-        . ' id="radio_quick_export"';
-    if ($export_method == 'quick') {
-        $html .= ' checked="checked"';
-    }
-    $html .= ' />';
-    $html .= '<label for ="radio_quick_export">';
-    $html .= __('Quick - display only the minimal options');
-    $html .= '</label>';
-    $html .= '</li>';
-
-    $html .= '<li>';
-    $html .= '<input type="radio" name="quick_or_custom" value="custom" '
-        . ' id="radio_custom_export"';
-    if ($export_method == 'custom') {
-        $html .= ' checked="checked"';
-    }
-    $html .= ' />';
-    $html .= '<label for="radio_custom_export">';
-    $html .= __('Custom - display all possible options');
-    $html .= '</label>';
-    $html .= '</li>';
-
-    $html .= '</ul>';
-    $html .= '</div>';
-
-    return $html;
-}
-
-/**
- * Prints Html For Export Options Selection
- *
- * @param String $export_type  Selected Export Type
- * @param String $multi_values Export Options
- *
- * @return string
- */
-function PMA_getHtmlForExportOptionsSelection($export_type, $multi_values)
-{
-    $html = '<div class="exportoptions" id="databases_and_tables">';
-    if ($export_type == 'server') {
-        $html .= '<h3>' . __('Databases:') . '</h3>';
-    } else if ($export_type == 'database') {
-        $html .= '<h3>' . __('Tables:') . '</h3>';
-    }
-    if (! empty($multi_values)) {
-        $html .= $multi_values;
-    }
-    $html .= '</div>';
-
-    return $html;
-}
-
-/**
- * Prints Html For Export Options Format dropdown
- *
- * @param ExportPlugin[] $export_list Export List
- *
- * @return string
- */
-function PMA_getHtmlForExportOptionsFormatDropdown($export_list)
-{
-    $html  = '<div class="exportoptions" id="format">';
-    $html .= '<h3>' . __('Format:') . '</h3>';
-    $html .= PMA_pluginGetChoice('Export', 'what', $export_list, 'format');
-    $html .= '</div>';
-    return $html;
-}
-
-/**
- * Prints Html For Export Options Format-specific options
- *
- * @param ExportPlugin[] $export_list Export List
- *
- * @return string
- */
-function PMA_getHtmlForExportOptionsFormat($export_list)
-{
-    $html = '<div class="exportoptions" id="format_specific_opts">';
-    $html .= '<h3>' . __('Format-specific options:') . '</h3>';
-    $html .= '<p class="no_js_msg" id="scroll_to_options_msg">';
-    $html .= __(
-        'Scroll down to fill in the options for the selected format '
-        . 'and ignore the options for other formats.'
-    );
-    $html .= '</p>';
-    $html .= PMA_pluginGetOptions('Export', $export_list);
-    $html .= '</div>';
-
-    if (function_exists('PMA_Kanji_encodingForm')) {
-        // Encoding setting form appended by Y.Kawada
-        // Japanese encoding setting
-        $html .= '<div class="exportoptions" id="kanji_encoding">';
-        $html .= '<h3>' . __('Encoding Conversion:') . '</h3>';
-        $html .= PMA_Kanji_encodingForm();
-        $html .= '</div>';
-    }
-
-    $html .= '<div class="exportoptions" id="submit">';
-
-    $html .= PMA\libraries\Util::getExternalBug(
-        __('SQL compatibility mode'), 'mysql', '50027', '14515'
-    );
-    global $cfg;
-    if ($cfg['ExecTimeLimit'] > 0) {
-        $html .= '<input type="submit" value="' . __('Go')
-            . '" id="buttonGo" onclick="check_time_out('
-            . $cfg['ExecTimeLimit'] . ')"/>';
-    } else {
-        // if the time limit set is zero, then time out won't occur
-        // So no need to check for time out.
-        $html .= '<input type="submit" value="' . __('Go') . '" id="buttonGo" />';
-    }
-    $html .= '</div>';
-
-    return $html;
-}
-/**
- * Prints Html For Export Options Rows
- *
- * @param String $db             Selected DB
- * @param String $table          Selected Table
- * @param String $unlim_num_rows Num of Rows
- *
- * @return string
- */
-function PMA_getHtmlForExportOptionsRows($db, $table, $unlim_num_rows)
-{
-    $html  = '<div class="exportoptions" id="rows">';
-    $html .= '<h3>' . __('Rows:') . '</h3>';
-    $html .= '<ul>';
-    $html .= '<li>';
-    $html .= '<input type="radio" name="allrows" value="0" id="radio_allrows_0"';
-    if (isset($_GET['allrows']) && $_GET['allrows'] == 0) {
-        $html .= ' checked="checked"';
-    }
-    $html .= '/>';
-    $html .= '<label for ="radio_allrows_0">' . __('Dump some row(s)') . '</label>';
-    $html .= '<ul>';
-    $html .= '<li>';
-    $html .= '<label for="limit_to">' . __('Number of rows:') . '</label>';
-    $html .= '<input type="text" id="limit_to" name="limit_to" size="5" value="';
-    if (isset($_GET['limit_to'])) {
-        $html .= htmlspecialchars($_GET['limit_to']);
-    } elseif (!empty($unlim_num_rows)) {
-        $html .= $unlim_num_rows;
-    } else {
-        $_table = new Table($table, $db);
-        $html .= $_table->countRecords();
-    }
-    $html .= '" onfocus="this.select()" />';
-    $html .= '</li>';
-    $html .= '<li>';
-    $html .= '<label for="limit_from">' . __('Row to begin at:') . '</label>';
-    $html .= '<input type="text" id="limit_from" name="limit_from" value="';
-    if (isset($_GET['limit_from'])) {
-        $html .= htmlspecialchars($_GET['limit_from']);
-    } else {
-        $html .= '0';
-    }
-    $html .= '" size="5" onfocus="this.select()" />';
-    $html .= '</li>';
-    $html .= '</ul>';
-    $html .= '</li>';
-    $html .= '<li>';
-    $html .= '<input type="radio" name="allrows" value="1" id="radio_allrows_1"';
-    if (! isset($_GET['allrows']) || $_GET['allrows'] == 1) {
-        $html .= ' checked="checked"';
-    }
-    $html .= '/>';
-    $html .= ' <label for="radio_allrows_1">' . __('Dump all rows') . '</label>';
-    $html .= '</li>';
-    $html .= '</ul>';
-    $html .= '</div>';
-    return $html;
-}
-
-/**
- * Prints Html For Export Options Quick Export
- *
- * @return string
- */
-function PMA_getHtmlForExportOptionsQuickExport()
-{
-    global $cfg;
-    $html  = '<div class="exportoptions" id="output_quick_export">';
-    $html .= '<h3>' . __('Output:') . '</h3>';
-    $html .= '<ul>';
-    $html .= '<li>';
-    $html .= '<input type="checkbox" name="quick_export_onserver" value="saveit" ';
-    $html .= 'id="checkbox_quick_dump_onserver" ';
-    $html .= PMA_exportCheckboxCheck('quick_export_onserver');
-    $html .= '/>';
-    $html .= '<label for="checkbox_quick_dump_onserver">';
-    $html .= sprintf(
-        __('Save on server in the directory <b>%s</b>'),
-        htmlspecialchars(PMA\libraries\Util::userDir($cfg['SaveDir']))
-    );
-    $html .= '</label>';
-    $html .= '</li>';
-    $html .= '<li>';
-    $html .= '<input type="checkbox" name="quick_export_onserver_overwrite" ';
-    $html .= 'value="saveitover" id="checkbox_quick_dump_onserver_overwrite" ';
-    $html .= PMA_exportCheckboxCheck('quick_export_onserver_overwrite');
-    $html .= '/>';
-    $html .= '<label for="checkbox_quick_dump_onserver_overwrite">';
-    $html .= __('Overwrite existing file(s)');
-    $html .= '</label>';
-    $html .= '</li>';
-    $html .= '</ul>';
-    $html .= '</div>';
-
-    return $html;
-}
-
-/**
- * Prints Html For Export Options Save Dir
- *
- * @return string
- */
-function PMA_getHtmlForExportOptionsOutputSaveDir()
-{
-    global $cfg;
-    $html  = '<li>';
-    $html .= '<input type="checkbox" name="onserver" value="saveit" ';
-    $html .= 'id="checkbox_dump_onserver" ';
-    $html .= PMA_exportCheckboxCheck('onserver');
-    $html .= '/>';
-    $html .= '<label for="checkbox_dump_onserver">';
-    $html .= sprintf(
-        __('Save on server in the directory <b>%s</b>'),
-        htmlspecialchars(PMA\libraries\Util::userDir($cfg['SaveDir']))
-    );
-    $html .= '</label>';
-    $html .= '</li>';
-    $html .= '<li>';
-    $html .= '<input type="checkbox" name="onserver_overwrite" value="saveitover"';
-    $html .= ' id="checkbox_dump_onserver_overwrite" ';
-    $html .= PMA_exportCheckboxCheck('onserver_overwrite');
-    $html .= '/>';
-    $html .= '<label for="checkbox_dump_onserver_overwrite">';
-    $html .= __('Overwrite existing file(s)');
-    $html .= '</label>';
-    $html .= '</li>';
-
-    return $html;
-}
-
-
-/**
- * Prints Html For Export Options
- *
- * @param String $export_type Selected Export Type
- *
- * @return string
- */
-function PMA_getHtmlForExportOptionsOutputFormat($export_type)
-{
-    $html  = '<li>';
-    $html .= '<label for="filename_template" class="desc">';
-    $html .= __('File name template:');
-    $trans = new Message;
-    $trans->addMessage(__('@SERVER@ will become the server name'));
-    if ($export_type == 'database' || $export_type == 'table') {
-        $trans->addMessage(__(', @DATABASE@ will become the database name'));
-        if ($export_type == 'table') {
-            $trans->addMessage(__(', @TABLE@ will become the table name'));
-        }
-    }
-
-    $msg = new Message(
-        __(
-            'This value is interpreted using %1$sstrftime%2$s, '
-            . 'so you can use time formatting strings. '
-            . 'Additionally the following transformations will happen: %3$s. '
-            . 'Other text will be kept as is. See the %4$sFAQ%5$s for details.'
-        )
-    );
-    $msg->addParam(
-        '<a href="' . PMA_linkURL(PMA_getPHPDocLink('function.strftime.php'))
-        . '" target="documentation" title="' . __('Documentation') . '">',
-        false
-    );
-    $msg->addParam('</a>', false);
-    $msg->addParam($trans);
-    $doc_url = PMA\libraries\Util::getDocuLink('faq', 'faq6-27');
-    $msg->addParam(
-        '<a href="' . $doc_url . '" target="documentation">',
-        false
-    );
-    $msg->addParam('</a>', false);
-
-    $html .= PMA\libraries\Util::showHint($msg);
-    $html .= '</label>';
-    $html .= '<input type="text" name="filename_template" id="filename_template" ';
-    $html .= ' value="';
-    if (isset($_GET['filename_template'])) {
-        $html .= htmlspecialchars($_GET['filename_template']);
-    } else {
-        if ($export_type == 'database') {
-            $html .= htmlspecialchars(
-                $GLOBALS['PMA_Config']->getUserValue(
-                    'pma_db_filename_template',
-                    $GLOBALS['cfg']['Export']['file_template_database']
-                )
-            );
-        } elseif ($export_type == 'table') {
-            $html .= htmlspecialchars(
-                $GLOBALS['PMA_Config']->getUserValue(
-                    'pma_table_filename_template',
-                    $GLOBALS['cfg']['Export']['file_template_table']
-                )
-            );
-        } else {
-            $html .= htmlspecialchars(
-                $GLOBALS['PMA_Config']->getUserValue(
-                    'pma_server_filename_template',
-                    $GLOBALS['cfg']['Export']['file_template_server']
-                )
-            );
-        }
-    }
-    $html .= '"';
-    $html .= '/>';
-    $html .= '<input type="checkbox" name="remember_template" ';
-    $html .= 'id="checkbox_remember_template" ';
-    $html .= PMA_exportCheckboxCheck('remember_file_template');
-    $html .= '/>';
-    $html .= '<label for="checkbox_remember_template">';
-    $html .= __('use this for future exports');
-    $html .= '</label>';
-    $html .= '</li>';
-    return $html;
-}
-
-/**
- * Prints Html For Export Options Charset
- *
- * @return string
- */
-function PMA_getHtmlForExportOptionsOutputCharset()
-{
-    global $cfg;
-    $html = '        <li><label for="select_charset" class="desc">'
-        . __('Character set of the file:') . '</label>' . "\n";
-    $html .= '<select id="select_charset" name="charset" size="1">';
-    foreach ($cfg['AvailableCharsets'] as $temp_charset) {
-        $html .= '<option value="' . $temp_charset . '"';
-        if (isset($_GET['charset'])
-            && ($_GET['charset'] != $temp_charset)
-        ) {
-            $html .= '';
-        } elseif ((empty($cfg['Export']['charset']) && $temp_charset == 'utf-8')
-            || $temp_charset == $cfg['Export']['charset']
-        ) {
-            $html .= ' selected="selected"';
-        }
-        $html .= '>' . $temp_charset . '</option>';
-    } // end foreach
-    $html .= '</select></li>';
-
-    return $html;
-}
-
-/**
- * Prints Html For Export Options Compression
- *
- * @return string
- */
-function PMA_getHtmlForExportOptionsOutputCompression()
-{
-    global $cfg;
-    if (isset($_GET['compression'])) {
-        $selected_compression = $_GET['compression'];
-    } elseif (isset($cfg['Export']['compression'])) {
-        $selected_compression = $cfg['Export']['compression'];
-    } else {
-        $selected_compression = "none";
-    }
-
-    // Since separate files export works with ZIP only
-    if (isset($cfg['Export']['as_separate_files'])
-        && $cfg['Export']['as_separate_files']
-    ) {
-        $selected_compression = "zip";
-    }
-
-    $html = "";
-    // zip and gzip encode features
-    $is_zip  = ($cfg['ZipDump']  && @function_exists('gzcompress'));
-    $is_gzip = ($cfg['GZipDump'] && @function_exists('gzencode'));
-    if ($is_zip || $is_gzip) {
-        $html .= '<li>';
-        $html .= '<label for="compression" class="desc">'
-            . __('Compression:') . '</label>';
-        $html .= '<select id="compression" name="compression">';
-        $html .= '<option value="none">' . __('None') . '</option>';
-        if ($is_zip) {
-            $html .= '<option value="zip" ';
-            if ($selected_compression == "zip") {
-                $html .= 'selected="selected"';
-            }
-            $html .= '>' . __('zipped') . '</option>';
-        }
-        if ($is_gzip) {
-            $html .= '<option value="gzip" ';
-            if ($selected_compression == "gzip") {
-                $html .= 'selected="selected"';
-            }
-            $html .= '>' . __('gzipped') . '</option>';
-        }
-        $html .= '</select>';
-        $html .= '</li>';
-    } else {
-        $html .= '<input type="hidden" name="compression" value="'
-            . htmlspecialchars($selected_compression) . '" />';
-    }
-
-    return $html;
-}
-
-/**
- * Prints Html For Export Options Radio
- *
- * @return string
- */
-function PMA_getHtmlForExportOptionsOutputRadio()
-{
-    $html  = '<li>';
-    $html .= '<input type="radio" id="radio_view_as_text" '
-        . ' name="output_format" value="astext" ';
-    if (isset($_GET['repopulate']) || $GLOBALS['cfg']['Export']['asfile'] == false) {
-        $html .= 'checked="checked"';
-    }
-    $html .= '/>';
-    $html .= '<label for="radio_view_as_text">'
-        . __('View output as text') . '</label></li>';
-    return $html;
-}
-
-/**
- * Prints Html For Export Options Checkbox - Separate files
- *
- * @param String $export_type Selected Export Type
- *
- * @return string
- */
-function PMA_getHtmlForExportOptionsOutputSeparateFiles($export_type)
-{
-    $html  = '<li>';
-    $html .= '<input type="checkbox" id="checkbox_as_separate_files" '
-        . PMA_exportCheckboxCheck('as_separate_files')
-        . ' name="as_separate_files" value="' . $export_type . '" />';
-    $html .= '<label for="checkbox_as_separate_files">';
-
-    if ($export_type == 'server') {
-        $html .= __('Export databases as separate files');
-    } elseif ($export_type == 'database') {
-        $html .= __('Export tables as separate files');
-    }
-
-    $html .= '</label></li>';
-
-    return $html;
-}
-
-/**
- * Prints Html For Export Options
- *
- * @param String $export_type Selected Export Type
- *
- * @return string
- */
-function PMA_getHtmlForExportOptionsOutput($export_type)
-{
-    global $cfg;
-    $html  = '<div class="exportoptions" id="output">';
-    $html .= '<h3>' . __('Output:') . '</h3>';
-    $html .= '<ul id="ul_output">';
-    $html .= '<li><input type="checkbox" id="btn_alias_config" ';
-    if (isset($_SESSION['tmpval']['aliases'])
-        && !PMA_emptyRecursive($_SESSION['tmpval']['aliases'])
-    ) {
-        $html .= 'checked="checked"';
-    }
-    unset($_SESSION['tmpval']['aliases']);
-    $html .= '/>';
-    $html .= '<label for="btn_alias_config">';
-    $html .= __('Rename exported databases/tables/columns');
-    $html .= '</label></li>';
-
-    if ($export_type != 'server') {
-        $html .= '<li>';
-        $html .= '<input type="checkbox" name="lock_tables"';
-        $html .= ' value="something" id="checkbox_lock_tables"';
-        if (! isset($_GET['repopulate'])) {
-            $html .= PMA_exportCheckboxCheck('lock_tables') . '/>';
-        } elseif (isset($_GET['lock_tables'])) {
-            $html .= ' checked="checked"';
-        }
-        $html .= '<label for="checkbox_lock_tables">';
-        $html .= sprintf(__('Use %s statement'), '<code>LOCK TABLES</code>');
-        $html .= '</label></li>';
-    }
-
-    $html .= '<li>';
-    $html .= '<input type="radio" name="output_format" value="sendit" ';
-    $html .= 'id="radio_dump_asfile" ';
-    if (!isset($_GET['repopulate'])) {
-        $html .= PMA_exportCheckboxCheck('asfile');
-    }
-    $html .= '/>';
-    $html .= '<label for="radio_dump_asfile">'
-        . __('Save output to a file') . '</label>';
-    $html .= '<ul id="ul_save_asfile">';
-    if (isset($cfg['SaveDir']) && !empty($cfg['SaveDir'])) {
-        $html .= PMA_getHtmlForExportOptionsOutputSaveDir();
-    }
-
-    $html .= PMA_getHtmlForExportOptionsOutputFormat($export_type);
-
-    // charset of file
-    if ($GLOBALS['PMA_recoding_engine'] != PMA_CHARSET_NONE) {
-        $html .= PMA_getHtmlForExportOptionsOutputCharset();
-    } // end if
-
-    $html .= PMA_getHtmlForExportOptionsOutputCompression();
-
-    if ($export_type == 'server'
-        || $export_type == 'database'
-    ) {
-        $html .= PMA_getHtmlForExportOptionsOutputSeparateFiles($export_type);
-    }
-
-    $html .= '</ul>';
-    $html .= '</li>';
-
-    $html .= PMA_getHtmlForExportOptionsOutputRadio();
-
-    $html .= '</ul>';
-
-    /*
-     * @todo use sprintf() for better translatability, while keeping the
-     *       <label></label> principle (for screen readers)
-     */
-    $html .= '<label for="maxsize">'
-        . __('Skip tables larger than') . '</label>';
-    $html .= '<input type="text" id="maxsize" name="maxsize" size="4">' . __('MiB');
-
-    $html .= '</div>';
-
-    return $html;
-}
-
-/**
- * Prints Html For Export Options
- *
- * @param String         $export_type    Selected Export Type
- * @param String         $db             Selected DB
- * @param String         $table          Selected Table
- * @param String         $multi_values   Export selection
- * @param String         $num_tables     number of tables
- * @param ExportPlugin[] $export_list    Export List
- * @param String         $unlim_num_rows Number of Rows
- *
- * @return string
- */
-function PMA_getHtmlForExportOptions(
-    $export_type, $db, $table, $multi_values,
-    $num_tables, $export_list, $unlim_num_rows
-) {
-    global $cfg;
-    $html  = PMA_getHtmlForExportOptionsMethod();
-    $html .= PMA_getHtmlForExportOptionsFormatDropdown($export_list);
-    $html .= PMA_getHtmlForExportOptionsSelection($export_type, $multi_values);
-
-    $tableLength = mb_strlen($table);
-    $_table = new Table($table, $db);
-    if ($tableLength && empty($num_tables) && ! $_table->isMerge()) {
-        $html .= PMA_getHtmlForExportOptionsRows($db, $table, $unlim_num_rows);
-    }
-
-    if (isset($cfg['SaveDir']) && !empty($cfg['SaveDir'])) {
-        $html .= PMA_getHtmlForExportOptionsQuickExport();
-    }
-
-    $html .= PMA_getHtmlForAliasModalDialog($db, $table);
-    $html .= PMA_getHtmlForExportOptionsOutput($export_type);
-    $html .= PMA_getHtmlForExportOptionsFormat($export_list);
-    return $html;
-}
-
-/**
- * Prints Html For Alias Modal Dialog
- *
- * @param String $db    Selected DB
- * @param String $table Selected Table
- *
- * @return string
- */
-function PMA_getHtmlForAliasModalDialog($db = '', $table = '')
-{
-    if (isset($_SESSION['tmpval']['aliases'])) {
-        $aliases = $_SESSION['tmpval']['aliases'];
-    }
-    // In case of server export, the following list of
-    // databases are not shown in the list.
-    $dbs_not_allowed = array(
-        'information_schema',
-        'performance_schema',
-        'mysql'
-    );
-    // Fetch Columns info
-    // Server export does not have db set.
-    $title = __('Rename exported databases/tables/columns');
-    if (empty($db)) {
-        $databases = $GLOBALS['dbi']->getColumnsFull(
-            null, null, null, $GLOBALS['userlink']
-        );
-        foreach ($dbs_not_allowed as $db) {
-            unset($databases[$db]);
-        }
-        // Database export does not have table set.
-    } elseif (empty($table)) {
-        $tables = $GLOBALS['dbi']->getColumnsFull(
-            $db, null, null, $GLOBALS['userlink']
-        );
-        $databases = array($db => $tables);
-        // Table export
-    } else {
-        $columns = $GLOBALS['dbi']->getColumnsFull(
-            $db, $table, null, $GLOBALS['userlink']
-        );
-        $databases = array(
-            $db => array(
-                $table => $columns
-            )
-        );
-    }
-
-    $html = '<div id="alias_modal" class="hide" title="' . $title . '">';
-    $db_html = '<label class="col-2">' . __('Select database') . ': '
-        . '</label><select id="db_alias_select">';
-    $table_html = '<label class="col-2">' . __('Select table') . ': </label>';
-    $first_db = true;
-    $table_input_html = $db_input_html = '';
-    foreach ($databases as  $db => $tables) {
-        $val = '';
-        if (!empty($aliases[$db]['alias'])) {
-            $val = htmlspecialchars($aliases[$db]['alias']);
-        }
-        $db = htmlspecialchars($db);
-        $name_attr = 'aliases[' . $db . '][alias]';
-        $id_attr = substr(md5($name_attr), 0, 12);
-        $class = 'hide';
-        if ($first_db) {
-            $first_db = false;
-            $class = '';
-            $db_input_html = '<label class="col-2" for="' . $id_attr . '">'
-                . __('New database name') . ': </label>';
-        }
-        $db_input_html .= '<input type="text" name="' . $name_attr . '" '
-            . 'placeholder="' . $db . ' alias" class="' . $class . '" '
-            . 'id="' . $id_attr . '" value="' . $val . '" disabled="disabled"/>';
-        $db_html .= '<option value="' . $id_attr . '">' . $db . '</option>';
-        $table_html .= '<span id="' . $id_attr . '_tables" class="' . $class . '">';
-        $table_html .= '<select id="' . $id_attr . '_tables_select" '
-            . 'class="table_alias_select">';
-        $first_tbl = true;
-        $col_html = '';
-        foreach ($tables as $table => $columns) {
-            $val = '';
-            if (!empty($aliases[$db]['tables'][$table]['alias'])) {
-                $val = htmlspecialchars($aliases[$db]['tables'][$table]['alias']);
-            }
-            $table = htmlspecialchars($table);
-            $name_attr =  'aliases[' . $db . '][tables][' . $table . '][alias]';
-            $id_attr = substr(md5($name_attr), 0, 12);
-            $class = 'hide';
-            if ($first_tbl) {
-                $first_tbl = false;
-                $class = '';
-                $table_input_html = '<label class="col-2" for="' . $id_attr . '">'
-                    . __('New table name') . ': </label>';
-            }
-            $table_input_html .= '<input type="text" value="' . $val . '" '
-                . 'name="' . $name_attr . '" id="' . $id_attr . '" '
-                . 'placeholder="' . $table . ' alias" class="' . $class . '" '
-                . 'disabled="disabled"/>';
-            $table_html .= '<option value="' . $id_attr . '">'
-                . $table . '</option>';
-            $col_html .= '<table id="' . $id_attr . '_cols" class="'
-                . $class . '" width="100%">';
-            $col_html .= '<thead><tr><th>' . __('Old column name') . '</th>'
-                . '<th>' . __('New column name') . '</th></tr></thead><tbody>';
-            $class = 'odd';
-            foreach ($columns as $column => $col_def) {
-                $val = '';
-                if (!empty($aliases[$db]['tables'][$table]['columns'][$column])) {
-                    $val = htmlspecialchars(
-                        $aliases[$db]['tables'][$table]['columns'][$column]
-                    );
-                }
-                $column = htmlspecialchars($column);
-                $name_attr = 'aliases[' . $db . '][tables][' . $table
-                    . '][columns][' . $column . ']';
-                $id_attr = substr(md5($name_attr), 0, 12);
-                $col_html .= '<tr class="' . $class . '">';
-                $col_html .= '<th><label for="' . $id_attr . '">' . $column
-                    . '</label></th>';
-                $col_html .= '<td><dummy_inp type="text" name="' . $name_attr . '" '
-                    . 'id="' . $id_attr . '" placeholder="'
-                    . $column . ' alias" value="' . $val . '"></dummy_inp></td>';
-                $col_html .= '</tr>';
-                $class = $class === 'odd' ? 'even' : 'odd';
-            }
-            $col_html .= '</tbody></table>';
-        }
-        $table_html .= '</select>';
-        $table_html .= $table_input_html . '<hr/>' . $col_html . '</span>';
-    }
-    $db_html .= '</select>';
-    $html .= $db_html;
-    $html .= $db_input_html . '<hr/>';
-    $html .= $table_html;
-
-    $html .= '</div>';
-    return $html;
-}
-
-/**
- * Gets HTML to display export dialogs
- *
- * @param String $export_type    export type: server|database|table
- * @param String $db             selected DB
- * @param String $table          selected table
- * @param String $sql_query      SQL query
- * @param Int    $num_tables     number of tables
- * @param Int    $unlim_num_rows unlimited number of rows
- * @param String $multi_values   selector options
- *
- * @return string $html
- */
-function PMA_getExportDisplay(
-    $export_type, $db, $table, $sql_query, $num_tables,
-    $unlim_num_rows, $multi_values
-) {
-    $cfgRelation = PMA_getRelationsParam();
-
-    if (isset($_REQUEST['single_table'])) {
-        $GLOBALS['single_table'] = $_REQUEST['single_table'];
-    }
-
-    include_once './libraries/file_listing.lib.php';
-    include_once './libraries/plugin_interface.lib.php';
-    include_once './libraries/display_export.lib.php';
-
-    /* Scan for plugins */
-    /* @var $export_list ExportPlugin[] */
-    $export_list = PMA_getPlugins(
-        "export",
-        'libraries/plugins/export/',
-        array(
-            'export_type' => $export_type,
-            'single_table' => isset($GLOBALS['single_table'])
-        )
-    );
-
-    /* Fail if we didn't find any plugin */
-    if (empty($export_list)) {
-        Message::error(
-            __('Could not load export plugins, please check your installation!')
-        )->display();
-        exit;
-    }
-
-    $html = PMA_getHtmlForExportOptionHeader($export_type, $db, $table);
-
-    if ($cfgRelation['exporttemplateswork']) {
-        $html .= PMA_getHtmlForExportTemplateLoading($export_type);
-    }
-
-    $html .= '<form method="post" action="export.php" '
-        . ' name="dump" class="disableAjax">';
-
-    //output Hidden Inputs
-    $single_table_str = isset($GLOBALS['single_table']) ? $GLOBALS['single_table']
-        : '';
-    $html .= PMA_getHtmlForHiddenInput(
-        $export_type,
-        $db,
-        $table,
-        $single_table_str,
-        $sql_query
-    );
-
-    //output Export Options
-    $html .= PMA_getHtmlForExportOptions(
-        $export_type,
-        $db,
-        $table,
-        $multi_values,
-        $num_tables,
-        $export_list,
-        $unlim_num_rows
-    );
-
-    $html .= '</form>';
-    return $html;
-}
-
-/**
- * Handles export template actions
- *
- * @param array $cfgRelation Relation configuration
- *
- * @return void
- */
-function PMA_handleExportTemplateActions($cfgRelation)
-{
-    if (isset($_REQUEST['templateId'])) {
-        $id = $GLOBALS['dbi']->escapeString($_REQUEST['templateId']);
-    } else {
-        $id = '';
-    }
-
-    $templateTable = PMA\libraries\Util::backquote($cfgRelation['db']) . '.'
-       . PMA\libraries\Util::backquote($cfgRelation['export_templates']);
-    $user = $GLOBALS['dbi']->escapeString($GLOBALS['cfg']['Server']['user']);
-
-    switch ($_REQUEST['templateAction']) {
-    case 'create':
-        $query = "INSERT INTO " . $templateTable . "("
-            . " `username`, `export_type`,"
-            . " `template_name`, `template_data`"
-            . ") VALUES ("
-            . "'" . $user . "', "
-            . "'" . $GLOBALS['dbi']->escapeString($_REQUEST['exportType'])
-            . "', '" . $GLOBALS['dbi']->escapeString($_REQUEST['templateName'])
-            . "', '" . $GLOBALS['dbi']->escapeString($_REQUEST['templateData'])
-            . "');";
-        break;
-    case 'load':
-        $query = "SELECT `template_data` FROM " . $templateTable
-             . " WHERE `id` = " . $id  . " AND `username` = '" . $user . "'";
-        break;
-    case 'update':
-        $query = "UPDATE " . $templateTable . " SET `template_data` = "
-          . "'" . $GLOBALS['dbi']->escapeString($_REQUEST['templateData']) . "'"
-          . " WHERE `id` = " . $id  . " AND `username` = '" . $user . "'";
-        break;
-    case 'delete':
-        $query = "DELETE FROM " . $templateTable
-           . " WHERE `id` = " . $id  . " AND `username` = '" . $user . "'";
-        break;
-    default:
-        $query = '';
-        break;
-    }
-
-    $result = PMA_queryAsControlUser($query, false);
-
-    $response = PMA\libraries\Response::getInstance();
-    if (! $result) {
-        $error = $GLOBALS['dbi']->getError($GLOBALS['controllink']);
-        $response->setRequestStatus(false);
-        $response->addJSON('message', $error);
-        exit;
-    }
-
-    $response->setRequestStatus(true);
-    if ('create' == $_REQUEST['templateAction']) {
-        $response->addJSON(
-            'data',
-            PMA_getOptionsForExportTemplates($_REQUEST['exportType'])
-        );
-    } elseif ('load' == $_REQUEST['templateAction']) {
-        $data = null;
-        while ($row = $GLOBALS['dbi']->fetchAssoc(
-            $result, $GLOBALS['controllink']
-        )) {
-            $data = $row['template_data'];
-        }
-        $response->addJSON('data', $data);
-    }
-    $GLOBALS['dbi']->freeResult($result);
-}
diff --git a/#pma/libraries/display_git_revision.lib.php b/#pma/libraries/display_git_revision.lib.php
deleted file mode 100644
index 38506c88..00000000
--- a/#pma/libraries/display_git_revision.lib.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Displays form for password change
- *
- * @package PhpMyAdmin
- */
-
-/**
-* Prints details about the current Git commit revision
-*
-* @return void
-*/
-function PMA_printGitRevision()
-{
-    if (! $GLOBALS['PMA_Config']->get('PMA_VERSION_GIT')) {
-        $response = PMA\libraries\Response::getInstance();
-        $response->setRequestStatus(false);
-        return;
-    }
-
-    // load revision data from repo
-    $GLOBALS['PMA_Config']->checkGitRevision();
-
-    // if using a remote commit fast-forwarded, link to GitHub
-    $commit_hash = substr(
-        $GLOBALS['PMA_Config']->get('PMA_VERSION_GIT_COMMITHASH'),
-        0,
-        7
-    );
-    $commit_hash = '<strong title="'
-        . htmlspecialchars($GLOBALS['PMA_Config']->get('PMA_VERSION_GIT_MESSAGE'))
-        . '">' . $commit_hash . '</strong>';
-    if ($GLOBALS['PMA_Config']->get('PMA_VERSION_GIT_ISREMOTECOMMIT')) {
-        $commit_hash = '<a href="'
-            . PMA_linkURL(
-                'https://github.com/phpmyadmin/phpmyadmin/commit/'
-                . $GLOBALS['PMA_Config']->get('PMA_VERSION_GIT_COMMITHASH')
-            )
-            . '" rel="noopener noreferrer" target="_blank">' . $commit_hash . '</a>';
-    }
-
-    $branch = $GLOBALS['PMA_Config']->get('PMA_VERSION_GIT_BRANCH');
-    if ($GLOBALS['PMA_Config']->get('PMA_VERSION_GIT_ISREMOTEBRANCH')) {
-        $branch = '<a href="'
-            . PMA_linkURL(
-                'https://github.com/phpmyadmin/phpmyadmin/tree/'
-                . $GLOBALS['PMA_Config']->get('PMA_VERSION_GIT_BRANCH')
-            )
-            . '" rel="noopener noreferrer" target="_blank">' . $branch . '</a>';
-    }
-    if ($branch !== false) {
-        $branch = sprintf(__('%1$s from %2$s branch'), $commit_hash, $branch);
-    } else {
-        $branch = $commit_hash . ' (' . __('no branch') . ')';
-    }
-
-    $committer = $GLOBALS['PMA_Config']->get('PMA_VERSION_GIT_COMMITTER');
-    $author = $GLOBALS['PMA_Config']->get('PMA_VERSION_GIT_AUTHOR');
-    PMA_printListItem(
-        __('Git revision:') . ' '
-        . $branch . ',<br /> '
-        . sprintf(
-            __('committed on %1$s by %2$s'),
-            PMA\libraries\Util::localisedDate(strtotime($committer['date'])),
-            '<a href="' . PMA_linkURL(
-                'mailto:' . htmlspecialchars($committer['email'])
-            ) . '">'
-            . htmlspecialchars($committer['name']) . '</a>'
-        )
-        . ($author != $committer
-            ? ', <br />'
-            . sprintf(
-                __('authored on %1$s by %2$s'),
-                PMA\libraries\Util::localisedDate(strtotime($author['date'])),
-                '<a href="' . PMA_linkURL(
-                    'mailto:' . htmlspecialchars($author['email'])
-                ) . '">'
-                . htmlspecialchars($author['name']) . '</a>'
-            )
-            : ''),
-        'li_pma_version_git', null, null, null
-    );
-}
diff --git a/#pma/libraries/display_import.lib.php b/#pma/libraries/display_import.lib.php
deleted file mode 100644
index 4109bc2c..00000000
--- a/#pma/libraries/display_import.lib.php
+++ /dev/null
@@ -1,693 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-
-/**
- * functions for displaying import for: server, database and table
- *
- * @usedby display_import.inc.php
- *
- * @package PhpMyAdmin
- */
-use PMA\libraries\Message;
-use PMA\libraries\plugins\ImportPlugin;
-
-/**
- * Prints Html For Display Import Hidden Input
- *
- * @param String $import_type Import type: server, database, table
- * @param String $db          Selected DB
- * @param String $table       Selected Table
- *
- * @return string
- */
-function PMA_getHtmlForHiddenInputs($import_type, $db, $table)
-{
-    $html  = '';
-    if ($import_type == 'server') {
-        $html .= PMA_URL_getHiddenInputs('', '', 1);
-    } elseif ($import_type == 'database') {
-        $html .= PMA_URL_getHiddenInputs($db, '', 1);
-    } else {
-        $html .= PMA_URL_getHiddenInputs($db, $table, 1);
-    }
-    $html .= '    <input type="hidden" name="import_type" value="'
-        . $import_type . '" />' . "\n";
-
-    return $html;
-}
-
-/**
- * Prints Html For Import Javascript
- *
- * @param int $upload_id The selected upload id
- *
- * @return string
- */
-function PMA_getHtmlForImportJS($upload_id)
-{
-    global $SESSION_KEY;
-    $html  = '';
-    $html .= '<script type="text/javascript">';
-    $html .= '    //<![CDATA[';
-    //with "\n", so that the following lines won't be commented out by //<![CDATA[
-    $html .= "\n";
-    $html .= '    $( function() {';
-    // add event when user click on "Go" button
-    $html .= '      $("#buttonGo").bind("click", function() {';
-    // hide form
-    $html .= '        $("#upload_form_form").css("display", "none");';
-
-    if ($_SESSION[$SESSION_KEY]["handler"] != 'PMA\libraries\plugins\import\upload\UploadNoplugin') {
-
-        $html .= PMA_getHtmlForImportWithPlugin($upload_id);
-
-    } else { // no plugin available
-        $image_tag = '<img src="' . $GLOBALS['pmaThemeImage']
-            . 'ajax_clock_small.gif" width="16" height="16" alt="ajax clock" /> '
-            . PMA_jsFormat(
-                __(
-                    'Please be patient, the file is being uploaded. '
-                    . 'Details about the upload are not available.'
-                ),
-                false
-            ) . PMA\libraries\Util::showDocu('faq', 'faq2-9');
-        $html .= "   $('#upload_form_status_info').html('" . $image_tag . "');";
-        $html .= '   $("#upload_form_status").css("display", "none");';
-    } // else
-
-    // onclick
-    $html .= '      });';
-    // domready
-    $html .= '    });';
-    $html .= '    //]]>';
-    //with "\n", so that the following lines won't be commented out by //]]>
-    $html .= "\n";
-    $html .= '</script>';
-
-    return $html;
-}
-
-/**
- * Prints Html For Display Export options
- *
- * @param String $import_type Import type: server, database, table
- * @param String $db          Selected DB
- * @param String $table       Selected Table
- *
- * @return string
- */
-function PMA_getHtmlForImportOptions($import_type, $db, $table)
-{
-    $html  = '    <div class="exportoptions" id="header">';
-    $html .= '        <h2>';
-    $html .= PMA\libraries\Util::getImage('b_import.png', __('Import'));
-
-    if ($import_type == 'server') {
-        $html .= __('Importing into the current server');
-    } elseif ($import_type == 'database') {
-        $import_str = sprintf(
-            __('Importing into the database "%s"'),
-            htmlspecialchars($db)
-        );
-        $html .= $import_str;
-    } else {
-        $import_str = sprintf(
-            __('Importing into the table "%s"'),
-            htmlspecialchars($table)
-        );
-        $html .= $import_str;
-    }
-    $html .= '        </h2>';
-    $html .= '    </div>';
-
-    return $html;
-}
-
-/**
- * Prints Html For Display Import options : Compressions
- *
- * @return string
- */
-function PMA_getHtmlForImportCompressions()
-{
-    global $cfg;
-    $html = '';
-    // zip, gzip and bzip2 encode features
-    $compressions = array();
-
-    if ($cfg['GZipDump'] && @function_exists('gzopen')) {
-        $compressions[] = 'gzip';
-    }
-    if ($cfg['BZipDump'] && @function_exists('bzopen')) {
-        $compressions[] = 'bzip2';
-    }
-    if ($cfg['ZipDump'] && @function_exists('zip_open')) {
-        $compressions[] = 'zip';
-    }
-    // We don't have show anything about compression, when no supported
-    if ($compressions != array()) {
-        $html .= '<div class="formelementrow" id="compression_info">';
-        $compress_str = sprintf(
-            __('File may be compressed (%s) or uncompressed.'),
-            implode(", ", $compressions)
-        );
-        $html .= $compress_str;
-        $html .= '<br />';
-        $html .= __(
-            'A compressed file\'s name must end in <b>.[format].[compression]</b>. '
-            . 'Example: <b>.sql.zip</b>'
-        );
-        $html .= '</div>';
-    }
-
-    return $html;
-}
-
-/**
- * Prints Html For Display Import charset
- *
- * @return string
- */
-function PMA_getHtmlForImportCharset()
-{
-    global $cfg;
-    $html = '       <div class="formelementrow" id="charaset_of_file">';
-    // charset of file
-    if ($GLOBALS['PMA_recoding_engine'] != PMA_CHARSET_NONE) {
-        $html .= '<label for="charset_of_file">' . __('Character set of the file:')
-            . '</label>';
-        $html .= '<select id="charset_of_file" name="charset_of_file" size="1">';
-        foreach ($cfg['AvailableCharsets'] as $temp_charset) {
-            $html .= '<option value="' . htmlentities($temp_charset) .  '"';
-            if ((empty($cfg['Import']['charset']) && $temp_charset == 'utf-8')
-                || $temp_charset == $cfg['Import']['charset']
-            ) {
-                $html .= ' selected="selected"';
-            }
-            $html .= '>' . htmlentities($temp_charset) . '</option>';
-        }
-        $html .= ' </select><br />';
-    } else {
-        $html .= '<label for="charset_of_file">' . __('Character set of the file:')
-            . '</label>' . "\n";
-        $html .= PMA_generateCharsetDropdownBox(
-            PMA_CSDROPDOWN_CHARSET,
-            'charset_of_file',
-            'charset_of_file',
-            'utf8',
-            false
-        );
-    } // end if (recoding)
-
-    $html .= '        </div>';
-
-    return $html;
-}
-
-/**
- * Prints Html For Display Import options : file property
- *
- * @param int            $max_upload_size   Max upload size
- * @param ImportPlugin[] $import_list       import list
- * @param String         $local_import_file from upload directory
- *
- * @return string
- */
-function PMA_getHtmlForImportOptionsFile(
-    $max_upload_size, $import_list, $local_import_file
-) {
-    global $cfg;
-    $html  = '    <div class="importoptions">';
-    $html .= '         <h3>'  . __('File to import:') . '</h3>';
-    $html .= PMA_getHtmlForImportCompressions();
-    $html .= '        <div class="formelementrow" id="upload_form">';
-
-    if ($GLOBALS['is_upload'] && !empty($cfg['UploadDir'])) {
-        $html .= '            <ul>';
-        $html .= '            <li>';
-        $html .= '                <input type="radio" name="file_location" '
-            . 'id="radio_import_file" required="required" />';
-        $html .= PMA\libraries\Util::getBrowseUploadFileBlock($max_upload_size);
-        $html .= '<br />' . __('You may also drag and drop a file on any page.');
-        $html .= '            </li>';
-        $html .= '            <li>';
-        $html .= '               <input type="radio" name="file_location" '
-            . 'id="radio_local_import_file"';
-        if (! empty($GLOBALS['timeout_passed'])
-            && ! empty($local_import_file)
-        ) {
-            $html .= ' checked="checked"';
-        }
-        $html .= ' />';
-        $html .= PMA\libraries\Util::getSelectUploadFileBlock(
-            $import_list,
-            $cfg['UploadDir']
-        );
-        $html .= '            </li>';
-        $html .= '            </ul>';
-
-    } elseif ($GLOBALS['is_upload']) {
-        $html .= PMA\libraries\Util::getBrowseUploadFileBlock($max_upload_size);
-        $html .= '<br />' . __('You may also drag and drop a file on any page.');
-    } elseif (!$GLOBALS['is_upload']) {
-        $html .= Message::notice(
-            __('File uploads are not allowed on this server.')
-        )->getDisplay();
-    } elseif (!empty($cfg['UploadDir'])) {
-        $html .= PMA\libraries\Util::getSelectUploadFileBlock(
-            $import_list,
-            $cfg['UploadDir']
-        );
-    } // end if (web-server upload directory)
-
-    $html .= '        </div>';
-    $html .= PMA_getHtmlForImportCharset();
-    $html .= '   </div>';
-
-    return $html;
-}
-
-/**
- * Prints Html For Display Import options : Partial Import
- *
- * @param String $timeout_passed timeout passed
- * @param String $offset         timeout offset
- *
- * @return string
- */
-function PMA_getHtmlForImportOptionsPartialImport($timeout_passed, $offset)
-{
-    $html  = '    <div class="importoptions">';
-    $html .= '        <h3>' . __('Partial import:') . '</h3>';
-
-    if (isset($timeout_passed) && $timeout_passed) {
-        $html .= '<div class="formelementrow">' . "\n";
-        $html .= '<input type="hidden" name="skip" value="' . $offset . '" />';
-        $html .= sprintf(
-            __(
-                'Previous import timed out, after resubmitting '
-                . 'will continue from position %d.'
-            ),
-            $offset
-        );
-        $html .= '</div>' . "\n";
-    }
-
-    $html .= '        <div class="formelementrow">';
-    $html .= '           <input type="checkbox" name="allow_interrupt" value="yes"';
-    $html .= '                  id="checkbox_allow_interrupt" '
-        . PMA_pluginCheckboxCheck('Import', 'allow_interrupt') . '/>';
-    $html .= '            <label for="checkbox_allow_interrupt">'
-        . __(
-            'Allow the interruption of an import in case the script detects '
-            . 'it is close to the PHP timeout limit. <i>(This might be a good way'
-            . ' to import large files, however it can break transactions.)</i>'
-        ) . '</label><br />';
-    $html .= '        </div>';
-
-    if (! (isset($timeout_passed) && $timeout_passed)) {
-        $html .= '        <div class="formelementrow">';
-        $html .= '            <label for="text_skip_queries">'
-            .  __(
-                'Skip this number of queries (for SQL) starting from the first one:'
-            )
-            . '</label>';
-        $html .= '            <input type="number" name="skip_queries" value="'
-            . PMA_pluginGetDefault('Import', 'skip_queries')
-            . '" id="text_skip_queries" min="0" />';
-        $html .= '        </div>';
-
-    } else {
-        // If timeout has passed,
-        // do not show the Skip dialog to avoid the risk of someone
-        // entering a value here that would interfere with "skip"
-        $html .= '         <input type="hidden" name="skip_queries" value="'
-            . PMA_pluginGetDefault('Import', 'skip_queries')
-            . '" id="text_skip_queries" />';
-    }
-
-    $html .= '    </div>';
-
-    return $html;
-}
-
-/**
- * Prints Html For Display Import options : Other
- *
- * @return string
- */
-function PMA_getHtmlForImportOptionsOther()
-{
-    $html  = '   <div class="importoptions">';
-    $html .= '       <h3>' . __('Other options:') . '</h3>';
-    $html .= '       <div class="formelementrow">';
-    $html .= PMA\libraries\Util::getFKCheckbox();
-    $html .= '       </div>';
-    $html .= '   </div>';
-
-    return $html;
-}
-
-/**
- * Prints Html For Display Import options : Format
- *
- * @param ImportPlugin[] $import_list import list
- *
- * @return string
- */
-function PMA_getHtmlForImportOptionsFormat($import_list)
-{
-    $html  = '   <div class="importoptions">';
-    $html .= '       <h3>' . __('Format:') . '</h3>';
-    $html .= PMA_pluginGetChoice('Import', 'format', $import_list);
-    $html .= '       <div id="import_notification"></div>';
-    $html .= '   </div>';
-
-    $html .= '    <div class="importoptions" id="format_specific_opts">';
-    $html .= '        <h3>' . __('Format-specific options:') . '</h3>';
-    $html .= '        <p class="no_js_msg" id="scroll_to_options_msg">'
-        . 'Scroll down to fill in the options for the selected format '
-        . 'and ignore the options for other formats.</p>';
-    $html .= PMA_pluginGetOptions('Import', $import_list);
-    $html .= '    </div>';
-    $html .= '        <div class="clearfloat"></div>';
-
-    // Encoding setting form appended by Y.Kawada
-    if (function_exists('PMA_Kanji_encodingForm')) {
-        $html .= '        <div class="importoptions" id="kanji_encoding">';
-        $html .= '            <h3>' . __('Encoding Conversion:') . '</h3>';
-        $html .= PMA_Kanji_encodingForm();
-        $html .= '        </div>';
-
-    }
-    $html .= "\n";
-
-    return $html;
-}
-
-/**
- * Prints Html For Display Import options : submit
- *
- * @return string
- */
-function PMA_getHtmlForImportOptionsSubmit()
-{
-    $html  = '    <div class="importoptions" id="submit">';
-    $html .= '       <input type="submit" value="' . __('Go') . '" id="buttonGo" />';
-    $html .= '   </div>';
-
-    return $html;
-}
-
-/**
- * Prints Html For Display Import
- *
- * @param int            $upload_id         The selected upload id
- * @param String         $import_type       Import type: server, database, table
- * @param String         $db                Selected DB
- * @param String         $table             Selected Table
- * @param int            $max_upload_size   Max upload size
- * @param ImportPlugin[] $import_list       Import list
- * @param String         $timeout_passed    Timeout passed
- * @param String         $offset            Timeout offset
- * @param String         $local_import_file from upload directory
- *
- * @return string
- */
-function PMA_getHtmlForImport(
-    $upload_id, $import_type, $db, $table,
-    $max_upload_size, $import_list, $timeout_passed, $offset, $local_import_file
-) {
-    global $SESSION_KEY;
-    $html  = '';
-    $html .= '<iframe id="import_upload_iframe" name="import_upload_iframe" '
-        . 'width="1" height="1" style="display: none;"></iframe>';
-    $html .= '<div id="import_form_status" style="display: none;"></div>';
-    $html .= '<div id="importmain">';
-    $html .= '    <img src="' . $GLOBALS['pmaThemeImage'] . 'ajax_clock_small.gif" '
-        . 'width="16" height="16" alt="ajax clock" style="display: none;" />';
-
-    $html .= PMA_getHtmlForImportJS($upload_id);
-
-    $html .= '    <form id="import_file_form" action="import.php" method="post" '
-        . 'enctype="multipart/form-data"';
-    $html .= '        name="import"';
-    if ($_SESSION[$SESSION_KEY]["handler"] != 'PMA\libraries\plugins\import\upload\UploadNoplugin') {
-        $html .= ' target="import_upload_iframe"';
-    }
-    $html .= ' class="ajax"';
-    $html .= '>';
-    $html .= '    <input type="hidden" name="';
-    $html .= $_SESSION[$SESSION_KEY]['handler']::getIdKey();
-    $html .= '" value="' . $upload_id . '" />';
-
-    $html .= PMA_getHtmlForHiddenInputs($import_type, $db, $table);
-
-    $html .= PMA_getHtmlForImportOptions($import_type, $db, $table);
-
-    $html .= PMA_getHtmlForImportOptionsFile(
-        $max_upload_size, $import_list, $local_import_file
-    );
-
-    $html .= PMA_getHtmlForImportOptionsPartialImport($timeout_passed, $offset);
-
-    $html .= PMA_getHtmlForImportOptionsOther();
-
-    $html .= PMA_getHtmlForImportOptionsFormat($import_list);
-
-    $html .= PMA_getHtmlForImportOptionsSubmit();
-
-    $html .= '</form>';
-    $html .= '</div>';
-
-    return $html;
-}
-
-/**
- * Prints javascript for upload with plugin, upload process bar
- *
- * @param int $upload_id The selected upload id
- *
- * @return string
- */
-function PMA_getHtmlForImportWithPlugin($upload_id)
-{
-    //some variable for javascript
-    $ajax_url = "import_status.php?id=" . $upload_id . "&"
-        . PMA_URL_getCommon(array('import_status'=>1), 'text');
-    $promot_str = PMA_jsFormat(
-        __(
-            'The file being uploaded is probably larger than '
-            . 'the maximum allowed size or this is a known bug in webkit '
-            . 'based (Safari, Google Chrome, Arora etc.) browsers.'
-        ),
-        false
-    );
-    $statustext_str = PMA_escapeJsString(__('%s of %s'));
-    $upload_str = PMA_jsFormat(__('Uploading your import file…'), false);
-    $second_str = PMA_jsFormat(__('%s/sec.'), false);
-    $remaining_min = PMA_jsFormat(__('About %MIN min. %SEC sec. remaining.'), false);
-    $remaining_second = PMA_jsFormat(__('About %SEC sec. remaining.'), false);
-    $processed_str = PMA_jsFormat(
-        __('The file is being processed, please be patient.'),
-        false
-    );
-    $import_url = PMA_URL_getCommon(array('import_status'=>1), 'text');
-
-    //start output
-    $html  = 'var finished = false; ';
-    $html .= 'var percent  = 0.0; ';
-    $html .= 'var total    = 0; ';
-    $html .= 'var complete = 0; ';
-    $html .= 'var original_title = '
-        . 'parent && parent.document ? parent.document.title : false; ';
-    $html .= 'var import_start; ';
-
-    $html .= 'var perform_upload = function () { ';
-    $html .= 'new $.getJSON( ';
-    $html .= '        "' . $ajax_url . '", ';
-    $html .= '        {}, ';
-    $html .= '        function(response) { ';
-    $html .= '            finished = response.finished; ';
-    $html .= '            percent = response.percent; ';
-    $html .= '            total = response.total; ';
-    $html .= '            complete = response.complete; ';
-
-    $html .= '            if (total==0 && complete==0 && percent==0) { ';
-    $img_tag = '<img src="' . $GLOBALS['pmaThemeImage'] . 'ajax_clock_small.gif"';
-    $html .= '                $("#upload_form_status_info").html(\''
-        . $img_tag . ' width="16" height="16" alt="ajax clock" /> '
-        . $promot_str . '\'); ';
-    $html .= '                $("#upload_form_status").css("display", "none"); ';
-    $html .= '            } else { ';
-    $html .= '                var now = new Date(); ';
-    $html .= '                now = Date.UTC( ';
-    $html .= '                    now.getFullYear(), ';
-    $html .= '                    now.getMonth(), ';
-    $html .= '                    now.getDate(), ';
-    $html .= '                    now.getHours(), ';
-    $html .= '                    now.getMinutes(), ';
-    $html .= '                    now.getSeconds()) ';
-    $html .= '                    + now.getMilliseconds() - 1000; ';
-    $html .= '                var statustext = PMA_sprintf(';
-    $html .= '                    "' . $statustext_str . '", ';
-    $html .= '                    formatBytes( ';
-    $html .= '                        complete, 1, PMA_messages.strDecimalSeparator';
-    $html .= '                    ), ';
-    $html .= '                    formatBytes(';
-    $html .= '                        total, 1, PMA_messages.strDecimalSeparator';
-    $html .= '                    ) ';
-    $html .= '                ); ';
-
-    $html .= '                if ($("#importmain").is(":visible")) { ';
-    // show progress UI
-    $html .= '                    $("#importmain").hide(); ';
-    $html .= '                    $("#import_form_status") ';
-    $html .= '                    .html(\'<div class="upload_progress">'
-        . '<div class="upload_progress_bar_outer"><div class="percentage">'
-        . '</div><div id="status" class="upload_progress_bar_inner">'
-        . '<div class="percentage"></div></div></div><div>'
-        . '<img src="' . $GLOBALS['pmaThemeImage']
-        . 'ajax_clock_small.gif" width="16" height="16" alt="ajax clock" /> '
-        . $upload_str . '</div><div id="statustext"></div></div>\') ';
-    $html .= '                    .show(); ';
-    $html .= '                    import_start = now; ';
-    $html .= '                } ';
-    $html .= '                else if (percent > 9 || complete > 2000000) { ';
-    // calculate estimated time
-    $html .= '                    var used_time = now - import_start; ';
-    $html .= '                    var seconds = '
-        . 'parseInt(((total - complete) / complete) * used_time / 1000); ';
-    $html .= '                    var speed = PMA_sprintf("' . $second_str . '"';
-    $html .= '                       , formatBytes(complete / used_time * 1000, 1,'
-        . ' PMA_messages.strDecimalSeparator)); ';
-
-    $html .= '                    var minutes = parseInt(seconds / 60); ';
-    $html .= '                    seconds %= 60; ';
-    $html .= '                    var estimated_time; ';
-    $html .= '                    if (minutes > 0) { ';
-    $html .= '                        estimated_time = "' . $remaining_min . '"';
-    $html .= '                            .replace("%MIN", minutes)';
-    $html .= '                            .replace("%SEC", seconds); ';
-    $html .= '                    } ';
-    $html .= '                    else { ';
-    $html .= '                        estimated_time = "' . $remaining_second . '"';
-    $html .= '                        .replace("%SEC", seconds); ';
-    $html .= '                    } ';
-
-    $html .= '                    statustext += "<br />" + speed + "<br /><br />" '
-        . '+ estimated_time; ';
-    $html .= '                } ';
-
-    $html .= '                var percent_str = Math.round(percent) + "%"; ';
-    $html .= '                $("#status").animate({width: percent_str}, 150); ';
-    $html .= '                $(".percentage").text(percent_str); ';
-
-    // show percent in window title
-    $html .= '                if (original_title !== false) { ';
-    $html .= '                    parent.document.title ';
-    $html .= '                        = percent_str + " - " + original_title; ';
-    $html .= '                } ';
-    $html .= '                else { ';
-    $html .= '                    document.title ';
-    $html .= '                        = percent_str + " - " + original_title; ';
-    $html .= '                } ';
-    $html .= '                $("#statustext").html(statustext); ';
-    $html .= '            }  ';
-
-    $html .= '            if (finished == true) { ';
-    $html .= '                if (original_title !== false) { ';
-    $html .= '                    parent.document.title = original_title; ';
-    $html .= '                } ';
-    $html .= '                else { ';
-    $html .= '                    document.title = original_title; ';
-    $html .= '                } ';
-    $html .= '                $("#importmain").hide(); ';
-    // loads the message, either success or mysql error
-    $html .= '                $("#import_form_status") ';
-    $html .= '                .html(\'<img src="' . $GLOBALS['pmaThemeImage']
-        . 'ajax_clock_small.gif" width="16" height="16" alt="ajax clock" /> '
-        . $processed_str . '\')';
-    $html .= '                .show(); ';
-    $html .= '                $("#import_form_status").load("import_status.php?'
-        . 'message=true&' . $import_url . '"); ';
-    $html .= '                PMA_reloadNavigation(); ';
-
-    // if finished
-    $html .= '            } ';
-    $html .= '            else { ';
-    $html .= '              setTimeout(perform_upload, 1000); ';
-    $html .= '         } ';
-    $html .= '}); ';
-    $html .= '}; ';
-    $html .= 'setTimeout(perform_upload, 1000); ';
-
-    return $html;
-}
-
-/**
- * Gets HTML to display import dialogs
- *
- * @param String $import_type     Import type: server|database|table
- * @param String $db              Selected DB
- * @param String $table           Selected Table
- * @param int    $max_upload_size Max upload size
- *
- * @return string $html
- */
-function PMA_getImportDisplay($import_type, $db, $table, $max_upload_size)
-{
-    global $SESSION_KEY;
-    include_once './libraries/file_listing.lib.php';
-    include_once './libraries/plugin_interface.lib.php';
-
-    include_once './libraries/display_import_ajax.lib.php';
-    list(
-        $SESSION_KEY,
-        $upload_id,
-    ) = PMA_uploadProgressSetup();
-
-    /* Scan for plugins */
-    /* @var $import_list ImportPlugin[] */
-    $import_list = PMA_getPlugins(
-        "import",
-        'libraries/plugins/import/',
-        $import_type
-    );
-
-    /* Fail if we didn't find any plugin */
-    if (empty($import_list)) {
-        Message::error(
-            __(
-                'Could not load import plugins, please check your installation!'
-            )
-        )->display();
-        exit;
-    }
-
-    if (PMA_isValid($_REQUEST['offset'], 'numeric')) {
-        $offset = intval($_REQUEST['offset']);
-    }
-    if (isset($_REQUEST['timeout_passed'])) {
-        $timeout_passed = $_REQUEST['timeout_passed'];
-    }
-
-    $local_import_file = '';
-    if (isset($_REQUEST['local_import_file'])) {
-        $local_import_file = $_REQUEST['local_import_file'];
-    }
-
-    $timeout_passed_str = isset($timeout_passed)? $timeout_passed : null;
-    $offset_str = isset($offset)? $offset : null;
-    return PMA_getHtmlForImport(
-        $upload_id,
-        $import_type,
-        $db,
-        $table,
-        $max_upload_size,
-        $import_list,
-        $timeout_passed_str,
-        $offset_str,
-        $local_import_file
-    );
-}
diff --git a/#pma/libraries/display_import_ajax.lib.php b/#pma/libraries/display_import_ajax.lib.php
deleted file mode 100644
index 838f9b78..00000000
--- a/#pma/libraries/display_import_ajax.lib.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
-* Handles plugins that show the upload progress
-*
-* @package PhpMyAdmin
-*/
-
-/**
- * Sets up some variables for upload progress
- *
- * @return array
- *
- */
-function PMA_uploadProgressSetup()
-{
-    /**
-     * constant for differentiating array in $_SESSION variable
-     */
-    $SESSION_KEY = '__upload_status';
-
-    /**
-     * sets default plugin for handling the import process
-     */
-    $_SESSION[$SESSION_KEY]["handler"] = "";
-
-    /**
-     * unique ID for each upload
-     */
-    $upload_id = uniqid("");
-
-    /**
-     * list of available plugins
-     *
-     * Each plugin has own checkfunction in display_import_ajax.lib.php
-     * and own file with functions in upload_#KEY#.php
-     */
-    $plugins = array(
-        // PHP 5.4 session-based upload progress is problematic, see bug 3964
-        //"session",
-        "progress",
-        "apc",
-        "noplugin"
-    );
-
-    // select available plugin
-    foreach ($plugins as $plugin) {
-        $check = "PMA_Import_" . $plugin . "Check";
-
-        if ($check()) {
-            $upload_class = 'PMA\libraries\plugins\import\upload\Upload' . ucwords(
-                $plugin
-            );
-            $_SESSION[$SESSION_KEY]["handler"] = $upload_class;
-            break;
-        }
-    }
-    return array($SESSION_KEY, $upload_id, $plugins);
-}
-
-/**
-  * Checks if APC bar extension is available and configured correctly.
-  *
-  * @return boolean true if APC extension is available and if rfc1867 is enabled,
-  *                      false if it is not
-  */
-function PMA_Import_apcCheck()
-{
-    if (! extension_loaded('apc')
-        || ! function_exists('apc_fetch')
-        || ! function_exists('getallheaders')
-    ) {
-        return false;
-    }
-    return (ini_get('apc.enabled') && ini_get('apc.rfc1867'));
-}
-
-/**
- * Checks if PMA\libraries\plugins\import\upload\UploadProgress bar extension is
- * available.
- *
- * @return boolean true if PMA\libraries\plugins\import\upload\UploadProgress
- * extension is available, false if it is not
- */
-function PMA_Import_progressCheck()
-{
-    if (! function_exists("uploadprogress_get_info")
-        || ! function_exists('getallheaders')
-    ) {
-        return false;
-    }
-    return true;
-}
-
-/**
-  * Checks if PHP 5.4 session upload-progress feature is available.
-  *
-  * @return boolean true if PHP 5.4 session upload-progress is available,
-  *                 false if it is not
-  */
-function PMA_Import_sessionCheck()
-{
-    if (! ini_get('session.upload_progress.enabled')) {
-        return false;
-    }
-    return true;
-}
-
-/**
-  * Default plugin for handling import.
-  * If no other plugin is available, noplugin is used.
-  *
-  * @return boolean true
-  */
-function PMA_Import_nopluginCheck()
-{
-    return true;
-}
-
-/**
-  * The function outputs json encoded status of uploaded.
-  * It uses PMA_getUploadStatus, which is defined in plugin's file.
-  *
-  * @param string $id ID of transfer, usually $upload_id
-  *                   from display_import_ajax.lib.php
-  *
-  * @return void
-  */
-function PMA_importAjaxStatus($id)
-{
-    PMA_headerJSON();
-    echo json_encode(
-        $_SESSION[$GLOBALS['SESSION_KEY']]['handler']::getUploadStatus($id)
-    );
-}
diff --git a/#pma/libraries/display_select_lang.lib.php b/#pma/libraries/display_select_lang.lib.php
deleted file mode 100644
index bd0c929e..00000000
--- a/#pma/libraries/display_select_lang.lib.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Code for displaying language selection
- *
- * @package PhpMyAdmin
- */
-use PMA\libraries\LanguageManager;
-
-/**
- * Returns HTML code for the language selector
- *
- * @param boolean $use_fieldset whether to use fieldset for selection
- * @param boolean $show_doc     whether to show documentation links
- *
- * @return string
- *
- * @access  public
- */
-function PMA_getLanguageSelectorHtml($use_fieldset = false, $show_doc = true)
-{
-    $retval = '';
-    $available_languages = LanguageManager::getInstance()->sortedLanguages();
-
-    // Display language selection only if there
-    // is more than one language to choose from
-    if (count($available_languages) > 1) {
-        $retval .= '<form method="get" action="index.php" class="disableAjax">';
-
-        $_form_params = array(
-            'db' => $GLOBALS['db'],
-            'table' => $GLOBALS['table'],
-        );
-        $retval .= PMA_URL_getHiddenInputs($_form_params);
-
-        // For non-English, display "Language" with emphasis because it's
-        // not a proper word in the current language; we show it to help
-        // people recognize the dialog
-        $language_title = __('Language')
-            . (__('Language') != 'Language' ? ' - <em>Language</em>' : '');
-        if ($show_doc) {
-            $language_title .= PMA\libraries\Util::showDocu('faq', 'faq7-2');
-        }
-        if ($use_fieldset) {
-            $retval .= '<fieldset><legend lang="en" dir="ltr">'
-                . $language_title . '</legend>';
-        } else {
-            $retval .= '<bdo lang="en" dir="ltr"><label for="sel-lang">'
-                . $language_title . ': </label></bdo>';
-        }
-
-        $retval .= '<select name="lang" class="autosubmit" lang="en"'
-            . ' dir="ltr" id="sel-lang">';
-
-        foreach ($available_languages as $language) {
-            //Is current one active?
-            if ($language->isActive()) {
-                $selected = ' selected="selected"';
-            } else {
-                $selected = '';
-            }
-            $retval .= '<option value="' . strtolower($language->getCode()) . '"' . $selected . '>';
-            $retval .= $language->getName();
-            $retval .= '</option>';
-        }
-
-        $retval .= '</select>';
-
-        if ($use_fieldset) {
-            $retval .= '</fieldset>';
-        }
-
-        $retval .= '</form>';
-    }
-    return $retval;
-}
-
diff --git a/#pma/libraries/engines/Bdb.php b/#pma/libraries/engines/Bdb.php
deleted file mode 100644
index 6c28ae3b..00000000
--- a/#pma/libraries/engines/Bdb.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * The BDB storage engine
- *
- * @package PhpMyAdmin-Engines
- */
-namespace PMA\libraries\engines;
-
-use PMA\libraries\StorageEngine;
-
-/**
- * The BDB storage engine
- *
- * @package PhpMyAdmin-Engines
- */
-class Bdb extends StorageEngine
-{
-    /**
-     * Returns array with variable names related to this storage engine
-     *
-     * @return array   variable names
-     */
-    public function getVariables()
-    {
-        return array(
-            'version_bdb'         => array(
-                'title' => __('Version information'),
-            ),
-            'bdb_cache_size'      => array(
-                'type' => PMA_ENGINE_DETAILS_TYPE_SIZE,
-            ),
-            'bdb_home'            => array(),
-            'bdb_log_buffer_size' => array(
-                'type' => PMA_ENGINE_DETAILS_TYPE_SIZE,
-            ),
-            'bdb_logdir'          => array(),
-            'bdb_max_lock'        => array(
-                'type' => PMA_ENGINE_DETAILS_TYPE_NUMERIC,
-            ),
-            'bdb_shared_data'     => array(),
-            'bdb_tmpdir'          => array(),
-            'bdb_data_direct'     => array(),
-            'bdb_lock_detect'     => array(),
-            'bdb_log_direct'      => array(),
-            'bdb_no_recover'      => array(),
-            'bdb_no_sync'         => array(),
-            'skip_sync_bdb_logs'  => array(),
-            'sync_bdb_logs'       => array(),
-        );
-    }
-
-    /**
-     * Returns the pattern to be used in the query for SQL variables
-     * related to this storage engine
-     *
-     * @return string LIKE pattern
-     */
-    public function getVariablesLikePattern()
-    {
-        return '%bdb%';
-    }
-
-    /**
-     * returns string with filename for the MySQL helppage
-     * about this storage engine
-     *
-     * @return string  mysql helppage filename
-     */
-    public function getMysqlHelpPage()
-    {
-        return 'bdb';
-    }
-}
-
diff --git a/#pma/libraries/engines/Berkeleydb.php b/#pma/libraries/engines/Berkeleydb.php
deleted file mode 100644
index 55941e64..00000000
--- a/#pma/libraries/engines/Berkeleydb.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * The BerkeleyDB storage engine
- *
- * @package PhpMyAdmin-Engines
- */
-namespace PMA\libraries\engines;
-
-/**
- * This is same as BDB
- *
- * @package PhpMyAdmin-Engines
- */
-class Berkeleydb extends Bdb
-{
-}
-
diff --git a/#pma/libraries/engines/Binlog.php b/#pma/libraries/engines/Binlog.php
deleted file mode 100644
index 0012f852..00000000
--- a/#pma/libraries/engines/Binlog.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * The binary log storage engine
- *
- * @package PhpMyAdmin-Engines
- */
-namespace PMA\libraries\engines;
-
-use PMA\libraries\StorageEngine;
-
-/**
- * The binary log storage engine
- *
- * @package PhpMyAdmin-Engines
- */
-class Binlog extends StorageEngine
-{
-    /**
-     * Returns string with filename for the MySQL helppage
-     * about this storage engine
-     *
-     * @return string  mysql helppage filename
-     */
-    public function getMysqlHelpPage()
-    {
-        return 'binary-log';
-    }
-}
-
diff --git a/#pma/libraries/engines/Innobase.php b/#pma/libraries/engines/Innobase.php
deleted file mode 100644
index e3fc63b0..00000000
--- a/#pma/libraries/engines/Innobase.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * The Innobase storage engine
- *
- * @package PhpMyAdmin-Engines
- */
-namespace PMA\libraries\engines;
-
-/**
- * The Innobase storage engine
- *
- * @package PhpMyAdmin-Engines
- */
-class Innobase extends Innodb
-{
-}
diff --git a/#pma/libraries/engines/Innodb.php b/#pma/libraries/engines/Innodb.php
deleted file mode 100644
index cdcb6dc7..00000000
--- a/#pma/libraries/engines/Innodb.php
+++ /dev/null
@@ -1,395 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * The InnoDB storage engine
- *
- * @package PhpMyAdmin-Engines
- */
-namespace PMA\libraries\engines;
-
-use PMA\libraries\StorageEngine;
-use PMA\libraries\Util;
-
-/**
- * The InnoDB storage engine
- *
- * @package PhpMyAdmin-Engines
- */
-class Innodb extends StorageEngine
-{
-    /**
-     * Returns array with variable names related to InnoDB storage engine
-     *
-     * @return array   variable names
-     */
-    public function getVariables()
-    {
-        return array(
-            'innodb_data_home_dir'            => array(
-                'title' => __('Data home directory'),
-                'desc'  => __(
-                    'The common part of the directory path for all InnoDB data '
-                    . 'files.'
-                ),
-            ),
-            'innodb_data_file_path'           => array(
-                'title' => __('Data files'),
-            ),
-            'innodb_autoextend_increment'     => array(
-                'title' => __('Autoextend increment'),
-                'desc'  => __(
-                    'The increment size for extending the size of an autoextending '
-                    . 'tablespace when it becomes full.'
-                ),
-                'type'  => PMA_ENGINE_DETAILS_TYPE_NUMERIC,
-            ),
-            'innodb_buffer_pool_size'         => array(
-                'title' => __('Buffer pool size'),
-                'desc'  => __(
-                    'The size of the memory buffer InnoDB uses to cache data and '
-                    . 'indexes of its tables.'
-                ),
-                'type'  => PMA_ENGINE_DETAILS_TYPE_SIZE,
-            ),
-            'innodb_additional_mem_pool_size' => array(
-                'title' => 'innodb_additional_mem_pool_size',
-                'type'  => PMA_ENGINE_DETAILS_TYPE_SIZE,
-            ),
-            'innodb_buffer_pool_awe_mem_mb'   => array(
-                'type' => PMA_ENGINE_DETAILS_TYPE_SIZE,
-            ),
-            'innodb_checksums'                => array(),
-            'innodb_commit_concurrency'       => array(),
-            'innodb_concurrency_tickets'      => array(
-                'type' => PMA_ENGINE_DETAILS_TYPE_NUMERIC,
-            ),
-            'innodb_doublewrite'              => array(),
-            'innodb_fast_shutdown'            => array(),
-            'innodb_file_io_threads'          => array(
-                'type' => PMA_ENGINE_DETAILS_TYPE_NUMERIC,
-            ),
-            'innodb_file_per_table'           => array(),
-            'innodb_flush_log_at_trx_commit'  => array(),
-            'innodb_flush_method'             => array(),
-            'innodb_force_recovery'           => array(),
-            'innodb_lock_wait_timeout'        => array(
-                'type' => PMA_ENGINE_DETAILS_TYPE_NUMERIC,
-            ),
-            'innodb_locks_unsafe_for_binlog'  => array(),
-            'innodb_log_arch_dir'             => array(),
-            'innodb_log_archive'              => array(),
-            'innodb_log_buffer_size'          => array(
-                'type' => PMA_ENGINE_DETAILS_TYPE_SIZE,
-            ),
-            'innodb_log_file_size'            => array(
-                'type' => PMA_ENGINE_DETAILS_TYPE_SIZE,
-            ),
-            'innodb_log_files_in_group'       => array(
-                'type' => PMA_ENGINE_DETAILS_TYPE_NUMERIC,
-            ),
-            'innodb_log_group_home_dir'       => array(),
-            'innodb_max_dirty_pages_pct'      => array(
-                'type' => PMA_ENGINE_DETAILS_TYPE_NUMERIC,
-            ),
-            'innodb_max_purge_lag'            => array(),
-            'innodb_mirrored_log_groups'      => array(
-                'type' => PMA_ENGINE_DETAILS_TYPE_NUMERIC,
-            ),
-            'innodb_open_files'               => array(
-                'type' => PMA_ENGINE_DETAILS_TYPE_NUMERIC,
-            ),
-            'innodb_support_xa'               => array(),
-            'innodb_sync_spin_loops'          => array(
-                'type' => PMA_ENGINE_DETAILS_TYPE_NUMERIC,
-            ),
-            'innodb_table_locks'              => array(
-                'type' => PMA_ENGINE_DETAILS_TYPE_BOOLEAN,
-            ),
-            'innodb_thread_concurrency'       => array(
-                'type' => PMA_ENGINE_DETAILS_TYPE_NUMERIC,
-            ),
-            'innodb_thread_sleep_delay'       => array(
-                'type' => PMA_ENGINE_DETAILS_TYPE_NUMERIC,
-            ),
-        );
-    }
-
-    /**
-     * Returns the pattern to be used in the query for SQL variables
-     * related to InnoDb storage engine
-     *
-     * @return string  SQL query LIKE pattern
-     */
-    public function getVariablesLikePattern()
-    {
-        return 'innodb\\_%';
-    }
-
-    /**
-     * Get information pages
-     *
-     * @return array detail pages
-     */
-    public function getInfoPages()
-    {
-        if ($this->support < PMA_ENGINE_SUPPORT_YES) {
-            return array();
-        }
-        $pages = array();
-        $pages['Bufferpool'] = __('Buffer Pool');
-        $pages['Status'] = __('InnoDB Status');
-
-        return $pages;
-    }
-
-    /**
-     * returns html tables with stats over inno db buffer pool
-     *
-     * @return string  html table with stats
-     */
-    public function getPageBufferpool()
-    {
-        // The following query is only possible because we know
-        // that we are on MySQL 5 here (checked above)!
-        // side note: I love MySQL 5 for this. :-)
-        $sql
-            = '
-             SHOW STATUS
-            WHERE Variable_name LIKE \'Innodb\\_buffer\\_pool\\_%\'
-               OR Variable_name = \'Innodb_page_size\';';
-        $status = $GLOBALS['dbi']->fetchResult($sql, 0, 1);
-
-        $output = '<table class="data" id="table_innodb_bufferpool_usage">' . "\n"
-            . '    <caption class="tblHeaders">' . "\n"
-            . '        ' . __('Buffer Pool Usage') . "\n"
-            . '    </caption>' . "\n"
-            . '    <tfoot>' . "\n"
-            . '        <tr>' . "\n"
-            . '            <th colspan="2">' . "\n"
-            . '                ' . __('Total') . "\n"
-            . '                : '
-            . Util::formatNumber(
-                $status['Innodb_buffer_pool_pages_total'],
-                0
-            )
-            . '&nbsp;' . __('pages')
-            . ' / '
-            . join(
-                '&nbsp;',
-                Util::formatByteDown(
-                    $status['Innodb_buffer_pool_pages_total']
-                    * $status['Innodb_page_size']
-                )
-            ) . "\n"
-            . '            </th>' . "\n"
-            . '        </tr>' . "\n"
-            . '    </tfoot>' . "\n"
-            . '    <tbody>' . "\n"
-            . '        <tr class="odd">' . "\n"
-            . '            <th>' . __('Free pages') . '</th>' . "\n"
-            . '            <td class="value">'
-            . Util::formatNumber(
-                $status['Innodb_buffer_pool_pages_free'],
-                0
-            )
-            . '</td>' . "\n"
-            . '        </tr>' . "\n"
-            . '        <tr class="even">' . "\n"
-            . '            <th>' . __('Dirty pages') . '</th>' . "\n"
-            . '            <td class="value">'
-            . Util::formatNumber(
-                $status['Innodb_buffer_pool_pages_dirty'],
-                0
-            )
-            . '</td>' . "\n"
-            . '        </tr>' . "\n"
-            . '        <tr class="odd">' . "\n"
-            . '            <th>' . __('Pages containing data') . '</th>' . "\n"
-            . '            <td class="value">'
-            . Util::formatNumber(
-                $status['Innodb_buffer_pool_pages_data'],
-                0
-            ) . "\n"
-            . '</td>' . "\n"
-            . '        </tr>' . "\n"
-            . '        <tr class="even">' . "\n"
-            . '            <th>' . __('Pages to be flushed') . '</th>' . "\n"
-            . '            <td class="value">'
-            . Util::formatNumber(
-                $status['Innodb_buffer_pool_pages_flushed'],
-                0
-            ) . "\n"
-            . '</td>' . "\n"
-            . '        </tr>' . "\n"
-            . '        <tr class="odd">' . "\n"
-            . '            <th>' . __('Busy pages') . '</th>' . "\n"
-            . '            <td class="value">'
-            . Util::formatNumber(
-                $status['Innodb_buffer_pool_pages_misc'],
-                0
-            ) . "\n"
-            . '</td>' . "\n"
-            . '        </tr>';
-
-        // not present at least since MySQL 5.1.40
-        if (isset($status['Innodb_buffer_pool_pages_latched'])) {
-            $output .= '        <tr class="even">'
-                . '            <th>' . __('Latched pages') . '</th>'
-                . '            <td class="value">'
-                . Util::formatNumber(
-                    $status['Innodb_buffer_pool_pages_latched'],
-                    0
-                )
-                . '</td>'
-                . '        </tr>';
-        }
-
-        $output .= '    </tbody>' . "\n"
-            . '</table>' . "\n\n"
-            . '<table class="data" id="table_innodb_bufferpool_activity">' . "\n"
-            . '    <caption class="tblHeaders">' . "\n"
-            . '        ' . __('Buffer Pool Activity') . "\n"
-            . '    </caption>' . "\n"
-            . '    <tbody>' . "\n"
-            . '        <tr class="odd">' . "\n"
-            . '            <th>' . __('Read requests') . '</th>' . "\n"
-            . '            <td class="value">'
-            . Util::formatNumber(
-                $status['Innodb_buffer_pool_read_requests'],
-                0
-            ) . "\n"
-            . '</td>' . "\n"
-            . '        </tr>' . "\n"
-            . '        <tr class="even">' . "\n"
-            . '            <th>' . __('Write requests') . '</th>' . "\n"
-            . '            <td class="value">'
-            . Util::formatNumber(
-                $status['Innodb_buffer_pool_write_requests'],
-                0
-            ) . "\n"
-            . '</td>' . "\n"
-            . '        </tr>' . "\n"
-            . '        <tr class="odd">' . "\n"
-            . '            <th>' . __('Read misses') . '</th>' . "\n"
-            . '            <td class="value">'
-            . Util::formatNumber(
-                $status['Innodb_buffer_pool_reads'],
-                0
-            ) . "\n"
-            . '</td>' . "\n"
-            . '        </tr>' . "\n"
-            . '        <tr class="even">' . "\n"
-            . '            <th>' . __('Write waits') . '</th>' . "\n"
-            . '            <td class="value">'
-            . Util::formatNumber(
-                $status['Innodb_buffer_pool_wait_free'],
-                0
-            ) . "\n"
-            . '</td>' . "\n"
-            . '        </tr>' . "\n"
-            . '        <tr class="odd">' . "\n"
-            . '            <th>' . __('Read misses in %') . '</th>' . "\n"
-            . '            <td class="value">'
-            . ($status['Innodb_buffer_pool_read_requests'] == 0
-                ? '---'
-                : htmlspecialchars(
-                    Util::formatNumber(
-                        $status['Innodb_buffer_pool_reads'] * 100
-                        / $status['Innodb_buffer_pool_read_requests'],
-                        3,
-                        2
-                    )
-                ) . ' %') . "\n"
-            . '</td>' . "\n"
-            . '        </tr>' . "\n"
-            . '        <tr class="even">' . "\n"
-            . '            <th>' . __('Write waits in %') . '</th>' . "\n"
-            . '            <td class="value">'
-            . ($status['Innodb_buffer_pool_write_requests'] == 0
-                ? '---'
-                : htmlspecialchars(
-                    Util::formatNumber(
-                        $status['Innodb_buffer_pool_wait_free'] * 100
-                        / $status['Innodb_buffer_pool_write_requests'],
-                        3,
-                        2
-                    )
-                ) . ' %') . "\n"
-            . '</td>' . "\n"
-            . '        </tr>' . "\n"
-            . '    </tbody>' . "\n"
-            . '</table>' . "\n";
-
-        return $output;
-    }
-
-    /**
-     * returns InnoDB status
-     *
-     * @return string  result of SHOW ENGINE INNODB STATUS inside pre tags
-     */
-    public function getPageStatus()
-    {
-        return '<pre id="pre_innodb_status">' . "\n"
-        . htmlspecialchars(
-            $GLOBALS['dbi']->fetchValue('SHOW ENGINE INNODB STATUS;', 0, 'Status')
-        ) . "\n"
-        . '</pre>' . "\n";
-    }
-
-    /**
-     * returns string with filename for the MySQL helppage
-     * about this storage engine
-     *
-     * @return string  mysql helppage filename
-     */
-    public function getMysqlHelpPage()
-    {
-        return 'innodb-storage-engine';
-    }
-
-    /**
-     * Gets the InnoDB plugin version number
-     *
-     * @return string the version number, or empty if not running as a plugin
-     */
-    public function getInnodbPluginVersion()
-    {
-        return $GLOBALS['dbi']->fetchValue('SELECT @@innodb_version;');
-    }
-
-    /**
-     * Gets the InnoDB file format
-     *
-     * (do not confuse this with phpMyAdmin's storage engine plugins!)
-     *
-     * @return string the InnoDB file format
-     */
-    public function getInnodbFileFormat()
-    {
-        return $GLOBALS['dbi']->fetchValue(
-            "SHOW GLOBAL VARIABLES LIKE 'innodb_file_format';",
-            0,
-            1
-        );
-    }
-
-    /**
-     * Verifies if this server supports the innodb_file_per_table feature
-     *
-     * (do not confuse this with phpMyAdmin's storage engine plugins!)
-     *
-     * @return boolean whether this feature is supported or not
-     */
-    public function supportsFilePerTable()
-    {
-        return (
-            $GLOBALS['dbi']->fetchValue(
-                "SHOW GLOBAL VARIABLES LIKE 'innodb_file_per_table';",
-                0,
-                1
-            ) == 'ON'
-        );
-    }
-}
-
diff --git a/#pma/libraries/engines/Memory.php b/#pma/libraries/engines/Memory.php
deleted file mode 100644
index b4e88248..00000000
--- a/#pma/libraries/engines/Memory.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * The MEMORY (HEAP) storage engine
- *
- * @package PhpMyAdmin-Engines
- */
-namespace PMA\libraries\engines;
-
-use PMA\libraries\StorageEngine;
-
-/**
- * The MEMORY (HEAP) storage engine
- *
- * @package PhpMyAdmin-Engines
- */
-class Memory extends StorageEngine
-{
-    /**
-     * Returns array with variable names dedicated to MEMORY storage engine
-     *
-     * @return array   variable names
-     */
-    public function getVariables()
-    {
-        return array(
-            'max_heap_table_size' => array(
-                'type' => PMA_ENGINE_DETAILS_TYPE_SIZE,
-            ),
-        );
-    }
-}
-
diff --git a/#pma/libraries/engines/Merge.php b/#pma/libraries/engines/Merge.php
deleted file mode 100644
index dc9553a7..00000000
--- a/#pma/libraries/engines/Merge.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * The MERGE storage engine
- *
- * @package PhpMyAdmin-Engines
- */
-namespace PMA\libraries\engines;
-
-use PMA\libraries\StorageEngine;
-
-/**
- * The MERGE storage engine
- *
- * @package PhpMyAdmin-Engines
- */
-class Merge extends StorageEngine
-{
-}
-
diff --git a/#pma/libraries/engines/Mrg_Myisam.php b/#pma/libraries/engines/Mrg_Myisam.php
deleted file mode 100644
index 39bd2720..00000000
--- a/#pma/libraries/engines/Mrg_Myisam.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * The MERGE storage engine
- *
- * @package PhpMyAdmin-Engines
- */
-namespace PMA\libraries\engines;
-
-/**
- * The MERGE storage engine
- *
- * @package PhpMyAdmin-Engines
- */
-class Mrg_Myisam extends Merge
-{
-    /**
-     * returns string with filename for the MySQL helppage
-     * about this storage engine
-     *
-     * @return string  mysql helppage filename
-     */
-    public function getMysqlHelpPage()
-    {
-        return 'merge-storage-engine';
-    }
-}
-
diff --git a/#pma/libraries/engines/Myisam.php b/#pma/libraries/engines/Myisam.php
deleted file mode 100644
index 7dff629e..00000000
--- a/#pma/libraries/engines/Myisam.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * The MyISAM storage engine
- *
- * @package PhpMyAdmin-Engines
- */
-namespace PMA\libraries\engines;
-
-use PMA\libraries\StorageEngine;
-
-/**
- * The MyISAM storage engine
- *
- * @package PhpMyAdmin-Engines
- */
-class Myisam extends StorageEngine
-{
-    /**
-     * Returns array with variable names dedicated to MyISAM storage engine
-     *
-     * @return array   variable names
-     */
-    public function getVariables()
-    {
-        return array(
-            'myisam_data_pointer_size'        => array(
-                'title' => __('Data pointer size'),
-                'desc'  => __(
-                    'The default pointer size in bytes, to be used by CREATE TABLE '
-                    . 'for MyISAM tables when no MAX_ROWS option is specified.'
-                ),
-                'type'  => PMA_ENGINE_DETAILS_TYPE_SIZE,
-            ),
-            'myisam_recover_options'          => array(
-                'title' => __('Automatic recovery mode'),
-                'desc'  => __(
-                    'The mode for automatic recovery of crashed MyISAM tables, as '
-                    . 'set via the --myisam-recover server startup option.'
-                ),
-            ),
-            'myisam_max_sort_file_size'       => array(
-                'title' => __('Maximum size for temporary sort files'),
-                'desc'  => __(
-                    'The maximum size of the temporary file MySQL is allowed to use '
-                    . 'while re-creating a MyISAM index (during REPAIR TABLE, ALTER '
-                    . 'TABLE, or LOAD DATA INFILE).'
-                ),
-                'type'  => PMA_ENGINE_DETAILS_TYPE_SIZE,
-            ),
-            'myisam_max_extra_sort_file_size' => array(
-                'title' => __('Maximum size for temporary files on index creation'),
-                'desc'  => __(
-                    'If the temporary file used for fast MyISAM index creation '
-                    . 'would be larger than using the key cache by the amount '
-                    . 'specified here, prefer the key cache method.'
-                ),
-                'type'  => PMA_ENGINE_DETAILS_TYPE_SIZE,
-            ),
-            'myisam_repair_threads'           => array(
-                'title' => __('Repair threads'),
-                'desc'  => __(
-                    'If this value is greater than 1, MyISAM table indexes are '
-                    . 'created in parallel (each index in its own thread) during '
-                    . 'the repair by sorting process.'
-                ),
-                'type'  => PMA_ENGINE_DETAILS_TYPE_NUMERIC,
-            ),
-            'myisam_sort_buffer_size'         => array(
-                'title' => __('Sort buffer size'),
-                'desc'  => __(
-                    'The buffer that is allocated when sorting MyISAM indexes '
-                    . 'during a REPAIR TABLE or when creating indexes with CREATE '
-                    . 'INDEX or ALTER TABLE.'
-                ),
-                'type'  => PMA_ENGINE_DETAILS_TYPE_SIZE,
-            ),
-            'myisam_stats_method'             => array(),
-            'delay_key_write'                 => array(),
-            'bulk_insert_buffer_size'         => array(
-                'type' => PMA_ENGINE_DETAILS_TYPE_SIZE,
-            ),
-            'skip_external_locking'           => array(),
-        );
-    }
-}
-
diff --git a/#pma/libraries/engines/Ndbcluster.php b/#pma/libraries/engines/Ndbcluster.php
deleted file mode 100644
index cbf1fc75..00000000
--- a/#pma/libraries/engines/Ndbcluster.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * The NDBCLUSTER storage engine
- *
- * @package PhpMyAdmin-Engines
- */
-namespace PMA\libraries\engines;
-
-use PMA\libraries\StorageEngine;
-
-/**
- * The NDBCLUSTER storage engine
- *
- * @package PhpMyAdmin-Engines
- */
-class Ndbcluster extends StorageEngine
-{
-    /**
-     * Returns array with variable names related to NDBCLUSTER storage engine
-     *
-     * @return array   variable names
-     */
-    public function getVariables()
-    {
-        return array(
-            'ndb_connectstring' => array(),
-        );
-    }
-
-    /**
-     * Returns the pattern to be used in the query for SQL variables
-     * related to NDBCLUSTER storage engine
-     *
-     * @return string  SQL query LIKE pattern
-     */
-    public function getVariablesLikePattern()
-    {
-        return 'ndb\\_%';
-    }
-
-    /**
-     * Returns string with filename for the MySQL help page
-     * about this storage engine
-     *
-     * @return string  mysql helppage filename
-     */
-    public function getMysqlHelpPage()
-    {
-        return 'ndbcluster';
-    }
-}
-
diff --git a/#pma/libraries/engines/Pbxt.php b/#pma/libraries/engines/Pbxt.php
deleted file mode 100644
index 68af6171..00000000
--- a/#pma/libraries/engines/Pbxt.php
+++ /dev/null
@@ -1,193 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * The PBXT storage engine
- *
- * @package PhpMyAdmin-Engines
- */
-namespace PMA\libraries\engines;
-
-use PMA;
-use PMA\libraries\StorageEngine;
-
-/**
- * The PBXT storage engine
- *
- * @package PhpMyAdmin-Engines
- */
-class Pbxt extends StorageEngine
-{
-    /**
-     * Returns array with variable names dedicated to PBXT storage engine
-     *
-     * @return array   variable names
-     */
-    public function getVariables()
-    {
-        return array(
-            'pbxt_index_cache_size'        => array(
-                'title' => __('Index cache size'),
-                'desc'  => __(
-                    'This is the amount of memory allocated to the'
-                    . ' index cache. Default value is 32MB. The memory'
-                    . ' allocated here is used only for caching index pages.'
-                ),
-                'type'  => PMA_ENGINE_DETAILS_TYPE_SIZE,
-            ),
-            'pbxt_record_cache_size'       => array(
-                'title' => __('Record cache size'),
-                'desc'  => __(
-                    'This is the amount of memory allocated to the'
-                    . ' record cache used to cache table data. The default'
-                    . ' value is 32MB. This memory is used to cache changes to'
-                    . ' the handle data (.xtd) and row pointer (.xtr) files.'
-                ),
-                'type'  => PMA_ENGINE_DETAILS_TYPE_SIZE,
-            ),
-            'pbxt_log_cache_size'          => array(
-                'title' => __('Log cache size'),
-                'desc'  => __(
-                    'The amount of memory allocated to the'
-                    . ' transaction log cache used to cache on transaction log'
-                    . ' data. The default is 16MB.'
-                ),
-                'type'  => PMA_ENGINE_DETAILS_TYPE_SIZE,
-            ),
-            'pbxt_log_file_threshold'      => array(
-                'title' => __('Log file threshold'),
-                'desc'  => __(
-                    'The size of a transaction log before rollover,'
-                    . ' and a new log is created. The default value is 16MB.'
-                ),
-                'type'  => PMA_ENGINE_DETAILS_TYPE_SIZE,
-            ),
-            'pbxt_transaction_buffer_size' => array(
-                'title' => __('Transaction buffer size'),
-                'desc'  => __(
-                    'The size of the global transaction log buffer'
-                    . ' (the engine allocates 2 buffers of this size).'
-                    . ' The default is 1MB.'
-                ),
-                'type'  => PMA_ENGINE_DETAILS_TYPE_SIZE,
-            ),
-            'pbxt_checkpoint_frequency'    => array(
-                'title' => __('Checkpoint frequency'),
-                'desc'  => __(
-                    'The amount of data written to the transaction'
-                    . ' log before a checkpoint is performed.'
-                    . ' The default value is 24MB.'
-                ),
-                'type'  => PMA_ENGINE_DETAILS_TYPE_SIZE,
-            ),
-            'pbxt_data_log_threshold'      => array(
-                'title' => __('Data log threshold'),
-                'desc'  => __(
-                    'The maximum size of a data log file. The default'
-                    . ' value is 64MB. PBXT can create a maximum of 32000 data'
-                    . ' logs, which are used by all tables. So the value of'
-                    . ' this variable can be increased to increase the total'
-                    . ' amount of data that can be stored in the database.'
-                ),
-                'type'  => PMA_ENGINE_DETAILS_TYPE_SIZE,
-            ),
-            'pbxt_garbage_threshold'       => array(
-                'title' => __('Garbage threshold'),
-                'desc'  => __(
-                    'The percentage of garbage in a data log file'
-                    . ' before it is compacted. This is a value between 1 and'
-                    . ' 99. The default is 50.'
-                ),
-                'type'  => PMA_ENGINE_DETAILS_TYPE_NUMERIC,
-            ),
-            'pbxt_log_buffer_size'         => array(
-                'title' => __('Log buffer size'),
-                'desc'  => __(
-                    'The size of the buffer used when writing a data'
-                    . ' log. The default is 256MB. The engine allocates one'
-                    . ' buffer per thread, but only if the thread is required'
-                    . ' to write a data log.'
-                ),
-                'type'  => PMA_ENGINE_DETAILS_TYPE_SIZE,
-            ),
-            'pbxt_data_file_grow_size'     => array(
-                'title' => __('Data file grow size'),
-                'desc'  => __('The grow size of the handle data (.xtd) files.'),
-                'type'  => PMA_ENGINE_DETAILS_TYPE_SIZE,
-            ),
-            'pbxt_row_file_grow_size'      => array(
-                'title' => __('Row file grow size'),
-                'desc'  => __('The grow size of the row pointer (.xtr) files.'),
-                'type'  => PMA_ENGINE_DETAILS_TYPE_SIZE,
-            ),
-            'pbxt_log_file_count'          => array(
-                'title' => __('Log file count'),
-                'desc'  => __(
-                    'This is the number of transaction log files'
-                    . ' (pbxt/system/xlog*.xt) the system will maintain. If the'
-                    . ' number of logs exceeds this value then old logs will be'
-                    . ' deleted, otherwise they are renamed and given the next'
-                    . ' highest number.'
-                ),
-                'type'  => PMA_ENGINE_DETAILS_TYPE_NUMERIC,
-            ),
-        );
-    }
-
-    /**
-     * returns the pbxt engine specific handling for
-     * PMA_ENGINE_DETAILS_TYPE_SIZE variables.
-     *
-     * @param string $formatted_size the size expression (for example 8MB)
-     *
-     * @return string the formatted value and its unit
-     */
-    public function resolveTypeSize($formatted_size)
-    {
-        if (preg_match('/^[0-9]+[a-zA-Z]+$/', $formatted_size)) {
-            $value = PMA\libraries\Util::extractValueFromFormattedSize(
-                $formatted_size
-            );
-        } else {
-            $value = $formatted_size;
-        }
-
-        return PMA\libraries\Util::formatByteDown($value);
-    }
-
-    //--------------------
-    /**
-     * Get information about pages
-     *
-     * @return array Information about pages
-     */
-    public function getInfoPages()
-    {
-        $pages = array();
-        $pages['Documentation'] = __('Documentation');
-
-        return $pages;
-    }
-
-    //--------------------
-    /**
-     * Get content of documentation page
-     *
-     * @return string
-     */
-    public function getPageDocumentation()
-    {
-        $output = '<p>' . sprintf(
-            __(
-                'Documentation and further information about PBXT'
-                . ' can be found on the %sPrimeBase XT Home Page%s.'
-            ),
-            '<a href="' . PMA_linkURL('https://mariadb.com/kb/en/mariadb/about-pbxt/')
-            . '" rel="noopener noreferrer" target="_blank">',
-            '</a>'
-        )
-        . '</p>' . "\n";
-
-        return $output;
-    }
-}
-
diff --git a/#pma/libraries/engines/Performance_Schema.php b/#pma/libraries/engines/Performance_Schema.php
deleted file mode 100644
index e0c53aef..00000000
--- a/#pma/libraries/engines/Performance_Schema.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * The performance schema storage engine
- *
- * @package PhpMyAdmin-Engines
- */
-namespace PMA\libraries\engines;
-
-use PMA\libraries\StorageEngine;
-
-/**
- * The performance schema storage engine
- *
- * @package PhpMyAdmin-Engines
- */
-class Performance_Schema extends StorageEngine
-{
-    /**
-     * Returns string with filename for the MySQL helppage
-     * about this storage engine
-     *
-     * @return string  mysql helppage filename
-     */
-    public function getMysqlHelpPage()
-    {
-        return 'performance-schema';
-    }
-}
-
diff --git a/#pma/libraries/error.inc.php b/#pma/libraries/error.inc.php
deleted file mode 100644
index 1d44975a..00000000
--- a/#pma/libraries/error.inc.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * phpMyAdmin fatal error display page
- *
- * @package PhpMyAdmin
- */
-
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
-if (! defined('TESTSUITE')) {
-    header('Content-Type: text/html; charset=utf-8');
-}
-?>
-<!DOCTYPE HTML>
-<html lang="<?php echo $lang; ?>" dir="<?php echo $dir; ?>">
-<head>
-    <link rel="icon" href="favicon.ico" type="image/x-icon" />
-    <link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
-    <title>phpMyAdmin</title>
-    <meta charset="utf-8" />
-    <style type="text/css">
-    <!--
-    html {
-        padding: 0;
-        margin: 0;
-    }
-    body  {
-        font-family: sans-serif;
-        font-size: small;
-        color: #000000;
-        background-color: #F5F5F5;
-        margin: 1em;
-    }
-    h1 {
-        margin: 0;
-        padding: 0.3em;
-        font-size: 1.4em;
-        font-weight: bold;
-        color: #ffffff;
-        background-color: #ff0000;
-    }
-    p {
-        margin: 0;
-        padding: 0.5em;
-        border: 0.1em solid red;
-        background-color: #ffeeee;
-    }
-    //-->
-    </style>
-</head>
-<body>
-<h1>phpMyAdmin - <?php echo $error_header; ?></h1>
-<p><?php echo PMA_sanitize($error_message); ?></p>
-</body>
-</html>
diff --git a/#pma/libraries/error_report.lib.php b/#pma/libraries/error_report.lib.php
deleted file mode 100644
index aa50f6c1..00000000
--- a/#pma/libraries/error_report.lib.php
+++ /dev/null
@@ -1,349 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Error reporting functions used to generate and submit error reports
- *
- * @package PhpMyAdmin
- */
-
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
-/**
- * The generated file that contains the line numbers for the js files
- * If you change any of the js files you can run the scripts/line-counts.sh
- */
-if (is_readable('js/line_counts.php')) {
-    include_once 'js/line_counts.php';
-}
-
-/**
- * the url where to submit reports to
- */
-define('SUBMISSION_URL', "https://reports.phpmyadmin.net/incidents/create");
-
-/**
- * returns the pretty printed error report data collected from the
- * current configuration or from the request parameters sent by the
- * error reporting js code.
- *
- * @return String the report
- */
-function PMA_getPrettyReportData()
-{
-    $report = PMA_getReportData();
-
-    return json_encode($report, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
-}
-
-/**
- * returns the error report data collected from the current configuration or
- * from the request parameters sent by the error reporting js code.
- *
- * @param string $exception_type whether exception is 'js' or 'php'
- *
- * @return array error report if success, Empty Array otherwise
- */
-function PMA_getReportData($exception_type = 'js')
-{
-    $relParams = PMA_getRelationsParam();
-    // common params for both, php & js exceptions
-    $report = array(
-            "pma_version" => PMA_VERSION,
-            "browser_name" => PMA_USR_BROWSER_AGENT,
-            "browser_version" => PMA_USR_BROWSER_VER,
-            "user_os" => PMA_USR_OS,
-            "server_software" => $_SERVER['SERVER_SOFTWARE'],
-            "user_agent_string" => $_SERVER['HTTP_USER_AGENT'],
-            "locale" => $_COOKIE['pma_lang'],
-            "configuration_storage" =>
-                is_null($relParams['db']) ? "disabled" :
-                "enabled",
-            "php_version" => phpversion()
-            );
-
-    if ($exception_type == 'js') {
-        if (empty($_REQUEST['exception'])) {
-            return array();
-        }
-        $exception = $_REQUEST['exception'];
-        $exception["stack"] = PMA_translateStacktrace($exception["stack"]);
-        List($uri, $script_name) = PMA_sanitizeUrl($exception["url"]);
-        $exception["uri"] = $uri;
-        unset($exception["url"]);
-
-        $report ["exception_type"] = 'js';
-        $report ["exception"] = $exception;
-        $report ["script_name"] = $script_name;
-        $report ["microhistory"] = $_REQUEST['microhistory'];
-
-        if (! empty($_REQUEST['description'])) {
-            $report['steps'] = $_REQUEST['description'];
-        }
-    } elseif ($exception_type == 'php') {
-        $errors = array();
-        // create php error report
-        $i = 0;
-        if (!isset($_SESSION['prev_errors'])
-            || $_SESSION['prev_errors'] == ''
-        ) {
-            return array();
-        }
-        foreach ($_SESSION['prev_errors'] as $errorObj) {
-            /* @var $errorObj PMA\libraries\Error */
-            if ($errorObj->getLine()
-                && $errorObj->getType()
-                && $errorObj->getNumber() != E_USER_WARNING
-            ) {
-                $errors[$i++] = array(
-                    "lineNum" => $errorObj->getLine(),
-                    "file" => $errorObj->getFile(),
-                    "type" => $errorObj->getType(),
-                    "msg" => $errorObj->getOnlyMessage(),
-                    "stackTrace" => $errorObj->getBacktrace(5),
-                    "stackhash" => $errorObj->getHash()
-                    );
-
-            }
-        }
-
-        // if there were no 'actual' errors to be submitted.
-        if ($i==0) {
-            return array();   // then return empty array
-        }
-        $report ["exception_type"] = 'php';
-        $report["errors"] = $errors;
-    } else {
-        return array();
-    }
-
-    return $report;
-}
-
-/**
- * Sanitize a url to remove the identifiable host name and extract the
- * current script name from the url fragment
- *
- * It returns two things in an array. The first is the uri without the
- * hostname and identifying query params. The second is the name of the
- * php script in the url
- *
- * @param String $url the url to sanitize
- *
- * @return array the uri and script name
- */
-function PMA_sanitizeUrl($url)
-{
-    $components = parse_url($url);
-    if (isset($components["fragment"])
-        && preg_match("<PMAURL-\d+:>", $components["fragment"], $matches)
-    ) {
-        $uri = str_replace($matches[0], "", $components["fragment"]);
-        $url = "https://example.com/" . $uri;
-        $components = parse_url($url);
-    }
-
-    // get script name
-    preg_match("<([a-zA-Z\-_\d]*\.php)$>", $components["path"], $matches);
-    if (count($matches) < 2) {
-        $script_name = 'index.php';
-    } else {
-        $script_name = $matches[1];
-    }
-
-    // remove deployment specific details to make uri more generic
-    if (isset($components["query"])) {
-        parse_str($components["query"], $query_array);
-        unset($query_array["db"]);
-        unset($query_array["table"]);
-        unset($query_array["token"]);
-        unset($query_array["server"]);
-        $query = http_build_query($query_array);
-    } else {
-        $query = '';
-    }
-
-    $uri = $script_name . "?" . $query;
-    return array($uri, $script_name);
-}
-
-/**
- * Sends report data to the error reporting server
- *
- * @param array $report the report info to be sent
- *
- * @return String the reply of the server
- */
-function PMA_sendErrorReport($report)
-{
-    $data_string = json_encode($report);
-    if (function_exists('curl_init')) {
-        $curl_handle = curl_init(SUBMISSION_URL);
-        if ($curl_handle === false) {
-            return null;
-        }
-        $curl_handle = PMA\libraries\Util::configureCurl($curl_handle);
-        curl_setopt($curl_handle, CURLOPT_CUSTOMREQUEST, "POST");
-        curl_setopt(
-            $curl_handle, CURLOPT_HTTPHEADER,
-            array('Expect:', 'Content-Type: application/json')
-        );
-        curl_setopt($curl_handle, CURLOPT_POSTFIELDS, $data_string);
-        curl_setopt($curl_handle, CURLOPT_RETURNTRANSFER, 1);
-        $response = curl_exec($curl_handle);
-        curl_close($curl_handle);
-
-        return $response;
-    } else if (ini_get('allow_url_fopen')) {
-        $context = array("http" =>
-            array(
-                'method'  => 'POST',
-                'content' => $data_string,
-                'header' => "Content-Type: application/json\r\n",
-            )
-        );
-        $context = PMA\libraries\Util::handleContext($context);
-        $response = @file_get_contents(
-            SUBMISSION_URL,
-            false,
-            stream_context_create($context)
-        );
-        return $response;
-    }
-
-    return null;
-}
-
-/**
- * Returns number of lines in given javascript file.
- *
- * @param string $filename javascript filename
- *
- * @return Number of lines
- *
- * @todo Should gracefully handle non existing files
- */
-function PMA_countLines($filename)
-{
-    global $LINE_COUNT;
-    if (defined('LINE_COUNTS')) {
-        return $LINE_COUNT[$filename];
-    }
-
-    // ensure that the file is inside the phpMyAdmin folder
-    $depath = 1;
-    foreach (explode('/', $filename) as $part) {
-        if ($part == '..') {
-            $depath--;
-        } elseif ($part != '.' || $part === '') {
-            $depath++;
-        }
-        if ($depath < 0) {
-            return 0;
-        }
-    }
-
-    $linecount = 0;
-    $handle = fopen('./js/' . $filename, 'r');
-    while (!feof($handle)) {
-        $line = fgets($handle);
-        if ($line === false) {
-            break;
-        }
-        $linecount++;
-    }
-    fclose($handle);
-    return $linecount;
-}
-
-/**
- * returns the translated line number and the file name from the cumulative line
- * number and an array of files
- *
- * uses the $LINE_COUNT global array of file names and line numbers
- *
- * @param array   $filenames         list of files in order of concatenation
- * @param Integer $cumulative_number the cumulative line number in the
- *                                   concatenated files
- *
- * @return array the filename and line number
- * Returns two variables in an array:
- * - A String $filename the filename where the requested cumulative number
- *   exists
- * - Integer $linenumber the translated line number in the returned file
- */
-function PMA_getLineNumber($filenames, $cumulative_number)
-{
-    $cumulative_sum = 0;
-    foreach ($filenames as $filename) {
-        $filecount = PMA_countLines($filename);
-        if ($cumulative_number <= $cumulative_sum + $filecount + 2) {
-            $linenumber = $cumulative_number - $cumulative_sum;
-            break;
-        }
-        $cumulative_sum += $filecount + 2;
-    }
-    if (! isset($filename)) {
-        $filename = '';
-    }
-    return array($filename, $linenumber);
-}
-
-/**
- * translates the cumulative line numbers in the stack trace as well as sanitize
- * urls and trim long lines in the context
- *
- * @param array $stack the stack trace
- *
- * @return array $stack the modified stack trace
- */
-function PMA_translateStacktrace($stack)
-{
-    foreach ($stack as &$level) {
-        foreach ($level["context"] as &$line) {
-            if (mb_strlen($line) > 80) {
-                $line = mb_substr($line, 0, 75) . "//...";
-            }
-        }
-        if (preg_match("<js/get_scripts.js.php\?(.*)>", $level["url"], $matches)) {
-            parse_str($matches[1], $vars);
-            List($file_name, $line_number) = PMA_getLineNumber(
-                $vars["scripts"], $level["line"]
-            );
-            $level["filename"] = $file_name;
-            $level["line"] = $line_number;
-        } else {
-            unset($level["context"]);
-            List($uri, $script_name) = PMA_sanitizeUrl($level["url"]);
-            $level["uri"] = $uri;
-            $level["scriptname"] = $script_name;
-        }
-        unset($level["url"]);
-    }
-    unset($level);
-    return $stack;
-}
-
-/**
- * generates the error report form to collect user description and preview the
- * report before being sent
- *
- * @return String the form
- */
-function PMA_getErrorReportForm()
-{
-    $datas = array(
-        'report_data' => PMA_getPrettyReportData(),
-        'hidden_inputs' => PMA_URL_getHiddenInputs(),
-        'hidden_fields' => null,
-    );
-
-    $reportData = PMA_getReportData();
-    if (!empty($reportData)) {
-        $datas['hidden_fields'] = PMA_getHiddenFields($reportData);
-    }
-
-    return PMA\libraries\Template::get('error/report_form')
-        ->render($datas);
-}
diff --git a/#pma/libraries/export.lib.php b/#pma/libraries/export.lib.php
deleted file mode 100644
index 7a217950..00000000
--- a/#pma/libraries/export.lib.php
+++ /dev/null
@@ -1,1053 +0,0 @@
-<?php
-
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * function for the main export logic
- *
- * @package PhpMyAdmin
- */
-use PMA\libraries\Message;
-use PMA\libraries\plugins\ExportPlugin;
-use PMA\libraries\Table;
-use PMA\libraries\ZipFile;
-
-/**
- * Sets a session variable upon a possible fatal error during export
- *
- * @return void
- */
-function PMA_shutdownDuringExport()
-{
-    $error = error_get_last();
-    if ($error != null && mb_strpos($error['message'], "execution time")) {
-        //set session variable to check if there was error while exporting
-        $_SESSION['pma_export_error'] = $error['message'];
-    }
-}
-
-/**
- * Detect ob_gzhandler
- *
- * @return bool
- */
-function PMA_isGzHandlerEnabled()
-{
-    return in_array('ob_gzhandler', ob_list_handlers());
-}
-
-/**
- * Detect whether gzencode is needed; it might not be needed if
- * the server is already compressing by itself
- *
- * @return bool Whether gzencode is needed
- */
-function PMA_gzencodeNeeded()
-{
-    /*
-     * We should gzencode only if the function exists
-     * but we don't want to compress twice, therefore
-     * gzencode only if transparent compression is not enabled
-     * and gz compression was not asked via $cfg['OBGzip']
-     * but transparent compression does not apply when saving to server
-     */
-    $chromeAndGreaterThan43 = PMA_USR_BROWSER_AGENT == 'CHROME'
-        && PMA_USR_BROWSER_VER >= 43; // see bug #4942
-
-    if (@function_exists('gzencode')
-        && ((! @ini_get('zlib.output_compression')
-        && ! PMA_isGzHandlerEnabled())
-        || $GLOBALS['save_on_server']
-        || $chromeAndGreaterThan43)
-    ) {
-        return true;
-    } else {
-        return false;
-    }
-}
-
-/**
- * Output handler for all exports, if needed buffering, it stores data into
- * $dump_buffer, otherwise it prints them out.
- *
- * @param string $line the insert statement
- *
- * @return bool Whether output succeeded
- */
-function PMA_exportOutputHandler($line)
-{
-    global $time_start, $dump_buffer, $dump_buffer_len, $save_filename;
-
-    // Kanji encoding convert feature
-    if ($GLOBALS['output_kanji_conversion']) {
-        $line = PMA_Kanji_strConv(
-            $line,
-            $GLOBALS['knjenc'],
-            isset($GLOBALS['xkana']) ? $GLOBALS['xkana'] : ''
-        );
-    }
-
-    // If we have to buffer data, we will perform everything at once at the end
-    if ($GLOBALS['buffer_needed']) {
-
-        $dump_buffer .= $line;
-        if ($GLOBALS['onfly_compression']) {
-
-            $dump_buffer_len += mb_strlen($line);
-
-            if ($dump_buffer_len > $GLOBALS['memory_limit']) {
-                if ($GLOBALS['output_charset_conversion']) {
-                    $dump_buffer = PMA_convertString(
-                        'utf-8',
-                        $GLOBALS['charset'],
-                        $dump_buffer
-                    );
-                }
-                if ($GLOBALS['compression'] == 'gzip'
-                    && PMA_gzencodeNeeded()
-                ) {
-                    // as a gzipped file
-                    // without the optional parameter level because it bugs
-                    $dump_buffer = gzencode($dump_buffer);
-                }
-                if ($GLOBALS['save_on_server']) {
-                    $write_result = @fwrite($GLOBALS['file_handle'], $dump_buffer);
-                    // Here, use strlen rather than mb_strlen to get the length
-                    // in bytes to compare against the number of bytes written.
-                    if ($write_result != strlen($dump_buffer)) {
-                        $GLOBALS['message'] = Message::error(
-                            __('Insufficient space to save the file %s.')
-                        );
-                        $GLOBALS['message']->addParam($save_filename);
-                        return false;
-                    }
-                } else {
-                    echo $dump_buffer;
-                }
-                $dump_buffer = '';
-                $dump_buffer_len = 0;
-            }
-        } else {
-            $time_now = time();
-            if ($time_start >= $time_now + 30) {
-                $time_start = $time_now;
-                header('X-pmaPing: Pong');
-            } // end if
-        }
-    } else {
-        if ($GLOBALS['asfile']) {
-            if ($GLOBALS['output_charset_conversion']) {
-                $line = PMA_convertString(
-                    'utf-8',
-                    $GLOBALS['charset'],
-                    $line
-                );
-            }
-            if ($GLOBALS['save_on_server'] && mb_strlen($line) > 0) {
-                $write_result = @fwrite($GLOBALS['file_handle'], $line);
-                // Here, use strlen rather than mb_strlen to get the length
-                // in bytes to compare against the number of bytes written.
-                if (! $write_result
-                    || $write_result != strlen($line)
-                ) {
-                    $GLOBALS['message'] = Message::error(
-                        __('Insufficient space to save the file %s.')
-                    );
-                    $GLOBALS['message']->addParam($save_filename);
-                    return false;
-                }
-                $time_now = time();
-                if ($time_start >= $time_now + 30) {
-                    $time_start = $time_now;
-                    header('X-pmaPing: Pong');
-                } // end if
-            } else {
-                // We export as file - output normally
-                echo $line;
-            }
-        } else {
-            // We export as html - replace special chars
-            echo htmlspecialchars($line);
-        }
-    }
-    return true;
-} // end of the 'PMA_exportOutputHandler()' function
-
-/**
- * Returns HTML containing the footer for a displayed export
- *
- * @param string $back_button the link for going Back
- *
- * @return string $html the HTML output
- */
-function PMA_getHtmlForDisplayedExportFooter($back_button)
-{
-    /**
-     * Close the html tags and add the footers for on-screen export
-     */
-    $html = '</textarea>'
-        . '    </form>'
-        // bottom back button
-        . $back_button
-        . '</div>'
-        . '<script type="text/javascript">' . "\n"
-        . '//<![CDATA[' . "\n"
-        . 'var $body = $("body");' . "\n"
-        . '$("#textSQLDUMP")' . "\n"
-        . '.width($body.width() - 50)' . "\n"
-        . '.height($body.height() - 100);' . "\n"
-        . '//]]>' . "\n"
-        . '</script>' . "\n";
-    return $html;
-}
-
-/**
- * Computes the memory limit for export
- *
- * @return int $memory_limit the memory limit
- */
-function PMA_getMemoryLimitForExport()
-{
-    $memory_limit = trim(@ini_get('memory_limit'));
-    $memory_limit_num = (int)substr($memory_limit, 0, -1);
-    $lowerLastChar = strtolower(substr($memory_limit, -1));
-    // 2 MB as default
-    if (empty($memory_limit) || '-1' == $memory_limit) {
-        $memory_limit = 2 * 1024 * 1024;
-    } elseif ($lowerLastChar == 'm') {
-        $memory_limit = $memory_limit_num * 1024 * 1024;
-    } elseif ($lowerLastChar == 'k') {
-        $memory_limit = $memory_limit_num * 1024;
-    } elseif ($lowerLastChar == 'g') {
-        $memory_limit = $memory_limit_num * 1024 * 1024 * 1024;
-    } else {
-        $memory_limit = (int)$memory_limit;
-    }
-
-    // Some of memory is needed for other things and as threshold.
-    // During export I had allocated (see memory_get_usage function)
-    // approx 1.2MB so this comes from that.
-    if ($memory_limit > 1500000) {
-        $memory_limit -= 1500000;
-    }
-
-    // Some memory is needed for compression, assume 1/3
-    $memory_limit /= 8;
-    return $memory_limit;
-}
-
-/**
- * Return the filename and MIME type for export file
- *
- * @param string       $export_type       type of export
- * @param string       $remember_template whether to remember template
- * @param ExportPlugin $export_plugin     the export plugin
- * @param string       $compression       compression asked
- * @param string       $filename_template the filename template
- *
- * @return array the filename template and mime type
- */
-function PMA_getExportFilenameAndMimetype(
-    $export_type, $remember_template, $export_plugin, $compression,
-    $filename_template
-) {
-    if ($export_type == 'server') {
-        if (! empty($remember_template)) {
-            $GLOBALS['PMA_Config']->setUserValue(
-                'pma_server_filename_template',
-                'Export/file_template_server',
-                $filename_template
-            );
-        }
-    } elseif ($export_type == 'database') {
-        if (! empty($remember_template)) {
-            $GLOBALS['PMA_Config']->setUserValue(
-                'pma_db_filename_template',
-                'Export/file_template_database',
-                $filename_template
-            );
-        }
-    } else {
-        if (! empty($remember_template)) {
-            $GLOBALS['PMA_Config']->setUserValue(
-                'pma_table_filename_template',
-                'Export/file_template_table',
-                $filename_template
-            );
-        }
-    }
-    $filename = PMA\libraries\Util::expandUserString($filename_template);
-    // remove dots in filename (coming from either the template or already
-    // part of the filename) to avoid a remote code execution vulnerability
-    $filename = PMA_sanitizeFilename($filename, $replaceDots = true);
-
-    // Grab basic dump extension and mime type
-    // Check if the user already added extension;
-    // get the substring where the extension would be if it was included
-    $extension_start_pos = mb_strlen($filename) - mb_strlen(
-        $export_plugin->getProperties()->getExtension()
-    ) - 1;
-    $user_extension = mb_substr(
-        $filename, $extension_start_pos, mb_strlen($filename)
-    );
-    $required_extension = "." . $export_plugin->getProperties()->getExtension();
-    if (mb_strtolower($user_extension) != $required_extension) {
-        $filename  .= $required_extension;
-    }
-    $mime_type  = $export_plugin->getProperties()->getMimeType();
-
-    // If dump is going to be compressed, set correct mime_type and add
-    // compression to extension
-    if ($compression == 'gzip') {
-        $filename  .= '.gz';
-        $mime_type = 'application/x-gzip';
-    } elseif ($compression == 'zip') {
-        $filename  .= '.zip';
-        $mime_type = 'application/zip';
-    }
-    return array($filename, $mime_type);
-}
-
-/**
- * Open the export file
- *
- * @param string  $filename     the export filename
- * @param boolean $quick_export whether it's a quick export or not
- *
- * @return array the full save filename, possible message and the file handle
- */
-function PMA_openExportFile($filename, $quick_export)
-{
-    $file_handle = null;
-    $message = '';
-
-    $save_filename = PMA\libraries\Util::userDir($GLOBALS['cfg']['SaveDir'])
-        . preg_replace('@[/\\\\]@', '_', $filename);
-
-    if (file_exists($save_filename)
-        && ((! $quick_export && empty($_REQUEST['onserver_overwrite']))
-        || ($quick_export
-        && $_REQUEST['quick_export_onserver_overwrite'] != 'saveitover'))
-    ) {
-        $message = Message::error(
-            __(
-                'File %s already exists on server, '
-                . 'change filename or check overwrite option.'
-            )
-        );
-        $message->addParam($save_filename);
-    } elseif (@is_file($save_filename) && ! @is_writable($save_filename)) {
-        $message = Message::error(
-            __(
-                'The web server does not have permission '
-                . 'to save the file %s.'
-            )
-        );
-        $message->addParam($save_filename);
-    } elseif (! $file_handle = @fopen($save_filename, 'w')) {
-        $message = Message::error(
-            __(
-                'The web server does not have permission '
-                . 'to save the file %s.'
-            )
-        );
-        $message->addParam($save_filename);
-    }
-    return array($save_filename, $message, $file_handle);
-}
-
-/**
- * Close the export file
- *
- * @param resource $file_handle   the export file handle
- * @param string   $dump_buffer   the current dump buffer
- * @param string   $save_filename the export filename
- *
- * @return object $message a message object (or empty string)
- */
-function PMA_closeExportFile($file_handle, $dump_buffer, $save_filename)
-{
-    $write_result = @fwrite($file_handle, $dump_buffer);
-    fclose($file_handle);
-    // Here, use strlen rather than mb_strlen to get the length
-    // in bytes to compare against the number of bytes written.
-    if (mb_strlen($dump_buffer) > 0
-        && (! $write_result || $write_result != strlen($dump_buffer))
-    ) {
-        $message = new Message(
-            __('Insufficient space to save the file %s.'),
-            Message::ERROR,
-            array($save_filename)
-        );
-    } else {
-        $message = new Message(
-            __('Dump has been saved to file %s.'),
-            Message::SUCCESS,
-            array($save_filename)
-        );
-    }
-    return $message;
-}
-
-/**
- * Compress the export buffer
- *
- * @param array|string $dump_buffer the current dump buffer
- * @param string       $compression the compression mode
- * @param string       $filename    the filename
- *
- * @return object $message a message object (or empty string)
- */
-function PMA_compressExport($dump_buffer, $compression, $filename)
-{
-    if ($compression == 'zip' && @function_exists('gzcompress')) {
-        $filename = substr($filename, 0, -4); // remove extension (.zip)
-        $zipfile = new ZipFile();
-        if (is_array($dump_buffer)) {
-            foreach ($dump_buffer as $table => $dump) {
-                $ext_pos = strpos($filename, '.');
-                $extension = substr($filename, $ext_pos);
-                $zipfile->addFile(
-                    $dump,
-                    str_replace(
-                        $extension,
-                        '_' . $table . $extension,
-                        $filename
-                    )
-                );
-            }
-        } else {
-            $zipfile->addFile($dump_buffer, $filename);
-        }
-        $dump_buffer = $zipfile->file();
-    } elseif ($compression == 'gzip' && PMA_gzencodeNeeded()) {
-        // without the optional parameter level because it bugs
-        $dump_buffer = gzencode($dump_buffer);
-    }
-    return $dump_buffer;
-}
-
-/**
- * Saves the dump_buffer for a particular table in an array
- * Used in separate files export
- *
- * @param string  $object_name the name of current object to be stored
- * @param boolean $append      optional boolean to append to an existing index or not
- *
- * @return void
- */
-function PMA_saveObjectInBuffer($object_name, $append = false)
-{
-
-    global $dump_buffer_objects, $dump_buffer, $dump_buffer_len;
-
-    if (! empty($dump_buffer)) {
-        if ($append && isset($dump_buffer_objects[$object_name])) {
-            $dump_buffer_objects[$object_name] .= $dump_buffer;
-        } else {
-            $dump_buffer_objects[$object_name] = $dump_buffer;
-        }
-    }
-
-    // Re - initialize
-    $dump_buffer = '';
-    $dump_buffer_len = 0;
-
-}
-
-/**
- * Returns HTML containing the header for a displayed export
- *
- * @param string $export_type the export type
- * @param string $db          the database name
- * @param string $table       the table name
- *
- * @return array the generated HTML and back button
- */
-function PMA_getHtmlForDisplayedExportHeader($export_type, $db, $table)
-{
-    $html = '<div style="text-align: ' . $GLOBALS['cell_align_left'] . '">';
-
-    /**
-     * Displays a back button with all the $_REQUEST data in the URL
-     * (store in a variable to also display after the textarea)
-     */
-    $back_button = '<p>[ <a href="';
-    if ($export_type == 'server') {
-        $back_button .= 'server_export.php' . PMA_URL_getCommon();
-    } elseif ($export_type == 'database') {
-        $back_button .= 'db_export.php' . PMA_URL_getCommon(array('db' => $db));
-    } else {
-        $back_button .= 'tbl_export.php' . PMA_URL_getCommon(
-            array(
-                'db' => $db, 'table' => $table
-            )
-        );
-    }
-
-    // Convert the multiple select elements from an array to a string
-    if ($export_type == 'server' && isset($_REQUEST['db_select'])) {
-        $_REQUEST['db_select'] = implode(",", $_REQUEST['db_select']);
-    } elseif ($export_type == 'database') {
-        if (isset($_REQUEST['table_select'])) {
-            $_REQUEST['table_select'] = implode(",", $_REQUEST['table_select']);
-        }
-        if (isset($_REQUEST['table_structure'])) {
-            $_REQUEST['table_structure'] = implode(
-                ",",
-                $_REQUEST['table_structure']
-            );
-        } else if (empty($_REQUEST['structure_or_data_forced'])) {
-            $_REQUEST['table_structure'] = '';
-        }
-        if (isset($_REQUEST['table_data'])) {
-            $_REQUEST['table_data'] = implode(",", $_REQUEST['table_data']);
-        } else if (empty($_REQUEST['structure_or_data_forced'])) {
-            $_REQUEST['table_data'] = '';
-        }
-    }
-
-    foreach ($_REQUEST as $name => $value) {
-        if (!is_array($value)) {
-            $back_button .= '&amp;' . urlencode($name) . '=' . urlencode($value);
-        }
-    }
-    $back_button .= '&amp;repopulate=1">' . __('Back') . '</a> ]</p>';
-
-    $html .= $back_button
-        . '<form name="nofunction">'
-        . '<textarea name="sqldump" cols="50" rows="30" '
-        . 'id="textSQLDUMP" wrap="OFF">';
-
-    return array($html, $back_button);
-}
-
-/**
- * Export at the server level
- *
- * @param string       $db_select       the selected databases to export
- * @param string       $whatStrucOrData structure or data or both
- * @param ExportPlugin $export_plugin   the selected export plugin
- * @param string       $crlf            end of line character(s)
- * @param string       $err_url         the URL in case of error
- * @param string       $export_type     the export type
- * @param bool         $do_relation     whether to export relation info
- * @param bool         $do_comments     whether to add comments
- * @param bool         $do_mime         whether to add MIME info
- * @param bool         $do_dates        whether to add dates
- * @param array        $aliases         alias information for db/table/column
- * @param string       $separate_files  whether it is a separate-files export
- *
- * @return void
- */
-function PMA_exportServer(
-    $db_select, $whatStrucOrData, $export_plugin, $crlf, $err_url,
-    $export_type, $do_relation, $do_comments, $do_mime, $do_dates,
-    $aliases, $separate_files
-) {
-    if (! empty($db_select)) {
-        $tmp_select = implode($db_select, '|');
-        $tmp_select = '|' . $tmp_select . '|';
-    }
-    // Walk over databases
-    foreach ($GLOBALS['dblist']->databases as $current_db) {
-        if (isset($tmp_select)
-            && mb_strpos(' ' . $tmp_select, '|' . $current_db . '|')
-        ) {
-            $tables = $GLOBALS['dbi']->getTables($current_db);
-            PMA_exportDatabase(
-                $current_db, $tables, $whatStrucOrData, $tables, $tables,
-                $export_plugin, $crlf, $err_url, $export_type, $do_relation,
-                $do_comments, $do_mime, $do_dates, $aliases,
-                $separate_files == 'database' ? $separate_files : ''
-            );
-            if ($separate_files == 'server') {
-                PMA_saveObjectInBuffer($current_db);
-            }
-        }
-    } // end foreach database
-}
-
-/**
- * Export at the database level
- *
- * @param string       $db              the database to export
- * @param array        $tables          the tables to export
- * @param string       $whatStrucOrData structure or data or both
- * @param array        $table_structure whether to export structure for each table
- * @param array        $table_data      whether to export data for each table
- * @param ExportPlugin $export_plugin   the selected export plugin
- * @param string       $crlf            end of line character(s)
- * @param string       $err_url         the URL in case of error
- * @param string       $export_type     the export type
- * @param bool         $do_relation     whether to export relation info
- * @param bool         $do_comments     whether to add comments
- * @param bool         $do_mime         whether to add MIME info
- * @param bool         $do_dates        whether to add dates
- * @param array        $aliases         Alias information for db/table/column
- * @param string       $separate_files  whether it is a separate-files export
- *
- * @return void
- */
-function PMA_exportDatabase(
-    $db, $tables, $whatStrucOrData, $table_structure, $table_data,
-    $export_plugin, $crlf, $err_url, $export_type, $do_relation,
-    $do_comments, $do_mime, $do_dates, $aliases, $separate_files
-) {
-    $db_alias = !empty($aliases[$db]['alias'])
-        ? $aliases[$db]['alias'] : '';
-
-    if (! $export_plugin->exportDBHeader($db, $db_alias)) {
-        return;
-    }
-    if (! $export_plugin->exportDBCreate($db, $export_type, $db_alias)) {
-        return;
-    }
-    if ($separate_files == 'database') {
-        PMA_saveObjectInBuffer('database', true);
-    }
-
-    if (($GLOBALS['sql_structure_or_data'] == 'structure'
-        || $GLOBALS['sql_structure_or_data'] == 'structure_and_data')
-        && isset($GLOBALS['sql_procedure_function'])
-    ) {
-        $export_plugin->exportRoutines($db, $aliases);
-
-        if ($separate_files == 'database') {
-            PMA_saveObjectInBuffer('routines');
-        }
-    }
-
-    $views = array();
-
-    foreach ($tables as $table) {
-        $_table = new Table($table, $db);
-        // if this is a view, collect it for later;
-        // views must be exported after the tables
-        $is_view = $_table->isView();
-        if ($is_view) {
-            $views[] = $table;
-        }
-        if (($whatStrucOrData == 'structure'
-            || $whatStrucOrData == 'structure_and_data')
-            && in_array($table, $table_structure)
-        ) {
-            // for a view, export a stand-in definition of the table
-            // to resolve view dependencies (only when it's a single-file export)
-            if ($is_view) {
-                if ($separate_files == ''
-                    && isset($GLOBALS['sql_create_view'])
-                    && ! $export_plugin->exportStructure(
-                        $db, $table, $crlf, $err_url, 'stand_in',
-                        $export_type, $do_relation, $do_comments,
-                        $do_mime, $do_dates, $aliases
-                    )
-                ) {
-                    break;
-                }
-            } else if (isset($GLOBALS['sql_create_table'])) {
-
-                $table_size = $GLOBALS['maxsize'];
-                // Checking if the maximum table size constrain has been set
-                // And if that constrain is a valid number or not
-                if ($table_size !== '' && is_numeric($table_size)) {
-                    // This obtains the current table's size
-                    $query = 'SELECT data_length + index_length
-                          from information_schema.TABLES
-                          WHERE table_schema = "' . $GLOBALS['dbi']->escapeString($db) . '"
-                          AND table_name = "' . $GLOBALS['dbi']->escapeString($table) . '"';
-
-                    $size = $GLOBALS['dbi']->fetchValue($query);
-                    //Converting the size to MB
-                    $size = ($size / 1024) / 1024;
-                    if ($size > $table_size) {
-                        continue;
-                    }
-                }
-
-                if (! $export_plugin->exportStructure(
-                    $db, $table, $crlf, $err_url, 'create_table',
-                    $export_type, $do_relation, $do_comments,
-                    $do_mime, $do_dates, $aliases
-                )) {
-                    break;
-                }
-
-            }
-
-        }
-        // if this is a view or a merge table, don't export data
-        if (($whatStrucOrData == 'data' || $whatStrucOrData == 'structure_and_data')
-            && in_array($table, $table_data)
-            && ! ($is_view)
-        ) {
-            $tableObj = new PMA\libraries\Table($table, $db);
-            $nonGeneratedCols = $tableObj->getNonGeneratedColumns(true);
-
-            $local_query  = 'SELECT ' . implode(', ', $nonGeneratedCols)
-                .  ' FROM ' . PMA\libraries\Util::backquote($db)
-                . '.' . PMA\libraries\Util::backquote($table);
-
-            if (! $export_plugin->exportData(
-                $db, $table, $crlf, $err_url, $local_query, $aliases
-            )) {
-                break;
-            }
-        }
-
-        // this buffer was filled, we save it and go to the next one
-        if ($separate_files == 'database') {
-            PMA_saveObjectInBuffer('table_' . $table);
-        }
-
-        // now export the triggers (needs to be done after the data because
-        // triggers can modify already imported tables)
-        if (isset($GLOBALS['sql_create_trigger']) && ($whatStrucOrData == 'structure'
-            || $whatStrucOrData == 'structure_and_data')
-            && in_array($table, $table_structure)
-        ) {
-            if (! $export_plugin->exportStructure(
-                $db, $table, $crlf, $err_url, 'triggers',
-                $export_type, $do_relation, $do_comments,
-                $do_mime, $do_dates, $aliases
-            )) {
-                break;
-            }
-
-            if ($separate_files == 'database') {
-                PMA_saveObjectInBuffer('table_' . $table, true);
-            }
-        }
-
-    }
-
-    if (isset($GLOBALS['sql_create_view'])) {
-
-        foreach ($views as $view) {
-            // no data export for a view
-            if ($whatStrucOrData == 'structure'
-                || $whatStrucOrData == 'structure_and_data'
-            ) {
-                if (! $export_plugin->exportStructure(
-                    $db, $view, $crlf, $err_url, 'create_view',
-                    $export_type, $do_relation, $do_comments,
-                    $do_mime, $do_dates, $aliases
-                )) {
-                    break;
-                }
-
-                if ($separate_files == 'database') {
-                    PMA_saveObjectInBuffer('view_' . $view);
-                }
-            }
-        }
-
-    }
-
-    if (! $export_plugin->exportDBFooter($db)) {
-        return;
-    }
-
-    // export metadata related to this db
-    if (isset($GLOBALS['sql_metadata'])) {
-        // Types of metadata to export.
-        // In the future these can be allowed to be selected by the user
-        $metadataTypes = PMA_getMetadataTypesToExport();
-        $export_plugin->exportMetadata($db, $tables, $metadataTypes);
-
-        if ($separate_files == 'database') {
-            PMA_saveObjectInBuffer('metadata');
-        }
-    }
-
-    if ($separate_files == 'database') {
-        PMA_saveObjectInBuffer('extra');
-    }
-
-    if (($GLOBALS['sql_structure_or_data'] == 'structure'
-        || $GLOBALS['sql_structure_or_data'] == 'structure_and_data')
-        && isset($GLOBALS['sql_procedure_function'])
-    ) {
-        $export_plugin->exportEvents($db);
-
-        if ($separate_files == 'database') {
-            PMA_saveObjectInBuffer('events');
-        }
-    }
-}
-
-/**
- * Export at the table level
- *
- * @param string       $db              the database to export
- * @param string       $table           the table to export
- * @param string       $whatStrucOrData structure or data or both
- * @param ExportPlugin $export_plugin   the selected export plugin
- * @param string       $crlf            end of line character(s)
- * @param string       $err_url         the URL in case of error
- * @param string       $export_type     the export type
- * @param bool         $do_relation     whether to export relation info
- * @param bool         $do_comments     whether to add comments
- * @param bool         $do_mime         whether to add MIME info
- * @param bool         $do_dates        whether to add dates
- * @param string       $allrows         whether "dump all rows" was ticked
- * @param string       $limit_to        upper limit
- * @param string       $limit_from      starting limit
- * @param string       $sql_query       query for which exporting is requested
- * @param array        $aliases         Alias information for db/table/column
- *
- * @return void
- */
-function PMA_exportTable(
-    $db, $table, $whatStrucOrData, $export_plugin, $crlf, $err_url,
-    $export_type, $do_relation, $do_comments, $do_mime, $do_dates,
-    $allrows, $limit_to, $limit_from, $sql_query, $aliases
-) {
-    $db_alias = !empty($aliases[$db]['alias'])
-        ? $aliases[$db]['alias'] : '';
-    if (! $export_plugin->exportDBHeader($db, $db_alias)) {
-        return;
-    }
-    if (isset($allrows)
-        && $allrows == '0'
-        && $limit_to > 0
-        && $limit_from >= 0
-    ) {
-        $add_query  = ' LIMIT '
-                    . (($limit_from > 0) ? $limit_from . ', ' : '')
-                    . $limit_to;
-    } else {
-        $add_query  = '';
-    }
-
-    $_table = new Table($table, $db);
-    $is_view = $_table->isView();
-    if ($whatStrucOrData == 'structure'
-        || $whatStrucOrData == 'structure_and_data'
-    ) {
-
-        if ($is_view) {
-
-            if (isset($GLOBALS['sql_create_view'])) {
-                if (! $export_plugin->exportStructure(
-                    $db, $table, $crlf, $err_url, 'create_view',
-                    $export_type, $do_relation, $do_comments,
-                    $do_mime, $do_dates, $aliases
-                )) {
-                    return;
-                }
-            }
-
-        } else if (isset($GLOBALS['sql_create_table'])) {
-
-            if (! $export_plugin->exportStructure(
-                $db, $table, $crlf, $err_url, 'create_table',
-                $export_type, $do_relation, $do_comments,
-                $do_mime, $do_dates, $aliases
-            )) {
-                return;
-            }
-
-        }
-
-    }
-    // If this is an export of a single view, we have to export data;
-    // for example, a PDF report
-    // if it is a merge table, no data is exported
-    if ($whatStrucOrData == 'data'
-        || $whatStrucOrData == 'structure_and_data'
-    ) {
-        if (! empty($sql_query)) {
-            // only preg_replace if needed
-            if (! empty($add_query)) {
-                // remove trailing semicolon before adding a LIMIT
-                $sql_query = preg_replace('%;\s*$%', '', $sql_query);
-            }
-            $local_query = $sql_query . $add_query;
-            $GLOBALS['dbi']->selectDb($db);
-        } else {
-            // Data is exported only for Non-generated columns
-            $tableObj = new PMA\libraries\Table($table, $db);
-            $nonGeneratedCols = $tableObj->getNonGeneratedColumns(true);
-
-            $local_query  = 'SELECT ' . implode(', ', $nonGeneratedCols)
-                .  ' FROM ' . PMA\libraries\Util::backquote($db)
-                . '.' . PMA\libraries\Util::backquote($table) . $add_query;
-        }
-        if (! $export_plugin->exportData(
-            $db, $table, $crlf, $err_url, $local_query, $aliases
-        )) {
-            return;
-        }
-    }
-    // now export the triggers (needs to be done after the data because
-    // triggers can modify already imported tables)
-    if (isset($GLOBALS['sql_create_trigger']) && ($whatStrucOrData == 'structure'
-        || $whatStrucOrData == 'structure_and_data')
-    ) {
-        if (! $export_plugin->exportStructure(
-            $db, $table, $crlf, $err_url, 'triggers',
-            $export_type, $do_relation, $do_comments,
-            $do_mime, $do_dates, $aliases
-        )) {
-            return;
-        }
-    }
-    if (! $export_plugin->exportDBFooter($db)) {
-        return;
-    }
-
-    if (isset($GLOBALS['sql_metadata'])) {
-        // Types of metadata to export.
-        // In the future these can be allowed to be selected by the user
-        $metadataTypes = PMA_getMetadataTypesToExport();
-        $export_plugin->exportMetadata($db, $table, $metadataTypes);
-    }
-}
-
-/**
- * Loads correct page after doing export
- *
- * @param string $db          the database name
- * @param string $table       the table name
- * @param string $export_type Export type
- *
- * @return void
- */
-function PMA_showExportPage($db, $table, $export_type)
-{
-    global $cfg;
-    if ($export_type == 'server') {
-        $active_page = 'server_export.php';
-        include_once 'server_export.php';
-    } elseif ($export_type == 'database') {
-        $active_page = 'db_export.php';
-        include_once 'db_export.php';
-    } else {
-        $active_page = 'tbl_export.php';
-        include_once 'tbl_export.php';
-    }
-    exit();
-}
-
-/**
- * Merge two alias arrays, if array1 and array2 have
- * conflicting alias then array2 value is used if it
- * is non empty otherwise array1 value.
- *
- * @param array $aliases1 first array of aliases
- * @param array $aliases2 second array of aliases
- *
- * @return array resultant merged aliases info
- */
-function PMA_mergeAliases($aliases1, $aliases2)
-{
-    // First do a recursive array merge
-    // on aliases arrays.
-    $aliases = array_merge_recursive($aliases1, $aliases2);
-    // Now, resolve conflicts in aliases, if any
-    foreach ($aliases as $db_name => $db) {
-        // If alias key is an array then
-        // it is a merge conflict.
-        if (isset($db['alias']) && is_array($db['alias'])) {
-            $val1 = $db['alias'][0];
-            $val2 = $db['alias'][1];
-            // Use aliases2 alias if non empty
-            $aliases[$db_name]['alias']
-                = empty($val2) ? $val1 : $val2;
-        }
-        if (!isset($db['tables'])) {
-            continue;
-        }
-        foreach ($db['tables'] as $tbl_name => $tbl) {
-            if (isset($tbl['alias']) && is_array($tbl['alias'])) {
-                $val1 = $tbl['alias'][0];
-                $val2 = $tbl['alias'][1];
-                // Use aliases2 alias if non empty
-                $aliases[$db_name]['tables'][$tbl_name]['alias']
-                    = empty($val2) ? $val1 : $val2;
-            }
-            if (!isset($tbl['columns'])) {
-                continue;
-            }
-            foreach ($tbl['columns'] as  $col => $col_as) {
-                if (isset($col_as) && is_array($col_as)) {
-                    $val1 = $col_as[0];
-                    $val2 = $col_as[1];
-                    // Use aliases2 alias if non empty
-                    $aliases[$db_name]['tables'][$tbl_name]['columns'][$col]
-                        = empty($val2) ? $val1 : $val2;
-                }
-            };
-        };
-    }
-    return $aliases;
-}
-
-/**
- * Locks tables
- *
- * @param string $db       database name
- * @param array  $tables   list of table names
- * @param string $lockType lock type; "[LOW_PRIORITY] WRITE" or "READ [LOCAL]"
- *
- * @return mixed result of the query
- */
-function PMA_lockTables($db, $tables, $lockType = "WRITE")
-{
-    $locks = array();
-    foreach ($tables as $table) {
-        $locks[] = PMA\libraries\Util::backquote($db) . "."
-            . PMA\libraries\Util::backquote($table) . " " . $lockType;
-    }
-
-    $sql = "LOCK TABLES " . implode(", ", $locks);
-    return $GLOBALS['dbi']->tryQuery($sql);
-}
-
-/**
- * Releases table locks
- *
- * @return mixed result of the query
- */
-function PMA_unlockTables()
-{
-    return $GLOBALS['dbi']->tryQuery("UNLOCK TABLES");
-}
-
-/**
- * Returns all the metadata types that can be exported with a database or a table
- *
- * @return array metadata types.
- */
-function PMA_getMetadataTypesToExport()
-{
-    return array(
-        'column_info',
-        'table_uiprefs',
-        'tracking',
-        'bookmark',
-        'relation',
-        'table_coords',
-        'pdf_pages',
-        'savedsearches',
-        'central_columns',
-        'export_templates',
-    );
-}
-
-/**
- * Returns the checked clause, depending on the presence of key in array
- *
- * @param string $key   the key to look for
- * @param array  $array array to verify
- *
- * @return string the checked clause
- */
-function PMA_getCheckedClause($key, $array)
-{
-    if (in_array($key, $array)) {
-        return ' checked="checked"';
-    } else {
-        return '';
-    }
-}
diff --git a/#pma/libraries/file_listing.lib.php b/#pma/libraries/file_listing.lib.php
deleted file mode 100644
index 64b469b0..00000000
--- a/#pma/libraries/file_listing.lib.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Functions for listing directories
- *
- * @package PhpMyAdmin
- */
-
-/**
- * Returns array of filtered file names
- *
- * @param string $dir        directory to list
- * @param string $expression regular expression to match files
- *
- * @return array   sorted file list on success, false on failure
- */
-function PMA_getDirContent($dir, $expression = '')
-{
-    if (!@file_exists($dir) || !($handle = @opendir($dir))) {
-        return false;
-    }
-
-    $result = array();
-    if (substr($dir, -1) != '/') {
-        $dir .= '/';
-    }
-    while ($file = @readdir($handle)) {
-        if (@is_file($dir . $file)
-            && ! @is_link($dir . $file)
-            && ($expression == '' || preg_match($expression, $file))
-        ) {
-            $result[] = $file;
-        }
-    }
-    closedir($handle);
-    asort($result);
-    return $result;
-}
-
-/**
- * Returns options of filtered file names
- *
- * @param string $dir        directory to list
- * @param string $extensions regular expression to match files
- * @param string $active     currently active choice
- *
- * @return array   sorted file list on success, false on failure
- */
-function PMA_getFileSelectOptions($dir, $extensions = '', $active = '')
-{
-    $list = PMA_getDirContent($dir, $extensions);
-    if ($list === false) {
-        return false;
-    }
-    $result = '';
-    foreach ($list as $val) {
-        $result .= '<option value="' . htmlspecialchars($val) . '"';
-        if ($val == $active) {
-            $result .= ' selected="selected"';
-        }
-        $result .= '>' . htmlspecialchars($val) . '</option>' . "\n";
-    }
-    return $result;
-}
-
-/**
- * Get currently supported decompressions.
- *
- * @return string separated list of extensions usable in PMA_getDirContent
- */
-function PMA_supportedDecompressions()
-{
-    global $cfg;
-
-    $compressions = '';
-
-    if ($cfg['GZipDump'] && @function_exists('gzopen')) {
-        if (!empty($compressions)) {
-            $compressions .= '|';
-        }
-        $compressions .= 'gz';
-    }
-    if ($cfg['BZipDump'] && @function_exists('bzopen')) {
-        if (!empty($compressions)) {
-            $compressions .= '|';
-        }
-        $compressions .= 'bz2';
-    }
-    if ($cfg['ZipDump'] && @function_exists('gzinflate')) {
-        if (!empty($compressions)) {
-            $compressions .= '|';
-        }
-        $compressions .= 'zip';
-    }
-
-    return $compressions;
-}
diff --git a/#pma/libraries/gis/GISFactory.php b/#pma/libraries/gis/GISFactory.php
deleted file mode 100644
index 3cf1b2a9..00000000
--- a/#pma/libraries/gis/GISFactory.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Contains the factory class that handles the creation of geometric objects
- *
- * @package PhpMyAdmin-GIS
- */
-
-namespace PMA\libraries\gis;
-
-use PMA;
-
-/**
- * Factory class that handles the creation of geometric objects.
- *
- * @package PhpMyAdmin-GIS
- */
-class GISFactory
-{
-    /**
-     * Returns the singleton instance of geometric class of the given type.
-     *
-     * @param string $type type of the geometric object
-     *
-     * @return GISGeometry the singleton instance of geometric class
-     *                          of the given type
-     *
-     * @access public
-     * @static
-     */
-    public static function factory($type)
-    {
-        switch (strtoupper($type)) {
-        case 'MULTIPOLYGON' :
-            return GISMultipolygon::singleton();
-        case 'POLYGON' :
-            return GISPolygon::singleton();
-        case 'MULTIPOINT' :
-            return GISMultipoint::singleton();
-        case 'POINT' :
-            return GISPoint::singleton();
-        case 'MULTILINESTRING' :
-            return GISMultilinestring::singleton();
-        case 'LINESTRING' :
-            return GISLinestring::singleton();
-        case 'GEOMETRYCOLLECTION' :
-            return GISGeometrycollection::singleton();
-        default :
-            return false;
-        }
-    }
-}
diff --git a/#pma/libraries/gis/GISGeometry.php b/#pma/libraries/gis/GISGeometry.php
deleted file mode 100644
index e84a405d..00000000
--- a/#pma/libraries/gis/GISGeometry.php
+++ /dev/null
@@ -1,399 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Base class for all GIS data type classes
- *
- * @package PhpMyAdmin-GIS
- */
-
-namespace PMA\libraries\gis;
-
-use \TCPDF;
-
-/**
- * Base class for all GIS data type classes.
- *
- * @package PhpMyAdmin-GIS
- */
-abstract class GISGeometry
-{
-    /**
-     * Prepares and returns the code related to a row in the GIS dataset as SVG.
-     *
-     * @param string $spatial    GIS data object
-     * @param string $label      label for the GIS data object
-     * @param string $color      color for the GIS data object
-     * @param array  $scale_data data related to scaling
-     *
-     * @return string the code related to a row in the GIS dataset
-     * @access public
-     */
-    public abstract function prepareRowAsSvg($spatial, $label, $color, $scale_data);
-
-    /**
-     * Adds to the PNG image object, the data related to a row in the GIS dataset.
-     *
-     * @param string $spatial    GIS data object
-     * @param string $label      label for the GIS data object
-     * @param string $color      color for the GIS data object
-     * @param array  $scale_data array containing data related to scaling
-     * @param object $image      image object
-     *
-     * @return object the modified image object
-     * @access public
-     */
-    public abstract function prepareRowAsPng(
-        $spatial,
-        $label,
-        $color,
-        $scale_data,
-        $image
-    );
-
-    /**
-     * Adds to the TCPDF instance, the data related to a row in the GIS dataset.
-     *
-     * @param string $spatial    GIS data object
-     * @param string $label      label for the GIS data object
-     * @param string $color      color for the GIS data object
-     * @param array  $scale_data array containing data related to scaling
-     * @param TCPDF  $pdf        TCPDF instance
-     *
-     * @return TCPDF the modified TCPDF instance
-     * @access public
-     */
-    public abstract function prepareRowAsPdf(
-        $spatial,
-        $label,
-        $color,
-        $scale_data,
-        $pdf
-    );
-
-    /**
-     * Prepares the JavaScript related to a row in the GIS dataset
-     * to visualize it with OpenLayers.
-     *
-     * @param string $spatial    GIS data object
-     * @param int    $srid       spatial reference ID
-     * @param string $label      label for the GIS data object
-     * @param string $color      color for the GIS data object
-     * @param array  $scale_data array containing data related to scaling
-     *
-     * @return string the JavaScript related to a row in the GIS dataset
-     * @access public
-     */
-    public abstract function prepareRowAsOl(
-        $spatial,
-        $srid,
-        $label,
-        $color,
-        $scale_data
-    );
-
-    /**
-     * Scales each row.
-     *
-     * @param string $spatial spatial data of a row
-     *
-     * @return array array containing the min, max values for x and y coordinates
-     * @access public
-     */
-    public abstract function scaleRow($spatial);
-
-    /**
-     * Generates the WKT with the set of parameters passed by the GIS editor.
-     *
-     * @param array  $gis_data GIS data
-     * @param int    $index    index into the parameter object
-     * @param string $empty    value for empty points
-     *
-     * @return string WKT with the set of parameters passed by the GIS editor
-     * @access public
-     */
-    public abstract function generateWkt($gis_data, $index, $empty = '');
-
-    /**
-     * Returns OpenLayers.Bounds object that correspond to the bounds of GIS data.
-     *
-     * @param string $srid       spatial reference ID
-     * @param array  $scale_data data related to scaling
-     *
-     * @return string OpenLayers.Bounds object that
-     *                correspond to the bounds of GIS data
-     * @access protected
-     */
-    protected function getBoundsForOl($srid, $scale_data)
-    {
-        return 'bound = new OpenLayers.Bounds(); '
-        . 'bound.extend(new OpenLayers.LonLat('
-        . $scale_data['minX'] . ', ' . $scale_data['minY']
-        . ').transform(new OpenLayers.Projection("EPSG:'
-        . intval($srid) . '"), map.getProjectionObject())); '
-        . 'bound.extend(new OpenLayers.LonLat('
-        . $scale_data['maxX'] . ', ' . $scale_data['maxY']
-        . ').transform(new OpenLayers.Projection("EPSG:'
-        . intval($srid) . '"), map.getProjectionObject()));';
-    }
-
-    /**
-     * Updates the min, max values with the given point set.
-     *
-     * @param string $point_set point set
-     * @param array  $min_max   existing min, max values
-     *
-     * @return array the updated min, max values
-     * @access protected
-     */
-    protected function setMinMax($point_set, $min_max)
-    {
-        // Separate each point
-        $points = explode(",", $point_set);
-
-        foreach ($points as $point) {
-            // Extract coordinates of the point
-            $cordinates = explode(" ", $point);
-
-            $x = (float)$cordinates[0];
-            if (!isset($min_max['maxX']) || $x > $min_max['maxX']) {
-                $min_max['maxX'] = $x;
-            }
-            if (!isset($min_max['minX']) || $x < $min_max['minX']) {
-                $min_max['minX'] = $x;
-            }
-            $y = (float)$cordinates[1];
-            if (!isset($min_max['maxY']) || $y > $min_max['maxY']) {
-                $min_max['maxY'] = $y;
-            }
-            if (!isset($min_max['minY']) || $y < $min_max['minY']) {
-                $min_max['minY'] = $y;
-            }
-        }
-
-        return $min_max;
-    }
-
-    /**
-     * Generates parameters for the GIS data editor from the value of the GIS column.
-     * This method performs common work.
-     * More specific work is performed by each of the geom classes.
-     *
-     * @param string $value value of the GIS column
-     *
-     * @return array parameters for the GIS editor from the value of the GIS column
-     * @access protected
-     */
-    protected function generateParams($value)
-    {
-        $geom_types = '(POINT|MULTIPOINT|LINESTRING|MULTILINESTRING'
-            . '|POLYGON|MULTIPOLYGON|GEOMETRYCOLLECTION)';
-        $srid = 0;
-        $wkt = '';
-
-        if (preg_match("/^'" . $geom_types . "\(.*\)',[0-9]*$/i", $value)) {
-            $last_comma = mb_strripos($value, ",");
-            $srid = trim(mb_substr($value, $last_comma + 1));
-            $wkt = trim(mb_substr($value, 1, $last_comma - 2));
-        } elseif (preg_match("/^" . $geom_types . "\(.*\)$/i", $value)) {
-            $wkt = $value;
-        }
-
-        return array('srid' => $srid, 'wkt' => $wkt);
-    }
-
-    /**
-     * Extracts points, scales and returns them as an array.
-     *
-     * @param string  $point_set  string of comma separated points
-     * @param array   $scale_data data related to scaling
-     * @param boolean $linear     if true, as a 1D array, else as a 2D array
-     *
-     * @return array scaled points
-     * @access protected
-     */
-    protected function extractPoints($point_set, $scale_data, $linear = false)
-    {
-        $points_arr = array();
-
-        // Separate each point
-        $points = explode(",", $point_set);
-
-        foreach ($points as $point) {
-            // Extract coordinates of the point
-            $cordinates = explode(" ", $point);
-
-            if (!empty($cordinates[0]) && trim($cordinates[0]) != ''
-                && isset($cordinates[1])
-                && trim($cordinates[1]) != ''
-            ) {
-                if ($scale_data != null) {
-                    $x = ($cordinates[0] - $scale_data['x']) * $scale_data['scale'];
-                    $y = $scale_data['height']
-                        - ($cordinates[1] - $scale_data['y']) * $scale_data['scale'];
-                } else {
-                    $x = floatval(trim($cordinates[0]));
-                    $y = floatval(trim($cordinates[1]));
-                }
-            } else {
-                $x = '';
-                $y = '';
-            }
-
-            if (!$linear) {
-                $points_arr[] = array($x, $y);
-            } else {
-                $points_arr[] = $x;
-                $points_arr[] = $y;
-            }
-        }
-
-        return $points_arr;
-    }
-
-    /**
-     * Generates JavaScript for adding an array of polygons to OpenLayers.
-     *
-     * @param array  $polygons x and y coordinates for each polygon
-     * @param string $srid     spatial reference id
-     *
-     * @return string JavaScript for adding an array of polygons to OpenLayers
-     * @access protected
-     */
-    protected function getPolygonArrayForOpenLayers($polygons, $srid)
-    {
-        $ol_array = 'new Array(';
-        foreach ($polygons as $polygon) {
-            $rings = explode("),(", $polygon);
-            $ol_array .= $this->getPolygonForOpenLayers($rings, $srid) . ', ';
-        }
-
-        $ol_array
-            = mb_substr(
-                $ol_array,
-                0,
-                mb_strlen($ol_array) - 2
-            );
-        $ol_array .= ')';
-
-        return $ol_array;
-    }
-
-    /**
-     * Generates JavaScript for adding points for OpenLayers polygon.
-     *
-     * @param array  $polygon x and y coordinates for each line
-     * @param string $srid    spatial reference id
-     *
-     * @return string JavaScript for adding points for OpenLayers polygon
-     * @access protected
-     */
-    protected function getPolygonForOpenLayers($polygon, $srid)
-    {
-        return 'new OpenLayers.Geometry.Polygon('
-        . $this->getLineArrayForOpenLayers($polygon, $srid, false)
-        . ')';
-    }
-
-    /**
-     * Generates JavaScript for adding an array of LineString
-     * or LineRing to OpenLayers.
-     *
-     * @param array  $lines          x and y coordinates for each line
-     * @param string $srid           spatial reference id
-     * @param bool   $is_line_string whether it's an array of LineString
-     *
-     * @return string JavaScript for adding an array of LineString
-     *                or LineRing to OpenLayers
-     * @access protected
-     */
-    protected function getLineArrayForOpenLayers(
-        $lines,
-        $srid,
-        $is_line_string = true
-    ) {
-        $ol_array = 'new Array(';
-        foreach ($lines as $line) {
-            $points_arr = $this->extractPoints($line, null);
-            $ol_array .= $this->getLineForOpenLayers(
-                $points_arr,
-                $srid,
-                $is_line_string
-            );
-            $ol_array .= ', ';
-        }
-
-        $ol_array
-            = mb_substr(
-                $ol_array,
-                0,
-                mb_strlen($ol_array) - 2
-            );
-        $ol_array .= ')';
-
-        return $ol_array;
-    }
-
-    /**
-     * Generates JavaScript for adding a LineString or LineRing to OpenLayers.
-     *
-     * @param array  $points_arr     x and y coordinates for each point
-     * @param string $srid           spatial reference id
-     * @param bool   $is_line_string whether it's a LineString
-     *
-     * @return string JavaScript for adding a LineString or LineRing to OpenLayers
-     * @access protected
-     */
-    protected function getLineForOpenLayers(
-        $points_arr,
-        $srid,
-        $is_line_string = true
-    ) {
-        return 'new OpenLayers.Geometry.'
-        . ($is_line_string ? 'LineString' : 'LinearRing') . '('
-        . $this->getPointsArrayForOpenLayers($points_arr, $srid)
-        . ')';
-    }
-
-    /**
-     * Generates JavaScript for adding an array of points to OpenLayers.
-     *
-     * @param array  $points_arr x and y coordinates for each point
-     * @param string $srid       spatial reference id
-     *
-     * @return string JavaScript for adding an array of points to OpenLayers
-     * @access protected
-     */
-    protected function getPointsArrayForOpenLayers($points_arr, $srid)
-    {
-        $ol_array = 'new Array(';
-        foreach ($points_arr as $point) {
-            $ol_array .= $this->getPointForOpenLayers($point, $srid) . ', ';
-        }
-
-        $ol_array
-            = mb_substr(
-                $ol_array,
-                0,
-                mb_strlen($ol_array) - 2
-            );
-        $ol_array .= ')';
-
-        return $ol_array;
-    }
-
-    /**
-     * Generates JavaScript for adding a point to OpenLayers.
-     *
-     * @param array  $point array containing the x and y coordinates of the point
-     * @param string $srid  spatial reference id
-     *
-     * @return string JavaScript for adding points to OpenLayers
-     * @access protected
-     */
-    protected function getPointForOpenLayers($point, $srid)
-    {
-        return '(new OpenLayers.Geometry.Point(' . $point[0] . ',' . $point[1] . '))'
-        . '.transform(new OpenLayers.Projection("EPSG:'
-        . intval($srid) . '"), map.getProjectionObject())';
-    }
-}
diff --git a/#pma/libraries/gis/GISGeometrycollection.php b/#pma/libraries/gis/GISGeometrycollection.php
deleted file mode 100644
index 932f0ff2..00000000
--- a/#pma/libraries/gis/GISGeometrycollection.php
+++ /dev/null
@@ -1,416 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Handles actions related to GIS GEOMETRYCOLLECTION objects
- *
- * @package PhpMyAdmin-GIS
- */
-
-namespace PMA\libraries\gis;
-
-use \TCPDF;
-
-/**
- * Handles actions related to GIS GEOMETRYCOLLECTION objects
- *
- * @package PhpMyAdmin-GIS
- */
-class GISGeometrycollection extends GISGeometry
-{
-    // Hold the singleton instance of the class
-    private static $_instance;
-
-    /**
-     * A private constructor; prevents direct creation of object.
-     *
-     * @access private
-     */
-    private function __construct()
-    {
-    }
-
-    /**
-     * Returns the singleton.
-     *
-     * @return GISGeometrycollection the singleton
-     * @access public
-     */
-    public static function singleton()
-    {
-        if (!isset(self::$_instance)) {
-            $class = __CLASS__;
-            self::$_instance = new $class;
-        }
-
-        return self::$_instance;
-    }
-
-    /**
-     * Scales each row.
-     *
-     * @param string $spatial spatial data of a row
-     *
-     * @return array array containing the min, max values for x and y coordinates
-     * @access public
-     */
-    public function scaleRow($spatial)
-    {
-        $min_max = array();
-
-        // Trim to remove leading 'GEOMETRYCOLLECTION(' and trailing ')'
-        $goem_col
-            = mb_substr(
-                $spatial,
-                19,
-                mb_strlen($spatial) - 20
-            );
-
-        // Split the geometry collection object to get its constituents.
-        $sub_parts = $this->_explodeGeomCol($goem_col);
-
-        foreach ($sub_parts as $sub_part) {
-            $type_pos = mb_strpos($sub_part, '(');
-            if ($type_pos === false) {
-                continue;
-            }
-            $type = mb_substr($sub_part, 0, $type_pos);
-
-            $gis_obj = GISFactory::factory($type);
-            if (!$gis_obj) {
-                continue;
-            }
-            $scale_data = $gis_obj->scaleRow($sub_part);
-
-            // Update minimum/maximum values for x and y coordinates.
-            $c_maxX = (float)$scale_data['maxX'];
-            if (!isset($min_max['maxX']) || $c_maxX > $min_max['maxX']) {
-                $min_max['maxX'] = $c_maxX;
-            }
-
-            $c_minX = (float)$scale_data['minX'];
-            if (!isset($min_max['minX']) || $c_minX < $min_max['minX']) {
-                $min_max['minX'] = $c_minX;
-            }
-
-            $c_maxY = (float)$scale_data['maxY'];
-            if (!isset($min_max['maxY']) || $c_maxY > $min_max['maxY']) {
-                $min_max['maxY'] = $c_maxY;
-            }
-
-            $c_minY = (float)$scale_data['minY'];
-            if (!isset($min_max['minY']) || $c_minY < $min_max['minY']) {
-                $min_max['minY'] = $c_minY;
-            }
-        }
-
-        return $min_max;
-    }
-
-    /**
-     * Adds to the PNG image object, the data related to a row in the GIS dataset.
-     *
-     * @param string $spatial    GIS GEOMETRYCOLLECTION object
-     * @param string $label      label for the GIS GEOMETRYCOLLECTION object
-     * @param string $color      color for the GIS GEOMETRYCOLLECTION object
-     * @param array  $scale_data array containing data related to scaling
-     * @param object $image      image object
-     *
-     * @return resource the modified image object
-     * @access public
-     */
-    public function prepareRowAsPng($spatial, $label, $color, $scale_data, $image)
-    {
-        // Trim to remove leading 'GEOMETRYCOLLECTION(' and trailing ')'
-        $goem_col
-            = mb_substr(
-                $spatial,
-                19,
-                mb_strlen($spatial) - 20
-            );
-        // Split the geometry collection object to get its constituents.
-        $sub_parts = $this->_explodeGeomCol($goem_col);
-
-        foreach ($sub_parts as $sub_part) {
-            $type_pos = mb_strpos($sub_part, '(');
-            if ($type_pos === false) {
-                continue;
-            }
-            $type = mb_substr($sub_part, 0, $type_pos);
-
-            $gis_obj = GISFactory::factory($type);
-            if (!$gis_obj) {
-                continue;
-            }
-            $image = $gis_obj->prepareRowAsPng(
-                $sub_part,
-                $label,
-                $color,
-                $scale_data,
-                $image
-            );
-        }
-
-        return $image;
-    }
-
-    /**
-     * Adds to the TCPDF instance, the data related to a row in the GIS dataset.
-     *
-     * @param string $spatial    GIS GEOMETRYCOLLECTION object
-     * @param string $label      label for the GIS GEOMETRYCOLLECTION object
-     * @param string $color      color for the GIS GEOMETRYCOLLECTION object
-     * @param array  $scale_data array containing data related to scaling
-     * @param TCPDF  $pdf        TCPDF instance
-     *
-     * @return TCPDF the modified TCPDF instance
-     * @access public
-     */
-    public function prepareRowAsPdf($spatial, $label, $color, $scale_data, $pdf)
-    {
-        // Trim to remove leading 'GEOMETRYCOLLECTION(' and trailing ')'
-        $goem_col
-            = mb_substr(
-                $spatial,
-                19,
-                mb_strlen($spatial) - 20
-            );
-        // Split the geometry collection object to get its constituents.
-        $sub_parts = $this->_explodeGeomCol($goem_col);
-
-        foreach ($sub_parts as $sub_part) {
-            $type_pos = mb_strpos($sub_part, '(');
-            if ($type_pos === false) {
-                continue;
-            }
-            $type = mb_substr($sub_part, 0, $type_pos);
-
-            $gis_obj = GISFactory::factory($type);
-            if (!$gis_obj) {
-                continue;
-            }
-            $pdf = $gis_obj->prepareRowAsPdf(
-                $sub_part,
-                $label,
-                $color,
-                $scale_data,
-                $pdf
-            );
-        }
-
-        return $pdf;
-    }
-
-    /**
-     * Prepares and returns the code related to a row in the GIS dataset as SVG.
-     *
-     * @param string $spatial    GIS GEOMETRYCOLLECTION object
-     * @param string $label      label for the GIS GEOMETRYCOLLECTION object
-     * @param string $color      color for the GIS GEOMETRYCOLLECTION object
-     * @param array  $scale_data array containing data related to scaling
-     *
-     * @return string the code related to a row in the GIS dataset
-     * @access public
-     */
-    public function prepareRowAsSvg($spatial, $label, $color, $scale_data)
-    {
-        $row = '';
-
-        // Trim to remove leading 'GEOMETRYCOLLECTION(' and trailing ')'
-        $goem_col
-            = mb_substr(
-                $spatial,
-                19,
-                mb_strlen($spatial) - 20
-            );
-        // Split the geometry collection object to get its constituents.
-        $sub_parts = $this->_explodeGeomCol($goem_col);
-
-        foreach ($sub_parts as $sub_part) {
-            $type_pos = mb_strpos($sub_part, '(');
-            if ($type_pos === false) {
-                continue;
-            }
-            $type = mb_substr($sub_part, 0, $type_pos);
-
-            $gis_obj = GISFactory::factory($type);
-            if (!$gis_obj) {
-                continue;
-            }
-            $row .= $gis_obj->prepareRowAsSvg(
-                $sub_part,
-                $label,
-                $color,
-                $scale_data
-            );
-        }
-
-        return $row;
-    }
-
-    /**
-     * Prepares JavaScript related to a row in the GIS dataset
-     * to visualize it with OpenLayers.
-     *
-     * @param string $spatial    GIS GEOMETRYCOLLECTION object
-     * @param int    $srid       spatial reference ID
-     * @param string $label      label for the GIS GEOMETRYCOLLECTION object
-     * @param string $color      color for the GIS GEOMETRYCOLLECTION object
-     * @param array  $scale_data array containing data related to scaling
-     *
-     * @return string JavaScript related to a row in the GIS dataset
-     * @access public
-     */
-    public function prepareRowAsOl($spatial, $srid, $label, $color, $scale_data)
-    {
-        $row = '';
-
-        // Trim to remove leading 'GEOMETRYCOLLECTION(' and trailing ')'
-        $goem_col
-            = mb_substr(
-                $spatial,
-                19,
-                mb_strlen($spatial) - 20
-            );
-        // Split the geometry collection object to get its constituents.
-        $sub_parts = $this->_explodeGeomCol($goem_col);
-
-        foreach ($sub_parts as $sub_part) {
-            $type_pos = mb_strpos($sub_part, '(');
-            if ($type_pos === false) {
-                continue;
-            }
-            $type = mb_substr($sub_part, 0, $type_pos);
-
-            $gis_obj = GISFactory::factory($type);
-            if (!$gis_obj) {
-                continue;
-            }
-            $row .= $gis_obj->prepareRowAsOl(
-                $sub_part,
-                $srid,
-                $label,
-                $color,
-                $scale_data
-            );
-        }
-
-        return $row;
-    }
-
-    /**
-     * Splits the GEOMETRYCOLLECTION object and get its constituents.
-     *
-     * @param string $geom_col geometry collection string
-     *
-     * @return array the constituents of the geometry collection object
-     * @access private
-     */
-    private function _explodeGeomCol($geom_col)
-    {
-        $sub_parts = array();
-        $br_count = 0;
-        $start = 0;
-        $count = 0;
-        foreach (str_split($geom_col) as $char) {
-            if ($char == '(') {
-                $br_count++;
-            } elseif ($char == ')') {
-                $br_count--;
-                if ($br_count == 0) {
-                    $sub_parts[]
-                        = mb_substr(
-                            $geom_col,
-                            $start,
-                            ($count + 1 - $start)
-                        );
-                    $start = $count + 2;
-                }
-            }
-            $count++;
-        }
-
-        return $sub_parts;
-    }
-
-    /**
-     * Generates the WKT with the set of parameters passed by the GIS editor.
-     *
-     * @param array  $gis_data GIS data
-     * @param int    $index    index into the parameter object
-     * @param string $empty    value for empty points
-     *
-     * @return string WKT with the set of parameters passed by the GIS editor
-     * @access public
-     */
-    public function generateWkt($gis_data, $index, $empty = '')
-    {
-        $geom_count = (isset($gis_data['GEOMETRYCOLLECTION']['geom_count']))
-            ? $gis_data['GEOMETRYCOLLECTION']['geom_count'] : 1;
-        $wkt = 'GEOMETRYCOLLECTION(';
-        for ($i = 0; $i < $geom_count; $i++) {
-            if (isset($gis_data[$i]['gis_type'])) {
-                $type = $gis_data[$i]['gis_type'];
-                $gis_obj = GISFactory::factory($type);
-                if (!$gis_obj) {
-                    continue;
-                }
-                $wkt .= $gis_obj->generateWkt($gis_data, $i, $empty) . ',';
-            }
-        }
-        if (isset($gis_data[0]['gis_type'])) {
-            $wkt
-                = mb_substr(
-                    $wkt,
-                    0,
-                    mb_strlen($wkt) - 1
-                );
-        }
-        $wkt .= ')';
-
-        return $wkt;
-    }
-
-    /**
-     * Generates parameters for the GIS data editor from the value of the GIS column.
-     *
-     * @param string $value of the GIS column
-     *
-     * @return array parameters for the GIS editor from the value of the GIS column
-     * @access public
-     */
-    public function generateParams($value)
-    {
-        $params = array();
-        $data = GISGeometry::generateParams($value);
-        $params['srid'] = $data['srid'];
-        $wkt = $data['wkt'];
-
-        // Trim to remove leading 'GEOMETRYCOLLECTION(' and trailing ')'
-        $goem_col
-            = mb_substr(
-                $wkt,
-                19,
-                mb_strlen($wkt) - 20
-            );
-        // Split the geometry collection object to get its constituents.
-        $sub_parts = $this->_explodeGeomCol($goem_col);
-        $params['GEOMETRYCOLLECTION']['geom_count'] = count($sub_parts);
-
-        $i = 0;
-        foreach ($sub_parts as $sub_part) {
-            $type_pos = mb_strpos($sub_part, '(');
-            if ($type_pos === false) {
-                continue;
-            }
-            $type = mb_substr($sub_part, 0, $type_pos);
-            $gis_obj = GISFactory::factory($type);
-            if (!$gis_obj) {
-                continue;
-            }
-            $params = array_merge($params, $gis_obj->generateParams($sub_part, $i));
-            $i++;
-        }
-
-        return $params;
-    }
-}
diff --git a/#pma/libraries/gis/GISLinestring.php b/#pma/libraries/gis/GISLinestring.php
deleted file mode 100644
index 0935c8ed..00000000
--- a/#pma/libraries/gis/GISLinestring.php
+++ /dev/null
@@ -1,353 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Handles actions related to GIS LINESTRING objects
- *
- * @package PhpMyAdmin-GIS
- */
-
-namespace PMA\libraries\gis;
-
-use \TCPDF;
-
-/**
- * Handles actions related to GIS LINESTRING objects
- *
- * @package PhpMyAdmin-GIS
- */
-class GISLinestring extends GISGeometry
-{
-    // Hold the singleton instance of the class
-    private static $_instance;
-
-    /**
-     * A private constructor; prevents direct creation of object.
-     *
-     * @access private
-     */
-    private function __construct()
-    {
-    }
-
-    /**
-     * Returns the singleton.
-     *
-     * @return GISLinestring the singleton
-     * @access public
-     */
-    public static function singleton()
-    {
-        if (!isset(self::$_instance)) {
-            $class = __CLASS__;
-            self::$_instance = new $class;
-        }
-
-        return self::$_instance;
-    }
-
-    /**
-     * Scales each row.
-     *
-     * @param string $spatial spatial data of a row
-     *
-     * @return array an array containing the min, max values for x and y coordinates
-     * @access public
-     */
-    public function scaleRow($spatial)
-    {
-        // Trim to remove leading 'LINESTRING(' and trailing ')'
-        $linestring
-            = mb_substr(
-                $spatial,
-                11,
-                mb_strlen($spatial) - 12
-            );
-
-        return $this->setMinMax($linestring, array());
-    }
-
-    /**
-     * Adds to the PNG image object, the data related to a row in the GIS dataset.
-     *
-     * @param string $spatial    GIS LINESTRING object
-     * @param string $label      Label for the GIS LINESTRING object
-     * @param string $line_color Color for the GIS LINESTRING object
-     * @param array  $scale_data Array containing data related to scaling
-     * @param object $image      Image object
-     *
-     * @return resource the modified image object
-     * @access public
-     */
-    public function prepareRowAsPng(
-        $spatial,
-        $label,
-        $line_color,
-        $scale_data,
-        $image
-    ) {
-        // allocate colors
-        $black = imagecolorallocate($image, 0, 0, 0);
-        $red = hexdec(mb_substr($line_color, 1, 2));
-        $green = hexdec(mb_substr($line_color, 3, 2));
-        $blue = hexdec(mb_substr($line_color, 4, 2));
-        $color = imagecolorallocate($image, $red, $green, $blue);
-
-        // Trim to remove leading 'LINESTRING(' and trailing ')'
-        $linesrting
-            = mb_substr(
-                $spatial,
-                11,
-                mb_strlen($spatial) - 12
-            );
-        $points_arr = $this->extractPoints($linesrting, $scale_data);
-
-        foreach ($points_arr as $point) {
-            if (!isset($temp_point)) {
-                $temp_point = $point;
-            } else {
-                // draw line section
-                imageline(
-                    $image,
-                    $temp_point[0],
-                    $temp_point[1],
-                    $point[0],
-                    $point[1],
-                    $color
-                );
-                $temp_point = $point;
-            }
-        }
-        // print label if applicable
-        if (isset($label) && trim($label) != '') {
-            imagestring(
-                $image,
-                1,
-                $points_arr[1][0],
-                $points_arr[1][1],
-                trim($label),
-                $black
-            );
-        }
-
-        return $image;
-    }
-
-    /**
-     * Adds to the TCPDF instance, the data related to a row in the GIS dataset.
-     *
-     * @param string $spatial    GIS LINESTRING object
-     * @param string $label      Label for the GIS LINESTRING object
-     * @param string $line_color Color for the GIS LINESTRING object
-     * @param array  $scale_data Array containing data related to scaling
-     * @param TCPDF  $pdf        TCPDF instance
-     *
-     * @return TCPDF the modified TCPDF instance
-     * @access public
-     */
-    public function prepareRowAsPdf($spatial, $label, $line_color, $scale_data, $pdf)
-    {
-        // allocate colors
-        $red = hexdec(mb_substr($line_color, 1, 2));
-        $green = hexdec(mb_substr($line_color, 3, 2));
-        $blue = hexdec(mb_substr($line_color, 4, 2));
-        $line = array('width' => 1.5, 'color' => array($red, $green, $blue));
-
-        // Trim to remove leading 'LINESTRING(' and trailing ')'
-        $linesrting
-            = mb_substr(
-                $spatial,
-                11,
-                mb_strlen($spatial) - 12
-            );
-        $points_arr = $this->extractPoints($linesrting, $scale_data);
-
-        foreach ($points_arr as $point) {
-            if (!isset($temp_point)) {
-                $temp_point = $point;
-            } else {
-                // draw line section
-                $pdf->Line(
-                    $temp_point[0],
-                    $temp_point[1],
-                    $point[0],
-                    $point[1],
-                    $line
-                );
-                $temp_point = $point;
-            }
-        }
-        // print label
-        if (isset($label) && trim($label) != '') {
-            $pdf->SetXY($points_arr[1][0], $points_arr[1][1]);
-            $pdf->SetFontSize(5);
-            $pdf->Cell(0, 0, trim($label));
-        }
-
-        return $pdf;
-    }
-
-    /**
-     * Prepares and returns the code related to a row in the GIS dataset as SVG.
-     *
-     * @param string $spatial    GIS LINESTRING object
-     * @param string $label      Label for the GIS LINESTRING object
-     * @param string $line_color Color for the GIS LINESTRING object
-     * @param array  $scale_data Array containing data related to scaling
-     *
-     * @return string the code related to a row in the GIS dataset
-     * @access public
-     */
-    public function prepareRowAsSvg($spatial, $label, $line_color, $scale_data)
-    {
-        $line_options = array(
-            'name'         => $label,
-            'id'           => $label . rand(),
-            'class'        => 'linestring vector',
-            'fill'         => 'none',
-            'stroke'       => $line_color,
-            'stroke-width' => 2,
-        );
-
-        // Trim to remove leading 'LINESTRING(' and trailing ')'
-        $linesrting
-            = mb_substr(
-                $spatial,
-                11,
-                mb_strlen($spatial) - 12
-            );
-        $points_arr = $this->extractPoints($linesrting, $scale_data);
-
-        $row = '<polyline points="';
-        foreach ($points_arr as $point) {
-            $row .= $point[0] . ',' . $point[1] . ' ';
-        }
-        $row .= '"';
-        foreach ($line_options as $option => $val) {
-            $row .= ' ' . $option . '="' . trim($val) . '"';
-        }
-        $row .= '/>';
-
-        return $row;
-    }
-
-    /**
-     * Prepares JavaScript related to a row in the GIS dataset
-     * to visualize it with OpenLayers.
-     *
-     * @param string $spatial    GIS LINESTRING object
-     * @param int    $srid       Spatial reference ID
-     * @param string $label      Label for the GIS LINESTRING object
-     * @param string $line_color Color for the GIS LINESTRING object
-     * @param array  $scale_data Array containing data related to scaling
-     *
-     * @return string JavaScript related to a row in the GIS dataset
-     * @access public
-     */
-    public function prepareRowAsOl($spatial, $srid, $label, $line_color, $scale_data)
-    {
-        $style_options = array(
-            'strokeColor' => $line_color,
-            'strokeWidth' => 2,
-            'label'       => $label,
-            'fontSize'    => 10,
-        );
-        if ($srid == 0) {
-            $srid = 4326;
-        }
-        $result = $this->getBoundsForOl($srid, $scale_data);
-
-        // Trim to remove leading 'LINESTRING(' and trailing ')'
-        $linesrting
-            = mb_substr(
-                $spatial,
-                11,
-                mb_strlen($spatial) - 12
-            );
-        $points_arr = $this->extractPoints($linesrting, null);
-
-        $result .= 'vectorLayer.addFeatures(new OpenLayers.Feature.Vector('
-            . $this->getLineForOpenLayers($points_arr, $srid)
-            . ', null, ' . json_encode($style_options) . '));';
-
-        return $result;
-    }
-
-    /**
-     * Generate the WKT with the set of parameters passed by the GIS editor.
-     *
-     * @param array  $gis_data GIS data
-     * @param int    $index    Index into the parameter object
-     * @param string $empty    Value for empty points
-     *
-     * @return string WKT with the set of parameters passed by the GIS editor
-     * @access public
-     */
-    public function generateWkt($gis_data, $index, $empty = '')
-    {
-        $no_of_points = isset($gis_data[$index]['LINESTRING']['no_of_points'])
-            ? $gis_data[$index]['LINESTRING']['no_of_points'] : 2;
-        if ($no_of_points < 2) {
-            $no_of_points = 2;
-        }
-        $wkt = 'LINESTRING(';
-        for ($i = 0; $i < $no_of_points; $i++) {
-            $wkt .= ((isset($gis_data[$index]['LINESTRING'][$i]['x'])
-                    && trim($gis_data[$index]['LINESTRING'][$i]['x']) != '')
-                    ? $gis_data[$index]['LINESTRING'][$i]['x'] : $empty)
-                . ' ' . ((isset($gis_data[$index]['LINESTRING'][$i]['y'])
-                    && trim($gis_data[$index]['LINESTRING'][$i]['y']) != '')
-                    ? $gis_data[$index]['LINESTRING'][$i]['y'] : $empty) . ',';
-        }
-
-        $wkt
-            = mb_substr(
-                $wkt,
-                0,
-                mb_strlen($wkt) - 1
-            );
-        $wkt .= ')';
-
-        return $wkt;
-    }
-
-    /**
-     * Generate parameters for the GIS data editor from the value of the GIS column.
-     *
-     * @param string $value of the GIS column
-     * @param int    $index of the geometry
-     *
-     * @return array params for the GIS data editor from the value of the GIS column
-     * @access public
-     */
-    public function generateParams($value, $index = -1)
-    {
-        $params = array();
-        if ($index == -1) {
-            $index = 0;
-            $data = GISGeometry::generateParams($value);
-            $params['srid'] = $data['srid'];
-            $wkt = $data['wkt'];
-        } else {
-            $params[$index]['gis_type'] = 'LINESTRING';
-            $wkt = $value;
-        }
-
-        // Trim to remove leading 'LINESTRING(' and trailing ')'
-        $linestring
-            = mb_substr(
-                $wkt,
-                11,
-                mb_strlen($wkt) - 12
-            );
-        $points_arr = $this->extractPoints($linestring, null);
-
-        $no_of_points = count($points_arr);
-        $params[$index]['LINESTRING']['no_of_points'] = $no_of_points;
-        for ($i = 0; $i < $no_of_points; $i++) {
-            $params[$index]['LINESTRING'][$i]['x'] = $points_arr[$i][0];
-            $params[$index]['LINESTRING'][$i]['y'] = $points_arr[$i][1];
-        }
-
-        return $params;
-    }
-}
diff --git a/#pma/libraries/gis/GISMultilinestring.php b/#pma/libraries/gis/GISMultilinestring.php
deleted file mode 100644
index 398815ef..00000000
--- a/#pma/libraries/gis/GISMultilinestring.php
+++ /dev/null
@@ -1,441 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Handles actions related to GIS MULTILINESTRING objects
- *
- * @package PhpMyAdmin-GIS
- */
-
-namespace PMA\libraries\gis;
-
-use \TCPDF;
-
-/**
- * Handles actions related to GIS MULTILINESTRING objects
- *
- * @package PhpMyAdmin-GIS
- */
-class GISMultilinestring extends GISGeometry
-{
-    // Hold the singleton instance of the class
-    private static $_instance;
-
-    /**
-     * A private constructor; prevents direct creation of object.
-     *
-     * @access private
-     */
-    private function __construct()
-    {
-    }
-
-    /**
-     * Returns the singleton.
-     *
-     * @return GISMultilinestring the singleton
-     * @access public
-     */
-    public static function singleton()
-    {
-        if (!isset(self::$_instance)) {
-            $class = __CLASS__;
-            self::$_instance = new $class;
-        }
-
-        return self::$_instance;
-    }
-
-    /**
-     * Scales each row.
-     *
-     * @param string $spatial spatial data of a row
-     *
-     * @return array an array containing the min, max values for x and y coordinates
-     * @access public
-     */
-    public function scaleRow($spatial)
-    {
-        $min_max = array();
-
-        // Trim to remove leading 'MULTILINESTRING((' and trailing '))'
-        $multilinestirng
-            = mb_substr(
-                $spatial,
-                17,
-                mb_strlen($spatial) - 19
-            );
-        // Separate each linestring
-        $linestirngs = explode("),(", $multilinestirng);
-
-        foreach ($linestirngs as $linestring) {
-            $min_max = $this->setMinMax($linestring, $min_max);
-        }
-
-        return $min_max;
-    }
-
-    /**
-     * Adds to the PNG image object, the data related to a row in the GIS dataset.
-     *
-     * @param string $spatial    GIS MULTILINESTRING object
-     * @param string $label      Label for the GIS MULTILINESTRING object
-     * @param string $line_color Color for the GIS MULTILINESTRING object
-     * @param array  $scale_data Array containing data related to scaling
-     * @param object $image      Image object
-     *
-     * @return object the modified image object
-     * @access public
-     */
-    public function prepareRowAsPng(
-        $spatial,
-        $label,
-        $line_color,
-        $scale_data,
-        $image
-    ) {
-        // allocate colors
-        $black = imagecolorallocate($image, 0, 0, 0);
-        $red = hexdec(mb_substr($line_color, 1, 2));
-        $green = hexdec(mb_substr($line_color, 3, 2));
-        $blue = hexdec(mb_substr($line_color, 4, 2));
-        $color = imagecolorallocate($image, $red, $green, $blue);
-
-        // Trim to remove leading 'MULTILINESTRING((' and trailing '))'
-        $multilinestirng
-            = mb_substr(
-                $spatial,
-                17,
-                mb_strlen($spatial) - 19
-            );
-        // Separate each linestring
-        $linestirngs = explode("),(", $multilinestirng);
-
-        $first_line = true;
-        foreach ($linestirngs as $linestring) {
-            $points_arr = $this->extractPoints($linestring, $scale_data);
-            foreach ($points_arr as $point) {
-                if (!isset($temp_point)) {
-                    $temp_point = $point;
-                } else {
-                    // draw line section
-                    imageline(
-                        $image,
-                        $temp_point[0],
-                        $temp_point[1],
-                        $point[0],
-                        $point[1],
-                        $color
-                    );
-                    $temp_point = $point;
-                }
-            }
-            unset($temp_point);
-            // print label if applicable
-            if (isset($label) && trim($label) != '' && $first_line) {
-                imagestring(
-                    $image,
-                    1,
-                    $points_arr[1][0],
-                    $points_arr[1][1],
-                    trim($label),
-                    $black
-                );
-            }
-            $first_line = false;
-        }
-
-        return $image;
-    }
-
-    /**
-     * Adds to the TCPDF instance, the data related to a row in the GIS dataset.
-     *
-     * @param string $spatial    GIS MULTILINESTRING object
-     * @param string $label      Label for the GIS MULTILINESTRING object
-     * @param string $line_color Color for the GIS MULTILINESTRING object
-     * @param array  $scale_data Array containing data related to scaling
-     * @param TCPDF  $pdf        TCPDF instance
-     *
-     * @return TCPDF the modified TCPDF instance
-     * @access public
-     */
-    public function prepareRowAsPdf($spatial, $label, $line_color, $scale_data, $pdf)
-    {
-        // allocate colors
-        $red = hexdec(mb_substr($line_color, 1, 2));
-        $green = hexdec(mb_substr($line_color, 3, 2));
-        $blue = hexdec(mb_substr($line_color, 4, 2));
-        $line = array('width' => 1.5, 'color' => array($red, $green, $blue));
-
-        // Trim to remove leading 'MULTILINESTRING((' and trailing '))'
-        $multilinestirng
-            = mb_substr(
-                $spatial,
-                17,
-                mb_strlen($spatial) - 19
-            );
-        // Separate each linestring
-        $linestirngs = explode("),(", $multilinestirng);
-
-        $first_line = true;
-        foreach ($linestirngs as $linestring) {
-            $points_arr = $this->extractPoints($linestring, $scale_data);
-            foreach ($points_arr as $point) {
-                if (!isset($temp_point)) {
-                    $temp_point = $point;
-                } else {
-                    // draw line section
-                    $pdf->Line(
-                        $temp_point[0],
-                        $temp_point[1],
-                        $point[0],
-                        $point[1],
-                        $line
-                    );
-                    $temp_point = $point;
-                }
-            }
-            unset($temp_point);
-            // print label
-            if (isset($label) && trim($label) != '' && $first_line) {
-                $pdf->SetXY($points_arr[1][0], $points_arr[1][1]);
-                $pdf->SetFontSize(5);
-                $pdf->Cell(0, 0, trim($label));
-            }
-            $first_line = false;
-        }
-
-        return $pdf;
-    }
-
-    /**
-     * Prepares and returns the code related to a row in the GIS dataset as SVG.
-     *
-     * @param string $spatial    GIS MULTILINESTRING object
-     * @param string $label      Label for the GIS MULTILINESTRING object
-     * @param string $line_color Color for the GIS MULTILINESTRING object
-     * @param array  $scale_data Array containing data related to scaling
-     *
-     * @return string the code related to a row in the GIS dataset
-     * @access public
-     */
-    public function prepareRowAsSvg($spatial, $label, $line_color, $scale_data)
-    {
-        $line_options = array(
-            'name'         => $label,
-            'class'        => 'linestring vector',
-            'fill'         => 'none',
-            'stroke'       => $line_color,
-            'stroke-width' => 2,
-        );
-
-        // Trim to remove leading 'MULTILINESTRING((' and trailing '))'
-        $multilinestirng
-            = mb_substr(
-                $spatial,
-                17,
-                mb_strlen($spatial) - 19
-            );
-        // Separate each linestring
-        $linestirngs = explode("),(", $multilinestirng);
-
-        $row = '';
-        foreach ($linestirngs as $linestring) {
-            $points_arr = $this->extractPoints($linestring, $scale_data);
-
-            $row .= '<polyline points="';
-            foreach ($points_arr as $point) {
-                $row .= $point[0] . ',' . $point[1] . ' ';
-            }
-            $row .= '"';
-            $line_options['id'] = $label . rand();
-            foreach ($line_options as $option => $val) {
-                $row .= ' ' . $option . '="' . trim($val) . '"';
-            }
-            $row .= '/>';
-        }
-
-        return $row;
-    }
-
-    /**
-     * Prepares JavaScript related to a row in the GIS dataset
-     * to visualize it with OpenLayers.
-     *
-     * @param string $spatial    GIS MULTILINESTRING object
-     * @param int    $srid       Spatial reference ID
-     * @param string $label      Label for the GIS MULTILINESTRING object
-     * @param string $line_color Color for the GIS MULTILINESTRING object
-     * @param array  $scale_data Array containing data related to scaling
-     *
-     * @return string JavaScript related to a row in the GIS dataset
-     * @access public
-     */
-    public function prepareRowAsOl($spatial, $srid, $label, $line_color, $scale_data)
-    {
-        $style_options = array(
-            'strokeColor' => $line_color,
-            'strokeWidth' => 2,
-            'label'       => $label,
-            'fontSize'    => 10,
-        );
-        if ($srid == 0) {
-            $srid = 4326;
-        }
-        $row = $this->getBoundsForOl($srid, $scale_data);
-
-        // Trim to remove leading 'MULTILINESTRING((' and trailing '))'
-        $multilinestirng
-            = mb_substr(
-                $spatial,
-                17,
-                mb_strlen($spatial) - 19
-            );
-        // Separate each linestring
-        $linestirngs = explode("),(", $multilinestirng);
-
-        $row .= 'vectorLayer.addFeatures(new OpenLayers.Feature.Vector('
-            . 'new OpenLayers.Geometry.MultiLineString('
-            . $this->getLineArrayForOpenLayers($linestirngs, $srid)
-            . '), null, ' . json_encode($style_options) . '));';
-
-        return $row;
-    }
-
-    /**
-     * Generate the WKT with the set of parameters passed by the GIS editor.
-     *
-     * @param array  $gis_data GIS data
-     * @param int    $index    Index into the parameter object
-     * @param string $empty    Value for empty points
-     *
-     * @return string WKT with the set of parameters passed by the GIS editor
-     * @access public
-     */
-    public function generateWkt($gis_data, $index, $empty = '')
-    {
-        $data_row = $gis_data[$index]['MULTILINESTRING'];
-
-        $no_of_lines = isset($data_row['no_of_lines'])
-            ? $data_row['no_of_lines'] : 1;
-        if ($no_of_lines < 1) {
-            $no_of_lines = 1;
-        }
-
-        $wkt = 'MULTILINESTRING(';
-        for ($i = 0; $i < $no_of_lines; $i++) {
-            $no_of_points = isset($data_row[$i]['no_of_points'])
-                ? $data_row[$i]['no_of_points'] : 2;
-            if ($no_of_points < 2) {
-                $no_of_points = 2;
-            }
-            $wkt .= '(';
-            for ($j = 0; $j < $no_of_points; $j++) {
-                $wkt .= ((isset($data_row[$i][$j]['x'])
-                        && trim($data_row[$i][$j]['x']) != '')
-                        ? $data_row[$i][$j]['x'] : $empty)
-                    . ' ' . ((isset($data_row[$i][$j]['y'])
-                        && trim($data_row[$i][$j]['y']) != '')
-                        ? $data_row[$i][$j]['y'] : $empty) . ',';
-            }
-            $wkt
-                = mb_substr(
-                    $wkt,
-                    0, mb_strlen($wkt) - 1
-                );
-            $wkt .= '),';
-        }
-        $wkt
-            = mb_substr(
-                $wkt,
-                0,
-                mb_strlen($wkt) - 1
-            );
-        $wkt .= ')';
-
-        return $wkt;
-    }
-
-    /**
-     * Generate the WKT for the data from ESRI shape files.
-     *
-     * @param array $row_data GIS data
-     *
-     * @return string the WKT for the data from ESRI shape files
-     * @access public
-     */
-    public function getShape($row_data)
-    {
-        $wkt = 'MULTILINESTRING(';
-        for ($i = 0; $i < $row_data['numparts']; $i++) {
-            $wkt .= '(';
-            foreach ($row_data['parts'][$i]['points'] as $point) {
-                $wkt .= $point['x'] . ' ' . $point['y'] . ',';
-            }
-            $wkt
-                = mb_substr(
-                    $wkt,
-                    0,
-                    mb_strlen($wkt) - 1
-                );
-            $wkt .= '),';
-        }
-        $wkt
-            = mb_substr(
-                $wkt,
-                0,
-                mb_strlen($wkt) - 1
-            );
-        $wkt .= ')';
-
-        return $wkt;
-    }
-
-    /**
-     * Generate parameters for the GIS data editor from the value of the GIS column.
-     *
-     * @param string $value Value of the GIS column
-     * @param int    $index Index of the geometry
-     *
-     * @return array params for the GIS data editor from the value of the GIS column
-     * @access public
-     */
-    public function generateParams($value, $index = -1)
-    {
-        $params = array();
-        if ($index == -1) {
-            $index = 0;
-            $data = GISGeometry::generateParams($value);
-            $params['srid'] = $data['srid'];
-            $wkt = $data['wkt'];
-        } else {
-            $params[$index]['gis_type'] = 'MULTILINESTRING';
-            $wkt = $value;
-        }
-
-        // Trim to remove leading 'MULTILINESTRING((' and trailing '))'
-        $multilinestirng
-            = mb_substr(
-                $wkt,
-                17,
-                mb_strlen($wkt) - 19
-            );
-        // Separate each linestring
-        $linestirngs = explode("),(", $multilinestirng);
-        $params[$index]['MULTILINESTRING']['no_of_lines'] = count($linestirngs);
-
-        $j = 0;
-        foreach ($linestirngs as $linestring) {
-            $points_arr = $this->extractPoints($linestring, null);
-            $no_of_points = count($points_arr);
-            $params[$index]['MULTILINESTRING'][$j]['no_of_points'] = $no_of_points;
-            for ($i = 0; $i < $no_of_points; $i++) {
-                $params[$index]['MULTILINESTRING'][$j][$i]['x'] = $points_arr[$i][0];
-                $params[$index]['MULTILINESTRING'][$j][$i]['y'] = $points_arr[$i][1];
-            }
-            $j++;
-        }
-
-        return $params;
-    }
-}
diff --git a/#pma/libraries/gis/GISMultipoint.php b/#pma/libraries/gis/GISMultipoint.php
deleted file mode 100644
index e63c0034..00000000
--- a/#pma/libraries/gis/GISMultipoint.php
+++ /dev/null
@@ -1,409 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Handles actions related to GIS MULTIPOINT objects
- *
- * @package PhpMyAdmin-GIS
- */
-
-namespace PMA\libraries\gis;
-
-use \TCPDF;
-
-/**
- * Handles actions related to GIS MULTIPOINT objects
- *
- * @package PhpMyAdmin-GIS
- */
-class GISMultipoint extends GISGeometry
-{
-    // Hold the singleton instance of the class
-    private static $_instance;
-
-    /**
-     * A private constructor; prevents direct creation of object.
-     *
-     * @access private
-     */
-    private function __construct()
-    {
-    }
-
-    /**
-     * Returns the singleton.
-     *
-     * @return GISMultipoint the singleton
-     * @access public
-     */
-    public static function singleton()
-    {
-        if (!isset(self::$_instance)) {
-            $class = __CLASS__;
-            self::$_instance = new $class;
-        }
-
-        return self::$_instance;
-    }
-
-    /**
-     * Scales each row.
-     *
-     * @param string $spatial spatial data of a row
-     *
-     * @return array an array containing the min, max values for x and y coordinates
-     * @access public
-     */
-    public function scaleRow($spatial)
-    {
-        // Trim to remove leading 'MULTIPOINT(' and trailing ')'
-        $multipoint
-            = mb_substr(
-                $spatial,
-                11,
-                mb_strlen($spatial) - 12
-            );
-
-        return $this->setMinMax($multipoint, array());
-    }
-
-    /**
-     * Adds to the PNG image object, the data related to a row in the GIS dataset.
-     *
-     * @param string $spatial     GIS MULTIPOINT object
-     * @param string $label       Label for the GIS MULTIPOINT object
-     * @param string $point_color Color for the GIS MULTIPOINT object
-     * @param array  $scale_data  Array containing data related to scaling
-     * @param object $image       Image object
-     *
-     * @return object the modified image object
-     * @access public
-     */
-    public function prepareRowAsPng(
-        $spatial,
-        $label,
-        $point_color,
-        $scale_data,
-        $image
-    ) {
-        // allocate colors
-        $black = imagecolorallocate($image, 0, 0, 0);
-        $red = hexdec(mb_substr($point_color, 1, 2));
-        $green = hexdec(mb_substr($point_color, 3, 2));
-        $blue = hexdec(mb_substr($point_color, 4, 2));
-        $color = imagecolorallocate($image, $red, $green, $blue);
-
-        // Trim to remove leading 'MULTIPOINT(' and trailing ')'
-        $multipoint
-            = mb_substr(
-                $spatial,
-                11,
-                mb_strlen($spatial) - 12
-            );
-        $points_arr = $this->extractPoints($multipoint, $scale_data);
-
-        foreach ($points_arr as $point) {
-            // draw a small circle to mark the point
-            if ($point[0] != '' && $point[1] != '') {
-                imagearc($image, $point[0], $point[1], 7, 7, 0, 360, $color);
-            }
-        }
-        // print label for each point
-        if ((isset($label) && trim($label) != '')
-            && ($points_arr[0][0] != '' && $points_arr[0][1] != '')
-        ) {
-            imagestring(
-                $image,
-                1,
-                $points_arr[0][0],
-                $points_arr[0][1],
-                trim($label),
-                $black
-            );
-        }
-
-        return $image;
-    }
-
-    /**
-     * Adds to the TCPDF instance, the data related to a row in the GIS dataset.
-     *
-     * @param string $spatial     GIS MULTIPOINT object
-     * @param string $label       Label for the GIS MULTIPOINT object
-     * @param string $point_color Color for the GIS MULTIPOINT object
-     * @param array  $scale_data  Array containing data related to scaling
-     * @param TCPDF  $pdf         TCPDF instance
-     *
-     * @return TCPDF the modified TCPDF instance
-     * @access public
-     */
-    public function prepareRowAsPdf(
-        $spatial,
-        $label,
-        $point_color,
-        $scale_data,
-        $pdf
-    ) {
-        // allocate colors
-        $red = hexdec(mb_substr($point_color, 1, 2));
-        $green = hexdec(mb_substr($point_color, 3, 2));
-        $blue = hexdec(mb_substr($point_color, 4, 2));
-        $line = array('width' => 1.25, 'color' => array($red, $green, $blue));
-
-        // Trim to remove leading 'MULTIPOINT(' and trailing ')'
-        $multipoint
-            = mb_substr(
-                $spatial,
-                11,
-                mb_strlen($spatial) - 12
-            );
-        $points_arr = $this->extractPoints($multipoint, $scale_data);
-
-        foreach ($points_arr as $point) {
-            // draw a small circle to mark the point
-            if ($point[0] != '' && $point[1] != '') {
-                $pdf->Circle($point[0], $point[1], 2, 0, 360, 'D', $line);
-            }
-        }
-        // print label for each point
-        if ((isset($label) && trim($label) != '')
-            && ($points_arr[0][0] != '' && $points_arr[0][1] != '')
-        ) {
-            $pdf->SetXY($points_arr[0][0], $points_arr[0][1]);
-            $pdf->SetFontSize(5);
-            $pdf->Cell(0, 0, trim($label));
-        }
-
-        return $pdf;
-    }
-
-    /**
-     * Prepares and returns the code related to a row in the GIS dataset as SVG.
-     *
-     * @param string $spatial     GIS MULTIPOINT object
-     * @param string $label       Label for the GIS MULTIPOINT object
-     * @param string $point_color Color for the GIS MULTIPOINT object
-     * @param array  $scale_data  Array containing data related to scaling
-     *
-     * @return string the code related to a row in the GIS dataset
-     * @access public
-     */
-    public function prepareRowAsSvg($spatial, $label, $point_color, $scale_data)
-    {
-        $point_options = array(
-            'name'         => $label,
-            'class'        => 'multipoint vector',
-            'fill'         => 'white',
-            'stroke'       => $point_color,
-            'stroke-width' => 2,
-        );
-
-        // Trim to remove leading 'MULTIPOINT(' and trailing ')'
-        $multipoint
-            = mb_substr(
-                $spatial,
-                11,
-                mb_strlen($spatial) - 12
-            );
-        $points_arr = $this->extractPoints($multipoint, $scale_data);
-
-        $row = '';
-        foreach ($points_arr as $point) {
-            if ($point[0] != '' && $point[1] != '') {
-                $row .= '<circle cx="' . $point[0] . '" cy="'
-                    . $point[1] . '" r="3"';
-                $point_options['id'] = $label . rand();
-                foreach ($point_options as $option => $val) {
-                    $row .= ' ' . $option . '="' . trim($val) . '"';
-                }
-                $row .= '/>';
-            }
-        }
-
-        return $row;
-    }
-
-    /**
-     * Prepares JavaScript related to a row in the GIS dataset
-     * to visualize it with OpenLayers.
-     *
-     * @param string $spatial     GIS MULTIPOINT object
-     * @param int    $srid        Spatial reference ID
-     * @param string $label       Label for the GIS MULTIPOINT object
-     * @param string $point_color Color for the GIS MULTIPOINT object
-     * @param array  $scale_data  Array containing data related to scaling
-     *
-     * @return string JavaScript related to a row in the GIS dataset
-     * @access public
-     */
-    public function prepareRowAsOl(
-        $spatial,
-        $srid,
-        $label,
-        $point_color,
-        $scale_data
-    ) {
-        $style_options = array(
-            'pointRadius'  => 3,
-            'fillColor'    => '#ffffff',
-            'strokeColor'  => $point_color,
-            'strokeWidth'  => 2,
-            'label'        => $label,
-            'labelYOffset' => -8,
-            'fontSize'     => 10,
-        );
-        if ($srid == 0) {
-            $srid = 4326;
-        }
-        $result = $this->getBoundsForOl($srid, $scale_data);
-
-        // Trim to remove leading 'MULTIPOINT(' and trailing ')'
-        $multipoint
-            = mb_substr(
-                $spatial,
-                11,
-                mb_strlen($spatial) - 12
-            );
-        $points_arr = $this->extractPoints($multipoint, null);
-
-        $result .= 'vectorLayer.addFeatures(new OpenLayers.Feature.Vector('
-            . 'new OpenLayers.Geometry.MultiPoint('
-            . $this->getPointsArrayForOpenLayers($points_arr, $srid)
-            . '), null, ' . json_encode($style_options) . '));';
-
-        return $result;
-    }
-
-    /**
-     * Generate the WKT with the set of parameters passed by the GIS editor.
-     *
-     * @param array  $gis_data GIS data
-     * @param int    $index    Index into the parameter object
-     * @param string $empty    Multipoint does not adhere to this
-     *
-     * @return string WKT with the set of parameters passed by the GIS editor
-     * @access public
-     */
-    public function generateWkt($gis_data, $index, $empty = '')
-    {
-        $no_of_points = isset($gis_data[$index]['MULTIPOINT']['no_of_points'])
-            ? $gis_data[$index]['MULTIPOINT']['no_of_points'] : 1;
-        if ($no_of_points < 1) {
-            $no_of_points = 1;
-        }
-        $wkt = 'MULTIPOINT(';
-        for ($i = 0; $i < $no_of_points; $i++) {
-            $wkt .= ((isset($gis_data[$index]['MULTIPOINT'][$i]['x'])
-                    && trim($gis_data[$index]['MULTIPOINT'][$i]['x']) != '')
-                    ? $gis_data[$index]['MULTIPOINT'][$i]['x'] : '')
-                . ' ' . ((isset($gis_data[$index]['MULTIPOINT'][$i]['y'])
-                    && trim($gis_data[$index]['MULTIPOINT'][$i]['y']) != '')
-                    ? $gis_data[$index]['MULTIPOINT'][$i]['y'] : '') . ',';
-        }
-
-        $wkt
-            = mb_substr(
-                $wkt,
-                0,
-                mb_strlen($wkt) - 1
-            );
-        $wkt .= ')';
-
-        return $wkt;
-    }
-
-    /**
-     * Generate the WKT for the data from ESRI shape files.
-     *
-     * @param array $row_data GIS data
-     *
-     * @return string the WKT for the data from ESRI shape files
-     * @access public
-     */
-    public function getShape($row_data)
-    {
-        $wkt = 'MULTIPOINT(';
-        for ($i = 0; $i < $row_data['numpoints']; $i++) {
-            $wkt .= $row_data['points'][$i]['x'] . ' '
-                . $row_data['points'][$i]['y'] . ',';
-        }
-
-        $wkt
-            = mb_substr(
-                $wkt,
-                0,
-                mb_strlen($wkt) - 1
-            );
-        $wkt .= ')';
-
-        return $wkt;
-    }
-
-    /**
-     * Generate parameters for the GIS data editor from the value of the GIS column.
-     *
-     * @param string  $value Value of the GIS column
-     * @param integer $index Index of the geometry
-     *
-     * @return array params for the GIS data editor from the value of the GIS column
-     * @access public
-     */
-    public function generateParams($value, $index = -1)
-    {
-        $params = array();
-        if ($index == -1) {
-            $index = 0;
-            $data = GISGeometry::generateParams($value);
-            $params['srid'] = $data['srid'];
-            $wkt = $data['wkt'];
-        } else {
-            $params[$index]['gis_type'] = 'MULTIPOINT';
-            $wkt = $value;
-        }
-
-        // Trim to remove leading 'MULTIPOINT(' and trailing ')'
-        $points
-            = mb_substr(
-                $wkt,
-                11,
-                mb_strlen($wkt) - 12
-            );
-        $points_arr = $this->extractPoints($points, null);
-
-        $no_of_points = count($points_arr);
-        $params[$index]['MULTIPOINT']['no_of_points'] = $no_of_points;
-        for ($i = 0; $i < $no_of_points; $i++) {
-            $params[$index]['MULTIPOINT'][$i]['x'] = $points_arr[$i][0];
-            $params[$index]['MULTIPOINT'][$i]['y'] = $points_arr[$i][1];
-        }
-
-        return $params;
-    }
-
-    /**
-     * Overridden to make sure that only the points having valid values
-     * for x and y coordinates are added.
-     *
-     * @param array  $points_arr x and y coordinates for each point
-     * @param string $srid       spatial reference id
-     *
-     * @return string JavaScript for adding an array of points to OpenLayers
-     * @access protected
-     */
-    protected function getPointsArrayForOpenLayers($points_arr, $srid)
-    {
-        $ol_array = 'new Array(';
-        foreach ($points_arr as $point) {
-            if ($point[0] != '' && $point[1] != '') {
-                $ol_array .= $this->getPointForOpenLayers($point, $srid) . ', ';
-            }
-        }
-
-        $olArrayLength = mb_strlen($ol_array);
-        if (mb_substr($ol_array, $olArrayLength - 2) == ', ') {
-            $ol_array = mb_substr($ol_array, 0, $olArrayLength - 2);
-        }
-        $ol_array .= ')';
-
-        return $ol_array;
-    }
-}
diff --git a/#pma/libraries/gis/GISMultipolygon.php b/#pma/libraries/gis/GISMultipolygon.php
deleted file mode 100644
index b47dc74d..00000000
--- a/#pma/libraries/gis/GISMultipolygon.php
+++ /dev/null
@@ -1,606 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Handles actions related to GIS MULTIPOLYGON objects
- *
- * @package PhpMyAdmin-GIS
- */
-
-namespace PMA\libraries\gis;
-
-use \TCPDF;
-
-/**
- * Handles actions related to GIS MULTIPOLYGON objects
- *
- * @package PhpMyAdmin-GIS
- */
-class GISMultipolygon extends GISGeometry
-{
-    // Hold the singleton instance of the class
-    private static $_instance;
-
-    /**
-     * A private constructor; prevents direct creation of object.
-     *
-     * @access private
-     */
-    private function __construct()
-    {
-    }
-
-    /**
-     * Returns the singleton.
-     *
-     * @return GISMultipolygon the singleton
-     * @access public
-     */
-    public static function singleton()
-    {
-        if (!isset(self::$_instance)) {
-            $class = __CLASS__;
-            self::$_instance = new $class;
-        }
-
-        return self::$_instance;
-    }
-
-    /**
-     * Scales each row.
-     *
-     * @param string $spatial spatial data of a row
-     *
-     * @return array an array containing the min, max values for x and y coordinates
-     * @access public
-     */
-    public function scaleRow($spatial)
-    {
-        $min_max = array();
-
-        // Trim to remove leading 'MULTIPOLYGON(((' and trailing ')))'
-        $multipolygon
-            = mb_substr(
-                $spatial,
-                15,
-                mb_strlen($spatial) - 18
-            );
-        // Separate each polygon
-        $polygons = explode(")),((", $multipolygon);
-
-        foreach ($polygons as $polygon) {
-            // If the polygon doesn't have an inner ring, use polygon itself
-            if (mb_strpos($polygon, "),(") === false) {
-                $ring = $polygon;
-            } else {
-                // Separate outer ring and use it to determine min-max
-                $parts = explode("),(", $polygon);
-                $ring = $parts[0];
-            }
-            $min_max = $this->setMinMax($ring, $min_max);
-        }
-
-        return $min_max;
-    }
-
-    /**
-     * Adds to the PNG image object, the data related to a row in the GIS dataset.
-     *
-     * @param string $spatial    GIS MULTIPOLYGON object
-     * @param string $label      Label for the GIS MULTIPOLYGON object
-     * @param string $fill_color Color for the GIS MULTIPOLYGON object
-     * @param array  $scale_data Array containing data related to scaling
-     * @param object $image      Image object
-     *
-     * @return object the modified image object
-     * @access public
-     */
-    public function prepareRowAsPng(
-        $spatial,
-        $label,
-        $fill_color,
-        $scale_data,
-        $image
-    ) {
-        // allocate colors
-        $black = imagecolorallocate($image, 0, 0, 0);
-        $red = hexdec(mb_substr($fill_color, 1, 2));
-        $green = hexdec(mb_substr($fill_color, 3, 2));
-        $blue = hexdec(mb_substr($fill_color, 4, 2));
-        $color = imagecolorallocate($image, $red, $green, $blue);
-
-        // Trim to remove leading 'MULTIPOLYGON(((' and trailing ')))'
-        $multipolygon
-            = mb_substr(
-                $spatial,
-                15,
-                mb_strlen($spatial) - 18
-            );
-        // Separate each polygon
-        $polygons = explode(")),((", $multipolygon);
-
-        $first_poly = true;
-        foreach ($polygons as $polygon) {
-            // If the polygon doesn't have an inner polygon
-            if (mb_strpos($polygon, "),(") === false) {
-                $points_arr = $this->extractPoints($polygon, $scale_data, true);
-            } else {
-                // Separate outer and inner polygons
-                $parts = explode("),(", $polygon);
-                $outer = $parts[0];
-                $inner = array_slice($parts, 1);
-
-                $points_arr = $this->extractPoints($outer, $scale_data, true);
-
-                foreach ($inner as $inner_poly) {
-                    $points_arr = array_merge(
-                        $points_arr,
-                        $this->extractPoints($inner_poly, $scale_data, true)
-                    );
-                }
-            }
-            // draw polygon
-            imagefilledpolygon($image, $points_arr, sizeof($points_arr) / 2, $color);
-            // mark label point if applicable
-            if (isset($label) && trim($label) != '' && $first_poly) {
-                $label_point = array($points_arr[2], $points_arr[3]);
-            }
-            $first_poly = false;
-        }
-        // print label if applicable
-        if (isset($label_point)) {
-            imagestring(
-                $image,
-                1,
-                $points_arr[2],
-                $points_arr[3],
-                trim($label),
-                $black
-            );
-        }
-
-        return $image;
-    }
-
-    /**
-     * Adds to the TCPDF instance, the data related to a row in the GIS dataset.
-     *
-     * @param string $spatial    GIS MULTIPOLYGON object
-     * @param string $label      Label for the GIS MULTIPOLYGON object
-     * @param string $fill_color Color for the GIS MULTIPOLYGON object
-     * @param array  $scale_data Array containing data related to scaling
-     * @param TCPDF  $pdf        TCPDF instance
-     *
-     * @return TCPDF the modified TCPDF instance
-     * @access public
-     */
-    public function prepareRowAsPdf($spatial, $label, $fill_color, $scale_data, $pdf)
-    {
-        // allocate colors
-        $red = hexdec(mb_substr($fill_color, 1, 2));
-        $green = hexdec(mb_substr($fill_color, 3, 2));
-        $blue = hexdec(mb_substr($fill_color, 4, 2));
-        $color = array($red, $green, $blue);
-
-        // Trim to remove leading 'MULTIPOLYGON(((' and trailing ')))'
-        $multipolygon
-            = mb_substr(
-                $spatial,
-                15,
-                mb_strlen($spatial) - 18
-            );
-        // Separate each polygon
-        $polygons = explode(")),((", $multipolygon);
-
-        $first_poly = true;
-        foreach ($polygons as $polygon) {
-            // If the polygon doesn't have an inner polygon
-            if (mb_strpos($polygon, "),(") === false) {
-                $points_arr = $this->extractPoints($polygon, $scale_data, true);
-            } else {
-                // Separate outer and inner polygons
-                $parts = explode("),(", $polygon);
-                $outer = $parts[0];
-                $inner = array_slice($parts, 1);
-
-                $points_arr = $this->extractPoints($outer, $scale_data, true);
-
-                foreach ($inner as $inner_poly) {
-                    $points_arr = array_merge(
-                        $points_arr,
-                        $this->extractPoints($inner_poly, $scale_data, true)
-                    );
-                }
-            }
-            // draw polygon
-            $pdf->Polygon($points_arr, 'F*', array(), $color, true);
-            // mark label point if applicable
-            if (isset($label) && trim($label) != '' && $first_poly) {
-                $label_point = array($points_arr[2], $points_arr[3]);
-            }
-            $first_poly = false;
-        }
-
-        // print label if applicable
-        if (isset($label_point)) {
-            $pdf->SetXY($label_point[0], $label_point[1]);
-            $pdf->SetFontSize(5);
-            $pdf->Cell(0, 0, trim($label));
-        }
-
-        return $pdf;
-    }
-
-    /**
-     * Prepares and returns the code related to a row in the GIS dataset as SVG.
-     *
-     * @param string $spatial    GIS MULTIPOLYGON object
-     * @param string $label      Label for the GIS MULTIPOLYGON object
-     * @param string $fill_color Color for the GIS MULTIPOLYGON object
-     * @param array  $scale_data Array containing data related to scaling
-     *
-     * @return string the code related to a row in the GIS dataset
-     * @access public
-     */
-    public function prepareRowAsSvg($spatial, $label, $fill_color, $scale_data)
-    {
-        $polygon_options = array(
-            'name'         => $label,
-            'class'        => 'multipolygon vector',
-            'stroke'       => 'black',
-            'stroke-width' => 0.5,
-            'fill'         => $fill_color,
-            'fill-rule'    => 'evenodd',
-            'fill-opacity' => 0.8,
-        );
-
-        $row = '';
-
-        // Trim to remove leading 'MULTIPOLYGON(((' and trailing ')))'
-        $multipolygon
-            = mb_substr(
-                $spatial,
-                15,
-                mb_strlen($spatial) - 18
-            );
-        // Separate each polygon
-        $polygons = explode(")),((", $multipolygon);
-
-        foreach ($polygons as $polygon) {
-            $row .= '<path d="';
-
-            // If the polygon doesn't have an inner polygon
-            if (mb_strpos($polygon, "),(") === false) {
-                $row .= $this->_drawPath($polygon, $scale_data);
-            } else {
-                // Separate outer and inner polygons
-                $parts = explode("),(", $polygon);
-                $outer = $parts[0];
-                $inner = array_slice($parts, 1);
-
-                $row .= $this->_drawPath($outer, $scale_data);
-
-                foreach ($inner as $inner_poly) {
-                    $row .= $this->_drawPath($inner_poly, $scale_data);
-                }
-            }
-            $polygon_options['id'] = $label . rand();
-            $row .= '"';
-            foreach ($polygon_options as $option => $val) {
-                $row .= ' ' . $option . '="' . trim($val) . '"';
-            }
-            $row .= '/>';
-        }
-
-        return $row;
-    }
-
-    /**
-     * Prepares JavaScript related to a row in the GIS dataset
-     * to visualize it with OpenLayers.
-     *
-     * @param string $spatial    GIS MULTIPOLYGON object
-     * @param int    $srid       Spatial reference ID
-     * @param string $label      Label for the GIS MULTIPOLYGON object
-     * @param string $fill_color Color for the GIS MULTIPOLYGON object
-     * @param array  $scale_data Array containing data related to scaling
-     *
-     * @return string JavaScript related to a row in the GIS dataset
-     * @access public
-     */
-    public function prepareRowAsOl($spatial, $srid, $label, $fill_color, $scale_data)
-    {
-        $style_options = array(
-            'strokeColor' => '#000000',
-            'strokeWidth' => 0.5,
-            'fillColor'   => $fill_color,
-            'fillOpacity' => 0.8,
-            'label'       => $label,
-            'fontSize'    => 10,
-        );
-        if ($srid == 0) {
-            $srid = 4326;
-        }
-        $row = $this->getBoundsForOl($srid, $scale_data);
-
-        // Trim to remove leading 'MULTIPOLYGON(((' and trailing ')))'
-        $multipolygon
-            = mb_substr(
-                $spatial,
-                15,
-                mb_strlen($spatial) - 18
-            );
-        // Separate each polygon
-        $polygons = explode(")),((", $multipolygon);
-
-        $row .= 'vectorLayer.addFeatures(new OpenLayers.Feature.Vector('
-            . 'new OpenLayers.Geometry.MultiPolygon('
-            . $this->getPolygonArrayForOpenLayers($polygons, $srid)
-            . '), null, ' . json_encode($style_options) . '));';
-
-        return $row;
-    }
-
-    /**
-     * Draws a ring of the polygon using SVG path element.
-     *
-     * @param string $polygon    The ring
-     * @param array  $scale_data Array containing data related to scaling
-     *
-     * @return string the code to draw the ring
-     * @access private
-     */
-    private function _drawPath($polygon, $scale_data)
-    {
-        $points_arr = $this->extractPoints($polygon, $scale_data);
-
-        $row = ' M ' . $points_arr[0][0] . ', ' . $points_arr[0][1];
-        $other_points = array_slice($points_arr, 1, count($points_arr) - 2);
-        foreach ($other_points as $point) {
-            $row .= ' L ' . $point[0] . ', ' . $point[1];
-        }
-        $row .= ' Z ';
-
-        return $row;
-    }
-
-    /**
-     * Generate the WKT with the set of parameters passed by the GIS editor.
-     *
-     * @param array  $gis_data GIS data
-     * @param int    $index    Index into the parameter object
-     * @param string $empty    Value for empty points
-     *
-     * @return string WKT with the set of parameters passed by the GIS editor
-     * @access public
-     */
-    public function generateWkt($gis_data, $index, $empty = '')
-    {
-        $data_row = $gis_data[$index]['MULTIPOLYGON'];
-
-        $no_of_polygons = isset($data_row['no_of_polygons'])
-            ? $data_row['no_of_polygons'] : 1;
-        if ($no_of_polygons < 1) {
-            $no_of_polygons = 1;
-        }
-
-        $wkt = 'MULTIPOLYGON(';
-        for ($k = 0; $k < $no_of_polygons; $k++) {
-            $no_of_lines = isset($data_row[$k]['no_of_lines'])
-                ? $data_row[$k]['no_of_lines'] : 1;
-            if ($no_of_lines < 1) {
-                $no_of_lines = 1;
-            }
-            $wkt .= '(';
-            for ($i = 0; $i < $no_of_lines; $i++) {
-                $no_of_points = isset($data_row[$k][$i]['no_of_points'])
-                    ? $data_row[$k][$i]['no_of_points'] : 4;
-                if ($no_of_points < 4) {
-                    $no_of_points = 4;
-                }
-                $wkt .= '(';
-                for ($j = 0; $j < $no_of_points; $j++) {
-                    $wkt .= ((isset($data_row[$k][$i][$j]['x'])
-                            && trim($data_row[$k][$i][$j]['x']) != '')
-                            ? $data_row[$k][$i][$j]['x'] : $empty)
-                        . ' ' . ((isset($data_row[$k][$i][$j]['y'])
-                            && trim($data_row[$k][$i][$j]['y']) != '')
-                            ? $data_row[$k][$i][$j]['y'] : $empty) . ',';
-                }
-                $wkt
-                    = mb_substr(
-                        $wkt,
-                        0,
-                        mb_strlen($wkt) - 1
-                    );
-                $wkt .= '),';
-            }
-            $wkt
-                = mb_substr(
-                    $wkt,
-                    0,
-                    mb_strlen($wkt) - 1
-                );
-            $wkt .= '),';
-        }
-        $wkt
-            = mb_substr(
-                $wkt,
-                0,
-                mb_strlen($wkt) - 1
-            );
-        $wkt .= ')';
-
-        return $wkt;
-    }
-
-    /**
-     * Generate the WKT for the data from ESRI shape files.
-     *
-     * @param array $row_data GIS data
-     *
-     * @return string the WKT for the data from ESRI shape files
-     * @access public
-     */
-    public function getShape($row_data)
-    {
-        // Determines whether each line ring is an inner ring or an outer ring.
-        // If it's an inner ring get a point on the surface which can be used to
-        // correctly classify inner rings to their respective outer rings.
-        foreach ($row_data['parts'] as $i => $ring) {
-            $row_data['parts'][$i]['isOuter']
-                = GISPolygon::isOuterRing($ring['points']);
-        }
-
-        // Find points on surface for inner rings
-        foreach ($row_data['parts'] as $i => $ring) {
-            if (!$ring['isOuter']) {
-                $row_data['parts'][$i]['pointOnSurface']
-                    = GISPolygon::getPointOnSurface($ring['points']);
-            }
-        }
-
-        // Classify inner rings to their respective outer rings.
-        foreach ($row_data['parts'] as $j => $ring1) {
-            if ($ring1['isOuter']) {
-                continue;
-            }
-            foreach ($row_data['parts'] as $k => $ring2) {
-                if (!$ring2['isOuter']) {
-                    continue;
-                }
-
-                // If the pointOnSurface of the inner ring
-                // is also inside the outer ring
-                if (GISPolygon::isPointInsidePolygon(
-                    $ring1['pointOnSurface'],
-                    $ring2['points']
-                )
-                ) {
-                    if (!isset($ring2['inner'])) {
-                        $row_data['parts'][$k]['inner'] = array();
-                    }
-                    $row_data['parts'][$k]['inner'][] = $j;
-                }
-            }
-        }
-
-        $wkt = 'MULTIPOLYGON(';
-        // for each polygon
-        foreach ($row_data['parts'] as $ring) {
-            if (!$ring['isOuter']) {
-                continue;
-            }
-
-            $wkt .= '('; // start of polygon
-
-            $wkt .= '('; // start of outer ring
-            foreach ($ring['points'] as $point) {
-                $wkt .= $point['x'] . ' ' . $point['y'] . ',';
-            }
-            $wkt
-                = mb_substr(
-                    $wkt,
-                    0,
-                    mb_strlen($wkt) - 1
-                );
-            $wkt .= ')'; // end of outer ring
-
-            // inner rings if any
-            if (isset($ring['inner'])) {
-                foreach ($ring['inner'] as $j) {
-                    $wkt .= ',('; // start of inner ring
-                    foreach ($row_data['parts'][$j]['points'] as $innerPoint) {
-                        $wkt .= $innerPoint['x'] . ' ' . $innerPoint['y'] . ',';
-                    }
-                    $wkt
-                        = mb_substr(
-                            $wkt,
-                            0,
-                            mb_strlen($wkt) - 1
-                        );
-                    $wkt .= ')';  // end of inner ring
-                }
-            }
-
-            $wkt .= '),'; // end of polygon
-        }
-        $wkt
-            = mb_substr(
-                $wkt,
-                0,
-                mb_strlen($wkt) - 1
-            );
-
-        $wkt .= ')'; // end of multipolygon
-        return $wkt;
-    }
-
-    /**
-     * Generate parameters for the GIS data editor from the value of the GIS column.
-     *
-     * @param string $value Value of the GIS column
-     * @param int    $index Index of the geometry
-     *
-     * @return array params for the GIS data editor from the value of the GIS column
-     * @access public
-     */
-    public function generateParams($value, $index = -1)
-    {
-        $params = array();
-        if ($index == -1) {
-            $index = 0;
-            $data = GISGeometry::generateParams($value);
-            $params['srid'] = $data['srid'];
-            $wkt = $data['wkt'];
-        } else {
-            $params[$index]['gis_type'] = 'MULTIPOLYGON';
-            $wkt = $value;
-        }
-
-        // Trim to remove leading 'MULTIPOLYGON(((' and trailing ')))'
-        $multipolygon
-            = mb_substr(
-                $wkt,
-                15,
-                mb_strlen($wkt) - 18
-            );
-        // Separate each polygon
-        $polygons = explode(")),((", $multipolygon);
-
-        $param_row =& $params[$index]['MULTIPOLYGON'];
-        $param_row['no_of_polygons'] = count($polygons);
-
-        $k = 0;
-        foreach ($polygons as $polygon) {
-            // If the polygon doesn't have an inner polygon
-            if (mb_strpos($polygon, "),(") === false) {
-                $param_row[$k]['no_of_lines'] = 1;
-                $points_arr = $this->extractPoints($polygon, null);
-                $no_of_points = count($points_arr);
-                $param_row[$k][0]['no_of_points'] = $no_of_points;
-                for ($i = 0; $i < $no_of_points; $i++) {
-                    $param_row[$k][0][$i]['x'] = $points_arr[$i][0];
-                    $param_row[$k][0][$i]['y'] = $points_arr[$i][1];
-                }
-            } else {
-                // Separate outer and inner polygons
-                $parts = explode("),(", $polygon);
-                $param_row[$k]['no_of_lines'] = count($parts);
-                $j = 0;
-                foreach ($parts as $ring) {
-                    $points_arr = $this->extractPoints($ring, null);
-                    $no_of_points = count($points_arr);
-                    $param_row[$k][$j]['no_of_points'] = $no_of_points;
-                    for ($i = 0; $i < $no_of_points; $i++) {
-                        $param_row[$k][$j][$i]['x'] = $points_arr[$i][0];
-                        $param_row[$k][$j][$i]['y'] = $points_arr[$i][1];
-                    }
-                    $j++;
-                }
-            }
-            $k++;
-        }
-
-        return $params;
-    }
-}
diff --git a/#pma/libraries/gis/GISPoint.php b/#pma/libraries/gis/GISPoint.php
deleted file mode 100644
index 7992e6c2..00000000
--- a/#pma/libraries/gis/GISPoint.php
+++ /dev/null
@@ -1,356 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Handles actions related to GIS POINT objects
- *
- * @package PhpMyAdmin-GIS
- */
-
-namespace PMA\libraries\gis;
-
-use \TCPDF;
-
-/**
- * Handles actions related to GIS POINT objects
- *
- * @package PhpMyAdmin-GIS
- */
-class GISPoint extends GISGeometry
-{
-    // Hold the singleton instance of the class
-    private static $_instance;
-
-    /**
-     * A private constructor; prevents direct creation of object.
-     *
-     * @access private
-     */
-    private function __construct()
-    {
-    }
-
-    /**
-     * Returns the singleton.
-     *
-     * @return GISPoint the singleton
-     * @access public
-     */
-    public static function singleton()
-    {
-        if (!isset(self::$_instance)) {
-            $class = __CLASS__;
-            self::$_instance = new $class;
-        }
-
-        return self::$_instance;
-    }
-
-    /**
-     * Scales each row.
-     *
-     * @param string $spatial spatial data of a row
-     *
-     * @return array an array containing the min, max values for x and y coordinates
-     * @access public
-     */
-    public function scaleRow($spatial)
-    {
-        // Trim to remove leading 'POINT(' and trailing ')'
-        $point
-            = mb_substr(
-                $spatial,
-                6,
-                mb_strlen($spatial) - 7
-            );
-
-        return $this->setMinMax($point, array());
-    }
-
-    /**
-     * Adds to the PNG image object, the data related to a row in the GIS dataset.
-     *
-     * @param string   $spatial     GIS POINT object
-     * @param string   $label       Label for the GIS POINT object
-     * @param string   $point_color Color for the GIS POINT object
-     * @param array    $scale_data  Array containing data related to scaling
-     * @param resource $image       Image object
-     *
-     * @return object the modified image object
-     * @access public
-     */
-    public function prepareRowAsPng(
-        $spatial,
-        $label,
-        $point_color,
-        $scale_data,
-        $image
-    ) {
-        // allocate colors
-        $black = imagecolorallocate($image, 0, 0, 0);
-        $red = hexdec(mb_substr($point_color, 1, 2));
-        $green = hexdec(mb_substr($point_color, 3, 2));
-        $blue = hexdec(mb_substr($point_color, 4, 2));
-        $color = imagecolorallocate($image, $red, $green, $blue);
-
-        // Trim to remove leading 'POINT(' and trailing ')'
-        $point
-            = mb_substr(
-                $spatial,
-                6,
-                mb_strlen($spatial) - 7
-            );
-        $points_arr = $this->extractPoints($point, $scale_data);
-
-        // draw a small circle to mark the point
-        if ($points_arr[0][0] != '' && $points_arr[0][1] != '') {
-            imagearc(
-                $image,
-                $points_arr[0][0],
-                $points_arr[0][1],
-                7,
-                7,
-                0,
-                360,
-                $color
-            );
-            // print label if applicable
-            if (isset($label) && trim($label) != '') {
-                imagestring(
-                    $image,
-                    1,
-                    $points_arr[0][0],
-                    $points_arr[0][1],
-                    trim($label),
-                    $black
-                );
-            }
-        }
-
-        return $image;
-    }
-
-    /**
-     * Adds to the TCPDF instance, the data related to a row in the GIS dataset.
-     *
-     * @param string $spatial     GIS POINT object
-     * @param string $label       Label for the GIS POINT object
-     * @param string $point_color Color for the GIS POINT object
-     * @param array  $scale_data  Array containing data related to scaling
-     * @param TCPDF  $pdf         TCPDF instance
-     *
-     * @return TCPDF the modified TCPDF instance
-     * @access public
-     */
-    public function prepareRowAsPdf(
-        $spatial,
-        $label,
-        $point_color,
-        $scale_data,
-        $pdf
-    ) {
-        // allocate colors
-        $red = hexdec(mb_substr($point_color, 1, 2));
-        $green = hexdec(mb_substr($point_color, 3, 2));
-        $blue = hexdec(mb_substr($point_color, 4, 2));
-        $line = array('width' => 1.25, 'color' => array($red, $green, $blue));
-
-        // Trim to remove leading 'POINT(' and trailing ')'
-        $point
-            = mb_substr(
-                $spatial,
-                6,
-                mb_strlen($spatial) - 7
-            );
-        $points_arr = $this->extractPoints($point, $scale_data);
-
-        // draw a small circle to mark the point
-        if ($points_arr[0][0] != '' && $points_arr[0][1] != '') {
-            $pdf->Circle(
-                $points_arr[0][0],
-                $points_arr[0][1],
-                2,
-                0,
-                360,
-                'D',
-                $line
-            );
-            // print label if applicable
-            if (isset($label) && trim($label) != '') {
-                $pdf->SetXY($points_arr[0][0], $points_arr[0][1]);
-                $pdf->SetFontSize(5);
-                $pdf->Cell(0, 0, trim($label));
-            }
-        }
-
-        return $pdf;
-    }
-
-    /**
-     * Prepares and returns the code related to a row in the GIS dataset as SVG.
-     *
-     * @param string $spatial     GIS POINT object
-     * @param string $label       Label for the GIS POINT object
-     * @param string $point_color Color for the GIS POINT object
-     * @param array  $scale_data  Array containing data related to scaling
-     *
-     * @return string the code related to a row in the GIS dataset
-     * @access public
-     */
-    public function prepareRowAsSvg($spatial, $label, $point_color, $scale_data)
-    {
-        $point_options = array(
-            'name'         => $label,
-            'id'           => $label . rand(),
-            'class'        => 'point vector',
-            'fill'         => 'white',
-            'stroke'       => $point_color,
-            'stroke-width' => 2,
-        );
-
-        // Trim to remove leading 'POINT(' and trailing ')'
-        $point
-            = mb_substr(
-                $spatial,
-                6,
-                mb_strlen($spatial) - 7
-            );
-        $points_arr = $this->extractPoints($point, $scale_data);
-
-        $row = '';
-        if ($points_arr[0][0] != '' && $points_arr[0][1] != '') {
-            $row .= '<circle cx="' . $points_arr[0][0]
-                . '" cy="' . $points_arr[0][1] . '" r="3"';
-            foreach ($point_options as $option => $val) {
-                $row .= ' ' . $option . '="' . trim($val) . '"';
-            }
-            $row .= '/>';
-        }
-
-        return $row;
-    }
-
-    /**
-     * Prepares JavaScript related to a row in the GIS dataset
-     * to visualize it with OpenLayers.
-     *
-     * @param string $spatial     GIS POINT object
-     * @param int    $srid        Spatial reference ID
-     * @param string $label       Label for the GIS POINT object
-     * @param string $point_color Color for the GIS POINT object
-     * @param array  $scale_data  Array containing data related to scaling
-     *
-     * @return string JavaScript related to a row in the GIS dataset
-     * @access public
-     */
-    public function prepareRowAsOl(
-        $spatial,
-        $srid,
-        $label,
-        $point_color,
-        $scale_data
-    ) {
-        $style_options = array(
-            'pointRadius'  => 3,
-            'fillColor'    => '#ffffff',
-            'strokeColor'  => $point_color,
-            'strokeWidth'  => 2,
-            'label'        => $label,
-            'labelYOffset' => -8,
-            'fontSize'     => 10,
-        );
-        if ($srid == 0) {
-            $srid = 4326;
-        }
-        $result = $this->getBoundsForOl($srid, $scale_data);
-
-        // Trim to remove leading 'POINT(' and trailing ')'
-        $point
-            = mb_substr(
-                $spatial,
-                6,
-                mb_strlen($spatial) - 7
-            );
-        $points_arr = $this->extractPoints($point, null);
-
-        if ($points_arr[0][0] != '' && $points_arr[0][1] != '') {
-            $result .= 'vectorLayer.addFeatures(new OpenLayers.Feature.Vector('
-                . $this->getPointForOpenLayers($points_arr[0], $srid) . ', null, '
-                . json_encode($style_options) . '));';
-        }
-
-        return $result;
-    }
-
-    /**
-     * Generate the WKT with the set of parameters passed by the GIS editor.
-     *
-     * @param array  $gis_data GIS data
-     * @param int    $index    Index into the parameter object
-     * @param string $empty    Point does not adhere to this parameter
-     *
-     * @return string WKT with the set of parameters passed by the GIS editor
-     * @access public
-     */
-    public function generateWkt($gis_data, $index, $empty = '')
-    {
-        return 'POINT('
-        . ((isset($gis_data[$index]['POINT']['x'])
-            && trim($gis_data[$index]['POINT']['x']) != '')
-            ? $gis_data[$index]['POINT']['x'] : '')
-        . ' '
-        . ((isset($gis_data[$index]['POINT']['y'])
-            && trim($gis_data[$index]['POINT']['y']) != '')
-            ? $gis_data[$index]['POINT']['y'] : '') . ')';
-    }
-
-    /**
-     * Generate the WKT for the data from ESRI shape files.
-     *
-     * @param array $row_data GIS data
-     *
-     * @return string the WKT for the data from ESRI shape files
-     * @access public
-     */
-    public function getShape($row_data)
-    {
-        return 'POINT(' . (isset($row_data['x']) ? $row_data['x'] : '')
-        . ' ' . (isset($row_data['y']) ? $row_data['y'] : '') . ')';
-    }
-
-    /**
-     * Generate parameters for the GIS data editor from the value of the GIS column.
-     *
-     * @param string $value of the GIS column
-     * @param int    $index of the geometry
-     *
-     * @return array params for the GIS data editor from the value of the GIS column
-     * @access public
-     */
-    public function generateParams($value, $index = -1)
-    {
-        $params = array();
-        if ($index == -1) {
-            $index = 0;
-            $data = GISGeometry::generateParams($value);
-            $params['srid'] = $data['srid'];
-            $wkt = $data['wkt'];
-        } else {
-            $params[$index]['gis_type'] = 'POINT';
-            $wkt = $value;
-        }
-
-        // Trim to remove leading 'POINT(' and trailing ')'
-        $point
-            = mb_substr(
-                $wkt,
-                6,
-                mb_strlen($wkt) - 7
-            );
-        $points_arr = $this->extractPoints($point, null);
-
-        $params[$index]['POINT']['x'] = $points_arr[0][0];
-        $params[$index]['POINT']['y'] = $points_arr[0][1];
-
-        return $params;
-    }
-}
diff --git a/#pma/libraries/gis/GISPolygon.php b/#pma/libraries/gis/GISPolygon.php
deleted file mode 100644
index bc03d2ab..00000000
--- a/#pma/libraries/gis/GISPolygon.php
+++ /dev/null
@@ -1,623 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Handles actions related to GIS POLYGON objects
- *
- * @package PhpMyAdmin-GIS
- */
-namespace PMA\libraries\gis;
-
-use PMA\libraries\Util;
-use \TCPDF;
-
-/**
- * Handles actions related to GIS POLYGON objects
- *
- * @package PhpMyAdmin-GIS
- */
-class GISPolygon extends GISGeometry
-{
-    // Hold the singleton instance of the class
-    private static $_instance;
-
-    /**
-     * A private constructor; prevents direct creation of object.
-     *
-     * @access private
-     */
-    private function __construct()
-    {
-    }
-
-    /**
-     * Returns the singleton.
-     *
-     * @return GISPolygon the singleton
-     * @access public
-     */
-    public static function singleton()
-    {
-        if (!isset(self::$_instance)) {
-            $class = __CLASS__;
-            self::$_instance = new $class;
-        }
-
-        return self::$_instance;
-    }
-
-    /**
-     * Scales each row.
-     *
-     * @param string $spatial spatial data of a row
-     *
-     * @return array an array containing the min, max values for x and y coordinates
-     * @access public
-     */
-    public function scaleRow($spatial)
-    {
-        // Trim to remove leading 'POLYGON((' and trailing '))'
-        $polygon = mb_substr(
-            $spatial,
-            9,
-            mb_strlen($spatial) - 11
-        );
-
-        // If the polygon doesn't have an inner ring, use polygon itself
-        if (mb_strpos($polygon, "),(") === false) {
-            $ring = $polygon;
-        } else {
-            // Separate outer ring and use it to determine min-max
-            $parts = explode("),(", $polygon);
-            $ring = $parts[0];
-        }
-
-        return $this->setMinMax($ring, array());
-    }
-
-    /**
-     * Adds to the PNG image object, the data related to a row in the GIS dataset.
-     *
-     * @param string $spatial    GIS POLYGON object
-     * @param string $label      Label for the GIS POLYGON object
-     * @param string $fill_color Color for the GIS POLYGON object
-     * @param array  $scale_data Array containing data related to scaling
-     * @param object $image      Image object
-     *
-     * @return object the modified image object
-     * @access public
-     */
-    public function prepareRowAsPng(
-        $spatial,
-        $label,
-        $fill_color,
-        $scale_data,
-        $image
-    ) {
-        // allocate colors
-        $black = imagecolorallocate($image, 0, 0, 0);
-        $red = hexdec(mb_substr($fill_color, 1, 2));
-        $green = hexdec(mb_substr($fill_color, 3, 2));
-        $blue = hexdec(mb_substr($fill_color, 4, 2));
-        $color = imagecolorallocate($image, $red, $green, $blue);
-
-        // Trim to remove leading 'POLYGON((' and trailing '))'
-        $polygon = mb_substr(
-            $spatial,
-            9,
-
-            mb_strlen($spatial) - 11
-        );
-
-        // If the polygon doesn't have an inner polygon
-        if (mb_strpos($polygon, "),(") === false) {
-            $points_arr = $this->extractPoints($polygon, $scale_data, true);
-        } else {
-            // Separate outer and inner polygons
-            $parts = explode("),(", $polygon);
-            $outer = $parts[0];
-            $inner = array_slice($parts, 1);
-
-            $points_arr = $this->extractPoints($outer, $scale_data, true);
-
-            foreach ($inner as $inner_poly) {
-                $points_arr = array_merge(
-                    $points_arr,
-                    $this->extractPoints($inner_poly, $scale_data, true)
-                );
-            }
-        }
-
-        // draw polygon
-        imagefilledpolygon($image, $points_arr, sizeof($points_arr) / 2, $color);
-        // print label if applicable
-        if (isset($label) && trim($label) != '') {
-            imagestring(
-                $image,
-                1,
-                $points_arr[2],
-                $points_arr[3],
-                trim($label),
-                $black
-            );
-        }
-
-        return $image;
-    }
-
-    /**
-     * Adds to the TCPDF instance, the data related to a row in the GIS dataset.
-     *
-     * @param string $spatial    GIS POLYGON object
-     * @param string $label      Label for the GIS POLYGON object
-     * @param string $fill_color Color for the GIS POLYGON object
-     * @param array  $scale_data Array containing data related to scaling
-     * @param TCPDF  $pdf        TCPDF instance
-     *
-     * @return TCPDF the modified TCPDF instance
-     * @access public
-     */
-    public function prepareRowAsPdf($spatial, $label, $fill_color, $scale_data, $pdf)
-    {
-        // allocate colors
-        $red = hexdec(mb_substr($fill_color, 1, 2));
-        $green = hexdec(mb_substr($fill_color, 3, 2));
-        $blue = hexdec(mb_substr($fill_color, 4, 2));
-        $color = array($red, $green, $blue);
-
-        // Trim to remove leading 'POLYGON((' and trailing '))'
-        $polygon = mb_substr(
-            $spatial,
-            9,
-            mb_strlen($spatial) - 11
-        );
-
-        // If the polygon doesn't have an inner polygon
-        if (mb_strpos($polygon, "),(") === false) {
-            $points_arr = $this->extractPoints($polygon, $scale_data, true);
-        } else {
-            // Separate outer and inner polygons
-            $parts = explode("),(", $polygon);
-            $outer = $parts[0];
-            $inner = array_slice($parts, 1);
-
-            $points_arr = $this->extractPoints($outer, $scale_data, true);
-
-            foreach ($inner as $inner_poly) {
-                $points_arr = array_merge(
-                    $points_arr,
-                    $this->extractPoints($inner_poly, $scale_data, true)
-                );
-            }
-        }
-
-        // draw polygon
-        $pdf->Polygon($points_arr, 'F*', array(), $color, true);
-        // print label if applicable
-        if (isset($label) && trim($label) != '') {
-            $pdf->SetXY($points_arr[2], $points_arr[3]);
-            $pdf->SetFontSize(5);
-            $pdf->Cell(0, 0, trim($label));
-        }
-
-        return $pdf;
-    }
-
-    /**
-     * Prepares and returns the code related to a row in the GIS dataset as SVG.
-     *
-     * @param string $spatial    GIS POLYGON object
-     * @param string $label      Label for the GIS POLYGON object
-     * @param string $fill_color Color for the GIS POLYGON object
-     * @param array  $scale_data Array containing data related to scaling
-     *
-     * @return string the code related to a row in the GIS dataset
-     * @access public
-     */
-    public function prepareRowAsSvg($spatial, $label, $fill_color, $scale_data)
-    {
-        $polygon_options = array(
-            'name'         => $label,
-            'id'           => $label . rand(),
-            'class'        => 'polygon vector',
-            'stroke'       => 'black',
-            'stroke-width' => 0.5,
-            'fill'         => $fill_color,
-            'fill-rule'    => 'evenodd',
-            'fill-opacity' => 0.8,
-        );
-
-        // Trim to remove leading 'POLYGON((' and trailing '))'
-        $polygon
-            = mb_substr(
-                $spatial,
-                9,
-                mb_strlen($spatial) - 11
-            );
-
-        $row = '<path d="';
-
-        // If the polygon doesn't have an inner polygon
-        if (mb_strpos($polygon, "),(") === false) {
-            $row .= $this->_drawPath($polygon, $scale_data);
-        } else {
-            // Separate outer and inner polygons
-            $parts = explode("),(", $polygon);
-            $outer = $parts[0];
-            $inner = array_slice($parts, 1);
-
-            $row .= $this->_drawPath($outer, $scale_data);
-
-            foreach ($inner as $inner_poly) {
-                $row .= $this->_drawPath($inner_poly, $scale_data);
-            }
-        }
-
-        $row .= '"';
-        foreach ($polygon_options as $option => $val) {
-            $row .= ' ' . $option . '="' . trim($val) . '"';
-        }
-        $row .= '/>';
-
-        return $row;
-    }
-
-    /**
-     * Prepares JavaScript related to a row in the GIS dataset
-     * to visualize it with OpenLayers.
-     *
-     * @param string $spatial    GIS POLYGON object
-     * @param int    $srid       Spatial reference ID
-     * @param string $label      Label for the GIS POLYGON object
-     * @param string $fill_color Color for the GIS POLYGON object
-     * @param array  $scale_data Array containing data related to scaling
-     *
-     * @return string JavaScript related to a row in the GIS dataset
-     * @access public
-     */
-    public function prepareRowAsOl($spatial, $srid, $label, $fill_color, $scale_data)
-    {
-        $style_options = array(
-            'strokeColor' => '#000000',
-            'strokeWidth' => 0.5,
-            'fillColor'   => $fill_color,
-            'fillOpacity' => 0.8,
-            'label'       => $label,
-            'fontSize'    => 10,
-        );
-        if ($srid == 0) {
-            $srid = 4326;
-        }
-        $row = $this->getBoundsForOl($srid, $scale_data);
-
-        // Trim to remove leading 'POLYGON((' and trailing '))'
-        $polygon
-            =
-            mb_substr(
-                $spatial,
-                9,
-
-                mb_strlen($spatial) - 11
-            );
-
-        // Separate outer and inner polygons
-        $parts = explode("),(", $polygon);
-        $row .= 'vectorLayer.addFeatures(new OpenLayers.Feature.Vector('
-            . $this->getPolygonForOpenLayers($parts, $srid)
-            . ', null, ' . json_encode($style_options) . '));';
-
-        return $row;
-    }
-
-    /**
-     * Draws a ring of the polygon using SVG path element.
-     *
-     * @param string $polygon    The ring
-     * @param array  $scale_data Array containing data related to scaling
-     *
-     * @return string the code to draw the ring
-     * @access private
-     */
-    private function _drawPath($polygon, $scale_data)
-    {
-        $points_arr = $this->extractPoints($polygon, $scale_data);
-
-        $row = ' M ' . $points_arr[0][0] . ', ' . $points_arr[0][1];
-        $other_points = array_slice($points_arr, 1, count($points_arr) - 2);
-        foreach ($other_points as $point) {
-            $row .= ' L ' . $point[0] . ', ' . $point[1];
-        }
-        $row .= ' Z ';
-
-        return $row;
-    }
-
-    /**
-     * Generate the WKT with the set of parameters passed by the GIS editor.
-     *
-     * @param array  $gis_data GIS data
-     * @param int    $index    Index into the parameter object
-     * @param string $empty    Value for empty points
-     *
-     * @return string WKT with the set of parameters passed by the GIS editor
-     * @access public
-     */
-    public function generateWkt($gis_data, $index, $empty = '')
-    {
-        $no_of_lines = isset($gis_data[$index]['POLYGON']['no_of_lines'])
-            ? $gis_data[$index]['POLYGON']['no_of_lines'] : 1;
-        if ($no_of_lines < 1) {
-            $no_of_lines = 1;
-        }
-
-        $wkt = 'POLYGON(';
-        for ($i = 0; $i < $no_of_lines; $i++) {
-            $no_of_points = isset($gis_data[$index]['POLYGON'][$i]['no_of_points'])
-                ? $gis_data[$index]['POLYGON'][$i]['no_of_points'] : 4;
-            if ($no_of_points < 4) {
-                $no_of_points = 4;
-            }
-            $wkt .= '(';
-            for ($j = 0; $j < $no_of_points; $j++) {
-                $wkt .= ((isset($gis_data[$index]['POLYGON'][$i][$j]['x'])
-                        && trim($gis_data[$index]['POLYGON'][$i][$j]['x']) != '')
-                        ? $gis_data[$index]['POLYGON'][$i][$j]['x'] : $empty)
-                    . ' ' . ((isset($gis_data[$index]['POLYGON'][$i][$j]['y'])
-                        && trim($gis_data[$index]['POLYGON'][$i][$j]['y']) != '')
-                        ? $gis_data[$index]['POLYGON'][$i][$j]['y'] : $empty) . ',';
-            }
-            $wkt
-                =
-                mb_substr(
-                    $wkt,
-                    0,
-                    mb_strlen($wkt) - 1
-                );
-            $wkt .= '),';
-        }
-        $wkt
-            =
-            mb_substr(
-                $wkt,
-                0,
-                mb_strlen($wkt) - 1
-            );
-        $wkt .= ')';
-
-        return $wkt;
-    }
-
-    /**
-     * Calculates the area of a closed simple polygon.
-     *
-     * @param array $ring array of points forming the ring
-     *
-     * @return float the area of a closed simple polygon
-     * @access public
-     * @static
-     */
-    public static function area($ring)
-    {
-
-        $no_of_points = count($ring);
-
-        // If the last point is same as the first point ignore it
-        $last = count($ring) - 1;
-        if (($ring[0]['x'] == $ring[$last]['x'])
-            && ($ring[0]['y'] == $ring[$last]['y'])
-        ) {
-            $no_of_points--;
-        }
-
-        //         _n-1
-        // A = _1_ \    (X(i) * Y(i+1)) - (Y(i) * X(i+1))
-        //      2  /__
-        //         i=0
-        $area = 0;
-        for ($i = 0; $i < $no_of_points; $i++) {
-            $j = ($i + 1) % $no_of_points;
-            $area += $ring[$i]['x'] * $ring[$j]['y'];
-            $area -= $ring[$i]['y'] * $ring[$j]['x'];
-        }
-        $area /= 2.0;
-
-        return $area;
-    }
-
-    /**
-     * Determines whether a set of points represents an outer ring.
-     * If points are in clockwise orientation then, they form an outer ring.
-     *
-     * @param array $ring array of points forming the ring
-     *
-     * @return bool whether a set of points represents an outer ring
-     * @access public
-     * @static
-     */
-    public static function isOuterRing($ring)
-    {
-        // If area is negative then it's in clockwise orientation,
-        // i.e. it's an outer ring
-        if (GISPolygon::area($ring) < 0) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Determines whether a given point is inside a given polygon.
-     *
-     * @param array $point   x, y coordinates of the point
-     * @param array $polygon array of points forming the ring
-     *
-     * @return bool whether a given point is inside a given polygon
-     * @access public
-     * @static
-     */
-    public static function isPointInsidePolygon($point, $polygon)
-    {
-        // If first point is repeated at the end remove it
-        $last = count($polygon) - 1;
-        if (($polygon[0]['x'] == $polygon[$last]['x'])
-            && ($polygon[0]['y'] == $polygon[$last]['y'])
-        ) {
-            $polygon = array_slice($polygon, 0, $last);
-        }
-
-        $no_of_points = count($polygon);
-        $counter = 0;
-
-        // Use ray casting algorithm
-        $p1 = $polygon[0];
-        for ($i = 1; $i <= $no_of_points; $i++) {
-            $p2 = $polygon[$i % $no_of_points];
-            if ($point['y'] <= min(array($p1['y'], $p2['y']))) {
-                $p1 = $p2;
-                continue;
-            }
-
-            if ($point['y'] > max(array($p1['y'], $p2['y']))) {
-                $p1 = $p2;
-                continue;
-            }
-
-            if ($point['x'] > max(array($p1['x'], $p2['x']))) {
-                $p1 = $p2;
-                continue;
-            }
-
-            if ($p1['y'] != $p2['y']) {
-                $xinters = ($point['y'] - $p1['y'])
-                    * ($p2['x'] - $p1['x'])
-                    / ($p2['y'] - $p1['y']) + $p1['x'];
-                if ($p1['x'] == $p2['x'] || $point['x'] <= $xinters) {
-                    $counter++;
-                }
-            }
-
-            $p1 = $p2;
-        }
-
-        if ($counter % 2 == 0) {
-            return false;
-        } else {
-            return true;
-        }
-    }
-
-    /**
-     * Returns a point that is guaranteed to be on the surface of the ring.
-     * (for simple closed rings)
-     *
-     * @param array $ring array of points forming the ring
-     *
-     * @return array|void a point on the surface of the ring
-     * @access public
-     * @static
-     */
-    public static function getPointOnSurface($ring)
-    {
-        // Find two consecutive distinct points.
-        for ($i = 0, $nb = count($ring) - 1; $i < $nb; $i++) {
-            if ($ring[$i]['y'] != $ring[$i + 1]['y']) {
-                $x0 = $ring[$i]['x'];
-                $x1 = $ring[$i + 1]['x'];
-                $y0 = $ring[$i]['y'];
-                $y1 = $ring[$i + 1]['y'];
-                break;
-            }
-        }
-
-        if (!isset($x0)) {
-            return false;
-        }
-
-        // Find the mid point
-        $x2 = ($x0 + $x1) / 2;
-        $y2 = ($y0 + $y1) / 2;
-
-        // Always keep $epsilon < 1 to go with the reduction logic down here
-        $epsilon = 0.1;
-        $denominator = sqrt(
-            Util::pow(($y1 - $y0), 2)
-            + Util::pow(($x0 - $x1), 2)
-        );
-        $pointA = array();
-        $pointB = array();
-
-        while (true) {
-            // Get the points on either sides of the line
-            // with a distance of epsilon to the mid point
-            $pointA['x'] = $x2 + ($epsilon * ($y1 - $y0)) / $denominator;
-            $pointA['y'] = $y2 + ($pointA['x'] - $x2) * ($x0 - $x1) / ($y1 - $y0);
-
-            $pointB['x'] = $x2 + ($epsilon * ($y1 - $y0)) / (0 - $denominator);
-            $pointB['y'] = $y2 + ($pointB['x'] - $x2) * ($x0 - $x1) / ($y1 - $y0);
-
-            // One of the points should be inside the polygon,
-            // unless epsilon chosen is too large
-            if (GISPolygon::isPointInsidePolygon($pointA, $ring)) {
-                return $pointA;
-            }
-
-            if (GISPolygon::isPointInsidePolygon($pointB, $ring)) {
-                return $pointB;
-            }
-
-            //If both are outside the polygon reduce the epsilon and
-            //recalculate the points(reduce exponentially for faster convergence)
-            $epsilon = Util::pow($epsilon, 2);
-            if ($epsilon == 0) {
-                return false;
-            }
-        }
-    }
-
-    /** Generate parameters for the GIS data editor from the value of the GIS column.
-     *
-     * @param string $value Value of the GIS column
-     * @param int    $index Index of the geometry
-     *
-     * @return array params for the GIS data editor from the value of the GIS column
-     * @access public
-     */
-    public function generateParams($value, $index = -1)
-    {
-        $params = array();
-        if ($index == -1) {
-            $index = 0;
-            $data = GISGeometry::generateParams($value);
-            $params['srid'] = $data['srid'];
-            $wkt = $data['wkt'];
-        } else {
-            $params[$index]['gis_type'] = 'POLYGON';
-            $wkt = $value;
-        }
-
-        // Trim to remove leading 'POLYGON((' and trailing '))'
-        $polygon
-            =
-            mb_substr(
-                $wkt,
-                9,
-                mb_strlen($wkt) - 11
-            );
-        // Separate each linestring
-        $linerings = explode("),(", $polygon);
-        $params[$index]['POLYGON']['no_of_lines'] = count($linerings);
-
-        $j = 0;
-        foreach ($linerings as $linering) {
-            $points_arr = $this->extractPoints($linering, null);
-            $no_of_points = count($points_arr);
-            $params[$index]['POLYGON'][$j]['no_of_points'] = $no_of_points;
-            for ($i = 0; $i < $no_of_points; $i++) {
-                $params[$index]['POLYGON'][$j][$i]['x'] = $points_arr[$i][0];
-                $params[$index]['POLYGON'][$j][$i]['y'] = $points_arr[$i][1];
-            }
-            $j++;
-        }
-
-        return $params;
-    }
-}
diff --git a/#pma/libraries/gis/GISVisualization.php b/#pma/libraries/gis/GISVisualization.php
deleted file mode 100644
index b61a375e..00000000
--- a/#pma/libraries/gis/GISVisualization.php
+++ /dev/null
@@ -1,708 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Handles visualization of GIS data
- *
- * @package PhpMyAdmin-GIS
- */
-
-namespace PMA\libraries\gis;
-
-use PMA\libraries\Util;
-use \TCPDF;
-
-require_once 'libraries/sql.lib.php';
-
-/**
- * Handles visualization of GIS data
- *
- * @package PhpMyAdmin-GIS
- */
-class GISVisualization
-{
-    /**
-     * @var array   Raw data for the visualization
-     */
-    private $_data;
-    private $_modified_sql;
-    /**
-     * @var array   Set of default settings values are here.
-     */
-    private $_settings = array(
-        // Array of colors to be used for GIS visualizations.
-        'colors' => array(
-            '#B02EE0',
-            '#E0642E',
-            '#E0D62E',
-            '#2E97E0',
-            '#BCE02E',
-            '#E02E75',
-            '#5CE02E',
-            '#E0B02E',
-            '#0022E0',
-            '#726CB1',
-            '#481A36',
-            '#BAC658',
-            '#127224',
-            '#825119',
-            '#238C74',
-            '#4C489B',
-            '#87C9BF',
-        ),
-        // The width of the GIS visualization.
-        'width'  => 600,
-        // The height of the GIS visualization.
-        'height' => 450,
-    );
-    /**
-     * @var array   Options that the user has specified.
-     */
-    private $_userSpecifiedSettings = null;
-
-    /**
-     * Returns the settings array
-     *
-     * @return array the settings array
-     * @access public
-     */
-    public function getSettings()
-    {
-        return $this->_settings;
-    }
-
-    /**
-     * Factory
-     *
-     * @param string  $sql_query SQL to fetch raw data for visualization
-     * @param array   $options   Users specified options
-     * @param integer $row       number of rows
-     * @param integer $pos       start position
-     *
-     * @return GISVisualization
-     *
-     * @access public
-     */
-    public static function get($sql_query, $options, $row, $pos)
-    {
-        return new GISVisualization($sql_query, $options, $row, $pos);
-    }
-
-    /**
-     * Get visualization
-     *
-     * @param array $data    Raw data, if set, parameters other than $options will be
-     *                       ignored
-     * @param array $options Users specified options
-     *
-     * @return GISVisualization
-     */
-    public static function getByData($data, $options)
-    {
-        return new GISVisualization(null, $options, null, null, $data);
-    }
-
-    /**
-     * Check if data has SRID
-     *
-     * @return bool
-     */
-    public function hasSrid()
-    {
-        foreach ($this->_data as $row) {
-            if ($row['srid'] != 0) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Constructor. Stores user specified options.
-     *
-     * @param string  $sql_query SQL to fetch raw data for visualization
-     * @param array   $options   Users specified options
-     * @param integer $row       number of rows
-     * @param integer $pos       start position
-     * @param array   $data      raw data. If set, parameters other than $options
-     *                           will be ignored
-     *
-     * @access public
-     */
-    private function __construct($sql_query, $options, $row, $pos, $data = null)
-    {
-        $this->_userSpecifiedSettings = $options;
-        if (isset($data)) {
-            $this->_data = $data;
-        } else {
-            $this->_modified_sql = $this->_modifySqlQuery($sql_query, $row, $pos);
-            $this->_data = $this->_fetchRawData();
-        }
-    }
-
-    /**
-     * All the variable initialization, options handling has to be done here.
-     *
-     * @return void
-     * @access protected
-     */
-    protected function init()
-    {
-        $this->_handleOptions();
-    }
-
-    /**
-     * Returns sql for fetching raw data
-     *
-     * @param string  $sql_query The SQL to modify.
-     * @param integer $rows      Number of rows.
-     * @param integer $pos       Start position.
-     *
-     * @return string the modified sql query.
-     */
-    private function _modifySqlQuery($sql_query, $rows, $pos)
-    {
-        $modified_query = 'SELECT ';
-        // If label column is chosen add it to the query
-        if (!empty($this->_userSpecifiedSettings['labelColumn'])) {
-            $modified_query .= Util::backquote(
-                $this->_userSpecifiedSettings['labelColumn']
-            )
-            . ', ';
-        }
-        // Wrap the spatial column with 'ASTEXT()' function and add it
-        $modified_query .= 'ASTEXT('
-            . Util::backquote($this->_userSpecifiedSettings['spatialColumn'])
-            . ') AS ' . Util::backquote(
-                $this->_userSpecifiedSettings['spatialColumn']
-            )
-            . ', ';
-
-        // Get the SRID
-        $modified_query .= 'SRID('
-            . Util::backquote($this->_userSpecifiedSettings['spatialColumn'])
-            . ') AS ' . Util::backquote('srid') . ' ';
-
-        // Append the original query as the inner query
-        $modified_query .= 'FROM (' . $sql_query . ') AS '
-            . Util::backquote('temp_gis');
-
-        // LIMIT clause
-        if (is_numeric($rows) && $rows > 0) {
-            $modified_query .= ' LIMIT ';
-            if (is_numeric($pos) && $pos >= 0) {
-                $modified_query .= $pos . ', ' . $rows;
-            } else {
-                $modified_query .= $rows;
-            }
-        }
-
-        return $modified_query;
-    }
-
-    /**
-     * Returns raw data for GIS visualization.
-     *
-     * @return string the raw data.
-     */
-    private function _fetchRawData()
-    {
-        $modified_result = $GLOBALS['dbi']->tryQuery($this->_modified_sql);
-
-        $data = array();
-        while ($row = $GLOBALS['dbi']->fetchAssoc($modified_result)) {
-            $data[] = $row;
-        }
-
-        return $data;
-    }
-
-    /**
-     * A function which handles passed parameters. Useful if desired
-     * chart needs to be a little bit different from the default one.
-     *
-     * @return void
-     * @access private
-     */
-    private function _handleOptions()
-    {
-        if (!is_null($this->_userSpecifiedSettings)) {
-            $this->_settings = array_merge(
-                $this->_settings,
-                $this->_userSpecifiedSettings
-            );
-        }
-    }
-
-    /**
-     * Sanitizes the file name.
-     *
-     * @param string $file_name file name
-     * @param string $ext       extension of the file
-     *
-     * @return string the sanitized file name
-     * @access private
-     */
-    private function _sanitizeName($file_name, $ext)
-    {
-        $file_name = PMA_sanitizeFilename($file_name);
-
-        // Check if the user already added extension;
-        // get the substring where the extension would be if it was included
-        $extension_start_pos = mb_strlen($file_name) - mb_strlen($ext) - 1;
-        $user_extension
-            = mb_substr(
-                $file_name,
-                $extension_start_pos,
-                mb_strlen($file_name)
-            );
-        $required_extension = "." . $ext;
-        if (mb_strtolower($user_extension) != $required_extension) {
-            $file_name .= $required_extension;
-        }
-
-        return $file_name;
-    }
-
-    /**
-     * Handles common tasks of writing the visualization to file for various formats.
-     *
-     * @param string $file_name file name
-     * @param string $type      mime type
-     * @param string $ext       extension of the file
-     *
-     * @return void
-     * @access private
-     */
-    private function _toFile($file_name, $type, $ext)
-    {
-        $file_name = $this->_sanitizeName($file_name, $ext);
-        PMA_downloadHeader($file_name, $type);
-    }
-
-    /**
-     * Generate the visualization in SVG format.
-     *
-     * @return string the generated image resource
-     * @access private
-     */
-    private function _svg()
-    {
-        $this->init();
-
-        $output = '<?xml version="1.0" encoding="UTF-8" standalone="no"?' . ' >'
-            . "\n"
-            . '<svg version="1.1" xmlns:svg="http://www.w3.org/2000/svg"'
-            . ' xmlns="http://www.w3.org/2000/svg"'
-            . ' width="' . intval($this->_settings['width']) . '"'
-            . ' height="' . intval($this->_settings['height']) . '">'
-            . '<g id="groupPanel">';
-
-        $scale_data = $this->_scaleDataSet($this->_data);
-        $output .= $this->_prepareDataSet($this->_data, $scale_data, 'svg', '');
-
-        $output .= '</g></svg>';
-
-        return $output;
-    }
-
-    /**
-     * Get the visualization as a SVG.
-     *
-     * @return string the visualization as a SVG
-     * @access public
-     */
-    public function asSVG()
-    {
-        $output = $this->_svg();
-
-        return $output;
-    }
-
-    /**
-     * Saves as a SVG image to a file.
-     *
-     * @param string $file_name File name
-     *
-     * @return void
-     * @access public
-     */
-    public function toFileAsSvg($file_name)
-    {
-        $img = $this->_svg();
-        $this->_toFile($file_name, 'image/svg+xml', 'svg');
-        echo($img);
-    }
-
-    /**
-     * Generate the visualization in PNG format.
-     *
-     * @return resource the generated image resource
-     * @access private
-     */
-    private function _png()
-    {
-        $this->init();
-
-        // create image
-        $image = imagecreatetruecolor(
-            $this->_settings['width'],
-            $this->_settings['height']
-        );
-
-        // fill the background
-        $bg = imagecolorallocate($image, 229, 229, 229);
-        imagefilledrectangle(
-            $image,
-            0,
-            0,
-            $this->_settings['width'] - 1,
-            $this->_settings['height'] - 1,
-            $bg
-        );
-
-        $scale_data = $this->_scaleDataSet($this->_data);
-        $image = $this->_prepareDataSet($this->_data, $scale_data, 'png', $image);
-
-        return $image;
-    }
-
-    /**
-     * Get the visualization as a PNG.
-     *
-     * @return string the visualization as a PNG
-     * @access public
-     */
-    public function asPng()
-    {
-        $img = $this->_png();
-
-        // render and save it to variable
-        ob_start();
-        imagepng($img, null, 9, PNG_ALL_FILTERS);
-        imagedestroy($img);
-        $output = ob_get_contents();
-        ob_end_clean();
-
-        // base64 encode
-        $encoded = base64_encode($output);
-
-        return '<img src="data:image/png;base64,' . $encoded . '" />';
-    }
-
-    /**
-     * Saves as a PNG image to a file.
-     *
-     * @param string $file_name File name
-     *
-     * @return void
-     * @access public
-     */
-    public function toFileAsPng($file_name)
-    {
-        $img = $this->_png();
-        $this->_toFile($file_name, 'image/png', 'png');
-        imagepng($img, null, 9, PNG_ALL_FILTERS);
-        imagedestroy($img);
-    }
-
-    /**
-     * Get the code for visualization with OpenLayers.
-     *
-     * @todo Should return JSON to avoid eval() in gis_data_editor.js
-     *
-     * @return string the code for visualization with OpenLayers
-     * @access public
-     */
-    public function asOl()
-    {
-        $this->init();
-        $scale_data = $this->_scaleDataSet($this->_data);
-        $output
-            = 'if (typeof OpenLayers !== "undefined") {'
-            . 'var options = {'
-            . 'projection: new OpenLayers.Projection("EPSG:900913"),'
-            . 'displayProjection: new OpenLayers.Projection("EPSG:4326"),'
-            . 'units: "m",'
-            . 'numZoomLevels: 18,'
-            . 'maxResolution: 156543.0339,'
-            . 'maxExtent: new OpenLayers.Bounds('
-            . '-20037508, -20037508, 20037508, 20037508),'
-            . 'restrictedExtent: new OpenLayers.Bounds('
-            . '-20037508, -20037508, 20037508, 20037508)'
-            . '};'
-            . 'var map = new OpenLayers.Map("openlayersmap", options);'
-            . 'var layerNone = new OpenLayers.Layer.Boxes('
-            . '"None", {isBaseLayer: true});'
-            . 'var layerOSM = new OpenLayers.Layer.OSM("OSM",'
-            . '['
-            . '"https://a.tile.openstreetmap.org/${z}/${x}/${y}.png",'
-            . '"https://b.tile.openstreetmap.org/${z}/${x}/${y}.png",'
-            . '"https://c.tile.openstreetmap.org/${z}/${x}/${y}.png"'
-            . ']);'
-            . 'map.addLayers([layerOSM,layerNone]);'
-            . 'var vectorLayer = new OpenLayers.Layer.Vector("Data");'
-            . 'var bound;';
-        $output .= $this->_prepareDataSet($this->_data, $scale_data, 'ol', '');
-        $output .= 'map.addLayer(vectorLayer);'
-            . 'map.zoomToExtent(bound);'
-            . 'if (map.getZoom() < 2) {'
-            . 'map.zoomTo(2);'
-            . '}'
-            . 'map.addControl(new OpenLayers.Control.LayerSwitcher());'
-            . 'map.addControl(new OpenLayers.Control.MousePosition());'
-            . '}';
-
-        return $output;
-    }
-
-    /**
-     * Saves as a PDF to a file.
-     *
-     * @param string $file_name File name
-     *
-     * @return void
-     * @access public
-     */
-    public function toFileAsPdf($file_name)
-    {
-        $this->init();
-
-        include_once './libraries/tcpdf/tcpdf.php';
-
-        // create pdf
-        $pdf = new TCPDF(
-            '', 'pt', $GLOBALS['cfg']['PDFDefaultPageSize'], true, 'UTF-8', false
-        );
-
-        // disable header and footer
-        $pdf->setPrintHeader(false);
-        $pdf->setPrintFooter(false);
-
-        //set auto page breaks
-        $pdf->SetAutoPageBreak(false);
-
-        // add a page
-        $pdf->AddPage();
-
-        $scale_data = $this->_scaleDataSet($this->_data);
-        $pdf = $this->_prepareDataSet($this->_data, $scale_data, 'pdf', $pdf);
-
-        // sanitize file name
-        $file_name = $this->_sanitizeName($file_name, 'pdf');
-        $pdf->Output($file_name, 'D');
-    }
-
-    /**
-     * Convert file to image
-     *
-     * @param string $format Output format
-     *
-     * @return string File
-     */
-    public function toImage($format)
-    {
-        if ($format == 'svg') {
-            return $this->asSvg();
-        } elseif ($format == 'png') {
-            return $this->asPng();
-        } elseif ($format == 'ol') {
-            return $this->asOl();
-        }
-    }
-
-    /**
-     * Convert file to given format
-     *
-     * @param string $filename Filename
-     * @param string $format   Output format
-     *
-     * @return void
-     */
-    public function toFile($filename, $format)
-    {
-        if ($format == 'svg') {
-            $this->toFileAsSvg($filename);
-        } elseif ($format == 'png') {
-            $this->toFileAsPng($filename);
-        } elseif ($format == 'pdf') {
-            $this->toFileAsPdf($filename);
-        }
-    }
-
-    /**
-     * Calculates the scale, horizontal and vertical offset that should be used.
-     *
-     * @param array $data Row data
-     *
-     * @return array an array containing the scale, x and y offsets
-     * @access private
-     */
-    private function _scaleDataSet($data)
-    {
-        $min_max = array();
-        $border = 15;
-        // effective width and height of the plot
-        $plot_width = $this->_settings['width'] - 2 * $border;
-        $plot_height = $this->_settings['height'] - 2 * $border;
-
-        foreach ($data as $row) {
-
-            // Figure out the data type
-            $ref_data = $row[$this->_settings['spatialColumn']];
-            $type_pos = mb_strpos($ref_data, '(');
-            if ($type_pos === false) {
-                continue;
-            }
-            $type = mb_substr($ref_data, 0, $type_pos);
-
-            $gis_obj = GISFactory::factory($type);
-            if (!$gis_obj) {
-                continue;
-            }
-            $scale_data = $gis_obj->scaleRow(
-                $row[$this->_settings['spatialColumn']]
-            );
-
-            // Update minimum/maximum values for x and y coordinates.
-            $c_maxX = (float)$scale_data['maxX'];
-            if (!isset($min_max['maxX']) || $c_maxX > $min_max['maxX']) {
-                $min_max['maxX'] = $c_maxX;
-            }
-
-            $c_minX = (float)$scale_data['minX'];
-            if (!isset($min_max['minX']) || $c_minX < $min_max['minX']) {
-                $min_max['minX'] = $c_minX;
-            }
-
-            $c_maxY = (float)$scale_data['maxY'];
-            if (!isset($min_max['maxY']) || $c_maxY > $min_max['maxY']) {
-                $min_max['maxY'] = $c_maxY;
-            }
-
-            $c_minY = (float)$scale_data['minY'];
-            if (!isset($min_max['minY']) || $c_minY < $min_max['minY']) {
-                $min_max['minY'] = $c_minY;
-            }
-        }
-
-        // scale the visualization
-        $x_ratio = ($min_max['maxX'] - $min_max['minX']) / $plot_width;
-        $y_ratio = ($min_max['maxY'] - $min_max['minY']) / $plot_height;
-        $ratio = ($x_ratio > $y_ratio) ? $x_ratio : $y_ratio;
-
-        $scale = ($ratio != 0) ? (1 / $ratio) : 1;
-
-        if ($x_ratio < $y_ratio) {
-            // center horizontally
-            $x = ($min_max['maxX'] + $min_max['minX'] - $plot_width / $scale) / 2;
-            // fit vertically
-            $y = $min_max['minY'] - ($border / $scale);
-        } else {
-            // fit horizontally
-            $x = $min_max['minX'] - ($border / $scale);
-            // center vertically
-            $y = ($min_max['maxY'] + $min_max['minY'] - $plot_height / $scale) / 2;
-        }
-
-        return array(
-            'scale'  => $scale,
-            'x'      => $x,
-            'y'      => $y,
-            'minX'   => $min_max['minX'],
-            'maxX'   => $min_max['maxX'],
-            'minY'   => $min_max['minY'],
-            'maxY'   => $min_max['maxY'],
-            'height' => $this->_settings['height'],
-        );
-    }
-
-    /**
-     * Prepares and return the dataset as needed by the visualization.
-     *
-     * @param array  $data       Raw data
-     * @param array  $scale_data Data related to scaling
-     * @param string $format     Format of the visualization
-     * @param object $results    Image object in the case of png
-     *                           TCPDF object in the case of pdf
-     *
-     * @return mixed the formatted array of data
-     * @access private
-     */
-    private function _prepareDataSet($data, $scale_data, $format, $results)
-    {
-        $color_number = 0;
-
-        // loop through the rows
-        foreach ($data as $row) {
-            $index = $color_number % sizeof($this->_settings['colors']);
-
-            // Figure out the data type
-            $ref_data = $row[$this->_settings['spatialColumn']];
-            $type_pos = mb_strpos($ref_data, '(');
-            if ($type_pos === false) {
-                continue;
-            }
-            $type = mb_substr($ref_data, 0, $type_pos);
-
-            $gis_obj = GISFactory::factory($type);
-            if (!$gis_obj) {
-                continue;
-            }
-            $label = '';
-            if (isset($this->_settings['labelColumn'])
-                && isset($row[$this->_settings['labelColumn']])
-            ) {
-                $label = $row[$this->_settings['labelColumn']];
-            }
-
-            if ($format == 'svg') {
-                $results .= $gis_obj->prepareRowAsSvg(
-                    $row[$this->_settings['spatialColumn']],
-                    $label,
-                    $this->_settings['colors'][$index],
-                    $scale_data
-                );
-            } elseif ($format == 'png') {
-                $results = $gis_obj->prepareRowAsPng(
-                    $row[$this->_settings['spatialColumn']],
-                    $label,
-                    $this->_settings['colors'][$index],
-                    $scale_data,
-                    $results
-                );
-            } elseif ($format == 'pdf') {
-                $results = $gis_obj->prepareRowAsPdf(
-                    $row[$this->_settings['spatialColumn']],
-                    $label,
-                    $this->_settings['colors'][$index],
-                    $scale_data,
-                    $results
-                );
-            } elseif ($format == 'ol') {
-                $results .= $gis_obj->prepareRowAsOl(
-                    $row[$this->_settings['spatialColumn']],
-                    $row['srid'],
-                    $label,
-                    $this->_settings['colors'][$index],
-                    $scale_data
-                );
-            }
-            $color_number++;
-        }
-
-        return $results;
-    }
-
-    /**
-     * Set user specified settings
-     *
-     * @param array $userSpecifiedSettings User specified settings
-     *
-     * @return void
-     */
-    public function setUserSpecifiedSettings($userSpecifiedSettings)
-    {
-        $this->_userSpecifiedSettings = $userSpecifiedSettings;
-    }
-}
diff --git a/#pma/libraries/iconv_wrapper.lib.php b/#pma/libraries/iconv_wrapper.lib.php
deleted file mode 100644
index 6dc5d654..00000000
--- a/#pma/libraries/iconv_wrapper.lib.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Iconv wrapper for AIX
- *
- * @package PhpMyAdmin
- */
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
-/**
- * GNU iconv code set to IBM AIX libiconv code set table
- * Keys of this table should be in lowercase,
- * and searches should be performed using lowercase!
- */
-$gnu_iconv_to_aix_iconv_codepage_map = array (
-    // "iso-8859-[1-9]" --> "ISO8859-[1-9]" according to
-    // http://publibn.boulder.ibm.com/doc_link/en_US/a_doc_lib/libs/basetrf2/setlocale.htm
-    'iso-8859-1' => 'ISO8859-1',
-    'iso-8859-2' => 'ISO8859-2',
-    'iso-8859-3' => 'ISO8859-3',
-    'iso-8859-4' => 'ISO8859-4',
-    'iso-8859-5' => 'ISO8859-5',
-    'iso-8859-6' => 'ISO8859-6',
-    'iso-8859-7' => 'ISO8859-7',
-    'iso-8859-8' => 'ISO8859-8',
-    'iso-8859-9' => 'ISO8859-9',
-
-    // "big5" --> "IBM-eucTW" according to
-    // http://kadesh.cepba.upc.es/mancpp/classref/ref/ITranscoder_DSC.htm
-    'big5' => 'IBM-eucTW',
-
-    // Other mappings corresponding to the phpMyAdmin dropdown box when using the
-    // charset conversion feature
-    'euc-jp' => 'IBM-eucJP',
-    'koi8-r' => 'IBM-eucKR',
-    'ks_c_5601-1987' => 'KSC5601.1987-0',
-    'tis-620' => 'TIS-620',
-    'utf-8' => 'UTF-8'
-);
-
-/**
- * Wrapper around IBM AIX iconv(), whose character set naming differs
- * from the GNU version of iconv().
- *
- * @param string $in_charset  input character set
- * @param string $out_charset output character set
- * @param string $str         the string to convert
- *
- * @return mixed    converted string or false on failure
- *
- * @access  public
- *
- */
-function PMA_convertAIXIconv($in_charset, $out_charset, $str)
-{
-    list($in_charset, $out_charset) = PMA_convertAIXMapCharsets(
-        $in_charset, $out_charset
-    );
-    // Call iconv() with the possibly modified parameters
-    return iconv($in_charset, $out_charset, $str);
-} //  end of the "PMA_convertAIXIconv()" function
-
-/**
- * Maps input and output character set names to corresponding AIX ones
- *
- * @param string $in_charset  input character set
- * @param string $out_charset output character set
- *
- * @return array array of mapped input and output character set names
- */
-function PMA_convertAIXMapCharsets($in_charset, $out_charset)
-{
-    global $gnu_iconv_to_aix_iconv_codepage_map;
-
-    // Check for transliteration argument at the end of output character set name
-    $translit_search = mb_strpos(
-        mb_strtolower($out_charset),
-        '//translit'
-    );
-    $using_translit = (!($translit_search === false));
-
-    // Extract "plain" output character set name
-    // (without any transliteration argument)
-    $out_charset_plain = ($using_translit
-        ? mb_substr($out_charset, 0, $translit_search)
-        : $out_charset);
-
-    // Transform name of input character set (if found)
-    $in_charset_exisits = array_key_exists(
-        mb_strtolower($in_charset),
-        $gnu_iconv_to_aix_iconv_codepage_map
-    );
-    if ($in_charset_exisits) {
-        $in_charset = $gnu_iconv_to_aix_iconv_codepage_map[
-            mb_strtolower($in_charset)
-        ];
-    }
-
-    // Transform name of "plain" output character set (if found)
-    $out_charset_plain_exists = array_key_exists(
-        mb_strtolower($out_charset_plain),
-        $gnu_iconv_to_aix_iconv_codepage_map
-    );
-    if ($out_charset_plain_exists) {
-        $out_charset_plain = $gnu_iconv_to_aix_iconv_codepage_map[
-            mb_strtolower($out_charset_plain)
-        ];
-    }
-
-    // Add transliteration argument again (exactly as specified by user) if used
-    // Build the output character set name that we will use
-    /* Not needed because always overwritten
-    $out_charset = ($using_translit
-        ? $out_charset_plain . mb_substr($out_charset, $translit_search)
-        : $out_charset_plain);
-    */
-
-    // NOTE: Transliteration not supported; we will use the "plain"
-    // output character set name
-    $out_charset = $out_charset_plain;
-
-    return array($in_charset, $out_charset);
-}
-
diff --git a/#pma/libraries/import.lib.php b/#pma/libraries/import.lib.php
deleted file mode 100644
index ad640224..00000000
--- a/#pma/libraries/import.lib.php
+++ /dev/null
@@ -1,1724 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Library that provides common import functions that are used by import plugins
- *
- * @package PhpMyAdmin-Import
- */
-use PMA\libraries\Message;
-use PMA\libraries\Table;
-use PMA\libraries\Util;
-
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
-/**
- * We need to know something about user
- */
-require_once './libraries/check_user_privileges.lib.php';
-
-/**
- * Checks whether timeout is getting close
- *
- * @return boolean true if timeout is close
- * @access public
- */
-function PMA_checkTimeout()
-{
-    global $timestamp, $maximum_time, $timeout_passed;
-    if ($maximum_time == 0) {
-        return false;
-    } elseif ($timeout_passed) {
-        return true;
-        /* 5 in next row might be too much */
-    } elseif ((time() - $timestamp) > ($maximum_time - 5)) {
-        $timeout_passed = true;
-        return true;
-    } else {
-        return false;
-    }
-}
-
-/**
- * Detects what compression the file uses
- *
- * @param string $filepath filename to check
- *
- * @return string MIME type of compression, none for none
- * @access public
- */
-function PMA_detectCompression($filepath)
-{
-    $file = @fopen($filepath, 'rb');
-    if (! $file) {
-        return false;
-    }
-    return PMA\libraries\Util::getCompressionMimeType($file);
-}
-
-/**
- * Runs query inside import buffer. This is needed to allow displaying
- * of last SELECT, SHOW or HANDLER results and similar nice stuff.
- *
- * @param string $sql       query to run
- * @param string $full      query to display, this might be commented
- * @param array  &$sql_data SQL parse data storage
- *
- * @return void
- * @access public
- */
-function PMA_executeQuery($sql, $full, &$sql_data)
-{
-    global $go_sql,
-        $sql_query, $my_die, $error, $reload,
-        $result, $msg,
-        $cfg, $sql_query_disabled, $db;
-
-    $result = $GLOBALS['dbi']->tryQuery($sql);
-
-    // USE query changes the database, son need to track
-    // while running multiple queries
-    $is_use_query = mb_stripos($sql, "use ") !== false;
-
-    $msg = '# ';
-    if ($result === false) { // execution failed
-        if (! isset($my_die)) {
-            $my_die = array();
-        }
-        $my_die[] = array(
-            'sql' => $full,
-            'error' => $GLOBALS['dbi']->getError()
-        );
-
-        $msg .= __('Error');
-
-        if (! $cfg['IgnoreMultiSubmitErrors']) {
-            $error = true;
-            return;
-        }
-    } else {
-        $a_num_rows = (int)@$GLOBALS['dbi']->numRows($result);
-        $a_aff_rows = (int)@$GLOBALS['dbi']->affectedRows();
-        if ($a_num_rows > 0) {
-            $msg .= __('Rows') . ': ' . $a_num_rows;
-        } elseif ($a_aff_rows > 0) {
-            $message = Message::getMessageForAffectedRows(
-                $a_aff_rows
-            );
-            $msg .= $message->getMessage();
-        } else {
-            $msg .= __(
-                'MySQL returned an empty result set (i.e. zero '
-                . 'rows).'
-            );
-        }
-
-        if (($a_num_rows > 0) || $is_use_query) {
-            $sql_data['valid_sql'][] = $sql;
-            if (!isset($sql_data['valid_queries'])) {
-                $sql_data['valid_queries'] = 0;
-            }
-            $sql_data['valid_queries']++;
-        }
-    }
-    if (! $sql_query_disabled) {
-        $sql_query .= $msg . "\n";
-    }
-
-    // If a 'USE <db>' SQL-clause was found and the query
-    // succeeded, set our current $db to the new one
-    if ($result != false) {
-        list($db, $reload) = PMA_lookForUse(
-            $sql,
-            $db,
-            $reload
-        );
-    }
-
-    $pattern = '@^[\s]*(DROP|CREATE)[\s]+(IF EXISTS[[:space:]]+)'
-        . '?(TABLE|DATABASE)[[:space:]]+(.+)@im';
-    if ($result != false
-        && preg_match($pattern, $sql)
-    ) {
-        $reload = true;
-    }
-}
-
-/**
- * Runs query inside import buffer. This is needed to allow displaying
- * of last SELECT, SHOW or HANDLER results and similar nice stuff.
- *
- * @param string $sql       query to run
- * @param string $full      query to display, this might be commented
- * @param array  &$sql_data SQL parse data storage
- *
- * @return void
- * @access public
- */
-function PMA_importRunQuery($sql = '', $full = '', &$sql_data = array())
-{
-    global $import_run_buffer, $go_sql, $complete_query, $display_query,
-        $sql_query, $error, $reload, $result, $msg,
-        $skip_queries, $executed_queries, $max_sql_len, $read_multiply,
-        $cfg, $sql_query_disabled, $db, $run_query, $is_superuser;
-    $read_multiply = 1;
-    if (!isset($import_run_buffer)) {
-        // Do we have something to push into buffer?
-        $import_run_buffer = PMA_ImportRunQuery_post(
-            $import_run_buffer, $sql, $full
-        );
-        return;
-    }
-
-    // Should we skip something?
-    if ($skip_queries > 0) {
-        $skip_queries--;
-        // Do we have something to push into buffer?
-        $import_run_buffer = PMA_ImportRunQuery_post(
-            $import_run_buffer, $sql, $full
-        );
-        return;
-    }
-
-    if (! empty($import_run_buffer['sql'])
-        && trim($import_run_buffer['sql']) != ''
-    ) {
-        $max_sql_len = max(
-            $max_sql_len,
-            mb_strlen($import_run_buffer['sql'])
-        );
-        if (! $sql_query_disabled) {
-            $sql_query .= $import_run_buffer['full'];
-        }
-
-        $executed_queries++;
-
-        if ($run_query && $executed_queries < 50) {
-            $go_sql = true;
-
-            if (! $sql_query_disabled) {
-                $complete_query = $sql_query;
-                $display_query = $sql_query;
-            } else {
-                $complete_query = '';
-                $display_query = '';
-            }
-            $sql_query = $import_run_buffer['sql'];
-            $sql_data['valid_sql'][] = $import_run_buffer['sql'];
-            $sql_data['valid_full'][] = $import_run_buffer['full'];
-            if (! isset($sql_data['valid_queries'])) {
-                $sql_data['valid_queries'] = 0;
-            }
-            $sql_data['valid_queries']++;
-        } elseif ($run_query) {
-
-            /* Handle rollback from go_sql */
-            if ($go_sql && isset($sql_data['valid_full'])) {
-                $queries = $sql_data['valid_sql'];
-                $fulls = $sql_data['valid_full'];
-                $count = $sql_data['valid_queries'];
-                $go_sql = false;
-
-                $sql_data['valid_sql'] = array();
-                $sql_data['valid_queries'] = 0;
-                unset($sql_data['valid_full']);
-                for ($i = 0; $i < $count; $i++) {
-                    PMA_executeQuery(
-                        $queries[$i],
-                        $fulls[$i],
-                        $sql_data
-                    );
-                }
-            }
-
-            PMA_executeQuery(
-                $import_run_buffer['sql'],
-                $import_run_buffer['full'],
-                $sql_data
-            );
-        } // end run query
-        // end non empty query
-    } elseif (! empty($import_run_buffer['full'])) {
-        if ($go_sql) {
-            $complete_query .= $import_run_buffer['full'];
-            $display_query .= $import_run_buffer['full'];
-        } else {
-            if (! $sql_query_disabled) {
-                $sql_query .= $import_run_buffer['full'];
-            }
-        }
-    }
-    // check length of query unless we decided to pass it to sql.php
-    // (if $run_query is false, we are just displaying so show
-    // the complete query in the textarea)
-    if (! $go_sql && $run_query) {
-        if (! empty($sql_query)) {
-            if (mb_strlen($sql_query) > 50000
-                || $executed_queries > 50
-                || $max_sql_len > 1000
-            ) {
-                $sql_query = '';
-                $sql_query_disabled = true;
-            }
-        }
-    }
-
-    // Do we have something to push into buffer?
-    $import_run_buffer = PMA_ImportRunQuery_post($import_run_buffer, $sql, $full);
-
-    // In case of ROLLBACK, notify the user.
-    if (isset($_REQUEST['rollback_query'])) {
-        $msg .= __('[ROLLBACK occurred.]');
-    }
-}
-
-/**
- * Return import run buffer
- *
- * @param array  $import_run_buffer Buffer of queries for import
- * @param string $sql               SQL query
- * @param string $full              Query to display
- *
- * @return array Buffer of queries for import
- */
-function PMA_ImportRunQuery_post($import_run_buffer, $sql, $full)
-{
-    if (!empty($sql) || !empty($full)) {
-        $import_run_buffer = array('sql' => $sql, 'full' => $full);
-        return $import_run_buffer;
-    } else {
-        unset($GLOBALS['import_run_buffer']);
-        return $import_run_buffer;
-    }
-}
-
-/**
- * Looks for the presence of USE to possibly change current db
- *
- * @param string $buffer buffer to examine
- * @param string $db     current db
- * @param bool   $reload reload
- *
- * @return array (current or new db, whether to reload)
- * @access public
- */
-function PMA_lookForUse($buffer, $db, $reload)
-{
-    if (preg_match('@^[\s]*USE[[:space:]]+([\S]+)@i', $buffer, $match)) {
-        $db = trim($match[1]);
-        $db = trim($db, ';'); // for example, USE abc;
-
-        // $db must not contain the escape characters generated by backquote()
-        // ( used in PMA_buildSQL() as: backquote($db_name), and then called
-        // in PMA_importRunQuery() which in turn calls PMA_lookForUse() )
-        $db = PMA\libraries\Util::unQuote($db);
-
-        $reload = true;
-    }
-    return(array($db, $reload));
-}
-
-
-/**
- * Returns next part of imported file/buffer
- *
- * @param int $size size of buffer to read
- *                  (this is maximal size function will return)
- *
- * @return string part of file/buffer
- * @access public
- */
-function PMA_importGetNextChunk($size = 32768)
-{
-    global $compression, $import_handle, $charset_conversion, $charset_of_file,
-        $read_multiply;
-
-    // Add some progression while reading large amount of data
-    if ($read_multiply <= 8) {
-        $size *= $read_multiply;
-    } else {
-        $size *= 8;
-    }
-    $read_multiply++;
-
-    // We can not read too much
-    if ($size > $GLOBALS['read_limit']) {
-        $size = $GLOBALS['read_limit'];
-    }
-
-    if (PMA_checkTimeout()) {
-        return false;
-    }
-    if ($GLOBALS['finished']) {
-        return true;
-    }
-
-    if ($GLOBALS['import_file'] == 'none') {
-        // Well this is not yet supported and tested,
-        // but should return content of textarea
-        if (mb_strlen($GLOBALS['import_text']) < $size) {
-            $GLOBALS['finished'] = true;
-            return $GLOBALS['import_text'];
-        } else {
-            $r = mb_substr($GLOBALS['import_text'], 0, $size);
-            $GLOBALS['offset'] += $size;
-            $GLOBALS['import_text'] = mb_substr($GLOBALS['import_text'], $size);
-            return $r;
-        }
-    }
-
-    switch ($compression) {
-    case 'application/bzip2':
-        $result = bzread($import_handle, $size);
-        $GLOBALS['finished'] = feof($import_handle);
-        break;
-    case 'application/gzip':
-        $result = gzread($import_handle, $size);
-        $GLOBALS['finished'] = feof($import_handle);
-        break;
-    case 'application/zip':
-        $result = mb_substr($GLOBALS['import_text'], 0, $size);
-        $GLOBALS['import_text'] = mb_substr(
-            $GLOBALS['import_text'],
-            $size
-        );
-        $GLOBALS['finished'] = empty($GLOBALS['import_text']);
-        break;
-    case 'none':
-        $result = fread($import_handle, $size);
-        $GLOBALS['finished'] = feof($import_handle);
-        break;
-    }
-    $GLOBALS['offset'] += $size;
-
-    if ($charset_conversion) {
-        return PMA_convertString($charset_of_file, 'utf-8', $result);
-    }
-
-    /**
-     * Skip possible byte order marks (I do not think we need more
-     * charsets, but feel free to add more, you can use wikipedia for
-     * reference: <https://en.wikipedia.org/wiki/Byte_Order_Mark>)
-     *
-     * @todo BOM could be used for charset autodetection
-     */
-    if ($GLOBALS['offset'] == $size) {
-        // UTF-8
-        if (strncmp($result, "\xEF\xBB\xBF", 3) == 0) {
-            $result = mb_substr($result, 3);
-            // UTF-16 BE, LE
-        } elseif (strncmp($result, "\xFE\xFF", 2) == 0
-            || strncmp($result, "\xFF\xFE", 2) == 0
-        ) {
-            $result = mb_substr($result, 2);
-        }
-    }
-    return $result;
-}
-
-/**
- * Returns the "Excel" column name (i.e. 1 = "A", 26 = "Z", 27 = "AA", etc.)
- *
- * This functions uses recursion to build the Excel column name.
- *
- * The column number (1-26) is converted to the responding
- * ASCII character (A-Z) and returned.
- *
- * If the column number is bigger than 26 (= num of letters in alphabet),
- * an extra character needs to be added. To find this extra character,
- * the number is divided by 26 and this value is passed to another instance
- * of the same function (hence recursion). In that new instance the number is
- * evaluated again, and if it is still bigger than 26, it is divided again
- * and passed to another instance of the same function. This continues until
- * the number is smaller than 26. Then the last called function returns
- * the corresponding ASCII character to the function that called it.
- * Each time a called function ends an extra character is added to the column name.
- * When the first function is reached, the last character is added and the complete
- * column name is returned.
- *
- * @param int $num the column number
- *
- * @return string The column's "Excel" name
- * @access  public
- */
-function PMA_getColumnAlphaName($num)
-{
-    $A = 65; // ASCII value for capital "A"
-    $col_name = "";
-
-    if ($num > 26) {
-        $div = (int)($num / 26);
-        $remain = (int)($num % 26);
-
-        // subtract 1 of divided value in case the modulus is 0,
-        // this is necessary because A-Z has no 'zero'
-        if ($remain == 0) {
-            $div--;
-        }
-
-        // recursive function call
-        $col_name = PMA_getColumnAlphaName($div);
-        // use modulus as new column number
-        $num = $remain;
-    }
-
-    if ($num == 0) {
-        // use 'Z' if column number is 0,
-        // this is necessary because A-Z has no 'zero'
-        $col_name .= mb_chr(($A + 26) - 1);
-    } else {
-        // convert column number to ASCII character
-        $col_name .= mb_chr(($A + $num) - 1);
-    }
-
-    return $col_name;
-}
-
-/**
- * Returns the column number based on the Excel name.
- * So "A" = 1, "Z" = 26, "AA" = 27, etc.
- *
- * Basically this is a base26 (A-Z) to base10 (0-9) conversion.
- * It iterates through all characters in the column name and
- * calculates the corresponding value, based on character value
- * (A = 1, ..., Z = 26) and position in the string.
- *
- * @param string $name column name(i.e. "A", or "BC", etc.)
- *
- * @return int The column number
- * @access  public
- */
-function PMA_getColumnNumberFromName($name)
-{
-    if (empty($name)) {
-        return 0;
-    }
-
-    $name = mb_strtoupper($name);
-    $num_chars = mb_strlen($name);
-    $column_number = 0;
-    for ($i = 0; $i < $num_chars; ++$i) {
-        // read string from back to front
-        $char_pos = ($num_chars - 1) - $i;
-
-        // convert capital character to ASCII value
-        // and subtract 64 to get corresponding decimal value
-        // ASCII value of "A" is 65, "B" is 66, etc.
-        // Decimal equivalent of "A" is 1, "B" is 2, etc.
-        $number = (int)(mb_ord($name[$char_pos]) - 64);
-
-        // base26 to base10 conversion : multiply each number
-        // with corresponding value of the position, in this case
-        // $i=0 : 1; $i=1 : 26; $i=2 : 676; ...
-        $column_number += $number * PMA\libraries\Util::pow(26, $i);
-    }
-    return $column_number;
-}
-
-/**
- * Constants definitions
- */
-
-/* MySQL type defs */
-define("NONE",      0);
-define("VARCHAR",   1);
-define("INT",       2);
-define("DECIMAL",   3);
-define("BIGINT",    4);
-define("GEOMETRY",  5);
-
-/* Decimal size defs */
-define("M",         0);
-define("D",         1);
-define("FULL",      2);
-
-/* Table array defs */
-define("TBL_NAME",  0);
-define("COL_NAMES", 1);
-define("ROWS",      2);
-
-/* Analysis array defs */
-define("TYPES",        0);
-define("SIZES",        1);
-define("FORMATTEDSQL", 2);
-
-/**
- * Obtains the precision (total # of digits) from a size of type decimal
- *
- * @param string $last_cumulative_size Size of type decimal
- *
- * @return int Precision of the given decimal size notation
- * @access  public
- */
-function PMA_getDecimalPrecision($last_cumulative_size)
-{
-    return (int)substr(
-        $last_cumulative_size,
-        0,
-        strpos($last_cumulative_size, ",")
-    );
-}
-
-/**
- * Obtains the scale (# of digits to the right of the decimal point)
- * from a size of type decimal
- *
- * @param string $last_cumulative_size Size of type decimal
- *
- * @return int Scale of the given decimal size notation
- * @access  public
- */
-function PMA_getDecimalScale($last_cumulative_size)
-{
-    return (int)substr(
-        $last_cumulative_size,
-        (strpos($last_cumulative_size, ",") + 1),
-        (strlen($last_cumulative_size) - strpos($last_cumulative_size, ","))
-    );
-}
-
-/**
- * Obtains the decimal size of a given cell
- *
- * @param string $cell cell content
- *
- * @return array Contains the precision, scale, and full size
- *                representation of the given decimal cell
- * @access  public
- */
-function PMA_getDecimalSize($cell)
-{
-    $curr_size = mb_strlen((string)$cell);
-    $decPos = mb_strpos($cell, ".");
-    $decPrecision = ($curr_size - 1) - $decPos;
-
-    $m = $curr_size - 1;
-    $d = $decPrecision;
-
-    return array($m, $d, ($m . "," . $d));
-}
-
-/**
- * Obtains the size of the given cell
- *
- * @param string $last_cumulative_size Last cumulative column size
- * @param int    $last_cumulative_type Last cumulative column type
- *                                     (NONE or VARCHAR or DECIMAL or INT or BIGINT)
- * @param int    $curr_type            Type of the current cell
- *                                     (NONE or VARCHAR or DECIMAL or INT or BIGINT)
- * @param string $cell                 The current cell
- *
- * @return string  Size of the given cell in the type-appropriate format
- * @access  public
- *
- * @todo    Handle the error cases more elegantly
- */
-function PMA_detectSize($last_cumulative_size, $last_cumulative_type,
-    $curr_type, $cell
-) {
-    $curr_size = mb_strlen((string)$cell);
-
-    /**
-     * If the cell is NULL, don't treat it as a varchar
-     */
-    if (! strcmp('NULL', $cell)) {
-        return $last_cumulative_size;
-    } elseif ($curr_type == VARCHAR) {
-        /**
-         * What to do if the current cell is of type VARCHAR
-         */
-        /**
-         * The last cumulative type was VARCHAR
-         */
-        if ($last_cumulative_type == VARCHAR) {
-            if ($curr_size >= $last_cumulative_size) {
-                return $curr_size;
-            } else {
-                return $last_cumulative_size;
-            }
-        } elseif ($last_cumulative_type == DECIMAL) {
-            /**
-             * The last cumulative type was DECIMAL
-             */
-            $oldM = PMA_getDecimalPrecision($last_cumulative_size);
-
-            if ($curr_size >= $oldM) {
-                return $curr_size;
-            } else {
-                return $oldM;
-            }
-        } elseif ($last_cumulative_type == BIGINT || $last_cumulative_type == INT) {
-            /**
-             * The last cumulative type was BIGINT or INT
-             */
-            if ($curr_size >= $last_cumulative_size) {
-                return $curr_size;
-            } else {
-                return $last_cumulative_size;
-            }
-        } elseif (! isset($last_cumulative_type) || $last_cumulative_type == NONE) {
-            /**
-             * This is the first row to be analyzed
-             */
-            return $curr_size;
-        } else {
-            /**
-             * An error has DEFINITELY occurred
-             */
-            /**
-             * TODO: Handle this MUCH more elegantly
-             */
-
-            return -1;
-        }
-    } elseif ($curr_type == DECIMAL) {
-        /**
-         * What to do if the current cell is of type DECIMAL
-         */
-        /**
-         * The last cumulative type was VARCHAR
-         */
-        if ($last_cumulative_type == VARCHAR) {
-            /* Convert $last_cumulative_size from varchar to decimal format */
-            $size = PMA_getDecimalSize($cell);
-
-            if ($size[M] >= $last_cumulative_size) {
-                return $size[M];
-            } else {
-                return $last_cumulative_size;
-            }
-        } elseif ($last_cumulative_type == DECIMAL) {
-            /**
-             * The last cumulative type was DECIMAL
-             */
-            $size = PMA_getDecimalSize($cell);
-
-            $oldM = PMA_getDecimalPrecision($last_cumulative_size);
-            $oldD = PMA_getDecimalScale($last_cumulative_size);
-
-            /* New val if M or D is greater than current largest */
-            if ($size[M] > $oldM || $size[D] > $oldD) {
-                /* Take the largest of both types */
-                return (string) ((($size[M] > $oldM) ? $size[M] : $oldM)
-                    . "," . (($size[D] > $oldD) ? $size[D] : $oldD));
-            } else {
-                return $last_cumulative_size;
-            }
-        } elseif ($last_cumulative_type == BIGINT || $last_cumulative_type == INT) {
-            /**
-             * The last cumulative type was BIGINT or INT
-             */
-            /* Convert $last_cumulative_size from int to decimal format */
-            $size = PMA_getDecimalSize($cell);
-
-            if ($size[M] >= $last_cumulative_size) {
-                return $size[FULL];
-            } else {
-                return ($last_cumulative_size . "," . $size[D]);
-            }
-        } elseif (! isset($last_cumulative_type) || $last_cumulative_type == NONE) {
-            /**
-             * This is the first row to be analyzed
-             */
-            /* First row of the column */
-            $size = PMA_getDecimalSize($cell);
-
-            return $size[FULL];
-        } else {
-            /**
-             * An error has DEFINITELY occurred
-             */
-            /**
-             * TODO: Handle this MUCH more elegantly
-             */
-
-            return -1;
-        }
-    } elseif ($curr_type == BIGINT || $curr_type == INT) {
-        /**
-         * What to do if the current cell is of type BIGINT or INT
-         */
-        /**
-         * The last cumulative type was VARCHAR
-         */
-        if ($last_cumulative_type == VARCHAR) {
-            if ($curr_size >= $last_cumulative_size) {
-                return $curr_size;
-            } else {
-                return $last_cumulative_size;
-            }
-        } elseif ($last_cumulative_type == DECIMAL) {
-            /**
-             * The last cumulative type was DECIMAL
-             */
-            $oldM = PMA_getDecimalPrecision($last_cumulative_size);
-            $oldD = PMA_getDecimalScale($last_cumulative_size);
-            $oldInt = $oldM - $oldD;
-            $newInt = mb_strlen((string)$cell);
-
-            /* See which has the larger integer length */
-            if ($oldInt >= $newInt) {
-                /* Use old decimal size */
-                return $last_cumulative_size;
-            } else {
-                /* Use $newInt + $oldD as new M */
-                return (($newInt + $oldD) . "," . $oldD);
-            }
-        } elseif ($last_cumulative_type == BIGINT || $last_cumulative_type == INT) {
-            /**
-             * The last cumulative type was BIGINT or INT
-             */
-            if ($curr_size >= $last_cumulative_size) {
-                return $curr_size;
-            } else {
-                return $last_cumulative_size;
-            }
-        } elseif (! isset($last_cumulative_type) || $last_cumulative_type == NONE) {
-            /**
-             * This is the first row to be analyzed
-             */
-            return $curr_size;
-        } else {
-            /**
-             * An error has DEFINITELY occurred
-             */
-            /**
-             * TODO: Handle this MUCH more elegantly
-             */
-
-            return -1;
-        }
-    } else {
-        /**
-         * An error has DEFINITELY occurred
-         */
-        /**
-         * TODO: Handle this MUCH more elegantly
-         */
-
-        return -1;
-    }
-}
-
-/**
- * Determines what MySQL type a cell is
- *
- * @param int    $last_cumulative_type Last cumulative column type
- *                                     (VARCHAR or INT or BIGINT or DECIMAL or NONE)
- * @param string $cell                 String representation of the cell for which
- *                                     a best-fit type is to be determined
- *
- * @return int  The MySQL type representation
- *               (VARCHAR or INT or BIGINT or DECIMAL or NONE)
- * @access  public
- */
-function PMA_detectType($last_cumulative_type, $cell)
-{
-    /**
-     * If numeric, determine if decimal, int or bigint
-     * Else, we call it varchar for simplicity
-     */
-
-    if (! strcmp('NULL', $cell)) {
-        if ($last_cumulative_type === null || $last_cumulative_type == NONE) {
-            return NONE;
-        }
-
-        return $last_cumulative_type;
-    }
-
-    if (!is_numeric($cell)) {
-        return VARCHAR;
-    }
-
-    if ($cell == (string)(float)$cell
-        && mb_strpos($cell, ".") !== false
-        && mb_substr_count($cell, ".") == 1
-    ) {
-        return DECIMAL;
-    }
-
-    if (abs($cell) > 2147483647) {
-        return BIGINT;
-    }
-
-    return INT;
-}
-
-/**
- * Determines if the column types are int, decimal, or string
- *
- * @param array &$table array(string $table_name, array $col_names, array $rows)
- *
- * @return array    array(array $types, array $sizes)
- * @access  public
- *
- * @link https://wiki.phpmyadmin.net/pma/Import
- *
- * @todo    Handle the error case more elegantly
- */
-function PMA_analyzeTable(&$table)
-{
-    /* Get number of rows in table */
-    $numRows = count($table[ROWS]);
-    /* Get number of columns */
-    $numCols = count($table[COL_NAMES]);
-    /* Current type for each column */
-    $types = array();
-    $sizes = array();
-
-    /* Initialize $sizes to all 0's */
-    for ($i = 0; $i < $numCols; ++$i) {
-        $sizes[$i] = 0;
-    }
-
-    /* Initialize $types to NONE */
-    for ($i = 0; $i < $numCols; ++$i) {
-        $types[$i] = NONE;
-    }
-
-    /* If the passed array is not of the correct form, do not process it */
-    if (!is_array($table)
-        || is_array($table[TBL_NAME])
-        || !is_array($table[COL_NAMES])
-        || !is_array($table[ROWS])
-    ) {
-        /**
-         * TODO: Handle this better
-         */
-
-        return false;
-    }
-
-    /* Analyze each column */
-    for ($i = 0; $i < $numCols; ++$i) {
-        /* Analyze the column in each row */
-        for ($j = 0; $j < $numRows; ++$j) {
-            /* Determine type of the current cell */
-            $curr_type = PMA_detectType($types[$i], $table[ROWS][$j][$i]);
-            /* Determine size of the current cell */
-            $sizes[$i] = PMA_detectSize(
-                $sizes[$i],
-                $types[$i],
-                $curr_type,
-                $table[ROWS][$j][$i]
-            );
-
-            /**
-             * If a type for this column has already been declared,
-             * only alter it if it was a number and a varchar was found
-             */
-            if ($curr_type != NONE) {
-                if ($curr_type == VARCHAR) {
-                    $types[$i] = VARCHAR;
-                } else if ($curr_type == DECIMAL) {
-                    if ($types[$i] != VARCHAR) {
-                        $types[$i] = DECIMAL;
-                    }
-                } else if ($curr_type == BIGINT) {
-                    if ($types[$i] != VARCHAR && $types[$i] != DECIMAL) {
-                        $types[$i] = BIGINT;
-                    }
-                } else if ($curr_type == INT) {
-                    if ($types[$i] != VARCHAR
-                        && $types[$i] != DECIMAL
-                        && $types[$i] != BIGINT
-                    ) {
-                        $types[$i] = INT;
-                    }
-                }
-            }
-        }
-    }
-
-    /* Check to ensure that all types are valid */
-    $len = count($types);
-    for ($n = 0; $n < $len; ++$n) {
-        if (! strcmp(NONE, $types[$n])) {
-            $types[$n] = VARCHAR;
-            $sizes[$n] = '10';
-        }
-    }
-
-    return array($types, $sizes);
-}
-
-/* Needed to quell the beast that is Message */
-$import_notice = null;
-
-/**
- * Builds and executes SQL statements to create the database and tables
- * as necessary, as well as insert all the data.
- *
- * @param string $db_name         Name of the database
- * @param array  &$tables         Array of tables for the specified database
- * @param array  &$analyses       Analyses of the tables
- * @param array  &$additional_sql Additional SQL statements to be executed
- * @param array  $options         Associative array of options
- * @param array  &$sql_data       2-element array with sql data
- *
- * @return void
- * @access  public
- *
- * @link https://wiki.phpmyadmin.net/pma/Import
- */
-function PMA_buildSQL($db_name, &$tables, &$analyses = null,
-    &$additional_sql = null, $options = null, &$sql_data
-) {
-    /* Take care of the options */
-    if (isset($options['db_collation'])&& ! is_null($options['db_collation'])) {
-        $collation = $options['db_collation'];
-    } else {
-        $collation = "utf8_general_ci";
-    }
-
-    if (isset($options['db_charset']) && ! is_null($options['db_charset'])) {
-        $charset = $options['db_charset'];
-    } else {
-        $charset = "utf8";
-    }
-
-    if (isset($options['create_db'])) {
-        $create_db = $options['create_db'];
-    } else {
-        $create_db = true;
-    }
-
-    /* Create SQL code to handle the database */
-    $sql = array();
-
-    if ($create_db) {
-        $sql[] = "CREATE DATABASE IF NOT EXISTS " . Util::backquote($db_name)
-            . " DEFAULT CHARACTER SET " . $charset . " COLLATE " . $collation
-            . ";";
-    }
-
-    /**
-     * The calling plug-in should include this statement,
-     * if necessary, in the $additional_sql parameter
-     *
-     * $sql[] = "USE " . backquote($db_name);
-     */
-
-    /* Execute the SQL statements create above */
-    $sql_len = count($sql);
-    for ($i = 0; $i < $sql_len; ++$i) {
-        PMA_importRunQuery($sql[$i], $sql[$i], $sql_data);
-    }
-
-    /* No longer needed */
-    unset($sql);
-
-    /* Run the $additional_sql statements supplied by the caller plug-in */
-    if ($additional_sql != null) {
-        /* Clean the SQL first */
-        $additional_sql_len = count($additional_sql);
-
-        /**
-         * Only match tables for now, because CREATE IF NOT EXISTS
-         * syntax is lacking or nonexisting for views, triggers,
-         * functions, and procedures.
-         *
-         * See: https://bugs.mysql.com/bug.php?id=15287
-         *
-         * To the best of my knowledge this is still an issue.
-         *
-         * $pattern = 'CREATE (TABLE|VIEW|TRIGGER|FUNCTION|PROCEDURE)';
-         */
-        $pattern = '/CREATE [^`]*(TABLE)/';
-        $replacement = 'CREATE \\1 IF NOT EXISTS';
-
-        /* Change CREATE statements to CREATE IF NOT EXISTS to support
-         * inserting into existing structures
-         */
-        for ($i = 0; $i < $additional_sql_len; ++$i) {
-            $additional_sql[$i] = preg_replace(
-                $pattern,
-                $replacement,
-                $additional_sql[$i]
-            );
-            /* Execute the resulting statements */
-            PMA_importRunQuery($additional_sql[$i], $additional_sql[$i], $sql_data);
-        }
-    }
-
-    if ($analyses != null) {
-        $type_array = array(
-            NONE => "NULL",
-            VARCHAR => "varchar",
-            INT => "int",
-            DECIMAL => "decimal",
-            BIGINT => "bigint",
-            GEOMETRY => 'geometry'
-        );
-
-        /* TODO: Do more checking here to make sure they really are matched */
-        if (count($tables) != count($analyses)) {
-            exit();
-        }
-
-        /* Create SQL code to create the tables */
-        $num_tables = count($tables);
-        for ($i = 0; $i < $num_tables; ++$i) {
-            $num_cols = count($tables[$i][COL_NAMES]);
-            $tempSQLStr = "CREATE TABLE IF NOT EXISTS "
-            . PMA\libraries\Util::backquote($db_name)
-            . '.' . PMA\libraries\Util::backquote($tables[$i][TBL_NAME]) . " (";
-            for ($j = 0; $j < $num_cols; ++$j) {
-                $size = $analyses[$i][SIZES][$j];
-                if ((int)$size == 0) {
-                    $size = 10;
-                }
-
-                $tempSQLStr .= PMA\libraries\Util::backquote(
-                    $tables[$i][COL_NAMES][$j]
-                ) . " "
-                . $type_array[$analyses[$i][TYPES][$j]];
-                if ($analyses[$i][TYPES][$j] != GEOMETRY) {
-                    $tempSQLStr .= "(" . $size . ")";
-                }
-
-                if ($j != (count($tables[$i][COL_NAMES]) - 1)) {
-                    $tempSQLStr .= ", ";
-                }
-            }
-            $tempSQLStr .= ") DEFAULT CHARACTER SET " . $charset
-                . " COLLATE " . $collation . ";";
-
-            /**
-             * Each SQL statement is executed immediately
-             * after it is formed so that we don't have
-             * to store them in a (possibly large) buffer
-             */
-            PMA_importRunQuery($tempSQLStr, $tempSQLStr, $sql_data);
-        }
-    }
-
-    /**
-     * Create the SQL statements to insert all the data
-     *
-     * Only one insert query is formed for each table
-     */
-    $tempSQLStr = "";
-    $col_count = 0;
-    $num_tables = count($tables);
-    for ($i = 0; $i < $num_tables; ++$i) {
-        $num_cols = count($tables[$i][COL_NAMES]);
-        $num_rows = count($tables[$i][ROWS]);
-
-        $tempSQLStr = "INSERT INTO " . PMA\libraries\Util::backquote($db_name) . '.'
-            . PMA\libraries\Util::backquote($tables[$i][TBL_NAME]) . " (";
-
-        for ($m = 0; $m < $num_cols; ++$m) {
-            $tempSQLStr .= PMA\libraries\Util::backquote($tables[$i][COL_NAMES][$m]);
-
-            if ($m != ($num_cols - 1)) {
-                $tempSQLStr .= ", ";
-            }
-        }
-
-        $tempSQLStr .= ") VALUES ";
-
-        for ($j = 0; $j < $num_rows; ++$j) {
-            $tempSQLStr .= "(";
-
-            for ($k = 0; $k < $num_cols; ++$k) {
-                // If fully formatted SQL, no need to enclose
-                // with apostrophes, add slashes etc.
-                if ($analyses != null
-                    && isset($analyses[$i][FORMATTEDSQL][$col_count])
-                    && $analyses[$i][FORMATTEDSQL][$col_count] == true
-                ) {
-                    $tempSQLStr .= (string) $tables[$i][ROWS][$j][$k];
-                } else {
-                    if ($analyses != null) {
-                        $is_varchar = ($analyses[$i][TYPES][$col_count] === VARCHAR);
-                    } else {
-                        $is_varchar = ! is_numeric($tables[$i][ROWS][$j][$k]);
-                    }
-
-                    /* Don't put quotes around NULL fields */
-                    if (! strcmp($tables[$i][ROWS][$j][$k], 'NULL')) {
-                        $is_varchar = false;
-                    }
-
-                    $tempSQLStr .= (($is_varchar) ? "'" : "");
-                    $tempSQLStr .= $GLOBALS['dbi']->escapeString(
-                        (string) $tables[$i][ROWS][$j][$k]
-                    );
-                    $tempSQLStr .= (($is_varchar) ? "'" : "");
-                }
-
-                if ($k != ($num_cols - 1)) {
-                    $tempSQLStr .= ", ";
-                }
-
-                if ($col_count == ($num_cols - 1)) {
-                    $col_count = 0;
-                } else {
-                    $col_count++;
-                }
-
-                /* Delete the cell after we are done with it */
-                unset($tables[$i][ROWS][$j][$k]);
-            }
-
-            $tempSQLStr .= ")";
-
-            if ($j != ($num_rows - 1)) {
-                $tempSQLStr .= ",\n ";
-            }
-
-            $col_count = 0;
-            /* Delete the row after we are done with it */
-            unset($tables[$i][ROWS][$j]);
-        }
-
-        $tempSQLStr .= ";";
-
-        /**
-         * Each SQL statement is executed immediately
-         * after it is formed so that we don't have
-         * to store them in a (possibly large) buffer
-         */
-        PMA_importRunQuery($tempSQLStr, $tempSQLStr, $sql_data);
-    }
-
-    /* No longer needed */
-    unset($tempSQLStr);
-
-    /**
-     * A work in progress
-     */
-
-    /* Add the viewable structures from $additional_sql
-     * to $tables so they are also displayed
-     */
-    $view_pattern = '@VIEW `[^`]+`\.`([^`]+)@';
-    $table_pattern = '@CREATE TABLE IF NOT EXISTS `([^`]+)`@';
-    /* Check a third pattern to make sure its not a "USE `db_name`;" statement */
-
-    $regs = array();
-
-    $inTables = false;
-
-    $additional_sql_len = count($additional_sql);
-    for ($i = 0; $i < $additional_sql_len; ++$i) {
-        preg_match($view_pattern, $additional_sql[$i], $regs);
-
-        if (count($regs) == 0) {
-            preg_match($table_pattern, $additional_sql[$i], $regs);
-        }
-
-        if (count($regs)) {
-            for ($n = 0; $n < $num_tables; ++$n) {
-                if (! strcmp($regs[1], $tables[$n][TBL_NAME])) {
-                    $inTables = true;
-                    break;
-                }
-            }
-
-            if (! $inTables) {
-                $tables[] = array(TBL_NAME => $regs[1]);
-            }
-        }
-
-        /* Reset the array */
-        $regs = array();
-        $inTables = false;
-    }
-
-    $params = array('db' => (string)$db_name);
-    $db_url = 'db_structure.php' . PMA_URL_getCommon($params);
-    $db_ops_url = 'db_operations.php' . PMA_URL_getCommon($params);
-
-    $message = '<br /><br />';
-    $message .= '<strong>' . __(
-        'The following structures have either been created or altered. Here you can:'
-    ) . '</strong><br />';
-    $message .= '<ul><li>' . __(
-        "View a structure's contents by clicking on its name."
-    ) . '</li>';
-    $message .= '<li>' . __(
-        'Change any of its settings by clicking the corresponding "Options" link.'
-    ) . '</li>';
-    $message .= '<li>' . __('Edit structure by following the "Structure" link.')
-        . '</li>';
-    $message .= sprintf(
-        '<br /><li><a href="%s" title="%s">%s</a> (<a href="%s" title="%s">'
-        . __('Options') . '</a>)</li>',
-        $db_url,
-        sprintf(
-            __('Go to database: %s'),
-            htmlspecialchars(PMA\libraries\Util::backquote($db_name))
-        ),
-        htmlspecialchars($db_name),
-        $db_ops_url,
-        sprintf(
-            __('Edit settings for %s'),
-            htmlspecialchars(PMA\libraries\Util::backquote($db_name))
-        )
-    );
-
-    $message .= '<ul>';
-
-    unset($params);
-
-    $num_tables = count($tables);
-    for ($i = 0; $i < $num_tables; ++$i) {
-        $params = array(
-             'db' => (string) $db_name,
-             'table' => (string) $tables[$i][TBL_NAME]
-        );
-        $tbl_url = 'sql.php' . PMA_URL_getCommon($params);
-        $tbl_struct_url = 'tbl_structure.php' . PMA_URL_getCommon($params);
-        $tbl_ops_url = 'tbl_operations.php' . PMA_URL_getCommon($params);
-
-        unset($params);
-
-        $_table = new Table($tables[$i][TBL_NAME], $db_name);
-        if (! $_table->isView()) {
-            $message .= sprintf(
-                '<li><a href="%s" title="%s">%s</a> (<a href="%s" title="%s">' . __(
-                    'Structure'
-                ) . '</a>) (<a href="%s" title="%s">' . __('Options') . '</a>)</li>',
-                $tbl_url,
-                sprintf(
-                    __('Go to table: %s'),
-                    htmlspecialchars(
-                        PMA\libraries\Util::backquote($tables[$i][TBL_NAME])
-                    )
-                ),
-                htmlspecialchars($tables[$i][TBL_NAME]),
-                $tbl_struct_url,
-                sprintf(
-                    __('Structure of %s'),
-                    htmlspecialchars(
-                        PMA\libraries\Util::backquote($tables[$i][TBL_NAME])
-                    )
-                ),
-                $tbl_ops_url,
-                sprintf(
-                    __('Edit settings for %s'),
-                    htmlspecialchars(
-                        PMA\libraries\Util::backquote($tables[$i][TBL_NAME])
-                    )
-                )
-            );
-        } else {
-            $message .= sprintf(
-                '<li><a href="%s" title="%s">%s</a></li>',
-                $tbl_url,
-                sprintf(
-                    __('Go to view: %s'),
-                    htmlspecialchars(
-                        PMA\libraries\Util::backquote($tables[$i][TBL_NAME])
-                    )
-                ),
-                htmlspecialchars($tables[$i][TBL_NAME])
-            );
-        }
-    }
-
-    $message .= '</ul></ul>';
-
-    global $import_notice;
-    $import_notice = $message;
-
-    unset($tables);
-}
-
-
-/**
- * Stops the import on (mostly upload/file related) error
- *
- * @param PMA\libraries\Message $error_message The error message
- *
- * @return void
- * @access  public
- *
- */
-function PMA_stopImport( Message $error_message )
-{
-    global $import_handle, $file_to_unlink;
-
-    // Close open handles
-    if ($import_handle !== false && $import_handle !== null) {
-        fclose($import_handle);
-    }
-
-    // Delete temporary file
-    if ($file_to_unlink != '') {
-        unlink($file_to_unlink);
-    }
-    $msg = $error_message->getDisplay();
-    $_SESSION['Import_message']['message'] = $msg;
-
-    $response = PMA\libraries\Response::getInstance();
-    $response->setRequestStatus(false);
-    $response->addJSON('message', PMA\libraries\Message::error($msg));
-
-    exit;
-}
-
-/**
- * Handles request for Simulation of UPDATE/DELETE queries.
- *
- * @return void
- */
-function PMA_handleSimulateDMLRequest()
-{
-    $response = PMA\libraries\Response::getInstance();
-    $error = false;
-    $error_msg = __('Only single-table UPDATE and DELETE queries can be simulated.');
-    $sql_delimiter = $_REQUEST['sql_delimiter'];
-    $sql_data = array();
-    $queries = explode($sql_delimiter, $GLOBALS['sql_query']);
-    foreach ($queries as $sql_query) {
-        if (empty($sql_query)) {
-            continue;
-        }
-
-        // Parsing the query.
-        $parser = new SqlParser\Parser($sql_query);
-
-        if (empty($parser->statements[0])) {
-            continue;
-        }
-
-        $statement = $parser->statements[0];
-
-        $analyzed_sql_results = array(
-            'query' => $sql_query,
-            'parser' => $parser,
-            'statement' => $statement,
-        );
-
-        if ((!(($statement instanceof SqlParser\Statements\UpdateStatement)
-            || ($statement instanceof SqlParser\Statements\DeleteStatement)))
-            || (!empty($statement->join))
-        ) {
-            $error = $error_msg;
-            break;
-        }
-
-        $tables = SqlParser\Utils\Query::getTables($statement);
-        if (count($tables) > 1) {
-            $error = $error_msg;
-            break;
-        }
-
-        // Get the matched rows for the query.
-        $result = PMA_getMatchedRows($analyzed_sql_results);
-        if (! $error = $GLOBALS['dbi']->getError()) {
-            $sql_data[] = $result;
-        } else {
-            break;
-        }
-    }
-
-    if ($error) {
-        $message = Message::rawError($error);
-        $response->addJSON('message', $message);
-        $response->addJSON('sql_data', false);
-    } else {
-        $response->addJSON('sql_data', $sql_data);
-    }
-}
-
-/**
- * Find the matching rows for UPDATE/DELETE query.
- *
- * @param array $analyzed_sql_results Analyzed SQL results from parser.
- *
- * @return mixed
- */
-function PMA_getMatchedRows($analyzed_sql_results = array())
-{
-    $statement = $analyzed_sql_results['statement'];
-
-    $matched_row_query = '';
-    if ($statement instanceof SqlParser\Statements\DeleteStatement) {
-        $matched_row_query = PMA_getSimulatedDeleteQuery($analyzed_sql_results);
-    } elseif ($statement instanceof SqlParser\Statements\UpdateStatement) {
-        $matched_row_query = PMA_getSimulatedUpdateQuery($analyzed_sql_results);
-    }
-
-    // Execute the query and get the number of matched rows.
-    $matched_rows = PMA_executeMatchedRowQuery($matched_row_query);
-
-    // URL to matched rows.
-    $_url_params = array(
-        'db'        => $GLOBALS['db'],
-        'sql_query' => $matched_row_query
-    );
-    $matched_rows_url  = 'sql.php' . PMA_URL_getCommon($_url_params);
-
-    return array(
-        'sql_query' => PMA\libraries\Util::formatSql($analyzed_sql_results['query']),
-        'matched_rows' => $matched_rows,
-        'matched_rows_url' => $matched_rows_url
-    );
-}
-
-/**
- * Transforms a UPDATE query into SELECT statement.
- *
- * @param array $analyzed_sql_results Analyzed SQL results from parser.
- *
- * @return string SQL query
- */
-function PMA_getSimulatedUpdateQuery($analyzed_sql_results)
-{
-    $table_references = SqlParser\Utils\Query::getTables(
-        $analyzed_sql_results['statement']
-    );
-
-    $where = SqlParser\Utils\Query::getClause(
-        $analyzed_sql_results['statement'],
-        $analyzed_sql_results['parser']->list,
-        'WHERE'
-    );
-
-    if (empty($where)) {
-        $where = '1';
-    }
-
-    $columns = array();
-    $diff = array();
-    foreach ($analyzed_sql_results['statement']->set as $set) {
-        $columns[] = $set->column;
-        $diff[] = $set->column . ' <> ' . $set->value;
-    }
-    if (!empty($diff)) {
-        $where .= ' AND (' . implode(' OR ', $diff) . ')';
-    }
-
-    $order_and_limit = '';
-
-    if (!empty($analyzed_sql_results['statement']->order)) {
-        $order_and_limit .= ' ORDER BY ' . SqlParser\Utils\Query::getClause(
-            $analyzed_sql_results['statement'],
-            $analyzed_sql_results['parser']->list,
-            'ORDER BY'
-        );
-    }
-
-    if (!empty($analyzed_sql_results['statement']->limit)) {
-        $order_and_limit .= ' LIMIT ' . SqlParser\Utils\Query::getClause(
-            $analyzed_sql_results['statement'],
-            $analyzed_sql_results['parser']->list,
-            'LIMIT'
-        );
-    }
-
-    return 'SELECT '  . implode(', ', $columns) .
-        ' FROM ' . implode(', ', $table_references) .
-        ' WHERE ' . $where . $order_and_limit;
-}
-
-/**
- * Transforms a DELETE query into SELECT statement.
- *
- * @param array $analyzed_sql_results Analyzed SQL results from parser.
- *
- * @return string SQL query
- */
-function PMA_getSimulatedDeleteQuery($analyzed_sql_results)
-{
-    $table_references = SqlParser\Utils\Query::getTables(
-        $analyzed_sql_results['statement']
-    );
-
-    $where = SqlParser\Utils\Query::getClause(
-        $analyzed_sql_results['statement'],
-        $analyzed_sql_results['parser']->list,
-        'WHERE'
-    );
-
-    if (empty($where)) {
-        $where = '1';
-    }
-
-    $order_and_limit = '';
-
-    if (!empty($analyzed_sql_results['statement']->order)) {
-        $order_and_limit .= ' ORDER BY ' . SqlParser\Utils\Query::getClause(
-            $analyzed_sql_results['statement'],
-            $analyzed_sql_results['parser']->list,
-            'ORDER BY'
-        );
-    }
-
-    if (!empty($analyzed_sql_results['statement']->limit)) {
-        $order_and_limit .= ' LIMIT ' . SqlParser\Utils\Query::getClause(
-            $analyzed_sql_results['statement'],
-            $analyzed_sql_results['parser']->list,
-            'LIMIT'
-        );
-    }
-
-    return 'SELECT * FROM ' . implode(', ', $table_references) .
-        ' WHERE ' . $where . $order_and_limit;
-}
-
-/**
- * Executes the matched_row_query and returns the resultant row count.
- *
- * @param string $matched_row_query SQL query
- *
- * @return integer Number of rows returned
- */
-function PMA_executeMatchedRowQuery($matched_row_query)
-{
-    $GLOBALS['dbi']->selectDb($GLOBALS['db']);
-    // Execute the query.
-    $result = $GLOBALS['dbi']->tryQuery($matched_row_query);
-    // Count the number of rows in the result set.
-    $result = $GLOBALS['dbi']->numRows($result);
-
-    return $result;
-}
-
-/**
- * Handles request for ROLLBACK.
- *
- * @param string $sql_query SQL query(s)
- *
- * @return void
- */
-function PMA_handleRollbackRequest($sql_query)
-{
-    $sql_delimiter = $_REQUEST['sql_delimiter'];
-    $queries = explode($sql_delimiter, $sql_query);
-    $error = false;
-    $error_msg = __(
-        'Only INSERT, UPDATE, DELETE and REPLACE '
-        . 'SQL queries containing transactional engine tables can be rolled back.'
-    );
-    foreach ($queries as $sql_query) {
-        if (empty($sql_query)) {
-            continue;
-        }
-
-        // Check each query for ROLLBACK support.
-        if (! PMA_checkIfRollbackPossible($sql_query)) {
-            $global_error = $GLOBALS['dbi']->getError();
-            if ($global_error) {
-                $error = $global_error;
-            } else {
-                $error = $error_msg;
-            }
-            break;
-        }
-    }
-
-    if ($error) {
-        unset($_REQUEST['rollback_query']);
-        $response = PMA\libraries\Response::getInstance();
-        $message = Message::rawError($error);
-        $response->addJSON('message', $message);
-        exit;
-    } else {
-        // If everything fine, START a transaction.
-        $GLOBALS['dbi']->query('START TRANSACTION');
-    }
-}
-
-/**
- * Checks if ROLLBACK is possible for a SQL query or not.
- *
- * @param string $sql_query SQL query
- *
- * @return bool
- */
-function PMA_checkIfRollbackPossible($sql_query)
-{
-    $parser = new SqlParser\Parser($sql_query);
-
-    if (empty($parser->statements[0])) {
-        return false;
-    }
-
-    $statement = $parser->statements[0];
-
-    // Check if query is supported.
-    if (!(($statement instanceof SqlParser\Statements\InsertStatement)
-        || ($statement instanceof SqlParser\Statements\UpdateStatement)
-        || ($statement instanceof SqlParser\Statements\DeleteStatement)
-        || ($statement instanceof SqlParser\Statements\ReplaceStatement))
-    ) {
-        return false;
-    }
-
-    // Get table_references from the query.
-    $tables = SqlParser\Utils\Query::getTables($statement);
-
-    // Check if each table is 'InnoDB'.
-    foreach ($tables as $table) {
-        if (! PMA_isTableTransactional($table)) {
-            return false;
-        }
-    }
-
-    return true;
-}
-
-/**
- * Checks if a table is 'InnoDB' or not.
- *
- * @param string $table Table details
- *
- * @return bool
- */
-function PMA_isTableTransactional($table)
-{
-    $table = explode('.', $table);
-    if (count($table) == 2) {
-        $db = PMA\libraries\Util::unQuote($table[0]);
-        $table = PMA\libraries\Util::unQuote($table[1]);
-    } else {
-        $db = $GLOBALS['db'];
-        $table = PMA\libraries\Util::unQuote($table[0]);
-    }
-
-    // Query to check if table exists.
-    $check_table_query = 'SELECT * FROM ' . PMA\libraries\Util::backquote($db)
-        . '.' . PMA\libraries\Util::backquote($table) . ' '
-        . 'LIMIT 1';
-
-    $result = $GLOBALS['dbi']->tryQuery($check_table_query);
-
-    if (! $result) {
-        return false;
-    }
-
-    // List of Transactional Engines.
-    $transactional_engines = array(
-        'INNODB',
-        'FALCON',
-        'NDB',
-        'INFINIDB',
-        'TOKUDB',
-        'XTRADB',
-        'SEQUENCE',
-        'BDB'
-    );
-
-    // Query to check if table is 'Transactional'.
-    $check_query = 'SELECT `ENGINE` FROM `information_schema`.`tables` '
-        . 'WHERE `table_name` = "' . $table . '" '
-        . 'AND `table_schema` = "' . $db . '" '
-        . 'AND UPPER(`engine`) IN ("'
-        . implode('", "', $transactional_engines)
-        . '")';
-
-    $result = $GLOBALS['dbi']->tryQuery($check_query);
-
-    if ($GLOBALS['dbi']->numRows($result) == 1) {
-        return true;
-    } else {
-        return false;
-    }
-}
diff --git a/#pma/libraries/index.lib.php b/#pma/libraries/index.lib.php
deleted file mode 100644
index 804faea2..00000000
--- a/#pma/libraries/index.lib.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * set of functions for structure section in pma
- *
- * @package PhpMyAdmin
- */
-
-/**
- * Get HTML for display indexes
- *
- * @return string $html_output
- */
-function PMA_getHtmlForDisplayIndexes()
-{
-    $html_output = '<div id="index_div" class="ajax';
-    if ($GLOBALS['cfg']['InitialSlidersState'] != 'disabled') {
-        $html_output .= ' print_ignore';
-    }
-    $html_output .= '" >';
-
-    $html_output .= PMA\libraries\Util::getDivForSliderEffect(
-        'indexes', __('Indexes')
-    );
-    $html_output .= PMA\libraries\Index::getHtmlForIndexes(
-        $GLOBALS['table'],
-        $GLOBALS['db']
-    );
-    $html_output .= '<fieldset class="tblFooters print_ignore" style="text-align: '
-        . 'left;"><form action="tbl_indexes.php" method="post">';
-    $html_output .= PMA_URL_getHiddenInputs(
-        $GLOBALS['db'], $GLOBALS['table']
-    );
-    $html_output .= sprintf(
-        __('Create an index on &nbsp;%s&nbsp;columns'),
-        '<input type="number" name="added_fields" value="1" '
-        . 'min="1" required="required" />'
-    );
-    $html_output .= '<input type="hidden" name="create_index" value="1" />'
-        . '<input class="add_index ajax"'
-        . ' type="submit" value="' . __('Go') . '" />';
-
-    $html_output .= '</form>'
-        . '</fieldset>'
-        . '</div>'
-        . '</div>';
-
-    return $html_output;
-}
diff --git a/#pma/libraries/information_schema_relations.lib.php b/#pma/libraries/information_schema_relations.lib.php
deleted file mode 100644
index 3c1b618d..00000000
--- a/#pma/libraries/information_schema_relations.lib.php
+++ /dev/null
@@ -1,326 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Internal relations for information schema.
- *
- * @package PhpMyAdmin
- */
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
-/**
- *
- */
-$GLOBALS['information_schema_relations'] = array(
-    'CHARACTER_SETS' => array(
-        'DEFAULT_COLLATE_NAME' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'COLLATIONS',
-            'foreign_field' => 'COLLATION_NAME'
-        )
-    ),
-    'COLLATIONS' => array(
-        'CHARACTER_SET_NAME' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'CHARACTER_SETS',
-            'foreign_field' => 'CHARACTER_SET_NAME'
-        )
-    ),
-    'COLLATION_CHARACTER_SET_APPLICABILITY' => array(
-        'CHARACTER_SET_NAME' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'CHARACTER_SETS',
-            'foreign_field' => 'CHARACTER_SET_NAME'
-        ),
-        'COLLATION_NAME' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'COLLATIONS',
-            'foreign_field' => 'COLLATION_NAME'
-        )
-    ),
-    'COLUMNS' => array(
-        'TABLE_SCHEMA' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'SCHEMATA',
-            'foreign_field' => 'SCHEMA_NAME'
-        ),
-        'CHARACTER_SET_NAME' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'CHARACTER_SETS',
-            'foreign_field' => 'CHARACTER_SET_NAME'
-        ),
-        'COLLATION_NAME' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'COLLATIONS',
-            'foreign_field' => 'COLLATION_NAME'
-        )
-    ),
-    'COLUMN_PRIVILEGES' => array(
-        'TABLE_SCHEMA' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'SCHEMATA',
-            'foreign_field' => 'SCHEMA_NAME'
-        )
-    ),
-    'EVENTS' => array(
-        'EVENT_SCHEMA' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'SCHEMATA',
-            'foreign_field' => 'SCHEMA_NAME'
-        ),
-        'CHARACTER_SET_CLIENT' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'CHARACTER_SETS',
-            'foreign_field' => 'CHARACTER_SET_NAME'
-        ),
-        'COLLATION_CONNECTION' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'COLLATIONS',
-            'foreign_field' => 'COLLATION_NAME'
-        ),
-        'DATABASE_COLLATION' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'COLLATIONS',
-            'foreign_field' => 'COLLATION_NAME'
-        )
-    ),
-    'FILES' => array(
-        'TABLESPACE_NAME' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'TABLESPACES',
-            'foreign_field' => 'TABLESPACE_NAME'
-        ),
-        'TABLE_SCHEMA' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'SCHEMATA',
-            'foreign_field' => 'SCHEMA_NAME'
-        ),
-        'COLLATION_CONNECTION' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'COLLATIONS',
-            'foreign_field' => 'COLLATION_NAME'
-        ),
-        'ENGINE' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'ENGINES',
-            'foreign_field' => 'ENGINE'
-        )
-    ),
-    'KEY_COLUMN_USAGE' => array(
-        'CONSTRAINT_SCHEMA' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'SCHEMATA',
-            'foreign_field' => 'SCHEMA_NAME'
-        ),
-        'TABLE_SCHEMA' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'SCHEMATA',
-            'foreign_field' => 'SCHEMA_NAME'
-        ),
-        'REFERENCED_TABLE_SCHEMA' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'SCHEMATA',
-            'foreign_field' => 'SCHEMA_NAME'
-        )
-    ),
-    'PARAMETERS' => array(
-        'SPECIFIC_SCHEMA' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'SCHEMATA',
-            'foreign_field' => 'SCHEMA_NAME'
-        ),
-        'CHARACTER_SET_NAME' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'CHARACTER_SETS',
-            'foreign_field' => 'CHARACTER_SET_NAME'
-        ),
-        'COLLATION_NAME' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'COLLATIONS',
-            'foreign_field' => 'COLLATION_NAME'
-        )
-    ),
-    'PARTITIONS' => array(
-        'TABLE_SCHEMA' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'SCHEMATA',
-            'foreign_field' => 'SCHEMA_NAME'
-        ),
-        'TABLESPACE_NAME' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'TABLESPACES',
-            'foreign_field' => 'TABLESPACE_NAME'
-        )
-    ),
-    'PROCESSLIST' => array(
-        'DB' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'SCHEMATA',
-            'foreign_field' => 'SCHEMA_NAME'
-        )
-    ),
-    'REFERENTIAL_CONSTRAINTS' => array(
-        'CONSTRAINT_SCHEMA' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'SCHEMATA',
-            'foreign_field' => 'SCHEMA_NAME'
-        ),
-        'UNIQUE_CONSTRAINT_SCHEMA' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'SCHEMATA',
-            'foreign_field' => 'SCHEMA_NAME'
-        )
-    ),
-    'ROUTINES' => array(
-        'ROUTINE_SCHEMA' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'SCHEMATA',
-            'foreign_field' => 'SCHEMA_NAME'
-        ),
-        'CHARACTER_SET_NAME' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'CHARACTER_SETS',
-            'foreign_field' => 'CHARACTER_SET_NAME'
-        ),
-        'COLLATION_NAME' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'COLLATIONS',
-            'foreign_field' => 'COLLATION_NAME'
-        ),
-        'CHARACTER_SET_CLIENT' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'CHARACTER_SETS',
-            'foreign_field' => 'CHARACTER_SET_NAME'
-        ),
-        'COLLATION_CONNECTION' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'COLLATIONS',
-            'foreign_field' => 'COLLATION_NAME'
-        ),
-        'DATABASE_COLLATION' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'COLLATIONS',
-            'foreign_field' => 'COLLATION_NAME'
-        )
-    ),
-    'SCHEMATA' => array(
-        'DEFAULT_CHARACTER_SET_NAME' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'CHARACTER_SETS',
-            'foreign_field' => 'CHARACTER_SET_NAME'
-        ),
-        'DEFAULT_COLLATION_NAME' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'COLLATIONS',
-            'foreign_field' => 'COLLATION_NAME'
-        )
-    ),
-    'SCHEMA_PRIVILEGES' => array(
-        'TABLE_SCHEMA' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'SCHEMATA',
-            'foreign_field' => 'SCHEMA_NAME'
-        )
-    ),
-    'STATISTICS' => array(
-        'TABLE_SCHEMA' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'SCHEMATA',
-            'foreign_field' => 'SCHEMA_NAME'
-        ),
-        'INDEX_SCHEMA' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'SCHEMATA',
-            'foreign_field' => 'SCHEMA_NAME'
-        )
-    ),
-    'TABLES' => array(
-        'TABLE_SCHEMA' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'SCHEMATA',
-            'foreign_field' => 'SCHEMA_NAME'
-        ),
-        'TABLE_COLLATION' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'COLLATIONS',
-            'foreign_field' => 'COLLATION_NAME'
-        ),
-        'ENGINE' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'ENGINES',
-            'foreign_field' => 'ENGINE'
-        ),
-    ),
-    'TABLESAPCES' => array(
-        'ENGINE' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'ENGINES',
-            'foreign_field' => 'ENGINE'
-        )
-    ),
-    'TABLE_CONSTRAINTS' => array(
-        'CONSTRAINT_SCHEMA' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'SCHEMATA',
-            'foreign_field' => 'SCHEMA_NAME'
-        ),
-        'TABLE_SCHEMA' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'SCHEMATA',
-            'foreign_field' => 'SCHEMA_NAME'
-        )
-    ),
-    'TABLE_PRIVILEGES' => array(
-        'TABLE_SCHEMA' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'SCHEMATA',
-            'foreign_field' => 'SCHEMA_NAME'
-        )
-    ),
-    'TRIGGERS' => array(
-        'TRIGGER_SCHEMA' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'SCHEMATA',
-            'foreign_field' => 'SCHEMA_NAME'
-        ),
-        'EVENT_OBJECT_SCHEMA' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'SCHEMATA',
-            'foreign_field' => 'SCHEMA_NAME'
-        ),
-        'CHARACTER_SET_CLIENT' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'CHARACTER_SETS',
-            'foreign_field' => 'CHARACTER_SET_NAME'
-        ),
-        'COLLATION_CONNECTION' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'COLLATIONS',
-            'foreign_field' => 'COLLATION_NAME'
-        ),
-        'DATABASE_COLLATION' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'COLLATIONS',
-            'foreign_field' => 'COLLATION_NAME'
-        )
-    ),
-    'VIEWS' => array(
-        'TABLE_SCHEMA' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'SCHEMATA',
-            'foreign_field' => 'SCHEMA_NAME'
-        ),
-        'CHARACTER_SET_CLIENT' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'CHARACTER_SETS',
-            'foreign_field' => 'CHARACTER_SET_NAME'
-        ),
-        'COLLATION_CONNECTION' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'COLLATIONS',
-            'foreign_field' => 'COLLATION_NAME'
-        )
-    )
-);
-
diff --git a/#pma/libraries/insert_edit.lib.php b/#pma/libraries/insert_edit.lib.php
deleted file mode 100644
index 9e71fcbd..00000000
--- a/#pma/libraries/insert_edit.lib.php
+++ /dev/null
@@ -1,3039 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * set of functions with the insert/edit features in pma
- *
- * @package PhpMyAdmin
- */
-use PMA\libraries\Message;
-use PMA\libraries\plugins\TransformationsPlugin;
-
-/**
- * Retrieve form parameters for insert/edit form
- *
- * @param string     $db                 name of the database
- * @param string     $table              name of the table
- * @param array|null $where_clauses      where clauses
- * @param array      $where_clause_array array of where clauses
- * @param string     $err_url            error url
- *
- * @return array $form_params array of insert/edit form parameters
- */
-function PMA_getFormParametersForInsertForm($db, $table, $where_clauses,
-    $where_clause_array, $err_url
-) {
-    $_form_params = array(
-        'db'        => $db,
-        'table'     => $table,
-        'goto'      => $GLOBALS['goto'],
-        'err_url'   => $err_url,
-        'sql_query' => $_REQUEST['sql_query'],
-    );
-    if (isset($where_clauses)) {
-        foreach ($where_clause_array as $key_id => $where_clause) {
-            $_form_params['where_clause[' . $key_id . ']'] = trim($where_clause);
-        }
-    }
-    if (isset($_REQUEST['clause_is_unique'])) {
-        $_form_params['clause_is_unique'] = $_REQUEST['clause_is_unique'];
-    }
-    return $_form_params;
-}
-
-/**
- * Creates array of where clauses
- *
- * @param array|string|null $where_clause where clause
- *
- * @return array whereClauseArray array of where clauses
- */
-function PMA_getWhereClauseArray($where_clause)
-{
-    if (!isset($where_clause)) {
-        return array();
-    }
-
-    if (is_array($where_clause)) {
-        return $where_clause;
-    }
-
-    return array(0 => $where_clause);
-}
-
-/**
- * Analysing where clauses array
- *
- * @param array  $where_clause_array array of where clauses
- * @param string $table              name of the table
- * @param string $db                 name of the database
- *
- * @return array $where_clauses, $result, $rows
- */
-function PMA_analyzeWhereClauses(
-    $where_clause_array, $table, $db
-) {
-    $rows               = array();
-    $result             = array();
-    $where_clauses      = array();
-    $found_unique_key   = false;
-    foreach ($where_clause_array as $key_id => $where_clause) {
-
-        $local_query     = 'SELECT * FROM '
-            . PMA\libraries\Util::backquote($db) . '.'
-            . PMA\libraries\Util::backquote($table)
-            . ' WHERE ' . $where_clause . ';';
-        $result[$key_id] = $GLOBALS['dbi']->query(
-            $local_query, null, PMA\libraries\DatabaseInterface::QUERY_STORE
-        );
-        $rows[$key_id]   = $GLOBALS['dbi']->fetchAssoc($result[$key_id]);
-
-        $where_clauses[$key_id] = str_replace('\\', '\\\\', $where_clause);
-        $has_unique_condition   = PMA_showEmptyResultMessageOrSetUniqueCondition(
-            $rows, $key_id, $where_clause_array, $local_query, $result
-        );
-        if ($has_unique_condition) {
-            $found_unique_key = true;
-        }
-    }
-    return array($where_clauses, $result, $rows, $found_unique_key);
-}
-
-/**
- * Show message for empty result or set the unique_condition
- *
- * @param array  $rows               MySQL returned rows
- * @param string $key_id             ID in current key
- * @param array  $where_clause_array array of where clauses
- * @param string $local_query        query performed
- * @param array  $result             MySQL result handle
- *
- * @return boolean $has_unique_condition
- */
-function PMA_showEmptyResultMessageOrSetUniqueCondition($rows, $key_id,
-    $where_clause_array, $local_query, $result
-) {
-    $has_unique_condition = false;
-
-    // No row returned
-    if (! $rows[$key_id]) {
-        unset($rows[$key_id], $where_clause_array[$key_id]);
-        PMA\libraries\Response::getInstance()->addHtml(
-            PMA\libraries\Util::getMessage(
-                __('MySQL returned an empty result set (i.e. zero rows).'),
-                $local_query
-            )
-        );
-        /**
-         * @todo not sure what should be done at this point, but we must not
-         * exit if we want the message to be displayed
-         */
-    } else {// end if (no row returned)
-        $meta = $GLOBALS['dbi']->getFieldsMeta($result[$key_id]);
-
-        list($unique_condition, $tmp_clause_is_unique)
-            = PMA\libraries\Util::getUniqueCondition(
-                $result[$key_id], // handle
-                count($meta), // fields_cnt
-                $meta, // fields_meta
-                $rows[$key_id], // row
-                true, // force_unique
-                false, // restrict_to_table
-                null // analyzed_sql_results
-            );
-
-        if (! empty($unique_condition)) {
-            $has_unique_condition = true;
-        }
-        unset($unique_condition, $tmp_clause_is_unique);
-    }
-    return $has_unique_condition;
-}
-
-/**
- * No primary key given, just load first row
- *
- * @param string $table name of the table
- * @param string $db    name of the database
- *
- * @return array                containing $result and $rows arrays
- */
-function PMA_loadFirstRow($table, $db)
-{
-    $result = $GLOBALS['dbi']->query(
-        'SELECT * FROM ' . PMA\libraries\Util::backquote($db)
-        . '.' . PMA\libraries\Util::backquote($table) . ' LIMIT 1;',
-        null,
-        PMA\libraries\DatabaseInterface::QUERY_STORE
-    );
-    $rows = array_fill(0, $GLOBALS['cfg']['InsertRows'], false);
-    return array($result, $rows);
-}
-
-/**
- * Add some url parameters
- *
- * @param array  $url_params         containing $db and $table as url parameters
- * @param array  $where_clause_array where clauses array
- * @param string $where_clause       where clause
- *
- * @return array Add some url parameters to $url_params array and return it
- */
-function PMA_urlParamsInEditMode($url_params, $where_clause_array, $where_clause)
-{
-    if (isset($where_clause)) {
-        foreach ($where_clause_array as $where_clause) {
-            $url_params['where_clause'] = trim($where_clause);
-        }
-    }
-    if (! empty($_REQUEST['sql_query'])) {
-        $url_params['sql_query'] = $_REQUEST['sql_query'];
-    }
-    return $url_params;
-}
-
-/**
- * Show type information or function selectors in Insert/Edit
- *
- * @param string  $which      function|type
- * @param array   $url_params containing url parameters
- * @param boolean $is_show    whether to show the element in $which
- *
- * @return string an HTML snippet
- */
-function PMA_showTypeOrFunction($which, $url_params, $is_show)
-{
-    $params = array();
-
-    switch($which) {
-    case 'function':
-        $params['ShowFunctionFields'] = ($is_show ? 0 : 1);
-        $params['ShowFieldTypesInDataEditView']
-            = $GLOBALS['cfg']['ShowFieldTypesInDataEditView'];
-        break;
-    case 'type':
-        $params['ShowFieldTypesInDataEditView'] = ($is_show ? 0 : 1);
-        $params['ShowFunctionFields']
-            = $GLOBALS['cfg']['ShowFunctionFields'];
-        break;
-    }
-
-    $params['goto'] = 'sql.php';
-    $this_url_params = array_merge($url_params, $params);
-
-    if (! $is_show) {
-        return ' : <a href="tbl_change.php'
-            . PMA_URL_getCommon($this_url_params) . '">'
-            . PMA_showTypeOrFunctionLabel($which)
-            . '</a>';
-    }
-    return '<th><a href="tbl_change.php'
-        . PMA_URL_getCommon($this_url_params)
-        . '" title="' . __('Hide') . '">'
-        . PMA_showTypeOrFunctionLabel($which)
-        . '</a></th>';
-}
-
-/**
- * Show type information or function selectors labels in Insert/Edit
- *
- * @param string $which function|type
- *
- * @return string an HTML snippet
- */
-function PMA_showTypeOrFunctionLabel($which)
-{
-    switch($which) {
-    case 'function':
-        return __('Function');
-    case 'type':
-        return __('Type');
-    }
-
-    return null;
-}
-
- /**
-  * Analyze the table column array
-  *
-  * @param array   $column         description of column in given table
-  * @param array   $comments_map   comments for every column that has a comment
-  * @param boolean $timestamp_seen whether a timestamp has been seen
-  *
-  * @return array                   description of column in given table
-  */
-function PMA_analyzeTableColumnsArray($column, $comments_map, $timestamp_seen)
-{
-    $column['Field_html']    = htmlspecialchars($column['Field']);
-    $column['Field_md5']     = md5($column['Field']);
-    // True_Type contains only the type (stops at first bracket)
-    $column['True_Type']     = preg_replace('@\(.*@s', '', $column['Type']);
-    $column['len'] = preg_match('@float|double@', $column['Type']) ? 100 : -1;
-    $column['Field_title']   = PMA_getColumnTitle($column, $comments_map);
-    $column['is_binary']     = PMA_isColumn(
-        $column,
-        array('binary', 'varbinary')
-    );
-    $column['is_blob']       = PMA_isColumn(
-        $column,
-        array('blob', 'tinyblob', 'mediumblob', 'longblob')
-    );
-    $column['is_char']       = PMA_isColumn(
-        $column,
-        array('char', 'varchar')
-    );
-
-    list($column['pma_type'], $column['wrap'], $column['first_timestamp'])
-        = PMA_getEnumSetAndTimestampColumns($column, $timestamp_seen);
-
-    return $column;
-}
-
- /**
-  * Retrieve the column title
-  *
-  * @param array $column       description of column in given table
-  * @param array $comments_map comments for every column that has a comment
-  *
-  * @return string              column title
-  */
-function PMA_getColumnTitle($column, $comments_map)
-{
-    if (isset($comments_map[$column['Field']])) {
-        return '<span style="border-bottom: 1px dashed black;" title="'
-            . htmlspecialchars($comments_map[$column['Field']]) . '">'
-            . $column['Field_html'] . '</span>';
-    } else {
-            return $column['Field_html'];
-    }
-}
-
- /**
-  * check whether the column is of a certain type
-  * the goal is to ensure that types such as "enum('one','two','binary',..)"
-  * or "enum('one','two','varbinary',..)" are not categorized as binary
-  *
-  * @param array $column description of column in given table
-  * @param array $types  the types to verify
-  *
-  * @return boolean whether the column's type if one of the $types
-  */
-function PMA_isColumn($column, $types)
-{
-    foreach ($types as $one_type) {
-        if (mb_stripos($column['Type'], $one_type) === 0) {
-            return true;
-        }
-    }
-    return false;
-}
-
-/**
- * Retrieve set, enum, timestamp table columns
- *
- * @param array   $column         description of column in given table
- * @param boolean $timestamp_seen whether a timestamp has been seen
- *
- * @return array $column['pma_type'], $column['wrap'], $column['first_timestamp']
- */
-function PMA_getEnumSetAndTimestampColumns($column, $timestamp_seen)
-{
-    $column['first_timestamp'] = false;
-    switch ($column['True_Type']) {
-    case 'set':
-        $column['pma_type'] = 'set';
-        $column['wrap']  = '';
-        break;
-    case 'enum':
-        $column['pma_type'] = 'enum';
-        $column['wrap']  = '';
-        break;
-    case 'timestamp':
-        if (! $timestamp_seen) {   // can only occur once per table
-            $column['first_timestamp'] = true;
-        }
-        $column['pma_type'] = $column['Type'];
-        $column['wrap']  = ' nowrap';
-        break;
-
-    default:
-        $column['pma_type'] = $column['Type'];
-        $column['wrap']  = ' nowrap';
-        break;
-    }
-    return array($column['pma_type'], $column['wrap'], $column['first_timestamp']);
-}
-
-/**
- * The function column
- * We don't want binary data to be destroyed
- * Note: from the MySQL manual: "BINARY doesn't affect how the column is
- *       stored or retrieved" so it does not mean that the contents is binary
- *
- * @param array   $column                description of column in given table
- * @param boolean $is_upload             upload or no
- * @param string  $column_name_appendix  the name attribute
- * @param string  $onChangeClause        onchange clause for fields
- * @param array   $no_support_types      list of datatypes that are not (yet)
- *                                       handled by PMA
- * @param integer $tabindex_for_function +3000
- * @param integer $tabindex              tab index
- * @param integer $idindex               id index
- * @param boolean $insert_mode           insert mode or edit mode
- * @param boolean $readOnly              is column read only or not
- * @param array   $foreignData           foreign key data
- *
- * @return string                           an html snippet
- */
-function PMA_getFunctionColumn($column, $is_upload, $column_name_appendix,
-    $onChangeClause, $no_support_types, $tabindex_for_function,
-    $tabindex, $idindex, $insert_mode, $readOnly, $foreignData
-) {
-    $html_output = '';
-    if (($GLOBALS['cfg']['ProtectBinary'] === 'blob'
-        && $column['is_blob'] && !$is_upload)
-        || ($GLOBALS['cfg']['ProtectBinary'] === 'all'
-        && $column['is_binary'])
-        || ($GLOBALS['cfg']['ProtectBinary'] === 'noblob'
-        && $column['is_binary'])
-    ) {
-        $html_output .= '<td class="center">' . __('Binary') . '</td>' . "\n";
-    } elseif ($readOnly
-        || mb_strstr($column['True_Type'], 'enum')
-        || mb_strstr($column['True_Type'], 'set')
-        || in_array($column['pma_type'], $no_support_types)
-    ) {
-        $html_output .= '<td class="center">--</td>' . "\n";
-    } else {
-        $html_output .= '<td>' . "\n";
-
-        $html_output .= '<select name="funcs' . $column_name_appendix . '"'
-            . ' ' . $onChangeClause
-            . ' tabindex="' . ($tabindex + $tabindex_for_function) . '"'
-            . ' id="field_' . $idindex . '_1">';
-        $html_output .= PMA\libraries\Util::getFunctionsForField(
-            $column,
-            $insert_mode,
-            $foreignData
-        ) . "\n";
-
-        $html_output .= '</select>' .  "\n";
-        $html_output .= '</td>' .  "\n";
-    }
-    return $html_output;
-}
-
-/**
- * The null column
- *
- * @param array   $column               description of column in given table
- * @param string  $column_name_appendix the name attribute
- * @param boolean $real_null_value      is column value null or not null
- * @param integer $tabindex             tab index
- * @param integer $tabindex_for_null    +6000
- * @param integer $idindex              id index
- * @param string  $vkey                 [multi_edit]['row_id']
- * @param array   $foreigners           keys into foreign fields
- * @param array   $foreignData          data about the foreign keys
- * @param boolean $readOnly             is column read only or not
- *
- * @return string                       an html snippet
- */
-function PMA_getNullColumn($column, $column_name_appendix, $real_null_value,
-    $tabindex, $tabindex_for_null, $idindex, $vkey, $foreigners, $foreignData,
-    $readOnly
-) {
-    if ($column['Null'] != 'YES' || $readOnly) {
-        return "<td></td>\n";
-    }
-    $html_output = '';
-    $html_output .= '<td>' . "\n";
-    $html_output .= '<input type="hidden" name="fields_null_prev'
-        . $column_name_appendix . '"';
-    if ($real_null_value && !$column['first_timestamp']) {
-        $html_output .= ' value="on"';
-    }
-    $html_output .= ' />' . "\n";
-
-    $html_output .= '<input type="checkbox" class="checkbox_null" tabindex="'
-        . ($tabindex + $tabindex_for_null) . '"'
-        . ' name="fields_null' . $column_name_appendix . '"';
-    if ($real_null_value) {
-        $html_output .= ' checked="checked"';
-    }
-    $html_output .= ' id="field_' . ($idindex) . '_2" />';
-
-    // nullify_code is needed by the js nullify() function
-    $nullify_code = PMA_getNullifyCodeForNullColumn(
-        $column, $foreigners, $foreignData
-    );
-    // to be able to generate calls to nullify() in jQuery
-    $html_output .= '<input type="hidden" class="nullify_code" name="nullify_code'
-        . $column_name_appendix . '" value="' . $nullify_code . '" />';
-    $html_output .= '<input type="hidden" class="hashed_field" name="hashed_field'
-        . $column_name_appendix . '" value="' .  $column['Field_md5'] . '" />';
-    $html_output .= '<input type="hidden" class="multi_edit" name="multi_edit'
-        . $column_name_appendix . '" value="' . PMA_escapeJsString($vkey) . '" />';
-    $html_output .= '</td>' . "\n";
-
-    return $html_output;
-}
-
-/**
- * Retrieve the nullify code for the null column
- *
- * @param array $column      description of column in given table
- * @param array $foreigners  keys into foreign fields
- * @param array $foreignData data about the foreign keys
- *
- * @return integer              $nullify_code
- */
-function PMA_getNullifyCodeForNullColumn($column, $foreigners, $foreignData)
-{
-    $foreigner = PMA_searchColumnInForeigners($foreigners, $column['Field']);
-    if (mb_strstr($column['True_Type'], 'enum')) {
-        if (mb_strlen($column['Type']) > 20) {
-            $nullify_code = '1';
-        } else {
-            $nullify_code = '2';
-        }
-    } elseif (mb_strstr($column['True_Type'], 'set')) {
-        $nullify_code = '3';
-    } elseif (!empty($foreigners)
-        && !empty($foreigner)
-        && $foreignData['foreign_link'] == false
-    ) {
-        // foreign key in a drop-down
-        $nullify_code = '4';
-    } elseif (!empty($foreigners)
-        && !empty($foreigner)
-        && $foreignData['foreign_link'] == true
-    ) {
-        // foreign key with a browsing icon
-        $nullify_code = '6';
-    } else {
-        $nullify_code = '5';
-    }
-    return $nullify_code;
-}
-
-/**
- * Get the HTML elements for value column in insert form
- * (here, "column" is used in the sense of HTML column in HTML table)
- *
- * @param array   $column                description of column in given table
- * @param string  $backup_field          hidden input field
- * @param string  $column_name_appendix  the name attribute
- * @param string  $onChangeClause        onchange clause for fields
- * @param integer $tabindex              tab index
- * @param integer $tabindex_for_value    offset for the values tabindex
- * @param integer $idindex               id index
- * @param string  $data                  description of the column field
- * @param string  $special_chars         special characters
- * @param array   $foreignData           data about the foreign keys
- * @param boolean $odd_row               whether row is odd
- * @param array   $paramTableDbArray     array containing $table and $db
- * @param integer $rownumber             the row number
- * @param array   $titles                An HTML IMG tag for a particular icon from
- *                                       a theme, which may be an actual file or
- *                                       an icon from a sprite
- * @param string  $text_dir              text direction
- * @param string  $special_chars_encoded replaced char if the string starts
- *                                       with a \r\n pair (0x0d0a) add an extra \n
- * @param string  $vkey                  [multi_edit]['row_id']
- * @param boolean $is_upload             is upload or not
- * @param integer $biggest_max_file_size 0 integer
- * @param string  $default_char_editing  default char editing mode which is stored
- *                                       in the config.inc.php script
- * @param array   $no_support_types      list of datatypes that are not (yet)
- *                                       handled by PMA
- * @param array   $gis_data_types        list of GIS data types
- * @param array   $extracted_columnspec  associative array containing type,
- *                                       spec_in_brackets and possibly
- *                                       enum_set_values (another array)
- * @param boolean $readOnly              is column read only or not
- *
- * @return string an html snippet
- */
-function PMA_getValueColumn($column, $backup_field, $column_name_appendix,
-    $onChangeClause, $tabindex, $tabindex_for_value, $idindex, $data,
-    $special_chars, $foreignData, $odd_row, $paramTableDbArray, $rownumber,
-    $titles, $text_dir, $special_chars_encoded, $vkey,
-    $is_upload, $biggest_max_file_size,
-    $default_char_editing, $no_support_types, $gis_data_types, $extracted_columnspec,
-    $readOnly
-) {
-    // HTML5 data-* attribute data-type
-    $data_type = $GLOBALS['PMA_Types']->getTypeClass($column['True_Type']);
-    $html_output = '';
-
-    if ($foreignData['foreign_link'] == true) {
-        $html_output .= PMA_getForeignLink(
-            $column, $backup_field, $column_name_appendix,
-            $onChangeClause, $tabindex, $tabindex_for_value, $idindex, $data,
-            $paramTableDbArray, $rownumber, $titles, $readOnly
-        );
-
-    } elseif (is_array($foreignData['disp_row'])) {
-        $html_output .= PMA_dispRowForeignData(
-            $backup_field, $column_name_appendix,
-            $onChangeClause, $tabindex, $tabindex_for_value,
-            $idindex, $data, $foreignData, $readOnly
-        );
-
-    } elseif ($GLOBALS['cfg']['LongtextDoubleTextarea']
-        && mb_strstr($column['pma_type'], 'longtext')
-    ) {
-        $html_output = '&nbsp;</td>';
-        $html_output .= '</tr>';
-        $html_output .= '<tr class="' . ($odd_row ? 'odd' : 'even') . '">'
-            . '<td colspan="5" class="right">';
-        $html_output .= PMA_getTextarea(
-            $column, $backup_field, $column_name_appendix, $onChangeClause,
-            $tabindex, $tabindex_for_value, $idindex, $text_dir,
-            $special_chars_encoded, $data_type, $readOnly
-        );
-
-    } elseif (mb_strstr($column['pma_type'], 'text')) {
-
-        $html_output .= PMA_getTextarea(
-            $column, $backup_field, $column_name_appendix, $onChangeClause,
-            $tabindex, $tabindex_for_value, $idindex, $text_dir,
-            $special_chars_encoded, $data_type, $readOnly
-        );
-        $html_output .= "\n";
-        if (mb_strlen($special_chars) > 32000) {
-            $html_output .= "</td>\n";
-            $html_output .= '<td>' . __(
-                'Because of its length,<br /> this column might not be editable.'
-            );
-        }
-
-    } elseif ($column['pma_type'] == 'enum') {
-        $html_output .= PMA_getPmaTypeEnum(
-            $column, $backup_field, $column_name_appendix, $extracted_columnspec,
-            $onChangeClause, $tabindex, $tabindex_for_value, $idindex, $data,
-            $readOnly
-        );
-
-    } elseif ($column['pma_type'] == 'set') {
-        $html_output .= PMA_getPmaTypeSet(
-            $column, $extracted_columnspec, $backup_field,
-            $column_name_appendix, $onChangeClause, $tabindex,
-            $tabindex_for_value, $idindex, $data, $readOnly
-        );
-
-    } elseif ($column['is_binary'] || $column['is_blob']) {
-        $html_output .= PMA_getBinaryAndBlobColumn(
-            $column, $data, $special_chars, $biggest_max_file_size,
-            $backup_field, $column_name_appendix, $onChangeClause, $tabindex,
-            $tabindex_for_value, $idindex, $text_dir, $special_chars_encoded,
-            $vkey, $is_upload, $readOnly
-        );
-
-    } elseif (! in_array($column['pma_type'], $no_support_types)) {
-        $html_output .= PMA_getValueColumnForOtherDatatypes(
-            $column, $default_char_editing, $backup_field,
-            $column_name_appendix, $onChangeClause, $tabindex, $special_chars,
-            $tabindex_for_value, $idindex, $text_dir, $special_chars_encoded,
-            $data, $extracted_columnspec, $readOnly
-        );
-    }
-
-    if (in_array($column['pma_type'], $gis_data_types)) {
-        $html_output .= PMA_getHTMLforGisDataTypes();
-    }
-
-    return $html_output;
-}
-
-/**
- * Get HTML for foreign link in insert form
- *
- * @param array   $column               description of column in given table
- * @param string  $backup_field         hidden input field
- * @param string  $column_name_appendix the name attribute
- * @param string  $onChangeClause       onchange clause for fields
- * @param integer $tabindex             tab index
- * @param integer $tabindex_for_value   offset for the values tabindex
- * @param integer $idindex              id index
- * @param string  $data                 data to edit
- * @param array   $paramTableDbArray    array containing $table and $db
- * @param integer $rownumber            the row number
- * @param array   $titles               An HTML IMG tag for a particular icon from
- *                                      a theme, which may be an actual file or
- *                                      an icon from a sprite
- * @param boolean $readOnly             is column read only or not
- *
- * @return string                       an html snippet
- */
-function PMA_getForeignLink($column, $backup_field, $column_name_appendix,
-    $onChangeClause, $tabindex, $tabindex_for_value, $idindex, $data,
-    $paramTableDbArray, $rownumber, $titles, $readOnly
-) {
-    list($table, $db) = $paramTableDbArray;
-    $html_output = '';
-    $html_output .= $backup_field . "\n";
-
-    $html_output .= '<input type="hidden" name="fields_type'
-        . $column_name_appendix . '" value="foreign" />';
-
-    $html_output .= '<input type="text" name="fields' . $column_name_appendix . '" '
-        . 'class="textfield" '
-        . $onChangeClause . ' '
-        . ($readOnly ? 'readonly="readonly" ' : '')
-        . 'tabindex="' . ($tabindex + $tabindex_for_value) . '" '
-        . 'id="field_' . ($idindex) . '_3" '
-        . 'value="' . htmlspecialchars($data) . '" />';
-
-    $html_output .= '<a class="ajax browse_foreign" href="browse_foreigners.php'
-        . PMA_URL_getCommon(
-            array(
-                'db' => $db,
-                'table' => $table,
-                'field' => $column['Field'],
-                'rownumber' => $rownumber,
-                'data'      => $data
-            )
-        ) . '">'
-        . str_replace("'", "\'", $titles['Browse']) . '</a>';
-    return $html_output;
-}
-
-/**
- * Get HTML to display foreign data
- *
- * @param string  $backup_field         hidden input field
- * @param string  $column_name_appendix the name attribute
- * @param string  $onChangeClause       onchange clause for fields
- * @param integer $tabindex             tab index
- * @param integer $tabindex_for_value   offset for the values tabindex
- * @param integer $idindex              id index
- * @param string  $data                 data to edit
- * @param array   $foreignData          data about the foreign keys
- * @param boolean $readOnly             is display read only or not
- *
- * @return string                       an html snippet
- */
-function PMA_dispRowForeignData($backup_field, $column_name_appendix,
-    $onChangeClause, $tabindex, $tabindex_for_value, $idindex, $data,
-    $foreignData, $readOnly
-) {
-    $html_output = '';
-    $html_output .= $backup_field . "\n";
-    $html_output .= '<input type="hidden"'
-        . ' name="fields_type' . $column_name_appendix . '"'
-        . ' value="foreign" />';
-
-    $html_output .= '<select name="fields' . $column_name_appendix . '"'
-        . ' ' . $onChangeClause
-        . ' class="textfield"'
-        . ($readOnly ? ' disabled' : '')
-        . ' tabindex="' . ($tabindex + $tabindex_for_value) . '"'
-        . ' id="field_' . $idindex . '_3">';
-    $html_output .= PMA_foreignDropdown(
-        $foreignData['disp_row'], $foreignData['foreign_field'],
-        $foreignData['foreign_display'], $data,
-        $GLOBALS['cfg']['ForeignKeyMaxLimit']
-    );
-    $html_output .= '</select>';
-
-    //Add hidden input, as disabled <select> input does not included in POST.
-    if ($readOnly) {
-        $html_output .= '<input name="fields' . $column_name_appendix . '"'
-            . ' type="hidden" value="' . htmlspecialchars($data) . '">';
-    }
-
-    return $html_output;
-}
-
-/**
- * Get HTML textarea for insert form
- *
- * @param array   $column                column information
- * @param string  $backup_field          hidden input field
- * @param string  $column_name_appendix  the name attribute
- * @param string  $onChangeClause        onchange clause for fields
- * @param integer $tabindex              tab index
- * @param integer $tabindex_for_value    offset for the values tabindex
- * @param integer $idindex               id index
- * @param string  $text_dir              text direction
- * @param string  $special_chars_encoded replaced char if the string starts
- *                                       with a \r\n pair (0x0d0a) add an extra \n
- * @param string  $data_type             the html5 data-* attribute type
- * @param boolean $readOnly              is column read only or not
- *
- * @return string                       an html snippet
- */
-function PMA_getTextarea($column, $backup_field, $column_name_appendix,
-    $onChangeClause, $tabindex, $tabindex_for_value, $idindex,
-    $text_dir, $special_chars_encoded, $data_type, $readOnly
-) {
-    $the_class = '';
-    $textAreaRows = $GLOBALS['cfg']['TextareaRows'];
-    $textareaCols = $GLOBALS['cfg']['TextareaCols'];
-
-    if ($column['is_char']) {
-        /**
-         * @todo clarify the meaning of the "textfield" class and explain
-         *       why character columns have the "char" class instead
-         */
-        $the_class = 'char';
-        $textAreaRows = $GLOBALS['cfg']['CharTextareaRows'];
-        $textareaCols = $GLOBALS['cfg']['CharTextareaCols'];
-        $extracted_columnspec = PMA\libraries\Util::extractColumnSpec(
-            $column['Type']
-        );
-        $maxlength = $extracted_columnspec['spec_in_brackets'];
-    } elseif ($GLOBALS['cfg']['LongtextDoubleTextarea']
-        && mb_strstr($column['pma_type'], 'longtext')
-    ) {
-        $textAreaRows = $GLOBALS['cfg']['TextareaRows'] * 2;
-        $textareaCols = $GLOBALS['cfg']['TextareaCols'] * 2;
-    }
-    $html_output = $backup_field . "\n"
-        . '<textarea name="fields' . $column_name_appendix . '"'
-        . ' class="' . $the_class . '"'
-        . ($readOnly ? ' readonly="readonly"' : '')
-        . (isset($maxlength) ? ' data-maxlength="' . $maxlength . '"' : '')
-        . ' rows="' . $textAreaRows . '"'
-        . ' cols="' . $textareaCols . '"'
-        . ' dir="' . $text_dir . '"'
-        . ' id="field_' . ($idindex) . '_3"'
-        . (! empty($onChangeClause) ? ' ' . $onChangeClause : '')
-        . ' tabindex="' . ($tabindex + $tabindex_for_value) . '"'
-        . ' data-type="' . $data_type . '">'
-        . $special_chars_encoded
-        . '</textarea>';
-
-    return $html_output;
-}
-
-/**
- * Get HTML for enum type
- *
- * @param array   $column               description of column in given table
- * @param string  $backup_field         hidden input field
- * @param string  $column_name_appendix the name attribute
- * @param array   $extracted_columnspec associative array containing type,
- *                                      spec_in_brackets and possibly
- *                                      enum_set_values (another array)
- * @param string  $onChangeClause       onchange clause for fields
- * @param integer $tabindex             tab index
- * @param integer $tabindex_for_value   offset for the values tabindex
- * @param integer $idindex              id index
- * @param mixed   $data                 data to edit
- * @param boolean $readOnly             is column read only or not
- *
- * @return string an html snippet
- */
-function PMA_getPmaTypeEnum($column, $backup_field, $column_name_appendix,
-    $extracted_columnspec, $onChangeClause, $tabindex, $tabindex_for_value,
-    $idindex, $data, $readOnly
-) {
-    $html_output = '';
-    if (! isset($column['values'])) {
-        $column['values'] = PMA_getColumnEnumValues(
-            $column, $extracted_columnspec
-        );
-    }
-    $column_enum_values = $column['values'];
-    $html_output .= '<input type="hidden" name="fields_type'
-        . $column_name_appendix . '" value="enum" />';
-    $html_output .= "\n" . '            ' . $backup_field . "\n";
-    if (mb_strlen($column['Type']) > 20) {
-        $html_output .= PMA_getDropDownDependingOnLength(
-            $column, $column_name_appendix, $onChangeClause,
-            $tabindex, $tabindex_for_value,
-            $idindex, $data, $column_enum_values, $readOnly
-        );
-    } else {
-        $html_output .= PMA_getRadioButtonDependingOnLength(
-            $column_name_appendix, $onChangeClause,
-            $tabindex, $column, $tabindex_for_value,
-            $idindex, $data, $column_enum_values, $readOnly
-        );
-    }
-    return $html_output;
-}
-
-/**
- * Get column values
- *
- * @param array $column               description of column in given table
- * @param array $extracted_columnspec associative array containing type,
- *                                    spec_in_brackets and possibly enum_set_values
- *                                    (another array)
- *
- * @return array column values as an associative array
- */
-function PMA_getColumnEnumValues($column, $extracted_columnspec)
-{
-    $column['values'] = array();
-    foreach ($extracted_columnspec['enum_set_values'] as $val) {
-        $column['values'][] = array(
-            'plain' => $val,
-            'html'  => htmlspecialchars($val),
-        );
-    }
-    return $column['values'];
-}
-
-/**
- * Get HTML drop down for more than 20 string length
- *
- * @param array   $column               description of column in given table
- * @param string  $column_name_appendix the name attribute
- * @param string  $onChangeClause       onchange clause for fields
- * @param integer $tabindex             tab index
- * @param integer $tabindex_for_value   offset for the values tabindex
- * @param integer $idindex              id index
- * @param string  $data                 data to edit
- * @param array   $column_enum_values   $column['values']
- *
- * @return string                       an html snippet
- */
-function PMA_getDropDownDependingOnLength(
-    $column, $column_name_appendix, $onChangeClause,
-    $tabindex, $tabindex_for_value, $idindex, $data, $column_enum_values,
-    $readOnly
-) {
-    $html_output = '<select name="fields' . $column_name_appendix . '"'
-        . ' ' . $onChangeClause
-        . ' class="textfield"'
-        . ' tabindex="' . ($tabindex + $tabindex_for_value) . '"'
-        . ($readOnly ? ' disabled' : '')
-        . ' id="field_' . ($idindex) . '_3">';
-    $html_output .= '<option value="">&nbsp;</option>' . "\n";
-
-    $selected_html = '';
-    foreach ($column_enum_values as $enum_value) {
-        $html_output .= '<option value="' . $enum_value['html'] . '"';
-        if ($data == $enum_value['plain']
-            || ($data == ''
-            && (! isset($_REQUEST['where_clause']) || $column['Null'] != 'YES')
-            && isset($column['Default'])
-            && $enum_value['plain'] == $column['Default'])
-        ) {
-            $html_output .= ' selected="selected"';
-            $selected_html = $enum_value['html'];
-        }
-        $html_output .= '>' . $enum_value['html'] . '</option>' . "\n";
-    }
-    $html_output .= '</select>';
-
-    //Add hidden input, as disabled <select> input does not included in POST.
-    if ($readOnly) {
-        $html_output .= '<input name="fields' . $column_name_appendix . '"'
-            . ' type="hidden" value="' . $selected_html . '">';
-    }
-    return $html_output;
-}
-
-/**
- * Get HTML radio button for less than 20 string length
- *
- * @param string  $column_name_appendix the name attribute
- * @param string  $onChangeClause       onchange clause for fields
- * @param integer $tabindex             tab index
- * @param array   $column               description of column in given table
- * @param integer $tabindex_for_value   offset for the values tabindex
- * @param integer $idindex              id index
- * @param string  $data                 data to edit
- * @param array   $column_enum_values   $column['values']
- *
- * @return string                       an html snippet
- */
-function PMA_getRadioButtonDependingOnLength(
-    $column_name_appendix, $onChangeClause,
-    $tabindex, $column, $tabindex_for_value, $idindex, $data,
-    $column_enum_values, $readOnly
-) {
-    $j = 0;
-    $html_output = '';
-    foreach ($column_enum_values as $enum_value) {
-        $html_output .= '            '
-            . '<input type="radio" name="fields' . $column_name_appendix . '"'
-            . ' class="textfield"'
-            . ' value="' . $enum_value['html'] . '"'
-            . ' id="field_' . ($idindex) . '_3_'  . $j . '"'
-            . ' ' . $onChangeClause;
-        if ($data == $enum_value['plain']
-            || ($data == ''
-            && (! isset($_REQUEST['where_clause']) || $column['Null'] != 'YES')
-            && isset($column['Default'])
-            && $enum_value['plain'] == $column['Default'])
-        ) {
-            $html_output .= ' checked="checked"';
-        }
-        elseif ($readOnly) {
-            $html_output .= ' disabled';
-        }
-        $html_output .= ' tabindex="' . ($tabindex + $tabindex_for_value) . '" />';
-        $html_output .= '<label for="field_' . $idindex . '_3_' . $j . '">'
-            . $enum_value['html'] . '</label>' . "\n";
-        $j++;
-    }
-    return $html_output;
-}
-
-/**
- * Get the HTML for 'set' pma type
- *
- * @param array   $column               description of column in given table
- * @param array   $extracted_columnspec associative array containing type,
- *                                      spec_in_brackets and possibly
- *                                      enum_set_values (another array)
- * @param string  $backup_field         hidden input field
- * @param string  $column_name_appendix the name attribute
- * @param string  $onChangeClause       onchange clause for fields
- * @param integer $tabindex             tab index
- * @param integer $tabindex_for_value   offset for the values tabindex
- * @param integer $idindex              id index
- * @param string  $data                 description of the column field
- * @param boolean $readOnly             is column read only or not
- *
- * @return string                       an html snippet
- */
-function PMA_getPmaTypeSet(
-    $column, $extracted_columnspec, $backup_field,
-    $column_name_appendix, $onChangeClause, $tabindex,
-    $tabindex_for_value, $idindex, $data, $readOnly
-) {
-    list($column_set_values, $select_size) = PMA_getColumnSetValueAndSelectSize(
-        $column, $extracted_columnspec
-    );
-    $vset = array_flip(explode(',', $data));
-    $html_output = $backup_field . "\n";
-    $html_output .= '<input type="hidden" name="fields_type'
-        . $column_name_appendix . '" value="set" />';
-    $html_output .= '<select name="fields' . $column_name_appendix . '[]' . '"'
-        . ' class="textfield"'
-        . ($readOnly ? ' disabled' : '')
-        . ' size="' . $select_size . '"'
-        . ' multiple="multiple"'
-        . ' ' . $onChangeClause
-        . ' tabindex="' . ($tabindex + $tabindex_for_value) . '"'
-        . ' id="field_' . ($idindex) . '_3">';
-
-    $selected_html = '';
-    foreach ($column_set_values as $column_set_value) {
-        $html_output .= '<option value="' . $column_set_value['html'] . '"';
-        if (isset($vset[$column_set_value['plain']])) {
-            $html_output .= ' selected="selected"';
-            $selected_html = $column_set_value['html'];
-        }
-        $html_output .= '>' . $column_set_value['html'] . '</option>' . "\n";
-    }
-    $html_output .= '</select>';
-
-    //Add hidden input, as disabled <select> input does not included in POST.
-    if ($readOnly) {
-        $html_output .= '<input name="fields' . $column_name_appendix . '[]' . '"'
-            . ' type="hidden" value="' . $selected_html . '">';
-    }
-    return $html_output;
-}
-
-/**
- * Retrieve column 'set' value and select size
- *
- * @param array $column               description of column in given table
- * @param array $extracted_columnspec associative array containing type,
- *                                    spec_in_brackets and possibly enum_set_values
- *                                    (another array)
- *
- * @return array $column['values'], $column['select_size']
- */
-function PMA_getColumnSetValueAndSelectSize($column, $extracted_columnspec)
-{
-    if (! isset($column['values'])) {
-        $column['values'] = array();
-        foreach ($extracted_columnspec['enum_set_values'] as $val) {
-            $column['values'][] = array(
-                'plain' => $val,
-                'html'  => htmlspecialchars($val),
-            );
-        }
-        $column['select_size'] = min(4, count($column['values']));
-    }
-    return array($column['values'], $column['select_size']);
-}
-
-/**
- * Get HTML for binary and blob column
- *
- * @param array   $column                description of column in given table
- * @param string  $data                  data to edit
- * @param string  $special_chars         special characters
- * @param integer $biggest_max_file_size biggest max file size for uploading
- * @param string  $backup_field          hidden input field
- * @param string  $column_name_appendix  the name attribute
- * @param string  $onChangeClause        onchange clause for fields
- * @param integer $tabindex              tab index
- * @param integer $tabindex_for_value    offset for the values tabindex
- * @param integer $idindex               id index
- * @param string  $text_dir              text direction
- * @param string  $special_chars_encoded replaced char if the string starts
- *                                       with a \r\n pair (0x0d0a) add an extra \n
- * @param string  $vkey                  [multi_edit]['row_id']
- * @param boolean $is_upload             is upload or not
- * @param boolean $readOnly              is column read only or not
- *
- * @return string                           an html snippet
- */
-function PMA_getBinaryAndBlobColumn(
-    $column, $data, $special_chars, $biggest_max_file_size,
-    $backup_field, $column_name_appendix, $onChangeClause, $tabindex,
-    $tabindex_for_value, $idindex, $text_dir, $special_chars_encoded,
-    $vkey, $is_upload, $readOnly
-) {
-    $html_output = '';
-    // Add field type : Protected or Hexadecimal
-    $fields_type_html = '<input type="hidden" name="fields_type'
-        . $column_name_appendix . '" value="%s" />';
-    // Default value : hex
-    $fields_type_val = 'hex';
-    if (($GLOBALS['cfg']['ProtectBinary'] === 'blob' && $column['is_blob'])
-        || ($GLOBALS['cfg']['ProtectBinary'] === 'all')
-        || ($GLOBALS['cfg']['ProtectBinary'] === 'noblob' && !$column['is_blob'])
-    ) {
-        $html_output .= __('Binary - do not edit');
-        if (isset($data)) {
-            $data_size = PMA\libraries\Util::formatByteDown(
-                mb_strlen(stripslashes($data)), 3, 1
-            );
-            $html_output .= ' (' . $data_size[0] . ' ' . $data_size[1] . ')';
-            unset($data_size);
-        }
-        $fields_type_val = 'protected';
-        $html_output .= '<input type="hidden" name="fields'
-            . $column_name_appendix . '" value="" />';
-    } elseif ($column['is_blob']
-        || ($column['len'] > $GLOBALS['cfg']['LimitChars'])
-    ) {
-        $html_output .= "\n" . PMA_getTextarea(
-            $column, $backup_field, $column_name_appendix, $onChangeClause,
-            $tabindex, $tabindex_for_value, $idindex, $text_dir,
-            $special_chars_encoded, 'HEX', $readOnly
-        );
-    } else {
-        // field size should be at least 4 and max $GLOBALS['cfg']['LimitChars']
-        $fieldsize = min(max($column['len'], 4), $GLOBALS['cfg']['LimitChars']);
-        $html_output .= "\n" . $backup_field . "\n" . PMA_getHTMLinput(
-            $column, $column_name_appendix, $special_chars, $fieldsize,
-            $onChangeClause, $tabindex, $tabindex_for_value, $idindex, 'HEX',
-            $readOnly
-        );
-    }
-    $html_output .= sprintf($fields_type_html, $fields_type_val);
-
-    if ($is_upload && $column['is_blob'] && !$readOnly) {
-        // We don't want to prevent users from using
-        // browser's default drag-drop feature on some page(s),
-        // so we add noDragDrop class to the input
-        $html_output .= '<br />'
-            . '<input type="file"'
-            . ' name="fields_upload' . $vkey . '[' . $column['Field_md5'] . ']"'
-            . ' class="textfield noDragDrop" id="field_' . $idindex . '_3" size="10"'
-            . ' ' . $onChangeClause . '/>&nbsp;';
-        list($html_out,) = PMA_getMaxUploadSize(
-            $column, $biggest_max_file_size
-        );
-        $html_output .= $html_out;
-    }
-
-    if (!empty($GLOBALS['cfg']['UploadDir']) && !$readOnly) {
-        $html_output .= PMA_getSelectOptionForUpload($vkey, $column);
-    }
-
-    return $html_output;
-}
-
-/**
- * Get HTML input type
- *
- * @param array   $column               description of column in given table
- * @param string  $column_name_appendix the name attribute
- * @param string  $special_chars        special characters
- * @param integer $fieldsize            html field size
- * @param string  $onChangeClause       onchange clause for fields
- * @param integer $tabindex             tab index
- * @param integer $tabindex_for_value   offset for the values tabindex
- * @param integer $idindex              id index
- * @param string  $data_type            the html5 data-* attribute type
- * @param boolean $readOnly             is column read only or not
- *
- * @return string                       an html snippet
- */
-function PMA_getHTMLinput(
-    $column, $column_name_appendix, $special_chars, $fieldsize, $onChangeClause,
-    $tabindex, $tabindex_for_value, $idindex, $data_type, $readOnly
-) {
-    $input_type = 'text';
-    // do not use the 'date' or 'time' types here; they have no effect on some
-    // browsers and create side effects (see bug #4218)
-
-    $the_class = 'textfield';
-    // verify True_Type which does not contain the parentheses and length
-    if ($readOnly) {
-        //NOOP. Disable date/timepicker
-    } else if ($column['True_Type'] === 'date') {
-        $the_class .= ' datefield';
-    } else if ($column['True_Type'] === 'time') {
-        $the_class .= ' timefield';
-    } else if ($column['True_Type'] === 'datetime'
-        || $column['True_Type'] === 'timestamp'
-    ) {
-        $the_class .= ' datetimefield';
-    }
-    $input_min_max = false;
-    if (in_array($column['True_Type'], $GLOBALS['PMA_Types']->getIntegerTypes())) {
-        $extracted_columnspec = PMA\libraries\Util::extractColumnSpec(
-            $column['Type']
-        );
-        $is_unsigned = $extracted_columnspec['unsigned'];
-        $min_max_values = $GLOBALS['PMA_Types']->getIntegerRange(
-            $column['True_Type'], ! $is_unsigned
-        );
-        $input_min_max = 'min="' . $min_max_values[0] . '" '
-            . 'max="' . $min_max_values[1] . '"';
-        $data_type = 'INT';
-    }
-    return '<input type="' . $input_type . '"'
-        . ' name="fields' . $column_name_appendix . '"'
-        . ' value="' . $special_chars . '" size="' . $fieldsize . '"'
-        . ((isset($column['is_char']) && $column['is_char'])
-        ? ' data-maxlength="' . $fieldsize . '"'
-        : '')
-        . ($readOnly ? ' readonly="readonly"' : '')
-        . ($input_min_max !== false ? ' ' . $input_min_max : '')
-        . ' data-type="' . $data_type . '"'
-        . ($input_type === 'time' ? ' step="1"' : '')
-        . ' class="' . $the_class . '" ' . $onChangeClause
-        . ' tabindex="' . ($tabindex + $tabindex_for_value) . '"'
-        . ' id="field_' . ($idindex) . '_3" />';
-}
-
-/**
- * Get HTML select option for upload
- *
- * @param string $vkey   [multi_edit]['row_id']
- * @param array  $column description of column in given table
- *
- * @return string|void an html snippet
- */
-function PMA_getSelectOptionForUpload($vkey, $column)
-{
-    $files = PMA_getFileSelectOptions(
-        PMA\libraries\Util::userDir($GLOBALS['cfg']['UploadDir'])
-    );
-
-    if ($files === false) {
-        return '<span style="color:red">' . __('Error') . '</span><br />' . "\n"
-            .  __('The directory you set for upload work cannot be reached.') . "\n";
-    } elseif (!empty($files)) {
-        return "<br />\n"
-            . '<i>' . __('Or') . '</i>' . ' '
-            . __('web server upload directory:') . '<br />' . "\n"
-            . '<select size="1" name="fields_uploadlocal'
-            . $vkey . '[' . $column['Field_md5'] . ']">' . "\n"
-            . '<option value="" selected="selected"></option>' . "\n"
-            . $files
-            . '</select>' . "\n";
-    }
-
-    return null;
-}
-
-/**
- * Retrieve the maximum upload file size
- *
- * @param array   $column                description of column in given table
- * @param integer $biggest_max_file_size biggest max file size for uploading
- *
- * @return array an html snippet and $biggest_max_file_size
- */
-function PMA_getMaxUploadSize($column, $biggest_max_file_size)
-{
-    // find maximum upload size, based on field type
-    /**
-     * @todo with functions this is not so easy, as you can basically
-     * process any data with function like MD5
-     */
-    global $max_upload_size;
-    $max_field_sizes = array(
-        'tinyblob'   =>        '256',
-        'blob'       =>      '65536',
-        'mediumblob' =>   '16777216',
-        'longblob'   => '4294967296' // yeah, really
-    );
-
-    $this_field_max_size = $max_upload_size; // from PHP max
-    if ($this_field_max_size > $max_field_sizes[$column['pma_type']]) {
-        $this_field_max_size = $max_field_sizes[$column['pma_type']];
-    }
-    $html_output
-        = PMA\libraries\Util::getFormattedMaximumUploadSize(
-            $this_field_max_size
-        ) . "\n";
-    // do not generate here the MAX_FILE_SIZE, because we should
-    // put only one in the form to accommodate the biggest field
-    if ($this_field_max_size > $biggest_max_file_size) {
-        $biggest_max_file_size = $this_field_max_size;
-    }
-    return array($html_output, $biggest_max_file_size);
-}
-
-/**
- * Get HTML for the Value column of other datatypes
- * (here, "column" is used in the sense of HTML column in HTML table)
- *
- * @param array   $column                description of column in given table
- * @param string  $default_char_editing  default char editing mode which is stored
- *                                       in the config.inc.php script
- * @param string  $backup_field          hidden input field
- * @param string  $column_name_appendix  the name attribute
- * @param string  $onChangeClause        onchange clause for fields
- * @param integer $tabindex              tab index
- * @param string  $special_chars         special characters
- * @param integer $tabindex_for_value    offset for the values tabindex
- * @param integer $idindex               id index
- * @param string  $text_dir              text direction
- * @param string  $special_chars_encoded replaced char if the string starts
- *                                       with a \r\n pair (0x0d0a) add an extra \n
- * @param string  $data                  data to edit
- * @param array   $extracted_columnspec  associative array containing type,
- *                                       spec_in_brackets and possibly
- *                                       enum_set_values (another array)
- * @param boolean $readOnly              is column read only or not
- *
- * @return string an html snippet
- */
-function PMA_getValueColumnForOtherDatatypes($column, $default_char_editing,
-    $backup_field,
-    $column_name_appendix, $onChangeClause, $tabindex, $special_chars,
-    $tabindex_for_value, $idindex, $text_dir, $special_chars_encoded, $data,
-    $extracted_columnspec, $readOnly
-) {
-    // HTML5 data-* attribute data-type
-    $data_type = $GLOBALS['PMA_Types']->getTypeClass($column['True_Type']);
-    $fieldsize = PMA_getColumnSize($column, $extracted_columnspec);
-    $html_output = $backup_field . "\n";
-    if ($column['is_char']
-        && ($GLOBALS['cfg']['CharEditing'] == 'textarea'
-        || mb_strpos($data, "\n") !== false)
-    ) {
-        $html_output .= "\n";
-        $GLOBALS['cfg']['CharEditing'] = $default_char_editing;
-        $html_output .= PMA_getTextarea(
-            $column, $backup_field, $column_name_appendix, $onChangeClause,
-            $tabindex, $tabindex_for_value, $idindex, $text_dir,
-            $special_chars_encoded, $data_type, $readOnly
-        );
-    } else {
-        $html_output .= PMA_getHTMLinput(
-            $column, $column_name_appendix, $special_chars, $fieldsize,
-            $onChangeClause, $tabindex, $tabindex_for_value, $idindex,
-            $data_type, $readOnly
-        );
-
-        $virtual = array(
-            'VIRTUAL', 'PERSISTENT', 'VIRTUAL GENERATED', 'STORED GENERATED'
-        );
-        if (in_array($column['Extra'], $virtual)) {
-            $html_output .= '<input type="hidden" name="virtual'
-                . $column_name_appendix . '" value="1" />';
-        }
-        if ($column['Extra'] == 'auto_increment') {
-            $html_output .= '<input type="hidden" name="auto_increment'
-                . $column_name_appendix . '" value="1" />';
-        }
-        if (substr($column['pma_type'], 0, 9) == 'timestamp') {
-            $html_output .= '<input type="hidden" name="fields_type'
-                . $column_name_appendix . '" value="timestamp" />';
-        }
-        if (substr($column['pma_type'], 0, 8) == 'datetime') {
-            $html_output .= '<input type="hidden" name="fields_type'
-                . $column_name_appendix . '" value="datetime" />';
-        }
-        if ($column['True_Type'] == 'bit') {
-            $html_output .= '<input type="hidden" name="fields_type'
-                . $column_name_appendix . '" value="bit" />';
-        }
-        if ($column['pma_type'] == 'date'
-            || $column['pma_type'] == 'datetime'
-            || substr($column['pma_type'], 0, 9) == 'timestamp'
-        ) {
-            // the _3 suffix points to the date field
-            // the _2 suffix points to the corresponding NULL checkbox
-            // in dateFormat, 'yy' means the year with 4 digits
-        }
-    }
-    return $html_output;
-}
-
-/**
- * Get the field size
- *
- * @param array $column               description of column in given table
- * @param array $extracted_columnspec associative array containing type,
- *                                    spec_in_brackets and possibly enum_set_values
- *                                    (another array)
- *
- * @return integer      field size
- */
-function PMA_getColumnSize($column, $extracted_columnspec)
-{
-    if ($column['is_char']) {
-        $fieldsize = $extracted_columnspec['spec_in_brackets'];
-        if ($fieldsize > $GLOBALS['cfg']['MaxSizeForInputField']) {
-            /**
-             * This case happens for CHAR or VARCHAR columns which have
-             * a size larger than the maximum size for input field.
-             */
-            $GLOBALS['cfg']['CharEditing'] = 'textarea';
-        }
-    } else {
-        /**
-         * This case happens for example for INT or DATE columns;
-         * in these situations, the value returned in $column['len']
-         * seems appropriate.
-         */
-        $fieldsize = $column['len'];
-    }
-    return min(
-        max($fieldsize, $GLOBALS['cfg']['MinSizeForInputField']),
-        $GLOBALS['cfg']['MaxSizeForInputField']
-    );
-}
-
-/**
- * Get HTML for gis data types
- *
- * @return string an html snippet
- */
-function PMA_getHTMLforGisDataTypes()
-{
-    $edit_str = PMA\libraries\Util::getIcon('b_edit.png', __('Edit/Insert'));
-    return '<span class="open_gis_editor">'
-        . PMA\libraries\Util::linkOrButton(
-            '#', $edit_str, array(), false, false, '_blank'
-        )
-        . '</span>';
-}
-
-/**
- * get html for continue insertion form
- *
- * @param string $table              name of the table
- * @param string $db                 name of the database
- * @param array  $where_clause_array array of where clauses
- * @param string $err_url            error url
- *
- * @return string                   an html snippet
- */
-function PMA_getContinueInsertionForm($table, $db, $where_clause_array, $err_url)
-{
-    $html_output = '<form id="continueForm" method="post"'
-        . ' action="tbl_replace.php" name="continueForm">'
-        . PMA_URL_getHiddenInputs($db, $table)
-        . '<input type="hidden" name="goto"'
-        . ' value="' . htmlspecialchars($GLOBALS['goto']) . '" />'
-        . '<input type="hidden" name="err_url"'
-        . ' value="' . htmlspecialchars($err_url) . '" />'
-        . '<input type="hidden" name="sql_query"'
-        . ' value="' . htmlspecialchars($_REQUEST['sql_query']) . '" />';
-
-    if (isset($_REQUEST['where_clause'])) {
-        foreach ($where_clause_array as $key_id => $where_clause) {
-
-            $html_output .= '<input type="hidden"'
-                . ' name="where_clause[' . $key_id . ']"'
-                . ' value="' . htmlspecialchars(trim($where_clause)) . '" />' . "\n";
-        }
-    }
-    $tmp = '<select name="insert_rows" id="insert_rows">' . "\n";
-    $option_values = array(1, 2, 5, 10, 15, 20, 30, 40);
-
-    foreach ($option_values as $value) {
-        $tmp .= '<option value="' . $value . '"';
-        if ($value == $GLOBALS['cfg']['InsertRows']) {
-            $tmp .= ' selected="selected"';
-        }
-        $tmp .= '>' . $value . '</option>' . "\n";
-    }
-
-    $tmp .= '</select>' . "\n";
-    $html_output .= "\n" . sprintf(__('Continue insertion with %s rows'), $tmp);
-    unset($tmp);
-    $html_output .= '</form>' . "\n";
-    return $html_output;
-}
-
-/**
- * Get action panel
- *
- * @param array   $where_clause       where clause
- * @param string  $after_insert       insert mode, e.g. new_insert, same_insert
- * @param integer $tabindex           tab index
- * @param integer $tabindex_for_value offset for the values tabindex
- * @param boolean $found_unique_key   boolean variable for unique key
- *
- * @return string an html snippet
- */
-function PMA_getActionsPanel($where_clause, $after_insert, $tabindex,
-    $tabindex_for_value, $found_unique_key
-) {
-    $html_output = '<fieldset id="actions_panel">'
-        . '<table cellpadding="5" cellspacing="0">'
-        . '<tr>'
-        . '<td class="nowrap vmiddle">'
-        . PMA_getSubmitTypeDropDown($where_clause, $tabindex, $tabindex_for_value)
-        . "\n";
-
-    $html_output .= '</td>'
-        . '<td class="vmiddle">'
-        . '&nbsp;&nbsp;&nbsp;<strong>'
-        . __('and then') . '</strong>&nbsp;&nbsp;&nbsp;'
-        . '</td>'
-        . '<td class="nowrap vmiddle">'
-        . PMA_getAfterInsertDropDown(
-            $where_clause, $after_insert, $found_unique_key
-        )
-        . '</td>'
-        . '</tr>';
-    $html_output .='<tr>'
-        . PMA_getSubmitAndResetButtonForActionsPanel($tabindex, $tabindex_for_value)
-        . '</tr>'
-        . '</table>'
-        . '</fieldset>';
-    return $html_output;
-}
-
-/**
- * Get a HTML drop down for submit types
- *
- * @param array   $where_clause       where clause
- * @param integer $tabindex           tab index
- * @param integer $tabindex_for_value offset for the values tabindex
- *
- * @return string                       an html snippet
- */
-function PMA_getSubmitTypeDropDown($where_clause, $tabindex, $tabindex_for_value)
-{
-    $html_output = '<select name="submit_type" class="control_at_footer" tabindex="'
-        . ($tabindex + $tabindex_for_value + 1) . '">';
-    if (isset($where_clause)) {
-        $html_output .= '<option value="save">' . __('Save') . '</option>';
-    }
-    $html_output .= '<option value="insert">'
-        . __('Insert as new row')
-        . '</option>'
-        . '<option value="insertignore">'
-        . __('Insert as new row and ignore errors')
-        . '</option>'
-        . '<option value="showinsert">'
-        . __('Show insert query')
-        . '</option>'
-        . '</select>';
-    return $html_output;
-}
-
-/**
- * Get HTML drop down for after insert
- *
- * @param array   $where_clause     where clause
- * @param string  $after_insert     insert mode, e.g. new_insert, same_insert
- * @param boolean $found_unique_key boolean variable for unique key
- *
- * @return string                   an html snippet
- */
-function PMA_getAfterInsertDropDown($where_clause, $after_insert, $found_unique_key)
-{
-    $html_output = '<select name="after_insert" class="control_at_footer">'
-        . '<option value="back" '
-        . ($after_insert == 'back' ? 'selected="selected"' : '') . '>'
-        . __('Go back to previous page') . '</option>'
-        . '<option value="new_insert" '
-        . ($after_insert == 'new_insert' ? 'selected="selected"' : '') . '>'
-        . __('Insert another new row') . '</option>';
-
-    if (isset($where_clause)) {
-        $html_output .= '<option value="same_insert" '
-            . ($after_insert == 'same_insert' ? 'selected="selected"' : '') . '>'
-            . __('Go back to this page') . '</option>';
-
-        // If we have just numeric primary key, we can also edit next
-        // in 2.8.2, we were looking for `field_name` = numeric_value
-        //if (preg_match('@^[\s]*`[^`]*` = [0-9]+@', $where_clause)) {
-        // in 2.9.0, we are looking for `table_name`.`field_name` = numeric_value
-        $is_numeric = false;
-        if (! is_array($where_clause)) {
-            $where_clause = array($where_clause);
-        }
-        for ($i = 0, $nb = count($where_clause); $i < $nb; $i++) {
-            // preg_match() returns 1 if there is a match
-            $is_numeric = (preg_match(
-                '@^[\s]*`[^`]*`[\.]`[^`]*` = [0-9]+@',
-                $where_clause[$i]
-            ) == 1);
-            if ($is_numeric === true) {
-                break;
-            }
-        }
-        if ($found_unique_key && $is_numeric) {
-            $html_output .= '<option value="edit_next" '
-                . ($after_insert == 'edit_next' ? 'selected="selected"' : '') . '>'
-                . __('Edit next row') . '</option>';
-
-        }
-    }
-    $html_output .= '</select>';
-    return $html_output;
-
-}
-
-/**
- * get Submit button and Reset button for action panel
- *
- * @param integer $tabindex           tab index
- * @param integer $tabindex_for_value offset for the values tabindex
- *
- * @return string an html snippet
- */
-function PMA_getSubmitAndResetButtonForActionsPanel($tabindex, $tabindex_for_value)
-{
-    return '<td>'
-    . PMA\libraries\Util::showHint(
-        __(
-            'Use TAB key to move from value to value,'
-            . ' or CTRL+arrows to move anywhere.'
-        )
-    )
-    . '</td>'
-    . '<td colspan="3" class="right vmiddle">'
-    . '<input type="submit" class="control_at_footer" value="' . __('Go') . '"'
-    . ' tabindex="' . ($tabindex + $tabindex_for_value + 6) . '" id="buttonYes" />'
-    . '<input type="button" class="preview_sql" value="' . __('Preview SQL') . '"'
-    . ' tabindex="' . ($tabindex + $tabindex_for_value + 7) . '" />'
-    . '<input type="reset" class="control_at_footer" value="' . __('Reset') . '"'
-    . ' tabindex="' . ($tabindex + $tabindex_for_value + 8) . '" />'
-    . '</td>';
-}
-
-/**
- * Get table head and table foot for insert row table
- *
- * @param array $url_params url parameters
- *
- * @return string           an html snippet
- */
-function PMA_getHeadAndFootOfInsertRowTable($url_params)
-{
-    $html_output = '<table class="insertRowTable topmargin">'
-        . '<thead>'
-        . '<tr>'
-        . '<th>' . __('Column') . '</th>';
-
-    if ($GLOBALS['cfg']['ShowFieldTypesInDataEditView']) {
-        $html_output .= PMA_showTypeOrFunction('type', $url_params, true);
-    }
-    if ($GLOBALS['cfg']['ShowFunctionFields']) {
-        $html_output .= PMA_showTypeOrFunction('function', $url_params, true);
-    }
-
-    $html_output .= '<th>' . __('Null') . '</th>'
-        . '<th>' . __('Value') . '</th>'
-        . '</tr>'
-        . '</thead>'
-        . ' <tfoot>'
-        . '<tr>'
-        . '<th colspan="5" class="tblFooters right">'
-        . '<input type="submit" value="' . __('Go') . '" />'
-        . '</th>'
-        . '</tr>'
-        . '</tfoot>';
-    return $html_output;
-}
-
-/**
- * Prepares the field value and retrieve special chars, backup field and data array
- *
- * @param array   $current_row          a row of the table
- * @param array   $column               description of column in given table
- * @param array   $extracted_columnspec associative array containing type,
- *                                      spec_in_brackets and possibly
- *                                      enum_set_values (another array)
- * @param boolean $real_null_value      whether column value null or not null
- * @param array   $gis_data_types       list of GIS data types
- * @param string  $column_name_appendix string to append to column name in input
- * @param bool    $as_is                use the data as is, used in repopulating
- *
- * @return array $real_null_value, $data, $special_chars, $backup_field,
- *               $special_chars_encoded
- */
-function PMA_getSpecialCharsAndBackupFieldForExistingRow(
-    $current_row, $column, $extracted_columnspec,
-    $real_null_value, $gis_data_types, $column_name_appendix, $as_is
-) {
-    $special_chars_encoded = '';
-    $data = null;
-    // (we are editing)
-    if (!isset($current_row[$column['Field']])) {
-        $real_null_value = true;
-        $current_row[$column['Field']] = '';
-        $special_chars = '';
-        $data = $current_row[$column['Field']];
-    } elseif ($column['True_Type'] == 'bit') {
-        $special_chars = $as_is
-            ? $current_row[$column['Field']]
-            : PMA\libraries\Util::printableBitValue(
-                $current_row[$column['Field']],
-                $extracted_columnspec['spec_in_brackets']
-            );
-    } elseif ((substr($column['True_Type'], 0, 9) == 'timestamp'
-        || $column['True_Type'] == 'datetime'
-        || $column['True_Type'] == 'time')
-        && (mb_strpos($current_row[$column['Field']], ".") !== false)
-    ) {
-        $current_row[$column['Field']] = $as_is
-            ? $current_row[$column['Field']]
-            : PMA\libraries\Util::addMicroseconds(
-                $current_row[$column['Field']]
-            );
-        $special_chars = htmlspecialchars($current_row[$column['Field']]);
-    } elseif (in_array($column['True_Type'], $gis_data_types)) {
-        // Convert gis data to Well Know Text format
-        $current_row[$column['Field']] = $as_is
-            ? $current_row[$column['Field']]
-            : PMA\libraries\Util::asWKT(
-                $current_row[$column['Field']], true
-            );
-        $special_chars = htmlspecialchars($current_row[$column['Field']]);
-    } else {
-        // special binary "characters"
-        if ($column['is_binary']
-            || ($column['is_blob'] && $GLOBALS['cfg']['ProtectBinary'] !== 'all')
-        ) {
-            $current_row[$column['Field']] = $as_is
-                ? $current_row[$column['Field']]
-                : bin2hex(
-                    $current_row[$column['Field']]
-                );
-        } // end if
-        $special_chars = htmlspecialchars($current_row[$column['Field']]);
-
-        //We need to duplicate the first \n or otherwise we will lose
-        //the first newline entered in a VARCHAR or TEXT column
-        $special_chars_encoded
-            = PMA\libraries\Util::duplicateFirstNewline($special_chars);
-
-        $data = $current_row[$column['Field']];
-    } // end if... else...
-
-    //when copying row, it is useful to empty auto-increment column
-    // to prevent duplicate key error
-    if (isset($_REQUEST['default_action'])
-        && $_REQUEST['default_action'] === 'insert'
-    ) {
-        if ($column['Key'] === 'PRI'
-            && mb_strpos($column['Extra'], 'auto_increment') !== false
-        ) {
-            $data = $special_chars_encoded = $special_chars = null;
-        }
-    }
-    // If a timestamp field value is not included in an update
-    // statement MySQL auto-update it to the current timestamp;
-    // however, things have changed since MySQL 4.1, so
-    // it's better to set a fields_prev in this situation
-    $backup_field = '<input type="hidden" name="fields_prev'
-        . $column_name_appendix . '" value="'
-        . htmlspecialchars($current_row[$column['Field']]) . '" />';
-
-    return array(
-        $real_null_value,
-        $special_chars_encoded,
-        $special_chars,
-        $data,
-        $backup_field
-    );
-}
-
-/**
- * display default values
- *
- * @param array   $column          description of column in given table
- * @param boolean $real_null_value whether column value null or not null
- *
- * @return array $real_null_value, $data, $special_chars,
- *               $backup_field, $special_chars_encoded
- */
-function PMA_getSpecialCharsAndBackupFieldForInsertingMode(
-    $column, $real_null_value
-) {
-    if (! isset($column['Default'])) {
-        $column['Default']    = '';
-        $real_null_value          = true;
-        $data                     = '';
-    } else {
-        $data                     = $column['Default'];
-    }
-
-    $trueType = $column['True_Type'];
-
-    if ($trueType == 'bit') {
-        $special_chars = PMA\libraries\Util::convertBitDefaultValue(
-            $column['Default']
-        );
-    } elseif (substr($trueType, 0, 9) == 'timestamp'
-        || $trueType == 'datetime'
-        || $trueType == 'time'
-    ) {
-        $special_chars = PMA\libraries\Util::addMicroseconds($column['Default']);
-    } elseif ($trueType == 'binary' || $trueType == 'varbinary') {
-        $special_chars = bin2hex($column['Default']);
-    } else {
-        $special_chars = htmlspecialchars($column['Default']);
-    }
-    $backup_field = '';
-    $special_chars_encoded = PMA\libraries\Util::duplicateFirstNewline(
-        $special_chars
-    );
-    return array(
-        $real_null_value, $data, $special_chars,
-        $backup_field, $special_chars_encoded
-    );
-}
-
-/**
- * Prepares the update/insert of a row
- *
- * @return array     $loop_array, $using_key, $is_insert, $is_insertignore
- */
-function PMA_getParamsForUpdateOrInsert()
-{
-    if (isset($_REQUEST['where_clause'])) {
-        // we were editing something => use the WHERE clause
-        $loop_array = is_array($_REQUEST['where_clause'])
-            ? $_REQUEST['where_clause']
-            : array($_REQUEST['where_clause']);
-        $using_key  = true;
-        $is_insert  = isset($_REQUEST['submit_type'])
-                      && ($_REQUEST['submit_type'] == 'insert'
-                      || $_REQUEST['submit_type'] == 'showinsert'
-                      || $_REQUEST['submit_type'] == 'insertignore');
-    } else {
-        // new row => use indexes
-        $loop_array = array();
-        if (! empty($_REQUEST['fields'])) {
-            foreach ($_REQUEST['fields']['multi_edit'] as $key => $dummy) {
-                $loop_array[] = $key;
-            }
-        }
-        $using_key  = false;
-        $is_insert  = true;
-    }
-    $is_insertignore  = isset($_REQUEST['submit_type'])
-        && $_REQUEST['submit_type'] == 'insertignore';
-    return array($loop_array, $using_key, $is_insert, $is_insertignore);
-}
-
-/**
- * Check wether insert row mode and if so include tbl_changen script and set
- * global variables.
- *
- * @return void
- */
-function PMA_isInsertRow()
-{
-    if (isset($_REQUEST['insert_rows'])
-        && is_numeric($_REQUEST['insert_rows'])
-        && $_REQUEST['insert_rows'] != $GLOBALS['cfg']['InsertRows']
-    ) {
-        $GLOBALS['cfg']['InsertRows'] = $_REQUEST['insert_rows'];
-        $response = PMA\libraries\Response::getInstance();
-        $header = $response->getHeader();
-        $scripts = $header->getScripts();
-        $scripts->addFile('tbl_change.js');
-        if (!defined('TESTSUITE')) {
-            include 'tbl_change.php';
-            exit;
-        }
-    }
-}
-
-/**
- * set $_SESSION for edit_next
- *
- * @param string $one_where_clause one where clause from where clauses array
- *
- * @return void
- */
-function PMA_setSessionForEditNext($one_where_clause)
-{
-    $local_query = 'SELECT * FROM ' . PMA\libraries\Util::backquote($GLOBALS['db'])
-        . '.' . PMA\libraries\Util::backquote($GLOBALS['table']) . ' WHERE '
-        . str_replace('` =', '` >', $one_where_clause) . ' LIMIT 1;';
-
-    $res            = $GLOBALS['dbi']->query($local_query);
-    $row            = $GLOBALS['dbi']->fetchRow($res);
-    $meta           = $GLOBALS['dbi']->getFieldsMeta($res);
-    // must find a unique condition based on unique key,
-    // not a combination of all fields
-    list($unique_condition, $clause_is_unique)
-        = PMA\libraries\Util::getUniqueCondition(
-            $res, // handle
-            count($meta), // fields_cnt
-            $meta, // fields_meta
-            $row, // row
-            true, // force_unique
-            false, // restrict_to_table
-            null // analyzed_sql_results
-        );
-    if (! empty($unique_condition)) {
-        $_SESSION['edit_next'] = $unique_condition;
-    }
-    unset($unique_condition, $clause_is_unique);
-}
-
-/**
- * set $goto_include variable for different cases and retrieve like,
- * if $GLOBALS['goto'] empty, if $goto_include previously not defined
- * and new_insert, same_insert, edit_next
- *
- * @param string $goto_include store some script for include, otherwise it is
- *                             boolean false
- *
- * @return string               $goto_include
- */
-function PMA_getGotoInclude($goto_include)
-{
-    $valid_options = array('new_insert', 'same_insert', 'edit_next');
-    if (isset($_REQUEST['after_insert'])
-        && in_array($_REQUEST['after_insert'], $valid_options)
-    ) {
-        $goto_include = 'tbl_change.php';
-    } elseif (! empty($GLOBALS['goto'])) {
-        if (! preg_match('@^[a-z_]+\.php$@', $GLOBALS['goto'])) {
-            // this should NOT happen
-            //$GLOBALS['goto'] = false;
-            $goto_include = false;
-        } else {
-            $goto_include = $GLOBALS['goto'];
-        }
-        if ($GLOBALS['goto'] == 'db_sql.php'
-            && mb_strlen($GLOBALS['table'])
-        ) {
-            $GLOBALS['table'] = '';
-        }
-    }
-    if (! $goto_include) {
-        if (! mb_strlen($GLOBALS['table'])) {
-            $goto_include = 'db_sql.php';
-        } else {
-            $goto_include = 'tbl_sql.php';
-        }
-    }
-    return $goto_include;
-}
-
-/**
- * Defines the url to return in case of failure of the query
- *
- * @param array $url_params url parameters
- *
- * @return string           error url for query failure
- */
-function PMA_getErrorUrl($url_params)
-{
-    if (isset($_REQUEST['err_url'])) {
-        return $_REQUEST['err_url'];
-    } else {
-        return 'tbl_change.php' . PMA_URL_getCommon($url_params);
-    }
-}
-
-/**
- * Builds the sql query
- *
- * @param boolean $is_insertignore $_REQUEST['submit_type'] == 'insertignore'
- * @param array   $query_fields    column names array
- * @param array   $value_sets      array of query values
- *
- * @return array of query
- */
-function PMA_buildSqlQuery($is_insertignore, $query_fields, $value_sets)
-{
-    if ($is_insertignore) {
-        $insert_command = 'INSERT IGNORE ';
-    } else {
-        $insert_command = 'INSERT ';
-    }
-    $query = array(
-        $insert_command . 'INTO '
-        . PMA\libraries\Util::backquote($GLOBALS['table'])
-        . ' (' . implode(', ', $query_fields) . ') VALUES ('
-        . implode('), (', $value_sets) . ')'
-    );
-    unset($insert_command, $query_fields);
-    return $query;
-}
-
-/**
- * Executes the sql query and get the result, then move back to the calling page
- *
- * @param array $url_params url parameters array
- * @param array $query      built query from PMA_buildSqlQuery()
- *
- * @return array            $url_params, $total_affected_rows, $last_messages
- *                          $warning_messages, $error_messages, $return_to_sql_query
- */
-function PMA_executeSqlQuery($url_params, $query)
-{
-    $return_to_sql_query = '';
-    if (! empty($GLOBALS['sql_query'])) {
-        $url_params['sql_query'] = $GLOBALS['sql_query'];
-        $return_to_sql_query = $GLOBALS['sql_query'];
-    }
-    $GLOBALS['sql_query'] = implode('; ', $query) . ';';
-    // to ensure that the query is displayed in case of
-    // "insert as new row" and then "insert another new row"
-    $GLOBALS['display_query'] = $GLOBALS['sql_query'];
-
-    $total_affected_rows = 0;
-    $last_messages = array();
-    $warning_messages = array();
-    $error_messages = array();
-
-    foreach ($query as $single_query) {
-        if ($_REQUEST['submit_type'] == 'showinsert') {
-            $last_messages[] = Message::notice(__('Showing SQL query'));
-            continue;
-        }
-        if ($GLOBALS['cfg']['IgnoreMultiSubmitErrors']) {
-            $result = $GLOBALS['dbi']->tryQuery($single_query);
-        } else {
-            $result = $GLOBALS['dbi']->query($single_query);
-        }
-        if (! $result) {
-            $error_messages[] = Message::sanitize($GLOBALS['dbi']->getError());
-        } else {
-            // The next line contains a real assignment, it's not a typo
-            if ($tmp = @$GLOBALS['dbi']->affectedRows()) {
-                $total_affected_rows += $tmp;
-            }
-            unset($tmp);
-
-            $insert_id = $GLOBALS['dbi']->insertId();
-            if ($insert_id != 0) {
-                // insert_id is id of FIRST record inserted in one insert, so if we
-                // inserted multiple rows, we had to increment this
-
-                if ($total_affected_rows > 0) {
-                    $insert_id = $insert_id + $total_affected_rows - 1;
-                }
-                $last_message = Message::notice(__('Inserted row id: %1$d'));
-                $last_message->addParam($insert_id);
-                $last_messages[] = $last_message;
-            }
-            $GLOBALS['dbi']->freeResult($result);
-        }
-        $warning_messages = PMA_getWarningMessages();
-    }
-    return array(
-        $url_params,
-        $total_affected_rows,
-        $last_messages,
-        $warning_messages,
-        $error_messages,
-        $return_to_sql_query
-    );
-}
-
-/**
- * get the warning messages array
- *
- * @return array  $warning_essages
- */
-function PMA_getWarningMessages()
-{
-    $warning_essages = array();
-    foreach ($GLOBALS['dbi']->getWarnings() as $warning) {
-        $warning_essages[] = Message::sanitize(
-            $warning['Level'] . ': #' . $warning['Code'] . ' ' . $warning['Message']
-        );
-    }
-    return $warning_essages;
-}
-
-/**
- * Column to display from the foreign table?
- *
- * @param string $where_comparison string that contain relation field value
- * @param array  $map              all Relations to foreign tables for a given
- *                                 table or optionally a given column in a table
- * @param string $relation_field   relation field
- *
- * @return string $dispval display value from the foreign table
- */
-function PMA_getDisplayValueForForeignTableColumn($where_comparison,
-    $map, $relation_field
-) {
-    $foreigner = PMA_searchColumnInForeigners($map, $relation_field);
-    $display_field = PMA_getDisplayField(
-        $foreigner['foreign_db'],
-        $foreigner['foreign_table']
-    );
-    // Field to display from the foreign table?
-    if (isset($display_field) && mb_strlen($display_field)) {
-        $dispsql = 'SELECT ' . PMA\libraries\Util::backquote($display_field)
-            . ' FROM ' . PMA\libraries\Util::backquote($foreigner['foreign_db'])
-            . '.' . PMA\libraries\Util::backquote($foreigner['foreign_table'])
-            . ' WHERE ' . PMA\libraries\Util::backquote($foreigner['foreign_field'])
-            . $where_comparison;
-        $dispresult  = $GLOBALS['dbi']->tryQuery(
-            $dispsql, null, PMA\libraries\DatabaseInterface::QUERY_STORE
-        );
-        if ($dispresult && $GLOBALS['dbi']->numRows($dispresult) > 0) {
-            list($dispval) = $GLOBALS['dbi']->fetchRow($dispresult, 0);
-        } else {
-            $dispval = '';
-        }
-        if ($dispresult) {
-            $GLOBALS['dbi']->freeResult($dispresult);
-        }
-        return $dispval;
-    }
-    return '';
-}
-
-/**
- * Display option in the cell according to user choices
- *
- * @param array  $map                  all Relations to foreign tables for a given
- *                                     table or optionally a given column in a table
- * @param string $relation_field       relation field
- * @param string $where_comparison     string that contain relation field value
- * @param string $dispval              display value from the foreign table
- * @param string $relation_field_value relation field value
- *
- * @return string $output HTML <a> tag
- */
-function PMA_getLinkForRelationalDisplayField($map, $relation_field,
-    $where_comparison, $dispval, $relation_field_value
-) {
-    $foreigner = PMA_searchColumnInForeigners($map, $relation_field);
-    if ('K' == $_SESSION['tmpval']['relational_display']) {
-        // user chose "relational key" in the display options, so
-        // the title contains the display field
-        $title = (! empty($dispval))
-            ? ' title="' . htmlspecialchars($dispval) . '"'
-            : '';
-    } else {
-        $title = ' title="' . htmlspecialchars($relation_field_value) . '"';
-    }
-    $_url_params = array(
-        'db'    => $foreigner['foreign_db'],
-        'table' => $foreigner['foreign_table'],
-        'pos'   => '0',
-        'sql_query' => 'SELECT * FROM '
-            . PMA\libraries\Util::backquote($foreigner['foreign_db'])
-            . '.' . PMA\libraries\Util::backquote($foreigner['foreign_table'])
-            . ' WHERE ' . PMA\libraries\Util::backquote($foreigner['foreign_field'])
-            . $where_comparison
-    );
-    $output = '<a href="sql.php'
-        . PMA_URL_getCommon($_url_params) . '"' . $title . '>';
-
-    if ('D' == $_SESSION['tmpval']['relational_display']) {
-        // user chose "relational display field" in the
-        // display options, so show display field in the cell
-        $output .= (!empty($dispval)) ? htmlspecialchars($dispval) : '';
-    } else {
-        // otherwise display data in the cell
-        $output .= htmlspecialchars($relation_field_value);
-    }
-    $output .= '</a>';
-    return $output;
-}
-
-/**
- * Transform edited values
- *
- * @param string $db             db name
- * @param string $table          table name
- * @param array  $transformation mimetypes for all columns of a table
- *                               [field_name][field_key]
- * @param array  &$edited_values transform columns list and new values
- * @param string $file           file containing the transformation plugin
- * @param string $column_name    column name
- * @param array  $extra_data     extra data array
- * @param string $type           the type of transformation
- *
- * @return array $extra_data
- */
-function PMA_transformEditedValues($db, $table,
-    $transformation, &$edited_values, $file, $column_name, $extra_data, $type
-) {
-    $include_file = 'libraries/plugins/transformations/' . $file;
-    if (is_file($include_file)) {
-        include_once $include_file;
-        $_url_params = array(
-            'db'            => $db,
-            'table'         => $table,
-            'where_clause'  => $_REQUEST['where_clause'],
-            'transform_key' => $column_name
-        );
-        $transform_options  = PMA_Transformation_getOptions(
-            isset($transformation[$type . '_options'])
-            ? $transformation[$type . '_options']
-            : ''
-        );
-        $transform_options['wrapper_link']
-            = PMA_URL_getCommon($_url_params);
-        $class_name = PMA_getTransformationClassName($include_file);
-        /** @var TransformationsPlugin $transformation_plugin */
-        $transformation_plugin = new $class_name();
-
-        foreach ($edited_values as $cell_index => $curr_cell_edited_values) {
-            if (isset($curr_cell_edited_values[$column_name])) {
-                $edited_values[$cell_index][$column_name]
-                    = $extra_data['transformations'][$cell_index]
-                        = $transformation_plugin->applyTransformation(
-                            $curr_cell_edited_values[$column_name],
-                            $transform_options,
-                            ''
-                        );
-            }
-        }   // end of loop for each transformation cell
-    }
-    return $extra_data;
-}
-
-/**
- * Get current value in multi edit mode
- *
- * @param array  $multi_edit_funcs        multiple edit functions array
- * @param array  $multi_edit_salt         multiple edit array with encryption salt
- * @param array  $gis_from_text_functions array that contains gis from text functions
- * @param string $current_value           current value in the column
- * @param array  $gis_from_wkb_functions  initially $val is $multi_edit_columns[$key]
- * @param array  $func_optional_param     array('RAND','UNIX_TIMESTAMP')
- * @param array  $func_no_param           array of set of string
- * @param string $key                     an md5 of the column name
- *
- * @return array $cur_value
- */
-function PMA_getCurrentValueAsAnArrayForMultipleEdit( $multi_edit_funcs,
-    $multi_edit_salt,
-    $gis_from_text_functions, $current_value, $gis_from_wkb_functions,
-    $func_optional_param, $func_no_param, $key
-) {
-    if (empty($multi_edit_funcs[$key])) {
-        return $current_value;
-    } elseif ('UUID' === $multi_edit_funcs[$key]) {
-        /* This way user will know what UUID new row has */
-        $uuid = $GLOBALS['dbi']->fetchValue('SELECT UUID()');
-        return "'" . $uuid . "'";
-    } elseif ((in_array($multi_edit_funcs[$key], $gis_from_text_functions)
-        && substr($current_value, 0, 3) == "'''")
-        || in_array($multi_edit_funcs[$key], $gis_from_wkb_functions)
-    ) {
-        // Remove enclosing apostrophes
-        $current_value = mb_substr($current_value, 1, -1);
-        // Remove escaping apostrophes
-        $current_value = str_replace("''", "'", $current_value);
-        return $multi_edit_funcs[$key] . '(' . $current_value . ')';
-    } elseif (! in_array($multi_edit_funcs[$key], $func_no_param)
-        || ($current_value != "''"
-        && in_array($multi_edit_funcs[$key], $func_optional_param))
-    ) {
-        if ((isset($multi_edit_salt[$key])
-            && ($multi_edit_funcs[$key] == "AES_ENCRYPT"
-            || $multi_edit_funcs[$key] == "AES_DECRYPT"))
-            || (! empty($multi_edit_salt[$key])
-            && ($multi_edit_funcs[$key] == "DES_ENCRYPT"
-            || $multi_edit_funcs[$key] == "DES_DECRYPT"
-            || $multi_edit_funcs[$key] == "ENCRYPT"))
-        ) {
-            return $multi_edit_funcs[$key] . '(' . $current_value . ",'"
-                . $GLOBALS['dbi']->escapeString($multi_edit_salt[$key]) . "')";
-        } else {
-            return $multi_edit_funcs[$key] . '(' . $current_value . ')';
-        }
-    } else {
-        return $multi_edit_funcs[$key] . '()';
-    }
-}
-
-/**
- * Get query values array and query fields array for insert and update in multi edit
- *
- * @param array   $multi_edit_columns_name      multiple edit columns name array
- * @param array   $multi_edit_columns_null      multiple edit columns null array
- * @param string  $current_value                current value in the column in loop
- * @param array   $multi_edit_columns_prev      multiple edit previous columns array
- * @param array   $multi_edit_funcs             multiple edit functions array
- * @param boolean $is_insert                    boolean value whether insert or not
- * @param array   $query_values                 SET part of the sql query
- * @param array   $query_fields                 array of query fields
- * @param string  $current_value_as_an_array    current value in the column
- *                                              as an array
- * @param array   $value_sets                   array of valu sets
- * @param string  $key                          an md5 of the column name
- * @param array   $multi_edit_columns_null_prev array of multiple edit columns
- *                                              null previous
- *
- * @return array ($query_values, $query_fields)
- */
-function PMA_getQueryValuesForInsertAndUpdateInMultipleEdit($multi_edit_columns_name,
-    $multi_edit_columns_null, $current_value, $multi_edit_columns_prev,
-    $multi_edit_funcs,$is_insert, $query_values, $query_fields,
-    $current_value_as_an_array, $value_sets, $key, $multi_edit_columns_null_prev
-) {
-    //  i n s e r t
-    if ($is_insert) {
-        // no need to add column into the valuelist
-        if (mb_strlen($current_value_as_an_array)) {
-            $query_values[] = $current_value_as_an_array;
-            // first inserted row so prepare the list of fields
-            if (empty($value_sets)) {
-                $query_fields[] = PMA\libraries\Util::backquote(
-                    $multi_edit_columns_name[$key]
-                );
-            }
-        }
-
-    } elseif (! empty($multi_edit_columns_null_prev[$key])
-        && ! isset($multi_edit_columns_null[$key])
-    ) {
-        //  u p d a t e
-
-        // field had the null checkbox before the update
-        // field no longer has the null checkbox
-        $query_values[]
-            = PMA\libraries\Util::backquote($multi_edit_columns_name[$key])
-            . ' = ' . $current_value_as_an_array;
-    } elseif (empty($multi_edit_funcs[$key])
-        && isset($multi_edit_columns_prev[$key])
-        && (("'" . $GLOBALS['dbi']->escapeString($multi_edit_columns_prev[$key]) . "'" === $current_value)
-        || ('0x' . $multi_edit_columns_prev[$key] === $current_value))
-    ) {
-        // No change for this column and no MySQL function is used -> next column
-    } elseif (! empty($current_value)) {
-        // avoid setting a field to NULL when it's already NULL
-        // (field had the null checkbox before the update
-        //  field still has the null checkbox)
-        if (empty($multi_edit_columns_null_prev[$key])
-            || empty($multi_edit_columns_null[$key])
-        ) {
-             $query_values[]
-                 = PMA\libraries\Util::backquote($multi_edit_columns_name[$key])
-                . ' = ' . $current_value_as_an_array;
-        }
-    }
-    return array($query_values, $query_fields);
-}
-
-/**
- * Get the current column value in the form for different data types
- *
- * @param string|false $possibly_uploaded_val        uploaded file content
- * @param string       $key                          an md5 of the column name
- * @param array        $multi_edit_columns_type      array of multi edit column types
- * @param string       $current_value                current column value in the form
- * @param array        $multi_edit_auto_increment    multi edit auto increment
- * @param integer      $rownumber                    index of where clause array
- * @param array        $multi_edit_columns_name      multi edit column names array
- * @param array        $multi_edit_columns_null      multi edit columns null array
- * @param array        $multi_edit_columns_null_prev multi edit columns previous null
- * @param boolean      $is_insert                    whether insert or not
- * @param boolean      $using_key                    whether editing or new row
- * @param string       $where_clause                 where clause
- * @param string       $table                        table name
- * @param array        $multi_edit_funcs             multiple edit functions array
- *
- * @return string $current_value  current column value in the form
- */
-function PMA_getCurrentValueForDifferentTypes($possibly_uploaded_val, $key,
-    $multi_edit_columns_type, $current_value, $multi_edit_auto_increment,
-    $rownumber, $multi_edit_columns_name, $multi_edit_columns_null,
-    $multi_edit_columns_null_prev, $is_insert, $using_key, $where_clause, $table,
-    $multi_edit_funcs
-) {
-    // Fetch the current values of a row to use in case we have a protected field
-    if ($is_insert
-        && $using_key && isset($multi_edit_columns_type)
-        && is_array($multi_edit_columns_type) && !empty($where_clause)
-    ) {
-        $protected_row = $GLOBALS['dbi']->fetchSingleRow(
-            'SELECT * FROM ' . PMA\libraries\Util::backquote($table)
-            . ' WHERE ' . $where_clause . ';'
-        );
-    }
-
-    if (false !== $possibly_uploaded_val) {
-        $current_value = $possibly_uploaded_val;
-    } else if (! empty($multi_edit_funcs[$key])) {
-        $current_value = "'" . $GLOBALS['dbi']->escapeString($current_value)
-            . "'";
-    } else {
-        // c o l u m n    v a l u e    i n    t h e    f o r m
-        if (isset($multi_edit_columns_type[$key])) {
-            $type = $multi_edit_columns_type[$key];
-        } else {
-            $type = '';
-        }
-
-        if ($type != 'protected' && $type != 'set'
-            && 0 === mb_strlen($current_value)
-        ) {
-            // best way to avoid problems in strict mode
-            // (works also in non-strict mode)
-            if (isset($multi_edit_auto_increment)
-                && isset($multi_edit_auto_increment[$key])
-            ) {
-                $current_value = 'NULL';
-            } else {
-                $current_value = "''";
-            }
-        } elseif ($type == 'set') {
-            if (! empty($_REQUEST['fields']['multi_edit'][$rownumber][$key])) {
-                $current_value = implode(
-                    ',', $_REQUEST['fields']['multi_edit'][$rownumber][$key]
-                );
-                $current_value = "'"
-                    . $GLOBALS['dbi']->escapeString($current_value) . "'";
-            } else {
-                 $current_value = "''";
-            }
-        } elseif ($type == 'protected') {
-            // here we are in protected mode (asked in the config)
-            // so tbl_change has put this special value in the
-            // columns array, so we do not change the column value
-            // but we can still handle column upload
-
-            // when in UPDATE mode, do not alter field's contents. When in INSERT
-            // mode, insert empty field because no values were submitted.
-            // If protected blobs where set, insert original fields content.
-            if (! empty($protected_row[$multi_edit_columns_name[$key]])) {
-                $current_value = '0x'
-                    . bin2hex($protected_row[$multi_edit_columns_name[$key]]);
-            } else {
-                $current_value = '';
-            }
-        } elseif ($type === 'hex') {
-            $current_value = '0x' . $current_value;
-        } elseif ($type == 'bit') {
-            $current_value = preg_replace('/[^01]/', '0', $current_value);
-            $current_value = "b'" . $GLOBALS['dbi']->escapeString($current_value)
-                . "'";
-        } elseif (! ($type == 'datetime' || $type == 'timestamp')
-            || $current_value != 'CURRENT_TIMESTAMP'
-        ) {
-            $current_value = "'" . $GLOBALS['dbi']->escapeString($current_value)
-                . "'";
-        }
-
-        // Was the Null checkbox checked for this field?
-        // (if there is a value, we ignore the Null checkbox: this could
-        // be possible if Javascript is disabled in the browser)
-        if (! empty($multi_edit_columns_null[$key])
-            && ($current_value == "''" || $current_value == '')
-        ) {
-            $current_value = 'NULL';
-        }
-
-        // The Null checkbox was unchecked for this field
-        if (empty($current_value)
-            && ! empty($multi_edit_columns_null_prev[$key])
-            && ! isset($multi_edit_columns_null[$key])
-        ) {
-            $current_value = "''";
-        }
-    }  // end else (column value in the form)
-    return $current_value;
-}
-
-
-/**
- * Check whether inline edited value can be truncated or not,
- * and add additional parameters for extra_data array  if needed
- *
- * @param string $db          Database name
- * @param string $table       Table name
- * @param string $column_name Column name
- * @param array  &$extra_data Extra data for ajax response
- *
- * @return void
- */
-function PMA_verifyWhetherValueCanBeTruncatedAndAppendExtraData(
-    $db, $table, $column_name, &$extra_data
-) {
-
-    $extra_data['isNeedToRecheck'] = false;
-
-    $sql_for_real_value = 'SELECT ' . PMA\libraries\Util::backquote($table) . '.'
-        . PMA\libraries\Util::backquote($column_name)
-        . ' FROM ' . PMA\libraries\Util::backquote($db) . '.'
-        . PMA\libraries\Util::backquote($table)
-        . ' WHERE ' . $_REQUEST['where_clause'][0];
-
-    $result = $GLOBALS['dbi']->tryQuery($sql_for_real_value);
-    $fields_meta = $GLOBALS['dbi']->getFieldsMeta($result);
-    $meta = $fields_meta[0];
-    if ($row = $GLOBALS['dbi']->fetchRow($result)) {
-        $new_value = $row[0];
-        if ((substr($meta->type, 0, 9) == 'timestamp')
-            || ($meta->type == 'datetime')
-            || ($meta->type == 'time')
-        ) {
-            $new_value = PMA\libraries\Util::addMicroseconds($new_value);
-        }
-        $extra_data['isNeedToRecheck'] = true;
-        $extra_data['truncatableFieldValue'] = $new_value;
-    }
-    $GLOBALS['dbi']->freeResult($result);
-}
-
-/**
- * Function to get the columns of a table
- *
- * @param string $db    current db
- * @param string $table current table
- *
- * @return array
- */
-function PMA_getTableColumns($db, $table)
-{
-    $GLOBALS['dbi']->selectDb($db);
-    return array_values($GLOBALS['dbi']->getColumns($db, $table, null, true));
-
-}
-
-/**
- * Function to determine Insert/Edit rows
- *
- * @param string $where_clause where clause
- * @param string $db           current database
- * @param string $table        current table
- *
- * @return mixed
- */
-function PMA_determineInsertOrEdit($where_clause, $db, $table)
-{
-    if (isset($_REQUEST['where_clause'])) {
-        $where_clause = $_REQUEST['where_clause'];
-    }
-    if (isset($_SESSION['edit_next'])) {
-        $where_clause = $_SESSION['edit_next'];
-        unset($_SESSION['edit_next']);
-        $after_insert = 'edit_next';
-    }
-    if (isset($_REQUEST['ShowFunctionFields'])) {
-        $GLOBALS['cfg']['ShowFunctionFields'] = $_REQUEST['ShowFunctionFields'];
-    }
-    if (isset($_REQUEST['ShowFieldTypesInDataEditView'])) {
-        $GLOBALS['cfg']['ShowFieldTypesInDataEditView']
-            = $_REQUEST['ShowFieldTypesInDataEditView'];
-    }
-    if (isset($_REQUEST['after_insert'])) {
-        $after_insert = $_REQUEST['after_insert'];
-    }
-
-    if (isset($where_clause)) {
-        // we are editing
-        $insert_mode = false;
-        $where_clause_array = PMA_getWhereClauseArray($where_clause);
-        list($where_clauses, $result, $rows, $found_unique_key)
-            = PMA_analyzeWhereClauses(
-                $where_clause_array, $table, $db
-            );
-    } else {
-        // we are inserting
-        $insert_mode = true;
-        $where_clause = null;
-        list($result, $rows) = PMA_loadFirstRow($table, $db);
-        $where_clauses = null;
-        $where_clause_array = array();
-        $found_unique_key = false;
-    }
-
-    // Copying a row - fetched data will be inserted as a new row,
-    // therefore the where clause is needless.
-    if (isset($_REQUEST['default_action'])
-        && $_REQUEST['default_action'] === 'insert'
-    ) {
-        $where_clause = $where_clauses = null;
-    }
-
-    return array(
-        $insert_mode, $where_clause, $where_clause_array, $where_clauses,
-        $result, $rows, $found_unique_key,
-        isset($after_insert) ? $after_insert : null
-    );
-}
-
-/**
- * Function to get comments for the table columns
- *
- * @param string $db    current database
- * @param string $table current table
- *
- * @return array $comments_map comments for columns
- */
-function PMA_getCommentsMap($db, $table)
-{
-    $comments_map = array();
-
-    if ($GLOBALS['cfg']['ShowPropertyComments']) {
-        $comments_map = PMA_getComments($db, $table);
-    }
-
-    return $comments_map;
-}
-
-/**
- * Function to get URL parameters
- *
- * @param string $db    current database
- * @param string $table current table
- *
- * @return array $url_params url parameters
- */
-function PMA_getUrlParameters($db, $table)
-{
-    /**
-     * @todo check if we could replace by "db_|tbl_" - please clarify!?
-     */
-    $url_params = array(
-        'db' => $db,
-        'sql_query' => $_REQUEST['sql_query']
-    );
-
-    if (preg_match('@^tbl_@', $GLOBALS['goto'])) {
-        $url_params['table'] = $table;
-    }
-
-    return $url_params;
-}
-
-/**
- * Function to get html for the gis editor div
- *
- * @return string
- */
-function PMA_getHtmlForGisEditor()
-{
-    return '<div id="gis_editor"></div>'
-        . '<div id="popup_background"></div>'
-        . '<br />';
-}
-
-/**
- * Function to get html for the ignore option in insert mode
- *
- * @param int  $row_id  row id
- * @param bool $checked ignore option is checked or not
- *
- * @return string
- */
-function PMA_getHtmlForIgnoreOption($row_id, $checked = true)
-{
-    return '<input type="checkbox"'
-            . ($checked ? ' checked="checked"' : '')
-            . ' name="insert_ignore_' . $row_id . '"'
-            . ' id="insert_ignore_' . $row_id . '" />'
-            . '<label for="insert_ignore_' . $row_id . '">'
-            . __('Ignore')
-            . '</label><br />' . "\n";
-}
-
-/**
- * Function to get html for the function option
- *
- * @param bool   $odd_row              whether odd row or not
- * @param array  $column               column
- * @param string $column_name_appendix column name appendix
- *
- * @return String
- */
-function PMA_getHtmlForFunctionOption($odd_row, $column, $column_name_appendix)
-{
-    $longDoubleTextArea = $GLOBALS['cfg']['LongtextDoubleTextarea'];
-    return '<tr class="noclick ' . ($odd_row ? 'odd' : 'even' ) . '">'
-        . '<td '
-        . ($longDoubleTextArea
-            && mb_strstr($column['True_Type'], 'longtext')
-            ? 'rowspan="2"'
-            : ''
-        )
-        . 'class="center">'
-        . $column['Field_title']
-        . '<input type="hidden" name="fields_name' . $column_name_appendix
-        . '" value="' . $column['Field_html'] . '"/>'
-        . '</td>';
-
-}
-
-/**
- * Function to get html for the column type
- *
- * @param array $column column
- *
- * @return string
- */
-function PMA_getHtmlForInsertEditColumnType($column)
-{
-    return '<td class="center' . $column['wrap'] . '">'
-        . '<span class="column_type" dir="ltr">' . $column['pma_type'] . '</span>'
-        . '</td>';
-
-}
-
-/**
- * Function to get html for the insert edit form header
- *
- * @param bool $has_blob_field whether has blob field
- * @param bool $is_upload      whether is upload
- *
- * @return string
- */
-function PMA_getHtmlForInsertEditFormHeader($has_blob_field, $is_upload)
-{
-    $html_output ='<form id="insertForm" class="lock-page ';
-    if ($has_blob_field && $is_upload) {
-        $html_output .='disableAjax';
-    }
-    $html_output .='" method="post" action="tbl_replace.php" name="insertForm" ';
-    if ($is_upload) {
-        $html_output .= ' enctype="multipart/form-data"';
-    }
-    $html_output .= '>';
-
-    return $html_output;
-}
-
-/**
- * Function to get html for each insert/edit column
- *
- * @param array  $table_columns         table columns
- * @param int    $column_number         column index in table_columns
- * @param array  $comments_map          comments map
- * @param bool   $timestamp_seen        whether timestamp seen
- * @param array  $current_result        current result
- * @param string $chg_evt_handler       javascript change event handler
- * @param string $jsvkey                javascript validation key
- * @param string $vkey                  validation key
- * @param bool   $insert_mode           whether insert mode
- * @param array  $current_row           current row
- * @param bool   $odd_row               whether odd row
- * @param int    &$o_rows               row offset
- * @param int    &$tabindex             tab index
- * @param int    $columns_cnt           columns count
- * @param bool   $is_upload             whether upload
- * @param int    $tabindex_for_function tab index offset for function
- * @param array  $foreigners            foreigners
- * @param int    $tabindex_for_null     tab index offset for null
- * @param int    $tabindex_for_value    tab index offset for value
- * @param string $table                 table
- * @param string $db                    database
- * @param int    $row_id                row id
- * @param array  $titles                titles
- * @param int    $biggest_max_file_size biggest max file size
- * @param string $default_char_editing  default char editing mode which is stored
- *                                      in the config.inc.php script
- * @param string $text_dir              text direction
- * @param array  $repopulate            the data to be repopulated
- * @param array  $column_mime           the mime information of column
- * @param string $where_clause          the where clause
- *
- * @return string
- */
-function PMA_getHtmlForInsertEditFormColumn($table_columns, $column_number,
-    $comments_map, $timestamp_seen, $current_result, $chg_evt_handler,
-    $jsvkey, $vkey, $insert_mode, $current_row, $odd_row, &$o_rows,
-    &$tabindex, $columns_cnt, $is_upload, $tabindex_for_function,
-    $foreigners, $tabindex_for_null, $tabindex_for_value, $table, $db,
-    $row_id, $titles, $biggest_max_file_size, $default_char_editing,
-    $text_dir, $repopulate, $column_mime, $where_clause
-) {
-    $column = $table_columns[$column_number];
-    $readOnly = false;
-    if (! PMA_userHasColumnPrivileges($column, $insert_mode)) {
-        $readOnly = true;
-    }
-
-    if (! isset($column['processed'])) {
-        $column = PMA_analyzeTableColumnsArray(
-            $column, $comments_map, $timestamp_seen
-        );
-    }
-    $as_is = false;
-    if (!empty($repopulate) && !empty($current_row)) {
-        $current_row[$column['Field']] = $repopulate[$column['Field_md5']];
-        $as_is = true;
-    }
-
-    $extracted_columnspec
-        = PMA\libraries\Util::extractColumnSpec($column['Type']);
-
-    if (-1 === $column['len']) {
-        $column['len'] = $GLOBALS['dbi']->fieldLen(
-            $current_result, $column_number
-        );
-        // length is unknown for geometry fields,
-        // make enough space to edit very simple WKTs
-        if (-1 === $column['len']) {
-            $column['len'] = 30;
-        }
-    }
-    //Call validation when the form submitted...
-    $onChangeClause = $chg_evt_handler
-        . "=\"return verificationsAfterFieldChange('"
-        . PMA_escapeJsString($column['Field_md5']) . "', '"
-        . PMA_escapeJsString($jsvkey) . "','" . $column['pma_type'] . "')\"";
-
-    // Use an MD5 as an array index to avoid having special characters
-    // in the name attribute (see bug #1746964 )
-    $column_name_appendix = $vkey . '[' . $column['Field_md5'] . ']';
-
-    if ($column['Type'] === 'datetime'
-        && ! isset($column['Default'])
-        && ! is_null($column['Default'])
-        && $insert_mode
-    ) {
-        $column['Default'] = date('Y-m-d H:i:s', time());
-    }
-
-    $html_output = PMA_getHtmlForFunctionOption(
-        $odd_row, $column, $column_name_appendix
-    );
-
-    if ($GLOBALS['cfg']['ShowFieldTypesInDataEditView']) {
-        $html_output .= PMA_getHtmlForInsertEditColumnType($column);
-    } //End if
-
-    // Get a list of GIS data types.
-    $gis_data_types = PMA\libraries\Util::getGISDatatypes();
-
-    // Prepares the field value
-    $real_null_value = false;
-    $special_chars_encoded = '';
-    if (!empty($current_row)) {
-        // (we are editing)
-        list(
-            $real_null_value, $special_chars_encoded, $special_chars,
-            $data, $backup_field
-        )
-            = PMA_getSpecialCharsAndBackupFieldForExistingRow(
-                $current_row, $column, $extracted_columnspec,
-                $real_null_value, $gis_data_types, $column_name_appendix, $as_is
-            );
-    } else {
-        // (we are inserting)
-        // display default values
-        $tmp = $column;
-        if (isset($repopulate[$column['Field_md5']])) {
-            $tmp['Default'] = $repopulate[$column['Field_md5']];
-        }
-        list($real_null_value, $data, $special_chars, $backup_field,
-            $special_chars_encoded
-        )
-            = PMA_getSpecialCharsAndBackupFieldForInsertingMode(
-                $tmp, $real_null_value
-            );
-        unset($tmp);
-    }
-
-    $idindex = ($o_rows * $columns_cnt) + $column_number + 1;
-    $tabindex = $idindex;
-
-    // Get a list of data types that are not yet supported.
-    $no_support_types = PMA\libraries\Util::unsupportedDatatypes();
-
-    // The function column
-    // -------------------
-    $foreignData = PMA_getForeignData(
-        $foreigners, $column['Field'], false, '', ''
-    );
-    if ($GLOBALS['cfg']['ShowFunctionFields']) {
-        $html_output .= PMA_getFunctionColumn(
-            $column, $is_upload, $column_name_appendix,
-            $onChangeClause, $no_support_types, $tabindex_for_function,
-            $tabindex, $idindex, $insert_mode, $readOnly, $foreignData
-        );
-    }
-
-    // The null column
-    // ---------------
-    $html_output .= PMA_getNullColumn(
-        $column, $column_name_appendix, $real_null_value,
-        $tabindex, $tabindex_for_null, $idindex, $vkey, $foreigners,
-        $foreignData, $readOnly
-    );
-
-    // The value column (depends on type)
-    // ----------------
-    // See bug #1667887 for the reason why we don't use the maxlength
-    // HTML attribute
-
-    //add data attributes "no of decimals" and "data type"
-    $no_decimals = 0;
-    $type = current(explode("(", $column['pma_type']));
-    if (preg_match('/\(([^()]+)\)/', $column['pma_type'], $match)) {
-        $match[0] = trim($match[0], '()');
-        $no_decimals = $match[0];
-    }
-    $html_output .= '<td' . ' data-type="' . $type . '"' . ' data-decimals="'
-        . $no_decimals . '">' . "\n";
-    // Will be used by js/tbl_change.js to set the default value
-    // for the "Continue insertion" feature
-    $html_output .= '<span class="default_value hide">'
-        . $special_chars . '</span>';
-
-    // Check input transformation of column
-    $transformed_html = '';
-    if (!empty($column_mime['input_transformation'])) {
-        $file = $column_mime['input_transformation'];
-        $include_file = 'libraries/plugins/transformations/' . $file;
-        if (is_file($include_file)) {
-            include_once $include_file;
-            $class_name = PMA_getTransformationClassName($include_file);
-            $transformation_plugin = new $class_name();
-            $transformation_options = PMA_Transformation_getOptions(
-                $column_mime['input_transformation_options']
-            );
-            $_url_params = array(
-                'db'            => $db,
-                'table'         => $table,
-                'transform_key' => $column['Field'],
-                'where_clause'  => $where_clause
-            );
-            $transformation_options['wrapper_link']
-                = PMA_URL_getCommon($_url_params);
-            $current_value = '';
-            if (isset($current_row[$column['Field']])) {
-                $current_value = $current_row[$column['Field']];
-            }
-            if (method_exists($transformation_plugin, 'getInputHtml')) {
-                $transformed_html = $transformation_plugin->getInputHtml(
-                    $column, $row_id, $column_name_appendix,
-                    $transformation_options, $current_value, $text_dir,
-                    $tabindex, $tabindex_for_value, $idindex
-                );
-            }
-            if (method_exists($transformation_plugin, 'getScripts')) {
-                $GLOBALS['plugin_scripts'] = array_merge(
-                    $GLOBALS['plugin_scripts'], $transformation_plugin->getScripts()
-                );
-            }
-        }
-    }
-    if (!empty($transformed_html)) {
-        $html_output .= $transformed_html;
-    } else {
-        $html_output .= PMA_getValueColumn(
-            $column, $backup_field, $column_name_appendix, $onChangeClause,
-            $tabindex, $tabindex_for_value, $idindex, $data, $special_chars,
-            $foreignData, $odd_row, array($table, $db), $row_id, $titles,
-            $text_dir, $special_chars_encoded, $vkey, $is_upload,
-            $biggest_max_file_size, $default_char_editing,
-            $no_support_types, $gis_data_types, $extracted_columnspec, $readOnly
-        );
-    }
-    $html_output .= '</td>'
-        . '</tr>';
-
-    return $html_output;
-}
-
-/**
- * Function to get html for each insert/edit row
- *
- * @param array  $url_params            url parameters
- * @param array  $table_columns         table columns
- * @param array  $comments_map          comments map
- * @param bool   $timestamp_seen        whether timestamp seen
- * @param array  $current_result        current result
- * @param string $chg_evt_handler       javascript change event handler
- * @param string $jsvkey                javascript validation key
- * @param string $vkey                  validation key
- * @param bool   $insert_mode           whether insert mode
- * @param array  $current_row           current row
- * @param int    &$o_rows               row offset
- * @param int    &$tabindex             tab index
- * @param int    $columns_cnt           columns count
- * @param bool   $is_upload             whether upload
- * @param int    $tabindex_for_function tab index offset for function
- * @param array  $foreigners            foreigners
- * @param int    $tabindex_for_null     tab index offset for null
- * @param int    $tabindex_for_value    tab index offset for value
- * @param string $table                 table
- * @param string $db                    database
- * @param int    $row_id                row id
- * @param array  $titles                titles
- * @param int    $biggest_max_file_size biggest max file size
- * @param string $text_dir              text direction
- * @param array  $repopulate            the data to be repopulated
- * @param array  $where_clause_array    the array of where clauses
- *
- * @return string
- */
-function PMA_getHtmlForInsertEditRow($url_params, $table_columns,
-    $comments_map, $timestamp_seen, $current_result, $chg_evt_handler,
-    $jsvkey, $vkey, $insert_mode, $current_row, &$o_rows, &$tabindex, $columns_cnt,
-    $is_upload, $tabindex_for_function, $foreigners, $tabindex_for_null,
-    $tabindex_for_value, $table, $db, $row_id, $titles,
-    $biggest_max_file_size, $text_dir, $repopulate, $where_clause_array
-) {
-    $html_output = PMA_getHeadAndFootOfInsertRowTable($url_params)
-        . '<tbody>';
-
-    //store the default value for CharEditing
-    $default_char_editing  = $GLOBALS['cfg']['CharEditing'];
-    $mime_map = PMA_getMIME($db, $table);
-    $odd_row = true;
-    $where_clause = '';
-    if (isset($where_clause_array[$row_id])) {
-        $where_clause = $where_clause_array[$row_id];
-    }
-    for ($column_number = 0; $column_number < $columns_cnt; $column_number++) {
-        $table_column = $table_columns[$column_number];
-        $column_mime = array();
-        if (isset($mime_map[$table_column['Field']])) {
-            $column_mime = $mime_map[$table_column['Field']];
-        }
-        $html_output .= PMA_getHtmlForInsertEditFormColumn(
-            $table_columns, $column_number, $comments_map, $timestamp_seen,
-            $current_result, $chg_evt_handler, $jsvkey, $vkey, $insert_mode,
-            $current_row, $odd_row, $o_rows, $tabindex, $columns_cnt, $is_upload,
-            $tabindex_for_function, $foreigners, $tabindex_for_null,
-            $tabindex_for_value, $table, $db, $row_id, $titles,
-            $biggest_max_file_size, $default_char_editing, $text_dir, $repopulate,
-            $column_mime, $where_clause
-        );
-        $odd_row = !$odd_row;
-    } // end for
-    $o_rows++;
-    $html_output .= '  </tbody>'
-        . '</table><br />'
-        . '<div class="clearfloat"></div>';
-
-    return $html_output;
-}
-
-/**
- * Returns whether the user has necessary insert/update privileges for the column
- *
- * @param array $table_column array of column details
- * @param bool  $insert_mode  whether on insert mode
- *
- * @return boolean whether user has necessary privileges
- */
-function PMA_userHasColumnPrivileges($table_column, $insert_mode)
-{
-    $privileges = $table_column['Privileges'];
-    return ($insert_mode && strstr($privileges, 'insert') !== false)
-        || (! $insert_mode && strstr($privileges, 'update') !== false);
-}
diff --git a/#pma/libraries/ip_allow_deny.lib.php b/#pma/libraries/ip_allow_deny.lib.php
deleted file mode 100644
index cc74c16b..00000000
--- a/#pma/libraries/ip_allow_deny.lib.php
+++ /dev/null
@@ -1,351 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * This library is used with the server IP allow/deny host authentication
- * feature
- *
- * @package PhpMyAdmin
- */
-
-/**
- * Gets the "true" IP address of the current user
- *
- * @return string   the ip of the user
- *
- * @access  private
- */
-function PMA_getIp()
-{
-    /* Get the address of user */
-    if (empty($_SERVER['REMOTE_ADDR'])) {
-        /* We do not know remote IP */
-        return false;
-    }
-
-    $direct_ip = $_SERVER['REMOTE_ADDR'];
-
-    /* Do we trust this IP as a proxy? If yes we will use it's header. */
-    if (!isset($GLOBALS['cfg']['TrustedProxies'][$direct_ip])) {
-        /* Return true IP */
-        return $direct_ip;
-    }
-
-    /**
-     * Parse header in form:
-     * X-Forwarded-For: client, proxy1, proxy2
-     */
-    // Get header content
-    $value = PMA_getenv($GLOBALS['cfg']['TrustedProxies'][$direct_ip]);
-    // Grab first element what is client adddress
-    $value = explode(',', $value)[0];
-    // Extract IP address
-    // the $ checks that the header contains only one IP address,
-    // ?: makes sure the () don't capture
-    $matches = array();
-    $is_ip = preg_match(
-        '|^(?:[0-9]{1,3}\.){3,3}[0-9]{1,3}$|',
-        $value, $matches
-    );
-
-    if ($is_ip && (count($matches) == 1)) {
-        // True IP behind a proxy
-        return $matches[0];
-    }
-
-    // We could not parse header
-    return false;
-} // end of the 'PMA_getIp()' function
-
-
-/**
- * Matches for IPv4 or IPv6 addresses
- *
- * @param string $testRange string of IP range to match
- * @param string $ipToTest  string of IP to test against range
- *
- * @return boolean    whether the IP mask matches
- *
- * @access  public
- */
-function PMA_ipMaskTest($testRange, $ipToTest)
-{
-    if (mb_strpos($testRange, ':') > -1
-        || mb_strpos($ipToTest, ':') > -1
-    ) {
-        // assume IPv6
-        $result = PMA_ipv6MaskTest($testRange, $ipToTest);
-    } else {
-        $result = PMA_ipv4MaskTest($testRange, $ipToTest);
-    }
-
-    return $result;
-} // end of the "PMA_ipMaskTest()" function
-
-
-/**
- * Based on IP Pattern Matcher
- * Originally by J.Adams <jna@retina.net>
- * Found on <https://www.php.net/manual/en/function.ip2long.php>
- * Modified for phpMyAdmin
- *
- * Matches:
- * xxx.xxx.xxx.xxx        (exact)
- * xxx.xxx.xxx.[yyy-zzz]  (range)
- * xxx.xxx.xxx.xxx/nn     (CIDR)
- *
- * Does not match:
- * xxx.xxx.xxx.xx[yyy-zzz]  (range, partial octets not supported)
- *
- * @param string $testRange string of IP range to match
- * @param string $ipToTest  string of IP to test against range
- *
- * @return boolean    whether the IP mask matches
- *
- * @access  public
- */
-function PMA_ipv4MaskTest($testRange, $ipToTest)
-{
-    $result = true;
-    $match = preg_match(
-        '|([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)/([0-9]+)|',
-        $testRange,
-        $regs
-    );
-    if ($match) {
-        // performs a mask match
-        $ipl    = ip2long($ipToTest);
-        $rangel = ip2long(
-            $regs[1] . '.' . $regs[2] . '.' . $regs[3] . '.' . $regs[4]
-        );
-
-        $maskl  = 0;
-
-        for ($i = 0; $i < 31; $i++) {
-            if ($i < $regs[5] - 1) {
-                $maskl = $maskl + PMA\libraries\Util::pow(2, (30 - $i));
-            } // end if
-        } // end for
-
-        if (($maskl & $rangel) == ($maskl & $ipl)) {
-            return true;
-        }
-
-        return false;
-    }
-
-    // range based
-    $maskocts = explode('.', $testRange);
-    $ipocts   = explode('.', $ipToTest);
-
-    // perform a range match
-    for ($i = 0; $i < 4; $i++) {
-        if (preg_match('|\[([0-9]+)\-([0-9]+)\]|', $maskocts[$i], $regs)) {
-            if (($ipocts[$i] > $regs[2]) || ($ipocts[$i] < $regs[1])) {
-                $result = false;
-            } // end if
-        } else {
-            if ($maskocts[$i] <> $ipocts[$i]) {
-                $result = false;
-            } // end if
-        } // end if/else
-    } //end for
-
-    return $result;
-} // end of the "PMA_ipv4MaskTest()" function
-
-
-/**
- * IPv6 matcher
- * CIDR section taken from https://stackoverflow.com/a/10086404
- * Modified for phpMyAdmin
- *
- * Matches:
- * xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx
- * (exact)
- * xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:[yyyy-zzzz]
- * (range, only at end of IP - no subnets)
- * xxxx:xxxx:xxxx:xxxx/nn
- * (CIDR)
- *
- * Does not match:
- * xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xx[yyy-zzz]
- * (range, partial octets not supported)
- *
- * @param string $test_range string of IP range to match
- * @param string $ip_to_test string of IP to test against range
- *
- * @return boolean    whether the IP mask matches
- *
- * @access  public
- */
-function PMA_ipv6MaskTest($test_range, $ip_to_test)
-{
-    $result = true;
-
-    // convert to lowercase for easier comparison
-    $test_range = mb_strtolower($test_range);
-    $ip_to_test = mb_strtolower($ip_to_test);
-
-    $is_cidr = mb_strpos($test_range, '/') > -1;
-    $is_range = mb_strpos($test_range, '[') > -1;
-    $is_single = ! $is_cidr && ! $is_range;
-
-    $ip_hex = bin2hex(inet_pton($ip_to_test));
-
-    if ($is_single) {
-        $range_hex = bin2hex(inet_pton($test_range));
-        $result = hash_equals($ip_hex, $range_hex);
-        return $result;
-    }
-
-    if ($is_range) {
-        // what range do we operate on?
-        $range_match = array();
-        $match = preg_match(
-            '/\[([0-9a-f]+)\-([0-9a-f]+)\]/', $test_range, $range_match
-        );
-        if ($match) {
-            $range_start = $range_match[1];
-            $range_end   = $range_match[2];
-
-            // get the first and last allowed IPs
-            $first_ip  = str_replace($range_match[0], $range_start, $test_range);
-            $first_hex = bin2hex(inet_pton($first_ip));
-            $last_ip   = str_replace($range_match[0], $range_end, $test_range);
-            $last_hex  = bin2hex(inet_pton($last_ip));
-
-            // check if the IP to test is within the range
-            $result = ($ip_hex >= $first_hex && $ip_hex <= $last_hex);
-        }
-        return $result;
-    }
-
-    if ($is_cidr) {
-        // Split in address and prefix length
-        list($first_ip, $subnet) = explode('/', $test_range);
-
-        // Parse the address into a binary string
-        $first_bin = inet_pton($first_ip);
-        $first_hex = bin2hex($first_bin);
-
-        $flexbits = 128 - $subnet;
-
-        // Build the hexadecimal string of the last address
-        $last_hex = $first_hex;
-
-        $pos = 31;
-        while ($flexbits > 0) {
-            // Get the character at this position
-            $orig = mb_substr($last_hex, $pos, 1);
-
-            // Convert it to an integer
-            $origval = hexdec($orig);
-
-            // OR it with (2^flexbits)-1, with flexbits limited to 4 at a time
-            $newval = $origval | (pow(2, min(4, $flexbits)) - 1);
-
-            // Convert it back to a hexadecimal character
-            $new = dechex($newval);
-
-            // And put that character back in the string
-            $last_hex = substr_replace($last_hex, $new, $pos, 1);
-
-            // We processed one nibble, move to previous position
-            $flexbits -= 4;
-            --$pos;
-        }
-
-        // check if the IP to test is within the range
-        $result = ($ip_hex >= $first_hex && $ip_hex <= $last_hex);
-    }
-
-    return $result;
-} // end of the "PMA_ipv6MaskTest()" function
-
-
-/**
- * Runs through IP Allow/Deny rules the use of it below for more information
- *
- * @param string $type 'allow' | 'deny' type of rule to match
- *
- * @return bool   Matched a rule ?
- *
- * @access  public
- *
- * @see     PMA_getIp()
- */
-function PMA_allowDeny($type)
-{
-    global $cfg;
-
-    // Grabs true IP of the user and returns if it can't be found
-    $remote_ip = PMA_getIp();
-    if (empty($remote_ip)) {
-        return false;
-    }
-
-    // copy username
-    $username  = $cfg['Server']['user'];
-
-    // copy rule database
-    if (isset($cfg['Server']['AllowDeny']['rules'])) {
-        $rules     = $cfg['Server']['AllowDeny']['rules'];
-        if (! is_array($rules)) {
-            $rules = array();
-        }
-    } else {
-        $rules = array();
-    }
-
-    // lookup table for some name shortcuts
-    $shortcuts = array(
-        'all'       => '0.0.0.0/0',
-        'localhost' => '127.0.0.1/8'
-    );
-
-    // Provide some useful shortcuts if server gives us address:
-    if (PMA_getenv('SERVER_ADDR')) {
-        $shortcuts['localnetA'] = PMA_getenv('SERVER_ADDR') . '/8';
-        $shortcuts['localnetB'] = PMA_getenv('SERVER_ADDR') . '/16';
-        $shortcuts['localnetC'] = PMA_getenv('SERVER_ADDR') . '/24';
-    }
-
-    foreach ($rules as $rule) {
-        // extract rule data
-        $rule_data = explode(' ', $rule);
-
-        // check for rule type
-        if ($rule_data[0] != $type) {
-            continue;
-        }
-
-        // check for username
-        if (($rule_data[1] != '%') //wildcarded first
-            && (! hash_equals($rule_data[1], $username))
-        ) {
-            continue;
-        }
-
-        // check if the config file has the full string with an extra
-        // 'from' in it and if it does, just discard it
-        if ($rule_data[2] == 'from') {
-            $rule_data[2] = $rule_data[3];
-        }
-
-        // Handle shortcuts with above array
-        if (isset($shortcuts[$rule_data[2]])) {
-            $rule_data[2] = $shortcuts[$rule_data[2]];
-        }
-
-        // Add code for host lookups here
-        // Excluded for the moment
-
-        // Do the actual matching now
-        if (PMA_ipMaskTest($rule_data[2], $remote_ip)) {
-            return true;
-        }
-    } // end while
-
-    return false;
-} // end of the "PMA_AllowDeny()" function
-
diff --git a/#pma/libraries/js_escape.lib.php b/#pma/libraries/js_escape.lib.php
deleted file mode 100644
index f2c27d18..00000000
--- a/#pma/libraries/js_escape.lib.php
+++ /dev/null
@@ -1,173 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Javascript escaping functions.
- *
- * @package PhpMyAdmin
- *
- */
-
-/**
- * Format a string so it can be a string inside JavaScript code inside an
- * eventhandler (onclick, onchange, on..., ).
- * This function is used to displays a javascript confirmation box for
- * "DROP/DELETE/ALTER" queries.
- *
- * @param string  $a_string       the string to format
- * @param boolean $add_backquotes whether to add backquotes to the string or not
- *
- * @return string   the formatted string
- *
- * @access  public
- */
-function PMA_jsFormat($a_string = '', $add_backquotes = true)
-{
-    $a_string = htmlspecialchars($a_string);
-    $a_string = PMA_escapeJsString($a_string);
-    // Needed for inline javascript to prevent some browsers
-    // treating it as a anchor
-    $a_string = str_replace('#', '\\#', $a_string);
-
-    return $add_backquotes
-        ? PMA\libraries\Util::backquote($a_string)
-        : $a_string;
-} // end of the 'PMA_jsFormat()' function
-
-/**
- * escapes a string to be inserted as string a JavaScript block
- * enclosed by <![CDATA[ ... ]]>
- * this requires only to escape ' with \' and end of script block
- *
- * We also remove NUL byte as some browsers (namely MSIE) ignore it and
- * inserting it anywhere inside </script would allow to bypass this check.
- *
- * @param string $string the string to be escaped
- *
- * @return string  the escaped string
- */
-function PMA_escapeJsString($string)
-{
-    return preg_replace(
-        '@</script@i', '</\' + \'script',
-        strtr(
-            $string,
-            array(
-                "\000" => '',
-                '\\' => '\\\\',
-                '\'' => '\\\'',
-                '"' => '\"',
-                "\n" => '\n',
-                "\r" => '\r'
-            )
-        )
-    );
-}
-
-/**
- * Formats a value for javascript code.
- *
- * @param string $value String to be formatted.
- *
- * @return string formatted value.
- */
-function PMA_formatJsVal($value)
-{
-    if (is_bool($value)) {
-        if ($value) {
-            return 'true';
-        }
-
-        return 'false';
-    }
-
-    if (is_int($value)) {
-        return (int)$value;
-    }
-
-    return '"' . PMA_escapeJsString($value) . '"';
-}
-
-/**
- * Formats an javascript assignment with proper escaping of a value
- * and support for assigning array of strings.
- *
- * @param string $key    Name of value to set
- * @param mixed  $value  Value to set, can be either string or array of strings
- * @param bool   $escape Whether to escape value or keep it as it is
- *                       (for inclusion of js code)
- *
- * @return string Javascript code.
- */
-function PMA_getJsValue($key, $value, $escape = true)
-{
-    $result = $key . ' = ';
-    if (!$escape) {
-        $result .= $value;
-    } elseif (is_array($value)) {
-        $result .= '[';
-        foreach ($value as $val) {
-            $result .= PMA_formatJsVal($val) . ",";
-        }
-        $result .= "];\n";
-    } else {
-        $result .= PMA_formatJsVal($value) . ";\n";
-    }
-    return $result;
-}
-
-/**
- * Prints an javascript assignment with proper escaping of a value
- * and support for assigning array of strings.
- *
- * @param string $key   Name of value to set
- * @param mixed  $value Value to set, can be either string or array of strings
- *
- * @return void
- */
-function PMA_printJsValue($key, $value)
-{
-    echo PMA_getJsValue($key, $value);
-}
-
-/**
- * Formats javascript assignment for form validation api
- * with proper escaping of a value.
- *
- * @param string  $key   Name of value to set
- * @param string  $value Value to set
- * @param boolean $addOn Check if $.validator.format is required or not
- * @param boolean $comma Check if comma is required
- *
- * @return string Javascript code.
- */
-function PMA_getJsValueForFormValidation($key, $value, $addOn, $comma)
-{
-    $result = $key . ': ';
-    if ($addOn) {
-        $result .= '$.validator.format(';
-    }
-    $result .= PMA_formatJsVal($value);
-    if ($addOn) {
-        $result .= ')';
-    }
-    if ($comma) {
-        $result .= ', ';
-    }
-    return $result;
-}
-
-/**
- * Prints javascript assignment for form validation api
- * with proper escaping of a value.
- *
- * @param string  $key   Name of value to set
- * @param string  $value Value to set
- * @param boolean $addOn Check if $.validator.format is required or not
- * @param boolean $comma Check if comma is required
- *
- * @return void
- */
-function PMA_printJsValueForFormValidation($key, $value, $addOn=false, $comma=true)
-{
-    echo PMA_getJsValueForFormValidation($key, $value, $addOn, $comma);
-}
diff --git a/#pma/libraries/kanji-encoding.lib.php b/#pma/libraries/kanji-encoding.lib.php
deleted file mode 100644
index b879c3c0..00000000
--- a/#pma/libraries/kanji-encoding.lib.php
+++ /dev/null
@@ -1,170 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Set of functions for kanji-encoding convert (available only with japanese
- * language)
- *
- * PHP4 configure requirements:
- *     --enable-mbstring --enable-mbstr-enc-trans --enable-mbregex
- *
- * 2002/2/22 - by Yukihiro Kawada <kawada@den.fujifilm.co.jp>
- *
- * @package PhpMyAdmin
- */
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
-/**
- * Gets the php internal encoding codes and sets the available encoding
- * codes list
- * 2002/1/4 by Y.Kawada
- *
- * @global  string $kanji_encoding_list the available encoding codes list
- *
- * @return boolean  always true
- */
-function PMA_Kanji_checkEncoding()
-{
-    global $kanji_encoding_list;
-
-    $internal_enc = mb_internal_encoding();
-    if ($internal_enc == 'EUC-JP') {
-        $kanji_encoding_list = 'ASCII,EUC-JP,SJIS,JIS';
-    } else {
-        $kanji_encoding_list = 'ASCII,SJIS,EUC-JP,JIS';
-    }
-
-    return true;
-} // end of the 'PMA_Kanji_checkEncoding' function
-
-
-/**
- * Reverses SJIS & EUC-JP position in the encoding codes list
- * 2002/1/4 by Y.Kawada
- *
- * @global  string $kanji_encoding_list the available encoding codes list
- *
- * @return boolean  always true
- */
-function PMA_Kanji_changeOrder()
-{
-    global $kanji_encoding_list;
-
-    $parts = explode(',', $kanji_encoding_list);
-    if ($parts[1] == 'EUC-JP') {
-        $kanji_encoding_list = 'ASCII,SJIS,EUC-JP,JIS';
-    } else {
-        $kanji_encoding_list = 'ASCII,EUC-JP,SJIS,JIS';
-    }
-
-    return true;
-} // end of the 'PMA_Kanji_changeOrder' function
-
-
-/**
- * Kanji string encoding convert
- * 2002/1/4 by Y.Kawada
- *
- * @param string $str  the string to convert
- * @param string $enc  the destination encoding code
- * @param string $kana set 'kana' convert to JIS-X208-kana
- *
- * @global  string $kanji_encoding_list the available encoding codes list
- *
- * @return string   the converted string
- */
-function PMA_Kanji_strConv($str, $enc, $kana)
-{
-    global $kanji_encoding_list;
-
-    if ($enc == '' && $kana == '') {
-        return $str;
-    }
-    $string_encoding = mb_detect_encoding($str, $kanji_encoding_list);
-    if ($string_encoding === false) {
-        $string_encoding = 'utf-8';
-    }
-
-    if ($kana == 'kana') {
-        $dist = mb_convert_kana($str, 'KV', $string_encoding);
-        $str  = $dist;
-    }
-    if ($string_encoding != $enc && $enc != '') {
-        $dist = mb_convert_encoding($str, $enc, $string_encoding);
-    } else {
-        $dist = $str;
-    }
-    return $dist;
-} // end of the 'PMA_Kanji_strConv' function
-
-
-/**
- * Kanji file encoding convert
- * 2002/1/4 by Y.Kawada
- *
- * @param string $file the name of the file to convert
- * @param string $enc  the destination encoding code
- * @param string $kana set 'kana' convert to JIS-X208-kana
- *
- * @return string   the name of the converted file
- */
-function PMA_Kanji_fileConv($file, $enc, $kana)
-{
-    if ($enc == '' && $kana == '') {
-        return $file;
-    }
-
-    $tmpfname = tempnam('', $enc);
-    $fpd      = fopen($tmpfname, 'wb');
-    $fps      = fopen($file, 'r');
-    PMA_Kanji_changeOrder();
-    while (!feof($fps)) {
-        $line = fgets($fps, 4096);
-        $dist = PMA_Kanji_strConv($line, $enc, $kana);
-        fputs($fpd, $dist);
-    } // end while
-    PMA_Kanji_changeOrder();
-    fclose($fps);
-    fclose($fpd);
-    unlink($file);
-
-    return $tmpfname;
-} // end of the 'PMA_Kanji_fileConv' function
-
-
-/**
- * Defines radio form fields to switch between encoding modes
- * 2002/1/4 by Y.Kawada
- *
- * @return string   xhtml code for the radio controls
- */
-function PMA_Kanji_encodingForm()
-{
-    return "\n"
-        . '<ul>' . "\n" . '<li>'
-        . '<input type="radio" name="knjenc" value="" checked="checked" '
-        . 'id="kj-none" />'
-        . '<label for="kj-none">'
-        /* l10n: This is currently used only in Japanese locales */
-        . _pgettext('None encoding conversion', 'None')
-        . "</label>\n"
-        . '<input type="radio" name="knjenc" value="EUC-JP" id="kj-euc" />'
-        . '<label for="kj-euc">EUC</label>' . "\n"
-        . '<input type="radio" name="knjenc" value="SJIS" id="kj-sjis" />'
-        . '<label for="kj-sjis">SJIS</label>' . "\n"
-        . '</li>' . "\n" . '<li>'
-        . '<input type="checkbox" name="xkana" value="kana" id="kj-kana" />'
-        . "\n"
-        . '<label for="kj-kana">'
-        /* l10n: This is currently used only in Japanese locales */
-        . __('Convert to Kana')
-        . '</label><br />'
-        . "\n"
-        . '</li>' . "\n" . '</ul>'
-        ;
-} // end of the 'PMA_Kanji_encodingForm' function
-
-
-PMA_Kanji_checkEncoding();
-
diff --git a/#pma/libraries/language_stats.inc.php b/#pma/libraries/language_stats.inc.php
deleted file mode 100644
index decd6aff..00000000
--- a/#pma/libraries/language_stats.inc.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-/* Automatically generated file, do not edit! */
-/* Generated by scripts/remove-incomplete-mo */
-
-$GLOBALS["language_stats"] = array (
-    'af' => 8,
-    'ar' => 34,
-    'az' => 53,
-    'be' => 24,
-    'be@latin' => 23,
-    'bg' => 62,
-    'bn' => 72,
-    'br' => 16,
-    'brx' => 0,
-    'bs' => 12,
-    'ca' => 99,
-    'ckb' => 31,
-    'cs' => 93,
-    'cy' => 17,
-    'da' => 95,
-    'de' => 99,
-    'el' => 100,
-    'en_GB' => 77,
-    'eo' => 14,
-    'es' => 98,
-    'et' => 99,
-    'eu' => 15,
-    'fa' => 24,
-    'fi' => 68,
-    'fr' => 100,
-    'fy' => 19,
-    'gl' => 84,
-    'gu' => 0,
-    'he' => 16,
-    'hi' => 37,
-    'hr' => 28,
-    'hu' => 99,
-    'hy' => 66,
-    'ia' => 74,
-    'id' => 69,
-    'it' => 100,
-    'ja' => 70,
-    'ka' => 13,
-    'kk' => 9,
-    'km' => 5,
-    'kn' => 4,
-    'ko' => 80,
-    'ksh' => 0,
-    'ky' => 1,
-    'li' => 1,
-    'lt' => 42,
-    'lv' => 18,
-    'mk' => 17,
-    'ml' => 1,
-    'mn' => 20,
-    'ms' => 10,
-    'nb' => 57,
-    'ne' => 1,
-    'nl' => 100,
-    'pa' => 3,
-    'pl' => 81,
-    'pt' => 53,
-    'pt_BR' => 92,
-    'ro' => 53,
-    'ru' => 97,
-    'si' => 59,
-    'sk' => 83,
-    'sl' => 99,
-    'sq' => 99,
-    'sr' => 22,
-    'sr@latin' => 44,
-    'sv' => 97,
-    'ta' => 34,
-    'te' => 9,
-    'th' => 30,
-    'tk' => 0,
-    'tr' => 100,
-    'tt' => 16,
-    'ug' => 10,
-    'uk' => 79,
-    'ur' => 17,
-    'uz' => 32,
-    'uz@latin' => 32,
-    'vi' => 85,
-    'vls' => 2,
-    'zh_CN' => 87,
-    'zh_TW' => 99,
-);
-?>
diff --git a/#pma/libraries/logging.lib.php b/#pma/libraries/logging.lib.php
deleted file mode 100644
index 540ff5a4..00000000
--- a/#pma/libraries/logging.lib.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Logging functionality for webserver.
- *
- * This includes web server specific code to log some information.
- *
- * @package PhpMyAdmin
- */
-
-/**
- * Logs user information to webserver logs.
- *
- * @param string $user   user name
- * @param string $status status message
- *
- * @return void
- */
-function PMA_logUser($user, $status = 'ok')
-{
-    if (function_exists('apache_note')) {
-        apache_note('userID', $user);
-        apache_note('userStatus', $status);
-    }
-}
-
diff --git a/#pma/libraries/mime.lib.php b/#pma/libraries/mime.lib.php
deleted file mode 100644
index f1a7757a..00000000
--- a/#pma/libraries/mime.lib.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * MIME detection code.
- *
- * @package PhpMyAdmin
- * @todo Maybe we could try to use fileinfo module if loaded
- */
-
-/**
- * Tries to detect MIME type of content.
- *
- * @param string &$test First few bytes of content to use for detection
- *
- * @return string
- */
-function PMA_detectMIME(&$test)
-{
-    $len = mb_strlen($test);
-    if ($len >= 2 && $test[0] == chr(0xff) && $test[1] == chr(0xd8)) {
-        return 'image/jpeg';
-    }
-    if ($len >= 3 && substr($test, 0, 3) == 'GIF') {
-        return 'image/gif';
-    }
-    if ($len >= 4 && mb_substr($test, 0, 4) == "\x89PNG") {
-        return 'image/png';
-    }
-    return 'application/octet-stream';
-}
diff --git a/#pma/libraries/mult_submits.inc.php b/#pma/libraries/mult_submits.inc.php
deleted file mode 100644
index 47dbb62d..00000000
--- a/#pma/libraries/mult_submits.inc.php
+++ /dev/null
@@ -1,334 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Helper for multi submit forms
- *
- * @package PhpMyAdmin
- */
-use PMA\libraries\Message;
-use PMA\libraries\Response;
-
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
-require_once 'libraries/transformations.lib.php';
-require_once 'libraries/bookmark.lib.php';
-require_once 'libraries/sql.lib.php';
-require_once 'libraries/mult_submits.lib.php';
-
-$request_params = array(
-    'clause_is_unique',
-    'from_prefix',
-    'goto',
-    'mult_btn',
-    'original_sql_query',
-    'query_type',
-    'reload',
-    'selected',
-    'selected_fld',
-    'selected_recent_table',
-    'sql_query',
-    'submit_mult',
-    'table_type',
-    'to_prefix',
-    'url_query'
-);
-
-foreach ($request_params as $one_request_param) {
-    if (isset($_REQUEST[$one_request_param])) {
-        $GLOBALS[$one_request_param] = $_REQUEST[$one_request_param];
-    }
-}
-
-global $db, $table,  $clause_is_unique, $from_prefix, $goto,
-       $mult_btn, $original_sql_query, $query_type, $reload,
-       $selected, $selected_fld, $selected_recent_table, $sql_query,
-       $submit_mult, $table_type, $to_prefix, $url_query, $pmaThemeImage;
-
-/**
- * Prepares the work and runs some other scripts if required
- */
-if (! empty($submit_mult)
-    && $submit_mult != __('With selected:')
-    && (! empty($_REQUEST['selected_dbs'])
-    || ! empty($_POST['selected_tbl'])
-    || ! empty($selected_fld)
-    || ! empty($_REQUEST['rows_to_delete']))
-) {
-    define('PMA_SUBMIT_MULT', 1);
-    if (! empty($_REQUEST['selected_dbs'])) {
-        // coming from server database view - do something with
-        // selected databases
-        $selected   = $_REQUEST['selected_dbs'];
-        $query_type = 'drop_db';
-    } elseif (! empty($_POST['selected_tbl'])) {
-        // coming from database structure view - do something with
-        // selected tables
-        $selected = $_POST['selected_tbl'];
-        switch ($submit_mult) {
-        case 'add_prefix_tbl':
-        case 'replace_prefix_tbl':
-        case 'copy_tbl_change_prefix':
-        case 'drop_db':
-        case 'drop_tbl':
-        case 'empty_tbl':
-            $what = $submit_mult;
-            break;
-        case 'check_tbl':
-        case 'optimize_tbl':
-        case 'repair_tbl':
-        case 'analyze_tbl':
-        case 'checksum_tbl':
-            $query_type = $submit_mult;
-            unset($submit_mult);
-            $mult_btn   = __('Yes');
-            break;
-        case 'export':
-            unset($submit_mult);
-            include 'db_export.php';
-            exit;
-        case 'copy_tbl':
-            $views = $GLOBALS['dbi']->getVirtualTables($db);
-            list($full_query, $reload, $full_query_views)
-                = PMA_getQueryFromSelected(
-                    $submit_mult, $table, $selected, $views
-                );
-            $_url_params = PMA_getUrlParams(
-                $submit_mult, $reload, $action, $db, $table, $selected, $views,
-                isset($original_sql_query)? $original_sql_query : null,
-                isset($original_url_query)? $original_url_query : null
-            );
-            $response = PMA\libraries\Response::getInstance();
-            $response->disable();
-            $response->addHTML(
-                PMA_getHtmlForCopyMultipleTables($action, $_url_params)
-            );
-            exit;
-        case 'show_create':
-            $show_create = PMA\libraries\Template::get(
-                'database/structure/show_create'
-            )
-                ->render(
-                    array(
-                        'db'         => $GLOBALS['db'],
-                        'db_objects' => $selected,
-                    )
-                );
-            // Send response to client.
-            $response = PMA\libraries\Response::getInstance();
-            $response->addJSON('message', $show_create);
-            exit;
-        case 'sync_unique_columns_central_list':
-            include_once 'libraries/central_columns.lib.php';
-            $centralColsError = PMA_syncUniqueColumns($selected);
-            break;
-        case 'delete_unique_columns_central_list':
-            include_once 'libraries/central_columns.lib.php';
-            $centralColsError = PMA_deleteColumnsFromList($selected);
-            break;
-        case 'make_consistent_with_central_list':
-            include_once 'libraries/central_columns.lib.php';
-            $centralColsError = PMA_makeConsistentWithList(
-                $GLOBALS['db'],
-                $selected
-            );
-            break;
-        } // end switch
-    } elseif (isset($selected_fld) && !empty($selected_fld)) {
-        // coming from table structure view - do something with
-        // selected columns
-        // handled in StructrueController
-    } else {
-        // coming from browsing - do something with selected rows
-        $what = 'row_delete';
-        $selected = $_REQUEST['rows_to_delete'];
-    }
-} // end if
-
-if (empty($db)) {
-    $db = '';
-}
-if (empty($table)) {
-    $table = '';
-}
-$views = $GLOBALS['dbi']->getVirtualTables($db);
-
-/**
- * Displays the confirmation form if required
- */
-if (!empty($submit_mult) && !empty($what)) {
-    unset($message);
-
-    if (mb_strlen($table)) {
-        include './libraries/tbl_common.inc.php';
-        $url_query .= '&amp;goto=tbl_sql.php&amp;back=tbl_sql.php';
-        include './libraries/tbl_info.inc.php';
-    } elseif (mb_strlen($db)) {
-        include './libraries/db_common.inc.php';
-
-        list(
-            $tables,
-            $num_tables,
-            $total_num_tables,
-            $sub_part,
-            $is_show_stats,
-            $db_is_system_schema,
-            $tooltip_truename,
-            $tooltip_aliasname,
-            $pos
-        ) = PMA\libraries\Util::getDbInfo($db, isset($sub_part) ? $sub_part : '');
-
-    } else {
-        include_once './libraries/server_common.inc.php';
-    }
-
-    // Builds the query
-    list($full_query, $reload, $full_query_views)
-        = PMA_getQueryFromSelected(
-            $what, $table, $selected, $views
-        );
-
-    // Displays the confirmation form
-    $_url_params = PMA_getUrlParams(
-        $what, $reload, $action, $db, $table, $selected, $views,
-        isset($original_sql_query)? $original_sql_query : null,
-        isset($original_url_query)? $original_url_query : null
-    );
-
-    $response = PMA\libraries\Response::getInstance();
-
-    if ($what == 'replace_prefix_tbl' || $what == 'copy_tbl_change_prefix') {
-        $response->disable();
-        $response->addHTML(
-            PMA_getHtmlForReplacePrefixTable($action, $_url_params)
-        );
-    } elseif ($what == 'add_prefix_tbl') {
-        $response->disable();
-        $response->addHTML(PMA_getHtmlForAddPrefixTable($action, $_url_params));
-    } else {
-        $response->addHTML(
-            PMA_getHtmlForOtherActions($what, $action, $_url_params, $full_query)
-        );
-    }
-    exit;
-
-} elseif (! empty($mult_btn) && $mult_btn == __('Yes')) {
-    /**
-     * Executes the query - dropping rows, columns/fields, tables or dbs
-     */
-    if ($query_type == 'drop_db'
-        || $query_type == 'drop_tbl'
-        || $query_type == 'drop_fld'
-    ) {
-        include_once './libraries/relation_cleanup.lib.php';
-    }
-
-    if ($query_type == 'primary_fld') {
-        // Gets table primary key
-        $GLOBALS['dbi']->selectDb($db);
-        $result = $GLOBALS['dbi']->query(
-            'SHOW KEYS FROM ' . PMA\libraries\Util::backquote($table) . ';'
-        );
-        $primary = '';
-        while ($row = $GLOBALS['dbi']->fetchAssoc($result)) {
-            // Backups the list of primary keys
-            if ($row['Key_name'] == 'PRIMARY') {
-                $primary .= $row['Column_name'] . ', ';
-            }
-        } // end while
-        $GLOBALS['dbi']->freeResult($result);
-    }
-
-    if ($query_type == 'drop_tbl'
-        || $query_type == 'empty_tbl'
-        || $query_type == 'row_delete'
-    ) {
-        $default_fk_check_value = PMA\libraries\Util::handleDisableFKCheckInit();
-    }
-
-    list(
-        $result, $rebuild_database_list, $reload_ret,
-        $run_parts, $execute_query_later, $sql_query, $sql_query_views
-    ) = PMA_buildOrExecuteQueryForMulti(
-        $query_type, $selected, $db, $table, $views,
-        isset($primary) ? $primary : null,
-        isset($from_prefix) ? $from_prefix : null,
-        isset($to_prefix) ? $to_prefix : null
-    );
-    //update the existed variable
-    if (isset($reload_ret)) {
-        $reload = $reload_ret;
-    }
-
-    if ($query_type == 'drop_tbl') {
-        if (!empty($sql_query)) {
-            $sql_query .= ';';
-        } elseif (!empty($sql_query_views)) {
-            $sql_query = $sql_query_views . ';';
-            unset($sql_query_views);
-        }
-    }
-
-    if ($execute_query_later) {
-        PMA_executeQueryAndSendQueryResponse(
-            null, // analyzed_sql_results
-            false, // is_gotofile
-            $db, // db
-            $table, // table
-            null, // find_real_end
-            null, // sql_query_for_bookmark
-            null, // extra_data
-            null, // message_to_show
-            null, // message
-            null, // sql_data
-            $goto, // goto
-            $pmaThemeImage, // pmaThemeImage
-            null, // disp_query
-            null, // disp_message
-            $query_type, // query_type
-            $sql_query, // sql_query
-            $selected, // selectedTables
-            null // complete_query
-        );
-    } elseif (!$run_parts) {
-        $GLOBALS['dbi']->selectDb($db);
-        $result = $GLOBALS['dbi']->tryQuery($sql_query);
-        if ($result && !empty($sql_query_views)) {
-            $sql_query .= ' ' . $sql_query_views . ';';
-            $result = $GLOBALS['dbi']->tryQuery($sql_query_views);
-            unset($sql_query_views);
-        }
-
-        if (! $result) {
-            $message = Message::error($GLOBALS['dbi']->getError());
-        }
-    }
-    if ($query_type == 'drop_tbl'
-        || $query_type == 'empty_tbl'
-        || $query_type == 'row_delete'
-    ) {
-        PMA\libraries\Util::handleDisableFKCheckCleanup($default_fk_check_value);
-    }
-    if ($rebuild_database_list) {
-        // avoid a problem with the database list navigator
-        // when dropping a db from server_databases
-        $GLOBALS['dblist']->databases->build();
-    }
-} else {
-    if (isset($submit_mult)
-        && ($submit_mult == 'sync_unique_columns_central_list'
-        || $submit_mult == 'delete_unique_columns_central_list'
-        || $submit_mult == 'add_to_central_columns'
-        || $submit_mult == 'remove_from_central_columns'
-        || $submit_mult == 'make_consistent_with_central_list')
-    ) {
-        if (isset($centralColsError) && $centralColsError !== true) {
-            $message = $centralColsError;
-        } else {
-            $message = Message::success(__('Success!'));
-        }
-    } else {
-        $message = Message::success(__('No change'));
-    }
-}
diff --git a/#pma/libraries/mult_submits.lib.php b/#pma/libraries/mult_submits.lib.php
deleted file mode 100644
index f6fedacd..00000000
--- a/#pma/libraries/mult_submits.lib.php
+++ /dev/null
@@ -1,577 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * functions for multi submit forms
- *
- * @usedby  mult_submits.inc.php
- *
- * @package PhpMyAdmin
- */
-use PMA\libraries\Table;
-
-/**
- * Gets url params
- *
- * @param string $what               mult submit type
- * @param bool   $reload             is reload
- * @param string $action             action type
- * @param string $db                 database name
- * @param string $table              table name
- * @param array  $selected           selected rows(table,db)
- * @param array  $views              table views
- * @param string $original_sql_query original sql query
- * @param string $original_url_query original url query
- *
- * @return array
- */
-function PMA_getUrlParams(
-    $what, $reload, $action, $db, $table, $selected, $views,
-    $original_sql_query, $original_url_query
-) {
-    $_url_params = array(
-        'query_type' => $what,
-        'reload' => (! empty($reload) ? 1 : 0),
-    );
-    if (mb_strpos(' ' . $action, 'db_') == 1) {
-        $_url_params['db']= $db;
-    } elseif (mb_strpos(' ' . $action, 'tbl_') == 1
-        || $what == 'row_delete'
-    ) {
-        $_url_params['db']= $db;
-        $_url_params['table']= $table;
-    }
-    foreach ($selected as $sval) {
-        if ($what == 'row_delete') {
-            $_url_params['selected'][] = 'DELETE FROM '
-                . PMA\libraries\Util::backquote($table)
-                . ' WHERE ' . $sval . ' LIMIT 1;';
-        } else {
-            $_url_params['selected'][] = $sval;
-        }
-    }
-    if ($what == 'drop_tbl' && !empty($views)) {
-        foreach ($views as $current) {
-            $_url_params['views'][] = $current;
-        }
-    }
-    if ($what == 'row_delete') {
-        $_url_params['original_sql_query'] = $original_sql_query;
-        if (! empty($original_url_query)) {
-            $_url_params['original_url_query'] = $original_url_query;
-        }
-    }
-
-    return  $_url_params;
-}
-
-/**
- * Builds or execute queries for multiple elements, depending on $query_type
- *
- * @param string $query_type  query type
- * @param array  $selected    selected tables
- * @param string $db          db name
- * @param string $table       table name
- * @param array  $views       table views
- * @param string $primary     table primary
- * @param string $from_prefix from prefix original
- * @param string $to_prefix   to prefix original
- *
- * @return array
- */
-function PMA_buildOrExecuteQueryForMulti(
-    $query_type, $selected, $db, $table, $views, $primary,
-    $from_prefix, $to_prefix
-) {
-    $rebuild_database_list = false;
-    $reload = null;
-    $a_query = null;
-    $sql_query = '';
-    $sql_query_views = null;
-    // whether to run query after each pass
-    $run_parts = false;
-    // whether to execute the query at the end (to display results)
-    $execute_query_later = false;
-    $result = null;
-
-    if ($query_type == 'drop_tbl') {
-        $sql_query_views = '';
-    }
-
-    $selected_cnt   = count($selected);
-    $deletes = false;
-    $copy_tbl =false;
-
-    for ($i = 0; $i < $selected_cnt; $i++) {
-        switch ($query_type) {
-        case 'row_delete':
-            $deletes = true;
-            $a_query = $selected[$i];
-            $run_parts = true;
-            break;
-
-        case 'drop_db':
-            PMA_relationsCleanupDatabase($selected[$i]);
-            $a_query   = 'DROP DATABASE '
-                       . PMA\libraries\Util::backquote($selected[$i]);
-            $reload    = 1;
-            $run_parts = true;
-            $rebuild_database_list = true;
-            break;
-
-        case 'drop_tbl':
-            PMA_relationsCleanupTable($db, $selected[$i]);
-            $current = $selected[$i];
-            if (!empty($views) && in_array($current, $views)) {
-                $sql_query_views .= (empty($sql_query_views) ? 'DROP VIEW ' : ', ')
-                          . PMA\libraries\Util::backquote($current);
-            } else {
-                $sql_query .= (empty($sql_query) ? 'DROP TABLE ' : ', ')
-                           . PMA\libraries\Util::backquote($current);
-            }
-            $reload    = 1;
-            break;
-
-        case 'check_tbl':
-            $sql_query .= (empty($sql_query) ? 'CHECK TABLE ' : ', ')
-                       . PMA\libraries\Util::backquote($selected[$i]);
-            $execute_query_later = true;
-            break;
-
-        case 'optimize_tbl':
-            $sql_query .= (empty($sql_query) ? 'OPTIMIZE TABLE ' : ', ')
-                       . PMA\libraries\Util::backquote($selected[$i]);
-            $execute_query_later = true;
-            break;
-
-        case 'analyze_tbl':
-            $sql_query .= (empty($sql_query) ? 'ANALYZE TABLE ' : ', ')
-                       . PMA\libraries\Util::backquote($selected[$i]);
-            $execute_query_later = true;
-            break;
-
-        case 'checksum_tbl':
-            $sql_query .= (empty($sql_query) ? 'CHECKSUM TABLE ' : ', ')
-                       . PMA\libraries\Util::backquote($selected[$i]);
-            $execute_query_later = true;
-            break;
-
-        case 'repair_tbl':
-            $sql_query .= (empty($sql_query) ? 'REPAIR TABLE ' : ', ')
-                       . PMA\libraries\Util::backquote($selected[$i]);
-            $execute_query_later = true;
-            break;
-
-        case 'empty_tbl':
-            $deletes = true;
-            $a_query = 'TRUNCATE ';
-            $a_query .= PMA\libraries\Util::backquote($selected[$i]);
-            $run_parts = true;
-            break;
-
-        case 'drop_fld':
-            PMA_relationsCleanupColumn($db, $table, $selected[$i]);
-            $sql_query .= (empty($sql_query)
-                ? 'ALTER TABLE ' . PMA\libraries\Util::backquote($table)
-                : ',')
-                       . ' DROP ' . PMA\libraries\Util::backquote($selected[$i])
-                       . (($i == $selected_cnt-1) ? ';' : '');
-            break;
-
-        case 'primary_fld':
-            $sql_query .= (empty($sql_query)
-                ? 'ALTER TABLE ' . PMA\libraries\Util::backquote($table)
-                    . (empty($primary)
-                    ? ''
-                    : ' DROP PRIMARY KEY,') . ' ADD PRIMARY KEY( '
-                : ', ')
-                       . PMA\libraries\Util::backquote($selected[$i])
-                       . (($i == $selected_cnt-1) ? ');' : '');
-            break;
-
-        case 'index_fld':
-            $sql_query .= (empty($sql_query)
-                ? 'ALTER TABLE ' . PMA\libraries\Util::backquote($table)
-                    . ' ADD INDEX( '
-                : ', ')
-                       . PMA\libraries\Util::backquote($selected[$i])
-                       . (($i == $selected_cnt-1) ? ');' : '');
-            break;
-
-        case 'unique_fld':
-            $sql_query .= (empty($sql_query)
-                ? 'ALTER TABLE ' . PMA\libraries\Util::backquote($table)
-                    . ' ADD UNIQUE( '
-                : ', ')
-                       . PMA\libraries\Util::backquote($selected[$i])
-                       . (($i == $selected_cnt-1) ? ');' : '');
-            break;
-
-        case 'spatial_fld':
-            $sql_query .= (empty($sql_query)
-                ? 'ALTER TABLE ' . PMA\libraries\Util::backquote($table)
-                    . ' ADD SPATIAL( '
-                : ', ')
-                       . PMA\libraries\Util::backquote($selected[$i])
-                       . (($i == $selected_cnt-1) ? ');' : '');
-            break;
-
-        case 'fulltext_fld':
-            $sql_query .= (empty($sql_query)
-                ? 'ALTER TABLE ' . PMA\libraries\Util::backquote($table)
-                    . ' ADD FULLTEXT( '
-                : ', ')
-                       . PMA\libraries\Util::backquote($selected[$i])
-                       . (($i == $selected_cnt-1) ? ');' : '');
-            break;
-
-        case 'add_prefix_tbl':
-            $newtablename = $_POST['add_prefix'] . $selected[$i];
-            // ADD PREFIX TO TABLE NAME
-            $a_query = 'ALTER TABLE '
-                . PMA\libraries\Util::backquote($selected[$i])
-                . ' RENAME '
-                . PMA\libraries\Util::backquote($newtablename);
-            $run_parts = true;
-            break;
-
-        case 'replace_prefix_tbl':
-            $current = $selected[$i];
-            $subFromPrefix = mb_substr(
-                $current,
-                0,
-                mb_strlen($from_prefix)
-            );
-            if ($subFromPrefix == $from_prefix) {
-                $newtablename = $to_prefix
-                    . mb_substr(
-                        $current,
-                        mb_strlen($from_prefix)
-                    );
-            } else {
-                $newtablename = $current;
-            }
-            // CHANGE PREFIX PATTERN
-            $a_query = 'ALTER TABLE '
-                . PMA\libraries\Util::backquote($selected[$i])
-                . ' RENAME '
-                . PMA\libraries\Util::backquote($newtablename);
-            $run_parts = true;
-            break;
-
-        case 'copy_tbl_change_prefix':
-            $run_parts = true;
-            $copy_tbl = true;
-
-            $current = $selected[$i];
-            $newtablename = $to_prefix .
-                mb_substr($current, mb_strlen($from_prefix));
-
-            // COPY TABLE AND CHANGE PREFIX PATTERN
-            Table::moveCopy(
-                $db, $current, $db, $newtablename,
-                'data', false, 'one_table'
-            );
-            break;
-
-        case 'copy_tbl':
-            $run_parts = true;
-            $copy_tbl = true;
-            Table::moveCopy($db, $selected[$i], $_POST['target_db'], $selected[$i], $_POST['what'], false, 'one_table');
-            if (isset($_POST['adjust_privileges']) && !empty($_POST['adjust_privileges'])) {
-                include_once 'operations.lib.php';
-                PMA_AdjustPrivileges_copyTable($db, $selected[$i], $_POST['target_db'], $selected[$i]);
-            }
-            break;
-        } // end switch
-
-        // All "DROP TABLE", "DROP FIELD", "OPTIMIZE TABLE" and "REPAIR TABLE"
-        // statements will be run at once below
-        if ($run_parts && !$copy_tbl) {
-            $sql_query .= $a_query . ';' . "\n";
-            if ($query_type != 'drop_db') {
-                $GLOBALS['dbi']->selectDb($db);
-            }
-            $result = $GLOBALS['dbi']->query($a_query);
-
-            if ($query_type == 'drop_db') {
-                PMA_clearTransformations($selected[$i]);
-            } elseif ($query_type == 'drop_tbl') {
-                PMA_clearTransformations($db, $selected[$i]);
-            } else if ($query_type == 'drop_fld') {
-                PMA_clearTransformations($db, $table, $selected[$i]);
-            }
-        } // end if
-    } // end for
-
-    if ($deletes && ! empty($_REQUEST['pos'])) {
-        $_REQUEST['pos'] = PMA_calculatePosForLastPage(
-            $db, $table, isset($_REQUEST['pos']) ? $_REQUEST['pos'] : null
-        );
-    }
-
-    return array(
-        $result, $rebuild_database_list, $reload,
-        $run_parts, $execute_query_later, $sql_query, $sql_query_views
-    );
-}
-
-/**
- * Gets HTML for copy tables form
- *
- * @param string $action      action type
- * @param array  $_url_params URL params
- *
- * @return string
- */
-function PMA_getHtmlForCopyMultipleTables($action, $_url_params)
-{
-    $html = '<form id="ajax_form" action="' . $action . '" method="post">';
-    $html .= PMA_URL_getHiddenInputs($_url_params);
-    $html .= '<fieldset class = "input">';
-    $databases_list = $GLOBALS['dblist']->databases;
-    foreach ($databases_list as $key => $db_name)
-        if ($db_name == $GLOBALS['db']){
-            $databases_list->offsetUnset($key);
-            break;
-        }
-    $html .= '<strong><label for="db_name_dropdown">' . __('Database') . ':</label></strong>';
-    $html .= '<select id="db_name_dropdown" class="halfWidth" name="target_db" >'
-        . $databases_list->getHtmlOptions(true, false)
-        . '</select>';
-    $html .= '<br><br>';
-    $html .= '<strong><label>' . __('Options') . ':</label></strong><br>';
-    $html .= '<input type="radio" id ="what_structure" value="structure" name="what"></input>';
-    $html .= '<label for="what_structure">' . __('Structure only') . '</label><br>';
-    $html .= '<input type="radio" id ="what_data" value="data" name="what" checked="checked"></input>';
-    $html .= '<label for="what_data">' . __('Structure and data') . '</label><br>';
-    $html .= '<input type="radio" id ="what_dataonly" value="dataonly" name="what"></input>';
-    $html .= '<label for="what_dataonly">' . __('Data only') . '</label><br><br>';
-    $html .= '<input type="checkbox" id="checkbox_drop" value="1" name="drop_if_exists"></input>';
-    $html .= '<label for="checkbox_drop">' . __('Add DROP TABLE') . '</label><br>';
-    $html .= '<input type="checkbox" id="checkbox_auto_increment_cp" value="1" name="sql_auto_increment"></input>';
-    $html .= '<label for="checkbox_auto_increment_cp">' . __('Add AUTO INCREMENT value') . '</label><br>';
-    $html .= '<input type="checkbox" id="checkbox_constraints" value="1" name="sql_auto_increment" checked="checked"></input>';
-    $html .= '<label for="checkbox_constraints">' . __('Add constraints') . '</label><br><br>';
-    $html .= '<input name="adjust_privileges" value="1" id="checkbox_adjust_privileges" checked="checked" type="checkbox"></input>';
-    $html .= '<label for="checkbox_adjust_privileges">' . __('Adjust privileges') . '<a href="./doc/html/faq.html#faq6-39" target="documentation"><img src="themes/dot.gif" title="Documentation" alt="Documentation" class="icon ic_b_help"></a></label>';
-    $html .= '</fieldset>';
-    $html .= '<input type="hidden" name="mult_btn" value="' . __('Yes') . '" />';
-    $html .= '</form>';
-   return $html;
-}
-
-/**
- * Gets HTML for replace_prefix_tbl or copy_tbl_change_prefix
- *
- * @param string $action      action type
- * @param array  $_url_params URL params
- *
- * @return string
- */
-function PMA_getHtmlForReplacePrefixTable($action, $_url_params)
-{
-    $html  = '<form id="ajax_form" action="' . $action . '" method="post">';
-    $html .= PMA_URL_getHiddenInputs($_url_params);
-    $html .= '<fieldset class = "input">';
-    $html .= '<table>';
-    $html .= '<tr>';
-    $html .= '<td>' . __('From') . '</td>';
-    $html .= '<td>';
-    $html .= '<input type="text" name="from_prefix" id="initialPrefix" />';
-    $html .= '</td>';
-    $html .= '</tr>';
-    $html .= '<tr>';
-    $html .= '<td>' . __('To') . '</td>';
-    $html .= '<td>';
-    $html .= '<input type="text" name="to_prefix" id="newPrefix" />';
-    $html .= '</td>';
-    $html .= '</tr>';
-    $html .= '</table>';
-    $html .= '</fieldset>';
-    $html .= '<input type="hidden" name="mult_btn" value="' . __('Yes') . '" />';
-    $html .= '</form>';
-
-    return $html;
-}
-
-/**
- * Gets HTML for add_prefix_tbl
- *
- * @param string $action      action type
- * @param array  $_url_params URL params
- *
- * @return string
- */
-function PMA_getHtmlForAddPrefixTable($action, $_url_params)
-{
-    $html  = '<form id="ajax_form" action="' . $action . '" method="post">';
-    $html .= PMA_URL_getHiddenInputs($_url_params);
-    $html .= '<fieldset class = "input">';
-    $html .= '<table>';
-    $html .= '<tr>';
-    $html .= '<td>' . __('Add prefix') . '</td>';
-    $html .= '<td>';
-    $html .= '<input type="text" name="add_prefix" id="txtPrefix" />';
-    $html .= '</td>';
-    $html .= '</tr>';
-    $html .= '<tr>';
-    $html .= '</table>';
-    $html .= '</fieldset>';
-    $html .= '<input type="hidden" name="mult_btn" value="' . __('Yes') . '" />';
-    $html .= '</form>';
-
-    return $html;
-}
-
-/**
- * Gets HTML for other mult_submits actions
- *
- * @param string $what        mult_submit type
- * @param string $action      action type
- * @param array  $_url_params URL params
- * @param string $full_query  full sql query string
- *
- * @return string
- */
-function PMA_getHtmlForOtherActions($what, $action, $_url_params, $full_query)
-{
-    $html = '<form action="' . $action . '" method="post">';
-    $html .= PMA_URL_getHiddenInputs($_url_params);
-    $html .= '<fieldset class="confirmation">';
-    $html .= '<legend>';
-    if ($what == 'drop_db') {
-        $html .=  __('You are about to DESTROY a complete database!') . ' ';
-    }
-    $html .= __('Do you really want to execute the following query?');
-    $html .= '<input type="submit" name="mult_btn" value="'
-        . __('Yes') . '" />';
-    $html .= '<input type="submit" name="mult_btn" value="'
-        . __('No') . '" />';
-    $html .= '</legend>';
-    $html .= '<code>' . $full_query . '</code>';
-    $html .= '</fieldset>';
-    $html .= '<fieldset class="tblFooters">';
-    // Display option to disable foreign key checks while dropping tables
-    if ($what === 'drop_tbl' || $what === 'empty_tbl' || $what === 'row_delete') {
-        $html .= '<div id="foreignkeychk">';
-        $html .= PMA\libraries\Util::getFKCheckbox();
-        $html .= '</div>';
-    }
-    $html .= '<input id="buttonYes" type="submit" name="mult_btn" value="'
-        . __('Yes') . '" />';
-    $html .= '<input id="buttonNo" type="submit" name="mult_btn" value="'
-        . __('No') . '" />';
-    $html .= '</fieldset>';
-    $html .= '</form>';
-
-    return $html;
-}
-
-/**
- * Get query string from Selected
- *
- * @param string $what     mult_submit type
- * @param string $table    table name
- * @param array  $selected the selected columns
- * @param array  $views    table views
- *
- * @return array
- */
-function PMA_getQueryFromSelected($what, $table, $selected, $views)
-{
-    $reload = false;
-    $full_query_views = null;
-    $full_query     = '';
-
-    if ($what == 'drop_tbl') {
-        $full_query_views = '';
-    }
-
-    $selected_cnt   = count($selected);
-    $i = 0;
-    foreach ($selected as $sval) {
-        switch ($what) {
-        case 'row_delete':
-            $full_query .= 'DELETE FROM '
-                . PMA\libraries\Util::backquote(htmlspecialchars($table))
-                // Do not append a "LIMIT 1" clause here
-                // (it's not binlog friendly).
-                // We don't need the clause because the calling panel permits
-                // this feature only when there is a unique index.
-                . ' WHERE ' . htmlspecialchars($sval)
-                . ';<br />';
-            break;
-        case 'drop_db':
-            $full_query .= 'DROP DATABASE '
-                . PMA\libraries\Util::backquote(htmlspecialchars($sval))
-                . ';<br />';
-            $reload = true;
-            break;
-
-        case 'drop_tbl':
-            $current = $sval;
-            if (!empty($views) && in_array($current, $views)) {
-                $full_query_views .= (empty($full_query_views) ? 'DROP VIEW ' : ', ')
-                    . PMA\libraries\Util::backquote(htmlspecialchars($current));
-            } else {
-                $full_query .= (empty($full_query) ? 'DROP TABLE ' : ', ')
-                    . PMA\libraries\Util::backquote(htmlspecialchars($current));
-            }
-            break;
-
-        case 'empty_tbl':
-            $full_query .= 'TRUNCATE ';
-            $full_query .= PMA\libraries\Util::backquote(htmlspecialchars($sval))
-                        . ';<br />';
-            break;
-
-        case 'primary_fld':
-            if ($full_query == '') {
-                $full_query .= 'ALTER TABLE '
-                    . PMA\libraries\Util::backquote(htmlspecialchars($table))
-                    . '<br />&nbsp;&nbsp;DROP PRIMARY KEY,'
-                    . '<br />&nbsp;&nbsp; ADD PRIMARY KEY('
-                    . '<br />&nbsp;&nbsp;&nbsp;&nbsp; '
-                    . PMA\libraries\Util::backquote(htmlspecialchars($sval))
-                    . ',';
-            } else {
-                $full_query .= '<br />&nbsp;&nbsp;&nbsp;&nbsp; '
-                    . PMA\libraries\Util::backquote(htmlspecialchars($sval))
-                    . ',';
-            }
-            if ($i == $selected_cnt-1) {
-                $full_query = preg_replace('@,$@', ');<br />', $full_query);
-            }
-            break;
-
-        case 'drop_fld':
-            if ($full_query == '') {
-                $full_query .= 'ALTER TABLE '
-                    . PMA\libraries\Util::backquote(htmlspecialchars($table));
-            }
-            $full_query .= '<br />&nbsp;&nbsp;DROP '
-                . PMA\libraries\Util::backquote(htmlspecialchars($sval))
-                . ',';
-            if ($i == $selected_cnt - 1) {
-                $full_query = preg_replace('@,$@', ';<br />', $full_query);
-            }
-            break;
-        } // end switch
-        $i++;
-    }
-
-    if ($what == 'drop_tbl') {
-        if (!empty($full_query)) {
-            $full_query .= ';<br />' . "\n";
-        }
-        if (!empty($full_query_views)) {
-            $full_query .= $full_query_views . ';<br />' . "\n";
-        }
-        unset($full_query_views);
-    }
-
-    $full_query_views = isset($full_query_views)? $full_query_views : null;
-
-    return array($full_query, $reload, $full_query_views);
-}
-
diff --git a/#pma/libraries/mysql_charsets.inc.php b/#pma/libraries/mysql_charsets.inc.php
deleted file mode 100644
index 78e26ace..00000000
--- a/#pma/libraries/mysql_charsets.inc.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * MySQL charsets listings
- *
- * @package PhpMyAdmin
- */
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
-/**
- *
- */
-
-if (! PMA\libraries\Util::cacheExists('mysql_charsets')) {
-    global $mysql_charsets, $mysql_charsets_descriptions,
-        $mysql_charsets_available, $mysql_collations, $mysql_collations_available,
-        $mysql_default_collations, $mysql_collations_flat;
-    $sql = 'SELECT * FROM information_schema.CHARACTER_SETS';
-    $res = $GLOBALS['dbi']->query($sql);
-
-    $mysql_charsets = array();
-    while ($row = $GLOBALS['dbi']->fetchAssoc($res)) {
-        $mysql_charsets[] = $row['CHARACTER_SET_NAME'];
-        // never used
-        //$mysql_charsets_maxlen[$row['Charset']] = $row['Maxlen'];
-        $mysql_charsets_descriptions[$row['CHARACTER_SET_NAME']]
-            = $row['DESCRIPTION'];
-    }
-    $GLOBALS['dbi']->freeResult($res);
-
-    sort($mysql_charsets, SORT_STRING);
-
-    $mysql_collations = array_flip($mysql_charsets);
-    $mysql_default_collations = $mysql_collations_flat
-        = $mysql_charsets_available = $mysql_collations_available = array();
-
-    $sql = 'SELECT * FROM information_schema.COLLATIONS';
-    $res = $GLOBALS['dbi']->query($sql);
-    while ($row = $GLOBALS['dbi']->fetchAssoc($res)) {
-        $char_set_name = $row['CHARACTER_SET_NAME'];
-        if (! is_array($mysql_collations[$char_set_name])) {
-            $mysql_collations[$char_set_name] = array($row['COLLATION_NAME']);
-        } else {
-            $mysql_collations[$char_set_name][] = $row['COLLATION_NAME'];
-        }
-        $mysql_collations_flat[] = $row['COLLATION_NAME'];
-        if ($row['IS_DEFAULT'] == 'Yes' || $row['IS_DEFAULT'] == '1') {
-            $mysql_default_collations[$char_set_name]
-                = $row['COLLATION_NAME'];
-        }
-        //$mysql_collations_available[$row['Collation']]
-        //    = ! isset($row['Compiled']) || $row['Compiled'] == 'Yes';
-        $mysql_collations_available[$row['COLLATION_NAME']] = true;
-        $mysql_charsets_available[$char_set_name]
-            = !empty($mysql_charsets_available[$char_set_name])
-            || !empty($mysql_collations_available[$row['COLLATION_NAME']]);
-    }
-    $GLOBALS['dbi']->freeResult($res);
-    unset($res, $row);
-
-    sort($mysql_collations_flat, SORT_STRING);
-    foreach ($mysql_collations as $key => $value) {
-        sort($mysql_collations[$key], SORT_STRING);
-    }
-    unset($key, $value);
-
-    PMA\libraries\Util::cacheSet(
-        'mysql_charsets', $GLOBALS['mysql_charsets']
-    );
-    PMA\libraries\Util::cacheSet(
-        'mysql_charsets_descriptions', $GLOBALS['mysql_charsets_descriptions']
-    );
-    PMA\libraries\Util::cacheSet(
-        'mysql_charsets_available', $GLOBALS['mysql_charsets_available']
-    );
-    PMA\libraries\Util::cacheSet(
-        'mysql_collations', $GLOBALS['mysql_collations']
-    );
-    PMA\libraries\Util::cacheSet(
-        'mysql_default_collations', $GLOBALS['mysql_default_collations']
-    );
-    PMA\libraries\Util::cacheSet(
-        'mysql_collations_flat', $GLOBALS['mysql_collations_flat']
-    );
-    PMA\libraries\Util::cacheSet(
-        'mysql_collations_available', $GLOBALS['mysql_collations_available']
-    );
-} else {
-    $GLOBALS['mysql_charsets'] = PMA\libraries\Util::cacheGet(
-        'mysql_charsets'
-    );
-    $GLOBALS['mysql_charsets_descriptions'] = PMA\libraries\Util::cacheGet(
-        'mysql_charsets_descriptions'
-    );
-    $GLOBALS['mysql_charsets_available'] = PMA\libraries\Util::cacheGet(
-        'mysql_charsets_available'
-    );
-    $GLOBALS['mysql_collations'] = PMA\libraries\Util::cacheGet(
-        'mysql_collations'
-    );
-    $GLOBALS['mysql_default_collations'] = PMA\libraries\Util::cacheGet(
-        'mysql_default_collations'
-    );
-    $GLOBALS['mysql_collations_flat'] = PMA\libraries\Util::cacheGet(
-        'mysql_collations_flat'
-    );
-    $GLOBALS['mysql_collations_available'] = PMA\libraries\Util::cacheGet(
-        'mysql_collations_available'
-    );
-}
-
-define('PMA_CSDROPDOWN_COLLATION', 0);
-define('PMA_CSDROPDOWN_CHARSET',   1);
-
-/**
- * shared functions for mysql charsets
- */
-require_once './libraries/mysql_charsets.lib.php';
-
diff --git a/#pma/libraries/mysql_charsets.lib.php b/#pma/libraries/mysql_charsets.lib.php
deleted file mode 100644
index 6c272d43..00000000
--- a/#pma/libraries/mysql_charsets.lib.php
+++ /dev/null
@@ -1,377 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Shared code for mysql charsets
- *
- * @package PhpMyAdmin
- */
-use PMA\libraries\Util;
-
-/**
- * Generate charset dropdown box
- *
- * @param int         $type           Type
- * @param string      $name           Element name
- * @param string      $id             Element id
- * @param null|string $default        Default value
- * @param bool        $label          Label
- * @param bool        $submitOnChange Submit on change
- *
- * @return string
- */
-function PMA_generateCharsetDropdownBox($type = PMA_CSDROPDOWN_COLLATION,
-    $name = null, $id = null, $default = null, $label = true,
-    $submitOnChange = false
-) {
-    global $mysql_charsets, $mysql_charsets_descriptions,
-        $mysql_charsets_available, $mysql_collations, $mysql_collations_available;
-
-    if (empty($name)) {
-        if ($type == PMA_CSDROPDOWN_COLLATION) {
-            $name = 'collation';
-        } else {
-            $name = 'character_set';
-        }
-    }
-
-    $return_str  = '<select lang="en" dir="ltr" name="'
-        . htmlspecialchars($name) . '"'
-        . (empty($id) ? '' : ' id="' . htmlspecialchars($id) . '"')
-        . ($submitOnChange ? ' class="autosubmit"' : '') . '>' . "\n";
-    if ($label) {
-        $return_str .= '<option value="">'
-            . ($type == PMA_CSDROPDOWN_COLLATION ? __('Collation') : __('Charset'))
-            . '</option>' . "\n";
-    }
-    $return_str .= '<option value=""></option>' . "\n";
-    foreach ($mysql_charsets as $current_charset) {
-        if (!$mysql_charsets_available[$current_charset]) {
-            continue;
-        }
-        $current_cs_descr
-            = empty($mysql_charsets_descriptions[$current_charset])
-            ? $current_charset
-            : $mysql_charsets_descriptions[$current_charset];
-
-        if ($type == PMA_CSDROPDOWN_COLLATION) {
-            $return_str .= '<optgroup label="' . $current_charset
-                . '" title="' . $current_cs_descr . '">' . "\n";
-            foreach ($mysql_collations[$current_charset] as $current_collation) {
-                if (!$mysql_collations_available[$current_collation]) {
-                    continue;
-                }
-                $return_str .= '<option value="' . $current_collation
-                    . '" title="' . PMA_getCollationDescr($current_collation) . '"'
-                    . ($default == $current_collation ? ' selected="selected"' : '')
-                    . '>'
-                    . $current_collation . '</option>' . "\n";
-            }
-            $return_str .= '</optgroup>' . "\n";
-        } else {
-            $return_str .= '<option value="' . $current_charset
-                . '" title="' . $current_cs_descr . '"'
-                . ($default == $current_charset ? ' selected="selected"' : '') . '>'
-                . $current_charset . '</option>' . "\n";
-        }
-    }
-    $return_str .= '</select>' . "\n";
-
-    return $return_str;
-}
-
-/**
- * Generate the charset query part
- *
- * @param string           $collation Collation
- * @param boolean optional $override  force 'CHARACTER SET' keyword
- *
- * @return string
- */
-function PMA_generateCharsetQueryPart($collation, $override = false)
-{
-    list($charset) = explode('_', $collation);
-    $keyword = ' CHARSET=';
-
-    if ($override) {
-        $keyword = ' CHARACTER SET ';
-    }
-    return $keyword . $charset
-        . ($charset == $collation ? '' : ' COLLATE ' . $collation);
-}
-
-/**
- * returns collation of given db
- *
- * @param string $db name of db
- *
- * @return string  collation of $db
- */
-function PMA_getDbCollation($db)
-{
-    if ($GLOBALS['dbi']->isSystemSchema($db)) {
-        // We don't have to check the collation of the virtual
-        // information_schema database: We know it!
-        return 'utf8_general_ci';
-    }
-
-    if (! $GLOBALS['cfg']['Server']['DisableIS']) {
-        // this is slow with thousands of databases
-        $sql = 'SELECT DEFAULT_COLLATION_NAME FROM information_schema.SCHEMATA'
-            . ' WHERE SCHEMA_NAME = \'' . $GLOBALS['dbi']->escapeString($db)
-            . '\' LIMIT 1';
-        return $GLOBALS['dbi']->fetchValue($sql);
-    } else {
-        $GLOBALS['dbi']->selectDb($db);
-        $return = $GLOBALS['dbi']->fetchValue('SELECT @@collation_database');
-        if ($db !== $GLOBALS['db']) {
-            $GLOBALS['dbi']->selectDb($GLOBALS['db']);
-        }
-        return $return;
-    }
-}
-
-/**
- * returns default server collation from show variables
- *
- * @return string  $server_collation
- */
-function PMA_getServerCollation()
-{
-    return $GLOBALS['dbi']->fetchValue('SELECT @@collation_server');
-}
-
-/**
- * returns description for given collation
- *
- * @param string $collation MySQL collation string
- *
- * @return string  collation description
- */
-function PMA_getCollationDescr($collation)
-{
-    if ($collation == 'binary') {
-        return __('Binary');
-    }
-    $parts = explode('_', $collation);
-    if (count($parts) == 1) {
-        $parts[1] = 'general';
-    } elseif ($parts[1] == 'ci' || $parts[1] == 'cs') {
-        $parts[2] = $parts[1];
-        $parts[1] = 'general';
-    }
-    $descr = '';
-    switch ($parts[1]) {
-    case 'bulgarian':
-        $descr = __('Bulgarian');
-        break;
-    case 'chinese':
-        if ($parts[0] == 'gb2312' || $parts[0] == 'gbk') {
-            $descr = __('Simplified Chinese');
-        } elseif ($parts[0] == 'big5') {
-            $descr = __('Traditional Chinese');
-        }
-        break;
-    case 'ci':
-        $descr = __('case-insensitive');
-        break;
-    case 'cs':
-        $descr = __('case-sensitive');
-        break;
-    case 'croatian':
-        $descr = __('Croatian');
-        break;
-    case 'czech':
-        $descr = __('Czech');
-        break;
-    case 'danish':
-        $descr = __('Danish');
-        break;
-    case 'english':
-        $descr = __('English');
-        break;
-    case 'esperanto':
-        $descr = __('Esperanto');
-        break;
-    case 'estonian':
-        $descr = __('Estonian');
-        break;
-    case 'german1':
-        $descr = __('German') . ' (' . __('dictionary') . ')';
-        break;
-    case 'german2':
-        $descr = __('German') . ' (' . __('phone book') . ')';
-        break;
-    case 'hungarian':
-        $descr = __('Hungarian');
-        break;
-    case 'icelandic':
-        $descr = __('Icelandic');
-        break;
-    case 'japanese':
-        $descr = __('Japanese');
-        break;
-    case 'latvian':
-        $descr = __('Latvian');
-        break;
-    case 'lithuanian':
-        $descr = __('Lithuanian');
-        break;
-    case 'korean':
-        $descr = __('Korean');
-        break;
-    case 'persian':
-        $descr = __('Persian');
-        break;
-    case 'polish':
-        $descr = __('Polish');
-        break;
-    case 'roman':
-        $descr = __('West European');
-        break;
-    case 'romanian':
-        $descr = __('Romanian');
-        break;
-    case 'sinhala':
-        $descr = __('Sinhalese');
-        break;
-    case 'slovak':
-        $descr = __('Slovak');
-        break;
-    case 'slovenian':
-        $descr = __('Slovenian');
-        break;
-    case 'spanish':
-        $descr = __('Spanish');
-        break;
-    case 'spanish2':
-        $descr = __('Traditional Spanish');
-        break;
-    case 'swedish':
-        $descr = __('Swedish');
-        break;
-    case 'thai':
-        $descr = __('Thai');
-        break;
-    case 'turkish':
-        $descr = __('Turkish');
-        break;
-    case 'ukrainian':
-        $descr = __('Ukrainian');
-        break;
-    case 'unicode':
-        $descr = __('Unicode') . ' (' . __('multilingual') . ')';
-        break;
-    case 'vietnamese':
-        $descr = __('Vietnamese');
-        break;
-    /** @noinspection PhpMissingBreakStatementInspection */
-    case 'bin':
-        $is_bin = true;
-        // no break; statement here, continuing with 'general' section:
-    case 'general':
-        switch ($parts[0]) {
-        // Unicode charsets
-        case 'ucs2':
-        case 'utf8':
-        case 'utf8mb4':
-            $descr = __('Unicode') . ' (' . __('multilingual') . ')';
-            break;
-        // West European charsets
-        case 'ascii':
-        case 'cp850':
-        case 'dec8':
-        case 'hp8':
-        case 'latin1':
-        case 'macroman':
-            $descr = __('West European') . ' (' . __('multilingual') . ')';
-            break;
-        // Central European charsets
-        case 'cp1250':
-        case 'cp852':
-        case 'latin2':
-        case 'macce':
-            $descr = __('Central European') . ' (' . __('multilingual') . ')';
-            break;
-        // Russian charsets
-        case 'cp866':
-        case 'koi8r':
-            $descr = __('Russian');
-            break;
-        // Simplified Chinese charsets
-        case 'gb2312':
-        case 'gbk':
-            $descr = __('Simplified Chinese');
-            break;
-        // Japanese charsets
-        case 'sjis':
-        case 'ujis':
-        case 'cp932':
-        case 'eucjpms':
-            $descr = __('Japanese');
-            break;
-        // Baltic charsets
-        case 'cp1257':
-        case 'latin7':
-            $descr = __('Baltic') . ' (' . __('multilingual') . ')';
-            break;
-        // Other
-        case 'armscii8':
-        case 'armscii':
-            $descr = __('Armenian');
-            break;
-        case 'big5':
-            $descr = __('Traditional Chinese');
-            break;
-        case 'cp1251':
-            $descr = __('Cyrillic') . ' (' . __('multilingual') . ')';
-            break;
-        case 'cp1256':
-            $descr = __('Arabic');
-            break;
-        case 'euckr':
-            $descr = __('Korean');
-            break;
-        case 'hebrew':
-            $descr = __('Hebrew');
-            break;
-        case 'geostd8':
-            $descr = __('Georgian');
-            break;
-        case 'greek':
-            $descr = __('Greek');
-            break;
-        case 'keybcs2':
-            $descr = __('Czech-Slovak');
-            break;
-        case 'koi8u':
-            $descr = __('Ukrainian');
-            break;
-        case 'latin5':
-            $descr = __('Turkish');
-            break;
-        case 'swe7':
-            $descr = __('Swedish');
-            break;
-        case 'tis620':
-            $descr = __('Thai');
-            break;
-        default:
-            $descr = __('unknown');
-            break;
-        }
-        if (!empty($is_bin)) {
-            $descr .= ', ' . __('Binary');
-        }
-        break;
-    default: $descr = __('unknown');
-    }
-    if (!empty($parts[2])) {
-        if ($parts[2] == 'ci') {
-            $descr .= ', ' . __('case-insensitive');
-        } elseif ($parts[2] == 'cs') {
-            $descr .= ', ' . __('case-sensitive');
-        }
-    }
-
-    return $descr;
-}
diff --git a/#pma/libraries/mysql_relations.lib.php b/#pma/libraries/mysql_relations.lib.php
deleted file mode 100644
index a6bc43a5..00000000
--- a/#pma/libraries/mysql_relations.lib.php
+++ /dev/null
@@ -1,168 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Internal relations for mysql database.
- *
- * @package PhpMyAdmin
- */
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
-/**
- * Internal relations for mysql database.
- */
-$GLOBALS['mysql_relations'] = array(
-    'columns_priv' => array(
-        'Db' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'SCHEMATA',
-            'foreign_field' => 'SCHEMA_NAME'
-        ),
-    ),
-    'db' => array(
-        'Db' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'SCHEMATA',
-            'foreign_field' => 'SCHEMA_NAME'
-        ),
-    ),
-    'event' => array(
-        'db' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'SCHEMATA',
-            'foreign_field' => 'SCHEMA_NAME'
-        ),
-        'character_set_client' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'CHARACTER_SETS',
-            'foreign_field' => 'CHARACTER_SET_NAME'
-        ),
-        'collation_connection' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'COLLATIONS',
-            'foreign_field' => 'COLLATION_NAME'
-        ),
-        'db_collation' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'COLLATIONS',
-            'foreign_field' => 'COLLATION_NAME'
-        ),
-    ),
-    'help_category' => array(
-        'parent_category_id' => array(
-            'foreign_db'    => 'mysql',
-            'foreign_table' => 'help_category',
-            'foreign_field' => 'help_category_id'
-        ),
-    ),
-    'help_relation' => array(
-        'help_topic_id' => array(
-            'foreign_db'    => 'mysql',
-            'foreign_table' => 'help_topic',
-            'foreign_field' => 'help_topic_id'
-        ),
-        'help_keyword_id' => array(
-            'foreign_db'    => 'mysql',
-            'foreign_table' => 'help_keyword',
-            'foreign_field' => 'help_keyword_id'
-        ),
-    ),
-    'help_topic' => array(
-        'help_category_id' => array(
-            'foreign_db'    => 'mysql',
-            'foreign_table' => 'help_category',
-            'foreign_field' => 'help_category_id'
-        ),
-    ),
-    'innodb_index_stats' => array(
-        'database_name' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'SCHEMATA',
-            'foreign_field' => 'SCHEMA_NAME'
-        ),
-    ),
-    'innodb_table_stats' => array(
-        'database_name' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'SCHEMATA',
-            'foreign_field' => 'SCHEMA_NAME'
-        ),
-    ),
-    'proc' => array(
-        'db' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'SCHEMATA',
-            'foreign_field' => 'SCHEMA_NAME'
-        ),
-        'character_set_client' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'CHARACTER_SETS',
-            'foreign_field' => 'CHARACTER_SET_NAME'
-        ),
-        'collation_connection' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'COLLATIONS',
-            'foreign_field' => 'COLLATION_NAME'
-        ),
-        'db_collation' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'COLLATIONS',
-            'foreign_field' => 'COLLATION_NAME'
-        ),
-    ),
-    'proc_priv' => array(
-        'Db' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'SCHEMATA',
-            'foreign_field' => 'SCHEMA_NAME'
-        ),
-    ),
-    'servers' => array(
-        'Db' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'SCHEMATA',
-            'foreign_field' => 'SCHEMA_NAME'
-        ),
-    ),
-    'slow_log' => array(
-        'db' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'SCHEMATA',
-            'foreign_field' => 'SCHEMA_NAME'
-        ),
-    ),
-    'tables_priv' => array(
-        'Db' => array(
-            'foreign_db'    => 'information_schema',
-            'foreign_table' => 'SCHEMATA',
-            'foreign_field' => 'SCHEMA_NAME'
-        ),
-    ),
-    'time_zone_name' => array(
-        'Time_zone_id' => array(
-            'foreign_db'    => 'mysql',
-            'foreign_table' => 'time_zone',
-            'foreign_field' => 'Time_zone_id'
-        ),
-    ),
-    'time_zone_transition' => array(
-        'Time_zone_id' => array(
-            'foreign_db'    => 'mysql',
-            'foreign_table' => 'time_zone',
-            'foreign_field' => 'Time_zone_id'
-        ),
-        'Transition_time' => array(
-            'foreign_db'    => 'mysql',
-            'foreign_table' => 'time_zone_leap_second',
-            'foreign_field' => 'Transition_time'
-        )
-    ),
-    'time_zone_transition_type' => array(
-        'Time_zone_id' => array(
-            'foreign_db'    => 'mysql',
-            'foreign_table' => 'time_zone',
-            'foreign_field' => 'Time_zone_id'
-        ),
-    ),
-);
diff --git a/#pma/libraries/navigation/Navigation.php b/#pma/libraries/navigation/Navigation.php
deleted file mode 100644
index 87701be7..00000000
--- a/#pma/libraries/navigation/Navigation.php
+++ /dev/null
@@ -1,232 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * This class is responsible for instantiating
- * the various components of the navigation panel
- *
- * @package PhpMyAdmin-navigation
- */
-namespace PMA\libraries\navigation;
-
-use PMA\libraries\config\PageSettings;
-use PMA\libraries\Message;
-use PMA\libraries\Response;
-use PMA\libraries\Util;
-
-/**
- * The navigation panel - displays server, db and table selection tree
- *
- * @package PhpMyAdmin-Navigation
- */
-class Navigation
-{
-    /**
-     * Renders the navigation tree, or part of it
-     *
-     * @return string The navigation tree
-     */
-    public function getDisplay()
-    {
-        /* Init */
-        $retval = '';
-        if (!Response::getInstance()->isAjax()) {
-            $header = new NavigationHeader();
-            $retval = $header->getDisplay();
-        }
-        $tree = new NavigationTree();
-        if (! Response::getInstance()->isAjax()
-            || ! empty($_REQUEST['full'])
-            || ! empty($_REQUEST['reload'])
-        ) {
-            if ($GLOBALS['cfg']['ShowDatabasesNavigationAsTree']) {
-                // provide database tree in navigation
-                $navRender = $tree->renderState();
-            } else {
-                // provide legacy pre-4.0 navigation
-                $navRender = $tree->renderDbSelect();
-            }
-        } else {
-            $navRender = $tree->renderPath();
-        }
-        if (! $navRender) {
-            $retval .= Message::error(
-                __('An error has occurred while loading the navigation display')
-            )->getDisplay();
-        } else {
-            $retval .= $navRender;
-        }
-
-        if (! Response::getInstance()->isAjax()) {
-            // closes the tags that were opened by the navigation header
-            $retval .= '</div>'; // pma_navigation_tree
-            $retval .= '<div id="pma_navi_settings_container">';
-            if (!defined('PMA_DISABLE_NAVI_SETTINGS')) {
-                $retval .= PageSettings::getNaviSettings();
-            }
-            $retval .= '</div>'; //pma_navi_settings_container
-            $retval .= '</div>'; // pma_navigation_content
-            $retval .= $this->_getDropHandler();
-            $retval .= '</div>'; // pma_navigation
-        }
-
-        return $retval;
-    }
-
-    /**
-     * Add an item of navigation tree to the hidden items list in PMA database.
-     *
-     * @param string $itemName  name of the navigation tree item
-     * @param string $itemType  type of the navigation tree item
-     * @param string $dbName    database name
-     * @param string $tableName table name if applicable
-     *
-     * @return void
-     */
-    public function hideNavigationItem(
-        $itemName, $itemType, $dbName, $tableName = null
-    ) {
-        $navTable = Util::backquote($GLOBALS['cfgRelation']['db'])
-            . "." . Util::backquote($GLOBALS['cfgRelation']['navigationhiding']);
-        $sqlQuery = "INSERT INTO " . $navTable
-            . "(`username`, `item_name`, `item_type`, `db_name`, `table_name`)"
-            . " VALUES ("
-            . "'" . $GLOBALS['dbi']->escapeString($GLOBALS['cfg']['Server']['user']) . "',"
-            . "'" . $GLOBALS['dbi']->escapeString($itemName) . "',"
-            . "'" . $GLOBALS['dbi']->escapeString($itemType) . "',"
-            . "'" . $GLOBALS['dbi']->escapeString($dbName) . "',"
-            . "'" . (! empty($tableName)? $GLOBALS['dbi']->escapeString($tableName) : "" )
-            . "')";
-        PMA_queryAsControlUser($sqlQuery, false);
-    }
-
-    /**
-     * Inserts Drag and Drop Import handler
-     *
-     * @return string html code for drop handler
-     */
-    private function _getDropHandler()
-    {
-        $retval = '';
-        $retval .= '<div class="pma_drop_handler">'
-            . __('Drop files here')
-            . '</div>';
-        $retval .= '<div class="pma_sql_import_status">';
-        $retval .= '<h2>SQL upload ( ';
-        $retval .= '<span class="pma_import_count">0</span> ';
-        $retval .= ') <span class="close">x</span>';
-        $retval .= '<span class="minimize">-</span></h2>';
-        $retval .= '<div></div>';
-        $retval .= '</div>';
-        return $retval;
-    }
-
-    /**
-     * Remove a hidden item of navigation tree from the
-     * list of hidden items in PMA database.
-     *
-     * @param string $itemName  name of the navigation tree item
-     * @param string $itemType  type of the navigation tree item
-     * @param string $dbName    database name
-     * @param string $tableName table name if applicable
-     *
-     * @return void
-     */
-    public function unhideNavigationItem(
-        $itemName, $itemType, $dbName, $tableName = null
-    ) {
-        $navTable = Util::backquote($GLOBALS['cfgRelation']['db'])
-            . "." . Util::backquote($GLOBALS['cfgRelation']['navigationhiding']);
-        $sqlQuery = "DELETE FROM " . $navTable
-            . " WHERE"
-            . " `username`='"
-            . $GLOBALS['dbi']->escapeString($GLOBALS['cfg']['Server']['user']) . "'"
-            . " AND `item_name`='" . $GLOBALS['dbi']->escapeString($itemName) . "'"
-            . " AND `item_type`='" . $GLOBALS['dbi']->escapeString($itemType) . "'"
-            . " AND `db_name`='" . $GLOBALS['dbi']->escapeString($dbName) . "'"
-            . (! empty($tableName)
-                ? " AND `table_name`='" . $GLOBALS['dbi']->escapeString($tableName) . "'"
-                : ""
-            );
-        PMA_queryAsControlUser($sqlQuery, false);
-    }
-
-    /**
-     * Returns HTML for the dialog to show hidden navigation items.
-     *
-     * @param string $dbName    database name
-     * @param string $itemType  type of the items to include
-     * @param string $tableName table name
-     *
-     * @return string HTML for the dialog to show hidden navigation items
-     */
-    public function getItemUnhideDialog($dbName, $itemType = null, $tableName = null)
-    {
-        $html  = '<form method="post" action="navigation.php" class="ajax">';
-        $html .= '<fieldset>';
-        $html .= PMA_URL_getHiddenInputs($dbName, $tableName);
-
-        $navTable = Util::backquote($GLOBALS['cfgRelation']['db'])
-            . "." . Util::backquote($GLOBALS['cfgRelation']['navigationhiding']);
-        $sqlQuery = "SELECT `item_name`, `item_type` FROM " . $navTable
-            . " WHERE `username`='"
-            . $GLOBALS['dbi']->escapeString($GLOBALS['cfg']['Server']['user']) . "'"
-            . " AND `db_name`='" . $GLOBALS['dbi']->escapeString($dbName) . "'"
-            . " AND `table_name`='"
-            . (! empty($tableName) ? $GLOBALS['dbi']->escapeString($tableName) : '') . "'";
-        $result = PMA_queryAsControlUser($sqlQuery, false);
-
-        $hidden = array();
-        if ($result) {
-            while ($row = $GLOBALS['dbi']->fetchArray($result)) {
-                $type = $row['item_type'];
-                if (! isset($hidden[$type])) {
-                    $hidden[$type] = array();
-                }
-                $hidden[$type][] = $row['item_name'];
-            }
-        }
-        $GLOBALS['dbi']->freeResult($result);
-
-        $typeMap = array(
-            'group' => __('Groups:'),
-            'event' => __('Events:'),
-            'function' => __('Functions:'),
-            'procedure' => __('Procedures:'),
-            'table' => __('Tables:'),
-            'view' => __('Views:'),
-        );
-        if (empty($tableName)) {
-            $first = true;
-            foreach ($typeMap as $t => $lable) {
-                if ((empty($itemType) || $itemType == $t)
-                    && isset($hidden[$t])
-                ) {
-                    $html .= (! $first ? '<br/>' : '')
-                        . '<strong>' . $lable . '</strong>';
-                    $html .= '<table width="100%"><tbody>';
-                    $odd = true;
-                    foreach ($hidden[$t] as $hiddenItem) {
-                        $html .= '<tr class="' . ($odd ? 'odd' : 'even') . '">';
-                        $html .= '<td>' . htmlspecialchars($hiddenItem) . '</td>';
-                        $html .= '<td style="width:80px"><a href="navigation.php'
-                            . PMA_URL_getCommon()
-                            . '&unhideNavItem=true'
-                            . '&itemType=' . urlencode($t)
-                            . '&itemName=' . urlencode($hiddenItem)
-                            . '&dbName=' . urlencode($dbName) . '"'
-                            . ' class="unhideNavItem ajax">'
-                            . Util::getIcon('lightbulb.png', __('Show'))
-                            .  '</a></td>';
-                        $odd = ! $odd;
-                    }
-                    $html .= '</tbody></table>';
-                    $first = false;
-                }
-            }
-        }
-
-        $html .= '</fieldset>';
-        $html .= '</form>';
-        return $html;
-    }
-}
diff --git a/#pma/libraries/navigation/NavigationHeader.php b/#pma/libraries/navigation/NavigationHeader.php
deleted file mode 100644
index faa8b55d..00000000
--- a/#pma/libraries/navigation/NavigationHeader.php
+++ /dev/null
@@ -1,249 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Header for the navigation panel
- *
- * @package PhpMyAdmin-Navigation
- */
-namespace PMA\libraries\navigation;
-
-use PMA;
-use PMA\libraries\Template;
-
-/**
- * This class renders the logo, links, server selection,
- * which are then displayed at the top of the navigation panel
- *
- * @package PhpMyAdmin-Navigation
- */
-class NavigationHeader
-{
-    /**
-     * Renders the navigation
-     *
-     * @return String HTML
-     */
-    public function getDisplay()
-    {
-        if (empty($GLOBALS['url_query'])) {
-            $GLOBALS['url_query'] = PMA_URL_getCommon();
-        }
-        $link_url = PMA_URL_getCommon(
-            array(
-                'ajax_request' => true,
-            )
-        );
-        $class = ' class="list_container';
-        if ($GLOBALS['cfg']['NavigationLinkWithMainPanel']) {
-            $class .= ' synced';
-        }
-        if ($GLOBALS['cfg']['NavigationTreePointerEnable']) {
-            $class .= ' highlight';
-        }
-        $class .= '"';
-        $buffer = '<div id="pma_navigation">';
-        $buffer .= '<div id="pma_navigation_resizer"></div>';
-        $buffer .= '<div id="pma_navigation_collapser"></div>';
-        $buffer .= '<div id="pma_navigation_content">';
-        $buffer .= '<div id="pma_navigation_header">';
-        $buffer .= sprintf(
-            '<a class="hide navigation_url" href="navigation.php%s"></a>',
-            $link_url
-        );
-        $buffer .= $this->_logo();
-        $buffer .= $this->_links();
-        $buffer .= $this->_serverChoice();
-        $buffer .= PMA\libraries\Util::getImage(
-            'ajax_clock_small.gif',
-            __('Loading…'),
-            array(
-                'style' => 'visibility: hidden; display:none',
-                'class' => 'throbber',
-            )
-        );
-        $buffer .= '</div>'; // pma_navigation_header
-        $buffer .= '<div id="pma_navigation_tree"' . $class . '>';
-
-        return $buffer;
-    }
-
-    /**
-     * Create the code for displaying the phpMyAdmin
-     * logo based on configuration settings
-     *
-     * @return string HTML code for the logo
-     */
-    private function _logo()
-    {
-        // display Logo, depending on $GLOBALS['cfg']['NavigationDisplayLogo']
-        if (!$GLOBALS['cfg']['NavigationDisplayLogo']) {
-            return Template::get('navigation/logo')
-                ->render(array('displayLogo' => false));
-        }
-
-        $logo = 'phpMyAdmin';
-        if (@file_exists($GLOBALS['pmaThemeImage'] . 'logo_left.png')) {
-            $logo = '<img src="' . $GLOBALS['pmaThemeImage'] . 'logo_left.png" '
-                . 'alt="' . $logo . '" id="imgpmalogo" />';
-        } elseif (@file_exists($GLOBALS['pmaThemeImage'] . 'pma_logo2.png')) {
-            $logo = '<img src="' . $GLOBALS['pmaThemeImage'] . 'pma_logo2.png" '
-                . 'alt="' . $logo . '" id="imgpmalogo" />';
-        }
-
-        if (!$GLOBALS['cfg']['NavigationLogoLink']) {
-            return Template::get('navigation/logo')
-                ->render(
-                    array(
-                        'displayLogo' => true,
-                        'useLogoLink' => false,
-                        'logo'        => $logo,
-                    )
-                );
-        }
-
-        $useLogoLink = true;
-        $linkAttriks = null;
-        $logoLink = trim(
-            htmlspecialchars($GLOBALS['cfg']['NavigationLogoLink'])
-        );
-        // prevent XSS, see PMASA-2013-9
-        // if link has protocol, allow only http and https
-        if (! PMA_checkLink($logoLink, true)) {
-            $logoLink = 'index.php';
-        }
-        switch ($GLOBALS['cfg']['NavigationLogoLinkWindow']) {
-        case 'new':
-            $linkAttriks = 'target="_blank" rel="noopener noreferrer"';
-            break;
-        case 'main':
-            // do not add our parameters for an external link
-            $host = parse_url(
-                $GLOBALS['cfg']['NavigationLogoLink'],
-                PHP_URL_HOST
-            );
-            if (empty($host)) {
-                $logoLink .= PMA_URL_getCommon();
-            } else {
-                $linkAttriks = 'target="_blank" rel="noopener noreferrer"';
-            }
-        }
-
-        return Template::get('navigation/logo')
-            ->render(
-                array(
-                    'displayLogo' => true,
-                    'useLogoLink' => $useLogoLink,
-                    'logoLink'    => $logoLink,
-                    'linkAttribs' => $linkAttriks,
-                    'logo'        => $logo,
-                )
-            );
-    }
-
-    /**
-     * Creates the code for displaying the links
-     * at the top of the navigation panel
-     *
-     * @return string HTML code for the links
-     */
-    private function _links()
-    {
-        // always iconic
-        $showIcon = true;
-        $showText = false;
-
-        $retval = '<!-- LINKS START -->';
-        $retval .= '<div id="navipanellinks">';
-        $retval .= PMA\libraries\Util::getNavigationLink(
-            'index.php' . PMA_URL_getCommon(),
-            $showText,
-            __('Home'),
-            $showIcon,
-            'b_home.png'
-        );
-        // if we have chosen server
-        if ($GLOBALS['server'] != 0) {
-            // Logout for advanced authentication
-            if ($GLOBALS['cfg']['Server']['auth_type'] != 'config') {
-                $text = __('Log out');
-            } else {
-                $text = __('Empty session data');
-            }
-            $link = 'logout.php' . $GLOBALS['url_query'];
-            $retval .= PMA\libraries\Util::getNavigationLink(
-                $link,
-                $showText,
-                $text,
-                $showIcon,
-                's_loggoff.png',
-                '',
-                true
-            );
-        }
-        $retval .= PMA\libraries\Util::getNavigationLink(
-            PMA\libraries\Util::getDocuLink('index'),
-            $showText,
-            __('phpMyAdmin documentation'),
-            $showIcon,
-            'b_docs.png',
-            '',
-            false,
-            'documentation'
-        );
-        $retval .= PMA\libraries\Util::getNavigationLink(
-            PMA\libraries\Util::getMySQLDocuURL('', ''),
-            $showText,
-            __('Documentation'),
-            $showIcon,
-            'b_sqlhelp.png',
-            '',
-            false,
-            'mysql_doc'
-        );
-        $retval .= PMA\libraries\Util::getNavigationLink(
-            '#',
-            $showText,
-            __('Navigation panel settings'),
-            $showIcon,
-            's_cog.png',
-            'pma_navigation_settings_icon',
-            false,
-            '',
-            defined('PMA_DISABLE_NAVI_SETTINGS') ? array('hide') : array()
-        );
-        $retval .= PMA\libraries\Util::getNavigationLink(
-            '#',
-            $showText,
-            __('Reload navigation panel'),
-            $showIcon,
-            's_reload.png',
-            'pma_navigation_reload'
-        );
-        $retval .= '</div>';
-        $retval .= '<!-- LINKS ENDS -->';
-
-        return $retval;
-    }
-
-    /**
-     * Displays the MySQL servers choice form
-     *
-     * @return string HTML code for the MySQL servers choice
-     */
-    private function _serverChoice()
-    {
-        $retval = '';
-        if ($GLOBALS['cfg']['NavigationDisplayServers']
-            && count($GLOBALS['cfg']['Servers']) > 1
-        ) {
-            include_once './libraries/select_server.lib.php';
-            $retval .= '<!-- SERVER CHOICE START -->';
-            $retval .= '<div id="serverChoice">';
-            $retval .= PMA_selectServer(true, true);
-            $retval .= '</div>';
-            $retval .= '<!-- SERVER CHOICE END -->';
-        }
-
-        return $retval;
-    }
-}
diff --git a/#pma/libraries/navigation/NavigationTree.php b/#pma/libraries/navigation/NavigationTree.php
deleted file mode 100644
index 2b7ca44a..00000000
--- a/#pma/libraries/navigation/NavigationTree.php
+++ /dev/null
@@ -1,1560 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Functionality for the navigation tree
- *
- * @package PhpMyAdmin-Navigation
- */
-namespace PMA\libraries\navigation;
-
-use PMA\libraries\navigation\nodes\Node;
-use PMA\libraries\navigation\nodes\NodeDatabase;
-use PMA\libraries\navigation\nodes\NodeTable;
-use PMA\libraries\navigation\nodes\NodeTableContainer;
-use PMA\libraries\navigation\nodes\NodeViewContainer;
-use PMA\libraries\RecentFavoriteTable;
-use PMA\libraries\Response;
-use PMA\libraries\Util;
-
-/**
- * Displays a collapsible of database objects in the navigation frame
- *
- * @package PhpMyAdmin-Navigation
- */
-class NavigationTree
-{
-    /**
-     * @var Node Reference to the root node of the tree
-     */
-    private $_tree;
-    /**
-     * @var array The actual paths to all expanded nodes in the tree
-     *            This does not include nodes created after the grouping
-     *            of nodes has been performed
-     */
-    private $_aPath = array();
-    /**
-     * @var array The virtual paths to all expanded nodes in the tree
-     *            This includes nodes created after the grouping of
-     *            nodes has been performed
-     */
-    private $_vPath = array();
-    /**
-     * @var int Position in the list of databases,
-     *          used for pagination
-     */
-    private $_pos;
-    /**
-     * @var array The names of the type of items that are being paginated on
-     *            the second level of the navigation tree. These may be
-     *            tables, views, functions, procedures or events.
-     */
-    private $_pos2_name = array();
-    /**
-     * @var array The positions of nodes in the lists of tables, views,
-     *            routines or events used for pagination
-     */
-    private $_pos2_value = array();
-    /**
-     * @var array The names of the type of items that are being paginated
-     *            on the second level of the navigation tree.
-     *            These may be columns or indexes
-     */
-    private $_pos3_name = array();
-    /**
-     * @var array The positions of nodes in the lists of columns or indexes
-     *            used for pagination
-     */
-    private $_pos3_value = array();
-    /**
-     * @var string The search clause to use in SQL queries for
-     *             fetching databases
-     *             Used by the asynchronous fast filter
-     */
-    private $_searchClause = '';
-    /**
-     * @var string The search clause to use in SQL queries for
-     *             fetching nodes
-     *             Used by the asynchronous fast filter
-     */
-    private $_searchClause2 = '';
-    /**
-     * @var bool Whether a warning was raised for large item groups
-     *           which can affect performance.
-     */
-    private $_largeGroupWarning = false;
-
-    /**
-     * Initialises the class
-     */
-    public function __construct()
-    {
-        // Save the position at which we are in the database list
-        if (isset($_REQUEST['pos'])) {
-            $this->_pos = (int)$_REQUEST['pos'];
-        }
-        if (!isset($this->_pos)) {
-            $this->_pos = $this->_getNavigationDbPos();
-        }
-        // Get the active node
-        if (isset($_REQUEST['aPath'])) {
-            $this->_aPath[0] = $this->_parsePath($_REQUEST['aPath']);
-            $this->_pos2_name[0] = $_REQUEST['pos2_name'];
-            $this->_pos2_value[0] = $_REQUEST['pos2_value'];
-            if (isset($_REQUEST['pos3_name'])) {
-                $this->_pos3_name[0] = $_REQUEST['pos3_name'];
-                $this->_pos3_value[0] = $_REQUEST['pos3_value'];
-            }
-        } else {
-            if (isset($_REQUEST['n0_aPath'])) {
-                $count = 0;
-                while (isset($_REQUEST['n' . $count . '_aPath'])) {
-                    $this->_aPath[$count] = $this->_parsePath(
-                        $_REQUEST['n' . $count . '_aPath']
-                    );
-                    $index = 'n' . $count . '_pos2_';
-                    $this->_pos2_name[$count] = $_REQUEST[$index . 'name'];
-                    $this->_pos2_value[$count] = $_REQUEST[$index . 'value'];
-                    $index = 'n' . $count . '_pos3_';
-                    if (isset($_REQUEST[$index])) {
-                        $this->_pos3_name[$count] = $_REQUEST[$index . 'name'];
-                        $this->_pos3_value[$count] = $_REQUEST[$index . 'value'];
-                    }
-                    $count++;
-                }
-            }
-        }
-        if (isset($_REQUEST['vPath'])) {
-            $this->_vPath[0] = $this->_parsePath($_REQUEST['vPath']);
-        } else {
-            if (isset($_REQUEST['n0_vPath'])) {
-                $count = 0;
-                while (isset($_REQUEST['n' . $count . '_vPath'])) {
-                    $this->_vPath[$count] = $this->_parsePath(
-                        $_REQUEST['n' . $count . '_vPath']
-                    );
-                    $count++;
-                }
-            }
-        }
-        if (isset($_REQUEST['searchClause'])) {
-            $this->_searchClause = $_REQUEST['searchClause'];
-        }
-        if (isset($_REQUEST['searchClause2'])) {
-            $this->_searchClause2 = $_REQUEST['searchClause2'];
-        }
-        // Initialise the tree by creating a root node
-        $node = NodeFactory::getInstance('NodeDatabaseContainer', 'root');
-        $this->_tree = $node;
-        if ($GLOBALS['cfg']['NavigationTreeEnableGrouping']
-            && $GLOBALS['cfg']['ShowDatabasesNavigationAsTree']
-        ) {
-            $this->_tree->separator = $GLOBALS['cfg']['NavigationTreeDbSeparator'];
-            $this->_tree->separator_depth = 10000;
-        }
-    }
-
-    /**
-     * Returns the database position for the page selector
-     *
-     * @return int
-     */
-    private function _getNavigationDbPos()
-    {
-        $retval = 0;
-
-        if (empty($GLOBALS['db'])) {
-            return $retval;
-        }
-
-        /*
-         * @todo describe a scenario where this code is executed
-         */
-        if (!$GLOBALS['cfg']['Server']['DisableIS']) {
-            $query = "SELECT (COUNT(DB_first_level) DIV %d) * %d ";
-            $query .= "from ( ";
-            $query .= " SELECT distinct SUBSTRING_INDEX(SCHEMA_NAME, ";
-            $query .= " '" . $GLOBALS['dbi']->escapeString($GLOBALS['cfg']['NavigationTreeDbSeparator']) . "', 1) ";
-            $query .= " DB_first_level ";
-            $query .= " FROM INFORMATION_SCHEMA.SCHEMATA ";
-            $query .= " WHERE `SCHEMA_NAME` < '%s' ";
-            $query .= ") t ";
-
-            $retval = $GLOBALS['dbi']->fetchValue(
-                sprintf(
-                    $query,
-                    (int)$GLOBALS['cfg']['FirstLevelNavigationItems'],
-                    (int)$GLOBALS['cfg']['FirstLevelNavigationItems'],
-                    $GLOBALS['dbi']->escapeString($GLOBALS['db'])
-                )
-            );
-
-            return $retval;
-        }
-
-        $prefixMap = array();
-        if ($GLOBALS['dbs_to_test'] === false) {
-            $handle = $GLOBALS['dbi']->tryQuery("SHOW DATABASES");
-            if ($handle !== false) {
-                while ($arr = $GLOBALS['dbi']->fetchArray($handle)) {
-                    if (strcasecmp($arr[0], $GLOBALS['db']) >= 0) {
-                        break;
-                    }
-
-                    $prefix = strstr(
-                        $arr[0],
-                        $GLOBALS['cfg']['NavigationTreeDbSeparator'],
-                        true
-                    );
-                    if ($prefix === false) {
-                        $prefix = $arr[0];
-                    }
-                    $prefixMap[$prefix] = 1;
-                }
-            }
-        } else {
-            $databases = array();
-            foreach ($GLOBALS['dbs_to_test'] as $db) {
-                $query = "SHOW DATABASES LIKE '" . $db . "'";
-                $handle = $GLOBALS['dbi']->tryQuery($query);
-                if ($handle === false) {
-                    continue;
-                }
-                while ($arr = $GLOBALS['dbi']->fetchArray($handle)) {
-                    $databases[] = $arr[0];
-                }
-            }
-            sort($databases);
-            foreach ($databases as $database) {
-                if (strcasecmp($database, $GLOBALS['db']) >= 0) {
-                    break;
-                }
-
-                $prefix = strstr(
-                    $database,
-                    $GLOBALS['cfg']['NavigationTreeDbSeparator'],
-                    true
-                );
-                if ($prefix === false) {
-                    $prefix = $database;
-                }
-                $prefixMap[$prefix] = 1;
-            }
-        }
-
-        $navItems = (int)$GLOBALS['cfg']['FirstLevelNavigationItems'];
-        $retval = floor((count($prefixMap) / $navItems)) * $navItems;
-
-        return $retval;
-    }
-
-    /**
-     * Converts an encoded path to a node in string format to an array
-     *
-     * @param string $string The path to parse
-     *
-     * @return array
-     */
-    private function _parsePath($string)
-    {
-        $path = explode('.', $string);
-        foreach ($path as $key => $value) {
-            $path[$key] = base64_decode($value);
-        }
-
-        return $path;
-    }
-
-    /**
-     * Generates the tree structure so that it can be rendered later
-     *
-     * @return Node|false The active node or false in case of failure
-     */
-    private function _buildPath()
-    {
-        $retval = $this->_tree;
-
-        // Add all databases unconditionally
-        $data = $this->_tree->getData(
-            'databases',
-            $this->_pos,
-            $this->_searchClause
-        );
-        $hiddenCounts = $this->_tree->getNavigationHidingData();
-        foreach ($data as $db) {
-            $node = NodeFactory::getInstance('NodeDatabase', $db);
-            if (isset($hiddenCounts[$db])) {
-                $node->setHiddenCount($hiddenCounts[$db]);
-            }
-            $this->_tree->addChild($node);
-        }
-
-        // Whether build other parts of the tree depends
-        // on whether we have any paths in $this->_aPath
-        foreach ($this->_aPath as $key => $path) {
-            $retval = $this->_buildPathPart(
-                $path,
-                $this->_pos2_name[$key],
-                $this->_pos2_value[$key],
-                isset($this->_pos3_name[$key]) ? $this->_pos3_name[$key] : '',
-                isset($this->_pos3_value[$key]) ? $this->_pos3_value[$key] : ''
-            );
-        }
-
-        return $retval;
-    }
-
-    /**
-     * Builds a branch of the tree
-     *
-     * @param array  $path  A paths pointing to the branch
-     *                      of the tree that needs to be built
-     * @param string $type2 The type of item being paginated on
-     *                      the second level of the tree
-     * @param int    $pos2  The position for the pagination of
-     *                      the branch at the second level of the tree
-     * @param string $type3 The type of item being paginated on
-     *                      the third level of the tree
-     * @param int    $pos3  The position for the pagination of
-     *                      the branch at the third level of the tree
-     *
-     * @return Node|false The active node or false in case of failure
-     */
-    private function _buildPathPart($path, $type2, $pos2, $type3, $pos3)
-    {
-        if (empty($pos2)) {
-            $pos2 = 0;
-        }
-        if (empty($pos3)) {
-            $pos3 = 0;
-        }
-
-        $retval = true;
-        if (count($path) <= 1) {
-            return $retval;
-        }
-
-        array_shift($path); // remove 'root'
-        /* @var $db NodeDatabase */
-        $db = $this->_tree->getChild($path[0]);
-        $retval = $db;
-
-        if ($db === false) {
-            return false;
-        }
-
-        $containers = $this->_addDbContainers($db, $type2, $pos2);
-
-        array_shift($path); // remove db
-
-        if ((count($path) <= 0 || !array_key_exists($path[0], $containers))
-            && count($containers) != 1
-        ) {
-            return $retval;
-        }
-
-        if (count($containers) == 1) {
-            $container = array_shift($containers);
-        } else {
-            $container = $db->getChild($path[0], true);
-            if ($container === false) {
-                return false;
-            }
-        }
-        $retval = $container;
-
-        if (count($container->children) <= 1) {
-            $dbData = $db->getData(
-                $container->real_name,
-                $pos2,
-                $this->_searchClause2
-            );
-            foreach ($dbData as $item) {
-                switch ($container->real_name) {
-                case 'events':
-                    $node = NodeFactory::getInstance(
-                        'NodeEvent',
-                        $item
-                    );
-                    break;
-                case 'functions':
-                    $node = NodeFactory::getInstance(
-                        'NodeFunction',
-                        $item
-                    );
-                    break;
-                case 'procedures':
-                    $node = NodeFactory::getInstance(
-                        'NodeProcedure',
-                        $item
-                    );
-                    break;
-                case 'tables':
-                    $node = NodeFactory::getInstance(
-                        'NodeTable',
-                        $item
-                    );
-                    break;
-                case 'views':
-                    $node = NodeFactory::getInstance(
-                        'NodeView',
-                        $item
-                    );
-                    break;
-                default:
-                    break;
-                }
-                if (isset($node)) {
-                    if ($type2 == $container->real_name) {
-                        $node->pos2 = $pos2;
-                    }
-                    $container->addChild($node);
-                }
-            }
-        }
-        if (count($path) > 1 && $path[0] != 'tables') {
-            $retval = false;
-
-            return $retval;
-        }
-
-        array_shift($path); // remove container
-        if (count($path) <= 0) {
-            return $retval;
-        }
-
-        /* @var $table NodeTable */
-        $table = $container->getChild($path[0], true);
-        if ($table === false) {
-            if (!$db->getPresence('tables', $path[0])) {
-                return false;
-            }
-
-            $node = NodeFactory::getInstance(
-                'NodeTable',
-                $path[0]
-            );
-            if ($type2 == $container->real_name) {
-                $node->pos2 = $pos2;
-            }
-            $container->addChild($node);
-            $table = $container->getChild($path[0], true);
-        }
-        $retval = $table;
-        $containers = $this->_addTableContainers(
-            $table,
-            $pos2,
-            $type3,
-            $pos3
-        );
-        array_shift($path); // remove table
-        if (count($path) <= 0
-            || !array_key_exists($path[0], $containers)
-        ) {
-            return $retval;
-        }
-
-        $container = $table->getChild($path[0], true);
-        $retval = $container;
-        $tableData = $table->getData(
-            $container->real_name,
-            $pos3
-        );
-        foreach ($tableData as $item) {
-            switch ($container->real_name) {
-            case 'indexes':
-                $node = NodeFactory::getInstance(
-                    'NodeIndex',
-                    $item
-                );
-                break;
-            case 'columns':
-                $node = NodeFactory::getInstance(
-                    'NodeColumn',
-                    $item
-                );
-                break;
-            case 'triggers':
-                $node = NodeFactory::getInstance(
-                    'NodeTrigger',
-                    $item
-                );
-                break;
-            default:
-                break;
-            }
-            if (isset($node)) {
-                $node->pos2 = $container->parent->pos2;
-                if ($type3 == $container->real_name) {
-                    $node->pos3 = $pos3;
-                }
-                $container->addChild($node);
-            }
-        }
-
-        return $retval;
-    }
-
-    /**
-     * Adds containers to a node that is a table
-     *
-     * References to existing children are returned
-     * if this function is called twice on the same node
-     *
-     * @param NodeTable $table The table node, new containers will be
-     *                         attached to this node
-     * @param int       $pos2  The position for the pagination of
-     *                         the branch at the second level of the tree
-     * @param string    $type3 The type of item being paginated on
-     *                         the third level of the tree
-     * @param int       $pos3  The position for the pagination of
-     *                         the branch at the third level of the tree
-     *
-     * @return array An array of new nodes
-     */
-    private function _addTableContainers($table, $pos2, $type3, $pos3)
-    {
-        $retval = array();
-        if ($table->hasChildren(true) == 0) {
-            if ($table->getPresence('columns')) {
-                $retval['columns'] = NodeFactory::getInstance(
-                    'NodeColumnContainer'
-                );
-            }
-            if ($table->getPresence('indexes')) {
-                $retval['indexes'] = NodeFactory::getInstance(
-                    'NodeIndexContainer'
-                );
-            }
-            if ($table->getPresence('triggers')) {
-                $retval['triggers'] = NodeFactory::getInstance(
-                    'NodeTriggerContainer'
-                );
-            }
-            // Add all new Nodes to the tree
-            foreach ($retval as $node) {
-                $node->pos2 = $pos2;
-                if ($type3 == $node->real_name) {
-                    $node->pos3 = $pos3;
-                }
-                $table->addChild($node);
-            }
-        } else {
-            foreach ($table->children as $node) {
-                if ($type3 == $node->real_name) {
-                    $node->pos3 = $pos3;
-                }
-                $retval[$node->real_name] = $node;
-            }
-        }
-
-        return $retval;
-    }
-
-    /**
-     * Adds containers to a node that is a database
-     *
-     * References to existing children are returned
-     * if this function is called twice on the same node
-     *
-     * @param NodeDatabase $db   The database node, new containers will be
-     *                           attached to this node
-     * @param string       $type The type of item being paginated on
-     *                           the second level of the tree
-     * @param int          $pos2 The position for the pagination of
-     *                           the branch at the second level of the tree
-     *
-     * @return array An array of new nodes
-     */
-    private function _addDbContainers($db, $type, $pos2)
-    {
-        // Get items to hide
-        $hidden = $db->getHiddenItems('group');
-        if (!$GLOBALS['cfg']['NavigationTreeShowTables']
-            && !in_array('tables', $hidden)
-        ) {
-            $hidden[] = 'tables';
-        }
-        if (!$GLOBALS['cfg']['NavigationTreeShowViews']
-            && !in_array('views', $hidden)
-        ) {
-            $hidden[] = 'views';
-        }
-        if (!$GLOBALS['cfg']['NavigationTreeShowFunctions']
-            && !in_array('functions', $hidden)
-        ) {
-            $hidden[] = 'functions';
-        }
-        if (!$GLOBALS['cfg']['NavigationTreeShowProcedures']
-            && !in_array('procedures', $hidden)
-        ) {
-            $hidden[] = 'procedures';
-        }
-        if (!$GLOBALS['cfg']['NavigationTreeShowEvents']
-            && !in_array('events', $hidden)
-        ) {
-            $hidden[] = 'events';
-        }
-
-        $retval = array();
-        if ($db->hasChildren(true) == 0) {
-            if (!in_array('tables', $hidden) && $db->getPresence('tables')) {
-                $retval['tables'] = NodeFactory::getInstance(
-                    'NodeTableContainer'
-                );
-            }
-            if (!in_array('views', $hidden) && $db->getPresence('views')) {
-                $retval['views'] = NodeFactory::getInstance(
-                    'NodeViewContainer'
-                );
-            }
-            if (!in_array('functions', $hidden) && $db->getPresence('functions')) {
-                $retval['functions'] = NodeFactory::getInstance(
-                    'NodeFunctionContainer'
-                );
-            }
-            if (!in_array('procedures', $hidden) && $db->getPresence('procedures')) {
-                $retval['procedures'] = NodeFactory::getInstance(
-                    'NodeProcedureContainer'
-                );
-            }
-            if (!in_array('events', $hidden) && $db->getPresence('events')) {
-                $retval['events'] = NodeFactory::getInstance(
-                    'NodeEventContainer'
-                );
-            }
-            // Add all new Nodes to the tree
-            foreach ($retval as $node) {
-                if ($type == $node->real_name) {
-                    $node->pos2 = $pos2;
-                }
-                $db->addChild($node);
-            }
-        } else {
-            foreach ($db->children as $node) {
-                if ($type == $node->real_name) {
-                    $node->pos2 = $pos2;
-                }
-                $retval[$node->real_name] = $node;
-            }
-        }
-
-        return $retval;
-    }
-
-    /**
-     * Recursively groups tree nodes given a separator
-     *
-     * @param mixed $node The node to group or null
-     *                    to group the whole tree. If
-     *                    passed as an argument, $node
-     *                    must be of type CONTAINER
-     *
-     * @return void
-     */
-    public function groupTree($node = null)
-    {
-        if (!isset($node)) {
-            $node = $this->_tree;
-        }
-        $this->groupNode($node);
-        foreach ($node->children as $child) {
-            $this->groupTree($child);
-        }
-    }
-
-    /**
-     * Recursively groups tree nodes given a separator
-     *
-     * @param Node $node The node to group
-     *
-     * @return void
-     */
-    public function groupNode($node)
-    {
-        if ($node->type != Node::CONTAINER
-            || !$GLOBALS['cfg']['NavigationTreeEnableExpansion']
-        ) {
-            return;
-        }
-
-        $separators = array();
-        if (is_array($node->separator)) {
-            $separators = $node->separator;
-        } else {
-            if (strlen($node->separator)) {
-                $separators[] = $node->separator;
-            }
-        }
-        $prefixes = array();
-        if ($node->separator_depth > 0) {
-            foreach ($node->children as $child) {
-                $prefix_pos = false;
-                foreach ($separators as $separator) {
-                    $sep_pos = mb_strpos($child->name, $separator);
-                    if ($sep_pos != false
-                        && $sep_pos != mb_strlen($child->name)
-                        && $sep_pos != 0
-                        && ($prefix_pos == false || $sep_pos < $prefix_pos)
-                    ) {
-                        $prefix_pos = $sep_pos;
-                    }
-                }
-                if ($prefix_pos !== false) {
-                    $prefix = mb_substr($child->name, 0, $prefix_pos);
-                    if (!isset($prefixes[$prefix])) {
-                        $prefixes[$prefix] = 1;
-                    } else {
-                        $prefixes[$prefix]++;
-                    }
-                }
-                //Bug #4375: Check if prefix is the name of a DB, to create a group.
-                foreach ($node->children as $otherChild) {
-                    if (array_key_exists($otherChild->name, $prefixes)) {
-                        $prefixes[$otherChild->name]++;
-                    }
-                }
-            }
-            //Check if prefix is the name of a DB, to create a group.
-            foreach ($node->children as $child) {
-                if (array_key_exists($child->name, $prefixes)) {
-                    $prefixes[$child->name]++;
-                }
-            }
-        }
-        // It is not a group if it has only one item
-        foreach ($prefixes as $key => $value) {
-            if ($value == 1) {
-                unset($prefixes[$key]);
-            }
-        }
-        // rfe #1634 Don't group if there's only one group and no other items
-        if (count($prefixes) == 1) {
-            $keys = array_keys($prefixes);
-            $key = $keys[0];
-            if ($prefixes[$key] == count($node->children) - 1) {
-                unset($prefixes[$key]);
-            }
-        }
-        if (count($prefixes)) {
-            /** @var Node[] $groups */
-            $groups = array();
-            foreach ($prefixes as $key => $value) {
-
-                // warn about large groups
-                if ($value > 500 && !$this->_largeGroupWarning) {
-                    trigger_error(
-                        __(
-                            'There are large item groups in navigation panel which '
-                            . 'may affect the performance. Consider disabling item '
-                            . 'grouping in the navigation panel.'
-                        ),
-                        E_USER_WARNING
-                    );
-                    $this->_largeGroupWarning = true;
-                }
-
-                $groups[$key] = new Node(
-                    $key,
-                    Node::CONTAINER,
-                    true
-                );
-                $groups[$key]->separator = $node->separator;
-                $groups[$key]->separator_depth = $node->separator_depth - 1;
-                $groups[$key]->icon = Util::getImage(
-                    'b_group.png'
-                );
-                $groups[$key]->pos2 = $node->pos2;
-                $groups[$key]->pos3 = $node->pos3;
-                if ($node instanceof NodeTableContainer
-                    || $node instanceof NodeViewContainer
-                ) {
-                    $tblGroup = '&amp;tbl_group=' . urlencode($key);
-                    $groups[$key]->links = array(
-                        'text' => $node->links['text'] . $tblGroup,
-                        'icon' => $node->links['icon'] . $tblGroup,
-                    );
-                }
-                $node->addChild($groups[$key]);
-                foreach ($separators as $separator) {
-                    $separatorLength = strlen($separator);
-                    // FIXME: this could be more efficient
-                    foreach ($node->children as $child) {
-                        $keySeparatorLength = mb_strlen($key) + $separatorLength;
-                        $name_substring = mb_substr(
-                            $child->name,
-                            0,
-                            $keySeparatorLength
-                        );
-                        if (($name_substring != $key . $separator
-                            && $child->name != $key)
-                            || $child->type != Node::OBJECT
-                        ) {
-                            continue;
-                        }
-                        $class = get_class($child);
-                        $className = substr($class, strrpos($class, '\\') + 1);
-                        unset($class);
-                        $new_child = NodeFactory::getInstance(
-                            $className,
-                            mb_substr(
-                                $child->name,
-                                $keySeparatorLength
-                            )
-                        );
-
-                        if ($new_child instanceof NodeDatabase
-                            && $child->getHiddenCount() > 0
-                        ) {
-                            $new_child->setHiddenCount($child->getHiddenCount());
-                        }
-
-                        $new_child->real_name = $child->real_name;
-                        $new_child->icon = $child->icon;
-                        $new_child->links = $child->links;
-                        $new_child->pos2 = $child->pos2;
-                        $new_child->pos3 = $child->pos3;
-                        $groups[$key]->addChild($new_child);
-                        foreach ($child->children as $elm) {
-                            $new_child->addChild($elm);
-                        }
-                        $node->removeChild($child->name);
-                    }
-                }
-            }
-            foreach ($prefixes as $key => $value) {
-                $this->groupNode($groups[$key]);
-                $groups[$key]->classes = "navGroup";
-            }
-        }
-    }
-
-    /**
-     * Renders a state of the tree, used in light mode when
-     * either JavaScript and/or Ajax are disabled
-     *
-     * @return string HTML code for the navigation tree
-     */
-    public function renderState()
-    {
-        $this->_buildPath();
-        $retval = $this->_quickWarp();
-        $retval .= '<div class="clearfloat"></div>';
-        $retval .= '<ul>';
-        $retval .= $this->_fastFilterHtml($this->_tree);
-        if ($GLOBALS['cfg']['NavigationTreeEnableExpansion']
-        ) {
-            $retval .= $this->_controls();
-        }
-        $retval .= '</ul>';
-        $retval .= $this->_getPageSelector($this->_tree);
-        $this->groupTree();
-        $retval .= "<div id='pma_navigation_tree_content'><ul>";
-        $children = $this->_tree->children;
-        usort(
-            $children,
-            array('PMA\\libraries\\navigation\\NavigationTree', 'sortNode')
-        );
-        $this->_setVisibility();
-        for ($i = 0, $nbChildren = count($children); $i < $nbChildren; $i++) {
-            if ($i == 0) {
-                $retval .= $this->_renderNode($children[0], true, 'first');
-            } else {
-                if ($i + 1 != $nbChildren) {
-                    $retval .= $this->_renderNode($children[$i], true);
-                } else {
-                    $retval .= $this->_renderNode($children[$i], true, 'last');
-                }
-            }
-        }
-        $retval .= "</ul></div>";
-
-        return $retval;
-    }
-
-    /**
-     * Renders a part of the tree, used for Ajax
-     * requests in light mode
-     *
-     * @return string HTML code for the navigation tree
-     */
-    public function renderPath()
-    {
-        $node = $this->_buildPath();
-        if ($node === false) {
-            $retval = false;
-        } else {
-            $this->groupTree();
-            $retval = "<div class='list_container' style='display: none;'>";
-            if (!empty($this->_searchClause) || !empty($this->_searchClause2)) {
-                $retval .= "<ul class='search_results'>";
-            } else {
-                $retval .= "<ul>";
-            }
-            $listContent = $this->_fastFilterHtml($node);
-            $listContent .= $this->_getPageSelector($node);
-            $children = $node->children;
-            usort(
-                $children,
-                array('PMA\\libraries\\navigation\\NavigationTree', 'sortNode')
-            );
-            for ($i = 0, $nbChildren = count($children); $i < $nbChildren; $i++) {
-                if ($i + 1 != $nbChildren) {
-                    $listContent .= $this->_renderNode($children[$i], true);
-                } else {
-                    $listContent .= $this->_renderNode($children[$i], true, 'last');
-                }
-            }
-            $retval .= $listContent;
-            $retval .= "</ul>";
-            if (!$GLOBALS['cfg']['ShowDatabasesNavigationAsTree']) {
-                $retval .= "<span class='hide loaded_db'>";
-                $parents = $node->parents(true);
-                $retval .= urlencode($parents[0]->real_name);
-                $retval .= "</span>";
-                if (empty($listContent)) {
-                    $retval .= "<div style='margin:0.75em'>";
-                    $retval .= __('No tables found in database.');
-                    $retval .= "</div>";
-                }
-            }
-            $retval .= "</div>";
-        }
-
-        if (!empty($this->_searchClause) || !empty($this->_searchClause2)) {
-            $results = 0;
-            if (!empty($this->_searchClause2)) {
-                if (is_object($node->realParent())) {
-                    $results = $node->realParent()
-                        ->getPresence(
-                            $node->real_name,
-                            $this->_searchClause2
-                        );
-                }
-            } else {
-                $results = $this->_tree->getPresence(
-                    'databases',
-                    $this->_searchClause
-                );
-            }
-            $results = sprintf(
-                _ngettext(
-                    '%s result found',
-                    '%s results found',
-                    $results
-                ),
-                $results
-            );
-            Response::getInstance()
-                ->addJSON(
-                    'results',
-                    $results
-                );
-        }
-
-        return $retval;
-    }
-
-    /**
-     * Renders the parameters that are required on the client
-     * side to know which page(s) we will be requesting data from
-     *
-     * @param Node $node The node to create the pagination parameters for
-     *
-     * @return string
-     */
-    private function _getPaginationParamsHtml($node)
-    {
-        $retval = '';
-        $paths = $node->getPaths();
-        if (isset($paths['aPath_clean'][2])) {
-            $retval .= "<span class='hide pos2_name'>";
-            $retval .= $paths['aPath_clean'][2];
-            $retval .= "</span>";
-            $retval .= "<span class='hide pos2_value'>";
-            $retval .= htmlspecialchars($node->pos2);
-            $retval .= "</span>";
-        }
-        if (isset($paths['aPath_clean'][4])) {
-            $retval .= "<span class='hide pos3_name'>";
-            $retval .= $paths['aPath_clean'][4];
-            $retval .= "</span>";
-            $retval .= "<span class='hide pos3_value'>";
-            $retval .= htmlspecialchars($node->pos3);
-            $retval .= "</span>";
-        }
-
-        return $retval;
-    }
-
-    /**
-     * Finds whether given tree matches this tree.
-     *
-     * @param array $tree  Tree to check
-     * @param array $paths Paths to check
-     *
-     * @return boolean
-     */
-    private function _findTreeMatch($tree, $paths)
-    {
-        $match = false;
-        foreach ($tree as $path) {
-            $match = true;
-            foreach ($paths as $key => $part) {
-                if (!isset($path[$key]) || $part != $path[$key]) {
-                    $match = false;
-                    break;
-                }
-            }
-            if ($match) {
-                break;
-            }
-        }
-
-        return $match;
-    }
-
-    /**
-     * Renders a single node or a branch of the tree
-     *
-     * @param Node   $node      The node to render
-     * @param bool   $recursive Bool: Whether to render a single node or a branch
-     * @param string $class     An additional class for the list item
-     *
-     * @return string HTML code for the tree node or branch
-     */
-    private function _renderNode($node, $recursive, $class = '')
-    {
-        $retval = '';
-        $paths = $node->getPaths();
-        if ($node->hasSiblings()
-            || $node->realParent() === false
-        ) {
-            if ($node->type == Node::CONTAINER
-                && count($node->children) == 0
-                && $GLOBALS['is_ajax_request'] != true
-            ) {
-                return '';
-            }
-            $retval .= '<li class="' . trim($class . ' ' . $node->classes) . '">';
-            $sterile = array(
-                'events',
-                'triggers',
-                'functions',
-                'procedures',
-                'views',
-                'columns',
-                'indexes',
-            );
-            $parentName = '';
-            $parents = $node->parents(false, true);
-            if (count($parents)) {
-                $parentName = $parents[0]->real_name;
-            }
-            // if node name itself is in sterile, then allow
-            if ($node->is_group
-                || (!in_array($parentName, $sterile) && !$node->isNew)
-                || (in_array($node->real_name, $sterile))
-            ) {
-                $retval .= "<div class='block'>";
-                $iClass = '';
-                if ($class == 'first') {
-                    $iClass = " class='first'";
-                }
-                $retval .= "<i$iClass></i>";
-                if (strpos($class, 'last') === false) {
-                    $retval .= "<b></b>";
-                }
-
-                $match = $this->_findTreeMatch(
-                    $this->_vPath,
-                    $paths['vPath_clean']
-                );
-
-                $retval .= '<a class="' . $node->getCssClasses($match) . '"';
-                $retval .= " href='#'>";
-                $retval .= "<span class='hide aPath'>";
-                $retval .= $paths['aPath'];
-                $retval .= "</span>";
-                $retval .= "<span class='hide vPath'>";
-                $retval .= $paths['vPath'];
-                $retval .= "</span>";
-                $retval .= "<span class='hide pos'>";
-                $retval .= $this->_pos;
-                $retval .= "</span>";
-                $retval .= $this->_getPaginationParamsHtml($node);
-                if ($GLOBALS['cfg']['ShowDatabasesNavigationAsTree']
-                    || $parentName != 'root'
-                ) {
-                    $retval .= $node->getIcon($match);
-                }
-
-                $retval .= "</a>";
-                $retval .= "</div>";
-            } else {
-                $retval .= "<div class='block'>";
-                $iClass = '';
-                if ($class == 'first') {
-                    $iClass = " class='first'";
-                }
-                $retval .= "<i$iClass></i>";
-                $retval .= $this->_getPaginationParamsHtml($node);
-                $retval .= "</div>";
-            }
-
-            $linkClass = '';
-            $haveAjax = array(
-                'functions',
-                'procedures',
-                'events',
-                'triggers',
-                'indexes',
-            );
-            $parent = $node->parents(false, true);
-            $isNewView = $parent[0]->real_name == 'views' && $node->isNew === true;
-            if ($parent[0]->type == Node::CONTAINER
-                && (in_array($parent[0]->real_name, $haveAjax) || $isNewView)
-            ) {
-                $linkClass = ' ajax';
-            }
-
-            if ($node->type == Node::CONTAINER) {
-                $retval .= "<i>";
-            }
-
-            $divClass = '';
-
-            if (isset($node->links['icon']) && !empty($node->links['icon'])) {
-                $iconLinks = $node->links['icon'];
-                $icons = $node->icon;
-                if (!is_array($iconLinks)) {
-                    $iconLinks = array($iconLinks);
-                    $icons = array($icons);
-                }
-
-                if (count($icons) > 1) {
-                    $divClass = 'double';
-                }
-            }
-
-            $retval .= "<div class='block " . $divClass . "'>";
-
-            if (isset($node->links['icon']) && !empty($node->links['icon'])) {
-                $args = array();
-                foreach ($node->parents(true) as $parent) {
-                    $args[] = urlencode($parent->real_name);
-                }
-
-                foreach ($icons as $key => $icon) {
-                    $link = vsprintf($iconLinks[$key], $args);
-                    if ($linkClass != '') {
-                        $retval .= "<a class='$linkClass' href='$link'>";
-                        $retval .= "{$icon}</a>";
-                    } else {
-                        $retval .= "<a href='$link'>{$icon}</a>";
-                    }
-                }
-            } else {
-                $retval .= "<u>{$node->icon}</u>";
-            }
-            $retval .= "</div>";
-
-            if (isset($node->links['text'])) {
-                $args = array();
-                foreach ($node->parents(true) as $parent) {
-                    $args[] = urlencode($parent->real_name);
-                }
-                $link = vsprintf($node->links['text'], $args);
-                $title = empty($node->links['title']) ? '' : $node->links['title'];
-                if ($node->type == Node::CONTAINER) {
-                    $retval .= "&nbsp;<a class='hover_show_full' href='$link'>";
-                    $retval .= htmlspecialchars($node->name);
-                    $retval .= "</a>";
-                } else {
-                    $retval .= "<a class='hover_show_full$linkClass' href='$link'";
-                    $retval .= " title='$title'>";
-                    $retval .= htmlspecialchars($node->real_name);
-                    $retval .= "</a>";
-                }
-            } else {
-                $retval .= "&nbsp;{$node->name}";
-            }
-            $retval .= $node->getHtmlForControlButtons();
-            if ($node->type == Node::CONTAINER) {
-                $retval .= "</i>";
-            }
-            $retval .= '<div class="clearfloat"></div>';
-            $wrap = true;
-        } else {
-            $node->visible = true;
-            $wrap = false;
-            $retval .= $this->_getPaginationParamsHtml($node);
-        }
-
-        if ($recursive) {
-            $hide = '';
-            if (!$node->visible) {
-                $hide = " style='display: none;'";
-            }
-            $children = $node->children;
-            usort(
-                $children,
-                array('PMA\\libraries\\navigation\\NavigationTree', 'sortNode')
-            );
-            $buffer = '';
-            $extra_class = '';
-            for ($i = 0, $nbChildren = count($children); $i < $nbChildren; $i++) {
-                if ($i + 1 == $nbChildren) {
-                    $extra_class = ' last';
-                }
-                $buffer .= $this->_renderNode(
-                    $children[$i],
-                    true,
-                    $children[$i]->classes . $extra_class
-                );
-            }
-            if (!empty($buffer)) {
-                if ($wrap) {
-                    $retval .= "<div$hide class='list_container'><ul>";
-                }
-                $retval .= $this->_fastFilterHtml($node);
-                $retval .= $this->_getPageSelector($node);
-                $retval .= $buffer;
-                if ($wrap) {
-                    $retval .= "</ul></div>";
-                }
-            }
-        }
-        if ($node->hasSiblings()) {
-            $retval .= "</li>";
-        }
-
-        return $retval;
-    }
-
-    /**
-     * Renders a database select box like the pre-4.0 navigation panel
-     *
-     * @return string HTML code
-     */
-    public function renderDbSelect()
-    {
-        $this->_buildPath();
-        $retval = $this->_quickWarp();
-        $this->_tree->is_group = false;
-        $retval .= '<div id="pma_navigation_select_database">';
-        // Provide for pagination in database select
-        $retval .= Util::getListNavigator(
-            $this->_tree->getPresence('databases', ''),
-            $this->_pos,
-            array('server' => $GLOBALS['server']),
-            'navigation.php',
-            'frame_navigation',
-            $GLOBALS['cfg']['FirstLevelNavigationItems'],
-            'pos',
-            array('dbselector')
-        );
-        $children = $this->_tree->children;
-        array_shift($children);
-        $url_params = array(
-            'token'  => $_SESSION[' PMA_token '],
-            'server' => $GLOBALS['server'],
-        );
-        $retval .= '<div id="pma_navigation_db_select">';
-        $retval .= '<form action="index.php">';
-        $retval .= PMA_getHiddenFields($url_params);
-        $retval .= '<select name="db" class="hide" id="navi_db_select">'
-            . '<option value="" dir="' . $GLOBALS['text_dir'] . '">'
-            . '(' . __('Databases') . ') ...</option>' . "\n";
-        $selected = $GLOBALS['db'];
-        foreach ($children as $node) {
-            $paths = $node->getPaths();
-            if (isset($node->links['text'])) {
-                $title = empty($node->links['title']) ? '' : $node->links['title'];
-                $retval .= '<option value="'
-                    . htmlspecialchars($node->real_name) . '"'
-                    . ' title="' . htmlspecialchars($title) . '"'
-                    . ' apath="' . $paths['aPath'] . '"'
-                    . ' vpath="' . $paths['vPath'] . '"'
-                    . ' pos="' . $this->_pos . '"';
-                if ($node->real_name == $selected) {
-                    $retval .= ' selected="selected"';
-                }
-                $retval .= '>' . htmlspecialchars($node->real_name);
-                $retval .= '</option>';
-            }
-        }
-        $retval .= '</select></form>';
-        $retval .= '</div></div>';
-        $retval .= '<div id="pma_navigation_tree_content"><ul>';
-        $children = $this->_tree->children;
-        usort(
-            $children,
-            array('PMA\\libraries\\navigation\\NavigationTree', 'sortNode')
-        );
-        $this->_setVisibility();
-        for ($i = 0, $nbChildren = count($children); $i < $nbChildren; $i++) {
-            if ($i == 0) {
-                $retval .= $this->_renderNode($children[0], true, 'first');
-            } else {
-                if ($i + 1 != $nbChildren) {
-                    $retval .= $this->_renderNode($children[$i], true);
-                } else {
-                    $retval .= $this->_renderNode($children[$i], true, 'last');
-                }
-            }
-        }
-        $retval .= '</ul></div>';
-
-        return $retval;
-    }
-
-    /**
-     * Makes some nodes visible based on the which node is active
-     *
-     * @return void
-     */
-    private function _setVisibility()
-    {
-        foreach ($this->_vPath as $path) {
-            $node = $this->_tree;
-            foreach ($path as $value) {
-                $child = $node->getChild($value);
-                if ($child !== false) {
-                    $child->visible = true;
-                    $node = $child;
-                }
-            }
-        }
-    }
-
-    /**
-     * Generates the HTML code for displaying the fast filter for tables
-     *
-     * @param Node $node The node for which to generate the fast filter html
-     *
-     * @return string LI element used for the fast filter
-     */
-    private function _fastFilterHtml($node)
-    {
-        $retval = '';
-        $filter_db_min
-            = (int)$GLOBALS['cfg']['NavigationTreeDisplayDbFilterMinimum'];
-        $filter_item_min
-            = (int)$GLOBALS['cfg']['NavigationTreeDisplayItemFilterMinimum'];
-        if ($node === $this->_tree
-            && $this->_tree->getPresence() >= $filter_db_min
-        ) {
-            $url_params = array(
-                'pos' => 0,
-            );
-            $retval .= '<li class="fast_filter db_fast_filter">';
-            $retval .= '<form class="ajax fast_filter">';
-            $retval .= PMA_getHiddenFields($url_params);
-            $retval .= '<input class="searchClause" type="text"';
-            $retval .= ' name="searchClause" accesskey="q"';
-            // allow html5 placeholder attribute
-            $placeholder_key = 'value';
-            if (PMA_USR_BROWSER_AGENT !== 'IE'
-                || PMA_USR_BROWSER_VER > 9
-            ) {
-                $placeholder_key = 'placeholder';
-            }
-            $retval .= " $placeholder_key='"
-                . __("Type to filter these, Enter to search all");
-            $retval .= "' />";
-            $retval .= '<span title="' . __('Clear fast filter') . '">X</span>';
-            $retval .= "</form>";
-            $retval .= "</li>";
-
-            return $retval;
-        }
-
-        if (($node->type == Node::CONTAINER
-            && ($node->real_name == 'tables'
-            || $node->real_name == 'views'
-            || $node->real_name == 'functions'
-            || $node->real_name == 'procedures'
-            || $node->real_name == 'events'))
-            && method_exists($node->realParent(), 'getPresence')
-            && $node->realParent()->getPresence($node->real_name) >= $filter_item_min
-        ) {
-            $paths = $node->getPaths();
-            $url_params = array(
-                'pos'        => $this->_pos,
-                'aPath'      => $paths['aPath'],
-                'vPath'      => $paths['vPath'],
-                'pos2_name'  => $node->real_name,
-                'pos2_value' => 0,
-            );
-            $retval .= "<li class='fast_filter'>";
-            $retval .= "<form class='ajax fast_filter'>";
-            $retval .= PMA_getHiddenFields($url_params);
-            $retval .= "<input class='searchClause' type='text'";
-            $retval .= " name='searchClause2'";
-            // allow html5 placeholder attribute
-            $placeholder_key = 'value';
-            if (PMA_USR_BROWSER_AGENT !== 'IE' || PMA_USR_BROWSER_VER > 9) {
-                $placeholder_key = 'placeholder';
-            }
-            $retval .= " $placeholder_key='"
-                . __("Type to filter these, Enter to search all") . "' />";
-            $retval .= "<span title='" . __('Clear fast filter') . "'>X</span>";
-            $retval .= "</form>";
-            $retval .= "</li>";
-        }
-
-        return $retval;
-    }
-
-    /**
-     * Creates the code for displaying the controls
-     * at the top of the navigation tree
-     *
-     * @return string HTML code for the controls
-     */
-    private function _controls()
-    {
-        // always iconic
-        $showIcon = true;
-        $showText = false;
-
-        $retval = '<!-- CONTROLS START -->';
-        $retval .= '<li id="navigation_controls_outer">';
-        $retval .= '<div id="navigation_controls">';
-        $retval .= Util::getNavigationLink(
-            '#',
-            $showText,
-            __('Collapse all'),
-            $showIcon,
-            's_collapseall.png',
-            'pma_navigation_collapse'
-        );
-        $syncImage = 's_unlink.png';
-        $title = __('Link with main panel');
-        if ($GLOBALS['cfg']['NavigationLinkWithMainPanel']) {
-            $syncImage = 's_link.png';
-            $title = __('Unlink from main panel');
-        }
-        $retval .= Util::getNavigationLink(
-            '#',
-            $showText,
-            $title,
-            $showIcon,
-            $syncImage,
-            'pma_navigation_sync'
-        );
-        $retval .= '</div>';
-        $retval .= '</li>';
-        $retval .= '<!-- CONTROLS ENDS -->';
-
-        return $retval;
-    }
-
-    /**
-     * Generates the HTML code for displaying the list pagination
-     *
-     * @param Node $node The node for whose children the page
-     *                   selector will be created
-     *
-     * @return string
-     */
-    private function _getPageSelector($node)
-    {
-        $retval = '';
-        if ($node === $this->_tree) {
-            $retval .= Util::getListNavigator(
-                $this->_tree->getPresence('databases', $this->_searchClause),
-                $this->_pos,
-                array('server' => $GLOBALS['server']),
-                'navigation.php',
-                'frame_navigation',
-                $GLOBALS['cfg']['FirstLevelNavigationItems'],
-                'pos',
-                array('dbselector')
-            );
-        } else {
-            if ($node->type == Node::CONTAINER && !$node->is_group) {
-                $paths = $node->getPaths();
-
-                $level = isset($paths['aPath_clean'][4]) ? 3 : 2;
-                $_url_params = array(
-                    'aPath'     => $paths['aPath'],
-                    'vPath'     => $paths['vPath'],
-                    'pos'       => $this->_pos,
-                    'server'    => $GLOBALS['server'],
-                    'pos2_name' => $paths['aPath_clean'][2],
-                );
-                if ($level == 3) {
-                    $pos = $node->pos3;
-                    $_url_params['pos2_value'] = $node->pos2;
-                    $_url_params['pos3_name'] = $paths['aPath_clean'][4];
-                } else {
-                    $pos = $node->pos2;
-                }
-                $num = $node->realParent()
-                    ->getPresence(
-                        $node->real_name,
-                        $this->_searchClause2
-                    );
-                $retval .= Util::getListNavigator(
-                    $num,
-                    $pos,
-                    $_url_params,
-                    'navigation.php',
-                    'frame_navigation',
-                    $GLOBALS['cfg']['MaxNavigationItems'],
-                    'pos' . $level . '_value'
-                );
-            }
-        }
-
-        return $retval;
-    }
-
-    /**
-     * Called by usort() for sorting the nodes in a container
-     *
-     * @param Node $a The first element used in the comparison
-     * @param Node $b The second element used in the comparison
-     *
-     * @return int See strnatcmp() and strcmp()
-     */
-    static public function sortNode($a, $b)
-    {
-        if ($a->isNew) {
-            return -1;
-        } else {
-            if ($b->isNew) {
-                return 1;
-            }
-        }
-        if ($GLOBALS['cfg']['NaturalOrder']) {
-            return strnatcasecmp($a->name, $b->name);
-        } else {
-            return strcasecmp($a->name, $b->name);
-        }
-    }
-
-    /**
-     * Display quick warp links, contain Recents and Favorites
-     *
-     * @return string HTML code
-     */
-    private function _quickWarp()
-    {
-        $retval = '<div class="pma_quick_warp">';
-        if ($GLOBALS['cfg']['NumRecentTables'] > 0) {
-            $retval .= RecentFavoriteTable::getInstance('recent')
-                ->getHtml();
-        }
-        if ($GLOBALS['cfg']['NumFavoriteTables'] > 0) {
-            $retval .= RecentFavoriteTable::getInstance('favorite')
-                ->getHtml();
-        }
-        $retval .= '<div class="clearfloat"></div>';
-        $retval .= '</div>';
-
-        return $retval;
-    }
-}
diff --git a/#pma/libraries/navigation/NodeFactory.php b/#pma/libraries/navigation/NodeFactory.php
deleted file mode 100644
index adbc4873..00000000
--- a/#pma/libraries/navigation/NodeFactory.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * This class is responsible for creating Node objects
- *
- * @package PhpMyAdmin-navigation
- */
-namespace PMA\libraries\navigation;
-
-use PMA\libraries\navigation\nodes\Node;
-use PMA\Psr4Autoloader;
-
-/**
- * Node factory - instantiates Node objects or objects derived from the Node class
- *
- * @package PhpMyAdmin-Navigation
- */
-class NodeFactory
-{
-    protected static $_namespace = 'PMA\\libraries\\navigation\\nodes\\%s';
-    /**
-     * Sanitizes the name of a Node class
-     *
-     * @param string $class The class name to be sanitized
-     *
-     * @return string
-     */
-    private static function _sanitizeClass($class)
-    {
-        if (!preg_match('@^Node\w*$@', $class)) {
-            $class = 'Node';
-            trigger_error(
-                sprintf(
-                    /* l10n: The word "Node" must not be translated here */
-                    __('Invalid class name "%1$s", using default of "Node"'),
-                    $class
-                ),
-                E_USER_ERROR
-            );
-        }
-
-        return self::_checkClass($class);
-    }
-
-    /**
-     * Checks if a class exists and try to load it.
-     * Will return the default class name back if the
-     * file for some subclass is not available
-     *
-     * @param string $class The class name to check
-     *
-     * @return string
-     */
-    private static function _checkClass($class)
-    {
-        $class = sprintf(self::$_namespace, $class);
-        if (!class_exists($class)
-            && !Psr4Autoloader::getInstance()->loadClass($class)
-        ) {
-            $class = sprintf(self::$_namespace, 'Node');
-            trigger_error(
-                sprintf(
-                    __('Could not load class "%1$s"'),
-                    $class
-                ),
-                E_USER_ERROR
-            );
-        }
-
-        return $class;
-    }
-
-    /**
-     * Instantiates a Node object
-     *
-     * @param string $class    The name of the class to instantiate
-     * @param string $name     An identifier for the new node
-     * @param int    $type     Type of node, may be one of CONTAINER or OBJECT
-     * @param bool   $is_group Whether this object has been created
-     *                         while grouping nodes
-     *
-     * @return mixed
-     */
-    public static function getInstance(
-        $class = 'Node',
-        $name = 'default',
-        $type = Node::OBJECT,
-        $is_group = false
-    ) {
-        $class = self::_sanitizeClass($class);
-        return new $class($name, $type, $is_group);
-    }
-}
-
diff --git a/#pma/libraries/navigation/nodes/Node.php b/#pma/libraries/navigation/nodes/Node.php
deleted file mode 100644
index 8265f631..00000000
--- a/#pma/libraries/navigation/nodes/Node.php
+++ /dev/null
@@ -1,836 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Functionality for the navigation tree in the left frame
- *
- * @package PhpMyAdmin-Navigation
- */
-namespace PMA\libraries\navigation\nodes;
-
-use PMA\libraries\Util;
-
-/**
- * The Node is the building block for the collapsible navigation tree
- *
- * @package PhpMyAdmin-Navigation
- */
-class Node
-{
-    /**
-     * @var int Defines a possible node type
-     */
-    const CONTAINER = 0;
-    /**
-     * @var int Defines a possible node type
-     */
-    const OBJECT = 1;
-    /**
-     * @var string A non-unique identifier for the node
-     *             This may be trimmed when grouping nodes
-     */
-    public $name = "";
-    /**
-     * @var string A non-unique identifier for the node
-     *             This will never change after being assigned
-     */
-    public $real_name = "";
-    /**
-     * @var int May be one of CONTAINER or OBJECT
-     */
-    public $type = Node::OBJECT;
-    /**
-     * @var bool Whether this object has been created while grouping nodes
-     *           Only relevant if the node is of type CONTAINER
-     */
-    public $is_group;
-    /**
-     * @var bool Whether to add a "display: none;" CSS
-     *           rule to the node when rendering it
-     */
-    public $visible = false;
-    /**
-     * @var Node A reference to the parent object of
-     *           this node, NULL for the root node.
-     */
-    public $parent;
-    /**
-     * @var Node[] An array of Node objects that are
-     *             direct children of this node
-     */
-    public $children = array();
-    /**
-     * @var Mixed A string used to group nodes, or an array of strings
-     *            Only relevant if the node is of type CONTAINER
-     */
-    public $separator = '';
-    /**
-     * @var int How many time to recursively apply the grouping function
-     *          Only relevant if the node is of type CONTAINER
-     */
-    public $separator_depth = 1;
-    /**
-     * @var string An IMG tag, used when rendering the node
-     */
-    public $icon;
-    /**
-     * @var array An array of A tags, used when rendering the node
-     *            The indexes in the array may be 'icon' and 'text'
-     */
-    public $links;
-    /**
-     * @var string HTML title
-     */
-    public $title;
-    /**
-     * @var string Extra CSS classes for the node
-     */
-    public $classes = '';
-    /**
-     * @var bool Whether this node is a link for creating new objects
-     */
-    public $isNew = false;
-    /**
-     * @var int The position for the pagination of
-     *          the branch at the second level of the tree
-     */
-    public $pos2 = 0;
-    /**
-     * @var int The position for the pagination of
-     *          the branch at the third level of the tree
-     */
-    public $pos3 = 0;
-
-    /**
-     * Initialises the class by setting the mandatory variables
-     *
-     * @param string $name     An identifier for the new node
-     * @param int    $type     Type of node, may be one of CONTAINER or OBJECT
-     * @param bool   $is_group Whether this object has been created
-     *                         while grouping nodes
-     */
-    public function __construct($name, $type = Node::OBJECT, $is_group = false)
-    {
-        if (!empty($name)) {
-            $this->name = $name;
-            $this->real_name = $name;
-        }
-        if ($type === Node::CONTAINER) {
-            $this->type = Node::CONTAINER;
-        }
-        $this->is_group = (bool)$is_group;
-    }
-
-    /**
-     * Adds a child node to this node
-     *
-     * @param Node $child A child node
-     *
-     * @return void
-     */
-    public function addChild($child)
-    {
-        $this->children[] = $child;
-        $child->parent = $this;
-    }
-
-    /**
-     * Returns a child node given it's name
-     *
-     * @param string $name      The name of requested child
-     * @param bool   $real_name Whether to use the "real_name"
-     *                          instead of "name" in comparisons
-     *
-     * @return false|Node The requested child node or false,
-     *                    if the requested node cannot be found
-     */
-    public function getChild($name, $real_name = false)
-    {
-        if ($real_name) {
-            foreach ($this->children as $child) {
-                if ($child->real_name == $name) {
-                    return $child;
-                }
-            }
-        } else {
-            foreach ($this->children as $child) {
-                if ($child->name == $name) {
-                    return $child;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Removes a child node from this node
-     *
-     * @param string $name The name of child to be removed
-     *
-     * @return void
-     */
-    public function removeChild($name)
-    {
-        foreach ($this->children as $key => $child) {
-            if ($child->name == $name) {
-                unset($this->children[$key]);
-                break;
-            }
-        }
-    }
-
-    /**
-     * Retrieves the parents for a node
-     *
-     * @param bool $self       Whether to include the Node itself in the results
-     * @param bool $containers Whether to include nodes of type CONTAINER
-     * @param bool $groups     Whether to include nodes which have $group == true
-     *
-     * @return array An array of parent Nodes
-     */
-    public function parents($self = false, $containers = false, $groups = false)
-    {
-        $parents = array();
-        if ($self
-            && ($this->type != Node::CONTAINER || $containers)
-            && (!$this->is_group || $groups)
-        ) {
-            $parents[] = $this;
-        }
-        $parent = $this->parent;
-        while (isset($parent)) {
-            if (($parent->type != Node::CONTAINER || $containers)
-                && (!$parent->is_group || $groups)
-            ) {
-                $parents[] = $parent;
-            }
-            $parent = $parent->parent;
-        }
-
-        return $parents;
-    }
-
-    /**
-     * Returns the actual parent of a node. If used twice on an index or columns
-     * node, it will return the table and database nodes. The names of the returned
-     * nodes can be used in SQL queries, etc...
-     *
-     * @return Node|false
-     */
-    public function realParent()
-    {
-        $retval = $this->parents();
-        if (count($retval) <= 0) {
-            return false;
-        }
-
-        return $retval[0];
-    }
-
-    /**
-     * This function checks if the node has children nodes associated with it
-     *
-     * @param bool $count_empty_containers Whether to count empty child
-     *                                     containers as valid children
-     *
-     * @return bool Whether the node has child nodes
-     */
-    public function hasChildren($count_empty_containers = true)
-    {
-        $retval = false;
-        if ($count_empty_containers) {
-            if (count($this->children)) {
-                $retval = true;
-            }
-        } else {
-            foreach ($this->children as $child) {
-                if ($child->type == Node::OBJECT || $child->hasChildren(false)) {
-                    $retval = true;
-                    break;
-                }
-            }
-        }
-
-        return $retval;
-    }
-
-    /**
-     * Returns true if the node has some siblings (other nodes on the same tree
-     * level, in the same branch), false otherwise.
-     * The only exception is for nodes on
-     * the third level of the tree (columns and indexes), for which the function
-     * always returns true. This is because we want to render the containers
-     * for these nodes
-     *
-     * @return bool
-     */
-    public function hasSiblings()
-    {
-        $retval = false;
-        $paths = $this->getPaths();
-        if (count($paths['aPath_clean']) > 3) {
-            $retval = true;
-
-            return $retval;
-        }
-
-        foreach ($this->parent->children as $child) {
-            if ($child !== $this
-                && ($child->type == Node::OBJECT || $child->hasChildren(false))
-            ) {
-                $retval = true;
-                break;
-            }
-        }
-
-        return $retval;
-    }
-
-    /**
-     * Returns the number of child nodes that a node has associated with it
-     *
-     * @return int The number of children nodes
-     */
-    public function numChildren()
-    {
-        $retval = 0;
-        foreach ($this->children as $child) {
-            if ($child->type == Node::OBJECT) {
-                $retval++;
-            } else {
-                $retval += $child->numChildren();
-            }
-        }
-
-        return $retval;
-    }
-
-    /**
-     * Returns the actual path and the virtual paths for a node
-     * both as clean arrays and base64 encoded strings
-     *
-     * @return array
-     */
-    public function getPaths()
-    {
-        $aPath = array();
-        $aPath_clean = array();
-        foreach ($this->parents(true, true, false) as $parent) {
-            $aPath[] = base64_encode($parent->real_name);
-            $aPath_clean[] = $parent->real_name;
-        }
-        $aPath = implode('.', array_reverse($aPath));
-        $aPath_clean = array_reverse($aPath_clean);
-
-        $vPath = array();
-        $vPath_clean = array();
-        foreach ($this->parents(true, true, true) as $parent) {
-            $vPath[] = base64_encode($parent->name);
-            $vPath_clean[] = $parent->name;
-        }
-        $vPath = implode('.', array_reverse($vPath));
-        $vPath_clean = array_reverse($vPath_clean);
-
-        return array(
-            'aPath'       => $aPath,
-            'aPath_clean' => $aPath_clean,
-            'vPath'       => $vPath,
-            'vPath_clean' => $vPath_clean,
-        );
-    }
-
-    /**
-     * Returns the names of children of type $type present inside this container
-     * This method is overridden by the PMA\libraries\navigation\nodes\NodeDatabase and PMA\libraries\navigation\nodes\NodeTable classes
-     *
-     * @param string $type         The type of item we are looking for
-     *                             ('tables', 'views', etc)
-     * @param int    $pos          The offset of the list within the results
-     * @param string $searchClause A string used to filter the results of the query
-     *
-     * @return array
-     */
-    public function getData($type, $pos, $searchClause = '')
-    {
-        $maxItems = $GLOBALS['cfg']['FirstLevelNavigationItems'];
-        if (!$GLOBALS['cfg']['NavigationTreeEnableGrouping']
-            || !$GLOBALS['cfg']['ShowDatabasesNavigationAsTree']
-        ) {
-            if (isset($GLOBALS['cfg']['Server']['DisableIS'])
-                && !$GLOBALS['cfg']['Server']['DisableIS']
-            ) {
-                $query = "SELECT `SCHEMA_NAME` ";
-                $query .= "FROM `INFORMATION_SCHEMA`.`SCHEMATA` ";
-                $query .= $this->_getWhereClause('SCHEMA_NAME', $searchClause);
-                $query .= "ORDER BY `SCHEMA_NAME` ";
-                $query .= "LIMIT $pos, $maxItems";
-                $retval = $GLOBALS['dbi']->fetchResult($query);
-
-                return $retval;
-            }
-
-            if ($GLOBALS['dbs_to_test'] === false) {
-                $retval = array();
-                $query = "SHOW DATABASES ";
-                $query .= $this->_getWhereClause('Database', $searchClause);
-                $handle = $GLOBALS['dbi']->tryQuery($query);
-                if ($handle === false) {
-                    return $retval;
-                }
-
-                $count = 0;
-                if (!$GLOBALS['dbi']->dataSeek($handle, $pos)) {
-                    return $retval;
-                }
-
-                while ($arr = $GLOBALS['dbi']->fetchArray($handle)) {
-                    if ($count < $maxItems) {
-                        $retval[] = $arr[0];
-                        $count++;
-                    } else {
-                        break;
-                    }
-                }
-
-                return $retval;
-            }
-
-            $retval = array();
-            $count = 0;
-            foreach ($this->_getDatabasesToSearch($searchClause) as $db) {
-                $query = "SHOW DATABASES LIKE '" . $db . "'";
-                $handle = $GLOBALS['dbi']->tryQuery($query);
-                if ($handle === false) {
-                    continue;
-                }
-
-                while ($arr = $GLOBALS['dbi']->fetchArray($handle)) {
-                    if ($this->_isHideDb($arr[0])) {
-                        continue;
-                    }
-                    if (in_array($arr[0], $retval)) {
-                        continue;
-                    }
-
-                    if ($pos <= 0 && $count < $maxItems) {
-                        $retval[] = $arr[0];
-                        $count++;
-                    }
-                    $pos--;
-                }
-            }
-            sort($retval);
-
-            return $retval;
-        }
-
-        $dbSeparator = $GLOBALS['cfg']['NavigationTreeDbSeparator'];
-        if (isset($GLOBALS['cfg']['Server']['DisableIS'])
-            && !$GLOBALS['cfg']['Server']['DisableIS']
-        ) {
-            $query = "SELECT `SCHEMA_NAME` ";
-            $query .= "FROM `INFORMATION_SCHEMA`.`SCHEMATA`, ";
-            $query .= "(";
-            $query .= "SELECT DB_first_level ";
-            $query .= "FROM ( ";
-            $query .= "SELECT DISTINCT SUBSTRING_INDEX(SCHEMA_NAME, ";
-            $query .= "'" . $GLOBALS['dbi']->escapeString($dbSeparator) . "', 1) ";
-            $query .= "DB_first_level ";
-            $query .= "FROM INFORMATION_SCHEMA.SCHEMATA ";
-            $query .= $this->_getWhereClause('SCHEMA_NAME', $searchClause);
-            $query .= ") t ";
-            $query .= "ORDER BY DB_first_level ASC ";
-            $query .= "LIMIT $pos, $maxItems";
-            $query .= ") t2 ";
-            $query .= $this->_getWhereClause('SCHEMA_NAME', $searchClause);
-            $query .= "AND 1 = LOCATE(CONCAT(DB_first_level, ";
-            $query .= "'" . $GLOBALS['dbi']->escapeString($dbSeparator) . "'), ";
-            $query .= "CONCAT(SCHEMA_NAME, ";
-            $query .= "'" . $GLOBALS['dbi']->escapeString($dbSeparator) . "')) ";
-            $query .= "ORDER BY SCHEMA_NAME ASC";
-            $retval = $GLOBALS['dbi']->fetchResult($query);
-
-            return $retval;
-        }
-
-        if ($GLOBALS['dbs_to_test'] === false) {
-            $query = "SHOW DATABASES ";
-            $query .= $this->_getWhereClause('Database', $searchClause);
-            $handle = $GLOBALS['dbi']->tryQuery($query);
-            $prefixes = array();
-            if ($handle !== false) {
-                $prefixMap = array();
-                $total = $pos + $maxItems;
-                while ($arr = $GLOBALS['dbi']->fetchArray($handle)) {
-                    $prefix = strstr($arr[0], $dbSeparator, true);
-                    if ($prefix === false) {
-                        $prefix = $arr[0];
-                    }
-                    $prefixMap[$prefix] = 1;
-                    if (sizeof($prefixMap) == $total) {
-                        break;
-                    }
-                }
-                $prefixes = array_slice(array_keys($prefixMap), $pos);
-            }
-
-            $query = "SHOW DATABASES ";
-            $query .= $this->_getWhereClause('Database', $searchClause);
-            $query .= "AND (";
-            $subClauses = array();
-            foreach ($prefixes as $prefix) {
-                $subClauses[] = " LOCATE('"
-                    . $GLOBALS['dbi']->escapeString($prefix) . $dbSeparator
-                    . "', "
-                    . "CONCAT(`Database`, '" . $dbSeparator . "')) = 1 ";
-            }
-            $query .= implode("OR", $subClauses) . ")";
-            $retval = $GLOBALS['dbi']->fetchResult($query);
-
-            return $retval;
-        }
-
-        $retval = array();
-        $prefixMap = array();
-        $total = $pos + $maxItems;
-        foreach ($this->_getDatabasesToSearch($searchClause) as $db) {
-            $query = "SHOW DATABASES LIKE '" . $db . "'";
-            $handle = $GLOBALS['dbi']->tryQuery($query);
-            if ($handle === false) {
-                continue;
-            }
-
-            while ($arr = $GLOBALS['dbi']->fetchArray($handle)) {
-                if ($this->_isHideDb($arr[0])) {
-                    continue;
-                }
-                $prefix = strstr($arr[0], $dbSeparator, true);
-                if ($prefix === false) {
-                    $prefix = $arr[0];
-                }
-                $prefixMap[$prefix] = 1;
-                if (sizeof($prefixMap) == $total) {
-                    break 2;
-                }
-            }
-        }
-        $prefixes = array_slice(array_keys($prefixMap), $pos);
-
-        foreach ($this->_getDatabasesToSearch($searchClause) as $db) {
-            $query = "SHOW DATABASES LIKE '" . $db . "'";
-            $handle = $GLOBALS['dbi']->tryQuery($query);
-            if ($handle === false) {
-                continue;
-            }
-
-            while ($arr = $GLOBALS['dbi']->fetchArray($handle)) {
-                if ($this->_isHideDb($arr[0])) {
-                    continue;
-                }
-                if (in_array($arr[0], $retval)) {
-                    continue;
-                }
-
-                foreach ($prefixes as $prefix) {
-                    $starts_with = strpos(
-                        $arr[0] . $dbSeparator,
-                        $prefix . $dbSeparator
-                    ) === 0;
-                    if ($starts_with) {
-                        $retval[] = $arr[0];
-                        break;
-                    }
-                }
-            }
-        }
-        sort($retval);
-
-        return $retval;
-    }
-
-    /**
-     * Returns the number of children of type $type present inside this container
-     * This method is overridden by the PMA\libraries\navigation\nodes\NodeDatabase and PMA\libraries\navigation\nodes\NodeTable classes
-     *
-     * @param string $type         The type of item we are looking for
-     *                             ('tables', 'views', etc)
-     * @param string $searchClause A string used to filter the results of the query
-     *
-     * @return int
-     */
-    public function getPresence($type = '', $searchClause = '')
-    {
-        if (!$GLOBALS['cfg']['NavigationTreeEnableGrouping']
-            || !$GLOBALS['cfg']['ShowDatabasesNavigationAsTree']
-        ) {
-            if (isset($GLOBALS['cfg']['Server']['DisableIS'])
-                && !$GLOBALS['cfg']['Server']['DisableIS']
-            ) {
-                $query = "SELECT COUNT(*) ";
-                $query .= "FROM INFORMATION_SCHEMA.SCHEMATA ";
-                $query .= $this->_getWhereClause('SCHEMA_NAME', $searchClause);
-                $retval = (int)$GLOBALS['dbi']->fetchValue($query);
-
-                return $retval;
-            }
-
-            if ($GLOBALS['dbs_to_test'] === false) {
-                $query = "SHOW DATABASES ";
-                $query .= $this->_getWhereClause('Database', $searchClause);
-                $retval = $GLOBALS['dbi']->numRows(
-                    $GLOBALS['dbi']->tryQuery($query)
-                );
-
-                return $retval;
-            }
-
-            $retval = 0;
-            foreach ($this->_getDatabasesToSearch($searchClause) as $db) {
-                $query = "SHOW DATABASES LIKE '" . $db . "'";
-                $retval += $GLOBALS['dbi']->numRows(
-                    $GLOBALS['dbi']->tryQuery($query)
-                );
-            }
-
-            return $retval;
-        }
-
-        $dbSeparator = $GLOBALS['cfg']['NavigationTreeDbSeparator'];
-        if (!$GLOBALS['cfg']['Server']['DisableIS']) {
-            $query = "SELECT COUNT(*) ";
-            $query .= "FROM ( ";
-            $query .= "SELECT DISTINCT SUBSTRING_INDEX(SCHEMA_NAME, ";
-            $query .= "'$dbSeparator', 1) ";
-            $query .= "DB_first_level ";
-            $query .= "FROM INFORMATION_SCHEMA.SCHEMATA ";
-            $query .= $this->_getWhereClause('SCHEMA_NAME', $searchClause);
-            $query .= ") t ";
-            $retval = (int)$GLOBALS['dbi']->fetchValue($query);
-
-            return $retval;
-        }
-
-        if ($GLOBALS['dbs_to_test'] !== false) {
-            $prefixMap = array();
-            foreach ($this->_getDatabasesToSearch($searchClause) as $db) {
-                $query = "SHOW DATABASES LIKE '" . $db . "'";
-                $handle = $GLOBALS['dbi']->tryQuery($query);
-                if ($handle === false) {
-                    continue;
-                }
-
-                while ($arr = $GLOBALS['dbi']->fetchArray($handle)) {
-                    if ($this->_isHideDb($arr[0])) {
-                        continue;
-                    }
-                    $prefix = strstr($arr[0], $dbSeparator, true);
-                    if ($prefix === false) {
-                        $prefix = $arr[0];
-                    }
-                    $prefixMap[$prefix] = 1;
-                }
-            }
-            $retval = count($prefixMap);
-
-            return $retval;
-        }
-
-        $prefixMap = array();
-        $query = "SHOW DATABASES ";
-        $query .= $this->_getWhereClause('Database', $searchClause);
-        $handle = $GLOBALS['dbi']->tryQuery($query);
-        if ($handle !== false) {
-            while ($arr = $GLOBALS['dbi']->fetchArray($handle)) {
-                $prefix = strstr($arr[0], $dbSeparator, true);
-                if ($prefix === false) {
-                    $prefix = $arr[0];
-                }
-                $prefixMap[$prefix] = 1;
-            }
-        }
-        $retval = count($prefixMap);
-
-        return $retval;
-    }
-
-    /**
-     * Detemines whether a given database should be hidden according to 'hide_db'
-     *
-     * @param string $db database name
-     *
-     * @return boolean whether to hide
-     */
-    private function _isHideDb($db)
-    {
-        if (!empty($GLOBALS['cfg']['Server']['hide_db'])
-            && preg_match('/' . $GLOBALS['cfg']['Server']['hide_db'] . '/', $db)
-        ) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Get the list of databases for 'SHOW DATABASES LIKE' queries.
-     * If a search clause is set it gets the highest priority while only_db gets
-     * the next priority. In case both are empty list of databases determined by
-     * GRANTs are used
-     *
-     * @param string $searchClause search clause
-     *
-     * @return array array of databases
-     */
-    private function _getDatabasesToSearch($searchClause)
-    {
-        if (!empty($searchClause)) {
-            $databases = array(
-                "%" . $GLOBALS['dbi']->escapeString($searchClause, true) . "%",
-            );
-        } elseif (!empty($GLOBALS['cfg']['Server']['only_db'])) {
-            $databases = $GLOBALS['cfg']['Server']['only_db'];
-        } elseif (!empty($GLOBALS['dbs_to_test'])) {
-            $databases = $GLOBALS['dbs_to_test'];
-        }
-        sort($databases);
-
-        return $databases;
-    }
-
-    /**
-     * Returns the WHERE clause depending on the $searchClause parameter
-     * and the hide_db directive
-     *
-     * @param string $columnName   Column name of the column having database names
-     * @param string $searchClause A string used to filter the results of the query
-     *
-     * @return string
-     */
-    private function _getWhereClause($columnName, $searchClause = '')
-    {
-        $whereClause = "WHERE TRUE ";
-        if (!empty($searchClause)) {
-            $whereClause .= "AND " . Util::backquote($columnName)
-                . " LIKE '%";
-            $whereClause .= $GLOBALS['dbi']->escapeString(
-                $searchClause,
-                true
-            );
-            $whereClause .= "%' ";
-        }
-
-        if (!empty($GLOBALS['cfg']['Server']['hide_db'])) {
-            $whereClause .= "AND " . Util::backquote($columnName)
-                . " NOT REGEXP '"
-                . $GLOBALS['dbi']->escapeString($GLOBALS['cfg']['Server']['hide_db'])
-                . "' ";
-        }
-
-        if (!empty($GLOBALS['cfg']['Server']['only_db'])) {
-            if (is_string($GLOBALS['cfg']['Server']['only_db'])) {
-                $GLOBALS['cfg']['Server']['only_db'] = array(
-                    $GLOBALS['cfg']['Server']['only_db'],
-                );
-            }
-            $whereClause .= "AND (";
-            $subClauses = array();
-            foreach ($GLOBALS['cfg']['Server']['only_db'] as $each_only_db) {
-                $subClauses[] = " " . Util::backquote($columnName)
-                    . " LIKE '"
-                    . $GLOBALS['dbi']->escapeString($each_only_db) . "' ";
-            }
-            $whereClause .= implode("OR", $subClauses) . ") ";
-        }
-
-        return $whereClause;
-    }
-
-    /**
-     * Returns HTML for control buttons displayed infront of a node
-     *
-     * @return String HTML for control buttons
-     */
-    public function getHtmlForControlButtons()
-    {
-        return '';
-    }
-
-    /**
-     * Returns CSS classes for a node
-     *
-     * @param boolean $match Whether the node matched loaded tree
-     *
-     * @return String with html classes.
-     */
-    public function getCssClasses($match)
-    {
-        if (!$GLOBALS['cfg']['NavigationTreeEnableExpansion']
-        ) {
-            return '';
-        }
-
-        $result = array('expander');
-
-        if ($this->is_group || $match) {
-            $result[] = 'loaded';
-        }
-        if ($this->type == Node::CONTAINER) {
-            $result[] = 'container';
-        }
-
-        return implode(' ', $result);
-    }
-
-    /**
-     * Returns icon for the node
-     *
-     * @param boolean $match Whether the node matched loaded tree
-     *
-     * @return String with image name
-     */
-    public function getIcon($match)
-    {
-        if (!$GLOBALS['cfg']['NavigationTreeEnableExpansion']
-        ) {
-            return '';
-        } elseif ($match && !$this->is_group) {
-            $this->visible = true;
-
-            return Util::getImage('b_minus.png');
-        } else {
-            return Util::getImage('b_plus.png', __('Expand/Collapse'));
-        }
-    }
-
-    /**
-     * Gets the count of hidden elements for each database
-     *
-     * @return array array containing the count of hidden elements for each database
-     */
-    public function getNavigationHidingData()
-    {
-        $cfgRelation = PMA_getRelationsParam();
-        if ($cfgRelation['navwork']) {
-            $navTable = Util::backquote($cfgRelation['db'])
-                . "." . Util::backquote(
-                    $cfgRelation['navigationhiding']
-                );
-            $sqlQuery = "SELECT `db_name`, COUNT(*) AS `count` FROM " . $navTable
-                . " WHERE `username`='"
-                . $GLOBALS['dbi']->escapeString(
-                    $GLOBALS['cfg']['Server']['user']
-                ) . "'"
-                . " GROUP BY `db_name`";
-            $counts = $GLOBALS['dbi']->fetchResult(
-                $sqlQuery,
-                'db_name',
-                'count',
-                $GLOBALS['controllink']
-            );
-
-            return $counts;
-        }
-
-        return null;
-    }
-}
diff --git a/#pma/libraries/navigation/nodes/NodeColumn.php b/#pma/libraries/navigation/nodes/NodeColumn.php
deleted file mode 100644
index 75f64b6f..00000000
--- a/#pma/libraries/navigation/nodes/NodeColumn.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Functionality for the navigation tree
- *
- * @package PhpMyAdmin-Navigation
- */
-namespace PMA\libraries\navigation\nodes;
-
-use PMA;
-
-/**
- * Represents a columns node in the navigation tree
- *
- * @package PhpMyAdmin-Navigation
- */
-class NodeColumn extends Node
-{
-    /**
-     * Initialises the class
-     *
-     * @param string $name     An identifier for the new node
-     * @param int    $type     Type of node, may be one of CONTAINER or OBJECT
-     * @param bool   $is_group Whether this object has been created
-     *                         while grouping nodes
-     */
-    public function __construct($name, $type = Node::OBJECT, $is_group = false)
-    {
-        parent::__construct($name, $type, $is_group);
-        $this->icon = PMA\libraries\Util::getImage('pause.png', __('Column'));
-        $this->links = array(
-            'text'  => 'tbl_structure.php?server=' . $GLOBALS['server']
-                . '&amp;db=%3$s&amp;table=%2$s&amp;field=%1$s'
-                . '&amp;change_column=1'
-                . '&amp;token=' . $_SESSION[' PMA_token '],
-            'icon'  => 'tbl_structure.php?server=' . $GLOBALS['server']
-                . '&amp;db=%3$s&amp;table=%2$s&amp;field=%1$s'
-                . '&amp;change_column=1'
-                . '&amp;token=' . $_SESSION[' PMA_token '],
-            'title' => __('Structure'),
-        );
-    }
-}
-
diff --git a/#pma/libraries/navigation/nodes/NodeColumnContainer.php b/#pma/libraries/navigation/nodes/NodeColumnContainer.php
deleted file mode 100644
index aa678a72..00000000
--- a/#pma/libraries/navigation/nodes/NodeColumnContainer.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Functionality for the navigation tree
- *
- * @package PhpMyAdmin-Navigation
- */
-namespace PMA\libraries\navigation\nodes;
-
-use PMA;
-use PMA\libraries\navigation\NodeFactory;
-use PMA\libraries\Util;
-
-/**
- * Represents a container for column nodes in the navigation tree
- *
- * @package PhpMyAdmin-Navigation
- */
-class NodeColumnContainer extends Node
-{
-    /**
-     * Initialises the class
-     */
-    public function __construct()
-    {
-        parent::__construct(__('Columns'), Node::CONTAINER);
-        $this->icon = Util::getImage('pause.png', __('Columns'));
-        $this->links = array(
-            'text' => 'tbl_structure.php?server=' . $GLOBALS['server']
-                . '&amp;db=%2$s&amp;table=%1$s'
-                . '&amp;token=' . $_SESSION[' PMA_token '],
-            'icon' => 'tbl_structure.php?server=' . $GLOBALS['server']
-                . '&amp;db=%2$s&amp;table=%1$s'
-                . '&amp;token=' . $_SESSION[' PMA_token '],
-        );
-        $this->real_name = 'columns';
-
-        $new_label = _pgettext('Create new column', 'New');
-        $new = NodeFactory::getInstance(
-            'Node',
-            $new_label
-        );
-        $new->isNew = true;
-        $new->icon = Util::getImage('b_column_add.png', $new_label);
-        $new->links = array(
-            'text' => 'tbl_addfield.php?server=' . $GLOBALS['server']
-                . '&amp;db=%3$s&amp;table=%2$s'
-                . '&amp;field_where=last&after_field='
-                . '&amp;token=' . $_SESSION[' PMA_token '],
-            'icon' => 'tbl_addfield.php?server=' . $GLOBALS['server']
-                . '&amp;db=%3$s&amp;table=%2$s'
-                . '&amp;field_where=last&after_field='
-                . '&amp;token=' . $_SESSION[' PMA_token '],
-        );
-        $new->classes = 'new_column italics';
-        $this->addChild($new);
-    }
-}
-
diff --git a/#pma/libraries/navigation/nodes/NodeDatabase.php b/#pma/libraries/navigation/nodes/NodeDatabase.php
deleted file mode 100644
index 27915fb2..00000000
--- a/#pma/libraries/navigation/nodes/NodeDatabase.php
+++ /dev/null
@@ -1,712 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Functionality for the navigation tree
- *
- * @package PhpMyAdmin-Navigation
- */
-namespace PMA\libraries\navigation\nodes;
-
-use PMA\libraries\Util;
-
-/**
- * Represents a database node in the navigation tree
- *
- * @package PhpMyAdmin-Navigation
- */
-class NodeDatabase extends Node
-{
-    /**
-     * The number of hidden items in this database
-     *
-     * @var int
-     */
-    protected $hiddenCount = 0;
-
-    /**
-     * Initialises the class
-     *
-     * @param string $name     An identifier for the new node
-     * @param int    $type     Type of node, may be one of CONTAINER or OBJECT
-     * @param bool   $is_group Whether this object has been created
-     *                         while grouping nodes
-     */
-    public function __construct($name, $type = Node::OBJECT, $is_group = false)
-    {
-        parent::__construct($name, $type, $is_group);
-        $this->icon = Util::getImage(
-            's_db.png',
-            __('Database operations')
-        );
-
-        $script_name = Util::getScriptNameForOption(
-            $GLOBALS['cfg']['DefaultTabDatabase'],
-            'database'
-        );
-        $this->links = array(
-            'text'  => $script_name
-                . '?server=' . $GLOBALS['server']
-                . '&amp;db=%1$s&amp;token=' . $_SESSION[' PMA_token '],
-            'icon'  => 'db_operations.php?server=' . $GLOBALS['server']
-                . '&amp;db=%1$s&amp;token=' . $_SESSION[' PMA_token '],
-            'title' => __('Structure'),
-        );
-        $this->classes = 'database';
-    }
-
-    /**
-     * Returns the number of children of type $type present inside this container
-     * This method is overridden by the PMA\libraries\navigation\nodes\NodeDatabase
-     * and PMA\libraries\navigation\nodes\NodeTable classes
-     *
-     * @param string  $type         The type of item we are looking for
-     *                              ('tables', 'views', etc)
-     * @param string  $searchClause A string used to filter the results of
-     *                              the query
-     * @param boolean $singleItem   Whether to get presence of a single known
-     *                              item or false in none
-     *
-     * @return int
-     */
-    public function getPresence($type = '', $searchClause = '', $singleItem = false)
-    {
-        $retval = 0;
-        switch ($type) {
-        case 'tables':
-            $retval = $this->_getTableCount($searchClause, $singleItem);
-            break;
-        case 'views':
-            $retval = $this->_getViewCount($searchClause, $singleItem);
-            break;
-        case 'procedures':
-            $retval = $this->_getProcedureCount($searchClause, $singleItem);
-            break;
-        case 'functions':
-            $retval = $this->_getFunctionCount($searchClause, $singleItem);
-            break;
-        case 'events':
-            $retval = $this->_getEventCount($searchClause, $singleItem);
-            break;
-        default:
-            break;
-        }
-
-        return $retval;
-    }
-
-    /**
-     * Returns the number of tables or views present inside this database
-     *
-     * @param string  $which        tables|views
-     * @param string  $searchClause A string used to filter the results of
-     *                              the query
-     * @param boolean $singleItem   Whether to get presence of a single known
-     *                              item or false in none
-     *
-     * @return int
-     */
-    private function _getTableOrViewCount($which, $searchClause, $singleItem)
-    {
-        $db = $this->real_name;
-        if ($which == 'tables') {
-            $condition = '=';
-        } else {
-            $condition = '!=';
-        }
-
-        if (! $GLOBALS['cfg']['Server']['DisableIS']) {
-            $db     = $GLOBALS['dbi']->escapeString($db);
-            $query  = "SELECT COUNT(*) ";
-            $query .= "FROM `INFORMATION_SCHEMA`.`TABLES` ";
-            $query .= "WHERE `TABLE_SCHEMA`='$db' ";
-            $query .= "AND `TABLE_TYPE`" . $condition . "'BASE TABLE' ";
-            if (! empty($searchClause)) {
-                $query .= "AND " . $this->_getWhereClauseForSearch(
-                    $searchClause,
-                    $singleItem,
-                    'TABLE_NAME'
-                );
-            }
-            $retval = (int)$GLOBALS['dbi']->fetchValue($query);
-        } else {
-            $query = "SHOW FULL TABLES FROM ";
-            $query .= Util::backquote($db);
-            $query .= " WHERE `Table_type`" . $condition . "'BASE TABLE' ";
-            if (!empty($searchClause)) {
-                $query .= "AND " . $this->_getWhereClauseForSearch(
-                    $searchClause,
-                    $singleItem,
-                    'Tables_in_' . $db
-                );
-            }
-            $retval = $GLOBALS['dbi']->numRows(
-                $GLOBALS['dbi']->tryQuery($query)
-            );
-        }
-
-        return $retval;
-    }
-
-    /**
-     * Returns the number of tables present inside this database
-     *
-     * @param string  $searchClause A string used to filter the results of
-     *                              the query
-     * @param boolean $singleItem   Whether to get presence of a single known
-     *                              item or false in none
-     *
-     * @return int
-     */
-    private function _getTableCount($searchClause, $singleItem)
-    {
-        return $this->_getTableOrViewCount(
-            'tables',
-            $searchClause,
-            $singleItem
-        );
-    }
-
-    /**
-     * Returns the number of views present inside this database
-     *
-     * @param string  $searchClause A string used to filter the results of
-     *                              the query
-     * @param boolean $singleItem   Whether to get presence of a single known
-     *                              item or false in none
-     *
-     * @return int
-     */
-    private function _getViewCount($searchClause, $singleItem)
-    {
-        return $this->_getTableOrViewCount(
-            'views',
-            $searchClause,
-            $singleItem
-        );
-    }
-
-    /**
-     * Returns the number of procedures present inside this database
-     *
-     * @param string  $searchClause A string used to filter the results of
-     *                              the query
-     * @param boolean $singleItem   Whether to get presence of a single known
-     *                              item or false in none
-     *
-     * @return int
-     */
-    private function _getProcedureCount($searchClause, $singleItem)
-    {
-        $db = $this->real_name;
-        if (!$GLOBALS['cfg']['Server']['DisableIS']) {
-            $db = $GLOBALS['dbi']->escapeString($db);
-            $query = "SELECT COUNT(*) ";
-            $query .= "FROM `INFORMATION_SCHEMA`.`ROUTINES` ";
-            $query .= "WHERE `ROUTINE_SCHEMA` "
-                . Util::getCollateForIS() . "='$db'";
-            $query .= "AND `ROUTINE_TYPE`='PROCEDURE' ";
-            if (!empty($searchClause)) {
-                $query .= "AND " . $this->_getWhereClauseForSearch(
-                    $searchClause,
-                    $singleItem,
-                    'ROUTINE_NAME'
-                );
-            }
-            $retval = (int)$GLOBALS['dbi']->fetchValue($query);
-        } else {
-            $db = $GLOBALS['dbi']->escapeString($db);
-            $query = "SHOW PROCEDURE STATUS WHERE `Db`='$db' ";
-            if (!empty($searchClause)) {
-                $query .= "AND " . $this->_getWhereClauseForSearch(
-                    $searchClause,
-                    $singleItem,
-                    'Name'
-                );
-            }
-            $retval = $GLOBALS['dbi']->numRows(
-                $GLOBALS['dbi']->tryQuery($query)
-            );
-        }
-
-        return $retval;
-    }
-
-    /**
-     * Returns the number of functions present inside this database
-     *
-     * @param string  $searchClause A string used to filter the results of
-     *                              the query
-     * @param boolean $singleItem   Whether to get presence of a single known
-     *                              item or false in none
-     *
-     * @return int
-     */
-    private function _getFunctionCount($searchClause, $singleItem)
-    {
-        $db = $this->real_name;
-        if (!$GLOBALS['cfg']['Server']['DisableIS']) {
-            $db = $GLOBALS['dbi']->escapeString($db);
-            $query = "SELECT COUNT(*) ";
-            $query .= "FROM `INFORMATION_SCHEMA`.`ROUTINES` ";
-            $query .= "WHERE `ROUTINE_SCHEMA` "
-                . Util::getCollateForIS() . "='$db' ";
-            $query .= "AND `ROUTINE_TYPE`='FUNCTION' ";
-            if (!empty($searchClause)) {
-                $query .= "AND " . $this->_getWhereClauseForSearch(
-                    $searchClause,
-                    $singleItem,
-                    'ROUTINE_NAME'
-                );
-            }
-            $retval = (int)$GLOBALS['dbi']->fetchValue($query);
-        } else {
-            $db = $GLOBALS['dbi']->escapeString($db);
-            $query = "SHOW FUNCTION STATUS WHERE `Db`='$db' ";
-            if (!empty($searchClause)) {
-                $query .= "AND " . $this->_getWhereClauseForSearch(
-                    $searchClause,
-                    $singleItem,
-                    'Name'
-                );
-            }
-            $retval = $GLOBALS['dbi']->numRows(
-                $GLOBALS['dbi']->tryQuery($query)
-            );
-        }
-
-        return $retval;
-    }
-
-    /**
-     * Returns the number of events present inside this database
-     *
-     * @param string  $searchClause A string used to filter the results of
-     *                              the query
-     * @param boolean $singleItem   Whether to get presence of a single known
-     *                              item or false in none
-     *
-     * @return int
-     */
-    private function _getEventCount($searchClause, $singleItem)
-    {
-        $db = $this->real_name;
-        if (!$GLOBALS['cfg']['Server']['DisableIS']) {
-            $db = $GLOBALS['dbi']->escapeString($db);
-            $query = "SELECT COUNT(*) ";
-            $query .= "FROM `INFORMATION_SCHEMA`.`EVENTS` ";
-            $query .= "WHERE `EVENT_SCHEMA` "
-                . Util::getCollateForIS() . "='$db' ";
-            if (!empty($searchClause)) {
-                $query .= "AND " . $this->_getWhereClauseForSearch(
-                    $searchClause,
-                    $singleItem,
-                    'EVENT_NAME'
-                );
-            }
-            $retval = (int)$GLOBALS['dbi']->fetchValue($query);
-        } else {
-            $db = Util::backquote($db);
-            $query = "SHOW EVENTS FROM $db ";
-            if (!empty($searchClause)) {
-                $query .= "WHERE " . $this->_getWhereClauseForSearch(
-                    $searchClause,
-                    $singleItem,
-                    'Name'
-                );
-            }
-            $retval = $GLOBALS['dbi']->numRows(
-                $GLOBALS['dbi']->tryQuery($query)
-            );
-        }
-
-        return $retval;
-    }
-
-    /**
-     * Returns the WHERE clause for searching inside a database
-     *
-     * @param string  $searchClause A string used to filter the results of the query
-     * @param boolean $singleItem   Whether to get presence of a single known item
-     * @param string  $columnName   Name of the column in the result set to match
-     *
-     * @return string WHERE clause for searching
-     */
-    private function _getWhereClauseForSearch(
-        $searchClause,
-        $singleItem,
-        $columnName
-    ) {
-        $query = '';
-        if ($singleItem) {
-            $query .= Util::backquote($columnName) . " = ";
-            $query .= "'" . $GLOBALS['dbi']->escapeString($searchClause) . "'";
-        } else {
-            $query .= Util::backquote($columnName) . " LIKE ";
-            $query .= "'%" . $GLOBALS['dbi']->escapeString($searchClause)
-                . "%'";
-        }
-
-        return $query;
-    }
-
-    /**
-     * Returns the names of children of type $type present inside this container
-     * This method is overridden by the PMA\libraries\navigation\nodes\NodeDatabase
-     * and PMA\libraries\navigation\nodes\NodeTable classes
-     *
-     * @param string $type         The type of item we are looking for
-     *                             ('tables', 'views', etc)
-     * @param int    $pos          The offset of the list within the results
-     * @param string $searchClause A string used to filter the results of the query
-     *
-     * @return array
-     */
-    public function getData($type, $pos, $searchClause = '')
-    {
-        $retval = array();
-        switch ($type) {
-        case 'tables':
-            $retval = $this->_getTables($pos, $searchClause);
-            break;
-        case 'views':
-            $retval = $this->_getViews($pos, $searchClause);
-            break;
-        case 'procedures':
-            $retval = $this->_getProcedures($pos, $searchClause);
-            break;
-        case 'functions':
-            $retval = $this->_getFunctions($pos, $searchClause);
-            break;
-        case 'events':
-            $retval = $this->_getEvents($pos, $searchClause);
-            break;
-        default:
-            break;
-        }
-
-        // Remove hidden items so that they are not displayed in navigation tree
-        $cfgRelation = PMA_getRelationsParam();
-        if ($cfgRelation['navwork']) {
-            $hiddenItems = $this->getHiddenItems(substr($type, 0, -1));
-            foreach ($retval as $key => $item) {
-                if (in_array($item, $hiddenItems)) {
-                    unset($retval[$key]);
-                }
-            }
-        }
-
-        return $retval;
-    }
-
-    /**
-     * Return list of hidden items of given type
-     *
-     * @param string $type The type of items we are looking for
-     *                     ('table', 'function', 'group', etc.)
-     *
-     * @return array Array containing hidden items of given type
-     */
-    public function getHiddenItems($type)
-    {
-        $db = $this->real_name;
-        $cfgRelation = PMA_getRelationsParam();
-        if (empty($cfgRelation['navigationhiding'])) {
-            return array();
-        }
-        $navTable = Util::backquote($cfgRelation['db'])
-            . "." . Util::backquote($cfgRelation['navigationhiding']);
-        $sqlQuery = "SELECT `item_name` FROM " . $navTable
-            . " WHERE `username`='" . $cfgRelation['user'] . "'"
-            . " AND `item_type`='" . $type
-            . "'" . " AND `db_name`='" . $GLOBALS['dbi']->escapeString($db)
-            . "'";
-        $result = PMA_queryAsControlUser($sqlQuery, false);
-        $hiddenItems = array();
-        if ($result) {
-            while ($row = $GLOBALS['dbi']->fetchArray($result)) {
-                $hiddenItems[] = $row[0];
-            }
-        }
-        $GLOBALS['dbi']->freeResult($result);
-
-        return $hiddenItems;
-    }
-
-    /**
-     * Returns the list of tables or views inside this database
-     *
-     * @param string $which        tables|views
-     * @param int    $pos          The offset of the list within the results
-     * @param string $searchClause A string used to filter the results of the query
-     *
-     * @return array
-     */
-    private function _getTablesOrViews($which, $pos, $searchClause)
-    {
-        if ($which == 'tables') {
-            $condition = '=';
-        } else {
-            $condition = '!=';
-        }
-        $maxItems = $GLOBALS['cfg']['MaxNavigationItems'];
-        $retval   = array();
-        $db       = $this->real_name;
-        if (! $GLOBALS['cfg']['Server']['DisableIS']) {
-            $escdDb = $GLOBALS['dbi']->escapeString($db);
-            $query  = "SELECT `TABLE_NAME` AS `name` ";
-            $query .= "FROM `INFORMATION_SCHEMA`.`TABLES` ";
-            $query .= "WHERE `TABLE_SCHEMA`='$escdDb' ";
-            $query .= "AND `TABLE_TYPE`" . $condition . "'BASE TABLE' ";
-            if (! empty($searchClause)) {
-                $query .= "AND `TABLE_NAME` LIKE '%";
-                $query .= $GLOBALS['dbi']->escapeString($searchClause);
-                $query .= "%'";
-            }
-            $query .= "ORDER BY `TABLE_NAME` ASC ";
-            $query .= "LIMIT " . intval($pos) . ", $maxItems";
-            $retval = $GLOBALS['dbi']->fetchResult($query);
-        } else {
-            $query = " SHOW FULL TABLES FROM ";
-            $query .= Util::backquote($db);
-            $query .= " WHERE `Table_type`" . $condition . "'BASE TABLE' ";
-            if (!empty($searchClause)) {
-                $query .= "AND " . Util::backquote(
-                    "Tables_in_" . $db
-                );
-                $query .= " LIKE '%" . $GLOBALS['dbi']->escapeString(
-                    $searchClause
-                );
-                $query .= "%'";
-            }
-            $handle = $GLOBALS['dbi']->tryQuery($query);
-            if ($handle !== false) {
-                $count = 0;
-                if ($GLOBALS['dbi']->dataSeek($handle, $pos)) {
-                    while ($arr = $GLOBALS['dbi']->fetchArray($handle)) {
-                        if ($count < $maxItems) {
-                            $retval[] = $arr[0];
-                            $count++;
-                        } else {
-                            break;
-                        }
-                    }
-                }
-            }
-        }
-
-        return $retval;
-    }
-
-    /**
-     * Returns the list of tables inside this database
-     *
-     * @param int    $pos          The offset of the list within the results
-     * @param string $searchClause A string used to filter the results of the query
-     *
-     * @return array
-     */
-    private function _getTables($pos, $searchClause)
-    {
-        return $this->_getTablesOrViews('tables', $pos, $searchClause);
-    }
-
-    /**
-     * Returns the list of views inside this database
-     *
-     * @param int    $pos          The offset of the list within the results
-     * @param string $searchClause A string used to filter the results of the query
-     *
-     * @return array
-     */
-    private function _getViews($pos, $searchClause)
-    {
-        return $this->_getTablesOrViews('views', $pos, $searchClause);
-    }
-
-    /**
-     * Returns the list of procedures or functions inside this database
-     *
-     * @param string $routineType  PROCEDURE|FUNCTION
-     * @param int    $pos          The offset of the list within the results
-     * @param string $searchClause A string used to filter the results of the query
-     *
-     * @return array
-     */
-    private function _getRoutines($routineType, $pos, $searchClause)
-    {
-        $maxItems = $GLOBALS['cfg']['MaxNavigationItems'];
-        $retval = array();
-        $db = $this->real_name;
-        if (!$GLOBALS['cfg']['Server']['DisableIS']) {
-            $escdDb = $GLOBALS['dbi']->escapeString($db);
-            $query = "SELECT `ROUTINE_NAME` AS `name` ";
-            $query .= "FROM `INFORMATION_SCHEMA`.`ROUTINES` ";
-            $query .= "WHERE `ROUTINE_SCHEMA` "
-                . Util::getCollateForIS() . "='$escdDb'";
-            $query .= "AND `ROUTINE_TYPE`='" . $routineType . "' ";
-            if (!empty($searchClause)) {
-                $query .= "AND `ROUTINE_NAME` LIKE '%";
-                $query .= $GLOBALS['dbi']->escapeString($searchClause);
-                $query .= "%'";
-            }
-            $query .= "ORDER BY `ROUTINE_NAME` ASC ";
-            $query .= "LIMIT " . intval($pos) . ", $maxItems";
-            $retval = $GLOBALS['dbi']->fetchResult($query);
-        } else {
-            $escdDb = $GLOBALS['dbi']->escapeString($db);
-            $query = "SHOW " . $routineType . " STATUS WHERE `Db`='$escdDb' ";
-            if (!empty($searchClause)) {
-                $query .= "AND `Name` LIKE '%";
-                $query .= $GLOBALS['dbi']->escapeString($searchClause);
-                $query .= "%'";
-            }
-            $handle = $GLOBALS['dbi']->tryQuery($query);
-            if ($handle !== false) {
-                $count = 0;
-                if ($GLOBALS['dbi']->dataSeek($handle, $pos)) {
-                    while ($arr = $GLOBALS['dbi']->fetchArray($handle)) {
-                        if ($count < $maxItems) {
-                            $retval[] = $arr['Name'];
-                            $count++;
-                        } else {
-                            break;
-                        }
-                    }
-                }
-            }
-        }
-
-        return $retval;
-    }
-
-    /**
-     * Returns the list of procedures inside this database
-     *
-     * @param int    $pos          The offset of the list within the results
-     * @param string $searchClause A string used to filter the results of the query
-     *
-     * @return array
-     */
-    private function _getProcedures($pos, $searchClause)
-    {
-        return $this->_getRoutines('PROCEDURE', $pos, $searchClause);
-    }
-
-    /**
-     * Returns the list of functions inside this database
-     *
-     * @param int    $pos          The offset of the list within the results
-     * @param string $searchClause A string used to filter the results of the query
-     *
-     * @return array
-     */
-    private function _getFunctions($pos, $searchClause)
-    {
-        return $this->_getRoutines('FUNCTION', $pos, $searchClause);
-    }
-
-    /**
-     * Returns the list of events inside this database
-     *
-     * @param int    $pos          The offset of the list within the results
-     * @param string $searchClause A string used to filter the results of the query
-     *
-     * @return array
-     */
-    private function _getEvents($pos, $searchClause)
-    {
-        $maxItems = $GLOBALS['cfg']['MaxNavigationItems'];
-        $retval = array();
-        $db = $this->real_name;
-        if (!$GLOBALS['cfg']['Server']['DisableIS']) {
-            $escdDb = $GLOBALS['dbi']->escapeString($db);
-            $query = "SELECT `EVENT_NAME` AS `name` ";
-            $query .= "FROM `INFORMATION_SCHEMA`.`EVENTS` ";
-            $query .= "WHERE `EVENT_SCHEMA` "
-                . Util::getCollateForIS() . "='$escdDb' ";
-            if (!empty($searchClause)) {
-                $query .= "AND `EVENT_NAME` LIKE '%";
-                $query .= $GLOBALS['dbi']->escapeString($searchClause);
-                $query .= "%'";
-            }
-            $query .= "ORDER BY `EVENT_NAME` ASC ";
-            $query .= "LIMIT " . intval($pos) . ", $maxItems";
-            $retval = $GLOBALS['dbi']->fetchResult($query);
-        } else {
-            $escdDb = Util::backquote($db);
-            $query = "SHOW EVENTS FROM $escdDb ";
-            if (!empty($searchClause)) {
-                $query .= "WHERE `Name` LIKE '%";
-                $query .= $GLOBALS['dbi']->escapeString($searchClause);
-                $query .= "%'";
-            }
-            $handle = $GLOBALS['dbi']->tryQuery($query);
-            if ($handle !== false) {
-                $count = 0;
-                if ($GLOBALS['dbi']->dataSeek($handle, $pos)) {
-                    while ($arr = $GLOBALS['dbi']->fetchArray($handle)) {
-                        if ($count < $maxItems) {
-                            $retval[] = $arr['Name'];
-                            $count++;
-                        } else {
-                            break;
-                        }
-                    }
-                }
-            }
-        }
-
-        return $retval;
-    }
-
-    /**
-     * Returns HTML for control buttons displayed infront of a node
-     *
-     * @return String HTML for control buttons
-     */
-    public function getHtmlForControlButtons()
-    {
-        $ret = '';
-        $cfgRelation = PMA_getRelationsParam();
-        if ($cfgRelation['navwork']) {
-            if ($this->hiddenCount > 0) {
-                $ret = '<span class="dbItemControls">'
-                    . '<a href="navigation.php'
-                    . PMA_URL_getCommon()
-                    . '&showUnhideDialog=true'
-                    . '&dbName=' . urlencode($this->real_name) . '"'
-                    . ' class="showUnhide ajax">'
-                    . Util::getImage(
-                        'lightbulb.png',
-                        __('Show hidden items')
-                    )
-                    . '</a></span>';
-            }
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Sets the number of hidden items in this database
-     *
-     * @param int $count hidden item count
-     *
-     * @return void
-     */
-    public function setHiddenCount($count)
-    {
-        $this->hiddenCount = $count;
-    }
-
-    /**
-     * Returns the number of hidden items in this database
-     *
-     * @return int hidden item count
-     */
-    public function getHiddenCount()
-    {
-        return $this->hiddenCount;
-    }
-}
-
diff --git a/#pma/libraries/navigation/nodes/NodeDatabaseChild.php b/#pma/libraries/navigation/nodes/NodeDatabaseChild.php
deleted file mode 100644
index 94477bdd..00000000
--- a/#pma/libraries/navigation/nodes/NodeDatabaseChild.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Functionality for the navigation tree
- *
- * @package PhpMyAdmin-Navigation
- */
-namespace PMA\libraries\navigation\nodes;
-
-use PMA;
-
-/**
- * Represents a node that is a child of a database node
- * This may either be a concrete child such as table or a container
- * such as table container
- *
- * @package PhpMyAdmin-Navigation
- */
-abstract class NodeDatabaseChild extends Node
-{
-    /**
-     * Returns the type of the item represented by the node.
-     *
-     * @return string type of the item
-     */
-    protected abstract function getItemType();
-
-    /**
-     * Returns HTML for control buttons displayed infront of a node
-     *
-     * @return String HTML for control buttons
-     */
-    public function getHtmlForControlButtons()
-    {
-        $ret = '';
-        $cfgRelation = PMA_getRelationsParam();
-        if ($cfgRelation['navwork']) {
-            $db = $this->realParent()->real_name;
-            $item = $this->real_name;
-            $ret = '<span class="navItemControls">'
-                . '<a href="navigation.php'
-                . PMA_URL_getCommon()
-                . '&hideNavItem=true'
-                . '&itemType=' . urlencode($this->getItemType())
-                . '&itemName=' . urlencode($item)
-                . '&dbName=' . urlencode($db) . '"'
-                . ' class="hideNavItem ajax">'
-                . PMA\libraries\Util::getImage('lightbulb_off.png', __('Hide'))
-                . '</a></span>';
-        }
-
-        return $ret;
-    }
-}
diff --git a/#pma/libraries/navigation/nodes/NodeDatabaseChildContainer.php b/#pma/libraries/navigation/nodes/NodeDatabaseChildContainer.php
deleted file mode 100644
index 59250f72..00000000
--- a/#pma/libraries/navigation/nodes/NodeDatabaseChildContainer.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Represents container node that carries children of a database
- *
- * @package PhpMyAdmin-Navigation
- */
-namespace PMA\libraries\navigation\nodes;
-
-/**
- * Represents container node that carries children of a database
- *
- * @package PhpMyAdmin-Navigation
- */
-abstract class NodeDatabaseChildContainer extends NodeDatabaseChild
-{
-    /**
-     * Initialises the class by setting the common variables
-     *
-     * @param string $name An identifier for the new node
-     * @param int    $type Type of node, may be one of CONTAINER or OBJECT
-     */
-    public function __construct($name, $type = Node::OBJECT)
-    {
-        parent::__construct($name, $type);
-        if ($GLOBALS['cfg']['NavigationTreeEnableGrouping']) {
-            $this->separator = $GLOBALS['cfg']['NavigationTreeTableSeparator'];
-            $this->separator_depth = (int)(
-            $GLOBALS['cfg']['NavigationTreeTableLevel']
-            );
-        }
-    }
-
-    /**
-     * Returns the type of the item represented by the node.
-     *
-     * @return string type of the item
-     */
-    protected function getItemType()
-    {
-        return 'group';
-    }
-}
diff --git a/#pma/libraries/navigation/nodes/NodeDatabaseContainer.php b/#pma/libraries/navigation/nodes/NodeDatabaseContainer.php
deleted file mode 100644
index b636748c..00000000
--- a/#pma/libraries/navigation/nodes/NodeDatabaseContainer.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Functionality for the navigation tree
- *
- * @package PhpMyAdmin-Navigation
- */
-namespace PMA\libraries\navigation\nodes;
-
-use PMA;
-use PMA\libraries\navigation\NodeFactory;
-
-require_once './libraries/check_user_privileges.lib.php';
-
-/**
- * Represents a container for database nodes in the navigation tree
- *
- * @package PhpMyAdmin-Navigation
- */
-class NodeDatabaseContainer extends Node
-{
-    /**
-     * Initialises the class
-     *
-     * @param string $name An identifier for the new node
-     */
-    public function __construct($name)
-    {
-        parent::__construct($name, Node::CONTAINER);
-
-        if ($GLOBALS['is_create_db_priv']
-            && $GLOBALS['cfg']['ShowCreateDb'] !== false
-        ) {
-            $new = NodeFactory::getInstance(
-                'Node',
-                _pgettext('Create new database', 'New')
-            );
-            $new->isNew = true;
-            $new->icon = PMA\libraries\Util::getImage('b_newdb.png', '');
-            $new->links = array(
-                'text' => 'server_databases.php?server=' . $GLOBALS['server']
-                    . '&amp;token=' . $_SESSION[' PMA_token '],
-                'icon' => 'server_databases.php?server=' . $GLOBALS['server']
-                    . '&amp;token=' . $_SESSION[' PMA_token '],
-            );
-            $new->classes = 'new_database italics';
-            $this->addChild($new);
-        }
-    }
-}
diff --git a/#pma/libraries/navigation/nodes/NodeEvent.php b/#pma/libraries/navigation/nodes/NodeEvent.php
deleted file mode 100644
index d3946820..00000000
--- a/#pma/libraries/navigation/nodes/NodeEvent.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Functionality for the navigation tree
- *
- * @package PhpMyAdmin-Navigation
- */
-namespace PMA\libraries\navigation\nodes;
-
-use PMA;
-
-/**
- * Represents a event node in the navigation tree
- *
- * @package PhpMyAdmin-Navigation
- */
-class NodeEvent extends NodeDatabaseChild
-{
-    /**
-     * Initialises the class
-     *
-     * @param string $name     An identifier for the new node
-     * @param int    $type     Type of node, may be one of CONTAINER or OBJECT
-     * @param bool   $is_group Whether this object has been created
-     *                         while grouping nodes
-     */
-    public function __construct($name, $type = Node::OBJECT, $is_group = false)
-    {
-        parent::__construct($name, $type, $is_group);
-        $this->icon = PMA\libraries\Util::getImage('b_events.png');
-        $this->links = array(
-            'text' => 'db_events.php?server=' . $GLOBALS['server']
-                . '&amp;db=%2$s&amp;item_name=%1$s&amp;edit_item=1'
-                . '&amp;token=' . $_SESSION[' PMA_token '],
-            'icon' => 'db_events.php?server=' . $GLOBALS['server']
-                . '&amp;db=%2$s&amp;item_name=%1$s&amp;export_item=1'
-                . '&amp;token=' . $_SESSION[' PMA_token '],
-        );
-        $this->classes = 'event';
-    }
-
-    /**
-     * Returns the type of the item represented by the node.
-     *
-     * @return string type of the item
-     */
-    protected function getItemType()
-    {
-        return 'event';
-    }
-}
-
diff --git a/#pma/libraries/navigation/nodes/NodeEventContainer.php b/#pma/libraries/navigation/nodes/NodeEventContainer.php
deleted file mode 100644
index a244231f..00000000
--- a/#pma/libraries/navigation/nodes/NodeEventContainer.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Functionality for the navigation tree
- *
- * @package PhpMyAdmin-Navigation
- */
-namespace PMA\libraries\navigation\nodes;
-
-use PMA;
-use PMA\libraries\navigation\NodeFactory;
-
-/**
- * Represents a container for events nodes in the navigation tree
- *
- * @package PhpMyAdmin-Navigation
- */
-class NodeEventContainer extends NodeDatabaseChildContainer
-{
-    /**
-     * Initialises the class
-     */
-    public function __construct()
-    {
-        parent::__construct(__('Events'), Node::CONTAINER);
-        $this->icon = PMA\libraries\Util::getImage('b_events.png', '');
-        $this->links = array(
-            'text' => 'db_events.php?server=' . $GLOBALS['server']
-                . '&amp;db=%1$s&amp;token=' . $_SESSION[' PMA_token '],
-            'icon' => 'db_events.php?server=' . $GLOBALS['server']
-                . '&amp;db=%1$s&amp;token=' . $_SESSION[' PMA_token '],
-        );
-        $this->real_name = 'events';
-
-        $new = NodeFactory::getInstance(
-            'Node',
-            _pgettext('Create new event', 'New')
-        );
-        $new->isNew = true;
-        $new->icon = PMA\libraries\Util::getImage('b_event_add.png', '');
-        $new->links = array(
-            'text' => 'db_events.php?server=' . $GLOBALS['server']
-                . '&amp;db=%2$s&amp;token=' . $_SESSION[' PMA_token ']
-                . '&add_item=1',
-            'icon' => 'db_events.php?server=' . $GLOBALS['server']
-                . '&amp;db=%2$s&amp;token=' . $_SESSION[' PMA_token ']
-                . '&add_item=1',
-        );
-        $new->classes = 'new_event italics';
-        $this->addChild($new);
-    }
-}
-
diff --git a/#pma/libraries/navigation/nodes/NodeFunction.php b/#pma/libraries/navigation/nodes/NodeFunction.php
deleted file mode 100644
index 61d87b2b..00000000
--- a/#pma/libraries/navigation/nodes/NodeFunction.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Functionality for the navigation tree
- *
- * @package PhpMyAdmin-Navigation
- */
-namespace PMA\libraries\navigation\nodes;
-
-use PMA;
-
-/**
- * Represents a function node in the navigation tree
- *
- * @package PhpMyAdmin-Navigation
- */
-class NodeFunction extends NodeDatabaseChild
-{
-    /**
-     * Initialises the class
-     *
-     * @param string $name     An identifier for the new node
-     * @param int    $type     Type of node, may be one of CONTAINER or OBJECT
-     * @param bool   $is_group Whether this object has been created
-     *                         while grouping nodes
-     */
-    public function __construct($name, $type = Node::OBJECT, $is_group = false)
-    {
-        parent::__construct($name, $type, $is_group);
-        $this->icon = PMA\libraries\Util::getImage('b_routines.png', __('Function'));
-        $this->links = array(
-            'text' => 'db_routines.php?server=' . $GLOBALS['server']
-                . '&amp;db=%2$s&amp;item_name=%1$s&amp;item_type=FUNCTION'
-                . '&amp;edit_item=1&amp;token=' . $_SESSION[' PMA_token '],
-            'icon' => 'db_routines.php?server=' . $GLOBALS['server']
-                . '&amp;db=%2$s&amp;item_name=%1$s&amp;item_type=FUNCTION'
-                . '&amp;execute_dialog=1&amp;token=' . $_SESSION[' PMA_token '],
-        );
-        $this->classes = 'function';
-    }
-
-    /**
-     * Returns the type of the item represented by the node.
-     *
-     * @return string type of the item
-     */
-    protected function getItemType()
-    {
-        return 'function';
-    }
-}
-
diff --git a/#pma/libraries/navigation/nodes/NodeFunctionContainer.php b/#pma/libraries/navigation/nodes/NodeFunctionContainer.php
deleted file mode 100644
index 523d6b62..00000000
--- a/#pma/libraries/navigation/nodes/NodeFunctionContainer.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Functionality for the navigation tree
- *
- * @package PhpMyAdmin-Navigation
- */
-namespace PMA\libraries\navigation\nodes;
-
-use PMA;
-use PMA\libraries\navigation\NodeFactory;
-
-/**
- * Represents a container for functions nodes in the navigation tree
- *
- * @package PhpMyAdmin-Navigation
- */
-class NodeFunctionContainer extends NodeDatabaseChildContainer
-{
-    /**
-     * Initialises the class
-     */
-    public function __construct()
-    {
-        parent::__construct(__('Functions'), Node::CONTAINER);
-        $this->icon = PMA\libraries\Util::getImage(
-            'b_routines.png',
-            __('Functions')
-        );
-        $this->links = array(
-            'text' => 'db_routines.php?server=' . $GLOBALS['server']
-                . '&amp;db=%1$s&amp;token=' . $_SESSION[' PMA_token ']
-                . '&amp;type=FUNCTION',
-            'icon' => 'db_routines.php?server=' . $GLOBALS['server']
-                . '&amp;db=%1$s&amp;token=' . $_SESSION[' PMA_token ']
-                . '&amp;type=FUNCTION',
-        );
-        $this->real_name = 'functions';
-
-        $new_label = _pgettext('Create new function', 'New');
-        $new = NodeFactory::getInstance(
-            'Node',
-            $new_label
-        );
-        $new->isNew = true;
-        $new->icon = PMA\libraries\Util::getImage('b_routine_add.png', $new_label);
-        $new->links = array(
-            'text' => 'db_routines.php?server=' . $GLOBALS['server']
-                . '&amp;db=%2$s&amp;token=' . $_SESSION[' PMA_token ']
-                . '&add_item=1&amp;item_type=FUNCTION',
-            'icon' => 'db_routines.php?server=' . $GLOBALS['server']
-                . '&amp;db=%2$s&amp;token=' . $_SESSION[' PMA_token ']
-                . '&add_item=1&amp;item_type=FUNCTION',
-        );
-        $new->classes = 'new_function italics';
-        $this->addChild($new);
-    }
-}
-
diff --git a/#pma/libraries/navigation/nodes/NodeIndex.php b/#pma/libraries/navigation/nodes/NodeIndex.php
deleted file mode 100644
index fa964a0d..00000000
--- a/#pma/libraries/navigation/nodes/NodeIndex.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Functionality for the navigation tree
- *
- * @package PhpMyAdmin-Navigation
- */
-namespace PMA\libraries\navigation\nodes;
-
-use PMA;
-
-/**
- * Represents a index node in the navigation tree
- *
- * @package PhpMyAdmin-Navigation
- */
-class NodeIndex extends Node
-{
-    /**
-     * Initialises the class
-     *
-     * @param string $name     An identifier for the new node
-     * @param int    $type     Type of node, may be one of CONTAINER or OBJECT
-     * @param bool   $is_group Whether this object has been created
-     *                         while grouping nodes
-     */
-    public function __construct($name, $type = Node::OBJECT, $is_group = false)
-    {
-        parent::__construct($name, $type, $is_group);
-        $this->icon = PMA\libraries\Util::getImage('b_index.png', __('Index'));
-        $this->links = array(
-            'text' => 'tbl_indexes.php?server=' . $GLOBALS['server']
-                . '&amp;db=%3$s&amp;table=%2$s&amp;index=%1$s'
-                . '&amp;token=' . $_SESSION[' PMA_token '],
-            'icon' => 'tbl_indexes.php?server=' . $GLOBALS['server']
-                . '&amp;db=%3$s&amp;table=%2$s&amp;index=%1$s'
-                . '&amp;token=' . $_SESSION[' PMA_token '],
-        );
-        $this->classes = 'index';
-    }
-}
-
diff --git a/#pma/libraries/navigation/nodes/NodeIndexContainer.php b/#pma/libraries/navigation/nodes/NodeIndexContainer.php
deleted file mode 100644
index 8398729f..00000000
--- a/#pma/libraries/navigation/nodes/NodeIndexContainer.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Functionality for the navigation tree
- *
- * @package PhpMyAdmin-Navigation
- */
-namespace PMA\libraries\navigation\nodes;
-
-use PMA;
-use PMA\libraries\navigation\NodeFactory;
-
-/**
- * Represents a container for index nodes in the navigation tree
- *
- * @package PhpMyAdmin-Navigation
- */
-class NodeIndexContainer extends Node
-{
-    /**
-     * Initialises the class
-     */
-    public function __construct()
-    {
-        parent::__construct(__('Indexes'), Node::CONTAINER);
-        $this->icon = PMA\libraries\Util::getImage('b_index.png', __('Indexes'));
-        $this->links = array(
-            'text' => 'tbl_structure.php?server=' . $GLOBALS['server']
-                . '&amp;db=%2$s&amp;table=%1$s'
-                . '&amp;token=' . $_SESSION[' PMA_token '],
-            'icon' => 'tbl_structure.php?server=' . $GLOBALS['server']
-                . '&amp;db=%2$s&amp;table=%1$s'
-                . '&amp;token=' . $_SESSION[' PMA_token '],
-        );
-        $this->real_name = 'indexes';
-
-        $new_label = _pgettext('Create new index', 'New');
-        $new = NodeFactory::getInstance(
-            'Node',
-            $new_label
-        );
-        $new->isNew = true;
-        $new->icon = PMA\libraries\Util::getImage('b_index_add.png', $new_label);
-        $new->links = array(
-            'text' => 'tbl_indexes.php?server=' . $GLOBALS['server']
-                . '&amp;create_index=1&amp;added_fields=2'
-                . '&amp;db=%3$s&amp;table=%2$s&amp;token='
-                . $_SESSION[' PMA_token '],
-            'icon' => 'tbl_indexes.php?server=' . $GLOBALS['server']
-                . '&amp;create_index=1&amp;added_fields=2'
-                . '&amp;db=%3$s&amp;table=%2$s&amp;token='
-                . $_SESSION[' PMA_token '],
-        );
-        $new->classes = 'new_index italics';
-        $this->addChild($new);
-    }
-}
-
diff --git a/#pma/libraries/navigation/nodes/NodeProcedure.php b/#pma/libraries/navigation/nodes/NodeProcedure.php
deleted file mode 100644
index 579b1168..00000000
--- a/#pma/libraries/navigation/nodes/NodeProcedure.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Functionality for the navigation tree
- *
- * @package PhpMyAdmin-Navigation
- */
-namespace PMA\libraries\navigation\nodes;
-
-use PMA;
-
-/**
- * Represents a procedure node in the navigation tree
- *
- * @package PhpMyAdmin-Navigation
- */
-class NodeProcedure extends NodeDatabaseChild
-{
-    /**
-     * Initialises the class
-     *
-     * @param string $name     An identifier for the new node
-     * @param int    $type     Type of node, may be one of CONTAINER or OBJECT
-     * @param bool   $is_group Whether this object has been created
-     *                         while grouping nodes
-     */
-    public function __construct($name, $type = Node::OBJECT, $is_group = false)
-    {
-        parent::__construct($name, $type, $is_group);
-        $this->icon = PMA\libraries\Util::getImage(
-            'b_routines.png',
-            __('Procedure')
-        );
-        $this->links = array(
-            'text' => 'db_routines.php?server=' . $GLOBALS['server']
-                . '&amp;db=%2$s&amp;item_name=%1$s&amp;item_type=PROCEDURE'
-                . '&amp;edit_item=1&amp;token=' . $_SESSION[' PMA_token '],
-            'icon' => 'db_routines.php?server=' . $GLOBALS['server']
-                . '&amp;db=%2$s&amp;item_name=%1$s&amp;item_type=PROCEDURE'
-                . '&amp;execute_dialog=1&amp;token=' . $_SESSION[' PMA_token '],
-        );
-        $this->classes = 'procedure';
-    }
-
-    /**
-     * Returns the type of the item represented by the node.
-     *
-     * @return string type of the item
-     */
-    protected function getItemType()
-    {
-        return 'procedure';
-    }
-}
-
diff --git a/#pma/libraries/navigation/nodes/NodeProcedureContainer.php b/#pma/libraries/navigation/nodes/NodeProcedureContainer.php
deleted file mode 100644
index 21acc484..00000000
--- a/#pma/libraries/navigation/nodes/NodeProcedureContainer.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Functionality for the navigation tree
- *
- * @package PhpMyAdmin-Navigation
- */
-namespace PMA\libraries\navigation\nodes;
-
-use PMA;
-use PMA\libraries\navigation\NodeFactory;
-
-/**
- * Represents a container for procedure nodes in the navigation tree
- *
- * @package PhpMyAdmin-Navigation
- */
-class NodeProcedureContainer extends NodeDatabaseChildContainer
-{
-    /**
-     * Initialises the class
-     */
-    public function __construct()
-    {
-        parent::__construct(__('Procedures'), Node::CONTAINER);
-        $this->icon = PMA\libraries\Util::getImage(
-            'b_routines.png',
-            __('Procedures')
-        );
-        $this->links = array(
-            'text' => 'db_routines.php?server=' . $GLOBALS['server']
-                . '&amp;db=%1$s&amp;token=' . $_SESSION[' PMA_token ']
-                . '&amp;type=PROCEDURE',
-            'icon' => 'db_routines.php?server=' . $GLOBALS['server']
-                . '&amp;db=%1$s&amp;token=' . $_SESSION[' PMA_token ']
-                . '&amp;type=PROCEDURE',
-        );
-        $this->real_name = 'procedures';
-
-        $new_label = _pgettext('Create new procedure', 'New');
-        $new = NodeFactory::getInstance(
-            'Node',
-            $new_label
-        );
-        $new->isNew = true;
-        $new->icon = PMA\libraries\Util::getImage('b_routine_add.png', $new_label);
-        $new->links = array(
-            'text' => 'db_routines.php?server=' . $GLOBALS['server']
-                . '&amp;db=%2$s&amp;token=' . $_SESSION[' PMA_token ']
-                . '&add_item=1',
-            'icon' => 'db_routines.php?server=' . $GLOBALS['server']
-                . '&amp;db=%2$s&amp;token=' . $_SESSION[' PMA_token ']
-                . '&add_item=1',
-        );
-        $new->classes = 'new_procedure italics';
-        $this->addChild($new);
-    }
-}
-
diff --git a/#pma/libraries/navigation/nodes/NodeTable.php b/#pma/libraries/navigation/nodes/NodeTable.php
deleted file mode 100644
index 89020cae..00000000
--- a/#pma/libraries/navigation/nodes/NodeTable.php
+++ /dev/null
@@ -1,319 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Functionality for the navigation tree
- *
- * @package PhpMyAdmin-Navigation
- */
-namespace PMA\libraries\navigation\nodes;
-
-use PMA\libraries\Util;
-
-/**
- * Represents a columns node in the navigation tree
- *
- * @package PhpMyAdmin-Navigation
- */
-class NodeTable extends NodeDatabaseChild
-{
-    /**
-     * Initialises the class
-     *
-     * @param string $name     An identifier for the new node
-     * @param int    $type     Type of node, may be one of CONTAINER or OBJECT
-     * @param bool   $is_group Whether this object has been created
-     *                         while grouping nodes
-     */
-    public function __construct($name, $type = Node::OBJECT, $is_group = false)
-    {
-        parent::__construct($name, $type, $is_group);
-        $this->icon = array();
-        $this->_addIcon(
-            Util::getScriptNameForOption(
-                $GLOBALS['cfg']['NavigationTreeDefaultTabTable'],
-                'table'
-            )
-        );
-        $this->_addIcon(
-            Util::getScriptNameForOption(
-                $GLOBALS['cfg']['NavigationTreeDefaultTabTable2'],
-                'table'
-            )
-        );
-        $title = Util::getTitleForTarget(
-            $GLOBALS['cfg']['DefaultTabTable']
-        );
-        $this->title = $title;
-
-        $script_name = Util::getScriptNameForOption(
-            $GLOBALS['cfg']['DefaultTabTable'],
-            'table'
-        );
-        $this->links = array(
-            'text'  => $script_name
-                . '?server=' . $GLOBALS['server']
-                . '&amp;db=%2$s&amp;table=%1$s'
-                . '&amp;pos=0&amp;token=' . $_SESSION[' PMA_token '],
-            'icon'  => array(
-                Util::getScriptNameForOption(
-                    $GLOBALS['cfg']['NavigationTreeDefaultTabTable'],
-                    'table'
-                )
-                . '?server=' . $GLOBALS['server']
-                . '&amp;db=%2$s&amp;table=%1$s&amp;token='
-                . $_SESSION[' PMA_token '],
-                Util::getScriptNameForOption(
-                    $GLOBALS['cfg']['NavigationTreeDefaultTabTable2'],
-                    'table'
-                )
-                . '?server=' . $GLOBALS['server']
-                . '&amp;db=%2$s&amp;table=%1$s&amp;token='
-                . $_SESSION[' PMA_token '],
-            ),
-            'title' => $this->title,
-        );
-        $this->classes = 'table';
-    }
-
-    /**
-     * Returns the number of children of type $type present inside this container
-     * This method is overridden by the PMA\libraries\navigation\nodes\NodeDatabase
-     * and PMA\libraries\navigation\nodes\NodeTable classes
-     *
-     * @param string $type         The type of item we are looking for
-     *                             ('columns' or 'indexes')
-     * @param string $searchClause A string used to filter the results of the query
-     *
-     * @return int
-     */
-    public function getPresence($type = '', $searchClause = '')
-    {
-        $retval = 0;
-        $db = $this->realParent()->real_name;
-        $table = $this->real_name;
-        switch ($type) {
-        case 'columns':
-            if (!$GLOBALS['cfg']['Server']['DisableIS']) {
-                $db = $GLOBALS['dbi']->escapeString($db);
-                $table = $GLOBALS['dbi']->escapeString($table);
-                $query = "SELECT COUNT(*) ";
-                $query .= "FROM `INFORMATION_SCHEMA`.`COLUMNS` ";
-                $query .= "WHERE `TABLE_NAME`='$table' ";
-                $query .= "AND `TABLE_SCHEMA`='$db'";
-                $retval = (int)$GLOBALS['dbi']->fetchValue($query);
-            } else {
-                $db = Util::backquote($db);
-                $table = Util::backquote($table);
-                $query = "SHOW COLUMNS FROM $table FROM $db";
-                $retval = (int)$GLOBALS['dbi']->numRows(
-                    $GLOBALS['dbi']->tryQuery($query)
-                );
-            }
-            break;
-        case 'indexes':
-            $db = Util::backquote($db);
-            $table = Util::backquote($table);
-            $query = "SHOW INDEXES FROM $table FROM $db";
-            $retval = (int)$GLOBALS['dbi']->numRows(
-                $GLOBALS['dbi']->tryQuery($query)
-            );
-            break;
-        case 'triggers':
-            if (!$GLOBALS['cfg']['Server']['DisableIS']) {
-                $db = $GLOBALS['dbi']->escapeString($db);
-                $table = $GLOBALS['dbi']->escapeString($table);
-                $query = "SELECT COUNT(*) ";
-                $query .= "FROM `INFORMATION_SCHEMA`.`TRIGGERS` ";
-                $query .= "WHERE `EVENT_OBJECT_SCHEMA` "
-                    . Util::getCollateForIS() . "='$db' ";
-                $query .= "AND `EVENT_OBJECT_TABLE` "
-                    . Util::getCollateForIS() . "='$table'";
-                $retval = (int)$GLOBALS['dbi']->fetchValue($query);
-            } else {
-                $db = Util::backquote($db);
-                $table = $GLOBALS['dbi']->escapeString($table);
-                $query = "SHOW TRIGGERS FROM $db WHERE `Table` = '$table'";
-                $retval = (int)$GLOBALS['dbi']->numRows(
-                    $GLOBALS['dbi']->tryQuery($query)
-                );
-            }
-            break;
-        default:
-            break;
-        }
-
-        return $retval;
-    }
-
-    /**
-     * Returns the names of children of type $type present inside this container
-     * This method is overridden by the PMA\libraries\navigation\nodes\NodeDatabase
-     * and PMA\libraries\navigation\nodes\NodeTable classes
-     *
-     * @param string $type         The type of item we are looking for
-     *                             ('tables', 'views', etc)
-     * @param int    $pos          The offset of the list within the results
-     * @param string $searchClause A string used to filter the results of the query
-     *
-     * @return array
-     */
-    public function getData($type, $pos, $searchClause = '')
-    {
-        $maxItems = $GLOBALS['cfg']['MaxNavigationItems'];
-        $retval = array();
-        $db = $this->realParent()->real_name;
-        $table = $this->real_name;
-        switch ($type) {
-        case 'columns':
-            if (!$GLOBALS['cfg']['Server']['DisableIS']) {
-                $db = $GLOBALS['dbi']->escapeString($db);
-                $table = $GLOBALS['dbi']->escapeString($table);
-                $query = "SELECT `COLUMN_NAME` AS `name` ";
-                $query .= "FROM `INFORMATION_SCHEMA`.`COLUMNS` ";
-                $query .= "WHERE `TABLE_NAME`='$table' ";
-                $query .= "AND `TABLE_SCHEMA`='$db' ";
-                $query .= "ORDER BY `COLUMN_NAME` ASC ";
-                $query .= "LIMIT " . intval($pos) . ", $maxItems";
-                $retval = $GLOBALS['dbi']->fetchResult($query);
-                break;
-            }
-
-            $db = Util::backquote($db);
-            $table = Util::backquote($table);
-            $query = "SHOW COLUMNS FROM $table FROM $db";
-            $handle = $GLOBALS['dbi']->tryQuery($query);
-            if ($handle === false) {
-                break;
-            }
-
-            $count = 0;
-            if ($GLOBALS['dbi']->dataSeek($handle, $pos)) {
-                while ($arr = $GLOBALS['dbi']->fetchArray($handle)) {
-                    if ($count < $maxItems) {
-                        $retval[] = $arr['Field'];
-                        $count++;
-                    } else {
-                        break;
-                    }
-                }
-            }
-            break;
-        case 'indexes':
-            $db = Util::backquote($db);
-            $table = Util::backquote($table);
-            $query = "SHOW INDEXES FROM $table FROM $db";
-            $handle = $GLOBALS['dbi']->tryQuery($query);
-            if ($handle === false) {
-                break;
-            }
-
-            $count = 0;
-            while ($arr = $GLOBALS['dbi']->fetchArray($handle)) {
-                if (in_array($arr['Key_name'], $retval)) {
-                    continue;
-                }
-                if ($pos <= 0 && $count < $maxItems) {
-                    $retval[] = $arr['Key_name'];
-                    $count++;
-                }
-                $pos--;
-            }
-            break;
-        case 'triggers':
-            if (!$GLOBALS['cfg']['Server']['DisableIS']) {
-                $db = $GLOBALS['dbi']->escapeString($db);
-                $table = $GLOBALS['dbi']->escapeString($table);
-                $query = "SELECT `TRIGGER_NAME` AS `name` ";
-                $query .= "FROM `INFORMATION_SCHEMA`.`TRIGGERS` ";
-                $query .= "WHERE `EVENT_OBJECT_SCHEMA` "
-                    . Util::getCollateForIS() . "='$db' ";
-                $query .= "AND `EVENT_OBJECT_TABLE` "
-                    . Util::getCollateForIS() . "='$table' ";
-                $query .= "ORDER BY `TRIGGER_NAME` ASC ";
-                $query .= "LIMIT " . intval($pos) . ", $maxItems";
-                $retval = $GLOBALS['dbi']->fetchResult($query);
-                break;
-            }
-
-            $db = Util::backquote($db);
-            $table = $GLOBALS['dbi']->escapeString($table);
-            $query = "SHOW TRIGGERS FROM $db WHERE `Table` = '$table'";
-            $handle = $GLOBALS['dbi']->tryQuery($query);
-            if ($handle === false) {
-                break;
-            }
-
-            $count = 0;
-            if ($GLOBALS['dbi']->dataSeek($handle, $pos)) {
-                while ($arr = $GLOBALS['dbi']->fetchArray($handle)) {
-                    if ($count < $maxItems) {
-                        $retval[] = $arr['Trigger'];
-                        $count++;
-                    } else {
-                        break;
-                    }
-                }
-            }
-            break;
-        default:
-            break;
-        }
-
-        return $retval;
-    }
-
-    /**
-     * Returns the type of the item represented by the node.
-     *
-     * @return string type of the item
-     */
-    protected function getItemType()
-    {
-        return 'table';
-    }
-
-    /**
-     * Add an icon to navigation tree
-     *
-     * @param string $page Page name to redirect
-     *
-     * @return void
-     */
-    private function _addIcon($page)
-    {
-        if (empty($page)) {
-            return;
-        }
-
-        switch ($page) {
-        case 'tbl_structure.php':
-            $this->icon[] = Util::getImage(
-                'b_props.png',
-                __('Structure')
-            );
-            break;
-        case 'tbl_select.php':
-            $this->icon[] = Util::getImage(
-                'b_search.png',
-                __('Search')
-            );
-            break;
-        case 'tbl_change.php':
-            $this->icon[] = Util::getImage(
-                'b_insrow.png',
-                __('Insert')
-            );
-            break;
-        case 'tbl_sql.php':
-            $this->icon[] = Util::getImage('b_sql.png', __('SQL'));
-            break;
-        case 'sql.php':
-            $this->icon[] = Util::getImage(
-                'b_browse.png',
-                __('Browse')
-            );
-            break;
-        }
-    }
-}
-
diff --git a/#pma/libraries/navigation/nodes/NodeTableContainer.php b/#pma/libraries/navigation/nodes/NodeTableContainer.php
deleted file mode 100644
index 8928fb01..00000000
--- a/#pma/libraries/navigation/nodes/NodeTableContainer.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Functionality for the navigation tree
- *
- * @package PhpMyAdmin-Navigation
- */
-namespace PMA\libraries\navigation\nodes;
-
-use PMA;
-use PMA\libraries\navigation\NodeFactory;
-
-/**
- * Represents a container for table nodes in the navigation tree
- *
- * @package PhpMyAdmin-Navigation
- */
-class NodeTableContainer extends NodeDatabaseChildContainer
-{
-    /**
-     * Initialises the class
-     */
-    public function __construct()
-    {
-        parent::__construct(__('Tables'), Node::CONTAINER);
-        $this->icon = PMA\libraries\Util::getImage('b_browse.png', __('Tables'));
-        $this->links = array(
-            'text' => 'db_structure.php?server=' . $GLOBALS['server']
-                . '&amp;db=%1$s&amp;tbl_type=table'
-                . '&amp;token=' . $_SESSION[' PMA_token '],
-            'icon' => 'db_structure.php?server=' . $GLOBALS['server']
-                . '&amp;db=%1$s&amp;tbl_type=table'
-                . '&amp;token=' . $_SESSION[' PMA_token '],
-        );
-        $this->real_name = 'tables';
-        $this->classes = 'tableContainer subContainer';
-
-        $new_label = _pgettext('Create new table', 'New');
-        $new = NodeFactory::getInstance(
-            'Node',
-            $new_label
-        );
-        $new->isNew = true;
-        $new->icon = PMA\libraries\Util::getImage('b_table_add.png', $new_label);
-        $new->links = array(
-            'text' => 'tbl_create.php?server=' . $GLOBALS['server']
-                . '&amp;db=%2$s&amp;token=' . $_SESSION[' PMA_token '],
-            'icon' => 'tbl_create.php?server=' . $GLOBALS['server']
-                . '&amp;db=%2$s&amp;token=' . $_SESSION[' PMA_token '],
-        );
-        $new->classes = 'new_table italics';
-        $this->addChild($new);
-    }
-}
-
diff --git a/#pma/libraries/navigation/nodes/NodeTrigger.php b/#pma/libraries/navigation/nodes/NodeTrigger.php
deleted file mode 100644
index ee0960ba..00000000
--- a/#pma/libraries/navigation/nodes/NodeTrigger.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Functionality for the navigation tree
- *
- * @package PhpMyAdmin-Navigation
- */
-namespace PMA\libraries\navigation\nodes;
-
-use PMA;
-
-/**
- * Represents a trigger node in the navigation tree
- *
- * @package PhpMyAdmin-Navigation
- */
-class NodeTrigger extends Node
-{
-    /**
-     * Initialises the class
-     *
-     * @param string $name     An identifier for the new node
-     * @param int    $type     Type of node, may be one of CONTAINER or OBJECT
-     * @param bool   $is_group Whether this object has been created
-     *                         while grouping nodes
-     */
-    public function __construct($name, $type = Node::OBJECT, $is_group = false)
-    {
-        parent::__construct($name, $type, $is_group);
-        $this->icon = PMA\libraries\Util::getImage('b_triggers.png');
-        $this->links = array(
-            'text' => 'db_triggers.php?server=' . $GLOBALS['server']
-                . '&amp;db=%3$s&amp;item_name=%1$s&amp;edit_item=1'
-                . '&amp;token=' . $_SESSION[' PMA_token '],
-            'icon' => 'db_triggers.php?server=' . $GLOBALS['server']
-                . '&amp;db=%3$s&amp;item_name=%1$s&amp;export_item=1'
-                . '&amp;token=' . $_SESSION[' PMA_token '],
-        );
-        $this->classes = 'trigger';
-    }
-}
-
diff --git a/#pma/libraries/navigation/nodes/NodeTriggerContainer.php b/#pma/libraries/navigation/nodes/NodeTriggerContainer.php
deleted file mode 100644
index 5d1e643a..00000000
--- a/#pma/libraries/navigation/nodes/NodeTriggerContainer.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Functionality for the navigation tree
- *
- * @package PhpMyAdmin-Navigation
- */
-namespace PMA\libraries\navigation\nodes;
-
-use PMA;
-use PMA\libraries\navigation\NodeFactory;
-
-/**
- * Represents a container for trigger nodes in the navigation tree
- *
- * @package PhpMyAdmin-Navigation
- */
-class NodeTriggerContainer extends Node
-{
-    /**
-     * Initialises the class
-     */
-    public function __construct()
-    {
-        parent::__construct(__('Triggers'), Node::CONTAINER);
-        $this->icon = PMA\libraries\Util::getImage('b_triggers.png');
-        $this->links = array(
-            'text' => 'db_triggers.php?server=' . $GLOBALS['server']
-                . '&amp;db=%2$s&amp;table=%1$s&amp;token='
-                . $_SESSION[' PMA_token '],
-            'icon' => 'db_triggers.php?server=' . $GLOBALS['server']
-                . '&amp;db=%2$s&amp;table=%1$s&amp;token='
-                . $_SESSION[' PMA_token '],
-        );
-        $this->real_name = 'triggers';
-
-        $new = NodeFactory::getInstance(
-            'Node',
-            _pgettext('Create new trigger', 'New')
-        );
-        $new->isNew = true;
-        $new->icon = PMA\libraries\Util::getImage('b_trigger_add.png', '');
-        $new->links = array(
-            'text' => 'db_triggers.php?server=' . $GLOBALS['server']
-                . '&amp;db=%3$s&amp;token=' . $_SESSION[' PMA_token ']
-                . '&amp;add_item=1',
-            'icon' => 'db_triggers.php?server=' . $GLOBALS['server']
-                . '&amp;db=%3$s&amp;token=' . $_SESSION[' PMA_token ']
-                . '&amp;add_item=1',
-        );
-        $new->classes = 'new_trigger italics';
-        $this->addChild($new);
-    }
-}
-
diff --git a/#pma/libraries/navigation/nodes/NodeView.php b/#pma/libraries/navigation/nodes/NodeView.php
deleted file mode 100644
index 80407972..00000000
--- a/#pma/libraries/navigation/nodes/NodeView.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Functionality for the navigation tree
- *
- * @package PhpMyAdmin-Navigation
- */
-namespace PMA\libraries\navigation\nodes;
-
-use PMA;
-
-/**
- * Represents a view node in the navigation tree
- *
- * @package PhpMyAdmin-Navigation
- */
-class NodeView extends NodeDatabaseChild
-{
-    /**
-     * Initialises the class
-     *
-     * @param string $name     An identifier for the new node
-     * @param int    $type     Type of node, may be one of CONTAINER or OBJECT
-     * @param bool   $is_group Whether this object has been created
-     *                         while grouping nodes
-     */
-    public function __construct($name, $type = Node::OBJECT, $is_group = false)
-    {
-        parent::__construct($name, $type, $is_group);
-        $this->icon = PMA\libraries\Util::getImage('b_props.png', __('View'));
-        $this->links = array(
-            'text' => 'sql.php?server=' . $GLOBALS['server']
-                . '&amp;db=%2$s&amp;table=%1$s&amp;pos=0'
-                . '&amp;token=' . $_SESSION[' PMA_token '],
-            'icon' => 'tbl_structure.php?server=' . $GLOBALS['server']
-                . '&amp;db=%2$s&amp;table=%1$s'
-                . '&amp;token=' . $_SESSION[' PMA_token '],
-        );
-        $this->classes = 'view';
-    }
-
-    /**
-     * Returns the type of the item represented by the node.
-     *
-     * @return string type of the item
-     */
-    protected function getItemType()
-    {
-        return 'view';
-    }
-}
-
diff --git a/#pma/libraries/navigation/nodes/NodeViewContainer.php b/#pma/libraries/navigation/nodes/NodeViewContainer.php
deleted file mode 100644
index 89dfbe77..00000000
--- a/#pma/libraries/navigation/nodes/NodeViewContainer.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Functionality for the navigation tree
- *
- * @package PhpMyAdmin-Navigation
- */
-namespace PMA\libraries\navigation\nodes;
-
-use PMA;
-use PMA\libraries\navigation\NodeFactory;
-
-/**
- * Represents a container for view nodes in the navigation tree
- *
- * @package PhpMyAdmin-Navigation
- */
-class NodeViewContainer extends NodeDatabaseChildContainer
-{
-    /**
-     * Initialises the class
-     */
-    public function __construct()
-    {
-        parent::__construct(__('Views'), Node::CONTAINER);
-        $this->icon = PMA\libraries\Util::getImage('b_views.png', __('Views'));
-        $this->links = array(
-            'text' => 'db_structure.php?server=' . $GLOBALS['server']
-                . '&amp;db=%1$s&amp;tbl_type=view'
-                . '&amp;token=' . $_SESSION[' PMA_token '],
-            'icon' => 'db_structure.php?server=' . $GLOBALS['server']
-                . '&amp;db=%1$s&amp;tbl_type=view'
-                . '&amp;token=' . $_SESSION[' PMA_token '],
-        );
-        $this->classes = 'viewContainer subContainer';
-        $this->real_name = 'views';
-
-        $new_label = _pgettext('Create new view', 'New');
-        $new = NodeFactory::getInstance(
-            'Node',
-            $new_label
-        );
-        $new->isNew = true;
-        $new->icon = PMA\libraries\Util::getImage('b_view_add.png', $new_label);
-        $new->links = array(
-            'text' => 'view_create.php?server=' . $GLOBALS['server']
-                . '&amp;db=%2$s&amp;token=' . $_SESSION[' PMA_token '],
-            'icon' => 'view_create.php?server=' . $GLOBALS['server']
-                . '&amp;db=%2$s&amp;token=' . $_SESSION[' PMA_token '],
-        );
-        $new->classes = 'new_view italics';
-        $this->addChild($new);
-    }
-}
-
diff --git a/#pma/libraries/normalization.lib.php b/#pma/libraries/normalization.lib.php
deleted file mode 100644
index 36e866ac..00000000
--- a/#pma/libraries/normalization.lib.php
+++ /dev/null
@@ -1,979 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * set of functions used for normalization
- *
- * @package PhpMyAdmin
- */
-use PMA\libraries\Message;
-use PMA\libraries\Util;
-
-/**
- * build the html for columns of $colTypeCategory category
- * in form of given $listType in a table
- *
- * @param string $db              current database
- * @param string $table           current table
- * @param string $colTypeCategory supported all|Numeric|String|Spatial
- *                                |Date and time using the _pgettext() format
- * @param string $listType        type of list to build, supported dropdown|checkbox
- *
- * @return string HTML for list of columns in form of given list types
- */
-function PMA_getHtmlForColumnsList(
-    $db, $table, $colTypeCategory='all', $listType='dropdown'
-) {
-    $columnTypeList = array();
-    if ($colTypeCategory != 'all') {
-        $types = $GLOBALS['PMA_Types']->getColumns();
-        $columnTypeList = $types[$colTypeCategory];
-    }
-    $GLOBALS['dbi']->selectDb($db, $GLOBALS['userlink']);
-    $columns = $GLOBALS['dbi']->getColumns(
-        $db, $table, null,
-        true, $GLOBALS['userlink']
-    );
-    $type = "";
-    $selectColHtml = "";
-    foreach ($columns as $column => $def) {
-        if (isset($def['Type'])) {
-            $extracted_columnspec = Util::extractColumnSpec($def['Type']);
-            $type = $extracted_columnspec['type'];
-        }
-        if (empty($columnTypeList)
-            || in_array(mb_strtoupper($type), $columnTypeList)
-        ) {
-            if ($listType == 'checkbox') {
-                $selectColHtml .= '<input type="checkbox" value="'
-                    . htmlspecialchars($column) . '"/>'
-                    . htmlspecialchars($column) . ' [ '
-                    . htmlspecialchars($def['Type']) . ' ]</br>';
-            } else {
-                $selectColHtml .= '<option value="' . htmlspecialchars($column) . ''
-                . '">' . htmlspecialchars($column)
-                . ' [ ' . htmlspecialchars($def['Type']) . ' ]'
-                . '</option>';
-            }
-        }
-    }
-    return $selectColHtml;
-}
-
-/**
- * get the html of the form to add the new column to given table
- *
- * @param integer $num_fields number of columns to add
- * @param string  $db         current database
- * @param string  $table      current table
- * @param array   $columnMeta array containing default values for the fields
- *
- * @return string HTML
- */
-function PMA_getHtmlForCreateNewColumn(
-    $num_fields, $db, $table, $columnMeta=array()
-) {
-    $cfgRelation = PMA_getRelationsParam();
-    $content_cells = array();
-    $available_mime = array();
-    $mime_map = array();
-    if ($cfgRelation['mimework'] && $GLOBALS['cfg']['BrowseMIME']) {
-        $mime_map = PMA_getMIME($db, $table);
-        $available_mime = PMA_getAvailableMIMEtypes();
-    }
-    $comments_map = PMA_getComments($db, $table);
-    for ($columnNumber = 0; $columnNumber < $num_fields; $columnNumber++) {
-        $content_cells[$columnNumber] = array(
-            'columnNumber' => $columnNumber,
-            'columnMeta' => $columnMeta,
-            'type_upper' => '',
-            'length_values_input_size' => 8,
-            'length' => '',
-            'extracted_columnspec' => array(),
-            'submit_attribute' => null,
-            'comments_map' => $comments_map,
-            'fields_meta' => null,
-            'is_backup' => true,
-            'move_columns' => array(),
-            'cfgRelation' => $cfgRelation,
-            'available_mime' => isset($available_mime)?$available_mime:array(),
-            'mime_map' => $mime_map
-        );
-    }
-
-    return PMA\libraries\Template::get(
-        'columns_definitions/table_fields_definitions'
-    )
-        ->render(
-            array(
-            'is_backup' => true,
-            'fields_meta' => null,
-            'mimework' => $cfgRelation['mimework'],
-            'content_cells' => $content_cells
-            )
-        );
-}
-/**
- * build the html for step 1.1 of normalization
- *
- * @param string $db           current database
- * @param string $table        current table
- * @param string $normalizedTo up to which step normalization will go,
- * possible values 1nf|2nf|3nf
- *
- * @return string HTML for step 1.1
- */
-function PMA_getHtmlFor1NFStep1($db, $table, $normalizedTo)
-{
-    $step = 1;
-    $stepTxt = __('Make all columns atomic');
-    $html = "<h3 class='center'>"
-        . __('First step of normalization (1NF)') . "</h3>";
-    $html .= "<div id='mainContent' data-normalizeto='" . $normalizedTo . "'>" .
-        "<fieldset>" .
-        "<legend>" . __('Step 1.') . $step . " " . $stepTxt . "</legend>" .
-        "<h4>" . __(
-            'Do you have any column which can be split into more than'
-            . ' one column? '
-            . 'For example: address can be split into street, city, country and zip.'
-        )
-        . "</br>(<a class='central_columns_dialog' data-maxrows='25' "
-        . "data-pick=false href='#'> "
-        . __(
-            'Show me the central list of columns that are not already in this table'
-        ) . " </a>)</h4>"
-        . "<p class='cm-em'>" . __(
-            'Select a column which can be split into more '
-            . 'than one (on select of \'no such column\', it\'ll move to next step).'
-        )
-        . "</p>"
-        . "<div id='extra'>"
-        . "<select id='selectNonAtomicCol' name='makeAtomic'>"
-        . '<option selected="selected" disabled="disabled">'
-        . __('Select one…') . "</option>"
-        . "<option value='no_such_col'>" . __('No such column') . "</option>"
-        . PMA_getHtmlForColumnsList(
-            $db,
-            $table,
-            _pgettext('string types', 'String')
-        )
-        . "</select>"
-        . "<span>" . __('split into ')
-        . "</span><input id='numField' type='number' value='2'>"
-        . "<input type='submit' id='splitGo' value='" . __('Go') . "'/></div>"
-        . "<div id='newCols'></div>"
-        . "</fieldset><fieldset class='tblFooters'>"
-        . "</fieldset>"
-        . "</div>";
-    return $html;
-}
-
-/**
- * build the html contents of various html elements in step 1.2
- *
- * @param string $db    current database
- * @param string $table current table
- *
- * @return string HTML contents for step 1.2
- */
-function PMA_getHtmlContentsFor1NFStep2($db, $table)
-{
-    $step = 2;
-    $stepTxt = __('Have a primary key');
-    $primary = PMA\libraries\Index::getPrimary($table, $db);
-    $hasPrimaryKey = "0";
-    $legendText = __('Step 1.') . $step . " " . $stepTxt;
-    $extra = '';
-    if ($primary) {
-        $headText = __("Primary key already exists.");
-        $subText = __("Taking you to next step…");
-        $hasPrimaryKey = "1";
-    } else {
-        $headText = __(
-            "There is no primary key; please add one.<br/>"
-            . "Hint: A primary key is a column "
-            . "(or combination of columns) that uniquely identify all rows."
-        );
-        $subText = '<a href="#" id="createPrimaryKey">'
-            . Util::getIcon(
-                'b_index_add.png', __(
-                    'Add a primary key on existing column(s)'
-                )
-            )
-            . '</a>';
-        $extra = __(
-            "If it's not possible to make existing "
-            . "column combinations as primary key"
-        ) . "<br/>"
-            . '<a href="#" id="addNewPrimary">'
-            . __('+ Add a new primary key column') . '</a>';
-    }
-    $res = array(
-        'legendText' => $legendText,
-        'headText' => $headText,
-        'subText' => $subText,
-        'hasPrimaryKey' => $hasPrimaryKey,
-        'extra' => $extra
-    );
-    return $res;
-}
-
-/**
- * build the html contents of various html elements in step 1.4
- *
- * @param string $db    current database
- * @param string $table current table
- *
- * @return string HTML contents for step 1.4
- */
-function PMA_getHtmlContentsFor1NFStep4($db, $table)
-{
-    $step = 4;
-    $stepTxt = __('Remove redundant columns');
-    $legendText = __('Step 1.') . $step . " " . $stepTxt;
-    $headText = __(
-        "Do you have a group of columns which on combining gives an existing"
-        . " column? For example, if you have first_name, last_name and"
-        . " full_name then combining first_name and last_name gives full_name"
-        . " which is redundant."
-    );
-    $subText = __(
-        "Check the columns which are redundant and click on remove. "
-        . "If no redundant column, click on 'No redundant column'"
-    );
-    $extra = PMA_getHtmlForColumnsList($db, $table, 'all', "checkbox") . "</br>"
-        . '<input type="submit" id="removeRedundant" value="'
-        . __('Remove selected') . '"/>'
-        . '<input type="submit" value="' . __('No redundant column')
-        . '" onclick="goToFinish1NF();"'
-        . '/>';
-    $res = array(
-        'legendText' => $legendText,
-        'headText' => $headText,
-        'subText' => $subText,
-        'extra' => $extra
-    );
-    return $res;
-}
-
-/**
- * build the html contents of various html elements in step 1.3
- *
- * @param string $db    current database
- * @param string $table current table
- *
- * @return string HTML contents for step 1.3
- */
-function PMA_getHtmlContentsFor1NFStep3($db, $table)
-{
-    $step = 3;
-    $stepTxt = __('Move repeating groups');
-    $legendText = __('Step 1.') . $step . " " . $stepTxt;
-    $headText = __(
-        "Do you have a group of two or more columns that are closely "
-        . "related and are all repeating the same attribute? For example, "
-        . "a table that holds data on books might have columns such as book_id, "
-        . "author1, author2, author3 and so on which form a "
-        . "repeating group. In this case a new table (book_id, author) should "
-        . "be created."
-    );
-    $subText = __(
-        "Check the columns which form a repeating group. "
-        . "If no such group, click on 'No repeating group'"
-    );
-    $extra = PMA_getHtmlForColumnsList($db, $table, 'all', "checkbox") . "</br>"
-        . '<input type="submit" id="moveRepeatingGroup" value="'
-        . __('Done') . '"/>'
-        . '<input type="submit" value="' . __('No repeating group')
-        . '" onclick="goToStep4();"'
-        . '/>';
-    $primary = PMA\libraries\Index::getPrimary($table, $db);
-    $primarycols = $primary->getColumns();
-    $pk = array();
-    foreach ($primarycols as $col) {
-        $pk[] = $col->getName();
-    }
-    $res = array(
-        'legendText' => $legendText,
-        'headText' => $headText,
-        'subText' => $subText,
-        'extra' => $extra,
-        'primary_key' => json_encode($pk)
-    );
-    return $res;
-}
-
-/**
- * build html contents for 2NF step 2.1
- *
- * @param string $db    current database
- * @param string $table current table
- *
- * @return string HTML contents for 2NF step 2.1
- */
-function PMA_getHtmlFor2NFstep1($db, $table)
-{
-    $legendText = __('Step 2.') . "1 " . __('Find partial dependencies');
-    $primary = PMA\libraries\Index::getPrimary($table, $db);
-    $primarycols = $primary->getColumns();
-    $pk = array();
-    $subText = '';
-    $selectPkForm = "";
-    $extra = "";
-    foreach ($primarycols as $col) {
-        $pk[] = $col->getName();
-        $selectPkForm .= '<input type="checkbox" name="pd" value="'
-            . htmlspecialchars($col->getName()) . '">'
-            . htmlspecialchars($col->getName());
-    }
-    $key = implode(', ', $pk);
-    if (count($primarycols) > 1) {
-        $GLOBALS['dbi']->selectDb($db, $GLOBALS['userlink']);
-        $columns = (array) $GLOBALS['dbi']->getColumnNames(
-            $db, $table, $GLOBALS['userlink']
-        );
-        if (count($pk) == count($columns)) {
-            $headText = sprintf(
-                __(
-                    'No partial dependencies possible as '
-                    . 'no non-primary column exists since primary key ( %1$s ) '
-                    . 'is composed of all the columns in the table.'
-                ), htmlspecialchars($key)
-            ) . '<br/>';
-            $extra = '<h3>' . __('Table is already in second normal form.')
-                . '</h3>';
-        } else {
-            $headText = sprintf(
-                __(
-                    'The primary key ( %1$s ) consists of more than one column '
-                    . 'so we need to find the partial dependencies.'
-                ), htmlspecialchars($key)
-            ) . '<br/>' . __(
-                'Please answer the following question(s) '
-                . 'carefully to obtain a correct normalization.'
-            )
-                . '<br/><a href="#" id="showPossiblePd">' . __(
-                    '+ Show me the possible partial dependencies '
-                    . 'based on data in the table'
-                ) . '</a>';
-            $subText = __(
-                'For each column below, '
-                . 'please select the <b>minimal set</b> of columns among given set '
-                . 'whose values combined together are sufficient'
-                . ' to determine the value of the column.'
-            );
-            $cnt = 0;
-            foreach ($columns as $column) {
-                if (!in_array($column, $pk)) {
-                    $cnt++;
-                    $extra .= "<b>" . sprintf(
-                        __('\'%1$s\' depends on:'), htmlspecialchars($column)
-                    ) . "</b><br>";
-                    $extra .= '<form id="pk_' . $cnt . '" data-colname="'
-                        . htmlspecialchars($column) . '" class="smallIndent">'
-                        . $selectPkForm . '</form><br/><br/>';
-                }
-            }
-        }
-    } else {
-        $headText = sprintf(
-            __(
-                'No partial dependencies possible as the primary key'
-                . ' ( %1$s ) has just one column.'
-            ), htmlspecialchars($key)
-        ) . '<br/>';
-        $extra = '<h3>' . __('Table is already in second normal form.') . '</h3>';
-    }
-    $res = array(
-        'legendText' => $legendText,
-        'headText' => $headText,
-        'subText' => $subText,
-        'extra' => $extra,
-        'primary_key' => $key
-    );
-    return $res;
-}
-
-/**
- * build the html for showing the tables to have in order to put current table in 2NF
- *
- * @param array  $partialDependencies array containing all the dependencies
- * @param string $table               current table
- *
- * @return string HTML
- */
-function PMA_getHtmlForNewTables2NF($partialDependencies,$table)
-{
-    $html = '<p><b>' . sprintf(
-        __(
-            'In order to put the '
-            . 'original table \'%1$s\' into Second normal form we need '
-            . 'to create the following tables:'
-        ), htmlspecialchars($table)
-    ) . '</b></p>';
-    $tableName = $table;
-    $i = 1;
-    foreach ($partialDependencies as $key=>$dependents) {
-        $html .= '<p><input type="text" name="' . htmlspecialchars($key)
-            . '" value="' . htmlspecialchars($tableName) . '"/>'
-            . '( <u>' . htmlspecialchars($key) . '</u>'
-            .  (count($dependents)>0?', ':'')
-            . htmlspecialchars(implode(', ', $dependents)) . ' )';
-        $i++;
-        $tableName = 'table' . $i;
-    }
-    return $html;
-}
-
-/**
- * create/alter the tables needed for 2NF
- *
- * @param array  $partialDependencies array containing all the partial dependencies
- * @param object $tablesName          name of new tables
- * @param string $table               current table
- * @param string $db                  current database
- *
- * @return array
- */
-function PMA_createNewTablesFor2NF($partialDependencies, $tablesName, $table, $db)
-{
-    $dropCols = false;
-    $nonPKCols = array();
-    $queries = array();
-    $error = false;
-    $headText = '<h3>' . sprintf(
-        __('The second step of normalization is complete for table \'%1$s\'.'),
-        htmlspecialchars($table)
-    ) . '</h3>';
-    if (count((array)$partialDependencies) == 1) {
-        return array(
-            'legendText'=>__('End of step'), 'headText'=>$headText,
-            'queryError'=>$error
-        );
-    }
-    $message = '';
-    $GLOBALS['dbi']->selectDb($db, $GLOBALS['userlink']);
-    foreach ($partialDependencies as $key=>$dependents) {
-        if ($tablesName->$key != $table) {
-            $backquotedKey = implode(', ', Util::backquote(explode(', ', $key)));
-            $queries[] = 'CREATE TABLE ' . Util::backquote($tablesName->$key)
-                . ' SELECT DISTINCT ' . $backquotedKey
-                . (count($dependents)>0?', ':'')
-                . implode(',', Util::backquote($dependents))
-                . ' FROM ' . Util::backquote($table) . ';';
-            $queries[] = 'ALTER TABLE ' . Util::backquote($tablesName->$key)
-                . ' ADD PRIMARY KEY(' . $backquotedKey . ');';
-            $nonPKCols = array_merge($nonPKCols, $dependents);
-        } else {
-            $dropCols = true;
-        }
-    }
-
-    if ($dropCols) {
-        $query = 'ALTER TABLE ' . Util::backquote($table);
-        foreach ($nonPKCols as $col) {
-            $query .= ' DROP ' . Util::backquote($col) . ',';
-        }
-        $query = trim($query, ', ');
-        $query .= ';';
-        $queries[] = $query;
-    } else {
-        $queries[] = 'DROP TABLE ' . Util::backquote($table);
-    }
-    foreach ($queries as $query) {
-        if (!$GLOBALS['dbi']->tryQuery($query, $GLOBALS['userlink'])) {
-            $message = Message::error(__('Error in processing!'));
-            $message->addMessage('<br /><br />');
-            $message->addMessage(
-                Message::rawError(
-                    $GLOBALS['dbi']->getError($GLOBALS['userlink'])
-                )
-            );
-            $error = true;
-            break;
-        }
-    }
-    return array(
-        'legendText' => __('End of step'),
-        'headText' => $headText,
-        'queryError' => $error,
-        'extra' => $message
-    );
-}
-
-/**
- * build the html for showing the new tables to have in order
- * to put given tables in 3NF
- *
- * @param object $dependencies containing all the dependencies
- * @param array  $tables       tables formed after 2NF and need to convert to 3NF
- * @param string $db           current database
- *
- * @return array containing html and the list of new tables
- */
-function PMA_getHtmlForNewTables3NF($dependencies, $tables, $db)
-{
-    $html = "";
-    $i = 1;
-    $newTables = array();
-    foreach ($tables as $table=>$arrDependson) {
-        if (count(array_unique($arrDependson)) == 1) {
-            continue;
-        }
-        $primary = PMA\libraries\Index::getPrimary($table, $db);
-        $primarycols = $primary->getColumns();
-        $pk = array();
-        foreach ($primarycols as $col) {
-            $pk[] = $col->getName();
-        }
-        $html .= '<p><b>' . sprintf(
-            __(
-                'In order to put the '
-                . 'original table \'%1$s\' into Third normal form we need '
-                . 'to create the following tables:'
-            ), htmlspecialchars($table)
-        ) . '</b></p>';
-        $tableName = $table;
-        $columnList = array();
-        foreach ($arrDependson as $key) {
-            $dependents = $dependencies->$key;
-            if ($key == $table) {
-                $key = implode(', ', $pk);
-            }
-            $tmpTableCols =array_merge(explode(', ', $key), $dependents);
-            sort($tmpTableCols);
-            if (!in_array($tmpTableCols, $columnList)) {
-                $columnList[] = $tmpTableCols;
-                    $html .= '<p><input type="text" name="'
-                        . htmlspecialchars($tableName)
-                        . '" value="' . htmlspecialchars($tableName) . '"/>'
-                        . '( <u>' . htmlspecialchars($key) . '</u>'
-                        .  (count($dependents)>0?', ':'')
-                        . htmlspecialchars(implode(', ', $dependents)) . ' )';
-                    $newTables[$table][$tableName] = array(
-                        "pk"=>$key, "nonpk"=>implode(', ', $dependents)
-                    );
-                    $i++;
-                    $tableName = 'table' . $i;
-            }
-        }
-    }
-    return array('html' => $html, 'newTables' => $newTables);
-}
-
-/**
- * create new tables or alter existing to get 3NF
- *
- * @param array  $newTables list of new tables to be created
- * @param string $db        current database
- *
- * @return array
- */
-function PMA_createNewTablesFor3NF($newTables, $db)
-{
-    $queries = array();
-    $dropCols = false;
-    $error = false;
-    $headText = '<h3>' .
-        __('The third step of normalization is complete.')
-        . '</h3>';
-    if (count((array)$newTables) == 0) {
-        return array(
-            'legendText'=>__('End of step'), 'headText'=>$headText,
-            'queryError'=>$error
-        );
-    }
-    $message = '';
-    $GLOBALS['dbi']->selectDb($db, $GLOBALS['userlink']);
-    foreach ($newTables as $originalTable=>$tablesList) {
-        foreach ($tablesList as $table=>$cols) {
-            if ($table != $originalTable) {
-                $quotedPk = implode(
-                    ', ', Util::backquote(explode(', ', $cols->pk))
-                );
-                $quotedNonpk = implode(
-                    ', ', Util::backquote(explode(', ', $cols->nonpk))
-                );
-                $queries[] = 'CREATE TABLE ' . Util::backquote($table)
-                    . ' SELECT DISTINCT ' . $quotedPk
-                    . ', ' . $quotedNonpk
-                    . ' FROM ' . Util::backquote($originalTable) . ';';
-                $queries[] = 'ALTER TABLE ' . Util::backquote($table)
-                    . ' ADD PRIMARY KEY(' . $quotedPk . ');';
-            } else {
-                $dropCols = $cols;
-            }
-        }
-        if ($dropCols) {
-            $columns = (array) $GLOBALS['dbi']->getColumnNames(
-                $db, $originalTable, $GLOBALS['userlink']
-            );
-            $colPresent = array_merge(
-                explode(', ', $dropCols->pk), explode(', ', $dropCols->nonpk)
-            );
-            $query = 'ALTER TABLE ' . Util::backquote($originalTable);
-            foreach ($columns as $col) {
-                if (!in_array($col, $colPresent)) {
-                    $query .= ' DROP ' . Util::backquote($col) . ',';
-                }
-            }
-            $query = trim($query, ', ');
-            $query .= ';';
-            $queries[] = $query;
-        } else {
-            $queries[] = 'DROP TABLE ' . Util::backquote($originalTable);
-        }
-        $dropCols = false;
-    }
-    foreach ($queries as $query) {
-        if (!$GLOBALS['dbi']->tryQuery($query, $GLOBALS['userlink'])) {
-            $message = Message::error(__('Error in processing!'));
-            $message->addMessage('<br /><br />');
-            $message->addMessage(
-                Message::rawError(
-                    $GLOBALS['dbi']->getError($GLOBALS['userlink'])
-                )
-            );
-            $error = true;
-            break;
-        }
-    }
-    return array(
-        'legendText' => __('End of step'),
-        'headText' => $headText,
-        'queryError' => $error,
-        'extra' => $message
-    );
-}
-/**
- * move the repeating group of columns to a new table
- *
- * @param string $repeatingColumns comma separated list of repeating group columns
- * @param string $primary_columns  comma separated list of column in primary key
- * of $table
- * @param string $newTable         name of the new table to be created
- * @param string $newColumn        name of the new column in the new table
- * @param string $table            current table
- * @param string $db               current database
- *
- * @return array
- */
-function PMA_moveRepeatingGroup(
-    $repeatingColumns, $primary_columns, $newTable, $newColumn, $table, $db
-) {
-    $repeatingColumnsArr = (array)Util::backquote(
-        explode(', ', $repeatingColumns)
-    );
-    $primary_columns = implode(
-        ',', Util::backquote(explode(',', $primary_columns))
-    );
-    $query1 = 'CREATE TABLE ' . Util::backquote($newTable);
-    $query2 = 'ALTER TABLE ' . Util::backquote($table);
-    $message = Message::success(
-        sprintf(
-            __('Selected repeating group has been moved to the table \'%s\''),
-            htmlspecialchars($table)
-        )
-    );
-    $first = true;
-    $error = false;
-    foreach ($repeatingColumnsArr as $repeatingColumn) {
-        if (!$first) {
-            $query1 .= ' UNION ';
-        }
-        $first = false;
-        $query1 .=  ' SELECT ' . $primary_columns . ',' . $repeatingColumn
-            . ' as ' . Util::backquote($newColumn)
-            . ' FROM ' . Util::backquote($table);
-        $query2 .= ' DROP ' . $repeatingColumn . ',';
-    }
-    $query2 = trim($query2, ',');
-    $queries = array($query1, $query2);
-    $GLOBALS['dbi']->selectDb($db, $GLOBALS['userlink']);
-    foreach ($queries as $query) {
-        if (!$GLOBALS['dbi']->tryQuery($query, $GLOBALS['userlink'])) {
-            $message = Message::error(__('Error in processing!'));
-            $message->addMessage('<br /><br />');
-            $message->addMessage(
-                Message::rawError(
-                    $GLOBALS['dbi']->getError($GLOBALS['userlink'])
-                )
-            );
-            $error = true;
-            break;
-        }
-    }
-    return array(
-        'queryError' => $error, 'message' => $message
-    );
-}
-
-/**
- * build html for 3NF step 1 to find the transitive dependencies
- *
- * @param string $db     current database
- * @param array  $tables tables formed after 2NF and need to process for 3NF
- *
- * @return string
- */
-function PMA_getHtmlFor3NFstep1($db, $tables)
-{
-    $legendText = __('Step 3.') . "1 " . __('Find transitive dependencies');
-    $extra = "";
-    $headText = __(
-        'Please answer the following question(s) '
-        . 'carefully to obtain a correct normalization.'
-    );
-    $subText = __(
-        'For each column below, '
-        . 'please select the <b>minimal set</b> of columns among given set '
-        . 'whose values combined together are sufficient'
-        . ' to determine the value of the column.<br />'
-        . 'Note: A column may have no transitive dependency, '
-        . 'in that case you don\'t have to select any.'
-    );
-    $cnt = 0;
-    foreach ($tables as $table) {
-        $primary = PMA\libraries\Index::getPrimary($table, $db);
-        $primarycols = $primary->getColumns();
-        $selectTdForm = "";
-        $pk = array();
-        foreach ($primarycols as $col) {
-            $pk[] = $col->getName();
-        }
-        $GLOBALS['dbi']->selectDb($db, $GLOBALS['userlink']);
-        $columns = (array) $GLOBALS['dbi']->getColumnNames(
-            $db, $table, $GLOBALS['userlink']
-        );
-        if (count($columns) - count($pk) <= 1) {
-            continue;
-        }
-        foreach ($columns as $column) {
-            if (!in_array($column, $pk)) {
-                $selectTdForm .= '<input type="checkbox" name="pd" value="'
-                . htmlspecialchars($column) . '">'
-                . '<span>' . htmlspecialchars($column) . '</span>';
-            }
-        }
-        foreach ($columns as $column) {
-            if (!in_array($column, $pk)) {
-                $cnt++;
-                $extra .= "<b>" . sprintf(
-                    __('\'%1$s\' depends on:'), htmlspecialchars($column)
-                )
-                    . "</b><br>";
-                $extra .= '<form id="td_' . $cnt . '" data-colname="'
-                    . htmlspecialchars($column) . '" data-tablename="'
-                    . htmlspecialchars($table) . '" class="smallIndent">'
-                    . $selectTdForm
-                    . '</form><br/><br/>';
-            }
-        }
-    }
-    if ($extra == "") {
-        $headText = __(
-            "No Transitive dependencies possible as the table "
-            . "doesn't have any non primary key columns"
-        );
-        $subText = "";
-        $extra = "<h3>" . __("Table is already in Third normal form!") . "</h3>";
-    }
-    $res = array(
-        'legendText' => $legendText,
-        'headText' => $headText,
-        'subText' => $subText,
-        'extra' => $extra
-    );
-    return $res;
-}
-/**
- * get html for options to normalize table
- *
- * @return string HTML
- */
-function PMA_getHtmlForNormalizetable()
-{
-    $html_output = '<form method="post" action="normalization.php" '
-        . 'name="normalize" '
-        . 'id="normalizeTable" '
-        . '>'
-        . PMA_URL_getHiddenInputs($GLOBALS['db'], $GLOBALS['table'])
-        . '<input type="hidden" name="step1" value="1">';
-    $html_output .= '<fieldset>';
-    $html_output .= '<legend>'
-        . __('Improve table structure (Normalization):') . '</legend>';
-    $html_output .= '<h3>' . __('Select up to what step you want to normalize')
-        . '</h3>';
-    $choices = array(
-            '1nf' => __('First step of normalization (1NF)'),
-            '2nf'      => __('Second step of normalization (1NF+2NF)'),
-            '3nf'  => __('Third step of normalization (1NF+2NF+3NF)'));
-
-    $html_output .= Util::getRadioFields(
-        'normalizeTo', $choices, '1nf', true
-    );
-    $html_output .= '</fieldset><fieldset class="tblFooters">'
-        . "<span class='floatleft'>" . __(
-            'Hint: Please follow the procedure carefully in order '
-            . 'to obtain correct normalization'
-        ) . "</span>"
-        . '<input type="submit" name="submit_normalize" value="' . __('Go') . '" />'
-        . '</fieldset>'
-        . '</form>'
-        . '</div>';
-
-    return $html_output;
-}
-
-/**
- * find all the possible partial dependencies based on data in the table.
- *
- * @param string $table current table
- * @param string $db    current database
- *
- * @return string HTML containing the list of all the possible partial dependencies
- */
-function PMA_findPartialDependencies($table, $db)
-{
-    $dependencyList = array();
-    $GLOBALS['dbi']->selectDb($db, $GLOBALS['userlink']);
-    $columns = (array) $GLOBALS['dbi']->getColumnNames(
-        $db, $table, $GLOBALS['userlink']
-    );
-    $columns = (array)Util::backquote($columns);
-    $totalRowsRes = $GLOBALS['dbi']->fetchResult(
-        'SELECT COUNT(*) FROM (SELECT * FROM '
-        . Util::backquote($table) . ' LIMIT 500) as dt;'
-    );
-    $totalRows = $totalRowsRes[0];
-    $primary = PMA\libraries\Index::getPrimary($table, $db);
-    $primarycols = $primary->getColumns();
-    $pk = array();
-    foreach ($primarycols as $col) {
-        $pk[] = Util::backquote($col->getName());
-    }
-    $partialKeys = PMA_getAllCombinationPartialKeys($pk);
-    $distinctValCount = PMA_findDistinctValuesCount(
-        array_unique(
-            array_merge($columns, $partialKeys)
-        ), $table
-    );
-    foreach ($columns as $column) {
-        if (!in_array($column, $pk)) {
-            foreach ($partialKeys as $partialKey) {
-                if ($partialKey
-                    && PMA_checkPartialDependency(
-                        $partialKey, $column, $table,
-                        $distinctValCount[$partialKey],
-                        $distinctValCount[$column], $totalRows
-                    )
-                ) {
-                    $dependencyList[$partialKey][] = $column;
-                }
-            }
-        }
-    }
-
-    $html = __(
-        'This list is based on a subset of the table\'s data '
-        . 'and is not necessarily accurate. '
-    )
-        . '<div class="dependencies_box">';
-    foreach ($dependencyList as $dependon=>$colList) {
-        $html .= '<span class="displayblock">'
-            . '<input type="button" class="pickPd" value="' . __('Pick') . '"/>'
-            . '<span class="determinants">'
-            . htmlspecialchars(str_replace('`', '', $dependon)) . '</span> -> '
-            . '<span class="dependents">'
-            . htmlspecialchars(str_replace('`', '', implode(', ', $colList)))
-            . '</span>'
-            . '</span>';
-    }
-    if (empty($dependencyList)) {
-        $html .= '<p class="displayblock desc">'
-            . __('No partial dependencies found!') . '</p>';
-    }
-    $html .= '</div>';
-    return $html;
-}
-/**
- * check whether a particular column is dependent on given subset of primary key
- *
- * @param string  $partialKey the partial key, subset of primary key,
- * each column in key supposed to be backquoted
- * @param string  $column     backquoted column on whose dependency being checked
- * @param string  $table      current table
- * @param integer $pkCnt      distinct value count for given partial key
- * @param integer $colCnt     distinct value count for given column
- * @param integer $totalRows  total distinct rows count of the table
- *
- * @return boolean TRUE if $column is dependent on $partialKey, False otherwise
- */
-function PMA_checkPartialDependency(
-    $partialKey, $column, $table, $pkCnt, $colCnt, $totalRows
-) {
-    $query = 'SELECT '
-        . 'COUNT(DISTINCT ' . $partialKey . ',' . $column . ') as pkColCnt '
-        . 'FROM (SELECT * FROM ' . Util::backquote($table)
-        . ' LIMIT 500) as dt'  . ';';
-    $res = $GLOBALS['dbi']->fetchResult($query, null, null, $GLOBALS['userlink']);
-    $pkColCnt = $res[0];
-    if ($pkCnt && $pkCnt == $colCnt && $colCnt == $pkColCnt) {
-        return true;
-    }
-    if ($totalRows && $totalRows == $pkCnt) {
-        return true;
-    }
-    return false;
-}
-
-/**
- * function to get distinct values count of all the column in the array $columns
- *
- * @param array  $columns array of backquoted columns whose distinct values
- * need to be counted.
- * @param string $table   table to which these columns belong
- *
- * @return array associative array containing the count
- */
-function PMA_findDistinctValuesCount($columns, $table)
-{
-    $result = array();
-    $query = 'SELECT ';
-    foreach ($columns as $column) {
-        if ($column) { //each column is already backquoted
-            $query .= 'COUNT(DISTINCT ' .  $column . ') as \''
-                . $column . '_cnt\', ';
-        }
-    }
-    $query = trim($query, ', ');
-    $query .= ' FROM (SELECT * FROM ' . Util::backquote($table)
-        . ' LIMIT 500) as dt' . ';';
-    $res = $GLOBALS['dbi']->fetchResult($query, null, null, $GLOBALS['userlink']);
-    foreach ($columns as $column) {
-        if ($column) {
-            $result[$column] = $res[0][$column . '_cnt'];
-        }
-    }
-    return $result;
-}
-
-/**
- * find all the possible partial keys
- *
- * @param array $primaryKey array containing all the column present in primary key
- *
- * @return array containing all the possible partial keys(subset of primary key)
- */
-function PMA_getAllCombinationPartialKeys($primaryKey)
-{
-    $results = array('');
-    foreach ($primaryKey as $element) {
-        foreach ($results as $combination) {
-            array_push(
-                $results, trim($element . ',' . $combination, ',')
-            );
-        }
-    }
-    array_pop($results); //remove key which consist of all primary key columns
-    return $results;
-}
diff --git a/#pma/libraries/opendocument.lib.php b/#pma/libraries/opendocument.lib.php
deleted file mode 100644
index 71305d86..00000000
--- a/#pma/libraries/opendocument.lib.php
+++ /dev/null
@@ -1,167 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Simple interface for creating OASIS OpenDocument files.
- *
- * @package PhpMyAdmin
- */
-use PMA\libraries\ZipFile;
-
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
-$GLOBALS['OpenDocumentNS']
-    = 'xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" '
-    . 'xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" '
-    . 'xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" '
-    . 'xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" '
-    . 'xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" '
-    . 'xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" ';
-
-/**
- * Minimalistic creator of OASIS OpenDocument
- *
- * @param string $mime desired MIME type
- * @param string $data document content
- *
- * @return string  OASIS OpenDocument data
- *
- * @access  public
- */
-function PMA_createOpenDocument($mime, $data)
-{
-    $zipfile = new ZipFile();
-    $zipfile -> addFile($mime, 'mimetype');
-    $zipfile -> addFile($data, 'content.xml');
-    $zipfile -> addFile(
-        '<?xml version="1.0" encoding="UTF-8"?' . '>'
-        . '<office:document-meta '
-        . 'xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" '
-        . 'xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" '
-        . 'office:version="1.0">'
-        . '<office:meta>'
-        . '<meta:generator>phpMyAdmin ' . PMA_VERSION . '</meta:generator>'
-        . '<meta:initial-creator>phpMyAdmin ' . PMA_VERSION
-        . '</meta:initial-creator>'
-        . '<meta:creation-date>' . strftime('%Y-%m-%dT%H:%M:%S')
-        . '</meta:creation-date>'
-        . '</office:meta>'
-        . '</office:document-meta>',
-        'meta.xml'
-    );
-    $zipfile -> addFile(
-        '<?xml version="1.0" encoding="UTF-8"?' . '>'
-        . '<office:document-styles ' . $GLOBALS['OpenDocumentNS']
-        . 'office:version="1.0">'
-        . '<office:font-face-decls>'
-        . '<style:font-face style:name="Arial Unicode MS"'
-        . ' svg:font-family="\'Arial Unicode MS\'" style:font-pitch="variable"/>'
-        . '<style:font-face style:name="DejaVu Sans1"'
-        . ' svg:font-family="\'DejaVu Sans\'" style:font-pitch="variable"/>'
-        . '<style:font-face style:name="HG Mincho Light J"'
-        . ' svg:font-family="\'HG Mincho Light J\'" style:font-pitch="variable"/>'
-        . '<style:font-face style:name="DejaVu Serif"'
-        . ' svg:font-family="\'DejaVu Serif\'" style:font-family-generic="roman"'
-        . ' style:font-pitch="variable"/>'
-        . '<style:font-face style:name="Thorndale"'
-        . ' svg:font-family="Thorndale" style:font-family-generic="roman"'
-        . ' style:font-pitch="variable"/>'
-        . '<style:font-face style:name="DejaVu Sans"'
-        . ' svg:font-family="\'DejaVu Sans\'" style:font-family-generic="swiss"'
-        . ' style:font-pitch="variable"/>'
-        . '</office:font-face-decls>'
-        . '<office:styles>'
-        . '<style:default-style style:family="paragraph">'
-        . '<style:paragraph-properties fo:hyphenation-ladder-count="no-limit"'
-        . ' style:text-autospace="ideograph-alpha" style:punctuation-wrap="hanging"'
-        . ' style:line-break="strict" style:tab-stop-distance="0.4925in"'
-        . ' style:writing-mode="page"/>'
-        . '<style:text-properties style:use-window-font-color="true"'
-        . ' style:font-name="DejaVu Serif" fo:font-size="12pt" fo:language="en"'
-        . ' fo:country="US" style:font-name-asian="DejaVu Sans1"'
-        . ' style:font-size-asian="12pt" style:language-asian="none"'
-        . ' style:country-asian="none" style:font-name-complex="DejaVu Sans1"'
-        . ' style:font-size-complex="12pt" style:language-complex="none"'
-        . ' style:country-complex="none" fo:hyphenate="false"'
-        . ' fo:hyphenation-remain-char-count="2"'
-        . ' fo:hyphenation-push-char-count="2"/>'
-        . '</style:default-style>'
-        . '<style:style style:name="Standard" style:family="paragraph"'
-        . ' style:class="text"/>'
-        . '<style:style style:name="Text_body" style:display-name="Text body"'
-        . ' style:family="paragraph" style:parent-style-name="Standard"'
-        . ' style:class="text">'
-        . '<style:paragraph-properties fo:margin-top="0in"'
-        . ' fo:margin-bottom="0.0835in"/>'
-        . '</style:style>'
-        . '<style:style style:name="Heading" style:family="paragraph"'
-        . ' style:parent-style-name="Standard" style:next-style-name="Text_body"'
-        . ' style:class="text">'
-        . '<style:paragraph-properties fo:margin-top="0.1665in"'
-        . ' fo:margin-bottom="0.0835in" fo:keep-with-next="always"/>'
-        . '<style:text-properties style:font-name="DejaVu Sans" fo:font-size="14pt"'
-        . ' style:font-name-asian="DejaVu Sans1" style:font-size-asian="14pt"'
-        . ' style:font-name-complex="DejaVu Sans1" style:font-size-complex="14pt"/>'
-        . '</style:style>'
-        . '<style:style style:name="Heading_1" style:display-name="Heading 1"'
-        . ' style:family="paragraph" style:parent-style-name="Heading"'
-        . ' style:next-style-name="Text_body" style:class="text"'
-        . ' style:default-outline-level="1">'
-        . '<style:text-properties style:font-name="Thorndale" fo:font-size="24pt"'
-        . ' fo:font-weight="bold" style:font-name-asian="HG Mincho Light J"'
-        . ' style:font-size-asian="24pt" style:font-weight-asian="bold"'
-        . ' style:font-name-complex="Arial Unicode MS"'
-        . ' style:font-size-complex="24pt" style:font-weight-complex="bold"/>'
-        . '</style:style>'
-        . '<style:style style:name="Heading_2" style:display-name="Heading 2"'
-        . ' style:family="paragraph" style:parent-style-name="Heading"'
-        . ' style:next-style-name="Text_body" style:class="text"'
-        . ' style:default-outline-level="2">'
-        . '<style:text-properties style:font-name="DejaVu Serif"'
-        . ' fo:font-size="18pt" fo:font-weight="bold"'
-        . ' style:font-name-asian="DejaVu Sans1" style:font-size-asian="18pt"'
-        . ' style:font-weight-asian="bold" style:font-name-complex="DejaVu Sans1"'
-        . ' style:font-size-complex="18pt" style:font-weight-complex="bold"/>'
-        . '</style:style>'
-        . '</office:styles>'
-        . '<office:automatic-styles>'
-        . '<style:page-layout style:name="pm1">'
-        . '<style:page-layout-properties fo:page-width="8.2673in"'
-        . ' fo:page-height="11.6925in" style:num-format="1"'
-        . ' style:print-orientation="portrait" fo:margin-top="1in"'
-        . ' fo:margin-bottom="1in" fo:margin-left="1.25in"'
-        . ' fo:margin-right="1.25in" style:writing-mode="lr-tb"'
-        . ' style:footnote-max-height="0in">'
-        . '<style:footnote-sep style:width="0.0071in"'
-        . ' style:distance-before-sep="0.0398in"'
-        . ' style:distance-after-sep="0.0398in" style:adjustment="left"'
-        . ' style:rel-width="25%" style:color="#000000"/>'
-        . '</style:page-layout-properties>'
-        . '<style:header-style/>'
-        . '<style:footer-style/>'
-        . '</style:page-layout>'
-        . '</office:automatic-styles>'
-        . '<office:master-styles>'
-        . '<style:master-page style:name="Standard" style:page-layout-name="pm1"/>'
-        . '</office:master-styles>'
-        . '</office:document-styles>',
-        'styles.xml'
-    );
-    $zipfile -> addFile(
-        '<?xml version="1.0" encoding="UTF-8"?' . '>'
-        . '<manifest:manifest'
-        . ' xmlns:manifest="urn:oasis:names:tc:opendocument:xmlns:manifest:1.0">'
-        . '<manifest:file-entry manifest:media-type="' . $mime
-        . '" manifest:full-path="/"/>'
-        . '<manifest:file-entry manifest:media-type="text/xml"'
-        . ' manifest:full-path="content.xml"/>'
-        . '<manifest:file-entry manifest:media-type="text/xml"'
-        . ' manifest:full-path="meta.xml"/>'
-        . '<manifest:file-entry manifest:media-type="text/xml"'
-        . ' manifest:full-path="styles.xml"/>'
-        . '</manifest:manifest>',
-        'META-INF/manifest.xml'
-    );
-    return $zipfile -> file();
-}
diff --git a/#pma/libraries/operations.lib.php b/#pma/libraries/operations.lib.php
deleted file mode 100644
index 358bd8a2..00000000
--- a/#pma/libraries/operations.lib.php
+++ /dev/null
@@ -1,2164 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * set of functions with the operations section in pma
- *
- * @package PhpMyAdmin
- */
-use PMA\libraries\engines\Innodb;
-use PMA\libraries\Message;
-use PMA\libraries\Partition;
-use PMA\libraries\plugins\export\ExportSql;
-use PMA\libraries\Response;
-use PMA\libraries\StorageEngine;
-use PMA\libraries\Table;
-use PMA\libraries\Util;
-
-/**
- * Get HTML output for database comment
- *
- * @param string $db database name
- *
- * @return string $html_output
- */
-function PMA_getHtmlForDatabaseComment($db)
-{
-    $html_output = '<div class="operations_half_width">'
-        . '<form method="post" action="db_operations.php" id="formDatabaseComment">'
-        . PMA_URL_getHiddenInputs($db)
-        . '<fieldset>'
-        . '<legend>';
-    if (PMA\libraries\Util::showIcons('ActionLinksMode')) {
-        $html_output .= PMA\libraries\Util::getImage('b_comment.png') . '&nbsp;';
-    }
-    $html_output .=  __('Database comment');
-    $html_output .= '</legend>';
-    $html_output .= '<input type="text" name="comment" '
-        . 'class="textfield" size="30"'
-        . 'value="' . htmlspecialchars(PMA_getDBComment($db)) . '" />'
-        . '</fieldset>';
-    $html_output .= '<fieldset class="tblFooters">'
-        . '<input type="submit" value="' . __('Go') . '" />'
-        . '</fieldset>'
-        . '</form>'
-        . '</div>';
-
-    return $html_output;
-}
-
-/**
- * Get HTML output for rename database
- *
- * @param string $db database name
- *
- * @return string $html_output
- */
-function PMA_getHtmlForRenameDatabase($db)
-{
-    $html_output = '<div class="operations_half_width">'
-        . '<form id="rename_db_form" '
-        . 'class="ajax" '
-        . 'method="post" action="db_operations.php" '
-        . 'onsubmit="return emptyCheckTheField(this, \'newname\')">';
-    if (isset($_REQUEST['db_collation'])) {
-        $html_output .= '<input type="hidden" name="db_collation" '
-            . 'value="' . $_REQUEST['db_collation']
-            . '" />' . "\n";
-    }
-    $html_output .= '<input type="hidden" name="what" value="data" />'
-        . '<input type="hidden" name="db_rename" value="true" />'
-        . PMA_URL_getHiddenInputs($db)
-        . '<fieldset>'
-        . '<legend>';
-
-    if (PMA\libraries\Util::showIcons('ActionLinksMode')) {
-        $html_output .= PMA\libraries\Util::getImage('b_edit.png') . '&nbsp;';
-    }
-    $html_output .= __('Rename database to')
-        . '</legend>';
-
-    $html_output .= '<input id="new_db_name" type="text" name="newname" '
-        . 'maxlength="64" size="30" class="textfield" required="required" '
-        . 'value="' . htmlspecialchars($db) . '"/>';
-
-    if ($GLOBALS['db_priv'] && $GLOBALS['table_priv']
-        && $GLOBALS['col_priv'] && $GLOBALS['proc_priv']
-        && $GLOBALS['is_reload_priv']
-    ) {
-        $html_output .= '<input type="checkbox" name="adjust_privileges" '
-            . 'value="1" id="checkbox_adjust_privileges" checked="checked" />';
-    } else {
-        $html_output .= '<input type="checkbox" name="adjust_privileges" '
-            . 'value="1" id="checkbox_adjust_privileges" title="' . __(
-                'You don\'t have sufficient privileges to perform this '
-                . 'operation; Please refer to the documentation for more details'
-            )
-            . '" disabled/>';
-    }
-
-    $html_output .= '<label for="checkbox_adjust_privileges">'
-            . __('Adjust privileges') . Util::showDocu('faq', 'faq6-39')
-            . '</label><br />';
-
-    $html_output .= ''
-        . '</fieldset>'
-        . '<fieldset class="tblFooters">'
-        . '<input id="rename_db_input" type="submit" value="' . __('Go') . '" />'
-        . '</fieldset>'
-        . '</form>'
-        . '</div>';
-
-    return $html_output;
-}
-
-/**
- * Get HTML for database drop link
- *
- * @param string $db database name
- *
- * @return string $html_output
- */
-function PMA_getHtmlForDropDatabaseLink($db)
-{
-    $this_sql_query = 'DROP DATABASE ' . PMA\libraries\Util::backquote($db);
-    $this_url_params = array(
-        'sql_query' => $this_sql_query,
-        'back' => 'db_operations.php',
-        'goto' => 'index.php',
-        'reload' => '1',
-        'purge' => '1',
-        'message_to_show' => sprintf(
-            __('Database %s has been dropped.'),
-            htmlspecialchars(PMA\libraries\Util::backquote($db))
-        ),
-        'db' => null,
-    );
-
-    $html_output = '<div class="operations_half_width">'
-        . '<fieldset class="caution">';
-    $html_output .= '<legend>';
-    if (PMA\libraries\Util::showIcons('ActionLinksMode')) {
-        $html_output .= PMA\libraries\Util::getImage('b_deltbl.png') . '&nbsp';
-    }
-    $html_output .= __('Remove database')
-        . '</legend>';
-    $html_output .= '<ul>';
-    $html_output .= PMA_getDeleteDataOrTablelink(
-        $this_url_params,
-        'DROP_DATABASE',
-        __('Drop the database (DROP)'),
-        'drop_db_anchor'
-    );
-    $html_output .= '</ul></fieldset>'
-        . '</div>';
-
-    return $html_output;
-}
-
-/**
- * Get HTML snippet for copy database
- *
- * @param string $db database name
- *
- * @return string $html_output
- */
-function PMA_getHtmlForCopyDatabase($db)
-{
-    $drop_clause = 'DROP TABLE / DROP VIEW';
-    $choices = array(
-        'structure' => __('Structure only'),
-        'data'      => __('Structure and data'),
-        'dataonly'  => __('Data only')
-    );
-
-    if (isset($_COOKIE)
-        && isset($_COOKIE['pma_switch_to_new'])
-        && $_COOKIE['pma_switch_to_new'] == 'true'
-    ) {
-        $pma_switch_to_new = 'true';
-    }
-
-    $html_output = '<div class="operations_half_width clearfloat">';
-    $html_output .= '<form id="copy_db_form" '
-        . 'class="ajax" '
-        . 'method="post" action="db_operations.php" '
-        . 'onsubmit="return emptyCheckTheField(this, \'newname\')">';
-
-    if (isset($_REQUEST['db_collation'])) {
-        $html_output .= '<input type="hidden" name="db_collation" '
-        . 'value="' . $_REQUEST['db_collation'] . '" />' . "\n";
-    }
-    $html_output .= '<input type="hidden" name="db_copy" value="true" />' . "\n"
-        . PMA_URL_getHiddenInputs($db);
-    $html_output .= '<fieldset>'
-        . '<legend>';
-
-    if (PMA\libraries\Util::showIcons('ActionLinksMode')) {
-        $html_output .= PMA\libraries\Util::getImage('b_edit.png') . '&nbsp';
-    }
-    $html_output .= __('Copy database to')
-        . '</legend>'
-        . '<input type="text" maxlength="64" name="newname" size="30" '
-        . 'class="textfield" value="' . htmlspecialchars($db) . '" '
-        . 'required="required" /><br />'
-        . PMA\libraries\Util::getRadioFields(
-            'what', $choices, 'data', true
-        );
-    $html_output .= '<br />';
-    $html_output .= '<input type="checkbox" name="create_database_before_copying" '
-        . 'value="1" id="checkbox_create_database_before_copying"'
-        . 'checked="checked" />';
-    $html_output .= '<label for="checkbox_create_database_before_copying">'
-        . __('CREATE DATABASE before copying') . '</label><br />';
-    $html_output .= '<input type="checkbox" name="drop_if_exists" value="true"'
-        . 'id="checkbox_drop" />';
-    $html_output .= '<label for="checkbox_drop">'
-        . sprintf(__('Add %s'), $drop_clause)
-        . '</label><br />';
-    $html_output .= '<input type="checkbox" name="sql_auto_increment" value="1" '
-        . 'checked="checked" id="checkbox_auto_increment" />';
-    $html_output .= '<label for="checkbox_auto_increment">'
-        . __('Add AUTO_INCREMENT value') . '</label><br />';
-    $html_output .= '<input type="checkbox" name="add_constraints" value="1"'
-        . 'id="checkbox_constraints" checked="checked"/>';
-    $html_output .= '<label for="checkbox_constraints">'
-        . __('Add constraints') . '</label><br />';
-    $html_output .= '<br />';
-
-    if ($GLOBALS['db_priv'] && $GLOBALS['table_priv']
-        && $GLOBALS['col_priv'] && $GLOBALS['proc_priv']
-        && $GLOBALS['is_reload_priv']
-    ) {
-        $html_output .= '<input type="checkbox" name="adjust_privileges" '
-            . 'value="1" id="checkbox_privileges" checked="checked" />';
-    } else {
-        $html_output .= '<input type="checkbox" name="adjust_privileges" '
-            . 'value="1" id="checkbox_privileges" title="' . __(
-                'You don\'t have sufficient privileges to perform this '
-                . 'operation; Please refer to the documentation for more details'
-            )
-            . '" disabled/>';
-    }
-    $html_output .= '<label for="checkbox_privileges">'
-        . __('Adjust privileges') . Util::showDocu('faq', 'faq6-39')
-        . '</label><br />';
-
-    $html_output .= '<input type="checkbox" name="switch_to_new" value="true"'
-        . 'id="checkbox_switch"'
-        . ((isset($pma_switch_to_new) && $pma_switch_to_new == 'true')
-            ? ' checked="checked"'
-            : '')
-        . '/>';
-    $html_output .= '<label for="checkbox_switch">'
-        . __('Switch to copied database') . '</label>'
-        . '</fieldset>';
-    $html_output .= '<fieldset class="tblFooters">'
-        . '<input type="submit" name="submit_copy" value="' . __('Go') . '" />'
-        . '</fieldset>'
-        . '</form>'
-        . '</div>';
-
-    return $html_output;
-}
-
-/**
- * Get HTML snippet for change database charset
- *
- * @param string $db    database name
- * @param string $table table name
- *
- * @return string $html_output
- */
-function PMA_getHtmlForChangeDatabaseCharset($db, $table)
-{
-    $html_output = '<div class="operations_half_width">'
-        . '<form id="change_db_charset_form" ';
-    $html_output .= 'class="ajax" ';
-    $html_output .= 'method="post" action="db_operations.php">';
-
-    $html_output .= PMA_URL_getHiddenInputs($db, $table);
-
-    $html_output .= '<fieldset>' . "\n"
-       . '    <legend>';
-    if (PMA\libraries\Util::showIcons('ActionLinksMode')) {
-        $html_output .= PMA\libraries\Util::getImage('s_asci.png') . '&nbsp';
-    }
-    $html_output .= '<label for="select_db_collation">' . __('Collation')
-        . '</label>' . "\n"
-        . '</legend>' . "\n"
-        . PMA_generateCharsetDropdownBox(
-            PMA_CSDROPDOWN_COLLATION,
-            'db_collation',
-            'select_db_collation',
-            isset($_REQUEST['db_collation']) ? $_REQUEST['db_collation'] : '',
-            false
-        )
-        . '</fieldset>'
-        . '<fieldset class="tblFooters">'
-        . '<input type="submit" name="submitcollation"'
-        . ' value="' . __('Go') . '" />' . "\n"
-        . '</fieldset>' . "\n"
-        . '</form></div>' . "\n";
-
-    return $html_output;
-}
-
-/**
- * Run the Procedure definitions and function definitions
- *
- * to avoid selecting alternatively the current and new db
- * we would need to modify the CREATE definitions to qualify
- * the db name
- *
- * @param string $db database name
- *
- * @return void
- */
-function PMA_runProcedureAndFunctionDefinitions($db)
-{
-    $procedure_names = $GLOBALS['dbi']->getProceduresOrFunctions($db, 'PROCEDURE');
-    if ($procedure_names) {
-        foreach ($procedure_names as $procedure_name) {
-            $GLOBALS['dbi']->selectDb($db);
-            $tmp_query = $GLOBALS['dbi']->getDefinition(
-                $db, 'PROCEDURE', $procedure_name
-            );
-            // collect for later display
-            $GLOBALS['sql_query'] .= "\n" . $tmp_query;
-            $GLOBALS['dbi']->selectDb($_REQUEST['newname']);
-            $GLOBALS['dbi']->query($tmp_query);
-        }
-    }
-
-    $function_names = $GLOBALS['dbi']->getProceduresOrFunctions($db, 'FUNCTION');
-    if ($function_names) {
-        foreach ($function_names as $function_name) {
-            $GLOBALS['dbi']->selectDb($db);
-            $tmp_query = $GLOBALS['dbi']->getDefinition(
-                $db, 'FUNCTION', $function_name
-            );
-            // collect for later display
-            $GLOBALS['sql_query'] .= "\n" . $tmp_query;
-            $GLOBALS['dbi']->selectDb($_REQUEST['newname']);
-            $GLOBALS['dbi']->query($tmp_query);
-        }
-    }
-}
-
-/**
- * Create database before copy
- *
- * @return void
- */
-function PMA_createDbBeforeCopy()
-{
-    // lower_case_table_names=1 `DB` becomes `db`
-    $lowerCaseTableNames = $GLOBALS['dbi']->fetchValue(
-        'SELECT @@lower_case_table_names'
-    );
-    if ($lowerCaseTableNames === '1') {
-        $_REQUEST['newname'] = mb_strtolower(
-            $_REQUEST['newname']
-        );
-    }
-
-    $local_query = 'CREATE DATABASE IF NOT EXISTS '
-        . PMA\libraries\Util::backquote($_REQUEST['newname']);
-    if (isset($_REQUEST['db_collation'])) {
-        $local_query .= ' DEFAULT'
-            . PMA_generateCharsetQueryPart($_REQUEST['db_collation']);
-    }
-    $local_query .= ';';
-    $GLOBALS['sql_query'] .= $local_query;
-
-    // save the original db name because Tracker.php which
-    // may be called under $GLOBALS['dbi']->query() changes $GLOBALS['db']
-    // for some statements, one of which being CREATE DATABASE
-    $original_db = $GLOBALS['db'];
-    $GLOBALS['dbi']->query($local_query);
-    $GLOBALS['db'] = $original_db;
-
-    // Set the SQL mode to NO_AUTO_VALUE_ON_ZERO to prevent MySQL from creating
-    // export statements it cannot import
-    $sql_set_mode = "SET SQL_MODE='NO_AUTO_VALUE_ON_ZERO'";
-    $GLOBALS['dbi']->query($sql_set_mode);
-
-    // rebuild the database list because Table::moveCopy
-    // checks in this list if the target db exists
-    $GLOBALS['dblist']->databases->build();
-}
-
-/**
- * Get views as an array and create SQL view stand-in
- *
- * @param array     $tables_full       array of all tables in given db or dbs
- * @param ExportSql $export_sql_plugin export plugin instance
- * @param string    $db                database name
- *
- * @return array $views
- */
-function PMA_getViewsAndCreateSqlViewStandIn(
-    $tables_full, $export_sql_plugin, $db
-) {
-    $views = array();
-    foreach ($tables_full as $each_table => $tmp) {
-        // to be able to rename a db containing views,
-        // first all the views are collected and a stand-in is created
-        // the real views are created after the tables
-        if ($GLOBALS['dbi']->getTable($db, $each_table)->isView()) {
-
-            // If view exists, and 'add drop view' is selected: Drop it!
-            if ($_REQUEST['what'] != 'nocopy'
-                && isset($_REQUEST['drop_if_exists'])
-                && $_REQUEST['drop_if_exists'] == 'true'
-            ) {
-                $drop_query = 'DROP VIEW IF EXISTS '
-                    . PMA\libraries\Util::backquote($_REQUEST['newname']) . '.'
-                    . PMA\libraries\Util::backquote($each_table);
-                $GLOBALS['dbi']->query($drop_query);
-
-                $GLOBALS['sql_query'] .= "\n" . $drop_query . ';';
-            }
-
-            $views[] = $each_table;
-            // Create stand-in definition to resolve view dependencies
-            $sql_view_standin = $export_sql_plugin->getTableDefStandIn(
-                $db, $each_table, "\n"
-            );
-            $GLOBALS['dbi']->selectDb($_REQUEST['newname']);
-            $GLOBALS['dbi']->query($sql_view_standin);
-            $GLOBALS['sql_query'] .= "\n" . $sql_view_standin;
-        }
-    }
-    return $views;
-}
-
-/**
- * Get sql query for copy/rename table and boolean for whether copy/rename or not
- *
- * @param array   $tables_full array of all tables in given db or dbs
- * @param boolean $move        whether database name is empty or not
- * @param string  $db          database name
- *
- * @return array SQL queries for the constraints
- */
-function PMA_copyTables($tables_full, $move, $db)
-{
-    $sqlContraints = array();
-    foreach ($tables_full as $each_table => $tmp) {
-        // skip the views; we have created stand-in definitions
-        if ($GLOBALS['dbi']->getTable($db, $each_table)->isView()) {
-            continue;
-        }
-
-        // value of $what for this table only
-        $this_what = $_REQUEST['what'];
-
-        // do not copy the data from a Merge table
-        // note: on the calling FORM, 'data' means 'structure and data'
-        if ($GLOBALS['dbi']->getTable($db, $each_table)->isMerge()) {
-            if ($this_what == 'data') {
-                $this_what = 'structure';
-            }
-            if ($this_what == 'dataonly') {
-                $this_what = 'nocopy';
-            }
-        }
-
-        if ($this_what != 'nocopy') {
-            // keep the triggers from the original db+table
-            // (third param is empty because delimiters are only intended
-            //  for importing via the mysql client or our Import feature)
-            $triggers = $GLOBALS['dbi']->getTriggers($db, $each_table, '');
-
-            if (! Table::moveCopy(
-                $db, $each_table, $_REQUEST['newname'], $each_table,
-                (isset($this_what) ? $this_what : 'data'),
-                $move, 'db_copy'
-            )) {
-                $GLOBALS['_error'] = true;
-                break;
-            }
-            // apply the triggers to the destination db+table
-            if ($triggers) {
-                $GLOBALS['dbi']->selectDb($_REQUEST['newname']);
-                foreach ($triggers as $trigger) {
-                    $GLOBALS['dbi']->query($trigger['create']);
-                    $GLOBALS['sql_query'] .= "\n" . $trigger['create'] . ';';
-                }
-            }
-
-            // this does not apply to a rename operation
-            if (isset($_REQUEST['add_constraints'])
-                && ! empty($GLOBALS['sql_constraints_query'])
-            ) {
-                $sqlContraints[] = $GLOBALS['sql_constraints_query'];
-                unset($GLOBALS['sql_constraints_query']);
-            }
-        }
-    }
-    return $sqlContraints;
-}
-
-/**
- * Run the EVENT definition for selected database
- *
- * to avoid selecting alternatively the current and new db
- * we would need to modify the CREATE definitions to qualify
- * the db name
- *
- * @param string $db database name
- *
- * @return void
- */
-function PMA_runEventDefinitionsForDb($db)
-{
-    $event_names = $GLOBALS['dbi']->fetchResult(
-        'SELECT EVENT_NAME FROM information_schema.EVENTS WHERE EVENT_SCHEMA= \''
-        . $GLOBALS['dbi']->escapeString($db) . '\';'
-    );
-    if ($event_names) {
-        foreach ($event_names as $event_name) {
-            $GLOBALS['dbi']->selectDb($db);
-            $tmp_query = $GLOBALS['dbi']->getDefinition($db, 'EVENT', $event_name);
-            // collect for later display
-            $GLOBALS['sql_query'] .= "\n" . $tmp_query;
-            $GLOBALS['dbi']->selectDb($_REQUEST['newname']);
-            $GLOBALS['dbi']->query($tmp_query);
-        }
-    }
-}
-
-/**
- * Handle the views, return the boolean value whether table rename/copy or not
- *
- * @param array   $views views as an array
- * @param boolean $move  whether database name is empty or not
- * @param string  $db    database name
- *
- * @return void
- */
-function PMA_handleTheViews($views, $move, $db)
-{
-    // temporarily force to add DROP IF EXIST to CREATE VIEW query,
-    // to remove stand-in VIEW that was created earlier
-    // ( $_REQUEST['drop_if_exists'] is used in moveCopy() )
-    if (isset($_REQUEST['drop_if_exists'])) {
-        $temp_drop_if_exists = $_REQUEST['drop_if_exists'];
-    }
-
-    $_REQUEST['drop_if_exists'] = 'true';
-    foreach ($views as $view) {
-        $copying_succeeded = Table::moveCopy(
-            $db, $view, $_REQUEST['newname'], $view, 'structure', $move, 'db_copy'
-        );
-        if (! $copying_succeeded) {
-            $GLOBALS['_error'] = true;
-            break;
-        }
-    }
-    unset($_REQUEST['drop_if_exists']);
-
-    if (isset($temp_drop_if_exists)) {
-        // restore previous value
-        $_REQUEST['drop_if_exists'] = $temp_drop_if_exists;
-    }
-}
-
-/**
- * Adjust the privileges after Renaming the db
- *
- * @param string $oldDb   Database name before renaming
- * @param string $newname New Database name requested
- *
- * @return void
- */
-function PMA_AdjustPrivileges_moveDB($oldDb, $newname)
-{
-    if ($GLOBALS['db_priv'] && $GLOBALS['table_priv']
-        && $GLOBALS['col_priv'] && $GLOBALS['proc_priv']
-        && $GLOBALS['is_reload_priv']
-    ) {
-        $GLOBALS['dbi']->selectDb('mysql');
-        $newname = str_replace("_", "\_", $newname);
-        $oldDb = str_replace("_", "\_", $oldDb);
-
-        // For Db specific privileges
-        $query_db_specific = 'UPDATE ' . Util::backquote('db')
-            . 'SET Db = \'' . $GLOBALS['dbi']->escapeString($newname)
-            . '\' where Db = \'' . $GLOBALS['dbi']->escapeString($oldDb) . '\';';
-        $GLOBALS['dbi']->query($query_db_specific);
-
-        // For table specific privileges
-        $query_table_specific = 'UPDATE ' . Util::backquote('tables_priv')
-            . 'SET Db = \'' . $GLOBALS['dbi']->escapeString($newname)
-            . '\' where Db = \'' . $GLOBALS['dbi']->escapeString($oldDb) . '\';';
-        $GLOBALS['dbi']->query($query_table_specific);
-
-        // For column specific privileges
-        $query_col_specific = 'UPDATE ' . Util::backquote('columns_priv')
-            . 'SET Db = \'' . $GLOBALS['dbi']->escapeString($newname)
-            . '\' where Db = \'' . $GLOBALS['dbi']->escapeString($oldDb) . '\';';
-        $GLOBALS['dbi']->query($query_col_specific);
-
-        // For procedures specific privileges
-        $query_proc_specific = 'UPDATE ' . Util::backquote('procs_priv')
-            . 'SET Db = \'' . $GLOBALS['dbi']->escapeString($newname)
-            . '\' where Db = \'' . $GLOBALS['dbi']->escapeString($oldDb) . '\';';
-        $GLOBALS['dbi']->query($query_proc_specific);
-
-        // Finally FLUSH the new privileges
-        $flush_query = "FLUSH PRIVILEGES;";
-        $GLOBALS['dbi']->query($flush_query);
-    }
-}
-
-/**
- * Adjust the privileges after Copying the db
- *
- * @param string $oldDb   Database name before copying
- * @param string $newname New Database name requested
- *
- * @return void
- */
-function PMA_AdjustPrivileges_copyDB($oldDb, $newname)
-{
-    if ($GLOBALS['db_priv'] && $GLOBALS['table_priv']
-        && $GLOBALS['col_priv'] && $GLOBALS['proc_priv']
-        && $GLOBALS['is_reload_priv']
-    ) {
-        $GLOBALS['dbi']->selectDb('mysql');
-        $newname = str_replace("_", "\_", $newname);
-        $oldDb = str_replace("_", "\_", $oldDb);
-
-        $query_db_specific_old = 'SELECT * FROM '
-            . Util::backquote('db') . ' WHERE '
-            . 'Db = "' . $oldDb . '";';
-
-        $old_privs_db = $GLOBALS['dbi']->fetchResult($query_db_specific_old, 0);
-
-        foreach ($old_privs_db as $old_priv) {
-            $newDb_db_privs_query = 'INSERT INTO ' . Util::backquote('db')
-                . ' VALUES("' . $old_priv[0] . '", "' . $newname . '", "'
-                . $old_priv[2] . '", "' . $old_priv[3] . '", "' . $old_priv[4]
-                . '", "' . $old_priv[5] . '", "' . $old_priv[6] . '", "'
-                . $old_priv[7] . '", "' . $old_priv[8] . '", "' . $old_priv[9]
-                . '", "' . $old_priv[10] . '", "' . $old_priv[11] . '", "'
-                . $old_priv[12] . '", "' . $old_priv[13] . '", "' . $old_priv[14]
-                . '", "' . $old_priv[15] . '", "' . $old_priv[16] . '", "'
-                . $old_priv[17] . '", "' . $old_priv[18] . '", "' . $old_priv[19]
-                . '", "' . $old_priv[20] . '", "' . $old_priv[21] . '");';
-
-            $GLOBALS['dbi']->query($newDb_db_privs_query);
-        }
-
-        // For Table Specific privileges
-        $query_table_specific_old = 'SELECT * FROM '
-            . Util::backquote('tables_priv') . ' WHERE '
-            . 'Db = "' . $oldDb . '";';
-
-        $old_privs_table = $GLOBALS['dbi']->fetchResult(
-            $query_table_specific_old,
-            0
-        );
-
-        foreach ($old_privs_table as $old_priv) {
-            $newDb_table_privs_query = 'INSERT INTO ' . Util::backquote(
-                'tables_priv'
-            ) . ' VALUES("' . $old_priv[0] . '", "' . $newname . '", "'
-            . $old_priv[2] . '", "' . $old_priv[3] . '", "' . $old_priv[4]
-            . '", "' . $old_priv[5] . '", "' . $old_priv[6] . '", "'
-            . $old_priv[7] . '");';
-
-            $GLOBALS['dbi']->query($newDb_table_privs_query);
-        }
-
-        // For Column Specific privileges
-        $query_col_specific_old = 'SELECT * FROM '
-            . Util::backquote('columns_priv') . ' WHERE '
-            . 'Db = "' . $oldDb . '";';
-
-        $old_privs_col = $GLOBALS['dbi']->fetchResult(
-            $query_col_specific_old,
-            0
-        );
-
-        foreach ($old_privs_col as $old_priv) {
-            $newDb_col_privs_query = 'INSERT INTO ' . Util::backquote(
-                'columns_priv'
-            ) . ' VALUES("' . $old_priv[0] . '", "' . $newname . '", "'
-            . $old_priv[2] . '", "' . $old_priv[3] . '", "' . $old_priv[4]
-            . '", "' . $old_priv[5] . '", "' . $old_priv[6] . '");';
-
-            $GLOBALS['dbi']->query($newDb_col_privs_query);
-        }
-
-        // For Procedure Specific privileges
-        $query_proc_specific_old = 'SELECT * FROM '
-            . Util::backquote('procs_priv') . ' WHERE '
-            . 'Db = "' . $oldDb . '";';
-
-        $old_privs_proc = $GLOBALS['dbi']->fetchResult(
-            $query_proc_specific_old,
-            0
-        );
-
-        foreach ($old_privs_proc as $old_priv) {
-            $newDb_proc_privs_query = 'INSERT INTO ' . Util::backquote(
-                'procs_priv'
-            ) . ' VALUES("' . $old_priv[0] . '", "' . $newname . '", "'
-            . $old_priv[2] . '", "' . $old_priv[3] . '", "' . $old_priv[4]
-            . '", "' . $old_priv[5] . '", "' . $old_priv[6] . '", "'
-            . $old_priv[7] . '");';
-
-            $GLOBALS['dbi']->query($newDb_proc_privs_query);
-        }
-
-        // Finally FLUSH the new privileges
-        $flush_query = "FLUSH PRIVILEGES;";
-        $GLOBALS['dbi']->query($flush_query);
-    }
-}
-
-/**
- * Create all accumulated constraints
- *
- * @param array $sqlConstratints array of sql constraints for the database
- *
- * @return void
- */
-function PMA_createAllAccumulatedConstraints($sqlConstratints)
-{
-    $GLOBALS['dbi']->selectDb($_REQUEST['newname']);
-    foreach ($sqlConstratints as $one_query) {
-        $GLOBALS['dbi']->query($one_query);
-        // and prepare to display them
-        $GLOBALS['sql_query'] .= "\n" . $one_query;
-    }
-}
-
-/**
- * Duplicate the bookmarks for the db (done once for each db)
- *
- * @param boolean $_error whether table rename/copy or not
- * @param string  $db     database name
- *
- * @return void
- */
-function PMA_duplicateBookmarks($_error, $db)
-{
-    if (! $_error && $db != $_REQUEST['newname']) {
-        $get_fields = array('user', 'label', 'query');
-        $where_fields = array('dbase' => $db);
-        $new_fields = array('dbase' => $_REQUEST['newname']);
-        Table::duplicateInfo(
-            'bookmarkwork', 'bookmark', $get_fields,
-            $where_fields, $new_fields
-        );
-    }
-}
-
-/**
- * Get the HTML snippet for order the table
- *
- * @param array $columns columns array
- *
- * @return string $html_out
- */
-function PMA_getHtmlForOrderTheTable($columns)
-{
-    $html_output = '<div class="operations_half_width">';
-    $html_output .= '<form method="post" id="alterTableOrderby" '
-        . 'action="tbl_operations.php">';
-    $html_output .= PMA_URL_getHiddenInputs(
-        $GLOBALS['db'], $GLOBALS['table']
-    );
-    $html_output .= '<fieldset id="fieldset_table_order">'
-        . '<legend>' . __('Alter table order by') . '</legend>'
-        . '<select name="order_field">';
-
-    foreach ($columns as $fieldname) {
-        $html_output .= '<option '
-            . 'value="' . htmlspecialchars($fieldname['Field']) . '">'
-            . htmlspecialchars($fieldname['Field']) . '</option>' . "\n";
-    }
-    $html_output .= '</select> ' . __('(singly)') . ' '
-        . '<br />'
-        . '<input id="order_order_asc" name="order_order"'
-        . ' type="radio" value="asc" checked="checked" />'
-        . '<label for="order_order_asc">' . __('Ascending') . '</label>'
-        . '<input id="order_order_desc" name="order_order"'
-        . ' type="radio" value="desc" />'
-        . '<label for="order_order_desc">' . __('Descending') . '</label>'
-        . '</fieldset>'
-        . '<fieldset class="tblFooters">'
-        . '<input type="hidden" name="submitorderby" value="1" />'
-        . '<input type="submit" value="' . __('Go') . '" />'
-        . '</fieldset>'
-        . '</form>'
-        . '</div>';
-
-     return $html_output;
-}
-
-/**
- * Get the HTML snippet for move table
- *
- * @return string $html_output
- */
-function PMA_getHtmlForMoveTable()
-{
-    $html_output = '<div class="operations_half_width">';
-    $html_output .= '<form method="post" action="tbl_operations.php"'
-        . ' id="moveTableForm" class="ajax"'
-        . ' onsubmit="return emptyCheckTheField(this, \'new_name\')">'
-        . PMA_URL_getHiddenInputs($GLOBALS['db'], $GLOBALS['table']);
-
-    $html_output .= '<input type="hidden" name="reload" value="1" />'
-        . '<input type="hidden" name="what" value="data" />'
-        . '<fieldset id="fieldset_table_rename">';
-
-    $html_output .= '<legend>' . __('Move table to (database<b>.</b>table)')
-        . '</legend>';
-
-    if (count($GLOBALS['dblist']->databases) > $GLOBALS['cfg']['MaxDbList']) {
-        $html_output .= '<input type="text" maxlength="100" size="30" '
-            . 'name="target_db" value="' . htmlspecialchars($GLOBALS['db'])
-            . '"/>';
-    } else {
-        $html_output .= '<select class="halfWidth" name="target_db">'
-            . $GLOBALS['dblist']->databases->getHtmlOptions(true, false)
-            . '</select>';
-    }
-    $html_output .= '&nbsp;<strong>.</strong>&nbsp;';
-    $html_output .= '<input class="halfWidth" type="text" size="20" name="new_name"'
-        . ' maxlength="64" required="required" '
-        . 'value="' . htmlspecialchars($GLOBALS['table']) . '" /><br />';
-
-    // starting with MySQL 5.0.24, SHOW CREATE TABLE includes the AUTO_INCREMENT
-    // next value but users can decide if they want it or not for the operation
-
-    $html_output .= '<input type="checkbox" name="sql_auto_increment" '
-        . 'value="1" id="checkbox_auto_increment_mv" checked="checked" />'
-        . '<label for="checkbox_auto_increment_mv">'
-        . __('Add AUTO_INCREMENT value')
-        . '</label><br />';
-
-    if ($GLOBALS['table_priv'] && $GLOBALS['col_priv']
-        && $GLOBALS['is_reload_priv']
-    ) {
-        $html_output .= '<input type="checkbox" name="adjust_privileges" '
-            . 'value="1" id="checkbox_privileges_tables_move" '
-            . 'checked="checked" />';
-    } else {
-        $html_output .= '<input type="checkbox" name="adjust_privileges" '
-            . 'value="1" id="checkbox_privileges_tables_move" title="' . __(
-                'You don\'t have sufficient privileges to perform this '
-                . 'operation; Please refer to the documentation for more details'
-            )
-            . '" disabled/>';
-    }
-    $html_output .= '<label for="checkbox_privileges_tables_move">'
-        . __('Adjust privileges') . Util::showDocu('faq', 'faq6-39')
-        . '</label><br />';
-
-    $html_output .= '</fieldset><fieldset class="tblFooters">'
-        . '<input type="submit" name="submit_move" value="' . __('Go') . '" />'
-        . '</fieldset>'
-        . '</form>'
-        . '</div>';
-
-    return $html_output;
-}
-
-/**
- * Get the HTML div for Table option
- *
- * @param string  $comment            Comment
- * @param array   $tbl_collation      table collation
- * @param string  $tbl_storage_engine table storage engine
- * @param boolean $is_myisam_or_aria  whether MYISAM | ARIA or not
- * @param boolean $is_isam            whether ISAM or not
- * @param string  $pack_keys          pack keys
- * @param string  $auto_increment     value of auto increment
- * @param string  $delay_key_write    delay key write
- * @param string  $transactional      value of transactional
- * @param string  $page_checksum      value of page checksum
- * @param boolean $is_innodb          whether INNODB or not
- * @param boolean $is_pbxt            whether PBXT or not
- * @param boolean $is_aria            whether ARIA or not
- * @param string  $checksum           the checksum
- *
- * @return string $html_output
- */
-function PMA_getTableOptionDiv($comment, $tbl_collation, $tbl_storage_engine,
-    $is_myisam_or_aria, $is_isam, $pack_keys, $auto_increment, $delay_key_write,
-    $transactional, $page_checksum, $is_innodb, $is_pbxt, $is_aria, $checksum
-) {
-    $html_output = '<div class="operations_half_width clearfloat">';
-    $html_output .= '<form method="post" action="tbl_operations.php"';
-    $html_output .= ' id="tableOptionsForm" class="ajax">';
-    $html_output .= PMA_URL_getHiddenInputs(
-        $GLOBALS['db'], $GLOBALS['table']
-    );
-    $html_output .= '<input type="hidden" name="reload" value="1" />';
-
-    $html_output .= PMA_getTableOptionFieldset(
-        $comment, $tbl_collation,
-        $tbl_storage_engine, $is_myisam_or_aria, $is_isam, $pack_keys,
-        $delay_key_write, $auto_increment, $transactional, $page_checksum,
-        $is_innodb, $is_pbxt, $is_aria, $checksum
-    );
-
-    $html_output .= '<fieldset class="tblFooters">'
-        . '<input type="hidden" name="submitoptions" value="1" />'
-        . '<input type="submit" value="' . __('Go') . '" />'
-        . '</fieldset>'
-        . '</form>'
-        . '</div>';
-
-    return $html_output;
-}
-
-/**
- * Get HTML for the rename table part of table options
- *
- * @return string $html_output
- */
-function PMA_getHtmlForRenameTable()
-{
-    $html_output = '<tr><td class="vmiddle">' . __('Rename table to') . '</td>'
-        . '<td>'
-        . '<input type="text" size="20" name="new_name" maxlength="64" '
-        . 'value="' . htmlspecialchars($GLOBALS['table'])
-        . '" required="required" />'
-        . '</td></tr>'
-        . '<tr><td></td><td>';
-
-    if ($GLOBALS['table_priv'] && $GLOBALS['col_priv']
-        && $GLOBALS['is_reload_priv']
-    ) {
-        $html_output .= '<input type="checkbox" name="adjust_privileges" '
-            . 'value="1" id="checkbox_privileges_table_options" '
-            . 'checked="checked" />';
-    } else {
-        $html_output .= '<input type="checkbox" name="adjust_privileges" '
-            . 'value="1" id="checkbox_privileges_table_options" title="' . __(
-                'You don\'t have sufficient privileges to perform this '
-                . 'operation; Please refer to the documentation for more details'
-            )
-            . '" disabled/>';
-    }
-    $html_output .= '<label for="checkbox_privileges_table_options">'
-        . __('Adjust privileges') . '&nbsp;'
-        . Util::showDocu('faq', 'faq6-39') . '</label>';
-
-    $html_output .= '</td></tr>';
-    return $html_output;
-}
-
-/**
- * Get HTML for the table comments part of table options
- *
- * @param string $current_value of the table comments
- *
- * @return string $html_output
- */
-function PMA_getHtmlForTableComments($current_value)
-{
-    $commentLength = PMA_MYSQL_INT_VERSION >= 50503 ? 2048 : 60;
-    $html_output = '<tr><td class="vmiddle">' . __('Table comments') . '</td>'
-        . '<td><input type="text" name="comment" '
-        . 'maxlength="' . $commentLength . '" size="30"'
-        . 'value="' . htmlspecialchars($current_value) . '" />'
-        . '<input type="hidden" name="prev_comment" value="'
-        . htmlspecialchars($current_value) . '" />'
-        . '</td>'
-        . '</tr>';
-
-    return $html_output;
-}
-
-/**
- * Get HTML for the PACK KEYS part of table options
- *
- * @param string $current_value of the pack keys option
- *
- * @return string $html_output
- */
-function PMA_getHtmlForPackKeys($current_value)
-{
-    $html_output = '<tr>'
-        . '<td class="vmiddle"><label for="new_pack_keys">PACK_KEYS</label></td>'
-        . '<td><select name="new_pack_keys" id="new_pack_keys">';
-
-    $html_output .= '<option value="DEFAULT"';
-    if ($current_value == 'DEFAULT') {
-        $html_output .= 'selected="selected"';
-    }
-    $html_output .= '>DEFAULT</option>
-            <option value="0"';
-    if ($current_value == '0') {
-        $html_output .= 'selected="selected"';
-    }
-    $html_output .= '>0</option>
-            <option value="1" ';
-    if ($current_value == '1') {
-        $html_output .= 'selected="selected"';
-    }
-    $html_output .= '>1</option>'
-        . '</select>'
-        . '</td>'
-        . '</tr>';
-
-    return $html_output;
-}
-
-/**
- * Get HTML fieldset for Table option, it contains HTML table for options
- *
- * @param string  $comment            Comment
- * @param array   $tbl_collation      table collation
- * @param string  $tbl_storage_engine table storage engine
- * @param boolean $is_myisam_or_aria  whether MYISAM | ARIA or not
- * @param boolean $is_isam            whether ISAM or not
- * @param string  $pack_keys          pack keys
- * @param string  $delay_key_write    delay key write
- * @param string  $auto_increment     value of auto increment
- * @param string  $transactional      value of transactional
- * @param string  $page_checksum      value of page checksum
- * @param boolean $is_innodb          whether INNODB or not
- * @param boolean $is_pbxt            whether PBXT or not
- * @param boolean $is_aria            whether ARIA or not
- * @param string  $checksum           the checksum
- *
- * @return string $html_output
- */
-function PMA_getTableOptionFieldset($comment, $tbl_collation,
-    $tbl_storage_engine, $is_myisam_or_aria, $is_isam, $pack_keys,
-    $delay_key_write, $auto_increment, $transactional,
-    $page_checksum, $is_innodb, $is_pbxt, $is_aria, $checksum
-) {
-    $html_output = '<fieldset>'
-        . '<legend>' . __('Table options') . '</legend>';
-
-    $html_output .= '<table>';
-    $html_output .= PMA_getHtmlForRenameTable();
-    $html_output .= PMA_getHtmlForTableComments($comment);
-
-    //Storage engine
-    $html_output .= '<tr><td class="vmiddle">' . __('Storage Engine')
-        . '&nbsp;' . PMA\libraries\Util::showMySQLDocu('Storage_engines')
-        . '</td>'
-        . '<td>'
-        . StorageEngine::getHtmlSelect(
-            'new_tbl_storage_engine', null, $tbl_storage_engine
-        )
-        . '</td>'
-        . '</tr>';
-
-    //Table character set
-    $html_output .= '<tr><td class="vmiddle">' . __('Collation') . '</td>'
-        . '<td>'
-        . PMA_generateCharsetDropdownBox(
-            PMA_CSDROPDOWN_COLLATION,
-            'tbl_collation', null, $tbl_collation, false
-        )
-        . '</td>'
-        . '</tr>';
-
-    // Change all Column collations
-    $html_output .= '<tr><td></td><td>'
-        . '<input type="checkbox" name="change_all_collations" value="1" '
-        . 'id="checkbox_change_all_collations" />'
-        . '<label for="checkbox_change_all_collations">'
-        . __('Change all column collations')
-        . '</label>'
-        . '</td></tr>';
-
-    if ($is_myisam_or_aria || $is_isam) {
-        $html_output .= PMA_getHtmlForPackKeys($pack_keys);
-    } // end if (MYISAM|ISAM)
-
-    if ($is_myisam_or_aria) {
-        $html_output .= PMA_getHtmlForTableRow(
-            'new_checksum',
-            'CHECKSUM',
-            $checksum
-        );
-
-        $html_output .= PMA_getHtmlForTableRow(
-            'new_delay_key_write',
-            'DELAY_KEY_WRITE',
-            $delay_key_write
-        );
-    } // end if (MYISAM)
-
-    if ($is_aria) {
-        $html_output .= PMA_getHtmlForTableRow(
-            'new_transactional',
-            'TRANSACTIONAL',
-            $transactional
-        );
-
-        $html_output .= PMA_getHtmlForTableRow(
-            'new_page_checksum',
-            'PAGE_CHECKSUM',
-            $page_checksum
-        );
-    } // end if (ARIA)
-
-    if (mb_strlen($auto_increment) > 0
-        && ($is_myisam_or_aria || $is_innodb || $is_pbxt)
-    ) {
-        $html_output .= '<tr><td class="vmiddle">'
-            . '<label for="auto_increment_opt">AUTO_INCREMENT</label></td>'
-            . '<td><input type="number" name="new_auto_increment" '
-            . 'id="auto_increment_opt"'
-            . 'value="' . $auto_increment . '" /></td>'
-            . '</tr> ';
-    } // end if (MYISAM|INNODB)
-
-    $possible_row_formats = PMA_getPossibleRowFormat();
-
-    // for MYISAM there is also COMPRESSED but it can be set only by the
-    // myisampack utility, so don't offer here the choice because if we
-    // try it inside an ALTER TABLE, MySQL (at least in 5.1.23-maria)
-    // does not return a warning
-    // (if the table was compressed, it can be seen on the Structure page)
-
-    if (isset($possible_row_formats[$tbl_storage_engine])) {
-        $current_row_format
-            = mb_strtoupper($GLOBALS['showtable']['Row_format']);
-        $html_output .= '<tr><td class="vmiddle">'
-            . '<label for="new_row_format">ROW_FORMAT</label></td>'
-            . '<td>';
-        $html_output .= PMA\libraries\Util::getDropdown(
-            'new_row_format', $possible_row_formats[$tbl_storage_engine],
-            $current_row_format, 'new_row_format'
-        );
-        $html_output .= '</td></tr>';
-    }
-    $html_output .= '</table>'
-        . '</fieldset>';
-
-    return $html_output;
-}
-
-/**
- * Get the common HTML table row (tr) for new_checksum, new_delay_key_write,
- * new_transactional and new_page_checksum
- *
- * @param string $attribute class, name and id attribute
- * @param string $label     label value
- * @param string $val       checksum, delay_key_write, transactional, page_checksum
- *
- * @return string $html_output
- */
-function PMA_getHtmlForTableRow($attribute, $label, $val)
-{
-    return '<tr>'
-        . '<td class="vmiddle">'
-        . '<label for="' . $attribute . '">' . $label . '</label>'
-        . '</td>'
-        . '<td>'
-        . '<input type="checkbox" name="' . $attribute . '" id="' . $attribute . '"'
-        . ' value="1"' . ((!empty($val) && $val == 1) ? ' checked="checked"' : '')
-        . '/>'
-        . '</td>'
-        . '</tr>';
-}
-
-/**
- * Get array of possible row formats
- *
- * @return array $possible_row_formats
- */
-function PMA_getPossibleRowFormat()
-{
-    // the outer array is for engines, the inner array contains the dropdown
-    // option values as keys then the dropdown option labels
-
-    $possible_row_formats = array(
-        'ARCHIVE' => array(
-            'COMPRESSED' => 'COMPRESSED',
-        ),
-        'ARIA'  => array(
-            'FIXED'     => 'FIXED',
-            'DYNAMIC'   => 'DYNAMIC',
-            'PAGE'      => 'PAGE'
-        ),
-        'MARIA'  => array(
-            'FIXED'     => 'FIXED',
-            'DYNAMIC'   => 'DYNAMIC',
-            'PAGE'      => 'PAGE'
-        ),
-        'MYISAM' => array(
-             'FIXED'    => 'FIXED',
-             'DYNAMIC'  => 'DYNAMIC'
-        ),
-        'PBXT'   => array(
-             'FIXED'    => 'FIXED',
-             'DYNAMIC'  => 'DYNAMIC'
-        ),
-        'INNODB' => array(
-             'COMPACT'  => 'COMPACT',
-             'REDUNDANT' => 'REDUNDANT'
-        )
-    );
-
-    /** @var Innodb $innodbEnginePlugin */
-    $innodbEnginePlugin = StorageEngine::getEngine('Innodb');
-    $innodbPluginVersion = $innodbEnginePlugin->getInnodbPluginVersion();
-    if (!empty($innodbPluginVersion)) {
-        $innodb_file_format = $innodbEnginePlugin->getInnodbFileFormat();
-    } else {
-        $innodb_file_format = '';
-    }
-    if ('Barracuda' == $innodb_file_format
-        && $innodbEnginePlugin->supportsFilePerTable()
-    ) {
-        $possible_row_formats['INNODB']['DYNAMIC'] = 'DYNAMIC';
-        $possible_row_formats['INNODB']['COMPRESSED'] = 'COMPRESSED';
-    }
-
-    return $possible_row_formats;
-}
-
-/**
- * Get HTML div for copy table
- *
- * @return string $html_output
- */
-function PMA_getHtmlForCopytable()
-{
-    $html_output = '<div class="operations_half_width">';
-    $html_output .= '<form method="post" action="tbl_operations.php" '
-        . 'name="copyTable" '
-        . 'id="copyTable" '
-        . ' class="ajax" '
-        . 'onsubmit="return emptyCheckTheField(this, \'new_name\')">'
-        . PMA_URL_getHiddenInputs($GLOBALS['db'], $GLOBALS['table'])
-        . '<input type="hidden" name="reload" value="1" />';
-
-    $html_output .= '<fieldset>';
-    $html_output .= '<legend>'
-        . __('Copy table to (database<b>.</b>table)') . '</legend>';
-
-    if (count($GLOBALS['dblist']->databases) > $GLOBALS['cfg']['MaxDbList']) {
-        $html_output .= '<input class="halfWidth" type="text" maxlength="100" '
-            . 'size="30" name="target_db" '
-            . 'value="' . htmlspecialchars($GLOBALS['db']) . '"/>';
-    } else {
-        $html_output .= '<select class="halfWidth" name="target_db">'
-            . $GLOBALS['dblist']->databases->getHtmlOptions(true, false)
-            . '</select>';
-    }
-    $html_output .= '&nbsp;<strong>.</strong>&nbsp;';
-    $html_output .= '<input class="halfWidth" type="text" required="required" '
-        . 'size="20" name="new_name" maxlength="64" '
-        . 'value="' . htmlspecialchars($GLOBALS['table']) . '"/><br />';
-
-    $choices = array(
-        'structure' => __('Structure only'),
-        'data'      => __('Structure and data'),
-        'dataonly'  => __('Data only')
-    );
-
-    $html_output .= PMA\libraries\Util::getRadioFields(
-        'what', $choices, 'data', true
-    );
-    $html_output .= '<br />';
-
-    $html_output .= '<input type="checkbox" name="drop_if_exists" '
-        . 'value="true" id="checkbox_drop" />'
-        . '<label for="checkbox_drop">'
-        . sprintf(__('Add %s'), 'DROP TABLE') . '</label><br />'
-        . '<input type="checkbox" name="sql_auto_increment" '
-        . 'value="1" id="checkbox_auto_increment_cp" />'
-        . '<label for="checkbox_auto_increment_cp">'
-        . __('Add AUTO_INCREMENT value') . '</label><br />';
-
-    // display "Add constraints" choice only if there are
-    // foreign keys
-    if (PMA_getForeigners($GLOBALS['db'], $GLOBALS['table'], '', 'foreign')) {
-        $html_output .= '<input type="checkbox" name="add_constraints" '
-            . 'value="1" id="checkbox_constraints" checked="checked"/>';
-        $html_output .= '<label for="checkbox_constraints">'
-            . __('Add constraints') . '</label><br />';
-    } // endif
-
-    $html_output .= '<br />';
-
-    if ($GLOBALS['table_priv'] && $GLOBALS['col_priv']
-        && $GLOBALS['is_reload_priv']
-    ) {
-        $html_output .= '<input type="checkbox" name="adjust_privileges" '
-            . 'value="1" id="checkbox_adjust_privileges" checked="checked" />';
-    } else {
-        $html_output .= '<input type="checkbox" name="adjust_privileges" '
-            . 'value="1" id="checkbox_adjust_privileges" title="' . __(
-                'You don\'t have sufficient privileges to perform this '
-                . 'operation; Please refer to the documentation for more details'
-            )
-            . '" disabled/>';
-    }
-    $html_output .= '<label for="checkbox_adjust_privileges">'
-        . __('Adjust privileges') . Util::showDocu('faq', 'faq6-39')
-        . '</label><br />';
-
-    if (isset($_COOKIE['pma_switch_to_new'])
-        && $_COOKIE['pma_switch_to_new'] == 'true'
-    ) {
-        $pma_switch_to_new = 'true';
-    }
-
-    $html_output .= '<input type="checkbox" name="switch_to_new" value="true"'
-        . 'id="checkbox_switch"'
-        . ((isset($pma_switch_to_new) && $pma_switch_to_new == 'true')
-            ? ' checked="checked"'
-            : '' . '/>');
-    $html_output .= '<label for="checkbox_switch">'
-        . __('Switch to copied table') . '</label>'
-        . '</fieldset>';
-
-    $html_output .= '<fieldset class="tblFooters">'
-        . '<input type="submit" name="submit_copy" value="' . __('Go') . '" />'
-        . '</fieldset>'
-        . '</form>'
-        . '</div>';
-
-    return $html_output;
-}
-
-/**
- * Get HTML snippet for table maintenance
- *
- * @param boolean $is_myisam_or_aria whether MYISAM | ARIA or not
- * @param boolean $is_innodb         whether innodb or not
- * @param boolean $is_berkeleydb     whether  berkeleydb or not
- * @param array   $url_params        array of URL parameters
- *
- * @return string $html_output
- */
-function PMA_getHtmlForTableMaintenance(
-    $is_myisam_or_aria, $is_innodb, $is_berkeleydb, $url_params
-) {
-    $html_output = '<div class="operations_half_width">';
-    $html_output .= '<fieldset>'
-        . '<legend>' . __('Table maintenance') . '</legend>';
-    $html_output .= '<ul id="tbl_maintenance">';
-
-    // Note: BERKELEY (BDB) is no longer supported, starting with MySQL 5.1
-    $html_output .= PMA_getListofMaintainActionLink(
-        $is_myisam_or_aria, $is_innodb, $url_params, $is_berkeleydb
-    );
-
-    $html_output .= '</ul>'
-        . '</fieldset>'
-        . '</div>';
-
-    return $html_output;
-}
-
-/**
- * Get HTML 'li' having a link of maintain action
- *
- * @param boolean $is_myisam_or_aria whether MYISAM | ARIA or not
- * @param boolean $is_innodb         whether innodb or not
- * @param array   $url_params        array of URL parameters
- * @param boolean $is_berkeleydb     whether  berkeleydb or not
- *
- * @return string $html_output
- */
-function PMA_getListofMaintainActionLink($is_myisam_or_aria,
-    $is_innodb, $url_params, $is_berkeleydb
-) {
-    $html_output = '';
-
-    // analyze table
-    if ($is_innodb || $is_myisam_or_aria || $is_berkeleydb) {
-        $params = array(
-            'sql_query' => 'ANALYZE TABLE '
-                . PMA\libraries\Util::backquote($GLOBALS['table']),
-            'table_maintenance' => 'Go',
-        );
-        $html_output .= PMA_getMaintainActionlink(
-            __('Analyze table'),
-            $params,
-            $url_params,
-            'ANALYZE_TABLE'
-        );
-    }
-
-    // check table
-    if ($is_myisam_or_aria || $is_innodb) {
-        $params = array(
-            'sql_query' => 'CHECK TABLE '
-                . PMA\libraries\Util::backquote($GLOBALS['table']),
-            'table_maintenance' => 'Go',
-        );
-        $html_output .= PMA_getMaintainActionlink(
-            __('Check table'),
-            $params,
-            $url_params,
-            'CHECK_TABLE'
-        );
-    }
-
-    // checksum table
-    $params = array(
-        'sql_query' => 'CHECKSUM TABLE '
-            . Util::backquote($GLOBALS['table']),
-        'table_maintenance' => 'Go',
-    );
-    $html_output .= PMA_getMaintainActionlink(
-        __('Checksum table'),
-        $params,
-        $url_params,
-        'CHECKSUM_TABLE'
-    );
-
-    // defragment table
-    if ($is_innodb) {
-        $params = array(
-            'sql_query' => 'ALTER TABLE '
-            . PMA\libraries\Util::backquote($GLOBALS['table'])
-            . ' ENGINE = InnoDB;'
-        );
-        $html_output .= PMA_getMaintainActionlink(
-            __('Defragment table'),
-            $params,
-            $url_params,
-            'InnoDB_File_Defragmenting'
-        );
-    }
-
-    // flush table
-    $params = array(
-        'sql_query' => 'FLUSH TABLE '
-            . PMA\libraries\Util::backquote($GLOBALS['table']),
-        'message_to_show' => sprintf(
-            __('Table %s has been flushed.'),
-            htmlspecialchars($GLOBALS['table'])
-        ),
-        'reload' => 1,
-    );
-    $html_output .= PMA_getMaintainActionlink(
-        __('Flush the table (FLUSH)'),
-        $params,
-        $url_params,
-        'FLUSH'
-    );
-
-    // optimize table
-    if ($is_myisam_or_aria || $is_innodb || $is_berkeleydb) {
-        $params = array(
-            'sql_query' => 'OPTIMIZE TABLE '
-                . PMA\libraries\Util::backquote($GLOBALS['table']),
-            'table_maintenance' => 'Go',
-        );
-        $html_output .= PMA_getMaintainActionlink(
-            __('Optimize table'),
-            $params,
-            $url_params,
-            'OPTIMIZE_TABLE'
-        );
-    }
-
-    // repair table
-    if ($is_myisam_or_aria) {
-        $params = array(
-            'sql_query' => 'REPAIR TABLE '
-                . PMA\libraries\Util::backquote($GLOBALS['table']),
-            'table_maintenance' => 'Go',
-        );
-        $html_output .= PMA_getMaintainActionlink(
-            __('Repair table'),
-            $params,
-            $url_params,
-            'REPAIR_TABLE'
-        );
-    }
-
-    return $html_output;
-}
-
-/**
- * Get maintain action HTML link
- *
- * @param string $action_message action message
- * @param array  $params         url parameters array
- * @param array  $url_params     additional url parameters
- * @param string $link           contains name of page/anchor that is being linked
- *
- * @return string $html_output
- */
-function PMA_getMaintainActionlink($action_message, $params, $url_params, $link)
-{
-    return '<li>'
-        . '<a class="maintain_action ajax" '
-        . 'href="sql.php'
-        . PMA_URL_getCommon(array_merge($url_params, $params)) . '">'
-        . $action_message
-        . '</a>'
-        . PMA\libraries\Util::showMySQLDocu($link)
-        . '</li>';
-}
-
-/**
- * Get HTML for Delete data or table (truncate table, drop table)
- *
- * @param array $truncate_table_url_params url parameter array for truncate table
- * @param array $dropTableUrlParams        url parameter array for drop table
- *
- * @return string $html_output
- */
-function PMA_getHtmlForDeleteDataOrTable(
-    $truncate_table_url_params,
-    $dropTableUrlParams
-) {
-    $html_output = '<div class="operations_half_width">'
-        . '<fieldset class="caution">'
-        . '<legend>' . __('Delete data or table') . '</legend>';
-
-    $html_output .= '<ul>';
-
-    if (! empty($truncate_table_url_params)) {
-        $html_output .= PMA_getDeleteDataOrTablelink(
-            $truncate_table_url_params,
-            'TRUNCATE_TABLE',
-            __('Empty the table (TRUNCATE)'),
-            'truncate_tbl_anchor'
-        );
-    }
-    if (!empty($dropTableUrlParams)) {
-        $html_output .= PMA_getDeleteDataOrTablelink(
-            $dropTableUrlParams,
-            'DROP_TABLE',
-            __('Delete the table (DROP)'),
-            'drop_tbl_anchor'
-        );
-    }
-    $html_output .= '</ul></fieldset></div>';
-
-    return $html_output;
-}
-
-/**
- * Get the HTML link for Truncate table, Drop table and Drop db
- *
- * @param array  $url_params url parameter array for delete data or table
- * @param string $syntax     TRUNCATE_TABLE or DROP_TABLE or DROP_DATABASE
- * @param string $link       link to be shown
- * @param string $htmlId     id of the link
- *
- * @return String html output
- */
-function PMA_getDeleteDataOrTablelink($url_params, $syntax, $link, $htmlId)
-{
-    return  '<li><a '
-        . 'href="sql.php' . PMA_URL_getCommon($url_params) . '"'
-        . ' id="' . $htmlId . '" class="ajax">'
-        . $link . '</a>'
-        . PMA\libraries\Util::showMySQLDocu($syntax)
-        . '</li>';
-}
-
-/**
- * Get HTML snippet for partition maintenance
- *
- * @param array $partition_names array of partition names for a specific db/table
- * @param array $url_params      url parameters
- *
- * @return string $html_output
- */
-function PMA_getHtmlForPartitionMaintenance($partition_names, $url_params)
-{
-    $choices = array(
-        'ANALYZE' => __('Analyze'),
-        'CHECK' => __('Check'),
-        'OPTIMIZE' => __('Optimize'),
-        'REBUILD' => __('Rebuild'),
-        'REPAIR' => __('Repair'),
-        'TRUNCATE' => __('Truncate')
-    );
-
-    $partition_method = Partition::getPartitionMethod(
-        $GLOBALS['db'], $GLOBALS['table']
-    );
-    // add COALESCE or DROP option to choices array depeding on Partition method
-    if ($partition_method == 'RANGE'
-        || $partition_method == 'RANGE COLUMNS'
-        || $partition_method == 'LIST'
-        || $partition_method == 'LIST COLUMNS'
-    ) {
-        $choices['DROP'] = __('Drop');
-    } else {
-        $choices['COALESCE'] = __('Coalesce');
-    }
-
-    $html_output = '<div class="operations_half_width">'
-        . '<form id="partitionsForm" class="ajax" '
-        . 'method="post" action="tbl_operations.php" >'
-        . PMA_URL_getHiddenInputs($GLOBALS['db'], $GLOBALS['table'])
-        . '<fieldset>'
-        . '<legend>'
-        . __('Partition maintenance')
-        . PMA\libraries\Util::showMySQLDocu('partitioning_maintenance')
-        . '</legend>';
-
-    $html_select = '<select id="partition_name" name="partition_name[]"'
-        . ' multiple="multiple" required="required">' . "\n";
-    $first = true;
-    foreach ($partition_names as $one_partition) {
-        $one_partition = htmlspecialchars($one_partition);
-        $html_select .= '<option value="' . $one_partition . '"';
-        if ($first) {
-            $html_select .= ' selected="selected"';
-            $first = false;
-        }
-        $html_select .=  '>' . $one_partition . '</option>' . "\n";
-    }
-    $html_select .= '</select>' . "\n";
-    $html_output .= sprintf(__('Partition %s'), $html_select);
-
-    $html_output .= '<div class="clearfloat" />';
-    $html_output .= PMA\libraries\Util::getRadioFields(
-        'partition_operation', $choices, 'ANALYZE', false, true, 'floatleft'
-    );
-    $this_url_params = array_merge(
-        $url_params,
-        array(
-            'sql_query' => 'ALTER TABLE '
-            . PMA\libraries\Util::backquote($GLOBALS['table'])
-            . ' REMOVE PARTITIONING;'
-        )
-    );
-    $html_output .= '<div class="clearfloat" /><br />';
-
-    $html_output .= '<a href="sql.php'
-        . PMA_URL_getCommon($this_url_params) . '">'
-        . __('Remove partitioning') . '</a>';
-
-    $html_output .= '</fieldset>'
-        . '<fieldset class="tblFooters">'
-        . '<input type="hidden" name="submit_partition" value="1">'
-        . '<input type="submit" value="' . __('Go') . '" />'
-        . '</fieldset>'
-        . '</form>'
-        . '</div>';
-
-    return $html_output;
-}
-
-/**
- * Get the HTML for Referential Integrity check
- *
- * @param array $foreign    all Relations to foreign tables for a given table
- *                          or optionally a given column in a table
- * @param array $url_params array of url parameters
- *
- * @return string $html_output
- */
-function PMA_getHtmlForReferentialIntegrityCheck($foreign, $url_params)
-{
-    $html_output = '<div class="operations_half_width">'
-        . '<fieldset>'
-        . '<legend>' . __('Check referential integrity:') . '</legend>';
-
-    $html_output .= '<ul>';
-
-    foreach ($foreign as $master => $arr) {
-        $join_query  = 'SELECT '
-            . PMA\libraries\Util::backquote($GLOBALS['table']) . '.*'
-            . ' FROM ' . PMA\libraries\Util::backquote($GLOBALS['table'])
-            . ' LEFT JOIN '
-            . PMA\libraries\Util::backquote($arr['foreign_db'])
-            . '.'
-            . PMA\libraries\Util::backquote($arr['foreign_table']);
-        if ($arr['foreign_table'] == $GLOBALS['table']) {
-            $foreign_table = $GLOBALS['table'] . '1';
-            $join_query .= ' AS ' . PMA\libraries\Util::backquote($foreign_table);
-        } else {
-            $foreign_table = $arr['foreign_table'];
-        }
-        $join_query .= ' ON '
-            . PMA\libraries\Util::backquote($GLOBALS['table']) . '.'
-            . PMA\libraries\Util::backquote($master)
-            . ' = '
-            . PMA\libraries\Util::backquote($arr['foreign_db'])
-            . '.'
-            . PMA\libraries\Util::backquote($foreign_table) . '.'
-            . PMA\libraries\Util::backquote($arr['foreign_field'])
-            . ' WHERE '
-            . PMA\libraries\Util::backquote($arr['foreign_db'])
-            . '.'
-            . PMA\libraries\Util::backquote($foreign_table) . '.'
-            . PMA\libraries\Util::backquote($arr['foreign_field'])
-            . ' IS NULL AND '
-            . PMA\libraries\Util::backquote($GLOBALS['table']) . '.'
-            . PMA\libraries\Util::backquote($master)
-            . ' IS NOT NULL';
-        $this_url_params = array_merge(
-            $url_params,
-            array('sql_query' => $join_query)
-        );
-
-        $html_output .= '<li>'
-            . '<a href="sql.php'
-            . PMA_URL_getCommon($this_url_params)
-            . '">'
-            . $master . '&nbsp;->&nbsp;' . $arr['foreign_db'] . '.'
-            . $arr['foreign_table'] . '.' . $arr['foreign_field']
-            . '</a></li>' . "\n";
-    } //  foreach $foreign
-    $html_output .= '</ul></fieldset></div>';
-
-    return $html_output;
-}
-
-/**
- * Reorder table based on request params
- *
- * @return array SQL query and result
- */
-function PMA_getQueryAndResultForReorderingTable()
-{
-    $sql_query = 'ALTER TABLE '
-        . PMA\libraries\Util::backquote($GLOBALS['table'])
-        . ' ORDER BY '
-        . PMA\libraries\Util::backquote(urldecode($_REQUEST['order_field']));
-    if (isset($_REQUEST['order_order'])
-        && $_REQUEST['order_order'] === 'desc'
-    ) {
-        $sql_query .= ' DESC';
-    }
-    $sql_query .= ';';
-    $result = $GLOBALS['dbi']->query($sql_query);
-
-    return array($sql_query, $result);
-}
-
-/**
- * Get table alters array
- *
- * @param boolean $is_myisam_or_aria   whether MYISAM | ARIA or not
- * @param boolean $is_isam             whether ISAM or not
- * @param string  $pack_keys           pack keys
- * @param string  $checksum            value of checksum
- * @param boolean $is_aria             whether ARIA or not
- * @param string  $page_checksum       value of page checksum
- * @param string  $delay_key_write     delay key write
- * @param boolean $is_innodb           whether INNODB or not
- * @param boolean $is_pbxt             whether PBXT or not
- * @param string  $row_format          row format
- * @param string  $newTblStorageEngine table storage engine
- * @param string  $transactional       value of transactional
- * @param string  $tbl_collation       collation of the table
- *
- * @return array  $table_alters
- */
-function PMA_getTableAltersArray($is_myisam_or_aria, $is_isam, $pack_keys,
-    $checksum, $is_aria, $page_checksum, $delay_key_write, $is_innodb,
-    $is_pbxt, $row_format, $newTblStorageEngine, $transactional, $tbl_collation
-) {
-    global $auto_increment;
-
-    $table_alters = array();
-
-    if (isset($_REQUEST['comment'])
-        && urldecode($_REQUEST['prev_comment']) !== $_REQUEST['comment']
-    ) {
-        $table_alters[] = 'COMMENT = \''
-            . $GLOBALS['dbi']->escapeString($_REQUEST['comment']) . '\'';
-    }
-
-    if (! empty($newTblStorageEngine)
-        && mb_strtolower($newTblStorageEngine) !== mb_strtolower($GLOBALS['tbl_storage_engine'])
-    ) {
-        $table_alters[] = 'ENGINE = ' . $newTblStorageEngine;
-    }
-    if (! empty($_REQUEST['tbl_collation'])
-        && $_REQUEST['tbl_collation'] !== $tbl_collation
-    ) {
-        $table_alters[] = 'DEFAULT '
-            . PMA_generateCharsetQueryPart($_REQUEST['tbl_collation']);
-    }
-
-    if (($is_myisam_or_aria || $is_isam)
-        && isset($_REQUEST['new_pack_keys'])
-        && $_REQUEST['new_pack_keys'] != (string)$pack_keys
-    ) {
-        $table_alters[] = 'pack_keys = ' . $_REQUEST['new_pack_keys'];
-    }
-
-    $_REQUEST['new_checksum'] = empty($_REQUEST['new_checksum']) ? '0' : '1';
-    if ($is_myisam_or_aria
-        && $_REQUEST['new_checksum'] !== $checksum
-    ) {
-        $table_alters[] = 'checksum = ' . $_REQUEST['new_checksum'];
-    }
-
-    $_REQUEST['new_transactional']
-        = empty($_REQUEST['new_transactional']) ? '0' : '1';
-    if ($is_aria
-        && $_REQUEST['new_transactional'] !== $transactional
-    ) {
-        $table_alters[] = 'TRANSACTIONAL = ' . $_REQUEST['new_transactional'];
-    }
-
-    $_REQUEST['new_page_checksum']
-        = empty($_REQUEST['new_page_checksum']) ? '0' : '1';
-    if ($is_aria
-        && $_REQUEST['new_page_checksum'] !== $page_checksum
-    ) {
-        $table_alters[] = 'PAGE_CHECKSUM = ' . $_REQUEST['new_page_checksum'];
-    }
-
-    $_REQUEST['new_delay_key_write']
-        = empty($_REQUEST['new_delay_key_write']) ? '0' : '1';
-    if ($is_myisam_or_aria
-        && $_REQUEST['new_delay_key_write'] !== $delay_key_write
-    ) {
-        $table_alters[] = 'delay_key_write = ' . $_REQUEST['new_delay_key_write'];
-    }
-
-    if (($is_myisam_or_aria || $is_innodb || $is_pbxt)
-        && ! empty($_REQUEST['new_auto_increment'])
-        && (! isset($auto_increment)
-        || $_REQUEST['new_auto_increment'] !== $auto_increment)
-    ) {
-        $table_alters[] = 'auto_increment = '
-            . $GLOBALS['dbi']->escapeString($_REQUEST['new_auto_increment']);
-    }
-
-    if (! empty($_REQUEST['new_row_format'])) {
-        $newRowFormat = $_REQUEST['new_row_format'];
-        $newRowFormatLower = mb_strtolower($newRowFormat);
-        if (($is_myisam_or_aria || $is_innodb || $is_pbxt)
-            && (!mb_strlen($row_format)
-            || $newRowFormatLower !== mb_strtolower($row_format))
-        ) {
-            $table_alters[] = 'ROW_FORMAT = '
-                . $GLOBALS['dbi']->escapeString($newRowFormat);
-        }
-    }
-
-    return $table_alters;
-}
-
-/**
- * set initial value of the set of variables, based on the current table engine
- *
- * @param string $tbl_storage_engine table storage engine in upper case
- *
- * @return array ($is_myisam_or_aria, $is_innodb, $is_isam,
- *                $is_berkeleydb, $is_aria, $is_pbxt)
- */
-function PMA_setGlobalVariablesForEngine($tbl_storage_engine)
-{
-    //Options that apply to MYISAM usually apply to ARIA
-    $is_myisam_or_aria = ($tbl_storage_engine == 'MYISAM'
-        || $tbl_storage_engine == 'ARIA'
-        || $tbl_storage_engine == 'MARIA'
-    );
-    $is_aria = ($tbl_storage_engine == 'ARIA');
-
-    $is_isam = ($tbl_storage_engine == 'ISAM');
-    $is_innodb = ($tbl_storage_engine == 'INNODB');
-    $is_berkeleydb = ($tbl_storage_engine == 'BERKELEYDB');
-    $is_pbxt = ($tbl_storage_engine == 'PBXT');
-
-    return array(
-        $is_myisam_or_aria, $is_innodb, $is_isam,
-        $is_berkeleydb, $is_aria, $is_pbxt
-    );
-}
-
-/**
- * Get warning messages array
- *
- * @return array  $warning_messages
- */
-function PMA_getWarningMessagesArray()
-{
-    $warning_messages = array();
-    foreach ($GLOBALS['dbi']->getWarnings() as $warning) {
-        // In MariaDB 5.1.44, when altering a table from Maria to MyISAM
-        // and if TRANSACTIONAL was set, the system reports an error;
-        // I discussed with a Maria developer and he agrees that this
-        // should not be reported with a Level of Error, so here
-        // I just ignore it. But there are other 1478 messages
-        // that it's better to show.
-        if (! ($_REQUEST['new_tbl_storage_engine'] == 'MyISAM'
-            && $warning['Code'] == '1478'
-            && $warning['Level'] == 'Error')
-        ) {
-            $warning_messages[] = $warning['Level'] . ': #' . $warning['Code']
-                . ' ' . $warning['Message'];
-        }
-    }
-    return $warning_messages;
-}
-
-/**
- * Get SQL query and result after ran this SQL query for a partition operation
- * has been requested by the user
- *
- * @return array $sql_query, $result
- */
-function PMA_getQueryAndResultForPartition()
-{
-    $sql_query = 'ALTER TABLE '
-        . PMA\libraries\Util::backquote($GLOBALS['table']) . ' '
-        . $_REQUEST['partition_operation']
-        . ' PARTITION ';
-
-    if ($_REQUEST['partition_operation'] == 'COALESCE') {
-        $sql_query .= count($_REQUEST['partition_name']);
-    } else {
-        $sql_query .= implode(', ', $_REQUEST['partition_name']) . ';';
-    }
-
-    $result = $GLOBALS['dbi']->query($sql_query);
-
-    return array($sql_query, $result);
-}
-
-/**
- * Adjust the privileges after renaming/moving a table
- *
- * @param string $oldDb    Database name before table renaming/moving table
- * @param string $oldTable Table name before table renaming/moving table
- * @param string $newDb    Database name after table renaming/ moving table
- * @param string $newTable Table name after table renaming/moving table
- *
- * @return void
- */
-function PMA_AdjustPrivileges_renameOrMoveTable($oldDb, $oldTable, $newDb, $newTable)
-{
-    if ($GLOBALS['table_priv'] && $GLOBALS['col_priv']
-        && $GLOBALS['is_reload_priv']
-    ) {
-        $GLOBALS['dbi']->selectDb('mysql');
-
-        // For table specific privileges
-        $query_table_specific = 'UPDATE ' . Util::backquote('tables_priv')
-            . 'SET Db = \'' . $GLOBALS['dbi']->escapeString($newDb) . '\', Table_name = \'' . $GLOBALS['dbi']->escapeString($newTable)
-            . '\' where Db = \'' . $GLOBALS['dbi']->escapeString($oldDb) . '\' AND Table_name = \'' . $GLOBALS['dbi']->escapeString($oldTable)
-            . '\';';
-        $GLOBALS['dbi']->query($query_table_specific);
-
-        // For column specific privileges
-        $query_col_specific = 'UPDATE ' . Util::backquote('columns_priv')
-            . 'SET Db = \'' . $GLOBALS['dbi']->escapeString($newDb) . '\', Table_name = \'' . $GLOBALS['dbi']->escapeString($newTable)
-            . '\' where Db = \'' . $GLOBALS['dbi']->escapeString($oldDb) . '\' AND Table_name = \'' . $GLOBALS['dbi']->escapeString($oldTable)
-            . '\';';
-        $GLOBALS['dbi']->query($query_col_specific);
-
-        // Finally FLUSH the new privileges
-        $flush_query = "FLUSH PRIVILEGES;";
-        $GLOBALS['dbi']->query($flush_query);
-    }
-}
-
-/**
- * Adjust the privileges after copying a table
- *
- * @param string $oldDb    Database name before table copying
- * @param string $oldTable Table name before table copying
- * @param string $newDb    Database name after table copying
- * @param string $newTable Table name after table copying
- *
- * @return void
- */
-function PMA_AdjustPrivileges_copyTable($oldDb, $oldTable, $newDb, $newTable)
-{
-    if ($GLOBALS['table_priv'] && $GLOBALS['col_priv']
-        && $GLOBALS['is_reload_priv']
-    ) {
-        $GLOBALS['dbi']->selectDb('mysql');
-
-        // For Table Specific privileges
-        $query_table_specific_old = 'SELECT * FROM '
-            . Util::backquote('tables_priv') . ' where '
-            . 'Db = "' . $oldDb . '" AND Table_name = "' . $oldTable . '";';
-
-        $old_privs_table = $GLOBALS['dbi']->fetchResult(
-            $query_table_specific_old,
-            0
-        );
-
-        foreach ($old_privs_table as $old_priv) {
-            $newDb_table_privs_query = 'INSERT INTO '
-                . Util::backquote('tables_priv') . ' VALUES("'
-                . $old_priv[0] . '", "' . $newDb . '", "' . $old_priv[2] . '", "'
-                . $newTable . '", "' . $old_priv[4] . '", "' . $old_priv[5]
-                . '", "' . $old_priv[6] . '", "' . $old_priv[7] . '");';
-
-            $GLOBALS['dbi']->query($newDb_table_privs_query);
-        }
-
-        // For Column Specific privileges
-        $query_col_specific_old = 'SELECT * FROM '
-            . Util::backquote('columns_priv') . ' WHERE '
-            . 'Db = "' . $oldDb . '" AND Table_name = "' . $oldTable . '";';
-
-        $old_privs_col = $GLOBALS['dbi']->fetchResult(
-            $query_col_specific_old,
-            0
-        );
-
-        foreach ($old_privs_col as $old_priv) {
-            $newDb_col_privs_query = 'INSERT INTO '
-                . Util::backquote('columns_priv') . ' VALUES("'
-                . $old_priv[0] . '", "' . $newDb . '", "' . $old_priv[2] . '", "'
-                . $newTable . '", "' . $old_priv[4] . '", "' . $old_priv[5]
-                . '", "' . $old_priv[6] . '");';
-
-            $GLOBALS['dbi']->query($newDb_col_privs_query);
-        }
-
-        // Finally FLUSH the new privileges
-        $flush_query = "FLUSH PRIVILEGES;";
-        $GLOBALS['dbi']->query($flush_query);
-    }
-}
-
-/**
- * Change all collations and character sets of all columns in table
- *
- * @param string $db            Database name
- * @param string $table         Table name
- * @param string $tbl_collation Collation Name
- *
- * @return void
- */
-function PMA_changeAllColumnsCollation($db, $table, $tbl_collation)
-{
-    $GLOBALS['dbi']->selectDb($db);
-
-    $change_all_collations_query = 'ALTER TABLE '
-        . PMA\libraries\Util::backquote($table)
-        . ' CONVERT TO';
-
-    list($charset) = explode('_', $tbl_collation);
-
-    $change_all_collations_query .= ' CHARACTER SET ' . $charset
-        . ($charset == $tbl_collation ? '' : ' COLLATE ' . $tbl_collation);
-
-    $GLOBALS['dbi']->query($change_all_collations_query);
-}
-
-/**
- * Move or copy a table
- *
- * @param string $db    current database name
- * @param string $table current table name
- *
- * @return void
- */
-function PMA_moveOrCopyTable($db, $table)
-{
-    /**
-     * Selects the database to work with
-     */
-    $GLOBALS['dbi']->selectDb($db);
-
-    /**
-     * $_REQUEST['target_db'] could be empty in case we came from an input field
-     * (when there are many databases, no drop-down)
-     */
-    if (empty($_REQUEST['target_db'])) {
-        $_REQUEST['target_db'] = $db;
-    }
-
-    /**
-     * A target table name has been sent to this script -> do the work
-     */
-    if (PMA_isValid($_REQUEST['new_name'])) {
-        if ($db == $_REQUEST['target_db'] && $table == $_REQUEST['new_name']) {
-            if (isset($_REQUEST['submit_move'])) {
-                $message = Message::error(__('Can\'t move table to same one!'));
-            } else {
-                $message = Message::error(__('Can\'t copy table to same one!'));
-            }
-        } else {
-            Table::moveCopy(
-                $db, $table, $_REQUEST['target_db'], $_REQUEST['new_name'],
-                $_REQUEST['what'], isset($_REQUEST['submit_move']), 'one_table'
-            );
-
-            if (isset($_REQUEST['adjust_privileges'])
-                && ! empty($_REQUEST['adjust_privileges'])
-            ) {
-                if (isset($_REQUEST['submit_move'])) {
-                    PMA_AdjustPrivileges_renameOrMoveTable(
-                        $db, $table, $_REQUEST['target_db'], $_REQUEST['new_name']
-                    );
-                } else {
-                    PMA_AdjustPrivileges_copyTable(
-                        $db, $table, $_REQUEST['target_db'], $_REQUEST['new_name']
-                    );
-                }
-
-                if (isset($_REQUEST['submit_move'])) {
-                    $message = Message::success(
-                        __(
-                            'Table %s has been moved to %s. Privileges have been '
-                            . 'adjusted.'
-                        )
-                    );
-                } else {
-                    $message = Message::success(
-                        __(
-                            'Table %s has been copied to %s. Privileges have been '
-                            . 'adjusted.'
-                        )
-                    );
-                }
-
-            } else {
-                if (isset($_REQUEST['submit_move'])) {
-                    $message = Message::success(
-                        __('Table %s has been moved to %s.')
-                    );
-                } else {
-                    $message = Message::success(
-                        __('Table %s has been copied to %s.')
-                    );
-                }
-            }
-
-            $old = PMA\libraries\Util::backquote($db) . '.'
-                . PMA\libraries\Util::backquote($table);
-            $message->addParam($old);
-            $new = PMA\libraries\Util::backquote($_REQUEST['target_db']) . '.'
-                . PMA\libraries\Util::backquote($_REQUEST['new_name']);
-            $message->addParam($new);
-
-            /* Check: Work on new table or on old table? */
-            if (isset($_REQUEST['submit_move'])
-                || PMA_isValid($_REQUEST['switch_to_new'])
-            ) {
-            }
-        }
-    } else {
-        /**
-         * No new name for the table!
-         */
-        $message = Message::error(__('The table name is empty!'));
-    }
-
-    if ($GLOBALS['is_ajax_request'] == true) {
-        $response = PMA\libraries\Response::getInstance();
-        $response->addJSON('message', $message);
-        if ($message->isSuccess()) {
-            $response->addJSON('db', $GLOBALS['db']);
-        } else {
-            $response->setRequestStatus(false);
-        }
-        exit;
-    }
-}
diff --git a/#pma/libraries/parse_analyze.lib.php b/#pma/libraries/parse_analyze.lib.php
deleted file mode 100644
index 81945467..00000000
--- a/#pma/libraries/parse_analyze.lib.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Parse and analyse a SQL query
- *
- * @package PhpMyAdmin
- */
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
-/**
- * Calls the parser on a query
- *
- * @param string $sql_query the query to parse
- * @param string $db        the current database
- *
- * @return array
- *
- * @access  public
- */
-function PMA_parseAnalyze($sql_query, $db)
-{
-    // @todo: move to returned results (also in all the calling chain)
-    $GLOBALS['unparsed_sql'] = $sql_query;
-
-    // Get details about the SQL query.
-    $analyzed_sql_results = SqlParser\Utils\Query::getAll($sql_query);
-
-    extract($analyzed_sql_results);
-    $table = '';
-
-    // If the targeted table (and database) are different than the ones that is
-    // currently browsed, edit `$db` and `$table` to match them so other elements
-    // (page headers, links, navigation panel) can be updated properly.
-    if (!empty($analyzed_sql_results['select_tables'])) {
-
-        // Previous table and database name is stored to check if it changed.
-        $prev_db = $db;
-
-        if (count($analyzed_sql_results['select_tables']) > 1) {
-
-            /**
-             * @todo if there are more than one table name in the Select:
-             * - do not extract the first table name
-             * - do not show a table name in the page header
-             * - do not display the sub-pages links)
-             */
-            $table = '';
-        } else {
-            $table = $analyzed_sql_results['select_tables'][0][0];
-            if (!empty($analyzed_sql_results['select_tables'][0][1])) {
-                $db = $analyzed_sql_results['select_tables'][0][1];
-            }
-        }
-        // There is no point checking if a reload is required if we already decided
-        // to reload. Also, no reload is required for AJAX requests.
-        if ((empty($reload)) && (empty($GLOBALS['is_ajax_request']))) {
-            // NOTE: Database names are case-insensitive.
-            $reload  = strcasecmp($db, $prev_db) != 0;
-        }
-
-        // Updating the array.
-        $analyzed_sql_results['reload'] = $reload;
-    }
-
-    return array($analyzed_sql_results, $db, $table);
-}
diff --git a/#pma/libraries/php-gettext/gettext.inc b/#pma/libraries/php-gettext/gettext.inc
deleted file mode 100644
index 397ce028..00000000
--- a/#pma/libraries/php-gettext/gettext.inc
+++ /dev/null
@@ -1,550 +0,0 @@
-<?php
-/*
-   Copyright (c) 2005 Steven Armstrong <sa at c-area dot ch>
-   Copyright (c) 2009 Danilo Segan <danilo@kvota.net>
-
-   Drop in replacement for native gettext.
-
-   This file is part of PHP-gettext.
-
-   PHP-gettext is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   PHP-gettext is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with PHP-gettext; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-*/
-/*
-LC_CTYPE        0
-LC_NUMERIC      1
-LC_TIME         2
-LC_COLLATE      3
-LC_MONETARY     4
-LC_MESSAGES     5
-LC_ALL          6
-*/
-
-// LC_MESSAGES is not available if php-gettext is not loaded
-// while the other constants are already available from session extension.
-if (!defined('LC_MESSAGES')) {
-  define('LC_MESSAGES',	5);
-}
-
-require('streams.php');
-require('gettext.php');
-
-
-// Variables
-
-global $text_domains, $default_domain, $LC_CATEGORIES, $EMULATEGETTEXT, $CURRENTLOCALE;
-$text_domains = array();
-$default_domain = 'messages';
-$LC_CATEGORIES = array('LC_CTYPE', 'LC_NUMERIC', 'LC_TIME', 'LC_COLLATE', 'LC_MONETARY', 'LC_MESSAGES', 'LC_ALL');
-$EMULATEGETTEXT = 0;
-$CURRENTLOCALE = '';
-
-/* Class to hold a single domain included in $text_domains. */
-class domain {
-  var $l10n;
-  var $path;
-  var $codeset;
-}
-
-// Utility functions
-
-/**
- * Return a list of locales to try for any POSIX-style locale specification.
- */
-function get_list_of_locales($locale) {
-  /* Figure out all possible locale names and start with the most
-   * specific ones.  I.e. for sr_CS.UTF-8@latin, look through all of
-   * sr_CS.UTF-8@latin, sr_CS@latin, sr@latin, sr_CS.UTF-8, sr_CS, sr.
-   */
-  $locale_names = array();
-  $lang = NULL;
-  $country = NULL;
-  $charset = NULL;
-  $modifier = NULL;
-  if ($locale) {
-    if (preg_match("/^(?P<lang>[a-z]{2,3})"              // language code
-                   ."(?:_(?P<country>[A-Z]{2}))?"           // country code
-                   ."(?:\.(?P<charset>[-A-Za-z0-9_]+))?"    // charset
-                   ."(?:@(?P<modifier>[-A-Za-z0-9_]+))?$/",  // @ modifier
-                   $locale, $matches)) {
-
-      if (isset($matches["lang"])) $lang = $matches["lang"];
-      if (isset($matches["country"])) $country = $matches["country"];
-      if (isset($matches["charset"])) $charset = $matches["charset"];
-      if (isset($matches["modifier"])) $modifier = $matches["modifier"];
-
-      if ($modifier) {
-        if ($country) {
-          if ($charset)
-            array_push($locale_names, "${lang}_$country.$charset@$modifier");
-          array_push($locale_names, "${lang}_$country@$modifier");
-        } elseif ($charset)
-            array_push($locale_names, "${lang}.$charset@$modifier");
-        array_push($locale_names, "$lang@$modifier");
-      }
-      if ($country) {
-        if ($charset)
-          array_push($locale_names, "${lang}_$country.$charset");
-        array_push($locale_names, "${lang}_$country");
-      } elseif ($charset)
-          array_push($locale_names, "${lang}.$charset");
-      array_push($locale_names, $lang);
-    }
-
-    // If the locale name doesn't match POSIX style, just include it as-is.
-    if (!in_array($locale, $locale_names))
-      array_push($locale_names, $locale);
-  }
-  return $locale_names;
-}
-
-/**
- * Utility function to get a StreamReader for the given text domain.
- */
-function _get_reader($domain=null, $category=5, $enable_cache=true) {
-    global $text_domains, $default_domain, $LC_CATEGORIES;
-    if (is_null($domain)) $domain = $default_domain;
-    if (!isset($text_domains[$domain]->l10n)) {
-        // get the current locale
-        $locale = _setlocale(LC_MESSAGES, 0);
-        $bound_path = isset($text_domains[$domain]->path) ?
-          $text_domains[$domain]->path : './';
-        $subpath = $LC_CATEGORIES[$category] ."/$domain.mo";
-
-        $locale_names = get_list_of_locales($locale);
-        $input = null;
-        foreach ($locale_names as $locale) {
-          $full_path = $bound_path . $locale . "/" . $subpath;
-          if (file_exists($full_path)) {
-            $input = new FileReader($full_path);
-            break;
-          }
-        }
-
-        if (!array_key_exists($domain, $text_domains)) {
-          // Initialize an empty domain object.
-          $text_domains[$domain] = new domain();
-        }
-        $text_domains[$domain]->l10n = new gettext_reader($input,
-                                                          $enable_cache);
-    }
-    return $text_domains[$domain]->l10n;
-}
-
-/**
- * Returns whether we are using our emulated gettext API or PHP built-in one.
- */
-function locale_emulation() {
-    global $EMULATEGETTEXT;
-    return $EMULATEGETTEXT;
-}
-
-/**
- * Checks if the current locale is supported on this system.
- */
-function _check_locale_and_function($function=false) {
-    global $EMULATEGETTEXT;
-    if ($function and !function_exists($function))
-        return false;
-    return !$EMULATEGETTEXT;
-}
-
-/**
- * Get the codeset for the given domain.
- */
-function _get_codeset($domain=null) {
-    global $text_domains, $default_domain, $LC_CATEGORIES;
-    if (!isset($domain)) {
-        $domain = $default_domain;
-    }
-    if (isset($text_domains[$domain]->codeset)) {
-        return $text_domains[$domain]->codeset;
-    }
-    if (!empty(ini_get('mbstring.internal_encoding'))) {
-        return ini_get('mbstring.internal_encoding');
-    }
-    return 'utf-8';
-}
-
-/**
- * Convert the given string to the encoding set by bind_textdomain_codeset.
- */
-function _encode($text) {
-    $source_encoding = 'utf-8';
-    if (function_exists('mb_detect_encoding')) {
-        $source_encoding = mb_detect_encoding($text);
-        if ($source_encoding === false) {
-            $source_encoding = 'utf-8';
-        }
-    }
-    $target_encoding = _get_codeset();
-    if ($source_encoding != $target_encoding) {
-        return mb_convert_encoding($text, $target_encoding, $source_encoding);
-    }
-    else {
-        return $text;
-    }
-}
-
-
-// Custom implementation of the standard gettext related functions
-
-/**
- * Returns passed in $locale, or environment variable $LANG if $locale == ''.
- */
-function _get_default_locale($locale) {
-  if ($locale == '') // emulate variable support
-    return getenv('LANG');
-  else
-    return $locale;
-}
-
-/**
- * Sets a requested locale, if needed emulates it.
- */
-function _setlocale($category, $locale) {
-    global $CURRENTLOCALE, $EMULATEGETTEXT;
-    if ($locale === 0) { // use === to differentiate between string "0"
-        if ($CURRENTLOCALE != '')
-            return $CURRENTLOCALE;
-        else
-            // obey LANG variable, maybe extend to support all of LC_* vars
-            // even if we tried to read locale without setting it first
-            return _setlocale($category, $CURRENTLOCALE);
-    } else {
-        if (function_exists('setlocale')) {
-          $ret = setlocale($category, $locale);
-          if (($locale == '' and !$ret) or // failed setting it by env
-              ($locale != '' and $ret != $locale)) { // failed setting it
-            // Failed setting it according to environment.
-            $CURRENTLOCALE = _get_default_locale($locale);
-            $EMULATEGETTEXT = 1;
-          } else {
-            $CURRENTLOCALE = $ret;
-            $EMULATEGETTEXT = 0;
-          }
-        } else {
-          // No function setlocale(), emulate it all.
-          $CURRENTLOCALE = _get_default_locale($locale);
-          $EMULATEGETTEXT = 1;
-        }
-        // Allow locale to be changed on the go for one translation domain.
-        global $text_domains, $default_domain;
-        if (array_key_exists($default_domain, $text_domains)) {
-            unset($text_domains[$default_domain]->l10n);
-        }
-        return $CURRENTLOCALE;
-    }
-}
-
-/**
- * Sets the path for a domain.
- */
-function _bindtextdomain($domain, $path) {
-    global $text_domains;
-    // ensure $path ends with a slash ('/' should work for both, but lets still play nice)
-    if (DIRECTORY_SEPARATOR == '\\') {
-      if ($path[strlen($path)-1] != '\\' and $path[strlen($path)-1] != '/')
-        $path .= '\\';
-    } else {
-      if ($path[strlen($path)-1] != '/')
-        $path .= '/';
-    }
-    if (!array_key_exists($domain, $text_domains)) {
-      // Initialize an empty domain object.
-      $text_domains[$domain] = new domain();
-    }
-    $text_domains[$domain]->path = $path;
-}
-
-/**
- * Specify the character encoding in which the messages from the DOMAIN message catalog will be returned.
- */
-function _bind_textdomain_codeset($domain, $codeset) {
-    global $text_domains;
-    $text_domains[$domain]->codeset = $codeset;
-}
-
-/**
- * Sets the default domain.
- */
-function _textdomain($domain) {
-    global $default_domain;
-    $default_domain = $domain;
-}
-
-/**
- * Lookup a message in the current domain.
- */
-function _gettext($msgid) {
-    $l10n = _get_reader();
-    return _encode($l10n->translate($msgid));
-}
-
-/**
- * Alias for gettext.
- */
-function __($msgid) {
-    return _gettext($msgid);
-}
-
-/**
- * Plural version of gettext.
- */
-function _ngettext($singular, $plural, $number) {
-    $l10n = _get_reader();
-    return _encode($l10n->ngettext($singular, $plural, $number));
-}
-
-/**
- * Override the current domain.
- */
-function _dgettext($domain, $msgid) {
-    $l10n = _get_reader($domain);
-    return _encode($l10n->translate($msgid));
-}
-
-/**
- * Plural version of dgettext.
- */
-function _dngettext($domain, $singular, $plural, $number) {
-    $l10n = _get_reader($domain);
-    return _encode($l10n->ngettext($singular, $plural, $number));
-}
-
-/**
- * Overrides the domain and category for a single lookup.
- */
-function _dcgettext($domain, $msgid, $category) {
-    $l10n = _get_reader($domain, $category);
-    return _encode($l10n->translate($msgid));
-}
-/**
- * Plural version of dcgettext.
- */
-function _dcngettext($domain, $singular, $plural, $number, $category) {
-    $l10n = _get_reader($domain, $category);
-    return _encode($l10n->ngettext($singular, $plural, $number));
-}
-
-/**
- * Context version of gettext.
- */
-function _pgettext($context, $msgid) {
-    $l10n = _get_reader();
-    return _encode($l10n->pgettext($context, $msgid));
-}
-
-/**
- * Override the current domain in a context gettext call.
- */
-function _dpgettext($domain, $context, $msgid) {
-    $l10n = _get_reader($domain);
-    return _encode($l10n->pgettext($context, $msgid));
-}
-
-/**
- * Overrides the domain and category for a single context-based lookup.
- */
-function _dcpgettext($domain, $context, $msgid, $category) {
-    $l10n = _get_reader($domain, $category);
-    return _encode($l10n->pgettext($context, $msgid));
-}
-
-/**
- * Context version of ngettext.
- */
-function _npgettext($context, $singular, $plural) {
-    $l10n = _get_reader();
-    return _encode($l10n->npgettext($context, $singular, $plural));
-}
-
-/**
- * Override the current domain in a context ngettext call.
- */
-function _dnpgettext($domain, $context, $singular, $plural) {
-    $l10n = _get_reader($domain);
-    return _encode($l10n->npgettext($context, $singular, $plural));
-}
-
-/**
- * Overrides the domain and category for a plural context-based lookup.
- */
-function _dcnpgettext($domain, $context, $singular, $plural, $category) {
-    $l10n = _get_reader($domain, $category);
-    return _encode($l10n->npgettext($context, $singular, $plural));
-}
-
-
-
-// Wrappers to use if the standard gettext functions are available,
-// but the current locale is not supported by the system.
-// Use the standard impl if the current locale is supported, use the
-// custom impl otherwise.
-
-function T_setlocale($category, $locale) {
-    return _setlocale($category, $locale);
-}
-
-function T_bindtextdomain($domain, $path) {
-    if (_check_locale_and_function()) return bindtextdomain($domain, $path);
-    else return _bindtextdomain($domain, $path);
-}
-function T_bind_textdomain_codeset($domain, $codeset) {
-    // bind_textdomain_codeset is available only in PHP 4.2.0+
-    if (_check_locale_and_function('bind_textdomain_codeset'))
-        return bind_textdomain_codeset($domain, $codeset);
-    else return _bind_textdomain_codeset($domain, $codeset);
-}
-function T_textdomain($domain) {
-    if (_check_locale_and_function()) return textdomain($domain);
-    else return _textdomain($domain);
-}
-function T_gettext($msgid) {
-    if (_check_locale_and_function()) return gettext($msgid);
-    else return _gettext($msgid);
-}
-function T_($msgid) {
-    if (_check_locale_and_function()) return _($msgid);
-    return __($msgid);
-}
-function T_ngettext($singular, $plural, $number) {
-    if (_check_locale_and_function())
-        return ngettext($singular, $plural, $number);
-    else return _ngettext($singular, $plural, $number);
-}
-function T_dgettext($domain, $msgid) {
-    if (_check_locale_and_function()) return dgettext($domain, $msgid);
-    else return _dgettext($domain, $msgid);
-}
-function T_dngettext($domain, $singular, $plural, $number) {
-    if (_check_locale_and_function())
-        return dngettext($domain, $singular, $plural, $number);
-    else return _dngettext($domain, $singular, $plural, $number);
-}
-function T_dcgettext($domain, $msgid, $category) {
-    if (_check_locale_and_function())
-        return dcgettext($domain, $msgid, $category);
-    else return _dcgettext($domain, $msgid, $category);
-}
-function T_dcngettext($domain, $singular, $plural, $number, $category) {
-    if (_check_locale_and_function())
-      return dcngettext($domain, $singular, $plural, $number, $category);
-    else return _dcngettext($domain, $singular, $plural, $number, $category);
-}
-
-function T_pgettext($context, $msgid) {
-  if (_check_locale_and_function('pgettext'))
-      return pgettext($context, $msgid);
-  else
-      return _pgettext($context, $msgid);
-}
-
-function T_dpgettext($domain, $context, $msgid) {
-  if (_check_locale_and_function('dpgettext'))
-      return dpgettext($domain, $context, $msgid);
-  else
-      return _dpgettext($domain, $context, $msgid);
-}
-
-function T_dcpgettext($domain, $context, $msgid, $category) {
-  if (_check_locale_and_function('dcpgettext'))
-      return dcpgettext($domain, $context, $msgid, $category);
-  else
-      return _dcpgettext($domain, $context, $msgid, $category);
-}
-
-function T_npgettext($context, $singular, $plural, $number) {
-    if (_check_locale_and_function('npgettext'))
-        return npgettext($context, $singular, $plural, $number);
-    else
-        return _npgettext($context, $singular, $plural, $number);
-}
-
-function T_dnpgettext($domain, $context, $singular, $plural, $number) {
-  if (_check_locale_and_function('dnpgettext'))
-      return dnpgettext($domain, $context, $singular, $plural, $number);
-  else
-      return _dnpgettext($domain, $context, $singular, $plural, $number);
-}
-
-function T_dcnpgettext($domain, $context, $singular, $plural,
-                       $number, $category) {
-    if (_check_locale_and_function('dcnpgettext'))
-        return dcnpgettext($domain, $context, $singular,
-                           $plural, $number, $category);
-    else
-        return _dcnpgettext($domain, $context, $singular,
-                            $plural, $number, $category);
-}
-
-
-
-// Wrappers used as a drop in replacement for the standard gettext functions
-
-if (!function_exists('gettext')) {
-    function bindtextdomain($domain, $path) {
-        return _bindtextdomain($domain, $path);
-    }
-    function bind_textdomain_codeset($domain, $codeset) {
-        return _bind_textdomain_codeset($domain, $codeset);
-    }
-    function textdomain($domain) {
-        return _textdomain($domain);
-    }
-    function gettext($msgid) {
-        return _gettext($msgid);
-    }
-    function _($msgid) {
-        return __($msgid);
-    }
-    function ngettext($singular, $plural, $number) {
-        return _ngettext($singular, $plural, $number);
-    }
-    function dgettext($domain, $msgid) {
-        return _dgettext($domain, $msgid);
-    }
-    function dngettext($domain, $singular, $plural, $number) {
-        return _dngettext($domain, $singular, $plural, $number);
-    }
-    function dcgettext($domain, $msgid, $category) {
-        return _dcgettext($domain, $msgid, $category);
-    }
-    function dcngettext($domain, $singular, $plural, $number, $category) {
-        return _dcngettext($domain, $singular, $plural, $number, $category);
-    }
-    function pgettext($context, $msgid) {
-        return _pgettext($context, $msgid);
-    }
-    function npgettext($context, $singular, $plural, $number) {
-        return _npgettext($context, $singular, $plural, $number);
-    }
-    function dpgettext($domain, $context, $msgid) {
-        return _dpgettext($domain, $context, $msgid);
-    }
-    function dnpgettext($domain, $context, $singular, $plural, $number) {
-        return _dnpgettext($domain, $context, $singular, $plural, $number);
-    }
-    function dcpgettext($domain, $context, $msgid, $category) {
-        return _dcpgettext($domain, $context, $msgid, $category);
-    }
-    function dcnpgettext($domain, $context, $singular, $plural,
-                         $number, $category) {
-      return _dcnpgettext($domain, $context, $singular, $plural,
-                          $number, $category);
-    }
-}
-
-?>
diff --git a/#pma/libraries/php-gettext/gettext.php b/#pma/libraries/php-gettext/gettext.php
deleted file mode 100644
index d712deac..00000000
--- a/#pma/libraries/php-gettext/gettext.php
+++ /dev/null
@@ -1,431 +0,0 @@
-<?php
-/*
-   Copyright (c) 2003, 2009 Danilo Segan <danilo@kvota.net>.
-   Copyright (c) 2005 Nico Kaiser <nico@siriux.net>
-
-   This file is part of PHP-gettext.
-
-   PHP-gettext is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   PHP-gettext is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with PHP-gettext; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-*/
-
-/**
- * Provides a simple gettext replacement that works independently from
- * the system's gettext abilities.
- * It can read MO files and use them for translating strings.
- * The files are passed to gettext_reader as a Stream (see streams.php)
- *
- * This version has the ability to cache all strings and translations to
- * speed up the string lookup.
- * While the cache is enabled by default, it can be switched off with the
- * second parameter in the constructor (e.g. whenusing very large MO files
- * that you don't want to keep in memory)
- */
-class gettext_reader {
-  //public:
-   var $error = 0; // public variable that holds error code (0 if no error)
-
-   //private:
-  var $BYTEORDER = 0;        // 0: low endian, 1: big endian
-  var $STREAM = NULL;
-  var $short_circuit = false;
-  var $enable_cache = false;
-  var $originals = NULL;      // offset of original table
-  var $translations = NULL;    // offset of translation table
-  var $pluralheader = NULL;    // cache header field for plural forms
-  var $total = 0;          // total string count
-  var $table_originals = NULL;  // table for original strings (offsets)
-  var $table_translations = NULL;  // table for translated strings (offsets)
-  var $cache_translations = NULL;  // original -> translation mapping
-
-
-  /* Methods */
-
-
-  /**
-   * Reads a 32bit Integer from the Stream
-   *
-   * @access private
-   * @return Integer from the Stream
-   */
-  function readint() {
-      if ($this->BYTEORDER == 0) {
-        // low endian
-        $input=unpack('V', $this->STREAM->read(4));
-        return array_shift($input);
-      } else {
-        // big endian
-        $input=unpack('N', $this->STREAM->read(4));
-        return array_shift($input);
-      }
-    }
-
-  function read($bytes) {
-    return $this->STREAM->read($bytes);
-  }
-
-  /**
-   * Reads an array of Integers from the Stream
-   *
-   * @param int count How many elements should be read
-   * @return Array of Integers
-   */
-  function readintarray($count) {
-    if ($this->BYTEORDER == 0) {
-        // low endian
-        return unpack('V'.$count, $this->STREAM->read(4 * $count));
-      } else {
-        // big endian
-        return unpack('N'.$count, $this->STREAM->read(4 * $count));
-      }
-  }
-
-  /**
-   * Constructor
-   *
-   * @param object Reader the StreamReader object
-   * @param boolean enable_cache Enable or disable caching of strings (default on)
-   */
-  public function __construct($Reader, $enable_cache = true) {
-    // If there isn't a StreamReader, turn on short circuit mode.
-    if (! $Reader || isset($Reader->error) ) {
-      $this->short_circuit = true;
-      return;
-    }
-
-    // Caching can be turned off
-    $this->enable_cache = $enable_cache;
-
-    $MAGIC1 = "\x95\x04\x12\xde";
-    $MAGIC2 = "\xde\x12\x04\x95";
-
-    $this->STREAM = $Reader;
-    $magic = $this->read(4);
-    if ($magic == $MAGIC1) {
-      $this->BYTEORDER = 1;
-    } elseif ($magic == $MAGIC2) {
-      $this->BYTEORDER = 0;
-    } else {
-      $this->error = 1; // not MO file
-      return false;
-    }
-
-    // FIXME: Do we care about revision? We should.
-    $revision = $this->readint();
-
-    $this->total = $this->readint();
-    $this->originals = $this->readint();
-    $this->translations = $this->readint();
-  }
-
-  /**
-   * Loads the translation tables from the MO file into the cache
-   * If caching is enabled, also loads all strings into a cache
-   * to speed up translation lookups
-   *
-   * @access private
-   */
-  function load_tables() {
-    if (is_array($this->cache_translations) &&
-      is_array($this->table_originals) &&
-      is_array($this->table_translations))
-      return;
-
-    /* get original and translations tables */
-    if (!is_array($this->table_originals)) {
-      $this->STREAM->seekto($this->originals);
-      $this->table_originals = $this->readintarray($this->total * 2);
-    }
-    if (!is_array($this->table_translations)) {
-      $this->STREAM->seekto($this->translations);
-      $this->table_translations = $this->readintarray($this->total * 2);
-    }
-
-    if ($this->enable_cache) {
-      $this->cache_translations = array ();
-      /* read all strings in the cache */
-      for ($i = 0; $i < $this->total; $i++) {
-        $this->STREAM->seekto($this->table_originals[$i * 2 + 2]);
-        $original = $this->STREAM->read($this->table_originals[$i * 2 + 1]);
-        $this->STREAM->seekto($this->table_translations[$i * 2 + 2]);
-        $translation = $this->STREAM->read($this->table_translations[$i * 2 + 1]);
-        $this->cache_translations[$original] = $translation;
-      }
-    }
-  }
-
-  /**
-   * Returns a string from the "originals" table
-   *
-   * @access private
-   * @param int num Offset number of original string
-   * @return string Requested string if found, otherwise ''
-   */
-  function get_original_string($num) {
-    $length = $this->table_originals[$num * 2 + 1];
-    $offset = $this->table_originals[$num * 2 + 2];
-    if (! $length)
-      return '';
-    $this->STREAM->seekto($offset);
-    $data = $this->STREAM->read($length);
-    return (string)$data;
-  }
-
-  /**
-   * Returns a string from the "translations" table
-   *
-   * @access private
-   * @param int num Offset number of original string
-   * @return string Requested string if found, otherwise ''
-   */
-  function get_translation_string($num) {
-    $length = $this->table_translations[$num * 2 + 1];
-    $offset = $this->table_translations[$num * 2 + 2];
-    if (! $length)
-      return '';
-    $this->STREAM->seekto($offset);
-    $data = $this->STREAM->read($length);
-    return (string)$data;
-  }
-
-  /**
-   * Binary search for string
-   *
-   * @access private
-   * @param string string
-   * @param int start (internally used in recursive function)
-   * @param int end (internally used in recursive function)
-   * @return int string number (offset in originals table)
-   */
-  function find_string($string, $start = -1, $end = -1) {
-    if (($start == -1) or ($end == -1)) {
-      // find_string is called with only one parameter, set start end end
-      $start = 0;
-      $end = $this->total;
-    }
-    if (abs($start - $end) <= 1) {
-      // We're done, now we either found the string, or it doesn't exist
-      $txt = $this->get_original_string($start);
-      if ($string == $txt)
-        return $start;
-      else
-        return -1;
-    } else if ($start > $end) {
-      // start > end -> turn around and start over
-      return $this->find_string($string, $end, $start);
-    } else {
-      // Divide table in two parts
-      $half = (int)(($start + $end) / 2);
-      $cmp = strcmp($string, $this->get_original_string($half));
-      if ($cmp == 0)
-        // string is exactly in the middle => return it
-        return $half;
-      else if ($cmp < 0)
-        // The string is in the upper half
-        return $this->find_string($string, $start, $half);
-      else
-        // The string is in the lower half
-        return $this->find_string($string, $half, $end);
-    }
-  }
-
-  /**
-   * Translates a string
-   *
-   * @access public
-   * @param string string to be translated
-   * @return string translated string (or original, if not found)
-   */
-  function translate($string) {
-    if ($this->short_circuit)
-      return $string;
-    $this->load_tables();
-
-    if ($this->enable_cache) {
-      // Caching enabled, get translated string from cache
-      if (array_key_exists($string, $this->cache_translations))
-        return $this->cache_translations[$string];
-      else
-        return $string;
-    } else {
-      // Caching not enabled, try to find string
-      $num = $this->find_string($string);
-      if ($num == -1)
-        return $string;
-      else
-        return $this->get_translation_string($num);
-    }
-  }
-
-  /**
-   * Sanitize plural form expression for use in PHP eval call.
-   *
-   * @access private
-   * @return string sanitized plural form expression
-   */
-  function sanitize_plural_expression($expr) {
-    // Get rid of disallowed characters.
-    $expr = preg_replace('@[^a-zA-Z0-9_:;\(\)\?\|\&=!<>+*/\%-]@', '', $expr);
-
-    // Add parenthesis for tertiary '?' operator.
-    $expr .= ';';
-    $res = '';
-    $p = 0;
-    for ($i = 0; $i < strlen($expr); $i++) {
-      $ch = $expr[$i];
-      switch ($ch) {
-      case '?':
-        $res .= ' ? (';
-        $p++;
-        break;
-      case ':':
-        $res .= ') : (';
-        break;
-      case ';':
-        $res .= str_repeat( ')', $p) . ';';
-        $p = 0;
-        break;
-      default:
-        $res .= $ch;
-      }
-    }
-    return $res;
-  }
-
-  /**
-   * Parse full PO header and extract only plural forms line.
-   *
-   * @access private
-   * @return string verbatim plural form header field
-   */
-  function extract_plural_forms_header_from_po_header($header) {
-    if (preg_match("/(^|\n)plural-forms: ([^\n]*)\n/i", $header, $regs))
-      $expr = $regs[2];
-    else
-      $expr = "nplurals=2; plural=n == 1 ? 0 : 1;";
-    return $expr;
-  }
-
-  /**
-   * Get possible plural forms from MO header
-   *
-   * @access private
-   * @return string plural form header
-   */
-  function get_plural_forms() {
-    // lets assume message number 0 is header
-    // this is true, right?
-    $this->load_tables();
-
-    // cache header field for plural forms
-    if (! is_string($this->pluralheader)) {
-      if ($this->enable_cache) {
-        $header = $this->cache_translations[""];
-      } else {
-        $header = $this->get_translation_string(0);
-      }
-      $expr = $this->extract_plural_forms_header_from_po_header($header);
-      $this->pluralheader = $this->sanitize_plural_expression($expr);
-    }
-    return $this->pluralheader;
-  }
-
-  /**
-   * Detects which plural form to take
-   *
-   * @access private
-   * @param n count
-   * @return int array index of the right plural form
-   */
-  function select_string($n) {
-    $string = $this->get_plural_forms();
-    $string = str_replace('nplurals',"\$total",$string);
-    $string = str_replace("n",$n,$string);
-    $string = str_replace('plural',"\$plural",$string);
-
-    $total = 0;
-    $plural = 0;
-
-    eval("$string");
-    if ($plural >= $total) $plural = $total - 1;
-    return $plural;
-  }
-
-  /**
-   * Plural version of gettext
-   *
-   * @access public
-   * @param string single
-   * @param string plural
-   * @param string number
-   * @return translated plural form
-   */
-  function ngettext($single, $plural, $number) {
-    if ($this->short_circuit) {
-      if ($number != 1)
-        return $plural;
-      else
-        return $single;
-    }
-
-    // find out the appropriate form
-    $select = $this->select_string($number);
-
-    // this should contains all strings separated by NULLs
-    $key = $single . chr(0) . $plural;
-
-
-    if ($this->enable_cache) {
-      if (! array_key_exists($key, $this->cache_translations)) {
-        return ($number != 1) ? $plural : $single;
-      } else {
-        $result = $this->cache_translations[$key];
-        $list = explode(chr(0), $result);
-        return $list[$select];
-      }
-    } else {
-      $num = $this->find_string($key);
-      if ($num == -1) {
-        return ($number != 1) ? $plural : $single;
-      } else {
-        $result = $this->get_translation_string($num);
-        $list = explode(chr(0), $result);
-        return $list[$select];
-      }
-    }
-  }
-
-  function pgettext($context, $msgid) {
-    $key = $context . chr(4) . $msgid;
-    $ret = $this->translate($key);
-    if (strpos($ret, "\004") !== FALSE) {
-      return $msgid;
-    } else {
-      return $ret;
-    }
-  }
-
-  function npgettext($context, $singular, $plural, $number) {
-    $key = $context . chr(4) . $singular;
-    $ret = $this->ngettext($key, $plural, $number);
-    if (strpos($ret, "\004") !== FALSE) {
-      return $singular;
-    } else {
-      return $ret;
-    }
-
-  }
-}
-
diff --git a/#pma/libraries/php-gettext/streams.php b/#pma/libraries/php-gettext/streams.php
deleted file mode 100644
index 19cd9b2c..00000000
--- a/#pma/libraries/php-gettext/streams.php
+++ /dev/null
@@ -1,166 +0,0 @@
-<?php
-/*
-   Copyright (c) 2003, 2005, 2006, 2009 Danilo Segan <danilo@kvota.net>.
-
-   This file is part of PHP-gettext.
-
-   PHP-gettext is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   PHP-gettext is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with PHP-gettext; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-*/
-
-
-  // Simple class to wrap file streams, string streams, etc.
-  // seek is essential, and it should be byte stream
-class StreamReader {
-  // should return a string [FIXME: perhaps return array of bytes?]
-  function read($bytes) {
-    return false;
-  }
-
-  // should return new position
-  function seekto($position) {
-    return false;
-  }
-
-  // returns current position
-  function currentpos() {
-    return false;
-  }
-
-  // returns length of entire stream (limit for seekto()s)
-  function length() {
-    return false;
-  }
-};
-
-class StringReader {
-  var $_pos;
-  var $_str;
-
-  public function __construct($str='') {
-    $this->_str = $str;
-    $this->_pos = 0;
-  }
-
-  function read($bytes) {
-    $data = substr($this->_str, $this->_pos, $bytes);
-    $this->_pos += $bytes;
-    if (strlen($this->_str)<$this->_pos)
-      $this->_pos = strlen($this->_str);
-
-    return $data;
-  }
-
-  function seekto($pos) {
-    $this->_pos = $pos;
-    if (strlen($this->_str)<$this->_pos)
-      $this->_pos = strlen($this->_str);
-    return $this->_pos;
-  }
-
-  function currentpos() {
-    return $this->_pos;
-  }
-
-  function length() {
-    return strlen($this->_str);
-  }
-
-};
-
-
-class FileReader {
-  var $_pos;
-  var $_fd;
-  var $_length;
-
-  public function __construct($filename) {
-    if (file_exists($filename)) {
-
-      $this->_length=filesize($filename);
-      $this->_pos = 0;
-      $this->_fd = fopen($filename,'rb');
-      if (!$this->_fd) {
-        $this->error = 3; // Cannot read file, probably permissions
-        return false;
-      }
-    } else {
-      $this->error = 2; // File doesn't exist
-      return false;
-    }
-  }
-
-  function read($bytes) {
-    if ($bytes) {
-      fseek($this->_fd, $this->_pos);
-
-      // PHP 5.1.1 does not read more than 8192 bytes in one fread()
-      // the discussions at PHP Bugs suggest it's the intended behaviour
-      $data = '';
-      while ($bytes > 0) {
-        $chunk  = fread($this->_fd, $bytes);
-        $data  .= $chunk;
-        $bytes -= strlen($chunk);
-      }
-      $this->_pos = ftell($this->_fd);
-
-      return $data;
-    } else return '';
-  }
-
-  function seekto($pos) {
-    fseek($this->_fd, $pos);
-    $this->_pos = ftell($this->_fd);
-    return $this->_pos;
-  }
-
-  function currentpos() {
-    return $this->_pos;
-  }
-
-  function length() {
-    return $this->_length;
-  }
-
-  function close() {
-    fclose($this->_fd);
-  }
-
-};
-
-// Preloads entire file in memory first, then creates a StringReader
-// over it (it assumes knowledge of StringReader internals)
-class CachedFileReader extends StringReader {
-  public function __construct($filename) {
-    if (file_exists($filename)) {
-
-      $length=filesize($filename);
-      $fd = fopen($filename,'rb');
-
-      if (!$fd) {
-        $this->error = 3; // Cannot read file, probably permissions
-        return false;
-      }
-      $this->_str = fread($fd, $length);
-      fclose($fd);
-
-    } else {
-      $this->error = 2; // File doesn't exist
-      return false;
-    }
-  }
-};
-
-
diff --git a/#pma/libraries/phpseclib/Crypt/AES.php b/#pma/libraries/phpseclib/Crypt/AES.php
deleted file mode 100644
index a0902907..00000000
--- a/#pma/libraries/phpseclib/Crypt/AES.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-
-/**
- * Pure-PHP implementation of AES.
- *
- * Uses mcrypt, if available/possible, and an internal implementation, otherwise.
- *
- * PHP version 5
- *
- * NOTE: Since AES.php is (for compatibility and phpseclib-historical reasons) virtually
- * just a wrapper to Rijndael.php you may consider using Rijndael.php instead of
- * to save one include_once().
- *
- * If {@link self::setKeyLength() setKeyLength()} isn't called, it'll be calculated from
- * {@link self::setKey() setKey()}.  ie. if the key is 128-bits, the key length will be 128-bits.  If it's 136-bits
- * it'll be null-padded to 192-bits and 192 bits will be the key length until {@link self::setKey() setKey()}
- * is called, again, at which point, it'll be recalculated.
- *
- * Since \phpseclib\Crypt\AES extends \phpseclib\Crypt\Rijndael, some functions are available to be called that, in the context of AES, don't
- * make a whole lot of sense.  {@link self::setBlockLength() setBlockLength()}, for instance.  Calling that function,
- * however possible, won't do anything (AES has a fixed block length whereas Rijndael has a variable one).
- *
- * Here's a short example of how to use this library:
- * <code>
- * <?php
- *    include 'vendor/autoload.php';
- *
- *    $aes = new \phpseclib\Crypt\AES();
- *
- *    $aes->setKey('abcdefghijklmnop');
- *
- *    $size = 10 * 1024;
- *    $plaintext = '';
- *    for ($i = 0; $i < $size; $i++) {
- *        $plaintext.= 'a';
- *    }
- *
- *    echo $aes->decrypt($aes->encrypt($plaintext));
- * ?>
- * </code>
- *
- * @category  Crypt
- * @package   AES
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2008 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-namespace phpseclib\Crypt;
-
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
-use phpseclib\Crypt\Rijndael;
-
-/**
- * Pure-PHP implementation of AES.
- *
- * @package AES
- * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
- */
-class AES extends Rijndael
-{
-    /**
-     * Dummy function
-     *
-     * Since \phpseclib\Crypt\AES extends \phpseclib\Crypt\Rijndael, this function is, technically, available, but it doesn't do anything.
-     *
-     * @see \phpseclib\Crypt\Rijndael::setBlockLength()
-     * @access public
-     * @param int $length
-     */
-    function setBlockLength($length)
-    {
-        return;
-    }
-
-    /**
-     * Sets the key length
-     *
-     * Valid key lengths are 128, 192, and 256.  If the length is less than 128, it will be rounded up to
-     * 128.  If the length is greater than 128 and invalid, it will be rounded down to the closest valid amount.
-     *
-     * @see \phpseclib\Crypt\Rijndael:setKeyLength()
-     * @access public
-     * @param int $length
-     */
-    function setKeyLength($length)
-    {
-        switch ($length) {
-            case 160:
-                $length = 192;
-                break;
-            case 224:
-                $length = 256;
-        }
-        parent::setKeyLength($length);
-    }
-
-    /**
-     * Sets the key.
-     *
-     * Rijndael supports five different key lengths, AES only supports three.
-     *
-     * @see \phpseclib\Crypt\Rijndael:setKey()
-     * @see setKeyLength()
-     * @access public
-     * @param string $key
-     */
-    function setKey($key)
-    {
-        parent::setKey($key);
-
-        if (!$this->explicit_key_length) {
-            $length = strlen($key);
-            switch (true) {
-                case $length <= 16:
-                    $this->key_length = 16;
-                    break;
-                case $length <= 24:
-                    $this->key_length = 24;
-                    break;
-                default:
-                    $this->key_length = 32;
-            }
-            $this->_setEngine();
-        }
-    }
-}
diff --git a/#pma/libraries/phpseclib/Crypt/Base.php b/#pma/libraries/phpseclib/Crypt/Base.php
deleted file mode 100644
index e1d0b8b2..00000000
--- a/#pma/libraries/phpseclib/Crypt/Base.php
+++ /dev/null
@@ -1,2549 +0,0 @@
-<?php
-
-/**
- * Base Class for all \phpseclib\Crypt\* cipher classes
- *
- * PHP version 5
- *
- * Internally for phpseclib developers:
- *  If you plan to add a new cipher class, please note following rules:
- *
- *  - The new \phpseclib\Crypt\* cipher class should extend \phpseclib\Crypt\Base
- *
- *  - Following methods are then required to be overridden/overloaded:
- *
- *    - _encryptBlock()
- *
- *    - _decryptBlock()
- *
- *    - _setupKey()
- *
- *  - All other methods are optional to be overridden/overloaded
- *
- *  - Look at the source code of the current ciphers how they extend \phpseclib\Crypt\Base
- *    and take one of them as a start up for the new cipher class.
- *
- *  - Please read all the other comments/notes/hints here also for each class var/method
- *
- * @category  Crypt
- * @package   Base
- * @author    Jim Wigginton <terrafrost@php.net>
- * @author    Hans-Juergen Petrich <petrich@tronic-media.com>
- * @copyright 2007 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib\Crypt;
-
-use phpseclib\Crypt\Hash;
-
-/**
- * Base Class for all \phpseclib\Crypt\* cipher classes
- *
- * @package Base
- * @author  Jim Wigginton <terrafrost@php.net>
- * @author  Hans-Juergen Petrich <petrich@tronic-media.com>
- */
-abstract class Base
-{
-    /**#@+
-     * @access public
-     * @see \phpseclib\Crypt\Base::encrypt()
-     * @see \phpseclib\Crypt\Base::decrypt()
-     */
-    /**
-     * Encrypt / decrypt using the Counter mode.
-     *
-     * Set to -1 since that's what Crypt/Random.php uses to index the CTR mode.
-     *
-     * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Counter_.28CTR.29
-     */
-    const MODE_CTR = -1;
-    /**
-     * Encrypt / decrypt using the Electronic Code Book mode.
-     *
-     * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Electronic_codebook_.28ECB.29
-     */
-    const MODE_ECB = 1;
-    /**
-     * Encrypt / decrypt using the Code Book Chaining mode.
-     *
-     * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Cipher-block_chaining_.28CBC.29
-     */
-    const MODE_CBC = 2;
-    /**
-     * Encrypt / decrypt using the Cipher Feedback mode.
-     *
-     * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Cipher_feedback_.28CFB.29
-     */
-    const MODE_CFB = 3;
-    /**
-     * Encrypt / decrypt using the Output Feedback mode.
-     *
-     * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Output_feedback_.28OFB.29
-     */
-    const MODE_OFB = 4;
-    /**
-     * Encrypt / decrypt using streaming mode.
-     */
-    const MODE_STREAM = 5;
-    /**#@-*/
-
-    /**
-     * Whirlpool available flag
-     *
-     * @see \phpseclib\Crypt\Base::_hashInlineCryptFunction()
-     * @var bool
-     * @access private
-     */
-    static $WHIRLPOOL_AVAILABLE;
-
-    /**#@+
-     * @access private
-     * @see \phpseclib\Crypt\Base::__construct()
-     */
-    /**
-     * Base value for the internal implementation $engine switch
-     */
-    const ENGINE_INTERNAL = 1;
-    /**
-     * Base value for the mcrypt implementation $engine switch
-     */
-    const ENGINE_MCRYPT = 2;
-    /**
-     * Base value for the mcrypt implementation $engine switch
-     */
-    const ENGINE_OPENSSL = 3;
-    /**#@-*/
-
-    /**
-     * The Encryption Mode
-     *
-     * @see self::__construct()
-     * @var int
-     * @access private
-     */
-    var $mode;
-
-    /**
-     * The Block Length of the block cipher
-     *
-     * @var int
-     * @access private
-     */
-    var $block_size = 16;
-
-    /**
-     * The Key
-     *
-     * @see self::setKey()
-     * @var string
-     * @access private
-     */
-    var $key = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
-
-    /**
-     * The Initialization Vector
-     *
-     * @see self::setIV()
-     * @var string
-     * @access private
-     */
-    var $iv;
-
-    /**
-     * A "sliding" Initialization Vector
-     *
-     * @see self::enableContinuousBuffer()
-     * @see self::_clearBuffers()
-     * @var string
-     * @access private
-     */
-    var $encryptIV;
-
-    /**
-     * A "sliding" Initialization Vector
-     *
-     * @see self::enableContinuousBuffer()
-     * @see self::_clearBuffers()
-     * @var string
-     * @access private
-     */
-    var $decryptIV;
-
-    /**
-     * Continuous Buffer status
-     *
-     * @see self::enableContinuousBuffer()
-     * @var bool
-     * @access private
-     */
-    var $continuousBuffer = false;
-
-    /**
-     * Encryption buffer for CTR, OFB and CFB modes
-     *
-     * @see self::encrypt()
-     * @see self::_clearBuffers()
-     * @var array
-     * @access private
-     */
-    var $enbuffer;
-
-    /**
-     * Decryption buffer for CTR, OFB and CFB modes
-     *
-     * @see self::decrypt()
-     * @see self::_clearBuffers()
-     * @var array
-     * @access private
-     */
-    var $debuffer;
-
-    /**
-     * mcrypt resource for encryption
-     *
-     * The mcrypt resource can be recreated every time something needs to be created or it can be created just once.
-     * Since mcrypt operates in continuous mode, by default, it'll need to be recreated when in non-continuous mode.
-     *
-     * @see self::encrypt()
-     * @var resource
-     * @access private
-     */
-    var $enmcrypt;
-
-    /**
-     * mcrypt resource for decryption
-     *
-     * The mcrypt resource can be recreated every time something needs to be created or it can be created just once.
-     * Since mcrypt operates in continuous mode, by default, it'll need to be recreated when in non-continuous mode.
-     *
-     * @see self::decrypt()
-     * @var resource
-     * @access private
-     */
-    var $demcrypt;
-
-    /**
-     * Does the enmcrypt resource need to be (re)initialized?
-     *
-     * @see \phpseclib\Crypt\Twofish::setKey()
-     * @see \phpseclib\Crypt\Twofish::setIV()
-     * @var bool
-     * @access private
-     */
-    var $enchanged = true;
-
-    /**
-     * Does the demcrypt resource need to be (re)initialized?
-     *
-     * @see \phpseclib\Crypt\Twofish::setKey()
-     * @see \phpseclib\Crypt\Twofish::setIV()
-     * @var bool
-     * @access private
-     */
-    var $dechanged = true;
-
-    /**
-     * mcrypt resource for CFB mode
-     *
-     * mcrypt's CFB mode, in (and only in) buffered context,
-     * is broken, so phpseclib implements the CFB mode by it self,
-     * even when the mcrypt php extension is available.
-     *
-     * In order to do the CFB-mode work (fast) phpseclib
-     * use a separate ECB-mode mcrypt resource.
-     *
-     * @link http://phpseclib.sourceforge.net/cfb-demo.phps
-     * @see self::encrypt()
-     * @see self::decrypt()
-     * @see self::_setupMcrypt()
-     * @var resource
-     * @access private
-     */
-    var $ecb;
-
-    /**
-     * Optimizing value while CFB-encrypting
-     *
-     * Only relevant if $continuousBuffer enabled
-     * and $engine == self::ENGINE_MCRYPT
-     *
-     * It's faster to re-init $enmcrypt if
-     * $buffer bytes > $cfb_init_len than
-     * using the $ecb resource furthermore.
-     *
-     * This value depends of the chosen cipher
-     * and the time it would be needed for it's
-     * initialization [by mcrypt_generic_init()]
-     * which, typically, depends on the complexity
-     * on its internaly Key-expanding algorithm.
-     *
-     * @see self::encrypt()
-     * @var int
-     * @access private
-     */
-    var $cfb_init_len = 600;
-
-    /**
-     * Does internal cipher state need to be (re)initialized?
-     *
-     * @see self::setKey()
-     * @see self::setIV()
-     * @see self::disableContinuousBuffer()
-     * @var bool
-     * @access private
-     */
-    var $changed = true;
-
-    /**
-     * Padding status
-     *
-     * @see self::enablePadding()
-     * @var bool
-     * @access private
-     */
-    var $padding = true;
-
-    /**
-     * Is the mode one that is paddable?
-     *
-     * @see self::__construct()
-     * @var bool
-     * @access private
-     */
-    var $paddable = false;
-
-    /**
-     * Holds which crypt engine internaly should be use,
-     * which will be determined automatically on __construct()
-     *
-     * Currently available $engines are:
-     * - self::ENGINE_OPENSSL  (very fast, php-extension: openssl, extension_loaded('openssl') required)
-     * - self::ENGINE_MCRYPT   (fast, php-extension: mcrypt, extension_loaded('mcrypt') required)
-     * - self::ENGINE_INTERNAL (slower, pure php-engine, no php-extension required)
-     *
-     * @see self::_setEngine()
-     * @see self::encrypt()
-     * @see self::decrypt()
-     * @var int
-     * @access private
-     */
-    var $engine;
-
-    /**
-     * Holds the preferred crypt engine
-     *
-     * @see self::_setEngine()
-     * @see self::setPreferredEngine()
-     * @var int
-     * @access private
-     */
-    var $preferredEngine;
-
-    /**
-     * The mcrypt specific name of the cipher
-     *
-     * Only used if $engine == self::ENGINE_MCRYPT
-     *
-     * @link http://www.php.net/mcrypt_module_open
-     * @link http://www.php.net/mcrypt_list_algorithms
-     * @see self::_setupMcrypt()
-     * @var string
-     * @access private
-     */
-    var $cipher_name_mcrypt;
-
-    /**
-     * The openssl specific name of the cipher
-     *
-     * Only used if $engine == self::ENGINE_OPENSSL
-     *
-     * @link http://www.php.net/openssl-get-cipher-methods
-     * @var string
-     * @access private
-     */
-    var $cipher_name_openssl;
-
-    /**
-     * The openssl specific name of the cipher in ECB mode
-     *
-     * If OpenSSL does not support the mode we're trying to use (CTR)
-     * it can still be emulated with ECB mode.
-     *
-     * @link http://www.php.net/openssl-get-cipher-methods
-     * @var string
-     * @access private
-     */
-    var $cipher_name_openssl_ecb;
-
-    /**
-     * The default salt used by setPassword()
-     *
-     * @see self::setPassword()
-     * @var string
-     * @access private
-     */
-    var $password_default_salt = 'phpseclib/salt';
-
-    /**
-     * The name of the performance-optimized callback function
-     *
-     * Used by encrypt() / decrypt()
-     * only if $engine == self::ENGINE_INTERNAL
-     *
-     * @see self::encrypt()
-     * @see self::decrypt()
-     * @see self::_setupInlineCrypt()
-     * @see self::$use_inline_crypt
-     * @var Callback
-     * @access private
-     */
-    var $inline_crypt;
-
-    /**
-     * Holds whether performance-optimized $inline_crypt() can/should be used.
-     *
-     * @see self::encrypt()
-     * @see self::decrypt()
-     * @see self::inline_crypt
-     * @var mixed
-     * @access private
-     */
-    var $use_inline_crypt;
-
-    /**
-     * If OpenSSL can be used in ECB but not in CTR we can emulate CTR
-     *
-     * @see self::_openssl_ctr_process()
-     * @var bool
-     * @access private
-     */
-    var $openssl_emulate_ctr = false;
-
-    /**
-     * Determines what options are passed to openssl_encrypt/decrypt
-     *
-     * @see self::isValidEngine()
-     * @var mixed
-     * @access private
-     */
-    var $openssl_options;
-
-    /**
-     * Has the key length explicitly been set or should it be derived from the key, itself?
-     *
-     * @see self::setKeyLength()
-     * @var bool
-     * @access private
-     */
-    var $explicit_key_length = false;
-
-    /**
-     * Don't truncate / null pad key
-     *
-     * @see self::_clearBuffers()
-     * @var bool
-     * @access private
-     */
-    var $skip_key_adjustment = false;
-
-    /**
-     * Default Constructor.
-     *
-     * Determines whether or not the mcrypt extension should be used.
-     *
-     * $mode could be:
-     *
-     * - self::MODE_ECB
-     *
-     * - self::MODE_CBC
-     *
-     * - self::MODE_CTR
-     *
-     * - self::MODE_CFB
-     *
-     * - self::MODE_OFB
-     *
-     * If not explicitly set, self::MODE_CBC will be used.
-     *
-     * @param int $mode
-     * @access public
-     */
-    function __construct($mode = self::MODE_CBC)
-    {
-        // $mode dependent settings
-        switch ($mode) {
-            case self::MODE_ECB:
-                $this->paddable = true;
-                $this->mode = self::MODE_ECB;
-                break;
-            case self::MODE_CTR:
-            case self::MODE_CFB:
-            case self::MODE_OFB:
-            case self::MODE_STREAM:
-                $this->mode = $mode;
-                break;
-            case self::MODE_CBC:
-            default:
-                $this->paddable = true;
-                $this->mode = self::MODE_CBC;
-        }
-
-        $this->_setEngine();
-
-        // Determining whether inline crypting can be used by the cipher
-        if ($this->use_inline_crypt !== false && function_exists('create_function')) {
-            $this->use_inline_crypt = true;
-        }
-    }
-
-    /**
-     * Sets the initialization vector. (optional)
-     *
-     * SetIV is not required when self::MODE_ECB (or ie for AES: \phpseclib\Crypt\AES::MODE_ECB) is being used.  If not explicitly set, it'll be assumed
-     * to be all zero's.
-     *
-     * @access public
-     * @param string $iv
-     * @internal Can be overwritten by a sub class, but does not have to be
-     */
-    function setIV($iv)
-    {
-        if ($this->mode == self::MODE_ECB) {
-            return;
-        }
-
-        $this->iv = $iv;
-        $this->changed = true;
-    }
-
-    /**
-     * Sets the key length.
-     *
-     * Keys with explicitly set lengths need to be treated accordingly
-     *
-     * @access public
-     * @param int $length
-     */
-    function setKeyLength($length)
-    {
-        $this->explicit_key_length = true;
-        $this->changed = true;
-        $this->_setEngine();
-    }
-
-    /**
-     * Returns the current key length in bits
-     *
-     * @access public
-     * @return int
-     */
-    function getKeyLength()
-    {
-        return $this->key_length << 3;
-    }
-
-    /**
-     * Returns the current block length in bits
-     *
-     * @access public
-     * @return int
-     */
-    function getBlockLength()
-    {
-        return $this->block_size << 3;
-    }
-
-    /**
-     * Sets the key.
-     *
-     * The min/max length(s) of the key depends on the cipher which is used.
-     * If the key not fits the length(s) of the cipher it will paded with null bytes
-     * up to the closest valid key length.  If the key is more than max length,
-     * we trim the excess bits.
-     *
-     * If the key is not explicitly set, it'll be assumed to be all null bytes.
-     *
-     * @access public
-     * @param string $key
-     * @internal Could, but not must, extend by the child Crypt_* class
-     */
-    function setKey($key)
-    {
-        if (!$this->explicit_key_length) {
-            $this->setKeyLength(strlen($key) << 3);
-            $this->explicit_key_length = false;
-        }
-
-        $this->key = $key;
-        $this->changed = true;
-        $this->_setEngine();
-    }
-
-    /**
-     * Sets the password.
-     *
-     * Depending on what $method is set to, setPassword()'s (optional) parameters are as follows:
-     *     {@link http://en.wikipedia.org/wiki/PBKDF2 pbkdf2} or pbkdf1:
-     *         $hash, $salt, $count, $dkLen
-     *
-     *         Where $hash (default = sha1) currently supports the following hashes: see: Crypt/Hash.php
-     *
-     * @see Crypt/Hash.php
-     * @param string $password
-     * @param string $method
-     * @return bool
-     * @access public
-     * @internal Could, but not must, extend by the child Crypt_* class
-     */
-    function setPassword($password, $method = 'pbkdf2')
-    {
-        $key = '';
-
-        switch ($method) {
-            default: // 'pbkdf2' or 'pbkdf1'
-                $func_args = func_get_args();
-
-                // Hash function
-                $hash = isset($func_args[2]) ? $func_args[2] : 'sha1';
-
-                // WPA and WPA2 use the SSID as the salt
-                $salt = isset($func_args[3]) ? $func_args[3] : $this->password_default_salt;
-
-                // RFC2898#section-4.2 uses 1,000 iterations by default
-                // WPA and WPA2 use 4,096.
-                $count = isset($func_args[4]) ? $func_args[4] : 1000;
-
-                // Keylength
-                if (isset($func_args[5])) {
-                    $dkLen = $func_args[5];
-                } else {
-                    $dkLen = $method == 'pbkdf1' ? 2 * $this->key_length : $this->key_length;
-                }
-
-                switch (true) {
-                    case $method == 'pbkdf1':
-                        $hashObj = new Hash();
-                        $hashObj->setHash($hash);
-                        if ($dkLen > $hashObj->getLength()) {
-                            user_error('Derived key too long');
-                            return false;
-                        }
-                        $t = $password . $salt;
-                        for ($i = 0; $i < $count; ++$i) {
-                            $t = $hashObj->hash($t);
-                        }
-                        $key = substr($t, 0, $dkLen);
-
-                        $this->setKey(substr($key, 0, $dkLen >> 1));
-                        $this->setIV(substr($key, $dkLen >> 1));
-
-                        return true;
-                    // Determining if php[>=5.5.0]'s hash_pbkdf2() function avail- and useable
-                    case !function_exists('hash_pbkdf2'):
-                    case !function_exists('hash_algos'):
-                    case !in_array($hash, hash_algos()):
-                        $i = 1;
-                        while (strlen($key) < $dkLen) {
-                            $hmac = new Hash();
-                            $hmac->setHash($hash);
-                            $hmac->setKey($password);
-                            $f = $u = $hmac->hash($salt . pack('N', $i++));
-                            for ($j = 2; $j <= $count; ++$j) {
-                                $u = $hmac->hash($u);
-                                $f^= $u;
-                            }
-                            $key.= $f;
-                        }
-                        $key = substr($key, 0, $dkLen);
-                        break;
-                    default:
-                        $key = hash_pbkdf2($hash, $password, $salt, $count, $dkLen, true);
-                }
-        }
-
-        $this->setKey($key);
-
-        return true;
-    }
-
-    /**
-     * Encrypts a message.
-     *
-     * $plaintext will be padded with additional bytes such that it's length is a multiple of the block size. Other cipher
-     * implementations may or may not pad in the same manner.  Other common approaches to padding and the reasons why it's
-     * necessary are discussed in the following
-     * URL:
-     *
-     * {@link http://www.di-mgt.com.au/cryptopad.html http://www.di-mgt.com.au/cryptopad.html}
-     *
-     * An alternative to padding is to, separately, send the length of the file.  This is what SSH, in fact, does.
-     * strlen($plaintext) will still need to be a multiple of the block size, however, arbitrary values can be added to make it that
-     * length.
-     *
-     * @see self::decrypt()
-     * @access public
-     * @param string $plaintext
-     * @return string $ciphertext
-     * @internal Could, but not must, extend by the child Crypt_* class
-     */
-    function encrypt($plaintext)
-    {
-        if ($this->paddable) {
-            $plaintext = $this->_pad($plaintext);
-        }
-
-        if ($this->engine === self::ENGINE_OPENSSL) {
-            if ($this->changed) {
-                $this->_clearBuffers();
-                $this->changed = false;
-            }
-            switch ($this->mode) {
-                case self::MODE_STREAM:
-                    return openssl_encrypt($plaintext, $this->cipher_name_openssl, $this->key, $this->openssl_options);
-                case self::MODE_ECB:
-                    $result = openssl_encrypt($plaintext, $this->cipher_name_openssl, $this->key, $this->openssl_options);
-                    return !defined('OPENSSL_RAW_DATA') ? substr($result, 0, -$this->block_size) : $result;
-                case self::MODE_CBC:
-                    $result = openssl_encrypt($plaintext, $this->cipher_name_openssl, $this->key, $this->openssl_options, $this->encryptIV);
-                    if ($this->continuousBuffer) {
-                        $this->encryptIV = substr($result, -$this->block_size);
-                    }
-                    return !defined('OPENSSL_RAW_DATA') ? substr($result, 0, -$this->block_size) : $result;
-                case self::MODE_CTR:
-                    return $this->_openssl_ctr_process($plaintext, $this->encryptIV, $this->enbuffer);
-                case self::MODE_CFB:
-                    // cfb loosely routines inspired by openssl's:
-                    // {@link http://cvs.openssl.org/fileview?f=openssl/crypto/modes/cfb128.c&v=1.3.2.2.2.1}
-                    $ciphertext = '';
-                    if ($this->continuousBuffer) {
-                        $iv = &$this->encryptIV;
-                        $pos = &$this->enbuffer['pos'];
-                    } else {
-                        $iv = $this->encryptIV;
-                        $pos = 0;
-                    }
-                    $len = strlen($plaintext);
-                    $i = 0;
-                    if ($pos) {
-                        $orig_pos = $pos;
-                        $max = $this->block_size - $pos;
-                        if ($len >= $max) {
-                            $i = $max;
-                            $len-= $max;
-                            $pos = 0;
-                        } else {
-                            $i = $len;
-                            $pos+= $len;
-                            $len = 0;
-                        }
-                        // ie. $i = min($max, $len), $len-= $i, $pos+= $i, $pos%= $blocksize
-                        $ciphertext = substr($iv, $orig_pos) ^ $plaintext;
-                        $iv = substr_replace($iv, $ciphertext, $orig_pos, $i);
-                        $plaintext = substr($plaintext, $i);
-                    }
-
-                    $overflow = $len % $this->block_size;
-
-                    if ($overflow) {
-                        $ciphertext.= openssl_encrypt(substr($plaintext, 0, -$overflow) . str_repeat("\0", $this->block_size), $this->cipher_name_openssl, $this->key, $this->openssl_options, $iv);
-                        $iv = $this->_string_pop($ciphertext, $this->block_size);
-
-                        $size = $len - $overflow;
-                        $block = $iv ^ substr($plaintext, -$overflow);
-                        $iv = substr_replace($iv, $block, 0, $overflow);
-                        $ciphertext.= $block;
-                        $pos = $overflow;
-                    } elseif ($len) {
-                        $ciphertext = openssl_encrypt($plaintext, $this->cipher_name_openssl, $this->key, $this->openssl_options, $iv);
-                        $iv = substr($ciphertext, -$this->block_size);
-                    }
-
-                    return $ciphertext;
-                case self::MODE_OFB:
-                    return $this->_openssl_ofb_process($plaintext, $this->encryptIV, $this->enbuffer);
-            }
-        }
-
-        if ($this->engine === self::ENGINE_MCRYPT) {
-            if ($this->changed) {
-                $this->_setupMcrypt();
-                $this->changed = false;
-            }
-            if ($this->enchanged) {
-                mcrypt_generic_init($this->enmcrypt, $this->key, $this->encryptIV);
-                $this->enchanged = false;
-            }
-
-            // re: {@link http://phpseclib.sourceforge.net/cfb-demo.phps}
-            // using mcrypt's default handing of CFB the above would output two different things.  using phpseclib's
-            // rewritten CFB implementation the above outputs the same thing twice.
-            if ($this->mode == self::MODE_CFB && $this->continuousBuffer) {
-                $block_size = $this->block_size;
-                $iv = &$this->encryptIV;
-                $pos = &$this->enbuffer['pos'];
-                $len = strlen($plaintext);
-                $ciphertext = '';
-                $i = 0;
-                if ($pos) {
-                    $orig_pos = $pos;
-                    $max = $block_size - $pos;
-                    if ($len >= $max) {
-                        $i = $max;
-                        $len-= $max;
-                        $pos = 0;
-                    } else {
-                        $i = $len;
-                        $pos+= $len;
-                        $len = 0;
-                    }
-                    $ciphertext = substr($iv, $orig_pos) ^ $plaintext;
-                    $iv = substr_replace($iv, $ciphertext, $orig_pos, $i);
-                    $this->enbuffer['enmcrypt_init'] = true;
-                }
-                if ($len >= $block_size) {
-                    if ($this->enbuffer['enmcrypt_init'] === false || $len > $this->cfb_init_len) {
-                        if ($this->enbuffer['enmcrypt_init'] === true) {
-                            mcrypt_generic_init($this->enmcrypt, $this->key, $iv);
-                            $this->enbuffer['enmcrypt_init'] = false;
-                        }
-                        $ciphertext.= mcrypt_generic($this->enmcrypt, substr($plaintext, $i, $len - $len % $block_size));
-                        $iv = substr($ciphertext, -$block_size);
-                        $len%= $block_size;
-                    } else {
-                        while ($len >= $block_size) {
-                            $iv = mcrypt_generic($this->ecb, $iv) ^ substr($plaintext, $i, $block_size);
-                            $ciphertext.= $iv;
-                            $len-= $block_size;
-                            $i+= $block_size;
-                        }
-                    }
-                }
-
-                if ($len) {
-                    $iv = mcrypt_generic($this->ecb, $iv);
-                    $block = $iv ^ substr($plaintext, -$len);
-                    $iv = substr_replace($iv, $block, 0, $len);
-                    $ciphertext.= $block;
-                    $pos = $len;
-                }
-
-                return $ciphertext;
-            }
-
-            $ciphertext = mcrypt_generic($this->enmcrypt, $plaintext);
-
-            if (!$this->continuousBuffer) {
-                mcrypt_generic_init($this->enmcrypt, $this->key, $this->encryptIV);
-            }
-
-            return $ciphertext;
-        }
-
-        if ($this->changed) {
-            $this->_setup();
-            $this->changed = false;
-        }
-        if ($this->use_inline_crypt) {
-            $inline = $this->inline_crypt;
-            return $inline('encrypt', $this, $plaintext);
-        }
-
-        $buffer = &$this->enbuffer;
-        $block_size = $this->block_size;
-        $ciphertext = '';
-        switch ($this->mode) {
-            case self::MODE_ECB:
-                for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
-                    $ciphertext.= $this->_encryptBlock(substr($plaintext, $i, $block_size));
-                }
-                break;
-            case self::MODE_CBC:
-                $xor = $this->encryptIV;
-                for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
-                    $block = substr($plaintext, $i, $block_size);
-                    $block = $this->_encryptBlock($block ^ $xor);
-                    $xor = $block;
-                    $ciphertext.= $block;
-                }
-                if ($this->continuousBuffer) {
-                    $this->encryptIV = $xor;
-                }
-                break;
-            case self::MODE_CTR:
-                $xor = $this->encryptIV;
-                if (strlen($buffer['ciphertext'])) {
-                    for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
-                        $block = substr($plaintext, $i, $block_size);
-                        if (strlen($block) > strlen($buffer['ciphertext'])) {
-                            $buffer['ciphertext'].= $this->_encryptBlock($xor);
-                        }
-                        $this->_increment_str($xor);
-                        $key = $this->_string_shift($buffer['ciphertext'], $block_size);
-                        $ciphertext.= $block ^ $key;
-                    }
-                } else {
-                    for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
-                        $block = substr($plaintext, $i, $block_size);
-                        $key = $this->_encryptBlock($xor);
-                        $this->_increment_str($xor);
-                        $ciphertext.= $block ^ $key;
-                    }
-                }
-                if ($this->continuousBuffer) {
-                    $this->encryptIV = $xor;
-                    if ($start = strlen($plaintext) % $block_size) {
-                        $buffer['ciphertext'] = substr($key, $start) . $buffer['ciphertext'];
-                    }
-                }
-                break;
-            case self::MODE_CFB:
-                // cfb loosely routines inspired by openssl's:
-                // {@link http://cvs.openssl.org/fileview?f=openssl/crypto/modes/cfb128.c&v=1.3.2.2.2.1}
-                if ($this->continuousBuffer) {
-                    $iv = &$this->encryptIV;
-                    $pos = &$buffer['pos'];
-                } else {
-                    $iv = $this->encryptIV;
-                    $pos = 0;
-                }
-                $len = strlen($plaintext);
-                $i = 0;
-                if ($pos) {
-                    $orig_pos = $pos;
-                    $max = $block_size - $pos;
-                    if ($len >= $max) {
-                        $i = $max;
-                        $len-= $max;
-                        $pos = 0;
-                    } else {
-                        $i = $len;
-                        $pos+= $len;
-                        $len = 0;
-                    }
-                    // ie. $i = min($max, $len), $len-= $i, $pos+= $i, $pos%= $blocksize
-                    $ciphertext = substr($iv, $orig_pos) ^ $plaintext;
-                    $iv = substr_replace($iv, $ciphertext, $orig_pos, $i);
-                }
-                while ($len >= $block_size) {
-                    $iv = $this->_encryptBlock($iv) ^ substr($plaintext, $i, $block_size);
-                    $ciphertext.= $iv;
-                    $len-= $block_size;
-                    $i+= $block_size;
-                }
-                if ($len) {
-                    $iv = $this->_encryptBlock($iv);
-                    $block = $iv ^ substr($plaintext, $i);
-                    $iv = substr_replace($iv, $block, 0, $len);
-                    $ciphertext.= $block;
-                    $pos = $len;
-                }
-                break;
-            case self::MODE_OFB:
-                $xor = $this->encryptIV;
-                if (strlen($buffer['xor'])) {
-                    for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
-                        $block = substr($plaintext, $i, $block_size);
-                        if (strlen($block) > strlen($buffer['xor'])) {
-                            $xor = $this->_encryptBlock($xor);
-                            $buffer['xor'].= $xor;
-                        }
-                        $key = $this->_string_shift($buffer['xor'], $block_size);
-                        $ciphertext.= $block ^ $key;
-                    }
-                } else {
-                    for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
-                        $xor = $this->_encryptBlock($xor);
-                        $ciphertext.= substr($plaintext, $i, $block_size) ^ $xor;
-                    }
-                    $key = $xor;
-                }
-                if ($this->continuousBuffer) {
-                    $this->encryptIV = $xor;
-                    if ($start = strlen($plaintext) % $block_size) {
-                        $buffer['xor'] = substr($key, $start) . $buffer['xor'];
-                    }
-                }
-                break;
-            case self::MODE_STREAM:
-                $ciphertext = $this->_encryptBlock($plaintext);
-                break;
-        }
-
-        return $ciphertext;
-    }
-
-    /**
-     * Decrypts a message.
-     *
-     * If strlen($ciphertext) is not a multiple of the block size, null bytes will be added to the end of the string until
-     * it is.
-     *
-     * @see self::encrypt()
-     * @access public
-     * @param string $ciphertext
-     * @return string $plaintext
-     * @internal Could, but not must, extend by the child Crypt_* class
-     */
-    function decrypt($ciphertext)
-    {
-        if ($this->paddable) {
-            // we pad with chr(0) since that's what mcrypt_generic does.  to quote from {@link http://www.php.net/function.mcrypt-generic}:
-            // "The data is padded with "\0" to make sure the length of the data is n * blocksize."
-            $ciphertext = str_pad($ciphertext, strlen($ciphertext) + ($this->block_size - strlen($ciphertext) % $this->block_size) % $this->block_size, chr(0));
-        }
-
-        if ($this->engine === self::ENGINE_OPENSSL) {
-            if ($this->changed) {
-                $this->_clearBuffers();
-                $this->changed = false;
-            }
-            switch ($this->mode) {
-                case self::MODE_STREAM:
-                    $plaintext = openssl_decrypt($ciphertext, $this->cipher_name_openssl, $this->key, $this->openssl_options);
-                    break;
-                case self::MODE_ECB:
-                    if (!defined('OPENSSL_RAW_DATA')) {
-                        $ciphertext.= openssl_encrypt('', $this->cipher_name_openssl_ecb, $this->key, true);
-                    }
-                    $plaintext = openssl_decrypt($ciphertext, $this->cipher_name_openssl, $this->key, $this->openssl_options);
-                    break;
-                case self::MODE_CBC:
-                    if (!defined('OPENSSL_RAW_DATA')) {
-                        $padding = str_repeat(chr($this->block_size), $this->block_size) ^ substr($ciphertext, -$this->block_size);
-                        $ciphertext.= substr(openssl_encrypt($padding, $this->cipher_name_openssl_ecb, $this->key, true), 0, $this->block_size);
-                    }
-                    $plaintext = openssl_decrypt($ciphertext, $this->cipher_name_openssl, $this->key, $this->openssl_options, $this->decryptIV);
-                    if ($this->continuousBuffer) {
-                        $this->decryptIV = substr($ciphertext, -$this->block_size);
-                    }
-                    break;
-                case self::MODE_CTR:
-                    $plaintext = $this->_openssl_ctr_process($ciphertext, $this->decryptIV, $this->debuffer);
-                    break;
-                case self::MODE_CFB:
-                    // cfb loosely routines inspired by openssl's:
-                    // {@link http://cvs.openssl.org/fileview?f=openssl/crypto/modes/cfb128.c&v=1.3.2.2.2.1}
-                    $plaintext = '';
-                    if ($this->continuousBuffer) {
-                        $iv = &$this->decryptIV;
-                        $pos = &$this->buffer['pos'];
-                    } else {
-                        $iv = $this->decryptIV;
-                        $pos = 0;
-                    }
-                    $len = strlen($ciphertext);
-                    $i = 0;
-                    if ($pos) {
-                        $orig_pos = $pos;
-                        $max = $this->block_size - $pos;
-                        if ($len >= $max) {
-                            $i = $max;
-                            $len-= $max;
-                            $pos = 0;
-                        } else {
-                            $i = $len;
-                            $pos+= $len;
-                            $len = 0;
-                        }
-                        // ie. $i = min($max, $len), $len-= $i, $pos+= $i, $pos%= $this->blocksize
-                        $plaintext = substr($iv, $orig_pos) ^ $ciphertext;
-                        $iv = substr_replace($iv, substr($ciphertext, 0, $i), $orig_pos, $i);
-                        $ciphertext = substr($ciphertext, $i);
-                    }
-                    $overflow = $len % $this->block_size;
-                    if ($overflow) {
-                        $plaintext.= openssl_decrypt(substr($ciphertext, 0, -$overflow), $this->cipher_name_openssl, $this->key, $this->openssl_options, $iv);
-                        if ($len - $overflow) {
-                            $iv = substr($ciphertext, -$overflow - $this->block_size, -$overflow);
-                        }
-                        $iv = openssl_encrypt(str_repeat("\0", $this->block_size), $this->cipher_name_openssl, $this->key, $this->openssl_options, $iv);
-                        $plaintext.= $iv ^ substr($ciphertext, -$overflow);
-                        $iv = substr_replace($iv, substr($ciphertext, -$overflow), 0, $overflow);
-                        $pos = $overflow;
-                    } elseif ($len) {
-                        $plaintext.= openssl_decrypt($ciphertext, $this->cipher_name_openssl, $this->key, $this->openssl_options, $iv);
-                        $iv = substr($ciphertext, -$this->block_size);
-                    }
-                    break;
-                case self::MODE_OFB:
-                    $plaintext = $this->_openssl_ofb_process($ciphertext, $this->decryptIV, $this->debuffer);
-            }
-
-            return $this->paddable ? $this->_unpad($plaintext) : $plaintext;
-        }
-
-        if ($this->engine === self::ENGINE_MCRYPT) {
-            $block_size = $this->block_size;
-            if ($this->changed) {
-                $this->_setupMcrypt();
-                $this->changed = false;
-            }
-            if ($this->dechanged) {
-                mcrypt_generic_init($this->demcrypt, $this->key, $this->decryptIV);
-                $this->dechanged = false;
-            }
-
-            if ($this->mode == self::MODE_CFB && $this->continuousBuffer) {
-                $iv = &$this->decryptIV;
-                $pos = &$this->debuffer['pos'];
-                $len = strlen($ciphertext);
-                $plaintext = '';
-                $i = 0;
-                if ($pos) {
-                    $orig_pos = $pos;
-                    $max = $block_size - $pos;
-                    if ($len >= $max) {
-                        $i = $max;
-                        $len-= $max;
-                        $pos = 0;
-                    } else {
-                        $i = $len;
-                        $pos+= $len;
-                        $len = 0;
-                    }
-                    // ie. $i = min($max, $len), $len-= $i, $pos+= $i, $pos%= $blocksize
-                    $plaintext = substr($iv, $orig_pos) ^ $ciphertext;
-                    $iv = substr_replace($iv, substr($ciphertext, 0, $i), $orig_pos, $i);
-                }
-                if ($len >= $block_size) {
-                    $cb = substr($ciphertext, $i, $len - $len % $block_size);
-                    $plaintext.= mcrypt_generic($this->ecb, $iv . $cb) ^ $cb;
-                    $iv = substr($cb, -$block_size);
-                    $len%= $block_size;
-                }
-                if ($len) {
-                    $iv = mcrypt_generic($this->ecb, $iv);
-                    $plaintext.= $iv ^ substr($ciphertext, -$len);
-                    $iv = substr_replace($iv, substr($ciphertext, -$len), 0, $len);
-                    $pos = $len;
-                }
-
-                return $plaintext;
-            }
-
-            $plaintext = mdecrypt_generic($this->demcrypt, $ciphertext);
-
-            if (!$this->continuousBuffer) {
-                mcrypt_generic_init($this->demcrypt, $this->key, $this->decryptIV);
-            }
-
-            return $this->paddable ? $this->_unpad($plaintext) : $plaintext;
-        }
-
-        if ($this->changed) {
-            $this->_setup();
-            $this->changed = false;
-        }
-        if ($this->use_inline_crypt) {
-            $inline = $this->inline_crypt;
-            return $inline('decrypt', $this, $ciphertext);
-        }
-
-        $block_size = $this->block_size;
-
-        $buffer = &$this->debuffer;
-        $plaintext = '';
-        switch ($this->mode) {
-            case self::MODE_ECB:
-                for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
-                    $plaintext.= $this->_decryptBlock(substr($ciphertext, $i, $block_size));
-                }
-                break;
-            case self::MODE_CBC:
-                $xor = $this->decryptIV;
-                for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
-                    $block = substr($ciphertext, $i, $block_size);
-                    $plaintext.= $this->_decryptBlock($block) ^ $xor;
-                    $xor = $block;
-                }
-                if ($this->continuousBuffer) {
-                    $this->decryptIV = $xor;
-                }
-                break;
-            case self::MODE_CTR:
-                $xor = $this->decryptIV;
-                if (strlen($buffer['ciphertext'])) {
-                    for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
-                        $block = substr($ciphertext, $i, $block_size);
-                        if (strlen($block) > strlen($buffer['ciphertext'])) {
-                            $buffer['ciphertext'].= $this->_encryptBlock($xor);
-                            $this->_increment_str($xor);
-                        }
-                        $key = $this->_string_shift($buffer['ciphertext'], $block_size);
-                        $plaintext.= $block ^ $key;
-                    }
-                } else {
-                    for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
-                        $block = substr($ciphertext, $i, $block_size);
-                        $key = $this->_encryptBlock($xor);
-                        $this->_increment_str($xor);
-                        $plaintext.= $block ^ $key;
-                    }
-                }
-                if ($this->continuousBuffer) {
-                    $this->decryptIV = $xor;
-                    if ($start = strlen($ciphertext) % $block_size) {
-                        $buffer['ciphertext'] = substr($key, $start) . $buffer['ciphertext'];
-                    }
-                }
-                break;
-            case self::MODE_CFB:
-                if ($this->continuousBuffer) {
-                    $iv = &$this->decryptIV;
-                    $pos = &$buffer['pos'];
-                } else {
-                    $iv = $this->decryptIV;
-                    $pos = 0;
-                }
-                $len = strlen($ciphertext);
-                $i = 0;
-                if ($pos) {
-                    $orig_pos = $pos;
-                    $max = $block_size - $pos;
-                    if ($len >= $max) {
-                        $i = $max;
-                        $len-= $max;
-                        $pos = 0;
-                    } else {
-                        $i = $len;
-                        $pos+= $len;
-                        $len = 0;
-                    }
-                    // ie. $i = min($max, $len), $len-= $i, $pos+= $i, $pos%= $blocksize
-                    $plaintext = substr($iv, $orig_pos) ^ $ciphertext;
-                    $iv = substr_replace($iv, substr($ciphertext, 0, $i), $orig_pos, $i);
-                }
-                while ($len >= $block_size) {
-                    $iv = $this->_encryptBlock($iv);
-                    $cb = substr($ciphertext, $i, $block_size);
-                    $plaintext.= $iv ^ $cb;
-                    $iv = $cb;
-                    $len-= $block_size;
-                    $i+= $block_size;
-                }
-                if ($len) {
-                    $iv = $this->_encryptBlock($iv);
-                    $plaintext.= $iv ^ substr($ciphertext, $i);
-                    $iv = substr_replace($iv, substr($ciphertext, $i), 0, $len);
-                    $pos = $len;
-                }
-                break;
-            case self::MODE_OFB:
-                $xor = $this->decryptIV;
-                if (strlen($buffer['xor'])) {
-                    for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
-                        $block = substr($ciphertext, $i, $block_size);
-                        if (strlen($block) > strlen($buffer['xor'])) {
-                            $xor = $this->_encryptBlock($xor);
-                            $buffer['xor'].= $xor;
-                        }
-                        $key = $this->_string_shift($buffer['xor'], $block_size);
-                        $plaintext.= $block ^ $key;
-                    }
-                } else {
-                    for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
-                        $xor = $this->_encryptBlock($xor);
-                        $plaintext.= substr($ciphertext, $i, $block_size) ^ $xor;
-                    }
-                    $key = $xor;
-                }
-                if ($this->continuousBuffer) {
-                    $this->decryptIV = $xor;
-                    if ($start = strlen($ciphertext) % $block_size) {
-                        $buffer['xor'] = substr($key, $start) . $buffer['xor'];
-                    }
-                }
-                break;
-            case self::MODE_STREAM:
-                $plaintext = $this->_decryptBlock($ciphertext);
-                break;
-        }
-        return $this->paddable ? $this->_unpad($plaintext) : $plaintext;
-    }
-
-    /**
-     * OpenSSL CTR Processor
-     *
-     * PHP's OpenSSL bindings do not operate in continuous mode so we'll wrap around it. Since the keystream
-     * for CTR is the same for both encrypting and decrypting this function is re-used by both Base::encrypt()
-     * and Base::decrypt(). Also, OpenSSL doesn't implement CTR for all of it's symmetric ciphers so this
-     * function will emulate CTR with ECB when necesary.
-     *
-     * @see self::encrypt()
-     * @see self::decrypt()
-     * @param string $plaintext
-     * @param string $encryptIV
-     * @param array $buffer
-     * @return string
-     * @access private
-     */
-    function _openssl_ctr_process($plaintext, &$encryptIV, &$buffer)
-    {
-        $ciphertext = '';
-
-        $block_size = $this->block_size;
-        $key = $this->key;
-
-        if ($this->openssl_emulate_ctr) {
-            $xor = $encryptIV;
-            if (strlen($buffer['ciphertext'])) {
-                for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
-                    $block = substr($plaintext, $i, $block_size);
-                    if (strlen($block) > strlen($buffer['ciphertext'])) {
-                        $result = openssl_encrypt($xor, $this->cipher_name_openssl_ecb, $key, $this->openssl_options);
-                        $result = !defined('OPENSSL_RAW_DATA') ? substr($result, 0, -$this->block_size) : $result;
-                        $buffer['ciphertext'].= $result;
-                    }
-                    $this->_increment_str($xor);
-                    $otp = $this->_string_shift($buffer['ciphertext'], $block_size);
-                    $ciphertext.= $block ^ $otp;
-                }
-            } else {
-                for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
-                    $block = substr($plaintext, $i, $block_size);
-                    $otp = openssl_encrypt($xor, $this->cipher_name_openssl_ecb, $key, $this->openssl_options);
-                    $otp = !defined('OPENSSL_RAW_DATA') ? substr($otp, 0, -$this->block_size) : $otp;
-                    $this->_increment_str($xor);
-                    $ciphertext.= $block ^ $otp;
-                }
-            }
-            if ($this->continuousBuffer) {
-                $encryptIV = $xor;
-                if ($start = strlen($plaintext) % $block_size) {
-                    $buffer['ciphertext'] = substr($key, $start) . $buffer['ciphertext'];
-                }
-            }
-
-            return $ciphertext;
-        }
-
-        if (strlen($buffer['ciphertext'])) {
-            $ciphertext = $plaintext ^ $this->_string_shift($buffer['ciphertext'], strlen($plaintext));
-            $plaintext = substr($plaintext, strlen($ciphertext));
-
-            if (!strlen($plaintext)) {
-                return $ciphertext;
-            }
-        }
-
-        $overflow = strlen($plaintext) % $block_size;
-        if ($overflow) {
-            $plaintext2 = $this->_string_pop($plaintext, $overflow); // ie. trim $plaintext to a multiple of $block_size and put rest of $plaintext in $plaintext2
-            $encrypted = openssl_encrypt($plaintext . str_repeat("\0", $block_size), $this->cipher_name_openssl, $key, $this->openssl_options, $encryptIV);
-            $temp = $this->_string_pop($encrypted, $block_size);
-            $ciphertext.= $encrypted . ($plaintext2 ^ $temp);
-            if ($this->continuousBuffer) {
-                $buffer['ciphertext'] = substr($temp, $overflow);
-                $encryptIV = $temp;
-            }
-        } elseif (!strlen($buffer['ciphertext'])) {
-            $ciphertext.= openssl_encrypt($plaintext . str_repeat("\0", $block_size), $this->cipher_name_openssl, $key, $this->openssl_options, $encryptIV);
-            $temp = $this->_string_pop($ciphertext, $block_size);
-            if ($this->continuousBuffer) {
-                $encryptIV = $temp;
-            }
-        }
-        if ($this->continuousBuffer) {
-            if (!defined('OPENSSL_RAW_DATA')) {
-                $encryptIV.= openssl_encrypt('', $this->cipher_name_openssl_ecb, $key, $this->openssl_options);
-            }
-            $encryptIV = openssl_decrypt($encryptIV, $this->cipher_name_openssl_ecb, $key, $this->openssl_options);
-            if ($overflow) {
-                $this->_increment_str($encryptIV);
-            }
-        }
-
-        return $ciphertext;
-    }
-
-    /**
-     * OpenSSL OFB Processor
-     *
-     * PHP's OpenSSL bindings do not operate in continuous mode so we'll wrap around it. Since the keystream
-     * for OFB is the same for both encrypting and decrypting this function is re-used by both Base::encrypt()
-     * and Base::decrypt().
-     *
-     * @see self::encrypt()
-     * @see self::decrypt()
-     * @param string $plaintext
-     * @param string $encryptIV
-     * @param array $buffer
-     * @return string
-     * @access private
-     */
-    function _openssl_ofb_process($plaintext, &$encryptIV, &$buffer)
-    {
-        if (strlen($buffer['xor'])) {
-            $ciphertext = $plaintext ^ $buffer['xor'];
-            $buffer['xor'] = substr($buffer['xor'], strlen($ciphertext));
-            $plaintext = substr($plaintext, strlen($ciphertext));
-        } else {
-            $ciphertext = '';
-        }
-
-        $block_size = $this->block_size;
-
-        $len = strlen($plaintext);
-        $key = $this->key;
-        $overflow = $len % $block_size;
-
-        if (strlen($plaintext)) {
-            if ($overflow) {
-                $ciphertext.= openssl_encrypt(substr($plaintext, 0, -$overflow) . str_repeat("\0", $block_size), $this->cipher_name_openssl, $key, $this->openssl_options, $encryptIV);
-                $xor = $this->_string_pop($ciphertext, $block_size);
-                if ($this->continuousBuffer) {
-                    $encryptIV = $xor;
-                }
-                $ciphertext.= $this->_string_shift($xor, $overflow) ^ substr($plaintext, -$overflow);
-                if ($this->continuousBuffer) {
-                    $buffer['xor'] = $xor;
-                }
-            } else {
-                $ciphertext = openssl_encrypt($plaintext, $this->cipher_name_openssl, $key, $this->openssl_options, $encryptIV);
-                if ($this->continuousBuffer) {
-                    $encryptIV = substr($ciphertext, -$block_size) ^ substr($plaintext, -$block_size);
-                }
-            }
-        }
-
-        return $ciphertext;
-    }
-
-    /**
-     * phpseclib <-> OpenSSL Mode Mapper
-     *
-     * May need to be overwritten by classes extending this one in some cases
-     *
-     * @return int
-     * @access private
-     */
-    function _openssl_translate_mode()
-    {
-        switch ($this->mode) {
-            case self::MODE_ECB:
-                return 'ecb';
-            case self::MODE_CBC:
-                return 'cbc';
-            case self::MODE_CTR:
-                return 'ctr';
-            case self::MODE_CFB:
-                return 'cfb';
-            case self::MODE_OFB:
-                return 'ofb';
-        }
-    }
-
-    /**
-     * Pad "packets".
-     *
-     * Block ciphers working by encrypting between their specified [$this->]block_size at a time
-     * If you ever need to encrypt or decrypt something that isn't of the proper length, it becomes necessary to
-     * pad the input so that it is of the proper length.
-     *
-     * Padding is enabled by default.  Sometimes, however, it is undesirable to pad strings.  Such is the case in SSH,
-     * where "packets" are padded with random bytes before being encrypted.  Unpad these packets and you risk stripping
-     * away characters that shouldn't be stripped away. (SSH knows how many bytes are added because the length is
-     * transmitted separately)
-     *
-     * @see self::disablePadding()
-     * @access public
-     */
-    function enablePadding()
-    {
-        $this->padding = true;
-    }
-
-    /**
-     * Do not pad packets.
-     *
-     * @see self::enablePadding()
-     * @access public
-     */
-    function disablePadding()
-    {
-        $this->padding = false;
-    }
-
-    /**
-     * Treat consecutive "packets" as if they are a continuous buffer.
-     *
-     * Say you have a 32-byte plaintext $plaintext.  Using the default behavior, the two following code snippets
-     * will yield different outputs:
-     *
-     * <code>
-     *    echo $rijndael->encrypt(substr($plaintext,  0, 16));
-     *    echo $rijndael->encrypt(substr($plaintext, 16, 16));
-     * </code>
-     * <code>
-     *    echo $rijndael->encrypt($plaintext);
-     * </code>
-     *
-     * The solution is to enable the continuous buffer.  Although this will resolve the above discrepancy, it creates
-     * another, as demonstrated with the following:
-     *
-     * <code>
-     *    $rijndael->encrypt(substr($plaintext, 0, 16));
-     *    echo $rijndael->decrypt($rijndael->encrypt(substr($plaintext, 16, 16)));
-     * </code>
-     * <code>
-     *    echo $rijndael->decrypt($rijndael->encrypt(substr($plaintext, 16, 16)));
-     * </code>
-     *
-     * With the continuous buffer disabled, these would yield the same output.  With it enabled, they yield different
-     * outputs.  The reason is due to the fact that the initialization vector's change after every encryption /
-     * decryption round when the continuous buffer is enabled.  When it's disabled, they remain constant.
-     *
-     * Put another way, when the continuous buffer is enabled, the state of the \phpseclib\Crypt\*() object changes after each
-     * encryption / decryption round, whereas otherwise, it'd remain constant.  For this reason, it's recommended that
-     * continuous buffers not be used.  They do offer better security and are, in fact, sometimes required (SSH uses them),
-     * however, they are also less intuitive and more likely to cause you problems.
-     *
-     * @see self::disableContinuousBuffer()
-     * @access public
-     * @internal Could, but not must, extend by the child Crypt_* class
-     */
-    function enableContinuousBuffer()
-    {
-        if ($this->mode == self::MODE_ECB) {
-            return;
-        }
-
-        $this->continuousBuffer = true;
-
-        $this->_setEngine();
-    }
-
-    /**
-     * Treat consecutive packets as if they are a discontinuous buffer.
-     *
-     * The default behavior.
-     *
-     * @see self::enableContinuousBuffer()
-     * @access public
-     * @internal Could, but not must, extend by the child Crypt_* class
-     */
-    function disableContinuousBuffer()
-    {
-        if ($this->mode == self::MODE_ECB) {
-            return;
-        }
-        if (!$this->continuousBuffer) {
-            return;
-        }
-
-        $this->continuousBuffer = false;
-        $this->changed = true;
-
-        $this->_setEngine();
-    }
-
-    /**
-     * Test for engine validity
-     *
-     * @see self::__construct()
-     * @param int $engine
-     * @access public
-     * @return bool
-     */
-    function isValidEngine($engine)
-    {
-        switch ($engine) {
-            case self::ENGINE_OPENSSL:
-                if ($this->mode == self::MODE_STREAM && $this->continuousBuffer) {
-                    return false;
-                }
-                $this->openssl_emulate_ctr = false;
-                $result = $this->cipher_name_openssl &&
-                          extension_loaded('openssl') &&
-                          // PHP 5.3.0 - 5.3.2 did not let you set IV's
-                          version_compare(PHP_VERSION, '5.3.3', '>=');
-                if (!$result) {
-                    return false;
-                }
-
-                // prior to PHP 5.4.0 OPENSSL_RAW_DATA and OPENSSL_ZERO_PADDING were not defined. instead of expecting an integer
-                // $options openssl_encrypt expected a boolean $raw_data.
-                if (!defined('OPENSSL_RAW_DATA')) {
-                    $this->openssl_options = true;
-                } else {
-                    $this->openssl_options = OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING;
-                }
-
-                $methods = openssl_get_cipher_methods();
-                if (in_array($this->cipher_name_openssl, $methods)) {
-                    return true;
-                }
-                // not all of openssl's symmetric cipher's support ctr. for those
-                // that don't we'll emulate it
-                switch ($this->mode) {
-                    case self::MODE_CTR:
-                        if (in_array($this->cipher_name_openssl_ecb, $methods)) {
-                            $this->openssl_emulate_ctr = true;
-                            return true;
-                        }
-                }
-                return false;
-            case self::ENGINE_MCRYPT:
-                return $this->cipher_name_mcrypt &&
-                       extension_loaded('mcrypt') &&
-                       in_array($this->cipher_name_mcrypt, mcrypt_list_algorithms());
-            case self::ENGINE_INTERNAL:
-                return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Sets the preferred crypt engine
-     *
-     * Currently, $engine could be:
-     *
-     * - \phpseclib\Crypt\Base::ENGINE_OPENSSL  [very fast]
-     *
-     * - \phpseclib\Crypt\Base::ENGINE_MCRYPT   [fast]
-     *
-     * - \phpseclib\Crypt\Base::ENGINE_INTERNAL [slow]
-     *
-     * If the preferred crypt engine is not available the fastest available one will be used
-     *
-     * @see self::__construct()
-     * @param int $engine
-     * @access public
-     */
-    function setPreferredEngine($engine)
-    {
-        switch ($engine) {
-            //case self::ENGINE_OPENSSL;
-            case self::ENGINE_MCRYPT:
-            case self::ENGINE_INTERNAL:
-                $this->preferredEngine = $engine;
-                break;
-            default:
-                $this->preferredEngine = self::ENGINE_OPENSSL;
-        }
-
-        $this->_setEngine();
-    }
-
-    /**
-     * Returns the engine currently being utilized
-     *
-     * @see self::_setEngine()
-     * @access public
-     */
-    function getEngine()
-    {
-        return $this->engine;
-    }
-
-    /**
-     * Sets the engine as appropriate
-     *
-     * @see self::__construct()
-     * @access private
-     */
-    function _setEngine()
-    {
-        $this->engine = null;
-
-        $candidateEngines = array(
-            $this->preferredEngine,
-            self::ENGINE_OPENSSL,
-            self::ENGINE_MCRYPT
-        );
-        foreach ($candidateEngines as $engine) {
-            if ($this->isValidEngine($engine)) {
-                $this->engine = $engine;
-                break;
-            }
-        }
-        if (!$this->engine) {
-            $this->engine = self::ENGINE_INTERNAL;
-        }
-
-        if ($this->engine != self::ENGINE_MCRYPT && $this->enmcrypt) {
-            // Closing the current mcrypt resource(s). _mcryptSetup() will, if needed,
-            // (re)open them with the module named in $this->cipher_name_mcrypt
-            mcrypt_module_close($this->enmcrypt);
-            mcrypt_module_close($this->demcrypt);
-            $this->enmcrypt = null;
-            $this->demcrypt = null;
-
-            if ($this->ecb) {
-                mcrypt_module_close($this->ecb);
-                $this->ecb = null;
-            }
-        }
-
-        $this->changed = true;
-    }
-
-    /**
-     * Encrypts a block
-     *
-     * Note: Must be extended by the child \phpseclib\Crypt\* class
-     *
-     * @access private
-     * @param string $in
-     * @return string
-     */
-    abstract function _encryptBlock($in);
-
-    /**
-     * Decrypts a block
-     *
-     * Note: Must be extended by the child \phpseclib\Crypt\* class
-     *
-     * @access private
-     * @param string $in
-     * @return string
-     */
-    abstract function _decryptBlock($in);
-
-    /**
-     * Setup the key (expansion)
-     *
-     * Only used if $engine == self::ENGINE_INTERNAL
-     *
-     * Note: Must extend by the child \phpseclib\Crypt\* class
-     *
-     * @see self::_setup()
-     * @access private
-     */
-    abstract function _setupKey();
-
-    /**
-     * Setup the self::ENGINE_INTERNAL $engine
-     *
-     * (re)init, if necessary, the internal cipher $engine and flush all $buffers
-     * Used (only) if $engine == self::ENGINE_INTERNAL
-     *
-     * _setup() will be called each time if $changed === true
-     * typically this happens when using one or more of following public methods:
-     *
-     * - setKey()
-     *
-     * - setIV()
-     *
-     * - disableContinuousBuffer()
-     *
-     * - First run of encrypt() / decrypt() with no init-settings
-     *
-     * @see self::setKey()
-     * @see self::setIV()
-     * @see self::disableContinuousBuffer()
-     * @access private
-     * @internal _setup() is always called before en/decryption.
-     * @internal Could, but not must, extend by the child Crypt_* class
-     */
-    function _setup()
-    {
-        $this->_clearBuffers();
-        $this->_setupKey();
-
-        if ($this->use_inline_crypt) {
-            $this->_setupInlineCrypt();
-        }
-    }
-
-    /**
-     * Setup the self::ENGINE_MCRYPT $engine
-     *
-     * (re)init, if necessary, the (ext)mcrypt resources and flush all $buffers
-     * Used (only) if $engine = self::ENGINE_MCRYPT
-     *
-     * _setupMcrypt() will be called each time if $changed === true
-     * typically this happens when using one or more of following public methods:
-     *
-     * - setKey()
-     *
-     * - setIV()
-     *
-     * - disableContinuousBuffer()
-     *
-     * - First run of encrypt() / decrypt()
-     *
-     * @see self::setKey()
-     * @see self::setIV()
-     * @see self::disableContinuousBuffer()
-     * @access private
-     * @internal Could, but not must, extend by the child Crypt_* class
-     */
-    function _setupMcrypt()
-    {
-        $this->_clearBuffers();
-        $this->enchanged = $this->dechanged = true;
-
-        if (!isset($this->enmcrypt)) {
-            static $mcrypt_modes = array(
-                self::MODE_CTR    => 'ctr',
-                self::MODE_ECB    => MCRYPT_MODE_ECB,
-                self::MODE_CBC    => MCRYPT_MODE_CBC,
-                self::MODE_CFB    => 'ncfb',
-                self::MODE_OFB    => MCRYPT_MODE_NOFB,
-                self::MODE_STREAM => MCRYPT_MODE_STREAM,
-            );
-
-            $this->demcrypt = mcrypt_module_open($this->cipher_name_mcrypt, '', $mcrypt_modes[$this->mode], '');
-            $this->enmcrypt = mcrypt_module_open($this->cipher_name_mcrypt, '', $mcrypt_modes[$this->mode], '');
-
-            // we need the $ecb mcrypt resource (only) in MODE_CFB with enableContinuousBuffer()
-            // to workaround mcrypt's broken ncfb implementation in buffered mode
-            // see: {@link http://phpseclib.sourceforge.net/cfb-demo.phps}
-            if ($this->mode == self::MODE_CFB) {
-                $this->ecb = mcrypt_module_open($this->cipher_name_mcrypt, '', MCRYPT_MODE_ECB, '');
-            }
-        } // else should mcrypt_generic_deinit be called?
-
-        if ($this->mode == self::MODE_CFB) {
-            mcrypt_generic_init($this->ecb, $this->key, str_repeat("\0", $this->block_size));
-        }
-    }
-
-    /**
-     * Pads a string
-     *
-     * Pads a string using the RSA PKCS padding standards so that its length is a multiple of the blocksize.
-     * $this->block_size - (strlen($text) % $this->block_size) bytes are added, each of which is equal to
-     * chr($this->block_size - (strlen($text) % $this->block_size)
-     *
-     * If padding is disabled and $text is not a multiple of the blocksize, the string will be padded regardless
-     * and padding will, hence forth, be enabled.
-     *
-     * @see self::_unpad()
-     * @param string $text
-     * @access private
-     * @return string
-     */
-    function _pad($text)
-    {
-        $length = strlen($text);
-
-        if (!$this->padding) {
-            if ($length % $this->block_size == 0) {
-                return $text;
-            } else {
-                user_error("The plaintext's length ($length) is not a multiple of the block size ({$this->block_size})");
-                $this->padding = true;
-            }
-        }
-
-        $pad = $this->block_size - ($length % $this->block_size);
-
-        return str_pad($text, $length + $pad, chr($pad));
-    }
-
-    /**
-     * Unpads a string.
-     *
-     * If padding is enabled and the reported padding length is invalid the encryption key will be assumed to be wrong
-     * and false will be returned.
-     *
-     * @see self::_pad()
-     * @param string $text
-     * @access private
-     * @return string
-     */
-    function _unpad($text)
-    {
-        if (!$this->padding) {
-            return $text;
-        }
-
-        $length = ord($text[strlen($text) - 1]);
-
-        if (!$length || $length > $this->block_size) {
-            return false;
-        }
-
-        return substr($text, 0, -$length);
-    }
-
-    /**
-     * Clears internal buffers
-     *
-     * Clearing/resetting the internal buffers is done everytime
-     * after disableContinuousBuffer() or on cipher $engine (re)init
-     * ie after setKey() or setIV()
-     *
-     * @access public
-     * @internal Could, but not must, extend by the child Crypt_* class
-     */
-    function _clearBuffers()
-    {
-        $this->enbuffer = $this->debuffer = array('ciphertext' => '', 'xor' => '', 'pos' => 0, 'enmcrypt_init' => true);
-
-        // mcrypt's handling of invalid's $iv:
-        // $this->encryptIV = $this->decryptIV = strlen($this->iv) == $this->block_size ? $this->iv : str_repeat("\0", $this->block_size);
-        $this->encryptIV = $this->decryptIV = str_pad(substr($this->iv, 0, $this->block_size), $this->block_size, "\0");
-
-        if (!$this->skip_key_adjustment) {
-            $this->key = str_pad(substr($this->key, 0, $this->key_length), $this->key_length, "\0");
-        }
-    }
-
-    /**
-     * String Shift
-     *
-     * Inspired by array_shift
-     *
-     * @param string $string
-     * @param int $index
-     * @access private
-     * @return string
-     */
-    function _string_shift(&$string, $index = 1)
-    {
-        $substr = substr($string, 0, $index);
-        $string = substr($string, $index);
-        return $substr;
-    }
-
-    /**
-     * String Pop
-     *
-     * Inspired by array_pop
-     *
-     * @param string $string
-     * @param int $index
-     * @access private
-     * @return string
-     */
-    function _string_pop(&$string, $index = 1)
-    {
-        $substr = substr($string, -$index);
-        $string = substr($string, 0, -$index);
-        return $substr;
-    }
-
-    /**
-     * Increment the current string
-     *
-     * @see self::decrypt()
-     * @see self::encrypt()
-     * @param string $var
-     * @access private
-     */
-    function _increment_str(&$var)
-    {
-        for ($i = 4; $i <= strlen($var); $i+= 4) {
-            $temp = substr($var, -$i, 4);
-            switch ($temp) {
-                case "\xFF\xFF\xFF\xFF":
-                    $var = substr_replace($var, "\x00\x00\x00\x00", -$i, 4);
-                    break;
-                case "\x7F\xFF\xFF\xFF":
-                    $var = substr_replace($var, "\x80\x00\x00\x00", -$i, 4);
-                    return;
-                default:
-                    $temp = unpack('Nnum', $temp);
-                    $var = substr_replace($var, pack('N', $temp['num'] + 1), -$i, 4);
-                    return;
-            }
-        }
-
-        $remainder = strlen($var) % 4;
-
-        if ($remainder == 0) {
-            return;
-        }
-
-        $temp = unpack('Nnum', str_pad(substr($var, 0, $remainder), 4, "\0", STR_PAD_LEFT));
-        $temp = substr(pack('N', $temp['num'] + 1), -$remainder);
-        $var = substr_replace($var, $temp, 0, $remainder);
-    }
-
-    /**
-     * Setup the performance-optimized function for de/encrypt()
-     *
-     * Stores the created (or existing) callback function-name
-     * in $this->inline_crypt
-     *
-     * Internally for phpseclib developers:
-     *
-     *     _setupInlineCrypt() would be called only if:
-     *
-     *     - $engine == self::ENGINE_INTERNAL and
-     *
-     *     - $use_inline_crypt === true
-     *
-     *     - each time on _setup(), after(!) _setupKey()
-     *
-     *
-     *     This ensures that _setupInlineCrypt() has always a
-     *     full ready2go initializated internal cipher $engine state
-     *     where, for example, the keys allready expanded,
-     *     keys/block_size calculated and such.
-     *
-     *     It is, each time if called, the responsibility of _setupInlineCrypt():
-     *
-     *     - to set $this->inline_crypt to a valid and fully working callback function
-     *       as a (faster) replacement for encrypt() / decrypt()
-     *
-     *     - NOT to create unlimited callback functions (for memory reasons!)
-     *       no matter how often _setupInlineCrypt() would be called. At some
-     *       point of amount they must be generic re-useable.
-     *
-     *     - the code of _setupInlineCrypt() it self,
-     *       and the generated callback code,
-     *       must be, in following order:
-     *       - 100% safe
-     *       - 100% compatible to encrypt()/decrypt()
-     *       - using only php5+ features/lang-constructs/php-extensions if
-     *         compatibility (down to php4) or fallback is provided
-     *       - readable/maintainable/understandable/commented and... not-cryptic-styled-code :-)
-     *       - >= 10% faster than encrypt()/decrypt() [which is, by the way,
-     *         the reason for the existence of _setupInlineCrypt() :-)]
-     *       - memory-nice
-     *       - short (as good as possible)
-     *
-     * Note: - _setupInlineCrypt() is using _createInlineCryptFunction() to create the full callback function code.
-     *       - In case of using inline crypting, _setupInlineCrypt() must extend by the child \phpseclib\Crypt\* class.
-     *       - The following variable names are reserved:
-     *         - $_*  (all variable names prefixed with an underscore)
-     *         - $self (object reference to it self. Do not use $this, but $self instead)
-     *         - $in (the content of $in has to en/decrypt by the generated code)
-     *       - The callback function should not use the 'return' statement, but en/decrypt'ing the content of $in only
-     *
-     *
-     * @see self::_setup()
-     * @see self::_createInlineCryptFunction()
-     * @see self::encrypt()
-     * @see self::decrypt()
-     * @access private
-     * @internal If a Crypt_* class providing inline crypting it must extend _setupInlineCrypt()
-     */
-    function _setupInlineCrypt()
-    {
-        // If, for any reason, an extending \phpseclib\Crypt\Base() \phpseclib\Crypt\* class
-        // not using inline crypting then it must be ensured that: $this->use_inline_crypt = false
-        // ie in the class var declaration of $use_inline_crypt in general for the \phpseclib\Crypt\* class,
-        // in the constructor at object instance-time
-        // or, if it's runtime-specific, at runtime
-
-        $this->use_inline_crypt = false;
-    }
-
-    /**
-     * Creates the performance-optimized function for en/decrypt()
-     *
-     * Internally for phpseclib developers:
-     *
-     *    _createInlineCryptFunction():
-     *
-     *    - merge the $cipher_code [setup'ed by _setupInlineCrypt()]
-     *      with the current [$this->]mode of operation code
-     *
-     *    - create the $inline function, which called by encrypt() / decrypt()
-     *      as its replacement to speed up the en/decryption operations.
-     *
-     *    - return the name of the created $inline callback function
-     *
-     *    - used to speed up en/decryption
-     *
-     *
-     *
-     *    The main reason why can speed up things [up to 50%] this way are:
-     *
-     *    - using variables more effective then regular.
-     *      (ie no use of expensive arrays but integers $k_0, $k_1 ...
-     *      or even, for example, the pure $key[] values hardcoded)
-     *
-     *    - avoiding 1000's of function calls of ie _encryptBlock()
-     *      but inlining the crypt operations.
-     *      in the mode of operation for() loop.
-     *
-     *    - full loop unroll the (sometimes key-dependent) rounds
-     *      avoiding this way ++$i counters and runtime-if's etc...
-     *
-     *    The basic code architectur of the generated $inline en/decrypt()
-     *    lambda function, in pseudo php, is:
-     *
-     *    <code>
-     *    +----------------------------------------------------------------------------------------------+
-     *    | callback $inline = create_function:                                                          |
-     *    | lambda_function_0001_crypt_ECB($action, $text)                                               |
-     *    | {                                                                                            |
-     *    |     INSERT PHP CODE OF:                                                                      |
-     *    |     $cipher_code['init_crypt'];                  // general init code.                       |
-     *    |                                                  // ie: $sbox'es declarations used for       |
-     *    |                                                  //     encrypt and decrypt'ing.             |
-     *    |                                                                                              |
-     *    |     switch ($action) {                                                                       |
-     *    |         case 'encrypt':                                                                      |
-     *    |             INSERT PHP CODE OF:                                                              |
-     *    |             $cipher_code['init_encrypt'];       // encrypt sepcific init code.               |
-     *    |                                                    ie: specified $key or $box                |
-     *    |                                                        declarations for encrypt'ing.         |
-     *    |                                                                                              |
-     *    |             foreach ($ciphertext) {                                                          |
-     *    |                 $in = $block_size of $ciphertext;                                            |
-     *    |                                                                                              |
-     *    |                 INSERT PHP CODE OF:                                                          |
-     *    |                 $cipher_code['encrypt_block'];  // encrypt's (string) $in, which is always:  |
-     *    |                                                 // strlen($in) == $this->block_size          |
-     *    |                                                 // here comes the cipher algorithm in action |
-     *    |                                                 // for encryption.                           |
-     *    |                                                 // $cipher_code['encrypt_block'] has to      |
-     *    |                                                 // encrypt the content of the $in variable   |
-     *    |                                                                                              |
-     *    |                 $plaintext .= $in;                                                           |
-     *    |             }                                                                                |
-     *    |             return $plaintext;                                                               |
-     *    |                                                                                              |
-     *    |         case 'decrypt':                                                                      |
-     *    |             INSERT PHP CODE OF:                                                              |
-     *    |             $cipher_code['init_decrypt'];       // decrypt sepcific init code                |
-     *    |                                                    ie: specified $key or $box                |
-     *    |                                                        declarations for decrypt'ing.         |
-     *    |             foreach ($plaintext) {                                                           |
-     *    |                 $in = $block_size of $plaintext;                                             |
-     *    |                                                                                              |
-     *    |                 INSERT PHP CODE OF:                                                          |
-     *    |                 $cipher_code['decrypt_block'];  // decrypt's (string) $in, which is always   |
-     *    |                                                 // strlen($in) == $this->block_size          |
-     *    |                                                 // here comes the cipher algorithm in action |
-     *    |                                                 // for decryption.                           |
-     *    |                                                 // $cipher_code['decrypt_block'] has to      |
-     *    |                                                 // decrypt the content of the $in variable   |
-     *    |                 $ciphertext .= $in;                                                          |
-     *    |             }                                                                                |
-     *    |             return $ciphertext;                                                              |
-     *    |     }                                                                                        |
-     *    | }                                                                                            |
-     *    +----------------------------------------------------------------------------------------------+
-     *    </code>
-     *
-     *    See also the \phpseclib\Crypt\*::_setupInlineCrypt()'s for
-     *    productive inline $cipher_code's how they works.
-     *
-     *    Structure of:
-     *    <code>
-     *    $cipher_code = array(
-     *        'init_crypt'    => (string) '', // optional
-     *        'init_encrypt'  => (string) '', // optional
-     *        'init_decrypt'  => (string) '', // optional
-     *        'encrypt_block' => (string) '', // required
-     *        'decrypt_block' => (string) ''  // required
-     *    );
-     *    </code>
-     *
-     * @see self::_setupInlineCrypt()
-     * @see self::encrypt()
-     * @see self::decrypt()
-     * @param array $cipher_code
-     * @access private
-     * @return string (the name of the created callback function)
-     */
-    function _createInlineCryptFunction($cipher_code)
-    {
-        $block_size = $this->block_size;
-
-        // optional
-        $init_crypt    = isset($cipher_code['init_crypt'])    ? $cipher_code['init_crypt']    : '';
-        $init_encrypt  = isset($cipher_code['init_encrypt'])  ? $cipher_code['init_encrypt']  : '';
-        $init_decrypt  = isset($cipher_code['init_decrypt'])  ? $cipher_code['init_decrypt']  : '';
-        // required
-        $encrypt_block = $cipher_code['encrypt_block'];
-        $decrypt_block = $cipher_code['decrypt_block'];
-
-        // Generating mode of operation inline code,
-        // merged with the $cipher_code algorithm
-        // for encrypt- and decryption.
-        switch ($this->mode) {
-            case self::MODE_ECB:
-                $encrypt = $init_encrypt . '
-                    $_ciphertext = "";
-                    $_plaintext_len = strlen($_text);
-
-                    for ($_i = 0; $_i < $_plaintext_len; $_i+= '.$block_size.') {
-                        $in = substr($_text, $_i, '.$block_size.');
-                        '.$encrypt_block.'
-                        $_ciphertext.= $in;
-                    }
-
-                    return $_ciphertext;
-                    ';
-
-                $decrypt = $init_decrypt . '
-                    $_plaintext = "";
-                    $_text = str_pad($_text, strlen($_text) + ('.$block_size.' - strlen($_text) % '.$block_size.') % '.$block_size.', chr(0));
-                    $_ciphertext_len = strlen($_text);
-
-                    for ($_i = 0; $_i < $_ciphertext_len; $_i+= '.$block_size.') {
-                        $in = substr($_text, $_i, '.$block_size.');
-                        '.$decrypt_block.'
-                        $_plaintext.= $in;
-                    }
-
-                    return $self->_unpad($_plaintext);
-                    ';
-                break;
-            case self::MODE_CTR:
-                $encrypt = $init_encrypt . '
-                    $_ciphertext = "";
-                    $_plaintext_len = strlen($_text);
-                    $_xor = $self->encryptIV;
-                    $_buffer = &$self->enbuffer;
-                    if (strlen($_buffer["ciphertext"])) {
-                        for ($_i = 0; $_i < $_plaintext_len; $_i+= '.$block_size.') {
-                            $_block = substr($_text, $_i, '.$block_size.');
-                            if (strlen($_block) > strlen($_buffer["ciphertext"])) {
-                                $in = $_xor;
-                                '.$encrypt_block.'
-                                $self->_increment_str($_xor);
-                                $_buffer["ciphertext"].= $in;
-                            }
-                            $_key = $self->_string_shift($_buffer["ciphertext"], '.$block_size.');
-                            $_ciphertext.= $_block ^ $_key;
-                        }
-                    } else {
-                        for ($_i = 0; $_i < $_plaintext_len; $_i+= '.$block_size.') {
-                            $_block = substr($_text, $_i, '.$block_size.');
-                            $in = $_xor;
-                            '.$encrypt_block.'
-                            $self->_increment_str($_xor);
-                            $_key = $in;
-                            $_ciphertext.= $_block ^ $_key;
-                        }
-                    }
-                    if ($self->continuousBuffer) {
-                        $self->encryptIV = $_xor;
-                        if ($_start = $_plaintext_len % '.$block_size.') {
-                            $_buffer["ciphertext"] = substr($_key, $_start) . $_buffer["ciphertext"];
-                        }
-                    }
-
-                    return $_ciphertext;
-                ';
-
-                $decrypt = $init_encrypt . '
-                    $_plaintext = "";
-                    $_ciphertext_len = strlen($_text);
-                    $_xor = $self->decryptIV;
-                    $_buffer = &$self->debuffer;
-
-                    if (strlen($_buffer["ciphertext"])) {
-                        for ($_i = 0; $_i < $_ciphertext_len; $_i+= '.$block_size.') {
-                            $_block = substr($_text, $_i, '.$block_size.');
-                            if (strlen($_block) > strlen($_buffer["ciphertext"])) {
-                                $in = $_xor;
-                                '.$encrypt_block.'
-                                $self->_increment_str($_xor);
-                                $_buffer["ciphertext"].= $in;
-                            }
-                            $_key = $self->_string_shift($_buffer["ciphertext"], '.$block_size.');
-                            $_plaintext.= $_block ^ $_key;
-                        }
-                    } else {
-                        for ($_i = 0; $_i < $_ciphertext_len; $_i+= '.$block_size.') {
-                            $_block = substr($_text, $_i, '.$block_size.');
-                            $in = $_xor;
-                            '.$encrypt_block.'
-                            $self->_increment_str($_xor);
-                            $_key = $in;
-                            $_plaintext.= $_block ^ $_key;
-                        }
-                    }
-                    if ($self->continuousBuffer) {
-                        $self->decryptIV = $_xor;
-                        if ($_start = $_ciphertext_len % '.$block_size.') {
-                            $_buffer["ciphertext"] = substr($_key, $_start) . $_buffer["ciphertext"];
-                        }
-                    }
-
-                    return $_plaintext;
-                    ';
-                break;
-            case self::MODE_CFB:
-                $encrypt = $init_encrypt . '
-                    $_ciphertext = "";
-                    $_buffer = &$self->enbuffer;
-
-                    if ($self->continuousBuffer) {
-                        $_iv = &$self->encryptIV;
-                        $_pos = &$_buffer["pos"];
-                    } else {
-                        $_iv = $self->encryptIV;
-                        $_pos = 0;
-                    }
-                    $_len = strlen($_text);
-                    $_i = 0;
-                    if ($_pos) {
-                        $_orig_pos = $_pos;
-                        $_max = '.$block_size.' - $_pos;
-                        if ($_len >= $_max) {
-                            $_i = $_max;
-                            $_len-= $_max;
-                            $_pos = 0;
-                        } else {
-                            $_i = $_len;
-                            $_pos+= $_len;
-                            $_len = 0;
-                        }
-                        $_ciphertext = substr($_iv, $_orig_pos) ^ $_text;
-                        $_iv = substr_replace($_iv, $_ciphertext, $_orig_pos, $_i);
-                    }
-                    while ($_len >= '.$block_size.') {
-                        $in = $_iv;
-                        '.$encrypt_block.';
-                        $_iv = $in ^ substr($_text, $_i, '.$block_size.');
-                        $_ciphertext.= $_iv;
-                        $_len-= '.$block_size.';
-                        $_i+= '.$block_size.';
-                    }
-                    if ($_len) {
-                        $in = $_iv;
-                        '.$encrypt_block.'
-                        $_iv = $in;
-                        $_block = $_iv ^ substr($_text, $_i);
-                        $_iv = substr_replace($_iv, $_block, 0, $_len);
-                        $_ciphertext.= $_block;
-                        $_pos = $_len;
-                    }
-                    return $_ciphertext;
-                ';
-
-                $decrypt = $init_encrypt . '
-                    $_plaintext = "";
-                    $_buffer = &$self->debuffer;
-
-                    if ($self->continuousBuffer) {
-                        $_iv = &$self->decryptIV;
-                        $_pos = &$_buffer["pos"];
-                    } else {
-                        $_iv = $self->decryptIV;
-                        $_pos = 0;
-                    }
-                    $_len = strlen($_text);
-                    $_i = 0;
-                    if ($_pos) {
-                        $_orig_pos = $_pos;
-                        $_max = '.$block_size.' - $_pos;
-                        if ($_len >= $_max) {
-                            $_i = $_max;
-                            $_len-= $_max;
-                            $_pos = 0;
-                        } else {
-                            $_i = $_len;
-                            $_pos+= $_len;
-                            $_len = 0;
-                        }
-                        $_plaintext = substr($_iv, $_orig_pos) ^ $_text;
-                        $_iv = substr_replace($_iv, substr($_text, 0, $_i), $_orig_pos, $_i);
-                    }
-                    while ($_len >= '.$block_size.') {
-                        $in = $_iv;
-                        '.$encrypt_block.'
-                        $_iv = $in;
-                        $cb = substr($_text, $_i, '.$block_size.');
-                        $_plaintext.= $_iv ^ $cb;
-                        $_iv = $cb;
-                        $_len-= '.$block_size.';
-                        $_i+= '.$block_size.';
-                    }
-                    if ($_len) {
-                        $in = $_iv;
-                        '.$encrypt_block.'
-                        $_iv = $in;
-                        $_plaintext.= $_iv ^ substr($_text, $_i);
-                        $_iv = substr_replace($_iv, substr($_text, $_i), 0, $_len);
-                        $_pos = $_len;
-                    }
-
-                    return $_plaintext;
-                    ';
-                break;
-            case self::MODE_OFB:
-                $encrypt = $init_encrypt . '
-                    $_ciphertext = "";
-                    $_plaintext_len = strlen($_text);
-                    $_xor = $self->encryptIV;
-                    $_buffer = &$self->enbuffer;
-
-                    if (strlen($_buffer["xor"])) {
-                        for ($_i = 0; $_i < $_plaintext_len; $_i+= '.$block_size.') {
-                            $_block = substr($_text, $_i, '.$block_size.');
-                            if (strlen($_block) > strlen($_buffer["xor"])) {
-                                $in = $_xor;
-                                '.$encrypt_block.'
-                                $_xor = $in;
-                                $_buffer["xor"].= $_xor;
-                            }
-                            $_key = $self->_string_shift($_buffer["xor"], '.$block_size.');
-                            $_ciphertext.= $_block ^ $_key;
-                        }
-                    } else {
-                        for ($_i = 0; $_i < $_plaintext_len; $_i+= '.$block_size.') {
-                            $in = $_xor;
-                            '.$encrypt_block.'
-                            $_xor = $in;
-                            $_ciphertext.= substr($_text, $_i, '.$block_size.') ^ $_xor;
-                        }
-                        $_key = $_xor;
-                    }
-                    if ($self->continuousBuffer) {
-                        $self->encryptIV = $_xor;
-                        if ($_start = $_plaintext_len % '.$block_size.') {
-                             $_buffer["xor"] = substr($_key, $_start) . $_buffer["xor"];
-                        }
-                    }
-                    return $_ciphertext;
-                    ';
-
-                $decrypt = $init_encrypt . '
-                    $_plaintext = "";
-                    $_ciphertext_len = strlen($_text);
-                    $_xor = $self->decryptIV;
-                    $_buffer = &$self->debuffer;
-
-                    if (strlen($_buffer["xor"])) {
-                        for ($_i = 0; $_i < $_ciphertext_len; $_i+= '.$block_size.') {
-                            $_block = substr($_text, $_i, '.$block_size.');
-                            if (strlen($_block) > strlen($_buffer["xor"])) {
-                                $in = $_xor;
-                                '.$encrypt_block.'
-                                $_xor = $in;
-                                $_buffer["xor"].= $_xor;
-                            }
-                            $_key = $self->_string_shift($_buffer["xor"], '.$block_size.');
-                            $_plaintext.= $_block ^ $_key;
-                        }
-                    } else {
-                        for ($_i = 0; $_i < $_ciphertext_len; $_i+= '.$block_size.') {
-                            $in = $_xor;
-                            '.$encrypt_block.'
-                            $_xor = $in;
-                            $_plaintext.= substr($_text, $_i, '.$block_size.') ^ $_xor;
-                        }
-                        $_key = $_xor;
-                    }
-                    if ($self->continuousBuffer) {
-                        $self->decryptIV = $_xor;
-                        if ($_start = $_ciphertext_len % '.$block_size.') {
-                             $_buffer["xor"] = substr($_key, $_start) . $_buffer["xor"];
-                        }
-                    }
-                    return $_plaintext;
-                    ';
-                break;
-            case self::MODE_STREAM:
-                $encrypt = $init_encrypt . '
-                    $_ciphertext = "";
-                    '.$encrypt_block.'
-                    return $_ciphertext;
-                    ';
-                $decrypt = $init_decrypt . '
-                    $_plaintext = "";
-                    '.$decrypt_block.'
-                    return $_plaintext;
-                    ';
-                break;
-            // case self::MODE_CBC:
-            default:
-                $encrypt = $init_encrypt . '
-                    $_ciphertext = "";
-                    $_plaintext_len = strlen($_text);
-
-                    $in = $self->encryptIV;
-
-                    for ($_i = 0; $_i < $_plaintext_len; $_i+= '.$block_size.') {
-                        $in = substr($_text, $_i, '.$block_size.') ^ $in;
-                        '.$encrypt_block.'
-                        $_ciphertext.= $in;
-                    }
-
-                    if ($self->continuousBuffer) {
-                        $self->encryptIV = $in;
-                    }
-
-                    return $_ciphertext;
-                    ';
-
-                $decrypt = $init_decrypt . '
-                    $_plaintext = "";
-                    $_text = str_pad($_text, strlen($_text) + ('.$block_size.' - strlen($_text) % '.$block_size.') % '.$block_size.', chr(0));
-                    $_ciphertext_len = strlen($_text);
-
-                    $_iv = $self->decryptIV;
-
-                    for ($_i = 0; $_i < $_ciphertext_len; $_i+= '.$block_size.') {
-                        $in = $_block = substr($_text, $_i, '.$block_size.');
-                        '.$decrypt_block.'
-                        $_plaintext.= $in ^ $_iv;
-                        $_iv = $_block;
-                    }
-
-                    if ($self->continuousBuffer) {
-                        $self->decryptIV = $_iv;
-                    }
-
-                    return $self->_unpad($_plaintext);
-                    ';
-                break;
-        }
-
-        // Create the $inline function and return its name as string. Ready to run!
-        return create_function('$_action, &$self, $_text', $init_crypt . 'if ($_action == "encrypt") { ' . $encrypt . ' } else { ' . $decrypt . ' }');
-    }
-
-    /**
-     * Holds the lambda_functions table (classwide)
-     *
-     * Each name of the lambda function, created from
-     * _setupInlineCrypt() && _createInlineCryptFunction()
-     * is stored, classwide (!), here for reusing.
-     *
-     * The string-based index of $function is a classwide
-     * uniqe value representing, at least, the $mode of
-     * operation (or more... depends of the optimizing level)
-     * for which $mode the lambda function was created.
-     *
-     * @access private
-     * @return array &$functions
-     */
-    function &_getLambdaFunctions()
-    {
-        static $functions = array();
-        return $functions;
-    }
-
-    /**
-     * Generates a digest from $bytes
-     *
-     * @see self::_setupInlineCrypt()
-     * @access private
-     * @param $bytes
-     * @return string
-     */
-    function _hashInlineCryptFunction($bytes)
-    {
-        if (!isset(self::$WHIRLPOOL_AVAILABLE)) {
-            self::$WHIRLPOOL_AVAILABLE = extension_loaded('hash') && in_array('whirlpool', hash_algos());
-        }
-
-        $result = '';
-        $hash = $bytes;
-
-        switch (true) {
-            case self::$WHIRLPOOL_AVAILABLE:
-                foreach (str_split($bytes, 64) as $t) {
-                    $hash = hash('whirlpool', $hash, true);
-                    $result .= $t ^ $hash;
-                }
-                return $result . hash('whirlpool', $hash, true);
-            default:
-                $len = strlen($bytes);
-                for ($i = 0; $i < $len; $i+=20) {
-                    $t = substr($bytes, $i, 20);
-                    $hash = pack('H*', sha1($hash));
-                    $result .= $t ^ $hash;
-                }
-                return $result . pack('H*', sha1($hash));
-        }
-    }
-}
diff --git a/#pma/libraries/phpseclib/Crypt/Random.php b/#pma/libraries/phpseclib/Crypt/Random.php
deleted file mode 100644
index 586bd6c4..00000000
--- a/#pma/libraries/phpseclib/Crypt/Random.php
+++ /dev/null
@@ -1,243 +0,0 @@
-<?php
-
-/**
- * Random Number Generator
- *
- * PHP version 5
- *
- * Here's a short example of how to use this library:
- * <code>
- * <?php
- *    include 'vendor/autoload.php';
- *
- *    echo bin2hex(\phpseclib\Crypt\Random::string(8));
- * ?>
- * </code>
- *
- * @category  Crypt
- * @package   Random
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2007 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib\Crypt;
-
-use phpseclib\Crypt\AES;
-use phpseclib\Crypt\Base;
-use phpseclib\Crypt\Blowfish;
-use phpseclib\Crypt\DES;
-use phpseclib\Crypt\RC4;
-use phpseclib\Crypt\TripleDES;
-use phpseclib\Crypt\Twofish;
-
-/**
- * Pure-PHP Random Number Generator
- *
- * @package Random
- * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
- */
-class Random
-{
-    /**
-     * Generate a random string.
-     *
-     * Although microoptimizations are generally discouraged as they impair readability this function is ripe with
-     * microoptimizations because this function has the potential of being called a huge number of times.
-     * eg. for RSA key generation.
-     *
-     * @param int $length
-     * @return string
-     */
-    static function string($length)
-    {
-        if (version_compare(PHP_VERSION, '7.0.0', '>=')) {
-            try {
-                return \random_bytes($length);
-            } catch (\Throwable $e) {
-                // If a sufficient source of randomness is unavailable, random_bytes() will throw an
-                // object that implements the Throwable interface (Exception, TypeError, Error).
-                // We don't actually need to do anything here. The string() method should just continue
-                // as normal. Note, however, that if we don't have a sufficient source of randomness for
-                // random_bytes(), most of the other calls here will fail too, so we'll end up using
-                // the PHP implementation.
-            }
-        }
-
-        if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
-            // method 1. prior to PHP 5.3 this would call rand() on windows hence the function_exists('class_alias') call.
-            // ie. class_alias is a function that was introduced in PHP 5.3
-            if (extension_loaded('mcrypt') && function_exists('class_alias')) {
-                return mcrypt_create_iv($length);
-            }
-            // method 2. openssl_random_pseudo_bytes was introduced in PHP 5.3.0 but prior to PHP 5.3.4 there was,
-            // to quote <http://php.net/ChangeLog-5.php#5.3.4>, "possible blocking behavior". as of 5.3.4
-            // openssl_random_pseudo_bytes and mcrypt_create_iv do the exact same thing on Windows. ie. they both
-            // call php_win32_get_random_bytes():
-            //
-            // https://github.com/php/php-src/blob/7014a0eb6d1611151a286c0ff4f2238f92c120d6/ext/openssl/openssl.c#L5008
-            // https://github.com/php/php-src/blob/7014a0eb6d1611151a286c0ff4f2238f92c120d6/ext/mcrypt/mcrypt.c#L1392
-            //
-            // php_win32_get_random_bytes() is defined thusly:
-            //
-            // https://github.com/php/php-src/blob/7014a0eb6d1611151a286c0ff4f2238f92c120d6/win32/winutil.c#L80
-            //
-            // we're calling it, all the same, in the off chance that the mcrypt extension is not available
-            if (extension_loaded('openssl') && version_compare(PHP_VERSION, '5.3.4', '>=')) {
-                return openssl_random_pseudo_bytes($length);
-            }
-        } else {
-            // method 1. the fastest
-            if (extension_loaded('openssl')) {
-                return openssl_random_pseudo_bytes($length);
-            }
-            // method 2
-            static $fp = true;
-            if ($fp === true) {
-                // warning's will be output unles the error suppression operator is used. errors such as
-                // "open_basedir restriction in effect", "Permission denied", "No such file or directory", etc.
-                $fp = @fopen('/dev/urandom', 'rb');
-            }
-            if ($fp !== true && $fp !== false) { // surprisingly faster than !is_bool() or is_resource()
-                return fread($fp, $length);
-            }
-            // method 3. pretty much does the same thing as method 2 per the following url:
-            // https://github.com/php/php-src/blob/7014a0eb6d1611151a286c0ff4f2238f92c120d6/ext/mcrypt/mcrypt.c#L1391
-            // surprisingly slower than method 2. maybe that's because mcrypt_create_iv does a bunch of error checking that we're
-            // not doing. regardless, this'll only be called if this PHP script couldn't open /dev/urandom due to open_basedir
-            // restrictions or some such
-            if (extension_loaded('mcrypt')) {
-                return mcrypt_create_iv($length, MCRYPT_DEV_URANDOM);
-            }
-        }
-        // at this point we have no choice but to use a pure-PHP CSPRNG
-
-        // cascade entropy across multiple PHP instances by fixing the session and collecting all
-        // environmental variables, including the previous session data and the current session
-        // data.
-        //
-        // mt_rand seeds itself by looking at the PID and the time, both of which are (relatively)
-        // easy to guess at. linux uses mouse clicks, keyboard timings, etc, as entropy sources, but
-        // PHP isn't low level to be able to use those as sources and on a web server there's not likely
-        // going to be a ton of keyboard or mouse action. web servers do have one thing that we can use
-        // however, a ton of people visiting the website. obviously you don't want to base your seeding
-        // soley on parameters a potential attacker sends but (1) not everything in $_SERVER is controlled
-        // by the user and (2) this isn't just looking at the data sent by the current user - it's based
-        // on the data sent by all users. one user requests the page and a hash of their info is saved.
-        // another user visits the page and the serialization of their data is utilized along with the
-        // server envirnment stuff and a hash of the previous http request data (which itself utilizes
-        // a hash of the session data before that). certainly an attacker should be assumed to have
-        // full control over his own http requests. he, however, is not going to have control over
-        // everyone's http requests.
-        static $crypto = false, $v;
-        if ($crypto === false) {
-            // save old session data
-            $old_session_id = session_id();
-            $old_use_cookies = ini_get('session.use_cookies');
-            $old_session_cache_limiter = session_cache_limiter();
-            $_OLD_SESSION = isset($_SESSION) ? $_SESSION : false;
-            if ($old_session_id != '') {
-                session_write_close();
-            }
-
-            session_id(1);
-            ini_set('session.use_cookies', 0);
-            session_cache_limiter('');
-            session_start();
-
-            $v = $seed = $_SESSION['seed'] = pack('H*', sha1(
-                serialize($_SERVER) .
-                serialize($_POST) .
-                serialize($_GET) .
-                serialize($_COOKIE) .
-                serialize($GLOBALS) .
-                serialize($_SESSION) .
-                serialize($_OLD_SESSION)
-            ));
-            if (!isset($_SESSION['count'])) {
-                $_SESSION['count'] = 0;
-            }
-            $_SESSION['count']++;
-
-            session_write_close();
-
-            // restore old session data
-            if ($old_session_id != '') {
-                session_id($old_session_id);
-                session_start();
-                ini_set('session.use_cookies', $old_use_cookies);
-                session_cache_limiter($old_session_cache_limiter);
-            } else {
-                if ($_OLD_SESSION !== false) {
-                    $_SESSION = $_OLD_SESSION;
-                    unset($_OLD_SESSION);
-                } else {
-                    unset($_SESSION);
-                }
-            }
-
-            // in SSH2 a shared secret and an exchange hash are generated through the key exchange process.
-            // the IV client to server is the hash of that "nonce" with the letter A and for the encryption key it's the letter C.
-            // if the hash doesn't produce enough a key or an IV that's long enough concat successive hashes of the
-            // original hash and the current hash. we'll be emulating that. for more info see the following URL:
-            //
-            // http://tools.ietf.org/html/rfc4253#section-7.2
-            //
-            // see the is_string($crypto) part for an example of how to expand the keys
-            $key = pack('H*', sha1($seed . 'A'));
-            $iv = pack('H*', sha1($seed . 'C'));
-
-            // ciphers are used as per the nist.gov link below. also, see this link:
-            //
-            // http://en.wikipedia.org/wiki/Cryptographically_secure_pseudorandom_number_generator#Designs_based_on_cryptographic_primitives
-            switch (true) {
-                case class_exists('\phpseclib\Crypt\AES'):
-                    $crypto = new AES(Base::MODE_CTR);
-                    break;
-                case class_exists('\phpseclib\Crypt\Twofish'):
-                    $crypto = new Twofish(Base::MODE_CTR);
-                    break;
-                case class_exists('\phpseclib\Crypt\Blowfish'):
-                    $crypto = new Blowfish(Base::MODE_CTR);
-                    break;
-                case class_exists('\phpseclib\Crypt\TripleDES'):
-                    $crypto = new TripleDES(Base::MODE_CTR);
-                    break;
-                case class_exists('\phpseclib\Crypt\DES'):
-                    $crypto = new DES(Base::MODE_CTR);
-                    break;
-                case class_exists('\phpseclib\Crypt\RC4'):
-                    $crypto = new RC4();
-                    break;
-                default:
-                    user_error(__CLASS__ . ' requires at least one symmetric cipher be loaded');
-                    return false;
-            }
-
-            $crypto->setKey($key);
-            $crypto->setIV($iv);
-            $crypto->enableContinuousBuffer();
-        }
-
-        //return $crypto->encrypt(str_repeat("\0", $length));
-
-        // the following is based off of ANSI X9.31:
-        //
-        // http://csrc.nist.gov/groups/STM/cavp/documents/rng/931rngext.pdf
-        //
-        // OpenSSL uses that same standard for it's random numbers:
-        //
-        // http://www.opensource.apple.com/source/OpenSSL/OpenSSL-38/openssl/fips-1.0/rand/fips_rand.c
-        // (do a search for "ANS X9.31 A.2.4")
-        $result = '';
-        while (strlen($result) < $length) {
-            $i = $crypto->encrypt(microtime()); // strlen(microtime()) == 21
-            $r = $crypto->encrypt($i ^ $v); // strlen($v) == 20
-            $v = $crypto->encrypt($r ^ $i); // strlen($r) == 20
-            $result.= $r;
-        }
-        return substr($result, 0, $length);
-    }
-}
diff --git a/#pma/libraries/phpseclib/Crypt/Rijndael.php b/#pma/libraries/phpseclib/Crypt/Rijndael.php
deleted file mode 100644
index 05bfc982..00000000
--- a/#pma/libraries/phpseclib/Crypt/Rijndael.php
+++ /dev/null
@@ -1,941 +0,0 @@
-<?php
-
-/**
- * Pure-PHP implementation of Rijndael.
- *
- * Uses mcrypt, if available/possible, and an internal implementation, otherwise.
- *
- * PHP version 5
- *
- * If {@link self::setBlockLength() setBlockLength()} isn't called, it'll be assumed to be 128 bits.  If
- * {@link self::setKeyLength() setKeyLength()} isn't called, it'll be calculated from
- * {@link self::setKey() setKey()}.  ie. if the key is 128-bits, the key length will be 128-bits.  If it's
- * 136-bits it'll be null-padded to 192-bits and 192 bits will be the key length until
- * {@link self::setKey() setKey()} is called, again, at which point, it'll be recalculated.
- *
- * Not all Rijndael implementations may support 160-bits or 224-bits as the block length / key length.  mcrypt, for example,
- * does not.  AES, itself, only supports block lengths of 128 and key lengths of 128, 192, and 256.
- * {@link http://csrc.nist.gov/archive/aes/rijndael/Rijndael-ammended.pdf#page=10 Rijndael-ammended.pdf#page=10} defines the
- * algorithm for block lengths of 192 and 256 but not for block lengths / key lengths of 160 and 224.  Indeed, 160 and 224
- * are first defined as valid key / block lengths in
- * {@link http://csrc.nist.gov/archive/aes/rijndael/Rijndael-ammended.pdf#page=44 Rijndael-ammended.pdf#page=44}:
- * Extensions: Other block and Cipher Key lengths.
- * Note: Use of 160/224-bit Keys must be explicitly set by setKeyLength(160) respectively setKeyLength(224).
- *
- * {@internal The variable names are the same as those in
- * {@link http://www.csrc.nist.gov/publications/fips/fips197/fips-197.pdf#page=10 fips-197.pdf#page=10}.}}
- *
- * Here's a short example of how to use this library:
- * <code>
- * <?php
- *    include 'vendor/autoload.php';
- *
- *    $rijndael = new \phpseclib\Crypt\Rijndael();
- *
- *    $rijndael->setKey('abcdefghijklmnop');
- *
- *    $size = 10 * 1024;
- *    $plaintext = '';
- *    for ($i = 0; $i < $size; $i++) {
- *        $plaintext.= 'a';
- *    }
- *
- *    echo $rijndael->decrypt($rijndael->encrypt($plaintext));
- * ?>
- * </code>
- *
- * @category  Crypt
- * @package   Rijndael
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2008 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-namespace phpseclib\Crypt;
-
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
-use phpseclib\Crypt\Base;
-
-/**
- * Pure-PHP implementation of Rijndael.
- *
- * @package Rijndael
- * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
- */
-class Rijndael extends Base
-{
-    /**
-     * The mcrypt specific name of the cipher
-     *
-     * Mcrypt is useable for 128/192/256-bit $block_size/$key_length. For 160/224 not.
-     * \phpseclib\Crypt\Rijndael determines automatically whether mcrypt is useable
-     * or not for the current $block_size/$key_length.
-     * In case of, $cipher_name_mcrypt will be set dynamically at run time accordingly.
-     *
-     * @see \phpseclib\Crypt\Base::cipher_name_mcrypt
-     * @see \phpseclib\Crypt\Base::engine
-     * @see self::isValidEngine()
-     * @var string
-     * @access private
-     */
-    var $cipher_name_mcrypt = 'rijndael-128';
-
-    /**
-     * The default salt used by setPassword()
-     *
-     * @see \phpseclib\Crypt\Base::password_default_salt
-     * @see \phpseclib\Crypt\Base::setPassword()
-     * @var string
-     * @access private
-     */
-    var $password_default_salt = 'phpseclib';
-
-    /**
-     * The Key Schedule
-     *
-     * @see self::_setup()
-     * @var array
-     * @access private
-     */
-    var $w;
-
-    /**
-     * The Inverse Key Schedule
-     *
-     * @see self::_setup()
-     * @var array
-     * @access private
-     */
-    var $dw;
-
-    /**
-     * The Block Length divided by 32
-     *
-     * @see self::setBlockLength()
-     * @var int
-     * @access private
-     * @internal The max value is 256 / 32 = 8, the min value is 128 / 32 = 4.  Exists in conjunction with $block_size
-     *    because the encryption / decryption / key schedule creation requires this number and not $block_size.  We could
-     *    derive this from $block_size or vice versa, but that'd mean we'd have to do multiple shift operations, so in lieu
-     *    of that, we'll just precompute it once.
-     */
-    var $Nb = 4;
-
-    /**
-     * The Key Length (in bytes)
-     *
-     * @see self::setKeyLength()
-     * @var int
-     * @access private
-     * @internal The max value is 256 / 8 = 32, the min value is 128 / 8 = 16.  Exists in conjunction with $Nk
-     *    because the encryption / decryption / key schedule creation requires this number and not $key_length.  We could
-     *    derive this from $key_length or vice versa, but that'd mean we'd have to do multiple shift operations, so in lieu
-     *    of that, we'll just precompute it once.
-     */
-    var $key_length = 16;
-
-    /**
-     * The Key Length divided by 32
-     *
-     * @see self::setKeyLength()
-     * @var int
-     * @access private
-     * @internal The max value is 256 / 32 = 8, the min value is 128 / 32 = 4
-     */
-    var $Nk = 4;
-
-    /**
-     * The Number of Rounds
-     *
-     * @var int
-     * @access private
-     * @internal The max value is 14, the min value is 10.
-     */
-    var $Nr;
-
-    /**
-     * Shift offsets
-     *
-     * @var array
-     * @access private
-     */
-    var $c;
-
-    /**
-     * Holds the last used key- and block_size information
-     *
-     * @var array
-     * @access private
-     */
-    var $kl;
-
-    /**
-     * Sets the key length.
-     *
-     * Valid key lengths are 128, 160, 192, 224, and 256.  If the length is less than 128, it will be rounded up to
-     * 128.  If the length is greater than 128 and invalid, it will be rounded down to the closest valid amount.
-     *
-     * Note: phpseclib extends Rijndael (and AES) for using 160- and 224-bit keys but they are officially not defined
-     *       and the most (if not all) implementations are not able using 160/224-bit keys but round/pad them up to
-     *       192/256 bits as, for example, mcrypt will do.
-     *
-     *       That said, if you want be compatible with other Rijndael and AES implementations,
-     *       you should not setKeyLength(160) or setKeyLength(224).
-     *
-     * Additional: In case of 160- and 224-bit keys, phpseclib will/can, for that reason, not use
-     *             the mcrypt php extension, even if available.
-     *             This results then in slower encryption.
-     *
-     * @access public
-     * @param int $length
-     */
-    function setKeyLength($length)
-    {
-        switch (true) {
-            case $length <= 128:
-                $this->key_length = 16;
-                break;
-            case $length <= 160:
-                $this->key_length = 20;
-                break;
-            case $length <= 192:
-                $this->key_length = 24;
-                break;
-            case $length <= 224:
-                $this->key_length = 28;
-                break;
-            default:
-                $this->key_length = 32;
-        }
-
-        parent::setKeyLength($length);
-    }
-
-    /**
-     * Sets the block length
-     *
-     * Valid block lengths are 128, 160, 192, 224, and 256.  If the length is less than 128, it will be rounded up to
-     * 128.  If the length is greater than 128 and invalid, it will be rounded down to the closest valid amount.
-     *
-     * @access public
-     * @param int $length
-     */
-    function setBlockLength($length)
-    {
-        $length >>= 5;
-        if ($length > 8) {
-            $length = 8;
-        } elseif ($length < 4) {
-            $length = 4;
-        }
-        $this->Nb = $length;
-        $this->block_size = $length << 2;
-        $this->changed = true;
-        $this->_setEngine();
-    }
-
-    /**
-     * Test for engine validity
-     *
-     * This is mainly just a wrapper to set things up for \phpseclib\Crypt\Base::isValidEngine()
-     *
-     * @see \phpseclib\Crypt\Base::__construct()
-     * @param int $engine
-     * @access public
-     * @return bool
-     */
-    function isValidEngine($engine)
-    {
-        switch ($engine) {
-            case self::ENGINE_OPENSSL:
-                if ($this->block_size != 16) {
-                    return false;
-                }
-                $this->cipher_name_openssl_ecb = 'aes-' . ($this->key_length << 3) . '-ecb';
-                $this->cipher_name_openssl = 'aes-' . ($this->key_length << 3) . '-' . $this->_openssl_translate_mode();
-                break;
-            case self::ENGINE_MCRYPT:
-                $this->cipher_name_mcrypt = 'rijndael-' . ($this->block_size << 3);
-                if ($this->key_length % 8) { // is it a 160/224-bit key?
-                    // mcrypt is not usable for them, only for 128/192/256-bit keys
-                    return false;
-                }
-        }
-
-        return parent::isValidEngine($engine);
-    }
-
-    /**
-     * Encrypts a block
-     *
-     * @access private
-     * @param string $in
-     * @return string
-     */
-    function _encryptBlock($in)
-    {
-        static $tables;
-        if (empty($tables)) {
-            $tables = &$this->_getTables();
-        }
-        $t0   = $tables[0];
-        $t1   = $tables[1];
-        $t2   = $tables[2];
-        $t3   = $tables[3];
-        $sbox = $tables[4];
-
-        $state = array();
-        $words = unpack('N*', $in);
-
-        $c = $this->c;
-        $w = $this->w;
-        $Nb = $this->Nb;
-        $Nr = $this->Nr;
-
-        // addRoundKey
-        $wc = $Nb - 1;
-        foreach ($words as $word) {
-            $state[] = $word ^ $w[++$wc];
-        }
-
-        // fips-197.pdf#page=19, "Figure 5. Pseudo Code for the Cipher", states that this loop has four components -
-        // subBytes, shiftRows, mixColumns, and addRoundKey. fips-197.pdf#page=30, "Implementation Suggestions Regarding
-        // Various Platforms" suggests that performs enhanced implementations are described in Rijndael-ammended.pdf.
-        // Rijndael-ammended.pdf#page=20, "Implementation aspects / 32-bit processor", discusses such an optimization.
-        // Unfortunately, the description given there is not quite correct.  Per aes.spec.v316.pdf#page=19 [1],
-        // equation (7.4.7) is supposed to use addition instead of subtraction, so we'll do that here, as well.
-
-        // [1] http://fp.gladman.plus.com/cryptography_technology/rijndael/aes.spec.v316.pdf
-        $temp = array();
-        for ($round = 1; $round < $Nr; ++$round) {
-            $i = 0; // $c[0] == 0
-            $j = $c[1];
-            $k = $c[2];
-            $l = $c[3];
-
-            while ($i < $Nb) {
-                $temp[$i] = $t0[$state[$i] >> 24 & 0x000000FF] ^
-                            $t1[$state[$j] >> 16 & 0x000000FF] ^
-                            $t2[$state[$k] >>  8 & 0x000000FF] ^
-                            $t3[$state[$l]       & 0x000000FF] ^
-                            $w[++$wc];
-                ++$i;
-                $j = ($j + 1) % $Nb;
-                $k = ($k + 1) % $Nb;
-                $l = ($l + 1) % $Nb;
-            }
-            $state = $temp;
-        }
-
-        // subWord
-        for ($i = 0; $i < $Nb; ++$i) {
-            $state[$i] =   $sbox[$state[$i]       & 0x000000FF]        |
-                          ($sbox[$state[$i] >>  8 & 0x000000FF] <<  8) |
-                          ($sbox[$state[$i] >> 16 & 0x000000FF] << 16) |
-                          ($sbox[$state[$i] >> 24 & 0x000000FF] << 24);
-        }
-
-        // shiftRows + addRoundKey
-        $i = 0; // $c[0] == 0
-        $j = $c[1];
-        $k = $c[2];
-        $l = $c[3];
-        while ($i < $Nb) {
-            $temp[$i] = ($state[$i] & 0xFF000000) ^
-                        ($state[$j] & 0x00FF0000) ^
-                        ($state[$k] & 0x0000FF00) ^
-                        ($state[$l] & 0x000000FF) ^
-                         $w[$i];
-            ++$i;
-            $j = ($j + 1) % $Nb;
-            $k = ($k + 1) % $Nb;
-            $l = ($l + 1) % $Nb;
-        }
-
-        switch ($Nb) {
-            case 8:
-                return pack('N*', $temp[0], $temp[1], $temp[2], $temp[3], $temp[4], $temp[5], $temp[6], $temp[7]);
-            case 7:
-                return pack('N*', $temp[0], $temp[1], $temp[2], $temp[3], $temp[4], $temp[5], $temp[6]);
-            case 6:
-                return pack('N*', $temp[0], $temp[1], $temp[2], $temp[3], $temp[4], $temp[5]);
-            case 5:
-                return pack('N*', $temp[0], $temp[1], $temp[2], $temp[3], $temp[4]);
-            default:
-                return pack('N*', $temp[0], $temp[1], $temp[2], $temp[3]);
-        }
-    }
-
-    /**
-     * Decrypts a block
-     *
-     * @access private
-     * @param string $in
-     * @return string
-     */
-    function _decryptBlock($in)
-    {
-        static $invtables;
-        if (empty($invtables)) {
-            $invtables = &$this->_getInvTables();
-        }
-        $dt0   = $invtables[0];
-        $dt1   = $invtables[1];
-        $dt2   = $invtables[2];
-        $dt3   = $invtables[3];
-        $isbox = $invtables[4];
-
-        $state = array();
-        $words = unpack('N*', $in);
-
-        $c  = $this->c;
-        $dw = $this->dw;
-        $Nb = $this->Nb;
-        $Nr = $this->Nr;
-
-        // addRoundKey
-        $wc = $Nb - 1;
-        foreach ($words as $word) {
-            $state[] = $word ^ $dw[++$wc];
-        }
-
-        $temp = array();
-        for ($round = $Nr - 1; $round > 0; --$round) {
-            $i = 0; // $c[0] == 0
-            $j = $Nb - $c[1];
-            $k = $Nb - $c[2];
-            $l = $Nb - $c[3];
-
-            while ($i < $Nb) {
-                $temp[$i] = $dt0[$state[$i] >> 24 & 0x000000FF] ^
-                            $dt1[$state[$j] >> 16 & 0x000000FF] ^
-                            $dt2[$state[$k] >>  8 & 0x000000FF] ^
-                            $dt3[$state[$l]       & 0x000000FF] ^
-                            $dw[++$wc];
-                ++$i;
-                $j = ($j + 1) % $Nb;
-                $k = ($k + 1) % $Nb;
-                $l = ($l + 1) % $Nb;
-            }
-            $state = $temp;
-        }
-
-        // invShiftRows + invSubWord + addRoundKey
-        $i = 0; // $c[0] == 0
-        $j = $Nb - $c[1];
-        $k = $Nb - $c[2];
-        $l = $Nb - $c[3];
-
-        while ($i < $Nb) {
-            $word = ($state[$i] & 0xFF000000) |
-                    ($state[$j] & 0x00FF0000) |
-                    ($state[$k] & 0x0000FF00) |
-                    ($state[$l] & 0x000000FF);
-
-            $temp[$i] = $dw[$i] ^ ($isbox[$word       & 0x000000FF]        |
-                                  ($isbox[$word >>  8 & 0x000000FF] <<  8) |
-                                  ($isbox[$word >> 16 & 0x000000FF] << 16) |
-                                  ($isbox[$word >> 24 & 0x000000FF] << 24));
-            ++$i;
-            $j = ($j + 1) % $Nb;
-            $k = ($k + 1) % $Nb;
-            $l = ($l + 1) % $Nb;
-        }
-
-        switch ($Nb) {
-            case 8:
-                return pack('N*', $temp[0], $temp[1], $temp[2], $temp[3], $temp[4], $temp[5], $temp[6], $temp[7]);
-            case 7:
-                return pack('N*', $temp[0], $temp[1], $temp[2], $temp[3], $temp[4], $temp[5], $temp[6]);
-            case 6:
-                return pack('N*', $temp[0], $temp[1], $temp[2], $temp[3], $temp[4], $temp[5]);
-            case 5:
-                return pack('N*', $temp[0], $temp[1], $temp[2], $temp[3], $temp[4]);
-            default:
-                return pack('N*', $temp[0], $temp[1], $temp[2], $temp[3]);
-        }
-    }
-
-    /**
-     * Setup the key (expansion)
-     *
-     * @see \phpseclib\Crypt\Base::_setupKey()
-     * @access private
-     */
-    function _setupKey()
-    {
-        // Each number in $rcon is equal to the previous number multiplied by two in Rijndael's finite field.
-        // See http://en.wikipedia.org/wiki/Finite_field_arithmetic#Multiplicative_inverse
-        static $rcon = array(0,
-            0x01000000, 0x02000000, 0x04000000, 0x08000000, 0x10000000,
-            0x20000000, 0x40000000, 0x80000000, 0x1B000000, 0x36000000,
-            0x6C000000, 0xD8000000, 0xAB000000, 0x4D000000, 0x9A000000,
-            0x2F000000, 0x5E000000, 0xBC000000, 0x63000000, 0xC6000000,
-            0x97000000, 0x35000000, 0x6A000000, 0xD4000000, 0xB3000000,
-            0x7D000000, 0xFA000000, 0xEF000000, 0xC5000000, 0x91000000
-        );
-
-        if (isset($this->kl['key']) && $this->key === $this->kl['key'] && $this->key_length === $this->kl['key_length'] && $this->block_size === $this->kl['block_size']) {
-            // already expanded
-            return;
-        }
-        $this->kl = array('key' => $this->key, 'key_length' => $this->key_length, 'block_size' => $this->block_size);
-
-        $this->Nk = $this->key_length >> 2;
-        // see Rijndael-ammended.pdf#page=44
-        $this->Nr = max($this->Nk, $this->Nb) + 6;
-
-        // shift offsets for Nb = 5, 7 are defined in Rijndael-ammended.pdf#page=44,
-        //     "Table 8: Shift offsets in Shiftrow for the alternative block lengths"
-        // shift offsets for Nb = 4, 6, 8 are defined in Rijndael-ammended.pdf#page=14,
-        //     "Table 2: Shift offsets for different block lengths"
-        switch ($this->Nb) {
-            case 4:
-            case 5:
-            case 6:
-                $this->c = array(0, 1, 2, 3);
-                break;
-            case 7:
-                $this->c = array(0, 1, 2, 4);
-                break;
-            case 8:
-                $this->c = array(0, 1, 3, 4);
-        }
-
-        $w = array_values(unpack('N*words', $this->key));
-
-        $length = $this->Nb * ($this->Nr + 1);
-        for ($i = $this->Nk; $i < $length; $i++) {
-            $temp = $w[$i - 1];
-            if ($i % $this->Nk == 0) {
-                // according to <http://php.net/language.types.integer>, "the size of an integer is platform-dependent".
-                // on a 32-bit machine, it's 32-bits, and on a 64-bit machine, it's 64-bits. on a 32-bit machine,
-                // 0xFFFFFFFF << 8 == 0xFFFFFF00, but on a 64-bit machine, it equals 0xFFFFFFFF00. as such, doing 'and'
-                // with 0xFFFFFFFF (or 0xFFFFFF00) on a 32-bit machine is unnecessary, but on a 64-bit machine, it is.
-                $temp = (($temp << 8) & 0xFFFFFF00) | (($temp >> 24) & 0x000000FF); // rotWord
-                $temp = $this->_subWord($temp) ^ $rcon[$i / $this->Nk];
-            } elseif ($this->Nk > 6 && $i % $this->Nk == 4) {
-                $temp = $this->_subWord($temp);
-            }
-            $w[$i] = $w[$i - $this->Nk] ^ $temp;
-        }
-
-        // convert the key schedule from a vector of $Nb * ($Nr + 1) length to a matrix with $Nr + 1 rows and $Nb columns
-        // and generate the inverse key schedule.  more specifically,
-        // according to <http://csrc.nist.gov/archive/aes/rijndael/Rijndael-ammended.pdf#page=23> (section 5.3.3),
-        // "The key expansion for the Inverse Cipher is defined as follows:
-        //        1. Apply the Key Expansion.
-        //        2. Apply InvMixColumn to all Round Keys except the first and the last one."
-        // also, see fips-197.pdf#page=27, "5.3.5 Equivalent Inverse Cipher"
-        list($dt0, $dt1, $dt2, $dt3) = $this->_getInvTables();
-        $temp = $this->w = $this->dw = array();
-        for ($i = $row = $col = 0; $i < $length; $i++, $col++) {
-            if ($col == $this->Nb) {
-                if ($row == 0) {
-                    $this->dw[0] = $this->w[0];
-                } else {
-                    // subWord + invMixColumn + invSubWord = invMixColumn
-                    $j = 0;
-                    while ($j < $this->Nb) {
-                        $dw = $this->_subWord($this->w[$row][$j]);
-                        $temp[$j] = $dt0[$dw >> 24 & 0x000000FF] ^
-                                    $dt1[$dw >> 16 & 0x000000FF] ^
-                                    $dt2[$dw >>  8 & 0x000000FF] ^
-                                    $dt3[$dw       & 0x000000FF];
-                        $j++;
-                    }
-                    $this->dw[$row] = $temp;
-                }
-
-                $col = 0;
-                $row++;
-            }
-            $this->w[$row][$col] = $w[$i];
-        }
-
-        $this->dw[$row] = $this->w[$row];
-
-        // Converting to 1-dim key arrays (both ascending)
-        $this->dw = array_reverse($this->dw);
-        $w  = array_pop($this->w);
-        $dw = array_pop($this->dw);
-        foreach ($this->w as $r => $wr) {
-            foreach ($wr as $c => $wc) {
-                $w[]  = $wc;
-                $dw[] = $this->dw[$r][$c];
-            }
-        }
-        $this->w  = $w;
-        $this->dw = $dw;
-    }
-
-    /**
-     * Performs S-Box substitutions
-     *
-     * @access private
-     * @param int $word
-     */
-    function _subWord($word)
-    {
-        static $sbox;
-        if (empty($sbox)) {
-            list(, , , , $sbox) = $this->_getTables();
-        }
-
-        return  $sbox[$word       & 0x000000FF]        |
-               ($sbox[$word >>  8 & 0x000000FF] <<  8) |
-               ($sbox[$word >> 16 & 0x000000FF] << 16) |
-               ($sbox[$word >> 24 & 0x000000FF] << 24);
-    }
-
-    /**
-     * Provides the mixColumns and sboxes tables
-     *
-     * @see self::_encryptBlock()
-     * @see self::_setupInlineCrypt()
-     * @see self::_subWord()
-     * @access private
-     * @return array &$tables
-     */
-    function &_getTables()
-    {
-        static $tables;
-        if (empty($tables)) {
-            // according to <http://csrc.nist.gov/archive/aes/rijndael/Rijndael-ammended.pdf#page=19> (section 5.2.1),
-            // precomputed tables can be used in the mixColumns phase. in that example, they're assigned t0...t3, so
-            // those are the names we'll use.
-            $t3 = array_map('intval', array(
-                // with array_map('intval', ...) we ensure we have only int's and not
-                // some slower floats converted by php automatically on high values
-                0x6363A5C6, 0x7C7C84F8, 0x777799EE, 0x7B7B8DF6, 0xF2F20DFF, 0x6B6BBDD6, 0x6F6FB1DE, 0xC5C55491,
-                0x30305060, 0x01010302, 0x6767A9CE, 0x2B2B7D56, 0xFEFE19E7, 0xD7D762B5, 0xABABE64D, 0x76769AEC,
-                0xCACA458F, 0x82829D1F, 0xC9C94089, 0x7D7D87FA, 0xFAFA15EF, 0x5959EBB2, 0x4747C98E, 0xF0F00BFB,
-                0xADADEC41, 0xD4D467B3, 0xA2A2FD5F, 0xAFAFEA45, 0x9C9CBF23, 0xA4A4F753, 0x727296E4, 0xC0C05B9B,
-                0xB7B7C275, 0xFDFD1CE1, 0x9393AE3D, 0x26266A4C, 0x36365A6C, 0x3F3F417E, 0xF7F702F5, 0xCCCC4F83,
-                0x34345C68, 0xA5A5F451, 0xE5E534D1, 0xF1F108F9, 0x717193E2, 0xD8D873AB, 0x31315362, 0x15153F2A,
-                0x04040C08, 0xC7C75295, 0x23236546, 0xC3C35E9D, 0x18182830, 0x9696A137, 0x05050F0A, 0x9A9AB52F,
-                0x0707090E, 0x12123624, 0x80809B1B, 0xE2E23DDF, 0xEBEB26CD, 0x2727694E, 0xB2B2CD7F, 0x75759FEA,
-                0x09091B12, 0x83839E1D, 0x2C2C7458, 0x1A1A2E34, 0x1B1B2D36, 0x6E6EB2DC, 0x5A5AEEB4, 0xA0A0FB5B,
-                0x5252F6A4, 0x3B3B4D76, 0xD6D661B7, 0xB3B3CE7D, 0x29297B52, 0xE3E33EDD, 0x2F2F715E, 0x84849713,
-                0x5353F5A6, 0xD1D168B9, 0x00000000, 0xEDED2CC1, 0x20206040, 0xFCFC1FE3, 0xB1B1C879, 0x5B5BEDB6,
-                0x6A6ABED4, 0xCBCB468D, 0xBEBED967, 0x39394B72, 0x4A4ADE94, 0x4C4CD498, 0x5858E8B0, 0xCFCF4A85,
-                0xD0D06BBB, 0xEFEF2AC5, 0xAAAAE54F, 0xFBFB16ED, 0x4343C586, 0x4D4DD79A, 0x33335566, 0x85859411,
-                0x4545CF8A, 0xF9F910E9, 0x02020604, 0x7F7F81FE, 0x5050F0A0, 0x3C3C4478, 0x9F9FBA25, 0xA8A8E34B,
-                0x5151F3A2, 0xA3A3FE5D, 0x4040C080, 0x8F8F8A05, 0x9292AD3F, 0x9D9DBC21, 0x38384870, 0xF5F504F1,
-                0xBCBCDF63, 0xB6B6C177, 0xDADA75AF, 0x21216342, 0x10103020, 0xFFFF1AE5, 0xF3F30EFD, 0xD2D26DBF,
-                0xCDCD4C81, 0x0C0C1418, 0x13133526, 0xECEC2FC3, 0x5F5FE1BE, 0x9797A235, 0x4444CC88, 0x1717392E,
-                0xC4C45793, 0xA7A7F255, 0x7E7E82FC, 0x3D3D477A, 0x6464ACC8, 0x5D5DE7BA, 0x19192B32, 0x737395E6,
-                0x6060A0C0, 0x81819819, 0x4F4FD19E, 0xDCDC7FA3, 0x22226644, 0x2A2A7E54, 0x9090AB3B, 0x8888830B,
-                0x4646CA8C, 0xEEEE29C7, 0xB8B8D36B, 0x14143C28, 0xDEDE79A7, 0x5E5EE2BC, 0x0B0B1D16, 0xDBDB76AD,
-                0xE0E03BDB, 0x32325664, 0x3A3A4E74, 0x0A0A1E14, 0x4949DB92, 0x06060A0C, 0x24246C48, 0x5C5CE4B8,
-                0xC2C25D9F, 0xD3D36EBD, 0xACACEF43, 0x6262A6C4, 0x9191A839, 0x9595A431, 0xE4E437D3, 0x79798BF2,
-                0xE7E732D5, 0xC8C8438B, 0x3737596E, 0x6D6DB7DA, 0x8D8D8C01, 0xD5D564B1, 0x4E4ED29C, 0xA9A9E049,
-                0x6C6CB4D8, 0x5656FAAC, 0xF4F407F3, 0xEAEA25CF, 0x6565AFCA, 0x7A7A8EF4, 0xAEAEE947, 0x08081810,
-                0xBABAD56F, 0x787888F0, 0x25256F4A, 0x2E2E725C, 0x1C1C2438, 0xA6A6F157, 0xB4B4C773, 0xC6C65197,
-                0xE8E823CB, 0xDDDD7CA1, 0x74749CE8, 0x1F1F213E, 0x4B4BDD96, 0xBDBDDC61, 0x8B8B860D, 0x8A8A850F,
-                0x707090E0, 0x3E3E427C, 0xB5B5C471, 0x6666AACC, 0x4848D890, 0x03030506, 0xF6F601F7, 0x0E0E121C,
-                0x6161A3C2, 0x35355F6A, 0x5757F9AE, 0xB9B9D069, 0x86869117, 0xC1C15899, 0x1D1D273A, 0x9E9EB927,
-                0xE1E138D9, 0xF8F813EB, 0x9898B32B, 0x11113322, 0x6969BBD2, 0xD9D970A9, 0x8E8E8907, 0x9494A733,
-                0x9B9BB62D, 0x1E1E223C, 0x87879215, 0xE9E920C9, 0xCECE4987, 0x5555FFAA, 0x28287850, 0xDFDF7AA5,
-                0x8C8C8F03, 0xA1A1F859, 0x89898009, 0x0D0D171A, 0xBFBFDA65, 0xE6E631D7, 0x4242C684, 0x6868B8D0,
-                0x4141C382, 0x9999B029, 0x2D2D775A, 0x0F0F111E, 0xB0B0CB7B, 0x5454FCA8, 0xBBBBD66D, 0x16163A2C
-            ));
-
-            foreach ($t3 as $t3i) {
-                $t0[] = (($t3i << 24) & 0xFF000000) | (($t3i >>  8) & 0x00FFFFFF);
-                $t1[] = (($t3i << 16) & 0xFFFF0000) | (($t3i >> 16) & 0x0000FFFF);
-                $t2[] = (($t3i <<  8) & 0xFFFFFF00) | (($t3i >> 24) & 0x000000FF);
-            }
-
-            $tables = array(
-                // The Precomputed mixColumns tables t0 - t3
-                $t0,
-                $t1,
-                $t2,
-                $t3,
-                // The SubByte S-Box
-                array(
-                    0x63, 0x7C, 0x77, 0x7B, 0xF2, 0x6B, 0x6F, 0xC5, 0x30, 0x01, 0x67, 0x2B, 0xFE, 0xD7, 0xAB, 0x76,
-                    0xCA, 0x82, 0xC9, 0x7D, 0xFA, 0x59, 0x47, 0xF0, 0xAD, 0xD4, 0xA2, 0xAF, 0x9C, 0xA4, 0x72, 0xC0,
-                    0xB7, 0xFD, 0x93, 0x26, 0x36, 0x3F, 0xF7, 0xCC, 0x34, 0xA5, 0xE5, 0xF1, 0x71, 0xD8, 0x31, 0x15,
-                    0x04, 0xC7, 0x23, 0xC3, 0x18, 0x96, 0x05, 0x9A, 0x07, 0x12, 0x80, 0xE2, 0xEB, 0x27, 0xB2, 0x75,
-                    0x09, 0x83, 0x2C, 0x1A, 0x1B, 0x6E, 0x5A, 0xA0, 0x52, 0x3B, 0xD6, 0xB3, 0x29, 0xE3, 0x2F, 0x84,
-                    0x53, 0xD1, 0x00, 0xED, 0x20, 0xFC, 0xB1, 0x5B, 0x6A, 0xCB, 0xBE, 0x39, 0x4A, 0x4C, 0x58, 0xCF,
-                    0xD0, 0xEF, 0xAA, 0xFB, 0x43, 0x4D, 0x33, 0x85, 0x45, 0xF9, 0x02, 0x7F, 0x50, 0x3C, 0x9F, 0xA8,
-                    0x51, 0xA3, 0x40, 0x8F, 0x92, 0x9D, 0x38, 0xF5, 0xBC, 0xB6, 0xDA, 0x21, 0x10, 0xFF, 0xF3, 0xD2,
-                    0xCD, 0x0C, 0x13, 0xEC, 0x5F, 0x97, 0x44, 0x17, 0xC4, 0xA7, 0x7E, 0x3D, 0x64, 0x5D, 0x19, 0x73,
-                    0x60, 0x81, 0x4F, 0xDC, 0x22, 0x2A, 0x90, 0x88, 0x46, 0xEE, 0xB8, 0x14, 0xDE, 0x5E, 0x0B, 0xDB,
-                    0xE0, 0x32, 0x3A, 0x0A, 0x49, 0x06, 0x24, 0x5C, 0xC2, 0xD3, 0xAC, 0x62, 0x91, 0x95, 0xE4, 0x79,
-                    0xE7, 0xC8, 0x37, 0x6D, 0x8D, 0xD5, 0x4E, 0xA9, 0x6C, 0x56, 0xF4, 0xEA, 0x65, 0x7A, 0xAE, 0x08,
-                    0xBA, 0x78, 0x25, 0x2E, 0x1C, 0xA6, 0xB4, 0xC6, 0xE8, 0xDD, 0x74, 0x1F, 0x4B, 0xBD, 0x8B, 0x8A,
-                    0x70, 0x3E, 0xB5, 0x66, 0x48, 0x03, 0xF6, 0x0E, 0x61, 0x35, 0x57, 0xB9, 0x86, 0xC1, 0x1D, 0x9E,
-                    0xE1, 0xF8, 0x98, 0x11, 0x69, 0xD9, 0x8E, 0x94, 0x9B, 0x1E, 0x87, 0xE9, 0xCE, 0x55, 0x28, 0xDF,
-                    0x8C, 0xA1, 0x89, 0x0D, 0xBF, 0xE6, 0x42, 0x68, 0x41, 0x99, 0x2D, 0x0F, 0xB0, 0x54, 0xBB, 0x16
-                )
-            );
-        }
-        return $tables;
-    }
-
-    /**
-     * Provides the inverse mixColumns and inverse sboxes tables
-     *
-     * @see self::_decryptBlock()
-     * @see self::_setupInlineCrypt()
-     * @see self::_setupKey()
-     * @access private
-     * @return array &$tables
-     */
-    function &_getInvTables()
-    {
-        static $tables;
-        if (empty($tables)) {
-            $dt3 = array_map('intval', array(
-                0xF4A75051, 0x4165537E, 0x17A4C31A, 0x275E963A, 0xAB6BCB3B, 0x9D45F11F, 0xFA58ABAC, 0xE303934B,
-                0x30FA5520, 0x766DF6AD, 0xCC769188, 0x024C25F5, 0xE5D7FC4F, 0x2ACBD7C5, 0x35448026, 0x62A38FB5,
-                0xB15A49DE, 0xBA1B6725, 0xEA0E9845, 0xFEC0E15D, 0x2F7502C3, 0x4CF01281, 0x4697A38D, 0xD3F9C66B,
-                0x8F5FE703, 0x929C9515, 0x6D7AEBBF, 0x5259DA95, 0xBE832DD4, 0x7421D358, 0xE0692949, 0xC9C8448E,
-                0xC2896A75, 0x8E7978F4, 0x583E6B99, 0xB971DD27, 0xE14FB6BE, 0x88AD17F0, 0x20AC66C9, 0xCE3AB47D,
-                0xDF4A1863, 0x1A3182E5, 0x51336097, 0x537F4562, 0x6477E0B1, 0x6BAE84BB, 0x81A01CFE, 0x082B94F9,
-                0x48685870, 0x45FD198F, 0xDE6C8794, 0x7BF8B752, 0x73D323AB, 0x4B02E272, 0x1F8F57E3, 0x55AB2A66,
-                0xEB2807B2, 0xB5C2032F, 0xC57B9A86, 0x3708A5D3, 0x2887F230, 0xBFA5B223, 0x036ABA02, 0x16825CED,
-                0xCF1C2B8A, 0x79B492A7, 0x07F2F0F3, 0x69E2A14E, 0xDAF4CD65, 0x05BED506, 0x34621FD1, 0xA6FE8AC4,
-                0x2E539D34, 0xF355A0A2, 0x8AE13205, 0xF6EB75A4, 0x83EC390B, 0x60EFAA40, 0x719F065E, 0x6E1051BD,
-                0x218AF93E, 0xDD063D96, 0x3E05AEDD, 0xE6BD464D, 0x548DB591, 0xC45D0571, 0x06D46F04, 0x5015FF60,
-                0x98FB2419, 0xBDE997D6, 0x4043CC89, 0xD99E7767, 0xE842BDB0, 0x898B8807, 0x195B38E7, 0xC8EEDB79,
-                0x7C0A47A1, 0x420FE97C, 0x841EC9F8, 0x00000000, 0x80868309, 0x2BED4832, 0x1170AC1E, 0x5A724E6C,
-                0x0EFFFBFD, 0x8538560F, 0xAED51E3D, 0x2D392736, 0x0FD9640A, 0x5CA62168, 0x5B54D19B, 0x362E3A24,
-                0x0A67B10C, 0x57E70F93, 0xEE96D2B4, 0x9B919E1B, 0xC0C54F80, 0xDC20A261, 0x774B695A, 0x121A161C,
-                0x93BA0AE2, 0xA02AE5C0, 0x22E0433C, 0x1B171D12, 0x090D0B0E, 0x8BC7ADF2, 0xB6A8B92D, 0x1EA9C814,
-                0xF1198557, 0x75074CAF, 0x99DDBBEE, 0x7F60FDA3, 0x01269FF7, 0x72F5BC5C, 0x663BC544, 0xFB7E345B,
-                0x4329768B, 0x23C6DCCB, 0xEDFC68B6, 0xE4F163B8, 0x31DCCAD7, 0x63851042, 0x97224013, 0xC6112084,
-                0x4A247D85, 0xBB3DF8D2, 0xF93211AE, 0x29A16DC7, 0x9E2F4B1D, 0xB230F3DC, 0x8652EC0D, 0xC1E3D077,
-                0xB3166C2B, 0x70B999A9, 0x9448FA11, 0xE9642247, 0xFC8CC4A8, 0xF03F1AA0, 0x7D2CD856, 0x3390EF22,
-                0x494EC787, 0x38D1C1D9, 0xCAA2FE8C, 0xD40B3698, 0xF581CFA6, 0x7ADE28A5, 0xB78E26DA, 0xADBFA43F,
-                0x3A9DE42C, 0x78920D50, 0x5FCC9B6A, 0x7E466254, 0x8D13C2F6, 0xD8B8E890, 0x39F75E2E, 0xC3AFF582,
-                0x5D80BE9F, 0xD0937C69, 0xD52DA96F, 0x2512B3CF, 0xAC993BC8, 0x187DA710, 0x9C636EE8, 0x3BBB7BDB,
-                0x267809CD, 0x5918F46E, 0x9AB701EC, 0x4F9AA883, 0x956E65E6, 0xFFE67EAA, 0xBCCF0821, 0x15E8E6EF,
-                0xE79BD9BA, 0x6F36CE4A, 0x9F09D4EA, 0xB07CD629, 0xA4B2AF31, 0x3F23312A, 0xA59430C6, 0xA266C035,
-                0x4EBC3774, 0x82CAA6FC, 0x90D0B0E0, 0xA7D81533, 0x04984AF1, 0xECDAF741, 0xCD500E7F, 0x91F62F17,
-                0x4DD68D76, 0xEFB04D43, 0xAA4D54CC, 0x9604DFE4, 0xD1B5E39E, 0x6A881B4C, 0x2C1FB8C1, 0x65517F46,
-                0x5EEA049D, 0x8C355D01, 0x877473FA, 0x0B412EFB, 0x671D5AB3, 0xDBD25292, 0x105633E9, 0xD647136D,
-                0xD7618C9A, 0xA10C7A37, 0xF8148E59, 0x133C89EB, 0xA927EECE, 0x61C935B7, 0x1CE5EDE1, 0x47B13C7A,
-                0xD2DF599C, 0xF2733F55, 0x14CE7918, 0xC737BF73, 0xF7CDEA53, 0xFDAA5B5F, 0x3D6F14DF, 0x44DB8678,
-                0xAFF381CA, 0x68C43EB9, 0x24342C38, 0xA3405FC2, 0x1DC37216, 0xE2250CBC, 0x3C498B28, 0x0D9541FF,
-                0xA8017139, 0x0CB3DE08, 0xB4E49CD8, 0x56C19064, 0xCB84617B, 0x32B670D5, 0x6C5C7448, 0xB85742D0
-            ));
-
-            foreach ($dt3 as $dt3i) {
-                $dt0[] = (($dt3i << 24) & 0xFF000000) | (($dt3i >>  8) & 0x00FFFFFF);
-                $dt1[] = (($dt3i << 16) & 0xFFFF0000) | (($dt3i >> 16) & 0x0000FFFF);
-                $dt2[] = (($dt3i <<  8) & 0xFFFFFF00) | (($dt3i >> 24) & 0x000000FF);
-            };
-
-            $tables = array(
-                // The Precomputed inverse mixColumns tables dt0 - dt3
-                $dt0,
-                $dt1,
-                $dt2,
-                $dt3,
-                // The inverse SubByte S-Box
-                array(
-                    0x52, 0x09, 0x6A, 0xD5, 0x30, 0x36, 0xA5, 0x38, 0xBF, 0x40, 0xA3, 0x9E, 0x81, 0xF3, 0xD7, 0xFB,
-                    0x7C, 0xE3, 0x39, 0x82, 0x9B, 0x2F, 0xFF, 0x87, 0x34, 0x8E, 0x43, 0x44, 0xC4, 0xDE, 0xE9, 0xCB,
-                    0x54, 0x7B, 0x94, 0x32, 0xA6, 0xC2, 0x23, 0x3D, 0xEE, 0x4C, 0x95, 0x0B, 0x42, 0xFA, 0xC3, 0x4E,
-                    0x08, 0x2E, 0xA1, 0x66, 0x28, 0xD9, 0x24, 0xB2, 0x76, 0x5B, 0xA2, 0x49, 0x6D, 0x8B, 0xD1, 0x25,
-                    0x72, 0xF8, 0xF6, 0x64, 0x86, 0x68, 0x98, 0x16, 0xD4, 0xA4, 0x5C, 0xCC, 0x5D, 0x65, 0xB6, 0x92,
-                    0x6C, 0x70, 0x48, 0x50, 0xFD, 0xED, 0xB9, 0xDA, 0x5E, 0x15, 0x46, 0x57, 0xA7, 0x8D, 0x9D, 0x84,
-                    0x90, 0xD8, 0xAB, 0x00, 0x8C, 0xBC, 0xD3, 0x0A, 0xF7, 0xE4, 0x58, 0x05, 0xB8, 0xB3, 0x45, 0x06,
-                    0xD0, 0x2C, 0x1E, 0x8F, 0xCA, 0x3F, 0x0F, 0x02, 0xC1, 0xAF, 0xBD, 0x03, 0x01, 0x13, 0x8A, 0x6B,
-                    0x3A, 0x91, 0x11, 0x41, 0x4F, 0x67, 0xDC, 0xEA, 0x97, 0xF2, 0xCF, 0xCE, 0xF0, 0xB4, 0xE6, 0x73,
-                    0x96, 0xAC, 0x74, 0x22, 0xE7, 0xAD, 0x35, 0x85, 0xE2, 0xF9, 0x37, 0xE8, 0x1C, 0x75, 0xDF, 0x6E,
-                    0x47, 0xF1, 0x1A, 0x71, 0x1D, 0x29, 0xC5, 0x89, 0x6F, 0xB7, 0x62, 0x0E, 0xAA, 0x18, 0xBE, 0x1B,
-                    0xFC, 0x56, 0x3E, 0x4B, 0xC6, 0xD2, 0x79, 0x20, 0x9A, 0xDB, 0xC0, 0xFE, 0x78, 0xCD, 0x5A, 0xF4,
-                    0x1F, 0xDD, 0xA8, 0x33, 0x88, 0x07, 0xC7, 0x31, 0xB1, 0x12, 0x10, 0x59, 0x27, 0x80, 0xEC, 0x5F,
-                    0x60, 0x51, 0x7F, 0xA9, 0x19, 0xB5, 0x4A, 0x0D, 0x2D, 0xE5, 0x7A, 0x9F, 0x93, 0xC9, 0x9C, 0xEF,
-                    0xA0, 0xE0, 0x3B, 0x4D, 0xAE, 0x2A, 0xF5, 0xB0, 0xC8, 0xEB, 0xBB, 0x3C, 0x83, 0x53, 0x99, 0x61,
-                    0x17, 0x2B, 0x04, 0x7E, 0xBA, 0x77, 0xD6, 0x26, 0xE1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0C, 0x7D
-                )
-            );
-        }
-        return $tables;
-    }
-
-    /**
-     * Setup the performance-optimized function for de/encrypt()
-     *
-     * @see \phpseclib\Crypt\Base::_setupInlineCrypt()
-     * @access private
-     */
-    function _setupInlineCrypt()
-    {
-        // Note: _setupInlineCrypt() will be called only if $this->changed === true
-        // So here we are'nt under the same heavy timing-stress as we are in _de/encryptBlock() or de/encrypt().
-        // However...the here generated function- $code, stored as php callback in $this->inline_crypt, must work as fast as even possible.
-
-        $lambda_functions =& self::_getLambdaFunctions();
-
-        // We create max. 10 hi-optimized code for memory reason. Means: For each $key one ultra fast inline-crypt function.
-        // (Currently, for Crypt_Rijndael/AES, one generated $lambda_function cost on php5.5@32bit ~80kb unfreeable mem and ~130kb on php5.5@64bit)
-        // After that, we'll still create very fast optimized code but not the hi-ultimative code, for each $mode one.
-        $gen_hi_opt_code = (bool)(count($lambda_functions) < 10);
-
-        // Generation of a uniqe hash for our generated code
-        $code_hash = "Crypt_Rijndael, {$this->mode}, {$this->Nr}, {$this->Nb}";
-        if ($gen_hi_opt_code) {
-            $code_hash = str_pad($code_hash, 32) . $this->_hashInlineCryptFunction($this->key);
-        }
-
-        if (!isset($lambda_functions[$code_hash])) {
-            switch (true) {
-                case $gen_hi_opt_code:
-                    // The hi-optimized $lambda_functions will use the key-words hardcoded for better performance.
-                    $w  = $this->w;
-                    $dw = $this->dw;
-                    $init_encrypt = '';
-                    $init_decrypt = '';
-                    break;
-                default:
-                    for ($i = 0, $cw = count($this->w); $i < $cw; ++$i) {
-                        $w[]  = '$w['  . $i . ']';
-                        $dw[] = '$dw[' . $i . ']';
-                    }
-                    $init_encrypt = '$w  = $self->w;';
-                    $init_decrypt = '$dw = $self->dw;';
-            }
-
-            $Nr = $this->Nr;
-            $Nb = $this->Nb;
-            $c  = $this->c;
-
-            // Generating encrypt code:
-            $init_encrypt.= '
-                static $tables;
-                if (empty($tables)) {
-                    $tables = &$self->_getTables();
-                }
-                $t0   = $tables[0];
-                $t1   = $tables[1];
-                $t2   = $tables[2];
-                $t3   = $tables[3];
-                $sbox = $tables[4];
-            ';
-
-            $s  = 'e';
-            $e  = 's';
-            $wc = $Nb - 1;
-
-            // Preround: addRoundKey
-            $encrypt_block = '$in = unpack("N*", $in);'."\n";
-            for ($i = 0; $i < $Nb; ++$i) {
-                $encrypt_block .= '$s'.$i.' = $in['.($i + 1).'] ^ '.$w[++$wc].";\n";
-            }
-
-            // Mainrounds: shiftRows + subWord + mixColumns + addRoundKey
-            for ($round = 1; $round < $Nr; ++$round) {
-                list($s, $e) = array($e, $s);
-                for ($i = 0; $i < $Nb; ++$i) {
-                    $encrypt_block.=
-                        '$'.$e.$i.' =
-                        $t0[($'.$s.$i                  .' >> 24) & 0xff] ^
-                        $t1[($'.$s.(($i + $c[1]) % $Nb).' >> 16) & 0xff] ^
-                        $t2[($'.$s.(($i + $c[2]) % $Nb).' >>  8) & 0xff] ^
-                        $t3[ $'.$s.(($i + $c[3]) % $Nb).'        & 0xff] ^
-                        '.$w[++$wc].";\n";
-                }
-            }
-
-            // Finalround: subWord + shiftRows + addRoundKey
-            for ($i = 0; $i < $Nb; ++$i) {
-                $encrypt_block.=
-                    '$'.$e.$i.' =
-                     $sbox[ $'.$e.$i.'        & 0xff]        |
-                    ($sbox[($'.$e.$i.' >>  8) & 0xff] <<  8) |
-                    ($sbox[($'.$e.$i.' >> 16) & 0xff] << 16) |
-                    ($sbox[($'.$e.$i.' >> 24) & 0xff] << 24);'."\n";
-            }
-            $encrypt_block .= '$in = pack("N*"'."\n";
-            for ($i = 0; $i < $Nb; ++$i) {
-                $encrypt_block.= ',
-                    ($'.$e.$i                  .' & '.((int)0xFF000000).') ^
-                    ($'.$e.(($i + $c[1]) % $Nb).' &         0x00FF0000   ) ^
-                    ($'.$e.(($i + $c[2]) % $Nb).' &         0x0000FF00   ) ^
-                    ($'.$e.(($i + $c[3]) % $Nb).' &         0x000000FF   ) ^
-                    '.$w[$i]."\n";
-            }
-            $encrypt_block .= ');';
-
-            // Generating decrypt code:
-            $init_decrypt.= '
-                static $invtables;
-                if (empty($invtables)) {
-                    $invtables = &$self->_getInvTables();
-                }
-                $dt0   = $invtables[0];
-                $dt1   = $invtables[1];
-                $dt2   = $invtables[2];
-                $dt3   = $invtables[3];
-                $isbox = $invtables[4];
-            ';
-
-            $s  = 'e';
-            $e  = 's';
-            $wc = $Nb - 1;
-
-            // Preround: addRoundKey
-            $decrypt_block = '$in = unpack("N*", $in);'."\n";
-            for ($i = 0; $i < $Nb; ++$i) {
-                $decrypt_block .= '$s'.$i.' = $in['.($i + 1).'] ^ '.$dw[++$wc].';'."\n";
-            }
-
-            // Mainrounds: shiftRows + subWord + mixColumns + addRoundKey
-            for ($round = 1; $round < $Nr; ++$round) {
-                list($s, $e) = array($e, $s);
-                for ($i = 0; $i < $Nb; ++$i) {
-                    $decrypt_block.=
-                        '$'.$e.$i.' =
-                        $dt0[($'.$s.$i                        .' >> 24) & 0xff] ^
-                        $dt1[($'.$s.(($Nb + $i - $c[1]) % $Nb).' >> 16) & 0xff] ^
-                        $dt2[($'.$s.(($Nb + $i - $c[2]) % $Nb).' >>  8) & 0xff] ^
-                        $dt3[ $'.$s.(($Nb + $i - $c[3]) % $Nb).'        & 0xff] ^
-                        '.$dw[++$wc].";\n";
-                }
-            }
-
-            // Finalround: subWord + shiftRows + addRoundKey
-            for ($i = 0; $i < $Nb; ++$i) {
-                $decrypt_block.=
-                    '$'.$e.$i.' =
-                     $isbox[ $'.$e.$i.'        & 0xff]        |
-                    ($isbox[($'.$e.$i.' >>  8) & 0xff] <<  8) |
-                    ($isbox[($'.$e.$i.' >> 16) & 0xff] << 16) |
-                    ($isbox[($'.$e.$i.' >> 24) & 0xff] << 24);'."\n";
-            }
-            $decrypt_block .= '$in = pack("N*"'."\n";
-            for ($i = 0; $i < $Nb; ++$i) {
-                $decrypt_block.= ',
-                    ($'.$e.$i.                        ' & '.((int)0xFF000000).') ^
-                    ($'.$e.(($Nb + $i - $c[1]) % $Nb).' &         0x00FF0000   ) ^
-                    ($'.$e.(($Nb + $i - $c[2]) % $Nb).' &         0x0000FF00   ) ^
-                    ($'.$e.(($Nb + $i - $c[3]) % $Nb).' &         0x000000FF   ) ^
-                    '.$dw[$i]."\n";
-            }
-            $decrypt_block .= ');';
-
-            $lambda_functions[$code_hash] = $this->_createInlineCryptFunction(
-                array(
-                   'init_crypt'    => '',
-                   'init_encrypt'  => $init_encrypt,
-                   'init_decrypt'  => $init_decrypt,
-                   'encrypt_block' => $encrypt_block,
-                   'decrypt_block' => $decrypt_block
-                )
-            );
-        }
-        $this->inline_crypt = $lambda_functions[$code_hash];
-    }
-}
diff --git a/#pma/libraries/phpseclib/LICENSE b/#pma/libraries/phpseclib/LICENSE
deleted file mode 100644
index 75f6b204..00000000
--- a/#pma/libraries/phpseclib/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-Copyright 2007-2013 TerraFrost and other contributors
-http://phpseclib.sourceforge.net/
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/#pma/libraries/plugin_interface.lib.php b/#pma/libraries/plugin_interface.lib.php
deleted file mode 100644
index 0376e87e..00000000
--- a/#pma/libraries/plugin_interface.lib.php
+++ /dev/null
@@ -1,578 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Generic plugin interface.
- *
- * @package PhpMyAdmin
- */
-use PMA\libraries\properties\options\groups\OptionsPropertySubgroup;
-use PMA\libraries\properties\options\OptionsPropertyItem;
-use PMA\libraries\properties\plugins\ExportPluginProperties;
-use PMA\libraries\properties\plugins\PluginPropertyItem;
-use PMA\libraries\properties\plugins\SchemaPluginProperties;
-
-/**
- * Includes and instantiates the specified plugin type for a certain format
- *
- * @param string $plugin_type   the type of the plugin (import, export, etc)
- * @param string $plugin_format the format of the plugin (sql, xml, et )
- * @param string $plugins_dir   directory with plugins
- * @param mixed  $plugin_param  parameter to plugin by which they can
- *                              decide whether they can work
- *
- * @return object|null new plugin instance
- */
-function PMA_getPlugin(
-    $plugin_type,
-    $plugin_format,
-    $plugins_dir,
-    $plugin_param = false
-) {
-    $GLOBALS['plugin_param'] = $plugin_param;
-    $class_name = mb_strtoupper($plugin_type[0])
-        . mb_strtolower(mb_substr($plugin_type, 1))
-        . mb_strtoupper($plugin_format[0])
-        . mb_strtolower(mb_substr($plugin_format, 1));
-    $file = $class_name . ".php";
-    if (is_file($plugins_dir . $file)) {
-        //include_once $plugins_dir . $file;
-        $fqnClass = 'PMA\\' . str_replace('/', '\\', $plugins_dir) . $class_name;
-        // check if class exists, could be caused by skip_import
-        if (class_exists($fqnClass)) {
-            return new $fqnClass;
-        }
-    }
-
-    return null;
-}
-
-/**
- * Reads all plugin information from directory $plugins_dir
- *
- * @param string $plugin_type  the type of the plugin (import, export, etc)
- * @param string $plugins_dir  directory with plugins
- * @param mixed  $plugin_param parameter to plugin by which they can
- *                             decide whether they can work
- *
- * @return array list of plugin instances
- */
-function PMA_getPlugins($plugin_type, $plugins_dir, $plugin_param)
-{
-    $GLOBALS['plugin_param'] = $plugin_param;
-    /* Scan for plugins */
-    $plugin_list = array();
-    if (!($handle = @opendir($plugins_dir))) {
-        return $plugin_list;
-    }
-
-    $namespace = 'PMA\\' . str_replace('/', '\\', $plugins_dir);
-    $class_type = mb_strtoupper($plugin_type[0], 'UTF-8')
-        . mb_strtolower(mb_substr($plugin_type, 1), 'UTF-8');
-
-    $prefix_class_name = $namespace . $class_type;
-
-    while ($file = @readdir($handle)) {
-        // In some situations, Mac OS creates a new file for each file
-        // (for example ._csv.php) so the following regexp
-        // matches a file which does not start with a dot but ends
-        // with ".php"
-        if (is_file($plugins_dir . $file)
-            && preg_match(
-                '@^' . $class_type . '([^\.]+)\.php$@i',
-                $file,
-                $matches
-            )
-        ) {
-            $GLOBALS['skip_import'] = false;
-            include_once $plugins_dir . $file;
-            if (! $GLOBALS['skip_import']) {
-                $class_name = $prefix_class_name . $matches[1];
-                $plugin = new $class_name;
-                if (null !== $plugin->getProperties()) {
-                    $plugin_list[] = $plugin;
-                }
-            }
-        }
-    }
-
-    ksort($plugin_list);
-    return $plugin_list;
-}
-
-/**
- * Returns locale string for $name or $name if no locale is found
- *
- * @param string $name for local string
- *
- * @return string  locale string for $name
- */
-function PMA_getString($name)
-{
-    return isset($GLOBALS[$name]) ? $GLOBALS[$name] : $name;
-}
-
-/**
- * Returns html input tag option 'checked' if plugin $opt
- * should be set by config or request
- *
- * @param string $section name of config section in
- *                        $GLOBALS['cfg'][$section] for plugin
- * @param string $opt     name of option
- *
- * @return string  html input tag option 'checked'
- */
-function PMA_pluginCheckboxCheck($section, $opt)
-{
-    // If the form is being repopulated using $_GET data, that is priority
-    if (isset($_GET[$opt])
-        || ! isset($_GET['repopulate'])
-        && ((! empty($GLOBALS['timeout_passed']) && isset($_REQUEST[$opt]))
-        || ! empty($GLOBALS['cfg'][$section][$opt]))
-    ) {
-        return ' checked="checked"';
-    }
-    return '';
-}
-
-/**
- * Returns default value for option $opt
- *
- * @param string $section name of config section in
- *                        $GLOBALS['cfg'][$section] for plugin
- * @param string $opt     name of option
- *
- * @return string  default value for option $opt
- */
-function PMA_pluginGetDefault($section, $opt)
-{
-    if (isset($_GET[$opt])) {
-        // If the form is being repopulated using $_GET data, that is priority
-        return htmlspecialchars($_GET[$opt]);
-    }
-
-    if (isset($GLOBALS['timeout_passed'])
-        && $GLOBALS['timeout_passed']
-        && isset($_REQUEST[$opt])
-    ) {
-        return htmlspecialchars($_REQUEST[$opt]);
-    }
-
-    if (!isset($GLOBALS['cfg'][$section][$opt])) {
-        return '';
-    }
-
-    $matches = array();
-    /* Possibly replace localised texts */
-    if (!preg_match_all(
-        '/(str[A-Z][A-Za-z0-9]*)/',
-        $GLOBALS['cfg'][$section][$opt],
-        $matches
-    )) {
-        return htmlspecialchars($GLOBALS['cfg'][$section][$opt]);
-    }
-
-    $val = $GLOBALS['cfg'][$section][$opt];
-    foreach ($matches[0] as $match) {
-        if (isset($GLOBALS[$match])) {
-            $val = str_replace($match, $GLOBALS[$match], $val);
-        }
-    }
-    return htmlspecialchars($val);
-}
-
-/**
- * Returns html select form element for plugin choice
- * and hidden fields denoting whether each plugin must be exported as a file
- *
- * @param string $section name of config section in
- *                        $GLOBALS['cfg'][$section] for plugin
- * @param string $name    name of select element
- * @param array  &$list   array with plugin instances
- * @param string $cfgname name of config value, if none same as $name
- *
- * @return string  html select tag
- */
-function PMA_pluginGetChoice($section, $name, &$list, $cfgname = null)
-{
-    if (! isset($cfgname)) {
-        $cfgname = $name;
-    }
-    $ret = '<select id="plugins" name="' . $name . '">';
-    $default = PMA_pluginGetDefault($section, $cfgname);
-    $hidden = null;
-    foreach ($list as $plugin) {
-        $elem = explode('\\', get_class($plugin));
-        $plugin_name = array_pop($elem);
-        unset($elem);
-        $plugin_name = mb_strtolower(
-            mb_substr(
-                $plugin_name,
-                mb_strlen($section)
-            )
-        );
-        $ret .= '<option';
-         // If the form is being repopulated using $_GET data, that is priority
-        if (isset($_GET[$name])
-            && $plugin_name == $_GET[$name]
-            || ! isset($_GET[$name])
-            && $plugin_name == $default
-        ) {
-            $ret .= ' selected="selected"';
-        }
-
-        /** @var PluginPropertyItem $properties */
-        $properties = $plugin->getProperties();
-        $text = null;
-        if ($properties != null) {
-            $text = $properties->getText();
-        }
-        $ret .= ' value="' . $plugin_name . '">'
-           . PMA_getString($text)
-           . '</option>' . "\n";
-
-        // Whether each plugin has to be saved as a file
-        $hidden .= '<input type="hidden" id="force_file_' . $plugin_name
-            . '" value="';
-        /** @var ExportPluginProperties|SchemaPluginProperties $properties */
-        $properties = $plugin->getProperties();
-        if (! strcmp($section, 'Import')
-            || ($properties != null && $properties->getForceFile() != null)
-        ) {
-            $hidden .= 'true';
-        } else {
-            $hidden .= 'false';
-        }
-        $hidden .= '" />' . "\n";
-    }
-    $ret .= '</select>' . "\n" . $hidden;
-
-    return $ret;
-}
-
-/**
- * Returns single option in a list element
- *
- * @param string                                       $section        name of
- *                                                                     config
- *                                                                     section in
- *                                                                     $GLOBALS['cfg'][$section]
- *                                                                     for plugin
- * @param string                                       $plugin_name    unique plugin
- *                                                                     name
- * @param array|\PMA\libraries\properties\PropertyItem &$propertyGroup options
- *                                                                     property main
- *                                                                     group
- *                                                                     instance
- * @param boolean                                      $is_subgroup    if this group
- *                                                                     is a subgroup
- *
- * @return string  table row with option
- */
-function PMA_pluginGetOneOption(
-    $section,
-    $plugin_name,
-    &$propertyGroup,
-    $is_subgroup = false
-) {
-    $ret = "\n";
-
-    if (! $is_subgroup) {
-        // for subgroup headers
-        if (mb_strpos(get_class($propertyGroup), "PropertyItem")) {
-            $properties = array($propertyGroup);
-        } else {
-            // for main groups
-            $ret .= '<div class="export_sub_options" id="' . $plugin_name . '_'
-                . $propertyGroup->getName() . '">';
-
-            if (method_exists($propertyGroup, 'getText')) {
-                $text = $propertyGroup->getText();
-            }
-
-            if ($text != null) {
-                $ret .= '<h4>' . PMA_getString($text) . '</h4>';
-            }
-            $ret .= '<ul>';
-        }
-    }
-
-    if (! isset($properties)) {
-        $not_subgroup_header = true;
-        if (method_exists($propertyGroup, 'getProperties')) {
-            $properties = $propertyGroup->getProperties();
-        }
-    }
-
-    if (isset($properties)) {
-        /** @var OptionsPropertySubgroup $propertyItem */
-        foreach ($properties as $propertyItem) {
-            $property_class = get_class($propertyItem);
-            // if the property is a subgroup, we deal with it recursively
-            if (mb_strpos($property_class, "Subgroup")) {
-                // for subgroups
-                // each subgroup can have a header, which may also be a form element
-                /** @var OptionsPropertyItem $subgroup_header */
-                $subgroup_header = $propertyItem->getSubgroupHeader();
-                if (isset($subgroup_header)) {
-                    $ret .= PMA_pluginGetOneOption(
-                        $section,
-                        $plugin_name,
-                        $subgroup_header
-                    );
-                }
-
-                $ret .= '<li class="subgroup"><ul';
-                if (isset($subgroup_header)) {
-                    $ret .= ' id="ul_' . $subgroup_header->getName() . '">';
-                } else {
-                    $ret .= '>';
-                }
-
-                $ret .=  PMA_pluginGetOneOption(
-                    $section,
-                    $plugin_name,
-                    $propertyItem,
-                    true
-                );
-                continue;
-            }
-
-            // single property item
-            $ret .= PMA_getHtmlForProperty(
-                $section, $plugin_name, $propertyItem
-            );
-        }
-    }
-
-    if ($is_subgroup) {
-        // end subgroup
-        $ret .= '</ul></li>';
-    } else {
-        // end main group
-        if (! empty($not_subgroup_header)) {
-            $ret .= '</ul></div>';
-        }
-    }
-
-    if (method_exists($propertyGroup, "getDoc")) {
-        $doc = $propertyGroup->getDoc();
-        if ($doc != null) {
-            if (count($doc) == 3) {
-                $ret .= PMA\libraries\Util::showMySQLDocu(
-                    $doc[1],
-                    false,
-                    $doc[2]
-                );
-            } elseif (count($doc) == 1) {
-                $ret .= PMA\libraries\Util::showDocu('faq', $doc[0]);
-            } else {
-                $ret .= PMA\libraries\Util::showMySQLDocu(
-                    $doc[1]
-                );
-            }
-        }
-    }
-
-    // Close the list element after $doc link is displayed
-    if (isset($property_class)) {
-        if ($property_class == 'PMA\libraries\properties\options\items\BoolPropertyItem'
-            || $property_class == 'PMA\libraries\properties\options\items\MessageOnlyPropertyItem'
-            || $property_class == 'PMA\libraries\properties\options\items\SelectPropertyItem'
-            || $property_class == 'PMA\libraries\properties\options\items\TextPropertyItem'
-        ) {
-            $ret .= '</li>';
-        }
-    }
-    $ret .= "\n";
-    return $ret;
-}
-
-/**
- * Get HTML for properties items
- *
- * @param string              $section      name of config section in
- *                                          $GLOBALS['cfg'][$section] for plugin
- * @param string              $plugin_name  unique plugin name
- * @param OptionsPropertyItem $propertyItem Property item
- *
- * @return string
- */
-function PMA_getHtmlForProperty(
-    $section, $plugin_name, $propertyItem
-) {
-    $ret = null;
-    $property_class = get_class($propertyItem);
-    switch ($property_class) {
-    case 'PMA\libraries\properties\options\items\BoolPropertyItem':
-        $ret .= '<li>' . "\n";
-        $ret .= '<input type="checkbox" name="' . $plugin_name . '_'
-            . $propertyItem->getName() . '"'
-            . ' value="something" id="checkbox_' . $plugin_name . '_'
-            . $propertyItem->getName() . '"'
-            . ' '
-            . PMA_pluginCheckboxCheck(
-                $section,
-                $plugin_name . '_' . $propertyItem->getName()
-            );
-
-        if ($propertyItem->getForce() != null) {
-            // Same code is also few lines lower, update both if needed
-            $ret .= ' onclick="if (!this.checked &amp;&amp; '
-                . '(!document.getElementById(\'checkbox_' . $plugin_name
-                . '_' . $propertyItem->getForce() . '\') '
-                . '|| !document.getElementById(\'checkbox_'
-                . $plugin_name . '_' . $propertyItem->getForce()
-                . '\').checked)) '
-                . 'return false; else return true;"';
-        }
-        $ret .= ' />';
-        $ret .= '<label for="checkbox_' . $plugin_name . '_'
-            . $propertyItem->getName() . '">'
-            . PMA_getString($propertyItem->getText()) . '</label>';
-        break;
-    case 'PMA\libraries\properties\options\items\DocPropertyItem':
-        echo 'PMA\libraries\properties\options\items\DocPropertyItem';
-        break;
-    case 'PMA\libraries\properties\options\items\HiddenPropertyItem':
-        $ret .= '<li><input type="hidden" name="' . $plugin_name . '_'
-            . $propertyItem->getName() . '"'
-            . ' value="' . PMA_pluginGetDefault(
-                $section,
-                $plugin_name . '_' . $propertyItem->getName()
-            )
-            . '"' . ' /></li>';
-        break;
-    case 'PMA\libraries\properties\options\items\MessageOnlyPropertyItem':
-        $ret .= '<li>' . "\n";
-        $ret .= '<p>' . PMA_getString($propertyItem->getText()) . '</p>';
-        break;
-    case 'PMA\libraries\properties\options\items\RadioPropertyItem':
-        $default = PMA_pluginGetDefault(
-            $section,
-            $plugin_name . '_' . $propertyItem->getName()
-        );
-        foreach ($propertyItem->getValues() as $key => $val) {
-            $ret .= '<li><input type="radio" name="' . $plugin_name
-                . '_' . $propertyItem->getName() . '" value="' . $key
-                . '" id="radio_' . $plugin_name . '_'
-                . $propertyItem->getName() . '_' . $key . '"';
-            if ($key == $default) {
-                $ret .= ' checked="checked"';
-            }
-            $ret .= ' />' . '<label for="radio_' . $plugin_name . '_'
-                . $propertyItem->getName() . '_' . $key . '">'
-                . PMA_getString($val) . '</label></li>';
-        }
-        break;
-    case 'PMA\libraries\properties\options\items\SelectPropertyItem':
-        $ret .= '<li>' . "\n";
-        $ret .= '<label for="select_' . $plugin_name . '_'
-            . $propertyItem->getName() . '" class="desc">'
-            . PMA_getString($propertyItem->getText()) . '</label>';
-        $ret .= '<select name="' . $plugin_name . '_'
-            . $propertyItem->getName() . '"'
-            . ' id="select_' . $plugin_name . '_'
-            . $propertyItem->getName() . '">';
-        $default = PMA_pluginGetDefault(
-            $section,
-            $plugin_name . '_' . $propertyItem->getName()
-        );
-        foreach ($propertyItem->getValues() as $key => $val) {
-            $ret .= '<option value="' . $key . '"';
-            if ($key == $default) {
-                $ret .= ' selected="selected"';
-            }
-            $ret .= '>' . PMA_getString($val) . '</option>';
-        }
-        $ret .= '</select>';
-        break;
-    case 'PMA\libraries\properties\options\items\TextPropertyItem':
-    case 'PMA\libraries\properties\options\items\NumberPropertyItem':
-        $ret .= '<li>' . "\n";
-        $ret .= '<label for="text_' . $plugin_name . '_'
-            . $propertyItem->getName() . '" class="desc">'
-            . PMA_getString($propertyItem->getText()) . '</label>';
-        $ret .= '<input type="text" name="' . $plugin_name . '_'
-            . $propertyItem->getName() . '"'
-            . ' value="' . PMA_pluginGetDefault(
-                $section,
-                $plugin_name . '_' . $propertyItem->getName()
-            ) . '"'
-            . ' id="text_' . $plugin_name . '_'
-            . $propertyItem->getName() . '"'
-            . ($propertyItem->getSize() != null
-                ? ' size="' . $propertyItem->getSize() . '"'
-                : '')
-            . ($propertyItem->getLen() != null
-                ? ' maxlength="' . $propertyItem->getLen() . '"'
-                : '')
-            . ' />';
-        break;
-    default:
-        break;
-    }
-    return $ret;
-}
-
-/**
- * Returns html div with editable options for plugin
- *
- * @param string $section name of config section in $GLOBALS['cfg'][$section]
- * @param array  &$list   array with plugin instances
- *
- * @return string  html fieldset with plugin options
- */
-function PMA_pluginGetOptions($section, &$list)
-{
-    $ret = '';
-    // Options for plugins that support them
-    foreach ($list as $plugin) {
-        $properties = $plugin->getProperties();
-        if ($properties != null) {
-            $text = $properties->getText();
-            $options = $properties->getOptions();
-        }
-
-        $elem = explode('\\', get_class($plugin));
-        $plugin_name = array_pop($elem);
-        unset($elem);
-        $plugin_name = mb_strtolower(
-            mb_substr(
-                $plugin_name,
-                mb_strlen($section)
-            )
-        );
-
-        $ret .= '<div id="' . $plugin_name
-            . '_options" class="format_specific_options">';
-        $ret .= '<h3>' . PMA_getString($text) . '</h3>';
-
-        $no_options = true;
-        if ($options != null && count($options) > 0) {
-            foreach ($options->getProperties()
-                as $propertyMainGroup
-            ) {
-                // check for hidden properties
-                $no_options = true;
-                foreach ($propertyMainGroup->getProperties() as $propertyItem) {
-                    if (strcmp('PMA\libraries\properties\options\items\HiddenPropertyItem', get_class($propertyItem))) {
-                        $no_options = false;
-                        break;
-                    }
-                }
-
-                $ret .= PMA_pluginGetOneOption(
-                    $section,
-                    $plugin_name,
-                    $propertyMainGroup
-                );
-            }
-        }
-
-        if ($no_options) {
-            $ret .= '<p>' . __('This format has no options') . '</p>';
-        }
-        $ret .= '</div>';
-    }
-    return $ret;
-}
diff --git a/#pma/libraries/plugins/AuthenticationPlugin.php b/#pma/libraries/plugins/AuthenticationPlugin.php
deleted file mode 100644
index 6063aa98..00000000
--- a/#pma/libraries/plugins/AuthenticationPlugin.php
+++ /dev/null
@@ -1,159 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Abstract class for the authentication plugins
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries\plugins;
-
-/**
- * Provides a common interface that will have to be implemented by all of the
- * authentication plugins.
- *
- * @package PhpMyAdmin
- */
-abstract class AuthenticationPlugin
-{
-    /**
-     * Displays authentication form
-     *
-     * @return boolean
-     */
-    abstract public function auth();
-
-    /**
-     * Gets advanced authentication settings
-     *
-     * @return boolean
-     */
-    abstract public function authCheck();
-
-    /**
-     * Set the user and password after last checkings if required
-     *
-     * @return boolean
-     */
-    abstract public function authSetUser();
-
-    /**
-     * Stores user credentials after successful login.
-     *
-     * @return void
-     */
-    public function storeUserCredentials()
-    {
-    }
-
-    /**
-     * User is not allowed to login to MySQL -> authentication failed
-     *
-     * @return boolean
-     */
-    abstract public function authFails();
-
-    /**
-     * Perform logout
-     *
-     * @return void
-     */
-    public function logOut()
-    {
-        global $PHP_AUTH_USER, $PHP_AUTH_PW;
-
-        /* Obtain redirect URL (before doing logout) */
-        if (! empty($GLOBALS['cfg']['Server']['LogoutURL'])) {
-            $redirect_url = $GLOBALS['cfg']['Server']['LogoutURL'];
-        } else {
-            $redirect_url = $this->getLoginFormURL();
-        }
-
-        /* Clear credentials */
-        $PHP_AUTH_USER = '';
-        $PHP_AUTH_PW = '';
-
-        /* delete user's choices that were stored in session */
-        $_SESSION = array();
-        if (!defined('TESTSUITE')) {
-            session_destroy();
-        }
-
-        /* Redirect to login form (or configured URL) */
-        PMA_sendHeaderLocation($redirect_url);
-    }
-
-    /**
-     * Returns URL for login form.
-     *
-     * @return string
-     */
-    public function getLoginFormURL()
-    {
-        return './index.php';
-    }
-
-    /**
-     * Returns error message for failed authentication.
-     *
-     * @return string
-     */
-    public function getErrorMessage()
-    {
-        if (!empty($GLOBALS['login_without_password_is_forbidden'])) {
-            return __(
-                'Login without a password is forbidden by configuration'
-                . ' (see AllowNoPassword)'
-            );
-        } elseif (!empty($GLOBALS['allowDeny_forbidden'])) {
-            return __('Access denied!');
-        } elseif (!empty($GLOBALS['no_activity'])) {
-            return sprintf(
-                __('No activity within %s seconds; please log in again.'),
-                intval($GLOBALS['cfg']['LoginCookieValidity'])
-            );
-        } else {
-            $dbi_error = $GLOBALS['dbi']->getError();
-            if (!empty($dbi_error)) {
-                return htmlspecialchars($dbi_error);
-            } elseif (isset($GLOBALS['errno'])) {
-                return '#' . $GLOBALS['errno'] . ' '
-                . __('Cannot log in to the MySQL server');
-            } else {
-                return __('Cannot log in to the MySQL server');
-            }
-        }
-    }
-
-    /**
-     * Callback when user changes password.
-     *
-     * @param string $password New password to set
-     *
-     * @return void
-     */
-    public function handlePasswordChange($password)
-    {
-    }
-
-    /**
-     * Store session access time in session.
-     *
-     * Tries to workaround PHP 5 session garbage collection which
-     * looks at the session file's last modified time
-     *
-     * @return void
-     */
-     public function setSessionAccessTime()
-     {
-        if (isset($_REQUEST['access_time'])) {
-            // Ensure access_time is in range <0, LoginCookieValidity + 1>
-            // to avoid excessive extension of validity.
-            //
-            // Negative values can cause session expiry extension
-            // Too big values can cause overflow and lead to same
-            $_SESSION['last_access_time'] = time() - min(max(0, intval($_REQUEST['access_time'])), $GLOBALS['cfg']['LoginCookieValidity'] + 1);
-        } else {
-            $_SESSION['last_access_time'] = time();
-        }
-     }
-}
diff --git a/#pma/libraries/plugins/ExportPlugin.php b/#pma/libraries/plugins/ExportPlugin.php
deleted file mode 100644
index 4d872a61..00000000
--- a/#pma/libraries/plugins/ExportPlugin.php
+++ /dev/null
@@ -1,367 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Abstract class for the export plugins
- *
- * @package PhpMyAdmin
- */
-
-namespace PMA\libraries\plugins;
-
-use PMA\libraries\properties\plugins\ExportPluginProperties;
-
-/**
- * Provides a common interface that will have to be implemented by all of the
- * export plugins. Some of the plugins will also implement other public
- * methods, but those are not declared here, because they are not implemented
- * by all export plugins.
- *
- * @package PhpMyAdmin
- */
-abstract class ExportPlugin
-{
-    /**
-     * PMA\libraries\properties\plugins\ExportPluginProperties object containing
-     * the specific export plugin type properties
-     *
-     * @var \PMA\libraries\properties\plugins\ExportPluginProperties
-     */
-    protected $properties;
-    /**
-     * Common methods, must be overwritten by all export plugins
-     */
-
-    /**
-     * Outputs export header
-     *
-     * @return bool Whether it succeeded
-     */
-    abstract public function exportHeader();
-
-    /**
-     * Outputs export footer
-     *
-     * @return bool Whether it succeeded
-     */
-    abstract public function exportFooter();
-
-    /**
-     * Outputs database header
-     *
-     * @param string $db       Database name
-     * @param string $db_alias Aliases of db
-     *
-     * @return bool Whether it succeeded
-     */
-    abstract public function exportDBHeader($db, $db_alias = '');
-
-    /**
-     * Outputs database footer
-     *
-     * @param string $db Database name
-     *
-     * @return bool Whether it succeeded
-     */
-    abstract public function exportDBFooter($db);
-
-    /**
-     * Outputs CREATE DATABASE statement
-     *
-     * @param string $db          Database name
-     * @param string $export_type 'server', 'database', 'table'
-     * @param string $db_alias    Aliases of db
-     *
-     * @return bool Whether it succeeded
-     */
-    abstract public function exportDBCreate($db, $export_type, $db_alias = '');
-
-    /**
-     * Outputs the content of a table
-     *
-     * @param string $db        database name
-     * @param string $table     table name
-     * @param string $crlf      the end of line sequence
-     * @param string $error_url the url to go back in case of error
-     * @param string $sql_query SQL query for obtaining data
-     * @param array  $aliases   Aliases of db/table/columns
-     *
-     * @return bool Whether it succeeded
-     */
-    abstract public function exportData(
-        $db,
-        $table,
-        $crlf,
-        $error_url,
-        $sql_query,
-        $aliases = array()
-    );
-
-    /**
-     * The following methods are used in export.php or in db_operations.php,
-     * but they are not implemented by all export plugins
-     */
-
-    /**
-     * Exports routines (procedures and functions)
-     *
-     * @param string $db      Database
-     * @param array  $aliases Aliases of db/table/columns
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportRoutines($db, $aliases = array())
-    {
-        ;
-    }
-
-    /**
-     * Exports events
-     *
-     * @param string $db Database
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportEvents($db)
-    {
-        ;
-    }
-
-    /**
-     * Outputs table's structure
-     *
-     * @param string $db          database name
-     * @param string $table       table name
-     * @param string $crlf        the end of line sequence
-     * @param string $error_url   the url to go back in case of error
-     * @param string $export_mode 'create_table','triggers','create_view',
-     *                            'stand_in'
-     * @param string $export_type 'server', 'database', 'table'
-     * @param bool   $relation    whether to include relation comments
-     * @param bool   $comments    whether to include the pmadb-style column comments
-     *                            as comments in the structure; this is deprecated
-     *                            but the parameter is left here because export.php
-     *                            calls exportStructure() also for other export
-     *                            types which use this parameter
-     * @param bool   $mime        whether to include mime comments
-     * @param bool   $dates       whether to include creation/update/check dates
-     * @param array  $aliases     Aliases of db/table/columns
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportStructure(
-        $db,
-        $table,
-        $crlf,
-        $error_url,
-        $export_mode,
-        $export_type,
-        $relation = false,
-        $comments = false,
-        $mime = false,
-        $dates = false,
-        $aliases = array()
-    ) {
-        ;
-    }
-
-    /**
-     * Exports metadata from Configuration Storage
-     *
-     * @param string       $db            database being exported
-     * @param string|array $tables        table(s) being exported
-     * @param array        $metadataTypes types of metadata to export
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportMetadata(
-        $db,
-        $tables,
-        $metadataTypes
-    ) {
-        ;
-    }
-
-    /**
-     * Returns a stand-in CREATE definition to resolve view dependencies
-     *
-     * @param string $db      the database name
-     * @param string $view    the view name
-     * @param string $crlf    the end of line sequence
-     * @param array  $aliases Aliases of db/table/columns
-     *
-     * @return string resulting definition
-     */
-    public function getTableDefStandIn($db, $view, $crlf, $aliases = array())
-    {
-        ;
-    }
-
-    /**
-     * Outputs triggers
-     *
-     * @param string $db    database name
-     * @param string $table table name
-     *
-     * @return string Formatted triggers list
-     */
-    protected function getTriggers($db, $table)
-    {
-        ;
-    }
-
-    /**
-     * Initialize the specific variables for each export plugin
-     *
-     * @return void
-     */
-    protected function initSpecificVariables()
-    {
-        ;
-    }
-
-    /* ~~~~~~~~~~~~~~~~~~~~ Getters and Setters ~~~~~~~~~~~~~~~~~~~~ */
-
-    /**
-     * Gets the export specific format plugin properties
-     *
-     * @return ExportPluginProperties
-     */
-    public function getProperties()
-    {
-        return $this->properties;
-    }
-
-    /**
-     * Sets the export plugins properties and is implemented by each export
-     * plugin
-     *
-     * @return void
-     */
-    abstract protected function setProperties();
-
-    /**
-     * The following methods are implemented here so that they
-     * can be used by all export plugin without overriding it.
-     * Note: If you are creating a export plugin then don't include
-     * below methods unless you want to override them.
-     */
-
-    /**
-     * Initialize aliases
-     *
-     * @param array  $aliases Alias information for db/table/column
-     * @param string &$db     the database
-     * @param string &$table  the table
-     *
-     * @return void
-     */
-    public function initAlias($aliases, &$db, &$table = null)
-    {
-        if (!empty($aliases[$db]['tables'][$table]['alias'])) {
-            $table = $aliases[$db]['tables'][$table]['alias'];
-        }
-        if (!empty($aliases[$db]['alias'])) {
-            $db = $aliases[$db]['alias'];
-        }
-    }
-
-    /**
-     * Search for alias of a identifier.
-     *
-     * @param array  $aliases Alias information for db/table/column
-     * @param string $id      the identifier to be searched
-     * @param string $type    db/tbl/col or any combination of them
-     *                        representing what to be searched
-     * @param string $db      the database in which search is to be done
-     * @param string $tbl     the table in which search is to be done
-     *
-     * @return string alias of the identifier if found or ''
-     */
-    public function getAlias($aliases, $id, $type = 'dbtblcol', $db = '', $tbl = '')
-    {
-        if (!empty($db) && isset($aliases[$db])) {
-            $aliases = array(
-                $db => $aliases[$db],
-            );
-        }
-        // search each database
-        foreach ($aliases as $db_key => $db) {
-            // check if id is database and has alias
-            if (stristr($type, 'db') !== false
-                && $db_key === $id
-                && !empty($db['alias'])
-            ) {
-                return $db['alias'];
-            }
-            if (empty($db['tables'])) {
-                continue;
-            }
-            if (!empty($tbl) && isset($db['tables'][$tbl])) {
-                $db['tables'] = array(
-                    $tbl => $db['tables'][$tbl],
-                );
-            }
-            // search each of its tables
-            foreach ($db['tables'] as $table_key => $table) {
-                // check if id is table and has alias
-                if (stristr($type, 'tbl') !== false
-                    && $table_key === $id
-                    && !empty($table['alias'])
-                ) {
-                    return $table['alias'];
-                }
-                if (empty($table['columns'])) {
-                    continue;
-                }
-                // search each of its columns
-                foreach ($table['columns'] as $col_key => $col) {
-                    // check if id is column
-                    if (stristr($type, 'col') !== false
-                        && $col_key === $id
-                        && !empty($col)
-                    ) {
-                        return $col;
-                    }
-                }
-            }
-        }
-
-        return '';
-    }
-
-    /**
-     * Gives the relation string and
-     * also substitutes with alias if required
-     * in this format:
-     * [Foreign Table] ([Foreign Field])
-     *
-     * @param array  $res_rel    the foreigners array
-     * @param string $field_name the field name
-     * @param string $db         the field name
-     * @param array  $aliases    Alias information for db/table/column
-     *
-     * @return string the Relation string
-     */
-    public function getRelationString(
-        $res_rel,
-        $field_name,
-        $db,
-        $aliases = array()
-    ) {
-        $relation = '';
-        $foreigner = PMA_searchColumnInForeigners($res_rel, $field_name);
-        if ($foreigner) {
-            $ftable = $foreigner['foreign_table'];
-            $ffield = $foreigner['foreign_field'];
-            if (!empty($aliases[$db]['tables'][$ftable]['columns'][$ffield])) {
-                $ffield = $aliases[$db]['tables'][$ftable]['columns'][$ffield];
-            }
-            if (!empty($aliases[$db]['tables'][$ftable]['alias'])) {
-                $ftable = $aliases[$db]['tables'][$ftable]['alias'];
-            }
-            $relation = $ftable . ' (' . $ffield . ')';
-        }
-
-        return $relation;
-    }
-}
diff --git a/#pma/libraries/plugins/IOTransformationsPlugin.php b/#pma/libraries/plugins/IOTransformationsPlugin.php
deleted file mode 100644
index eed01717..00000000
--- a/#pma/libraries/plugins/IOTransformationsPlugin.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Abstract class for the I/O transformations plugins
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries\plugins;
-
-use PMA\libraries\plugins\TransformationsPlugin;
-
-/**
- * Provides a common interface that will have to be implemented
- * by all of the Input/Output transformations plugins.
- *
- * @package PhpMyAdmin
- */
-abstract class IOTransformationsPlugin extends TransformationsPlugin
-{
-    // specifies whether transformation was successful or not
-    protected $success = true;
-    // to store the error message in case of failed transformations
-    protected $error = '';
-
-    /**
-     * Returns the html for input field to override default textarea.
-     * Note: Return empty string if default textarea is required.
-     *
-     * @param array  $column               column details
-     * @param int    $row_id               row number
-     * @param string $column_name_appendix the name attribute
-     * @param array  $options              transformation options
-     * @param string $value                Current field value
-     * @param string $text_dir             text direction
-     * @param int    $tabindex             tab index
-     * @param int    $tabindex_for_value   offset for the values tabindex
-     * @param int    $idindex              id index
-     *
-     * @return string the html for input field
-     */
-    public function getInputHtml(
-        $column,
-        $row_id,
-        $column_name_appendix,
-        $options,
-        $value,
-        $text_dir,
-        $tabindex,
-        $tabindex_for_value,
-        $idindex
-    ) {
-        return '';
-    }
-
-    /**
-     * Returns the array of scripts (filename) required for plugin
-     * initialization and handling
-     *
-     * @return array javascripts to be included
-     */
-    public function getScripts()
-    {
-        return array();
-    }
-
-    /**
-     * Returns the error message
-     *
-     * @return string error
-     */
-    public function getError()
-    {
-        return $this->error;
-    }
-
-    /**
-     * Returns the success status
-     *
-     * @return bool
-     */
-    public function isSuccess()
-    {
-        return $this->success;
-    }
-
-    /**
-     * Resets the object properties
-     *
-     * @return void
-     */
-    public function reset()
-    {
-        $this->success = true;
-        $this->error = '';
-    }
-}
diff --git a/#pma/libraries/plugins/ImportPlugin.php b/#pma/libraries/plugins/ImportPlugin.php
deleted file mode 100644
index 254ac0ad..00000000
--- a/#pma/libraries/plugins/ImportPlugin.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Abstract class for the import plugins
- *
- * @package PhpMyAdmin
- */
-
-namespace PMA\libraries\plugins;
-
-use PMA\libraries\properties\plugins\ImportPluginProperties;
-
-/**
- * Provides a common interface that will have to be implemented by all of the
- * import plugins.
- *
- * @package PhpMyAdmin
- */
-abstract class ImportPlugin
-{
-    /**
-     * ImportPluginProperties object containing the import plugin properties
-     *
-     * @var ImportPluginProperties
-     */
-    protected $properties;
-
-    /**
-     * Handles the whole import logic
-     *
-     * @return void
-     */
-    abstract public function doImport();
-
-
-    /* ~~~~~~~~~~~~~~~~~~~~ Getters and Setters ~~~~~~~~~~~~~~~~~~~~ */
-
-    /**
-     * Gets the import specific format plugin properties
-     *
-     * @return \PMA\libraries\properties\plugins\ImportPluginProperties
-     */
-    public function getProperties()
-    {
-        return $this->properties;
-    }
-
-    /**
-     * Sets the export plugins properties and is implemented by each import
-     * plugin
-     *
-     * @return void
-     */
-    abstract protected function setProperties();
-
-    /**
-     * Define DB name and options
-     *
-     * @param string $currentDb DB
-     * @param string $defaultDb Default DB name
-     *
-     * @return array DB name and options (an associative array of options)
-     */
-    protected function getDbnameAndOptions($currentDb, $defaultDb)
-    {
-        if (mb_strlen($currentDb)) {
-            $db_name = $currentDb;
-            $options = array('create_db' => false);
-        } else {
-            $db_name = $defaultDb;
-            $options = null;
-        }
-
-        return array($db_name, $options);
-    }
-}
diff --git a/#pma/libraries/plugins/SchemaPlugin.php b/#pma/libraries/plugins/SchemaPlugin.php
deleted file mode 100644
index f7696c2e..00000000
--- a/#pma/libraries/plugins/SchemaPlugin.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Abstract class for the schema export plugins
- *
- * @package PhpMyAdmin
- */
-
-namespace PMA\libraries\plugins;
-
-use PMA\libraries\properties\options\items\BoolPropertyItem;
-use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
-use PMA\libraries\properties\plugins\SchemaPluginProperties;
-
-/**
- * Provides a common interface that will have to be implemented by all of the
- * schema export plugins. Some of the plugins will also implement other public
- * methods, but those are not declared here, because they are not implemented
- * by all export plugins.
- *
- * @package PhpMyAdmin
- */
-abstract class SchemaPlugin
-{
-    /**
-     * PMA\libraries\properties\plugins\SchemaPluginProperties object containing
-     * the specific schema export plugin type properties
-     *
-     * @var SchemaPluginProperties
-     */
-    protected $properties;
-
-    /**
-     * Gets the export specific format plugin properties
-     *
-     * @return SchemaPluginProperties
-     */
-    public function getProperties()
-    {
-        return $this->properties;
-    }
-
-    /**
-     * Sets the export plugins properties and is implemented by
-     * each schema export plugin
-     *
-     * @return void
-     */
-    protected abstract function setProperties();
-
-    /**
-     * Exports the schema into the specified format.
-     *
-     * @param string $db database name
-     *
-     * @return bool Whether it succeeded
-     */
-    public abstract function exportSchema($db);
-
-    /**
-     * Adds export options common to all plugins.
-     *
-     * @param \PMA\libraries\properties\options\groups\OptionsPropertyMainGroup $propertyGroup property group
-     *
-     * @return void
-     */
-    protected function addCommonOptions(OptionsPropertyMainGroup $propertyGroup)
-    {
-        $leaf = new BoolPropertyItem('show_color', __('Show color'));
-        $propertyGroup->addProperty($leaf);
-        $leaf = new BoolPropertyItem('show_keys', __('Only show keys'));
-        $propertyGroup->addProperty($leaf);
-    }
-
-    /**
-     * Returns the array of paper sizes
-     *
-     * @return array array of paper sizes
-     */
-    protected function getPaperSizeArray()
-    {
-        $ret = array();
-        foreach ($GLOBALS['cfg']['PDFPageSizes'] as $val) {
-            $ret[$val] = $val;
-        }
-
-        return $ret;
-    }
-}
diff --git a/#pma/libraries/plugins/TransformationsInterface.php b/#pma/libraries/plugins/TransformationsInterface.php
deleted file mode 100644
index 97332db9..00000000
--- a/#pma/libraries/plugins/TransformationsInterface.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Interface for the transformations plugins
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries\plugins;
-
-/**
- * Provides a common interface that will have to be implemented by all of the
- * transformations plugins.
- *
- * @package PhpMyAdmin
- */
-interface TransformationsInterface
-{
-    /**
-     * Gets the transformation description
-     *
-     * @return string
-     */
-    public static function getInfo();
-
-    /**
-     * Gets the specific MIME type
-     *
-     * @return string
-     */
-    public static function getMIMEType();
-
-    /**
-     * Gets the specific MIME subtype
-     *
-     * @return string
-     */
-    public static function getMIMESubtype();
-
-    /**
-     * Gets the transformation name of the specific plugin
-     *
-     * @return string
-     */
-    public static function getName();
-}
-
diff --git a/#pma/libraries/plugins/TransformationsPlugin.php b/#pma/libraries/plugins/TransformationsPlugin.php
deleted file mode 100644
index c672b173..00000000
--- a/#pma/libraries/plugins/TransformationsPlugin.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Abstract class for the transformations plugins
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries\plugins;
-
-/**
- * Provides a common interface that will have to
- * be implemented by all of the transformations plugins.
- *
- * @package PhpMyAdmin
- */
-abstract class TransformationsPlugin implements TransformationsInterface
-{
-    /**
-     * Does the actual work of each specific transformations plugin.
-     *
-     * @param array $options transformation options
-     *
-     * @return void
-     */
-    public function applyTransformationNoWrap($options = array())
-    {
-        ;
-    }
-
-    /**
-     * Does the actual work of each specific transformations plugin.
-     *
-     * @param string $buffer  text to be transformed
-     * @param array  $options transformation options
-     * @param string $meta    meta information
-     *
-     * @return string the transformed text
-     */
-    abstract public function applyTransformation(
-        $buffer,
-        $options = array(),
-        $meta = ''
-    );
-
-    /**
-     * Returns passed options or default values if they were not set
-     *
-     * @param string[] $options  List of passed options
-     * @param string[] $defaults List of default values
-     *
-     * @return string[] List of options possibly filled in by defaults.
-     */
-    public function getOptions($options, $defaults)
-    {
-        $result = array();
-        foreach ($defaults as $key => $value) {
-            if (isset($options[$key]) && $options[$key] !== '') {
-                $result[$key] = $options[$key];
-            } else {
-                $result[$key] = $value;
-            }
-        }
-
-        return $result;
-    }
-}
diff --git a/#pma/libraries/plugins/UploadInterface.php b/#pma/libraries/plugins/UploadInterface.php
deleted file mode 100644
index 061812e6..00000000
--- a/#pma/libraries/plugins/UploadInterface.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Interface for the import->upload plugins
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries\plugins;
-
-/**
- * Provides a common interface that will have to implemented by all of the
- * import->upload plugins.
- *
- * @package PhpMyAdmin
- */
-interface UploadInterface
-{
-    /**
-     * Gets the specific upload ID Key
-     *
-     * @return string ID Key
-     */
-    public static function getIdKey();
-
-    /**
-     * Returns upload status.
-     *
-     * @param string $id upload id
-     *
-     * @return array|null
-     */
-    public static function getUploadStatus($id);
-}
diff --git a/#pma/libraries/plugins/auth/AuthenticationConfig.php b/#pma/libraries/plugins/auth/AuthenticationConfig.php
deleted file mode 100644
index 77bf980d..00000000
--- a/#pma/libraries/plugins/auth/AuthenticationConfig.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Config Authentication plugin for phpMyAdmin
- *
- * @package    PhpMyAdmin-Authentication
- * @subpackage Config
- */
-namespace PMA\libraries\plugins\auth;
-
-use PMA\libraries\plugins\AuthenticationPlugin;
-use PMA;
-
-/**
- * Handles the config authentication method
- *
- * @package PhpMyAdmin-Authentication
- */
-class AuthenticationConfig extends AuthenticationPlugin
-{
-    /**
-     * Displays authentication form
-     *
-     * @return boolean always true
-     */
-    public function auth()
-    {
-        $response = PMA\libraries\Response::getInstance();
-        if ($response->isAjax()) {
-            $response->setRequestStatus(false);
-            // reload_flag removes the token parameter from the URL and reloads
-            $response->addJSON('reload_flag', '1');
-            if (defined('TESTSUITE')) {
-                return true;
-            } else {
-                exit;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Gets advanced authentication settings
-     *
-     * @return boolean always true
-     */
-    public function authCheck()
-    {
-        if ($GLOBALS['token_provided'] && $GLOBALS['token_mismatch']) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Set the user and password after last checkings if required
-     *
-     * @return boolean always true
-     */
-    public function authSetUser()
-    {
-        $this->setSessionAccessTime();
-
-        return true;
-    }
-
-    /**
-     * User is not allowed to login to MySQL -> authentication failed
-     *
-     * @return boolean   always true (no return indeed)
-     */
-    public function authFails()
-    {
-        $conn_error = $GLOBALS['dbi']->getError();
-        if (!$conn_error) {
-            $conn_error = __('Cannot connect: invalid settings.');
-        }
-
-        /* HTML header */
-        $response = PMA\libraries\Response::getInstance();
-        $response->getFooter()
-            ->setMinimal();
-        $header = $response->getHeader();
-        $header->setBodyId('loginform');
-        $header->setTitle(__('Access denied!'));
-        $header->disableMenuAndConsole();
-        echo '<br /><br />
-    <center>
-        <h1>';
-        echo sprintf(__('Welcome to %s'), ' phpMyAdmin ');
-        echo '</h1>
-    </center>
-    <br />
-    <table cellpadding="0" cellspacing="3" style="margin: 0 auto" width="80%">
-        <tr>
-            <td>';
-        if (isset($GLOBALS['allowDeny_forbidden'])
-            && $GLOBALS['allowDeny_forbidden']
-        ) {
-            trigger_error(__('Access denied!'), E_USER_NOTICE);
-        } else {
-            // Check whether user has configured something
-            if ($GLOBALS['PMA_Config']->source_mtime == 0) {
-                echo '<p>' , sprintf(
-                    __(
-                        'You probably did not create a configuration file.'
-                        . ' You might want to use the %1$ssetup script%2$s to'
-                        . ' create one.'
-                    ),
-                    '<a href="setup/">',
-                    '</a>'
-                ) , '</p>' , "\n";
-            } elseif (!isset($GLOBALS['errno'])
-                || (isset($GLOBALS['errno']) && $GLOBALS['errno'] != 2002)
-                && $GLOBALS['errno'] != 2003
-            ) {
-                // if we display the "Server not responding" error, do not confuse
-                // users by telling them they have a settings problem
-                // (note: it's true that they could have a badly typed host name,
-                // but anyway the current message tells that the server
-                //  rejected the connection, which is not really what happened)
-                // 2002 is the error given by mysqli
-                // 2003 is the error given by mysql
-                trigger_error(
-                    __(
-                        'phpMyAdmin tried to connect to the MySQL server, and the'
-                        . ' server rejected the connection. You should check the'
-                        . ' host, username and password in your configuration and'
-                        . ' make sure that they correspond to the information given'
-                        . ' by the administrator of the MySQL server.'
-                    ),
-                    E_USER_WARNING
-                );
-            }
-            echo PMA\libraries\Util::mysqlDie(
-                $conn_error,
-                '',
-                true,
-                '',
-                false
-            );
-        }
-        $GLOBALS['error_handler']->dispUserErrors();
-        echo '</td>
-        </tr>
-        <tr>
-            <td>' , "\n";
-        echo '<a href="'
-            , PMA\libraries\Util::getScriptNameForOption(
-                $GLOBALS['cfg']['DefaultTabServer'],
-                'server'
-            )
-            , PMA_URL_getCommon(array()) , '" class="button disableAjax">'
-            , __('Retry to connect')
-            , '</a>' , "\n";
-        echo '</td>
-        </tr>' , "\n";
-        if (count($GLOBALS['cfg']['Servers']) > 1) {
-            // offer a chance to login to other servers if the current one failed
-            include_once './libraries/select_server.lib.php';
-            echo '<tr>' , "\n";
-            echo ' <td>' , "\n";
-            echo PMA_selectServer(true, true);
-            echo ' </td>' , "\n";
-            echo '</tr>' , "\n";
-        }
-        echo '</table>' , "\n";
-        if (!defined('TESTSUITE')) {
-            exit;
-        }
-
-        return true;
-    }
-}
diff --git a/#pma/libraries/plugins/auth/AuthenticationCookie.php b/#pma/libraries/plugins/auth/AuthenticationCookie.php
deleted file mode 100644
index 0d37f4db..00000000
--- a/#pma/libraries/plugins/auth/AuthenticationCookie.php
+++ /dev/null
@@ -1,867 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Cookie Authentication plugin for phpMyAdmin
- *
- * @package    PhpMyAdmin-Authentication
- * @subpackage Cookie
- */
-namespace PMA\libraries\plugins\auth;
-
-use phpseclib\Crypt;
-use PMA\libraries\Message;
-use PMA\libraries\plugins\AuthenticationPlugin;
-use PMA\libraries\Response;
-use PMA\libraries\Util;
-use ReCaptcha\ReCaptcha;
-
-require_once './libraries/session.lib.php';
-
-/**
- * Remember where to redirect the user
- * in case of an expired session.
- */
-if (! empty($_REQUEST['target'])) {
-    $GLOBALS['target'] = $_REQUEST['target'];
-} else if (PMA_getenv('SCRIPT_NAME')) {
-    $GLOBALS['target'] = basename(PMA_getenv('SCRIPT_NAME'));
-}
-
-/**
- * Handles the cookie authentication method
- *
- * @package PhpMyAdmin-Authentication
- */
-class AuthenticationCookie extends AuthenticationPlugin
-{
-    /**
-     * IV for encryption
-     */
-    private $_cookie_iv = null;
-
-    /**
-     * Displays authentication form
-     *
-     * this function MUST exit/quit the application
-     *
-     * @global string $conn_error the last connection error
-     *
-     * @return boolean|void
-     */
-    public function auth()
-    {
-        global $conn_error;
-
-        $response = Response::getInstance();
-        if ($response->isAjax()) {
-            $response->setRequestStatus(false);
-            // redirect_flag redirects to the login page
-            $response->addJSON('redirect_flag', '1');
-            if (defined('TESTSUITE')) {
-                return true;
-            } else {
-                exit;
-            }
-        }
-
-        // No recall if blowfish secret is not configured as it would produce
-        // garbage
-        if ($GLOBALS['cfg']['LoginCookieRecall']
-            && ! empty($GLOBALS['cfg']['blowfish_secret'])
-        ) {
-            $default_user   = $GLOBALS['PHP_AUTH_USER'];
-            $default_server = $GLOBALS['pma_auth_server'];
-            $autocomplete   = '';
-        } else {
-            $default_user   = '';
-            $default_server = '';
-            // skip the IE autocomplete feature.
-            $autocomplete   = ' autocomplete="off"';
-        }
-
-        $response->getFooter()->setMinimal();
-        $header = $response->getHeader();
-        $header->setBodyId('loginform');
-        $header->setTitle('phpMyAdmin');
-        $header->disableMenuAndConsole();
-        $header->disableWarnings();
-
-        if (@file_exists(CUSTOM_HEADER_FILE)) {
-            include CUSTOM_HEADER_FILE;
-        }
-        echo '
-    <div class="container">
-    <a href="';
-        echo PMA_linkURL('https://www.phpmyadmin.net/');
-        echo '" target="_blank" rel="noopener noreferrer" class="logo">';
-        $logo_image = $GLOBALS['pmaThemeImage'] . 'logo_right.png';
-        if (@file_exists($logo_image)) {
-            echo '<img src="' , $logo_image
-                , '" id="imLogo" name="imLogo" alt="phpMyAdmin" border="0" />';
-        } else {
-            echo '<img name="imLogo" id="imLogo" src="'
-                , $GLOBALS['pmaThemeImage'] , 'pma_logo.png' , '" '
-                , 'border="0" width="88" height="31" alt="phpMyAdmin" />';
-        }
-        echo '</a>
-       <h1>';
-        echo sprintf(
-            __('Welcome to %s'),
-            '<bdo dir="ltr" lang="en">phpMyAdmin</bdo>'
-        );
-        echo "</h1>";
-
-        // Show error message
-        if (! empty($conn_error)) {
-            Message::rawError($conn_error)->display();
-        } elseif (isset($_GET['session_expired'])
-            && intval($_GET['session_expired']) == 1
-        ) {
-            Message::rawError(
-                __('Your session has expired. Please log in again.')
-            )->display();
-        }
-
-        echo "<noscript>\n";
-        Message::error(
-            __("Javascript must be enabled past this point!")
-        )->display();
-        echo "</noscript>\n";
-
-        echo "<div class='hide js-show'>";
-        // Displays the languages form
-        if (empty($GLOBALS['cfg']['Lang'])) {
-            include_once './libraries/display_select_lang.lib.php';
-            // use fieldset, don't show doc link
-            echo PMA_getLanguageSelectorHtml(true, false);
-        }
-        echo '</div>
-    <br />
-    <!-- Login form -->
-    <form method="post" action="index.php" name="login_form"' , $autocomplete ,
-            ' class="disableAjax login hide js-show">
-        <fieldset>
-        <legend>';
-        echo __('Log in');
-        echo Util::showDocu('index');
-        echo '</legend>';
-        if ($GLOBALS['cfg']['AllowArbitraryServer']) {
-            echo '
-            <div class="item">
-                <label for="input_servername" title="';
-            echo __(
-                'You can enter hostname/IP address and port separated by space.'
-            );
-            echo '">';
-            echo __('Server:');
-            echo '</label>
-                <input type="text" name="pma_servername" id="input_servername"';
-            echo ' value="';
-            echo htmlspecialchars($default_server);
-            echo '" size="24" class="textfield" title="';
-            echo __(
-                'You can enter hostname/IP address and port separated by space.'
-            ); echo '" />
-            </div>';
-        }
-            echo '<div class="item">
-                <label for="input_username">' , __('Username:') , '</label>
-                <input type="text" name="pma_username" id="input_username" '
-                , 'value="' , htmlspecialchars($default_user) , '" size="24"'
-                , ' class="textfield"/>
-            </div>
-            <div class="item">
-                <label for="input_password">' , __('Password:') , '</label>
-                <input type="password" name="pma_password" id="input_password"'
-                , ' value="" size="24" class="textfield" />
-            </div>';
-        if (count($GLOBALS['cfg']['Servers']) > 1) {
-            echo '<div class="item">
-                <label for="select_server">' . __('Server Choice:') . '</label>
-                <select name="server" id="select_server"';
-            if ($GLOBALS['cfg']['AllowArbitraryServer']) {
-                echo ' onchange="document.forms[\'login_form\'].'
-                    , 'elements[\'pma_servername\'].value = \'\'" ';
-            }
-            echo '>';
-
-            include_once './libraries/select_server.lib.php';
-            echo PMA_selectServer(false, false);
-
-            echo '</select></div>';
-        } else {
-            echo '    <input type="hidden" name="server" value="'
-                , $GLOBALS['server'] , '" />';
-        } // end if (server choice)
-
-        // Add captcha input field if reCaptcha is enabled
-        if (!empty($GLOBALS['cfg']['CaptchaLoginPrivateKey'])
-            && !empty($GLOBALS['cfg']['CaptchaLoginPublicKey'])
-        ) {
-            // If enabled show captcha to the user on the login screen.
-            echo '<script src="https://www.google.com/recaptcha/api.js?hl='
-                , $GLOBALS['lang'] , '" async defer></script>';
-            echo '<div class="g-recaptcha" data-sitekey="'
-                , htmlspecialchars($GLOBALS['cfg']['CaptchaLoginPublicKey']) , '"></div>';
-        }
-
-        echo '</fieldset>
-        <fieldset class="tblFooters">
-            <input value="' , __('Go') , '" type="submit" id="input_go" />';
-        $_form_params = array();
-        if (! empty($GLOBALS['target'])) {
-            $_form_params['target'] = $GLOBALS['target'];
-        }
-        if (! empty($GLOBALS['db'])) {
-            $_form_params['db'] = $GLOBALS['db'];
-        }
-        if (! empty($GLOBALS['table'])) {
-            $_form_params['table'] = $GLOBALS['table'];
-        }
-        // do not generate a "server" hidden field as we want the "server"
-        // drop-down to have priority
-        echo PMA_URL_getHiddenInputs($_form_params, '', 0, 'server');
-        echo '</fieldset>
-    </form>';
-
-        if ($GLOBALS['error_handler']->hasDisplayErrors()) {
-            echo '<div id="pma_errors">';
-            $GLOBALS['error_handler']->dispErrors();
-            echo '</div>';
-        }
-        echo '</div>';
-        if (@file_exists(CUSTOM_FOOTER_FILE)) {
-            include CUSTOM_FOOTER_FILE;
-        }
-        if (! defined('TESTSUITE')) {
-            exit;
-        } else {
-            return true;
-        }
-    }
-
-    /**
-     * Gets advanced authentication settings
-     *
-     * this function DOES NOT check authentication - it just checks/provides
-     * authentication credentials required to connect to the MySQL server
-     * usually with $GLOBALS['dbi']->connect()
-     *
-     * it returns false if something is missing - which usually leads to
-     * auth() which displays login form
-     *
-     * it returns true if all seems ok which usually leads to auth_set_user()
-     *
-     * it directly switches to authFails() if user inactivity timeout is reached
-     *
-     * @return boolean   whether we get authentication settings or not
-     */
-    public function authCheck()
-    {
-        global $conn_error;
-
-        // Initialization
-        /**
-         * @global $GLOBALS['pma_auth_server'] the user provided server to
-         * connect to
-         */
-        $GLOBALS['pma_auth_server'] = '';
-
-        $GLOBALS['PHP_AUTH_USER'] = $GLOBALS['PHP_AUTH_PW'] = '';
-        $GLOBALS['from_cookie'] = false;
-
-        if (! empty($_REQUEST['pma_username'])) {
-
-            // Verify Captcha if it is required.
-            if (! empty($GLOBALS['cfg']['CaptchaLoginPrivateKey'])
-                && ! empty($GLOBALS['cfg']['CaptchaLoginPublicKey'])
-            ) {
-                if (! empty($_POST["g-recaptcha-response"])) {
-
-                    include_once 'libraries/plugins/auth/recaptcha/autoload.php';
-                    $reCaptcha = new ReCaptcha(
-                        $GLOBALS['cfg']['CaptchaLoginPrivateKey']
-                    );
-
-                    // verify captcha status.
-                    $resp = $reCaptcha->verify(
-                        $_POST["g-recaptcha-response"],
-                        $_SERVER["REMOTE_ADDR"]
-                    );
-
-                    // Check if the captcha entered is valid, if not stop the login.
-                    if ($resp == null || ! $resp->isSuccess()) {
-                        $conn_error = __('Entered captcha is wrong, try again!');
-                        return false;
-                    }
-                } else {
-                    $conn_error = __('Please enter correct captcha!');
-                    return false;
-                }
-            }
-
-            // The user just logged in
-            $GLOBALS['PHP_AUTH_USER'] = PMA_sanitizeMySQLUser($_REQUEST['pma_username']);
-            $GLOBALS['PHP_AUTH_PW']   = empty($_REQUEST['pma_password'])
-                ? ''
-                : $_REQUEST['pma_password'];
-            if ($GLOBALS['cfg']['AllowArbitraryServer']
-                && isset($_REQUEST['pma_servername'])
-            ) {
-                if ($GLOBALS['cfg']['ArbitraryServerRegexp']) {
-                    $parts = explode(' ', $_REQUEST['pma_servername']);
-                    if (count($parts) == 2) {
-                        $tmp_host = $parts[0];
-                    } else {
-                        $tmp_host = $_REQUEST['pma_servername'];
-                    }
-
-                    $match = preg_match(
-                        $GLOBALS['cfg']['ArbitraryServerRegexp'], $tmp_host
-                    );
-                    if (! $match) {
-                        $conn_error = __(
-                            'You are not allowed to log in to this MySQL server!'
-                        );
-                        return false;
-                    }
-                }
-                $GLOBALS['pma_auth_server'] = PMA_sanitizeMySQLHost($_REQUEST['pma_servername']);
-            }
-            PMA_secureSession();
-            return true;
-        }
-
-        // At the end, try to set the $GLOBALS['PHP_AUTH_USER']
-        // and $GLOBALS['PHP_AUTH_PW'] variables from cookies
-
-        // check cookies
-        if (empty($_COOKIE['pmaUser-' . $GLOBALS['server']])) {
-            return false;
-        }
-
-        $GLOBALS['PHP_AUTH_USER'] = $this->cookieDecrypt(
-            $_COOKIE['pmaUser-' . $GLOBALS['server']],
-            $this->_getEncryptionSecret()
-        );
-
-        // user was never logged in since session start
-        if (empty($_SESSION['last_access_time'])) {
-            return false;
-        }
-
-        // User inactive too long
-        $last_access_time = time() - $GLOBALS['cfg']['LoginCookieValidity'];
-        if ($_SESSION['last_access_time'] < $last_access_time) {
-            Util::cacheUnset('is_create_db_priv');
-            Util::cacheUnset('is_reload_priv');
-            Util::cacheUnset('db_to_create');
-            Util::cacheUnset('dbs_where_create_table_allowed');
-            Util::cacheUnset('dbs_to_test');
-            Util::cacheUnset('db_priv');
-            Util::cacheUnset('col_priv');
-            Util::cacheUnset('table_priv');
-            Util::cacheUnset('proc_priv');
-
-            $GLOBALS['no_activity'] = true;
-            $this->authFails();
-            if (! defined('TESTSUITE')) {
-                exit;
-            } else {
-                return false;
-            }
-        }
-
-        // check password cookie
-        if (empty($_COOKIE['pmaAuth-' . $GLOBALS['server']])) {
-            return false;
-        }
-
-        $auth_data = json_decode(
-            $this->cookieDecrypt(
-                $_COOKIE['pmaAuth-' . $GLOBALS['server']],
-                $this->_getSessionEncryptionSecret()
-            ),
-            true
-        );
-        if (! is_array($auth_data) || ! isset($auth_data['password'])) {
-            return false;
-        }
-        $GLOBALS['PHP_AUTH_PW'] = $auth_data['password'];
-        if ($GLOBALS['cfg']['AllowArbitraryServer'] && ! empty($auth_data['server'])) {
-            $GLOBALS['pma_auth_server'] = $auth_data['server'];
-        }
-
-        $GLOBALS['from_cookie'] = true;
-
-        return true;
-    }
-
-    /**
-     * Set the user and password after last checkings if required
-     *
-     * @return boolean always true
-     */
-    public function authSetUser()
-    {
-        global $cfg;
-
-        // Ensures valid authentication mode, 'only_db', bookmark database and
-        // table names and relation table name are used
-        if (! hash_equals($cfg['Server']['user'], $GLOBALS['PHP_AUTH_USER'])) {
-            foreach ($cfg['Servers'] as $idx => $current) {
-                if ($current['host'] == $cfg['Server']['host']
-                    && $current['port'] == $cfg['Server']['port']
-                    && $current['socket'] == $cfg['Server']['socket']
-                    && $current['ssl'] == $cfg['Server']['ssl']
-                    && $current['connect_type'] == $cfg['Server']['connect_type']
-                    && hash_equals($current['user'], $GLOBALS['PHP_AUTH_USER'])
-                ) {
-                    $GLOBALS['server'] = $idx;
-                    $cfg['Server']     = $current;
-                    break;
-                }
-            } // end foreach
-        } // end if
-
-        if ($GLOBALS['cfg']['AllowArbitraryServer']
-            && ! empty($GLOBALS['pma_auth_server'])
-        ) {
-            /* Allow to specify 'host port' */
-            $parts = explode(' ', $GLOBALS['pma_auth_server']);
-            if (count($parts) == 2) {
-                $tmp_host = $parts[0];
-                $tmp_port = $parts[1];
-            } else {
-                $tmp_host = $GLOBALS['pma_auth_server'];
-                $tmp_port = '';
-            }
-            if ($cfg['Server']['host'] != $GLOBALS['pma_auth_server']) {
-                $cfg['Server']['host'] = $tmp_host;
-                if (! empty($tmp_port)) {
-                    $cfg['Server']['port'] = $tmp_port;
-                }
-            }
-            unset($tmp_host, $tmp_port, $parts);
-        }
-        $cfg['Server']['user']     = $GLOBALS['PHP_AUTH_USER'];
-        $cfg['Server']['password'] = $GLOBALS['PHP_AUTH_PW'];
-
-        // Avoid showing the password in phpinfo()'s output
-        unset($GLOBALS['PHP_AUTH_PW']);
-        unset($_SERVER['PHP_AUTH_PW']);
-        $this->setSessionAccessTime();
-    }
-
-    /**
-     * Stores user credentials after successful login.
-     *
-     * @return void|bool
-     */
-    public function storeUserCredentials()
-    {
-        global $cfg;
-
-        // Name and password cookies need to be refreshed each time
-        // Duration = one month for username
-        $this->storeUsernameCookie($cfg['Server']['user']);
-
-        // Duration = as configured
-        // Do not store password cookie on password change as we will
-        // set the cookie again after password has been changed
-        if (! isset($_POST['change_pw'])) {
-            $this->storePasswordCookie($cfg['Server']['password']);
-        }
-
-        // Set server cookies if required (once per session) and, in this case,
-        // force reload to ensure the client accepts cookies
-        if (! $GLOBALS['from_cookie']) {
-            // URL where to go:
-            $redirect_url = './index.php';
-
-            // any parameters to pass?
-            $url_params = array();
-            if (mb_strlen($GLOBALS['db'])) {
-                $url_params['db'] = $GLOBALS['db'];
-            }
-            if (mb_strlen($GLOBALS['table'])) {
-                $url_params['table'] = $GLOBALS['table'];
-            }
-            // any target to pass?
-            if (! empty($GLOBALS['target'])
-                && $GLOBALS['target'] != 'index.php'
-            ) {
-                $url_params['target'] = $GLOBALS['target'];
-            }
-
-            /**
-             * Clear user cache.
-             */
-            Util::clearUserCache();
-
-            Response::getInstance()
-                ->disable();
-
-            PMA_sendHeaderLocation(
-                $redirect_url . PMA_URL_getCommon($url_params, 'text'),
-                true
-            );
-            if (! defined('TESTSUITE')) {
-                exit;
-            } else {
-                return false;
-            }
-        } // end if
-
-        return true;
-    }
-
-    /**
-     * Stores username in a cookie.
-     *
-     * @param string $username User name
-     *
-     * @return void
-     */
-    public function storeUsernameCookie($username)
-    {
-        // Name and password cookies need to be refreshed each time
-        // Duration = one month for username
-        $GLOBALS['PMA_Config']->setCookie(
-            'pmaUser-' . $GLOBALS['server'],
-            $this->cookieEncrypt(
-                $username,
-                $this->_getEncryptionSecret()
-            )
-        );
-    }
-
-    /**
-     * Stores password in a cookie.
-     *
-     * @param string $password Password
-     *
-     * @return void
-     */
-    public function storePasswordCookie($password)
-    {
-        $payload = array('password' => $password);
-        if ($GLOBALS['cfg']['AllowArbitraryServer'] && ! empty($GLOBALS['pma_auth_server'])) {
-            $payload['server'] = $GLOBALS['pma_auth_server'];
-        }
-        // Duration = as configured
-        $GLOBALS['PMA_Config']->setCookie(
-            'pmaAuth-' . $GLOBALS['server'],
-            $this->cookieEncrypt(
-                json_encode($payload),
-                $this->_getSessionEncryptionSecret()
-            ),
-            null,
-            $GLOBALS['cfg']['LoginCookieStore']
-        );
-    }
-
-    /**
-     * User is not allowed to login to MySQL -> authentication failed
-     *
-     * prepares error message and switches to auth() which display the error
-     * and the login form
-     *
-     * this function MUST exit/quit the application,
-     * currently done by call to auth()
-     *
-     * @return void
-     */
-    public function authFails()
-    {
-        global $conn_error;
-
-        // Deletes password cookie and displays the login form
-        $GLOBALS['PMA_Config']->removeCookie('pmaAuth-' . $GLOBALS['server']);
-
-        $conn_error = $this->getErrorMessage();
-
-        $response = Response::getInstance();
-
-        // needed for PHP-CGI (not need for FastCGI or mod-php)
-        $response->header('Cache-Control: no-store, no-cache, must-revalidate');
-        $response->header('Pragma: no-cache');
-
-        $this->auth();
-    }
-
-    /**
-     * Returns blowfish secret or generates one if needed.
-     *
-     * @return string
-     */
-    private function _getEncryptionSecret()
-    {
-        if (empty($GLOBALS['cfg']['blowfish_secret'])) {
-            return $this->_getSessionEncryptionSecret();
-        } else {
-            return $GLOBALS['cfg']['blowfish_secret'];
-        }
-    }
-
-    /**
-     * Returns blowfish secret or generates one if needed.
-     *
-     * @return string
-     */
-    private function _getSessionEncryptionSecret()
-    {
-        if (empty($_SESSION['encryption_key'])) {
-            if (self::useOpenSSL()) {
-                $_SESSION['encryption_key'] = openssl_random_pseudo_bytes(32);
-            } else {
-                $_SESSION['encryption_key'] = Crypt\Random::string(32);
-            }
-        }
-        return $_SESSION['encryption_key'];
-    }
-
-    /**
-     * Checks whether we should use openssl for encryption.
-     *
-     * @return boolean
-     */
-    public static function useOpenSSL()
-    {
-        return (
-            function_exists('openssl_encrypt')
-            && function_exists('openssl_decrypt')
-            && function_exists('openssl_random_pseudo_bytes')
-        );
-    }
-
-    /**
-     * Concatenates secret in order to make it 16 bytes log
-     *
-     * This doesn't add any security, just ensures the secret
-     * is long enough by copying it.
-     *
-     * @param string $secret Original secret
-     *
-     * @return string
-     */
-    public function enlargeSecret($secret)
-    {
-        while (strlen($secret) < 16) {
-            $secret .= $secret;
-        }
-        return substr($secret, 0, 16);
-    }
-
-    /**
-     * Derives MAC secret from encryption secret.
-     *
-     * @param string $secret the secret
-     *
-     * @return string the MAC secret
-     */
-    public function getMACSecret($secret)
-    {
-        // Grab first part, up to 16 chars
-        // The MAC and AES secrets can overlap if original secret is short
-        $length = strlen($secret);
-        if ($length > 16) {
-            return substr($secret, 0, 16);
-        }
-        return $this->enlargeSecret(
-            $length == 1 ? $secret : substr($secret, 0, -1)
-        );
-    }
-
-    /**
-     * Derives AES secret from encryption secret.
-     *
-     * @param string $secret the secret
-     *
-     * @return string the AES secret
-     */
-    public function getAESSecret($secret)
-    {
-        // Grab second part, up to 16 chars
-        // The MAC and AES secrets can overlap if original secret is short
-        $length = strlen($secret);
-        if ($length > 16) {
-            return substr($secret, -16);
-        }
-        return $this->enlargeSecret(
-            $length == 1 ? $secret : substr($secret, 1)
-        );
-    }
-
-    /**
-     * Encryption using openssl's AES or phpseclib's AES
-     * (phpseclib uses mcrypt when it is available)
-     *
-     * @param string $data   original data
-     * @param string $secret the secret
-     *
-     * @return string the encrypted result
-     */
-    public function cookieEncrypt($data, $secret)
-    {
-        $mac_secret = $this->getMACSecret($secret);
-        $aes_secret = $this->getAESSecret($secret);
-        $iv = $this->createIV();
-        if (self::useOpenSSL()) {
-            $result = openssl_encrypt(
-                $data,
-                'AES-128-CBC',
-                $secret,
-                0,
-                $iv
-            );
-        } else {
-            $cipher = new Crypt\AES(Crypt\Base::MODE_CBC);
-            $cipher->setIV($iv);
-            $cipher->setKey($aes_secret);
-            $result = base64_encode($cipher->encrypt($data));
-        }
-        $iv = base64_encode($iv);
-        return json_encode(
-            array(
-                'iv' => $iv,
-                'mac' => hash_hmac('sha1', $iv . $result, $mac_secret),
-                'payload' => $result,
-            )
-        );
-    }
-
-    /**
-     * Decryption using openssl's AES or phpseclib's AES
-     * (phpseclib uses mcrypt when it is available)
-     *
-     * @param string $encdata encrypted data
-     * @param string $secret  the secret
-     *
-     * @return string|bool original data, false on error
-     */
-    public function cookieDecrypt($encdata, $secret)
-    {
-        $data = json_decode($encdata, true);
-
-        if (! is_array($data) || ! isset($data['mac']) || ! isset($data['iv']) || ! isset($data['payload'])
-            || ! is_string($data['mac']) || ! is_string($data['iv']) || ! is_string($data['payload'])
-            ) {
-            return false;
-        }
-
-        $mac_secret = $this->getMACSecret($secret);
-        $aes_secret = $this->getAESSecret($secret);
-        $newmac = hash_hmac('sha1', $data['iv'] . $data['payload'], $mac_secret);
-
-        if (! hash_equals($data['mac'], $newmac)) {
-            return false;
-        }
-
-        if (self::useOpenSSL()) {
-            return openssl_decrypt(
-                $data['payload'],
-                'AES-128-CBC',
-                $secret,
-                0,
-                base64_decode($data['iv'])
-            );
-        } else {
-            $cipher = new Crypt\AES(Crypt\Base::MODE_CBC);
-            $cipher->setIV(base64_decode($data['iv']));
-            $cipher->setKey($aes_secret);
-            return $cipher->decrypt(base64_decode($data['payload']));
-        }
-    }
-
-    /**
-     * Returns size of IV for encryption.
-     *
-     * @return int
-     */
-    public function getIVSize()
-    {
-        if (self::useOpenSSL()) {
-            return openssl_cipher_iv_length('AES-128-CBC');
-        }
-        $cipher = new Crypt\AES(Crypt\Base::MODE_CBC);
-        return $cipher->block_size;
-    }
-
-    /**
-     * Initialization
-     * Store the initialization vector because it will be needed for
-     * further decryption. I don't think necessary to have one iv
-     * per server so I don't put the server number in the cookie name.
-     *
-     * @return void
-     */
-    public function createIV()
-    {
-        /* Testsuite shortcut only to allow predictable IV */
-        if (! is_null($this->_cookie_iv)) {
-            return $this->_cookie_iv;
-        }
-        if (self::useOpenSSL()) {
-            return openssl_random_pseudo_bytes(
-                $this->getIVSize()
-            );
-        } else {
-            return Crypt\Random::string(
-                $this->getIVSize()
-            );
-        }
-    }
-
-    /**
-     * Sets encryption IV to use
-     *
-     * This is for testing only!
-     *
-     * @param string $vector The IV
-     *
-     * @return void
-     */
-    public function setIV($vector)
-    {
-        $this->_cookie_iv = $vector;
-    }
-
-    /**
-     * Callback when user changes password.
-     *
-     * @param string $password New password to set
-     *
-     * @return void
-     */
-    public function handlePasswordChange($password)
-    {
-        $this->storePasswordCookie($password);
-    }
-
-    /**
-     * Perform logout
-     *
-     * @return void
-     */
-    public function logOut()
-    {
-        // -> delete password cookie(s)
-        if ($GLOBALS['cfg']['LoginCookieDeleteAll']) {
-            foreach ($GLOBALS['cfg']['Servers'] as $key => $val) {
-                $GLOBALS['PMA_Config']->removeCookie('pmaAuth-' . $key);
-                if (isset($_COOKIE['pmaAuth-' . $key])) {
-                    unset($_COOKIE['pmaAuth-' . $key]);
-                }
-            }
-        } else {
-            $GLOBALS['PMA_Config']->removeCookie(
-                'pmaAuth-' . $GLOBALS['server']
-            );
-            if (isset($_COOKIE['pmaAuth-' . $GLOBALS['server']])) {
-                unset($_COOKIE['pmaAuth-' . $GLOBALS['server']]);
-            }
-        }
-        parent::logOut();
-    }
-}
diff --git a/#pma/libraries/plugins/auth/AuthenticationHttp.php b/#pma/libraries/plugins/auth/AuthenticationHttp.php
deleted file mode 100644
index b4c6f928..00000000
--- a/#pma/libraries/plugins/auth/AuthenticationHttp.php
+++ /dev/null
@@ -1,262 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * HTTP Authentication plugin for phpMyAdmin.
- * NOTE: Requires PHP loaded as a Apache module.
- *
- * @package    PhpMyAdmin-Authentication
- * @subpackage HTTP
- */
-namespace PMA\libraries\plugins\auth;
-
-use PMA\libraries\plugins\AuthenticationPlugin;
-use PMA\libraries\Message;
-use PMA\libraries\Response;
-
-/**
- * Handles the HTTP authentication methods
- *
- * @package PhpMyAdmin-Authentication
- */
-class AuthenticationHttp extends AuthenticationPlugin
-{
-    /**
-     * Displays authentication form and redirect as necessary
-     *
-     * @return boolean   always true (no return indeed)
-     */
-    public function auth()
-    {
-        $response = Response::getInstance();
-        if ($response->isAjax()) {
-            $response->setRequestStatus(false);
-            // reload_flag removes the token parameter from the URL and reloads
-            $response->addJSON('reload_flag', '1');
-            if (defined('TESTSUITE')) {
-                return true;
-            } else {
-                exit;
-            }
-        }
-
-        return $this->authForm();
-    }
-
-    /**
-     * Displays authentication form
-     *
-     * @return boolean
-     */
-    public function authForm()
-    {
-        if (empty($GLOBALS['cfg']['Server']['auth_http_realm'])) {
-            if (empty($GLOBALS['cfg']['Server']['verbose'])) {
-                $server_message = $GLOBALS['cfg']['Server']['host'];
-            } else {
-                $server_message = $GLOBALS['cfg']['Server']['verbose'];
-            }
-            $realm_message = 'phpMyAdmin ' . $server_message;
-        } else {
-            $realm_message = $GLOBALS['cfg']['Server']['auth_http_realm'];
-        }
-
-        $response = Response::getInstance();
-
-        // remove non US-ASCII to respect RFC2616
-        $realm_message = preg_replace('/[^\x20-\x7e]/i', '', $realm_message);
-        $response->header('WWW-Authenticate: Basic realm="' . $realm_message . '"');
-        $response->header('HTTP/1.0 401 Unauthorized');
-        if (php_sapi_name() !== 'cgi-fcgi') {
-            $response->header('status: 401 Unauthorized');
-        }
-
-        /* HTML header */
-        $footer = $response->getFooter();
-        $footer->setMinimal();
-        $header = $response->getHeader();
-        $header->setTitle(__('Access denied!'));
-        $header->disableMenuAndConsole();
-        $header->setBodyId('loginform');
-
-        $response->addHTML('<h1>');
-        $response->addHTML(sprintf(__('Welcome to %s'), ' phpMyAdmin'));
-        $response->addHTML('</h1>');
-        $response->addHTML('<h3>');
-        $response->addHTML(
-            Message::error(
-                __('Wrong username/password. Access denied.')
-            )
-        );
-        $response->addHTML('</h3>');
-
-        if (@file_exists(CUSTOM_FOOTER_FILE)) {
-            include CUSTOM_FOOTER_FILE;
-        }
-
-        if (!defined('TESTSUITE')) {
-            exit;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Gets advanced authentication settings
-     *
-     * @global  string $PHP_AUTH_USER          the username if register_globals is
-     *          on
-     * @global  string $PHP_AUTH_PW            the password if register_globals is
-     *          on
-     *
-     * @return boolean   whether we get authentication settings or not
-     */
-    public function authCheck()
-    {
-        global $PHP_AUTH_USER, $PHP_AUTH_PW;
-
-        // Grabs the $PHP_AUTH_USER variable whatever are the values of the
-        // 'register_globals' and the 'variables_order' directives
-        if (empty($PHP_AUTH_USER)) {
-            if (PMA_getenv('PHP_AUTH_USER')) {
-                $PHP_AUTH_USER = PMA_getenv('PHP_AUTH_USER');
-            } elseif (PMA_getenv('REMOTE_USER')) {
-                // CGI, might be encoded, see below
-                $PHP_AUTH_USER = PMA_getenv('REMOTE_USER');
-            } elseif (PMA_getenv('REDIRECT_REMOTE_USER')) {
-                // CGI, might be encoded, see below
-                $PHP_AUTH_USER = PMA_getenv('REDIRECT_REMOTE_USER');
-            } elseif (PMA_getenv('AUTH_USER')) {
-                // WebSite Professional
-                $PHP_AUTH_USER = PMA_getenv('AUTH_USER');
-            } elseif (PMA_getenv('HTTP_AUTHORIZATION')) {
-                // IIS, might be encoded, see below
-                $PHP_AUTH_USER = PMA_getenv('HTTP_AUTHORIZATION');
-            } elseif (PMA_getenv('Authorization')) {
-                // FastCGI, might be encoded, see below
-                $PHP_AUTH_USER = PMA_getenv('Authorization');
-            }
-        }
-        // Grabs the $PHP_AUTH_PW variable whatever are the values of the
-        // 'register_globals' and the 'variables_order' directives
-        if (empty($PHP_AUTH_PW)) {
-            if (PMA_getenv('PHP_AUTH_PW')) {
-                $PHP_AUTH_PW = PMA_getenv('PHP_AUTH_PW');
-            } elseif (PMA_getenv('REMOTE_PASSWORD')) {
-                // Apache/CGI
-                $PHP_AUTH_PW = PMA_getenv('REMOTE_PASSWORD');
-            } elseif (PMA_getenv('AUTH_PASSWORD')) {
-                // WebSite Professional
-                $PHP_AUTH_PW = PMA_getenv('AUTH_PASSWORD');
-            }
-        }
-
-        // Decode possibly encoded information (used by IIS/CGI/FastCGI)
-        // (do not use explode() because a user might have a colon in his password
-        if (strcmp(substr($PHP_AUTH_USER, 0, 6), 'Basic ') == 0) {
-            $usr_pass = base64_decode(substr($PHP_AUTH_USER, 6));
-            if (!empty($usr_pass)) {
-                $colon = strpos($usr_pass, ':');
-                if ($colon) {
-                    $PHP_AUTH_USER = substr($usr_pass, 0, $colon);
-                    $PHP_AUTH_PW = substr($usr_pass, $colon + 1);
-                }
-                unset($colon);
-            }
-            unset($usr_pass);
-        }
-
-        // sanitize username
-        $PHP_AUTH_USER = PMA_sanitizeMySQLUser($PHP_AUTH_USER);
-
-        // User logged out -> ensure the new username is not the same
-        $old_usr = isset($_REQUEST['old_usr']) ? $_REQUEST['old_usr'] : '';
-        if (! empty($old_usr)
-            && (isset($PHP_AUTH_USER) && hash_equals($old_usr, $PHP_AUTH_USER))
-        ) {
-            $PHP_AUTH_USER = '';
-            // -> delete user's choices that were stored in session
-            if (!defined('TESTSUITE')) {
-                session_destroy();
-            }
-        }
-
-        // Returns whether we get authentication settings or not
-        if (empty($PHP_AUTH_USER)) {
-            return false;
-        } else {
-            return true;
-        }
-    }
-
-    /**
-     * Set the user and password after last checkings if required
-     *
-     * @global  array   $cfg                   the valid servers settings
-     * @global  integer $server                the id of the current server
-     * @global  string  $PHP_AUTH_USER         the current username
-     * @global  string  $PHP_AUTH_PW           the current password
-     *
-     * @return boolean   always true
-     */
-    public function authSetUser()
-    {
-        global $cfg, $server;
-        global $PHP_AUTH_USER, $PHP_AUTH_PW;
-
-        // Ensures valid authentication mode, 'only_db', bookmark database and
-        // table names and relation table name are used
-        if (! hash_equals($cfg['Server']['user'], $PHP_AUTH_USER)) {
-            $servers_cnt = count($cfg['Servers']);
-            for ($i = 1; $i <= $servers_cnt; $i++) {
-                if (isset($cfg['Servers'][$i])
-                    && ($cfg['Servers'][$i]['host'] == $cfg['Server']['host']
-                    && hash_equals($cfg['Servers'][$i]['user'], $PHP_AUTH_USER))
-                ) {
-                    $server = $i;
-                    $cfg['Server'] = $cfg['Servers'][$i];
-                    break;
-                }
-            } // end for
-        } // end if
-
-        $cfg['Server']['user'] = $PHP_AUTH_USER;
-        $cfg['Server']['password'] = $PHP_AUTH_PW;
-
-        // Avoid showing the password in phpinfo()'s output
-        unset($GLOBALS['PHP_AUTH_PW']);
-        unset($_SERVER['PHP_AUTH_PW']);
-
-        $this->setSessionAccessTime();
-
-        return true;
-    }
-
-    /**
-     * User is not allowed to login to MySQL -> authentication failed
-     *
-     * @return bool true
-     */
-    public function authFails()
-    {
-        $error = $GLOBALS['dbi']->getError();
-        if ($error && $GLOBALS['errno'] != 1045) {
-            PMA_fatalError($error);
-
-            return true;
-        }
-
-        $this->authForm();
-
-        return true;
-    }
-
-    /**
-     * Returns URL for login form.
-     *
-     * @return string
-     */
-    public function getLoginFormURL()
-    {
-        return './index.php?old_usr=' . $GLOBALS['PHP_AUTH_USER'];
-    }
-}
diff --git a/#pma/libraries/plugins/auth/AuthenticationSignon.php b/#pma/libraries/plugins/auth/AuthenticationSignon.php
deleted file mode 100644
index df52cb7e..00000000
--- a/#pma/libraries/plugins/auth/AuthenticationSignon.php
+++ /dev/null
@@ -1,243 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * SignOn Authentication plugin for phpMyAdmin
- *
- * @package    PhpMyAdmin-Authentication
- * @subpackage SignOn
- */
-namespace PMA\libraries\plugins\auth;
-
-use PMA\libraries\plugins\AuthenticationPlugin;
-use PMA;
-
-/**
- * Handles the SignOn authentication method
- *
- * @package PhpMyAdmin-Authentication
- */
-class AuthenticationSignon extends AuthenticationPlugin
-{
-    /**
-     * Displays authentication form
-     *
-     * @return boolean   always true (no return indeed)
-     */
-    public function auth()
-    {
-        unset($_SESSION['LAST_SIGNON_URL']);
-        if (empty($GLOBALS['cfg']['Server']['SignonURL'])) {
-            PMA_fatalError('You must set SignonURL!');
-        } else {
-            PMA_sendHeaderLocation($GLOBALS['cfg']['Server']['SignonURL']);
-        }
-
-        if (!defined('TESTSUITE')) {
-            exit();
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Gets advanced authentication settings
-     *
-     * @global  string $PHP_AUTH_USER        the username if register_globals is on
-     * @global  string $PHP_AUTH_PW          the password if register_globals is on
-     *
-     * @return boolean   whether we get authentication settings or not
-     */
-    public function authCheck()
-    {
-        global $PHP_AUTH_USER, $PHP_AUTH_PW;
-
-        /* Check if we're using same signon server */
-        $signon_url = $GLOBALS['cfg']['Server']['SignonURL'];
-        if (isset($_SESSION['LAST_SIGNON_URL'])
-            && $_SESSION['LAST_SIGNON_URL'] != $signon_url
-        ) {
-            return false;
-        }
-
-        /* Script name */
-        $script_name = $GLOBALS['cfg']['Server']['SignonScript'];
-
-        /* Session name */
-        $session_name = $GLOBALS['cfg']['Server']['SignonSession'];
-
-        /* Login URL */
-        $signon_url = $GLOBALS['cfg']['Server']['SignonURL'];
-
-        /* Current host */
-        $single_signon_host = $GLOBALS['cfg']['Server']['host'];
-
-        /* Current port */
-        $single_signon_port = $GLOBALS['cfg']['Server']['port'];
-
-        /* No configuration updates */
-        $single_signon_cfgupdate = array();
-
-        /* Handle script based auth */
-        if (!empty($script_name)) {
-            if (!file_exists($script_name)) {
-                PMA_fatalError(
-                    __('Can not find signon authentication script:')
-                    . ' ' . $script_name
-                );
-            }
-            include $script_name;
-
-            list ($PHP_AUTH_USER, $PHP_AUTH_PW)
-                = get_login_credentials($GLOBALS['cfg']['Server']['user']);
-        } elseif (isset($_COOKIE[$session_name])) { /* Does session exist? */
-            /* End current session */
-            $old_session = session_name();
-            $old_id = session_id();
-            if (!defined('TESTSUITE')) {
-                session_write_close();
-            }
-
-            /* Load single signon session */
-            session_name($session_name);
-            session_id($_COOKIE[$session_name]);
-            if (!defined('TESTSUITE')) {
-                session_start();
-            }
-
-            /* Clear error message */
-            unset($_SESSION['PMA_single_signon_error_message']);
-
-            /* Grab credentials if they exist */
-            if (isset($_SESSION['PMA_single_signon_user'])) {
-                $PHP_AUTH_USER = $_SESSION['PMA_single_signon_user'];
-            }
-            if (isset($_SESSION['PMA_single_signon_password'])) {
-                $PHP_AUTH_PW = $_SESSION['PMA_single_signon_password'];
-            }
-            if (isset($_SESSION['PMA_single_signon_host'])) {
-                $single_signon_host = $_SESSION['PMA_single_signon_host'];
-            }
-
-            if (isset($_SESSION['PMA_single_signon_port'])) {
-                $single_signon_port = $_SESSION['PMA_single_signon_port'];
-            }
-
-            if (isset($_SESSION['PMA_single_signon_cfgupdate'])) {
-                $single_signon_cfgupdate = $_SESSION['PMA_single_signon_cfgupdate'];
-            }
-
-            /* Also get token as it is needed to access subpages */
-            if (isset($_SESSION['PMA_single_signon_token'])) {
-                /* No need to care about token on logout */
-                $pma_token = $_SESSION['PMA_single_signon_token'];
-            }
-
-            /* End single signon session */
-            if (!defined('TESTSUITE')) {
-                session_write_close();
-            }
-
-            /* Restart phpMyAdmin session */
-            session_name($old_session);
-            if (!empty($old_id)) {
-                session_id($old_id);
-            }
-            if (!defined('TESTSUITE')) {
-                session_start();
-            }
-
-            /* Set the single signon host */
-            $GLOBALS['cfg']['Server']['host'] = $single_signon_host;
-
-            /* Set the single signon port */
-            $GLOBALS['cfg']['Server']['port'] = $single_signon_port;
-
-            /* Configuration update */
-            $GLOBALS['cfg']['Server'] = array_merge(
-                $GLOBALS['cfg']['Server'],
-                $single_signon_cfgupdate
-            );
-
-            /* Restore our token */
-            if (!empty($pma_token)) {
-                $_SESSION[' PMA_token '] = $pma_token;
-            }
-
-            /**
-             * Clear user cache.
-             */
-            PMA\libraries\Util::clearUserCache();
-        }
-
-        // Returns whether we get authentication settings or not
-        if (empty($PHP_AUTH_USER)) {
-            unset($_SESSION['LAST_SIGNON_URL']);
-
-            return false;
-        } else {
-            $_SESSION['LAST_SIGNON_URL'] = $GLOBALS['cfg']['Server']['SignonURL'];
-
-            return true;
-        }
-    }
-
-    /**
-     * Set the user and password after last checkings if required
-     *
-     * @global  array  $cfg                   the valid servers settings
-     * @global  string $PHP_AUTH_USER         the current username
-     * @global  string $PHP_AUTH_PW           the current password
-     *
-     * @return boolean   always true
-     */
-    public function authSetUser()
-    {
-        global $cfg;
-        global $PHP_AUTH_USER, $PHP_AUTH_PW;
-
-        $cfg['Server']['user'] = $PHP_AUTH_USER;
-        $cfg['Server']['password'] = $PHP_AUTH_PW;
-
-        return true;
-    }
-
-    /**
-     * User is not allowed to login to MySQL -> authentication failed
-     *
-     * @return boolean   always true (no return indeed)
-     */
-    public function authFails()
-    {
-        /* Session name */
-        $session_name = $GLOBALS['cfg']['Server']['SignonSession'];
-
-        /* Does session exist? */
-        if (isset($_COOKIE[$session_name])) {
-            /* End current session */
-            if (!defined('TESTSUITE')) {
-                session_write_close();
-            }
-
-            /* Load single signon session */
-            session_name($session_name);
-            session_id($_COOKIE[$session_name]);
-            if (!defined('TESTSUITE')) {
-                session_start();
-            }
-
-            /* Set error message */
-            $_SESSION['PMA_single_signon_error_message'] = $this->getErrorMessage();
-        }
-        $this->auth();
-    }
-
-    /**
-     * Returns URL for login form.
-     *
-     * @return string
-     */
-    public function getLoginFormURL()
-    {
-        return $GLOBALS['cfg']['Server']['SignonURL'];
-    }
-}
diff --git a/#pma/libraries/plugins/auth/recaptcha/LICENSE b/#pma/libraries/plugins/auth/recaptcha/LICENSE
deleted file mode 100644
index f6412328..00000000
--- a/#pma/libraries/plugins/auth/recaptcha/LICENSE
+++ /dev/null
@@ -1,29 +0,0 @@
-Copyright 2014, Google Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-    * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
diff --git a/#pma/libraries/plugins/auth/recaptcha/ReCaptcha/ReCaptcha.php b/#pma/libraries/plugins/auth/recaptcha/ReCaptcha/ReCaptcha.php
deleted file mode 100644
index e2f7c347..00000000
--- a/#pma/libraries/plugins/auth/recaptcha/ReCaptcha/ReCaptcha.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-/**
- * This is a PHP library that handles calling reCAPTCHA.
- *
- * @copyright Copyright (c) 2015, Google Inc.
- * @link      http://www.google.com/recaptcha
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-namespace ReCaptcha;
-
-/**
- * reCAPTCHA client.
- */
-class ReCaptcha
-{
-    /**
-     * Version of this client library.
-     * @const string
-     */
-    const VERSION = 'php_1.1.2';
-
-    /**
-     * Shared secret for the site.
-     * @var type string
-     */
-    private $secret;
-
-    /**
-     * Method used to communicate  with service. Defaults to POST request.
-     * @var RequestMethod
-     */
-    private $requestMethod;
-
-    /**
-     * Create a configured instance to use the reCAPTCHA service.
-     *
-     * @param string $secret shared secret between site and reCAPTCHA server.
-     * @param RequestMethod $requestMethod method used to send the request. Defaults to POST.
-     */
-    public function __construct($secret, RequestMethod $requestMethod = null)
-    {
-        if (empty($secret)) {
-            throw new \RuntimeException('No secret provided');
-        }
-
-        if (!is_string($secret)) {
-            throw new \RuntimeException('The provided secret must be a string');
-        }
-
-        $this->secret = $secret;
-
-        if (!is_null($requestMethod)) {
-            $this->requestMethod = $requestMethod;
-        } else {
-            $this->requestMethod = new RequestMethod\Post();
-        }
-    }
-
-    /**
-     * Calls the reCAPTCHA siteverify API to verify whether the user passes
-     * CAPTCHA test.
-     *
-     * @param string $response The value of 'g-recaptcha-response' in the submitted form.
-     * @param string $remoteIp The end user's IP address.
-     * @return Response Response from the service.
-     */
-    public function verify($response, $remoteIp = null)
-    {
-        // Discard empty solution submissions
-        if (empty($response)) {
-            $recaptchaResponse = new Response(false, array('missing-input-response'));
-            return $recaptchaResponse;
-        }
-
-        $params = new RequestParameters($this->secret, $response, $remoteIp, self::VERSION);
-        $rawResponse = $this->requestMethod->submit($params);
-        return Response::fromJson($rawResponse);
-    }
-}
diff --git a/#pma/libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod.php b/#pma/libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod.php
deleted file mode 100644
index fc4dde59..00000000
--- a/#pma/libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * This is a PHP library that handles calling reCAPTCHA.
- *
- * @copyright Copyright (c) 2015, Google Inc.
- * @link      http://www.google.com/recaptcha
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-namespace ReCaptcha;
-
-/**
- * Method used to send the request to the service.
- */
-interface RequestMethod
-{
-
-    /**
-     * Submit the request with the specified parameters.
-     *
-     * @param RequestParameters $params Request parameters
-     * @return string Body of the reCAPTCHA response
-     */
-    public function submit(RequestParameters $params);
-}
diff --git a/#pma/libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod/Curl.php b/#pma/libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod/Curl.php
deleted file mode 100644
index 20ee5309..00000000
--- a/#pma/libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod/Curl.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-/**
- * This is a PHP library that handles calling reCAPTCHA.
- *
- * @copyright Copyright (c) 2015, Google Inc.
- * @link      http://www.google.com/recaptcha
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-namespace ReCaptcha\RequestMethod;
-
-/**
- * Convenience wrapper around the cURL functions to allow mocking.
- */
-class Curl
-{
-
-    /**
-     * @see http://php.net/curl_init
-     * @param string $url
-     * @return resource cURL handle
-     */
-    public function init($url = null)
-    {
-        return curl_init($url);
-    }
-
-    /**
-     * @see http://php.net/curl_setopt_array
-     * @param resource $ch
-     * @param array $options
-     * @return bool
-     */
-    public function setoptArray($ch, array $options)
-    {
-        return curl_setopt_array($ch, $options);
-    }
-
-    /**
-     * @see http://php.net/curl_exec
-     * @param resource $ch
-     * @return mixed
-     */
-    public function exec($ch)
-    {
-        return curl_exec($ch);
-    }
-
-    /**
-     * @see http://php.net/curl_close
-     * @param resource $ch
-     */
-    public function close($ch)
-    {
-        curl_close($ch);
-    }
-}
diff --git a/#pma/libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod/CurlPost.php b/#pma/libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod/CurlPost.php
deleted file mode 100644
index e06d1cc8..00000000
--- a/#pma/libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod/CurlPost.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-/**
- * This is a PHP library that handles calling reCAPTCHA.
- *
- * @copyright Copyright (c) 2015, Google Inc.
- * @link      http://www.google.com/recaptcha
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-namespace ReCaptcha\RequestMethod;
-
-use ReCaptcha\RequestMethod;
-use ReCaptcha\RequestParameters;
-
-/**
- * Sends cURL request to the reCAPTCHA service.
- * Note: this requires the cURL extension to be enabled in PHP
- * @see http://php.net/manual/en/book.curl.php
- */
-class CurlPost implements RequestMethod
-{
-    /**
-     * URL to which requests are sent via cURL.
-     * @const string
-     */
-    const SITE_VERIFY_URL = 'https://www.google.com/recaptcha/api/siteverify';
-
-    /**
-     * Curl connection to the reCAPTCHA service
-     * @var Curl
-     */
-    private $curl;
-
-    public function __construct(Curl $curl = null)
-    {
-        if (!is_null($curl)) {
-            $this->curl = $curl;
-        } else {
-            $this->curl = new Curl();
-        }
-    }
-
-    /**
-     * Submit the cURL request with the specified parameters.
-     *
-     * @param RequestParameters $params Request parameters
-     * @return string Body of the reCAPTCHA response
-     */
-    public function submit(RequestParameters $params)
-    {
-        $handle = $this->curl->init(self::SITE_VERIFY_URL);
-
-        $options = array(
-            CURLOPT_POST => true,
-            CURLOPT_POSTFIELDS => $params->toQueryString(),
-            CURLOPT_HTTPHEADER => array(
-                'Content-Type: application/x-www-form-urlencoded'
-            ),
-            CURLINFO_HEADER_OUT => false,
-            CURLOPT_HEADER => false,
-            CURLOPT_RETURNTRANSFER => true,
-            CURLOPT_SSL_VERIFYPEER => true
-        );
-        $this->curl->setoptArray($handle, $options);
-
-        $response = $this->curl->exec($handle);
-        $this->curl->close($handle);
-
-        return $response;
-    }
-}
diff --git a/#pma/libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod/Post.php b/#pma/libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod/Post.php
deleted file mode 100644
index 7770d908..00000000
--- a/#pma/libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod/Post.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-/**
- * This is a PHP library that handles calling reCAPTCHA.
- *
- * @copyright Copyright (c) 2015, Google Inc.
- * @link      http://www.google.com/recaptcha
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-namespace ReCaptcha\RequestMethod;
-
-use ReCaptcha\RequestMethod;
-use ReCaptcha\RequestParameters;
-
-/**
- * Sends POST requests to the reCAPTCHA service.
- */
-class Post implements RequestMethod
-{
-    /**
-     * URL to which requests are POSTed.
-     * @const string
-     */
-    const SITE_VERIFY_URL = 'https://www.google.com/recaptcha/api/siteverify';
-
-    /**
-     * Submit the POST request with the specified parameters.
-     *
-     * @param RequestParameters $params Request parameters
-     * @return string Body of the reCAPTCHA response
-     */
-    public function submit(RequestParameters $params)
-    {
-        /**
-         * PHP 5.6.0 changed the way you specify the peer name for SSL context options.
-         * Using "CN_name" will still work, but it will raise deprecated errors.
-         */
-        $peer_key = version_compare(PHP_VERSION, '5.6.0', '<') ? 'CN_name' : 'peer_name';
-        $options = array(
-            'http' => array(
-                'header' => "Content-type: application/x-www-form-urlencoded\r\n",
-                'method' => 'POST',
-                'content' => $params->toQueryString(),
-                // Force the peer to validate (not needed in 5.6.0+, but still works
-                'verify_peer' => true,
-                // Force the peer validation to use www.google.com
-                $peer_key => 'www.google.com',
-            ),
-        );
-        $context = stream_context_create($options);
-        return file_get_contents(self::SITE_VERIFY_URL, false, $context);
-    }
-}
diff --git a/#pma/libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod/Socket.php b/#pma/libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod/Socket.php
deleted file mode 100644
index d3c87922..00000000
--- a/#pma/libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod/Socket.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-/**
- * This is a PHP library that handles calling reCAPTCHA.
- *
- * @copyright Copyright (c) 2015, Google Inc.
- * @link      http://www.google.com/recaptcha
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-namespace ReCaptcha\RequestMethod;
-
-/**
- * Convenience wrapper around native socket and file functions to allow for
- * mocking.
- */
-class Socket
-{
-    private $handle = null;
-
-    /**
-     * fsockopen
-     * 
-     * @see http://php.net/fsockopen
-     * @param string $hostname
-     * @param int $port
-     * @param int $errno
-     * @param string $errstr
-     * @param float $timeout
-     * @return resource
-     */
-    public function fsockopen($hostname, $port = -1, &$errno = 0, &$errstr = '', $timeout = null)
-    {
-        $this->handle = fsockopen($hostname, $port, $errno, $errstr, (is_null($timeout) ? ini_get("default_socket_timeout") : $timeout));
-
-        if ($this->handle != false && $errno === 0 && $errstr === '') {
-            return $this->handle;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * fwrite
-     * 
-     * @see http://php.net/fwrite
-     * @param string $string
-     * @param int $length
-     * @return int | bool
-     */
-    public function fwrite($string, $length = null)
-    {
-        return fwrite($this->handle, $string, (is_null($length) ? strlen($string) : $length));
-    }
-
-    /**
-     * fgets
-     * 
-     * @see http://php.net/fgets
-     * @param int $length
-     * @return string
-     */
-    public function fgets($length = null)
-    {
-        return fgets($this->handle, $length);
-    }
-
-    /**
-     * feof
-     * 
-     * @see http://php.net/feof
-     * @return bool
-     */
-    public function feof()
-    {
-        return feof($this->handle);
-    }
-
-    /**
-     * fclose
-     * 
-     * @see http://php.net/fclose
-     * @return bool
-     */
-    public function fclose()
-    {
-        return fclose($this->handle);
-    }
-}
diff --git a/#pma/libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod/SocketPost.php b/#pma/libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod/SocketPost.php
deleted file mode 100644
index 47541215..00000000
--- a/#pma/libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod/SocketPost.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-/**
- * This is a PHP library that handles calling reCAPTCHA.
- *
- * @copyright Copyright (c) 2015, Google Inc.
- * @link      http://www.google.com/recaptcha
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-namespace ReCaptcha\RequestMethod;
-
-use ReCaptcha\RequestMethod;
-use ReCaptcha\RequestParameters;
-
-/**
- * Sends a POST request to the reCAPTCHA service, but makes use of fsockopen()
- * instead of get_file_contents(). This is to account for people who may be on
- * servers where allow_furl_open is disabled.
- */
-class SocketPost implements RequestMethod
-{
-    /**
-     * reCAPTCHA service host.
-     * @const string
-     */
-    const RECAPTCHA_HOST = 'www.google.com';
-
-    /**
-     * @const string reCAPTCHA service path
-     */
-    const SITE_VERIFY_PATH = '/recaptcha/api/siteverify';
-
-    /**
-     * @const string Bad request error
-     */
-    const BAD_REQUEST = '{"success": false, "error-codes": ["invalid-request"]}';
-
-    /**
-     * @const string Bad response error
-     */
-    const BAD_RESPONSE = '{"success": false, "error-codes": ["invalid-response"]}';
-
-    /**
-     * Socket to the reCAPTCHA service
-     * @var Socket
-     */
-    private $socket;
-
-    /**
-     * Constructor
-     *
-     * @param \ReCaptcha\RequestMethod\Socket $socket optional socket, injectable for testing
-     */
-    public function __construct(Socket $socket = null)
-    {
-        if (!is_null($socket)) {
-            $this->socket = $socket;
-        } else {
-            $this->socket = new Socket();
-        }
-    }
-
-    /**
-     * Submit the POST request with the specified parameters.
-     *
-     * @param RequestParameters $params Request parameters
-     * @return string Body of the reCAPTCHA response
-     */
-    public function submit(RequestParameters $params)
-    {
-        $errno = 0;
-        $errstr = '';
-
-        if (false === $this->socket->fsockopen('ssl://' . self::RECAPTCHA_HOST, 443, $errno, $errstr, 30)) {
-            return self::BAD_REQUEST;
-        }
-
-        $content = $params->toQueryString();
-
-        $request = "POST " . self::SITE_VERIFY_PATH . " HTTP/1.1\r\n";
-        $request .= "Host: " . self::RECAPTCHA_HOST . "\r\n";
-        $request .= "Content-Type: application/x-www-form-urlencoded\r\n";
-        $request .= "Content-length: " . strlen($content) . "\r\n";
-        $request .= "Connection: close\r\n\r\n";
-        $request .= $content . "\r\n\r\n";
-
-        $this->socket->fwrite($request);
-        $response = '';
-
-        while (!$this->socket->feof()) {
-            $response .= $this->socket->fgets(4096);
-        }
-
-        $this->socket->fclose();
-
-        if (0 !== strpos($response, 'HTTP/1.1 200 OK')) {
-            return self::BAD_RESPONSE;
-        }
-
-        $parts = preg_split("#\n\s*\n#Uis", $response);
-
-        return $parts[1];
-    }
-}
diff --git a/#pma/libraries/plugins/auth/recaptcha/ReCaptcha/RequestParameters.php b/#pma/libraries/plugins/auth/recaptcha/ReCaptcha/RequestParameters.php
deleted file mode 100644
index cb66f26c..00000000
--- a/#pma/libraries/plugins/auth/recaptcha/ReCaptcha/RequestParameters.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-/**
- * This is a PHP library that handles calling reCAPTCHA.
- *
- * @copyright Copyright (c) 2015, Google Inc.
- * @link      http://www.google.com/recaptcha
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-namespace ReCaptcha;
-
-/**
- * Stores and formats the parameters for the request to the reCAPTCHA service.
- */
-class RequestParameters
-{
-    /**
-     * Site secret.
-     * @var string
-     */
-    private $secret;
-
-    /**
-     * Form response.
-     * @var string
-     */
-    private $response;
-
-    /**
-     * Remote user's IP address.
-     * @var string
-     */
-    private $remoteIp;
-
-    /**
-     * Client version.
-     * @var string
-     */
-    private $version;
-
-    /**
-     * Initialise parameters.
-     *
-     * @param string $secret Site secret.
-     * @param string $response Value from g-captcha-response form field.
-     * @param string $remoteIp User's IP address.
-     * @param string $version Version of this client library.
-     */
-    public function __construct($secret, $response, $remoteIp = null, $version = null)
-    {
-        $this->secret = $secret;
-        $this->response = $response;
-        $this->remoteIp = $remoteIp;
-        $this->version = $version;
-    }
-
-    /**
-     * Array representation.
-     *
-     * @return array Array formatted parameters.
-     */
-    public function toArray()
-    {
-        $params = array('secret' => $this->secret, 'response' => $this->response);
-
-        if (!is_null($this->remoteIp)) {
-            $params['remoteip'] = $this->remoteIp;
-        }
-
-        if (!is_null($this->version)) {
-            $params['version'] = $this->version;
-        }
-
-        return $params;
-    }
-
-    /**
-     * Query string representation for HTTP request.
-     *
-     * @return string Query string formatted parameters.
-     */
-    public function toQueryString()
-    {
-        return http_build_query($this->toArray(), '', '&');
-    }
-}
diff --git a/#pma/libraries/plugins/auth/recaptcha/ReCaptcha/Response.php b/#pma/libraries/plugins/auth/recaptcha/ReCaptcha/Response.php
deleted file mode 100644
index d2d8a8bf..00000000
--- a/#pma/libraries/plugins/auth/recaptcha/ReCaptcha/Response.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-/**
- * This is a PHP library that handles calling reCAPTCHA.
- *
- * @copyright Copyright (c) 2015, Google Inc.
- * @link      http://www.google.com/recaptcha
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-namespace ReCaptcha;
-
-/**
- * The response returned from the service.
- */
-class Response
-{
-    /**
-     * Succes or failure.
-     * @var boolean
-     */
-    private $success = false;
-
-    /**
-     * Error code strings.
-     * @var array
-     */
-    private $errorCodes = array();
-
-    /**
-     * Build the response from the expected JSON returned by the service.
-     *
-     * @param string $json
-     * @return \ReCaptcha\Response
-     */
-    public static function fromJson($json)
-    {
-        $responseData = json_decode($json, true);
-
-        if (!$responseData) {
-            return new Response(false, array('invalid-json'));
-        }
-
-        if (isset($responseData['success']) && $responseData['success'] == true) {
-            return new Response(true);
-        }
-
-        if (isset($responseData['error-codes']) && is_array($responseData['error-codes'])) {
-            return new Response(false, $responseData['error-codes']);
-        }
-
-        return new Response(false);
-    }
-
-    /**
-     * Constructor.
-     *
-     * @param boolean $success
-     * @param array $errorCodes
-     */
-    public function __construct($success, array $errorCodes = array())
-    {
-        $this->success = $success;
-        $this->errorCodes = $errorCodes;
-    }
-
-    /**
-     * Is success?
-     *
-     * @return boolean
-     */
-    public function isSuccess()
-    {
-        return $this->success;
-    }
-
-    /**
-     * Get error codes.
-     *
-     * @return array
-     */
-    public function getErrorCodes()
-    {
-        return $this->errorCodes;
-    }
-}
diff --git a/#pma/libraries/plugins/auth/recaptcha/autoload.php b/#pma/libraries/plugins/auth/recaptcha/autoload.php
deleted file mode 100644
index a53cbd78..00000000
--- a/#pma/libraries/plugins/auth/recaptcha/autoload.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-/* An autoloader for ReCaptcha\Foo classes. This should be require()d
- * by the user before attempting to instantiate any of the ReCaptcha
- * classes.
- */
-
-spl_autoload_register(function ($class) {
-    if (substr($class, 0, 10) !== 'ReCaptcha\\') {
-      /* If the class does not lie under the "ReCaptcha" namespace,
-       * then we can exit immediately.
-       */
-      return;
-    }
-
-    /* All of the classes have names like "ReCaptcha\Foo", so we need
-     * to replace the backslashes with frontslashes if we want the
-     * name to map directly to a location in the filesystem.
-     */
-    $class = str_replace('\\', '/', $class);
-
-    /* First, check under the current directory. It is important that
-     * we look here first, so that we don't waste time searching for
-     * test classes in the common case.
-     */
-    $path = dirname(__FILE__).'/'.$class.'.php';
-    if (is_readable($path)) {
-        require_once $path;
-    }
-
-    /* If we didn't find what we're looking for already, maybe it's
-     * a test class?
-     */
-    $path = dirname(__FILE__).'/../tests/'.$class.'.php';
-    if (is_readable($path)) {
-        require_once $path;
-    }
-});
diff --git a/#pma/libraries/plugins/export/ExportCodegen.php b/#pma/libraries/plugins/export/ExportCodegen.php
deleted file mode 100644
index 52c9a29a..00000000
--- a/#pma/libraries/plugins/export/ExportCodegen.php
+++ /dev/null
@@ -1,443 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Set of functions used to build NHibernate dumps of tables
- *
- * @package    PhpMyAdmin-Export
- * @subpackage CodeGen
- */
-namespace PMA\libraries\plugins\export;
-
-use PMA\libraries\plugins\ExportPlugin;
-use PMA\libraries\properties\plugins\ExportPluginProperties;
-use PMA\libraries\properties\options\items\HiddenPropertyItem;
-use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
-use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
-use PMA;
-use PMA\libraries\properties\options\items\SelectPropertyItem;
-use PMA\libraries\plugins\export\TableProperty;
-
-/**
- * Handles the export for the CodeGen class
- *
- * @package    PhpMyAdmin-Export
- * @subpackage CodeGen
- */
-class ExportCodegen extends ExportPlugin
-{
-    /**
-     * CodeGen Formats
-     *
-     * @var array
-     */
-    private $_cgFormats;
-    /**
-     * CodeGen Handlers
-     *
-     * @var array
-     */
-    private $_cgHandlers;
-
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        // initialize the specific export CodeGen variables
-        $this->initSpecificVariables();
-        $this->setProperties();
-    }
-
-    /**
-     * Initialize the local variables that are used for export CodeGen
-     *
-     * @return void
-     */
-    protected function initSpecificVariables()
-    {
-        $this->_setCgFormats(
-            array(
-                "NHibernate C# DO",
-                "NHibernate XML",
-            )
-        );
-
-        $this->_setCgHandlers(
-            array(
-                "_handleNHibernateCSBody",
-                "_handleNHibernateXMLBody",
-            )
-        );
-    }
-
-    /**
-     * Sets the export CodeGen properties
-     *
-     * @return void
-     */
-    protected function setProperties()
-    {
-        $exportPluginProperties = new ExportPluginProperties();
-        $exportPluginProperties->setText('CodeGen');
-        $exportPluginProperties->setExtension('cs');
-        $exportPluginProperties->setMimeType('text/cs');
-        $exportPluginProperties->setOptionsText(__('Options'));
-
-        // create the root group that will be the options field for
-        // $exportPluginProperties
-        // this will be shown as "Format specific options"
-        $exportSpecificOptions = new OptionsPropertyRootGroup(
-            "Format Specific Options"
-        );
-
-        // general options main group
-        $generalOptions = new OptionsPropertyMainGroup("general_opts");
-        // create primary items and add them to the group
-        $leaf = new HiddenPropertyItem("structure_or_data");
-        $generalOptions->addProperty($leaf);
-        $leaf = new SelectPropertyItem(
-            "format",
-            __('Format:')
-        );
-        $leaf->setValues($this->_getCgFormats());
-        $generalOptions->addProperty($leaf);
-        // add the main group to the root group
-        $exportSpecificOptions->addProperty($generalOptions);
-
-        // set the options for the export plugin property item
-        $exportPluginProperties->setOptions($exportSpecificOptions);
-        $this->properties = $exportPluginProperties;
-    }
-
-    /**
-     * Outputs export header
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportHeader()
-    {
-        return true;
-    }
-
-    /**
-     * Outputs export footer
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportFooter()
-    {
-        return true;
-    }
-
-    /**
-     * Outputs database header
-     *
-     * @param string $db       Database name
-     * @param string $db_alias Aliases of db
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportDBHeader($db, $db_alias = '')
-    {
-        return true;
-    }
-
-    /**
-     * Outputs database footer
-     *
-     * @param string $db Database name
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportDBFooter($db)
-    {
-        return true;
-    }
-
-    /**
-     * Outputs CREATE DATABASE statement
-     *
-     * @param string $db          Database name
-     * @param string $export_type 'server', 'database', 'table'
-     * @param string $db_alias    Aliases of db
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportDBCreate($db, $export_type, $db_alias = '')
-    {
-        return true;
-    }
-
-    /**
-     * Outputs the content of a table in NHibernate format
-     *
-     * @param string $db        database name
-     * @param string $table     table name
-     * @param string $crlf      the end of line sequence
-     * @param string $error_url the url to go back in case of error
-     * @param string $sql_query SQL query for obtaining data
-     * @param array  $aliases   Aliases of db/table/columns
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportData(
-        $db,
-        $table,
-        $crlf,
-        $error_url,
-        $sql_query,
-        $aliases = array()
-    ) {
-        $CG_FORMATS = $this->_getCgFormats();
-        $CG_HANDLERS = $this->_getCgHandlers();
-
-        $format = $GLOBALS['codegen_format'];
-        if (isset($CG_FORMATS[$format])) {
-            $method = $CG_HANDLERS[$format];
-
-            return PMA_exportOutputHandler(
-                $this->$method($db, $table, $crlf, $aliases)
-            );
-        }
-
-        return PMA_exportOutputHandler(sprintf("%s is not supported.", $format));
-    }
-
-    /**
-     * Used to make identifiers (from table or database names)
-     *
-     * @param string $str     name to be converted
-     * @param bool   $ucfirst whether to make the first character uppercase
-     *
-     * @return string identifier
-     */
-    public static function cgMakeIdentifier($str, $ucfirst = true)
-    {
-        // remove unsafe characters
-        $str = preg_replace('/[^\p{L}\p{Nl}_]/u', '', $str);
-        // make sure first character is a letter or _
-        if (!preg_match('/^\pL/u', $str)) {
-            $str = '_' . $str;
-        }
-        if ($ucfirst) {
-            $str = ucfirst($str);
-        }
-
-        return $str;
-    }
-
-    /**
-     * C# Handler
-     *
-     * @param string $db      database name
-     * @param string $table   table name
-     * @param string $crlf    line separator
-     * @param array  $aliases Aliases of db/table/columns
-     *
-     * @return string containing C# code lines, separated by "\n"
-     */
-    private function _handleNHibernateCSBody($db, $table, $crlf, $aliases = array())
-    {
-        $db_alias = $db;
-        $table_alias = $table;
-        $this->initAlias($aliases, $db_alias, $table_alias);
-        $lines = array();
-
-        $result = $GLOBALS['dbi']->query(
-            sprintf(
-                'DESC %s.%s',
-                PMA\libraries\Util::backquote($db),
-                PMA\libraries\Util::backquote($table)
-            )
-        );
-        if ($result) {
-            /** @var TableProperty[] $tableProperties */
-            $tableProperties = array();
-            while ($row = $GLOBALS['dbi']->fetchRow($result)) {
-                $col_as = $this->getAlias($aliases, $row[0], 'col', $db, $table);
-                if (!empty($col_as)) {
-                    $row[0] = $col_as;
-                }
-                $tableProperties[] = new TableProperty($row);
-            }
-            $GLOBALS['dbi']->freeResult($result);
-            $lines[] = 'using System;';
-            $lines[] = 'using System.Collections;';
-            $lines[] = 'using System.Collections.Generic;';
-            $lines[] = 'using System.Text;';
-            $lines[] = 'namespace ' . ExportCodegen::cgMakeIdentifier($db_alias);
-            $lines[] = '{';
-            $lines[] = '    #region '
-                . ExportCodegen::cgMakeIdentifier($table_alias);
-            $lines[] = '    public class '
-                . ExportCodegen::cgMakeIdentifier($table_alias);
-            $lines[] = '    {';
-            $lines[] = '        #region Member Variables';
-            foreach ($tableProperties as $tableProperty) {
-                $lines[] = $tableProperty->formatCs(
-                    '        protected #dotNetPrimitiveType# _#name#;'
-                );
-            }
-            $lines[] = '        #endregion';
-            $lines[] = '        #region Constructors';
-            $lines[] = '        public '
-                . ExportCodegen::cgMakeIdentifier($table_alias) . '() { }';
-            $temp = array();
-            foreach ($tableProperties as $tableProperty) {
-                if (!$tableProperty->isPK()) {
-                    $temp[] = $tableProperty->formatCs(
-                        '#dotNetPrimitiveType# #name#'
-                    );
-                }
-            }
-            $lines[] = '        public '
-                . ExportCodegen::cgMakeIdentifier($table_alias)
-                . '('
-                . implode(', ', $temp)
-                . ')';
-            $lines[] = '        {';
-            foreach ($tableProperties as $tableProperty) {
-                if (!$tableProperty->isPK()) {
-                    $lines[] = $tableProperty->formatCs(
-                        '            this._#name#=#name#;'
-                    );
-                }
-            }
-            $lines[] = '        }';
-            $lines[] = '        #endregion';
-            $lines[] = '        #region Public Properties';
-            foreach ($tableProperties as $tableProperty) {
-                $lines[] = $tableProperty->formatCs(
-                    '        public virtual #dotNetPrimitiveType# #ucfirstName#'
-                    . "\n"
-                    . '        {' . "\n"
-                    . '            get {return _#name#;}' . "\n"
-                    . '            set {_#name#=value;}' . "\n"
-                    . '        }'
-                );
-            }
-            $lines[] = '        #endregion';
-            $lines[] = '    }';
-            $lines[] = '    #endregion';
-            $lines[] = '}';
-        }
-
-        return implode($crlf, $lines);
-    }
-
-    /**
-     * XML Handler
-     *
-     * @param string $db      database name
-     * @param string $table   table name
-     * @param string $crlf    line separator
-     * @param array  $aliases Aliases of db/table/columns
-     *
-     * @return string containing XML code lines, separated by "\n"
-     */
-    private function _handleNHibernateXMLBody(
-        $db,
-        $table,
-        $crlf,
-        $aliases = array()
-    ) {
-        $db_alias = $db;
-        $table_alias = $table;
-        $this->initAlias($aliases, $db_alias, $table_alias);
-        $lines = array();
-        $lines[] = '<?xml version="1.0" encoding="utf-8" ?' . '>';
-        $lines[] = '<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" '
-            . 'namespace="' . ExportCodegen::cgMakeIdentifier($db_alias) . '" '
-            . 'assembly="' . ExportCodegen::cgMakeIdentifier($db_alias) . '">';
-        $lines[] = '    <class '
-            . 'name="' . ExportCodegen::cgMakeIdentifier($table_alias) . '" '
-            . 'table="' . ExportCodegen::cgMakeIdentifier($table_alias) . '">';
-        $result = $GLOBALS['dbi']->query(
-            sprintf(
-                "DESC %s.%s",
-                PMA\libraries\Util::backquote($db),
-                PMA\libraries\Util::backquote($table)
-            )
-        );
-        if ($result) {
-            while ($row = $GLOBALS['dbi']->fetchRow($result)) {
-                $col_as = $this->getAlias($aliases, $row[0], 'col', $db, $table);
-                if (!empty($col_as)) {
-                    $row[0] = $col_as;
-                }
-                $tableProperty = new TableProperty($row);
-                if ($tableProperty->isPK()) {
-                    $lines[] = $tableProperty->formatXml(
-                        '        <id name="#ucfirstName#" type="#dotNetObjectType#"'
-                        . ' unsaved-value="0">' . "\n"
-                        . '            <column name="#name#" sql-type="#type#"'
-                        . ' not-null="#notNull#" unique="#unique#"'
-                        . ' index="PRIMARY"/>' . "\n"
-                        . '            <generator class="native" />' . "\n"
-                        . '        </id>'
-                    );
-                } else {
-                    $lines[] = $tableProperty->formatXml(
-                        '        <property name="#ucfirstName#"'
-                        . ' type="#dotNetObjectType#">' . "\n"
-                        . '            <column name="#name#" sql-type="#type#"'
-                        . ' not-null="#notNull#" #indexName#/>' . "\n"
-                        . '        </property>'
-                    );
-                }
-            }
-            $GLOBALS['dbi']->freeResult($result);
-        }
-        $lines[] = '    </class>';
-        $lines[] = '</hibernate-mapping>';
-
-        return implode($crlf, $lines);
-    }
-
-
-    /* ~~~~~~~~~~~~~~~~~~~~ Getters and Setters ~~~~~~~~~~~~~~~~~~~~ */
-
-    /**
-     * Getter for CodeGen formats
-     *
-     * @return array
-     */
-    private function _getCgFormats()
-    {
-        return $this->_cgFormats;
-    }
-
-    /**
-     * Setter for CodeGen formats
-     *
-     * @param array $CG_FORMATS contains CodeGen Formats
-     *
-     * @return void
-     */
-    private function _setCgFormats($CG_FORMATS)
-    {
-        $this->_cgFormats = $CG_FORMATS;
-    }
-
-    /**
-     * Getter for CodeGen handlers
-     *
-     * @return array
-     */
-    private function _getCgHandlers()
-    {
-        return $this->_cgHandlers;
-    }
-
-    /**
-     * Setter for CodeGen handlers
-     *
-     * @param array $CG_HANDLERS contains CodeGen handler methods
-     *
-     * @return void
-     */
-    private function _setCgHandlers($CG_HANDLERS)
-    {
-        $this->_cgHandlers = $CG_HANDLERS;
-    }
-}
diff --git a/#pma/libraries/plugins/export/ExportCsv.php b/#pma/libraries/plugins/export/ExportCsv.php
deleted file mode 100644
index 55483658..00000000
--- a/#pma/libraries/plugins/export/ExportCsv.php
+++ /dev/null
@@ -1,331 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * CSV export code
- *
- * @package    PhpMyAdmin-Export
- * @subpackage CSV
- */
-
-namespace PMA\libraries\plugins\export;
-
-use PMA\libraries\properties\options\items\BoolPropertyItem;
-use PMA\libraries\plugins\ExportPlugin;
-use PMA\libraries\properties\plugins\ExportPluginProperties;
-use PMA\libraries\properties\options\items\HiddenPropertyItem;
-use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
-use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
-use PMA;
-use PMA\libraries\properties\options\items\TextPropertyItem;
-
-/**
- * Handles the export for the CSV format
- *
- * @package    PhpMyAdmin-Export
- * @subpackage CSV
- */
-class ExportCsv extends ExportPlugin
-{
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        $this->setProperties();
-    }
-
-    /**
-     * Sets the export CSV properties
-     *
-     * @return void
-     */
-    protected function setProperties()
-    {
-        $exportPluginProperties = new ExportPluginProperties();
-        $exportPluginProperties->setText('CSV');
-        $exportPluginProperties->setExtension('csv');
-        $exportPluginProperties->setMimeType('text/comma-separated-values');
-        $exportPluginProperties->setOptionsText(__('Options'));
-
-        // create the root group that will be the options field for
-        // $exportPluginProperties
-        // this will be shown as "Format specific options"
-        $exportSpecificOptions = new OptionsPropertyRootGroup(
-            "Format Specific Options"
-        );
-
-        // general options main group
-        $generalOptions = new OptionsPropertyMainGroup("general_opts");
-        // create leaf items and add them to the group
-        $leaf = new TextPropertyItem(
-            "separator",
-            __('Columns separated with:')
-        );
-        $generalOptions->addProperty($leaf);
-        $leaf = new TextPropertyItem(
-            "enclosed",
-            __('Columns enclosed with:')
-        );
-        $generalOptions->addProperty($leaf);
-        $leaf = new TextPropertyItem(
-            "escaped",
-            __('Columns escaped with:')
-        );
-        $generalOptions->addProperty($leaf);
-        $leaf = new TextPropertyItem(
-            "terminated",
-            __('Lines terminated with:')
-        );
-        $generalOptions->addProperty($leaf);
-        $leaf = new TextPropertyItem(
-            'null',
-            __('Replace NULL with:')
-        );
-        $generalOptions->addProperty($leaf);
-        $leaf = new BoolPropertyItem(
-            'removeCRLF',
-            __('Remove carriage return/line feed characters within columns')
-        );
-        $generalOptions->addProperty($leaf);
-        $leaf = new BoolPropertyItem(
-            'columns',
-            __('Put columns names in the first row')
-        );
-        $generalOptions->addProperty($leaf);
-        $leaf = new HiddenPropertyItem(
-            'structure_or_data'
-        );
-        $generalOptions->addProperty($leaf);
-        // add the main group to the root group
-        $exportSpecificOptions->addProperty($generalOptions);
-
-        // set the options for the export plugin property item
-        $exportPluginProperties->setOptions($exportSpecificOptions);
-        $this->properties = $exportPluginProperties;
-    }
-
-    /**
-     * Outputs export header
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportHeader()
-    {
-        global $what, $csv_terminated, $csv_separator, $csv_enclosed, $csv_escaped;
-
-        // Here we just prepare some values for export
-        if ($what == 'excel') {
-            $csv_terminated = "\015\012";
-            switch ($GLOBALS['excel_edition']) {
-            case 'win':
-                // as tested on Windows with Excel 2002 and Excel 2007
-                $csv_separator = ';';
-                break;
-            case 'mac_excel2003':
-                $csv_separator = ';';
-                break;
-            case 'mac_excel2008':
-                $csv_separator = ',';
-                break;
-            }
-            $csv_enclosed = '"';
-            $csv_escaped = '"';
-            if (isset($GLOBALS['excel_columns'])) {
-                $GLOBALS['csv_columns'] = 'yes';
-            }
-        } else {
-            if (empty($csv_terminated)
-                || mb_strtolower($csv_terminated) == 'auto'
-            ) {
-                $csv_terminated = $GLOBALS['crlf'];
-            } else {
-                $csv_terminated = str_replace('\\r', "\015", $csv_terminated);
-                $csv_terminated = str_replace('\\n', "\012", $csv_terminated);
-                $csv_terminated = str_replace('\\t', "\011", $csv_terminated);
-            } // end if
-            $csv_separator = str_replace('\\t', "\011", $csv_separator);
-        }
-
-        return true;
-    }
-
-    /**
-     * Outputs export footer
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportFooter()
-    {
-        return true;
-    }
-
-    /**
-     * Outputs database header
-     *
-     * @param string $db       Database name
-     * @param string $db_alias Alias of db
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportDBHeader($db, $db_alias = '')
-    {
-        return true;
-    }
-
-    /**
-     * Outputs database footer
-     *
-     * @param string $db Database name
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportDBFooter($db)
-    {
-        return true;
-    }
-
-    /**
-     * Outputs CREATE DATABASE statement
-     *
-     * @param string $db          Database name
-     * @param string $export_type 'server', 'database', 'table'
-     * @param string $db_alias    Aliases of db
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportDBCreate($db, $export_type, $db_alias = '')
-    {
-        return true;
-    }
-
-    /**
-     * Outputs the content of a table in CSV format
-     *
-     * @param string $db        database name
-     * @param string $table     table name
-     * @param string $crlf      the end of line sequence
-     * @param string $error_url the url to go back in case of error
-     * @param string $sql_query SQL query for obtaining data
-     * @param array  $aliases   Aliases of db/table/columns
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportData(
-        $db,
-        $table,
-        $crlf,
-        $error_url,
-        $sql_query,
-        $aliases = array()
-    ) {
-        global $what, $csv_terminated, $csv_separator, $csv_enclosed, $csv_escaped;
-
-        $db_alias = $db;
-        $table_alias = $table;
-        $this->initAlias($aliases, $db_alias, $table_alias);
-
-        // Gets the data from the database
-        $result = $GLOBALS['dbi']->query(
-            $sql_query,
-            null,
-            PMA\libraries\DatabaseInterface::QUERY_UNBUFFERED
-        );
-        $fields_cnt = $GLOBALS['dbi']->numFields($result);
-
-        // If required, get fields name at the first line
-        if (isset($GLOBALS['csv_columns'])) {
-            $schema_insert = '';
-            for ($i = 0; $i < $fields_cnt; $i++) {
-                $col_as = $GLOBALS['dbi']->fieldName($result, $i);
-                if (!empty($aliases[$db]['tables'][$table]['columns'][$col_as])) {
-                    $col_as = $aliases[$db]['tables'][$table]['columns'][$col_as];
-                }
-                $col_as = stripslashes($col_as);
-                if ($csv_enclosed == '') {
-                    $schema_insert .= $col_as;
-                } else {
-                    $schema_insert .= $csv_enclosed
-                        . str_replace(
-                            $csv_enclosed,
-                            $csv_escaped . $csv_enclosed,
-                            $col_as
-                        )
-                        . $csv_enclosed;
-                }
-                $schema_insert .= $csv_separator;
-            } // end for
-            $schema_insert = trim(mb_substr($schema_insert, 0, -1));
-            if (!PMA_exportOutputHandler($schema_insert . $csv_terminated)) {
-                return false;
-            }
-        } // end if
-
-        // Format the data
-        while ($row = $GLOBALS['dbi']->fetchRow($result)) {
-            $schema_insert = '';
-            for ($j = 0; $j < $fields_cnt; $j++) {
-                if (!isset($row[$j]) || is_null($row[$j])) {
-                    $schema_insert .= $GLOBALS[$what . '_null'];
-                } elseif ($row[$j] == '0' || $row[$j] != '') {
-                    // always enclose fields
-                    if ($what == 'excel') {
-                        $row[$j] = preg_replace("/\015(\012)?/", "\012", $row[$j]);
-                    }
-                    // remove CRLF characters within field
-                    if (isset($GLOBALS[$what . '_removeCRLF'])
-                        && $GLOBALS[$what . '_removeCRLF']
-                    ) {
-                        $row[$j] = str_replace(
-                            "\n",
-                            "",
-                            str_replace(
-                                "\r",
-                                "",
-                                $row[$j]
-                            )
-                        );
-                    }
-                    if ($csv_enclosed == '') {
-                        $schema_insert .= $row[$j];
-                    } else {
-                        // also double the escape string if found in the data
-                        if ($csv_escaped != $csv_enclosed) {
-                            $schema_insert .= $csv_enclosed
-                                . str_replace(
-                                    $csv_enclosed,
-                                    $csv_escaped . $csv_enclosed,
-                                    str_replace(
-                                        $csv_escaped,
-                                        $csv_escaped . $csv_escaped,
-                                        $row[$j]
-                                    )
-                                )
-                                . $csv_enclosed;
-                        } else {
-                            // avoid a problem when escape string equals enclose
-                            $schema_insert .= $csv_enclosed
-                                . str_replace(
-                                    $csv_enclosed,
-                                    $csv_escaped . $csv_enclosed,
-                                    $row[$j]
-                                )
-                                . $csv_enclosed;
-                        }
-                    }
-                } else {
-                    $schema_insert .= '';
-                }
-                if ($j < $fields_cnt - 1) {
-                    $schema_insert .= $csv_separator;
-                }
-            } // end for
-
-            if (!PMA_exportOutputHandler($schema_insert . $csv_terminated)) {
-                return false;
-            }
-        } // end while
-        $GLOBALS['dbi']->freeResult($result);
-
-        return true;
-    }
-}
diff --git a/#pma/libraries/plugins/export/ExportExcel.php b/#pma/libraries/plugins/export/ExportExcel.php
deleted file mode 100644
index 63f10b32..00000000
--- a/#pma/libraries/plugins/export/ExportExcel.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Class for exporting CSV dumps of tables for excel
- *
- * @package    PhpMyAdmin-Export
- * @subpackage CSV-Excel
- */
-namespace PMA\libraries\plugins\export;
-
-use PMA\libraries\properties\options\items\BoolPropertyItem;
-use PMA\libraries\properties\plugins\ExportPluginProperties;
-use PMA\libraries\properties\options\items\HiddenPropertyItem;
-use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
-use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
-use PMA\libraries\properties\options\items\SelectPropertyItem;
-use PMA\libraries\properties\options\items\TextPropertyItem;
-
-/**
- * Handles the export for the CSV-Excel format
- *
- * @package    PhpMyAdmin-Export
- * @subpackage CSV-Excel
- */
-class ExportExcel extends ExportCsv
-{
-    /**
-     * Sets the export CSV for Excel properties
-     *
-     * @return void
-     */
-    protected function setProperties()
-    {
-        $exportPluginProperties = new ExportPluginProperties();
-        $exportPluginProperties->setText('CSV for MS Excel');
-        $exportPluginProperties->setExtension('csv');
-        $exportPluginProperties->setMimeType('text/comma-separated-values');
-        $exportPluginProperties->setOptionsText(__('Options'));
-
-        // create the root group that will be the options field for
-        // $exportPluginProperties
-        // this will be shown as "Format specific options"
-        $exportSpecificOptions = new OptionsPropertyRootGroup(
-            "Format Specific Options"
-        );
-
-        // general options main group
-        $generalOptions = new OptionsPropertyMainGroup("general_opts");
-        // create primary items and add them to the group
-        $leaf = new TextPropertyItem(
-            'null',
-            __('Replace NULL with:')
-        );
-        $generalOptions->addProperty($leaf);
-        $leaf = new BoolPropertyItem(
-            'removeCRLF',
-            __('Remove carriage return/line feed characters within columns')
-        );
-        $generalOptions->addProperty($leaf);
-        $leaf = new BoolPropertyItem(
-            'columns',
-            __('Put columns names in the first row')
-        );
-        $generalOptions->addProperty($leaf);
-        $leaf = new SelectPropertyItem(
-            'edition',
-            __('Excel edition:')
-        );
-        $leaf->setValues(
-            array(
-                'win'           => 'Windows',
-                'mac_excel2003' => 'Excel 2003 / Macintosh',
-                'mac_excel2008' => 'Excel 2008 / Macintosh',
-            )
-        );
-        $generalOptions->addProperty($leaf);
-        $leaf = new HiddenPropertyItem(
-            'structure_or_data'
-        );
-        $generalOptions->addProperty($leaf);
-        // add the main group to the root group
-        $exportSpecificOptions->addProperty($generalOptions);
-
-        // set the options for the export plugin property item
-        $exportPluginProperties->setOptions($exportSpecificOptions);
-        $this->properties = $exportPluginProperties;
-    }
-}
diff --git a/#pma/libraries/plugins/export/ExportHtmlword.php b/#pma/libraries/plugins/export/ExportHtmlword.php
deleted file mode 100644
index b0467f69..00000000
--- a/#pma/libraries/plugins/export/ExportHtmlword.php
+++ /dev/null
@@ -1,665 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * HTML-Word export code
- *
- * @package    PhpMyAdmin-Export
- * @subpackage HTML-Word
- */
-namespace PMA\libraries\plugins\export;
-
-use PMA\libraries\properties\options\items\BoolPropertyItem;
-use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
-use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
-use PMA\libraries\plugins\ExportPlugin;
-use PMA\libraries\properties\plugins\ExportPluginProperties;
-use PMA\libraries\DatabaseInterface;
-use PMA\libraries\Util;
-use PMA\libraries\properties\options\items\RadioPropertyItem;
-use PMA\libraries\properties\options\items\TextPropertyItem;
-
-/**
- * Handles the export for the HTML-Word format
- *
- * @package    PhpMyAdmin-Export
- * @subpackage HTML-Word
- */
-class ExportHtmlword extends ExportPlugin
-{
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        $this->setProperties();
-    }
-
-    /**
-     * Sets the export HTML-Word properties
-     *
-     * @return void
-     */
-    protected function setProperties()
-    {
-        $exportPluginProperties = new ExportPluginProperties();
-        $exportPluginProperties->setText('Microsoft Word 2000');
-        $exportPluginProperties->setExtension('doc');
-        $exportPluginProperties->setMimeType('application/vnd.ms-word');
-        $exportPluginProperties->setForceFile(true);
-        $exportPluginProperties->setOptionsText(__('Options'));
-
-        // create the root group that will be the options field for
-        // $exportPluginProperties
-        // this will be shown as "Format specific options"
-        $exportSpecificOptions = new OptionsPropertyRootGroup(
-            "Format Specific Options"
-        );
-
-        // what to dump (structure/data/both)
-        $dumpWhat = new OptionsPropertyMainGroup(
-            "dump_what", __('Dump table')
-        );
-        // create primary items and add them to the group
-        $leaf = new RadioPropertyItem("structure_or_data");
-        $leaf->setValues(
-            array(
-                'structure'          => __('structure'),
-                'data'               => __('data'),
-                'structure_and_data' => __('structure and data'),
-            )
-        );
-        $dumpWhat->addProperty($leaf);
-        // add the main group to the root group
-        $exportSpecificOptions->addProperty($dumpWhat);
-
-        // data options main group
-        $dataOptions = new OptionsPropertyMainGroup(
-            "dump_what", __('Data dump options')
-        );
-        $dataOptions->setForce('structure');
-        // create primary items and add them to the group
-        $leaf = new TextPropertyItem(
-            "null",
-            __('Replace NULL with:')
-        );
-        $dataOptions->addProperty($leaf);
-        $leaf = new BoolPropertyItem(
-            "columns",
-            __('Put columns names in the first row')
-        );
-        $dataOptions->addProperty($leaf);
-        // add the main group to the root group
-        $exportSpecificOptions->addProperty($dataOptions);
-
-        // set the options for the export plugin property item
-        $exportPluginProperties->setOptions($exportSpecificOptions);
-        $this->properties = $exportPluginProperties;
-    }
-
-    /**
-     * Outputs export header
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportHeader()
-    {
-        global $charset;
-
-        return PMA_exportOutputHandler(
-            '<html xmlns:o="urn:schemas-microsoft-com:office:office"
-            xmlns:x="urn:schemas-microsoft-com:office:word"
-            xmlns="http://www.w3.org/TR/REC-html40">
-
-            <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"'
-            . ' "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-            <html>
-            <head>
-                <meta http-equiv="Content-type" content="text/html;charset='
-            . (isset($charset) ? $charset : 'utf-8') . '" />
-            </head>
-            <body>'
-        );
-    }
-
-    /**
-     * Outputs export footer
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportFooter()
-    {
-        return PMA_exportOutputHandler('</body></html>');
-    }
-
-    /**
-     * Outputs database header
-     *
-     * @param string $db       Database name
-     * @param string $db_alias Aliases of db
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportDBHeader($db, $db_alias = '')
-    {
-        if (empty($db_alias)) {
-            $db_alias = $db;
-        }
-
-        return PMA_exportOutputHandler(
-            '<h1>' . __('Database') . ' ' . htmlspecialchars($db_alias) . '</h1>'
-        );
-    }
-
-    /**
-     * Outputs database footer
-     *
-     * @param string $db Database name
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportDBFooter($db)
-    {
-        return true;
-    }
-
-    /**
-     * Outputs CREATE DATABASE statement
-     *
-     * @param string $db          Database name
-     * @param string $export_type 'server', 'database', 'table'
-     * @param string $db_alias    Aliases of db
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportDBCreate($db, $export_type, $db_alias = '')
-    {
-        return true;
-    }
-
-    /**
-     * Outputs the content of a table in HTML-Word format
-     *
-     * @param string $db        database name
-     * @param string $table     table name
-     * @param string $crlf      the end of line sequence
-     * @param string $error_url the url to go back in case of error
-     * @param string $sql_query SQL query for obtaining data
-     * @param array  $aliases   Aliases of db/table/columns
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportData(
-        $db,
-        $table,
-        $crlf,
-        $error_url,
-        $sql_query,
-        $aliases = array()
-    ) {
-        global $what;
-
-        $db_alias = $db;
-        $table_alias = $table;
-        $this->initAlias($aliases, $db_alias, $table_alias);
-
-        if (!PMA_exportOutputHandler(
-            '<h2>'
-            . __('Dumping data for table') . ' ' . htmlspecialchars($table_alias)
-            . '</h2>'
-        )
-        ) {
-            return false;
-        }
-        if (!PMA_exportOutputHandler(
-            '<table class="width100" cellspacing="1">'
-        )
-        ) {
-            return false;
-        }
-
-        // Gets the data from the database
-        $result = $GLOBALS['dbi']->query(
-            $sql_query,
-            null,
-            DatabaseInterface::QUERY_UNBUFFERED
-        );
-        $fields_cnt = $GLOBALS['dbi']->numFields($result);
-
-        // If required, get fields name at the first line
-        if (isset($GLOBALS['htmlword_columns'])) {
-            $schema_insert = '<tr class="print-category">';
-            for ($i = 0; $i < $fields_cnt; $i++) {
-                $col_as = $GLOBALS['dbi']->fieldName($result, $i);
-                if (!empty($aliases[$db]['tables'][$table]['columns'][$col_as])) {
-                    $col_as = $aliases[$db]['tables'][$table]['columns'][$col_as];
-                }
-                $col_as = stripslashes($col_as);
-                $schema_insert .= '<td class="print"><strong>'
-                    . htmlspecialchars($col_as)
-                    . '</strong></td>';
-            } // end for
-            $schema_insert .= '</tr>';
-            if (!PMA_exportOutputHandler($schema_insert)) {
-                return false;
-            }
-        } // end if
-
-        // Format the data
-        while ($row = $GLOBALS['dbi']->fetchRow($result)) {
-            $schema_insert = '<tr class="print-category">';
-            for ($j = 0; $j < $fields_cnt; $j++) {
-                if (!isset($row[$j]) || is_null($row[$j])) {
-                    $value = $GLOBALS[$what . '_null'];
-                } elseif ($row[$j] == '0' || $row[$j] != '') {
-                    $value = $row[$j];
-                } else {
-                    $value = '';
-                }
-                $schema_insert .= '<td class="print">'
-                    . htmlspecialchars($value)
-                    . '</td>';
-            } // end for
-            $schema_insert .= '</tr>';
-            if (!PMA_exportOutputHandler($schema_insert)) {
-                return false;
-            }
-        } // end while
-        $GLOBALS['dbi']->freeResult($result);
-        if (!PMA_exportOutputHandler('</table>')) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Returns a stand-in CREATE definition to resolve view dependencies
-     *
-     * @param string $db      the database name
-     * @param string $view    the view name
-     * @param string $crlf    the end of line sequence
-     * @param array  $aliases Aliases of db/table/columns
-     *
-     * @return string resulting definition
-     */
-    public function getTableDefStandIn($db, $view, $crlf, $aliases = array())
-    {
-        $schema_insert = '<table class="width100" cellspacing="1">'
-            . '<tr class="print-category">'
-            . '<th class="print">'
-            . __('Column')
-            . '</th>'
-            . '<td class="print"><strong>'
-            . __('Type')
-            . '</strong></td>'
-            . '<td class="print"><strong>'
-            . __('Null')
-            . '</strong></td>'
-            . '<td class="print"><strong>'
-            . __('Default')
-            . '</strong></td>'
-            . '</tr>';
-
-        /**
-         * Get the unique keys in the view
-         */
-        $unique_keys = array();
-        $keys = $GLOBALS['dbi']->getTableIndexes($db, $view);
-        foreach ($keys as $key) {
-            if ($key['Non_unique'] == 0) {
-                $unique_keys[] = $key['Column_name'];
-            }
-        }
-
-        $columns = $GLOBALS['dbi']->getColumns($db, $view);
-        foreach ($columns as $column) {
-            $col_as = $column['Field'];
-            if (!empty($aliases[$db]['tables'][$view]['columns'][$col_as])) {
-                $col_as = $aliases[$db]['tables'][$view]['columns'][$col_as];
-            }
-            $schema_insert .= $this->formatOneColumnDefinition(
-                $column,
-                $unique_keys,
-                $col_as
-            );
-            $schema_insert .= '</tr>';
-        }
-
-        $schema_insert .= '</table>';
-
-        return $schema_insert;
-    }
-
-    /**
-     * Returns $table's CREATE definition
-     *
-     * @param string $db          the database name
-     * @param string $table       the table name
-     * @param bool   $do_relation whether to include relation comments
-     * @param bool   $do_comments whether to include the pmadb-style column
-     *                            comments as comments in the structure;
-     *                            this is deprecated but the parameter is
-     *                            left here because export.php calls
-     *                            PMA_exportStructure() also for other
-     *                            export types which use this parameter
-     * @param bool   $do_mime     whether to include mime comments
-     *                            at the end
-     * @param bool   $view        whether we're handling a view
-     * @param array  $aliases     Aliases of db/table/columns
-     *
-     * @return string resulting schema
-     */
-    public function getTableDef(
-        $db,
-        $table,
-        $do_relation,
-        $do_comments,
-        $do_mime,
-        $view = false,
-        $aliases = array()
-    ) {
-        // set $cfgRelation here, because there is a chance that it's modified
-        // since the class initialization
-        global $cfgRelation;
-
-        $schema_insert = '';
-
-        /**
-         * Gets fields properties
-         */
-        $GLOBALS['dbi']->selectDb($db);
-
-        // Check if we can use Relations
-        list($res_rel, $have_rel) = PMA_getRelationsAndStatus(
-            $do_relation && !empty($cfgRelation['relation']),
-            $db,
-            $table
-        );
-
-        /**
-         * Displays the table structure
-         */
-        $schema_insert .= '<table class="width100" cellspacing="1">';
-
-        $schema_insert .= '<tr class="print-category">';
-        $schema_insert .= '<th class="print">'
-            . __('Column')
-            . '</th>';
-        $schema_insert .= '<td class="print"><strong>'
-            . __('Type')
-            . '</strong></td>';
-        $schema_insert .= '<td class="print"><strong>'
-            . __('Null')
-            . '</strong></td>';
-        $schema_insert .= '<td class="print"><strong>'
-            . __('Default')
-            . '</strong></td>';
-        if ($do_relation && $have_rel) {
-            $schema_insert .= '<td class="print"><strong>'
-                . __('Links to')
-                . '</strong></td>';
-        }
-        if ($do_comments) {
-            $schema_insert .= '<td class="print"><strong>'
-                . __('Comments')
-                . '</strong></td>';
-            $comments = PMA_getComments($db, $table);
-        }
-        if ($do_mime && $cfgRelation['mimework']) {
-            $schema_insert .= '<td class="print"><strong>'
-                . htmlspecialchars('MIME')
-                . '</strong></td>';
-            $mime_map = PMA_getMIME($db, $table, true);
-        }
-        $schema_insert .= '</tr>';
-
-        $columns = $GLOBALS['dbi']->getColumns($db, $table);
-        /**
-         * Get the unique keys in the table
-         */
-        $unique_keys = array();
-        $keys = $GLOBALS['dbi']->getTableIndexes($db, $table);
-        foreach ($keys as $key) {
-            if ($key['Non_unique'] == 0) {
-                $unique_keys[] = $key['Column_name'];
-            }
-        }
-        foreach ($columns as $column) {
-            $col_as = $column['Field'];
-            if (!empty($aliases[$db]['tables'][$table]['columns'][$col_as])) {
-                $col_as = $aliases[$db]['tables'][$table]['columns'][$col_as];
-            }
-            $schema_insert .= $this->formatOneColumnDefinition(
-                $column,
-                $unique_keys,
-                $col_as
-            );
-            $field_name = $column['Field'];
-            if ($do_relation && $have_rel) {
-                $schema_insert .= '<td class="print">'
-                    . htmlspecialchars(
-                        $this->getRelationString(
-                            $res_rel,
-                            $field_name,
-                            $db,
-                            $aliases
-                        )
-                    )
-                    . '</td>';
-            }
-            if ($do_comments && $cfgRelation['commwork']) {
-                $schema_insert .= '<td class="print">'
-                    . (isset($comments[$field_name])
-                        ? htmlspecialchars($comments[$field_name])
-                        : '') . '</td>';
-            }
-            if ($do_mime && $cfgRelation['mimework']) {
-                $schema_insert .= '<td class="print">'
-                    . (isset($mime_map[$field_name]) ?
-                        htmlspecialchars(
-                            str_replace('_', '/', $mime_map[$field_name]['mimetype'])
-                        )
-                        : '') . '</td>';
-            }
-
-            $schema_insert .= '</tr>';
-        } // end foreach
-
-        $schema_insert .= '</table>';
-
-        return $schema_insert;
-    }
-
-    /**
-     * Outputs triggers
-     *
-     * @param string $db    database name
-     * @param string $table table name
-     *
-     * @return string Formatted triggers list
-     */
-    protected function getTriggers($db, $table)
-    {
-        $dump = '<table class="width100" cellspacing="1">';
-        $dump .= '<tr class="print-category">';
-        $dump .= '<th class="print">' . __('Name') . '</th>';
-        $dump .= '<td class="print"><strong>' . __('Time') . '</strong></td>';
-        $dump .= '<td class="print"><strong>' . __('Event') . '</strong></td>';
-        $dump .= '<td class="print"><strong>' . __('Definition') . '</strong></td>';
-        $dump .= '</tr>';
-
-        $triggers = $GLOBALS['dbi']->getTriggers($db, $table);
-
-        foreach ($triggers as $trigger) {
-            $dump .= '<tr class="print-category">';
-            $dump .= '<td class="print">'
-                . htmlspecialchars($trigger['name'])
-                . '</td>'
-                . '<td class="print">'
-                . htmlspecialchars($trigger['action_timing'])
-                . '</td>'
-                . '<td class="print">'
-                . htmlspecialchars($trigger['event_manipulation'])
-                . '</td>'
-                . '<td class="print">'
-                . htmlspecialchars($trigger['definition'])
-                . '</td>'
-                . '</tr>';
-        }
-
-        $dump .= '</table>';
-
-        return $dump;
-    }
-
-    /**
-     * Outputs table's structure
-     *
-     * @param string $db          database name
-     * @param string $table       table name
-     * @param string $crlf        the end of line sequence
-     * @param string $error_url   the url to go back in case of error
-     * @param string $export_mode 'create_table', 'triggers', 'create_view',
-     *                            'stand_in'
-     * @param string $export_type 'server', 'database', 'table'
-     * @param bool   $do_relation whether to include relation comments
-     * @param bool   $do_comments whether to include the pmadb-style column
-     *                            comments as comments in the structure;
-     *                            this is deprecated but the parameter is
-     *                            left here because export.php calls
-     *                            PMA_exportStructure() also for other
-     *                            export types which use this parameter
-     * @param bool   $do_mime     whether to include mime comments
-     * @param bool   $dates       whether to include creation/update/check dates
-     * @param array  $aliases     Aliases of db/table/columns
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportStructure(
-        $db,
-        $table,
-        $crlf,
-        $error_url,
-        $export_mode,
-        $export_type,
-        $do_relation = false,
-        $do_comments = false,
-        $do_mime = false,
-        $dates = false,
-        $aliases = array()
-    ) {
-        $db_alias = $db;
-        $table_alias = $table;
-        $this->initAlias($aliases, $db_alias, $table_alias);
-
-        $dump = '';
-
-        switch ($export_mode) {
-        case 'create_table':
-            $dump .= '<h2>'
-                . __('Table structure for table') . ' '
-                . htmlspecialchars($table_alias)
-                . '</h2>';
-            $dump .= $this->getTableDef(
-                $db,
-                $table,
-                $do_relation,
-                $do_comments,
-                $do_mime,
-                false,
-                $aliases
-            );
-            break;
-        case 'triggers':
-            $dump = '';
-            $triggers = $GLOBALS['dbi']->getTriggers($db, $table);
-            if ($triggers) {
-                $dump .= '<h2>'
-                    . __('Triggers') . ' ' . htmlspecialchars($table_alias)
-                    . '</h2>';
-                $dump .= $this->getTriggers($db, $table);
-            }
-            break;
-        case 'create_view':
-            $dump .= '<h2>'
-                . __('Structure for view') . ' ' . htmlspecialchars($table_alias)
-                . '</h2>';
-            $dump .= $this->getTableDef(
-                $db,
-                $table,
-                $do_relation,
-                $do_comments,
-                $do_mime,
-                true,
-                $aliases
-            );
-            break;
-        case 'stand_in':
-            $dump .= '<h2>'
-                . __('Stand-in structure for view') . ' '
-                . htmlspecialchars($table_alias)
-                . '</h2>';
-            // export a stand-in definition to resolve view dependencies
-            $dump .= $this->getTableDefStandIn($db, $table, $crlf, $aliases);
-        } // end switch
-
-        return PMA_exportOutputHandler($dump);
-    }
-
-    /**
-     * Formats the definition for one column
-     *
-     * @param array  $column      info about this column
-     * @param array  $unique_keys unique keys of the table
-     * @param string $col_alias   Column Alias
-     *
-     * @return string Formatted column definition
-     */
-    protected function formatOneColumnDefinition(
-        $column,
-        $unique_keys,
-        $col_alias = ''
-    ) {
-        if (empty($col_alias)) {
-            $col_alias = $column['Field'];
-        }
-        $definition = '<tr class="print-category">';
-
-        $extracted_columnspec = Util::extractColumnSpec($column['Type']);
-
-        $type = htmlspecialchars($extracted_columnspec['print_type']);
-        if (empty($type)) {
-            $type = '&nbsp;';
-        }
-
-        if (!isset($column['Default'])) {
-            if ($column['Null'] != 'NO') {
-                $column['Default'] = 'NULL';
-            }
-        }
-
-        $fmt_pre = '';
-        $fmt_post = '';
-        if (in_array($column['Field'], $unique_keys)) {
-            $fmt_pre = '<strong>' . $fmt_pre;
-            $fmt_post = $fmt_post . '</strong>';
-        }
-        if ($column['Key'] == 'PRI') {
-            $fmt_pre = '<em>' . $fmt_pre;
-            $fmt_post = $fmt_post . '</em>';
-        }
-        $definition .= '<td class="print">' . $fmt_pre
-            . htmlspecialchars($col_alias) . $fmt_post . '</td>';
-        $definition .= '<td class="print">' . htmlspecialchars($type) . '</td>';
-        $definition .= '<td class="print">'
-            . (($column['Null'] == '' || $column['Null'] == 'NO')
-                ? __('No')
-                : __('Yes'))
-            . '</td>';
-        $definition .= '<td class="print">'
-            . htmlspecialchars(isset($column['Default']) ? $column['Default'] : '')
-            . '</td>';
-
-        return $definition;
-    }
-}
diff --git a/#pma/libraries/plugins/export/ExportJson.php b/#pma/libraries/plugins/export/ExportJson.php
deleted file mode 100644
index d5f84cf9..00000000
--- a/#pma/libraries/plugins/export/ExportJson.php
+++ /dev/null
@@ -1,238 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Set of methods used to build dumps of tables as JSON
- *
- * @package    PhpMyAdmin-Export
- * @subpackage JSON
- */
-namespace PMA\libraries\plugins\export;
-
-use PMA\libraries\properties\options\items\BoolPropertyItem;
-use PMA\libraries\plugins\ExportPlugin;
-use PMA\libraries\properties\plugins\ExportPluginProperties;
-use PMA\libraries\properties\options\items\HiddenPropertyItem;
-use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
-use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
-use PMA;
-
-/**
- * Handles the export for the JSON format
- *
- * @package    PhpMyAdmin-Export
- * @subpackage JSON
- */
-class ExportJson extends ExportPlugin
-{
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        $this->setProperties();
-    }
-
-    /**
-     * Sets the export JSON properties
-     *
-     * @return void
-     */
-    protected function setProperties()
-    {
-        $exportPluginProperties = new ExportPluginProperties();
-        $exportPluginProperties->setText('JSON');
-        $exportPluginProperties->setExtension('json');
-        $exportPluginProperties->setMimeType('text/plain');
-        $exportPluginProperties->setOptionsText(__('Options'));
-
-        // create the root group that will be the options field for
-        // $exportPluginProperties
-        // this will be shown as "Format specific options"
-        $exportSpecificOptions = new OptionsPropertyRootGroup(
-            "Format Specific Options"
-        );
-
-        // general options main group
-        $generalOptions = new OptionsPropertyMainGroup("general_opts");
-        // create primary items and add them to the group
-        $leaf = new HiddenPropertyItem("structure_or_data");
-        $generalOptions->addProperty($leaf);
-
-        // JSON_PRETTY_PRINT is available since 5.4.0
-        if (version_compare(PHP_VERSION, '5.4.0', '>=')) {
-            $leaf = new BoolPropertyItem(
-                'pretty_print',
-                __('Output pretty-printed JSON (Use human-readable formatting)')
-            );
-            $generalOptions->addProperty($leaf);
-        }
-
-        // add the main group to the root group
-        $exportSpecificOptions->addProperty($generalOptions);
-
-        // set the options for the export plugin property item
-        $exportPluginProperties->setOptions($exportSpecificOptions);
-        $this->properties = $exportPluginProperties;
-    }
-
-    /**
-     * Outputs export header
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportHeader()
-    {
-        PMA_exportOutputHandler(
-            '/**' . $GLOBALS['crlf']
-            . ' Export to JSON plugin for PHPMyAdmin' . $GLOBALS['crlf']
-            . ' @version ' . PMA_VERSION . $GLOBALS['crlf']
-            . ' */' . $GLOBALS['crlf'] . $GLOBALS['crlf']
-        );
-
-        return true;
-    }
-
-    /**
-     * Outputs export footer
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportFooter()
-    {
-        return true;
-    }
-
-    /**
-     * Outputs database header
-     *
-     * @param string $db       Database name
-     * @param string $db_alias Aliases of db
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportDBHeader($db, $db_alias = '')
-    {
-        if (empty($db_alias)) {
-            $db_alias = $db;
-        }
-        PMA_exportOutputHandler(
-            '// Database \'' . $db_alias . '\'' . $GLOBALS['crlf']
-        );
-
-        return true;
-    }
-
-    /**
-     * Outputs database footer
-     *
-     * @param string $db Database name
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportDBFooter($db)
-    {
-        return true;
-    }
-
-    /**
-     * Outputs CREATE DATABASE statement
-     *
-     * @param string $db          Database name
-     * @param string $export_type 'server', 'database', 'table'
-     * @param string $db_alias    Aliases of db
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportDBCreate($db, $export_type, $db_alias = '')
-    {
-        return true;
-    }
-
-    /**
-     * Outputs the content of a table in JSON format
-     *
-     * @param string $db        database name
-     * @param string $table     table name
-     * @param string $crlf      the end of line sequence
-     * @param string $error_url the url to go back in case of error
-     * @param string $sql_query SQL query for obtaining data
-     * @param array  $aliases   Aliases of db/table/columns
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportData(
-        $db,
-        $table,
-        $crlf,
-        $error_url,
-        $sql_query,
-        $aliases = array()
-    ) {
-        $db_alias = $db;
-        $table_alias = $table;
-        $this->initAlias($aliases, $db_alias, $table_alias);
-
-        $result = $GLOBALS['dbi']->query(
-            $sql_query,
-            null,
-            PMA\libraries\DatabaseInterface::QUERY_UNBUFFERED
-        );
-        $columns_cnt = $GLOBALS['dbi']->numFields($result);
-
-        $columns = array();
-        for ($i = 0; $i < $columns_cnt; $i++) {
-            $col_as = $GLOBALS['dbi']->fieldName($result, $i);
-            if (!empty($aliases[$db]['tables'][$table]['columns'][$col_as])) {
-                $col_as = $aliases[$db]['tables'][$table]['columns'][$col_as];
-            }
-            $columns[$i] = stripslashes($col_as);
-        }
-
-        $record_cnt = 0;
-        while ($record = $GLOBALS['dbi']->fetchRow($result)) {
-
-            $record_cnt++;
-
-            // Output table name as comment if this is the first record of the table
-            if ($record_cnt == 1) {
-                $buffer = $crlf . '// ' . $db_alias . '.' . $table_alias
-                    . $crlf . $crlf;
-                $buffer .= '[';
-            } else {
-                $buffer = ', ';
-            }
-
-            if (!PMA_exportOutputHandler($buffer)) {
-                return false;
-            }
-
-            $data = array();
-
-            for ($i = 0; $i < $columns_cnt; $i++) {
-                $data[$columns[$i]] = $record[$i];
-            }
-
-            if (isset($GLOBALS['json_pretty_print'])
-                && $GLOBALS['json_pretty_print']
-            ) {
-                $encoded = json_encode($data, JSON_PRETTY_PRINT);
-            } else {
-                $encoded = json_encode($data);
-            }
-
-            if (!PMA_exportOutputHandler($encoded)) {
-                return false;
-            }
-        }
-
-        if ($record_cnt) {
-            if (!PMA_exportOutputHandler(']' . $crlf)) {
-                return false;
-            }
-        }
-
-        $GLOBALS['dbi']->freeResult($result);
-
-        return true;
-    }
-}
diff --git a/#pma/libraries/plugins/export/ExportLatex.php b/#pma/libraries/plugins/export/ExportLatex.php
deleted file mode 100644
index 651ef5ba..00000000
--- a/#pma/libraries/plugins/export/ExportLatex.php
+++ /dev/null
@@ -1,675 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Set of methods used to build dumps of tables as Latex
- *
- * @package    PhpMyAdmin-Export
- * @subpackage Latex
- */
-namespace PMA\libraries\plugins\export;
-
-use PMA\libraries\properties\options\items\BoolPropertyItem;
-use PMA\libraries\properties\plugins\ExportPluginProperties;
-use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
-use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
-use PMA\libraries\plugins\ExportPlugin;
-use PMA\libraries\DatabaseInterface;
-use PMA\libraries\Util;
-use PMA\libraries\properties\options\items\RadioPropertyItem;
-use PMA\libraries\properties\options\items\TextPropertyItem;
-
-/**
- * Handles the export for the Latex format
- *
- * @package    PhpMyAdmin-Export
- * @subpackage Latex
- */
-class ExportLatex extends ExportPlugin
-{
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        // initialize the specific export sql variables
-        $this->initSpecificVariables();
-
-        $this->setProperties();
-    }
-
-    /**
-     * Initialize the local variables that are used for export Latex
-     *
-     * @return void
-     */
-    protected function initSpecificVariables()
-    {
-        /* Messages used in default captions */
-        $GLOBALS['strLatexContent'] = __('Content of table @TABLE@');
-        $GLOBALS['strLatexContinued'] = __('(continued)');
-        $GLOBALS['strLatexStructure'] = __('Structure of table @TABLE@');
-    }
-
-    /**
-     * Sets the export Latex properties
-     *
-     * @return void
-     */
-    protected function setProperties()
-    {
-        global $plugin_param;
-        $hide_structure = false;
-        if ($plugin_param['export_type'] == 'table'
-            && !$plugin_param['single_table']
-        ) {
-            $hide_structure = true;
-        }
-
-        $exportPluginProperties = new ExportPluginProperties();
-        $exportPluginProperties->setText('LaTeX');
-        $exportPluginProperties->setExtension('tex');
-        $exportPluginProperties->setMimeType('application/x-tex');
-        $exportPluginProperties->setOptionsText(__('Options'));
-
-        // create the root group that will be the options field for
-        // $exportPluginProperties
-        // this will be shown as "Format specific options"
-        $exportSpecificOptions = new OptionsPropertyRootGroup(
-            "Format Specific Options"
-        );
-
-        // general options main group
-        $generalOptions = new OptionsPropertyMainGroup("general_opts");
-        // create primary items and add them to the group
-        $leaf = new BoolPropertyItem(
-            "caption",
-            __('Include table caption')
-        );
-        $generalOptions->addProperty($leaf);
-        // add the main group to the root group
-        $exportSpecificOptions->addProperty($generalOptions);
-
-        // what to dump (structure/data/both) main group
-        $dumpWhat = new OptionsPropertyMainGroup(
-            "dump_what", __('Dump table')
-        );
-        // create primary items and add them to the group
-        $leaf = new RadioPropertyItem("structure_or_data");
-        $leaf->setValues(
-            array(
-                'structure'          => __('structure'),
-                'data'               => __('data'),
-                'structure_and_data' => __('structure and data'),
-            )
-        );
-        $dumpWhat->addProperty($leaf);
-        // add the main group to the root group
-        $exportSpecificOptions->addProperty($dumpWhat);
-
-        // structure options main group
-        if (!$hide_structure) {
-            $structureOptions = new OptionsPropertyMainGroup(
-                "structure", __('Object creation options')
-            );
-            $structureOptions->setForce('data');
-            // create primary items and add them to the group
-            $leaf = new TextPropertyItem(
-                "structure_caption",
-                __('Table caption:')
-            );
-            $leaf->setDoc('faq6-27');
-            $structureOptions->addProperty($leaf);
-            $leaf = new TextPropertyItem(
-                "structure_continued_caption",
-                __('Table caption (continued):')
-            );
-            $leaf->setDoc('faq6-27');
-            $structureOptions->addProperty($leaf);
-            $leaf = new TextPropertyItem(
-                "structure_label",
-                __('Label key:')
-            );
-            $leaf->setDoc('faq6-27');
-            $structureOptions->addProperty($leaf);
-            if (!empty($GLOBALS['cfgRelation']['relation'])) {
-                $leaf = new BoolPropertyItem(
-                    "relation",
-                    __('Display foreign key relationships')
-                );
-                $structureOptions->addProperty($leaf);
-            }
-            $leaf = new BoolPropertyItem(
-                "comments",
-                __('Display comments')
-            );
-            $structureOptions->addProperty($leaf);
-            if (!empty($GLOBALS['cfgRelation']['mimework'])) {
-                $leaf = new BoolPropertyItem(
-                    "mime",
-                    __('Display MIME types')
-                );
-                $structureOptions->addProperty($leaf);
-            }
-            // add the main group to the root group
-            $exportSpecificOptions->addProperty($structureOptions);
-        }
-
-        // data options main group
-        $dataOptions = new OptionsPropertyMainGroup(
-            "data", __('Data dump options')
-        );
-        $dataOptions->setForce('structure');
-        // create primary items and add them to the group
-        $leaf = new BoolPropertyItem(
-            "columns",
-            __('Put columns names in the first row:')
-        );
-        $dataOptions->addProperty($leaf);
-        $leaf = new TextPropertyItem(
-            "data_caption",
-            __('Table caption:')
-        );
-        $leaf->setDoc('faq6-27');
-        $dataOptions->addProperty($leaf);
-        $leaf = new TextPropertyItem(
-            "data_continued_caption",
-            __('Table caption (continued):')
-        );
-        $leaf->setDoc('faq6-27');
-        $dataOptions->addProperty($leaf);
-        $leaf = new TextPropertyItem(
-            "data_label",
-            __('Label key:')
-        );
-        $leaf->setDoc('faq6-27');
-        $dataOptions->addProperty($leaf);
-        $leaf = new TextPropertyItem(
-            'null',
-            __('Replace NULL with:')
-        );
-        $dataOptions->addProperty($leaf);
-        // add the main group to the root group
-        $exportSpecificOptions->addProperty($dataOptions);
-
-        // set the options for the export plugin property item
-        $exportPluginProperties->setOptions($exportSpecificOptions);
-        $this->properties = $exportPluginProperties;
-    }
-
-    /**
-     * Outputs export header
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportHeader()
-    {
-        global $crlf;
-        global $cfg;
-
-        $head = '% phpMyAdmin LaTeX Dump' . $crlf
-            . '% version ' . PMA_VERSION . $crlf
-            . '% https://www.phpmyadmin.net/' . $crlf
-            . '%' . $crlf
-            . '% ' . __('Host:') . ' ' . $cfg['Server']['host'];
-        if (!empty($cfg['Server']['port'])) {
-            $head .= ':' . $cfg['Server']['port'];
-        }
-        $head .= $crlf
-            . '% ' . __('Generation Time:') . ' '
-            . Util::localisedDate() . $crlf
-            . '% ' . __('Server version:') . ' ' . PMA_MYSQL_STR_VERSION . $crlf
-            . '% ' . __('PHP Version:') . ' ' . phpversion() . $crlf;
-
-        return PMA_exportOutputHandler($head);
-    }
-
-    /**
-     * Outputs export footer
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportFooter()
-    {
-        return true;
-    }
-
-    /**
-     * Outputs database header
-     *
-     * @param string $db       Database name
-     * @param string $db_alias Aliases of db
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportDBHeader($db, $db_alias = '')
-    {
-        if (empty($db_alias)) {
-            $db_alias = $db;
-        }
-        global $crlf;
-        $head = '% ' . $crlf
-            . '% ' . __('Database:') . ' ' . '\'' . $db_alias . '\'' . $crlf
-            . '% ' . $crlf;
-
-        return PMA_exportOutputHandler($head);
-    }
-
-    /**
-     * Outputs database footer
-     *
-     * @param string $db Database name
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportDBFooter($db)
-    {
-        return true;
-    }
-
-    /**
-     * Outputs CREATE DATABASE statement
-     *
-     * @param string $db          Database name
-     * @param string $export_type 'server', 'database', 'table'
-     * @param string $db_alias    Aliases of db
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportDBCreate($db, $export_type, $db_alias = '')
-    {
-        return true;
-    }
-
-    /**
-     * Outputs the content of a table in JSON format
-     *
-     * @param string $db        database name
-     * @param string $table     table name
-     * @param string $crlf      the end of line sequence
-     * @param string $error_url the url to go back in case of error
-     * @param string $sql_query SQL query for obtaining data
-     * @param array  $aliases   Aliases of db/table/columns
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportData(
-        $db,
-        $table,
-        $crlf,
-        $error_url,
-        $sql_query,
-        $aliases = array()
-    ) {
-        $db_alias = $db;
-        $table_alias = $table;
-        $this->initAlias($aliases, $db_alias, $table_alias);
-
-        $result = $GLOBALS['dbi']->tryQuery(
-            $sql_query,
-            null,
-            DatabaseInterface::QUERY_UNBUFFERED
-        );
-
-        $columns_cnt = $GLOBALS['dbi']->numFields($result);
-        $columns = array();
-        $columns_alias = array();
-        for ($i = 0; $i < $columns_cnt; $i++) {
-            $columns[$i] = $col_as = $GLOBALS['dbi']->fieldName($result, $i);
-            if (!empty($aliases[$db]['tables'][$table]['columns'][$col_as])) {
-                $col_as = $aliases[$db]['tables'][$table]['columns'][$col_as];
-            }
-            $columns_alias[$i] = $col_as;
-        }
-
-        $buffer = $crlf . '%' . $crlf . '% ' . __('Data:') . ' ' . $table_alias
-            . $crlf . '%' . $crlf . ' \\begin{longtable}{|';
-
-        for ($index = 0; $index < $columns_cnt; $index++) {
-            $buffer .= 'l|';
-        }
-        $buffer .= '} ' . $crlf;
-
-        $buffer .= ' \\hline \\endhead \\hline \\endfoot \\hline ' . $crlf;
-        if (isset($GLOBALS['latex_caption'])) {
-            $buffer .= ' \\caption{'
-                . Util::expandUserString(
-                    $GLOBALS['latex_data_caption'],
-                    array(
-                        'texEscape',
-                        get_class($this),
-                    ),
-                    array('table' => $table_alias, 'database' => $db_alias)
-                )
-                . '} \\label{'
-                . Util::expandUserString(
-                    $GLOBALS['latex_data_label'],
-                    null,
-                    array('table' => $table_alias, 'database' => $db_alias)
-                )
-                . '} \\\\';
-        }
-        if (!PMA_exportOutputHandler($buffer)) {
-            return false;
-        }
-
-        // show column names
-        if (isset($GLOBALS['latex_columns'])) {
-            $buffer = '\\hline ';
-            for ($i = 0; $i < $columns_cnt; $i++) {
-                $buffer .= '\\multicolumn{1}{|c|}{\\textbf{'
-                    . self::texEscape(stripslashes($columns_alias[$i])) . '}} & ';
-            }
-
-            $buffer = mb_substr($buffer, 0, -2) . '\\\\ \\hline \hline ';
-            if (!PMA_exportOutputHandler($buffer . ' \\endfirsthead ' . $crlf)) {
-                return false;
-            }
-            if (isset($GLOBALS['latex_caption'])) {
-                if (!PMA_exportOutputHandler(
-                    '\\caption{'
-                    . Util::expandUserString(
-                        $GLOBALS['latex_data_continued_caption'],
-                        array(
-                            'texEscape',
-                            get_class($this),
-                        ),
-                        array('table' => $table_alias, 'database' => $db_alias)
-                    )
-                    . '} \\\\ '
-                )
-                ) {
-                    return false;
-                }
-            }
-            if (!PMA_exportOutputHandler($buffer . '\\endhead \\endfoot' . $crlf)) {
-                return false;
-            }
-        } else {
-            if (!PMA_exportOutputHandler('\\\\ \hline')) {
-                return false;
-            }
-        }
-
-        // print the whole table
-        while ($record = $GLOBALS['dbi']->fetchAssoc($result)) {
-            $buffer = '';
-            // print each row
-            for ($i = 0; $i < $columns_cnt; $i++) {
-                if ((!function_exists('is_null')
-                    || !is_null($record[$columns[$i]]))
-                    && isset($record[$columns[$i]])
-                ) {
-                    $column_value = self::texEscape(
-                        stripslashes($record[$columns[$i]])
-                    );
-                } else {
-                    $column_value = $GLOBALS['latex_null'];
-                }
-
-                // last column ... no need for & character
-                if ($i == ($columns_cnt - 1)) {
-                    $buffer .= $column_value;
-                } else {
-                    $buffer .= $column_value . " & ";
-                }
-            }
-            $buffer .= ' \\\\ \\hline ' . $crlf;
-            if (!PMA_exportOutputHandler($buffer)) {
-                return false;
-            }
-        }
-
-        $buffer = ' \\end{longtable}' . $crlf;
-        if (!PMA_exportOutputHandler($buffer)) {
-            return false;
-        }
-
-        $GLOBALS['dbi']->freeResult($result);
-
-        return true;
-    } // end getTableLaTeX
-
-    /**
-     * Outputs table's structure
-     *
-     * @param string $db          database name
-     * @param string $table       table name
-     * @param string $crlf        the end of line sequence
-     * @param string $error_url   the url to go back in case of error
-     * @param string $export_mode 'create_table', 'triggers', 'create_view',
-     *                            'stand_in'
-     * @param string $export_type 'server', 'database', 'table'
-     * @param bool   $do_relation whether to include relation comments
-     * @param bool   $do_comments whether to include the pmadb-style column
-     *                            comments as comments in the structure;
-     *                            this is deprecated but the parameter is
-     *                            left here because export.php calls
-     *                            exportStructure() also for other
-     *                            export types which use this parameter
-     * @param bool   $do_mime     whether to include mime comments
-     * @param bool   $dates       whether to include creation/update/check dates
-     * @param array  $aliases     Aliases of db/table/columns
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportStructure(
-        $db,
-        $table,
-        $crlf,
-        $error_url,
-        $export_mode,
-        $export_type,
-        $do_relation = false,
-        $do_comments = false,
-        $do_mime = false,
-        $dates = false,
-        $aliases = array()
-    ) {
-        $db_alias = $db;
-        $table_alias = $table;
-        $this->initAlias($aliases, $db_alias, $table_alias);
-
-        global $cfgRelation;
-
-        /* We do not export triggers */
-        if ($export_mode == 'triggers') {
-            return true;
-        }
-
-        /**
-         * Get the unique keys in the table
-         */
-        $unique_keys = array();
-        $keys = $GLOBALS['dbi']->getTableIndexes($db, $table);
-        foreach ($keys as $key) {
-            if ($key['Non_unique'] == 0) {
-                $unique_keys[] = $key['Column_name'];
-            }
-        }
-
-        /**
-         * Gets fields properties
-         */
-        $GLOBALS['dbi']->selectDb($db);
-
-        // Check if we can use Relations
-        list($res_rel, $have_rel) = PMA_getRelationsAndStatus(
-            $do_relation && !empty($cfgRelation['relation']),
-            $db,
-            $table
-        );
-        /**
-         * Displays the table structure
-         */
-        $buffer = $crlf . '%' . $crlf . '% ' . __('Structure:') . ' '
-            . $table_alias . $crlf . '%' . $crlf . ' \\begin{longtable}{';
-        if (!PMA_exportOutputHandler($buffer)) {
-            return false;
-        }
-
-        $alignment = '|l|c|c|c|';
-        if ($do_relation && $have_rel) {
-            $alignment .= 'l|';
-        }
-        if ($do_comments) {
-            $alignment .= 'l|';
-        }
-        if ($do_mime && $cfgRelation['mimework']) {
-            $alignment .= 'l|';
-        }
-        $buffer = $alignment . '} ' . $crlf;
-
-        $header = ' \\hline ';
-        $header .= '\\multicolumn{1}{|c|}{\\textbf{' . __('Column')
-            . '}} & \\multicolumn{1}{|c|}{\\textbf{' . __('Type')
-            . '}} & \\multicolumn{1}{|c|}{\\textbf{' . __('Null')
-            . '}} & \\multicolumn{1}{|c|}{\\textbf{' . __('Default') . '}}';
-        if ($do_relation && $have_rel) {
-            $header .= ' & \\multicolumn{1}{|c|}{\\textbf{' . __('Links to') . '}}';
-        }
-        if ($do_comments) {
-            $header .= ' & \\multicolumn{1}{|c|}{\\textbf{' . __('Comments') . '}}';
-            $comments = PMA_getComments($db, $table);
-        }
-        if ($do_mime && $cfgRelation['mimework']) {
-            $header .= ' & \\multicolumn{1}{|c|}{\\textbf{MIME}}';
-            $mime_map = PMA_getMIME($db, $table, true);
-        }
-
-        // Table caption for first page and label
-        if (isset($GLOBALS['latex_caption'])) {
-            $buffer .= ' \\caption{'
-                . Util::expandUserString(
-                    $GLOBALS['latex_structure_caption'],
-                    array(
-                        'texEscape',
-                        get_class($this),
-                    ),
-                    array('table' => $table_alias, 'database' => $db_alias)
-                )
-                . '} \\label{'
-                . Util::expandUserString(
-                    $GLOBALS['latex_structure_label'],
-                    null,
-                    array('table' => $table_alias, 'database' => $db_alias)
-                )
-                . '} \\\\' . $crlf;
-        }
-        $buffer .= $header . ' \\\\ \\hline \\hline' . $crlf
-            . '\\endfirsthead' . $crlf;
-        // Table caption on next pages
-        if (isset($GLOBALS['latex_caption'])) {
-            $buffer .= ' \\caption{'
-                . Util::expandUserString(
-                    $GLOBALS['latex_structure_continued_caption'],
-                    array(
-                        'texEscape',
-                        get_class($this),
-                    ),
-                    array('table' => $table_alias, 'database' => $db_alias)
-                )
-                . '} \\\\ ' . $crlf;
-        }
-        $buffer .= $header . ' \\\\ \\hline \\hline \\endhead \\endfoot ' . $crlf;
-
-        if (!PMA_exportOutputHandler($buffer)) {
-            return false;
-        }
-
-        $fields = $GLOBALS['dbi']->getColumns($db, $table);
-        foreach ($fields as $row) {
-            $extracted_columnspec = Util::extractColumnSpec($row['Type']);
-            $type = $extracted_columnspec['print_type'];
-            if (empty($type)) {
-                $type = ' ';
-            }
-
-            if (!isset($row['Default'])) {
-                if ($row['Null'] != 'NO') {
-                    $row['Default'] = 'NULL';
-                }
-            }
-
-            $field_name = $col_as = $row['Field'];
-            if (!empty($aliases[$db]['tables'][$table]['columns'][$col_as])) {
-                $col_as = $aliases[$db]['tables'][$table]['columns'][$col_as];
-            }
-
-            $local_buffer = $col_as . "\000" . $type . "\000"
-                . (($row['Null'] == '' || $row['Null'] == 'NO')
-                    ? __('No') : __('Yes'))
-                . "\000" . (isset($row['Default']) ? $row['Default'] : '');
-
-            if ($do_relation && $have_rel) {
-                $local_buffer .= "\000";
-                $local_buffer .= $this->getRelationString(
-                    $res_rel,
-                    $field_name,
-                    $db,
-                    $aliases
-                );
-            }
-            if ($do_comments && $cfgRelation['commwork']) {
-                $local_buffer .= "\000";
-                if (isset($comments[$field_name])) {
-                    $local_buffer .= $comments[$field_name];
-                }
-            }
-            if ($do_mime && $cfgRelation['mimework']) {
-                $local_buffer .= "\000";
-                if (isset($mime_map[$field_name])) {
-                    $local_buffer .= str_replace(
-                        '_',
-                        '/',
-                        $mime_map[$field_name]['mimetype']
-                    );
-                }
-            }
-            $local_buffer = self::texEscape($local_buffer);
-            if ($row['Key'] == 'PRI') {
-                $pos = mb_strpos($local_buffer, "\000");
-                $local_buffer = '\\textit{'
-                    .
-                    mb_substr($local_buffer, 0, $pos)
-                    . '}' .
-                    mb_substr($local_buffer, $pos);
-            }
-            if (in_array($field_name, $unique_keys)) {
-                $pos = mb_strpos($local_buffer, "\000");
-                $local_buffer = '\\textbf{'
-                    .
-                    mb_substr($local_buffer, 0, $pos)
-                    . '}' .
-                    mb_substr($local_buffer, $pos);
-            }
-            $buffer = str_replace("\000", ' & ', $local_buffer);
-            $buffer .= ' \\\\ \\hline ' . $crlf;
-
-            if (!PMA_exportOutputHandler($buffer)) {
-                return false;
-            }
-        } // end while
-
-        $buffer = ' \\end{longtable}' . $crlf;
-
-        return PMA_exportOutputHandler($buffer);
-    } // end of the 'exportStructure' method
-
-    /**
-     * Escapes some special characters for use in TeX/LaTeX
-     *
-     * @param string $string the string to convert
-     *
-     * @return string the converted string with escape codes
-     */
-    public static function texEscape($string)
-    {
-        $escape = array('$', '%', '{', '}', '&', '#', '_', '^');
-        $cnt_escape = count($escape);
-        for ($k = 0; $k < $cnt_escape; $k++) {
-            $string = str_replace($escape[$k], '\\' . $escape[$k], $string);
-        }
-
-        return $string;
-    }
-}
diff --git a/#pma/libraries/plugins/export/ExportMediawiki.php b/#pma/libraries/plugins/export/ExportMediawiki.php
deleted file mode 100644
index 810198bb..00000000
--- a/#pma/libraries/plugins/export/ExportMediawiki.php
+++ /dev/null
@@ -1,379 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Set of functions used to build MediaWiki dumps of tables
- *
- * @package    PhpMyAdmin-Export
- * @subpackage MediaWiki
- */
-namespace PMA\libraries\plugins\export;
-
-use PMA\libraries\properties\options\items\BoolPropertyItem;
-use PMA\libraries\plugins\ExportPlugin;
-use PMA\libraries\properties\plugins\ExportPluginProperties;
-use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
-use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
-use PMA\libraries\properties\options\groups\OptionsPropertySubgroup;
-use PMA;
-use PMA\libraries\properties\options\items\RadioPropertyItem;
-
-/**
- * Handles the export for the MediaWiki class
- *
- * @package    PhpMyAdmin-Export
- * @subpackage MediaWiki
- */
-class ExportMediawiki extends ExportPlugin
-{
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        $this->setProperties();
-    }
-
-    /**
-     * Sets the export MediaWiki properties
-     *
-     * @return void
-     */
-    protected function setProperties()
-    {
-        $exportPluginProperties = new ExportPluginProperties();
-        $exportPluginProperties->setText('MediaWiki Table');
-        $exportPluginProperties->setExtension('mediawiki');
-        $exportPluginProperties->setMimeType('text/plain');
-        $exportPluginProperties->setOptionsText(__('Options'));
-
-        // create the root group that will be the options field for
-        // $exportPluginProperties
-        // this will be shown as "Format specific options"
-        $exportSpecificOptions = new OptionsPropertyRootGroup(
-            "Format Specific Options"
-        );
-
-        // general options main group
-        $generalOptions = new OptionsPropertyMainGroup(
-            "general_opts", __('Dump table')
-        );
-
-        // what to dump (structure/data/both)
-        $subgroup = new OptionsPropertySubgroup(
-            "dump_table", __("Dump table")
-        );
-        $leaf = new RadioPropertyItem('structure_or_data');
-        $leaf->setValues(
-            array(
-                'structure'          => __('structure'),
-                'data'               => __('data'),
-                'structure_and_data' => __('structure and data'),
-            )
-        );
-        $subgroup->setSubgroupHeader($leaf);
-        $generalOptions->addProperty($subgroup);
-
-        // export table name
-        $leaf = new BoolPropertyItem(
-            "caption",
-            __('Export table names')
-        );
-        $generalOptions->addProperty($leaf);
-
-        // export table headers
-        $leaf = new BoolPropertyItem(
-            "headers",
-            __('Export table headers')
-        );
-        $generalOptions->addProperty($leaf);
-        //add the main group to the root group
-        $exportSpecificOptions->addProperty($generalOptions);
-
-        // set the options for the export plugin property item
-        $exportPluginProperties->setOptions($exportSpecificOptions);
-        $this->properties = $exportPluginProperties;
-    }
-
-    /**
-     * Outputs export header
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportHeader()
-    {
-        return true;
-    }
-
-    /**
-     * Outputs export footer
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportFooter()
-    {
-        return true;
-    }
-
-    /**
-     * Outputs database header
-     *
-     * @param string $db       Database name
-     * @param string $db_alias Alias of db
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportDBHeader($db, $db_alias = '')
-    {
-        return true;
-    }
-
-    /**
-     * Outputs database footer
-     *
-     * @param string $db Database name
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportDBFooter($db)
-    {
-        return true;
-    }
-
-    /**
-     * Outputs CREATE DATABASE statement
-     *
-     * @param string $db          Database name
-     * @param string $export_type 'server', 'database', 'table'
-     * @param string $db_alias    Aliases of db
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportDBCreate($db, $export_type, $db_alias = '')
-    {
-        return true;
-    }
-
-    /**
-     * Outputs table's structure
-     *
-     * @param string $db          database name
-     * @param string $table       table name
-     * @param string $crlf        the end of line sequence
-     * @param string $error_url   the url to go back in case of error
-     * @param string $export_mode 'create_table','triggers','create_view',
-     *                            'stand_in'
-     * @param string $export_type 'server', 'database', 'table'
-     * @param bool   $do_relation whether to include relation comments
-     * @param bool   $do_comments whether to include the pmadb-style column
-     *                            comments as comments in the structure; this is
-     *                            deprecated but the parameter is left here
-     *                            because export.php calls exportStructure()
-     *                            also for other export types which use this
-     *                            parameter
-     * @param bool   $do_mime     whether to include mime comments
-     * @param bool   $dates       whether to include creation/update/check dates
-     * @param array  $aliases     Aliases of db/table/columns
-     *
-     * @return bool               Whether it succeeded
-     */
-    public function exportStructure(
-        $db,
-        $table,
-        $crlf,
-        $error_url,
-        $export_mode,
-        $export_type,
-        $do_relation = false,
-        $do_comments = false,
-        $do_mime = false,
-        $dates = false,
-        $aliases = array()
-    ) {
-        $db_alias = $db;
-        $table_alias = $table;
-        $this->initAlias($aliases, $db_alias, $table_alias);
-
-        $output = '';
-        switch ($export_mode) {
-        case 'create_table':
-            $columns = $GLOBALS['dbi']->getColumns($db, $table);
-            $columns = array_values($columns);
-            $row_cnt = count($columns);
-
-            // Print structure comment
-            $output = $this->_exportComment(
-                "Table structure for "
-                . PMA\libraries\Util::backquote($table_alias)
-            );
-
-            // Begin the table construction
-            $output .= "{| class=\"wikitable\" style=\"text-align:center;\""
-                . $this->_exportCRLF();
-
-            // Add the table name
-            if (isset($GLOBALS['mediawiki_caption'])) {
-                $output .= "|+'''" . $table_alias . "'''" . $this->_exportCRLF();
-            }
-
-            // Add the table headers
-            if (isset($GLOBALS['mediawiki_headers'])) {
-                $output .= "|- style=\"background:#ffdead;\"" . $this->_exportCRLF();
-                $output .= "! style=\"background:#ffffff\" | "
-                    . $this->_exportCRLF();
-                for ($i = 0; $i < $row_cnt; ++$i) {
-                    $col_as = $columns[$i]['Field'];
-                    if (!empty($aliases[$db]['tables'][$table]['columns'][$col_as])
-                    ) {
-                        $col_as
-                            = $aliases[$db]['tables'][$table]['columns'][$col_as];
-                    }
-                    $output .= " | " . $col_as . $this->_exportCRLF();
-                }
-            }
-
-            // Add the table structure
-            $output .= "|-" . $this->_exportCRLF();
-            $output .= "! Type" . $this->_exportCRLF();
-            for ($i = 0; $i < $row_cnt; ++$i) {
-                $output .= " | " . $columns[$i]['Type'] . $this->_exportCRLF();
-            }
-
-            $output .= "|-" . $this->_exportCRLF();
-            $output .= "! Null" . $this->_exportCRLF();
-            for ($i = 0; $i < $row_cnt; ++$i) {
-                $output .= " | " . $columns[$i]['Null'] . $this->_exportCRLF();
-            }
-
-            $output .= "|-" . $this->_exportCRLF();
-            $output .= "! Default" . $this->_exportCRLF();
-            for ($i = 0; $i < $row_cnt; ++$i) {
-                $output .= " | " . $columns[$i]['Default'] . $this->_exportCRLF();
-            }
-
-            $output .= "|-" . $this->_exportCRLF();
-            $output .= "! Extra" . $this->_exportCRLF();
-            for ($i = 0; $i < $row_cnt; ++$i) {
-                $output .= " | " . $columns[$i]['Extra'] . $this->_exportCRLF();
-            }
-
-            $output .= "|}" . str_repeat($this->_exportCRLF(), 2);
-            break;
-        } // end switch
-
-        return PMA_exportOutputHandler($output);
-    }
-
-    /**
-     * Outputs the content of a table in MediaWiki format
-     *
-     * @param string $db        database name
-     * @param string $table     table name
-     * @param string $crlf      the end of line sequence
-     * @param string $error_url the url to go back in case of error
-     * @param string $sql_query SQL query for obtaining data
-     * @param array  $aliases   Aliases of db/table/columns
-     *
-     * @return bool             Whether it succeeded
-     */
-    public function exportData(
-        $db,
-        $table,
-        $crlf,
-        $error_url,
-        $sql_query,
-        $aliases = array()
-    ) {
-        $db_alias = $db;
-        $table_alias = $table;
-        $this->initAlias($aliases, $db_alias, $table_alias);
-
-        // Print data comment
-        $output = $this->_exportComment(
-            "Table data for " . PMA\libraries\Util::backquote($table_alias)
-        );
-
-        // Begin the table construction
-        // Use the "wikitable" class for style
-        // Use the "sortable"  class for allowing tables to be sorted by column
-        $output .= "{| class=\"wikitable sortable\" style=\"text-align:center;\""
-            . $this->_exportCRLF();
-
-        // Add the table name
-        if (isset($GLOBALS['mediawiki_caption'])) {
-            $output .= "|+'''" . $table_alias . "'''" . $this->_exportCRLF();
-        }
-
-        // Add the table headers
-        if (isset($GLOBALS['mediawiki_headers'])) {
-            // Get column names
-            $column_names = $GLOBALS['dbi']->getColumnNames($db, $table);
-
-            // Add column names as table headers
-            if (!is_null($column_names)) {
-                // Use '|-' for separating rows
-                $output .= "|-" . $this->_exportCRLF();
-
-                // Use '!' for separating table headers
-                foreach ($column_names as $column) {
-                    if (!empty($aliases[$db]['tables'][$table]['columns'][$column])
-                    ) {
-                        $column
-                            = $aliases[$db]['tables'][$table]['columns'][$column];
-                    }
-                    $output .= " ! " . $column . "" . $this->_exportCRLF();
-                }
-            }
-        }
-
-        // Get the table data from the database
-        $result = $GLOBALS['dbi']->query(
-            $sql_query,
-            null,
-            PMA\libraries\DatabaseInterface::QUERY_UNBUFFERED
-        );
-        $fields_cnt = $GLOBALS['dbi']->numFields($result);
-
-        while ($row = $GLOBALS['dbi']->fetchRow($result)) {
-            $output .= "|-" . $this->_exportCRLF();
-
-            // Use '|' for separating table columns
-            for ($i = 0; $i < $fields_cnt; ++$i) {
-                $output .= " | " . $row[$i] . "" . $this->_exportCRLF();
-            }
-        }
-
-        // End table construction
-        $output .= "|}" . str_repeat($this->_exportCRLF(), 2);
-
-        return PMA_exportOutputHandler($output);
-    }
-
-    /**
-     * Outputs comments containing info about the exported tables
-     *
-     * @param string $text Text of comment
-     *
-     * @return string The formatted comment
-     */
-    private function _exportComment($text = '')
-    {
-        // see http://www.mediawiki.org/wiki/Help:Formatting
-        $comment = $this->_exportCRLF();
-        $comment .= '<!--' . $this->_exportCRLF();
-        $comment .= htmlspecialchars($text) . $this->_exportCRLF();
-        $comment .= '-->' . str_repeat($this->_exportCRLF(), 2);
-
-        return $comment;
-    }
-
-    /**
-     * Outputs CRLF
-     *
-     * @return string CRLF
-     */
-    private function _exportCRLF()
-    {
-        // The CRLF expected by the mediawiki format is "\n"
-        return "\n";
-    }
-}
diff --git a/#pma/libraries/plugins/export/ExportOds.php b/#pma/libraries/plugins/export/ExportOds.php
deleted file mode 100644
index 8ee621c5..00000000
--- a/#pma/libraries/plugins/export/ExportOds.php
+++ /dev/null
@@ -1,342 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Set of functions used to build OpenDocument Spreadsheet dumps of tables
- *
- * @package    PhpMyAdmin-Export
- * @subpackage ODS
- */
-namespace PMA\libraries\plugins\export;
-
-use PMA\libraries\properties\options\items\BoolPropertyItem;
-use PMA\libraries\plugins\ExportPlugin;
-use PMA\libraries\properties\plugins\ExportPluginProperties;
-use PMA\libraries\properties\options\items\HiddenPropertyItem;
-use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
-use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
-use PMA\libraries\DatabaseInterface;
-use PMA\libraries\properties\options\items\TextPropertyItem;
-
-$GLOBALS['ods_buffer'] = '';
-require_once 'libraries/opendocument.lib.php';
-
-/**
- * Handles the export for the ODS class
- *
- * @package    PhpMyAdmin-Export
- * @subpackage ODS
- */
-class ExportOds extends ExportPlugin
-{
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        $this->setProperties();
-    }
-
-    /**
-     * Sets the export ODS properties
-     *
-     * @return void
-     */
-    protected function setProperties()
-    {
-        $exportPluginProperties = new ExportPluginProperties();
-        $exportPluginProperties->setText('OpenDocument Spreadsheet');
-        $exportPluginProperties->setExtension('ods');
-        $exportPluginProperties->setMimeType(
-            'application/vnd.oasis.opendocument.spreadsheet'
-        );
-        $exportPluginProperties->setForceFile(true);
-        $exportPluginProperties->setOptionsText(__('Options'));
-
-        // create the root group that will be the options field for
-        // $exportPluginProperties
-        // this will be shown as "Format specific options"
-        $exportSpecificOptions = new OptionsPropertyRootGroup(
-            "Format Specific Options"
-        );
-
-        // general options main group
-        $generalOptions = new OptionsPropertyMainGroup("general_opts");
-        // create primary items and add them to the group
-        $leaf = new TextPropertyItem(
-            "null",
-            __('Replace NULL with:')
-        );
-        $generalOptions->addProperty($leaf);
-        $leaf = new BoolPropertyItem(
-            "columns",
-            __('Put columns names in the first row')
-        );
-        $generalOptions->addProperty($leaf);
-        $leaf = new HiddenPropertyItem("structure_or_data");
-        $generalOptions->addProperty($leaf);
-        // add the main group to the root group
-        $exportSpecificOptions->addProperty($generalOptions);
-
-        // set the options for the export plugin property item
-        $exportPluginProperties->setOptions($exportSpecificOptions);
-        $this->properties = $exportPluginProperties;
-    }
-
-    /**
-     * Outputs export header
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportHeader()
-    {
-        $GLOBALS['ods_buffer'] .= '<?xml version="1.0" encoding="utf-8"?' . '>'
-            . '<office:document-content '
-            . $GLOBALS['OpenDocumentNS'] . 'office:version="1.0">'
-            . '<office:automatic-styles>'
-            . '<number:date-style style:name="N37"'
-            . ' number:automatic-order="true">'
-            . '<number:month number:style="long"/>'
-            . '<number:text>/</number:text>'
-            . '<number:day number:style="long"/>'
-            . '<number:text>/</number:text>'
-            . '<number:year/>'
-            . '</number:date-style>'
-            . '<number:time-style style:name="N43">'
-            . '<number:hours number:style="long"/>'
-            . '<number:text>:</number:text>'
-            . '<number:minutes number:style="long"/>'
-            . '<number:text>:</number:text>'
-            . '<number:seconds number:style="long"/>'
-            . '<number:text> </number:text>'
-            . '<number:am-pm/>'
-            . '</number:time-style>'
-            . '<number:date-style style:name="N50"'
-            . ' number:automatic-order="true"'
-            . ' number:format-source="language">'
-            . '<number:month/>'
-            . '<number:text>/</number:text>'
-            . '<number:day/>'
-            . '<number:text>/</number:text>'
-            . '<number:year/>'
-            . '<number:text> </number:text>'
-            . '<number:hours number:style="long"/>'
-            . '<number:text>:</number:text>'
-            . '<number:minutes number:style="long"/>'
-            . '<number:text> </number:text>'
-            . '<number:am-pm/>'
-            . '</number:date-style>'
-            . '<style:style style:name="DateCell" style:family="table-cell"'
-            . ' style:parent-style-name="Default" style:data-style-name="N37"/>'
-            . '<style:style style:name="TimeCell" style:family="table-cell"'
-            . ' style:parent-style-name="Default" style:data-style-name="N43"/>'
-            . '<style:style style:name="DateTimeCell" style:family="table-cell"'
-            . ' style:parent-style-name="Default" style:data-style-name="N50"/>'
-            . '</office:automatic-styles>'
-            . '<office:body>'
-            . '<office:spreadsheet>';
-
-        return true;
-    }
-
-    /**
-     * Outputs export footer
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportFooter()
-    {
-        $GLOBALS['ods_buffer'] .= '</office:spreadsheet>'
-            . '</office:body>'
-            . '</office:document-content>';
-        if (!PMA_exportOutputHandler(
-            PMA_createOpenDocument(
-                'application/vnd.oasis.opendocument.spreadsheet',
-                $GLOBALS['ods_buffer']
-            )
-        )
-        ) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Outputs database header
-     *
-     * @param string $db       Database name
-     * @param string $db_alias Aliases of db
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportDBHeader($db, $db_alias = '')
-    {
-        return true;
-    }
-
-    /**
-     * Outputs database footer
-     *
-     * @param string $db Database name
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportDBFooter($db)
-    {
-        return true;
-    }
-
-    /**
-     * Outputs CREATE DATABASE statement
-     *
-     * @param string $db          Database name
-     * @param string $export_type 'server', 'database', 'table'
-     * @param string $db_alias    Aliases of db
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportDBCreate($db, $export_type, $db_alias = '')
-    {
-        return true;
-    }
-
-    /**
-     * Outputs the content of a table in NHibernate format
-     *
-     * @param string $db        database name
-     * @param string $table     table name
-     * @param string $crlf      the end of line sequence
-     * @param string $error_url the url to go back in case of error
-     * @param string $sql_query SQL query for obtaining data
-     * @param array  $aliases   Aliases of db/table/columns
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportData(
-        $db,
-        $table,
-        $crlf,
-        $error_url,
-        $sql_query,
-        $aliases = array()
-    ) {
-        global $what;
-
-        $db_alias = $db;
-        $table_alias = $table;
-        $this->initAlias($aliases, $db_alias, $table_alias);
-        // Gets the data from the database
-        $result = $GLOBALS['dbi']->query(
-            $sql_query,
-            null,
-            DatabaseInterface::QUERY_UNBUFFERED
-        );
-        $fields_cnt = $GLOBALS['dbi']->numFields($result);
-        $fields_meta = $GLOBALS['dbi']->getFieldsMeta($result);
-        $field_flags = array();
-        for ($j = 0; $j < $fields_cnt; $j++) {
-            $field_flags[$j] = $GLOBALS['dbi']->fieldFlags($result, $j);
-        }
-
-        $GLOBALS['ods_buffer']
-            .= '<table:table table:name="' . htmlspecialchars($table_alias) . '">';
-
-        // If required, get fields name at the first line
-        if (isset($GLOBALS[$what . '_columns'])) {
-            $GLOBALS['ods_buffer'] .= '<table:table-row>';
-            for ($i = 0; $i < $fields_cnt; $i++) {
-                $col_as = $GLOBALS['dbi']->fieldName($result, $i);
-                if (!empty($aliases[$db]['tables'][$table]['columns'][$col_as])) {
-                    $col_as = $aliases[$db]['tables'][$table]['columns'][$col_as];
-                }
-                $GLOBALS['ods_buffer']
-                    .= '<table:table-cell office:value-type="string">'
-                    . '<text:p>'
-                    . htmlspecialchars(
-                        stripslashes($col_as)
-                    )
-                    . '</text:p>'
-                    . '</table:table-cell>';
-            } // end for
-            $GLOBALS['ods_buffer'] .= '</table:table-row>';
-        } // end if
-
-        // Format the data
-        while ($row = $GLOBALS['dbi']->fetchRow($result)) {
-            $GLOBALS['ods_buffer'] .= '<table:table-row>';
-            for ($j = 0; $j < $fields_cnt; $j++) {
-                if (!isset($row[$j]) || is_null($row[$j])) {
-                    $GLOBALS['ods_buffer']
-                        .= '<table:table-cell office:value-type="string">'
-                        . '<text:p>'
-                        . htmlspecialchars($GLOBALS[$what . '_null'])
-                        . '</text:p>'
-                        . '</table:table-cell>';
-                } elseif (stristr($field_flags[$j], 'BINARY')
-                    && $fields_meta[$j]->blob
-                ) {
-                    // ignore BLOB
-                    $GLOBALS['ods_buffer']
-                        .= '<table:table-cell office:value-type="string">'
-                        . '<text:p></text:p>'
-                        . '</table:table-cell>';
-                } elseif ($fields_meta[$j]->type == "date") {
-                    $GLOBALS['ods_buffer']
-                        .= '<table:table-cell office:value-type="date"'
-                        . ' office:date-value="'
-                        . date("Y-m-d", strtotime($row[$j]))
-                        . '" table:style-name="DateCell">'
-                        . '<text:p>'
-                        . htmlspecialchars($row[$j])
-                        . '</text:p>'
-                        . '</table:table-cell>';
-                } elseif ($fields_meta[$j]->type == "time") {
-                    $GLOBALS['ods_buffer']
-                        .= '<table:table-cell office:value-type="time"'
-                        . ' office:time-value="'
-                        . date("\P\TH\Hi\Ms\S", strtotime($row[$j]))
-                        . '" table:style-name="TimeCell">'
-                        . '<text:p>'
-                        . htmlspecialchars($row[$j])
-                        . '</text:p>'
-                        . '</table:table-cell>';
-                } elseif ($fields_meta[$j]->type == "datetime") {
-                    $GLOBALS['ods_buffer']
-                        .= '<table:table-cell office:value-type="date"'
-                        . ' office:date-value="'
-                        . date("Y-m-d\TH:i:s", strtotime($row[$j]))
-                        . '" table:style-name="DateTimeCell">'
-                        . '<text:p>'
-                        . htmlspecialchars($row[$j])
-                        . '</text:p>'
-                        . '</table:table-cell>';
-                } elseif (($fields_meta[$j]->numeric
-                    && $fields_meta[$j]->type != 'timestamp'
-                    && !$fields_meta[$j]->blob)
-                    || $fields_meta[$j]->type == 'real'
-                ) {
-                    $GLOBALS['ods_buffer']
-                        .= '<table:table-cell office:value-type="float"'
-                        . ' office:value="' . $row[$j] . '" >'
-                        . '<text:p>'
-                        . htmlspecialchars($row[$j])
-                        . '</text:p>'
-                        . '</table:table-cell>';
-                } else {
-                    $GLOBALS['ods_buffer']
-                        .= '<table:table-cell office:value-type="string">'
-                        . '<text:p>'
-                        . htmlspecialchars($row[$j])
-                        . '</text:p>'
-                        . '</table:table-cell>';
-                }
-            } // end for
-            $GLOBALS['ods_buffer'] .= '</table:table-row>';
-        } // end while
-        $GLOBALS['dbi']->freeResult($result);
-
-        $GLOBALS['ods_buffer'] .= '</table:table>';
-
-        return true;
-    }
-}
diff --git a/#pma/libraries/plugins/export/ExportOdt.php b/#pma/libraries/plugins/export/ExportOdt.php
deleted file mode 100644
index 152619ce..00000000
--- a/#pma/libraries/plugins/export/ExportOdt.php
+++ /dev/null
@@ -1,802 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Set of functions used to build OpenDocument Text dumps of tables
- *
- * @package    PhpMyAdmin-Export
- * @subpackage ODT
- */
-namespace PMA\libraries\plugins\export;
-
-use PMA\libraries\properties\options\items\BoolPropertyItem;
-use PMA\libraries\properties\plugins\ExportPluginProperties;
-use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
-use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
-use PMA\libraries\DatabaseInterface;
-use PMA\libraries\plugins\ExportPlugin;
-use PMA\libraries\Util;
-use PMA\libraries\properties\options\items\RadioPropertyItem;
-use PMA\libraries\properties\options\items\TextPropertyItem;
-
-$GLOBALS['odt_buffer'] = '';
-require_once 'libraries/opendocument.lib.php';
-
-/**
- * Handles the export for the ODT class
- *
- * @package    PhpMyAdmin-Export
- * @subpackage ODT
- */
-class ExportOdt extends ExportPlugin
-{
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        $this->setProperties();
-    }
-
-    /**
-     * Sets the export ODT properties
-     *
-     * @return void
-     */
-    protected function setProperties()
-    {
-        global $plugin_param;
-        $hide_structure = false;
-        if ($plugin_param['export_type'] == 'table'
-            && !$plugin_param['single_table']
-        ) {
-            $hide_structure = true;
-        }
-
-        $exportPluginProperties = new ExportPluginProperties();
-        $exportPluginProperties->setText('OpenDocument Text');
-        $exportPluginProperties->setExtension('odt');
-        $exportPluginProperties->setMimeType(
-            'application/vnd.oasis.opendocument.text'
-        );
-        $exportPluginProperties->setForceFile(true);
-        $exportPluginProperties->setOptionsText(__('Options'));
-
-        // create the root group that will be the options field for
-        // $exportPluginProperties
-        // this will be shown as "Format specific options"
-        $exportSpecificOptions = new OptionsPropertyRootGroup(
-            "Format Specific Options"
-        );
-
-        // what to dump (structure/data/both) main group
-        $dumpWhat = new OptionsPropertyMainGroup(
-            "general_opts", __('Dump table')
-        );
-        // create primary items and add them to the group
-        $leaf = new RadioPropertyItem("structure_or_data");
-        $leaf->setValues(
-            array(
-                'structure'          => __('structure'),
-                'data'               => __('data'),
-                'structure_and_data' => __('structure and data'),
-            )
-        );
-        $dumpWhat->addProperty($leaf);
-        // add the main group to the root group
-        $exportSpecificOptions->addProperty($dumpWhat);
-
-        // structure options main group
-        if (!$hide_structure) {
-            $structureOptions = new OptionsPropertyMainGroup(
-                "structure", __('Object creation options')
-            );
-            $structureOptions->setForce('data');
-            // create primary items and add them to the group
-            if (!empty($GLOBALS['cfgRelation']['relation'])) {
-                $leaf = new BoolPropertyItem(
-                    "relation",
-                    __('Display foreign key relationships')
-                );
-                $structureOptions->addProperty($leaf);
-            }
-            $leaf = new BoolPropertyItem(
-                "comments",
-                __('Display comments')
-            );
-            $structureOptions->addProperty($leaf);
-            if (!empty($GLOBALS['cfgRelation']['mimework'])) {
-                $leaf = new BoolPropertyItem(
-                    "mime",
-                    __('Display MIME types')
-                );
-                $structureOptions->addProperty($leaf);
-            }
-            // add the main group to the root group
-            $exportSpecificOptions->addProperty($structureOptions);
-        }
-
-        // data options main group
-        $dataOptions = new OptionsPropertyMainGroup(
-            "data", __('Data dump options')
-        );
-        $dataOptions->setForce('structure');
-        // create primary items and add them to the group
-        $leaf = new BoolPropertyItem(
-            "columns",
-            __('Put columns names in the first row')
-        );
-        $dataOptions->addProperty($leaf);
-        $leaf = new TextPropertyItem(
-            'null',
-            __('Replace NULL with:')
-        );
-        $dataOptions->addProperty($leaf);
-        // add the main group to the root group
-        $exportSpecificOptions->addProperty($dataOptions);
-
-        // set the options for the export plugin property item
-        $exportPluginProperties->setOptions($exportSpecificOptions);
-        $this->properties = $exportPluginProperties;
-    }
-
-    /**
-     * Outputs export header
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportHeader()
-    {
-        $GLOBALS['odt_buffer'] .= '<?xml version="1.0" encoding="utf-8"?' . '>'
-            . '<office:document-content '
-            . $GLOBALS['OpenDocumentNS'] . 'office:version="1.0">'
-            . '<office:body>'
-            . '<office:text>';
-
-        return true;
-    }
-
-    /**
-     * Outputs export footer
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportFooter()
-    {
-        $GLOBALS['odt_buffer'] .= '</office:text>'
-            . '</office:body>'
-            . '</office:document-content>';
-        if (!PMA_exportOutputHandler(
-            PMA_createOpenDocument(
-                'application/vnd.oasis.opendocument.text',
-                $GLOBALS['odt_buffer']
-            )
-        )
-        ) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Outputs database header
-     *
-     * @param string $db       Database name
-     * @param string $db_alias Aliases of db
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportDBHeader($db, $db_alias = '')
-    {
-        if (empty($db_alias)) {
-            $db_alias = $db;
-        }
-        $GLOBALS['odt_buffer']
-            .= '<text:h text:outline-level="1" text:style-name="Heading_1"'
-            . ' text:is-list-header="true">'
-            . __('Database') . ' ' . htmlspecialchars($db_alias)
-            . '</text:h>';
-
-        return true;
-    }
-
-    /**
-     * Outputs database footer
-     *
-     * @param string $db Database name
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportDBFooter($db)
-    {
-        return true;
-    }
-
-    /**
-     * Outputs CREATE DATABASE statement
-     *
-     * @param string $db          Database name
-     * @param string $export_type 'server', 'database', 'table'
-     * @param string $db_alias    Aliases of db
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportDBCreate($db, $export_type, $db_alias = '')
-    {
-        return true;
-    }
-
-    /**
-     * Outputs the content of a table in NHibernate format
-     *
-     * @param string $db        database name
-     * @param string $table     table name
-     * @param string $crlf      the end of line sequence
-     * @param string $error_url the url to go back in case of error
-     * @param string $sql_query SQL query for obtaining data
-     * @param array  $aliases   Aliases of db/table/columns
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportData(
-        $db,
-        $table,
-        $crlf,
-        $error_url,
-        $sql_query,
-        $aliases = array()
-    ) {
-        global $what;
-
-        $db_alias = $db;
-        $table_alias = $table;
-        $this->initAlias($aliases, $db_alias, $table_alias);
-        // Gets the data from the database
-        $result = $GLOBALS['dbi']->query(
-            $sql_query,
-            null,
-            DatabaseInterface::QUERY_UNBUFFERED
-        );
-        $fields_cnt = $GLOBALS['dbi']->numFields($result);
-        $fields_meta = $GLOBALS['dbi']->getFieldsMeta($result);
-        $field_flags = array();
-        for ($j = 0; $j < $fields_cnt; $j++) {
-            $field_flags[$j] = $GLOBALS['dbi']->fieldFlags($result, $j);
-        }
-
-        $GLOBALS['odt_buffer']
-            .= '<text:h text:outline-level="2" text:style-name="Heading_2"'
-            . ' text:is-list-header="true">'
-            . __('Dumping data for table') . ' ' . htmlspecialchars($table_alias)
-            . '</text:h>'
-            . '<table:table'
-            . ' table:name="' . htmlspecialchars($table_alias) . '_structure">'
-            . '<table:table-column'
-            . ' table:number-columns-repeated="' . $fields_cnt . '"/>';
-
-        // If required, get fields name at the first line
-        if (isset($GLOBALS[$what . '_columns'])) {
-            $GLOBALS['odt_buffer'] .= '<table:table-row>';
-            for ($i = 0; $i < $fields_cnt; $i++) {
-                $col_as = $GLOBALS['dbi']->fieldName($result, $i);
-                if (!empty($aliases[$db]['tables'][$table]['columns'][$col_as])) {
-                    $col_as = $aliases[$db]['tables'][$table]['columns'][$col_as];
-                }
-                $GLOBALS['odt_buffer']
-                    .= '<table:table-cell office:value-type="string">'
-                    . '<text:p>'
-                    . htmlspecialchars(
-                        stripslashes($col_as)
-                    )
-                    . '</text:p>'
-                    . '</table:table-cell>';
-            } // end for
-            $GLOBALS['odt_buffer'] .= '</table:table-row>';
-        } // end if
-
-        // Format the data
-        while ($row = $GLOBALS['dbi']->fetchRow($result)) {
-            $GLOBALS['odt_buffer'] .= '<table:table-row>';
-            for ($j = 0; $j < $fields_cnt; $j++) {
-                if (!isset($row[$j]) || is_null($row[$j])) {
-                    $GLOBALS['odt_buffer']
-                        .= '<table:table-cell office:value-type="string">'
-                        . '<text:p>'
-                        . htmlspecialchars($GLOBALS[$what . '_null'])
-                        . '</text:p>'
-                        . '</table:table-cell>';
-                } elseif (stristr($field_flags[$j], 'BINARY')
-                    && $fields_meta[$j]->blob
-                ) {
-                    // ignore BLOB
-                    $GLOBALS['odt_buffer']
-                        .= '<table:table-cell office:value-type="string">'
-                        . '<text:p></text:p>'
-                        . '</table:table-cell>';
-                } elseif ($fields_meta[$j]->numeric
-                    && $fields_meta[$j]->type != 'timestamp'
-                    && !$fields_meta[$j]->blob
-                ) {
-                    $GLOBALS['odt_buffer']
-                        .= '<table:table-cell office:value-type="float"'
-                        . ' office:value="' . $row[$j] . '" >'
-                        . '<text:p>'
-                        . htmlspecialchars($row[$j])
-                        . '</text:p>'
-                        . '</table:table-cell>';
-                } else {
-                    $GLOBALS['odt_buffer']
-                        .= '<table:table-cell office:value-type="string">'
-                        . '<text:p>'
-                        . htmlspecialchars($row[$j])
-                        . '</text:p>'
-                        . '</table:table-cell>';
-                }
-            } // end for
-            $GLOBALS['odt_buffer'] .= '</table:table-row>';
-        } // end while
-        $GLOBALS['dbi']->freeResult($result);
-
-        $GLOBALS['odt_buffer'] .= '</table:table>';
-
-        return true;
-    }
-
-    /**
-     * Returns a stand-in CREATE definition to resolve view dependencies
-     *
-     * @param string $db      the database name
-     * @param string $view    the view name
-     * @param string $crlf    the end of line sequence
-     * @param array  $aliases Aliases of db/table/columns
-     *
-     * @return string resulting definition
-     */
-    public function getTableDefStandIn($db, $view, $crlf, $aliases = array())
-    {
-        $db_alias = $db;
-        $view_alias = $view;
-        $this->initAlias($aliases, $db_alias, $view_alias);
-        /**
-         * Gets fields properties
-         */
-        $GLOBALS['dbi']->selectDb($db);
-
-        /**
-         * Displays the table structure
-         */
-        $GLOBALS['odt_buffer']
-            .= '<table:table table:name="'
-            . htmlspecialchars($view_alias) . '_data">';
-        $columns_cnt = 4;
-        $GLOBALS['odt_buffer']
-            .= '<table:table-column'
-            . ' table:number-columns-repeated="' . $columns_cnt . '"/>';
-        /* Header */
-        $GLOBALS['odt_buffer'] .= '<table:table-row>'
-            . '<table:table-cell office:value-type="string">'
-            . '<text:p>' . __('Column') . '</text:p>'
-            . '</table:table-cell>'
-            . '<table:table-cell office:value-type="string">'
-            . '<text:p>' . __('Type') . '</text:p>'
-            . '</table:table-cell>'
-            . '<table:table-cell office:value-type="string">'
-            . '<text:p>' . __('Null') . '</text:p>'
-            . '</table:table-cell>'
-            . '<table:table-cell office:value-type="string">'
-            . '<text:p>' . __('Default') . '</text:p>'
-            . '</table:table-cell>'
-            . '</table:table-row>';
-
-        $columns = $GLOBALS['dbi']->getColumns($db, $view);
-        foreach ($columns as $column) {
-            $col_as = $column['Field'];
-            if (!empty($aliases[$db]['tables'][$view]['columns'][$col_as])) {
-                $col_as = $aliases[$db]['tables'][$view]['columns'][$col_as];
-            }
-            $GLOBALS['odt_buffer'] .= $this->formatOneColumnDefinition(
-                $column,
-                $col_as
-            );
-            $GLOBALS['odt_buffer'] .= '</table:table-row>';
-        } // end foreach
-
-        $GLOBALS['odt_buffer'] .= '</table:table>';
-
-        return true;
-    }
-
-    /**
-     * Returns $table's CREATE definition
-     *
-     * @param string $db            the database name
-     * @param string $table         the table name
-     * @param string $crlf          the end of line sequence
-     * @param string $error_url     the url to go back in case of error
-     * @param bool   $do_relation   whether to include relation comments
-     * @param bool   $do_comments   whether to include the pmadb-style column
-     *                              comments as comments in the structure;
-     *                              this is deprecated but the parameter is
-     *                              left here because export.php calls
-     *                              PMA_exportStructure() also for other
-     * @param bool   $do_mime       whether to include mime comments
-     * @param bool   $show_dates    whether to include creation/update/check dates
-     * @param bool   $add_semicolon whether to add semicolon and end-of-line at
-     *                              the end
-     * @param bool   $view          whether we're handling a view
-     * @param array  $aliases       Aliases of db/table/columns
-     *
-     * @return bool true
-     */
-    public function getTableDef(
-        $db,
-        $table,
-        $crlf,
-        $error_url,
-        $do_relation,
-        $do_comments,
-        $do_mime,
-        $show_dates = false,
-        $add_semicolon = true,
-        $view = false,
-        $aliases = array()
-    ) {
-        global $cfgRelation;
-
-        $db_alias = $db;
-        $table_alias = $table;
-        $this->initAlias($aliases, $db_alias, $table_alias);
-        /**
-         * Gets fields properties
-         */
-        $GLOBALS['dbi']->selectDb($db);
-
-        // Check if we can use Relations
-        list($res_rel, $have_rel) = PMA_getRelationsAndStatus(
-            $do_relation && !empty($cfgRelation['relation']),
-            $db,
-            $table
-        );
-        /**
-         * Displays the table structure
-         */
-        $GLOBALS['odt_buffer'] .= '<table:table table:name="'
-            . htmlspecialchars($table_alias) . '_structure">';
-        $columns_cnt = 4;
-        if ($do_relation && $have_rel) {
-            $columns_cnt++;
-        }
-        if ($do_comments) {
-            $columns_cnt++;
-        }
-        if ($do_mime && $cfgRelation['mimework']) {
-            $columns_cnt++;
-        }
-        $GLOBALS['odt_buffer'] .= '<table:table-column'
-            . ' table:number-columns-repeated="' . $columns_cnt . '"/>';
-        /* Header */
-        $GLOBALS['odt_buffer'] .= '<table:table-row>'
-            . '<table:table-cell office:value-type="string">'
-            . '<text:p>' . __('Column') . '</text:p>'
-            . '</table:table-cell>'
-            . '<table:table-cell office:value-type="string">'
-            . '<text:p>' . __('Type') . '</text:p>'
-            . '</table:table-cell>'
-            . '<table:table-cell office:value-type="string">'
-            . '<text:p>' . __('Null') . '</text:p>'
-            . '</table:table-cell>'
-            . '<table:table-cell office:value-type="string">'
-            . '<text:p>' . __('Default') . '</text:p>'
-            . '</table:table-cell>';
-        if ($do_relation && $have_rel) {
-            $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
-                . '<text:p>' . __('Links to') . '</text:p>'
-                . '</table:table-cell>';
-        }
-        if ($do_comments) {
-            $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
-                . '<text:p>' . __('Comments') . '</text:p>'
-                . '</table:table-cell>';
-            $comments = PMA_getComments($db, $table);
-        }
-        if ($do_mime && $cfgRelation['mimework']) {
-            $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
-                . '<text:p>' . __('MIME type') . '</text:p>'
-                . '</table:table-cell>';
-            $mime_map = PMA_getMIME($db, $table, true);
-        }
-        $GLOBALS['odt_buffer'] .= '</table:table-row>';
-
-        $columns = $GLOBALS['dbi']->getColumns($db, $table);
-        foreach ($columns as $column) {
-            $col_as = $field_name = $column['Field'];
-            if (!empty($aliases[$db]['tables'][$table]['columns'][$col_as])) {
-                $col_as = $aliases[$db]['tables'][$table]['columns'][$col_as];
-            }
-            $GLOBALS['odt_buffer'] .= $this->formatOneColumnDefinition(
-                $column,
-                $col_as
-            );
-            if ($do_relation && $have_rel) {
-                $foreigner = PMA_searchColumnInForeigners($res_rel, $field_name);
-                if ($foreigner) {
-                    $rtable = $foreigner['foreign_table'];
-                    $rfield = $foreigner['foreign_field'];
-                    if (!empty($aliases[$db]['tables'][$rtable]['columns'][$rfield])
-                    ) {
-                        $rfield
-                            = $aliases[$db]['tables'][$rtable]['columns'][$rfield];
-                    }
-                    if (!empty($aliases[$db]['tables'][$rtable]['alias'])) {
-                        $rtable = $aliases[$db]['tables'][$rtable]['alias'];
-                    }
-                    $relation = htmlspecialchars($rtable . ' (' . $rfield . ')');
-                    $GLOBALS['odt_buffer']
-                        .= '<table:table-cell office:value-type="string">'
-                        . '<text:p>'
-                        . htmlspecialchars($relation)
-                        . '</text:p>'
-                        . '</table:table-cell>';
-                }
-            }
-            if ($do_comments) {
-                if (isset($comments[$field_name])) {
-                    $GLOBALS['odt_buffer']
-                        .= '<table:table-cell office:value-type="string">'
-                        . '<text:p>'
-                        . htmlspecialchars($comments[$field_name])
-                        . '</text:p>'
-                        . '</table:table-cell>';
-                } else {
-                    $GLOBALS['odt_buffer']
-                        .= '<table:table-cell office:value-type="string">'
-                        . '<text:p></text:p>'
-                        . '</table:table-cell>';
-                }
-            }
-            if ($do_mime && $cfgRelation['mimework']) {
-                if (isset($mime_map[$field_name])) {
-                    $GLOBALS['odt_buffer']
-                        .= '<table:table-cell office:value-type="string">'
-                        . '<text:p>'
-                        . htmlspecialchars(
-                            str_replace('_', '/', $mime_map[$field_name]['mimetype'])
-                        )
-                        . '</text:p>'
-                        . '</table:table-cell>';
-                } else {
-                    $GLOBALS['odt_buffer']
-                        .= '<table:table-cell office:value-type="string">'
-                        . '<text:p></text:p>'
-                        . '</table:table-cell>';
-                }
-            }
-            $GLOBALS['odt_buffer'] .= '</table:table-row>';
-        } // end foreach
-
-        $GLOBALS['odt_buffer'] .= '</table:table>';
-
-        return true;
-    } // end of the '$this->getTableDef()' function
-
-    /**
-     * Outputs triggers
-     *
-     * @param string $db      database name
-     * @param string $table   table name
-     * @param array  $aliases Aliases of db/table/columns
-     *
-     * @return bool true
-     */
-    protected function getTriggers($db, $table, $aliases = array())
-    {
-        $db_alias = $db;
-        $table_alias = $table;
-        $this->initAlias($aliases, $db_alias, $table_alias);
-        $GLOBALS['odt_buffer'] .= '<table:table'
-            . ' table:name="' . htmlspecialchars($table_alias) . '_triggers">'
-            . '<table:table-column'
-            . ' table:number-columns-repeated="4"/>'
-            . '<table:table-row>'
-            . '<table:table-cell office:value-type="string">'
-            . '<text:p>' . __('Name') . '</text:p>'
-            . '</table:table-cell>'
-            . '<table:table-cell office:value-type="string">'
-            . '<text:p>' . __('Time') . '</text:p>'
-            . '</table:table-cell>'
-            . '<table:table-cell office:value-type="string">'
-            . '<text:p>' . __('Event') . '</text:p>'
-            . '</table:table-cell>'
-            . '<table:table-cell office:value-type="string">'
-            . '<text:p>' . __('Definition') . '</text:p>'
-            . '</table:table-cell>'
-            . '</table:table-row>';
-
-        $triggers = $GLOBALS['dbi']->getTriggers($db, $table);
-
-        foreach ($triggers as $trigger) {
-            $GLOBALS['odt_buffer'] .= '<table:table-row>';
-            $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
-                . '<text:p>'
-                . htmlspecialchars($trigger['name'])
-                . '</text:p>'
-                . '</table:table-cell>';
-            $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
-                . '<text:p>'
-                . htmlspecialchars($trigger['action_timing'])
-                . '</text:p>'
-                . '</table:table-cell>';
-            $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
-                . '<text:p>'
-                . htmlspecialchars($trigger['event_manipulation'])
-                . '</text:p>'
-                . '</table:table-cell>';
-            $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
-                . '<text:p>'
-                . htmlspecialchars($trigger['definition'])
-                . '</text:p>'
-                . '</table:table-cell>';
-            $GLOBALS['odt_buffer'] .= '</table:table-row>';
-        }
-
-        $GLOBALS['odt_buffer'] .= '</table:table>';
-
-        return true;
-    }
-
-    /**
-     * Outputs table's structure
-     *
-     * @param string $db          database name
-     * @param string $table       table name
-     * @param string $crlf        the end of line sequence
-     * @param string $error_url   the url to go back in case of error
-     * @param string $export_mode 'create_table', 'triggers', 'create_view',
-     *                            'stand_in'
-     * @param string $export_type 'server', 'database', 'table'
-     * @param bool   $do_relation whether to include relation comments
-     * @param bool   $do_comments whether to include the pmadb-style column
-     *                            comments as comments in the structure;
-     *                            this is deprecated but the parameter is
-     *                            left here because export.php calls
-     *                            PMA_exportStructure() also for other
-     * @param bool   $do_mime     whether to include mime comments
-     * @param bool   $dates       whether to include creation/update/check dates
-     * @param array  $aliases     Aliases of db/table/columns
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportStructure(
-        $db,
-        $table,
-        $crlf,
-        $error_url,
-        $export_mode,
-        $export_type,
-        $do_relation = false,
-        $do_comments = false,
-        $do_mime = false,
-        $dates = false,
-        $aliases = array()
-    ) {
-        $db_alias = $db;
-        $table_alias = $table;
-        $this->initAlias($aliases, $db_alias, $table_alias);
-        switch ($export_mode) {
-        case 'create_table':
-            $GLOBALS['odt_buffer']
-                .= '<text:h text:outline-level="2" text:style-name="Heading_2"'
-                . ' text:is-list-header="true">'
-                . __('Table structure for table') . ' ' .
-                htmlspecialchars($table_alias)
-                . '</text:h>';
-            $this->getTableDef(
-                $db,
-                $table,
-                $crlf,
-                $error_url,
-                $do_relation,
-                $do_comments,
-                $do_mime,
-                $dates,
-                true,
-                false,
-                $aliases
-            );
-            break;
-        case 'triggers':
-            $triggers = $GLOBALS['dbi']->getTriggers($db, $table, $aliases);
-            if ($triggers) {
-                $GLOBALS['odt_buffer']
-                    .= '<text:h text:outline-level="2" text:style-name="Heading_2"'
-                    . ' text:is-list-header="true">'
-                    . __('Triggers') . ' '
-                    . htmlspecialchars($table_alias)
-                    . '</text:h>';
-                $this->getTriggers($db, $table);
-            }
-            break;
-        case 'create_view':
-            $GLOBALS['odt_buffer']
-                .= '<text:h text:outline-level="2" text:style-name="Heading_2"'
-                . ' text:is-list-header="true">'
-                . __('Structure for view') . ' '
-                . htmlspecialchars($table_alias)
-                . '</text:h>';
-            $this->getTableDef(
-                $db,
-                $table,
-                $crlf,
-                $error_url,
-                $do_relation,
-                $do_comments,
-                $do_mime,
-                $dates,
-                true,
-                true,
-                $aliases
-            );
-            break;
-        case 'stand_in':
-            $GLOBALS['odt_buffer']
-                .= '<text:h text:outline-level="2" text:style-name="Heading_2"'
-                . ' text:is-list-header="true">'
-                . __('Stand-in structure for view') . ' '
-                . htmlspecialchars($table_alias)
-                . '</text:h>';
-            // export a stand-in definition to resolve view dependencies
-            $this->getTableDefStandIn($db, $table, $crlf, $aliases);
-        } // end switch
-
-        return true;
-    } // end of the '$this->exportStructure' function
-
-    /**
-     * Formats the definition for one column
-     *
-     * @param array  $column info about this column
-     * @param string $col_as column alias
-     *
-     * @return string Formatted column definition
-     */
-    protected function formatOneColumnDefinition($column, $col_as = '')
-    {
-        if (empty($col_as)) {
-            $col_as = $column['Field'];
-        }
-        $definition = '<table:table-row>';
-        $definition .= '<table:table-cell office:value-type="string">'
-            . '<text:p>' . htmlspecialchars($col_as) . '</text:p>'
-            . '</table:table-cell>';
-
-        $extracted_columnspec
-            = Util::extractColumnSpec($column['Type']);
-        $type = htmlspecialchars($extracted_columnspec['print_type']);
-        if (empty($type)) {
-            $type = '&nbsp;';
-        }
-
-        $definition .= '<table:table-cell office:value-type="string">'
-            . '<text:p>' . htmlspecialchars($type) . '</text:p>'
-            . '</table:table-cell>';
-        if (!isset($column['Default'])) {
-            if ($column['Null'] != 'NO') {
-                $column['Default'] = 'NULL';
-            } else {
-                $column['Default'] = '';
-            }
-        }
-        $definition .= '<table:table-cell office:value-type="string">'
-            . '<text:p>'
-            . (($column['Null'] == '' || $column['Null'] == 'NO')
-                ? __('No')
-                : __('Yes'))
-            . '</text:p>'
-            . '</table:table-cell>';
-        $definition .= '<table:table-cell office:value-type="string">'
-            . '<text:p>' . htmlspecialchars($column['Default']) . '</text:p>'
-            . '</table:table-cell>';
-
-        return $definition;
-    }
-}
diff --git a/#pma/libraries/plugins/export/ExportPdf.php b/#pma/libraries/plugins/export/ExportPdf.php
deleted file mode 100644
index ccf8c9c6..00000000
--- a/#pma/libraries/plugins/export/ExportPdf.php
+++ /dev/null
@@ -1,390 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Produce a PDF report (export) from a query
- *
- * @package    PhpMyAdmin-Export
- * @subpackage PDF
- */
-namespace PMA\libraries\plugins\export;
-
-use PMA\libraries\plugins\ExportPlugin;
-use PMA\libraries\properties\plugins\ExportPluginProperties;
-use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
-use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
-use PMA\libraries\plugins\export\PMA_ExportPdf;
-use PMA\libraries\properties\options\items\RadioPropertyItem;
-use PMA\libraries\properties\options\items\TextPropertyItem;
-
-/**
- * Skip the plugin if TCPDF is not available.
- */
-if (!@file_exists(TCPDF_INC)) {
-    $GLOBALS['skip_import'] = true;
-    return;
-}
-
-require_once 'libraries/transformations.lib.php';
-
-/**
- * Handles the export for the PDF class
- *
- * @package    PhpMyAdmin-Export
- * @subpackage PDF
- */
-class ExportPdf extends ExportPlugin
-{
-    /**
-     * PMA\libraries\plugins\export\PMA_ExportPdf instance
-     *
-     * @var PMA_ExportPdf
-     */
-    private $_pdf;
-    /**
-     * PDF Report Title
-     *
-     * @var string
-     */
-    private $_pdfReportTitle;
-
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        // initialize the specific export PDF variables
-        $this->initSpecificVariables();
-
-        $this->setProperties();
-    }
-
-    /**
-     * Initialize the local variables that are used for export PDF
-     *
-     * @return void
-     */
-    protected function initSpecificVariables()
-    {
-        if (!empty($_POST['pdf_report_title'])) {
-            $this->_setPdfReportTitle($_POST['pdf_report_title']);
-        }
-        $this->_setPdf(new PMA_ExportPdf('L', 'pt', 'A3'));
-    }
-
-    /**
-     * Sets the export PDF properties
-     *
-     * @return void
-     */
-    protected function setProperties()
-    {
-        $exportPluginProperties = new ExportPluginProperties();
-        $exportPluginProperties->setText('PDF');
-        $exportPluginProperties->setExtension('pdf');
-        $exportPluginProperties->setMimeType('application/pdf');
-        $exportPluginProperties->setForceFile(true);
-        $exportPluginProperties->setOptionsText(__('Options'));
-
-        // create the root group that will be the options field for
-        // $exportPluginProperties
-        // this will be shown as "Format specific options"
-        $exportSpecificOptions = new OptionsPropertyRootGroup(
-            "Format Specific Options"
-        );
-
-        // general options main group
-        $generalOptions = new OptionsPropertyMainGroup("general_opts");
-        // create primary items and add them to the group
-        $leaf = new TextPropertyItem(
-            "report_title",
-            __('Report title:')
-        );
-        $generalOptions->addProperty($leaf);
-        // add the group to the root group
-        $exportSpecificOptions->addProperty($generalOptions);
-
-        // what to dump (structure/data/both) main group
-        $dumpWhat = new OptionsPropertyMainGroup(
-            "dump_what", __('Dump table')
-        );
-        $leaf = new RadioPropertyItem("structure_or_data");
-        $leaf->setValues(
-            array(
-                'structure'          => __('structure'),
-                'data'               => __('data'),
-                'structure_and_data' => __('structure and data'),
-            )
-        );
-        $dumpWhat->addProperty($leaf);
-        // add the group to the root group
-        $exportSpecificOptions->addProperty($dumpWhat);
-
-        // set the options for the export plugin property item
-        $exportPluginProperties->setOptions($exportSpecificOptions);
-        $this->properties = $exportPluginProperties;
-    }
-
-    /**
-     * Outputs export header
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportHeader()
-    {
-        $pdf_report_title = $this->_getPdfReportTitle();
-        $pdf = $this->_getPdf();
-        $pdf->Open();
-
-        $attr = array('titleFontSize' => 18, 'titleText' => $pdf_report_title);
-        $pdf->setAttributes($attr);
-        $pdf->setTopMargin(30);
-
-        return true;
-    }
-
-    /**
-     * Outputs export footer
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportFooter()
-    {
-        $pdf = $this->_getPdf();
-
-        // instead of $pdf->Output():
-        if (!PMA_exportOutputHandler($pdf->getPDFData())) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Outputs database header
-     *
-     * @param string $db       Database name
-     * @param string $db_alias Aliases of db
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportDBHeader($db, $db_alias = '')
-    {
-        return true;
-    }
-
-    /**
-     * Outputs database footer
-     *
-     * @param string $db Database name
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportDBFooter($db)
-    {
-        return true;
-    }
-
-    /**
-     * Outputs CREATE DATABASE statement
-     *
-     * @param string $db          Database name
-     * @param string $export_type 'server', 'database', 'table'
-     * @param string $db_alias    Aliases of db
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportDBCreate($db, $export_type, $db_alias = '')
-    {
-        return true;
-    }
-
-    /**
-     * Outputs the content of a table in NHibernate format
-     *
-     * @param string $db        database name
-     * @param string $table     table name
-     * @param string $crlf      the end of line sequence
-     * @param string $error_url the url to go back in case of error
-     * @param string $sql_query SQL query for obtaining data
-     * @param array  $aliases   Aliases of db/table/columns
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportData(
-        $db,
-        $table,
-        $crlf,
-        $error_url,
-        $sql_query,
-        $aliases = array()
-    ) {
-        $db_alias = $db;
-        $table_alias = $table;
-        $this->initAlias($aliases, $db_alias, $table_alias);
-        $pdf = $this->_getPdf();
-        $attr = array(
-            'currentDb'    => $db,
-            'currentTable' => $table,
-            'dbAlias'      => $db_alias,
-            'tableAlias'   => $table_alias,
-            'aliases'      => $aliases,
-        );
-        $pdf->setAttributes($attr);
-        $pdf->purpose = __('Dumping data');
-        $pdf->mysqlReport($sql_query);
-
-        return true;
-    } // end of the 'PMA_exportData()' function
-
-    /**
-     * Outputs table structure
-     *
-     * @param string $db          database name
-     * @param string $table       table name
-     * @param string $crlf        the end of line sequence
-     * @param string $error_url   the url to go back in case of error
-     * @param string $export_mode 'create_table', 'triggers', 'create_view',
-     *                            'stand_in'
-     * @param string $export_type 'server', 'database', 'table'
-     * @param bool   $do_relation whether to include relation comments
-     * @param bool   $do_comments whether to include the pmadb-style column
-     *                            comments as comments in the structure;
-     *                            this is deprecated but the parameter is
-     *                            left here because export.php calls
-     *                            PMA_exportStructure() also for other
-     *                            export types which use this parameter
-     * @param bool   $do_mime     whether to include mime comments
-     * @param bool   $dates       whether to include creation/update/check dates
-     * @param array  $aliases     aliases for db/table/columns
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportStructure(
-        $db,
-        $table,
-        $crlf,
-        $error_url,
-        $export_mode,
-        $export_type,
-        $do_relation = false,
-        $do_comments = false,
-        $do_mime = false,
-        $dates = false,
-        $aliases = array()
-    ) {
-        $db_alias = $db;
-        $table_alias = $table;
-        $this->initAlias($aliases, $db_alias, $table_alias);
-        $pdf = $this->_getPdf();
-        // getting purpose to show at top
-        switch ($export_mode) {
-        case 'create_table':
-            $purpose = __('Table structure');
-            break;
-        case 'triggers':
-            $purpose = __('Triggers');
-            break;
-        case 'create_view':
-            $purpose = __('View structure');
-            break;
-        case 'stand_in':
-            $purpose = __('Stand in');
-        } // end switch
-
-        $attr = array(
-            'currentDb'    => $db,
-            'currentTable' => $table,
-            'dbAlias'      => $db_alias,
-            'tableAlias'   => $table_alias,
-            'aliases'      => $aliases,
-            'purpose'      => $purpose,
-        );
-        $pdf->setAttributes($attr);
-        /**
-         * comment display set true as presently in pdf
-         * format, no option is present to take user input.
-         */
-        $do_comments = true;
-        switch ($export_mode) {
-        case 'create_table':
-            $pdf->getTableDef(
-                $db,
-                $table,
-                $do_relation,
-                $do_comments,
-                $do_mime,
-                false,
-                $aliases
-            );
-            break;
-        case 'triggers':
-            $pdf->getTriggers($db, $table);
-            break;
-        case 'create_view':
-            $pdf->getTableDef(
-                $db,
-                $table,
-                $do_relation,
-                $do_comments,
-                $do_mime,
-                false,
-                $aliases
-            );
-            break;
-        case 'stand_in':
-            /* export a stand-in definition to resolve view dependencies
-             * Yet to develop this function
-             * $pdf->getTableDefStandIn($db, $table, $crlf);
-             */
-        } // end switch
-
-        return true;
-    }
-
-
-    /* ~~~~~~~~~~~~~~~~~~~~ Getters and Setters ~~~~~~~~~~~~~~~~~~~~ */
-
-    /**
-     * Gets the PMA\libraries\plugins\export\PMA_ExportPdf instance
-     *
-     * @return PMA_ExportPdf
-     */
-    private function _getPdf()
-    {
-        return $this->_pdf;
-    }
-
-    /**
-     * Instantiates the PMA\libraries\plugins\export\PMA_ExportPdf class
-     *
-     * @param PMA_ExportPdf $pdf The instance
-     *
-     * @return void
-     */
-    private function _setPdf($pdf)
-    {
-        $this->_pdf = $pdf;
-    }
-
-    /**
-     * Gets the PDF report title
-     *
-     * @return string
-     */
-    private function _getPdfReportTitle()
-    {
-        return $this->_pdfReportTitle;
-    }
-
-    /**
-     * Sets the PDF report title
-     *
-     * @param string $pdfReportTitle PDF report title
-     *
-     * @return void
-     */
-    private function _setPdfReportTitle($pdfReportTitle)
-    {
-        $this->_pdfReportTitle = $pdfReportTitle;
-    }
-}
diff --git a/#pma/libraries/plugins/export/ExportPhparray.php b/#pma/libraries/plugins/export/ExportPhparray.php
deleted file mode 100644
index d04c03ee..00000000
--- a/#pma/libraries/plugins/export/ExportPhparray.php
+++ /dev/null
@@ -1,255 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Set of functions used to build dumps of tables as PHP Arrays
- *
- * @package    PhpMyAdmin-Export
- * @subpackage PHP
- */
-
-namespace PMA\libraries\plugins\export;
-
-use PMA\libraries\plugins\ExportPlugin;
-use PMA\libraries\properties\plugins\ExportPluginProperties;
-use PMA\libraries\properties\options\items\HiddenPropertyItem;
-use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
-use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
-use PMA;
-
-/**
- * Handles the export for the PHP Array class
- *
- * @package    PhpMyAdmin-Export
- * @subpackage PHP
- */
-class ExportPhparray extends ExportPlugin
-{
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        $this->setProperties();
-    }
-
-    /**
-     * Sets the export PHP Array properties
-     *
-     * @return void
-     */
-    protected function setProperties()
-    {
-        $exportPluginProperties = new ExportPluginProperties();
-        $exportPluginProperties->setText('PHP array');
-        $exportPluginProperties->setExtension('php');
-        $exportPluginProperties->setMimeType('text/plain');
-        $exportPluginProperties->setOptionsText(__('Options'));
-
-        // create the root group that will be the options field for
-        // $exportPluginProperties
-        // this will be shown as "Format specific options"
-        $exportSpecificOptions = new OptionsPropertyRootGroup(
-            "Format Specific Options"
-        );
-
-        // general options main group
-        $generalOptions = new OptionsPropertyMainGroup("general_opts");
-        // create primary items and add them to the group
-        $leaf = new HiddenPropertyItem("structure_or_data");
-        $generalOptions->addProperty($leaf);
-        // add the main group to the root group
-        $exportSpecificOptions->addProperty($generalOptions);
-
-        // set the options for the export plugin property item
-        $exportPluginProperties->setOptions($exportSpecificOptions);
-        $this->properties = $exportPluginProperties;
-    }
-
-    /**
-     * Removes end of comment from a string
-     *
-     * @param string $string String to replace
-     *
-     * @return string
-     */
-    public function commentString($string)
-    {
-        return strtr($string, '*/', '-');
-    }
-
-
-    /**
-     * Outputs export header
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportHeader()
-    {
-        PMA_exportOutputHandler(
-            '<?php' . $GLOBALS['crlf']
-            . '/**' . $GLOBALS['crlf']
-            . ' * Export to PHP Array plugin for PHPMyAdmin' . $GLOBALS['crlf']
-            . ' * @version ' . PMA_VERSION . $GLOBALS['crlf']
-            . ' */' . $GLOBALS['crlf'] . $GLOBALS['crlf']
-        );
-
-        return true;
-    }
-
-    /**
-     * Outputs export footer
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportFooter()
-    {
-        return true;
-    }
-
-    /**
-     * Outputs database header
-     *
-     * @param string $db       Database name
-     * @param string $db_alias Aliases of db
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportDBHeader($db, $db_alias = '')
-    {
-        if (empty($db_alias)) {
-            $db_alias = $db;
-        }
-        PMA_exportOutputHandler(
-            '/**' . $GLOBALS['crlf']
-            . ' * Database ' . $this->commentString(PMA\libraries\Util::backquote($db_alias))
-            . $GLOBALS['crlf'] . ' */' . $GLOBALS['crlf']
-        );
-
-        return true;
-    }
-
-    /**
-     * Outputs database footer
-     *
-     * @param string $db Database name
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportDBFooter($db)
-    {
-        return true;
-    }
-
-    /**
-     * Outputs CREATE DATABASE statement
-     *
-     * @param string $db          Database name
-     * @param string $export_type 'server', 'database', 'table'
-     * @param string $db_alias    Aliases of db
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportDBCreate($db, $export_type, $db_alias = '')
-    {
-        return true;
-    }
-
-    /**
-     * Outputs the content of a table in PHP array format
-     *
-     * @param string $db        database name
-     * @param string $table     table name
-     * @param string $crlf      the end of line sequence
-     * @param string $error_url the url to go back in case of error
-     * @param string $sql_query SQL query for obtaining data
-     * @param array  $aliases   Aliases of db/table/columns
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportData(
-        $db,
-        $table,
-        $crlf,
-        $error_url,
-        $sql_query,
-        $aliases = array()
-    ) {
-        $db_alias = $db;
-        $table_alias = $table;
-        $this->initAlias($aliases, $db_alias, $table_alias);
-
-        $result = $GLOBALS['dbi']->query(
-            $sql_query,
-            null,
-            PMA\libraries\DatabaseInterface::QUERY_UNBUFFERED
-        );
-
-        $columns_cnt = $GLOBALS['dbi']->numFields($result);
-        $columns = array();
-        for ($i = 0; $i < $columns_cnt; $i++) {
-            $col_as = $GLOBALS['dbi']->fieldName($result, $i);
-            if (!empty($aliases[$db]['tables'][$table]['columns'][$col_as])) {
-                $col_as = $aliases[$db]['tables'][$table]['columns'][$col_as];
-            }
-            $columns[$i] = stripslashes($col_as);
-        }
-
-        // fix variable names (based on
-        // https://www.php.net/manual/language.variables.basics.php)
-        if (!preg_match(
-            '/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*$/',
-            $table_alias
-        )
-        ) {
-            // fix invalid characters in variable names by replacing them with
-            // underscores
-            $tablefixed = preg_replace(
-                '/[^a-zA-Z0-9_\x7f-\xff]/',
-                '_',
-                $table_alias
-            );
-
-            // variable name must not start with a number or dash...
-            if (preg_match('/^[a-zA-Z_\x7f-\xff]/', $tablefixed) === 0) {
-                $tablefixed = '_' . $tablefixed;
-            }
-        } else {
-            $tablefixed = $table;
-        }
-
-        $buffer = '';
-        $record_cnt = 0;
-        // Output table name as comment
-        $buffer .= $crlf . '/* '
-            . $this->commentString(PMA\libraries\Util::backquote($db_alias)) . '.'
-            . $this->commentString(PMA\libraries\Util::backquote($table_alias)) . ' */' . $crlf;
-        $buffer .= '$' . $tablefixed . ' = array(';
-
-        while ($record = $GLOBALS['dbi']->fetchRow($result)) {
-            $record_cnt++;
-
-            if ($record_cnt == 1) {
-                $buffer .= $crlf . '  array(';
-            } else {
-                $buffer .= ',' . $crlf . '  array(';
-            }
-
-            for ($i = 0; $i < $columns_cnt; $i++) {
-                $buffer .= var_export($columns[$i], true)
-                    . " => " . var_export($record[$i], true)
-                    . (($i + 1 >= $columns_cnt) ? '' : ',');
-            }
-
-            $buffer .= ')';
-        }
-
-        $buffer .= $crlf . ');' . $crlf;
-        if (!PMA_exportOutputHandler($buffer)) {
-            return false;
-        }
-
-        $GLOBALS['dbi']->freeResult($result);
-
-        return true;
-    }
-}
diff --git a/#pma/libraries/plugins/export/ExportSql.php b/#pma/libraries/plugins/export/ExportSql.php
deleted file mode 100644
index b44ddc07..00000000
--- a/#pma/libraries/plugins/export/ExportSql.php
+++ /dev/null
@@ -1,2861 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Set of functions used to build SQL dumps of tables
- *
- * @package    PhpMyAdmin-Export
- * @subpackage SQL
- */
-namespace PMA\libraries\plugins\export;
-
-use PMA\libraries\properties\options\items\BoolPropertyItem;
-use PMA\libraries\properties\plugins\ExportPluginProperties;
-use PMA\libraries\properties\options\items\MessageOnlyPropertyItem;
-use PMA\libraries\properties\options\items\NumberPropertyItem;
-use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
-use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
-use PMA\libraries\properties\options\groups\OptionsPropertySubgroup;
-use PMA\libraries\DatabaseInterface;
-use PMA\libraries\plugins\ExportPlugin;
-use PMA\libraries\Util;
-use PMA\libraries\properties\options\items\RadioPropertyItem;
-use PMA\libraries\properties\options\items\SelectPropertyItem;
-use SqlParser\Components\CreateDefinition;
-use SqlParser\Context;
-use SqlParser\Parser;
-use SqlParser\Statements\SelectStatement;
-use SqlParser\Token;
-use PMA\libraries\properties\options\items\TextPropertyItem;
-
-/**
- * Handles the export for the SQL class
- *
- * @package    PhpMyAdmin-Export
- * @subpackage SQL
- */
-class ExportSql extends ExportPlugin
-{
-    /**
-     * Whether charset header was sent.
-     *
-     * @var boolean
-     */
-    private $_sent_charset = false;
-
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        $this->setProperties();
-
-        // Avoids undefined variables, use NULL so isset() returns false
-        if (!isset($GLOBALS['sql_backquotes'])) {
-            $GLOBALS['sql_backquotes'] = null;
-        }
-    }
-
-    /**
-     * Sets the export SQL properties
-     *
-     * @return void
-     */
-    protected function setProperties()
-    {
-        global $plugin_param;
-
-        $hide_sql = false;
-        $hide_structure = false;
-        if ($plugin_param['export_type'] == 'table'
-            && !$plugin_param['single_table']
-        ) {
-            $hide_structure = true;
-            $hide_sql = true;
-        }
-
-        if (!$hide_sql) {
-            $exportPluginProperties = new ExportPluginProperties();
-            $exportPluginProperties->setText('SQL');
-            $exportPluginProperties->setExtension('sql');
-            $exportPluginProperties->setMimeType('text/x-sql');
-            $exportPluginProperties->setOptionsText(__('Options'));
-
-            // create the root group that will be the options field for
-            // $exportPluginProperties
-            // this will be shown as "Format specific options"
-            $exportSpecificOptions = new OptionsPropertyRootGroup(
-                "Format Specific Options"
-            );
-
-            // general options main group
-            $generalOptions = new OptionsPropertyMainGroup("general_opts");
-
-            // comments
-            $subgroup = new OptionsPropertySubgroup("include_comments");
-            $leaf = new BoolPropertyItem(
-                'include_comments',
-                __(
-                    'Display comments <i>(includes info such as export'
-                    . ' timestamp, PHP version, and server version)</i>'
-                )
-            );
-            $subgroup->setSubgroupHeader($leaf);
-
-            $leaf = new TextPropertyItem(
-                'header_comment',
-                __('Additional custom header comment (\n splits lines):')
-            );
-            $subgroup->addProperty($leaf);
-            $leaf = new BoolPropertyItem(
-                'dates',
-                __(
-                    'Include a timestamp of when databases were created, last'
-                    . ' updated, and last checked'
-                )
-            );
-            $subgroup->addProperty($leaf);
-            if (!empty($GLOBALS['cfgRelation']['relation'])) {
-                $leaf = new BoolPropertyItem(
-                    'relation',
-                    __('Display foreign key relationships')
-                );
-                $subgroup->addProperty($leaf);
-            }
-            if (!empty($GLOBALS['cfgRelation']['mimework'])) {
-                $leaf = new BoolPropertyItem(
-                    'mime',
-                    __('Display MIME types')
-                );
-                $subgroup->addProperty($leaf);
-            }
-            $generalOptions->addProperty($subgroup);
-
-            // enclose in a transaction
-            $leaf = new BoolPropertyItem(
-                "use_transaction",
-                __('Enclose export in a transaction')
-            );
-            $leaf->setDoc(
-                array(
-                    'programs',
-                    'mysqldump',
-                    'option_mysqldump_single-transaction',
-                )
-            );
-            $generalOptions->addProperty($leaf);
-
-            // disable foreign key checks
-            $leaf = new BoolPropertyItem(
-                "disable_fk",
-                __('Disable foreign key checks')
-            );
-            $leaf->setDoc(
-                array(
-                    'manual_MySQL_Database_Administration',
-                    'server-system-variables',
-                    'sysvar_foreign_key_checks',
-                )
-            );
-            $generalOptions->addProperty($leaf);
-
-            // export views as tables
-            $leaf = new BoolPropertyItem(
-                "views_as_tables",
-                __('Export views as tables')
-            );
-            $generalOptions->addProperty($leaf);
-
-            // export metadata
-            $leaf = new BoolPropertyItem(
-                "metadata",
-                __('Export metadata')
-            );
-            $generalOptions->addProperty($leaf);
-
-            // compatibility maximization
-            $compats = $GLOBALS['dbi']->getCompatibilities();
-            if (count($compats) > 0) {
-                $values = array();
-                foreach ($compats as $val) {
-                    $values[$val] = $val;
-                }
-
-                $leaf = new SelectPropertyItem(
-                    "compatibility",
-                    __(
-                        'Database system or older MySQL server to maximize output'
-                        . ' compatibility with:'
-                    )
-                );
-                $leaf->setValues($values);
-                $leaf->setDoc(
-                    array(
-                        'manual_MySQL_Database_Administration',
-                        'Server_SQL_mode',
-                    )
-                );
-                $generalOptions->addProperty($leaf);
-
-                unset($values);
-            }
-
-            // what to dump (structure/data/both)
-            $subgroup = new OptionsPropertySubgroup(
-                "dump_table", __("Dump table")
-            );
-            $leaf = new RadioPropertyItem('structure_or_data');
-            $leaf->setValues(
-                array(
-                    'structure'          => __('structure'),
-                    'data'               => __('data'),
-                    'structure_and_data' => __('structure and data'),
-                )
-            );
-            $subgroup->setSubgroupHeader($leaf);
-            $generalOptions->addProperty($subgroup);
-
-            // add the main group to the root group
-            $exportSpecificOptions->addProperty($generalOptions);
-
-            // structure options main group
-            if (!$hide_structure) {
-                $structureOptions = new OptionsPropertyMainGroup(
-                    "structure", __('Object creation options')
-                );
-                $structureOptions->setForce('data');
-
-                // begin SQL Statements
-                $subgroup = new OptionsPropertySubgroup();
-                $leaf = new MessageOnlyPropertyItem(
-                    'add_statements',
-                    __('Add statements:')
-                );
-                $subgroup->setSubgroupHeader($leaf);
-
-                // server export options
-                if ($plugin_param['export_type'] == 'server') {
-                    $leaf = new BoolPropertyItem(
-                        "drop_database",
-                        sprintf(__('Add %s statement'), '<code>DROP DATABASE IF EXISTS</code>')
-                    );
-                    $subgroup->addProperty($leaf);
-                }
-
-                if ($plugin_param['export_type'] == 'database') {
-                    $create_clause = '<code>CREATE DATABASE / USE</code>';
-                    $leaf = new BoolPropertyItem(
-                        'create_database',
-                        sprintf(__('Add %s statement'), $create_clause)
-                    );
-                    $subgroup->addProperty($leaf);
-                }
-
-                if ($plugin_param['export_type'] == 'table') {
-                    $drop_clause = $GLOBALS['dbi']->getTable(
-                        $GLOBALS['db'],
-                        $GLOBALS['table']
-                    )->isView()
-                        ? '<code>DROP VIEW</code>'
-                        : '<code>DROP TABLE</code>';
-                } else {
-                    $drop_clause = '<code>DROP TABLE / VIEW / PROCEDURE'
-                        . ' / FUNCTION / EVENT</code>';
-                }
-
-                $drop_clause .= '<code> / TRIGGER</code>';
-
-                $leaf = new BoolPropertyItem(
-                    'drop_table',
-                    sprintf(__('Add %s statement'), $drop_clause)
-                );
-                $subgroup->addProperty($leaf);
-
-                $subgroup_create_table = new OptionsPropertySubgroup();
-
-                // Add table structure option
-                $leaf = new BoolPropertyItem(
-                    'create_table',
-                    sprintf(__('Add %s statement'), '<code>CREATE TABLE</code>')
-                );
-                $subgroup_create_table->setSubgroupHeader($leaf);
-
-                $leaf = new BoolPropertyItem(
-                    'if_not_exists',
-                    '<code>IF NOT EXISTS</code> ' . __(
-                        '(less efficient as indexes will be generated during table '
-                        . 'creation)'
-                    )
-                );
-                $subgroup_create_table->addProperty($leaf);
-
-                $leaf = new BoolPropertyItem(
-                    'auto_increment',
-                    sprintf(__('%s value'), '<code>AUTO_INCREMENT</code>')
-                );
-                $subgroup_create_table->addProperty($leaf);
-
-                $subgroup->addProperty($subgroup_create_table);
-
-                // Add view option
-                $leaf = new BoolPropertyItem(
-                    'create_view',
-                    sprintf(__('Add %s statement'), '<code>CREATE VIEW</code>')
-                );
-                $subgroup->addProperty($leaf);
-
-                $leaf = new BoolPropertyItem(
-                    'procedure_function',
-                    sprintf(
-                        __('Add %s statement'),
-                        '<code>CREATE PROCEDURE / FUNCTION / EVENT</code>'
-                    )
-                );
-                $subgroup->addProperty($leaf);
-
-                // Add triggers option
-                $leaf = new BoolPropertyItem(
-                    'create_trigger',
-                    sprintf(__('Add %s statement'), '<code>CREATE TRIGGER</code>')
-                );
-                $subgroup->addProperty($leaf);
-
-                $structureOptions->addProperty($subgroup);
-
-                $leaf = new BoolPropertyItem(
-                    "backquotes",
-                    __(
-                        'Enclose table and column names with backquotes '
-                        . '<i>(Protects column and table names formed with'
-                        . ' special characters or keywords)</i>'
-                    )
-                );
-
-                $structureOptions->addProperty($leaf);
-
-                // add the main group to the root group
-                $exportSpecificOptions->addProperty($structureOptions);
-            }
-
-            // begin Data options
-            $dataOptions = new OptionsPropertyMainGroup(
-                "data", __('Data creation options')
-            );
-            $dataOptions->setForce('structure');
-            $leaf = new BoolPropertyItem(
-                "truncate",
-                __('Truncate table before insert')
-            );
-            $dataOptions->addProperty($leaf);
-
-            // begin SQL Statements
-            $subgroup = new OptionsPropertySubgroup();
-            $leaf = new MessageOnlyPropertyItem(
-                __('Instead of <code>INSERT</code> statements, use:')
-            );
-            $subgroup->setSubgroupHeader($leaf);
-
-            $leaf = new BoolPropertyItem(
-                "delayed",
-                __('<code>INSERT DELAYED</code> statements')
-            );
-            $leaf->setDoc(
-                array(
-                    'manual_MySQL_Database_Administration',
-                    'insert_delayed'
-                )
-            );
-            $subgroup->addProperty($leaf);
-
-            $leaf = new BoolPropertyItem(
-                "ignore",
-                __('<code>INSERT IGNORE</code> statements')
-            );
-            $leaf->setDoc(
-                array(
-                    'manual_MySQL_Database_Administration',
-                    'insert',
-                )
-            );
-            $subgroup->addProperty($leaf);
-            $dataOptions->addProperty($subgroup);
-
-            // Function to use when dumping dat
-            $leaf = new SelectPropertyItem(
-                "type",
-                __('Function to use when dumping data:')
-            );
-            $leaf->setValues(
-                array(
-                    'INSERT'  => 'INSERT',
-                    'UPDATE'  => 'UPDATE',
-                    'REPLACE' => 'REPLACE',
-                )
-            );
-            $dataOptions->addProperty($leaf);
-
-            /* Syntax to use when inserting data */
-            $subgroup = new OptionsPropertySubgroup();
-            $leaf = new MessageOnlyPropertyItem(
-                null,
-                __('Syntax to use when inserting data:')
-            );
-            $subgroup->setSubgroupHeader($leaf);
-            $leaf = new RadioPropertyItem(
-                "insert_syntax",
-                __('<code>INSERT IGNORE</code> statements')
-            );
-            $leaf->setValues(
-                array(
-                    'complete' => __(
-                        'include column names in every <code>INSERT</code> statement'
-                        . ' <br /> &nbsp; &nbsp; &nbsp; Example: <code>INSERT INTO'
-                        . ' tbl_name (col_A,col_B,col_C) VALUES (1,2,3)</code>'
-                    ),
-                    'extended' => __(
-                        'insert multiple rows in every <code>INSERT</code> statement'
-                        . '<br /> &nbsp; &nbsp; &nbsp; Example: <code>INSERT INTO'
-                        . ' tbl_name VALUES (1,2,3), (4,5,6), (7,8,9)</code>'
-                    ),
-                    'both'     => __(
-                        'both of the above<br /> &nbsp; &nbsp; &nbsp; Example:'
-                        . ' <code>INSERT INTO tbl_name (col_A,col_B,col_C) VALUES'
-                        . ' (1,2,3), (4,5,6), (7,8,9)</code>'
-                    ),
-                    'none'     => __(
-                        'neither of the above<br /> &nbsp; &nbsp; &nbsp; Example:'
-                        . ' <code>INSERT INTO tbl_name VALUES (1,2,3)</code>'
-                    ),
-                )
-            );
-            $subgroup->addProperty($leaf);
-            $dataOptions->addProperty($subgroup);
-
-            // Max length of query
-            $leaf = new NumberPropertyItem(
-                "max_query_size",
-                __('Maximal length of created query')
-            );
-            $dataOptions->addProperty($leaf);
-
-            // Dump binary columns in hexadecimal
-            $leaf = new BoolPropertyItem(
-                "hex_for_binary",
-                __(
-                    'Dump binary columns in hexadecimal notation'
-                    . ' <i>(for example, "abc" becomes 0x616263)</i>'
-                )
-            );
-            $dataOptions->addProperty($leaf);
-
-            // Dump time in UTC
-            $leaf = new BoolPropertyItem(
-                "utc_time",
-                __(
-                    'Dump TIMESTAMP columns in UTC <i>(enables TIMESTAMP columns'
-                    . ' to be dumped and reloaded between servers in different'
-                    . ' time zones)</i>'
-                )
-            );
-            $dataOptions->addProperty($leaf);
-
-            // add the main group to the root group
-            $exportSpecificOptions->addProperty($dataOptions);
-
-            // set the options for the export plugin property item
-            $exportPluginProperties->setOptions($exportSpecificOptions);
-            $this->properties = $exportPluginProperties;
-        }
-    }
-
-    /**
-     * Generates SQL for routines export
-     *
-     * @param string $db        Database
-     * @param array  $aliases   Aliases of db/table/columns
-     * @param string $type      Type of exported routine
-     * @param string $name      Verbose name of exported routine
-     * @param array  $routines  List of routines to export
-     * @param string $delimiter Delimiter to use in SQL
-     *
-     * @return string SQL query
-     */
-    protected function _exportRoutineSQL(
-        $db, $aliases, $type, $name, $routines, $delimiter
-    ) {
-        global $crlf;
-
-        $text = $this->_exportComment()
-            . $this->_exportComment($name)
-            . $this->_exportComment();
-
-        $used_alias = false;
-        $proc_query = '';
-
-        foreach ($routines as $routine) {
-            if (!empty($GLOBALS['sql_drop_table'])) {
-                $proc_query .= 'DROP ' . $type . ' IF EXISTS '
-                    . Util::backquote($routine)
-                    . $delimiter . $crlf;
-            }
-            $create_query = $this->replaceWithAliases(
-                $GLOBALS['dbi']->getDefinition($db, $type, $routine),
-                $aliases,
-                $db,
-                '',
-                $flag
-            );
-            // One warning per database
-            if ($flag) {
-                $used_alias = true;
-            }
-            $proc_query .= $create_query . $delimiter . $crlf . $crlf;
-        }
-        if ($used_alias) {
-            $text .= $this->_exportComment(
-                __('It appears your database uses routines;')
-            )
-            . $this->_exportComment(
-                __('alias export may not work reliably in all cases.')
-            )
-            . $this->_exportComment();
-        }
-        $text .= $proc_query;
-
-        return $text;
-    }
-
-    /**
-     * Exports routines (procedures and functions)
-     *
-     * @param string $db      Database
-     * @param array  $aliases Aliases of db/table/columns
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportRoutines($db, $aliases = array())
-    {
-        global $crlf;
-
-        $db_alias = $db;
-        $this->initAlias($aliases, $db_alias);
-
-        $text = '';
-        $delimiter = '$$';
-
-        $procedure_names = $GLOBALS['dbi']
-            ->getProceduresOrFunctions($db, 'PROCEDURE');
-        $function_names = $GLOBALS['dbi']->getProceduresOrFunctions($db, 'FUNCTION');
-
-        if ($procedure_names || $function_names) {
-            $text .= $crlf
-                . 'DELIMITER ' . $delimiter . $crlf;
-
-            if ($procedure_names) {
-                $text .= $this->_exportRoutineSQL(
-                    $db,
-                    $aliases,
-                    'PROCEDURE',
-                    __('Procedures'),
-                    $procedure_names,
-                    $delimiter
-                );
-            }
-
-            if ($function_names) {
-                $text .= $this->_exportRoutineSQL(
-                    $db,
-                    $aliases,
-                    'FUNCTION',
-                    __('Functions'),
-                    $function_names,
-                    $delimiter
-                );
-            }
-
-            $text .= 'DELIMITER ;' . $crlf;
-        }
-
-        if (!empty($text)) {
-            return PMA_exportOutputHandler($text);
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Possibly outputs comment
-     *
-     * @param string $text Text of comment
-     *
-     * @return string The formatted comment
-     */
-    private function _exportComment($text = '')
-    {
-        if (isset($GLOBALS['sql_include_comments'])
-            && $GLOBALS['sql_include_comments']
-        ) {
-            // see https://dev.mysql.com/doc/refman/5.0/en/ansi-diff-comments.html
-            if (empty($text)) {
-                return '--' . $GLOBALS['crlf'];
-            } else {
-                $lines = preg_split("/\\r\\n|\\r|\\n/", $text);
-                $result = array();
-                foreach ($lines as $line) {
-                    $result[] = '-- ' . $line . $GLOBALS['crlf'];
-                }
-                return implode('', $result);
-            }
-        } else {
-            return '';
-        }
-    }
-
-    /**
-     * Possibly outputs CRLF
-     *
-     * @return string $crlf or nothing
-     */
-    private function _possibleCRLF()
-    {
-        if (isset($GLOBALS['sql_include_comments'])
-            && $GLOBALS['sql_include_comments']
-        ) {
-            return $GLOBALS['crlf'];
-        } else {
-            return '';
-        }
-    }
-
-    /**
-     * Outputs export footer
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportFooter()
-    {
-        global $crlf, $mysql_charset_map;
-
-        $foot = '';
-
-        if (isset($GLOBALS['sql_disable_fk'])) {
-            $foot .= 'SET FOREIGN_KEY_CHECKS=1;' . $crlf;
-        }
-
-        if (isset($GLOBALS['sql_use_transaction'])) {
-            $foot .= 'COMMIT;' . $crlf;
-        }
-
-        // restore connection settings
-        if ($this->_sent_charset) {
-            $foot .= $crlf
-                . '/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;'
-                . $crlf
-                . '/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;'
-                . $crlf
-                . '/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;'
-                . $crlf;
-            $this->_sent_charset = false;
-        }
-
-        /* Restore timezone */
-        if (isset($GLOBALS['sql_utc_time']) && $GLOBALS['sql_utc_time']) {
-            $GLOBALS['dbi']->query('SET time_zone = "' . $GLOBALS['old_tz'] . '"');
-        }
-
-        return PMA_exportOutputHandler($foot);
-    }
-
-    /**
-     * Outputs export header. It is the first method to be called, so all
-     * the required variables are initialized here.
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportHeader()
-    {
-        global $crlf, $cfg;
-        global $mysql_charset_map;
-
-        if (isset($GLOBALS['sql_compatibility'])) {
-            $tmp_compat = $GLOBALS['sql_compatibility'];
-            if ($tmp_compat == 'NONE') {
-                $tmp_compat = '';
-            }
-            $GLOBALS['dbi']->tryQuery('SET SQL_MODE="' . $tmp_compat . '"');
-            unset($tmp_compat);
-        }
-        $head = $this->_exportComment('phpMyAdmin SQL Dump')
-            . $this->_exportComment('version ' . PMA_VERSION)
-            . $this->_exportComment('https://www.phpmyadmin.net/')
-            . $this->_exportComment();
-        $host_string = __('Host:') . ' ' . $cfg['Server']['host'];
-        if (!empty($cfg['Server']['port'])) {
-            $host_string .= ':' . $cfg['Server']['port'];
-        }
-        $head .= $this->_exportComment($host_string);
-        $head .= $this->_exportComment(
-            __('Generation Time:') . ' '
-            . Util::localisedDate()
-        )
-        . $this->_exportComment(
-            __('Server version:') . ' ' . PMA_MYSQL_STR_VERSION
-        )
-        . $this->_exportComment(__('PHP Version:') . ' ' . phpversion())
-        . $this->_possibleCRLF();
-
-        if (isset($GLOBALS['sql_header_comment'])
-            && !empty($GLOBALS['sql_header_comment'])
-        ) {
-            // '\n' is not a newline (like "\n" would be), it's the characters
-            // backslash and n, as explained on the export interface
-            $lines = explode('\n', $GLOBALS['sql_header_comment']);
-            $head .= $this->_exportComment();
-            foreach ($lines as $one_line) {
-                $head .= $this->_exportComment($one_line);
-            }
-            $head .= $this->_exportComment();
-        }
-
-        if (isset($GLOBALS['sql_disable_fk'])) {
-            $head .= 'SET FOREIGN_KEY_CHECKS=0;' . $crlf;
-        }
-
-        // We want exported AUTO_INCREMENT columns to have still same value,
-        // do this only for recent MySQL exports
-        if ((! isset($GLOBALS['sql_compatibility'])
-            || $GLOBALS['sql_compatibility'] == 'NONE')
-        ) {
-            $head .= 'SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO";' . $crlf;
-        }
-
-        if (isset($GLOBALS['sql_use_transaction'])) {
-            $head .= 'SET AUTOCOMMIT = 0;' . $crlf
-                . 'START TRANSACTION;' . $crlf;
-        }
-
-        /* Change timezone if we should export timestamps in UTC */
-        if (isset($GLOBALS['sql_utc_time']) && $GLOBALS['sql_utc_time']) {
-            $head .= 'SET time_zone = "+00:00";' . $crlf;
-            $GLOBALS['old_tz'] = $GLOBALS['dbi']
-                ->fetchValue('SELECT @@session.time_zone');
-            $GLOBALS['dbi']->query('SET time_zone = "+00:00"');
-        }
-
-        $head .= $this->_possibleCRLF();
-
-        if (! empty($GLOBALS['asfile'])) {
-            // we are saving as file, therefore we provide charset information
-            // so that a utility like the mysql client can interpret
-            // the file correctly
-            if (isset($GLOBALS['charset'])
-                && isset($mysql_charset_map[$GLOBALS['charset']])
-            ) {
-                // we got a charset from the export dialog
-                $set_names = $mysql_charset_map[$GLOBALS['charset']];
-            } else {
-                // by default we use the connection charset
-                $set_names = $mysql_charset_map['utf-8'];
-            }
-            if ($set_names == 'utf8' && PMA_MYSQL_INT_VERSION > 50503) {
-                $set_names = 'utf8mb4';
-            }
-            $head .= $crlf
-                . '/*!40101 SET @OLD_CHARACTER_SET_CLIENT='
-                . '@@CHARACTER_SET_CLIENT */;' . $crlf
-                . '/*!40101 SET @OLD_CHARACTER_SET_RESULTS='
-                . '@@CHARACTER_SET_RESULTS */;' . $crlf
-                . '/*!40101 SET @OLD_COLLATION_CONNECTION='
-                . '@@COLLATION_CONNECTION */;' . $crlf
-                . '/*!40101 SET NAMES ' . $set_names . ' */;' . $crlf . $crlf;
-            $this->_sent_charset = true;
-        }
-
-        return PMA_exportOutputHandler($head);
-    }
-
-    /**
-     * Outputs CREATE DATABASE statement
-     *
-     * @param string $db          Database name
-     * @param string $export_type 'server', 'database', 'table'
-     * @param string $db_alias    Aliases of db
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportDBCreate($db, $export_type, $db_alias = '')
-    {
-        global $crlf;
-
-        if (empty($db_alias)) {
-            $db_alias = $db;
-        }
-        if (isset($GLOBALS['sql_compatibility'])) {
-            $compat = $GLOBALS['sql_compatibility'];
-        } else {
-            $compat = 'NONE';
-        }
-        if (isset($GLOBALS['sql_drop_database'])) {
-            if (!PMA_exportOutputHandler(
-                'DROP DATABASE IF EXISTS '
-                . Util::backquoteCompat(
-                    $db_alias,
-                    $compat,
-                    isset($GLOBALS['sql_backquotes'])
-                )
-                . ';' . $crlf
-            )
-            ) {
-                return false;
-            }
-        }
-        if ($export_type == 'database' && !isset($GLOBALS['sql_create_database'])) {
-            return true;
-        }
-
-        $create_query = 'CREATE DATABASE IF NOT EXISTS '
-            . Util::backquoteCompat(
-                $db_alias,
-                $compat,
-                isset($GLOBALS['sql_backquotes'])
-            );
-        $collation = PMA_getDbCollation($db);
-        if (mb_strpos($collation, '_')) {
-            $create_query .= ' DEFAULT CHARACTER SET '
-                . mb_substr(
-                    $collation,
-                    0,
-                    mb_strpos($collation, '_')
-                )
-                . ' COLLATE ' . $collation;
-        } else {
-            $create_query .= ' DEFAULT CHARACTER SET ' . $collation;
-        }
-        $create_query .= ';' . $crlf;
-        if (!PMA_exportOutputHandler($create_query)) {
-            return false;
-        }
-
-        return $this->_exportUseStatement($db_alias, $compat);
-    }
-
-    /**
-     * Outputs USE statement
-     *
-     * @param string $db     db to use
-     * @param string $compat sql compatibility
-     *
-     * @return bool Whether it succeeded
-     */
-    private function _exportUseStatement($db, $compat)
-    {
-        global $crlf;
-
-        if (isset($GLOBALS['sql_compatibility'])
-            && $GLOBALS['sql_compatibility'] == 'NONE'
-        ) {
-            $result = PMA_exportOutputHandler(
-                'USE '
-                . Util::backquoteCompat(
-                    $db,
-                    $compat,
-                    isset($GLOBALS['sql_backquotes'])
-                )
-                . ';' . $crlf
-            );
-        } else {
-            $result = PMA_exportOutputHandler('USE ' . $db . ';' . $crlf);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Outputs database header
-     *
-     * @param string $db       Database name
-     * @param string $db_alias Alias of db
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportDBHeader($db, $db_alias = '')
-    {
-        if (empty($db_alias)) {
-            $db_alias = $db;
-        }
-        if (isset($GLOBALS['sql_compatibility'])) {
-            $compat = $GLOBALS['sql_compatibility'];
-        } else {
-            $compat = 'NONE';
-        }
-        $head = $this->_exportComment()
-            . $this->_exportComment(
-                __('Database:') . ' '
-                . Util::backquoteCompat(
-                    $db_alias,
-                    $compat,
-                    isset($GLOBALS['sql_backquotes'])
-                )
-            )
-            . $this->_exportComment();
-
-        return PMA_exportOutputHandler($head);
-    }
-
-    /**
-     * Outputs database footer
-     *
-     * @param string $db Database name
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportDBFooter($db)
-    {
-        global $crlf;
-
-        $result = true;
-
-        //add indexes to the sql dump file
-        if (isset($GLOBALS['sql_indexes'])) {
-            $result = PMA_exportOutputHandler($GLOBALS['sql_indexes']);
-            unset($GLOBALS['sql_indexes']);
-        }
-        //add auto increments to the sql dump file
-        if (isset($GLOBALS['sql_auto_increments'])) {
-            $result = PMA_exportOutputHandler($GLOBALS['sql_auto_increments']);
-            unset($GLOBALS['sql_auto_increments']);
-        }
-        //add constraints to the sql dump file
-        if (isset($GLOBALS['sql_constraints'])) {
-            $result = PMA_exportOutputHandler($GLOBALS['sql_constraints']);
-            unset($GLOBALS['sql_constraints']);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Exports events
-     *
-     * @param string $db Database
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportEvents($db)
-    {
-        global $crlf;
-
-        $text = '';
-        $delimiter = '$$';
-
-        $event_names = $GLOBALS['dbi']->fetchResult(
-            "SELECT EVENT_NAME FROM information_schema.EVENTS WHERE"
-            . " EVENT_SCHEMA= '" . $GLOBALS['dbi']->escapeString($db)
-            . "';"
-        );
-
-        if ($event_names) {
-            $text .= $crlf
-                . "DELIMITER " . $delimiter . $crlf;
-
-            $text .= $this->_exportComment()
-                . $this->_exportComment(__('Events'))
-                . $this->_exportComment();
-
-            foreach ($event_names as $event_name) {
-                if (!empty($GLOBALS['sql_drop_table'])) {
-                    $text .= "DROP EVENT "
-                        . Util::backquote($event_name)
-                        . $delimiter . $crlf;
-                }
-                $text .= $GLOBALS['dbi']->getDefinition($db, 'EVENT', $event_name)
-                    . $delimiter . $crlf . $crlf;
-            }
-
-            $text .= "DELIMITER ;" . $crlf;
-        }
-
-        if (!empty($text)) {
-            return PMA_exportOutputHandler($text);
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Exports metadata from Configuration Storage
-     *
-     * @param string       $db            database being exported
-     * @param string|array $tables        table(s) being exported
-     * @param array        $metadataTypes types of metadata to export
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportMetadata(
-        $db,
-        $tables,
-        $metadataTypes
-    ) {
-        $cfgRelation = PMA_getRelationsParam();
-        if (!isset($cfgRelation['db'])) {
-            return true;
-        }
-
-        $comment = $this->_possibleCRLF()
-            . $this->_possibleCRLF()
-            . $this->_exportComment()
-            . $this->_exportComment(__('Metadata'))
-            . $this->_exportComment();
-        if (!PMA_exportOutputHandler($comment)) {
-            return false;
-        }
-
-        if (!$this->_exportUseStatement(
-            $cfgRelation['db'],
-            $GLOBALS['sql_compatibility']
-        )
-        ) {
-            return false;
-        }
-
-        $r = true;
-        if (is_array($tables)) {
-            // export metadata for each table
-            foreach ($tables as $table) {
-                $r &= $this->_exportMetadata($db, $table, $metadataTypes);
-            }
-            // export metadata for the database
-            $r &= $this->_exportMetadata($db, null, $metadataTypes);
-        } else {
-            // export metadata for single table
-            $r &= $this->_exportMetadata($db, $tables, $metadataTypes);
-        }
-
-        return $r;
-    }
-
-    /**
-     * Exports metadata from Configuration Storage
-     *
-     * @param string $db            database being exported
-     * @param string $table         table being exported
-     * @param array  $metadataTypes types of metadata to export
-     *
-     * @return bool Whether it succeeded
-     */
-    private function _exportMetadata(
-        $db,
-        $table,
-        $metadataTypes
-    ) {
-        $cfgRelation = PMA_getRelationsParam();
-
-        if (isset($table)) {
-            $types = array(
-                'column_info'   => 'db_name',
-                'table_uiprefs' => 'db_name',
-                'tracking'      => 'db_name',
-            );
-        } else {
-            $types = array(
-                'bookmark'        => 'dbase',
-                'relation'        => 'master_db',
-                'pdf_pages'       => 'db_name',
-                'savedsearches'   => 'db_name',
-                'central_columns' => 'db_name',
-            );
-        }
-
-        $aliases = array();
-
-        $comment = $this->_possibleCRLF()
-            . $this->_exportComment();
-
-        if (isset($table)) {
-            $comment .= $this->_exportComment(
-                sprintf(
-                    __('Metadata for table %s'),
-                    $table
-                )
-            );
-        } else {
-            $comment .= $this->_exportComment(
-                sprintf(
-                    __('Metadata for database %s'),
-                    $db
-                )
-            );
-        }
-
-        $comment .= $this->_exportComment();
-
-        if (!PMA_exportOutputHandler($comment)) {
-            return false;
-        }
-
-        foreach ($types as $type => $dbNameColumn) {
-            if (in_array($type, $metadataTypes) && isset($cfgRelation[$type])) {
-
-                // special case, designer pages and their coordinates
-                if ($type == 'pdf_pages') {
-
-                    $sql_query = "SELECT `page_nr`, `page_descr` FROM "
-                        . Util::backquote($cfgRelation['db'])
-                        . "." . Util::backquote($cfgRelation[$type])
-                        . " WHERE " . Util::backquote($dbNameColumn)
-                        . " = '" . $GLOBALS['dbi']->escapeString($db) . "'";
-
-                    $result = $GLOBALS['dbi']->fetchResult(
-                        $sql_query,
-                        'page_nr',
-                        'page_descr'
-                    );
-
-                    foreach ($result as $page => $name) {
-                        // insert row for pdf_page
-                        $sql_query_row = "SELECT `db_name`, `page_descr` FROM "
-                            . Util::backquote($cfgRelation['db'])
-                            . "." . Util::backquote(
-                                $cfgRelation[$type]
-                            )
-                            . " WHERE " . Util::backquote(
-                                $dbNameColumn
-                            )
-                            . " = '" . $GLOBALS['dbi']->escapeString($db) . "'"
-                            . " AND `page_nr` = '" . intval($page) . "'";
-
-                        if (!$this->exportData(
-                            $cfgRelation['db'],
-                            $cfgRelation[$type],
-                            $GLOBALS['crlf'],
-                            '',
-                            $sql_query_row,
-                            $aliases
-                        )
-                        ) {
-                            return false;
-                        }
-
-                        $lastPage = $GLOBALS['crlf']
-                            . "SET @LAST_PAGE = LAST_INSERT_ID();"
-                            . $GLOBALS['crlf'];
-                        if (!PMA_exportOutputHandler($lastPage)) {
-                            return false;
-                        }
-
-                        $sql_query_coords = "SELECT `db_name`, `table_name`, "
-                            . "'@LAST_PAGE' AS `pdf_page_number`, `x`, `y` FROM "
-                            . Util::backquote($cfgRelation['db'])
-                            . "." . Util::backquote(
-                                $cfgRelation['table_coords']
-                            )
-                            . " WHERE `pdf_page_number` = '" . $page . "'";
-
-                        $GLOBALS['exporting_metadata'] = true;
-                        if (!$this->exportData(
-                            $cfgRelation['db'],
-                            $cfgRelation['table_coords'],
-                            $GLOBALS['crlf'],
-                            '',
-                            $sql_query_coords,
-                            $aliases
-                        )
-                        ) {
-                            $GLOBALS['exporting_metadata'] = false;
-
-                            return false;
-                        }
-                        $GLOBALS['exporting_metadata'] = false;
-                    }
-                    continue;
-                }
-
-                // remove auto_incrementing id field for some tables
-                if ($type == 'bookmark') {
-                    $sql_query = "SELECT `dbase`, `user`, `label`, `query` FROM ";
-                } elseif ($type == 'column_info') {
-                    $sql_query = "SELECT `db_name`, `table_name`, `column_name`,"
-                        . " `comment`, `mimetype`, `transformation`,"
-                        . " `transformation_options`, `input_transformation`,"
-                        . " `input_transformation_options` FROM";
-                } elseif ($type == 'savedsearches') {
-                    $sql_query = "SELECT `username`, `db_name`, `search_name`,"
-                        . " `search_data` FROM";
-                } else {
-                    $sql_query = "SELECT * FROM ";
-                }
-                $sql_query .= Util::backquote($cfgRelation['db'])
-                    . '.' . Util::backquote($cfgRelation[$type])
-                    . " WHERE " . Util::backquote($dbNameColumn)
-                    . " = '" . $GLOBALS['dbi']->escapeString($db) . "'";
-                if (isset($table)) {
-                    $sql_query .= " AND `table_name` = '"
-                        . $GLOBALS['dbi']->escapeString($table) . "'";
-                }
-
-                if (!$this->exportData(
-                    $cfgRelation['db'],
-                    $cfgRelation[$type],
-                    $GLOBALS['crlf'],
-                    '',
-                    $sql_query,
-                    $aliases
-                )
-                ) {
-                    return false;
-                }
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Returns a stand-in CREATE definition to resolve view dependencies
-     *
-     * @param string $db      the database name
-     * @param string $view    the view name
-     * @param string $crlf    the end of line sequence
-     * @param array  $aliases Aliases of db/table/columns
-     *
-     * @return string resulting definition
-     */
-    public function getTableDefStandIn($db, $view, $crlf, $aliases = array())
-    {
-        $db_alias = $db;
-        $view_alias = $view;
-        $this->initAlias($aliases, $db_alias, $view_alias);
-        $create_query = '';
-        if (!empty($GLOBALS['sql_drop_table'])) {
-            $create_query .= 'DROP VIEW IF EXISTS '
-                . Util::backquote($view_alias)
-                . ';' . $crlf;
-        }
-
-        $create_query .= 'CREATE TABLE ';
-
-        if (isset($GLOBALS['sql_if_not_exists'])
-            && $GLOBALS['sql_if_not_exists']
-        ) {
-            $create_query .= 'IF NOT EXISTS ';
-        }
-        $create_query .= Util::backquote($view_alias) . ' (' . $crlf;
-        $tmp = array();
-        $columns = $GLOBALS['dbi']->getColumnsFull($db, $view);
-        foreach ($columns as $column_name => $definition) {
-            $col_alias = $column_name;
-            if (!empty($aliases[$db]['tables'][$view]['columns'][$col_alias])) {
-                $col_alias = $aliases[$db]['tables'][$view]['columns'][$col_alias];
-            }
-            $tmp[] = Util::backquote($col_alias) . ' ' .
-                $definition['Type'] . $crlf;
-        }
-        $create_query .= implode(',', $tmp) . ');' . $crlf;
-
-        return ($create_query);
-    }
-
-    /**
-     * Returns CREATE definition that matches $view's structure
-     *
-     * @param string $db            the database name
-     * @param string $view          the view name
-     * @param string $crlf          the end of line sequence
-     * @param bool   $add_semicolon whether to add semicolon and end-of-line at
-     *                              the end
-     * @param array  $aliases       Aliases of db/table/columns
-     *
-     * @return string resulting schema
-     */
-    private function _getTableDefForView(
-        $db,
-        $view,
-        $crlf,
-        $add_semicolon = true,
-        $aliases = array()
-    ) {
-        $db_alias = $db;
-        $view_alias = $view;
-        $this->initAlias($aliases, $db_alias, $view_alias);
-        $create_query = "CREATE TABLE";
-        if (isset($GLOBALS['sql_if_not_exists'])) {
-            $create_query .= " IF NOT EXISTS ";
-        }
-        $create_query .= Util::backquote($view_alias) . "(" . $crlf;
-
-        $columns = $GLOBALS['dbi']->getColumns($db, $view, null, true);
-
-        $firstCol = true;
-        foreach ($columns as $column) {
-            $col_alias = $column['Field'];
-            if (!empty($aliases[$db]['tables'][$view]['columns'][$col_alias])) {
-                $col_alias = $aliases[$db]['tables'][$view]['columns'][$col_alias];
-            }
-            $extracted_columnspec = Util::extractColumnSpec(
-                $column['Type']
-            );
-
-            if (!$firstCol) {
-                $create_query .= "," . $crlf;
-            }
-            $create_query .= "    " . Util::backquote($col_alias);
-            $create_query .= " " . $column['Type'];
-            if ($extracted_columnspec['can_contain_collation']
-                && !empty($column['Collation'])
-            ) {
-                $create_query .= " COLLATE " . $column['Collation'];
-            }
-            if ($column['Null'] == 'NO') {
-                $create_query .= " NOT NULL";
-            }
-            if (isset($column['Default'])) {
-                $create_query .= " DEFAULT '"
-                    . $GLOBALS['dbi']->escapeString($column['Default']) . "'";
-            } else {
-                if ($column['Null'] == 'YES') {
-                    $create_query .= " DEFAULT NULL";
-                }
-            }
-            if (!empty($column['Comment'])) {
-                $create_query .= " COMMENT '"
-                    . $GLOBALS['dbi']->escapeString($column['Comment']) . "'";
-            }
-            $firstCol = false;
-        }
-        $create_query .= $crlf . ")" . ($add_semicolon ? ';' : '') . $crlf;
-
-        if (isset($GLOBALS['sql_compatibility'])) {
-            $compat = $GLOBALS['sql_compatibility'];
-        } else {
-            $compat = 'NONE';
-        }
-        if ($compat == 'MSSQL') {
-            $create_query = $this->_makeCreateTableMSSQLCompatible(
-                $create_query
-            );
-        }
-
-        return $create_query;
-    }
-
-    /**
-     * Returns $table's CREATE definition
-     *
-     * @param string $db                        the database name
-     * @param string $table                     the table name
-     * @param string $crlf                      the end of line sequence
-     * @param string $error_url                 the url to go back in case
-     *                                          of error
-     * @param bool   $show_dates                whether to include creation/
-     *                                          update/check dates
-     * @param bool   $add_semicolon             whether to add semicolon and
-     *                                          end-of-line at the end
-     * @param bool   $view                      whether we're handling a view
-     * @param bool   $update_indexes_increments whether we need to update
-     *                                          two global variables
-     * @param array  $aliases                   Aliases of db/table/columns
-     *
-     * @return string resulting schema
-     */
-    public function getTableDef(
-        $db,
-        $table,
-        $crlf,
-        $error_url,
-        $show_dates = false,
-        $add_semicolon = true,
-        $view = false,
-        $update_indexes_increments = true,
-        $aliases = array()
-    ) {
-        global $sql_drop_table, $sql_backquotes, $sql_constraints,
-               $sql_constraints_query, $sql_indexes, $sql_indexes_query,
-               $sql_auto_increments, $sql_drop_foreign_keys;
-
-        $db_alias = $db;
-        $table_alias = $table;
-        $this->initAlias($aliases, $db_alias, $table_alias);
-
-        $schema_create = '';
-        $auto_increment = '';
-        $new_crlf = $crlf;
-
-        if (isset($GLOBALS['sql_compatibility'])) {
-            $compat = $GLOBALS['sql_compatibility'];
-        } else {
-            $compat = 'NONE';
-        }
-
-        // need to use PMA\libraries\DatabaseInterface::QUERY_STORE
-        // with $GLOBALS['dbi']->numRows() in mysqli
-        $result = $GLOBALS['dbi']->query(
-            'SHOW TABLE STATUS FROM ' . Util::backquote($db)
-            . ' WHERE Name = \'' . $GLOBALS['dbi']->escapeString($table) . '\'',
-            null,
-            DatabaseInterface::QUERY_STORE
-        );
-        if ($result != false) {
-            if ($GLOBALS['dbi']->numRows($result) > 0) {
-                $tmpres = $GLOBALS['dbi']->fetchAssoc($result);
-
-                // Here we optionally add the AUTO_INCREMENT next value,
-                // but starting with MySQL 5.0.24, the clause is already included
-                // in SHOW CREATE TABLE so we'll remove it below
-                if (isset($GLOBALS['sql_auto_increment'])
-                    && !empty($tmpres['Auto_increment'])
-                ) {
-                    $auto_increment .= ' AUTO_INCREMENT='
-                        . $tmpres['Auto_increment'] . ' ';
-                }
-
-                if ($show_dates
-                    && isset($tmpres['Create_time'])
-                    && !empty($tmpres['Create_time'])
-                ) {
-                    $schema_create .= $this->_exportComment(
-                        __('Creation:') . ' '
-                        . Util::localisedDate(
-                            strtotime($tmpres['Create_time'])
-                        )
-                    );
-                    $new_crlf = $this->_exportComment() . $crlf;
-                }
-
-                if ($show_dates
-                    && isset($tmpres['Update_time'])
-                    && !empty($tmpres['Update_time'])
-                ) {
-                    $schema_create .= $this->_exportComment(
-                        __('Last update:') . ' '
-                        . Util::localisedDate(
-                            strtotime($tmpres['Update_time'])
-                        )
-                    );
-                    $new_crlf = $this->_exportComment() . $crlf;
-                }
-
-                if ($show_dates
-                    && isset($tmpres['Check_time'])
-                    && !empty($tmpres['Check_time'])
-                ) {
-                    $schema_create .= $this->_exportComment(
-                        __('Last check:') . ' '
-                        . Util::localisedDate(
-                            strtotime($tmpres['Check_time'])
-                        )
-                    );
-                    $new_crlf = $this->_exportComment() . $crlf;
-                }
-            }
-            $GLOBALS['dbi']->freeResult($result);
-        }
-
-        $schema_create .= $new_crlf;
-
-        // no need to generate a DROP VIEW here, it was done earlier
-        if (!empty($sql_drop_table)
-            && !$GLOBALS['dbi']->getTable($db, $table)->isView()
-        ) {
-            $schema_create .= 'DROP TABLE IF EXISTS '
-                . Util::backquote($table_alias, $sql_backquotes) . ';'
-                . $crlf;
-        }
-
-        // Complete table dump,
-        // Whether to quote table and column names or not
-        if ($sql_backquotes) {
-            $GLOBALS['dbi']->query('SET SQL_QUOTE_SHOW_CREATE = 1');
-        } else {
-            $GLOBALS['dbi']->query('SET SQL_QUOTE_SHOW_CREATE = 0');
-        }
-
-        // I don't see the reason why this unbuffered query could cause problems,
-        // because SHOW CREATE TABLE returns only one row, and we free the
-        // results below. Nonetheless, we got 2 user reports about this
-        // (see bug 1562533) so I removed the unbuffered mode.
-        // $result = $GLOBALS['dbi']->query('SHOW CREATE TABLE ' . backquote($db)
-        // . '.' . backquote($table), null, DatabaseInterface::QUERY_UNBUFFERED);
-        //
-        // Note: SHOW CREATE TABLE, at least in MySQL 5.1.23, does not
-        // produce a displayable result for the default value of a BIT
-        // column, nor does the mysqldump command. See MySQL bug 35796
-        $result = $GLOBALS['dbi']->tryQuery(
-            'SHOW CREATE TABLE ' . Util::backquote($db) . '.'
-            . Util::backquote($table)
-        );
-        // an error can happen, for example the table is crashed
-        $tmp_error = $GLOBALS['dbi']->getError();
-        if ($tmp_error) {
-            return $this->_exportComment(__('in use') . '(' . $tmp_error . ')');
-        }
-
-        // Old mode is stored so it can be restored once exporting is done.
-        $old_mode = Context::$MODE;
-
-        $warning = '';
-        if ($result != false && ($row = $GLOBALS['dbi']->fetchRow($result))) {
-            $create_query = $row[1];
-            unset($row);
-
-            // Convert end of line chars to one that we want (note that MySQL
-            // doesn't return query it will accept in all cases)
-            if (mb_strpos($create_query, "(\r\n ")) {
-                $create_query = str_replace("\r\n", $crlf, $create_query);
-            } elseif (mb_strpos($create_query, "(\n ")) {
-                $create_query = str_replace("\n", $crlf, $create_query);
-            } elseif (mb_strpos($create_query, "(\r ")) {
-                $create_query = str_replace("\r", $crlf, $create_query);
-            }
-
-            /*
-             * Drop database name from VIEW creation.
-             *
-             * This is a bit tricky, but we need to issue SHOW CREATE TABLE with
-             * database name, but we don't want name to show up in CREATE VIEW
-             * statement.
-             */
-            if ($view) {
-                $create_query = preg_replace(
-                    '/' . preg_quote(Util::backquote($db), '/') . '\./',
-                    '',
-                    $create_query
-                );
-            }
-
-            // Substitute aliases in `CREATE` query.
-            $create_query = $this->replaceWithAliases(
-                $create_query,
-                $aliases,
-                $db,
-                $table,
-                $flag
-            );
-
-            // One warning per view.
-            if ($flag && $view) {
-                $warning = $this->_exportComment()
-                    . $this->_exportComment(
-                        __('It appears your database uses views;')
-                    )
-                    . $this->_exportComment(
-                        __('alias export may not work reliably in all cases.')
-                    )
-                    . $this->_exportComment();
-            }
-
-            // Adding IF NOT EXISTS, if required.
-            if (isset($GLOBALS['sql_if_not_exists'])) {
-                $create_query = preg_replace(
-                    '/^CREATE TABLE/',
-                    'CREATE TABLE IF NOT EXISTS',
-                    $create_query
-                );
-            }
-
-            // Making the query MSSQL compatible.
-            if ($compat == 'MSSQL') {
-                $create_query = $this->_makeCreateTableMSSQLCompatible(
-                    $create_query
-                );
-            }
-
-            // Views have no constraints, indexes, etc. They do not require any
-            // analysis.
-            if (!$view) {
-
-                if (empty($sql_backquotes)) {
-                    // Option "Enclose table and column names with backquotes"
-                    // was checked.
-                    Context::$MODE |= Context::NO_ENCLOSING_QUOTES;
-                }
-
-                // Using appropriate quotes.
-                if (($compat === 'MSSQL') || ($sql_backquotes === '"')) {
-                    Context::$MODE |= Context::ANSI_QUOTES;
-                }
-            }
-
-            /**
-             * Parser used for analysis.
-             *
-             * @var Parser
-             */
-            $parser = new Parser($create_query);
-
-            /**
-             * `CREATE TABLE` statement.
-             *
-             * @var SelectStatement
-             */
-            $statement = $parser->statements[0];
-
-            if (!empty($statement->entityOptions)) {
-                $engine = $statement->entityOptions->has('ENGINE');
-            } else {
-                $engine = '';
-            }
-
-            /* Avoid operation on ARCHIVE tables as those can not be altered */
-            if (!empty($statement->fields) && (empty($engine) || strtoupper($engine) != 'ARCHIVE')) {
-
-                /**
-                 * Fragments containining definition of each constraint.
-                 *
-                 * @var array
-                 */
-                $constraints = array();
-
-                /**
-                 * Fragments containining definition of each index.
-                 *
-                 * @var array
-                 */
-                $indexes = array();
-
-                /**
-                 * Fragments containining definition of each FULLTEXT index.
-                 *
-                 * @var array
-                 */
-                $indexes_fulltext = array();
-
-                /**
-                 * Fragments containining definition of each foreign key that will
-                 * be dropped.
-                 *
-                 * @var array
-                 */
-                $dropped = array();
-
-                /**
-                 * Fragment containining definition of the `AUTO_INCREMENT`.
-                 *
-                 * @var array
-                 */
-                $auto_increment = array();
-
-                // Scanning each field of the `CREATE` statement to fill the arrays
-                // above.
-                // If the field is used in any of the arrays above, it is removed
-                // from the original definition.
-                // Also, AUTO_INCREMENT attribute is removed.
-                /** @var CreateDefinition $field */
-                foreach ($statement->fields as $key => $field) {
-
-                    if ($field->isConstraint) {
-                        // Creating the parts that add constraints.
-                        $constraints[] = $field::build($field);
-                        unset($statement->fields[$key]);
-                    } elseif (!empty($field->key)) {
-                        // Creating the parts that add indexes (must not be
-                        // constraints).
-                        if ($field->key->type === 'FULLTEXT KEY') {
-                            $indexes_fulltext[] = $field->build($field);
-                            unset($statement->fields[$key]);
-                        } else {
-                            if (empty($GLOBALS['sql_if_not_exists'])) {
-                                $indexes[] = str_replace(
-                                    'COMMENT=\'', 'COMMENT \'', $field::build($field)
-                                );
-                                unset($statement->fields[$key]);
-                            }
-                        }
-                    }
-
-                    // Creating the parts that drop foreign keys.
-                    if (!empty($field->key)) {
-                        if ($field->key->type === 'FOREIGN KEY') {
-                            $dropped[] = 'FOREIGN KEY ' . Context::escape(
-                                $field->name
-                            );
-                            unset($statement->fields[$key]);
-                        }
-                    }
-
-                    // Dropping AUTO_INCREMENT.
-                    if (!empty($field->options)) {
-                        if ($field->options->has('AUTO_INCREMENT')
-                            && empty($GLOBALS['sql_if_not_exists'])
-                        ) {
-
-                            $auto_increment[] = $field::build($field);
-                            $field->options->remove('AUTO_INCREMENT');
-                        }
-                    }
-                }
-
-                /**
-                 * The header of the `ALTER` statement (`ALTER TABLE tbl`).
-                 *
-                 * @var string
-                 */
-                $alter_header = 'ALTER TABLE ' .
-                    Util::backquoteCompat(
-                        $table_alias,
-                        $compat,
-                        $sql_backquotes
-                    );
-
-                /**
-                 * The footer of the `ALTER` statement (usually ';')
-                 *
-                 * @var string
-                 */
-                $alter_footer = ';' . $crlf;
-
-                // Generating constraints-related query.
-                if (!empty($constraints)) {
-                    $sql_constraints_query = $alter_header . $crlf . '  ADD '
-                        . implode(',' . $crlf . '  ADD ', $constraints)
-                        . $alter_footer;
-
-                    $sql_constraints = $this->generateComment(
-                        $crlf,
-                        $sql_constraints,
-                        __('Constraints for dumped tables'),
-                        __('Constraints for table'),
-                        $table_alias,
-                        $compat
-                    ) . $sql_constraints_query;
-                }
-
-                // Generating indexes-related query.
-                $sql_indexes_query = '';
-
-                if (!empty($indexes)) {
-                    $sql_indexes_query .= $alter_header . $crlf . '  ADD '
-                        . implode(',' . $crlf . '  ADD ', $indexes)
-                        . $alter_footer;
-                }
-
-                if (!empty($indexes_fulltext)) {
-                    // InnoDB supports one FULLTEXT index creation at a time.
-                    // So FULLTEXT indexes are created one-by-one after other
-                    // indexes where created.
-                    $sql_indexes_query .= $alter_header .
-                        ' ADD ' . implode(
-                            $alter_footer . $alter_header . ' ADD ',
-                            $indexes_fulltext
-                        ) . $alter_footer;
-                }
-
-                if ((!empty($indexes)) || (!empty($indexes_fulltext))) {
-                    $sql_indexes = $this->generateComment(
-                        $crlf,
-                        $sql_indexes,
-                        __('Indexes for dumped tables'),
-                        __('Indexes for table'),
-                        $table_alias,
-                        $compat
-                    ) . $sql_indexes_query;
-                }
-
-                // Generating drop foreign keys-related query.
-                if (!empty($dropped)) {
-                    $sql_drop_foreign_keys = $alter_header . $crlf . '  DROP '
-                        . implode(',' . $crlf . '  DROP ', $dropped)
-                        . $alter_footer;
-                }
-
-                // Generating auto-increment-related query.
-                if ((! empty($auto_increment)) && ($update_indexes_increments)) {
-                    $sql_auto_increments_query = $alter_header . $crlf . '  MODIFY '
-                        . implode(',' . $crlf . '  MODIFY ', $auto_increment);
-                    if (isset($GLOBALS['sql_auto_increment'])
-                        && ($statement->entityOptions->has('AUTO_INCREMENT') !== false)
-                    ) {
-                        $sql_auto_increments_query .= ', AUTO_INCREMENT='
-                            . $statement->entityOptions->has('AUTO_INCREMENT');
-                    }
-                    $sql_auto_increments_query .= ';';
-
-                    $sql_auto_increments = $this->generateComment(
-                        $crlf,
-                        $sql_auto_increments,
-                        __('AUTO_INCREMENT for dumped tables'),
-                        __('AUTO_INCREMENT for table'),
-                        $table_alias,
-                        $compat
-                    ) . $sql_auto_increments_query;
-                }
-
-                // Removing the `AUTO_INCREMENT` attribute from the `CREATE TABLE`
-                // too.
-                if (!empty($statement->entityOptions)
-                    && (empty($GLOBALS['sql_if_not_exists'])
-                    || empty($GLOBALS['sql_auto_increment']))
-                ) {
-                    $statement->entityOptions->remove('AUTO_INCREMENT');
-                }
-
-                // Rebuilding the query.
-                $create_query = $statement->build();
-            }
-
-            $schema_create .= $create_query;
-        }
-
-        $GLOBALS['dbi']->freeResult($result);
-
-        // Restoring old mode.
-        Context::$MODE = $old_mode;
-
-        return $warning . $schema_create . ($add_semicolon ? ';' . $crlf : '');
-    } // end of the 'getTableDef()' function
-
-    /**
-     * Returns $table's comments, relations etc.
-     *
-     * @param string $db          database name
-     * @param string $table       table name
-     * @param string $crlf        end of line sequence
-     * @param bool   $do_relation whether to include relation comments
-     * @param bool   $do_mime     whether to include mime comments
-     * @param array  $aliases     Aliases of db/table/columns
-     *
-     * @return string resulting comments
-     */
-    private function _getTableComments(
-        $db,
-        $table,
-        $crlf,
-        $do_relation = false,
-        $do_mime = false,
-        $aliases = array()
-    ) {
-        global $cfgRelation, $sql_backquotes;
-
-        $db_alias = $db;
-        $table_alias = $table;
-        $this->initAlias($aliases, $db_alias, $table_alias);
-
-        $schema_create = '';
-
-        // Check if we can use Relations
-        list($res_rel, $have_rel) = PMA_getRelationsAndStatus(
-            $do_relation && !empty($cfgRelation['relation']),
-            $db,
-            $table
-        );
-
-        if ($do_mime && $cfgRelation['mimework']) {
-            if (!($mime_map = PMA_getMIME($db, $table, true))) {
-                unset($mime_map);
-            }
-        }
-
-        if (isset($mime_map) && count($mime_map) > 0) {
-            $schema_create .= $this->_possibleCRLF()
-                . $this->_exportComment()
-                . $this->_exportComment(
-                    __('MIME TYPES FOR TABLE') . ' '
-                    . Util::backquote($table, $sql_backquotes) . ':'
-                );
-            foreach ($mime_map as $mime_field => $mime) {
-                $schema_create .= $this->_exportComment(
-                    '  '
-                    . Util::backquote($mime_field, $sql_backquotes)
-                )
-                . $this->_exportComment(
-                    '      '
-                    . Util::backquote(
-                        $mime['mimetype'],
-                        $sql_backquotes
-                    )
-                );
-            }
-            $schema_create .= $this->_exportComment();
-        }
-
-        if ($have_rel) {
-            $schema_create .= $this->_possibleCRLF()
-                . $this->_exportComment()
-                . $this->_exportComment(
-                    __('RELATIONS FOR TABLE') . ' '
-                    . Util::backquote($table_alias, $sql_backquotes)
-                    . ':'
-                );
-
-            foreach ($res_rel as $rel_field => $rel) {
-                if ($rel_field != 'foreign_keys_data') {
-                    $rel_field_alias = !empty(
-                        $aliases[$db]['tables'][$table]['columns'][$rel_field]
-                    ) ? $aliases[$db]['tables'][$table]['columns'][$rel_field]
-                        : $rel_field;
-                    $schema_create .= $this->_exportComment(
-                        '  '
-                        . Util::backquote(
-                            $rel_field_alias,
-                            $sql_backquotes
-                        )
-                    )
-                    . $this->_exportComment(
-                        '      '
-                        . Util::backquote(
-                            $rel['foreign_table'],
-                            $sql_backquotes
-                        )
-                        . ' -> '
-                        . Util::backquote(
-                            $rel['foreign_field'],
-                            $sql_backquotes
-                        )
-                    );
-                } else {
-                    foreach ($rel as $one_key) {
-                        foreach ($one_key['index_list'] as $index => $field) {
-                            $rel_field_alias = !empty(
-                                $aliases[$db]['tables'][$table]['columns'][$field]
-                            ) ? $aliases[$db]['tables'][$table]['columns'][$field]
-                                : $field;
-                            $schema_create .= $this->_exportComment(
-                                '  '
-                                . Util::backquote(
-                                    $rel_field_alias,
-                                    $sql_backquotes
-                                )
-                            )
-                            . $this->_exportComment(
-                                '      '
-                                . Util::backquote(
-                                    $one_key['ref_table_name'],
-                                    $sql_backquotes
-                                )
-                                . ' -> '
-                                . Util::backquote(
-                                    $one_key['ref_index_list'][$index],
-                                    $sql_backquotes
-                                )
-                            );
-                        }
-                    }
-                }
-            }
-            $schema_create .= $this->_exportComment();
-        }
-
-        return $schema_create;
-    } // end of the '_getTableComments()' function
-
-    /**
-     * Outputs table's structure
-     *
-     * @param string $db          database name
-     * @param string $table       table name
-     * @param string $crlf        the end of line sequence
-     * @param string $error_url   the url to go back in case of error
-     * @param string $export_mode 'create_table','triggers','create_view',
-     *                            'stand_in'
-     * @param string $export_type 'server', 'database', 'table'
-     * @param bool   $relation    whether to include relation comments
-     * @param bool   $comments    whether to include the pmadb-style column
-     *                            comments as comments in the structure; this is
-     *                            deprecated but the parameter is left here
-     *                            because export.php calls exportStructure()
-     *                            also for other export types which use this
-     *                            parameter
-     * @param bool   $mime        whether to include mime comments
-     * @param bool   $dates       whether to include creation/update/check dates
-     * @param array  $aliases     Aliases of db/table/columns
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportStructure(
-        $db,
-        $table,
-        $crlf,
-        $error_url,
-        $export_mode,
-        $export_type,
-        $relation = false,
-        $comments = false,
-        $mime = false,
-        $dates = false,
-        $aliases = array()
-    ) {
-        $db_alias = $db;
-        $table_alias = $table;
-        $this->initAlias($aliases, $db_alias, $table_alias);
-        if (isset($GLOBALS['sql_compatibility'])) {
-            $compat = $GLOBALS['sql_compatibility'];
-        } else {
-            $compat = 'NONE';
-        }
-
-        $formatted_table_name = Util::backquoteCompat(
-            $table_alias,
-            $compat,
-            isset($GLOBALS['sql_backquotes'])
-        );
-        $dump = $this->_possibleCRLF()
-            . $this->_exportComment(str_repeat('-', 56))
-            . $this->_possibleCRLF()
-            . $this->_exportComment();
-
-        switch ($export_mode) {
-        case 'create_table':
-            $dump .= $this->_exportComment(
-                __('Table structure for table') . ' ' . $formatted_table_name
-            );
-            $dump .= $this->_exportComment();
-            $dump .= $this->getTableDef(
-                $db,
-                $table,
-                $crlf,
-                $error_url,
-                $dates,
-                true,
-                false,
-                true,
-                $aliases
-            );
-            $dump .= $this->_getTableComments(
-                $db,
-                $table,
-                $crlf,
-                $relation,
-                $mime,
-                $aliases
-            );
-            break;
-        case 'triggers':
-            $dump = '';
-            $delimiter = '$$';
-            $triggers = $GLOBALS['dbi']->getTriggers($db, $table, $delimiter);
-            if ($triggers) {
-                $dump .= $this->_possibleCRLF()
-                    . $this->_exportComment()
-                    . $this->_exportComment(
-                        __('Triggers') . ' ' . $formatted_table_name
-                    )
-                    . $this->_exportComment();
-                $used_alias = false;
-                $trigger_query = '';
-                foreach ($triggers as $trigger) {
-                    if (!empty($GLOBALS['sql_drop_table'])) {
-                        $trigger_query .= $trigger['drop'] . ';' . $crlf;
-                    }
-
-                    $trigger_query .= 'DELIMITER ' . $delimiter . $crlf;
-                    $trigger_query .= $this->replaceWithAliases(
-                        $trigger['create'],
-                        $aliases,
-                        $db,
-                        $table,
-                        $flag
-                    );
-                    if ($flag) {
-                        $used_alias = true;
-                    }
-                    $trigger_query .= 'DELIMITER ;' . $crlf;
-                }
-                // One warning per table.
-                if ($used_alias) {
-                    $dump .= $this->_exportComment(
-                        __('It appears your table uses triggers;')
-                    )
-                    . $this->_exportComment(
-                        __('alias export may not work reliably in all cases.')
-                    )
-                    . $this->_exportComment();
-                }
-                $dump .= $trigger_query;
-            }
-            break;
-        case 'create_view':
-            if (empty($GLOBALS['sql_views_as_tables'])) {
-                $dump .= $this->_exportComment(
-                    __('Structure for view')
-                    . ' '
-                    . $formatted_table_name
-                )
-                . $this->_exportComment();
-                // delete the stand-in table previously created (if any)
-                if ($export_type != 'table') {
-                    $dump .= 'DROP TABLE IF EXISTS '
-                        . Util::backquote($table_alias) . ';' . $crlf;
-                }
-                $dump .= $this->getTableDef(
-                    $db,
-                    $table,
-                    $crlf,
-                    $error_url,
-                    $dates,
-                    true,
-                    true,
-                    true,
-                    $aliases
-                );
-            } else {
-                $dump .= $this->_exportComment(
-                    sprintf(
-                        __('Structure for view %s exported as a table'),
-                        $formatted_table_name
-                    )
-                )
-                . $this->_exportComment();
-                // delete the stand-in table previously created (if any)
-                if ($export_type != 'table') {
-                    $dump .= 'DROP TABLE IF EXISTS '
-                        . Util::backquote($table_alias) . ';' . $crlf;
-                }
-                $dump .= $this->_getTableDefForView(
-                    $db,
-                    $table,
-                    $crlf,
-                    true,
-                    $aliases
-                );
-            }
-            break;
-        case 'stand_in':
-            $dump .= $this->_exportComment(
-                __('Stand-in structure for view') . ' ' . $formatted_table_name
-            )
-                . $this->_exportComment(
-                __('(See below for the actual view)')
-            )
-                . $this->_exportComment();
-            // export a stand-in definition to resolve view dependencies
-            $dump .= $this->getTableDefStandIn($db, $table, $crlf, $aliases);
-        } // end switch
-
-        // this one is built by getTableDef() to use in table copy/move
-        // but not in the case of export
-        unset($GLOBALS['sql_constraints_query']);
-
-        return PMA_exportOutputHandler($dump);
-    }
-
-    /**
-     * Outputs the content of a table in SQL format
-     *
-     * @param string $db        database name
-     * @param string $table     table name
-     * @param string $crlf      the end of line sequence
-     * @param string $error_url the url to go back in case of error
-     * @param string $sql_query SQL query for obtaining data
-     * @param array  $aliases   Aliases of db/table/columns
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportData(
-        $db,
-        $table,
-        $crlf,
-        $error_url,
-        $sql_query,
-        $aliases = array()
-    ) {
-        global $current_row, $sql_backquotes;
-
-        // Do not export data for merge tables
-        if ($GLOBALS['dbi']->getTable($db, $table)->isMerge()) {
-            return true;
-        }
-
-        $db_alias = $db;
-        $table_alias = $table;
-        $this->initAlias($aliases, $db_alias, $table_alias);
-
-        if (isset($GLOBALS['sql_compatibility'])) {
-            $compat = $GLOBALS['sql_compatibility'];
-        } else {
-            $compat = 'NONE';
-        }
-
-        $formatted_table_name = Util::backquoteCompat(
-            $table_alias,
-            $compat,
-            $sql_backquotes
-        );
-
-        // Do not export data for a VIEW, unless asked to export the view as a table
-        // (For a VIEW, this is called only when exporting a single VIEW)
-        if ($GLOBALS['dbi']->getTable($db, $table)->isView()
-            && empty($GLOBALS['sql_views_as_tables'])
-        ) {
-            $head = $this->_possibleCRLF()
-                . $this->_exportComment()
-                . $this->_exportComment('VIEW ' . ' ' . $formatted_table_name)
-                . $this->_exportComment(__('Data:') . ' ' . __('None'))
-                . $this->_exportComment()
-                . $this->_possibleCRLF();
-
-            if (!PMA_exportOutputHandler($head)) {
-                return false;
-            }
-
-            return true;
-        }
-
-        $result = $GLOBALS['dbi']->tryQuery(
-            $sql_query,
-            null,
-            DatabaseInterface::QUERY_UNBUFFERED
-        );
-        // a possible error: the table has crashed
-        $tmp_error = $GLOBALS['dbi']->getError();
-        if ($tmp_error) {
-            return PMA_exportOutputHandler(
-                $this->_exportComment(
-                    __('Error reading data:') . ' (' . $tmp_error . ')'
-                )
-            );
-        }
-
-        if ($result == false) {
-            $GLOBALS['dbi']->freeResult($result);
-
-            return true;
-        }
-
-        $fields_cnt = $GLOBALS['dbi']->numFields($result);
-
-        // Get field information
-        $fields_meta = $GLOBALS['dbi']->getFieldsMeta($result);
-        $field_flags = array();
-        for ($j = 0; $j < $fields_cnt; $j++) {
-            $field_flags[$j] = $GLOBALS['dbi']->fieldFlags($result, $j);
-        }
-
-        $field_set = array();
-        for ($j = 0; $j < $fields_cnt; $j++) {
-            $col_as = $fields_meta[$j]->name;
-            if (!empty($aliases[$db]['tables'][$table]['columns'][$col_as])) {
-                $col_as = $aliases[$db]['tables'][$table]['columns'][$col_as];
-            }
-            $field_set[$j] = Util::backquoteCompat(
-                $col_as,
-                $compat,
-                $sql_backquotes
-            );
-        }
-
-        if (isset($GLOBALS['sql_type'])
-            && $GLOBALS['sql_type'] == 'UPDATE'
-        ) {
-            // update
-            $schema_insert = 'UPDATE ';
-            if (isset($GLOBALS['sql_ignore'])) {
-                $schema_insert .= 'IGNORE ';
-            }
-            // avoid EOL blank
-            $schema_insert .= Util::backquoteCompat(
-                $table_alias,
-                $compat,
-                $sql_backquotes
-            ) . ' SET';
-        } else {
-            // insert or replace
-            if (isset($GLOBALS['sql_type'])
-                && $GLOBALS['sql_type'] == 'REPLACE'
-            ) {
-                $sql_command = 'REPLACE';
-            } else {
-                $sql_command = 'INSERT';
-            }
-
-            // delayed inserts?
-            if (isset($GLOBALS['sql_delayed'])) {
-                $insert_delayed = ' DELAYED';
-            } else {
-                $insert_delayed = '';
-            }
-
-            // insert ignore?
-            if (isset($GLOBALS['sql_type'])
-                && $GLOBALS['sql_type'] == 'INSERT'
-                && isset($GLOBALS['sql_ignore'])
-            ) {
-                $insert_delayed .= ' IGNORE';
-            }
-            //truncate table before insert
-            if (isset($GLOBALS['sql_truncate'])
-                && $GLOBALS['sql_truncate']
-                && $sql_command == 'INSERT'
-            ) {
-                $truncate = 'TRUNCATE TABLE '
-                    . Util::backquoteCompat(
-                        $table_alias,
-                        $compat,
-                        $sql_backquotes
-                    ) . ";";
-                $truncatehead = $this->_possibleCRLF()
-                    . $this->_exportComment()
-                    . $this->_exportComment(
-                        __('Truncate table before insert') . ' '
-                        . $formatted_table_name
-                    )
-                    . $this->_exportComment()
-                    . $crlf;
-                PMA_exportOutputHandler($truncatehead);
-                PMA_exportOutputHandler($truncate);
-            }
-
-            // scheme for inserting fields
-            if ($GLOBALS['sql_insert_syntax'] == 'complete'
-                || $GLOBALS['sql_insert_syntax'] == 'both'
-            ) {
-                $fields = implode(', ', $field_set);
-                $schema_insert = $sql_command . $insert_delayed . ' INTO '
-                    . Util::backquoteCompat(
-                        $table_alias,
-                        $compat,
-                        $sql_backquotes
-                    )
-                    // avoid EOL blank
-                    . ' (' . $fields . ') VALUES';
-            } else {
-                $schema_insert = $sql_command . $insert_delayed . ' INTO '
-                    . Util::backquoteCompat(
-                        $table_alias,
-                        $compat,
-                        $sql_backquotes
-                    )
-                    . ' VALUES';
-            }
-        }
-
-        //\x08\\x09, not required
-        $current_row = 0;
-        $query_size = 0;
-        if (($GLOBALS['sql_insert_syntax'] == 'extended'
-            || $GLOBALS['sql_insert_syntax'] == 'both')
-            && (!isset($GLOBALS['sql_type'])
-            || $GLOBALS['sql_type'] != 'UPDATE')
-        ) {
-            $separator = ',';
-            $schema_insert .= $crlf;
-        } else {
-            $separator = ';';
-        }
-
-        while ($row = $GLOBALS['dbi']->fetchRow($result)) {
-            if ($current_row == 0) {
-                $head = $this->_possibleCRLF()
-                    . $this->_exportComment()
-                    . $this->_exportComment(
-                        __('Dumping data for table') . ' '
-                        . $formatted_table_name
-                    )
-                    . $this->_exportComment()
-                    . $crlf;
-                if (!PMA_exportOutputHandler($head)) {
-                    return false;
-                }
-            }
-            // We need to SET IDENTITY_INSERT ON for MSSQL
-            if (isset($GLOBALS['sql_compatibility'])
-                && $GLOBALS['sql_compatibility'] == 'MSSQL'
-                && $current_row == 0
-            ) {
-                if (!PMA_exportOutputHandler(
-                    'SET IDENTITY_INSERT '
-                    . Util::backquoteCompat(
-                        $table_alias,
-                        $compat,
-                        $sql_backquotes
-                    )
-                    . ' ON ;' . $crlf
-                )
-                ) {
-                    return false;
-                }
-            }
-            $current_row++;
-            $values = array();
-            for ($j = 0; $j < $fields_cnt; $j++) {
-                // NULL
-                if (!isset($row[$j]) || is_null($row[$j])) {
-                    $values[] = 'NULL';
-                } elseif ($fields_meta[$j]->numeric
-                    && $fields_meta[$j]->type != 'timestamp'
-                    && !$fields_meta[$j]->blob
-                ) {
-                    // a number
-                    // timestamp is numeric on some MySQL 4.1, BLOBs are
-                    // sometimes numeric
-                    $values[] = $row[$j];
-                } elseif (stristr($field_flags[$j], 'BINARY') !== false
-                    && isset($GLOBALS['sql_hex_for_binary'])
-                ) {
-                    // a true BLOB
-                    // - mysqldump only generates hex data when the --hex-blob
-                    //   option is used, for fields having the binary attribute
-                    //   no hex is generated
-                    // - a TEXT field returns type blob but a real blob
-                    //   returns also the 'binary' flag
-
-                    // empty blobs need to be different, but '0' is also empty
-                    // :-(
-                    if (empty($row[$j]) && $row[$j] != '0') {
-                        $values[] = '\'\'';
-                    } else {
-                        $values[] = '0x' . bin2hex($row[$j]);
-                    }
-                } elseif ($fields_meta[$j]->type == 'bit') {
-                    // detection of 'bit' works only on mysqli extension
-                    $values[] = "b'" . $GLOBALS['dbi']->escapeString(
-                        Util::printableBitValue(
-                            $row[$j],
-                            $fields_meta[$j]->length
-                        )
-                    )
-                    . "'";
-                } elseif (!empty($GLOBALS['exporting_metadata'])
-                    && $row[$j] == '@LAST_PAGE'
-                ) {
-                    $values[] = '@LAST_PAGE';
-                } else {
-                    // something else -> treat as a string
-                    $values[] = '\''
-                        . $GLOBALS['dbi']->escapeString($row[$j])
-                        . '\'';
-                } // end if
-            } // end for
-
-            // should we make update?
-            if (isset($GLOBALS['sql_type'])
-                && $GLOBALS['sql_type'] == 'UPDATE'
-            ) {
-
-                $insert_line = $schema_insert;
-                for ($i = 0; $i < $fields_cnt; $i++) {
-                    if (0 == $i) {
-                        $insert_line .= ' ';
-                    }
-                    if ($i > 0) {
-                        // avoid EOL blank
-                        $insert_line .= ',';
-                    }
-                    $insert_line .= $field_set[$i] . ' = ' . $values[$i];
-                }
-
-                list($tmp_unique_condition, $tmp_clause_is_unique)
-                    = Util::getUniqueCondition(
-                        $result, // handle
-                        $fields_cnt, // fields_cnt
-                        $fields_meta, // fields_meta
-                        $row, // row
-                        false, // force_unique
-                        false, // restrict_to_table
-                        null // analyzed_sql_results
-                    );
-                $insert_line .= ' WHERE ' . $tmp_unique_condition;
-                unset($tmp_unique_condition, $tmp_clause_is_unique);
-            } else {
-
-                // Extended inserts case
-                if ($GLOBALS['sql_insert_syntax'] == 'extended'
-                    || $GLOBALS['sql_insert_syntax'] == 'both'
-                ) {
-                    if ($current_row == 1) {
-                        $insert_line = $schema_insert . '('
-                            . implode(', ', $values) . ')';
-                    } else {
-                        $insert_line = '(' . implode(', ', $values) . ')';
-                        $insertLineSize = mb_strlen($insert_line);
-                        $sql_max_size = $GLOBALS['sql_max_query_size'];
-                        if (isset($sql_max_size)
-                            && $sql_max_size > 0
-                            && $query_size + $insertLineSize > $sql_max_size
-                        ) {
-                            if (!PMA_exportOutputHandler(';' . $crlf)) {
-                                return false;
-                            }
-                            $query_size = 0;
-                            $current_row = 1;
-                            $insert_line = $schema_insert . $insert_line;
-                        }
-                    }
-                    $query_size += mb_strlen($insert_line);
-                    // Other inserts case
-                } else {
-                    $insert_line = $schema_insert
-                        . '(' . implode(', ', $values) . ')';
-                }
-            }
-            unset($values);
-
-            if (!PMA_exportOutputHandler(
-                ($current_row == 1 ? '' : $separator . $crlf)
-                . $insert_line
-            )
-            ) {
-                return false;
-            }
-        } // end while
-
-        if ($current_row > 0) {
-            if (!PMA_exportOutputHandler(';' . $crlf)) {
-                return false;
-            }
-        }
-
-        // We need to SET IDENTITY_INSERT OFF for MSSQL
-        if (isset($GLOBALS['sql_compatibility'])
-            && $GLOBALS['sql_compatibility'] == 'MSSQL'
-            && $current_row > 0
-        ) {
-            $outputSucceeded = PMA_exportOutputHandler(
-                $crlf . 'SET IDENTITY_INSERT '
-                . Util::backquoteCompat(
-                    $table_alias,
-                    $compat,
-                    $sql_backquotes
-                )
-                . ' OFF;' . $crlf
-            );
-            if (!$outputSucceeded) {
-                return false;
-            }
-        }
-
-        $GLOBALS['dbi']->freeResult($result);
-
-        return true;
-    } // end of the 'exportData()' function
-
-    /**
-     * Make a create table statement compatible with MSSQL
-     *
-     * @param string $create_query MySQL create table statement
-     *
-     * @return string MSSQL compatible create table statement
-     */
-    private function _makeCreateTableMSSQLCompatible($create_query)
-    {
-        // In MSSQL
-        // 1. No 'IF NOT EXISTS' in CREATE TABLE
-        // 2. DATE field doesn't exists, we will use DATETIME instead
-        // 3. UNSIGNED attribute doesn't exist
-        // 4. No length on INT, TINYINT, SMALLINT, BIGINT and no precision on
-        //    FLOAT fields
-        // 5. No KEY and INDEX inside CREATE TABLE
-        // 6. DOUBLE field doesn't exists, we will use FLOAT instead
-
-        $create_query = preg_replace(
-            "/^CREATE TABLE IF NOT EXISTS/",
-            'CREATE TABLE',
-            $create_query
-        );
-        // first we need  to replace all lines ended with '" DATE ...,\n'
-        // last preg_replace preserve us from situation with date text
-        // inside DEFAULT field value
-        $create_query = preg_replace(
-            "/\" date DEFAULT NULL(,)?\n/",
-            '" datetime DEFAULT NULL$1' . "\n",
-            $create_query
-        );
-        $create_query = preg_replace(
-            "/\" date NOT NULL(,)?\n/",
-            '" datetime NOT NULL$1' . "\n",
-            $create_query
-        );
-        $create_query = preg_replace(
-            '/" date NOT NULL DEFAULT \'([^\'])/',
-            '" datetime NOT NULL DEFAULT \'$1',
-            $create_query
-        );
-
-        // next we need to replace all lines ended with ') UNSIGNED ...,'
-        // last preg_replace preserve us from situation with unsigned text
-        // inside DEFAULT field value
-        $create_query = preg_replace(
-            "/\) unsigned NOT NULL(,)?\n/",
-            ') NOT NULL$1' . "\n",
-            $create_query
-        );
-        $create_query = preg_replace(
-            "/\) unsigned DEFAULT NULL(,)?\n/",
-            ') DEFAULT NULL$1' . "\n",
-            $create_query
-        );
-        $create_query = preg_replace(
-            '/\) unsigned NOT NULL DEFAULT \'([^\'])/',
-            ') NOT NULL DEFAULT \'$1',
-            $create_query
-        );
-
-        // we need to replace all lines ended with
-        // '" INT|TINYINT([0-9]{1,}) ...,' last preg_replace preserve us
-        // from situation with int([0-9]{1,}) text inside DEFAULT field
-        // value
-        $create_query = preg_replace(
-            '/" (int|tinyint|smallint|bigint)\([0-9]+\) DEFAULT NULL(,)?\n/',
-            '" $1 DEFAULT NULL$2' . "\n",
-            $create_query
-        );
-        $create_query = preg_replace(
-            '/" (int|tinyint|smallint|bigint)\([0-9]+\) NOT NULL(,)?\n/',
-            '" $1 NOT NULL$2' . "\n",
-            $create_query
-        );
-        $create_query = preg_replace(
-            '/" (int|tinyint|smallint|bigint)\([0-9]+\) NOT NULL DEFAULT \'([^\'])/',
-            '" $1 NOT NULL DEFAULT \'$2',
-            $create_query
-        );
-
-        // we need to replace all lines ended with
-        // '" FLOAT|DOUBLE([0-9,]{1,}) ...,'
-        // last preg_replace preserve us from situation with
-        // float([0-9,]{1,}) text inside DEFAULT field value
-        $create_query = preg_replace(
-            '/" (float|double)(\([0-9]+,[0-9,]+\))? DEFAULT NULL(,)?\n/',
-            '" float DEFAULT NULL$3' . "\n",
-            $create_query
-        );
-        $create_query = preg_replace(
-            '/" (float|double)(\([0-9,]+,[0-9,]+\))? NOT NULL(,)?\n/',
-            '" float NOT NULL$3' . "\n",
-            $create_query
-        );
-        $create_query = preg_replace(
-            '/" (float|double)(\([0-9,]+,[0-9,]+\))? NOT NULL DEFAULT \'([^\'])/',
-            '" float NOT NULL DEFAULT \'$3',
-            $create_query
-        );
-
-        // @todo remove indexes from CREATE TABLE
-
-        return $create_query;
-    }
-
-    /**
-     * replaces db/table/column names with their aliases
-     *
-     * @param string $sql_query SQL query in which aliases are to be substituted
-     * @param array  $aliases   Alias information for db/table/column
-     * @param string $db        the database name
-     * @param string $table     the tablename
-     * @param string &$flag     the flag denoting whether any replacement was done
-     *
-     * @return string query replaced with aliases
-     */
-    public function replaceWithAliases(
-        $sql_query,
-        $aliases,
-        $db,
-        $table = '',
-        &$flag = null
-    ) {
-        $flag = false;
-
-        /**
-         * The parser of this query.
-         *
-         * @var Parser $parser
-         */
-        $parser = new Parser($sql_query);
-
-        if (empty($parser->statements[0])) {
-            return $sql_query;
-        }
-
-        /**
-         * The statement that represents the query.
-         *
-         * @var \SqlParser\Statements\CreateStatement $statement
-         */
-        $statement = $parser->statements[0];
-
-        /**
-         * Old database name.
-         *
-         * @var string $old_database
-         */
-        $old_database = $db;
-
-        // Replacing aliases in `CREATE TABLE` statement.
-        if ($statement->options->has('TABLE')) {
-
-            // Extracting the name of the old database and table from the
-            // statement to make sure the parameters are corect.
-            if (!empty($statement->name->database)) {
-                $old_database = $statement->name->database;
-            }
-
-            /**
-             * Old table name.
-             *
-             * @var string $old_table
-             */
-            $old_table = $statement->name->table;
-
-            // Finding the aliased database name.
-            // The database might be empty so we have to add a few checks.
-            $new_database = null;
-            if (!empty($statement->name->database)) {
-                $new_database = $statement->name->database;
-                if (!empty($aliases[$old_database]['alias'])) {
-                    $new_database = $aliases[$old_database]['alias'];
-                }
-            }
-
-            // Finding the aliases table name.
-            $new_table = $old_table;
-            if (!empty($aliases[$old_database]['tables'][$old_table]['alias'])) {
-                $new_table = $aliases[$old_database]['tables'][$old_table]['alias'];
-            }
-
-            // Replacing new values.
-            if (($statement->name->database !== $new_database)
-                || ($statement->name->table !== $new_table)
-            ) {
-                $statement->name->database = $new_database;
-                $statement->name->table = $new_table;
-                $statement->name->expr = null; // Force rebuild.
-                $flag = true;
-            }
-
-            foreach ($statement->fields as $field) {
-
-                // Column name.
-                if (!empty($field->type)) {
-                    if (!empty($aliases[$old_database]['tables'][$old_table]['columns'][$field->name])) {
-                        $field->name = $aliases[$old_database]['tables']
-                        [$old_table]['columns'][$field->name];
-                        $flag = true;
-                    }
-                }
-
-                // Key's columns.
-                if (!empty($field->key)) {
-                    foreach ($field->key->columns as $key => $column) {
-                        if (!empty($aliases[$old_database]['tables'][$old_table]['columns'][$column['name']])) {
-                            $field->key->columns[$key]['name'] = $aliases[$old_database]
-                                ['tables'][$old_table]['columns'][$column['name']];
-                            $flag = true;
-                        }
-                    }
-                }
-
-                // References.
-                if (!empty($field->references)) {
-                    $ref_table = $field->references->table->table;
-                    // Replacing table.
-                    if (!empty($aliases[$old_database]['tables'][$ref_table]['alias'])) {
-                        $field->references->table->table
-                            = $aliases[$old_database]['tables'][$ref_table]['alias'];
-                        $field->references->table->expr = null;
-                        $flag = true;
-                    }
-                    // Replacing column names.
-                    foreach ($field->references->columns as $key => $column) {
-                        if (!empty($aliases[$old_database]['tables'][$ref_table]['columns'][$column])) {
-                            $field->references->columns[$key]
-                                = $aliases[$old_database]['tables'][$ref_table]['columns'][$column];
-                            $flag = true;
-                        }
-                    }
-                }
-            }
-        } elseif ($statement->options->has('TRIGGER')) {
-
-            // Extracting the name of the old database and table from the
-            // statement to make sure the parameters are corect.
-            if (!empty($statement->table->database)) {
-                $old_database = $statement->table->database;
-            }
-
-            /**
-             * Old table name.
-             *
-             * @var string $old_table
-             */
-            $old_table = $statement->table->table;
-
-            if (!empty($aliases[$old_database]['tables'][$old_table]['alias'])) {
-                $statement->table->table
-                    = $aliases[$old_database]['tables'][$old_table]['alias'];
-                $statement->table->expr = null; // Force rebuild.
-                $flag = true;
-            }
-        }
-
-        if (($statement->options->has('TRIGGER'))
-            || ($statement->options->has('PROCEDURE'))
-            || ($statement->options->has('FUNCTION'))
-            || ($statement->options->has('VIEW'))
-        ) {
-
-            // Repalcing the body.
-            for ($i = 0, $count = count($statement->body); $i < $count; ++$i) {
-
-                /**
-                 * Token parsed at this moment.
-                 *
-                 * @var Token $token
-                 */
-                $token = $statement->body[$i];
-
-                // Replacing only symbols (that are not variables) and unknown
-                // identifiers.
-                if ((($token->type === Token::TYPE_SYMBOL)
-                    && (!($token->flags & Token::FLAG_SYMBOL_VARIABLE)))
-                    || ((($token->type === Token::TYPE_KEYWORD)
-                    && (!($token->flags & Token::FLAG_KEYWORD_RESERVED)))
-                    || ($token->type === Token::TYPE_NONE))
-                ) {
-                    $alias = $this->getAlias($aliases, $token->value);
-                    if (!empty($alias)) {
-                        // Replacing the token.
-                        $token->token = Context::escape($alias);
-                        $flag = true;
-                    }
-                }
-            }
-        }
-
-        return $statement->build();
-    }
-
-    /**
-     * Generate comment
-     *
-     * @param string $crlf          Carriage return character
-     * @param string $sql_statement SQL statement
-     * @param string $comment1      Comment for dumped table
-     * @param string $comment2      Comment for current table
-     * @param string $table_alias   Table alias
-     * @param string $compat        Compatibility mode
-     *
-     * @return string
-     */
-    protected function generateComment(
-        $crlf,
-        $sql_statement,
-        $comment1,
-        $comment2,
-        $table_alias,
-        $compat
-    ) {
-        if (!isset($sql_statement)) {
-            if (isset($GLOBALS['no_constraints_comments'])) {
-                $sql_statement = '';
-            } else {
-                $sql_statement = $crlf
-                    . $this->_exportComment()
-                    . $this->_exportComment($comment1)
-                    . $this->_exportComment();
-            }
-        }
-
-        // comments for current table
-        if (!isset($GLOBALS['no_constraints_comments'])) {
-            $sql_statement .= $crlf
-                . $this->_exportComment()
-                . $this->_exportComment(
-                    $comment2 . ' ' . Util::backquoteCompat(
-                        $table_alias,
-                        $compat,
-                        isset($GLOBALS['sql_backquotes'])
-                    )
-                )
-                . $this->_exportComment();
-        }
-
-        return $sql_statement;
-    }
-}
diff --git a/#pma/libraries/plugins/export/ExportTexytext.php b/#pma/libraries/plugins/export/ExportTexytext.php
deleted file mode 100644
index 93f96bdc..00000000
--- a/#pma/libraries/plugins/export/ExportTexytext.php
+++ /dev/null
@@ -1,616 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Export to Texy! text.
- *
- * @package    PhpMyAdmin-Export
- * @subpackage Texy!text
- */
-namespace PMA\libraries\plugins\export;
-
-use PMA\libraries\properties\options\items\BoolPropertyItem;
-use PMA\libraries\properties\plugins\ExportPluginProperties;
-use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
-use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
-use PMA\libraries\DatabaseInterface;
-use PMA\libraries\plugins\ExportPlugin;
-use PMA\libraries\Util;
-use PMA\libraries\properties\options\items\RadioPropertyItem;
-use PMA\libraries\properties\options\items\TextPropertyItem;
-
-/**
- * Handles the export for the Texy! text class
- *
- * @package    PhpMyAdmin-Export
- * @subpackage Texy!text
- */
-class ExportTexytext extends ExportPlugin
-{
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        $this->setProperties();
-    }
-
-    /**
-     * Sets the export Texy! text properties
-     *
-     * @return void
-     */
-    protected function setProperties()
-    {
-        $exportPluginProperties = new ExportPluginProperties();
-        $exportPluginProperties->setText('Texy! text');
-        $exportPluginProperties->setExtension('txt');
-        $exportPluginProperties->setMimeType('text/plain');
-        $exportPluginProperties->setOptionsText(__('Options'));
-
-        // create the root group that will be the options field for
-        // $exportPluginProperties
-        // this will be shown as "Format specific options"
-        $exportSpecificOptions = new OptionsPropertyRootGroup(
-            "Format Specific Options"
-        );
-
-        // what to dump (structure/data/both) main group
-        $dumpWhat = new OptionsPropertyMainGroup(
-            "general_opts", __('Dump table')
-        );
-        // create primary items and add them to the group
-        $leaf = new RadioPropertyItem("structure_or_data");
-        $leaf->setValues(
-            array(
-                'structure'          => __('structure'),
-                'data'               => __('data'),
-                'structure_and_data' => __('structure and data'),
-            )
-        );
-        $dumpWhat->addProperty($leaf);
-        // add the main group to the root group
-        $exportSpecificOptions->addProperty($dumpWhat);
-
-        // data options main group
-        $dataOptions = new OptionsPropertyMainGroup(
-            "data", __('Data dump options')
-        );
-        $dataOptions->setForce('structure');
-        // create primary items and add them to the group
-        $leaf = new BoolPropertyItem(
-            "columns",
-            __('Put columns names in the first row')
-        );
-        $dataOptions->addProperty($leaf);
-        $leaf = new TextPropertyItem(
-            'null',
-            __('Replace NULL with:')
-        );
-        $dataOptions->addProperty($leaf);
-        // add the main group to the root group
-        $exportSpecificOptions->addProperty($dataOptions);
-
-        // set the options for the export plugin property item
-        $exportPluginProperties->setOptions($exportSpecificOptions);
-        $this->properties = $exportPluginProperties;
-    }
-
-    /**
-     * Outputs export header
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportHeader()
-    {
-        return true;
-    }
-
-    /**
-     * Outputs export footer
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportFooter()
-    {
-        return true;
-    }
-
-    /**
-     * Outputs database header
-     *
-     * @param string $db       Database name
-     * @param string $db_alias Alias of db
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportDBHeader($db, $db_alias = '')
-    {
-        if (empty($db_alias)) {
-            $db_alias = $db;
-        }
-
-        return PMA_exportOutputHandler(
-            '===' . __('Database') . ' ' . $db_alias . "\n\n"
-        );
-    }
-
-    /**
-     * Outputs database footer
-     *
-     * @param string $db Database name
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportDBFooter($db)
-    {
-        return true;
-    }
-
-    /**
-     * Outputs CREATE DATABASE statement
-     *
-     * @param string $db          Database name
-     * @param string $export_type 'server', 'database', 'table'
-     * @param string $db_alias    Aliases of db
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportDBCreate($db, $export_type, $db_alias = '')
-    {
-        return true;
-    }
-
-    /**
-     * Outputs the content of a table in NHibernate format
-     *
-     * @param string $db        database name
-     * @param string $table     table name
-     * @param string $crlf      the end of line sequence
-     * @param string $error_url the url to go back in case of error
-     * @param string $sql_query SQL query for obtaining data
-     * @param array  $aliases   Aliases of db/table/columns
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportData(
-        $db,
-        $table,
-        $crlf,
-        $error_url,
-        $sql_query,
-        $aliases = array()
-    ) {
-        global $what;
-
-        $db_alias = $db;
-        $table_alias = $table;
-        $this->initAlias($aliases, $db_alias, $table_alias);
-
-        if (!PMA_exportOutputHandler(
-            '== ' . __('Dumping data for table') . ' ' . $table_alias . "\n\n"
-        )
-        ) {
-            return false;
-        }
-
-        // Gets the data from the database
-        $result = $GLOBALS['dbi']->query(
-            $sql_query,
-            null,
-            DatabaseInterface::QUERY_UNBUFFERED
-        );
-        $fields_cnt = $GLOBALS['dbi']->numFields($result);
-
-        // If required, get fields name at the first line
-        if (isset($GLOBALS[$what . '_columns'])) {
-            $text_output = "|------\n";
-            for ($i = 0; $i < $fields_cnt; $i++) {
-                $col_as = $GLOBALS['dbi']->fieldName($result, $i);
-                if (!empty($aliases[$db]['tables'][$table]['columns'][$col_as])) {
-                    $col_as = $aliases[$db]['tables'][$table]['columns'][$col_as];
-                }
-                $text_output .= '|'
-                    . htmlspecialchars(stripslashes($col_as));
-            } // end for
-            $text_output .= "\n|------\n";
-            if (!PMA_exportOutputHandler($text_output)) {
-                return false;
-            }
-        } // end if
-
-        // Format the data
-        while ($row = $GLOBALS['dbi']->fetchRow($result)) {
-            $text_output = '';
-            for ($j = 0; $j < $fields_cnt; $j++) {
-                if (!isset($row[$j]) || is_null($row[$j])) {
-                    $value = $GLOBALS[$what . '_null'];
-                } elseif ($row[$j] == '0' || $row[$j] != '') {
-                    $value = $row[$j];
-                } else {
-                    $value = ' ';
-                }
-                $text_output .= '|'
-                    . str_replace(
-                        '|',
-                        '&#124;',
-                        htmlspecialchars($value)
-                    );
-            } // end for
-            $text_output .= "\n";
-            if (!PMA_exportOutputHandler($text_output)) {
-                return false;
-            }
-        } // end while
-        $GLOBALS['dbi']->freeResult($result);
-
-        return true;
-    }
-
-    /**
-     * Returns a stand-in CREATE definition to resolve view dependencies
-     *
-     * @param string $db      the database name
-     * @param string $view    the view name
-     * @param string $crlf    the end of line sequence
-     * @param array  $aliases Aliases of db/table/columns
-     *
-     * @return string resulting definition
-     */
-    public function getTableDefStandIn($db, $view, $crlf, $aliases = array())
-    {
-        $text_output = '';
-
-        /**
-         * Get the unique keys in the table
-         */
-        $unique_keys = array();
-        $keys = $GLOBALS['dbi']->getTableIndexes($db, $view);
-        foreach ($keys as $key) {
-            if ($key['Non_unique'] == 0) {
-                $unique_keys[] = $key['Column_name'];
-            }
-        }
-
-        /**
-         * Gets fields properties
-         */
-        $GLOBALS['dbi']->selectDb($db);
-
-        /**
-         * Displays the table structure
-         */
-
-        $text_output .= "|------\n"
-            . '|' . __('Column')
-            . '|' . __('Type')
-            . '|' . __('Null')
-            . '|' . __('Default')
-            . "\n|------\n";
-
-        $columns = $GLOBALS['dbi']->getColumns($db, $view);
-        foreach ($columns as $column) {
-            $col_as = $column['Field'];
-            if (!empty($aliases[$db]['tables'][$view]['columns'][$col_as])) {
-                $col_as = $aliases[$db]['tables'][$view]['columns'][$col_as];
-            }
-            $text_output .= $this->formatOneColumnDefinition(
-                $column,
-                $unique_keys,
-                $col_as
-            );
-            $text_output .= "\n";
-        } // end foreach
-
-        return $text_output;
-    }
-
-    /**
-     * Returns $table's CREATE definition
-     *
-     * @param string $db            the database name
-     * @param string $table         the table name
-     * @param string $crlf          the end of line sequence
-     * @param string $error_url     the url to go back in case of error
-     * @param bool   $do_relation   whether to include relation comments
-     * @param bool   $do_comments   whether to include the pmadb-style column
-     *                              comments as comments in the structure;
-     *                              this is deprecated but the parameter is
-     *                              left here because export.php calls
-     *                              $this->exportStructure() also for other
-     *                              export types which use this parameter
-     * @param bool   $do_mime       whether to include mime comments
-     * @param bool   $show_dates    whether to include creation/update/check dates
-     * @param bool   $add_semicolon whether to add semicolon and end-of-line
-     *                              at the end
-     * @param bool   $view          whether we're handling a view
-     * @param array  $aliases       Aliases of db/table/columns
-     *
-     * @return string resulting schema
-     */
-    public function getTableDef(
-        $db,
-        $table,
-        $crlf,
-        $error_url,
-        $do_relation,
-        $do_comments,
-        $do_mime,
-        $show_dates = false,
-        $add_semicolon = true,
-        $view = false,
-        $aliases = array()
-    ) {
-        global $cfgRelation;
-
-        $text_output = '';
-
-        /**
-         * Get the unique keys in the table
-         */
-        $unique_keys = array();
-        $keys = $GLOBALS['dbi']->getTableIndexes($db, $table);
-        foreach ($keys as $key) {
-            if ($key['Non_unique'] == 0) {
-                $unique_keys[] = $key['Column_name'];
-            }
-        }
-
-        /**
-         * Gets fields properties
-         */
-        $GLOBALS['dbi']->selectDb($db);
-
-        // Check if we can use Relations
-        list($res_rel, $have_rel) = PMA_getRelationsAndStatus(
-            $do_relation && !empty($cfgRelation['relation']),
-            $db,
-            $table
-        );
-
-        /**
-         * Displays the table structure
-         */
-
-        $text_output .= "|------\n";
-        $text_output .= '|' . __('Column');
-        $text_output .= '|' . __('Type');
-        $text_output .= '|' . __('Null');
-        $text_output .= '|' . __('Default');
-        if ($do_relation && $have_rel) {
-            $text_output .= '|' . __('Links to');
-        }
-        if ($do_comments) {
-            $text_output .= '|' . __('Comments');
-            $comments = PMA_getComments($db, $table);
-        }
-        if ($do_mime && $cfgRelation['mimework']) {
-            $text_output .= '|' . htmlspecialchars('MIME');
-            $mime_map = PMA_getMIME($db, $table, true);
-        }
-        $text_output .= "\n|------\n";
-
-        $columns = $GLOBALS['dbi']->getColumns($db, $table);
-        foreach ($columns as $column) {
-            $col_as = $column['Field'];
-            if (!empty($aliases[$db]['tables'][$table]['columns'][$col_as])) {
-                $col_as = $aliases[$db]['tables'][$table]['columns'][$col_as];
-            }
-            $text_output .= $this->formatOneColumnDefinition(
-                $column,
-                $unique_keys,
-                $col_as
-            );
-            $field_name = $column['Field'];
-            if ($do_relation && $have_rel) {
-                $text_output .= '|' . htmlspecialchars(
-                    $this->getRelationString(
-                        $res_rel,
-                        $field_name,
-                        $db,
-                        $aliases
-                    )
-                );
-            }
-            if ($do_comments && $cfgRelation['commwork']) {
-                $text_output .= '|'
-                    . (isset($comments[$field_name])
-                        ? htmlspecialchars($comments[$field_name])
-                        : '');
-            }
-            if ($do_mime && $cfgRelation['mimework']) {
-                $text_output .= '|'
-                    . (isset($mime_map[$field_name])
-                        ? htmlspecialchars(
-                            str_replace('_', '/', $mime_map[$field_name]['mimetype'])
-                        )
-                        : '');
-            }
-
-            $text_output .= "\n";
-        } // end foreach
-
-        return $text_output;
-    } // end of the '$this->getTableDef()' function
-
-    /**
-     * Outputs triggers
-     *
-     * @param string $db    database name
-     * @param string $table table name
-     *
-     * @return string Formatted triggers list
-     */
-    public function getTriggers($db, $table)
-    {
-        $dump = "|------\n";
-        $dump .= '|' . __('Name');
-        $dump .= '|' . __('Time');
-        $dump .= '|' . __('Event');
-        $dump .= '|' . __('Definition');
-        $dump .= "\n|------\n";
-
-        $triggers = $GLOBALS['dbi']->getTriggers($db, $table);
-
-        foreach ($triggers as $trigger) {
-            $dump .= '|' . $trigger['name'];
-            $dump .= '|' . $trigger['action_timing'];
-            $dump .= '|' . $trigger['event_manipulation'];
-            $dump .= '|' .
-                str_replace(
-                    '|',
-                    '&#124;',
-                    htmlspecialchars($trigger['definition'])
-                );
-            $dump .= "\n";
-        }
-
-        return $dump;
-    }
-
-    /**
-     * Outputs table's structure
-     *
-     * @param string $db          database name
-     * @param string $table       table name
-     * @param string $crlf        the end of line sequence
-     * @param string $error_url   the url to go back in case of error
-     * @param string $export_mode 'create_table', 'triggers', 'create_view',
-     *                            'stand_in'
-     * @param string $export_type 'server', 'database', 'table'
-     * @param bool   $do_relation whether to include relation comments
-     * @param bool   $do_comments whether to include the pmadb-style column
-     *                            comments as comments in the structure;
-     *                            this is deprecated but the parameter is
-     *                            left here because export.php calls
-     *                            $this->exportStructure() also for other
-     *                            export types which use this parameter
-     * @param bool   $do_mime     whether to include mime comments
-     * @param bool   $dates       whether to include creation/update/check dates
-     * @param array  $aliases     Aliases of db/table/columns
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportStructure(
-        $db,
-        $table,
-        $crlf,
-        $error_url,
-        $export_mode,
-        $export_type,
-        $do_relation = false,
-        $do_comments = false,
-        $do_mime = false,
-        $dates = false,
-        $aliases = array()
-    ) {
-        $db_alias = $db;
-        $table_alias = $table;
-        $this->initAlias($aliases, $db_alias, $table_alias);
-        $dump = '';
-
-        switch ($export_mode) {
-        case 'create_table':
-            $dump .= '== ' . __('Table structure for table') . ' '
-                . $table_alias . "\n\n";
-            $dump .= $this->getTableDef(
-                $db,
-                $table,
-                $crlf,
-                $error_url,
-                $do_relation,
-                $do_comments,
-                $do_mime,
-                $dates,
-                true,
-                false,
-                $aliases
-            );
-            break;
-        case 'triggers':
-            $dump = '';
-            $triggers = $GLOBALS['dbi']->getTriggers($db, $table);
-            if ($triggers) {
-                $dump .= '== ' . __('Triggers') . ' ' . $table_alias . "\n\n";
-                $dump .= $this->getTriggers($db, $table);
-            }
-            break;
-        case 'create_view':
-            $dump .= '== ' . __('Structure for view') . ' ' . $table_alias . "\n\n";
-            $dump .= $this->getTableDef(
-                $db,
-                $table,
-                $crlf,
-                $error_url,
-                $do_relation,
-                $do_comments,
-                $do_mime,
-                $dates,
-                true,
-                true,
-                $aliases
-            );
-            break;
-        case 'stand_in':
-            $dump .= '== ' . __('Stand-in structure for view')
-                . ' ' . $table . "\n\n";
-            // export a stand-in definition to resolve view dependencies
-            $dump .= $this->getTableDefStandIn($db, $table, $crlf, $aliases);
-        } // end switch
-
-        return PMA_exportOutputHandler($dump);
-    }
-
-    /**
-     * Formats the definition for one column
-     *
-     * @param array  $column      info about this column
-     * @param array  $unique_keys unique keys for this table
-     * @param string $col_alias   Column Alias
-     *
-     * @return string Formatted column definition
-     */
-    public function formatOneColumnDefinition(
-        $column,
-        $unique_keys,
-        $col_alias = ''
-    ) {
-        if (empty($col_alias)) {
-            $col_alias = $column['Field'];
-        }
-        $extracted_columnspec
-            = Util::extractColumnSpec($column['Type']);
-        $type = $extracted_columnspec['print_type'];
-        if (empty($type)) {
-            $type = '&nbsp;';
-        }
-
-        if (!isset($column['Default'])) {
-            if ($column['Null'] != 'NO') {
-                $column['Default'] = 'NULL';
-            }
-        }
-
-        $fmt_pre = '';
-        $fmt_post = '';
-        if (in_array($column['Field'], $unique_keys)) {
-            $fmt_pre = '**' . $fmt_pre;
-            $fmt_post = $fmt_post . '**';
-        }
-        if ($column['Key'] == 'PRI') {
-            $fmt_pre = '//' . $fmt_pre;
-            $fmt_post = $fmt_post . '//';
-        }
-        $definition = '|'
-            . $fmt_pre . htmlspecialchars($col_alias) . $fmt_post;
-        $definition .= '|' . htmlspecialchars($type);
-        $definition .= '|'
-            . (($column['Null'] == '' || $column['Null'] == 'NO')
-                ? __('No') : __('Yes'));
-        $definition .= '|'
-            . htmlspecialchars(
-                isset($column['Default']) ? $column['Default'] : ''
-            );
-
-        return $definition;
-    }
-}
diff --git a/#pma/libraries/plugins/export/ExportXml.php b/#pma/libraries/plugins/export/ExportXml.php
deleted file mode 100644
index 3878b33a..00000000
--- a/#pma/libraries/plugins/export/ExportXml.php
+++ /dev/null
@@ -1,577 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Set of functions used to build XML dumps of tables
- *
- * @package    PhpMyAdmin-Export
- * @subpackage XML
- */
-namespace PMA\libraries\plugins\export;
-
-use PMA\libraries\properties\options\items\BoolPropertyItem;
-use PMA\libraries\properties\plugins\ExportPluginProperties;
-use PMA\libraries\properties\options\items\HiddenPropertyItem;
-use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
-use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
-use PMA\libraries\DatabaseInterface;
-use PMA\libraries\plugins\ExportPlugin;
-use PMA\libraries\Util;
-
-if (!mb_strlen($GLOBALS['db'])) { /* Can't do server export */
-    $GLOBALS['skip_import'] = true;
-    return;
-}
-
-/**
- * Handles the export for the XML class
- *
- * @package    PhpMyAdmin-Export
- * @subpackage XML
- */
-class ExportXml extends ExportPlugin
-{
-    /**
-     * Table name
-     *
-     * @var string
-     */
-    private $_table;
-    /**
-     * Table names
-     *
-     * @var array
-     */
-    private $_tables;
-
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        $this->setProperties();
-    }
-
-    /**
-     * Initialize the local variables that are used for export PDF
-     *
-     * @return void
-     */
-    protected function initSpecificVariables()
-    {
-        global $table, $tables;
-        $this->_setTable($table);
-        $this->_setTables($tables);
-    }
-
-    /**
-     * Sets the export XML properties
-     *
-     * @return void
-     */
-    protected function setProperties()
-    {
-        // create the export plugin property item
-        $exportPluginProperties = new ExportPluginProperties();
-        $exportPluginProperties->setText('XML');
-        $exportPluginProperties->setExtension('xml');
-        $exportPluginProperties->setMimeType('text/xml');
-        $exportPluginProperties->setOptionsText(__('Options'));
-
-        // create the root group that will be the options field for
-        // $exportPluginProperties
-        // this will be shown as "Format specific options"
-        $exportSpecificOptions = new OptionsPropertyRootGroup(
-            "Format Specific Options"
-        );
-
-        // general options main group
-        $generalOptions = new OptionsPropertyMainGroup("general_opts");
-        // create primary items and add them to the group
-        $leaf = new HiddenPropertyItem("structure_or_data");
-        $generalOptions->addProperty($leaf);
-        // add the main group to the root group
-        $exportSpecificOptions->addProperty($generalOptions);
-
-        // export structure main group
-        $structure = new OptionsPropertyMainGroup(
-            "structure", __('Object creation options (all are recommended)')
-        );
-
-        // create primary items and add them to the group
-        $leaf = new BoolPropertyItem(
-            "export_events",
-            __('Events')
-        );
-        $structure->addProperty($leaf);
-        $leaf = new BoolPropertyItem(
-            "export_functions",
-            __('Functions')
-        );
-        $structure->addProperty($leaf);
-        $leaf = new BoolPropertyItem(
-            "export_procedures",
-            __('Procedures')
-        );
-        $structure->addProperty($leaf);
-        $leaf = new BoolPropertyItem(
-            "export_tables",
-            __('Tables')
-        );
-        $structure->addProperty($leaf);
-        $leaf = new BoolPropertyItem(
-            "export_triggers",
-            __('Triggers')
-        );
-        $structure->addProperty($leaf);
-        $leaf = new BoolPropertyItem(
-            "export_views",
-            __('Views')
-        );
-        $structure->addProperty($leaf);
-        $exportSpecificOptions->addProperty($structure);
-
-        // data main group
-        $data = new OptionsPropertyMainGroup(
-            "data", __('Data dump options')
-        );
-        // create primary items and add them to the group
-        $leaf = new BoolPropertyItem(
-            "export_contents",
-            __('Export contents')
-        );
-        $data->addProperty($leaf);
-        $exportSpecificOptions->addProperty($data);
-
-        // set the options for the export plugin property item
-        $exportPluginProperties->setOptions($exportSpecificOptions);
-        $this->properties = $exportPluginProperties;
-    }
-
-    /**
-     * Generates output for SQL defintions of routines
-     *
-     * @param string $db      Database name
-     * @param string $type    Item type to be used in XML output
-     * @param string $dbitype Item type used in DBI qieries
-     *
-     * @return string XML with definitions
-     */
-    private function _exportRoutines($db, $type, $dbitype)
-    {
-        // Export routines
-        $routines = $GLOBALS['dbi']->getProceduresOrFunctions(
-            $db,
-            $dbitype
-        );
-        return $this->_exportDefinitions($db, $type, $dbitype, $routines);
-    }
-
-    /**
-     * Generates output for SQL defintions
-     *
-     * @param string $db      Database name
-     * @param string $type    Item type to be used in XML output
-     * @param string $dbitype Item type used in DBI qieries
-     * @param array  $names   Names of items to export
-     *
-     * @return string XML with definitions
-     */
-    private function _exportDefinitions($db, $type, $dbitype, $names)
-    {
-        global $crlf;
-
-        $head = '';
-
-        if ($names) {
-            foreach ($names as $name) {
-                $head .= '            <pma:' . $type . ' name="'
-                    . htmlspecialchars($name) . '">' . $crlf;
-
-                // Do some formatting
-                $sql = $GLOBALS['dbi']->getDefinition($db, $dbitype, $name);
-                $sql = htmlspecialchars(rtrim($sql));
-                $sql = str_replace("\n", "\n                ", $sql);
-
-                $head .= "                " . $sql . $crlf;
-                $head .= '            </pma:' . $type . '>' . $crlf;
-            }
-        }
-
-        return $head;
-    }
-
-    /**
-     * Outputs export header. It is the first method to be called, so all
-     * the required variables are initialized here.
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportHeader()
-    {
-        $this->initSpecificVariables();
-        global $crlf, $cfg, $db;
-        $table = $this->_getTable();
-        $tables = $this->_getTables();
-
-        $export_struct = isset($GLOBALS['xml_export_functions'])
-            || isset($GLOBALS['xml_export_procedures'])
-            || isset($GLOBALS['xml_export_tables'])
-            || isset($GLOBALS['xml_export_triggers'])
-            || isset($GLOBALS['xml_export_views']);
-        $export_data = isset($GLOBALS['xml_export_contents']) ? true : false;
-
-        if ($GLOBALS['output_charset_conversion']) {
-            $charset = $GLOBALS['charset'];
-        } else {
-            $charset = 'utf-8';
-        }
-
-        $head = '<?xml version="1.0" encoding="' . $charset . '"?>' . $crlf
-            . '<!--' . $crlf
-            . '- phpMyAdmin XML Dump' . $crlf
-            . '- version ' . PMA_VERSION . $crlf
-            . '- https://www.phpmyadmin.net' . $crlf
-            . '-' . $crlf
-            . '- ' . __('Host:') . ' ' . htmlspecialchars($cfg['Server']['host']);
-        if (!empty($cfg['Server']['port'])) {
-            $head .= ':' . $cfg['Server']['port'];
-        }
-        $head .= $crlf
-            . '- ' . __('Generation Time:') . ' '
-            . Util::localisedDate() . $crlf
-            . '- ' . __('Server version:') . ' ' . PMA_MYSQL_STR_VERSION . $crlf
-            . '- ' . __('PHP Version:') . ' ' . phpversion() . $crlf
-            . '-->' . $crlf . $crlf;
-
-        $head .= '<pma_xml_export version="1.0"'
-            . (($export_struct)
-                ? ' xmlns:pma="https://www.phpmyadmin.net/some_doc_url/"'
-                : '')
-            . '>' . $crlf;
-
-        if ($export_struct) {
-            $result = $GLOBALS['dbi']->fetchResult(
-                'SELECT `DEFAULT_CHARACTER_SET_NAME`, `DEFAULT_COLLATION_NAME`'
-                . ' FROM `information_schema`.`SCHEMATA` WHERE `SCHEMA_NAME`'
-                . ' = \'' . $GLOBALS['dbi']->escapeString($db) . '\' LIMIT 1'
-            );
-            $db_collation = $result[0]['DEFAULT_COLLATION_NAME'];
-            $db_charset = $result[0]['DEFAULT_CHARACTER_SET_NAME'];
-
-            $head .= '    <!--' . $crlf;
-            $head .= '    - Structure schemas' . $crlf;
-            $head .= '    -->' . $crlf;
-            $head .= '    <pma:structure_schemas>' . $crlf;
-            $head .= '        <pma:database name="' . htmlspecialchars($db)
-                . '" collation="' . htmlspecialchars($db_collation) . '" charset="' . htmlspecialchars($db_charset)
-                . '">' . $crlf;
-
-            if (count($tables) == 0) {
-                $tables[] = $table;
-            }
-
-            foreach ($tables as $table) {
-                // Export tables and views
-                $result = $GLOBALS['dbi']->fetchResult(
-                    'SHOW CREATE TABLE ' . Util::backquote($db) . '.'
-                    . Util::backquote($table),
-                    0
-                );
-                $tbl = $result[$table][1];
-
-                $is_view = $GLOBALS['dbi']->getTable($db, $table)
-                    ->isView();
-
-                if ($is_view) {
-                    $type = 'view';
-                } else {
-                    $type = 'table';
-                }
-
-                if ($is_view && !isset($GLOBALS['xml_export_views'])) {
-                    continue;
-                }
-
-                if (!$is_view && !isset($GLOBALS['xml_export_tables'])) {
-                    continue;
-                }
-
-                $head .= '            <pma:' . $type . ' name="' . htmlspecialchars($table) . '">'
-                    . $crlf;
-
-                $tbl = "                " . htmlspecialchars($tbl);
-                $tbl = str_replace("\n", "\n                ", $tbl);
-
-                $head .= $tbl . ';' . $crlf;
-                $head .= '            </pma:' . $type . '>' . $crlf;
-
-                if (isset($GLOBALS['xml_export_triggers'])
-                    && $GLOBALS['xml_export_triggers']
-                ) {
-                    // Export triggers
-                    $triggers = $GLOBALS['dbi']->getTriggers($db, $table);
-                    if ($triggers) {
-                        foreach ($triggers as $trigger) {
-                            $code = $trigger['create'];
-                            $head .= '            <pma:trigger name="'
-                                . htmlspecialchars($trigger['name']) . '">' . $crlf;
-
-                            // Do some formatting
-                            $code = mb_substr(rtrim($code), 0, -3);
-                            $code = "                " . htmlspecialchars($code);
-                            $code = str_replace("\n", "\n                ", $code);
-
-                            $head .= $code . $crlf;
-                            $head .= '            </pma:trigger>' . $crlf;
-                        }
-
-                        unset($trigger);
-                        unset($triggers);
-                    }
-                }
-            }
-
-            if (isset($GLOBALS['xml_export_functions'])
-                && $GLOBALS['xml_export_functions']
-            ) {
-                $head .= $this->_exportRoutines($db, 'function', 'FUNCTION');
-            }
-
-            if (isset($GLOBALS['xml_export_procedures'])
-                && $GLOBALS['xml_export_procedures']
-            ) {
-                $head .= $this->_exportRoutines($db, 'procedure', 'PROCEDURE');
-            }
-
-            if (isset($GLOBALS['xml_export_events'])
-                && $GLOBALS['xml_export_events']
-            ) {
-                // Export events
-                $events = $GLOBALS['dbi']->fetchResult(
-                    "SELECT EVENT_NAME FROM information_schema.EVENTS "
-                    . "WHERE EVENT_SCHEMA='" . $GLOBALS['dbi']->escapeString($db)
-                    . "'"
-                );
-                $head .= $this->_exportDefinitions(
-                    $db, 'event', 'EVENT', $events
-                );
-            }
-
-            unset($result);
-
-            $head .= '        </pma:database>' . $crlf;
-            $head .= '    </pma:structure_schemas>' . $crlf;
-
-            if ($export_data) {
-                $head .= $crlf;
-            }
-        }
-
-        return PMA_exportOutputHandler($head);
-    }
-
-    /**
-     * Outputs export footer
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportFooter()
-    {
-        $foot = '</pma_xml_export>';
-
-        return PMA_exportOutputHandler($foot);
-    }
-
-    /**
-     * Outputs database header
-     *
-     * @param string $db       Database name
-     * @param string $db_alias Aliases of db
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportDBHeader($db, $db_alias = '')
-    {
-        global $crlf;
-
-        if (empty($db_alias)) {
-            $db_alias = $db;
-        }
-        if (isset($GLOBALS['xml_export_contents'])
-            && $GLOBALS['xml_export_contents']
-        ) {
-            $head = '    <!--' . $crlf
-                . '    - ' . __('Database:') . ' ' . '\''
-                . htmlspecialchars($db_alias) . '\'' . $crlf
-                . '    -->' . $crlf . '    <database name="'
-                . htmlspecialchars($db_alias) . '">' . $crlf;
-
-            return PMA_exportOutputHandler($head);
-        } else {
-            return true;
-        }
-    }
-
-    /**
-     * Outputs database footer
-     *
-     * @param string $db Database name
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportDBFooter($db)
-    {
-        global $crlf;
-
-        if (isset($GLOBALS['xml_export_contents'])
-            && $GLOBALS['xml_export_contents']
-        ) {
-            return PMA_exportOutputHandler('    </database>' . $crlf);
-        } else {
-            return true;
-        }
-    }
-
-    /**
-     * Outputs CREATE DATABASE statement
-     *
-     * @param string $db          Database name
-     * @param string $export_type 'server', 'database', 'table'
-     * @param string $db_alias    Aliases of db
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportDBCreate($db, $export_type, $db_alias = '')
-    {
-        return true;
-    }
-
-    /**
-     * Outputs the content of a table in XML format
-     *
-     * @param string $db        database name
-     * @param string $table     table name
-     * @param string $crlf      the end of line sequence
-     * @param string $error_url the url to go back in case of error
-     * @param string $sql_query SQL query for obtaining data
-     * @param array  $aliases   Aliases of db/table/columns
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportData(
-        $db,
-        $table,
-        $crlf,
-        $error_url,
-        $sql_query,
-        $aliases = array()
-    ) {
-        // Do not export data for merge tables
-        if ($GLOBALS['dbi']->getTable($db, $table)->isMerge()) {
-            return true;
-        }
-
-        $db_alias = $db;
-        $table_alias = $table;
-        $this->initAlias($aliases, $db_alias, $table_alias);
-        if (isset($GLOBALS['xml_export_contents'])
-            && $GLOBALS['xml_export_contents']
-        ) {
-            $result = $GLOBALS['dbi']->query(
-                $sql_query,
-                null,
-                DatabaseInterface::QUERY_UNBUFFERED
-            );
-
-            $columns_cnt = $GLOBALS['dbi']->numFields($result);
-            $columns = array();
-            for ($i = 0; $i < $columns_cnt; $i++) {
-                $columns[$i] = stripslashes($GLOBALS['dbi']->fieldName($result, $i));
-            }
-            unset($i);
-
-            $buffer = '        <!-- ' . __('Table') . ' '
-                . htmlspecialchars($table_alias) . ' -->' . $crlf;
-            if (!PMA_exportOutputHandler($buffer)) {
-                return false;
-            }
-
-            while ($record = $GLOBALS['dbi']->fetchRow($result)) {
-                $buffer = '        <table name="'
-                    . htmlspecialchars($table_alias) . '">' . $crlf;
-                for ($i = 0; $i < $columns_cnt; $i++) {
-                    $col_as = $columns[$i];
-                    if (!empty($aliases[$db]['tables'][$table]['columns'][$col_as])
-                    ) {
-                        $col_as
-                            = $aliases[$db]['tables'][$table]['columns'][$col_as];
-                    }
-                    // If a cell is NULL, still export it to preserve
-                    // the XML structure
-                    if (!isset($record[$i]) || is_null($record[$i])) {
-                        $record[$i] = 'NULL';
-                    }
-                    $buffer .= '            <column name="'
-                        . htmlspecialchars($col_as) . '">'
-                        . htmlspecialchars((string)$record[$i])
-                        . '</column>' . $crlf;
-                }
-                $buffer .= '        </table>' . $crlf;
-
-                if (!PMA_exportOutputHandler($buffer)) {
-                    return false;
-                }
-            }
-            $GLOBALS['dbi']->freeResult($result);
-        }
-
-        return true;
-    }
-
-
-    /* ~~~~~~~~~~~~~~~~~~~~ Getters and Setters ~~~~~~~~~~~~~~~~~~~~ */
-
-    /**
-     * Gets the table name
-     *
-     * @return string
-     */
-    private function _getTable()
-    {
-        return $this->_table;
-    }
-
-    /**
-     * Sets the table name
-     *
-     * @param string $table table name
-     *
-     * @return void
-     */
-    private function _setTable($table)
-    {
-        $this->_table = $table;
-    }
-
-    /**
-     * Gets the table names
-     *
-     * @return array
-     */
-    private function _getTables()
-    {
-        return $this->_tables;
-    }
-
-    /**
-     * Sets the table names
-     *
-     * @param array $tables table names
-     *
-     * @return void
-     */
-    private function _setTables($tables)
-    {
-        $this->_tables = $tables;
-    }
-}
diff --git a/#pma/libraries/plugins/export/ExportYaml.php b/#pma/libraries/plugins/export/ExportYaml.php
deleted file mode 100644
index 6689b864..00000000
--- a/#pma/libraries/plugins/export/ExportYaml.php
+++ /dev/null
@@ -1,217 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Set of functions used to build YAML dumps of tables
- *
- * @package    PhpMyAdmin-Export
- * @subpackage YAML
- */
-
-namespace PMA\libraries\plugins\export;
-
-use PMA\libraries\plugins\ExportPlugin;
-use PMA\libraries\properties\plugins\ExportPluginProperties;
-use PMA\libraries\properties\options\items\HiddenPropertyItem;
-use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
-use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
-use PMA;
-
-/**
- * Handles the export for the YAML format
- *
- * @package    PhpMyAdmin-Export
- * @subpackage YAML
- */
-class ExportYaml extends ExportPlugin
-{
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        $this->setProperties();
-    }
-
-    /**
-     * Sets the export YAML properties
-     *
-     * @return void
-     */
-    protected function setProperties()
-    {
-        $exportPluginProperties = new ExportPluginProperties();
-        $exportPluginProperties->setText('YAML');
-        $exportPluginProperties->setExtension('yml');
-        $exportPluginProperties->setMimeType('text/yaml');
-        $exportPluginProperties->setForceFile(true);
-        $exportPluginProperties->setOptionsText(__('Options'));
-
-        // create the root group that will be the options field for
-        // $exportPluginProperties
-        // this will be shown as "Format specific options"
-        $exportSpecificOptions = new OptionsPropertyRootGroup(
-            "Format Specific Options"
-        );
-
-        // general options main group
-        $generalOptions = new OptionsPropertyMainGroup("general_opts");
-        // create primary items and add them to the group
-        $leaf = new HiddenPropertyItem("structure_or_data");
-        $generalOptions->addProperty($leaf);
-        // add the main group to the root group
-        $exportSpecificOptions->addProperty($generalOptions);
-
-        // set the options for the export plugin property item
-        $exportPluginProperties->setOptions($exportSpecificOptions);
-        $this->properties = $exportPluginProperties;
-    }
-
-    /**
-     * Outputs export header
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportHeader()
-    {
-        PMA_exportOutputHandler(
-            '%YAML 1.1' . $GLOBALS['crlf'] . '---' . $GLOBALS['crlf']
-        );
-
-        return true;
-    }
-
-    /**
-     * Outputs export footer
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportFooter()
-    {
-        PMA_exportOutputHandler('...' . $GLOBALS['crlf']);
-
-        return true;
-    }
-
-    /**
-     * Outputs database header
-     *
-     * @param string $db       Database name
-     * @param string $db_alias Aliases of db
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportDBHeader($db, $db_alias = '')
-    {
-        return true;
-    }
-
-    /**
-     * Outputs database footer
-     *
-     * @param string $db Database name
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportDBFooter($db)
-    {
-        return true;
-    }
-
-    /**
-     * Outputs CREATE DATABASE statement
-     *
-     * @param string $db          Database name
-     * @param string $export_type 'server', 'database', 'table'
-     * @param string $db_alias    Aliases of db
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportDBCreate($db, $export_type, $db_alias = '')
-    {
-        return true;
-    }
-
-    /**
-     * Outputs the content of a table in JSON format
-     *
-     * @param string $db        database name
-     * @param string $table     table name
-     * @param string $crlf      the end of line sequence
-     * @param string $error_url the url to go back in case of error
-     * @param string $sql_query SQL query for obtaining data
-     * @param array  $aliases   Aliases of db/table/columns
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportData(
-        $db,
-        $table,
-        $crlf,
-        $error_url,
-        $sql_query,
-        $aliases = array()
-    ) {
-        $db_alias = $db;
-        $table_alias = $table;
-        $this->initAlias($aliases, $db_alias, $table_alias);
-        $result = $GLOBALS['dbi']->query(
-            $sql_query,
-            null,
-            PMA\libraries\DatabaseInterface::QUERY_UNBUFFERED
-        );
-
-        $columns_cnt = $GLOBALS['dbi']->numFields($result);
-        $columns = array();
-        for ($i = 0; $i < $columns_cnt; $i++) {
-            $col_as = $GLOBALS['dbi']->fieldName($result, $i);
-            if (!empty($aliases[$db]['tables'][$table]['columns'][$col_as])) {
-                $col_as = $aliases[$db]['tables'][$table]['columns'][$col_as];
-            }
-            $columns[$i] = stripslashes($col_as);
-        }
-
-        $buffer = '';
-        $record_cnt = 0;
-        while ($record = $GLOBALS['dbi']->fetchRow($result)) {
-            $record_cnt++;
-
-            // Output table name as comment if this is the first record of the table
-            if ($record_cnt == 1) {
-                $buffer = '# ' . $db_alias . '.' . $table_alias . $crlf;
-                $buffer .= '-' . $crlf;
-            } else {
-                $buffer = '-' . $crlf;
-            }
-
-            for ($i = 0; $i < $columns_cnt; $i++) {
-                if (!isset($record[$i])) {
-                    continue;
-                }
-
-                if (is_null($record[$i])) {
-                    $buffer .= '  ' . $columns[$i] . ': null' . $crlf;
-                    continue;
-                }
-
-                if (is_numeric($record[$i])) {
-                    $buffer .= '  ' . $columns[$i] . ': ' . $record[$i] . $crlf;
-                    continue;
-                }
-
-                $record[$i] = str_replace(
-                    array('\\', '"', "\n", "\r"),
-                    array('\\\\', '\"', '\n', '\r'),
-                    $record[$i]
-                );
-                $buffer .= '  ' . $columns[$i] . ': "' . $record[$i] . '"' . $crlf;
-            }
-
-            if (!PMA_exportOutputHandler($buffer)) {
-                return false;
-            }
-        }
-        $GLOBALS['dbi']->freeResult($result);
-
-        return true;
-    } // end getTableYAML
-}
diff --git a/#pma/libraries/plugins/export/PMA_ExportPdf.php b/#pma/libraries/plugins/export/PMA_ExportPdf.php
deleted file mode 100644
index c553be62..00000000
--- a/#pma/libraries/plugins/export/PMA_ExportPdf.php
+++ /dev/null
@@ -1,811 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * PMA\libraries\plugins\export\TableProperty class
- *
- * @package    PhpMyAdmin-Export
- * @subpackage PDF
- */
-namespace PMA\libraries\plugins\export;
-
-use PMA\libraries\DatabaseInterface;
-use PMA\libraries\PDF;
-use PMA\libraries\Util;
-use TCPDF_STATIC;
-
-/**
- * Adapted from a LGPL script by Philip Clarke
- *
- * @package    PhpMyAdmin-Export
- * @subpackage PDF
- */
-class PMA_ExportPdf extends PDF
-{
-    var $tablewidths;
-    var $headerset;
-
-    /**
-     * Add page if needed.
-     *
-     * @param float|int $h       cell height. Default value: 0
-     * @param mixed     $y       starting y position, leave empty for current
-     *                           position
-     * @param boolean   $addpage if true add a page, otherwise only return
-     *                           the true/false state
-     *
-     * @return boolean true in case of page break, false otherwise.
-     */
-    public function checkPageBreak($h = 0, $y = '', $addpage = true)
-    {
-        if (TCPDF_STATIC::empty_string($y)) {
-            $y = $this->y;
-        }
-        $current_page = $this->page;
-        if ((($y + $h) > $this->PageBreakTrigger)
-            && (!$this->InFooter)
-            && ($this->AcceptPageBreak())
-        ) {
-            if ($addpage) {
-                //Automatic page break
-                $x = $this->x;
-                $this->AddPage($this->CurOrientation);
-                $this->y = $this->dataY;
-                $oldpage = $this->page - 1;
-
-                $this_page_orm = $this->pagedim[$this->page]['orm'];
-                $old_page_orm = $this->pagedim[$oldpage]['orm'];
-                $this_page_olm = $this->pagedim[$this->page]['olm'];
-                $old_page_olm = $this->pagedim[$oldpage]['olm'];
-                if ($this->rtl) {
-                    if ($this_page_orm != $old_page_orm) {
-                        $this->x = $x - ($this_page_orm - $old_page_orm);
-                    } else {
-                        $this->x = $x;
-                    }
-                } else {
-                    if ($this_page_olm != $old_page_olm) {
-                        $this->x = $x + ($this_page_olm - $old_page_olm);
-                    } else {
-                        $this->x = $x;
-                    }
-                }
-            }
-
-            return true;
-        }
-        if ($current_page != $this->page) {
-            // account for columns mode
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * This method is used to render the page header.
-     *
-     * @return void
-     */
-    public function Header()
-    {
-        global $maxY;
-        // We don't want automatic page breaks while generating header
-        // as this can lead to infinite recursion as auto generated page
-        // will want header as well causing another page break
-        // FIXME: Better approach might be to try to compact the content
-        $this->SetAutoPageBreak(false);
-        // Check if header for this page already exists
-        if (!isset($this->headerset[$this->page])) {
-            $fullwidth = 0;
-            foreach ($this->tablewidths as $width) {
-                $fullwidth += $width;
-            }
-            $this->SetY(($this->tMargin) - ($this->FontSizePt / $this->k) * 5);
-            $this->cellFontSize = $this->FontSizePt;
-            $this->SetFont(
-                PDF::PMA_PDF_FONT,
-                '',
-                ($this->titleFontSize
-                    ? $this->titleFontSize
-                    : $this->FontSizePt)
-            );
-            $this->Cell(0, $this->FontSizePt, $this->titleText, 0, 1, 'C');
-            $this->SetFont(PDF::PMA_PDF_FONT, '', $this->cellFontSize);
-            $this->SetY(($this->tMargin) - ($this->FontSizePt / $this->k) * 2.5);
-            $this->Cell(
-                0,
-                $this->FontSizePt,
-                __('Database:') . ' ' . $this->dbAlias . ',  '
-                . __('Table:') . ' ' . $this->tableAlias . ',  '
-                . __('Purpose:') . ' ' . $this->purpose,
-                0,
-                1,
-                'L'
-            );
-            $l = ($this->lMargin);
-            foreach ($this->colTitles as $col => $txt) {
-                $this->SetXY($l, ($this->tMargin));
-                $this->MultiCell(
-                    $this->tablewidths[$col],
-                    $this->FontSizePt,
-                    $txt
-                );
-                $l += $this->tablewidths[$col];
-                $maxY = ($maxY < $this->getY()) ? $this->getY() : $maxY;
-            }
-            $this->SetXY($this->lMargin, $this->tMargin);
-            $this->setFillColor(200, 200, 200);
-            $l = ($this->lMargin);
-            foreach ($this->colTitles as $col => $txt) {
-                $this->SetXY($l, $this->tMargin);
-                $this->cell(
-                    $this->tablewidths[$col],
-                    $maxY - ($this->tMargin),
-                    '',
-                    1,
-                    0,
-                    'L',
-                    1
-                );
-                $this->SetXY($l, $this->tMargin);
-                $this->MultiCell(
-                    $this->tablewidths[$col],
-                    $this->FontSizePt,
-                    $txt,
-                    0,
-                    'C'
-                );
-                $l += $this->tablewidths[$col];
-            }
-            $this->setFillColor(255, 255, 255);
-            // set headerset
-            $this->headerset[$this->page] = 1;
-        }
-
-        $this->dataY = $maxY;
-        $this->SetAutoPageBreak(true);
-    }
-
-    /**
-     * Generate table
-     *
-     * @param int $lineheight Height of line
-     *
-     * @return void
-     */
-    public function morepagestable($lineheight = 8)
-    {
-        // some things to set and 'remember'
-        $l = $this->lMargin;
-        $startheight = $h = $this->dataY;
-        $startpage = $currpage = $this->page;
-
-        // calculate the whole width
-        $fullwidth = 0;
-        foreach ($this->tablewidths as $width) {
-            $fullwidth += $width;
-        }
-
-        // Now let's start to write the table
-        $row = 0;
-        $tmpheight = array();
-        $maxpage = $this->page;
-
-        while ($data = $GLOBALS['dbi']->fetchRow($this->results)) {
-            $this->page = $currpage;
-            // write the horizontal borders
-            $this->Line($l, $h, $fullwidth + $l, $h);
-            // write the content and remember the height of the highest col
-            foreach ($data as $col => $txt) {
-                $this->page = $currpage;
-                $this->SetXY($l, $h);
-                if ($this->tablewidths[$col] > 0) {
-                    $this->MultiCell(
-                        $this->tablewidths[$col],
-                        $lineheight,
-                        $txt,
-                        0,
-                        $this->colAlign[$col]
-                    );
-                    $l += $this->tablewidths[$col];
-                }
-
-                if (!isset($tmpheight[$row . '-' . $this->page])) {
-                    $tmpheight[$row . '-' . $this->page] = 0;
-                }
-                if ($tmpheight[$row . '-' . $this->page] < $this->GetY()) {
-                    $tmpheight[$row . '-' . $this->page] = $this->GetY();
-                }
-                if ($this->page > $maxpage) {
-                    $maxpage = $this->page;
-                }
-                unset($data[$col]);
-            }
-
-            // get the height we were in the last used page
-            $h = $tmpheight[$row . '-' . $maxpage];
-            // set the "pointer" to the left margin
-            $l = $this->lMargin;
-            // set the $currpage to the last page
-            $currpage = $maxpage;
-            unset($data[$row]);
-            $row++;
-        }
-        // draw the borders
-        // we start adding a horizontal line on the last page
-        $this->page = $maxpage;
-        $this->Line($l, $h, $fullwidth + $l, $h);
-        // now we start at the top of the document and walk down
-        for ($i = $startpage; $i <= $maxpage; $i++) {
-            $this->page = $i;
-            $l = $this->lMargin;
-            $t = ($i == $startpage) ? $startheight : $this->tMargin;
-            $lh = ($i == $maxpage) ? $h : $this->h - $this->bMargin;
-            $this->Line($l, $t, $l, $lh);
-            foreach ($this->tablewidths as $width) {
-                $l += $width;
-                $this->Line($l, $t, $l, $lh);
-            }
-        }
-        // set it to the last page, if not it'll cause some problems
-        $this->page = $maxpage;
-    }
-
-    /**
-     * Sets a set of attributes.
-     *
-     * @param array $attr array containing the attributes
-     *
-     * @return void
-     */
-    public function setAttributes($attr = array())
-    {
-        foreach ($attr as $key => $val) {
-            $this->$key = $val;
-        }
-    }
-
-    /**
-     * Defines the top margin.
-     * The method can be called before creating the first page.
-     *
-     * @param float $topMargin the margin
-     *
-     * @return void
-     */
-    public function setTopMargin($topMargin)
-    {
-        $this->tMargin = $topMargin;
-    }
-
-    /**
-     * Prints triggers
-     *
-     * @param string $db    database name
-     * @param string $table table name
-     *
-     * @return void
-     */
-    public function getTriggers($db, $table)
-    {
-        $i = 0;
-        $triggers = $GLOBALS['dbi']->getTriggers($db, $table);
-        foreach ($triggers as $trigger) {
-            $i++;
-            break;
-        }
-        if ($i == 0) {
-            return; //prevents printing blank trigger list for any table
-        }
-
-        unset($this->tablewidths);
-        unset($this->colTitles);
-        unset($this->titleWidth);
-        unset($this->colFits);
-        unset($this->display_column);
-        unset($this->colAlign);
-
-        /**
-         * Making table heading
-         * Keeping column width constant
-         */
-        $this->colTitles[0] = __('Name');
-        $this->tablewidths[0] = 90;
-        $this->colTitles[1] = __('Time');
-        $this->tablewidths[1] = 80;
-        $this->colTitles[2] = __('Event');
-        $this->tablewidths[2] = 40;
-        $this->colTitles[3] = __('Definition');
-        $this->tablewidths[3] = 240;
-
-        for ($columns_cnt = 0; $columns_cnt < 4; $columns_cnt++) {
-            $this->colAlign[$columns_cnt] = 'L';
-            $this->display_column[$columns_cnt] = true;
-        }
-
-        // Starting to fill table with required info
-
-        $this->setY($this->tMargin);
-        $this->AddPage();
-        $this->SetFont(PDF::PMA_PDF_FONT, '', 9);
-
-        $l = $this->lMargin;
-        $startheight = $h = $this->dataY;
-        $startpage = $currpage = $this->page;
-
-        // calculate the whole width
-        $fullwidth = 0;
-        foreach ($this->tablewidths as $width) {
-            $fullwidth += $width;
-        }
-
-        $row = 0;
-        $tmpheight = array();
-        $maxpage = $this->page;
-        $data = array();
-
-        $triggers = $GLOBALS['dbi']->getTriggers($db, $table);
-
-        foreach ($triggers as $trigger) {
-            $data[] = $trigger['name'];
-            $data[] = $trigger['action_timing'];
-            $data[] = $trigger['event_manipulation'];
-            $data[] = $trigger['definition'];
-            $this->page = $currpage;
-            // write the horizontal borders
-            $this->Line($l, $h, $fullwidth + $l, $h);
-            // write the content and remember the height of the highest col
-            foreach ($data as $col => $txt) {
-                $this->page = $currpage;
-                $this->SetXY($l, $h);
-                if ($this->tablewidths[$col] > 0) {
-                    $this->MultiCell(
-                        $this->tablewidths[$col],
-                        $this->FontSizePt,
-                        $txt,
-                        0,
-                        $this->colAlign[$col]
-                    );
-                    $l += $this->tablewidths[$col];
-                }
-
-                if (!isset($tmpheight[$row . '-' . $this->page])) {
-                    $tmpheight[$row . '-' . $this->page] = 0;
-                }
-                if ($tmpheight[$row . '-' . $this->page] < $this->GetY()) {
-                    $tmpheight[$row . '-' . $this->page] = $this->GetY();
-                }
-                if ($this->page > $maxpage) {
-                    $maxpage = $this->page;
-                }
-            }
-            // get the height we were in the last used page
-            $h = $tmpheight[$row . '-' . $maxpage];
-            // set the "pointer" to the left margin
-            $l = $this->lMargin;
-            // set the $currpage to the last page
-            $currpage = $maxpage;
-            unset($data);
-            $row++;
-        }
-        // draw the borders
-        // we start adding a horizontal line on the last page
-        $this->page = $maxpage;
-        $this->Line($l, $h, $fullwidth + $l, $h);
-        // now we start at the top of the document and walk down
-        for ($i = $startpage; $i <= $maxpage; $i++) {
-            $this->page = $i;
-            $l = $this->lMargin;
-            $t = ($i == $startpage) ? $startheight : $this->tMargin;
-            $lh = ($i == $maxpage) ? $h : $this->h - $this->bMargin;
-            $this->Line($l, $t, $l, $lh);
-            foreach ($this->tablewidths as $width) {
-                $l += $width;
-                $this->Line($l, $t, $l, $lh);
-            }
-        }
-        // set it to the last page, if not it'll cause some problems
-        $this->page = $maxpage;
-    }
-
-    /**
-     * Print $table's CREATE definition
-     *
-     * @param string $db          the database name
-     * @param string $table       the table name
-     * @param bool   $do_relation whether to include relation comments
-     * @param bool   $do_comments whether to include the pmadb-style column
-     *                            comments as comments in the structure;
-     *                            this is deprecated but the parameter is
-     *                            left here because export.php calls
-     *                            PMA_exportStructure() also for other
-     *                            export types which use this parameter
-     * @param bool   $do_mime     whether to include mime comments
-     * @param bool   $view        whether we're handling a view
-     * @param array  $aliases     aliases of db/table/columns
-     *
-     * @return void
-     */
-    public function getTableDef(
-        $db,
-        $table,
-        $do_relation,
-        $do_comments,
-        $do_mime,
-        $view = false,
-        $aliases = array()
-    ) {
-        // set $cfgRelation here, because there is a chance that it's modified
-        // since the class initialization
-        global $cfgRelation;
-
-        unset($this->tablewidths);
-        unset($this->colTitles);
-        unset($this->titleWidth);
-        unset($this->colFits);
-        unset($this->display_column);
-        unset($this->colAlign);
-
-        /**
-         * Gets fields properties
-         */
-        $GLOBALS['dbi']->selectDb($db);
-
-        /**
-         * All these three checks do_relation, do_comment and do_mime is
-         * not required. As presently all are set true by default.
-         * But when, methods to take user input will be developed,
-         * it will be of use
-         */
-        // Check if we can use Relations
-        if ($do_relation) {
-            // Find which tables are related with the current one and write it in
-            // an array
-            $res_rel = PMA_getForeigners($db, $table);
-            $have_rel = !empty($res_rel);
-        } else {
-            $have_rel = false;
-        } // end if
-
-        //column count and table heading
-
-        $this->colTitles[0] = __('Column');
-        $this->tablewidths[0] = 90;
-        $this->colTitles[1] = __('Type');
-        $this->tablewidths[1] = 80;
-        $this->colTitles[2] = __('Null');
-        $this->tablewidths[2] = 40;
-        $this->colTitles[3] = __('Default');
-        $this->tablewidths[3] = 120;
-
-        for ($columns_cnt = 0; $columns_cnt < 4; $columns_cnt++) {
-            $this->colAlign[$columns_cnt] = 'L';
-            $this->display_column[$columns_cnt] = true;
-        }
-
-        if ($do_relation && $have_rel) {
-            $this->colTitles[$columns_cnt] = __('Links to');
-            $this->display_column[$columns_cnt] = true;
-            $this->colAlign[$columns_cnt] = 'L';
-            $this->tablewidths[$columns_cnt] = 120;
-            $columns_cnt++;
-        }
-        if ($do_comments /*&& $cfgRelation['commwork']*/) {
-            $this->colTitles[$columns_cnt] = __('Comments');
-            $this->display_column[$columns_cnt] = true;
-            $this->colAlign[$columns_cnt] = 'L';
-            $this->tablewidths[$columns_cnt] = 120;
-            $columns_cnt++;
-        }
-        if ($do_mime && $cfgRelation['mimework']) {
-            $this->colTitles[$columns_cnt] = __('MIME');
-            $this->display_column[$columns_cnt] = true;
-            $this->colAlign[$columns_cnt] = 'L';
-            $this->tablewidths[$columns_cnt] = 120;
-            $columns_cnt++;
-        }
-
-        // Starting to fill table with required info
-
-        $this->setY($this->tMargin);
-        $this->AddPage();
-        $this->SetFont(PDF::PMA_PDF_FONT, '', 9);
-
-        // Now let's start to write the table structure
-
-        if ($do_comments) {
-            $comments = PMA_getComments($db, $table);
-        }
-        if ($do_mime && $cfgRelation['mimework']) {
-            $mime_map = PMA_getMIME($db, $table, true);
-        }
-
-        $columns = $GLOBALS['dbi']->getColumns($db, $table);
-        /**
-         * Get the unique keys in the table.
-         * Presently, this information is not used. We will have to find out
-         * way of displaying it.
-         */
-        $unique_keys = array();
-        $keys = $GLOBALS['dbi']->getTableIndexes($db, $table);
-        foreach ($keys as $key) {
-            if ($key['Non_unique'] == 0) {
-                $unique_keys[] = $key['Column_name'];
-            }
-        }
-
-        // some things to set and 'remember'
-        $l = $this->lMargin;
-        $startheight = $h = $this->dataY;
-        $startpage = $currpage = $this->page;
-        // calculate the whole width
-        $fullwidth = 0;
-        foreach ($this->tablewidths as $width) {
-            $fullwidth += $width;
-        }
-
-        $row = 0;
-        $tmpheight = array();
-        $maxpage = $this->page;
-        $data = array();
-
-        // fun begin
-        foreach ($columns as $column) {
-            $extracted_columnspec
-                = Util::extractColumnSpec($column['Type']);
-
-            $type = $extracted_columnspec['print_type'];
-            if (empty($type)) {
-                $type = ' ';
-            }
-
-            if (!isset($column['Default'])) {
-                if ($column['Null'] != 'NO') {
-                    $column['Default'] = 'NULL';
-                }
-            }
-            $data [] = $column['Field'];
-            $data [] = $type;
-            $data [] = ($column['Null'] == '' || $column['Null'] == 'NO')
-                ? 'No'
-                : 'Yes';
-            $data [] = isset($column['Default']) ? $column['Default'] : '';
-
-            $field_name = $column['Field'];
-
-            if ($do_relation && $have_rel) {
-                $data [] = isset($res_rel[$field_name])
-                    ? $res_rel[$field_name]['foreign_table']
-                    . ' (' . $res_rel[$field_name]['foreign_field']
-                    . ')'
-                    : '';
-            }
-            if ($do_comments) {
-                $data [] = isset($comments[$field_name])
-                    ? $comments[$field_name]
-                    : '';
-            }
-            if ($do_mime) {
-                $data [] = isset($mime_map[$field_name])
-                    ? $mime_map[$field_name]['mimetype']
-                    : '';
-            }
-
-            $this->page = $currpage;
-            // write the horizontal borders
-            $this->Line($l, $h, $fullwidth + $l, $h);
-            // write the content and remember the height of the highest col
-            foreach ($data as $col => $txt) {
-                $this->page = $currpage;
-                $this->SetXY($l, $h);
-                if ($this->tablewidths[$col] > 0) {
-                    $this->MultiCell(
-                        $this->tablewidths[$col],
-                        $this->FontSizePt,
-                        $txt,
-                        0,
-                        $this->colAlign[$col]
-                    );
-                    $l += $this->tablewidths[$col];
-                }
-
-                if (!isset($tmpheight[$row . '-' . $this->page])) {
-                    $tmpheight[$row . '-' . $this->page] = 0;
-                }
-                if ($tmpheight[$row . '-' . $this->page] < $this->GetY()) {
-                    $tmpheight[$row . '-' . $this->page] = $this->GetY();
-                }
-                if ($this->page > $maxpage) {
-                    $maxpage = $this->page;
-                }
-            }
-
-            // get the height we were in the last used page
-            $h = $tmpheight[$row . '-' . $maxpage];
-            // set the "pointer" to the left margin
-            $l = $this->lMargin;
-            // set the $currpage to the last page
-            $currpage = $maxpage;
-            unset($data);
-            $row++;
-        }
-        // draw the borders
-        // we start adding a horizontal line on the last page
-        $this->page = $maxpage;
-        $this->Line($l, $h, $fullwidth + $l, $h);
-        // now we start at the top of the document and walk down
-        for ($i = $startpage; $i <= $maxpage; $i++) {
-            $this->page = $i;
-            $l = $this->lMargin;
-            $t = ($i == $startpage) ? $startheight : $this->tMargin;
-            $lh = ($i == $maxpage) ? $h : $this->h - $this->bMargin;
-            $this->Line($l, $t, $l, $lh);
-            foreach ($this->tablewidths as $width) {
-                $l += $width;
-                $this->Line($l, $t, $l, $lh);
-            }
-        }
-        // set it to the last page, if not it'll cause some problems
-        $this->page = $maxpage;
-    }
-
-    /**
-     * MySQL report
-     *
-     * @param string $query Query to execute
-     *
-     * @return void
-     */
-    public function mysqlReport($query)
-    {
-        unset($this->tablewidths);
-        unset($this->colTitles);
-        unset($this->titleWidth);
-        unset($this->colFits);
-        unset($this->display_column);
-        unset($this->colAlign);
-
-        /**
-         * Pass 1 for column widths
-         */
-        $this->results = $GLOBALS['dbi']->query(
-            $query,
-            null,
-            DatabaseInterface::QUERY_UNBUFFERED
-        );
-        $this->numFields = $GLOBALS['dbi']->numFields($this->results);
-        $this->fields = $GLOBALS['dbi']->getFieldsMeta($this->results);
-
-        // sColWidth = starting col width (an average size width)
-        $availableWidth = $this->w - $this->lMargin - $this->rMargin;
-        $this->sColWidth = $availableWidth / $this->numFields;
-        $totalTitleWidth = 0;
-
-        // loop through results header and set initial
-        // col widths/ titles/ alignment
-        // if a col title is less than the starting col width,
-        // reduce that column size
-        $colFits = array();
-        $titleWidth = array();
-        for ($i = 0; $i < $this->numFields; $i++) {
-            $col_as = $this->fields[$i]->name;
-            $db = $this->currentDb;
-            $table = $this->currentTable;
-            if (!empty($this->aliases[$db]['tables'][$table]['columns'][$col_as])) {
-                $col_as = $this->aliases[$db]['tables'][$table]['columns'][$col_as];
-            }
-            $stringWidth = $this->getstringwidth($col_as) + 6;
-            // save the real title's width
-            $titleWidth[$i] = $stringWidth;
-            $totalTitleWidth += $stringWidth;
-
-            // set any column titles less than the start width to
-            // the column title width
-            if ($stringWidth < $this->sColWidth) {
-                $colFits[$i] = $stringWidth;
-            }
-            $this->colTitles[$i] = $col_as;
-            $this->display_column[$i] = true;
-
-            switch ($this->fields[$i]->type) {
-            case 'int':
-                $this->colAlign[$i] = 'R';
-                break;
-            case 'blob':
-            case 'tinyblob':
-            case 'mediumblob':
-            case 'longblob':
-                /**
-                 * @todo do not deactivate completely the display
-                 * but show the field's name and [BLOB]
-                 */
-                if (stristr($this->fields[$i]->flags, 'BINARY')) {
-                    $this->display_column[$i] = false;
-                    unset($this->colTitles[$i]);
-                }
-                $this->colAlign[$i] = 'L';
-                break;
-            default:
-                $this->colAlign[$i] = 'L';
-            }
-        }
-
-        // title width verification
-        if ($totalTitleWidth > $availableWidth) {
-            $adjustingMode = true;
-        } else {
-            $adjustingMode = false;
-            // we have enough space for all the titles at their
-            // original width so use the true title's width
-            foreach ($titleWidth as $key => $val) {
-                $colFits[$key] = $val;
-            }
-        }
-
-        // loop through the data; any column whose contents
-        // is greater than the column size is resized
-        /**
-         * @todo force here a LIMIT to avoid reading all rows
-         */
-        while ($row = $GLOBALS['dbi']->fetchRow($this->results)) {
-            foreach ($colFits as $key => $val) {
-                $stringWidth = $this->getstringwidth($row[$key]) + 6;
-                if ($adjustingMode && ($stringWidth > $this->sColWidth)) {
-                    // any column whose data's width is bigger than
-                    // the start width is now discarded
-                    unset($colFits[$key]);
-                } else {
-                    // if data's width is bigger than the current column width,
-                    // enlarge the column (but avoid enlarging it if the
-                    // data's width is very big)
-                    if ($stringWidth > $val
-                        && $stringWidth < ($this->sColWidth * 3)
-                    ) {
-                        $colFits[$key] = $stringWidth;
-                    }
-                }
-            }
-        }
-
-        $totAlreadyFitted = 0;
-        foreach ($colFits as $key => $val) {
-            // set fitted columns to smallest size
-            $this->tablewidths[$key] = $val;
-            // to work out how much (if any) space has been freed up
-            $totAlreadyFitted += $val;
-        }
-
-        if ($adjustingMode) {
-            $surplus = (sizeof($colFits) * $this->sColWidth) - $totAlreadyFitted;
-            $surplusToAdd = $surplus / ($this->numFields - sizeof($colFits));
-        } else {
-            $surplusToAdd = 0;
-        }
-
-        for ($i = 0; $i < $this->numFields; $i++) {
-            if (!in_array($i, array_keys($colFits))) {
-                $this->tablewidths[$i] = $this->sColWidth + $surplusToAdd;
-            }
-            if ($this->display_column[$i] == false) {
-                $this->tablewidths[$i] = 0;
-            }
-        }
-
-        ksort($this->tablewidths);
-
-        $GLOBALS['dbi']->freeResult($this->results);
-
-        // Pass 2
-
-        $this->results = $GLOBALS['dbi']->query(
-            $query,
-            null,
-            DatabaseInterface::QUERY_UNBUFFERED
-        );
-        $this->setY($this->tMargin);
-        $this->AddPage();
-        $this->SetFont(PDF::PMA_PDF_FONT, '', 9);
-        $this->morepagestable($this->FontSizePt);
-        $GLOBALS['dbi']->freeResult($this->results);
-    } // end of mysqlReport function
-} // end of PMA_Export_PDF class
diff --git a/#pma/libraries/plugins/export/README b/#pma/libraries/plugins/export/README
deleted file mode 100644
index 1bb8843c..00000000
--- a/#pma/libraries/plugins/export/README
+++ /dev/null
@@ -1,257 +0,0 @@
-This directory holds export plugins for phpMyAdmin. Any new plugin should
-basically follow the structure presented here. Official plugins need to
-have str* messages with their definition in language files, but if you build
-some plugins for your use, you can directly use texts in plugin.
-
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * [Name] export plugin for phpMyAdmin
- *
- * @package    PhpMyAdmin-Export
- * @subpackage [Name]
- */
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
-/**
- * Handles the export for the [Name] format
- *
- * @package PhpMyAdmin-Export
- */
-class Export[Name] extends PMA\libraries\plugins\ExportPlugin
-{
-    /**
-     * optional - declare variables and descriptions
-     *
-     * @var type
-     */
-    private $_myOptionalVariable;
-
-    /**
-     * optional - declare global variables and descriptions
-     *
-     * @var type
-     */
-    private $_globalVariableName;
-
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        $this->setProperties();
-    }
-
-    // optional - declare global variables and use getters later
-    /**
-     * Initialize the local variables that are used specific for export SQL
-     *
-     * @global type $global_variable_name
-     * [..]
-     *
-     * @return void
-     */
-    protected function initSpecificVariables()
-    {
-        global $global_variable_name;
-        $this->_setGlobalVariableName($global_variable_name);
-    }
-
-    /**
-     * Sets the export plugin properties.
-     * Called in the constructor.
-     *
-     * @return void
-     */
-    protected function setProperties()
-    {
-        $exportPluginProperties = new PMA\libraries\properties\plugins\ExportPluginProperties();
-        $exportPluginProperties->setText('[name]');             // the name of your plug-in
-        $exportPluginProperties->setExtension('[ext]');         // extension this plug-in can handle
-        $exportPluginProperties->setOptionsText(__('Options'));
-
-        // create the root group that will be the options field for
-        // $exportPluginProperties
-        // this will be shown as "Format specific options"
-        $exportSpecificOptions = new PMA\libraries\properties\options\groups\OptionsPropertyRootGroup(
-            "Format Specific Options"
-        );
-
-        // general options main group
-        $generalOptions = new PMA\libraries\properties\options\groups\OptionsPropertyMainGroup(
-            "general_opts"
-        );
-
-        // optional :
-        // create primary items and add them to the group
-        // type - one of the classes listed in libraries/properties/options/items/
-        // name - form element name
-        // text - description in GUI
-        // size - size of text element
-        // len  - maximal size of input
-        // values - possible values of the item
-        $leaf = new PMA\libraries\properties\options\items\RadioPropertyItem(
-            "structure_or_data"
-        );
-        $leaf->setValues(
-            array(
-                'structure' => __('structure'),
-                'data' => __('data'),
-                'structure_and_data' => __('structure and data')
-            )
-        );
-        $generalOptions->addProperty($leaf);
-
-        // add the main group to the root group
-        $exportSpecificOptions->addProperty($generalOptions);
-
-        // set the options for the export plugin property item
-        $exportPluginProperties->setOptions($exportSpecificOptions);
-        $this->properties = $exportPluginProperties;
-    }
-
-    /**
-     * Outputs export header
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportHeader ()
-    {
-        // implementation
-        return true;
-    }
-
-    /**
-     * Outputs export footer
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportFooter ()
-    {
-        // implementation
-        return true;
-    }
-
-    /**
-     * Outputs database header
-     *
-     * @param string $db       Database name
-     * @param string $db_alias Aliases of db
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportDBHeader ($db, $db_alias = '')
-    {
-        // implementation
-        return true;
-    }
-
-    /**
-     * Outputs database footer
-     *
-     * @param string $db Database name
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportDBFooter ($db)
-    {
-        // implementation
-        return true;
-    }
-
-    /**
-     * Outputs CREATE DATABASE statement
-     *
-     * @param string $db       Database name
-     * @param string $db_alias Aliases of db
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportDBCreate($db, $db_alias = '')
-    {
-        // implementation
-        return true;
-    }
-
-    /**
-     * Outputs the content of a table in [Name] format
-     *
-     * @param string $db        database name
-     * @param string $table     table name
-     * @param string $crlf      the end of line sequence
-     * @param string $error_url the url to go back in case of error
-     * @param string $sql_query SQL query for obtaining data
-     * @param array  $aliases   Aliases of db/table/columns
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportData(
-        $db, $table, $crlf, $error_url, $sql_query, $aliases = array()
-    ) {
-        // implementation;
-        return true;
-    }
-
-    // optional - implement other methods defined in PMA\libraries\plugins\ExportPlugin.class.php:
-    //  - exportRoutines()
-    //  - exportStructure()
-    //  - getTableDefStandIn()
-    //  - getTriggers()
-
-    // optional - implement other private methods in order to avoid
-    // having huge methods or avoid duplicate code. Make use of them
-    // as well as of the getters and setters declared both here
-    // and in the PMA\libraries\plugins\ExportPlugin class
-
-
-    // optional:
-    /* ~~~~~~~~~~~~~~~~~~~~ Getters and Setters ~~~~~~~~~~~~~~~~~~~~ */
-
-
-    /**
-     * Getter description
-     *
-     * @return type
-     */
-    private function _getMyOptionalVariable()
-    {
-        return $this->_myOptionalVariable;
-    }
-
-    /**
-     * Setter description
-     *
-     * @param type $my_optional_variable description
-     *
-     * @return void
-     */
-    private function _setMyOptionalVariable($my_optional_variable)
-    {
-        $this->_myOptionalVariable = $my_optional_variable;
-    }
-
-    /**
-     * Getter description
-     *
-     * @return type
-     */
-    private function _getGlobalVariableName()
-    {
-        return $this->_globalVariableName;
-    }
-
-    /**
-     * Setter description
-     *
-     * @param type $global_variable_name description
-     *
-     * @return void
-     */
-    private function _setGlobalVariableName($global_variable_name)
-    {
-        $this->_globalVariableName = $global_variable_name;
-    }
-}
-?>
diff --git a/#pma/libraries/plugins/export/TableProperty.php b/#pma/libraries/plugins/export/TableProperty.php
deleted file mode 100644
index d76baa62..00000000
--- a/#pma/libraries/plugins/export/TableProperty.php
+++ /dev/null
@@ -1,283 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Holds the PMA\libraries\plugins\export\TableProperty class
- *
- * @package    PhpMyAdmin-Export
- * @subpackage CodeGen
- */
-namespace PMA\libraries\plugins\export;
-
-/**
- * PMA\libraries\plugins\export\TableProperty class
- *
- * @package    PhpMyAdmin-Export
- * @subpackage CodeGen
- */
-class TableProperty
-{
-    /**
-     * Name
-     *
-     * @var string
-     */
-    public $name;
-
-    /**
-     * Type
-     *
-     * @var string
-     */
-    public $type;
-
-    /**
-     * Whether the key is nullable or not
-     *
-     * @var bool
-     */
-    public $nullable;
-
-    /**
-     * The key
-     *
-     * @var int
-     */
-    public $key;
-
-    /**
-     * Default value
-     *
-     * @var mixed
-     */
-    public $defaultValue;
-
-    /**
-     * Extension
-     *
-     * @var string
-     */
-    public $ext;
-
-    /**
-     * Constructor
-     *
-     * @param array $row table row
-     */
-    public function __construct($row)
-    {
-        $this->name = trim($row[0]);
-        $this->type = trim($row[1]);
-        $this->nullable = trim($row[2]);
-        $this->key = trim($row[3]);
-        $this->defaultValue = trim($row[4]);
-        $this->ext = trim($row[5]);
-    }
-
-    /**
-     * Gets the pure type
-     *
-     * @return string type
-     */
-    public function getPureType()
-    {
-        $pos = mb_strpos($this->type, "(");
-        if ($pos > 0) {
-            return mb_substr($this->type, 0, $pos);
-        }
-        return $this->type;
-    }
-
-    /**
-     * Tells whether the key is null or not
-     *
-     * @return bool true if the key is not null, false otherwise
-     */
-    public function isNotNull()
-    {
-        return $this->nullable == "NO" ? "true" : "false";
-    }
-
-    /**
-     * Tells whether the key is unique or not
-     *
-     * @return bool true if the key is unique, false otherwise
-     */
-    public function isUnique()
-    {
-        return $this->key == "PRI" || $this->key == "UNI" ? "true" : "false";
-    }
-
-     /**
-     * Gets the .NET primitive type
-     *
-     * @return string type
-     */
-    public function getDotNetPrimitiveType()
-    {
-        if (mb_strpos($this->type, "int") === 0) {
-            return "int";
-        }
-        if (mb_strpos($this->type, "longtext") === 0) {
-            return "string";
-        }
-        if (mb_strpos($this->type, "long") === 0) {
-            return "long";
-        }
-        if (mb_strpos($this->type, "char") === 0) {
-            return "string";
-        }
-        if (mb_strpos($this->type, "varchar") === 0) {
-            return "string";
-        }
-        if (mb_strpos($this->type, "text") === 0) {
-            return "string";
-        }
-        if (mb_strpos($this->type, "tinyint") === 0) {
-            return "bool";
-        }
-        if (mb_strpos($this->type, "datetime") === 0) {
-            return "DateTime";
-        }
-        return "unknown";
-    }
-
-    /**
-     * Gets the .NET object type
-     *
-     * @return string type
-     */
-    public function getDotNetObjectType()
-    {
-        if (mb_strpos($this->type, "int") === 0) {
-            return "Int32";
-        }
-        if (mb_strpos($this->type, "longtext") === 0) {
-            return "String";
-        }
-        if (mb_strpos($this->type, "long") === 0) {
-            return "Long";
-        }
-        if (mb_strpos($this->type, "char") === 0) {
-            return "String";
-        }
-        if (mb_strpos($this->type, "varchar") === 0) {
-            return "String";
-        }
-        if (mb_strpos($this->type, "text") === 0) {
-            return "String";
-        }
-        if (mb_strpos($this->type, "tinyint") === 0) {
-            return "Boolean";
-        }
-        if (mb_strpos($this->type, "datetime") === 0) {
-            return "DateTime";
-        }
-        return "Unknown";
-    }
-
-    /**
-     * Gets the index name
-     *
-     * @return string containing the name of the index
-     */
-    public function getIndexName()
-    {
-        if (mb_strlen($this->key) > 0) {
-            return "index=\""
-                . htmlspecialchars($this->name, ENT_COMPAT, 'UTF-8')
-                . "\"";
-        }
-        return "";
-    }
-
-    /**
-     * Tells whether the key is primary or not
-     *
-     * @return bool true if the key is primary, false otherwise
-     */
-    public function isPK()
-    {
-        return $this->key == "PRI";
-    }
-
-    /**
-     * Formats a string for C#
-     *
-     * @param string $text string to be formatted
-     *
-     * @return string formatted text
-     */
-    public function formatCs($text)
-    {
-        $text = str_replace(
-            "#name#",
-            ExportCodegen::cgMakeIdentifier($this->name, false),
-            $text
-        );
-        return $this->format($text);
-    }
-
-    /**
-     * Formats a string for XML
-     *
-     * @param string $text string to be formatted
-     *
-     * @return string formatted text
-     */
-    public function formatXml($text)
-    {
-        $text = str_replace(
-            "#name#",
-            htmlspecialchars($this->name, ENT_COMPAT, 'UTF-8'),
-            $text
-        );
-        $text = str_replace(
-            "#indexName#",
-            $this->getIndexName(),
-            $text
-        );
-        return $this->format($text);
-    }
-
-    /**
-     * Formats a string
-     *
-     * @param string $text string to be formatted
-     *
-     * @return string formatted text
-     */
-    public function format($text)
-    {
-        $text = str_replace(
-            "#ucfirstName#",
-            ExportCodegen::cgMakeIdentifier($this->name),
-            $text
-        );
-        $text = str_replace(
-            "#dotNetPrimitiveType#",
-            $this->getDotNetPrimitiveType(),
-            $text
-        );
-        $text = str_replace(
-            "#dotNetObjectType#",
-            $this->getDotNetObjectType(),
-            $text
-        );
-        $text = str_replace(
-            "#type#",
-            $this->getPureType(),
-            $text
-        );
-        $text = str_replace(
-            "#notNull#",
-            $this->isNotNull(),
-            $text
-        );
-        $text = str_replace(
-            "#unique#",
-            $this->isUnique(),
-            $text
-        );
-        return $text;
-    }
-}
diff --git a/#pma/libraries/plugins/import/AbstractImportCsv.php b/#pma/libraries/plugins/import/AbstractImportCsv.php
deleted file mode 100644
index 96489075..00000000
--- a/#pma/libraries/plugins/import/AbstractImportCsv.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Super class of CSV import plugins for phpMyAdmin
- *
- * @package    PhpMyAdmin-Import
- * @subpackage CSV
- */
-namespace PMA\libraries\plugins\import;
-
-use PMA\libraries\properties\options\items\BoolPropertyItem;
-use PMA\libraries\properties\plugins\ImportPluginProperties;
-use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
-use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
-use PMA\libraries\plugins\ImportPlugin;
-use PMA\libraries\properties\options\items\TextPropertyItem;
-
-/**
- * Super class of the import plugins for the CSV format
- *
- * @package    PhpMyAdmin-Import
- * @subpackage CSV
- */
-abstract class AbstractImportCsv extends ImportPlugin
-{
-    /**
-     * Sets the import plugin properties.
-     * Called in the constructor.
-     *
-     * @return \PMA\libraries\properties\options\groups\OptionsPropertyMainGroup PMA\libraries\properties\options\groups\OptionsPropertyMainGroup object of the plugin
-     */
-    protected function setProperties()
-    {
-        $importPluginProperties = new ImportPluginProperties();
-        $importPluginProperties->setOptionsText(__('Options'));
-
-        // create the root group that will be the options field for
-        // $importPluginProperties
-        // this will be shown as "Format specific options"
-        $importSpecificOptions = new OptionsPropertyRootGroup(
-            "Format Specific Options"
-        );
-
-        // general options main group
-        $generalOptions = new OptionsPropertyMainGroup("general_opts");
-
-        // create common items and add them to the group
-        $leaf = new BoolPropertyItem(
-            "replace",
-            __(
-                'Update data when duplicate keys found on import (add ON DUPLICATE '
-                . 'KEY UPDATE)'
-            )
-        );
-        $generalOptions->addProperty($leaf);
-        $leaf = new TextPropertyItem(
-            "terminated",
-            __('Columns separated with:')
-        );
-        $leaf->setSize(2);
-        $generalOptions->addProperty($leaf);
-        $leaf = new TextPropertyItem(
-            "enclosed",
-            __('Columns enclosed with:')
-        );
-        $leaf->setSize(2);
-        $leaf->setLen(2);
-        $generalOptions->addProperty($leaf);
-        $leaf = new TextPropertyItem(
-            "escaped",
-            __('Columns escaped with:')
-        );
-        $leaf->setSize(2);
-        $leaf->setLen(2);
-        $generalOptions->addProperty($leaf);
-        $leaf = new TextPropertyItem(
-            "new_line",
-            __('Lines terminated with:')
-        );
-        $leaf->setSize(2);
-        $generalOptions->addProperty($leaf);
-
-        // add the main group to the root group
-        $importSpecificOptions->addProperty($generalOptions);
-
-        // set the options for the import plugin property item
-        $importPluginProperties->setOptions($importSpecificOptions);
-        $this->properties = $importPluginProperties;
-
-        return $generalOptions;
-    }
-}
diff --git a/#pma/libraries/plugins/import/ImportCsv.php b/#pma/libraries/plugins/import/ImportCsv.php
deleted file mode 100644
index f0dc96eb..00000000
--- a/#pma/libraries/plugins/import/ImportCsv.php
+++ /dev/null
@@ -1,716 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * CSV import plugin for phpMyAdmin
- *
- * @todo       add an option for handling NULL values
- * @package    PhpMyAdmin-Import
- * @subpackage CSV
- */
-namespace PMA\libraries\plugins\import;
-
-use PMA\libraries\properties\options\items\BoolPropertyItem;
-use PMA;
-use PMA\libraries\properties\options\items\TextPropertyItem;
-
-/**
- * Handles the import for the CSV format
- *
- * @package    PhpMyAdmin-Import
- * @subpackage CSV
- */
-class ImportCsv extends AbstractImportCsv
-{
-    /**
-     * Whether to analyze tables
-     *
-     * @var bool
-     */
-    private $_analyze;
-
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        $this->setProperties();
-    }
-
-    /**
-     * Sets the import plugin properties.
-     * Called in the constructor.
-     *
-     * @return void
-     */
-    protected function setProperties()
-    {
-        $this->_setAnalyze(false);
-
-        if ($GLOBALS['plugin_param'] !== 'table') {
-            $this->_setAnalyze(true);
-        }
-
-        $generalOptions = parent::setProperties();
-        $this->properties->setText('CSV');
-        $this->properties->setExtension('csv');
-
-        if ($GLOBALS['plugin_param'] !== 'table') {
-            $leaf = new BoolPropertyItem(
-                "col_names",
-                __(
-                    'The first line of the file contains the table column names'
-                    . ' <i>(if this is unchecked, the first line will become part'
-                    . ' of the data)</i>'
-                )
-            );
-            $generalOptions->addProperty($leaf);
-        } else {
-            $hint = new PMA\libraries\Message(
-                __(
-                    'If the data in each row of the file is not'
-                    . ' in the same order as in the database, list the corresponding'
-                    . ' column names here. Column names must be separated by commas'
-                    . ' and not enclosed in quotations.'
-                )
-            );
-            $leaf = new TextPropertyItem(
-                "columns",
-                __('Column names: ') . PMA\libraries\Util::showHint($hint)
-            );
-            $generalOptions->addProperty($leaf);
-        }
-
-        $leaf = new BoolPropertyItem(
-            "ignore",
-            __('Do not abort on INSERT error')
-        );
-        $generalOptions->addProperty($leaf);
-    }
-
-    /**
-     * Handles the whole import logic
-     *
-     * @param array &$sql_data 2-element array with sql data
-     *
-     * @return void
-     */
-    public function doImport(&$sql_data = array())
-    {
-        global $db, $table, $csv_terminated, $csv_enclosed, $csv_escaped,
-               $csv_new_line, $csv_columns, $err_url;
-        // $csv_replace and $csv_ignore should have been here,
-        // but we use directly from $_POST
-        global $error, $timeout_passed, $finished, $message;
-
-        $replacements = array(
-            '\\n' => "\n",
-            '\\t' => "\t",
-            '\\r' => "\r",
-        );
-        $csv_terminated = strtr($csv_terminated, $replacements);
-        $csv_enclosed = strtr($csv_enclosed, $replacements);
-        $csv_escaped = strtr($csv_escaped, $replacements);
-        $csv_new_line = strtr($csv_new_line, $replacements);
-
-        $param_error = false;
-        if (mb_strlen($csv_terminated) < 1) {
-            $message = PMA\libraries\Message::error(
-                __('Invalid parameter for CSV import: %s')
-            );
-            $message->addParam(__('Columns terminated with'), false);
-            $error = true;
-            $param_error = true;
-            // The default dialog of MS Excel when generating a CSV produces a
-            // semi-colon-separated file with no chance of specifying the
-            // enclosing character. Thus, users who want to import this file
-            // tend to remove the enclosing character on the Import dialog.
-            // I could not find a test case where having no enclosing characters
-            // confuses this script.
-            // But the parser won't work correctly with strings so we allow just
-            // one character.
-        } elseif (mb_strlen($csv_enclosed) > 1) {
-            $message = PMA\libraries\Message::error(
-                __('Invalid parameter for CSV import: %s')
-            );
-            $message->addParam(__('Columns enclosed with'), false);
-            $error = true;
-            $param_error = true;
-            // I could not find a test case where having no escaping characters
-            // confuses this script.
-            // But the parser won't work correctly with strings so we allow just
-            // one character.
-        } elseif (mb_strlen($csv_escaped) > 1) {
-            $message = PMA\libraries\Message::error(
-                __('Invalid parameter for CSV import: %s')
-            );
-            $message->addParam(__('Columns escaped with'), false);
-            $error = true;
-            $param_error = true;
-        } elseif (mb_strlen($csv_new_line) != 1
-            && $csv_new_line != 'auto'
-        ) {
-            $message = PMA\libraries\Message::error(
-                __('Invalid parameter for CSV import: %s')
-            );
-            $message->addParam(__('Lines terminated with'), false);
-            $error = true;
-            $param_error = true;
-        }
-
-        // If there is an error in the parameters entered,
-        // indicate that immediately.
-        if ($param_error) {
-            PMA\libraries\Util::mysqlDie(
-                $message->getMessage(),
-                '',
-                false,
-                $err_url
-            );
-        }
-
-        $buffer = '';
-        $required_fields = 0;
-
-        if (!$this->_getAnalyze()) {
-            $sql_template = 'INSERT';
-            if (isset($_POST['csv_ignore'])) {
-                $sql_template .= ' IGNORE';
-            }
-            $sql_template .= ' INTO ' . PMA\libraries\Util::backquote($table);
-
-            $tmp_fields = $GLOBALS['dbi']->getColumns($db, $table);
-
-            if (empty($csv_columns)) {
-                $fields = $tmp_fields;
-            } else {
-                $sql_template .= ' (';
-                $fields = array();
-                $tmp = preg_split('/,( ?)/', $csv_columns);
-                foreach ($tmp as $key => $val) {
-                    if (count($fields) > 0) {
-                        $sql_template .= ', ';
-                    }
-                    /* Trim also `, if user already included backquoted fields */
-                    $val = trim($val, " \t\r\n\0\x0B`");
-                    $found = false;
-                    foreach ($tmp_fields as $field) {
-                        if ($field['Field'] == $val) {
-                            $found = true;
-                            break;
-                        }
-                    }
-                    if (!$found) {
-                        $message = PMA\libraries\Message::error(
-                            __(
-                                'Invalid column (%s) specified! Ensure that columns'
-                                . ' names are spelled correctly, separated by commas'
-                                . ', and not enclosed in quotes.'
-                            )
-                        );
-                        $message->addParam($val);
-                        $error = true;
-                        break;
-                    }
-                    $fields[] = $field;
-                    $sql_template .= PMA\libraries\Util::backquote($val);
-                }
-                $sql_template .= ') ';
-            }
-
-            $required_fields = count($fields);
-
-            $sql_template .= ' VALUES (';
-        }
-
-        // Defaults for parser
-        $i = 0;
-        $len = 0;
-        $lastlen = null;
-        $line = 1;
-        $lasti = -1;
-        $values = array();
-        $csv_finish = false;
-
-        $tempRow = array();
-        $rows = array();
-        $col_names = array();
-        $tables = array();
-
-        $col_count = 0;
-        $max_cols = 0;
-        $csv_terminated_len = mb_strlen($csv_terminated);
-        while (!($finished && $i >= $len) && !$error && !$timeout_passed) {
-            $data = PMA_importGetNextChunk();
-            if ($data === false) {
-                // subtract data we didn't handle yet and stop processing
-                $GLOBALS['offset'] -= strlen($buffer);
-                break;
-            } elseif ($data === true) {
-                // Handle rest of buffer
-            } else {
-                // Append new data to buffer
-                $buffer .= $data;
-                unset($data);
-
-                // Force a trailing new line at EOF to prevent parsing problems
-                if ($finished && $buffer) {
-                    $finalch = mb_substr($buffer, -1);
-                    if ($csv_new_line == 'auto'
-                        && $finalch != "\r"
-                        && $finalch != "\n"
-                    ) {
-                        $buffer .= "\n";
-                    } elseif ($csv_new_line != 'auto'
-                        && $finalch != $csv_new_line
-                    ) {
-                        $buffer .= $csv_new_line;
-                    }
-                }
-
-                // Do not parse string when we're not at the end
-                // and don't have new line inside
-                if (($csv_new_line == 'auto'
-                    && mb_strpos($buffer, "\r") === false
-                    && mb_strpos($buffer, "\n") === false)
-                    || ($csv_new_line != 'auto'
-                    && mb_strpos($buffer, $csv_new_line) === false)
-                ) {
-                    continue;
-                }
-            }
-
-            // Current length of our buffer
-            $len = mb_strlen($buffer);
-            // Currently parsed char
-
-            $ch = mb_substr($buffer, $i, 1);
-            if ($csv_terminated_len > 1 && $ch == $csv_terminated[0]) {
-                $ch = $this->readCsvTerminatedString(
-                    $buffer,
-                    $ch,
-                    $i,
-                    $csv_terminated_len
-                );
-                $i += $csv_terminated_len - 1;
-            }
-            while ($i < $len) {
-                // Deadlock protection
-                if ($lasti == $i && $lastlen == $len) {
-                    $message = PMA\libraries\Message::error(
-                        __('Invalid format of CSV input on line %d.')
-                    );
-                    $message->addParam($line);
-                    $error = true;
-                    break;
-                }
-                $lasti = $i;
-                $lastlen = $len;
-
-                // This can happen with auto EOL and \r at the end of buffer
-                if (!$csv_finish) {
-                    // Grab empty field
-                    if ($ch == $csv_terminated) {
-                        if ($i == $len - 1) {
-                            break;
-                        }
-                        $values[] = '';
-                        $i++;
-                        $ch = mb_substr($buffer, $i, 1);
-                        if ($csv_terminated_len > 1 && $ch == $csv_terminated[0]) {
-                            $ch = $this->readCsvTerminatedString(
-                                $buffer,
-                                $ch,
-                                $i,
-                                $csv_terminated_len
-                            );
-                            $i += $csv_terminated_len - 1;
-                        }
-                        continue;
-                    }
-
-                    // Grab one field
-                    $fallbacki = $i;
-                    if ($ch == $csv_enclosed) {
-                        if ($i == $len - 1) {
-                            break;
-                        }
-                        $need_end = true;
-                        $i++;
-                        $ch = mb_substr($buffer, $i, 1);
-                        if ($csv_terminated_len > 1 && $ch == $csv_terminated[0]) {
-                            $ch = $this->readCsvTerminatedString(
-                                $buffer,
-                                $ch,
-                                $i,
-                                $csv_terminated_len
-                            );
-                            $i += $csv_terminated_len - 1;
-                        }
-                    } else {
-                        $need_end = false;
-                    }
-                    $fail = false;
-                    $value = '';
-                    while (($need_end
-                            && ($ch != $csv_enclosed
-                                || $csv_enclosed == $csv_escaped))
-                        || (!$need_end
-                            && !($ch == $csv_terminated
-                                || $ch == $csv_new_line
-                                || ($csv_new_line == 'auto'
-                                    && ($ch == "\r" || $ch == "\n"))))
-                    ) {
-                        if ($ch == $csv_escaped) {
-                            if ($i == $len - 1) {
-                                $fail = true;
-                                break;
-                            }
-                            $i++;
-                            $ch = mb_substr($buffer, $i, 1);
-                            if ($csv_terminated_len > 1
-                                && $ch == $csv_terminated[0]
-                            ) {
-                                $ch = $this->readCsvTerminatedString(
-                                    $buffer,
-                                    $ch,
-                                    $i,
-                                    $csv_terminated_len
-                                );
-                                $i += $csv_terminated_len - 1;
-                            }
-                            if ($csv_enclosed == $csv_escaped
-                                && ($ch == $csv_terminated
-                                || $ch == $csv_new_line
-                                || ($csv_new_line == 'auto'
-                                && ($ch == "\r" || $ch == "\n")))
-                            ) {
-                                break;
-                            }
-                        }
-                        $value .= $ch;
-                        if ($i == $len - 1) {
-                            if (!$finished) {
-                                $fail = true;
-                            }
-                            break;
-                        }
-                        $i++;
-                        $ch = mb_substr($buffer, $i, 1);
-                        if ($csv_terminated_len > 1 && $ch == $csv_terminated[0]) {
-                            $ch = $this->readCsvTerminatedString(
-                                $buffer,
-                                $ch,
-                                $i,
-                                $csv_terminated_len
-                            );
-                            $i += $csv_terminated_len - 1;
-                        }
-                    }
-
-                    // unquoted NULL string
-                    if (false === $need_end && $value === 'NULL') {
-                        $value = null;
-                    }
-
-                    if ($fail) {
-                        $i = $fallbacki;
-                        $ch = mb_substr($buffer, $i, 1);
-                        if ($csv_terminated_len > 1 && $ch == $csv_terminated[0]) {
-                            $i += $csv_terminated_len - 1;
-                        }
-                        break;
-                    }
-                    // Need to strip trailing enclosing char?
-                    if ($need_end && $ch == $csv_enclosed) {
-                        if ($finished && $i == $len - 1) {
-                            $ch = null;
-                        } elseif ($i == $len - 1) {
-                            $i = $fallbacki;
-                            $ch = mb_substr($buffer, $i, 1);
-                            if ($csv_terminated_len > 1
-                                && $ch == $csv_terminated[0]
-                            ) {
-                                $i += $csv_terminated_len - 1;
-                            }
-                            break;
-                        } else {
-                            $i++;
-                            $ch = mb_substr($buffer, $i, 1);
-                            if ($csv_terminated_len > 1
-                                && $ch == $csv_terminated[0]
-                            ) {
-                                $ch = $this->readCsvTerminatedString(
-                                    $buffer,
-                                    $ch,
-                                    $i,
-                                    $csv_terminated_len
-                                );
-                                $i += $csv_terminated_len - 1;
-                            }
-                        }
-                    }
-                    // Are we at the end?
-                    if ($ch == $csv_new_line
-                        || ($csv_new_line == 'auto' && ($ch == "\r" || $ch == "\n"))
-                        || ($finished && $i == $len - 1)
-                    ) {
-                        $csv_finish = true;
-                    }
-                    // Go to next char
-                    if ($ch == $csv_terminated) {
-                        if ($i == $len - 1) {
-                            $i = $fallbacki;
-                            $ch = mb_substr($buffer, $i, 1);
-                            if ($csv_terminated_len > 1
-                                && $ch == $csv_terminated[0]
-                            ) {
-                                $i += $csv_terminated_len - 1;
-                            }
-                            break;
-                        }
-                        $i++;
-                        $ch = mb_substr($buffer, $i, 1);
-                        if ($csv_terminated_len > 1
-                            && $ch == $csv_terminated[0]
-                        ) {
-                            $ch = $this->readCsvTerminatedString(
-                                $buffer,
-                                $ch,
-                                $i,
-                                $csv_terminated_len
-                            );
-                            $i += $csv_terminated_len - 1;
-                        }
-                    }
-                    // If everything went okay, store value
-                    $values[] = $value;
-                }
-
-                // End of line
-                if ($csv_finish
-                    || $ch == $csv_new_line
-                    || ($csv_new_line == 'auto' && ($ch == "\r" || $ch == "\n"))
-                ) {
-                    if ($csv_new_line == 'auto' && $ch == "\r") { // Handle "\r\n"
-                        if ($i >= ($len - 2) && !$finished) {
-                            break; // We need more data to decide new line
-                        }
-                        if (mb_substr($buffer, $i + 1, 1) == "\n") {
-                            $i++;
-                        }
-                    }
-                    // We didn't parse value till the end of line, so there was
-                    // empty one
-                    if (!$csv_finish) {
-                        $values[] = '';
-                    }
-
-                    if ($this->_getAnalyze()) {
-                        foreach ($values as $val) {
-                            $tempRow[] = $val;
-                            ++$col_count;
-                        }
-
-                        if ($col_count > $max_cols) {
-                            $max_cols = $col_count;
-                        }
-                        $col_count = 0;
-
-                        $rows[] = $tempRow;
-                        $tempRow = array();
-                    } else {
-                        // Do we have correct count of values?
-                        if (count($values) != $required_fields) {
-
-                            // Hack for excel
-                            if ($values[count($values) - 1] == ';') {
-                                unset($values[count($values) - 1]);
-                            } else {
-                                $message = PMA\libraries\Message::error(
-                                    __(
-                                        'Invalid column count in CSV input'
-                                        . ' on line %d.'
-                                    )
-                                );
-                                $message->addParam($line);
-                                $error = true;
-                                break;
-                            }
-                        }
-
-                        $first = true;
-                        $sql = $sql_template;
-                        foreach ($values as $key => $val) {
-                            if (!$first) {
-                                $sql .= ', ';
-                            }
-                            if ($val === null) {
-                                $sql .= 'NULL';
-                            } else {
-                                $sql .= '\''
-                                    . $GLOBALS['dbi']->escapeString($val)
-                                    . '\'';
-                            }
-
-                            $first = false;
-                        }
-                        $sql .= ')';
-                        if (isset($_POST['csv_replace'])) {
-                            $sql .= " ON DUPLICATE KEY UPDATE ";
-                            foreach ($fields as $field) {
-                                $fieldName = PMA\libraries\Util::backquote(
-                                    $field['Field']
-                                );
-                                $sql .= $fieldName . " = VALUES(" . $fieldName
-                                    . "), ";
-                            }
-                            $sql = rtrim($sql, ', ');
-                        }
-
-                        /**
-                         * @todo maybe we could add original line to verbose
-                         * SQL in comment
-                         */
-                        PMA_importRunQuery($sql, $sql, $sql_data);
-                    }
-
-                    $line++;
-                    $csv_finish = false;
-                    $values = array();
-                    $buffer = mb_substr($buffer, $i + 1);
-                    $len = mb_strlen($buffer);
-                    $i = 0;
-                    $lasti = -1;
-                    $ch = mb_substr($buffer, 0, 1);
-                }
-            } // End of parser loop
-        } // End of import loop
-
-        if ($this->_getAnalyze()) {
-            /* Fill out all rows */
-            $num_rows = count($rows);
-            for ($i = 0; $i < $num_rows; ++$i) {
-                for ($j = count($rows[$i]); $j < $max_cols; ++$j) {
-                    $rows[$i][] = 'NULL';
-                }
-            }
-
-            if (isset($_REQUEST['csv_col_names'])) {
-                $col_names = array_splice($rows, 0, 1);
-                $col_names = $col_names[0];
-                // MySQL column names can't end with a space character.
-                foreach ($col_names as $key => $col_name) {
-                    $col_names[$key] = rtrim($col_name);
-                }
-            }
-
-            if ((isset($col_names) && count($col_names) != $max_cols)
-                || !isset($col_names)
-            ) {
-                // Fill out column names
-                for ($i = 0; $i < $max_cols; ++$i) {
-                    $col_names[] = 'COL ' . ($i + 1);
-                }
-            }
-
-            if (mb_strlen($db)) {
-                $result = $GLOBALS['dbi']->fetchResult('SHOW TABLES');
-                $tbl_name = 'TABLE ' . (count($result) + 1);
-            } else {
-                $tbl_name = 'TBL_NAME';
-            }
-
-            $tables[] = array($tbl_name, $col_names, $rows);
-
-            /* Obtain the best-fit MySQL types for each column */
-            $analyses = array();
-            $analyses[] = PMA_analyzeTable($tables[0]);
-
-            /**
-             * string $db_name (no backquotes)
-             *
-             * array $table = array(table_name, array() column_names, array()() rows)
-             * array $tables = array of "$table"s
-             *
-             * array $analysis = array(array() column_types, array() column_sizes)
-             * array $analyses = array of "$analysis"s
-             *
-             * array $create = array of SQL strings
-             *
-             * array $options = an associative array of options
-             */
-
-            /* Set database name to the currently selected one, if applicable */
-            list($db_name, $options) = $this->getDbnameAndOptions($db, 'CSV_DB');
-
-            /* Non-applicable parameters */
-            $create = null;
-
-            /* Created and execute necessary SQL statements from data */
-            PMA_buildSQL($db_name, $tables, $analyses, $create, $options, $sql_data);
-
-            unset($tables);
-            unset($analyses);
-        }
-
-        // Commit any possible data in buffers
-        PMA_importRunQuery('', '', $sql_data);
-
-        if (count($values) != 0 && !$error) {
-            $message = PMA\libraries\Message::error(
-                __('Invalid format of CSV input on line %d.')
-            );
-            $message->addParam($line);
-            $error = true;
-        }
-    }
-
-    /**
-     * Read the expected column_separated_with String of length
-     * $csv_terminated_len from the $buffer
-     * into variable $ch and return the read string $ch
-     *
-     * @param string $buffer             The original string buffer read from
-     *                                   csv file
-     * @param string $ch                 Partially read "column Separated with"
-     *                                   string, also used to return after
-     *                                   reading length equal $csv_terminated_len
-     * @param int    $i                  Current read counter of buffer string
-     * @param int    $csv_terminated_len The length of "column separated with"
-     *                                   String
-     *
-     * @return string
-     */
-    public function readCsvTerminatedString($buffer, $ch, $i, $csv_terminated_len)
-    {
-        for ($j = 0; $j < $csv_terminated_len - 1; $j++) {
-            $i++;
-            $ch .= mb_substr($buffer, $i, 1);
-        }
-
-        return $ch;
-    }
-    /* ~~~~~~~~~~~~~~~~~~~~ Getters and Setters ~~~~~~~~~~~~~~~~~~~~ */
-
-    /**
-     * Returns true if the table should be analyzed, false otherwise
-     *
-     * @return bool
-     */
-    private function _getAnalyze()
-    {
-        return $this->_analyze;
-    }
-
-    /**
-     * Sets to true if the table should be analyzed, false otherwise
-     *
-     * @param bool $analyze status
-     *
-     * @return void
-     */
-    private function _setAnalyze($analyze)
-    {
-        $this->_analyze = $analyze;
-    }
-}
diff --git a/#pma/libraries/plugins/import/ImportLdi.php b/#pma/libraries/plugins/import/ImportLdi.php
deleted file mode 100644
index c1d8540e..00000000
--- a/#pma/libraries/plugins/import/ImportLdi.php
+++ /dev/null
@@ -1,173 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * CSV import plugin for phpMyAdmin using LOAD DATA
- *
- * @package    PhpMyAdmin-Import
- * @subpackage LDI
- */
-namespace PMA\libraries\plugins\import;
-
-use PMA\libraries\properties\options\items\BoolPropertyItem;
-use PMA;
-use PMA\libraries\plugins\import\AbstractImportCsv;
-use PMA\libraries\properties\options\items\TextPropertyItem;
-
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
-// We need relations enabled and we work only on database
-if ($GLOBALS['plugin_param'] !== 'table') {
-    $GLOBALS['skip_import'] = true;
-
-    return;
-}
-
-/**
- * Handles the import for the CSV format using load data
- *
- * @package    PhpMyAdmin-Import
- * @subpackage LDI
- */
-class ImportLdi extends AbstractImportCsv
-{
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        $this->setProperties();
-    }
-
-    /**
-     * Sets the import plugin properties.
-     * Called in the constructor.
-     *
-     * @return void
-     */
-    protected function setProperties()
-    {
-        if ($GLOBALS['cfg']['Import']['ldi_local_option'] == 'auto') {
-            $GLOBALS['cfg']['Import']['ldi_local_option'] = false;
-
-            $result = $GLOBALS['dbi']->tryQuery(
-                'SELECT @@local_infile;'
-            );
-            if ($result != false && $GLOBALS['dbi']->numRows($result) > 0) {
-                $tmp = $GLOBALS['dbi']->fetchRow($result);
-                if ($tmp[0] == 'ON') {
-                    $GLOBALS['cfg']['Import']['ldi_local_option'] = true;
-                }
-            }
-            $GLOBALS['dbi']->freeResult($result);
-            unset($result);
-        }
-
-        $generalOptions = parent::setProperties();
-        $this->properties->setText('CSV using LOAD DATA');
-        $this->properties->setExtension('ldi');
-
-        $leaf = new TextPropertyItem(
-            "columns",
-            __('Column names: ')
-        );
-        $generalOptions->addProperty($leaf);
-
-        $leaf = new BoolPropertyItem(
-            "ignore",
-            __('Do not abort on INSERT error')
-        );
-        $generalOptions->addProperty($leaf);
-
-        $leaf = new BoolPropertyItem(
-            "local_option",
-            __('Use LOCAL keyword')
-        );
-        $generalOptions->addProperty($leaf);
-    }
-
-    /**
-     * Handles the whole import logic
-     *
-     * @param array &$sql_data 2-element array with sql data
-     *
-     * @return void
-     */
-    public function doImport(&$sql_data = array())
-    {
-        global $finished, $import_file, $compression, $charset_conversion, $table;
-        global $ldi_local_option, $ldi_replace, $ldi_ignore, $ldi_terminated,
-               $ldi_enclosed, $ldi_escaped, $ldi_new_line, $skip_queries, $ldi_columns;
-
-        if ($import_file == 'none'
-            || $compression != 'none'
-            || $charset_conversion
-        ) {
-            // We handle only some kind of data!
-            $GLOBALS['message'] = PMA\libraries\Message::error(
-                __('This plugin does not support compressed imports!')
-            );
-            $GLOBALS['error'] = true;
-
-            return;
-        }
-
-        $sql = 'LOAD DATA';
-        if (isset($ldi_local_option)) {
-            $sql .= ' LOCAL';
-        }
-        $sql .= ' INFILE \'' . $GLOBALS['dbi']->escapeString($import_file)
-            . '\'';
-        if (isset($ldi_replace)) {
-            $sql .= ' REPLACE';
-        } elseif (isset($ldi_ignore)) {
-            $sql .= ' IGNORE';
-        }
-        $sql .= ' INTO TABLE ' . PMA\libraries\Util::backquote($table);
-
-        if (strlen($ldi_terminated) > 0) {
-            $sql .= ' FIELDS TERMINATED BY \'' . $ldi_terminated . '\'';
-        }
-        if (strlen($ldi_enclosed) > 0) {
-            $sql .= ' ENCLOSED BY \''
-                . $GLOBALS['dbi']->escapeString($ldi_enclosed) . '\'';
-        }
-        if (strlen($ldi_escaped) > 0) {
-            $sql .= ' ESCAPED BY \''
-                . $GLOBALS['dbi']->escapeString($ldi_escaped) . '\'';
-        }
-        if (strlen($ldi_new_line) > 0) {
-            if ($ldi_new_line == 'auto') {
-                $ldi_new_line
-                    = (PMA\libraries\Util::whichCrlf() == "\n")
-                    ? '\n'
-                    : '\r\n';
-            }
-            $sql .= ' LINES TERMINATED BY \'' . $ldi_new_line . '\'';
-        }
-        if ($skip_queries > 0) {
-            $sql .= ' IGNORE ' . $skip_queries . ' LINES';
-            $skip_queries = 0;
-        }
-        if (strlen($ldi_columns) > 0) {
-            $sql .= ' (';
-            $tmp = preg_split('/,( ?)/', $ldi_columns);
-            $cnt_tmp = count($tmp);
-            for ($i = 0; $i < $cnt_tmp; $i++) {
-                if ($i > 0) {
-                    $sql .= ', ';
-                }
-                /* Trim also `, if user already included backquoted fields */
-                $sql .= PMA\libraries\Util::backquote(
-                    trim($tmp[$i], " \t\r\n\0\x0B`")
-                );
-            } // end for
-            $sql .= ')';
-        }
-
-        PMA_importRunQuery($sql, $sql, $sql_data);
-        PMA_importRunQuery('', '', $sql_data);
-        $finished = true;
-    }
-}
diff --git a/#pma/libraries/plugins/import/ImportMediawiki.php b/#pma/libraries/plugins/import/ImportMediawiki.php
deleted file mode 100644
index fce1c868..00000000
--- a/#pma/libraries/plugins/import/ImportMediawiki.php
+++ /dev/null
@@ -1,598 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * MediaWiki import plugin for phpMyAdmin
- *
- * @package    PhpMyAdmin-Import
- * @subpackage MediaWiki
- */
-namespace PMA\libraries\plugins\import;
-
-use PMA\libraries\properties\plugins\ImportPluginProperties;
-use PMA;
-use PMA\libraries\plugins\ImportPlugin;
-
-/**
- * Handles the import for the MediaWiki format
- *
- * @package    PhpMyAdmin-Import
- * @subpackage MediaWiki
- */
-class ImportMediawiki extends ImportPlugin
-{
-    /**
-     * Whether to analyze tables
-     *
-     * @var bool
-     */
-    private $_analyze;
-
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        $this->setProperties();
-    }
-
-    /**
-     * Sets the import plugin properties.
-     * Called in the constructor.
-     *
-     * @return void
-     */
-    protected function setProperties()
-    {
-        $this->_setAnalyze(false);
-        if ($GLOBALS['plugin_param'] !== 'table') {
-            $this->_setAnalyze(true);
-        }
-
-        $importPluginProperties = new ImportPluginProperties();
-        $importPluginProperties->setText(__('MediaWiki Table'));
-        $importPluginProperties->setExtension('txt');
-        $importPluginProperties->setMimeType('text/plain');
-        $importPluginProperties->setOptions(array());
-        $importPluginProperties->setOptionsText(__('Options'));
-
-        $this->properties = $importPluginProperties;
-    }
-
-    /**
-     * Handles the whole import logic
-     *
-     * @param array &$sql_data 2-element array with sql data
-     *
-     * @return void
-     */
-    public function doImport(&$sql_data = array())
-    {
-        global $error, $timeout_passed, $finished;
-
-        // Defaults for parser
-
-        // The buffer that will be used to store chunks read from the imported file
-        $buffer = '';
-
-        // Used as storage for the last part of the current chunk data
-        // Will be appended to the first line of the next chunk, if there is one
-        $last_chunk_line = '';
-
-        // Remembers whether the current buffer line is part of a comment
-        $inside_comment = false;
-        // Remembers whether the current buffer line is part of a data comment
-        $inside_data_comment = false;
-        // Remembers whether the current buffer line is part of a structure comment
-        $inside_structure_comment = false;
-
-        // MediaWiki only accepts "\n" as row terminator
-        $mediawiki_new_line = "\n";
-
-        // Initialize the name of the current table
-        $cur_table_name = "";
-
-        while (!$finished && !$error && !$timeout_passed) {
-            $data = PMA_importGetNextChunk();
-
-            if ($data === false) {
-                // Subtract data we didn't handle yet and stop processing
-                $GLOBALS['offset'] -= mb_strlen($buffer);
-                break;
-            } elseif ($data === true) {
-                // Handle rest of buffer
-            } else {
-                // Append new data to buffer
-                $buffer = $data;
-                unset($data);
-                // Don't parse string if we're not at the end
-                // and don't have a new line inside
-                if (mb_strpos($buffer, $mediawiki_new_line) === false) {
-                    continue;
-                }
-            }
-
-            // Because of reading chunk by chunk, the first line from the buffer
-            // contains only a portion of an actual line from the imported file.
-            // Therefore, we have to append it to the last line from the previous
-            // chunk. If we are at the first chunk, $last_chunk_line should be empty.
-            $buffer = $last_chunk_line . $buffer;
-
-            // Process the buffer line by line
-            $buffer_lines = explode($mediawiki_new_line, $buffer);
-
-            $full_buffer_lines_count = count($buffer_lines);
-            // If the reading is not finalised, the final line of the current chunk
-            // will not be complete
-            if (! $finished) {
-                $last_chunk_line = $buffer_lines[--$full_buffer_lines_count];
-            }
-
-            for ($line_nr = 0; $line_nr < $full_buffer_lines_count; ++$line_nr) {
-                $cur_buffer_line = trim($buffer_lines[$line_nr]);
-
-                // If the line is empty, go to the next one
-                if ($cur_buffer_line === '') {
-                    continue;
-                }
-
-                $first_character = $cur_buffer_line[0];
-                $matches = array();
-
-                // Check beginning of comment
-                if (!strcmp(mb_substr($cur_buffer_line, 0, 4), "<!--")) {
-                    $inside_comment = true;
-                    continue;
-                } elseif ($inside_comment) {
-                    // Check end of comment
-                    if (!strcmp(mb_substr($cur_buffer_line, 0, 4), "-->")
-                    ) {
-                        // Only data comments are closed. The structure comments
-                        // will be closed when a data comment begins (in order to
-                        // skip structure tables)
-                        if ($inside_data_comment) {
-                            $inside_data_comment = false;
-                        }
-
-                        // End comments that are not related to table structure
-                        if (!$inside_structure_comment) {
-                            $inside_comment = false;
-                        }
-                    } else {
-                        // Check table name
-                        $match_table_name = array();
-                        if (preg_match(
-                            "/^Table data for `(.*)`$/",
-                            $cur_buffer_line,
-                            $match_table_name
-                        )
-                        ) {
-                            $cur_table_name = $match_table_name[1];
-                            $inside_data_comment = true;
-
-                            $inside_structure_comment
-                                = $this->_mngInsideStructComm(
-                                    $inside_structure_comment
-                                );
-                        } elseif (preg_match(
-                            "/^Table structure for `(.*)`$/",
-                            $cur_buffer_line,
-                            $match_table_name
-                        )
-                        ) {
-                            // The structure comments will be ignored
-                            $inside_structure_comment = true;
-                        }
-                    }
-                    continue;
-                } elseif (preg_match('/^\{\|(.*)$/', $cur_buffer_line, $matches)) {
-                    // Check start of table
-
-                    // This will store all the column info on all rows from
-                    // the current table read from the buffer
-                    $cur_temp_table = array();
-
-                    // Will be used as storage for the current row in the buffer
-                    // Once all its columns are read, it will be added to
-                    // $cur_temp_table and then it will be emptied
-                    $cur_temp_line = array();
-
-                    // Helps us differentiate the header columns
-                    // from the normal columns
-                    $in_table_header = false;
-                    // End processing because the current line does not
-                    // contain any column information
-                } elseif (mb_substr($cur_buffer_line, 0, 2) === '|-'
-                    || mb_substr($cur_buffer_line, 0, 2) === '|+'
-                    || mb_substr($cur_buffer_line, 0, 2) === '|}'
-                ) {
-                    // Check begin row or end table
-
-                    // Add current line to the values storage
-                    if (!empty($cur_temp_line)) {
-                        // If the current line contains header cells
-                        // ( marked with '!' ),
-                        // it will be marked as table header
-                        if ($in_table_header) {
-                            // Set the header columns
-                            $cur_temp_table_headers = $cur_temp_line;
-                        } else {
-                            // Normal line, add it to the table
-                            $cur_temp_table [] = $cur_temp_line;
-                        }
-                    }
-
-                    // Empty the temporary buffer
-                    $cur_temp_line = array();
-
-                    // No more processing required at the end of the table
-                    if (mb_substr($cur_buffer_line, 0, 2) === '|}') {
-                        $current_table = array(
-                            $cur_table_name,
-                            $cur_temp_table_headers,
-                            $cur_temp_table,
-                        );
-
-                        // Import the current table data into the database
-                        $this->_importDataOneTable($current_table, $sql_data);
-
-                        // Reset table name
-                        $cur_table_name = "";
-                    }
-                    // What's after the row tag is now only attributes
-
-                } elseif (($first_character === '|') || ($first_character === '!')) {
-                    // Check cell elements
-
-                    // Header cells
-                    if ($first_character === '!') {
-                        // Mark as table header, but treat as normal row
-                        $cur_buffer_line = str_replace('!!', '||', $cur_buffer_line);
-                        // Will be used to set $cur_temp_line as table header
-                        $in_table_header = true;
-                    } else {
-                        $in_table_header = false;
-                    }
-
-                    // Loop through each table cell
-                    $cells = $this->_explodeMarkup($cur_buffer_line);
-                    foreach ($cells as $cell) {
-                        $cell = $this->_getCellData($cell);
-
-                        // Delete the beginning of the column, if there is one
-                        $cell = trim($cell);
-                        $col_start_chars = array("|", "!");
-                        foreach ($col_start_chars as $col_start_char) {
-                            $cell = $this->_getCellContent($cell, $col_start_char);
-                        }
-
-                        // Add the cell to the row
-                        $cur_temp_line [] = $cell;
-                    } // foreach $cells
-                } else {
-                    // If it's none of the above, then the current line has a bad
-                    // format
-                    $message = PMA\libraries\Message::error(
-                        __('Invalid format of mediawiki input on line: <br />%s.')
-                    );
-                    $message->addParam($cur_buffer_line);
-                    $error = true;
-                }
-            } // End treating full buffer lines
-        } // while - finished parsing buffer
-    }
-
-    /**
-     * Imports data from a single table
-     *
-     * @param array $table    containing all table info:
-     *                        <code>
-     *                        $table[0] - string containing table name
-     *                        $table[1] - array[]   of table headers
-     *                        $table[2] - array[][] of table content rows
-     *                        </code>
-     *
-     * @param array &$sql_data 2-element array with sql data
-     *
-     * @global bool $analyze whether to scan for column types
-     *
-     * @return void
-     */
-    private function _importDataOneTable($table, &$sql_data)
-    {
-        $analyze = $this->_getAnalyze();
-        if ($analyze) {
-            // Set the table name
-            $this->_setTableName($table[0]);
-
-            // Set generic names for table headers if they don't exist
-            $this->_setTableHeaders($table[1], $table[2][0]);
-
-            // Create the tables array to be used in PMA_buildSQL()
-            $tables = array();
-            $tables [] = array($table[0], $table[1], $table[2]);
-
-            // Obtain the best-fit MySQL types for each column
-            $analyses = array();
-            $analyses [] = PMA_analyzeTable($tables[0]);
-
-            $this->_executeImportTables($tables, $analyses, $sql_data);
-        }
-
-        // Commit any possible data in buffers
-        PMA_importRunQuery('', '', $sql_data);
-    }
-
-    /**
-     * Sets the table name
-     *
-     * @param string &$table_name reference to the name of the table
-     *
-     * @return void
-     */
-    private function _setTableName(&$table_name)
-    {
-        if (empty($table_name)) {
-            $result = $GLOBALS['dbi']->fetchResult('SHOW TABLES');
-            // todo check if the name below already exists
-            $table_name = 'TABLE ' . (count($result) + 1);
-        }
-    }
-
-    /**
-     * Set generic names for table headers, if they don't exist
-     *
-     * @param array &$table_headers reference to the array containing the headers
-     *                              of a table
-     * @param array $table_row      array containing the first content row
-     *
-     * @return void
-     */
-    private function _setTableHeaders(&$table_headers, $table_row)
-    {
-        if (empty($table_headers)) {
-            // The first table row should contain the number of columns
-            // If they are not set, generic names will be given (COL 1, COL 2, etc)
-            $num_cols = count($table_row);
-            for ($i = 0; $i < $num_cols; ++$i) {
-                $table_headers [$i] = 'COL ' . ($i + 1);
-            }
-        }
-    }
-
-    /**
-     * Sets the database name and additional options and calls PMA_buildSQL()
-     * Used in PMA_importDataAllTables() and $this->_importDataOneTable()
-     *
-     * @param array &$tables   structure:
-     *                         array(
-     *                         array(table_name, array() column_names, array()()
-     *                         rows)
-     *                         )
-     * @param array &$analyses structure:
-     *                         $analyses = array(
-     *                         array(array() column_types, array() column_sizes)
-     *                         )
-     * @param array &$sql_data 2-element array with sql data
-     *
-     * @global string $db      name of the database to import in
-     *
-     * @return void
-     */
-    private function _executeImportTables(&$tables, &$analyses, &$sql_data)
-    {
-        global $db;
-
-        // $db_name : The currently selected database name, if applicable
-        //            No backquotes
-        // $options : An associative array of options
-        list($db_name, $options) = $this->getDbnameAndOptions($db, 'mediawiki_DB');
-
-        // Array of SQL strings
-        // Non-applicable parameters
-        $create = null;
-
-        // Create and execute necessary SQL statements from data
-        PMA_buildSQL($db_name, $tables, $analyses, $create, $options, $sql_data);
-
-        unset($tables);
-        unset($analyses);
-    }
-
-    /**
-     * Replaces all instances of the '||' separator between delimiters
-     * in a given string
-     *
-     * @param string $replace the string to be replaced with
-     * @param string $subject the text to be replaced
-     *
-     * @return string with replacements
-     */
-    private function _delimiterReplace($replace, $subject)
-    {
-        // String that will be returned
-        $cleaned = "";
-        // Possible states of current character
-        $inside_tag = false;
-        $inside_attribute = false;
-        // Attributes can be declared with either " or '
-        $start_attribute_character = false;
-
-        // The full separator is "||";
-        // This remembers if the previous character was '|'
-        $partial_separator = false;
-
-        // Parse text char by char
-        for ($i = 0; $i < strlen($subject); $i++) {
-            $cur_char = $subject[$i];
-            // Check for separators
-            if ($cur_char == '|') {
-                // If we're not inside a tag, then this is part of a real separator,
-                // so we append it to the current segment
-                if (!$inside_attribute) {
-                    $cleaned .= $cur_char;
-                    if ($partial_separator) {
-                        $inside_tag = false;
-                        $inside_attribute = false;
-                    }
-                } elseif ($partial_separator) {
-                    // If we are inside a tag, we replace the current char with
-                    // the placeholder and append that to the current segment
-                    $cleaned .= $replace;
-                }
-
-                // If the previous character was also '|', then this ends a
-                // full separator. If not, this may be the beginning of one
-                $partial_separator = !$partial_separator;
-            } else {
-                // If we're inside a tag attribute and the current character is
-                // not '|', but the previous one was, it means that the single '|'
-                // was not appended, so we append it now
-                if ($partial_separator && $inside_attribute) {
-                    $cleaned .= "|";
-                }
-                // If the char is different from "|", no separator can be formed
-                $partial_separator = false;
-
-                // any other character should be appended to the current segment
-                $cleaned .= $cur_char;
-
-                if ($cur_char == '<' && !$inside_attribute) {
-                    // start of a tag
-                    $inside_tag = true;
-                } elseif ($cur_char == '>' && !$inside_attribute) {
-                    // end of a tag
-                    $inside_tag = false;
-                } elseif (($cur_char == '"' || $cur_char == "'") && $inside_tag) {
-                    // start or end of an attribute
-                    if (!$inside_attribute) {
-                        $inside_attribute = true;
-                        // remember the attribute`s declaration character (" or ')
-                        $start_attribute_character = $cur_char;
-                    } else {
-                        if ($cur_char == $start_attribute_character) {
-                            $inside_attribute = false;
-                            // unset attribute declaration character
-                            $start_attribute_character = false;
-                        }
-                    }
-                }
-            }
-        } // end for each character in $subject
-
-        return $cleaned;
-    }
-
-    /**
-     * Separates a string into items, similarly to explode
-     * Uses the '||' separator (which is standard in the mediawiki format)
-     * and ignores any instances of it inside markup tags
-     * Used in parsing buffer lines containing data cells
-     *
-     * @param string $text text to be split
-     *
-     * @return array
-     */
-    private function _explodeMarkup($text)
-    {
-        $separator = "||";
-        $placeholder = "\x00";
-
-        // Remove placeholder instances
-        $text = str_replace($placeholder, '', $text);
-
-        // Replace instances of the separator inside HTML-like
-        // tags with the placeholder
-        $cleaned = $this->_delimiterReplace($placeholder, $text);
-        // Explode, then put the replaced separators back in
-        $items = explode($separator, $cleaned);
-        foreach ($items as $i => $str) {
-            $items[$i] = str_replace($placeholder, $separator, $str);
-        }
-
-        return $items;
-    }
-
-
-    /* ~~~~~~~~~~~~~~~~~~~~ Getters and Setters ~~~~~~~~~~~~~~~~~~~~ */
-
-    /**
-     * Returns true if the table should be analyzed, false otherwise
-     *
-     * @return bool
-     */
-    private function _getAnalyze()
-    {
-        return $this->_analyze;
-    }
-
-    /**
-     * Sets to true if the table should be analyzed, false otherwise
-     *
-     * @param bool $analyze status
-     *
-     * @return void
-     */
-    private function _setAnalyze($analyze)
-    {
-        $this->_analyze = $analyze;
-    }
-
-    /**
-     * Get cell
-     *
-     * @param string $cell Cell
-     *
-     * @return mixed
-     */
-    private function _getCellData($cell)
-    {
-        // A cell could contain both parameters and data
-        $cell_data = explode('|', $cell, 2);
-
-        // A '|' inside an invalid link should not
-        // be mistaken as delimiting cell parameters
-        if (mb_strpos($cell_data[0], '[[') === false) {
-            return $cell;
-        }
-
-        if (count($cell_data) == 1) {
-            return $cell_data[0];
-        }
-
-        return $cell_data[1];
-    }
-
-    /**
-     * Manage $inside_structure_comment
-     *
-     * @param boolean $inside_structure_comment Value to test
-     *
-     * @return bool
-     */
-    private function _mngInsideStructComm($inside_structure_comment)
-    {
-        // End ignoring structure rows
-        if ($inside_structure_comment) {
-            $inside_structure_comment = false;
-        }
-
-        return $inside_structure_comment;
-    }
-
-    /**
-     * Get cell content
-     *
-     * @param string $cell           Cell
-     * @param string $col_start_char Start char
-     *
-     * @return string
-     */
-    private function _getCellContent($cell, $col_start_char)
-    {
-        if (mb_strpos($cell, $col_start_char) === 0) {
-            $cell = trim(mb_substr($cell, 1));
-        }
-
-        return $cell;
-    }
-}
diff --git a/#pma/libraries/plugins/import/ImportOds.php b/#pma/libraries/plugins/import/ImportOds.php
deleted file mode 100644
index 7e06ae5d..00000000
--- a/#pma/libraries/plugins/import/ImportOds.php
+++ /dev/null
@@ -1,430 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * OpenDocument Spreadsheet import plugin for phpMyAdmin
- *
- * @todo       Pretty much everything
- * @todo       Importing of accented characters seems to fail
- * @package    PhpMyAdmin-Import
- * @subpackage ODS
- */
-namespace PMA\libraries\plugins\import;
-
-use PMA\libraries\properties\options\items\BoolPropertyItem;
-use PMA\libraries\properties\plugins\ImportPluginProperties;
-use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
-use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
-use PMA;
-use PMA\libraries\plugins\ImportPlugin;
-use SimpleXMLElement;
-
-/**
- * We need way to disable external XML entities processing.
- */
-if (!function_exists('libxml_disable_entity_loader')) {
-    $GLOBALS['skip_import'] = true;
-
-    return;
-}
-
-/**
- * Handles the import for the ODS format
- *
- * @package    PhpMyAdmin-Import
- * @subpackage ODS
- */
-class ImportOds extends ImportPlugin
-{
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        $this->setProperties();
-    }
-
-    /**
-     * Sets the import plugin properties.
-     * Called in the constructor.
-     *
-     * @return void
-     */
-    protected function setProperties()
-    {
-        $importPluginProperties = new ImportPluginProperties();
-        $importPluginProperties->setText('OpenDocument Spreadsheet');
-        $importPluginProperties->setExtension('ods');
-        $importPluginProperties->setOptionsText(__('Options'));
-
-        // create the root group that will be the options field for
-        // $importPluginProperties
-        // this will be shown as "Format specific options"
-        $importSpecificOptions = new OptionsPropertyRootGroup(
-            "Format Specific Options"
-        );
-
-        // general options main group
-        $generalOptions = new OptionsPropertyMainGroup("general_opts");
-        // create primary items and add them to the group
-        $leaf = new BoolPropertyItem(
-            "col_names",
-            __(
-                'The first line of the file contains the table column names'
-                . ' <i>(if this is unchecked, the first line will become part'
-                . ' of the data)</i>'
-            )
-        );
-        $generalOptions->addProperty($leaf);
-        $leaf = new BoolPropertyItem(
-            "empty_rows",
-            __('Do not import empty rows')
-        );
-        $generalOptions->addProperty($leaf);
-        $leaf = new BoolPropertyItem(
-            "recognize_percentages",
-            __(
-                'Import percentages as proper decimals <i>(ex. 12.00% to .12)</i>'
-            )
-        );
-        $generalOptions->addProperty($leaf);
-        $leaf = new BoolPropertyItem(
-            "recognize_currency",
-            __('Import currencies <i>(ex. $5.00 to 5.00)</i>')
-        );
-        $generalOptions->addProperty($leaf);
-
-        // add the main group to the root group
-        $importSpecificOptions->addProperty($generalOptions);
-
-        // set the options for the import plugin property item
-        $importPluginProperties->setOptions($importSpecificOptions);
-        $this->properties = $importPluginProperties;
-    }
-
-    /**
-     * Handles the whole import logic
-     *
-     * @param array &$sql_data 2-element array with sql data
-     *
-     * @return void
-     */
-    public function doImport(&$sql_data = array())
-    {
-        global $db, $error, $timeout_passed, $finished;
-
-        $i = 0;
-        $len = 0;
-        $buffer = "";
-
-        /**
-         * Read in the file via PMA_importGetNextChunk so that
-         * it can process compressed files
-         */
-        while (!($finished && $i >= $len) && !$error && !$timeout_passed) {
-            $data = PMA_importGetNextChunk();
-            if ($data === false) {
-                /* subtract data we didn't handle yet and stop processing */
-                $GLOBALS['offset'] -= strlen($buffer);
-                break;
-            } elseif ($data === true) {
-                /* Handle rest of buffer */
-            } else {
-                /* Append new data to buffer */
-                $buffer .= $data;
-                unset($data);
-            }
-        }
-
-        unset($data);
-
-        /**
-         * Disable loading of external XML entities.
-         */
-        libxml_disable_entity_loader();
-
-        /**
-         * Load the XML string
-         *
-         * The option LIBXML_COMPACT is specified because it can
-         * result in increased performance without the need to
-         * alter the code in any way. It's basically a freebee.
-         */
-        $xml = @simplexml_load_string($buffer, "SimpleXMLElement", LIBXML_COMPACT);
-
-        unset($buffer);
-
-        if ($xml === false) {
-            $sheets = array();
-            $GLOBALS['message'] = PMA\libraries\Message::error(
-                __(
-                    'The XML file specified was either malformed or incomplete.'
-                    . ' Please correct the issue and try again.'
-                )
-            );
-            $GLOBALS['error'] = true;
-        } else {
-            /** @var SimpleXMLElement $root */
-            $root = $xml->children('office', true)->{'body'}->{'spreadsheet'};
-            if (empty($root)) {
-                $sheets = array();
-                $GLOBALS['message'] = PMA\libraries\Message::error(
-                    __('Could not parse OpenDocument Spreadsheet!')
-                );
-                $GLOBALS['error'] = true;
-            } else {
-                $sheets = $root->children('table', true);
-            }
-        }
-
-        $tables = array();
-
-        $max_cols = 0;
-
-        $col_count = 0;
-        $col_names = array();
-
-        $tempRow = array();
-        $tempRows = array();
-        $rows = array();
-
-        /* Iterate over tables */
-        /** @var SimpleXMLElement $sheet */
-        foreach ($sheets as $sheet) {
-            $col_names_in_first_row = isset($_REQUEST['ods_col_names']);
-
-            /* Iterate over rows */
-            /** @var SimpleXMLElement $row */
-            foreach ($sheet as $row) {
-                $type = $row->getName();
-                if (strcmp('table-row', $type)) {
-                    continue;
-                }
-                /* Iterate over columns */
-                $cellCount = count($row);
-                $a = 0;
-                /** @var SimpleXMLElement $cell */
-                foreach ($row as $cell) {
-                    $a++;
-                    $text = $cell->children('text', true);
-                    $cell_attrs = $cell->attributes('office', true);
-
-                    if (count($text) != 0) {
-                        $attr = $cell->attributes('table', true);
-                        $num_repeat = (int)$attr['number-columns-repeated'];
-                        $num_iterations = $num_repeat ? $num_repeat : 1;
-
-                        for ($k = 0; $k < $num_iterations; $k++) {
-                            $value = $this->getValue($cell_attrs, $text);
-                            if (!$col_names_in_first_row) {
-                                $tempRow[] = $value;
-                            } else {
-                                // MySQL column names can't end with a space
-                                // character.
-                                $col_names[] = rtrim($value);
-                            }
-
-                            ++$col_count;
-                        }
-                        continue;
-                    }
-
-                    // skip empty repeats in the last row
-                    if ($a == $cellCount) {
-                        continue;
-                    }
-
-                    $attr = $cell->attributes('table', true);
-                    $num_null = (int)$attr['number-columns-repeated'];
-
-                    if ($num_null) {
-                        if (!$col_names_in_first_row) {
-                            for ($i = 0; $i < $num_null; ++$i) {
-                                $tempRow[] = 'NULL';
-                                ++$col_count;
-                            }
-                        } else {
-                            for ($i = 0; $i < $num_null; ++$i) {
-                                $col_names[] = PMA_getColumnAlphaName(
-                                    $col_count + 1
-                                );
-                                ++$col_count;
-                            }
-                        }
-                    } else {
-                        if (!$col_names_in_first_row) {
-                            $tempRow[] = 'NULL';
-                        } else {
-                            $col_names[] = PMA_getColumnAlphaName(
-                                $col_count + 1
-                            );
-                        }
-
-                        ++$col_count;
-                    }
-                } //Endforeach
-
-                /* Find the widest row */
-                if ($col_count > $max_cols) {
-                    $max_cols = $col_count;
-                }
-
-                /* Don't include a row that is full of NULL values */
-                if (!$col_names_in_first_row) {
-                    if ($_REQUEST['ods_empty_rows']) {
-                        foreach ($tempRow as $cell) {
-                            if (strcmp('NULL', $cell)) {
-                                $tempRows[] = $tempRow;
-                                break;
-                            }
-                        }
-                    } else {
-                        $tempRows[] = $tempRow;
-                    }
-                }
-
-                $col_count = 0;
-                $col_names_in_first_row = false;
-                $tempRow = array();
-            }
-
-            /* Skip over empty sheets */
-            if (count($tempRows) == 0 || count($tempRows[0]) == 0) {
-                $col_names = array();
-                $tempRow = array();
-                $tempRows = array();
-                continue;
-            }
-
-            /**
-             * Fill out each row as necessary to make
-             * every one exactly as wide as the widest
-             * row. This included column names.
-             */
-
-            /* Fill out column names */
-            for ($i = count($col_names); $i < $max_cols; ++$i) {
-                $col_names[] = PMA_getColumnAlphaName($i + 1);
-            }
-
-            /* Fill out all rows */
-            $num_rows = count($tempRows);
-            for ($i = 0; $i < $num_rows; ++$i) {
-                for ($j = count($tempRows[$i]); $j < $max_cols; ++$j) {
-                    $tempRows[$i][] = 'NULL';
-                }
-            }
-
-            /* Store the table name so we know where to place the row set */
-            $tbl_attr = $sheet->attributes('table', true);
-            $tables[] = array((string)$tbl_attr['name']);
-
-            /* Store the current sheet in the accumulator */
-            $rows[] = array((string)$tbl_attr['name'], $col_names, $tempRows);
-            $tempRows = array();
-            $col_names = array();
-            $max_cols = 0;
-        }
-
-        unset($tempRow);
-        unset($tempRows);
-        unset($col_names);
-        unset($sheets);
-        unset($xml);
-
-        /**
-         * Bring accumulated rows into the corresponding table
-         */
-        $num_tables = count($tables);
-        for ($i = 0; $i < $num_tables; ++$i) {
-            $num_rows = count($rows);
-            for ($j = 0; $j < $num_rows; ++$j) {
-                if (strcmp($tables[$i][TBL_NAME], $rows[$j][TBL_NAME])) {
-                    continue;
-                }
-
-                if (!isset($tables[$i][COL_NAMES])) {
-                    $tables[$i][] = $rows[$j][COL_NAMES];
-                }
-
-                $tables[$i][ROWS] = $rows[$j][ROWS];
-            }
-        }
-
-        /* No longer needed */
-        unset($rows);
-
-        /* Obtain the best-fit MySQL types for each column */
-        $analyses = array();
-
-        $len = count($tables);
-        for ($i = 0; $i < $len; ++$i) {
-            $analyses[] = PMA_analyzeTable($tables[$i]);
-        }
-
-        /**
-         * string $db_name (no backquotes)
-         *
-         * array $table = array(table_name, array() column_names, array()() rows)
-         * array $tables = array of "$table"s
-         *
-         * array $analysis = array(array() column_types, array() column_sizes)
-         * array $analyses = array of "$analysis"s
-         *
-         * array $create = array of SQL strings
-         *
-         * array $options = an associative array of options
-         */
-
-        /* Set database name to the currently selected one, if applicable */
-        list($db_name, $options) = $this->getDbnameAndOptions($db, 'ODS_DB');
-
-        /* Non-applicable parameters */
-        $create = null;
-
-        /* Created and execute necessary SQL statements from data */
-        PMA_buildSQL($db_name, $tables, $analyses, $create, $options, $sql_data);
-
-        unset($tables);
-        unset($analyses);
-
-        /* Commit any possible data in buffers */
-        PMA_importRunQuery('', '', $sql_data);
-    }
-
-    /**
-     * Get value
-     *
-     * @param array $cell_attrs Cell attributes
-     * @param array $text       Texts
-     *
-     * @return float|string
-     */
-    protected function getValue($cell_attrs, $text)
-    {
-        if ($_REQUEST['ods_recognize_percentages']
-            && !strcmp(
-                'percentage',
-                $cell_attrs['value-type']
-            )
-        ) {
-            $value = (double)$cell_attrs['value'];
-
-            return $value;
-        } elseif ($_REQUEST['ods_recognize_currency']
-            && !strcmp('currency', $cell_attrs['value-type'])
-        ) {
-            $value = (double)$cell_attrs['value'];
-
-            return $value;
-        } else {
-            /* We need to concatenate all paragraphs */
-            $values = array();
-            foreach ($text as $paragraph) {
-                $values[] = (string)$paragraph;
-            }
-            $value = implode("\n", $values);
-
-            return $value;
-        }
-    }
-}
diff --git a/#pma/libraries/plugins/import/ImportShp.php b/#pma/libraries/plugins/import/ImportShp.php
deleted file mode 100644
index cdfe1a6c..00000000
--- a/#pma/libraries/plugins/import/ImportShp.php
+++ /dev/null
@@ -1,333 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * ESRI Shape file import plugin for phpMyAdmin
- *
- * @package    PhpMyAdmin-Import
- * @subpackage ESRI_Shape
- */
-namespace PMA\libraries\plugins\import;
-
-use PMA\libraries\properties\plugins\ImportPluginProperties;
-use PMA;
-use PMA\libraries\plugins\ImportPlugin;
-use PMA\libraries\gis\GISFactory;
-use PMA\libraries\gis\GISMultilinestring;
-use PMA\libraries\gis\GISMultipoint;
-use PMA\libraries\gis\GISPoint;
-use PMA\libraries\gis\GISPolygon;
-use PMA\libraries\plugins\import\ShapeFile;
-
-/* Get the ShapeFile class */
-require_once 'libraries/bfShapeFiles/ShapeFile.lib.php';
-
-/**
- * Handles the import for ESRI Shape files
- *
- * @package    PhpMyAdmin-Import
- * @subpackage ESRI_Shape
- */
-class ImportShp extends ImportPlugin
-{
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        $this->setProperties();
-    }
-
-    /**
-     * Sets the import plugin properties.
-     * Called in the constructor.
-     *
-     * @return void
-     */
-    protected function setProperties()
-    {
-        $importPluginProperties = new ImportPluginProperties();
-        $importPluginProperties->setText(__('ESRI Shape File'));
-        $importPluginProperties->setExtension('shp');
-        $importPluginProperties->setOptions(array());
-        $importPluginProperties->setOptionsText(__('Options'));
-
-        $this->properties = $importPluginProperties;
-    }
-
-    /**
-     * Handles the whole import logic
-     *
-     * @param array &$sql_data 2-element array with sql data
-     *
-     * @return void
-     */
-    public function doImport(&$sql_data = array())
-    {
-        global $db, $error, $finished, $compression,
-               $import_file, $local_import_file, $message;
-
-        $GLOBALS['finished'] = false;
-
-        $shp = new ShapeFile(1);
-        // If the zip archive has more than one file,
-        // get the correct content to the buffer from .shp file.
-        if ($compression == 'application/zip'
-            && PMA_getNoOfFilesInZip($import_file) > 1
-        ) {
-            $zip_content = PMA_getZipContents($import_file, '/^.*\.shp$/i');
-            $GLOBALS['import_text'] = $zip_content['data'];
-        }
-
-        $temp_dbf_file = false;
-        // We need dbase extension to handle .dbf file
-        if (extension_loaded('dbase')) {
-            // If we can extract the zip archive to 'TempDir'
-            // and use the files in it for import
-            if ($compression == 'application/zip'
-                && !empty($GLOBALS['cfg']['TempDir'])
-                && @is_writable($GLOBALS['cfg']['TempDir'])
-            ) {
-                $dbf_file_name = PMA_findFileFromZipArchive(
-                    '/^.*\.dbf$/i',
-                    $import_file
-                );
-                // If the corresponding .dbf file is in the zip archive
-                if ($dbf_file_name) {
-                    // Extract the .dbf file and point to it.
-                    $extracted = PMA_zipExtract(
-                        $import_file,
-                        $dbf_file_name
-                    );
-                    if ($extracted !== false) {
-                        $dbf_file_path = realpath($GLOBALS['cfg']['TempDir'])
-                            . (PMA_IS_WINDOWS ? '\\' : '/')
-                            . PMA_sanitizeFilename($dbf_file_name, true);
-                        $handle = fopen($dbf_file_path, 'wb');
-                        if ($handle !== false) {
-                            fwrite($handle, $extracted);
-                            fclose($handle);
-                            $temp_dbf_file = true;
-                            // Replace the .dbf with .*, as required
-                            // by the bsShapeFiles library.
-                            $file_name = substr(
-                                $dbf_file_path, 0, strlen($dbf_file_path) - 4
-                            ) . '.*';
-                            $shp->FileName = $file_name;
-                        }
-                    }
-                }
-            } elseif (!empty($local_import_file)
-                && !empty($GLOBALS['cfg']['UploadDir'])
-                && $compression == 'none'
-            ) {
-                // If file is in UploadDir, use .dbf file in the same UploadDir
-                // to load extra data.
-                // Replace the .shp with .*,
-                // so the bsShapeFiles library correctly locates .dbf file.
-                $file_name = mb_substr(
-                    $import_file,
-                    0,
-                    mb_strlen($import_file) - 4
-                ) . '.*';
-                $shp->FileName = $file_name;
-            }
-        }
-
-        // Delete the .dbf file extracted to 'TempDir'
-        if ($temp_dbf_file
-            && isset($dbf_file_path)
-            && file_exists($dbf_file_path)
-        ) {
-            unlink($dbf_file_path);
-        }
-
-        // Load data
-        $shp->loadFromFile('');
-        if ($shp->lastError != "") {
-            $error = true;
-            $message = PMA\libraries\Message::error(
-                __('There was an error importing the ESRI shape file: "%s".')
-            );
-            $message->addParam($shp->lastError);
-
-            return;
-        }
-
-        $esri_types = array(
-            0 => 'Null Shape',
-            1 => 'Point',
-            3 => 'PolyLine',
-            5 => 'Polygon',
-            8 => 'MultiPoint',
-            11 => 'PointZ',
-            13 => 'PolyLineZ',
-            15 => 'PolygonZ',
-            18 => 'MultiPointZ',
-            21 => 'PointM',
-            23 => 'PolyLineM',
-            25 => 'PolygonM',
-            28 => 'MultiPointM',
-            31 => 'MultiPatch',
-        );
-
-        switch ($shp->shapeType) {
-            // ESRI Null Shape
-        case 0:
-            break;
-            // ESRI Point
-        case 1:
-            $gis_type = 'point';
-            break;
-            // ESRI PolyLine
-        case 3:
-            $gis_type = 'multilinestring';
-            break;
-            // ESRI Polygon
-        case 5:
-            $gis_type = 'multipolygon';
-            break;
-            // ESRI MultiPoint
-        case 8:
-            $gis_type = 'multipoint';
-            break;
-        default:
-            $error = true;
-            if (!isset($esri_types[$shp->shapeType])) {
-                $message = PMA\libraries\Message::error(
-                    __(
-                        'You tried to import an invalid file or the imported file'
-                        . ' contains invalid data!'
-                    )
-                );
-            } else {
-                $message = PMA\libraries\Message::error(
-                    __('MySQL Spatial Extension does not support ESRI type "%s".')
-                );
-                $message->addParam($esri_types[$shp->shapeType]);
-            }
-
-            return;
-        }
-
-        if (isset($gis_type)) {
-            /** @var GISMultilinestring|\PMA\libraries\gis\GISMultipoint|\PMA\libraries\gis\GISPoint|GISPolygon $gis_obj */
-            $gis_obj = GISFactory::factory($gis_type);
-        } else {
-            $gis_obj = null;
-        }
-
-        $num_rows = count($shp->records);
-        // If .dbf file is loaded, the number of extra data columns
-        $num_data_cols = isset($shp->DBFHeader) ? count($shp->DBFHeader) : 0;
-
-        $rows = array();
-        $col_names = array();
-        if ($num_rows != 0) {
-            foreach ($shp->records as $record) {
-                $tempRow = array();
-                if ($gis_obj == null) {
-                    $tempRow[] = null;
-                } else {
-                    $tempRow[] = "GeomFromText('"
-                        . $gis_obj->getShape($record->SHPData) . "')";
-                }
-
-                if (isset($shp->DBFHeader)) {
-                    foreach ($shp->DBFHeader as $c) {
-                        $cell = trim($record->DBFData[$c[0]]);
-
-                        if (!strcmp($cell, '')) {
-                            $cell = 'NULL';
-                        }
-
-                        $tempRow[] = $cell;
-                    }
-                }
-                $rows[] = $tempRow;
-            }
-        }
-
-        if (count($rows) == 0) {
-            $error = true;
-            $message = PMA\libraries\Message::error(
-                __('The imported file does not contain any data!')
-            );
-
-            return;
-        }
-
-        // Column names for spatial column and the rest of the columns,
-        // if they are available
-        $col_names[] = 'SPATIAL';
-        for ($n = 0; $n < $num_data_cols; $n++) {
-            $col_names[] = $shp->DBFHeader[$n][0];
-        }
-
-        // Set table name based on the number of tables
-        if (mb_strlen($db)) {
-            $result = $GLOBALS['dbi']->fetchResult('SHOW TABLES');
-            $table_name = 'TABLE ' . (count($result) + 1);
-        } else {
-            $table_name = 'TBL_NAME';
-        }
-        $tables = array(array($table_name, $col_names, $rows));
-
-        // Use data from shape file to chose best-fit MySQL types for each column
-        $analyses = array();
-        $analyses[] = PMA_analyzeTable($tables[0]);
-
-        $table_no = 0;
-        $spatial_col = 0;
-        $analyses[$table_no][TYPES][$spatial_col] = GEOMETRY;
-        $analyses[$table_no][FORMATTEDSQL][$spatial_col] = true;
-
-        // Set database name to the currently selected one, if applicable
-        if (mb_strlen($db)) {
-            $db_name = $db;
-            $options = array('create_db' => false);
-        } else {
-            $db_name = 'SHP_DB';
-            $options = null;
-        }
-
-        // Created and execute necessary SQL statements from data
-        $null_param = null;
-        PMA_buildSQL($db_name, $tables, $analyses, $null_param, $options, $sql_data);
-
-        unset($tables);
-        unset($analyses);
-
-        $finished = true;
-        $error = false;
-
-        // Commit any possible data in buffers
-        PMA_importRunQuery('', '', $sql_data);
-    }
-
-    /**
-     * Returns specified number of bytes from the buffer.
-     * Buffer automatically fetches next chunk of data when the buffer
-     * falls short.
-     * Sets $eof when $GLOBALS['finished'] is set and the buffer falls short.
-     *
-     * @param int $length number of bytes
-     *
-     * @return string
-     */
-    public static function readFromBuffer($length)
-    {
-        global $buffer, $eof;
-
-        if (strlen($buffer) < $length) {
-            if ($GLOBALS['finished']) {
-                $eof = true;
-            } else {
-                $buffer .= PMA_importGetNextChunk();
-            }
-        }
-        $result = substr($buffer, 0, $length);
-        $buffer = substr($buffer, $length);
-
-        return $result;
-    }
-}
diff --git a/#pma/libraries/plugins/import/ImportSql.php b/#pma/libraries/plugins/import/ImportSql.php
deleted file mode 100644
index 8926830e..00000000
--- a/#pma/libraries/plugins/import/ImportSql.php
+++ /dev/null
@@ -1,198 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * SQL import plugin for phpMyAdmin
- *
- * @package    PhpMyAdmin-Import
- * @subpackage SQL
- */
-namespace PMA\libraries\plugins\import;
-
-use PMA\libraries\properties\options\items\BoolPropertyItem;
-use PMA\libraries\properties\plugins\ImportPluginProperties;
-use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
-use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
-use PMA;
-use PMA\libraries\plugins\ImportPlugin;
-use PMA\libraries\properties\options\items\SelectPropertyItem;
-use SqlParser;
-
-/**
- * Handles the import for the SQL format
- *
- * @package    PhpMyAdmin-Import
- * @subpackage SQL
- */
-class ImportSql extends ImportPlugin
-{
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        $this->setProperties();
-    }
-
-    /**
-     * Sets the import plugin properties.
-     * Called in the constructor.
-     *
-     * @return void
-     */
-    protected function setProperties()
-    {
-        $importPluginProperties = new ImportPluginProperties();
-        $importPluginProperties->setText('SQL');
-        $importPluginProperties->setExtension('sql');
-        $importPluginProperties->setOptionsText(__('Options'));
-
-        $compats = $GLOBALS['dbi']->getCompatibilities();
-        if (count($compats) > 0) {
-            $values = array();
-            foreach ($compats as $val) {
-                $values[$val] = $val;
-            }
-
-            // create the root group that will be the options field for
-            // $importPluginProperties
-            // this will be shown as "Format specific options"
-            $importSpecificOptions = new OptionsPropertyRootGroup(
-                "Format Specific Options"
-            );
-
-            // general options main group
-            $generalOptions = new OptionsPropertyMainGroup("general_opts");
-            // create primary items and add them to the group
-            $leaf = new SelectPropertyItem(
-                "compatibility",
-                __('SQL compatibility mode:')
-            );
-            $leaf->setValues($values);
-            $leaf->setDoc(
-                array(
-                    'manual_MySQL_Database_Administration',
-                    'Server_SQL_mode',
-                )
-            );
-            $generalOptions->addProperty($leaf);
-            $leaf = new BoolPropertyItem(
-                "no_auto_value_on_zero",
-                __('Do not use <code>AUTO_INCREMENT</code> for zero values')
-            );
-            $leaf->setDoc(
-                array(
-                    'manual_MySQL_Database_Administration',
-                    'Server_SQL_mode',
-                    'sqlmode_no_auto_value_on_zero',
-                )
-            );
-            $generalOptions->addProperty($leaf);
-
-            // add the main group to the root group
-            $importSpecificOptions->addProperty($generalOptions);
-            // set the options for the import plugin property item
-            $importPluginProperties->setOptions($importSpecificOptions);
-        }
-
-        $this->properties = $importPluginProperties;
-    }
-
-    /**
-     * Handles the whole import logic
-     *
-     * @param array &$sql_data 2-element array with sql data
-     *
-     * @return void
-     */
-    public function doImport(&$sql_data = array())
-    {
-        global $error, $timeout_passed;
-
-        // Handle compatibility options.
-        $this->_setSQLMode($GLOBALS['dbi'], $_REQUEST);
-
-        $bq = new SqlParser\Utils\BufferedQuery();
-        if (isset($_POST['sql_delimiter'])) {
-            $bq->setDelimiter($_POST['sql_delimiter']);
-        }
-
-        /**
-         * Will be set in PMA_importGetNextChunk().
-         *
-         * @global bool $GLOBALS ['finished']
-         */
-        $GLOBALS['finished'] = false;
-
-        while ((!$error) && (!$timeout_passed)) {
-
-            // Getting the first statement, the remaining data and the last
-            // delimiter.
-            $statement = $bq->extract();
-
-            // If there is no full statement, we are looking for more data.
-            if (empty($statement)) {
-
-                // Importing new data.
-                $newData = PMA_importGetNextChunk();
-
-                // Subtract data we didn't handle yet and stop processing.
-                if ($newData === false) {
-                    $GLOBALS['offset'] -= mb_strlen($bq->query);
-                    break;
-                }
-
-                // Checking if the input buffer has finished.
-                if ($newData === true) {
-                    $GLOBALS['finished'] = true;
-                    break;
-                }
-
-                // Convert CR (but not CRLF) to LF otherwise all queries may
-                // not get executed on some platforms.
-                $bq->query .= preg_replace("/\r($|[^\n])/", "\n$1", $newData);
-
-                continue;
-            }
-
-            // Executing the query.
-            PMA_importRunQuery($statement, $statement, $sql_data);
-        }
-
-        // Extracting remaining statements.
-        while ((!$error) && (!$timeout_passed) && (!empty($bq->query))) {
-            $statement = $bq->extract(true);
-            if (!empty($statement)) {
-                PMA_importRunQuery($statement, $statement, $sql_data);
-            }
-        }
-
-        // Finishing.
-        PMA_importRunQuery('', '', $sql_data);
-    }
-
-    /**
-     * Handle compatibility options
-     *
-     * @param PMA\libraries\DatabaseInterface $dbi     Database interface
-     * @param array                           $request Request array
-     *
-     * @return void
-     */
-    private function _setSQLMode($dbi, $request)
-    {
-        $sql_modes = array();
-        if (isset($request['sql_compatibility'])
-            && 'NONE' != $request['sql_compatibility']
-        ) {
-            $sql_modes[] = $request['sql_compatibility'];
-        }
-        if (isset($request['sql_no_auto_value_on_zero'])) {
-            $sql_modes[] = 'NO_AUTO_VALUE_ON_ZERO';
-        }
-        if (count($sql_modes) > 0) {
-            $dbi->tryQuery(
-                'SET SQL_MODE="' . implode(',', $sql_modes) . '"'
-            );
-        }
-    }
-}
diff --git a/#pma/libraries/plugins/import/ImportXml.php b/#pma/libraries/plugins/import/ImportXml.php
deleted file mode 100644
index 5dba74b8..00000000
--- a/#pma/libraries/plugins/import/ImportXml.php
+++ /dev/null
@@ -1,378 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * XML import plugin for phpMyAdmin
- *
- * @todo       Improve efficiency
- * @package    PhpMyAdmin-Import
- * @subpackage XML
- */
-
-namespace PMA\libraries\plugins\import;
-
-use PMA\libraries\properties\plugins\ImportPluginProperties;
-use PMA;
-use PMA\libraries\plugins\ImportPlugin;
-use SimpleXMLElement;
-
-/**
- * We need way to disable external XML entities processing.
- */
-if (!function_exists('libxml_disable_entity_loader')) {
-    $GLOBALS['skip_import'] = true;
-
-    return;
-}
-
-/**
- * Handles the import for the XML format
- *
- * @package    PhpMyAdmin-Import
- * @subpackage XML
- */
-class ImportXml extends ImportPlugin
-{
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        $this->setProperties();
-    }
-
-    /**
-     * Sets the import plugin properties.
-     * Called in the constructor.
-     *
-     * @return void
-     */
-    protected function setProperties()
-    {
-        $importPluginProperties = new ImportPluginProperties();
-        $importPluginProperties->setText(__('XML'));
-        $importPluginProperties->setExtension('xml');
-        $importPluginProperties->setMimeType('text/xml');
-        $importPluginProperties->setOptions(array());
-        $importPluginProperties->setOptionsText(__('Options'));
-
-        $this->properties = $importPluginProperties;
-    }
-
-    /**
-     * Handles the whole import logic
-     *
-     * @param array &$sql_data 2-element array with sql data
-     *
-     * @return void
-     */
-    public function doImport(&$sql_data = array())
-    {
-        global $error, $timeout_passed, $finished, $db;
-
-        $i = 0;
-        $len = 0;
-        $buffer = "";
-
-        /**
-         * Read in the file via PMA_importGetNextChunk so that
-         * it can process compressed files
-         */
-        while (!($finished && $i >= $len) && !$error && !$timeout_passed) {
-            $data = PMA_importGetNextChunk();
-            if ($data === false) {
-                /* subtract data we didn't handle yet and stop processing */
-                $GLOBALS['offset'] -= strlen($buffer);
-                break;
-            } elseif ($data === true) {
-                /* Handle rest of buffer */
-            } else {
-                /* Append new data to buffer */
-                $buffer .= $data;
-                unset($data);
-            }
-        }
-
-        unset($data);
-
-        /**
-         * Disable loading of external XML entities.
-         */
-        libxml_disable_entity_loader();
-
-        /**
-         * Load the XML string
-         *
-         * The option LIBXML_COMPACT is specified because it can
-         * result in increased performance without the need to
-         * alter the code in any way. It's basically a freebee.
-         */
-        $xml = @simplexml_load_string($buffer, "SimpleXMLElement", LIBXML_COMPACT);
-
-        unset($buffer);
-
-        /**
-         * The XML was malformed
-         */
-        if ($xml === false) {
-            PMA\libraries\Message::error(
-                __(
-                    'The XML file specified was either malformed or incomplete.'
-                    . ' Please correct the issue and try again.'
-                )
-            )
-                ->display();
-            unset($xml);
-            $GLOBALS['finished'] = false;
-
-            return;
-        }
-
-        /**
-         * Table accumulator
-         */
-        $tables = array();
-        /**
-         * Row accumulator
-         */
-        $rows = array();
-
-        /**
-         * Temp arrays
-         */
-        $tempRow = array();
-        $tempCells = array();
-
-        /**
-         * CREATE code included (by default: no)
-         */
-        $struct_present = false;
-
-        /**
-         * Analyze the data in each table
-         */
-        $namespaces = $xml->getNameSpaces(true);
-
-        /**
-         * Get the database name, collation and charset
-         */
-        $db_attr = $xml->children($namespaces['pma'])
-            ->{'structure_schemas'}->{'database'};
-
-        if ($db_attr instanceof SimpleXMLElement) {
-            $db_attr = $db_attr->attributes();
-            $db_name = (string)$db_attr['name'];
-            $collation = (string)$db_attr['collation'];
-            $charset = (string)$db_attr['charset'];
-        } else {
-            /**
-             * If the structure section is not present
-             * get the database name from the data section
-             */
-            $db_attr = $xml->children()
-                ->attributes();
-            $db_name = (string)$db_attr['name'];
-            $collation = null;
-            $charset = null;
-        }
-
-        /**
-         * The XML was malformed
-         */
-        if ($db_name === null) {
-            PMA\libraries\Message::error(
-                __(
-                    'The XML file specified was either malformed or incomplete.'
-                    . ' Please correct the issue and try again.'
-                )
-            )
-                ->display();
-            unset($xml);
-            $GLOBALS['finished'] = false;
-
-            return;
-        }
-
-        /**
-         * Retrieve the structure information
-         */
-        if (isset($namespaces['pma'])) {
-            /**
-             * Get structures for all tables
-             *
-             * @var SimpleXMLElement $struct
-             */
-            $struct = $xml->children($namespaces['pma']);
-
-            $create = array();
-
-            /** @var SimpleXMLElement $val1 */
-            foreach ($struct as $val1) {
-                /** @var SimpleXMLElement $val2 */
-                foreach ($val1 as $val2) {
-                    // Need to select the correct database for the creation of
-                    // tables, views, triggers, etc.
-                    /**
-                     * @todo    Generating a USE here blocks importing of a table
-                     *          into another database.
-                     */
-                    $attrs = $val2->attributes();
-                    $create[] = "USE "
-                        . PMA\libraries\Util::backquote(
-                            $attrs["name"]
-                        );
-
-                    foreach ($val2 as $val3) {
-                        /**
-                         * Remove the extra cosmetic spacing
-                         */
-                        $val3 = str_replace("                ", "", (string)$val3);
-                        $create[] = $val3;
-                    }
-                }
-            }
-
-            $struct_present = true;
-        }
-
-        /**
-         * Move down the XML tree to the actual data
-         */
-        $xml = $xml->children()
-            ->children();
-
-        $data_present = false;
-
-        /**
-         * Only attempt to analyze/collect data if there is data present
-         */
-        if ($xml && @count($xml->children())) {
-            $data_present = true;
-
-            /**
-             * Process all database content
-             */
-            foreach ($xml as $v1) {
-                $tbl_attr = $v1->attributes();
-
-                $isInTables = false;
-                $num_tables = count($tables);
-                for ($i = 0; $i < $num_tables; ++$i) {
-                    if (!strcmp($tables[$i][TBL_NAME], (string)$tbl_attr['name'])) {
-                        $isInTables = true;
-                        break;
-                    }
-                }
-
-                if (!$isInTables) {
-                    $tables[] = array((string)$tbl_attr['name']);
-                }
-
-                foreach ($v1 as $v2) {
-                    $row_attr = $v2->attributes();
-                    if (!array_search((string)$row_attr['name'], $tempRow)) {
-                        $tempRow[] = (string)$row_attr['name'];
-                    }
-                    $tempCells[] = (string)$v2;
-                }
-
-                $rows[] = array((string)$tbl_attr['name'], $tempRow, $tempCells);
-
-                $tempRow = array();
-                $tempCells = array();
-            }
-
-            unset($tempRow);
-            unset($tempCells);
-            unset($xml);
-
-            /**
-             * Bring accumulated rows into the corresponding table
-             */
-            $num_tables = count($tables);
-            for ($i = 0; $i < $num_tables; ++$i) {
-                $num_rows = count($rows);
-                for ($j = 0; $j < $num_rows; ++$j) {
-                    if (!strcmp($tables[$i][TBL_NAME], $rows[$j][TBL_NAME])) {
-                        if (!isset($tables[$i][COL_NAMES])) {
-                            $tables[$i][] = $rows[$j][COL_NAMES];
-                        }
-
-                        $tables[$i][ROWS][] = $rows[$j][ROWS];
-                    }
-                }
-            }
-
-            unset($rows);
-
-            if (!$struct_present) {
-                $analyses = array();
-
-                $len = count($tables);
-                for ($i = 0; $i < $len; ++$i) {
-                    $analyses[] = PMA_analyzeTable($tables[$i]);
-                }
-            }
-        }
-
-        unset($xml);
-        unset($tempCells);
-        unset($rows);
-
-        /**
-         * Only build SQL from data if there is data present
-         */
-        if ($data_present) {
-            /**
-             * Set values to NULL if they were not present
-             * to maintain PMA_buildSQL() call integrity
-             */
-            if (!isset($analyses)) {
-                $analyses = null;
-                if (!$struct_present) {
-                    $create = null;
-                }
-            }
-        }
-
-        /**
-         * string $db_name (no backquotes)
-         *
-         * array $table = array(table_name, array() column_names, array()() rows)
-         * array $tables = array of "$table"s
-         *
-         * array $analysis = array(array() column_types, array() column_sizes)
-         * array $analyses = array of "$analysis"s
-         *
-         * array $create = array of SQL strings
-         *
-         * array $options = an associative array of options
-         */
-
-        /* Set database name to the currently selected one, if applicable */
-        if (strlen($db)) {
-            /* Override the database name in the XML file, if one is selected */
-            $db_name = $db;
-            $options = array('create_db' => false);
-        } else {
-            if ($db_name === null) {
-                $db_name = 'XML_DB';
-            }
-
-            /* Set database collation/charset */
-            $options = array(
-                'db_collation' => $collation,
-                'db_charset'   => $charset,
-            );
-        }
-
-        /* Created and execute necessary SQL statements from data */
-        PMA_buildSQL($db_name, $tables, $analyses, $create, $options, $sql_data);
-
-        unset($analyses);
-        unset($tables);
-        unset($create);
-
-        /* Commit any possible data in buffers */
-        PMA_importRunQuery('', '', $sql_data);
-    }
-}
diff --git a/#pma/libraries/plugins/import/README b/#pma/libraries/plugins/import/README
deleted file mode 100644
index a7e60dd1..00000000
--- a/#pma/libraries/plugins/import/README
+++ /dev/null
@@ -1,155 +0,0 @@
-This directory holds import plugins for phpMyAdmin. Any new plugin should
-basically follow the structure presented here. The messages must use our
-gettext mechanism, see https://wiki.phpmyadmin.net/pma/Gettext_for_developers.
-
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * [Name] import plugin for phpMyAdmin
- *
- * @package    PhpMyAdmin-Import
- * @subpackage [Name]
- */
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
-/* Get the import interface */
-require_once 'libraries/plugins/PMA\libraries\plugins\ImportPlugin.class.php';
-
-/**
- * Handles the import for the [Name] format
- *
- * @package PhpMyAdmin-Import
- */
-class Import[Name] extends PMA\libraries\plugins\ImportPlugin
-{
-    /**
-     * optional - declare variables and descriptions
-     *
-     * @var type
-     */
-    private $_myOptionalVariable;
-
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        $this->setProperties();
-    }
-
-    /**
-     * Sets the import plugin properties.
-     * Called in the constructor.
-     *
-     * @return void
-     */
-    protected function setProperties()
-    {
-        $importPluginProperties = new PMA\libraries\properties\plugins\ImportPluginProperties();
-        $importPluginProperties->setText('[name]');             // the name of your plug-in
-        $importPluginProperties->setExtension('[ext]');         // extension this plug-in can handle
-        $importPluginProperties->setOptionsText(__('Options'));
-
-        // create the root group that will be the options field for
-        // $importPluginProperties
-        // this will be shown as "Format specific options"
-        $importSpecificOptions = new
-        PMA\libraries\properties\options\groups\OptionsPropertyRootGroup(
-            "Format Specific Options"
-        );
-
-        // general options main group
-        $generalOptions = new PMA\libraries\properties\options\groups\OptionsPropertyMainGroup(
-            "general_opts"
-        );
-
-        // optional :
-        // create primary items and add them to the group
-        // type - one of the classes listed in libraries/properties/options/items/
-        // name - form element name
-        // text - description in GUI
-        // size - size of text element
-        // len  - maximal size of input
-        // values - possible values of the item
-        $leaf = new PMA\libraries\properties\options\items\RadioPropertyItem(
-            "structure_or_data"
-        );
-        $leaf->setValues(
-            array(
-                'structure' => __('structure'),
-                'data' => __('data'),
-                'structure_and_data' => __('structure and data')
-            )
-        );
-        $generalOptions->addProperty($leaf);
-
-        // add the main group to the root group
-        $importSpecificOptions->addProperty($generalOptions);
-
-        // set the options for the import plugin property item
-        $importPluginProperties->setOptions($importSpecificOptions);
-        $this->properties = $importPluginProperties;
-    }
-
-    /**
-     * Handles the whole import logic
-     *
-     * @param array &$sql_data 2-element array with sql data
-     *
-     * @return void
-     */
-    public function doImport(&$sql_data = array())
-    {
-        // get globals (others are optional)
-        global $error, $timeout_passed, $finished;
-
-        $buffer = '';
-        while (! ($finished && $i >= $len) && ! $error && ! $timeout_passed) {
-            $data = PMA_importGetNextChunk();
-            if ($data === false) {
-                // subtract data we didn't handle yet and stop processing
-                $GLOBALS['offset'] -= strlen($buffer);
-                break;
-            } elseif ($data === true) {
-                // Handle rest of buffer
-            } else {
-                // Append new data to buffer
-                $buffer .= $data;
-            }
-            // PARSE $buffer here, post sql queries using:
-            PMA_importRunQuery($sql, $verbose_sql_with_comments, $sql_data);
-        } // End of import loop
-        // Commit any possible data in buffers
-        PMA_importRunQuery('', '', $sql_data);
-    }
-
-
-    // optional:
-    /* ~~~~~~~~~~~~~~~~~~~~ Getters and Setters ~~~~~~~~~~~~~~~~~~~~ */
-
-
-    /**
-     * Getter description
-     *
-     * @return type
-     */
-    private function _getMyOptionalVariable()
-    {
-        return $this->_myOptionalVariable;
-    }
-
-    /**
-     * Setter description
-     *
-     * @param type $my_optional_variable description
-     *
-     * @return void
-     */
-    private function _setMyOptionalVariable($my_optional_variable)
-    {
-        $this->_myOptionalVariable = $my_optional_variable;
-    }
-}
-?>
diff --git a/#pma/libraries/plugins/import/ShapeFile.php b/#pma/libraries/plugins/import/ShapeFile.php
deleted file mode 100644
index 350458f6..00000000
--- a/#pma/libraries/plugins/import/ShapeFile.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * This class extends ShapeFile class to cater the following phpMyAdmin
- * specific requirements.
- *
- * @package    PhpMyAdmin-Import
- * @subpackage ESRI_Shape
- */
-namespace PMA\libraries\plugins\import;
-
-/**
- * 1) To load data from .dbf file only when the dBase extension is available.
- * 2) To use PMA_importGetNextChunk() functionality to read data, rather than
- *    reading directly from a file. Using
- *    PMA\libraries\plugins\import\ImportShp::readFromBuffer() in place of fread().
- *    This makes it possible to use compressions.
- *
- * @package    PhpMyAdmin-Import
- * @subpackage ESRI_Shape
- */
-class ShapeFile extends \ShapeFile
-{
-    /**
-     * Returns whether the 'dbase' extension is loaded
-     *
-     * @return boolean whether the 'dbase' extension is loaded
-     */
-    private function _isDbaseLoaded()
-    {
-        return extension_loaded('dbase');
-    }
-
-    /**
-     * Loads ESRI shape data from the imported file
-     *
-     * @param string $FileName not used, it's here only to match the method
-     *                         signature of the method being overridden
-     *
-     * @return void
-     * @see ShapeFile::loadFromFile()
-     */
-    public function loadFromFile($FileName)
-    {
-        $this->_loadHeaders();
-        $this->_loadRecords();
-        if ($this->_isDbaseLoaded()) {
-            $this->_closeDBFFile();
-        }
-    }
-
-    /**
-     * Loads metadata from the ESRI shape file header
-     *
-     * @return void
-     * @see ShapeFile::_loadHeaders()
-     */
-    public function _loadHeaders()
-    {
-        ImportShp::readFromBuffer(24);
-        $this->fileLength = loadData("N", ImportShp::readFromBuffer(4));
-
-        ImportShp::readFromBuffer(4);
-        $this->shapeType = loadData("V", ImportShp::readFromBuffer(4));
-
-        $this->boundingBox = array();
-        $this->boundingBox["xmin"] = loadData("d", ImportShp::readFromBuffer(8));
-        $this->boundingBox["ymin"] = loadData("d", ImportShp::readFromBuffer(8));
-        $this->boundingBox["xmax"] = loadData("d", ImportShp::readFromBuffer(8));
-        $this->boundingBox["ymax"] = loadData("d", ImportShp::readFromBuffer(8));
-
-        if ($this->_isDbaseLoaded() && $this->_openDBFFile()) {
-            $this->DBFHeader = $this->_loadDBFHeader();
-        }
-    }
-
-    /**
-     * Loads geometry data from the ESRI shape file
-     *
-     * @return boolean|void
-     * @see ShapeFile::_loadRecords()
-     */
-    public function _loadRecords()
-    {
-        global $eof;
-        ImportShp::readFromBuffer(32);
-        while (true) {
-            $record = new ShapeRecord(-1);
-            $record->loadFromFile($this->SHPFile, $this->DBFFile);
-            if ($record->lastError != "") {
-                return false;
-            }
-            if ($eof) {
-                break;
-            }
-
-            $this->records[] = $record;
-        }
-    }
-}
diff --git a/#pma/libraries/plugins/import/ShapeRecord.php b/#pma/libraries/plugins/import/ShapeRecord.php
deleted file mode 100644
index b496bcad..00000000
--- a/#pma/libraries/plugins/import/ShapeRecord.php
+++ /dev/null
@@ -1,159 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * This class extends ShapeRecord class to cater the following phpMyAdmin
- * specific requirements.
- *
- * @package    PhpMyAdmin-Import
- * @subpackage ESRI_Shape
- */
-namespace PMA\libraries\plugins\import;
-
-/**
- * 1) To load data from .dbf file only when the dBase extension is available.
- * 2) To use PMA_importGetNextChunk() functionality to read data, rather than
- *    reading directly from a file. Using
- *    PMA\libraries\plugins\import\ImportShp::readFromBuffer() in place of fread().
- *    This makes it possible to use compressions.
- *
- * @package    PhpMyAdmin-Import
- * @subpackage ESRI_Shape
- */
-class ShapeRecord extends \ShapeRecord
-{
-    /**
-     * Loads a geometry data record from the file
-     *
-     * @param object &$SHPFile .shp file
-     * @param object &$DBFFile .dbf file
-     *
-     * @return void
-     * @see ShapeRecord::loadFromFile()
-     */
-    public function loadFromFile(&$SHPFile, &$DBFFile)
-    {
-        $this->DBFFile = $DBFFile;
-        $this->_loadHeaders();
-
-        switch ($this->shapeType) {
-        case 0:
-            $this->_loadNullRecord();
-            break;
-        case 1:
-            $this->_loadPointRecord();
-            break;
-        case 3:
-            $this->_loadPolyLineRecord();
-            break;
-        case 5:
-            $this->_loadPolygonRecord();
-            break;
-        case 8:
-            $this->_loadMultiPointRecord();
-            break;
-        default:
-            $this->setError(
-                sprintf(
-                    __("Geometry type '%s' is not supported by MySQL."),
-                    $this->shapeType
-                )
-            );
-            break;
-        }
-        if (extension_loaded('dbase') && isset($this->DBFFile)) {
-            $this->_loadDBFData();
-        }
-    }
-
-    /**
-     * Loads metadata from the ESRI shape record header
-     *
-     * @return void
-     * @see ShapeRecord::_loadHeaders()
-     */
-    public function _loadHeaders()
-    {
-        $this->recordNumber = loadData("N", ImportShp::readFromBuffer(4));
-        ImportShp::readFromBuffer(4);
-        $this->shapeType = loadData("V", ImportShp::readFromBuffer(4));
-    }
-
-    /**
-     * Loads data from a point record
-     *
-     * @return array
-     * @see ShapeRecord::_loadPoint()
-     */
-    public function _loadPoint()
-    {
-        $data = array();
-
-        $data["x"] = loadData("d", ImportShp::readFromBuffer(8));
-        $data["y"] = loadData("d", ImportShp::readFromBuffer(8));
-
-        return $data;
-    }
-
-    /**
-     * Loads data from a multipoint record
-     *
-     * @return void
-     * @see ShapeRecord::_loadMultiPointRecord()
-     */
-    public function _loadMultiPointRecord()
-    {
-        $this->SHPData = array();
-        $this->SHPData["xmin"] = loadData("d", ImportShp::readFromBuffer(8));
-        $this->SHPData["ymin"] = loadData("d", ImportShp::readFromBuffer(8));
-        $this->SHPData["xmax"] = loadData("d", ImportShp::readFromBuffer(8));
-        $this->SHPData["ymax"] = loadData("d", ImportShp::readFromBuffer(8));
-
-        $this->SHPData["numpoints"] = loadData("V", ImportShp::readFromBuffer(4));
-
-        for ($i = 0; $i <= $this->SHPData["numpoints"]; $i++) {
-            $this->SHPData["points"][] = $this->_loadPoint();
-        }
-    }
-
-    /**
-     * Loads data from a polyline record
-     *
-     * @return void
-     * @see ShapeRecord::_loadPolyLineRecord()
-     */
-    public function _loadPolyLineRecord()
-    {
-        $this->SHPData = array();
-        $this->SHPData["xmin"] = loadData("d", ImportShp::readFromBuffer(8));
-        $this->SHPData["ymin"] = loadData("d", ImportShp::readFromBuffer(8));
-        $this->SHPData["xmax"] = loadData("d", ImportShp::readFromBuffer(8));
-        $this->SHPData["ymax"] = loadData("d", ImportShp::readFromBuffer(8));
-
-        $this->SHPData["numparts"] = loadData("V", ImportShp::readFromBuffer(4));
-        $this->SHPData["numpoints"] = loadData("V", ImportShp::readFromBuffer(4));
-
-        for ($i = 0; $i < $this->SHPData["numparts"]; $i++) {
-            $this->SHPData["parts"][$i] = loadData(
-                "V",
-                ImportShp::readFromBuffer(4)
-            );
-        }
-
-        $readPoints = 0;
-        foreach ($this->SHPData["parts"] as &$partData) {
-            if (!isset($partData["points"])
-                || !is_array($partData["points"])
-            ) {
-                $partData = array(
-                    'points' => array()
-                );
-            }
-            while (!in_array($readPoints, $this->SHPData["parts"])
-                && ($readPoints < ($this->SHPData["numpoints"]))
-            ) {
-                $partData["points"][] = $this->_loadPoint();
-                $readPoints++;
-            }
-        }
-    }
-}
diff --git a/#pma/libraries/plugins/import/upload/UploadApc.php b/#pma/libraries/plugins/import/upload/UploadApc.php
deleted file mode 100644
index 95e8c6af..00000000
--- a/#pma/libraries/plugins/import/upload/UploadApc.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Provides upload functionalities for the import plugins
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries\plugins\import\upload;
-
-use PMA\libraries\plugins\UploadInterface;
-
-/**
- * Implementation for the APC extension
- *
- * @package PhpMyAdmin
- */
-class UploadApc implements UploadInterface
-{
-    /**
-     * Gets the specific upload ID Key
-     *
-     * @return string ID Key
-     */
-    public static function getIdKey()
-    {
-        return 'APC_UPLOAD_PROGRESS';
-    }
-
-    /**
-     * Returns upload status.
-     *
-     * This is implementation for APC extension.
-     *
-     * @param string $id upload id
-     *
-     * @return array|null
-     */
-    public static function getUploadStatus($id)
-    {
-        global $SESSION_KEY;
-
-        if (trim($id) == "") {
-            return null;
-        }
-        if (!array_key_exists($id, $_SESSION[$SESSION_KEY])) {
-            $_SESSION[$SESSION_KEY][$id] = array(
-                'id'       => $id,
-                'finished' => false,
-                'percent'  => 0,
-                'total'    => 0,
-                'complete' => 0,
-                'plugin'   => UploadApc::getIdKey(),
-            );
-        }
-        $ret = $_SESSION[$SESSION_KEY][$id];
-
-        if (!PMA_Import_apcCheck() || $ret['finished']) {
-            return $ret;
-        }
-        $status = apc_fetch('upload_' . $id);
-
-        if ($status) {
-            $ret['finished'] = (bool)$status['done'];
-            $ret['total'] = $status['total'];
-            $ret['complete'] = $status['current'];
-
-            if ($ret['total'] > 0) {
-                $ret['percent'] = $ret['complete'] / $ret['total'] * 100;
-            }
-
-            if ($ret['percent'] == 100) {
-                $ret['finished'] = (bool)true;
-            }
-
-            $_SESSION[$SESSION_KEY][$id] = $ret;
-        }
-
-        return $ret;
-    }
-}
diff --git a/#pma/libraries/plugins/import/upload/UploadNoplugin.php b/#pma/libraries/plugins/import/upload/UploadNoplugin.php
deleted file mode 100644
index 2bc67cbd..00000000
--- a/#pma/libraries/plugins/import/upload/UploadNoplugin.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Provides upload functionalities for the import plugins
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries\plugins\import\upload;
-
-use PMA\libraries\plugins\UploadInterface;
-
-/**
- * Implementation for no plugin
- *
- * @package PhpMyAdmin
- */
-class UploadNoplugin implements UploadInterface
-{
-    /**
-     * Gets the specific upload ID Key
-     *
-     * @return string ID Key
-     */
-    public static function getIdKey()
-    {
-        return 'noplugin';
-    }
-
-    /**
-     * Returns upload status.
-     *
-     * This is implementation when no webserver support exists,
-     * so it returns just zeroes.
-     *
-     * @param string $id upload id
-     *
-     * @return array|null
-     */
-    public static function getUploadStatus($id)
-    {
-        global $SESSION_KEY;
-
-        if (trim($id) == "") {
-            return null;
-        }
-        if (!array_key_exists($id, $_SESSION[$SESSION_KEY])) {
-            $_SESSION[$SESSION_KEY][$id] = array(
-                'id'       => $id,
-                'finished' => false,
-                'percent'  => 0,
-                'total'    => 0,
-                'complete' => 0,
-                'plugin'   => UploadNoplugin::getIdKey(),
-            );
-        }
-        $ret = $_SESSION[$SESSION_KEY][$id];
-
-        return $ret;
-    }
-}
diff --git a/#pma/libraries/plugins/import/upload/UploadProgress.php b/#pma/libraries/plugins/import/upload/UploadProgress.php
deleted file mode 100644
index 9b3ac319..00000000
--- a/#pma/libraries/plugins/import/upload/UploadProgress.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Provides upload functionalities for the import plugins
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries\plugins\import\upload;
-
-use PMA\libraries\plugins\UploadInterface;
-
-/**
- * Implementation for upload progress
- *
- * @package PhpMyAdmin
- */
-class UploadProgress implements UploadInterface
-{
-    /**
-     * Gets the specific upload ID Key
-     *
-     * @return string ID Key
-     */
-    public static function getIdKey()
-    {
-        return 'UPLOAD_IDENTIFIER';
-    }
-
-    /**
-     * Returns upload status.
-     *
-     * This is implementation for upload progress
-     *
-     * @param string $id upload id
-     *
-     * @return array|null
-     */
-    public static function getUploadStatus($id)
-    {
-        global $SESSION_KEY;
-
-        if (trim($id) == "") {
-            return null;
-        }
-
-        if (!array_key_exists($id, $_SESSION[$SESSION_KEY])) {
-            $_SESSION[$SESSION_KEY][$id] = array(
-                'id'       => $id,
-                'finished' => false,
-                'percent'  => 0,
-                'total'    => 0,
-                'complete' => 0,
-                'plugin'   => UploadProgress::getIdKey(),
-            );
-        }
-        $ret = $_SESSION[$SESSION_KEY][$id];
-
-        if (!PMA_Import_progressCheck() || $ret['finished']) {
-            return $ret;
-        }
-
-        $status = uploadprogress_get_info($id);
-
-        if ($status) {
-            if ($status['bytes_uploaded'] == $status['bytes_total']) {
-                $ret['finished'] = true;
-            } else {
-                $ret['finished'] = false;
-            }
-            $ret['total'] = $status['bytes_total'];
-            $ret['complete'] = $status['bytes_uploaded'];
-
-            if ($ret['total'] > 0) {
-                $ret['percent'] = $ret['complete'] / $ret['total'] * 100;
-            }
-        } else {
-            $ret = array(
-                'id'       => $id,
-                'finished' => true,
-                'percent'  => 100,
-                'total'    => $ret['total'],
-                'complete' => $ret['total'],
-                'plugin'   => UploadProgress::getIdKey(),
-            );
-        }
-
-        $_SESSION[$SESSION_KEY][$id] = $ret;
-
-        return $ret;
-    }
-}
diff --git a/#pma/libraries/plugins/import/upload/UploadSession.php b/#pma/libraries/plugins/import/upload/UploadSession.php
deleted file mode 100644
index 0891bdf0..00000000
--- a/#pma/libraries/plugins/import/upload/UploadSession.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Provides upload functionalities for the import plugins
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries\plugins\import\upload;
-
-use PMA\libraries\plugins\UploadInterface;
-
-/**
- * Implementation for session
- *
- * @package PhpMyAdmin
- */
-class UploadSession implements UploadInterface
-{
-    /**
-     * Gets the specific upload ID Key
-     *
-     * @return string ID Key
-     */
-    public static function getIdKey()
-    {
-        return ini_get('session.upload_progress.name');
-    }
-
-    /**
-     * Returns upload status.
-     *
-     * This is implementation for session.upload_progress in PHP 5.4+.
-     *
-     * @param string $id upload id
-     *
-     * @return array|null
-     */
-    public static function getUploadStatus($id)
-    {
-        global $SESSION_KEY;
-
-        if (trim($id) == '') {
-            return null;
-        }
-
-        if (!array_key_exists($id, $_SESSION[$SESSION_KEY])) {
-            $_SESSION[$SESSION_KEY][$id] = array(
-                'id'       => $id,
-                'finished' => false,
-                'percent'  => 0,
-                'total'    => 0,
-                'complete' => 0,
-                'plugin'   => UploadSession::getIdKey(),
-            );
-        }
-        $ret = $_SESSION[$SESSION_KEY][$id];
-
-        if (!PMA_Import_sessionCheck() || $ret['finished']) {
-            return $ret;
-        }
-
-        $status = false;
-        $sessionkey = ini_get('session.upload_progress.prefix') . $id;
-
-        if (isset($_SESSION[$sessionkey])) {
-            $status = $_SESSION[$sessionkey];
-        }
-
-        if ($status) {
-            $ret['finished'] = $status['done'];
-            $ret['total'] = $status['content_length'];
-            $ret['complete'] = $status['bytes_processed'];
-
-            if ($ret['total'] > 0) {
-                $ret['percent'] = $ret['complete'] / $ret['total'] * 100;
-            }
-        } else {
-            $ret = array(
-                'id'       => $id,
-                'finished' => true,
-                'percent'  => 100,
-                'total'    => $ret['total'],
-                'complete' => $ret['total'],
-                'plugin'   => UploadSession::getIdKey(),
-            );
-        }
-
-        $_SESSION[$SESSION_KEY][$id] = $ret;
-
-        return $ret;
-    }
-}
diff --git a/#pma/libraries/plugins/schema/ExportRelationSchema.php b/#pma/libraries/plugins/schema/ExportRelationSchema.php
deleted file mode 100644
index 228af6c6..00000000
--- a/#pma/libraries/plugins/schema/ExportRelationSchema.php
+++ /dev/null
@@ -1,301 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Contains PMA\libraries\plugins\schema\ExportRelationSchema class which is
- * inherited by all schema classes.
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries\plugins\schema;
-
-use PMA;
-
-/**
- * This class is inherited by all schema classes
- * It contains those methods which are common in them
- * it works like factory pattern
- *
- * @package PhpMyAdmin
- */
-class ExportRelationSchema
-{
-    /**
-     * Constructor.
-     *
-     * @param string $db      database name
-     * @param object $diagram schema diagram
-     */
-    public function __construct($db, $diagram)
-    {
-        $this->db = $db;
-        $this->diagram = $diagram;
-        $this->setPageNumber($_REQUEST['page_number']);
-        $this->setOffline(isset($_REQUEST['offline_export']));
-    }
-
-    protected $db;
-    protected $diagram;
-    protected $showColor;
-    protected $tableDimension;
-    protected $sameWide;
-    protected $showKeys;
-    protected $orientation;
-    protected $paper;
-    protected $pageNumber;
-    protected $offline;
-
-    /**
-     * Set Page Number
-     *
-     * @param integer $value Page Number of the document to be created
-     *
-     * @return void
-     */
-    public function setPageNumber($value)
-    {
-        $this->pageNumber = intval($value);
-    }
-
-    /**
-     * Returns the schema page number
-     *
-     * @return integer schema page number
-     */
-    public function getPageNumber()
-    {
-        return $this->pageNumber;
-    }
-
-    /**
-     * Sets showColor
-     *
-     * @param boolean $value whether to show colors
-     *
-     * @return void
-     */
-    public function setShowColor($value)
-    {
-        $this->showColor = $value;
-    }
-
-    /**
-     * Returns whether to show colors
-     *
-     * @return boolean whether to show colors
-     */
-    public function isShowColor()
-    {
-        return $this->showColor;
-    }
-
-    /**
-     * Set Table Dimension
-     *
-     * @param boolean $value show table co-ordinates or not
-     *
-     * @return void
-     */
-    public function setTableDimension($value)
-    {
-        $this->tableDimension = $value;
-    }
-
-    /**
-     * Returns whether to show table dimensions
-     *
-     * @return boolean whether to show table dimensions
-     */
-    public function isTableDimension()
-    {
-        return $this->tableDimension;
-    }
-
-    /**
-     * Set same width of All Tables
-     *
-     * @param boolean $value set same width of all tables or not
-     *
-     * @return void
-     */
-    public function setAllTablesSameWidth($value)
-    {
-        $this->sameWide = $value;
-    }
-
-    /**
-     * Returns whether to use same width for all tables or not
-     *
-     * @return boolean whether to use same width for all tables or not
-     */
-    public function isAllTableSameWidth()
-    {
-        return $this->sameWide;
-    }
-
-    /**
-     * Set Show only keys
-     *
-     * @param boolean $value show only keys or not
-     *
-     * @return void
-     *
-     * @access public
-     */
-    public function setShowKeys($value)
-    {
-        $this->showKeys = $value;
-    }
-
-    /**
-     * Returns whether to show keys
-     *
-     * @return boolean whether to show keys
-     */
-    public function isShowKeys()
-    {
-        return $this->showKeys;
-    }
-
-    /**
-     * Set Orientation
-     *
-     * @param string $value Orientation will be portrait or landscape
-     *
-     * @return void
-     *
-     * @access public
-     */
-    public function setOrientation($value)
-    {
-        $this->orientation = ($value == 'P') ? 'P' : 'L';
-    }
-
-    /**
-     * Returns orientation
-     *
-     * @return string orientation
-     */
-    public function getOrientation()
-    {
-        return $this->orientation;
-    }
-
-    /**
-     * Set type of paper
-     *
-     * @param string $value paper type can be A4 etc
-     *
-     * @return void
-     *
-     * @access public
-     */
-    public function setPaper($value)
-    {
-        $this->paper = $value;
-    }
-
-    /**
-     * Returns the paper size
-     *
-     * @return string paper size
-     */
-    public function getPaper()
-    {
-        return $this->paper;
-    }
-
-    /**
-     * Set whether the document is generated from client side DB
-     *
-     * @param boolean $value offline or not
-     *
-     * @return void
-     *
-     * @access public
-     */
-    public function setOffline($value)
-    {
-        $this->offline = $value;
-    }
-
-    /**
-     * Returns whether the client side database is used
-     *
-     * @return boolean
-     *
-     * @access public
-     */
-    public function isOffline()
-    {
-        return $this->offline;
-    }
-
-    /**
-     * Get the table names from the request
-     *
-     * @return array an array of table names
-     */
-    protected function getTablesFromRequest()
-    {
-        $tables = array();
-        $dbLength = mb_strlen($this->db);
-        foreach ($_REQUEST['t_h'] as $key => $value) {
-            if ($value) {
-                $tables[] = mb_substr($key, $dbLength + 1);
-            }
-        }
-
-        return $tables;
-    }
-
-    /**
-     * Returns the file name
-     *
-     * @param String $extension file extension
-     *
-     * @return string file name
-     */
-    protected function getFileName($extension)
-    {
-        $filename = $this->db . $extension;
-        // Get the name of this page to use as filename
-        if ($this->pageNumber != -1 && !$this->offline) {
-            $_name_sql = 'SELECT page_descr FROM '
-                . PMA\libraries\Util::backquote($GLOBALS['cfgRelation']['db']) . '.'
-                . PMA\libraries\Util::backquote($GLOBALS['cfgRelation']['pdf_pages'])
-                . ' WHERE page_nr = ' . $this->pageNumber;
-            $_name_rs = PMA_queryAsControlUser($_name_sql);
-            $_name_row = $GLOBALS['dbi']->fetchRow($_name_rs);
-            $filename = $_name_row[0] . $extension;
-        }
-
-        return $filename;
-    }
-
-    /**
-     * Displays an error message
-     *
-     * @param integer $pageNumber    ID of the chosen page
-     * @param string  $type          Schema Type
-     * @param string  $error_message The error message
-     *
-     * @access public
-     *
-     * @return void
-     */
-    public static function dieSchema($pageNumber, $type = '', $error_message = '')
-    {
-        echo "<p><strong>" , __("SCHEMA ERROR: ") , $type , "</strong></p>" , "\n";
-        if (!empty($error_message)) {
-            $error_message = htmlspecialchars($error_message);
-        }
-        echo '<p>' , "\n";
-        echo '    ' , $error_message , "\n";
-        echo '</p>' , "\n";
-        echo '<a href="db_designer.php'
-            , PMA_URL_getCommon(array('db' => $GLOBALS['db']))
-            , '&page=' . htmlspecialchars($pageNumber) , '">' , __('Back') , '</a>';
-        echo "\n";
-        exit;
-    }
-}
diff --git a/#pma/libraries/plugins/schema/RelationStats.php b/#pma/libraries/plugins/schema/RelationStats.php
deleted file mode 100644
index d22b1805..00000000
--- a/#pma/libraries/plugins/schema/RelationStats.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Contains abstract class to hold relation preferences/statistics
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries\plugins\schema;
-
-/**
- * Relations preferences/statistics
- *
- * This class fetches the table master and foreign fields positions
- * and helps in generating the Table references and then connects
- * master table's master field to foreign table's foreign key.
- *
- * @package PhpMyAdmin
- * @abstract
- */
-abstract class RelationStats
-{
-    protected $diagram;
-    /**
-     * Defines properties
-     */
-    public $xSrc, $ySrc;
-    public $srcDir;
-    public $destDir;
-    public $xDest, $yDest;
-    public $wTick;
-
-    /**
-     * The constructor
-     *
-     * @param object $diagram       The diagram
-     * @param string $master_table  The master table name
-     * @param string $master_field  The relation field in the master table
-     * @param string $foreign_table The foreign table name
-     * @param string $foreign_field The relation field in the foreign table
-     */
-    public function __construct(
-        $diagram,
-        $master_table,
-        $master_field,
-        $foreign_table,
-        $foreign_field
-    ) {
-        $this->diagram = $diagram;
-
-        $src_pos = $this->_getXy($master_table, $master_field);
-        $dest_pos = $this->_getXy($foreign_table, $foreign_field);
-        /*
-         * [0] is x-left
-        * [1] is x-right
-        * [2] is y
-        */
-        $src_left = $src_pos[0] - $this->wTick;
-        $src_right = $src_pos[1] + $this->wTick;
-        $dest_left = $dest_pos[0] - $this->wTick;
-        $dest_right = $dest_pos[1] + $this->wTick;
-
-        $d1 = abs($src_left - $dest_left);
-        $d2 = abs($src_right - $dest_left);
-        $d3 = abs($src_left - $dest_right);
-        $d4 = abs($src_right - $dest_right);
-        $d = min($d1, $d2, $d3, $d4);
-
-        if ($d == $d1) {
-            $this->xSrc = $src_pos[0];
-            $this->srcDir = -1;
-            $this->xDest = $dest_pos[0];
-            $this->destDir = -1;
-        } elseif ($d == $d2) {
-            $this->xSrc = $src_pos[1];
-            $this->srcDir = 1;
-            $this->xDest = $dest_pos[0];
-            $this->destDir = -1;
-        } elseif ($d == $d3) {
-            $this->xSrc = $src_pos[0];
-            $this->srcDir = -1;
-            $this->xDest = $dest_pos[1];
-            $this->destDir = 1;
-        } else {
-            $this->xSrc = $src_pos[1];
-            $this->srcDir = 1;
-            $this->xDest = $dest_pos[1];
-            $this->destDir = 1;
-        }
-        $this->ySrc = $src_pos[2];
-        $this->yDest = $dest_pos[2];
-    }
-
-    /**
-     * Gets arrows coordinates
-     *
-     * @param string $table  The current table name
-     * @param string $column The relation column name
-     *
-     * @return array Arrows coordinates
-     *
-     * @access private
-     */
-    private function _getXy($table, $column)
-    {
-        $pos = array_search($column, $table->fields);
-
-        // x_left, x_right, y
-        return array(
-            $table->x,
-            $table->x + $table->width,
-            $table->y + ($pos + 1.5) * $table->heightCell,
-        );
-    }
-}
diff --git a/#pma/libraries/plugins/schema/SchemaDia.php b/#pma/libraries/plugins/schema/SchemaDia.php
deleted file mode 100644
index 01606574..00000000
--- a/#pma/libraries/plugins/schema/SchemaDia.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Dia schema export code
- *
- * @package    PhpMyAdmin-Schema
- * @subpackage Dia
- */
-namespace PMA\libraries\plugins\schema;
-
-use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
-use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
-use PMA\libraries\plugins\SchemaPlugin;
-use PMA\libraries\plugins\schema\dia\DiaRelationSchema;
-use PMA\libraries\properties\plugins\SchemaPluginProperties;
-use PMA\libraries\properties\options\items\SelectPropertyItem;
-
-/**
- * Handles the schema export for the Dia format
- *
- * @package    PhpMyAdmin-Schema
- * @subpackage Dia
- */
-class SchemaDia extends SchemaPlugin
-{
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        $this->setProperties();
-    }
-
-    /**
-     * Sets the schema export Dia properties
-     *
-     * @return void
-     */
-    protected function setProperties()
-    {
-        $schemaPluginProperties = new SchemaPluginProperties();
-        $schemaPluginProperties->setText('Dia');
-        $schemaPluginProperties->setExtension('dia');
-        $schemaPluginProperties->setMimeType('application/dia');
-
-        // create the root group that will be the options field for
-        // $schemaPluginProperties
-        // this will be shown as "Format specific options"
-        $exportSpecificOptions = new OptionsPropertyRootGroup(
-            "Format Specific Options"
-        );
-
-        // specific options main group
-        $specificOptions = new OptionsPropertyMainGroup("general_opts");
-        // add options common to all plugins
-        $this->addCommonOptions($specificOptions);
-
-        $leaf = new SelectPropertyItem(
-            "orientation",
-            __('Orientation')
-        );
-        $leaf->setValues(
-            array(
-                'L' => __('Landscape'),
-                'P' => __('Portrait'),
-            )
-        );
-        $specificOptions->addProperty($leaf);
-
-        $leaf = new SelectPropertyItem(
-            "paper",
-            __('Paper size')
-        );
-        $leaf->setValues($this->getPaperSizeArray());
-        $specificOptions->addProperty($leaf);
-
-        // add the main group to the root group
-        $exportSpecificOptions->addProperty($specificOptions);
-
-        // set the options for the schema export plugin property item
-        $schemaPluginProperties->setOptions($exportSpecificOptions);
-        $this->properties = $schemaPluginProperties;
-    }
-
-    /**
-     * Exports the schema into DIA format.
-     *
-     * @param string $db database name
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportSchema($db)
-    {
-        $export = new DiaRelationSchema($db);
-        $export->showOutput();
-    }
-}
diff --git a/#pma/libraries/plugins/schema/SchemaEps.php b/#pma/libraries/plugins/schema/SchemaEps.php
deleted file mode 100644
index 59ce7466..00000000
--- a/#pma/libraries/plugins/schema/SchemaEps.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * PDF schema export code
- *
- * @package    PhpMyAdmin-Schema
- * @subpackage EPS
- */
-namespace PMA\libraries\plugins\schema;
-
-use PMA\libraries\properties\options\items\BoolPropertyItem;
-use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
-use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
-use PMA\libraries\plugins\schema\eps\EpsRelationSchema;
-use PMA\libraries\plugins\SchemaPlugin;
-use PMA\libraries\properties\plugins\SchemaPluginProperties;
-use PMA\libraries\properties\options\items\SelectPropertyItem;
-
-/**
- * Handles the schema export for the EPS format
- *
- * @package    PhpMyAdmin-Schema
- * @subpackage EPS
- */
-class SchemaEps extends SchemaPlugin
-{
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        $this->setProperties();
-    }
-
-    /**
-     * Sets the schema export EPS properties
-     *
-     * @return void
-     */
-    protected function setProperties()
-    {
-        $schemaPluginProperties = new SchemaPluginProperties();
-        $schemaPluginProperties->setText('EPS');
-        $schemaPluginProperties->setExtension('eps');
-        $schemaPluginProperties->setMimeType('application/eps');
-
-        // create the root group that will be the options field for
-        // $schemaPluginProperties
-        // this will be shown as "Format specific options"
-        $exportSpecificOptions = new OptionsPropertyRootGroup(
-            "Format Specific Options"
-        );
-
-        // specific options main group
-        $specificOptions = new OptionsPropertyMainGroup("general_opts");
-        // add options common to all plugins
-        $this->addCommonOptions($specificOptions);
-
-        // create leaf items and add them to the group
-        $leaf = new BoolPropertyItem(
-            'all_tables_same_width',
-            __('Same width for all tables')
-        );
-        $specificOptions->addProperty($leaf);
-
-        $leaf = new SelectPropertyItem(
-            "orientation",
-            __('Orientation')
-        );
-        $leaf->setValues(
-            array(
-                'L' => __('Landscape'),
-                'P' => __('Portrait'),
-            )
-        );
-        $specificOptions->addProperty($leaf);
-
-        // add the main group to the root group
-        $exportSpecificOptions->addProperty($specificOptions);
-
-        // set the options for the schema export plugin property item
-        $schemaPluginProperties->setOptions($exportSpecificOptions);
-        $this->properties = $schemaPluginProperties;
-    }
-
-    /**
-     * Exports the schema into EPS format.
-     *
-     * @param string $db database name
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportSchema($db)
-    {
-        $export = new EpsRelationSchema($db);
-        $export->showOutput();
-    }
-}
diff --git a/#pma/libraries/plugins/schema/SchemaPdf.php b/#pma/libraries/plugins/schema/SchemaPdf.php
deleted file mode 100644
index f900ab61..00000000
--- a/#pma/libraries/plugins/schema/SchemaPdf.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * PDF schema export code
- *
- * @package    PhpMyAdmin-Schema
- * @subpackage PDF
- */
-namespace PMA\libraries\plugins\schema;
-
-use PMA\libraries\properties\options\items\BoolPropertyItem;
-use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
-use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
-use PMA\libraries\plugins\schema\pdf\PdfRelationSchema;
-use PMA\libraries\plugins\SchemaPlugin;
-use PMA\libraries\properties\plugins\SchemaPluginProperties;
-use PMA\libraries\properties\options\items\SelectPropertyItem;
-
-/**
- * Handles the schema export for the PDF format
- *
- * @package    PhpMyAdmin-Schema
- * @subpackage PDF
- */
-class SchemaPdf extends SchemaPlugin
-{
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        $this->setProperties();
-    }
-
-    /**
-     * Sets the schema export PDF properties
-     *
-     * @return void
-     */
-    protected function setProperties()
-    {
-        $schemaPluginProperties = new SchemaPluginProperties();
-        $schemaPluginProperties->setText('PDF');
-        $schemaPluginProperties->setExtension('pdf');
-        $schemaPluginProperties->setMimeType('application/pdf');
-
-        // create the root group that will be the options field for
-        // $schemaPluginProperties
-        // this will be shown as "Format specific options"
-        $exportSpecificOptions = new OptionsPropertyRootGroup(
-            "Format Specific Options"
-        );
-
-        // specific options main group
-        $specificOptions = new OptionsPropertyMainGroup("general_opts");
-        // add options common to all plugins
-        $this->addCommonOptions($specificOptions);
-
-        // create leaf items and add them to the group
-        $leaf = new BoolPropertyItem(
-            'all_tables_same_width',
-            __('Same width for all tables')
-        );
-        $specificOptions->addProperty($leaf);
-
-        $leaf = new SelectPropertyItem(
-            "orientation",
-            __('Orientation')
-        );
-        $leaf->setValues(
-            array(
-                'L' => __('Landscape'),
-                'P' => __('Portrait'),
-            )
-        );
-        $specificOptions->addProperty($leaf);
-
-        $leaf = new SelectPropertyItem(
-            "paper",
-            __('Paper size')
-        );
-        $leaf->setValues($this->getPaperSizeArray());
-        $specificOptions->addProperty($leaf);
-
-        $leaf = new BoolPropertyItem(
-            'show_grid',
-            __('Show grid')
-        );
-        $specificOptions->addProperty($leaf);
-
-        $leaf = new BoolPropertyItem(
-            'with_doc',
-            __('Data dictionary')
-        );
-        $specificOptions->addProperty($leaf);
-
-        $leaf = new SelectPropertyItem(
-            "table_order",
-            __('Order of the tables')
-        );
-        $leaf->setValues(
-            array(
-                ''          => __('None'),
-                'name_asc'  => __('Name (Ascending)'),
-                'name_desc' => __('Name (Descending)'),
-            )
-        );
-        $specificOptions->addProperty($leaf);
-
-        // add the main group to the root group
-        $exportSpecificOptions->addProperty($specificOptions);
-
-        // set the options for the schema export plugin property item
-        $schemaPluginProperties->setOptions($exportSpecificOptions);
-        $this->properties = $schemaPluginProperties;
-    }
-
-    /**
-     * Exports the schema into PDF format.
-     *
-     * @param string $db database name
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportSchema($db)
-    {
-        $export = new PdfRelationSchema($db);
-        $export->showOutput();
-    }
-}
diff --git a/#pma/libraries/plugins/schema/SchemaSvg.php b/#pma/libraries/plugins/schema/SchemaSvg.php
deleted file mode 100644
index df875484..00000000
--- a/#pma/libraries/plugins/schema/SchemaSvg.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * PDF schema export code
- *
- * @package    PhpMyAdmin-Schema
- * @subpackage SVG
- */
-namespace PMA\libraries\plugins\schema;
-
-use PMA\libraries\properties\options\items\BoolPropertyItem;
-use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
-use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
-use PMA\libraries\plugins\SchemaPlugin;
-use PMA\libraries\plugins\schema\svg\SvgRelationSchema;
-use PMA\libraries\properties\plugins\SchemaPluginProperties;
-
-/**
- * Handles the schema export for the SVG format
- *
- * @package    PhpMyAdmin-Schema
- * @subpackage SVG
- */
-class SchemaSvg extends SchemaPlugin
-{
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        $this->setProperties();
-    }
-
-    /**
-     * Sets the schema export SVG properties
-     *
-     * @return void
-     */
-    protected function setProperties()
-    {
-        $schemaPluginProperties = new SchemaPluginProperties();
-        $schemaPluginProperties->setText('SVG');
-        $schemaPluginProperties->setExtension('svg');
-        $schemaPluginProperties->setMimeType('application/svg');
-
-        // create the root group that will be the options field for
-        // $schemaPluginProperties
-        // this will be shown as "Format specific options"
-        $exportSpecificOptions = new OptionsPropertyRootGroup(
-            "Format Specific Options"
-        );
-
-        // specific options main group
-        $specificOptions = new OptionsPropertyMainGroup("general_opts");
-        // add options common to all plugins
-        $this->addCommonOptions($specificOptions);
-
-        // create leaf items and add them to the group
-        $leaf = new BoolPropertyItem(
-            'all_tables_same_width',
-            __('Same width for all tables')
-        );
-        $specificOptions->addProperty($leaf);
-
-        // add the main group to the root group
-        $exportSpecificOptions->addProperty($specificOptions);
-
-        // set the options for the schema export plugin property item
-        $schemaPluginProperties->setOptions($exportSpecificOptions);
-        $this->properties = $schemaPluginProperties;
-    }
-
-    /**
-     * Exports the schema into SVG format.
-     *
-     * @param string $db database name
-     *
-     * @return bool Whether it succeeded
-     */
-    public function exportSchema($db)
-    {
-        $export = new SvgRelationSchema($db);
-        $export->showOutput();
-    }
-}
diff --git a/#pma/libraries/plugins/schema/TableStats.php b/#pma/libraries/plugins/schema/TableStats.php
deleted file mode 100644
index 69fea396..00000000
--- a/#pma/libraries/plugins/schema/TableStats.php
+++ /dev/null
@@ -1,174 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Contains abstract class to hold table preferences/statistics
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries\plugins\schema;
-
-use PMA;
-
-/**
- * Table preferences/statistics
- *
- * This class preserves the table co-ordinates,fields
- * and helps in drawing/generating the tables.
- *
- * @package PhpMyAdmin
- * @abstract
- */
-abstract class TableStats
-{
-    protected $diagram;
-    protected $db;
-    protected $pageNumber;
-    protected $tableName;
-    protected $showKeys;
-    protected $tableDimension;
-    public $displayfield;
-    public $fields = array();
-    public $primary = array();
-    public $x, $y;
-    public $width = 0;
-    public $heightCell = 0;
-    protected $offline;
-
-    /**
-     * Constructor
-     *
-     * @param object  $diagram        schema diagram
-     * @param string  $db             current db name
-     * @param integer $pageNumber     current page number (from the
-     *                                $cfg['Servers'][$i]['table_coords'] table)
-     * @param string  $tableName      table name
-     * @param boolean $showKeys       whether to display keys or not
-     * @param boolean $tableDimension whether to display table position or not
-     * @param boolean $offline        whether the coordinates are sent
-     *                                from the browser
-     */
-    public function __construct(
-        $diagram, $db, $pageNumber, $tableName, $showKeys, $tableDimension, $offline
-    ) {
-        $this->diagram    = $diagram;
-        $this->db         = $db;
-        $this->pageNumber = $pageNumber;
-        $this->tableName  = $tableName;
-
-        $this->showKeys   = $showKeys;
-        $this->tableDimension   = $tableDimension;
-
-        $this->offline    = $offline;
-
-        // checks whether the table exists
-        // and loads fields
-        $this->validateTableAndLoadFields();
-        // load table coordinates
-        $this->loadCoordinates();
-        // loads display field
-        $this->loadDisplayField();
-        // loads primary keys
-        $this->loadPrimaryKey();
-    }
-
-    /**
-     * Validate whether the table exists.
-     *
-     * @return void
-     */
-    protected function validateTableAndLoadFields()
-    {
-        $sql = 'DESCRIBE ' . PMA\libraries\Util::backquote($this->tableName);
-        $result = $GLOBALS['dbi']->tryQuery(
-            $sql, null, PMA\libraries\DatabaseInterface::QUERY_STORE
-        );
-        if (! $result || ! $GLOBALS['dbi']->numRows($result)) {
-            $this->showMissingTableError();
-        }
-
-        if ($this->showKeys) {
-            $indexes = PMA\libraries\Index::getFromTable($this->tableName, $this->db);
-            $all_columns = array();
-            foreach ($indexes as $index) {
-                $all_columns = array_merge(
-                    $all_columns,
-                    array_flip(array_keys($index->getColumns()))
-                );
-            }
-            $this->fields = array_keys($all_columns);
-        } else {
-            while ($row = $GLOBALS['dbi']->fetchRow($result)) {
-                $this->fields[] = $row[0];
-            }
-        }
-    }
-
-    /**
-     * Displays an error when the table cannot be found.
-     *
-     * @return void
-     * @abstract
-     */
-    protected abstract function showMissingTableError();
-
-    /**
-     * Loads coordinates of a table
-     *
-     * @return void
-     */
-    protected function loadCoordinates()
-    {
-        foreach ($_REQUEST['t_h'] as $key => $value) {
-            if ($this->db . '.' . $this->tableName == $key) {
-                $this->x = (double) $_REQUEST['t_x'][$key];
-                $this->y = (double) $_REQUEST['t_y'][$key];
-                break;
-            }
-        }
-    }
-
-    /**
-     * Loads the table's display field
-     *
-     * @return void
-     */
-    protected function loadDisplayField()
-    {
-        $this->displayfield = PMA_getDisplayField($this->db, $this->tableName);
-    }
-
-    /**
-     * Loads the PRIMARY key.
-     *
-     * @return void
-     */
-    protected function loadPrimaryKey()
-    {
-        $result = $GLOBALS['dbi']->query(
-            'SHOW INDEX FROM ' . PMA\libraries\Util::backquote($this->tableName) . ';',
-            null, PMA\libraries\DatabaseInterface::QUERY_STORE
-        );
-        if ($GLOBALS['dbi']->numRows($result) > 0) {
-            while ($row = $GLOBALS['dbi']->fetchAssoc($result)) {
-                if ($row['Key_name'] == 'PRIMARY') {
-                    $this->primary[] = $row['Column_name'];
-                }
-            }
-        }
-    }
-
-    /**
-     * Returns title of the current table,
-     * title can have the dimensions/co-ordinates of the table
-     *
-     * @return string title of the current table
-     */
-    protected function getTitle()
-    {
-        return ($this->tableDimension
-            ? sprintf('%.0fx%0.f', $this->width, $this->heightCell)
-            : ''
-        )
-        . ' ' . $this->tableName;
-    }
-}
diff --git a/#pma/libraries/plugins/schema/dia/Dia.php b/#pma/libraries/plugins/schema/dia/Dia.php
deleted file mode 100644
index 4aad6e06..00000000
--- a/#pma/libraries/plugins/schema/dia/Dia.php
+++ /dev/null
@@ -1,188 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Classes to create relation schema in Dia format.
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries\plugins\schema\dia;
-
-use PMA;
-use XMLWriter;
-
-/**
- * This Class inherits the XMLwriter class and
- * helps in developing structure of DIA Schema Export
- *
- * @package PhpMyAdmin
- * @access  public
- * @see     https://php.net/manual/en/book.xmlwriter.php
- */
-class Dia extends XMLWriter
-{
-    /**
-     * The "Dia" constructor
-     *
-     * Upon instantiation This starts writing the Dia XML document
-     *
-     * @see XMLWriter::openMemory(),XMLWriter::setIndent(),XMLWriter::startDocument()
-     */
-    public function __construct()
-    {
-        $this->openMemory();
-        /*
-         * Set indenting using three spaces,
-         * so output is formatted
-         */
-        $this->setIndent(true);
-        $this->setIndentString('   ');
-        /*
-         * Create the XML document
-         */
-        $this->startDocument('1.0', 'UTF-8');
-    }
-
-    /**
-     * Starts Dia Document
-     *
-     * dia document starts by first initializing dia:diagram tag
-     * then dia:diagramdata contains all the attributes that needed
-     * to define the document, then finally a Layer starts which
-     * holds all the objects.
-     *
-     * @param string $paper        the size of the paper/document
-     * @param float  $topMargin    top margin of the paper/document in cm
-     * @param float  $bottomMargin bottom margin of the paper/document in cm
-     * @param float  $leftMargin   left margin of the paper/document in cm
-     * @param float  $rightMargin  right margin of the paper/document in cm
-     * @param string $orientation  orientation of the document, portrait or landscape
-     *
-     * @return void
-     *
-     * @access public
-     * @see    XMLWriter::startElement(),XMLWriter::writeAttribute(),
-     *      XMLWriter::writeRaw()
-     */
-    public function startDiaDoc(
-        $paper,
-        $topMargin,
-        $bottomMargin,
-        $leftMargin,
-        $rightMargin,
-        $orientation
-    ) {
-        if ($orientation == 'P') {
-            $isPortrait = 'true';
-        } else {
-            $isPortrait = 'false';
-        }
-        $this->startElement('dia:diagram');
-        $this->writeAttribute('xmlns:dia', 'http://www.lysator.liu.se/~alla/dia/');
-        $this->startElement('dia:diagramdata');
-        $this->writeRaw(
-            '<dia:attribute name="background">
-              <dia:color val="#ffffff"/>
-            </dia:attribute>
-            <dia:attribute name="pagebreak">
-              <dia:color val="#000099"/>
-            </dia:attribute>
-            <dia:attribute name="paper">
-              <dia:composite type="paper">
-                <dia:attribute name="name">
-                  <dia:string>#' . $paper . '#</dia:string>
-                </dia:attribute>
-                <dia:attribute name="tmargin">
-                  <dia:real val="' . $topMargin . '"/>
-                </dia:attribute>
-                <dia:attribute name="bmargin">
-                  <dia:real val="' . $bottomMargin . '"/>
-                </dia:attribute>
-                <dia:attribute name="lmargin">
-                  <dia:real val="' . $leftMargin . '"/>
-                </dia:attribute>
-                <dia:attribute name="rmargin">
-                  <dia:real val="' . $rightMargin . '"/>
-                </dia:attribute>
-                <dia:attribute name="is_portrait">
-                  <dia:boolean val="' . $isPortrait . '"/>
-                </dia:attribute>
-                <dia:attribute name="scaling">
-                  <dia:real val="1"/>
-                </dia:attribute>
-                <dia:attribute name="fitto">
-                  <dia:boolean val="false"/>
-                </dia:attribute>
-              </dia:composite>
-            </dia:attribute>
-            <dia:attribute name="grid">
-              <dia:composite type="grid">
-                <dia:attribute name="width_x">
-                  <dia:real val="1"/>
-                </dia:attribute>
-                <dia:attribute name="width_y">
-                  <dia:real val="1"/>
-                </dia:attribute>
-                <dia:attribute name="visible_x">
-                  <dia:int val="1"/>
-                </dia:attribute>
-                <dia:attribute name="visible_y">
-                  <dia:int val="1"/>
-                </dia:attribute>
-                <dia:composite type="color"/>
-              </dia:composite>
-            </dia:attribute>
-            <dia:attribute name="color">
-              <dia:color val="#d8e5e5"/>
-            </dia:attribute>
-            <dia:attribute name="guides">
-              <dia:composite type="guides">
-                <dia:attribute name="hguides"/>
-                <dia:attribute name="vguides"/>
-              </dia:composite>
-            </dia:attribute>'
-        );
-        $this->endElement();
-        $this->startElement('dia:layer');
-        $this->writeAttribute('name', 'Background');
-        $this->writeAttribute('visible', 'true');
-        $this->writeAttribute('active', 'true');
-    }
-
-    /**
-     * Ends Dia Document
-     *
-     * @return void
-     * @access public
-     * @see    XMLWriter::endElement(),XMLWriter::endDocument()
-     */
-    public function endDiaDoc()
-    {
-        $this->endElement();
-        $this->endDocument();
-    }
-
-    /**
-     * Output Dia Document for download
-     *
-     * @param string $fileName name of the dia document
-     *
-     * @return void
-     * @access public
-     * @see    XMLWriter::flush()
-     */
-    public function showOutput($fileName)
-    {
-        if (ob_get_clean()) {
-            ob_end_clean();
-        }
-        $output = $this->flush();
-        PMA\libraries\Response::getInstance()
-            ->disable();
-        PMA_downloadHeader(
-            $fileName,
-            'application/x-dia-diagram',
-            strlen($output)
-        );
-        print $output;
-    }
-}
diff --git a/#pma/libraries/plugins/schema/dia/DiaRelationSchema.php b/#pma/libraries/plugins/schema/dia/DiaRelationSchema.php
deleted file mode 100644
index 01a0249f..00000000
--- a/#pma/libraries/plugins/schema/dia/DiaRelationSchema.php
+++ /dev/null
@@ -1,227 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Classes to create relation schema in Dia format.
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries\plugins\schema\dia;
-
-use PMA\libraries\plugins\schema\eps\TableStatsEps;
-use PMA\libraries\plugins\schema\ExportRelationSchema;
-use PMA\libraries\plugins\schema\pdf\TableStatsPdf;
-use PMA\libraries\plugins\schema\svg\TableStatsSvg;
-use PMA\libraries\plugins\schema\dia\TableStatsDia;
-
-/**
- * Dia Relation Schema Class
- *
- * Purpose of this class is to generate the Dia XML Document
- * which is used for representing the database diagrams in Dia IDE
- * This class uses Database Table and Reference Objects of Dia and with
- * the combination of these objects actually helps in preparing Dia XML.
- *
- * Dia XML is generated by using XMLWriter php extension and this class
- * inherits ExportRelationSchema class has common functionality added
- * to this class
- *
- * @package PhpMyAdmin
- * @name    Dia_Relation_Schema
- */
-class DiaRelationSchema extends ExportRelationSchema
-{
-    /**
-     * @var TableStatsDia[]|TableStatsEps[]|TableStatsPdf[]|TableStatsSvg[]
-     */
-    private $_tables = array();
-    /** @var RelationStatsDia[] Relations */
-    private $_relations = array();
-    private $_topMargin = 2.8222000598907471;
-    private $_bottomMargin = 2.8222000598907471;
-    private $_leftMargin = 2.8222000598907471;
-    private $_rightMargin = 2.8222000598907471;
-    public static $objectId = 0;
-
-    /**
-     * The "PMA\libraries\plugins\schema\dia\DiaRelationSchema" constructor
-     *
-     * Upon instantiation This outputs the Dia XML document
-     * that user can download
-     *
-     * @param string $db database name
-     *
-     * @see Dia,TableStatsDia,RelationStatsDia
-     */
-    public function __construct($db)
-    {
-        parent::__construct($db, new Dia());
-
-        $this->setShowColor(isset($_REQUEST['dia_show_color']));
-        $this->setShowKeys(isset($_REQUEST['dia_show_keys']));
-        $this->setOrientation($_REQUEST['dia_orientation']);
-        $this->setPaper($_REQUEST['dia_paper']);
-
-        $this->diagram->startDiaDoc(
-            $this->paper,
-            $this->_topMargin,
-            $this->_bottomMargin,
-            $this->_leftMargin,
-            $this->_rightMargin,
-            $this->orientation
-        );
-
-        $alltables = $this->getTablesFromRequest();
-
-        foreach ($alltables as $table) {
-            if (!isset($this->tables[$table])) {
-                $this->_tables[$table] = new TableStatsDia(
-                    $this->diagram, $this->db, $table, $this->pageNumber,
-                    $this->showKeys, $this->offline
-                );
-            }
-        }
-
-        $seen_a_relation = false;
-        foreach ($alltables as $one_table) {
-            $exist_rel = PMA_getForeigners($this->db, $one_table, '', 'both');
-            if (!$exist_rel) {
-                continue;
-            }
-
-            $seen_a_relation = true;
-            foreach ($exist_rel as $master_field => $rel) {
-                /* put the foreign table on the schema only if selected
-                 * by the user
-                 * (do not use array_search() because we would have to
-                 * to do a === false and this is not PHP3 compatible)
-                 */
-                if ($master_field != 'foreign_keys_data') {
-                    if (in_array($rel['foreign_table'], $alltables)) {
-                        $this->_addRelation(
-                            $one_table,
-                            $master_field,
-                            $rel['foreign_table'],
-                            $rel['foreign_field'],
-                            $this->showKeys
-                        );
-                    }
-                    continue;
-                }
-
-                foreach ($rel as $one_key) {
-                    if (!in_array($one_key['ref_table_name'], $alltables)) {
-                        continue;
-                    }
-
-                    foreach ($one_key['index_list'] as $index => $one_field) {
-                        $this->_addRelation(
-                            $one_table,
-                            $one_field,
-                            $one_key['ref_table_name'],
-                            $one_key['ref_index_list'][$index],
-                            $this->showKeys
-                        );
-                    }
-                }
-            }
-        }
-        $this->_drawTables();
-
-        if ($seen_a_relation) {
-            $this->_drawRelations();
-        }
-        $this->diagram->endDiaDoc();
-    }
-
-    /**
-     * Output Dia Document for download
-     *
-     * @return void
-     * @access public
-     */
-    public function showOutput()
-    {
-        $this->diagram->showOutput($this->getFileName('.dia'));
-    }
-
-    /**
-     * Defines relation objects
-     *
-     * @param string $masterTable  The master table name
-     * @param string $masterField  The relation field in the master table
-     * @param string $foreignTable The foreign table name
-     * @param string $foreignField The relation field in the foreign table
-     * @param bool   $showKeys     Whether to display ONLY keys or not
-     *
-     * @return void
-     *
-     * @access private
-     * @see    TableStatsDia::__construct(),RelationStatsDia::__construct()
-     */
-    private function _addRelation(
-        $masterTable,
-        $masterField,
-        $foreignTable,
-        $foreignField,
-        $showKeys
-    ) {
-        if (!isset($this->_tables[$masterTable])) {
-            $this->_tables[$masterTable] = new TableStatsDia(
-                $this->diagram, $this->db, $masterTable, $this->pageNumber, $showKeys
-            );
-        }
-        if (!isset($this->_tables[$foreignTable])) {
-            $this->_tables[$foreignTable] = new TableStatsDia(
-                $this->diagram,
-                $this->db,
-                $foreignTable,
-                $this->pageNumber,
-                $showKeys
-            );
-        }
-        $this->_relations[] = new RelationStatsDia(
-            $this->diagram,
-            $this->_tables[$masterTable],
-            $masterField,
-            $this->_tables[$foreignTable],
-            $foreignField
-        );
-    }
-
-    /**
-     * Draws relation references
-     *
-     * connects master table's master field to
-     * foreign table's foreign field using Dia object
-     * type Database - Reference
-     *
-     * @return void
-     *
-     * @access private
-     * @see    RelationStatsDia::relationDraw()
-     */
-    private function _drawRelations()
-    {
-        foreach ($this->_relations as $relation) {
-            $relation->relationDraw($this->showColor);
-        }
-    }
-
-    /**
-     * Draws tables
-     *
-     * Tables are generated using Dia object type Database - Table
-     * primary fields are underlined and bold in tables
-     *
-     * @return void
-     *
-     * @access private
-     * @see    TableStatsDia::tableDraw()
-     */
-    private function _drawTables()
-    {
-        foreach ($this->_tables as $table) {
-            $table->tableDraw($this->showColor);
-        }
-    }
-}
diff --git a/#pma/libraries/plugins/schema/dia/RelationStatsDia.php b/#pma/libraries/plugins/schema/dia/RelationStatsDia.php
deleted file mode 100644
index f40ec225..00000000
--- a/#pma/libraries/plugins/schema/dia/RelationStatsDia.php
+++ /dev/null
@@ -1,214 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Contains PMA\libraries\plugins\schema\dia\RelationStatsDia class
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries\plugins\schema\dia;
-
-/**
- * Relation preferences/statistics
- *
- * This class fetches the table master and foreign fields positions
- * and helps in generating the Table references and then connects
- * master table's master field to foreign table's foreign key
- * in dia XML document.
- *
- * @package PhpMyAdmin
- * @name    Relation_Stats_Dia
- * @see     PMA_DIA
- */
-class RelationStatsDia
-{
-    protected $diagram;
-    /**
-     * Defines properties
-     */
-    public $srcConnPointsRight;
-    public $srcConnPointsLeft;
-    public $destConnPointsRight;
-    public $destConnPointsLeft;
-    public $masterTableId;
-    public $foreignTableId;
-    public $masterTablePos;
-    public $foreignTablePos;
-    public $referenceColor;
-
-    /**
-     * The "PMA\libraries\plugins\schema\dia\RelationStatsDia" constructor
-     *
-     * @param object $diagram       The DIA diagram
-     * @param string $master_table  The master table name
-     * @param string $master_field  The relation field in the master table
-     * @param string $foreign_table The foreign table name
-     * @param string $foreign_field The relation field in the foreign table
-     *
-     * @see Relation_Stats_Dia::_getXy
-     */
-    public function __construct(
-        $diagram, $master_table, $master_field, $foreign_table, $foreign_field
-    ) {
-        $this->diagram = $diagram;
-        $src_pos  = $this->_getXy($master_table, $master_field);
-        $dest_pos = $this->_getXy($foreign_table, $foreign_field);
-        $this->srcConnPointsLeft = $src_pos[0];
-        $this->srcConnPointsRight = $src_pos[1];
-        $this->destConnPointsLeft = $dest_pos[0];
-        $this->destConnPointsRight = $dest_pos[1];
-        $this->masterTablePos = $src_pos[2];
-        $this->foreignTablePos = $dest_pos[2];
-        $this->masterTableId = $master_table->tableId;
-        $this->foreignTableId = $foreign_table->tableId;
-    }
-
-    /**
-     * Each Table object have connection points
-     * which is used to connect to other objects in Dia
-     * we detect the position of key in fields and
-     * then determines its left and right connection
-     * points.
-     *
-     * @param string $table  The current table name
-     * @param string $column The relation column name
-     *
-     * @return array Table right,left connection points and key position
-     *
-     * @access private
-     */
-    private function _getXy($table, $column)
-    {
-        $pos = array_search($column, $table->fields);
-        // left, right, position
-        $value = 12;
-        if ($pos != 0) {
-            return array($pos + $value + $pos, $pos + $value + $pos + 1, $pos);
-        }
-        return array($pos + $value , $pos + $value + 1, $pos);
-    }
-
-    /**
-     * Draws relation references
-     *
-     * connects master table's master field to foreign table's
-     * foreign field using Dia object type Database - Reference
-     * Dia object is used to generate the XML of Dia Document.
-     * Database reference Object and their attributes are involved
-     * in the combination of displaying Database - reference on Dia Document.
-     *
-     * @param boolean $showColor Whether to use one color per relation or not
-     *                           if showColor is true then an array of $listOfColors
-     *                           will be used to choose the random colors for
-     *                           references lines. we can change/add more colors to
-     *                           this
-     *
-     * @return boolean|void
-     *
-     * @access public
-     * @see    PDF
-     */
-    public function relationDraw($showColor)
-    {
-        ++DiaRelationSchema::$objectId;
-        /*
-         * if source connection points and destination connection
-        * points are same then return it false and don't draw that
-        * relation
-        */
-        if ($this->srcConnPointsRight == $this->destConnPointsRight) {
-            if ($this->srcConnPointsLeft == $this->destConnPointsLeft) {
-                return false;
-            }
-        }
-
-        if ($showColor) {
-            $listOfColors = array(
-                'FF0000',
-                '000099',
-                '00FF00',
-            );
-            shuffle($listOfColors);
-            $this->referenceColor = '#' . $listOfColors[0] . '';
-        } else {
-            $this->referenceColor = '#000000';
-        }
-
-        $this->diagram->writeRaw(
-            '<dia:object type="Database - Reference" version="0" id="'
-            . DiaRelationSchema::$objectId . '">
-            <dia:attribute name="obj_pos">
-                <dia:point val="3.27,18.9198"/>
-            </dia:attribute>
-            <dia:attribute name="obj_bb">
-                <dia:rectangle val="2.27,8.7175;17.7679,18.9198"/>
-            </dia:attribute>
-            <dia:attribute name="meta">
-                <dia:composite type="dict"/>
-            </dia:attribute>
-            <dia:attribute name="orth_points">
-                <dia:point val="3.27,18.9198"/>
-                <dia:point val="2.27,18.9198"/>
-                <dia:point val="2.27,14.1286"/>
-                <dia:point val="17.7679,14.1286"/>
-                <dia:point val="17.7679,9.3375"/>
-                <dia:point val="16.7679,9.3375"/>
-            </dia:attribute>
-            <dia:attribute name="orth_orient">
-                <dia:enum val="0"/>
-                <dia:enum val="1"/>
-                <dia:enum val="0"/>
-                <dia:enum val="1"/>
-                <dia:enum val="0"/>
-            </dia:attribute>
-            <dia:attribute name="orth_autoroute">
-                <dia:boolean val="true"/>
-            </dia:attribute>
-            <dia:attribute name="text_colour">
-                <dia:color val="#000000"/>
-            </dia:attribute>
-            <dia:attribute name="line_colour">
-                <dia:color val="' . $this->referenceColor . '"/>
-            </dia:attribute>
-            <dia:attribute name="line_width">
-                <dia:real val="0.10000000000000001"/>
-            </dia:attribute>
-            <dia:attribute name="line_style">
-                <dia:enum val="0"/>
-                <dia:real val="1"/>
-            </dia:attribute>
-            <dia:attribute name="corner_radius">
-                <dia:real val="0"/>
-            </dia:attribute>
-            <dia:attribute name="end_arrow">
-                <dia:enum val="22"/>
-            </dia:attribute>
-            <dia:attribute name="end_arrow_length">
-                <dia:real val="0.5"/>
-            </dia:attribute>
-            <dia:attribute name="end_arrow_width">
-                <dia:real val="0.5"/>
-            </dia:attribute>
-            <dia:attribute name="start_point_desc">
-                <dia:string>#1#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="end_point_desc">
-                <dia:string>#n#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="normal_font">
-                <dia:font family="monospace" style="0" name="Courier"/>
-            </dia:attribute>
-            <dia:attribute name="normal_font_height">
-                <dia:real val="0.59999999999999998"/>
-            </dia:attribute>
-            <dia:connections>
-                <dia:connection handle="0" to="'
-            . $this->masterTableId . '" connection="'
-            . $this->srcConnPointsRight . '"/>
-                <dia:connection handle="1" to="'
-            . $this->foreignTableId . '" connection="'
-            . $this->destConnPointsRight . '"/>
-            </dia:connections>
-            </dia:object>'
-        );
-    }
-}
diff --git a/#pma/libraries/plugins/schema/dia/TableStatsDia.php b/#pma/libraries/plugins/schema/dia/TableStatsDia.php
deleted file mode 100644
index 883af32e..00000000
--- a/#pma/libraries/plugins/schema/dia/TableStatsDia.php
+++ /dev/null
@@ -1,229 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Contains PMA\libraries\plugins\schema\dia\TableStatsDia class
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries\plugins\schema\dia;
-
-use PMA\libraries\plugins\schema\ExportRelationSchema;
-use PMA\libraries\plugins\schema\TableStats;
-
-/**
- * Table preferences/statistics
- *
- * This class preserves the table co-ordinates,fields
- * and helps in drawing/generating the Tables in dia XML document.
- *
- * @package PhpMyAdmin
- * @name    Table_Stats_Dia
- * @see     PMA_DIA
- */
-class TableStatsDia extends TableStats
-{
-    public $tableId;
-    public $tableColor;
-
-    /**
-     * The "PMA\libraries\plugins\schema\dia\TableStatsDia" constructor
-     *
-     * @param object  $diagram    The current dia document
-     * @param string  $db         The database name
-     * @param string  $tableName  The table name
-     * @param integer $pageNumber The current page number (from the
-     *                            $cfg['Servers'][$i]['table_coords'] table)
-     * @param boolean $showKeys   Whether to display ONLY keys or not
-     * @param boolean $offline    Whether the coordinates are sent from the browser
-     */
-    public function __construct(
-        $diagram,
-        $db,
-        $tableName,
-        $pageNumber,
-        $showKeys = false,
-        $offline = false
-    ) {
-        parent::__construct(
-            $diagram,
-            $db,
-            $pageNumber,
-            $tableName,
-            $showKeys,
-            false,
-            $offline
-        );
-
-        /**
-         * Every object in Dia document needs an ID to identify
-         * so, we used a static variable to keep the things unique
-        */
-        $this->tableId = ++DiaRelationSchema::$objectId;
-    }
-
-    /**
-     * Displays an error when the table cannot be found.
-     *
-     * @return void
-     */
-    protected function showMissingTableError()
-    {
-        ExportRelationSchema::dieSchema(
-            $this->pageNumber,
-            "DIA",
-            sprintf(__('The %s table doesn\'t exist!'), $this->tableName)
-        );
-    }
-
-    /**
-     * Do draw the table
-     *
-     * Tables are generated using object type Database - Table
-     * primary fields are underlined in tables. Dia object
-     * is used to generate the XML of Dia Document. Database Table
-     * Object and their attributes are involved in the combination
-     * of displaying Database - Table on Dia Document.
-     *
-     * @param boolean $showColor Whether to show color for tables text or not
-     *                           if showColor is true then an array of $listOfColors
-     *                           will be used to choose the random colors for tables
-     *                           text we can change/add more colors to this array
-     *
-     * @return void
-     *
-     * @access public
-     * @see    Dia
-     */
-    public function tableDraw($showColor)
-    {
-        if ($showColor) {
-            $listOfColors = array(
-                'FF0000',
-                '000099',
-                '00FF00'
-            );
-            shuffle($listOfColors);
-            $this->tableColor =  '#' . $listOfColors[0] . '';
-        } else {
-            $this->tableColor = '#000000';
-        }
-
-        $factor = 0.1;
-
-        $this->diagram->startElement('dia:object');
-        $this->diagram->writeAttribute('type', 'Database - Table');
-        $this->diagram->writeAttribute('version', '0');
-        $this->diagram->writeAttribute('id', '' . $this->tableId . '');
-        $this->diagram->writeRaw(
-            '<dia:attribute name="obj_pos">
-                <dia:point val="'
-            . ($this->x * $factor) . ',' . ($this->y * $factor) . '"/>
-            </dia:attribute>
-            <dia:attribute name="obj_bb">
-                <dia:rectangle val="'
-            . ($this->x * $factor) . ',' . ($this->y * $factor) . ';9.97,9.2"/>
-            </dia:attribute>
-            <dia:attribute name="meta">
-                <dia:composite type="dict"/>
-            </dia:attribute>
-            <dia:attribute name="elem_corner">
-                <dia:point val="'
-            . ($this->x * $factor) . ',' . ($this->y * $factor) . '"/>
-            </dia:attribute>
-            <dia:attribute name="elem_width">
-                <dia:real val="5.9199999999999999"/>
-            </dia:attribute>
-            <dia:attribute name="elem_height">
-                <dia:real val="3.5"/>
-            </dia:attribute>
-            <dia:attribute name="text_colour">
-                <dia:color val="' . $this->tableColor . '"/>
-            </dia:attribute>
-            <dia:attribute name="line_colour">
-                <dia:color val="#000000"/>
-            </dia:attribute>
-            <dia:attribute name="fill_colour">
-                <dia:color val="#ffffff"/>
-            </dia:attribute>
-            <dia:attribute name="line_width">
-                <dia:real val="0.10000000000000001"/>
-            </dia:attribute>
-            <dia:attribute name="name">
-                <dia:string>#' . $this->tableName . '#</dia:string>
-            </dia:attribute>
-            <dia:attribute name="comment">
-                <dia:string>##</dia:string>
-            </dia:attribute>
-            <dia:attribute name="visible_comment">
-                <dia:boolean val="false"/>
-            </dia:attribute>
-            <dia:attribute name="tagging_comment">
-                <dia:boolean val="false"/>
-            </dia:attribute>
-            <dia:attribute name="underline_primary_key">
-                <dia:boolean val="true"/>
-            </dia:attribute>
-            <dia:attribute name="bold_primary_keys">
-                <dia:boolean val="true"/>
-            </dia:attribute>
-            <dia:attribute name="normal_font">
-                <dia:font family="monospace" style="0" name="Courier"/>
-            </dia:attribute>
-            <dia:attribute name="name_font">
-                <dia:font family="sans" style="80" name="Helvetica-Bold"/>
-            </dia:attribute>
-            <dia:attribute name="comment_font">
-                <dia:font family="sans" style="0" name="Helvetica"/>
-            </dia:attribute>
-            <dia:attribute name="normal_font_height">
-                <dia:real val="0.80000000000000004"/>
-            </dia:attribute>
-            <dia:attribute name="name_font_height">
-                <dia:real val="0.69999999999999996"/>
-            </dia:attribute>
-            <dia:attribute name="comment_font_height">
-                <dia:real val="0.69999999999999996"/>
-            </dia:attribute>'
-        );
-
-        $this->diagram->startElement('dia:attribute');
-        $this->diagram->writeAttribute('name', 'attributes');
-
-        foreach ($this->fields as $field) {
-            $this->diagram->writeRaw(
-                '<dia:composite type="table_attribute">
-                    <dia:attribute name="name">
-                <dia:string>#' . $field . '#</dia:string>
-                </dia:attribute>
-                <dia:attribute name="type">
-                    <dia:string>##</dia:string>
-                </dia:attribute>
-                    <dia:attribute name="comment">
-                <dia:string>##</dia:string>
-                </dia:attribute>'
-            );
-            unset($pm);
-            $pm = 'false';
-            if (in_array($field, $this->primary)) {
-                $pm = 'true';
-            }
-            if ($field == $this->displayfield) {
-                $pm = 'false';
-            }
-            $this->diagram->writeRaw(
-                '<dia:attribute name="primary_key">
-                    <dia:boolean val="' . $pm . '"/>
-                </dia:attribute>
-                <dia:attribute name="nullable">
-                    <dia:boolean val="false"/>
-                </dia:attribute>
-                <dia:attribute name="unique">
-                    <dia:boolean val="' . $pm . '"/>
-                </dia:attribute>
-                </dia:composite>'
-            );
-        }
-        $this->diagram->endElement();
-        $this->diagram->endElement();
-    }
-}
diff --git a/#pma/libraries/plugins/schema/eps/Eps.php b/#pma/libraries/plugins/schema/eps/Eps.php
deleted file mode 100644
index de39521d..00000000
--- a/#pma/libraries/plugins/schema/eps/Eps.php
+++ /dev/null
@@ -1,277 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Classes to create relation schema in EPS format.
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries\plugins\schema\eps;
-
-use PMA\libraries\Response;
-
-/**
- * This Class is EPS Library and
- * helps in developing structure of EPS Schema Export
- *
- * @package PhpMyAdmin
- * @access  public
- * @see     https://php.net/manual/en/book.xmlwriter.php
- */
-class Eps
-{
-    public $font;
-    public $fontSize;
-    public $stringCommands;
-
-    /**
-     * The "Eps" constructor
-     *
-     * Upon instantiation This starts writing the EPS Document.
-     * %!PS-Adobe-3.0 EPSF-3.0 This is the MUST first comment to include
-     * it shows/tells that the Post Script document is purely under
-     * Document Structuring Convention [DSC] and is Compliant
-     * Encapsulated Post Script Document
-     */
-    public function __construct()
-    {
-        $this->stringCommands = "";
-        $this->stringCommands .= "%!PS-Adobe-3.0 EPSF-3.0 \n";
-    }
-
-    /**
-     * Set document title
-     *
-     * @param string $value sets the title text
-     *
-     * @return void
-     */
-    public function setTitle($value)
-    {
-        $this->stringCommands .= '%%Title: ' . $value . "\n";
-    }
-
-    /**
-     * Set document author
-     *
-     * @param string $value sets the author
-     *
-     * @return void
-     */
-    public function setAuthor($value)
-    {
-        $this->stringCommands .= '%%Creator: ' . $value . "\n";
-    }
-
-    /**
-     * Set document creation date
-     *
-     * @param string $value sets the date
-     *
-     * @return void
-     */
-    public function setDate($value)
-    {
-        $this->stringCommands .= '%%CreationDate: ' . $value . "\n";
-    }
-
-    /**
-     * Set document orientation
-     *
-     * @param string $orientation sets the orientation
-     *
-     * @return void
-     */
-    public function setOrientation($orientation)
-    {
-        $this->stringCommands .= "%%PageOrder: Ascend \n";
-        if ($orientation == "L") {
-            $orientation = "Landscape";
-            $this->stringCommands .= '%%Orientation: ' . $orientation . "\n";
-        } else {
-            $orientation = "Portrait";
-            $this->stringCommands .= '%%Orientation: ' . $orientation . "\n";
-        }
-        $this->stringCommands .= "%%EndComments \n";
-        $this->stringCommands .= "%%Pages 1 \n";
-        $this->stringCommands .= "%%BoundingBox: 72 150 144 170 \n";
-    }
-
-    /**
-     * Set the font and size
-     *
-     * font can be set whenever needed in EPS
-     *
-     * @param string  $value sets the font name e.g Arial
-     * @param integer $size  sets the size of the font e.g 10
-     *
-     * @return void
-     */
-    public function setFont($value, $size)
-    {
-        $this->font = $value;
-        $this->fontSize = $size;
-        $this->stringCommands .= "/" . $value . " findfont   % Get the basic font\n";
-        $this->stringCommands .= ""
-            . $size . " scalefont            % Scale the font to $size points\n";
-        $this->stringCommands
-            .= "setfont                 % Make it the current font\n";
-    }
-
-    /**
-     * Get the font
-     *
-     * @return string return the font name e.g Arial
-     */
-    public function getFont()
-    {
-        return $this->font;
-    }
-
-    /**
-     * Get the font Size
-     *
-     * @return string return the size of the font e.g 10
-     */
-    public function getFontSize()
-    {
-        return $this->fontSize;
-    }
-
-    /**
-     * Draw the line
-     *
-     * drawing the lines from x,y source to x,y destination and set the
-     * width of the line. lines helps in showing relationships of tables
-     *
-     * @param integer $x_from    The x_from attribute defines the start
-     *                           left position of the element
-     * @param integer $y_from    The y_from attribute defines the start
-     *                           right position of the element
-     * @param integer $x_to      The x_to attribute defines the end
-     *                           left position of the element
-     * @param integer $y_to      The y_to attribute defines the end
-     *                           right position of the element
-     * @param integer $lineWidth Sets the width of the line e.g 2
-     *
-     * @return void
-     */
-    public function line(
-        $x_from = 0,
-        $y_from = 0,
-        $x_to = 0,
-        $y_to = 0,
-        $lineWidth = 0
-    ) {
-        $this->stringCommands .= $lineWidth . " setlinewidth  \n";
-        $this->stringCommands .= $x_from . ' ' . $y_from . " moveto \n";
-        $this->stringCommands .= $x_to . ' ' . $y_to . " lineto \n";
-        $this->stringCommands .= "stroke \n";
-    }
-
-    /**
-     * Draw the rectangle
-     *
-     * drawing the rectangle from x,y source to x,y destination and set the
-     * width of the line. rectangles drawn around the text shown of fields
-     *
-     * @param integer $x_from    The x_from attribute defines the start
-     *                           left position of the element
-     * @param integer $y_from    The y_from attribute defines the start
-     *                           right position of the element
-     * @param integer $x_to      The x_to attribute defines the end
-     *                           left position of the element
-     * @param integer $y_to      The y_to attribute defines the end
-     *                           right position of the element
-     * @param integer $lineWidth Sets the width of the line e.g 2
-     *
-     * @return void
-     */
-    public function rect($x_from, $y_from, $x_to, $y_to, $lineWidth)
-    {
-        $this->stringCommands .= $lineWidth . " setlinewidth  \n";
-        $this->stringCommands .= "newpath \n";
-        $this->stringCommands .= $x_from . " " . $y_from . " moveto \n";
-        $this->stringCommands .= "0 " . $y_to . " rlineto \n";
-        $this->stringCommands .= $x_to . " 0 rlineto \n";
-        $this->stringCommands .= "0 -" . $y_to . " rlineto \n";
-        $this->stringCommands .= "closepath \n";
-        $this->stringCommands .= "stroke \n";
-    }
-
-    /**
-     * Set the current point
-     *
-     * The moveto operator takes two numbers off the stack and treats
-     * them as x and y coordinates to which to move. The coordinates
-     * specified become the current point.
-     *
-     * @param integer $x The x attribute defines the left position of the element
-     * @param integer $y The y attribute defines the right position of the element
-     *
-     * @return void
-     */
-    public function moveTo($x, $y)
-    {
-        $this->stringCommands .= $x . ' ' . $y . " moveto \n";
-    }
-
-    /**
-     * Output/Display the text
-     *
-     * @param string $text The string to be displayed
-     *
-     * @return void
-     */
-    public function show($text)
-    {
-        $this->stringCommands .= '(' . $text . ") show \n";
-    }
-
-    /**
-     * Output the text at specified co-ordinates
-     *
-     * @param string  $text String to be displayed
-     * @param integer $x    X attribute defines the left position of the element
-     * @param integer $y    Y attribute defines the right position of the element
-     *
-     * @return void
-     */
-    public function showXY($text, $x, $y)
-    {
-        $this->moveTo($x, $y);
-        $this->show($text);
-    }
-
-    /**
-     * Ends EPS Document
-     *
-     * @return void
-     */
-    public function endEpsDoc()
-    {
-        $this->stringCommands .= "showpage \n";
-    }
-
-    /**
-     * Output EPS Document for download
-     *
-     * @param string $fileName name of the eps document
-     *
-     * @return void
-     */
-    public function showOutput($fileName)
-    {
-        // if(ob_get_clean()){
-        //ob_end_clean();
-        //}
-        $output = $this->stringCommands;
-        Response::getInstance()
-            ->disable();
-        PMA_downloadHeader(
-            $fileName,
-            'image/x-eps',
-            strlen($output)
-        );
-        print $output;
-    }
-}
diff --git a/#pma/libraries/plugins/schema/eps/EpsRelationSchema.php b/#pma/libraries/plugins/schema/eps/EpsRelationSchema.php
deleted file mode 100644
index 5caed6da..00000000
--- a/#pma/libraries/plugins/schema/eps/EpsRelationSchema.php
+++ /dev/null
@@ -1,223 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Classes to create relation schema in EPS format.
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries\plugins\schema\eps;
-
-use PMA\libraries\plugins\schema\dia\RelationStatsDia;
-use PMA\libraries\plugins\schema\dia\TableStatsDia;
-use PMA\libraries\plugins\schema\ExportRelationSchema;
-use PMA\libraries\plugins\schema\pdf\TableStatsPdf;
-use PMA\libraries\plugins\schema\svg\TableStatsSvg;
-
-/**
- * EPS Relation Schema Class
- *
- * Purpose of this class is to generate the EPS Document
- * which is used for representing the database diagrams.
- * This class uses post script commands and with
- * the combination of these commands actually helps in preparing EPS Document.
- *
- * This class inherits ExportRelationSchema class has common functionality added
- * to this class
- *
- * @package PhpMyAdmin
- * @name    Eps_Relation_Schema
- */
-class EpsRelationSchema extends ExportRelationSchema
-{
-    /**
-     * @var TableStatsDia[]|TableStatsEps[]|TableStatsPdf[]|TableStatsSvg[]
-     */
-    private $_tables = array();
-
-    /** @var RelationStatsDia[] Relations */
-    private $_relations = array();
-
-    private $_tablewidth;
-
-    /**
-     * The "PMA_EPS_Relation_Schema" constructor
-     *
-     * Upon instantiation This starts writing the EPS document
-     * user will be prompted for download as .eps extension
-     *
-     * @param string $db database name
-     *
-     * @see PMA_EPS
-     */
-    public function __construct($db)
-    {
-        parent::__construct($db, new Eps());
-
-        $this->setShowColor(isset($_REQUEST['eps_show_color']));
-        $this->setShowKeys(isset($_REQUEST['eps_show_keys']));
-        $this->setTableDimension(isset($_REQUEST['eps_show_table_dimension']));
-        $this->setAllTablesSameWidth(isset($_REQUEST['eps_all_tables_same_width']));
-        $this->setOrientation($_REQUEST['eps_orientation']);
-
-        $this->diagram->setTitle(
-            sprintf(
-                __('Schema of the %s database - Page %s'),
-                $this->db,
-                $this->pageNumber
-            )
-        );
-        $this->diagram->setAuthor('phpMyAdmin ' . PMA_VERSION);
-        $this->diagram->setDate(date("j F Y, g:i a"));
-        $this->diagram->setOrientation($this->orientation);
-        $this->diagram->setFont('Verdana', '10');
-
-        $alltables = $this->getTablesFromRequest();
-
-        foreach ($alltables as $table) {
-            if (! isset($this->_tables[$table])) {
-                $this->_tables[$table] = new TableStatsEps(
-                    $this->diagram, $this->db,
-                    $table, $this->diagram->getFont(),
-                    $this->diagram->getFontSize(), $this->pageNumber,
-                    $this->_tablewidth, $this->showKeys,
-                    $this->tableDimension, $this->offline
-                );
-            }
-
-            if ($this->sameWide) {
-                $this->_tables[$table]->width = $this->_tablewidth;
-            }
-        }
-
-        $seen_a_relation = false;
-        foreach ($alltables as $one_table) {
-            $exist_rel = PMA_getForeigners($this->db, $one_table, '', 'both');
-            if (!$exist_rel) {
-                continue;
-            }
-
-            $seen_a_relation = true;
-            foreach ($exist_rel as $master_field => $rel) {
-                /* put the foreign table on the schema only if selected
-                * by the user
-                * (do not use array_search() because we would have to
-                * to do a === false and this is not PHP3 compatible)
-                */
-                if ($master_field != 'foreign_keys_data') {
-                    if (in_array($rel['foreign_table'], $alltables)) {
-                        $this->_addRelation(
-                            $one_table, $this->diagram->getFont(), $this->diagram->getFontSize(),
-                            $master_field, $rel['foreign_table'],
-                            $rel['foreign_field'], $this->tableDimension
-                        );
-                    }
-                    continue;
-                }
-
-                foreach ($rel as $one_key) {
-                    if (!in_array($one_key['ref_table_name'], $alltables)) {
-                        continue;
-                    }
-
-                    foreach ($one_key['index_list']
-                        as $index => $one_field
-                    ) {
-                        $this->_addRelation(
-                            $one_table, $this->diagram->getFont(),
-                            $this->diagram->getFontSize(),
-                            $one_field, $one_key['ref_table_name'],
-                            $one_key['ref_index_list'][$index],
-                            $this->tableDimension
-                        );
-                    }
-                }
-            }
-        }
-        if ($seen_a_relation) {
-            $this->_drawRelations();
-        }
-
-        $this->_drawTables();
-        $this->diagram->endEpsDoc();
-    }
-
-    /**
-     * Output Eps Document for download
-     *
-     * @return void
-     */
-    public function showOutput()
-    {
-        $this->diagram->showOutput($this->getFileName('.eps'));
-    }
-
-    /**
-     * Defines relation objects
-     *
-     * @param string  $masterTable    The master table name
-     * @param string  $font           The font
-     * @param int     $fontSize       The font size
-     * @param string  $masterField    The relation field in the master table
-     * @param string  $foreignTable   The foreign table name
-     * @param string  $foreignField   The relation field in the foreign table
-     * @param boolean $tableDimension Whether to display table position or not
-     *
-     * @return void
-     *
-     * @see _setMinMax,Table_Stats_Eps::__construct(),
-     * PMA\libraries\plugins\schema\eps\RelationStatsEps::__construct()
-     */
-    private function _addRelation(
-        $masterTable, $font, $fontSize, $masterField,
-        $foreignTable, $foreignField, $tableDimension
-    ) {
-        if (! isset($this->_tables[$masterTable])) {
-            $this->_tables[$masterTable] = new TableStatsEps(
-                $this->diagram, $this->db, $masterTable, $font, $fontSize,
-                $this->pageNumber, $this->_tablewidth, false, $tableDimension
-            );
-        }
-        if (! isset($this->_tables[$foreignTable])) {
-            $this->_tables[$foreignTable] = new TableStatsEps(
-                $this->diagram, $this->db, $foreignTable, $font, $fontSize,
-                $this->pageNumber, $this->_tablewidth, false, $tableDimension
-            );
-        }
-        $this->_relations[] = new RelationStatsEps(
-            $this->diagram,
-            $this->_tables[$masterTable],
-            $masterField,
-            $this->_tables[$foreignTable],
-            $foreignField
-        );
-    }
-
-    /**
-     * Draws relation arrows and lines connects master table's master field to
-     * foreign table's foreign field
-     *
-     * @return void
-     *
-     * @see Relation_Stats_Eps::relationDraw()
-     */
-    private function _drawRelations()
-    {
-        foreach ($this->_relations as $relation) {
-            $relation->relationDraw();
-        }
-    }
-
-    /**
-     * Draws tables
-     *
-     * @return void
-     *
-     * @see Table_Stats_Eps::Table_Stats_tableDraw()
-     */
-    private function _drawTables()
-    {
-        foreach ($this->_tables as $table) {
-            $table->tableDraw($this->showColor);
-        }
-    }
-}
diff --git a/#pma/libraries/plugins/schema/eps/RelationStatsEps.php b/#pma/libraries/plugins/schema/eps/RelationStatsEps.php
deleted file mode 100644
index 23824000..00000000
--- a/#pma/libraries/plugins/schema/eps/RelationStatsEps.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Contains PMA\libraries\plugins\schema\eps\RelationStatsEps class
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries\plugins\schema\eps;
-
-use PMA\libraries\plugins\schema\RelationStats;
-
-/**
- * Relation preferences/statistics
- *
- * This class fetches the table master and foreign fields positions
- * and helps in generating the Table references and then connects
- * master table's master field to foreign table's foreign key
- * in EPS document.
- *
- * @package PhpMyAdmin
- * @name    Relation_Stats_Eps
- * @see     PMA_EPS
- */
-class RelationStatsEps extends RelationStats
-{
-    /**
-     * The "PMA\libraries\plugins\schema\eps\RelationStatsEps" constructor
-     *
-     * @param object $diagram       The EPS diagram
-     * @param string $master_table  The master table name
-     * @param string $master_field  The relation field in the master table
-     * @param string $foreign_table The foreign table name
-     * @param string $foreign_field The relation field in the foreign table
-     */
-    public function __construct(
-        $diagram, $master_table, $master_field, $foreign_table, $foreign_field
-    ) {
-        $this->wTick = 10;
-        parent::__construct(
-            $diagram, $master_table, $master_field, $foreign_table, $foreign_field
-        );
-        $this->ySrc  += 10;
-        $this->yDest += 10;
-    }
-
-    /**
-     * draws relation links and arrows
-     * shows foreign key relations
-     *
-     * @see PMA_EPS
-     *
-     * @return void
-     */
-    public function relationDraw()
-    {
-        // draw a line like -- to foreign field
-        $this->diagram->line(
-            $this->xSrc,
-            $this->ySrc,
-            $this->xSrc + $this->srcDir * $this->wTick,
-            $this->ySrc,
-            1
-        );
-        // draw a line like -- to master field
-        $this->diagram->line(
-            $this->xDest + $this->destDir * $this->wTick,
-            $this->yDest,
-            $this->xDest,
-            $this->yDest,
-            1
-        );
-        // draw a line that connects to master field line and foreign field line
-        $this->diagram->line(
-            $this->xSrc + $this->srcDir * $this->wTick,
-            $this->ySrc,
-            $this->xDest + $this->destDir * $this->wTick,
-            $this->yDest,
-            1
-        );
-        $root2 = 2 * sqrt(2);
-        $this->diagram->line(
-            $this->xSrc + $this->srcDir * $this->wTick * 0.75,
-            $this->ySrc,
-            $this->xSrc + $this->srcDir * (0.75 - 1 / $root2) * $this->wTick,
-            $this->ySrc + $this->wTick / $root2,
-            1
-        );
-        $this->diagram->line(
-            $this->xSrc + $this->srcDir * $this->wTick * 0.75,
-            $this->ySrc,
-            $this->xSrc + $this->srcDir * (0.75 - 1 / $root2) * $this->wTick,
-            $this->ySrc - $this->wTick / $root2,
-            1
-        );
-        $this->diagram->line(
-            $this->xDest + $this->destDir * $this->wTick / 2,
-            $this->yDest,
-            $this->xDest + $this->destDir * (0.5 + 1 / $root2) * $this->wTick,
-            $this->yDest + $this->wTick / $root2,
-            1
-        );
-        $this->diagram->line(
-            $this->xDest + $this->destDir * $this->wTick / 2,
-            $this->yDest,
-            $this->xDest + $this->destDir * (0.5 + 1 / $root2) * $this->wTick,
-            $this->yDest - $this->wTick / $root2,
-            1
-        );
-    }
-}
diff --git a/#pma/libraries/plugins/schema/eps/TableStatsEps.php b/#pma/libraries/plugins/schema/eps/TableStatsEps.php
deleted file mode 100644
index c53cb883..00000000
--- a/#pma/libraries/plugins/schema/eps/TableStatsEps.php
+++ /dev/null
@@ -1,182 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Contains PMA\libraries\plugins\schema\eps\TableStatsEps class
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries\plugins\schema\eps;
-
-use PMA;
-use PMA\libraries\plugins\schema\ExportRelationSchema;
-use PMA\libraries\plugins\schema\TableStats;
-
-/**
- * Table preferences/statistics
- *
- * This class preserves the table co-ordinates,fields
- * and helps in drawing/generating the Tables in EPS.
- *
- * @package PhpMyAdmin
- * @name    Table_Stats_Eps
- * @see     PMA_EPS
- */
-class TableStatsEps extends TableStats
-{
-    /**
-     * Defines properties
-     */
-    public $height;
-    public $currentCell = 0;
-
-    /**
-     * The "PMA\libraries\plugins\schema\eps\TableStatsEps" constructor
-     *
-     * @param object  $diagram          The EPS diagram
-     * @param string  $db               The database name
-     * @param string  $tableName        The table name
-     * @param string  $font             The font  name
-     * @param integer $fontSize         The font size
-     * @param integer $pageNumber       Page number
-     * @param integer &$same_wide_width The max width among tables
-     * @param boolean $showKeys         Whether to display keys or not
-     * @param boolean $tableDimension   Whether to display table position or not
-     * @param boolean $offline          Whether the coordinates are sent
-     *                                  from the browser
-     *
-     * @see PMA_EPS, Table_Stats_Eps::Table_Stats_setWidth,
-     *      PMA\libraries\plugins\schema\eps\TableStatsEps::Table_Stats_setHeight
-     */
-    public function __construct(
-        $diagram,
-        $db,
-        $tableName,
-        $font,
-        $fontSize,
-        $pageNumber,
-        &$same_wide_width,
-        $showKeys = false,
-        $tableDimension = false,
-        $offline = false
-    ) {
-        parent::__construct(
-            $diagram,
-            $db,
-            $pageNumber,
-            $tableName,
-            $showKeys,
-            $tableDimension,
-            $offline
-        );
-
-        // height and width
-        $this->_setHeightTable($fontSize);
-        // setWidth must me after setHeight, because title
-        // can include table height which changes table width
-        $this->_setWidthTable($font, $fontSize);
-        if ($same_wide_width < $this->width) {
-            $same_wide_width = $this->width;
-        }
-    }
-
-    /**
-     * Displays an error when the table cannot be found.
-     *
-     * @return void
-     */
-    protected function showMissingTableError()
-    {
-        ExportRelationSchema::dieSchema(
-            $this->pageNumber,
-            "EPS",
-            sprintf(__('The %s table doesn\'t exist!'), $this->tableName)
-        );
-    }
-
-    /**
-     * Sets the width of the table
-     *
-     * @param string  $font     The font name
-     * @param integer $fontSize The font size
-     *
-     * @return void
-     *
-     * @see PMA_EPS
-     */
-    private function _setWidthTable($font, $fontSize)
-    {
-        foreach ($this->fields as $field) {
-            $this->width = max(
-                $this->width,
-                PMA\libraries\Font::getStringWidth($field, $font, $fontSize)
-            );
-        }
-        $this->width += PMA\libraries\Font::getStringWidth(
-            '      ',
-            $font,
-            $fontSize
-        );
-        /*
-         * it is unknown what value must be added, because
-        * table title is affected by the table width value
-        */
-        while ($this->width
-            < PMA\libraries\Font::getStringWidth(
-                $this->getTitle(),
-                $font,
-                $fontSize
-            )) {
-            $this->width += 7;
-        }
-    }
-
-    /**
-     * Sets the height of the table
-     *
-     * @param integer $fontSize The font size
-     *
-     * @return void
-     */
-    private function _setHeightTable($fontSize)
-    {
-        $this->heightCell = $fontSize + 4;
-        $this->height = (count($this->fields) + 1) * $this->heightCell;
-    }
-
-    /**
-     * Draw the table
-     *
-     * @param boolean $showColor Whether to display color
-     *
-     * @return void
-     *
-     * @see PMA_EPS,PMA_EPS::line,PMA_EPS::rect
-     */
-    public function tableDraw($showColor)
-    {
-        //echo $this->tableName.'<br />';
-        $this->diagram->rect(
-            $this->x,
-            $this->y + 12,
-            $this->width,
-            $this->heightCell,
-            1
-        );
-        $this->diagram->showXY($this->getTitle(), $this->x + 5, $this->y + 14);
-        foreach ($this->fields as $field) {
-            $this->currentCell += $this->heightCell;
-            $this->diagram->rect(
-                $this->x,
-                $this->y + 12 + $this->currentCell,
-                $this->width,
-                $this->heightCell,
-                1
-            );
-            $this->diagram->showXY(
-                $field,
-                $this->x + 5,
-                $this->y + 14 + $this->currentCell
-            );
-        }
-    }
-}
diff --git a/#pma/libraries/plugins/schema/pdf/Pdf.php b/#pma/libraries/plugins/schema/pdf/Pdf.php
deleted file mode 100644
index 19a35626..00000000
--- a/#pma/libraries/plugins/schema/pdf/Pdf.php
+++ /dev/null
@@ -1,396 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * PDF schema handling
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries\plugins\schema\pdf;
-
-use PMA\libraries\PDF as PDF_lib;
-use PMA\libraries\Util;
-
-/**
- * Skip the plugin if TCPDF is not available.
- */
-if (! file_exists(TCPDF_INC)) {
-    $GLOBALS['skip_import'] = true;
-    return;
-}
-
-/**
- * block attempts to directly run this script
- */
-if (getcwd() == dirname(__FILE__)) {
-    die('Attack stopped');
-}
-
-require_once 'libraries/transformations.lib.php';
-
-/**
- * Extends the "TCPDF" class and helps
- * in developing the structure of PDF Schema Export
- *
- * @access  public
- * @package PhpMyAdmin
- * @see     TCPDF
- */
-class Pdf extends PDF_lib
-{
-    /**
-     * Defines properties
-     */
-    var $_xMin;
-    var $_yMin;
-    var $leftMargin = 10;
-    var $topMargin = 10;
-    var $scale;
-    var $PMA_links;
-    var $Outlines = array();
-    var $def_outlines;
-    var $widths;
-    private $_ff = PDF_lib::PMA_PDF_FONT;
-    private $_offline;
-    private $_pageNumber;
-    private $_withDoc;
-    private $_db;
-
-    /**
-     * Constructs PDF for schema export.
-     *
-     * @param string  $orientation page orientation
-     * @param string  $unit        unit
-     * @param string  $paper       the format used for pages
-     * @param int     $pageNumber  schema page number that is being exported
-     * @param boolean $withDoc     with document dictionary
-     * @param string  $db          the database name
-     *
-     * @access public
-     */
-    public function __construct(
-        $orientation, $unit, $paper, $pageNumber, $withDoc, $db
-    ) {
-        parent::__construct($orientation, $unit, $paper);
-        $this->_pageNumber = $pageNumber;
-        $this->_withDoc = $withDoc;
-        $this->_db = $db;
-    }
-
-    /**
-     * Sets the value for margins
-     *
-     * @param float $c_margin margin
-     *
-     * @return void
-     */
-    public function setCMargin($c_margin)
-    {
-        $this->cMargin = $c_margin;
-    }
-
-    /**
-     * Sets the scaling factor, defines minimum coordinates and margins
-     *
-     * @param float|int $scale      The scaling factor
-     * @param float|int $xMin       The minimum X coordinate
-     * @param float|int $yMin       The minimum Y coordinate
-     * @param float|int $leftMargin The left margin
-     * @param float|int $topMargin  The top margin
-     *
-     * @return void
-     */
-    public function setScale($scale = 1, $xMin = 0, $yMin = 0,
-        $leftMargin = -1, $topMargin = -1
-    ) {
-        $this->scale = $scale;
-        $this->_xMin = $xMin;
-        $this->_yMin = $yMin;
-        if ($this->leftMargin != -1) {
-            $this->leftMargin = $leftMargin;
-        }
-        if ($this->topMargin != -1) {
-            $this->topMargin = $topMargin;
-        }
-    }
-
-    /**
-     * Outputs a scaled cell
-     *
-     * @param float|int $w      The cell width
-     * @param float|int $h      The cell height
-     * @param string    $txt    The text to output
-     * @param mixed     $border Whether to add borders or not
-     * @param integer   $ln     Where to put the cursor once the output is done
-     * @param string    $align  Align mode
-     * @param integer   $fill   Whether to fill the cell with a color or not
-     * @param string    $link   Link
-     *
-     * @return void
-     *
-     * @see TCPDF::Cell()
-     */
-    public function cellScale($w, $h = 0, $txt = '', $border = 0, $ln = 0,
-        $align = '', $fill = 0, $link = ''
-    ) {
-        $h = $h / $this->scale;
-        $w = $w / $this->scale;
-        $this->Cell($w, $h, $txt, $border, $ln, $align, $fill, $link);
-    }
-
-    /**
-     * Draws a scaled line
-     *
-     * @param float $x1 The horizontal position of the starting point
-     * @param float $y1 The vertical position of the starting point
-     * @param float $x2 The horizontal position of the ending point
-     * @param float $y2 The vertical position of the ending point
-     *
-     * @return void
-     *
-     * @see TCPDF::Line()
-     */
-    public function lineScale($x1, $y1, $x2, $y2)
-    {
-        $x1 = ($x1 - $this->_xMin) / $this->scale + $this->leftMargin;
-        $y1 = ($y1 - $this->_yMin) / $this->scale + $this->topMargin;
-        $x2 = ($x2 - $this->_xMin) / $this->scale + $this->leftMargin;
-        $y2 = ($y2 - $this->_yMin) / $this->scale + $this->topMargin;
-        $this->Line($x1, $y1, $x2, $y2);
-    }
-
-    /**
-     * Sets x and y scaled positions
-     *
-     * @param float $x The x position
-     * @param float $y The y position
-     *
-     * @return void
-     *
-     * @see TCPDF::SetXY()
-     */
-    public function setXyScale($x, $y)
-    {
-        $x = ($x - $this->_xMin) / $this->scale + $this->leftMargin;
-        $y = ($y - $this->_yMin) / $this->scale + $this->topMargin;
-        $this->SetXY($x, $y);
-    }
-
-    /**
-     * Sets the X scaled positions
-     *
-     * @param float $x The x position
-     *
-     * @return void
-     *
-     * @see TCPDF::SetX()
-     */
-    public function setXScale($x)
-    {
-        $x = ($x - $this->_xMin) / $this->scale + $this->leftMargin;
-        $this->SetX($x);
-    }
-
-    /**
-     * Sets the scaled font size
-     *
-     * @param float $size The font size (in points)
-     *
-     * @return void
-     *
-     * @see TCPDF::SetFontSize()
-     */
-    public function setFontSizeScale($size)
-    {
-        // Set font size in points
-        $size = $size / $this->scale;
-        $this->SetFontSize($size);
-    }
-
-    /**
-     * Sets the scaled line width
-     *
-     * @param float $width The line width
-     *
-     * @return void
-     *
-     * @see TCPDF::SetLineWidth()
-     */
-    public function setLineWidthScale($width)
-    {
-        $width = $width / $this->scale;
-        $this->SetLineWidth($width);
-    }
-
-    /**
-     * This method is used to render the page header.
-     *
-     * @return void
-     *
-     * @see TCPDF::Header()
-     */
-    public function Header()
-    {
-        // We only show this if we find something in the new pdf_pages table
-
-        // This function must be named "Header" to work with the TCPDF library
-        if ($this->_withDoc) {
-            if ($this->_offline || $this->_pageNumber == -1) {
-                $pg_name = __("PDF export page");
-            } else {
-                $test_query = 'SELECT * FROM '
-                    . Util::backquote($GLOBALS['cfgRelation']['db']) . '.'
-                    . Util::backquote($GLOBALS['cfgRelation']['pdf_pages'])
-                    . ' WHERE db_name = \'' . $GLOBALS['dbi']->escapeString($this->_db)
-                    . '\' AND page_nr = \'' . $this->_pageNumber . '\'';
-                $test_rs = PMA_queryAsControlUser($test_query);
-                $pages = @$GLOBALS['dbi']->fetchAssoc($test_rs);
-                $pg_name = ucfirst($pages['page_descr']);
-            }
-
-            $this->SetFont($this->_ff, 'B', 14);
-            $this->Cell(0, 6, $pg_name, 'B', 1, 'C');
-            $this->SetFont($this->_ff, '');
-            $this->Ln();
-        }
-    }
-
-    /**
-     * This function must be named "Footer" to work with the TCPDF library
-     *
-     * @return void
-     *
-     * @see PDF::Footer()
-     */
-    public function Footer()
-    {
-        if ($this->_withDoc) {
-            parent::Footer();
-        }
-    }
-
-    /**
-     * Sets widths
-     *
-     * @param array $w array of widths
-     *
-     * @return void
-     */
-    public function SetWidths($w)
-    {
-        // column widths
-        $this->widths = $w;
-    }
-
-    /**
-     * Generates table row.
-     *
-     * @param array $data  Data for table
-     * @param array $links Links for table cells
-     *
-     * @return void
-     */
-    public function Row($data, $links)
-    {
-        // line height
-        $nb = 0;
-        $data_cnt = count($data);
-        for ($i = 0;$i < $data_cnt;$i++) {
-            $nb = max($nb, $this->NbLines($this->widths[$i], $data[$i]));
-        }
-        $il = $this->FontSize;
-        $h = ($il + 1) * $nb;
-        // page break if necessary
-        $this->CheckPageBreak($h);
-        // draw the cells
-        $data_cnt = count($data);
-        for ($i = 0;$i < $data_cnt;$i++) {
-            $w = $this->widths[$i];
-            // save current position
-            $x = $this->GetX();
-            $y = $this->GetY();
-            // draw the border
-            $this->Rect($x, $y, $w, $h);
-            if (isset($links[$i])) {
-                $this->Link($x, $y, $w, $h, $links[$i]);
-            }
-            // print text
-            $this->MultiCell($w, $il + 1, $data[$i], 0, 'L');
-            // go to right side
-            $this->SetXY($x + $w, $y);
-        }
-        // go to line
-        $this->Ln($h);
-    }
-
-    /**
-     * Compute number of lines used by a multicell of width w
-     *
-     * @param int    $w   width
-     * @param string $txt text
-     *
-     * @return int
-     */
-    public function NbLines($w, $txt)
-    {
-        $cw = &$this->CurrentFont['cw'];
-        if ($w == 0) {
-            $w = $this->w - $this->rMargin - $this->x;
-        }
-        $wmax = ($w-2 * $this->cMargin) * 1000 / $this->FontSize;
-        $s = str_replace("\r", '', $txt);
-        $nb = mb_strlen($s);
-        if ($nb > 0 && $s[$nb-1] == "\n") {
-            $nb--;
-        }
-        $sep = -1;
-        $i = 0;
-        $j = 0;
-        $l = 0;
-        $nl = 1;
-        while ($i < $nb) {
-            $c = $s[$i];
-            if ($c == "\n") {
-                $i++;
-                $sep = -1;
-                $j = $i;
-                $l = 0;
-                $nl++;
-                continue;
-            }
-            if ($c == ' ') {
-                $sep = $i;
-            }
-            $l += isset($cw[mb_ord($c)])?$cw[mb_ord($c)]:0 ;
-            if ($l > $wmax) {
-                if ($sep == -1) {
-                    if ($i == $j) {
-                        $i++;
-                    }
-                } else {
-                    $i = $sep + 1;
-                }
-                $sep = -1;
-                $j = $i;
-                $l = 0;
-                $nl++;
-            } else {
-                $i++;
-            }
-        }
-        return $nl;
-    }
-
-    /**
-     * Set whether the document is generated from client side DB
-     *
-     * @param string $value whether offline
-     *
-     * @return void
-     *
-     * @access private
-     */
-    public function setOffline($value)
-    {
-        $this->_offline = $value;
-    }
-}
diff --git a/#pma/libraries/plugins/schema/pdf/PdfRelationSchema.php b/#pma/libraries/plugins/schema/pdf/PdfRelationSchema.php
deleted file mode 100644
index 809da775..00000000
--- a/#pma/libraries/plugins/schema/pdf/PdfRelationSchema.php
+++ /dev/null
@@ -1,732 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * PDF schema handling
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries\plugins\schema\pdf;
-
-use PMA\libraries\plugins\schema\ExportRelationSchema;
-use PMA\libraries\Util;
-use PMA\libraries\PDF as PDF_lib;
-
-/**
- * Skip the plugin if TCPDF is not available.
- */
-if (! @file_exists(TCPDF_INC)) {
-    $GLOBALS['skip_import'] = true;
-    return;
-}
-
-/**
- * block attempts to directly run this script
- */
-if (getcwd() == dirname(__FILE__)) {
-    die('Attack stopped');
-}
-
-require_once 'libraries/transformations.lib.php';
-
-/**
- * Pdf Relation Schema Class
- *
- * Purpose of this class is to generate the PDF Document. PDF is widely
- * used format for documenting text,fonts,images and 3d vector graphics.
- *
- * This class inherits ExportRelationSchema class has common functionality added
- * to this class
- *
- * @name Pdf_Relation_Schema
- * @package PhpMyAdmin
- */
-class PdfRelationSchema extends ExportRelationSchema
-{
-    /**
-     * Defines properties
-     */
-    private $_showGrid;
-    private $_withDoc;
-    private $_tableOrder;
-
-    /**
-     * @var TableStatsPdf[]
-     */
-    private $_tables = array();
-    private $_ff = PDF_lib::PMA_PDF_FONT;
-    private $_xMax = 0;
-    private $_yMax = 0;
-    private $_scale;
-    private $_xMin = 100000;
-    private $_yMin = 100000;
-    private $_topMargin = 10;
-    private $_bottomMargin = 10;
-    private $_leftMargin = 10;
-    private $_rightMargin = 10;
-    private $_tablewidth;
-
-    /**
-     * @var RelationStatsPdf[]
-     */
-    protected $relations = array();
-
-    /**
-     * The "PdfRelationSchema" constructor
-     *
-     * @param string $db database name
-     *
-     * @see PMA_Schema_PDF
-     */
-    public function __construct($db)
-    {
-        $this->setShowGrid(isset($_REQUEST['pdf_show_grid']));
-        $this->setShowColor(isset($_REQUEST['pdf_show_color']));
-        $this->setShowKeys(isset($_REQUEST['pdf_show_keys']));
-        $this->setTableDimension(isset($_REQUEST['pdf_show_table_dimension']));
-        $this->setAllTablesSameWidth(isset($_REQUEST['pdf_all_tables_same_width']));
-        $this->setWithDataDictionary(isset($_REQUEST['pdf_with_doc']));
-        $this->setTableOrder($_REQUEST['pdf_table_order']);
-        $this->setOrientation($_REQUEST['pdf_orientation']);
-        $this->setPaper($_REQUEST['pdf_paper']);
-
-        // Initializes a new document
-        parent::__construct(
-            $db,
-            new Pdf(
-                $this->orientation, 'mm', $this->paper,
-                $this->pageNumber, $this->_withDoc, $db
-            )
-        );
-        $this->diagram->SetTitle(
-            sprintf(
-                __('Schema of the %s database'),
-                $this->db
-            )
-        );
-        $this->diagram->setCMargin(0);
-        $this->diagram->Open();
-        $this->diagram->SetAutoPageBreak('auto');
-        $this->diagram->setOffline($this->offline);
-
-        $alltables = $this->getTablesFromRequest();
-        if ($this->getTableOrder() == 'name_asc') {
-            sort($alltables);
-        } else if ($this->getTableOrder() == 'name_desc') {
-            rsort($alltables);
-        }
-
-        if ($this->_withDoc) {
-            $this->diagram->SetAutoPageBreak('auto', 15);
-            $this->diagram->setCMargin(1);
-            $this->dataDictionaryDoc($alltables);
-            $this->diagram->SetAutoPageBreak('auto');
-            $this->diagram->setCMargin(0);
-        }
-
-        $this->diagram->Addpage();
-
-        if ($this->_withDoc) {
-            $this->diagram->SetLink($this->diagram->PMA_links['RT']['-'], -1);
-            $this->diagram->Bookmark(__('Relational schema'));
-            $this->diagram->SetAlias('{00}', $this->diagram->PageNo());
-            $this->_topMargin = 28;
-            $this->_bottomMargin = 28;
-        }
-
-        /* snip */
-        foreach ($alltables as $table) {
-            if (! isset($this->_tables[$table])) {
-                $this->_tables[$table] = new TableStatsPdf(
-                    $this->diagram,
-                    $this->db,
-                    $table,
-                    null,
-                    $this->pageNumber,
-                    $this->_tablewidth,
-                    $this->showKeys,
-                    $this->tableDimension,
-                    $this->offline
-                );
-            }
-            if ($this->sameWide) {
-                $this->_tables[$table]->width = $this->_tablewidth;
-            }
-            $this->_setMinMax($this->_tables[$table]);
-        }
-
-        // Defines the scale factor
-        $innerWidth = $this->diagram->getPageWidth() - $this->_rightMargin
-            - $this->_leftMargin;
-        $innerHeight = $this->diagram->getPageHeight() - $this->_topMargin
-            - $this->_bottomMargin;
-        $this->_scale = ceil(
-            max(
-                ($this->_xMax - $this->_xMin) / $innerWidth,
-                ($this->_yMax - $this->_yMin) / $innerHeight
-            ) * 100
-        ) / 100;
-
-        $this->diagram->setScale(
-            $this->_scale,
-            $this->_xMin,
-            $this->_yMin,
-            $this->_leftMargin,
-            $this->_topMargin
-        );
-        // Builds and save the PDF document
-        $this->diagram->setLineWidthScale(0.1);
-
-        if ($this->_showGrid) {
-            $this->diagram->SetFontSize(10);
-            $this->_strokeGrid();
-        }
-        $this->diagram->setFontSizeScale(14);
-        // previous logic was checking master tables and foreign tables
-        // but I think that looping on every table of the pdf page as a master
-        // and finding its foreigns is OK (then we can support innodb)
-        $seen_a_relation = false;
-        foreach ($alltables as $one_table) {
-            $exist_rel = PMA_getForeigners($this->db, $one_table, '', 'both');
-            if (!$exist_rel) {
-                continue;
-            }
-
-            $seen_a_relation = true;
-            foreach ($exist_rel as $master_field => $rel) {
-                // put the foreign table on the schema only if selected
-                // by the user
-                // (do not use array_search() because we would have to
-                // to do a === false and this is not PHP3 compatible)
-                if ($master_field != 'foreign_keys_data') {
-                    if (in_array($rel['foreign_table'], $alltables)) {
-                        $this->_addRelation(
-                            $one_table,
-                            $master_field,
-                            $rel['foreign_table'],
-                            $rel['foreign_field']
-                        );
-                    }
-                    continue;
-                }
-
-                foreach ($rel as $one_key) {
-                    if (!in_array($one_key['ref_table_name'], $alltables)) {
-                        continue;
-                    }
-
-                    foreach ($one_key['index_list']
-                        as $index => $one_field
-                    ) {
-                        $this->_addRelation(
-                            $one_table,
-                            $one_field,
-                            $one_key['ref_table_name'],
-                            $one_key['ref_index_list'][$index]
-                        );
-                    }
-                }
-            } // end while
-        } // end while
-
-        if ($seen_a_relation) {
-            $this->_drawRelations();
-        }
-        $this->_drawTables();
-    }
-
-    /**
-     * Set Show Grid
-     *
-     * @param boolean $value show grid of the document or not
-     *
-     * @return void
-     */
-    public function setShowGrid($value)
-    {
-        $this->_showGrid = $value;
-    }
-
-    /**
-     * Returns whether to show grid
-     *
-     * @return boolean whether to show grid
-     */
-    public function isShowGrid()
-    {
-        return $this->_showGrid;
-    }
-
-    /**
-     * Set Data Dictionary
-     *
-     * @param boolean $value show selected database data dictionary or not
-     *
-     * @return void
-     */
-    public function setWithDataDictionary($value)
-    {
-        $this->_withDoc = $value;
-    }
-
-    /**
-     * Return whether to show selected database data dictionary or not
-     *
-     * @return boolean whether to show selected database data dictionary or not
-     */
-    public function isWithDataDictionary()
-    {
-        return $this->_withDoc;
-    }
-
-    /**
-     * Sets the order of the table in data dictionary
-     *
-     * @param string $value table order
-     *
-     * @return void
-     */
-    public function setTableOrder($value)
-    {
-        $this->_tableOrder = $value;
-    }
-
-    /**
-     * Returns the order of the table in data dictionary
-     *
-     * @return string table order
-     */
-    public function getTableOrder()
-    {
-        return $this->_tableOrder;
-    }
-
-    /**
-     * Output Pdf Document for download
-     *
-     * @return void
-     */
-    public function showOutput()
-    {
-        $this->diagram->Download($this->getFileName('.pdf'));
-    }
-
-    /**
-     * Sets X and Y minimum and maximum for a table cell
-     *
-     * @param TableStatsPdf $table The table name of which sets XY co-ordinates
-     *
-     * @return void
-     */
-    private function _setMinMax($table)
-    {
-        $this->_xMax = max($this->_xMax, $table->x + $table->width);
-        $this->_yMax = max($this->_yMax, $table->y + $table->height);
-        $this->_xMin = min($this->_xMin, $table->x);
-        $this->_yMin = min($this->_yMin, $table->y);
-    }
-
-    /**
-     * Defines relation objects
-     *
-     * @param string $masterTable  The master table name
-     * @param string $masterField  The relation field in the master table
-     * @param string $foreignTable The foreign table name
-     * @param string $foreignField The relation field in the foreign table
-     *
-     * @return void
-     *
-     * @see _setMinMax
-     */
-    private function _addRelation($masterTable, $masterField, $foreignTable,
-        $foreignField
-    ) {
-        if (! isset($this->_tables[$masterTable])) {
-            $this->_tables[$masterTable] = new TableStatsPdf(
-                $this->diagram,
-                $this->db,
-                $masterTable,
-                null,
-                $this->pageNumber,
-                $this->_tablewidth,
-                $this->showKeys,
-                $this->tableDimension
-            );
-            $this->_setMinMax($this->_tables[$masterTable]);
-        }
-        if (! isset($this->_tables[$foreignTable])) {
-            $this->_tables[$foreignTable] = new TableStatsPdf(
-                $this->diagram,
-                $this->db,
-                $foreignTable,
-                null,
-                $this->pageNumber,
-                $this->_tablewidth,
-                $this->showKeys,
-                $this->tableDimension
-            );
-            $this->_setMinMax($this->_tables[$foreignTable]);
-        }
-        $this->relations[] = new RelationStatsPdf(
-            $this->diagram,
-            $this->_tables[$masterTable],
-            $masterField,
-            $this->_tables[$foreignTable],
-            $foreignField
-        );
-    }
-
-    /**
-     * Draws the grid
-     *
-     * @return void
-     *
-     * @see PMA_Schema_PDF
-     */
-    private function _strokeGrid()
-    {
-        $gridSize = 10;
-        $labelHeight = 4;
-        $labelWidth = 5;
-        if ($this->_withDoc) {
-            $topSpace = 6;
-            $bottomSpace = 15;
-        } else {
-            $topSpace = 0;
-            $bottomSpace = 0;
-        }
-
-        $this->diagram->SetMargins(0, 0);
-        $this->diagram->SetDrawColor(200, 200, 200);
-        // Draws horizontal lines
-        $innerHeight = $this->diagram->getPageHeight() - $topSpace - $bottomSpace;
-        for ($l = 0,
-            $size = intval($innerHeight / $gridSize);
-            $l <= $size;
-            $l++
-        ) {
-            $this->diagram->line(
-                0, $l * $gridSize + $topSpace,
-                $this->diagram->getPageWidth(), $l * $gridSize + $topSpace
-            );
-            // Avoid duplicates
-            if ($l > 0
-                && $l <= intval(($innerHeight - $labelHeight) / $gridSize)
-            ) {
-                $this->diagram->SetXY(0, $l * $gridSize + $topSpace);
-                $label = (string) sprintf(
-                    '%.0f',
-                    ($l * $gridSize + $topSpace - $this->_topMargin)
-                    * $this->_scale + $this->_yMin
-                );
-                $this->diagram->Cell($labelWidth, $labelHeight, ' ' . $label);
-            } // end if
-        } // end for
-        // Draws vertical lines
-        for (
-            $j = 0, $size = intval($this->diagram->getPageWidth() / $gridSize);
-            $j <= $size;
-            $j++
-        ) {
-            $this->diagram->line(
-                $j * $gridSize,
-                $topSpace,
-                $j * $gridSize,
-                $this->diagram->getPageHeight() - $bottomSpace
-            );
-            $this->diagram->SetXY($j * $gridSize, $topSpace);
-            $label = (string) sprintf(
-                '%.0f',
-                ($j * $gridSize - $this->_leftMargin) * $this->_scale + $this->_xMin
-            );
-            $this->diagram->Cell($labelWidth, $labelHeight, $label);
-        }
-    }
-
-    /**
-     * Draws relation arrows
-     *
-     * @return void
-     *
-     * @see Relation_Stats_Pdf::relationdraw()
-     */
-    private function _drawRelations()
-    {
-        $i = 0;
-        foreach ($this->relations as $relation) {
-            $relation->relationDraw($this->showColor, $i);
-            $i++;
-        }
-    }
-
-    /**
-     * Draws tables
-     *
-     * @return void
-     *
-     * @see Table_Stats_Pdf::tableDraw()
-     */
-    private function _drawTables()
-    {
-        foreach ($this->_tables as $table) {
-            $table->tableDraw(null, $this->_withDoc, $this->showColor);
-        }
-    }
-
-    /**
-     * Generates data dictionary pages.
-     *
-     * @param array $alltables Tables to document.
-     *
-     * @return void
-     */
-    public function dataDictionaryDoc($alltables)
-    {
-         // TOC
-        $this->diagram->addpage($this->orientation);
-        $this->diagram->Cell(0, 9, __('Table of contents'), 1, 0, 'C');
-        $this->diagram->Ln(15);
-        $i = 1;
-        foreach ($alltables as $table) {
-            $this->diagram->PMA_links['doc'][$table]['-']
-                = $this->diagram->AddLink();
-            $this->diagram->SetX(10);
-            // $this->diagram->Ln(1);
-            $this->diagram->Cell(
-                0, 6, __('Page number:') . ' {' . sprintf("%02d", $i) . '}', 0, 0,
-                'R', 0, $this->diagram->PMA_links['doc'][$table]['-']
-            );
-            $this->diagram->SetX(10);
-            $this->diagram->Cell(
-                0, 6, $i . ' ' . $table, 0, 1,
-                'L', 0, $this->diagram->PMA_links['doc'][$table]['-']
-            );
-            // $this->diagram->Ln(1);
-            $fields = $GLOBALS['dbi']->getColumns($this->db, $table);
-            foreach ($fields as $row) {
-                $this->diagram->SetX(20);
-                $field_name = $row['Field'];
-                $this->diagram->PMA_links['doc'][$table][$field_name]
-                    = $this->diagram->AddLink();
-                //$this->diagram->Cell(
-                //    0, 6, $field_name, 0, 1,
-                //    'L', 0, $this->diagram->PMA_links['doc'][$table][$field_name]
-                //);
-            }
-            $i++;
-        }
-        $this->diagram->PMA_links['RT']['-'] = $this->diagram->AddLink();
-        $this->diagram->SetX(10);
-        $this->diagram->Cell(
-            0, 6, __('Page number:') . ' {00}', 0, 0,
-            'R', 0, $this->diagram->PMA_links['RT']['-']
-        );
-        $this->diagram->SetX(10);
-        $this->diagram->Cell(
-            0, 6, $i . ' ' . __('Relational schema'), 0, 1,
-            'L', 0, $this->diagram->PMA_links['RT']['-']
-        );
-        $z = 0;
-        foreach ($alltables as $table) {
-            $z++;
-            $this->diagram->SetAutoPageBreak(true, 15);
-            $this->diagram->addpage($this->orientation);
-            $this->diagram->Bookmark($table);
-            $this->diagram->SetAlias(
-                '{' . sprintf("%02d", $z) . '}', $this->diagram->PageNo()
-            );
-            $this->diagram->PMA_links['RT'][$table]['-']
-                = $this->diagram->AddLink();
-            $this->diagram->SetLink(
-                $this->diagram->PMA_links['doc'][$table]['-'], -1
-            );
-            $this->diagram->SetFont($this->_ff, 'B', 18);
-            $this->diagram->Cell(
-                0, 8, $z . ' ' . $table, 1, 1,
-                'C', 0, $this->diagram->PMA_links['RT'][$table]['-']
-            );
-            $this->diagram->SetFont($this->_ff, '', 8);
-            $this->diagram->ln();
-
-            $cfgRelation = PMA_getRelationsParam();
-            $comments = PMA_getComments($this->db, $table);
-            if ($cfgRelation['mimework']) {
-                $mime_map = PMA_getMIME($this->db, $table, true);
-            }
-
-            /**
-             * Gets table information
-             */
-            $showtable = $GLOBALS['dbi']->getTable($this->db, $table)
-                ->getStatusInfo();
-            $show_comment = isset($showtable['Comment'])
-                ? $showtable['Comment']
-                : '';
-            $create_time  = isset($showtable['Create_time'])
-                ? Util::localisedDate(
-                    strtotime($showtable['Create_time'])
-                )
-                : '';
-            $update_time  = isset($showtable['Update_time'])
-                ? Util::localisedDate(
-                    strtotime($showtable['Update_time'])
-                )
-                : '';
-            $check_time   = isset($showtable['Check_time'])
-                ? Util::localisedDate(
-                    strtotime($showtable['Check_time'])
-                )
-                : '';
-
-            /**
-             * Gets fields properties
-             */
-            $columns = $GLOBALS['dbi']->getColumns($this->db, $table);
-
-            // Find which tables are related with the current one and write it in
-            // an array
-            $res_rel = PMA_getForeigners($this->db, $table);
-
-            /**
-             * Displays the comments of the table if MySQL >= 3.23
-             */
-
-            $break = false;
-            if (! empty($show_comment)) {
-                $this->diagram->Cell(
-                    0, 3, __('Table comments:') . ' ' . $show_comment, 0, 1
-                );
-                $break = true;
-            }
-
-            if (! empty($create_time)) {
-                $this->diagram->Cell(
-                    0, 3, __('Creation:') . ' ' . $create_time, 0, 1
-                );
-                $break = true;
-            }
-
-            if (! empty($update_time)) {
-                $this->diagram->Cell(
-                    0, 3, __('Last update:') . ' ' . $update_time, 0, 1
-                );
-                $break = true;
-            }
-
-            if (! empty($check_time)) {
-                $this->diagram->Cell(
-                    0, 3, __('Last check:') . ' ' . $check_time, 0, 1
-                );
-                $break = true;
-            }
-
-            if ($break == true) {
-                $this->diagram->Cell(0, 3, '', 0, 1);
-                $this->diagram->Ln();
-            }
-
-            $this->diagram->SetFont($this->_ff, 'B');
-            if (isset($this->orientation) && $this->orientation == 'L') {
-                $this->diagram->Cell(25, 8, __('Column'), 1, 0, 'C');
-                $this->diagram->Cell(20, 8, __('Type'), 1, 0, 'C');
-                $this->diagram->Cell(20, 8, __('Attributes'), 1, 0, 'C');
-                $this->diagram->Cell(10, 8, __('Null'), 1, 0, 'C');
-                $this->diagram->Cell(20, 8, __('Default'), 1, 0, 'C');
-                $this->diagram->Cell(25, 8, __('Extra'), 1, 0, 'C');
-                $this->diagram->Cell(45, 8, __('Links to'), 1, 0, 'C');
-
-                if ($this->paper == 'A4') {
-                    $comments_width = 67;
-                } else {
-                    // this is really intended for 'letter'
-                    /**
-                     * @todo find optimal width for all formats
-                     */
-                    $comments_width = 50;
-                }
-                $this->diagram->Cell($comments_width, 8, __('Comments'), 1, 0, 'C');
-                $this->diagram->Cell(45, 8, 'MIME', 1, 1, 'C');
-                $this->diagram->SetWidths(
-                    array(25, 20, 20, 10, 20, 25, 45, $comments_width, 45)
-                );
-            } else {
-                $this->diagram->Cell(20, 8, __('Column'), 1, 0, 'C');
-                $this->diagram->Cell(20, 8, __('Type'), 1, 0, 'C');
-                $this->diagram->Cell(20, 8, __('Attributes'), 1, 0, 'C');
-                $this->diagram->Cell(10, 8, __('Null'), 1, 0, 'C');
-                $this->diagram->Cell(15, 8, __('Default'), 1, 0, 'C');
-                $this->diagram->Cell(15, 8, __('Extra'), 1, 0, 'C');
-                $this->diagram->Cell(30, 8, __('Links to'), 1, 0, 'C');
-                $this->diagram->Cell(30, 8, __('Comments'), 1, 0, 'C');
-                $this->diagram->Cell(30, 8, 'MIME', 1, 1, 'C');
-                $this->diagram->SetWidths(array(20, 20, 20, 10, 15, 15, 30, 30, 30));
-            }
-            $this->diagram->SetFont($this->_ff, '');
-
-            foreach ($columns as $row) {
-                $extracted_columnspec
-                    = Util::extractColumnSpec($row['Type']);
-                $type                = $extracted_columnspec['print_type'];
-                $attribute           = $extracted_columnspec['attribute'];
-                if (! isset($row['Default'])) {
-                    if ($row['Null'] != '' && $row['Null'] != 'NO') {
-                        $row['Default'] = 'NULL';
-                    }
-                }
-                $field_name = $row['Field'];
-                // $this->diagram->Ln();
-                $this->diagram->PMA_links['RT'][$table][$field_name]
-                    = $this->diagram->AddLink();
-                $this->diagram->Bookmark($field_name, 1, -1);
-                $this->diagram->SetLink(
-                    $this->diagram->PMA_links['doc'][$table][$field_name], -1
-                );
-                $foreigner = PMA_searchColumnInForeigners($res_rel, $field_name);
-
-                $linksTo = '';
-                if ($foreigner) {
-                    $linksTo = '-> ';
-                    if ($foreigner['foreign_db'] != $this->db) {
-                        $linksTo .= $foreigner['foreign_db'] . '.';
-                    }
-                    $linksTo .= $foreigner['foreign_table']
-                        . '.' . $foreigner['foreign_field'];
-
-                    if (isset($foreigner['on_update'])) { // not set for internal
-                        $linksTo .= "\n" . 'ON UPDATE ' . $foreigner['on_update'];
-                        $linksTo .= "\n" . 'ON DELETE ' . $foreigner['on_delete'];
-                    }
-                }
-
-                $this->diagram_row = array(
-                    $field_name,
-                    $type,
-                    $attribute,
-                    (($row['Null'] == '' || $row['Null'] == 'NO')
-                        ? __('No')
-                        : __('Yes')),
-                    (isset($row['Default']) ? $row['Default'] : ''),
-                    $row['Extra'],
-                    $linksTo,
-                    (isset($comments[$field_name])
-                        ? $comments[$field_name]
-                        : ''),
-                    (isset($mime_map) && isset($mime_map[$field_name])
-                        ? str_replace('_', '/', $mime_map[$field_name]['mimetype'])
-                        : '')
-                );
-                $links = array();
-                $links[0] = $this->diagram->PMA_links['RT'][$table][$field_name];
-                if ($foreigner
-                    && isset($this->diagram->PMA_links['doc'][$foreigner['foreign_table']][$foreigner['foreign_field']])
-                ) {
-                    $links[6] = $this->diagram->PMA_links['doc']
-                        [$foreigner['foreign_table']][$foreigner['foreign_field']];
-                } else {
-                    unset($links[6]);
-                }
-                $this->diagram->Row($this->diagram_row, $links);
-            } // end foreach
-            $this->diagram->SetFont($this->_ff, '', 14);
-        } //end each
-    }
-}
diff --git a/#pma/libraries/plugins/schema/pdf/RelationStatsPdf.php b/#pma/libraries/plugins/schema/pdf/RelationStatsPdf.php
deleted file mode 100644
index 06be9c2d..00000000
--- a/#pma/libraries/plugins/schema/pdf/RelationStatsPdf.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Contains PMA\libraries\plugins\schema\pdf\RelationStatsPdf class
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries\plugins\schema\pdf;
-
-use PMA\libraries\plugins\schema\RelationStats;
-
-/**
- * Relation preferences/statistics
- *
- * This class fetches the table master and foreign fields positions
- * and helps in generating the Table references and then connects
- * master table's master field to foreign table's foreign key
- * in PDF document.
- *
- * @name    Relation_Stats_Pdf
- * @package PhpMyAdmin
- * @see     PMA_Schema_PDF::SetDrawColor, PMA_Schema_PDF::setLineWidthScale,
- *          Pdf::lineScale
- */
-class RelationStatsPdf extends RelationStats
-{
-    /**
-     * The "PMA\libraries\plugins\schema\pdf\RelationStatsPdf" constructor
-     *
-     * @param object $diagram       The PDF diagram
-     * @param string $master_table  The master table name
-     * @param string $master_field  The relation field in the master table
-     * @param string $foreign_table The foreign table name
-     * @param string $foreign_field The relation field in the foreign table
-     */
-    public function __construct(
-        $diagram, $master_table, $master_field, $foreign_table,
-        $foreign_field
-    ) {
-        $this->wTick = 5;
-        parent::__construct(
-            $diagram, $master_table, $master_field, $foreign_table, $foreign_field
-        );
-    }
-
-    /**
-     * draws relation links and arrows shows foreign key relations
-     *
-     * @param boolean $showColor Whether to use one color per relation or not
-     * @param integer $i         The id of the link to draw
-     *
-     * @access public
-     *
-     * @return void
-     *
-     * @see    Pdf
-     */
-    public function relationDraw($showColor, $i)
-    {
-        if ($showColor) {
-            $d = $i % 6;
-            $j = ($i - $d) / 6;
-            $j = $j % 4;
-            $j++;
-            $case = array(
-                array(1, 0, 0),
-                array(0, 1, 0),
-                array(0, 0, 1),
-                array(1, 1, 0),
-                array(1, 0, 1),
-                array(0, 1, 1)
-            );
-            list ($a, $b, $c) = $case[$d];
-            $e = (1 - ($j - 1) / 6);
-            $this->diagram->SetDrawColor($a * 255 * $e, $b * 255 * $e, $c * 255 * $e);
-        } else {
-            $this->diagram->SetDrawColor(0);
-        }
-        $this->diagram->setLineWidthScale(0.2);
-        $this->diagram->lineScale(
-            $this->xSrc,
-            $this->ySrc,
-            $this->xSrc + $this->srcDir * $this->wTick,
-            $this->ySrc
-        );
-        $this->diagram->lineScale(
-            $this->xDest + $this->destDir * $this->wTick,
-            $this->yDest,
-            $this->xDest,
-            $this->yDest
-        );
-        $this->diagram->setLineWidthScale(0.1);
-        $this->diagram->lineScale(
-            $this->xSrc + $this->srcDir * $this->wTick,
-            $this->ySrc,
-            $this->xDest + $this->destDir * $this->wTick,
-            $this->yDest
-        );
-        /*
-         * Draws arrows ->
-        */
-        $root2 = 2 * sqrt(2);
-        $this->diagram->lineScale(
-            $this->xSrc + $this->srcDir * $this->wTick * 0.75,
-            $this->ySrc,
-            $this->xSrc + $this->srcDir * (0.75 - 1 / $root2) * $this->wTick,
-            $this->ySrc + $this->wTick / $root2
-        );
-        $this->diagram->lineScale(
-            $this->xSrc + $this->srcDir * $this->wTick * 0.75,
-            $this->ySrc,
-            $this->xSrc + $this->srcDir * (0.75 - 1 / $root2) * $this->wTick,
-            $this->ySrc - $this->wTick / $root2
-        );
-
-        $this->diagram->lineScale(
-            $this->xDest + $this->destDir * $this->wTick / 2,
-            $this->yDest,
-            $this->xDest + $this->destDir * (0.5 + 1 / $root2) * $this->wTick,
-            $this->yDest + $this->wTick / $root2
-        );
-        $this->diagram->lineScale(
-            $this->xDest + $this->destDir * $this->wTick / 2,
-            $this->yDest,
-            $this->xDest + $this->destDir * (0.5 + 1 / $root2) * $this->wTick,
-            $this->yDest - $this->wTick / $root2
-        );
-        $this->diagram->SetDrawColor(0);
-    }
-}
diff --git a/#pma/libraries/plugins/schema/pdf/TableStatsPdf.php b/#pma/libraries/plugins/schema/pdf/TableStatsPdf.php
deleted file mode 100644
index f8349c79..00000000
--- a/#pma/libraries/plugins/schema/pdf/TableStatsPdf.php
+++ /dev/null
@@ -1,232 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Contains PMA\libraries\plugins\schema\pdf\TableStatsPdf class
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries\plugins\schema\pdf;
-
-use PMA\libraries\plugins\schema\ExportRelationSchema;
-use PMA\libraries\plugins\schema\TableStats;
-use PMA\libraries\PDF as PDF_lib;
-
-/**
- * Table preferences/statistics
- *
- * This class preserves the table co-ordinates,fields
- * and helps in drawing/generating the Tables in PDF document.
- *
- * @name    Table_Stats_Pdf
- * @package PhpMyAdmin
- * @see     PMA_Schema_PDF
- */
-class TableStatsPdf extends TableStats
-{
-    /**
-     * Defines properties
-     */
-    public $nb_fiels;
-    public $height;
-    private $_ff = PDF_lib::PMA_PDF_FONT;
-
-    /**
-     * The "PMA\libraries\plugins\schema\pdf\TableStatsPdf" constructor
-     *
-     * @param object  $diagram        The PDF diagram
-     * @param string  $db             The database name
-     * @param string  $tableName      The table name
-     * @param integer $fontSize       The font size
-     * @param integer $pageNumber     The current page number (from the
-     *                                $cfg['Servers'][$i]['table_coords'] table)
-     * @param integer &$sameWideWidth The max. width among tables
-     * @param boolean $showKeys       Whether to display keys or not
-     * @param boolean $tableDimension Whether to display table position or not
-     * @param boolean $offline        Whether the coordinates are sent
-     *                                from the browser
-     *
-     * @see PMA_Schema_PDF, Table_Stats_Pdf::Table_Stats_setWidth,
-     *     PMA\libraries\plugins\schema\pdf\TableStatsPdf::Table_Stats_setHeight
-     */
-    public function __construct(
-        $diagram,
-        $db,
-        $tableName,
-        $fontSize,
-        $pageNumber,
-        &$sameWideWidth,
-        $showKeys = false,
-        $tableDimension = false,
-        $offline = false
-    ) {
-        parent::__construct(
-            $diagram,
-            $db,
-            $pageNumber,
-            $tableName,
-            $showKeys,
-            $tableDimension,
-            $offline
-        );
-
-        $this->heightCell = 6;
-        $this->_setHeight();
-        /*
-         * setWidth must me after setHeight, because title
-        * can include table height which changes table width
-        */
-        $this->_setWidth($fontSize);
-        if ($sameWideWidth < $this->width) {
-            $sameWideWidth = $this->width;
-        }
-    }
-
-    /**
-     * Displays an error when the table cannot be found.
-     *
-     * @return void
-     */
-    protected function showMissingTableError()
-    {
-        ExportRelationSchema::dieSchema(
-            $this->pageNumber,
-            "PDF",
-            sprintf(__('The %s table doesn\'t exist!'), $this->tableName)
-        );
-    }
-
-    /**
-     * Returns title of the current table,
-     * title can have the dimensions of the table
-     *
-     * @return string
-     */
-    protected function getTitle()
-    {
-        $ret = '';
-        if ($this->tableDimension) {
-            $ret = sprintf('%.0fx%0.f', $this->width, $this->height);
-        }
-
-        return $ret . ' ' . $this->tableName;
-    }
-
-    /**
-     * Sets the width of the table
-     *
-     * @param integer $fontSize The font size
-     *
-     * @access private
-     *
-     * @return void
-     *
-     * @see    PMA_Schema_PDF
-     */
-    private function _setWidth($fontSize)
-    {
-        foreach ($this->fields as $field) {
-            $this->width = max($this->width, $this->diagram->GetStringWidth($field));
-        }
-        $this->width += $this->diagram->GetStringWidth('      ');
-        $this->diagram->SetFont($this->_ff, 'B', $fontSize);
-        /*
-         * it is unknown what value must be added, because
-         * table title is affected by the table width value
-         */
-        while ($this->width < $this->diagram->GetStringWidth($this->getTitle())) {
-            $this->width += 5;
-        }
-        $this->diagram->SetFont($this->_ff, '', $fontSize);
-    }
-
-    /**
-     * Sets the height of the table
-     *
-     * @return void
-     *
-     * @access private
-     */
-    private function _setHeight()
-    {
-        $this->height = (count($this->fields) + 1) * $this->heightCell;
-    }
-
-    /**
-     * Do draw the table
-     *
-     * @param integer         $fontSize The font size
-     * @param boolean         $withDoc  Whether to include links to documentation
-     * @param boolean|integer $setColor Whether to display color
-     *
-     * @access public
-     *
-     * @return void
-     *
-     * @see    PMA_Schema_PDF
-     */
-    public function tableDraw($fontSize, $withDoc, $setColor = 0)
-    {
-        $this->diagram->setXyScale($this->x, $this->y);
-        $this->diagram->SetFont($this->_ff, 'B', $fontSize);
-        if ($setColor) {
-            $this->diagram->SetTextColor(200);
-            $this->diagram->SetFillColor(0, 0, 128);
-        }
-        if ($withDoc) {
-            $this->diagram->SetLink(
-                $this->diagram->PMA_links['RT'][$this->tableName]['-'],
-                -1
-            );
-        } else {
-            $this->diagram->PMA_links['doc'][$this->tableName]['-'] = '';
-        }
-
-        $this->diagram->cellScale(
-            $this->width,
-            $this->heightCell,
-            $this->getTitle(),
-            1,
-            1,
-            'C',
-            $setColor,
-            $this->diagram->PMA_links['doc'][$this->tableName]['-']
-        );
-        $this->diagram->setXScale($this->x);
-        $this->diagram->SetFont($this->_ff, '', $fontSize);
-        $this->diagram->SetTextColor(0);
-        $this->diagram->SetFillColor(255);
-
-        foreach ($this->fields as $field) {
-            if ($setColor) {
-                if (in_array($field, $this->primary)) {
-                    $this->diagram->SetFillColor(215, 121, 123);
-                }
-                if ($field == $this->displayfield) {
-                    $this->diagram->SetFillColor(142, 159, 224);
-                }
-            }
-            if ($withDoc) {
-                $this->diagram->SetLink(
-                    $this->diagram->PMA_links['RT'][$this->tableName][$field],
-                    -1
-                );
-            } else {
-                $this->diagram->PMA_links['doc'][$this->tableName][$field] = '';
-            }
-
-            $this->diagram->cellScale(
-                $this->width,
-                $this->heightCell,
-                ' ' . $field,
-                1,
-                1,
-                'L',
-                $setColor,
-                $this->diagram->PMA_links['doc'][$this->tableName][$field]
-            );
-            $this->diagram->setXScale($this->x);
-            $this->diagram->SetFillColor(255);
-        }
-    }
-}
-
diff --git a/#pma/libraries/plugins/schema/svg/RelationStatsSvg.php b/#pma/libraries/plugins/schema/svg/RelationStatsSvg.php
deleted file mode 100644
index b3ee1e36..00000000
--- a/#pma/libraries/plugins/schema/svg/RelationStatsSvg.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Contains PMA\libraries\plugins\schema\svg\RelationStatsSvg class
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries\plugins\schema\svg;
-
-use PMA\libraries\plugins\schema\RelationStats;
-
-/**
- * Relation preferences/statistics
- *
- * This class fetches the table master and foreign fields positions
- * and helps in generating the Table references and then connects
- * master table's master field to foreign table's foreign key
- * in SVG XML document.
- *
- * @package PhpMyAdmin
- * @name    Relation_Stats_Svg
- * @see     PMA_SVG::printElementLine
- */
-class RelationStatsSvg extends RelationStats
-{
-    /**
-     * The "PMA\libraries\plugins\schema\svg\RelationStatsSvg" constructor
-     *
-     * @param object $diagram       The SVG diagram
-     * @param string $master_table  The master table name
-     * @param string $master_field  The relation field in the master table
-     * @param string $foreign_table The foreign table name
-     * @param string $foreign_field The relation field in the foreign table
-     */
-    public function __construct(
-        $diagram,
-        $master_table,
-        $master_field,
-        $foreign_table,
-        $foreign_field
-    ) {
-        $this->wTick = 10;
-        parent::__construct(
-            $diagram,
-            $master_table,
-            $master_field,
-            $foreign_table,
-            $foreign_field
-        );
-    }
-
-    /**
-     * draws relation links and arrows shows foreign key relations
-     *
-     * @param boolean $showColor Whether to use one color per relation or not
-     *
-     * @return void
-     * @access public
-     *
-     * @see    PMA_SVG
-     */
-    public function relationDraw($showColor)
-    {
-        if ($showColor) {
-            $listOfColors = array(
-                '#c00',
-                '#bbb',
-                '#333',
-                '#cb0',
-                '#0b0',
-                '#0bf',
-                '#b0b',
-            );
-            shuffle($listOfColors);
-            $color = $listOfColors[0];
-        } else {
-            $color = '#333';
-        }
-
-        $this->diagram->printElementLine(
-            'line',
-            $this->xSrc,
-            $this->ySrc,
-            $this->xSrc + $this->srcDir * $this->wTick,
-            $this->ySrc,
-            'stroke:' . $color . ';stroke-width:1;'
-        );
-        $this->diagram->printElementLine(
-            'line',
-            $this->xDest + $this->destDir * $this->wTick,
-            $this->yDest,
-            $this->xDest,
-            $this->yDest,
-            'stroke:' . $color . ';stroke-width:1;'
-        );
-        $this->diagram->printElementLine(
-            'line',
-            $this->xSrc + $this->srcDir * $this->wTick,
-            $this->ySrc,
-            $this->xDest + $this->destDir * $this->wTick,
-            $this->yDest,
-            'stroke:' . $color . ';stroke-width:1;'
-        );
-        $root2 = 2 * sqrt(2);
-        $this->diagram->printElementLine(
-            'line',
-            $this->xSrc + $this->srcDir * $this->wTick * 0.75,
-            $this->ySrc,
-            $this->xSrc + $this->srcDir * (0.75 - 1 / $root2) * $this->wTick,
-            $this->ySrc + $this->wTick / $root2,
-            'stroke:' . $color . ';stroke-width:2;'
-        );
-        $this->diagram->printElementLine(
-            'line',
-            $this->xSrc + $this->srcDir * $this->wTick * 0.75,
-            $this->ySrc,
-            $this->xSrc + $this->srcDir * (0.75 - 1 / $root2) * $this->wTick,
-            $this->ySrc - $this->wTick / $root2,
-            'stroke:' . $color . ';stroke-width:2;'
-        );
-        $this->diagram->printElementLine(
-            'line',
-            $this->xDest + $this->destDir * $this->wTick / 2,
-            $this->yDest,
-            $this->xDest + $this->destDir * (0.5 + 1 / $root2) * $this->wTick,
-            $this->yDest + $this->wTick / $root2,
-            'stroke:' . $color . ';stroke-width:2;'
-        );
-        $this->diagram->printElementLine(
-            'line',
-            $this->xDest + $this->destDir * $this->wTick / 2,
-            $this->yDest,
-            $this->xDest + $this->destDir * (0.5 + 1 / $root2) * $this->wTick,
-            $this->yDest - $this->wTick / $root2,
-            'stroke:' . $color . ';stroke-width:2;'
-        );
-    }
-}
diff --git a/#pma/libraries/plugins/schema/svg/Svg.php b/#pma/libraries/plugins/schema/svg/Svg.php
deleted file mode 100644
index 0ea3c90a..00000000
--- a/#pma/libraries/plugins/schema/svg/Svg.php
+++ /dev/null
@@ -1,279 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Classes to create relation schema in SVG format.
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries\plugins\schema\svg;
-
-use PMA;
-use XMLWriter;
-
-/**
- * This Class inherits the XMLwriter class and
- * helps in developing structure of SVG Schema Export
- *
- * @package PhpMyAdmin
- * @access  public
- * @see     https://php.net/manual/en/book.xmlwriter.php
- */
-class Svg extends XMLWriter
-{
-    public $title;
-    public $author;
-    public $font;
-    public $fontSize;
-
-    /**
-     * The "PMA\libraries\plugins\schema\svg\Svg" constructor
-     *
-     * Upon instantiation This starts writing the RelationStatsSvg XML document
-     *
-     * @see XMLWriter::openMemory(),XMLWriter::setIndent(),XMLWriter::startDocument()
-     */
-    public function __construct()
-    {
-        $this->openMemory();
-        /*
-         * Set indenting using three spaces,
-         * so output is formatted
-         */
-
-        $this->setIndent(true);
-        $this->setIndentString('   ');
-        /*
-         * Create the XML document
-         */
-
-        $this->startDocument('1.0', 'UTF-8');
-        $this->startDtd(
-            'svg',
-            '-//W3C//DTD SVG 1.1//EN',
-            'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'
-        );
-        $this->endDtd();
-    }
-
-    /**
-     * Set document title
-     *
-     * @param string $value sets the title text
-     *
-     * @return void
-     */
-    public function setTitle($value)
-    {
-        $this->title = $value;
-    }
-
-    /**
-     * Set document author
-     *
-     * @param string $value sets the author
-     *
-     * @return void
-     */
-    public function setAuthor($value)
-    {
-        $this->author = $value;
-    }
-
-    /**
-     * Set document font
-     *
-     * @param string $value sets the font e.g Arial, Sans-serif etc
-     *
-     * @return void
-     */
-    public function setFont($value)
-    {
-        $this->font = $value;
-    }
-
-    /**
-     * Get document font
-     *
-     * @return string returns the font name
-     */
-    public function getFont()
-    {
-        return $this->font;
-    }
-
-    /**
-     * Set document font size
-     *
-     * @param string $value sets the font size in pixels
-     *
-     * @return void
-     */
-    public function setFontSize($value)
-    {
-        $this->fontSize = $value;
-    }
-
-    /**
-     * Get document font size
-     *
-     * @return string returns the font size
-     */
-    public function getFontSize()
-    {
-        return $this->fontSize;
-    }
-
-    /**
-     * Starts RelationStatsSvg Document
-     *
-     * svg document starts by first initializing svg tag
-     * which contains all the attributes and namespace that needed
-     * to define the svg document
-     *
-     * @param integer $width  total width of the RelationStatsSvg document
-     * @param integer $height total height of the RelationStatsSvg document
-     * @param integer $x      min-x of the view box
-     * @param integer $y      min-y of the view box
-     *
-     * @return void
-     *
-     * @see XMLWriter::startElement(),XMLWriter::writeAttribute()
-     */
-    public function startSvgDoc($width, $height, $x = 0, $y = 0)
-    {
-        $this->startElement('svg');
-
-        if (!is_int($width)) {
-            $width = intval($width);
-        }
-
-        if (!is_int($height)) {
-            $height = intval($height);
-        }
-
-        if ($x != 0 || $y != 0) {
-            $this->writeAttribute('viewBox', "$x $y $width $height");
-        }
-        $this->writeAttribute('width', ($width - $x) . 'px');
-        $this->writeAttribute('height', ($height - $y) . 'px');
-        $this->writeAttribute('xmlns', 'http://www.w3.org/2000/svg');
-        $this->writeAttribute('version', '1.1');
-    }
-
-    /**
-     * Ends RelationStatsSvg Document
-     *
-     * @return void
-     * @see XMLWriter::endElement(),XMLWriter::endDocument()
-     */
-    public function endSvgDoc()
-    {
-        $this->endElement();
-        $this->endDocument();
-    }
-
-    /**
-     * output RelationStatsSvg Document
-     *
-     * svg document prompted to the user for download
-     * RelationStatsSvg document saved in .svg extension and can be
-     * easily changeable by using any svg IDE
-     *
-     * @param string $fileName file name
-     *
-     * @return void
-     * @see XMLWriter::startElement(),XMLWriter::writeAttribute()
-     */
-    public function showOutput($fileName)
-    {
-        //ob_get_clean();
-        $output = $this->flush();
-        PMA\libraries\Response::getInstance()
-            ->disable();
-        PMA_downloadHeader(
-            $fileName,
-            'image/svg+xml',
-            strlen($output)
-        );
-        print $output;
-    }
-
-    /**
-     * Draws RelationStatsSvg elements
-     *
-     * SVG has some predefined shape elements like rectangle & text
-     * and other elements who have x,y co-ordinates are drawn.
-     * specify their width and height and can give styles too.
-     *
-     * @param string     $name   RelationStatsSvg element name
-     * @param int        $x      The x attr defines the left position of the element
-     *                           (e.g. x="0" places the element 0 pixels from the
-     *                           left of the browser window)
-     * @param integer    $y      The y attribute defines the top position of the
-     *                           element (e.g. y="0" places the element 0 pixels
-     *                           from the top of the browser window)
-     * @param int|string $width  The width attribute defines the width the element
-     * @param int|string $height The height attribute defines the height the element
-     * @param string     $text   The text attribute defines the text the element
-     * @param string     $styles The style attribute defines the style the element
-     *                           styles can be defined like CSS styles
-     *
-     * @return void
-     *
-     * @see XMLWriter::startElement(), XMLWriter::writeAttribute(),
-     * XMLWriter::text(), XMLWriter::endElement()
-     */
-    public function printElement(
-        $name,
-        $x,
-        $y,
-        $width = '',
-        $height = '',
-        $text = '',
-        $styles = ''
-    ) {
-        $this->startElement($name);
-        $this->writeAttribute('width', $width);
-        $this->writeAttribute('height', $height);
-        $this->writeAttribute('x', $x);
-        $this->writeAttribute('y', $y);
-        $this->writeAttribute('style', $styles);
-        if (isset($text)) {
-            $this->writeAttribute('font-family', $this->font);
-            $this->writeAttribute('font-size', $this->fontSize);
-            $this->text($text);
-        }
-        $this->endElement();
-    }
-
-    /**
-     * Draws RelationStatsSvg Line element
-     *
-     * RelationStatsSvg line element is drawn for connecting the tables.
-     * arrows are also drawn by specify its start and ending
-     * co-ordinates
-     *
-     * @param string  $name   RelationStatsSvg element name i.e line
-     * @param integer $x1     Defines the start of the line on the x-axis
-     * @param integer $y1     Defines the start of the line on the y-axis
-     * @param integer $x2     Defines the end of the line on the x-axis
-     * @param integer $y2     Defines the end of the line on the y-axis
-     * @param string  $styles The style attribute defines the style the element
-     *                        styles can be defined like CSS styles
-     *
-     * @return void
-     *
-     * @see XMLWriter::startElement(), XMLWriter::writeAttribute(),
-     * XMLWriter::endElement()
-     */
-    public function printElementLine($name, $x1, $y1, $x2, $y2, $styles)
-    {
-        $this->startElement($name);
-        $this->writeAttribute('x1', $x1);
-        $this->writeAttribute('y1', $y1);
-        $this->writeAttribute('x2', $x2);
-        $this->writeAttribute('y2', $y2);
-        $this->writeAttribute('style', $styles);
-        $this->endElement();
-    }
-}
diff --git a/#pma/libraries/plugins/schema/svg/SvgRelationSchema.php b/#pma/libraries/plugins/schema/svg/SvgRelationSchema.php
deleted file mode 100644
index 2ba33514..00000000
--- a/#pma/libraries/plugins/schema/svg/SvgRelationSchema.php
+++ /dev/null
@@ -1,267 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Contains PMA\libraries\plugins\schema\svg\RelationStatsSvg class
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries\plugins\schema\svg;
-
-use PMA\libraries\plugins\schema\dia\RelationStatsDia;
-use PMA\libraries\plugins\schema\eps\TableStatsEps;
-use PMA\libraries\plugins\schema\ExportRelationSchema;
-use PMA\libraries\plugins\schema\pdf\TableStatsPdf;
-use PMA\libraries\plugins\schema\svg\Svg;
-use PMA\libraries\plugins\schema\svg\TableStatsSvg;
-use PMA\libraries\plugins\schema\dia\TableStatsDia;
-
-/**
- * RelationStatsSvg Relation Schema Class
- *
- * Purpose of this class is to generate the SVG XML Document because
- * SVG defines the graphics in XML format which is used for representing
- * the database diagrams as vector image. This class actually helps
- *  in preparing SVG XML format.
- *
- * SVG XML is generated by using XMLWriter php extension and this class
- * inherits ExportRelationSchema class has common functionality added
- * to this class
- *
- * @package PhpMyAdmin
- * @name Svg_Relation_Schema
- */
-class SvgRelationSchema extends ExportRelationSchema
-{
-    /**
-     * @var \PMA\libraries\plugins\schema\dia\TableStatsDia[]|TableStatsEps[]|TableStatsPdf[]|TableStatsSvg[]
-     */
-    private $_tables = array();
-    /** @var RelationStatsDia[] Relations */
-    private $_relations = array();
-    private $_xMax = 0;
-    private $_yMax = 0;
-    private $_xMin = 100000;
-    private $_yMin = 100000;
-    private $_tablewidth;
-
-    /**
-     * The "PMA\libraries\plugins\schema\svg\SvgRelationSchema" constructor
-     *
-     * Upon instantiation This starts writing the SVG XML document
-     * user will be prompted for download as .svg extension
-     *
-     * @param string $db database name
-     *
-     * @see PMA_SVG
-     */
-    function __construct($db)
-    {
-        parent::__construct($db, new Svg());
-
-        $this->setShowColor(isset($_REQUEST['svg_show_color']));
-        $this->setShowKeys(isset($_REQUEST['svg_show_keys']));
-        $this->setTableDimension(isset($_REQUEST['svg_show_table_dimension']));
-        $this->setAllTablesSameWidth(isset($_REQUEST['svg_all_tables_same_width']));
-
-        $this->diagram->setTitle(
-            sprintf(
-                __('Schema of the %s database - Page %s'),
-                $this->db,
-                $this->pageNumber
-            )
-        );
-        $this->diagram->SetAuthor('phpMyAdmin ' . PMA_VERSION);
-        $this->diagram->setFont('Arial');
-        $this->diagram->setFontSize('16px');
-
-        $alltables = $this->getTablesFromRequest();
-
-        foreach ($alltables as $table) {
-            if (!isset($this->_tables[$table])) {
-                $this->_tables[$table] = new TableStatsSvg(
-                    $this->diagram, $this->db,
-                    $table, $this->diagram->getFont(),
-                    $this->diagram->getFontSize(), $this->pageNumber,
-                    $this->_tablewidth, $this->showKeys, $this->tableDimension,
-                    $this->offline
-                );
-            }
-
-            if ($this->sameWide) {
-                $this->_tables[$table]->width = &$this->_tablewidth;
-            }
-            $this->_setMinMax($this->_tables[$table]);
-        }
-
-        $border = 15;
-        $this->diagram->startSvgDoc(
-            $this->_xMax + $border,
-            $this->_yMax + $border,
-            $this->_xMin - $border,
-            $this->_yMin - $border
-        );
-
-        $seen_a_relation = false;
-        foreach ($alltables as $one_table) {
-            $exist_rel = PMA_getForeigners($this->db, $one_table, '', 'both');
-            if (!$exist_rel) {
-                continue;
-            }
-
-            $seen_a_relation = true;
-            foreach ($exist_rel as $master_field => $rel) {
-                /* put the foreign table on the schema only if selected
-                * by the user
-                * (do not use array_search() because we would have to
-                * to do a === false and this is not PHP3 compatible)
-                */
-                if ($master_field != 'foreign_keys_data') {
-                    if (in_array($rel['foreign_table'], $alltables)) {
-                        $this->_addRelation(
-                            $one_table,
-                            $this->diagram->getFont(),
-                            $this->diagram->getFontSize(),
-                            $master_field,
-                            $rel['foreign_table'],
-                            $rel['foreign_field'],
-                            $this->tableDimension
-                        );
-                    }
-                    continue;
-                }
-
-                foreach ($rel as $one_key) {
-                    if (!in_array($one_key['ref_table_name'], $alltables)) {
-                        continue;
-                    }
-
-                    foreach (
-                        $one_key['index_list']
-                        as $index => $one_field
-                    ) {
-                        $this->_addRelation(
-                            $one_table,
-                            $this->diagram->getFont(),
-                            $this->diagram->getFontSize(),
-                            $one_field,
-                            $one_key['ref_table_name'],
-                            $one_key['ref_index_list'][$index],
-                            $this->tableDimension
-                        );
-                    }
-                }
-            }
-        }
-        if ($seen_a_relation) {
-            $this->_drawRelations();
-        }
-
-        $this->_drawTables();
-        $this->diagram->endSvgDoc();
-    }
-
-    /**
-     * Output RelationStatsSvg Document for download
-     *
-     * @return void
-     */
-    public function showOutput()
-    {
-        $this->diagram->showOutput($this->getFileName('.svg'));
-    }
-
-    /**
-     * Sets X and Y minimum and maximum for a table cell
-     *
-     * @param string $table The table name
-     *
-     * @return void
-     */
-    private function _setMinMax($table)
-    {
-        $this->_xMax = max($this->_xMax, $table->x + $table->width);
-        $this->_yMax = max($this->_yMax, $table->y + $table->height);
-        $this->_xMin = min($this->_xMin, $table->x);
-        $this->_yMin = min($this->_yMin, $table->y);
-    }
-
-    /**
-     * Defines relation objects
-     *
-     * @param string  $masterTable    The master table name
-     * @param string  $font           The font face
-     * @param int     $fontSize       Font size
-     * @param string  $masterField    The relation field in the master table
-     * @param string  $foreignTable   The foreign table name
-     * @param string  $foreignField   The relation field in the foreign table
-     * @param boolean $tableDimension Whether to display table position or not
-     *
-     * @return void
-     *
-     * @see _setMinMax,Table_Stats_Svg::__construct(),
-     *       PMA\libraries\plugins\schema\svg\RelationStatsSvg::__construct()
-     */
-    private function _addRelation(
-        $masterTable,
-        $font,
-        $fontSize,
-        $masterField,
-        $foreignTable,
-        $foreignField,
-        $tableDimension
-    ) {
-        if (!isset($this->_tables[$masterTable])) {
-            $this->_tables[$masterTable] = new TableStatsSvg(
-                $this->diagram, $this->db,
-                $masterTable, $font, $fontSize, $this->pageNumber,
-                $this->_tablewidth, false, $tableDimension
-            );
-            $this->_setMinMax($this->_tables[$masterTable]);
-        }
-        if (!isset($this->_tables[$foreignTable])) {
-            $this->_tables[$foreignTable] = new TableStatsSvg(
-                $this->diagram, $this->db,
-                $foreignTable, $font, $fontSize, $this->pageNumber,
-                $this->_tablewidth, false, $tableDimension
-            );
-            $this->_setMinMax($this->_tables[$foreignTable]);
-        }
-        $this->_relations[] = new RelationStatsSvg(
-            $this->diagram,
-            $this->_tables[$masterTable],
-            $masterField,
-            $this->_tables[$foreignTable],
-            $foreignField
-        );
-    }
-
-    /**
-     * Draws relation arrows and lines
-     * connects master table's master field to
-     * foreign table's foreign field
-     *
-     * @return void
-     *
-     * @see Relation_Stats_Svg::relationDraw()
-     */
-    private function _drawRelations()
-    {
-        foreach ($this->_relations as $relation) {
-            $relation->relationDraw($this->showColor);
-        }
-    }
-
-    /**
-     * Draws tables
-     *
-     * @return void
-     *
-     * @see Table_Stats_Svg::Table_Stats_tableDraw()
-     */
-    private function _drawTables()
-    {
-        foreach ($this->_tables as $table) {
-            $table->tableDraw($this->showColor);
-        }
-    }
-}
\ No newline at end of file
diff --git a/#pma/libraries/plugins/schema/svg/TableStatsSvg.php b/#pma/libraries/plugins/schema/svg/TableStatsSvg.php
deleted file mode 100644
index 7675d5ba..00000000
--- a/#pma/libraries/plugins/schema/svg/TableStatsSvg.php
+++ /dev/null
@@ -1,202 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Contains PMA\libraries\plugins\schema\svg\TableStatsSvg class
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries\plugins\schema\svg;
-
-use PMA;
-use PMA\libraries\plugins\schema\ExportRelationSchema;
-use PMA\libraries\plugins\schema\TableStats;
-
-/**
- * Table preferences/statistics
- *
- * This class preserves the table co-ordinates,fields
- * and helps in drawing/generating the Tables in SVG XML document.
- *
- * @package PhpMyAdmin
- * @name    Table_Stats_Svg
- * @see     PMA_SVG
- */
-class TableStatsSvg extends TableStats
-{
-    /**
-     * Defines properties
-     */
-    public $height;
-    public $currentCell = 0;
-
-    /**
-     * The "PMA\libraries\plugins\schema\svg\TableStatsSvg" constructor
-     *
-     * @param object  $diagram          The current SVG image document
-     * @param string  $db               The database name
-     * @param string  $tableName        The table name
-     * @param string  $font             Font face
-     * @param integer $fontSize         The font size
-     * @param integer $pageNumber       Page number
-     * @param integer &$same_wide_width The max. width among tables
-     * @param boolean $showKeys         Whether to display keys or not
-     * @param boolean $tableDimension   Whether to display table position or not
-     * @param boolean $offline          Whether the coordinates are sent
-     *
-     *
-     * @see PMA_SVG, Table_Stats_Svg::Table_Stats_setWidth,
-     *       PMA\libraries\plugins\schema\svg\TableStatsSvg::Table_Stats_setHeight
-     */
-    public function __construct(
-        $diagram,
-        $db,
-        $tableName,
-        $font,
-        $fontSize,
-        $pageNumber,
-        &$same_wide_width,
-        $showKeys = false,
-        $tableDimension = false,
-        $offline = false
-    ) {
-        parent::__construct(
-            $diagram,
-            $db,
-            $pageNumber,
-            $tableName,
-            $showKeys,
-            $tableDimension,
-            $offline
-        );
-
-        // height and width
-        $this->_setHeightTable($fontSize);
-        // setWidth must me after setHeight, because title
-        // can include table height which changes table width
-        $this->_setWidthTable($font, $fontSize);
-        if ($same_wide_width < $this->width) {
-            $same_wide_width = $this->width;
-        }
-    }
-
-    /**
-     * Displays an error when the table cannot be found.
-     *
-     * @return void
-     */
-    protected function showMissingTableError()
-    {
-        ExportRelationSchema::dieSchema(
-            $this->pageNumber,
-            "SVG",
-            sprintf(__('The %s table doesn\'t exist!'), $this->tableName)
-        );
-    }
-
-    /**
-     * Sets the width of the table
-     *
-     * @param string  $font     The font size
-     * @param integer $fontSize The font size
-     *
-     * @return void
-     * @access private
-     *
-     * @see    PMA_SVG
-     */
-    private function _setWidthTable($font, $fontSize)
-    {
-        foreach ($this->fields as $field) {
-            $this->width = max(
-                $this->width,
-                PMA\libraries\Font::getStringWidth($field, $font, $fontSize)
-            );
-        }
-        $this->width += PMA\libraries\Font::getStringWidth('  ', $font, $fontSize);
-
-        /*
-         * it is unknown what value must be added, because
-         * table title is affected by the table width value
-         */
-        while ($this->width
-            < PMA\libraries\Font::getStringWidth($this->getTitle(), $font, $fontSize)
-        ) {
-            $this->width += 7;
-        }
-    }
-
-    /**
-     * Sets the height of the table
-     *
-     * @param integer $fontSize font size
-     *
-     * @return void
-     */
-    private function _setHeightTable($fontSize)
-    {
-        $this->heightCell = $fontSize + 4;
-        $this->height = (count($this->fields) + 1) * $this->heightCell;
-    }
-
-    /**
-     * draw the table
-     *
-     * @param boolean $showColor Whether to display color
-     *
-     * @access public
-     * @return void
-     *
-     * @see    PMA_SVG,PMA_SVG::printElement
-     */
-    public function tableDraw($showColor)
-    {
-        $this->diagram->printElement(
-            'rect',
-            $this->x,
-            $this->y,
-            $this->width,
-            $this->heightCell,
-            null,
-            'fill:#007;stroke:black;'
-        );
-        $this->diagram->printElement(
-            'text',
-            $this->x + 5,
-            $this->y + 14,
-            $this->width,
-            $this->heightCell,
-            $this->getTitle(),
-            'fill:#fff;'
-        );
-        foreach ($this->fields as $field) {
-            $this->currentCell += $this->heightCell;
-            $fillColor = 'none';
-            if ($showColor) {
-                if (in_array($field, $this->primary)) {
-                    $fillColor = '#aea';
-                }
-                if ($field == $this->displayfield) {
-                    $fillColor = 'none';
-                }
-            }
-            $this->diagram->printElement(
-                'rect',
-                $this->x,
-                $this->y + $this->currentCell,
-                $this->width,
-                $this->heightCell,
-                null,
-                'fill:' . $fillColor . ';stroke:black;'
-            );
-            $this->diagram->printElement(
-                'text',
-                $this->x + 5,
-                $this->y + 14 + $this->currentCell,
-                $this->width,
-                $this->heightCell,
-                $field,
-                'fill:black;'
-            );
-        }
-    }
-}
diff --git a/#pma/libraries/plugins/transformations/README b/#pma/libraries/plugins/transformations/README
deleted file mode 100644
index 7d7a1255..00000000
--- a/#pma/libraries/plugins/transformations/README
+++ /dev/null
@@ -1,4 +0,0 @@
-TRANSFORMATION USAGE (Garvin Hicking, <me@supergarv.de>)
-====================
-
-See the documentation for complete instructions on how to use transformation plugins.
diff --git a/#pma/libraries/plugins/transformations/TEMPLATE b/#pma/libraries/plugins/transformations/TEMPLATE
deleted file mode 100644
index 12f09443..00000000
--- a/#pma/libraries/plugins/transformations/TEMPLATE
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-// vim: expandtab sw=4 ts=4 sts=4:
-/**
- * This file contains the basic structure for a specific MIME Type and Subtype
- * transformations class.
- * For instructions, read the documentation
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage [TransformationName]
- */
-namespace PMA\libraries\plugins\transformations;
-
-use PMA\libraries\plugins\transformations\abs\[TransformationName]TransformationsPlugin;
-
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
-/**
- * Handles the [TransformationName] transformation for [MIMEType] - [MIMESubtype]
- *
- * @package PhpMyAdmin
- */
-class [MIMEType][MIMESubtype][TransformationName]
-    extends [TransformationName]TransformationsPlugin
-{
-    /**
-     * Gets the plugin`s MIME type
-     *
-     * @return string
-     */
-    public static function getMIMEType()
-    {
-        return "[MIMEType]";
-    }
-
-    /**
-     * Gets the plugin`s MIME subtype
-     *
-     * @return string
-     */
-    public static function getMIMESubtype()
-    {
-        return "[MIMESubtype]";
-    }
-}
-?>
diff --git a/#pma/libraries/plugins/transformations/TEMPLATE_ABSTRACT b/#pma/libraries/plugins/transformations/TEMPLATE_ABSTRACT
deleted file mode 100644
index 5ea9bc0d..00000000
--- a/#pma/libraries/plugins/transformations/TEMPLATE_ABSTRACT
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-// vim: expandtab sw=4 ts=4 sts=4:
-/**
- * This file contains the basic structure for an abstract class defining a
- * transformation.
- * For instructions, read the documentation
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage [TransformationName]
- */
-namespace PMA\libraries\plugins\transformations\abs;
-
-use PMA\libraries\plugins\IOTransformationsPlugin;
-
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
-/**
- * Provides common methods for all of the [TransformationName] transformations plugins.
- *
- * @package PhpMyAdmin
- */
-abstract class [TransformationName]TransformationsPlugin
-    extends IOTransformationsPlugin
-{
-    /**
-     * Gets the transformation description of the specific plugin
-     *
-     * @return string
-     */
-    public static function getInfo()
-    {
-        return __(
-            'Description of the transformation.'
-        );
-    }
-
-    /**
-     * Does the actual work of each specific transformations plugin.
-     *
-     * @param string $buffer  text to be transformed
-     * @param array  $options transformation options
-     * @param string $meta    meta information
-     *
-     * @return void
-     */
-    public function applyTransformation($buffer, $options = array(), $meta = '')
-    {
-        // possibly use a global transform and feed it with special options
-
-        // further operations on $buffer using the $options[] array.
-
-        // You can evaluate the propagated $meta Object. It's contained fields are described in https://www.php.net/mysql_fetch_field.
-        // This stored information can be used to get the field information about the transformed field.
-        // $meta->mimetype contains the original MimeType of the field (i.e. 'text/plain', 'image/jpeg' etc.)
-
-        return $buffer;
-    }
-
-    /* ~~~~~~~~~~~~~~~~~~~~ Getters and Setters ~~~~~~~~~~~~~~~~~~~~ */
-
-
-    /**
-     * Gets the TransformationName of the specific plugin
-     *
-     * @return string
-     */
-    public static function getName()
-    {
-        return "[TransformationName]";
-    }
-}
-?>
diff --git a/#pma/libraries/plugins/transformations/Text_Plain_Link.php b/#pma/libraries/plugins/transformations/Text_Plain_Link.php
deleted file mode 100644
index 769435e8..00000000
--- a/#pma/libraries/plugins/transformations/Text_Plain_Link.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Text Plain Link Transformations plugin for phpMyAdmin
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage Link
- */
-namespace PMA\libraries\plugins\transformations;
-
-use PMA\libraries\plugins\transformations\abs\TextLinkTransformationsPlugin;
-
-/**
- * Handles the link transformation for text plain
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage Link
- */
-class Text_Plain_Link extends TextLinkTransformationsPlugin
-{
-    /**
-     * Gets the plugin`s MIME type
-     *
-     * @return string
-     */
-    public static function getMIMEType()
-    {
-        return "Text";
-    }
-
-    /**
-     * Gets the plugin`s MIME subtype
-     *
-     * @return string
-     */
-    public static function getMIMESubtype()
-    {
-        return "Plain";
-    }
-}
diff --git a/#pma/libraries/plugins/transformations/Text_Plain_Longtoipv4.php b/#pma/libraries/plugins/transformations/Text_Plain_Longtoipv4.php
deleted file mode 100644
index ac621eab..00000000
--- a/#pma/libraries/plugins/transformations/Text_Plain_Longtoipv4.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Text Plain Long To IPv4 Transformations plugin for phpMyAdmin
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage LongToIPv4
- */
-namespace PMA\libraries\plugins\transformations;
-
-use PMA\libraries\plugins\transformations\abs\LongToIPv4TransformationsPlugin;
-
-/**
- * Handles the long to ipv4 transformation for text plain
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage LongToIPv4
- */
-class Text_Plain_Longtoipv4 extends LongToIPv4TransformationsPlugin
-{
-    /**
-     * Gets the plugin`s MIME type
-     *
-     * @return string
-     */
-    public static function getMIMEType()
-    {
-        return "Text";
-    }
-
-    /**
-     * Gets the plugin`s MIME subtype
-     *
-     * @return string
-     */
-    public static function getMIMESubtype()
-    {
-        return "Plain";
-    }
-}
diff --git a/#pma/libraries/plugins/transformations/Text_Plain_PreApPend.php b/#pma/libraries/plugins/transformations/Text_Plain_PreApPend.php
deleted file mode 100644
index 8bc07f0b..00000000
--- a/#pma/libraries/plugins/transformations/Text_Plain_PreApPend.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Text Plain Prepend/Append Transformations plugin for phpMyAdmin
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage PreApPend
- */
-namespace PMA\libraries\plugins\transformations;
-
-use PMA\libraries\plugins\transformations\abs\PreApPendTransformationsPlugin;
-
-/**
- * Handles the prepend and/or append transformation for text plain.
- * Has two options: the text to be prepended and appended (if any, default '')
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage PreApPend
- */
-class Text_Plain_PreApPend extends PreApPendTransformationsPlugin
-{
-    /**
-     * Gets the plugin`s MIME type
-     *
-     * @return string
-     */
-    public static function getMIMEType()
-    {
-        return "Text";
-    }
-
-    /**
-     * Gets the plugin`s MIME subtype
-     *
-     * @return string
-     */
-    public static function getMIMESubtype()
-    {
-        return "Plain";
-    }
-}
diff --git a/#pma/libraries/plugins/transformations/Text_Plain_Substring.php b/#pma/libraries/plugins/transformations/Text_Plain_Substring.php
deleted file mode 100644
index a8128e03..00000000
--- a/#pma/libraries/plugins/transformations/Text_Plain_Substring.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Text Plain Substring Transformations plugin for phpMyAdmin
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage Substring
- */
-namespace PMA\libraries\plugins\transformations;
-
-use PMA\libraries\plugins\transformations\abs\SubstringTransformationsPlugin;
-
-/**
- * Handles the substring transformation for text plain
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage Substring
- */
-class Text_Plain_Substring extends SubstringTransformationsPlugin
-{
-    /**
-     * Gets the plugin`s MIME type
-     *
-     * @return string
-     */
-    public static function getMIMEType()
-    {
-        return "Text";
-    }
-
-    /**
-     * Gets the plugin`s MIME subtype
-     *
-     * @return string
-     */
-    public static function getMIMESubtype()
-    {
-        return "Plain";
-    }
-}
diff --git a/#pma/libraries/plugins/transformations/abs/Bool2TextTransformationsPlugin.php b/#pma/libraries/plugins/transformations/abs/Bool2TextTransformationsPlugin.php
deleted file mode 100644
index 0272ec4d..00000000
--- a/#pma/libraries/plugins/transformations/abs/Bool2TextTransformationsPlugin.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Abstract class for the Bool2Text transformations plugins
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage Bool2Text
- */
-namespace PMA\libraries\plugins\transformations\abs;
-
-use PMA\libraries\plugins\TransformationsPlugin;
-
-/**
- * Provides common methods for all of the Bool2Text transformations plugins.
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage Bool2Text
- */
-abstract class Bool2TextTransformationsPlugin extends TransformationsPlugin
-{
-    /**
-     * Gets the transformation description of the specific plugin
-     *
-     * @return string
-     */
-    public static function getInfo()
-    {
-        return __(
-            'Converts Boolean values to text (default \'T\' and \'F\').'
-            . ' First option is for TRUE, second for FALSE. Nonzero=true.'
-        );
-    }
-
-    /**
-     * Does the actual work of each specific transformations plugin.
-     *
-     * @param string $buffer  text to be transformed
-     * @param array  $options transformation options
-     * @param string $meta    meta information
-     *
-     * @return string
-     */
-    public function applyTransformation($buffer, $options = array(), $meta = '')
-    {
-        $options = $this->getOptions($options, array('T', 'F'));
-
-        if ($buffer == '0') {
-            return $options[1];   // return false label
-        }
-
-        return $options[0];       // or true one if nonzero
-    }
-
-    /* ~~~~~~~~~~~~~~~~~~~~ Getters and Setters ~~~~~~~~~~~~~~~~~~~~ */
-
-    /**
-     * Gets the transformation name of the specific plugin
-     *
-     * @return string
-     */
-    public static function getName()
-    {
-        return "Bool2Text";
-    }
-}
diff --git a/#pma/libraries/plugins/transformations/abs/CodeMirrorEditorTransformationPlugin.php b/#pma/libraries/plugins/transformations/abs/CodeMirrorEditorTransformationPlugin.php
deleted file mode 100644
index 54ab6ed9..00000000
--- a/#pma/libraries/plugins/transformations/abs/CodeMirrorEditorTransformationPlugin.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Abstract class for syntax highlighted editors using CodeMirror
- *
- * @package PhpMyAdmin-Transformations
- */
-namespace PMA\libraries\plugins\transformations\abs;
-
-use PMA\libraries\plugins\IOTransformationsPlugin;
-
-/**
- * Provides common methods for all the CodeMirror syntax highlighted editors
- *
- * @package PhpMyAdmin-Transformations
- */
-abstract class CodeMirrorEditorTransformationPlugin extends IOTransformationsPlugin
-{
-    /**
-     * Does the actual work of each specific transformations plugin.
-     *
-     * @param string $buffer  text to be transformed
-     * @param array  $options transformation options
-     * @param string $meta    meta information
-     *
-     * @return string
-     */
-    public function applyTransformation($buffer, $options = array(), $meta = '')
-    {
-        return $buffer;
-    }
-
-    /**
-     * Returns the html for input field to override default textarea.
-     * Note: Return empty string if default textarea is required.
-     *
-     * @param array  $column               column details
-     * @param int    $row_id               row number
-     * @param string $column_name_appendix the name attribute
-     * @param array  $options              transformation options
-     * @param string $value                Current field value
-     * @param string $text_dir             text direction
-     * @param int    $tabindex             tab index
-     * @param int    $tabindex_for_value   offset for the values tabindex
-     * @param int    $idindex              id index
-     *
-     * @return string the html for input field
-     */
-    public function getInputHtml(
-        $column,
-        $row_id,
-        $column_name_appendix,
-        $options,
-        $value,
-        $text_dir,
-        $tabindex,
-        $tabindex_for_value,
-        $idindex
-    ) {
-        $html = '';
-        if (!empty($value)) {
-            $html = '<input type="hidden" name="fields_prev' . $column_name_appendix
-                . '" value="' . htmlspecialchars($value) . '"/>';
-        }
-        $class = 'transform_' . strtolower(static::getName()) . '_editor';
-        $html .= '<textarea name="fields' . $column_name_appendix . '"'
-            . ' dir="' . $text_dir . '" class="' . $class . '">'
-            . htmlspecialchars($value) . '</textarea>';
-
-        return $html;
-    }
-}
diff --git a/#pma/libraries/plugins/transformations/abs/DateFormatTransformationsPlugin.php b/#pma/libraries/plugins/transformations/abs/DateFormatTransformationsPlugin.php
deleted file mode 100644
index 7a7e0cee..00000000
--- a/#pma/libraries/plugins/transformations/abs/DateFormatTransformationsPlugin.php
+++ /dev/null
@@ -1,168 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Abstract class for the date format transformations plugins
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage DateFormat
- */
-namespace PMA\libraries\plugins\transformations\abs;
-
-use PMA;
-use PMA\libraries\plugins\TransformationsPlugin;
-
-require_once 'libraries/js_escape.lib.php';
-
-/**
- * Provides common methods for all of the date format transformations plugins.
- *
- * @package PhpMyAdmin
- */
-abstract class DateFormatTransformationsPlugin extends TransformationsPlugin
-{
-    /**
-     * Gets the transformation description of the specific plugin
-     *
-     * @return string
-     */
-    public static function getInfo()
-    {
-        return __(
-            'Displays a TIME, TIMESTAMP, DATETIME or numeric unix timestamp'
-            . ' column as formatted date. The first option is the offset (in'
-            . ' hours) which will be added to the timestamp (Default: 0). Use'
-            . ' second option to specify a different date/time format string.'
-            . ' Third option determines whether you want to see local date or'
-            . ' UTC one (use "local" or "utc" strings) for that. According to'
-            . ' that, date format has different value - for "local" see the'
-            . ' documentation for PHP\'s strftime() function and for "utc" it'
-            . ' is done using gmdate() function.'
-        );
-    }
-
-    /**
-     * Does the actual work of each specific transformations plugin.
-     *
-     * @param string $buffer  text to be transformed
-     * @param array  $options transformation options
-     * @param string $meta    meta information
-     *
-     * @return string
-     */
-    public function applyTransformation($buffer, $options = array(), $meta = '')
-    {
-        // possibly use a global transform and feed it with special options
-
-        // further operations on $buffer using the $options[] array.
-        if (empty($options[0])) {
-            $options[0] = 0;
-        }
-
-        if (empty($options[2])) {
-            $options[2] = 'local';
-        } else {
-            $options[2] = mb_strtolower($options[2]);
-        }
-
-        if (empty($options[1])) {
-            if ($options[2] == 'local') {
-                $options[1] = __('%B %d, %Y at %I:%M %p');
-            } else {
-                $options[1] = 'Y-m-d  H:i:s';
-            }
-        }
-
-        $timestamp = -1;
-
-        // INT columns will be treated as UNIX timestamps
-        // and need to be detected before the verification for
-        // MySQL TIMESTAMP
-        if ($meta->type == 'int') {
-            $timestamp = $buffer;
-
-            // Detect TIMESTAMP(6 | 8 | 10 | 12 | 14)
-            // TIMESTAMP (2 | 4) not supported here.
-            // (Note: prior to MySQL 4.1, TIMESTAMP has a display size
-            // for example TIMESTAMP(8) means YYYYMMDD)
-        } else {
-            if (preg_match('/^(\d{2}){3,7}$/', $buffer)) {
-
-                if (mb_strlen($buffer) == 14 || mb_strlen($buffer) == 8) {
-                    $offset = 4;
-                } else {
-                    $offset = 2;
-                }
-
-                $aDate = array();
-                $aDate['year'] = (int)
-                mb_substr($buffer, 0, $offset);
-                $aDate['month'] = (int)
-                mb_substr($buffer, $offset, 2);
-                $aDate['day'] = (int)
-                mb_substr($buffer, $offset + 2, 2);
-                $aDate['hour'] = (int)
-                mb_substr($buffer, $offset + 4, 2);
-                $aDate['minute'] = (int)
-                mb_substr($buffer, $offset + 6, 2);
-                $aDate['second'] = (int)
-                mb_substr($buffer, $offset + 8, 2);
-
-                if (checkdate($aDate['month'], $aDate['day'], $aDate['year'])) {
-                    $timestamp = mktime(
-                        $aDate['hour'],
-                        $aDate['minute'],
-                        $aDate['second'],
-                        $aDate['month'],
-                        $aDate['day'],
-                        $aDate['year']
-                    );
-                }
-                // If all fails, assume one of the dozens of valid strtime() syntaxes
-                // (http://www.gnu.org/manual/tar-1.12/html_chapter/tar_7.html)
-            } else {
-                if (preg_match('/^[0-9]\d{1,9}$/', $buffer)) {
-                    $timestamp = (int)$buffer;
-                } else {
-                    $timestamp = strtotime($buffer);
-                }
-            }
-        }
-
-        // If all above failed, maybe it's a Unix timestamp already?
-        if ($timestamp < 0 && preg_match('/^[1-9]\d{1,9}$/', $buffer)) {
-            $timestamp = $buffer;
-        }
-
-        // Reformat a valid timestamp
-        if ($timestamp >= 0) {
-            $timestamp -= $options[0] * 60 * 60;
-            $source = $buffer;
-            if ($options[2] == 'local') {
-                $text = PMA\libraries\Util::localisedDate(
-                    $timestamp,
-                    $options[1]
-                );
-            } elseif ($options[2] == 'utc') {
-                $text = gmdate($options[1], $timestamp);
-            } else {
-                $text = 'INVALID DATE TYPE';
-            }
-            return '<dfn onclick="alert(\'' . PMA_jsFormat($source, false) . '\');" title="'
-                . htmlspecialchars($source) . '">' . htmlspecialchars($text) . '</dfn>';
-        } else {
-            return htmlspecialchars($buffer);
-        }
-    }
-
-    /* ~~~~~~~~~~~~~~~~~~~~ Getters and Setters ~~~~~~~~~~~~~~~~~~~~ */
-
-    /**
-     * Gets the transformation name of the specific plugin
-     *
-     * @return string
-     */
-    public static function getName()
-    {
-        return "Date Format";
-    }
-}
diff --git a/#pma/libraries/plugins/transformations/abs/DownloadTransformationsPlugin.php b/#pma/libraries/plugins/transformations/abs/DownloadTransformationsPlugin.php
deleted file mode 100644
index 51525749..00000000
--- a/#pma/libraries/plugins/transformations/abs/DownloadTransformationsPlugin.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Abstract class for the download transformations plugins
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage Download
- */
-namespace PMA\libraries\plugins\transformations\abs;
-
-use PMA\libraries\plugins\TransformationsPlugin;
-
-/**
- * Provides common methods for all of the download transformations plugins.
- *
- * @package PhpMyAdmin
- */
-abstract class DownloadTransformationsPlugin extends TransformationsPlugin
-{
-    /**
-     * Gets the transformation description of the specific plugin
-     *
-     * @return string
-     */
-    public static function getInfo()
-    {
-        return __(
-            'Displays a link to download the binary data of the column. You can'
-            . ' use the first option to specify the filename, or use the second'
-            . ' option as the name of a column which contains the filename. If'
-            . ' you use the second option, you need to set the first option to'
-            . ' the empty string.'
-        );
-    }
-
-    /**
-     * Does the actual work of each specific transformations plugin.
-     *
-     * @param string $buffer  text to be transformed
-     * @param array  $options transformation options
-     * @param string $meta    meta information
-     *
-     * @return string
-     */
-    public function applyTransformation($buffer, $options = array(), $meta = '')
-    {
-        global $row, $fields_meta;
-
-        if (isset($options[0]) && !empty($options[0])) {
-            $cn = $options[0]; // filename
-        } else {
-            if (isset($options[1]) && !empty($options[1])) {
-                foreach ($fields_meta as $key => $val) {
-                    if ($val->name == $options[1]) {
-                        $pos = $key;
-                        break;
-                    }
-                }
-                if (isset($pos)) {
-                    $cn = $row[$pos];
-                }
-            }
-            if (empty($cn)) {
-                $cn = 'binary_file.dat';
-            }
-        }
-
-        return sprintf(
-            '<a href="transformation_wrapper.php%s&amp;ct=application'
-            . '/octet-stream&amp;cn=%s" title="%s" class="disableAjax">%s</a>',
-            $options['wrapper_link'],
-            htmlspecialchars(urlencode($cn)),
-            htmlspecialchars($cn),
-            htmlspecialchars($cn)
-        );
-    }
-
-
-    /* ~~~~~~~~~~~~~~~~~~~~ Getters and Setters ~~~~~~~~~~~~~~~~~~~~ */
-
-    /**
-     * Gets the transformation name of the specific plugin
-     *
-     * @return string
-     */
-    public static function getName()
-    {
-        return "Download";
-    }
-}
diff --git a/#pma/libraries/plugins/transformations/abs/ExternalTransformationsPlugin.php b/#pma/libraries/plugins/transformations/abs/ExternalTransformationsPlugin.php
deleted file mode 100644
index ae618ce0..00000000
--- a/#pma/libraries/plugins/transformations/abs/ExternalTransformationsPlugin.php
+++ /dev/null
@@ -1,150 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Abstract class for the external transformations plugins
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage External
- */
-namespace PMA\libraries\plugins\transformations\abs;
-
-use PMA\libraries\plugins\TransformationsPlugin;
-
-/**
- * Provides common methods for all of the external transformations plugins.
- *
- * @package PhpMyAdmin
- */
-abstract class ExternalTransformationsPlugin extends TransformationsPlugin
-{
-    /**
-     * Gets the transformation description of the specific plugin
-     *
-     * @return string
-     */
-    public static function getInfo()
-    {
-        return __(
-            'LINUX ONLY: Launches an external application and feeds it the column'
-            . ' data via standard input. Returns the standard output of the'
-            . ' application. The default is Tidy, to pretty-print HTML code.'
-            . ' For security reasons, you have to manually edit the file'
-            . ' libraries/plugins/transformations/output/Text_Plain_External'
-            . '.php and list the tools you want to make available.'
-            . ' The first option is then the number of the program you want to'
-            . ' use and the second option is the parameters for the program.'
-            . ' The third option, if set to 1, will convert the output using'
-            . ' htmlspecialchars() (Default 1). The fourth option, if set to 1,'
-            . ' will prevent wrapping and ensure that the output appears all on'
-            . ' one line (Default 1).'
-        );
-    }
-
-    /**
-     * Enables no-wrapping
-     *
-     * @param array $options transformation options
-     *
-     * @return bool
-     */
-    public function applyTransformationNoWrap($options = array())
-    {
-        if (!isset($options[3]) || $options[3] == '') {
-            $nowrap = true;
-        } elseif ($options[3] == '1' || $options[3] == 1) {
-            $nowrap = true;
-        } else {
-            $nowrap = false;
-        }
-
-        return $nowrap;
-    }
-
-    /**
-     * Does the actual work of each specific transformations plugin.
-     *
-     * @param string $buffer  text to be transformed
-     * @param array  $options transformation options
-     * @param string $meta    meta information
-     *
-     * @return string
-     */
-    public function applyTransformation($buffer, $options = array(), $meta = '')
-    {
-        // possibly use a global transform and feed it with special options
-
-        // further operations on $buffer using the $options[] array.
-
-        $allowed_programs = array();
-
-        //
-        // WARNING:
-        //
-        // It's up to administrator to allow anything here. Note that users may
-        // specify any parameters, so when programs allow output redirection or
-        // any other possibly dangerous operations, you should write wrapper
-        // script that will publish only functions you really want.
-        //
-        // Add here program definitions like (note that these are NOT safe
-        // programs):
-        //
-        //$allowed_programs[0] = '/usr/local/bin/tidy';
-        //$allowed_programs[1] = '/usr/local/bin/validate';
-
-        // no-op when no allowed programs
-        if (count($allowed_programs) == 0) {
-            return $buffer;
-        }
-
-        $options = $this->getOptions(
-            $options,
-            array(0, '-f /dev/null -i -wrap -q', 1, 1)
-        );
-
-        if (isset($allowed_programs[$options[0]])) {
-            $program = $allowed_programs[$options[0]];
-        } else {
-            $program = $allowed_programs[0];
-        }
-
-        // needs PHP >= 4.3.0
-        $newstring = '';
-        $descriptorspec = array(
-            0 => array("pipe", "r"),
-            1 => array("pipe", "w"),
-        );
-        $process = proc_open($program . ' ' . $options[1], $descriptorspec, $pipes);
-        if (is_resource($process)) {
-            fwrite($pipes[0], $buffer);
-            fclose($pipes[0]);
-
-            while (!feof($pipes[1])) {
-                $newstring .= fgets($pipes[1], 1024);
-            }
-            fclose($pipes[1]);
-            // we don't currently use the return value
-            proc_close($process);
-        }
-
-        if ($options[2] == 1 || $options[2] == '2') {
-            $retstring = htmlspecialchars($newstring);
-        } else {
-            $retstring = $newstring;
-        }
-
-        return $retstring;
-    }
-
-
-    /* ~~~~~~~~~~~~~~~~~~~~ Getters and Setters ~~~~~~~~~~~~~~~~~~~~ */
-
-    /**
-     * Gets the transformation name of the specific plugin
-     *
-     * @return string
-     */
-    public static function getName()
-    {
-        return "External";
-    }
-}
diff --git a/#pma/libraries/plugins/transformations/abs/FormattedTransformationsPlugin.php b/#pma/libraries/plugins/transformations/abs/FormattedTransformationsPlugin.php
deleted file mode 100644
index d71842af..00000000
--- a/#pma/libraries/plugins/transformations/abs/FormattedTransformationsPlugin.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Abstract class for the formatted transformations plugins
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage Formatted
- */
-namespace PMA\libraries\plugins\transformations\abs;
-
-use PMA\libraries\plugins\TransformationsPlugin;
-
-/**
- * Provides common methods for all of the formatted transformations plugins.
- *
- * @package PhpMyAdmin
- */
-abstract class FormattedTransformationsPlugin extends TransformationsPlugin
-{
-    /**
-     * Gets the transformation description of the specific plugin
-     *
-     * @return string
-     */
-    public static function getInfo()
-    {
-        return __(
-            'Displays the contents of the column as-is, without running it'
-            . ' through htmlspecialchars(). That is, the column is assumed'
-            . ' to contain valid HTML.'
-        );
-    }
-
-    /**
-     * Does the actual work of each specific transformations plugin.
-     *
-     * @param string $buffer  text to be transformed
-     * @param array  $options transformation options
-     * @param string $meta    meta information
-     *
-     * @return string
-     */
-    public function applyTransformation($buffer, $options = array(), $meta = '')
-    {
-        return '<iframe srcdoc="'
-            . strtr($buffer, '"', '\'')
-            . '" sandbox=""></iframe>';
-    }
-
-
-    /* ~~~~~~~~~~~~~~~~~~~~ Getters and Setters ~~~~~~~~~~~~~~~~~~~~ */
-
-    /**
-     * Gets the transformation name of the specific plugin
-     *
-     * @return string
-     */
-    public static function getName()
-    {
-        return "Formatted";
-    }
-}
diff --git a/#pma/libraries/plugins/transformations/abs/HexTransformationsPlugin.php b/#pma/libraries/plugins/transformations/abs/HexTransformationsPlugin.php
deleted file mode 100644
index f2bab93f..00000000
--- a/#pma/libraries/plugins/transformations/abs/HexTransformationsPlugin.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Abstract class for the hex transformations plugins
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage Hex
- */
-namespace PMA\libraries\plugins\transformations\abs;
-
-use PMA\libraries\plugins\TransformationsPlugin;
-
-/**
- * Provides common methods for all of the hex transformations plugins.
- *
- * @package PhpMyAdmin
- */
-abstract class HexTransformationsPlugin extends TransformationsPlugin
-{
-    /**
-     * Gets the transformation description of the specific plugin
-     *
-     * @return string
-     */
-    public static function getInfo()
-    {
-        return __(
-            'Displays hexadecimal representation of data. Optional first'
-            . ' parameter specifies how often space will be added (defaults'
-            . ' to 2 nibbles).'
-        );
-    }
-
-    /**
-     * Does the actual work of each specific transformations plugin.
-     *
-     * @param string $buffer  text to be transformed
-     * @param array  $options transformation options
-     * @param string $meta    meta information
-     *
-     * @return string
-     */
-    public function applyTransformation($buffer, $options = array(), $meta = '')
-    {
-        // possibly use a global transform and feed it with special options
-        $options = $this->getOptions($options, array('2'));
-        $options[0] = intval($options[0]);
-
-        if ($options[0] < 1) {
-            return bin2hex($buffer);
-        } else {
-            return chunk_split(bin2hex($buffer), $options[0], ' ');
-        }
-    }
-
-    /* ~~~~~~~~~~~~~~~~~~~~ Getters and Setters ~~~~~~~~~~~~~~~~~~~~ */
-
-    /**
-     * Gets the transformation name of the specific plugin
-     *
-     * @return string
-     */
-    public static function getName()
-    {
-        return "Hex";
-    }
-}
diff --git a/#pma/libraries/plugins/transformations/abs/ImageLinkTransformationsPlugin.php b/#pma/libraries/plugins/transformations/abs/ImageLinkTransformationsPlugin.php
deleted file mode 100644
index 429b5cfd..00000000
--- a/#pma/libraries/plugins/transformations/abs/ImageLinkTransformationsPlugin.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Abstract class for the link transformations plugins
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage Link
- */
-namespace PMA\libraries\plugins\transformations\abs;
-
-use PMA\libraries\plugins\TransformationsPlugin;
-
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
-/* For PMA_Transformation_globalHtmlReplace */
-require_once 'libraries/transformations.lib.php';
-
-/**
- * Provides common methods for all of the link transformations plugins.
- *
- * @package PhpMyAdmin
- */
-abstract class ImageLinkTransformationsPlugin extends TransformationsPlugin
-{
-    /**
-     * Gets the transformation description of the specific plugin
-     *
-     * @return string
-     */
-    public static function getInfo()
-    {
-        return __(
-            'Displays a link to download this image.'
-        );
-    }
-
-    /**
-     * Does the actual work of each specific transformations plugin.
-     *
-     * @param string $buffer  text to be transformed
-     * @param array  $options transformation options
-     * @param string $meta    meta information
-     *
-     * @return string
-     */
-    public function applyTransformation($buffer, $options = array(), $meta = '')
-    {
-        // must disable the page loader, see
-        // https://wiki.phpmyadmin.net/pma/Page_loader#Bypassing_the_page_loader
-        return '<a class="disableAjax" target="_blank" rel="noopener noreferrer" href="transformation_wrapper.php'
-            . $options['wrapper_link'] . '" alt="[' . htmlspecialchars($buffer) . ']">[BLOB]</a>';
-    }
-
-    /* ~~~~~~~~~~~~~~~~~~~~ Getters and Setters ~~~~~~~~~~~~~~~~~~~~ */
-
-    /**
-     * Gets the transformation name of the specific plugin
-     *
-     * @return string
-     */
-    public static function getName()
-    {
-        return "ImageLink";
-    }
-}
diff --git a/#pma/libraries/plugins/transformations/abs/ImageUploadTransformationsPlugin.php b/#pma/libraries/plugins/transformations/abs/ImageUploadTransformationsPlugin.php
deleted file mode 100644
index 44638161..00000000
--- a/#pma/libraries/plugins/transformations/abs/ImageUploadTransformationsPlugin.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Abstract class for the image upload input transformations plugins
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage ImageUpload
- */
-namespace PMA\libraries\plugins\transformations\abs;
-
-use PMA\libraries\plugins\IOTransformationsPlugin;
-
-/**
- * Provides common methods for all of the image upload transformations plugins.
- *
- * @package PhpMyAdmin
- */
-abstract class ImageUploadTransformationsPlugin extends IOTransformationsPlugin
-{
-    /**
-     * Gets the transformation description of the specific plugin
-     *
-     * @return string
-     */
-    public static function getInfo()
-    {
-        return __(
-            'Image upload functionality which also displays a thumbnail.'
-            . ' The options are the width and height of the thumbnail'
-            . ' in pixels. Defaults to 100 X 100.'
-        );
-    }
-
-    /**
-     * Does the actual work of each specific transformations plugin.
-     *
-     * @param string $buffer  text to be transformed
-     * @param array  $options transformation options
-     * @param string $meta    meta information
-     *
-     * @return string
-     */
-    public function applyTransformation($buffer, $options = array(), $meta = '')
-    {
-        return $buffer;
-    }
-
-    /**
-     * Returns the html for input field to override default textarea.
-     * Note: Return empty string if default textarea is required.
-     *
-     * @param array  $column               column details
-     * @param int    $row_id               row number
-     * @param string $column_name_appendix the name attribute
-     * @param array  $options              transformation options
-     * @param string $value                Current field value
-     * @param string $text_dir             text direction
-     * @param int    $tabindex             tab index
-     * @param int    $tabindex_for_value   offset for the values tabindex
-     * @param int    $idindex              id index
-     *
-     * @return string the html for input field
-     */
-    public function getInputHtml(
-        $column,
-        $row_id,
-        $column_name_appendix,
-        $options,
-        $value,
-        $text_dir,
-        $tabindex,
-        $tabindex_for_value,
-        $idindex
-    ) {
-        $html = '';
-        $src = '';
-        if (!empty($value)) {
-            $html = '<input type="hidden" name="fields_prev' . $column_name_appendix
-                . '" value="' . bin2hex($value) . '"/>';
-            $html .= '<input type="hidden" name="fields' . $column_name_appendix
-                . '" value="' . bin2hex($value) . '"/>';
-            $src = 'transformation_wrapper.php' . $options['wrapper_link'];
-        }
-        $html .= '<img src="' . $src . '" width="'
-            . (isset($options[0]) ? intval($options[0]) : '100') . '" height="'
-            . (isset($options[1]) ? intval($options[1]) : '100') . '" alt="'
-            . __('Image preview here') . '"/>';
-        $html .= '<br/><input type="file" name="fields_upload'
-            . $column_name_appendix . '" accept="image/*" class="image-upload"/>';
-
-        return $html;
-    }
-
-    /**
-     * Returns the array of scripts (filename) required for plugin
-     * initialization and handling
-     *
-     * @return array javascripts to be included
-     */
-    public function getScripts()
-    {
-        return array(
-            'transformations/image_upload.js',
-        );
-    }
-
-    /* ~~~~~~~~~~~~~~~~~~~~ Getters and Setters ~~~~~~~~~~~~~~~~~~~~ */
-
-    /**
-     * Gets the transformation name of the specific plugin
-     *
-     * @return string
-     */
-    public static function getName()
-    {
-        return "Image upload";
-    }
-}
diff --git a/#pma/libraries/plugins/transformations/abs/InlineTransformationsPlugin.php b/#pma/libraries/plugins/transformations/abs/InlineTransformationsPlugin.php
deleted file mode 100644
index ac9134a3..00000000
--- a/#pma/libraries/plugins/transformations/abs/InlineTransformationsPlugin.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Abstract class for the inline transformations plugins
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage Inline
- */
-namespace PMA\libraries\plugins\transformations\abs;
-
-use PMA\libraries\plugins\TransformationsPlugin;
-
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
-/* For PMA_Transformation_globalHtmlReplace */
-require_once 'libraries/transformations.lib.php';
-
-/**
- * Provides common methods for all of the inline transformations plugins.
- *
- * @package PhpMyAdmin
- */
-abstract class InlineTransformationsPlugin extends TransformationsPlugin
-{
-    /**
-     * Gets the transformation description of the specific plugin
-     *
-     * @return string
-     */
-    public static function getInfo()
-    {
-        return __(
-            'Displays a clickable thumbnail. The options are the maximum width'
-            . ' and height in pixels. The original aspect ratio is preserved.'
-        );
-    }
-
-    /**
-     * Does the actual work of each specific transformations plugin.
-     *
-     * @param string $buffer  text to be transformed
-     * @param array  $options transformation options
-     * @param string $meta    meta information
-     *
-     * @return string
-     */
-    public function applyTransformation($buffer, $options = array(), $meta = '')
-    {
-        if (PMA_IS_GD2) {
-            return '<a href="transformation_wrapper.php'
-                . $options['wrapper_link']
-                . '" rel="noopener noreferrer" target="_blank"><img src="transformation_wrapper.php'
-                . $options['wrapper_link'] . '&amp;resize=jpeg&amp;newWidth='
-                . (isset($options[0]) ? intval($options[0]) : '100') . '&amp;newHeight='
-                . (isset($options[1]) ? intval($options[1]) : 100)
-                . '" alt="[' . htmlspecialchars($buffer) . ']" border="0" /></a>';
-        } else {
-            return '<img src="transformation_wrapper.php'
-                . $options['wrapper_link']
-                . '" alt="[' . htmlspecialchars($buffer) . ']" width="320" height="240" />';
-        }
-    }
-
-
-
-    /* ~~~~~~~~~~~~~~~~~~~~ Getters and Setters ~~~~~~~~~~~~~~~~~~~~ */
-
-    /**
-     * Gets the transformation name of the specific plugin
-     *
-     * @return string
-     */
-    public static function getName()
-    {
-        return "Inline";
-    }
-}
diff --git a/#pma/libraries/plugins/transformations/abs/LongToIPv4TransformationsPlugin.php b/#pma/libraries/plugins/transformations/abs/LongToIPv4TransformationsPlugin.php
deleted file mode 100644
index 234a4925..00000000
--- a/#pma/libraries/plugins/transformations/abs/LongToIPv4TransformationsPlugin.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Abstract class for the long to IPv4 transformations plugins
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage LongToIPv4
- */
-namespace PMA\libraries\plugins\transformations\abs;
-
-use PMA\libraries\plugins\TransformationsPlugin;
-
-/**
- * Provides common methods for all of the long to IPv4 transformations plugins.
- *
- * @package PhpMyAdmin
- */
-abstract class LongToIPv4TransformationsPlugin extends TransformationsPlugin
-{
-    /**
-     * Gets the transformation description of the specific plugin
-     *
-     * @return string
-     */
-    public static function getInfo()
-    {
-        return __(
-            'Converts an (IPv4) Internet network address stored as a BIGINT'
-            . ' into a string in Internet standard dotted format.'
-        );
-    }
-
-    /**
-     * Does the actual work of each specific transformations plugin.
-     *
-     * @param string $buffer  text to be transformed
-     * @param array  $options transformation options
-     * @param string $meta    meta information
-     *
-     * @return string
-     */
-    public function applyTransformation($buffer, $options = array(), $meta = '')
-    {
-        if ($buffer < 0 || $buffer > 4294967295) {
-            return htmlspecialchars($buffer);
-        }
-
-        return long2ip($buffer);
-    }
-
-
-    /* ~~~~~~~~~~~~~~~~~~~~ Getters and Setters ~~~~~~~~~~~~~~~~~~~~ */
-
-    /**
-     * Gets the transformation name of the specific plugin
-     *
-     * @return string
-     */
-    public static function getName()
-    {
-        return "Long To IPv4";
-    }
-}
diff --git a/#pma/libraries/plugins/transformations/abs/PreApPendTransformationsPlugin.php b/#pma/libraries/plugins/transformations/abs/PreApPendTransformationsPlugin.php
deleted file mode 100644
index 7247ce13..00000000
--- a/#pma/libraries/plugins/transformations/abs/PreApPendTransformationsPlugin.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Abstract class for the prepend/append transformations plugins
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage PreApPend
- */
-namespace PMA\libraries\plugins\transformations\abs;
-
-use PMA\libraries\plugins\TransformationsPlugin;
-
-/**
- * Provides common methods for all of the prepend/append transformations plugins.
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage PreApPend
- */
-abstract class PreApPendTransformationsPlugin extends TransformationsPlugin
-{
-    /**
-     * Gets the transformation description of the specific plugin
-     *
-     * @return string
-     */
-    public static function getInfo()
-    {
-        return __(
-            'Prepends and/or Appends text to a string. First option is text'
-            . ' to be prepended, second is appended (enclosed in single'
-            . ' quotes, default empty string).'
-        );
-    }
-
-    /**
-     * Does the actual work of each specific transformations plugin.
-     *
-     * @param string $buffer  text to be transformed
-     * @param array  $options transformation options
-     * @param string $meta    meta information
-     *
-     * @return string
-     */
-    public function applyTransformation($buffer, $options = array(), $meta = '')
-    {
-        $options = $this->getOptions($options, array('', ''));
-
-        //just prepend and/or append the options to the original text
-        return htmlspecialchars($options[0]) . htmlspecialchars($buffer)
-            . htmlspecialchars($options[1]);
-    }
-
-    /* ~~~~~~~~~~~~~~~~~~~~ Getters and Setters ~~~~~~~~~~~~~~~~~~~~ */
-
-    /**
-     * Gets the transformation name of the specific plugin
-     *
-     * @return string
-     */
-    public static function getName()
-    {
-        return "PreApPend";
-    }
-}
diff --git a/#pma/libraries/plugins/transformations/abs/RegexValidationTransformationsPlugin.php b/#pma/libraries/plugins/transformations/abs/RegexValidationTransformationsPlugin.php
deleted file mode 100644
index caf54039..00000000
--- a/#pma/libraries/plugins/transformations/abs/RegexValidationTransformationsPlugin.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Abstract class for the regex validation input transformations plugins
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage RegexValidation
- */
-namespace PMA\libraries\plugins\transformations\abs;
-
-use PMA\libraries\plugins\IOTransformationsPlugin;
-
-/**
- * Provides common methods for all of the regex validation
- * input transformations plugins.
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage RegexValidation
- */
-abstract class RegexValidationTransformationsPlugin extends IOTransformationsPlugin
-{
-    /**
-     * Gets the transformation description of the specific plugin
-     *
-     * @return string
-     */
-    public static function getInfo()
-    {
-        return __(
-            'Validates the string using regular expression '
-            . 'and performs insert only if string matches it. '
-            . 'The first option is the Regular Expression.'
-        );
-    }
-
-    /**
-     * Does the actual work of each specific transformations plugin.
-     *
-     * @param string $buffer  text to be transformed
-     * @param array  $options transformation options
-     * @param string $meta    meta information
-     *
-     * @return string
-     */
-    public function applyTransformation($buffer, $options = array(), $meta = '')
-    {
-        // reset properties of object
-        $this->reset();
-        if (!empty($options[0]) && !preg_match($options[0], $buffer)) {
-            $this->success = false;
-            $this->error = sprintf(
-                __('Validation failed for the input string %s.'),
-                htmlspecialchars($buffer)
-            );
-        }
-
-        return $buffer;
-    }
-
-    /* ~~~~~~~~~~~~~~~~~~~~ Getters and Setters ~~~~~~~~~~~~~~~~~~~~ */
-
-    /**
-     * Gets the transformation name of the specific plugin
-     *
-     * @return string
-     */
-    public static function getName()
-    {
-        return "Regex Validation";
-    }
-}
diff --git a/#pma/libraries/plugins/transformations/abs/SQLTransformationsPlugin.php b/#pma/libraries/plugins/transformations/abs/SQLTransformationsPlugin.php
deleted file mode 100644
index ae054e40..00000000
--- a/#pma/libraries/plugins/transformations/abs/SQLTransformationsPlugin.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Abstract class for the SQL transformations plugins
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage SQL
- */
-namespace PMA\libraries\plugins\transformations\abs;
-
-use PMA;
-use PMA\libraries\plugins\TransformationsPlugin;
-
-/**
- * Provides common methods for all of the SQL transformations plugins.
- *
- * @package PhpMyAdmin
- */
-abstract class SQLTransformationsPlugin extends TransformationsPlugin
-{
-    /**
-     * Gets the transformation description of the specific plugin
-     *
-     * @return string
-     */
-    public static function getInfo()
-    {
-        return __(
-            'Formats text as SQL query with syntax highlighting.'
-        );
-    }
-
-    /**
-     * Does the actual work of each specific transformations plugin.
-     *
-     * @param string $buffer  text to be transformed
-     * @param array  $options transformation options
-     * @param string $meta    meta information
-     *
-     * @return string
-     */
-    public function applyTransformation($buffer, $options = array(), $meta = '')
-    {
-        // see PMA_highlightSQL()
-        $result = PMA\libraries\Util::formatSql($buffer);
-
-        return $result;
-    }
-
-
-    /* ~~~~~~~~~~~~~~~~~~~~ Getters and Setters ~~~~~~~~~~~~~~~~~~~~ */
-
-    /**
-     * Gets the transformation name of the specific plugin
-     *
-     * @return string
-     */
-    public static function getName()
-    {
-        return "SQL";
-    }
-}
diff --git a/#pma/libraries/plugins/transformations/abs/SubstringTransformationsPlugin.php b/#pma/libraries/plugins/transformations/abs/SubstringTransformationsPlugin.php
deleted file mode 100644
index 57979d1c..00000000
--- a/#pma/libraries/plugins/transformations/abs/SubstringTransformationsPlugin.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Abstract class for the substring transformations plugins
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage Substring
- */
-namespace PMA\libraries\plugins\transformations\abs;
-
-use PMA\libraries\plugins\TransformationsPlugin;
-
-/**
- * Provides common methods for all of the substring transformations plugins.
- *
- * @package PhpMyAdmin
- */
-abstract class SubstringTransformationsPlugin extends TransformationsPlugin
-{
-    /**
-     * Gets the transformation description of the specific plugin
-     *
-     * @return string
-     */
-    public static function getInfo()
-    {
-        return __(
-            'Displays a part of a string. The first option is the number of'
-            . ' characters to skip from the beginning of the string (Default 0).'
-            . ' The second option is the number of characters to return (Default:'
-            . ' until end of string). The third option is the string to append'
-            . ' and/or prepend when truncation occurs (Default: "…").'
-        );
-    }
-
-    /**
-     * Does the actual work of each specific transformations plugin.
-     *
-     * @param string $buffer  text to be transformed
-     * @param array  $options transformation options
-     * @param string $meta    meta information
-     *
-     * @return string
-     */
-    public function applyTransformation($buffer, $options = array(), $meta = '')
-    {
-        // possibly use a global transform and feed it with special options
-
-        // further operations on $buffer using the $options[] array.
-        $options = $this->getOptions($options, array(0, 'all', '…'));
-
-        if ($options[1] != 'all') {
-            $newtext = mb_substr(
-                $buffer,
-                $options[0],
-                $options[1]
-            );
-        } else {
-            $newtext = mb_substr($buffer, $options[0]);
-        }
-
-        $length = mb_strlen($newtext);
-        $baselength = mb_strlen($buffer);
-        if ($length != $baselength) {
-            if ($options[0] != 0) {
-                $newtext = $options[2] . $newtext;
-            }
-
-            if (($length + $options[0]) != $baselength) {
-                $newtext .= $options[2];
-            }
-        }
-
-        return htmlspecialchars($newtext);
-    }
-
-
-    /* ~~~~~~~~~~~~~~~~~~~~ Getters and Setters ~~~~~~~~~~~~~~~~~~~~ */
-
-    /**
-     * Gets the transformation name of the specific plugin
-     *
-     * @return string
-     */
-    public static function getName()
-    {
-        return "Substring";
-    }
-}
diff --git a/#pma/libraries/plugins/transformations/abs/TextFileUploadTransformationsPlugin.php b/#pma/libraries/plugins/transformations/abs/TextFileUploadTransformationsPlugin.php
deleted file mode 100644
index 41142437..00000000
--- a/#pma/libraries/plugins/transformations/abs/TextFileUploadTransformationsPlugin.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Abstract class for the text file upload input transformations plugins
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage TextFileUpload
- */
-namespace PMA\libraries\plugins\transformations\abs;
-
-use PMA\libraries\plugins\IOTransformationsPlugin;
-
-/**
- * Provides common methods for all of the text file upload
- * input transformations plugins.
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage TextFileUpload
- */
-abstract class TextFileUploadTransformationsPlugin extends IOTransformationsPlugin
-{
-    /**
-     * Gets the transformation description of the specific plugin
-     *
-     * @return string
-     */
-    public static function getInfo()
-    {
-        return __(
-            'File upload functionality for TEXT columns. '
-            . 'It does not have a textarea for input.'
-        );
-    }
-
-    /**
-     * Does the actual work of each specific transformations plugin.
-     *
-     * @param string $buffer  text to be transformed
-     * @param array  $options transformation options
-     * @param string $meta    meta information
-     *
-     * @return string
-     */
-    public function applyTransformation($buffer, $options = array(), $meta = '')
-    {
-        return $buffer;
-    }
-
-    /**
-     * Returns the html for input field to override default textarea.
-     * Note: Return empty string if default textarea is required.
-     *
-     * @param array  $column               column details
-     * @param int    $row_id               row number
-     * @param string $column_name_appendix the name attribute
-     * @param array  $options              transformation options
-     * @param string $value                Current field value
-     * @param string $text_dir             text direction
-     * @param int    $tabindex             tab index
-     * @param int    $tabindex_for_value   offset for the values tabindex
-     * @param int    $idindex              id index
-     *
-     * @return string the html for input field
-     */
-    public function getInputHtml(
-        $column,
-        $row_id,
-        $column_name_appendix,
-        $options,
-        $value,
-        $text_dir,
-        $tabindex,
-        $tabindex_for_value,
-        $idindex
-    ) {
-        $html = '';
-        if (!empty($value)) {
-            $html = '<input type="hidden" name="fields_prev' . $column_name_appendix
-                . '" value="' . htmlspecialchars($value) . '"/>';
-            $html .= '<input type="hidden" name="fields' . $column_name_appendix
-                . '" value="' . htmlspecialchars($value) . '"/>';
-        }
-        $html .= '<input type="file" name="fields_upload'
-            . $column_name_appendix . '"/>';
-
-        return $html;
-    }
-
-    /* ~~~~~~~~~~~~~~~~~~~~ Getters and Setters ~~~~~~~~~~~~~~~~~~~~ */
-
-    /**
-     * Gets the transformation name of the specific plugin
-     *
-     * @return string
-     */
-    public static function getName()
-    {
-        return "Text file upload";
-    }
-}
diff --git a/#pma/libraries/plugins/transformations/abs/TextImageLinkTransformationsPlugin.php b/#pma/libraries/plugins/transformations/abs/TextImageLinkTransformationsPlugin.php
deleted file mode 100644
index 219c70b9..00000000
--- a/#pma/libraries/plugins/transformations/abs/TextImageLinkTransformationsPlugin.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Abstract class for the image link transformations plugins
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage ImageLink
- */
-namespace PMA\libraries\plugins\transformations\abs;
-
-use PMA\libraries\plugins\TransformationsPlugin;
-
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
-/**
- * Provides common methods for all of the image link transformations plugins.
- *
- * @package PhpMyAdmin
- */
-abstract class TextImageLinkTransformationsPlugin extends TransformationsPlugin
-{
-    /**
-     * Gets the transformation description of the specific plugin
-     *
-     * @return string
-     */
-    public static function getInfo()
-    {
-        return __(
-            'Displays an image and a link; the column contains the filename. The'
-            . ' first option is a URL prefix like "https://www.example.com/". The'
-            . ' second and third options are the width and the height in pixels.'
-        );
-    }
-
-    /**
-     * Does the actual work of each specific transformations plugin.
-     *
-     * @param string $buffer  text to be transformed
-     * @param array  $options transformation options
-     * @param string $meta    meta information
-     *
-     * @return string
-     */
-    public function applyTransformation($buffer, $options = array(), $meta = '')
-    {
-        $url = (isset($options[0]) ? $options[0] : '') . $buffer;
-        /* Do not allow javascript links */
-        if (! PMA_checkLink($url, true, true)) {
-            return htmlspecialchars($url);
-        }
-        return '<a href="' . htmlspecialchars($url)
-            . '" rel="noopener noreferrer" target="_blank"><img src="' . htmlspecialchars($url)
-            . '" border="0" width="' . (isset($options[1]) ? intval($options[1]) : 100)
-            . '" height="' . (isset($options[2]) ? intval($options[2]) : 50) . '" />'
-            . htmlspecialchars($buffer) . '</a>';
-    }
-
-
-    /* ~~~~~~~~~~~~~~~~~~~~ Getters and Setters ~~~~~~~~~~~~~~~~~~~~ */
-
-    /**
-     * Gets the transformation name of the specific plugin
-     *
-     * @return string
-     */
-    public static function getName()
-    {
-        return "Image Link";
-    }
-}
diff --git a/#pma/libraries/plugins/transformations/abs/TextLinkTransformationsPlugin.php b/#pma/libraries/plugins/transformations/abs/TextLinkTransformationsPlugin.php
deleted file mode 100644
index ff92d406..00000000
--- a/#pma/libraries/plugins/transformations/abs/TextLinkTransformationsPlugin.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Abstract class for the link transformations plugins
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage Link
- */
-namespace PMA\libraries\plugins\transformations\abs;
-
-use PMA\libraries\plugins\TransformationsPlugin;
-
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
-/**
- * Provides common methods for all of the link transformations plugins.
- *
- * @package PhpMyAdmin
- */
-abstract class TextLinkTransformationsPlugin extends TransformationsPlugin
-{
-    /**
-     * Gets the transformation description of the specific plugin
-     *
-     * @return string
-     */
-    public static function getInfo()
-    {
-        return __(
-            'Displays a link; the column contains the filename. The first option'
-            . ' is a URL prefix like "https://www.example.com/". The second option'
-            . ' is a title for the link.'
-        );
-    }
-
-    /**
-     * Does the actual work of each specific transformations plugin.
-     *
-     * @param string $buffer  text to be transformed
-     * @param array  $options transformation options
-     * @param string $meta    meta information
-     *
-     * @return string
-     */
-    public function applyTransformation($buffer, $options = array(), $meta = '')
-    {
-        $url = (isset($options[0]) ? $options[0] : '') . ((isset($options[2]) && $options[2]) ? '' : $buffer);
-        /* Do not allow javascript links */
-        if (! PMA_checkLink($url, true, true)) {
-            return htmlspecialchars($url);
-        }
-        return '<a href="'
-            . htmlspecialchars($url)
-            . '" title="'
-            . htmlspecialchars(isset($options[1]) ? $options[1] : '')
-            . '" target="_blank" rel="noopener noreferrer">'
-            . htmlspecialchars(isset($options[1]) ? $options[1] : $buffer)
-            . '</a>';
-    }
-
-
-    /* ~~~~~~~~~~~~~~~~~~~~ Getters and Setters ~~~~~~~~~~~~~~~~~~~~ */
-
-    /**
-     * Gets the transformation name of the specific plugin
-     *
-     * @return string
-     */
-    public static function getName()
-    {
-        return "TextLink";
-    }
-}
diff --git a/#pma/libraries/plugins/transformations/input/Image_JPEG_Upload.php b/#pma/libraries/plugins/transformations/input/Image_JPEG_Upload.php
deleted file mode 100644
index 9f87cf4e..00000000
--- a/#pma/libraries/plugins/transformations/input/Image_JPEG_Upload.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Image JPEG Upload Input Transformations plugin for phpMyAdmin
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage ImageUpload
- */
-namespace PMA\libraries\plugins\transformations\input;
-
-use PMA\libraries\plugins\transformations\abs\ImageUploadTransformationsPlugin;
-
-/**
- * Handles the image upload input transformation for JPEG.
- * Has two option: width & height of the thumbnail
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage ImageUpload
- */
-class Image_JPEG_Upload extends ImageUploadTransformationsPlugin
-{
-    /**
-     * Gets the plugin`s MIME type
-     *
-     * @return string
-     */
-    public static function getMIMEType()
-    {
-        return "Image";
-    }
-
-    /**
-     * Gets the plugin`s MIME subtype
-     *
-     * @return string
-     */
-    public static function getMIMESubtype()
-    {
-        return "JPEG";
-    }
-}
diff --git a/#pma/libraries/plugins/transformations/input/Text_Plain_FileUpload.php b/#pma/libraries/plugins/transformations/input/Text_Plain_FileUpload.php
deleted file mode 100644
index a4fe6243..00000000
--- a/#pma/libraries/plugins/transformations/input/Text_Plain_FileUpload.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Text Plain File Upload Input Transformations plugin for phpMyAdmin
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage TextFileUpload
- */
-namespace PMA\libraries\plugins\transformations\input;
-
-use PMA\libraries\plugins\transformations\abs\TextFileUploadTransformationsPlugin;
-
-/**
- * Handles the input text file upload transformation for text plain.
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage TextFileUpload
- */
-class Text_Plain_FileUpload extends TextFileUploadTransformationsPlugin
-{
-    /**
-     * Gets the plugin`s MIME type
-     *
-     * @return string
-     */
-    public static function getMIMEType()
-    {
-        return "Text";
-    }
-
-    /**
-     * Gets the plugin`s MIME subtype
-     *
-     * @return string
-     */
-    public static function getMIMESubtype()
-    {
-        return "Plain";
-    }
-}
diff --git a/#pma/libraries/plugins/transformations/input/Text_Plain_Iptobinary.php b/#pma/libraries/plugins/transformations/input/Text_Plain_Iptobinary.php
deleted file mode 100644
index a490350a..00000000
--- a/#pma/libraries/plugins/transformations/input/Text_Plain_Iptobinary.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Handles the IPv4/IPv6 to binary transformation for text plain
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage IPToBinary
- */
-namespace PMA\libraries\plugins\transformations\input;
-
-use PMA\libraries\plugins\IOTransformationsPlugin;
-
-/**
- * Handles the IPv4/IPv6 to binary transformation for text plain
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage IPToBinary
- */
-class Text_Plain_Iptobinary extends IOTransformationsPlugin
-{
-    /**
-     * Gets the transformation description of the plugin
-     *
-     * @return string
-     */
-    public static function getInfo()
-    {
-        return __(
-            'Converts an Internet network address in (IPv4/IPv6) format to binary'
-        );
-    }
-
-    /**
-     * Does the actual work of each specific transformations plugin.
-     *
-     * @param string $buffer  text to be transformed. a binary string containing
-     *                        an IP address, as returned from MySQL's INET6_ATON
-     *                        function
-     * @param array  $options transformation options
-     * @param string $meta    meta information
-     *
-     * @return string IP address
-     */
-    public function applyTransformation($buffer, $options = array(), $meta = '')
-    {
-        $val = @inet_pton($buffer);
-        if ($val !== false) {
-            return $val;
-        }
-
-        return $buffer;
-    }
-
-    /**
-     * Returns the html for input field to override default textarea.
-     * Note: Return empty string if default textarea is required.
-     *
-     * @param array  $column               column details
-     * @param int    $row_id               row number
-     * @param string $column_name_appendix the name attribute
-     * @param array  $options              transformation options
-     * @param string $value                Current field value
-     * @param string $text_dir             text direction
-     * @param int    $tabindex             tab index
-     * @param int    $tabindex_for_value   offset for the values tabindex
-     * @param int    $idindex              id index
-     *
-     * @return string the html for input field
-     */
-    public function getInputHtml(
-        $column,
-        $row_id,
-        $column_name_appendix,
-        $options,
-        $value,
-        $text_dir,
-        $tabindex,
-        $tabindex_for_value,
-        $idindex
-    ) {
-        $html = '';
-        $val = '';
-        if (!empty($value)) {
-            $length = strlen($value);
-            if ($length == 4 || $length == 16) {
-                $ip = @inet_ntop(pack('A' . $length, $value));
-                if ($ip !== false) {
-                    $val = $ip;
-                }
-            }
-            $html = '<input type="hidden" name="fields_prev' . $column_name_appendix
-                . '" value="' . htmlspecialchars($val) . '"/>';
-        }
-        $class = 'transform_IPToBin';
-        $html .= '<input type="text" name="fields' . $column_name_appendix . '"'
-            . ' value="' . htmlspecialchars($val) . '"'
-            . ' size="40"'
-            . ' dir="' . $text_dir . '"'
-            . ' class="' . $class . '"'
-            . ' id="field_' . ($idindex) . '_3"'
-            . ' tabindex="' . ($tabindex + $tabindex_for_value) . '">'
-            . '</input>';
-
-        return $html;
-    }
-
-    /* ~~~~~~~~~~~~~~~~~~~~ Getters and Setters ~~~~~~~~~~~~~~~~~~~~ */
-
-    /**
-     * Gets the transformation name of the plugin
-     *
-     * @return string
-     */
-    public static function getName()
-    {
-        return "IPv4/IPv6 To Binary";
-    }
-
-    /**
-     * Gets the plugin`s MIME type
-     *
-     * @return string
-     */
-    public static function getMIMEType()
-    {
-        return "Text";
-    }
-
-    /**
-     * Gets the plugin`s MIME subtype
-     *
-     * @return string
-     */
-    public static function getMIMESubtype()
-    {
-        return "Plain";
-    }
-}
diff --git a/#pma/libraries/plugins/transformations/input/Text_Plain_JsonEditor.php b/#pma/libraries/plugins/transformations/input/Text_Plain_JsonEditor.php
deleted file mode 100644
index 6122c41f..00000000
--- a/#pma/libraries/plugins/transformations/input/Text_Plain_JsonEditor.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * JSON editing with syntax highlighted CodeMirror editor
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage JSON
- */
-namespace PMA\libraries\plugins\transformations\input;
-
-use PMA\libraries\plugins\transformations\abs\CodeMirrorEditorTransformationPlugin;
-
-/**
- * JSON editing with syntax highlighted CodeMirror editor
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage JSON
- */
-class Text_Plain_JsonEditor extends CodeMirrorEditorTransformationPlugin
-{
-    /**
-     * Gets the transformation description of the specific plugin
-     *
-     * @return string
-     */
-    public static function getInfo()
-    {
-        return __(
-            'Syntax highlighted CodeMirror editor for JSON.'
-        );
-    }
-
-    /**
-     * Returns the array of scripts (filename) required for plugin
-     * initialization and handling
-     *
-     * @return array javascripts to be included
-     */
-    public function getScripts()
-    {
-        $scripts = array();
-        if ($GLOBALS['cfg']['CodemirrorEnable']) {
-            $scripts[] = 'codemirror/lib/codemirror.js';
-            $scripts[] = 'codemirror/mode/javascript/javascript.js';
-            $scripts[] = 'transformations/json_editor.js';
-        }
-
-        return $scripts;
-    }
-
-    /* ~~~~~~~~~~~~~~~~~~~~ Getters and Setters ~~~~~~~~~~~~~~~~~~~~ */
-
-    /**
-     * Gets the transformation name of the specific plugin
-     *
-     * @return string
-     */
-    public static function getName()
-    {
-        return "JSON";
-    }
-
-    /**
-     * Gets the plugin`s MIME type
-     *
-     * @return string
-     */
-    public static function getMIMEType()
-    {
-        return "Text";
-    }
-
-    /**
-     * Gets the plugin`s MIME subtype
-     *
-     * @return string
-     */
-    public static function getMIMESubtype()
-    {
-        return "Plain";
-    }
-}
diff --git a/#pma/libraries/plugins/transformations/input/Text_Plain_RegexValidation.php b/#pma/libraries/plugins/transformations/input/Text_Plain_RegexValidation.php
deleted file mode 100644
index 5ea4f5fd..00000000
--- a/#pma/libraries/plugins/transformations/input/Text_Plain_RegexValidation.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Text Plain Regex Validation Input Transformations plugin for phpMyAdmin
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage RegexValidation
- */
-namespace PMA\libraries\plugins\transformations\input;
-
-use PMA\libraries\plugins\transformations\abs\RegexValidationTransformationsPlugin;
-
-/**
- * Handles the input regex validation transformation for text plain.
- * Has one option: the regular expression
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage RegexValidation
- */
-class Text_Plain_RegexValidation extends RegexValidationTransformationsPlugin
-{
-    /**
-     * Gets the plugin`s MIME type
-     *
-     * @return string
-     */
-    public static function getMIMEType()
-    {
-        return "Text";
-    }
-
-    /**
-     * Gets the plugin`s MIME subtype
-     *
-     * @return string
-     */
-    public static function getMIMESubtype()
-    {
-        return "Plain";
-    }
-}
diff --git a/#pma/libraries/plugins/transformations/input/Text_Plain_SqlEditor.php b/#pma/libraries/plugins/transformations/input/Text_Plain_SqlEditor.php
deleted file mode 100644
index dbee75e4..00000000
--- a/#pma/libraries/plugins/transformations/input/Text_Plain_SqlEditor.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * SQL editing with syntax highlighted CodeMirror editor
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage SQL
- */
-namespace PMA\libraries\plugins\transformations\input;
-
-use PMA\libraries\plugins\transformations\abs\CodeMirrorEditorTransformationPlugin;
-
-/**
- * SQL editing with syntax highlighted CodeMirror editor
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage SQL
- */
-class Text_Plain_SqlEditor extends CodeMirrorEditorTransformationPlugin
-{
-    /**
-     * Gets the transformation description of the specific plugin
-     *
-     * @return string
-     */
-    public static function getInfo()
-    {
-        return __(
-            'Syntax highlighted CodeMirror editor for SQL.'
-        );
-    }
-
-    /**
-     * Returns the array of scripts (filename) required for plugin
-     * initialization and handling
-     *
-     * @return array javascripts to be included
-     */
-    public function getScripts()
-    {
-        $scripts = array();
-        if ($GLOBALS['cfg']['CodemirrorEnable']) {
-            $scripts[] = 'codemirror/lib/codemirror.js';
-            $scripts[] = 'codemirror/mode/sql/sql.js';
-            $scripts[] = 'transformations/sql_editor.js';
-        }
-
-        return $scripts;
-    }
-
-    /* ~~~~~~~~~~~~~~~~~~~~ Getters and Setters ~~~~~~~~~~~~~~~~~~~~ */
-
-    /**
-     * Gets the transformation name of the specific plugin
-     *
-     * @return string
-     */
-    public static function getName()
-    {
-        return "SQL";
-    }
-
-    /**
-     * Gets the plugin`s MIME type
-     *
-     * @return string
-     */
-    public static function getMIMEType()
-    {
-        return "Text";
-    }
-
-    /**
-     * Gets the plugin`s MIME subtype
-     *
-     * @return string
-     */
-    public static function getMIMESubtype()
-    {
-        return "Plain";
-    }
-}
diff --git a/#pma/libraries/plugins/transformations/input/Text_Plain_XmlEditor.php b/#pma/libraries/plugins/transformations/input/Text_Plain_XmlEditor.php
deleted file mode 100644
index b0b407a4..00000000
--- a/#pma/libraries/plugins/transformations/input/Text_Plain_XmlEditor.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * XML (and HTML) editing with syntax highlighted CodeMirror editor
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage XML
- */
-namespace PMA\libraries\plugins\transformations\input;
-
-use PMA\libraries\plugins\transformations\abs\CodeMirrorEditorTransformationPlugin;
-
-/**
- * XML (and HTML) editing with syntax highlighted CodeMirror editor
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage XML
- */
-class Text_Plain_XmlEditor extends CodeMirrorEditorTransformationPlugin
-{
-    /**
-     * Gets the transformation description of the specific plugin
-     *
-     * @return string
-     */
-    public static function getInfo()
-    {
-        return __(
-            'Syntax highlighted CodeMirror editor for XML (and HTML).'
-        );
-    }
-
-    /**
-     * Returns the array of scripts (filename) required for plugin
-     * initialization and handling
-     *
-     * @return array javascripts to be included
-     */
-    public function getScripts()
-    {
-        $scripts = array();
-        if ($GLOBALS['cfg']['CodemirrorEnable']) {
-            $scripts[] = 'codemirror/lib/codemirror.js';
-            $scripts[] = 'codemirror/mode/xml/xml.js';
-            $scripts[] = 'transformations/xml_editor.js';
-        }
-
-        return $scripts;
-    }
-
-    /* ~~~~~~~~~~~~~~~~~~~~ Getters and Setters ~~~~~~~~~~~~~~~~~~~~ */
-
-    /**
-     * Gets the transformation name of the specific plugin
-     *
-     * @return string
-     */
-    public static function getName()
-    {
-        return "XML";
-    }
-
-    /**
-     * Gets the plugin`s MIME type
-     *
-     * @return string
-     */
-    public static function getMIMEType()
-    {
-        return "Text";
-    }
-
-    /**
-     * Gets the plugin`s MIME subtype
-     *
-     * @return string
-     */
-    public static function getMIMESubtype()
-    {
-        return "Plain";
-    }
-}
diff --git a/#pma/libraries/plugins/transformations/output/Application_Octetstream_Download.php b/#pma/libraries/plugins/transformations/output/Application_Octetstream_Download.php
deleted file mode 100644
index 3f175d21..00000000
--- a/#pma/libraries/plugins/transformations/output/Application_Octetstream_Download.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Application OctetStream Download Transformations plugin for phpMyAdmin
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage Download
- */
-namespace PMA\libraries\plugins\transformations\output;
-
-use PMA\libraries\plugins\transformations\abs\DownloadTransformationsPlugin;
-
-/**
- * Handles the download transformation for application octetstream
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage Download
- */
-class Application_Octetstream_Download extends DownloadTransformationsPlugin
-{
-    /**
-     * Gets the plugin`s MIME type
-     *
-     * @return string
-     */
-    public static function getMIMEType()
-    {
-        return "Application";
-    }
-
-    /**
-     * Gets the plugin`s MIME subtype
-     *
-     * @return string
-     */
-    public static function getMIMESubtype()
-    {
-        return "OctetStream";
-    }
-}
diff --git a/#pma/libraries/plugins/transformations/output/Application_Octetstream_Hex.php b/#pma/libraries/plugins/transformations/output/Application_Octetstream_Hex.php
deleted file mode 100644
index 6f990d73..00000000
--- a/#pma/libraries/plugins/transformations/output/Application_Octetstream_Hex.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Application OctetStream Hex Transformations plugin for phpMyAdmin
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage Hex
- */
-namespace PMA\libraries\plugins\transformations\output;
-
-use PMA\libraries\plugins\transformations\abs\HexTransformationsPlugin;
-
-/**
- * Handles the hex transformation for application octetstream
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage Hex
- */
-class Application_Octetstream_Hex extends HexTransformationsPlugin
-{
-    /**
-     * Gets the plugin`s MIME type
-     *
-     * @return string
-     */
-    public static function getMIMEType()
-    {
-        return "Application";
-    }
-
-    /**
-     * Gets the plugin`s MIME subtype
-     *
-     * @return string
-     */
-    public static function getMIMESubtype()
-    {
-        return "OctetStream";
-    }
-}
diff --git a/#pma/libraries/plugins/transformations/output/Image_JPEG_Inline.php b/#pma/libraries/plugins/transformations/output/Image_JPEG_Inline.php
deleted file mode 100644
index eb0aa9c4..00000000
--- a/#pma/libraries/plugins/transformations/output/Image_JPEG_Inline.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Image JPEG Inline Transformations plugin for phpMyAdmin
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage Inline
- */
-namespace PMA\libraries\plugins\transformations\output;
-
-use PMA\libraries\plugins\transformations\abs\InlineTransformationsPlugin;
-
-/**
- * Handles the inline transformation for image jpeg
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage Inline
- */
-class Image_JPEG_Inline extends InlineTransformationsPlugin
-{
-    /**
-     * Gets the plugin`s MIME type
-     *
-     * @return string
-     */
-    public static function getMIMEType()
-    {
-        return "Image";
-    }
-
-    /**
-     * Gets the plugin`s MIME subtype
-     *
-     * @return string
-     */
-    public static function getMIMESubtype()
-    {
-        return "JPEG";
-    }
-}
diff --git a/#pma/libraries/plugins/transformations/output/Image_JPEG_Link.php b/#pma/libraries/plugins/transformations/output/Image_JPEG_Link.php
deleted file mode 100644
index 27beb8c6..00000000
--- a/#pma/libraries/plugins/transformations/output/Image_JPEG_Link.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Image JPEG Link Transformations plugin for phpMyAdmin
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage Link
- */
-namespace PMA\libraries\plugins\transformations\output;
-
-use PMA\libraries\plugins\transformations\abs\ImageLinkTransformationsPlugin;
-
-/**
- * Handles the link transformation for image jpeg
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage Link
- */
-class Image_JPEG_Link extends ImageLinkTransformationsPlugin
-{
-    /**
-     * Gets the plugin`s MIME type
-     *
-     * @return string
-     */
-    public static function getMIMEType()
-    {
-        return "Image";
-    }
-
-    /**
-     * Gets the plugin`s MIME subtype
-     *
-     * @return string
-     */
-    public static function getMIMESubtype()
-    {
-        return "JPEG";
-    }
-}
diff --git a/#pma/libraries/plugins/transformations/output/Image_PNG_Inline.php b/#pma/libraries/plugins/transformations/output/Image_PNG_Inline.php
deleted file mode 100644
index 2f5d4252..00000000
--- a/#pma/libraries/plugins/transformations/output/Image_PNG_Inline.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Image PNG Inline Transformations plugin for phpMyAdmin
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage Inline
- */
-namespace PMA\libraries\plugins\transformations\output;
-
-use PMA\libraries\plugins\transformations\abs\InlineTransformationsPlugin;
-
-/**
- * Handles the inline transformation for image png
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage Inline
- */
-class Image_PNG_Inline extends InlineTransformationsPlugin
-{
-    /**
-     * Gets the plugin`s MIME type
-     *
-     * @return string
-     */
-    public static function getMIMEType()
-    {
-        return "Image";
-    }
-
-    /**
-     * Gets the plugin`s MIME subtype
-     *
-     * @return string
-     */
-    public static function getMIMESubtype()
-    {
-        return "PNG";
-    }
-}
diff --git a/#pma/libraries/plugins/transformations/output/Text_Octetstream_Sql.php b/#pma/libraries/plugins/transformations/output/Text_Octetstream_Sql.php
deleted file mode 100644
index 81d8997a..00000000
--- a/#pma/libraries/plugins/transformations/output/Text_Octetstream_Sql.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Blob SQL Transformations plugin for phpMyAdmin
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage SQL
- */
-namespace PMA\libraries\plugins\transformations\output;
-
-use PMA\libraries\plugins\transformations\abs\SQLTransformationsPlugin;
-
-/**
- * Handles the sql transformation for blob data
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage SQL
- */
-class Text_Octetstream_Sql extends SQLTransformationsPlugin
-{
-    /**
-     * Gets the plugin`s MIME type
-     *
-     * @return string
-     */
-    public static function getMIMEType()
-    {
-        return "Text";
-    }
-
-    /**
-     * Gets the plugin`s MIME subtype
-     *
-     * @return string
-     */
-    public static function getMIMESubtype()
-    {
-        return "Octetstream";
-    }
-}
diff --git a/#pma/libraries/plugins/transformations/output/Text_Plain_Binarytoip.php b/#pma/libraries/plugins/transformations/output/Text_Plain_Binarytoip.php
deleted file mode 100644
index 94e6f088..00000000
--- a/#pma/libraries/plugins/transformations/output/Text_Plain_Binarytoip.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Handles the binary to IPv4/IPv6 transformation for text plain
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage BinaryToIP
- */
-namespace PMA\libraries\plugins\transformations\output;
-
-use PMA\libraries\plugins\TransformationsPlugin;
-
-/**
- * Handles the binary to IPv4/IPv6 transformation for text plain
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage BinaryToIP
- */
-class Text_Plain_Binarytoip extends TransformationsPlugin
-{
-    /**
-     * Gets the transformation description of the plugin
-     *
-     * @return string
-     */
-    public static function getInfo()
-    {
-        return __(
-            'Converts an Internet network address stored as a binary string'
-            . ' into a string in Internet standard (IPv4/IPv6) format.'
-        );
-    }
-
-    /**
-     * Does the actual work of each specific transformations plugin.
-     *
-     * @param string $buffer  text to be transformed. a binary string containing
-     *                        an IP address, as returned from MySQL's INET6_ATON
-     *                        function
-     * @param array  $options transformation options
-     * @param string $meta    meta information
-     *
-     * @return string IP address
-     */
-    public function applyTransformation($buffer, $options = array(), $meta = '')
-    {
-        $length = strlen($buffer);
-        if ($length == 4 || $length == 16) {
-            $val = @inet_ntop(pack('A' . $length, $buffer));
-            if ($val !== false) {
-                return $val;
-            }
-        }
-
-        return $buffer;
-    }
-
-
-    /* ~~~~~~~~~~~~~~~~~~~~ Getters and Setters ~~~~~~~~~~~~~~~~~~~~ */
-
-    /**
-     * Gets the transformation name of the plugin
-     *
-     * @return string
-     */
-    public static function getName()
-    {
-        return "Binary To IPv4/IPv6";
-    }
-
-    /**
-     * Gets the plugin`s MIME type
-     *
-     * @return string
-     */
-    public static function getMIMEType()
-    {
-        return "Text";
-    }
-
-    /**
-     * Gets the plugin`s MIME subtype
-     *
-     * @return string
-     */
-    public static function getMIMESubtype()
-    {
-        return "Plain";
-    }
-}
diff --git a/#pma/libraries/plugins/transformations/output/Text_Plain_Bool2Text.php b/#pma/libraries/plugins/transformations/output/Text_Plain_Bool2Text.php
deleted file mode 100644
index 36114194..00000000
--- a/#pma/libraries/plugins/transformations/output/Text_Plain_Bool2Text.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Text Plain Bool2Text Transformations plugin for phpMyAdmin
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage Bool2Text
- */
-namespace PMA\libraries\plugins\transformations\output;
-
-use PMA\libraries\plugins\transformations\abs\Bool2TextTransformationsPlugin;
-
-/**
- * Handles the Boolean to Text transformation for text plain.
- * Has one option: the output format (default 'T/F')
- * or 'Y/N'
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage Bool2Text
- */
-class Text_Plain_Bool2Text extends Bool2TextTransformationsPlugin
-{
-    /**
-     * Gets the plugin`s MIME type
-     *
-     * @return string
-     */
-    public static function getMIMEType()
-    {
-        return "Text";
-    }
-
-    /**
-     * Gets the plugin`s MIME subtype
-     *
-     * @return string
-     */
-    public static function getMIMESubtype()
-    {
-        return "Plain";
-    }
-}
diff --git a/#pma/libraries/plugins/transformations/output/Text_Plain_Dateformat.php b/#pma/libraries/plugins/transformations/output/Text_Plain_Dateformat.php
deleted file mode 100644
index 95904993..00000000
--- a/#pma/libraries/plugins/transformations/output/Text_Plain_Dateformat.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Text Plain Date Format Transformations plugin for phpMyAdmin
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage DateFormat
- */
-namespace PMA\libraries\plugins\transformations\output;
-
-use PMA\libraries\plugins\transformations\abs\DateFormatTransformationsPlugin;
-
-/**
- * Handles the date format transformation for text plain
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage DateFormat
- */
-class Text_Plain_Dateformat extends DateFormatTransformationsPlugin
-{
-    /**
-     * Gets the plugin`s MIME type
-     *
-     * @return string
-     */
-    public static function getMIMEType()
-    {
-        return "Text";
-    }
-
-    /**
-     * Gets the plugin`s MIME subtype
-     *
-     * @return string
-     */
-    public static function getMIMESubtype()
-    {
-        return "Plain";
-    }
-}
diff --git a/#pma/libraries/plugins/transformations/output/Text_Plain_External.php b/#pma/libraries/plugins/transformations/output/Text_Plain_External.php
deleted file mode 100644
index 1b8eb4c8..00000000
--- a/#pma/libraries/plugins/transformations/output/Text_Plain_External.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Text Plain External Transformations plugin for phpMyAdmin
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage External
- */
-namespace PMA\libraries\plugins\transformations\output;
-
-use PMA\libraries\plugins\transformations\abs\ExternalTransformationsPlugin;
-
-/**
- * Handles the external transformation for text plain
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage External
- */
-class Text_Plain_External extends ExternalTransformationsPlugin
-{
-    /**
-     * Gets the plugin`s MIME type
-     *
-     * @return string
-     */
-    public static function getMIMEType()
-    {
-        return "Text";
-    }
-
-    /**
-     * Gets the plugin`s MIME subtype
-     *
-     * @return string
-     */
-    public static function getMIMESubtype()
-    {
-        return "Plain";
-    }
-}
diff --git a/#pma/libraries/plugins/transformations/output/Text_Plain_Formatted.php b/#pma/libraries/plugins/transformations/output/Text_Plain_Formatted.php
deleted file mode 100644
index dbe1c534..00000000
--- a/#pma/libraries/plugins/transformations/output/Text_Plain_Formatted.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Text Plain Formatted Transformations plugin for phpMyAdmin
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage Formatted
- */
-namespace PMA\libraries\plugins\transformations\output;
-
-use PMA\libraries\plugins\transformations\abs\FormattedTransformationsPlugin;
-
-/**
- * Handles the formatted transformation for text plain
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage Formatted
- */
-class Text_Plain_Formatted extends FormattedTransformationsPlugin
-{
-    /**
-     * Gets the plugin`s MIME type
-     *
-     * @return string
-     */
-    public static function getMIMEType()
-    {
-        return "Text";
-    }
-
-    /**
-     * Gets the plugin`s MIME subtype
-     *
-     * @return string
-     */
-    public static function getMIMESubtype()
-    {
-        return "Plain";
-    }
-}
diff --git a/#pma/libraries/plugins/transformations/output/Text_Plain_Imagelink.php b/#pma/libraries/plugins/transformations/output/Text_Plain_Imagelink.php
deleted file mode 100644
index 122d3cc1..00000000
--- a/#pma/libraries/plugins/transformations/output/Text_Plain_Imagelink.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Text Plain Image Link Transformations plugin for phpMyAdmin
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage ImageLink
- */
-namespace PMA\libraries\plugins\transformations\output;
-
-use PMA\libraries\plugins\transformations\abs\TextImageLinkTransformationsPlugin;
-
-/**
- * Handles the image link transformation for text plain
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage ImageLink
- */
-class Text_Plain_Imagelink extends TextImageLinkTransformationsPlugin
-{
-    /**
-     * Gets the plugin`s MIME type
-     *
-     * @return string
-     */
-    public static function getMIMEType()
-    {
-        return "Text";
-    }
-
-    /**
-     * Gets the plugin`s MIME subtype
-     *
-     * @return string
-     */
-    public static function getMIMESubtype()
-    {
-        return "Plain";
-    }
-}
diff --git a/#pma/libraries/plugins/transformations/output/Text_Plain_Json.php b/#pma/libraries/plugins/transformations/output/Text_Plain_Json.php
deleted file mode 100644
index 2e4c4c66..00000000
--- a/#pma/libraries/plugins/transformations/output/Text_Plain_Json.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Text Plain JSON Transformations plugin for phpMyAdmin
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage SQL
- */
-namespace PMA\libraries\plugins\transformations\output;
-
-use PMA;
-use PMA\libraries\plugins\TransformationsPlugin;
-use PMA\libraries\Response;
-
-/**
- * Handles the json transformation for text plain
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage JSON
- */
-class Text_Plain_Json extends TransformationsPlugin
-{
-    /**
-     * No-arg constructor
-     */
-    public function __construct()
-    {
-        if (!empty($GLOBALS['cfg']['CodemirrorEnable'])) {
-            $response = PMA\libraries\Response::getInstance();
-            $scripts = $response->getHeader()
-                ->getScripts();
-            $scripts->addFile('codemirror/lib/codemirror.js');
-            $scripts->addFile('codemirror/mode/javascript/javascript.js');
-            $scripts->addFile('codemirror/addon/runmode/runmode.js');
-            $scripts->addFile('transformations/json.js');
-        }
-    }
-
-    /**
-     * Gets the transformation description of the specific plugin
-     *
-     * @return string
-     */
-    public static function getInfo()
-    {
-        return __(
-            'Formats text as JSON with syntax highlighting.'
-        );
-    }
-
-    /**
-     * Does the actual work of each specific transformations plugin.
-     *
-     * @param string $buffer  text to be transformed
-     * @param array  $options transformation options
-     * @param string $meta    meta information
-     *
-     * @return string
-     */
-    public function applyTransformation($buffer, $options = array(), $meta = '')
-    {
-        return '<code class="json"><pre>' . "\n"
-        . htmlspecialchars($buffer) . "\n"
-        . '</pre></code>';
-    }
-
-    /* ~~~~~~~~~~~~~~~~~~~~ Getters and Setters ~~~~~~~~~~~~~~~~~~~~ */
-
-    /**
-     * Gets the plugin`s MIME type
-     *
-     * @return string
-     */
-    public static function getMIMEType()
-    {
-        return "Text";
-    }
-
-    /**
-     * Gets the plugin`s MIME subtype
-     *
-     * @return string
-     */
-    public static function getMIMESubtype()
-    {
-        return "Plain";
-    }
-
-    /**
-     * Gets the transformation name of the specific plugin
-     *
-     * @return string
-     */
-    public static function getName()
-    {
-        return "JSON";
-    }
-}
diff --git a/#pma/libraries/plugins/transformations/output/Text_Plain_Sql.php b/#pma/libraries/plugins/transformations/output/Text_Plain_Sql.php
deleted file mode 100644
index 71b1b5d8..00000000
--- a/#pma/libraries/plugins/transformations/output/Text_Plain_Sql.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Text Plain SQL Transformations plugin for phpMyAdmin
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage SQL
- */
-namespace PMA\libraries\plugins\transformations\output;
-
-use PMA\libraries\Response;
-use PMA\libraries\plugins\transformations\abs\SQLTransformationsPlugin;
-
-/**
- * Handles the sql transformation for text plain
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage SQL
- */
-class Text_Plain_Sql extends SQLTransformationsPlugin
-{
-    /**
-     * No-arg constructor
-     */
-    public function __construct()
-    {
-        if (!empty($GLOBALS['cfg']['CodemirrorEnable'])) {
-            $response = Response::getInstance();
-            $scripts = $response->getHeader()
-                ->getScripts();
-            $scripts->addFile('codemirror/lib/codemirror.js');
-            $scripts->addFile('codemirror/mode/sql/sql.js');
-            $scripts->addFile('codemirror/addon/runmode/runmode.js');
-            $scripts->addFile('function.js');
-        }
-    }
-
-    /**
-     * Gets the plugin`s MIME type
-     *
-     * @return string
-     */
-    public static function getMIMEType()
-    {
-        return "Text";
-    }
-
-    /**
-     * Gets the plugin`s MIME subtype
-     *
-     * @return string
-     */
-    public static function getMIMESubtype()
-    {
-        return "Plain";
-    }
-}
diff --git a/#pma/libraries/plugins/transformations/output/Text_Plain_Xml.php b/#pma/libraries/plugins/transformations/output/Text_Plain_Xml.php
deleted file mode 100644
index c6702714..00000000
--- a/#pma/libraries/plugins/transformations/output/Text_Plain_Xml.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Text Plain XML Transformations plugin for phpMyAdmin
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage SQL
- */
-namespace PMA\libraries\plugins\transformations\output;
-
-use PMA;
-use PMA\libraries\plugins\TransformationsPlugin;
-use PMA\libraries\Response;
-
-/**
- * Handles the XML transformation for text plain
- *
- * @package    PhpMyAdmin-Transformations
- * @subpackage XML
- */
-class Text_Plain_Xml extends TransformationsPlugin
-{
-    /**
-     * No-arg constructor
-     */
-    public function __construct()
-    {
-        if (!empty($GLOBALS['cfg']['CodemirrorEnable'])) {
-            $response = PMA\libraries\Response::getInstance();
-            $scripts = $response->getHeader()
-                ->getScripts();
-            $scripts->addFile('codemirror/lib/codemirror.js');
-            $scripts->addFile('codemirror/mode/xml/xml.js');
-            $scripts->addFile('codemirror/addon/runmode/runmode.js');
-            $scripts->addFile('transformations/xml.js');
-        }
-    }
-
-    /**
-     * Gets the transformation description of the specific plugin
-     *
-     * @return string
-     */
-    public static function getInfo()
-    {
-        return __(
-            'Formats text as XML with syntax highlighting.'
-        );
-    }
-
-    /**
-     * Does the actual work of each specific transformations plugin.
-     *
-     * @param string $buffer  text to be transformed
-     * @param array  $options transformation options
-     * @param string $meta    meta information
-     *
-     * @return string
-     */
-    public function applyTransformation($buffer, $options = array(), $meta = '')
-    {
-        return '<code class="xml"><pre>' . "\n"
-        . htmlspecialchars($buffer) . "\n"
-        . '</pre></code>';
-    }
-
-    /* ~~~~~~~~~~~~~~~~~~~~ Getters and Setters ~~~~~~~~~~~~~~~~~~~~ */
-
-    /**
-     * Gets the plugin`s MIME type
-     *
-     * @return string
-     */
-    public static function getMIMEType()
-    {
-        return "Text";
-    }
-
-    /**
-     * Gets the plugin`s MIME subtype
-     *
-     * @return string
-     */
-    public static function getMIMESubtype()
-    {
-        return "Plain";
-    }
-
-    /**
-     * Gets the transformation name of the specific plugin
-     *
-     * @return string
-     */
-    public static function getName()
-    {
-        return "XML";
-    }
-}
diff --git a/#pma/libraries/pmd_common.php b/#pma/libraries/pmd_common.php
deleted file mode 100644
index f390f8cc..00000000
--- a/#pma/libraries/pmd_common.php
+++ /dev/null
@@ -1,775 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Common functions for Designer
- *
- * @package PhpMyAdmin-Designer
- */
-use PMA\libraries\Table;
-
-/**
- * Block attempts to directly run this script
- */
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
-$GLOBALS['PMD']['STYLE']          = 'default';
-
-$cfgRelation = PMA_getRelationsParam();
-
-/**
- * Retrieves table info and stores it in $GLOBALS['PMD']
- *
- * @return array with table info
- */
-function PMA_getTablesInfo()
-{
-    $retval = array();
-
-    $GLOBALS['PMD']['TABLE_NAME'] = array();// that foreach no error
-    $GLOBALS['PMD']['OWNER'] = array();
-    $GLOBALS['PMD']['TABLE_NAME_SMALL'] = array();
-
-    $tables = $GLOBALS['dbi']->getTablesFull($GLOBALS['db']);
-    // seems to be needed later
-    $GLOBALS['dbi']->selectDb($GLOBALS['db']);
-    $i = 0;
-    foreach ($tables as $one_table) {
-        $GLOBALS['PMD']['TABLE_NAME'][$i]
-            = $GLOBALS['db'] . "." . $one_table['TABLE_NAME'];
-        $GLOBALS['PMD']['OWNER'][$i] = $GLOBALS['db'];
-        $GLOBALS['PMD']['TABLE_NAME_SMALL'][$i] = $one_table['TABLE_NAME'];
-
-        $GLOBALS['PMD_URL']['TABLE_NAME'][$i]
-            = $GLOBALS['db'] . "." . $one_table['TABLE_NAME'];
-        $GLOBALS['PMD_URL']['OWNER'][$i] = $GLOBALS['db'];
-        $GLOBALS['PMD_URL']['TABLE_NAME_SMALL'][$i]
-            = $one_table['TABLE_NAME'];
-
-        $GLOBALS['PMD_OUT']['TABLE_NAME'][$i] = htmlspecialchars(
-            $GLOBALS['db'] . "." . $one_table['TABLE_NAME'], ENT_QUOTES
-        );
-        $GLOBALS['PMD_OUT']['OWNER'][$i] = htmlspecialchars(
-            $GLOBALS['db'], ENT_QUOTES
-        );
-        $GLOBALS['PMD_OUT']['TABLE_NAME_SMALL'][$i] = htmlspecialchars(
-            $one_table['TABLE_NAME'], ENT_QUOTES
-        );
-
-        $GLOBALS['PMD']['TABLE_TYPE'][$i] = mb_strtoupper(
-            $one_table['ENGINE']
-        );
-
-        $DF = PMA_getDisplayField($GLOBALS['db'], $one_table['TABLE_NAME']);
-        if ($DF != '') {
-            $retval[$GLOBALS['PMD_URL']["TABLE_NAME_SMALL"][$i]] = $DF;
-        }
-
-        $i++;
-    }
-
-    return $retval;
-}
-
-/**
- * Retrieves table column info
- *
- * @return array   table column nfo
- */
-function PMA_getColumnsInfo()
-{
-    $GLOBALS['dbi']->selectDb($GLOBALS['db']);
-    $tab_column = array();
-    for ($i = 0, $cnt = count($GLOBALS['PMD']["TABLE_NAME"]); $i < $cnt; $i++) {
-        $fields_rs = $GLOBALS['dbi']->query(
-            $GLOBALS['dbi']->getColumnsSql(
-                $GLOBALS['db'],
-                $GLOBALS['PMD']["TABLE_NAME_SMALL"][$i],
-                null,
-                true
-            ),
-            null,
-            PMA\libraries\DatabaseInterface::QUERY_STORE
-        );
-        $tbl_name_i = $GLOBALS['PMD']['TABLE_NAME'][$i];
-        $j = 0;
-        while ($row = $GLOBALS['dbi']->fetchAssoc($fields_rs)) {
-            $tab_column[$tbl_name_i]['COLUMN_ID'][$j]   = $j;
-            $tab_column[$tbl_name_i]['COLUMN_NAME'][$j] = $row['Field'];
-            $tab_column[$tbl_name_i]['TYPE'][$j]        = $row['Type'];
-            $tab_column[$tbl_name_i]['NULLABLE'][$j]    = $row['Null'];
-            $j++;
-        }
-    }
-    return $tab_column;
-}
-
-/**
- * Returns JavaScript code for initializing vars
- *
- * @return string   JavaScript code
- */
-function PMA_getScriptContr()
-{
-    $GLOBALS['dbi']->selectDb($GLOBALS['db']);
-    $con = array();
-    $con["C_NAME"] = array();
-    $i = 0;
-    $alltab_rs = $GLOBALS['dbi']->query(
-        'SHOW TABLES FROM ' . PMA\libraries\Util::backquote($GLOBALS['db']),
-        null,
-        PMA\libraries\DatabaseInterface::QUERY_STORE
-    );
-    while ($val = @$GLOBALS['dbi']->fetchRow($alltab_rs)) {
-        $row = PMA_getForeigners($GLOBALS['db'], $val[0], '', 'internal');
-
-        if ($row !== false) {
-            foreach ($row as $field => $value) {
-                $con['C_NAME'][$i] = '';
-                $con['DTN'][$i]    = urlencode($GLOBALS['db'] . "." . $val[0]);
-                $con['DCN'][$i]    = urlencode($field);
-                $con['STN'][$i]    = urlencode(
-                    $value['foreign_db'] . "." . $value['foreign_table']
-                );
-                $con['SCN'][$i]    = urlencode($value['foreign_field']);
-                $i++;
-            }
-        }
-        $row = PMA_getForeigners($GLOBALS['db'], $val[0], '', 'foreign');
-
-        if ($row !== false) {
-            foreach ($row['foreign_keys_data'] as $one_key) {
-                foreach ($one_key['index_list'] as $index => $one_field) {
-                    $con['C_NAME'][$i] = $one_key['constraint'];
-                    $con['DTN'][$i]    = urlencode($GLOBALS['db'] . "." . $val[0]);
-                    $con['DCN'][$i]    = urlencode($one_field);
-                    $con['STN'][$i]    = urlencode(
-                        (isset($one_key['ref_db_name']) ?
-                            $one_key['ref_db_name'] : $GLOBALS['db'])
-                        . "." . $one_key['ref_table_name']
-                    );
-                    $con['SCN'][$i] = urlencode($one_key['ref_index_list'][$index]);
-                    $i++;
-                }
-            }
-        }
-    }
-
-    $ti = 0;
-    $retval = array();
-    for ($i = 0, $cnt = count($con["C_NAME"]); $i < $cnt; $i++) {
-        $c_name_i = $con['C_NAME'][$i];
-        $dtn_i = $con['DTN'][$i];
-        $retval[$ti] = array();
-        $retval[$ti][$c_name_i] = array();
-        if (in_array($dtn_i, $GLOBALS['PMD_URL']["TABLE_NAME"])
-            && in_array($con['STN'][$i], $GLOBALS['PMD_URL']["TABLE_NAME"])
-        ) {
-            $retval[$ti][$c_name_i][$dtn_i] = array();
-            $retval[$ti][$c_name_i][$dtn_i][$con['DCN'][$i]] = array(
-                0 => $con['STN'][$i],
-                1 => $con['SCN'][$i]
-            );
-        }
-        $ti++;
-    }
-    return $retval;
-}
-
-/**
- * Returns UNIQUE and PRIMARY indices
- *
- * @return array unique or primary indices
- */
-function PMA_getPKOrUniqueKeys()
-{
-    return PMA_getAllKeys(true);
-}
-
-/**
- * Returns all indices
- *
- * @param bool $unique_only whether to include only unique ones
- *
- * @return array indices
- */
-function PMA_getAllKeys($unique_only = false)
-{
-    $keys = array();
-
-    foreach ($GLOBALS['PMD']['TABLE_NAME_SMALL'] as $I => $table) {
-        $schema = $GLOBALS['PMD']['OWNER'][$I];
-        // for now, take into account only the first index segment
-        foreach (PMA\libraries\Index::getFromTable($table, $schema) as $index) {
-            if ($unique_only && ! $index->isUnique()) {
-                continue;
-            }
-            $columns = $index->getColumns();
-            foreach ($columns as $column_name => $dummy) {
-                $keys[$schema . '.' . $table . '.' . $column_name] = 1;
-            }
-        }
-    }
-    return $keys;
-}
-
-/**
- * Return script to create j_tab and h_tab arrays
- *
- * @return string
- */
-function PMA_getScriptTabs()
-{
-    $retval = array(
-        'j_tabs' => array(),
-        'h_tabs' => array()
-    );
-
-    for ($i = 0, $cnt = count($GLOBALS['PMD']['TABLE_NAME']); $i < $cnt; $i++) {
-        $j = 0;
-        if (PMA\libraries\Util::isForeignKeySupported($GLOBALS['PMD']['TABLE_TYPE'][$i])) {
-            $j = 1;
-        }
-        $retval['j_tabs'][$GLOBALS['PMD_URL']['TABLE_NAME'][$i]] = $j;
-        $retval['h_tabs'][$GLOBALS['PMD_URL']['TABLE_NAME'][$i]] = 1;
-    }
-    return $retval;
-}
-
-/**
- * Returns table positions of a given pdf page
- *
- * @param int $pg pdf page id
- *
- * @return array of table positions
- */
-function PMA_getTablePositions($pg)
-{
-    $cfgRelation = PMA_getRelationsParam();
-    if (! $cfgRelation['pdfwork']) {
-        return null;
-    }
-
-    $query = "
-        SELECT CONCAT_WS('.', `db_name`, `table_name`) AS `name`,
-            `x` AS `X`,
-            `y` AS `Y`,
-            1 AS `V`,
-            1 AS `H`
-        FROM " . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . "." . PMA\libraries\Util::backquote($cfgRelation['table_coords']) . "
-        WHERE pdf_page_number = " . intval($pg);
-
-    $tab_pos = $GLOBALS['dbi']->fetchResult(
-        $query,
-        'name',
-        null,
-        $GLOBALS['controllink'],
-        PMA\libraries\DatabaseInterface::QUERY_STORE
-    );
-    return $tab_pos;
-}
-
-/**
- * Returns page name of a given pdf page
- *
- * @param int $pg pdf page id
- *
- * @return String table name
- */
-function PMA_getPageName($pg)
-{
-    $cfgRelation = PMA_getRelationsParam();
-    if (! $cfgRelation['pdfwork']) {
-        return null;
-    }
-
-    $query = "SELECT `page_descr`"
-        . " FROM " . PMA\libraries\Util::backquote($cfgRelation['db'])
-        . "." . PMA\libraries\Util::backquote($cfgRelation['pdf_pages'])
-        . " WHERE " . PMA\libraries\Util::backquote('page_nr') . " = " . intval($pg);
-    $page_name = $GLOBALS['dbi']->fetchResult(
-        $query,
-        null,
-        null,
-        $GLOBALS['controllink'],
-        PMA\libraries\DatabaseInterface::QUERY_STORE
-    );
-    return count($page_name) ? $page_name[0] : null;
-}
-
-/**
- * Deletes a given pdf page and its corresponding coordinates
- *
- * @param int $pg page id
- *
- * @return boolean success/failure
- */
-function PMA_deletePage($pg)
-{
-    $cfgRelation = PMA_getRelationsParam();
-    if (! $cfgRelation['pdfwork']) {
-        return false;
-    }
-
-    $query = "DELETE FROM " . PMA\libraries\Util::backquote($cfgRelation['db'])
-        . "." . PMA\libraries\Util::backquote($cfgRelation['table_coords'])
-        . " WHERE " . PMA\libraries\Util::backquote('pdf_page_number') . " = " . intval($pg);
-    $success = PMA_queryAsControlUser(
-        $query, true, PMA\libraries\DatabaseInterface::QUERY_STORE
-    );
-
-    if ($success) {
-        $query = "DELETE FROM " . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . "." . PMA\libraries\Util::backquote($cfgRelation['pdf_pages'])
-            . " WHERE " . PMA\libraries\Util::backquote('page_nr') . " = " . intval($pg);
-        $success = PMA_queryAsControlUser(
-            $query, true, PMA\libraries\DatabaseInterface::QUERY_STORE
-        );
-    }
-
-    return (boolean) $success;
-}
-
-/**
- * Returns the id of the default pdf page of the database.
- * Default page is the one which has the same name as the database.
- *
- * @param string $db database
- *
- * @return int id of the default pdf page for the database
- */
-function PMA_getDefaultPage($db)
-{
-    $cfgRelation = PMA_getRelationsParam();
-    if (! $cfgRelation['pdfwork']) {
-        return null;
-    }
-
-    $query = "SELECT `page_nr`"
-        . " FROM " . PMA\libraries\Util::backquote($cfgRelation['db'])
-        . "." . PMA\libraries\Util::backquote($cfgRelation['pdf_pages'])
-        . " WHERE `db_name` = '" . $GLOBALS['dbi']->escapeString($db) . "'"
-        . " AND `page_descr` = '" .  $GLOBALS['dbi']->escapeString($db) . "'";
-
-    $default_page_no = $GLOBALS['dbi']->fetchResult(
-        $query,
-        null,
-        null,
-        $GLOBALS['controllink'],
-        PMA\libraries\DatabaseInterface::QUERY_STORE
-    );
-
-    if (count($default_page_no)) {
-        return intval($default_page_no[0]);
-    }
-    return -1;
-}
-
-/**
- * Get the id of the page to load. If a default page exists it will be returned.
- * If no such exists, returns the id of the first page of the database.
- *
- * @param string $db database
- *
- * @return int id of the page to load
- */
-function PMA_getLoadingPage($db)
-{
-    $cfgRelation = PMA_getRelationsParam();
-    if (! $cfgRelation['pdfwork']) {
-        return null;
-    }
-
-    $page_no = -1;
-
-    $default_page_no = PMA_getDefaultPage($db);
-    if ($default_page_no != -1) {
-        $page_no = $default_page_no;
-    } else {
-        $query = "SELECT MIN(`page_nr`)"
-            . " FROM " . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . "." . PMA\libraries\Util::backquote($cfgRelation['pdf_pages'])
-            . " WHERE `db_name` = '" . $GLOBALS['dbi']->escapeString($db) . "'";
-
-        $min_page_no = $GLOBALS['dbi']->fetchResult(
-            $query,
-            null,
-            null,
-            $GLOBALS['controllink'],
-            PMA\libraries\DatabaseInterface::QUERY_STORE
-        );
-        if (count($min_page_no[0])) {
-            $page_no = $min_page_no[0];
-        }
-    }
-    return intval($page_no);
-}
-
-/**
- * Creates a new page and returns its auto-incrementing id
- *
- * @param string $pageName name of the page
- * @param string $db       name of the database
- *
- * @return int|null
- */
-function PMA_createNewPage($pageName, $db)
-{
-    $cfgRelation = PMA_getRelationsParam();
-    if ($cfgRelation['pdfwork']) {
-        $pageNumber = PMA_REL_createPage(
-            $pageName,
-            $cfgRelation,
-            $db
-        );
-        return $pageNumber;
-    }
-    return null;
-}
-
-/**
- * Saves positions of table(s) of a given pdf page
- *
- * @param int $pg pdf page id
- *
- * @return boolean success/failure
- */
-function PMA_saveTablePositions($pg)
-{
-    $cfgRelation = PMA_getRelationsParam();
-    if (! $cfgRelation['pdfwork']) {
-        return false;
-    }
-
-    $query =  "DELETE FROM "
-        . PMA\libraries\Util::backquote($GLOBALS['cfgRelation']['db'])
-        . "." . PMA\libraries\Util::backquote(
-            $GLOBALS['cfgRelation']['table_coords']
-        )
-        . " WHERE `db_name` = '" . $GLOBALS['dbi']->escapeString($_REQUEST['db'])
-        . "'"
-        . " AND `pdf_page_number` = '" . $GLOBALS['dbi']->escapeString($pg)
-        . "'";
-
-    $res = PMA_queryAsControlUser(
-        $query,
-        true,
-        PMA\libraries\DatabaseInterface::QUERY_STORE
-    );
-
-    if (!$res) {
-        return (boolean)$res;
-    }
-
-    foreach ($_REQUEST['t_h'] as $key => $value) {
-        list($DB, $TAB) = explode(".", $key);
-        if (!$value) {
-            continue;
-        }
-
-        $query = "INSERT INTO "
-            . PMA\libraries\Util::backquote($GLOBALS['cfgRelation']['db']) . "."
-            . PMA\libraries\Util::backquote($GLOBALS['cfgRelation']['table_coords'])
-            . " (`db_name`, `table_name`, `pdf_page_number`, `x`, `y`)"
-            . " VALUES ("
-            . "'" . $GLOBALS['dbi']->escapeString($DB) . "', "
-            . "'" . $GLOBALS['dbi']->escapeString($TAB) . "', "
-            . "'" . $GLOBALS['dbi']->escapeString($pg) . "', "
-            . "'" . $GLOBALS['dbi']->escapeString($_REQUEST['t_x'][$key]) . "', "
-            . "'" . $GLOBALS['dbi']->escapeString($_REQUEST['t_y'][$key]) . "')";
-
-        $res = PMA_queryAsControlUser(
-            $query,  true, PMA\libraries\DatabaseInterface::QUERY_STORE
-        );
-    }
-
-    return (boolean) $res;
-}
-
-/**
- * Saves the display field for a table.
- *
- * @param string $db    database name
- * @param string $table table name
- * @param string $field display field name
- *
- * @return boolean
- */
-function PMA_saveDisplayField($db, $table, $field)
-{
-    $cfgRelation = PMA_getRelationsParam();
-    if (!$cfgRelation['displaywork']) {
-        return false;
-    }
-
-    $disp = PMA_getDisplayField($db, $table);
-    if ($disp && $disp === $field) {
-        $field = '';
-    }
-
-    $upd_query = new Table($table, $db, $GLOBALS['dbi']);
-    $upd_query->updateDisplayField($disp, $field, $cfgRelation);
-
-    return true;
-}
-
-/**
- * Adds a new foreign relation
- *
- * @param string $db        database name
- * @param string $T1        foreign table
- * @param string $F1        foreign field
- * @param string $T2        master table
- * @param string $F2        master field
- * @param string $on_delete on delete action
- * @param string $on_update on update action
- *
- * @return array array of success/failure and message
- */
-function PMA_addNewRelation($db, $T1, $F1, $T2, $F2, $on_delete, $on_update)
-{
-    $tables = $GLOBALS['dbi']->getTablesFull($db, $T1);
-    $type_T1 = mb_strtoupper($tables[$T1]['ENGINE']);
-    $tables = $GLOBALS['dbi']->getTablesFull($db, $T2);
-    $type_T2 = mb_strtoupper($tables[$T2]['ENGINE']);
-
-    // native foreign key
-    if (PMA\libraries\Util::isForeignKeySupported($type_T1)
-        && PMA\libraries\Util::isForeignKeySupported($type_T2)
-        && $type_T1 == $type_T2
-    ) {
-        // relation exists?
-        $existrel_foreign = PMA_getForeigners($db, $T2, '', 'foreign');
-        $foreigner = PMA_searchColumnInForeigners($existrel_foreign, $F2);
-        if ($foreigner
-            && isset($foreigner['constraint'])
-        ) {
-            return array(false, __('Error: relation already exists.'));
-        }
-        // note: in InnoDB, the index does not requires to be on a PRIMARY
-        // or UNIQUE key
-        // improve: check all other requirements for InnoDB relations
-        $result = $GLOBALS['dbi']->query(
-            'SHOW INDEX FROM ' . PMA\libraries\Util::backquote($db)
-            . '.' . PMA\libraries\Util::backquote($T1) . ';'
-        );
-
-        // will be use to emphasis prim. keys in the table view
-        $index_array1 = array();
-        while ($row = $GLOBALS['dbi']->fetchAssoc($result)) {
-            $index_array1[$row['Column_name']] = 1;
-        }
-        $GLOBALS['dbi']->freeResult($result);
-
-        $result = $GLOBALS['dbi']->query(
-            'SHOW INDEX FROM ' . PMA\libraries\Util::backquote($db)
-            . '.' . PMA\libraries\Util::backquote($T2) . ';'
-        );
-        // will be used to emphasis prim. keys in the table view
-        $index_array2 = array();
-        while ($row = $GLOBALS['dbi']->fetchAssoc($result)) {
-            $index_array2[$row['Column_name']] = 1;
-        }
-        $GLOBALS['dbi']->freeResult($result);
-
-        if (! empty($index_array1[$F1]) && ! empty($index_array2[$F2])) {
-            $upd_query  = 'ALTER TABLE ' . PMA\libraries\Util::backquote($db)
-                . '.' . PMA\libraries\Util::backquote($T2)
-                . ' ADD FOREIGN KEY ('
-                . PMA\libraries\Util::backquote($F2) . ')'
-                . ' REFERENCES '
-                . PMA\libraries\Util::backquote($db) . '.'
-                . PMA\libraries\Util::backquote($T1) . '('
-                . PMA\libraries\Util::backquote($F1) . ')';
-
-            if ($on_delete != 'nix') {
-                $upd_query   .= ' ON DELETE ' . $on_delete;
-            }
-            if ($on_update != 'nix') {
-                $upd_query   .= ' ON UPDATE ' . $on_update;
-            }
-            $upd_query .= ';';
-            if ($GLOBALS['dbi']->tryQuery($upd_query)) {
-                return array(true, __('FOREIGN KEY relation has been added.'));
-            }
-
-            $error = $GLOBALS['dbi']->getError();
-            return array(
-                false,
-                __('Error: FOREIGN KEY relation could not be added!')
-                . "<br/>" . $error
-            );
-        }
-
-        return array(false, __('Error: Missing index on column(s).'));
-    }
-
-    // internal (pmadb) relation
-    if ($GLOBALS['cfgRelation']['relwork'] == false) {
-        return array(false, __('Error: Relational features are disabled!'));
-    }
-
-    // no need to recheck if the keys are primary or unique at this point,
-    // this was checked on the interface part
-
-    $q  = "INSERT INTO "
-        . PMA\libraries\Util::backquote($GLOBALS['cfgRelation']['db'])
-        . "."
-        . PMA\libraries\Util::backquote($GLOBALS['cfgRelation']['relation'])
-        . "(master_db, master_table, master_field, "
-        . "foreign_db, foreign_table, foreign_field)"
-        . " values("
-        . "'" . $GLOBALS['dbi']->escapeString($db) . "', "
-        . "'" . $GLOBALS['dbi']->escapeString($T2) . "', "
-        . "'" . $GLOBALS['dbi']->escapeString($F2) . "', "
-        . "'" . $GLOBALS['dbi']->escapeString($db) . "', "
-        . "'" . $GLOBALS['dbi']->escapeString($T1) . "', "
-        . "'" . $GLOBALS['dbi']->escapeString($F1) . "')";
-
-    if (PMA_queryAsControlUser($q, false, PMA\libraries\DatabaseInterface::QUERY_STORE)
-    ) {
-        return array(true, __('Internal relation has been added.'));
-    }
-
-    $error = $GLOBALS['dbi']->getError($GLOBALS['controllink']);
-    return array(
-        false,
-        __('Error: Internal relation could not be added!')
-        . "<br/>" . $error
-    );
-}
-
-/**
- * Removes a foreign relation
- *
- * @param string $T1 foreign db.table
- * @param string $F1 foreign field
- * @param string $T2 master db.table
- * @param string $F2 master field
- *
- * @return array array of success/failure and message
- */
-function PMA_removeRelation($T1, $F1, $T2, $F2)
-{
-    list($DB1, $T1) = explode(".", $T1);
-    list($DB2, $T2) = explode(".", $T2);
-
-    $tables = $GLOBALS['dbi']->getTablesFull($DB1, $T1);
-    $type_T1 = mb_strtoupper($tables[$T1]['ENGINE']);
-    $tables = $GLOBALS['dbi']->getTablesFull($DB2, $T2);
-    $type_T2 = mb_strtoupper($tables[$T2]['ENGINE']);
-
-    if (PMA\libraries\Util::isForeignKeySupported($type_T1)
-        && PMA\libraries\Util::isForeignKeySupported($type_T2)
-        && $type_T1 == $type_T2
-    ) {
-        // InnoDB
-        $existrel_foreign = PMA_getForeigners($DB2, $T2, '', 'foreign');
-        $foreigner = PMA_searchColumnInForeigners($existrel_foreign, $F2);
-
-        if (isset($foreigner['constraint'])) {
-            $upd_query = 'ALTER TABLE ' . PMA\libraries\Util::backquote($DB2)
-                . '.' . PMA\libraries\Util::backquote($T2) . ' DROP FOREIGN KEY '
-                . PMA\libraries\Util::backquote($foreigner['constraint']) . ';';
-            if ($GLOBALS['dbi']->query($upd_query)) {
-                return array(true, __('FOREIGN KEY relation has been removed.'));
-            }
-
-            $error = $GLOBALS['dbi']->getError();
-            return array(
-                false,
-                __('Error: FOREIGN KEY relation could not be removed!')
-                . "<br/>" . $error
-            );
-        }
-    }
-
-    // internal relations
-    $delete_query = "DELETE FROM "
-        . PMA\libraries\Util::backquote($GLOBALS['cfgRelation']['db']) . "."
-        . $GLOBALS['cfgRelation']['relation'] . " WHERE "
-        . "master_db = '" . $GLOBALS['dbi']->escapeString($DB2) . "'"
-        . " AND master_table = '" . $GLOBALS['dbi']->escapeString($T2) . "'"
-        . " AND master_field = '" . $GLOBALS['dbi']->escapeString($F2) . "'"
-        . " AND foreign_db = '" . $GLOBALS['dbi']->escapeString($DB1) . "'"
-        . " AND foreign_table = '" . $GLOBALS['dbi']->escapeString($T1) . "'"
-        . " AND foreign_field = '" . $GLOBALS['dbi']->escapeString($F1) . "'";
-
-    $result = PMA_queryAsControlUser(
-        $delete_query,
-        false,
-        PMA\libraries\DatabaseInterface::QUERY_STORE
-    );
-
-    if (!$result) {
-        $error = $GLOBALS['dbi']->getError($GLOBALS['controllink']);
-        return array(
-            false,
-            __('Error: Internal relation could not be removed!') . "<br/>" . $error
-        );
-    }
-
-    return array(true, __('Internal relation has been removed.'));
-}
-
-/**
- * Save value for a designer setting
- *
- * @param string $index setting
- * @param string $value value
- *
- * @return bool whether the operation succeeded
- */
-function PMA_saveDesignerSetting($index, $value)
-{
-    $cfgRelation = PMA_getRelationsParam();
-    $cfgDesigner = array(
-        'user'  => $GLOBALS['cfg']['Server']['user'],
-        'db'    => $cfgRelation['db'],
-        'table' => $cfgRelation['designer_settings']
-    );
-
-    $success = true;
-    if ($GLOBALS['cfgRelation']['designersettingswork']) {
-
-        $orig_data_query = "SELECT settings_data"
-            . " FROM " . PMA\libraries\Util::backquote($cfgDesigner['db'])
-            . "." . PMA\libraries\Util::backquote($cfgDesigner['table'])
-            . " WHERE username = '"
-            . $GLOBALS['dbi']->escapeString($cfgDesigner['user']) . "';";
-
-        $orig_data = $GLOBALS['dbi']->fetchSingleRow(
-            $orig_data_query, 'ASSOC', $GLOBALS['controllink']
-        );
-
-        if (! empty($orig_data)) {
-            $orig_data = json_decode($orig_data['settings_data'], true);
-            $orig_data[$index] = $value;
-            $orig_data = json_encode($orig_data);
-
-            $save_query = "UPDATE "
-                . PMA\libraries\Util::backquote($cfgDesigner['db'])
-                . "." . PMA\libraries\Util::backquote($cfgDesigner['table'])
-                . " SET settings_data = '" . $orig_data . "'"
-                . " WHERE username = '"
-                . $GLOBALS['dbi']->escapeString($cfgDesigner['user']) . "';";
-
-            $success = PMA_queryAsControlUser($save_query);
-        } else {
-            $save_data = array($index => $value);
-
-            $query = "INSERT INTO "
-                . PMA\libraries\Util::backquote($cfgDesigner['db'])
-                . "." . PMA\libraries\Util::backquote($cfgDesigner['table'])
-                . " (username, settings_data)"
-                . " VALUES('" . $cfgDesigner['user'] . "',"
-                . " '" . json_encode($save_data) . "');";
-
-            $success = PMA_queryAsControlUser($query);
-        }
-    }
-
-    return (bool) $success;
-}
diff --git a/#pma/libraries/properties/PropertyItem.php b/#pma/libraries/properties/PropertyItem.php
deleted file mode 100644
index 40f910ce..00000000
--- a/#pma/libraries/properties/PropertyItem.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * The top-level class of the object-oriented properties system.
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries\properties;
-
-/**
- * Provides an interface for Property classes
- *
- * @package PhpMyAdmin
- */
-abstract class PropertyItem
-{
-    /**
-     * Returns the property type ( either "Options", or "Plugin" ).
-     *
-     * @return string
-     */
-    public abstract function getPropertyType();
-
-    /**
-     * Returns the property item type of either an instance of
-     *  - PMA\libraries\properties\options\OptionsPropertyOneItem ( f.e. "bool", "text", "radio", etc ) or
-     *  - PMA\libraries\properties\options\OptionsPropertyGroup   ( "root", "main" or "subgroup" )
-     *  - PMA\libraries\properties\plugins\PluginPropertyItem     ( "export", "import", "transformations" )
-     *
-     * @return string
-     */
-    public abstract function getItemType();
-
-    /**
-     * Only overwritten in the PMA\libraries\properties\options\OptionsPropertyGroup class:
-     * Used to tell whether we can use the current item as a group by calling
-     * the addProperty() or removeProperty() methods, which are not available
-     * for simple PMA\libraries\properties\options\OptionsPropertyOneItem subclasses.
-     *
-     * @return string
-     */
-    public function getGroup()
-    {
-        return null;
-    }
-}
diff --git a/#pma/libraries/properties/options/OptionsPropertyGroup.php b/#pma/libraries/properties/options/OptionsPropertyGroup.php
deleted file mode 100644
index d07d655e..00000000
--- a/#pma/libraries/properties/options/OptionsPropertyGroup.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Superclass for the Property Group classes.
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries\properties\options;
-
-/**
- * Parents group property items and provides methods to manage groups of
- * properties.
- *
- * @todo    modify descriptions if needed, when the options are integrated
- * @package PhpMyAdmin
- */
-abstract class OptionsPropertyGroup extends OptionsPropertyItem
-{
-    /**
-     * Holds a group of properties (PMA\libraries\properties\options\OptionsPropertyItem instances)
-     *
-     * @var array
-     */
-    private $_properties;
-
-    /**
-     * Adds a property to the group of properties
-     *
-     * @param OptionsPropertyItem $property the property instance to be added
-     *                                      to the group
-     *
-     * @return void
-     */
-    public function addProperty($property)
-    {
-        if (!$this->getProperties() == null
-            && in_array($property, $this->getProperties(), true)
-        ) {
-            return;
-        }
-        $this->_properties [] = $property;
-    }
-
-    /**
-     * Removes a property from the group of properties
-     *
-     * @param OptionsPropertyItem $property the property instance to be removed
-     *                                      from the group
-     *
-     * @return void
-     */
-    public function removeProperty($property)
-    {
-        $this->_properties = array_diff(
-            $this->getProperties(),
-            array($property)
-        );
-    }
-
-
-    /* ~~~~~~~~~~~~~~~~~~~~ Getters and Setters ~~~~~~~~~~~~~~~~~~~~ */
-
-    /**
-     * Gets the instance of the class
-     *
-     * @return array
-     */
-    public function getGroup()
-    {
-        return $this;
-    }
-
-    /**
-     * Gets the group of properties
-     *
-     * @return array
-     */
-    public function getProperties()
-    {
-        return $this->_properties;
-    }
-
-    /**
-     * Gets the number of properties
-     *
-     * @return int
-     */
-    public function getNrOfProperties()
-    {
-        return count($this->_properties);
-    }
-}
diff --git a/#pma/libraries/properties/options/OptionsPropertyItem.php b/#pma/libraries/properties/options/OptionsPropertyItem.php
deleted file mode 100644
index 5841c83c..00000000
--- a/#pma/libraries/properties/options/OptionsPropertyItem.php
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * The top-level class of the "Options" subtree of the object-oriented
- * properties system (the other subtree is "Plugin").
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries\properties\options;
-
-use PMA\libraries\properties\PropertyItem;
-
-/**
- * Superclass for
- *  - PMA\libraries\properties\options\OptionsPropertyOneItem and
- *  - OptionsProperty Group
- *
- * @package PhpMyAdmin
- */
-abstract class OptionsPropertyItem extends PropertyItem
-{
-    /**
-     * Name
-     *
-     * @var string
-     */
-    private $_name;
-    /**
-     * Text
-     *
-     * @var string
-     */
-    private $_text;
-    /**
-     * What to force
-     *
-     * @var string
-     */
-    private $_force;
-
-    /**
-     * constructor
-     *
-     * @param string $name Item name
-     * @param string $text Item text
-     */
-    public function __construct($name = null, $text = null)
-    {
-        if ($name) {
-            $this->_name = $name;
-        }
-        if ($text) {
-            $this->_text = $text;
-        }
-    }
-
-    /* ~~~~~~~~~~~~~~~~~~~~ Getters and Setters ~~~~~~~~~~~~~~~~~~~~ */
-
-    /**
-     * Gets the name
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->_name;
-    }
-
-    /**
-     * Sets the name
-     *
-     * @param string $name name
-     *
-     * @return void
-     */
-    public function setName($name)
-    {
-        $this->_name = $name;
-    }
-
-    /**
-     * Gets the text
-     *
-     * @return string
-     */
-    public function getText()
-    {
-        return $this->_text;
-    }
-
-    /**
-     * Sets the text
-     *
-     * @param string $text text
-     *
-     * @return void
-     */
-    public function setText($text)
-    {
-        $this->_text = $text;
-    }
-
-    /**
-     * Gets the force parameter
-     *
-     * @return string
-     */
-    public function getForce()
-    {
-        return $this->_force;
-    }
-
-    /**
-     * Sets the force parameter
-     *
-     * @param string $force force parameter
-     *
-     * @return void
-     */
-    public function setForce($force)
-    {
-        $this->_force = $force;
-    }
-
-    /**
-     * Returns the property type ( either "options", or "plugin" ).
-     *
-     * @return string
-     */
-    public function getPropertyType()
-    {
-        return "options";
-    }
-}
diff --git a/#pma/libraries/properties/options/OptionsPropertyOneItem.php b/#pma/libraries/properties/options/OptionsPropertyOneItem.php
deleted file mode 100644
index ef08c0dd..00000000
--- a/#pma/libraries/properties/options/OptionsPropertyOneItem.php
+++ /dev/null
@@ -1,159 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Superclass for the single Property Item classes.
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries\properties\options;
-
-/**
- * Parents only single property items (not groups).
- * Defines possible options and getters and setters for them.
- *
- * @package PhpMyAdmin
- */
-abstract class OptionsPropertyOneItem extends OptionsPropertyItem
-{
-    /**
-     * Whether to force or not
-     *
-     * @var bool
-     */
-    private $_force_one;
-    /**
-     * Values
-     *
-     * @var array
-     */
-    private $_values;
-    /**
-     * Doc
-     *
-     * @var string
-     */
-    private $_doc;
-    /**
-     * Length
-     *
-     * @var int
-     */
-    private $_len;
-    /**
-     * Size
-     *
-     * @var int
-     */
-    private $_size;
-    /* ~~~~~~~~~~~~~~~~~~~~ Getters and Setters ~~~~~~~~~~~~~~~~~~~~ */
-
-    /**
-     * Gets the force parameter
-     *
-     * @return string
-     */
-    public function getForce()
-    {
-        return $this->_force_one;
-    }
-
-    /**
-     * Sets the force parameter
-     *
-     * @param bool $force force parameter
-     *
-     * @return void
-     */
-    public function setForce($force)
-    {
-        $this->_force_one = $force;
-    }
-
-    /**
-     * Gets the values
-     *
-     * @return string
-     */
-    public function getValues()
-    {
-        return $this->_values;
-    }
-
-    /**
-     * Sets the values
-     *
-     * @param array $values values
-     *
-     * @return void
-     */
-    public function setValues($values)
-    {
-        $this->_values = $values;
-    }
-
-    /**
-     * Gets MySQL documentation pointer
-     *
-     * @return array
-     */
-    public function getDoc()
-    {
-        return $this->_doc;
-    }
-
-    /**
-     * Sets the doc
-     *
-     * @param array $doc MySQL documentation pointer
-     *
-     * @return void
-     */
-    public function setDoc($doc)
-    {
-        $this->_doc = $doc;
-    }
-
-    /**
-     * Gets the length
-     *
-     * @return int
-     */
-    public function getLen()
-    {
-        return $this->_len;
-    }
-
-    /**
-     * Sets the length
-     *
-     * @param int $len length
-     *
-     * @return void
-     */
-    public function setLen($len)
-    {
-        $this->_len = $len;
-    }
-
-    /**
-     * Gets the size
-     *
-     * @return int
-     */
-    public function getSize()
-    {
-        return $this->_size;
-    }
-
-    /**
-     * Sets the size
-     *
-     * @param int $size size
-     *
-     * @return void
-     */
-    public function setSize($size)
-    {
-        $this->_size = $size;
-    }
-}
diff --git a/#pma/libraries/properties/options/groups/OptionsPropertyMainGroup.php b/#pma/libraries/properties/options/groups/OptionsPropertyMainGroup.php
deleted file mode 100644
index 0ff6124c..00000000
--- a/#pma/libraries/properties/options/groups/OptionsPropertyMainGroup.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Holds the PMA\libraries\properties\options\groups\OptionsPropertyMainGroup class
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries\properties\options\groups;
-
-use PMA\libraries\properties\options\OptionsPropertyGroup;
-
-/**
- * Group property item class of type main
- *
- * @package PhpMyAdmin
- */
-class OptionsPropertyMainGroup extends OptionsPropertyGroup
-{
-    /**
-     * Returns the property item type of either an instance of
-     *  - PMA\libraries\properties\options\OptionsPropertyOneItem ( f.e. "bool",
-     *  "text", "radio", etc ) or
-     *  - PMA\libraries\properties\options\OptionsPropertyGroup   ( "root", "main"
-     *  or "subgroup" )
-     *  - PMA\libraries\properties\plugins\PluginPropertyItem     ( "export", "import", "transformations" )
-     *
-     * @return string
-     */
-    public function getItemType()
-    {
-        return "main";
-    }
-}
diff --git a/#pma/libraries/properties/options/groups/OptionsPropertyRootGroup.php b/#pma/libraries/properties/options/groups/OptionsPropertyRootGroup.php
deleted file mode 100644
index 62a3c976..00000000
--- a/#pma/libraries/properties/options/groups/OptionsPropertyRootGroup.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Holds the PMA\libraries\properties\options\groups\OptionsPropertyRootGroup class
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries\properties\options\groups;
-
-use PMA\libraries\properties\options\OptionsPropertyGroup;
-
-/**
- * Group property item class of type root
- *
- * @package PhpMyAdmin
- */
-class OptionsPropertyRootGroup extends OptionsPropertyGroup
-{
-    /**
-     * Returns the property item type of either an instance of
-     *  - PMA\libraries\properties\options\OptionsPropertyOneItem ( f.e. "bool",
-     *  "text", "radio", etc ) or
-     *  - PMA\libraries\properties\options\OptionsPropertyGroup   ( "root", "main"
-     *  or "subgroup" )
-     *  - PMA\libraries\properties\plugins\PluginPropertyItem     ( "export", "import", "transformations" )
-     *
-     * @return string
-     */
-    public function getItemType()
-    {
-        return "root";
-    }
-}
diff --git a/#pma/libraries/properties/options/groups/OptionsPropertySubgroup.php b/#pma/libraries/properties/options/groups/OptionsPropertySubgroup.php
deleted file mode 100644
index e7571aa8..00000000
--- a/#pma/libraries/properties/options/groups/OptionsPropertySubgroup.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Holds the PMA\libraries\properties\options\groups\OptionsPropertySubgroup class
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries\properties\options\groups;
-
-use PMA\libraries\properties\options\OptionsPropertyGroup;
-
-/**
- * Group property item class of type subgroup
- *
- * @package PhpMyAdmin
- */
-class OptionsPropertySubgroup extends OptionsPropertyGroup
-{
-    /**
-     * Subgroup Header
-     *
-     * @var string
-     */
-    private $_subgroupHeader;
-    /* ~~~~~~~~~~~~~~~~~~~~ Getters and Setters ~~~~~~~~~~~~~~~~~~~~ */
-
-    /**
-     * Returns the property item type of either an instance of
-     *  - PMA\libraries\properties\options\OptionsPropertyOneItem ( f.e. "bool",
-     *  "text", "radio", etc ) or
-     *  - PMA\libraries\properties\options\OptionsPropertyGroup   ( "root", "main"
-     *  or "subgroup" )
-     *  - PMA\libraries\properties\plugins\PluginPropertyItem     ( "export", "import", "transformations" )
-     *
-     * @return string
-     */
-    public function getItemType()
-    {
-        return "subgroup";
-    }
-
-    /**
-     * Gets the subgroup header
-     *
-     * @return \PMA\libraries\properties\PropertyItem
-     */
-    public function getSubgroupHeader()
-    {
-        return $this->_subgroupHeader;
-    }
-
-    /**
-     * Sets the subgroup header
-     *
-     * @param \PMA\libraries\properties\PropertyItem $subgroupHeader subgroup header
-     *
-     * @return void
-     */
-    public function setSubgroupHeader($subgroupHeader)
-    {
-        $this->_subgroupHeader = $subgroupHeader;
-    }
-}
diff --git a/#pma/libraries/properties/options/items/BoolPropertyItem.php b/#pma/libraries/properties/options/items/BoolPropertyItem.php
deleted file mode 100644
index c4315a8f..00000000
--- a/#pma/libraries/properties/options/items/BoolPropertyItem.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Holds the PMA\libraries\properties\options\items\BoolPropertyItem class
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries\properties\options\items;
-
-use PMA\libraries\properties\options\OptionsPropertyOneItem;
-
-/**
- * Single property item class of type bool
- *
- * @package PhpMyAdmin
- */
-class BoolPropertyItem extends OptionsPropertyOneItem
-{
-    /**
-     * Returns the property item type of either an instance of
-     *  - PMA\libraries\properties\options\OptionsPropertyOneItem ( f.e. "bool",
-     *  "text", "radio", etc ) or
-     *  - PMA\libraries\properties\options\OptionsPropertyGroup   ( "root", "main"
-     *  or "subgroup" )
-     *  - PMA\libraries\properties\plugins\PluginPropertyItem     ( "export", "import", "transformations" )
-     *
-     * @return string
-     */
-    public function getItemType()
-    {
-        return "bool";
-    }
-}
diff --git a/#pma/libraries/properties/options/items/DocPropertyItem.php b/#pma/libraries/properties/options/items/DocPropertyItem.php
deleted file mode 100644
index 09399f34..00000000
--- a/#pma/libraries/properties/options/items/DocPropertyItem.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Holds the PMA\libraries\properties\options\items\DocPropertyItem class
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries\properties\options\items;
-
-use PMA\libraries\properties\options\OptionsPropertyOneItem;
-
-/**
- * Single property item class of type doc
- *
- * @package PhpMyAdmin
- */
-class DocPropertyItem extends OptionsPropertyOneItem
-{
-    /**
-     * Returns the property item type of either an instance of
-     *  - PMA\libraries\properties\options\OptionsPropertyOneItem ( f.e. "bool",
-     *  "text", "radio", etc ) or
-     *  - PMA\libraries\properties\options\OptionsPropertyGroup   ( "root", "main"
-     *  or "subgroup" )
-     *  - PMA\libraries\properties\plugins\PluginPropertyItem     ( "export", "import", "transformations" )
-     *
-     * @return string
-     */
-    public function getItemType()
-    {
-        return "doc";
-    }
-}
diff --git a/#pma/libraries/properties/options/items/HiddenPropertyItem.php b/#pma/libraries/properties/options/items/HiddenPropertyItem.php
deleted file mode 100644
index 7a8ac777..00000000
--- a/#pma/libraries/properties/options/items/HiddenPropertyItem.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Holds the PMA\libraries\properties\options\items\HiddenPropertyItem class
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries\properties\options\items;
-
-use PMA\libraries\properties\options\OptionsPropertyOneItem;
-
-/**
- * Single property item class of type hidden
- *
- * @package PhpMyAdmin
- */
-class HiddenPropertyItem extends OptionsPropertyOneItem
-{
-    /**
-     * Returns the property item type of either an instance of
-     *  - PMA\libraries\properties\options\OptionsPropertyOneItem ( f.e. "bool",
-     *  "text", "radio", etc ) or
-     *  - PMA\libraries\properties\options\OptionsPropertyGroup   ( "root", "main"
-     *  or "subgroup" )
-     *  - PMA\libraries\properties\plugins\PluginPropertyItem     ( "export", "import", "transformations" )
-     *
-     * @return string
-     */
-    public function getItemType()
-    {
-        return "hidden";
-    }
-}
diff --git a/#pma/libraries/properties/options/items/MessageOnlyPropertyItem.php b/#pma/libraries/properties/options/items/MessageOnlyPropertyItem.php
deleted file mode 100644
index ada4a112..00000000
--- a/#pma/libraries/properties/options/items/MessageOnlyPropertyItem.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Holds the PMA\libraries\properties\options\items\MessageOnlyPropertyItem class
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries\properties\options\items;
-
-use PMA\libraries\properties\options\OptionsPropertyOneItem;
-
-/**
- * Single property item class of type messageOnly
- *
- * @package PhpMyAdmin
- */
-class MessageOnlyPropertyItem extends OptionsPropertyOneItem
-{
-    /**
-     * Returns the property item type of either an instance of
-     *  - PMA\libraries\properties\options\OptionsPropertyOneItem ( f.e. "bool",
-     *  "text", "radio", etc ) or
-     *  - PMA\libraries\properties\options\OptionsPropertyGroup   ( "root", "main"
-     *  or "subgroup" )
-     *  - PMA\libraries\properties\plugins\PluginPropertyItem     ( "export", "import", "transformations" )
-     *
-     * @return string
-     */
-    public function getItemType()
-    {
-        return "messageOnly";
-    }
-}
diff --git a/#pma/libraries/properties/options/items/NumberPropertyItem.php b/#pma/libraries/properties/options/items/NumberPropertyItem.php
deleted file mode 100644
index 0c11ca52..00000000
--- a/#pma/libraries/properties/options/items/NumberPropertyItem.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Holds the PMA\libraries\properties\options\items\TextPropertyItem class
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries\properties\options\items;
-
-use PMA\libraries\properties\options\OptionsPropertyOneItem;
-
-/**
- * Single property item class of type number
- *
- * @package PhpMyAdmin
- */
-class NumberPropertyItem extends OptionsPropertyOneItem
-{
-    /**
-     * Returns the property item type of either an instance of
-     *  - PMA\libraries\properties\options\OptionsPropertyOneItem ( f.e. "bool",
-     *  "text", "radio", etc ) or
-     *  - PMA\libraries\properties\options\OptionsPropertyGroup   ( "root", "main"
-     *  or "subgroup" )
-     *  - PMA\libraries\properties\plugins\PluginPropertyItem     ( "export", "import", "transformations" )
-     *
-     * @return string
-     */
-    public function getItemType()
-    {
-        return "number";
-    }
-}
diff --git a/#pma/libraries/properties/options/items/RadioPropertyItem.php b/#pma/libraries/properties/options/items/RadioPropertyItem.php
deleted file mode 100644
index 5ec02b27..00000000
--- a/#pma/libraries/properties/options/items/RadioPropertyItem.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Holds the PMA\libraries\properties\options\items\RadioPropertyItem class
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries\properties\options\items;
-
-use PMA\libraries\properties\options\OptionsPropertyOneItem;
-
-/**
- * Single property item class of type radio
- *
- * @package PhpMyAdmin
- */
-class RadioPropertyItem extends OptionsPropertyOneItem
-{
-    /**
-     * Returns the property item type of either an instance of
-     *  - PMA\libraries\properties\options\OptionsPropertyOneItem ( f.e. "bool",
-     *  "text", "radio", etc ) or
-     *  - PMA\libraries\properties\options\OptionsPropertyGroup   ( "root", "main"
-     *  or "subgroup" )
-     *  - PMA\libraries\properties\plugins\PluginPropertyItem     ( "export", "import", "transformations" )
-     *
-     * @return string
-     */
-    public function getItemType()
-    {
-        return "radio";
-    }
-}
diff --git a/#pma/libraries/properties/options/items/SelectPropertyItem.php b/#pma/libraries/properties/options/items/SelectPropertyItem.php
deleted file mode 100644
index e09ee3e9..00000000
--- a/#pma/libraries/properties/options/items/SelectPropertyItem.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Holds the PMA\libraries\properties\options\items\SelectPropertyItem class
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries\properties\options\items;
-
-use PMA\libraries\properties\options\OptionsPropertyOneItem;
-
-/**
- * Single property item class of type select
- *
- * @package PhpMyAdmin
- */
-class SelectPropertyItem extends OptionsPropertyOneItem
-{
-    /**
-     * Returns the property item type of either an instance of
-     *  - PMA\libraries\properties\options\OptionsPropertyOneItem ( f.e. "bool",
-     *  "text", "radio", etc ) or
-     *  - PMA\libraries\properties\options\OptionsPropertyGroup   ( "root", "main"
-     *  or "subgroup" )
-     *  - PMA\libraries\properties\plugins\PluginPropertyItem     ( "export", "import", "transformations" )
-     *
-     * @return string
-     */
-    public function getItemType()
-    {
-        return "select";
-    }
-}
diff --git a/#pma/libraries/properties/options/items/TextPropertyItem.php b/#pma/libraries/properties/options/items/TextPropertyItem.php
deleted file mode 100644
index 98143b5f..00000000
--- a/#pma/libraries/properties/options/items/TextPropertyItem.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Holds the PMA\libraries\properties\options\items\TextPropertyItem class
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries\properties\options\items;
-
-use PMA\libraries\properties\options\OptionsPropertyOneItem;
-
-/**
- * Single property item class of type text
- *
- * @package PhpMyAdmin
- */
-class TextPropertyItem extends OptionsPropertyOneItem
-{
-    /**
-     * Returns the property item type of either an instance of
-     *  - PMA\libraries\properties\options\OptionsPropertyOneItem ( f.e. "bool",
-     *  "text", "radio", etc ) or
-     *  - PMA\libraries\properties\options\OptionsPropertyGroup   ( "root", "main"
-     *  or "subgroup" )
-     *  - PMA\libraries\properties\plugins\PluginPropertyItem     ( "export", "import", "transformations" )
-     *
-     * @return string
-     */
-    public function getItemType()
-    {
-        return "text";
-    }
-}
diff --git a/#pma/libraries/properties/plugins/ExportPluginProperties.php b/#pma/libraries/properties/plugins/ExportPluginProperties.php
deleted file mode 100644
index 44914629..00000000
--- a/#pma/libraries/properties/plugins/ExportPluginProperties.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Properties class for the export plug-in
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries\properties\plugins;
-
-/**
- * Defines possible options and getters and setters for them.
- *
- * @todo    modify descriptions if needed, when the plug-in properties are integrated
- * @package PhpMyAdmin
- */
-class ExportPluginProperties extends PluginPropertyItem
-{
-    /**
-     * Whether to force or not
-     *
-     * @var bool
-     */
-    private $_forceFile;
-    /* ~~~~~~~~~~~~~~~~~~~~ Getters and Setters ~~~~~~~~~~~~~~~~~~~~ */
-
-    /**
-     * Returns the property item type of either an instance of
-     *  - PMA\libraries\properties\options\OptionsPropertyOneItem ( f.e. "bool",
-     *  "text", "radio", etc ) or
-     *  - PMA\libraries\properties\options\OptionsPropertyGroup   ( "root", "main"
-     *  or "subgroup" )
-     *  - PMA\libraries\properties\plugins\PluginPropertyItem     ( "export", "import", "transformations" )
-     *
-     * @return string
-     */
-    public function getItemType()
-    {
-        return "export";
-    }
-
-    /**
-     * Gets the force file parameter
-     *
-     * @return bool
-     */
-    public function getForceFile()
-    {
-        return $this->_forceFile;
-    }
-
-    /**
-     * Sets the force file parameter
-     *
-     * @param bool $forceFile the force file parameter
-     *
-     * @return void
-     */
-    public function setForceFile($forceFile)
-    {
-        $this->_forceFile = $forceFile;
-    }
-}
diff --git a/#pma/libraries/properties/plugins/ImportPluginProperties.php b/#pma/libraries/properties/plugins/ImportPluginProperties.php
deleted file mode 100644
index afb82e1d..00000000
--- a/#pma/libraries/properties/plugins/ImportPluginProperties.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Properties class for the import plug-in
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries\properties\plugins;
-
-/**
- * Defines possible options and getters and setters for them.
- *
- * @package PhpMyAdmin
- */
-class ImportPluginProperties extends PluginPropertyItem
-{
-    /**
-     * Returns the property item type of either an instance of
-     *  - PMA\libraries\properties\options\OptionsPropertyOneItem ( f.e. "bool",
-     *  "text", "radio", etc ) or
-     *  - PMA\libraries\properties\options\OptionsPropertyGroup   ( "root", "main"
-     *  or "subgroup" )
-     *  - PMA\libraries\properties\plugins\PluginPropertyItem     ( "export", "import", "transformations" )
-     *
-     * @return string
-     */
-    public function getItemType()
-    {
-        return "import";
-    }
-}
\ No newline at end of file
diff --git a/#pma/libraries/properties/plugins/PluginPropertyItem.php b/#pma/libraries/properties/plugins/PluginPropertyItem.php
deleted file mode 100644
index 0fc0cdc0..00000000
--- a/#pma/libraries/properties/plugins/PluginPropertyItem.php
+++ /dev/null
@@ -1,175 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * The top-level class of the "Plugin" subtree of the object-oriented
- * properties system (the other subtree is "Options").
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries\properties\plugins;
-
-use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
-use PMA\libraries\properties\PropertyItem;
-
-/**
- * Superclass for
- *  - PMA\libraries\properties\plugins\ExportPluginProperties,
- *  - PMA\libraries\properties\plugins\ImportPluginProperties and
- *  - TransformationsPluginProperties
- *
- * @package PhpMyAdmin
- */
-abstract class PluginPropertyItem extends PropertyItem
-{
-    /**
-     * Text
-     *
-     * @var string
-     */
-    private $_text;
-    /**
-     * Extension
-     *
-     * @var string
-     */
-    private $_extension;
-    /**
-     * Options
-     *
-     * @var OptionsPropertyRootGroup
-     */
-    private $_options;
-    /**
-     * Options text
-     *
-     * @var string
-     */
-    private $_optionsText;
-    /**
-     * MIME Type
-     *
-     * @var string
-     */
-    private $_mimeType;
-    /* ~~~~~~~~~~~~~~~~~~~~ Getters and Setters ~~~~~~~~~~~~~~~~~~~~ */
-
-    /**
-     * Gets the text
-     *
-     * @return string
-     */
-    public function getText()
-    {
-        return $this->_text;
-    }
-
-    /**
-     * Sets the text
-     *
-     * @param string $text text
-     *
-     * @return void
-     */
-    public function setText($text)
-    {
-        $this->_text = $text;
-    }
-
-    /**
-     * Gets the extension
-     *
-     * @return string
-     */
-    public function getExtension()
-    {
-        return $this->_extension;
-    }
-
-    /**
-     * Sets the extension
-     *
-     * @param string $extension extension
-     *
-     * @return void
-     */
-    public function setExtension($extension)
-    {
-        $this->_extension = $extension;
-    }
-
-    /**
-     * Gets the options
-     *
-     * @return OptionsPropertyRootGroup
-     */
-    public function getOptions()
-    {
-        return $this->_options;
-    }
-
-    /**
-     * Sets the options
-     *
-     * @param OptionsPropertyRootGroup $options options
-     *
-     * @return void
-     */
-    public function setOptions($options)
-    {
-        $this->_options = $options;
-    }
-
-    /**
-     * Gets the options text
-     *
-     * @return string
-     */
-    public function getOptionsText()
-    {
-        return $this->_optionsText;
-    }
-
-    /**
-     * Sets the options text
-     *
-     * @param string $optionsText optionsText
-     *
-     * @return void
-     */
-    public function setOptionsText($optionsText)
-    {
-        $this->_optionsText = $optionsText;
-    }
-
-    /**
-     * Gets the MIME type
-     *
-     * @return string
-     */
-    public function getMimeType()
-    {
-        return $this->_mimeType;
-    }
-
-    /**
-     * Sets the MIME type
-     *
-     * @param string $mimeType MIME type
-     *
-     * @return void
-     */
-    public function setMimeType($mimeType)
-    {
-        $this->_mimeType = $mimeType;
-    }
-
-    /**
-     * Returns the property type ( either "options", or "plugin" ).
-     *
-     * @return string
-     */
-    public function getPropertyType()
-    {
-        return "plugin";
-    }
-}
diff --git a/#pma/libraries/properties/plugins/SchemaPluginProperties.php b/#pma/libraries/properties/plugins/SchemaPluginProperties.php
deleted file mode 100644
index 7aba43c4..00000000
--- a/#pma/libraries/properties/plugins/SchemaPluginProperties.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Properties class for the schema export plug-in
- *
- * @package PhpMyAdmin
- */
-namespace PMA\libraries\properties\plugins;
-
-/**
- * Defines possible options and getters and setters for them.
- *
- * @package PhpMyAdmin
- */
-class SchemaPluginProperties extends PluginPropertyItem
-{
-    /* ~~~~~~~~~~~~~~~~~~~~ Getters and Setters ~~~~~~~~~~~~~~~~~~~~ */
-
-    /**
-     * Returns the property item type of either an instance of
-     *  - PMA\libraries\properties\options\OptionsPropertyOneItem ( f.e. "bool",
-     *  "text", "radio", etc ) or
-     *  - PMA\libraries\properties\options\OptionsPropertyGroup   ( "root", "main"
-     *  or "subgroup" )
-     *  - PMA\libraries\properties\plugins\PluginPropertyItem     ( "export",
-     *  "import", "transformations" )
-     *
-     * @return string
-     */
-    public function getItemType()
-    {
-        return "schema";
-    }
-
-    /**
-     * Gets the force file parameter
-     *
-     * @return bool
-     */
-    public function getForceFile()
-    {
-        return true;
-    }
-}
diff --git a/#pma/libraries/relation.lib.php b/#pma/libraries/relation.lib.php
deleted file mode 100644
index 7d01c6af..00000000
--- a/#pma/libraries/relation.lib.php
+++ /dev/null
@@ -1,2077 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Set of functions used with the relation and pdf feature
- *
- * @package PhpMyAdmin
- */
-use PMA\libraries\Message;
-use PMA\libraries\Table;
-use PMA\libraries\RecentFavoriteTable;
-use SqlParser\Statements\CreateStatement;
-
-/**
- * Executes a query as controluser if possible, otherwise as normal user
- *
- * @param string  $sql        the query to execute
- * @param boolean $show_error whether to display SQL error messages or not
- * @param int     $options    query options
- *
- * @return resource|boolean the result set, or false if no result set
- *
- * @access  public
- *
- */
-function PMA_queryAsControlUser($sql, $show_error = true, $options = 0)
-{
-    // Avoid caching of the number of rows affected; for example, this function
-    // is called for tracking purposes but we want to display the correct number
-    // of rows affected by the original query, not by the query generated for
-    // tracking.
-    $cache_affected_rows = false;
-
-    if ($show_error) {
-        $result = $GLOBALS['dbi']->query(
-            $sql,
-            $GLOBALS['controllink'],
-            $options,
-            $cache_affected_rows
-        );
-    } else {
-        $result = @$GLOBALS['dbi']->tryQuery(
-            $sql,
-            $GLOBALS['controllink'],
-            $options,
-            $cache_affected_rows
-        );
-    } // end if... else...
-
-    if ($result) {
-        return $result;
-    } else {
-        return false;
-    }
-} // end of the "PMA_queryAsControlUser()" function
-
-/**
- * Returns current relation parameters
- *
- * @return array   $cfgRelation
- */
-function PMA_getRelationsParam()
-{
-    if (empty($_SESSION['relation'][$GLOBALS['server']])
-        || (empty($_SESSION['relation'][$GLOBALS['server']]['PMA_VERSION']))
-        || $_SESSION['relation'][$GLOBALS['server']]['PMA_VERSION'] != PMA_VERSION
-    ) {
-        $_SESSION['relation'][$GLOBALS['server']] = PMA_checkRelationsParam();
-    }
-
-    // just for BC but needs to be before PMA_getRelationsParamDiagnostic()
-    // which uses it
-    $GLOBALS['cfgRelation'] = $_SESSION['relation'][$GLOBALS['server']];
-
-    return $_SESSION['relation'][$GLOBALS['server']];
-}
-
-/**
- * prints out diagnostic info for pma relation feature
- *
- * @param array $cfgRelation Relation configuration
- *
- * @return string
- */
-function PMA_getRelationsParamDiagnostic($cfgRelation)
-{
-    $retval = '<br>';
-
-    $messages = array();
-    $messages['error'] = '<span style="color:red"><strong>'
-        . __('not OK')
-        . '</strong></span>';
-
-    $messages['ok'] = '<span style="color:green"><strong>'
-        .  _pgettext('Correctly working', 'OK')
-        . '</strong></span>';
-
-    $messages['enabled']  = '<span style="color:green">' . __('Enabled') . '</span>';
-    $messages['disabled'] = '<span style="color:red">'   . __('Disabled') . '</span>';
-
-    if (empty($cfgRelation['db'])) {
-        $retval .= __('Configuration of pmadb…') . ' '
-             . $messages['error']
-             . PMA\libraries\Util::showDocu('setup', 'linked-tables')
-             . '<br />' . "\n"
-             . __('General relation features')
-             . ' <font color="green">' . __('Disabled')
-             . '</font>' . "\n";
-        if ($GLOBALS['cfg']['ZeroConf']) {
-            if (empty($GLOBALS['db'])) {
-                $retval .= PMA_getHtmlFixPMATables(true, true);
-            } else {
-                $retval .= PMA_getHtmlFixPMATables(true);
-            }
-        }
-    } else {
-        $retval .= '<table>' . "\n";
-
-        if (! $cfgRelation['allworks']
-            && $GLOBALS['cfg']['ZeroConf']
-            // Avoid showing a "Create missing tables" link if it's a
-            // problem of missing definition
-            && PMA_arePmadbTablesDefined()
-        ) {
-            $retval .= PMA_getHtmlFixPMATables(false);
-            $retval .= '<br />';
-        }
-
-        $retval .= PMA_getDiagMessageForParameter(
-            'pmadb',
-            $cfgRelation['db'],
-            $messages,
-            'pmadb'
-        );
-        $retval .= PMA_getDiagMessageForParameter(
-            'relation',
-            isset($cfgRelation['relation']),
-            $messages,
-            'relation'
-        );
-        $retval .= PMA_getDiagMessageForFeature(
-            __('General relation features'),
-            'relwork',
-            $messages
-        );
-        $retval .= PMA_getDiagMessageForParameter(
-            'table_info',
-            isset($cfgRelation['table_info']),
-            $messages,
-            'table_info'
-        );
-        $retval .= PMA_getDiagMessageForFeature(
-            __('Display Features'),
-            'displaywork',
-            $messages
-        );
-        $retval .= PMA_getDiagMessageForParameter(
-            'table_coords',
-            isset($cfgRelation['table_coords']),
-            $messages,
-            'table_coords'
-        );
-        $retval .= PMA_getDiagMessageForParameter(
-            'pdf_pages',
-            isset($cfgRelation['pdf_pages']),
-            $messages,
-            'pdf_pages'
-        );
-        $retval .= PMA_getDiagMessageForFeature(
-            __('Designer and creation of PDFs'),
-            'pdfwork',
-            $messages
-        );
-        $retval .= PMA_getDiagMessageForParameter(
-            'column_info',
-            isset($cfgRelation['column_info']),
-            $messages,
-            'column_info'
-        );
-        $retval .= PMA_getDiagMessageForFeature(
-            __('Displaying Column Comments'),
-            'commwork',
-            $messages,
-            false
-        );
-        $retval .= PMA_getDiagMessageForFeature(
-            __('Browser transformation'),
-            'mimework',
-            $messages
-        );
-        if ($cfgRelation['commwork'] && ! $cfgRelation['mimework']) {
-            $retval .= '<tr><td colspan=2 class="left error">';
-            $retval .=  __(
-                'Please see the documentation on how to'
-                . ' update your column_info table. '
-            );
-            $retval .= PMA\libraries\Util::showDocu(
-                'config',
-                'cfg_Servers_column_info'
-            );
-            $retval .= '</td></tr>';
-        }
-        $retval .= PMA_getDiagMessageForParameter(
-            'bookmarktable',
-            isset($cfgRelation['bookmark']),
-            $messages,
-            'bookmark'
-        );
-        $retval .= PMA_getDiagMessageForFeature(
-            __('Bookmarked SQL query'),
-            'bookmarkwork',
-            $messages
-        );
-        $retval .= PMA_getDiagMessageForParameter(
-            'history',
-            isset($cfgRelation['history']),
-            $messages,
-            'history'
-        );
-        $retval .= PMA_getDiagMessageForFeature(
-            __('SQL history'),
-            'historywork',
-            $messages
-        );
-        $retval .= PMA_getDiagMessageForParameter(
-            'recent',
-            isset($cfgRelation['recent']),
-            $messages,
-            'recent'
-        );
-        $retval .= PMA_getDiagMessageForFeature(
-            __('Persistent recently used tables'),
-            'recentwork',
-            $messages
-        );
-        $retval .= PMA_getDiagMessageForParameter(
-            'favorite',
-            isset($cfgRelation['favorite']),
-            $messages,
-            'favorite'
-        );
-        $retval .= PMA_getDiagMessageForFeature(
-            __('Persistent favorite tables'),
-            'favoritework',
-            $messages
-        );
-        $retval .= PMA_getDiagMessageForParameter(
-            'table_uiprefs',
-            isset($cfgRelation['table_uiprefs']),
-            $messages,
-            'table_uiprefs'
-        );
-        $retval .= PMA_getDiagMessageForFeature(
-            __('Persistent tables\' UI preferences'),
-            'uiprefswork',
-            $messages
-        );
-        $retval .= PMA_getDiagMessageForParameter(
-            'tracking',
-            isset($cfgRelation['tracking']),
-            $messages,
-            'tracking'
-        );
-        $retval .= PMA_getDiagMessageForFeature(
-            __('Tracking'),
-            'trackingwork',
-            $messages
-        );
-        $retval .= PMA_getDiagMessageForParameter(
-            'userconfig',
-            isset($cfgRelation['userconfig']),
-            $messages,
-            'userconfig'
-        );
-        $retval .= PMA_getDiagMessageForFeature(
-            __('User preferences'),
-            'userconfigwork',
-            $messages
-        );
-        $retval .= PMA_getDiagMessageForParameter(
-            'users',
-            isset($cfgRelation['users']),
-            $messages,
-            'users'
-        );
-        $retval .= PMA_getDiagMessageForParameter(
-            'usergroups',
-            isset($cfgRelation['usergroups']),
-            $messages,
-            'usergroups'
-        );
-        $retval .= PMA_getDiagMessageForFeature(
-            __('Configurable menus'),
-            'menuswork',
-            $messages
-        );
-        $retval .= PMA_getDiagMessageForParameter(
-            'navigationhiding',
-            isset($cfgRelation['navigationhiding']),
-            $messages,
-            'navigationhiding'
-        );
-        $retval .= PMA_getDiagMessageForFeature(
-            __('Hide/show navigation items'),
-            'navwork',
-            $messages
-        );
-        $retval .= PMA_getDiagMessageForParameter(
-            'savedsearches',
-            isset($cfgRelation['savedsearches']),
-            $messages,
-            'savedsearches'
-        );
-        $retval .= PMA_getDiagMessageForFeature(
-            __('Saving Query-By-Example searches'),
-            'savedsearcheswork',
-            $messages
-        );
-        $retval .= PMA_getDiagMessageForParameter(
-            'central_columns',
-            isset($cfgRelation['central_columns']),
-            $messages,
-            'central_columns'
-        );
-        $retval .= PMA_getDiagMessageForFeature(
-            __('Managing Central list of columns'),
-            'centralcolumnswork',
-            $messages
-        );
-        $retval .= PMA_getDiagMessageForParameter(
-            'designer_settings',
-            isset($cfgRelation['designer_settings']),
-            $messages,
-            'designer_settings'
-        );
-        $retval .= PMA_getDiagMessageForFeature(
-            __('Remembering Designer Settings'),
-            'designersettingswork',
-            $messages
-        );
-        $retval .= PMA_getDiagMessageForParameter(
-            'export_templates',
-            isset($cfgRelation['export_templates']),
-            $messages,
-            'export_templates'
-        );
-        $retval .= PMA_getDiagMessageForFeature(
-            __('Saving export templates'),
-            'exporttemplateswork',
-            $messages
-        );
-        $retval .= '</table>' . "\n";
-
-        if (! $cfgRelation['allworks']) {
-
-            $retval .= '<p>' . __('Quick steps to set up advanced features:')
-                . '</p>';
-
-            $items = array();
-            $items[] = sprintf(
-                __(
-                    'Create the needed tables with the '
-                    . '<code>%screate_tables.sql</code>.'
-                ),
-                htmlspecialchars(SQL_DIR)
-            ) . ' ' . PMA\libraries\Util::showDocu('setup', 'linked-tables');
-            $items[] = __('Create a pma user and give access to these tables.') . ' '
-                . PMA\libraries\Util::showDocu('config', 'cfg_Servers_controluser');
-            $items[] = __(
-                'Enable advanced features in configuration file '
-                . '(<code>config.inc.php</code>), for example by '
-                . 'starting from <code>config.sample.inc.php</code>.'
-            ) . ' ' . PMA\libraries\Util::showDocu('setup', 'quick-install');
-            $items[] = __(
-                'Re-login to phpMyAdmin to load the updated configuration file.'
-            );
-
-            $retval .= PMA\libraries\Template::get('list/unordered')->render(
-                array('items' => $items,)
-            );
-        }
-    }
-
-    return $retval;
-}
-
-/**
- * prints out one diagnostic message for a feature
- *
- * @param string  $feature_name       feature name in a message string
- * @param string  $relation_parameter the $GLOBALS['cfgRelation'] parameter to check
- * @param array   $messages           utility messages
- * @param boolean $skip_line          whether to skip a line after the message
- *
- * @return string
- */
-function PMA_getDiagMessageForFeature($feature_name,
-    $relation_parameter, $messages, $skip_line = true
-) {
-    $retval = '    <tr><td colspan=2 class="right">' . $feature_name . ': ';
-    if (isset($GLOBALS['cfgRelation'][$relation_parameter])
-        && $GLOBALS['cfgRelation'][$relation_parameter]
-    ) {
-        $retval .= $messages['enabled'];
-    } else {
-        $retval .= $messages['disabled'];
-    }
-    $retval .= '</td></tr>';
-    if ($skip_line) {
-        $retval .= '<tr><td>&nbsp;</td></tr>';
-    }
-    return $retval;
-}
-
-/**
- * prints out one diagnostic message for a configuration parameter
- *
- * @param string  $parameter            config parameter name to display
- * @param boolean $relationParameterSet whether this parameter is set
- * @param array   $messages             utility messages
- * @param string  $docAnchor            anchor in documentation
- *
- * @return string
- */
-function PMA_getDiagMessageForParameter($parameter,
-    $relationParameterSet, $messages, $docAnchor
-) {
-    $retval = '<tr><th class="left">';
-    $retval .= '$cfg[\'Servers\'][$i][\'' . $parameter . '\']  ... ';
-    $retval .= '</th><td class="right">';
-    if ($relationParameterSet) {
-        $retval .= $messages['ok'];
-    } else {
-        $retval .= sprintf(
-            $messages['error'],
-            PMA\libraries\Util::getDocuLink('config', 'cfg_Servers_' . $docAnchor)
-        );
-    }
-    $retval .= '</td></tr>' . "\n";
-    return $retval;
-}
-
-
-/**
- * Defines the relation parameters for the current user
- * just a copy of the functions used for relations ;-)
- * but added some stuff to check what will work
- *
- * @access  protected
- * @return array    the relation parameters for the current user
- */
-function PMA_checkRelationsParam()
-{
-    $cfgRelation                   = array();
-    $cfgRelation['PMA_VERSION']    = PMA_VERSION;
-
-    $workToTable = array(
-        'relwork' => 'relation',
-        'displaywork' => array('relation', 'table_info'),
-        'bookmarkwork' => 'bookmarktable',
-        'pdfwork' => array('table_coords', 'pdf_pages'),
-        'commwork' => 'column_info',
-        'mimework' => 'column_info',
-        'historywork' => 'history',
-        'recentwork' => 'recent',
-        'favoritework' => 'favorite',
-        'uiprefswork' => 'table_uiprefs',
-        'trackingwork' => 'tracking',
-        'userconfigwork' => 'userconfig',
-        'menuswork' => array('users', 'usergroups'),
-        'navwork' => 'navigationhiding',
-        'savedsearcheswork' => 'savedsearches',
-        'centralcolumnswork' => 'central_columns',
-        'designersettingswork' => 'designer_settings',
-        'exporttemplateswork' => 'export_templates',
-    );
-
-    foreach ($workToTable as $work => $table) {
-        $cfgRelation[$work] = false;
-    }
-    $cfgRelation['allworks']       = false;
-    $cfgRelation['user']           = null;
-    $cfgRelation['db']             = null;
-
-    if ($GLOBALS['server'] == 0
-        || empty($GLOBALS['cfg']['Server']['pmadb'])
-        || empty($GLOBALS['controllink'])
-        || ! $GLOBALS['dbi']->selectDb(
-            $GLOBALS['cfg']['Server']['pmadb'], $GLOBALS['controllink']
-        )
-    ) {
-        // No server selected -> no bookmark table
-        // we return the array with the falses in it,
-        // to avoid some 'Uninitialized string offset' errors later
-        $GLOBALS['cfg']['Server']['pmadb'] = false;
-        return $cfgRelation;
-    }
-
-    $cfgRelation['user']  = $GLOBALS['cfg']['Server']['user'];
-    $cfgRelation['db']    = $GLOBALS['cfg']['Server']['pmadb'];
-
-    //  Now I just check if all tables that i need are present so I can for
-    //  example enable relations but not pdf...
-    //  I was thinking of checking if they have all required columns but I
-    //  fear it might be too slow
-
-    $tab_query = 'SHOW TABLES FROM '
-        . PMA\libraries\Util::backquote(
-            $GLOBALS['cfg']['Server']['pmadb']
-        );
-    $tab_rs    = PMA_queryAsControlUser(
-        $tab_query, false, PMA\libraries\DatabaseInterface::QUERY_STORE
-    );
-
-    if (! $tab_rs) {
-        // query failed ... ?
-        //$GLOBALS['cfg']['Server']['pmadb'] = false;
-        return $cfgRelation;
-    }
-
-    while ($curr_table = @$GLOBALS['dbi']->fetchRow($tab_rs)) {
-        if ($curr_table[0] == $GLOBALS['cfg']['Server']['bookmarktable']) {
-            $cfgRelation['bookmark']        = $curr_table[0];
-        } elseif ($curr_table[0] == $GLOBALS['cfg']['Server']['relation']) {
-            $cfgRelation['relation']        = $curr_table[0];
-        } elseif ($curr_table[0] == $GLOBALS['cfg']['Server']['table_info']) {
-            $cfgRelation['table_info']      = $curr_table[0];
-        } elseif ($curr_table[0] == $GLOBALS['cfg']['Server']['table_coords']) {
-            $cfgRelation['table_coords']    = $curr_table[0];
-        } elseif ($curr_table[0] == $GLOBALS['cfg']['Server']['column_info']) {
-            $cfgRelation['column_info']     = $curr_table[0];
-        } elseif ($curr_table[0] == $GLOBALS['cfg']['Server']['pdf_pages']) {
-            $cfgRelation['pdf_pages']       = $curr_table[0];
-        } elseif ($curr_table[0] == $GLOBALS['cfg']['Server']['history']) {
-            $cfgRelation['history']         = $curr_table[0];
-        } elseif ($curr_table[0] == $GLOBALS['cfg']['Server']['recent']) {
-            $cfgRelation['recent']          = $curr_table[0];
-        } elseif ($curr_table[0] == $GLOBALS['cfg']['Server']['favorite']) {
-            $cfgRelation['favorite']        = $curr_table[0];
-        } elseif ($curr_table[0] == $GLOBALS['cfg']['Server']['table_uiprefs']) {
-            $cfgRelation['table_uiprefs']   = $curr_table[0];
-        } elseif ($curr_table[0] == $GLOBALS['cfg']['Server']['tracking']) {
-            $cfgRelation['tracking']        = $curr_table[0];
-        } elseif ($curr_table[0] == $GLOBALS['cfg']['Server']['userconfig']) {
-            $cfgRelation['userconfig']      = $curr_table[0];
-        } elseif ($curr_table[0] == $GLOBALS['cfg']['Server']['users']) {
-            $cfgRelation['users']           = $curr_table[0];
-        } elseif ($curr_table[0] == $GLOBALS['cfg']['Server']['usergroups']) {
-            $cfgRelation['usergroups']      = $curr_table[0];
-        } elseif ($curr_table[0] == $GLOBALS['cfg']['Server']['navigationhiding']) {
-            $cfgRelation['navigationhiding']      = $curr_table[0];
-        } elseif ($curr_table[0] == $GLOBALS['cfg']['Server']['savedsearches']) {
-            $cfgRelation['savedsearches']    = $curr_table[0];
-        } elseif ($curr_table[0] == $GLOBALS['cfg']['Server']['central_columns']) {
-            $cfgRelation['central_columns']    = $curr_table[0];
-        } elseif ($curr_table[0] == $GLOBALS['cfg']['Server']['designer_settings']) {
-            $cfgRelation['designer_settings'] = $curr_table[0];
-        } elseif ($curr_table[0] == $GLOBALS['cfg']['Server']['export_templates']) {
-            $cfgRelation['export_templates']    = $curr_table[0];
-        }
-    } // end while
-    $GLOBALS['dbi']->freeResult($tab_rs);
-
-    if (isset($cfgRelation['relation'])) {
-        $cfgRelation['relwork']     = true;
-    }
-
-    if (isset($cfgRelation['relation']) && isset($cfgRelation['table_info'])) {
-        $cfgRelation['displaywork'] = true;
-    }
-
-    if (isset($cfgRelation['table_coords']) && isset($cfgRelation['pdf_pages'])) {
-        $cfgRelation['pdfwork']     = true;
-    }
-
-    if (isset($cfgRelation['column_info'])) {
-        $cfgRelation['commwork']    = true;
-        // phpMyAdmin 4.3+
-        // Check for input transformations upgrade.
-        $cfgRelation['mimework'] = PMA_tryUpgradeTransformations();
-    }
-
-    if (isset($cfgRelation['history'])) {
-        $cfgRelation['historywork']     = true;
-    }
-
-    if (isset($cfgRelation['recent'])) {
-        $cfgRelation['recentwork']      = true;
-    }
-
-    if (isset($cfgRelation['favorite'])) {
-        $cfgRelation['favoritework']    = true;
-    }
-
-    if (isset($cfgRelation['table_uiprefs'])) {
-        $cfgRelation['uiprefswork']     = true;
-    }
-
-    if (isset($cfgRelation['tracking'])) {
-        $cfgRelation['trackingwork']     = true;
-    }
-
-    if (isset($cfgRelation['userconfig'])) {
-        $cfgRelation['userconfigwork']   = true;
-    }
-
-    if (isset($cfgRelation['bookmark'])) {
-        $cfgRelation['bookmarkwork']     = true;
-    }
-
-    if (isset($cfgRelation['users']) && isset($cfgRelation['usergroups'])) {
-        $cfgRelation['menuswork']        = true;
-    }
-
-    if (isset($cfgRelation['navigationhiding'])) {
-        $cfgRelation['navwork']          = true;
-    }
-
-    if (isset($cfgRelation['savedsearches'])) {
-        $cfgRelation['savedsearcheswork']      = true;
-    }
-
-    if (isset($cfgRelation['central_columns'])) {
-        $cfgRelation['centralcolumnswork']      = true;
-    }
-
-    if (isset($cfgRelation['designer_settings'])) {
-        $cfgRelation['designersettingswork']    = true;
-    }
-
-    if (isset($cfgRelation['export_templates'])) {
-        $cfgRelation['exporttemplateswork']      = true;
-    }
-
-    $allWorks = true;
-    foreach ($workToTable as $work => $table) {
-        if (! $cfgRelation[$work]) {
-            if (is_string($table)) {
-                if (isset($GLOBALS['cfg']['Server'][$table])
-                    && $GLOBALS['cfg']['Server'][$table] !== false
-                ) {
-                    $allWorks = false;
-                    break;
-                }
-            } else if (is_array($table)) {
-                $oneNull = false;
-                foreach ($table as $t) {
-                    if (isset($GLOBALS['cfg']['Server'][$t])
-                        && $GLOBALS['cfg']['Server'][$t] === false
-                    ) {
-                        $oneNull = true;
-                        break;
-                    }
-                }
-                if (! $oneNull) {
-                    $allWorks = false;
-                    break;
-                }
-            }
-        }
-    }
-    $cfgRelation['allworks'] = $allWorks;
-
-    return $cfgRelation;
-} // end of the 'PMA_checkRelationsParam()' function
-
-/**
- * Check whether column_info table input transformation
- * upgrade is required and try to upgrade silently
- *
- * @return bool false if upgrade failed
- *
- * @access  public
- */
-function PMA_tryUpgradeTransformations()
-{
-    // From 4.3, new input oriented transformation feature was introduced.
-    // Check whether column_info table has input transformation columns
-    $new_cols = array(
-        "input_transformation",
-        "input_transformation_options"
-    );
-    $query = 'SHOW COLUMNS FROM '
-        . PMA\libraries\Util::backquote($GLOBALS['cfg']['Server']['pmadb'])
-        . '.' . PMA\libraries\Util::backquote(
-            $GLOBALS['cfg']['Server']['column_info']
-        )
-        . ' WHERE Field IN (\'' . implode('\', \'', $new_cols) . '\')';
-    $result = PMA_queryAsControlUser(
-        $query, false, PMA\libraries\DatabaseInterface::QUERY_STORE
-    );
-    if ($result) {
-        $rows = $GLOBALS['dbi']->numRows($result);
-        $GLOBALS['dbi']->freeResult($result);
-        // input transformations are present
-        // no need to upgrade
-        if ($rows === 2) {
-            return true;
-            // try silent upgrade without disturbing the user
-        } else {
-            // read upgrade query file
-            $query = @file_get_contents(SQL_DIR . 'upgrade_column_info_4_3_0+.sql');
-            // replace database name from query to with set in config.inc.php
-            $query = str_replace(
-                '`phpmyadmin`',
-                PMA\libraries\Util::backquote($GLOBALS['cfg']['Server']['pmadb']),
-                $query
-            );
-            // replace pma__column_info table name from query
-            // to with set in config.inc.php
-            $query = str_replace(
-                '`pma__column_info`',
-                PMA\libraries\Util::backquote(
-                    $GLOBALS['cfg']['Server']['column_info']
-                ),
-                $query
-            );
-            $GLOBALS['dbi']->tryMultiQuery($query, $GLOBALS['controllink']);
-            // skips result sets of query as we are not interested in it
-            while ($GLOBALS['dbi']->moreResults($GLOBALS['controllink'])
-                && $GLOBALS['dbi']->nextResult($GLOBALS['controllink'])
-            ) {
-            }
-            $error = $GLOBALS['dbi']->getError($GLOBALS['controllink']);
-            // return true if no error exists otherwise false
-            return empty($error);
-        }
-    }
-    // some failure, either in upgrading or something else
-    // make some noise, time to wake up user.
-    return false;
-}
-
-/**
- * Gets all Relations to foreign tables for a given table or
- * optionally a given column in a table
- *
- * @param string $db     the name of the db to check for
- * @param string $table  the name of the table to check for
- * @param string $column the name of the column to check for
- * @param string $source the source for foreign key information
- *
- * @return array    db,table,column
- *
- * @access  public
- */
-function PMA_getForeigners($db, $table, $column = '', $source = 'both')
-{
-    $cfgRelation = PMA_getRelationsParam();
-    $foreign = array();
-
-    if ($cfgRelation['relwork'] && ($source == 'both' || $source == 'internal')) {
-        $rel_query = '
-            SELECT `master_field`,
-                `foreign_db`,
-                `foreign_table`,
-                `foreign_field`
-            FROM ' . PMA\libraries\Util::backquote($cfgRelation['db'])
-                . '.' . PMA\libraries\Util::backquote($cfgRelation['relation']) . '
-            WHERE `master_db`    = \'' . $GLOBALS['dbi']->escapeString($db) . '\'
-                AND `master_table` = \'' . $GLOBALS['dbi']->escapeString($table)
-            . '\' ';
-        if (mb_strlen($column)) {
-            $rel_query .= ' AND `master_field` = '
-                . '\'' . $GLOBALS['dbi']->escapeString($column) . '\'';
-        }
-        $foreign = $GLOBALS['dbi']->fetchResult(
-            $rel_query, 'master_field', null, $GLOBALS['controllink']
-        );
-    }
-
-    if (($source == 'both' || $source == 'foreign') && mb_strlen($table)
-    ) {
-        $tableObj = new Table($table, $db);
-        $show_create_table = $tableObj->showCreate();
-        if ($show_create_table) {
-            $parser = new SqlParser\Parser($show_create_table);
-            /**
-             * @var CreateStatement $stmt
-             */
-            $stmt = $parser->statements[0];
-            $foreign['foreign_keys_data'] = SqlParser\Utils\Table::getForeignKeys(
-                $stmt
-            );
-        }
-    }
-
-    /**
-     * Emulating relations for some information_schema tables
-     */
-    $isInformationSchema = mb_strtolower($db) == 'information_schema';
-        $isMysql = mb_strtolower($db) == 'mysql';
-    if (($isInformationSchema || $isMysql)
-        && ($source == 'internal' || $source == 'both')
-    ) {
-        if ($isInformationSchema) {
-            $relations_key = 'information_schema_relations';
-            include_once './libraries/information_schema_relations.lib.php';
-        } else {
-            $relations_key = 'mysql_relations';
-            include_once './libraries/mysql_relations.lib.php';
-        }
-        if (isset($GLOBALS[$relations_key][$table])) {
-            foreach ($GLOBALS[$relations_key][$table] as $field => $relations) {
-                if ((! mb_strlen($column) || $column == $field)
-                    && (! isset($foreign[$field])
-                    || ! mb_strlen($foreign[$field]))
-                ) {
-                    $foreign[$field] = $relations;
-                }
-            }
-        }
-    }
-
-    return $foreign;
-} // end of the 'PMA_getForeigners()' function
-
-/**
- * Gets the display field of a table
- *
- * @param string $db    the name of the db to check for
- * @param string $table the name of the table to check for
- *
- * @return string   field name
- *
- * @access  public
- */
-function PMA_getDisplayField($db, $table)
-{
-    $cfgRelation = PMA_getRelationsParam();
-
-    /**
-     * Try to fetch the display field from DB.
-     */
-    if ($cfgRelation['displaywork']) {
-        $disp_query = '
-            SELECT `display_field`
-            FROM ' . PMA\libraries\Util::backquote($cfgRelation['db'])
-                . '.' . PMA\libraries\Util::backquote($cfgRelation['table_info']) . '
-            WHERE `db_name`    = \'' . $GLOBALS['dbi']->escapeString($db) . '\'
-                AND `table_name` = \'' . $GLOBALS['dbi']->escapeString($table)
-            . '\'';
-
-        $row = $GLOBALS['dbi']->fetchSingleRow(
-            $disp_query, 'ASSOC', $GLOBALS['controllink']
-        );
-        if (isset($row['display_field'])) {
-            return $row['display_field'];
-        }
-    }
-
-    /**
-     * Emulating the display field for some information_schema tables.
-     */
-    if ($db == 'information_schema') {
-        switch ($table) {
-        case 'CHARACTER_SETS':
-            return 'DESCRIPTION';
-        case 'TABLES':
-            return 'TABLE_COMMENT';
-        }
-    }
-
-    /**
-     * No Luck...
-     */
-    return false;
-
-} // end of the 'PMA_getDisplayField()' function
-
-/**
- * Gets the comments for all columns of a table or the db itself
- *
- * @param string $db    the name of the db to check for
- * @param string $table the name of the table to check for
- *
- * @return array    [column_name] = comment
- *
- * @access  public
- */
-function PMA_getComments($db, $table = '')
-{
-    $comments = array();
-
-    if ($table != '') {
-        // MySQL native column comments
-        $columns = $GLOBALS['dbi']->getColumns($db, $table, null, true);
-        if ($columns) {
-            foreach ($columns as $column) {
-                if (! empty($column['Comment'])) {
-                    $comments[$column['Field']] = $column['Comment'];
-                }
-            }
-        }
-    } else {
-        $comments[] = PMA_getDbComment($db);
-    }
-
-    return $comments;
-} // end of the 'PMA_getComments()' function
-
-/**
- * Gets the comment for a db
- *
- * @param string $db the name of the db to check for
- *
- * @return string   comment
- *
- * @access  public
- */
-function PMA_getDbComment($db)
-{
-    $cfgRelation = PMA_getRelationsParam();
-    $comment = '';
-
-    if ($cfgRelation['commwork']) {
-        // pmadb internal db comment
-        $com_qry = "
-            SELECT `comment`
-            FROM " . PMA\libraries\Util::backquote($cfgRelation['db'])
-                . "." . PMA\libraries\Util::backquote($cfgRelation['column_info'])
-                . "
-            WHERE db_name     = '" . $GLOBALS['dbi']->escapeString($db) . "'
-                AND table_name  = ''
-                AND column_name = '(db_comment)'";
-        $com_rs = PMA_queryAsControlUser(
-            $com_qry, true, PMA\libraries\DatabaseInterface::QUERY_STORE
-        );
-
-        if ($com_rs && $GLOBALS['dbi']->numRows($com_rs) > 0) {
-            $row = $GLOBALS['dbi']->fetchAssoc($com_rs);
-            $comment = $row['comment'];
-        }
-        $GLOBALS['dbi']->freeResult($com_rs);
-    }
-
-    return $comment;
-} // end of the 'PMA_getDbComment()' function
-
-/**
- * Gets the comment for a db
- *
- * @access  public
- *
- * @return string   comment
- */
-function PMA_getDbComments()
-{
-    $cfgRelation = PMA_getRelationsParam();
-    $comments = array();
-
-    if ($cfgRelation['commwork']) {
-        // pmadb internal db comment
-        $com_qry = "
-            SELECT `db_name`, `comment`
-            FROM " . PMA\libraries\Util::backquote($cfgRelation['db'])
-                . "." . PMA\libraries\Util::backquote($cfgRelation['column_info'])
-                . "
-            WHERE `column_name` = '(db_comment)'";
-        $com_rs = PMA_queryAsControlUser(
-            $com_qry, true, PMA\libraries\DatabaseInterface::QUERY_STORE
-        );
-
-        if ($com_rs && $GLOBALS['dbi']->numRows($com_rs) > 0) {
-            while ($row = $GLOBALS['dbi']->fetchAssoc($com_rs)) {
-                $comments[$row['db_name']] = $row['comment'];
-            }
-        }
-        $GLOBALS['dbi']->freeResult($com_rs);
-    }
-
-    return $comments;
-} // end of the 'PMA_getDbComments()' function
-
-/**
- * Set a database comment to a certain value.
- *
- * @param string $db      the name of the db
- * @param string $comment the value of the column
- *
- * @return boolean  true, if comment-query was made.
- *
- * @access  public
- */
-function PMA_setDbComment($db, $comment = '')
-{
-    $cfgRelation = PMA_getRelationsParam();
-
-    if (! $cfgRelation['commwork']) {
-        return false;
-    }
-
-    if (mb_strlen($comment)) {
-        $upd_query = 'INSERT INTO '
-            . PMA\libraries\Util::backquote($cfgRelation['db']) . '.'
-            . PMA\libraries\Util::backquote($cfgRelation['column_info'])
-            . ' (`db_name`, `table_name`, `column_name`, `comment`)'
-            . ' VALUES (\''
-            . $GLOBALS['dbi']->escapeString($db)
-            . "', '', '(db_comment)', '"
-            . $GLOBALS['dbi']->escapeString($comment)
-            . "') "
-            . ' ON DUPLICATE KEY UPDATE '
-            . "`comment` = '" . $GLOBALS['dbi']->escapeString($comment) . "'";
-    } else {
-        $upd_query = 'DELETE FROM '
-            . PMA\libraries\Util::backquote($cfgRelation['db']) . '.'
-            . PMA\libraries\Util::backquote($cfgRelation['column_info'])
-            . ' WHERE `db_name`     = \'' . $GLOBALS['dbi']->escapeString($db)
-            . '\'
-                AND `table_name`  = \'\'
-                AND `column_name` = \'(db_comment)\'';
-    }
-
-    if (isset($upd_query)) {
-        return PMA_queryAsControlUser($upd_query);
-    }
-
-    return false;
-} // end of 'PMA_setDbComment()' function
-
-/**
- * Set a SQL history entry
- *
- * @param string $db       the name of the db
- * @param string $table    the name of the table
- * @param string $username the username
- * @param string $sqlquery the sql query
- *
- * @return void
- *
- * @access  public
- */
-function PMA_setHistory($db, $table, $username, $sqlquery)
-{
-    $maxCharactersInDisplayedSQL = $GLOBALS['cfg']['MaxCharactersInDisplayedSQL'];
-    // Prevent to run this automatically on Footer class destroying in testsuite
-    if (defined('TESTSUITE')
-        || mb_strlen($sqlquery) > $maxCharactersInDisplayedSQL
-    ) {
-        return;
-    }
-
-    $cfgRelation = PMA_getRelationsParam();
-
-    if (! isset($_SESSION['sql_history'])) {
-        $_SESSION['sql_history'] = array();
-    }
-
-    $_SESSION['sql_history'][] = array(
-        'db' => $db,
-        'table' => $table,
-        'sqlquery' => $sqlquery,
-    );
-
-    if (count($_SESSION['sql_history']) > $GLOBALS['cfg']['QueryHistoryMax']) {
-        // history should not exceed a maximum count
-        array_shift($_SESSION['sql_history']);
-    }
-
-    if (! $cfgRelation['historywork'] || ! $GLOBALS['cfg']['QueryHistoryDB']) {
-        return;
-    }
-
-    PMA_queryAsControlUser(
-        'INSERT INTO '
-        . PMA\libraries\Util::backquote($cfgRelation['db']) . '.'
-        . PMA\libraries\Util::backquote($cfgRelation['history']) . '
-              (`username`,
-                `db`,
-                `table`,
-                `timevalue`,
-                `sqlquery`)
-        VALUES
-              (\'' . $GLOBALS['dbi']->escapeString($username) . '\',
-               \'' . $GLOBALS['dbi']->escapeString($db) . '\',
-               \'' . $GLOBALS['dbi']->escapeString($table) . '\',
-               NOW(),
-               \'' . $GLOBALS['dbi']->escapeString($sqlquery) . '\')'
-    );
-
-    PMA_purgeHistory($username);
-
-} // end of 'PMA_setHistory()' function
-
-/**
- * Gets a SQL history entry
- *
- * @param string $username the username
- *
- * @return array    list of history items
- *
- * @access  public
- */
-function PMA_getHistory($username)
-{
-    $cfgRelation = PMA_getRelationsParam();
-
-    if (! $cfgRelation['historywork']) {
-        return false;
-    }
-
-    /**
-     * if db-based history is disabled but there exists a session-based
-     * history, use it
-     */
-    if (! $GLOBALS['cfg']['QueryHistoryDB']) {
-        if (isset($_SESSION['sql_history'])) {
-            return array_reverse($_SESSION['sql_history']);
-        }
-        return false;
-    }
-
-    $hist_query = '
-         SELECT `db`,
-                `table`,
-                `sqlquery`,
-                `timevalue`
-           FROM ' . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . '.' . PMA\libraries\Util::backquote($cfgRelation['history']) . '
-          WHERE `username` = \'' . $GLOBALS['dbi']->escapeString($username) . '\'
-       ORDER BY `id` DESC';
-
-    return $GLOBALS['dbi']->fetchResult(
-        $hist_query, null, null, $GLOBALS['controllink']
-    );
-} // end of 'PMA_getHistory()' function
-
-/**
- * purges SQL history
- *
- * deletes entries that exceeds $cfg['QueryHistoryMax'], oldest first, for the
- * given user
- *
- * @param string $username the username
- *
- * @return void
- *
- * @access  public
- */
-function PMA_purgeHistory($username)
-{
-    $cfgRelation = PMA_getRelationsParam();
-    if (! $GLOBALS['cfg']['QueryHistoryDB'] || ! $cfgRelation['historywork']) {
-        return;
-    }
-
-    if (! $cfgRelation['historywork']) {
-        return;
-    }
-
-    $search_query = '
-        SELECT `timevalue`
-        FROM ' . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . '.' . PMA\libraries\Util::backquote($cfgRelation['history']) . '
-        WHERE `username` = \'' . $GLOBALS['dbi']->escapeString($username) . '\'
-        ORDER BY `timevalue` DESC
-        LIMIT ' . $GLOBALS['cfg']['QueryHistoryMax'] . ', 1';
-
-    if ($max_time = $GLOBALS['dbi']->fetchValue(
-        $search_query, 0, 0, $GLOBALS['controllink']
-    )) {
-        PMA_queryAsControlUser(
-            'DELETE FROM '
-            . PMA\libraries\Util::backquote($cfgRelation['db']) . '.'
-            . PMA\libraries\Util::backquote($cfgRelation['history']) . '
-              WHERE `username` = \'' . $GLOBALS['dbi']->escapeString($username)
-            . '\'
-                AND `timevalue` <= \'' . $max_time . '\''
-        );
-    }
-} // end of 'PMA_purgeHistory()' function
-
-/**
- * Prepares the dropdown for one mode
- *
- * @param array  $foreign the keys and values for foreigns
- * @param string $data    the current data of the dropdown
- * @param string $mode    the needed mode
- *
- * @return array   the <option value=""><option>s
- *
- * @access  protected
- */
-function PMA_buildForeignDropdown($foreign, $data, $mode)
-{
-    $reloptions = array();
-
-    // id-only is a special mode used when no foreign display column
-    // is available
-    if ($mode == 'id-content' || $mode == 'id-only') {
-        // sort for id-content
-        if ($GLOBALS['cfg']['NaturalOrder']) {
-            uksort($foreign, 'strnatcasecmp');
-        } else {
-            ksort($foreign);
-        }
-    } elseif ($mode == 'content-id') {
-        // sort for content-id
-        if ($GLOBALS['cfg']['NaturalOrder']) {
-            natcasesort($foreign);
-        } else {
-            asort($foreign);
-        }
-    }
-
-    foreach ($foreign as $key => $value) {
-        if (mb_strlen($value) <= $GLOBALS['cfg']['LimitChars']
-        ) {
-            $vtitle = '';
-            $value  = htmlspecialchars($value);
-        } else {
-            $vtitle  = htmlspecialchars($value);
-            $value  = htmlspecialchars(
-                mb_substr(
-                    $value, 0, $GLOBALS['cfg']['LimitChars']
-                ) . '...'
-            );
-        }
-
-        $reloption = '<option value="' . htmlspecialchars($key) . '"';
-        if ($vtitle != '') {
-            $reloption .= ' title="' . $vtitle . '"';
-        }
-
-        if ((string) $key == (string) $data) {
-            $reloption .= ' selected="selected"';
-        }
-
-        if ($mode == 'content-id') {
-            $reloptions[] = $reloption . '>'
-                . $value . '&nbsp;-&nbsp;' . htmlspecialchars($key) .  '</option>';
-        } elseif ($mode == 'id-content') {
-            $reloptions[] = $reloption . '>'
-                . htmlspecialchars($key) .  '&nbsp;-&nbsp;' . $value . '</option>';
-        } elseif ($mode == 'id-only') {
-            $reloptions[] = $reloption . '>'
-                . htmlspecialchars($key) . '</option>';
-        }
-    } // end foreach
-
-    return $reloptions;
-} // end of 'PMA_buildForeignDropdown' function
-
-/**
- * Outputs dropdown with values of foreign fields
- *
- * @param array  $disp_row        array of the displayed row
- * @param string $foreign_field   the foreign field
- * @param string $foreign_display the foreign field to display
- * @param string $data            the current data of the dropdown (field in row)
- * @param int    $max             maximum number of items in the dropdown
- *
- * @return string   the <option value=""><option>s
- *
- * @access  public
- */
-function PMA_foreignDropdown($disp_row, $foreign_field, $foreign_display, $data,
-    $max = null
-) {
-    if (null === $max) {
-        $max = $GLOBALS['cfg']['ForeignKeyMaxLimit'];
-    }
-
-    $foreign = array();
-
-    // collect the data
-    foreach ($disp_row as $relrow) {
-        $key   = $relrow[$foreign_field];
-
-        // if the display field has been defined for this foreign table
-        if ($foreign_display) {
-            $value  = $relrow[$foreign_display];
-        } else {
-            $value = '';
-        } // end if ($foreign_display)
-
-        $foreign[$key] = $value;
-    } // end foreach
-
-    // put the dropdown sections in correct order
-    $top = array();
-    $bottom = array();
-    if ($foreign_display) {
-        if (PMA_isValid($GLOBALS['cfg']['ForeignKeyDropdownOrder'], 'array')) {
-            if (PMA_isValid($GLOBALS['cfg']['ForeignKeyDropdownOrder'][0])) {
-                $top = PMA_buildForeignDropdown(
-                    $foreign,
-                    $data,
-                    $GLOBALS['cfg']['ForeignKeyDropdownOrder'][0]
-                );
-            }
-            if (PMA_isValid($GLOBALS['cfg']['ForeignKeyDropdownOrder'][1])) {
-                $bottom = PMA_buildForeignDropdown(
-                    $foreign,
-                    $data,
-                    $GLOBALS['cfg']['ForeignKeyDropdownOrder'][1]
-                );
-            }
-        } else {
-            $top = PMA_buildForeignDropdown($foreign, $data, 'id-content');
-            $bottom = PMA_buildForeignDropdown($foreign, $data, 'content-id');
-        }
-    } else {
-        $top = PMA_buildForeignDropdown($foreign, $data, 'id-only');
-    }
-
-    // beginning of dropdown
-    $ret = '<option value="">&nbsp;</option>';
-    $top_count = count($top);
-    if ($max == -1 || $top_count < $max) {
-        $ret .= implode('', $top);
-        if ($foreign_display && $top_count > 0) {
-            // this empty option is to visually mark the beginning of the
-            // second series of values (bottom)
-            $ret .= '<option value="">&nbsp;</option>';
-        }
-    }
-    if ($foreign_display) {
-        $ret .= implode('', $bottom);
-    }
-
-    return $ret;
-} // end of 'PMA_foreignDropdown()' function
-
-/**
- * Gets foreign keys in preparation for a drop-down selector
- *
- * @param array|boolean $foreigners     array of the foreign keys
- * @param string        $field          the foreign field name
- * @param bool          $override_total whether to override the total
- * @param string        $foreign_filter a possible filter
- * @param string        $foreign_limit  a possible LIMIT clause
- * @param bool          $get_total      optional, whether to get total num of rows
- *                                      in $foreignData['the_total;]
- *                                      (has an effect of performance)
- *
- * @return array    data about the foreign keys
- *
- * @access  public
- */
-function PMA_getForeignData(
-    $foreigners, $field, $override_total,
-    $foreign_filter, $foreign_limit, $get_total=false
-) {
-    // we always show the foreign field in the drop-down; if a display
-    // field is defined, we show it besides the foreign field
-    $foreign_link = false;
-    do {
-        if (! $foreigners) {
-            break;
-        }
-        $foreigner = PMA_searchColumnInForeigners($foreigners, $field);
-        if ($foreigner != false) {
-            $foreign_db      = $foreigner['foreign_db'];
-            $foreign_table   = $foreigner['foreign_table'];
-            $foreign_field   = $foreigner['foreign_field'];
-        } else {
-            break;
-        }
-
-        // Count number of rows in the foreign table. Currently we do
-        // not use a drop-down if more than ForeignKeyMaxLimit rows in the
-        // foreign table,
-        // for speed reasons and because we need a better interface for this.
-        //
-        // We could also do the SELECT anyway, with a LIMIT, and ensure that
-        // the current value of the field is one of the choices.
-
-        // Check if table has more rows than specified by
-        // $GLOBALS['cfg']['ForeignKeyMaxLimit']
-        $moreThanLimit = $GLOBALS['dbi']->getTable($foreign_db, $foreign_table)
-            ->checkIfMinRecordsExist($GLOBALS['cfg']['ForeignKeyMaxLimit']);
-
-        if ($override_total == true
-            || !$moreThanLimit
-        ) {
-            // foreign_display can be false if no display field defined:
-            $foreign_display = PMA_getDisplayField($foreign_db, $foreign_table);
-
-            $f_query_main = 'SELECT ' . PMA\libraries\Util::backquote($foreign_field)
-                . (
-                    ($foreign_display == false)
-                        ? ''
-                        : ', ' . PMA\libraries\Util::backquote($foreign_display)
-                );
-            $f_query_from = ' FROM ' . PMA\libraries\Util::backquote($foreign_db)
-                . '.' . PMA\libraries\Util::backquote($foreign_table);
-            $f_query_filter = empty($foreign_filter) ? '' : ' WHERE '
-                . PMA\libraries\Util::backquote($foreign_field)
-                . ' LIKE "%' . $GLOBALS['dbi']->escapeString($foreign_filter) . '%"'
-                . (
-                ($foreign_display == false)
-                    ? ''
-                    : ' OR ' . PMA\libraries\Util::backquote($foreign_display)
-                    . ' LIKE "%' . $GLOBALS['dbi']->escapeString($foreign_filter)
-                    . '%"'
-                );
-            $f_query_order = ($foreign_display == false) ? '' :' ORDER BY '
-                . PMA\libraries\Util::backquote($foreign_table) . '.'
-                . PMA\libraries\Util::backquote($foreign_display);
-
-            $f_query_limit = ! empty($foreign_limit) ? ($foreign_limit) : '';
-
-            if (!empty($foreign_filter)) {
-                $the_total = $GLOBALS['dbi']->fetchValue(
-                    'SELECT COUNT(*)' . $f_query_from . $f_query_filter
-                );
-                if ($the_total === false) {
-                    $the_total = 0;
-                }
-            }
-
-            $disp  = $GLOBALS['dbi']->tryQuery(
-                $f_query_main . $f_query_from . $f_query_filter
-                . $f_query_order . $f_query_limit
-            );
-            if ($disp && $GLOBALS['dbi']->numRows($disp) > 0) {
-                // If a resultset has been created, pre-cache it in the $disp_row
-                // array. This helps us from not needing to use mysql_data_seek by
-                // accessing a pre-cached PHP array. Usually those resultsets are
-                // not that big, so a performance hit should not be expected.
-                $disp_row = array();
-                while ($single_disp_row = @$GLOBALS['dbi']->fetchAssoc($disp)) {
-                    $disp_row[] = $single_disp_row;
-                }
-                @$GLOBALS['dbi']->freeResult($disp);
-            } else {
-                // Either no data in the foreign table or
-                // user does not have select permission to foreign table/field
-                // Show an input field with a 'Browse foreign values' link
-                $disp_row = null;
-                $foreign_link = true;
-            }
-        } else {
-            $disp_row = null;
-            $foreign_link = true;
-        }
-    } while (false);
-
-    if ($get_total) {
-        $the_total = $GLOBALS['dbi']->getTable($foreign_db, $foreign_table)
-            ->countRecords(true);
-    }
-
-    $foreignData = array();
-    $foreignData['foreign_link'] = $foreign_link;
-    $foreignData['the_total'] = isset($the_total) ? $the_total : null;
-    $foreignData['foreign_display'] = (
-        isset($foreign_display) ? $foreign_display : null
-    );
-    $foreignData['disp_row'] = isset($disp_row) ? $disp_row : null;
-    $foreignData['foreign_field'] = isset($foreign_field) ? $foreign_field : null;
-
-    return $foreignData;
-} // end of 'PMA_getForeignData()' function
-
-/**
- * Rename a field in relation tables
- *
- * usually called after a column in a table was renamed
- *
- * @param string $db       database name
- * @param string $table    table name
- * @param string $field    old field name
- * @param string $new_name new field name
- *
- * @return void
- */
-function PMA_REL_renameField($db, $table, $field, $new_name)
-{
-    $cfgRelation = PMA_getRelationsParam();
-
-    if ($cfgRelation['displaywork']) {
-        $table_query = 'UPDATE '
-            . PMA\libraries\Util::backquote($cfgRelation['db']) . '.'
-            . PMA\libraries\Util::backquote($cfgRelation['table_info'])
-            . '   SET display_field = \'' . $GLOBALS['dbi']->escapeString(
-                $new_name
-            ) . '\''
-            . ' WHERE db_name       = \'' . $GLOBALS['dbi']->escapeString($db)
-            . '\''
-            . '   AND table_name    = \'' . $GLOBALS['dbi']->escapeString($table)
-            . '\''
-            . '   AND display_field = \'' . $GLOBALS['dbi']->escapeString($field)
-            . '\'';
-        PMA_queryAsControlUser($table_query);
-    }
-
-    if ($cfgRelation['relwork']) {
-        $table_query = 'UPDATE '
-            . PMA\libraries\Util::backquote($cfgRelation['db']) . '.'
-            . PMA\libraries\Util::backquote($cfgRelation['relation'])
-            . '   SET master_field = \'' . $GLOBALS['dbi']->escapeString(
-                $new_name
-            ) . '\''
-            . ' WHERE master_db    = \'' . $GLOBALS['dbi']->escapeString($db)
-            . '\''
-            . '   AND master_table = \'' . $GLOBALS['dbi']->escapeString($table)
-            . '\''
-            . '   AND master_field = \'' . $GLOBALS['dbi']->escapeString($field)
-            . '\'';
-        PMA_queryAsControlUser($table_query);
-
-        $table_query = 'UPDATE '
-            . PMA\libraries\Util::backquote($cfgRelation['db']) . '.'
-            . PMA\libraries\Util::backquote($cfgRelation['relation'])
-            . '   SET foreign_field = \'' . $GLOBALS['dbi']->escapeString(
-                $new_name
-            ) . '\''
-            . ' WHERE foreign_db    = \'' . $GLOBALS['dbi']->escapeString($db)
-            . '\''
-            . '   AND foreign_table = \'' . $GLOBALS['dbi']->escapeString($table)
-            . '\''
-            . '   AND foreign_field = \'' . $GLOBALS['dbi']->escapeString($field)
-            . '\'';
-        PMA_queryAsControlUser($table_query);
-
-    } // end if relwork
-}
-
-
-/**
- * Performs SQL query used for renaming table.
- *
- * @param string $table        Relation table to use
- * @param string $source_db    Source database name
- * @param string $target_db    Target database name
- * @param string $source_table Source table name
- * @param string $target_table Target table name
- * @param string $db_field     Name of database field
- * @param string $table_field  Name of table field
- *
- * @return void
- */
-function PMA_REL_renameSingleTable($table,
-    $source_db, $target_db,
-    $source_table, $target_table,
-    $db_field, $table_field
-) {
-    $query = 'UPDATE '
-        . PMA\libraries\Util::backquote($GLOBALS['cfgRelation']['db']) . '.'
-        . PMA\libraries\Util::backquote($GLOBALS['cfgRelation'][$table])
-        . ' SET '
-        . $db_field . ' = \'' . $GLOBALS['dbi']->escapeString($target_db)
-        . '\', '
-        . $table_field . ' = \'' . $GLOBALS['dbi']->escapeString($target_table)
-        . '\''
-        . ' WHERE '
-        . $db_field . '  = \'' . $GLOBALS['dbi']->escapeString($source_db) . '\''
-        . ' AND '
-        . $table_field . ' = \'' . $GLOBALS['dbi']->escapeString($source_table)
-        . '\'';
-    PMA_queryAsControlUser($query);
-}
-
-
-/**
- * Rename a table in relation tables
- *
- * usually called after table has been moved
- *
- * @param string $source_db    Source database name
- * @param string $target_db    Target database name
- * @param string $source_table Source table name
- * @param string $target_table Target table name
- *
- * @return void
- */
-function PMA_REL_renameTable($source_db, $target_db, $source_table, $target_table)
-{
-    // Move old entries from PMA-DBs to new table
-    if ($GLOBALS['cfgRelation']['commwork']) {
-        PMA_REL_renameSingleTable(
-            'column_info',
-            $source_db, $target_db,
-            $source_table, $target_table,
-            'db_name', 'table_name'
-        );
-    }
-
-    // updating bookmarks is not possible since only a single table is
-    // moved, and not the whole DB.
-
-    if ($GLOBALS['cfgRelation']['displaywork']) {
-        PMA_REL_renameSingleTable(
-            'table_info',
-            $source_db, $target_db,
-            $source_table, $target_table,
-            'db_name', 'table_name'
-        );
-    }
-
-    if ($GLOBALS['cfgRelation']['relwork']) {
-        PMA_REL_renameSingleTable(
-            'relation',
-            $source_db, $target_db,
-            $source_table, $target_table,
-            'foreign_db', 'foreign_table'
-        );
-
-        PMA_REL_renameSingleTable(
-            'relation',
-            $source_db, $target_db,
-            $source_table, $target_table,
-            'master_db', 'master_table'
-        );
-    }
-
-    if ($GLOBALS['cfgRelation']['pdfwork']) {
-        if ($source_db == $target_db) {
-            // rename within the database can be handled
-            PMA_REL_renameSingleTable(
-                'table_coords',
-                $source_db, $target_db,
-                $source_table, $target_table,
-                'db_name', 'table_name'
-            );
-        } else {
-            // if the table is moved out of the database we can no loger keep the
-            // record for table coordinate
-            $remove_query = "DELETE FROM "
-                . PMA\libraries\Util::backquote($GLOBALS['cfgRelation']['db']) . "."
-                . PMA\libraries\Util::backquote($GLOBALS['cfgRelation']['table_coords'])
-                . " WHERE db_name  = '" . $GLOBALS['dbi']->escapeString($source_db) . "'"
-                . " AND table_name = '" . $GLOBALS['dbi']->escapeString($source_table)
-                . "'";
-            PMA_queryAsControlUser($remove_query);
-        }
-    }
-
-    if ($GLOBALS['cfgRelation']['uiprefswork']) {
-        PMA_REL_renameSingleTable(
-            'table_uiprefs',
-            $source_db, $target_db,
-            $source_table, $target_table,
-            'db_name', 'table_name'
-        );
-    }
-
-    if ($GLOBALS['cfgRelation']['navwork']) {
-        // update hidden items inside table
-        PMA_REL_renameSingleTable(
-            'navigationhiding',
-            $source_db, $target_db,
-            $source_table, $target_table,
-            'db_name', 'table_name'
-        );
-
-        // update data for hidden table
-        $query = "UPDATE "
-            . PMA\libraries\Util::backquote($GLOBALS['cfgRelation']['db']) . "."
-            . PMA\libraries\Util::backquote(
-                $GLOBALS['cfgRelation']['navigationhiding']
-            )
-            . " SET db_name = '" . $GLOBALS['dbi']->escapeString($target_db)
-            . "',"
-            . " item_name = '" . $GLOBALS['dbi']->escapeString($target_table)
-            . "'"
-            . " WHERE db_name  = '" . $GLOBALS['dbi']->escapeString($source_db)
-            . "'"
-            . " AND item_name = '" . $GLOBALS['dbi']->escapeString($source_table)
-            . "'"
-            . " AND item_type = 'table'";
-        PMA_queryAsControlUser($query);
-    }
-}
-
-/**
- * Create a PDF page
- *
- * @param string $newpage     name of the new PDF page
- * @param array  $cfgRelation Relation configuration
- * @param string $db          database name
- *
- * @return int $pdf_page_number
- */
-function PMA_REL_createPage($newpage, $cfgRelation, $db)
-{
-    if (! isset($newpage) || $newpage == '') {
-        $newpage = __('no description');
-    }
-    $ins_query   = 'INSERT INTO '
-        . PMA\libraries\Util::backquote($GLOBALS['cfgRelation']['db']) . '.'
-        . PMA\libraries\Util::backquote($cfgRelation['pdf_pages'])
-        . ' (db_name, page_descr)'
-        . ' VALUES (\''
-        . $GLOBALS['dbi']->escapeString($db) . '\', \''
-        . $GLOBALS['dbi']->escapeString($newpage) . '\')';
-    PMA_queryAsControlUser($ins_query, false);
-
-    return $GLOBALS['dbi']->insertId(
-        isset($GLOBALS['controllink']) ? $GLOBALS['controllink'] : ''
-    );
-}
-
-/**
- * Get child table references for a table column.
- * This works only if 'DisableIS' is false. An empty array is returned otherwise.
- *
- * @param string $db     name of master table db.
- * @param string $table  name of master table.
- * @param string $column name of master table column.
- *
- * @return array $child_references
- */
-function PMA_getChildReferences($db, $table, $column = '')
-{
-    $child_references = array();
-    if (! $GLOBALS['cfg']['Server']['DisableIS']) {
-        $rel_query = "SELECT `column_name`, `table_name`,"
-            . " `table_schema`, `referenced_column_name`"
-            . " FROM `information_schema`.`key_column_usage`"
-            . " WHERE `referenced_table_name` = '"
-            . $GLOBALS['dbi']->escapeString($table) . "'"
-            . " AND `referenced_table_schema` = '"
-            . $GLOBALS['dbi']->escapeString($db) . "'";
-        if ($column) {
-            $rel_query .= " AND `referenced_column_name` = '"
-                . $GLOBALS['dbi']->escapeString($column) . "'";
-        }
-
-        $child_references = $GLOBALS['dbi']->fetchResult(
-            $rel_query, array('referenced_column_name', null)
-        );
-    }
-    return $child_references;
-}
-
-/**
- * Check child table references and foreign key for a table column.
- *
- * @param string $db                    name of master table db.
- * @param string $table                 name of master table.
- * @param string $column                name of master table column.
- * @param array  $foreigners_full       foreiners array for the whole table.
- * @param array  $child_references_full child references for the whole table.
- *
- * @return array $column_status telling about references if foreign key.
- */
-function PMA_checkChildForeignReferences(
-    $db, $table, $column, $foreigners_full = null, $child_references_full = null
-) {
-    $column_status = array();
-    $column_status['isEditable'] = false;
-    $column_status['isReferenced'] = false;
-    $column_status['isForeignKey'] = false;
-    $column_status['references'] = array();
-
-    $foreigners = array();
-    if ($foreigners_full !== null) {
-        if (isset($foreigners_full[$column])) {
-            $foreigners[$column] = $foreigners_full[$column];
-        }
-        if (isset($foreigners_full['foreign_keys_data'])) {
-            $foreigners['foreign_keys_data'] = $foreigners_full['foreign_keys_data'];
-        }
-    } else {
-        $foreigners = PMA_getForeigners($db, $table, $column, 'foreign');
-    }
-    $foreigner = PMA_searchColumnInForeigners($foreigners, $column);
-
-    $child_references = array();
-    if ($child_references_full !== null) {
-        if (isset($child_references_full[$column])) {
-            $child_references = $child_references_full[$column];
-        }
-    } else {
-        $child_references = PMA_getChildReferences($db, $table, $column);
-    }
-
-    if (sizeof($child_references, 0) > 0
-        || $foreigner
-    ) {
-        if (sizeof($child_references, 0) > 0) {
-            $column_status['isReferenced'] = true;
-            foreach ($child_references as $columns) {
-                array_push(
-                    $column_status['references'],
-                    PMA\libraries\Util::backquote($columns['table_schema'])
-                    . '.' . PMA\libraries\Util::backquote($columns['table_name'])
-                );
-            }
-        }
-
-        if ($foreigner) {
-            $column_status['isForeignKey'] = true;
-        }
-    } else {
-        $column_status['isEditable'] = true;
-    }
-
-    return $column_status;
-}
-
-/**
- * Search a table column in foreign data.
- *
- * @param array  $foreigners Table Foreign data
- * @param string $column     Column name
- *
- * @return bool|array
- */
-function PMA_searchColumnInForeigners($foreigners, $column)
-{
-    if (isset($foreigners[$column])) {
-        return $foreigners[$column];
-    } else {
-        $foreigner = array();
-        foreach ($foreigners['foreign_keys_data'] as $one_key) {
-            $column_index = array_search($column, $one_key['index_list']);
-            if ($column_index !== false) {
-                $foreigner['foreign_field']
-                    = $one_key['ref_index_list'][$column_index];
-                $foreigner['foreign_db'] = isset($one_key['ref_db_name'])
-                    ? $one_key['ref_db_name']
-                    : $GLOBALS['db'];
-                $foreigner['foreign_table'] = $one_key['ref_table_name'];
-                $foreigner['constraint'] = $one_key['constraint'];
-                $foreigner['on_update'] = isset($one_key['on_update'])
-                    ? $one_key['on_update']
-                    : 'RESTRICT';
-                $foreigner['on_delete'] = isset($one_key['on_delete'])
-                    ? $one_key['on_delete']
-                    : 'RESTRICT';
-
-                return $foreigner;
-            }
-        }
-    }
-
-    return false;
-}
-
-/**
- * Returns default PMA table names and their create queries.
- *
- * @return array table name, create query
- */
-function PMA_getDefaultPMATableNames()
-{
-    $pma_tables = array();
-    $create_tables_file = file_get_contents(
-        SQL_DIR . 'create_tables.sql'
-    );
-
-    $queries = explode(';', $create_tables_file);
-
-    foreach ($queries as $query) {
-        if (preg_match(
-            '/CREATE TABLE IF NOT EXISTS `(.*)` \(/',
-            $query,
-            $table
-        )
-        ) {
-            $pma_tables[$table[1]] = $query . ';';
-        }
-    }
-
-    return $pma_tables;
-}
-
-/**
- * Create a table named phpmyadmin to be used as configuration storage
- *
- * @return bool
- */
-function PMA_createPMADatabase()
-{
-    $GLOBALS['dbi']->tryQuery("CREATE DATABASE IF NOT EXISTS `phpmyadmin`");
-    if ($error = $GLOBALS['dbi']->getError()) {
-        if ($GLOBALS['errno'] == 1044) {
-            $GLOBALS['message'] =    __(
-                'You do not have necessary privileges to create a database named'
-                . ' \'phpmyadmin\'. You may go to \'Operations\' tab of any'
-                . ' database to set up the phpMyAdmin configuration storage there.'
-            );
-        } else {
-            $GLOBALS['message'] = $error;
-        }
-        return false;
-    }
-    return true;
-}
-
-/**
- * Creates PMA tables in the given db, updates if already exists.
- *
- * @param string  $db     database
- * @param boolean $create whether to create tables if they don't exist.
- *
- * @return void
- */
-function PMA_fixPMATables($db, $create = true)
-{
-    $tablesToFeatures = array(
-        'pma__bookmark' => 'bookmarktable',
-        'pma__relation' => 'relation',
-        'pma__table_info' => 'table_info',
-        'pma__table_coords' => 'table_coords',
-        'pma__pdf_pages' => 'pdf_pages',
-        'pma__column_info' => 'column_info',
-        'pma__history' => 'history',
-        'pma__recent' => 'recent',
-        'pma__favorite' => 'favorite',
-        'pma__table_uiprefs' => 'table_uiprefs',
-        'pma__tracking' => 'tracking',
-        'pma__userconfig' => 'userconfig',
-        'pma__users' => 'users',
-        'pma__usergroups' => 'usergroups',
-        'pma__navigationhiding' => 'navigationhiding',
-        'pma__savedsearches' => 'savedsearches',
-        'pma__central_columns' => 'central_columns',
-        'pma__designer_settings' => 'designer_settings',
-        'pma__export_templates' => 'export_templates',
-    );
-
-    $existingTables = $GLOBALS['dbi']->getTables($db, $GLOBALS['controllink']);
-
-    $createQueries = null;
-    $foundOne = false;
-    foreach ($tablesToFeatures as $table => $feature) {
-        if (! in_array($table, $existingTables)) {
-            if ($create) {
-                if ($createQueries == null) { // first create
-                    $createQueries = PMA_getDefaultPMATableNames();
-                    $GLOBALS['dbi']->selectDb($db);
-                }
-                $GLOBALS['dbi']->tryQuery($createQueries[$table]);
-                if ($error = $GLOBALS['dbi']->getError()) {
-                    $GLOBALS['message'] = $error;
-                    return;
-                }
-                $foundOne = true;
-                $GLOBALS['cfg']['Server'][$feature] = $table;
-            }
-        } else {
-            $foundOne = true;
-            $GLOBALS['cfg']['Server'][$feature] = $table;
-        }
-    }
-
-    if (! $foundOne) {
-        return;
-    }
-    $GLOBALS['cfg']['Server']['pmadb'] = $db;
-    $_SESSION['relation'][$GLOBALS['server']] = PMA_checkRelationsParam();
-
-    $cfgRelation = PMA_getRelationsParam();
-    if ($cfgRelation['recentwork'] || $cfgRelation['favoritework']) {
-        // Since configuration storage is updated, we need to
-        // re-initialize the favorite and recent tables stored in the
-        // session from the current configuration storage.
-        if ($cfgRelation['favoritework']) {
-            $fav_tables = RecentFavoriteTable::getInstance('favorite');
-            $_SESSION['tmpval']['favorite_tables'][$GLOBALS['server']]
-                = $fav_tables->getFromDb();
-        }
-
-        if ($cfgRelation['recentwork']) {
-            $recent_tables = RecentFavoriteTable::getInstance('recent');
-            $_SESSION['tmpval']['recent_tables'][$GLOBALS['server']]
-                = $recent_tables->getFromDb();
-        }
-
-        // Reload navi panel to update the recent/favorite lists.
-        $GLOBALS['reload'] = true;
-    }
-}
-
-/**
- * Get Html for PMA tables fixing anchor.
- *
- * @param boolean $allTables whether to create all tables
- * @param boolean $createDb  whether to create the pmadb also
- *
- * @return string Html
- */
-function PMA_getHtmlFixPMATables($allTables, $createDb = false)
-{
-    $retval = '';
-
-    $url_query = PMA_URL_getCommon(array('db' => $GLOBALS['db']));
-    if ($allTables) {
-        if ($createDb) {
-            $url_query .= '&amp;goto=db_operations.php&amp;create_pmadb=1';
-            $message = Message::notice(
-                __(
-                    '%sCreate%s a database named \'phpmyadmin\' and setup '
-                    . 'the phpMyAdmin configuration storage there.'
-                )
-            );
-        } else {
-            $url_query .= '&amp;goto=db_operations.php&amp;fixall_pmadb=1';
-            $message = Message::notice(
-                __(
-                    '%sCreate%s the phpMyAdmin configuration storage in the '
-                    . 'current database.'
-                )
-            );
-        }
-    } else {
-        $url_query .= '&amp;goto=db_operations.php&amp;fix_pmadb=1';
-        $message = Message::notice(
-            __('%sCreate%s missing phpMyAdmin configuration storage tables.')
-        );
-    }
-    $message->addParam(
-        '<a href="./chk_rel.php' . $url_query . '">',
-        false
-    );
-    $message->addParam('</a>', false);
-
-    $retval .= $message->getDisplay();
-
-    return $retval;
-}
-
-/**
- * Gets the relations info and status, depending on the condition
- *
- * @param boolean $condition whether to look for foreigners or not
- * @param string  $db        database name
- * @param string  $table     table name
- *
- * @return array ($res_rel, $have_rel)
- */
-function PMA_getRelationsAndStatus($condition, $db, $table)
-{
-    if ($condition) {
-        // Find which tables are related with the current one and write it in
-        // an array
-        $res_rel = PMA_getForeigners($db, $table);
-
-        if (count($res_rel) > 0) {
-            $have_rel = true;
-        } else {
-            $have_rel = false;
-        }
-    } else {
-        $have_rel = false;
-        $res_rel = array();
-    } // end if
-    return(array($res_rel, $have_rel));
-}
-
-/**
- * Verifies if all the pmadb tables are defined
- *
- * @return boolean
- */
-function PMA_arePmadbTablesDefined()
-{
-    if (empty($GLOBALS['cfg']['Server']['bookmarktable'])
-        || empty($GLOBALS['cfg']['Server']['relation'])
-        || empty($GLOBALS['cfg']['Server']['table_info'])
-        || empty($GLOBALS['cfg']['Server']['table_coords'])
-        || empty($GLOBALS['cfg']['Server']['column_info'])
-        || empty($GLOBALS['cfg']['Server']['pdf_pages'])
-        || empty($GLOBALS['cfg']['Server']['history'])
-        || empty($GLOBALS['cfg']['Server']['recent'])
-        || empty($GLOBALS['cfg']['Server']['favorite'])
-        || empty($GLOBALS['cfg']['Server']['table_uiprefs'])
-        || empty($GLOBALS['cfg']['Server']['tracking'])
-        || empty($GLOBALS['cfg']['Server']['userconfig'])
-        || empty($GLOBALS['cfg']['Server']['users'])
-        || empty($GLOBALS['cfg']['Server']['usergroups'])
-        || empty($GLOBALS['cfg']['Server']['navigationhiding'])
-        || empty($GLOBALS['cfg']['Server']['savedsearches'])
-        || empty($GLOBALS['cfg']['Server']['central_columns'])
-        || empty($GLOBALS['cfg']['Server']['designer_settings'])
-        || empty($GLOBALS['cfg']['Server']['export_templates'])
-    ) {
-        return false;
-    } else {
-        return true;
-    }
-}
diff --git a/#pma/libraries/relation_cleanup.lib.php b/#pma/libraries/relation_cleanup.lib.php
deleted file mode 100644
index ac4a94cd..00000000
--- a/#pma/libraries/relation_cleanup.lib.php
+++ /dev/null
@@ -1,356 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Set of functions used for cleaning up phpMyAdmin tables
- *
- * @package PhpMyAdmin
- */
-
-/**
- * Cleanup column related relation stuff
- *
- * @param string $db     database name
- * @param string $table  table name
- * @param string $column column name
- *
- * @return void
- */
-function PMA_relationsCleanupColumn($db, $table, $column)
-{
-    $cfgRelation = PMA_getRelationsParam();
-
-    if ($cfgRelation['commwork']) {
-        $remove_query = 'DELETE FROM '
-            . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . '.' . PMA\libraries\Util::backquote($cfgRelation['column_info'])
-            . ' WHERE db_name  = \'' . $GLOBALS['dbi']->escapeString($db) . '\''
-            . ' AND table_name = \'' . $GLOBALS['dbi']->escapeString($table)
-            . '\''
-            . ' AND column_name = \'' . $GLOBALS['dbi']->escapeString($column)
-            . '\'';
-        PMA_queryAsControlUser($remove_query);
-    }
-
-    if ($cfgRelation['displaywork']) {
-        $remove_query = 'DELETE FROM '
-            . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . '.' . PMA\libraries\Util::backquote($cfgRelation['table_info'])
-            . ' WHERE db_name  = \'' . $GLOBALS['dbi']->escapeString($db) . '\''
-            . ' AND table_name = \'' . $GLOBALS['dbi']->escapeString($table)
-            . '\''
-            . ' AND display_field = \'' . $GLOBALS['dbi']->escapeString($column)
-            . '\'';
-        PMA_queryAsControlUser($remove_query);
-    }
-
-    if ($cfgRelation['relwork']) {
-        $remove_query = 'DELETE FROM '
-            . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . '.' . PMA\libraries\Util::backquote($cfgRelation['relation'])
-            . ' WHERE master_db  = \'' . $GLOBALS['dbi']->escapeString($db)
-            . '\''
-            . ' AND master_table = \'' . $GLOBALS['dbi']->escapeString($table)
-            . '\''
-            . ' AND master_field = \'' . $GLOBALS['dbi']->escapeString($column)
-            . '\'';
-        PMA_queryAsControlUser($remove_query);
-
-        $remove_query = 'DELETE FROM '
-            . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . '.' . PMA\libraries\Util::backquote($cfgRelation['relation'])
-            . ' WHERE foreign_db  = \'' . $GLOBALS['dbi']->escapeString($db)
-            . '\''
-            . ' AND foreign_table = \'' . $GLOBALS['dbi']->escapeString($table)
-            . '\''
-            . ' AND foreign_field = \'' . $GLOBALS['dbi']->escapeString($column)
-            . '\'';
-        PMA_queryAsControlUser($remove_query);
-    }
-}
-
-/**
- * Cleanup table related relation stuff
- *
- * @param string $db    database name
- * @param string $table table name
- *
- * @return void
- */
-function PMA_relationsCleanupTable($db, $table)
-{
-    $cfgRelation = PMA_getRelationsParam();
-
-    if ($cfgRelation['commwork']) {
-        $remove_query = 'DELETE FROM '
-            . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . '.' . PMA\libraries\Util::backquote($cfgRelation['column_info'])
-            . ' WHERE db_name  = \'' . $GLOBALS['dbi']->escapeString($db) . '\''
-            . ' AND table_name = \'' . $GLOBALS['dbi']->escapeString($table)
-            . '\'';
-        PMA_queryAsControlUser($remove_query);
-    }
-
-    if ($cfgRelation['displaywork']) {
-        $remove_query = 'DELETE FROM '
-            . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . '.' . PMA\libraries\Util::backquote($cfgRelation['table_info'])
-            . ' WHERE db_name  = \'' . $GLOBALS['dbi']->escapeString($db) . '\''
-            . ' AND table_name = \'' . $GLOBALS['dbi']->escapeString($table)
-            . '\'';
-        PMA_queryAsControlUser($remove_query);
-    }
-
-    if ($cfgRelation['pdfwork']) {
-        $remove_query = 'DELETE FROM '
-            . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . '.' . PMA\libraries\Util::backquote($cfgRelation['table_coords'])
-            . ' WHERE db_name  = \'' . $GLOBALS['dbi']->escapeString($db) . '\''
-            . ' AND table_name = \'' . $GLOBALS['dbi']->escapeString($table)
-            . '\'';
-        PMA_queryAsControlUser($remove_query);
-    }
-
-    if ($cfgRelation['relwork']) {
-        $remove_query = 'DELETE FROM '
-            . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . '.' . PMA\libraries\Util::backquote($cfgRelation['relation'])
-            . ' WHERE master_db  = \'' . $GLOBALS['dbi']->escapeString($db)
-            . '\''
-            . ' AND master_table = \'' . $GLOBALS['dbi']->escapeString($table)
-            . '\'';
-        PMA_queryAsControlUser($remove_query);
-
-        $remove_query = 'DELETE FROM '
-            . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . '.' . PMA\libraries\Util::backquote($cfgRelation['relation'])
-            . ' WHERE foreign_db  = \'' . $GLOBALS['dbi']->escapeString($db)
-            . '\''
-            . ' AND foreign_table = \'' . $GLOBALS['dbi']->escapeString($table)
-            . '\'';
-        PMA_queryAsControlUser($remove_query);
-    }
-
-    if ($cfgRelation['uiprefswork']) {
-        $remove_query = 'DELETE FROM '
-            . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . '.' . PMA\libraries\Util::backquote($cfgRelation['table_uiprefs'])
-            . ' WHERE db_name  = \'' . $GLOBALS['dbi']->escapeString($db) . '\''
-            . ' AND table_name = \'' . $GLOBALS['dbi']->escapeString($table)
-            . '\'';
-        PMA_queryAsControlUser($remove_query);
-    }
-
-    if ($cfgRelation['navwork']) {
-        $remove_query = 'DELETE FROM '
-            . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . '.' . PMA\libraries\Util::backquote($cfgRelation['navigationhiding'])
-            . ' WHERE db_name  = \'' . $GLOBALS['dbi']->escapeString($db) . '\''
-            . ' AND (table_name = \'' . $GLOBALS['dbi']->escapeString($table)
-            . '\''
-            . ' OR (item_name = \'' . $GLOBALS['dbi']->escapeString($table)
-            . '\''
-            . ' AND item_type = \'table\'))';
-        PMA_queryAsControlUser($remove_query);
-    }
-}
-
-/**
- * Cleanup database related relation stuff
- *
- * @param string $db database name
- *
- * @return void
- */
-function PMA_relationsCleanupDatabase($db)
-{
-    $cfgRelation = PMA_getRelationsParam();
-
-    if ($cfgRelation['commwork']) {
-        $remove_query = 'DELETE FROM '
-            . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . '.' . PMA\libraries\Util::backquote($cfgRelation['column_info'])
-            . ' WHERE db_name  = \'' . $GLOBALS['dbi']->escapeString($db) . '\'';
-        PMA_queryAsControlUser($remove_query);
-    }
-
-    if ($cfgRelation['bookmarkwork']) {
-        $remove_query = 'DELETE FROM '
-            . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . '.' . PMA\libraries\Util::backquote($cfgRelation['bookmark'])
-            . ' WHERE dbase  = \'' . $GLOBALS['dbi']->escapeString($db) . '\'';
-        PMA_queryAsControlUser($remove_query);
-    }
-
-    if ($cfgRelation['displaywork']) {
-        $remove_query = 'DELETE FROM '
-            . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . '.' . PMA\libraries\Util::backquote($cfgRelation['table_info'])
-            . ' WHERE db_name  = \'' . $GLOBALS['dbi']->escapeString($db) . '\'';
-        PMA_queryAsControlUser($remove_query);
-    }
-
-    if ($cfgRelation['pdfwork']) {
-        $remove_query = 'DELETE FROM '
-            . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . '.' . PMA\libraries\Util::backquote($cfgRelation['pdf_pages'])
-            . ' WHERE db_name  = \'' . $GLOBALS['dbi']->escapeString($db) . '\'';
-        PMA_queryAsControlUser($remove_query);
-
-        $remove_query = 'DELETE FROM '
-            . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . '.' . PMA\libraries\Util::backquote($cfgRelation['table_coords'])
-            . ' WHERE db_name  = \'' . $GLOBALS['dbi']->escapeString($db) . '\'';
-        PMA_queryAsControlUser($remove_query);
-    }
-
-    if ($cfgRelation['relwork']) {
-        $remove_query = 'DELETE FROM '
-            . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . '.' . PMA\libraries\Util::backquote($cfgRelation['relation'])
-            . ' WHERE master_db  = \''
-            . $GLOBALS['dbi']->escapeString($db) . '\'';
-        PMA_queryAsControlUser($remove_query);
-
-        $remove_query = 'DELETE FROM '
-            . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . '.' . PMA\libraries\Util::backquote($cfgRelation['relation'])
-            . ' WHERE foreign_db  = \'' . $GLOBALS['dbi']->escapeString($db)
-            . '\'';
-        PMA_queryAsControlUser($remove_query);
-    }
-
-    if ($cfgRelation['uiprefswork']) {
-        $remove_query = 'DELETE FROM '
-            . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . '.' . PMA\libraries\Util::backquote($cfgRelation['table_uiprefs'])
-            . ' WHERE db_name  = \'' . $GLOBALS['dbi']->escapeString($db) . '\'';
-        PMA_queryAsControlUser($remove_query);
-    }
-
-    if ($cfgRelation['navwork']) {
-        $remove_query = 'DELETE FROM '
-            . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . '.' . PMA\libraries\Util::backquote($cfgRelation['navigationhiding'])
-            . ' WHERE db_name  = \'' . $GLOBALS['dbi']->escapeString($db) . '\'';
-        PMA_queryAsControlUser($remove_query);
-    }
-
-    if ($cfgRelation['savedsearcheswork']) {
-        $remove_query = 'DELETE FROM '
-            . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . '.' . PMA\libraries\Util::backquote($cfgRelation['savedsearches'])
-            . ' WHERE db_name  = \'' . $GLOBALS['dbi']->escapeString($db) . '\'';
-        PMA_queryAsControlUser($remove_query);
-    }
-
-    if ($cfgRelation['centralcolumnswork']) {
-        $remove_query = 'DELETE FROM '
-            . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . '.' . PMA\libraries\Util::backquote($cfgRelation['central_columns'])
-            . ' WHERE db_name  = \'' . $GLOBALS['dbi']->escapeString($db) . '\'';
-        PMA_queryAsControlUser($remove_query);
-    }
-}
-
-/**
- * Cleanup user related relation stuff
- *
- * @param string $username username
- *
- * @return void
- */
-function PMA_relationsCleanupUser($username)
-{
-    $cfgRelation = PMA_getRelationsParam();
-
-    if ($cfgRelation['bookmarkwork']) {
-        $remove_query = "DELETE FROM "
-            . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . "." . PMA\libraries\Util::backquote($cfgRelation['bookmark'])
-            . " WHERE `user`  = '" . $GLOBALS['dbi']->escapeString($username)
-            . "'";
-        PMA_queryAsControlUser($remove_query);
-    }
-
-    if ($cfgRelation['historywork']) {
-        $remove_query = "DELETE FROM "
-            . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . "." . PMA\libraries\Util::backquote($cfgRelation['history'])
-            . " WHERE `username`  = '" . $GLOBALS['dbi']->escapeString($username)
-            . "'";
-        PMA_queryAsControlUser($remove_query);
-    }
-
-    if ($cfgRelation['recentwork']) {
-        $remove_query = "DELETE FROM "
-            . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . "." . PMA\libraries\Util::backquote($cfgRelation['recent'])
-            . " WHERE `username`  = '" . $GLOBALS['dbi']->escapeString($username)
-            . "'";
-        PMA_queryAsControlUser($remove_query);
-    }
-
-    if ($cfgRelation['favoritework']) {
-        $remove_query = "DELETE FROM "
-            . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . "." . PMA\libraries\Util::backquote($cfgRelation['favorite'])
-            . " WHERE `username`  = '" . $GLOBALS['dbi']->escapeString($username)
-            . "'";
-        PMA_queryAsControlUser($remove_query);
-    }
-
-    if ($cfgRelation['uiprefswork']) {
-        $remove_query = "DELETE FROM "
-            . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . "." . PMA\libraries\Util::backquote($cfgRelation['table_uiprefs'])
-            . " WHERE `username`  = '" . $GLOBALS['dbi']->escapeString($username)
-            . "'";
-        PMA_queryAsControlUser($remove_query);
-    }
-
-    if ($cfgRelation['userconfigwork']) {
-        $remove_query = "DELETE FROM "
-            . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . "." . PMA\libraries\Util::backquote($cfgRelation['userconfig'])
-            . " WHERE `username`  = '" . $GLOBALS['dbi']->escapeString($username)
-            . "'";
-        PMA_queryAsControlUser($remove_query);
-    }
-
-    if ($cfgRelation['menuswork']) {
-        $remove_query = "DELETE FROM "
-            . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . "." . PMA\libraries\Util::backquote($cfgRelation['users'])
-            . " WHERE `username`  = '" . $GLOBALS['dbi']->escapeString($username)
-            . "'";
-        PMA_queryAsControlUser($remove_query);
-    }
-
-    if ($cfgRelation['navwork']) {
-        $remove_query = "DELETE FROM "
-            . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . "." . PMA\libraries\Util::backquote($cfgRelation['navigationhiding'])
-            . " WHERE `username`  = '" . $GLOBALS['dbi']->escapeString($username)
-            . "'";
-        PMA_queryAsControlUser($remove_query);
-    }
-
-    if ($cfgRelation['savedsearcheswork']) {
-        $remove_query = "DELETE FROM "
-            . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . "." . PMA\libraries\Util::backquote($cfgRelation['savedsearches'])
-            . " WHERE `username`  = '" . $GLOBALS['dbi']->escapeString($username)
-            . "'";
-        PMA_queryAsControlUser($remove_query);
-    }
-
-    if ($cfgRelation['designersettingswork']) {
-        $remove_query = "DELETE FROM "
-            . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . "." . PMA\libraries\Util::backquote($cfgRelation['designer_settings'])
-            . " WHERE `username`  = '" . $GLOBALS['dbi']->escapeString($username)
-            . "'";
-        PMA_queryAsControlUser($remove_query);
-    }
-}
-
diff --git a/#pma/libraries/replication.inc.php b/#pma/libraries/replication.inc.php
deleted file mode 100644
index f10bbfaf..00000000
--- a/#pma/libraries/replication.inc.php
+++ /dev/null
@@ -1,322 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Replication helpers
- *
- * @package PhpMyAdmin
- */
-
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
-/**
- * get master replication from server
- */
-$server_master_replication = $GLOBALS['dbi']->fetchResult('SHOW MASTER STATUS');
-
-/**
- * set selected master server
- */
-if (! empty($_REQUEST['master_connection'])) {
-    /**
-     * check for multi-master replication functionality
-     */
-    $server_slave_multi_replication = $GLOBALS['dbi']->fetchResult(
-        'SHOW ALL SLAVES STATUS'
-    );
-    if ($server_slave_multi_replication) {
-        $GLOBALS['dbi']->query(
-            "SET @@default_master_connection = '"
-            . $GLOBALS['dbi']->escapeString(
-                $_REQUEST['master_connection']
-            ) . "'"
-        );
-        $GLOBALS['url_params']['master_connection'] = $_REQUEST['master_connection'];
-    }
-}
-
-/**
- * get slave replication from server
- */
-$server_slave_replication = $GLOBALS['dbi']->fetchResult('SHOW SLAVE STATUS');
-
-/**
- * replication types
- */
-$replication_types = array('master', 'slave');
-
-
-/**
- * define variables for master status
- */
-$master_variables = array(
-    'File',
-    'Position',
-    'Binlog_Do_DB',
-    'Binlog_Ignore_DB',
-);
-
-/**
- * Define variables for slave status
- */
-$slave_variables  = array(
-    'Slave_IO_State',
-    'Master_Host',
-    'Master_User',
-    'Master_Port',
-    'Connect_Retry',
-    'Master_Log_File',
-    'Read_Master_Log_Pos',
-    'Relay_Log_File',
-    'Relay_Log_Pos',
-    'Relay_Master_Log_File',
-    'Slave_IO_Running',
-    'Slave_SQL_Running',
-    'Replicate_Do_DB',
-    'Replicate_Ignore_DB',
-    'Replicate_Do_Table',
-    'Replicate_Ignore_Table',
-    'Replicate_Wild_Do_Table',
-    'Replicate_Wild_Ignore_Table',
-    'Last_Errno',
-    'Last_Error',
-    'Skip_Counter',
-    'Exec_Master_Log_Pos',
-    'Relay_Log_Space',
-    'Until_Condition',
-    'Until_Log_File',
-    'Until_Log_Pos',
-    'Master_SSL_Allowed',
-    'Master_SSL_CA_File',
-    'Master_SSL_CA_Path',
-    'Master_SSL_Cert',
-    'Master_SSL_Cipher',
-    'Master_SSL_Key',
-    'Seconds_Behind_Master',
-);
-/**
- * define important variables, which need to be watched for
- * correct running of replication in slave mode
- *
- * @usedby PMA_getHtmlForReplicationStatusTable()
- */
-// TODO change to regexp or something, to allow for negative match.
-// To e.g. highlight 'Last_Error'
-//
-$slave_variables_alerts = array(
-    'Slave_IO_Running' => 'No',
-    'Slave_SQL_Running' => 'No',
-);
-$slave_variables_oks = array(
-    'Slave_IO_Running' => 'Yes',
-    'Slave_SQL_Running' => 'Yes',
-);
-
-// check which replication is available and
-// set $server_{master/slave}_status and assign values
-
-// replication info is more easily passed to functions
-$GLOBALS['replication_info'] = array();
-
-foreach ($replication_types as $type) {
-    if (count(${"server_{$type}_replication"}) > 0) {
-        $GLOBALS['replication_info'][$type]['status'] = true;
-    } else {
-        $GLOBALS['replication_info'][$type]['status'] = false;
-    }
-    if ($GLOBALS['replication_info'][$type]['status']) {
-        if ($type == "master") {
-            PMA_fillReplicationInfo(
-                $type, 'Do_DB', $server_master_replication[0],
-                'Binlog_Do_DB'
-            );
-
-            PMA_fillReplicationInfo(
-                $type, 'Ignore_DB', $server_master_replication[0],
-                'Binlog_Ignore_DB'
-            );
-        } elseif ($type == "slave") {
-            PMA_fillReplicationInfo(
-                $type, 'Do_DB', $server_slave_replication[0],
-                'Replicate_Do_DB'
-            );
-
-            PMA_fillReplicationInfo(
-                $type, 'Ignore_DB', $server_slave_replication[0],
-                'Replicate_Ignore_DB'
-            );
-
-            PMA_fillReplicationInfo(
-                $type, 'Do_Table', $server_slave_replication[0],
-                'Replicate_Do_Table'
-            );
-
-            PMA_fillReplicationInfo(
-                $type, 'Ignore_Table', $server_slave_replication[0],
-                'Replicate_Ignore_Table'
-            );
-
-            PMA_fillReplicationInfo(
-                $type, 'Wild_Do_Table', $server_slave_replication[0],
-                'Replicate_Wild_Do_Table'
-            );
-
-            PMA_fillReplicationInfo(
-                $type, 'Wild_Ignore_Table', $server_slave_replication[0],
-                'Replicate_Wild_Ignore_Table'
-            );
-        }
-    }
-}
-
-/**
- * Fill global replication_info variable.
- *
- * @param string $type               Type: master, slave
- * @param string $replicationInfoKey Key in replication_info variable
- * @param array  $mysqlInfo          MySQL data about replication
- * @param string $mysqlKey           MySQL key
- *
- * @return array
- */
-function PMA_fillReplicationInfo(
-    $type, $replicationInfoKey, $mysqlInfo, $mysqlKey
-) {
-    $GLOBALS['replication_info'][$type][$replicationInfoKey]
-        = empty($mysqlInfo[$mysqlKey])
-            ? array()
-            : explode(
-                ",",
-                $mysqlInfo[$mysqlKey]
-            );
-
-    return $GLOBALS['replication_info'][$type][$replicationInfoKey];
-}
-
-/**
- * Extracts database or table name from string
- *
- * @param string $string contains "dbname.tablename"
- * @param string $what   what to extract (db|table)
- *
- * @return string the extracted part
- */
-function PMA_extractDbOrTable($string, $what = 'db')
-{
-    $list = explode(".", $string);
-    if ('db' == $what) {
-        return $list[0];
-    } else {
-        return $list[1];
-    }
-}
-
-/**
- * Configures replication slave
- *
- * @param string $action  possible values: START or STOP
- * @param string $control default: null,
- *                        possible values: SQL_THREAD or IO_THREAD or null.
- *                        If it is set to null, it controls both
- *                        SQL_THREAD and IO_THREAD
- * @param mixed  $link    mysql link
- *
- * @return mixed output of DatabaseInterface::tryQuery
- */
-function PMA_Replication_Slave_control($action, $control = null, $link = null)
-{
-    $action = mb_strtoupper($action);
-    $control = mb_strtoupper($control);
-
-    if ($action != "START" && $action != "STOP") {
-        return -1;
-    }
-    if ($control != "SQL_THREAD" && $control != "IO_THREAD" && $control != null) {
-        return -1;
-    }
-
-    return $GLOBALS['dbi']->tryQuery($action . " SLAVE " . $control . ";", $link);
-}
-
-/**
- * Changes master for replication slave
- *
- * @param string $user     replication user on master
- * @param string $password password for the user
- * @param string $host     master's hostname or IP
- * @param int    $port     port, where mysql is running
- * @param array  $pos      position of mysql replication,
- *                         array should contain fields File and Position
- * @param bool   $stop     shall we stop slave?
- * @param bool   $start    shall we start slave?
- * @param mixed  $link     mysql link
- *
- * @return string output of CHANGE MASTER mysql command
- */
-function PMA_Replication_Slave_changeMaster($user, $password, $host, $port,
-    $pos, $stop = true, $start = true, $link = null
-) {
-    if ($stop) {
-        PMA_Replication_Slave_control("STOP", null, $link);
-    }
-
-    $out = $GLOBALS['dbi']->tryQuery(
-        'CHANGE MASTER TO ' .
-        'MASTER_HOST=\'' . $host . '\',' .
-        'MASTER_PORT=' . ($port * 1) . ',' .
-        'MASTER_USER=\'' . $user . '\',' .
-        'MASTER_PASSWORD=\'' . $password . '\',' .
-        'MASTER_LOG_FILE=\'' . $pos["File"] . '\',' .
-        'MASTER_LOG_POS=' . $pos["Position"] . ';', $link
-    );
-
-    if ($start) {
-        PMA_Replication_Slave_control("START", null, $link);
-    }
-
-    return $out;
-}
-
-/**
- * This function provides connection to remote mysql server
- *
- * @param string $user     mysql username
- * @param string $password password for the user
- * @param string $host     mysql server's hostname or IP
- * @param int    $port     mysql remote port
- * @param string $socket   path to unix socket
- *
- * @return mixed $link mysql link on success
- */
-function PMA_Replication_connectToMaster(
-    $user, $password, $host = null, $port = null, $socket = null
-) {
-    $server = array();
-    $server["host"] = PMA_sanitizeMySQLHost($host);
-    $server["port"] = $port;
-    $server["socket"] = $socket;
-
-    // 5th parameter set to true means that it's an auxiliary connection
-    // and we must not go back to login page if it fails
-    return $GLOBALS['dbi']->connect($user, $password, false, $server, true);
-}
-/**
- * Fetches position and file of current binary log on master
- *
- * @param mixed $link mysql link
- *
- * @return array an array containing File and Position in MySQL replication
- * on master server, useful for PMA_Replication_Slave_changeMaster
- */
-function PMA_Replication_Slave_binLogMaster($link = null)
-{
-    $data = $GLOBALS['dbi']->fetchResult('SHOW MASTER STATUS', null, null, $link);
-    $output = array();
-
-    if (! empty($data)) {
-        $output["File"] = $data[0]["File"];
-        $output["Position"] = $data[0]["Position"];
-    }
-    return $output;
-}
diff --git a/#pma/libraries/replication_gui.lib.php b/#pma/libraries/replication_gui.lib.php
deleted file mode 100644
index 82620916..00000000
--- a/#pma/libraries/replication_gui.lib.php
+++ /dev/null
@@ -1,1081 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Functions for the replication GUI
- *
- * @package PhpMyAdmin
- */
-use PMA\libraries\Message;
-
-/**
- * returns HTML for error message
- *
- * @return String HTML code
- */
-function PMA_getHtmlForErrorMessage()
-{
-    $html = '';
-    if (isset($_SESSION['replication']['sr_action_status'])
-        && isset($_SESSION['replication']['sr_action_info'])
-    ) {
-        if ($_SESSION['replication']['sr_action_status'] == 'error') {
-            $error_message = $_SESSION['replication']['sr_action_info'];
-            $html .= Message::error($error_message)->getDisplay();
-            $_SESSION['replication']['sr_action_status'] = 'unknown';
-        } elseif ($_SESSION['replication']['sr_action_status'] == 'success') {
-            $success_message = $_SESSION['replication']['sr_action_info'];
-            $html .= Message::success($success_message)->getDisplay();
-            $_SESSION['replication']['sr_action_status'] = 'unknown';
-        }
-    }
-    return $html;
-}
-
-/**
- * returns HTML for master replication
- *
- * @return String HTML code
- */
-function PMA_getHtmlForMasterReplication()
-{
-    $html = '';
-    if (! isset($_REQUEST['repl_clear_scr'])) {
-        $html .= '<fieldset>';
-        $html .= '<legend>' . __('Master replication') . '</legend>';
-        $html .= __('This server is configured as master in a replication process.');
-        $html .= '<ul>';
-        $html .= '  <li><a href="#master_status_href" id="master_status_href">';
-        $html .= __('Show master status') . '</a>';
-        $html .= PMA_getHtmlForReplicationStatusTable('master', true, false);
-        $html .= '  </li>';
-
-        $html .= '  <li><a href="#master_slaves_href" id="master_slaves_href">';
-        $html .= __('Show connected slaves') . '</a>';
-        $html .= PMA_getHtmlForReplicationSlavesTable(true);
-        $html .= '  </li>';
-
-        $_url_params = $GLOBALS['url_params'];
-        $_url_params['mr_adduser'] = true;
-        $_url_params['repl_clear_scr'] = true;
-
-        $html .= '  <li><a href="server_replication.php';
-        $html .= PMA_URL_getCommon($_url_params)
-            . '" id="master_addslaveuser_href">';
-        $html .= __('Add slave replication user') . '</a></li>';
-    }
-
-    // Display 'Add replication slave user' form
-    if (isset($_REQUEST['mr_adduser'])) {
-        $html .= PMA_getHtmlForReplicationMasterAddSlaveuser();
-    } elseif (! isset($_REQUEST['repl_clear_scr'])) {
-        $html .= "</ul>";
-        $html .= "</fieldset>";
-    }
-
-    return $html;
-}
-
-/**
- * returns HTML for master replication configuration
- *
- * @return String HTML code
- */
-function PMA_getHtmlForMasterConfiguration()
-{
-    $html  = '<fieldset>';
-    $html .= '<legend>' . __('Master configuration') . '</legend>';
-    $html .= __(
-        'This server is not configured as a master server in a '
-        . 'replication process. You can choose from either replicating '
-        . 'all databases and ignoring some of them (useful if you want to '
-        . 'replicate a majority of the databases) or you can choose to ignore '
-        . 'all databases by default and allow only certain databases to be '
-        . 'replicated. Please select the mode:'
-    ) . '<br /><br />';
-
-    $html .= '<select name="db_type" id="db_type">';
-    $html .= '<option value="all">' . __('Replicate all databases; Ignore:');
-    $html .= '</option>';
-    $html .= '<option value="ign">' . __('Ignore all databases; Replicate:');
-    $html .= '</option>';
-    $html .= '</select>';
-    $html .= '<br /><br />';
-    $html .= __('Please select databases:') . '<br />';
-    $html .= PMA_getHtmlForReplicationDbMultibox();
-    $html .= '<br /><br />';
-    $html .= __(
-        'Now, add the following lines at the end of [mysqld] section'
-        . ' in your my.cnf and please restart the MySQL server afterwards.'
-    ) . '<br />';
-    $html .= '<pre id="rep"></pre>';
-    $html .= __(
-        'Once you restarted MySQL server, please click on Go button. '
-        . 'Afterwards, you should see a message informing you, that this server'
-        . ' <b>is</b> configured as master.'
-    );
-    $html .= '</fieldset>';
-    $html .= '<fieldset class="tblFooters">';
-    $html .= ' <form method="post" action="server_replication.php" >';
-    $html .= PMA_URL_getHiddenInputs('', '');
-    $html .= '  <input type="submit" value="' . __('Go') . '" id="goButton" />';
-    $html .= ' </form>';
-    $html .= '</fieldset>';
-
-    return $html;
-}
-
-/**
- * returns HTML for slave replication configuration
- *
- * @param bool  $server_slave_status      Whether it is Master or Slave
- * @param array $server_slave_replication Slave replication
- *
- * @return String HTML code
- */
-function PMA_getHtmlForSlaveConfiguration(
-    $server_slave_status, $server_slave_replication
-) {
-    $html  = '<fieldset>';
-    $html .= '<legend>' . __('Slave replication') . '</legend>';
-    /**
-     * check for multi-master replication functionality
-     */
-    $server_slave_multi_replication = $GLOBALS['dbi']->fetchResult(
-        'SHOW ALL SLAVES STATUS'
-    );
-    if ($server_slave_multi_replication) {
-        $html .= __('Master connection:');
-        $html .= '<form method="get" action="server_replication.php">';
-        $html .= PMA_URL_getHiddenInputs($GLOBALS['url_params']);
-        $html .= ' <select name="master_connection">';
-        $html .= '<option value="">' . __('Default') . '</option>';
-        foreach ($server_slave_multi_replication as $server) {
-            $html .= '<option' . (isset($_REQUEST['master_connection'])
-                && $_REQUEST['master_connection'] == $server['Connection_name'] ?
-                    ' selected="selected"' : '') . '>' . $server['Connection_name']
-                . '</option>';
-        }
-        $html .= '</select>';
-        $html .= ' <input type="submit" value="' . __('Go') . '" id="goButton" />';
-        $html .= '</form>';
-        $html .= '<br /><br />';
-    }
-    if ($server_slave_status) {
-        $html .= '<div id="slave_configuration_gui">';
-
-        $_url_params = $GLOBALS['url_params'];
-        $_url_params['sr_take_action'] = true;
-        $_url_params['sr_slave_server_control'] = true;
-
-        if ($server_slave_replication[0]['Slave_IO_Running'] == 'No') {
-            $_url_params['sr_slave_action'] = 'start';
-        } else {
-            $_url_params['sr_slave_action'] = 'stop';
-        }
-
-        $_url_params['sr_slave_control_parm'] = 'IO_THREAD';
-        $slave_control_io_link = 'server_replication.php'
-            . PMA_URL_getCommon($_url_params);
-
-        if ($server_slave_replication[0]['Slave_SQL_Running'] == 'No') {
-            $_url_params['sr_slave_action'] = 'start';
-        } else {
-            $_url_params['sr_slave_action'] = 'stop';
-        }
-
-        $_url_params['sr_slave_control_parm'] = 'SQL_THREAD';
-        $slave_control_sql_link = 'server_replication.php'
-            . PMA_URL_getCommon($_url_params);
-
-        if ($server_slave_replication[0]['Slave_IO_Running'] == 'No'
-            || $server_slave_replication[0]['Slave_SQL_Running'] == 'No'
-        ) {
-            $_url_params['sr_slave_action'] = 'start';
-        } else {
-            $_url_params['sr_slave_action'] = 'stop';
-        }
-
-        $_url_params['sr_slave_control_parm'] = null;
-        $slave_control_full_link = 'server_replication.php'
-            . PMA_URL_getCommon($_url_params);
-
-        $_url_params['sr_slave_action'] = 'reset';
-        $slave_control_reset_link = 'server_replication.php'
-            . PMA_URL_getCommon($_url_params);
-
-        $_url_params = $GLOBALS['url_params'];
-        $_url_params['sr_take_action'] = true;
-        $_url_params['sr_slave_skip_error'] = true;
-        $slave_skip_error_link = 'server_replication.php'
-            . PMA_URL_getCommon($_url_params);
-
-        if ($server_slave_replication[0]['Slave_SQL_Running'] == 'No') {
-            $html .= Message::error(
-                __('Slave SQL Thread not running!')
-            )->getDisplay();
-        }
-        if ($server_slave_replication[0]['Slave_IO_Running'] == 'No') {
-            $html .= Message::error(
-                __('Slave IO Thread not running!')
-            )->getDisplay();
-        }
-
-        $_url_params = $GLOBALS['url_params'];
-        $_url_params['sl_configure'] = true;
-        $_url_params['repl_clear_scr'] = true;
-
-        $reconfiguremaster_link = 'server_replication.php'
-            . PMA_URL_getCommon($_url_params);
-
-        $html .= __(
-            'Server is configured as slave in a replication process. Would you ' .
-            'like to:'
-        );
-        $html .= '<br />';
-        $html .= '<ul>';
-        $html .= ' <li><a href="#slave_status_href" id="slave_status_href">';
-        $html .= __('See slave status table') . '</a>';
-        $html .= PMA_getHtmlForReplicationStatusTable('slave', true, false);
-        $html .= ' </li>';
-
-        $html .= ' <li><a href="#slave_control_href" id="slave_control_href">';
-        $html .= __('Control slave:') . '</a>';
-        $html .= ' <div id="slave_control_gui" style="display: none">';
-        $html .= '  <ul>';
-        $html .= '   <li><a href="' . $slave_control_full_link . '">';
-        $html .= (($server_slave_replication[0]['Slave_IO_Running'] == 'No' ||
-                   $server_slave_replication[0]['Slave_SQL_Running'] == 'No')
-                 ? __('Full start')
-                 : __('Full stop')) . ' </a></li>';
-        $html .= '   <li><a class="ajax" id="reset_slave"'
-            . ' href="' . $slave_control_reset_link . '">';
-        $html .= __('Reset slave') . '</a></li>';
-        if ($server_slave_replication[0]['Slave_SQL_Running'] == 'No') {
-            $html .= '   <li><a href="' . $slave_control_sql_link . '">';
-            $html .= __('Start SQL Thread only') . '</a></li>';
-        } else {
-            $html .= '   <li><a href="' . $slave_control_sql_link . '">';
-            $html .= __('Stop SQL Thread only') . '</a></li>';
-        }
-        if ($server_slave_replication[0]['Slave_IO_Running'] == 'No') {
-            $html .= '   <li><a href="' . $slave_control_io_link . '">';
-            $html .= __('Start IO Thread only') . '</a></li>';
-        } else {
-            $html .= '   <li><a href="' . $slave_control_io_link . '">';
-            $html .= __('Stop IO Thread only') . '</a></li>';
-        }
-        $html .= '  </ul>';
-        $html .= ' </div>';
-        $html .= ' </li>';
-        $html .= ' <li>';
-        $html .= PMA_getHtmlForSlaveErrorManagement($slave_skip_error_link);
-        $html .= ' </li>';
-        $html .= ' <li><a href="' . $reconfiguremaster_link . '">';
-        $html .=  __('Change or reconfigure master server') . '</a></li>';
-        $html .= '</ul>';
-        $html .= '</div>';
-
-    } elseif (! isset($_REQUEST['sl_configure'])) {
-        $_url_params = $GLOBALS['url_params'];
-        $_url_params['sl_configure'] = true;
-        $_url_params['repl_clear_scr'] = true;
-
-        $html .= sprintf(
-            __(
-                'This server is not configured as slave in a replication process. '
-                . 'Would you like to <a href="%s">configure</a> it?'
-            ),
-            'server_replication.php' . PMA_URL_getCommon($_url_params)
-        );
-    }
-    $html .= '</fieldset>';
-
-    return $html;
-}
-
-/**
- * returns HTML for Slave Error Management
- *
- * @param String $slave_skip_error_link error link
- *
- * @return String HTML code
- */
-function PMA_getHtmlForSlaveErrorManagement($slave_skip_error_link)
-{
-    $html  = '<a href="#slave_errormanagement_href" '
-        . 'id="slave_errormanagement_href">';
-    $html .= __('Error management:') . '</a>';
-    $html .= ' <div id="slave_errormanagement_gui" style="display: none">';
-    $html .= Message::error(
-        __('Skipping errors might lead into unsynchronized master and slave!')
-    )->getDisplay();
-    $html .= '  <ul>';
-    $html .= '   <li><a href="' . $slave_skip_error_link . '">';
-    $html .= __('Skip current error') . '</a></li>';
-    $html .= '   <li>';
-    $html .= '    <form method="post" action="server_replication.php">';
-    $html .= PMA_URL_getHiddenInputs('', '');
-    $html .= sprintf(
-        __('Skip next %s errors.'),
-        '<input type="text" name="sr_skip_errors_count" value="1" '
-        . 'style="width: 30px" />'
-    );
-    $html .= '              <input type="submit" name="sr_slave_skip_error" ';
-    $html .= 'value="' . __('Go') . '" />';
-    $html .= '      <input type="hidden" name="sr_take_action" value="1" />';
-    $html .= '    </form></li>';
-    $html .= '  </ul>';
-    $html .= ' </div>';
-    return $html;
-}
-
-/**
- * returns HTML for not configure for a server replication
- *
- * @return String HTML code
- */
-function PMA_getHtmlForNotServerReplication()
-{
-    $_url_params = $GLOBALS['url_params'];
-    $_url_params['mr_configure'] = true;
-
-    $html  = '<fieldset>';
-    $html .= '<legend>' . __('Master replication') . '</legend>';
-    $html .= sprintf(
-        __(
-            'This server is not configured as master in a replication process. '
-            . 'Would you like to <a href="%s">configure</a> it?'
-        ),
-        'server_replication.php' . PMA_URL_getCommon($_url_params)
-    );
-    $html .= '</fieldset>';
-    return $html;
-}
-
-/**
- * returns HTML code for selecting databases
- *
- * @return String HTML code
- */
-function PMA_getHtmlForReplicationDbMultibox()
-{
-    $multi_values = '';
-    $multi_values .= '<select name="db_select[]" '
-        . 'size="6" multiple="multiple" id="db_select">';
-
-    foreach ($GLOBALS['dblist']->databases as $current_db) {
-        if ($GLOBALS['dbi']->isSystemSchema($current_db)) {
-            continue;
-        }
-        $current_db = htmlspecialchars($current_db);
-        $multi_values .= '                <option value="' . $current_db . '" ';
-        $multi_values .= '>';
-        $multi_values .= $current_db . '</option>';
-    } // end while
-
-    $multi_values .= '</select><br />';
-    $multi_values .= '<a href="#" id="db_select_href">' . __('Select all') . '</a>';
-    $multi_values .= '&nbsp;/&nbsp;';
-    $multi_values .= '<a href="#" id="db_reset_href">' . __('Unselect all') . '</a>';
-
-    return $multi_values;
-}
-
-/**
- * returns HTML for changing master
- *
- * @param String $submitname - submit button name
- *
- * @return String HTML code
- */
-function PMA_getHtmlForReplicationChangeMaster($submitname)
-{
-    $html = '';
-    list($username_length, $hostname_length)
-        = PMA_replicationGetUsernameHostnameLength();
-
-    $html .= '<form method="post" action="server_replication.php">';
-    $html .= PMA_URL_getHiddenInputs('', '');
-    $html .= ' <fieldset id="fieldset_add_user_login">';
-    $html .= '  <legend>' . __('Slave configuration');
-    $html .= ' - ' . __('Change or reconfigure master server') . '</legend>';
-    $html .= __(
-        'Make sure, you have unique server-id in your configuration file (my.cnf). '
-        . 'If not, please add the following line into [mysqld] section:'
-    );
-    $html .= '<br />';
-    $html .= '<pre>server-id=' . time() . '</pre>';
-
-    $html .= PMA_getHtmlForAddUserInputDiv(
-        array('text'=>__('User name:'), 'for'=>"text_username"),
-        array(
-            'type'=>'text',
-            'name'=>'username',
-            'id'=>'text_username',
-            'maxlength'=>$username_length,
-            'title'=>__('User name'),
-            'required'=>'required'
-        )
-    );
-
-    $html .= PMA_getHtmlForAddUserInputDiv(
-        array('text'=>__('Password:'), 'for'=>"text_pma_pw"),
-        array(
-            'type'=>'password',
-            'name'=>'pma_pw',
-            'id'=>'text_pma_pw',
-            'title'=>__('Password'),
-            'required'=>'required'
-        )
-    );
-
-    $html .= PMA_getHtmlForAddUserInputDiv(
-        array('text'=>__('Host:'), 'for'=>"text_hostname"),
-        array(
-            'type'=>'text',
-            'name'=>'hostname',
-            'id'=>'text_hostname',
-            'maxlength'=>$hostname_length,
-            'value'=>'',
-            'required'=>'required'
-        )
-    );
-
-    $html .= PMA_getHtmlForAddUserInputDiv(
-        array('text'=>__('Port:'), 'for'=>"text_port"),
-        array(
-            'type'=>'number',
-            'name'=>'text_port',
-            'id'=>'text_port',
-            'maxlength'=>6,
-            'value'=>'3306',
-            'required'=>'required'
-         )
-    );
-
-    $html .= ' </fieldset>';
-    $html .= ' <fieldset id="fieldset_user_privtable_footer" class="tblFooters">';
-    $html .= '    <input type="hidden" name="sr_take_action" value="true" />';
-    $html .= '     <input type="hidden" name="' . $submitname . '" value="1" />';
-    $html .= '     <input type="submit" id="confslave_submit" value="';
-    $html .= __('Go') . '" />';
-    $html .= ' </fieldset>';
-    $html .= '</form>';
-
-    return $html;
-}
-
-/**
- * returns HTML code for Add user input div
- *
- * @param array $label_array label tag elements
- * @param array $input_array input tag elements
- *
- * @return String HTML code
- */
-function PMA_getHtmlForAddUserInputDiv($label_array, $input_array)
-{
-    $html  = '  <div class="item">';
-    $html .= '     <label for="' . $label_array['for'] . '">';
-    $html .=  $label_array['text'] . '</label>';
-
-    $html .= '    <input ';
-    foreach ($input_array as $key=>$value) {
-        $html .= ' ' . $key . '="' . $value . '" ';
-    }
-    $html .= ' />';
-    $html .= '  </div>';
-    return $html;
-}
-
-/**
- * This function returns html code for table with replication status.
- *
- * @param string  $type   either master or slave
- * @param boolean $hidden if true, then default style is set to hidden,
- *                        default value false
- * @param boolean $title  if true, then title is displayed, default true
- *
- * @return String HTML code
- */
-function PMA_getHtmlForReplicationStatusTable($type, $hidden = false, $title = true)
-{
-    global ${"{$type}_variables"};
-    global ${"{$type}_variables_alerts"};
-    global ${"{$type}_variables_oks"};
-    global ${"server_{$type}_replication"};
-    global ${"strReplicationStatus_{$type}"};
-
-    $html = '';
-
-    // TODO check the Masters server id?
-    // seems to default to '1' when queried via SHOW VARIABLES ,
-    // but resulted in error on the master when slave connects
-    // [ERROR] Error reading packet from server: Misconfigured master
-    // - server id was not set ( server_errno=1236)
-    // [ERROR] Got fatal error 1236: 'Misconfigured master
-    // - server id was not set' from master when reading data from binary log
-    //
-    //$server_id = $GLOBALS['dbi']->fetchValue(
-    //    "SHOW VARIABLES LIKE 'server_id'", 0, 1
-    //);
-
-    $html .= '<div id="replication_' . $type . '_section" style="';
-    $html .= ($hidden ? 'display: none;' : '') . '"> ';
-
-    if ($title) {
-        if ($type == 'master') {
-            $html .= '<h4><a name="replication_' . $type . '"></a>';
-            $html .= __('Master status') . '</h4>';
-        } else {
-            $html .= '<h4><a name="replication_' . $type . '"></a>';
-            $html .= __('Slave status') . '</h4>';
-        }
-    } else {
-        $html .= '<br />';
-    }
-
-    $html .= '   <table id="server' . $type . 'replicationsummary" class="data"> ';
-    $html .= '   <thead>';
-    $html .= '    <tr>';
-    $html .= '     <th>' . __('Variable') . '</th>';
-    $html .= '        <th>' . __('Value') . '</th>';
-    $html .= '    </tr>';
-    $html .= '   </thead>';
-    $html .= '   <tbody>';
-
-    $odd_row = true;
-    foreach (${"{$type}_variables"} as $variable) {
-        $html .= '   <tr class="' . ($odd_row ? 'odd' : 'even') . '">';
-        $html .= '     <td class="name">';
-        $html .= htmlspecialchars($variable);
-        $html .= '     </td>';
-        $html .= '     <td class="value">';
-
-        // TODO change to regexp or something, to allow for negative match
-        if (isset(${"{$type}_variables_alerts"}[$variable])
-            && ${"{$type}_variables_alerts"}[$variable] == ${"server_{$type}_replication"}[0][$variable]
-        ) {
-            $html .= '<span class="attention">';
-
-        } elseif (isset(${"{$type}_variables_oks"}[$variable])
-            && ${"{$type}_variables_oks"}[$variable] == ${"server_{$type}_replication"}[0][$variable]
-        ) {
-            $html .= '<span class="allfine">';
-        } else {
-            $html .= '<span>';
-        }
-        // allow wrapping long table lists into multiple lines
-        static $variables_wrap = array(
-            'Replicate_Do_DB', 'Replicate_Ignore_DB',
-            'Replicate_Do_Table', 'Replicate_Ignore_Table',
-            'Replicate_Wild_Do_Table', 'Replicate_Wild_Ignore_Table');
-        if (in_array($variable, $variables_wrap)) {
-            $html .= htmlspecialchars(str_replace(
-                ',',
-                ', ',
-                ${"server_{$type}_replication"}[0][$variable]
-            ));
-        } else {
-            $html .= htmlspecialchars(${"server_{$type}_replication"}[0][$variable]);
-        }
-        $html .= '</span>';
-
-        $html .= '  </td>';
-        $html .= ' </tr>';
-
-        $odd_row = ! $odd_row;
-    }
-
-    $html .= '   </tbody>';
-    $html .= ' </table>';
-    $html .= ' <br />';
-    $html .= '</div>';
-
-    return $html;
-}
-
-/**
- * returns html code for table with slave users connected to this master
- *
- * @param boolean $hidden - if true, then default style is set to hidden,
- *                        - default value false
- *
- * @return string
- */
-function PMA_getHtmlForReplicationSlavesTable($hidden = false)
-{
-    $html = '';
-    // Fetch data
-    $data = $GLOBALS['dbi']->fetchResult('SHOW SLAVE HOSTS', null, null);
-
-    $html .= '  <br />';
-    $html .= '  <div id="replication_slaves_section" style="';
-    $html .=  ($hidden ? 'display: none;' : '') . '"> ';
-    $html .= '    <table class="data">';
-    $html .= '    <thead>';
-    $html .= '      <tr>';
-    $html .= '        <th>' . __('Server ID') . '</th>';
-    $html .= '        <th>' . __('Host') . '</th>';
-    $html .= '      </tr>';
-    $html .= '    </thead>';
-    $html .= '    <tbody>';
-
-    $odd_row = true;
-    foreach ($data as $slave) {
-        $html .= '    <tr class="' . ($odd_row ? 'odd' : 'even') . '">';
-        $html .= '      <td class="value">' . $slave['Server_id'] . '</td>';
-        $html .= '      <td class="value">' . $slave['Host'] . '</td>';
-        $html .= '    </tr>';
-
-        $odd_row = ! $odd_row;
-    }
-
-    $html .= '    </tbody>';
-    $html .= '    </table>';
-    $html .= '    <br />';
-    $html .= Message::notice(
-        __(
-            'Only slaves started with the '
-            . '--report-host=host_name option are visible in this list.'
-        )
-    )->getDisplay();
-    $html .= '    <br />';
-    $html .= '  </div>';
-
-    return $html;
-}
-
-/**
- * get the correct username and hostname lengths for this MySQL server
- *
- * @return array   username length, hostname length
- */
-function PMA_replicationGetUsernameHostnameLength()
-{
-    $fields_info = $GLOBALS['dbi']->getColumns('mysql', 'user');
-    $username_length = 16;
-    $hostname_length = 41;
-    foreach ($fields_info as $val) {
-        if ($val['Field'] == 'User') {
-            strtok($val['Type'], '()');
-            $v = strtok('()');
-            if (is_int($v)) {
-                $username_length = $v;
-            }
-        } elseif ($val['Field'] == 'Host') {
-            strtok($val['Type'], '()');
-            $v = strtok('()');
-            if (is_int($v)) {
-                $hostname_length = $v;
-            }
-        }
-    }
-    return array($username_length, $hostname_length);
-}
-
-/**
- * returns html code to add a replication slave user to the master
- *
- * @return String HTML code
- */
-function PMA_getHtmlForReplicationMasterAddSlaveuser()
-{
-    $html = '';
-    list($username_length, $hostname_length)
-        = PMA_replicationGetUsernameHostnameLength();
-
-    if (isset($_REQUEST['username'])
-        && mb_strlen($_REQUEST['username']) === 0
-    ) {
-        $GLOBALS['pred_username'] = 'any';
-    }
-    $html .= '<div id="master_addslaveuser_gui">';
-    $html .= '<form autocomplete="off" method="post" ';
-    $html .= 'action="server_privileges.php"';
-    $html .= ' onsubmit="return checkAddUser(this);">';
-    $html .= PMA_URL_getHiddenInputs('', '');
-    $html .= '<fieldset id="fieldset_add_user_login">'
-        . '<legend>' . __('Add slave replication user') . '</legend>'
-        . PMA_getHtmlForAddUserLoginForm($username_length)
-        . '<div class="item">'
-        . '<label for="select_pred_hostname">'
-        . '    ' . __('Host:')
-        . '</label>'
-        . '<span class="options">'
-        . '    <select name="pred_hostname" id="select_pred_hostname" title="'
-        . __('Host') . '"';
-
-    $_current_user = $GLOBALS['dbi']->fetchValue('SELECT USER();');
-    if (! empty($_current_user)) {
-        $thishost = str_replace(
-            "'",
-            '',
-            mb_substr(
-                $_current_user,
-                (mb_strrpos($_current_user, '@') + 1)
-            )
-        );
-        if ($thishost != 'localhost' && $thishost != '127.0.0.1') {
-            $html .= ' data-thishost="' . htmlspecialchars($thishost) . '" ';
-        } else {
-            unset($thishost);
-        }
-    }
-    $html .= '>' . "\n";
-    unset($_current_user);
-
-    // when we start editing a user, $GLOBALS['pred_hostname'] is not defined
-    if (! isset($GLOBALS['pred_hostname']) && isset($_REQUEST['hostname'])) {
-        switch (mb_strtolower($_REQUEST['hostname'])) {
-        case 'localhost':
-        case '127.0.0.1':
-            $GLOBALS['pred_hostname'] = 'localhost';
-            break;
-        case '%':
-            $GLOBALS['pred_hostname'] = 'any';
-            break;
-        default:
-            $GLOBALS['pred_hostname'] = 'userdefined';
-            break;
-        }
-    }
-    $html .= '        <option value="any"'
-        . ((isset($GLOBALS['pred_hostname']) && $GLOBALS['pred_hostname'] == 'any')
-        ? ' selected="selected"' : '') . '>' . __('Any host')
-        . '</option>'
-        . '        <option value="localhost"'
-        . ((isset($GLOBALS['pred_hostname'])
-            && $GLOBALS['pred_hostname'] == 'localhost')
-        ? ' selected="selected"' : '') . '>' . __('Local')
-        . '</option>';
-
-    if (!empty($thishost)) {
-        $html .= '        <option value="thishost"'
-            . ((isset($GLOBALS['pred_hostname'])
-                && $GLOBALS['pred_hostname'] == 'thishost')
-            ? ' selected="selected"' : '') . '>' . __('This Host')
-            . '</option>';
-    }
-    unset($thishost);
-
-    $html .= PMA_getHtmlForTableInfoForm($hostname_length);
-    $html .= '</form>';
-    $html .= '</div>';
-
-    return $html;
-}
-/**
- *  returns html code to add a replication slave user to the master
- *
- * @param int $username_length Username length
- *
- * @return String HTML code
- */
-function PMA_getHtmlForAddUserLoginForm($username_length)
-{
-    $html = '<input type="hidden" name="grant_count" value="25" />'
-        . '<input type="hidden" name="createdb" id="createdb_0" value="0" />'
-        . '<input id="checkbox_Repl_slave_priv" type="hidden"'
-        . ' title="Needed for the replication slaves." '
-        . 'value="Y" name="Repl_slave_priv"/>'
-        . '<input id="checkbox_Repl_client_priv" type="hidden" '
-        . 'title="Needed for the replication slaves."'
-        . ' value="Y" name="Repl_client_priv"/> '
-        . '<input type="hidden" name="sr_take_action" value="true" />'
-        . '<div class="item">'
-        . '<label for="select_pred_username">'
-        . '    ' . __('User name:')
-        . '</label>'
-        . '<span class="options">'
-        . '    <select name="pred_username" id="select_pred_username" '
-        .         'title="' . __('User name') . '">'
-        . '        <option value="any"'
-        . ((isset($GLOBALS['pred_username'])
-            && $GLOBALS['pred_username'] == 'any') ? ' selected="selected"' : '')
-        . '>' . __('Any user') . '</option>'
-        . '        <option value="userdefined"'
-        . ((! isset($GLOBALS['pred_username'])
-            || $GLOBALS['pred_username'] == 'userdefined')
-            ? ' selected="selected"' : '')
-        . '>' . __('Use text field:') . '</option>'
-        . '    </select>'
-        . '</span>'
-        . '<input type="text" name="username" id="pma_username" maxlength="'
-        . $username_length . '" title="' . __('User name') . '"'
-        . (empty($_REQUEST['username']) ? '' : ' value="'
-        . (isset($GLOBALS['new_username'])
-            ? $GLOBALS['new_username']
-            : htmlspecialchars($_REQUEST['username'])) . '"')
-        . ' />'
-        . '</div>';
-
-    return $html;
-}
-
-/**
- * returns HTML for TableInfoForm
- *
- * @param int $hostname_length Selected hostname length
- *
- * @return String HTML code
- */
-function PMA_getHtmlForTableInfoForm($hostname_length)
-{
-    $html = '        <option value="hosttable"'
-        . ((isset($GLOBALS['pred_hostname'])
-            && $GLOBALS['pred_hostname'] == 'hosttable')
-        ? ' selected="selected"' : '') . '>' . __('Use Host Table')
-        . '</option>'
-        . '        <option value="userdefined"'
-        . ((isset($GLOBALS['pred_hostname'])
-            && $GLOBALS['pred_hostname'] == 'userdefined')
-        ? ' selected="selected"' : '')
-        . '>' . __('Use text field:') . '</option>'
-        . '    </select>'
-        . '</span>'
-        . '<input type="text" name="hostname" id="pma_hostname" maxlength="'
-        . $hostname_length . '" value="'
-        . (isset($_REQUEST['hostname']) ? htmlspecialchars($_REQUEST['hostname']) : '')
-        . '" title="' . __('Host')
-        . '" />'
-        . PMA\libraries\Util::showHint(
-            __(
-                'When Host table is used, this field is ignored '
-                . 'and values stored in Host table are used instead.'
-            )
-        )
-        . '</div>'
-        . '<div class="item">'
-        . '<label for="select_pred_password">'
-        . '    ' . __('Password:')
-        . '</label>'
-        . '<span class="options">'
-        . '    <select name="pred_password" id="select_pred_password" title="'
-        . __('Password') . '">'
-        . '        <option value="none"';
-    if (isset($_REQUEST['username'])) {
-        $html .= '  selected="selected"';
-    }
-    $html .= '>' . __('No Password') . '</option>'
-        . '        <option value="userdefined"'
-        . (isset($_REQUEST['username']) ? '' : ' selected="selected"')
-        . '>' . __('Use text field:') . '</option>'
-        . '    </select>'
-        . '</span>'
-        . '<input type="password" id="text_pma_pw" name="pma_pw" title="'
-        . __('Password') . '" />'
-        . '</div>'
-        . '<div class="item">'
-        . '<label for="text_pma_pw2">'
-        . '    ' . __('Re-type:')
-        . '</label>'
-        . '<span class="options">&nbsp;</span>'
-        . '<input type="password" name="pma_pw2" id="text_pma_pw2" title="'
-        . __('Re-type') . '" />'
-        . '</div>'
-        . '<div class="item">'
-        . '<label for="button_generate_password">'
-        . '    ' . __('Generate password:')
-        . '</label>'
-        . '<span class="options">'
-        . '    <input type="button" class="button" '
-        . 'id="button_generate_password" value="' . __('Generate')
-        . '" onclick="suggestPassword(this.form)" />'
-        . '</span>'
-        . '<input type="text" name="generated_pw" id="generated_pw" />'
-        . '</div>'
-        . '</fieldset>';
-    $html .= '<fieldset id="fieldset_user_privtable_footer" class="tblFooters">'
-        . '    <input type="hidden" name="adduser_submit" value="1" />'
-        . '    <input type="submit" id="adduser_submit" value="' . __('Go') . '" />'
-        . '</fieldset>';
-    return $html;
-}
-
-/**
- * handle control requests
- *
- * @return NULL
- */
-function PMA_handleControlRequest()
-{
-    if (isset($_REQUEST['sr_take_action'])) {
-        $refresh = false;
-        $result = false;
-        $messageSuccess = null;
-        $messageError = null;
-
-        if (isset($_REQUEST['slave_changemaster'])) {
-            $result = PMA_handleRequestForSlaveChangeMaster();
-        } elseif (isset($_REQUEST['sr_slave_server_control'])) {
-            $result = PMA_handleRequestForSlaveServerControl();
-            $refresh = true;
-
-            switch ($_REQUEST['sr_slave_action']) {
-            case 'start':
-                $messageSuccess = __('Replication started successfully.');
-                $messageError = __('Error starting replication.');
-                break;
-            case 'stop':
-                $messageSuccess = __('Replication stopped successfully.');
-                $messageError = __('Error stopping replication.');
-                break;
-            case 'reset':
-                $messageSuccess = __('Replication resetting successfully.');
-                $messageError = __('Error resetting replication.');
-                break;
-            default:
-                $messageSuccess = __('Success.');
-                $messageError = __('Error.');
-                break;
-            }
-        } elseif (isset($_REQUEST['sr_slave_skip_error'])) {
-            $result = PMA_handleRequestForSlaveSkipError();
-        }
-
-        if ($refresh) {
-            $response = PMA\libraries\Response::getInstance();
-            if ($response->isAjax()) {
-                $response->setRequestStatus($result);
-                $response->addJSON(
-                    'message',
-                    $result
-                    ? Message::success($messageSuccess)
-                    : Message::error($messageError)
-                );
-            } else {
-                PMA_sendHeaderLocation(
-                    './server_replication.php'
-                    . PMA_URL_getCommon($GLOBALS['url_params'], 'text')
-                );
-            }
-        }
-        unset($refresh);
-    }
-}
-/**
- * handle control requests for Slave Change Master
- *
- * @return boolean
- */
-function PMA_handleRequestForSlaveChangeMaster()
-{
-    $sr = array();
-    $_SESSION['replication']['m_username'] = $sr['username']
-        = $GLOBALS['dbi']->escapeString($_REQUEST['username']);
-    $_SESSION['replication']['m_password'] = $sr['pma_pw']
-        = $GLOBALS['dbi']->escapeString($_REQUEST['pma_pw']);
-    $_SESSION['replication']['m_hostname'] = $sr['hostname']
-        = $GLOBALS['dbi']->escapeString($_REQUEST['hostname']);
-    $_SESSION['replication']['m_port']     = $sr['port']
-        = $GLOBALS['dbi']->escapeString($_REQUEST['text_port']);
-    $_SESSION['replication']['m_correct']  = '';
-    $_SESSION['replication']['sr_action_status'] = 'error';
-    $_SESSION['replication']['sr_action_info'] = __('Unknown error');
-
-    // Attempt to connect to the new master server
-    $link_to_master = PMA_Replication_connectToMaster(
-        $sr['username'], $sr['pma_pw'], $sr['hostname'], $sr['port']
-    );
-
-    if (! $link_to_master) {
-        $_SESSION['replication']['sr_action_status'] = 'error';
-        $_SESSION['replication']['sr_action_info'] = sprintf(
-            __('Unable to connect to master %s.'),
-            htmlspecialchars($sr['hostname'])
-        );
-    } else {
-        // Read the current master position
-        $position = PMA_Replication_Slave_binLogMaster($link_to_master);
-
-        if (empty($position)) {
-            $_SESSION['replication']['sr_action_status'] = 'error';
-            $_SESSION['replication']['sr_action_info']
-                = __(
-                    'Unable to read master log position. '
-                    . 'Possible privilege problem on master.'
-                );
-        } else {
-            $_SESSION['replication']['m_correct']  = true;
-
-            if (! PMA_Replication_Slave_changeMaster(
-                $sr['username'],
-                $sr['pma_pw'],
-                $sr['hostname'],
-                $sr['port'],
-                $position,
-                true,
-                false
-            )
-            ) {
-                $_SESSION['replication']['sr_action_status'] = 'error';
-                $_SESSION['replication']['sr_action_info']
-                    = __('Unable to change master!');
-            } else {
-                $_SESSION['replication']['sr_action_status'] = 'success';
-                $_SESSION['replication']['sr_action_info'] = sprintf(
-                    __('Master server changed successfully to %s.'),
-                    htmlspecialchars($sr['hostname'])
-                );
-            }
-        }
-    }
-
-    return $_SESSION['replication']['sr_action_status'] === 'success';
-}
-
-/**
- * handle control requests for Slave Server Control
- *
- * @return boolean
- */
-function PMA_handleRequestForSlaveServerControl()
-{
-    if (empty($_REQUEST['sr_slave_control_parm'])) {
-        $_REQUEST['sr_slave_control_parm'] = null;
-    }
-    if ($_REQUEST['sr_slave_action'] == 'reset') {
-        $qStop = PMA_Replication_Slave_control("STOP");
-        $qReset = $GLOBALS['dbi']->tryQuery("RESET SLAVE;");
-        $qStart = PMA_Replication_Slave_control("START");
-
-        $result = ($qStop !== false && $qStop !== -1 &&
-            $qReset !== false && $qReset !== -1 &&
-            $qStart !== false && $qStart !== -1);
-    } else {
-        $qControl = PMA_Replication_Slave_control(
-            $_REQUEST['sr_slave_action'],
-            $_REQUEST['sr_slave_control_parm']
-        );
-
-        $result = ($qControl !== false && $qControl !== -1);
-    }
-
-    return $result;
-}
-
-/**
- * handle control requests for Slave Skip Error
- *
- * @return boolean
- */
-function PMA_handleRequestForSlaveSkipError()
-{
-    $count = 1;
-    if (isset($_REQUEST['sr_skip_errors_count'])) {
-        $count = $_REQUEST['sr_skip_errors_count'] * 1;
-    }
-
-    $qStop = PMA_Replication_Slave_control("STOP");
-    $qSkip = $GLOBALS['dbi']->tryQuery(
-        "SET GLOBAL SQL_SLAVE_SKIP_COUNTER = " . $count . ";"
-    );
-    $qStart = PMA_Replication_Slave_control("START");
-
-    $result = ($qStop !== false && $qStop !== -1 &&
-        $qSkip !== false && $qSkip !== -1 &&
-        $qStart !== false && $qStart !== -1);
-
-    return $result;
-}
diff --git a/#pma/libraries/rte/rte_events.lib.php b/#pma/libraries/rte/rte_events.lib.php
deleted file mode 100644
index f2507e9f..00000000
--- a/#pma/libraries/rte/rte_events.lib.php
+++ /dev/null
@@ -1,612 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Functions for event management.
- *
- * @package PhpMyAdmin
- */
-use PMA\libraries\Response;
-
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
-/**
- * Sets required globals
- *
- * @return void
- */
-function PMA_EVN_setGlobals()
-{
-    global $event_status, $event_type, $event_interval;
-
-    $event_status        = array(
-                               'query'   => array('ENABLE',
-                                                  'DISABLE',
-                                                  'DISABLE ON SLAVE'),
-                               'display' => array('ENABLED',
-                                                  'DISABLED',
-                                                  'SLAVESIDE_DISABLED')
-                           );
-    $event_type          = array('RECURRING',
-                                 'ONE TIME');
-    $event_interval      = array('YEAR',
-                                 'QUARTER',
-                                 'MONTH',
-                                 'DAY',
-                                 'HOUR',
-                                 'MINUTE',
-                                 'WEEK',
-                                 'SECOND',
-                                 'YEAR_MONTH',
-                                 'DAY_HOUR',
-                                 'DAY_MINUTE',
-                                 'DAY_SECOND',
-                                 'HOUR_MINUTE',
-                                 'HOUR_SECOND',
-                                 'MINUTE_SECOND');
-}
-
-/**
- * Main function for the events functionality
- *
- * @return void
- */
-function PMA_EVN_main()
-{
-    global $db;
-
-    PMA_EVN_setGlobals();
-    /**
-     * Process all requests
-     */
-    PMA_EVN_handleEditor();
-    PMA_EVN_handleExport();
-    /**
-     * Display a list of available events
-     */
-    $items = $GLOBALS['dbi']->getEvents($db);
-    echo PMA_RTE_getList('event', $items);
-    /**
-     * Display a link for adding a new event, if
-     * the user has the privileges and a link to
-     * toggle the state of the event scheduler.
-     */
-    echo PMA_EVN_getFooterLinks();
-} // end PMA_EVN_main()
-
-/**
- * Handles editor requests for adding or editing an item
- *
- * @return void
- */
-function PMA_EVN_handleEditor()
-{
-    global $_REQUEST, $_POST, $errors, $db;
-
-    if (! empty($_REQUEST['editor_process_add'])
-        || ! empty($_REQUEST['editor_process_edit'])
-    ) {
-        $sql_query = '';
-
-        $item_query = PMA_EVN_getQueryFromRequest();
-
-        if (! count($errors)) { // set by PMA_RTN_getQueryFromRequest()
-            // Execute the created query
-            if (! empty($_REQUEST['editor_process_edit'])) {
-                // Backup the old trigger, in case something goes wrong
-                $create_item = $GLOBALS['dbi']->getDefinition(
-                    $db,
-                    'EVENT',
-                    $_REQUEST['item_original_name']
-                );
-                $drop_item = "DROP EVENT "
-                    . PMA\libraries\Util::backquote($_REQUEST['item_original_name'])
-                    . ";\n";
-                $result = $GLOBALS['dbi']->tryQuery($drop_item);
-                if (! $result) {
-                    $errors[] = sprintf(
-                        __('The following query has failed: "%s"'),
-                        htmlspecialchars($drop_item)
-                    )
-                    . '<br />'
-                    . __('MySQL said: ') . $GLOBALS['dbi']->getError(null);
-                } else {
-                    $result = $GLOBALS['dbi']->tryQuery($item_query);
-                    if (! $result) {
-                        $errors[] = sprintf(
-                            __('The following query has failed: "%s"'),
-                            htmlspecialchars($item_query)
-                        )
-                        . '<br />'
-                        . __('MySQL said: ') . $GLOBALS['dbi']->getError(null);
-                        // We dropped the old item, but were unable to create
-                        // the new one. Try to restore the backup query
-                        $result = $GLOBALS['dbi']->tryQuery($create_item);
-                        $errors = checkResult(
-                            $result,
-                            __(
-                                'Sorry, we failed to restore the dropped event.'
-                            ),
-                            $create_item,
-                            $errors
-                        );
-                    } else {
-                        $message = PMA\libraries\Message::success(
-                            __('Event %1$s has been modified.')
-                        );
-                        $message->addParam(
-                            PMA\libraries\Util::backquote($_REQUEST['item_name'])
-                        );
-                        $sql_query = $drop_item . $item_query;
-                    }
-                }
-            } else {
-                // 'Add a new item' mode
-                $result = $GLOBALS['dbi']->tryQuery($item_query);
-                if (! $result) {
-                    $errors[] = sprintf(
-                        __('The following query has failed: "%s"'),
-                        htmlspecialchars($item_query)
-                    )
-                    . '<br /><br />'
-                    . __('MySQL said: ') . $GLOBALS['dbi']->getError(null);
-                } else {
-                    $message = PMA\libraries\Message::success(
-                        __('Event %1$s has been created.')
-                    );
-                    $message->addParam(
-                        PMA\libraries\Util::backquote($_REQUEST['item_name'])
-                    );
-                    $sql_query = $item_query;
-                }
-            }
-        }
-
-        if (count($errors)) {
-            $message = PMA\libraries\Message::error(
-                '<b>'
-                . __(
-                    'One or more errors have occurred while processing your request:'
-                )
-                . '</b>'
-            );
-            $message->addString('<ul>');
-            foreach ($errors as $string) {
-                $message->addString('<li>' . $string . '</li>');
-            }
-            $message->addString('</ul>');
-        }
-
-        $output = PMA\libraries\Util::getMessage($message, $sql_query);
-        if ($GLOBALS['is_ajax_request']) {
-            $response = PMA\libraries\Response::getInstance();
-            if ($message->isSuccess()) {
-                $events = $GLOBALS['dbi']->getEvents($db, $_REQUEST['item_name']);
-                $event = $events[0];
-                $response->addJSON(
-                    'name',
-                    htmlspecialchars(
-                        mb_strtoupper($_REQUEST['item_name'])
-                    )
-                );
-                $response->addJSON('new_row', PMA_EVN_getRowForList($event));
-                $response->addJSON('insert', ! empty($event));
-                $response->addJSON('message', $output);
-            } else {
-                $response->setRequestStatus(false);
-                $response->addJSON('message', $message);
-            }
-            exit;
-        }
-    }
-    /**
-     * Display a form used to add/edit a trigger, if necessary
-     */
-    if (count($errors)
-        || (empty($_REQUEST['editor_process_add'])
-        && empty($_REQUEST['editor_process_edit'])
-        && (! empty($_REQUEST['add_item'])
-        || ! empty($_REQUEST['edit_item'])
-        || ! empty($_REQUEST['item_changetype'])))
-    ) { // FIXME: this must be simpler than that
-        $operation = '';
-        if (! empty($_REQUEST['item_changetype'])) {
-            $operation = 'change';
-        }
-        // Get the data for the form (if any)
-        if (! empty($_REQUEST['add_item'])) {
-            $title = PMA_RTE_getWord('add');
-            $item = PMA_EVN_getDataFromRequest();
-            $mode = 'add';
-        } else if (! empty($_REQUEST['edit_item'])) {
-            $title = __("Edit event");
-            if (! empty($_REQUEST['item_name'])
-                && empty($_REQUEST['editor_process_edit'])
-                && empty($_REQUEST['item_changetype'])
-            ) {
-                $item = PMA_EVN_getDataFromName($_REQUEST['item_name']);
-                if ($item !== false) {
-                    $item['item_original_name'] = $item['item_name'];
-                }
-            } else {
-                $item = PMA_EVN_getDataFromRequest();
-            }
-            $mode = 'edit';
-        }
-        PMA_RTE_sendEditor('EVN', $mode, $item, $title, $db, $operation);
-    }
-} // end PMA_EVN_handleEditor()
-
-/**
- * This function will generate the values that are required to for the editor
- *
- * @return array    Data necessary to create the editor.
- */
-function PMA_EVN_getDataFromRequest()
-{
-    $retval = array();
-    $indices = array('item_name',
-                     'item_original_name',
-                     'item_status',
-                     'item_execute_at',
-                     'item_interval_value',
-                     'item_interval_field',
-                     'item_starts',
-                     'item_ends',
-                     'item_definition',
-                     'item_preserve',
-                     'item_comment',
-                     'item_definer');
-    foreach ($indices as $index) {
-        $retval[$index] = isset($_REQUEST[$index]) ? $_REQUEST[$index] : '';
-    }
-    $retval['item_type']        = 'ONE TIME';
-    $retval['item_type_toggle'] = 'RECURRING';
-    if (isset($_REQUEST['item_type']) && $_REQUEST['item_type'] == 'RECURRING') {
-        $retval['item_type']        = 'RECURRING';
-        $retval['item_type_toggle'] = 'ONE TIME';
-    }
-    return $retval;
-} // end PMA_EVN_getDataFromRequest()
-
-/**
- * This function will generate the values that are required to complete
- * the "Edit event" form given the name of a event.
- *
- * @param string $name The name of the event.
- *
- * @return array Data necessary to create the editor.
- */
-function PMA_EVN_getDataFromName($name)
-{
-    global $db;
-
-    $retval = array();
-    $columns = "`EVENT_NAME`, `STATUS`, `EVENT_TYPE`, `EXECUTE_AT`, "
-             . "`INTERVAL_VALUE`, `INTERVAL_FIELD`, `STARTS`, `ENDS`, "
-             . "`EVENT_DEFINITION`, `ON_COMPLETION`, `DEFINER`, `EVENT_COMMENT`";
-    $where   = "EVENT_SCHEMA " . PMA\libraries\Util::getCollateForIS() . "="
-             . "'" . $GLOBALS['dbi']->escapeString($db) . "' "
-             . "AND EVENT_NAME='" . $GLOBALS['dbi']->escapeString($name) . "'";
-    $query   = "SELECT $columns FROM `INFORMATION_SCHEMA`.`EVENTS` WHERE $where;";
-    $item    = $GLOBALS['dbi']->fetchSingleRow($query);
-    if (! $item) {
-        return false;
-    }
-    $retval['item_name']   = $item['EVENT_NAME'];
-    $retval['item_status'] = $item['STATUS'];
-    $retval['item_type']   = $item['EVENT_TYPE'];
-    if ($retval['item_type'] == 'RECURRING') {
-        $retval['item_type_toggle'] = 'ONE TIME';
-    } else {
-        $retval['item_type_toggle'] = 'RECURRING';
-    }
-    $retval['item_execute_at']     = $item['EXECUTE_AT'];
-    $retval['item_interval_value'] = $item['INTERVAL_VALUE'];
-    $retval['item_interval_field'] = $item['INTERVAL_FIELD'];
-    $retval['item_starts']         = $item['STARTS'];
-    $retval['item_ends']           = $item['ENDS'];
-    $retval['item_preserve']       = '';
-    if ($item['ON_COMPLETION'] == 'PRESERVE') {
-        $retval['item_preserve']   = " checked='checked'";
-    }
-    $retval['item_definition'] = $item['EVENT_DEFINITION'];
-    $retval['item_definer']    = $item['DEFINER'];
-    $retval['item_comment']    = $item['EVENT_COMMENT'];
-
-    return $retval;
-} // end PMA_EVN_getDataFromName()
-
-/**
- * Displays a form used to add/edit an event
- *
- * @param string $mode      If the editor will be used to edit an event
- *                              or add a new one: 'edit' or 'add'.
- * @param string $operation If the editor was previously invoked with
- *                              JS turned off, this will hold the name of
- *                              the current operation
- * @param array  $item      Data for the event returned by
- *                              PMA_EVN_getDataFromRequest() or
- *                              PMA_EVN_getDataFromName()
- *
- * @return string   HTML code for the editor.
- */
-function PMA_EVN_getEditorForm($mode, $operation, $item)
-{
-    global $db, $table, $event_status, $event_type, $event_interval;
-
-    $modeToUpper = mb_strtoupper($mode);
-
-    // Escape special characters
-    $need_escape = array(
-                       'item_original_name',
-                       'item_name',
-                       'item_type',
-                       'item_execute_at',
-                       'item_interval_value',
-                       'item_starts',
-                       'item_ends',
-                       'item_definition',
-                       'item_definer',
-                       'item_comment'
-                   );
-    foreach ($need_escape as $index) {
-        $item[$index] = htmlentities($item[$index], ENT_QUOTES);
-    }
-    $original_data = '';
-    if ($mode == 'edit') {
-        $original_data = "<input name='item_original_name' "
-                       . "type='hidden' value='{$item['item_original_name']}'/>\n";
-    }
-    // Handle some logic first
-    if ($operation == 'change') {
-        if ($item['item_type'] == 'RECURRING') {
-            $item['item_type']         = 'ONE TIME';
-            $item['item_type_toggle']  = 'RECURRING';
-        } else {
-            $item['item_type']         = 'RECURRING';
-            $item['item_type_toggle']  = 'ONE TIME';
-        }
-    }
-    if ($item['item_type'] == 'ONE TIME') {
-        $isrecurring_class = ' hide';
-        $isonetime_class   = '';
-    } else {
-        $isrecurring_class = '';
-        $isonetime_class   = ' hide';
-    }
-    // Create the output
-    $retval  = "";
-    $retval .= "<!-- START " . $modeToUpper . " EVENT FORM -->\n\n";
-    $retval .= "<form class='rte_form' action='db_events.php' method='post'>\n";
-    $retval .= "<input name='{$mode}_item' type='hidden' value='1' />\n";
-    $retval .= $original_data;
-    $retval .= PMA_URL_getHiddenInputs($db, $table) . "\n";
-    $retval .= "<fieldset>\n";
-    $retval .= "<legend>" . __('Details') . "</legend>\n";
-    $retval .= "<table class='rte_table' style='width: 100%'>\n";
-    $retval .= "<tr>\n";
-    $retval .= "    <td style='width: 20%;'>" . __('Event name') . "</td>\n";
-    $retval .= "    <td><input type='text' name='item_name' \n";
-    $retval .= "               value='{$item['item_name']}'\n";
-    $retval .= "               maxlength='64' /></td>\n";
-    $retval .= "</tr>\n";
-    $retval .= "<tr>\n";
-    $retval .= "    <td>" . __('Status') . "</td>\n";
-    $retval .= "    <td>\n";
-    $retval .= "        <select name='item_status'>\n";
-    foreach ($event_status['display'] as $key => $value) {
-        $selected = "";
-        if (! empty($item['item_status']) && $item['item_status'] == $value) {
-            $selected = " selected='selected'";
-        }
-        $retval .= "<option$selected>$value</option>";
-    }
-    $retval .= "        </select>\n";
-    $retval .= "    </td>\n";
-    $retval .= "</tr>\n";
-
-    $retval .= "<tr>\n";
-    $retval .= "    <td>" . __('Event type') . "</td>\n";
-    $retval .= "    <td>\n";
-    if ($GLOBALS['is_ajax_request']) {
-        $retval .= "        <select name='item_type'>";
-        foreach ($event_type as $key => $value) {
-            $selected = "";
-            if (! empty($item['item_type']) && $item['item_type'] == $value) {
-                $selected = " selected='selected'";
-            }
-            $retval .= "<option$selected>$value</option>";
-        }
-        $retval .= "        </select>\n";
-    } else {
-        $retval .= "        <input name='item_type' type='hidden' \n";
-        $retval .= "               value='{$item['item_type']}' />\n";
-        $retval .= "        <div class='floatleft' style='width: 49%; "
-            . "text-align: center; font-weight: bold;'>\n";
-        $retval .= "            {$item['item_type']}\n";
-        $retval .= "        </div>\n";
-        $retval .= "        <input style='width: 49%;' type='submit'\n";
-        $retval .= "               name='item_changetype'\n";
-        $retval .= "               value='";
-        $retval .= sprintf(__('Change to %s'), $item['item_type_toggle']);
-        $retval .= "' />\n";
-    }
-    $retval .= "    </td>\n";
-    $retval .= "</tr>\n";
-    $retval .= "<tr class='onetime_event_row $isonetime_class'>\n";
-    $retval .= "    <td>" . __('Execute at') . "</td>\n";
-    $retval .= "    <td class='nowrap'>\n";
-    $retval .= "        <input type='text' name='item_execute_at'\n";
-    $retval .= "               value='{$item['item_execute_at']}'\n";
-    $retval .= "               class='datetimefield' />\n";
-    $retval .= "    </td>\n";
-    $retval .= "</tr>\n";
-    $retval .= "<tr class='recurring_event_row $isrecurring_class'>\n";
-    $retval .= "    <td>" . __('Execute every') . "</td>\n";
-    $retval .= "    <td>\n";
-    $retval .= "        <input style='width: 49%;' type='text'\n";
-    $retval .= "               name='item_interval_value'\n";
-    $retval .= "               value='{$item['item_interval_value']}' />\n";
-    $retval .= "        <select style='width: 49%;' name='item_interval_field'>";
-    foreach ($event_interval as $key => $value) {
-        $selected = "";
-        if (! empty($item['item_interval_field'])
-            && $item['item_interval_field'] == $value
-        ) {
-            $selected = " selected='selected'";
-        }
-        $retval .= "<option$selected>$value</option>";
-    }
-    $retval .= "        </select>\n";
-    $retval .= "    </td>\n";
-    $retval .= "</tr>\n";
-    $retval .= "<tr class='recurring_event_row$isrecurring_class'>\n";
-    $retval .= "    <td>" . _pgettext('Start of recurring event', 'Start');
-    $retval .= "    </td>\n";
-    $retval .= "    <td class='nowrap'>\n";
-    $retval .= "        <input type='text'\n name='item_starts'\n";
-    $retval .= "               value='{$item['item_starts']}'\n";
-    $retval .= "               class='datetimefield' />\n";
-    $retval .= "    </td>\n";
-    $retval .= "</tr>\n";
-    $retval .= "<tr class='recurring_event_row$isrecurring_class'>\n";
-    $retval .= "    <td>" . _pgettext('End of recurring event', 'End') . "</td>\n";
-    $retval .= "    <td class='nowrap'>\n";
-    $retval .= "        <input type='text' name='item_ends'\n";
-    $retval .= "               value='{$item['item_ends']}'\n";
-    $retval .= "               class='datetimefield' />\n";
-    $retval .= "    </td>\n";
-    $retval .= "</tr>\n";
-    $retval .= "<tr>\n";
-    $retval .= "    <td>" . __('Definition') . "</td>\n";
-    $retval .= "    <td><textarea name='item_definition' rows='15' cols='40'>";
-    $retval .= $item['item_definition'];
-    $retval .= "</textarea></td>\n";
-    $retval .= "</tr>\n";
-    $retval .= "<tr>\n";
-    $retval .= "    <td>" . __('On completion preserve') . "</td>\n";
-    $retval .= "    <td><input type='checkbox'\n";
-    $retval .= "             name='item_preserve'{$item['item_preserve']} /></td>\n";
-    $retval .= "</tr>\n";
-    $retval .= "<tr>\n";
-    $retval .= "    <td>" . __('Definer') . "</td>\n";
-    $retval .= "    <td><input type='text' name='item_definer'\n";
-    $retval .= "               value='{$item['item_definer']}' /></td>\n";
-    $retval .= "</tr>\n";
-    $retval .= "<tr>\n";
-    $retval .= "    <td>" . __('Comment') . "</td>\n";
-    $retval .= "    <td><input type='text' name='item_comment' maxlength='64'\n";
-    $retval .= "               value='{$item['item_comment']}' /></td>\n";
-    $retval .= "</tr>\n";
-    $retval .= "</table>\n";
-    $retval .= "</fieldset>\n";
-    if ($GLOBALS['is_ajax_request']) {
-        $retval .= "<input type='hidden' name='editor_process_{$mode}'\n";
-        $retval .= "       value='true' />\n";
-        $retval .= "<input type='hidden' name='ajax_request' value='true' />\n";
-    } else {
-        $retval .= "<fieldset class='tblFooters'>\n";
-        $retval .= "    <input type='submit' name='editor_process_{$mode}'\n";
-        $retval .= "           value='" . __('Go') . "' />\n";
-        $retval .= "</fieldset>\n";
-    }
-    $retval .= "</form>\n\n";
-    $retval .= "<!-- END " . $modeToUpper . " EVENT FORM -->\n\n";
-
-    return $retval;
-} // end PMA_EVN_getEditorForm()
-
-/**
- * Composes the query necessary to create an event from an HTTP request.
- *
- * @return string  The CREATE EVENT query.
- */
-function PMA_EVN_getQueryFromRequest()
-{
-    global $_REQUEST, $errors, $event_status, $event_type, $event_interval;
-
-    $query = 'CREATE ';
-    if (! empty($_REQUEST['item_definer'])) {
-        if (mb_strpos($_REQUEST['item_definer'], '@') !== false
-        ) {
-            $arr = explode('@', $_REQUEST['item_definer']);
-            $query .= 'DEFINER=' . PMA\libraries\Util::backquote($arr[0]);
-            $query .= '@' . PMA\libraries\Util::backquote($arr[1]) . ' ';
-        } else {
-            $errors[] = __('The definer must be in the "username@hostname" format!');
-        }
-    }
-    $query .= 'EVENT ';
-    if (! empty($_REQUEST['item_name'])) {
-        $query .= PMA\libraries\Util::backquote($_REQUEST['item_name']) . ' ';
-    } else {
-        $errors[] = __('You must provide an event name!');
-    }
-    $query .= 'ON SCHEDULE ';
-    if (! empty($_REQUEST['item_type'])
-        && in_array($_REQUEST['item_type'], $event_type)
-    ) {
-        if ($_REQUEST['item_type'] == 'RECURRING') {
-            if (! empty($_REQUEST['item_interval_value'])
-                && !empty($_REQUEST['item_interval_field'])
-                && in_array($_REQUEST['item_interval_field'], $event_interval)
-            ) {
-                $query .= 'EVERY ' . intval($_REQUEST['item_interval_value']) . ' ';
-                $query .= $_REQUEST['item_interval_field'] . ' ';
-            } else {
-                $errors[]
-                    = __('You must provide a valid interval value for the event.');
-            }
-            if (! empty($_REQUEST['item_starts'])) {
-                $query .= "STARTS '"
-                    . $GLOBALS['dbi']->escapeString($_REQUEST['item_starts'])
-                    . "' ";
-            }
-            if (! empty($_REQUEST['item_ends'])) {
-                $query .= "ENDS '"
-                    . $GLOBALS['dbi']->escapeString($_REQUEST['item_ends'])
-                    . "' ";
-            }
-        } else {
-            if (! empty($_REQUEST['item_execute_at'])) {
-                $query .= "AT '"
-                    . $GLOBALS['dbi']->escapeString($_REQUEST['item_execute_at'])
-                    . "' ";
-            } else {
-                $errors[]
-                    = __('You must provide a valid execution time for the event.');
-            }
-        }
-    } else {
-        $errors[] = __('You must provide a valid type for the event.');
-    }
-    $query .= 'ON COMPLETION ';
-    if (empty($_REQUEST['item_preserve'])) {
-        $query .= 'NOT ';
-    }
-    $query .= 'PRESERVE ';
-    if (! empty($_REQUEST['item_status'])) {
-        foreach ($event_status['display'] as $key => $value) {
-            if ($value == $_REQUEST['item_status']) {
-                $query .= $event_status['query'][$key] . ' ';
-                break;
-            }
-        }
-    }
-    if (! empty($_REQUEST['item_comment'])) {
-        $query .= "COMMENT '" . $GLOBALS['dbi']->escapeString(
-            $_REQUEST['item_comment']
-        ) . "' ";
-    }
-    $query .= 'DO ';
-    if (! empty($_REQUEST['item_definition'])) {
-        $query .= $_REQUEST['item_definition'];
-    } else {
-        $errors[] = __('You must provide an event definition.');
-    }
-
-    return $query;
-} // end PMA_EVN_getQueryFromRequest()
-
diff --git a/#pma/libraries/rte/rte_export.lib.php b/#pma/libraries/rte/rte_export.lib.php
deleted file mode 100644
index 94b59ff5..00000000
--- a/#pma/libraries/rte/rte_export.lib.php
+++ /dev/null
@@ -1,137 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Common functions for the export functionality for Routines, Triggers and Events.
- *
- * @package PhpMyAdmin
- */
-use PMA\libraries\Message;
-use PMA\libraries\Response;
-
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
-/**
- * This function is called from one of the other functions in this file
- * and it completes the handling of the export functionality.
- *
- * @param string $export_data The SQL query to create the requested item
- *
- * @return void
- */
-function PMA_RTE_handleExport($export_data)
-{
-    global $db;
-
-    $item_name = htmlspecialchars(PMA\libraries\Util::backquote($_GET['item_name']));
-    if ($export_data !== false) {
-        $export_data = htmlspecialchars(trim($export_data));
-        $title = sprintf(PMA_RTE_getWord('export'), $item_name);
-        if ($GLOBALS['is_ajax_request'] == true) {
-            $response = PMA\libraries\Response::getInstance();
-            $response->addJSON('message', $export_data);
-            $response->addJSON('title', $title);
-            exit;
-        } else {
-            $export_data = '<textarea cols="40" rows="15" style="width: 100%;">'
-               . $export_data . '</textarea>';
-            echo "<fieldset>\n"
-               , "<legend>$title</legend>\n"
-               , $export_data
-               , "</fieldset>\n";
-        }
-    } else {
-        $_db = htmlspecialchars(PMA\libraries\Util::backquote($db));
-        $message  = __('Error in processing request:') . ' '
-                  . sprintf(PMA_RTE_getWord('no_view'), $item_name, $_db);
-        $message = Message::error($message);
-
-        if ($GLOBALS['is_ajax_request'] == true) {
-            $response = PMA\libraries\Response::getInstance();
-            $response->setRequestStatus(false);
-            $response->addJSON('message', $message);
-            exit;
-        } else {
-            $message->display();
-        }
-    }
-} // end PMA_RTE_handleExport()
-
-/**
- * If necessary, prepares event information and passes
- * it to PMA_RTE_handleExport() for the actual export.
- *
- * @return void
- */
-function PMA_EVN_handleExport()
-{
-    global $_GET, $db;
-
-    if (! empty($_GET['export_item']) && ! empty($_GET['item_name'])) {
-        $item_name = $_GET['item_name'];
-        $export_data = $GLOBALS['dbi']->getDefinition($db, 'EVENT', $item_name);
-        if (! $export_data) {
-            $export_data = false;
-        }
-        PMA_RTE_handleExport($export_data);
-    }
-} // end PMA_EVN_handleExport()
-
-/**
- * If necessary, prepares routine information and passes
- * it to PMA_RTE_handleExport() for the actual export.
- *
- * @return void
- */
-function PMA_RTN_handleExport()
-{
-    global $_GET, $db;
-
-    if (! empty($_GET['export_item'])
-        && ! empty($_GET['item_name'])
-        && ! empty($_GET['item_type'])
-    ) {
-        if ($_GET['item_type'] == 'FUNCTION' || $_GET['item_type'] == 'PROCEDURE') {
-            $rtn_definition
-                = $GLOBALS['dbi']->getDefinition(
-                    $db,
-                    $_GET['item_type'],
-                    $_GET['item_name']
-                );
-            if (! $rtn_definition) {
-                $export_data = false;
-            } else {
-                $export_data = "DELIMITER $$\n"
-                    . $rtn_definition
-                    . "$$\nDELIMITER ;\n";
-            }
-
-            PMA_RTE_handleExport($export_data);
-        }
-    }
-} // end PMA_RTN_handleExport()
-
-/**
- * If necessary, prepares trigger information and passes
- * it to PMA_RTE_handleExport() for the actual export.
- *
- * @return void
- */
-function PMA_TRI_handleExport()
-{
-    global $_GET, $db, $table;
-
-    if (! empty($_GET['export_item']) && ! empty($_GET['item_name'])) {
-        $item_name = $_GET['item_name'];
-        $triggers = $GLOBALS['dbi']->getTriggers($db, $table, '');
-        $export_data = false;
-        foreach ($triggers as $trigger) {
-            if ($trigger['name'] === $item_name) {
-                $export_data = $trigger['create'];
-                break;
-            }
-        }
-        PMA_RTE_handleExport($export_data);
-    }
-} // end PMA_TRI_handleExport()
diff --git a/#pma/libraries/rte/rte_footer.lib.php b/#pma/libraries/rte/rte_footer.lib.php
deleted file mode 100644
index c3252a2d..00000000
--- a/#pma/libraries/rte/rte_footer.lib.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Common functions for generating the footer for Routines, Triggers and Events.
- *
- * @package PhpMyAdmin
- */
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
-/**
- * Creates a fieldset for adding a new item, if the user has the privileges.
- *
- * @param string $docu String used to create a link to the MySQL docs
- * @param string $priv Privilege to check for adding a new item
- * @param string $name MySQL name of the item
- *
- * @return string An HTML snippet with the link to add a new item
- */
-function PMA_RTE_getFooterLinks($docu, $priv, $name)
-{
-    global $db, $table, $url_query, $ajax_class;
-
-    $icon = mb_strtolower($name) . '_add.png';
-    $retval  = "";
-    $retval .= "<!-- ADD " . $name . " FORM START -->\n";
-    $retval .= "<fieldset class='left'>\n";
-    $retval .= "<legend>" . _pgettext('Create new procedure', 'New') . "</legend>\n";
-    $retval .= "        <div class='wrap'>\n";
-    if (PMA\libraries\Util::currentUserHasPrivilege($priv, $db, $table)) {
-        $retval .= "            <a {$ajax_class['add']} ";
-        $retval .= "href='db_" . mb_strtolower($name) . "s.php";
-        $retval .= "$url_query&amp;add_item=1' ";
-        $retval .= "onclick='$.datepicker.initialized = false;'>";
-        $icon = 'b_' . $icon;
-        $retval .= PMA\libraries\Util::getIcon($icon);
-        $retval .= PMA_RTE_getWord('add') . "</a>\n";
-    } else {
-        $icon = 'bd_' . $icon;
-        $retval .= PMA\libraries\Util::getIcon($icon);
-        $retval .= PMA_RTE_getWord('add') . "\n";
-    }
-    $retval .= "            " . PMA\libraries\Util::showMySQLDocu($docu) . "\n";
-    $retval .= "        </div>\n";
-    $retval .= "</fieldset>\n";
-    $retval .= "<!-- ADD " . $name . " FORM END -->\n\n";
-
-    return $retval;
-} // end PMA_RTE_getFooterLinks()
-
-/**
- * Creates a fieldset for adding a new routine, if the user has the privileges.
- *
- * @return string    HTML code with containing the footer fieldset
- */
-function PMA_RTN_getFooterLinks()
-{
-    return PMA_RTE_getFooterLinks('CREATE_PROCEDURE', 'CREATE ROUTINE', 'ROUTINE');
-}// end PMA_RTN_getFooterLinks()
-
-/**
- * Creates a fieldset for adding a new trigger, if the user has the privileges.
- *
- * @return string    HTML code with containing the footer fieldset
- */
-function PMA_TRI_getFooterLinks()
-{
-    return PMA_RTE_getFooterLinks('CREATE_TRIGGER', 'TRIGGER', 'TRIGGER');
-} // end PMA_TRI_getFooterLinks()
-
-/**
- * Creates a fieldset for adding a new event, if the user has the privileges.
- *
- * @return string    HTML code with containing the footer fieldset
- */
-function PMA_EVN_getFooterLinks()
-{
-    global $db, $url_query;
-
-    /**
-     * For events, we show the usual 'Add event' form and also
-     * a form for toggling the state of the event scheduler
-     */
-    // Init options for the event scheduler toggle functionality
-    $es_state = $GLOBALS['dbi']->fetchValue(
-        "SHOW GLOBAL VARIABLES LIKE 'event_scheduler'",
-        0,
-        1
-    );
-    $es_state = mb_strtolower($es_state);
-    $options = array(
-                    0 => array(
-                        'label' => __('OFF'),
-                        'value' => "SET GLOBAL event_scheduler=\"OFF\"",
-                        'selected' => ($es_state != 'on')
-                    ),
-                    1 => array(
-                        'label' => __('ON'),
-                        'value' => "SET GLOBAL event_scheduler=\"ON\"",
-                        'selected' => ($es_state == 'on')
-                    )
-               );
-    // Generate output
-    $retval  = "<!-- FOOTER LINKS START -->\n";
-    $retval .= "<div class='doubleFieldset'>\n";
-    // show the usual footer
-    $retval .= PMA_RTE_getFooterLinks('CREATE_EVENT', 'EVENT', 'EVENT');
-    $retval .= "    <fieldset class='right'>\n";
-    $retval .= "        <legend>\n";
-    $retval .= "            " . __('Event scheduler status') . "\n";
-    $retval .= "        </legend>\n";
-    $retval .= "        <div class='wrap'>\n";
-    // show the toggle button
-    $retval .= PMA\libraries\Util::toggleButton(
-        "sql.php$url_query&amp;goto=db_events.php" . urlencode("?db=$db"),
-        'sql_query',
-        $options,
-        'PMA_slidingMessage(data.sql_query);'
-    );
-    $retval .= "        </div>\n";
-    $retval .= "    </fieldset>\n";
-    $retval .= "    <div style='clear: both;'></div>\n";
-    $retval .= "</div>";
-    $retval .= "<!-- FOOTER LINKS END -->\n";
-
-    return $retval;
-} // end PMA_EVN_getFooterLinks()
-
diff --git a/#pma/libraries/rte/rte_general.lib.php b/#pma/libraries/rte/rte_general.lib.php
deleted file mode 100644
index b07ca128..00000000
--- a/#pma/libraries/rte/rte_general.lib.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * General functions.
- *
- * @package PhpMyAdmin
- */
-use PMA\libraries\Message;
-use PMA\libraries\Response;
-
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
-/**
- * Check result
- *
- * @param resource|bool $result          Query result
- * @param string        $error           Error to add
- * @param string        $createStatement Query
- * @param array         $errors          Errors
- *
- * @return array
- */
-function checkResult($result, $error, $createStatement, $errors)
-{
-    if ($result) {
-        return $errors;
-    }
-
-    // OMG, this is really bad! We dropped the query,
-    // failed to create a new one
-    // and now even the backup query does not execute!
-    // This should not happen, but we better handle
-    // this just in case.
-    $errors[] = $error . '<br />'
-        . __('The backed up query was:')
-        . "\"" . htmlspecialchars($createStatement) . "\"" . '<br />'
-        . __('MySQL said: ') . $GLOBALS['dbi']->getError(null);
-
-    return $errors;
-}
-
-/**
- * Send TRI or EVN editor via ajax or by echoing.
- *
- * @param string $type      TRI or EVN
- * @param string $mode      Editor mode 'add' or 'edit'
- * @param array  $item      Data necessary to create the editor
- * @param string $title     Title of the editor
- * @param string $db        Database
- * @param string $operation Operation 'change' or ''
- *
- * @return void
- */
-function PMA_RTE_sendEditor($type, $mode, $item, $title, $db, $operation = null)
-{
-    if ($item !== false) {
-        // Show form
-        if ($type == 'TRI') {
-            $editor = PMA_TRI_getEditorForm($mode, $item);
-        } else { // EVN
-            $editor = PMA_EVN_getEditorForm($mode, $operation, $item);
-        }
-        if ($GLOBALS['is_ajax_request']) {
-            $response = PMA\libraries\Response::getInstance();
-            $response->addJSON('message', $editor);
-            $response->addJSON('title', $title);
-        } else {
-            echo "\n\n<h2>$title</h2>\n\n$editor";
-            unset($_POST);
-        }
-        exit;
-    } else {
-        $message  = __('Error in processing request:') . ' ';
-        $message .= sprintf(
-            PMA_RTE_getWord('not_found'),
-            htmlspecialchars(PMA\libraries\Util::backquote($_REQUEST['item_name'])),
-            htmlspecialchars(PMA\libraries\Util::backquote($db))
-        );
-        $message = Message::error($message);
-        if ($GLOBALS['is_ajax_request']) {
-            $response = PMA\libraries\Response::getInstance();
-            $response->setRequestStatus(false);
-            $response->addJSON('message', $message);
-            exit;
-        } else {
-            $message->display();
-        }
-    }
-}
diff --git a/#pma/libraries/rte/rte_list.lib.php b/#pma/libraries/rte/rte_list.lib.php
deleted file mode 100644
index 83d546e7..00000000
--- a/#pma/libraries/rte/rte_list.lib.php
+++ /dev/null
@@ -1,473 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Common functions for generating lists of Routines, Triggers and Events.
- *
- * @package PhpMyAdmin
- */
-use SqlParser\Statements\CreateStatement;
-
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
-/**
- * Creates a list of items containing the relevant
- * information and some action links.
- *
- * @param string $type  One of ['routine'|'trigger'|'event']
- * @param array  $items An array of items
- *
- * @return string HTML code of the list of items
- */
-function PMA_RTE_getList($type, $items)
-{
-    global $table;
-
-    /**
-     * Conditional classes switch the list on or off
-     */
-    $class1 = 'hide';
-    $class2 = '';
-    if (! $items) {
-        $class1 = '';
-        $class2 = ' hide';
-    }
-    /**
-     * Generate output
-     */
-    $retval  = "<!-- LIST OF " . PMA_RTE_getWord('docu') . " START -->\n";
-    $retval .= '<form id="rteListForm" class="ajax" action="';
-    switch ($type) {
-    case 'routine':
-        $retval .= 'db_routines.php';
-        break;
-    case 'trigger':
-        if (! empty($table)) {
-            $retval .= 'tbl_triggers.php';
-        } else {
-            $retval .= 'db_triggers.php';
-        }
-        break;
-    case 'event':
-        $retval .= 'db_events.php';
-        break;
-    default:
-        break;
-    }
-    $retval .= '">';
-    $retval .= PMA_URL_getHiddenInputs($GLOBALS['db'], $GLOBALS['table']);
-    $retval .= "<fieldset>\n";
-    $retval .= "    <legend>\n";
-    $retval .= "        " . PMA_RTE_getWord('title') . "\n";
-    $retval .= "        "
-        . PMA\libraries\Util::showMySQLDocu(PMA_RTE_getWord('docu')) . "\n";
-    $retval .= "    </legend>\n";
-    $retval .= "    <div class='$class1' id='nothing2display'>\n";
-    $retval .= "      " . PMA_RTE_getWord('nothing') . "\n";
-    $retval .= "    </div>\n";
-    $retval .= "    <table class='data$class2'>\n";
-    $retval .= "        <!-- TABLE HEADERS -->\n";
-    $retval .= "        <tr>\n";
-    // th cells with a colspan need corresponding td cells, according to W3C
-    switch ($type) {
-    case 'routine':
-        $retval .= "            <th></th>\n";
-        $retval .= "            <th>" . __('Name') . "</th>\n";
-        $retval .= "            <th colspan='4'>" . __('Action') . "</th>\n";
-        $retval .= "            <th>" . __('Type') . "</th>\n";
-        $retval .= "            <th>" . __('Returns') . "</th>\n";
-        $retval .= "        </tr>\n";
-        $retval .= "        <tr style='display: none'>\n"; // see comment above
-        for ($i = 0; $i < 7; $i++) {
-            $retval .= "            <td></td>\n";
-        }
-        break;
-    case 'trigger':
-        $retval .= "            <th></th>\n";
-        $retval .= "            <th>" . __('Name') . "</th>\n";
-        if (empty($table)) {
-            $retval .= "            <th>" . __('Table') . "</th>\n";
-        }
-        $retval .= "            <th colspan='3'>" . __('Action') . "</th>\n";
-        $retval .= "            <th>" . __('Time') . "</th>\n";
-        $retval .= "            <th>" . __('Event') . "</th>\n";
-        $retval .= "        </tr>\n";
-        $retval .= "        <tr style='display: none'>\n"; // see comment above
-        for ($i = 0; $i < (empty($table) ? 7 : 6); $i++) {
-            $retval .= "            <td></td>\n";
-        }
-        break;
-    case 'event':
-        $retval .= "            <th></th>\n";
-        $retval .= "            <th>" . __('Name') . "</th>\n";
-        $retval .= "            <th>" . __('Status') . "</th>\n";
-        $retval .= "            <th colspan='3'>" . __('Action') . "</th>\n";
-        $retval .= "            <th>" . __('Type') . "</th>\n";
-        $retval .= "        </tr>\n";
-        $retval .= "        <tr style='display: none'>\n"; // see comment above
-        for ($i = 0; $i < 6; $i++) {
-            $retval .= "            <td></td>\n";
-        }
-        break;
-    default:
-        break;
-    }
-    $retval .= "        </tr>\n";
-    $retval .= "        <!-- TABLE DATA -->\n";
-    $count = 0;
-    foreach ($items as $item) {
-        $rowclass = ($count % 2 == 0) ? 'odd' : 'even';
-        if ($GLOBALS['is_ajax_request'] && empty($_REQUEST['ajax_page_request'])) {
-            $rowclass .= ' ajaxInsert hide';
-        }
-        // Get each row from the correct function
-        switch ($type) {
-        case 'routine':
-            $retval .= PMA_RTN_getRowForList($item, $rowclass);
-            break;
-        case 'trigger':
-            $retval .= PMA_TRI_getRowForList($item, $rowclass);
-            break;
-        case 'event':
-            $retval .= PMA_EVN_getRowForList($item, $rowclass);
-            break;
-        default:
-            break;
-        }
-        $count++;
-    }
-    $retval .= "    </table>\n";
-
-    if (count($items)) {
-        $retval .= '<div class="withSelected">';
-        $retval .= PMA\libraries\Util::getWithSelected(
-            $GLOBALS['pmaThemeImage'], $GLOBALS['text_dir'], 'rteListForm'
-        );
-        $retval .= PMA\libraries\Util::getButtonOrImage(
-            'submit_mult', 'mult_submit', 'submit_mult_export',
-            __('Export'), 'b_export.png', 'export'
-        );
-        $retval .= PMA\libraries\Util::getButtonOrImage(
-            'submit_mult', 'mult_submit', 'submit_mult_drop',
-            __('Drop'), 'b_drop.png', 'drop'
-        );
-        $retval .= '</div>';
-    }
-
-    $retval .= "</fieldset>\n";
-    $retval .= "</form>\n";
-    $retval .= "<!-- LIST OF " . PMA_RTE_getWord('docu') . " END -->\n";
-
-    return $retval;
-} // end PMA_RTE_getList()
-
-/**
- * Creates the contents for a row in the list of routines
- *
- * @param array  $routine  An array of routine data
- * @param string $rowclass Empty or one of ['even'|'odd']
- *
- * @return string HTML code of a row for the list of routines
- */
-function PMA_RTN_getRowForList($routine, $rowclass = '')
-{
-    global $ajax_class, $url_query, $db, $titles;
-
-    $sql_drop = sprintf(
-        'DROP %s IF EXISTS %s',
-        $routine['type'],
-        PMA\libraries\Util::backquote($routine['name'])
-    );
-    $type_link = "item_type={$routine['type']}";
-
-    $retval  = "        <tr class='$rowclass'>\n";
-    $retval .= "            <td>\n";
-    $retval .= '                <input type="checkbox"'
-        . ' class="checkall" name="item_name[]"'
-        . ' value="' . htmlspecialchars($routine['name']) . '" />';
-    $retval .= "            </td>\n";
-    $retval .= "            <td>\n";
-    $retval .= "                <span class='drop_sql hide'>"
-        . htmlspecialchars($sql_drop) . "</span>\n";
-    $retval .= "                <strong>\n";
-    $retval .= "                    "
-        . htmlspecialchars($routine['name']) . "\n";
-    $retval .= "                </strong>\n";
-    $retval .= "            </td>\n";
-    $retval .= "            <td>\n";
-
-    // this is for our purpose to decide whether to
-    // show the edit link or not, so we need the DEFINER for the routine
-    $where = "ROUTINE_SCHEMA " . PMA\libraries\Util::getCollateForIS() . "="
-        . "'" . $GLOBALS['dbi']->escapeString($db) . "' "
-        . "AND SPECIFIC_NAME='" . $GLOBALS['dbi']->escapeString($routine['name']) . "'"
-        . "AND ROUTINE_TYPE='" . $GLOBALS['dbi']->escapeString($routine['type']) . "'";
-    $query = "SELECT `DEFINER` FROM INFORMATION_SCHEMA.ROUTINES WHERE $where;";
-    $routine_definer = $GLOBALS['dbi']->fetchValue($query, 0, 0, $GLOBALS['controllink']);
-
-    $curr_user = $GLOBALS['dbi']->getCurrentUser();
-
-    // Since editing a procedure involved dropping and recreating, check also for
-    // CREATE ROUTINE privilege to avoid lost procedures.
-    if ((PMA\libraries\Util::currentUserHasPrivilege('CREATE ROUTINE', $db)
-        && $curr_user == $routine_definer)
-        || $GLOBALS['is_superuser']
-    ) {
-        $retval .= '                <a ' . $ajax_class['edit']
-                                         . ' href="db_routines.php'
-                                         . $url_query
-                                         . '&amp;edit_item=1'
-                                         . '&amp;item_name='
-                                         . urlencode($routine['name'])
-                                         . '&amp;' . $type_link
-                                         . '">' . $titles['Edit'] . "</a>\n";
-    } else {
-        $retval .= "                {$titles['NoEdit']}\n";
-    }
-    $retval .= "            </td>\n";
-    $retval .= "            <td>\n";
-
-    // There is a problem with PMA\libraries\Util::currentUserHasPrivilege():
-    // it does not detect all kinds of privileges, for example
-    // a direct privilege on a specific routine. So, at this point,
-    // we show the Execute link, hoping that the user has the correct rights.
-    // Also, information_schema might be hiding the ROUTINE_DEFINITION
-    // but a routine with no input parameters can be nonetheless executed.
-
-    // Check if the routine has any input parameters. If it does,
-    // we will show a dialog to get values for these parameters,
-    // otherwise we can execute it directly.
-
-    $definition = $GLOBALS['dbi']->getDefinition(
-        $db, $routine['type'], $routine['name'], $GLOBALS['controllink']
-    );
-    if ($definition !== false) {
-        $parser = new SqlParser\Parser($definition);
-
-        /**
-         * @var CreateStatement $stmt
-         */
-        $stmt = $parser->statements[0];
-
-        $params = SqlParser\Utils\Routine::getParameters($stmt);
-
-        if (PMA\libraries\Util::currentUserHasPrivilege('EXECUTE', $db)) {
-            $execute_action = 'execute_routine';
-            for ($i = 0; $i < $params['num']; $i++) {
-                if ($routine['type'] == 'PROCEDURE'
-                    && $params['dir'][$i] == 'OUT'
-                ) {
-                    continue;
-                }
-                $execute_action = 'execute_dialog';
-                break;
-            }
-            $retval .= '                <a ' . $ajax_class['exec']
-                                             . ' href="db_routines.php'
-                                             . $url_query
-                                             . '&amp;' . $execute_action . '=1'
-                                             . '&amp;item_name='
-                                             . urlencode($routine['name'])
-                                             . '&amp;' . $type_link
-                                             . '">' . $titles['Execute'] . "</a>\n";
-        } else {
-            $retval .= "                {$titles['NoExecute']}\n";
-        }
-    }
-
-    $retval .= "            </td>\n";
-    $retval .= "            <td>\n";
-    if ((PMA\libraries\Util::currentUserHasPrivilege('CREATE ROUTINE', $db)
-        && $curr_user == $routine_definer)
-        || $GLOBALS['is_superuser']
-    ) {
-        $retval .= '                <a ' . $ajax_class['export']
-                                         . ' href="db_routines.php'
-                                         . $url_query
-                                         . '&amp;export_item=1'
-                                         . '&amp;item_name='
-                                         . urlencode($routine['name'])
-                                         . '&amp;' . $type_link
-                                         . '">' . $titles['Export'] . "</a>\n";
-    } else {
-        $retval .= "                {$titles['NoExport']}\n";
-    }
-    $retval .= "            </td>\n";
-    $retval .= "            <td>\n";
-    $retval .= '                <a ' . $ajax_class['drop']
-                                         . ' href="sql.php'
-                                         . $url_query
-                                         . '&amp;sql_query=' . urlencode($sql_drop)
-                                         . '&amp;goto=db_routines.php'
-                                         . urlencode("?db={$db}")
-                                         . '" >' . $titles['Drop'] . "</a>\n";
-    $retval .= "            </td>\n";
-    $retval .= "            <td>\n";
-    $retval .= "                 {$routine['type']}\n";
-    $retval .= "            </td>\n";
-    $retval .= "            <td dir=\"ltr\">\n";
-    $retval .= "                "
-        . htmlspecialchars($routine['returns']) . "\n";
-    $retval .= "            </td>\n";
-    $retval .= "        </tr>\n";
-
-    return $retval;
-} // end PMA_RTN_getRowForList()
-
-/**
- * Creates the contents for a row in the list of triggers
- *
- * @param array  $trigger  An array of routine data
- * @param string $rowclass Empty or one of ['even'|'odd']
- *
- * @return string HTML code of a cell for the list of triggers
- */
-function PMA_TRI_getRowForList($trigger, $rowclass = '')
-{
-    global $ajax_class, $url_query, $db, $table, $titles;
-
-    $retval  = "        <tr class='$rowclass'>\n";
-    $retval .= "            <td>\n";
-    $retval .= '                <input type="checkbox"'
-        . ' class="checkall" name="item_name[]"'
-        . ' value="' . htmlspecialchars($trigger['name']) . '" />';
-    $retval .= "            </td>\n";
-    $retval .= "            <td>\n";
-    $retval .= "                <span class='drop_sql hide'>"
-        . htmlspecialchars($trigger['drop']) . "</span>\n";
-    $retval .= "                <strong>\n";
-    $retval .= "                    " . htmlspecialchars($trigger['name']) . "\n";
-    $retval .= "                </strong>\n";
-    $retval .= "            </td>\n";
-    if (empty($table)) {
-        $retval .= "            <td>\n";
-        $retval .= "<a href='db_triggers.php{$url_query}"
-            . "&amp;table=" . urlencode($trigger['table']) . "'>"
-            . urlencode($trigger['table']) . "</a>";
-        $retval .= "            </td>\n";
-    }
-    $retval .= "            <td>\n";
-    if (PMA\libraries\Util::currentUserHasPrivilege('TRIGGER', $db, $table)) {
-        $retval .= '                <a ' . $ajax_class['edit']
-                                         . ' href="db_triggers.php'
-                                         . $url_query
-                                         . '&amp;edit_item=1'
-                                         . '&amp;item_name='
-                                         . urlencode($trigger['name'])
-                                         . '">' . $titles['Edit'] . "</a>\n";
-    } else {
-        $retval .= "                {$titles['NoEdit']}\n";
-    }
-    $retval .= "            </td>\n";
-    $retval .= "            <td>\n";
-    $retval .= '                    <a ' . $ajax_class['export']
-                                         . ' href="db_triggers.php'
-                                         . $url_query
-                                         . '&amp;export_item=1'
-                                         . '&amp;item_name='
-                                         . urlencode($trigger['name'])
-                                         . '">' . $titles['Export'] . "</a>\n";
-    $retval .= "            </td>\n";
-    $retval .= "            <td>\n";
-    if (PMA\libraries\Util::currentUserHasPrivilege('TRIGGER', $db)) {
-        $retval .= '                <a ' . $ajax_class['drop']
-                                         . ' href="sql.php'
-                                         . $url_query
-                                         . '&amp;sql_query='
-                                         . urlencode($trigger['drop'])
-                                         . '&amp;goto=db_triggers.php'
-                                         . urlencode("?db={$db}")
-                                         . '" >' . $titles['Drop'] . "</a>\n";
-    } else {
-        $retval .= "                {$titles['NoDrop']}\n";
-    }
-    $retval .= "            </td>\n";
-    $retval .= "            <td>\n";
-    $retval .= "                 {$trigger['action_timing']}\n";
-    $retval .= "            </td>\n";
-    $retval .= "            <td>\n";
-    $retval .= "                 {$trigger['event_manipulation']}\n";
-    $retval .= "            </td>\n";
-    $retval .= "        </tr>\n";
-
-    return $retval;
-} // end PMA_TRI_getRowForList()
-
-/**
- * Creates the contents for a row in the list of events
- *
- * @param array  $event    An array of routine data
- * @param string $rowclass Empty or one of ['even'|'odd']
- *
- * @return string HTML code of a cell for the list of events
- */
-function PMA_EVN_getRowForList($event, $rowclass = '')
-{
-    global $ajax_class, $url_query, $db, $titles;
-
-    $sql_drop = sprintf(
-        'DROP EVENT IF EXISTS %s',
-        PMA\libraries\Util::backquote($event['name'])
-    );
-
-    $retval  = "        <tr class='$rowclass'>\n";
-    $retval .= "            <td>\n";
-    $retval .= '                <input type="checkbox"'
-        . ' class="checkall" name="item_name[]"'
-        . ' value="' . htmlspecialchars($event['name']) . '" />';
-    $retval .= "            </td>\n";
-    $retval .= "            <td>\n";
-    $retval .= "                <span class='drop_sql hide'>"
-        . htmlspecialchars($sql_drop) . "</span>\n";
-    $retval .= "                <strong>\n";
-    $retval .= "                    "
-        . htmlspecialchars($event['name']) . "\n";
-    $retval .= "                </strong>\n";
-    $retval .= "            </td>\n";
-    $retval .= "            <td>\n";
-    $retval .= "                 {$event['status']}\n";
-    $retval .= "            </td>\n";
-    $retval .= "            <td>\n";
-    if (PMA\libraries\Util::currentUserHasPrivilege('EVENT', $db)) {
-        $retval .= '                <a ' . $ajax_class['edit']
-                                         . ' href="db_events.php'
-                                         . $url_query
-                                         . '&amp;edit_item=1'
-                                         . '&amp;item_name='
-                                         . urlencode($event['name'])
-                                         . '">' . $titles['Edit'] . "</a>\n";
-    } else {
-        $retval .= "                {$titles['NoEdit']}\n";
-    }
-    $retval .= "            </td>\n";
-    $retval .= "            <td>\n";
-    $retval .= '                <a ' . $ajax_class['export']
-                                     . ' href="db_events.php'
-                                     . $url_query
-                                     . '&amp;export_item=1'
-                                     . '&amp;item_name='
-                                     . urlencode($event['name'])
-                                     . '">' . $titles['Export'] . "</a>\n";
-    $retval .= "            </td>\n";
-    $retval .= "            <td>\n";
-    if (PMA\libraries\Util::currentUserHasPrivilege('EVENT', $db)) {
-        $retval .= '                <a ' . $ajax_class['drop']
-                                         . ' href="sql.php'
-                                         . $url_query
-                                         . '&amp;sql_query=' . urlencode($sql_drop)
-                                         . '&amp;goto=db_events.php'
-                                         . urlencode("?db={$db}")
-                                         . '" >' . $titles['Drop'] . "</a>\n";
-    } else {
-        $retval .= "                {$titles['NoDrop']}\n";
-    }
-    $retval .= "            </td>\n";
-    $retval .= "            <td>\n";
-    $retval .= "                 {$event['type']}\n";
-    $retval .= "            </td>\n";
-    $retval .= "        </tr>\n";
-
-    return $retval;
-} // end PMA_EVN_getRowForList()
-
diff --git a/#pma/libraries/rte/rte_main.inc.php b/#pma/libraries/rte/rte_main.inc.php
deleted file mode 100644
index 5c45255c..00000000
--- a/#pma/libraries/rte/rte_main.inc.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Common code for Routines, Triggers and Events.
- *
- * @package PhpMyAdmin
- */
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
-/**
- * Include all other files that are common
- * to routines, triggers and events.
- */
-require_once './libraries/rte/rte_general.lib.php';
-require_once './libraries/rte/rte_words.lib.php';
-require_once './libraries/rte/rte_export.lib.php';
-require_once './libraries/rte/rte_list.lib.php';
-require_once './libraries/rte/rte_footer.lib.php';
-
-if ($GLOBALS['is_ajax_request'] != true) {
-    /**
-     * Displays the header and tabs
-     */
-    if (! empty($table) && in_array($table, $GLOBALS['dbi']->getTables($db))) {
-        include_once './libraries/tbl_common.inc.php';
-    } else {
-        $table = '';
-        include_once './libraries/db_common.inc.php';
-
-        list(
-            $tables,
-            $num_tables,
-            $total_num_tables,
-            $sub_part,
-            $is_show_stats,
-            $db_is_system_schema,
-            $tooltip_truename,
-            $tooltip_aliasname,
-            $pos
-        ) = PMA\libraries\Util::getDbInfo($db, isset($sub_part) ? $sub_part : '');
-    }
-} else {
-    /**
-     * Since we did not include some libraries, we need
-     * to manually select the required database and
-     * create the missing $url_query variable
-     */
-    if (mb_strlen($db)) {
-        $GLOBALS['dbi']->selectDb($db);
-        if (! isset($url_query)) {
-            $url_query = PMA_URL_getCommon(
-                array(
-                    'db' => $db, 'table' => $table
-                )
-            );
-        }
-    }
-}
-
-/**
- * Generate the conditional classes that will
- * be used to attach jQuery events to links
- */
-$ajax_class = array(
-    'add'    => 'class="ajax add_anchor"',
-    'edit'   => 'class="ajax edit_anchor"',
-    'exec'   => 'class="ajax exec_anchor"',
-    'drop'   => 'class="ajax drop_anchor"',
-    'export' => 'class="ajax export_anchor"'
-);
-
-/**
- * Create labels for the list
- */
-$titles = PMA\libraries\Util::buildActionTitles();
-
-/**
- * Keep a list of errors that occurred while
- * processing an 'Add' or 'Edit' operation.
- */
-$errors = array();
-
-
-/**
- * Call the appropriate main function
- */
-switch ($_PMA_RTE) {
-case 'RTN':
-    $type = null;
-    if (isset($_REQUEST['type'])) {
-        $type = $_REQUEST['type'];
-    }
-    PMA_RTN_main($type);
-    break;
-case 'TRI':
-    PMA_TRI_main();
-    break;
-case 'EVN':
-    PMA_EVN_main();
-    break;
-}
-
diff --git a/#pma/libraries/rte/rte_routines.lib.php b/#pma/libraries/rte/rte_routines.lib.php
deleted file mode 100644
index c1e69854..00000000
--- a/#pma/libraries/rte/rte_routines.lib.php
+++ /dev/null
@@ -1,1711 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Functions for routine management.
- *
- * @package PhpMyAdmin
- */
-use PMA\libraries\Message;
-use PMA\libraries\Response;
-use PMA\libraries\Util;
-use SqlParser\Statements\CreateStatement;
-
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
-/**
- * Sets required globals
- *
- * @return void
- */
-function PMA_RTN_setGlobals()
-{
-    global $param_directions, $param_opts_num, $param_sqldataaccess;
-
-    $param_directions    = array('IN',
-                                 'OUT',
-                                 'INOUT');
-    $param_opts_num      = array('UNSIGNED',
-                                 'ZEROFILL',
-                                 'UNSIGNED ZEROFILL');
-    $param_sqldataaccess = array('NO SQL',
-                                 'CONTAINS SQL',
-                                 'READS SQL DATA',
-                                 'MODIFIES SQL DATA');
-}
-
-/**
- * Main function for the routines functionality
- *
- * @param string $type 'FUNCTION' for functions,
- *                     'PROCEDURE' for procedures,
- *                     null for both
- *
- * @return void
- */
-function PMA_RTN_main($type)
-{
-    global $db;
-
-    PMA_RTN_setGlobals();
-    /**
-     * Process all requests
-     */
-    PMA_RTN_handleEditor();
-    PMA_RTN_handleExecute();
-    PMA_RTN_handleExport();
-    /**
-     * Display a list of available routines
-     */
-    if (! PMA_isValid($type, array('FUNCTION','PROCEDURE'))) {
-        $type = null;
-    }
-    $items = $GLOBALS['dbi']->getRoutines($db, $type);
-    echo PMA_RTE_getList('routine', $items);
-    /**
-     * Display the form for adding a new routine, if the user has the privileges.
-     */
-    echo PMA_RTN_getFooterLinks();
-    /**
-     * Display a warning for users with PHP's old "mysql" extension.
-     */
-    if (! PMA\libraries\DatabaseInterface::checkDbExtension('mysqli')) {
-        trigger_error(
-            __(
-                'You are using PHP\'s deprecated \'mysql\' extension, '
-                . 'which is not capable of handling multi queries. '
-                . '[strong]The execution of some stored routines may fail![/strong] '
-                . 'Please use the improved \'mysqli\' extension to '
-                . 'avoid any problems.'
-            ),
-            E_USER_WARNING
-        );
-    }
-} // end PMA_RTN_main()
-
-/**
- * Handles editor requests for adding or editing an item
- *
- * @return void
- */
-function PMA_RTN_handleEditor()
-{
-    global $_GET, $_POST, $_REQUEST, $GLOBALS, $db, $errors;
-
-    $errors = PMA_RTN_handleRequestCreateOrEdit($errors, $db);
-
-    /**
-     * Display a form used to add/edit a routine, if necessary
-     */
-    // FIXME: this must be simpler than that
-    if (count($errors)
-        || ( empty($_REQUEST['editor_process_add'])
-        && empty($_REQUEST['editor_process_edit'])
-        && (! empty($_REQUEST['add_item']) || ! empty($_REQUEST['edit_item'])
-        || ! empty($_REQUEST['routine_addparameter'])
-        || ! empty($_REQUEST['routine_removeparameter'])
-        || ! empty($_REQUEST['routine_changetype'])))
-    ) {
-        // Handle requests to add/remove parameters and changing routine type
-        // This is necessary when JS is disabled
-        $operation = '';
-        if (! empty($_REQUEST['routine_addparameter'])) {
-            $operation = 'add';
-        } else if (! empty($_REQUEST['routine_removeparameter'])) {
-            $operation = 'remove';
-        } else if (! empty($_REQUEST['routine_changetype'])) {
-            $operation = 'change';
-        }
-        // Get the data for the form (if any)
-        if (! empty($_REQUEST['add_item'])) {
-            $title = PMA_RTE_getWord('add');
-            $routine = PMA_RTN_getDataFromRequest();
-            $mode = 'add';
-        } else if (! empty($_REQUEST['edit_item'])) {
-            $title = __("Edit routine");
-            if (! $operation && ! empty($_REQUEST['item_name'])
-                && empty($_REQUEST['editor_process_edit'])
-            ) {
-                $routine = PMA_RTN_getDataFromName(
-                    $_REQUEST['item_name'], $_REQUEST['item_type']
-                );
-                if ($routine !== false) {
-                    $routine['item_original_name'] = $routine['item_name'];
-                    $routine['item_original_type'] = $routine['item_type'];
-                }
-            } else {
-                $routine = PMA_RTN_getDataFromRequest();
-            }
-            $mode = 'edit';
-        }
-        if ($routine !== false) {
-            // Show form
-            $editor = PMA_RTN_getEditorForm($mode, $operation, $routine);
-            if ($GLOBALS['is_ajax_request']) {
-                $response = PMA\libraries\Response::getInstance();
-                $response->addJSON('message', $editor);
-                $response->addJSON('title', $title);
-                $response->addJSON('param_template', PMA_RTN_getParameterRow());
-                $response->addJSON('type', $routine['item_type']);
-            } else {
-                echo "\n\n<h2>$title</h2>\n\n$editor";
-            }
-            exit;
-        } else {
-            $message  = __('Error in processing request:') . ' ';
-            $message .= sprintf(
-                PMA_RTE_getWord('no_edit'),
-                htmlspecialchars(
-                    PMA\libraries\Util::backquote($_REQUEST['item_name'])
-                ),
-                htmlspecialchars(PMA\libraries\Util::backquote($db))
-            );
-
-            $message = Message::error($message);
-            if ($GLOBALS['is_ajax_request']) {
-                $response = PMA\libraries\Response::getInstance();
-                $response->setRequestStatus(false);
-                $response->addJSON('message', $message);
-                exit;
-            } else {
-                $message->display();
-            }
-        }
-    }
-}
-
-/**
- * Handle request to create or edit a routine
- *
- * @param array  $errors Errors
- * @param string $db     DB name
- *
- * @return array
- */
-function PMA_RTN_handleRequestCreateOrEdit($errors, $db)
-{
-    if (empty($_REQUEST['editor_process_add'])
-        && empty($_REQUEST['editor_process_edit'])
-    ) {
-        return $errors;
-    }
-
-    $sql_query = '';
-    $routine_query = PMA_RTN_getQueryFromRequest();
-    if (!count($errors)) { // set by PMA_RTN_getQueryFromRequest()
-        // Execute the created query
-        if (!empty($_REQUEST['editor_process_edit'])) {
-            $isProcOrFunc = in_array(
-                $_REQUEST['item_original_type'],
-                array('PROCEDURE', 'FUNCTION')
-            );
-
-            if (!$isProcOrFunc) {
-                $errors[] = sprintf(
-                    __('Invalid routine type: "%s"'),
-                    htmlspecialchars($_REQUEST['item_original_type'])
-                );
-            } else {
-                // Backup the old routine, in case something goes wrong
-                $create_routine = $GLOBALS['dbi']->getDefinition(
-                    $db,
-                    $_REQUEST['item_original_type'],
-                    $_REQUEST['item_original_name']
-                );
-
-                $privilegesBackup = PMA_RTN_backupPrivileges();
-
-                $drop_routine = "DROP {$_REQUEST['item_original_type']} "
-                    . PMA\libraries\Util::backquote($_REQUEST['item_original_name'])
-                    . ";\n";
-                $result = $GLOBALS['dbi']->tryQuery($drop_routine);
-                if (!$result) {
-                    $errors[] = sprintf(
-                        __('The following query has failed: "%s"'),
-                        htmlspecialchars($drop_routine)
-                    )
-                    . '<br />'
-                    . __('MySQL said: ') . $GLOBALS['dbi']->getError(null);
-                } else {
-                    list($newErrors, $message) = PMA_RTN_createRoutine(
-                        $routine_query,
-                        $create_routine,
-                        $privilegesBackup
-                    );
-                    if (empty($newErrors)) {
-                        $sql_query = $drop_routine . $routine_query;
-                    } else {
-                        $errors = array_merge($errors, $newErrors);
-                    }
-                    unset($newErrors);
-                    if (null === $message) {
-                        unset($message);
-                    }
-                }
-            }
-        } else {
-            // 'Add a new routine' mode
-            $result = $GLOBALS['dbi']->tryQuery($routine_query);
-            if (!$result) {
-                $errors[] = sprintf(
-                    __('The following query has failed: "%s"'),
-                    htmlspecialchars($routine_query)
-                )
-                . '<br /><br />'
-                . __('MySQL said: ') . $GLOBALS['dbi']->getError(null);
-            } else {
-                $message = PMA\libraries\Message::success(
-                    __('Routine %1$s has been created.')
-                );
-                $message->addParam(
-                    PMA\libraries\Util::backquote($_REQUEST['item_name'])
-                );
-                $sql_query = $routine_query;
-            }
-        }
-    }
-
-    if (count($errors)) {
-        $message = PMA\libraries\Message::error(
-            __(
-                'One or more errors have occurred while'
-                . ' processing your request:'
-            )
-        );
-        $message->addString('<ul>');
-        foreach ($errors as $string) {
-            $message->addString('<li>' . $string . '</li>');
-        }
-        $message->addString('</ul>');
-    }
-
-    $output = PMA\libraries\Util::getMessage($message, $sql_query);
-    if (!$GLOBALS['is_ajax_request']) {
-        return $errors;
-    }
-
-    $response = PMA\libraries\Response::getInstance();
-    if (!$message->isSuccess()) {
-        $response->setRequestStatus(false);
-        $response->addJSON('message', $output);
-        exit;
-    }
-
-    $routines = $GLOBALS['dbi']->getRoutines(
-        $db,
-        $_REQUEST['item_type'],
-        $_REQUEST['item_name']
-    );
-    $routine = $routines[0];
-    $response->addJSON(
-        'name',
-        htmlspecialchars(
-            mb_strtoupper($_REQUEST['item_name'])
-        )
-    );
-    $response->addJSON('new_row', PMA_RTN_getRowForList($routine));
-    $response->addJSON('insert', !empty($routine));
-    $response->addJSON('message', $output);
-    exit;
-}
-
-/**
- * Backup the privileges
- *
- * @return array
- */
-function PMA_RTN_backupPrivileges()
-{
-    if (! $GLOBALS['proc_priv'] || ! $GLOBALS['is_reload_priv']) {
-        return array();
-    }
-
-    // Backup the Old Privileges before dropping
-    // if $_REQUEST['item_adjust_privileges'] set
-    if (! isset($_REQUEST['item_adjust_privileges'])
-        || empty($_REQUEST['item_adjust_privileges'])
-    ) {
-        return array();
-    }
-
-    $privilegesBackupQuery = 'SELECT * FROM ' . PMA\libraries\Util::backquote(
-        'mysql'
-    )
-    . '.' . PMA\libraries\Util::backquote('procs_priv')
-    . ' where Routine_name = "' . $_REQUEST['item_original_name']
-    . '" AND Routine_type = "' . $_REQUEST['item_original_type']
-    . '";';
-
-    $privilegesBackup = $GLOBALS['dbi']->fetchResult(
-        $privilegesBackupQuery,
-        0
-    );
-
-    return $privilegesBackup;
-}
-
-/**
- * Create the routine
- *
- * @param string $routine_query    Query to create routine
- * @param string $create_routine   Query to restore routine
- * @param array  $privilegesBackup Privileges backup
- *
- * @return array
- */
-function PMA_RTN_createRoutine(
-    $routine_query,
-    $create_routine,
-    $privilegesBackup
-) {
-    $result = $GLOBALS['dbi']->tryQuery($routine_query);
-    if (!$result) {
-        $errors = array();
-        $errors[] = sprintf(
-            __('The following query has failed: "%s"'),
-            htmlspecialchars($routine_query)
-        )
-        . '<br />'
-        . __('MySQL said: ') . $GLOBALS['dbi']->getError(null);
-        // We dropped the old routine,
-        // but were unable to create the new one
-        // Try to restore the backup query
-        $result = $GLOBALS['dbi']->tryQuery($create_routine);
-        $errors = checkResult(
-            $result,
-            __(
-                'Sorry, we failed to restore'
-                . ' the dropped routine.'
-            ),
-            $create_routine,
-            $errors
-        );
-
-        return array($errors, null);
-    }
-
-    // Default value
-    $resultAdjust = false;
-
-    if ($GLOBALS['proc_priv']
-        && $GLOBALS['is_reload_priv']
-    ) {
-        // Insert all the previous privileges
-        // but with the new name and the new type
-        foreach ($privilegesBackup as $priv) {
-            $adjustProcPrivilege = 'INSERT INTO '
-                . Util::backquote('mysql') . '.'
-                . Util::backquote('procs_priv')
-                . ' VALUES("' . $priv[0] . '", "'
-                . $priv[1] . '", "' . $priv[2] . '", "'
-                . $_REQUEST['item_name'] . '", "'
-                . $_REQUEST['item_type'] . '", "'
-                . $priv[5] . '", "'
-                . $priv[6] . '", "'
-                . $priv[7] . '");';
-            $resultAdjust = $GLOBALS['dbi']->query(
-                $adjustProcPrivilege
-            );
-        }
-    }
-
-    $message = PMA_RTN_flushPrivileges($resultAdjust);
-
-    return array(array(), $message);
-}
-
-/**
- * Flush privileges and get message
- *
- * @param bool $flushPrivileges Flush privileges
- *
- * @return PMA\libraries\Message
- */
-function PMA_RTN_flushPrivileges($flushPrivileges)
-{
-    if ($flushPrivileges) {
-        // Flush the Privileges
-        $flushPrivQuery = 'FLUSH PRIVILEGES;';
-        $GLOBALS['dbi']->query($flushPrivQuery);
-
-        $message = PMA\libraries\Message::success(
-            __(
-                'Routine %1$s has been modified. Privileges have been adjusted.'
-            )
-        );
-    } else {
-        $message = PMA\libraries\Message::success(
-            __('Routine %1$s has been modified.')
-        );
-    }
-    $message->addParam(
-        PMA\libraries\Util::backquote($_REQUEST['item_name'])
-    );
-
-    return $message;
-} // end PMA_RTN_handleEditor()
-
-/**
- * This function will generate the values that are required to
- * complete the editor form. It is especially necessary to handle
- * the 'Add another parameter', 'Remove last parameter' and
- * 'Change routine type' functionalities when JS is disabled.
- *
- * @return array    Data necessary to create the routine editor.
- */
-function PMA_RTN_getDataFromRequest()
-{
-    global $_REQUEST, $param_directions, $param_sqldataaccess;
-
-    $retval = array();
-    $indices = array('item_name',
-                     'item_original_name',
-                     'item_returnlength',
-                     'item_returnopts_num',
-                     'item_returnopts_text',
-                     'item_definition',
-                     'item_comment',
-                     'item_definer');
-    foreach ($indices as $index) {
-        $retval[$index] = isset($_REQUEST[$index]) ? $_REQUEST[$index] : '';
-    }
-
-    $retval['item_type']         = 'PROCEDURE';
-    $retval['item_type_toggle']  = 'FUNCTION';
-    if (isset($_REQUEST['item_type']) && $_REQUEST['item_type'] == 'FUNCTION') {
-        $retval['item_type']         = 'FUNCTION';
-        $retval['item_type_toggle']  = 'PROCEDURE';
-    }
-    $retval['item_original_type'] = 'PROCEDURE';
-    if (isset($_REQUEST['item_original_type'])
-        && $_REQUEST['item_original_type'] == 'FUNCTION'
-    ) {
-        $retval['item_original_type'] = 'FUNCTION';
-    }
-    $retval['item_num_params']      = 0;
-    $retval['item_param_dir']       = array();
-    $retval['item_param_name']      = array();
-    $retval['item_param_type']      = array();
-    $retval['item_param_length']    = array();
-    $retval['item_param_opts_num']  = array();
-    $retval['item_param_opts_text'] = array();
-    if (isset($_REQUEST['item_param_name'])
-        && isset($_REQUEST['item_param_type'])
-        && isset($_REQUEST['item_param_length'])
-        && isset($_REQUEST['item_param_opts_num'])
-        && isset($_REQUEST['item_param_opts_text'])
-        && is_array($_REQUEST['item_param_name'])
-        && is_array($_REQUEST['item_param_type'])
-        && is_array($_REQUEST['item_param_length'])
-        && is_array($_REQUEST['item_param_opts_num'])
-        && is_array($_REQUEST['item_param_opts_text'])
-    ) {
-        if ($_REQUEST['item_type'] == 'PROCEDURE') {
-            $retval['item_param_dir'] = $_REQUEST['item_param_dir'];
-            foreach ($retval['item_param_dir'] as $key => $value) {
-                if (! in_array($value, $param_directions, true)) {
-                    $retval['item_param_dir'][$key] = '';
-                }
-            }
-        }
-        $retval['item_param_name'] = $_REQUEST['item_param_name'];
-        $retval['item_param_type'] = $_REQUEST['item_param_type'];
-        foreach ($retval['item_param_type'] as $key => $value) {
-            if (! in_array($value, PMA\libraries\Util::getSupportedDatatypes(), true)) {
-                $retval['item_param_type'][$key] = '';
-            }
-        }
-        $retval['item_param_length']    = $_REQUEST['item_param_length'];
-        $retval['item_param_opts_num']  = $_REQUEST['item_param_opts_num'];
-        $retval['item_param_opts_text'] = $_REQUEST['item_param_opts_text'];
-        $retval['item_num_params'] = max(
-            count($retval['item_param_name']),
-            count($retval['item_param_type']),
-            count($retval['item_param_length']),
-            count($retval['item_param_opts_num']),
-            count($retval['item_param_opts_text'])
-        );
-    }
-    $retval['item_returntype'] = '';
-    if (isset($_REQUEST['item_returntype'])
-        && in_array($_REQUEST['item_returntype'], PMA\libraries\Util::getSupportedDatatypes())
-    ) {
-        $retval['item_returntype'] = $_REQUEST['item_returntype'];
-    }
-
-    $retval['item_isdeterministic'] = '';
-    if (isset($_REQUEST['item_isdeterministic'])
-        && mb_strtolower($_REQUEST['item_isdeterministic']) == 'on'
-    ) {
-        $retval['item_isdeterministic'] = " checked='checked'";
-    }
-    $retval['item_securitytype_definer'] = '';
-    $retval['item_securitytype_invoker'] = '';
-    if (isset($_REQUEST['item_securitytype'])) {
-        if ($_REQUEST['item_securitytype'] === 'DEFINER') {
-            $retval['item_securitytype_definer'] = " selected='selected'";
-        } else if ($_REQUEST['item_securitytype'] === 'INVOKER') {
-            $retval['item_securitytype_invoker'] = " selected='selected'";
-        }
-    }
-    $retval['item_sqldataaccess'] = '';
-    if (isset($_REQUEST['item_sqldataaccess'])
-        && in_array($_REQUEST['item_sqldataaccess'], $param_sqldataaccess, true)
-    ) {
-        $retval['item_sqldataaccess'] = $_REQUEST['item_sqldataaccess'];
-    }
-
-    return $retval;
-} // end function PMA_RTN_getDataFromRequest()
-
-/**
- * This function will generate the values that are required to complete
- * the "Edit routine" form given the name of a routine.
- *
- * @param string $name    The name of the routine.
- * @param string $type    Type of routine (ROUTINE|PROCEDURE)
- * @param bool   $all     Whether to return all data or just
- *                        the info about parameters.
- * @param bool   $control Where to use Controllink to query for
- *                        routine information
- *
- * @return array    Data necessary to create the routine editor.
- */
-function PMA_RTN_getDataFromName($name, $type, $all = true, $control = false)
-{
-    global $db;
-    $link = null;
-
-    if ($control) {
-        $link = $GLOBALS['controllink'];
-    }
-
-    $retval  = array();
-
-    // Build and execute the query
-    $fields  = "SPECIFIC_NAME, ROUTINE_TYPE, DTD_IDENTIFIER, "
-             . "ROUTINE_DEFINITION, IS_DETERMINISTIC, SQL_DATA_ACCESS, "
-             . "ROUTINE_COMMENT, SECURITY_TYPE";
-    $where   = "ROUTINE_SCHEMA " . PMA\libraries\Util::getCollateForIS() . "="
-             . "'" . $GLOBALS['dbi']->escapeString($db) . "' "
-             . "AND SPECIFIC_NAME='" . $GLOBALS['dbi']->escapeString($name) . "'"
-             . "AND ROUTINE_TYPE='" . $GLOBALS['dbi']->escapeString($type) . "'";
-    $query   = "SELECT $fields FROM INFORMATION_SCHEMA.ROUTINES WHERE $where;";
-
-    $routine = $GLOBALS['dbi']->fetchSingleRow($query, 'ASSOC', $link);
-
-    if (! $routine) {
-        return false;
-    }
-
-    // Get required data
-    $retval['item_name'] = $routine['SPECIFIC_NAME'];
-    $retval['item_type'] = $routine['ROUTINE_TYPE'];
-
-    $definition
-        = $GLOBALS['dbi']->getDefinition(
-            $db,
-            $routine['ROUTINE_TYPE'],
-            $routine['SPECIFIC_NAME'],
-            $link
-        );
-
-    if ($definition == NULL) {
-        return false;
-    }
-
-    $parser = new SqlParser\Parser($definition);
-
-    /**
-     * @var CreateStatement $stmt
-     */
-    $stmt = $parser->statements[0];
-
-    $params = SqlParser\Utils\Routine::getParameters($stmt);
-    $retval['item_num_params']       = $params['num'];
-    $retval['item_param_dir']        = $params['dir'];
-    $retval['item_param_name']       = $params['name'];
-    $retval['item_param_type']       = $params['type'];
-    $retval['item_param_length']     = $params['length'];
-    $retval['item_param_length_arr'] = $params['length_arr'];
-    $retval['item_param_opts_num']   = $params['opts'];
-    $retval['item_param_opts_text']  = $params['opts'];
-
-    // Get extra data
-    if (!$all) {
-        return $retval;
-    }
-
-    if ($retval['item_type'] == 'FUNCTION') {
-        $retval['item_type_toggle'] = 'PROCEDURE';
-    } else {
-        $retval['item_type_toggle'] = 'FUNCTION';
-    }
-    $retval['item_returntype']      = '';
-    $retval['item_returnlength']    = '';
-    $retval['item_returnopts_num']  = '';
-    $retval['item_returnopts_text'] = '';
-
-    if (! empty($routine['DTD_IDENTIFIER'])) {
-        $options = array();
-        foreach ($stmt->return->options->options as $opt) {
-            $options[] = is_string($opt) ? $opt : $opt['value'];
-        }
-
-        $retval['item_returntype']      = $stmt->return->name;
-        $retval['item_returnlength']    = implode(',', $stmt->return->parameters);
-        $retval['item_returnopts_num']  = implode(' ', $options);
-        $retval['item_returnopts_text'] = implode(' ', $options);
-    }
-
-    $retval['item_definer'] = $stmt->options->has('DEFINER');
-    $retval['item_definition'] = $routine['ROUTINE_DEFINITION'];
-    $retval['item_isdeterministic'] = '';
-    if ($routine['IS_DETERMINISTIC'] == 'YES') {
-        $retval['item_isdeterministic'] = " checked='checked'";
-    }
-    $retval['item_securitytype_definer'] = '';
-    $retval['item_securitytype_invoker'] = '';
-    if ($routine['SECURITY_TYPE'] == 'DEFINER') {
-        $retval['item_securitytype_definer'] = " selected='selected'";
-    } else if ($routine['SECURITY_TYPE'] == 'INVOKER') {
-        $retval['item_securitytype_invoker'] = " selected='selected'";
-    }
-    $retval['item_sqldataaccess'] = $routine['SQL_DATA_ACCESS'];
-    $retval['item_comment']       = $routine['ROUTINE_COMMENT'];
-
-    return $retval;
-} // PMA_RTN_getDataFromName()
-
-/**
- * Creates one row for the parameter table used in the routine editor.
- *
- * @param array  $routine Data for the routine returned by
- *                        PMA_RTN_getDataFromRequest() or
- *                        PMA_RTN_getDataFromName()
- * @param mixed  $index   Either a numeric index of the row being processed
- *                        or NULL to create a template row for AJAX request
- * @param string $class   Class used to hide the direction column, if the
- *                        row is for a stored function.
- *
- * @return string    HTML code of one row of parameter table for the editor.
- */
-function PMA_RTN_getParameterRow($routine = array(), $index = null, $class = '')
-{
-    global $param_directions, $param_opts_num, $titles;
-
-    if ($index === null) {
-        // template row for AJAX request
-        $i = 0;
-        $index = '%s';
-        $drop_class = '';
-        $routine = array(
-            'item_param_dir'       => array(0 => ''),
-            'item_param_name'      => array(0 => ''),
-            'item_param_type'      => array(0 => ''),
-            'item_param_length'    => array(0 => ''),
-            'item_param_opts_num'  => array(0 => ''),
-            'item_param_opts_text' => array(0 => '')
-        );
-    } else if (! empty($routine)) {
-        // regular row for routine editor
-        $drop_class = ' hide';
-        $i = $index;
-    } else {
-        // No input data. This shouldn't happen,
-        // but better be safe than sorry.
-        return '';
-    }
-
-    // Create the output
-    $retval  = "";
-    $retval .= "        <tr>\n";
-    $retval .= "            <td class='dragHandle'>"
-        . "<span class='ui-icon ui-icon-arrowthick-2-n-s'></span>"
-        . "</td>\n";
-    $retval .= "            <td class='routine_direction_cell$class'>\n";
-    $retval .= "                <select name='item_param_dir[$index]'>\n";
-    foreach ($param_directions as $key => $value) {
-        $selected = "";
-        if (! empty($routine['item_param_dir'][$i])
-            && $routine['item_param_dir'][$i] == $value
-        ) {
-            $selected = " selected='selected'";
-        }
-        $retval .= "                    <option$selected>$value</option>\n";
-    }
-    $retval .= "                </select>\n";
-    $retval .= "            </td>\n";
-    $retval .= "            <td><input name='item_param_name[$index]' type='text'\n"
-        . " value='{$routine['item_param_name'][$i]}' /></td>\n";
-    $retval .= "            <td><select name='item_param_type[$index]'>";
-    $retval .= PMA\libraries\Util::getSupportedDatatypes(
-        true, $routine['item_param_type'][$i]
-    ) . "\n";
-    $retval .= "            </select></td>\n";
-    $retval .= "            <td>\n";
-    $retval .= "                <input id='item_param_length_$index'\n"
-        . " name='item_param_length[$index]' type='text'\n"
-        . " value='{$routine['item_param_length'][$i]}' />\n";
-    $retval .= "                <div class='enum_hint'>\n";
-    $retval .= "                    <a href='#' class='open_enum_editor'>\n";
-    $retval .= "                        "
-        . PMA\libraries\Util::getImage('b_edit', '', array('title'=>__('ENUM/SET editor')))
-        . "\n";
-    $retval .= "                    </a>\n";
-    $retval .= "                </div>\n";
-    $retval .= "            </td>\n";
-    $retval .= "            <td class='hide no_len'>---</td>\n";
-    $retval .= "            <td class='routine_param_opts_text'>\n";
-    $retval .= PMA_generateCharsetDropdownBox(
-        PMA_CSDROPDOWN_CHARSET,
-        "item_param_opts_text[$index]",
-        null,
-        $routine['item_param_opts_text'][$i]
-    );
-    $retval .= "            </td>\n";
-    $retval .= "            <td class='hide no_opts'>---</td>\n";
-    $retval .= "            <td class='routine_param_opts_num'>\n";
-    $retval .= "                <select name='item_param_opts_num[$index]'>\n";
-    $retval .= "                    <option value=''></option>";
-    foreach ($param_opts_num as $key => $value) {
-        $selected = "";
-        if (! empty($routine['item_param_opts_num'][$i])
-            && $routine['item_param_opts_num'][$i] == $value
-        ) {
-            $selected = " selected='selected'";
-        }
-        $retval .= "<option$selected>$value</option>";
-    }
-    $retval .= "\n                </select>\n";
-    $retval .= "            </td>\n";
-    $retval .= "            <td class='routine_param_remove$drop_class'>\n";
-    $retval .= "                <a href='#' class='routine_param_remove_anchor'>\n";
-    $retval .= "                    {$titles['Drop']}\n";
-    $retval .= "                </a>\n";
-    $retval .= "            </td>\n";
-    $retval .= "        </tr>\n";
-
-    return $retval;
-} // end PMA_RTN_getParameterRow()
-
-/**
- * Displays a form used to add/edit a routine
- *
- * @param string $mode      If the editor will be used to edit a routine
- *                          or add a new one: 'edit' or 'add'.
- * @param string $operation If the editor was previously invoked with
- *                          JS turned off, this will hold the name of
- *                          the current operation
- * @param array  $routine   Data for the routine returned by
- *                          PMA_RTN_getDataFromRequest() or
- *                          PMA_RTN_getDataFromName()
- *
- * @return string   HTML code for the editor.
- */
-function PMA_RTN_getEditorForm($mode, $operation, $routine)
-{
-    global $db, $errors, $param_sqldataaccess, $param_opts_num;
-
-    // Escape special characters
-    $need_escape = array(
-        'item_original_name',
-        'item_name',
-        'item_returnlength',
-        'item_definition',
-        'item_definer',
-        'item_comment'
-    );
-    foreach ($need_escape as $key => $index) {
-        $routine[$index] = htmlentities($routine[$index], ENT_QUOTES, 'UTF-8');
-    }
-    for ($i = 0; $i < $routine['item_num_params']; $i++) {
-        $routine['item_param_name'][$i]   = htmlentities(
-            $routine['item_param_name'][$i],
-            ENT_QUOTES
-        );
-        $routine['item_param_length'][$i] = htmlentities(
-            $routine['item_param_length'][$i],
-            ENT_QUOTES
-        );
-    }
-
-    // Handle some logic first
-    if ($operation == 'change') {
-        if ($routine['item_type'] == 'PROCEDURE') {
-            $routine['item_type']        = 'FUNCTION';
-            $routine['item_type_toggle'] = 'PROCEDURE';
-        } else {
-            $routine['item_type']        = 'PROCEDURE';
-            $routine['item_type_toggle'] = 'FUNCTION';
-        }
-    } else if ($operation == 'add'
-        || ($routine['item_num_params'] == 0 && $mode == 'add' && ! $errors)
-    ) {
-        $routine['item_param_dir'][]       = '';
-        $routine['item_param_name'][]      = '';
-        $routine['item_param_type'][]      = '';
-        $routine['item_param_length'][]    = '';
-        $routine['item_param_opts_num'][]  = '';
-        $routine['item_param_opts_text'][] = '';
-        $routine['item_num_params']++;
-    } else if ($operation == 'remove') {
-        unset($routine['item_param_dir'][$routine['item_num_params'] - 1]);
-        unset($routine['item_param_name'][$routine['item_num_params'] - 1]);
-        unset($routine['item_param_type'][$routine['item_num_params'] - 1]);
-        unset($routine['item_param_length'][$routine['item_num_params'] - 1]);
-        unset($routine['item_param_opts_num'][$routine['item_num_params'] - 1]);
-        unset($routine['item_param_opts_text'][$routine['item_num_params'] - 1]);
-        $routine['item_num_params']--;
-    }
-    $disableRemoveParam = '';
-    if (! $routine['item_num_params']) {
-        $disableRemoveParam = " color: gray;' disabled='disabled";
-    }
-    $original_routine = '';
-    if ($mode == 'edit') {
-        $original_routine = "<input name='item_original_name' "
-                          . "type='hidden' "
-                          . "value='{$routine['item_original_name']}'/>\n"
-                          . "<input name='item_original_type' "
-                          . "type='hidden' "
-                          . "value='{$routine['item_original_type']}'/>\n";
-    }
-    $isfunction_class   = '';
-    $isprocedure_class  = '';
-    $isfunction_select  = '';
-    $isprocedure_select = '';
-    if ($routine['item_type'] == 'PROCEDURE') {
-        $isfunction_class   = ' hide';
-        $isprocedure_select = " selected='selected'";
-    } else {
-        $isprocedure_class = ' hide';
-        $isfunction_select = " selected='selected'";
-    }
-
-    // Create the output
-    $retval  = "";
-    $retval .= "<!-- START " . mb_strtoupper($mode)
-        . " ROUTINE FORM -->\n\n";
-    $retval .= "<form class='rte_form' action='db_routines.php' method='post'>\n";
-    $retval .= "<input name='{$mode}_item' type='hidden' value='1' />\n";
-    $retval .= $original_routine;
-    $retval .= PMA_URL_getHiddenInputs($db) . "\n";
-    $retval .= "<fieldset>\n";
-    $retval .= "<legend>" . __('Details') . "</legend>\n";
-    $retval .= "<table class='rte_table' style='width: 100%'>\n";
-    $retval .= "<tr>\n";
-    $retval .= "    <td style='width: 20%;'>" . __('Routine name') . "</td>\n";
-    $retval .= "    <td><input type='text' name='item_name' maxlength='64'\n";
-    $retval .= "               value='{$routine['item_name']}' /></td>\n";
-    $retval .= "</tr>\n";
-    $retval .= "<tr>\n";
-    $retval .= "    <td>" . __('Type') . "</td>\n";
-    $retval .= "    <td>\n";
-    if ($GLOBALS['is_ajax_request']) {
-        $retval .= "        <select name='item_type'>\n"
-            . "<option value='PROCEDURE'$isprocedure_select>PROCEDURE</option>\n"
-            . "<option value='FUNCTION'$isfunction_select>FUNCTION</option>\n"
-            . "</select>\n";
-    } else {
-        $retval .= "<input name='item_type' type='hidden'"
-            . " value='{$routine['item_type']}' />\n"
-            . "<div class='floatleft' style='width: 49%; text-align: center;"
-            . " font-weight: bold;'>\n"
-            . $routine['item_type'] . "\n"
-            . "</div>\n"
-            . "<input style='width: 49%;' type='submit' name='routine_changetype'\n"
-            . " value='" . sprintf(__('Change to %s'), $routine['item_type_toggle'])
-            . "' />\n";
-    }
-    $retval .= "    </td>\n";
-    $retval .= "</tr>\n";
-    $retval .= "<tr>\n";
-    $retval .= "    <td>" . __('Parameters') . "</td>\n";
-    $retval .= "    <td>\n";
-    // parameter handling start
-    $retval .= "        <table class='routine_params_table'>\n";
-    $retval .= "        <thead>\n";
-    $retval .= "        <tr>\n";
-    $retval .= "            <td></td>\n";
-    $retval .= "            <th class='routine_direction_cell$isprocedure_class'>"
-        . __('Direction') . "</th>\n";
-    $retval .= "            <th>" . __('Name') . "</th>\n";
-    $retval .= "            <th>" . __('Type') . "</th>\n";
-    $retval .= "            <th>" . __('Length/Values') . "</th>\n";
-    $retval .= "            <th colspan='2'>" . __('Options') . "</th>\n";
-    $retval .= "            <th class='routine_param_remove hide'>&nbsp;</th>\n";
-    $retval .= "        </tr>";
-    $retval .= "        </thead>\n";
-    $retval .= "        <tbody>\n";
-    for ($i = 0; $i < $routine['item_num_params']; $i++) { // each parameter
-        $retval .= PMA_RTN_getParameterRow($routine, $i, $isprocedure_class);
-    }
-    $retval .= "        </tbody>\n";
-    $retval .= "        </table>";
-    $retval .= "    </td>";
-    $retval .= "</tr>";
-    $retval .= "<tr>";
-    $retval .= "    <td>&nbsp;</td>";
-    $retval .= "    <td>";
-    $retval .= "        <input style='width: 49%;' type='button'";
-    $retval .= "               name='routine_addparameter'";
-    $retval .= "               value='" . __('Add parameter') . "' />";
-    $retval .= "        <input style='width: 49%;" . $disableRemoveParam . "'";
-    $retval .= "               type='submit' ";
-    $retval .= "               name='routine_removeparameter'";
-    $retval .= "               value='" . __('Remove last parameter') . "' />";
-    $retval .= "    </td>";
-    $retval .= "</tr>";
-    // parameter handling end
-    $retval .= "<tr class='routine_return_row" . $isfunction_class . "'>";
-    $retval .= "    <td>" . __('Return type') . "</td>";
-    $retval .= "    <td><select name='item_returntype'>";
-    $retval .= PMA\libraries\Util::getSupportedDatatypes(true, $routine['item_returntype']);
-    $retval .= "    </select></td>";
-    $retval .= "</tr>";
-    $retval .= "<tr class='routine_return_row" . $isfunction_class . "'>";
-    $retval .= "    <td>" . __('Return length/values') . "</td>";
-    $retval .= "    <td><input type='text' name='item_returnlength'";
-    $retval .= "        value='" . $routine['item_returnlength'] . "' /></td>";
-    $retval .= "    <td class='hide no_len'>---</td>";
-    $retval .= "</tr>";
-    $retval .= "<tr class='routine_return_row" . $isfunction_class . "'>";
-    $retval .= "    <td>" . __('Return options') . "</td>";
-    $retval .= "    <td><div>";
-    $retval .= PMA_generateCharsetDropdownBox(
-        PMA_CSDROPDOWN_CHARSET,
-        "item_returnopts_text",
-        null,
-        $routine['item_returnopts_text']
-    );
-    $retval .= "    </div>";
-    $retval .= "    <div><select name='item_returnopts_num'>";
-    $retval .= "        <option value=''></option>";
-    foreach ($param_opts_num as $key => $value) {
-        $selected = "";
-        if (! empty($routine['item_returnopts_num'])
-            && $routine['item_returnopts_num'] == $value
-        ) {
-            $selected = " selected='selected'";
-        }
-        $retval .= "<option" . $selected . ">" . $value . "</option>";
-    }
-    $retval .= "    </select></div>";
-    $retval .= "    <div class='hide no_opts'>---</div>";
-    $retval .= "</td>";
-    $retval .= "</tr>";
-    $retval .= "<tr>";
-    $retval .= "    <td>" . __('Definition') . "</td>";
-    $retval .= "    <td><textarea name='item_definition' rows='15' cols='40'>";
-    $retval .= $routine['item_definition'];
-    $retval .= "</textarea></td>";
-    $retval .= "</tr>";
-    $retval .= "<tr>";
-    $retval .= "    <td>" . __('Is deterministic') . "</td>";
-    $retval .= "    <td><input type='checkbox' name='item_isdeterministic'"
-        . $routine['item_isdeterministic'] . " /></td>";
-    $retval .= "</tr>";
-    if (isset($_REQUEST['edit_item'])
-        && ! empty($_REQUEST['edit_item'])
-    ) {
-        $retval .= "<tr>";
-        $retval .= "    <td>" . __('Adjust privileges');
-        $retval .= PMA\libraries\Util::showDocu('faq', 'faq6-39');
-        $retval .= "</td>";
-        if ($GLOBALS['proc_priv']
-            && $GLOBALS['is_reload_priv']
-        ) {
-            $retval .= "    <td><input type='checkbox' "
-                . "name='item_adjust_privileges' value='1' checked /></td>";
-        } else {
-            $retval .= "    <td><input type='checkbox' "
-                . "name='item_adjust_privileges' value='1' title='" . __(
-                    "You do not have sufficient privileges to perform this "
-                    . "operation; Please refer to the documentation for more "
-                    . "details"
-                )
-                . "' disabled/></td>";
-        }
-        $retval .= "</tr>";
-    }
-
-    $retval .= "<tr>";
-    $retval .= "    <td>" . __('Definer') . "</td>";
-    $retval .= "    <td><input type='text' name='item_definer'";
-    $retval .= "               value='" . $routine['item_definer'] . "' /></td>";
-    $retval .= "</tr>";
-    $retval .= "<tr>";
-    $retval .= "    <td>" . __('Security type') . "</td>";
-    $retval .= "    <td><select name='item_securitytype'>";
-    $retval .= "        <option value='DEFINER'"
-        . $routine['item_securitytype_definer'] . ">DEFINER</option>";
-    $retval .= "        <option value='INVOKER'"
-        . $routine['item_securitytype_invoker'] . ">INVOKER</option>";
-    $retval .= "    </select></td>";
-    $retval .= "</tr>";
-    $retval .= "<tr>";
-    $retval .= "    <td>" . __('SQL data access') . "</td>";
-    $retval .= "    <td><select name='item_sqldataaccess'>";
-    foreach ($param_sqldataaccess as $key => $value) {
-        $selected = "";
-        if ($routine['item_sqldataaccess'] == $value) {
-            $selected = " selected='selected'";
-        }
-        $retval .= "        <option" . $selected . ">" . $value . "</option>";
-    }
-    $retval .= "    </select></td>";
-    $retval .= "</tr>";
-    $retval .= "<tr>";
-    $retval .= "    <td>" . __('Comment') . "</td>";
-    $retval .= "    <td><input type='text' name='item_comment' maxlength='64'";
-    $retval .= "    value='" . $routine['item_comment'] . "' /></td>";
-    $retval .= "</tr>";
-    $retval .= "</table>";
-    $retval .= "</fieldset>";
-    if ($GLOBALS['is_ajax_request']) {
-        $retval .= "<input type='hidden' name='editor_process_" . $mode . "'";
-        $retval .= "       value='true' />";
-        $retval .= "<input type='hidden' name='ajax_request' value='true' />";
-    } else {
-        $retval .= "<fieldset class='tblFooters'>";
-        $retval .= "    <input type='submit' name='editor_process_" . $mode . "'";
-        $retval .= "           value='" . __('Go') . "' />";
-        $retval .= "</fieldset>";
-    }
-    $retval .= "</form>";
-    $retval .= "<!-- END " . mb_strtoupper($mode) . " ROUTINE FORM -->";
-
-    return $retval;
-} // end PMA_RTN_getEditorForm()
-
-/**
- * Composes the query necessary to create a routine from an HTTP request.
- *
- * @return string  The CREATE [ROUTINE | PROCEDURE] query.
- */
-function PMA_RTN_getQueryFromRequest()
-{
-    global $_REQUEST, $errors, $param_sqldataaccess, $param_directions, $PMA_Types;
-
-    $_REQUEST['item_type'] = isset($_REQUEST['item_type'])
-        ? $_REQUEST['item_type'] : '';
-
-    $query = 'CREATE ';
-    if (! empty($_REQUEST['item_definer'])) {
-        if (mb_strpos($_REQUEST['item_definer'], '@') !== false) {
-            $arr = explode('@', $_REQUEST['item_definer']);
-
-            $do_backquote = true;
-            if (substr($arr[0], 0, 1) === "`"
-                && substr($arr[0], -1) === "`"
-            ) {
-                $do_backquote = false;
-            }
-            $query .= 'DEFINER=' . PMA\libraries\Util::backquote($arr[0], $do_backquote);
-
-            $do_backquote = true;
-            if (substr($arr[1], 0, 1) === "`"
-                && substr($arr[1], -1) === "`"
-            ) {
-                $do_backquote = false;
-            }
-            $query .= '@' . PMA\libraries\Util::backquote($arr[1], $do_backquote) . ' ';
-        } else {
-            $errors[] = __('The definer must be in the "username@hostname" format!');
-        }
-    }
-    if ($_REQUEST['item_type'] == 'FUNCTION'
-        || $_REQUEST['item_type'] == 'PROCEDURE'
-    ) {
-        $query .= $_REQUEST['item_type'] . ' ';
-    } else {
-        $errors[] = sprintf(
-            __('Invalid routine type: "%s"'),
-            htmlspecialchars($_REQUEST['item_type'])
-        );
-    }
-    if (! empty($_REQUEST['item_name'])) {
-        $query .= PMA\libraries\Util::backquote($_REQUEST['item_name']);
-    } else {
-        $errors[] = __('You must provide a routine name!');
-    }
-    $params = '';
-    $warned_about_dir    = false;
-    $warned_about_length = false;
-
-    if (! empty($_REQUEST['item_param_name'])
-        && ! empty($_REQUEST['item_param_type'])
-        && ! empty($_REQUEST['item_param_length'])
-        && is_array($_REQUEST['item_param_name'])
-        && is_array($_REQUEST['item_param_type'])
-        && is_array($_REQUEST['item_param_length'])
-    ) {
-        $item_param_name = $_REQUEST['item_param_name'];
-        $item_param_type = $_REQUEST['item_param_type'];
-        $item_param_length = $_REQUEST['item_param_length'];
-
-        for ($i=0, $nb = count($item_param_name); $i < $nb; $i++) {
-            if (! empty($item_param_name[$i])
-                && ! empty($item_param_type[$i])
-            ) {
-                if ($_REQUEST['item_type'] == 'PROCEDURE'
-                    && ! empty($_REQUEST['item_param_dir'][$i])
-                    && in_array($_REQUEST['item_param_dir'][$i], $param_directions)
-                ) {
-                    $params .= $_REQUEST['item_param_dir'][$i] . " "
-                        . PMA\libraries\Util::backquote($item_param_name[$i])
-                        . " " . $item_param_type[$i];
-                } else if ($_REQUEST['item_type'] == 'FUNCTION') {
-                    $params .= PMA\libraries\Util::backquote($item_param_name[$i])
-                        . " " . $item_param_type[$i];
-                } else if (! $warned_about_dir) {
-                    $warned_about_dir = true;
-                    $errors[] = sprintf(
-                        __('Invalid direction "%s" given for parameter.'),
-                        htmlspecialchars($_REQUEST['item_param_dir'][$i])
-                    );
-                }
-                if ($item_param_length[$i] != ''
-                    && !preg_match(
-                        '@^(DATE|DATETIME|TIME|TINYBLOB|TINYTEXT|BLOB|TEXT|'
-                        . 'MEDIUMBLOB|MEDIUMTEXT|LONGBLOB|LONGTEXT|'
-                        . 'SERIAL|BOOLEAN)$@i',
-                        $item_param_type[$i]
-                    )
-                ) {
-                    $params .= "(" . $item_param_length[$i] . ")";
-                } else if ($item_param_length[$i] == ''
-                    && preg_match(
-                        '@^(ENUM|SET|VARCHAR|VARBINARY)$@i',
-                        $item_param_type[$i]
-                    )
-                ) {
-                    if (! $warned_about_length) {
-                        $warned_about_length = true;
-                        $errors[] = __(
-                            'You must provide length/values for routine parameters'
-                            . ' of type ENUM, SET, VARCHAR and VARBINARY.'
-                        );
-                    }
-                }
-                if (! empty($_REQUEST['item_param_opts_text'][$i])) {
-                    if ($PMA_Types->getTypeClass($item_param_type[$i]) == 'CHAR') {
-                        $params .= ' CHARSET '
-                            . mb_strtolower(
-                                $_REQUEST['item_param_opts_text'][$i]
-                            );
-                    }
-                }
-                if (! empty($_REQUEST['item_param_opts_num'][$i])) {
-                    if ($PMA_Types->getTypeClass($item_param_type[$i]) == 'NUMBER') {
-                        $params .= ' '
-                            . mb_strtoupper(
-                                $_REQUEST['item_param_opts_num'][$i]
-                            );
-                    }
-                }
-                if ($i != (count($item_param_name) - 1)) {
-                    $params .= ", ";
-                }
-            } else {
-                $errors[] = __(
-                    'You must provide a name and a type for each routine parameter.'
-                );
-                break;
-            }
-        }
-    }
-    $query .= "(" . $params . ") ";
-    if ($_REQUEST['item_type'] == 'FUNCTION') {
-        $item_returntype = isset($_REQUEST['item_returntype'])
-            ? $_REQUEST['item_returntype']
-            : null;
-
-        if (! empty($item_returntype)
-            && in_array(
-                $item_returntype, PMA\libraries\Util::getSupportedDatatypes()
-            )
-        ) {
-            $query .= "RETURNS " . $item_returntype;
-        } else {
-            $errors[] = __('You must provide a valid return type for the routine.');
-        }
-        if (! empty($_REQUEST['item_returnlength'])
-            && !preg_match(
-                '@^(DATE|DATETIME|TIME|TINYBLOB|TINYTEXT|BLOB|TEXT|'
-                . 'MEDIUMBLOB|MEDIUMTEXT|LONGBLOB|LONGTEXT|SERIAL|BOOLEAN)$@i',
-                $item_returntype
-            )
-        ) {
-            $query .= "(" . $_REQUEST['item_returnlength'] . ")";
-        } else if (empty($_REQUEST['item_returnlength'])
-            && preg_match(
-                '@^(ENUM|SET|VARCHAR|VARBINARY)$@i', $item_returntype
-            )
-        ) {
-            if (! $warned_about_length) {
-                $errors[] = __(
-                    'You must provide length/values for routine parameters'
-                    . ' of type ENUM, SET, VARCHAR and VARBINARY.'
-                );
-            }
-        }
-        if (! empty($_REQUEST['item_returnopts_text'])) {
-            if ($PMA_Types->getTypeClass($item_returntype) == 'CHAR') {
-                $query .= ' CHARSET '
-                    . mb_strtolower($_REQUEST['item_returnopts_text']);
-            }
-        }
-        if (! empty($_REQUEST['item_returnopts_num'])) {
-            if ($PMA_Types->getTypeClass($item_returntype) == 'NUMBER') {
-                $query .= ' '
-                    . mb_strtoupper($_REQUEST['item_returnopts_num']);
-            }
-        }
-        $query .= ' ';
-    }
-    if (! empty($_REQUEST['item_comment'])) {
-        $query .= "COMMENT '" . $GLOBALS['dbi']->escapeString($_REQUEST['item_comment'])
-            . "' ";
-    }
-    if (isset($_REQUEST['item_isdeterministic'])) {
-        $query .= 'DETERMINISTIC ';
-    } else {
-        $query .= 'NOT DETERMINISTIC ';
-    }
-    if (! empty($_REQUEST['item_sqldataaccess'])
-        && in_array($_REQUEST['item_sqldataaccess'], $param_sqldataaccess)
-    ) {
-        $query .= $_REQUEST['item_sqldataaccess'] . ' ';
-    }
-    if (! empty($_REQUEST['item_securitytype'])) {
-        if ($_REQUEST['item_securitytype'] == 'DEFINER'
-            || $_REQUEST['item_securitytype'] == 'INVOKER'
-        ) {
-            $query .= 'SQL SECURITY ' . $_REQUEST['item_securitytype'] . ' ';
-        }
-    }
-    if (! empty($_REQUEST['item_definition'])) {
-        $query .= $_REQUEST['item_definition'];
-    } else {
-        $errors[] = __('You must provide a routine definition.');
-    }
-
-    return $query;
-} // end PMA_RTN_getQueryFromRequest()
-
-/**
- * Handles requests for executing a routine
- *
- * @return void
- */
-function PMA_RTN_handleExecute()
-{
-    global $_GET, $_POST, $_REQUEST, $GLOBALS, $db;
-
-    /**
-     * Handle all user requests other than the default of listing routines
-     */
-    if (! empty($_REQUEST['execute_routine']) && ! empty($_REQUEST['item_name'])) {
-        // Build the queries
-        $routine = PMA_RTN_getDataFromName(
-            $_REQUEST['item_name'], $_REQUEST['item_type'], false, true
-        );
-        if ($routine === false) {
-            $message  = __('Error in processing request:') . ' ';
-            $message .= sprintf(
-                PMA_RTE_getWord('not_found'),
-                htmlspecialchars(PMA\libraries\Util::backquote($_REQUEST['item_name'])),
-                htmlspecialchars(PMA\libraries\Util::backquote($db))
-            );
-            $message = Message::error($message);
-            if ($GLOBALS['is_ajax_request']) {
-                $response = PMA\libraries\Response::getInstance();
-                $response->setRequestStatus(false);
-                $response->addJSON('message', $message);
-                exit;
-            } else {
-                echo $message->getDisplay();
-                unset($_POST);
-            }
-        }
-
-        $queries   = array();
-        $end_query = array();
-        $args      = array();
-        $all_functions = $GLOBALS['PMA_Types']->getAllFunctions();
-        for ($i = 0; $i < $routine['item_num_params']; $i++) {
-            if (isset($_REQUEST['params'][$routine['item_param_name'][$i]])) {
-                $value = $_REQUEST['params'][$routine['item_param_name'][$i]];
-                if (is_array($value)) { // is SET type
-                    $value = implode(',', $value);
-                }
-                $value = $GLOBALS['dbi']->escapeString($value);
-                if (! empty($_REQUEST['funcs'][$routine['item_param_name'][$i]])
-                    && in_array(
-                        $_REQUEST['funcs'][$routine['item_param_name'][$i]],
-                        $all_functions
-                    )
-                ) {
-                    $queries[] = "SET @p$i="
-                        . $_REQUEST['funcs'][$routine['item_param_name'][$i]]
-                        . "('$value');\n";
-                } else {
-                    $queries[] = "SET @p$i='$value';\n";
-                }
-                $args[] = "@p$i";
-            } else {
-                $args[] = "@p$i";
-            }
-            if ($routine['item_type'] == 'PROCEDURE') {
-                if ($routine['item_param_dir'][$i] == 'OUT'
-                    || $routine['item_param_dir'][$i] == 'INOUT'
-                ) {
-                    $end_query[] = "@p$i AS "
-                        . PMA\libraries\Util::backquote($routine['item_param_name'][$i]);
-                }
-            }
-        }
-        if ($routine['item_type'] == 'PROCEDURE') {
-            $queries[] = "CALL " . PMA\libraries\Util::backquote($routine['item_name'])
-                       . "(" . implode(', ', $args) . ");\n";
-            if (count($end_query)) {
-                $queries[] = "SELECT " . implode(', ', $end_query) . ";\n";
-            }
-        } else {
-            $queries[] = "SELECT " . PMA\libraries\Util::backquote($routine['item_name'])
-                       . "(" . implode(', ', $args) . ") "
-                       . "AS " . PMA\libraries\Util::backquote($routine['item_name'])
-                        . ";\n";
-        }
-
-        // Get all the queries as one SQL statement
-        $multiple_query = implode("", $queries);
-
-        $outcome = true;
-        $affected = 0;
-
-        // Execute query
-        if (! $GLOBALS['dbi']->tryMultiQuery($multiple_query)) {
-            $outcome = false;
-        }
-
-        // Generate output
-        if ($outcome) {
-
-            // Pass the SQL queries through the "pretty printer"
-            $output  = PMA\libraries\Util::formatSql(implode($queries, "\n"));
-
-            // Display results
-            $output .= "<fieldset><legend>";
-            $output .= sprintf(
-                __('Execution results of routine %s'),
-                PMA\libraries\Util::backquote(htmlspecialchars($routine['item_name']))
-            );
-            $output .= "</legend>";
-
-            $nbResultsetToDisplay = 0;
-
-            do {
-
-                $result = $GLOBALS['dbi']->storeResult();
-                $num_rows = $GLOBALS['dbi']->numRows($result);
-
-                if (($result !== false) && ($num_rows > 0)) {
-
-                    $output .= "<table><tr>";
-                    foreach ($GLOBALS['dbi']->getFieldsMeta($result) as $field) {
-                        $output .= "<th>";
-                        $output .= htmlspecialchars($field->name);
-                        $output .= "</th>";
-                    }
-                    $output .= "</tr>";
-
-                    $color_class = 'odd';
-
-                    while ($row = $GLOBALS['dbi']->fetchAssoc($result)) {
-                        $output .= "<tr>" . browseRow($row, $color_class) . "</tr>";
-                        $color_class = ($color_class == 'odd') ? 'even' : 'odd';
-                    }
-
-                    $output .= "</table>";
-                    $nbResultsetToDisplay++;
-                    $affected = $num_rows;
-
-                }
-
-                if (! $GLOBALS['dbi']->moreResults()) {
-                    break;
-                }
-
-                $output .= "<br/>";
-
-                $GLOBALS['dbi']->freeResult($result);
-
-            } while ($GLOBALS['dbi']->nextResult());
-
-            $output .= "</fieldset>";
-
-            $message = __('Your SQL query has been executed successfully.');
-            if ($routine['item_type'] == 'PROCEDURE') {
-                $message .= '<br />';
-
-                // TODO : message need to be modified according to the
-                // output from the routine
-                $message .= sprintf(
-                    _ngettext(
-                        '%d row affected by the last statement inside the '
-                        . 'procedure.',
-                        '%d rows affected by the last statement inside the '
-                        . 'procedure.',
-                        $affected
-                    ),
-                    $affected
-                );
-            }
-            $message = Message::success($message);
-
-            if ($nbResultsetToDisplay == 0) {
-                $notice = __(
-                    'MySQL returned an empty result set (i.e. zero rows).'
-                );
-                $output .= Message::notice($notice)->getDisplay();
-            }
-
-        } else {
-            $output = '';
-            $message = Message::error(
-                sprintf(
-                    __('The following query has failed: "%s"'),
-                    htmlspecialchars($multiple_query)
-                )
-                . '<br /><br />'
-                . __('MySQL said: ') . $GLOBALS['dbi']->getError(null)
-            );
-        }
-
-        // Print/send output
-        if ($GLOBALS['is_ajax_request']) {
-            $response = PMA\libraries\Response::getInstance();
-            $response->setRequestStatus($message->isSuccess());
-            $response->addJSON('message', $message->getDisplay() . $output);
-            $response->addJSON('dialog', false);
-            exit;
-        } else {
-            echo $message->getDisplay() , $output;
-            if ($message->isError()) {
-                // At least one query has failed, so shouldn't
-                // execute any more queries, so we quit.
-                exit;
-            }
-            unset($_POST);
-            // Now deliberately fall through to displaying the routines list
-        }
-        return;
-    } else if (! empty($_GET['execute_dialog']) && ! empty($_GET['item_name'])) {
-        /**
-         * Display the execute form for a routine.
-         */
-        $routine = PMA_RTN_getDataFromName(
-            $_GET['item_name'], $_GET['item_type'], true, true
-        );
-        if ($routine !== false) {
-            $form = PMA_RTN_getExecuteForm($routine);
-            if ($GLOBALS['is_ajax_request'] == true) {
-                $title = __("Execute routine") . " " . PMA\libraries\Util::backquote(
-                    htmlentities($_GET['item_name'], ENT_QUOTES)
-                );
-                $response = PMA\libraries\Response::getInstance();
-                $response->addJSON('message', $form);
-                $response->addJSON('title', $title);
-                $response->addJSON('dialog', true);
-            } else {
-                echo "\n\n<h2>" . __("Execute routine") . "</h2>\n\n";
-                echo $form;
-            }
-            exit;
-        } else if (($GLOBALS['is_ajax_request'] == true)) {
-            $message  = __('Error in processing request:') . ' ';
-            $message .= sprintf(
-                PMA_RTE_getWord('not_found'),
-                htmlspecialchars(PMA\libraries\Util::backquote($_REQUEST['item_name'])),
-                htmlspecialchars(PMA\libraries\Util::backquote($db))
-            );
-            $message = Message::error($message);
-
-            $response = PMA\libraries\Response::getInstance();
-            $response->setRequestStatus(false);
-            $response->addJSON('message', $message);
-            exit;
-        }
-    }
-}
-
-/**
- * Browse row array
- *
- * @param array  $row         Columns
- * @param string $color_class CSS class
- *
- * @return string
- */
-function browseRow($row, $color_class)
-{
-    $output = null;
-    foreach ($row as $value) {
-        if ($value === null) {
-            $value = '<i>NULL</i>';
-        } else {
-            $value = htmlspecialchars($value);
-        }
-        $output .= "<td class='" . $color_class . "'>" . $value . "</td>";
-    }
-    return $output;
-}
-
-/**
- * Creates the HTML code that shows the routine execution dialog.
- *
- * @param array $routine Data for the routine returned by
- *                       PMA_RTN_getDataFromName()
- *
- * @return string   HTML code for the routine execution dialog.
- */
-function PMA_RTN_getExecuteForm($routine)
-{
-    global $db, $cfg;
-
-    // Escape special characters
-    $routine['item_name'] = htmlentities($routine['item_name'], ENT_QUOTES);
-    for ($i = 0; $i < $routine['item_num_params']; $i++) {
-        $routine['item_param_name'][$i] = htmlentities(
-            $routine['item_param_name'][$i],
-            ENT_QUOTES
-        );
-    }
-
-    // Create the output
-    $retval  = "";
-    $retval .= "<!-- START ROUTINE EXECUTE FORM -->\n\n";
-    $retval .= "<form action='db_routines.php' method='post'\n";
-    $retval .= "       class='rte_form ajax' onsubmit='return false'>\n";
-    $retval .= "<input type='hidden' name='item_name'\n";
-    $retval .= "       value='{$routine['item_name']}' />\n";
-    $retval .= "<input type='hidden' name='item_type'\n";
-    $retval .= "       value='{$routine['item_type']}' />\n";
-    $retval .= PMA_URL_getHiddenInputs($db) . "\n";
-    $retval .= "<fieldset>\n";
-    if ($GLOBALS['is_ajax_request'] != true) {
-        $retval .= "<legend>{$routine['item_name']}</legend>\n";
-        $retval .= "<table class='rte_table'>\n";
-        $retval .= "<caption class='tblHeaders'>\n";
-        $retval .= __('Routine parameters');
-        $retval .= "</caption>\n";
-    } else {
-        $retval .= "<legend>" . __('Routine parameters') . "</legend>\n";
-        $retval .= "<table class='rte_table' style='width: 100%;'>\n";
-    }
-    $retval .= "<tr>\n";
-    $retval .= "<th>" . __('Name') . "</th>\n";
-    $retval .= "<th>" . __('Type') . "</th>\n";
-    if ($cfg['ShowFunctionFields']) {
-        $retval .= "<th>" . __('Function') . "</th>\n";
-    }
-    $retval .= "<th>" . __('Value')    . "</th>\n";
-    $retval .= "</tr>\n";
-    // Get a list of data types that are not yet supported.
-    $no_support_types = PMA\libraries\Util::unsupportedDatatypes();
-    for ($i = 0; $i < $routine['item_num_params']; $i++) { // Each parameter
-        if ($routine['item_type'] == 'PROCEDURE'
-            && $routine['item_param_dir'][$i] == 'OUT'
-        ) {
-            continue;
-        }
-        $rowclass = ($i % 2 == 0) ? 'even' : 'odd';
-        $retval .= "\n<tr class='$rowclass'>\n";
-        $retval .= "<td>{$routine['item_param_name'][$i]}</td>\n";
-        $retval .= "<td>{$routine['item_param_type'][$i]}</td>\n";
-        if ($cfg['ShowFunctionFields']) {
-            $retval .= "<td>\n";
-            if (stristr($routine['item_param_type'][$i], 'enum')
-                || stristr($routine['item_param_type'][$i], 'set')
-                || in_array(
-                    mb_strtolower($routine['item_param_type'][$i]),
-                    $no_support_types
-                )
-            ) {
-                $retval .= "--\n";
-            } else {
-                $field = array(
-                    'True_Type'       => mb_strtolower(
-                        $routine['item_param_type'][$i]
-                    ),
-                    'Type'            => '',
-                    'Key'             => '',
-                    'Field'           => '',
-                    'Default'         => '',
-                    'first_timestamp' => false
-                );
-                $retval .= "<select name='funcs["
-                    . $routine['item_param_name'][$i] . "]'>";
-                $retval .= PMA\libraries\Util::getFunctionsForField($field, false, array());
-                $retval .= "</select>";
-            }
-            $retval .= "</td>\n";
-        }
-        // Append a class to date/time fields so that
-        // jQuery can attach a datepicker to them
-        $class = '';
-        if ($routine['item_param_type'][$i] == 'DATETIME'
-            || $routine['item_param_type'][$i] == 'TIMESTAMP'
-        ) {
-            $class = 'datetimefield';
-        } else if ($routine['item_param_type'][$i] == 'DATE') {
-            $class = 'datefield';
-        }
-        $retval .= "<td class='nowrap'>\n";
-        if (in_array($routine['item_param_type'][$i], array('ENUM', 'SET'))) {
-            if ($routine['item_param_type'][$i] == 'ENUM') {
-                $input_type = 'radio';
-            } else {
-                $input_type = 'checkbox';
-            }
-            foreach ($routine['item_param_length_arr'][$i] as $value) {
-                $value = htmlentities(PMA\libraries\Util::unquote($value), ENT_QUOTES);
-                $retval .= "<input name='params["
-                    . $routine['item_param_name'][$i] . "][]' "
-                    . "value='" . $value . "' type='"
-                    . $input_type . "' />"
-                    . $value . "<br />\n";
-            }
-        } else if (in_array(
-            mb_strtolower($routine['item_param_type'][$i]),
-            $no_support_types
-        )) {
-            $retval .= "\n";
-        } else {
-            $retval .= "<input class='$class' type='text' name='params["
-                . $routine['item_param_name'][$i] . "]' />\n";
-        }
-        $retval .= "</td>\n";
-        $retval .= "</tr>\n";
-    }
-    $retval .= "\n</table>\n";
-    if ($GLOBALS['is_ajax_request'] != true) {
-        $retval .= "</fieldset>\n\n";
-        $retval .= "<fieldset class='tblFooters'>\n";
-        $retval .= "    <input type='submit' name='execute_routine'\n";
-        $retval .= "           value='" . __('Go') . "' />\n";
-        $retval .= "</fieldset>\n";
-    } else {
-        $retval .= "<input type='hidden' name='execute_routine' value='true' />";
-        $retval .= "<input type='hidden' name='ajax_request' value='true' />";
-    }
-    $retval .= "</form>\n\n";
-    $retval .= "<!-- END ROUTINE EXECUTE FORM -->\n\n";
-
-    return $retval;
-} // end PMA_RTN_getExecuteForm()
-
diff --git a/#pma/libraries/rte/rte_triggers.lib.php b/#pma/libraries/rte/rte_triggers.lib.php
deleted file mode 100644
index c28aab88..00000000
--- a/#pma/libraries/rte/rte_triggers.lib.php
+++ /dev/null
@@ -1,464 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Functions for trigger management.
- *
- * @package PhpMyAdmin
- */
-use PMA\libraries\Response;
-
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
-/**
- * Sets required globals
- *
- * @return void
- */
-function PMA_TRI_setGlobals()
-{
-    global $action_timings, $event_manipulations;
-
-    // Some definitions for triggers
-    $action_timings      = array('BEFORE',
-                                 'AFTER');
-    $event_manipulations = array('INSERT',
-                                 'UPDATE',
-                                 'DELETE');
-}
-
-/**
- * Main function for the triggers functionality
- *
- * @return void
- */
-function PMA_TRI_main()
-{
-    global $db, $table;
-
-    PMA_TRI_setGlobals();
-    /**
-     * Process all requests
-     */
-    PMA_TRI_handleEditor();
-    PMA_TRI_handleExport();
-    /**
-     * Display a list of available triggers
-     */
-    $items = $GLOBALS['dbi']->getTriggers($db, $table);
-    echo PMA_RTE_getList('trigger', $items);
-    /**
-     * Display a link for adding a new trigger,
-     * if the user has the necessary privileges
-     */
-    echo PMA_TRI_getFooterLinks();
-} // end PMA_TRI_main()
-
-/**
- * Handles editor requests for adding or editing an item
- *
- * @return void
- */
-function PMA_TRI_handleEditor()
-{
-    global $_REQUEST, $_POST, $errors, $db, $table;
-
-    if (! empty($_REQUEST['editor_process_add'])
-        || ! empty($_REQUEST['editor_process_edit'])
-    ) {
-        $sql_query = '';
-
-        $item_query = PMA_TRI_getQueryFromRequest();
-
-        if (! count($errors)) { // set by PMA_RTN_getQueryFromRequest()
-            // Execute the created query
-            if (! empty($_REQUEST['editor_process_edit'])) {
-                // Backup the old trigger, in case something goes wrong
-                $trigger = PMA_TRI_getDataFromName($_REQUEST['item_original_name']);
-                $create_item = $trigger['create'];
-                $drop_item = $trigger['drop'] . ';';
-                $result = $GLOBALS['dbi']->tryQuery($drop_item);
-                if (! $result) {
-                    $errors[] = sprintf(
-                        __('The following query has failed: "%s"'),
-                        htmlspecialchars($drop_item)
-                    )
-                    . '<br />'
-                    . __('MySQL said: ') . $GLOBALS['dbi']->getError(null);
-                } else {
-                    $result = $GLOBALS['dbi']->tryQuery($item_query);
-                    if (! $result) {
-                        $errors[] = sprintf(
-                            __('The following query has failed: "%s"'),
-                            htmlspecialchars($item_query)
-                        )
-                        . '<br />'
-                        . __('MySQL said: ') . $GLOBALS['dbi']->getError(null);
-                        // We dropped the old item, but were unable to create the
-                        // new one. Try to restore the backup query.
-                        $result = $GLOBALS['dbi']->tryQuery($create_item);
-
-                        $errors = checkResult(
-                            $result,
-                            __(
-                                'Sorry, we failed to restore the dropped trigger.'
-                            ),
-                            $create_item,
-                            $errors
-                        );
-                    } else {
-                        $message = PMA\libraries\Message::success(
-                            __('Trigger %1$s has been modified.')
-                        );
-                        $message->addParam(
-                            PMA\libraries\Util::backquote($_REQUEST['item_name'])
-                        );
-                        $sql_query = $drop_item . $item_query;
-                    }
-                }
-            } else {
-                // 'Add a new item' mode
-                $result = $GLOBALS['dbi']->tryQuery($item_query);
-                if (! $result) {
-                    $errors[] = sprintf(
-                        __('The following query has failed: "%s"'),
-                        htmlspecialchars($item_query)
-                    )
-                    . '<br /><br />'
-                    . __('MySQL said: ') . $GLOBALS['dbi']->getError(null);
-                } else {
-                    $message = PMA\libraries\Message::success(
-                        __('Trigger %1$s has been created.')
-                    );
-                    $message->addParam(
-                        PMA\libraries\Util::backquote($_REQUEST['item_name'])
-                    );
-                    $sql_query = $item_query;
-                }
-            }
-        }
-
-        if (count($errors)) {
-            $message = PMA\libraries\Message::error(
-                '<b>'
-                . __(
-                    'One or more errors have occurred while processing your request:'
-                )
-                . '</b>'
-            );
-            $message->addString('<ul>');
-            foreach ($errors as $string) {
-                $message->addString('<li>' . $string . '</li>');
-            }
-            $message->addString('</ul>');
-        }
-
-        $output = PMA\libraries\Util::getMessage($message, $sql_query);
-        if ($GLOBALS['is_ajax_request']) {
-            $response = PMA\libraries\Response::getInstance();
-            if ($message->isSuccess()) {
-                $items = $GLOBALS['dbi']->getTriggers($db, $table, '');
-                $trigger = false;
-                foreach ($items as $value) {
-                    if ($value['name'] == $_REQUEST['item_name']) {
-                        $trigger = $value;
-                    }
-                }
-                $insert = false;
-                if (empty($table)
-                    || ($trigger !== false && $table == $trigger['table'])
-                ) {
-                    $insert = true;
-                    $response->addJSON('new_row', PMA_TRI_getRowForList($trigger));
-                    $response->addJSON(
-                        'name',
-                        htmlspecialchars(
-                            mb_strtoupper(
-                                $_REQUEST['item_name']
-                            )
-                        )
-                    );
-                }
-                $response->addJSON('insert', $insert);
-                $response->addJSON('message', $output);
-            } else {
-                $response->addJSON('message', $message);
-                $response->setRequestStatus(false);
-            }
-            exit;
-        }
-    }
-
-    /**
-     * Display a form used to add/edit a trigger, if necessary
-     */
-    if (count($errors)
-        || (empty($_REQUEST['editor_process_add'])
-        && empty($_REQUEST['editor_process_edit'])
-        && (! empty($_REQUEST['add_item'])
-        || ! empty($_REQUEST['edit_item']))) // FIXME: this must be simpler than that
-    ) {
-        // Get the data for the form (if any)
-        if (! empty($_REQUEST['add_item'])) {
-            $title = PMA_RTE_getWord('add');
-            $item = PMA_TRI_getDataFromRequest();
-            $mode = 'add';
-        } else if (! empty($_REQUEST['edit_item'])) {
-            $title = __("Edit trigger");
-            if (! empty($_REQUEST['item_name'])
-                && empty($_REQUEST['editor_process_edit'])
-            ) {
-                $item = PMA_TRI_getDataFromName($_REQUEST['item_name']);
-                if ($item !== false) {
-                    $item['item_original_name'] = $item['item_name'];
-                }
-            } else {
-                $item = PMA_TRI_getDataFromRequest();
-            }
-            $mode = 'edit';
-        }
-        PMA_RTE_sendEditor('TRI', $mode, $item, $title, $db);
-    }
-} // end PMA_TRI_handleEditor()
-
-/**
- * This function will generate the values that are required to for the editor
- *
- * @return array    Data necessary to create the editor.
- */
-function PMA_TRI_getDataFromRequest()
-{
-    $retval = array();
-    $indices = array('item_name',
-                     'item_table',
-                     'item_original_name',
-                     'item_action_timing',
-                     'item_event_manipulation',
-                     'item_definition',
-                     'item_definer');
-    foreach ($indices as $index) {
-        $retval[$index] = isset($_REQUEST[$index]) ? $_REQUEST[$index] : '';
-    }
-    return $retval;
-} // end PMA_TRI_getDataFromRequest()
-
-/**
- * This function will generate the values that are required to complete
- * the "Edit trigger" form given the name of a trigger.
- *
- * @param string $name The name of the trigger.
- *
- * @return array Data necessary to create the editor.
- */
-function PMA_TRI_getDataFromName($name)
-{
-    global $db, $table, $_REQUEST;
-
-    $temp = array();
-    $items = $GLOBALS['dbi']->getTriggers($db, $table, '');
-    foreach ($items as $value) {
-        if ($value['name'] == $name) {
-            $temp = $value;
-        }
-    }
-    if (empty($temp)) {
-        return false;
-    } else {
-        $retval = array();
-        $retval['create']                  = $temp['create'];
-        $retval['drop']                    = $temp['drop'];
-        $retval['item_name']               = $temp['name'];
-        $retval['item_table']              = $temp['table'];
-        $retval['item_action_timing']      = $temp['action_timing'];
-        $retval['item_event_manipulation'] = $temp['event_manipulation'];
-        $retval['item_definition']         = $temp['definition'];
-        $retval['item_definer']            = $temp['definer'];
-        return $retval;
-    }
-} // end PMA_TRI_getDataFromName()
-
-/**
- * Displays a form used to add/edit a trigger
- *
- * @param string $mode If the editor will be used to edit a trigger
- *                     or add a new one: 'edit' or 'add'.
- * @param array  $item Data for the trigger returned by PMA_TRI_getDataFromRequest()
- *                     or PMA_TRI_getDataFromName()
- *
- * @return string HTML code for the editor.
- */
-function PMA_TRI_getEditorForm($mode, $item)
-{
-    global $db, $table, $event_manipulations, $action_timings;
-
-    $modeToUpper = mb_strtoupper($mode);
-
-    // Escape special characters
-    $need_escape = array(
-                       'item_original_name',
-                       'item_name',
-                       'item_definition',
-                       'item_definer'
-                   );
-    foreach ($need_escape as $key => $index) {
-        $item[$index] = htmlentities($item[$index], ENT_QUOTES, 'UTF-8');
-    }
-    $original_data = '';
-    if ($mode == 'edit') {
-        $original_data = "<input name='item_original_name' "
-                       . "type='hidden' value='{$item['item_original_name']}'/>\n";
-    }
-    $query  = "SELECT `TABLE_NAME` FROM `INFORMATION_SCHEMA`.`TABLES` ";
-    $query .= "WHERE `TABLE_SCHEMA`='" . $GLOBALS['dbi']->escapeString($db) . "' ";
-    $query .= "AND `TABLE_TYPE`='BASE TABLE'";
-    $tables = $GLOBALS['dbi']->fetchResult($query);
-
-    // Create the output
-    $retval  = "";
-    $retval .= "<!-- START " . $modeToUpper . " TRIGGER FORM -->\n\n";
-    $retval .= "<form class='rte_form' action='db_triggers.php' method='post'>\n";
-    $retval .= "<input name='{$mode}_item' type='hidden' value='1' />\n";
-    $retval .= $original_data;
-    $retval .= PMA_URL_getHiddenInputs($db, $table) . "\n";
-    $retval .= "<fieldset>\n";
-    $retval .= "<legend>" . __('Details') . "</legend>\n";
-    $retval .= "<table class='rte_table' style='width: 100%'>\n";
-    $retval .= "<tr>\n";
-    $retval .= "    <td style='width: 20%;'>" . __('Trigger name') . "</td>\n";
-    $retval .= "    <td><input type='text' name='item_name' maxlength='64'\n";
-    $retval .= "               value='{$item['item_name']}' /></td>\n";
-    $retval .= "</tr>\n";
-    $retval .= "<tr>\n";
-    $retval .= "    <td>" . __('Table') . "</td>\n";
-    $retval .= "    <td>\n";
-    $retval .= "        <select name='item_table'>\n";
-    foreach ($tables as $key => $value) {
-        $selected = "";
-        if ($mode == 'add' && $value == $table) {
-            $selected = " selected='selected'";
-        } else if ($mode == 'edit' && $value == $item['item_table']) {
-            $selected = " selected='selected'";
-        }
-        $retval .= "<option$selected>";
-        $retval .= htmlspecialchars($value);
-        $retval .= "</option>\n";
-    }
-    $retval .= "        </select>\n";
-    $retval .= "    </td>\n";
-    $retval .= "</tr>\n";
-    $retval .= "<tr>\n";
-    $retval .= "    <td>" . _pgettext('Trigger action time', 'Time') . "</td>\n";
-    $retval .= "    <td><select name='item_timing'>\n";
-    foreach ($action_timings as $key => $value) {
-        $selected = "";
-        if (! empty($item['item_action_timing'])
-            && $item['item_action_timing'] == $value
-        ) {
-            $selected = " selected='selected'";
-        }
-        $retval .= "<option$selected>$value</option>";
-    }
-    $retval .= "    </select></td>\n";
-    $retval .= "</tr>\n";
-    $retval .= "<tr>\n";
-    $retval .= "    <td>" . __('Event') . "</td>\n";
-    $retval .= "    <td><select name='item_event'>\n";
-    foreach ($event_manipulations as $key => $value) {
-        $selected = "";
-        if (! empty($item['item_event_manipulation'])
-            && $item['item_event_manipulation'] == $value
-        ) {
-            $selected = " selected='selected'";
-        }
-        $retval .= "<option$selected>$value</option>";
-    }
-    $retval .= "    </select></td>\n";
-    $retval .= "</tr>\n";
-    $retval .= "<tr>\n";
-    $retval .= "    <td>" . __('Definition') . "</td>\n";
-    $retval .= "    <td><textarea name='item_definition' rows='15' cols='40'>";
-    $retval .= $item['item_definition'];
-    $retval .= "</textarea></td>\n";
-    $retval .= "</tr>\n";
-    $retval .= "<tr>\n";
-    $retval .= "    <td>" . __('Definer') . "</td>\n";
-    $retval .= "    <td><input type='text' name='item_definer'\n";
-    $retval .= "               value='{$item['item_definer']}' /></td>\n";
-    $retval .= "</tr>\n";
-    $retval .= "</table>\n";
-    $retval .= "</fieldset>\n";
-    if ($GLOBALS['is_ajax_request']) {
-        $retval .= "<input type='hidden' name='editor_process_{$mode}'\n";
-        $retval .= "       value='true' />\n";
-        $retval .= "<input type='hidden' name='ajax_request' value='true' />\n";
-    } else {
-        $retval .= "<fieldset class='tblFooters'>\n";
-        $retval .= "    <input type='submit' name='editor_process_{$mode}'\n";
-        $retval .= "           value='" . __('Go') . "' />\n";
-        $retval .= "</fieldset>\n";
-    }
-    $retval .= "</form>\n\n";
-    $retval .= "<!-- END " . $modeToUpper . " TRIGGER FORM -->\n\n";
-
-    return $retval;
-} // end PMA_TRI_getEditorForm()
-
-/**
- * Composes the query necessary to create a trigger from an HTTP request.
- *
- * @return string  The CREATE TRIGGER query.
- */
-function PMA_TRI_getQueryFromRequest()
-{
-    global $_REQUEST, $db, $errors, $action_timings, $event_manipulations;
-
-    $query = 'CREATE ';
-    if (! empty($_REQUEST['item_definer'])) {
-        if (mb_strpos($_REQUEST['item_definer'], '@') !== false
-        ) {
-            $arr = explode('@', $_REQUEST['item_definer']);
-            $query .= 'DEFINER=' . PMA\libraries\Util::backquote($arr[0]);
-            $query .= '@' . PMA\libraries\Util::backquote($arr[1]) . ' ';
-        } else {
-            $errors[] = __('The definer must be in the "username@hostname" format!');
-        }
-    }
-    $query .= 'TRIGGER ';
-    if (! empty($_REQUEST['item_name'])) {
-        $query .= PMA\libraries\Util::backquote($_REQUEST['item_name']) . ' ';
-    } else {
-        $errors[] = __('You must provide a trigger name!');
-    }
-    if (! empty($_REQUEST['item_timing'])
-        && in_array($_REQUEST['item_timing'], $action_timings)
-    ) {
-        $query .= $_REQUEST['item_timing'] . ' ';
-    } else {
-        $errors[] = __('You must provide a valid timing for the trigger!');
-    }
-    if (! empty($_REQUEST['item_event'])
-        && in_array($_REQUEST['item_event'], $event_manipulations)
-    ) {
-        $query .= $_REQUEST['item_event'] . ' ';
-    } else {
-        $errors[] = __('You must provide a valid event for the trigger!');
-    }
-    $query .= 'ON ';
-    if (! empty($_REQUEST['item_table'])
-        && in_array($_REQUEST['item_table'], $GLOBALS['dbi']->getTables($db))
-    ) {
-        $query .= PMA\libraries\Util::backquote($_REQUEST['item_table']);
-    } else {
-        $errors[] = __('You must provide a valid table name!');
-    }
-    $query .= ' FOR EACH ROW ';
-    if (! empty($_REQUEST['item_definition'])) {
-        $query .= $_REQUEST['item_definition'];
-    } else {
-        $errors[] = __('You must provide a trigger definition.');
-    }
-
-    return $query;
-} // end PMA_TRI_getQueryFromRequest()
-
diff --git a/#pma/libraries/rte/rte_words.lib.php b/#pma/libraries/rte/rte_words.lib.php
deleted file mode 100644
index 95fc5a10..00000000
--- a/#pma/libraries/rte/rte_words.lib.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Helper functions for RTE
- *
- * @package PhpMyAdmin
- */
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
-/**
- * This function is used to retrieve some language strings that are used
- * in features that are common to routines, triggers and events.
- *
- * @param string $index The index of the string to get
- *
- * @return string The requested string or an empty string, if not available
- */
-function PMA_RTE_getWord($index)
-{
-    global $_PMA_RTE;
-
-    switch ($_PMA_RTE) {
-    case 'RTN':
-        $words = array(
-            'add'       => __('Add routine'),
-            'docu'      => 'STORED_ROUTINES',
-            'export'    => __('Export of routine %s'),
-            'human'     => __('routine'),
-            'no_create' => __(
-                'You do not have the necessary privileges to create a routine.'
-            ),
-            'no_edit'   => __(
-                'No routine with name %1$s found in database %2$s. '
-                . 'You might be lacking the necessary privileges to edit this routine.'
-            ),
-            'no_view'   => __(
-                'No routine with name %1$s found in database %2$s. '
-                . 'You might be lacking the necessary privileges to view/export this routine.'
-            ),
-            'not_found' => __('No routine with name %1$s found in database %2$s.'),
-            'nothing'   => __('There are no routines to display.'),
-            'title'     => __('Routines'),
-        );
-        break;
-    case 'TRI':
-        $words = array(
-            'add'       => __('Add trigger'),
-            'docu'      => 'TRIGGERS',
-            'export'    => __('Export of trigger %s'),
-            'human'     => __('trigger'),
-            'no_create' => __(
-                'You do not have the necessary privileges to create a trigger.'
-            ),
-            'not_found' => __('No trigger with name %1$s found in database %2$s.'),
-            'nothing'   => __('There are no triggers to display.'),
-            'title'     => __('Triggers'),
-        );
-        break;
-    case 'EVN':
-        $words = array(
-            'add'       => __('Add event'),
-            'docu'      => 'EVENTS',
-            'export'    => __('Export of event %s'),
-            'human'     => __('event'),
-            'no_create' => __(
-                'You do not have the necessary privileges to create an event.'
-            ),
-            'not_found' => __('No event with name %1$s found in database %2$s.'),
-            'nothing'   => __('There are no events to display.'),
-            'title'     => __('Events'),
-        );
-        break;
-    default:
-        $words = array();
-        break;
-    }
-
-    return isset($words[$index]) ? $words[$index] : '';
-} // end PMA_RTE_getWord()
-
diff --git a/#pma/libraries/sanitizing.lib.php b/#pma/libraries/sanitizing.lib.php
deleted file mode 100644
index e5c1c42e..00000000
--- a/#pma/libraries/sanitizing.lib.php
+++ /dev/null
@@ -1,233 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * This is in a separate script because it's called from a number of scripts
- *
- * @package PhpMyAdmin
- */
-
-/**
- * Checks whether given link is valid
- *
- * @param string  $url   URL to check
- * @param boolean $http  Whether to allow http links
- * @param boolean $other Whether to allow ftp and mailto links
- *
- * @return boolean True if string can be used as link
- */
-function PMA_checkLink($url, $http=false, $other=false)
-{
-    $url = strtolower($url);
-    $valid_starts = array(
-        'https://',
-        './url.php?url=https%3a%2f%2f',
-        './doc/html/',
-        # possible return values from Util::getScriptNameForOption
-        './index.php?',
-        './server_databases.php?',
-        './server_status.php?',
-        './server_variables.php?',
-        './server_privileges.php?',
-        './db_structure.php?',
-        './db_sql.php?',
-        './db_search.php?',
-        './db_operations.php?',
-        './tbl_structure.php?',
-        './tbl_sql.php?',
-        './tbl_select.php?',
-        './tbl_change.php?',
-        './sql.php?',
-        # Hardcoded options in libraries/special_schema_links.lib.php
-        './db_events.php?',
-        './db_routines.php?',
-        './server_privileges.php?',
-        './tbl_structure.php?',
-    );
-    // Adjust path to setup script location
-    if (defined('PMA_SETUP')) {
-        foreach ($valid_starts as $key => $value) {
-            if (substr($value, 0, 2) === './') {
-                $valid_starts[$key] = '.' . $value;
-            }
-        }
-    }
-    if ($other) {
-        $valid_starts[] = 'mailto:';
-        $valid_starts[] = 'ftp://';
-    }
-    if ($http) {
-        $valid_starts[] = 'http://';
-    }
-    if (defined('PMA_SETUP')) {
-        $valid_starts[] = '?page=form&';
-        $valid_starts[] = '?page=servers&';
-    }
-    foreach ($valid_starts as $val) {
-        if (substr($url, 0, strlen($val)) == $val) {
-            return true;
-        }
-    }
-    return false;
-}
-
-/**
- * Callback function for replacing [a@link@target] links in bb code.
- *
- * @param array $found Array of preg matches
- *
- * @return string Replaced string
- */
-function PMA_replaceBBLink($found)
-{
-    /* Check for valid link */
-    if (! PMA_checkLink($found[1])) {
-        return $found[0];
-    }
-    /* a-z and _ allowed in target */
-    if (! empty($found[3]) && preg_match('/[^a-z_]+/i', $found[3])) {
-        return $found[0];
-    }
-
-    /* Construct target */
-    $target = '';
-    if (! empty($found[3])) {
-        $target = ' target="' . $found[3] . '"';
-        if ($found[3] == '_blank') {
-            $target .= ' rel="noopener noreferrer"';
-        }
-    }
-
-    /* Construct url */
-    if (substr($found[1], 0, 4) == 'http') {
-        $url = PMA_linkURL($found[1]);
-    } else {
-        $url = $found[1];
-    }
-
-    return '<a href="' . $url . '"' . $target . '>';
-}
-
-/**
- * Callback function for replacing [doc@anchor] links in bb code.
- *
- * @param array $found Array of preg matches
- *
- * @return string Replaced string
- */
-function PMA_replaceDocLink($found)
-{
-    if (count($found) >= 4) {
-        $page = $found[1];
-        $anchor = $found[3];
-    } else {
-        $anchor = $found[1];
-        if (strncmp('faq', $anchor, 3) == 0) {
-            $page = 'faq';
-        } else if (strncmp('cfg', $anchor, 3) == 0) {
-            $page = 'config';
-        } else {
-            /* Guess */
-            $page = 'setup';
-        }
-    }
-    $link = PMA\libraries\Util::getDocuLink($page, $anchor);
-    return '<a href="' . $link . '" target="documentation">';
-}
-
-/**
- * Sanitizes $message, taking into account our special codes
- * for formatting.
- *
- * If you want to include result in element attribute, you should escape it.
- *
- * Examples:
- *
- * <p><?php echo PMA_sanitize($foo); ?></p>
- *
- * <a title="<?php echo PMA_sanitize($foo, true); ?>">bar</a>
- *
- * @param string  $message the message
- * @param boolean $escape  whether to escape html in result
- * @param boolean $safe    whether string is safe (can keep < and > chars)
- *
- * @return string   the sanitized message
- */
-function PMA_sanitize($message, $escape = false, $safe = false)
-{
-    if (!$safe) {
-        $message = strtr($message, array('<' => '&lt;', '>' => '&gt;'));
-    }
-
-    /* Interpret bb code */
-    $replace_pairs = array(
-        '[em]'      => '<em>',
-        '[/em]'     => '</em>',
-        '[strong]'  => '<strong>',
-        '[/strong]' => '</strong>',
-        '[code]'    => '<code>',
-        '[/code]'   => '</code>',
-        '[kbd]'     => '<kbd>',
-        '[/kbd]'    => '</kbd>',
-        '[br]'      => '<br />',
-        '[/a]'      => '</a>',
-        '[/doc]'      => '</a>',
-        '[sup]'     => '<sup>',
-        '[/sup]'    => '</sup>',
-         // used in common.inc.php:
-        '[conferr]' => '<iframe src="show_config_errors.php"><a href="show_config_errors.php">show_config_errors.php</a></iframe>',
-         // used in libraries/Util.php
-        '[dochelpicon]' => PMA\libraries\Util::getImage('b_help.png', __('Documentation')),
-    );
-
-    $message = strtr($message, $replace_pairs);
-
-    /* Match links in bb code ([a@url@target], where @target is options) */
-    $pattern = '/\[a@([^]"@]*)(@([^]"]*))?\]/';
-
-    /* Find and replace all links */
-    $message = preg_replace_callback($pattern, 'PMA_replaceBBLink', $message);
-
-    /* Replace documentation links */
-    $message = preg_replace_callback(
-        '/\[doc@([a-zA-Z0-9_-]+)(@([a-zA-Z0-9_-]*))?\]/',
-        'PMA_replaceDocLink',
-        $message
-    );
-
-    /* Possibly escape result */
-    if ($escape) {
-        $message = htmlspecialchars($message);
-    }
-
-    return $message;
-}
-
-
-/**
- * Sanitize a filename by removing anything besides legit characters
- *
- * Intended usecase:
- *    When using a filename in a Content-Disposition header
- *    the value should not contain ; or "
- *
- *    When exporting, avoiding generation of an unexpected double-extension file
- *
- * @param string  $filename    The filename
- * @param boolean $replaceDots Whether to also replace dots
- *
- * @return string  the sanitized filename
- *
- */
-function PMA_sanitizeFilename($filename, $replaceDots = false)
-{
-    $pattern = '/[^A-Za-z0-9_';
-    // if we don't have to replace dots
-    if (! $replaceDots) {
-        // then add the dot to the list of legit characters
-        $pattern .= '.';
-    }
-    $pattern .= '-]/';
-    $filename = preg_replace($pattern, '_', $filename);
-    return $filename;
-}
-
diff --git a/#pma/libraries/select_server.lib.php b/#pma/libraries/select_server.lib.php
deleted file mode 100644
index 63e1a690..00000000
--- a/#pma/libraries/select_server.lib.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Code for displaying server selection
- *
- * @package PhpMyAdmin
- */
-
-/**
- * Renders the server selection in list or selectbox form, or option tags only
- *
- * @param boolean $not_only_options whether to include form tags or not
- * @param boolean $omit_fieldset    whether to omit fieldset tag or not
- *
- * @return string
- */
-function PMA_selectServer($not_only_options, $omit_fieldset)
-{
-    $retval = '';
-
-    // Show as list?
-    if ($not_only_options) {
-        $list = $GLOBALS['cfg']['DisplayServersList'];
-        $not_only_options =! $list;
-    } else {
-        $list = false;
-    }
-
-    if ($not_only_options) {
-        $retval .= '<form method="post" action="'
-            . PMA\libraries\Util::getScriptNameForOption(
-                $GLOBALS['cfg']['DefaultTabServer'], 'server'
-            )
-            . '" class="disableAjax">';
-
-        if (! $omit_fieldset) {
-            $retval .= '<fieldset>';
-        }
-        $retval .= '<label for="select_server">'
-            . __('Current server:') . '</label> ';
-
-        $retval .= '<select name="server" id="select_server" class="autosubmit">';
-        $retval .= '<option value="">(' . __('Servers') . ') ...</option>' . "\n";
-    } elseif ($list) {
-        $retval .= __('Current server:') . '<br />';
-        $retval .= '<ul id="list_server">';
-    }
-
-    foreach ($GLOBALS['cfg']['Servers'] as $key => $server) {
-        if (empty($server['host'])) {
-            continue;
-        }
-
-        if (!empty($GLOBALS['server']) && (int) $GLOBALS['server'] === (int) $key) {
-            $selected = 1;
-        } else {
-            $selected = 0;
-        }
-        if (!empty($server['verbose'])) {
-            $label = $server['verbose'];
-        } else {
-            $label = $server['host'];
-            if (!empty($server['port'])) {
-                $label .= ':' . $server['port'];
-            }
-        }
-        if (! empty($server['only_db'])) {
-            if (! is_array($server['only_db'])) {
-                $label .= ' - ' . $server['only_db'];
-                // try to avoid displaying a too wide selector
-            } elseif (count($server['only_db']) < 4) {
-                $label .= ' - ' . implode(', ', $server['only_db']);
-            }
-        }
-        if (!empty($server['user']) && $server['auth_type'] == 'config') {
-            $label .= '  (' . $server['user'] . ')';
-        }
-
-        if ($list) {
-            $retval .= '<li>';
-            if ($selected) {
-                $retval .= '<strong>' . htmlspecialchars($label) . '</strong>';
-            } else {
-
-                $retval .= '<a class="disableAjax item" href="'
-                    . PMA\libraries\Util::getScriptNameForOption(
-                        $GLOBALS['cfg']['DefaultTabServer'], 'server'
-                    )
-                    . PMA_URL_getCommon(array('server' => $key))
-                    . '" >' . htmlspecialchars($label) . '</a>';
-            }
-            $retval .= '</li>';
-        } else {
-            $retval .= '<option value="' . $key . '" '
-                . ($selected ? ' selected="selected"' : '') . '>'
-                . htmlspecialchars($label) . '</option>' . "\n";
-        }
-    } // end while
-
-    if ($not_only_options) {
-        $retval .= '</select>';
-        if (! $omit_fieldset) {
-            $retval .= '</fieldset>';
-        }
-        $retval .= '</form>';
-    } elseif ($list) {
-        $retval .= '</ul>';
-    }
-
-    return $retval;
-}
diff --git a/#pma/libraries/server_common.inc.php b/#pma/libraries/server_common.inc.php
deleted file mode 100644
index 8661fb2f..00000000
--- a/#pma/libraries/server_common.inc.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Shared code for server pages
- *
- * @package PhpMyAdmin
- */
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
-/**
- * Handles some variables that may have been sent by the calling script
- * Note: this can be called also from the db panel to get the privileges of
- *       a db, in which case we want to keep displaying the tabs of
- *       the Database panel
- */
-if (empty($viewing_mode)) {
-    $db = $table = '';
-}
-
-/**
- * Set parameters for links
- */
-$GLOBALS['url_query'] = PMA_URL_getCommon(array('db' => $db));
-
-/**
- * Defines the urls to return to in case of error in a sql statement
- */
-$err_url = 'index.php' . $GLOBALS['url_query'];
-
-/**
- * @global boolean Checks for superuser privileges
- */
-$GLOBALS['is_superuser'] = $GLOBALS['dbi']->isSuperuser();
-$GLOBALS['is_grantuser'] = $GLOBALS['dbi']->isUserType('grant');
-$GLOBALS['is_createuser'] = $GLOBALS['dbi']->isUserType('create');
-
-// now, select the mysql db
-if ($GLOBALS['is_superuser']) {
-    $GLOBALS['dbi']->selectDb('mysql', $GLOBALS['userlink']);
-}
-
-PMA\libraries\Util::checkParameters(
-    array('is_superuser', 'url_query'), false
-);
-
-/**
- * shared functions for server page
- */
-require_once './libraries/server_common.lib.php';
-
diff --git a/#pma/libraries/server_common.lib.php b/#pma/libraries/server_common.lib.php
deleted file mode 100644
index 7e3a2ca9..00000000
--- a/#pma/libraries/server_common.lib.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Shared code for server pages
- *
- * @package PhpMyAdmin
- */
-
-/**
- * Returns the html for the sub-page heading
- *
- * @param string $type     Sub page type
- * @param string $link     Link to the official MySQL documentation
- * @param bool   $is_image Display image or icon, true: image, false: icon
- *
- * @return string
- */
-function PMA_getHtmlForSubPageHeader($type, $link='', $is_image=true)
-{
-    //array contains Sub page icon and text
-    $header = array();
-
-    $header['variables']['image'] = 's_vars.png';
-    $header['variables']['text'] = __('Server variables and settings');
-
-    $header['engines']['image'] = 'b_engine.png';
-    $header['engines']['text'] = __('Storage Engines');
-
-    $header['plugins']['image'] = 'b_engine.png';
-    $header['plugins']['text'] = __('Plugins');
-
-    $header['binlog']['image'] = 's_tbl.png';
-    $header['binlog']['text'] = __('Binary log');
-
-    $header['collations']['image'] = 's_asci.png';
-    $header['collations']['text'] = __('Character Sets and Collations');
-
-    $header['replication']['image'] = 's_replication.png';
-    $header['replication']['text'] = __('Replication');
-
-    $header['database_statistics']['image'] = 's_db.png';
-    $header['database_statistics']['text'] = __('Databases statistics');
-
-    $header['databases']['image'] = 's_db.png';
-    $header['databases']['text'] = __('Databases');
-
-    $header['privileges']['image'] = 'b_usrlist.png';
-    $header['privileges']['text'] = __('Privileges');
-
-    if ($is_image) {
-        $html = '<h2>' . "\n"
-            . PMA\libraries\Util::getImage($header[$type]['image'])
-            . '    ' . $header[$type]['text'] . "\n"
-            . $link . '</h2>' . "\n";
-    } else {
-        $html = '<h2>' . "\n"
-            . PMA\libraries\Util::getIcon($header[$type]['image'])
-            . '    ' . $header[$type]['text'] . "\n"
-            . $link . '</h2>' . "\n";
-    }
-    return $html;
-}
-
diff --git a/#pma/libraries/server_privileges.lib.php b/#pma/libraries/server_privileges.lib.php
deleted file mode 100644
index c328dd49..00000000
--- a/#pma/libraries/server_privileges.lib.php
+++ /dev/null
@@ -1,5485 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * set of functions with the Privileges section in pma
- *
- * @package PhpMyAdmin
- */
-use PMA\libraries\DatabaseInterface;
-use PMA\libraries\Message;
-use PMA\libraries\Template;
-use PMA\libraries\Util;
-
-/**
- * Get Html for User Group Dialog
- *
- * @param string $username     username
- * @param bool   $is_menuswork Is menuswork set in configuration
- *
- * @return string html
- */
-function PMA_getHtmlForUserGroupDialog($username, $is_menuswork)
-{
-    $html = '';
-    if (! empty($_REQUEST['edit_user_group_dialog']) && $is_menuswork) {
-        $dialog = PMA_getHtmlToChooseUserGroup($username);
-        $response = PMA\libraries\Response::getInstance();
-        if ($GLOBALS['is_ajax_request']) {
-            $response->addJSON('message', $dialog);
-            exit;
-        } else {
-            $html .= $dialog;
-        }
-    }
-
-    return $html;
-}
-
-/**
- * Escapes wildcard in a database+table specification
- * before using it in a GRANT statement.
- *
- * Escaping a wildcard character in a GRANT is only accepted at the global
- * or database level, not at table level; this is why I remove
- * the escaping character. Internally, in mysql.tables_priv.Db there are
- * no escaping (for example test_db) but in mysql.db you'll see test\_db
- * for a db-specific privilege.
- *
- * @param string $dbname    Database name
- * @param string $tablename Table name
- *
- * @return string the escaped (if necessary) database.table
- */
-function PMA_wildcardEscapeForGrant($dbname, $tablename)
-{
-    if (!mb_strlen($dbname)) {
-        $db_and_table = '*.*';
-    } else {
-        if (mb_strlen($tablename)) {
-            $db_and_table = Util::backquote(
-                Util::unescapeMysqlWildcards($dbname)
-            )
-            . '.' . Util::backquote($tablename);
-        } else {
-            $db_and_table = Util::backquote($dbname) . '.*';
-        }
-    }
-    return $db_and_table;
-}
-
-/**
- * Generates a condition on the user name
- *
- * @param string $initial the user's initial
- *
- * @return string   the generated condition
- */
-function PMA_rangeOfUsers($initial = '')
-{
-    // strtolower() is used because the User field
-    // might be BINARY, so LIKE would be case sensitive
-    if ($initial === null || $initial === '') {
-        return '';
-    }
-
-    $ret = " WHERE `User` LIKE '"
-        . $GLOBALS['dbi']->escapeString($initial) . "%'"
-        . " OR `User` LIKE '"
-        . $GLOBALS['dbi']->escapeString(mb_strtolower($initial))
-        . "%'";
-    return $ret;
-} // end function
-
-/**
- * Formats privilege name for a display
- *
- * @param array   $privilege Privilege information
- * @param boolean $html      Whether to use HTML
- *
- * @return string
- */
-function PMA_formatPrivilege($privilege, $html)
-{
-    if ($html) {
-        return '<dfn title="' . $privilege[2] . '">'
-            . $privilege[1] . '</dfn>';
-    } else {
-        return $privilege[1];
-    }
-}
-
-/**
- * Parses privileges into an array, it modifies the array
- *
- * @param array &$row Results row from
- *
- * @return void
- */
-function PMA_fillInTablePrivileges(&$row)
-{
-    $row1 = $GLOBALS['dbi']->fetchSingleRow(
-        'SHOW COLUMNS FROM `mysql`.`tables_priv` LIKE \'Table_priv\';',
-        'ASSOC', $GLOBALS['userlink']
-    );
-    // note: in MySQL 5.0.3 we get "Create View', 'Show view';
-    // the View for Create is spelled with uppercase V
-    // the view for Show is spelled with lowercase v
-    // and there is a space between the words
-
-    $av_grants = explode(
-        '\',\'',
-        mb_substr(
-            $row1['Type'],
-            mb_strpos($row1['Type'], '(') + 2,
-            mb_strpos($row1['Type'], ')')
-            - mb_strpos($row1['Type'], '(') - 3
-        )
-    );
-
-    $users_grants = explode(',', $row['Table_priv']);
-
-    foreach ($av_grants as $current_grant) {
-        $row[$current_grant . '_priv']
-            = in_array($current_grant, $users_grants) ? 'Y' : 'N';
-    }
-    unset($row['Table_priv']);
-}
-
-
-/**
- * Extracts the privilege information of a priv table row
- *
- * @param array|null $row        the row
- * @param boolean    $enableHTML add <dfn> tag with tooltips
- * @param boolean    $tablePrivs whether row contains table privileges
- *
- * @global  resource $user_link the database connection
- *
- * @return array
- */
-function PMA_extractPrivInfo($row = null, $enableHTML = false, $tablePrivs = false)
-{
-    if ($tablePrivs) {
-        $grants = PMA_getTableGrantsArray();
-    } else {
-        $grants = PMA_getGrantsArray();
-    }
-
-    if (! is_null($row) && isset($row['Table_priv'])) {
-        PMA_fillInTablePrivileges($row);
-    }
-
-    $privs = array();
-    $allPrivileges = true;
-    foreach ($grants as $current_grant) {
-        if ((! is_null($row) && isset($row[$current_grant[0]]))
-            || (is_null($row) && isset($GLOBALS[$current_grant[0]]))
-        ) {
-            if ((! is_null($row) && $row[$current_grant[0]] == 'Y')
-                || (is_null($row)
-                && ($GLOBALS[$current_grant[0]] == 'Y'
-                || (is_array($GLOBALS[$current_grant[0]])
-                && count($GLOBALS[$current_grant[0]]) == $_REQUEST['column_count']
-                && empty($GLOBALS[$current_grant[0] . '_none']))))
-            ) {
-                $privs[] = PMA_formatPrivilege($current_grant, $enableHTML);
-            } elseif (! empty($GLOBALS[$current_grant[0]])
-                && is_array($GLOBALS[$current_grant[0]])
-                && empty($GLOBALS[$current_grant[0] . '_none'])
-            ) {
-                // Required for proper escaping of ` (backtick) in a column name
-                $grant_cols = array_map(
-                    function($val) {
-                        return Util::backquote($val);
-                    },
-                    $GLOBALS[$current_grant[0]]
-                );
-
-                $privs[] = PMA_formatPrivilege($current_grant, $enableHTML)
-                    . ' (' . join(', ', $grant_cols) . ')';
-            } else {
-                $allPrivileges = false;
-            }
-        }
-    }
-    if (empty($privs)) {
-        if ($enableHTML) {
-            $privs[] = '<dfn title="' . __('No privileges.') . '">USAGE</dfn>';
-        } else {
-            $privs[] = 'USAGE';
-        }
-    } elseif ($allPrivileges
-        && (! isset($_POST['grant_count']) || count($privs) == $_POST['grant_count'])
-    ) {
-        if ($enableHTML) {
-            $privs = array('<dfn title="'
-                . __('Includes all privileges except GRANT.')
-                . '">ALL PRIVILEGES</dfn>'
-            );
-        } else {
-            $privs = array('ALL PRIVILEGES');
-        }
-    }
-    return $privs;
-} // end of the 'PMA_extractPrivInfo()' function
-
-/**
- * Returns an array of table grants and their descriptions
- *
- * @return array array of table grants
- */
-function PMA_getTableGrantsArray()
-{
-    return array(
-        array(
-            'Delete',
-            'DELETE',
-            $GLOBALS['strPrivDescDelete']
-        ),
-        array(
-            'Create',
-            'CREATE',
-            $GLOBALS['strPrivDescCreateTbl']
-        ),
-        array(
-            'Drop',
-            'DROP',
-            $GLOBALS['strPrivDescDropTbl']
-        ),
-        array(
-            'Index',
-            'INDEX',
-            $GLOBALS['strPrivDescIndex']
-        ),
-        array(
-            'Alter',
-            'ALTER',
-            $GLOBALS['strPrivDescAlter']
-        ),
-        array(
-            'Create View',
-            'CREATE_VIEW',
-            $GLOBALS['strPrivDescCreateView']
-        ),
-        array(
-            'Show view',
-            'SHOW_VIEW',
-            $GLOBALS['strPrivDescShowView']
-        ),
-        array(
-            'Trigger',
-            'TRIGGER',
-            $GLOBALS['strPrivDescTrigger']
-        ),
-    );
-}
-
-/**
- * Get the grants array which contains all the privilege types
- * and relevant grant messages
- *
- * @return array
- */
-function PMA_getGrantsArray()
-{
-    return array(
-        array(
-            'Select_priv',
-            'SELECT',
-            __('Allows reading data.')
-        ),
-        array(
-            'Insert_priv',
-            'INSERT',
-            __('Allows inserting and replacing data.')
-        ),
-        array(
-            'Update_priv',
-            'UPDATE',
-            __('Allows changing data.')
-        ),
-        array(
-            'Delete_priv',
-            'DELETE',
-            __('Allows deleting data.')
-        ),
-        array(
-            'Create_priv',
-            'CREATE',
-            __('Allows creating new databases and tables.')
-        ),
-        array(
-            'Drop_priv',
-            'DROP',
-            __('Allows dropping databases and tables.')
-        ),
-        array(
-            'Reload_priv',
-            'RELOAD',
-            __('Allows reloading server settings and flushing the server\'s caches.')
-        ),
-        array(
-            'Shutdown_priv',
-            'SHUTDOWN',
-            __('Allows shutting down the server.')
-        ),
-        array(
-            'Process_priv',
-            'PROCESS',
-            __('Allows viewing processes of all users.')
-        ),
-        array(
-            'File_priv',
-            'FILE',
-            __('Allows importing data from and exporting data into files.')
-        ),
-        array(
-            'References_priv',
-            'REFERENCES',
-            __('Has no effect in this MySQL version.')
-        ),
-        array(
-            'Index_priv',
-            'INDEX',
-            __('Allows creating and dropping indexes.')
-        ),
-        array(
-            'Alter_priv',
-            'ALTER',
-            __('Allows altering the structure of existing tables.')
-        ),
-        array(
-            'Show_db_priv',
-            'SHOW DATABASES',
-            __('Gives access to the complete list of databases.')
-        ),
-        array(
-            'Super_priv',
-            'SUPER',
-            __(
-                'Allows connecting, even if maximum number of connections '
-                . 'is reached; required for most administrative operations '
-                . 'like setting global variables or killing threads of other users.'
-            )
-        ),
-        array(
-            'Create_tmp_table_priv',
-            'CREATE TEMPORARY TABLES',
-            __('Allows creating temporary tables.')
-        ),
-        array(
-            'Lock_tables_priv',
-            'LOCK TABLES',
-            __('Allows locking tables for the current thread.')
-        ),
-        array(
-            'Repl_slave_priv',
-            'REPLICATION SLAVE',
-            __('Needed for the replication slaves.')
-        ),
-        array(
-            'Repl_client_priv',
-            'REPLICATION CLIENT',
-            __('Allows the user to ask where the slaves / masters are.')
-        ),
-        array(
-            'Create_view_priv',
-            'CREATE VIEW',
-            __('Allows creating new views.')
-        ),
-        array(
-            'Event_priv',
-            'EVENT',
-            __('Allows to set up events for the event scheduler.')
-        ),
-        array(
-            'Trigger_priv',
-            'TRIGGER',
-            __('Allows creating and dropping triggers.')
-        ),
-        // for table privs:
-        array(
-            'Create View_priv',
-            'CREATE VIEW',
-            __('Allows creating new views.')
-        ),
-        array(
-            'Show_view_priv',
-            'SHOW VIEW',
-            __('Allows performing SHOW CREATE VIEW queries.')
-        ),
-        // for table privs:
-        array(
-            'Show view_priv',
-            'SHOW VIEW',
-            __('Allows performing SHOW CREATE VIEW queries.')
-        ),
-        array(
-            'Create_routine_priv',
-            'CREATE ROUTINE',
-            __('Allows creating stored routines.')
-        ),
-        array(
-            'Alter_routine_priv',
-            'ALTER ROUTINE',
-            __('Allows altering and dropping stored routines.')
-        ),
-        array(
-            'Create_user_priv',
-            'CREATE USER',
-            __('Allows creating, dropping and renaming user accounts.')
-        ),
-        array(
-            'Execute_priv',
-            'EXECUTE',
-            __('Allows executing stored routines.')
-        ),
-    );
-}
-
-/**
- * Displays on which column(s) a table-specific privilege is granted
- *
- * @param array  $columns          columns array
- * @param array  $row              first row from result or boolean false
- * @param string $name_for_select  privilege types - Select_priv, Insert_priv
- *                                 Update_priv, References_priv
- * @param string $priv_for_header  privilege for header
- * @param string $name             privilege name: insert, select, update, references
- * @param string $name_for_dfn     name for dfn
- * @param string $name_for_current name for current
- *
- * @return string $html_output html snippet
- */
-function PMA_getHtmlForColumnPrivileges($columns, $row, $name_for_select,
-    $priv_for_header, $name, $name_for_dfn, $name_for_current
-) {
-    $html_output = '<div class="item" id="div_item_' . $name . '">' . "\n"
-        . '<label for="select_' . $name . '_priv">' . "\n"
-        . '<code><dfn title="' . $name_for_dfn . '">'
-        . $priv_for_header . '</dfn></code>' . "\n"
-        . '</label><br />' . "\n"
-        . '<select id="select_' . $name . '_priv" name="'
-        . $name_for_select . '[]" multiple="multiple" size="8">' . "\n";
-
-    foreach ($columns as $currCol => $currColPrivs) {
-        $html_output .= '<option '
-            . 'value="' . htmlspecialchars($currCol) . '"';
-        if ($row[$name_for_select] == 'Y'
-            || $currColPrivs[$name_for_current]
-        ) {
-            $html_output .= ' selected="selected"';
-        }
-        $html_output .= '>'
-            . htmlspecialchars($currCol) . '</option>' . "\n";
-    }
-
-    $html_output .= '</select>' . "\n"
-        . '<i>' . __('Or') . '</i>' . "\n"
-        . '<label for="checkbox_' . $name_for_select
-        . '_none"><input type="checkbox"'
-        . ' name="' . $name_for_select . '_none" id="checkbox_'
-        . $name_for_select . '_none" title="'
-        . _pgettext('None privileges', 'None') . '" />'
-        . _pgettext('None privileges', 'None') . '</label>' . "\n"
-        . '</div>' . "\n";
-    return $html_output;
-} // end function
-
-/**
- * Get sql query for display privileges table
- *
- * @param string $db       the database
- * @param string $table    the table
- * @param string $username username for database connection
- * @param string $hostname hostname for database connection
- *
- * @return string sql query
- */
-function PMA_getSqlQueryForDisplayPrivTable($db, $table, $username, $hostname)
-{
-    if ($db == '*') {
-        return "SELECT * FROM `mysql`.`user`"
-            . " WHERE `User` = '" . $GLOBALS['dbi']->escapeString($username) . "'"
-            . " AND `Host` = '" . $GLOBALS['dbi']->escapeString($hostname) . "';";
-    } elseif ($table == '*') {
-        return "SELECT * FROM `mysql`.`db`"
-            . " WHERE `User` = '" . $GLOBALS['dbi']->escapeString($username) . "'"
-            . " AND `Host` = '" . $GLOBALS['dbi']->escapeString($hostname) . "'"
-            . " AND '" . $GLOBALS['dbi']->escapeString(Util::unescapeMysqlWildcards($db)) . "'"
-            . " LIKE `Db`;";
-    }
-    return "SELECT `Table_priv`"
-        . " FROM `mysql`.`tables_priv`"
-        . " WHERE `User` = '" . $GLOBALS['dbi']->escapeString($username) . "'"
-        . " AND `Host` = '" . $GLOBALS['dbi']->escapeString($hostname) . "'"
-        . " AND `Db` = '" . $GLOBALS['dbi']->escapeString(Util::unescapeMysqlWildcards($db)) . "'"
-        . " AND `Table_name` = '" . $GLOBALS['dbi']->escapeString($table) . "';";
-}
-
-/**
- * Displays a dropdown to select the user group
- * with menu items configured to each of them.
- *
- * @param string $username username
- *
- * @return string html to select the user group
- */
-function PMA_getHtmlToChooseUserGroup($username)
-{
-    $html_output = '<form class="ajax" id="changeUserGroupForm"'
-            . ' action="server_privileges.php" method="post">';
-    $params = array('username' => $username);
-    $html_output .= PMA_URL_getHiddenInputs($params);
-    $html_output .= '<fieldset id="fieldset_user_group_selection">';
-    $html_output .= '<legend>' . __('User group') . '</legend>';
-
-    $cfgRelation = PMA_getRelationsParam();
-    $groupTable = Util::backquote($cfgRelation['db'])
-        . "." . Util::backquote($cfgRelation['usergroups']);
-    $userTable = Util::backquote($cfgRelation['db'])
-        . "." . Util::backquote($cfgRelation['users']);
-
-    $userGroups = array();
-    $sql_query = "SELECT DISTINCT `usergroup` FROM " . $groupTable;
-    $result = PMA_queryAsControlUser($sql_query, false);
-    if ($result) {
-        while ($row = $GLOBALS['dbi']->fetchRow($result)) {
-            $userGroups[] = $row[0];
-        }
-    }
-    $GLOBALS['dbi']->freeResult($result);
-
-    $userGroup = '';
-    if (isset($GLOBALS['username'])) {
-        $sql_query = "SELECT `usergroup` FROM " . $userTable
-            . " WHERE `username` = '" . $GLOBALS['dbi']->escapeString($username) . "'";
-        $userGroup = $GLOBALS['dbi']->fetchValue(
-            $sql_query, 0, 0, $GLOBALS['controllink']
-        );
-    }
-
-    $html_output .= __('User group') . ': ';
-    $html_output .= '<select name="userGroup">';
-    $html_output .= '<option value=""></option>';
-    foreach ($userGroups as $oneUserGroup) {
-        $html_output .= '<option value="' . htmlspecialchars($oneUserGroup) . '"'
-            . ($oneUserGroup == $userGroup ? ' selected="selected"' : '')
-            . '>'
-            . htmlspecialchars($oneUserGroup)
-            . '</option>';
-    }
-    $html_output .= '</select>';
-    $html_output .= '<input type="hidden" name="changeUserGroup" value="1">';
-    $html_output .= '</fieldset>';
-    $html_output .= '</form>';
-    return $html_output;
-}
-
-/**
- * Sets the user group from request values
- *
- * @param string $username  username
- * @param string $userGroup user group to set
- *
- * @return void
- */
-function PMA_setUserGroup($username, $userGroup)
-{
-    $cfgRelation = PMA_getRelationsParam();
-    $userTable = Util::backquote($cfgRelation['db'])
-        . "." . Util::backquote($cfgRelation['users']);
-
-    $sql_query = "SELECT `usergroup` FROM " . $userTable
-        . " WHERE `username` = '" . $GLOBALS['dbi']->escapeString($username) . "'";
-    $oldUserGroup = $GLOBALS['dbi']->fetchValue(
-        $sql_query, 0, 0, $GLOBALS['controllink']
-    );
-
-    if ($oldUserGroup === false) {
-        $upd_query = "INSERT INTO " . $userTable . "(`username`, `usergroup`)"
-            . " VALUES ('" . $GLOBALS['dbi']->escapeString($username) . "', "
-            . "'" . $GLOBALS['dbi']->escapeString($userGroup) . "')";
-    } else {
-        if (empty($userGroup)) {
-            $upd_query = "DELETE FROM " . $userTable
-                . " WHERE `username`='" . $GLOBALS['dbi']->escapeString($username) . "'";
-        } elseif ($oldUserGroup != $userGroup) {
-            $upd_query = "UPDATE " . $userTable
-                . " SET `usergroup`='" . $GLOBALS['dbi']->escapeString($userGroup) . "'"
-                . " WHERE `username`='" . $GLOBALS['dbi']->escapeString($username) . "'";
-        }
-    }
-    if (isset($upd_query)) {
-        PMA_queryAsControlUser($upd_query);
-    }
-}
-
-/**
- * Displays the privileges form table
- *
- * @param string  $db     the database
- * @param string  $table  the table
- * @param boolean $submit whether to display the submit button or not
- *
- * @global  array     $cfg         the phpMyAdmin configuration
- * @global  resource  $user_link   the database connection
- *
- * @return string html snippet
- */
-function PMA_getHtmlToDisplayPrivilegesTable($db = '*',
-    $table = '*', $submit = true
-) {
-    $html_output = '';
-    $sql_query = '';
-
-    if ($db == '*') {
-        $table = '*';
-    }
-
-    if (isset($GLOBALS['username'])) {
-        $username = $GLOBALS['username'];
-        $hostname = $GLOBALS['hostname'];
-        $sql_query = PMA_getSqlQueryForDisplayPrivTable(
-            $db, $table, $username, $hostname
-        );
-        $row = $GLOBALS['dbi']->fetchSingleRow($sql_query);
-    }
-    if (empty($row)) {
-        if ($table == '*' && $GLOBALS['is_superuser']) {
-            if ($db == '*') {
-                $sql_query = 'SHOW COLUMNS FROM `mysql`.`user`;';
-            } elseif ($table == '*') {
-                $sql_query = 'SHOW COLUMNS FROM `mysql`.`db`;';
-            }
-            $res = $GLOBALS['dbi']->query($sql_query);
-            while ($row1 = $GLOBALS['dbi']->fetchRow($res)) {
-                if (mb_substr($row1[0], 0, 4) == 'max_') {
-                    $row[$row1[0]] = 0;
-                } elseif (mb_substr($row1[0], 0, 5) == 'x509_'
-                    || mb_substr($row1[0], 0, 4) == 'ssl_'
-                ) {
-                    $row[$row1[0]] = '';
-                } else {
-                    $row[$row1[0]] = 'N';
-                }
-            }
-            $GLOBALS['dbi']->freeResult($res);
-        } elseif ($table == '*') {
-            $row = array();
-        } else {
-            $row = array('Table_priv' => '');
-        }
-    }
-    if (isset($row['Table_priv'])) {
-        PMA_fillInTablePrivileges($row);
-
-        // get columns
-        $res = $GLOBALS['dbi']->tryQuery(
-            'SHOW COLUMNS FROM '
-            . Util::backquote(
-                Util::unescapeMysqlWildcards($db)
-            )
-            . '.' . Util::backquote($table) . ';'
-        );
-        $columns = array();
-        if ($res) {
-            while ($row1 = $GLOBALS['dbi']->fetchRow($res)) {
-                $columns[$row1[0]] = array(
-                    'Select' => false,
-                    'Insert' => false,
-                    'Update' => false,
-                    'References' => false
-                );
-            }
-            $GLOBALS['dbi']->freeResult($res);
-        }
-        unset($res, $row1);
-    }
-    // table-specific privileges
-    if (! empty($columns)) {
-        $html_output .= PMA_getHtmlForTableSpecificPrivileges(
-            $username, $hostname, $db, $table, $columns, $row
-        );
-    } else {
-        // global or db-specific
-        $html_output .= PMA_getHtmlForGlobalOrDbSpecificPrivs($db, $table, $row);
-    }
-    $html_output .= '</fieldset>' . "\n";
-    if ($submit) {
-        $html_output .= '<fieldset id="fieldset_user_privtable_footer" '
-            . 'class="tblFooters">' . "\n"
-            . '<input type="hidden" name="update_privs" value="1" />' . "\n"
-            . '<input type="submit" value="' . __('Go') . '" />' . "\n"
-            . '</fieldset>' . "\n";
-    }
-    return $html_output;
-} // end of the 'PMA_displayPrivTable()' function
-
-/**
- * Get HTML for "Require"
- *
- * @param array $row privilege array
- *
- * @return string html snippet
- */
-function PMA_getHtmlForRequires($row)
-{
-    $html_output  = '<fieldset>';
-    $html_output .= '<legend>SSL</legend>';
-
-    $html_output .= '<div id="require_ssl_div">';
-
-    // REQUIRE NONE
-    $html_output .= '<div class="item">';
-    $html_output .= '<input type="radio" name="ssl_type" id="ssl_type_NONE"'
-        . ' value="NONE" title="'
-        . __(
-            'Does not require SSL-encrypted connections.'
-        )
-        . '"'
-        . ((isset($row['ssl_type'])
-            && ($row['ssl_type'] == 'NONE'
-                || $row['ssl_type'] == ''))
-            ? ' checked="checked"'
-            : ''
-        )
-        . '/>';
-
-    $html_output .= '<label for="ssl_type_NONE"><code>'
-        . 'REQUIRE NONE'
-        . '</code></label>';
-    $html_output .= '</div>';
-
-    // REQUIRE SSL
-    $html_output .= '<div class="item">';
-    $html_output .= '<input type="radio" name="ssl_type" id="ssl_type_ANY"'
-        . ' value="ANY" title="'
-        . __(
-            'Requires SSL-encrypted connections.'
-        )
-        . '"'
-        . ((isset($row['ssl_type'])
-            && $row['ssl_type'] == 'ANY')
-            ? ' checked="checked"'
-            : ''
-        )
-        . '/>';
-
-    $html_output .= '<label for="ssl_type_ANY"><code>'
-        . 'REQUIRE SSL'
-        . '</code></label>';
-    $html_output .= '</div>';
-
-    // REQUIRE X509
-    $html_output .= '<div class="item">';
-    $html_output .= '<input type="radio" name="ssl_type" id="ssl_type_X509"'
-        . ' value="X509" title="'
-        . __(
-            'Requires a valid X509 certificate.'
-        )
-        . '"'
-        . ((isset($row['ssl_type']) && $row['ssl_type'] == 'X509')
-            ? ' checked="checked"'
-            : ''
-        )
-        . '/>';
-
-    $html_output .= '<label for="ssl_type_X509"><code>'
-        . 'REQUIRE X509'
-        . '</code></label>';
-    $html_output .= '</div>';
-
-    // Specified
-    $specified = (isset($row['ssl_type']) && $row['ssl_type'] == 'SPECIFIED');
-    $html_output .= '<div class="item">';
-    $html_output .= '<input type="radio" name="ssl_type" id="ssl_type_specified"'
-        . ' value="SPECIFIED"' . ($specified ? ' checked="checked"' : '') . '/>';
-
-    $html_output .= '<label for="ssl_type_specified"><code>'
-        . 'SPECIFIED'
-        . '</code></label>';
-    $html_output .= '</div>';
-
-    $html_output .= '<div id="specified_div" style="padding-left:20px;">';
-
-    // REQUIRE CIPHER
-    $html_output .= '<div class="item">';
-    $html_output .= '<label for="text_ssl_cipher">'
-        . '<code><dfn title="'
-        . __(
-            'Requires that a specific cipher method be used for a connection.'
-        )
-        . '">'
-        . 'REQUIRE CIPHER'
-        . '</dfn></code></label>';
-    $html_output .= '<input type="text" name="ssl_cipher" id="text_ssl_cipher" '
-        . 'value="' . (isset($row['ssl_cipher']) ? htmlspecialchars($row['ssl_cipher']) : '') . '" '
-        . 'size=80" title="'
-        . __(
-            'Requires that a specific cipher method be used for a connection.'
-        ) . '"'
-        . (! $specified ? ' disabled' : '')
-        . ' />';
-    $html_output .= '</div>';
-
-    // REQUIRE ISSUER
-    $html_output .= '<div class="item">';
-    $html_output .= '<label for="text_x509_issuer">'
-        . '<code><dfn title="'
-        . __(
-            'Requires that a valid X509 certificate issued by this CA be presented.'
-        )
-        . '">'
-        . 'REQUIRE ISSUER'
-        . '</dfn></code></label>';
-    $html_output .= '<input type="text" name="x509_issuer" id="text_x509_issuer" '
-        . 'value="' . (isset($row['x509_issuer']) ? htmlspecialchars($row['x509_issuer']) : '') . '" '
-        . 'size=80" title="'
-        . __(
-            'Requires that a valid X509 certificate issued by this CA be presented.'
-        ) . '"'
-        . (! $specified ? ' disabled' : '')
-        . ' />';
-    $html_output .= '</div>';
-
-    // REQUIRE SUBJECT
-    $html_output .= '<div class="item">';
-    $html_output .= '<label for="text_x509_subject">'
-        . '<code><dfn title="'
-        . __(
-            'Requires that a valid X509 certificate with this subject be presented.'
-        )
-        . '">'
-        . 'REQUIRE SUBJECT'
-        . '</dfn></code></label>';
-    $html_output .= '<input type="text" name="x509_subject" id="text_x509_subject" '
-        . 'value="' . (isset($row['x509_subject']) ? htmlspecialchars($row['x509_subject']) : '')
-        . '" size=80" title="'
-        . __(
-            'Requires that a valid X509 certificate with this subject be presented.'
-        ) . '"'
-        . (! $specified ? ' disabled' : '')
-        . ' />';
-    $html_output .= '</div>';
-
-    $html_output .= '</div>';
-
-    $html_output .= '</div>';
-    $html_output .= '</fieldset>';
-
-    return $html_output;
-}
-
-/**
- * Get HTML for "Resource limits"
- *
- * @param array $row first row from result or boolean false
- *
- * @return string html snippet
- */
-function PMA_getHtmlForResourceLimits($row)
-{
-    $html_output = '<fieldset>' . "\n"
-        . '<legend>' . __('Resource limits') . '</legend>' . "\n"
-        . '<p><small>'
-        . '<i>' . __('Note: Setting these options to 0 (zero) removes the limit.')
-        . '</i></small></p>' . "\n";
-
-    $html_output .= '<div class="item">' . "\n"
-        . '<label for="text_max_questions">'
-        . '<code><dfn title="'
-        . __(
-            'Limits the number of queries the user may send to the server per hour.'
-        )
-        . '">'
-        . 'MAX QUERIES PER HOUR'
-        . '</dfn></code></label>' . "\n"
-        . '<input type="number" name="max_questions" id="text_max_questions" '
-        . 'value="'
-        . (isset($row['max_questions']) ? $row['max_questions'] : '0')
-        . '" min="0" '
-        . 'title="'
-        . __(
-            'Limits the number of queries the user may send to the server per hour.'
-        )
-        . '" />' . "\n"
-        . '</div>' . "\n";
-
-    $html_output .= '<div class="item">' . "\n"
-        . '<label for="text_max_updates">'
-        . '<code><dfn title="'
-        . __(
-            'Limits the number of commands that change any table '
-            . 'or database the user may execute per hour.'
-        ) . '">'
-        . 'MAX UPDATES PER HOUR'
-        . '</dfn></code></label>' . "\n"
-        . '<input type="number" name="max_updates" id="text_max_updates" '
-        . 'value="'
-        . (isset($row['max_updates']) ? $row['max_updates'] : '0')
-        . '" min="0" '
-        . 'title="'
-        . __(
-            'Limits the number of commands that change any table '
-            . 'or database the user may execute per hour.'
-        )
-        . '" />' . "\n"
-        . '</div>' . "\n";
-
-    $html_output .= '<div class="item">' . "\n"
-        . '<label for="text_max_connections">'
-        . '<code><dfn title="'
-        . __(
-            'Limits the number of new connections the user may open per hour.'
-        ) . '">'
-        . 'MAX CONNECTIONS PER HOUR'
-        . '</dfn></code></label>' . "\n"
-        . '<input type="number" name="max_connections" id="text_max_connections" '
-        . 'value="'
-        . (isset($row['max_connections']) ? $row['max_connections'] : '0')
-        . '" min="0" '
-        . 'title="' . __(
-            'Limits the number of new connections the user may open per hour.'
-        )
-        . '" />' . "\n"
-        . '</div>' . "\n";
-
-    $html_output .= '<div class="item">' . "\n"
-        . '<label for="text_max_user_connections">'
-        . '<code><dfn title="'
-        . __('Limits the number of simultaneous connections the user may have.')
-        . '">'
-        . 'MAX USER_CONNECTIONS'
-        . '</dfn></code></label>' . "\n"
-        . '<input type="number" name="max_user_connections" '
-        . 'id="text_max_user_connections" '
-        . 'value="'
-        . (isset($row['max_user_connections']) ? $row['max_user_connections'] : '0')
-        . '" '
-        . 'title="'
-        . __('Limits the number of simultaneous connections the user may have.')
-        . '" />' . "\n"
-        . '</div>' . "\n";
-
-    $html_output .= '</fieldset>' . "\n";
-
-    return $html_output;
-}
-
-/**
- * Get the HTML snippet for routine specific privileges
- *
- * @param string $username   username for database connection
- * @param string $hostname   hostname for database connection
- * @param string $db         the database
- * @param string $routine    the routine
- * @param string $url_dbname url encoded db name
- *
- * @return string $html_output
- */
-function PMA_getHtmlForRoutineSpecificPrivilges(
-    $username, $hostname, $db, $routine, $url_dbname
-) {
-    $header = PMA_getHtmlHeaderForUserProperties(
-        false, $url_dbname, $db, $username, $hostname,
-        $routine, 'routine'
-    );
-
-    $sql = "SELECT `Proc_priv`"
-        . " FROM `mysql`.`procs_priv`"
-        . " WHERE `User` = '" . $GLOBALS['dbi']->escapeString($username) . "'"
-        . " AND `Host` = '" . $GLOBALS['dbi']->escapeString($hostname) . "'"
-        . " AND `Db` = '"
-        . $GLOBALS['dbi']->escapeString(Util::unescapeMysqlWildcards($db)) . "'"
-        . " AND `Routine_name` LIKE '" . $GLOBALS['dbi']->escapeString($routine) . "';";
-    $res = $GLOBALS['dbi']->fetchValue($sql);
-
-    $privs = array(
-        'Alter_routine_priv' => 'N',
-        'Execute_priv'       => 'N',
-        'Grant_priv'         => 'N',
-    );
-    foreach (explode(',', $res) as $priv) {
-        if ($priv == 'Alter Routine') {
-            $privs['Alter_routine_priv'] = 'Y';
-        } else {
-            $privs[$priv . '_priv'] = 'Y';
-        }
-    }
-
-    $routineArray   = array(PMA_getTriggerPrivilegeTable());
-    $privTableNames = array(__('Routine'));
-    $privCheckboxes = PMA_getHtmlForGlobalPrivTableWithCheckboxes(
-        $routineArray, $privTableNames, $privs
-    );
-
-    $data = array(
-        'username'       => $username,
-        'hostname'       => $hostname,
-        'database'       => $db,
-        'routine'        => $routine,
-        'grantCount'     => count($privs),
-        'privCheckboxes' => $privCheckboxes,
-        'header'         => $header,
-    );
-    $html_output = Template::get('privileges/edit_routine_privileges')
-        ->render($data);
-
-    return $html_output;
-}
-
-/**
- * Get routine privilege table as an array
- *
- * @return privilege type array
- */
-function PMA_getTriggerPrivilegeTable()
-{
-    $routinePrivTable = array(
-        array(
-            'Grant',
-            'GRANT',
-            __(
-                'Allows user to give to other users or remove from other users '
-                . 'privileges that user possess on this routine.'
-            )
-        ),
-        array(
-            'Alter_routine',
-            'ALTER ROUTINE',
-            __('Allows altering and dropping this routine.')
-        ),
-        array(
-            'Execute',
-            'EXECUTE',
-            __('Allows executing this routine.')
-        )
-    );
-    return $routinePrivTable;
-}
-
-/**
- * Get the HTML snippet for table specific privileges
- *
- * @param string $username username for database connection
- * @param string $hostname hostname for database connection
- * @param string $db       the database
- * @param string $table    the table
- * @param array  $columns  columns array
- * @param array  $row      current privileges row
- *
- * @return string $html_output
- */
-function PMA_getHtmlForTableSpecificPrivileges(
-    $username, $hostname, $db, $table, $columns, $row
-) {
-    $res = $GLOBALS['dbi']->query(
-        'SELECT `Column_name`, `Column_priv`'
-        . ' FROM `mysql`.`columns_priv`'
-        . ' WHERE `User`'
-        . ' = \'' . $GLOBALS['dbi']->escapeString($username) . "'"
-        . ' AND `Host`'
-        . ' = \'' . $GLOBALS['dbi']->escapeString($hostname) . "'"
-        . ' AND `Db`'
-        . ' = \'' . $GLOBALS['dbi']->escapeString(
-            Util::unescapeMysqlWildcards($db)
-        ) . "'"
-        . ' AND `Table_name`'
-        . ' = \'' . $GLOBALS['dbi']->escapeString($table) . '\';'
-    );
-
-    while ($row1 = $GLOBALS['dbi']->fetchRow($res)) {
-        $row1[1] = explode(',', $row1[1]);
-        foreach ($row1[1] as $current) {
-            $columns[$row1[0]][$current] = true;
-        }
-    }
-    $GLOBALS['dbi']->freeResult($res);
-    unset($res, $row1, $current);
-
-    $html_output = '<input type="hidden" name="grant_count" '
-        . 'value="' . count($row) . '" />' . "\n"
-        . '<input type="hidden" name="column_count" '
-        . 'value="' . count($columns) . '" />' . "\n"
-        . '<fieldset id="fieldset_user_priv">' . "\n"
-        . '<legend data-submenu-label="' . __('Table') . '">' . __('Table-specific privileges')
-        . '</legend>'
-        . '<p><small><i>'
-        . __('Note: MySQL privilege names are expressed in English.')
-        . '</i></small></p>';
-
-    // privs that are attached to a specific column
-    $html_output .= PMA_getHtmlForAttachedPrivilegesToTableSpecificColumn(
-        $columns, $row
-    );
-
-    // privs that are not attached to a specific column
-    $html_output .= '<div class="item">' . "\n"
-        . PMA_getHtmlForNotAttachedPrivilegesToTableSpecificColumn($row)
-        . '</div>' . "\n";
-
-    // for Safari 2.0.2
-    $html_output .= '<div class="clearfloat"></div>' . "\n";
-
-    return $html_output;
-}
-
-/**
- * Get HTML snippet for privileges that are attached to a specific column
- *
- * @param array $columns columns array
- * @param array $row     first row from result or boolean false
- *
- * @return string $html_output
- */
-function PMA_getHtmlForAttachedPrivilegesToTableSpecificColumn($columns, $row)
-{
-    $html_output = PMA_getHtmlForColumnPrivileges(
-        $columns, $row, 'Select_priv', 'SELECT',
-        'select', __('Allows reading data.'), 'Select'
-    );
-
-    $html_output .= PMA_getHtmlForColumnPrivileges(
-        $columns, $row, 'Insert_priv', 'INSERT',
-        'insert', __('Allows inserting and replacing data.'), 'Insert'
-    );
-
-    $html_output .= PMA_getHtmlForColumnPrivileges(
-        $columns, $row, 'Update_priv', 'UPDATE',
-        'update', __('Allows changing data.'), 'Update'
-    );
-
-    $html_output .= PMA_getHtmlForColumnPrivileges(
-        $columns, $row, 'References_priv', 'REFERENCES', 'references',
-        __('Has no effect in this MySQL version.'), 'References'
-    );
-    return $html_output;
-}
-
-/**
- * Get HTML for privileges that are not attached to a specific column
- *
- * @param array $row first row from result or boolean false
- *
- * @return string $html_output
- */
-function PMA_getHtmlForNotAttachedPrivilegesToTableSpecificColumn($row)
-{
-    $html_output = '';
-
-    foreach ($row as $current_grant => $current_grant_value) {
-        $grant_type = substr($current_grant, 0, -5);
-        if (in_array($grant_type, array('Select', 'Insert', 'Update', 'References'))
-        ) {
-            continue;
-        }
-        // make a substitution to match the messages variables;
-        // also we must substitute the grant we get, because we can't generate
-        // a form variable containing blanks (those would get changed to
-        // an underscore when receiving the POST)
-        if ($current_grant == 'Create View_priv') {
-            $tmp_current_grant = 'CreateView_priv';
-            $current_grant = 'Create_view_priv';
-        } elseif ($current_grant == 'Show view_priv') {
-            $tmp_current_grant = 'ShowView_priv';
-            $current_grant = 'Show_view_priv';
-        } else {
-            $tmp_current_grant = $current_grant;
-        }
-
-        $html_output .= '<div class="item">' . "\n"
-           . '<input type="checkbox"'
-           . ' name="' . $current_grant . '" id="checkbox_' . $current_grant
-           . '" value="Y" '
-           . ($current_grant_value == 'Y' ? 'checked="checked" ' : '')
-           . 'title="';
-
-        $privGlobalName = 'strPrivDesc'
-            . mb_substr(
-                $tmp_current_grant,
-                0,
-                (mb_strlen($tmp_current_grant) - 5)
-            );
-        $html_output .= (isset($GLOBALS[$privGlobalName])
-                ? $GLOBALS[$privGlobalName]
-                : $GLOBALS[$privGlobalName . 'Tbl']
-            )
-            . '"/>' . "\n";
-
-        $privGlobalName1 = 'strPrivDesc'
-            . mb_substr(
-                $tmp_current_grant,
-                0,
-                - 5
-            );
-        $html_output .= '<label for="checkbox_' . $current_grant
-            . '"><code><dfn title="'
-            . (isset($GLOBALS[$privGlobalName1])
-                ? $GLOBALS[$privGlobalName1]
-                : $GLOBALS[$privGlobalName1 . 'Tbl']
-            )
-            . '">'
-            . mb_strtoupper(
-                mb_substr(
-                    $current_grant,
-                    0,
-                    -5
-                )
-            )
-            . '</dfn></code></label>' . "\n"
-            . '</div>' . "\n";
-    } // end foreach ()
-    return $html_output;
-}
-
-/**
- * Get HTML for global or database specific privileges
- *
- * @param string $db    the database
- * @param string $table the table
- * @param array  $row   first row from result or boolean false
- *
- * @return string $html_output
- */
-function PMA_getHtmlForGlobalOrDbSpecificPrivs($db, $table, $row)
-{
-    $privTable_names = array(0 => __('Data'),
-        1 => __('Structure'),
-        2 => __('Administration')
-    );
-    $privTable = array();
-    // d a t a
-    $privTable[0] = PMA_getDataPrivilegeTable($db);
-
-    // s t r u c t u r e
-    $privTable[1] = PMA_getStructurePrivilegeTable($table, $row);
-
-    // a d m i n i s t r a t i o n
-    $privTable[2] = PMA_getAdministrationPrivilegeTable($db);
-
-    $html_output = '<input type="hidden" name="grant_count" value="'
-        . (count($privTable[0])
-            + count($privTable[1])
-            + count($privTable[2])
-            - (isset($row['Grant_priv']) ? 1 : 0)
-        )
-        . '" />';
-    if ($db == '*') {
-        $legend     = __('Global privileges');
-        $menu_label = __('Global');
-    } else if ($table == '*') {
-        $legend     = __('Database-specific privileges');
-        $menu_label = __('Database');
-    } else {
-        $legend     = __('Table-specific privileges');
-        $menu_label = __('Table');
-    }
-    $html_output .= '<fieldset id="fieldset_user_global_rights">'
-        . '<legend data-submenu-label="' . $menu_label . '">' . $legend
-        . '<input type="checkbox" id="addUsersForm_checkall" '
-        . 'class="checkall_box" title="' . __('Check all') . '" /> '
-        . '<label for="addUsersForm_checkall">' . __('Check all') . '</label> '
-        . '</legend>'
-        . '<p><small><i>'
-        . __('Note: MySQL privilege names are expressed in English.')
-        . '</i></small></p>';
-
-    // Output the Global privilege tables with checkboxes
-    $html_output .= PMA_getHtmlForGlobalPrivTableWithCheckboxes(
-        $privTable, $privTable_names, $row
-    );
-
-    // The "Resource limits" box is not displayed for db-specific privs
-    if ($db == '*') {
-        $html_output .= PMA_getHtmlForResourceLimits($row);
-        $html_output .= PMA_getHtmlForRequires($row);
-    }
-    // for Safari 2.0.2
-    $html_output .= '<div class="clearfloat"></div>';
-
-    return $html_output;
-}
-
-/**
- * Get data privilege table as an array
- *
- * @param string $db the database
- *
- * @return string data privilege table
- */
-function PMA_getDataPrivilegeTable($db)
-{
-    $data_privTable = array(
-        array('Select', 'SELECT', __('Allows reading data.')),
-        array('Insert', 'INSERT', __('Allows inserting and replacing data.')),
-        array('Update', 'UPDATE', __('Allows changing data.')),
-        array('Delete', 'DELETE', __('Allows deleting data.'))
-    );
-    if ($db == '*') {
-        $data_privTable[]
-            = array('File',
-                'FILE',
-                __('Allows importing data from and exporting data into files.')
-            );
-    }
-    return $data_privTable;
-}
-
-/**
- * Get structure privilege table as an array
- *
- * @param string $table the table
- * @param array  $row   first row from result or boolean false
- *
- * @return string structure privilege table
- */
-function PMA_getStructurePrivilegeTable($table, $row)
-{
-    $structure_privTable = array(
-        array('Create',
-            'CREATE',
-            ($table == '*'
-                ? __('Allows creating new databases and tables.')
-                : __('Allows creating new tables.')
-            )
-        ),
-        array('Alter',
-            'ALTER',
-            __('Allows altering the structure of existing tables.')
-        ),
-        array('Index', 'INDEX', __('Allows creating and dropping indexes.')),
-        array('Drop',
-            'DROP',
-            ($table == '*'
-                ? __('Allows dropping databases and tables.')
-                : __('Allows dropping tables.')
-            )
-        ),
-        array('Create_tmp_table',
-            'CREATE TEMPORARY TABLES',
-            __('Allows creating temporary tables.')
-        ),
-        array('Show_view',
-            'SHOW VIEW',
-            __('Allows performing SHOW CREATE VIEW queries.')
-        ),
-        array('Create_routine',
-            'CREATE ROUTINE',
-            __('Allows creating stored routines.')
-        ),
-        array('Alter_routine',
-            'ALTER ROUTINE',
-            __('Allows altering and dropping stored routines.')
-        ),
-        array('Execute', 'EXECUTE', __('Allows executing stored routines.')),
-    );
-    // this one is for a db-specific priv: Create_view_priv
-    if (isset($row['Create_view_priv'])) {
-        $structure_privTable[] = array('Create_view',
-            'CREATE VIEW',
-            __('Allows creating new views.')
-        );
-    }
-    // this one is for a table-specific priv: Create View_priv
-    if (isset($row['Create View_priv'])) {
-        $structure_privTable[] = array('Create View',
-            'CREATE VIEW',
-            __('Allows creating new views.')
-        );
-    }
-    if (isset($row['Event_priv'])) {
-        // MySQL 5.1.6
-        $structure_privTable[] = array('Event',
-            'EVENT',
-            __('Allows to set up events for the event scheduler.')
-        );
-        $structure_privTable[] = array('Trigger',
-            'TRIGGER',
-            __('Allows creating and dropping triggers.')
-        );
-    }
-    return $structure_privTable;
-}
-
-/**
- * Get administration privilege table as an array
- *
- * @param string $db the table
- *
- * @return string administration privilege table
- */
-function PMA_getAdministrationPrivilegeTable($db)
-{
-    if ($db == '*') {
-        $adminPrivTable = array(
-            array('Grant',
-                'GRANT',
-                __(
-                    'Allows adding users and privileges '
-                    . 'without reloading the privilege tables.'
-                )
-            ),
-        );
-        $adminPrivTable[] = array('Super',
-            'SUPER',
-            __(
-                'Allows connecting, even if maximum number '
-                . 'of connections is reached; required for '
-                . 'most administrative operations like '
-                . 'setting global variables or killing threads of other users.'
-            )
-        );
-        $adminPrivTable[] = array('Process',
-            'PROCESS',
-            __('Allows viewing processes of all users.')
-        );
-        $adminPrivTable[] = array('Reload',
-            'RELOAD',
-            __('Allows reloading server settings and flushing the server\'s caches.')
-        );
-        $adminPrivTable[] = array('Shutdown',
-            'SHUTDOWN',
-            __('Allows shutting down the server.')
-        );
-        $adminPrivTable[] = array('Show_db',
-            'SHOW DATABASES',
-            __('Gives access to the complete list of databases.')
-        );
-    }
-    else {
-        $adminPrivTable = array(
-            array('Grant',
-                'GRANT',
-                __(
-                    'Allows user to give to other users or remove from other'
-                    . ' users the privileges that user possess yourself.'
-                )
-           ),
-        );
-    }
-    $adminPrivTable[] = array('Lock_tables',
-        'LOCK TABLES',
-        __('Allows locking tables for the current thread.')
-    );
-    $adminPrivTable[] = array('References',
-        'REFERENCES',
-        __('Has no effect in this MySQL version.')
-    );
-    if ($db == '*') {
-        $adminPrivTable[] = array('Repl_client',
-            'REPLICATION CLIENT',
-            __('Allows the user to ask where the slaves / masters are.')
-        );
-        $adminPrivTable[] = array('Repl_slave',
-            'REPLICATION SLAVE',
-            __('Needed for the replication slaves.')
-        );
-        $adminPrivTable[] = array('Create_user',
-            'CREATE USER',
-            __('Allows creating, dropping and renaming user accounts.')
-        );
-    }
-    return $adminPrivTable;
-}
-
-/**
- * Get HTML snippet for global privileges table with check boxes
- *
- * @param array $privTable       privileges table array
- * @param array $privTable_names names of the privilege tables
- *                               (Data, Structure, Administration)
- * @param array $row             first row from result or boolean false
- *
- * @return string $html_output
- */
-function PMA_getHtmlForGlobalPrivTableWithCheckboxes(
-    $privTable, $privTable_names, $row
-) {
-    $html_output = '';
-    foreach ($privTable as $i => $table) {
-        $html_output .= '<fieldset>' . "\n"
-            . '<legend>' . "\n"
-            . '<input type="checkbox" class="sub_checkall_box"'
-            . ' id="checkall_' . $privTable_names[$i] . '_priv"'
-            . ' title="' . __('Check all') . '"/>'
-            . '<label for="checkall_' . $privTable_names[$i] . '_priv">'
-            . $privTable_names[$i] . '</label>' . "\n"
-            . '</legend>' . "\n";
-        foreach ($table as $priv) {
-            $html_output .= '<div class="item">' . "\n"
-                . '<input type="checkbox" class="checkall"'
-                . ' name="' . $priv[0] . '_priv" '
-                . 'id="checkbox_' . $priv[0] . '_priv"'
-                . ' value="Y" title="' . $priv[2] . '"'
-                . ((isset($row[$priv[0] . '_priv'])
-                    && $row[$priv[0] . '_priv'] == 'Y')
-                    ?  ' checked="checked"'
-                    : ''
-                )
-                . '/>' . "\n"
-                . '<label for="checkbox_' . $priv[0] . '_priv">'
-                . '<code>'
-                . PMA_formatPrivilege($priv, true)
-                . '</code></label>' . "\n"
-                . '</div>' . "\n";
-        }
-        $html_output .= '</fieldset>' . "\n";
-    }
-    return $html_output;
-}
-
-/**
- * Gets the currently active authentication plugins
- *
- * @param string $orig_auth_plugin Default Authentication plugin
- * @param string $mode             are we creating a new user or are we just
- *                                 changing  one?
- *                                 (allowed values: 'new', 'edit', 'change_pw')
- * @param string $versions         Is MySQL version newer or older than 5.5.7
- *
- * @return string $html_output
- */
-function PMA_getHtmlForAuthPluginsDropdown(
-    $orig_auth_plugin,
-    $mode = 'new',
-    $versions = 'new'
-) {
-    $html_output = '<select '
-        . 'id="select_authentication_plugin'
-        . ($mode =='change_pw' ? '_cp' : '') . '" '
-        . 'name="authentication_plugin" >';
-    if ($versions == 'new') {
-        $active_auth_plugins = PMA_getActiveAuthPlugins();
-
-        foreach ($active_auth_plugins as $plugin) {
-            if ($plugin['PLUGIN_NAME'] == 'mysql_old_password') {
-                continue;
-            }
-            // if description is known, enable its translation
-            if ('Native MySQL authentication' == $plugin['PLUGIN_DESCRIPTION']) {
-                $description = __('Native MySQL authentication');
-            } elseif ('SHA256 password authentication' == $plugin['PLUGIN_DESCRIPTION']) {
-                $description = __('SHA256 password authentication');
-            } else {
-                // but there can be other auth plugins, see
-                // https://github.com/phpmyadmin/phpmyadmin/issues/11561
-                $description = $plugin['PLUGIN_DESCRIPTION'];
-            }
-
-            $html_output .= '<option value="' . $plugin['PLUGIN_NAME'] . '"'
-                . ($orig_auth_plugin == $plugin['PLUGIN_NAME'] ? 'selected ' : '')
-                . '>' . $description . '</option>';
-        }
-        $html_output .= '</select>';
-    } else {
-        $html_output .= '<option value="mysql_native_password" >'
-            . __('Native MySQL Authentication') . '</option>'
-            . '</select>';
-    }
-
-    return $html_output;
-}
-/**
- * Gets the currently active authentication plugins
- *
- * @return array $result  array of plugin names and descriptions
- */
-function PMA_getActiveAuthPlugins()
-{
-    $get_plugins_query = "SELECT `PLUGIN_NAME`, `PLUGIN_DESCRIPTION`"
-        . " FROM `information_schema`.`PLUGINS` "
-        . "WHERE `PLUGIN_TYPE` = 'AUTHENTICATION';";
-    $resultset = $GLOBALS['dbi']->query($get_plugins_query);
-
-    $result = array();
-
-    while ($row = $GLOBALS['dbi']->fetchAssoc($resultset)) {
-        $result[] = $row;
-    }
-
-    return $result;
-}
-
-/**
- * Displays the fields used by the "new user" form as well as the
- * "change login information / copy user" form.
- *
- * @param string $mode     are we creating a new user or are we just
- *                         changing  one? (allowed values: 'new', 'change')
- * @param string $username User name
- * @param string $hostname Host name
- *
- * @global  array      $cfg     the phpMyAdmin configuration
- * @global  resource   $user_link the database connection
- *
- * @return string $html_output  a HTML snippet
- */
-function PMA_getHtmlForLoginInformationFields(
-    $mode = 'new',
-    $username = null,
-    $hostname = null
-) {
-    list($username_length, $hostname_length) = PMA_getUsernameAndHostnameLength();
-
-    if (isset($GLOBALS['username'])
-        && mb_strlen($GLOBALS['username']) === 0
-    ) {
-        $GLOBALS['pred_username'] = 'any';
-    }
-    $html_output = '<fieldset id="fieldset_add_user_login">' . "\n"
-        . '<legend>' . __('Login Information') . '</legend>' . "\n"
-        . '<div class="item">' . "\n"
-        . '<label for="select_pred_username">' . "\n"
-        . '    ' . __('User name:') . "\n"
-        . '</label>' . "\n"
-        . '<span class="options">' . "\n";
-
-    $html_output .= '<select name="pred_username" id="select_pred_username" '
-        . 'title="' . __('User name') . '">' . "\n";
-
-    $html_output .= '<option value="any"'
-        . ((isset($GLOBALS['pred_username']) && $GLOBALS['pred_username'] == 'any')
-            ? ' selected="selected"'
-            : '') . '>'
-        . __('Any user')
-        . '</option>' . "\n";
-
-    $html_output .= '<option value="userdefined"'
-        . ((! isset($GLOBALS['pred_username'])
-                || $GLOBALS['pred_username'] == 'userdefined'
-            )
-            ? ' selected="selected"'
-            : '') . '>'
-        . __('Use text field')
-        . ':</option>' . "\n";
-
-    $html_output .= '</select>' . "\n"
-        . '</span>' . "\n";
-
-    $html_output .= '<input type="text" name="username" id="pma_username" class="autofocus"'
-        . ' maxlength="' . $username_length . '" title="' . __('User name') . '"'
-        . (empty($GLOBALS['username'])
-           ? ''
-           : ' value="' . htmlspecialchars(
-               isset($GLOBALS['new_username'])
-               ? $GLOBALS['new_username']
-               : $GLOBALS['username']
-           ) . '"'
-        )
-        . ((! isset($GLOBALS['pred_username'])
-                || $GLOBALS['pred_username'] == 'userdefined'
-            )
-            ? 'required="required"'
-            : '') . ' />' . "\n";
-
-    $html_output .= '<div id="user_exists_warning"'
-        . ' name="user_exists_warning" style="display:none;">'
-        . Message::notice(
-            __(
-                'An account already exists with the same username '
-                . 'but possibly a different hostname.'
-            )
-        )->getDisplay()
-        . '</div>';
-    $html_output .= '</div>';
-
-    $html_output .= '<div class="item">' . "\n"
-        . '<label for="select_pred_hostname">' . "\n"
-        . '    ' . __('Host name:') . "\n"
-        . '</label>' . "\n";
-
-    $html_output .= '<span class="options">' . "\n"
-        . '    <select name="pred_hostname" id="select_pred_hostname" '
-        . 'title="' . __('Host name') . '"' . "\n";
-    $_current_user = $GLOBALS['dbi']->fetchValue('SELECT USER();');
-    if (! empty($_current_user)) {
-        $thishost = str_replace(
-            "'",
-            '',
-            mb_substr(
-                $_current_user,
-                (mb_strrpos($_current_user, '@') + 1)
-            )
-        );
-        if ($thishost != 'localhost' && $thishost != '127.0.0.1') {
-            $html_output .= ' data-thishost="' . htmlspecialchars($thishost) . '" ';
-        } else {
-            unset($thishost);
-        }
-    }
-    $html_output .= '>' . "\n";
-    unset($_current_user);
-
-    // when we start editing a user, $GLOBALS['pred_hostname'] is not defined
-    if (! isset($GLOBALS['pred_hostname']) && isset($GLOBALS['hostname'])) {
-        switch (mb_strtolower($GLOBALS['hostname'])) {
-        case 'localhost':
-        case '127.0.0.1':
-            $GLOBALS['pred_hostname'] = 'localhost';
-            break;
-        case '%':
-            $GLOBALS['pred_hostname'] = 'any';
-            break;
-        default:
-            $GLOBALS['pred_hostname'] = 'userdefined';
-            break;
-        }
-    }
-    $html_output .=  '<option value="any"'
-        . ((isset($GLOBALS['pred_hostname'])
-                && $GLOBALS['pred_hostname'] == 'any'
-            )
-            ? ' selected="selected"'
-            : '') . '>'
-        . __('Any host')
-        . '</option>' . "\n"
-        . '<option value="localhost"'
-        . ((isset($GLOBALS['pred_hostname'])
-                && $GLOBALS['pred_hostname'] == 'localhost'
-            )
-            ? ' selected="selected"'
-            : '') . '>'
-        . __('Local')
-        . '</option>' . "\n";
-    if (! empty($thishost)) {
-        $html_output .= '<option value="thishost"'
-            . ((isset($GLOBALS['pred_hostname'])
-                    && $GLOBALS['pred_hostname'] == 'thishost'
-                )
-                ? ' selected="selected"'
-                : '') . '>'
-            . __('This Host')
-            . '</option>' . "\n";
-    }
-    unset($thishost);
-    $html_output .= '<option value="hosttable"'
-        . ((isset($GLOBALS['pred_hostname'])
-                && $GLOBALS['pred_hostname'] == 'hosttable'
-            )
-            ? ' selected="selected"'
-            : '') . '>'
-        . __('Use Host Table')
-        . '</option>' . "\n";
-
-    $html_output .= '<option value="userdefined"'
-        . ((isset($GLOBALS['pred_hostname'])
-                && $GLOBALS['pred_hostname'] == 'userdefined'
-            )
-            ? ' selected="selected"'
-            : '') . '>'
-        . __('Use text field:') . '</option>' . "\n"
-        . '</select>' . "\n"
-        . '</span>' . "\n";
-
-    $html_output .= '<input type="text" name="hostname" id="pma_hostname" maxlength="'
-        . $hostname_length . '" value="'
-        // use default value of '%' to match with the default 'Any host'
-        . htmlspecialchars(isset($GLOBALS['hostname']) ? $GLOBALS['hostname'] : '%')
-        . '" title="' . __('Host name')
-        . ((isset($GLOBALS['pred_hostname'])
-                && $GLOBALS['pred_hostname'] == 'userdefined'
-            )
-            ? 'required="required"'
-            : '')
-        . ' />' . "\n"
-        . Util::showHint(
-            __(
-                'When Host table is used, this field is ignored '
-                . 'and values stored in Host table are used instead.'
-            )
-        )
-        . '</div>' . "\n";
-
-    $html_output .= '<div class="item">' . "\n"
-        . '<label for="select_pred_password">' . "\n"
-        . '    ' . __('Password:') . "\n"
-        . '</label>' . "\n"
-        . '<span class="options">' . "\n"
-        . '<select name="pred_password" id="select_pred_password" title="'
-        . __('Password') . '">' . "\n"
-        . ($mode == 'change' ? '<option value="keep" selected="selected">'
-            . __('Do not change the password')
-            . '</option>' . "\n" : '')
-        . '<option value="none"';
-
-    if (isset($GLOBALS['username']) && $mode != 'change') {
-        $html_output .= '  selected="selected"';
-    }
-    $html_output .= '>' . __('No Password') . '</option>' . "\n"
-        . '<option value="userdefined"'
-        . (isset($GLOBALS['username']) ? '' : ' selected="selected"') . '>'
-        . __('Use text field')
-        . ':</option>' . "\n"
-        . '</select>' . "\n"
-        . '</span>' . "\n"
-        . '<input type="password" id="text_pma_pw" name="pma_pw" '
-        . 'title="' . __('Password') . '" '
-        . (isset($GLOBALS['username']) ? '' : 'required="required"')
-        . '/>' . "\n"
-        . '</div>' . "\n";
-
-    $html_output .= '<div class="item" '
-        . 'id="div_element_before_generate_password">' . "\n"
-        . '<label for="text_pma_pw2">' . "\n"
-        . '    ' . __('Re-type:') . "\n"
-        . '</label>' . "\n"
-        . '<span class="options">&nbsp;</span>' . "\n"
-        . '<input type="password" name="pma_pw2" id="text_pma_pw2" '
-        . 'title="' . __('Re-type') . '" '
-        . (isset($GLOBALS['username']) ? '' : 'required="required"')
-        . '/>' . "\n"
-        . '</div>' . "\n"
-        . '<div class="item" id="authentication_plugin_div">'
-        . '<label for="select_authentication_plugin" >';
-
-    $serverType = Util::getServerType();
-    $orig_auth_plugin = PMA_getCurrentAuthenticationPlugin(
-        $mode,
-        $username,
-        $hostname
-    );
-
-    if (($serverType == 'MySQL'
-        && PMA_MYSQL_INT_VERSION >= 50507)
-        || ($serverType == 'MariaDB'
-        && PMA_MYSQL_INT_VERSION >= 50200)
-    ) {
-        $html_output .= __('Authentication Plugin')
-        . '</label><span class="options">&nbsp;</span>' . "\n";
-
-        $auth_plugin_dropdown = PMA_getHtmlForAuthPluginsDropdown(
-            $orig_auth_plugin, $mode, 'new'
-        );
-    } else {
-        $html_output .= __('Password Hashing Method')
-            . '</label><span class="options">&nbsp;</span>' . "\n";
-        $auth_plugin_dropdown = PMA_getHtmlForAuthPluginsDropdown(
-            $orig_auth_plugin, $mode, 'old'
-        );
-    }
-    $html_output .= $auth_plugin_dropdown;
-
-    $html_output .= '<div '
-        . ($orig_auth_plugin != 'sha256_password' ? 'style="display:none"' : '')
-        . ' id="ssl_reqd_warning">'
-        . Message::notice(
-            __(
-                'This method requires using an \'<i>SSL connection</i>\' '
-                . 'or an \'<i>unencrypted connection that encrypts the password '
-                . 'using RSA</i>\'; while connecting to the server.'
-            )
-            . Util::showMySQLDocu('sha256-authentication-plugin')
-        )
-            ->getDisplay()
-        . '</div>';
-
-    $html_output .= '</div>' . "\n"
-        // Generate password added here via jQuery
-       . '</fieldset>' . "\n";
-
-    return $html_output;
-} // end of the 'PMA_getHtmlForLoginInformationFields()' function
-
-/**
- * Get username and hostname length
- *
- * @return array username length and hostname length
- */
-function PMA_getUsernameAndHostnameLength()
-{
-    /* Fallback values */
-    $username_length = 16;
-    $hostname_length = 41;
-
-    /* Try to get real lengths from the database */
-    $fields_info = $GLOBALS['dbi']->fetchResult(
-        'SELECT COLUMN_NAME, CHARACTER_MAXIMUM_LENGTH '
-        . 'FROM information_schema.columns '
-        . "WHERE table_schema = 'mysql' AND table_name = 'user' "
-        . "AND COLUMN_NAME IN ('User', 'Host')"
-    );
-    foreach ($fields_info as $val) {
-        if ($val['COLUMN_NAME'] == 'User') {
-            $username_length = $val['CHARACTER_MAXIMUM_LENGTH'];
-        } elseif ($val['COLUMN_NAME'] == 'Host') {
-            $hostname_length = $val['CHARACTER_MAXIMUM_LENGTH'];
-        }
-    }
-    return array($username_length, $hostname_length);
-}
-
-/**
- * Get current authentication plugin in use - for a user or globally
- *
- * @param string $mode     are we creating a new user or are we just
- *                         changing  one? (allowed values: 'new', 'change')
- * @param string $username User name
- * @param string $hostname Host name
- *
- * @return string authentication plugin in use
- */
-function PMA_getCurrentAuthenticationPlugin(
-    $mode = 'new',
-    $username = null,
-    $hostname = null
-) {
-    /* Fallback (standard) value */
-    $authentication_plugin = 'mysql_native_password';
-
-    if (isset($username) && isset($hostname)
-        && $mode == 'change'
-    ) {
-        $row = $GLOBALS['dbi']->fetchSingleRow(
-            'SELECT `plugin` FROM `mysql`.`user` WHERE '
-            . '`User` = "' . $username . '" AND `Host` = "' . $hostname . '" LIMIT 1'
-        );
-        // Table 'mysql'.'user' may not exist for some previous
-        // versions of MySQL - in that case consider fallback value
-        if (isset($row) && $row) {
-            $authentication_plugin = $row['plugin'];
-        }
-    } elseif ($mode == 'change') {
-        $row = $GLOBALS['dbi']->fetchSingleRow(
-            'SELECT CURRENT_USER() as user;'
-        );
-        if (isset($row) && $row) {
-            list($username, $hostname) = explode('@', $row['user']);
-        }
-
-        $row = $GLOBALS['dbi']->fetchSingleRow(
-            'SELECT `plugin` FROM `mysql`.`user` WHERE '
-            . '`User` = "' . $username . '" AND `Host` = "' . $hostname . '"'
-        );
-        if (isset($row) && $row && ! empty($row['plugin'])) {
-            $authentication_plugin = $row['plugin'];
-        }
-    } elseif (PMA_MYSQL_INT_VERSION >= 50702) {
-        $row = $GLOBALS['dbi']->fetchSingleRow(
-            'SELECT @@default_authentication_plugin'
-        );
-        $authentication_plugin = $row['@@default_authentication_plugin'];
-    }
-
-    return $authentication_plugin;
-}
-
-/**
- * Returns all the grants for a certain user on a certain host
- * Used in the export privileges for all users section
- *
- * @param string $user User name
- * @param string $host Host name
- *
- * @return string containing all the grants text
- */
-function PMA_getGrants($user, $host)
-{
-    $grants = $GLOBALS['dbi']->fetchResult(
-        "SHOW GRANTS FOR '"
-        . $GLOBALS['dbi']->escapeString($user) . "'@'"
-        . $GLOBALS['dbi']->escapeString($host) . "'"
-    );
-    $response = '';
-    foreach ($grants as $one_grant) {
-        $response .= $one_grant . ";\n\n";
-    }
-    return $response;
-} // end of the 'PMA_getGrants()' function
-
-/**
- * Update password and get message for password updating
- *
- * @param string $err_url  error url
- * @param string $username username
- * @param string $hostname hostname
- *
- * @return string $message  success or error message after updating password
- */
-function PMA_updatePassword($err_url, $username, $hostname)
-{
-    // similar logic in user_password.php
-    $message = '';
-    $is_superuser = $GLOBALS['dbi']->isSuperuser();
-
-    if (empty($_REQUEST['nopass'])
-        && isset($_POST['pma_pw'])
-        && isset($_POST['pma_pw2'])
-    ) {
-        if ($_POST['pma_pw'] != $_POST['pma_pw2']) {
-            $message = Message::error(__('The passwords aren\'t the same!'));
-        } elseif (empty($_POST['pma_pw']) || empty($_POST['pma_pw2'])) {
-            $message = Message::error(__('The password is empty!'));
-        }
-    }
-
-    // here $nopass could be == 1
-    if (empty($message)) {
-        $hashing_function = 'PASSWORD';
-        $serverType = Util::getServerType();
-        $authentication_plugin
-            = (isset($_REQUEST['authentication_plugin'])
-            ? $_REQUEST['authentication_plugin']
-            : PMA_getCurrentAuthenticationPlugin(
-                'change',
-                $username,
-                $hostname
-            ));
-
-        // Use 'ALTER USER ...' syntax for MySQL 5.7.6+
-        if ($serverType == 'MySQL'
-            && PMA_MYSQL_INT_VERSION >= 50706
-        ) {
-            if ($authentication_plugin != 'mysql_old_password') {
-                $query_prefix = "ALTER USER '"
-                    . $GLOBALS['dbi']->escapeString($username)
-                    . "'@'" . $GLOBALS['dbi']->escapeString($hostname) . "'"
-                    . " IDENTIFIED WITH "
-                    . $authentication_plugin
-                    . " BY '";
-            } else {
-                $query_prefix = "ALTER USER '"
-                    . $GLOBALS['dbi']->escapeString($username)
-                    . "'@'" . $GLOBALS['dbi']->escapeString($hostname) . "'"
-                    . " IDENTIFIED BY '";
-            }
-
-            // in $sql_query which will be displayed, hide the password
-            $sql_query = $query_prefix . "*'";
-
-            $local_query = $query_prefix
-                . $GLOBALS['dbi']->escapeString($_POST['pma_pw']) . "'";
-        } else if ($serverType == 'MariaDB'
-            && PMA_MYSQL_INT_VERSION >= 50200
-            && $is_superuser
-        ) {
-            // Use 'UPDATE `mysql`.`user` ...' Syntax for MariaDB 5.2+
-            if ($authentication_plugin == 'mysql_native_password') {
-                // Set the hashing method used by PASSWORD()
-                // to be 'mysql_native_password' type
-                $GLOBALS['dbi']->tryQuery('SET old_passwords = 0;');
-
-            } else if ($authentication_plugin == 'sha256_password') {
-                // Set the hashing method used by PASSWORD()
-                // to be 'sha256_password' type
-                $GLOBALS['dbi']->tryQuery('SET `old_passwords` = 2;');
-            }
-
-            $hashedPassword = PMA_getHashedPassword($_POST['pma_pw']);
-
-            $sql_query        = 'SET PASSWORD FOR \''
-                . $GLOBALS['dbi']->escapeString($username)
-                . '\'@\'' . $GLOBALS['dbi']->escapeString($hostname) . '\' = '
-                . (($_POST['pma_pw'] == '')
-                    ? '\'\''
-                    : $hashing_function . '(\''
-                    . preg_replace('@.@s', '*', $_POST['pma_pw']) . '\')');
-
-            $local_query = "UPDATE `mysql`.`user` SET "
-                . " `authentication_string` = '" . $hashedPassword
-                . "', `Password` = '', "
-                . " `plugin` = '" . $authentication_plugin . "'"
-                . " WHERE `User` = '" . $username . "' AND Host = '"
-                . $hostname . "';";
-        } else {
-            // USE 'SET PASSWORD ...' syntax for rest of the versions
-            // Backup the old value, to be reset later
-            $row = $GLOBALS['dbi']->fetchSingleRow(
-                'SELECT @@old_passwords;'
-            );
-            $orig_value = $row['@@old_passwords'];
-            $update_plugin_query = "UPDATE `mysql`.`user` SET"
-                . " `plugin` = '" . $authentication_plugin . "'"
-                . " WHERE `User` = '" . $username . "' AND Host = '"
-                . $hostname . "';";
-
-            // Update the plugin for the user
-            if (!($GLOBALS['dbi']->tryQuery($update_plugin_query))) {
-                Util::mysqlDie(
-                    $GLOBALS['dbi']->getError(),
-                    $update_plugin_query,
-                    false, $err_url
-                );
-            }
-            $GLOBALS['dbi']->tryQuery("FLUSH PRIVILEGES;");
-
-            if ($authentication_plugin == 'mysql_native_password') {
-                // Set the hashing method used by PASSWORD()
-                // to be 'mysql_native_password' type
-                $GLOBALS['dbi']->tryQuery('SET old_passwords = 0;');
-            } else if ($authentication_plugin == 'sha256_password') {
-                // Set the hashing method used by PASSWORD()
-                // to be 'sha256_password' type
-                $GLOBALS['dbi']->tryQuery('SET `old_passwords` = 2;');
-            }
-            $sql_query        = 'SET PASSWORD FOR \''
-                . $GLOBALS['dbi']->escapeString($username)
-                . '\'@\'' . $GLOBALS['dbi']->escapeString($hostname) . '\' = '
-                . (($_POST['pma_pw'] == '')
-                    ? '\'\''
-                    : $hashing_function . '(\''
-                    . preg_replace('@.@s', '*', $_POST['pma_pw']) . '\')');
-
-            $local_query      = 'SET PASSWORD FOR \''
-                . $GLOBALS['dbi']->escapeString($username)
-                . '\'@\'' . $GLOBALS['dbi']->escapeString($hostname) . '\' = '
-                . (($_POST['pma_pw'] == '') ? '\'\'' : $hashing_function
-                . '(\'' . $GLOBALS['dbi']->escapeString($_POST['pma_pw']) . '\')');
-        }
-
-        if (!($GLOBALS['dbi']->tryQuery($local_query))) {
-            Util::mysqlDie(
-                $GLOBALS['dbi']->getError(), $sql_query, false, $err_url
-            );
-        }
-        // Flush privileges after successful password change
-        $GLOBALS['dbi']->tryQuery("FLUSH PRIVILEGES;");
-
-        $message = Message::success(
-            __('The password for %s was changed successfully.')
-        );
-        $message->addParam(
-            '\'' . htmlspecialchars($username)
-            . '\'@\'' . htmlspecialchars($hostname) . '\''
-        );
-        if (isset($orig_value)) {
-            $GLOBALS['dbi']->tryQuery(
-                'SET `old_passwords` = ' . $orig_value . ';'
-            );
-        }
-    }
-    return $message;
-}
-
-/**
- * Revokes privileges and get message and SQL query for privileges revokes
- *
- * @param string $dbname    database name
- * @param string $tablename table name
- * @param string $username  username
- * @param string $hostname  host name
- * @param string $itemType  item type
- *
- * @return array ($message, $sql_query)
- */
-function PMA_getMessageAndSqlQueryForPrivilegesRevoke($dbname,
-    $tablename, $username, $hostname, $itemType
-) {
-    $db_and_table = PMA_wildcardEscapeForGrant($dbname, $tablename);
-
-    $sql_query0 = 'REVOKE ALL PRIVILEGES ON ' . $itemType . ' ' . $db_and_table
-        . ' FROM \''
-        . $GLOBALS['dbi']->escapeString($username) . '\'@\''
-        . $GLOBALS['dbi']->escapeString($hostname) . '\';';
-
-    $sql_query1 = 'REVOKE GRANT OPTION ON ' . $itemType . ' ' . $db_and_table
-        . ' FROM \'' . $GLOBALS['dbi']->escapeString($username) . '\'@\''
-        . $GLOBALS['dbi']->escapeString($hostname) . '\';';
-
-    $GLOBALS['dbi']->query($sql_query0);
-    if (! $GLOBALS['dbi']->tryQuery($sql_query1)) {
-        // this one may fail, too...
-        $sql_query1 = '';
-    }
-    $sql_query = $sql_query0 . ' ' . $sql_query1;
-    $message = Message::success(
-        __('You have revoked the privileges for %s.')
-    );
-    $message->addParam(
-        '\'' . htmlspecialchars($username)
-        . '\'@\'' . htmlspecialchars($hostname) . '\''
-    );
-
-    return array($message, $sql_query);
-}
-
-/**
- * Get REQUIRE cluase
- *
- * @return string REQUIRE clause
- */
-function PMA_getRequireClause()
-{
-    $arr = isset($_POST['ssl_type']) ? $_POST : $GLOBALS;
-    if (isset($arr['ssl_type']) && $arr['ssl_type'] == 'SPECIFIED') {
-        $require = array();
-        if (! empty($arr['ssl_cipher'])) {
-            $require[] = "CIPHER '"
-                    . $GLOBALS['dbi']->escapeString($arr['ssl_cipher']) . "'";
-        }
-        if (! empty($arr['x509_issuer'])) {
-            $require[] = "ISSUER '"
-                    . $GLOBALS['dbi']->escapeString($arr['x509_issuer']) . "'";
-        }
-        if (! empty($arr['x509_subject'])) {
-            $require[] = "SUBJECT '"
-                    . $GLOBALS['dbi']->escapeString($arr['x509_subject']) . "'";
-        }
-        if (count($require)) {
-            $require_clause = " REQUIRE " . implode(" AND ", $require);
-        } else {
-            $require_clause = " REQUIRE NONE";
-        }
-    } elseif (isset($arr['ssl_type']) && $arr['ssl_type'] == 'X509') {
-        $require_clause = " REQUIRE X509";
-    } elseif (isset($arr['ssl_type']) && $arr['ssl_type'] == 'ANY') {
-        $require_clause = " REQUIRE SSL";
-    } else {
-        $require_clause = " REQUIRE NONE";
-    }
-
-    return $require_clause;
-}
-
-/**
- * Get a WITH clause for 'update privileges' and 'add user'
- *
- * @return string $sql_query
- */
-function PMA_getWithClauseForAddUserAndUpdatePrivs()
-{
-    $sql_query = '';
-    if ((isset($_POST['Grant_priv']) && $_POST['Grant_priv'] == 'Y')
-        || (isset($GLOBALS['Grant_priv']) && $GLOBALS['Grant_priv'] == 'Y')
-    ) {
-        $sql_query .= ' GRANT OPTION';
-    }
-    if (isset($_POST['max_questions']) || isset($GLOBALS['max_questions'])) {
-        $max_questions = isset($_POST['max_questions'])
-            ? (int)$_POST['max_questions'] : (int)$GLOBALS['max_questions'];
-        $max_questions = max(0, $max_questions);
-        $sql_query .= ' MAX_QUERIES_PER_HOUR ' . $max_questions;
-    }
-    if (isset($_POST['max_connections']) || isset($GLOBALS['max_connections'])) {
-        $max_connections = isset($_POST['max_connections'])
-            ? (int)$_POST['max_connections'] : (int)$GLOBALS['max_connections'];
-        $max_connections = max(0, $max_connections);
-        $sql_query .= ' MAX_CONNECTIONS_PER_HOUR ' . $max_connections;
-    }
-    if (isset($_POST['max_updates']) || isset($GLOBALS['max_updates'])) {
-        $max_updates = isset($_POST['max_updates'])
-            ? (int)$_POST['max_updates'] : (int)$GLOBALS['max_updates'];
-        $max_updates = max(0, $max_updates);
-        $sql_query .= ' MAX_UPDATES_PER_HOUR ' . $max_updates;
-    }
-    if (isset($_POST['max_user_connections'])
-        || isset($GLOBALS['max_user_connections'])
-    ) {
-        $max_user_connections = isset($_POST['max_user_connections'])
-            ? (int)$_POST['max_user_connections']
-            : (int)$GLOBALS['max_user_connections'];
-        $max_user_connections = max(0, $max_user_connections);
-        $sql_query .= ' MAX_USER_CONNECTIONS ' . $max_user_connections;
-    }
-    return ((!empty($sql_query)) ? ' WITH' . $sql_query : '');
-}
-
-/**
- * Get HTML for addUsersForm, This function call if isset($_REQUEST['adduser'])
- *
- * @param string $dbname database name
- *
- * @return string HTML for addUserForm
- */
-function PMA_getHtmlForAddUser($dbname)
-{
-    $html_output = '<h2>' . "\n"
-       . Util::getIcon('b_usradd.png') . __('Add user account') . "\n"
-       . '</h2>' . "\n"
-       . '<form name="usersForm" id="addUsersForm"'
-       . ' onsubmit="return checkAddUser(this);"'
-       . ' action="server_privileges.php" method="post" autocomplete="off" >' . "\n"
-       . PMA_URL_getHiddenInputs('', '')
-       . PMA_getHtmlForLoginInformationFields('new');
-
-    $html_output .= '<fieldset id="fieldset_add_user_database">' . "\n"
-        . '<legend>' . __('Database for user account') . '</legend>' . "\n";
-
-    $html_output .= Util::getCheckbox(
-        'createdb-1',
-        __('Create database with same name and grant all privileges.'),
-        false, false, 'createdb-1'
-    );
-    $html_output .= '<br />' . "\n";
-    $html_output .= Util::getCheckbox(
-        'createdb-2',
-        __('Grant all privileges on wildcard name (username\\_%).'),
-        false, false, 'createdb-2'
-    );
-    $html_output .= '<br />' . "\n";
-
-    if (! empty($dbname) ) {
-        $html_output .= Util::getCheckbox(
-            'createdb-3',
-            sprintf(
-                __('Grant all privileges on database "%s".'),
-                htmlspecialchars($dbname)
-            ),
-            true,
-            false,
-            'createdb-3'
-        );
-        $html_output .= '<input type="hidden" name="dbname" value="'
-            . htmlspecialchars($dbname) . '" />' . "\n";
-        $html_output .= '<br />' . "\n";
-    }
-
-    $html_output .= '</fieldset>' . "\n";
-    if ($GLOBALS['is_grantuser']) {
-        $html_output .= PMA_getHtmlToDisplayPrivilegesTable('*', '*', false);
-    }
-    $html_output .= '<fieldset id="fieldset_add_user_footer" class="tblFooters">'
-        . "\n"
-        . '<input type="hidden" name="adduser_submit" value="1" />' . "\n"
-        . '<input type="submit" id="adduser_submit" value="' . __('Go') . '" />'
-        . "\n"
-        . '</fieldset>' . "\n"
-        . '</form>' . "\n";
-
-    return $html_output;
-}
-
-/**
- * Get the list of privileges and list of compared privileges as strings
- * and return a array that contains both strings
- *
- * @return array $list_of_privileges, $list_of_compared_privileges
- */
-function PMA_getListOfPrivilegesAndComparedPrivileges()
-{
-    $list_of_privileges
-        = '`User`, '
-        . '`Host`, '
-        . '`Select_priv`, '
-        . '`Insert_priv`, '
-        . '`Update_priv`, '
-        . '`Delete_priv`, '
-        . '`Create_priv`, '
-        . '`Drop_priv`, '
-        . '`Grant_priv`, '
-        . '`Index_priv`, '
-        . '`Alter_priv`, '
-        . '`References_priv`, '
-        . '`Create_tmp_table_priv`, '
-        . '`Lock_tables_priv`, '
-        . '`Create_view_priv`, '
-        . '`Show_view_priv`, '
-        . '`Create_routine_priv`, '
-        . '`Alter_routine_priv`, '
-        . '`Execute_priv`';
-
-    $listOfComparedPrivs
-        = '`Select_priv` = \'N\''
-        . ' AND `Insert_priv` = \'N\''
-        . ' AND `Update_priv` = \'N\''
-        . ' AND `Delete_priv` = \'N\''
-        . ' AND `Create_priv` = \'N\''
-        . ' AND `Drop_priv` = \'N\''
-        . ' AND `Grant_priv` = \'N\''
-        . ' AND `References_priv` = \'N\''
-        . ' AND `Create_tmp_table_priv` = \'N\''
-        . ' AND `Lock_tables_priv` = \'N\''
-        . ' AND `Create_view_priv` = \'N\''
-        . ' AND `Show_view_priv` = \'N\''
-        . ' AND `Create_routine_priv` = \'N\''
-        . ' AND `Alter_routine_priv` = \'N\''
-        . ' AND `Execute_priv` = \'N\'';
-
-    $list_of_privileges .=
-        ', `Event_priv`, '
-        . '`Trigger_priv`';
-    $listOfComparedPrivs .=
-        ' AND `Event_priv` = \'N\''
-        . ' AND `Trigger_priv` = \'N\'';
-    return array($list_of_privileges, $listOfComparedPrivs);
-}
-
-/**
- * Get the HTML for routine based privileges
- *
- * @param string $db             database name
- * @param string $odd_row        row styling
- * @param string $index_checkbox starting index for rows to be added
- *
- * @return string $html_output
- */
-function PMA_getHtmlTableBodyForSpecificDbRoutinePrivs($db, $odd_row, $index_checkbox)
-{
-    $sql_query = 'SELECT * FROM `mysql`.`procs_priv` WHERE Db = \'' . $GLOBALS['dbi']->escapeString($db) . '\';';
-    $res = $GLOBALS['dbi']->query($sql_query);
-    $html_output = '';
-    while ($row = $GLOBALS['dbi']->fetchAssoc($res)) {
-
-        $html_output .= '<tr class="' . ($odd_row ? 'odd' : 'even') . '">';
-
-        $html_output .= '<td';
-        $value = htmlspecialchars($row['User'] . '&amp;#27;' . $row['Host']);
-        $html_output .= '>';
-        $html_output .= '<input type="checkbox" class="checkall" '
-            . 'name="selected_usr[]" '
-            . 'id="checkbox_sel_users_' . ($index_checkbox++) . '" '
-            . 'value="' . $value . '" /></td>';
-
-        $html_output .= '<td>' . htmlspecialchars($row['User'])
-            . '</td>'
-            . '<td>' . htmlspecialchars($row['Host'])
-            . '</td>'
-            . '<td>' . 'routine'
-            . '</td>'
-            . '<td>' . '<code>' . htmlspecialchars($row['Routine_name']) . '</code>'
-            . '</td>'
-            . '<td>' . 'Yes'
-            . '</td>';
-        $current_user = $row['User'];
-        $current_host = $row['Host'];
-        $routine = $row['Routine_name'];
-        $html_output .= '<td>';
-        if ($GLOBALS['is_grantuser']) {
-            $specific_db = (isset($row['Db']) && $row['Db'] != '*')
-                ? $row['Db'] : '';
-            $specific_table = (isset($row['Table_name'])
-                && $row['Table_name'] != '*')
-                ? $row['Table_name'] : '';
-            $html_output .= PMA_getUserLink(
-                'edit',
-                $current_user,
-                $current_host,
-                $specific_db,
-                $specific_table,
-                $routine
-            );
-        }
-        $html_output .= '</td>';
-
-        $html_output .= '</tr>';
-        $odd_row = !$odd_row;
-
-    }
-    return $html_output;
-}
-
-/**
- * Get the HTML for user form and check the privileges for a particular database.
- *
- * @param string $db database name
- *
- * @return string $html_output
- */
-function PMA_getHtmlForSpecificDbPrivileges($db)
-{
-    $html_output = '';
-    if ($GLOBALS['is_superuser']) {
-        // check the privileges for a particular database.
-        $html_output  = '<form id="usersForm" action="server_privileges.php">';
-        $html_output .= PMA_URL_getHiddenInputs($db);
-        $html_output .= '<fieldset>';
-        $html_output .= '<legend>' . "\n"
-            . Util::getIcon('b_usrcheck.png')
-            . '    '
-            . sprintf(
-                __('Users having access to "%s"'),
-                '<a href="' . Util::getScriptNameForOption(
-                    $GLOBALS['cfg']['DefaultTabDatabase'], 'database'
-                )
-                . PMA_URL_getCommon(array('db' => $db)) . '">'
-                .  htmlspecialchars($db)
-                . '</a>'
-            )
-            . "\n"
-            . '</legend>' . "\n";
-
-        $html_output .= '<table id="dbspecificuserrights" class="data">';
-        $html_output .= PMA_getHtmlForPrivsTableHead();
-        $privMap = PMA_getPrivMap($db);
-        $html_output .= PMA_getHtmlTableBodyForSpecificDbOrTablePrivs($privMap, $db);
-        $html_output .= '</table>';
-
-        $html_output .= '<div class="floatleft">';
-        $html_output .= Util::getWithSelected(
-            $GLOBALS['pmaThemeImage'], $GLOBALS['text_dir'], "usersForm"
-        );
-        $html_output .= Util::getButtonOrImage(
-            'submit_mult', 'mult_submit', 'submit_mult_export',
-            __('Export'), 'b_tblexport.png', 'export'
-        );
-
-        $html_output .= '</fieldset>';
-        $html_output .= '</form>';
-    } else {
-        $html_output .= PMA_getHtmlForViewUsersError();
-    }
-
-    if ($GLOBALS['is_ajax_request'] == true
-        && empty($_REQUEST['ajax_page_request'])
-    ) {
-        $message = Message::success(__('User has been added.'));
-        $response = PMA\libraries\Response::getInstance();
-        $response->addJSON('message', $message);
-        $response->addJSON('user_form', $html_output);
-        exit;
-    } else {
-        // Offer to create a new user for the current database
-        $html_output .= PMA_getAddUserHtmlFieldset($db);
-    }
-    return $html_output;
-}
-
-/**
- * Get the HTML for user form and check the privileges for a particular table.
- *
- * @param string $db    database name
- * @param string $table table name
- *
- * @return string $html_output
- */
-function PMA_getHtmlForSpecificTablePrivileges($db, $table)
-{
-    $html_output = '';
-    if ($GLOBALS['is_superuser']) {
-        // check the privileges for a particular table.
-        $html_output  = '<form id="usersForm" action="server_privileges.php">';
-        $html_output .= PMA_URL_getHiddenInputs($db, $table);
-        $html_output .= '<fieldset>';
-        $html_output .= '<legend>'
-            . Util::getIcon('b_usrcheck.png')
-            . sprintf(
-                __('Users having access to "%s"'),
-                '<a href="' . Util::getScriptNameForOption(
-                    $GLOBALS['cfg']['DefaultTabTable'], 'table'
-                )
-                . PMA_URL_getCommon(
-                    array(
-                        'db' => $db,
-                        'table' => $table,
-                    )
-                ) . '">'
-                .  htmlspecialchars($db) . '.' . htmlspecialchars($table)
-                . '</a>'
-            )
-            . '</legend>';
-
-        $html_output .= '<table id="tablespecificuserrights" class="data">';
-        $html_output .= PMA_getHtmlForPrivsTableHead();
-        $privMap = PMA_getPrivMap($db);
-        $sql_query = "SELECT `User`, `Host`, `Db`,"
-            . " 't' AS `Type`, `Table_name`, `Table_priv`"
-            . " FROM `mysql`.`tables_priv`"
-            . " WHERE '" . $GLOBALS['dbi']->escapeString($db) . "' LIKE `Db`"
-            . "     AND '" . $GLOBALS['dbi']->escapeString($table) . "' LIKE `Table_name`"
-            . "     AND NOT (`Table_priv` = '' AND Column_priv = '')"
-            . " ORDER BY `User` ASC, `Host` ASC, `Db` ASC, `Table_priv` ASC;";
-        $res = $GLOBALS['dbi']->query($sql_query);
-        PMA_mergePrivMapFromResult($privMap, $res);
-        $html_output .= PMA_getHtmlTableBodyForSpecificDbOrTablePrivs($privMap, $db);
-        $html_output .= '</table>';
-
-        $html_output .= '<div class="floatleft">';
-        $html_output .= Util::getWithSelected(
-            $GLOBALS['pmaThemeImage'], $GLOBALS['text_dir'], "usersForm"
-        );
-        $html_output .= Util::getButtonOrImage(
-            'submit_mult', 'mult_submit', 'submit_mult_export',
-            __('Export'), 'b_tblexport.png', 'export'
-        );
-
-        $html_output .= '</fieldset>';
-        $html_output .= '</form>';
-    } else {
-        $html_output .= PMA_getHtmlForViewUsersError();
-    }
-    // Offer to create a new user for the current database
-    $html_output .= PMA_getAddUserHtmlFieldset($db, $table);
-    return $html_output;
-}
-
-/**
- * gets privilege map
- *
- * @param string $db the database
- *
- * @return array $privMap the privilege map
- */
-function PMA_getPrivMap($db)
-{
-    list($listOfPrivs, $listOfComparedPrivs)
-        = PMA_getListOfPrivilegesAndComparedPrivileges();
-    $sql_query
-        = "("
-        . " SELECT " . $listOfPrivs . ", '*' AS `Db`, 'g' AS `Type`"
-        . " FROM `mysql`.`user`"
-        . " WHERE NOT (" . $listOfComparedPrivs . ")"
-        . ")"
-        . " UNION "
-        . "("
-        . " SELECT " . $listOfPrivs . ", `Db`, 'd' AS `Type`"
-        . " FROM `mysql`.`db`"
-        . " WHERE '" . $GLOBALS['dbi']->escapeString($db) . "' LIKE `Db`"
-        . "     AND NOT (" . $listOfComparedPrivs . ")"
-        . ")"
-        . " ORDER BY `User` ASC, `Host` ASC, `Db` ASC;";
-    $res = $GLOBALS['dbi']->query($sql_query);
-    $privMap = array();
-    PMA_mergePrivMapFromResult($privMap, $res);
-    return $privMap;
-}
-
-/**
- * merge privilege map and rows from resultset
- *
- * @param array  &$privMap the privilege map reference
- * @param object $result   the resultset of query
- *
- * @return void
- */
-function PMA_mergePrivMapFromResult(&$privMap, $result)
-{
-    while ($row = $GLOBALS['dbi']->fetchAssoc($result)) {
-        $user = $row['User'];
-        $host = $row['Host'];
-        if (! isset($privMap[$user])) {
-            $privMap[$user] = array();
-        }
-        if (! isset($privMap[$user][$host])) {
-            $privMap[$user][$host] = array();
-        }
-        $privMap[$user][$host][] = $row;
-    }
-}
-
-/**
- * Get HTML snippet for privileges table head
- *
- * @return string $html_output
- */
-function PMA_getHtmlForPrivsTableHead()
-{
-    return '<thead>'
-        . '<tr>'
-        . '<th></th>'
-        . '<th>' . __('User name') . '</th>'
-        . '<th>' . __('Host name') . '</th>'
-        . '<th>' . __('Type') . '</th>'
-        . '<th>' . __('Privileges') . '</th>'
-        . '<th>' . __('Grant') . '</th>'
-        . '<th>' . __('Action') . '</th>'
-        . '</tr>'
-        . '</thead>';
-}
-
-/**
- * Get HTML error for View Users form
- * For non superusers such as grant/create users
- *
- * @return string $html_output
- */
-function PMA_getHtmlForViewUsersError()
-{
-    return Message::error(
-        __('Not enough privilege to view users.')
-    )->getDisplay();
-}
-
-/**
- * Get HTML snippet for table body of specific database or table privileges
- *
- * @param array  $privMap privilege map
- * @param string $db      database
- *
- * @return string $html_output
- */
-function PMA_getHtmlTableBodyForSpecificDbOrTablePrivs($privMap, $db)
-{
-    $html_output = '<tbody>';
-    $index_checkbox = 0;
-    $odd_row = true;
-    if (empty($privMap)) {
-        $html_output .= '<tr class="odd">'
-            . '<td colspan="6">'
-            . __('No user found.')
-            . '</td>'
-            . '</tr>'
-            . '</tbody>';
-        return $html_output;
-    }
-
-    foreach ($privMap as $current_user => $val) {
-        foreach ($val as $current_host => $current_privileges) {
-            $nbPrivileges = count($current_privileges);
-            $html_output .= '<tr class="' . ($odd_row ? 'odd' : 'even') . '">';
-
-            $value = htmlspecialchars($current_user . '&amp;#27;' . $current_host);
-            $html_output .= '<td';
-            if ($nbPrivileges > 1) {
-                $html_output .= ' rowspan="' . $nbPrivileges . '"';
-            }
-            $html_output .= '>';
-            $html_output .= '<input type="checkbox" class="checkall" '
-                . 'name="selected_usr[]" '
-                . 'id="checkbox_sel_users_' . ($index_checkbox++) . '" '
-                . 'value="' . $value . '" /></td>' . "\n";
-
-            // user
-            $html_output .= '<td';
-            if ($nbPrivileges > 1) {
-                $html_output .= ' rowspan="' . $nbPrivileges . '"';
-            }
-            $html_output .= '>';
-            if (empty($current_user)) {
-                $html_output .= '<span style="color: #FF0000">'
-                    . __('Any') . '</span>';
-            } else {
-                $html_output .= htmlspecialchars($current_user);
-            }
-            $html_output .= '</td>';
-
-            // host
-            $html_output .= '<td';
-            if ($nbPrivileges > 1) {
-                $html_output .= ' rowspan="' . $nbPrivileges . '"';
-            }
-            $html_output .= '>';
-            $html_output .= htmlspecialchars($current_host);
-            $html_output .= '</td>';
-
-            $html_output .= PMA_getHtmlListOfPrivs(
-                $db, $current_privileges, $current_user,
-                $current_host, $odd_row
-            );
-
-            $odd_row = ! $odd_row;
-        }
-    }
-
-    //For fetching routine based privileges
-    $html_output .= PMA_getHtmlTableBodyForSpecificDbRoutinePrivs($db, $odd_row, $index_checkbox);
-    $html_output .= '</tbody>';
-
-    return $html_output;
-}
-
-/**
- * Get HTML to display privileges
- *
- * @param string  $db                 Database name
- * @param array   $current_privileges List of privileges
- * @param string  $current_user       Current user
- * @param string  $current_host       Current host
- * @param boolean $odd_row            Current row is odd
- *
- * @return string HTML to display privileges
- */
-function PMA_getHtmlListOfPrivs(
-    $db, $current_privileges, $current_user,
-    $current_host, $odd_row
-) {
-    $nbPrivileges = count($current_privileges);
-    $html_output = null;
-    for ($i = 0; $i < $nbPrivileges; $i++) {
-        $current = $current_privileges[$i];
-
-        // type
-        $html_output .= '<td>';
-        if ($current['Type'] == 'g') {
-            $html_output .= __('global');
-        } elseif ($current['Type'] == 'd') {
-            if ($current['Db'] == Util::escapeMysqlWildcards($db)) {
-                $html_output .= __('database-specific');
-            } else {
-                $html_output .= __('wildcard') . ': '
-                    . '<code>'
-                    . htmlspecialchars($current['Db'])
-                    . '</code>';
-            }
-        } elseif ($current['Type'] == 't') {
-            $html_output .= __('table-specific');
-        }
-        $html_output .= '</td>';
-
-        // privileges
-        $html_output .= '<td>';
-        if (isset($current['Table_name'])) {
-            $privList = explode(',', $current['Table_priv']);
-            $privs = array();
-            $grantsArr = PMA_getTableGrantsArray();
-            foreach ($grantsArr as $grant) {
-                $privs[$grant[0]] = 'N';
-                foreach ($privList as $priv) {
-                    if ($grant[0] == $priv) {
-                        $privs[$grant[0]] = 'Y';
-                    }
-                }
-            }
-            $html_output .= '<code>'
-                . join(
-                    ',',
-                    PMA_extractPrivInfo($privs, true, true)
-                )
-                . '</code>';
-        } else {
-            $html_output .= '<code>'
-                . join(
-                    ',',
-                    PMA_extractPrivInfo($current, true, false)
-                )
-                . '</code>';
-        }
-        $html_output .= '</td>';
-
-        // grant
-        $html_output .= '<td>';
-        $containsGrant = false;
-        if (isset($current['Table_name'])) {
-            $privList = explode(',', $current['Table_priv']);
-            foreach ($privList as $priv) {
-                if ($priv == 'Grant') {
-                    $containsGrant = true;
-                }
-            }
-        } else {
-            $containsGrant = $current['Grant_priv'] == 'Y';
-        }
-        $html_output .= ($containsGrant ? __('Yes') : __('No'));
-        $html_output .= '</td>';
-
-        // action
-        $html_output .= '<td>';
-        if ($GLOBALS['is_grantuser']) {
-            $specific_db = (isset($current['Db']) && $current['Db'] != '*')
-                ? $current['Db'] : '';
-            $specific_table = (isset($current['Table_name'])
-                && $current['Table_name'] != '*')
-                ? $current['Table_name'] : '';
-            $html_output .= PMA_getUserLink(
-                'edit',
-                $current_user,
-                $current_host,
-                $specific_db,
-                $specific_table
-            );
-        }
-        $html_output .= '</td>';
-
-        $html_output .= '</tr>';
-        if (($i + 1) < $nbPrivileges) {
-            $html_output .= '<tr class="noclick '
-                . ($odd_row ? 'odd' : 'even') . '">';
-        }
-    }
-    return $html_output;
-}
-
-/**
- * Returns edit, revoke or export link for a user.
- *
- * @param string $linktype    The link type (edit | revoke | export)
- * @param string $username    User name
- * @param string $hostname    Host name
- * @param string $dbname      Database name
- * @param string $tablename   Table name
- * @param string $routinename Routine name
- * @param string $initial     Initial value
- *
- * @return string HTML code with link
- */
-function PMA_getUserLink(
-    $linktype, $username, $hostname, $dbname = '',
-    $tablename = '', $routinename = '', $initial = ''
-) {
-    $html = '<a';
-    switch($linktype) {
-    case 'edit':
-        $html .= ' class="edit_user_anchor"';
-        break;
-    case 'export':
-        $html .= ' class="export_user_anchor ajax"';
-        break;
-    }
-    $params = array(
-        'username' => $username,
-        'hostname' => $hostname
-    );
-    switch($linktype) {
-    case 'edit':
-        $params['dbname'] = $dbname;
-        $params['tablename'] = $tablename;
-        $params['routinename'] = $routinename;
-        break;
-    case 'revoke':
-        $params['dbname'] = $dbname;
-        $params['tablename'] = $tablename;
-        $params['routinename'] = $routinename;
-        $params['revokeall'] = 1;
-        break;
-    case 'export':
-        $params['initial'] = $initial;
-        $params['export'] = 1;
-        break;
-    }
-
-    $html .= ' href="server_privileges.php'
-        . PMA_URL_getCommon($params)
-        . '">';
-
-    switch($linktype) {
-    case 'edit':
-        $html .= Util::getIcon('b_usredit.png', __('Edit privileges'));
-        break;
-    case 'revoke':
-        $html .= Util::getIcon('b_usrdrop.png', __('Revoke'));
-        break;
-    case 'export':
-        $html .= Util::getIcon('b_tblexport.png', __('Export'));
-        break;
-    }
-    $html .= '</a>';
-
-    return $html;
-}
-
-/**
- * Returns user group edit link
- *
- * @param string $username User name
- *
- * @return string HTML code with link
- */
-function PMA_getUserGroupEditLink($username)
-{
-     return '<a class="edit_user_group_anchor ajax"'
-        . ' href="server_privileges.php'
-        . PMA_URL_getCommon(array('username' => $username))
-        . '">'
-        . Util::getIcon('b_usrlist.png', __('Edit user group'))
-        . '</a>';
-}
-
-/**
- * Returns number of defined user groups
- *
- * @return integer $user_group_count
- */
-function PMA_getUserGroupCount()
-{
-    $cfgRelation = PMA_getRelationsParam();
-    $user_group_table = Util::backquote($cfgRelation['db'])
-        . '.' . Util::backquote($cfgRelation['usergroups']);
-    $sql_query = 'SELECT COUNT(*) FROM ' . $user_group_table;
-    $user_group_count = $GLOBALS['dbi']->fetchValue(
-        $sql_query, 0, 0, $GLOBALS['controllink']
-    );
-
-    return $user_group_count;
-}
-
-/**
- * Returns name of user group that user is part of
- *
- * @param string $username User name
- *
- * @return mixed usergroup if found or null if not found
- */
-function PMA_getUserGroupForUser($username)
-{
-    $cfgRelation = PMA_getRelationsParam();
-
-    if (! isset($cfgRelation['db'])
-        || ! isset($cfgRelation['users'])
-    ) {
-        return null;
-    }
-
-    $user_table = Util::backquote($cfgRelation['db'])
-        . '.' . Util::backquote($cfgRelation['users']);
-    $sql_query = 'SELECT `usergroup` FROM ' . $user_table
-        . ' WHERE `username` = \'' . $username . '\''
-        . ' LIMIT 1';
-
-    $usergroup = $GLOBALS['dbi']->fetchValue(
-        $sql_query, 0, 0, $GLOBALS['controllink']
-    );
-
-    if ($usergroup === false) {
-        return null;
-    }
-
-    return $usergroup;
-}
-
-/**
- * This function return the extra data array for the ajax behavior
- *
- * @param string $password  password
- * @param string $sql_query sql query
- * @param string $hostname  hostname
- * @param string $username  username
- *
- * @return array $extra_data
- */
-function PMA_getExtraDataForAjaxBehavior(
-    $password, $sql_query, $hostname, $username
-) {
-    if (isset($GLOBALS['dbname'])) {
-        //if (preg_match('/\\\\(?:_|%)/i', $dbname)) {
-        if (preg_match('/(?<!\\\\)(?:_|%)/i', $GLOBALS['dbname'])) {
-            $dbname_is_wildcard = true;
-        } else {
-            $dbname_is_wildcard = false;
-        }
-    }
-
-    $user_group_count = 0;
-    if ($GLOBALS['cfgRelation']['menuswork']) {
-        $user_group_count = PMA_getUserGroupCount();
-    }
-
-    $extra_data = array();
-    if (mb_strlen($sql_query)) {
-        $extra_data['sql_query'] = Util::getMessage(null, $sql_query);
-    }
-
-    if (isset($_REQUEST['change_copy'])) {
-        /**
-         * generate html on the fly for the new user that was just created.
-         */
-        $new_user_string = '<tr>' . "\n"
-            . '<td> <input type="checkbox" name="selected_usr[]" '
-            . 'id="checkbox_sel_users_"'
-            . 'value="'
-            . htmlspecialchars($username)
-            . '&amp;#27;' . htmlspecialchars($hostname) . '" />'
-            . '</td>' . "\n"
-            . '<td><label for="checkbox_sel_users_">'
-            . (empty($_REQUEST['username'])
-                    ? '<span style="color: #FF0000">' . __('Any') . '</span>'
-                    : htmlspecialchars($username) ) . '</label></td>' . "\n"
-            . '<td>' . htmlspecialchars($hostname) . '</td>' . "\n";
-
-        $new_user_string .= '<td>';
-
-        if (! empty($password) || isset($_POST['pma_pw'])) {
-            $new_user_string .= __('Yes');
-        } else {
-            $new_user_string .= '<span style="color: #FF0000">'
-                . __('No')
-            . '</span>';
-        };
-
-        $new_user_string .= '</td>' . "\n";
-        $new_user_string .= '<td>'
-            . '<code>' . join(', ', PMA_extractPrivInfo(null, true)) . '</code>'
-            . '</td>'; //Fill in privileges here
-
-        // if $cfg['Servers'][$i]['users'] and $cfg['Servers'][$i]['usergroups'] are
-        // enabled
-        $cfgRelation = PMA_getRelationsParam();
-        if (isset($cfgRelation['users']) && isset($cfgRelation['usergroups'])) {
-            $new_user_string .= '<td class="usrGroup"></td>';
-        }
-
-        $new_user_string .= '<td>';
-        if ((isset($_POST['Grant_priv']) && $_POST['Grant_priv'] == 'Y')) {
-            $new_user_string .= __('Yes');
-        } else {
-            $new_user_string .= __('No');
-        }
-        $new_user_string .='</td>';
-
-        if ($GLOBALS['is_grantuser']) {
-            $new_user_string .= '<td>'
-                . PMA_getUserLink('edit', $username, $hostname)
-                . '</td>' . "\n";
-        }
-
-        if ($cfgRelation['menuswork'] && $user_group_count > 0) {
-            $new_user_string .= '<td>'
-                . PMA_getUserGroupEditLink($username)
-                . '</td>' . "\n";
-        }
-
-        $new_user_string .= '<td>'
-            . PMA_getUserLink(
-                'export',
-                $username,
-                $hostname,
-                '',
-                '',
-                '',
-                isset($_GET['initial']) ? $_GET['initial'] : ''
-            )
-            . '</td>' . "\n";
-
-        $new_user_string .= '</tr>';
-
-        $extra_data['new_user_string'] = $new_user_string;
-
-        /**
-         * Generate the string for this alphabet's initial, to update the user
-         * pagination
-         */
-        $new_user_initial = mb_strtoupper(
-            mb_substr($username, 0, 1)
-        );
-        $newUserInitialString = '<a href="server_privileges.php'
-            . PMA_URL_getCommon(array('initial' => $new_user_initial)) . '">'
-            . $new_user_initial . '</a>';
-        $extra_data['new_user_initial'] = $new_user_initial;
-        $extra_data['new_user_initial_string'] = $newUserInitialString;
-    }
-
-    if (isset($_POST['update_privs'])) {
-        $extra_data['db_specific_privs'] = false;
-        $extra_data['db_wildcard_privs'] = false;
-        if (isset($dbname_is_wildcard)) {
-            $extra_data['db_specific_privs'] = ! $dbname_is_wildcard;
-            $extra_data['db_wildcard_privs'] = $dbname_is_wildcard;
-        }
-        $new_privileges = join(', ', PMA_extractPrivInfo(null, true));
-
-        $extra_data['new_privileges'] = $new_privileges;
-    }
-
-    if (isset($_REQUEST['validate_username'])) {
-        $sql_query = "SELECT * FROM `mysql`.`user` WHERE `User` = '"
-            . $_REQUEST['username'] . "';";
-        $res = $GLOBALS['dbi']->query($sql_query);
-        $row = $GLOBALS['dbi']->fetchRow($res);
-        if (empty($row)) {
-            $extra_data['user_exists'] = false;
-        } else {
-            $extra_data['user_exists'] = true;
-        }
-    }
-
-    return $extra_data;
-}
-
-/**
- * Get the HTML snippet for change user login information
- *
- * @param string $username username
- * @param string $hostname host name
- *
- * @return string HTML snippet
- */
-function PMA_getChangeLoginInformationHtmlForm($username, $hostname)
-{
-    $choices = array(
-        '4' => __('… keep the old one.'),
-        '1' => __('… delete the old one from the user tables.'),
-        '2' => __(
-            '… revoke all active privileges from '
-            . 'the old one and delete it afterwards.'
-        ),
-        '3' => __(
-            '… delete the old one from the user tables '
-            . 'and reload the privileges afterwards.'
-        )
-    );
-
-    $html_output = '<form action="server_privileges.php" '
-        . 'onsubmit="return checkAddUser(this);" '
-        . 'method="post" class="copyUserForm submenu-item">' . "\n"
-        . PMA_URL_getHiddenInputs('', '')
-        . '<input type="hidden" name="old_username" '
-        . 'value="' . htmlspecialchars($username) . '" />' . "\n"
-        . '<input type="hidden" name="old_hostname" '
-        . 'value="' . htmlspecialchars($hostname) . '" />' . "\n";
-
-    $usergroup = PMA_getUserGroupForUser($username);
-    if ($usergroup !== null) {
-        $html_output .= '<input type="hidden" name="old_usergroup" '
-        . 'value="' . htmlspecialchars($usergroup) . '" />' . "\n";
-    }
-
-    $html_output .= '<fieldset id="fieldset_change_copy_user">' . "\n"
-        . '<legend data-submenu-label="' . __('Login Information') . '">' . "\n"
-        . __('Change login information / Copy user account')
-        . '</legend>' . "\n"
-        . PMA_getHtmlForLoginInformationFields('change', $username, $hostname);
-
-    $html_output .= '<fieldset id="fieldset_mode">' . "\n"
-        . ' <legend>'
-        . __('Create a new user account with the same privileges and …')
-        . '</legend>' . "\n";
-    $html_output .= Util::getRadioFields(
-        'mode', $choices, '4', true
-    );
-    $html_output .= '</fieldset>' . "\n"
-       . '</fieldset>' . "\n";
-
-    $html_output .= '<fieldset id="fieldset_change_copy_user_footer" '
-        . 'class="tblFooters">' . "\n"
-        . '<input type="hidden" name="change_copy" value="1" />' . "\n"
-        . '<input type="submit" value="' . __('Go') . '" />' . "\n"
-        . '</fieldset>' . "\n"
-        . '</form>' . "\n";
-
-    return $html_output;
-}
-
-/**
- * Provide a line with links to the relevant database and table
- *
- * @param string $url_dbname url database name that urlencode() string
- * @param string $dbname     database name
- * @param string $tablename  table name
- *
- * @return string HTML snippet
- */
-function PMA_getLinkToDbAndTable($url_dbname, $dbname, $tablename)
-{
-    $html_output = '[ ' . __('Database')
-        . ' <a href="' . Util::getScriptNameForOption(
-            $GLOBALS['cfg']['DefaultTabDatabase'], 'database'
-        )
-        . PMA_URL_getCommon(
-            array(
-                'db' => $url_dbname,
-                'reload' => 1
-            )
-        )
-        . '">'
-        . htmlspecialchars($dbname) . ': '
-        . Util::getTitleForTarget(
-            $GLOBALS['cfg']['DefaultTabDatabase']
-        )
-        . "</a> ]\n";
-
-    if (mb_strlen($tablename)) {
-        $html_output .= ' [ ' . __('Table') . ' <a href="'
-            . Util::getScriptNameForOption(
-                $GLOBALS['cfg']['DefaultTabTable'], 'table'
-            )
-            . PMA_URL_getCommon(
-                array(
-                    'db' => $url_dbname,
-                    'table' => $tablename,
-                    'reload' => 1,
-                )
-            )
-            . '">' . htmlspecialchars($tablename) . ': '
-            . Util::getTitleForTarget(
-                $GLOBALS['cfg']['DefaultTabTable']
-            )
-            . "</a> ]\n";
-    }
-    return $html_output;
-}
-
-/**
- * no db name given, so we want all privs for the given user
- * db name was given, so we want all user specific rights for this db
- * So this function returns user rights as an array
- *
- * @param string $username username
- * @param string $hostname host name
- * @param string $type     database or table
- * @param string $dbname   database name
- *
- * @return array $db_rights database rights
- */
-function PMA_getUserSpecificRights($username, $hostname, $type, $dbname = '')
-{
-    $user_host_condition = " WHERE `User`"
-        . " = '" . $GLOBALS['dbi']->escapeString($username) . "'"
-        . " AND `Host`"
-        . " = '" . $GLOBALS['dbi']->escapeString($hostname) . "'";
-
-    if ($type == 'database') {
-        $tables_to_search_for_users = array(
-            'tables_priv', 'columns_priv', 'procs_priv'
-        );
-        $dbOrTableName = 'Db';
-    } elseif ($type == 'table') {
-        $user_host_condition .= " AND `Db` LIKE '"
-            . $GLOBALS['dbi']->escapeString($dbname) . "'";
-        $tables_to_search_for_users = array('columns_priv',);
-        $dbOrTableName = 'Table_name';
-    } else { // routine
-        $user_host_condition .= " AND `Db` LIKE '"
-            . $GLOBALS['dbi']->escapeString($dbname) . "'";
-        $tables_to_search_for_users = array('procs_priv',);
-        $dbOrTableName = 'Routine_name';
-    }
-
-    // we also want privileges for this user not in table `db` but in other table
-    $tables = $GLOBALS['dbi']->fetchResult('SHOW TABLES FROM `mysql`;');
-
-    $db_rights_sqls = array();
-    foreach ($tables_to_search_for_users as $table_search_in) {
-        if (in_array($table_search_in, $tables)) {
-            $db_rights_sqls[] = '
-                SELECT DISTINCT `' . $dbOrTableName . '`
-                FROM `mysql`.' . Util::backquote($table_search_in)
-               . $user_host_condition;
-        }
-    }
-
-    $user_defaults = array(
-        $dbOrTableName  => '',
-        'Grant_priv'    => 'N',
-        'privs'         => array('USAGE'),
-        'Column_priv'   => true,
-    );
-
-    // for the rights
-    $db_rights = array();
-
-    $db_rights_sql = '(' . implode(') UNION (', $db_rights_sqls) . ')'
-        . ' ORDER BY `' . $dbOrTableName . '` ASC';
-
-    $db_rights_result = $GLOBALS['dbi']->query($db_rights_sql);
-
-    while ($db_rights_row = $GLOBALS['dbi']->fetchAssoc($db_rights_result)) {
-        $db_rights_row = array_merge($user_defaults, $db_rights_row);
-        if ($type == 'database') {
-            // only Db names in the table `mysql`.`db` uses wildcards
-            // as we are in the db specific rights display we want
-            // all db names escaped, also from other sources
-            $db_rights_row['Db'] = Util::escapeMysqlWildcards(
-                $db_rights_row['Db']
-            );
-        }
-        $db_rights[$db_rights_row[$dbOrTableName]] = $db_rights_row;
-    }
-
-    $GLOBALS['dbi']->freeResult($db_rights_result);
-
-    if ($type == 'database') {
-        $sql_query = 'SELECT * FROM `mysql`.`db`'
-            . $user_host_condition . ' ORDER BY `Db` ASC';
-    } elseif ($type == 'table') {
-        $sql_query = 'SELECT `Table_name`,'
-            . ' `Table_priv`,'
-            . ' IF(`Column_priv` = _latin1 \'\', 0, 1)'
-            . ' AS \'Column_priv\''
-            . ' FROM `mysql`.`tables_priv`'
-            . $user_host_condition
-            . ' ORDER BY `Table_name` ASC;';
-    } else {
-        $sql_query = "SELECT `Routine_name`, `Proc_priv`"
-            . " FROM `mysql`.`procs_priv`"
-            . $user_host_condition
-            . " ORDER BY `Routine_name`";
-
-    }
-
-    $result = $GLOBALS['dbi']->query($sql_query);
-
-    while ($row = $GLOBALS['dbi']->fetchAssoc($result)) {
-        if (isset($db_rights[$row[$dbOrTableName]])) {
-            $db_rights[$row[$dbOrTableName]]
-                = array_merge($db_rights[$row[$dbOrTableName]], $row);
-        } else {
-            $db_rights[$row[$dbOrTableName]] = $row;
-        }
-        if ($type == 'database') {
-            // there are db specific rights for this user
-            // so we can drop this db rights
-            $db_rights[$row['Db']]['can_delete'] = true;
-        }
-    }
-    $GLOBALS['dbi']->freeResult($result);
-    return $db_rights;
-}
-
-/**
- * Get a HTML table for display user's tabel specific or database specific rights
- *
- * @param string $username username
- * @param string $hostname host name
- * @param string $type     database, table or routine
- * @param string $dbname   database name
- *
- * @return array $html_output
- */
-function PMA_getHtmlForAllTableSpecificRights(
-    $username, $hostname, $type, $dbname = ''
-) {
-    $uiData = array(
-        'database' => array(
-            'formId'       => 'database_specific_priv',
-            'subMenuLabel' => __('Database'),
-            'legend'       => __('Database-specific privileges'),
-            'typeLabel'    => __('Database'),
-        ),
-        'table' => array(
-            'formId'       => 'table_specific_priv',
-            'subMenuLabel' => __('Table'),
-            'legend'       => __('Table-specific privileges'),
-            'typeLabel'    => __('Table'),
-        ),
-        'routine' => array(
-            'formId'       => 'routine_specific_priv',
-            'subMenuLabel' => __('Routine'),
-            'legend'       => __('Routine-specific privileges'),
-            'typeLabel'    => __('Routine'),
-        ),
-    );
-
-    /**
-     * no db name given, so we want all privs for the given user
-     * db name was given, so we want all user specific rights for this db
-     */
-    $db_rights = PMA_getUserSpecificRights($username, $hostname, $type, $dbname);
-    ksort($db_rights);
-
-    $foundRows = array();
-    $privileges = array();
-    foreach ($db_rights as $row) {
-        $onePrivilege = array();
-
-        $paramTableName = '';
-        $paramRoutineName = '';
-
-        if ($type == 'database') {
-            $name = $row['Db'];
-            $onePrivilege['grant']        = $row['Grant_priv'] == 'Y';
-            $onePrivilege['tablePrivs']   = ! empty($row['Table_priv'])
-                || ! empty($row['Column_priv']);
-            $onePrivilege['privileges'] = join(',', PMA_extractPrivInfo($row, true));
-
-            $paramDbName = $row['Db'];
-
-        } elseif ($type == 'table') {
-            $name = $row['Table_name'];
-            $onePrivilege['grant'] = in_array(
-                'Grant',
-                explode(',', $row['Table_priv'])
-            );
-            $onePrivilege['columnPrivs']  = ! empty($row['Column_priv']);
-            $onePrivilege['privileges'] = join(',', PMA_extractPrivInfo($row, true));
-
-            $paramDbName = $dbname;
-            $paramTableName = $row['Table_name'];
-
-        } else { // routine
-            $name = $row['Routine_name'];
-            $onePrivilege['grant'] = in_array(
-                'Grant',
-                explode(',', $row['Proc_priv'])
-            );
-
-            $privs = array(
-                'Alter_routine_priv' => 'N',
-                'Execute_priv'       => 'N',
-                'Grant_priv'         => 'N',
-            );
-            foreach (explode(',', $row['Proc_priv']) as $priv) {
-                if ($priv == 'Alter Routine') {
-                    $privs['Alter_routine_priv'] = 'Y';
-                } else {
-                    $privs[$priv . '_priv'] = 'Y';
-                }
-            }
-            $onePrivilege['privileges'] = join(
-                ',',
-                PMA_extractPrivInfo($privs, true)
-            );
-
-            $paramDbName = $dbname;
-            $paramRoutineName = $row['Routine_name'];
-        }
-
-        $foundRows[] = $name;
-        $onePrivilege['name'] = $name;
-
-        $onePrivilege['editLink'] = '';
-        if ($GLOBALS['is_grantuser']) {
-            $onePrivilege['editLink'] = PMA_getUserLink(
-                'edit',
-                $username,
-                $hostname,
-                $paramDbName,
-                $paramTableName,
-                $paramRoutineName
-            );
-        }
-
-        $onePrivilege['revokeLink'] = '';
-        if ($type != 'database' || ! empty($row['can_delete'])) {
-            $onePrivilege['revokeLink'] = PMA_getUserLink(
-                'revoke',
-                $username,
-                $hostname,
-                $paramDbName,
-                $paramTableName,
-                $paramRoutineName
-            );
-        }
-
-        $privileges[] = $onePrivilege;
-    }
-
-    $data = $uiData[$type];
-    $data['privileges'] = $privileges;
-    $data['userName']   = $username;
-    $data['hostName']   = $hostname;
-    $data['database']   = $dbname;
-    $data['type']       = $type;
-
-    if ($type == 'database') {
-
-        // we already have the list of databases from libraries/common.inc.php
-        // via $pma = new PMA;
-        $pred_db_array = $GLOBALS['dblist']->databases;
-        $databases_to_skip = array('information_schema', 'performance_schema');
-
-        $databases = array();
-        if (! empty($pred_db_array)) {
-            foreach ($pred_db_array as $current_db) {
-                if (in_array($current_db, $databases_to_skip)) {
-                    continue;
-                }
-                $current_db_escaped = Util::escapeMysqlWildcards($current_db);
-                // cannot use array_diff() once, outside of the loop,
-                // because the list of databases has special characters
-                // already escaped in $foundRows,
-                // contrary to the output of SHOW DATABASES
-                if (! in_array($current_db_escaped, $foundRows)) {
-                    $databases[] = $current_db;
-                }
-            }
-        }
-        $data['databases'] = $databases;
-
-    } elseif ($type == 'table') {
-        $result = @$GLOBALS['dbi']->tryQuery(
-            "SHOW TABLES FROM " . Util::backquote($dbname),
-            null,
-            DatabaseInterface::QUERY_STORE
-        );
-
-        $tables = array();
-        if ($result) {
-            while ($row = $GLOBALS['dbi']->fetchRow($result)) {
-                if (! in_array($row[0], $foundRows)) {
-                    $tables[] = $row[0];
-                }
-            }
-            $GLOBALS['dbi']->freeResult($result);
-        }
-        $data['tables'] = $tables;
-
-    } else { // routine
-        $routineData = $GLOBALS['dbi']->getRoutines($dbname);
-
-        $routines = array();
-        foreach ($routineData as $routine) {
-            if (! in_array($routine['name'], $foundRows)) {
-                $routines[] = $routine['name'];
-            }
-        }
-        $data['routines'] = $routines;
-    }
-
-    $html_output = Template::get('privileges/privileges_summary')
-        ->render($data);
-
-    return $html_output;
-}
-
-/**
- * Get HTML for display the users overview
- * (if less than 50 users, display them immediately)
- *
- * @param array  $result        ran sql query
- * @param array  $db_rights     user's database rights array
- * @param string $pmaThemeImage a image source link
- * @param string $text_dir      text directory
- *
- * @return string HTML snippet
- */
-function PMA_getUsersOverview($result, $db_rights, $pmaThemeImage, $text_dir)
-{
-    while ($row = $GLOBALS['dbi']->fetchAssoc($result)) {
-        $row['privs'] = PMA_extractPrivInfo($row, true);
-        $db_rights[$row['User']][$row['Host']] = $row;
-    }
-    @$GLOBALS['dbi']->freeResult($result);
-    $user_group_count = 0;
-    if ($GLOBALS['cfgRelation']['menuswork']) {
-        $user_group_count = PMA_getUserGroupCount();
-    }
-
-    $html_output
-        = '<form name="usersForm" id="usersForm" action="server_privileges.php" '
-        . 'method="post">' . "\n"
-        . PMA_URL_getHiddenInputs('', '')
-        . '<table id="tableuserrights" class="data">' . "\n"
-        . '<thead>' . "\n"
-        . '<tr><th></th>' . "\n"
-        . '<th>' . __('User name') . '</th>' . "\n"
-        . '<th>' . __('Host name') . '</th>' . "\n"
-        . '<th>' . __('Password') . '</th>' . "\n"
-        . '<th>' . __('Global privileges') . ' '
-        . Util::showHint(
-            __('Note: MySQL privilege names are expressed in English.')
-        )
-        . '</th>' . "\n";
-    if ($GLOBALS['cfgRelation']['menuswork']) {
-        $html_output .= '<th>' . __('User group') . '</th>' . "\n";
-    }
-    $html_output .= '<th>' . __('Grant') . '</th>' . "\n"
-        . '<th colspan="' . ($user_group_count > 0 ? '3' : '2') . '">'
-        . __('Action') . '</th>' . "\n"
-        . '</tr>' . "\n"
-        . '</thead>' . "\n";
-
-    $html_output .= '<tbody>' . "\n";
-    $html_output .= PMA_getHtmlTableBodyForUserRights($db_rights);
-    $html_output .= '</tbody>'
-        . '</table>' . "\n";
-
-    $html_output .= '<div class="floatleft">'
-        . Util::getWithSelected($pmaThemeImage, $text_dir, "usersForm") . "\n";
-
-    $html_output .= Util::getButtonOrImage(
-        'submit_mult', 'mult_submit', 'submit_mult_export',
-        __('Export'), 'b_tblexport.png', 'export'
-    );
-    $html_output .= '<input type="hidden" name="initial" '
-        . 'value="' . (isset($_GET['initial']) ? htmlspecialchars($_GET['initial']) : '') . '" />';
-    $html_output .= '</div>'
-        . '<div class="clear_both" style="clear:both"></div>';
-
-    // add/delete user fieldset
-    $html_output .= PMA_getFieldsetForAddDeleteUser();
-    $html_output .= '</form>' . "\n";
-
-    return $html_output;
-}
-
-/**
- * Get table body for 'tableuserrights' table in userform
- *
- * @param array $db_rights user's database rights array
- *
- * @return string HTML snippet
- */
-function PMA_getHtmlTableBodyForUserRights($db_rights)
-{
-    $cfgRelation = PMA_getRelationsParam();
-    if ($cfgRelation['menuswork']) {
-        $users_table = Util::backquote($cfgRelation['db'])
-            . "." . Util::backquote($cfgRelation['users']);
-        $sql_query = 'SELECT * FROM ' . $users_table;
-        $result = PMA_queryAsControlUser($sql_query, false);
-        $group_assignment = array();
-        if ($result) {
-            while ($row = $GLOBALS['dbi']->fetchAssoc($result)) {
-                $group_assignment[$row['username']] = $row['usergroup'];
-            }
-        }
-        $GLOBALS['dbi']->freeResult($result);
-
-        $user_group_count = PMA_getUserGroupCount();
-    }
-
-    $odd_row = true;
-    $index_checkbox = 0;
-    $html_output = '';
-    foreach ($db_rights as $user) {
-        ksort($user);
-        foreach ($user as $host) {
-            $index_checkbox++;
-            $html_output .= '<tr class="' . ($odd_row ? 'odd' : 'even') . '">'
-                . "\n";
-            $html_output .= '<td>'
-                . '<input type="checkbox" class="checkall" name="selected_usr[]" '
-                . 'id="checkbox_sel_users_'
-                . $index_checkbox . '" value="'
-                . htmlspecialchars($host['User'] . '&amp;#27;' . $host['Host'])
-                . '"'
-                . ' /></td>' . "\n";
-
-            $html_output .= '<td><label '
-                . 'for="checkbox_sel_users_' . $index_checkbox . '">'
-                . (empty($host['User'])
-                    ? '<span style="color: #FF0000">' . __('Any') . '</span>'
-                    : htmlspecialchars($host['User'])) . '</label></td>' . "\n"
-                . '<td>' . htmlspecialchars($host['Host']) . '</td>' . "\n";
-
-            $html_output .= '<td>';
-
-            $password_column = 'Password';
-
-            $check_plugin_query = "SELECT * FROM `mysql`.`user` WHERE "
-                . "`User` = '" . $host['User'] . "' AND `Host` = '"
-                . $host['Host'] . "'";
-            $res = $GLOBALS['dbi']->fetchSingleRow($check_plugin_query);
-
-            if ((isset($res['authentication_string'])
-                && ! empty($res['authentication_string']))
-                || (isset($res['Password'])
-                && ! empty($res['Password']))
-            ) {
-                $host[$password_column] = 'Y';
-            } else {
-                $host[$password_column] = 'N';
-            }
-
-            switch ($host[$password_column]) {
-            case 'Y':
-                $html_output .= __('Yes');
-                break;
-            case 'N':
-                $html_output .= '<span style="color: #FF0000">' . __('No')
-                    . '</span>';
-                break;
-            // this happens if this is a definition not coming from mysql.user
-            default:
-                $html_output .= '--'; // in future version, replace by "not present"
-                break;
-            } // end switch
-
-            $html_output .= '</td>' . "\n";
-
-            $html_output .= '<td><code>' . "\n"
-                . '' . implode(',' . "\n" . '            ', $host['privs']) . "\n"
-                . '</code></td>' . "\n";
-            if ($cfgRelation['menuswork']) {
-                $html_output .= '<td class="usrGroup">' . "\n"
-                    . (isset($group_assignment[$host['User']])
-                        ? htmlspecialchars($group_assignment[$host['User']])
-                        : ''
-                    )
-                    . '</td>' . "\n";
-            }
-            $html_output .= '<td>'
-                . ($host['Grant_priv'] == 'Y' ? __('Yes') : __('No'))
-                . '</td>' . "\n";
-
-            if ($GLOBALS['is_grantuser']) {
-                $html_output .= '<td class="center">'
-                    . PMA_getUserLink(
-                        'edit',
-                        $host['User'],
-                        $host['Host']
-                    )
-                    . '</td>';
-            }
-            if ($cfgRelation['menuswork'] && $user_group_count > 0) {
-                if (empty($host['User'])) {
-                    $html_output .= '<td class="center"></td>';
-                } else {
-                    $html_output .= '<td class="center">'
-                        . PMA_getUserGroupEditLink($host['User'])
-                        . '</td>';
-                }
-            }
-            $html_output .= '<td class="center">'
-                . PMA_getUserLink(
-                    'export',
-                    $host['User'],
-                    $host['Host'],
-                    '',
-                    '',
-                    '',
-                    isset($_GET['initial']) ? $_GET['initial'] : ''
-                )
-                . '</td>';
-            $html_output .= '</tr>';
-            $odd_row = ! $odd_row;
-        }
-    }
-    return $html_output;
-}
-
-/**
- * Get HTML fieldset for Add/Delete user
- *
- * @return string HTML snippet
- */
-function PMA_getFieldsetForAddDeleteUser()
-{
-    $html_output = PMA_getAddUserHtmlFieldset();
-    $html_output .= '<fieldset id="fieldset_delete_user">'
-        . '<legend>' . "\n"
-        . Util::getIcon('b_usrdrop.png')
-        . '            ' . __('Remove selected user accounts') . '' . "\n"
-        . '</legend>' . "\n";
-
-    $html_output .= '<input type="hidden" name="mode" value="2" />' . "\n"
-        . '('
-        . __(
-            'Revoke all active privileges from the users '
-            . 'and delete them afterwards.'
-        )
-        . ')'
-        . '<br />' . "\n";
-
-    $html_output .= '<input type="checkbox" '
-        . 'title="'
-        . __('Drop the databases that have the same names as the users.')
-        . '" '
-        . 'name="drop_users_db" id="checkbox_drop_users_db" />' . "\n";
-
-    $html_output .= '<label for="checkbox_drop_users_db" '
-        . 'title="'
-        . __('Drop the databases that have the same names as the users.')
-        . '">' . "\n"
-        . '            '
-        . __('Drop the databases that have the same names as the users.')
-        . "\n"
-        . '</label>' . "\n"
-        . '</fieldset>' . "\n";
-
-    $html_output .= '<fieldset id="fieldset_delete_user_footer" class="tblFooters">'
-        . "\n";
-    $html_output .= '<input type="submit" name="delete" '
-        . 'value="' . __('Go') . '" id="buttonGo" '
-        . 'class="ajax"/>' . "\n";
-
-    $html_output .= '</fieldset>' . "\n";
-
-    return $html_output;
-}
-
-/**
- * Get HTML for Displays the initials
- *
- * @param array $array_initials array for all initials, even non A-Z
- *
- * @return string HTML snippet
- */
-function PMA_getHtmlForInitials($array_initials)
-{
-    // initialize to false the letters A-Z
-    for ($letter_counter = 1; $letter_counter < 27; $letter_counter++) {
-        if (! isset($array_initials[mb_chr($letter_counter + 64)])) {
-            $array_initials[mb_chr($letter_counter + 64)] = false;
-        }
-    }
-
-    $initials = $GLOBALS['dbi']->tryQuery(
-        'SELECT DISTINCT UPPER(LEFT(`User`,1)) FROM `user`'
-        . ' ORDER BY UPPER(LEFT(`User`,1)) ASC',
-        null,
-        PMA\libraries\DatabaseInterface::QUERY_STORE
-    );
-    if ($initials) {
-        while (list($tmp_initial) = $GLOBALS['dbi']->fetchRow($initials)) {
-            $array_initials[$tmp_initial] = true;
-        }
-    }
-
-    // Display the initials, which can be any characters, not
-    // just letters. For letters A-Z, we add the non-used letters
-    // as greyed out.
-
-    uksort($array_initials, "strnatcasecmp");
-
-    $html_output = '<table id="initials_table" cellspacing="5">'
-        . '<tr>';
-    foreach ($array_initials as $tmp_initial => $initial_was_found) {
-        if ($tmp_initial === null) {
-            continue;
-        }
-
-        if (!$initial_was_found) {
-            $html_output .= '<td>' . $tmp_initial . '</td>';
-            continue;
-        }
-
-        $html_output .= '<td>'
-            . '<a class="ajax'
-            . ((isset($_REQUEST['initial'])
-                && $_REQUEST['initial'] === $tmp_initial
-                ) ? ' active' : '')
-            . '" href="server_privileges.php'
-            . PMA_URL_getCommon(array('initial' => $tmp_initial))
-            . '">' . $tmp_initial
-            . '</a>'
-            . '</td>' . "\n";
-    }
-    $html_output .= '<td>'
-        . '<a href="server_privileges.php'
-        . PMA_URL_getCommon(array('showall' => 1))
-        . '" class="nowrap">' . __('Show all') . '</a></td>' . "\n";
-    $html_output .= '</tr></table>';
-
-    return $html_output;
-}
-
-/**
- * Get the database rights array for Display user overview
- *
- * @return array  $db_rights    database rights array
- */
-function PMA_getDbRightsForUserOverview()
-{
-    // we also want users not in table `user` but in other table
-    $tables = $GLOBALS['dbi']->fetchResult('SHOW TABLES FROM `mysql`;');
-
-    $tablesSearchForUsers = array(
-        'user', 'db', 'tables_priv', 'columns_priv', 'procs_priv',
-    );
-
-    $db_rights_sqls = array();
-    foreach ($tablesSearchForUsers as $table_search_in) {
-        if (in_array($table_search_in, $tables)) {
-            $db_rights_sqls[] = 'SELECT DISTINCT `User`, `Host` FROM `mysql`.`'
-                . $table_search_in . '` '
-                . (isset($_GET['initial'])
-                ? PMA_rangeOfUsers($_GET['initial'])
-                : '');
-        }
-    }
-    $user_defaults = array(
-        'User'       => '',
-        'Host'       => '%',
-        'Password'   => '?',
-        'Grant_priv' => 'N',
-        'privs'      => array('USAGE'),
-    );
-
-    // for the rights
-    $db_rights = array();
-
-    $db_rights_sql = '(' . implode(') UNION (', $db_rights_sqls) . ')'
-        . ' ORDER BY `User` ASC, `Host` ASC';
-
-    $db_rights_result = $GLOBALS['dbi']->query($db_rights_sql);
-
-    while ($db_rights_row = $GLOBALS['dbi']->fetchAssoc($db_rights_result)) {
-        $db_rights_row = array_merge($user_defaults, $db_rights_row);
-        $db_rights[$db_rights_row['User']][$db_rights_row['Host']]
-            = $db_rights_row;
-    }
-    $GLOBALS['dbi']->freeResult($db_rights_result);
-    ksort($db_rights);
-
-    return $db_rights;
-}
-
-/**
- * Delete user and get message and sql query for delete user in privileges
- *
- * @param array $queries queries
- *
- * @return array Message
- */
-function PMA_deleteUser($queries)
-{
-    $sql_query = '';
-    if (empty($queries)) {
-        $message = Message::error(__('No users selected for deleting!'));
-    } else {
-        if ($_REQUEST['mode'] == 3) {
-            $queries[] = '# ' . __('Reloading the privileges') . ' …';
-            $queries[] = 'FLUSH PRIVILEGES;';
-        }
-        $drop_user_error = '';
-        foreach ($queries as $sql_query) {
-            if ($sql_query{0} != '#') {
-                if (! $GLOBALS['dbi']->tryQuery($sql_query, $GLOBALS['userlink'])) {
-                    $drop_user_error .= $GLOBALS['dbi']->getError() . "\n";
-                }
-            }
-        }
-        // tracking sets this, causing the deleted db to be shown in navi
-        unset($GLOBALS['db']);
-
-        $sql_query = join("\n", $queries);
-        if (! empty($drop_user_error)) {
-            $message = Message::rawError($drop_user_error);
-        } else {
-            $message = Message::success(
-                __('The selected users have been deleted successfully.')
-            );
-        }
-    }
-    return array($sql_query, $message);
-}
-
-/**
- * Update the privileges and return the success or error message
- *
- * @param string $username  username
- * @param string $hostname  host name
- * @param string $tablename table name
- * @param string $dbname    database name
- * @param string $itemType  item type
- *
- * @return Message success message or error message for update
- */
-function PMA_updatePrivileges($username, $hostname, $tablename, $dbname, $itemType)
-{
-    $db_and_table = PMA_wildcardEscapeForGrant($dbname, $tablename);
-
-    $sql_query0 = 'REVOKE ALL PRIVILEGES ON ' . $itemType . ' ' . $db_and_table
-        . ' FROM \'' . $GLOBALS['dbi']->escapeString($username)
-        . '\'@\'' . $GLOBALS['dbi']->escapeString($hostname) . '\';';
-
-    if (! isset($_POST['Grant_priv']) || $_POST['Grant_priv'] != 'Y') {
-        $sql_query1 = 'REVOKE GRANT OPTION ON ' . $itemType . ' ' . $db_and_table
-            . ' FROM \'' . $GLOBALS['dbi']->escapeString($username) . '\'@\''
-            . $GLOBALS['dbi']->escapeString($hostname) . '\';';
-    } else {
-        $sql_query1 = '';
-    }
-
-    // Should not do a GRANT USAGE for a table-specific privilege, it
-    // causes problems later (cannot revoke it)
-    if (! (mb_strlen($tablename)
-        && 'USAGE' == implode('', PMA_extractPrivInfo()))
-    ) {
-        $sql_query2 = 'GRANT ' . join(', ', PMA_extractPrivInfo())
-            . ' ON ' . $itemType . ' ' . $db_and_table
-            . ' TO \'' . $GLOBALS['dbi']->escapeString($username) . '\'@\''
-            . $GLOBALS['dbi']->escapeString($hostname) . '\'';
-
-        if (! mb_strlen($dbname)) {
-            // add REQUIRE clause
-            $sql_query2 .= PMA_getRequireClause();
-        }
-
-        if ((isset($_POST['Grant_priv']) && $_POST['Grant_priv'] == 'Y')
-            || (! mb_strlen($dbname)
-            && (isset($_POST['max_questions']) || isset($_POST['max_connections'])
-            || isset($_POST['max_updates'])
-            || isset($_POST['max_user_connections'])))
-        ) {
-            $sql_query2 .= PMA_getWithClauseForAddUserAndUpdatePrivs();
-        }
-        $sql_query2 .= ';';
-    }
-    if (! $GLOBALS['dbi']->tryQuery($sql_query0)) {
-        // This might fail when the executing user does not have
-        // ALL PRIVILEGES himself.
-        // See https://sourceforge.net/p/phpmyadmin/bugs/3270/
-        $sql_query0 = '';
-    }
-    if (! empty($sql_query1) && ! $GLOBALS['dbi']->tryQuery($sql_query1)) {
-        // this one may fail, too...
-        $sql_query1 = '';
-    }
-    if (! empty($sql_query2)) {
-        $GLOBALS['dbi']->query($sql_query2);
-    } else {
-        $sql_query2 = '';
-    }
-    $sql_query = $sql_query0 . ' ' . $sql_query1 . ' ' . $sql_query2;
-    $message = Message::success(__('You have updated the privileges for %s.'));
-    $message->addParam(
-        '\'' . htmlspecialchars($username)
-        . '\'@\'' . htmlspecialchars($hostname) . '\''
-    );
-
-    return array($sql_query, $message);
-}
-
-/**
- * Get List of information: Changes / copies a user
- *
- * @return array
- */
-function PMA_getDataForChangeOrCopyUser()
-{
-    $queries = null;
-    $password = null;
-
-    if (isset($_REQUEST['change_copy'])) {
-        $user_host_condition = ' WHERE `User` = '
-            . "'" . $GLOBALS['dbi']->escapeString($_REQUEST['old_username']) . "'"
-            . ' AND `Host` = '
-            . "'" . $GLOBALS['dbi']->escapeString($_REQUEST['old_hostname']) . "';";
-        $row = $GLOBALS['dbi']->fetchSingleRow(
-            'SELECT * FROM `mysql`.`user` ' . $user_host_condition
-        );
-        if (! $row) {
-            $response = PMA\libraries\Response::getInstance();
-            $response->addHTML(
-                Message::notice(__('No user found.'))->getDisplay()
-            );
-            unset($_REQUEST['change_copy']);
-        } else {
-            extract($row, EXTR_OVERWRITE);
-            foreach ($row as $key => $value) {
-                $GLOBALS[$key] = $value;
-            }
-            // Recent MySQL versions have the field "Password" in mysql.user,
-            // so the previous extract creates $Password but this script
-            // uses $password
-            if (! isset($password) && isset($Password)) {
-                $password = $Password;
-            }
-            if (Util::getServerType() == 'MySQL'
-                && PMA_MYSQL_INT_VERSION >= 50606
-                && PMA_MYSQL_INT_VERSION < 50706
-                && ((isset($authentication_string)
-                && empty($password))
-                || (isset($plugin)
-                && $plugin == 'sha256_password'))
-            ) {
-                $password = $authentication_string;
-            }
-
-            if (Util::getServerType() == 'MariaDB'
-                && PMA_MYSQL_INT_VERSION >= 50500
-                && isset($authentication_string)
-                && empty($password)
-            ) {
-                $password = $authentication_string;
-            }
-
-            // Always use 'authentication_string' column
-            // for MySQL 5.7.6+ since it does not have
-            // the 'password' column at all
-            if (Util::getServerType() == 'MySQL'
-                && PMA_MYSQL_INT_VERSION >= 50706
-                && isset($authentication_string)
-            ) {
-                $password = $authentication_string;
-            }
-
-            $queries = array();
-        }
-    }
-
-    return array($queries, $password);
-}
-
-/**
- * Update Data for information: Deletes users
- *
- * @param array $queries queries array
- *
- * @return array
- */
-function PMA_getDataForDeleteUsers($queries)
-{
-    if (isset($_REQUEST['change_copy'])) {
-        $selected_usr = array(
-            $_REQUEST['old_username'] . '&amp;#27;' . $_REQUEST['old_hostname']
-        );
-    } else {
-        $selected_usr = $_REQUEST['selected_usr'];
-        $queries = array();
-    }
-
-    // this happens, was seen in https://reports.phpmyadmin.net/reports/view/17146
-    if (! is_array($selected_usr)) {
-        return array();
-    }
-
-    foreach ($selected_usr as $each_user) {
-        list($this_user, $this_host) = explode('&amp;#27;', $each_user);
-        $queries[] = '# '
-            . sprintf(
-                __('Deleting %s'),
-                '\'' . $this_user . '\'@\'' . $this_host . '\''
-            )
-            . ' ...';
-        $queries[] = 'DROP USER \''
-            . $GLOBALS['dbi']->escapeString($this_user)
-            . '\'@\'' . $GLOBALS['dbi']->escapeString($this_host) . '\';';
-        PMA_relationsCleanupUser($this_user);
-
-        if (isset($_REQUEST['drop_users_db'])) {
-            $queries[] = 'DROP DATABASE IF EXISTS '
-                . Util::backquote($this_user) . ';';
-            $GLOBALS['reload'] = true;
-        }
-    }
-    return $queries;
-}
-
-/**
- * update Message For Reload
- *
- * @return array
- */
-function PMA_updateMessageForReload()
-{
-    $message = null;
-    if (isset($_REQUEST['flush_privileges'])) {
-        $sql_query = 'FLUSH PRIVILEGES;';
-        $GLOBALS['dbi']->query($sql_query);
-        $message = Message::success(
-            __('The privileges were reloaded successfully.')
-        );
-    }
-
-    if (isset($_REQUEST['validate_username'])) {
-        $message = Message::success();
-    }
-
-    return $message;
-}
-
-/**
- * update Data For Queries from queries_for_display
- *
- * @param array      $queries             queries array
- * @param array|null $queries_for_display queries array for display
- *
- * @return null
- */
-function PMA_getDataForQueries($queries, $queries_for_display)
-{
-    $tmp_count = 0;
-    foreach ($queries as $sql_query) {
-        if ($sql_query{0} != '#') {
-            $GLOBALS['dbi']->query($sql_query);
-        }
-        // when there is a query containing a hidden password, take it
-        // instead of the real query sent
-        if (isset($queries_for_display[$tmp_count])) {
-            $queries[$tmp_count] = $queries_for_display[$tmp_count];
-        }
-        $tmp_count++;
-    }
-
-    return $queries;
-}
-
-/**
- * update Data for information: Adds a user
- *
- * @param string $dbname      db name
- * @param string $username    user name
- * @param string $hostname    host name
- * @param string $password    password
- * @param bool   $is_menuwork is_menuwork set?
- *
- * @return array
- */
-function PMA_addUser(
-    $dbname, $username, $hostname,
-    $password, $is_menuwork
-) {
-    $_add_user_error = false;
-    $message = null;
-    $queries = null;
-    $queries_for_display = null;
-    $sql_query = null;
-
-    if (!isset($_REQUEST['adduser_submit']) && !isset($_REQUEST['change_copy'])) {
-        return array(
-            $message, $queries, $queries_for_display, $sql_query, $_add_user_error
-        );
-    }
-
-    $sql_query = '';
-    if ($_POST['pred_username'] == 'any') {
-        $username = '';
-    }
-    switch ($_POST['pred_hostname']) {
-    case 'any':
-        $hostname = '%';
-        break;
-    case 'localhost':
-        $hostname = 'localhost';
-        break;
-    case 'hosttable':
-        $hostname = '';
-        break;
-    case 'thishost':
-        $_user_name = $GLOBALS['dbi']->fetchValue('SELECT USER()');
-        $hostname = mb_substr(
-            $_user_name,
-            (mb_strrpos($_user_name, '@') + 1)
-        );
-        unset($_user_name);
-        break;
-    }
-    $sql = "SELECT '1' FROM `mysql`.`user`"
-        . " WHERE `User` = '" . $GLOBALS['dbi']->escapeString($username) . "'"
-        . " AND `Host` = '" . $GLOBALS['dbi']->escapeString($hostname) . "';";
-    if ($GLOBALS['dbi']->fetchValue($sql) == 1) {
-        $message = Message::error(__('The user %s already exists!'));
-        $message->addParam(
-            '[em]\'' . $username . '\'@\'' . $hostname . '\'[/em]'
-        );
-        $_REQUEST['adduser'] = true;
-        $_add_user_error = true;
-
-        return array(
-            $message,
-            $queries,
-            $queries_for_display,
-            $sql_query,
-            $_add_user_error
-        );
-    }
-
-    list(
-        $create_user_real, $create_user_show, $real_sql_query, $sql_query,
-        $password_set_real, $password_set_show
-    ) = PMA_getSqlQueriesForDisplayAndAddUser(
-        $username, $hostname, (isset($password) ? $password : '')
-    );
-
-    if (empty($_REQUEST['change_copy'])) {
-        $_error = false;
-
-        if (isset($create_user_real)) {
-            if (!$GLOBALS['dbi']->tryQuery($create_user_real)) {
-                $_error = true;
-            }
-            if (isset($password_set_real) && !empty($password_set_real)
-                && isset($_REQUEST['authentication_plugin'])
-            ) {
-                PMA_setProperPasswordHashing(
-                    $_REQUEST['authentication_plugin']
-                );
-                if ($GLOBALS['dbi']->tryQuery($password_set_real)) {
-                    $sql_query .= $password_set_show;
-                }
-            }
-            $sql_query = $create_user_show . $sql_query;
-        }
-
-        list($sql_query, $message) = PMA_addUserAndCreateDatabase(
-            $_error,
-            $real_sql_query,
-            $sql_query,
-            $username,
-            $hostname,
-            isset($dbname) ? $dbname : null
-        );
-        if (!empty($_REQUEST['userGroup']) && $is_menuwork) {
-            PMA_setUserGroup($GLOBALS['username'], $_REQUEST['userGroup']);
-        }
-
-        return array(
-            $message,
-            $queries,
-            $queries_for_display,
-            $sql_query,
-            $_add_user_error
-        );
-    }
-
-    // Copy the user group while copying a user
-    $old_usergroup =
-        $_REQUEST['old_usergroup'] ? $_REQUEST['old_usergroup'] : null;
-    PMA_setUserGroup($_REQUEST['username'], $old_usergroup);
-
-
-    if (isset($create_user_real)) {
-        $queries[] = $create_user_real;
-    }
-    $queries[] = $real_sql_query;
-
-    if (isset($password_set_real) && ! empty($password_set_real)
-        && isset($_REQUEST['authentication_plugin'])
-    ) {
-        PMA_setProperPasswordHashing(
-            $_REQUEST['authentication_plugin']
-        );
-
-        $queries[] = $password_set_real;
-    }
-    // we put the query containing the hidden password in
-    // $queries_for_display, at the same position occupied
-    // by the real query in $queries
-    $tmp_count = count($queries);
-    if (isset($create_user_real)) {
-        $queries_for_display[$tmp_count - 2] = $create_user_show;
-    }
-    if (isset($password_set_real) && ! empty($password_set_real)) {
-        $queries_for_display[$tmp_count - 3] = $create_user_show;
-        $queries_for_display[$tmp_count - 2] = $sql_query;
-        $queries_for_display[$tmp_count - 1] = $password_set_show;
-    } else {
-        $queries_for_display[$tmp_count - 1] = $sql_query;
-    }
-
-    return array(
-        $message, $queries, $queries_for_display, $sql_query, $_add_user_error
-    );
-}
-
-/**
- * Sets proper value of `old_passwords` according to
- * the authentication plugin selected
- *
- * @param string $auth_plugin authentication plugin selected
- *
- * @return void
- */
-function PMA_setProperPasswordHashing($auth_plugin)
-{
-    // Set the hashing method used by PASSWORD()
-    // to be of type depending upon $authentication_plugin
-    if ($auth_plugin == 'sha256_password') {
-        $GLOBALS['dbi']->tryQuery('SET `old_passwords` = 2');
-    } else if ($auth_plugin == 'mysql_old_password') {
-        $GLOBALS['dbi']->tryQuery('SET `old_passwords` = 1');
-    } else {
-        $GLOBALS['dbi']->tryQuery('SET `old_passwords` = 0');
-    }
-}
-
-/**
- * Update DB information: DB, Table, isWildcard
- *
- * @return array
- */
-function PMA_getDataForDBInfo()
-{
-    $username = null;
-    $hostname = null;
-    $dbname = null;
-    $tablename = null;
-    $routinename = null;
-    $dbname_is_wildcard = null;
-
-    if (isset($_REQUEST['username'])) {
-        $username = $_REQUEST['username'];
-    }
-    if (isset($_REQUEST['hostname'])) {
-        $hostname = $_REQUEST['hostname'];
-    }
-    /**
-     * Checks if a dropdown box has been used for selecting a database / table
-     */
-    if (PMA_isValid($_REQUEST['pred_tablename'])) {
-        $tablename = $_REQUEST['pred_tablename'];
-    } elseif (PMA_isValid($_REQUEST['tablename'])) {
-        $tablename = $_REQUEST['tablename'];
-    } else {
-        unset($tablename);
-    }
-
-    if (PMA_isValid($_REQUEST['pred_routinename'])) {
-        $routinename = $_REQUEST['pred_routinename'];
-    } elseif (PMA_isValid($_REQUEST['routinename'])) {
-        $routinename = $_REQUEST['routinename'];
-    } else {
-        unset($routinename);
-    }
-
-    if (isset($_REQUEST['pred_dbname'])) {
-        $is_valid_pred_dbname = true;
-        foreach ($_REQUEST['pred_dbname'] as $key => $db_name) {
-            if (! PMA_isValid($db_name)) {
-                $is_valid_pred_dbname = false;
-                break;
-            }
-        }
-    }
-
-    if (isset($_REQUEST['dbname'])) {
-        $is_valid_dbname = true;
-        if (is_array($_REQUEST['dbname'])) {
-            foreach ($_REQUEST['dbname'] as $key => $db_name) {
-                if (! PMA_isValid($db_name)) {
-                    $is_valid_dbname = false;
-                    break;
-                }
-            }
-        } else {
-            if (! PMA_isValid($_REQUEST['dbname'])) {
-                $is_valid_dbname = false;
-            }
-        }
-    }
-
-    if (isset($is_valid_pred_dbname) && $is_valid_pred_dbname) {
-        $dbname = $_REQUEST['pred_dbname'];
-        // If dbname contains only one database.
-        if (count($dbname) == 1) {
-            $dbname = $dbname[0];
-        }
-    } elseif (isset($is_valid_dbname) && $is_valid_dbname) {
-        $dbname = $_REQUEST['dbname'];
-    } else {
-        unset($dbname);
-        unset($tablename);
-    }
-
-    if (isset($dbname)) {
-        if (is_array($dbname)) {
-            $db_and_table = $dbname;
-            foreach ($db_and_table as $key => $db_name) {
-                $db_and_table[$key] .= '.';
-            }
-        } else {
-            $unescaped_db = Util::unescapeMysqlWildcards($dbname);
-            $db_and_table = Util::backquote($unescaped_db) . '.';
-        }
-        if (isset($tablename)) {
-            $db_and_table .= Util::backquote($tablename);
-        } else {
-            if (is_array($db_and_table)) {
-                foreach ($db_and_table as $key => $db_name) {
-                    $db_and_table[$key] .= '*';
-                }
-            } else {
-                $db_and_table .= '*';
-            }
-        }
-    } else {
-        $db_and_table = '*.*';
-    }
-
-    // check if given $dbname is a wildcard or not
-    if (isset($dbname)) {
-        //if (preg_match('/\\\\(?:_|%)/i', $dbname)) {
-        if (! is_array($dbname) && preg_match('/(?<!\\\\)(?:_|%)/i', $dbname)) {
-            $dbname_is_wildcard = true;
-        } else {
-            $dbname_is_wildcard = false;
-        }
-    }
-
-    return array(
-        $username, $hostname,
-        isset($dbname)? $dbname : null,
-        isset($tablename)? $tablename : null,
-        isset($routinename) ? $routinename : null,
-        $db_and_table,
-        $dbname_is_wildcard,
-    );
-}
-
-/**
- * Get title and textarea for export user definition in Privileges
- *
- * @param string $username username
- * @param string $hostname host name
- *
- * @return array ($title, $export)
- */
-function PMA_getListForExportUserDefinition($username, $hostname)
-{
-    $export = '<textarea class="export" cols="60" rows="15">';
-
-    if (isset($_REQUEST['selected_usr'])) {
-        // export privileges for selected users
-        $title = __('Privileges');
-
-        //For removing duplicate entries of users
-        $_REQUEST['selected_usr'] = array_unique($_REQUEST['selected_usr']);
-
-        foreach ($_REQUEST['selected_usr'] as $export_user) {
-            $export_username = mb_substr(
-                $export_user, 0, mb_strpos($export_user, '&')
-            );
-            $export_hostname = mb_substr(
-                $export_user, mb_strrpos($export_user, ';') + 1
-            );
-            $export .= '# '
-                . sprintf(
-                    __('Privileges for %s'),
-                    '`' . htmlspecialchars($export_username)
-                    . '`@`' . htmlspecialchars($export_hostname) . '`'
-                )
-                . "\n\n";
-            $export .= PMA_getGrants($export_username, $export_hostname) . "\n";
-        }
-    } else {
-        // export privileges for a single user
-        $title = __('User') . ' `' . htmlspecialchars($username)
-            . '`@`' . htmlspecialchars($hostname) . '`';
-        $export .= PMA_getGrants($username, $hostname);
-    }
-    // remove trailing whitespace
-    $export = trim($export);
-
-    $export .= '</textarea>';
-
-    return array($title, $export);
-}
-
-/**
- * Get HTML for display Add userfieldset
- *
- * @param string $db    the database
- * @param string $table the table name
- *
- * @return string html output
- */
-function PMA_getAddUserHtmlFieldset($db = '', $table = '')
-{
-    if (!$GLOBALS['is_createuser']) {
-        return '';
-    }
-    $rel_params = array();
-    $url_params = array(
-        'adduser' => 1
-    );
-    if (!empty($db)) {
-        $url_params['dbname']
-            = $rel_params['checkprivsdb']
-                = $db;
-    }
-    if (!empty($table)) {
-        $url_params['tablename']
-            = $rel_params['checkprivstable']
-                = $table;
-    }
-
-    return '<fieldset id="fieldset_add_user">' . "\n"
-        . '<legend>' . _pgettext('Create new user', 'New') . '</legend>'
-        . '<a id="add_user_anchor" href="server_privileges.php'
-        . PMA_URL_getCommon($url_params) . '" '
-        . (!empty($rel_params)
-            ? ('rel="' . PMA_URL_getCommon($rel_params) . '" ')
-            : '')
-        . '>' . "\n"
-        . Util::getIcon('b_usradd.png')
-        . '            ' . __('Add user account') . '</a>' . "\n"
-        . '</fieldset>' . "\n";
-}
-
-/**
- * Get HTML header for display User's properties
- *
- * @param boolean $dbname_is_wildcard whether database name is wildcard or not
- * @param string  $url_dbname         url database name that urlencode() string
- * @param string  $dbname             database name
- * @param string  $username           username
- * @param string  $hostname           host name
- * @param string  $entity_name        entity (table or routine) name
- * @param string  $entity_type        optional, type of entity ('table' or 'routine')
- *
- * @return string $html_output
- */
-function PMA_getHtmlHeaderForUserProperties(
-    $dbname_is_wildcard, $url_dbname, $dbname,
-    $username, $hostname, $entity_name, $entity_type='table'
-) {
-    $html_output = '<h2>' . "\n"
-       . Util::getIcon('b_usredit.png')
-       . __('Edit privileges:') . ' '
-       . __('User account');
-
-    if (! empty($dbname)) {
-        $html_output .= ' <i><a class="edit_user_anchor"'
-            . ' href="server_privileges.php'
-            . PMA_URL_getCommon(
-                array(
-                    'username' => $username,
-                    'hostname' => $hostname,
-                    'dbname' => '',
-                    'tablename' => '',
-                )
-            )
-            . '">\'' . htmlspecialchars($username)
-            . '\'@\'' . htmlspecialchars($hostname)
-            . '\'</a></i>' . "\n";
-
-        $html_output .= ' - ';
-        $html_output .= ($dbname_is_wildcard
-            || is_array($dbname) && count($dbname) > 1)
-            ? __('Databases') : __('Database');
-        if (! empty($entity_name) && $entity_type === 'table') {
-            $html_output .= ' <i><a href="server_privileges.php'
-                . PMA_URL_getCommon(
-                    array(
-                        'username' => $username,
-                        'hostname' => $hostname,
-                        'dbname' => $url_dbname,
-                        'tablename' => '',
-                    )
-                )
-                . '">' . htmlspecialchars($dbname)
-                . '</a></i>';
-
-            $html_output .= ' - ' . __('Table')
-                . ' <i>' . htmlspecialchars($entity_name) . '</i>';
-        } elseif (! empty($entity_name)) {
-            $html_output .= ' <i><a href="server_privileges.php'
-                . PMA_URL_getCommon(
-                    array(
-                        'username' => $username,
-                        'hostname' => $hostname,
-                        'dbname' => $url_dbname,
-                        'routinename' => '',
-                    )
-                )
-                . '">' . htmlspecialchars($dbname)
-                . '</a></i>';
-
-            $html_output .= ' - ' . __('Routine')
-                . ' <i>' . htmlspecialchars($entity_name) . '</i>';
-        } else {
-            if (! is_array($dbname)) {
-                $dbname = array($dbname);
-            }
-            $html_output .= ' <i>'
-                . htmlspecialchars(implode(', ', $dbname))
-                . '</i>';
-        }
-
-    } else {
-        $html_output .= ' <i>\'' . htmlspecialchars($username)
-            . '\'@\'' . htmlspecialchars($hostname)
-            . '\'</i>' . "\n";
-
-    }
-    $html_output .= '</h2>' . "\n";
-    $cur_user = htmlspecialchars($GLOBALS['dbi']->getCurrentUser());
-    $user = htmlspecialchars($username . '@' . $hostname);
-    // Add a short notice for the user
-    // to remind him that he is editing his own privileges
-    if ($user === $cur_user) {
-        $html_output .= Message::notice(
-            __(
-                'Note: You are attempting to edit privileges of the '
-                . 'user with which you are currently logged in.'
-            )
-        )->getDisplay();
-    }
-    return $html_output;
-}
-
-/**
- * Get HTML snippet for display user overview page
- *
- * @param string $pmaThemeImage a image source link
- * @param string $text_dir      text directory
- *
- * @return string $html_output
- */
-function PMA_getHtmlForUserOverview($pmaThemeImage, $text_dir)
-{
-    $html_output = '<h2>' . "\n"
-       . Util::getIcon('b_usrlist.png')
-       . __('User accounts overview') . "\n"
-       . '</h2>' . "\n";
-
-    $password_column = 'Password';
-    $server_type = Util::getServerType();
-    if (($server_type == 'MySQL' || $server_type == 'Percona Server')
-        && PMA_MYSQL_INT_VERSION >= 50706
-    ) {
-        $password_column = 'authentication_string';
-    }
-    // $sql_query is for the initial-filtered,
-    // $sql_query_all is for counting the total no. of users
-
-    $sql_query = $sql_query_all = 'SELECT *,' .
-        " IF(`" . $password_column . "` = _latin1 '', 'N', 'Y') AS 'Password'" .
-        ' FROM `mysql`.`user`';
-
-    $sql_query .= (isset($_REQUEST['initial'])
-        ? PMA_rangeOfUsers($_REQUEST['initial'])
-        : '');
-
-    $sql_query .= ' ORDER BY `User` ASC, `Host` ASC;';
-    $sql_query_all .= ' ;';
-
-    $res = $GLOBALS['dbi']->tryQuery(
-        $sql_query, null, PMA\libraries\DatabaseInterface::QUERY_STORE
-    );
-    $res_all = $GLOBALS['dbi']->tryQuery(
-        $sql_query_all, null, PMA\libraries\DatabaseInterface::QUERY_STORE
-    );
-
-    if (! $res) {
-        // the query failed! This may have two reasons:
-        // - the user does not have enough privileges
-        // - the privilege tables use a structure of an earlier version.
-        // so let's try a more simple query
-
-        $GLOBALS['dbi']->freeResult($res);
-        $GLOBALS['dbi']->freeResult($res_all);
-        $sql_query = 'SELECT * FROM `mysql`.`user`';
-        $res = $GLOBALS['dbi']->tryQuery(
-            $sql_query, null, PMA\libraries\DatabaseInterface::QUERY_STORE
-        );
-
-        if (! $res) {
-            $html_output .= PMA_getHtmlForViewUsersError();
-            $html_output .= PMA_getAddUserHtmlFieldset();
-        } else {
-            // This message is hardcoded because I will replace it by
-            // a automatic repair feature soon.
-            $raw = 'Your privilege table structure seems to be older than'
-                . ' this MySQL version!<br />'
-                . 'Please run the <code>mysql_upgrade</code> command'
-                . '(<code>mysql_fix_privilege_tables</code> on older systems)'
-                . ' that should be included in your MySQL server distribution'
-                . ' to solve this problem!';
-            $html_output .= Message::rawError($raw)->getDisplay();
-        }
-        $GLOBALS['dbi']->freeResult($res);
-    } else {
-        $db_rights = PMA_getDbRightsForUserOverview();
-        // for all initials, even non A-Z
-        $array_initials = array();
-
-        foreach ($db_rights as $right) {
-            foreach ($right as $account) {
-                if (empty($account['User']) && $account['Host'] == 'localhost') {
-                    $html_output .= Message::notice(
-                        __(
-                            'A user account allowing any user from localhost to '
-                            . 'connect is present. This will prevent other users '
-                            . 'from connecting if the host part of their account '
-                            . 'allows a connection from any (%) host.'
-                        )
-                        . Util::showMySQLDocu('problems-connecting')
-                    )->getDisplay();
-                    break 2;
-                }
-            }
-        }
-
-        /**
-         * Displays the initials
-         * Also not necessary if there is less than 20 privileges
-         */
-        if ($GLOBALS['dbi']->numRows($res_all) > 20) {
-            $html_output .= PMA_getHtmlForInitials($array_initials);
-        }
-
-        /**
-        * Display the user overview
-        * (if less than 50 users, display them immediately)
-        */
-        if (isset($_REQUEST['initial'])
-            || isset($_REQUEST['showall'])
-            || $GLOBALS['dbi']->numRows($res) < 50
-        ) {
-            $html_output .= PMA_getUsersOverview(
-                $res, $db_rights, $pmaThemeImage, $text_dir
-            );
-        } else {
-            $html_output .= PMA_getAddUserHtmlFieldset();
-        } // end if (display overview)
-
-        if (! $GLOBALS['is_ajax_request']
-            || ! empty($_REQUEST['ajax_page_request'])
-        ) {
-            if ($GLOBALS['is_reload_priv']) {
-                $flushnote = new Message(
-                    __(
-                        'Note: phpMyAdmin gets the users\' privileges directly '
-                        . 'from MySQL\'s privilege tables. The content of these '
-                        . 'tables may differ from the privileges the server uses, '
-                        . 'if they have been changed manually. In this case, '
-                        . 'you should %sreload the privileges%s before you continue.'
-                    ),
-                    Message::NOTICE
-                );
-                $flushLink = '<a href="server_privileges.php'
-                    . PMA_URL_getCommon(array('flush_privileges' => 1))
-                    . '" id="reload_privileges_anchor">';
-                $flushnote->addParam(
-                    $flushLink,
-                    false
-                );
-                $flushnote->addParam('</a>', false);
-            } else {
-                $flushnote = new Message(
-                    __(
-                        'Note: phpMyAdmin gets the users\' privileges directly '
-                        . 'from MySQL\'s privilege tables. The content of these '
-                        . 'tables may differ from the privileges the server uses, '
-                        . 'if they have been changed manually. In this case, '
-                        . 'the privileges have to be reloaded but currently, you '
-                        . 'don\'t have the RELOAD privilege.'
-                    )
-                    . Util::showMySQLDocu(
-                        'privileges-provided',
-                        false,
-                        'priv_reload'
-                    ),
-                    Message::NOTICE
-                );
-            }
-            $html_output .= $flushnote->getDisplay();
-        }
-    }
-
-    return $html_output;
-}
-
-/**
- * Get HTML snippet for display user properties
- *
- * @param boolean $dbname_is_wildcard whether database name is wildcard or not
- * @param string  $url_dbname         url database name that urlencode() string
- * @param string  $username           username
- * @param string  $hostname           host name
- * @param string  $dbname             database name
- * @param string  $tablename          table name
- *
- * @return string $html_output
- */
-function PMA_getHtmlForUserProperties($dbname_is_wildcard,$url_dbname,
-    $username, $hostname, $dbname, $tablename
-) {
-    $html_output  = '<div id="edit_user_dialog">';
-    $html_output .= PMA_getHtmlHeaderForUserProperties(
-        $dbname_is_wildcard, $url_dbname, $dbname, $username, $hostname,
-        $tablename, 'table'
-    );
-
-    $sql = "SELECT '1' FROM `mysql`.`user`"
-        . " WHERE `User` = '" . $GLOBALS['dbi']->escapeString($username) . "'"
-        . " AND `Host` = '" . $GLOBALS['dbi']->escapeString($hostname) . "';";
-
-    $user_does_not_exists = (bool) ! $GLOBALS['dbi']->fetchValue($sql);
-
-    if ($user_does_not_exists) {
-        $html_output .= Message::error(
-            __('The selected user was not found in the privilege table.')
-        )->getDisplay();
-        $html_output .= PMA_getHtmlForLoginInformationFields();
-    }
-
-    $_params = array(
-        'username' => $username,
-        'hostname' => $hostname,
-    );
-    if (! is_array($dbname) && mb_strlen($dbname)) {
-        $_params['dbname'] = $dbname;
-        if (mb_strlen($tablename)) {
-            $_params['tablename'] = $tablename;
-        }
-    } else {
-        $_params['dbname'] = $dbname;
-    }
-
-    $html_output .= '<form class="submenu-item" name="usersForm" '
-        . 'id="addUsersForm" action="server_privileges.php" method="post">' . "\n";
-    $html_output .= PMA_URL_getHiddenInputs($_params);
-    $html_output .= PMA_getHtmlToDisplayPrivilegesTable(
-        // If $dbname is an array, pass any one db as all have same privs.
-        PMA_ifSetOr($dbname, (is_array($dbname)) ? $dbname[0] : '*', 'length'),
-        PMA_ifSetOr($tablename, '*', 'length')
-    );
-
-    $html_output .= '</form>' . "\n";
-
-    if (! is_array($dbname) && ! mb_strlen($tablename)
-        && empty($dbname_is_wildcard)
-    ) {
-        // no table name was given, display all table specific rights
-        // but only if $dbname contains no wildcards
-        if (! mb_strlen($dbname)) {
-            $html_output .= PMA_getHtmlForAllTableSpecificRights(
-                $username, $hostname, 'database'
-            );
-        } else {
-            // unescape wildcards in dbname at table level
-            $unescaped_db = Util::unescapeMysqlWildcards($dbname);
-
-            $html_output .= PMA_getHtmlForAllTableSpecificRights(
-                $username, $hostname, 'table', $unescaped_db
-            );
-            $html_output .= PMA_getHtmlForAllTableSpecificRights(
-                $username, $hostname, 'routine', $unescaped_db
-            );
-        }
-    }
-
-    // Provide a line with links to the relevant database and table
-    if (! is_array($dbname) && mb_strlen($dbname)
-        && empty($dbname_is_wildcard)
-    ) {
-        $html_output .= PMA_getLinkToDbAndTable($url_dbname, $dbname, $tablename);
-
-    }
-
-    if (! is_array($dbname) && ! mb_strlen($dbname)
-        && ! $user_does_not_exists
-    ) {
-        //change login information
-        $html_output .= PMA_getHtmlForChangePassword(
-            'edit_other',
-            $username,
-            $hostname
-        );
-        $html_output .= PMA_getChangeLoginInformationHtmlForm($username, $hostname);
-    }
-    $html_output .= '</div>';
-
-    return $html_output;
-}
-
-/**
- * Get queries for Table privileges to change or copy user
- *
- * @param string $user_host_condition user host condition to
- *                                    select relevant table privileges
- * @param array  $queries             queries array
- * @param string $username            username
- * @param string $hostname            host name
- *
- * @return array  $queries
- */
-function PMA_getTablePrivsQueriesForChangeOrCopyUser($user_host_condition,
-    $queries, $username, $hostname
-) {
-    $res = $GLOBALS['dbi']->query(
-        'SELECT `Db`, `Table_name`, `Table_priv` FROM `mysql`.`tables_priv`'
-        . $user_host_condition,
-        $GLOBALS['userlink'],
-        PMA\libraries\DatabaseInterface::QUERY_STORE
-    );
-    while ($row = $GLOBALS['dbi']->fetchAssoc($res)) {
-
-        $res2 = $GLOBALS['dbi']->query(
-            'SELECT `Column_name`, `Column_priv`'
-            . ' FROM `mysql`.`columns_priv`'
-            . ' WHERE `User`'
-            . ' = \'' . $GLOBALS['dbi']->escapeString($_REQUEST['old_username']) . "'"
-            . ' AND `Host`'
-            . ' = \'' . $GLOBALS['dbi']->escapeString($_REQUEST['old_username']) . '\''
-            . ' AND `Db`'
-            . ' = \'' . $GLOBALS['dbi']->escapeString($row['Db']) . "'"
-            . ' AND `Table_name`'
-            . ' = \'' . $GLOBALS['dbi']->escapeString($row['Table_name']) . "'"
-            . ';',
-            null,
-            PMA\libraries\DatabaseInterface::QUERY_STORE
-        );
-
-        $tmp_privs1 = PMA_extractPrivInfo($row);
-        $tmp_privs2 = array(
-            'Select' => array(),
-            'Insert' => array(),
-            'Update' => array(),
-            'References' => array()
-        );
-
-        while ($row2 = $GLOBALS['dbi']->fetchAssoc($res2)) {
-            $tmp_array = explode(',', $row2['Column_priv']);
-            if (in_array('Select', $tmp_array)) {
-                $tmp_privs2['Select'][] = $row2['Column_name'];
-            }
-            if (in_array('Insert', $tmp_array)) {
-                $tmp_privs2['Insert'][] = $row2['Column_name'];
-            }
-            if (in_array('Update', $tmp_array)) {
-                $tmp_privs2['Update'][] = $row2['Column_name'];
-            }
-            if (in_array('References', $tmp_array)) {
-                $tmp_privs2['References'][] = $row2['Column_name'];
-            }
-        }
-        if (count($tmp_privs2['Select']) > 0 && ! in_array('SELECT', $tmp_privs1)) {
-            $tmp_privs1[] = 'SELECT (`' . join('`, `', $tmp_privs2['Select']) . '`)';
-        }
-        if (count($tmp_privs2['Insert']) > 0 && ! in_array('INSERT', $tmp_privs1)) {
-            $tmp_privs1[] = 'INSERT (`' . join('`, `', $tmp_privs2['Insert']) . '`)';
-        }
-        if (count($tmp_privs2['Update']) > 0 && ! in_array('UPDATE', $tmp_privs1)) {
-            $tmp_privs1[] = 'UPDATE (`' . join('`, `', $tmp_privs2['Update']) . '`)';
-        }
-        if (count($tmp_privs2['References']) > 0
-            && ! in_array('REFERENCES', $tmp_privs1)
-        ) {
-            $tmp_privs1[]
-                = 'REFERENCES (`' . join('`, `', $tmp_privs2['References']) . '`)';
-        }
-
-        $queries[] = 'GRANT ' . join(', ', $tmp_privs1)
-            . ' ON ' . Util::backquote($row['Db']) . '.'
-            . Util::backquote($row['Table_name'])
-            . ' TO \'' . $GLOBALS['dbi']->escapeString($username)
-            . '\'@\'' . $GLOBALS['dbi']->escapeString($hostname) . '\''
-            . (in_array('Grant', explode(',', $row['Table_priv']))
-            ? ' WITH GRANT OPTION;'
-            : ';');
-    }
-    return $queries;
-}
-
-/**
- * Get queries for database specific privileges for change or copy user
- *
- * @param array  $queries  queries array with string
- * @param string $username username
- * @param string $hostname host name
- *
- * @return array $queries
- */
-function PMA_getDbSpecificPrivsQueriesForChangeOrCopyUser(
-    $queries, $username, $hostname
-) {
-    $user_host_condition = ' WHERE `User`'
-        . ' = \'' . $GLOBALS['dbi']->escapeString($_REQUEST['old_username']) . "'"
-        . ' AND `Host`'
-        . ' = \'' . $GLOBALS['dbi']->escapeString($_REQUEST['old_hostname']) . '\';';
-
-    $res = $GLOBALS['dbi']->query(
-        'SELECT * FROM `mysql`.`db`' . $user_host_condition
-    );
-
-    while ($row = $GLOBALS['dbi']->fetchAssoc($res)) {
-        $queries[] = 'GRANT ' . join(', ', PMA_extractPrivInfo($row))
-            . ' ON ' . Util::backquote($row['Db']) . '.*'
-            . ' TO \'' . $GLOBALS['dbi']->escapeString($username)
-            . '\'@\'' . $GLOBALS['dbi']->escapeString($hostname) . '\''
-            . ($row['Grant_priv'] == 'Y' ? ' WITH GRANT OPTION;' : ';');
-    }
-    $GLOBALS['dbi']->freeResult($res);
-
-    $queries = PMA_getTablePrivsQueriesForChangeOrCopyUser(
-        $user_host_condition, $queries, $username, $hostname
-    );
-
-    return $queries;
-}
-
-/**
- * Prepares queries for adding users and
- * also create database and return query and message
- *
- * @param boolean $_error         whether user create or not
- * @param string  $real_sql_query SQL query for add a user
- * @param string  $sql_query      SQL query to be displayed
- * @param string  $username       username
- * @param string  $hostname       host name
- * @param string  $dbname         database name
- *
- * @return array  $sql_query, $message
- */
-function PMA_addUserAndCreateDatabase($_error, $real_sql_query, $sql_query,
-    $username, $hostname, $dbname
-) {
-    if ($_error || (!empty($real_sql_query)
-        && !$GLOBALS['dbi']->tryQuery($real_sql_query))
-    ) {
-        $_REQUEST['createdb-1'] = $_REQUEST['createdb-2']
-            = $_REQUEST['createdb-3'] = null;
-        $message = Message::rawError($GLOBALS['dbi']->getError());
-    } else {
-        $message = Message::success(__('You have added a new user.'));
-    }
-
-    if (isset($_REQUEST['createdb-1'])) {
-        // Create database with same name and grant all privileges
-        $q = 'CREATE DATABASE IF NOT EXISTS '
-            . Util::backquote(
-                $GLOBALS['dbi']->escapeString($username)
-            ) . ';';
-        $sql_query .= $q;
-        if (! $GLOBALS['dbi']->tryQuery($q)) {
-            $message = Message::rawError($GLOBALS['dbi']->getError());
-        }
-
-        /**
-         * Reload the navigation
-         */
-        $GLOBALS['reload'] = true;
-        $GLOBALS['db'] = $username;
-
-        $q = 'GRANT ALL PRIVILEGES ON '
-            . Util::backquote(
-                Util::escapeMysqlWildcards(
-                    $GLOBALS['dbi']->escapeString($username)
-                )
-            ) . '.* TO \''
-            . $GLOBALS['dbi']->escapeString($username)
-            . '\'@\'' . $GLOBALS['dbi']->escapeString($hostname) . '\';';
-        $sql_query .= $q;
-        if (! $GLOBALS['dbi']->tryQuery($q)) {
-            $message = Message::rawError($GLOBALS['dbi']->getError());
-        }
-    }
-
-    if (isset($_REQUEST['createdb-2'])) {
-        // Grant all privileges on wildcard name (username\_%)
-        $q = 'GRANT ALL PRIVILEGES ON '
-            . Util::backquote(
-                Util::escapeMysqlWildcards(
-                    $GLOBALS['dbi']->escapeString($username)
-                ) . '\_%'
-            ) . '.* TO \''
-            . $GLOBALS['dbi']->escapeString($username)
-            . '\'@\'' . $GLOBALS['dbi']->escapeString($hostname) . '\';';
-        $sql_query .= $q;
-        if (! $GLOBALS['dbi']->tryQuery($q)) {
-            $message = Message::rawError($GLOBALS['dbi']->getError());
-        }
-    }
-
-    if (isset($_REQUEST['createdb-3'])) {
-        // Grant all privileges on the specified database to the new user
-        $q = 'GRANT ALL PRIVILEGES ON '
-        . Util::backquote(
-            $GLOBALS['dbi']->escapeString($dbname)
-        ) . '.* TO \''
-        . $GLOBALS['dbi']->escapeString($username)
-        . '\'@\'' . $GLOBALS['dbi']->escapeString($hostname) . '\';';
-        $sql_query .= $q;
-        if (! $GLOBALS['dbi']->tryQuery($q)) {
-            $message = Message::rawError($GLOBALS['dbi']->getError());
-        }
-    }
-    return array($sql_query, $message);
-}
-
-/**
- * Get the hashed string for password
- *
- * @param string $password password
- *
- * @return string $hashedPassword
- */
-function PMA_getHashedPassword($password)
-{
-    $result = $GLOBALS['dbi']->fetchSingleRow(
-        "SELECT PASSWORD('" . $password . "') AS `password`;"
-    );
-
-    $hashedPassword = $result['password'];
-
-    return $hashedPassword;
-}
-
-/**
- * Check if MariaDB's 'simple_password_check'
- * OR 'cracklib_password_check' is ACTIVE
- *
- * @return boolean if atleast one of the plugins is ACTIVE
- */
-function PMA_checkIfMariaDBPwdCheckPluginActive()
-{
-    if (Util::getServerType() !== 'MariaDB') {
-        return false;
-    }
-
-    $result = $GLOBALS['dbi']->query(
-        'SHOW PLUGINS SONAME LIKE \'%_password_check%\''
-    );
-
-    while ($row = $GLOBALS['dbi']->fetchAssoc($result)) {
-        if ($row['Status'] === 'ACTIVE') {
-            return true;
-        }
-    }
-
-    return false;
-}
-
-
-/**
- * Get SQL queries for Display and Add user
- *
- * @param string $username username
- * @param string $hostname host name
- * @param string $password password
- *
- * @return array ($create_user_real, $create_user_show,$real_sql_query, $sql_query
- *                $password_set_real, $password_set_show)
- */
-function PMA_getSqlQueriesForDisplayAndAddUser($username, $hostname, $password)
-{
-    $slashedUsername = $GLOBALS['dbi']->escapeString($username);
-    $slashedHostname = $GLOBALS['dbi']->escapeString($hostname);
-    $slashedPassword = $GLOBALS['dbi']->escapeString($password);
-    $serverType = Util::getServerType();
-
-    $create_user_stmt = sprintf(
-        'CREATE USER \'%s\'@\'%s\'',
-        $slashedUsername,
-        $slashedHostname
-    );
-    $isMariaDBPwdPluginActive = PMA_checkIfMariaDBPwdCheckPluginActive();
-
-    // See https://github.com/phpmyadmin/phpmyadmin/pull/11560#issuecomment-147158219
-    // for details regarding details of syntax usage for various versions
-
-    // 'IDENTIFIED WITH auth_plugin'
-    // is supported by MySQL 5.5.7+
-    if (($serverType == 'MySQL' || $serverType == 'Percona Server')
-        && PMA_MYSQL_INT_VERSION >= 50507
-        && isset($_REQUEST['authentication_plugin'])
-    ) {
-        $create_user_stmt .= ' IDENTIFIED WITH '
-            . $_REQUEST['authentication_plugin'];
-    }
-
-    // 'IDENTIFIED VIA auth_plugin'
-    // is supported by MariaDB 5.2+
-    if ($serverType == 'MariaDB'
-        && PMA_MYSQL_INT_VERSION >= 50200
-        && isset($_REQUEST['authentication_plugin'])
-        && ! $isMariaDBPwdPluginActive
-    ) {
-        $create_user_stmt .= ' IDENTIFIED VIA '
-            . $_REQUEST['authentication_plugin'];
-    }
-
-    $create_user_real = $create_user_show = $create_user_stmt;
-
-    $password_set_stmt = 'SET PASSWORD FOR \'%s\'@\'%s\' = \'%s\'';
-    $password_set_show = sprintf(
-        $password_set_stmt,
-        $slashedUsername,
-        $slashedHostname,
-        '***'
-    );
-
-    $sql_query_stmt = sprintf(
-        'GRANT %s ON *.* TO \'%s\'@\'%s\'',
-        join(', ', PMA_extractPrivInfo()),
-        $slashedUsername,
-        $slashedHostname
-    );
-    $real_sql_query = $sql_query = $sql_query_stmt;
-
-    // Set the proper hashing method
-    if (isset($_REQUEST['authentication_plugin'])) {
-        PMA_setProperPasswordHashing(
-            $_REQUEST['authentication_plugin']
-        );
-    }
-
-    // Use 'CREATE USER ... WITH ... AS ..' syntax for
-    // newer MySQL versions
-    // and 'CREATE USER ... VIA .. USING ..' syntax for
-    // newer MariaDB versions
-    if ((($serverType == 'MySQL' || $serverType == 'Percona Server')
-        && PMA_MYSQL_INT_VERSION >= 50706)
-        || ($serverType == 'MariaDB'
-        && PMA_MYSQL_INT_VERSION >= 50200)
-    ) {
-        $password_set_real = null;
-
-        // Required for binding '%' with '%s'
-        $create_user_stmt = str_replace(
-            '%', '%%', $create_user_stmt
-        );
-
-        // MariaDB uses 'USING' whereas MySQL uses 'AS'
-        // but MariaDB with validation plugin needs cleartext password
-        if ($serverType == 'MariaDB'
-            && ! $isMariaDBPwdPluginActive
-        ) {
-            $create_user_stmt .= ' USING \'%s\'';
-        } elseif ($serverType == 'MariaDB') {
-            $create_user_stmt .= ' IDENTIFIED BY \'%s\'';
-        } else {
-            $create_user_stmt .= ' AS \'%s\'';
-        }
-
-        if ($_POST['pred_password'] == 'keep') {
-            $create_user_real = sprintf(
-                $create_user_stmt,
-                $slashedPassword
-            );
-            $create_user_show = sprintf(
-                $create_user_stmt,
-                '***'
-            );
-        } else if ($_POST['pred_password'] == 'none') {
-            $create_user_real = sprintf(
-                $create_user_stmt,
-                null
-            );
-            $create_user_show = sprintf(
-                $create_user_stmt,
-                '***'
-            );
-        } else {
-            if (! ($serverType == 'MariaDB'
-                && $isMariaDBPwdPluginActive)
-            ) {
-                $hashedPassword = PMA_getHashedPassword($_POST['pma_pw']);
-            } else {
-                // MariaDB with validation plugin needs cleartext password
-                $hashedPassword = $_POST['pma_pw'];
-            }
-            $create_user_real = sprintf(
-                $create_user_stmt,
-                $hashedPassword
-            );
-            $create_user_show = sprintf(
-                $create_user_stmt,
-                '***'
-            );
-        }
-    } else {
-        // Use 'SET PASSWORD' syntax for pre-5.7.6 MySQL versions
-        // and pre-5.2.0 MariaDB versions
-        if ($_POST['pred_password'] == 'keep') {
-            $password_set_real = sprintf(
-                $password_set_stmt,
-                $slashedUsername,
-                $slashedHostname,
-                $slashedPassword
-            );
-        } else if ($_POST['pred_password'] == 'none') {
-            $password_set_real = sprintf(
-                $password_set_stmt,
-                $slashedUsername,
-                $slashedHostname,
-                null
-            );
-        } else {
-            $hashedPassword = PMA_getHashedPassword($_POST['pma_pw']);
-            $password_set_real = sprintf(
-                $password_set_stmt,
-                $slashedUsername,
-                $slashedHostname,
-                $hashedPassword
-            );
-        }
-    }
-
-    // add REQUIRE clause
-    $require_clause = PMA_getRequireClause();
-    $real_sql_query .= $require_clause;
-    $sql_query .= $require_clause;
-
-    $with_clause = PMA_getWithClauseForAddUserAndUpdatePrivs();
-    $real_sql_query .= $with_clause;
-    $sql_query .= $with_clause;
-
-    if (isset($create_user_real)) {
-        $create_user_real .= ';';
-        $create_user_show .= ';';
-    }
-    $real_sql_query .= ';';
-    $sql_query .= ';';
-    // No Global GRANT_OPTION privilege
-    if (!$GLOBALS['is_grantuser']) {
-        $real_sql_query = '';
-        $sql_query = '';
-    }
-
-    // Use 'SET PASSWORD' for pre-5.7.6 MySQL versions
-    // and pre-5.2.0 MariaDB
-    if (($serverType == 'MySQL'
-        && PMA_MYSQL_INT_VERSION >= 50706)
-        || ($serverType == 'MariaDB'
-        && PMA_MYSQL_INT_VERSION >= 50200)
-    ) {
-        $password_set_real = null;
-        $password_set_show = null;
-    } else {
-        $password_set_real .= ";";
-        $password_set_show .= ";";
-    }
-
-    return array($create_user_real,
-        $create_user_show,
-        $real_sql_query,
-        $sql_query,
-        $password_set_real,
-        $password_set_show
-    );
-}
-
-/**
- * Returns the type ('PROCEDURE' or 'FUNCTION') of the routine
- *
- * @param string $dbname      database
- * @param string $routineName routine
- *
- * @return string type
- */
-function PMA_getRoutineType($dbname, $routineName)
-{
-    $routineData = $GLOBALS['dbi']->getRoutines($dbname);
-
-    foreach ($routineData as $routine) {
-        if ($routine['name'] === $routineName) {
-            return $routine['type'];
-        }
-    }
-    return '';
-}
diff --git a/#pma/libraries/server_status.lib.php b/#pma/libraries/server_status.lib.php
deleted file mode 100644
index b126bfd7..00000000
--- a/#pma/libraries/server_status.lib.php
+++ /dev/null
@@ -1,324 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * functions for displaying server status
- *
- * @usedby  server_status.php
- *
- * @package PhpMyAdmin
- */
-use PMA\libraries\ServerStatusData;
-
-/**
- * Prints server status information: processes, connections and traffic
- *
- * @param ServerStatusData $ServerStatusData Server status data
- *
- * @return string
- */
-function PMA_getHtmlForServerStatus($ServerStatusData)
-{
-    //display the server state General Information
-    $retval  = PMA_getHtmlForServerStateGeneralInfo($ServerStatusData);
-
-    //display the server state traffic information
-    $retval .= PMA_getHtmlForServerStateTraffic($ServerStatusData);
-
-    //display the server state connection information
-    $retval .= PMA_getHtmlForServerStateConnections($ServerStatusData);
-
-    // display replication information
-    if ($GLOBALS['replication_info']['master']['status']
-        || $GLOBALS['replication_info']['slave']['status']
-    ) {
-        $retval .= PMA_getHtmlForReplicationInfo();
-    }
-
-    return $retval;
-}
-
-/**
- * Prints server state General information
- *
- * @param ServerStatusData $ServerStatusData Server status data
- *
- * @return string
- */
-function PMA_getHtmlForServerStateGeneralInfo($ServerStatusData)
-{
-    $start_time = $GLOBALS['dbi']->fetchValue(
-        'SELECT UNIX_TIMESTAMP() - ' . $ServerStatusData->status['Uptime']
-    );
-
-    $retval  = '<h3>';
-    $bytes_received = $ServerStatusData->status['Bytes_received'];
-    $bytes_sent = $ServerStatusData->status['Bytes_sent'];
-    $retval .= sprintf(
-        __('Network traffic since startup: %s'),
-        implode(
-            ' ',
-            PMA\libraries\Util::formatByteDown(
-                $bytes_received + $bytes_sent,
-                3,
-                1
-            )
-        )
-    );
-    $retval .= '</h3>';
-    $retval .= '<p>';
-    $retval .= sprintf(
-        __('This MySQL server has been running for %1$s. It started up on %2$s.'),
-        PMA\libraries\Util::timespanFormat($ServerStatusData->status['Uptime']),
-        PMA\libraries\Util::localisedDate($start_time)
-    ) . "\n";
-    $retval .= '</p>';
-
-    return $retval;
-}
-
-/**
- * Returns HTML to display replication information
- *
- * @return string HTML on replication
- */
-function PMA_getHtmlForReplicationInfo()
-{
-    $retval = '<p class="notice clearfloat">';
-    if ($GLOBALS['replication_info']['master']['status']
-        && $GLOBALS['replication_info']['slave']['status']
-    ) {
-        $retval .= __(
-            'This MySQL server works as <b>master</b> and '
-            . '<b>slave</b> in <b>replication</b> process.'
-        );
-    } elseif ($GLOBALS['replication_info']['master']['status']) {
-        $retval .= __(
-            'This MySQL server works as <b>master</b> '
-            . 'in <b>replication</b> process.'
-        );
-    } elseif ($GLOBALS['replication_info']['slave']['status']) {
-        $retval .= __(
-            'This MySQL server works as <b>slave</b> '
-            . 'in <b>replication</b> process.'
-        );
-    }
-    $retval .= '</p>';
-
-    /*
-     * if the server works as master or slave in replication process,
-     * display useful information
-     */
-    $retval .= '<hr class="clearfloat" />';
-    $retval .= '<h3><a name="replication">';
-    $retval .= __('Replication status');
-    $retval .= '</a></h3>';
-    foreach ($GLOBALS['replication_types'] as $type) {
-        if (isset($GLOBALS['replication_info'][$type]['status'])
-            && $GLOBALS['replication_info'][$type]['status']
-        ) {
-            $retval .= PMA_getHtmlForReplicationStatusTable($type);
-        }
-    }
-
-    return $retval;
-}
-
-/**
- * Prints server state traffic information
- *
- * @param ServerStatusData $ServerStatusData Server status data
- *
- * @return string
- */
-function PMA_getHtmlForServerStateTraffic($ServerStatusData)
-{
-    $hour_factor    = 3600 / $ServerStatusData->status['Uptime'];
-    $retval  = '<table id="serverstatustraffic" class="data noclick">';
-    $retval .= '<thead>';
-    $retval .= '<tr>';
-    $retval .= '<th>';
-    $retval .= __('Traffic') . '&nbsp;';
-    $retval .=  PMA\libraries\Util::showHint(
-        __(
-            'On a busy server, the byte counters may overrun, so those statistics '
-            . 'as reported by the MySQL server may be incorrect.'
-        )
-    );
-    $retval .= '</th>';
-    $retval .= '<th>#</th>';
-    $retval .= '<th>&oslash; ' . __('per hour') . '</th>';
-    $retval .= '</tr>';
-    $retval .= '</thead>';
-    $retval .= '<tbody>';
-    $retval .= '<tr class="odd">';
-    $retval .= '<th class="name">' . __('Received') . '</th>';
-    $retval .= '<td class="value">';
-    $retval .= implode(
-        ' ',
-        PMA\libraries\Util::formatByteDown(
-            $ServerStatusData->status['Bytes_received'], 3, 1
-        )
-    );
-    $retval .= '</td>';
-    $retval .= '<td class="value">';
-    $retval .= implode(
-        ' ',
-        PMA\libraries\Util::formatByteDown(
-            $ServerStatusData->status['Bytes_received'] * $hour_factor, 3, 1
-        )
-    );
-    $retval .= '</td>';
-    $retval .= '</tr>';
-    $retval .= '<tr class="even">';
-    $retval .= '<th class="name">' . __('Sent') . '</th>';
-    $retval .= '<td class="value">';
-    $retval .= implode(
-        ' ',
-        PMA\libraries\Util::formatByteDown(
-            $ServerStatusData->status['Bytes_sent'], 3, 1
-        )
-    );
-    $retval .= '</td>';
-    $retval .= '<td class="value">';
-    $retval .= implode(
-        ' ',
-        PMA\libraries\Util::formatByteDown(
-            $ServerStatusData->status['Bytes_sent'] * $hour_factor, 3, 1
-        )
-    );
-    $retval .= '</td>';
-    $retval .= '</tr>';
-    $retval .= '<tr class="odd">';
-    $retval .= '<th class="name">' . __('Total') . '</th>';
-    $retval .= '<td class="value">';
-    $bytes_received = $ServerStatusData->status['Bytes_received'];
-    $bytes_sent = $ServerStatusData->status['Bytes_sent'];
-    $retval .= implode(
-        ' ',
-        PMA\libraries\Util::formatByteDown(
-            $bytes_received + $bytes_sent, 3, 1
-        )
-    );
-    $retval .= '</td>';
-    $retval .= '<td class="value">';
-    $bytes_received = $ServerStatusData->status['Bytes_received'];
-    $bytes_sent = $ServerStatusData->status['Bytes_sent'];
-    $retval .= implode(
-        ' ',
-        PMA\libraries\Util::formatByteDown(
-            ($bytes_received + $bytes_sent) * $hour_factor, 3, 1
-        )
-    );
-    $retval .= '</td>';
-    $retval .= '</tr>';
-    $retval .= '</tbody>';
-    $retval .= '</table>';
-    return $retval;
-}
-
-/**
- * Prints server state connections information
- *
- * @param ServerStatusData $ServerStatusData Server status data
- *
- * @return string
- */
-function PMA_getHtmlForServerStateConnections($ServerStatusData)
-{
-    $hour_factor    = 3600 / $ServerStatusData->status['Uptime'];
-    $retval  = '<table id="serverstatusconnections" class="data noclick">';
-    $retval .= '<thead>';
-    $retval .= '<tr>';
-    $retval .= '<th>' . __('Connections') . '</th>';
-    $retval .= '<th>#</th>';
-    $retval .= '<th>&oslash; ' . __('per hour') . '</th>';
-    $retval .= '<th>%</th>';
-    $retval .= '</tr>';
-    $retval .= '</thead>';
-    $retval .= '<tbody>';
-    $retval .= '<tr class="odd">';
-    $retval .= '<th class="name">' . __('Max. concurrent connections') . '</th>';
-    $retval .= '<td class="value">';
-    $retval .= PMA\libraries\Util::formatNumber(
-        $ServerStatusData->status['Max_used_connections'], 0
-    );
-    $retval .= '</td>';
-    $retval .= '<td class="value">--- </td>';
-    $retval .= '<td class="value">--- </td>';
-    $retval .= '</tr>';
-    $retval .= '<tr class="even">';
-    $retval .= '<th class="name">' . __('Failed attempts') . '</th>';
-    $retval .= '<td class="value">';
-    $retval .= PMA\libraries\Util::formatNumber(
-        $ServerStatusData->status['Aborted_connects'], 4, 1, true
-    );
-    $retval .= '</td>';
-    $retval .= '<td class="value">';
-    $retval .= PMA\libraries\Util::formatNumber(
-        $ServerStatusData->status['Aborted_connects'] * $hour_factor, 4, 2, true
-    );
-    $retval .= '</td>';
-    $retval .= '<td class="value">';
-    if ($ServerStatusData->status['Connections'] > 0) {
-        $abortNum = $ServerStatusData->status['Aborted_connects'];
-        $connectNum = $ServerStatusData->status['Connections'];
-
-        $retval .= PMA\libraries\Util::formatNumber(
-            $abortNum * 100 / $connectNum,
-            0, 2, true
-        );
-        $retval .= '%';
-    } else {
-        $retval .= '--- ';
-    }
-    $retval .= '</td>';
-    $retval .= '</tr>';
-    $retval .= '<tr class="odd">';
-    $retval .= '<th class="name">' . __('Aborted') . '</th>';
-    $retval .= '<td class="value">';
-    $retval .= PMA\libraries\Util::formatNumber(
-        $ServerStatusData->status['Aborted_clients'], 4, 1, true
-    );
-    $retval .= '</td>';
-    $retval .= '<td class="value">';
-    $retval .= PMA\libraries\Util::formatNumber(
-        $ServerStatusData->status['Aborted_clients'] * $hour_factor, 4, 2, true
-    );
-    $retval .= '</td>';
-    $retval .= '<td class="value">';
-    if ($ServerStatusData->status['Connections'] > 0) {
-        $abortNum = $ServerStatusData->status['Aborted_clients'];
-        $connectNum = $ServerStatusData->status['Connections'];
-
-        $retval .= PMA\libraries\Util::formatNumber(
-            $abortNum * 100 / $connectNum,
-            0, 2, true
-        );
-        $retval .= '%';
-    } else {
-        $retval .= '--- ';
-    }
-    $retval .= '</td>';
-    $retval .= '</tr>';
-    $retval .= '<tr class="even">';
-    $retval .= '<th class="name">' . __('Total') . '</th>';
-    $retval .= '<td class="value">';
-    $retval .= PMA\libraries\Util::formatNumber(
-        $ServerStatusData->status['Connections'], 4, 0
-    );
-    $retval .= '</td>';
-    $retval .= '<td class="value">';
-    $retval .= PMA\libraries\Util::formatNumber(
-        $ServerStatusData->status['Connections'] * $hour_factor, 4, 2
-    );
-    $retval .= '</td>';
-    $retval .= '<td class="value">';
-    $retval .= PMA\libraries\Util::formatNumber(100, 0, 2);
-    $retval .= '%</td>';
-    $retval .= '</tr>';
-    $retval .= '</tbody>';
-    $retval .= '</table>';
-
-    return $retval;
-}
-
diff --git a/#pma/libraries/server_status_advisor.lib.php b/#pma/libraries/server_status_advisor.lib.php
deleted file mode 100644
index f78577bd..00000000
--- a/#pma/libraries/server_status_advisor.lib.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * functions for displaying server status sub item: advisor
- *
- * @usedby  server_status_advisor.php
- *
- * @package PhpMyAdmin
- */
-
-/**
- * Returns html with PMA\libraries\Advisor
- *
- * @return string
- */
-function PMA_getHtmlForAdvisor()
-{
-    $output  = '<a href="#openAdvisorInstructions">';
-    $output .= PMA\libraries\Util::getIcon('b_help.png', __('Instructions'));
-    $output .= '</a>';
-    $output .= '<div id="statustabs_advisor"></div>';
-    $output .= '<div id="advisorInstructionsDialog" style="display:none;">';
-    $output .= '<p>';
-    $output .= __(
-        'The Advisor system can provide recommendations '
-        . 'on server variables by analyzing the server status variables.'
-    );
-    $output .= '</p>';
-    $output .= '<p>';
-    $output .= __(
-        'Do note however that this system provides recommendations '
-        . 'based on simple calculations and by rule of thumb which may '
-        . 'not necessarily apply to your system.'
-    );
-    $output .= '</p>';
-    $output .= '<p>';
-    $output .= __(
-        'Prior to changing any of the configuration, be sure to know '
-        . 'what you are changing (by reading the documentation) and how '
-        . 'to undo the change. Wrong tuning can have a very negative '
-        . 'effect on performance.'
-    );
-    $output .= '</p>';
-    $output .= '<p>';
-    $output .= __(
-        'The best way to tune your system would be to change only one '
-        . 'setting at a time, observe or benchmark your database, and undo '
-        . 'the change if there was no clearly measurable improvement.'
-    );
-    $output .= '</p>';
-    $output .= '</div>';
-    $output .= '<div id="advisorData" style="display:none;">';
-    $advisor = new PMA\libraries\Advisor();
-    $output .= htmlspecialchars(
-        json_encode(
-            $advisor->run()
-        )
-    );
-    $output .= '</div>';
-
-    return $output;
-}
-
diff --git a/#pma/libraries/server_status_monitor.lib.php b/#pma/libraries/server_status_monitor.lib.php
deleted file mode 100644
index c341ccca..00000000
--- a/#pma/libraries/server_status_monitor.lib.php
+++ /dev/null
@@ -1,819 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * functions for displaying server status sub item: monitor
- *
- * @usedby  server_status_monitor.php
- *
- * @package PhpMyAdmin
- */
-use PMA\libraries\ServerStatusData;
-use PMA\libraries\Util;
-
-/**
- * Prints html with monitor
- *
- * @param ServerStatusData $ServerStatusData Server status data
- *
- * @return string
- */
-function PMA_getHtmlForMonitor($ServerStatusData)
-{
-    $retval  = PMA_getHtmlForTabLinks();
-
-    $retval .= PMA_getHtmlForSettingsDialog();
-
-    $retval .= PMA_getHtmlForInstructionsDialog();
-
-    $retval .= PMA_getHtmlForAddChartDialog();
-
-    $retval .= PMA_getHtmlForAnalyseDialog();
-
-    $retval .= '<table class="clearfloat" id="chartGrid"></table>';
-    $retval .= '<div id="logTable">';
-    $retval .= '<br/>';
-    $retval .= '</div>';
-
-    $retval .= '<script type="text/javascript">';
-    $retval .= 'variableNames = [ ';
-    $i = 0;
-    foreach ($ServerStatusData->status as $name=>$value) {
-        if (is_numeric($value)) {
-            if ($i++ > 0) {
-                $retval .= ", ";
-            }
-            $retval .= "'" . $name . "'";
-        }
-    }
-    $retval .= '];';
-    $retval .= '</script>';
-
-    return $retval;
-}
-
-/**
- * Returns html for Analyse Dialog
- *
- * @return string
- */
-function PMA_getHtmlForAnalyseDialog()
-{
-    $retval  = '<div id="logAnalyseDialog" title="';
-    $retval .= __('Log statistics') . '" style="display:none;">';
-    $retval .= '<p>' . __('Selected time range:');
-    $retval .= '<input type="text" name="dateStart"'
-        . ' class="datetimefield" value="" /> - ';
-    $retval .= '<input type="text" name="dateEnd" class="datetimefield" value="" />';
-    $retval .= '</p>';
-    $retval .= '<input type="checkbox" id="limitTypes"'
-        . ' value="1" checked="checked" />';
-    $retval .= '<label for="limitTypes">';
-    $retval .= __('Only retrieve SELECT,INSERT,UPDATE and DELETE Statements');
-    $retval .= '</label>';
-    $retval .= '<br/>';
-    $retval .= '<input type="checkbox" id="removeVariables"'
-        . ' value="1" checked="checked" />';
-    $retval .= '<label for="removeVariables">';
-    $retval .= __('Remove variable data in INSERT statements for better grouping');
-    $retval .= '</label>';
-    $retval .= '<p>';
-    $retval .= __(
-        'Choose from which log you want the statistics to be generated from.'
-    );
-    $retval .= '</p>';
-    $retval .= '<p>';
-    $retval .= __('Results are grouped by query text.');
-    $retval .= '</p>';
-    $retval .= '</div>';
-    $retval .= '<div id="queryAnalyzerDialog" title="';
-    $retval .= __('Query analyzer') . '" style="display:none;">';
-    $retval .= '<textarea id="sqlquery"> </textarea>';
-    $retval .= '<p></p>';
-    $retval .= '<div class="placeHolder"></div>';
-    $retval .= '</div>';
-
-    return $retval;
-}
-
-/**
- * Returns html for Instructions Dialog
- *
- * @return string
- */
-function PMA_getHtmlForInstructionsDialog()
-{
-    $retval  = '<div id="monitorInstructionsDialog" title="';
-    $retval .= __('Monitor Instructions') . '" style="display:none;">';
-    $retval .= __(
-        'The phpMyAdmin Monitor can assist you in optimizing the server'
-        . ' configuration and track down time intensive queries. For the latter you'
-        . ' will need to set log_output to \'TABLE\' and have either the'
-        . ' slow_query_log or general_log enabled. Note however, that the'
-        . ' general_log produces a lot of data and increases server load'
-        . ' by up to 15%.'
-    );
-
-    $retval .= '<p></p>';
-    $retval .= '<img class="ajaxIcon" src="';
-    $retval .= $GLOBALS['pmaThemeImage'] . 'ajax_clock_small.gif"';
-    $retval .= ' alt="' . __('Loading…') . '" />';
-    $retval .= '<div class="ajaxContent"></div>';
-    $retval .= '<div class="monitorUse" style="display:none;">';
-    $retval .= '<p></p>';
-    $retval .= '<strong>';
-    $retval .= __('Using the monitor:');
-    $retval .= '</strong><p>';
-    $retval .= __(
-        'Your browser will refresh all displayed charts in a regular interval.'
-        . ' You may add charts and change the refresh rate under \'Settings\','
-        . ' or remove any chart using the cog icon on each respective chart.'
-    );
-    $retval .= '</p><p>';
-    $retval .= __(
-        'To display queries from the logs, select the relevant time span on any'
-        . ' chart by holding down the left mouse button and panning over the'
-        . ' chart. Once confirmed, this will load a table of grouped queries,'
-        . ' there you may click on any occurring SELECT statements to further'
-        . ' analyze them.'
-    );
-    $retval .= '</p>';
-    $retval .= '<p>';
-    $retval .= PMA\libraries\Util::getImage('s_attention.png');
-    $retval .= '<strong>';
-    $retval .= __('Please note:');
-    $retval .= '</strong><br />';
-    $retval .= __(
-        'Enabling the general_log may increase the server load by'
-        . ' 5-15%. Also be aware that generating statistics from the logs is a'
-        . ' load intensive task, so it is advisable to select only a small time'
-        . ' span and to disable the general_log and empty its table once'
-        . ' monitoring is not required any more.'
-    );
-    $retval .= '</p>';
-    $retval .= '</div>';
-    $retval .= '</div>';
-
-    return $retval;
-}
-
-/**
- * Returns html for addChartDialog
- *
- * @return string
- */
-function PMA_getHtmlForAddChartDialog()
-{
-    $retval  = '<div id="addChartDialog" title="'
-        . __('Add chart') . '" style="display:none;">';
-    $retval .= '<div id="tabGridVariables">';
-    $retval .= '<p><input type="text" name="chartTitle" value="'
-        . __('Chart Title') . '" /></p>';
-    $retval .= '<input type="radio" name="chartType"'
-        . ' value="preset" id="chartPreset" />';
-    $retval .= '<label for="chartPreset">' . __('Preset chart') . '</label>';
-    $retval .= '<select name="presetCharts"></select><br/>';
-    $retval .= '<input type="radio" name="chartType" value="variable" '
-        . 'id="chartStatusVar" checked="checked" />';
-    $retval .= '<label for="chartStatusVar">';
-    $retval .= __('Status variable(s)');
-    $retval .= '</label><br/>';
-    $retval .= '<div id="chartVariableSettings">';
-    $retval .= '<label for="chartSeries">' . __('Select series:') . '</label><br />';
-    $retval .= '<select id="chartSeries" name="varChartList" size="1">';
-    $retval .= '<option>' . __('Commonly monitored') . '</option>';
-    $retval .= '<option>Processes</option>';
-    $retval .= '<option>Questions</option>';
-    $retval .= '<option>Connections</option>';
-    $retval .= '<option>Bytes_sent</option>';
-    $retval .= '<option>Bytes_received</option>';
-    $retval .= '<option>Threads_connected</option>';
-    $retval .= '<option>Created_tmp_disk_tables</option>';
-    $retval .= '<option>Handler_read_first</option>';
-    $retval .= '<option>Innodb_buffer_pool_wait_free</option>';
-    $retval .= '<option>Key_reads</option>';
-    $retval .= '<option>Open_tables</option>';
-    $retval .= '<option>Select_full_join</option>';
-    $retval .= '<option>Slow_queries</option>';
-    $retval .= '</select><br />';
-    $retval .= '<label for="variableInput">';
-    $retval .= __('or type variable name:');
-    $retval .= ' </label>';
-    $retval .= '<input type="text" name="variableInput" id="variableInput" />';
-    $retval .= '<p></p>';
-    $retval .= '<input type="checkbox" name="differentialValue"'
-        . ' id="differentialValue" value="differential" checked="checked" />';
-    $retval .= '<label for="differentialValue">';
-    $retval .= __('Display as differential value');
-    $retval .= '</label><br />';
-    $retval .= '<input type="checkbox" id="useDivisor"'
-        . ' name="useDivisor" value="1" />';
-    $retval .= '<label for="useDivisor">' . __('Apply a divisor') . '</label>';
-    $retval .= '<span class="divisorInput" style="display:none;">';
-    $retval .= '<input type="text" name="valueDivisor" size="4" value="1" />';
-    $retval .= '(<a href="#kibDivisor">' . __('KiB') . '</a>, ';
-    $retval .= '<a href="#mibDivisor">' . __('MiB') . '</a>)';
-    $retval .= '</span><br />';
-    $retval .= '<input type="checkbox" id="useUnit" name="useUnit" value="1" />';
-    $retval .= '<label for="useUnit">';
-    $retval .= __('Append unit to data values');
-    $retval .= '</label>';
-    $retval .= '<span class="unitInput" style="display:none;">';
-    $retval .= '<input type="text" name="valueUnit" size="4" value="" />';
-    $retval .= '</span>';
-    $retval .= '<p>';
-    $retval .= '<a href="#submitAddSeries"><b>' . __('Add this series') . '</b></a>';
-    $retval .= '<span id="clearSeriesLink" style="display:none;">';
-    $retval .= ' | <a href="#submitClearSeries">' . __('Clear series') . '</a>';
-    $retval .= '</span>';
-    $retval .= '</p>';
-    $retval .= __('Series in chart:');
-    $retval .= '<br/>';
-    $retval .= '<span id="seriesPreview">';
-    $retval .= '<i>' . __('None') . '</i>';
-    $retval .= '</span>';
-    $retval .= '</div>';
-    $retval .= '</div>';
-    $retval .= '</div>';
-
-    return $retval;
-}
-
-/**
- * Returns html with Tab Links
- *
- * @return string
- */
-function PMA_getHtmlForTabLinks()
-{
-    $retval  = '<div class="tabLinks">';
-    $retval .= '<a href="#pauseCharts">';
-    $retval .= PMA\libraries\Util::getImage('play.png') . __('Start Monitor');
-    $retval .= '</a>';
-    $retval .= '<a href="#settingsPopup" class="popupLink">';
-    $retval .= PMA\libraries\Util::getImage('s_cog.png') .  __('Settings');
-    $retval .= '</a>';
-    $retval .= '<a href="#monitorInstructionsDialog">';
-    $retval .= Util::getImage('b_help.png') . __('Instructions/Setup');
-    $retval .= '<a href="#endChartEditMode" style="display:none;">';
-    $retval .= Util::getImage('s_okay.png');
-    $retval .= __('Done dragging (rearranging) charts');
-    $retval .= '</a>';
-    $retval .= '</div>';
-
-    return $retval;
-}
-
-/**
- * Returns html with Settings dialog
- *
- * @return string
- */
-function PMA_getHtmlForSettingsDialog()
-{
-    $retval  = '<div class="popupContent settingsPopup">';
-    $retval .= '<a href="#addNewChart">';
-    $retval .= PMA\libraries\Util::getImage('b_chart.png') . __('Add chart');
-    $retval .= '</a>';
-    $retval .= '<a href="#rearrangeCharts">';
-    $retval .= PMA\libraries\Util::getImage('b_tblops.png')
-        . __('Enable charts dragging');
-    $retval .= '</a>';
-    $retval .= '<div class="clearfloat paddingtop"></div>';
-    $retval .= '<div class="floatleft">';
-    $retval .= __('Refresh rate') . '<br />';
-    $retval .= ServerStatusData::getHtmlForRefreshList(
-        'gridChartRefresh',
-        5,
-        Array(2, 3, 4, 5, 10, 20, 40, 60, 120, 300, 600, 1200)
-    );
-    $retval .= '<br />';
-    $retval .= '</div>';
-    $retval .= '<div class="floatleft">';
-    $retval .= __('Chart columns');
-    $retval .= '<br />';
-    $retval .= '<select name="chartColumns">';
-    $retval .= '<option>1</option>';
-    $retval .= '<option>2</option>';
-    $retval .= '<option>3</option>';
-    $retval .= '<option>4</option>';
-    $retval .= '<option>5</option>';
-    $retval .= '<option>6</option>';
-    $retval .= '</select>';
-    $retval .= '</div>';
-    $retval .= '<div class="clearfloat paddingtop">';
-    $retval .= '<b>' . __('Chart arrangement') . '</b> ';
-    $retval .= PMA\libraries\Util::showHint(
-        __(
-            'The arrangement of the charts is stored to the browsers local storage. '
-            . 'You may want to export it if you have a complicated set up.'
-        )
-    );
-    $retval .= '<br/>';
-    $retval .= '<a class="ajax" href="#importMonitorConfig">';
-    $retval .= __('Import');
-    $retval .= '</a>';
-    $retval .= '&nbsp;&nbsp;';
-    $retval .= '<a class="disableAjax" href="#exportMonitorConfig">';
-    $retval .= __('Export');
-    $retval .= '</a>';
-    $retval .= '&nbsp;&nbsp;';
-    $retval .= '<a href="#clearMonitorConfig">';
-    $retval .= __('Reset to default');
-    $retval .= '</a>';
-    $retval .= '</div>';
-    $retval .= '</div>';
-
-    return $retval;
-}
-
-
-/**
- * Define some data and links needed on the client side
- *
- * @param ServerStatusData $ServerStatusData Server status data
- *
- * @return string
- */
-function PMA_getHtmlForClientSideDataAndLinks($ServerStatusData)
-{
-    /**
-     * Define some data needed on the client side
-     */
-    $input = '<input type="hidden" name="%s" value="%s" />';
-    $form  = '<form id="js_data" class="hide">';
-    $form .= sprintf($input, 'server_time', microtime(true) * 1000);
-    $form .= sprintf($input, 'server_os', PHP_OS);
-    $form .= sprintf($input, 'is_superuser', $GLOBALS['dbi']->isSuperuser());
-    $form .= sprintf($input, 'server_db_isLocal', $ServerStatusData->db_isLocal);
-    $form .= '</form>';
-    /**
-     * Define some links used on client side
-     */
-    $links  = '<div id="profiling_docu" class="hide">';
-    $links .= PMA\libraries\Util::showMySQLDocu('general-thread-states');
-    $links .= '</div>';
-    $links .= '<div id="explain_docu" class="hide">';
-    $links .= PMA\libraries\Util::showMySQLDocu('explain-output');
-    $links .= '</div>';
-
-    return $form . $links;
-}
-
-/***************************Ajax request function***********************************/
-
-/**
- * Returns JSon for real-time charting data
- *
- * @return array
- */
-function PMA_getJsonForChartingData()
-{
-    $ret = json_decode($_REQUEST['requiredData'], true);
-    $statusVars = array();
-    $serverVars = array();
-    $sysinfo = $cpuload = $memory = 0;
-
-    /* Accumulate all required variables and data */
-    list($serverVars, $statusVars, $ret) = PMA_getJsonForChartingDataGet(
-        $ret, $serverVars, $statusVars, $sysinfo, $cpuload, $memory
-    );
-
-    // Retrieve all required status variables
-    if (count($statusVars)) {
-        $statusVarValues = $GLOBALS['dbi']->fetchResult(
-            "SHOW GLOBAL STATUS WHERE Variable_name='"
-            . implode("' OR Variable_name='", $statusVars) . "'",
-            0,
-            1
-        );
-    } else {
-        $statusVarValues = array();
-    }
-
-    // Retrieve all required server variables
-    if (count($serverVars)) {
-        $serverVarValues = $GLOBALS['dbi']->fetchResult(
-            "SHOW GLOBAL VARIABLES WHERE Variable_name='"
-            . implode("' OR Variable_name='", $serverVars) . "'",
-            0,
-            1
-        );
-    } else {
-        $serverVarValues = array();
-    }
-
-    // ...and now assign them
-    $ret = PMA_getJsonForChartingDataSet($ret, $statusVarValues, $serverVarValues);
-
-    $ret['x'] = microtime(true) * 1000;
-    return $ret;
-}
-
-/**
- * Assign the variables for real-time charting data
- *
- * @param array $ret             Real-time charting data
- * @param array $statusVarValues Status variable values
- * @param array $serverVarValues Server variable values
- *
- * @return array
- */
-function PMA_getJsonForChartingDataSet($ret, $statusVarValues, $serverVarValues)
-{
-    foreach ($ret as $chart_id => $chartNodes) {
-        foreach ($chartNodes as $node_id => $nodeDataPoints) {
-            foreach ($nodeDataPoints as $point_id => $dataPoint) {
-                switch ($dataPoint['type']) {
-                case 'statusvar':
-                    $ret[$chart_id][$node_id][$point_id]['value']
-                        = $statusVarValues[$dataPoint['name']];
-                    break;
-                case 'servervar':
-                    $ret[$chart_id][$node_id][$point_id]['value']
-                        = $serverVarValues[$dataPoint['name']];
-                    break;
-                }
-            }
-        }
-    }
-    return $ret;
-}
-
-/**
- * Get called to get JSON for charting data
- *
- * @param array $ret        Real-time charting data
- * @param array $serverVars Server variable values
- * @param array $statusVars Status variable values
- * @param mixed $sysinfo    System info
- * @param mixed $cpuload    CPU load
- * @param mixed $memory     Memory
- *
- * @return array
- */
-function PMA_getJsonForChartingDataGet(
-    $ret, $serverVars, $statusVars, $sysinfo, $cpuload, $memory
-) {
-    // For each chart
-    foreach ($ret as $chart_id => $chartNodes) {
-        // For each data series
-        foreach ($chartNodes as $node_id => $nodeDataPoints) {
-            // For each data point in the series (usually just 1)
-            foreach ($nodeDataPoints as $point_id => $dataPoint) {
-                list($serverVars, $statusVars, $ret[$chart_id][$node_id][$point_id])
-                    = PMA_getJsonForChartingDataSwitch(
-                        $dataPoint['type'], $dataPoint['name'], $serverVars,
-                        $statusVars, $ret[$chart_id][$node_id][$point_id],
-                        $sysinfo, $cpuload, $memory
-                    );
-            } /* foreach */
-        } /* foreach */
-    }
-    return array($serverVars, $statusVars, $ret);
-}
-
-/**
- * Switch called to get JSON for charting data
- *
- * @param string $type       Type
- * @param string $pName      Name
- * @param array  $serverVars Server variable values
- * @param array  $statusVars Status variable values
- * @param array  $ret        Real-time charting data
- * @param mixed  $sysinfo    System info
- * @param mixed  $cpuload    CPU load
- * @param mixed  $memory     Memory
- *
- * @return array
- */
-function PMA_getJsonForChartingDataSwitch(
-    $type, $pName, $serverVars, $statusVars, $ret,
-    $sysinfo, $cpuload, $memory
-) {
-    switch ($type) {
-    /* We only collect the status and server variables here to
-     * read them all in one query,
-     * and only afterwards assign them.
-     * Also do some white list filtering on the names
-    */
-    case 'servervar':
-        if (!preg_match('/[^a-zA-Z_]+/', $pName)) {
-            $serverVars[] = $pName;
-        }
-        break;
-
-    case 'statusvar':
-        if (!preg_match('/[^a-zA-Z_]+/', $pName)) {
-            $statusVars[] = $pName;
-        }
-        break;
-
-    case 'proc':
-        $result = $GLOBALS['dbi']->query('SHOW PROCESSLIST');
-        $ret['value'] = $GLOBALS['dbi']->numRows($result);
-        break;
-
-    case 'cpu':
-        if (!$sysinfo) {
-            include_once 'libraries/sysinfo.lib.php';
-            $sysinfo = PMA_getSysInfo();
-        }
-        if (!$cpuload) {
-            $cpuload = $sysinfo->loadavg();
-        }
-
-        if (PMA_getSysInfoOs() == 'Linux') {
-            $ret['idle'] = $cpuload['idle'];
-            $ret['busy'] = $cpuload['busy'];
-        } else {
-            $ret['value'] = $cpuload['loadavg'];
-        }
-
-        break;
-
-    case 'memory':
-        if (!$sysinfo) {
-            include_once 'libraries/sysinfo.lib.php';
-            $sysinfo = PMA_getSysInfo();
-        }
-        if (!$memory) {
-            $memory = $sysinfo->memory();
-        }
-
-        $ret['value'] = isset($memory[$pName]) ? $memory[$pName] : 0;
-        break;
-    }
-
-    return array($serverVars, $statusVars, $ret);
-}
-
-/**
- * Returns JSon for log data with type: slow
- *
- * @param int $start Unix Time: Start time for query
- * @param int $end   Unix Time: End time for query
- *
- * @return array
- */
-function PMA_getJsonForLogDataTypeSlow($start, $end)
-{
-    $query  = 'SELECT start_time, user_host, ';
-    $query .= 'Sec_to_Time(Sum(Time_to_Sec(query_time))) as query_time, ';
-    $query .= 'Sec_to_Time(Sum(Time_to_Sec(lock_time))) as lock_time, ';
-    $query .= 'SUM(rows_sent) AS rows_sent, ';
-    $query .= 'SUM(rows_examined) AS rows_examined, db, sql_text, ';
-    $query .= 'COUNT(sql_text) AS \'#\' ';
-    $query .= 'FROM `mysql`.`slow_log` ';
-    $query .= 'WHERE start_time > FROM_UNIXTIME(' . $start . ') ';
-    $query .= 'AND start_time < FROM_UNIXTIME(' . $end . ') GROUP BY sql_text';
-
-    $result = $GLOBALS['dbi']->tryQuery($query);
-
-    $return = array('rows' => array(), 'sum' => array());
-
-    while ($row = $GLOBALS['dbi']->fetchAssoc($result)) {
-        $type = mb_strtolower(
-            mb_substr(
-                $row['sql_text'],
-                0,
-                mb_strpos($row['sql_text'], ' ')
-            )
-        );
-
-        switch($type) {
-        case 'insert':
-        case 'update':
-            //Cut off big inserts and updates, but append byte count instead
-            if (mb_strlen($row['sql_text']) > 220) {
-                $implode_sql_text = implode(
-                    ' ',
-                    PMA\libraries\Util::formatByteDown(
-                        mb_strlen($row['sql_text']), 2, 2
-                    )
-                );
-                $row['sql_text'] = mb_substr($row['sql_text'], 0, 200)
-                    . '... [' . $implode_sql_text . ']';
-            }
-            break;
-        default:
-            break;
-        }
-
-        if (! isset($return['sum'][$type])) {
-            $return['sum'][$type] = 0;
-        }
-        $return['sum'][$type] += $row['#'];
-        $return['rows'][] = $row;
-    }
-
-    $return['sum']['TOTAL'] = array_sum($return['sum']);
-    $return['numRows'] = count($return['rows']);
-
-    $GLOBALS['dbi']->freeResult($result);
-    return $return;
-}
-
-/**
- * Returns JSon for log data with type: general
- *
- * @param int $start Unix Time: Start time for query
- * @param int $end   Unix Time: End time for query
- *
- * @return array
- */
-function PMA_getJsonForLogDataTypeGeneral($start, $end)
-{
-    $limitTypes = '';
-    if (isset($_REQUEST['limitTypes']) && $_REQUEST['limitTypes']) {
-        $limitTypes
-            = 'AND argument REGEXP \'^(INSERT|SELECT|UPDATE|DELETE)\' ';
-    }
-
-    $query = 'SELECT TIME(event_time) as event_time, user_host, thread_id, ';
-    $query .= 'server_id, argument, count(argument) as \'#\' ';
-    $query .= 'FROM `mysql`.`general_log` ';
-    $query .= 'WHERE command_type=\'Query\' ';
-    $query .= 'AND event_time > FROM_UNIXTIME(' . $start . ') ';
-    $query .= 'AND event_time < FROM_UNIXTIME(' . $end . ') ';
-    $query .= $limitTypes . 'GROUP by argument'; // HAVING count > 1';
-
-    $result = $GLOBALS['dbi']->tryQuery($query);
-
-    $return = array('rows' => array(), 'sum' => array());
-    $insertTables = array();
-    $insertTablesFirst = -1;
-    $i = 0;
-    $removeVars = isset($_REQUEST['removeVariables'])
-        && $_REQUEST['removeVariables'];
-
-    while ($row = $GLOBALS['dbi']->fetchAssoc($result)) {
-        preg_match('/^(\w+)\s/', $row['argument'], $match);
-        $type = mb_strtolower($match[1]);
-
-        if (! isset($return['sum'][$type])) {
-            $return['sum'][$type] = 0;
-        }
-        $return['sum'][$type] += $row['#'];
-
-        switch($type) {
-        /** @noinspection PhpMissingBreakStatementInspection */
-        case 'insert':
-            // Group inserts if selected
-            if ($removeVars
-                && preg_match(
-                    '/^INSERT INTO (`|\'|"|)([^\s\\1]+)\\1/i',
-                    $row['argument'], $matches
-                )
-            ) {
-                $insertTables[$matches[2]]++;
-                if ($insertTables[$matches[2]] > 1) {
-                    $return['rows'][$insertTablesFirst]['#']
-                        = $insertTables[$matches[2]];
-
-                    // Add a ... to the end of this query to indicate that
-                    // there's been other queries
-                    $temp = $return['rows'][$insertTablesFirst]['argument'];
-                    $return['rows'][$insertTablesFirst]['argument']
-                        .= PMA_getSuspensionPoints(
-                            $temp[mb_strlen($temp) - 1]
-                        );
-
-                    // Group this value, thus do not add to the result list
-                    continue 2;
-                } else {
-                    $insertTablesFirst = $i;
-                    $insertTables[$matches[2]] += $row['#'] - 1;
-                }
-            }
-            // No break here
-
-        case 'update':
-            // Cut off big inserts and updates,
-            // but append byte count therefor
-            if (mb_strlen($row['argument']) > 220) {
-                $row['argument'] = mb_substr($row['argument'], 0, 200)
-                    . '... ['
-                    .  implode(
-                        ' ',
-                        PMA\libraries\Util::formatByteDown(
-                            mb_strlen($row['argument']),
-                            2,
-                            2
-                        )
-                    )
-                    . ']';
-            }
-            break;
-
-        default:
-            break;
-        }
-
-        $return['rows'][] = $row;
-        $i++;
-    }
-
-    $return['sum']['TOTAL'] = array_sum($return['sum']);
-    $return['numRows'] = count($return['rows']);
-
-    $GLOBALS['dbi']->freeResult($result);
-
-    return $return;
-}
-
-/**
- * Return suspension points if needed
- *
- * @param string $lastChar Last char
- *
- * @return null|string Return suspension points if needed
- */
-function PMA_getSuspensionPoints($lastChar)
-{
-    if ($lastChar != '.') {
-        return '<br/>...';
-    }
-
-    return null;
-}
-/**
- * Returns JSon for logging vars
- *
- * @return array
- */
-function PMA_getJsonForLoggingVars()
-{
-    if (isset($_REQUEST['varName']) && isset($_REQUEST['varValue'])) {
-        $value = $GLOBALS['dbi']->escapeString($_REQUEST['varValue']);
-        if (! is_numeric($value)) {
-            $value="'" . $value . "'";
-        }
-
-        if (! preg_match("/[^a-zA-Z0-9_]+/", $_REQUEST['varName'])) {
-            $GLOBALS['dbi']->query(
-                'SET GLOBAL ' . $_REQUEST['varName'] . ' = ' . $value
-            );
-        }
-
-    }
-
-    $loggingVars = $GLOBALS['dbi']->fetchResult(
-        'SHOW GLOBAL VARIABLES WHERE Variable_name IN'
-        . ' ("general_log","slow_query_log","long_query_time","log_output")',
-        0,
-        1
-    );
-    return $loggingVars;
-}
-
-/**
- * Returns JSon for query_analyzer
- *
- * @return array
- */
-function PMA_getJsonForQueryAnalyzer()
-{
-    $return = array();
-
-    if (mb_strlen($_REQUEST['database'])) {
-        $GLOBALS['dbi']->selectDb($_REQUEST['database']);
-    }
-
-    if ($profiling = PMA\libraries\Util::profilingSupported()) {
-        $GLOBALS['dbi']->query('SET PROFILING=1;');
-    }
-
-    // Do not cache query
-    $query = preg_replace(
-        '/^(\s*SELECT)/i',
-        '\\1 SQL_NO_CACHE',
-        $_REQUEST['query']
-    );
-
-    $GLOBALS['dbi']->tryQuery($query);
-    $return['affectedRows'] = $GLOBALS['cached_affected_rows'];
-
-    $result = $GLOBALS['dbi']->tryQuery('EXPLAIN ' . $query);
-    while ($row = $GLOBALS['dbi']->fetchAssoc($result)) {
-        $return['explain'][] = $row;
-    }
-
-    // In case an error happened
-    $return['error'] = $GLOBALS['dbi']->getError();
-
-    $GLOBALS['dbi']->freeResult($result);
-
-    if ($profiling) {
-        $return['profiling'] = array();
-        $result = $GLOBALS['dbi']->tryQuery(
-            'SELECT seq,state,duration FROM INFORMATION_SCHEMA.PROFILING'
-            . ' WHERE QUERY_ID=1 ORDER BY seq'
-        );
-        while ($row = $GLOBALS['dbi']->fetchAssoc($result)) {
-            $return['profiling'][]= $row;
-        }
-        $GLOBALS['dbi']->freeResult($result);
-    }
-    return $return;
-}
-
diff --git a/#pma/libraries/server_status_processes.lib.php b/#pma/libraries/server_status_processes.lib.php
deleted file mode 100644
index b55226e0..00000000
--- a/#pma/libraries/server_status_processes.lib.php
+++ /dev/null
@@ -1,308 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * functions for displaying processes list
- *
- * @usedby  server_status_processes.php
- *
- * @package PhpMyAdmin
- */
-use PMA\libraries\Message;
-use PMA\libraries\ServerStatusData;
-use PMA\libraries\Util;
-
-/**
- * Prints html for auto refreshing processes list
- *
- * @return string
- */
-function PMA_getHtmlForProcessListAutoRefresh()
-{
-    $notice = Message::notice(
-        __(
-            'Note: Enabling the auto refresh here might cause '
-            . 'heavy traffic between the web server and the MySQL server.'
-        )
-    )->getDisplay();
-    $retval  = $notice . '<div class="tabLinks">';
-    $retval .= '<label>' . __('Refresh rate') . ': ';
-    $retval .= ServerStatusData::getHtmlForRefreshList(
-        'refreshRate',
-        5,
-        Array(2, 3, 4, 5, 10, 20, 40, 60, 120, 300, 600, 1200)
-    );
-    $retval .= '</label>';
-    $retval .= '<a id="toggleRefresh" href="#">';
-    $retval .= Util::getImage('play.png') . __('Start auto refresh');
-    $retval .= '</a>';
-    $retval .= '</div>';
-    return $retval;
-}
-
-/**
- * Prints Server Process list
- *
- * @return string
- */
-function PMA_getHtmlForServerProcesslist()
-{
-    $url_params = array();
-
-    $show_full_sql = ! empty($_REQUEST['full']);
-    if ($show_full_sql) {
-        $url_params['full'] = 1;
-        $full_text_link = 'server_status_processes.php' . PMA_URL_getCommon(
-            array(), 'html', '?'
-        );
-    } else {
-        $full_text_link = 'server_status_processes.php' . PMA_URL_getCommon(
-            array('full' => 1)
-        );
-    }
-
-    // This array contains display name and real column name of each
-    // sortable column in the table
-    $sortable_columns = array(
-        array(
-            'column_name' => __('ID'),
-            'order_by_field' => 'Id'
-        ),
-        array(
-            'column_name' => __('User'),
-            'order_by_field' => 'User'
-        ),
-        array(
-            'column_name' => __('Host'),
-            'order_by_field' => 'Host'
-        ),
-        array(
-            'column_name' => __('Database'),
-            'order_by_field' => 'db'
-        ),
-        array(
-            'column_name' => __('Command'),
-            'order_by_field' => 'Command'
-        ),
-        array(
-            'column_name' => __('Time'),
-            'order_by_field' => 'Time'
-        ),
-        array(
-            'column_name' => __('Status'),
-            'order_by_field' => 'State'
-        ),
-        array(
-            'column_name' => __('Progress'),
-            'order_by_field' => 'Progress'
-        ),
-        array(
-            'column_name' => __('SQL query'),
-            'order_by_field' => 'Info'
-        )
-    );
-    $sortableColCount = count($sortable_columns);
-
-    $sql_query = $show_full_sql
-        ? 'SHOW FULL PROCESSLIST'
-        : 'SHOW PROCESSLIST';
-    if ((! empty($_REQUEST['order_by_field'])
-        && ! empty($_REQUEST['sort_order']))
-        || (! empty($_REQUEST['showExecuting']))
-    ) {
-        $sql_query = 'SELECT * FROM `INFORMATION_SCHEMA`.`PROCESSLIST` ';
-    }
-    if (! empty($_REQUEST['showExecuting'])) {
-        $sql_query .= ' WHERE state = "executing" ';
-    }
-    if (!empty($_REQUEST['order_by_field']) && !empty($_REQUEST['sort_order'])) {
-        $sql_query .= ' ORDER BY '
-            . Util::backquote($_REQUEST['order_by_field'])
-            . ' ' . $_REQUEST['sort_order'];
-    }
-
-    $result = $GLOBALS['dbi']->query($sql_query);
-
-    $retval = '<table id="tableprocesslist" '
-        . 'class="data clearfloat noclick sortable">';
-    $retval .= '<thead>';
-    $retval .= '<tr>';
-    $retval .= '<th>' . __('Processes') . '</th>';
-    foreach ($sortable_columns as $column) {
-
-        $is_sorted = ! empty($_REQUEST['order_by_field'])
-            && ! empty($_REQUEST['sort_order'])
-            && ($_REQUEST['order_by_field'] == $column['order_by_field']);
-
-        $column['sort_order'] = 'ASC';
-        if ($is_sorted && $_REQUEST['sort_order'] === 'ASC') {
-            $column['sort_order'] = 'DESC';
-        }
-        if (isset($_REQUEST['showExecuting'])) {
-            $column['showExecuting'] = 'on';
-        }
-
-        $retval .= '<th>';
-        $columnUrl = PMA_URL_getCommon($column);
-        $retval .= '<a href="server_status_processes.php' . $columnUrl . '" ';
-        if ($is_sorted) {
-            $retval .= 'onmouseout="$(\'.soimg\').toggle()" '
-                . 'onmouseover="$(\'.soimg\').toggle()"';
-        }
-        $retval .= '>';
-
-        $retval .= $column['column_name'];
-
-        if ($is_sorted) {
-            $asc_display_style = 'inline';
-            $desc_display_style = 'none';
-            if ($_REQUEST['sort_order'] === 'DESC') {
-                $desc_display_style = 'inline';
-                $asc_display_style = 'none';
-            }
-            $retval .= '<img class="icon ic_s_desc soimg" alt="'
-                . __('Descending') . '" title="" src="themes/dot.gif" '
-                . 'style="display: ' . $desc_display_style . '" />';
-            $retval .= '<img class="icon ic_s_asc soimg hide" alt="'
-                . __('Ascending') . '" title="" src="themes/dot.gif" '
-                . 'style="display: ' . $asc_display_style . '" />';
-        }
-
-        $retval .= '</a>';
-
-        if (0 === --$sortableColCount) {
-            $retval .= '<a href="' . $full_text_link . '">';
-            if ($show_full_sql) {
-                $retval .= Util::getImage(
-                    's_partialtext.png',
-                    __('Truncate Shown Queries')
-                );
-            } else {
-                $retval .= Util::getImage(
-                    's_fulltext.png',
-                    __('Show Full Queries')
-                );
-            }
-            $retval .= '</a>';
-        }
-        $retval .= '</th>';
-    }
-
-    $retval .= '</tr>';
-    $retval .= '</thead>';
-    $retval .= '<tbody>';
-
-    $odd_row = true;
-    while ($process = $GLOBALS['dbi']->fetchAssoc($result)) {
-        $retval .= PMA_getHtmlForServerProcessItem(
-            $process,
-            $odd_row,
-            $show_full_sql
-        );
-        $odd_row = ! $odd_row;
-    }
-    $retval .= '</tbody>';
-    $retval .= '</table>';
-
-    return $retval;
-}
-
-/**
- * Returns the html for the list filter
- *
- * @return string
- */
-function PMA_getHtmlForProcessListFilter()
-{
-    $showExecuting = '';
-    if (! empty($_REQUEST['showExecuting'])) {
-        $showExecuting = ' checked="checked"';
-    }
-
-    $url_params = array(
-        'ajax_request' => true,
-        'full' => (isset($_REQUEST['full']) ? $_REQUEST['full'] : ''),
-        'column_name' => (isset($_REQUEST['column_name']) ? $_REQUEST['column_name'] : ''),
-        'order_by_field'
-            => (isset($_REQUEST['order_by_field']) ? $_REQUEST['order_by_field'] : ''),
-        'sort_order' => (isset($_REQUEST['sort_order']) ? $_REQUEST['sort_order'] : ''),
-    );
-
-    $retval  = '';
-    $retval .= '<fieldset id="tableFilter">';
-    $retval .= '<legend>' . __('Filters') . '</legend>';
-    $retval .= '<form action="server_status_processes.php'
-        . PMA_URL_getCommon($url_params) . '">';
-    $retval .= '<input type="submit" value="' . __('Refresh') . '" />';
-    $retval .= '<div class="formelement">';
-    $retval .= '<input' . $showExecuting . ' type="checkbox" name="showExecuting"'
-        . ' id="showExecuting" class="autosubmit"/>';
-    $retval .= '<label for="showExecuting">';
-    $retval .= __('Show only active');
-    $retval .= '</label>';
-    $retval .= '</div>';
-    $retval .= '</form>';
-    $retval .= '</fieldset>';
-
-    return $retval;
-}
-
-/**
- * Prints Every Item of Server Process
- *
- * @param array $process       data of Every Item of Server Process
- * @param bool  $odd_row       display odd row or not
- * @param bool  $show_full_sql show full sql or not
- *
- * @return string
- */
-function PMA_getHtmlForServerProcessItem($process, $odd_row, $show_full_sql)
-{
-    // Array keys need to modify due to the way it has used
-    // to display column values
-    if ((! empty($_REQUEST['order_by_field']) && ! empty($_REQUEST['sort_order']))
-        || (! empty($_REQUEST['showExecuting']))
-    ) {
-        foreach (array_keys($process) as $key) {
-            $new_key = ucfirst(mb_strtolower($key));
-            if ($new_key !== $key) {
-                $process[$new_key] = $process[$key];
-                unset($process[$key]);
-            }
-        }
-    }
-
-    $url_params = array(
-        'kill' => $process['Id'],
-        'ajax_request' => true
-    );
-    $kill_process = 'server_status_processes.php' . PMA_URL_getCommon($url_params);
-
-    $retval  = '<tr class="' . ($odd_row ? 'odd' : 'even') . '">';
-    $retval .= '<td><a class="ajax kill_process" href="' . $kill_process . '">'
-        . __('Kill') . '</a></td>';
-    $retval .= '<td class="value">' . $process['Id'] . '</td>';
-    $retval .= '<td>' . htmlspecialchars($process['User']) . '</td>';
-    $retval .= '<td>' . htmlspecialchars($process['Host']) . '</td>';
-    $retval .= '<td>' . ((! isset($process['db'])
-            || !mb_strlen($process['db']))
-            ? '<i>' . __('None') . '</i>'
-            : htmlspecialchars($process['db'])) . '</td>';
-    $retval .= '<td>' . htmlspecialchars($process['Command']) . '</td>';
-    $retval .= '<td class="value">' . $process['Time'] . '</td>';
-    $processStatusStr = empty($process['State']) ? '---' : $process['State'];
-    $retval .= '<td>' . $processStatusStr . '</td>';
-    $processProgress = empty($process['Progress']) ? '---' : $process['Progress'];
-    $retval .= '<td>' . $processProgress . '</td>';
-    $retval .= '<td>';
-
-    if (empty($process['Info'])) {
-        $retval .= '---';
-    } else {
-        $retval .= Util::formatSql($process['Info'], ! $show_full_sql);
-    }
-    $retval .= '</td>';
-    $retval .= '</tr>';
-
-    return $retval;
-}
-
diff --git a/#pma/libraries/server_status_queries.lib.php b/#pma/libraries/server_status_queries.lib.php
deleted file mode 100644
index b81f9067..00000000
--- a/#pma/libraries/server_status_queries.lib.php
+++ /dev/null
@@ -1,152 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * functions for displaying query statistics for the server
- *
- * @usedby  server_status_queries.php
- *
- * @package PhpMyAdmin
- */
-use PMA\libraries\ServerStatusData;
-
-/**
- * Returns the html content for the query statistics
- *
- * @param ServerStatusData $ServerStatusData Server status data
- *
- * @return string
- */
-function PMA_getHtmlForQueryStatistics($ServerStatusData)
-{
-    $retval = '';
-
-    $hour_factor   = 3600 / $ServerStatusData->status['Uptime'];
-    $used_queries = $ServerStatusData->used_queries;
-    $total_queries = array_sum($used_queries);
-
-    $retval .= '<h3 id="serverstatusqueries">';
-    /* l10n: Questions is the name of a MySQL Status variable */
-    $retval .= sprintf(
-        __('Questions since startup: %s'),
-        PMA\libraries\Util::formatNumber($total_queries, 0)
-    );
-    $retval .= ' ';
-    $retval .= PMA\libraries\Util::showMySQLDocu(
-        'server-status-variables',
-        false,
-        'statvar_Questions'
-    );
-    $retval .= '<br />';
-    $retval .= '<span>';
-    $retval .= '&oslash; ' . __('per hour:') . ' ';
-    $retval .= PMA\libraries\Util::formatNumber($total_queries * $hour_factor, 0);
-    $retval .= '<br />';
-    $retval .= '&oslash; ' . __('per minute:') . ' ';
-    $retval .= PMA\libraries\Util::formatNumber(
-        $total_queries * 60 / $ServerStatusData->status['Uptime'],
-        0
-    );
-    $retval .= '<br />';
-    if ($total_queries / $ServerStatusData->status['Uptime'] >= 1) {
-        $retval .= '&oslash; ' . __('per second:') . ' ';
-        $retval .= PMA\libraries\Util::formatNumber(
-            $total_queries / $ServerStatusData->status['Uptime'],
-            0
-        );
-    }
-    $retval .= '</span>';
-    $retval .= '</h3>';
-
-    $retval .= PMA_getHtmlForServerStatusQueriesDetails($ServerStatusData);
-
-    return $retval;
-}
-
-/**
- * Returns the html content for the query details
- *
- * @param ServerStatusData $ServerStatusData Server status data
- *
- * @return string
- */
-function PMA_getHtmlForServerStatusQueriesDetails($ServerStatusData)
-{
-    $hour_factor   = 3600 / $ServerStatusData->status['Uptime'];
-    $used_queries = $ServerStatusData->used_queries;
-    $total_queries = array_sum($used_queries);
-    // reverse sort by value to show most used statements first
-    arsort($used_queries);
-
-    $odd_row        = true;
-
-    //(- $ServerStatusData->status['Connections']);
-    $perc_factor    = 100 / $total_queries;
-
-    $retval = '<table id="serverstatusqueriesdetails" '
-        . 'class="data sortable noclick">';
-    $retval .= '<col class="namecol" />';
-    $retval .= '<col class="valuecol" span="3" />';
-    $retval .= '<thead>';
-    $retval .= '<tr><th>' . __('Statements') . '</th>';
-    $retval .= '<th>';
-    /* l10n: # = Amount of queries */
-    $retval .= __('#');
-    $retval .= '</th>';
-    $retval .= '<th>&oslash; ' . __('per hour')
-        . '</th>';
-    $retval .= '<th>%</div></th>';
-    $retval .= '</tr>';
-    $retval .= '</thead>';
-    $retval .= '<tbody>';
-
-    $chart_json = array();
-    $query_sum = array_sum($used_queries);
-    $other_sum = 0;
-    foreach ($used_queries as $name => $value) {
-        $odd_row = !$odd_row;
-        // For the percentage column, use Questions - Connections, because
-        // the number of connections is not an item of the Query types
-        // but is included in Questions. Then the total of the percentages is 100.
-        $name = str_replace(array('Com_', '_'), array('', ' '), $name);
-        // Group together values that make out less than 2% into "Other", but only
-        // if we have more than 6 fractions already
-        if ($value < $query_sum * 0.02 && count($chart_json)>6) {
-            $other_sum += $value;
-        } else {
-            $chart_json[$name] = $value;
-        }
-        $retval .= '<tr class="';
-        $retval .= $odd_row ? 'odd' : 'even';
-        $retval .= '">';
-        $retval .= '<th class="name">' . htmlspecialchars($name) . '</th>';
-        $retval .= '<td class="value">';
-        $retval .= htmlspecialchars(
-            PMA\libraries\Util::formatNumber($value, 5, 0, true)
-        );
-        $retval .= '</td>';
-        $retval .= '<td class="value">';
-        $retval .= htmlspecialchars(
-            PMA\libraries\Util::formatNumber($value * $hour_factor, 4, 1, true)
-        );
-        $retval .= '</td>';
-        $retval .= '<td class="value">';
-        $retval .= htmlspecialchars(
-            PMA\libraries\Util::formatNumber($value * $perc_factor, 0, 2)
-        );
-        $retval .= '</td>';
-        $retval .= '</tr>';
-    }
-    $retval .= '</tbody>';
-    $retval .= '</table>';
-
-    $retval .= '<div id="serverstatusquerieschart"></div>';
-    $retval .= '<div id="serverstatusquerieschart_data" style="display:none;">';
-    if ($other_sum > 0) {
-        $chart_json[__('Other')] = $other_sum;
-    }
-    $retval .= htmlspecialchars(json_encode($chart_json));
-    $retval .= '</div>';
-
-    return $retval;
-}
-
diff --git a/#pma/libraries/server_status_variables.lib.php b/#pma/libraries/server_status_variables.lib.php
deleted file mode 100644
index 53b7ad4b..00000000
--- a/#pma/libraries/server_status_variables.lib.php
+++ /dev/null
@@ -1,765 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * functions for displaying server status variables
- *
- * @usedby  server_status_variables.php
- *
- * @package PhpMyAdmin
- */
-use PMA\libraries\ServerStatusData;
-
-/**
- * Returns the html for the list filter
- *
- * @param ServerStatusData $ServerStatusData Server status data
- *
- * @return string
- */
-function PMA_getHtmlForFilter($ServerStatusData)
-{
-    $filterAlert = '';
-    if (! empty($_REQUEST['filterAlert'])) {
-        $filterAlert = ' checked="checked"';
-    }
-    $filterText = '';
-    if (! empty($_REQUEST['filterText'])) {
-        $filterText = htmlspecialchars($_REQUEST['filterText']);
-    }
-    $dontFormat = '';
-    if (! empty($_REQUEST['dontFormat'])) {
-        $dontFormat = ' checked="checked"';
-    }
-
-    $retval  = '';
-    $retval .= '<fieldset id="tableFilter">';
-    $retval .= '<legend>' . __('Filters') . '</legend>';
-    $retval .= '<form action="server_status_variables.php'
-        . PMA_URL_getCommon() . '">';
-    $retval .= '<input type="submit" value="' . __('Refresh') . '" />';
-    $retval .= '<div class="formelement">';
-    $retval .= '<label for="filterText">' . __('Containing the word:') . '</label>';
-    $retval .= '<input name="filterText" type="text" id="filterText" '
-        . 'style="vertical-align: baseline;" value="' . $filterText . '" />';
-    $retval .= '</div>';
-    $retval .= '<div class="formelement">';
-    $retval .= '<input' . $filterAlert . ' type="checkbox" '
-        . 'name="filterAlert" id="filterAlert" />';
-    $retval .= '<label for="filterAlert">';
-    $retval .= __('Show only alert values');
-    $retval .= '</label>';
-    $retval .= '</div>';
-    $retval .= '<div class="formelement">';
-    $retval .= '<select id="filterCategory" name="filterCategory">';
-    $retval .= '<option value="">' . __('Filter by category…') . '</option>';
-
-    foreach ($ServerStatusData->sections as $section_id => $section_name) {
-        if (isset($ServerStatusData->sectionUsed[$section_id])) {
-            if (! empty($_REQUEST['filterCategory'])
-                && $_REQUEST['filterCategory'] == $section_id
-            ) {
-                $selected = ' selected="selected"';
-            } else {
-                $selected = '';
-            }
-            $retval .= '<option' . $selected . ' value="' . $section_id . '">';
-            $retval .= htmlspecialchars($section_name) . '</option>';
-        }
-    }
-    $retval .= '</select>';
-    $retval .= '</div>';
-    $retval .= '<div class="formelement">';
-    $retval .= '<input' . $dontFormat . ' type="checkbox" '
-        . 'name="dontFormat" id="dontFormat" />';
-    $retval .= '<label for="dontFormat">';
-    $retval .= __('Show unformatted values');
-    $retval .= '</label>';
-    $retval .= '</div>';
-    $retval .= '</form>';
-    $retval .= '</fieldset>';
-
-    return $retval;
-}
-
-/**
- * Prints the suggestion links
- *
- * @param ServerStatusData $ServerStatusData Server status data
- *
- * @return string
- */
-function PMA_getHtmlForLinkSuggestions($ServerStatusData)
-{
-    $retval  = '<div id="linkSuggestions" class="defaultLinks" '
-        . 'style="display:none">';
-    $retval .= '<p class="notice">' . __('Related links:');
-    foreach ($ServerStatusData->links as $section_name => $section_links) {
-        $retval .= '<span class="status_' . $section_name . '"> ';
-        $i = 0;
-        foreach ($section_links as $link_name => $link_url) {
-            if ($i > 0) {
-                $retval .= ', ';
-            }
-            if ('doc' == $link_name) {
-                $retval .= PMA\libraries\Util::showMySQLDocu($link_url);
-            } else {
-                $retval .= '<a href="' . $link_url . '">' . $link_name . '</a>';
-            }
-            $i++;
-        }
-        $retval .= '</span>';
-    }
-    unset($link_url, $link_name, $i);
-    $retval .= '</p>';
-    $retval .= '</div>';
-
-    return $retval;
-}
-
-/**
- * Returns a table with variables information
- *
- * @param ServerStatusData $ServerStatusData Server status data
- *
- * @return string
- */
-function PMA_getHtmlForVariablesList($ServerStatusData)
-{
-    $retval  = '';
-    $strShowStatus = PMA_getStatusVariablesDescriptions();
-    /**
-     * define some alerts
-     */
-    // name => max value before alert
-    $alerts = array(
-        // lower is better
-        // variable => max value
-        'Aborted_clients' => 0,
-        'Aborted_connects' => 0,
-
-        'Binlog_cache_disk_use' => 0,
-
-        'Created_tmp_disk_tables' => 0,
-
-        'Handler_read_rnd' => 0,
-        'Handler_read_rnd_next' => 0,
-
-        'Innodb_buffer_pool_pages_dirty' => 0,
-        'Innodb_buffer_pool_reads' => 0,
-        'Innodb_buffer_pool_wait_free' => 0,
-        'Innodb_log_waits' => 0,
-        'Innodb_row_lock_time_avg' => 10, // ms
-        'Innodb_row_lock_time_max' => 50, // ms
-        'Innodb_row_lock_waits' => 0,
-
-        'Slow_queries' => 0,
-        'Delayed_errors' => 0,
-        'Select_full_join' => 0,
-        'Select_range_check' => 0,
-        'Sort_merge_passes' => 0,
-        'Opened_tables' => 0,
-        'Table_locks_waited' => 0,
-        'Qcache_lowmem_prunes' => 0,
-
-        'Qcache_free_blocks' =>
-            isset($ServerStatusData->status['Qcache_total_blocks'])
-            ? $ServerStatusData->status['Qcache_total_blocks'] / 5
-            : 0,
-        'Slow_launch_threads' => 0,
-
-        // depends on Key_read_requests
-        // normally lower then 1:0.01
-        'Key_reads' => isset($ServerStatusData->status['Key_read_requests'])
-            ? (0.01 * $ServerStatusData->status['Key_read_requests']) : 0,
-        // depends on Key_write_requests
-        // normally nearly 1:1
-        'Key_writes' => isset($ServerStatusData->status['Key_write_requests'])
-            ? (0.9 * $ServerStatusData->status['Key_write_requests']) : 0,
-
-        'Key_buffer_fraction' => 0.5,
-
-        // alert if more than 95% of thread cache is in use
-        'Threads_cached' => isset($ServerStatusData->variables['thread_cache_size'])
-            ? 0.95 * $ServerStatusData->variables['thread_cache_size'] : 0
-
-        // higher is better
-        // variable => min value
-        //'Handler read key' => '> ',
-    );
-
-    $retval .= PMA_getHtmlForRenderVariables(
-        $ServerStatusData,
-        $alerts,
-        $strShowStatus
-    );
-
-    return $retval;
-}
-
-/**
- * Returns HTML for render variables list
- *
- * @param ServerStatusData $ServerStatusData Server status data
- * @param array            $alerts           Alert Array
- * @param array            $strShowStatus    Status Array
- *
- * @return string
- */
-function PMA_getHtmlForRenderVariables($ServerStatusData, $alerts, $strShowStatus)
-{
-    $retval  = '<table class="data noclick" id="serverstatusvariables">';
-    $retval .= '<col class="namecol" />';
-    $retval .= '<col class="valuecol" />';
-    $retval .= '<col class="descrcol" />';
-    $retval .= '<thead>';
-    $retval .= '<tr>';
-    $retval .= '<th>' . __('Variable') . '</th>';
-    $retval .= '<th>' . __('Value') . '</th>';
-    $retval .= '<th>' . __('Description') . '</th>';
-    $retval .= '</tr>';
-    $retval .= '</thead>';
-    $retval .= '<tbody>';
-
-    $odd_row = false;
-    foreach ($ServerStatusData->status as $name => $value) {
-        $odd_row = !$odd_row;
-        $retval .= '<tr class="' . ($odd_row ? 'odd' : 'even')
-            . (isset($ServerStatusData->allocationMap[$name])
-                ?' s_' . $ServerStatusData->allocationMap[$name]
-                : '')
-            . '">';
-
-        $retval .= '<th class="name">';
-        $retval .= htmlspecialchars(str_replace('_', ' ', $name));
-        // Fields containing % are calculated,
-        // they can not be described in MySQL documentation
-        if (mb_strpos($name, '%') === false) {
-            $retval .= PMA\libraries\Util::showMySQLDocu(
-                'server-status-variables',
-                false,
-                'statvar_' . $name
-            );
-        }
-        $retval .= '</th>';
-
-        $retval .= '<td class="value"><span class="formatted">';
-        if (isset($alerts[$name])) {
-            if ($value > $alerts[$name]) {
-                $retval .= '<span class="attention">';
-            } else {
-                $retval .= '<span class="allfine">';
-            }
-        }
-        if (substr($name, -1) === '%') {
-            $retval .= htmlspecialchars(
-                PMA\libraries\Util::formatNumber($value, 0, 2)
-            ) . ' %';
-        } elseif (strpos($name, 'Uptime') !== false) {
-            $retval .= htmlspecialchars(
-                PMA\libraries\Util::timespanFormat($value)
-            );
-        } elseif (is_numeric($value) && $value > 1000) {
-            $retval .= '<abbr title="'
-                // makes available the raw value as a title
-                . htmlspecialchars(PMA\libraries\Util::formatNumber($value, 0))
-                . '">'
-                . htmlspecialchars(PMA\libraries\Util::formatNumber($value, 3, 1))
-                . '</abbr>';
-        } elseif (is_numeric($value)) {
-            $retval .= htmlspecialchars(
-                PMA\libraries\Util::formatNumber($value, 3, 1)
-            );
-        } else {
-            $retval .= htmlspecialchars($value);
-        }
-        if (isset($alerts[$name])) {
-            $retval .= '</span>';
-        }
-        $retval .= '</span>';
-        $retval .= '<span style="display:none;" class="original">';
-        if (isset($alerts[$name])) {
-            if ($value > $alerts[$name]) {
-                $retval .= '<span class="attention">';
-            } else {
-                $retval .= '<span class="allfine">';
-            }
-        }
-        $retval .= htmlspecialchars($value);
-        if (isset($alerts[$name])) {
-            $retval .= '</span>';
-        }
-        $retval .= '</span>';
-        $retval .= '</td>';
-        $retval .= '<td class="descr">';
-
-        if (isset($strShowStatus[$name])) {
-            $retval .= $strShowStatus[$name];
-        }
-
-        if (isset($ServerStatusData->links[$name])) {
-            foreach ($ServerStatusData->links[$name] as $link_name => $link_url) {
-                if ('doc' == $link_name) {
-                    $retval .= PMA\libraries\Util::showMySQLDocu($link_url);
-                } else {
-                    $retval .= ' <a href="' . $link_url . '">' . $link_name . '</a>';
-                }
-            }
-            unset($link_url, $link_name);
-        }
-        $retval .= '</td>';
-        $retval .= '</tr>';
-    }
-    $retval .= '</tbody>';
-    $retval .= '</table>';
-
-    return $retval;
-}
-
-/**
- * Returns a list of variable descriptions
- *
- * @return array
- */
-function PMA_getStatusVariablesDescriptions()
-{
-    /**
-     * Messages are built using the message name
-     */
-    return array(
-        'Aborted_clients' => __(
-            'The number of connections that were aborted because the client died'
-            . ' without closing the connection properly.'
-        ),
-        'Aborted_connects' => __(
-            'The number of failed attempts to connect to the MySQL server.'
-        ),
-        'Binlog_cache_disk_use' => __(
-            'The number of transactions that used the temporary binary log cache'
-            . ' but that exceeded the value of binlog_cache_size and used a'
-            . ' temporary file to store statements from the transaction.'
-        ),
-        'Binlog_cache_use' => __(
-            'The number of transactions that used the temporary binary log cache.'
-        ),
-        'Connections' => __(
-            'The number of connection attempts (successful or not)'
-            . ' to the MySQL server.'
-        ),
-        'Created_tmp_disk_tables' => __(
-            'The number of temporary tables on disk created automatically by'
-            . ' the server while executing statements. If'
-            . ' Created_tmp_disk_tables is big, you may want to increase the'
-            . ' tmp_table_size  value to cause temporary tables to be'
-            . ' memory-based instead of disk-based.'
-        ),
-        'Created_tmp_files' => __(
-            'How many temporary files mysqld has created.'
-        ),
-        'Created_tmp_tables' => __(
-            'The number of in-memory temporary tables created automatically'
-            . ' by the server while executing statements.'
-        ),
-        'Delayed_errors' => __(
-            'The number of rows written with INSERT DELAYED for which some'
-            . ' error occurred (probably duplicate key).'
-        ),
-        'Delayed_insert_threads' => __(
-            'The number of INSERT DELAYED handler threads in use. Every'
-            . ' different table on which one uses INSERT DELAYED gets'
-            . ' its own thread.'
-        ),
-        'Delayed_writes' => __(
-            'The number of INSERT DELAYED rows written.'
-        ),
-        'Flush_commands'  => __(
-            'The number of executed FLUSH statements.'
-        ),
-        'Handler_commit' => __(
-            'The number of internal COMMIT statements.'
-        ),
-        'Handler_delete' => __(
-            'The number of times a row was deleted from a table.'
-        ),
-        'Handler_discover' => __(
-            'The MySQL server can ask the NDB Cluster storage engine if it'
-            . ' knows about a table with a given name. This is called discovery.'
-            . ' Handler_discover indicates the number of time tables have been'
-            . ' discovered.'
-        ),
-        'Handler_read_first' => __(
-            'The number of times the first entry was read from an index. If this'
-            . ' is high, it suggests that the server is doing a lot of full'
-            . ' index scans; for example, SELECT col1 FROM foo, assuming that'
-            . ' col1 is indexed.'
-        ),
-        'Handler_read_key' => __(
-            'The number of requests to read a row based on a key. If this is'
-            . ' high, it is a good indication that your queries and tables'
-            . ' are properly indexed.'
-        ),
-        'Handler_read_next' => __(
-            'The number of requests to read the next row in key order. This is'
-            . ' incremented if you are querying an index column with a range'
-            . ' constraint or if you are doing an index scan.'
-        ),
-        'Handler_read_prev' => __(
-            'The number of requests to read the previous row in key order.'
-            . ' This read method is mainly used to optimize ORDER BY … DESC.'
-        ),
-        'Handler_read_rnd' => __(
-            'The number of requests to read a row based on a fixed position.'
-            . ' This is high if you are doing a lot of queries that require'
-            . ' sorting of the result. You probably have a lot of queries that'
-            . ' require MySQL to scan whole tables or you have joins that'
-            . ' don\'t use keys properly.'
-        ),
-        'Handler_read_rnd_next' => __(
-            'The number of requests to read the next row in the data file.'
-            . ' This is high if you are doing a lot of table scans. Generally'
-            . ' this suggests that your tables are not properly indexed or that'
-            . ' your queries are not written to take advantage of the indexes'
-            . ' you have.'
-        ),
-        'Handler_rollback' => __(
-            'The number of internal ROLLBACK statements.'
-        ),
-        'Handler_update' => __(
-            'The number of requests to update a row in a table.'
-        ),
-        'Handler_write' => __(
-            'The number of requests to insert a row in a table.'
-        ),
-        'Innodb_buffer_pool_pages_data' => __(
-            'The number of pages containing data (dirty or clean).'
-        ),
-        'Innodb_buffer_pool_pages_dirty' => __(
-            'The number of pages currently dirty.'
-        ),
-        'Innodb_buffer_pool_pages_flushed' => __(
-            'The number of buffer pool pages that have been requested'
-            . ' to be flushed.'
-        ),
-        'Innodb_buffer_pool_pages_free' => __(
-            'The number of free pages.'
-        ),
-        'Innodb_buffer_pool_pages_latched' => __(
-            'The number of latched pages in InnoDB buffer pool. These are pages'
-            . ' currently being read or written or that can\'t be flushed or'
-            . ' removed for some other reason.'
-        ),
-        'Innodb_buffer_pool_pages_misc' => __(
-            'The number of pages busy because they have been allocated for'
-            . ' administrative overhead such as row locks or the adaptive'
-            . ' hash index. This value can also be calculated as'
-            . ' Innodb_buffer_pool_pages_total - Innodb_buffer_pool_pages_free'
-            . ' - Innodb_buffer_pool_pages_data.'
-        ),
-        'Innodb_buffer_pool_pages_total' => __(
-            'Total size of buffer pool, in pages.'
-        ),
-        'Innodb_buffer_pool_read_ahead_rnd' => __(
-            'The number of "random" read-aheads InnoDB initiated. This happens'
-            . ' when a query is to scan a large portion of a table but in'
-            . ' random order.'
-        ),
-        'Innodb_buffer_pool_read_ahead_seq' => __(
-            'The number of sequential read-aheads InnoDB initiated. This'
-            . ' happens when InnoDB does a sequential full table scan.'
-        ),
-        'Innodb_buffer_pool_read_requests' => __(
-            'The number of logical read requests InnoDB has done.'
-        ),
-        'Innodb_buffer_pool_reads' => __(
-            'The number of logical reads that InnoDB could not satisfy'
-            . ' from buffer pool and had to do a single-page read.'
-        ),
-        'Innodb_buffer_pool_wait_free' => __(
-            'Normally, writes to the InnoDB buffer pool happen in the'
-            . ' background. However, if it\'s necessary to read or create a page'
-            . ' and no clean pages are available, it\'s necessary to wait for'
-            . ' pages to be flushed first. This counter counts instances of'
-            . ' these waits. If the buffer pool size was set properly, this'
-            . ' value should be small.'
-        ),
-        'Innodb_buffer_pool_write_requests' => __(
-            'The number writes done to the InnoDB buffer pool.'
-        ),
-        'Innodb_data_fsyncs' => __(
-            'The number of fsync() operations so far.'
-        ),
-        'Innodb_data_pending_fsyncs' => __(
-            'The current number of pending fsync() operations.'
-        ),
-        'Innodb_data_pending_reads' => __(
-            'The current number of pending reads.'
-        ),
-        'Innodb_data_pending_writes' => __(
-            'The current number of pending writes.'
-        ),
-        'Innodb_data_read' => __(
-            'The amount of data read so far, in bytes.'
-        ),
-        'Innodb_data_reads' => __(
-            'The total number of data reads.'
-        ),
-        'Innodb_data_writes' => __(
-            'The total number of data writes.'
-        ),
-        'Innodb_data_written' => __(
-            'The amount of data written so far, in bytes.'
-        ),
-        'Innodb_dblwr_pages_written' => __(
-            'The number of pages that have been written for'
-            . ' doublewrite operations.'
-        ),
-        'Innodb_dblwr_writes' => __(
-            'The number of doublewrite operations that have been performed.'
-        ),
-        'Innodb_log_waits' => __(
-            'The number of waits we had because log buffer was too small and'
-            . ' we had to wait for it to be flushed before continuing.'
-        ),
-        'Innodb_log_write_requests' => __(
-            'The number of log write requests.'
-        ),
-        'Innodb_log_writes' => __(
-            'The number of physical writes to the log file.'
-        ),
-        'Innodb_os_log_fsyncs' => __(
-            'The number of fsync() writes done to the log file.'
-        ),
-        'Innodb_os_log_pending_fsyncs' => __(
-            'The number of pending log file fsyncs.'
-        ),
-        'Innodb_os_log_pending_writes' => __(
-            'Pending log file writes.'
-        ),
-        'Innodb_os_log_written' => __(
-            'The number of bytes written to the log file.'
-        ),
-        'Innodb_pages_created' => __(
-            'The number of pages created.'
-        ),
-        'Innodb_page_size' => __(
-            'The compiled-in InnoDB page size (default 16KB). Many values are'
-            . ' counted in pages; the page size allows them to be easily'
-            . ' converted to bytes.'
-        ),
-        'Innodb_pages_read' => __(
-            'The number of pages read.'
-        ),
-        'Innodb_pages_written' => __(
-            'The number of pages written.'
-        ),
-        'Innodb_row_lock_current_waits' => __(
-            'The number of row locks currently being waited for.'
-        ),
-        'Innodb_row_lock_time_avg' => __(
-            'The average time to acquire a row lock, in milliseconds.'
-        ),
-        'Innodb_row_lock_time' => __(
-            'The total time spent in acquiring row locks, in milliseconds.'
-        ),
-        'Innodb_row_lock_time_max' => __(
-            'The maximum time to acquire a row lock, in milliseconds.'
-        ),
-        'Innodb_row_lock_waits' => __(
-            'The number of times a row lock had to be waited for.'
-        ),
-        'Innodb_rows_deleted' => __(
-            'The number of rows deleted from InnoDB tables.'
-        ),
-        'Innodb_rows_inserted' => __(
-            'The number of rows inserted in InnoDB tables.'
-        ),
-        'Innodb_rows_read' => __(
-            'The number of rows read from InnoDB tables.'
-        ),
-        'Innodb_rows_updated' => __(
-            'The number of rows updated in InnoDB tables.'
-        ),
-        'Key_blocks_not_flushed' => __(
-            'The number of key blocks in the key cache that have changed but'
-            . ' haven\'t yet been flushed to disk. It used to be known as'
-            . ' Not_flushed_key_blocks.'
-        ),
-        'Key_blocks_unused' => __(
-            'The number of unused blocks in the key cache. You can use this'
-            . ' value to determine how much of the key cache is in use.'
-        ),
-        'Key_blocks_used' => __(
-            'The number of used blocks in the key cache. This value is a'
-            . ' high-water mark that indicates the maximum number of blocks'
-            . ' that have ever been in use at one time.'
-        ),
-        'Key_buffer_fraction_%' => __(
-            'Percentage of used key cache (calculated value)'
-        ),
-        'Key_read_requests' => __(
-            'The number of requests to read a key block from the cache.'
-        ),
-        'Key_reads' => __(
-            'The number of physical reads of a key block from disk. If Key_reads'
-            . ' is big, then your key_buffer_size value is probably too small.'
-            . ' The cache miss rate can be calculated as'
-            . ' Key_reads/Key_read_requests.'
-        ),
-        'Key_read_ratio_%' => __(
-            'Key cache miss calculated as rate of physical reads compared'
-            . ' to read requests (calculated value)'
-        ),
-        'Key_write_requests' => __(
-            'The number of requests to write a key block to the cache.'
-        ),
-        'Key_writes' => __(
-            'The number of physical writes of a key block to disk.'
-        ),
-        'Key_write_ratio_%' => __(
-            'Percentage of physical writes compared'
-            . ' to write requests (calculated value)'
-        ),
-        'Last_query_cost' => __(
-            'The total cost of the last compiled query as computed by the query'
-            . ' optimizer. Useful for comparing the cost of different query'
-            . ' plans for the same query. The default value of 0 means that'
-            . ' no query has been compiled yet.'
-        ),
-        'Max_used_connections' => __(
-            'The maximum number of connections that have been in use'
-            . ' simultaneously since the server started.'
-        ),
-        'Not_flushed_delayed_rows' => __(
-            'The number of rows waiting to be written in INSERT DELAYED queues.'
-        ),
-        'Opened_tables' => __(
-            'The number of tables that have been opened. If opened tables is'
-            . ' big, your table cache value is probably too small.'
-        ),
-        'Open_files' => __(
-            'The number of files that are open.'
-        ),
-        'Open_streams' => __(
-            'The number of streams that are open (used mainly for logging).'
-        ),
-        'Open_tables' => __(
-            'The number of tables that are open.'
-        ),
-        'Qcache_free_blocks' => __(
-            'The number of free memory blocks in query cache. High numbers can'
-            . ' indicate fragmentation issues, which may be solved by issuing'
-            . ' a FLUSH QUERY CACHE statement.'
-        ),
-        'Qcache_free_memory' => __(
-            'The amount of free memory for query cache.'
-        ),
-        'Qcache_hits' => __(
-            'The number of cache hits.'
-        ),
-        'Qcache_inserts' => __(
-            'The number of queries added to the cache.'
-        ),
-        'Qcache_lowmem_prunes' => __(
-            'The number of queries that have been removed from the cache to'
-            . ' free up memory for caching new queries. This information can'
-            . ' help you tune the query cache size. The query cache uses a'
-            . ' least recently used (LRU) strategy to decide which queries'
-            . ' to remove from the cache.'
-        ),
-        'Qcache_not_cached' => __(
-            'The number of non-cached queries (not cachable, or not cached'
-            . ' due to the query_cache_type setting).'
-        ),
-        'Qcache_queries_in_cache' => __(
-            'The number of queries registered in the cache.'
-        ),
-        'Qcache_total_blocks' => __(
-            'The total number of blocks in the query cache.'
-        ),
-        'Rpl_status' => __(
-            'The status of failsafe replication (not yet implemented).'
-        ),
-        'Select_full_join' => __(
-            'The number of joins that do not use indexes. If this value is'
-            . ' not 0, you should carefully check the indexes of your tables.'
-        ),
-        'Select_full_range_join' => __(
-            'The number of joins that used a range search on a reference table.'
-        ),
-        'Select_range_check' => __(
-            'The number of joins without keys that check for key usage after'
-            . ' each row. (If this is not 0, you should carefully check the'
-            . ' indexes of your tables.)'
-        ),
-        'Select_range' => __(
-            'The number of joins that used ranges on the first table. (It\'s'
-            . ' normally not critical even if this is big.)'
-        ),
-        'Select_scan' => __(
-            'The number of joins that did a full scan of the first table.'
-        ),
-        'Slave_open_temp_tables' => __(
-            'The number of temporary tables currently'
-            . ' open by the slave SQL thread.'
-        ),
-        'Slave_retried_transactions' => __(
-            'Total (since startup) number of times the replication slave SQL'
-            . ' thread has retried transactions.'
-        ),
-        'Slave_running' => __(
-            'This is ON if this server is a slave that is connected to a master.'
-        ),
-        'Slow_launch_threads' => __(
-            'The number of threads that have taken more than slow_launch_time'
-            . ' seconds to create.'
-        ),
-        'Slow_queries' => __(
-            'The number of queries that have taken more than long_query_time'
-            . ' seconds.'
-        ),
-        'Sort_merge_passes' => __(
-            'The number of merge passes the sort algorithm has had to do.'
-            . ' If this value is large, you should consider increasing the'
-            . ' value of the sort_buffer_size system variable.'
-        ),
-        'Sort_range' => __(
-            'The number of sorts that were done with ranges.'
-        ),
-        'Sort_rows' => __(
-            'The number of sorted rows.'
-        ),
-        'Sort_scan' => __(
-            'The number of sorts that were done by scanning the table.'
-        ),
-        'Table_locks_immediate' => __(
-            'The number of times that a table lock was acquired immediately.'
-        ),
-        'Table_locks_waited' => __(
-            'The number of times that a table lock could not be acquired'
-            . ' immediately and a wait was needed. If this is high, and you have'
-            . ' performance problems, you should first optimize your queries,'
-            . ' and then either split your table or tables or use replication.'
-        ),
-        'Threads_cached' => __(
-            'The number of threads in the thread cache. The cache hit rate can'
-            . ' be calculated as Threads_created/Connections. If this value is'
-            . ' red you should raise your thread_cache_size.'
-        ),
-        'Threads_connected' => __(
-            'The number of currently open connections.'
-        ),
-        'Threads_created' => __(
-            'The number of threads created to handle connections. If'
-            . ' Threads_created is big, you may want to increase the'
-            . ' thread_cache_size value. (Normally this doesn\'t give a notable'
-            . ' performance improvement if you have a good thread'
-            . ' implementation.)'
-        ),
-        'Threads_cache_hitrate_%' => __(
-            'Thread cache hit rate (calculated value)'
-        ),
-        'Threads_running' => __(
-            'The number of threads that are not sleeping.'
-        )
-    );
-}
-
diff --git a/#pma/libraries/server_user_groups.lib.php b/#pma/libraries/server_user_groups.lib.php
deleted file mode 100644
index add1f1dd..00000000
--- a/#pma/libraries/server_user_groups.lib.php
+++ /dev/null
@@ -1,362 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * set of functions for user group handling
- *
- * @package PhpMyAdmin
- */
-
-/**
- * Return HTML to list the users belonging to a given user group
- *
- * @param string $userGroup user group name
- *
- * @return string HTML to list the users belonging to a given user group
- */
-function PMA_getHtmlForListingUsersofAGroup($userGroup)
-{
-    $html_output  = '<h2>'
-        . sprintf(__('Users of \'%s\' user group'), htmlspecialchars($userGroup))
-        . '</h2>';
-
-    $cfgRelation = PMA_getRelationsParam();
-    $usersTable = PMA\libraries\Util::backquote($cfgRelation['db'])
-        . "." . PMA\libraries\Util::backquote($cfgRelation['users']);
-    $sql_query = "SELECT `username` FROM " . $usersTable
-        . " WHERE `usergroup`='" . $GLOBALS['dbi']->escapeString($userGroup)
-        . "'";
-    $result = PMA_queryAsControlUser($sql_query, false);
-    if ($result) {
-        if ($GLOBALS['dbi']->numRows($result) == 0) {
-            $html_output .= '<p>'
-                . __('No users were found belonging to this user group.')
-                . '</p>';
-        } else {
-            $html_output .= '<table>'
-                . '<thead><tr><th>#</th><th>' . __('User') . '</th></tr></thead>'
-                . '<tbody>';
-            $i = 0;
-            while ($row = $GLOBALS['dbi']->fetchRow($result)) {
-                $i++;
-                $html_output .= '<tr>'
-                    . '<td>' . $i . ' </td>'
-                    . '<td>' . htmlspecialchars($row[0]) . '</td>'
-                    . '</tr>';
-            }
-            $html_output .= '</tbody>'
-                . '</table>';
-        }
-    }
-    $GLOBALS['dbi']->freeResult($result);
-    return $html_output;
-}
-
-/**
- * Returns HTML for the 'user groups' table
- *
- * @return string HTML for the 'user groups' table
- */
-function PMA_getHtmlForUserGroupsTable()
-{
-    $html_output  = '<h2>' . __('User groups') . '</h2>';
-    $cfgRelation = PMA_getRelationsParam();
-    $groupTable = PMA\libraries\Util::backquote($cfgRelation['db'])
-        . "." . PMA\libraries\Util::backquote($cfgRelation['usergroups']);
-    $sql_query = "SELECT * FROM " . $groupTable . " ORDER BY `usergroup` ASC";
-    $result = PMA_queryAsControlUser($sql_query, false);
-
-    if ($result && $GLOBALS['dbi']->numRows($result)) {
-        $html_output .= '<form name="userGroupsForm" id="userGroupsForm"'
-            . ' action="server_privileges.php" method="post">';
-        $html_output .= PMA_URL_getHiddenInputs();
-        $html_output .= '<table id="userGroupsTable">';
-        $html_output .= '<thead><tr>';
-        $html_output .= '<th style="white-space: nowrap">'
-            . __('User group') . '</th>';
-        $html_output .= '<th>' . __('Server level tabs') . '</th>';
-        $html_output .= '<th>' . __('Database level tabs') . '</th>';
-        $html_output .= '<th>' . __('Table level tabs') . '</th>';
-        $html_output .= '<th>' . __('Action') . '</th>';
-        $html_output .= '</tr></thead>';
-        $html_output .= '<tbody>';
-
-        $odd = true;
-        $userGroups = array();
-        while ($row = $GLOBALS['dbi']->fetchAssoc($result)) {
-            $groupName = $row['usergroup'];
-            if (! isset($userGroups[$groupName])) {
-                $userGroups[$groupName] = array();
-            }
-            $userGroups[$groupName][$row['tab']] = $row['allowed'];
-        }
-        foreach ($userGroups as $groupName => $tabs) {
-            $html_output .= '<tr class="' . ($odd ? 'odd' : 'even') . '">';
-            $html_output .= '<td>' . htmlspecialchars($groupName) . '</td>';
-            $html_output .= '<td>' . _getAllowedTabNames($tabs, 'server') . '</td>';
-            $html_output .= '<td>' . _getAllowedTabNames($tabs, 'db') . '</td>';
-            $html_output .= '<td>' . _getAllowedTabNames($tabs, 'table') . '</td>';
-
-            $html_output .= '<td>';
-            $html_output .= '<a class="" href="server_user_groups.php'
-                . PMA_URL_getCommon(
-                    array(
-                        'viewUsers' => 1, 'userGroup' => $groupName
-                    )
-                )
-                . '">'
-                . PMA\libraries\Util::getIcon('b_usrlist.png', __('View users'))
-                . '</a>';
-            $html_output .= '&nbsp;&nbsp;';
-            $html_output .= '<a class="" href="server_user_groups.php'
-                . PMA_URL_getCommon(
-                    array(
-                        'editUserGroup' => 1, 'userGroup' => $groupName
-                    )
-                )
-                . '">'
-                . PMA\libraries\Util::getIcon('b_edit.png', __('Edit')) . '</a>';
-            $html_output .= '&nbsp;&nbsp;';
-            $html_output .= '<a class="deleteUserGroup ajax"'
-                . ' href="server_user_groups.php'
-                . PMA_URL_getCommon(
-                    array(
-                        'deleteUserGroup' => 1, 'userGroup' => $groupName
-                    )
-                )
-                . '">'
-                . PMA\libraries\Util::getIcon('b_drop.png', __('Delete')) . '</a>';
-            $html_output .= '</td>';
-
-            $html_output .= '</tr>';
-
-            $odd = ! $odd;
-        }
-
-        $html_output .= '</tbody>';
-        $html_output .= '</table>';
-        $html_output .= '</form>';
-    }
-    $GLOBALS['dbi']->freeResult($result);
-
-    $html_output .= '<fieldset id="fieldset_add_user_group">';
-    $html_output .= '<a href="server_user_groups.php'
-        . PMA_URL_getCommon(array('addUserGroup' => 1)) . '">'
-        . PMA\libraries\Util::getIcon('b_usradd.png')
-        . __('Add user group') . '</a>';
-    $html_output .= '</fieldset>';
-
-    return $html_output;
-}
-
-/**
- * Returns the list of allowed menu tab names
- * based on a data row from usergroup table.
- *
- * @param array  $row   row of usergroup table
- * @param string $level 'server', 'db' or 'table'
- *
- * @return string comma separated list of allowed menu tab names
- */
-function _getAllowedTabNames($row, $level)
-{
-    $tabNames = array();
-    $tabs = PMA\libraries\Util::getMenuTabList($level);
-    foreach ($tabs as $tab => $tabName) {
-        if (! isset($row[$level . '_' . $tab])
-            || $row[$level . '_' . $tab] == 'Y'
-        ) {
-            $tabNames[] = $tabName;
-        }
-    }
-    return implode(', ', $tabNames);
-}
-
-/**
- * Deletes a user group
- *
- * @param string $userGroup user group name
- *
- * @return void
- */
-function PMA_deleteUserGroup($userGroup)
-{
-    $cfgRelation = PMA_getRelationsParam();
-    $userTable = PMA\libraries\Util::backquote($cfgRelation['db'])
-        . "." . PMA\libraries\Util::backquote($cfgRelation['users']);
-    $groupTable = PMA\libraries\Util::backquote($cfgRelation['db'])
-        . "." . PMA\libraries\Util::backquote($cfgRelation['usergroups']);
-    $sql_query = "DELETE FROM " . $userTable
-        . " WHERE `usergroup`='" . $GLOBALS['dbi']->escapeString($userGroup)
-        . "'";
-    PMA_queryAsControlUser($sql_query, true);
-    $sql_query = "DELETE FROM " . $groupTable
-        . " WHERE `usergroup`='" . $GLOBALS['dbi']->escapeString($userGroup)
-        . "'";
-    PMA_queryAsControlUser($sql_query, true);
-}
-
-/**
- * Returns HTML for add/edit user group dialog
- *
- * @param string $userGroup name of the user group in case of editing
- *
- * @return string HTML for add/edit user group dialog
- */
-function PMA_getHtmlToEditUserGroup($userGroup = null)
-{
-    $html_output = '';
-    if ($userGroup == null) {
-        $html_output .= '<h2>' . __('Add user group') . '</h2>';
-    } else {
-        $html_output .= '<h2>'
-            . sprintf(__('Edit user group: \'%s\''), htmlspecialchars($userGroup))
-            . '</h2>';
-    }
-
-    $html_output .= '<form name="userGroupForm" id="userGroupForm"'
-        . ' action="server_user_groups.php" method="post">';
-    $urlParams = array();
-    if ($userGroup != null) {
-        $urlParams['userGroup'] = $userGroup;
-        $urlParams['editUserGroupSubmit'] = '1';
-    } else {
-        $urlParams['addUserGroupSubmit'] = '1';
-    }
-    $html_output .= PMA_URL_getHiddenInputs($urlParams);
-
-    $html_output .= '<fieldset id="fieldset_user_group_rights">';
-    $html_output .= '<legend>' . __('User group menu assignments')
-        . '&nbsp;&nbsp;&nbsp;'
-        . '<input type="checkbox" id="addUsersForm_checkall" '
-        . 'class="checkall_box" title="Check all">'
-        . '<label for="addUsersForm_checkall">' . __('Check all') . '</label>'
-        . '</legend>';
-
-    if ($userGroup == null) {
-        $html_output .= '<label for="userGroup">' . __('Group name:') . '</label>';
-        $html_output .= '<input type="text" name="userGroup" '
-            . 'autocomplete="off" required="required" />';
-        $html_output .= '<div class="clearfloat"></div>';
-    }
-
-    $allowedTabs = array(
-        'server' => array(),
-        'db'     => array(),
-        'table'  => array()
-    );
-    if ($userGroup != null) {
-        $cfgRelation = PMA_getRelationsParam();
-        $groupTable = PMA\libraries\Util::backquote($cfgRelation['db'])
-            . "." . PMA\libraries\Util::backquote($cfgRelation['usergroups']);
-        $sql_query = "SELECT * FROM " . $groupTable
-            . " WHERE `usergroup`='" . $GLOBALS['dbi']->escapeString($userGroup)
-            . "'";
-        $result = PMA_queryAsControlUser($sql_query, false);
-        if ($result) {
-            while ($row = $GLOBALS['dbi']->fetchAssoc($result)) {
-                $key = $row['tab'];
-                $value = $row['allowed'];
-                if (substr($key, 0, 7) == 'server_' && $value == 'Y') {
-                    $allowedTabs['server'][] = mb_substr($key, 7);
-                } elseif (substr($key, 0, 3) == 'db_' && $value == 'Y') {
-                    $allowedTabs['db'][] = mb_substr($key, 3);
-                } elseif (substr($key, 0, 6) == 'table_'
-                    && $value == 'Y'
-                ) {
-                    $allowedTabs['table'][] = mb_substr($key, 6);
-                }
-            }
-        }
-        $GLOBALS['dbi']->freeResult($result);
-    }
-
-    $html_output .= _getTabList(
-        __('Server-level tabs'), 'server', $allowedTabs['server']
-    );
-    $html_output .= _getTabList(
-        __('Database-level tabs'), 'db', $allowedTabs['db']
-    );
-    $html_output .= _getTabList(
-        __('Table-level tabs'), 'table', $allowedTabs['table']
-    );
-
-    $html_output .= '</fieldset>';
-
-    $html_output .= '<fieldset id="fieldset_user_group_rights_footer"'
-        . ' class="tblFooters">';
-    $html_output .= '<input type="submit" value="' . __('Go') . '">';
-    $html_output .= '</fieldset>';
-
-    return $html_output;
-}
-
-/**
- * Returns HTML for checkbox groups to choose
- * tabs of 'server', 'db' or 'table' levels.
- *
- * @param string $title    title of the checkbox group
- * @param string $level    'server', 'db' or 'table'
- * @param array  $selected array of selected allowed tabs
- *
- * @return string HTML for checkbox groups
- */
-function _getTabList($title, $level, $selected)
-{
-    $tabs = PMA\libraries\Util::getMenuTabList($level);
-    $html_output = '<fieldset>';
-    $html_output .= '<legend>' . $title . '</legend>';
-    foreach ($tabs as $tab => $tabName) {
-        $html_output .= '<div class="item">';
-        $html_output .= '<input type="checkbox" class="checkall"'
-            . (in_array($tab, $selected) ? ' checked="checked"' : '')
-            . ' name="' . $level . '_' . $tab .  '" value="Y" />';
-        $html_output .= '<label for="' . $level . '_' . $tab .  '">'
-            . '<code>' . $tabName . '</code>'
-            . '</label>';
-        $html_output .= '</div>';
-    }
-    $html_output .= '</fieldset>';
-    return $html_output;
-}
-
-/**
- * Add/update a user group with allowed menu tabs.
- *
- * @param string  $userGroup user group name
- * @param boolean $new       whether this is a new user group
- *
- * @return void
- */
-function PMA_editUserGroup($userGroup, $new = false)
-{
-    $tabs = PMA\libraries\Util::getMenuTabList();
-    $cfgRelation = PMA_getRelationsParam();
-    $groupTable = PMA\libraries\Util::backquote($cfgRelation['db'])
-        . "." . PMA\libraries\Util::backquote($cfgRelation['usergroups']);
-
-    if (! $new) {
-        $sql_query = "DELETE FROM " . $groupTable
-            . " WHERE `usergroup`='" . $GLOBALS['dbi']->escapeString($userGroup)
-            . "';";
-        PMA_queryAsControlUser($sql_query, true);
-    }
-
-    $sql_query = "INSERT INTO " . $groupTable
-        . "(`usergroup`, `tab`, `allowed`)"
-        . " VALUES ";
-    $first = true;
-    foreach ($tabs as $tabGroupName => $tabGroup) {
-        foreach ($tabGroup as $tab => $tabName) {
-            if (! $first) {
-                $sql_query .= ", ";
-            }
-            $tabName = $tabGroupName . '_' . $tab;
-            $allowed = isset($_REQUEST[$tabName]) && $_REQUEST[$tabName] == 'Y';
-            $sql_query .= "('" . $GLOBALS['dbi']->escapeString($userGroup) . "', '" . $tabName . "', '"
-                . ($allowed ? "Y" : "N") . "')";
-            $first = false;
-        }
-    }
-    $sql_query .= ";";
-    PMA_queryAsControlUser($sql_query, true);
-}
diff --git a/#pma/libraries/server_users.lib.php b/#pma/libraries/server_users.lib.php
deleted file mode 100644
index a9031734..00000000
--- a/#pma/libraries/server_users.lib.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * set of common functions for sub tabs in server level `Users` page
- *
- * @package PhpMyAdmin
- */
-
-/**
- * Get HTML for secondary level menu tabs on 'Users' page
- *
- * @param string $selfUrl Url of the file
- *
- * @return string HTML for secondary level menu tabs on 'Users' page
- */
-function PMA_getHtmlForSubMenusOnUsersPage($selfUrl)
-{
-    $url_params = PMA_URL_getCommon();
-    $items = array(
-        array(
-            'name' => __('User accounts overview'),
-            'url' => 'server_privileges.php',
-            'specific_params' => '&viewing_mode=server'
-        )
-    );
-
-    if ($GLOBALS['is_superuser']) {
-        $items[] = array(
-            'name' => __('User groups'),
-            'url' => 'server_user_groups.php',
-            'specific_params' => ''
-        );
-    }
-
-    $retval  = '<ul id="topmenu2">';
-    foreach ($items as $item) {
-        $class = '';
-        if ($item['url'] === $selfUrl) {
-            $class = ' class="tabactive"';
-        }
-        $retval .= '<li>';
-        $retval .= '<a' . $class;
-        $retval .= ' href="' . $item['url']
-            . $url_params . $item['specific_params'] . '">';
-        $retval .= $item['name'];
-        $retval .= '</a>';
-        $retval .= '</li>';
-    }
-    $retval .= '</ul>';
-    $retval .= '<div class="clearfloat"></div>';
-
-    return $retval;
-}
diff --git a/#pma/libraries/session.inc.php b/#pma/libraries/session.inc.php
deleted file mode 100644
index 71bd614d..00000000
--- a/#pma/libraries/session.inc.php
+++ /dev/null
@@ -1,169 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * session handling
- *
- * @todo    add an option to use mm-module for session handler
- *
- * @package PhpMyAdmin
- * @see     https://www.php.net/session
- */
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
-// verify if PHP supports session, die if it does not
-
-if (!@function_exists('session_name')) {
-    PMA_warnMissingExtension('session', true);
-} elseif (ini_get('session.auto_start') !== '' && session_name() != 'phpMyAdmin') {
-    // Do not delete the existing session, it might be used by other
-    // applications; instead just close it.
-    session_write_close();
-}
-
-// disable starting of sessions before all settings are done
-// does not work, besides how it is written in php manual
-//ini_set('session.auto_start', '0');
-
-// session cookie settings
-session_set_cookie_params(
-    0, $GLOBALS['PMA_Config']->getRootPath(),
-    '', $GLOBALS['PMA_Config']->isHttps(), true
-);
-
-// cookies are safer (use @ini_set() in case this function is disabled)
-@ini_set('session.use_cookies', 'true');
-
-// optionally set session_save_path
-$path = $GLOBALS['PMA_Config']->get('SessionSavePath');
-if (!empty($path)) {
-    session_save_path($path);
-}
-
-// use cookies only
-@ini_set('session.use_only_cookies', '1');
-// strict session mode (do not accept random string as session ID)
-@ini_set('session.use_strict_mode', '1');
-// make the session cookie HttpOnly
-@ini_set('session.cookie_httponly', '1');
-// do not force transparent session ids
-@ini_set('session.use_trans_sid', '0');
-
-// delete session/cookies when browser is closed
-@ini_set('session.cookie_lifetime', '0');
-
-// warn but don't work with bug
-@ini_set('session.bug_compat_42', 'false');
-@ini_set('session.bug_compat_warn', 'true');
-
-// use more secure session ids
-@ini_set('session.hash_function', '1');
-
-// some pages (e.g. stylesheet) may be cached on clients, but not in shared
-// proxy servers
-session_cache_limiter('private');
-
-// start the session
-// on some servers (for example, sourceforge.net), we get a permission error
-// on the session data directory, so I add some "@"
-
-
-function PMA_sessionFailed($errors)
-{
-    $messages = array();
-    foreach ($errors as $error) {
-        /*
-         * Remove path from open() in error message to avoid path disclossure
-         *
-         * This can happen with PHP 5 when nonexisting session ID is provided,
-         * since PHP 7, session existence is checked first.
-         *
-         * This error can also happen in case of session backed error (eg.
-         * read only filesystem) on any PHP version.
-         *
-         * The message string is currently hardcoded in PHP, so hopefully it
-         * will not change in future.
-         */
-        $messages[] = preg_replace(
-            '/open\(.*, O_RDWR\)/',
-            'open(SESSION_FILE, O_RDWR)',
-            htmlspecialchars($error->getMessage())
-        );
-    }
-
-    /*
-     * Session initialization is done before selecting language, so we
-     * can not use translations here.
-     */
-    PMA_fatalError(
-        'Error during session start; please check your PHP and/or '
-        . 'webserver log file and configure your PHP '
-        . 'installation properly. Also ensure that cookies are enabled '
-        . 'in your browser.'
-        . '<br /><br />'
-        . implode('<br /><br />', $messages)
-    );
-}
-
-// See bug #1538132. This would block normal behavior on a cluster
-//ini_set('session.save_handler', 'files');
-
-$session_name = 'phpMyAdmin';
-@session_name($session_name);
-
-// on first start of session we check for errors
-// f.e. session dir cannot be accessed - session file not created
-$orig_error_count = $GLOBALS['error_handler']->countErrors(false);
-
-$session_result = session_start();
-
-if ($session_result !== true
-    || $orig_error_count != $GLOBALS['error_handler']->countErrors(false)
-) {
-    setcookie($session_name, '', 1);
-    $errors = $GLOBALS['error_handler']->sliceErrors($orig_error_count);
-    PMA_sessionFailed($errors);
-}
-unset($orig_error_count, $session_result);
-
-/**
- * Disable setting of session cookies for further session_start() calls.
- */
-@ini_set('session.use_cookies', 'true');
-
-/**
- * Token which is used for authenticating access queries.
- * (we use "space PMA_token space" to prevent overwriting)
- */
-if (! isset($_SESSION[' PMA_token '])) {
-    if (! function_exists('openssl_random_pseudo_bytes')) {
-        $_SESSION[' PMA_token '] = bin2hex(phpseclib\Crypt\Random::string(16));
-    } else {
-        $_SESSION[' PMA_token '] = bin2hex(openssl_random_pseudo_bytes(16));
-    }
-
-    /**
-     * Check for disk space on session storage by trying to write it.
-     *
-     * This seems to be most reliable approach to test if sessions are working,
-     * otherwise the check would fail with custom session backends.
-     */
-    $orig_error_count = $GLOBALS['error_handler']->countErrors();
-    session_write_close();
-    if ($GLOBALS['error_handler']->countErrors() > $orig_error_count) {
-        $errors = $GLOBALS['error_handler']->sliceErrors($orig_error_count);
-        PMA_sessionFailed($errors);
-    }
-    session_start();
-}
-/**
- * Check if token is properly generated (both above functions can return false).
- */
-if (empty($_SESSION[' PMA_token '])) {
-    PMA_fatalError(
-        'Failed to generate random CSRF token!'
-    );
-}
-
-require_once 'libraries/session.lib.php';
diff --git a/#pma/libraries/session.lib.php b/#pma/libraries/session.lib.php
deleted file mode 100644
index 5c78d381..00000000
--- a/#pma/libraries/session.lib.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * session library
- *
- * @package PhpMyAdmin
- */
-
-/**
- * tries to secure session from hijacking and fixation
- * should be called before login and after successful login
- * (only required if sensitive information stored in session)
- *
- * @return void
- */
-function PMA_secureSession()
-{
-    // prevent session fixation and XSS
-    if (session_status() === PHP_SESSION_ACTIVE && ! defined('TESTSUITE')) {
-        session_regenerate_id(true);
-    }
-    if (! function_exists('openssl_random_pseudo_bytes')) {
-        $_SESSION[' PMA_token '] = bin2hex(phpseclib\Crypt\Random::string(16));
-    } else {
-        $_SESSION[' PMA_token '] = bin2hex(openssl_random_pseudo_bytes(16));
-    }
-}
diff --git a/#pma/libraries/special_schema_links.lib.php b/#pma/libraries/special_schema_links.lib.php
deleted file mode 100644
index b37694c9..00000000
--- a/#pma/libraries/special_schema_links.lib.php
+++ /dev/null
@@ -1,490 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Links configuration for MySQL system tables
- *
- * @package PhpMyAdmin
- */
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
-/**
- * This global variable represent the details for generating links inside
- * special schemas like mysql, information_schema etc.
- * Major element represent a schema.
- * All the strings in this array represented in lower case
- * This global variable has not modified anywhere
- *
- * Variable structure ex:
- * $GLOBALS['special_schema_links'] = array(
- *     // Database name is the major element
- *     'mysql' => array(
- *         // Table name
- *         'db' => array(
- *             // Column name
- *             'user' => array(
- *                 // Main url param (can be an array where represent sql)
- *                 'link_param' => 'username',
- *                 // Other url params
- *                 'link_dependancy_params' => array(
- *                     0 => array(
- *                         // URL parameter name
- *                         // (can be array where url param has static value)
- *                         'param_info' => 'hostname',
- *                         // Column name related to url param
- *                         'column_name' => 'host'
- *                     )
- *                 ),
- *                 // Page to link
- *                 'default_page' => './server_privileges.php'
- *             )
- *         )
- *     )
- * );
- *
- */
-$GLOBALS['special_schema_links'] = array(
-    'mysql' => array(
-        'columns_priv' => array(
-            'user' => array(
-                'link_param' => 'username',
-                'link_dependancy_params' => array(
-                    0 => array(
-                        'param_info' => 'hostname',
-                        'column_name' => 'host'
-                    )
-                ),
-                'default_page' => './server_privileges.php'
-            ),
-            'table_name' => array(
-                'link_param' => 'table',
-                'link_dependancy_params' => array(
-                    0 => array(
-                        'param_info' => 'db',
-                        'column_name' => 'Db'
-                    ),
-                ),
-                'default_page' => './' . PMA\libraries\Util::getScriptNameForOption(
-                    $GLOBALS['cfg']['DefaultTabTable'], 'table'
-                )
-            ),
-            'column_name' => array(
-                'link_param' => 'field',
-                'link_dependancy_params' => array(
-                    0 => array(
-                        'param_info' => 'db',
-                        'column_name' => 'Db'
-                    ),
-                    1 => array(
-                        'param_info' => 'table',
-                        'column_name' => 'Table_name'
-                    )
-                ),
-                'default_page' => './tbl_structure.php?change_column=1'
-            ),
-        ),
-        'db' => array(
-            'user' => array(
-                'link_param' => 'username',
-                'link_dependancy_params' => array(
-                    0 => array(
-                        'param_info' => 'hostname',
-                        'column_name' => 'host'
-                    )
-                ),
-                'default_page' => './server_privileges.php'
-            )
-        ),
-        'event' => array(
-            'name' => array(
-                'link_param' => 'item_name',
-                'link_dependancy_params' => array(
-                    0 => array(
-                        'param_info' => 'db',
-                        'column_name' => 'db'
-                    )
-                ),
-                'default_page' => './db_events.php?edit_item=1'
-            ),
-
-        ),
-        'innodb_index_stats' => array(
-            'table_name' => array(
-                'link_param' => 'table',
-                'link_dependancy_params' => array(
-                    0 => array(
-                        'param_info' => 'db',
-                        'column_name' => 'database_name'
-                    ),
-                ),
-                'default_page' => './' . PMA\libraries\Util::getScriptNameForOption(
-                    $GLOBALS['cfg']['DefaultTabTable'], 'table'
-                )
-            ),
-            'index_name' => array(
-                'link_param' => 'index',
-                'link_dependancy_params' => array(
-                    0 => array(
-                        'param_info' => 'db',
-                        'column_name' => 'database_name'
-                    ),
-                    1 => array(
-                        'param_info' => 'table',
-                        'column_name' => 'table_name'
-                    )
-                ),
-                'default_page' => './tbl_structure.php'
-            ),
-        ),
-        'innodb_table_stats' => array(
-            'table_name' => array(
-                'link_param' => 'table',
-                'link_dependancy_params' => array(
-                    0 => array(
-                        'param_info' => 'db',
-                        'column_name' => 'database_name'
-                    ),
-                ),
-                'default_page' => './' . PMA\libraries\Util::getScriptNameForOption(
-                    $GLOBALS['cfg']['DefaultTabTable'], 'table'
-                )
-            ),
-        ),
-        'proc' => array(
-            'name' => array(
-                'link_param' => 'item_name',
-                'link_dependancy_params' => array(
-                    0 => array(
-                        'param_info' => 'db',
-                        'column_name' => 'db'
-                    ),
-                    1 => array(
-                        'param_info' => 'item_type',
-                        'column_name' => 'type'
-                    )
-                ),
-                'default_page' => './db_routines.php?edit_item=1'
-            ),
-            'specific_name' => array(
-                'link_param' => 'item_name',
-                'link_dependancy_params' => array(
-                    0 => array(
-                        'param_info' => 'db',
-                        'column_name' => 'db'
-                    ),
-                    1 => array(
-                        'param_info' => 'item_type',
-                        'column_name' => 'type'
-                    )
-                ),
-                'default_page' => './db_routines.php?edit_item=1'
-            ),
-        ),
-        'proc_priv' => array(
-            'user' => array(
-                'link_param' => 'username',
-                'link_dependancy_params' => array(
-                    0 => array(
-                        'param_info' => 'hostname',
-                        'column_name' => 'Host'
-                    )
-                ),
-                'default_page' => './server_privileges.php'
-            ),
-            'routine_name' => array(
-                'link_param' => 'item_name',
-                'link_dependancy_params' => array(
-                    0 => array(
-                        'param_info' => 'db',
-                        'column_name' => 'Db'
-                    ),
-                    1 => array(
-                        'param_info' => 'item_type',
-                        'column_name' => 'Routine_type'
-                    )
-                ),
-                'default_page' => './db_routines.php?edit_item=1'
-            ),
-        ),
-        'proxies_priv' => array(
-            'user' => array(
-                'link_param' => 'username',
-                'link_dependancy_params' => array(
-                    0 => array(
-                        'param_info' => 'hostname',
-                        'column_name' => 'Host'
-                    )
-                ),
-                'default_page' => './server_privileges.php'
-            ),
-        ),
-        'tables_priv' => array(
-            'user' => array(
-                'link_param' => 'username',
-                'link_dependancy_params' => array(
-                    0 => array(
-                        'param_info' => 'hostname',
-                        'column_name' => 'Host'
-                    )
-                ),
-                'default_page' => './server_privileges.php'
-            ),
-            'table_name' => array(
-                'link_param' => 'table',
-                'link_dependancy_params' => array(
-                    0 => array(
-                        'param_info' => 'db',
-                        'column_name' => 'Db'
-                    ),
-                ),
-                'default_page' => './' . PMA\libraries\Util::getScriptNameForOption(
-                    $GLOBALS['cfg']['DefaultTabTable'], 'table'
-                )
-            ),
-        ),
-        'user' => array(
-            'user' => array(
-                'link_param' => 'username',
-                'link_dependancy_params' => array(
-                    0 => array(
-                        'param_info' => 'hostname',
-                        'column_name' => 'host'
-                    )
-                ),
-                'default_page' => './server_privileges.php'
-            )
-        )
-    ),
-    'information_schema' => array(
-        'columns' => array(
-            'table_name' => array(
-                'link_param' => 'table',
-                'link_dependancy_params' => array(
-                    0 => array(
-                        'param_info' => 'db',
-                        'column_name' => 'table_schema'
-                    )
-                ),
-                'default_page' => './' . PMA\libraries\Util::getScriptNameForOption(
-                    $GLOBALS['cfg']['DefaultTabTable'], 'table'
-                )
-            ),
-            'column_name' => array(
-                'link_param' => 'field',
-                'link_dependancy_params' => array(
-                    0 => array(
-                        'param_info' => 'db',
-                        'column_name' => 'table_schema'
-                    ),
-                    1 => array(
-                        'param_info' => 'table',
-                        'column_name' => 'table_name'
-                    )
-                ),
-                'default_page' => './tbl_structure.php?change_column=1'
-            )
-        ),
-        'key_column_usage' => array(
-            'table_name' => array(
-                'link_param' => 'table',
-                'link_dependancy_params' => array(
-                    0 => array(
-                        'param_info' => 'db',
-                        'column_name' => 'constraint_schema'
-                    )
-                ),
-                'default_page' => './' . PMA\libraries\Util::getScriptNameForOption(
-                    $GLOBALS['cfg']['DefaultTabTable'], 'table'
-                )
-            ),
-            'column_name' => array(
-                'link_param' => 'field',
-                'link_dependancy_params' => array(
-                    0 => array(
-                        'param_info' => 'db',
-                        'column_name' => 'table_schema'
-                    ),
-                    1 => array(
-                        'param_info' => 'table',
-                        'column_name' => 'table_name'
-                    )
-                ),
-                'default_page' => './tbl_structure.php?change_column=1'
-            ),
-            'referenced_table_name' => array(
-                'link_param' => 'table',
-                'link_dependancy_params' => array(
-                    0 => array(
-                        'param_info' => 'db',
-                        'column_name' => 'referenced_table_schema'
-                    )
-                ),
-                'default_page' => './' . PMA\libraries\Util::getScriptNameForOption(
-                    $GLOBALS['cfg']['DefaultTabTable'], 'table'
-                )
-            ),
-            'referenced_column_name' => array(
-                'link_param' => 'field',
-                'link_dependancy_params' => array(
-                    0 => array(
-                        'param_info' => 'db',
-                        'column_name' => 'referenced_table_schema'
-                    ),
-                    1 => array(
-                        'param_info' => 'table',
-                        'column_name' => 'referenced_table_name'
-                    )
-                ),
-                'default_page' => './tbl_structure.php?change_column=1'
-            )
-        ),
-        'partitions' => array(
-            'table_name' => array(
-                'link_param' => 'table',
-                'link_dependancy_params' => array(
-                    0 => array(
-                        'param_info' => 'db',
-                        'column_name' => 'table_schema'
-                    )
-                ),
-                'default_page' => './' . PMA\libraries\Util::getScriptNameForOption(
-                    $GLOBALS['cfg']['DefaultTabTable'], 'table'
-                )
-            )
-        ),
-        'processlist' => array(
-            'user' => array(
-                'link_param' => 'username',
-                'link_dependancy_params' => array(
-                    0 => array(
-                        'param_info' => 'hostname',
-                        'column_name' => 'host'
-                    )
-                ),
-                'default_page' => './server_privileges.php'
-            )
-        ),
-        'referential_constraints' => array(
-            'table_name' => array(
-                'link_param' => 'table',
-                'link_dependancy_params' => array(
-                    0 => array(
-                        'param_info' => 'db',
-                        'column_name' => 'constraint_schema'
-                    )
-                ),
-                'default_page' => './' . PMA\libraries\Util::getScriptNameForOption(
-                    $GLOBALS['cfg']['DefaultTabTable'], 'table'
-                )
-            ),
-            'referenced_table_name' => array(
-                'link_param' => 'table',
-                'link_dependancy_params' => array(
-                    0 => array(
-                        'param_info' => 'db',
-                        'column_name' => 'constraint_schema'
-                    )
-                ),
-                'default_page' => './' . PMA\libraries\Util::getScriptNameForOption(
-                    $GLOBALS['cfg']['DefaultTabTable'], 'table'
-                )
-            )
-        ),
-        'routines' => array(
-            'routine_name' => array(
-                'link_param' => 'item_name',
-                'link_dependancy_params' => array(
-                    0 => array(
-                        'param_info' => 'db',
-                        'column_name' => 'routine_schema'
-                    ),
-                    1 => array(
-                        'param_info' => 'item_type',
-                        'column_name' => 'routine_type'
-                    )
-                ),
-                'default_page' => './db_routines.php'
-            ),
-        ),
-        'schemata' => array(
-            'schema_name' => array(
-                'link_param' => 'db',
-                'default_page' => './' . PMA\libraries\Util::getScriptNameForOption(
-                    $GLOBALS['cfg']['DefaultTabTable'], 'table'
-                )
-            )
-        ),
-        'statistics' => array(
-            'table_name' => array(
-                'link_param' => 'table',
-                'link_dependancy_params' => array(
-                    0 => array(
-                        'param_info' => 'db',
-                        'column_name' => 'table_schema'
-                    )
-                ),
-                'default_page' => './' . PMA\libraries\Util::getScriptNameForOption(
-                    $GLOBALS['cfg']['DefaultTabTable'], 'table'
-                )
-            ),
-            'column_name' => array(
-                'link_param' => 'field',
-                'link_dependancy_params' => array(
-                    0 => array(
-                        'param_info' => 'db',
-                        'column_name' => 'table_schema'
-                    ),
-                    1 => array(
-                        'param_info' => 'table',
-                        'column_name' => 'table_name'
-                    )
-                ),
-                'default_page' => './tbl_structure.php?change_column=1'
-            )
-        ),
-        'tables' => array(
-            'table_name' => array(
-                'link_param' => 'table',
-                'link_dependancy_params' => array(
-                    0 => array(
-                        'param_info' => 'db',
-                        'column_name' => 'table_schema'
-                    )
-                ),
-                'default_page' => './' . PMA\libraries\Util::getScriptNameForOption(
-                    $GLOBALS['cfg']['DefaultTabTable'], 'table'
-                )
-            ),
-        ),
-        'table_constraints' => array(
-            'table_name' => array(
-                'link_param' => 'table',
-                'link_dependancy_params' => array(
-                    0 => array(
-                        'param_info' => 'db',
-                        'column_name' => 'table_schema'
-                    )
-                ),
-                'default_page' => './' . PMA\libraries\Util::getScriptNameForOption(
-                    $GLOBALS['cfg']['DefaultTabTable'], 'table'
-                )
-            ),
-        ),
-        'views' => array(
-            'table_name' => array(
-                'link_param' => 'table',
-                'link_dependancy_params' => array(
-                    0 => array(
-                        'param_info' => 'db',
-                        'column_name' => 'table_schema'
-                    )
-                ),
-                'default_page' => './' . PMA\libraries\Util::getScriptNameForOption(
-                    $GLOBALS['cfg']['DefaultTabTable'], 'table'
-                )
-            ),
-        ),
-    )
-);
-
diff --git a/#pma/libraries/sql-parser/ClassLoader.php b/#pma/libraries/sql-parser/ClassLoader.php
deleted file mode 100644
index 3ff2f69d..00000000
--- a/#pma/libraries/sql-parser/ClassLoader.php
+++ /dev/null
@@ -1,250 +0,0 @@
-<?php
-
-/**
- * This file is based on Composer's autoloader.
- *
- * (c) Nils Adermann <naderman@naderman.de>
- *     Jordi Boggiano <j.boggiano@seld.be>
- *
- * @package     SqlParser
- * @subpackage  Autoload
- */
-namespace SqlParser\Autoload;
-
-/**
- * ClassLoader implements a PSR-4 class loader,
- *
- * This class is loosely based on the Symfony UniversalClassLoader.
- * This class is a stripped version of Composer's ClassLoader.
- *
- * @package     SqlParser
- * @subpackage  Autoload
- * @author      Fabien Potencier <fabien@symfony.com>
- * @author      Jordi Boggiano <j.boggiano@seld.be>
- */
-class ClassLoader
-{
-    public $prefixLengths = array();
-    public $prefixDirs = array();
-    public $fallbackDirs = array();
-
-    public $classMap = array();
-
-    public $classMapAuthoritative = false;
-
-    /**
-     * @param array $classMap Class to filename map
-     *
-     * @return void
-     */
-    public function addClassMap(array $classMap)
-    {
-        if (!empty($this->classMap)) {
-            $this->classMap = array_merge($this->classMap, $classMap);
-        } else {
-            $this->classMap = $classMap;
-        }
-    }
-
-    /**
-     * Registers a set of PSR-4 directories for a given namespace, either
-     * appending or prepending to the ones previously set for this namespace.
-     *
-     * @param string       $prefix  The prefix/namespace, with trailing '\\'
-     * @param array|string $paths   The PSR-0 base directories
-     * @param bool         $prepend Whether to prepend the directories
-     *
-     * @throws \InvalidArgumentException
-     *
-     * @return void
-     */
-    public function add($prefix, $paths, $prepend = false)
-    {
-        if (!$prefix) {
-            // Register directories for the root namespace.
-            if ($prepend) {
-                $this->fallbackDirs = array_merge(
-                    (array) $paths,
-                    $this->fallbackDirs
-                );
-            } else {
-                $this->fallbackDirs = array_merge(
-                    $this->fallbackDirs,
-                    (array) $paths
-                );
-            }
-        } elseif (!isset($this->prefixDirs[$prefix])) {
-            // Register directories for a new namespace.
-            $length = strlen($prefix);
-            if ('\\' !== $prefix[$length - 1]) {
-                throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
-            }
-            $this->prefixLengths[$prefix[0]][$prefix] = $length;
-            $this->prefixDirs[$prefix] = (array) $paths;
-        } elseif ($prepend) {
-            // Prepend directories for an already registered namespace.
-            $this->prefixDirs[$prefix] = array_merge(
-                (array) $paths,
-                $this->prefixDirs[$prefix]
-            );
-        } else {
-            // Append directories for an already registered namespace.
-            $this->prefixDirs[$prefix] = array_merge(
-                $this->prefixDirs[$prefix],
-                (array) $paths
-            );
-        }
-    }
-
-    /**
-     * Registers a set of PSR-4 directories for a given namespace,
-     * replacing any others previously set for this namespace.
-     *
-     * @param string       $prefix The prefix/namespace, with trailing '\\'
-     * @param array|string $paths  The PSR-4 base directories
-     *
-     * @throws \InvalidArgumentException
-     *
-     * @return void
-     */
-    public function set($prefix, $paths)
-    {
-        if (!$prefix) {
-            $this->fallbackDirs = (array) $paths;
-        } else {
-            $length = strlen($prefix);
-            if ('\\' !== $prefix[$length - 1]) {
-                throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
-            }
-            $this->prefixLengths[$prefix[0]][$prefix] = $length;
-            $this->prefixDirs[$prefix] = (array) $paths;
-        }
-    }
-
-    /**
-     * Registers this instance as an autoloader.
-     *
-     * @param bool $prepend Whether to prepend the autoloader or not
-     *
-     * @return void
-     */
-    public function register($prepend = false)
-    {
-        spl_autoload_register(array($this, 'loadClass'), true, $prepend);
-    }
-
-    /**
-     * Unregisters this instance as an autoloader.
-     *
-     * @return void
-     */
-    public function unregister()
-    {
-        spl_autoload_unregister(array($this, 'loadClass'));
-    }
-
-    /**
-     * Loads the given class or interface.
-     *
-     * @param  string $class The name of the class
-     *
-     * @return bool|null True if loaded, null otherwise
-     */
-    public function loadClass($class)
-    {
-        if ($file = $this->findFile($class)) {
-            includeFile($file);
-
-            return true;
-        }
-    }
-
-    /**
-     * Finds the path to the file where the class is defined.
-     *
-     * @param string $class The name of the class
-     *
-     * @return string|false The path if found, false otherwise
-     */
-    public function findFile($class)
-    {
-        // work around for PHP 5.3.0 - 5.3.2 https://bugs.php.net/50731
-        if ('\\' == $class[0]) {
-            $class = substr($class, 1);
-        }
-
-        // class map lookup
-        if (isset($this->classMap[$class])) {
-            return $this->classMap[$class];
-        }
-        if ($this->classMapAuthoritative) {
-            return false;
-        }
-
-        $file = $this->findFileWithExtension($class, '.php');
-
-        // Search for Hack files if we are running on HHVM
-        if ($file === null && defined('HHVM_VERSION')) {
-            $file = $this->findFileWithExtension($class, '.hh');
-        }
-
-        if ($file === null) {
-            // Remember that this class does not exist.
-            return $this->classMap[$class] = false;
-        }
-
-        return $file;
-    }
-
-    /**
-     * Finds a file that defines the specified class and has the specified
-     * extension.
-     *
-     * @param  string $class The name of the class
-     * @param  string $ext   The extension of the file
-     *
-     * @return string|false The path if found, false otherwise
-     */
-    public function findFileWithExtension($class, $ext)
-    {
-        $logicalPath = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
-
-        $first = $class[0];
-        if (isset($this->prefixLengths[$first])) {
-            foreach ($this->prefixLengths[$first] as $prefix => $length) {
-                if (0 === strpos($class, $prefix)) {
-                    foreach ($this->prefixDirs[$prefix] as $dir) {
-                        if (is_file($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPath, $length))) {
-                            return $file;
-                        }
-                    }
-                }
-            }
-        }
-
-        foreach ($this->fallbackDirs as $dir) {
-            if (is_file($file = $dir . DIRECTORY_SEPARATOR . $logicalPath)) {
-                return $file;
-            }
-        }
-
-        return false;
-    }
-}
-
-if (!function_exists('SqlParser\\Autoload\\includeFile')) {
-
-    /**
-     * Scope isolated include.
-     *
-     * Prevents access to $this/self from included files.
-     *
-     * @param string $file The name of the file
-     *
-     * @return void
-     */
-    function includeFile($file)
-    {
-        include $file;
-    }
-}
diff --git a/#pma/libraries/sql-parser/autoload.php b/#pma/libraries/sql-parser/autoload.php
deleted file mode 100644
index f12057f2..00000000
--- a/#pma/libraries/sql-parser/autoload.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-/**
- * The autoloader used for loading sql-parser's components.
- *
- * This file is based on Composer's autoloader.
- *
- * (c) Nils Adermann <naderman@naderman.de>
- *     Jordi Boggiano <j.boggiano@seld.be>
- *
- * @package     SqlParser
- * @subpackage  Autoload
- */
-namespace SqlParser\Autoload;
-
-if (!class_exists('SqlParser\\Autoload\\ClassLoader')) {
-    if (! file_exists('./libraries/sql-parser/ClassLoader.php')) {
-        die('Invalid invocation');
-    }
-    include_once './libraries/sql-parser/ClassLoader.php';
-}
-
-use SqlParser\Autoload\ClassLoader;
-
-/**
- * Initializes the autoloader.
- *
- * @package     SqlParser
- * @subpackage  Autoload
- */
-class AutoloaderInit
-{
-
-    /**
-     * The loader instance.
-     *
-     * @var ClassLoader
-     */
-    public static $loader;
-
-    /**
-     * Constructs and returns the class loader.
-     *
-     * @param  array $map Array containing path to each namespace.
-     *
-     * @return ClassLoader
-     */
-    public static function getLoader(array $map)
-    {
-        if (null !== self::$loader) {
-            return self::$loader;
-        }
-
-        self::$loader = $loader = new ClassLoader();
-
-        foreach ($map as $namespace => $path) {
-            $loader->set($namespace, $path);
-        }
-
-        $loader->register(true);
-
-        return $loader;
-    }
-}
-
-// php-gettext is used to translate error messages.
-// This must be included before any class of the parser is loaded because
-// if there is no `__` function defined, the library defines a dummy one
-// in `common.php`.
-require_once './libraries/vendor_config.php';
-require_once GETTEXT_INC;
-
-// Initializing the autoloader.
-return AutoloaderInit::getLoader(
-    array(
-        'SqlParser\\' => array(dirname(__FILE__) . '/src'),
-    )
-);
diff --git a/#pma/libraries/sql-parser/src/Component.php b/#pma/libraries/sql-parser/src/Component.php
deleted file mode 100644
index 08720cfa..00000000
--- a/#pma/libraries/sql-parser/src/Component.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-/**
- * Defines a component that is later extended to parse specialized components or
- * keywords.
- *
- * There is a small difference between *Component and *Keyword classes: usually,
- * *Component parsers can be reused in multiple  situations and *Keyword parsers
- * count on the *Component classes to do their job.
- *
- * @package SqlParser
- */
-namespace SqlParser;
-
-require_once 'common.php';
-
-/**
- * A component (of a statement) is a part of a statement that is common to
- * multiple query types.
- *
- * @category Components
- * @package  SqlParser
- * @license  https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-abstract class Component
-{
-
-    /**
-     * Parses the tokens contained in the given list in the context of the given
-     * parser.
-     *
-     * @param Parser     $parser  The parser that serves as context.
-     * @param TokensList $list    The list of tokens that are being parsed.
-     * @param array      $options Parameters for parsing.
-     *
-     * @throws \Exception Not implemented yet.
-     *
-     * @return mixed
-     */
-    public static function parse(
-        Parser $parser,
-        TokensList $list,
-        array $options = array()
-    ) {
-        // This method should be abstract, but it can't be both static and
-        // abstract.
-        throw new \Exception(\__('Not implemented yet.'));
-    }
-
-    /**
-     * Builds the string representation of a component of this type.
-     *
-     * In other words, this function represents the inverse function of
-     * `static::parse`.
-     *
-     * @param mixed $component The component to be built.
-     * @param array $options   Parameters for building.
-     *
-     * @throws \Exception Not implemented yet.
-     *
-     * @return string
-     */
-    public static function build($component, array $options = array())
-    {
-        // This method should be abstract, but it can't be both static and
-        // abstract.
-        throw new \Exception(\__('Not implemented yet.'));
-    }
-
-    /**
-     * Builds the string representation of a component of this type.
-     *
-     * @see static::build
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return static::build($this);
-    }
-}
diff --git a/#pma/libraries/sql-parser/src/Components/AlterOperation.php b/#pma/libraries/sql-parser/src/Components/AlterOperation.php
deleted file mode 100644
index c2344c60..00000000
--- a/#pma/libraries/sql-parser/src/Components/AlterOperation.php
+++ /dev/null
@@ -1,265 +0,0 @@
-<?php
-
-/**
- * Parses an alter operation.
- *
- * @package    SqlParser
- * @subpackage Components
- */
-namespace SqlParser\Components;
-
-use SqlParser\Component;
-use SqlParser\Parser;
-use SqlParser\Token;
-use SqlParser\TokensList;
-
-/**
- * Parses an alter operation.
- *
- * @category   Components
- * @package    SqlParser
- * @subpackage Components
- * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-class AlterOperation extends Component
-{
-
-    /**
-     * All database options
-     *
-     * @var array
-     */
-    public static $DB_OPTIONS = array(
-        'CHARACTER SET'             => array(1, 'var'),
-        'CHARSET'                   => array(1, 'var'),
-        'DEFAULT CHARACTER SET'     => array(1, 'var'),
-        'DEFAULT CHARSET'           => array(1, 'var'),
-        'UPGRADE'                   => array(1, 'var'),
-        'COLLATE'                   => array(2, 'var'),
-        'DEFAULT COLLATE'           => array(2, 'var'),
-    );
-
-    /**
-     * All table options
-     *
-     * @var array
-     */
-    public static $TABLE_OPTIONS = array(
-        'ENGINE'                        => array(1, 'var='),
-        'AUTO_INCREMENT'                => array(1, 'var='),
-        'AVG_ROW_LENGTH'                => array(1, 'var'),
-        'MAX_ROWS'                      => array(1, 'var'),
-        'ROW_FORMAT'                    => array(1, 'var'),
-        'COMMENT'                       => array(1, 'var'),
-        'ADD'                           => 1,
-        'ALTER'                         => 1,
-        'ANALYZE'                       => 1,
-        'CHANGE'                        => 1,
-        'CHECK'                         => 1,
-        'COALESCE'                      => 1,
-        'CONVERT'                       => 1,
-        'DISABLE'                       => 1,
-        'DISCARD'                       => 1,
-        'DROP'                          => 1,
-        'ENABLE'                        => 1,
-        'IMPORT'                        => 1,
-        'MODIFY'                        => 1,
-        'OPTIMIZE'                      => 1,
-        'ORDER'                         => 1,
-        'PARTITION'                     => 1,
-        'REBUILD'                       => 1,
-        'REMOVE'                        => 1,
-        'RENAME'                        => 1,
-        'REORGANIZE'                    => 1,
-        'REPAIR'                        => 1,
-        'UPGRADE'                       => 1,
-
-        'COLUMN'                        => 2,
-        'CONSTRAINT'                    => 2,
-        'DEFAULT'                       => 2,
-        'TO'                            => 2,
-        'BY'                            => 2,
-        'FOREIGN'                       => 2,
-        'FULLTEXT'                      => 2,
-        'KEY'                           => 2,
-        'KEYS'                          => 2,
-        'PARTITIONING'                  => 2,
-        'PRIMARY KEY'                   => 2,
-        'SPATIAL'                       => 2,
-        'TABLESPACE'                    => 2,
-        'INDEX'                         => 2,
-    );
-
-    /**
-     * All view options
-     *
-     * @var array
-     */
-    public static $VIEW_OPTIONS = array(
-        'AS'                            => 1,
-    );
-
-    /**
-     * Options of this operation.
-     *
-     * @var OptionsArray
-     */
-    public $options;
-
-    /**
-     * The altered field.
-     *
-     * @var Expression
-     */
-    public $field;
-
-    /**
-     * Unparsed tokens.
-     *
-     * @var Token[]|string
-     */
-    public $unknown = array();
-
-    /**
-     * @param Parser     $parser  The parser that serves as context.
-     * @param TokensList $list    The list of tokens that are being parsed.
-     * @param array      $options Parameters for parsing.
-     *
-     * @return AlterOperation
-     */
-    public static function parse(Parser $parser, TokensList $list, array $options = array())
-    {
-        $ret = new AlterOperation();
-
-        /**
-         * Counts brackets.
-         *
-         * @var int $brackets
-         */
-        $brackets = 0;
-
-        /**
-         * The state of the parser.
-         *
-         * Below are the states of the parser.
-         *
-         *      0 ---------------------[ options ]---------------------> 1
-         *
-         *      1 ----------------------[ field ]----------------------> 2
-         *
-         *      2 -------------------------[ , ]-----------------------> 0
-         *
-         * @var int $state
-         */
-        $state = 0;
-
-        for (; $list->idx < $list->count; ++$list->idx) {
-            /**
-             * Token parsed at this moment.
-             *
-             * @var Token $token
-             */
-            $token = $list->tokens[$list->idx];
-
-            // End of statement.
-            if ($token->type === Token::TYPE_DELIMITER) {
-                break;
-            }
-
-            // Skipping comments.
-            if ($token->type === Token::TYPE_COMMENT) {
-                continue;
-            }
-
-            // Skipping whitespaces.
-            if ($token->type === Token::TYPE_WHITESPACE) {
-                if ($state === 2) {
-                    // When parsing the unknown part, the whitespaces are
-                    // included to not break anything.
-                    $ret->unknown[] = $token;
-                }
-                continue;
-            }
-
-            if ($state === 0) {
-                $ret->options = OptionsArray::parse($parser, $list, $options);
-
-                if ($ret->options->has('AS')) {
-                    for (; $list->idx < $list->count; ++$list->idx) {
-                        if ($list->tokens[$list->idx]->type === Token::TYPE_DELIMITER) {
-                            break;
-                        }
-                        $ret->unknown[] = $list->tokens[$list->idx];
-                    }
-                    break;
-                }
-
-                $state = 1;
-            } elseif ($state === 1) {
-                $ret->field = Expression::parse(
-                    $parser,
-                    $list,
-                    array(
-                        'breakOnAlias' => true,
-                        'parseField' => 'column',
-                    )
-                );
-                if ($ret->field === null) {
-                    // No field was read. We go back one token so the next
-                    // iteration will parse the same token, but in state 2.
-                    --$list->idx;
-                }
-                $state = 2;
-            } elseif ($state === 2) {
-                if ($token->type === Token::TYPE_OPERATOR) {
-                    if ($token->value === '(') {
-                        ++$brackets;
-                    } elseif ($token->value === ')') {
-                        --$brackets;
-                    } elseif (($token->value === ',') && ($brackets === 0)) {
-                        break;
-                    }
-                } elseif (!empty(Parser::$STATEMENT_PARSERS[$token->value])) {
-                    // We have reached the end of ALTER operation and suddenly found
-                    // a start to new statement, but have not find a delimiter between them
-
-                    if (! ($token->value == 'SET' && $list->tokens[$list->idx - 1]->value == 'CHARACTER')) {
-                        $parser->error(
-                            __('A new statement was found, but no delimiter between it and the previous one.'),
-                            $token
-                        );
-                        break;
-                    }
-                }
-                $ret->unknown[] = $token;
-            }
-        }
-
-        if ($ret->options->isEmpty()) {
-            $parser->error(
-                __('Unrecognized alter operation.'),
-                $list->tokens[$list->idx]
-            );
-        }
-
-        --$list->idx;
-
-        return $ret;
-    }
-
-    /**
-     * @param AlterOperation $component The component to be built.
-     * @param array          $options   Parameters for building.
-     *
-     * @return string
-     */
-    public static function build($component, array $options = array())
-    {
-        $ret = $component->options . ' ';
-        if ((isset($component->field)) && ($component->field !== '')) {
-            $ret .= $component->field . ' ';
-        }
-        $ret .= TokensList::build($component->unknown);
-        return $ret;
-    }
-}
diff --git a/#pma/libraries/sql-parser/src/Components/Array2d.php b/#pma/libraries/sql-parser/src/Components/Array2d.php
deleted file mode 100644
index 2199efe1..00000000
--- a/#pma/libraries/sql-parser/src/Components/Array2d.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
-
-/**
- * `VALUES` keyword parser.
- *
- * @package    SqlParser
- * @subpackage Components
- */
-namespace SqlParser\Components;
-
-use SqlParser\Component;
-use SqlParser\Parser;
-use SqlParser\Token;
-use SqlParser\TokensList;
-
-/**
- * `VALUES` keyword parser.
- *
- * @category   Keywords
- * @package    SqlParser
- * @subpackage Components
- * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-class Array2d extends Component
-{
-
-    /**
-     * @param Parser     $parser  The parser that serves as context.
-     * @param TokensList $list    The list of tokens that are being parsed.
-     * @param array      $options Parameters for parsing.
-     *
-     * @return ArrayObj[]
-     */
-    public static function parse(Parser $parser, TokensList $list, array $options = array())
-    {
-        $ret = array();
-
-        /**
-         * The number of values in each set.
-         *
-         * @var int $count
-         */
-        $count = -1;
-
-        /**
-         * The state of the parser.
-         *
-         * Below are the states of the parser.
-         *
-         *      0 ----------------------[ array ]----------------------> 1
-         *
-         *      1 ------------------------[ , ]------------------------> 0
-         *      1 -----------------------[ else ]----------------------> (END)
-         *
-         * @var int $state
-         */
-        $state = 0;
-
-        for (; $list->idx < $list->count; ++$list->idx) {
-            /**
-             * Token parsed at this moment.
-             *
-             * @var Token $token
-             */
-            $token = $list->tokens[$list->idx];
-
-            // End of statement.
-            if ($token->type === Token::TYPE_DELIMITER) {
-                break;
-            }
-
-            // Skipping whitespaces and comments.
-            if (($token->type === Token::TYPE_WHITESPACE) || ($token->type === Token::TYPE_COMMENT)) {
-                continue;
-            }
-
-            // No keyword is expected.
-            if (($token->type === Token::TYPE_KEYWORD) && ($token->flags & Token::FLAG_KEYWORD_RESERVED)) {
-                break;
-            }
-
-            if ($state === 0) {
-                if ($token->value === '(') {
-                    $arr = ArrayObj::parse($parser, $list, $options);
-                    $arrCount = count($arr->values);
-                    if ($count === -1) {
-                        $count = $arrCount;
-                    } elseif ($arrCount != $count) {
-                        $parser->error(
-                            sprintf(
-                                __('%1$d values were expected, but found %2$d.'),
-                                $count,
-                                $arrCount
-                            ),
-                            $token
-                        );
-                    }
-                    $ret[] = $arr;
-                    $state = 1;
-                } else {
-                    break;
-                }
-            } elseif ($state === 1) {
-                if ($token->value === ',') {
-                    $state = 0;
-                } else {
-                    break;
-                }
-            }
-        }
-
-        if ($state === 0) {
-            $parser->error(
-                __('An opening bracket followed by a set of values was expected.'),
-                $list->tokens[$list->idx]
-            );
-        }
-
-        --$list->idx;
-        return $ret;
-    }
-
-    /**
-     * @param ArrayObj[] $component The component to be built.
-     * @param array      $options   Parameters for building.
-     *
-     * @return string
-     */
-    public static function build($component, array $options = array())
-    {
-        return ArrayObj::build($component);
-    }
-}
diff --git a/#pma/libraries/sql-parser/src/Components/ArrayObj.php b/#pma/libraries/sql-parser/src/Components/ArrayObj.php
deleted file mode 100644
index bed7fc73..00000000
--- a/#pma/libraries/sql-parser/src/Components/ArrayObj.php
+++ /dev/null
@@ -1,193 +0,0 @@
-<?php
-
-/**
- * Parses an array.
- *
- * @package    SqlParser
- * @subpackage Components
- */
-namespace SqlParser\Components;
-
-use SqlParser\Component;
-use SqlParser\Parser;
-use SqlParser\Token;
-use SqlParser\TokensList;
-
-/**
- * Parses an array.
- *
- * @category   Components
- * @package    SqlParser
- * @subpackage Components
- * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-class ArrayObj extends Component
-{
-
-    /**
-     * The array that contains the unprocessed value of each token.
-     *
-     * @var array
-     */
-    public $raw = array();
-
-    /**
-     * The array that contains the processed value of each token.
-     *
-     * @var array
-     */
-    public $values = array();
-
-    /**
-     * Constructor.
-     *
-     * @param array $raw    The unprocessed values.
-     * @param array $values The processed values.
-     */
-    public function __construct(array $raw = array(), array $values = array())
-    {
-        $this->raw = $raw;
-        $this->values = $values;
-    }
-
-    /**
-     * @param Parser     $parser  The parser that serves as context.
-     * @param TokensList $list    The list of tokens that are being parsed.
-     * @param array      $options Parameters for parsing.
-     *
-     * @return ArrayObj|Component[]
-     */
-    public static function parse(Parser $parser, TokensList $list, array $options = array())
-    {
-        $ret = empty($options['type']) ? new ArrayObj() : array();
-
-        /**
-         * The last raw expression.
-         *
-         * @var string $lastRaw
-         */
-        $lastRaw = '';
-
-        /**
-         * The last value.
-         *
-         * @var string $lastValue
-         */
-        $lastValue = '';
-
-        /**
-         * Counts brackets.
-         *
-         * @var int $brackets
-         */
-        $brackets = 0;
-
-        /**
-         * Last separator (bracket or comma).
-         *
-         * @var boolean $isCommaLast
-         */
-        $isCommaLast = false;
-
-        for (; $list->idx < $list->count; ++$list->idx) {
-            /**
-             * Token parsed at this moment.
-             *
-             * @var Token $token
-             */
-            $token = $list->tokens[$list->idx];
-
-            // End of statement.
-            if ($token->type === Token::TYPE_DELIMITER) {
-                break;
-            }
-
-            // Skipping whitespaces and comments.
-            if (($token->type === Token::TYPE_WHITESPACE)
-                || ($token->type === Token::TYPE_COMMENT)
-            ) {
-                $lastRaw .= $token->token;
-                $lastValue = trim($lastValue) . ' ';
-                continue;
-            }
-
-            if (($brackets === 0)
-                && (($token->type !== Token::TYPE_OPERATOR)
-                || ($token->value !== '('))
-            ) {
-                $parser->error(__('An opening bracket was expected.'), $token);
-                break;
-            }
-
-            if ($token->type === Token::TYPE_OPERATOR) {
-                if ($token->value === '(') {
-                    if (++$brackets === 1) { // 1 is the base level.
-                        continue;
-                    }
-                } elseif ($token->value === ')') {
-                    if (--$brackets === 0) { // Array ended.
-                        break;
-                    }
-                } elseif ($token->value === ',') {
-                    if ($brackets === 1) {
-                        $isCommaLast = true;
-                        if (empty($options['type'])) {
-                            $ret->raw[] = trim($lastRaw);
-                            $ret->values[] = trim($lastValue);
-                            $lastRaw = $lastValue = '';
-                        }
-                    }
-                    continue;
-                }
-            }
-
-            if (empty($options['type'])) {
-                $lastRaw .= $token->token;
-                $lastValue .= $token->value;
-            } else {
-                $ret[] = $options['type']::parse(
-                    $parser,
-                    $list,
-                    empty($options['typeOptions']) ? array() : $options['typeOptions']
-                );
-            }
-        }
-
-        // Handling last element.
-        //
-        // This is treated differently to treat the following cases:
-        //
-        //           => array()
-        //      (,)  => array('', '')
-        //      ()   => array()
-        //      (a,) => array('a', '')
-        //      (a)  => array('a')
-        //
-        $lastRaw = trim($lastRaw);
-        if ((empty($options['type']))
-            && ((strlen($lastRaw) > 0) || ($isCommaLast))
-        ) {
-            $ret->raw[] = $lastRaw;
-            $ret->values[] = trim($lastValue);
-        }
-
-        return $ret;
-    }
-
-    /**
-     * @param ArrayObj|ArrayObj[] $component The component to be built.
-     * @param array               $options   Parameters for building.
-     *
-     * @return string
-     */
-    public static function build($component, array $options = array())
-    {
-        if (is_array($component)) {
-            return implode(', ', $component);
-        } elseif (!empty($component->raw)) {
-            return '(' . implode(', ', $component->raw) . ')';
-        } else {
-            return '(' . implode(', ', $component->values) . ')';
-        }
-    }
-}
diff --git a/#pma/libraries/sql-parser/src/Components/CaseExpression.php b/#pma/libraries/sql-parser/src/Components/CaseExpression.php
deleted file mode 100644
index df5a1bd3..00000000
--- a/#pma/libraries/sql-parser/src/Components/CaseExpression.php
+++ /dev/null
@@ -1,249 +0,0 @@
-<?php
-
-/**
- * Parses a reference to a CASE expression
- *
- * @package    SqlParser
- * @subpackage Components
- */
-namespace SqlParser\Components;
-
-use SqlParser\Component;
-use SqlParser\Parser;
-use SqlParser\Token;
-use SqlParser\TokensList;
-
-
-/**
- * Parses a reference to a CASE expression
- *
- * @category   Components
- * @package    SqlParser
- * @subpackage Components
- * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-class CaseExpression extends Component
-{
-
-    /**
-     * The value to be compared
-     *
-     * @var Expression
-     */
-    public $value;
-
-    /**
-     * The conditions in WHEN clauses
-     *
-     * @var array
-     */
-    public $conditions;
-
-    /**
-     * The results matching with the WHEN clauses
-     *
-     * @var array
-     */
-    public $results;
-
-    /**
-     * The values to be compared against
-     *
-     * @var array
-     */
-    public $compare_values;
-
-    /**
-     * The result in ELSE section of expr
-     *
-     * @var array
-     */
-    public $else_result;
-
-    /**
-     * Constructor.
-     *
-     */
-    public function __construct()
-    {
-    }
-
-    /**
-     *
-     * @param Parser     $parser  The parser that serves as context.
-     * @param TokensList $list    The list of tokens that are being parsed.
-     *
-     * @return Expression
-     */
-    public static function parse(Parser $parser, TokensList $list, array $options = array())
-    {
-        $ret = new CaseExpression();
-
-        /**
-         * State of parser
-         *
-         * @var int $parser
-         */
-        $state = 0;
-
-        /**
-         * Syntax type (type 0 or type 1)
-         *
-         * @var int $type
-         */
-        $type = 0;
-
-        ++$list->idx; // Skip 'CASE'
-
-        for (; $list->idx < $list->count; ++$list->idx) {
-
-            /**
-             * Token parsed at this moment.
-             *
-             * @var Token $token
-             */
-            $token = $list->tokens[$list->idx];
-
-            // Skipping whitespaces and comments.
-            if (($token->type === Token::TYPE_WHITESPACE)
-                || ($token->type === Token::TYPE_COMMENT)
-            ) {
-                continue;
-            }
-
-            if ($state === 0) {
-                if ($token->type === Token::TYPE_KEYWORD
-                    && $token->value === 'WHEN'
-                ) {
-                    ++$list->idx; // Skip 'WHEN'
-                    $new_condition = Condition::parse($parser, $list);
-                    $type = 1;
-                    $state = 1;
-                    $ret->conditions[] = $new_condition;
-                } elseif ($token->type === Token::TYPE_KEYWORD
-                    && $token->value === 'ELSE'
-                ) {
-                    ++$list->idx; // Skip 'ELSE'
-                    $ret->else_result = Expression::parse($parser, $list);
-                    $state = 0; // last clause of CASE expression
-                } elseif ($token->type === Token::TYPE_KEYWORD
-                    && ($token->value === 'END'
-                    || $token->value === 'end')
-                ) {
-                    $state = 3; // end of CASE expression
-                    ++$list->idx;
-                    break;
-                } elseif ($token->type === Token::TYPE_KEYWORD) {
-                    $parser->error(__('Unexpected keyword.'), $token);
-                    break;
-                } else {
-                    $ret->value = Expression::parse($parser, $list);
-                    $type = 0;
-                    $state = 1;
-                }
-            } elseif ($state === 1) {
-                if ($type === 0) {
-                    if ($token->type === Token::TYPE_KEYWORD
-                        && $token->value === 'WHEN'
-                    ) {
-                        ++$list->idx; // Skip 'WHEN'
-                        $new_value = Expression::parse($parser, $list);
-                        $state = 2;
-                        $ret->compare_values[] = $new_value;
-                    } elseif ($token->type === Token::TYPE_KEYWORD
-                        && $token->value === 'ELSE'
-                    ) {
-                        ++$list->idx; // Skip 'ELSE'
-                        $ret->else_result = Expression::parse($parser, $list);
-                        $state = 0; // last clause of CASE expression
-                    } elseif ($token->type === Token::TYPE_KEYWORD
-                        && ($token->value === 'END'
-                        || $token->value === 'end')
-                    ) {
-                        $state = 3; // end of CASE expression
-                        ++$list->idx;
-                        break;
-                    } elseif ($token->type === Token::TYPE_KEYWORD) {
-                        $parser->error(__('Unexpected keyword.'), $token);
-                        break;
-                    }
-                } else {
-                    if ($token->type === Token::TYPE_KEYWORD
-                        && $token->value === 'THEN'
-                    ) {
-                        ++$list->idx; // Skip 'THEN'
-                        $new_result = Expression::parse($parser, $list);
-                        $state = 0;
-                        $ret->results[] = $new_result;
-                    } elseif ($token->type === Token::TYPE_KEYWORD) {
-                        $parser->error(__('Unexpected keyword.'), $token);
-                        break;
-                    }
-                }
-            } elseif ($state === 2) {
-                if ($type === 0) {
-                    if ($token->type === Token::TYPE_KEYWORD
-                        && $token->value === 'THEN'
-                    ) {
-                        ++$list->idx; // Skip 'THEN'
-                        $new_result = Expression::parse($parser, $list);
-                        $ret->results[] = $new_result;
-                        $state = 1;
-                    } elseif ($token->type === Token::TYPE_KEYWORD) {
-                        $parser->error(__('Unexpected keyword.'), $token);
-                        break;
-                    }
-                }
-            }
-        }
-
-        if ($state !== 3) {
-            $parser->error(
-                __('Unexpected end of CASE expression'),
-                $list->tokens[$list->idx - 1]
-            );
-        }
-
-        --$list->idx;
-        return $ret;
-    }
-
-    /**
-     * @param Expression $component The component to be built.
-     * @param array      $options   Parameters for building.
-     *
-     * @return string
-     */
-    public static function build($component, array $options = array())
-    {
-        $ret = 'CASE ';
-        if (isset($component->value)) {
-            // Syntax type 0
-            $ret .= $component->value . ' ';
-            for (
-                $i = 0;
-                $i < count($component->compare_values) && $i < count($component->results);
-                ++$i
-            ) {
-                $ret .= 'WHEN ' . $component->compare_values[$i] . ' ';
-                $ret .= 'THEN ' . $component->results[$i] . ' ';
-            }
-        } else {
-            // Syntax type 1
-            for (
-                $i = 0;
-                $i < count($component->conditions) && $i < count($component->results);
-                ++$i
-            ) {
-                $ret .= 'WHEN ' . Condition::build($component->conditions[$i]) . ' ';
-                $ret .= 'THEN ' . $component->results[$i] . ' ';
-            }
-        }
-        if (isset($component->else_result)) {
-            $ret .= 'ELSE ' . $component->else_result . ' ';
-        }
-        $ret .= 'END';
-
-        return $ret;
-    }
-}
diff --git a/#pma/libraries/sql-parser/src/Components/Condition.php b/#pma/libraries/sql-parser/src/Components/Condition.php
deleted file mode 100644
index c69441aa..00000000
--- a/#pma/libraries/sql-parser/src/Components/Condition.php
+++ /dev/null
@@ -1,231 +0,0 @@
-<?php
-
-/**
- * `WHERE` keyword parser.
- *
- * @package    SqlParser
- * @subpackage Components
- */
-namespace SqlParser\Components;
-
-use SqlParser\Component;
-use SqlParser\Parser;
-use SqlParser\Token;
-use SqlParser\TokensList;
-
-/**
- * `WHERE` keyword parser.
- *
- * @category   Keywords
- * @package    SqlParser
- * @subpackage Components
- * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-class Condition extends Component
-{
-
-    /**
-     * Logical operators that can be used to delimit expressions.
-     *
-     * @var array
-     */
-    public static $DELIMITERS = array('&&', '||', 'AND', 'OR', 'XOR');
-
-    /**
-     * List of allowed reserved keywords in conditions.
-     *
-     * @var array
-     */
-    public static $ALLOWED_KEYWORDS = array(
-        'ALL'                           => 1,
-        'AND'                           => 1,
-        'BETWEEN'                       => 1,
-        'EXISTS'                        => 1,
-        'IF'                            => 1,
-        'IN'                            => 1,
-        'INTERVAL'                      => 1,
-        'IS'                            => 1,
-        'LIKE'                          => 1,
-        'MATCH'                         => 1,
-        'NOT IN'                        => 1,
-        'NOT NULL'                      => 1,
-        'NOT'                           => 1,
-        'NULL'                          => 1,
-        'OR'                            => 1,
-        'REGEXP'                        => 1,
-        'RLIKE'                         => 1,
-        'XOR'                           => 1,
-    );
-
-    /**
-     * Identifiers recognized.
-     *
-     * @var array
-     */
-    public $identifiers = array();
-
-    /**
-     * Whether this component is an operator.
-     *
-     * @var bool
-     */
-    public $isOperator = false;
-
-    /**
-     * The condition.
-     *
-     * @var string
-     */
-    public $expr;
-
-    /**
-     * Constructor.
-     *
-     * @param string $expr The condition or the operator.
-     */
-    public function __construct($expr = null)
-    {
-        $this->expr = trim($expr);
-    }
-
-    /**
-     * @param Parser     $parser  The parser that serves as context.
-     * @param TokensList $list    The list of tokens that are being parsed.
-     * @param array      $options Parameters for parsing.
-     *
-     * @return Condition[]
-     */
-    public static function parse(Parser $parser, TokensList $list, array $options = array())
-    {
-        $ret = array();
-
-        $expr = new Condition();
-
-        /**
-         * Counts brackets.
-         *
-         * @var int $brackets
-         */
-        $brackets = 0;
-
-        /**
-         * Whether there was a `BETWEEN` keyword before or not.
-         *
-         * It is required to keep track of them because their structure contains
-         * the keyword `AND`, which is also an operator that delimits
-         * expressions.
-         *
-         * @var bool $betweenBefore
-         */
-        $betweenBefore = false;
-
-        for (; $list->idx < $list->count; ++$list->idx) {
-
-            /**
-             * Token parsed at this moment.
-             *
-             * @var Token $token
-             */
-            $token = $list->tokens[$list->idx];
-
-            // End of statement.
-            if ($token->type === Token::TYPE_DELIMITER) {
-                break;
-            }
-
-            // Skipping whitespaces and comments.
-            if ($token->type === Token::TYPE_COMMENT) {
-                continue;
-            }
-
-            // Replacing all whitespaces (new lines, tabs, etc.) with a single
-            // space character.
-            if ($token->type === Token::TYPE_WHITESPACE) {
-                $expr->expr .= ' ';
-                continue;
-            }
-
-            // Conditions are delimited by logical operators.
-            if (in_array($token->value, static::$DELIMITERS, true)) {
-                if (($betweenBefore) && ($token->value === 'AND')) {
-                    // The syntax of keyword `BETWEEN` is hard-coded.
-                    $betweenBefore = false;
-                } else {
-                    // The expression ended.
-                    $expr->expr = trim($expr->expr);
-                    if (!empty($expr->expr)) {
-                        $ret[] = $expr;
-                    }
-
-                    // Adding the operator.
-                    $expr = new Condition($token->value);
-                    $expr->isOperator = true;
-                    $ret[] = $expr;
-
-                    // Preparing to parse another condition.
-                    $expr = new Condition();
-                    continue;
-                }
-            }
-
-            if (($token->type === Token::TYPE_KEYWORD)
-                && ($token->flags & Token::FLAG_KEYWORD_RESERVED)
-                && !($token->flags & Token::FLAG_KEYWORD_FUNCTION)
-            ) {
-                if ($token->value === 'BETWEEN') {
-                    $betweenBefore = true;
-                }
-                if (($brackets === 0) && (empty(static::$ALLOWED_KEYWORDS[$token->value]))) {
-                    break;
-                }
-            }
-
-            if ($token->type === Token::TYPE_OPERATOR) {
-                if ($token->value === '(') {
-                    ++$brackets;
-                } elseif ($token->value === ')') {
-                    if ($brackets == 0) {
-                        break;
-                    }
-                    --$brackets;
-                }
-            }
-
-            $expr->expr .= $token->token;
-            if (($token->type === Token::TYPE_NONE)
-                || (($token->type === Token::TYPE_KEYWORD)
-                && (!($token->flags & Token::FLAG_KEYWORD_RESERVED)))
-                || ($token->type === Token::TYPE_STRING)
-                || ($token->type === Token::TYPE_SYMBOL)
-            ) {
-                if (!in_array($token->value, $expr->identifiers)) {
-                    $expr->identifiers[] = $token->value;
-                }
-            }
-        }
-
-        // Last iteration was not processed.
-        $expr->expr = trim($expr->expr);
-        if (!empty($expr->expr)) {
-            $ret[] = $expr;
-        }
-
-        --$list->idx;
-        return $ret;
-    }
-
-    /**
-     * @param Condition[] $component The component to be built.
-     * @param array       $options   Parameters for building.
-     *
-     * @return string
-     */
-    public static function build($component, array $options = array())
-    {
-        if (is_array($component)) {
-            return implode(' ', $component);
-        } else {
-            return $component->expr;
-        }
-    }
-}
diff --git a/#pma/libraries/sql-parser/src/Components/CreateDefinition.php b/#pma/libraries/sql-parser/src/Components/CreateDefinition.php
deleted file mode 100644
index 86bb3157..00000000
--- a/#pma/libraries/sql-parser/src/Components/CreateDefinition.php
+++ /dev/null
@@ -1,339 +0,0 @@
-<?php
-
-/**
- * Parses the create definition of a column or a key.
- *
- * Used for parsing `CREATE TABLE` statement.
- *
- * @package    SqlParser
- * @subpackage Components
- */
-namespace SqlParser\Components;
-
-use SqlParser\Context;
-use SqlParser\Component;
-use SqlParser\Parser;
-use SqlParser\Token;
-use SqlParser\TokensList;
-
-/**
- * Parses the create definition of a column or a key.
- *
- * Used for parsing `CREATE TABLE` statement.
- *
- * @category   Components
- * @package    SqlParser
- * @subpackage Components
- * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-class CreateDefinition extends Component
-{
-
-    /**
-     * All field options.
-     *
-     * @var array
-     */
-    public static $FIELD_OPTIONS = array(
-
-        // Tells the `OptionsArray` to not sort the options.
-        // See the note below.
-        '_UNSORTED'                     => true,
-
-        'NOT NULL'                      => 1,
-        'NULL'                          => 1,
-        'DEFAULT'                       => array(2, 'expr', array('breakOnAlias' => true)),
-        'AUTO_INCREMENT'                => 3,
-        'PRIMARY'                       => 4,
-        'PRIMARY KEY'                   => 4,
-        'UNIQUE'                        => 4,
-        'UNIQUE KEY'                    => 4,
-        'COMMENT'                       => array(5, 'var'),
-        'COLUMN_FORMAT'                 => array(6, 'var'),
-        'ON UPDATE'                     => array(7, 'expr'),
-
-        // Generated columns options.
-        'GENERATED ALWAYS'              => 8,
-        'AS'                            => array(9, 'expr', array('parenthesesDelimited' => true)),
-        'VIRTUAL'                       => 10,
-        'PERSISTENT'                    => 11,
-        'STORED'                        => 11,
-        // Common entries.
-        //
-        // NOTE: Some of the common options are not in the same order which
-        // causes troubles when checking if the options are in the right order.
-        // I should find a way to define multiple sets of options and make the
-        // parser select the right set.
-        //
-        // 'UNIQUE'                        => 4,
-        // 'UNIQUE KEY'                    => 4,
-        // 'COMMENT'                       => array(5, 'var'),
-        // 'NOT NULL'                      => 1,
-        // 'NULL'                          => 1,
-        // 'PRIMARY'                       => 4,
-        // 'PRIMARY KEY'                   => 4,
-    );
-
-    /**
-     * The name of the new column.
-     *
-     * @var string
-     */
-    public $name;
-
-    /**
-     * Whether this field is a constraint or not.
-     *
-     * @var bool
-     */
-    public $isConstraint;
-
-    /**
-     * The data type of thew new column.
-     *
-     * @var DataType
-     */
-    public $type;
-
-    /**
-     * The key.
-     *
-     * @var Key
-     */
-    public $key;
-
-    /**
-     * The table that is referenced.
-     *
-     * @var Reference
-     */
-    public $references;
-
-    /**
-     * The options of this field.
-     *
-     * @var OptionsArray
-     */
-    public $options;
-
-    /**
-     * Constructor.
-     *
-     * @param string       $name         The name of the field.
-     * @param OptionsArray $options      The options of this field.
-     * @param DataType|Key $type         The data type of this field or the key.
-     * @param bool         $isConstraint Whether this field is a constraint or not.
-     * @param Reference    $references   References.
-     */
-    public function __construct(
-        $name = null,
-        $options = null,
-        $type = null,
-        $isConstraint = false,
-        $references = null
-    ) {
-        $this->name = $name;
-        $this->options = $options;
-        if ($type instanceof DataType) {
-            $this->type = $type;
-        } elseif ($type instanceof Key) {
-            $this->key = $type;
-            $this->isConstraint = $isConstraint;
-            $this->references = $references;
-        }
-    }
-
-    /**
-     * @param Parser     $parser  The parser that serves as context.
-     * @param TokensList $list    The list of tokens that are being parsed.
-     * @param array      $options Parameters for parsing.
-     *
-     * @return CreateDefinition[]
-     */
-    public static function parse(Parser $parser, TokensList $list, array $options = array())
-    {
-        $ret = array();
-
-        $expr = new CreateDefinition();
-
-        /**
-         * The state of the parser.
-         *
-         * Below are the states of the parser.
-         *
-         *      0 -----------------------[ ( ]------------------------> 1
-         *
-         *      1 --------------------[ CONSTRAINT ]------------------> 1
-         *      1 -----------------------[ key ]----------------------> 2
-         *      1 -------------[ constraint / column name ]-----------> 2
-         *
-         *      2 --------------------[ data type ]-------------------> 3
-         *
-         *      3 ---------------------[ options ]--------------------> 4
-         *
-         *      4 --------------------[ REFERENCES ]------------------> 4
-         *
-         *      5 ------------------------[ , ]-----------------------> 1
-         *      5 ------------------------[ ) ]-----------------------> 6 (-1)
-         *
-         * @var int $state
-         */
-        $state = 0;
-
-        for (; $list->idx < $list->count; ++$list->idx) {
-            /**
-             * Token parsed at this moment.
-             *
-             * @var Token $token
-             */
-            $token = $list->tokens[$list->idx];
-
-            // End of statement.
-            if ($token->type === Token::TYPE_DELIMITER) {
-                break;
-            }
-
-            // Skipping whitespaces and comments.
-            if (($token->type === Token::TYPE_WHITESPACE) || ($token->type === Token::TYPE_COMMENT)) {
-                continue;
-            }
-
-            if ($state === 0) {
-                if (($token->type === Token::TYPE_OPERATOR) && ($token->value === '(')) {
-                    $state = 1;
-                } else {
-                    $parser->error(
-                        __('An opening bracket was expected.'),
-                        $token
-                    );
-                    break;
-                }
-            } elseif ($state === 1) {
-                if (($token->type === Token::TYPE_KEYWORD) && ($token->value === 'CONSTRAINT')) {
-                    $expr->isConstraint = true;
-                } elseif (($token->type === Token::TYPE_KEYWORD) && ($token->flags & Token::FLAG_KEYWORD_KEY)) {
-                    $expr->key = Key::parse($parser, $list);
-                    $state = 4;
-                } elseif ($token->type === Token::TYPE_SYMBOL || $token->type === Token::TYPE_NONE) {
-                    $expr->name = $token->value;
-                    if (!$expr->isConstraint) {
-                        $state = 2;
-                    }
-                } else if ($token->type === Token::TYPE_KEYWORD) {
-                    if ($token->flags & Token::FLAG_KEYWORD_RESERVED) {
-                        // Reserved keywords can't be used
-                        // as field names without backquotes
-                        $parser->error(
-                            __('A symbol name was expected! '
-                                . 'A reserved keyword can not be used '
-                                . 'as a column name without backquotes.'
-                            ),
-                            $token
-                        );
-                        return $ret;
-                    } else {
-                        // Non-reserved keywords are allowed without backquotes
-                        $expr->name = $token->value;
-                        $state = 2;
-                    }
-                } else {
-                    $parser->error(
-                        __('A symbol name was expected!'),
-                        $token
-                    );
-                    return $ret;
-                }
-            } elseif ($state === 2) {
-                $expr->type = DataType::parse($parser, $list);
-                $state = 3;
-            } elseif ($state === 3) {
-                $expr->options = OptionsArray::parse($parser, $list, static::$FIELD_OPTIONS);
-                $state = 4;
-            } elseif ($state === 4) {
-                if (($token->type === Token::TYPE_KEYWORD) && ($token->value === 'REFERENCES')) {
-                    ++$list->idx; // Skipping keyword 'REFERENCES'.
-                    $expr->references = Reference::parse($parser, $list);
-                } else {
-                    --$list->idx;
-                }
-                $state = 5;
-            } elseif ($state === 5) {
-                if ((!empty($expr->type)) || (!empty($expr->key))) {
-                    $ret[] = $expr;
-                }
-                $expr = new CreateDefinition();
-                if ($token->value === ',') {
-                    $state = 1;
-                } elseif ($token->value === ')') {
-                    $state = 6;
-                    ++$list->idx;
-                    break;
-                } else {
-                    $parser->error(
-                        __('A comma or a closing bracket was expected.'),
-                        $token
-                    );
-                    $state = 0;
-                    break;
-                }
-            }
-        }
-
-        // Last iteration was not saved.
-        if ((!empty($expr->type)) || (!empty($expr->key))) {
-            $ret[] = $expr;
-        }
-
-        if (($state !== 0) && ($state !== 6)) {
-            $parser->error(
-                __('A closing bracket was expected.'),
-                $list->tokens[$list->idx - 1]
-            );
-        }
-
-        --$list->idx;
-        return $ret;
-    }
-
-    /**
-     * @param CreateDefinition|CreateDefinition[] $component The component to be built.
-     * @param array                               $options   Parameters for building.
-     *
-     * @return string
-     */
-    public static function build($component, array $options = array())
-    {
-        if (is_array($component)) {
-            return "(\n  " . implode(",\n  ", $component) . "\n)";
-        } else {
-            $tmp = '';
-
-            if ($component->isConstraint) {
-                $tmp .= 'CONSTRAINT ';
-            }
-
-            if ((isset($component->name)) && ($component->name !== '')) {
-                $tmp .= Context::escape($component->name) . ' ';
-            }
-
-            if (!empty($component->type)) {
-                $tmp .= DataType::build(
-                    $component->type,
-                    array('lowercase' => true)
-                ) . ' ';
-            }
-
-            if (!empty($component->key)) {
-                $tmp .= $component->key . ' ';
-            }
-
-            if (!empty($component->references)) {
-                $tmp .= 'REFERENCES ' . $component->references . ' ';
-            }
-
-            $tmp .= $component->options;
-
-            return trim($tmp);
-        }
-    }
-}
diff --git a/#pma/libraries/sql-parser/src/Components/DataType.php b/#pma/libraries/sql-parser/src/Components/DataType.php
deleted file mode 100644
index 378ec9d8..00000000
--- a/#pma/libraries/sql-parser/src/Components/DataType.php
+++ /dev/null
@@ -1,170 +0,0 @@
-<?php
-
-/**
- * Parses a data type.
- *
- * @package    SqlParser
- * @subpackage Components
- */
-namespace SqlParser\Components;
-
-use SqlParser\Component;
-use SqlParser\Parser;
-use SqlParser\Token;
-use SqlParser\TokensList;
-
-/**
- * Parses a data type.
- *
- * @category   Components
- * @package    SqlParser
- * @subpackage Components
- * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-class DataType extends Component
-{
-
-    /**
-     * All data type options.
-     *
-     * @var array
-     */
-    public static $DATA_TYPE_OPTIONS = array(
-        'BINARY'                        => 1,
-        'CHARACTER SET'                 => array(2, 'var'),
-        'CHARSET'                       => array(2, 'var'),
-        'COLLATE'                       => array(3, 'var'),
-        'UNSIGNED'                      => 4,
-        'ZEROFILL'                      => 5,
-    );
-
-    /**
-     * The name of the data type.
-     *
-     * @var string
-     */
-    public $name;
-
-    /**
-     * The parameters of this data type.
-     *
-     * Some data types have no parameters.
-     * Numeric types might have parameters for the maximum number of digits,
-     * precision, etc.
-     * String types might have parameters for the maximum length stored.
-     * `ENUM` and `SET` have parameters for possible values.
-     *
-     * For more information, check the MySQL manual.
-     *
-     * @var array
-     */
-    public $parameters = array();
-
-    /**
-     * The options of this data type.
-     *
-     * @var OptionsArray
-     */
-    public $options;
-
-    /**
-     * Constructor.
-     *
-     * @param string       $name       The name of this data type.
-     * @param array        $parameters The parameters (size or possible values).
-     * @param OptionsArray $options    The options of this data type.
-     */
-    public function __construct(
-        $name = null,
-        array $parameters = array(),
-        $options = null
-    ) {
-        $this->name = $name;
-        $this->parameters = $parameters;
-        $this->options = $options;
-    }
-
-    /**
-     * @param Parser     $parser  The parser that serves as context.
-     * @param TokensList $list    The list of tokens that are being parsed.
-     * @param array      $options Parameters for parsing.
-     *
-     * @return DataType
-     */
-    public static function parse(Parser $parser, TokensList $list, array $options = array())
-    {
-        $ret = new DataType();
-
-        /**
-         * The state of the parser.
-         *
-         * Below are the states of the parser.
-         *
-         *      0 -------------------[ data type ]--------------------> 1
-         *
-         *      1 ----------------[ size and options ]----------------> 2
-         *
-         * @var int $state
-         */
-        $state = 0;
-
-        for (; $list->idx < $list->count; ++$list->idx) {
-            /**
-             * Token parsed at this moment.
-             *
-             * @var Token $token
-             */
-            $token = $list->tokens[$list->idx];
-
-            // Skipping whitespaces and comments.
-            if (($token->type === Token::TYPE_WHITESPACE) || ($token->type === Token::TYPE_COMMENT)) {
-                continue;
-            }
-
-            if ($state === 0) {
-                $ret->name = strtoupper($token->value);
-                if (($token->type !== Token::TYPE_KEYWORD) || (!($token->flags & Token::FLAG_KEYWORD_DATA_TYPE))) {
-                    $parser->error(__('Unrecognized data type.'), $token);
-                }
-                $state = 1;
-            } elseif ($state === 1) {
-                if (($token->type === Token::TYPE_OPERATOR) && ($token->value === '(')) {
-                    $parameters = ArrayObj::parse($parser, $list);
-                    ++$list->idx;
-                    $ret->parameters = (($ret->name === 'ENUM') || ($ret->name === 'SET')) ?
-                        $parameters->raw : $parameters->values;
-                }
-                $ret->options = OptionsArray::parse($parser, $list, static::$DATA_TYPE_OPTIONS);
-                ++$list->idx;
-                break;
-            }
-
-        }
-
-        if (empty($ret->name)) {
-            return null;
-        }
-
-        --$list->idx;
-        return $ret;
-    }
-
-    /**
-     * @param DataType $component The component to be built.
-     * @param array    $options   Parameters for building.
-     *
-     * @return string
-     */
-    public static function build($component, array $options = array())
-    {
-        $name = (empty($options['lowercase'])) ?
-            $component->name : strtolower($component->name);
-
-        $parameters = '';
-        if (!empty($component->parameters)) {
-            $parameters = '(' . implode(',', $component->parameters) . ')';
-        }
-
-        return trim($name . $parameters . ' ' . $component->options);
-    }
-}
diff --git a/#pma/libraries/sql-parser/src/Components/Expression.php b/#pma/libraries/sql-parser/src/Components/Expression.php
deleted file mode 100644
index e4079603..00000000
--- a/#pma/libraries/sql-parser/src/Components/Expression.php
+++ /dev/null
@@ -1,448 +0,0 @@
-<?php
-
-/**
- * Parses a reference to an expression (column, table or database name, function
- * call, mathematical expression, etc.).
- *
- * @package    SqlParser
- * @subpackage Components
- */
-namespace SqlParser\Components;
-
-use SqlParser\Context;
-use SqlParser\Component;
-use SqlParser\Parser;
-use SqlParser\Token;
-use SqlParser\TokensList;
-
-/**
- * Parses a reference to an expression (column, table or database name, function
- * call, mathematical expression, etc.).
- *
- * @category   Components
- * @package    SqlParser
- * @subpackage Components
- * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-class Expression extends Component
-{
-
-    /**
-     * List of allowed reserved keywords in expressions.
-     *
-     * @var array
-     */
-    private static $ALLOWED_KEYWORDS = array(
-        'AS' => 1, 'DUAL' => 1, 'NULL' => 1, 'REGEXP' => 1, 'CASE' => 1
-    );
-
-    /**
-     * The name of this database.
-     *
-     * @var string
-     */
-    public $database;
-
-    /**
-     * The name of this table.
-     *
-     * @var string
-     */
-    public $table;
-
-    /**
-     * The name of the column.
-     *
-     * @var string
-     */
-    public $column;
-
-    /**
-     * The sub-expression.
-     *
-     * @var string
-     */
-    public $expr = '';
-
-    /**
-     * The alias of this expression.
-     *
-     * @var string
-     */
-    public $alias;
-
-    /**
-     * The name of the function.
-     *
-     * @var mixed
-     */
-    public $function;
-
-    /**
-     * The type of subquery.
-     *
-     * @var string
-     */
-    public $subquery;
-
-    /**
-     * Constructor.
-     *
-     * Syntax:
-     *     new Expression('expr')
-     *     new Expression('expr', 'alias')
-     *     new Expression('database', 'table', 'column')
-     *     new Expression('database', 'table', 'column', 'alias')
-     *
-     * If the database, table or column name is not required, pass an empty
-     * string.
-     *
-     * @param string $database The name of the database or the the expression.
-     *                          the the expression.
-     * @param string $table    The name of the table or the alias of the expression.
-     *                          the alias of the expression.
-     * @param string $column   The name of the column.
-     * @param string $alias    The name of the alias.
-     */
-    public function __construct($database = null, $table = null, $column = null, $alias = null)
-    {
-        if (($column === null) && ($alias === null)) {
-            $this->expr = $database; // case 1
-            $this->alias = $table; // case 2
-        } else {
-            $this->database = $database; // case 3
-            $this->table = $table; // case 3
-            $this->column = $column; // case 3
-            $this->alias = $alias; // case 4
-        }
-    }
-
-    /**
-     * Possible options:
-     *
-     *      `field`
-     *
-     *          First field to be filled.
-     *          If this is not specified, it takes the value of `parseField`.
-     *
-     *      `parseField`
-     *
-     *          Specifies the type of the field parsed. It may be `database`,
-     *          `table` or `column`. These expressions may not include
-     *          parentheses.
-     *
-     *      `breakOnAlias`
-     *
-     *          If not empty, breaks when the alias occurs (it is not included).
-     *
-     *      `breakOnParentheses`
-     *
-     *          If not empty, breaks when the first parentheses occurs.
-     *
-     *      `parenthesesDelimited`
-     *
-     *          If not empty, breaks after last parentheses occurred.
-     *
-     * @param Parser     $parser  The parser that serves as context.
-     * @param TokensList $list    The list of tokens that are being parsed.
-     * @param array      $options Parameters for parsing.
-     *
-     * @return Expression
-     */
-    public static function parse(Parser $parser, TokensList $list, array $options = array())
-    {
-        $ret = new Expression();
-
-        /**
-         * Whether current tokens make an expression or a table reference.
-         *
-         * @var bool $isExpr
-         */
-        $isExpr = false;
-
-        /**
-         * Whether a period was previously found.
-         *
-         * @var bool $dot
-         */
-        $dot = false;
-
-        /**
-         * Whether an alias is expected. Is 2 if `AS` keyword was found.
-         *
-         * @var bool $alias
-         */
-        $alias = false;
-
-        /**
-         * Counts brackets.
-         *
-         * @var int $brackets
-         */
-        $brackets = 0;
-
-        /**
-         * Keeps track of the last two previous tokens.
-         *
-         * @var Token[] $prev
-         */
-        $prev = array(null, null);
-
-        // When a field is parsed, no parentheses are expected.
-        if (!empty($options['parseField'])) {
-            $options['breakOnParentheses'] = true;
-            $options['field'] = $options['parseField'];
-        }
-
-        for (; $list->idx < $list->count; ++$list->idx) {
-
-            /**
-             * Token parsed at this moment.
-             *
-             * @var Token $token
-             */
-            $token = $list->tokens[$list->idx];
-
-            // End of statement.
-            if ($token->type === Token::TYPE_DELIMITER) {
-                break;
-            }
-
-            // Skipping whitespaces and comments.
-            if (($token->type === Token::TYPE_WHITESPACE)
-                || ($token->type === Token::TYPE_COMMENT)
-            ) {
-                if ($isExpr) {
-                    $ret->expr .= $token->token;
-                }
-                continue;
-            }
-
-            if ($token->type === Token::TYPE_KEYWORD) {
-                if (($brackets > 0) && (empty($ret->subquery))
-                    && (!empty(Parser::$STATEMENT_PARSERS[$token->value]))
-                ) {
-                    // A `(` was previously found and this keyword is the
-                    // beginning of a statement, so this is a subquery.
-                    $ret->subquery = $token->value;
-                } elseif (($token->flags & Token::FLAG_KEYWORD_FUNCTION)
-                    && (empty($options['parseField'])
-                    && ! $alias)
-                ) {
-                    $isExpr = true;
-                } elseif (($token->flags & Token::FLAG_KEYWORD_RESERVED)
-                    && ($brackets === 0)
-                ) {
-                    if (empty(self::$ALLOWED_KEYWORDS[$token->value])) {
-                        // A reserved keyword that is not allowed in the
-                        // expression was found so the expression must have
-                        // ended and a new clause is starting.
-                        break;
-                    }
-                    if ($token->value === 'AS') {
-                        if (!empty($options['breakOnAlias'])) {
-                            break;
-                        }
-                        if ($alias) {
-                            $parser->error(
-                                __('An alias was expected.'),
-                                $token
-                            );
-                            break;
-                        }
-                        $alias = true;
-                        continue;
-                    } elseif ($token->value === 'CASE') {
-                        // For a use of CASE like
-                        // 'SELECT a = CASE .... END, b=1, `id`, ... FROM ...'
-                        $tempCaseExpr = CaseExpression::parse($parser, $list);
-                        $ret->expr .= CaseExpression::build($tempCaseExpr);
-                        $isExpr = true;
-                        continue;
-                    }
-                    $isExpr = true;
-                } elseif ($brackets === 0 && count($ret->expr) > 0 && ! $alias) {
-                    /* End of expression */
-                    break;
-                }
-            }
-
-            if (($token->type === Token::TYPE_NUMBER)
-                || ($token->type === Token::TYPE_BOOL)
-                || (($token->type === Token::TYPE_SYMBOL)
-                && ($token->flags & Token::FLAG_SYMBOL_VARIABLE))
-                || (($token->type === Token::TYPE_OPERATOR)
-                && ($token->value !== '.'))
-            ) {
-                if (!empty($options['parseField'])) {
-                    break;
-                }
-
-                // Numbers, booleans and operators (except dot) are usually part
-                // of expressions.
-                $isExpr = true;
-            }
-
-            if ($token->type === Token::TYPE_OPERATOR) {
-                if ((!empty($options['breakOnParentheses']))
-                    && (($token->value === '(') || ($token->value === ')'))
-                ) {
-                    // No brackets were expected.
-                    break;
-                }
-                if ($token->value === '(') {
-                    ++$brackets;
-                    if ((empty($ret->function)) && ($prev[1] !== null)
-                        && (($prev[1]->type === Token::TYPE_NONE)
-                        || ($prev[1]->type === Token::TYPE_SYMBOL)
-                        || (($prev[1]->type === Token::TYPE_KEYWORD)
-                        && ($prev[1]->flags & Token::FLAG_KEYWORD_FUNCTION)))
-                    ) {
-                        $ret->function = $prev[1]->value;
-                    }
-                } elseif ($token->value === ')' && $brackets == 0) {
-                    // Not our bracket
-                    break;
-                } elseif ($token->value === ')') {
-                    --$brackets;
-                    if ($brackets === 0) {
-                        if (!empty($options['parenthesesDelimited'])) {
-                            // The current token is the last bracket, the next
-                            // one will be outside the expression.
-                            $ret->expr .= $token->token;
-                            ++$list->idx;
-                            break;
-                        }
-                    } elseif ($brackets < 0) {
-                        // $parser->error(__('Unexpected closing bracket.'), $token);
-                        // $brackets = 0;
-                        break;
-                    }
-                } elseif ($token->value === ',') {
-                    // Expressions are comma-delimited.
-                    if ($brackets === 0) {
-                        break;
-                    }
-                }
-            }
-
-            // Saving the previous tokens.
-            $prev[0] = $prev[1];
-            $prev[1] = $token;
-
-            if ($alias) {
-                // An alias is expected (the keyword `AS` was previously found).
-                if (!empty($ret->alias)) {
-                    $parser->error(__('An alias was previously found.'), $token);
-                    break;
-                }
-                $ret->alias = $token->value;
-                $alias = false;
-            } elseif ($isExpr) {
-                // Handling aliases.
-                if (/* (empty($ret->alias)) && */ ($brackets === 0)
-                    && (($prev[0] === null)
-                    || ((($prev[0]->type !== Token::TYPE_OPERATOR)
-                    || ($prev[0]->token === ')'))
-                    && (($prev[0]->type !== Token::TYPE_KEYWORD)
-                    || (!($prev[0]->flags & Token::FLAG_KEYWORD_RESERVED)))))
-                    && (($prev[1]->type === Token::TYPE_STRING)
-                    || (($prev[1]->type === Token::TYPE_SYMBOL)
-                    && (!($prev[1]->flags & Token::FLAG_SYMBOL_VARIABLE)))
-                    || ($prev[1]->type === Token::TYPE_NONE))
-                ) {
-                    if (!empty($ret->alias)) {
-                        $parser->error(__('An alias was previously found.'), $token);
-                        break;
-                    }
-                    $ret->alias = $prev[1]->value;
-                } else {
-                    $ret->expr .= $token->token;
-                }
-            } elseif (!$isExpr) {
-                if (($token->type === Token::TYPE_OPERATOR) && ($token->value === '.')) {
-                    // Found a `.` which means we expect a column name and
-                    // the column name we parsed is actually the table name
-                    // and the table name is actually a database name.
-                    if ((!empty($ret->database)) || ($dot)) {
-                        $parser->error(__('Unexpected dot.'), $token);
-                    }
-                    $ret->database = $ret->table;
-                    $ret->table = $ret->column;
-                    $ret->column = null;
-                    $dot = true;
-                    $ret->expr .= $token->token;
-                } else {
-                    $field = empty($options['field']) ? 'column' : $options['field'];
-                    if (empty($ret->$field)) {
-                        $ret->$field = $token->value;
-                        $ret->expr .= $token->token;
-                        $dot = false;
-                    } else {
-                        // No alias is expected.
-                        if (!empty($options['breakOnAlias'])) {
-                            break;
-                        }
-                        if (!empty($ret->alias)) {
-                            $parser->error(__('An alias was previously found.'), $token);
-                            break;
-                        }
-                        $ret->alias = $token->value;
-                    }
-                }
-            }
-        }
-
-        if ($alias) {
-            $parser->error(
-                __('An alias was expected.'),
-                $list->tokens[$list->idx - 1]
-            );
-        }
-
-        // White-spaces might be added at the end.
-        $ret->expr = trim($ret->expr);
-
-        if ($ret->expr === '') {
-            return null;
-        }
-
-        --$list->idx;
-        return $ret;
-    }
-
-    /**
-     * @param Expression|Expression[] $component The component to be built.
-     * @param array                   $options   Parameters for building.
-     *
-     * @return string
-     */
-    public static function build($component, array $options = array())
-    {
-        if (is_array($component)) {
-            return implode($component, ', ');
-        } else {
-            if ($component->expr !== '' && !is_null($component->expr)) {
-                $ret = $component->expr;
-            } else {
-                $fields = array();
-                if ((isset($component->database)) && ($component->database !== '')) {
-                    $fields[] = $component->database;
-                }
-                if ((isset($component->table)) && ($component->table !== '')) {
-                    $fields[] = $component->table;
-                }
-                if ((isset($component->column)) && ($component->column !== '')) {
-                    $fields[] = $component->column;
-                }
-                $ret = implode('.', Context::escape($fields));
-            }
-
-            if (!empty($component->alias)) {
-                $ret .= ' AS ' . Context::escape($component->alias);
-            }
-
-            return $ret;
-        }
-    }
-}
diff --git a/#pma/libraries/sql-parser/src/Components/ExpressionArray.php b/#pma/libraries/sql-parser/src/Components/ExpressionArray.php
deleted file mode 100644
index e2aa86eb..00000000
--- a/#pma/libraries/sql-parser/src/Components/ExpressionArray.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-
-/**
- * Parses a list of expressions delimited by a comma.
- *
- * @package    SqlParser
- * @subpackage Components
- */
-namespace SqlParser\Components;
-
-use SqlParser\Component;
-use SqlParser\Parser;
-use SqlParser\Token;
-use SqlParser\TokensList;
-
-/**
- * Parses a list of expressions delimited by a comma.
- *
- * @category   Keywords
- * @package    SqlParser
- * @subpackage Components
- * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-class ExpressionArray extends Component
-{
-
-    /**
-     * @param Parser     $parser  The parser that serves as context.
-     * @param TokensList $list    The list of tokens that are being parsed.
-     * @param array      $options Parameters for parsing.
-     *
-     * @return Expression[]
-     */
-    public static function parse(Parser $parser, TokensList $list, array $options = array())
-    {
-        $ret = array();
-
-        /**
-         * The state of the parser.
-         *
-         * Below are the states of the parser.
-         *
-         *      0 ----------------------[ array ]---------------------> 1
-         *
-         *      1 ------------------------[ , ]------------------------> 0
-         *      1 -----------------------[ else ]----------------------> (END)
-         *
-         * @var int $state
-         */
-        $state = 0;
-
-        for (; $list->idx < $list->count; ++$list->idx) {
-            /**
-             * Token parsed at this moment.
-             *
-             * @var Token $token
-             */
-            $token = $list->tokens[$list->idx];
-
-            // End of statement.
-            if ($token->type === Token::TYPE_DELIMITER) {
-                break;
-            }
-
-            // Skipping whitespaces and comments.
-            if (($token->type === Token::TYPE_WHITESPACE) || ($token->type === Token::TYPE_COMMENT)) {
-                continue;
-            }
-
-            if (($token->type === Token::TYPE_KEYWORD)
-                && ($token->flags & Token::FLAG_KEYWORD_RESERVED)
-                && ((~$token->flags & Token::FLAG_KEYWORD_FUNCTION))
-                && ($token->value !== 'DUAL')
-                && ($token->value !== 'NULL')
-                && ($token->value !== 'CASE')
-            ) {
-                // No keyword is expected.
-                break;
-            }
-
-            if ($state === 0) {
-                if ($token->type === Token::TYPE_KEYWORD
-                    && $token->value === 'CASE'
-                ) {
-                    $expr = CaseExpression::parse($parser, $list, $options);
-                } else {
-                    $expr = Expression::parse($parser, $list, $options);
-                }
-
-                if ($expr === null) {
-                    break;
-                }
-                $ret[] = $expr;
-                $state = 1;
-            } elseif ($state === 1) {
-                if ($token->value === ',') {
-                    $state = 0;
-                } else {
-                    break;
-                }
-            }
-        }
-
-        if ($state === 0) {
-            $parser->error(
-                __('An expression was expected.'),
-                $list->tokens[$list->idx]
-            );
-        }
-
-        --$list->idx;
-        return $ret;
-    }
-
-    /**
-     * @param Expression[] $component The component to be built.
-     * @param array        $options   Parameters for building.
-     *
-     * @return string
-     */
-    public static function build($component, array $options = array())
-    {
-        $ret = array();
-        foreach ($component as $frag) {
-            $ret[] = $frag::build($frag);
-        }
-        return implode($ret, ', ');
-    }
-}
diff --git a/#pma/libraries/sql-parser/src/Components/FunctionCall.php b/#pma/libraries/sql-parser/src/Components/FunctionCall.php
deleted file mode 100644
index e260532b..00000000
--- a/#pma/libraries/sql-parser/src/Components/FunctionCall.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-
-/**
- * Parses a function call.
- *
- * @package    SqlParser
- * @subpackage Components
- */
-namespace SqlParser\Components;
-
-use SqlParser\Component;
-use SqlParser\Parser;
-use SqlParser\Token;
-use SqlParser\TokensList;
-
-/**
- * Parses a function call.
- *
- * @category   Keywords
- * @package    SqlParser
- * @subpackage Components
- * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-class FunctionCall extends Component
-{
-
-    /**
-     * The name of this function.
-     *
-     * @var string
-     */
-    public $name;
-
-    /**
-     * The list of parameters
-     *
-     * @var ArrayObj
-     */
-    public $parameters;
-
-    /**
-     * Constructor.
-     *
-     * @param string         $name       The name of the function to be called.
-     * @param array|ArrayObj $parameters The parameters of this function.
-     */
-    public function __construct($name = null, $parameters = null)
-    {
-        $this->name = $name;
-        if (is_array($parameters)) {
-            $this->parameters = new ArrayObj($parameters);
-        } elseif ($parameters instanceof ArrayObj) {
-            $this->parameters = $parameters;
-        }
-    }
-
-    /**
-     * @param Parser     $parser  The parser that serves as context.
-     * @param TokensList $list    The list of tokens that are being parsed.
-     * @param array      $options Parameters for parsing.
-     *
-     * @return FunctionCall
-     */
-    public static function parse(Parser $parser, TokensList $list, array $options = array())
-    {
-        $ret = new FunctionCall();
-
-        /**
-         * The state of the parser.
-         *
-         * Below are the states of the parser.
-         *
-         *      0 ----------------------[ name ]-----------------------> 1
-         *
-         *      1 --------------------[ parameters ]-------------------> (END)
-         *
-         * @var int $state
-         */
-        $state = 0;
-
-        for (; $list->idx < $list->count; ++$list->idx) {
-            /**
-             * Token parsed at this moment.
-             *
-             * @var Token $token
-             */
-            $token = $list->tokens[$list->idx];
-
-            // End of statement.
-            if ($token->type === Token::TYPE_DELIMITER) {
-                break;
-            }
-
-            // Skipping whitespaces and comments.
-            if (($token->type === Token::TYPE_WHITESPACE) || ($token->type === Token::TYPE_COMMENT)) {
-                continue;
-            }
-
-            if ($state === 0) {
-                $ret->name = $token->value;
-                $state = 1;
-            } elseif ($state === 1) {
-                if (($token->type === Token::TYPE_OPERATOR) && ($token->value === '(')) {
-                    $ret->parameters = ArrayObj::parse($parser, $list);
-                }
-                break;
-            }
-
-        }
-
-        return $ret;
-    }
-
-    /**
-     * @param FunctionCall $component The component to be built.
-     * @param array        $options   Parameters for building.
-     *
-     * @return string
-     */
-    public static function build($component, array $options = array())
-    {
-        return $component->name . $component->parameters;
-    }
-}
diff --git a/#pma/libraries/sql-parser/src/Components/IntoKeyword.php b/#pma/libraries/sql-parser/src/Components/IntoKeyword.php
deleted file mode 100644
index d90963db..00000000
--- a/#pma/libraries/sql-parser/src/Components/IntoKeyword.php
+++ /dev/null
@@ -1,164 +0,0 @@
-<?php
-
-/**
- * `INTO` keyword parser.
- *
- * @package    SqlParser
- * @subpackage Components
- */
-namespace SqlParser\Components;
-
-use SqlParser\Component;
-use SqlParser\Parser;
-use SqlParser\Token;
-use SqlParser\TokensList;
-
-/**
- * `INTO` keyword parser.
- *
- * @category   Keywords
- * @package    SqlParser
- * @subpackage Components
- * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-class IntoKeyword extends Component
-{
-
-    /**
-     * Type of target (OUTFILE or SYMBOL).
-     *
-     * @var string
-     */
-    public $type;
-
-    /**
-     * The destination, which can be a table or a file.
-     *
-     * @var string|Expression
-     */
-    public $dest;
-
-    /**
-     * The name of the columns.
-     *
-     * @var array
-     */
-    public $columns;
-
-    /**
-     * The values to be selected into (SELECT .. INTO @var1)
-     *
-     * @var ExpressionArray
-     */
-    public $values;
-
-    /**
-     * @param Parser     $parser  The parser that serves as context.
-     * @param TokensList $list    The list of tokens that are being parsed.
-     * @param array      $options Parameters for parsing.
-     *
-     * @return IntoKeyword
-     */
-    public static function parse(Parser $parser, TokensList $list, array $options = array())
-    {
-        $ret = new IntoKeyword();
-
-        /**
-         * The state of the parser.
-         *
-         * Below are the states of the parser.
-         *
-         *      0 -----------------------[ name ]----------------------> 1
-         *      0 ---------------------[ OUTFILE ]---------------------> 2
-         *
-         *      1 ------------------------[ ( ]------------------------> (END)
-         *
-         *      2 ---------------------[ filename ]--------------------> 1
-         *
-         * @var int $state
-         */
-        $state = 0;
-
-        for (; $list->idx < $list->count; ++$list->idx) {
-            /**
-             * Token parsed at this moment.
-             *
-             * @var Token $token
-             */
-            $token = $list->tokens[$list->idx];
-
-            // End of statement.
-            if ($token->type === Token::TYPE_DELIMITER) {
-                break;
-            }
-
-            // Skipping whitespaces and comments.
-            if (($token->type === Token::TYPE_WHITESPACE) || ($token->type === Token::TYPE_COMMENT)) {
-                continue;
-            }
-
-            if (($token->type === Token::TYPE_KEYWORD) && ($token->flags & Token::FLAG_KEYWORD_RESERVED)) {
-                if (($state === 0) && ($token->value === 'OUTFILE')) {
-                    $ret->type = 'OUTFILE';
-                    $state = 2;
-                    continue;
-                }
-
-                // No other keyword is expected.
-                break;
-            }
-
-            if ($state === 0) {
-                if ((isset($options['fromInsert'])
-                    && $options['fromInsert'])
-                    || (isset($options['fromReplace'])
-                    && $options['fromReplace'])
-                ) {
-                    $ret->dest = Expression::parse(
-                        $parser,
-                        $list,
-                        array(
-                            'parseField' => 'table',
-                            'breakOnAlias' => true,
-                        )
-                    );
-                } else {
-                    $ret->values = ExpressionArray::parse($parser, $list);
-                }
-                $state = 1;
-            } elseif ($state === 1) {
-                if (($token->type === Token::TYPE_OPERATOR) && ($token->value === '(')) {
-                    $ret->columns = ArrayObj::parse($parser, $list)->values;
-                    ++$list->idx;
-                }
-                break;
-            } elseif ($state === 2) {
-                $ret->dest = $token->value;
-                ++$list->idx;
-                break;
-            }
-        }
-
-        --$list->idx;
-        return $ret;
-    }
-
-    /**
-     * @param IntoKeyword $component The component to be built.
-     * @param array       $options   Parameters for building.
-     *
-     * @return string
-     */
-    public static function build($component, array $options = array())
-    {
-        if ($component->dest instanceof Expression) {
-            $columns = !empty($component->columns) ?
-                '(`' . implode('`, `', $component->columns) . '`)' : '';
-            return $component->dest . $columns;
-        } elseif (isset($component->values)) {
-            return ExpressionArray::build($component->values);
-        } else {
-            return 'OUTFILE "' . $component->dest . '"';
-        }
-    }
-}
\ No newline at end of file
diff --git a/#pma/libraries/sql-parser/src/Components/JoinKeyword.php b/#pma/libraries/sql-parser/src/Components/JoinKeyword.php
deleted file mode 100644
index 548a64e9..00000000
--- a/#pma/libraries/sql-parser/src/Components/JoinKeyword.php
+++ /dev/null
@@ -1,210 +0,0 @@
-<?php
-
-/**
- * `JOIN` keyword parser.
- *
- * @package    SqlParser
- * @subpackage Components
- */
-namespace SqlParser\Components;
-
-use SqlParser\Component;
-use SqlParser\Parser;
-use SqlParser\Token;
-use SqlParser\TokensList;
-
-/**
- * `JOIN` keyword parser.
- *
- * @category   Keywords
- * @package    SqlParser
- * @subpackage Components
- * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-class JoinKeyword extends Component
-{
-
-    /**
-     * Types of join.
-     *
-     * @var array
-     */
-    public static $JOINS = array(
-        'CROSS JOIN'                    => 'CROSS',
-        'FULL JOIN'                     => 'FULL',
-        'FULL OUTER JOIN'               => 'FULL',
-        'INNER JOIN'                    => 'INNER',
-        'JOIN'                          => 'JOIN',
-        'LEFT JOIN'                     => 'LEFT',
-        'LEFT OUTER JOIN'               => 'LEFT',
-        'RIGHT JOIN'                    => 'RIGHT',
-        'RIGHT OUTER JOIN'              => 'RIGHT',
-        'NATURAL JOIN'                  => 'NATURAL',
-        'NATURAL LEFT JOIN'             => 'NATURAL LEFT',
-        'NATURAL LEFT JOIN'             => 'NATURAL LEFT',
-        'NATURAL RIGHT JOIN'            => 'NATURAL RIGHT',
-        'NATURAL LEFT OUTER JOIN'       => 'NATURAL LEFT OUTER',
-        'NATURAL RIGHT OUTER JOIN'      => 'NATURAL RIGHT OUTER',
-        'STRAIGHT_JOIN'                 => 'STRAIGHT',
-    );
-
-    /**
-     * Type of this join.
-     *
-     * @see static::$JOINS
-     * @var string
-     */
-    public $type;
-
-    /**
-     * Join expression.
-     *
-     * @var Expression
-     */
-    public $expr;
-
-    /**
-     * Join conditions.
-     *
-     * @var Condition[]
-     */
-    public $on;
-
-    /**
-     * Columns in Using clause
-     *
-     * @var ArrayObj
-     */
-    public $using;
-
-    /**
-     * @param Parser     $parser  The parser that serves as context.
-     * @param TokensList $list    The list of tokens that are being parsed.
-     * @param array      $options Parameters for parsing.
-     *
-     * @return JoinKeyword[]
-     */
-    public static function parse(Parser $parser, TokensList $list, array $options = array())
-    {
-        $ret = array();
-
-        $expr = new JoinKeyword();
-
-        /**
-         * The state of the parser.
-         *
-         * Below are the states of the parser.
-         *
-         *      0 -----------------------[ JOIN ]----------------------> 1
-         *
-         *      1 -----------------------[ expr ]----------------------> 2
-         *
-         *      2 ------------------------[ ON ]-----------------------> 3
-         *      2 -----------------------[ USING ]---------------------> 4
-         *
-         *      3 --------------------[ conditions ]-------------------> 0
-         *
-         *      4 ----------------------[ columns ]--------------------> 0
-         *
-         * @var int $state
-         */
-        $state = 0;
-
-        // By design, the parser will parse first token after the keyword.
-        // In this case, the keyword must be analyzed too, in order to determine
-        // the type of this join.
-        if ($list->idx > 0) {
-            --$list->idx;
-        }
-
-        for (; $list->idx < $list->count; ++$list->idx) {
-            /**
-             * Token parsed at this moment.
-             *
-             * @var Token $token
-             */
-            $token = $list->tokens[$list->idx];
-
-            // End of statement.
-            if ($token->type === Token::TYPE_DELIMITER) {
-                break;
-            }
-
-            // Skipping whitespaces and comments.
-            if (($token->type === Token::TYPE_WHITESPACE) || ($token->type === Token::TYPE_COMMENT)) {
-                continue;
-            }
-
-            if ($state === 0) {
-                if (($token->type === Token::TYPE_KEYWORD)
-                    && (!empty(static::$JOINS[$token->value]))
-                ) {
-                    $expr->type = static::$JOINS[$token->value];
-                    $state = 1;
-                } else {
-                    break;
-                }
-            } elseif ($state === 1) {
-                $expr->expr = Expression::parse($parser, $list, array('field' => 'table'));
-                $state = 2;
-            } elseif ($state === 2) {
-                if ($token->type === Token::TYPE_KEYWORD) {
-                    if ($token->value === 'ON') {
-                        $state = 3;
-                    } elseif ($token->value === 'USING') {
-                        $state = 4;
-                    } else {
-                        if (($token->type === Token::TYPE_KEYWORD)
-                            && (!empty(static::$JOINS[$token->value]))
-                        ) {
-                            $ret[] = $expr;
-                            $expr = new JoinKeyword();
-                            $expr->type = static::$JOINS[$token->value];
-                            $state = 1;
-                        } else {
-                            /* Next clause is starting */
-                            break;
-                        }
-                    }
-                }
-            } elseif ($state === 3) {
-                $expr->on = Condition::parse($parser, $list);
-                $ret[] = $expr;
-                $expr = new JoinKeyword();
-                $state = 0;
-            } elseif ($state === 4) {
-                $expr->using = ArrayObj::parse($parser, $list);
-                $ret[] = $expr;
-                $expr = new JoinKeyword();
-                $state = 0;
-            }
-
-        }
-
-        if (!empty($expr->type)) {
-            $ret[] = $expr;
-        }
-
-        --$list->idx;
-        return $ret;
-    }
-
-    /**
-     * @param JoinKeyword[] $component The component to be built.
-     * @param array         $options   Parameters for building.
-     *
-     * @return string
-     */
-    public static function build($component, array $options = array())
-    {
-        $ret = array();
-        foreach ($component as $c) {
-            $ret[] = array_search($c->type, static::$JOINS) . ' ' . $c->expr
-                . (!empty($c->on)
-                    ? ' ON ' . Condition::build($c->on) : '')
-                . (!empty($c->using)
-                    ? ' USING ' . ArrayObj::build($c->using) : '');
-        }
-        return implode(' ', $ret);
-    }
-}
diff --git a/#pma/libraries/sql-parser/src/Components/Key.php b/#pma/libraries/sql-parser/src/Components/Key.php
deleted file mode 100644
index 24cc3632..00000000
--- a/#pma/libraries/sql-parser/src/Components/Key.php
+++ /dev/null
@@ -1,207 +0,0 @@
-<?php
-
-/**
- * Parses the definition of a key.
- *
- * @package    SqlParser
- * @subpackage Components
- */
-namespace SqlParser\Components;
-
-use SqlParser\Context;
-use SqlParser\Component;
-use SqlParser\Parser;
-use SqlParser\Token;
-use SqlParser\TokensList;
-
-/**
- * Parses the definition of a key.
- *
- * Used for parsing `CREATE TABLE` statement.
- *
- * @category   Components
- * @package    SqlParser
- * @subpackage Components
- * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-class Key extends Component
-{
-
-    /**
-     * All key options.
-     *
-     * @var array
-     */
-    public static $KEY_OPTIONS = array(
-        'KEY_BLOCK_SIZE'                => array(1, 'var'),
-        'USING'                         => array(2, 'var'),
-        'WITH PARSER'                   => array(3, 'var'),
-        'COMMENT'                       => array(4, 'var='),
-    );
-
-    /**
-     * The name of this key.
-     *
-     * @var string
-     */
-    public $name;
-
-    /**
-     * Columns.
-     *
-     * @var array
-     */
-    public $columns;
-
-    /**
-     * The type of this key.
-     *
-     * @var string
-     */
-    public $type;
-
-    /**
-     * The options of this key.
-     *
-     * @var OptionsArray
-     */
-    public $options;
-
-    /**
-     * Constructor.
-     *
-     * @param string       $name    The name of the key.
-     * @param array        $columns The columns covered by this key.
-     * @param string       $type    The type of this key.
-     * @param OptionsArray $options The options of this key.
-     */
-    public function __construct(
-        $name = null,
-        array $columns = array(),
-        $type = null,
-        $options = null
-    ) {
-        $this->name = $name;
-        $this->columns = $columns;
-        $this->type = $type;
-        $this->options = $options;
-    }
-
-    /**
-     * @param Parser     $parser  The parser that serves as context.
-     * @param TokensList $list    The list of tokens that are being parsed.
-     * @param array      $options Parameters for parsing.
-     *
-     * @return Key
-     */
-    public static function parse(Parser $parser, TokensList $list, array $options = array())
-    {
-        $ret = new Key();
-
-        /**
-         * Last parsed column.
-         *
-         * @var array
-         */
-        $lastColumn = array();
-
-        /**
-         * The state of the parser.
-         *
-         * Below are the states of the parser.
-         *
-         *      0 ----------------------[ type ]-----------------------> 1
-         *
-         *      1 ----------------------[ name ]-----------------------> 1
-         *      1 ---------------------[ columns ]---------------------> 2
-         *
-         *      2 ---------------------[ options ]---------------------> 3
-         *
-         * @var int $state
-         */
-        $state = 0;
-
-        for (; $list->idx < $list->count; ++$list->idx) {
-            /**
-             * Token parsed at this moment.
-             *
-             * @var Token $token
-             */
-            $token = $list->tokens[$list->idx];
-
-            // End of statement.
-            if ($token->type === Token::TYPE_DELIMITER) {
-                break;
-            }
-
-            // Skipping whitespaces and comments.
-            if (($token->type === Token::TYPE_WHITESPACE) || ($token->type === Token::TYPE_COMMENT)) {
-                continue;
-            }
-
-            if ($state === 0) {
-                $ret->type = $token->value;
-                $state = 1;
-            } elseif ($state === 1) {
-                if (($token->type === Token::TYPE_OPERATOR) && ($token->value === '(')) {
-                    $state = 2;
-                } else {
-                    $ret->name = $token->value;
-                }
-            } elseif ($state === 2) {
-                if ($token->type === Token::TYPE_OPERATOR) {
-                    if ($token->value === '(') {
-                        $state = 3;
-                    } elseif (($token->value === ',') || ($token->value === ')')) {
-                        $state = ($token->value === ',') ? 2 : 4;
-                        if (!empty($lastColumn)) {
-                            $ret->columns[] = $lastColumn;
-                            $lastColumn = array();
-                        }
-                    }
-                } else {
-                    $lastColumn['name'] = $token->value;
-                }
-            } elseif ($state === 3) {
-                if (($token->type === Token::TYPE_OPERATOR) && ($token->value === ')')) {
-                    $state = 2;
-                } else {
-                    $lastColumn['length'] = $token->value;
-                }
-            } elseif ($state === 4) {
-                $ret->options = OptionsArray::parse($parser, $list, static::$KEY_OPTIONS);
-                ++$list->idx;
-                break;
-            }
-        }
-
-        --$list->idx;
-        return $ret;
-    }
-
-    /**
-     * @param Key   $component The component to be built.
-     * @param array $options   Parameters for building.
-     *
-     * @return string
-     */
-    public static function build($component, array $options = array())
-    {
-        $ret = $component->type . ' ';
-        if (!empty($component->name)) {
-            $ret .= Context::escape($component->name) . ' ';
-        }
-
-        $columns = array();
-        foreach ($component->columns as $column) {
-            $tmp = Context::escape($column['name']);
-            if (isset($column['length'])) {
-                $tmp .= '(' . $column['length'] . ')';
-            }
-            $columns[] = $tmp;
-        }
-
-        $ret .= '(' . implode(',', $columns) . ') ' . $component->options;
-        return trim($ret);
-    }
-}
diff --git a/#pma/libraries/sql-parser/src/Components/Limit.php b/#pma/libraries/sql-parser/src/Components/Limit.php
deleted file mode 100644
index 13a11277..00000000
--- a/#pma/libraries/sql-parser/src/Components/Limit.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-
-/**
- * `LIMIT` keyword parser.
- *
- * @package    SqlParser
- * @subpackage Components
- */
-namespace SqlParser\Components;
-
-use SqlParser\Component;
-use SqlParser\Parser;
-use SqlParser\Token;
-use SqlParser\TokensList;
-
-/**
- * `LIMIT` keyword parser.
- *
- * @category   Keywords
- * @package    SqlParser
- * @subpackage Components
- * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-class Limit extends Component
-{
-
-    /**
-     * The number of rows skipped.
-     *
-     * @var int
-     */
-    public $offset;
-
-    /**
-     * The number of rows to be returned.
-     *
-     * @var int
-     */
-    public $rowCount;
-
-    /**
-     * Constructor.
-     *
-     * @param int $rowCount The row count.
-     * @param int $offset   The offset.
-     */
-    public function __construct($rowCount = 0, $offset = 0)
-    {
-        $this->rowCount = $rowCount;
-        $this->offset = $offset;
-    }
-
-    /**
-     * @param Parser     $parser  The parser that serves as context.
-     * @param TokensList $list    The list of tokens that are being parsed.
-     * @param array      $options Parameters for parsing.
-     *
-     * @return Limit
-     */
-    public static function parse(Parser $parser, TokensList $list, array $options = array())
-    {
-        $ret = new Limit();
-
-        $offset = false;
-
-        for (; $list->idx < $list->count; ++$list->idx) {
-            /**
-             * Token parsed at this moment.
-             *
-             * @var Token $token
-             */
-            $token = $list->tokens[$list->idx];
-
-            // End of statement.
-            if ($token->type === Token::TYPE_DELIMITER) {
-                break;
-            }
-
-            // Skipping whitespaces and comments.
-            if (($token->type === Token::TYPE_WHITESPACE) || ($token->type === Token::TYPE_COMMENT)) {
-                continue;
-            }
-
-            if (($token->type === Token::TYPE_KEYWORD) && ($token->flags & Token::FLAG_KEYWORD_RESERVED)) {
-                break;
-            }
-
-            if (($token->type === Token::TYPE_KEYWORD) && ($token->value === 'OFFSET')) {
-                if ($offset) {
-                    $parser->error(__('An offset was expected.'), $token);
-                }
-                $offset = true;
-                continue;
-            }
-
-            if (($token->type === Token::TYPE_OPERATOR) && ($token->value === ',')) {
-                $ret->offset = $ret->rowCount;
-                $ret->rowCount = 0;
-                continue;
-            }
-
-            if ($offset) {
-                $ret->offset = $token->value;
-                $offset = false;
-            } else {
-                $ret->rowCount = $token->value;
-            }
-        }
-
-        if ($offset) {
-            $parser->error(
-                __('An offset was expected.'),
-                $list->tokens[$list->idx - 1]
-            );
-        }
-
-        --$list->idx;
-        return $ret;
-    }
-
-    /**
-     * @param Limit $component The component to be built.
-     * @param array $options   Parameters for building.
-     *
-     * @return string
-     */
-    public static function build($component, array $options = array())
-    {
-        return $component->offset . ', ' . $component->rowCount;
-    }
-}
diff --git a/#pma/libraries/sql-parser/src/Components/OptionsArray.php b/#pma/libraries/sql-parser/src/Components/OptionsArray.php
deleted file mode 100644
index 0c80e0d7..00000000
--- a/#pma/libraries/sql-parser/src/Components/OptionsArray.php
+++ /dev/null
@@ -1,372 +0,0 @@
-<?php
-
-/**
- * Parses a list of options.
- *
- * @package    SqlParser
- * @subpackage Components
- */
-namespace SqlParser\Components;
-
-use SqlParser\Component;
-use SqlParser\Parser;
-use SqlParser\Token;
-use SqlParser\TokensList;
-
-/**
- * Parses a list of options.
- *
- * @category   Components
- * @package    SqlParser
- * @subpackage Components
- * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-class OptionsArray extends Component
-{
-
-    /**
-     * ArrayObj of selected options.
-     *
-     * @var array
-     */
-    public $options = array();
-
-    /**
-     * Constructor.
-     *
-     * @param array $options The array of options. Options that have a value
-     *                       must be an array with at least two keys `name` and
-     *                       `expr` or `value`.
-     */
-    public function __construct(array $options = array())
-    {
-        $this->options = $options;
-    }
-
-    /**
-     * @param Parser     $parser  The parser that serves as context.
-     * @param TokensList $list    The list of tokens that are being parsed.
-     * @param array      $options Parameters for parsing.
-     *
-     * @return OptionsArray
-     */
-    public static function parse(Parser $parser, TokensList $list, array $options = array())
-    {
-        $ret = new OptionsArray();
-
-        /**
-         * The ID that will be assigned to duplicate options.
-         *
-         * @var int $lastAssignedId
-         */
-        $lastAssignedId = count($options) + 1;
-
-        /**
-         * The option that was processed last time.
-         *
-         * @var array $lastOption
-         */
-        $lastOption = null;
-
-        /**
-         * The index of the option that was processed last time.
-         *
-         * @var int $lastOptionId
-         */
-        $lastOptionId = 0;
-
-        /**
-         * Counts brackets.
-         *
-         * @var int $brackets
-         */
-        $brackets = 0;
-
-        /**
-         * The state of the parser.
-         *
-         * Below are the states of the parser.
-         *
-         *      0 ---------------------[ option ]----------------------> 1
-         *
-         *      1 -------------------[ = (optional) ]------------------> 2
-         *
-         *      2 ----------------------[ value ]----------------------> 0
-         *
-         * @var int $state
-         */
-        $state = 0;
-
-        for (; $list->idx < $list->count; ++$list->idx) {
-            /**
-             * Token parsed at this moment.
-             *
-             * @var Token $token
-             */
-            $token = $list->tokens[$list->idx];
-
-            // End of statement.
-            if ($token->type === Token::TYPE_DELIMITER) {
-                break;
-            }
-
-            // Skipping comments.
-            if ($token->type === Token::TYPE_COMMENT) {
-                continue;
-            }
-
-            // Skipping whitespace if not parsing value.
-            if (($token->type === Token::TYPE_WHITESPACE) && ($brackets === 0)) {
-                continue;
-            }
-
-            if ($lastOption === null) {
-                $upper = strtoupper($token->token);
-                if (isset($options[$upper])) {
-                    $lastOption = $options[$upper];
-                    $lastOptionId = is_array($lastOption) ?
-                        $lastOption[0] : $lastOption;
-                    $state = 0;
-
-                    // Checking for option conflicts.
-                    // For example, in `SELECT` statements the keywords `ALL`
-                    // and `DISTINCT` conflict and if used together, they
-                    // produce an invalid query.
-                    //
-                    // Usually, tokens can be identified in the array by the
-                    // option ID, but if conflicts occur, a generated option ID
-                    // is used.
-                    //
-                    // The first pseudo duplicate ID is the maximum value of the
-                    // real options (e.g.  if there are 5 options, the first
-                    // fake ID is 6).
-                    if (isset($ret->options[$lastOptionId])) {
-                        $parser->error(
-                            sprintf(
-                                __('This option conflicts with "%1$s".'),
-                                is_array($ret->options[$lastOptionId])
-                                ? $ret->options[$lastOptionId]['name']
-                                : $ret->options[$lastOptionId]
-                            ),
-                            $token
-                        );
-                        $lastOptionId = $lastAssignedId++;
-                    }
-                } else {
-                    // There is no option to be processed.
-                    break;
-                }
-            }
-
-            if ($state === 0) {
-                if (!is_array($lastOption)) {
-                    // This is a just keyword option without any value.
-                    // This is the beginning and the end of it.
-                    $ret->options[$lastOptionId] = $token->value;
-                    $lastOption = null;
-                    $state = 0;
-                } elseif (($lastOption[1] === 'var') || ($lastOption[1] === 'var=')) {
-                    // This is a keyword that is followed by a value.
-                    // This is only the beginning. The value is parsed in state
-                    // 1 and 2. State 1 is used to skip the first equals sign
-                    // and state 2 to parse the actual value.
-                    $ret->options[$lastOptionId] = array(
-                        // @var string The name of the option.
-                        'name' => $token->value,
-                        // @var bool Whether it contains an equal sign.
-                        //           This is used by the builder to rebuild it.
-                        'equals' => $lastOption[1] === 'var=',
-                        // @var string Raw value.
-                        'expr' => '',
-                        // @var string Processed value.
-                        'value' => '',
-                    );
-                    $state = 1;
-                } elseif ($lastOption[1] === 'expr'  || $lastOption[1] === 'expr=') {
-                    // This is a keyword that is followed by an expression.
-                    // The expression is used by the specialized parser.
-
-                    // Skipping this option in order to parse the expression.
-                    ++$list->idx;
-                    $ret->options[$lastOptionId] = array(
-                        // @var string The name of the option.
-                        'name' => $token->value,
-                        // @var bool Whether it contains an equal sign.
-                        //           This is used by the builder to rebuild it.
-                        'equals' => $lastOption[1] === 'expr=',
-                        // @var Expression The parsed expression.
-                        'expr' => '',
-                    );
-                    $state = 1;
-                }
-            } elseif ($state === 1) {
-                $state = 2;
-                if ($token->token === '=') {
-                    $ret->options[$lastOptionId]['equals'] = true;
-                    continue;
-                }
-            }
-
-            // This is outside the `elseif` group above because the change might
-            // change this iteration.
-            if ($state === 2) {
-                if ($lastOption[1] === 'expr' || $lastOption[1] === 'expr=') {
-                    $ret->options[$lastOptionId]['expr'] = Expression::parse(
-                        $parser,
-                        $list,
-                        empty($lastOption[2]) ? array() : $lastOption[2]
-                    );
-                    $ret->options[$lastOptionId]['value']
-                        = $ret->options[$lastOptionId]['expr']->expr;
-                    $lastOption = null;
-                    $state = 0;
-                } else {
-                    if ($token->token === '(') {
-                        ++$brackets;
-                    } elseif ($token->token === ')') {
-                        --$brackets;
-                    }
-
-                    $ret->options[$lastOptionId]['expr'] .= $token->token;
-
-                    if (!((($token->token === '(') && ($brackets === 1))
-                        || (($token->token === ')') && ($brackets === 0)))
-                    ) {
-                        // First pair of brackets is being skipped.
-                        $ret->options[$lastOptionId]['value'] .= $token->value;
-                    }
-
-                    // Checking if we finished parsing.
-                    if ($brackets === 0) {
-                        $lastOption = null;
-                    }
-                }
-            }
-        }
-
-        /*
-         * We reached the end of statement without getting a value
-         * for an option for which a value was required
-         */
-        if ($state === 1
-            && $lastOption
-            && ($lastOption[1] == 'expr'
-            || $lastOption[1] == 'var'
-            || $lastOption[1] == 'var='
-            || $lastOption[1] == 'expr=')
-        ) {
-            $parser->error(
-                sprintf(
-                    __('Value/Expression for the option %1$s was expected'),
-                    $ret->options[$lastOptionId]['name']
-                ),
-                $list->tokens[$list->idx - 1]
-            );
-        }
-
-        if (empty($options['_UNSORTED'])) {
-            ksort($ret->options);
-        }
-
-        --$list->idx;
-        return $ret;
-    }
-
-    /**
-     * @param OptionsArray $component The component to be built.
-     * @param array        $options   Parameters for building.
-     *
-     * @return string
-     */
-    public static function build($component, array $options = array())
-    {
-        if (empty($component->options)) {
-            return '';
-        }
-
-        $options = array();
-        foreach ($component->options as $option) {
-            if (!is_array($option)) {
-                $options[] = $option;
-            } else {
-                $options[] = $option['name']
-                    . ((!empty($option['equals']) && $option['equals']) ? '=' : ' ')
-                    . (!empty($option['expr']) ? $option['expr'] : $option['value']);
-            }
-        }
-        return implode(' ', $options);
-    }
-
-    /**
-     * Checks if it has the specified option and returns it value or true.
-     *
-     * @param string $key     The key to be checked.
-     * @param bool   $getExpr Gets the expression instead of the value.
-     *                        The value is the processed form of the expression.
-     *
-     * @return mixed
-     */
-    public function has($key, $getExpr = false)
-    {
-        foreach ($this->options as $option) {
-            if (is_array($option)) {
-                if (!strcasecmp($key, $option['name'])) {
-                    return $getExpr ? $option['expr'] : $option['value'];
-                }
-            } elseif (!strcasecmp($key, $option)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Removes the option from the array.
-     *
-     * @param string $key The key to be removed.
-     *
-     * @return bool Whether the key was found and deleted or not.
-     */
-    public function remove($key)
-    {
-        foreach ($this->options as $idx => $option) {
-            if (is_array($option)) {
-                if (!strcasecmp($key, $option['name'])) {
-                    unset($this->options[$idx]);
-                    return true;
-                }
-            } elseif (!strcasecmp($key, $option)) {
-                unset($this->options[$idx]);
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Merges the specified options with these ones. Values with same ID will be
-     * replaced.
-     *
-     * @param array|OptionsArray $options The options to be merged.
-     *
-     * @return void
-     */
-    public function merge($options)
-    {
-        if (is_array($options)) {
-            $this->options = array_merge_recursive($this->options, $options);
-        } elseif ($options instanceof OptionsArray) {
-            $this->options = array_merge_recursive($this->options, $options->options);
-        }
-    }
-
-    /**
-     * Checks tf there are no options set.
-     *
-     * @return bool
-     */
-    public function isEmpty()
-    {
-        return empty($this->options);
-    }
-}
diff --git a/#pma/libraries/sql-parser/src/Components/OrderKeyword.php b/#pma/libraries/sql-parser/src/Components/OrderKeyword.php
deleted file mode 100644
index ba773a84..00000000
--- a/#pma/libraries/sql-parser/src/Components/OrderKeyword.php
+++ /dev/null
@@ -1,144 +0,0 @@
-<?php
-
-/**
- * `ORDER BY` keyword parser.
- *
- * @package    SqlParser
- * @subpackage Components
- */
-namespace SqlParser\Components;
-
-use SqlParser\Component;
-use SqlParser\Parser;
-use SqlParser\Token;
-use SqlParser\TokensList;
-
-/**
- * `ORDER BY` keyword parser.
- *
- * @category   Keywords
- * @package    SqlParser
- * @subpackage Components
- * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-class OrderKeyword extends Component
-{
-
-    /**
-     * The expression that is used for ordering.
-     *
-     * @var Expression
-     */
-    public $expr;
-
-    /**
-     * The order type.
-     *
-     * @var string
-     */
-    public $type;
-
-    /**
-     * Constructor.
-     *
-     * @param Expression $expr The expression that we are sorting by.
-     * @param string     $type The sorting type.
-     */
-    public function __construct($expr = null, $type = 'ASC')
-    {
-        $this->expr = $expr;
-        $this->type = $type;
-    }
-
-    /**
-     * @param Parser     $parser  The parser that serves as context.
-     * @param TokensList $list    The list of tokens that are being parsed.
-     * @param array      $options Parameters for parsing.
-     *
-     * @return OrderKeyword[]
-     */
-    public static function parse(Parser $parser, TokensList $list, array $options = array())
-    {
-        $ret = array();
-
-        $expr = new OrderKeyword();
-
-        /**
-         * The state of the parser.
-         *
-         * Below are the states of the parser.
-         *
-         *      0 --------------------[ expression ]-------------------> 1
-         *
-         *      1 ------------------------[ , ]------------------------> 0
-         *      1 -------------------[ ASC / DESC ]--------------------> 1
-         *
-         * @var int $state
-         */
-        $state = 0;
-
-        for (; $list->idx < $list->count; ++$list->idx) {
-            /**
-             * Token parsed at this moment.
-             *
-             * @var Token $token
-             */
-            $token = $list->tokens[$list->idx];
-
-            // End of statement.
-            if ($token->type === Token::TYPE_DELIMITER) {
-                break;
-            }
-
-            // Skipping whitespaces and comments.
-            if (($token->type === Token::TYPE_WHITESPACE) || ($token->type === Token::TYPE_COMMENT)) {
-                continue;
-            }
-
-            if ($state === 0) {
-                $expr->expr = Expression::parse($parser, $list);
-                $state = 1;
-            } elseif ($state === 1) {
-                if (($token->type === Token::TYPE_KEYWORD)
-                    && (($token->value === 'ASC') || ($token->value === 'DESC'))
-                ) {
-                    $expr->type = $token->value;
-                } elseif (($token->type === Token::TYPE_OPERATOR)
-                    && ($token->value === ',')
-                ) {
-                    if (!empty($expr->expr)) {
-                        $ret[] = $expr;
-                    }
-                    $expr = new OrderKeyword();
-                    $state = 0;
-                } else {
-                    break;
-                }
-            }
-
-        }
-
-        // Last iteration was not processed.
-        if (!empty($expr->expr)) {
-            $ret[] = $expr;
-        }
-
-        --$list->idx;
-        return $ret;
-    }
-
-    /**
-     * @param OrderKeyword|OrderKeyword[] $component The component to be built.
-     * @param array                       $options   Parameters for building.
-     *
-     * @return string
-     */
-    public static function build($component, array $options = array())
-    {
-        if (is_array($component)) {
-            return implode(', ', $component);
-        } else {
-            return $component->expr . ' ' . $component->type;
-        }
-    }
-}
diff --git a/#pma/libraries/sql-parser/src/Components/ParameterDefinition.php b/#pma/libraries/sql-parser/src/Components/ParameterDefinition.php
deleted file mode 100644
index 274555e9..00000000
--- a/#pma/libraries/sql-parser/src/Components/ParameterDefinition.php
+++ /dev/null
@@ -1,160 +0,0 @@
-<?php
-
-/**
- * The definition of a parameter of a function or procedure.
- *
- * @package    SqlParser
- * @subpackage Components
- */
-namespace SqlParser\Components;
-
-use SqlParser\Context;
-use SqlParser\Component;
-use SqlParser\Parser;
-use SqlParser\Token;
-use SqlParser\TokensList;
-
-/**
- * The definition of a parameter of a function or procedure.
- *
- * @category   Components
- * @package    SqlParser
- * @subpackage Components
- * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-class ParameterDefinition extends Component
-{
-
-    /**
-     * The name of the new column.
-     *
-     * @var string
-     */
-    public $name;
-
-    /**
-     * Parameter's direction (IN, OUT or INOUT).
-     *
-     * @var string
-     */
-    public $inOut;
-
-    /**
-     * The data type of thew new column.
-     *
-     * @var DataType
-     */
-    public $type;
-
-    /**
-     * @param Parser     $parser  The parser that serves as context.
-     * @param TokensList $list    The list of tokens that are being parsed.
-     * @param array      $options Parameters for parsing.
-     *
-     * @return ParameterDefinition[]
-     */
-    public static function parse(Parser $parser, TokensList $list, array $options = array())
-    {
-        $ret = array();
-
-        $expr = new ParameterDefinition();
-
-        /**
-         * The state of the parser.
-         *
-         * Below are the states of the parser.
-         *
-         *      0 -----------------------[ ( ]------------------------> 1
-         *
-         *      1 ----------------[ IN / OUT / INOUT ]----------------> 1
-         *      1 ----------------------[ name ]----------------------> 2
-         *
-         *      2 -------------------[ data type ]--------------------> 3
-         *
-         *      3 ------------------------[ , ]-----------------------> 1
-         *      3 ------------------------[ ) ]-----------------------> (END)
-         *
-         * @var int $state
-         */
-        $state = 0;
-
-        for (; $list->idx < $list->count; ++$list->idx) {
-            /**
-             * Token parsed at this moment.
-             *
-             * @var Token $token
-             */
-            $token = $list->tokens[$list->idx];
-
-            // End of statement.
-            if ($token->type === Token::TYPE_DELIMITER) {
-                break;
-            }
-
-            // Skipping whitespaces and comments.
-            if (($token->type === Token::TYPE_WHITESPACE) || ($token->type === Token::TYPE_COMMENT)) {
-                continue;
-            }
-
-            if ($state === 0) {
-                if (($token->type === Token::TYPE_OPERATOR) && ($token->value === '(')) {
-                    $state = 1;
-                }
-                continue;
-            } elseif ($state === 1) {
-                if (($token->value === 'IN') || ($token->value === 'OUT') || ($token->value === 'INOUT')) {
-                    $expr->inOut = $token->value;
-                    ++$list->idx;
-                } elseif ($token->value === ')') {
-                    ++$list->idx;
-                    break;
-                } else {
-                    $expr->name = $token->value;
-                    $state = 2;
-                }
-            } elseif ($state === 2) {
-                $expr->type = DataType::parse($parser, $list);
-                $state = 3;
-            } elseif ($state === 3) {
-                $ret[] = $expr;
-                $expr = new ParameterDefinition();
-                if ($token->value === ',') {
-                    $state = 1;
-                } elseif ($token->value === ')') {
-                    ++$list->idx;
-                    break;
-                }
-            }
-        }
-
-        // Last iteration was not saved.
-        if ((isset($expr->name)) && ($expr->name !== '')) {
-            $ret[] = $expr;
-        }
-
-        --$list->idx;
-        return $ret;
-    }
-
-    /**
-     * @param ParameterDefinition[] $component The component to be built.
-     * @param array                 $options   Parameters for building.
-     *
-     * @return string
-     */
-    public static function build($component, array $options = array())
-    {
-        if (is_array($component)) {
-            return '(' . implode(', ', $component) . ')';
-        } else {
-            $tmp = '';
-            if (!empty($component->inOut)) {
-                $tmp .= $component->inOut . ' ';
-            }
-
-            return trim(
-                $tmp . Context::escape($component->name) . ' ' . $component->type
-            );
-        }
-    }
-}
diff --git a/#pma/libraries/sql-parser/src/Components/PartitionDefinition.php b/#pma/libraries/sql-parser/src/Components/PartitionDefinition.php
deleted file mode 100644
index 33c36928..00000000
--- a/#pma/libraries/sql-parser/src/Components/PartitionDefinition.php
+++ /dev/null
@@ -1,223 +0,0 @@
-<?php
-
-/**
- * Parses the create definition of a partition.
- *
- * Used for parsing `CREATE TABLE` statement.
- *
- * @package    SqlParser
- * @subpackage Components
- */
-namespace SqlParser\Components;
-
-use SqlParser\Component;
-use SqlParser\Parser;
-use SqlParser\Token;
-use SqlParser\TokensList;
-
-/**
- * Parses the create definition of a partition.
- *
- * Used for parsing `CREATE TABLE` statement.
- *
- * @category   Components
- * @package    SqlParser
- * @subpackage Components
- * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-class PartitionDefinition extends Component
-{
-
-    /**
-     * All field options.
-     *
-     * @var array
-     */
-    public static $OPTIONS = array(
-        'STORAGE ENGINE'                => array(1, 'var'),
-        'ENGINE'                        => array(1, 'var'),
-        'COMMENT'                       => array(2, 'var'),
-        'DATA DIRECTORY'                => array(3, 'var'),
-        'INDEX DIRECTORY'               => array(4, 'var'),
-        'MAX_ROWS'                      => array(5, 'var'),
-        'MIN_ROWS'                      => array(6, 'var'),
-        'TABLESPACE'                    => array(7, 'var'),
-        'NODEGROUP'                     => array(8, 'var'),
-    );
-
-    /**
-     * Whether this entry is a subpartition or a partition.
-     *
-     * @var bool
-     */
-    public $isSubpartition;
-
-    /**
-     * The name of this partition.
-     *
-     * @var string
-     */
-    public $name;
-
-    /**
-     * The type of this partition (what follows the `VALUES` keyword).
-     *
-     * @var string
-     */
-    public $type;
-
-    /**
-     * The expression used to defined this partition.
-     *
-     * @var Expression|string
-     */
-    public $expr;
-
-    /**
-     * The subpartitions of this partition.
-     *
-     * @var PartitionDefinition[]
-     */
-    public $subpartitions;
-
-    /**
-     * The options of this field.
-     *
-     * @var OptionsArray
-     */
-    public $options;
-
-    /**
-     * @param Parser     $parser  The parser that serves as context.
-     * @param TokensList $list    The list of tokens that are being parsed.
-     * @param array      $options Parameters for parsing.
-     *
-     * @return PartitionDefinition
-     */
-    public static function parse(Parser $parser, TokensList $list, array $options = array())
-    {
-        $ret = new PartitionDefinition();
-
-        /**
-         * The state of the parser.
-         *
-         * Below are the states of the parser.
-         *
-         *      0 -------------[ PARTITION | SUBPARTITION ]------------> 1
-         *
-         *      1 -----------------------[ name ]----------------------> 2
-         *
-         *      2 ----------------------[ VALUES ]---------------------> 3
-         *
-         *      3 ---------------------[ LESS THAN ]-------------------> 4
-         *      3 ------------------------[ IN ]-----------------------> 4
-         *
-         *      4 -----------------------[ expr ]----------------------> 5
-         *
-         *      5 ----------------------[ options ]--------------------> 6
-         *
-         *      6 ------------------[ subpartitions ]------------------> (END)
-         *
-         * @var int $state
-         */
-        $state = 0;
-
-        for (; $list->idx < $list->count; ++$list->idx) {
-            /**
-             * Token parsed at this moment.
-             *
-             * @var Token $token
-             */
-            $token = $list->tokens[$list->idx];
-
-            // End of statement.
-            if ($token->type === Token::TYPE_DELIMITER) {
-                break;
-            }
-
-            // Skipping whitespaces and comments.
-            if (($token->type === Token::TYPE_WHITESPACE) || ($token->type === Token::TYPE_COMMENT)) {
-                continue;
-            }
-
-            if ($state === 0) {
-                $ret->isSubpartition = ($token->type === Token::TYPE_KEYWORD) && ($token->value === 'SUBPARTITION');
-                $state = 1;
-            } elseif ($state === 1) {
-                $ret->name = $token->value;
-
-                // Looking ahead for a 'VALUES' keyword.
-                $idx = $list->idx;
-                $list->getNext();
-                $nextToken = $list->getNext();
-                $list->idx = $idx;
-
-                $state = ($nextToken->type === Token::TYPE_KEYWORD)
-                    && ($nextToken->value === 'VALUES')
-                    ? 2 : 5;
-            } elseif ($state === 2) {
-                $state = 3;
-            } elseif ($state === 3) {
-                $ret->type = $token->value;
-                $state = 4;
-            } elseif ($state === 4) {
-                if ($token->value === 'MAXVALUE') {
-                    $ret->expr = $token->value;
-                } else {
-                    $ret->expr = Expression::parse(
-                        $parser,
-                        $list,
-                        array(
-                            'parenthesesDelimited' => true,
-                            'breakOnAlias' => true,
-                        )
-                    );
-                }
-                $state = 5;
-            } elseif ($state === 5) {
-                $ret->options = OptionsArray::parse($parser, $list, static::$OPTIONS);
-                $state = 6;
-            } elseif ($state === 6) {
-                if (($token->type === Token::TYPE_OPERATOR) && ($token->value === '(')) {
-                    $ret->subpartitions = ArrayObj::parse(
-                        $parser,
-                        $list,
-                        array(
-                            'type' => 'SqlParser\\Components\\PartitionDefinition'
-                        )
-                    );
-                    ++$list->idx;
-                }
-                break;
-            }
-        }
-
-        --$list->idx;
-        return $ret;
-    }
-
-    /**
-     * @param PartitionDefinition|PartitionDefinition[] $component The component to be built.
-     * @param array                                     $options   Parameters for building.
-     *
-     * @return string
-     */
-    public static function build($component, array $options = array())
-    {
-        if (is_array($component)) {
-            return "(\n" . implode(",\n", $component) . "\n)";
-        } else {
-            if ($component->isSubpartition) {
-                return trim('SUBPARTITION ' . $component->name . ' ' . $component->options);
-            } else {
-                $subpartitions = empty($component->subpartitions)
-                    ? '' : ' ' . PartitionDefinition::build($component->subpartitions);
-                return trim(
-                    'PARTITION ' . $component->name
-                    . (empty($component->type) ? '' : ' VALUES ' . $component->type . ' ' . $component->expr . ' ')
-                    . $component->options . $subpartitions
-                );
-            }
-        }
-    }
-}
diff --git a/#pma/libraries/sql-parser/src/Components/Reference.php b/#pma/libraries/sql-parser/src/Components/Reference.php
deleted file mode 100644
index 24d633ca..00000000
--- a/#pma/libraries/sql-parser/src/Components/Reference.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php
-
-/**
- * `REFERENCES` keyword parser.
- *
- * @package    SqlParser
- * @subpackage Components
- */
-namespace SqlParser\Components;
-
-use SqlParser\Context;
-use SqlParser\Component;
-use SqlParser\Parser;
-use SqlParser\Token;
-use SqlParser\TokensList;
-
-/**
- * `REFERENCES` keyword parser.
- *
- * @category   Keywords
- * @package    SqlParser
- * @subpackage Components
- * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-class Reference extends Component
-{
-
-    /**
-     * All references options.
-     *
-     * @var array
-     */
-    public static $REFERENCES_OPTIONS = array(
-        'MATCH'                         => array(1, 'var'),
-        'ON DELETE'                     => array(2, 'var'),
-        'ON UPDATE'                     => array(3, 'var'),
-    );
-
-    /**
-     * The referenced table.
-     *
-     * @var Expression
-     */
-    public $table;
-
-    /**
-     * The referenced columns.
-     *
-     * @var array
-     */
-    public $columns;
-
-    /**
-     * The options of the referencing.
-     *
-     * @var OptionsArray
-     */
-    public $options;
-
-    /**
-     * Constructor.
-     *
-     * @param Expression   $table   The name of the table referenced.
-     * @param array        $columns The columns referenced.
-     * @param OptionsArray $options The options.
-     */
-    public function __construct($table = null, array $columns = array(), $options = null)
-    {
-        $this->table = $table;
-        $this->columns = $columns;
-        $this->options = $options;
-    }
-
-    /**
-     * @param Parser     $parser  The parser that serves as context.
-     * @param TokensList $list    The list of tokens that are being parsed.
-     * @param array      $options Parameters for parsing.
-     *
-     * @return Reference
-     */
-    public static function parse(Parser $parser, TokensList $list, array $options = array())
-    {
-        $ret = new Reference();
-
-        /**
-         * The state of the parser.
-         *
-         * Below are the states of the parser.
-         *
-         *      0 ----------------------[ table ]---------------------> 1
-         *
-         *      1 ---------------------[ columns ]--------------------> 2
-         *
-         *      2 ---------------------[ options ]--------------------> (END)
-         *
-         * @var int $state
-         */
-        $state = 0;
-
-        for (; $list->idx < $list->count; ++$list->idx) {
-            /**
-             * Token parsed at this moment.
-             *
-             * @var Token $token
-             */
-            $token = $list->tokens[$list->idx];
-
-            // End of statement.
-            if ($token->type === Token::TYPE_DELIMITER) {
-                break;
-            }
-
-            // Skipping whitespaces and comments.
-            if (($token->type === Token::TYPE_WHITESPACE) || ($token->type === Token::TYPE_COMMENT)) {
-                continue;
-            }
-
-            if ($state === 0) {
-                $ret->table = Expression::parse(
-                    $parser,
-                    $list,
-                    array(
-                        'parseField' => 'table',
-                        'breakOnAlias' => true,
-                    )
-                );
-                $state = 1;
-            } elseif ($state === 1) {
-                $ret->columns = ArrayObj::parse($parser, $list)->values;
-                $state = 2;
-            } elseif ($state === 2) {
-                $ret->options = OptionsArray::parse($parser, $list, static::$REFERENCES_OPTIONS);
-                ++$list->idx;
-                break;
-            }
-
-        }
-
-        --$list->idx;
-        return $ret;
-    }
-
-    /**
-     * @param Reference $component The component to be built.
-     * @param array     $options   Parameters for building.
-     *
-     * @return string
-     */
-    public static function build($component, array $options = array())
-    {
-        return trim(
-            $component->table
-            . ' (' . implode(', ', Context::escape($component->columns)) . ') '
-            . $component->options
-        );
-    }
-}
diff --git a/#pma/libraries/sql-parser/src/Components/RenameOperation.php b/#pma/libraries/sql-parser/src/Components/RenameOperation.php
deleted file mode 100644
index 291bd430..00000000
--- a/#pma/libraries/sql-parser/src/Components/RenameOperation.php
+++ /dev/null
@@ -1,173 +0,0 @@
-<?php
-
-/**
- * `RENAME TABLE` keyword parser.
- *
- * @package    SqlParser
- * @subpackage Components
- */
-namespace SqlParser\Components;
-
-use SqlParser\Component;
-use SqlParser\Parser;
-use SqlParser\Token;
-use SqlParser\TokensList;
-
-/**
- * `RENAME TABLE` keyword parser.
- *
- * @category   Keywords
- * @package    SqlParser
- * @subpackage Components
- * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-class RenameOperation extends Component
-{
-
-    /**
-     * The old table name.
-     *
-     * @var Expression
-     */
-    public $old;
-
-    /**
-     * The new table name.
-     *
-     * @var Expression
-     */
-    public $new;
-
-    /**
-     * @param Parser     $parser  The parser that serves as context.
-     * @param TokensList $list    The list of tokens that are being parsed.
-     * @param array      $options Parameters for parsing.
-     *
-     * @return RenameOperation[]
-     */
-    public static function parse(Parser $parser, TokensList $list, array $options = array())
-    {
-        $ret = array();
-
-        $expr = new RenameOperation();
-
-        /**
-         * The state of the parser.
-         *
-         * Below are the states of the parser.
-         *
-         *      0 ---------------------[ old name ]--------------------> 1
-         *
-         *      1 ------------------------[ TO ]-----------------------> 2
-         *
-         *      2 ---------------------[ old name ]--------------------> 3
-         *
-         *      3 ------------------------[ , ]------------------------> 0
-         *      3 -----------------------[ else ]----------------------> (END)
-         *
-         * @var int $state
-         */
-        $state = 0;
-
-        for (; $list->idx < $list->count; ++$list->idx) {
-            /**
-             * Token parsed at this moment.
-             *
-             * @var Token $token
-             */
-            $token = $list->tokens[$list->idx];
-
-            // End of statement.
-            if ($token->type === Token::TYPE_DELIMITER) {
-                break;
-            }
-
-            // Skipping whitespaces and comments.
-            if (($token->type === Token::TYPE_WHITESPACE) || ($token->type === Token::TYPE_COMMENT)) {
-                continue;
-            }
-
-            if ($state === 0) {
-                $expr->old = Expression::parse(
-                    $parser,
-                    $list,
-                    array(
-                        'breakOnAlias' => true,
-                        'parseField' => 'table',
-                    )
-                );
-                if (empty($expr->old)) {
-                    $parser->error(
-                        __('The old name of the table was expected.'),
-                        $token
-                    );
-                }
-                $state = 1;
-            } elseif ($state === 1) {
-                if (($token->type === Token::TYPE_KEYWORD) && ($token->value === 'TO')) {
-                    $state = 2;
-                } else {
-                    $parser->error(
-                        __('Keyword "TO" was expected.'),
-                        $token
-                    );
-                    break;
-                }
-            } elseif ($state === 2) {
-                $expr->new = Expression::parse(
-                    $parser,
-                    $list,
-                    array(
-                        'breakOnAlias' => true,
-                        'parseField' => 'table',
-                    )
-                );
-                if (empty($expr->new)) {
-                    $parser->error(
-                        __('The new name of the table was expected.'),
-                        $token
-                    );
-                }
-                $state = 3;
-            } elseif ($state === 3) {
-                if (($token->type === Token::TYPE_OPERATOR) && ($token->value === ',')) {
-                    $ret[] = $expr;
-                    $expr = new RenameOperation();
-                    $state = 0;
-                } else {
-                    break;
-                }
-            }
-        }
-
-        if ($state !== 3) {
-            $parser->error(
-                __('A rename operation was expected.'),
-                $list->tokens[$list->idx - 1]
-            );
-        }
-
-        // Last iteration was not saved.
-        if (!empty($expr->old)) {
-            $ret[] = $expr;
-        }
-
-        --$list->idx;
-        return $ret;
-    }
-
-    /**
-     * @param RenameOperation $component The component to be built.
-     * @param array           $options   Parameters for building.
-     *
-     * @return string
-     */
-    public static function build($component, array $options = array())
-    {
-        if (is_array($component)) {
-            return implode(', ', $component);
-        } else {
-            return $component->old . ' TO ' . $component->new;
-        }
-    }
-}
diff --git a/#pma/libraries/sql-parser/src/Components/SetOperation.php b/#pma/libraries/sql-parser/src/Components/SetOperation.php
deleted file mode 100644
index 0a1a54ca..00000000
--- a/#pma/libraries/sql-parser/src/Components/SetOperation.php
+++ /dev/null
@@ -1,137 +0,0 @@
-<?php
-
-/**
- * `SET` keyword parser.
- *
- * @package    SqlParser
- * @subpackage Components
- */
-namespace SqlParser\Components;
-
-use SqlParser\Component;
-use SqlParser\Parser;
-use SqlParser\Token;
-use SqlParser\TokensList;
-
-/**
- * `SET` keyword parser.
- *
- * @category   Keywords
- * @package    SqlParser
- * @subpackage Components
- * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-class SetOperation extends Component
-{
-
-    /**
-     * The name of the column that is being updated.
-     *
-     * @var string
-     */
-    public $column;
-
-    /**
-     * The new value.
-     *
-     * @var string
-     */
-    public $value;
-
-    /**
-     * @param Parser     $parser  The parser that serves as context.
-     * @param TokensList $list    The list of tokens that are being parsed.
-     * @param array      $options Parameters for parsing.
-     *
-     * @return SetOperation[]
-     */
-    public static function parse(Parser $parser, TokensList $list, array $options = array())
-    {
-        $ret = array();
-
-        $expr = new SetOperation();
-
-        /**
-         * The state of the parser.
-         *
-         * Below are the states of the parser.
-         *
-         *      0 -------------------[ column name ]-------------------> 1
-         *
-         *      1 ------------------------[ , ]------------------------> 0
-         *      1 ----------------------[ value ]----------------------> 1
-         *
-         * @var int $state
-         */
-        $state = 0;
-
-        for (; $list->idx < $list->count; ++$list->idx) {
-            /**
-             * Token parsed at this moment.
-             *
-             * @var Token $token
-             */
-            $token = $list->tokens[$list->idx];
-
-            // End of statement.
-            if ($token->type === Token::TYPE_DELIMITER) {
-                break;
-            }
-
-            // Skipping whitespaces and comments.
-            if (($token->type === Token::TYPE_WHITESPACE) || ($token->type === Token::TYPE_COMMENT)) {
-                continue;
-            }
-
-            // No keyword is expected.
-            if (($token->type === Token::TYPE_KEYWORD)
-                && ($token->flags & Token::FLAG_KEYWORD_RESERVED)
-                && ($state == 0)
-            ) {
-                break;
-            }
-
-            if ($state === 0) {
-                if ($token->token === '=') {
-                    $state = 1;
-                } elseif ($token->value !== ',') {
-                    $expr->column .= $token->token;
-                }
-            } elseif ($state === 1) {
-                $tmp = Expression::parse(
-                    $parser,
-                    $list,
-                    array(
-                        'breakOnAlias' => true,
-                    )
-                );
-                if ($tmp == null) {
-                    break;
-                }
-                $expr->column = trim($expr->column);
-                $expr->value = $tmp->expr;
-                $ret[] = $expr;
-                $expr = new SetOperation();
-                $state = 0;
-            }
-        }
-
-        --$list->idx;
-        return $ret;
-    }
-
-    /**
-     * @param SetOperation|SetOperation[] $component The component to be built.
-     * @param array                       $options   Parameters for building.
-     *
-     * @return string
-     */
-    public static function build($component, array $options = array())
-    {
-        if (is_array($component)) {
-            return implode(', ', $component);
-        } else {
-            return $component->column . ' = ' . $component->value;
-        }
-    }
-}
diff --git a/#pma/libraries/sql-parser/src/Components/UnionKeyword.php b/#pma/libraries/sql-parser/src/Components/UnionKeyword.php
deleted file mode 100644
index 138a79e5..00000000
--- a/#pma/libraries/sql-parser/src/Components/UnionKeyword.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * `UNION` keyword builder.
- *
- * @package    SqlParser
- * @subpackage Components
- */
-namespace SqlParser\Components;
-
-use SqlParser\Component;
-use SqlParser\Statements\SelectStatement;
-
-/**
- * `UNION` keyword builder.
- *
- * @category   Keywords
- * @package    SqlParser
- * @subpackage Components
- * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-class UnionKeyword extends Component
-{
-
-    /**
-     * @param SelectStatement[] $component The component to be built.
-     * @param array             $options   Parameters for building.
-     *
-     * @return string
-     */
-    public static function build($component, array $options = array())
-    {
-        $tmp = array();
-        foreach ($component as $component) {
-            $tmp[] = $component[0] . ' ' . $component[1];
-        }
-        return implode(' ', $tmp);
-    }
-}
diff --git a/#pma/libraries/sql-parser/src/Context.php b/#pma/libraries/sql-parser/src/Context.php
deleted file mode 100644
index 3685857b..00000000
--- a/#pma/libraries/sql-parser/src/Context.php
+++ /dev/null
@@ -1,554 +0,0 @@
-<?php
-
-/**
- * Defines a context class that is later extended to define other contexts.
- *
- * A context is a collection of keywords, operators and functions used for
- * parsing.
- *
- * @package SqlParser
- */
-namespace SqlParser;
-
-/**
- * Holds the configuration of the context that is currently used.
- *
- * @category Contexts
- * @package  SqlParser
- * @license  https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-abstract class Context
-{
-
-    /**
-     * The maximum length of a keyword.
-     *
-     * @see static::$TOKEN_KEYWORD
-     *
-     * @var int
-     */
-    const KEYWORD_MAX_LENGTH = 30;
-
-    /**
-     * The maximum length of a label.
-     *
-     * @see static::$TOKEN_LABEL
-     * Ref: https://dev.mysql.com/doc/refman/5.7/en/statement-labels.html
-     *
-     * @var int
-     */
-    const LABEL_MAX_LENGTH = 16;
-
-    /**
-     * The maximum length of an operator.
-     *
-     * @see static::$TOKEN_OPERATOR
-     *
-     * @var int
-     */
-    const OPERATOR_MAX_LENGTH = 4;
-
-    /**
-     * The name of the default content.
-     *
-     * @var string
-     */
-    public static $defaultContext = '\\SqlParser\\Contexts\\ContextMySql50700';
-
-    /**
-     * The name of the loaded context.
-     *
-     * @var string
-     */
-    public static $loadedContext = '\\SqlParser\\Contexts\\ContextMySql50700';
-
-    /**
-     * The prefix concatenated to the context name when an incomplete class name
-     * is specified.
-     *
-     * @var string
-     */
-    public static $contextPrefix = '\\SqlParser\\Contexts\\Context';
-
-    /**
-     * List of keywords.
-     *
-     * Because, PHP's associative arrays are basically hash tables, it is more
-     * efficient to store keywords as keys instead of values.
-     *
-     * The value associated to each keyword represents its flags.
-     *
-     * @see Token::FLAG_KEYWORD_*
-     *
-     * Elements are sorted by flags, length and keyword.
-     *
-     * @var array
-     */
-    public static $KEYWORDS = array();
-
-    /**
-     * List of operators and their flags.
-     *
-     * @var array
-     */
-    public static $OPERATORS = array(
-
-        // Some operators (*, =) may have ambiguous flags, because they depend on
-        // the context they are being used in.
-        // For example: 1. SELECT * FROM table; # SQL specific (wildcard)
-        //                 SELECT 2 * 3;        # arithmetic
-        //              2. SELECT * FROM table WHERE foo = 'bar';
-        //                 SET @i = 0;
-
-        // @see Token::FLAG_OPERATOR_ARITHMETIC
-        '%'   =>  1, '*'   =>  1, '+'    =>  1, '-'   =>  1, '/'   =>  1,
-
-        // @see Token::FLAG_OPERATOR_LOGICAL
-        '!'   =>  2, '!='   =>  2, '&&'  =>  2, '<'   =>  2, '<='  =>  2,
-        '<=>' =>  2, '<>'   =>  2, '='   =>  2, '>'   =>  2, '>='  =>  2,
-        '||'  =>  2,
-
-        // @see Token::FLAG_OPERATOR_BITWISE
-        '&'   =>  4, '<<'   =>  4, '>>'  =>  4, '^'   =>  4, '|'   =>  4,
-        '~'   =>  4,
-
-        // @see Token::FLAG_OPERATOR_ASSIGNMENT
-        ':='  =>  8,
-
-        // @see Token::FLAG_OPERATOR_SQL
-        '('   => 16, ')'    => 16, '.'   => 16,  ','  => 16, ';' => 16,
-    );
-
-    /**
-     * The mode of the MySQL server that will be used in lexing, parsing and
-     * building the statements.
-     *
-     * @var int
-     */
-    public static $MODE = 0;
-
-    /*
-     * Server SQL Modes
-     * https://dev.mysql.com/doc/refman/5.0/en/sql-mode.html
-     */
-
-    // Compatibility mode for Microsoft's SQL server.
-    // This is the equivalent of ANSI_QUOTES.
-    const COMPAT_MYSQL                  =       2;
-
-    // https://dev.mysql.com/doc/refman/5.0/en/sql-mode.html#sqlmode_allow_invalid_dates
-    const ALLOW_INVALID_DATES           =       1;
-
-    // https://dev.mysql.com/doc/refman/5.0/en/sql-mode.html#sqlmode_ansi_quotes
-    const ANSI_QUOTES                   =       2;
-
-    // https://dev.mysql.com/doc/refman/5.0/en/sql-mode.html#sqlmode_error_for_division_by_zero
-    const ERROR_FOR_DIVISION_BY_ZERO    =       4;
-
-    // https://dev.mysql.com/doc/refman/5.0/en/sql-mode.html#sqlmode_high_not_precedence
-    const HIGH_NOT_PRECEDENCE           =       8;
-
-    // https://dev.mysql.com/doc/refman/5.0/en/sql-mode.html#sqlmode_ignore_space
-    const IGNORE_SPACE                  =      16;
-
-    // https://dev.mysql.com/doc/refman/5.0/en/sql-mode.html#sqlmode_no_auto_create_user
-    const NO_AUTO_CREATE_USER           =      32;
-
-    // https://dev.mysql.com/doc/refman/5.0/en/sql-mode.html#sqlmode_no_auto_value_on_zero
-    const NO_AUTO_VALUE_ON_ZERO         =      64;
-
-    // https://dev.mysql.com/doc/refman/5.0/en/sql-mode.html#sqlmode_no_backslash_escapes
-    const NO_BACKSLASH_ESCAPES          =     128;
-
-    // https://dev.mysql.com/doc/refman/5.0/en/sql-mode.html#sqlmode_no_dir_in_create
-    const NO_DIR_IN_CREATE              =     256;
-
-    // https://dev.mysql.com/doc/refman/5.0/en/sql-mode.html#sqlmode_no_dir_in_create
-    const NO_ENGINE_SUBSTITUTION        =     512;
-
-    // https://dev.mysql.com/doc/refman/5.0/en/sql-mode.html#sqlmode_no_field_options
-    const NO_FIELD_OPTIONS              =    1024;
-
-    // https://dev.mysql.com/doc/refman/5.0/en/sql-mode.html#sqlmode_no_key_options
-    const NO_KEY_OPTIONS                =    2048;
-
-    // https://dev.mysql.com/doc/refman/5.0/en/sql-mode.html#sqlmode_no_table_options
-    const NO_TABLE_OPTIONS              =    4096;
-
-    // https://dev.mysql.com/doc/refman/5.0/en/sql-mode.html#sqlmode_no_unsigned_subtraction
-    const NO_UNSIGNED_SUBTRACTION       =    8192;
-
-    // https://dev.mysql.com/doc/refman/5.0/en/sql-mode.html#sqlmode_no_zero_date
-    const NO_ZERO_DATE                  =   16384;
-
-    // https://dev.mysql.com/doc/refman/5.0/en/sql-mode.html#sqlmode_no_zero_in_date
-    const NO_ZERO_IN_DATE               =   32768;
-
-    // https://dev.mysql.com/doc/refman/5.0/en/sql-mode.html#sqlmode_only_full_group_by
-    const ONLY_FULL_GROUP_BY            =   65536;
-
-    // https://dev.mysql.com/doc/refman/5.0/en/sql-mode.html#sqlmode_pipes_as_concat
-    const PIPES_AS_CONCAT               =  131072;
-
-    // https://dev.mysql.com/doc/refman/5.0/en/sql-mode.html#sqlmode_real_as_float
-    const REAL_AS_FLOAT                 =  262144;
-
-    // https://dev.mysql.com/doc/refman/5.0/en/sql-mode.html#sqlmode_strict_all_tables
-    const STRICT_ALL_TABLES             =  524288;
-
-    // https://dev.mysql.com/doc/refman/5.0/en/sql-mode.html#sqlmode_strict_trans_tables
-    const STRICT_TRANS_TABLES           = 1048576;
-
-    // Custom modes.
-
-    // The table and column names and any other field that must be escaped will
-    // not be.
-    // Reserved keywords are being escaped regardless this mode is used or not.
-    const NO_ENCLOSING_QUOTES           = 1073741824;
-
-    /*
-     * Combination SQL Modes
-     * https://dev.mysql.com/doc/refman/5.0/en/sql-mode.html#sql-mode-combo
-     */
-
-    // REAL_AS_FLOAT, PIPES_AS_CONCAT, ANSI_QUOTES, IGNORE_SPACE
-    const SQL_MODE_ANSI                 = 393234;
-
-    // PIPES_AS_CONCAT, ANSI_QUOTES, IGNORE_SPACE, NO_KEY_OPTIONS,
-    // NO_TABLE_OPTIONS, NO_FIELD_OPTIONS,
-    const SQL_MODE_DB2                  = 138258;
-
-    // PIPES_AS_CONCAT, ANSI_QUOTES, IGNORE_SPACE, NO_KEY_OPTIONS,
-    // NO_TABLE_OPTIONS, NO_FIELD_OPTIONS, NO_AUTO_CREATE_USER
-    const SQL_MODE_MAXDB                = 138290;
-
-    // PIPES_AS_CONCAT, ANSI_QUOTES, IGNORE_SPACE, NO_KEY_OPTIONS,
-    // NO_TABLE_OPTIONS, NO_FIELD_OPTIONS
-    const SQL_MODE_MSSQL                = 138258;
-
-    // PIPES_AS_CONCAT, ANSI_QUOTES, IGNORE_SPACE, NO_KEY_OPTIONS,
-    // NO_TABLE_OPTIONS, NO_FIELD_OPTIONS, NO_AUTO_CREATE_USER
-    const SQL_MODE_ORACLE               = 138290;
-
-    // PIPES_AS_CONCAT, ANSI_QUOTES, IGNORE_SPACE, NO_KEY_OPTIONS,
-    // NO_TABLE_OPTIONS, NO_FIELD_OPTIONS
-    const SQL_MODE_POSTGRESQL           = 138258;
-
-    // STRICT_TRANS_TABLES, STRICT_ALL_TABLES, NO_ZERO_IN_DATE, NO_ZERO_DATE,
-    // ERROR_FOR_DIVISION_BY_ZERO, NO_AUTO_CREATE_USER
-    const SQL_MODE_TRADITIONAL          = 1622052;
-
-    // -------------------------------------------------------------------------
-    // Keyword.
-
-    /**
-     * Checks if the given string is a keyword.
-     *
-     * @param string $str        String to be checked.
-     * @param bool   $isReserved Checks if the keyword is reserved.
-     *
-     * @return int
-     */
-    public static function isKeyword($str, $isReserved = false)
-    {
-        $str = strtoupper($str);
-
-        if (isset(static::$KEYWORDS[$str])) {
-            if ($isReserved) {
-                if (!(static::$KEYWORDS[$str] & Token::FLAG_KEYWORD_RESERVED)) {
-                    return null;
-                }
-            }
-            return static::$KEYWORDS[$str];
-        }
-
-        return null;
-    }
-
-    // -------------------------------------------------------------------------
-    // Operator.
-
-    /**
-     * Checks if the given string is an operator.
-     *
-     * @param string $str String to be checked.
-     *
-     * @return int The appropriate flag for the operator.
-     */
-    public static function isOperator($str)
-    {
-        if (!isset(static::$OPERATORS[$str])) {
-            return null;
-        }
-        return static::$OPERATORS[$str];
-    }
-
-    // -------------------------------------------------------------------------
-    // Whitespace.
-
-    /**
-     * Checks if the given character is a whitespace.
-     *
-     * @param string $str String to be checked.
-     *
-     * @return bool
-     */
-    public static function isWhitespace($str)
-    {
-        return ($str === ' ') || ($str === "\r") || ($str === "\n") || ($str === "\t");
-    }
-
-    // -------------------------------------------------------------------------
-    // Comment.
-
-    /**
-     * Checks if the given string is the beginning of a whitespace.
-     *
-     * @param string $str String to be checked.
-     *
-     * @return int The appropriate flag for the comment type.
-     */
-    public static function isComment($str)
-    {
-        $len = strlen($str);
-        if ($str[0] === '#') {
-            return Token::FLAG_COMMENT_BASH;
-        } elseif (($len > 1) && ($str[0] === '/') && ($str[1] === '*')) {
-            return (($len > 2) && ($str[2] == '!')) ?
-                Token::FLAG_COMMENT_MYSQL_CMD : Token::FLAG_COMMENT_C;
-        } elseif (($len > 1) && ($str[0] === '*') && ($str[1] === '/')) {
-            return Token::FLAG_COMMENT_C;
-        } elseif (($len > 2) && ($str[0] === '-')
-            && ($str[1] === '-') && (static::isWhitespace($str[2]))
-        ) {
-            return Token::FLAG_COMMENT_SQL;
-        }
-        return null;
-    }
-
-    // -------------------------------------------------------------------------
-    // Bool.
-
-    /**
-     * Checks if the given string is a boolean value.
-     * This actually check only for `TRUE` and `FALSE` because `1` or `0` are
-     * actually numbers and are parsed by specific methods.
-     *
-     * @param string $str String to be checked.
-     *
-     * @return bool
-     */
-    public static function isBool($str)
-    {
-        $str = strtoupper($str);
-        return ($str === 'TRUE') || ($str === 'FALSE');
-    }
-
-    // -------------------------------------------------------------------------
-    // Number.
-
-    /**
-     * Checks if the given character can be a part of a number.
-     *
-     * @param string $str String to be checked.
-     *
-     * @return bool
-     */
-    public static function isNumber($str)
-    {
-        return (($str >= '0') && ($str <= '9')) || ($str === '.')
-            || ($str === '-') || ($str === '+') || ($str === 'e') || ($str === 'E');
-    }
-
-    // -------------------------------------------------------------------------
-    // Symbol.
-
-    /**
-     * Checks if the given character is the beginning of a symbol. A symbol
-     * can be either a variable or a field name.
-     *
-     * @param string $str String to be checked.
-     *
-     * @return int The appropriate flag for the symbol type.
-     */
-    public static function isSymbol($str)
-    {
-        if ($str[0] === '@') {
-            return Token::FLAG_SYMBOL_VARIABLE;
-        } elseif ($str[0] === '`') {
-            return Token::FLAG_SYMBOL_BACKTICK;
-        }
-        return null;
-    }
-
-    // -------------------------------------------------------------------------
-    // String.
-
-    /**
-     * Checks if the given character is the beginning of a string.
-     *
-     * @param string $str String to be checked.
-     *
-     * @return int The appropriate flag for the string type.
-     */
-    public static function isString($str)
-    {
-        if ($str[0] === '\'') {
-            return Token::FLAG_STRING_SINGLE_QUOTES;
-        } elseif ($str[0] === '"') {
-            return Token::FLAG_STRING_DOUBLE_QUOTES;
-        }
-        return null;
-    }
-
-    // -------------------------------------------------------------------------
-    // Delimiter.
-
-    /**
-     * Checks if the given character can be a separator for two lexeme.
-     *
-     * @param string $str String to be checked.
-     *
-     * @return bool
-     */
-    public static function isSeparator($str)
-    {
-        // NOTES:   Only non alphanumeric ASCII characters may be separators.
-        //          `~` is the last printable ASCII character.
-        return ($str <= '~') && ($str !== '_')
-            && (($str < '0') || ($str > '9'))
-            && (($str < 'a') || ($str > 'z'))
-            && (($str < 'A') || ($str > 'Z'));
-    }
-
-    /**
-     * Loads the specified context.
-     *
-     * Contexts may be used by accessing the context directly.
-     *
-     * @param string $context Name of the context or full class name that
-     *                        defines the context.
-     *
-     * @throws \Exception If the specified context doesn't exist.
-     *
-     * @return void
-     */
-    public static function load($context = '')
-    {
-        if (empty($context)) {
-            $context = self::$defaultContext;
-        }
-        if ($context[0] !== '\\') {
-            // Short context name (must be formatted into class name).
-            $context = self::$contextPrefix . $context;
-        }
-        if (!class_exists($context)) {
-            throw new \Exception(
-                'Specified context ("' . $context . '") does not exist.'
-            );
-        }
-        self::$loadedContext = $context;
-        self::$KEYWORDS = $context::$KEYWORDS;
-    }
-
-    /**
-     * Loads the context with the closest version to the one specified.
-     *
-     * The closest context is found by replacing last digits with zero until one
-     * is loaded successfully.
-     *
-     * @see Context::load()
-     *
-     * @param string $context Name of the context or full class name that
-     *                        defines the context.
-     *
-     * @return string The loaded context. `null` if no context was loaded.
-     */
-    public static function loadClosest($context = '')
-    {
-        /**
-         * The number of replaces done by `preg_replace`.
-         * This actually represents whether a new context was generated or not.
-         *
-         * @var int $count
-         */
-        $count = 0;
-
-        // As long as a new context can be generated, we try to load it.
-        do {
-            try {
-                // Trying to load the new context.
-                static::load($context);
-            } catch (\Exception $e) {
-                // If it didn't work, we are looking for a new one and skipping
-                // over to the next generation that will try the new context.
-                $context = preg_replace(
-                    '/[1-9](0*)$/',
-                    '0$1',
-                    $context,
-                    -1,
-                    $count
-                );
-                continue;
-            }
-
-            // Last generated context was valid (did not throw any exceptions).
-            // So we return it, to let the user know what context was loaded.
-            return $context;
-        } while ($count !== 0);
-
-        return null;
-    }
-
-    /**
-     * Sets the SQL mode.
-     *
-     * @param string $mode The list of modes. If empty, the mode is reset.
-     *
-     * @return void
-     */
-    public static function setMode($mode = '')
-    {
-        static::$MODE = 0;
-        if (empty($mode)) {
-            return;
-        }
-        $mode = explode(',', $mode);
-        foreach ($mode as $m) {
-            static::$MODE |= constant('static::' . $m);
-        }
-    }
-
-    /**
-     * Escapes the symbol by adding surrounding backticks.
-     *
-     * @param array|string $str   The string to be escaped.
-     * @param string       $quote Quote to be used when escaping.
-     *
-     * @return string
-     */
-    public static function escape($str, $quote = '`')
-    {
-        if (is_array($str)) {
-            foreach ($str as $key => $value) {
-                $str[$key] = static::escape($value);
-            }
-            return $str;
-        }
-
-        if ((static::$MODE & Context::NO_ENCLOSING_QUOTES)
-            && (!static::isKeyword($str, true))
-        ) {
-            return $str;
-        }
-
-        if (static::$MODE & Context::ANSI_QUOTES) {
-            $quote = '"';
-        }
-
-        return $quote . str_replace($quote, $quote . $quote, $str) . $quote;
-    }
-}
-
-// Initializing the default context.
-Context::load();
diff --git a/#pma/libraries/sql-parser/src/Contexts/ContextMySql50000.php b/#pma/libraries/sql-parser/src/Contexts/ContextMySql50000.php
deleted file mode 100644
index 82ec3bd1..00000000
--- a/#pma/libraries/sql-parser/src/Contexts/ContextMySql50000.php
+++ /dev/null
@@ -1,287 +0,0 @@
-<?php
-
-/**
- * Context for MySQL 5.
- *
- * This file was auto-generated.
- *
- * @package    SqlParser
- * @subpackage Contexts
- * @link       https://dev.mysql.com/doc/refman/5.0/en/keywords.html
- */
-namespace SqlParser\Contexts;
-
-use SqlParser\Context;
-
-/**
- * Context for MySQL 5.
- *
- * @category   Contexts
- * @package    SqlParser
- * @subpackage Contexts
- * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-class ContextMySql50000 extends Context
-{
-
-    /**
-     * List of keywords.
-     *
-     * The value associated to each keyword represents its flags.
-     *
-     * @see Token::FLAG_KEYWORD_*
-     *
-     * @var array
-     */
-    public static $KEYWORDS = array(
-
-        'DO' => 1, 'IO' => 1, 'NO' => 1, 'XA' => 1,
-        'ANY' => 1, 'BDB' => 1, 'CPU' => 1, 'END' => 1, 'IPC' => 1, 'NDB' => 1,
-        'NEW' => 1, 'ONE' => 1, 'ROW' => 1,
-        'BOOL' => 1, 'BYTE' => 1, 'CODE' => 1, 'CUBE' => 1, 'DATA' => 1, 'FAST' => 1,
-        'FILE' => 1, 'FULL' => 1, 'HASH' => 1, 'HELP' => 1, 'LAST' => 1, 'LOGS' => 1,
-        'MODE' => 1, 'NAME' => 1, 'NEXT' => 1, 'NONE' => 1, 'OPEN' => 1, 'PAGE' => 1,
-        'PREV' => 1, 'ROWS' => 1, 'SOME' => 1, 'STOP' => 1, 'TYPE' => 1, 'VIEW' => 1,
-        'WORK' => 1, 'X509' => 1,
-        'AFTER' => 1, 'BEGIN' => 1, 'BLOCK' => 1, 'BTREE' => 1, 'CACHE' => 1,
-        'CHAIN' => 1, 'CLOSE' => 1, 'FIRST' => 1, 'FIXED' => 1, 'FLUSH' => 1,
-        'FOUND' => 1, 'HOSTS' => 1, 'LEVEL' => 1, 'LOCAL' => 1, 'LOCKS' => 1,
-        'MERGE' => 1, 'MUTEX' => 1, 'NAMES' => 1, 'NCHAR' => 1, 'PHASE' => 1,
-        'QUERY' => 1, 'QUICK' => 1, 'RAID0' => 1, 'RESET' => 1, 'RTREE' => 1,
-        'SHARE' => 1, 'SLAVE' => 1, 'START' => 1, 'SUPER' => 1, 'SWAPS' => 1,
-        'TYPES' => 1, 'UNTIL' => 1, 'VALUE' => 1,
-        'ACTION' => 1, 'BACKUP' => 1, 'BINLOG' => 1, 'CIPHER' => 1, 'CLIENT' => 1,
-        'COMMIT' => 1, 'ENABLE' => 1, 'ENGINE' => 1, 'ERRORS' => 1, 'ESCAPE' => 1,
-        'EVENTS' => 1, 'FAULTS' => 1, 'FIELDS' => 1, 'GLOBAL' => 1, 'GRANTS' => 1,
-        'IMPORT' => 1, 'INNODB' => 1, 'ISSUER' => 1, 'LEAVES' => 1, 'MASTER' => 1,
-        'MEDIUM' => 1, 'MEMORY' => 1, 'MODIFY' => 1, 'OFFSET' => 1, 'RELOAD' => 1,
-        'REPAIR' => 1, 'RESUME' => 1, 'ROLLUP' => 1, 'SIGNED' => 1, 'SIMPLE' => 1,
-        'SOUNDS' => 1, 'SOURCE' => 1, 'STATUS' => 1, 'STRING' => 1, 'TABLES' => 1,
-        'CHANGED' => 1, 'COLUMNS' => 1, 'COMMENT' => 1, 'COMPACT' => 1, 'CONTEXT' => 1,
-        'DEFINER' => 1, 'DISABLE' => 1, 'DISCARD' => 1, 'DYNAMIC' => 1, 'ENGINES' => 1,
-        'EXECUTE' => 1, 'HANDLER' => 1, 'INDEXES' => 1, 'INVOKER' => 1, 'MIGRATE' => 1,
-        'PARTIAL' => 1, 'PREPARE' => 1, 'PROFILE' => 1, 'RECOVER' => 1, 'RESTORE' => 1,
-        'RETURNS' => 1, 'ROUTINE' => 1, 'SESSION' => 1, 'STORAGE' => 1, 'STRIPED' => 1,
-        'SUBJECT' => 1, 'SUSPEND' => 1, 'UNICODE' => 1, 'UNKNOWN' => 1, 'UPGRADE' => 1,
-        'USE_FRM' => 1, 'VIRTUAL' => 1,
-        'CASCADED' => 1, 'CHECKSUM' => 1, 'DUMPFILE' => 1, 'EXTENDED' => 1,
-        'FUNCTION' => 1, 'INNOBASE' => 1, 'LANGUAGE' => 1, 'MAX_ROWS' => 1,
-        'MIN_ROWS' => 1, 'NATIONAL' => 1, 'NVARCHAR' => 1, 'ONE_SHOT' => 1,
-        'PROFILES' => 1, 'ROLLBACK' => 1, 'SECURITY' => 1, 'SHUTDOWN' => 1,
-        'SNAPSHOT' => 1, 'SWITCHES' => 1, 'TRIGGERS' => 1, 'WARNINGS' => 1,
-        'AGGREGATE' => 1, 'ALGORITHM' => 1, 'COMMITTED' => 1, 'DIRECTORY' => 1,
-        'DUPLICATE' => 1, 'EXPANSION' => 1, 'IO_THREAD' => 1, 'ISOLATION' => 1,
-        'PACK_KEYS' => 1, 'RAID_TYPE' => 1, 'REDUNDANT' => 1, 'SAVEPOINT' => 1,
-        'SQL_CACHE' => 1, 'TEMPORARY' => 1, 'TEMPTABLE' => 1, 'UNDEFINED' => 1,
-        'VARIABLES' => 1,
-        'BERKELEYDB' => 1, 'COMPRESSED' => 1, 'CONCURRENT' => 1, 'CONNECTION' => 1,
-        'CONSISTENT' => 1, 'DEALLOCATE' => 1, 'IDENTIFIED' => 1, 'MASTER_SSL' => 1,
-        'NDBCLUSTER' => 1, 'PARTITIONS' => 1, 'PERSISTENT' => 1, 'PRIVILEGES' => 1,
-        'REPEATABLE' => 1, 'ROW_FORMAT' => 1, 'SQL_THREAD' => 1, 'TABLESPACE' => 1,
-        'FRAC_SECOND' => 1, 'MASTER_HOST' => 1, 'MASTER_PORT' => 1, 'MASTER_USER' => 1,
-        'PROCESSLIST' => 1, 'RAID_CHUNKS' => 1, 'REPLICATION' => 1, 'SQL_TSI_DAY' => 1,
-        'TRANSACTION' => 1, 'UNCOMMITTED' => 1,
-        'DES_KEY_FILE' => 1, 'RELAY_THREAD' => 1, 'SERIALIZABLE' => 1,
-        'SQL_NO_CACHE' => 1, 'SQL_TSI_HOUR' => 1, 'SQL_TSI_WEEK' => 1,
-        'SQL_TSI_YEAR' => 1,
-        'INSERT_METHOD' => 1, 'MASTER_SSL_CA' => 1, 'RELAY_LOG_POS' => 1,
-        'SQL_TSI_MONTH' => 1, 'SUBPARTITIONS' => 1,
-        'AUTO_INCREMENT' => 1, 'AVG_ROW_LENGTH' => 1, 'MASTER_LOG_POS' => 1,
-        'MASTER_SSL_KEY' => 1, 'RAID_CHUNKSIZE' => 1, 'RELAY_LOG_FILE' => 1,
-        'SQL_TSI_MINUTE' => 1, 'SQL_TSI_SECOND' => 1, 'USER_RESOURCES' => 1,
-        'DELAY_KEY_WRITE' => 1, 'MASTER_LOG_FILE' => 1, 'MASTER_PASSWORD' => 1,
-        'MASTER_SSL_CERT' => 1, 'SQL_TSI_QUARTER' => 1,
-        'MASTER_SERVER_ID' => 1,
-        'MASTER_SSL_CAPATH' => 1, 'MASTER_SSL_CIPHER' => 1, 'SQL_BUFFER_RESULT' => 1,
-        'SQL_TSI_FRAC_SECOND' => 1,
-        'MASTER_CONNECT_RETRY' => 1, 'MAX_QUERIES_PER_HOUR' => 1,
-        'MAX_UPDATES_PER_HOUR' => 1, 'MAX_USER_CONNECTIONS' => 1,
-        'MAX_CONNECTIONS_PER_HOUR' => 1,
-
-        'AS' => 3, 'BY' => 3, 'IS' => 3, 'ON' => 3, 'OR' => 3, 'TO' => 3,
-        'ADD' => 3, 'ALL' => 3, 'AND' => 3, 'ASC' => 3, 'DEC' => 3, 'DIV' => 3,
-        'FOR' => 3, 'NOT' => 3, 'OUT' => 3, 'SQL' => 3, 'SSL' => 3, 'USE' => 3,
-        'XOR' => 3,
-        'BOTH' => 3, 'CALL' => 3, 'CASE' => 3, 'DESC' => 3, 'DROP' => 3, 'DUAL' => 3,
-        'EACH' => 3, 'ELSE' => 3, 'EXIT' => 3, 'FROM' => 3, 'INT1' => 3, 'INT2' => 3,
-        'INT3' => 3, 'INT4' => 3, 'INT8' => 3, 'INTO' => 3, 'JOIN' => 3, 'KEYS' => 3,
-        'KILL' => 3, 'LIKE' => 3, 'LOAD' => 3, 'LOCK' => 3, 'LONG' => 3, 'LOOP' => 3,
-        'NULL' => 3, 'READ' => 3, 'SHOW' => 3, 'THEN' => 3, 'TRUE' => 3, 'UNDO' => 3,
-        'WHEN' => 3, 'WITH' => 3,
-        'ALTER' => 3, 'CHECK' => 3, 'CROSS' => 3, 'FALSE' => 3, 'FETCH' => 3,
-        'FORCE' => 3, 'GRANT' => 3, 'GROUP' => 3, 'INNER' => 3, 'INOUT' => 3,
-        'LEAVE' => 3, 'LIMIT' => 3, 'LINES' => 3, 'ORDER' => 3, 'OUTER' => 3,
-        'PURGE' => 3, 'READS' => 3, 'RLIKE' => 3, 'TABLE' => 3, 'UNION' => 3,
-        'USAGE' => 3, 'USING' => 3, 'WHERE' => 3, 'WHILE' => 3, 'WRITE' => 3,
-        'BEFORE' => 3, 'CHANGE' => 3, 'COLUMN' => 3, 'CREATE' => 3, 'CURSOR' => 3,
-        'DELETE' => 3, 'ELSEIF' => 3, 'EXISTS' => 3, 'FLOAT4' => 3, 'FLOAT8' => 3,
-        'HAVING' => 3, 'IGNORE' => 3, 'INFILE' => 3, 'OPTION' => 3, 'REGEXP' => 3,
-        'RENAME' => 3, 'RETURN' => 3, 'REVOKE' => 3, 'SELECT' => 3, 'SONAME' => 3,
-        'UNLOCK' => 3, 'UPDATE' => 3,
-        'ANALYZE' => 3, 'BETWEEN' => 3, 'CASCADE' => 3, 'COLLATE' => 3, 'DECLARE' => 3,
-        'DELAYED' => 3, 'ESCAPED' => 3, 'EXPLAIN' => 3, 'FOREIGN' => 3, 'ITERATE' => 3,
-        'LEADING' => 3, 'NATURAL' => 3, 'OUTFILE' => 3, 'PRIMARY' => 3, 'RELEASE' => 3,
-        'REQUIRE' => 3, 'SCHEMAS' => 3, 'TRIGGER' => 3, 'VARYING' => 3,
-        'CONTINUE' => 3, 'DAY_HOUR' => 3, 'DESCRIBE' => 3, 'DISTINCT' => 3,
-        'ENCLOSED' => 3, 'MODIFIES' => 3, 'OPTIMIZE' => 3, 'RESTRICT' => 3,
-        'SPECIFIC' => 3, 'SQLSTATE' => 3, 'STARTING' => 3, 'TRAILING' => 3,
-        'UNSIGNED' => 3, 'ZEROFILL' => 3,
-        'CONDITION' => 3, 'DATABASES' => 3, 'MIDDLEINT' => 3, 'PRECISION' => 3,
-        'PROCEDURE' => 3, 'SENSITIVE' => 3, 'SEPARATOR' => 3,
-        'ASENSITIVE' => 3, 'CONSTRAINT' => 3, 'DAY_MINUTE' => 3, 'DAY_SECOND' => 3,
-        'OPTIONALLY' => 3, 'REFERENCES' => 3, 'SQLWARNING' => 3, 'TERMINATED' => 3,
-        'YEAR_MONTH' => 3,
-        'DISTINCTROW' => 3, 'HOUR_MINUTE' => 3, 'HOUR_SECOND' => 3, 'INSENSITIVE' => 3,
-        'LOW_PRIORITY' => 3, 'SQLEXCEPTION' => 3, 'VARCHARACTER' => 3,
-        'DETERMINISTIC' => 3, 'HIGH_PRIORITY' => 3, 'MINUTE_SECOND' => 3,
-        'STRAIGHT_JOIN' => 3,
-        'SQL_BIG_RESULT' => 3,
-        'DAY_MICROSECOND' => 3,
-        'HOUR_MICROSECOND' => 3, 'SQL_SMALL_RESULT' => 3,
-        'MINUTE_MICROSECOND' => 3, 'NO_WRITE_TO_BINLOG' => 3, 'SECOND_MICROSECOND' => 3,
-        'SQL_CALC_FOUND_ROWS' => 3,
-
-        'GROUP BY' => 7, 'NOT NULL' => 7, 'ORDER BY' => 7, 'SET NULL' => 7,
-        'AND CHAIN' => 7, 'FULL JOIN' => 7, 'IF EXISTS' => 7, 'LEFT JOIN' => 7,
-        'LESS THAN' => 7, 'NO ACTION' => 7, 'ON DELETE' => 7, 'ON UPDATE' => 7,
-        'UNION ALL' => 7,
-        'CROSS JOIN' => 7, 'FOR UPDATE' => 7, 'INNER JOIN' => 7, 'LINEAR KEY' => 7,
-        'NO RELEASE' => 7, 'OR REPLACE' => 7, 'RIGHT JOIN' => 7,
-        'LINEAR HASH' => 7,
-        'AND NO CHAIN' => 7, 'FOR EACH ROW' => 7, 'NATURAL JOIN' => 7,
-        'PARTITION BY' => 7, 'SET PASSWORD' => 7, 'SQL SECURITY' => 7,
-        'CHARACTER SET' => 7, 'IF NOT EXISTS' => 7,
-        'DATA DIRECTORY' => 7, 'UNION DISTINCT' => 7,
-        'DEFAULT CHARSET' => 7, 'DEFAULT COLLATE' => 7, 'FULL OUTER JOIN' => 7,
-        'INDEX DIRECTORY' => 7, 'LEFT OUTER JOIN' => 7, 'SUBPARTITION BY' => 7,
-        'GENERATED ALWAYS' => 7, 'RIGHT OUTER JOIN' => 7,
-        'NATURAL LEFT JOIN' => 7, 'START TRANSACTION' => 7,
-        'LOCK IN SHARE MODE' => 7, 'NATURAL RIGHT JOIN' => 7, 'SELECT TRANSACTION' => 7,
-        'DEFAULT CHARACTER SET' => 7,
-        'NATURAL LEFT OUTER JOIN' => 7,
-        'NATURAL RIGHT OUTER JOIN' => 7, 'WITH CONSISTENT SNAPSHOT' => 7,
-
-        'BIT' => 9, 'XML' => 9,
-        'ENUM' => 9, 'JSON' => 9, 'TEXT' => 9,
-        'ARRAY' => 9,
-        'SERIAL' => 9,
-        'BOOLEAN' => 9,
-        'DATETIME' => 9, 'GEOMETRY' => 9, 'MULTISET' => 9,
-        'MULTILINEPOINT' => 9,
-        'MULTILINEPOLYGON' => 9,
-
-        'INT' => 11, 'SET' => 11,
-        'BLOB' => 11, 'REAL' => 11,
-        'FLOAT' => 11,
-        'BIGINT' => 11, 'BINARY' => 11, 'DOUBLE' => 11,
-        'DECIMAL' => 11, 'INTEGER' => 11, 'NUMERIC' => 11, 'TINYINT' => 11, 'VARCHAR' => 11,
-        'LONGBLOB' => 11, 'LONGTEXT' => 11, 'SMALLINT' => 11, 'TINYBLOB' => 11,
-        'TINYTEXT' => 11,
-        'CHARACTER' => 11, 'MEDIUMINT' => 11, 'VARBINARY' => 11,
-        'MEDIUMBLOB' => 11, 'MEDIUMTEXT' => 11,
-
-        'BINARY VARYING' => 15,
-
-        'KEY' => 19,
-        'INDEX' => 19,
-        'UNIQUE' => 19,
-        'SPATIAL' => 19,
-        'FULLTEXT' => 19,
-
-        'INDEX KEY' => 23,
-        'UNIQUE KEY' => 23,
-        'FOREIGN KEY' => 23, 'PRIMARY KEY' => 23, 'SPATIAL KEY' => 23,
-        'FULLTEXT KEY' => 23, 'UNIQUE INDEX' => 23,
-        'SPATIAL INDEX' => 23,
-        'FULLTEXT INDEX' => 23,
-
-        'X' => 33, 'Y' => 33,
-        'LN' => 33, 'PI' => 33,
-        'ABS' => 33, 'AVG' => 33, 'BIN' => 33, 'COS' => 33, 'COT' => 33, 'DAY' => 33,
-        'ELT' => 33, 'EXP' => 33, 'HEX' => 33, 'LOG' => 33, 'MAX' => 33, 'MD5' => 33,
-        'MID' => 33, 'MIN' => 33, 'NOW' => 33, 'OCT' => 33, 'ORD' => 33, 'POW' => 33,
-        'SIN' => 33, 'STD' => 33, 'SUM' => 33, 'TAN' => 33,
-        'ACOS' => 33, 'AREA' => 33, 'ASIN' => 33, 'ATAN' => 33, 'CAST' => 33, 'CEIL' => 33,
-        'CONV' => 33, 'HOUR' => 33, 'LOG2' => 33, 'LPAD' => 33, 'RAND' => 33, 'RPAD' => 33,
-        'SHA1' => 33, 'SIGN' => 33, 'SQRT' => 33, 'SRID' => 33, 'TRIM' => 33, 'USER' => 33,
-        'UUID' => 33, 'WEEK' => 33,
-        'ASCII' => 33, 'ATAN2' => 33, 'COUNT' => 33, 'CRC32' => 33, 'FIELD' => 33,
-        'FLOOR' => 33, 'INSTR' => 33, 'LCASE' => 33, 'LEAST' => 33, 'LOG10' => 33,
-        'LOWER' => 33, 'LTRIM' => 33, 'MONTH' => 33, 'POWER' => 33, 'QUOTE' => 33,
-        'ROUND' => 33, 'RTRIM' => 33, 'SLEEP' => 33, 'SPACE' => 33, 'UCASE' => 33,
-        'UNHEX' => 33, 'UPPER' => 33,
-        'ASTEXT' => 33, 'BIT_OR' => 33, 'CONCAT' => 33, 'DECODE' => 33, 'ENCODE' => 33,
-        'EQUALS' => 33, 'FORMAT' => 33, 'IFNULL' => 33, 'ISNULL' => 33, 'LENGTH' => 33,
-        'LOCATE' => 33, 'MINUTE' => 33, 'NULLIF' => 33, 'POINTN' => 33, 'SECOND' => 33,
-        'STDDEV' => 33, 'STRCMP' => 33, 'SUBSTR' => 33, 'WITHIN' => 33,
-        'ADDDATE' => 33, 'ADDTIME' => 33, 'AGAINST' => 33, 'BIT_AND' => 33, 'BIT_XOR' => 33,
-        'CEILING' => 33, 'CHARSET' => 33, 'CROSSES' => 33, 'CURDATE' => 33, 'CURTIME' => 33,
-        'DAYNAME' => 33, 'DEGREES' => 33, 'ENCRYPT' => 33, 'EXTRACT' => 33, 'GLENGTH' => 33,
-        'ISEMPTY' => 33, 'QUARTER' => 33, 'RADIANS' => 33, 'REVERSE' => 33, 'SOUNDEX' => 33,
-        'SUBDATE' => 33, 'SUBTIME' => 33, 'SYSDATE' => 33, 'TOUCHES' => 33, 'TO_DAYS' => 33,
-        'VAR_POP' => 33, 'VERSION' => 33, 'WEEKDAY' => 33,
-        'ASBINARY' => 33, 'CENTROID' => 33, 'COALESCE' => 33, 'COMPRESS' => 33,
-        'CONTAINS' => 33, 'DATEDIFF' => 33, 'DATE_ADD' => 33, 'DATE_SUB' => 33,
-        'DISJOINT' => 33, 'ENDPOINT' => 33, 'ENVELOPE' => 33, 'GET_LOCK' => 33,
-        'GREATEST' => 33, 'ISCLOSED' => 33, 'ISSIMPLE' => 33, 'MAKEDATE' => 33,
-        'MAKETIME' => 33, 'MAKE_SET' => 33, 'MBREQUAL' => 33, 'OVERLAPS' => 33,
-        'PASSWORD' => 33, 'POSITION' => 33, 'TIMEDIFF' => 33, 'TRUNCATE' => 33,
-        'VARIANCE' => 33, 'VAR_SAMP' => 33, 'YEARWEEK' => 33,
-        'BENCHMARK' => 33, 'BIT_COUNT' => 33, 'COLLATION' => 33, 'CONCAT_WS' => 33,
-        'DAYOFWEEK' => 33, 'DAYOFYEAR' => 33, 'DIMENSION' => 33, 'FROM_DAYS' => 33,
-        'GEOMETRYN' => 33, 'INET_ATON' => 33, 'INET_NTOA' => 33, 'LOAD_FILE' => 33,
-        'MBRWITHIN' => 33, 'MONTHNAME' => 33, 'NUMPOINTS' => 33, 'ROW_COUNT' => 33,
-        'SUBSTRING' => 33,
-        'BIT_LENGTH' => 33, 'CONVERT_TZ' => 33, 'DAYOFMONTH' => 33, 'EXPORT_SET' => 33,
-        'FOUND_ROWS' => 33, 'GET_FORMAT' => 33, 'INTERSECTS' => 33, 'MBRTOUCHES' => 33,
-        'MULTIPOINT' => 33, 'NAME_CONST' => 33, 'PERIOD_ADD' => 33, 'STARTPOINT' => 33,
-        'STDDEV_POP' => 33, 'UNCOMPRESS' => 33, 'WEEKOFYEAR' => 33,
-        'AES_DECRYPT' => 33, 'AES_ENCRYPT' => 33, 'CHAR_LENGTH' => 33, 'DATE_FORMAT' => 33,
-        'DES_DECRYPT' => 33, 'DES_ENCRYPT' => 33, 'FIND_IN_SET' => 33, 'GEOMFROMWKB' => 33,
-        'LINEFROMWKB' => 33, 'MBRCONTAINS' => 33, 'MBRDISJOINT' => 33, 'MBROVERLAPS' => 33,
-        'MICROSECOND' => 33, 'PERIOD_DIFF' => 33, 'POLYFROMWKB' => 33, 'SEC_TO_TIME' => 33,
-        'STDDEV_SAMP' => 33, 'STR_TO_DATE' => 33, 'SYSTEM_USER' => 33, 'TIME_FORMAT' => 33,
-        'TIME_TO_SEC' => 33,
-        'COERCIBILITY' => 33, 'EXTERIORRING' => 33, 'GEOMETRYTYPE' => 33,
-        'GEOMFROMTEXT' => 33, 'GROUP_CONCAT' => 33, 'IS_FREE_LOCK' => 33,
-        'IS_USED_LOCK' => 33, 'LINEFROMTEXT' => 33, 'MLINEFROMWKB' => 33,
-        'MPOLYFROMWKB' => 33, 'MULTIPOLYGON' => 33, 'OCTET_LENGTH' => 33,
-        'OLD_PASSWORD' => 33, 'POINTFROMWKB' => 33, 'POLYFROMTEXT' => 33,
-        'RELEASE_LOCK' => 33, 'SESSION_USER' => 33, 'TIMESTAMPADD' => 33,
-        'CONNECTION_ID' => 33, 'FROM_UNIXTIME' => 33, 'INTERIORRINGN' => 33,
-        'MBRINTERSECTS' => 33, 'MLINEFROMTEXT' => 33, 'MPOINTFROMWKB' => 33,
-        'MPOLYFROMTEXT' => 33, 'NUMGEOMETRIES' => 33, 'POINTFROMTEXT' => 33,
-        'TIMESTAMPDIFF' => 33,
-        'LAST_INSERT_ID' => 33, 'MPOINTFROMTEXT' => 33, 'UNIX_TIMESTAMP' => 33,
-        'GEOMCOLLFROMWKB' => 33, 'MASTER_POS_WAIT' => 33, 'SUBSTRING_INDEX' => 33,
-        'CHARACTER_LENGTH' => 33, 'GEOMCOLLFROMTEXT' => 33, 'NUMINTERIORRINGS' => 33,
-        'UNCOMPRESSED_LENGTH' => 33,
-
-        'IF' => 35, 'IN' => 35,
-        'MOD' => 35,
-        'LEFT' => 35,
-        'MATCH' => 35, 'RIGHT' => 35,
-        'INSERT' => 35, 'REPEAT' => 35, 'SCHEMA' => 35, 'VALUES' => 35,
-        'CONVERT' => 35, 'DEFAULT' => 35, 'REPLACE' => 35,
-        'DATABASE' => 35, 'UTC_DATE' => 35, 'UTC_TIME' => 35,
-        'LOCALTIME' => 35,
-        'CURRENT_DATE' => 35, 'CURRENT_TIME' => 35, 'CURRENT_USER' => 35,
-        'UTC_TIMESTAMP' => 35,
-        'LOCALTIMESTAMP' => 35,
-        'CURRENT_TIMESTAMP' => 35,
-
-        'NOT IN' => 39,
-
-        'DATE' => 41, 'TIME' => 41, 'YEAR' => 41,
-        'POINT' => 41,
-        'POLYGON' => 41,
-        'TIMESTAMP' => 41,
-        'LINESTRING' => 41,
-        'MULTILINESTRING' => 41,
-        'GEOMETRYCOLLECTION' => 41,
-
-        'CHAR' => 43,
-        'INTERVAL' => 43,
-
-    );
-}
diff --git a/#pma/libraries/sql-parser/src/Contexts/ContextMySql50100.php b/#pma/libraries/sql-parser/src/Contexts/ContextMySql50100.php
deleted file mode 100644
index f63d1745..00000000
--- a/#pma/libraries/sql-parser/src/Contexts/ContextMySql50100.php
+++ /dev/null
@@ -1,312 +0,0 @@
-<?php
-
-/**
- * Context for MySQL 5.1.
- *
- * This file was auto-generated.
- *
- * @package    SqlParser
- * @subpackage Contexts
- * @link       https://dev.mysql.com/doc/refman/5.1/en/keywords.html
- */
-namespace SqlParser\Contexts;
-
-use SqlParser\Context;
-
-/**
- * Context for MySQL 5.1.
- *
- * @category   Contexts
- * @package    SqlParser
- * @subpackage Contexts
- * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-class ContextMySql50100 extends Context
-{
-
-    /**
-     * List of keywords.
-     *
-     * The value associated to each keyword represents its flags.
-     *
-     * @see Token::FLAG_KEYWORD_*
-     *
-     * @var array
-     */
-    public static $KEYWORDS = array(
-
-        'AT' => 1, 'DO' => 1, 'IO' => 1, 'NO' => 1, 'XA' => 1,
-        'ANY' => 1, 'BDB' => 1, 'CPU' => 1, 'END' => 1, 'IPC' => 1, 'NDB' => 1,
-        'NEW' => 1, 'ONE' => 1, 'ROW' => 1,
-        'BOOL' => 1, 'BYTE' => 1, 'CODE' => 1, 'CUBE' => 1, 'DATA' => 1, 'DISK' => 1,
-        'ENDS' => 1, 'FAST' => 1, 'FILE' => 1, 'FULL' => 1, 'GOTO' => 1, 'HASH' => 1,
-        'HELP' => 1, 'HOST' => 1, 'LAST' => 1, 'LESS' => 1, 'LIST' => 1, 'LOGS' => 1,
-        'MODE' => 1, 'NAME' => 1, 'NEXT' => 1, 'NONE' => 1, 'OPEN' => 1, 'PAGE' => 1,
-        'PORT' => 1, 'PREV' => 1, 'ROWS' => 1, 'SOME' => 1, 'STOP' => 1, 'THAN' => 1,
-        'TYPE' => 1, 'VIEW' => 1, 'WAIT' => 1, 'WORK' => 1, 'X509' => 1,
-        'AFTER' => 1, 'BEGIN' => 1, 'BLOCK' => 1, 'BTREE' => 1, 'CACHE' => 1,
-        'CHAIN' => 1, 'CLOSE' => 1, 'EVENT' => 1, 'EVERY' => 1, 'FIRST' => 1,
-        'FIXED' => 1, 'FLUSH' => 1, 'FOUND' => 1, 'HOSTS' => 1, 'LABEL' => 1,
-        'LEVEL' => 1, 'LOCAL' => 1, 'LOCKS' => 1, 'MERGE' => 1, 'MUTEX' => 1,
-        'NAMES' => 1, 'NCHAR' => 1, 'OWNER' => 1, 'PHASE' => 1, 'QUERY' => 1,
-        'QUICK' => 1, 'RAID0' => 1, 'RESET' => 1, 'RTREE' => 1, 'SHARE' => 1,
-        'SLAVE' => 1, 'START' => 1, 'SUPER' => 1, 'SWAPS' => 1, 'TYPES' => 1,
-        'UNTIL' => 1, 'VALUE' => 1,
-        'ACTION' => 1, 'BACKUP' => 1, 'BINLOG' => 1, 'CIPHER' => 1, 'CLIENT' => 1,
-        'COMMIT' => 1, 'ENABLE' => 1, 'ENGINE' => 1, 'ERRORS' => 1, 'ESCAPE' => 1,
-        'EVENTS' => 1, 'FAULTS' => 1, 'FIELDS' => 1, 'GLOBAL' => 1, 'GRANTS' => 1,
-        'IMPORT' => 1, 'INNODB' => 1, 'ISSUER' => 1, 'LEAVES' => 1, 'MASTER' => 1,
-        'MEDIUM' => 1, 'MEMORY' => 1, 'MODIFY' => 1, 'OFFSET' => 1, 'PARSER' => 1,
-        'PLUGIN' => 1, 'RELOAD' => 1, 'REMOVE' => 1, 'REPAIR' => 1, 'RESUME' => 1,
-        'ROLLUP' => 1, 'SERVER' => 1, 'SIGNED' => 1, 'SIMPLE' => 1, 'SOCKET' => 1,
-        'SONAME' => 1, 'SOUNDS' => 1, 'SOURCE' => 1, 'STARTS' => 1, 'STATUS' => 1,
-        'STRING' => 1, 'TABLES' => 1,
-        'AUTHORS' => 1, 'CHANGED' => 1, 'COLUMNS' => 1, 'COMMENT' => 1, 'COMPACT' => 1,
-        'CONTEXT' => 1, 'DEFINER' => 1, 'DISABLE' => 1, 'DISCARD' => 1, 'DYNAMIC' => 1,
-        'ENGINES' => 1, 'EXECUTE' => 1, 'HANDLER' => 1, 'INDEXES' => 1, 'INSTALL' => 1,
-        'INVOKER' => 1, 'LOGFILE' => 1, 'MIGRATE' => 1, 'NO_WAIT' => 1, 'OPTIONS' => 1,
-        'PARTIAL' => 1, 'PLUGINS' => 1, 'PREPARE' => 1, 'PROFILE' => 1, 'REBUILD' => 1,
-        'RECOVER' => 1, 'RESTORE' => 1, 'RETURNS' => 1, 'ROUTINE' => 1, 'SESSION' => 1,
-        'STORAGE' => 1, 'STRIPED' => 1, 'SUBJECT' => 1, 'SUSPEND' => 1, 'UNICODE' => 1,
-        'UNKNOWN' => 1, 'UPGRADE' => 1, 'USE_FRM' => 1, 'VIRTUAL' => 1, 'WRAPPER' => 1,
-        'CASCADED' => 1, 'CHECKSUM' => 1, 'DATAFILE' => 1, 'DUMPFILE' => 1,
-        'EXTENDED' => 1, 'FUNCTION' => 1, 'INNOBASE' => 1, 'LANGUAGE' => 1,
-        'MAXVALUE' => 1, 'MAX_ROWS' => 1, 'MAX_SIZE' => 1, 'MIN_ROWS' => 1,
-        'NATIONAL' => 1, 'NVARCHAR' => 1, 'ONE_SHOT' => 1, 'PRESERVE' => 1,
-        'PROFILES' => 1, 'REDOFILE' => 1, 'ROLLBACK' => 1, 'SCHEDULE' => 1,
-        'SECURITY' => 1, 'SHUTDOWN' => 1, 'SNAPSHOT' => 1, 'SWITCHES' => 1,
-        'TRIGGERS' => 1, 'UNDOFILE' => 1, 'WARNINGS' => 1,
-        'AGGREGATE' => 1, 'ALGORITHM' => 1, 'COMMITTED' => 1, 'DIRECTORY' => 1,
-        'DUPLICATE' => 1, 'EXPANSION' => 1, 'IO_THREAD' => 1, 'ISOLATION' => 1,
-        'NODEGROUP' => 1, 'PACK_KEYS' => 1, 'PARTITION' => 1, 'RAID_TYPE' => 1,
-        'READ_ONLY' => 1, 'REDUNDANT' => 1, 'SAVEPOINT' => 1, 'SCHEDULER' => 1,
-        'SQL_CACHE' => 1, 'TEMPORARY' => 1, 'TEMPTABLE' => 1, 'UNDEFINED' => 1,
-        'UNINSTALL' => 1, 'VARIABLES' => 1,
-        'BERKELEYDB' => 1, 'COMPLETION' => 1, 'COMPRESSED' => 1, 'CONCURRENT' => 1,
-        'CONNECTION' => 1, 'CONSISTENT' => 1, 'DEALLOCATE' => 1, 'IDENTIFIED' => 1,
-        'MASTER_SSL' => 1, 'NDBCLUSTER' => 1, 'PARTITIONS' => 1, 'PERSISTENT' => 1,
-        'PRIVILEGES' => 1, 'REORGANISE' => 1, 'REORGANIZE' => 1, 'REPEATABLE' => 1,
-        'ROW_FORMAT' => 1, 'SQL_THREAD' => 1, 'TABLESPACE' => 1,
-        'EXTENT_SIZE' => 1, 'FRAC_SECOND' => 1, 'MASTER_HOST' => 1, 'MASTER_PORT' => 1,
-        'MASTER_USER' => 1, 'PROCESSLIST' => 1, 'RAID_CHUNKS' => 1, 'REPLICATION' => 1,
-        'SQL_TSI_DAY' => 1, 'TRANSACTION' => 1, 'UNCOMMITTED' => 1,
-        'CONTRIBUTORS' => 1, 'DES_KEY_FILE' => 1, 'INITIAL_SIZE' => 1,
-        'PARTITIONING' => 1, 'RELAY_THREAD' => 1, 'SERIALIZABLE' => 1,
-        'SQL_NO_CACHE' => 1, 'SQL_TSI_HOUR' => 1, 'SQL_TSI_WEEK' => 1,
-        'SQL_TSI_YEAR' => 1, 'SUBPARTITION' => 1,
-        'INSERT_METHOD' => 1, 'MASTER_SSL_CA' => 1, 'PAGE_CHECKSUM' => 1,
-        'RELAY_LOG_POS' => 1, 'SQL_TSI_MONTH' => 1, 'SUBPARTITIONS' => 1,
-        'TRANSACTIONAL' => 1,
-        'AUTO_INCREMENT' => 1, 'AVG_ROW_LENGTH' => 1, 'KEY_BLOCK_SIZE' => 1,
-        'MASTER_LOG_POS' => 1, 'MASTER_SSL_KEY' => 1, 'RAID_CHUNKSIZE' => 1,
-        'RELAY_LOG_FILE' => 1, 'SQL_TSI_MINUTE' => 1, 'SQL_TSI_SECOND' => 1,
-        'TABLE_CHECKSUM' => 1, 'USER_RESOURCES' => 1,
-        'AUTOEXTEND_SIZE' => 1, 'DELAY_KEY_WRITE' => 1, 'MASTER_LOG_FILE' => 1,
-        'MASTER_PASSWORD' => 1, 'MASTER_SSL_CERT' => 1, 'SQL_TSI_QUARTER' => 1,
-        'MASTER_SERVER_ID' => 1, 'REDO_BUFFER_SIZE' => 1, 'UNDO_BUFFER_SIZE' => 1,
-        'MASTER_SSL_CAPATH' => 1, 'MASTER_SSL_CIPHER' => 1, 'SQL_BUFFER_RESULT' => 1,
-        'SQL_TSI_FRAC_SECOND' => 1,
-        'MASTER_CONNECT_RETRY' => 1, 'MAX_QUERIES_PER_HOUR' => 1,
-        'MAX_UPDATES_PER_HOUR' => 1, 'MAX_USER_CONNECTIONS' => 1,
-        'MAX_CONNECTIONS_PER_HOUR' => 1,
-
-        'AS' => 3, 'BY' => 3, 'IS' => 3, 'ON' => 3, 'OR' => 3, 'TO' => 3,
-        'ADD' => 3, 'ALL' => 3, 'AND' => 3, 'ASC' => 3, 'DEC' => 3, 'DIV' => 3,
-        'FOR' => 3, 'NOT' => 3, 'OUT' => 3, 'SQL' => 3, 'SSL' => 3, 'USE' => 3,
-        'XOR' => 3,
-        'BOTH' => 3, 'CALL' => 3, 'CASE' => 3, 'DESC' => 3, 'DROP' => 3, 'DUAL' => 3,
-        'EACH' => 3, 'ELSE' => 3, 'EXIT' => 3, 'FROM' => 3, 'INT1' => 3, 'INT2' => 3,
-        'INT3' => 3, 'INT4' => 3, 'INT8' => 3, 'INTO' => 3, 'JOIN' => 3, 'KEYS' => 3,
-        'KILL' => 3, 'LIKE' => 3, 'LOAD' => 3, 'LOCK' => 3, 'LONG' => 3, 'LOOP' => 3,
-        'NULL' => 3, 'READ' => 3, 'SHOW' => 3, 'THEN' => 3, 'TRUE' => 3, 'UNDO' => 3,
-        'WHEN' => 3, 'WITH' => 3,
-        'ALTER' => 3, 'CHECK' => 3, 'CROSS' => 3, 'FALSE' => 3, 'FETCH' => 3,
-        'FORCE' => 3, 'GRANT' => 3, 'GROUP' => 3, 'INNER' => 3, 'INOUT' => 3,
-        'LEAVE' => 3, 'LIMIT' => 3, 'LINES' => 3, 'ORDER' => 3, 'OUTER' => 3,
-        'PURGE' => 3, 'RANGE' => 3, 'READS' => 3, 'RLIKE' => 3, 'TABLE' => 3,
-        'UNION' => 3, 'USAGE' => 3, 'USING' => 3, 'WHERE' => 3, 'WHILE' => 3,
-        'WRITE' => 3,
-        'BEFORE' => 3, 'CHANGE' => 3, 'COLUMN' => 3, 'CREATE' => 3, 'CURSOR' => 3,
-        'DELETE' => 3, 'ELSEIF' => 3, 'EXISTS' => 3, 'FLOAT4' => 3, 'FLOAT8' => 3,
-        'HAVING' => 3, 'IGNORE' => 3, 'INFILE' => 3, 'LINEAR' => 3, 'OPTION' => 3,
-        'REGEXP' => 3, 'RENAME' => 3, 'RETURN' => 3, 'REVOKE' => 3, 'SELECT' => 3,
-        'UNLOCK' => 3, 'UPDATE' => 3,
-        'ANALYZE' => 3, 'BETWEEN' => 3, 'CASCADE' => 3, 'COLLATE' => 3, 'DECLARE' => 3,
-        'DELAYED' => 3, 'ESCAPED' => 3, 'EXPLAIN' => 3, 'FOREIGN' => 3, 'ITERATE' => 3,
-        'LEADING' => 3, 'NATURAL' => 3, 'OUTFILE' => 3, 'PRIMARY' => 3, 'RELEASE' => 3,
-        'REQUIRE' => 3, 'SCHEMAS' => 3, 'TRIGGER' => 3, 'VARYING' => 3,
-        'CONTINUE' => 3, 'DAY_HOUR' => 3, 'DESCRIBE' => 3, 'DISTINCT' => 3,
-        'ENCLOSED' => 3, 'MODIFIES' => 3, 'OPTIMIZE' => 3, 'RESTRICT' => 3,
-        'SPECIFIC' => 3, 'SQLSTATE' => 3, 'STARTING' => 3, 'TRAILING' => 3,
-        'UNSIGNED' => 3, 'ZEROFILL' => 3,
-        'CONDITION' => 3, 'DATABASES' => 3, 'MIDDLEINT' => 3, 'PRECISION' => 3,
-        'PROCEDURE' => 3, 'SENSITIVE' => 3, 'SEPARATOR' => 3,
-        'ACCESSIBLE' => 3, 'ASENSITIVE' => 3, 'CONSTRAINT' => 3, 'DAY_MINUTE' => 3,
-        'DAY_SECOND' => 3, 'OPTIONALLY' => 3, 'READ_WRITE' => 3, 'REFERENCES' => 3,
-        'SQLWARNING' => 3, 'TERMINATED' => 3, 'YEAR_MONTH' => 3,
-        'DISTINCTROW' => 3, 'HOUR_MINUTE' => 3, 'HOUR_SECOND' => 3, 'INSENSITIVE' => 3,
-        'LOW_PRIORITY' => 3, 'SQLEXCEPTION' => 3, 'VARCHARACTER' => 3,
-        'DETERMINISTIC' => 3, 'HIGH_PRIORITY' => 3, 'MINUTE_SECOND' => 3,
-        'STRAIGHT_JOIN' => 3,
-        'SQL_BIG_RESULT' => 3,
-        'DAY_MICROSECOND' => 3,
-        'HOUR_MICROSECOND' => 3, 'SQL_SMALL_RESULT' => 3,
-        'MINUTE_MICROSECOND' => 3, 'NO_WRITE_TO_BINLOG' => 3, 'SECOND_MICROSECOND' => 3,
-        'SQL_CALC_FOUND_ROWS' => 3,
-        'MASTER_SSL_VERIFY_SERVER_CERT' => 3,
-
-        'GROUP BY' => 7, 'NOT NULL' => 7, 'ORDER BY' => 7, 'SET NULL' => 7,
-        'AND CHAIN' => 7, 'FULL JOIN' => 7, 'IF EXISTS' => 7, 'LEFT JOIN' => 7,
-        'LESS THAN' => 7, 'NO ACTION' => 7, 'ON DELETE' => 7, 'ON UPDATE' => 7,
-        'UNION ALL' => 7,
-        'CROSS JOIN' => 7, 'FOR UPDATE' => 7, 'INNER JOIN' => 7, 'LINEAR KEY' => 7,
-        'NO RELEASE' => 7, 'OR REPLACE' => 7, 'RIGHT JOIN' => 7,
-        'LINEAR HASH' => 7,
-        'AND NO CHAIN' => 7, 'FOR EACH ROW' => 7, 'NATURAL JOIN' => 7,
-        'PARTITION BY' => 7, 'SET PASSWORD' => 7, 'SQL SECURITY' => 7,
-        'CHARACTER SET' => 7, 'IF NOT EXISTS' => 7,
-        'DATA DIRECTORY' => 7, 'UNION DISTINCT' => 7,
-        'DEFAULT CHARSET' => 7, 'DEFAULT COLLATE' => 7, 'FULL OUTER JOIN' => 7,
-        'INDEX DIRECTORY' => 7, 'LEFT OUTER JOIN' => 7, 'SUBPARTITION BY' => 7,
-        'GENERATED ALWAYS' => 7, 'RIGHT OUTER JOIN' => 7,
-        'NATURAL LEFT JOIN' => 7, 'START TRANSACTION' => 7,
-        'LOCK IN SHARE MODE' => 7, 'NATURAL RIGHT JOIN' => 7, 'SELECT TRANSACTION' => 7,
-        'DEFAULT CHARACTER SET' => 7,
-        'NATURAL LEFT OUTER JOIN' => 7,
-        'NATURAL RIGHT OUTER JOIN' => 7, 'WITH CONSISTENT SNAPSHOT' => 7,
-
-        'BIT' => 9, 'XML' => 9,
-        'ENUM' => 9, 'JSON' => 9, 'TEXT' => 9,
-        'ARRAY' => 9,
-        'SERIAL' => 9,
-        'BOOLEAN' => 9,
-        'DATETIME' => 9, 'GEOMETRY' => 9, 'MULTISET' => 9,
-        'MULTILINEPOINT' => 9,
-        'MULTILINEPOLYGON' => 9,
-
-        'INT' => 11, 'SET' => 11,
-        'BLOB' => 11, 'REAL' => 11,
-        'FLOAT' => 11,
-        'BIGINT' => 11, 'BINARY' => 11, 'DOUBLE' => 11,
-        'DECIMAL' => 11, 'INTEGER' => 11, 'NUMERIC' => 11, 'TINYINT' => 11, 'VARCHAR' => 11,
-        'LONGBLOB' => 11, 'LONGTEXT' => 11, 'SMALLINT' => 11, 'TINYBLOB' => 11,
-        'TINYTEXT' => 11,
-        'CHARACTER' => 11, 'MEDIUMINT' => 11, 'VARBINARY' => 11,
-        'MEDIUMBLOB' => 11, 'MEDIUMTEXT' => 11,
-
-        'BINARY VARYING' => 15,
-
-        'KEY' => 19,
-        'INDEX' => 19,
-        'UNIQUE' => 19,
-        'SPATIAL' => 19,
-        'FULLTEXT' => 19,
-
-        'INDEX KEY' => 23,
-        'UNIQUE KEY' => 23,
-        'FOREIGN KEY' => 23, 'PRIMARY KEY' => 23, 'SPATIAL KEY' => 23,
-        'FULLTEXT KEY' => 23, 'UNIQUE INDEX' => 23,
-        'SPATIAL INDEX' => 23,
-        'FULLTEXT INDEX' => 23,
-
-        'X' => 33, 'Y' => 33,
-        'LN' => 33, 'PI' => 33,
-        'ABS' => 33, 'AVG' => 33, 'BIN' => 33, 'COS' => 33, 'COT' => 33, 'DAY' => 33,
-        'ELT' => 33, 'EXP' => 33, 'HEX' => 33, 'LOG' => 33, 'MAX' => 33, 'MD5' => 33,
-        'MID' => 33, 'MIN' => 33, 'NOW' => 33, 'OCT' => 33, 'ORD' => 33, 'POW' => 33,
-        'SHA' => 33, 'SIN' => 33, 'STD' => 33, 'SUM' => 33, 'TAN' => 33,
-        'ACOS' => 33, 'AREA' => 33, 'ASIN' => 33, 'ATAN' => 33, 'CAST' => 33, 'CEIL' => 33,
-        'CONV' => 33, 'HOUR' => 33, 'LOG2' => 33, 'LPAD' => 33, 'RAND' => 33, 'RPAD' => 33,
-        'SHA1' => 33, 'SIGN' => 33, 'SQRT' => 33, 'SRID' => 33, 'TRIM' => 33, 'USER' => 33,
-        'UUID' => 33, 'WEEK' => 33,
-        'ASCII' => 33, 'ASWKB' => 33, 'ASWKT' => 33, 'ATAN2' => 33, 'COUNT' => 33,
-        'CRC32' => 33, 'DECOD' => 33, 'FIELD' => 33, 'FLOOR' => 33, 'INSTR' => 33,
-        'LCASE' => 33, 'LEAST' => 33, 'LOG10' => 33, 'LOWER' => 33, 'LTRIM' => 33,
-        'MONTH' => 33, 'POWER' => 33, 'QUOTE' => 33, 'ROUND' => 33, 'RTRIM' => 33,
-        'SLEEP' => 33, 'SPACE' => 33, 'UCASE' => 33, 'UNHEX' => 33, 'UPPER' => 33,
-        'ASTEXT' => 33, 'BIT_OR' => 33, 'CONCAT' => 33, 'ENCODE' => 33, 'EQUALS' => 33,
-        'FORMAT' => 33, 'IFNULL' => 33, 'ISNULL' => 33, 'LENGTH' => 33, 'LOCATE' => 33,
-        'MINUTE' => 33, 'NULLIF' => 33, 'POINTN' => 33, 'SECOND' => 33, 'STDDEV' => 33,
-        'STRCMP' => 33, 'SUBSTR' => 33, 'WITHIN' => 33,
-        'ADDDATE' => 33, 'ADDTIME' => 33, 'AGAINST' => 33, 'BIT_AND' => 33, 'BIT_XOR' => 33,
-        'CEILING' => 33, 'CHARSET' => 33, 'CROSSES' => 33, 'CURDATE' => 33, 'CURTIME' => 33,
-        'DAYNAME' => 33, 'DEGREES' => 33, 'ENCRYPT' => 33, 'EXTRACT' => 33, 'GLENGTH' => 33,
-        'ISEMPTY' => 33, 'QUARTER' => 33, 'RADIANS' => 33, 'REVERSE' => 33, 'SOUNDEX' => 33,
-        'SUBDATE' => 33, 'SUBTIME' => 33, 'SYSDATE' => 33, 'TOUCHES' => 33, 'TO_DAYS' => 33,
-        'VAR_POP' => 33, 'VERSION' => 33, 'WEEKDAY' => 33,
-        'ASBINARY' => 33, 'CENTROID' => 33, 'COALESCE' => 33, 'COMPRESS' => 33,
-        'CONTAINS' => 33, 'DATEDIFF' => 33, 'DATE_ADD' => 33, 'DATE_SUB' => 33,
-        'DISJOINT' => 33, 'ENDPOINT' => 33, 'ENVELOPE' => 33, 'GET_LOCK' => 33,
-        'GREATEST' => 33, 'ISCLOSED' => 33, 'ISSIMPLE' => 33, 'MAKEDATE' => 33,
-        'MAKETIME' => 33, 'MAKE_SET' => 33, 'MBREQUAL' => 33, 'OVERLAPS' => 33,
-        'PASSWORD' => 33, 'POSITION' => 33, 'TIMEDIFF' => 33, 'TRUNCATE' => 33,
-        'VARIANCE' => 33, 'VAR_SAMP' => 33, 'YEARWEEK' => 33,
-        'BENCHMARK' => 33, 'BIT_COUNT' => 33, 'COLLATION' => 33, 'CONCAT_WS' => 33,
-        'DAYOFWEEK' => 33, 'DAYOFYEAR' => 33, 'DIMENSION' => 33, 'FROM_DAYS' => 33,
-        'GEOMETRYN' => 33, 'INET_ATON' => 33, 'INET_NTOA' => 33, 'LOAD_FILE' => 33,
-        'MBRWITHIN' => 33, 'MONTHNAME' => 33, 'NUMPOINTS' => 33, 'ROW_COUNT' => 33,
-        'SUBSTRING' => 33, 'UPDATEXML' => 33,
-        'BIT_LENGTH' => 33, 'CONVERT_TZ' => 33, 'DAYOFMONTH' => 33, 'EXPORT_SET' => 33,
-        'FOUND_ROWS' => 33, 'GET_FORMAT' => 33, 'INTERSECTS' => 33, 'MBRTOUCHES' => 33,
-        'MULTIPOINT' => 33, 'NAME_CONST' => 33, 'PERIOD_ADD' => 33, 'STARTPOINT' => 33,
-        'STDDEV_POP' => 33, 'UNCOMPRESS' => 33, 'UUID_SHORT' => 33, 'WEEKOFYEAR' => 33,
-        'AES_DECRYPT' => 33, 'AES_ENCRYPT' => 33, 'CHAR_LENGTH' => 33, 'DATE_FORMAT' => 33,
-        'DES_DECRYPT' => 33, 'DES_ENCRYPT' => 33, 'FIND_IN_SET' => 33, 'GEOMFROMWKB' => 33,
-        'LINEFROMWKB' => 33, 'MBRCONTAINS' => 33, 'MBRDISJOINT' => 33, 'MBROVERLAPS' => 33,
-        'MICROSECOND' => 33, 'PERIOD_DIFF' => 33, 'POLYFROMWKB' => 33, 'SEC_TO_TIME' => 33,
-        'STDDEV_SAMP' => 33, 'STR_TO_DATE' => 33, 'SYSTEM_USER' => 33, 'TIME_FORMAT' => 33,
-        'TIME_TO_SEC' => 33,
-        'COERCIBILITY' => 33, 'EXTERIORRING' => 33, 'EXTRACTVALUE' => 33,
-        'GEOMETRYTYPE' => 33, 'GEOMFROMTEXT' => 33, 'GROUP_CONCAT' => 33,
-        'IS_FREE_LOCK' => 33, 'IS_USED_LOCK' => 33, 'LINEFROMTEXT' => 33,
-        'MLINEFROMWKB' => 33, 'MPOLYFROMWKB' => 33, 'MULTIPOLYGON' => 33,
-        'OCTET_LENGTH' => 33, 'OLD_PASSWORD' => 33, 'POINTFROMWKB' => 33,
-        'POLYFROMTEXT' => 33, 'RELEASE_LOCK' => 33, 'SESSION_USER' => 33,
-        'TIMESTAMPADD' => 33,
-        'CONNECTION_ID' => 33, 'FROM_UNIXTIME' => 33, 'INTERIORRINGN' => 33,
-        'MBRINTERSECTS' => 33, 'MLINEFROMTEXT' => 33, 'MPOINTFROMWKB' => 33,
-        'MPOLYFROMTEXT' => 33, 'NUMGEOMETRIES' => 33, 'POINTFROMTEXT' => 33,
-        'TIMESTAMPDIFF' => 33,
-        'LAST_INSERT_ID' => 33, 'MPOINTFROMTEXT' => 33, 'POLYGONFROMWKB' => 33,
-        'UNIX_TIMESTAMP' => 33,
-        'GEOMCOLLFROMWKB' => 33, 'MASTER_POS_WAIT' => 33, 'POLYGONFROMTEXT' => 33,
-        'SUBSTRING_INDEX' => 33,
-        'CHARACTER_LENGTH' => 33, 'GEOMCOLLFROMTEXT' => 33, 'GEOMETRYFROMTEXT' => 33,
-        'NUMINTERIORRINGS' => 33,
-        'LINESTRINGFROMWKB' => 33, 'MULTIPOINTFROMWKB' => 33,
-        'MULTIPOINTFROMTEXT' => 33,
-        'MULTIPOLYGONFROMWKB' => 33, 'UNCOMPRESSED_LENGTH' => 33,
-        'MULTIPOLYGONFROMTEXT' => 33,
-        'MULTILINESTRINGFROMWKB' => 33,
-        'MULTILINESTRINGFROMTEXT' => 33,
-        'GEOMETRYCOLLECTIONFROMWKB' => 33,
-        'GEOMETRYCOLLECTIONFROMTEXT' => 33,
-
-        'IF' => 35, 'IN' => 35,
-        'MOD' => 35,
-        'LEFT' => 35,
-        'MATCH' => 35, 'RIGHT' => 35,
-        'INSERT' => 35, 'REPEAT' => 35, 'SCHEMA' => 35, 'VALUES' => 35,
-        'CONVERT' => 35, 'DEFAULT' => 35, 'REPLACE' => 35,
-        'DATABASE' => 35, 'UTC_DATE' => 35, 'UTC_TIME' => 35,
-        'LOCALTIME' => 35,
-        'CURRENT_DATE' => 35, 'CURRENT_TIME' => 35, 'CURRENT_USER' => 35,
-        'UTC_TIMESTAMP' => 35,
-        'LOCALTIMESTAMP' => 35,
-        'CURRENT_TIMESTAMP' => 35,
-
-        'NOT IN' => 39,
-
-        'DATE' => 41, 'TIME' => 41, 'YEAR' => 41,
-        'POINT' => 41,
-        'POLYGON' => 41,
-        'TIMESTAMP' => 41,
-        'LINESTRING' => 41,
-        'MULTILINESTRING' => 41,
-        'GEOMETRYCOLLECTION' => 41,
-
-        'CHAR' => 43,
-        'INTERVAL' => 43,
-
-    );
-}
diff --git a/#pma/libraries/sql-parser/src/Contexts/ContextMySql50500.php b/#pma/libraries/sql-parser/src/Contexts/ContextMySql50500.php
deleted file mode 100644
index a015dd82..00000000
--- a/#pma/libraries/sql-parser/src/Contexts/ContextMySql50500.php
+++ /dev/null
@@ -1,317 +0,0 @@
-<?php
-
-/**
- * Context for MySQL 5.5.
- *
- * This file was auto-generated.
- *
- * @package    SqlParser
- * @subpackage Contexts
- * @link       https://dev.mysql.com/doc/refman/5.5/en/keywords.html
- */
-namespace SqlParser\Contexts;
-
-use SqlParser\Context;
-
-/**
- * Context for MySQL 5.5.
- *
- * @category   Contexts
- * @package    SqlParser
- * @subpackage Contexts
- * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-class ContextMySql50500 extends Context
-{
-
-    /**
-     * List of keywords.
-     *
-     * The value associated to each keyword represents its flags.
-     *
-     * @see Token::FLAG_KEYWORD_*
-     *
-     * @var array
-     */
-    public static $KEYWORDS = array(
-
-        'AT' => 1, 'DO' => 1, 'IO' => 1, 'NO' => 1, 'XA' => 1,
-        'ANY' => 1, 'CPU' => 1, 'END' => 1, 'IPC' => 1, 'NDB' => 1, 'NEW' => 1,
-        'ONE' => 1, 'ROW' => 1,
-        'BOOL' => 1, 'BYTE' => 1, 'CODE' => 1, 'CUBE' => 1, 'DATA' => 1, 'DISK' => 1,
-        'ENDS' => 1, 'FAST' => 1, 'FILE' => 1, 'FULL' => 1, 'HASH' => 1, 'HELP' => 1,
-        'HOST' => 1, 'LAST' => 1, 'LESS' => 1, 'LIST' => 1, 'LOGS' => 1, 'MODE' => 1,
-        'NAME' => 1, 'NEXT' => 1, 'NONE' => 1, 'OPEN' => 1, 'PAGE' => 1, 'PORT' => 1,
-        'PREV' => 1, 'ROWS' => 1, 'SLOW' => 1, 'SOME' => 1, 'STOP' => 1, 'THAN' => 1,
-        'TYPE' => 1, 'VIEW' => 1, 'WAIT' => 1, 'WORK' => 1, 'X509' => 1,
-        'AFTER' => 1, 'BEGIN' => 1, 'BLOCK' => 1, 'BTREE' => 1, 'CACHE' => 1,
-        'CHAIN' => 1, 'CLOSE' => 1, 'ERROR' => 1, 'EVENT' => 1, 'EVERY' => 1,
-        'FIRST' => 1, 'FIXED' => 1, 'FLUSH' => 1, 'FOUND' => 1, 'HOSTS' => 1,
-        'LEVEL' => 1, 'LOCAL' => 1, 'LOCKS' => 1, 'MERGE' => 1, 'MUTEX' => 1,
-        'NAMES' => 1, 'NCHAR' => 1, 'OWNER' => 1, 'PHASE' => 1, 'PROXY' => 1,
-        'QUERY' => 1, 'QUICK' => 1, 'RELAY' => 1, 'RESET' => 1, 'RTREE' => 1,
-        'SHARE' => 1, 'SLAVE' => 1, 'START' => 1, 'SUPER' => 1, 'SWAPS' => 1,
-        'TYPES' => 1, 'UNTIL' => 1, 'VALUE' => 1,
-        'ACTION' => 1, 'BACKUP' => 1, 'BINLOG' => 1, 'CIPHER' => 1, 'CLIENT' => 1,
-        'COMMIT' => 1, 'ENABLE' => 1, 'ENGINE' => 1, 'ERRORS' => 1, 'ESCAPE' => 1,
-        'EVENTS' => 1, 'FAULTS' => 1, 'FIELDS' => 1, 'GLOBAL' => 1, 'GRANTS' => 1,
-        'IMPORT' => 1, 'INNODB' => 1, 'ISSUER' => 1, 'LEAVES' => 1, 'MASTER' => 1,
-        'MEDIUM' => 1, 'MEMORY' => 1, 'MODIFY' => 1, 'OFFSET' => 1, 'PARSER' => 1,
-        'PLUGIN' => 1, 'RELOAD' => 1, 'REMOVE' => 1, 'REPAIR' => 1, 'RESUME' => 1,
-        'ROLLUP' => 1, 'SERVER' => 1, 'SIGNED' => 1, 'SIMPLE' => 1, 'SOCKET' => 1,
-        'SONAME' => 1, 'SOUNDS' => 1, 'SOURCE' => 1, 'STARTS' => 1, 'STATUS' => 1,
-        'STRING' => 1, 'TABLES' => 1,
-        'AUTHORS' => 1, 'CHANGED' => 1, 'COLUMNS' => 1, 'COMMENT' => 1, 'COMPACT' => 1,
-        'CONTEXT' => 1, 'DEFINER' => 1, 'DISABLE' => 1, 'DISCARD' => 1, 'DYNAMIC' => 1,
-        'ENGINES' => 1, 'EXECUTE' => 1, 'GENERAL' => 1, 'HANDLER' => 1, 'INDEXES' => 1,
-        'INSTALL' => 1, 'INVOKER' => 1, 'LOGFILE' => 1, 'MIGRATE' => 1, 'NO_WAIT' => 1,
-        'OPTIONS' => 1, 'PARTIAL' => 1, 'PLUGINS' => 1, 'PREPARE' => 1, 'PROFILE' => 1,
-        'REBUILD' => 1, 'RECOVER' => 1, 'RESTORE' => 1, 'RETURNS' => 1, 'ROUTINE' => 1,
-        'SESSION' => 1, 'STORAGE' => 1, 'SUBJECT' => 1, 'SUSPEND' => 1, 'UNICODE' => 1,
-        'UNKNOWN' => 1, 'UPGRADE' => 1, 'USE_FRM' => 1, 'VIRTUAL' => 1, 'WRAPPER' => 1,
-        'CASCADED' => 1, 'CHECKSUM' => 1, 'DATAFILE' => 1, 'DUMPFILE' => 1,
-        'EXTENDED' => 1, 'FUNCTION' => 1, 'INNOBASE' => 1, 'LANGUAGE' => 1,
-        'MAX_ROWS' => 1, 'MAX_SIZE' => 1, 'MIN_ROWS' => 1, 'NATIONAL' => 1,
-        'NVARCHAR' => 1, 'ONE_SHOT' => 1, 'PRESERVE' => 1, 'PROFILES' => 1,
-        'REDOFILE' => 1, 'RELAYLOG' => 1, 'ROLLBACK' => 1, 'SCHEDULE' => 1,
-        'SECURITY' => 1, 'SHUTDOWN' => 1, 'SNAPSHOT' => 1, 'SWITCHES' => 1,
-        'TRIGGERS' => 1, 'UNDOFILE' => 1, 'WARNINGS' => 1,
-        'AGGREGATE' => 1, 'ALGORITHM' => 1, 'COMMITTED' => 1, 'DIRECTORY' => 1,
-        'DUPLICATE' => 1, 'EXPANSION' => 1, 'IO_THREAD' => 1, 'ISOLATION' => 1,
-        'NODEGROUP' => 1, 'PACK_KEYS' => 1, 'PARTITION' => 1, 'READ_ONLY' => 1,
-        'REDUNDANT' => 1, 'SAVEPOINT' => 1, 'SQL_CACHE' => 1, 'TEMPORARY' => 1,
-        'TEMPTABLE' => 1, 'UNDEFINED' => 1, 'UNINSTALL' => 1, 'VARIABLES' => 1,
-        'COMPLETION' => 1, 'COMPRESSED' => 1, 'CONCURRENT' => 1, 'CONNECTION' => 1,
-        'CONSISTENT' => 1, 'DEALLOCATE' => 1, 'IDENTIFIED' => 1, 'MASTER_SSL' => 1,
-        'NDBCLUSTER' => 1, 'PARTITIONS' => 1, 'PERSISTENT' => 1, 'PRIVILEGES' => 1,
-        'REORGANIZE' => 1, 'REPEATABLE' => 1, 'ROW_FORMAT' => 1, 'SQL_THREAD' => 1,
-        'TABLESPACE' => 1, 'TABLE_NAME' => 1,
-        'COLUMN_NAME' => 1, 'CURSOR_NAME' => 1, 'EXTENT_SIZE' => 1, 'FRAC_SECOND' => 1,
-        'MASTER_HOST' => 1, 'MASTER_PORT' => 1, 'MASTER_USER' => 1, 'MYSQL_ERRNO' => 1,
-        'PROCESSLIST' => 1, 'REPLICATION' => 1, 'SCHEMA_NAME' => 1, 'SQL_TSI_DAY' => 1,
-        'TRANSACTION' => 1, 'UNCOMMITTED' => 1,
-        'CATALOG_NAME' => 1, 'CLASS_ORIGIN' => 1, 'CONTRIBUTORS' => 1,
-        'DES_KEY_FILE' => 1, 'INITIAL_SIZE' => 1, 'MESSAGE_TEXT' => 1,
-        'PARTITIONING' => 1, 'RELAY_THREAD' => 1, 'SERIALIZABLE' => 1,
-        'SQL_NO_CACHE' => 1, 'SQL_TSI_HOUR' => 1, 'SQL_TSI_WEEK' => 1,
-        'SQL_TSI_YEAR' => 1, 'SUBPARTITION' => 1,
-        'INSERT_METHOD' => 1, 'MASTER_SSL_CA' => 1, 'RELAY_LOG_POS' => 1,
-        'SQL_TSI_MONTH' => 1, 'SUBPARTITIONS' => 1,
-        'AUTO_INCREMENT' => 1, 'AVG_ROW_LENGTH' => 1, 'KEY_BLOCK_SIZE' => 1,
-        'MASTER_LOG_POS' => 1, 'MASTER_SSL_KEY' => 1, 'RELAY_LOG_FILE' => 1,
-        'SQL_TSI_MINUTE' => 1, 'SQL_TSI_SECOND' => 1, 'TABLE_CHECKSUM' => 1,
-        'USER_RESOURCES' => 1,
-        'AUTOEXTEND_SIZE' => 1, 'CONSTRAINT_NAME' => 1, 'DELAY_KEY_WRITE' => 1,
-        'MASTER_LOG_FILE' => 1, 'MASTER_PASSWORD' => 1, 'MASTER_SSL_CERT' => 1,
-        'SQL_TSI_QUARTER' => 1, 'SUBCLASS_ORIGIN' => 1,
-        'MASTER_SERVER_ID' => 1, 'REDO_BUFFER_SIZE' => 1, 'UNDO_BUFFER_SIZE' => 1,
-        'CONSTRAINT_SCHEMA' => 1, 'IGNORE_SERVER_IDS' => 1, 'MASTER_SSL_CAPATH' => 1,
-        'MASTER_SSL_CIPHER' => 1, 'SQL_BUFFER_RESULT' => 1,
-        'CONSTRAINT_CATALOG' => 1,
-        'SQL_TSI_FRAC_SECOND' => 1,
-        'MASTER_CONNECT_RETRY' => 1, 'MAX_QUERIES_PER_HOUR' => 1,
-        'MAX_UPDATES_PER_HOUR' => 1, 'MAX_USER_CONNECTIONS' => 1,
-        'MASTER_HEARTBEAT_PERIOD' => 1,
-        'MAX_CONNECTIONS_PER_HOUR' => 1,
-
-        'AS' => 3, 'BY' => 3, 'IS' => 3, 'ON' => 3, 'OR' => 3, 'TO' => 3,
-        'ADD' => 3, 'ALL' => 3, 'AND' => 3, 'ASC' => 3, 'DEC' => 3, 'DIV' => 3,
-        'FOR' => 3, 'NOT' => 3, 'OUT' => 3, 'SQL' => 3, 'SSL' => 3, 'USE' => 3,
-        'XOR' => 3,
-        'BOTH' => 3, 'CALL' => 3, 'CASE' => 3, 'DESC' => 3, 'DROP' => 3, 'DUAL' => 3,
-        'EACH' => 3, 'ELSE' => 3, 'EXIT' => 3, 'FROM' => 3, 'INT1' => 3, 'INT2' => 3,
-        'INT3' => 3, 'INT4' => 3, 'INT8' => 3, 'INTO' => 3, 'JOIN' => 3, 'KEYS' => 3,
-        'KILL' => 3, 'LIKE' => 3, 'LOAD' => 3, 'LOCK' => 3, 'LONG' => 3, 'LOOP' => 3,
-        'NULL' => 3, 'READ' => 3, 'SHOW' => 3, 'THEN' => 3, 'TRUE' => 3, 'UNDO' => 3,
-        'WHEN' => 3, 'WITH' => 3,
-        'ALTER' => 3, 'CHECK' => 3, 'CROSS' => 3, 'FALSE' => 3, 'FETCH' => 3,
-        'FORCE' => 3, 'GRANT' => 3, 'GROUP' => 3, 'INNER' => 3, 'INOUT' => 3,
-        'LEAVE' => 3, 'LIMIT' => 3, 'LINES' => 3, 'ORDER' => 3, 'OUTER' => 3,
-        'PURGE' => 3, 'RANGE' => 3, 'READS' => 3, 'RLIKE' => 3, 'TABLE' => 3,
-        'UNION' => 3, 'USAGE' => 3, 'USING' => 3, 'WHERE' => 3, 'WHILE' => 3,
-        'WRITE' => 3,
-        'BEFORE' => 3, 'CHANGE' => 3, 'COLUMN' => 3, 'CREATE' => 3, 'CURSOR' => 3,
-        'DELETE' => 3, 'ELSEIF' => 3, 'EXISTS' => 3, 'FLOAT4' => 3, 'FLOAT8' => 3,
-        'HAVING' => 3, 'IGNORE' => 3, 'INFILE' => 3, 'LINEAR' => 3, 'OPTION' => 3,
-        'REGEXP' => 3, 'RENAME' => 3, 'RETURN' => 3, 'REVOKE' => 3, 'SELECT' => 3,
-        'SIGNAL' => 3, 'UNLOCK' => 3, 'UPDATE' => 3,
-        'ANALYZE' => 3, 'BETWEEN' => 3, 'CASCADE' => 3, 'COLLATE' => 3, 'DECLARE' => 3,
-        'DELAYED' => 3, 'ESCAPED' => 3, 'EXPLAIN' => 3, 'FOREIGN' => 3, 'ITERATE' => 3,
-        'LEADING' => 3, 'NATURAL' => 3, 'OUTFILE' => 3, 'PRIMARY' => 3, 'RELEASE' => 3,
-        'REQUIRE' => 3, 'SCHEMAS' => 3, 'TRIGGER' => 3, 'VARYING' => 3,
-        'CONTINUE' => 3, 'DAY_HOUR' => 3, 'DESCRIBE' => 3, 'DISTINCT' => 3,
-        'ENCLOSED' => 3, 'MAXVALUE' => 3, 'MODIFIES' => 3, 'OPTIMIZE' => 3,
-        'RESIGNAL' => 3, 'RESTRICT' => 3, 'SPECIFIC' => 3, 'SQLSTATE' => 3,
-        'STARTING' => 3, 'TRAILING' => 3, 'UNSIGNED' => 3, 'ZEROFILL' => 3,
-        'CONDITION' => 3, 'DATABASES' => 3, 'MIDDLEINT' => 3, 'PRECISION' => 3,
-        'PROCEDURE' => 3, 'SENSITIVE' => 3, 'SEPARATOR' => 3,
-        'ACCESSIBLE' => 3, 'ASENSITIVE' => 3, 'CONSTRAINT' => 3, 'DAY_MINUTE' => 3,
-        'DAY_SECOND' => 3, 'OPTIONALLY' => 3, 'READ_WRITE' => 3, 'REFERENCES' => 3,
-        'SQLWARNING' => 3, 'TERMINATED' => 3, 'YEAR_MONTH' => 3,
-        'DISTINCTROW' => 3, 'HOUR_MINUTE' => 3, 'HOUR_SECOND' => 3, 'INSENSITIVE' => 3,
-        'LOW_PRIORITY' => 3, 'SQLEXCEPTION' => 3, 'VARCHARACTER' => 3,
-        'DETERMINISTIC' => 3, 'HIGH_PRIORITY' => 3, 'MINUTE_SECOND' => 3,
-        'STRAIGHT_JOIN' => 3,
-        'SQL_BIG_RESULT' => 3,
-        'DAY_MICROSECOND' => 3,
-        'HOUR_MICROSECOND' => 3, 'SQL_SMALL_RESULT' => 3,
-        'MINUTE_MICROSECOND' => 3, 'NO_WRITE_TO_BINLOG' => 3, 'SECOND_MICROSECOND' => 3,
-        'SQL_CALC_FOUND_ROWS' => 3,
-        'MASTER_SSL_VERIFY_SERVER_CERT' => 3,
-
-        'GROUP BY' => 7, 'NOT NULL' => 7, 'ORDER BY' => 7, 'SET NULL' => 7,
-        'AND CHAIN' => 7, 'FULL JOIN' => 7, 'IF EXISTS' => 7, 'LEFT JOIN' => 7,
-        'LESS THAN' => 7, 'NO ACTION' => 7, 'ON DELETE' => 7, 'ON UPDATE' => 7,
-        'UNION ALL' => 7,
-        'CROSS JOIN' => 7, 'FOR UPDATE' => 7, 'INNER JOIN' => 7, 'LINEAR KEY' => 7,
-        'NO RELEASE' => 7, 'OR REPLACE' => 7, 'RIGHT JOIN' => 7,
-        'LINEAR HASH' => 7,
-        'AND NO CHAIN' => 7, 'FOR EACH ROW' => 7, 'NATURAL JOIN' => 7,
-        'PARTITION BY' => 7, 'SET PASSWORD' => 7, 'SQL SECURITY' => 7,
-        'CHARACTER SET' => 7, 'IF NOT EXISTS' => 7,
-        'DATA DIRECTORY' => 7, 'UNION DISTINCT' => 7,
-        'DEFAULT CHARSET' => 7, 'DEFAULT COLLATE' => 7, 'FULL OUTER JOIN' => 7,
-        'INDEX DIRECTORY' => 7, 'LEFT OUTER JOIN' => 7, 'SUBPARTITION BY' => 7,
-        'GENERATED ALWAYS' => 7, 'RIGHT OUTER JOIN' => 7,
-        'NATURAL LEFT JOIN' => 7, 'START TRANSACTION' => 7,
-        'LOCK IN SHARE MODE' => 7, 'NATURAL RIGHT JOIN' => 7, 'SELECT TRANSACTION' => 7,
-        'DEFAULT CHARACTER SET' => 7,
-        'NATURAL LEFT OUTER JOIN' => 7,
-        'NATURAL RIGHT OUTER JOIN' => 7, 'WITH CONSISTENT SNAPSHOT' => 7,
-
-        'BIT' => 9, 'XML' => 9,
-        'ENUM' => 9, 'JSON' => 9, 'TEXT' => 9,
-        'ARRAY' => 9,
-        'SERIAL' => 9,
-        'BOOLEAN' => 9,
-        'DATETIME' => 9, 'GEOMETRY' => 9, 'MULTISET' => 9,
-        'MULTILINEPOINT' => 9,
-        'MULTILINEPOLYGON' => 9,
-
-        'INT' => 11, 'SET' => 11,
-        'BLOB' => 11, 'REAL' => 11,
-        'FLOAT' => 11,
-        'BIGINT' => 11, 'BINARY' => 11, 'DOUBLE' => 11,
-        'DECIMAL' => 11, 'INTEGER' => 11, 'NUMERIC' => 11, 'TINYINT' => 11, 'VARCHAR' => 11,
-        'LONGBLOB' => 11, 'LONGTEXT' => 11, 'SMALLINT' => 11, 'TINYBLOB' => 11,
-        'TINYTEXT' => 11,
-        'CHARACTER' => 11, 'MEDIUMINT' => 11, 'VARBINARY' => 11,
-        'MEDIUMBLOB' => 11, 'MEDIUMTEXT' => 11,
-
-        'BINARY VARYING' => 15,
-
-        'KEY' => 19,
-        'INDEX' => 19,
-        'UNIQUE' => 19,
-        'SPATIAL' => 19,
-        'FULLTEXT' => 19,
-
-        'INDEX KEY' => 23,
-        'UNIQUE KEY' => 23,
-        'FOREIGN KEY' => 23, 'PRIMARY KEY' => 23, 'SPATIAL KEY' => 23,
-        'FULLTEXT KEY' => 23, 'UNIQUE INDEX' => 23,
-        'SPATIAL INDEX' => 23,
-        'FULLTEXT INDEX' => 23,
-
-        'X' => 33, 'Y' => 33,
-        'LN' => 33, 'PI' => 33,
-        'ABS' => 33, 'AVG' => 33, 'BIN' => 33, 'COS' => 33, 'COT' => 33, 'DAY' => 33,
-        'ELT' => 33, 'EXP' => 33, 'HEX' => 33, 'LOG' => 33, 'MAX' => 33, 'MD5' => 33,
-        'MID' => 33, 'MIN' => 33, 'NOW' => 33, 'OCT' => 33, 'ORD' => 33, 'POW' => 33,
-        'SHA' => 33, 'SIN' => 33, 'STD' => 33, 'SUM' => 33, 'TAN' => 33,
-        'ACOS' => 33, 'AREA' => 33, 'ASIN' => 33, 'ATAN' => 33, 'CAST' => 33, 'CEIL' => 33,
-        'CONV' => 33, 'HOUR' => 33, 'LOG2' => 33, 'LPAD' => 33, 'RAND' => 33, 'RPAD' => 33,
-        'SHA1' => 33, 'SHA2' => 33, 'SIGN' => 33, 'SQRT' => 33, 'SRID' => 33, 'TRIM' => 33,
-        'USER' => 33, 'UUID' => 33, 'WEEK' => 33,
-        'ASCII' => 33, 'ASWKB' => 33, 'ASWKT' => 33, 'ATAN2' => 33, 'COUNT' => 33,
-        'CRC32' => 33, 'FIELD' => 33, 'FLOOR' => 33, 'INSTR' => 33, 'LCASE' => 33,
-        'LEAST' => 33, 'LOG10' => 33, 'LOWER' => 33, 'LTRIM' => 33, 'MONTH' => 33,
-        'POWER' => 33, 'QUOTE' => 33, 'ROUND' => 33, 'RTRIM' => 33, 'SLEEP' => 33,
-        'SPACE' => 33, 'UCASE' => 33, 'UNHEX' => 33, 'UPPER' => 33,
-        'ASTEXT' => 33, 'BIT_OR' => 33, 'CONCAT' => 33, 'DECODE' => 33, 'ENCODE' => 33,
-        'EQUALS' => 33, 'FORMAT' => 33, 'IFNULL' => 33, 'ISNULL' => 33, 'LENGTH' => 33,
-        'LOCATE' => 33, 'MINUTE' => 33, 'NULLIF' => 33, 'POINTN' => 33, 'SECOND' => 33,
-        'STDDEV' => 33, 'STRCMP' => 33, 'SUBSTR' => 33, 'WITHIN' => 33,
-        'ADDDATE' => 33, 'ADDTIME' => 33, 'AGAINST' => 33, 'BIT_AND' => 33, 'BIT_XOR' => 33,
-        'CEILING' => 33, 'CHARSET' => 33, 'CROSSES' => 33, 'CURDATE' => 33, 'CURTIME' => 33,
-        'DAYNAME' => 33, 'DEGREES' => 33, 'ENCRYPT' => 33, 'EXTRACT' => 33, 'GLENGTH' => 33,
-        'ISEMPTY' => 33, 'QUARTER' => 33, 'RADIANS' => 33, 'REVERSE' => 33, 'SOUNDEX' => 33,
-        'SUBDATE' => 33, 'SUBTIME' => 33, 'SYSDATE' => 33, 'TOUCHES' => 33, 'TO_DAYS' => 33,
-        'VAR_POP' => 33, 'VERSION' => 33, 'WEEKDAY' => 33,
-        'ASBINARY' => 33, 'CENTROID' => 33, 'COALESCE' => 33, 'COMPRESS' => 33,
-        'CONTAINS' => 33, 'DATEDIFF' => 33, 'DATE_ADD' => 33, 'DATE_SUB' => 33,
-        'DISJOINT' => 33, 'ENDPOINT' => 33, 'ENVELOPE' => 33, 'GET_LOCK' => 33,
-        'GREATEST' => 33, 'ISCLOSED' => 33, 'ISSIMPLE' => 33, 'MAKEDATE' => 33,
-        'MAKETIME' => 33, 'MAKE_SET' => 33, 'MBREQUAL' => 33, 'OVERLAPS' => 33,
-        'PASSWORD' => 33, 'POSITION' => 33, 'TIMEDIFF' => 33, 'TRUNCATE' => 33,
-        'VARIANCE' => 33, 'VAR_SAMP' => 33, 'YEARWEEK' => 33,
-        'BENCHMARK' => 33, 'BIT_COUNT' => 33, 'COLLATION' => 33, 'CONCAT_WS' => 33,
-        'DAYOFWEEK' => 33, 'DAYOFYEAR' => 33, 'DIMENSION' => 33, 'FROM_DAYS' => 33,
-        'GEOMETRYN' => 33, 'INET_ATON' => 33, 'INET_NTOA' => 33, 'LOAD_FILE' => 33,
-        'MBRWITHIN' => 33, 'MONTHNAME' => 33, 'NUMPOINTS' => 33, 'ROW_COUNT' => 33,
-        'SUBSTRING' => 33, 'UPDATEXML' => 33,
-        'BIT_LENGTH' => 33, 'CONVERT_TZ' => 33, 'DAYOFMONTH' => 33, 'EXPORT_SET' => 33,
-        'FOUND_ROWS' => 33, 'GET_FORMAT' => 33, 'INTERSECTS' => 33, 'MBRTOUCHES' => 33,
-        'MULTIPOINT' => 33, 'NAME_CONST' => 33, 'PERIOD_ADD' => 33, 'STARTPOINT' => 33,
-        'STDDEV_POP' => 33, 'TO_SECONDS' => 33, 'UNCOMPRESS' => 33, 'UUID_SHORT' => 33,
-        'WEEKOFYEAR' => 33,
-        'AES_DECRYPT' => 33, 'AES_ENCRYPT' => 33, 'CHAR_LENGTH' => 33, 'DATE_FORMAT' => 33,
-        'DES_DECRYPT' => 33, 'DES_ENCRYPT' => 33, 'FIND_IN_SET' => 33, 'GEOMFROMWKB' => 33,
-        'LINEFROMWKB' => 33, 'MBRCONTAINS' => 33, 'MBRDISJOINT' => 33, 'MBROVERLAPS' => 33,
-        'MICROSECOND' => 33, 'PERIOD_DIFF' => 33, 'POLYFROMWKB' => 33, 'SEC_TO_TIME' => 33,
-        'STDDEV_SAMP' => 33, 'STR_TO_DATE' => 33, 'SYSTEM_USER' => 33, 'TIME_FORMAT' => 33,
-        'TIME_TO_SEC' => 33,
-        'COERCIBILITY' => 33, 'EXTERIORRING' => 33, 'EXTRACTVALUE' => 33,
-        'GEOMETRYTYPE' => 33, 'GEOMFROMTEXT' => 33, 'GROUP_CONCAT' => 33,
-        'IS_FREE_LOCK' => 33, 'IS_USED_LOCK' => 33, 'LINEFROMTEXT' => 33,
-        'MLINEFROMWKB' => 33, 'MPOLYFROMWKB' => 33, 'MULTIPOLYGON' => 33,
-        'OCTET_LENGTH' => 33, 'OLD_PASSWORD' => 33, 'POINTFROMWKB' => 33,
-        'POLYFROMTEXT' => 33, 'RELEASE_LOCK' => 33, 'SESSION_USER' => 33,
-        'TIMESTAMPADD' => 33,
-        'CONNECTION_ID' => 33, 'FROM_UNIXTIME' => 33, 'INTERIORRINGN' => 33,
-        'MBRINTERSECTS' => 33, 'MLINEFROMTEXT' => 33, 'MPOINTFROMWKB' => 33,
-        'MPOLYFROMTEXT' => 33, 'NUMGEOMETRIES' => 33, 'POINTFROMTEXT' => 33,
-        'TIMESTAMPDIFF' => 33,
-        'LAST_INSERT_ID' => 33, 'MPOINTFROMTEXT' => 33, 'POLYGONFROMWKB' => 33,
-        'UNIX_TIMESTAMP' => 33,
-        'GEOMCOLLFROMWKB' => 33, 'MASTER_POS_WAIT' => 33, 'POLYGONFROMTEXT' => 33,
-        'SUBSTRING_INDEX' => 33,
-        'CHARACTER_LENGTH' => 33, 'GEOMCOLLFROMTEXT' => 33, 'GEOMETRYFROMTEXT' => 33,
-        'NUMINTERIORRINGS' => 33,
-        'LINESTRINGFROMWKB' => 33, 'MULTIPOINTFROMWKB' => 33,
-        'MULTIPOINTFROMTEXT' => 33,
-        'MULTIPOLYGONFROMWKB' => 33, 'UNCOMPRESSED_LENGTH' => 33,
-        'MULTIPOLYGONFROMTEXT' => 33,
-        'MULTILINESTRINGFROMWKB' => 33,
-        'MULTILINESTRINGFROMTEXT' => 33,
-        'GEOMETRYCOLLECTIONFROMWKB' => 33,
-        'GEOMETRYCOLLECTIONFROMTEXT' => 33,
-
-        'IF' => 35, 'IN' => 35,
-        'MOD' => 35,
-        'LEFT' => 35,
-        'MATCH' => 35, 'RIGHT' => 35,
-        'INSERT' => 35, 'REPEAT' => 35, 'SCHEMA' => 35, 'VALUES' => 35,
-        'CONVERT' => 35, 'DEFAULT' => 35, 'REPLACE' => 35,
-        'DATABASE' => 35, 'UTC_DATE' => 35, 'UTC_TIME' => 35,
-        'LOCALTIME' => 35,
-        'CURRENT_DATE' => 35, 'CURRENT_TIME' => 35, 'CURRENT_USER' => 35,
-        'UTC_TIMESTAMP' => 35,
-        'LOCALTIMESTAMP' => 35,
-        'CURRENT_TIMESTAMP' => 35,
-
-        'NOT IN' => 39,
-
-        'DATE' => 41, 'TIME' => 41, 'YEAR' => 41,
-        'POINT' => 41,
-        'POLYGON' => 41,
-        'TIMESTAMP' => 41,
-        'LINESTRING' => 41,
-        'MULTILINESTRING' => 41,
-        'GEOMETRYCOLLECTION' => 41,
-
-        'CHAR' => 43,
-        'INTERVAL' => 43,
-
-    );
-}
diff --git a/#pma/libraries/sql-parser/src/Contexts/ContextMySql50600.php b/#pma/libraries/sql-parser/src/Contexts/ContextMySql50600.php
deleted file mode 100644
index 94655aef..00000000
--- a/#pma/libraries/sql-parser/src/Contexts/ContextMySql50600.php
+++ /dev/null
@@ -1,346 +0,0 @@
-<?php
-
-/**
- * Context for MySQL 5.6.
- *
- * This file was auto-generated.
- *
- * @package    SqlParser
- * @subpackage Contexts
- * @link       https://dev.mysql.com/doc/refman/5.6/en/keywords.html
- */
-namespace SqlParser\Contexts;
-
-use SqlParser\Context;
-
-/**
- * Context for MySQL 5.6.
- *
- * @category   Contexts
- * @package    SqlParser
- * @subpackage Contexts
- * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-class ContextMySql50600 extends Context
-{
-
-    /**
-     * List of keywords.
-     *
-     * The value associated to each keyword represents its flags.
-     *
-     * @see Token::FLAG_KEYWORD_*
-     *
-     * @var array
-     */
-    public static $KEYWORDS = array(
-
-        'AT' => 1, 'DO' => 1, 'IO' => 1, 'NO' => 1, 'XA' => 1,
-        'ANY' => 1, 'CPU' => 1, 'END' => 1, 'IPC' => 1, 'NDB' => 1, 'NEW' => 1,
-        'ONE' => 1, 'ROW' => 1,
-        'BOOL' => 1, 'BYTE' => 1, 'CODE' => 1, 'CUBE' => 1, 'DATA' => 1, 'DISK' => 1,
-        'ENDS' => 1, 'FAST' => 1, 'FILE' => 1, 'FULL' => 1, 'HASH' => 1, 'HELP' => 1,
-        'HOST' => 1, 'LAST' => 1, 'LESS' => 1, 'LIST' => 1, 'LOGS' => 1, 'MODE' => 1,
-        'NAME' => 1, 'NEXT' => 1, 'NONE' => 1, 'ONLY' => 1, 'OPEN' => 1, 'PAGE' => 1,
-        'PORT' => 1, 'PREV' => 1, 'ROWS' => 1, 'SLOW' => 1, 'SOME' => 1, 'STOP' => 1,
-        'THAN' => 1, 'TYPE' => 1, 'VIEW' => 1, 'WAIT' => 1, 'WORK' => 1, 'X509' => 1,
-        'AFTER' => 1, 'BEGIN' => 1, 'BLOCK' => 1, 'BTREE' => 1, 'CACHE' => 1,
-        'CHAIN' => 1, 'CLOSE' => 1, 'ERROR' => 1, 'EVENT' => 1, 'EVERY' => 1,
-        'FIRST' => 1, 'FIXED' => 1, 'FLUSH' => 1, 'FOUND' => 1, 'HOSTS' => 1,
-        'LEVEL' => 1, 'LOCAL' => 1, 'LOCKS' => 1, 'MERGE' => 1, 'MUTEX' => 1,
-        'NAMES' => 1, 'NCHAR' => 1, 'OWNER' => 1, 'PHASE' => 1, 'PROXY' => 1,
-        'QUERY' => 1, 'QUICK' => 1, 'RELAY' => 1, 'RESET' => 1, 'RTREE' => 1,
-        'SHARE' => 1, 'SLAVE' => 1, 'START' => 1, 'SUPER' => 1, 'SWAPS' => 1,
-        'TYPES' => 1, 'UNTIL' => 1, 'VALUE' => 1,
-        'ACTION' => 1, 'BACKUP' => 1, 'BINLOG' => 1, 'CIPHER' => 1, 'CLIENT' => 1,
-        'COMMIT' => 1, 'ENABLE' => 1, 'ENGINE' => 1, 'ERRORS' => 1, 'ESCAPE' => 1,
-        'EVENTS' => 1, 'EXPIRE' => 1, 'EXPORT' => 1, 'FAULTS' => 1, 'FIELDS' => 1,
-        'GLOBAL' => 1, 'GRANTS' => 1, 'IMPORT' => 1, 'ISSUER' => 1, 'LEAVES' => 1,
-        'MASTER' => 1, 'MEDIUM' => 1, 'MEMORY' => 1, 'MODIFY' => 1, 'NUMBER' => 1,
-        'OFFSET' => 1, 'PARSER' => 1, 'PLUGIN' => 1, 'RELOAD' => 1, 'REMOVE' => 1,
-        'REPAIR' => 1, 'RESUME' => 1, 'ROLLUP' => 1, 'SERVER' => 1, 'SIGNED' => 1,
-        'SIMPLE' => 1, 'SOCKET' => 1, 'SONAME' => 1, 'SOUNDS' => 1, 'SOURCE' => 1,
-        'STARTS' => 1, 'STATUS' => 1, 'STRING' => 1, 'TABLES' => 1,
-        'ANALYSE' => 1, 'AUTHORS' => 1, 'CHANGED' => 1, 'COLUMNS' => 1, 'COMMENT' => 1,
-        'COMPACT' => 1, 'CONTEXT' => 1, 'CURRENT' => 1, 'DEFINER' => 1, 'DISABLE' => 1,
-        'DISCARD' => 1, 'DYNAMIC' => 1, 'ENGINES' => 1, 'EXECUTE' => 1, 'GENERAL' => 1,
-        'HANDLER' => 1, 'INDEXES' => 1, 'INSTALL' => 1, 'INVOKER' => 1, 'LOGFILE' => 1,
-        'MIGRATE' => 1, 'NO_WAIT' => 1, 'OPTIONS' => 1, 'PARTIAL' => 1, 'PLUGINS' => 1,
-        'PREPARE' => 1, 'PROFILE' => 1, 'REBUILD' => 1, 'RECOVER' => 1, 'RESTORE' => 1,
-        'RETURNS' => 1, 'ROUTINE' => 1, 'SESSION' => 1, 'STORAGE' => 1, 'SUBJECT' => 1,
-        'SUSPEND' => 1, 'UNICODE' => 1, 'UNKNOWN' => 1, 'UPGRADE' => 1, 'USE_FRM' => 1,
-        'VIRTUAL' => 1, 'WRAPPER' => 1,
-        'CASCADED' => 1, 'CHECKSUM' => 1, 'DATAFILE' => 1, 'DUMPFILE' => 1,
-        'EXCHANGE' => 1, 'EXTENDED' => 1, 'FUNCTION' => 1, 'LANGUAGE' => 1,
-        'MAX_ROWS' => 1, 'MAX_SIZE' => 1, 'MIN_ROWS' => 1, 'NATIONAL' => 1,
-        'NVARCHAR' => 1, 'ONE_SHOT' => 1, 'PRESERVE' => 1, 'PROFILES' => 1,
-        'REDOFILE' => 1, 'RELAYLOG' => 1, 'ROLLBACK' => 1, 'SCHEDULE' => 1,
-        'SECURITY' => 1, 'SHUTDOWN' => 1, 'SNAPSHOT' => 1, 'SWITCHES' => 1,
-        'TRIGGERS' => 1, 'UNDOFILE' => 1, 'WARNINGS' => 1,
-        'AGGREGATE' => 1, 'ALGORITHM' => 1, 'COMMITTED' => 1, 'DIRECTORY' => 1,
-        'DUPLICATE' => 1, 'EXPANSION' => 1, 'IO_THREAD' => 1, 'ISOLATION' => 1,
-        'NODEGROUP' => 1, 'PACK_KEYS' => 1, 'READ_ONLY' => 1, 'REDUNDANT' => 1,
-        'SAVEPOINT' => 1, 'SQL_CACHE' => 1, 'TEMPORARY' => 1, 'TEMPTABLE' => 1,
-        'UNDEFINED' => 1, 'UNINSTALL' => 1, 'VARIABLES' => 1,
-        'COMPLETION' => 1, 'COMPRESSED' => 1, 'CONCURRENT' => 1, 'CONNECTION' => 1,
-        'CONSISTENT' => 1, 'DEALLOCATE' => 1, 'IDENTIFIED' => 1, 'MASTER_SSL' => 1,
-        'NDBCLUSTER' => 1, 'PARTITIONS' => 1, 'PERSISTENT' => 1, 'PLUGIN_DIR' => 1,
-        'PRIVILEGES' => 1, 'REORGANIZE' => 1, 'REPEATABLE' => 1, 'ROW_FORMAT' => 1,
-        'SQL_THREAD' => 1, 'TABLESPACE' => 1, 'TABLE_NAME' => 1,
-        'COLUMN_NAME' => 1, 'CURSOR_NAME' => 1, 'DIAGNOSTICS' => 1, 'EXTENT_SIZE' => 1,
-        'MASTER_HOST' => 1, 'MASTER_PORT' => 1, 'MASTER_USER' => 1, 'MYSQL_ERRNO' => 1,
-        'PROCESSLIST' => 1, 'REPLICATION' => 1, 'SCHEMA_NAME' => 1, 'SQL_TSI_DAY' => 1,
-        'TRANSACTION' => 1, 'UNCOMMITTED' => 1,
-        'CATALOG_NAME' => 1, 'CLASS_ORIGIN' => 1, 'CONTRIBUTORS' => 1,
-        'DEFAULT_AUTH' => 1, 'DES_KEY_FILE' => 1, 'INITIAL_SIZE' => 1,
-        'MASTER_DELAY' => 1, 'MESSAGE_TEXT' => 1, 'PARTITIONING' => 1,
-        'RELAY_THREAD' => 1, 'SERIALIZABLE' => 1, 'SQL_NO_CACHE' => 1,
-        'SQL_TSI_HOUR' => 1, 'SQL_TSI_WEEK' => 1, 'SQL_TSI_YEAR' => 1,
-        'SUBPARTITION' => 1,
-        'COLUMN_FORMAT' => 1, 'INSERT_METHOD' => 1, 'MASTER_SSL_CA' => 1,
-        'RELAY_LOG_POS' => 1, 'SQL_TSI_MONTH' => 1, 'SUBPARTITIONS' => 1,
-        'AUTO_INCREMENT' => 1, 'AVG_ROW_LENGTH' => 1, 'KEY_BLOCK_SIZE' => 1,
-        'MASTER_LOG_POS' => 1, 'MASTER_SSL_CRL' => 1, 'MASTER_SSL_KEY' => 1,
-        'RELAY_LOG_FILE' => 1, 'SQL_TSI_MINUTE' => 1, 'SQL_TSI_SECOND' => 1,
-        'TABLE_CHECKSUM' => 1, 'USER_RESOURCES' => 1,
-        'AUTOEXTEND_SIZE' => 1, 'CONSTRAINT_NAME' => 1, 'DELAY_KEY_WRITE' => 1,
-        'MASTER_LOG_FILE' => 1, 'MASTER_PASSWORD' => 1, 'MASTER_SSL_CERT' => 1,
-        'SQL_AFTER_GTIDS' => 1, 'SQL_TSI_QUARTER' => 1, 'SUBCLASS_ORIGIN' => 1,
-        'MASTER_SERVER_ID' => 1, 'REDO_BUFFER_SIZE' => 1, 'SQL_BEFORE_GTIDS' => 1,
-        'STATS_PERSISTENT' => 1, 'UNDO_BUFFER_SIZE' => 1,
-        'CONSTRAINT_SCHEMA' => 1, 'IGNORE_SERVER_IDS' => 1, 'MASTER_SSL_CAPATH' => 1,
-        'MASTER_SSL_CIPHER' => 1, 'RETURNED_SQLSTATE' => 1, 'SQL_BUFFER_RESULT' => 1,
-        'STATS_AUTO_RECALC' => 1,
-        'CONSTRAINT_CATALOG' => 1, 'MASTER_RETRY_COUNT' => 1, 'MASTER_SSL_CRLPATH' => 1,
-        'SQL_AFTER_MTS_GAPS' => 1, 'STATS_SAMPLE_PAGES' => 1,
-        'MASTER_AUTO_POSITION' => 1, 'MASTER_CONNECT_RETRY' => 1,
-        'MAX_QUERIES_PER_HOUR' => 1, 'MAX_UPDATES_PER_HOUR' => 1,
-        'MAX_USER_CONNECTIONS' => 1,
-        'MASTER_HEARTBEAT_PERIOD' => 1,
-        'MAX_CONNECTIONS_PER_HOUR' => 1,
-
-        'AS' => 3, 'BY' => 3, 'IS' => 3, 'ON' => 3, 'OR' => 3, 'TO' => 3,
-        'ADD' => 3, 'ALL' => 3, 'AND' => 3, 'ASC' => 3, 'DEC' => 3, 'DIV' => 3,
-        'FOR' => 3, 'GET' => 3, 'NOT' => 3, 'OUT' => 3, 'SQL' => 3, 'SSL' => 3,
-        'USE' => 3, 'XOR' => 3,
-        'BOTH' => 3, 'CALL' => 3, 'CASE' => 3, 'DESC' => 3, 'DROP' => 3, 'DUAL' => 3,
-        'EACH' => 3, 'ELSE' => 3, 'EXIT' => 3, 'FROM' => 3, 'INT1' => 3, 'INT2' => 3,
-        'INT3' => 3, 'INT4' => 3, 'INT8' => 3, 'INTO' => 3, 'JOIN' => 3, 'KEYS' => 3,
-        'KILL' => 3, 'LIKE' => 3, 'LOAD' => 3, 'LOCK' => 3, 'LONG' => 3, 'LOOP' => 3,
-        'NULL' => 3, 'READ' => 3, 'SHOW' => 3, 'THEN' => 3, 'TRUE' => 3, 'UNDO' => 3,
-        'WHEN' => 3, 'WITH' => 3,
-        'ALTER' => 3, 'CHECK' => 3, 'CROSS' => 3, 'FALSE' => 3, 'FETCH' => 3,
-        'FORCE' => 3, 'GRANT' => 3, 'GROUP' => 3, 'INNER' => 3, 'INOUT' => 3,
-        'LEAVE' => 3, 'LIMIT' => 3, 'LINES' => 3, 'ORDER' => 3, 'OUTER' => 3,
-        'PURGE' => 3, 'RANGE' => 3, 'READS' => 3, 'RLIKE' => 3, 'TABLE' => 3,
-        'UNION' => 3, 'USAGE' => 3, 'USING' => 3, 'WHERE' => 3, 'WHILE' => 3,
-        'WRITE' => 3,
-        'BEFORE' => 3, 'CHANGE' => 3, 'COLUMN' => 3, 'CREATE' => 3, 'CURSOR' => 3,
-        'DELETE' => 3, 'ELSEIF' => 3, 'EXISTS' => 3, 'FLOAT4' => 3, 'FLOAT8' => 3,
-        'HAVING' => 3, 'IGNORE' => 3, 'INFILE' => 3, 'LINEAR' => 3, 'OPTION' => 3,
-        'REGEXP' => 3, 'RENAME' => 3, 'RETURN' => 3, 'REVOKE' => 3, 'SELECT' => 3,
-        'SIGNAL' => 3, 'UNLOCK' => 3, 'UPDATE' => 3,
-        'ANALYZE' => 3, 'BETWEEN' => 3, 'CASCADE' => 3, 'COLLATE' => 3, 'DECLARE' => 3,
-        'DELAYED' => 3, 'ESCAPED' => 3, 'EXPLAIN' => 3, 'FOREIGN' => 3, 'ITERATE' => 3,
-        'LEADING' => 3, 'NATURAL' => 3, 'OUTFILE' => 3, 'PRIMARY' => 3, 'RELEASE' => 3,
-        'REQUIRE' => 3, 'SCHEMAS' => 3, 'TRIGGER' => 3, 'VARYING' => 3,
-        'CONTINUE' => 3, 'DAY_HOUR' => 3, 'DESCRIBE' => 3, 'DISTINCT' => 3,
-        'ENCLOSED' => 3, 'MAXVALUE' => 3, 'MODIFIES' => 3, 'OPTIMIZE' => 3,
-        'RESIGNAL' => 3, 'RESTRICT' => 3, 'SPECIFIC' => 3, 'SQLSTATE' => 3,
-        'STARTING' => 3, 'TRAILING' => 3, 'UNSIGNED' => 3, 'ZEROFILL' => 3,
-        'CONDITION' => 3, 'DATABASES' => 3, 'MIDDLEINT' => 3, 'PARTITION' => 3,
-        'PRECISION' => 3, 'PROCEDURE' => 3, 'SENSITIVE' => 3, 'SEPARATOR' => 3,
-        'ACCESSIBLE' => 3, 'ASENSITIVE' => 3, 'CONSTRAINT' => 3, 'DAY_MINUTE' => 3,
-        'DAY_SECOND' => 3, 'OPTIONALLY' => 3, 'READ_WRITE' => 3, 'REFERENCES' => 3,
-        'SQLWARNING' => 3, 'TERMINATED' => 3, 'YEAR_MONTH' => 3,
-        'DISTINCTROW' => 3, 'HOUR_MINUTE' => 3, 'HOUR_SECOND' => 3, 'INSENSITIVE' => 3,
-        'MASTER_BIND' => 3,
-        'LOW_PRIORITY' => 3, 'SQLEXCEPTION' => 3, 'VARCHARACTER' => 3,
-        'DETERMINISTIC' => 3, 'HIGH_PRIORITY' => 3, 'MINUTE_SECOND' => 3,
-        'STRAIGHT_JOIN' => 3,
-        'IO_AFTER_GTIDS' => 3, 'SQL_BIG_RESULT' => 3,
-        'DAY_MICROSECOND' => 3, 'IO_BEFORE_GTIDS' => 3,
-        'HOUR_MICROSECOND' => 3, 'SQL_SMALL_RESULT' => 3,
-        'MINUTE_MICROSECOND' => 3, 'NO_WRITE_TO_BINLOG' => 3, 'SECOND_MICROSECOND' => 3,
-        'SQL_CALC_FOUND_ROWS' => 3,
-        'MASTER_SSL_VERIFY_SERVER_CERT' => 3,
-
-        'GROUP BY' => 7, 'NOT NULL' => 7, 'ORDER BY' => 7, 'SET NULL' => 7,
-        'AND CHAIN' => 7, 'FULL JOIN' => 7, 'IF EXISTS' => 7, 'LEFT JOIN' => 7,
-        'LESS THAN' => 7, 'NO ACTION' => 7, 'ON DELETE' => 7, 'ON UPDATE' => 7,
-        'UNION ALL' => 7,
-        'CROSS JOIN' => 7, 'FOR UPDATE' => 7, 'INNER JOIN' => 7, 'LINEAR KEY' => 7,
-        'NO RELEASE' => 7, 'OR REPLACE' => 7, 'RIGHT JOIN' => 7,
-        'LINEAR HASH' => 7,
-        'AND NO CHAIN' => 7, 'FOR EACH ROW' => 7, 'NATURAL JOIN' => 7,
-        'PARTITION BY' => 7, 'SET PASSWORD' => 7, 'SQL SECURITY' => 7,
-        'CHARACTER SET' => 7, 'IF NOT EXISTS' => 7,
-        'DATA DIRECTORY' => 7, 'UNION DISTINCT' => 7,
-        'DEFAULT CHARSET' => 7, 'DEFAULT COLLATE' => 7, 'FULL OUTER JOIN' => 7,
-        'INDEX DIRECTORY' => 7, 'LEFT OUTER JOIN' => 7, 'SUBPARTITION BY' => 7,
-        'GENERATED ALWAYS' => 7, 'RIGHT OUTER JOIN' => 7,
-        'NATURAL LEFT JOIN' => 7, 'START TRANSACTION' => 7,
-        'LOCK IN SHARE MODE' => 7, 'NATURAL RIGHT JOIN' => 7, 'SELECT TRANSACTION' => 7,
-        'DEFAULT CHARACTER SET' => 7,
-        'NATURAL LEFT OUTER JOIN' => 7,
-        'NATURAL RIGHT OUTER JOIN' => 7, 'WITH CONSISTENT SNAPSHOT' => 7,
-
-        'BIT' => 9, 'XML' => 9,
-        'ENUM' => 9, 'JSON' => 9, 'TEXT' => 9,
-        'ARRAY' => 9,
-        'SERIAL' => 9,
-        'BOOLEAN' => 9,
-        'DATETIME' => 9, 'GEOMETRY' => 9, 'MULTISET' => 9,
-        'MULTILINEPOINT' => 9,
-        'MULTILINEPOLYGON' => 9,
-
-        'INT' => 11, 'SET' => 11,
-        'BLOB' => 11, 'REAL' => 11,
-        'FLOAT' => 11,
-        'BIGINT' => 11, 'BINARY' => 11, 'DOUBLE' => 11,
-        'DECIMAL' => 11, 'INTEGER' => 11, 'NUMERIC' => 11, 'TINYINT' => 11, 'VARCHAR' => 11,
-        'LONGBLOB' => 11, 'LONGTEXT' => 11, 'SMALLINT' => 11, 'TINYBLOB' => 11,
-        'TINYTEXT' => 11,
-        'CHARACTER' => 11, 'MEDIUMINT' => 11, 'VARBINARY' => 11,
-        'MEDIUMBLOB' => 11, 'MEDIUMTEXT' => 11,
-
-        'BINARY VARYING' => 15,
-
-        'KEY' => 19,
-        'INDEX' => 19,
-        'UNIQUE' => 19,
-        'SPATIAL' => 19,
-        'FULLTEXT' => 19,
-
-        'INDEX KEY' => 23,
-        'UNIQUE KEY' => 23,
-        'FOREIGN KEY' => 23, 'PRIMARY KEY' => 23, 'SPATIAL KEY' => 23,
-        'FULLTEXT KEY' => 23, 'UNIQUE INDEX' => 23,
-        'SPATIAL INDEX' => 23,
-        'FULLTEXT INDEX' => 23,
-
-        'X' => 33, 'Y' => 33,
-        'LN' => 33, 'PI' => 33,
-        'ABS' => 33, 'AVG' => 33, 'BIN' => 33, 'COS' => 33, 'COT' => 33, 'DAY' => 33,
-        'ELT' => 33, 'EXP' => 33, 'HEX' => 33, 'LOG' => 33, 'MAX' => 33, 'MD5' => 33,
-        'MID' => 33, 'MIN' => 33, 'NOW' => 33, 'OCT' => 33, 'ORD' => 33, 'POW' => 33,
-        'SHA' => 33, 'SIN' => 33, 'STD' => 33, 'SUM' => 33, 'TAN' => 33,
-        'ACOS' => 33, 'AREA' => 33, 'ASIN' => 33, 'ATAN' => 33, 'CAST' => 33, 'CEIL' => 33,
-        'CONV' => 33, 'HOUR' => 33, 'LOG2' => 33, 'LPAD' => 33, 'RAND' => 33, 'RPAD' => 33,
-        'SHA1' => 33, 'SHA2' => 33, 'SIGN' => 33, 'SQRT' => 33, 'SRID' => 33, 'ST_X' => 33,
-        'ST_Y' => 33, 'TRIM' => 33, 'USER' => 33, 'UUID' => 33, 'WEEK' => 33,
-        'ASCII' => 33, 'ASWKB' => 33, 'ASWKT' => 33, 'ATAN2' => 33, 'COUNT' => 33,
-        'CRC32' => 33, 'FIELD' => 33, 'FLOOR' => 33, 'INSTR' => 33, 'LCASE' => 33,
-        'LEAST' => 33, 'LOG10' => 33, 'LOWER' => 33, 'LTRIM' => 33, 'MONTH' => 33,
-        'POWER' => 33, 'QUOTE' => 33, 'ROUND' => 33, 'RTRIM' => 33, 'SLEEP' => 33,
-        'SPACE' => 33, 'UCASE' => 33, 'UNHEX' => 33, 'UPPER' => 33,
-        'ASTEXT' => 33, 'BIT_OR' => 33, 'BUFFER' => 33, 'CONCAT' => 33, 'DECODE' => 33,
-        'ENCODE' => 33, 'EQUALS' => 33, 'FORMAT' => 33, 'IFNULL' => 33, 'ISNULL' => 33,
-        'LENGTH' => 33, 'LOCATE' => 33, 'MINUTE' => 33, 'NULLIF' => 33, 'POINTN' => 33,
-        'SECOND' => 33, 'STDDEV' => 33, 'STRCMP' => 33, 'SUBSTR' => 33, 'WITHIN' => 33,
-        'ADDDATE' => 33, 'ADDTIME' => 33, 'AGAINST' => 33, 'BIT_AND' => 33, 'BIT_XOR' => 33,
-        'CEILING' => 33, 'CHARSET' => 33, 'CROSSES' => 33, 'CURDATE' => 33, 'CURTIME' => 33,
-        'DAYNAME' => 33, 'DEGREES' => 33, 'ENCRYPT' => 33, 'EXTRACT' => 33, 'GLENGTH' => 33,
-        'ISEMPTY' => 33, 'IS_IPV4' => 33, 'IS_IPV6' => 33, 'QUARTER' => 33, 'RADIANS' => 33,
-        'REVERSE' => 33, 'SOUNDEX' => 33, 'ST_AREA' => 33, 'ST_SRID' => 33, 'SUBDATE' => 33,
-        'SUBTIME' => 33, 'SYSDATE' => 33, 'TOUCHES' => 33, 'TO_DAYS' => 33, 'VAR_POP' => 33,
-        'VERSION' => 33, 'WEEKDAY' => 33,
-        'ASBINARY' => 33, 'CENTROID' => 33, 'COALESCE' => 33, 'COMPRESS' => 33,
-        'CONTAINS' => 33, 'DATEDIFF' => 33, 'DATE_ADD' => 33, 'DATE_SUB' => 33,
-        'DISJOINT' => 33, 'ENDPOINT' => 33, 'ENVELOPE' => 33, 'GET_LOCK' => 33,
-        'GREATEST' => 33, 'ISCLOSED' => 33, 'ISSIMPLE' => 33, 'MAKEDATE' => 33,
-        'MAKETIME' => 33, 'MAKE_SET' => 33, 'MBREQUAL' => 33, 'OVERLAPS' => 33,
-        'PASSWORD' => 33, 'POSITION' => 33, 'ST_ASWKB' => 33, 'ST_ASWKT' => 33,
-        'ST_UNION' => 33, 'TIMEDIFF' => 33, 'TRUNCATE' => 33, 'VARIANCE' => 33,
-        'VAR_SAMP' => 33, 'YEARWEEK' => 33,
-        'BENCHMARK' => 33, 'BIT_COUNT' => 33, 'COLLATION' => 33, 'CONCAT_WS' => 33,
-        'DAYOFWEEK' => 33, 'DAYOFYEAR' => 33, 'DIMENSION' => 33, 'FROM_DAYS' => 33,
-        'GEOMETRYN' => 33, 'INET_ATON' => 33, 'INET_NTOA' => 33, 'LOAD_FILE' => 33,
-        'MBRWITHIN' => 33, 'MONTHNAME' => 33, 'NUMPOINTS' => 33, 'ROW_COUNT' => 33,
-        'ST_ASTEXT' => 33, 'ST_BUFFER' => 33, 'ST_EQUALS' => 33, 'ST_POINTN' => 33,
-        'ST_WITHIN' => 33, 'SUBSTRING' => 33, 'TO_BASE64' => 33, 'UPDATEXML' => 33,
-        'BIT_LENGTH' => 33, 'CONVERT_TZ' => 33, 'DAYOFMONTH' => 33, 'EXPORT_SET' => 33,
-        'FOUND_ROWS' => 33, 'GET_FORMAT' => 33, 'INET6_ATON' => 33, 'INET6_NTOA' => 33,
-        'INTERSECTS' => 33, 'MBRTOUCHES' => 33, 'MULTIPOINT' => 33, 'NAME_CONST' => 33,
-        'PERIOD_ADD' => 33, 'STARTPOINT' => 33, 'STDDEV_POP' => 33, 'ST_CROSSES' => 33,
-        'ST_ISEMPTY' => 33, 'ST_TOUCHES' => 33, 'TO_SECONDS' => 33, 'UNCOMPRESS' => 33,
-        'UUID_SHORT' => 33, 'WEEKOFYEAR' => 33,
-        'AES_DECRYPT' => 33, 'AES_ENCRYPT' => 33, 'CHAR_LENGTH' => 33, 'DATE_FORMAT' => 33,
-        'DES_DECRYPT' => 33, 'DES_ENCRYPT' => 33, 'FIND_IN_SET' => 33, 'FROM_BASE64' => 33,
-        'GEOMFROMWKB' => 33, 'GTID_SUBSET' => 33, 'LINEFROMWKB' => 33, 'MBRCONTAINS' => 33,
-        'MBRDISJOINT' => 33, 'MBROVERLAPS' => 33, 'MICROSECOND' => 33, 'PERIOD_DIFF' => 33,
-        'POLYFROMWKB' => 33, 'SEC_TO_TIME' => 33, 'STDDEV_SAMP' => 33, 'STR_TO_DATE' => 33,
-        'ST_ASBINARY' => 33, 'ST_CENTROID' => 33, 'ST_CONTAINS' => 33, 'ST_DISJOINT' => 33,
-        'ST_DISTANCE' => 33, 'ST_ENDPOINT' => 33, 'ST_ENVELOPE' => 33, 'ST_ISCLOSED' => 33,
-        'ST_ISSIMPLE' => 33, 'ST_OVERLAPS' => 33, 'SYSTEM_USER' => 33, 'TIME_FORMAT' => 33,
-        'TIME_TO_SEC' => 33,
-        'COERCIBILITY' => 33, 'EXTERIORRING' => 33, 'EXTRACTVALUE' => 33,
-        'GEOMETRYTYPE' => 33, 'GEOMFROMTEXT' => 33, 'GROUP_CONCAT' => 33,
-        'IS_FREE_LOCK' => 33, 'IS_USED_LOCK' => 33, 'LINEFROMTEXT' => 33,
-        'MLINEFROMWKB' => 33, 'MPOLYFROMWKB' => 33, 'MULTIPOLYGON' => 33,
-        'OCTET_LENGTH' => 33, 'OLD_PASSWORD' => 33, 'POINTFROMWKB' => 33,
-        'POLYFROMTEXT' => 33, 'RANDOM_BYTES' => 33, 'RELEASE_LOCK' => 33,
-        'SESSION_USER' => 33, 'ST_DIMENSION' => 33, 'ST_GEOMETRYN' => 33,
-        'ST_NUMPOINTS' => 33, 'TIMESTAMPADD' => 33,
-        'CONNECTION_ID' => 33, 'CREATE_DIGEST' => 33, 'FROM_UNIXTIME' => 33,
-        'GTID_SUBTRACT' => 33, 'INTERIORRINGN' => 33, 'MBRINTERSECTS' => 33,
-        'MLINEFROMTEXT' => 33, 'MPOINTFROMWKB' => 33, 'MPOLYFROMTEXT' => 33,
-        'NUMGEOMETRIES' => 33, 'POINTFROMTEXT' => 33, 'ST_DIFFERENCE' => 33,
-        'ST_INTERSECTS' => 33, 'ST_STARTPOINT' => 33, 'TIMESTAMPDIFF' => 33,
-        'WEIGHT_STRING' => 33,
-        'IS_IPV4_COMPAT' => 33, 'IS_IPV4_MAPPED' => 33, 'LAST_INSERT_ID' => 33,
-        'MPOINTFROMTEXT' => 33, 'POLYGONFROMWKB' => 33, 'ST_GEOMFROMWKB' => 33,
-        'ST_LINEFROMWKB' => 33, 'ST_POLYFROMWKB' => 33, 'UNIX_TIMESTAMP' => 33,
-        'ASYMMETRIC_SIGN' => 33, 'GEOMCOLLFROMWKB' => 33, 'MASTER_POS_WAIT' => 33,
-        'POLYGONFROMTEXT' => 33, 'ST_EXTERIORRING' => 33, 'ST_GEOMETRYTYPE' => 33,
-        'ST_GEOMFROMTEXT' => 33, 'ST_INTERSECTION' => 33, 'ST_LINEFROMTEXT' => 33,
-        'ST_POINTFROMWKB' => 33, 'ST_POLYFROMTEXT' => 33, 'SUBSTRING_INDEX' => 33,
-        'CHARACTER_LENGTH' => 33, 'GEOMCOLLFROMTEXT' => 33, 'GEOMETRYFROMTEXT' => 33,
-        'NUMINTERIORRINGS' => 33, 'ST_INTERIORRINGN' => 33, 'ST_NUMGEOMETRIES' => 33,
-        'ST_POINTFROMTEXT' => 33, 'ST_SYMDIFFERENCE' => 33,
-        'ASYMMETRIC_DERIVE' => 33, 'ASYMMETRIC_VERIFY' => 33, 'LINESTRINGFROMWKB' => 33,
-        'MULTIPOINTFROMWKB' => 33, 'ST_POLYGONFROMWKB' => 33,
-        'ASYMMETRIC_DECRYPT' => 33, 'ASYMMETRIC_ENCRYPT' => 33, 'MULTIPOINTFROMTEXT' => 33,
-        'ST_GEOMCOLLFROMTXT' => 33, 'ST_GEOMCOLLFROMWKB' => 33, 'ST_POLYGONFROMTEXT' => 33,
-        'MULTIPOLYGONFROMWKB' => 33, 'ST_GEOMCOLLFROMTEXT' => 33, 'ST_GEOMETRYFROMTEXT' => 33,
-        'ST_NUMINTERIORRINGS' => 33, 'UNCOMPRESSED_LENGTH' => 33,
-        'CREATE_DH_PARAMETERS' => 33, 'MULTIPOLYGONFROMTEXT' => 33,
-        'ST_LINESTRINGFROMWKB' => 33,
-        'MULTILINESTRINGFROMWKB' => 33,
-        'MULTILINESTRINGFROMTEXT' => 33,
-        'CREATE_ASYMMETRIC_PUB_KEY' => 33, 'GEOMETRYCOLLECTIONFROMWKB' => 33,
-        'CREATE_ASYMMETRIC_PRIV_KEY' => 33, 'GEOMETRYCOLLECTIONFROMTEXT' => 33,
-        'VALIDATE_PASSWORD_STRENGTH' => 33,
-        'SQL_THREAD_WAIT_AFTER_GTIDS' => 33,
-        'ST_GEOMETRYCOLLECTIONFROMWKB' => 33,
-        'ST_GEOMETRYCOLLECTIONFROMTEXT' => 33,
-        'WAIT_UNTIL_SQL_THREAD_AFTER_GTIDS' => 33,
-
-        'IF' => 35, 'IN' => 35,
-        'MOD' => 35,
-        'LEFT' => 35,
-        'MATCH' => 35, 'RIGHT' => 35,
-        'INSERT' => 35, 'REPEAT' => 35, 'SCHEMA' => 35, 'VALUES' => 35,
-        'CONVERT' => 35, 'DEFAULT' => 35, 'REPLACE' => 35,
-        'DATABASE' => 35, 'UTC_DATE' => 35, 'UTC_TIME' => 35,
-        'LOCALTIME' => 35,
-        'CURRENT_DATE' => 35, 'CURRENT_TIME' => 35, 'CURRENT_USER' => 35,
-        'UTC_TIMESTAMP' => 35,
-        'LOCALTIMESTAMP' => 35,
-        'CURRENT_TIMESTAMP' => 35,
-
-        'NOT IN' => 39,
-
-        'DATE' => 41, 'TIME' => 41, 'YEAR' => 41,
-        'POINT' => 41,
-        'POLYGON' => 41,
-        'TIMESTAMP' => 41,
-        'LINESTRING' => 41,
-        'MULTILINESTRING' => 41,
-        'GEOMETRYCOLLECTION' => 41,
-
-        'CHAR' => 43,
-        'INTERVAL' => 43,
-
-    );
-}
diff --git a/#pma/libraries/sql-parser/src/Contexts/ContextMySql50700.php b/#pma/libraries/sql-parser/src/Contexts/ContextMySql50700.php
deleted file mode 100644
index 9f83e0f5..00000000
--- a/#pma/libraries/sql-parser/src/Contexts/ContextMySql50700.php
+++ /dev/null
@@ -1,358 +0,0 @@
-<?php
-
-/**
- * Context for MySQL 5.7.
- *
- * This file was auto-generated.
- *
- * @package    SqlParser
- * @subpackage Contexts
- * @link       https://dev.mysql.com/doc/refman/5.7/en/keywords.html
- */
-namespace SqlParser\Contexts;
-
-use SqlParser\Context;
-
-/**
- * Context for MySQL 5.7.
- *
- * @category   Contexts
- * @package    SqlParser
- * @subpackage Contexts
- * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-class ContextMySql50700 extends Context
-{
-
-    /**
-     * List of keywords.
-     *
-     * The value associated to each keyword represents its flags.
-     *
-     * @see Token::FLAG_KEYWORD_*
-     *
-     * @var array
-     */
-    public static $KEYWORDS = array(
-
-        'AT' => 1, 'DO' => 1, 'IO' => 1, 'NO' => 1, 'XA' => 1,
-        'ANY' => 1, 'CPU' => 1, 'END' => 1, 'IPC' => 1, 'NDB' => 1, 'NEW' => 1,
-        'ONE' => 1, 'ROW' => 1, 'XID' => 1,
-        'BOOL' => 1, 'BYTE' => 1, 'CODE' => 1, 'CUBE' => 1, 'DATA' => 1, 'DISK' => 1,
-        'ENDS' => 1, 'FAST' => 1, 'FILE' => 1, 'FULL' => 1, 'HASH' => 1, 'HELP' => 1,
-        'HOST' => 1, 'LAST' => 1, 'LESS' => 1, 'LIST' => 1, 'LOGS' => 1, 'MODE' => 1,
-        'NAME' => 1, 'NEXT' => 1, 'NONE' => 1, 'ONLY' => 1, 'OPEN' => 1, 'PAGE' => 1,
-        'PORT' => 1, 'PREV' => 1, 'ROWS' => 1, 'SLOW' => 1, 'SOME' => 1, 'STOP' => 1,
-        'THAN' => 1, 'TYPE' => 1, 'VIEW' => 1, 'WAIT' => 1, 'WORK' => 1, 'X509' => 1,
-        'AFTER' => 1, 'BEGIN' => 1, 'BLOCK' => 1, 'BTREE' => 1, 'CACHE' => 1,
-        'CHAIN' => 1, 'CLOSE' => 1, 'ERROR' => 1, 'EVENT' => 1, 'EVERY' => 1,
-        'FIRST' => 1, 'FIXED' => 1, 'FLUSH' => 1, 'FOUND' => 1, 'HOSTS' => 1,
-        'LEVEL' => 1, 'LOCAL' => 1, 'LOCKS' => 1, 'MERGE' => 1, 'MUTEX' => 1,
-        'NAMES' => 1, 'NCHAR' => 1, 'NEVER' => 1, 'OWNER' => 1, 'PHASE' => 1,
-        'PROXY' => 1, 'QUERY' => 1, 'QUICK' => 1, 'RELAY' => 1, 'RESET' => 1,
-        'RTREE' => 1, 'SHARE' => 1, 'SLAVE' => 1, 'START' => 1, 'SUPER' => 1,
-        'SWAPS' => 1, 'TYPES' => 1, 'UNTIL' => 1, 'VALUE' => 1,
-        'ACTION' => 1, 'ALWAYS' => 1, 'BACKUP' => 1, 'BINLOG' => 1, 'CIPHER' => 1,
-        'CLIENT' => 1, 'COMMIT' => 1, 'ENABLE' => 1, 'ENGINE' => 1, 'ERRORS' => 1,
-        'ESCAPE' => 1, 'EVENTS' => 1, 'EXPIRE' => 1, 'EXPORT' => 1, 'FAULTS' => 1,
-        'FIELDS' => 1, 'FILTER' => 1, 'GLOBAL' => 1, 'GRANTS' => 1, 'IMPORT' => 1,
-        'ISSUER' => 1, 'LEAVES' => 1, 'MASTER' => 1, 'MEDIUM' => 1, 'MEMORY' => 1,
-        'MODIFY' => 1, 'NUMBER' => 1, 'OFFSET' => 1, 'PARSER' => 1, 'PLUGIN' => 1,
-        'RELOAD' => 1, 'REMOVE' => 1, 'REPAIR' => 1, 'RESUME' => 1, 'ROLLUP' => 1,
-        'SERVER' => 1, 'SIGNED' => 1, 'SIMPLE' => 1, 'SOCKET' => 1, 'SONAME' => 1,
-        'SOUNDS' => 1, 'SOURCE' => 1, 'STARTS' => 1, 'STATUS' => 1, 'STRING' => 1,
-        'TABLES' => 1,
-        'ACCOUNT' => 1, 'ANALYSE' => 1, 'CHANGED' => 1, 'CHANNEL' => 1, 'COLUMNS' => 1,
-        'COMMENT' => 1, 'COMPACT' => 1, 'CONTEXT' => 1, 'CURRENT' => 1, 'DEFINER' => 1,
-        'DISABLE' => 1, 'DISCARD' => 1, 'DYNAMIC' => 1, 'ENGINES' => 1, 'EXECUTE' => 1,
-        'FOLLOWS' => 1, 'GENERAL' => 1, 'HANDLER' => 1, 'INDEXES' => 1, 'INSTALL' => 1,
-        'INVOKER' => 1, 'LOGFILE' => 1, 'MIGRATE' => 1, 'NO_WAIT' => 1, 'OPTIONS' => 1,
-        'PARTIAL' => 1, 'PLUGINS' => 1, 'PREPARE' => 1, 'PROFILE' => 1, 'REBUILD' => 1,
-        'RECOVER' => 1, 'RESTORE' => 1, 'RETURNS' => 1, 'ROUTINE' => 1, 'SESSION' => 1,
-        'STACKED' => 1, 'STORAGE' => 1, 'SUBJECT' => 1, 'SUSPEND' => 1, 'UNICODE' => 1,
-        'UNKNOWN' => 1, 'UPGRADE' => 1, 'USE_FRM' => 1, 'WITHOUT' => 1, 'WRAPPER' => 1,
-        'CASCADED' => 1, 'CHECKSUM' => 1, 'DATAFILE' => 1, 'DUMPFILE' => 1,
-        'EXCHANGE' => 1, 'EXTENDED' => 1, 'FUNCTION' => 1, 'LANGUAGE' => 1,
-        'MAX_ROWS' => 1, 'MAX_SIZE' => 1, 'MIN_ROWS' => 1, 'NATIONAL' => 1,
-        'NVARCHAR' => 1, 'PRECEDES' => 1, 'PRESERVE' => 1, 'PROFILES' => 1,
-        'REDOFILE' => 1, 'RELAYLOG' => 1, 'ROLLBACK' => 1, 'SCHEDULE' => 1,
-        'SECURITY' => 1, 'SHUTDOWN' => 1, 'SNAPSHOT' => 1, 'SWITCHES' => 1,
-        'TRIGGERS' => 1, 'UNDOFILE' => 1, 'WARNINGS' => 1,
-        'AGGREGATE' => 1, 'ALGORITHM' => 1, 'COMMITTED' => 1, 'DIRECTORY' => 1,
-        'DUPLICATE' => 1, 'EXPANSION' => 1, 'IO_THREAD' => 1, 'ISOLATION' => 1,
-        'NODEGROUP' => 1, 'PACK_KEYS' => 1, 'READ_ONLY' => 1, 'REDUNDANT' => 1,
-        'SAVEPOINT' => 1, 'SQL_CACHE' => 1, 'TEMPORARY' => 1, 'TEMPTABLE' => 1,
-        'UNDEFINED' => 1, 'UNINSTALL' => 1, 'VARIABLES' => 1,
-        'COMPLETION' => 1, 'COMPRESSED' => 1, 'CONCURRENT' => 1, 'CONNECTION' => 1,
-        'CONSISTENT' => 1, 'DEALLOCATE' => 1, 'IDENTIFIED' => 1, 'MASTER_SSL' => 1,
-        'NDBCLUSTER' => 1, 'PARTITIONS' => 1, 'PERSISTENT' => 1, 'PLUGIN_DIR' => 1,
-        'PRIVILEGES' => 1, 'REORGANIZE' => 1, 'REPEATABLE' => 1, 'ROW_FORMAT' => 1,
-        'SQL_THREAD' => 1, 'TABLESPACE' => 1, 'TABLE_NAME' => 1, 'VALIDATION' => 1,
-        'COLUMN_NAME' => 1, 'COMPRESSION' => 1, 'CURSOR_NAME' => 1, 'DIAGNOSTICS' => 1,
-        'EXTENT_SIZE' => 1, 'MASTER_HOST' => 1, 'MASTER_PORT' => 1, 'MASTER_USER' => 1,
-        'MYSQL_ERRNO' => 1, 'NONBLOCKING' => 1, 'PROCESSLIST' => 1, 'REPLICATION' => 1,
-        'SCHEMA_NAME' => 1, 'SQL_TSI_DAY' => 1, 'TRANSACTION' => 1, 'UNCOMMITTED' => 1,
-        'CATALOG_NAME' => 1, 'CLASS_ORIGIN' => 1, 'DEFAULT_AUTH' => 1,
-        'DES_KEY_FILE' => 1, 'INITIAL_SIZE' => 1, 'MASTER_DELAY' => 1,
-        'MESSAGE_TEXT' => 1, 'PARTITIONING' => 1, 'RELAY_THREAD' => 1,
-        'SERIALIZABLE' => 1, 'SQL_NO_CACHE' => 1, 'SQL_TSI_HOUR' => 1,
-        'SQL_TSI_WEEK' => 1, 'SQL_TSI_YEAR' => 1, 'SUBPARTITION' => 1,
-        'COLUMN_FORMAT' => 1, 'INSERT_METHOD' => 1, 'MASTER_SSL_CA' => 1,
-        'RELAY_LOG_POS' => 1, 'SQL_TSI_MONTH' => 1, 'SUBPARTITIONS' => 1,
-        'AUTO_INCREMENT' => 1, 'AVG_ROW_LENGTH' => 1, 'KEY_BLOCK_SIZE' => 1,
-        'MASTER_LOG_POS' => 1, 'MASTER_SSL_CRL' => 1, 'MASTER_SSL_KEY' => 1,
-        'RELAY_LOG_FILE' => 1, 'SQL_TSI_MINUTE' => 1, 'SQL_TSI_SECOND' => 1,
-        'TABLE_CHECKSUM' => 1, 'USER_RESOURCES' => 1,
-        'AUTOEXTEND_SIZE' => 1, 'CONSTRAINT_NAME' => 1, 'DELAY_KEY_WRITE' => 1,
-        'FILE_BLOCK_SIZE' => 1, 'MASTER_LOG_FILE' => 1, 'MASTER_PASSWORD' => 1,
-        'MASTER_SSL_CERT' => 1, 'PARSE_GCOL_EXPR' => 1, 'REPLICATE_DO_DB' => 1,
-        'SQL_AFTER_GTIDS' => 1, 'SQL_TSI_QUARTER' => 1, 'SUBCLASS_ORIGIN' => 1,
-        'MASTER_SERVER_ID' => 1, 'REDO_BUFFER_SIZE' => 1, 'SQL_BEFORE_GTIDS' => 1,
-        'STATS_PERSISTENT' => 1, 'UNDO_BUFFER_SIZE' => 1,
-        'CONSTRAINT_SCHEMA' => 1, 'GROUP_REPLICATION' => 1, 'IGNORE_SERVER_IDS' => 1,
-        'MASTER_SSL_CAPATH' => 1, 'MASTER_SSL_CIPHER' => 1, 'RETURNED_SQLSTATE' => 1,
-        'SQL_BUFFER_RESULT' => 1, 'STATS_AUTO_RECALC' => 1,
-        'CONSTRAINT_CATALOG' => 1, 'MASTER_RETRY_COUNT' => 1, 'MASTER_SSL_CRLPATH' => 1,
-        'MAX_STATEMENT_TIME' => 1, 'REPLICATE_DO_TABLE' => 1, 'SQL_AFTER_MTS_GAPS' => 1,
-        'STATS_SAMPLE_PAGES' => 1,
-        'REPLICATE_IGNORE_DB' => 1,
-        'MASTER_AUTO_POSITION' => 1, 'MASTER_CONNECT_RETRY' => 1,
-        'MAX_QUERIES_PER_HOUR' => 1, 'MAX_UPDATES_PER_HOUR' => 1,
-        'MAX_USER_CONNECTIONS' => 1, 'REPLICATE_REWRITE_DB' => 1,
-        'REPLICATE_IGNORE_TABLE' => 1,
-        'MASTER_HEARTBEAT_PERIOD' => 1, 'REPLICATE_WILD_DO_TABLE' => 1,
-        'MAX_CONNECTIONS_PER_HOUR' => 1,
-        'REPLICATE_WILD_IGNORE_TABLE' => 1,
-
-        'AS' => 3, 'BY' => 3, 'IS' => 3, 'ON' => 3, 'OR' => 3, 'TO' => 3,
-        'ADD' => 3, 'ALL' => 3, 'AND' => 3, 'ASC' => 3, 'DEC' => 3, 'DIV' => 3,
-        'FOR' => 3, 'GET' => 3, 'NOT' => 3, 'OUT' => 3, 'SQL' => 3, 'SSL' => 3,
-        'USE' => 3, 'XOR' => 3,
-        'BOTH' => 3, 'CALL' => 3, 'CASE' => 3, 'DESC' => 3, 'DROP' => 3, 'DUAL' => 3,
-        'EACH' => 3, 'ELSE' => 3, 'EXIT' => 3, 'FROM' => 3, 'INT1' => 3, 'INT2' => 3,
-        'INT3' => 3, 'INT4' => 3, 'INT8' => 3, 'INTO' => 3, 'JOIN' => 3, 'KEYS' => 3,
-        'KILL' => 3, 'LIKE' => 3, 'LOAD' => 3, 'LOCK' => 3, 'LONG' => 3, 'LOOP' => 3,
-        'NULL' => 3, 'READ' => 3, 'SHOW' => 3, 'THEN' => 3, 'TRUE' => 3, 'UNDO' => 3,
-        'WHEN' => 3, 'WITH' => 3,
-        'ALTER' => 3, 'CHECK' => 3, 'CROSS' => 3, 'FALSE' => 3, 'FETCH' => 3,
-        'FORCE' => 3, 'GRANT' => 3, 'GROUP' => 3, 'INNER' => 3, 'INOUT' => 3,
-        'LEAVE' => 3, 'LIMIT' => 3, 'LINES' => 3, 'ORDER' => 3, 'OUTER' => 3,
-        'PURGE' => 3, 'RANGE' => 3, 'READS' => 3, 'RLIKE' => 3, 'TABLE' => 3,
-        'UNION' => 3, 'USAGE' => 3, 'USING' => 3, 'WHERE' => 3, 'WHILE' => 3,
-        'WRITE' => 3,
-        'BEFORE' => 3, 'CHANGE' => 3, 'COLUMN' => 3, 'CREATE' => 3, 'CURSOR' => 3,
-        'DELETE' => 3, 'ELSEIF' => 3, 'EXISTS' => 3, 'FLOAT4' => 3, 'FLOAT8' => 3,
-        'HAVING' => 3, 'IGNORE' => 3, 'INFILE' => 3, 'LINEAR' => 3, 'OPTION' => 3,
-        'REGEXP' => 3, 'RENAME' => 3, 'RETURN' => 3, 'REVOKE' => 3, 'SELECT' => 3,
-        'SIGNAL' => 3, 'STORED' => 3, 'UNLOCK' => 3, 'UPDATE' => 3,
-        'ANALYZE' => 3, 'BETWEEN' => 3, 'CASCADE' => 3, 'COLLATE' => 3, 'DECLARE' => 3,
-        'DELAYED' => 3, 'ESCAPED' => 3, 'EXPLAIN' => 3, 'FOREIGN' => 3, 'ITERATE' => 3,
-        'LEADING' => 3, 'NATURAL' => 3, 'OUTFILE' => 3, 'PRIMARY' => 3, 'RELEASE' => 3,
-        'REQUIRE' => 3, 'SCHEMAS' => 3, 'TRIGGER' => 3, 'VARYING' => 3, 'VIRTUAL' => 3,
-        'CONTINUE' => 3, 'DAY_HOUR' => 3, 'DESCRIBE' => 3, 'DISTINCT' => 3,
-        'ENCLOSED' => 3, 'MAXVALUE' => 3, 'MODIFIES' => 3, 'OPTIMIZE' => 3,
-        'RESIGNAL' => 3, 'RESTRICT' => 3, 'SPECIFIC' => 3, 'SQLSTATE' => 3,
-        'STARTING' => 3, 'TRAILING' => 3, 'UNSIGNED' => 3, 'ZEROFILL' => 3,
-        'CONDITION' => 3, 'DATABASES' => 3, 'GENERATED' => 3, 'MIDDLEINT' => 3,
-        'PARTITION' => 3, 'PRECISION' => 3, 'PROCEDURE' => 3, 'SENSITIVE' => 3,
-        'SEPARATOR' => 3,
-        'ACCESSIBLE' => 3, 'ASENSITIVE' => 3, 'CONSTRAINT' => 3, 'DAY_MINUTE' => 3,
-        'DAY_SECOND' => 3, 'OPTIONALLY' => 3, 'READ_WRITE' => 3, 'REFERENCES' => 3,
-        'SQLWARNING' => 3, 'TERMINATED' => 3, 'YEAR_MONTH' => 3,
-        'DISTINCTROW' => 3, 'HOUR_MINUTE' => 3, 'HOUR_SECOND' => 3, 'INSENSITIVE' => 3,
-        'MASTER_BIND' => 3,
-        'LOW_PRIORITY' => 3, 'SQLEXCEPTION' => 3, 'VARCHARACTER' => 3,
-        'DETERMINISTIC' => 3, 'HIGH_PRIORITY' => 3, 'MINUTE_SECOND' => 3,
-        'STRAIGHT_JOIN' => 3,
-        'IO_AFTER_GTIDS' => 3, 'SQL_BIG_RESULT' => 3,
-        'DAY_MICROSECOND' => 3, 'IO_BEFORE_GTIDS' => 3, 'OPTIMIZER_COSTS' => 3,
-        'HOUR_MICROSECOND' => 3, 'SQL_SMALL_RESULT' => 3,
-        'MINUTE_MICROSECOND' => 3, 'NO_WRITE_TO_BINLOG' => 3, 'SECOND_MICROSECOND' => 3,
-        'SQL_CALC_FOUND_ROWS' => 3,
-        'MASTER_SSL_VERIFY_SERVER_CERT' => 3,
-
-        'GROUP BY' => 7, 'NOT NULL' => 7, 'ORDER BY' => 7, 'SET NULL' => 7,
-        'AND CHAIN' => 7, 'FULL JOIN' => 7, 'IF EXISTS' => 7, 'LEFT JOIN' => 7,
-        'LESS THAN' => 7, 'NO ACTION' => 7, 'ON DELETE' => 7, 'ON UPDATE' => 7,
-        'UNION ALL' => 7,
-        'CROSS JOIN' => 7, 'FOR UPDATE' => 7, 'INNER JOIN' => 7, 'LINEAR KEY' => 7,
-        'NO RELEASE' => 7, 'OR REPLACE' => 7, 'RIGHT JOIN' => 7,
-        'LINEAR HASH' => 7,
-        'AND NO CHAIN' => 7, 'FOR EACH ROW' => 7, 'NATURAL JOIN' => 7,
-        'PARTITION BY' => 7, 'SET PASSWORD' => 7, 'SQL SECURITY' => 7,
-        'CHARACTER SET' => 7, 'IF NOT EXISTS' => 7,
-        'DATA DIRECTORY' => 7, 'UNION DISTINCT' => 7,
-        'DEFAULT CHARSET' => 7, 'DEFAULT COLLATE' => 7, 'FULL OUTER JOIN' => 7,
-        'INDEX DIRECTORY' => 7, 'LEFT OUTER JOIN' => 7, 'SUBPARTITION BY' => 7,
-        'GENERATED ALWAYS' => 7, 'RIGHT OUTER JOIN' => 7,
-        'NATURAL LEFT JOIN' => 7, 'START TRANSACTION' => 7,
-        'LOCK IN SHARE MODE' => 7, 'NATURAL RIGHT JOIN' => 7, 'SELECT TRANSACTION' => 7,
-        'DEFAULT CHARACTER SET' => 7,
-        'NATURAL LEFT OUTER JOIN' => 7,
-        'NATURAL RIGHT OUTER JOIN' => 7, 'WITH CONSISTENT SNAPSHOT' => 7,
-
-        'BIT' => 9, 'XML' => 9,
-        'ENUM' => 9, 'JSON' => 9, 'TEXT' => 9,
-        'ARRAY' => 9,
-        'SERIAL' => 9,
-        'BOOLEAN' => 9,
-        'DATETIME' => 9, 'GEOMETRY' => 9, 'MULTISET' => 9,
-        'MULTILINEPOINT' => 9,
-        'MULTILINEPOLYGON' => 9,
-
-        'INT' => 11, 'SET' => 11,
-        'BLOB' => 11, 'REAL' => 11,
-        'FLOAT' => 11,
-        'BIGINT' => 11, 'BINARY' => 11, 'DOUBLE' => 11,
-        'DECIMAL' => 11, 'INTEGER' => 11, 'NUMERIC' => 11, 'TINYINT' => 11, 'VARCHAR' => 11,
-        'LONGBLOB' => 11, 'LONGTEXT' => 11, 'SMALLINT' => 11, 'TINYBLOB' => 11,
-        'TINYTEXT' => 11,
-        'CHARACTER' => 11, 'MEDIUMINT' => 11, 'VARBINARY' => 11,
-        'MEDIUMBLOB' => 11, 'MEDIUMTEXT' => 11,
-
-        'BINARY VARYING' => 15,
-
-        'KEY' => 19,
-        'INDEX' => 19,
-        'UNIQUE' => 19,
-        'SPATIAL' => 19,
-        'FULLTEXT' => 19,
-
-        'INDEX KEY' => 23,
-        'UNIQUE KEY' => 23,
-        'FOREIGN KEY' => 23, 'PRIMARY KEY' => 23, 'SPATIAL KEY' => 23,
-        'FULLTEXT KEY' => 23, 'UNIQUE INDEX' => 23,
-        'SPATIAL INDEX' => 23,
-        'FULLTEXT INDEX' => 23,
-
-        'X' => 33, 'Y' => 33,
-        'LN' => 33, 'PI' => 33,
-        'ABS' => 33, 'AVG' => 33, 'BIN' => 33, 'COS' => 33, 'COT' => 33, 'DAY' => 33,
-        'ELT' => 33, 'EXP' => 33, 'HEX' => 33, 'LOG' => 33, 'MAX' => 33, 'MD5' => 33,
-        'MID' => 33, 'MIN' => 33, 'NOW' => 33, 'OCT' => 33, 'ORD' => 33, 'POW' => 33,
-        'SHA' => 33, 'SIN' => 33, 'STD' => 33, 'SUM' => 33, 'TAN' => 33,
-        'ACOS' => 33, 'AREA' => 33, 'ASIN' => 33, 'ATAN' => 33, 'CAST' => 33, 'CEIL' => 33,
-        'CONV' => 33, 'HOUR' => 33, 'LOG2' => 33, 'LPAD' => 33, 'RAND' => 33, 'RPAD' => 33,
-        'SHA1' => 33, 'SHA2' => 33, 'SIGN' => 33, 'SQRT' => 33, 'SRID' => 33, 'ST_X' => 33,
-        'ST_Y' => 33, 'TRIM' => 33, 'USER' => 33, 'UUID' => 33, 'WEEK' => 33,
-        'ASCII' => 33, 'ASWKB' => 33, 'ASWKT' => 33, 'ATAN2' => 33, 'COUNT' => 33,
-        'CRC32' => 33, 'FIELD' => 33, 'FLOOR' => 33, 'INSTR' => 33, 'LCASE' => 33,
-        'LEAST' => 33, 'LOG10' => 33, 'LOWER' => 33, 'LTRIM' => 33, 'MONTH' => 33,
-        'POWER' => 33, 'QUOTE' => 33, 'ROUND' => 33, 'RTRIM' => 33, 'SLEEP' => 33,
-        'SPACE' => 33, 'UCASE' => 33, 'UNHEX' => 33, 'UPPER' => 33,
-        'ASTEXT' => 33, 'BIT_OR' => 33, 'BUFFER' => 33, 'CONCAT' => 33, 'DECODE' => 33,
-        'ENCODE' => 33, 'EQUALS' => 33, 'FORMAT' => 33, 'IFNULL' => 33, 'ISNULL' => 33,
-        'LENGTH' => 33, 'LOCATE' => 33, 'MINUTE' => 33, 'NULLIF' => 33, 'POINTN' => 33,
-        'SECOND' => 33, 'STDDEV' => 33, 'STRCMP' => 33, 'SUBSTR' => 33, 'WITHIN' => 33,
-        'ADDDATE' => 33, 'ADDTIME' => 33, 'AGAINST' => 33, 'BIT_AND' => 33, 'BIT_XOR' => 33,
-        'CEILING' => 33, 'CHARSET' => 33, 'CROSSES' => 33, 'CURDATE' => 33, 'CURTIME' => 33,
-        'DAYNAME' => 33, 'DEGREES' => 33, 'ENCRYPT' => 33, 'EXTRACT' => 33, 'GLENGTH' => 33,
-        'ISEMPTY' => 33, 'IS_IPV4' => 33, 'IS_IPV6' => 33, 'QUARTER' => 33, 'RADIANS' => 33,
-        'REVERSE' => 33, 'SOUNDEX' => 33, 'ST_AREA' => 33, 'ST_SRID' => 33, 'SUBDATE' => 33,
-        'SUBTIME' => 33, 'SYSDATE' => 33, 'TOUCHES' => 33, 'TO_DAYS' => 33, 'VAR_POP' => 33,
-        'VERSION' => 33, 'WEEKDAY' => 33,
-        'ASBINARY' => 33, 'CENTROID' => 33, 'COALESCE' => 33, 'COMPRESS' => 33,
-        'CONTAINS' => 33, 'DATEDIFF' => 33, 'DATE_ADD' => 33, 'DATE_SUB' => 33,
-        'DISJOINT' => 33, 'DISTANCE' => 33, 'ENDPOINT' => 33, 'ENVELOPE' => 33,
-        'GET_LOCK' => 33, 'GREATEST' => 33, 'ISCLOSED' => 33, 'ISSIMPLE' => 33,
-        'MAKEDATE' => 33, 'MAKETIME' => 33, 'MAKE_SET' => 33, 'MBREQUAL' => 33,
-        'OVERLAPS' => 33, 'PASSWORD' => 33, 'POSITION' => 33, 'ST_ASWKB' => 33,
-        'ST_ASWKT' => 33, 'ST_UNION' => 33, 'TIMEDIFF' => 33, 'TRUNCATE' => 33,
-        'VARIANCE' => 33, 'VAR_SAMP' => 33, 'YEARWEEK' => 33,
-        'ANY_VALUE' => 33, 'BENCHMARK' => 33, 'BIT_COUNT' => 33, 'COLLATION' => 33,
-        'CONCAT_WS' => 33, 'DAYOFWEEK' => 33, 'DAYOFYEAR' => 33, 'DIMENSION' => 33,
-        'FROM_DAYS' => 33, 'GEOMETRYN' => 33, 'INET_ATON' => 33, 'INET_NTOA' => 33,
-        'LOAD_FILE' => 33, 'MBRCOVERS' => 33, 'MBREQUALS' => 33, 'MBRWITHIN' => 33,
-        'MONTHNAME' => 33, 'NUMPOINTS' => 33, 'ROW_COUNT' => 33, 'ST_ASTEXT' => 33,
-        'ST_BUFFER' => 33, 'ST_EQUALS' => 33, 'ST_LENGTH' => 33, 'ST_POINTN' => 33,
-        'ST_WITHIN' => 33, 'SUBSTRING' => 33, 'TO_BASE64' => 33, 'UPDATEXML' => 33,
-        'BIT_LENGTH' => 33, 'CONVERT_TZ' => 33, 'CONVEXHULL' => 33, 'DAYOFMONTH' => 33,
-        'EXPORT_SET' => 33, 'FOUND_ROWS' => 33, 'GET_FORMAT' => 33, 'INET6_ATON' => 33,
-        'INET6_NTOA' => 33, 'INTERSECTS' => 33, 'MBRTOUCHES' => 33, 'MULTIPOINT' => 33,
-        'NAME_CONST' => 33, 'PERIOD_ADD' => 33, 'STARTPOINT' => 33, 'STDDEV_POP' => 33,
-        'ST_CROSSES' => 33, 'ST_GEOHASH' => 33, 'ST_ISEMPTY' => 33, 'ST_ISVALID' => 33,
-        'ST_TOUCHES' => 33, 'TO_SECONDS' => 33, 'UNCOMPRESS' => 33, 'UUID_SHORT' => 33,
-        'WEEKOFYEAR' => 33,
-        'AES_DECRYPT' => 33, 'AES_ENCRYPT' => 33, 'CHAR_LENGTH' => 33, 'DATE_FORMAT' => 33,
-        'DES_DECRYPT' => 33, 'DES_ENCRYPT' => 33, 'FIND_IN_SET' => 33, 'FROM_BASE64' => 33,
-        'GEOMFROMWKB' => 33, 'GTID_SUBSET' => 33, 'LINEFROMWKB' => 33, 'MBRCONTAINS' => 33,
-        'MBRDISJOINT' => 33, 'MBROVERLAPS' => 33, 'MICROSECOND' => 33, 'PERIOD_DIFF' => 33,
-        'POLYFROMWKB' => 33, 'SEC_TO_TIME' => 33, 'STDDEV_SAMP' => 33, 'STR_TO_DATE' => 33,
-        'ST_ASBINARY' => 33, 'ST_CENTROID' => 33, 'ST_CONTAINS' => 33, 'ST_DISJOINT' => 33,
-        'ST_DISTANCE' => 33, 'ST_ENDPOINT' => 33, 'ST_ENVELOPE' => 33, 'ST_ISCLOSED' => 33,
-        'ST_ISSIMPLE' => 33, 'ST_OVERLAPS' => 33, 'ST_SIMPLIFY' => 33, 'ST_VALIDATE' => 33,
-        'SYSTEM_USER' => 33, 'TIME_FORMAT' => 33, 'TIME_TO_SEC' => 33,
-        'COERCIBILITY' => 33, 'EXTERIORRING' => 33, 'EXTRACTVALUE' => 33,
-        'GEOMETRYTYPE' => 33, 'GEOMFROMTEXT' => 33, 'GROUP_CONCAT' => 33,
-        'IS_FREE_LOCK' => 33, 'IS_USED_LOCK' => 33, 'LINEFROMTEXT' => 33,
-        'MBRCOVEREDBY' => 33, 'MLINEFROMWKB' => 33, 'MPOLYFROMWKB' => 33,
-        'MULTIPOLYGON' => 33, 'OCTET_LENGTH' => 33, 'OLD_PASSWORD' => 33,
-        'POINTFROMWKB' => 33, 'POLYFROMTEXT' => 33, 'RANDOM_BYTES' => 33,
-        'RELEASE_LOCK' => 33, 'SESSION_USER' => 33, 'ST_ASGEOJSON' => 33,
-        'ST_DIMENSION' => 33, 'ST_GEOMETRYN' => 33, 'ST_NUMPOINTS' => 33,
-        'TIMESTAMPADD' => 33,
-        'CONNECTION_ID' => 33, 'FROM_UNIXTIME' => 33, 'GTID_SUBTRACT' => 33,
-        'INTERIORRINGN' => 33, 'MBRINTERSECTS' => 33, 'MLINEFROMTEXT' => 33,
-        'MPOINTFROMWKB' => 33, 'MPOLYFROMTEXT' => 33, 'NUMGEOMETRIES' => 33,
-        'POINTFROMTEXT' => 33, 'ST_CONVEXHULL' => 33, 'ST_DIFFERENCE' => 33,
-        'ST_INTERSECTS' => 33, 'ST_STARTPOINT' => 33, 'TIMESTAMPDIFF' => 33,
-        'WEIGHT_STRING' => 33,
-        'IS_IPV4_COMPAT' => 33, 'IS_IPV4_MAPPED' => 33, 'LAST_INSERT_ID' => 33,
-        'MPOINTFROMTEXT' => 33, 'POLYGONFROMWKB' => 33, 'ST_GEOMFROMWKB' => 33,
-        'ST_LINEFROMWKB' => 33, 'ST_POLYFROMWKB' => 33, 'UNIX_TIMESTAMP' => 33,
-        'GEOMCOLLFROMWKB' => 33, 'MASTER_POS_WAIT' => 33, 'POLYGONFROMTEXT' => 33,
-        'ST_EXTERIORRING' => 33, 'ST_GEOMETRYTYPE' => 33, 'ST_GEOMFROMTEXT' => 33,
-        'ST_INTERSECTION' => 33, 'ST_LINEFROMTEXT' => 33, 'ST_MAKEENVELOPE' => 33,
-        'ST_MLINEFROMWKB' => 33, 'ST_MPOLYFROMWKB' => 33, 'ST_POINTFROMWKB' => 33,
-        'ST_POLYFROMTEXT' => 33, 'SUBSTRING_INDEX' => 33,
-        'CHARACTER_LENGTH' => 33, 'GEOMCOLLFROMTEXT' => 33, 'GEOMETRYFROMTEXT' => 33,
-        'NUMINTERIORRINGS' => 33, 'ST_INTERIORRINGN' => 33, 'ST_MLINEFROMTEXT' => 33,
-        'ST_MPOINTFROMWKB' => 33, 'ST_MPOLYFROMTEXT' => 33, 'ST_NUMGEOMETRIES' => 33,
-        'ST_POINTFROMTEXT' => 33, 'ST_SYMDIFFERENCE' => 33,
-        'LINESTRINGFROMWKB' => 33, 'MULTIPOINTFROMWKB' => 33, 'RELEASE_ALL_LOCKS' => 33,
-        'ST_LATFROMGEOHASH' => 33, 'ST_MPOINTFROMTEXT' => 33, 'ST_POLYGONFROMWKB' => 33,
-        'MULTIPOINTFROMTEXT' => 33, 'ST_BUFFER_STRATEGY' => 33, 'ST_DISTANCE_SPHERE' => 33,
-        'ST_GEOMCOLLFROMTXT' => 33, 'ST_GEOMCOLLFROMWKB' => 33, 'ST_GEOMFROMGEOJSON' => 33,
-        'ST_LONGFROMGEOHASH' => 33, 'ST_POLYGONFROMTEXT' => 33,
-        'MULTIPOLYGONFROMWKB' => 33, 'ST_GEOMCOLLFROMTEXT' => 33, 'ST_GEOMETRYFROMTEXT' => 33,
-        'ST_NUMINTERIORRINGS' => 33, 'ST_POINTFROMGEOHASH' => 33, 'UNCOMPRESSED_LENGTH' => 33,
-        'MULTIPOLYGONFROMTEXT' => 33, 'ST_LINESTRINGFROMWKB' => 33,
-        'ST_MULTIPOINTFROMWKB' => 33,
-        'ST_MULTIPOINTFROMTEXT' => 33,
-        'MULTILINESTRINGFROMWKB' => 33, 'ST_MULTIPOLYGONFROMWKB' => 33,
-        'MULTILINESTRINGFROMTEXT' => 33, 'ST_MULTIPOLYGONFROMTEXT' => 33,
-        'GEOMETRYCOLLECTIONFROMWKB' => 33, 'ST_MULTILINESTRINGFROMWKB' => 33,
-        'GEOMETRYCOLLECTIONFROMTEXT' => 33, 'ST_MULTILINESTRINGFROMTEXT' => 33,
-        'VALIDATE_PASSWORD_STRENGTH' => 33, 'WAIT_FOR_EXECUTED_GTID_SET' => 33,
-        'ST_GEOMETRYCOLLECTIONFROMWKB' => 33,
-        'ST_GEOMETRYCOLLECTIONFROMTEXT' => 33,
-        'WAIT_UNTIL_SQL_THREAD_AFTER_GTIDS' => 33,
-
-        'IF' => 35, 'IN' => 35,
-        'MOD' => 35,
-        'LEFT' => 35,
-        'MATCH' => 35, 'RIGHT' => 35,
-        'INSERT' => 35, 'REPEAT' => 35, 'SCHEMA' => 35, 'VALUES' => 35,
-        'CONVERT' => 35, 'DEFAULT' => 35, 'REPLACE' => 35,
-        'DATABASE' => 35, 'UTC_DATE' => 35, 'UTC_TIME' => 35,
-        'LOCALTIME' => 35,
-        'CURRENT_DATE' => 35, 'CURRENT_TIME' => 35, 'CURRENT_USER' => 35,
-        'UTC_TIMESTAMP' => 35,
-        'LOCALTIMESTAMP' => 35,
-        'CURRENT_TIMESTAMP' => 35,
-
-        'NOT IN' => 39,
-
-        'DATE' => 41, 'TIME' => 41, 'YEAR' => 41,
-        'POINT' => 41,
-        'POLYGON' => 41,
-        'TIMESTAMP' => 41,
-        'LINESTRING' => 41,
-        'MULTILINESTRING' => 41,
-        'GEOMETRYCOLLECTION' => 41,
-
-        'CHAR' => 43,
-        'INTERVAL' => 43,
-
-    );
-}
diff --git a/#pma/libraries/sql-parser/src/Exceptions/LexerException.php b/#pma/libraries/sql-parser/src/Exceptions/LexerException.php
deleted file mode 100644
index 2dd30412..00000000
--- a/#pma/libraries/sql-parser/src/Exceptions/LexerException.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-/**
- * Exception thrown by the lexer.
- *
- * @package    SqlParser
- * @subpackage Exceptions
- */
-namespace SqlParser\Exceptions;
-
-/**
- * Exception thrown by the lexer.
- *
- * @category   Exceptions
- * @package    SqlParser
- * @subpackage Exceptions
- * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-class LexerException extends \Exception
-{
-
-    /**
-     * The character that produced this error.
-     *
-     * @var string
-     */
-    public $ch;
-
-    /**
-     * The index of the character that produced this error.
-     *
-     * @var int
-     */
-    public $pos;
-
-    /**
-     * Constructor.
-     *
-     * @param string $msg  The message of this exception.
-     * @param string $ch   The character that produced this exception.
-     * @param int    $pos  The position of the character.
-     * @param int    $code The code of this error.
-     */
-    public function __construct($msg = '', $ch = '', $pos = 0, $code = 0)
-    {
-        parent::__construct($msg, $code);
-        $this->ch = $ch;
-        $this->pos = $pos;
-    }
-}
diff --git a/#pma/libraries/sql-parser/src/Exceptions/ParserException.php b/#pma/libraries/sql-parser/src/Exceptions/ParserException.php
deleted file mode 100644
index 81f62593..00000000
--- a/#pma/libraries/sql-parser/src/Exceptions/ParserException.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/**
- * Exception thrown by the parser.
- *
- * @package    SqlParser
- * @subpackage Exceptions
- */
-namespace SqlParser\Exceptions;
-
-use SqlParser\Token;
-
-/**
- * Exception thrown by the parser.
- *
- * @category   Exceptions
- * @package    SqlParser
- * @subpackage Exceptions
- * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-class ParserException extends \Exception
-{
-
-    /**
-     * The token that produced this error.
-     *
-     * @var Token
-     */
-    public $token;
-
-    /**
-     * Constructor.
-     *
-     * @param string $msg   The message of this exception.
-     * @param Token  $token The token that produced this exception.
-     * @param int    $code  The code of this error.
-     */
-    public function __construct($msg = '', Token $token = null, $code = 0)
-    {
-        parent::__construct($msg, $code);
-        $this->token = $token;
-    }
-}
diff --git a/#pma/libraries/sql-parser/src/Lexer.php b/#pma/libraries/sql-parser/src/Lexer.php
deleted file mode 100644
index 9de2a7ab..00000000
--- a/#pma/libraries/sql-parser/src/Lexer.php
+++ /dev/null
@@ -1,930 +0,0 @@
-<?php
-
-/**
- * Defines the lexer of the library.
- *
- * This is one of the most important components, along with the parser.
- *
- * Depends on context to extract lexemes.
- *
- * @package SqlParser
- */
-namespace SqlParser;
-
-require_once 'common.php';
-
-use SqlParser\Exceptions\LexerException;
-
-if (!defined('USE_UTF_STRINGS')) {
-    // NOTE: In previous versions of PHP (5.5 and older) the default
-    // internal encoding is "ISO-8859-1".
-    // All `mb_` functions must specify the correct encoding, which is
-    // 'UTF-8' in order to work properly.
-
-    /**
-     * Forces usage of `UtfString` if the string is multibyte.
-     * `UtfString` may be slower, but it gives better results.
-     *
-     * @var bool
-     */
-    define('USE_UTF_STRINGS', true);
-}
-
-/**
- * Performs lexical analysis over a SQL statement and splits it in multiple
- * tokens.
- *
- * The output of the lexer is affected by the context of the SQL statement.
- *
- * @category Lexer
- * @package  SqlParser
- * @license  https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- * @see      Context
- */
-class Lexer
-{
-
-    /**
-     * A list of methods that are used in lexing the SQL query.
-     *
-     * @var array
-     */
-    public static $PARSER_METHODS = array(
-
-        // It is best to put the parsers in order of their complexity
-        // (ascending) and their occurrence rate (descending).
-        //
-        // Conflicts:
-        //
-        // 1. `parseDelimiter`, `parseUnknown`, `parseKeyword`, `parseNumber`
-        // They fight over delimiter. The delimiter may be a keyword, a
-        // number or almost any character which makes the delimiter one of
-        // the first tokens that must be parsed.
-        //
-        // 1. `parseNumber` and `parseOperator`
-        // They fight over `+` and `-`.
-        //
-        // 2. `parseComment` and `parseOperator`
-        // They fight over `/` (as in ```/*comment*/``` or ```a / b```)
-        //
-        // 3. `parseBool` and `parseKeyword`
-        // They fight over `TRUE` and `FALSE`.
-        //
-        // 4. `parseKeyword` and `parseUnknown`
-        // They fight over words. `parseUnknown` does not know about
-        // keywords.
-
-        'parseDelimiter', 'parseWhitespace', 'parseNumber',
-        'parseComment', 'parseOperator', 'parseBool', 'parseString',
-        'parseSymbol', 'parseKeyword', 'parseLabel', 'parseUnknown'
-    );
-
-    /**
-     * Whether errors should throw exceptions or just be stored.
-     *
-     * @var bool
-     *
-     * @see static::$errors
-     */
-    public $strict = false;
-
-    /**
-     * The string to be parsed.
-     *
-     * @var string|UtfString
-     */
-    public $str = '';
-
-    /**
-     * The length of `$str`.
-     *
-     * By storing its length, a lot of time is saved, because parsing methods
-     * would call `strlen` everytime.
-     *
-     * @var int
-     */
-    public $len = 0;
-
-    /**
-     * The index of the last parsed character.
-     *
-     * @var int
-     */
-    public $last = 0;
-
-    /**
-     * Tokens extracted from given strings.
-     *
-     * @var TokensList
-     */
-    public $list;
-
-    /**
-     * The default delimiter. This is used, by default, in all new instances.
-     *
-     * @var string
-     */
-    public static $DEFAULT_DELIMITER = ';';
-
-    /**
-     * Statements delimiter.
-     * This may change during lexing.
-     *
-     * @var string
-     */
-    public $delimiter;
-
-    /**
-     * The length of the delimiter.
-     *
-     * Because `parseDelimiter` can be called a lot, it would perform a lot of
-     * calls to `strlen`, which might affect performance when the delimiter is
-     * big.
-     *
-     * @var int
-     */
-    public $delimiterLen;
-
-    /**
-     * List of errors that occurred during lexing.
-     *
-     * Usually, the lexing does not stop once an error occurred because that
-     * error might be false positive or a partial result (even a bad one)
-     * might be needed.
-     *
-     * @var LexerException[]
-     *
-     * @see Lexer::error()
-     */
-    public $errors = array();
-
-    /**
-     * Gets the tokens list parsed by a new instance of a lexer.
-     *
-     * @param string|UtfString $str       The query to be lexed.
-     * @param bool             $strict    Whether strict mode should be
-     *                                    enabled or not.
-     * @param string           $delimiter The delimiter to be used.
-     *
-     * @return TokensList
-     */
-    public static function getTokens($str, $strict = false, $delimiter = null)
-    {
-        $lexer = new Lexer($str, $strict, $delimiter);
-        return $lexer->list;
-    }
-
-    /**
-     * Constructor.
-     *
-     * @param string|UtfString $str       The query to be lexed.
-     * @param bool             $strict    Whether strict mode should be
-     *                                    enabled or not.
-     * @param string           $delimiter The delimiter to be used.
-     */
-    public function __construct($str, $strict = false, $delimiter = null)
-    {
-        // `strlen` is used instead of `mb_strlen` because the lexer needs to
-        // parse each byte of the input.
-        $len = ($str instanceof UtfString) ? $str->length() : strlen($str);
-
-        // For multi-byte strings, a new instance of `UtfString` is
-        // initialized (only if `UtfString` usage is forced.
-        if (!($str instanceof UtfString)) {
-            if ((USE_UTF_STRINGS) && ($len !== mb_strlen($str, 'UTF-8'))) {
-                $str = new UtfString($str);
-            }
-        }
-
-        $this->str = $str;
-        $this->len = ($str instanceof UtfString) ? $str->length() : $len;
-
-        $this->strict = $strict;
-
-        // Setting the delimiter.
-        $this->setDelimiter(
-            !empty($delimiter) ? $delimiter : static::$DEFAULT_DELIMITER
-        );
-
-        $this->lex();
-    }
-
-    /**
-     * Sets the delimiter.
-     *
-     * @param string $delimiter The new delimiter.
-     */
-    public function setDelimiter($delimiter)
-    {
-        $this->delimiter = $delimiter;
-        $this->delimiterLen = strlen($delimiter);
-    }
-
-    /**
-     * Parses the string and extracts lexemes.
-     *
-     * @return void
-     */
-    public function lex()
-    {
-        // TODO: Sometimes, static::parse* functions make unnecessary calls to
-        // is* functions. For a better performance, some rules can be deduced
-        // from context.
-        // For example, in `parseBool` there is no need to compare the token
-        // every time with `true` and `false`. The first step would be to
-        // compare with 'true' only and just after that add another letter from
-        // context and compare again with `false`.
-        // Another example is `parseComment`.
-
-        $list = new TokensList();
-
-        /**
-         * Last processed token.
-         *
-         * @var Token $lastToken
-         */
-        $lastToken = null;
-
-        for ($this->last = 0, $lastIdx = 0; $this->last < $this->len; $lastIdx = ++$this->last) {
-            /**
-             * The new token.
-             *
-             * @var Token $token
-             */
-            $token = null;
-
-            foreach (static::$PARSER_METHODS as $method) {
-                if (($token = $this->$method())) {
-                    break;
-                }
-            }
-
-            if ($token === null) {
-                // @assert($this->last === $lastIdx);
-                $token = new Token($this->str[$this->last]);
-                $this->error(
-                    __('Unexpected character.'),
-                    $this->str[$this->last],
-                    $this->last
-                );
-            } elseif (($lastToken !== null)
-                && ($token->type === Token::TYPE_SYMBOL)
-                && ($token->flags & Token::FLAG_SYMBOL_VARIABLE)
-                && (($lastToken->type === Token::TYPE_STRING)
-                || (($lastToken->type === Token::TYPE_SYMBOL)
-                && ($lastToken->flags & Token::FLAG_SYMBOL_BACKTICK)))
-            ) {
-                // Handles ```... FROM 'user'@'%' ...```.
-                $lastToken->token .= $token->token;
-                $lastToken->type = Token::TYPE_SYMBOL;
-                $lastToken->flags = Token::FLAG_SYMBOL_USER;
-                $lastToken->value .= '@' . $token->value;
-                continue;
-            } elseif (($lastToken !== null)
-                && ($token->type === Token::TYPE_KEYWORD)
-                && ($lastToken->type === Token::TYPE_OPERATOR)
-                && ($lastToken->value === '.')
-            ) {
-                // Handles ```... tbl.FROM ...```. In this case, FROM is not
-                // a reserved word.
-                $token->type = Token::TYPE_NONE;
-                $token->flags = 0;
-                $token->value = $token->token;
-            }
-
-            $token->position = $lastIdx;
-
-            $list->tokens[$list->count++] = $token;
-
-            // Handling delimiters.
-            if (($token->type === Token::TYPE_NONE) && ($token->value === 'DELIMITER')) {
-                if ($this->last + 1 >= $this->len) {
-                    $this->error(
-                        __('Expected whitespace(s) before delimiter.'),
-                        '',
-                        $this->last + 1
-                    );
-                    continue;
-                }
-
-                // Skipping last R (from `delimiteR`) and whitespaces between
-                // the keyword `DELIMITER` and the actual delimiter.
-                $pos = ++$this->last;
-                if (($token = $this->parseWhitespace()) !== null) {
-                    $token->position = $pos;
-                    $list->tokens[$list->count++] = $token;
-                }
-
-                // Preparing the token that holds the new delimiter.
-                if ($this->last + 1 >= $this->len) {
-                    $this->error(
-                        __('Expected delimiter.'),
-                        '',
-                        $this->last + 1
-                    );
-                    continue;
-                }
-                $pos = $this->last + 1;
-
-                // Parsing the delimiter.
-                $this->delimiter = null;
-                while ((++$this->last < $this->len) && (!Context::isWhitespace($this->str[$this->last]))) {
-                    $this->delimiter .= $this->str[$this->last];
-                }
-
-                if (empty($this->delimiter)) {
-                    $this->error(
-                        __('Expected delimiter.'),
-                        '',
-                        $this->last
-                    );
-                    $this->delimiter = ';';
-                }
-
-                --$this->last;
-
-                // Saving the delimiter and its token.
-                $this->delimiterLen = strlen($this->delimiter);
-                $token = new Token($this->delimiter, Token::TYPE_DELIMITER);
-                $token->position = $pos;
-                $list->tokens[$list->count++] = $token;
-            }
-
-            $lastToken = $token;
-        }
-
-        // Adding a final delimiter to mark the ending.
-        $list->tokens[$list->count++] = new Token(null, Token::TYPE_DELIMITER);
-
-        // Saving the tokens list.
-        $this->list = $list;
-    }
-
-    /**
-     * Creates a new error log.
-     *
-     * @param string $msg  The error message.
-     * @param string $str  The character that produced the error.
-     * @param int    $pos  The position of the character.
-     * @param int    $code The code of the error.
-     *
-     * @throws LexerException Throws the exception, if strict mode is enabled.
-     *
-     * @return void
-     */
-    public function error($msg = '', $str = '', $pos = 0, $code = 0)
-    {
-        $error = new LexerException($msg, $str, $pos, $code);
-        if ($this->strict) {
-            throw $error;
-        }
-        $this->errors[] = $error;
-    }
-
-    /**
-     * Parses a keyword.
-     *
-     * @return Token
-     */
-    public function parseKeyword()
-    {
-        $token = '';
-
-        /**
-         * Value to be returned.
-         *
-         * @var Token $ret
-         */
-        $ret = null;
-
-        /**
-         * The value of `$this->last` where `$token` ends in `$this->str`.
-         *
-         * @var int $iEnd
-         */
-        $iEnd = $this->last;
-
-        /**
-         * Whether last parsed character is a whitespace.
-         *
-         * @var bool $lastSpace
-         */
-        $lastSpace = false;
-
-        for ($j = 1; $j < Context::KEYWORD_MAX_LENGTH && $this->last < $this->len; ++$j, ++$this->last) {
-            // Composed keywords shouldn't have more than one whitespace between
-            // keywords.
-            if (Context::isWhitespace($this->str[$this->last])) {
-                if ($lastSpace) {
-                    --$j; // The size of the keyword didn't increase.
-                    continue;
-                } else {
-                    $lastSpace = true;
-                }
-            } else {
-                $lastSpace = false;
-            }
-            $token .= $this->str[$this->last];
-            if (($this->last + 1 === $this->len) || (Context::isSeparator($this->str[$this->last + 1]))) {
-                if (($flags = Context::isKeyword($token))) {
-                    $ret = new Token($token, Token::TYPE_KEYWORD, $flags);
-                    $iEnd = $this->last;
-
-                    // We don't break so we find longest keyword.
-                    // For example, `OR` and `ORDER` have a common prefix `OR`.
-                    // If we stopped at `OR`, the parsing would be invalid.
-                }
-            }
-        }
-
-        $this->last = $iEnd;
-        return $ret;
-    }
-
-    /**
-     * Parses a label.
-     *
-     * @return Token
-     */
-    public function parseLabel()
-    {
-        $token = '';
-
-        /**
-         * Value to be returned.
-         *
-         * @var Token $ret
-         */
-        $ret = null;
-
-        /**
-         * The value of `$this->last` where `$token` ends in `$this->str`.
-         *
-         * @var int $iEnd
-         */
-        $iEnd = $this->last;
-
-        /**
-         * Whether last parsed character is a whitespace.
-         *
-         * @var bool $lastSpace
-         */
-        $lastSpace = false;
-
-        for ($j = 1; $j < Context::LABEL_MAX_LENGTH && $this->last < $this->len; ++$j, ++$this->last) {
-            // Composed keywords shouldn't have more than one whitespace between
-            // keywords.
-            if (Context::isWhitespace($this->str[$this->last])) {
-                if ($lastSpace) {
-                    --$j; // The size of the keyword didn't increase.
-                    continue;
-                } else {
-                    $lastSpace = true;
-                }
-            } elseif ($this->str[$this->last] === ':') {
-                $token .= $this->str[$this->last];
-                $ret = new Token($token, Token::TYPE_LABEL);
-                $iEnd = $this->last;
-                break;
-            } else {
-                $lastSpace = false;
-            }
-            $token .= $this->str[$this->last];
-        }
-
-        $this->last = $iEnd;
-        return $ret;
-    }
-
-    /**
-     * Parses an operator.
-     *
-     * @return Token
-     */
-    public function parseOperator()
-    {
-        $token = '';
-
-        /**
-         * Value to be returned.
-         *
-         * @var Token $ret
-         */
-        $ret = null;
-
-        /**
-         * The value of `$this->last` where `$token` ends in `$this->str`.
-         *
-         * @var int $iEnd
-         */
-        $iEnd = $this->last;
-
-        for ($j = 1; $j < Context::OPERATOR_MAX_LENGTH && $this->last < $this->len; ++$j, ++$this->last) {
-            $token .= $this->str[$this->last];
-            if ($flags = Context::isOperator($token)) {
-                $ret = new Token($token, Token::TYPE_OPERATOR, $flags);
-                $iEnd = $this->last;
-            }
-        }
-
-        $this->last = $iEnd;
-        return $ret;
-    }
-
-    /**
-     * Parses a whitespace.
-     *
-     * @return Token
-     */
-    public function parseWhitespace()
-    {
-        $token = $this->str[$this->last];
-
-        if (!Context::isWhitespace($token)) {
-            return null;
-        }
-
-        while ((++$this->last < $this->len) && (Context::isWhitespace($this->str[$this->last]))) {
-            $token .= $this->str[$this->last];
-        }
-
-        --$this->last;
-        return new Token($token, Token::TYPE_WHITESPACE);
-    }
-
-    /**
-     * Parses a comment.
-     *
-     * @return Token
-     */
-    public function parseComment()
-    {
-        $iBak = $this->last;
-        $token = $this->str[$this->last];
-
-        // Bash style comments. (#comment\n)
-        if (Context::isComment($token)) {
-            while ((++$this->last < $this->len) && ($this->str[$this->last] !== "\n")) {
-                $token .= $this->str[$this->last];
-            }
-            $token .= "\n"; // Adding the line ending.
-            return new Token($token, Token::TYPE_COMMENT, Token::FLAG_COMMENT_BASH);
-        }
-
-        // C style comments. (/*comment*\/)
-        if (++$this->last < $this->len) {
-            $token .= $this->str[$this->last];
-            if (Context::isComment($token)) {
-                $flags = Token::FLAG_COMMENT_C;
-
-                // This comment already ended. It may be a part of a
-                // previous MySQL specific command.
-                if ($token === '*/') {
-                    return new Token($token, Token::TYPE_COMMENT, $flags);
-                }
-
-                // Checking if this is a MySQL-specific command.
-                if (($this->last + 1 < $this->len) && ($this->str[$this->last + 1] === '!')) {
-                    $flags |= Token::FLAG_COMMENT_MYSQL_CMD;
-                    $token .= $this->str[++$this->last];
-
-                    while ((++$this->last < $this->len)
-                        && ('0' <= $this->str[$this->last])
-                        && ($this->str[$this->last] <= '9')
-                    ) {
-                        $token .= $this->str[$this->last];
-                    }
-                    --$this->last;
-
-                    // We split this comment and parse only its beginning
-                    // here.
-                    return new Token($token, Token::TYPE_COMMENT, $flags);
-                }
-
-                // Parsing the comment.
-                while ((++$this->last < $this->len)
-                    && (($this->str[$this->last - 1] !== '*') || ($this->str[$this->last] !== '/'))
-                ) {
-                    $token .= $this->str[$this->last];
-                }
-
-                // Adding the ending.
-                if ($this->last < $this->len) {
-                    $token .= $this->str[$this->last];
-                }
-                return new Token($token, Token::TYPE_COMMENT, $flags);
-            }
-        }
-
-        // SQL style comments. (-- comment\n)
-        if (++$this->last < $this->len) {
-            $token .= $this->str[$this->last];
-            if (Context::isComment($token)) {
-                // Checking if this comment did not end already (```--\n```).
-                if ($this->str[$this->last] !== "\n") {
-                    while ((++$this->last < $this->len) && ($this->str[$this->last] !== "\n")) {
-                        $token .= $this->str[$this->last];
-                    }
-                    $token .= "\n"; // Adding the line ending.
-                }
-                return new Token($token, Token::TYPE_COMMENT, Token::FLAG_COMMENT_SQL);
-            }
-        }
-
-        $this->last = $iBak;
-        return null;
-    }
-
-    /**
-     * Parses a boolean.
-     *
-     * @return Token
-     */
-    public function parseBool()
-    {
-        if ($this->last + 3 >= $this->len) {
-            // At least `min(strlen('TRUE'), strlen('FALSE'))` characters are
-            // required.
-            return null;
-        }
-
-        $iBak = $this->last;
-        $token = $this->str[$this->last] . $this->str[++$this->last]
-        . $this->str[++$this->last] . $this->str[++$this->last]; // _TRUE_ or _FALS_e
-
-        if (Context::isBool($token)) {
-            return new Token($token, Token::TYPE_BOOL);
-        } elseif (++$this->last < $this->len) {
-            $token .= $this->str[$this->last]; // fals_E_
-            if (Context::isBool($token)) {
-                return new Token($token, Token::TYPE_BOOL, 1);
-            }
-        }
-
-        $this->last = $iBak;
-        return null;
-    }
-
-    /**
-     * Parses a number.
-     *
-     * @return Token
-     */
-    public function parseNumber()
-    {
-        // A rudimentary state machine is being used to parse numbers due to
-        // the various forms of their notation.
-        //
-        // Below are the states of the machines and the conditions to change
-        // the state.
-        //
-        //      1 --------------------[ + or - ]-------------------> 1
-        //      1 -------------------[ 0x or 0X ]------------------> 2
-        //      1 --------------------[ 0 to 9 ]-------------------> 3
-        //      1 -----------------------[ . ]---------------------> 4
-        //      1 -----------------------[ b ]---------------------> 7
-        //
-        //      2 --------------------[ 0 to F ]-------------------> 2
-        //
-        //      3 --------------------[ 0 to 9 ]-------------------> 3
-        //      3 -----------------------[ . ]---------------------> 4
-        //      3 --------------------[ e or E ]-------------------> 5
-        //
-        //      4 --------------------[ 0 to 9 ]-------------------> 4
-        //      4 --------------------[ e or E ]-------------------> 5
-        //
-        //      5 ---------------[ + or - or 0 to 9 ]--------------> 6
-        //
-        //      7 -----------------------[ ' ]---------------------> 8
-        //
-        //      8 --------------------[ 0 or 1 ]-------------------> 8
-        //      8 -----------------------[ ' ]---------------------> 9
-        //
-        // State 1 may be reached by negative numbers.
-        // State 2 is reached only by hex numbers.
-        // State 4 is reached only by float numbers.
-        // State 5 is reached only by numbers in approximate form.
-        // State 7 is reached only by numbers in bit representation.
-        //
-        // Valid final states are: 2, 3, 4 and 6. Any parsing that finished in a
-        // state other than these is invalid.
-        $iBak = $this->last;
-        $token = '';
-        $flags = 0;
-        $state = 1;
-        for (; $this->last < $this->len; ++$this->last) {
-            if ($state === 1) {
-                if ($this->str[$this->last] === '-') {
-                    $flags |= Token::FLAG_NUMBER_NEGATIVE;
-                } elseif (($this->last + 1 < $this->len)
-                    && ($this->str[$this->last] === '0')
-                    && (($this->str[$this->last + 1] === 'x')
-                    || ($this->str[$this->last + 1] === 'X'))
-                ) {
-                    $token .= $this->str[$this->last++];
-                    $state = 2;
-                } elseif (($this->str[$this->last] >= '0') && ($this->str[$this->last] <= '9')) {
-                    $state = 3;
-                } elseif ($this->str[$this->last] === '.') {
-                    $state = 4;
-                } elseif ($this->str[$this->last] === 'b') {
-                    $state = 7;
-                } elseif ($this->str[$this->last] !== '+') {
-                    // `+` is a valid character in a number.
-                    break;
-                }
-            } elseif ($state === 2) {
-                $flags |= Token::FLAG_NUMBER_HEX;
-                if (!((($this->str[$this->last] >= '0') && ($this->str[$this->last] <= '9'))
-                    || (($this->str[$this->last] >= 'A') && ($this->str[$this->last] <= 'F'))
-                    || (($this->str[$this->last] >= 'a') && ($this->str[$this->last] <= 'f')))
-                ) {
-                    break;
-                }
-            } elseif ($state === 3) {
-                if ($this->str[$this->last] === '.') {
-                    $state = 4;
-                } elseif (($this->str[$this->last] === 'e') || ($this->str[$this->last] === 'E')) {
-                    $state = 5;
-                } elseif (($this->str[$this->last] < '0') || ($this->str[$this->last] > '9')) {
-                    // Just digits and `.`, `e` and `E` are valid characters.
-                    break;
-                }
-            } elseif ($state === 4) {
-                $flags |= Token::FLAG_NUMBER_FLOAT;
-                if (($this->str[$this->last] === 'e') || ($this->str[$this->last] === 'E')) {
-                    $state = 5;
-                } elseif (($this->str[$this->last] < '0') || ($this->str[$this->last] > '9')) {
-                    // Just digits, `e` and `E` are valid characters.
-                    break;
-                }
-            } elseif ($state === 5) {
-                $flags |= Token::FLAG_NUMBER_APPROXIMATE;
-                if (($this->str[$this->last] === '+') || ($this->str[$this->last] === '-')
-                    || ((($this->str[$this->last] >= '0') && ($this->str[$this->last] <= '9')))
-                ) {
-                    $state = 6;
-                } else {
-                    break;
-                }
-            } elseif ($state === 6) {
-                if (($this->str[$this->last] < '0') || ($this->str[$this->last] > '9')) {
-                    // Just digits are valid characters.
-                    break;
-                }
-            } elseif ($state === 7) {
-                $flags |= Token::FLAG_NUMBER_BINARY;
-                if ($this->str[$this->last] === '\'') {
-                    $state = 8;
-                } else {
-                    break;
-                }
-            } elseif ($state === 8) {
-                if ($this->str[$this->last] === '\'') {
-                    $state = 9;
-                } elseif (($this->str[$this->last] !== '0')
-                    && ($this->str[$this->last] !== '1')
-                ) {
-                    break;
-                }
-            } elseif ($state === 9) {
-                break;
-            }
-            $token .= $this->str[$this->last];
-        }
-        if (($state === 2) || ($state === 3)
-            || (($token !== '.') && ($state === 4))
-            || ($state === 6) || ($state === 9)
-        ) {
-            --$this->last;
-            return new Token($token, Token::TYPE_NUMBER, $flags);
-        }
-        $this->last = $iBak;
-        return null;
-    }
-
-    /**
-     * Parses a string.
-     *
-     * @param string $quote Additional starting symbol.
-     *
-     * @return Token
-     */
-    public function parseString($quote = '')
-    {
-        $token = $this->str[$this->last];
-        if ((!($flags = Context::isString($token))) && ($token !== $quote)) {
-            return null;
-        }
-        $quote = $token;
-
-        while (++$this->last < $this->len) {
-            if (($this->last + 1 < $this->len)
-                && ((($this->str[$this->last] === $quote) && ($this->str[$this->last + 1] === $quote))
-                || (($this->str[$this->last] === '\\') && ($quote !== '`')))
-            ) {
-                $token .= $this->str[$this->last] . $this->str[++$this->last];
-            } else {
-                if ($this->str[$this->last] === $quote) {
-                    break;
-                }
-                $token .= $this->str[$this->last];
-            }
-        }
-
-        if (($this->last >= $this->len) || ($this->str[$this->last] !== $quote)) {
-            $this->error(
-                sprintf(
-                    __('Ending quote %1$s was expected.'),
-                    $quote
-                ),
-                '',
-                $this->last
-            );
-        } else {
-            $token .= $this->str[$this->last];
-        }
-        return new Token($token, Token::TYPE_STRING, $flags);
-    }
-
-    /**
-     * Parses a symbol.
-     *
-     * @return Token
-     */
-    public function parseSymbol()
-    {
-        $token = $this->str[$this->last];
-        if (!($flags = Context::isSymbol($token))) {
-            return null;
-        }
-
-        if ($flags & Token::FLAG_SYMBOL_VARIABLE) {
-            if ($this->str[++$this->last] === '@') {
-                // This is a system variable (e.g. `@@hostname`).
-                $token .= $this->str[$this->last++];
-                $flags |= Token::FLAG_SYMBOL_SYSTEM;
-            }
-        } else {
-            $token = '';
-        }
-
-        $str = null;
-
-        if ($this->last < $this->len) {
-            if (($str = $this->parseString('`')) === null) {
-                if (($str = static::parseUnknown()) === null) {
-                    $this->error(
-                        __('Variable name was expected.'),
-                        $this->str[$this->last],
-                        $this->last
-                    );
-                }
-            }
-        }
-
-        if ($str !== null) {
-            $token .= $str->token;
-        }
-
-        return new Token($token, Token::TYPE_SYMBOL, $flags);
-    }
-
-    /**
-     * Parses unknown parts of the query.
-     *
-     * @return Token
-     */
-    public function parseUnknown()
-    {
-        $token = $this->str[$this->last];
-        if (Context::isSeparator($token)) {
-            return null;
-        }
-        while ((++$this->last < $this->len) && (!Context::isSeparator($this->str[$this->last]))) {
-            $token .= $this->str[$this->last];
-        }
-        --$this->last;
-        return new Token($token);
-    }
-
-    /**
-     * Parses the delimiter of the query.
-     *
-     * @return Token
-     */
-    public function parseDelimiter()
-    {
-        $idx = 0;
-
-        while (($idx < $this->delimiterLen) && ($this->last + $idx < $this->len)) {
-            if ($this->delimiter[$idx] !== $this->str[$this->last + $idx]) {
-                return null;
-            }
-            ++$idx;
-        }
-
-        $this->last += $this->delimiterLen - 1;
-        return new Token($this->delimiter, Token::TYPE_DELIMITER);
-    }
-}
diff --git a/#pma/libraries/sql-parser/src/Parser.php b/#pma/libraries/sql-parser/src/Parser.php
deleted file mode 100644
index ddefc7ee..00000000
--- a/#pma/libraries/sql-parser/src/Parser.php
+++ /dev/null
@@ -1,607 +0,0 @@
-<?php
-
-/**
- * Defines the parser of the library.
- *
- * This is one of the most important components, along with the lexer.
- *
- * @package SqlParser
- */
-namespace SqlParser;
-
-require_once 'common.php';
-
-use SqlParser\Exceptions\ParserException;
-use SqlParser\Statements\SelectStatement;
-use SqlParser\Statements\TransactionStatement;
-
-/**
- * Takes multiple tokens (contained in a Lexer instance) as input and builds a
- * parse tree.
- *
- * @category Parser
- * @package  SqlParser
- * @license  https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-class Parser
-{
-
-    /**
-     * Array of classes that are used in parsing the SQL statements.
-     *
-     * @var array
-     */
-    public static $STATEMENT_PARSERS = array(
-
-        // MySQL Utility Statements
-        'DESCRIBE'          => 'SqlParser\\Statements\\ExplainStatement',
-        'DESC'              => 'SqlParser\\Statements\\ExplainStatement',
-        'EXPLAIN'           => 'SqlParser\\Statements\\ExplainStatement',
-        'FLUSH'             => '',
-        'GRANT'             => '',
-        'HELP'              => '',
-        'SET PASSWORD'      => '',
-        'STATUS'            => '',
-        'USE'               => '',
-
-        // Table Maintenance Statements
-        // https://dev.mysql.com/doc/refman/5.7/en/table-maintenance-sql.html
-        'ANALYZE'           => 'SqlParser\\Statements\\AnalyzeStatement',
-        'BACKUP'            => 'SqlParser\\Statements\\BackupStatement',
-        'CHECK'             => 'SqlParser\\Statements\\CheckStatement',
-        'CHECKSUM'          => 'SqlParser\\Statements\\ChecksumStatement',
-        'OPTIMIZE'          => 'SqlParser\\Statements\\OptimizeStatement',
-        'REPAIR'            => 'SqlParser\\Statements\\RepairStatement',
-        'RESTORE'           => 'SqlParser\\Statements\\RestoreStatement',
-
-        // Database Administration Statements
-        // https://dev.mysql.com/doc/refman/5.7/en/sql-syntax-server-administration.html
-        'SET'               => 'SqlParser\\Statements\\SetStatement',
-        'SHOW'              => 'SqlParser\\Statements\\ShowStatement',
-
-        // Data Definition Statements.
-        // https://dev.mysql.com/doc/refman/5.7/en/sql-syntax-data-definition.html
-        'ALTER'             => 'SqlParser\\Statements\\AlterStatement',
-        'CREATE'            => 'SqlParser\\Statements\\CreateStatement',
-        'DROP'              => 'SqlParser\\Statements\\DropStatement',
-        'RENAME'            => 'SqlParser\\Statements\\RenameStatement',
-        'TRUNCATE'          => 'SqlParser\\Statements\\TruncateStatement',
-
-        // Data Manipulation Statements.
-        // https://dev.mysql.com/doc/refman/5.7/en/sql-syntax-data-manipulation.html
-        'CALL'              => 'SqlParser\\Statements\\CallStatement',
-        'DELETE'            => 'SqlParser\\Statements\\DeleteStatement',
-        'DO'                => '',
-        'HANDLER'           => '',
-        'INSERT'            => 'SqlParser\\Statements\\InsertStatement',
-        'LOAD'              => '',
-        'REPLACE'           => 'SqlParser\\Statements\\ReplaceStatement',
-        'SELECT'            => 'SqlParser\\Statements\\SelectStatement',
-        'UPDATE'            => 'SqlParser\\Statements\\UpdateStatement',
-
-        // Prepared Statements.
-        // https://dev.mysql.com/doc/refman/5.7/en/sql-syntax-prepared-statements.html
-        'DEALLOCATE'        => '',
-        'EXECUTE'           => '',
-        'PREPARE'           => '',
-
-        // Transactional and Locking Statements
-        // https://dev.mysql.com/doc/refman/5.7/en/commit.html
-        'BEGIN'             => 'SqlParser\\Statements\\TransactionStatement',
-        'COMMIT'            => 'SqlParser\\Statements\\TransactionStatement',
-        'ROLLBACK'          => 'SqlParser\\Statements\\TransactionStatement',
-        'START TRANSACTION' => 'SqlParser\\Statements\\TransactionStatement',
-    );
-
-    /**
-     * Array of classes that are used in parsing SQL components.
-     *
-     * @var array
-     */
-    public static $KEYWORD_PARSERS = array(
-
-        // This is not a proper keyword and was added here to help the
-        // formatter.
-        'PARTITION BY'          => array(),
-        'SUBPARTITION BY'       => array(),
-
-        // This is not a proper keyword and was added here to help the
-        // builder.
-        '_OPTIONS'              => array(
-            'class'             => 'SqlParser\\Components\\OptionsArray',
-            'field'             => 'options',
-        ),
-        '_END_OPTIONS'          => array(
-            'class'             => 'SqlParser\\Components\\OptionsArray',
-            'field'             => 'end_options',
-        ),
-
-
-        'UNION'                 => array(
-            'class'             => 'SqlParser\\Components\\UnionKeyword',
-            'field'             => 'union',
-        ),
-        'UNION ALL'             => array(
-            'class'             => 'SqlParser\\Components\\UnionKeyword',
-            'field'             => 'union',
-        ),
-        'UNION DISTINCT'        => array(
-            'class'             => 'SqlParser\\Components\\UnionKeyword',
-            'field'             => 'union',
-        ),
-
-        // Actual clause parsers.
-        'ALTER'                 => array(
-            'class'             => 'SqlParser\\Components\\Expression',
-            'field'             => 'table',
-            'options'           => array('parseField' => 'table'),
-        ),
-        'ANALYZE'               => array(
-            'class'             => 'SqlParser\\Components\\ExpressionArray',
-            'field'             => 'tables',
-            'options'           => array('parseField' => 'table'),
-        ),
-        'BACKUP'                => array(
-            'class'             => 'SqlParser\\Components\\ExpressionArray',
-            'field'             => 'tables',
-            'options'           => array('parseField' => 'table'),
-        ),
-        'CALL'                  => array(
-            'class'             => 'SqlParser\\Components\\FunctionCall',
-            'field'             => 'call',
-        ),
-        'CHECK'                 => array(
-            'class'             => 'SqlParser\\Components\\ExpressionArray',
-            'field'             => 'tables',
-            'options'           => array('parseField' => 'table'),
-        ),
-        'CHECKSUM'              => array(
-            'class'             => 'SqlParser\\Components\\ExpressionArray',
-            'field'             => 'tables',
-            'options'           => array('parseField' => 'table'),
-        ),
-        'CROSS JOIN'            => array(
-            'class'             => 'SqlParser\\Components\\JoinKeyword',
-            'field'             => 'join',
-        ),
-        'DROP'                  => array(
-            'class'             => 'SqlParser\\Components\\ExpressionArray',
-            'field'             => 'fields',
-            'options'           => array('parseField' => 'table'),
-        ),
-        'FROM'                  => array(
-            'class'             => 'SqlParser\\Components\\ExpressionArray',
-            'field'             => 'from',
-            'options'           => array('field' => 'table'),
-        ),
-        'GROUP BY'              => array(
-            'class'             => 'SqlParser\\Components\\OrderKeyword',
-            'field'             => 'group',
-        ),
-        'HAVING'                => array(
-            'class'             => 'SqlParser\\Components\\Condition',
-            'field'             => 'having',
-        ),
-        'INTO'                  => array(
-            'class'             => 'SqlParser\\Components\\IntoKeyword',
-            'field'             => 'into',
-        ),
-        'JOIN'                  => array(
-            'class'             => 'SqlParser\\Components\\JoinKeyword',
-            'field'             => 'join',
-        ),
-        'LEFT JOIN'             => array(
-            'class'             => 'SqlParser\\Components\\JoinKeyword',
-            'field'             => 'join',
-        ),
-        'LEFT OUTER JOIN'       => array(
-            'class'             => 'SqlParser\\Components\\JoinKeyword',
-            'field'             => 'join',
-        ),
-        'ON'                    => array(
-            'class'             => 'SqlParser\\Components\\Expression',
-            'field'             => 'table',
-            'options'           => array('parseField' => 'table'),
-        ),
-        'RIGHT JOIN'            => array(
-            'class'             => 'SqlParser\\Components\\JoinKeyword',
-            'field'             => 'join',
-        ),
-        'RIGHT OUTER JOIN'      => array(
-            'class'             => 'SqlParser\\Components\\JoinKeyword',
-            'field'             => 'join',
-        ),
-        'INNER JOIN'            => array(
-            'class'             => 'SqlParser\\Components\\JoinKeyword',
-            'field'             => 'join',
-        ),
-        'FULL JOIN'             => array(
-            'class'             => 'SqlParser\\Components\\JoinKeyword',
-            'field'             => 'join',
-        ),
-        'FULL OUTER JOIN'       => array(
-            'class'             => 'SqlParser\\Components\\JoinKeyword',
-            'field'             => 'join',
-        ),
-        'NATURAL JOIN'         => array(
-            'class'             => 'SqlParser\\Components\\JoinKeyword',
-            'field'             => 'join',
-        ),
-        'NATURAL LEFT JOIN'         => array(
-            'class'             => 'SqlParser\\Components\\JoinKeyword',
-            'field'             => 'join',
-        ),
-        'NATURAL RIGHT JOIN'         => array(
-            'class'             => 'SqlParser\\Components\\JoinKeyword',
-            'field'             => 'join',
-        ),
-        'NATURAL LEFT OUTER JOIN'         => array(
-            'class'             => 'SqlParser\\Components\\JoinKeyword',
-            'field'             => 'join',
-        ),
-        'NATURAL RIGHT OUTER JOIN'         => array(
-            'class'             => 'SqlParser\\Components\\JoinKeyword',
-            'field'             => 'join',
-        ),
-        'LIMIT'                 => array(
-            'class'             => 'SqlParser\\Components\\Limit',
-            'field'             => 'limit',
-        ),
-        'OPTIMIZE'              => array(
-            'class'             => 'SqlParser\\Components\\ExpressionArray',
-            'field'             => 'tables',
-            'options'           => array('parseField' => 'table'),
-        ),
-        'ORDER BY'              => array(
-            'class'             => 'SqlParser\\Components\\OrderKeyword',
-            'field'             => 'order',
-        ),
-        'PARTITION'             => array(
-            'class'             => 'SqlParser\\Components\\ArrayObj',
-            'field'             => 'partition',
-        ),
-        'PROCEDURE'             => array(
-            'class'             => 'SqlParser\\Components\\FunctionCall',
-            'field'             => 'procedure',
-        ),
-        'RENAME'                => array(
-            'class'             => 'SqlParser\\Components\\RenameOperation',
-            'field'             => 'renames',
-        ),
-        'REPAIR'                => array(
-            'class'             => 'SqlParser\\Components\\ExpressionArray',
-            'field'             => 'tables',
-            'options'           => array('parseField' => 'table'),
-        ),
-        'RESTORE'               => array(
-            'class'             => 'SqlParser\\Components\\ExpressionArray',
-            'field'             => 'tables',
-            'options'           => array('parseField' => 'table'),
-        ),
-        'SET'                   => array(
-            'class'             => 'SqlParser\\Components\\SetOperation',
-            'field'             => 'set',
-        ),
-        'SELECT'                => array(
-            'class'             => 'SqlParser\\Components\\ExpressionArray',
-            'field'             => 'expr',
-        ),
-        'TRUNCATE'              => array(
-            'class'             => 'SqlParser\\Components\\Expression',
-            'field'             => 'table',
-            'options'           => array('parseField' => 'table'),
-        ),
-        'UPDATE'                => array(
-            'class'             => 'SqlParser\\Components\\ExpressionArray',
-            'field'             => 'tables',
-            'options'           => array('parseField' => 'table'),
-        ),
-        'VALUE'                 => array(
-            'class'             => 'SqlParser\\Components\\Array2d',
-            'field'             => 'values',
-        ),
-        'VALUES'                => array(
-            'class'             => 'SqlParser\\Components\\Array2d',
-            'field'             => 'values',
-        ),
-        'WHERE'                 => array(
-            'class'             => 'SqlParser\\Components\\Condition',
-            'field'             => 'where',
-        ),
-
-    );
-
-    /**
-     * The list of tokens that are parsed.
-     *
-     * @var TokensList
-     */
-    public $list;
-
-    /**
-     * Whether errors should throw exceptions or just be stored.
-     *
-     * @var bool
-     *
-     * @see static::$errors
-     */
-    public $strict = false;
-
-    /**
-     * List of errors that occurred during parsing.
-     *
-     * Usually, the parsing does not stop once an error occurred because that
-     * error might be a false positive or a partial result (even a bad one)
-     * might be needed.
-     *
-     * @var ParserException[]
-     *
-     * @see Parser::error()
-     */
-    public $errors = array();
-
-    /**
-     * List of statements parsed.
-     *
-     * @var Statement[]
-     */
-    public $statements = array();
-
-    /**
-     * The number of opened brackets.
-     *
-     * @var int
-     */
-    public $brackets = 0;
-
-    /**
-     * Constructor.
-     *
-     * @param string|UtfString|TokensList $list   The list of tokens to be parsed.
-     * @param bool                        $strict Whether strict mode should be enabled or not.
-     */
-    public function __construct($list = null, $strict = false)
-    {
-        if ((is_string($list)) || ($list instanceof UtfString)) {
-            $lexer = new Lexer($list, $strict);
-            $this->list = $lexer->list;
-        } elseif ($list instanceof TokensList) {
-            $this->list = $list;
-        }
-
-        $this->strict = $strict;
-
-        if ($list !== null) {
-            $this->parse();
-        }
-    }
-
-    /**
-     * Builds the parse trees.
-     *
-     * @return void
-     */
-    public function parse()
-    {
-
-        /**
-         * Last transaction.
-         *
-         * @var TransactionStatement $lastTransaction
-         */
-        $lastTransaction = null;
-
-        /**
-         * Last parsed statement.
-         *
-         * @var Statement $lastStatement
-         */
-        $lastStatement = null;
-
-        /**
-         * Union's type or false for no union.
-         *
-         * @var bool|string $unionType
-         */
-        $unionType = false;
-
-        /**
-         * The index of the last token from the last statement.
-         *
-         * @var int $prevLastIdx
-         */
-        $prevLastIdx = -1;
-
-        /**
-         * The list of tokens.
-         *
-         * @var TokensList $list
-         */
-        $list = &$this->list;
-
-        for (; $list->idx < $list->count; ++$list->idx) {
-            /**
-             * Token parsed at this moment.
-             *
-             * @var Token $token
-             */
-            $token = $list->tokens[$list->idx];
-
-            // `DELIMITER` is not an actual statement and it requires
-            // special handling.
-            if (($token->type === Token::TYPE_NONE)
-                && (strtoupper($token->token) === 'DELIMITER')
-            ) {
-                // Skipping to the end of this statement.
-                $list->getNextOfType(Token::TYPE_DELIMITER);
-                $prevLastIdx = $list->idx;
-                continue;
-            }
-
-            // Counting the brackets around statements.
-            if ($token->value === '(') {
-                ++$this->brackets;
-                continue;
-            }
-
-            // Statements can start with keywords only.
-            // Comments, whitespaces, etc. are ignored.
-            if ($token->type !== Token::TYPE_KEYWORD) {
-                if (($token->type !== TOKEN::TYPE_COMMENT)
-                    && ($token->type !== Token::TYPE_WHITESPACE)
-                    && ($token->type !== Token::TYPE_OPERATOR) // `(` and `)`
-                    && ($token->type !== Token::TYPE_DELIMITER)
-                ) {
-                    $this->error(
-                        __('Unexpected beginning of statement.'),
-                        $token
-                    );
-                }
-                continue;
-            }
-
-            if (($token->value === 'UNION') || ($token->value === 'UNION ALL') || ($token->value === 'UNION DISTINCT')) {
-                $unionType = $token->value;
-                continue;
-            }
-
-            // Checking if it is a known statement that can be parsed.
-            if (empty(static::$STATEMENT_PARSERS[$token->value])) {
-                if (!isset(static::$STATEMENT_PARSERS[$token->value])) {
-                    // A statement is considered recognized if the parser
-                    // is aware that it is a statement, but it does not have
-                    // a parser for it yet.
-                    $this->error(
-                        __('Unrecognized statement type.'),
-                        $token
-                    );
-                }
-                // Skipping to the end of this statement.
-                $list->getNextOfType(Token::TYPE_DELIMITER);
-                $prevLastIdx = $list->idx;
-                continue;
-            }
-
-            /**
-             * The name of the class that is used for parsing.
-             *
-             * @var string $class
-             */
-            $class = static::$STATEMENT_PARSERS[$token->value];
-
-            /**
-             * Processed statement.
-             *
-             * @var Statement $statement
-             */
-            $statement = new $class($this, $this->list);
-
-            // The first token that is a part of this token is the next token
-            // unprocessed by the previous statement.
-            // There might be brackets around statements and this shouldn't
-            // affect the parser
-            $statement->first = $prevLastIdx + 1;
-
-            // Storing the index of the last token parsed and updating the old
-            // index.
-            $statement->last = $list->idx;
-            $prevLastIdx = $list->idx;
-
-            // Handles unions.
-            if ((!empty($unionType))
-                && ($lastStatement instanceof SelectStatement)
-                && ($statement instanceof SelectStatement)
-            ) {
-                /**
-                 * This SELECT statement.
-                 *
-                 * @var SelectStatement $statement
-                 */
-
-                /**
-                 * Last SELECT statement.
-                 *
-                 * @var SelectStatement $lastStatement
-                 */
-                $lastStatement->union[] = array($unionType, $statement);
-
-                // if there are no no delimiting brackets, the `ORDER` and
-                // `LIMIT` keywords actually belong to the first statement.
-                $lastStatement->order = $statement->order;
-                $lastStatement->limit = $statement->limit;
-                $statement->order = array();
-                $statement->limit = null;
-
-                // The statement actually ends where the last statement in
-                // union ends.
-                $lastStatement->last = $statement->last;
-
-                $unionType = false;
-
-                // Validate clause order
-                $statement->validateClauseOrder($this, $list);
-                continue;
-            }
-
-            // Handles transactions.
-            if ($statement instanceof TransactionStatement) {
-                /**
-                 * @var TransactionStatement $statement
-                 */
-                if ($statement->type === TransactionStatement::TYPE_BEGIN) {
-                    $lastTransaction = $statement;
-                    $this->statements[] = $statement;
-                } elseif ($statement->type === TransactionStatement::TYPE_END) {
-                    if ($lastTransaction === null) {
-                        // Even though an error occurred, the query is being
-                        // saved.
-                        $this->statements[] = $statement;
-                        $this->error(
-                            __('No transaction was previously started.'),
-                            $token
-                        );
-                    } else {
-                        $lastTransaction->end = $statement;
-                    }
-                    $lastTransaction = null;
-                }
-
-                // Validate clause order
-                $statement->validateClauseOrder($this, $list);
-                continue;
-            }
-
-            // Validate clause order
-            $statement->validateClauseOrder($this, $list);
-
-            // Finally, storing the statement.
-            if ($lastTransaction !== null) {
-                $lastTransaction->statements[] = $statement;
-            } else {
-                $this->statements[] = $statement;
-            }
-            $lastStatement = $statement;
-
-        }
-    }
-
-    /**
-     * Creates a new error log.
-     *
-     * @param string $msg   The error message.
-     * @param Token  $token The token that produced the error.
-     * @param int    $code  The code of the error.
-     *
-     * @throws ParserException Throws the exception, if strict mode is enabled.
-     *
-     * @return void
-     */
-    public function error($msg = '', Token $token = null, $code = 0)
-    {
-        $error = new ParserException($msg, $token, $code);
-        if ($this->strict) {
-            throw $error;
-        }
-        $this->errors[] = $error;
-    }
-}
diff --git a/#pma/libraries/sql-parser/src/Statement.php b/#pma/libraries/sql-parser/src/Statement.php
deleted file mode 100644
index e3e5968c..00000000
--- a/#pma/libraries/sql-parser/src/Statement.php
+++ /dev/null
@@ -1,509 +0,0 @@
-<?php
-
-/**
- * The result of the parser is an array of statements are extensions of the
- * class defined here.
- *
- * A statement represents the result of parsing the lexemes.
- *
- * @package SqlParser
- */
-namespace SqlParser;
-
-use SqlParser\Components\OptionsArray;
-
-/**
- * Abstract statement definition.
- *
- * @category Statements
- * @package  SqlParser
- * @license  https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-abstract class Statement
-{
-
-    /**
-     * Options for this statement.
-     *
-     * The option would be the key and the value can be an integer or an array.
-     *
-     * The integer represents only the index used.
-     *
-     * The array may have two keys: `0` is used to represent the index used and
-     * `1` is the type of the option (which may be 'var' or 'var='). Both
-     * options mean they expect a value after the option (e.g. `A = B` or `A B`,
-     * in which case `A` is the key and `B` is the value). The only difference
-     * is in the building process. `var` options are built as `A B` and  `var=`
-     * options are built as `A = B`
-     *
-     * Two options that can be used together must have different values for
-     * indexes, else, when they will be used together, an error will occur.
-     *
-     * @var array
-     */
-    public static $OPTIONS = array();
-
-    /**
-     * The clauses of this statement, in order.
-     *
-     * The value attributed to each clause is used by the builder and it may
-     * have one of the following values:
-     *
-     *     - 1 = 01 - add the clause only
-     *     - 2 = 10 - add the keyword
-     *     - 3 = 11 - add both the keyword and the clause
-     *
-     * @var array
-     */
-    public static $CLAUSES = array();
-
-    /**
-     * The options of this query.
-     *
-     * @var OptionsArray
-     *
-     * @see static::$OPTIONS
-     */
-    public $options;
-
-    /**
-     * The index of the first token used in this statement.
-     *
-     * @var int
-     */
-    public $first;
-
-    /**
-     * The index of the last token used in this statement.
-     *
-     * @var int
-     */
-    public $last;
-
-    /**
-     * Constructor.
-     *
-     * @param Parser     $parser The instance that requests parsing.
-     * @param TokensList $list   The list of tokens to be parsed.
-     */
-    public function __construct(Parser $parser = null, TokensList $list = null)
-    {
-        if (($parser !== null) && ($list !== null)) {
-            $this->parse($parser, $list);
-        }
-    }
-
-    /**
-     * Builds the string representation of this statement.
-     *
-     * @return string
-     */
-    public function build()
-    {
-        /**
-         * Query to be returned.
-         *
-         * @var string $query
-         */
-        $query = '';
-
-        /**
-         * Clauses which were built already.
-         *
-         * It is required to keep track of built clauses because some fields,
-         * for example `join` is used by multiple clauses (`JOIN`, `LEFT JOIN`,
-         * `LEFT OUTER JOIN`, etc.). The same happens for `VALUE` and `VALUES`.
-         *
-         * A clause is considered built just after fields' value
-         * (`$this->field`) was used in building.
-         *
-         * @var array
-         */
-        $built = array();
-
-        /**
-         * Statement's clauses.
-         *
-         * @var array
-         */
-        $clauses = $this->getClauses();
-
-        foreach ($clauses as $clause) {
-            /**
-             * The name of the clause.
-             *
-             * @var string $name
-             */
-            $name = $clause[0];
-
-            /**
-             * The type of the clause.
-             *
-             * @see self::$CLAUSES
-             * @var int $type
-             */
-            $type = $clause[1];
-
-            /**
-             * The builder (parser) of this clause.
-             *
-             * @var Component $class
-             */
-            $class = Parser::$KEYWORD_PARSERS[$name]['class'];
-
-            /**
-             * The name of the field that is used as source for the builder.
-             * Same field is used to store the result of parsing.
-             *
-             * @var string $field
-             */
-            $field = Parser::$KEYWORD_PARSERS[$name]['field'];
-
-            // The field is empty, there is nothing to be built.
-            if (empty($this->$field)) {
-                continue;
-            }
-
-            // Checking if this field was already built.
-            if ($type & 1) {
-                if (!empty($built[$field])) {
-                    continue;
-                }
-                $built[$field] = true;
-            }
-
-            // Checking if the name of the clause should be added.
-            if ($type & 2) {
-                $query .= $name . ' ';
-            }
-
-            // Checking if the result of the builder should be added.
-            if ($type & 1) {
-                $query .= $class::build($this->$field) . ' ';
-            }
-        }
-
-        return $query;
-    }
-
-    /**
-     * Parses the statements defined by the tokens list.
-     *
-     * @param Parser     $parser The instance that requests parsing.
-     * @param TokensList $list   The list of tokens to be parsed.
-     *
-     * @return void
-     */
-    public function parse(Parser $parser, TokensList $list)
-    {
-        /**
-         * Array containing all list of clauses parsed.
-         * This is used to check for duplicates.
-         *
-         * @var array $parsedClauses
-         */
-        $parsedClauses = array();
-
-        // This may be corrected by the parser.
-        $this->first = $list->idx;
-
-        /**
-         * Whether options were parsed or not.
-         * For statements that do not have any options this is set to `true` by
-         * default.
-         *
-         * @var bool $parsedOptions
-         */
-        $parsedOptions = empty(static::$OPTIONS);
-
-        for (; $list->idx < $list->count; ++$list->idx) {
-            /**
-             * Token parsed at this moment.
-             *
-             * @var Token $token
-             */
-            $token = $list->tokens[$list->idx];
-
-            // End of statement.
-            if ($token->type === Token::TYPE_DELIMITER) {
-                break;
-            }
-
-            // Checking if this closing bracket is the pair for a bracket
-            // outside the statement.
-            if (($token->value === ')') && ($parser->brackets > 0)) {
-                --$parser->brackets;
-                continue;
-            }
-
-            // Only keywords are relevant here. Other parts of the query are
-            // processed in the functions below.
-            if ($token->type !== Token::TYPE_KEYWORD) {
-                if (($token->type !== TOKEN::TYPE_COMMENT)
-                    && ($token->type !== Token::TYPE_WHITESPACE)
-                ) {
-                    $parser->error(__('Unexpected token.'), $token);
-                }
-                continue;
-            }
-
-            // Unions are parsed by the parser because they represent more than
-            // one statement.
-            if (($token->value === 'UNION') || ($token->value === 'UNION ALL') || ($token->value === 'UNION DISTINCT')) {
-                break;
-            }
-
-            $lastIdx = $list->idx;
-
-            // ON DUPLICATE KEY UPDATE ...
-            // has to be parsed in parent statement (INSERT or REPLACE)
-            // so look for it and break
-            if (get_class($this) === 'SqlParser\Statements\SelectStatement'
-                && $token->value === 'ON'
-            ) {
-                ++$list->idx; // Skip ON
-
-                // look for ON DUPLICATE KEY UPDATE
-                $first = $list->getNextOfType(Token::TYPE_KEYWORD);
-                $second = $list->getNextOfType(Token::TYPE_KEYWORD);
-                $third = $list->getNextOfType(Token::TYPE_KEYWORD);
-
-                if ($first && $second && $third
-                    && $first->value === 'DUPLICATE'
-                    && $second->value === 'KEY'
-                    && $third->value === 'UPDATE'
-                ) {
-                    $list->idx = $lastIdx;
-                    break;
-                }
-            }
-            $list->idx = $lastIdx;
-
-            /**
-             * The name of the class that is used for parsing.
-             *
-             * @var Component $class
-             */
-            $class = null;
-
-            /**
-             * The name of the field where the result of the parsing is stored.
-             *
-             * @var string $field
-             */
-            $field = null;
-
-            /**
-             * Parser's options.
-             *
-             * @var array $options
-             */
-            $options = array();
-
-            // Looking for duplicated clauses.
-            if ((!empty(Parser::$KEYWORD_PARSERS[$token->value]))
-                || (!empty(Parser::$STATEMENT_PARSERS[$token->value]))
-            ) {
-                if (!empty($parsedClauses[$token->value])) {
-                    $parser->error(
-                        __('This type of clause was previously parsed.'),
-                        $token
-                    );
-                    break;
-                }
-                $parsedClauses[$token->value] = true;
-            }
-
-            // Checking if this is the beginning of a clause.
-            if (!empty(Parser::$KEYWORD_PARSERS[$token->value])) {
-                $class = Parser::$KEYWORD_PARSERS[$token->value]['class'];
-                $field = Parser::$KEYWORD_PARSERS[$token->value]['field'];
-                if (!empty(Parser::$KEYWORD_PARSERS[$token->value]['options'])) {
-                    $options = Parser::$KEYWORD_PARSERS[$token->value]['options'];
-                }
-            }
-
-            // Checking if this is the beginning of the statement.
-            if (!empty(Parser::$STATEMENT_PARSERS[$token->value])) {
-                if ((!empty(static::$CLAUSES)) // Undefined for some statements.
-                    && (empty(static::$CLAUSES[$token->value]))
-                ) {
-                    // Some keywords (e.g. `SET`) may be the beginning of a
-                    // statement and a clause.
-                    // If such keyword was found and it cannot be a clause of
-                    // this statement it means it is a new statement, but no
-                    // delimiter was found between them.
-                    $parser->error(
-                        __('A new statement was found, but no delimiter between it and the previous one.'),
-                        $token
-                    );
-                    break;
-                }
-                if (!$parsedOptions) {
-                    if (empty(static::$OPTIONS[$token->value])) {
-                        // Skipping keyword because if it is not a option.
-                        ++$list->idx;
-                    }
-                    $this->options = OptionsArray::parse(
-                        $parser,
-                        $list,
-                        static::$OPTIONS
-                    );
-                    $parsedOptions = true;
-                }
-            } elseif ($class === null) {
-                // Handle special end options in Select statement
-                // See Statements\SelectStatement::$END_OPTIONS
-                if (get_class($this) === 'SqlParser\Statements\SelectStatement'
-                    && ($token->value === 'FOR UPDATE'
-                    || $token->value === 'LOCK IN SHARE MODE')
-                ) {
-                    $this->end_options = OptionsArray::parse(
-                        $parser,
-                        $list,
-                        static::$END_OPTIONS
-                    );
-                } else {
-                    // There is no parser for this keyword and isn't the beginning
-                    // of a statement (so no options) either.
-                    $parser->error(__('Unrecognized keyword.'), $token);
-                    continue;
-                }
-            }
-
-            $this->before($parser, $list, $token);
-
-            // Parsing this keyword.
-            if ($class !== null) {
-                ++$list->idx; // Skipping keyword or last option.
-                $this->$field = $class::parse($parser, $list, $options);
-            }
-
-            $this->after($parser, $list, $token);
-        }
-
-        // This may be corrected by the parser.
-        $this->last = --$list->idx; // Go back to last used token.
-    }
-
-    /**
-     * Function called before the token is processed.
-     *
-     * @param Parser     $parser The instance that requests parsing.
-     * @param TokensList $list   The list of tokens to be parsed.
-     * @param Token      $token  The token that is being parsed.
-     *
-     * @return void
-     */
-    public function before(Parser $parser, TokensList $list, Token $token)
-    {
-
-    }
-
-    /**
-     * Function called after the token was processed.
-     *
-     * @param Parser     $parser The instance that requests parsing.
-     * @param TokensList $list   The list of tokens to be parsed.
-     * @param Token      $token  The token that is being parsed.
-     *
-     * @return void
-     */
-    public function after(Parser $parser, TokensList $list, Token $token)
-    {
-
-    }
-
-    /**
-     * Gets the clauses of this statement.
-     *
-     * @return array
-     */
-    public function getClauses()
-    {
-        return static::$CLAUSES;
-    }
-
-    /**
-     * Builds the string representation of this statement.
-     *
-     * @see static::build
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->build();
-    }
-
-    /**
-     * Validates the order of the clauses in parsed statement
-     * Ideally this should be called after successfully
-     * completing the parsing of each statement
-     *
-     * @param Parser     $parser The instance that requests parsing.
-     * @param TokensList $list   The list of tokens to be parsed.
-     *
-     * @return boolean
-     */
-    public function validateClauseOrder($parser, $list)
-    {
-        $clauses = array_flip(array_keys($this->getClauses()));
-
-        if (empty($clauses)
-            || count($clauses) == 0
-        ) {
-            return true;
-        }
-
-        $minIdx = -1;
-
-        /**
-         * For tracking JOIN clauses in a query
-         *   0 - JOIN not found till now
-         *   1 - JOIN has been found
-         *   2 - A Non-JOIN clause has been found
-         *       after a previously found JOIN clause
-         *
-         * @var int $joinStart
-         */
-        $joinStart = 0;
-
-        $error = 0;
-        foreach ($clauses as $clauseType => $index) {
-            $clauseStartIdx = Utils\Query::getClauseStartOffset(
-                $this,
-                $list,
-                $clauseType
-            );
-
-            // Handle ordering of Multiple Joins in a query
-            if ($clauseStartIdx != -1) {
-                if ($joinStart == 0 && stripos($clauseType, 'JOIN')) {
-                    $joinStart = 1;
-                } elseif ($joinStart == 1 && ! stripos($clauseType, 'JOIN')) {
-                    $joinStart = 2;
-                } elseif ($joinStart == 2 && stripos($clauseType, 'JOIN')) {
-                    $error = 1;
-                }
-            }
-
-            if ($clauseStartIdx != -1 && $clauseStartIdx < $minIdx) {
-                if ($joinStart == 0 || ($joinStart == 2 && $error = 1)) {
-                    $token = $list->tokens[$clauseStartIdx];
-                    $parser->error(
-                        __('Unexpected ordering of clauses.'),
-                        $token
-                    );
-                    return false;
-                } else {
-                    $minIdx = $clauseStartIdx;
-                }
-            } elseif ($clauseStartIdx != -1) {
-                $minIdx = $clauseStartIdx;
-            }
-        }
-
-        return true;
-    }
-}
diff --git a/#pma/libraries/sql-parser/src/Statements/AlterStatement.php b/#pma/libraries/sql-parser/src/Statements/AlterStatement.php
deleted file mode 100644
index abad5dad..00000000
--- a/#pma/libraries/sql-parser/src/Statements/AlterStatement.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php
-
-/**
- * `ALTER` statement.
- *
- * @package    SqlParser
- * @subpackage Statements
- */
-namespace SqlParser\Statements;
-
-use SqlParser\Parser;
-use SqlParser\Statement;
-use SqlParser\Token;
-use SqlParser\TokensList;
-use SqlParser\Components\AlterOperation;
-use SqlParser\Components\Expression;
-use SqlParser\Components\OptionsArray;
-
-/**
- * `ALTER` statement.
- *
- * @category   Statements
- * @package    SqlParser
- * @subpackage Statements
- * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-class AlterStatement extends Statement
-{
-
-    /**
-     * Table affected.
-     *
-     * @var Expression
-     */
-    public $table;
-
-    /**
-     * Column affected by this statement.
-     *
-     * @var AlterOperation[]
-     */
-    public $altered = array();
-
-    /**
-     * Options of this statement.
-     *
-     * @var array
-     */
-    public static $OPTIONS = array(
-        'ONLINE'                        => 1,
-        'OFFLINE'                       => 1,
-        'IGNORE'                        => 2,
-
-        'DATABASE'                      => 3,
-        'EVENT'                         => 3,
-        'FUNCTION'                      => 3,
-        'PROCEDURE'                     => 3,
-        'SERVER'                        => 3,
-        'TABLE'                         => 3,
-        'TABLESPACE'                    => 3,
-        'VIEW'                          => 3,
-    );
-
-    /**
-     * @param Parser     $parser The instance that requests parsing.
-     * @param TokensList $list   The list of tokens to be parsed.
-     *
-     * @return void
-     */
-    public function parse(Parser $parser, TokensList $list)
-    {
-        ++$list->idx; // Skipping `ALTER`.
-        $this->options = OptionsArray::parse(
-            $parser,
-            $list,
-            static::$OPTIONS
-        );
-        ++$list->idx;
-
-        // Parsing affected table.
-        $this->table = Expression::parse(
-            $parser,
-            $list,
-            array(
-                'parseField' => 'table',
-                'breakOnAlias' => true,
-            )
-        );
-        ++$list->idx; // Skipping field.
-
-        /**
-         * The state of the parser.
-         *
-         * Below are the states of the parser.
-         *
-         *      0 -----------------[ alter operation ]-----------------> 1
-         *
-         *      1 -------------------------[ , ]-----------------------> 0
-         *
-         * @var int $state
-         */
-        $state = 0;
-
-        for (; $list->idx < $list->count; ++$list->idx) {
-            /**
-             * Token parsed at this moment.
-             *
-             * @var Token $token
-             */
-            $token = $list->tokens[$list->idx];
-
-            // End of statement.
-            if ($token->type === Token::TYPE_DELIMITER) {
-                break;
-            }
-
-            // Skipping whitespaces and comments.
-            if (($token->type === Token::TYPE_WHITESPACE) || ($token->type === Token::TYPE_COMMENT)) {
-                continue;
-            }
-
-            if ($state === 0) {
-                $options = array();
-                if ($this->options->has('DATABASE')) {
-                    $options = AlterOperation::$DB_OPTIONS;
-                } elseif ($this->options->has('TABLE')) {
-                    $options = AlterOperation::$TABLE_OPTIONS;
-                } elseif ($this->options->has('VIEW')) {
-                    $options = AlterOperation::$VIEW_OPTIONS;
-                }
-
-                $this->altered[] = AlterOperation::parse($parser, $list, $options);
-                $state = 1;
-            } elseif ($state === 1) {
-                if (($token->type === Token::TYPE_OPERATOR) && ($token->value === ',')) {
-                    $state = 0;
-                }
-            }
-        }
-    }
-
-    /**
-     * @return string
-     */
-    public function build()
-    {
-        $tmp = array();
-        foreach ($this->altered as $altered) {
-            $tmp[] = $altered::build($altered);
-        }
-
-        return 'ALTER ' . OptionsArray::build($this->options)
-            . ' ' . Expression::build($this->table)
-            . ' ' . implode(', ', $tmp);
-    }
-}
diff --git a/#pma/libraries/sql-parser/src/Statements/AnalyzeStatement.php b/#pma/libraries/sql-parser/src/Statements/AnalyzeStatement.php
deleted file mode 100644
index f7e8f816..00000000
--- a/#pma/libraries/sql-parser/src/Statements/AnalyzeStatement.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-/**
- * `ANALYZE` statement.
- *
- * @package    SqlParser
- * @subpackage Statements
- */
-namespace SqlParser\Statements;
-
-use SqlParser\Statement;
-use SqlParser\Components\Expression;
-
-/**
- * `ANALYZE` statement.
- *
- * ANALYZE [NO_WRITE_TO_BINLOG | LOCAL] TABLE
- *  tbl_name [, tbl_name] ...
- *
- * @category   Statements
- * @package    SqlParser
- * @subpackage Statements
- * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-class AnalyzeStatement extends Statement
-{
-
-    /**
-     * Options of this statement.
-     *
-     * @var array
-     */
-    public static $OPTIONS = array(
-
-        'TABLE'                         => 1,
-
-        'NO_WRITE_TO_BINLOG'            => 2,
-        'LOCAL'                         => 3,
-    );
-
-    /**
-     * Analyzed tables.
-     *
-     * @var Expression[]
-     */
-    public $tables;
-}
diff --git a/#pma/libraries/sql-parser/src/Statements/BackupStatement.php b/#pma/libraries/sql-parser/src/Statements/BackupStatement.php
deleted file mode 100644
index df759398..00000000
--- a/#pma/libraries/sql-parser/src/Statements/BackupStatement.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-/**
- * `BACKUP` statement.
- *
- * @package    SqlParser
- * @subpackage Statements
- */
-namespace SqlParser\Statements;
-
-/**
- * `BACKUP` statement.
- *
- * BACKUP TABLE tbl_name [, tbl_name] ... TO '/path/to/backup/directory'
- *
- * @category   Statements
- * @package    SqlParser
- * @subpackage Statements
- * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-class BackupStatement extends MaintenanceStatement
-{
-
-    /**
-     * Options of this statement.
-     *
-     * @var array
-     */
-    public static $OPTIONS = array(
-
-        'TABLE'                         => 1,
-
-        'NO_WRITE_TO_BINLOG'            => 2,
-        'LOCAL'                         => 3,
-
-        'TO'                            => array(4, 'var'),
-    );
-}
diff --git a/#pma/libraries/sql-parser/src/Statements/CallStatement.php b/#pma/libraries/sql-parser/src/Statements/CallStatement.php
deleted file mode 100644
index 42a21d75..00000000
--- a/#pma/libraries/sql-parser/src/Statements/CallStatement.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/**
- * `CALL` statement.
- *
- * @package    SqlParser
- * @subpackage Statements
- */
-namespace SqlParser\Statements;
-
-use SqlParser\Statement;
-use SqlParser\Components\FunctionCall;
-
-/**
- * `CALL` statement.
- *
- * CALL sp_name([parameter[,...]])
- *
- * or
- *
- * CALL sp_name[()]
- *
- * @category   Statements
- * @package    SqlParser
- * @subpackage Statements
- * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-class CallStatement extends Statement
-{
-
-    /**
-     * The name of the function and its parameters.
-     *
-     * @var FunctionCall
-     */
-    public $call;
-}
diff --git a/#pma/libraries/sql-parser/src/Statements/CheckStatement.php b/#pma/libraries/sql-parser/src/Statements/CheckStatement.php
deleted file mode 100644
index ef99ed31..00000000
--- a/#pma/libraries/sql-parser/src/Statements/CheckStatement.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/**
- * `CHECK` statement.
- *
- * @package    SqlParser
- * @subpackage Statements
- */
-namespace SqlParser\Statements;
-
-/**
- * `CHECK` statement.
- *
- * CHECK TABLE tbl_name [, tbl_name] ... [option] ...
- *
- * @category   Statements
- * @package    SqlParser
- * @subpackage Statements
- * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-class CheckStatement extends MaintenanceStatement
-{
-
-    /**
-     * Options of this statement.
-     *
-     * @var array
-     */
-    public static $OPTIONS = array(
-
-        'TABLE'                         => 1,
-
-        'FOR UPGRADE'                   => 2,
-        'QUICK'                         => 3,
-        'FAST'                          => 4,
-        'MEDIUM'                        => 5,
-        'EXTENDED'                      => 6,
-        'CHANGED'                       => 7,
-    );
-}
diff --git a/#pma/libraries/sql-parser/src/Statements/ChecksumStatement.php b/#pma/libraries/sql-parser/src/Statements/ChecksumStatement.php
deleted file mode 100644
index 8b623353..00000000
--- a/#pma/libraries/sql-parser/src/Statements/ChecksumStatement.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/**
- * `CHECKSUM` statement.
- *
- * @package    SqlParser
- * @subpackage Statements
- */
-namespace SqlParser\Statements;
-
-/**
- * `CHECKSUM` statement.
- *
- * CHECKSUM TABLE tbl_name [, tbl_name] ... [ QUICK | EXTENDED ]
- *
- * @category   Statements
- * @package    SqlParser
- * @subpackage Statements
- * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-class ChecksumStatement extends MaintenanceStatement
-{
-
-    /**
-     * Options of this statement.
-     *
-     * @var array
-     */
-    public static $OPTIONS = array(
-
-        'TABLE'                         => 1,
-
-        'QUICK'                         => 2,
-        'EXTENDED'                      => 3,
-    );
-}
diff --git a/#pma/libraries/sql-parser/src/Statements/CreateStatement.php b/#pma/libraries/sql-parser/src/Statements/CreateStatement.php
deleted file mode 100644
index ed139523..00000000
--- a/#pma/libraries/sql-parser/src/Statements/CreateStatement.php
+++ /dev/null
@@ -1,638 +0,0 @@
-<?php
-
-/**
- * `CREATE` statement.
- *
- * @package    SqlParser
- * @subpackage Statements
- */
-namespace SqlParser\Statements;
-
-use SqlParser\Parser;
-use SqlParser\Statement;
-use SqlParser\Token;
-use SqlParser\TokensList;
-use SqlParser\Components\ArrayObj;
-use SqlParser\Components\DataType;
-use SqlParser\Components\CreateDefinition;
-use SqlParser\Components\PartitionDefinition;
-use SqlParser\Components\Expression;
-use SqlParser\Components\OptionsArray;
-use SqlParser\Components\ParameterDefinition;
-use SqlParser\Statements\SelectStatement;
-
-/**
- * `CREATE` statement.
- *
- * @category   Statements
- * @package    SqlParser
- * @subpackage Statements
- * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-class CreateStatement extends Statement
-{
-
-    /**
-     * Options for `CREATE` statements.
-     *
-     * @var array
-     */
-    public static $OPTIONS = array(
-
-        // CREATE TABLE
-        'TEMPORARY'                     => 1,
-
-        // CREATE VIEW
-        'OR REPLACE'                    => array(2, 'var='),
-        'ALGORITHM'                     => array(3, 'var='),
-        // `DEFINER` is also used for `CREATE FUNCTION / PROCEDURE`
-        'DEFINER'                       => array(4, 'expr='),
-        'SQL SECURITY'                  => array(5, 'var'),
-
-        'DATABASE'                      => 6,
-        'EVENT'                         => 6,
-        'FUNCTION'                      => 6,
-        'INDEX'                         => 6,
-        'UNIQUE INDEX'                  => 6,
-        'FULLTEXT INDEX'                => 6,
-        'SPATIAL INDEX'                 => 6,
-        'PROCEDURE'                     => 6,
-        'SERVER'                        => 6,
-        'TABLE'                         => 6,
-        'TABLESPACE'                    => 6,
-        'TRIGGER'                       => 6,
-        'USER'                          => 6,
-        'VIEW'                          => 6,
-
-        // CREATE TABLE
-        'IF NOT EXISTS'                 => 7,
-    );
-
-    /**
-     * All database options.
-     *
-     * @var array
-     */
-    public static $DB_OPTIONS = array(
-        'CHARACTER SET'                 => array(1, 'var='),
-        'CHARSET'                       => array(1, 'var='),
-        'DEFAULT CHARACTER SET'         => array(1, 'var='),
-        'DEFAULT CHARSET'               => array(1, 'var='),
-        'DEFAULT COLLATE'               => array(2, 'var='),
-        'COLLATE'                       => array(2, 'var='),
-    );
-
-    /**
-     * All table options.
-     *
-     * @var array
-     */
-    public static $TABLE_OPTIONS = array(
-        'ENGINE'                        => array(1, 'var='),
-        'AUTO_INCREMENT'                => array(2, 'var='),
-        'AVG_ROW_LENGTH'                => array(3, 'var'),
-        'CHARACTER SET'                 => array(4, 'var='),
-        'CHARSET'                       => array(4, 'var='),
-        'DEFAULT CHARACTER SET'         => array(4, 'var='),
-        'DEFAULT CHARSET'               => array(4, 'var='),
-        'CHECKSUM'                      => array(5, 'var'),
-        'DEFAULT COLLATE'               => array(6, 'var='),
-        'COLLATE'                       => array(6, 'var='),
-        'COMMENT'                       => array(7, 'var='),
-        'CONNECTION'                    => array(8, 'var'),
-        'DATA DIRECTORY'                => array(9, 'var'),
-        'DELAY_KEY_WRITE'               => array(10, 'var'),
-        'INDEX DIRECTORY'               => array(11, 'var'),
-        'INSERT_METHOD'                 => array(12, 'var'),
-        'KEY_BLOCK_SIZE'                => array(13, 'var'),
-        'MAX_ROWS'                      => array(14, 'var'),
-        'MIN_ROWS'                      => array(15, 'var'),
-        'PACK_KEYS'                     => array(16, 'var'),
-        'PASSWORD'                      => array(17, 'var'),
-        'ROW_FORMAT'                    => array(18, 'var'),
-        'TABLESPACE'                    => array(19, 'var'),
-        'STORAGE'                       => array(20, 'var'),
-        'UNION'                         => array(21, 'var'),
-    );
-
-    /**
-     * All function options.
-     *
-     * @var array
-     */
-    public static $FUNC_OPTIONS = array(
-        'COMMENT'                       => array(1, 'var='),
-        'LANGUAGE SQL'                  => 2,
-        'DETERMINISTIC'                 => 3,
-        'NOT DETERMINISTIC'             => 3,
-        'CONTAINS SQL'                  => 4,
-        'NO SQL'                        => 4,
-        'READS SQL DATA'                => 4,
-        'MODIFIES SQL DATA'             => 4,
-        'SQL SECURITY DEFINER'          => array(5, 'var'),
-    );
-
-    /**
-     * All trigger options.
-     *
-     * @var array
-     */
-    public static $TRIGGER_OPTIONS = array(
-        'BEFORE'                        => 1,
-        'AFTER'                         => 1,
-        'INSERT'                        => 2,
-        'UPDATE'                        => 2,
-        'DELETE'                        => 2,
-    );
-
-    /**
-     * The name of the entity that is created.
-     *
-     * Used by all `CREATE` statements.
-     *
-     * @var Expression
-     */
-    public $name;
-
-    /**
-     * The options of the entity (table, procedure, function, etc.).
-     *
-     * Used by `CREATE TABLE`, `CREATE FUNCTION` and `CREATE PROCEDURE`.
-     *
-     * @var OptionsArray
-     *
-     * @see static::$TABLE_OPTIONS
-     * @see static::$FUNC_OPTIONS
-     * @see static::$TRIGGER_OPTIONS
-     */
-    public $entityOptions;
-
-    /**
-     * If `CREATE TABLE`, a list of columns and keys.
-     * If `CREATE VIEW`, a list of columns.
-     *
-     * Used by `CREATE TABLE` and `CREATE VIEW`.
-     *
-     * @var CreateDefinition[]|ArrayObj
-     */
-    public $fields;
-
-    /**
-     * If `CREATE TABLE ... SELECT`
-     *
-     * Used by `CREATE TABLE`
-     *
-     * @var SelectStatement
-     */
-    public $select;
-
-    /**
-     * If `CREATE TABLE ... LIKE`
-     *
-     * Used by `CREATE TABLE`
-     *
-     * @var Expression
-     */
-    public $like;
-
-    /**
-     * Expression used for partitioning.
-     *
-     * @var string
-     */
-    public $partitionBy;
-
-    /**
-     * The number of partitions.
-     *
-     * @var int
-     */
-    public $partitionsNum;
-
-    /**
-     * Expression used for subpartitioning.
-     *
-     * @var string
-     */
-    public $subpartitionBy;
-
-    /**
-     * The number of subpartitions.
-     *
-     * @var int
-     */
-    public $subpartitionsNum;
-
-    /**
-     * The partition of the new table.
-     *
-     * @var PartitionDefinition[]
-     */
-    public $partitions;
-
-    /**
-     * If `CREATE TRIGGER` the name of the table.
-     *
-     * Used by `CREATE TRIGGER`.
-     *
-     * @var Expression
-     */
-    public $table;
-
-    /**
-     * The return data type of this routine.
-     *
-     * Used by `CREATE FUNCTION`.
-     *
-     * @var DataType
-     */
-    public $return;
-
-    /**
-     * The parameters of this routine.
-     *
-     * Used by `CREATE FUNCTION` and `CREATE PROCEDURE`.
-     *
-     * @var ParameterDefinition[]
-     */
-    public $parameters;
-
-    /**
-     * The body of this function or procedure. For views, it is the select
-     * statement that gets the
-     *
-     * Used by `CREATE FUNCTION`, `CREATE PROCEDURE` and `CREATE VIEW`.
-     *
-     * @var Token[]|string
-     */
-    public $body = array();
-
-    /**
-     * @return string
-     */
-    public function build()
-    {
-        $fields = '';
-        if (!empty($this->fields)) {
-            if (is_array($this->fields)) {
-                $fields = CreateDefinition::build($this->fields) . ' ';
-            } elseif ($this->fields instanceof ArrayObj) {
-                $fields = ArrayObj::build($this->fields);
-            }
-        }
-        if ($this->options->has('DATABASE')) {
-            return 'CREATE '
-                . OptionsArray::build($this->options) . ' '
-                . Expression::build($this->name) . ' '
-                . OptionsArray::build($this->entityOptions);
-        } elseif ($this->options->has('TABLE') && !is_null($this->select)) {
-            return 'CREATE '
-                . OptionsArray::build($this->options) . ' '
-                . Expression::build($this->name) . ' '
-                . $this->select->build();
-        } elseif ($this->options->has('TABLE') && !is_null($this->like)) {
-            return 'CREATE '
-                . OptionsArray::build($this->options) . ' '
-                . Expression::build($this->name) . ' LIKE '
-                . Expression::build($this->like);
-        } elseif ($this->options->has('TABLE')) {
-            $partition = '';
-
-            if (!empty($this->partitionBy)) {
-                $partition .= "\nPARTITION BY " . $this->partitionBy;
-            }
-            if (!empty($this->partitionsNum)) {
-                $partition .= "\nPARTITIONS " . $this->partitionsNum;
-            }
-            if (!empty($this->subpartitionBy)) {
-                $partition .= "\nSUBPARTITION BY " . $this->subpartitionBy;
-            }
-            if (!empty($this->subpartitionsNum)) {
-                $partition .= "\nSUBPARTITIONS " . $this->subpartitionsNum;
-            }
-            if (!empty($this->partitions)) {
-                $partition .= "\n" . PartitionDefinition::build($this->partitions);
-            }
-
-            return 'CREATE '
-                . OptionsArray::build($this->options) . ' '
-                . Expression::build($this->name) . ' '
-                . $fields
-                . OptionsArray::build($this->entityOptions)
-                . $partition;
-        } elseif ($this->options->has('VIEW')) {
-            return 'CREATE '
-                . OptionsArray::build($this->options) . ' '
-                . Expression::build($this->name) . ' '
-                . $fields . ' AS ' . TokensList::build($this->body) . ' '
-                . OptionsArray::build($this->entityOptions);
-        } elseif ($this->options->has('TRIGGER')) {
-            return 'CREATE '
-                . OptionsArray::build($this->options) . ' '
-                . Expression::build($this->name) . ' '
-                . OptionsArray::build($this->entityOptions) . ' '
-                . 'ON ' . Expression::build($this->table) . ' '
-                . 'FOR EACH ROW ' . TokensList::build($this->body);
-        } elseif (($this->options->has('PROCEDURE'))
-            || ($this->options->has('FUNCTION'))
-        ) {
-            $tmp = '';
-            if ($this->options->has('FUNCTION')) {
-                $tmp = 'RETURNS ' . DataType::build($this->return);
-            }
-            return 'CREATE '
-                . OptionsArray::build($this->options) . ' '
-                . Expression::build($this->name) . ' '
-                . ParameterDefinition::build($this->parameters) . ' '
-                . $tmp . ' ' . TokensList::build($this->body);
-        }
-        return 'CREATE '
-            . OptionsArray::build($this->options) . ' '
-            . Expression::build($this->name) . ' '
-            . TokensList::build($this->body);
-    }
-
-    /**
-     * @param Parser     $parser The instance that requests parsing.
-     * @param TokensList $list   The list of tokens to be parsed.
-     *
-     * @return void
-     */
-    public function parse(Parser $parser, TokensList $list)
-    {
-        ++$list->idx; // Skipping `CREATE`.
-
-        // Parsing options.
-        $this->options = OptionsArray::parse($parser, $list, static::$OPTIONS);
-        ++$list->idx; // Skipping last option.
-
-        // Parsing the field name.
-        $this->name = Expression::parse(
-            $parser,
-            $list,
-            array(
-                'parseField' => 'table',
-                'breakOnAlias' => true,
-            )
-        );
-
-        if ((!isset($this->name)) || ($this->name === '')) {
-            $parser->error(
-                __('The name of the entity was expected.'),
-                $list->tokens[$list->idx]
-            );
-        } else {
-            ++$list->idx; // Skipping field.
-        }
-
-        /**
-         * Token parsed at this moment.
-         *
-         * @var Token $token
-         */
-        $token = $list->tokens[$list->idx];
-        $nextidx = $list->idx + 1;
-        while ($nextidx < $list->count && $list->tokens[$nextidx]->type == Token::TYPE_WHITESPACE) {
-            $nextidx++;
-        }
-
-        if ($this->options->has('DATABASE')) {
-            $this->entityOptions = OptionsArray::parse(
-                $parser,
-                $list,
-                static::$DB_OPTIONS
-            );
-        } elseif ($this->options->has('TABLE')
-            && ($token->type == Token::TYPE_KEYWORD)
-            && ($token->value == 'SELECT')
-        ) {
-            /* CREATE TABLE ... SELECT */
-            $this->select = new SelectStatement($parser, $list);
-        } elseif ($this->options->has('TABLE')
-            && ($token->type == Token::TYPE_KEYWORD) && ($token->value == 'AS')
-            && ($list->tokens[$nextidx]->type == Token::TYPE_KEYWORD)
-            && ($list->tokens[$nextidx]->value == 'SELECT')
-        ) {
-            /* CREATE TABLE ... AS SELECT */
-            $list->idx = $nextidx;
-            $this->select = new SelectStatement($parser, $list);
-        } elseif ($this->options->has('TABLE')
-            && $token->type == Token::TYPE_KEYWORD
-            && $token->value == 'LIKE'
-        ) {
-            /* CREATE TABLE `new_tbl` LIKE 'orig_tbl' */
-            $list->idx = $nextidx;
-            $this->like = Expression::parse(
-                $parser,
-                $list,
-                array(
-                    'parseField' => 'table',
-                    'breakOnAlias' => true,
-                )
-            );
-            // The 'LIKE' keyword was found, but no table_name was found next to it
-            if ($this->like == null) {
-                $parser->error(
-                    __('A table name was expected.'),
-                    $list->tokens[$list->idx]
-                );
-            }
-        } elseif ($this->options->has('TABLE')) {
-            $this->fields = CreateDefinition::parse($parser, $list);
-            if (empty($this->fields)) {
-                $parser->error(
-                    __('At least one column definition was expected.'),
-                    $list->tokens[$list->idx]
-                );
-            }
-            ++$list->idx;
-
-            $this->entityOptions = OptionsArray::parse(
-                $parser,
-                $list,
-                static::$TABLE_OPTIONS
-            );
-
-            /**
-             * The field that is being filled (`partitionBy` or
-             * `subpartitionBy`).
-             *
-             * @var string $field
-             */
-            $field = null;
-
-            /**
-             * The number of brackets. `false` means no bracket was found
-             * previously. At least one bracket is required to validate the
-             * expression.
-             *
-             * @var int|bool $brackets
-             */
-            $brackets = false;
-
-            /*
-             * Handles partitions.
-             */
-            for (; $list->idx < $list->count; ++$list->idx) {
-                /**
-                 * Token parsed at this moment.
-                 *
-                 * @var Token $token
-                 */
-                $token = $list->tokens[$list->idx];
-
-                // End of statement.
-                if ($token->type === Token::TYPE_DELIMITER) {
-                    break;
-                }
-
-                // Skipping comments.
-                if ($token->type === Token::TYPE_COMMENT) {
-                    continue;
-                }
-
-                if (($token->type === Token::TYPE_KEYWORD) && ($token->value === 'PARTITION BY')) {
-                    $field = 'partitionBy';
-                    $brackets = false;
-                } elseif (($token->type === Token::TYPE_KEYWORD) && ($token->value === 'SUBPARTITION BY')) {
-                    $field = 'subpartitionBy';
-                    $brackets = false;
-                } elseif (($token->type === Token::TYPE_KEYWORD) && ($token->value === 'PARTITIONS')) {
-                    $token = $list->getNextOfType(Token::TYPE_NUMBER);
-                    --$list->idx; // `getNextOfType` also advances one position.
-                    $this->partitionsNum = $token->value;
-                } elseif (($token->type === Token::TYPE_KEYWORD) && ($token->value === 'SUBPARTITIONS')) {
-                    $token = $list->getNextOfType(Token::TYPE_NUMBER);
-                    --$list->idx; // `getNextOfType` also advances one position.
-                    $this->subpartitionsNum = $token->value;
-                } elseif (!empty($field)) {
-                    /*
-                     * Handling the content of `PARTITION BY` and `SUBPARTITION BY`.
-                     */
-
-                    // Counting brackets.
-                    if (($token->type === Token::TYPE_OPERATOR) && ($token->value === '(')) {
-                        // This is used instead of `++$brackets` because,
-                        // initially, `$brackets` is `false` cannot be
-                        // incremented.
-                        $brackets = $brackets + 1;
-                    } elseif (($token->type === Token::TYPE_OPERATOR) && ($token->value === ')')) {
-                        --$brackets;
-                    }
-
-                    // Building the expression used for partitioning.
-                    $this->$field .= ($token->type === Token::TYPE_WHITESPACE) ? ' ' : $token->token;
-
-                    // Last bracket was read, the expression ended.
-                    // Comparing with `0` and not `false`, because `false` means
-                    // that no bracket was found and at least one must is
-                    // required.
-                    if ($brackets === 0) {
-                        $this->$field = trim($this->$field);
-                        $field = null;
-                    }
-                } elseif (($token->type === Token::TYPE_OPERATOR) && ($token->value === '(')) {
-                    if (!empty($this->partitionBy)) {
-                        $this->partitions = ArrayObj::parse(
-                            $parser,
-                            $list,
-                            array(
-                                'type' => 'SqlParser\\Components\\PartitionDefinition'
-                            )
-                        );
-                    }
-                    break;
-                }
-            }
-        } elseif (($this->options->has('PROCEDURE'))
-            || ($this->options->has('FUNCTION'))
-        ) {
-            $this->parameters = ParameterDefinition::parse($parser, $list);
-            if ($this->options->has('FUNCTION')) {
-                $token = $list->getNextOfType(Token::TYPE_KEYWORD);
-                if ($token->value !== 'RETURNS') {
-                    $parser->error(
-                        __('A "RETURNS" keyword was expected.'),
-                        $token
-                    );
-                } else {
-                    ++$list->idx;
-                    $this->return = DataType::parse(
-                        $parser,
-                        $list
-                    );
-                }
-            }
-            ++$list->idx;
-
-            $this->entityOptions = OptionsArray::parse(
-                $parser,
-                $list,
-                static::$FUNC_OPTIONS
-            );
-            ++$list->idx;
-
-            for (; $list->idx < $list->count; ++$list->idx) {
-                $token = $list->tokens[$list->idx];
-                $this->body[] = $token;
-            }
-        } elseif ($this->options->has('VIEW')) {
-            $token = $list->getNext(); // Skipping whitespaces and comments.
-
-            // Parsing columns list.
-            if (($token->type === Token::TYPE_OPERATOR) && ($token->value === '(')) {
-                --$list->idx; // getNext() also goes forward one field.
-                $this->fields = ArrayObj::parse($parser, $list);
-                ++$list->idx; // Skipping last token from the array.
-                $list->getNext();
-            }
-
-            // Parsing the `AS` keyword.
-            for (; $list->idx < $list->count; ++$list->idx) {
-                $token = $list->tokens[$list->idx];
-                if ($token->type === Token::TYPE_DELIMITER) {
-                    break;
-                }
-                $this->body[] = $token;
-            }
-        } elseif ($this->options->has('TRIGGER')) {
-            // Parsing the time and the event.
-            $this->entityOptions = OptionsArray::parse(
-                $parser,
-                $list,
-                static::$TRIGGER_OPTIONS
-            );
-            ++$list->idx;
-
-            $list->getNextOfTypeAndValue(Token::TYPE_KEYWORD, 'ON');
-            ++$list->idx; // Skipping `ON`.
-
-            // Parsing the name of the table.
-            $this->table = Expression::parse(
-                $parser,
-                $list,
-                array(
-                    'parseField' => 'table',
-                    'breakOnAlias' => true,
-                )
-            );
-            ++$list->idx;
-
-            $list->getNextOfTypeAndValue(Token::TYPE_KEYWORD, 'FOR EACH ROW');
-            ++$list->idx; // Skipping `FOR EACH ROW`.
-
-            for (; $list->idx < $list->count; ++$list->idx) {
-                $token = $list->tokens[$list->idx];
-                $this->body[] = $token;
-            }
-        } else {
-            for (; $list->idx < $list->count; ++$list->idx) {
-                $token = $list->tokens[$list->idx];
-                if ($token->type === Token::TYPE_DELIMITER) {
-                    break;
-                }
-                $this->body[] = $token;
-            }
-        }
-    }
-}
diff --git a/#pma/libraries/sql-parser/src/Statements/DeleteStatement.php b/#pma/libraries/sql-parser/src/Statements/DeleteStatement.php
deleted file mode 100644
index 0c661389..00000000
--- a/#pma/libraries/sql-parser/src/Statements/DeleteStatement.php
+++ /dev/null
@@ -1,349 +0,0 @@
-<?php
-
-/**
- * `DELETE` statement.
- *
- * @package    SqlParser
- * @subpackage Statements
- */
-namespace SqlParser\Statements;
-
-use SqlParser\Statement;
-use SqlParser\Parser;
-use SqlParser\Token;
-use SqlParser\TokensList;
-use SqlParser\Components\ArrayObj;
-use SqlParser\Components\Expression;
-use SqlParser\Components\ExpressionArray;
-use SqlParser\Components\Limit;
-use SqlParser\Components\OrderKeyword;
-use SqlParser\Components\Condition;
-use SqlParser\Components\OptionsArray;
-
-/**
- * `DELETE` statement.
- *
- * DELETE [LOW_PRIORITY] [QUICK] [IGNORE] FROM tbl_name
- *     [PARTITION (partition_name,...)]
- *     [WHERE where_condition]
- *     [ORDER BY ...]
- *     [LIMIT row_count]
- *
- * Multi-table syntax
- *
- * DELETE [LOW_PRIORITY] [QUICK] [IGNORE]
- *   tbl_name[.*] [, tbl_name[.*]] ...
- *   FROM table_references
- *   [WHERE where_condition]
- *
- * OR
- *
- * DELETE [LOW_PRIORITY] [QUICK] [IGNORE]
- *   FROM tbl_name[.*] [, tbl_name[.*]] ...
- *   USING table_references
- *   [WHERE where_condition]
- *
- *
- * @category   Statements
- * @package    SqlParser
- * @subpackage Statements
- * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-class DeleteStatement extends Statement
-{
-
-    /**
-     * Options for `DELETE` statements.
-     *
-     * @var array
-     */
-    public static $OPTIONS = array(
-        'LOW_PRIORITY'                  => 1,
-        'QUICK'                         => 2,
-        'IGNORE'                        => 3,
-    );
-
-    /**
-     * The clauses of this statement, in order.
-     *
-     * @see Statement::$CLAUSES
-     *
-     * @var array
-     */
-    public static $CLAUSES = array(
-        'DELETE'                        => array('DELETE',      2),
-        // Used for options.
-        '_OPTIONS'                      => array('_OPTIONS',    1),
-        'FROM'                          => array('FROM',        3),
-        'PARTITION'                     => array('PARTITION',   3),
-        'USING'                         => array('USING',       3),
-        'WHERE'                         => array('WHERE',       3),
-        'ORDER BY'                      => array('ORDER BY',    3),
-        'LIMIT'                         => array('LIMIT',       3),
-    );
-
-    /**
-     * Table(s) used as sources for this statement.
-     *
-     * @var Expression[]
-     */
-    public $from;
-
-    /**
-     * Tables used as sources for this statement
-     *
-     * @var Expression[]
-     */
-    public $using;
-
-    /**
-     * Columns used in this statement
-     *
-     * @var Expression[]
-     */
-    public $columns;
-
-    /**
-     * Partitions used as source for this statement.
-     *
-     * @var ArrayObj
-     */
-    public $partition;
-
-    /**
-     * Conditions used for filtering each row of the result set.
-     *
-     * @var Condition[]
-     */
-    public $where;
-
-    /**
-     * Specifies the order of the rows in the result set.
-     *
-     * @var OrderKeyword[]
-     */
-    public $order;
-
-    /**
-     * Conditions used for limiting the size of the result set.
-     *
-     * @var Limit
-     */
-    public $limit;
-
-
-    /**
-     * @return string
-     */
-    public function build()
-    {
-        $ret = 'DELETE ' . OptionsArray::build($this->options);
-
-        if ($this->columns != NULL && count($this->columns) > 0) {
-            $ret .= ' ' . ExpressionArray::build($this->columns);
-        }
-        if ($this->from != NULL && count($this->from) > 0) {
-            $ret .= ' FROM ' . ExpressionArray::build($this->from);
-        }
-        if ($this->using != NULL && count($this->using) > 0) {
-            $ret .= ' USING ' . ExpressionArray::build($this->using);
-        }
-        if ($this->where != NULL && count($this->where) > 0) {
-            $ret .= ' WHERE ' . Condition::build($this->where);
-        }
-        if ($this->order != NULL && count($this->order) > 0) {
-            $ret .= ' ORDER BY ' . ExpressionArray::build($this->order);
-        }
-        if ($this->limit != NULL && count($this->limit) > 0) {
-            $ret .= ' LIMIT ' . Limit::build($this->limit);
-        }
-
-        return $ret;
-
-    }
-
-
-    /**
-     * @param Parser     $parser The instance that requests parsing.
-     * @param TokensList $list   The list of tokens to be parsed.
-     *
-     * @return void
-     */
-    public function parse(Parser $parser, TokensList $list)
-    {
-        ++$list->idx; // Skipping `DELETE`.
-
-        // parse any options if provided
-        $this->options = OptionsArray::parse(
-            $parser,
-            $list,
-            static::$OPTIONS
-        );
-        ++$list->idx;
-
-        /**
-         * The state of the parser.
-         *
-         * Below are the states of the parser.
-         *
-         *      0 ---------------------------------[ FROM ]----------------------------------> 2
-         *      0 ------------------------------[ table[.*] ]--------------------------------> 1
-         *      1 ---------------------------------[ FROM ]----------------------------------> 2
-         *      2 --------------------------------[ USING ]----------------------------------> 3
-         *      2 --------------------------------[ WHERE ]----------------------------------> 4
-         *      2 --------------------------------[ ORDER ]----------------------------------> 5
-         *      2 --------------------------------[ LIMIT ]----------------------------------> 6
-         *
-         * @var int $state
-         */
-        $state = 0;
-
-        /**
-         * If the query is multi-table or not
-         *
-         * @var bool $multiTable
-         */
-        $multiTable = false;
-
-        for (; $list->idx < $list->count; ++$list->idx) {
-            /**
-             * Token parsed at this moment.
-             *
-             * @var Token $token
-             */
-            $token = $list->tokens[$list->idx];
-
-            // End of statement.
-            if ($token->type === Token::TYPE_DELIMITER) {
-                break;
-            }
-
-            if ($state === 0) {
-                if ($token->type === Token::TYPE_KEYWORD
-                    && $token->value !== 'FROM'
-                ) {
-                    $parser->error(__('Unexpected keyword.'), $token);
-                    break;
-                } elseif ($token->type === Token::TYPE_KEYWORD
-                    && $token->value === 'FROM'
-                ) {
-                    ++$list->idx; // Skip 'FROM'
-                    $this->from = ExpressionArray::parse($parser, $list);
-                    $state = 2;
-                } else {
-                    $this->columns = ExpressionArray::parse($parser, $list);
-                    $state = 1;
-                }
-            } elseif ($state === 1) {
-                if ($token->type === Token::TYPE_KEYWORD
-                    && $token->value !== 'FROM'
-                ) {
-                    $parser->error(__('Unexpected keyword.'), $token);
-                    break;
-                } elseif ($token->type === Token::TYPE_KEYWORD
-                    && $token->value === 'FROM'
-                ) {
-                    ++$list->idx; // Skip 'FROM'
-                    $this->from = ExpressionArray::parse($parser, $list);
-                    $state = 2;
-                } else {
-                    $parser->error(__('Unexpected token.'), $token);
-                    break;
-                }
-            } elseif ($state === 2) {
-                if ($token->type === Token::TYPE_KEYWORD
-                    && $token->value === 'USING'
-                ) {
-                    ++$list->idx; // Skip 'USING'
-                    $this->using = ExpressionArray::parse($parser, $list);
-                    $state = 3;
-
-                    $multiTable = true;
-                } elseif ($token->type === Token::TYPE_KEYWORD
-                    && $token->value === 'WHERE'
-                ) {
-                    ++$list->idx; // Skip 'WHERE'
-                    $this->where = Condition::parse($parser, $list);
-                    $state = 4;
-                } elseif ($token->type === Token::TYPE_KEYWORD
-                    && $token->value === 'ORDER BY'
-                ) {
-                    ++$list->idx; // Skip 'ORDER BY'
-                    $this->order = OrderKeyword::parse($parser, $list);
-                    $state = 5;
-                } elseif ($token->type === Token::TYPE_KEYWORD
-                    && $token->value === 'LIMIT'
-                ) {
-                    ++$list->idx; // Skip 'LIMIT'
-                    $this->limit = Limit::parse($parser, $list);
-                    $state = 6;
-                } elseif ($token->type === Token::TYPE_KEYWORD) {
-                    $parser->error(__('Unexpected keyword.'), $token);
-                    break;
-                }
-            } elseif ($state === 3) {
-                if ($token->type === Token::TYPE_KEYWORD
-                    && $token->value === 'WHERE'
-                ) {
-                    ++$list->idx; // Skip 'WHERE'
-                    $this->where = Condition::parse($parser, $list);
-                    $state = 4;
-                } elseif ($token->type === Token::TYPE_KEYWORD) {
-                    $parser->error(__('Unexpected keyword.'), $token);
-                    break;
-                } else {
-                    $parser->error(__('Unexpected token.'), $token);
-                    break;
-                }
-            } elseif ($state === 4) {
-                if ($multiTable === true
-                    && $token->type === Token::TYPE_KEYWORD
-                ) {
-                    $parser->error(
-                        __('This type of clause is not valid in Multi-table queries.'),
-                        $token
-                    );
-                    break;
-                }
-
-                if ($token->type === Token::TYPE_KEYWORD
-                    && $token->value === 'ORDER BY'
-                ) {
-                    ++$list->idx; // Skip 'ORDER  BY'
-                    $this->order = OrderKeyword::parse($parser, $list);
-                    $state = 5;
-                }  elseif ($token->type === Token::TYPE_KEYWORD
-                    && $token->value === 'LIMIT'
-                ) {
-                    ++$list->idx; // Skip 'LIMIT'
-                    $this->limit = Limit::parse($parser, $list);
-                    $state = 6;
-                } elseif ($token->type === Token::TYPE_KEYWORD) {
-                    $parser->error(__('Unexpected keyword.'), $token);
-                    break;
-                }
-            } elseif ($state === 5) {
-                if ($token->type === Token::TYPE_KEYWORD
-                    && $token->value === 'LIMIT'
-                ) {
-                    ++$list->idx; // Skip 'LIMIT'
-                    $this->limit = Limit::parse($parser, $list);
-                    $state = 6;
-                } elseif ($token->type === Token::TYPE_KEYWORD) {
-                    $parser->error(__('Unexpected keyword.'), $token);
-                    break;
-                }
-            }
-        }
-
-        if ($state >= 2) {
-            foreach ($this->from as $from_expr) {
-                $from_expr->database = $from_expr->table;
-                $from_expr->table = $from_expr->column;
-                $from_expr->column = null;
-            }
-        }
-
-        --$list->idx;
-    }
-}
diff --git a/#pma/libraries/sql-parser/src/Statements/DropStatement.php b/#pma/libraries/sql-parser/src/Statements/DropStatement.php
deleted file mode 100644
index b75ab0e5..00000000
--- a/#pma/libraries/sql-parser/src/Statements/DropStatement.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-/**
- * `DROP` statement.
- *
- * @package    SqlParser
- * @subpackage Statements
- */
-namespace SqlParser\Statements;
-
-use SqlParser\Statement;
-use SqlParser\Components\Expression;
-
-/**
- * `DROP` statement.
- *
- * @category   Statements
- * @package    SqlParser
- * @subpackage Statements
- * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-class DropStatement extends Statement
-{
-
-    /**
-     * Options of this statement.
-     *
-     * @var array
-     */
-    public static $OPTIONS = array(
-
-        'DATABASE'                      => 1,
-        'EVENT'                         => 1,
-        'FUNCTION'                      => 1,
-        'INDEX'                         => 1,
-        'LOGFILE'                       => 1,
-        'PROCEDURE'                     => 1,
-        'SCHEMA'                        => 1,
-        'SERVER'                        => 1,
-        'TABLE'                         => 1,
-        'VIEW'                          => 1,
-        'TABLESPACE'                    => 1,
-        'TRIGGER'                       => 1,
-
-        'TEMPORARY'                     => 2,
-        'IF EXISTS'                     => 3,
-    );
-
-    /**
-     * The clauses of this statement, in order.
-     *
-     * @see Statement::$CLAUSES
-     *
-     * @var array
-     */
-    public static $CLAUSES = array(
-        'DROP'                          => array('DROP',        2),
-        // Used for options.
-        '_OPTIONS'                      => array('_OPTIONS',    1),
-        // Used for select expressions.
-        'DROP_'                         => array('DROP',        1),
-        'ON'                            => array('ON',          3),
-    );
-
-    /**
-     * Dropped elements.
-     *
-     * @var Expression[]
-     */
-    public $fields;
-
-    /**
-     * Table of the dropped index.
-     *
-     * @var Expression
-     */
-    public $table;
-}
diff --git a/#pma/libraries/sql-parser/src/Statements/ExplainStatement.php b/#pma/libraries/sql-parser/src/Statements/ExplainStatement.php
deleted file mode 100644
index 78c7acd2..00000000
--- a/#pma/libraries/sql-parser/src/Statements/ExplainStatement.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-/**
- * `EXPLAIN` statement.
- *
- * @package    SqlParser
- * @subpackage Statements
- */
-namespace SqlParser\Statements;
-
-/**
- * `EXPLAIN` statement.
- *
- * @category   Statements
- * @package    SqlParser
- * @subpackage Statements
- * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-class ExplainStatement extends NotImplementedStatement
-{
-
-}
diff --git a/#pma/libraries/sql-parser/src/Statements/InsertStatement.php b/#pma/libraries/sql-parser/src/Statements/InsertStatement.php
deleted file mode 100644
index 2270f589..00000000
--- a/#pma/libraries/sql-parser/src/Statements/InsertStatement.php
+++ /dev/null
@@ -1,272 +0,0 @@
-<?php
-
-/**
- * `INSERT` statement.
- *
- * @package    SqlParser
- * @subpackage Statements
- */
-namespace SqlParser\Statements;
-
-use SqlParser\Parser;
-use SqlParser\Token;
-use SqlParser\TokensList;
-use SqlParser\Statement;
-use SqlParser\Statements\SelectStatement;
-use SqlParser\Components\IntoKeyword;
-use SqlParser\Components\Array2d;
-use SqlParser\Components\OptionsArray;
-use SqlParser\Components\SetOperation;
-
-/**
- * `INSERT` statement.
- *
- * INSERT [LOW_PRIORITY | DELAYED | HIGH_PRIORITY] [IGNORE]
- *     [INTO] tbl_name
- *     [PARTITION (partition_name,...)]
- *     [(col_name,...)]
- *     {VALUES | VALUE} ({expr | DEFAULT},...),(...),...
- *     [ ON DUPLICATE KEY UPDATE
- *       col_name=expr
- *         [, col_name=expr] ... ]
- *
- * or
- *
- * INSERT [LOW_PRIORITY | DELAYED | HIGH_PRIORITY] [IGNORE]
- *     [INTO] tbl_name
- *     [PARTITION (partition_name,...)]
- *     SET col_name={expr | DEFAULT}, ...
- *     [ ON DUPLICATE KEY UPDATE
- *       col_name=expr
- *         [, col_name=expr] ... ]
- *
- * or
- *
- * INSERT [LOW_PRIORITY | HIGH_PRIORITY] [IGNORE]
- *     [INTO] tbl_name
- *     [PARTITION (partition_name,...)]
- *     [(col_name,...)]
- *     SELECT ...
- *     [ ON DUPLICATE KEY UPDATE
- *       col_name=expr
- *         [, col_name=expr] ... ]
- *
- * @category   Statements
- * @package    SqlParser
- * @subpackage Statements
- * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-class InsertStatement extends Statement
-{
-
-    /**
-     * Options for `INSERT` statements.
-     *
-     * @var array
-     */
-    public static $OPTIONS = array(
-        'LOW_PRIORITY'                  => 1,
-        'DELAYED'                       => 2,
-        'HIGH_PRIORITY'                 => 3,
-        'IGNORE'                        => 4,
-    );
-
-    /**
-     * Tables used as target for this statement.
-     *
-     * @var IntoKeyword
-     */
-    public $into;
-
-    /**
-     * Values to be inserted.
-     *
-     * @var Array2d
-     */
-    public $values;
-
-    /**
-     * If SET clause is present
-     * holds the SetOperation
-     *
-     * @var SetOperation[]
-     */
-    public $set;
-
-    /**
-     * If SELECT clause is present
-     * holds the SelectStatement
-     *
-     * @var SelectStatement
-     */
-    public $select;
-
-    /**
-     * If ON DUPLICATE KEY UPDATE clause is present
-     * holds the SetOperation
-     *
-     * @var SetOperation[]
-     */
-    public $onDuplicateSet;
-
-    /**
-     * @return string
-     */
-    public function build()
-    {
-        $ret = 'INSERT ' . $this->options
-            . ' INTO ' . $this->into;
-
-        if ($this->values != NULL && count($this->values) > 0) {
-            $ret .= ' VALUES ' . Array2d::build($this->values);
-        } elseif ($this->set != NULL && count($this->set) > 0) {
-            $ret .= ' SET ' . SetOperation::build($this->set);
-        } elseif ($this->select != NULL && count($this->select) > 0) {
-            $ret .= ' ' . $this->select->build();
-        }
-
-        if ($this->onDuplicateSet != NULL && count($this->onDuplicateSet) > 0) {
-            $ret .= ' ON DUPLICATE KEY UPDATE ' . SetOperation::build($this->onDuplicateSet);
-        }
-
-        return $ret;
-
-    }
-
-
-    /**
-     * @param Parser     $parser The instance that requests parsing.
-     * @param TokensList $list   The list of tokens to be parsed.
-     *
-     * @return void
-     */
-    public function parse(Parser $parser, TokensList $list)
-    {
-        ++$list->idx; // Skipping `INSERT`.
-
-        // parse any options if provided
-        $this->options = OptionsArray::parse(
-            $parser,
-            $list,
-            static::$OPTIONS
-        );
-        ++$list->idx;
-
-        /**
-         * The state of the parser.
-         *
-         * Below are the states of the parser.
-         *
-         *      0 ---------------------------------[ INTO ]----------------------------------> 1
-         *
-         *      1 -------------------------[ VALUES/VALUE/SET/SELECT ]-----------------------> 2
-         *
-         *      2 -------------------------[ ON DUPLICATE KEY UPDATE ]-----------------------> 3
-         *
-         * @var int $state
-         */
-        $state = 0;
-
-        /**
-         * For keeping track of semi-states on encountering
-         * ON DUPLICATE KEY UPDATE ...
-         *
-         */
-        $miniState = 0;
-
-        for (; $list->idx < $list->count; ++$list->idx) {
-            /**
-             * Token parsed at this moment.
-             *
-             * @var Token $token
-             */
-            $token = $list->tokens[$list->idx];
-
-            // End of statement.
-            if ($token->type === Token::TYPE_DELIMITER) {
-                break;
-            }
-
-            // Skipping whitespaces and comments.
-            if (($token->type === Token::TYPE_WHITESPACE) || ($token->type === Token::TYPE_COMMENT)) {
-                continue;
-            }
-
-            if ($state === 0) {
-                if ($token->type === Token::TYPE_KEYWORD
-                    && $token->value !== 'INTO'
-                ) {
-                    $parser->error(__('Unexpected keyword.'), $token);
-                    break;
-                } else {
-                    ++$list->idx;
-                    $this->into = IntoKeyword::parse(
-                        $parser,
-                        $list,
-                        array('fromInsert' => true)
-                    );
-                }
-
-                $state = 1;
-            } elseif ($state === 1) {
-                if ($token->type === Token::TYPE_KEYWORD) {
-                    if ($token->value === 'VALUE'
-                        || $token->value === 'VALUES'
-                    ) {
-                        ++$list->idx; // skip VALUES
-
-                        $this->values = Array2d::parse($parser, $list);
-                    } elseif ($token->value === 'SET') {
-                        ++$list->idx; // skip SET
-
-                        $this->set = SetOperation::parse($parser, $list);
-                    } elseif ($token->value === 'SELECT') {
-                        $this->select = new SelectStatement($parser, $list);
-                    } else {
-                        $parser->error(
-                            __('Unexpected keyword.'),
-                            $token
-                        );
-                        break;
-                    }
-                    $state = 2;
-                    $miniState = 1;
-                } else {
-                    $parser->error(
-                        __('Unexpected token.'),
-                        $token
-                    );
-                    break;
-                }
-            } elseif ($state == 2) {
-                $lastCount = $miniState;
-
-                if ($miniState === 1 && $token->value === 'ON') {
-                    $miniState++;
-                } elseif ($miniState === 2 && $token->value === 'DUPLICATE') {
-                    $miniState++;
-                } elseif ($miniState === 3 && $token->value === 'KEY') {
-                    $miniState++;
-                } elseif ($miniState === 4 && $token->value === 'UPDATE') {
-                    $miniState++;
-                }
-
-                if ($lastCount === $miniState) {
-                    $parser->error(
-                        __('Unexpected token.'),
-                        $token
-                    );
-                    break;
-                }
-
-                if ($miniState === 5) {
-                    ++$list->idx;
-                    $this->onDuplicateSet = SetOperation::parse($parser, $list);
-                    $state = 3;
-                }
-            }
-        }
-
-        --$list->idx;
-    }
-}
diff --git a/#pma/libraries/sql-parser/src/Statements/MaintenanceStatement.php b/#pma/libraries/sql-parser/src/Statements/MaintenanceStatement.php
deleted file mode 100644
index 9097527c..00000000
--- a/#pma/libraries/sql-parser/src/Statements/MaintenanceStatement.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-/**
- * Maintenance statement.
- *
- * @package    SqlParser
- * @subpackage Statements
- */
-namespace SqlParser\Statements;
-
-use SqlParser\Parser;
-use SqlParser\Statement;
-use SqlParser\Token;
-use SqlParser\TokensList;
-use SqlParser\Components\Expression;
-use SqlParser\Components\OptionsArray;
-
-/**
- * Maintenance statement.
- *
- * They follow the syntax:
- *     STMT [some options] tbl_name [, tbl_name] ... [some more options]
- *
- * @category   Statements
- * @package    SqlParser
- * @subpackage Statements
- * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-class MaintenanceStatement extends Statement
-{
-
-    /**
-     * Tables maintained.
-     *
-     * @var Expression[]
-     */
-    public $tables;
-
-    /**
-     * Function called after the token was processed.
-     *
-     * Parses the additional options from the end.
-     *
-     * @param Parser     $parser The instance that requests parsing.
-     * @param TokensList $list   The list of tokens to be parsed.
-     * @param Token      $token  The token that is being parsed.
-     *
-     * @return void
-     */
-    public function after(Parser $parser, TokensList $list, Token $token)
-    {
-        // [some options] is going to be parsed first.
-        //
-        // There is a parser specified in `Parser::$KEYWORD_PARSERS`
-        // which parses the name of the tables.
-        //
-        // Finally, we parse here [some more options] and that's all.
-        ++$list->idx;
-        $this->options->merge(
-            OptionsArray::parse(
-                $parser,
-                $list,
-                static::$OPTIONS
-            )
-        );
-    }
-}
diff --git a/#pma/libraries/sql-parser/src/Statements/NotImplementedStatement.php b/#pma/libraries/sql-parser/src/Statements/NotImplementedStatement.php
deleted file mode 100644
index 8bdff2d7..00000000
--- a/#pma/libraries/sql-parser/src/Statements/NotImplementedStatement.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-/**
- * Not implemented (yet) statements.
- *
- * @package    SqlParser
- * @subpackage Statements
- */
-namespace SqlParser\Statements;
-
-use SqlParser\Parser;
-use SqlParser\Statement;
-use SqlParser\Token;
-use SqlParser\TokensList;
-
-/**
- * Not implemented (yet) statements.
- *
- * The `after` function makes the parser jump straight to the first delimiter.
- *
- * @category   Statements
- * @package    SqlParser
- * @subpackage Statements
- * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-class NotImplementedStatement extends Statement
-{
-
-    /**
-     * The part of the statement that can't be parsed.
-     *
-     * @var Token[]
-     */
-    public $unknown = array();
-
-    /**
-     * @return string
-     */
-    public function build()
-    {
-        // Building the parsed part of the query (if any).
-        $query = parent::build() . ' ';
-
-        // Rebuilding the unknown part from tokens.
-        foreach ($this->unknown as $token) {
-            $query .= $token->token;
-        }
-
-        return $query;
-    }
-
-    /**
-     * @param Parser     $parser The instance that requests parsing.
-     * @param TokensList $list   The list of tokens to be parsed.
-     *
-     * @return void
-     */
-    public function parse(Parser $parser, TokensList $list)
-    {
-        for (; $list->idx < $list->count; ++$list->idx) {
-            if ($list->tokens[$list->idx]->type === Token::TYPE_DELIMITER) {
-                break;
-            }
-            $this->unknown[] = $list->tokens[$list->idx];
-        }
-    }
-}
diff --git a/#pma/libraries/sql-parser/src/Statements/OptimizeStatement.php b/#pma/libraries/sql-parser/src/Statements/OptimizeStatement.php
deleted file mode 100644
index f688333e..00000000
--- a/#pma/libraries/sql-parser/src/Statements/OptimizeStatement.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-/**
- * `OPTIMIZE` statement.
- *
- * @package    SqlParser
- * @subpackage Statements
- */
-namespace SqlParser\Statements;
-
-use SqlParser\Statement;
-use SqlParser\Components\Expression;
-
-/**
- * `OPTIMIZE` statement.
- *
- * OPTIMIZE [NO_WRITE_TO_BINLOG | LOCAL] TABLE
- *  tbl_name [, tbl_name] ...
- *
- * @category   Statements
- * @package    SqlParser
- * @subpackage Statements
- * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-class OptimizeStatement extends Statement
-{
-
-    /**
-     * Options of this statement.
-     *
-     * @var array
-     */
-    public static $OPTIONS = array(
-
-        'TABLE'                         => 1,
-
-        'NO_WRITE_TO_BINLOG'            => 2,
-        'LOCAL'                         => 3,
-    );
-
-    /**
-     * Optimized tables.
-     *
-     * @var Expression[]
-     */
-    public $tables;
-}
diff --git a/#pma/libraries/sql-parser/src/Statements/RenameStatement.php b/#pma/libraries/sql-parser/src/Statements/RenameStatement.php
deleted file mode 100644
index 0205f846..00000000
--- a/#pma/libraries/sql-parser/src/Statements/RenameStatement.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-/**
- * `RENAME` statement.
- *
- * @package    SqlParser
- * @subpackage Statements
- */
-namespace SqlParser\Statements;
-
-use SqlParser\Parser;
-use SqlParser\Statement;
-use SqlParser\Token;
-use SqlParser\TokensList;
-use SqlParser\Components\RenameOperation;
-
-/**
- * `RENAME` statement.
- *
- * RENAME TABLE tbl_name TO new_tbl_name
- *  [, tbl_name2 TO new_tbl_name2] ...
- *
- * @category   Statements
- * @package    SqlParser
- * @subpackage Statements
- * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-class RenameStatement extends Statement
-{
-
-    /**
-     * The old and new names of the tables.
-     *
-     * @var RenameOperation[]
-     */
-    public $renames;
-
-    /**
-     * Function called before the token is processed.
-     *
-     * Skips the `TABLE` keyword after `RENAME`.
-     *
-     * @param Parser     $parser The instance that requests parsing.
-     * @param TokensList $list   The list of tokens to be parsed.
-     * @param Token      $token  The token that is being parsed.
-     *
-     * @return void
-     */
-    public function before(Parser $parser, TokensList $list, Token $token)
-    {
-        if (($token->type === Token::TYPE_KEYWORD) && ($token->value === 'RENAME')) {
-            // Checking if it is the beginning of the query.
-            $list->getNextOfTypeAndValue(Token::TYPE_KEYWORD, 'TABLE');
-        }
-    }
-}
diff --git a/#pma/libraries/sql-parser/src/Statements/RepairStatement.php b/#pma/libraries/sql-parser/src/Statements/RepairStatement.php
deleted file mode 100644
index f98fcc62..00000000
--- a/#pma/libraries/sql-parser/src/Statements/RepairStatement.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/**
- * `REPAIR` statement.
- *
- * @package    SqlParser
- * @subpackage Statements
- */
-namespace SqlParser\Statements;
-
-/**
- * `REPAIR` statement.
- *
- * REPAIR [NO_WRITE_TO_BINLOG | LOCAL] TABLE
- *  tbl_name [, tbl_name] ...
- *  [QUICK] [EXTENDED] [USE_FRM]
- *
- * @category   Statements
- * @package    SqlParser
- * @subpackage Statements
- * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-class RepairStatement extends MaintenanceStatement
-{
-
-    /**
-     * Options of this statement.
-     *
-     * @var array
-     */
-    public static $OPTIONS = array(
-
-        'TABLE'                         => 1,
-
-        'NO_WRITE_TO_BINLOG'            => 2,
-        'LOCAL'                         => 3,
-
-        'QUICK'                         => 4,
-        'EXTENDED'                      => 5,
-        'USE_FRM'                       => 6,
-    );
-}
diff --git a/#pma/libraries/sql-parser/src/Statements/ReplaceStatement.php b/#pma/libraries/sql-parser/src/Statements/ReplaceStatement.php
deleted file mode 100644
index 4142c886..00000000
--- a/#pma/libraries/sql-parser/src/Statements/ReplaceStatement.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-
-/**
- * `REPLACE` statement.
- *
- * @package    SqlParser
- * @subpackage Statements
- */
-namespace SqlParser\Statements;
-
-use SqlParser\Parser;
-use SqlParser\Token;
-use SqlParser\TokensList;
-use SqlParser\Statement;
-use SqlParser\Statements\SelectStatement;
-use SqlParser\Components\Array2d;
-use SqlParser\Components\IntoKeyword;
-use SqlParser\Components\OptionsArray;
-use SqlParser\Components\SetOperation;
-
-/**
- * `REPLACE` statement.
- *
- * REPLACE [LOW_PRIORITY | DELAYED]
- *     [INTO] tbl_name [(col_name,...)]
- *     {VALUES | VALUE} ({expr | DEFAULT},...),(...),...
- *
- * or
- *
- * REPLACE [LOW_PRIORITY | DELAYED]
- *     [INTO] tbl_name
- *     SET col_name={expr | DEFAULT}, ...
- *
- * or
- *
- * REPLACE [LOW_PRIORITY | DELAYED]
- *   [INTO] tbl_name
- *   [PARTITION (partition_name,...)]
- *   [(col_name,...)]
- *   SELECT ...
- *
- * @category   Statements
- * @package    SqlParser
- * @subpackage Statements
- * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-class ReplaceStatement extends Statement
-{
-
-    /**
-     * Options for `REPLACE` statements and their slot ID.
-     *
-     * @var array
-     */
-    public static $OPTIONS = array(
-        'LOW_PRIORITY'                  => 1,
-        'DELAYED'                       => 1,
-    );
-
-    /**
-     * Tables used as target for this statement.
-     *
-     * @var IntoKeyword
-     */
-    public $into;
-
-    /**
-     * Values to be replaced.
-     *
-     * @var Array2d
-     */
-    public $values;
-
-    /**
-     * If SET clause is present
-     * holds the SetOperation
-     *
-     * @var SetOperation[]
-     */
-    public $set;
-
-    /**
-     * If SELECT clause is present
-     * holds the SelectStatement
-     *
-     * @var SelectStatement
-     */
-    public $select;
-
-    /**
-     * @return string
-     */
-    public function build()
-    {
-        $ret = 'REPLACE ' . $this->options
-            . ' INTO ' . $this->into;
-
-        if ($this->values != NULL && count($this->values) > 0) {
-            $ret .= ' VALUES ' . Array2d::build($this->values);
-        } elseif ($this->set != NULL && count($this->set) > 0) {
-            $ret .= ' SET ' . SetOperation::build($this->set);
-        } elseif ($this->select != NULL && count($this->select) > 0) {
-            $ret .= ' ' . $this->select->build();
-        }
-
-        return $ret;
-    }
-
-
-    /**
-     * @param Parser     $parser The instance that requests parsing.
-     * @param TokensList $list   The list of tokens to be parsed.
-     *
-     * @return void
-     */
-    public function parse(Parser $parser, TokensList $list)
-    {
-        ++$list->idx; // Skipping `REPLACE`.
-
-        // parse any options if provided
-        $this->options = OptionsArray::parse(
-            $parser,
-            $list,
-            static::$OPTIONS
-        );
-        ++$list->idx;
-
-        $token = $list->tokens[$list->idx];
-
-        /**
-         * The state of the parser.
-         *
-         * Below are the states of the parser.
-         *
-         *      0 ---------------------------------[ INTO ]----------------------------------> 1
-         *
-         *      1 -------------------------[ VALUES/VALUE/SET/SELECT ]-----------------------> 2
-         *
-         * @var int $state
-         */
-        $state = 0;
-
-        for (; $list->idx < $list->count; ++$list->idx) {
-            /**
-             * Token parsed at this moment.
-             *
-             * @var Token $token
-             */
-            $token = $list->tokens[$list->idx];
-
-            // End of statement.
-            if ($token->type === Token::TYPE_DELIMITER) {
-                break;
-            }
-
-            // Skipping whitespaces and comments.
-            if (($token->type === Token::TYPE_WHITESPACE) || ($token->type === Token::TYPE_COMMENT)) {
-                continue;
-            }
-
-            if ($state === 0) {
-                if ($token->type === Token::TYPE_KEYWORD
-                    && $token->value !== 'INTO'
-                ) {
-                    $parser->error(__('Unexpected keyword.'), $token);
-                    break;
-                } else {
-                    ++$list->idx;
-                    $this->into = IntoKeyword::parse(
-                        $parser,
-                        $list,
-                        array('fromReplace' => true)
-                    );
-                }
-
-                $state = 1;
-            } elseif ($state === 1) {
-                if ($token->type === Token::TYPE_KEYWORD) {
-                    if ($token->value === 'VALUE'
-                        || $token->value === 'VALUES'
-                    ) {
-                        ++$list->idx; // skip VALUES
-
-                        $this->values = Array2d::parse($parser, $list);
-                    } elseif ($token->value === 'SET') {
-                        ++$list->idx; // skip SET
-
-                        $this->set = SetOperation::parse($parser, $list);
-                    } elseif ($token->value === 'SELECT') {
-                        $this->select = new SelectStatement($parser, $list);
-                    } else {
-                        $parser->error(
-                            __('Unexpected keyword.'),
-                            $token
-                        );
-                        break;
-                    }
-                    $state = 2;
-                } else {
-                    $parser->error(
-                        __('Unexpected token.'),
-                        $token
-                    );
-                    break;
-                }
-            }
-        }
-
-        --$list->idx;
-    }
-}
diff --git a/#pma/libraries/sql-parser/src/Statements/RestoreStatement.php b/#pma/libraries/sql-parser/src/Statements/RestoreStatement.php
deleted file mode 100644
index 8500479b..00000000
--- a/#pma/libraries/sql-parser/src/Statements/RestoreStatement.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/**
- * `RESTORE` statement.
- *
- * @package    SqlParser
- * @subpackage Statements
- */
-namespace SqlParser\Statements;
-
-/**
- * `RESTORE` statement.
- *
- * RESTORE TABLE tbl_name [, tbl_name] ... FROM '/path/to/backup/directory'
- *
- * @category   Statements
- * @package    SqlParser
- * @subpackage Statements
- * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-class RestoreStatement extends MaintenanceStatement
-{
-
-    /**
-     * Options of this statement.
-     *
-     * @var array
-     */
-    public static $OPTIONS = array(
-
-        'TABLE'                         => 1,
-
-        'FROM'                          => array(2, 'var'),
-    );
-}
diff --git a/#pma/libraries/sql-parser/src/Statements/SelectStatement.php b/#pma/libraries/sql-parser/src/Statements/SelectStatement.php
deleted file mode 100644
index 49ed3934..00000000
--- a/#pma/libraries/sql-parser/src/Statements/SelectStatement.php
+++ /dev/null
@@ -1,238 +0,0 @@
-<?php
-
-/**
- * `SELECT` statement.
- *
- * @package    SqlParser
- * @subpackage Statements
- */
-namespace SqlParser\Statements;
-
-use SqlParser\Statement;
-use SqlParser\Components\ArrayObj;
-use SqlParser\Components\FunctionCall;
-use SqlParser\Components\Expression;
-use SqlParser\Components\IntoKeyword;
-use SqlParser\Components\JoinKeyword;
-use SqlParser\Components\Limit;
-use SqlParser\Components\OrderKeyword;
-use SqlParser\Components\Condition;
-
-/**
- * `SELECT` statement.
- *
- * SELECT
- *     [ALL | DISTINCT | DISTINCTROW ]
- *       [HIGH_PRIORITY]
- *       [MAX_STATEMENT_TIME = N]
- *       [STRAIGHT_JOIN]
- *       [SQL_SMALL_RESULT] [SQL_BIG_RESULT] [SQL_BUFFER_RESULT]
- *       [SQL_CACHE | SQL_NO_CACHE] [SQL_CALC_FOUND_ROWS]
- *     select_expr [, select_expr ...]
- *     [FROM table_references
- *       [PARTITION partition_list]
- *     [WHERE where_condition]
- *     [GROUP BY {col_name | expr | position}
- *       [ASC | DESC], ... [WITH ROLLUP]]
- *     [HAVING where_condition]
- *     [ORDER BY {col_name | expr | position}
- *       [ASC | DESC], ...]
- *     [LIMIT {[offset,] row_count | row_count OFFSET offset}]
- *     [PROCEDURE procedure_name(argument_list)]
- *     [INTO OUTFILE 'file_name'
- *         [CHARACTER SET charset_name]
- *         export_options
- *       | INTO DUMPFILE 'file_name'
- *       | INTO var_name [, var_name]]
- *     [FOR UPDATE | LOCK IN SHARE MODE]]
- *
- * @category   Statements
- * @package    SqlParser
- * @subpackage Statements
- * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-class SelectStatement extends Statement
-{
-
-    /**
-     * Options for `SELECT` statements and their slot ID.
-     *
-     * @var array
-     */
-    public static $OPTIONS = array(
-        'ALL'                           => 1,
-        'DISTINCT'                      => 1,
-        'DISTINCTROW'                   => 1,
-        'HIGH_PRIORITY'                 => 2,
-        'MAX_STATEMENT_TIME'            => array(3, 'var='),
-        'STRAIGHT_JOIN'                 => 4,
-        'SQL_SMALL_RESULT'              => 5,
-        'SQL_BIG_RESULT'                => 6,
-        'SQL_BUFFER_RESULT'             => 7,
-        'SQL_CACHE'                     => 8,
-        'SQL_NO_CACHE'                  => 8,
-        'SQL_CALC_FOUND_ROWS'           => 9,
-    );
-
-    public static $END_OPTIONS = array(
-        'FOR UPDATE'                    => 1,
-        'LOCK IN SHARE MODE'            => 1
-    );
-
-    /**
-     * The clauses of this statement, in order.
-     *
-     * @see Statement::$CLAUSES
-     *
-     * @var array
-     */
-    public static $CLAUSES = array(
-        'SELECT'                        => array('SELECT',                  2),
-        // Used for options.
-        '_OPTIONS'                      => array('_OPTIONS',                1),
-        // Used for selected expressions.
-        '_SELECT'                       => array('SELECT',                  1),
-        'INTO'                          => array('INTO',                    3),
-        'FROM'                          => array('FROM',                    3),
-        'PARTITION'                     => array('PARTITION',               3),
-
-        'JOIN'                          => array('JOIN',                    1),
-        'FULL JOIN'                     => array('FULL JOIN',               1),
-        'INNER JOIN'                    => array('INNER JOIN',              1),
-        'LEFT JOIN'                     => array('LEFT JOIN',               1),
-        'LEFT OUTER JOIN'               => array('LEFT OUTER JOIN',         1),
-        'RIGHT JOIN'                    => array('RIGHT JOIN',              1),
-        'RIGHT OUTER JOIN'              => array('RIGHT OUTER JOIN',        1),
-        'NATURAL JOIN'                  => array('NATURAL JOIN',            1),
-        'NATURAL LEFT JOIN'             => array('NATURAL LEFT JOIN',       1),
-        'NATURAL RIGHT JOIN'            => array('NATURAL RIGHT JOIN',      1),
-        'NATURAL LEFT OUTER JOIN'       => array('NATURAL LEFT OUTER JOIN', 1),
-        'NATURAL RIGHT OUTER JOIN'      => array('NATURAL RIGHT JOIN',      1),
-
-        'WHERE'                         => array('WHERE',                   3),
-        'GROUP BY'                      => array('GROUP BY',                3),
-        'HAVING'                        => array('HAVING',                  3),
-        'ORDER BY'                      => array('ORDER BY',                3),
-        'LIMIT'                         => array('LIMIT',                   3),
-        'PROCEDURE'                     => array('PROCEDURE',               3),
-        'UNION'                         => array('UNION',                   1),
-        '_END_OPTIONS'                  => array('_END_OPTIONS',            1)
-        // These are available only when `UNION` is present.
-        // 'ORDER BY'                      => array('ORDER BY',    3),
-        // 'LIMIT'                         => array('LIMIT',       3),
-    );
-
-    /**
-     * Expressions that are being selected by this statement.
-     *
-     * @var Expression[]
-     */
-    public $expr = array();
-
-    /**
-     * Tables used as sources for this statement.
-     *
-     * @var Expression[]
-     */
-    public $from = array();
-
-    /**
-     * Partitions used as source for this statement.
-     *
-     * @var ArrayObj
-     */
-    public $partition;
-
-    /**
-     * Conditions used for filtering each row of the result set.
-     *
-     * @var Condition[]
-     */
-    public $where;
-
-    /**
-     * Conditions used for grouping the result set.
-     *
-     * @var OrderKeyword[]
-     */
-    public $group;
-
-    /**
-     * Conditions used for filtering the result set.
-     *
-     * @var Condition[]
-     */
-    public $having;
-
-    /**
-     * Specifies the order of the rows in the result set.
-     *
-     * @var OrderKeyword[]
-     */
-    public $order;
-
-    /**
-     * Conditions used for limiting the size of the result set.
-     *
-     * @var Limit
-     */
-    public $limit;
-
-    /**
-     * Procedure that should process the data in the result set.
-     *
-     * @var FunctionCall
-     */
-    public $procedure;
-
-    /**
-     * Destination of this result set.
-     *
-     * @var IntoKeyword
-     */
-    public $into;
-
-    /**
-     * Joins.
-     *
-     * @var JoinKeyword[]
-     */
-    public $join;
-
-    /**
-     * Unions.
-     *
-     * @var SelectStatement[]
-     */
-    public $union = array();
-
-    /**
-     * The end options of this query.
-     *
-     * @var OptionsArray
-     *
-     * @see static::$END_OPTIONS
-     */
-    public $end_options;
-
-    /**
-     * Gets the clauses of this statement.
-     *
-     * @return array
-     */
-    public function getClauses()
-    {
-        // This is a cheap fix for `SELECT` statements that contain `UNION`.
-        // The `ORDER BY` and `LIMIT` clauses should be at the end of the
-        // statement.
-        if (!empty($this->union)) {
-            $clauses = static::$CLAUSES;
-            unset($clauses['ORDER BY']);
-            unset($clauses['LIMIT']);
-            $clauses['ORDER BY'] = array('ORDER BY', 3);
-            $clauses['LIMIT'] = array('LIMIT', 3);
-            return $clauses;
-        }
-        return static::$CLAUSES;
-    }
-}
diff --git a/#pma/libraries/sql-parser/src/Statements/SetStatement.php b/#pma/libraries/sql-parser/src/Statements/SetStatement.php
deleted file mode 100644
index a9ff4983..00000000
--- a/#pma/libraries/sql-parser/src/Statements/SetStatement.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-
-/**
- * `SET` statement.
- *
- * @package    SqlParser
- * @subpackage Statements
- */
-namespace SqlParser\Statements;
-
-use SqlParser\Statement;
-use SqlParser\Components\SetOperation;
-use SqlParser\Components\OptionsArray;
-
-/**
- * `SET` statement.
- *
- * @category   Statements
- * @package    SqlParser
- * @subpackage Statements
- * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-class SetStatement extends Statement
-{
-
-    /**
-     * The clauses of this statement, in order.
-     *
-     * @see Statement::$CLAUSES
-     *
-     * @var array
-     */
-    public static $CLAUSES = array(
-        'SET'                           => array('SET',         3),
-    );
-
-    /**
-     * Possible exceptions in SET statment
-     *
-     * @var array
-     */
-    public static $OPTIONS = array(
-        'CHARSET'           => array(3, 'var'),
-        'CHARACTER SET'     => array(3, 'var'),
-        'NAMES'             => array(3, 'var'),
-        'PASSWORD'          => array(3, 'expr'),
-    );
-
-    /**
-     * Options used in current statement
-     *
-     * @var OptionsArray[]
-     */
-    public $options;
-
-    /**
-     * The updated values.
-     *
-     * @var SetOperation[]
-     */
-    public $set;
-
-    /**
-     * @return string
-     */
-    public function build()
-    {
-        return 'SET ' . OptionsArray::build($this->options)
-            . ' ' . SetOperation::build($this->set);
-    }
-}
diff --git a/#pma/libraries/sql-parser/src/Statements/ShowStatement.php b/#pma/libraries/sql-parser/src/Statements/ShowStatement.php
deleted file mode 100644
index ecca3489..00000000
--- a/#pma/libraries/sql-parser/src/Statements/ShowStatement.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-/**
- * `SHOW` statement.
- *
- * @package    SqlParser
- * @subpackage Statements
- */
-namespace SqlParser\Statements;
-
-/**
- * `SHOW` statement.
- *
- * @category   Statements
- * @package    SqlParser
- * @subpackage Statements
- * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-class ShowStatement extends NotImplementedStatement
-{
-
-    /**
-     * Options of this statement.
-     *
-     * @var array
-     */
-    public static $OPTIONS = array(
-        'CREATE'                        => 1,
-        'AUTHORS'                       => 2,
-        'BINARY'                        => 2,
-        'BINLOG'                        => 2,
-        'CHARACTER'                     => 2,
-        'CODE'                          => 2,
-        'COLLATION'                     => 2,
-        'COLUMNS'                       => 2,
-        'CONTRIBUTORS'                  => 2,
-        'DATABASE'                      => 2,
-        'DATABASES'                     => 2,
-        'ENGINE'                        => 2,
-        'ENGINES'                       => 2,
-        'ERRORS'                        => 2,
-        'EVENT'                         => 2,
-        'EVENTS'                        => 2,
-        'FUNCTION'                      => 2,
-        'GRANTS'                        => 2,
-        'HOSTS'                         => 2,
-        'INDEX'                         => 2,
-        'INNODB'                        => 2,
-        'LOGS'                          => 2,
-        'MASTER'                        => 2,
-        'OPEN'                          => 2,
-        'PLUGINS'                       => 2,
-        'PRIVILEGES'                    => 2,
-        'PROCEDURE'                     => 2,
-        'PROCESSLIST'                   => 2,
-        'PROFILE'                       => 2,
-        'PROFILES'                      => 2,
-        'SCHEDULER'                     => 2,
-        'SET'                           => 2,
-        'SLAVE'                         => 2,
-        'STATUS'                        => 2,
-        'TABLE'                         => 2,
-        'TABLES'                        => 2,
-        'TRIGGER'                       => 2,
-        'TRIGGERS'                      => 2,
-        'VARIABLES'                     => 2,
-        'VIEW'                          => 2,
-        'WARNINGS'                      => 2,
-    );
-}
diff --git a/#pma/libraries/sql-parser/src/Statements/TransactionStatement.php b/#pma/libraries/sql-parser/src/Statements/TransactionStatement.php
deleted file mode 100644
index 2d355eab..00000000
--- a/#pma/libraries/sql-parser/src/Statements/TransactionStatement.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-
-/**
- * Transaction statement.
- *
- * @package    SqlParser
- * @subpackage Statements
- */
-namespace SqlParser\Statements;
-
-use SqlParser\Parser;
-use SqlParser\Statement;
-use SqlParser\TokensList;
-use SqlParser\Components\OptionsArray;
-
-/**
- * Transaction statement.
- *
- * @category   Statements
- * @package    SqlParser
- * @subpackage Statements
- * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-class TransactionStatement extends Statement
-{
-
-    /**
-     * START TRANSACTION and BEGIN
-     *
-     * @var int
-     */
-    const TYPE_BEGIN                    = 1;
-
-    /**
-     * COMMIT and ROLLBACK
-     *
-     * @var int
-     */
-    const TYPE_END                      = 2;
-
-    /**
-     * The type of this query.
-     *
-     * @var int
-     */
-    public $type;
-
-    /**
-     * The list of statements in this transaction.
-     *
-     * @var Statement[]
-     */
-    public $statements;
-
-    /**
-     * The ending transaction statement which may be a `COMMIT` or a `ROLLBACK`.
-     *
-     * @var TransactionStatement
-     */
-    public $end;
-
-    /**
-     * Options for this query.
-     *
-     * @var array
-     */
-    public static $OPTIONS = array(
-        'START TRANSACTION'             => 1,
-        'BEGIN'                         => 1,
-        'COMMIT'                        => 1,
-        'ROLLBACK'                      => 1,
-        'WITH CONSISTENT SNAPSHOT'      => 2,
-        'WORK'                          => 2,
-        'AND NO CHAIN'                  => 3,
-        'AND CHAIN'                     => 3,
-        'RELEASE'                       => 4,
-        'NO RELEASE'                    => 4,
-    );
-
-    /**
-     * @param Parser     $parser The instance that requests parsing.
-     * @param TokensList $list   The list of tokens to be parsed.
-     *
-     * @return void
-     */
-    public function parse(Parser $parser, TokensList $list)
-    {
-        parent::parse($parser, $list);
-
-        // Checks the type of this query.
-        if (($this->options->has('START TRANSACTION'))
-            || ($this->options->has('BEGIN'))
-        ) {
-            $this->type = TransactionStatement::TYPE_BEGIN;
-        } elseif (($this->options->has('COMMIT'))
-            || ($this->options->has('ROLLBACK'))
-        ) {
-            $this->type = TransactionStatement::TYPE_END;
-        }
-    }
-
-    /**
-     * @return string
-     */
-    public function build()
-    {
-        $ret = OptionsArray::build($this->options);
-        if ($this->type === TransactionStatement::TYPE_BEGIN) {
-            foreach ($this->statements as $statement) {
-                /**
-                 * @var SelectStatement $statement
-                 */
-                $ret .= ';' . $statement->build();
-            }
-            $ret .= ';' . $this->end->build();
-        }
-        return $ret;
-    }
-}
diff --git a/#pma/libraries/sql-parser/src/Statements/TruncateStatement.php b/#pma/libraries/sql-parser/src/Statements/TruncateStatement.php
deleted file mode 100644
index 6f9d303a..00000000
--- a/#pma/libraries/sql-parser/src/Statements/TruncateStatement.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/**
- * `TRUNCATE` statement.
- *
- * @package    SqlParser
- * @subpackage Statements
- */
-namespace SqlParser\Statements;
-
-use SqlParser\Statement;
-use SqlParser\Components\Expression;
-
-/**
- * `TRUNCATE` statement.
- *
- * @category   Statements
- * @package    SqlParser
- * @subpackage Statements
- * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-class TruncateStatement extends Statement
-{
-
-    /**
-     * Options for `TRUNCATE` statements.
-     *
-     * @var array
-     */
-    public static $OPTIONS = array(
-        'TABLE'                         => 1,
-    );
-
-    /**
-     * The name of the truncated table.
-     *
-     * @var Expression
-     */
-    public $table;
-}
diff --git a/#pma/libraries/sql-parser/src/Statements/UpdateStatement.php b/#pma/libraries/sql-parser/src/Statements/UpdateStatement.php
deleted file mode 100644
index 011b9555..00000000
--- a/#pma/libraries/sql-parser/src/Statements/UpdateStatement.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-
-/**
- * `UPDATE` statement.
- *
- * @package    SqlParser
- * @subpackage Statements
- */
-namespace SqlParser\Statements;
-
-use SqlParser\Statement;
-use SqlParser\Components\Expression;
-use SqlParser\Components\Limit;
-use SqlParser\Components\OrderKeyword;
-use SqlParser\Components\SetOperation;
-use SqlParser\Components\Condition;
-
-/**
- * `UPDATE` statement.
- *
- * UPDATE [LOW_PRIORITY] [IGNORE] table_reference
- *     SET col_name1={expr1|DEFAULT} [, col_name2={expr2|DEFAULT}] ...
- *     [WHERE where_condition]
- *     [ORDER BY ...]
- *     [LIMIT row_count]
- *
- * or
- *
- * UPDATE [LOW_PRIORITY] [IGNORE] table_references
- *     SET col_name1={expr1|DEFAULT} [, col_name2={expr2|DEFAULT}] ...
- *     [WHERE where_condition]
- *
- * @category   Statements
- * @package    SqlParser
- * @subpackage Statements
- * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-class UpdateStatement extends Statement
-{
-
-    /**
-     * Options for `UPDATE` statements and their slot ID.
-     *
-     * @var array
-     */
-    public static $OPTIONS = array(
-        'LOW_PRIORITY'                  => 1,
-        'IGNORE'                        => 2,
-    );
-
-    /**
-     * The clauses of this statement, in order.
-     *
-     * @see Statement::$CLAUSES
-     *
-     * @var array
-     */
-    public static $CLAUSES = array(
-        'UPDATE'                        => array('UPDATE',      2),
-        // Used for options.
-        '_OPTIONS'                      => array('_OPTIONS',    1),
-        // Used for updated tables.
-        '_UPDATE'                       => array('UPDATE',      1),
-        'SET'                           => array('SET',         3),
-        'WHERE'                         => array('WHERE',       3),
-        'ORDER BY'                      => array('ORDER BY',    3),
-        'LIMIT'                         => array('LIMIT',       3),
-    );
-
-    /**
-     * Tables used as sources for this statement.
-     *
-     * @var Expression[]
-     */
-    public $tables;
-
-    /**
-     * The updated values.
-     *
-     * @var SetOperation[]
-     */
-    public $set;
-
-    /**
-     * Conditions used for filtering each row of the result set.
-     *
-     * @var Condition[]
-     */
-    public $where;
-
-    /**
-     * Specifies the order of the rows in the result set.
-     *
-     * @var OrderKeyword[]
-     */
-    public $order;
-
-    /**
-     * Conditions used for limiting the size of the result set.
-     *
-     * @var Limit
-     */
-    public $limit;
-}
diff --git a/#pma/libraries/sql-parser/src/Token.php b/#pma/libraries/sql-parser/src/Token.php
deleted file mode 100644
index e5001ef9..00000000
--- a/#pma/libraries/sql-parser/src/Token.php
+++ /dev/null
@@ -1,303 +0,0 @@
-<?php
-
-/**
- * Defines a token along with a set of types and flags and utility functions.
- *
- * An array of tokens will result after parsing the query.
- *
- * @package SqlParser
- */
-namespace SqlParser;
-
-/**
- * A structure representing a lexeme that explicitly indicates its
- * categorization for the purpose of parsing.
- *
- * @category Tokens
- * @package  SqlParser
- * @license  https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-class Token
-{
-
-    // Types of tokens (a vague description of a token's purpose).
-
-    /**
-     * This type is used when the token is invalid or its type cannot be
-     * determined because of the ambiguous context. Further analysis might be
-     * required to detect its type.
-     *
-     * @var int
-     */
-    const TYPE_NONE                     =  0;
-
-    /**
-     * SQL specific keywords: SELECT, UPDATE, INSERT, etc.
-     *
-     * @var int
-     */
-    const TYPE_KEYWORD                  =  1;
-
-    /**
-     * Any type of legal operator.
-     *
-     * Arithmetic operators: +, -, *, /, etc.
-     * Logical operators: ===, <>, !==, etc.
-     * Bitwise operators: &, |, ^, etc.
-     * Assignment operators: =, +=, -=, etc.
-     * SQL specific operators: . (e.g. .. WHERE database.table ..),
-     *                         * (e.g. SELECT * FROM ..)
-     *
-     * @var int
-     */
-    const TYPE_OPERATOR                 =  2;
-
-    /**
-     * Spaces, tabs, new lines, etc.
-     *
-     * @var int
-     */
-    const TYPE_WHITESPACE               =  3;
-
-    /**
-     * Any type of legal comment.
-     *
-     * Bash (#), C (/* *\/) or SQL (--) comments:
-     *
-     *      -- SQL-comment
-     *
-     *      #Bash-like comment
-     *
-     *      /*C-like comment*\/
-     *
-     * or:
-     *
-     *      /*C-like
-     *        comment*\/
-     *
-     * Backslashes were added to respect PHP's comments syntax.
-     *
-     * @var int
-     */
-    const TYPE_COMMENT                  =  4;
-
-    /**
-     * Boolean values: true or false.
-     *
-     * @var int
-     */
-    const TYPE_BOOL                     =  5;
-
-    /**
-     * Numbers: 4, 0x8, 15.16, 23e42, etc.
-     *
-     * @var int
-     */
-    const TYPE_NUMBER                   =  6;
-
-    /**
-     * Literal strings: 'string', "test".
-     * Some of these strings are actually symbols.
-     *
-     * @var int
-     */
-    const TYPE_STRING                   =  7;
-
-    /**
-     * Database, table names, variables, etc.
-     * For example: ```SELECT `foo`, `bar` FROM `database`.`table`;```
-     *
-     * @var int
-     */
-    const TYPE_SYMBOL                   =  8;
-
-    /**
-     * Delimits an unknown string.
-     * For example: ```SELECT * FROM test;```, `test` is a delimiter.
-     *
-     * @var int
-     */
-    const TYPE_DELIMITER                =  9;
-
-    /**
-     * Labels in LOOP statement, ITERATE statement etc.
-     * For example (only for begin label):
-     *  begin_label: BEGIN [statement_list] END [end_label]
-     *  begin_label: LOOP [statement_list] END LOOP [end_label]
-     *  begin_label: REPEAT [statement_list] ... END REPEAT [end_label]
-     *  begin_label: WHILE ... DO [statement_list] END WHILE [end_label]
-     *
-     * @var int
-     */
-    const TYPE_LABEL                =  10;
-
-    // Flags that describe the tokens in more detail.
-    // All keywords must have flag 1 so `Context::isKeyword` method doesn't
-    // require strict comparison.
-    const FLAG_KEYWORD_RESERVED         =  2;
-    const FLAG_KEYWORD_COMPOSED         =  4;
-    const FLAG_KEYWORD_DATA_TYPE        =  8;
-    const FLAG_KEYWORD_KEY              = 16;
-    const FLAG_KEYWORD_FUNCTION         = 32;
-
-    // Numbers related flags.
-    const FLAG_NUMBER_HEX               =  1;
-    const FLAG_NUMBER_FLOAT             =  2;
-    const FLAG_NUMBER_APPROXIMATE       =  4;
-    const FLAG_NUMBER_NEGATIVE          =  8;
-    const FLAG_NUMBER_BINARY            = 16;
-
-    // Strings related flags.
-    const FLAG_STRING_SINGLE_QUOTES     =  1;
-    const FLAG_STRING_DOUBLE_QUOTES     =  2;
-
-    // Comments related flags.
-    const FLAG_COMMENT_BASH             =  1;
-    const FLAG_COMMENT_C                =  2;
-    const FLAG_COMMENT_SQL              =  4;
-    const FLAG_COMMENT_MYSQL_CMD        =  8;
-
-    // Operators related flags.
-    const FLAG_OPERATOR_ARITHMETIC      =  1;
-    const FLAG_OPERATOR_LOGICAL         =  2;
-    const FLAG_OPERATOR_BITWISE         =  4;
-    const FLAG_OPERATOR_ASSIGNMENT      =  8;
-    const FLAG_OPERATOR_SQL             = 16;
-
-    // Symbols related flags.
-    const FLAG_SYMBOL_VARIABLE          =  1;
-    const FLAG_SYMBOL_BACKTICK          =  2;
-    const FLAG_SYMBOL_USER              =  4;
-    const FLAG_SYMBOL_SYSTEM            =  8;
-
-    /**
-     * The token it its raw string representation.
-     *
-     * @var string
-     */
-    public $token;
-
-    /**
-     * The value this token contains (i.e. token after some evaluation)
-     *
-     * @var mixed
-     */
-    public $value;
-
-    /**
-     * The type of this token.
-     *
-     * @var int
-     */
-    public $type;
-
-    /**
-     * The flags of this token.
-     *
-     * @var int
-     */
-    public $flags;
-
-    /**
-     * The position in the initial string where this token started.
-     *
-     * @var int
-     */
-    public $position;
-
-    /**
-     * Constructor.
-     *
-     * @param string $token The value of the token.
-     * @param int    $type  The type of the token.
-     * @param int    $flags The flags of the token.
-     */
-    public function __construct($token, $type = 0, $flags = 0)
-    {
-        $this->token = $token;
-        $this->type = $type;
-        $this->flags = $flags;
-        $this->value = $this->extract();
-    }
-
-    /**
-     * Does little processing to the token to extract a value.
-     *
-     * If no processing can be done it will return the initial string.
-     *
-     * @return mixed
-     */
-    public function extract()
-    {
-        switch ($this->type) {
-            case Token::TYPE_KEYWORD:
-                if (!($this->flags & Token::FLAG_KEYWORD_RESERVED)) {
-                    // Unreserved keywords should stay the way they are because they
-                    // might represent field names.
-                    return $this->token;
-                }
-                return strtoupper($this->token);
-            case Token::TYPE_WHITESPACE:
-                return ' ';
-            case Token::TYPE_BOOL:
-                return strtoupper($this->token) === 'TRUE';
-            case Token::TYPE_NUMBER:
-                $ret = str_replace('--', '', $this->token); // e.g. ---42 === -42
-                if ($this->flags & Token::FLAG_NUMBER_HEX) {
-                    if ($this->flags & Token::FLAG_NUMBER_NEGATIVE) {
-                        $ret = str_replace('-', '', $this->token);
-                        sscanf($ret, '%x', $ret);
-                        $ret = -$ret;
-                    } else {
-                        sscanf($ret, '%x', $ret);
-                    }
-                } elseif (($this->flags & Token::FLAG_NUMBER_APPROXIMATE)
-                || ($this->flags & Token::FLAG_NUMBER_FLOAT)
-                ) {
-                    sscanf($ret, '%f', $ret);
-                } else {
-                    sscanf($ret, '%d', $ret);
-                }
-                return $ret;
-            case Token::TYPE_STRING:
-                $quote = $this->token[0];
-                $str = str_replace($quote . $quote, $quote, $this->token);
-                return mb_substr($str, 1, -1, 'UTF-8'); // trims quotes
-            case Token::TYPE_SYMBOL:
-                $str = $this->token;
-                if ((isset($str[0])) && ($str[0] === '@')) {
-                    // `mb_strlen($str)` must be used instead of `null` because
-                    // in PHP 5.3- the `null` parameter isn't handled correctly.
-                    $str = mb_substr(
-                        $str,
-                        ((!empty($str[1])) && ($str[1] === '@')) ? 2 : 1,
-                        mb_strlen($str),
-                        'UTF-8'
-                    );
-                }
-                if ((isset($str[0])) && (($str[0] === '`')
-                || ($str[0] === '"') || ($str[0] === '\''))
-                ) {
-                    $quote = $str[0];
-                    $str = str_replace($quote . $quote, $quote, $str);
-                    $str = mb_substr($str, 1, -1, 'UTF-8');
-                }
-                return $str;
-        }
-        return $this->token;
-    }
-
-    /**
-     * Converts the token into an inline token by replacing tabs and new lines.
-     *
-     * @return string
-     */
-    public function getInlineToken()
-    {
-        return str_replace(
-            array("\r", "\n", "\t"),
-            array('\r', '\n', '\t'),
-            $this->token
-        );
-    }
-}
diff --git a/#pma/libraries/sql-parser/src/TokensList.php b/#pma/libraries/sql-parser/src/TokensList.php
deleted file mode 100644
index c0c2c89e..00000000
--- a/#pma/libraries/sql-parser/src/TokensList.php
+++ /dev/null
@@ -1,207 +0,0 @@
-<?php
-
-/**
- * Defines an array of tokens and utility functions to iterate through it.
- *
- * @package SqlParser
- */
-namespace SqlParser;
-
-/**
- * A structure representing a list of tokens.
- *
- * @category Tokens
- * @package  SqlParser
- * @license  https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-class TokensList implements \ArrayAccess
-{
-
-    /**
-     * The array of tokens.
-     *
-     * @var array
-     */
-    public $tokens = array();
-
-    /**
-     * The count of tokens.
-     *
-     * @var int
-     */
-    public $count = 0;
-
-    /**
-     * The index of the next token to be returned.
-     *
-     * @var int
-     */
-    public $idx = 0;
-
-    /**
-     * Constructor.
-     *
-     * @param array $tokens The initial array of tokens.
-     * @param int   $count  The count of tokens in the initial array.
-     */
-    public function __construct(array $tokens = array(), $count = -1)
-    {
-        if (!empty($tokens)) {
-            $this->tokens = $tokens;
-            if ($count === -1) {
-                $this->count = count($tokens);
-            }
-        }
-    }
-
-    /**
-     * Builds an array of tokens by merging their raw value.
-     *
-     * @param string|Token[]|TokensList $list The tokens to be built.
-     *
-     * @return string
-     */
-    public static function build($list)
-    {
-        if (is_string($list)) {
-            return $list;
-        }
-
-        if ($list instanceof TokensList) {
-            $list = $list->tokens;
-        }
-
-        $ret = '';
-        if (is_array($list)) {
-            foreach ($list as $tok) {
-                $ret .= $tok->token;
-            }
-        }
-        return $ret;
-    }
-
-    /**
-     * Adds a new token.
-     *
-     * @param Token $token Token to be added in list.
-     *
-     * @return void
-     */
-    public function add(Token $token)
-    {
-        $this->tokens[$this->count++] = $token;
-    }
-
-    /**
-     * Gets the next token. Skips any irrelevant token (whitespaces and
-     * comments).
-     *
-     * @return Token
-     */
-    public function getNext()
-    {
-        for (; $this->idx < $this->count; ++$this->idx) {
-            if (($this->tokens[$this->idx]->type !== Token::TYPE_WHITESPACE)
-                && ($this->tokens[$this->idx]->type !== Token::TYPE_COMMENT)
-            ) {
-                return $this->tokens[$this->idx++];
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Gets the next token.
-     *
-     * @param int $type The type.
-     *
-     * @return Token
-     */
-    public function getNextOfType($type)
-    {
-        for (; $this->idx < $this->count; ++$this->idx) {
-            if ($this->tokens[$this->idx]->type === $type) {
-                return $this->tokens[$this->idx++];
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Gets the next token.
-     *
-     * @param int    $type  The type of the token.
-     * @param string $value The value of the token.
-     *
-     * @return Token
-     */
-    public function getNextOfTypeAndValue($type, $value)
-    {
-        for (; $this->idx < $this->count; ++$this->idx) {
-            if (($this->tokens[$this->idx]->type === $type)
-                && ($this->tokens[$this->idx]->value === $value)
-            ) {
-                return $this->tokens[$this->idx++];
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Sets an value inside the container.
-     *
-     * @param int   $offset The offset to be set.
-     * @param Token $value  The token to be saved.
-     *
-     * @return void
-     */
-    public function offsetSet($offset, $value)
-    {
-        if ($offset === null) {
-            $this->tokens[$this->count++] = $value;
-        } else {
-            $this->tokens[$offset] = $value;
-        }
-    }
-
-    /**
-     * Gets a value from the container.
-     *
-     * @param int $offset The offset to be returned.
-     *
-     * @return Token
-     */
-    public function offsetGet($offset)
-    {
-        return $offset < $this->count ? $this->tokens[$offset] : null;
-    }
-
-    /**
-     * Checks if an offset was previously set.
-     *
-     * @param int $offset The offset to be checked.
-     *
-     * @return bool
-     */
-    public function offsetExists($offset)
-    {
-        return $offset < $this->count;
-    }
-
-    /**
-     * Unsets the value of an offset.
-     *
-     * @param int $offset The offset to be unset.
-     *
-     * @return void
-     */
-    public function offsetUnset($offset)
-    {
-        unset($this->tokens[$offset]);
-        --$this->count;
-        for ($i = $offset; $i < $this->count; ++$i) {
-            $this->tokens[$i] = $this->tokens[$i + 1];
-        }
-        unset($this->tokens[$this->count]);
-    }
-}
diff --git a/#pma/libraries/sql-parser/src/UtfString.php b/#pma/libraries/sql-parser/src/UtfString.php
deleted file mode 100644
index c7b08d8e..00000000
--- a/#pma/libraries/sql-parser/src/UtfString.php
+++ /dev/null
@@ -1,217 +0,0 @@
-<?php
-
-/**
- * Implementation for UTF-8 strings.
- *
- * The subscript operator in PHP, when used with string will return a byte
- * and not a character. Because in UTF-8 strings a character may occupy more
- * than one byte, the subscript operator may return an invalid character.
- *
- * Because the lexer relies on the subscript operator this class had to be
- * implemented.
- *
- * @package SqlParser
- */
-namespace SqlParser;
-
-/**
- * Implements array-like access for UTF-8 strings.
- *
- * In this library, this class should be used to parse UTF-8 queries.
- *
- * @category Misc
- * @package  SqlParser
- * @license  https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-class UtfString implements \ArrayAccess
-{
-
-    /**
-     * The raw, multi-byte string.
-     *
-     * @var string
-     */
-    public $str = '';
-
-    /**
-     * The index of current byte.
-     *
-     * For ASCII strings, the byte index is equal to the character index.
-     *
-     * @var int
-     */
-    public $byteIdx = 0;
-
-    /**
-     * The index of current character.
-     *
-     * For non-ASCII strings, some characters occupy more than one byte and
-     * the character index will have a lower value than the byte index.
-     *
-     * @var int
-     */
-    public $charIdx = 0;
-
-    /**
-     * The length of the string (in bytes).
-     *
-     * @var int
-     */
-    public $byteLen = 0;
-
-    /**
-     * The length of the string (in characters).
-     *
-     * @var int
-     */
-    public $charLen = 0;
-
-    /**
-     * Constructor.
-     *
-     * @param string $str The string.
-     */
-    public function __construct($str)
-    {
-        $this->str = $str;
-        $this->byteIdx = 0;
-        $this->charIdx = 0;
-        // TODO: `strlen($str)` might return a wrong length when function
-        // overloading is enabled.
-        // https://php.net/manual/ro/mbstring.overload.php
-        $this->byteLen = strlen($str);
-        $this->charLen = mb_strlen($str, 'UTF-8');
-    }
-
-    /**
-     * Checks if the given offset exists.
-     *
-     * @param int $offset The offset to be checked.
-     *
-     * @return bool
-     */
-    public function offsetExists($offset)
-    {
-        return ($offset >= 0) && ($offset < $this->charLen);
-    }
-
-    /**
-     * Gets the character at given offset.
-     *
-     * @param int $offset The offset to be returned.
-     *
-     * @return string
-     */
-    public function offsetGet($offset)
-    {
-        if (($offset < 0) || ($offset >= $this->charLen)) {
-            return null;
-        }
-
-        $delta = $offset - $this->charIdx;
-
-        if ($delta > 0) {
-            // Fast forwarding.
-            while ($delta-- > 0) {
-                $this->byteIdx += static::getCharLength($this->str[$this->byteIdx]);
-                ++$this->charIdx;
-            }
-        } elseif ($delta < 0) {
-            // Rewinding.
-            while ($delta++ < 0) {
-                do {
-                    $byte = ord($this->str[--$this->byteIdx]);
-                } while ((128 <= $byte) && ($byte < 192));
-                --$this->charIdx;
-            }
-        }
-
-        $bytesCount = static::getCharLength($this->str[$this->byteIdx]);
-
-        $ret = '';
-        for ($i = 0; $bytesCount-- > 0; ++$i) {
-            $ret .= $this->str[$this->byteIdx + $i];
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Sets the value of a character.
-     *
-     * @param int    $offset The offset to be set.
-     * @param string $value  The value to be set.
-     *
-     * @throws \Exception Not implemented.
-     *
-     * @return void
-     */
-    public function offsetSet($offset, $value)
-    {
-        throw new \Exception('Not implemented.');
-    }
-
-    /**
-     * Unsets an index.
-     *
-     * @param int $offset The value to be unset.
-     *
-     * @throws \Exception Not implemented.
-     *
-     * @return void
-     */
-    public function offsetUnset($offset)
-    {
-        throw new \Exception('Not implemented.');
-    }
-
-    /**
-     * Gets the length of an UTF-8 character.
-     *
-     * According to RFC 3629, a UTF-8 character can have at most 4 bytes.
-     * However, this implementation supports UTF-8 characters containing up to 6
-     * bytes.
-     *
-     * @param string $byte The byte to be analyzed.
-     *
-     * @see http://tools.ietf.org/html/rfc3629
-     *
-     * @return int
-     */
-    public static function getCharLength($byte)
-    {
-        $byte = ord($byte);
-        if ($byte < 128) {
-            return 1;
-        } elseif ($byte < 224) {
-            return 2;
-        } elseif ($byte < 240) {
-            return 3;
-        } elseif ($byte < 248) {
-            return 4;
-        } elseif ($byte < 252) {
-            return 5; // unofficial
-        }
-        return 6; // unofficial
-    }
-
-    /**
-     * Returns the length in characters of the string.
-     *
-     * @return int
-     */
-    public function length()
-    {
-        return $this->charLen;
-    }
-
-    /**
-     * Returns the contained string.
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->str;
-    }
-}
diff --git a/#pma/libraries/sql-parser/src/Utils/BufferedQuery.php b/#pma/libraries/sql-parser/src/Utils/BufferedQuery.php
deleted file mode 100644
index b1ef46d4..00000000
--- a/#pma/libraries/sql-parser/src/Utils/BufferedQuery.php
+++ /dev/null
@@ -1,416 +0,0 @@
-<?php
-
-/**
- * Buffered query utilities.
- *
- * @package    SqlParser
- * @subpackage Utils
- */
-namespace SqlParser\Utils;
-
-use SqlParser\Context;
-
-/**
- * Buffer query utilities.
- *
- * Implements a specialized lexer used to extract statements from large inputs
- * that are being buffered. After each statement has been extracted, a lexer or
- * a parser may be used.
- *
- * All comments are skipped, with one exception: MySQL commands inside `/*!`.
- *
- * @category   Lexer
- * @package    SqlParser
- * @subpackage Utils
- * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-class BufferedQuery
-{
-
-    // Constants that describe the current status of the parser.
-
-    // A string is being parsed.
-    const STATUS_STRING                 = 16; // 0001 0000
-    const STATUS_STRING_SINGLE_QUOTES   = 17; // 0001 0001
-    const STATUS_STRING_DOUBLE_QUOTES   = 18; // 0001 0010
-    const STATUS_STRING_BACKTICK        = 20; // 0001 0100
-
-    // A comment is being parsed.
-    const STATUS_COMMENT                = 32; // 0010 0000
-    const STATUS_COMMENT_BASH           = 33; // 0010 0001
-    const STATUS_COMMENT_C              = 34; // 0010 0010
-    const STATUS_COMMENT_SQL            = 36; // 0010 0100
-
-    /**
-     * The query that is being processed.
-     *
-     * This field can be modified just by appending to it!
-     *
-     * @var string
-     */
-    public $query = '';
-
-    /**
-     * The options of this parser.
-     *
-     * @var array
-     */
-    public $options = array();
-
-    /**
-     * The last delimiter used.
-     *
-     * @var string
-     */
-    public $delimiter;
-
-    /**
-     * The length of the delimiter.
-     *
-     * @var int
-     */
-    public $delimiterLen;
-
-    /**
-     * The current status of the parser.
-     *
-     * @var int
-     */
-    public $status;
-
-    /**
-     * The last incomplete query that was extracted.
-     *
-     * @var string
-     */
-    public $current = '';
-
-    /**
-     * Constructor.
-     *
-     * @param string $query   The query to be parsed.
-     * @param array  $options The options of this parser.
-     */
-    public function __construct($query = '', array $options = array())
-    {
-        // Merges specified options with defaults.
-        $this->options = array_merge(
-            array(
-
-                /**
-                 * The starting delimiter.
-                 *
-                 * @var string
-                 */
-                'delimiter' => ';',
-
-                /**
-                 * Whether `DELIMITER` statements should be parsed.
-                 *
-                 * @var bool
-                 */
-                'parse_delimiter' => false,
-
-                /**
-                 * Whether a delimiter should be added at the end of the
-                 * statement.
-                 *
-                 * @var bool
-                 */
-                'add_delimiter' => false,
-            ),
-            $options
-        );
-
-        $this->query = $query;
-        $this->setDelimiter($this->options['delimiter']);
-    }
-
-    /**
-     * Sets the delimiter.
-     *
-     * Used to update the length of it too.
-     *
-     * @param string $delimiter
-     */
-    public function setDelimiter($delimiter)
-    {
-        $this->delimiter = $delimiter;
-        $this->delimiterLen = strlen($delimiter);
-    }
-
-    /**
-     * Extracts a statement from the buffer.
-     *
-     * @param bool $end Whether the end of the buffer was reached.
-     *
-     * @return string
-     */
-    public function extract($end = false)
-    {
-        /**
-         * The last parsed position.
-         *
-         * This is statically defined because it is not used outside anywhere
-         * outside this method and there is probably a (minor) performance
-         * improvement to it.
-         *
-         * @var int
-         */
-        static $i = 0;
-
-        if (empty($this->query)) {
-            return false;
-        }
-
-        /**
-         * The length of the buffer.
-         *
-         * @var int $len
-         */
-        $len = strlen($this->query);
-
-        /**
-         * The last index of the string that is going to be parsed.
-         *
-         * There must be a few characters left in the buffer so the parser can
-         * avoid confusing some symbols that may have multiple meanings.
-         *
-         * For example, if the buffer ends in `-` that may be an operator or the
-         * beginning of a comment.
-         *
-         * Another example if the buffer ends in `DELIMITE`. The parser is going
-         * to require a few more characters because that may be a part of the
-         * `DELIMITER` keyword or just a column named `DELIMITE`.
-         *
-         * Those extra characters are required only if there is more data
-         * expected (the end of the buffer was not reached).
-         *
-         * @var int $loopLen
-         */
-        $loopLen = $end ? $len : $len - 16;
-
-        for (; $i < $loopLen; ++$i) {
-            /**
-             * Handling backslash.
-             *
-             * Even if the next character is a special character that should be
-             * treated differently, because of the preceding backslash, it will
-             * be ignored.
-             */
-            if ((($this->status & static::STATUS_COMMENT) == 0) && ($this->query[$i] === '\\')) {
-                $this->current .= $this->query[$i] . $this->query[++$i];
-                continue;
-            }
-
-            /*
-             * Handling special parses statuses.
-             */
-            if ($this->status === static::STATUS_STRING_SINGLE_QUOTES) {
-                // Single-quoted strings like 'foo'.
-                if ($this->query[$i] === '\'') {
-                    $this->status = 0;
-                }
-                $this->current .= $this->query[$i];
-                continue;
-            } elseif ($this->status === static::STATUS_STRING_DOUBLE_QUOTES) {
-                // Double-quoted strings like "bar".
-                if ($this->query[$i] === '"') {
-                    $this->status = 0;
-                }
-                $this->current .= $this->query[$i];
-                continue;
-            } elseif ($this->status === static::STATUS_STRING_BACKTICK) {
-                if ($this->query[$i] === '`') {
-                    $this->status = 0;
-                }
-                $this->current .= $this->query[$i];
-                continue;
-            } elseif (($this->status === static::STATUS_COMMENT_BASH)
-                || ($this->status === static::STATUS_COMMENT_SQL)
-            ) {
-                // Bash-like (#) or SQL-like (-- ) comments end in new line.
-                if ($this->query[$i] === "\n") {
-                    $this->status = 0;
-                }
-                continue;
-            } elseif ($this->status === static::STATUS_COMMENT_C) {
-                // C-like comments end in */.
-                if (($this->query[$i - 1] === '*') && ($this->query[$i] === '/')) {
-                    $this->status = 0;
-                }
-                continue;
-            }
-
-            /*
-             * Checking if a string started.
-             */
-            if ($this->query[$i] === '\'') {
-                $this->status = static::STATUS_STRING_SINGLE_QUOTES;
-                $this->current .= $this->query[$i];
-                continue;
-            } elseif ($this->query[$i] === '"') {
-                $this->status = static::STATUS_STRING_DOUBLE_QUOTES;
-                $this->current .= $this->query[$i];
-                continue;
-            } elseif ($this->query[$i] === '`') {
-                $this->status = static::STATUS_STRING_BACKTICK;
-                $this->current .= $this->query[$i];
-                continue;
-            }
-
-            /*
-             * Checking if a comment started.
-             */
-            if ($this->query[$i] === '#') {
-                $this->status = static::STATUS_COMMENT_BASH;
-                continue;
-            } elseif (($i + 2 < $len)
-                && ($this->query[$i] === '-')
-                && ($this->query[$i + 1] === '-')
-                && (Context::isWhitespace($this->query[$i + 2]))
-            ) {
-                $this->status = static::STATUS_COMMENT_SQL;
-                continue;
-            } elseif (($i + 2 < $len)
-                && ($this->query[$i] === '/')
-                && ($this->query[$i + 1] === '*')
-                && ($this->query[$i + 2] !== '!')
-            ) {
-                $this->status = static::STATUS_COMMENT_C;
-                continue;
-            }
-
-            /*
-             * Handling `DELIMITER` statement.
-             *
-             * The code below basically checks for
-             *     `strtoupper(substr($this->query, $i, 9)) === 'DELIMITER'`
-             *
-             * This optimization makes the code about 3 times faster.
-             *
-             * `DELIMITER` is not being considered a keyword. The only context
-             * it has a special meaning is when it is the beginning of a
-             * statement. This is the reason for the last condition.
-             */
-            if (($i + 9 < $len)
-                && (($this->query[$i    ] === 'D') || ($this->query[$i    ] === 'd'))
-                && (($this->query[$i + 1] === 'E') || ($this->query[$i + 1] === 'e'))
-                && (($this->query[$i + 2] === 'L') || ($this->query[$i + 2] === 'l'))
-                && (($this->query[$i + 3] === 'I') || ($this->query[$i + 3] === 'i'))
-                && (($this->query[$i + 4] === 'M') || ($this->query[$i + 4] === 'm'))
-                && (($this->query[$i + 5] === 'I') || ($this->query[$i + 5] === 'i'))
-                && (($this->query[$i + 6] === 'T') || ($this->query[$i + 6] === 't'))
-                && (($this->query[$i + 7] === 'E') || ($this->query[$i + 7] === 'e'))
-                && (($this->query[$i + 8] === 'R') || ($this->query[$i + 8] === 'r'))
-                && (Context::isWhitespace($this->query[$i + 9]))
-                && (trim($this->current) === '')
-            ) {
-                // Saving the current index to be able to revert any parsing
-                // done in this block.
-                $iBak = $i;
-                $i += 9; // Skipping `DELIMITER`.
-
-                // Skipping whitespaces.
-                while (($i < $len) && (Context::isWhitespace($this->query[$i]))) {
-                    ++$i;
-                }
-
-                // Parsing the delimiter.
-                $delimiter = '';
-                while (($i < $len) && (!Context::isWhitespace($this->query[$i]))) {
-                    $delimiter .= $this->query[$i++];
-                }
-
-                // Checking if the delimiter definition ended.
-                if (($delimiter != '')
-                    && ((($i < $len) && (Context::isWhitespace($this->query[$i])))
-                    || (($i === $len) && ($end)))
-                ) {
-                    // Saving the delimiter.
-                    $this->setDelimiter($delimiter);
-
-                    // Whether this statement should be returned or not.
-                    $ret = '';
-                    if (!empty($this->options['parse_delimiter'])) {
-                        // Appending the `DELIMITER` statement that was just
-                        // found to the current statement.
-                        $ret = trim(
-                            $this->current . ' ' . substr($this->query, $iBak, $i - $iBak)
-                        );
-                    }
-
-                    // Removing the statement that was just extracted from the
-                    // query.
-                    $this->query = substr($this->query, $i);
-                    $i = 0;
-
-                    // Resetting the current statement.
-                    $this->current = '';
-
-                    return $ret;
-                }
-
-                // Incomplete statement. Reverting
-                $i = $iBak;
-                return false;
-            }
-
-            /*
-             * Checking if the current statement finished.
-             *
-             * The first letter of the delimiter is being checked as an
-             * optimization. This code is almost as fast as the one above.
-             *
-             * There is no point in checking if two strings match if not even
-             * the first letter matches.
-             */
-            if (($this->query[$i] === $this->delimiter[0])
-                && (($this->delimiterLen === 1)
-                || (substr($this->query, $i, $this->delimiterLen) === $this->delimiter))
-            ) {
-                // Saving the statement that just ended.
-                $ret = $this->current;
-
-                // If needed, adds a delimiter at the end of the statement.
-                if (!empty($this->options['add_delimiter'])) {
-                    $ret .= $this->delimiter;
-                }
-
-                // Removing the statement that was just extracted from the
-                // query.
-                $this->query = substr($this->query, $i + $this->delimiterLen);
-                $i = 0;
-
-                // Resetting the current statement.
-                $this->current = '';
-
-                // Returning the statement.
-                return trim($ret);
-            }
-
-            /*
-             * Appending current character to current statement.
-             */
-            $this->current .= $this->query[$i];
-        }
-
-        if (($end) && ($i === $len)) {
-            // If the end of the buffer was reached, the buffer is emptied and
-            // the current statement that was extracted is returned.
-            $ret = $this->current;
-
-            // Emptying the buffer.
-            $this->query = '';
-            $i = 0;
-
-            // Resetting the current statement.
-            $this->current = '';
-
-            // Returning the statement.
-            return trim($ret);
-        }
-
-        return '';
-    }
-}
diff --git a/#pma/libraries/sql-parser/src/Utils/CLI.php b/#pma/libraries/sql-parser/src/Utils/CLI.php
deleted file mode 100644
index 9ec7b853..00000000
--- a/#pma/libraries/sql-parser/src/Utils/CLI.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-
-/**
- * CLI interface
- *
- * @package    SqlParser
- * @subpackage Utils
- */
-namespace SqlParser\Utils;
-
-use SqlParser\Parser;
-use SqlParser\Lexer;
-
-/**
- * CLI interface
- *
- * @category   Exceptions
- * @package    SqlParser
- * @subpackage Utils
- * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-class CLI
-{
-    public function mergeLongOpts(&$params, &$longopts)
-    {
-        foreach ($longopts as $value) {
-            $value = rtrim($value, ':');
-            if (isset($params[$value])) {
-                $params[$value[0]] = $params[$value];
-            }
-        }
-    }
-
-    public function usageHighlight()
-    {
-        echo "Usage: highlight-query --query SQL [--format html|cli|text]\n";
-    }
-
-    public function getopt($opt, $long)
-    {
-        return getopt($opt, $long);
-    }
-
-    public function parseHighlight()
-    {
-        $longopts = array('help', 'query:', 'format:');
-        $params = $this->getopt(
-            'hq:f:', $longopts
-        );
-        if ($params === false) {
-            return false;
-        }
-        $this->mergeLongOpts($params, $longopts);
-        if (! isset($params['f'])) {
-            $params['f'] = 'cli';
-        }
-        if (! in_array($params['f'], array('html', 'cli', 'text'))) {
-            echo "ERROR: Invalid value for format!\n";
-            return false;
-        }
-        return $params;
-    }
-
-    public function runHighlight()
-    {
-        $params = $this->parseHighlight();
-        if ($params === false) {
-            return 1;
-        }
-        if (isset($params['h'])) {
-            $this->usageHighlight();
-            return 0;
-        }
-        if (isset($params['q'])) {
-            echo Formatter::format(
-                $params['q'], array('type' => $params['f'])
-            );
-            echo "\n";
-            return 0;
-        }
-        echo "ERROR: Missing parameters!\n";
-        $this->usageHighlight();
-        return 1;
-    }
-
-    public function usageLint()
-    {
-        echo "Usage: lint-query --query SQL\n";
-    }
-
-    public function parseLint()
-    {
-        $longopts = array('help', 'query:');
-        $params = $this->getopt(
-            'hq:', $longopts
-        );
-        $this->mergeLongOpts($params, $longopts);
-        return $params;
-    }
-
-    public function runLint()
-    {
-        $params = $this->parseLint();
-        if ($params === false) {
-            return 1;
-        }
-        if (isset($params['h'])) {
-            $this->usageLint();
-            return 0;
-        }
-        if (isset($params['q'])) {
-            $lexer = new Lexer($params['q'], false);
-            $parser = new Parser($lexer->list);
-            $errors = Error::get(array($lexer, $parser));
-            if (count($errors) == 0) {
-                return 0;
-            }
-            $output = Error::format($errors);
-            echo implode("\n", $output);
-            echo "\n";
-            return 10;
-        }
-        echo "ERROR: Missing parameters!\n";
-        $this->usageLint();
-        return 1;
-    }
-}
diff --git a/#pma/libraries/sql-parser/src/Utils/Error.php b/#pma/libraries/sql-parser/src/Utils/Error.php
deleted file mode 100644
index 2e942c44..00000000
--- a/#pma/libraries/sql-parser/src/Utils/Error.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-
-/**
- * Error related utilities.
- *
- * @package    SqlParser
- * @subpackage Utils
- */
-namespace SqlParser\Utils;
-
-use SqlParser\Lexer;
-use SqlParser\Parser;
-
-/**
- * Error related utilities.
- *
- * @category   Exceptions
- * @package    SqlParser
- * @subpackage Utils
- * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-class Error
-{
-
-    /**
-     * Gets the errors of a lexer and a parser.
-     *
-     * @param array $objs Objects from where the errors will be extracted.
-     *
-     * @return array Each element of the array represents an error.
-     *                    `$err[0]` holds the error message.
-     *                    `$err[1]` holds the error code.
-     *                    `$err[2]` holds the string that caused the issue.
-     *                    `$err[3]` holds the position of the string.
-     *                    (i.e. `array($msg, $code, $str, $pos)`)
-     */
-    public static function get($objs)
-    {
-        $ret = array();
-
-        foreach ($objs as $obj) {
-            if ($obj instanceof Lexer) {
-                foreach ($obj->errors as $err) {
-                    $ret[] = array(
-                        $err->getMessage(),
-                        $err->getCode(),
-                        $err->ch,
-                        $err->pos
-                    );
-                }
-            } elseif ($obj instanceof Parser) {
-                foreach ($obj->errors as $err) {
-                    $ret[] = array(
-                        $err->getMessage(),
-                        $err->getCode(),
-                        $err->token->token,
-                        $err->token->position
-                    );
-                }
-            }
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Formats the specified errors
-     *
-     * @param  array  $errors The errors to be formatted.
-     * @param  string $format The format of an error.
-     *                         '$1$d' is replaced by the position of this error.
-     *                         '$2$s' is replaced by the error message.
-     *                         '$3$d' is replaced by the error code.
-     *                         '$4$s' is replaced by the string that caused the
-     *                                issue.
-     *                         '$5$d' is replaced by the position of the string.
-     * @return array
-     */
-    public static function format(
-        $errors,
-        $format = '#%1$d: %2$s (near "%4$s" at position %5$d)'
-    ) {
-        $ret = array();
-
-        $i = 0;
-        foreach ($errors as $key => $err) {
-            $ret[$key] = sprintf(
-                $format,
-                ++$i,
-                $err[0],
-                $err[1],
-                htmlspecialchars($err[2]),
-                $err[3]
-            );
-        }
-
-        return $ret;
-    }
-}
diff --git a/#pma/libraries/sql-parser/src/Utils/Formatter.php b/#pma/libraries/sql-parser/src/Utils/Formatter.php
deleted file mode 100644
index bcf54862..00000000
--- a/#pma/libraries/sql-parser/src/Utils/Formatter.php
+++ /dev/null
@@ -1,573 +0,0 @@
-<?php
-
-/**
- * Utilities that are used for formatting queries.
- *
- * @package    SqlParser
- * @subpackage Utils
- */
-namespace SqlParser\Utils;
-
-use SqlParser\Lexer;
-use SqlParser\Parser;
-use SqlParser\Token;
-use SqlParser\TokensList;
-
-/**
- * Utilities that are used for formatting queries.
- *
- * @category   Misc
- * @package    SqlParser
- * @subpackage Utils
- * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-class Formatter
-{
-
-    /**
-     * The formatting options.
-     *
-     * @var array
-     */
-    public $options;
-
-    /**
-     * Clauses that must be inlined.
-     *
-     * These clauses usually are short and it's nicer to have them inline.
-     *
-     * @var array
-     */
-    public static $INLINE_CLAUSES = array(
-        'CREATE'                        => true,
-        'LIMIT'                         => true,
-        'PARTITION BY'                  => true,
-        'PARTITION'                     => true,
-        'PROCEDURE'                     => true,
-        'SUBPARTITION BY'               => true,
-        'VALUES'                        => true,
-    );
-
-    /**
-     * Constructor.
-     *
-     * @param array $options The formatting options.
-     */
-    public function __construct(array $options = array())
-    {
-        // The specified formatting options are merged with the default values.
-        $this->options = array_merge(
-            array(
-
-                /**
-                 * The format of the result.
-                 *
-                 * @var string The type ('text', 'cli' or 'html')
-                 */
-                'type' => php_sapi_name() == 'cli' ? 'cli' : 'text',
-
-                /**
-                 * The line ending used.
-                 * By default, for text this is "\n" and for HTML this is "<br/>".
-                 *
-                 * @var string
-                 */
-                'line_ending' => NULL,
-
-                /**
-                 * The string used for indentation.
-                 *
-                 * @var string
-                 */
-                'indentation' => '  ',
-
-                /**
-                 * Whether comments should be removed or not.
-                 *
-                 * @var bool
-                 */
-                'remove_comments' => false,
-
-                /**
-                 * Whether each clause should be on a new line.
-                 *
-                 * @var bool
-                 */
-                'clause_newline' => true,
-
-                /**
-                 * Whether each part should be on a new line.
-                 * Parts are delimited by brackets and commas.
-                 *
-                 * @var bool
-                 */
-                'parts_newline' => true,
-
-                /**
-                 * Whether each part of each clause should be indented.
-                 *
-                 * @var bool
-                 */
-                'indent_parts' => true,
-
-                /**
-                 * The styles used for HTML formatting.
-                 * array($type, $flags, $span, $callback)
-                 *
-                 * @var array[]
-                 */
-                'formats' => array(
-                    array(
-                        'type'      => Token::TYPE_KEYWORD,
-                        'flags'     => Token::FLAG_KEYWORD_RESERVED,
-                        'html'      => 'class="sql-reserved"',
-                        'cli'       => "\x1b[35m",
-                        'function'  => 'strtoupper',
-                    ),
-                    array(
-                        'type'      => Token::TYPE_KEYWORD,
-                        'flags'     => 0,
-                        'html'      => 'class="sql-keyword"',
-                        'cli'       => "\x1b[95m",
-                        'function'  => 'strtoupper',
-                    ),
-                    array(
-                        'type'      => Token::TYPE_COMMENT,
-                        'flags'     => 0,
-                        'html'      => 'class="sql-comment"',
-                        'cli'       => "\x1b[37m",
-                        'function'  => '',
-                    ),
-                    array(
-                        'type'      => Token::TYPE_BOOL,
-                        'flags'     => 0,
-                        'html'      => 'class="sql-atom"',
-                        'cli'       => "\x1b[36m",
-                        'function'  => 'strtoupper',
-                    ),
-                    array(
-                        'type'      => Token::TYPE_NUMBER,
-                        'flags'     => 0,
-                        'html'      => 'class="sql-number"',
-                        'cli'       => "\x1b[92m",
-                        'function'  => 'strtolower',
-                    ),
-                    array(
-                        'type'      => Token::TYPE_STRING,
-                        'flags'     => 0,
-                        'html'      => 'class="sql-string"',
-                        'cli'       => "\x1b[91m",
-                        'function'  => '',
-                    ),
-                    array(
-                        'type'      => Token::TYPE_SYMBOL,
-                        'flags'     => 0,
-                        'html'      => 'class="sql-variable"',
-                        'cli'       => "\x1b[36m",
-                        'function'  => '',
-                    ),
-                )
-            ),
-            $options
-        );
-
-        if (is_null($this->options['line_ending'])) {
-            $this->options['line_ending'] = $this->options['type'] == 'html' ? '<br/>' : "\n";
-        }
-
-        // `parts_newline` requires `clause_newline`
-        $this->options['parts_newline'] &= $this->options['clause_newline'];
-    }
-
-    /**
-     * Formats the given list of tokens.
-     *
-     * @param TokensList $list The list of tokens.
-     *
-     * @return string
-     */
-    public function formatList($list)
-    {
-
-        /**
-         * The query to be returned.
-         *
-         * @var string $ret
-         */
-        $ret = '';
-
-        /**
-         * The indentation level.
-         *
-         * @var int $indent
-         */
-        $indent = 0;
-
-        /**
-         * Whether the line ended.
-         *
-         * @var bool $lineEnded
-         */
-        $lineEnded = false;
-
-        /**
-         * Whether current group is short (no linebreaks)
-         *
-         * @var bool $shortGroup
-         */
-        $shortGroup = false;
-
-        /**
-         * The name of the last clause.
-         *
-         * @var string $lastClause
-         */
-        $lastClause = '';
-
-        /**
-         * A stack that keeps track of the indentation level every time a new
-         * block is found.
-         *
-         * @var array $blocksIndentation
-         */
-        $blocksIndentation = array();
-
-        /**
-         * A stack that keeps track of the line endings every time a new block
-         * is found.
-         *
-         * @var array $blocksLineEndings
-         */
-        $blocksLineEndings = array();
-
-        /**
-         * Whether clause's options were formatted.
-         *
-         * @var bool $formattedOptions
-         */
-        $formattedOptions = false;
-
-        /**
-         * Previously parsed token.
-         *
-         * @var Token $prev
-         */
-        $prev = null;
-
-        /**
-         * Comments are being formatted separately to maintain the whitespaces
-         * before and after them.
-         *
-         * @var string $comment
-         */
-        $comment = '';
-
-        // In order to be able to format the queries correctly, the next token
-        // must be taken into consideration. The loop below uses two pointers,
-        // `$prev` and `$curr` which store two consecutive tokens.
-        // Actually, at every iteration the previous token is being used.
-        for ($list->idx = 0; $list->idx < $list->count; ++$list->idx) {
-            /**
-             * Token parsed at this moment.
-             *
-             * @var Token $curr
-             */
-            $curr = $list->tokens[$list->idx];
-
-            if ($curr->type === Token::TYPE_WHITESPACE) {
-                // Whitespaces are skipped because the formatter adds its own.
-                continue;
-            } elseif ($curr->type === Token::TYPE_COMMENT) {
-                // Whether the comments should be parsed.
-                if (!empty($this->options['remove_comments'])) {
-                    continue;
-                }
-
-                if ($list->tokens[$list->idx - 1]->type === Token::TYPE_WHITESPACE) {
-                    // The whitespaces before and after are preserved for
-                    // formatting reasons.
-                    $comment .= $list->tokens[$list->idx - 1]->token;
-                }
-                $comment .= $this->toString($curr);
-                if (($list->tokens[$list->idx + 1]->type === Token::TYPE_WHITESPACE)
-                    && ($list->tokens[$list->idx + 2]->type !== Token::TYPE_COMMENT)
-                ) {
-                    // Adding the next whitespace only there is no comment that
-                    // follows it immediately which may cause adding a
-                    // whitespace twice.
-                    $comment .= $list->tokens[$list->idx + 1]->token;
-                }
-
-                // Everything was handled here, no need to continue.
-                continue;
-            }
-
-            // Checking if pointers were initialized.
-            if ($prev !== null) {
-                // Checking if a new clause started.
-                if (static::isClause($prev) !== false) {
-                    $lastClause = $prev->value;
-                    $formattedOptions = false;
-                }
-
-                // The options of a clause should stay on the same line and everything that follows.
-                if (($this->options['parts_newline'])
-                    && (!$formattedOptions)
-                    && (empty(self::$INLINE_CLAUSES[$lastClause]))
-                    && (($curr->type !== Token::TYPE_KEYWORD)
-                    || (($curr->type === Token::TYPE_KEYWORD)
-                    && ($curr->flags & Token::FLAG_KEYWORD_FUNCTION)))
-                ) {
-                    $formattedOptions = true;
-                    $lineEnded = true;
-                    ++$indent;
-                }
-
-                // Checking if this clause ended.
-                if ($tmp = static::isClause($curr)) {
-                    if (($tmp == 2) || ($this->options['clause_newline'])) {
-                        $lineEnded = true;
-                        if ($this->options['parts_newline']) {
-                            --$indent;
-                        }
-                    }
-                }
-
-                // Indenting BEGIN ... END blocks.
-                if (($prev->type === Token::TYPE_KEYWORD) && ($prev->value === 'BEGIN')) {
-                    $lineEnded = true;
-                    array_push($blocksIndentation, $indent);
-                    ++$indent;
-                } elseif (($curr->type === Token::TYPE_KEYWORD) && ($curr->value === 'END')) {
-                    $lineEnded = true;
-                    $indent = array_pop($blocksIndentation);
-                }
-
-                // Formatting fragments delimited by comma.
-                if (($prev->type === Token::TYPE_OPERATOR) && ($prev->value === ',')) {
-                    // Fragments delimited by a comma are broken into multiple
-                    // pieces only if the clause is not inlined or this fragment
-                    // is between brackets that are on new line.
-                    if (((empty(self::$INLINE_CLAUSES[$lastClause]))
-                        && ! $shortGroup
-                        && ($this->options['parts_newline']))
-                        || (end($blocksLineEndings) === true)
-                    ) {
-                        $lineEnded = true;
-                    }
-                }
-
-                // Handling brackets.
-                // Brackets are indented only if the length of the fragment between
-                // them is longer than 30 characters.
-                if (($prev->type === Token::TYPE_OPERATOR) && ($prev->value === '(')) {
-                    array_push($blocksIndentation, $indent);
-                    $shortGroup = true;
-                    if (static::getGroupLength($list) > 30) {
-                        ++$indent;
-                        $lineEnded = true;
-                        $shortGroup = false;
-                    }
-                    array_push($blocksLineEndings, $lineEnded);
-                } elseif (($curr->type === Token::TYPE_OPERATOR) && ($curr->value === ')')) {
-                    $indent = array_pop($blocksIndentation);
-                    $lineEnded |= array_pop($blocksLineEndings);
-                    $shortGroup = false;
-                }
-
-                // Delimiter must be placed on the same line with the last
-                // clause.
-                if ($curr->type === Token::TYPE_DELIMITER) {
-                    $lineEnded = false;
-                }
-
-                // Adding the token.
-                $ret .= $this->toString($prev);
-
-                // Finishing the line.
-                if ($lineEnded) {
-                    if ($indent < 0) {
-                        // TODO: Make sure this never occurs and delete it.
-                        $indent = 0;
-                    }
-
-                    if ($curr->type !== Token::TYPE_COMMENT) {
-                        $ret .= $this->options['line_ending']
-                            . str_repeat($this->options['indentation'], $indent);
-                    }
-                    $lineEnded = false;
-                } else {
-                    // If the line ended there is no point in adding whitespaces.
-                    // Also, some tokens do not have spaces before or after them.
-                    if (!((($prev->type === Token::TYPE_OPERATOR) && (($prev->value === '.') || ($prev->value === '(')))
-                        // No space after . (
-                        || (($curr->type === Token::TYPE_OPERATOR) && (($curr->value === '.') || ($curr->value === ',')
-                        || ($curr->value === '(') || ($curr->value === ')')))
-                        // No space before . , ( )
-                        || (($curr->type === Token::TYPE_DELIMITER)) && (mb_strlen($curr->value, 'UTF-8') < 2))
-                        // A space after delimiters that are longer than 2 characters.
-                        || ($prev->value === 'DELIMITER')
-                    ) {
-                        $ret .= ' ';
-                    }
-                }
-            }
-
-            if (!empty($comment)) {
-                $ret .= $comment;
-                $comment = '';
-            }
-
-            // Iteration finished, consider current token as previous.
-            $prev = $curr;
-        }
-
-        if ($this->options['type'] === 'cli') {
-            return $ret . "\x1b[0m";
-        }
-
-        return $ret;
-    }
-
-    public function escapeConsole($string)
-    {
-        return str_replace(
-            array(
-                "\x00", "\x01", "\x02", "\x03", "\x04",
-                "\x05", "\x06", "\x07", "\x08", "\x09", "\x0A",
-                "\x0B","\x0C","\x0D", "\x0E", "\x0F", "\x10", "\x11",
-                "\x12","\x13","\x14","\x15", "\x16", "\x17", "\x18",
-                "\x19","\x1A","\x1B","\x1C","\x1D", "\x1E", "\x1F"
-            ),
-            array(
-                '\x00', '\x01', '\x02', '\x03', '\x04',
-                '\x05', '\x06', '\x07', '\x08', '\x09', '\x0A',
-                '\x0B', '\x0C', '\x0D', '\x0E', '\x0F', '\x10', '\x11',
-                '\x12', '\x13', '\x14', '\x15', '\x16', '\x17', '\x18',
-                '\x19', '\x1A', '\x1B', '\x1C', '\x1D', '\x1E', '\x1F'
-            ),
-            $string
-        );
-    }
-
-    /**
-     * Tries to print the query and returns the result.
-     *
-     * @param Token $token The token to be printed.
-     *
-     * @return string
-     */
-    public function toString($token)
-    {
-        $text = $token->token;
-
-        foreach ($this->options['formats'] as $format) {
-            if (($token->type === $format['type'])
-                && (($token->flags & $format['flags']) === $format['flags'])
-            ) {
-                // Running transformation function.
-                if (!empty($format['function'])) {
-                    $func = $format['function'];
-                    $text = $func($text);
-                }
-
-                // Formatting HTML.
-                if ($this->options['type'] === 'html') {
-                    return '<span ' . $format['html'] . '>' . htmlspecialchars($text, ENT_NOQUOTES) . '</span>';
-                } elseif ($this->options['type'] === 'cli') {
-                    return $format['cli'] . $this->escapeConsole($text);
-                }
-
-                break;
-            }
-        }
-
-        if ($this->options['type'] === 'cli') {
-            return "\x1b[39m" . $this->escapeConsole($text);
-        } elseif ($this->options['type'] === 'html') {
-            return htmlspecialchars($text, ENT_NOQUOTES);
-        }
-    }
-
-    /**
-     * Formats a query.
-     *
-     * @param string $query   The query to be formatted
-     * @param array  $options The formatting options.
-     *
-     * @return string          The formatted string.
-     */
-    public static function format($query, array $options = array())
-    {
-        $lexer = new Lexer($query);
-        $formatter = new Formatter($options);
-        return $formatter->formatList($lexer->list);
-    }
-
-    /**
-     * Computes the length of a group.
-     *
-     * A group is delimited by a pair of brackets.
-     *
-     * @param TokensList $list The list of tokens.
-     *
-     * @return int
-     */
-    public static function getGroupLength($list)
-    {
-        /**
-         * The number of opening brackets found.
-         * This counter starts at one because by the time this function called,
-         * the list already advanced one position and the opening bracket was
-         * already parsed.
-         *
-         * @var int $count
-         */
-        $count = 1;
-
-        /**
-         * The length of this group.
-         *
-         * @var int $length
-         */
-        $length = 0;
-
-        for ($idx = $list->idx; $idx < $list->count; ++$idx) {
-            // Counting the brackets.
-            if ($list->tokens[$idx]->type === Token::TYPE_OPERATOR) {
-                if ($list->tokens[$idx]->value === '(') {
-                    ++$count;
-                } elseif ($list->tokens[$idx]->value === ')') {
-                    --$count;
-                    if ($count == 0) {
-                        break;
-                    }
-                }
-            }
-
-            // Keeping track of this group's length.
-            $length += mb_strlen($list->tokens[$idx]->value, 'UTF-8');
-        }
-
-        return $length;
-    }
-
-    /**
-     * Checks if a token is a statement or a clause inside a statement.
-     *
-     * @param Token $token The token to be checked.
-     *
-     * @return int|bool
-     */
-    public static function isClause($token)
-    {
-        if ((($token->type === Token::TYPE_NONE) && (strtoupper($token->token) === 'DELIMITER'))
-            || (($token->type === Token::TYPE_KEYWORD) && (isset(Parser::$STATEMENT_PARSERS[$token->value])))
-        ) {
-            return 2;
-        } elseif (($token->type === Token::TYPE_KEYWORD) && (isset(Parser::$KEYWORD_PARSERS[$token->value]))) {
-            return 1;
-        }
-        return false;
-    }
-}
diff --git a/#pma/libraries/sql-parser/src/Utils/Misc.php b/#pma/libraries/sql-parser/src/Utils/Misc.php
deleted file mode 100644
index 8166c458..00000000
--- a/#pma/libraries/sql-parser/src/Utils/Misc.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-
-/**
- * Miscellaneous utilities.
- *
- * @package    SqlParser
- * @subpackage Utils
- */
-namespace SqlParser\Utils;
-
-use SqlParser\Components\Expression;
-use SqlParser\Statements\SelectStatement;
-
-/**
- * Miscellaneous utilities.
- *
- * @category   Misc
- * @package    SqlParser
- * @subpackage Utils
- * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-class Misc
-{
-
-    /**
-     * Gets a list of all aliases and their original names.
-     *
-     * @param SelectStatement $statement The statement to be processed.
-     * @param string          $database  The name of the database.
-     *
-     * @return array
-     */
-    public static function getAliases($statement, $database)
-    {
-        if (!($statement instanceof SelectStatement)
-            || (empty($statement->expr))
-            || (empty($statement->from))
-        ) {
-            return array();
-        }
-
-        $retval = array();
-
-        $tables = array();
-
-        /**
-         * Expressions that may contain aliases.
-         * These are extracted from `FROM` and `JOIN` keywords.
-         *
-         * @var Expression[] $expressions
-         */
-        $expressions = $statement->from;
-
-        // Adding expressions from JOIN.
-        if (!empty($statement->join)) {
-            foreach ($statement->join as $join) {
-                $expressions[] = $join->expr;
-            }
-        }
-
-        foreach ($expressions as $expr) {
-            if ((!isset($expr->table)) || ($expr->table === '')) {
-                continue;
-            }
-
-            $thisDb = ((isset($expr->database)) && ($expr->database !== '')) ?
-                $expr->database : $database;
-
-            if (!isset($retval[$thisDb])) {
-                $retval[$thisDb] = array(
-                    'alias' => null,
-                    'tables' => array(),
-                );
-            }
-
-            if (!isset($retval[$thisDb]['tables'][$expr->table])) {
-                $retval[$thisDb]['tables'][$expr->table] = array(
-                    'alias' => ((isset($expr->alias)) && ($expr->alias !== '')) ?
-                        $expr->alias : null,
-                    'columns' => array(),
-                );
-            }
-
-            if (!isset($tables[$thisDb])) {
-                $tables[$thisDb] = array();
-            }
-            $tables[$thisDb][$expr->alias] = $expr->table;
-        }
-
-        foreach ($statement->expr as $expr) {
-            if ((!isset($expr->column)) || ($expr->column === '')
-                || (!isset($expr->alias)) || ($expr->alias === '')
-            ) {
-                continue;
-            }
-
-            $thisDb = ((isset($expr->database)) && ($expr->database !== '')) ?
-                $expr->database : $database;
-
-            if ((isset($expr->table)) && ($expr->table !== '')) {
-                $thisTable = isset($tables[$thisDb][$expr->table]) ?
-                    $tables[$thisDb][$expr->table] : $expr->table;
-                $retval[$thisDb]['tables'][$thisTable]['columns'][$expr->column] = $expr->alias;
-            } else {
-                foreach ($retval[$thisDb]['tables'] as &$table) {
-                    $table['columns'][$expr->column] = $expr->alias;
-                }
-            }
-        }
-
-        return $retval;
-    }
-}
diff --git a/#pma/libraries/sql-parser/src/Utils/Query.php b/#pma/libraries/sql-parser/src/Utils/Query.php
deleted file mode 100644
index 4d66a90a..00000000
--- a/#pma/libraries/sql-parser/src/Utils/Query.php
+++ /dev/null
@@ -1,840 +0,0 @@
-<?php
-
-/**
- * Statement utilities.
- *
- * @package    SqlParser
- * @subpackage Utils
- */
-namespace SqlParser\Utils;
-
-use SqlParser\Lexer;
-use SqlParser\Parser;
-use SqlParser\Statement;
-use SqlParser\Token;
-use SqlParser\TokensList;
-use SqlParser\Components\Expression;
-use SqlParser\Statements\AlterStatement;
-use SqlParser\Statements\AnalyzeStatement;
-use SqlParser\Statements\CallStatement;
-use SqlParser\Statements\CheckStatement;
-use SqlParser\Statements\ChecksumStatement;
-use SqlParser\Statements\CreateStatement;
-use SqlParser\Statements\DeleteStatement;
-use SqlParser\Statements\DropStatement;
-use SqlParser\Statements\ExplainStatement;
-use SqlParser\Statements\InsertStatement;
-use SqlParser\Statements\OptimizeStatement;
-use SqlParser\Statements\RenameStatement;
-use SqlParser\Statements\RepairStatement;
-use SqlParser\Statements\ReplaceStatement;
-use SqlParser\Statements\SelectStatement;
-use SqlParser\Statements\ShowStatement;
-use SqlParser\Statements\TruncateStatement;
-use SqlParser\Statements\UpdateStatement;
-
-/**
- * Statement utilities.
- *
- * @category   Statement
- * @package    SqlParser
- * @subpackage Utils
- * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-class Query
-{
-
-    /**
-     * Functions that set the flag `is_func`.
-     *
-     * @var array
-     */
-    public static $FUNCTIONS = array(
-        'SUM', 'AVG', 'STD', 'STDDEV', 'MIN', 'MAX', 'BIT_OR', 'BIT_AND'
-    );
-
-    /**
-     * Gets an array with flags this statement has.
-     *
-     * @param Statement|null $statement The statement to be processed.
-     * @param bool           $all       If `false`, false values will not be included.
-     *
-     * @return array
-     */
-    public static function getFlags($statement, $all = false)
-    {
-        $flags = array();
-        if ($all) {
-            $flags = array(
-
-                /**
-                 * select ... DISTINCT ...
-                 */
-                'distinct'      => false,
-
-                /**
-                 * drop ... DATABASE ...
-                 */
-                'drop_database' => false,
-
-                /**
-                 * ... GROUP BY ...
-                 */
-                'group'         => false,
-
-                /**
-                 * ... HAVING ...
-                 */
-                'having'        => false,
-
-                /**
-                 * INSERT ...
-                 * or
-                 * REPLACE ...
-                 * or
-                 * DELETE ...
-                 */
-                'is_affected'   => false,
-
-                /**
-                 * select ... PROCEDURE ANALYSE( ... ) ...
-                 */
-                'is_analyse'    => false,
-
-                /**
-                 * select COUNT( ... ) ...
-                 */
-                'is_count'      => false,
-
-                /**
-                 * DELETE ...
-                 */
-                'is_delete'     => false, // @deprecated; use `querytype`
-
-                /**
-                 * EXPLAIN ...
-                 */
-                'is_explain'    => false, // @deprecated; use `querytype`
-
-                /**
-                 * select ... INTO OUTFILE ...
-                 */
-                'is_export'     => false,
-
-                /**
-                 * select FUNC( ... ) ...
-                 */
-                'is_func'       => false,
-
-                /**
-                 * select ... GROUP BY ...
-                 * or
-                 * select ... HAVING ...
-                 */
-                'is_group'      => false,
-
-                /**
-                 * INSERT ...
-                 * or
-                 * REPLACE ...
-                 * or
-                 * TODO: LOAD DATA ...
-                 */
-                'is_insert'     => false,
-
-                /**
-                 * ANALYZE ...
-                 * or
-                 * CHECK ...
-                 * or
-                 * CHECKSUM ...
-                 * or
-                 * OPTIMIZE ...
-                 * or
-                 * REPAIR ...
-                 */
-                'is_maint'      => false,
-
-                /**
-                 * CALL ...
-                 */
-                'is_procedure'  => false,
-
-                /**
-                 * REPLACE ...
-                 */
-                'is_replace'    => false, // @deprecated; use `querytype`
-
-                /**
-                 * SELECT ...
-                 */
-                'is_select'     => false, // @deprecated; use `querytype`
-
-                /**
-                 * SHOW ...
-                 */
-                'is_show'       => false, // @deprecated; use `querytype`
-
-                /**
-                 * Contains a subquery.
-                 */
-                'is_subquery'   => false,
-
-                /**
-                 * ... JOIN ...
-                 */
-                'join'          => false,
-
-                /**
-                 * ... LIMIT ...
-                 */
-                'limit'         => false,
-
-                /**
-                 * TODO
-                 */
-                'offset'        => false,
-
-                /**
-                 * ... ORDER ...
-                 */
-                'order'         => false,
-
-                /**
-                 * The type of the query (which is usually the first keyword of
-                 * the statement).
-                 */
-                'querytype'     => false,
-
-                /**
-                 * Whether a page reload is required.
-                 */
-                'reload'        => false,
-
-                /**
-                 * SELECT ... FROM ...
-                 */
-                'select_from'   => false,
-
-                /**
-                 * ... UNION ...
-                 */
-                'union'         => false
-            );
-        }
-
-        if ($statement instanceof AlterStatement) {
-            $flags['querytype'] = 'ALTER';
-            $flags['reload'] = true;
-        } elseif ($statement instanceof CreateStatement) {
-            $flags['querytype'] = 'CREATE';
-            $flags['reload'] = true;
-        } elseif ($statement instanceof AnalyzeStatement) {
-            $flags['querytype'] = 'ANALYZE';
-            $flags['is_maint'] = true;
-        } elseif ($statement instanceof CheckStatement) {
-            $flags['querytype'] = 'CHECK';
-            $flags['is_maint'] = true;
-        } elseif ($statement instanceof ChecksumStatement) {
-            $flags['querytype'] = 'CHECKSUM';
-            $flags['is_maint'] = true;
-        } elseif ($statement instanceof OptimizeStatement) {
-            $flags['querytype'] = 'OPTIMIZE';
-            $flags['is_maint'] = true;
-        } elseif ($statement instanceof RepairStatement) {
-            $flags['querytype'] = 'REPAIR';
-            $flags['is_maint'] = true;
-        } elseif ($statement instanceof CallStatement) {
-            $flags['querytype'] = 'CALL';
-            $flags['is_procedure'] = true;
-        } elseif ($statement instanceof DeleteStatement) {
-            $flags['querytype'] = 'DELETE';
-            $flags['is_delete'] = true;
-            $flags['is_affected'] = true;
-        } elseif ($statement instanceof DropStatement) {
-            $flags['querytype'] = 'DROP';
-            $flags['reload'] = true;
-
-            if (($statement->options->has('DATABASE')
-                || ($statement->options->has('SCHEMA')))
-            ) {
-                $flags['drop_database'] = true;
-            }
-        } elseif ($statement instanceof ExplainStatement) {
-            $flags['querytype'] = 'EXPLAIN';
-            $flags['is_explain'] = true;
-        } elseif ($statement instanceof InsertStatement) {
-            $flags['querytype'] = 'INSERT';
-            $flags['is_affected'] = true;
-            $flags['is_insert'] = true;
-        } elseif ($statement instanceof ReplaceStatement) {
-            $flags['querytype'] = 'REPLACE';
-            $flags['is_affected'] = true;
-            $flags['is_replace'] = true;
-            $flags['is_insert'] = true;
-        } elseif ($statement instanceof SelectStatement) {
-            $flags['querytype'] = 'SELECT';
-            $flags['is_select'] = true;
-
-            if (!empty($statement->from)) {
-                $flags['select_from'] = true;
-            }
-
-            if ($statement->options->has('DISTINCT')) {
-                $flags['distinct'] = true;
-            }
-
-            if ((!empty($statement->group)) || (!empty($statement->having))) {
-                $flags['is_group'] = true;
-            }
-
-            if ((!empty($statement->into))
-                && ($statement->into->type === 'OUTFILE')
-            ) {
-                $flags['is_export'] = true;
-            }
-
-            $expressions = $statement->expr;
-            if (!empty($statement->join)) {
-                foreach ($statement->join as $join) {
-                    $expressions[] = $join->expr;
-                }
-            }
-
-            foreach ($expressions as $expr) {
-                if (!empty($expr->function)) {
-                    if ($expr->function === 'COUNT') {
-                        $flags['is_count'] = true;
-                    } elseif (in_array($expr->function, static::$FUNCTIONS)) {
-                        $flags['is_func'] = true;
-                    }
-                }
-                if (!empty($expr->subquery)) {
-                    $flags['is_subquery'] = true;
-                }
-            }
-
-            if ((!empty($statement->procedure))
-                && ($statement->procedure->name === 'ANALYSE')
-            ) {
-                $flags['is_analyse'] = true;
-            }
-
-            if (!empty($statement->group)) {
-                $flags['group'] = true;
-            }
-
-            if (!empty($statement->having)) {
-                $flags['having'] = true;
-            }
-
-            if (!empty($statement->union)) {
-                $flags['union'] = true;
-            }
-
-            if (!empty($statement->join)) {
-                $flags['join'] = true;
-            }
-
-        } elseif ($statement instanceof ShowStatement) {
-            $flags['querytype'] = 'SHOW';
-            $flags['is_show'] = true;
-        } elseif ($statement instanceof UpdateStatement) {
-            $flags['querytype'] = 'UPDATE';
-            $flags['is_affected'] = true;
-        }
-
-        if (($statement instanceof SelectStatement)
-            || ($statement instanceof UpdateStatement)
-            || ($statement instanceof DeleteStatement)
-        ) {
-            if (!empty($statement->limit)) {
-                $flags['limit'] = true;
-            }
-            if (!empty($statement->order)) {
-                $flags['order'] = true;
-            }
-        }
-
-        return $flags;
-    }
-
-    /**
-     * Parses a query and gets all information about it.
-     *
-     * @param string $query The query to be parsed.
-     *
-     * @return array The array returned is the one returned by
-     *               `static::getFlags()`, with the following keys added:
-     *                 - parser - the parser used to analyze the query;
-     *                 - statement - the first statement resulted from parsing;
-     *                 - select_tables - the real name of the tables selected;
-     *                       if there are no table names in the `SELECT`
-     *                       expressions, the table names are fetched from the
-     *                       `FROM` expressions
-     *                 - select_expr - selected expressions
-     */
-    public static function getAll($query)
-    {
-        $parser = new Parser($query);
-
-        if (empty($parser->statements[0])) {
-            return static::getFlags(null, true);
-        }
-
-        $statement = $parser->statements[0];
-
-        $ret = static::getFlags($statement, true);
-
-        $ret['parser'] = $parser;
-        $ret['statement'] = $statement;
-
-        if ($statement instanceof SelectStatement) {
-            $ret['select_tables'] = array();
-            $ret['select_expr'] = array();
-
-            // Finding tables' aliases and their associated real names.
-            $tableAliases = array();
-            foreach ($statement->from as $expr) {
-                if ((isset($expr->table)) && ($expr->table !== '')
-                    && (isset($expr->alias)) && ($expr->alias !== '')
-                ) {
-                    $tableAliases[$expr->alias] = array(
-                        $expr->table,
-                        isset($expr->database) ? $expr->database : null
-                    );
-                }
-            }
-
-            // Trying to find selected tables only from the select expression.
-            // Sometimes, this is not possible because the tables aren't defined
-            // explicitly (e.g. SELECT * FROM film, SELECT film_id FROM film).
-            foreach ($statement->expr as $expr) {
-                if ((isset($expr->table)) && ($expr->table !== '')) {
-                    if (isset($tableAliases[$expr->table])) {
-                        $arr = $tableAliases[$expr->table];
-                    } else {
-                        $arr = array(
-                            $expr->table,
-                            ((isset($expr->database)) && ($expr->database !== '')) ?
-                                $expr->database : null
-                        );
-                    }
-                    if (!in_array($arr, $ret['select_tables'])) {
-                        $ret['select_tables'][] = $arr;
-                    }
-                } else {
-                    $ret['select_expr'][] = $expr->expr;
-                }
-            }
-
-            // If no tables names were found in the SELECT clause or if there
-            // are expressions like * or COUNT(*), etc. tables names should be
-            // extracted from the FROM clause.
-            if (empty($ret['select_tables'])) {
-                foreach ($statement->from as $expr) {
-                    if ((isset($expr->table)) && ($expr->table !== '')) {
-                        $arr = array(
-                            $expr->table,
-                            ((isset($expr->database)) && ($expr->database !== '')) ?
-                                $expr->database : null
-                        );
-                        if (!in_array($arr, $ret['select_tables'])) {
-                            $ret['select_tables'][] = $arr;
-                        }
-                    }
-                }
-            }
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Gets a list of all tables used in this statement.
-     *
-     * @param Statement $statement Statement to be scanned.
-     *
-     * @return array
-     */
-    public static function getTables($statement)
-    {
-        $expressions = array();
-
-        if (($statement instanceof InsertStatement)
-            || ($statement instanceof ReplaceStatement)
-        ) {
-            $expressions = array($statement->into->dest);
-        } elseif ($statement instanceof UpdateStatement) {
-            $expressions = $statement->tables;
-        } elseif (($statement instanceof SelectStatement)
-            || ($statement instanceof DeleteStatement)
-        ) {
-            $expressions = $statement->from;
-        } elseif (($statement instanceof AlterStatement)
-            || ($statement instanceof TruncateStatement)
-        ) {
-            $expressions = array($statement->table);
-        } elseif ($statement instanceof DropStatement) {
-            if (!$statement->options->has('TABLE')) {
-                // No tables are dropped.
-                return array();
-            }
-            $expressions = $statement->fields;
-        } elseif ($statement instanceof RenameStatement) {
-            foreach ($statement->renames as $rename) {
-                $expressions[] = $rename->old;
-            }
-        }
-
-        $ret = array();
-        foreach ($expressions as $expr) {
-            if (!empty($expr->table)) {
-                $expr->expr = null; // Force rebuild.
-                $expr->alias = null; // Aliases are not required.
-                $ret[] = Expression::build($expr);
-            }
-        }
-        return $ret;
-    }
-
-    /**
-     * Gets a specific clause.
-     *
-     * @param Statement  $statement The parsed query that has to be modified.
-     * @param TokensList $list      The list of tokens.
-     * @param string     $clause    The clause to be returned.
-     * @param int|string $type      The type of the search.
-     *                              If int,
-     *                                -1 for everything that was before
-     *                                 0 only for the clause
-     *                                 1 for everything after
-     *                              If string, the name of the first clause that
-     *                              should not be included.
-     * @param bool       $skipFirst Whether to skip the first keyword in clause.
-     *
-     * @return string
-     */
-    public static function getClause($statement, $list, $clause, $type = 0, $skipFirst = true)
-    {
-
-        /**
-         * The index of the current clause.
-         *
-         * @var int $currIdx
-         */
-        $currIdx = 0;
-
-        /**
-         * The count of brackets.
-         * We keep track of them so we won't insert the clause in a subquery.
-         *
-         * @var int $brackets
-         */
-        $brackets = 0;
-
-        /**
-         * The string to be returned.
-         *
-         * @var string $ret
-         */
-        $ret = '';
-
-        /**
-         * The clauses of this type of statement and their index.
-         *
-         * @var array $clauses
-         */
-        $clauses = array_flip(array_keys($statement->getClauses()));
-
-        /**
-         * Lexer used for lexing the clause.
-         *
-         * @var Lexer $lexer
-         */
-        $lexer = new Lexer($clause);
-
-        /**
-         * The type of this clause.
-         *
-         * @var string $clauseType
-         */
-        $clauseType = $lexer->list->getNextOfType(Token::TYPE_KEYWORD)->value;
-
-        /**
-         * The index of this clause.
-         *
-         * @var int $clauseIdx
-         */
-        $clauseIdx = $clauses[$clauseType];
-
-        $firstClauseIdx = $clauseIdx;
-        $lastClauseIdx = $clauseIdx + 1;
-
-        // Determining the behavior of this function.
-        if ($type === -1) {
-            $firstClauseIdx = -1; // Something small enough.
-            $lastClauseIdx = $clauseIdx - 1;
-        } elseif ($type === 1) {
-            $firstClauseIdx = $clauseIdx + 1;
-            $lastClauseIdx = 10000; // Something big enough.
-        } elseif (is_string($type)) {
-            if ($clauses[$type] > $clauseIdx) {
-                $firstClauseIdx = $clauseIdx + 1;
-                $lastClauseIdx = $clauses[$type] - 1;
-            } else {
-                $firstClauseIdx = $clauses[$type] + 1;
-                $lastClauseIdx = $clauseIdx - 1;
-            }
-        }
-
-        // This option is unavailable for multiple clauses.
-        if ($type !== 0) {
-            $skipFirst = false;
-        }
-
-        for ($i = $statement->first; $i <= $statement->last; ++$i) {
-            $token = $list->tokens[$i];
-
-            if ($token->type === Token::TYPE_COMMENT) {
-                continue;
-            }
-
-            if ($token->type === Token::TYPE_OPERATOR) {
-                if ($token->value === '(') {
-                    ++$brackets;
-                } elseif ($token->value === ')') {
-                    --$brackets;
-                }
-            }
-
-            if ($brackets == 0) {
-                // Checking if the section was changed.
-                if (($token->type === Token::TYPE_KEYWORD)
-                    && (isset($clauses[$token->value]))
-                    && ($clauses[$token->value] >= $currIdx)
-                ) {
-                    $currIdx = $clauses[$token->value];
-                    if (($skipFirst) && ($currIdx == $clauseIdx)) {
-                        // This token is skipped (not added to the old
-                        // clause) because it will be replaced.
-                        continue;
-                    }
-                }
-            }
-
-            if (($firstClauseIdx <= $currIdx) && ($currIdx <= $lastClauseIdx)) {
-                $ret .= $token->token;
-            }
-        }
-
-        return trim($ret);
-    }
-
-    /**
-     * Builds a query by rebuilding the statement from the tokens list supplied
-     * and replaces a clause.
-     *
-     * It is a very basic version of a query builder.
-     *
-     * @param Statement  $statement The parsed query that has to be modified.
-     * @param TokensList $list      The list of tokens.
-     * @param string     $old       The type of the clause that should be
-     *                              replaced. This can be an entire clause.
-     * @param string     $new       The new clause. If this parameter is omitted
-     *                              it is considered to be equal with `$old`.
-     * @param bool       $onlyType  Whether only the type of the clause should
-     *                              be replaced or the entire clause.
-     *
-     * @return string
-     */
-    public static function replaceClause($statement, $list, $old, $new = null, $onlyType = false)
-    {
-        // TODO: Update the tokens list and the statement.
-
-        if ($new === null) {
-            $new = $old;
-        }
-
-        if ($onlyType) {
-            return static::getClause($statement, $list, $old, -1, false) . ' ' .
-                $new . ' ' . static::getClause($statement, $list, $old, 0) . ' ' .
-                static::getClause($statement, $list, $old, 1, false);
-        }
-
-        return static::getClause($statement, $list, $old, -1, false) . ' ' .
-            $new . ' ' . static::getClause($statement, $list, $old, 1, false);
-    }
-
-    /**
-     * Builds a query by rebuilding the statement from the tokens list supplied
-     * and replaces multiple clauses.
-     *
-     * @param Statement  $statement The parsed query that has to be modified.
-     * @param TokensList $list      The list of tokens.
-     * @param array      $ops       Clauses to be replaced. Contains multiple
-     *                              arrays having two values: array($old, $new).
-     *                              Clauses must be sorted.
-     *
-     * @return string
-     */
-    public static function replaceClauses($statement, $list, array $ops)
-    {
-        $count = count($ops);
-
-        // Nothing to do.
-        if ($count === 0) {
-            return '';
-        }
-
-        /**
-         * Value to be returned.
-         *
-         * @var string $ret
-         */
-        $ret = '';
-
-        // If there is only one clause, `replaceClause()` should be used.
-        if ($count === 1) {
-            return static::replaceClause(
-                $statement,
-                $list,
-                $ops[0][0],
-                $ops[0][1]
-            );
-        }
-
-        // Adding everything before first replacement.
-        $ret .= static::getClause($statement, $list, $ops[0][0], -1) . ' ';
-
-        // Doing replacements.
-        for ($i = 0; $i < $count; ++$i) {
-            $ret .= $ops[$i][1] . ' ';
-
-            // Adding everything between this and next replacement.
-            if ($i + 1 !== $count) {
-                $ret .= static::getClause($statement, $list, $ops[$i][0], $ops[$i + 1][0]) . ' ';
-            }
-        }
-
-        // Adding everything after the last replacement.
-        $ret .= static::getClause($statement, $list, $ops[$count - 1][0], 1);
-
-        return $ret;
-    }
-
-    /**
-     * Gets the first full statement in the query.
-     *
-     * @param string $query     The query to be analyzed.
-     * @param string $delimiter The delimiter to be used.
-     *
-     * @return array                Array containing the first full query, the
-     *                              remaining part of the query and the last
-     *                              delimiter.
-     */
-    public static function getFirstStatement($query, $delimiter = null)
-    {
-        $lexer = new Lexer($query, false, $delimiter);
-        $list = $lexer->list;
-
-        /**
-         * Whether a full statement was found.
-         *
-         * @var bool $fullStatement
-         */
-        $fullStatement = false;
-
-        /**
-         * The first full statement.
-         *
-         * @var string $statement
-         */
-        $statement = '';
-
-        for ($list->idx = 0; $list->idx < $list->count; ++$list->idx) {
-            $token = $list->tokens[$list->idx];
-
-            if ($token->type === Token::TYPE_COMMENT) {
-                continue;
-            }
-
-            $statement .= $token->token;
-
-            if (($token->type === Token::TYPE_DELIMITER) && (!empty($token->token))) {
-                $delimiter = $token->token;
-                $fullStatement = true;
-                break;
-            }
-        }
-
-        // No statement was found so we return the entire query as being the
-        // remaining part.
-        if (!$fullStatement) {
-            return array(null, $query, $delimiter);
-        }
-
-        // At least one query was found so we have to build the rest of the
-        // remaining query.
-        $query = '';
-        for (++$list->idx; $list->idx < $list->count; ++$list->idx) {
-            $query .= $list->tokens[$list->idx]->token;
-        }
-
-        return array(trim($statement), $query, $delimiter);
-    }
-
-    /**
-     * Gets a starting offset of a specific clause.
-     *
-     * @param Statement  $statement The parsed query that has to be modified.
-     * @param TokensList $list      The list of tokens.
-     * @param string     $clause    The clause to be returned.
-     *
-     * @return int
-     */
-    public static function getClauseStartOffset($statement, $list, $clause)
-    {
-        /**
-         * The count of brackets.
-         * We keep track of them so we won't insert the clause in a subquery.
-         *
-         * @var int $brackets
-         */
-        $brackets = 0;
-
-        /**
-         * The clauses of this type of statement and their index.
-         *
-         * @var array $clauses
-         */
-        $clauses = array_flip(array_keys($statement->getClauses()));
-
-        for ($i = $statement->first; $i <= $statement->last; ++$i) {
-            $token = $list->tokens[$i];
-
-            if ($token->type === Token::TYPE_COMMENT) {
-                continue;
-            }
-
-            if ($token->type === Token::TYPE_OPERATOR) {
-                if ($token->value === '(') {
-                    ++$brackets;
-                } elseif ($token->value === ')') {
-                    --$brackets;
-                }
-            }
-
-            if ($brackets == 0) {
-                if (($token->type === Token::TYPE_KEYWORD)
-                    && (isset($clauses[$token->value]))
-                    && ($clause === $token->value)
-                ) {
-                    return $i;
-                }
-            }
-        }
-
-        return -1;
-    }
-}
diff --git a/#pma/libraries/sql-parser/src/Utils/Routine.php b/#pma/libraries/sql-parser/src/Utils/Routine.php
deleted file mode 100644
index d5a7891d..00000000
--- a/#pma/libraries/sql-parser/src/Utils/Routine.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-
-/**
- * Routine utilities.
- *
- * @package    SqlParser
- * @subpackage Utils
- */
-namespace SqlParser\Utils;
-
-use SqlParser\Lexer;
-use SqlParser\Parser;
-use SqlParser\Components\DataType;
-use SqlParser\Components\ParameterDefinition;
-use SqlParser\Statements\CreateStatement;
-
-/**
- * Routine utilities.
- *
- * @category   Routines
- * @package    SqlParser
- * @subpackage Utils
- * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-class Routine
-{
-
-    /**
-     * Parses a parameter of a routine.
-     *
-     * @param string $param Parameter's definition.
-     *
-     * @return array
-     */
-    public static function getReturnType($param)
-    {
-        $lexer = new Lexer($param);
-
-        // A dummy parser is used for error reporting.
-        $type = DataType::parse(new Parser(), $lexer->list);
-
-        if ($type === null) {
-            return array('', '', '', '', '');
-        }
-
-        $options = array();
-        foreach ($type->options->options as $opt) {
-            $options[] = is_string($opt) ? $opt : $opt['value'];
-        }
-
-        return array(
-            '',
-            '',
-            $type->name,
-            implode(',', $type->parameters),
-            implode(' ', $options)
-        );
-    }
-
-    /**
-     * Parses a parameter of a routine.
-     *
-     * @param string $param Parameter's definition.
-     *
-     * @return array
-     */
-    public static function getParameter($param)
-    {
-        $lexer = new Lexer('(' . $param . ')');
-
-        // A dummy parser is used for error reporting.
-        $param = ParameterDefinition::parse(new Parser(), $lexer->list);
-
-        if (empty($param[0])) {
-            return array('', '', '', '', '');
-        }
-
-        $param = $param[0];
-
-        $options = array();
-        foreach ($param->type->options->options as $opt) {
-            $options[] = is_string($opt) ? $opt : $opt['value'];
-        }
-
-        return array(
-            empty($param->inOut) ? '' : $param->inOut,
-            $param->name,
-            $param->type->name,
-            implode(',', $param->type->parameters),
-            implode(' ', $options)
-        );
-    }
-
-    /**
-     * Gets the parameters of a routine from the parse tree.
-     *
-     * @param CreateStatement $statement The statement to be processed.
-     *
-     * @return array
-     */
-    public static function getParameters($statement)
-    {
-        $retval = array(
-            'num' => 0,
-            'dir' => array(),
-            'name' => array(),
-            'type' => array(),
-            'length' => array(),
-            'length_arr' => array(),
-            'opts' => array(),
-        );
-
-        if (!empty($statement->parameters)) {
-            $idx = 0;
-            foreach ($statement->parameters as $param) {
-                $retval['dir'][$idx] = $param->inOut;
-                $retval['name'][$idx] = $param->name;
-                $retval['type'][$idx] = $param->type->name;
-                $retval['length'][$idx] = implode(',', $param->type->parameters);
-                $retval['length_arr'][$idx] = $param->type->parameters;
-                $retval['opts'][$idx] = array();
-                foreach ($param->type->options->options as $opt) {
-                    $retval['opts'][$idx][] = is_string($opt) ?
-                        $opt : $opt['value'];
-                }
-                $retval['opts'][$idx] = implode(' ', $retval['opts'][$idx]);
-                ++$idx;
-            }
-
-            $retval['num'] = $idx;
-        }
-
-        return $retval;
-    }
-}
diff --git a/#pma/libraries/sql-parser/src/Utils/Table.php b/#pma/libraries/sql-parser/src/Utils/Table.php
deleted file mode 100644
index a31ddf27..00000000
--- a/#pma/libraries/sql-parser/src/Utils/Table.php
+++ /dev/null
@@ -1,141 +0,0 @@
-<?php
-
-/**
- * Table utilities.
- *
- * @package    SqlParser
- * @subpackage Utils
- */
-namespace SqlParser\Utils;
-
-use SqlParser\Statements\CreateStatement;
-
-/**
- * Table utilities.
- *
- * @category   Statement
- * @package    SqlParser
- * @subpackage Utils
- * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-class Table
-{
-
-    /**
-     * Gets the foreign keys of the table.
-     *
-     * @param CreateStatement $statement The statement to be processed.
-     *
-     * @return array
-     */
-    public static function getForeignKeys($statement)
-    {
-        if ((empty($statement->fields))
-            || (!is_array($statement->fields))
-            || (!$statement->options->has('TABLE'))
-        ) {
-            return array();
-        }
-
-        $ret = array();
-
-        foreach ($statement->fields as $field) {
-            if ((empty($field->key)) || ($field->key->type !== 'FOREIGN KEY')) {
-                continue;
-            }
-
-            $columns = array();
-            foreach ($field->key->columns as $column) {
-                $columns[] = $column['name'];
-            }
-
-            $tmp = array(
-                'constraint' => $field->name,
-                'index_list' => $columns,
-            );
-
-            if (!empty($field->references)) {
-                $tmp['ref_db_name'] = $field->references->table->database;
-                $tmp['ref_table_name'] = $field->references->table->table;
-                $tmp['ref_index_list'] = $field->references->columns;
-
-                if (($opt = $field->references->options->has('ON UPDATE'))) {
-                    $tmp['on_update'] = str_replace(' ', '_', $opt);
-                }
-
-                if (($opt = $field->references->options->has('ON DELETE'))) {
-                    $tmp['on_delete'] = str_replace(' ', '_', $opt);
-                }
-
-                // if (($opt = $field->references->options->has('MATCH'))) {
-                //     $tmp['match'] = str_replace(' ', '_', $opt);
-                // }
-            }
-
-            $ret[] = $tmp;
-
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Gets fields of the table.
-     *
-     * @param CreateStatement $statement The statement to be processed.
-     *
-     * @return array
-     */
-    public static function getFields($statement)
-    {
-        if ((empty($statement->fields))
-            || (!is_array($statement->fields))
-            || (!$statement->options->has('TABLE'))
-        ) {
-            return array();
-        }
-
-        $ret = array();
-
-        foreach ($statement->fields as $field) {
-            // Skipping keys.
-            if (empty($field->type)) {
-                continue;
-            }
-
-            $ret[$field->name] = array(
-                'type' => $field->type->name,
-                'timestamp_not_null' => false,
-            );
-
-            if ($field->options) {
-                if ($field->type->name === 'TIMESTAMP') {
-                    if ($field->options->has('NOT NULL')) {
-                        $ret[$field->name]['timestamp_not_null'] = true;
-                    }
-                }
-
-                if (($option = $field->options->has('DEFAULT'))) {
-                    $ret[$field->name]['default_value'] = $option;
-                    if ($option === 'CURRENT_TIMESTAMP') {
-                        $ret[$field->name]['default_current_timestamp'] = true;
-                    }
-                }
-
-                if (($option = $field->options->has('ON UPDATE'))) {
-                    if ($option === 'CURRENT_TIMESTAMP') {
-                        $ret[$field->name]['on_update_current_timestamp'] = true;
-                    }
-                }
-
-                if (($option = $field->options->has('AS'))) {
-                    $ret[$field->name]['generated'] = true;
-                    $ret[$field->name]['expr'] = $option;
-                }
-            }
-
-        }
-
-        return $ret;
-    }
-}
diff --git a/#pma/libraries/sql-parser/src/Utils/Tokens.php b/#pma/libraries/sql-parser/src/Utils/Tokens.php
deleted file mode 100644
index acec369c..00000000
--- a/#pma/libraries/sql-parser/src/Utils/Tokens.php
+++ /dev/null
@@ -1,174 +0,0 @@
-<?php
-
-/**
- * Token utilities.
- *
- * @package    SqlParser
- * @subpackage Utils
- */
-namespace SqlParser\Utils;
-
-use SqlParser\Lexer;
-use SqlParser\Token;
-use SqlParser\TokensList;
-
-/**
- * Token utilities.
- *
- * @category   Token
- * @package    SqlParser
- * @subpackage Utils
- * @license    https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
- */
-class Tokens
-{
-
-    /**
-     * Checks if a pattern is a match for the specified token.
-     *
-     * @param Token $token   The token to be matched.
-     * @param array $pattern The pattern to be matches.
-     *
-     * @return bool
-     */
-    public static function match(Token $token, array $pattern)
-    {
-        // Token.
-        if ((isset($pattern['token']))
-            && ($pattern['token'] !== $token->token)
-        ) {
-            return false;
-        }
-
-        // Value.
-        if ((isset($pattern['value']))
-            && ($pattern['value'] !== $token->value)
-        ) {
-            return false;
-        }
-
-        if ((isset($pattern['value_str']))
-            && (strcasecmp($pattern['value_str'], $token->value))
-        ) {
-            return false;
-        }
-
-        // Type.
-        if ((isset($pattern['type']))
-            && ($pattern['type'] !== $token->type)
-        ) {
-            return false;
-        }
-
-        // Flags.
-        if ((isset($pattern['flags']))
-            && (($pattern['flags'] & $token->flags) === 0)
-        ) {
-            return false;
-        }
-
-        return true;
-    }
-
-    public static function replaceTokens($list, array $find, array $replace)
-    {
-
-        /**
-         * Whether the first parameter is a list.
-         *
-         * @var bool
-         */
-        $isList = $list instanceof TokensList;
-
-        // Parsing the tokens.
-        if (!$isList) {
-            $list = Lexer::getTokens($list);
-        }
-
-        /**
-         * The list to be returned.
-         *
-         * @var array
-         */
-        $newList = array();
-
-        /**
-         * The length of the find pattern is calculated only once.
-         *
-         * @var int
-         */
-        $findCount = count($find);
-
-        /**
-         * The starting index of the pattern.
-         *
-         * @var int
-         */
-        $i = 0;
-
-        while ($i < $list->count) {
-            // A sequence may not start with a comment.
-            if ($list->tokens[$i]->type === Token::TYPE_COMMENT) {
-                $newList[] = $list->tokens[$i];
-                ++$i;
-                continue;
-            }
-
-            /**
-             * The index used to parse `$list->tokens`.
-             *
-             * This index might be running faster than `$k` because some tokens
-             * are skipped.
-             *
-             * @var int
-             */
-            $j = $i;
-
-            /**
-             * The index used to parse `$find`.
-             *
-             * This index might be running slower than `$j` because some tokens
-             * are skipped.
-             *
-             * @var int
-             */
-            $k = 0;
-
-            // Checking if the next tokens match the pattern described.
-            while (($j < $list->count) && ($k < $findCount)) {
-                // Comments are being skipped.
-                if ($list->tokens[$j]->type === Token::TYPE_COMMENT) {
-                    ++$j;
-                }
-
-                if (!static::match($list->tokens[$j], $find[$k])) {
-                    // This token does not match the pattern.
-                    break;
-                }
-
-                // Going to next token and segment of find pattern.
-                ++$j;
-                ++$k;
-            }
-
-
-            // Checking if the sequence was found.
-            if ($k === $findCount) {
-                // Inserting new tokens.
-                foreach ($replace as $token) {
-                    $newList[] = $token;
-                }
-
-                // Skipping next `$findCount` tokens.
-                $i = $j;
-            } else {
-                // Adding the same token.
-                $newList[] = $list->tokens[$i];
-                ++$i;
-            }
-        }
-
-        return $isList ?
-            new TokensList($newList) : TokensList::build($newList);
-    }
-}
diff --git a/#pma/libraries/sql-parser/src/common.php b/#pma/libraries/sql-parser/src/common.php
deleted file mode 100644
index 3575c24a..00000000
--- a/#pma/libraries/sql-parser/src/common.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-/**
- * Defines common elements used by the library.
- *
- * @package SqlParser
- */
-
-if (!function_exists('__')) {
-    /**
-     * Translates the given string.
-     *
-     * @param string $str String to be translated.
-     *
-     * @return string
-     */
-    function __($str)
-    {
-        return $str;
-    }
-}
diff --git a/#pma/libraries/sql.lib.php b/#pma/libraries/sql.lib.php
deleted file mode 100644
index c6145266..00000000
--- a/#pma/libraries/sql.lib.php
+++ /dev/null
@@ -1,2250 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * set of functions for the sql executor
- *
- * @package PhpMyAdmin
- */
-use PMA\libraries\DisplayResults;
-use PMA\libraries\Message;
-use PMA\libraries\Table;
-use PMA\libraries\Response;
-
-/**
- * Parses and analyzes the given SQL query.
- *
- * @param string $sql_query SQL query
- * @param string $db        DB name
- *
- * @return mixed
- */
-function PMA_parseAndAnalyze($sql_query, $db = null)
-{
-    if (($db === null) && (!empty($GLOBALS['db']))) {
-        $db = $GLOBALS['db'];
-    }
-
-    include_once 'libraries/parse_analyze.lib.php';
-    list($analyzed_sql_results,,) = PMA_parseAnalyze($sql_query, $db);
-
-    return $analyzed_sql_results;
-}
-
-/**
- * Handle remembered sorting order, only for single table query
- *
- * @param string $db                    database name
- * @param string $table                 table name
- * @param array  &$analyzed_sql_results the analyzed query results
- * @param string &$full_sql_query       SQL query
- *
- * @return void
- */
-function PMA_handleSortOrder(
-    $db, $table, &$analyzed_sql_results, &$full_sql_query
-) {
-    $pmatable = new Table($table, $db);
-
-    if (empty($analyzed_sql_results['order'])) {
-
-        // Retrieving the name of the column we should sort after.
-        $sortCol = $pmatable->getUiProp(Table::PROP_SORTED_COLUMN);
-        if (empty($sortCol)) {
-            return;
-        }
-
-        // Remove the name of the table from the retrieved field name.
-        $sortCol = str_replace(
-            PMA\libraries\Util::backquote($table) . '.',
-            '',
-            $sortCol
-        );
-
-        // Create the new query.
-        $full_sql_query = SqlParser\Utils\Query::replaceClause(
-            $analyzed_sql_results['statement'],
-            $analyzed_sql_results['parser']->list,
-            'ORDER BY ' . $sortCol
-        );
-
-        // TODO: Avoid reparsing the query.
-        $analyzed_sql_results = SqlParser\Utils\Query::getAll($full_sql_query);
-    } else {
-        // Store the remembered table into session.
-        $pmatable->setUiProp(
-            Table::PROP_SORTED_COLUMN,
-            SqlParser\Utils\Query::getClause(
-                $analyzed_sql_results['statement'],
-                $analyzed_sql_results['parser']->list,
-                'ORDER BY'
-            )
-        );
-    }
-}
-
-/**
- * Append limit clause to SQL query
- *
- * @param array &$analyzed_sql_results the analyzed query results
- *
- * @return string limit clause appended SQL query
- */
-function PMA_getSqlWithLimitClause(&$analyzed_sql_results)
-{
-    return SqlParser\Utils\Query::replaceClause(
-        $analyzed_sql_results['statement'],
-        $analyzed_sql_results['parser']->list,
-        'LIMIT ' . $_SESSION['tmpval']['pos'] . ', '
-        . $_SESSION['tmpval']['max_rows']
-    );
-}
-
-/**
- * Verify whether the result set has columns from just one table
- *
- * @param array $fields_meta meta fields
- *
- * @return boolean whether the result set has columns from just one table
- */
-function PMA_resultSetHasJustOneTable($fields_meta)
-{
-    $just_one_table = true;
-    $prev_table = '';
-    foreach ($fields_meta as $one_field_meta) {
-        if ($one_field_meta->table != ''
-            && $prev_table != ''
-            && $one_field_meta->table != $prev_table
-        ) {
-            $just_one_table = false;
-        }
-        if ($one_field_meta->table != '') {
-            $prev_table = $one_field_meta->table;
-        }
-    }
-    return $just_one_table && $prev_table != '';
-}
-
-/**
- * Verify whether the result set contains all the columns
- * of at least one unique key
- *
- * @param string $db          database name
- * @param string $table       table name
- * @param array  $fields_meta meta fields
- *
- * @return boolean whether the result set contains a unique key
- */
-function PMA_resultSetContainsUniqueKey($db, $table, $fields_meta)
-{
-    $resultSetColumnNames = array();
-    foreach ($fields_meta as $oneMeta) {
-        $resultSetColumnNames[] = $oneMeta->name;
-    }
-    foreach (PMA\libraries\Index::getFromTable($table, $db) as $index) {
-        if ($index->isUnique()) {
-            $indexColumns = $index->getColumns();
-            $numberFound = 0;
-            foreach ($indexColumns as $indexColumnName => $dummy) {
-                if (in_array($indexColumnName, $resultSetColumnNames)) {
-                    $numberFound++;
-                }
-            }
-            if ($numberFound == count($indexColumns)) {
-                return true;
-            }
-        }
-    }
-    return false;
-}
-
-/**
- * Get the HTML for relational column dropdown
- * During grid edit, if we have a relational field, returns the html for the
- * dropdown
- *
- * @param string $db         current database
- * @param string $table      current table
- * @param string $column     current column
- * @param string $curr_value current selected value
- *
- * @return string $dropdown html for the dropdown
- */
-function PMA_getHtmlForRelationalColumnDropdown($db, $table, $column, $curr_value)
-{
-    $foreigners = PMA_getForeigners($db, $table, $column);
-
-    $foreignData = PMA_getForeignData($foreigners, $column, false, '', '');
-
-    if ($foreignData['disp_row'] == null) {
-        //Handle the case when number of values
-        //is more than $cfg['ForeignKeyMaxLimit']
-        $_url_params = array(
-                'db' => $db,
-                'table' => $table,
-                'field' => $column
-        );
-
-        $dropdown = '<span class="curr_value">'
-            . htmlspecialchars($_REQUEST['curr_value'])
-            . '</span>'
-            . '<a href="browse_foreigners.php'
-            . PMA_URL_getCommon($_url_params) . '"'
-            . 'class="ajax browse_foreign" ' . '>'
-            . __('Browse foreign values')
-            . '</a>';
-    } else {
-        $dropdown = PMA_foreignDropdown(
-            $foreignData['disp_row'],
-            $foreignData['foreign_field'],
-            $foreignData['foreign_display'],
-            $curr_value,
-            $GLOBALS['cfg']['ForeignKeyMaxLimit']
-        );
-        $dropdown = '<select>' . $dropdown . '</select>';
-    }
-
-    return $dropdown;
-}
-
-/**
- * Get the HTML for the profiling table and accompanying chart if profiling is set.
- * Otherwise returns null
- *
- * @param string $url_query         url query
- * @param string $db                current database
- * @param array  $profiling_results array containing the profiling info
- *
- * @return string $profiling_table html for the profiling table and chart
- */
-function PMA_getHtmlForProfilingChart($url_query, $db, $profiling_results)
-{
-    if (! empty($profiling_results)) {
-        $pma_token = $_SESSION[' PMA_token '];
-        $url_query = isset($url_query)
-            ? $url_query
-            : PMA_URL_getCommon(array('db' => $db));
-
-        $profiling_table = '';
-        $profiling_table .= '<fieldset><legend>' . __('Profiling')
-            . '</legend>' . "\n";
-        $profiling_table .= '<div class="floatleft">';
-        $profiling_table .= '<h3>' . __('Detailed profile') . '</h3>';
-        $profiling_table .= '<table id="profiletable"><thead>' . "\n";
-        $profiling_table .= ' <tr>' . "\n";
-        $profiling_table .= '  <th>' . __('Order')
-            . '<div class="sorticon"></div></th>' . "\n";
-        $profiling_table .= '  <th>' . __('State')
-            . PMA\libraries\Util::showMySQLDocu('general-thread-states')
-            . '<div class="sorticon"></div></th>' . "\n";
-        $profiling_table .= '  <th>' . __('Time')
-            . '<div class="sorticon"></div></th>' . "\n";
-        $profiling_table .= ' </tr></thead><tbody>' . "\n";
-        list($detailed_table, $chart_json, $profiling_stats)
-            = PMA_analyzeAndGetTableHtmlForProfilingResults($profiling_results);
-        $profiling_table .= $detailed_table;
-        $profiling_table .= '</tbody></table>' . "\n";
-        $profiling_table .= '</div>';
-
-        $profiling_table .= '<div class="floatleft">';
-        $profiling_table .= '<h3>' . __('Summary by state') . '</h3>';
-        $profiling_table .= '<table id="profilesummarytable"><thead>' . "\n";
-        $profiling_table .= ' <tr>' . "\n";
-        $profiling_table .= '  <th>' . __('State')
-            . PMA\libraries\Util::showMySQLDocu('general-thread-states')
-            . '<div class="sorticon"></div></th>' . "\n";
-        $profiling_table .= '  <th>' . __('Total Time')
-            . '<div class="sorticon"></div></th>' . "\n";
-        $profiling_table .= '  <th>' . __('% Time')
-            . '<div class="sorticon"></div></th>' . "\n";
-        $profiling_table .= '  <th>' . __('Calls')
-            . '<div class="sorticon"></div></th>' . "\n";
-        $profiling_table .= '  <th>' . __('ø Time')
-            . '<div class="sorticon"></div></th>' . "\n";
-        $profiling_table .= ' </tr></thead><tbody>' . "\n";
-        $profiling_table .= PMA_getTableHtmlForProfilingSummaryByState(
-            $profiling_stats
-        );
-        $profiling_table .= '</tbody></table>' . "\n";
-
-        $profiling_table .= <<<EOT
-<script type="text/javascript">
-    pma_token = '$pma_token';
-    url_query = '$url_query';
-</script>
-EOT;
-        $profiling_table .= "</div>";
-        $profiling_table .= "<div class='clearfloat'></div>";
-
-        //require_once 'libraries/chart.lib.php';
-        $profiling_table .= '<div id="profilingChartData" style="display:none;">';
-        $profiling_table .= json_encode($chart_json);
-        $profiling_table .= '</div>';
-        $profiling_table .= '<div id="profilingchart" style="display:none;">';
-        $profiling_table .= '</div>';
-        $profiling_table .= '<script type="text/javascript">';
-        $profiling_table .= "AJAX.registerOnload('sql.js', function () {";
-        $profiling_table .= 'makeProfilingChart();';
-        $profiling_table .= 'initProfilingTables();';
-        $profiling_table .= '});';
-        $profiling_table .= '</script>';
-        $profiling_table .= '</fieldset>' . "\n";
-    } else {
-        $profiling_table = null;
-    }
-    return $profiling_table;
-}
-
-/**
- * Function to get HTML for detailed profiling results table, profiling stats, and
- * $chart_json for displaying the chart.
- *
- * @param array $profiling_results profiling results
- *
- * @return mixed
- */
-function PMA_analyzeAndGetTableHtmlForProfilingResults(
-    $profiling_results
-) {
-    $profiling_stats = array(
-        'total_time' => 0,
-        'states' => array(),
-    );
-    $chart_json = Array();
-    $i = 1;
-    $table = '';
-    foreach ($profiling_results as $one_result) {
-        if (isset($profiling_stats['states'][ucwords($one_result['Status'])])) {
-            $states = $profiling_stats['states'];
-            $states[ucwords($one_result['Status'])]['total_time']
-                += $one_result['Duration'];
-            $states[ucwords($one_result['Status'])]['calls']++;
-        } else {
-            $profiling_stats['states'][ucwords($one_result['Status'])] = array(
-                'total_time' => $one_result['Duration'],
-                'calls' => 1,
-            );
-        }
-        $profiling_stats['total_time'] += $one_result['Duration'];
-
-        $table .= ' <tr>' . "\n";
-        $table .= '<td>' . $i++ . '</td>' . "\n";
-        $table .= '<td>' . ucwords($one_result['Status'])
-            . '</td>' . "\n";
-        $table .= '<td class="right">'
-            . (PMA\libraries\Util::formatNumber($one_result['Duration'], 3, 1))
-            . 's<span style="display:none;" class="rawvalue">'
-            . $one_result['Duration'] . '</span></td>' . "\n";
-        if (isset($chart_json[ucwords($one_result['Status'])])) {
-            $chart_json[ucwords($one_result['Status'])]
-                += $one_result['Duration'];
-        } else {
-            $chart_json[ucwords($one_result['Status'])]
-                = $one_result['Duration'];
-        }
-    }
-    return array($table, $chart_json, $profiling_stats);
-}
-
-/**
- * Function to get HTML for summary by state table
- *
- * @param array $profiling_stats profiling stats
- *
- * @return string $table html for the table
- */
-function PMA_getTableHtmlForProfilingSummaryByState($profiling_stats)
-{
-    $table = '';
-    foreach ($profiling_stats['states'] as $name => $stats) {
-        $table .= ' <tr>' . "\n";
-        $table .= '<td>' . $name . '</td>' . "\n";
-        $table .= '<td align="right">'
-            . PMA\libraries\Util::formatNumber($stats['total_time'], 3, 1)
-            . 's<span style="display:none;" class="rawvalue">'
-            . $stats['total_time'] . '</span></td>' . "\n";
-        $table .= '<td align="right">'
-            . PMA\libraries\Util::formatNumber(
-                100 * ($stats['total_time'] / $profiling_stats['total_time']),
-                0, 2
-            )
-        . '%</td>' . "\n";
-        $table .= '<td align="right">' . $stats['calls'] . '</td>'
-            . "\n";
-        $table .= '<td align="right">'
-            . PMA\libraries\Util::formatNumber(
-                $stats['total_time'] / $stats['calls'], 3, 1
-            )
-            . 's<span style="display:none;" class="rawvalue">'
-            . number_format($stats['total_time'] / $stats['calls'], 8, '.', '')
-            . '</span></td>' . "\n";
-        $table .= ' </tr>' . "\n";
-    }
-    return $table;
-}
-
-/**
- * Get the HTML for the enum column dropdown
- * During grid edit, if we have a enum field, returns the html for the
- * dropdown
- *
- * @param string $db         current database
- * @param string $table      current table
- * @param string $column     current column
- * @param string $curr_value currently selected value
- *
- * @return string $dropdown html for the dropdown
- */
-function PMA_getHtmlForEnumColumnDropdown($db, $table, $column, $curr_value)
-{
-    $values = PMA_getValuesForColumn($db, $table, $column);
-    $dropdown = '<option value="">&nbsp;</option>';
-    $dropdown .= PMA_getHtmlForOptionsList($values, array($curr_value));
-    $dropdown = '<select>' . $dropdown . '</select>';
-    return $dropdown;
-}
-
-/**
- * Get value of a column for a specific row (marked by $where_clause)
- *
- * @param string $db           current database
- * @param string $table        current table
- * @param string $column       current column
- * @param string $where_clause where clause to select a particular row
- *
- * @return string with value
- */
-function PMA_getFullValuesForSetColumn($db, $table, $column, $where_clause)
-{
-    $result = $GLOBALS['dbi']->fetchSingleRow(
-        "SELECT `$column` FROM `$db`.`$table` WHERE $where_clause"
-    );
-
-    return $result[$column];
-}
-
-/**
- * Get the HTML for the set column dropdown
- * During grid edit, if we have a set field, returns the html for the
- * dropdown
- *
- * @param string $db         current database
- * @param string $table      current table
- * @param string $column     current column
- * @param string $curr_value currently selected value
- *
- * @return string $dropdown html for the set column
- */
-function PMA_getHtmlForSetColumn($db, $table, $column, $curr_value)
-{
-    $values = PMA_getValuesForColumn($db, $table, $column);
-    $dropdown = '';
-    $full_values =
-        isset($_REQUEST['get_full_values']) ? $_REQUEST['get_full_values'] : false;
-    $where_clause =
-        isset($_REQUEST['where_clause']) ? $_REQUEST['where_clause'] : null;
-
-    // If the $curr_value was truncated, we should
-    // fetch the correct full values from the table
-    if ($full_values && ! empty($where_clause)) {
-        $curr_value = PMA_getFullValuesForSetColumn(
-            $db, $table, $column, $where_clause
-        );
-    }
-
-    //converts characters of $curr_value to HTML entities
-    $converted_curr_value = htmlentities(
-        $curr_value, ENT_COMPAT, "UTF-8"
-    );
-
-    $selected_values = explode(',', $converted_curr_value);
-
-    $dropdown .= PMA_getHtmlForOptionsList($values, $selected_values);
-
-    $select_size = (sizeof($values) > 10) ? 10 : sizeof($values);
-    $dropdown = '<select multiple="multiple" size="' . $select_size . '">'
-        . $dropdown . '</select>';
-
-    return $dropdown;
-}
-
-/**
- * Get all the values for a enum column or set column in a table
- *
- * @param string $db     current database
- * @param string $table  current table
- * @param string $column current column
- *
- * @return array $values array containing the value list for the column
- */
-function PMA_getValuesForColumn($db, $table, $column)
-{
-    $field_info_query = $GLOBALS['dbi']->getColumnsSql($db, $table, $column);
-
-    $field_info_result = $GLOBALS['dbi']->fetchResult(
-        $field_info_query,
-        null,
-        null,
-        null,
-        PMA\libraries\DatabaseInterface::QUERY_STORE
-    );
-
-    $values = PMA\libraries\Util::parseEnumSetValues($field_info_result[0]['Type']);
-
-    return $values;
-}
-
-/**
- * Get HTML for options list
- *
- * @param array $values          set of values
- * @param array $selected_values currently selected values
- *
- * @return string $options HTML for options list
- */
-function PMA_getHtmlForOptionsList($values, $selected_values)
-{
-    $options = '';
-    foreach ($values as $value) {
-        $options .= '<option value="' . $value . '"';
-        if (in_array($value, $selected_values, true)) {
-            $options .= ' selected="selected" ';
-        }
-        $options .= '>' . $value . '</option>';
-    }
-    return $options;
-}
-
-/**
- * Function to get html for bookmark support if bookmarks are enabled. Else will
- * return null
- *
- * @param array  $displayParts   the parts to display
- * @param array  $cfgBookmark    configuration setting for bookmarking
- * @param string $sql_query      sql query
- * @param string $db             current database
- * @param string $table          current table
- * @param string $complete_query complete query
- * @param string $bkm_user       bookmarking user
- *
- * @return string $html
- */
-function PMA_getHtmlForBookmark($displayParts, $cfgBookmark, $sql_query, $db,
-    $table, $complete_query, $bkm_user
-) {
-    if ($displayParts['bkm_form'] == '1'
-        && (! empty($cfgBookmark) && empty($_GET['id_bookmark']))
-        && ! empty($sql_query)
-    ) {
-        $goto = 'sql.php'
-            . PMA_URL_getCommon(
-                array(
-                    'db' => $db,
-                    'table' => $table,
-                    'sql_query' => $sql_query,
-                    'id_bookmark'=> 1,
-                )
-            );
-        $bkm_sql_query = isset($complete_query) ? $complete_query : $sql_query;
-        $html = '<form action="sql.php" method="post"'
-            . ' onsubmit="return ! emptyCheckTheField(this,'
-            . '\'bkm_fields[bkm_label]\');"'
-            . ' class="bookmarkQueryForm print_ignore">';
-        $html .= PMA_URL_getHiddenInputs();
-        $html .= '<input type="hidden" name="db"'
-            . ' value="' . htmlspecialchars($db) . '" />';
-        $html .= '<input type="hidden" name="goto" value="' . $goto . '" />';
-        $html .= '<input type="hidden" name="bkm_fields[bkm_database]"'
-            . ' value="' . htmlspecialchars($db) . '" />';
-        $html .= '<input type="hidden" name="bkm_fields[bkm_user]"'
-            . ' value="' . $bkm_user . '" />';
-        $html .= '<input type="hidden" name="bkm_fields[bkm_sql_query]"'
-            . ' value="'
-            . htmlspecialchars($bkm_sql_query)
-            . '" />';
-        $html .= '<fieldset>';
-        $html .= '<legend>';
-        $html .= PMA\libraries\Util::getIcon(
-            'b_bookmark.png', __('Bookmark this SQL query'), true
-        );
-        $html .= '</legend>';
-        $html .= '<div class="formelement">';
-        $html .= '<label>' . __('Label:');
-        $html .= '<input type="text" name="bkm_fields[bkm_label]" value="" />' .
-            '</label>';
-        $html .= '</div>';
-        $html .= '<div class="formelement">';
-        $html .= '<label>' .
-            '<input type="checkbox" name="bkm_all_users" value="true" />';
-        $html .=  __('Let every user access this bookmark') . '</label>';
-        $html .= '</div>';
-        $html .= '<div class="clearfloat"></div>';
-        $html .= '</fieldset>';
-        $html .= '<fieldset class="tblFooters">';
-        $html .= '<input type="hidden" name="store_bkm" value="1" />';
-        $html .= '<input type="submit"'
-            . ' value="' . __('Bookmark this SQL query') . '" />';
-        $html .= '</fieldset>';
-        $html .= '</form>';
-
-    } else {
-        $html = null;
-    }
-
-    return $html;
-}
-
-/**
- * Function to check whether to remember the sorting order or not
- *
- * @param array $analyzed_sql_results the analyzed query and other variables set
- *                                    after analyzing the query
- *
- * @return boolean
- */
-function PMA_isRememberSortingOrder($analyzed_sql_results)
-{
-    return $GLOBALS['cfg']['RememberSorting']
-        && ! ($analyzed_sql_results['is_count']
-            || $analyzed_sql_results['is_export']
-            || $analyzed_sql_results['is_func']
-            || $analyzed_sql_results['is_analyse'])
-        && $analyzed_sql_results['select_from']
-        && ((empty($analyzed_sql_results['select_expr']))
-            || (count($analyzed_sql_results['select_expr'] == 1)
-                && ($analyzed_sql_results['select_expr'][0] == '*')))
-        && count($analyzed_sql_results['select_tables']) == 1;
-}
-
-/**
- * Function to check whether the LIMIT clause should be appended or not
- *
- * @param array $analyzed_sql_results the analyzed query and other variables set
- *                                    after analyzing the query
- *
- * @return boolean
- */
-function PMA_isAppendLimitClause($analyzed_sql_results)
-{
-    // Assigning LIMIT clause to an syntactically-wrong query
-    // is not needed. Also we would want to show the true query
-    // and the true error message to the query executor
-
-    return (isset($analyzed_sql_results['parser'])
-        && count($analyzed_sql_results['parser']->errors) === 0)
-        && ($_SESSION['tmpval']['max_rows'] != 'all')
-        && ! ($analyzed_sql_results['is_export']
-        || $analyzed_sql_results['is_analyse'])
-        && ($analyzed_sql_results['select_from']
-            || $analyzed_sql_results['is_subquery'])
-        && empty($analyzed_sql_results['limit']);
-}
-
-/**
- * Function to check whether this query is for just browsing
- *
- * @param array   $analyzed_sql_results the analyzed query and other variables set
- *                                      after analyzing the query
- * @param boolean $find_real_end        whether the real end should be found
- *
- * @return boolean
- */
-function PMA_isJustBrowsing($analyzed_sql_results, $find_real_end)
-{
-    return ! $analyzed_sql_results['is_group']
-        && ! $analyzed_sql_results['is_func']
-        && empty($analyzed_sql_results['union'])
-        && empty($analyzed_sql_results['distinct'])
-        && $analyzed_sql_results['select_from']
-        && (count($analyzed_sql_results['select_tables']) === 1)
-        && (empty($analyzed_sql_results['statement']->where)
-            || (count($analyzed_sql_results['statement']->where) == 1
-                && $analyzed_sql_results['statement']->where[0]->expr ==='1'))
-        && empty($analyzed_sql_results['group'])
-        && ! isset($find_real_end)
-        && ! $analyzed_sql_results['is_subquery']
-        && ! $analyzed_sql_results['join']
-        && empty($analyzed_sql_results['having']);
-}
-
-/**
- * Function to check whether the related transformation information should be deleted
- *
- * @param array $analyzed_sql_results the analyzed query and other variables set
- *                                    after analyzing the query
- *
- * @return boolean
- */
-function PMA_isDeleteTransformationInfo($analyzed_sql_results)
-{
-    return !empty($analyzed_sql_results['querytype'])
-        && (($analyzed_sql_results['querytype'] == 'ALTER')
-            || ($analyzed_sql_results['querytype'] == 'DROP'));
-}
-
-/**
- * Function to check whether the user has rights to drop the database
- *
- * @param array   $analyzed_sql_results  the analyzed query and other variables set
- *                                       after analyzing the query
- * @param boolean $allowUserDropDatabase whether the user is allowed to drop db
- * @param boolean $is_superuser          whether this user is a superuser
- *
- * @return boolean
- */
-function PMA_hasNoRightsToDropDatabase($analyzed_sql_results,
-    $allowUserDropDatabase, $is_superuser
-) {
-    return ! $allowUserDropDatabase
-        && isset($analyzed_sql_results['drop_database'])
-        && $analyzed_sql_results['drop_database']
-        && ! $is_superuser;
-}
-
-/**
- * Function to set a column property
- *
- * @param Table  $pmatable      Table instance
- * @param string $request_index col_order|col_visib
- *
- * @return boolean $retval
- */
-function PMA_setColumnProperty($pmatable, $request_index)
-{
-    $property_value = explode(',', $_REQUEST[$request_index]);
-    switch($request_index) {
-    case 'col_order':
-        $property_to_set = Table::PROP_COLUMN_ORDER;
-        break;
-    case 'col_visib':
-        $property_to_set = Table::PROP_COLUMN_VISIB;
-        break;
-    default:
-        $property_to_set = '';
-    }
-    $retval = $pmatable->setUiProp(
-        $property_to_set,
-        $property_value,
-        $_REQUEST['table_create_time']
-    );
-    if (gettype($retval) != 'boolean') {
-        $response = PMA\libraries\Response::getInstance();
-        $response->setRequestStatus(false);
-        $response->addJSON('message', $retval->getString());
-        exit;
-    }
-
-    return $retval;
-}
-
-/**
- * Function to check the request for setting the column order or visibility
- *
- * @param String $table the current table
- * @param String $db    the current database
- *
- * @return void
- */
-function PMA_setColumnOrderOrVisibility($table, $db)
-{
-    $pmatable = new Table($table, $db);
-    $retval = false;
-
-    // set column order
-    if (isset($_REQUEST['col_order'])) {
-        $retval = PMA_setColumnProperty($pmatable, 'col_order');
-    }
-
-    // set column visibility
-    if ($retval === true && isset($_REQUEST['col_visib'])) {
-        $retval = PMA_setColumnProperty($pmatable, 'col_visib');
-    }
-
-    $response = PMA\libraries\Response::getInstance();
-    $response->setRequestStatus($retval == true);
-    exit;
-}
-
-/**
- * Function to add a bookmark
- *
- * @param String $goto goto page URL
- *
- * @return void
- */
-function PMA_addBookmark($goto)
-{
-    $result = PMA_Bookmark_save(
-        $_POST['bkm_fields'],
-        (isset($_POST['bkm_all_users'])
-            && $_POST['bkm_all_users'] == 'true' ? true : false
-        )
-    );
-    $response = Response::getInstance();
-    if ($response->isAjax()) {
-        if ($result) {
-            $msg = Message::success(__('Bookmark %s has been created.'));
-            $msg->addParam($_POST['bkm_fields']['bkm_label']);
-            $response->addJSON('message', $msg);
-        } else {
-            $msg = PMA\libraries\message::error(__('Bookmark not created!'));
-            $response->setRequestStatus(false);
-            $response->addJSON('message', $msg);
-        }
-        exit;
-    } else {
-        // go back to sql.php to redisplay query; do not use &amp; in this case:
-        /**
-         * @todo In which scenario does this happen?
-         */
-        PMA_sendHeaderLocation(
-            './' . $goto
-            . '&label=' . $_POST['bkm_fields']['bkm_label']
-        );
-    }
-}
-
-/**
- * Function to find the real end of rows
- *
- * @param String $db    the current database
- * @param String $table the current table
- *
- * @return mixed the number of rows if "retain" param is true, otherwise true
- */
-function PMA_findRealEndOfRows($db, $table)
-{
-    $unlim_num_rows = $GLOBALS['dbi']->getTable($db, $table)->countRecords(true);
-    $_SESSION['tmpval']['pos'] = PMA_getStartPosToDisplayRow($unlim_num_rows);
-
-    return $unlim_num_rows;
-}
-
-/**
- * Function to get values for the relational columns
- *
- * @param String $db    the current database
- * @param String $table the current table
- *
- * @return void
- */
-function PMA_getRelationalValues($db, $table)
-{
-    $column = $_REQUEST['column'];
-    if ($_SESSION['tmpval']['relational_display'] == 'D'
-        && isset($_REQUEST['relation_key_or_display_column'])
-        && $_REQUEST['relation_key_or_display_column']
-    ) {
-        $curr_value = $_REQUEST['relation_key_or_display_column'];
-    } else {
-        $curr_value = $_REQUEST['curr_value'];
-    }
-    $dropdown = PMA_getHtmlForRelationalColumnDropdown(
-        $db, $table, $column, $curr_value
-    );
-    $response = PMA\libraries\Response::getInstance();
-    $response->addJSON('dropdown', $dropdown);
-    exit;
-}
-
-/**
- * Function to get values for Enum or Set Columns
- *
- * @param String $db         the current database
- * @param String $table      the current table
- * @param String $columnType whether enum or set
- *
- * @return void
- */
-function PMA_getEnumOrSetValues($db, $table, $columnType)
-{
-    $column = $_REQUEST['column'];
-    $curr_value = $_REQUEST['curr_value'];
-    $response = PMA\libraries\Response::getInstance();
-    if ($columnType == "enum") {
-        $dropdown = PMA_getHtmlForEnumColumnDropdown(
-            $db, $table, $column, $curr_value
-        );
-        $response->addJSON('dropdown', $dropdown);
-    } else {
-        $select = PMA_getHtmlForSetColumn(
-            $db, $table, $column, $curr_value
-        );
-        $response->addJSON('select', $select);
-    }
-    exit;
-}
-
-/**
- * Function to get the default sql query for browsing page
- *
- * @param String $db    the current database
- * @param String $table the current table
- *
- * @return String $sql_query the default $sql_query for browse page
- */
-function PMA_getDefaultSqlQueryForBrowse($db, $table)
-{
-    include_once 'libraries/bookmark.lib.php';
-    $book_sql_query = PMA_Bookmark_get(
-        $db,
-        '\'' . $GLOBALS['dbi']->escapeString($table) . '\'',
-        'label',
-        false,
-        true
-    );
-
-    if (! empty($book_sql_query)) {
-        $GLOBALS['using_bookmark_message'] = Message::notice(
-            __('Using bookmark "%s" as default browse query.')
-        );
-        $GLOBALS['using_bookmark_message']->addParam($table);
-        $GLOBALS['using_bookmark_message']->addMessage(
-            PMA\libraries\Util::showDocu('faq', 'faq6-22')
-        );
-        $sql_query = $book_sql_query;
-    } else {
-
-        $defaultOrderByClause = '';
-
-        if (isset($GLOBALS['cfg']['TablePrimaryKeyOrder'])
-            && ($GLOBALS['cfg']['TablePrimaryKeyOrder'] !== 'NONE')
-        ) {
-
-            $primaryKey     = null;
-            $primary        = PMA\libraries\Index::getPrimary($table, $db);
-
-            if ($primary !== false) {
-
-                $primarycols    = $primary->getColumns();
-
-                foreach ($primarycols as $col) {
-                    $primaryKey = $col->getName();
-                    break;
-                }
-
-                if ($primaryKey != null) {
-                    $defaultOrderByClause = ' ORDER BY '
-                        . PMA\libraries\Util::backquote($table) . '.'
-                        . PMA\libraries\Util::backquote($primaryKey) . ' '
-                        . $GLOBALS['cfg']['TablePrimaryKeyOrder'];
-                }
-
-            }
-
-        }
-
-        $sql_query = 'SELECT * FROM ' . PMA\libraries\Util::backquote($table)
-            . $defaultOrderByClause;
-
-    }
-    unset($book_sql_query);
-
-    return $sql_query;
-}
-
-/**
- * Responds an error when an error happens when executing the query
- *
- * @param boolean $is_gotofile    whether goto file or not
- * @param String  $error          error after executing the query
- * @param String  $full_sql_query full sql query
- *
- * @return void
- */
-function PMA_handleQueryExecuteError($is_gotofile, $error, $full_sql_query)
-{
-    if ($is_gotofile) {
-        $message = PMA\libraries\Message::rawError($error);
-        $response = PMA\libraries\Response::getInstance();
-        $response->setRequestStatus(false);
-        $response->addJSON('message', $message);
-    } else {
-        PMA\libraries\Util::mysqlDie($error, $full_sql_query, '', '');
-    }
-    exit;
-}
-
-/**
- * Function to store the query as a bookmark
- *
- * @param String  $db                     the current database
- * @param String  $bkm_user               the bookmarking user
- * @param String  $sql_query_for_bookmark the query to be stored in bookmark
- * @param String  $bkm_label              bookmark label
- * @param boolean $bkm_replace            whether to replace existing bookmarks
- *
- * @return void
- */
-function PMA_storeTheQueryAsBookmark($db, $bkm_user, $sql_query_for_bookmark,
-    $bkm_label, $bkm_replace
-) {
-    include_once 'libraries/bookmark.lib.php';
-    $bfields = array(
-                 'bkm_database' => $db,
-                 'bkm_user'  => $bkm_user,
-                 'bkm_sql_query' => $sql_query_for_bookmark,
-                 'bkm_label' => $bkm_label
-    );
-
-    // Should we replace bookmark?
-    if (isset($bkm_replace)) {
-        $bookmarks = PMA_Bookmark_getList($db);
-        foreach ($bookmarks as $key => $val) {
-            if ($val['label'] == $bkm_label) {
-                PMA_Bookmark_delete($key);
-            }
-        }
-    }
-
-    PMA_Bookmark_save($bfields, isset($_POST['bkm_all_users']));
-
-}
-
-/**
- * Executes the SQL query and measures its execution time
- *
- * @param String $full_sql_query the full sql query
- *
- * @return array ($result, $querytime)
- */
-function PMA_executeQueryAndMeasureTime($full_sql_query)
-{
-    // close session in case the query takes too long
-    session_write_close();
-
-    // Measure query time.
-    $querytime_before = array_sum(explode(' ', microtime()));
-
-    $result = @$GLOBALS['dbi']->tryQuery(
-        $full_sql_query, null, PMA\libraries\DatabaseInterface::QUERY_STORE
-    );
-    $querytime_after = array_sum(explode(' ', microtime()));
-
-    // reopen session
-    session_start();
-
-    return array($result, $querytime_after - $querytime_before);
-}
-
-/**
- * Function to get the affected or changed number of rows after executing a query
- *
- * @param boolean $is_affected whether the query affected a table
- * @param mixed   $result      results of executing the query
- *
- * @return int    $num_rows    number of rows affected or changed
- */
-function PMA_getNumberOfRowsAffectedOrChanged($is_affected, $result)
-{
-    if (! $is_affected) {
-        $num_rows = ($result) ? @$GLOBALS['dbi']->numRows($result) : 0;
-    } else {
-        $num_rows = @$GLOBALS['dbi']->affectedRows();
-    }
-
-    return $num_rows;
-}
-
-/**
- * Checks if the current database has changed
- * This could happen if the user sends a query like "USE `database`;"
- *
- * @param String $db the database in the query
- *
- * @return int $reload whether to reload the navigation(1) or not(0)
- */
-function PMA_hasCurrentDbChanged($db)
-{
-    if (mb_strlen($db)) {
-        $current_db = $GLOBALS['dbi']->fetchValue('SELECT DATABASE()');
-        // $current_db is false, except when a USE statement was sent
-        return ($current_db != false) && ($db !== $current_db);
-    }
-
-    return false;
-}
-
-/**
- * If a table, database or column gets dropped, clean comments.
- *
- * @param String $db     current database
- * @param String $table  current table
- * @param String $column current column
- * @param bool   $purge  whether purge set or not
- *
- * @return array $extra_data
- */
-function PMA_cleanupRelations($db, $table, $column, $purge)
-{
-    include_once 'libraries/relation_cleanup.lib.php';
-
-    if (! empty($purge) && mb_strlen($db)) {
-        if (mb_strlen($table)) {
-            if (isset($column) && mb_strlen($column)) {
-                PMA_relationsCleanupColumn($db, $table, $column);
-            } else {
-                PMA_relationsCleanupTable($db, $table);
-            }
-        } else {
-            PMA_relationsCleanupDatabase($db);
-        }
-    }
-}
-
-/**
- * Function to count the total number of rows for the same 'SELECT' query without
- * the 'LIMIT' clause that may have been programatically added
- *
- * @param int    $num_rows             number of rows affected/changed by the query
- * @param bool   $justBrowsing         whether just browsing or not
- * @param string $db                   the current database
- * @param string $table                the current table
- * @param array  $analyzed_sql_results the analyzed query and other variables set
- *                                     after analyzing the query
- *
- * @return int $unlim_num_rows unlimited number of rows
- */
-function PMA_countQueryResults(
-    $num_rows, $justBrowsing, $db, $table, $analyzed_sql_results
-) {
-
-    /* Shortcut for not analyzed/empty query */
-    if (empty($analyzed_sql_results)) {
-        return 0;
-    }
-
-    if (!PMA_isAppendLimitClause($analyzed_sql_results)) {
-        // if we did not append a limit, set this to get a correct
-        // "Showing rows..." message
-        // $_SESSION['tmpval']['max_rows'] = 'all';
-        $unlim_num_rows = $num_rows;
-    } elseif ($analyzed_sql_results['querytype'] == 'SELECT'
-        || $analyzed_sql_results['is_subquery']
-    ) {
-        //    c o u n t    q u e r y
-
-        // If we are "just browsing", there is only one table (and no join),
-        // and no WHERE clause (or just 'WHERE 1 '),
-        // we do a quick count (which uses MaxExactCount) because
-        // SQL_CALC_FOUND_ROWS is not quick on large InnoDB tables
-
-        // However, do not count again if we did it previously
-        // due to $find_real_end == true
-        if ($justBrowsing) {
-            // Get row count (is approximate for InnoDB)
-            $unlim_num_rows = $GLOBALS['dbi']->getTable($db, $table)->countRecords();
-            /**
-             * @todo Can we know at this point that this is InnoDB,
-             *       (in this case there would be no need for getting
-             *       an exact count)?
-             */
-            if ($unlim_num_rows < $GLOBALS['cfg']['MaxExactCount']) {
-                // Get the exact count if approximate count
-                // is less than MaxExactCount
-                /**
-                 * @todo In countRecords(), MaxExactCount is also verified,
-                 *       so can we avoid checking it twice?
-                 */
-                $unlim_num_rows = $GLOBALS['dbi']->getTable($db, $table)
-                    ->countRecords(true);
-            }
-
-        } else {
-
-            // The SQL_CALC_FOUND_ROWS option of the SELECT statement is used.
-
-            // For UNION statements, only a SQL_CALC_FOUND_ROWS is required
-            // after the first SELECT.
-
-            $count_query = SqlParser\Utils\Query::replaceClause(
-                $analyzed_sql_results['statement'],
-                $analyzed_sql_results['parser']->list,
-                'SELECT SQL_CALC_FOUND_ROWS',
-                null,
-                true
-            );
-
-            // Another LIMIT clause is added to avoid long delays.
-            // A complete result will be returned anyway, but the LIMIT would
-            // stop the query as soon as the result that is required has been
-            // computed.
-
-            if (empty($analyzed_sql_results['union'])) {
-                $count_query .= ' LIMIT 1';
-            }
-
-            // Running the count query.
-            $GLOBALS['dbi']->tryQuery($count_query);
-
-            $unlim_num_rows = $GLOBALS['dbi']->fetchValue('SELECT FOUND_ROWS()');
-        } // end else "just browsing"
-    } else {// not $is_select
-        $unlim_num_rows = 0;
-    }
-
-    return $unlim_num_rows;
-}
-
-/**
- * Function to handle all aspects relating to executing the query
- *
- * @param array   $analyzed_sql_results   analyzed sql results
- * @param String  $full_sql_query         full sql query
- * @param boolean $is_gotofile            whether to go to a file
- * @param String  $db                     current database
- * @param String  $table                  current table
- * @param boolean $find_real_end          whether to find the real end
- * @param String  $sql_query_for_bookmark sql query to be stored as bookmark
- * @param array   $extra_data             extra data
- *
- * @return mixed
- */
-function PMA_executeTheQuery($analyzed_sql_results, $full_sql_query, $is_gotofile,
-    $db, $table, $find_real_end, $sql_query_for_bookmark, $extra_data
-) {
-    $response = PMA\libraries\Response::getInstance();
-    $response->getHeader()->getMenu()->setTable($table);
-
-    // Only if we ask to see the php code
-    if (isset($GLOBALS['show_as_php'])) {
-        $result = null;
-        $num_rows = 0;
-        $unlim_num_rows = 0;
-    } else { // If we don't ask to see the php code
-        if (isset($_SESSION['profiling'])
-            && PMA\libraries\Util::profilingSupported()
-        ) {
-            $GLOBALS['dbi']->query('SET PROFILING=1;');
-        }
-
-        list(
-            $result,
-            $GLOBALS['querytime']
-        ) = PMA_executeQueryAndMeasureTime($full_sql_query);
-
-        // Displays an error message if required and stop parsing the script
-        $error = $GLOBALS['dbi']->getError();
-        if ($error && $GLOBALS['cfg']['IgnoreMultiSubmitErrors']) {
-            $extra_data['error'] = $error;
-        } elseif ($error) {
-            PMA_handleQueryExecuteError($is_gotofile, $error, $full_sql_query);
-        }
-
-        // If there are no errors and bookmarklabel was given,
-        // store the query as a bookmark
-        if (! empty($_POST['bkm_label']) && ! empty($sql_query_for_bookmark)) {
-            $cfgBookmark = PMA_Bookmark_getParams();
-            PMA_storeTheQueryAsBookmark(
-                $db, $cfgBookmark['user'],
-                $sql_query_for_bookmark, $_POST['bkm_label'],
-                isset($_POST['bkm_replace']) ? $_POST['bkm_replace'] : null
-            );
-        } // end store bookmarks
-
-        // Gets the number of rows affected/returned
-        // (This must be done immediately after the query because
-        // mysql_affected_rows() reports about the last query done)
-        $num_rows = PMA_getNumberOfRowsAffectedOrChanged(
-            $analyzed_sql_results['is_affected'], $result
-        );
-
-        // Grabs the profiling results
-        if (isset($_SESSION['profiling'])
-            && PMA\libraries\Util::profilingSupported()
-        ) {
-            $profiling_results = $GLOBALS['dbi']->fetchResult('SHOW PROFILE;');
-        }
-
-        $justBrowsing = PMA_isJustBrowsing(
-            $analyzed_sql_results, isset($find_real_end) ? $find_real_end : null
-        );
-
-        $unlim_num_rows = PMA_countQueryResults(
-            $num_rows, $justBrowsing, $db, $table, $analyzed_sql_results
-        );
-
-        PMA_cleanupRelations(
-            isset($db) ? $db : '',
-            isset($table) ? $table : '',
-            isset($_REQUEST['dropped_column']) ? $_REQUEST['dropped_column'] : null,
-            isset($_REQUEST['purge']) ? $_REQUEST['purge'] : null
-        );
-
-        if (isset($_REQUEST['dropped_column'])
-            && mb_strlen($db)
-            && mb_strlen($table)
-        ) {
-            // to refresh the list of indexes (Ajax mode)
-            $extra_data['indexes_list'] = PMA\libraries\Index::getHtmlForIndexes(
-                $table,
-                $db
-            );
-        }
-    }
-
-    return array($result, $num_rows, $unlim_num_rows,
-        isset($profiling_results) ? $profiling_results : null, $extra_data
-    );
-}
-/**
- * Delete related tranformation information
- *
- * @param String $db                   current database
- * @param String $table                current table
- * @param array  $analyzed_sql_results analyzed sql results
- *
- * @return void
- */
-function PMA_deleteTransformationInfo($db, $table, $analyzed_sql_results)
-{
-    include_once 'libraries/transformations.lib.php';
-    $statement = $analyzed_sql_results['statement'];
-    if ($statement instanceof SqlParser\Statements\AlterStatement) {
-        if (!empty($statement->altered[0])
-            && $statement->altered[0]->options->has('DROP')
-        ) {
-            if (!empty($statement->altered[0]->field->column)) {
-                PMA_clearTransformations(
-                    $db,
-                    $table,
-                    $statement->altered[0]->field->column
-                );
-            }
-        }
-    } elseif ($statement instanceof SqlParser\Statements\DropStatement) {
-        PMA_clearTransformations($db, $table);
-    }
-}
-
-/**
- * Function to get the message for the no rows returned case
- *
- * @param string $message_to_show      message to show
- * @param array  $analyzed_sql_results analyzed sql results
- * @param int    $num_rows             number of rows
- *
- * @return string $message
- */
-function PMA_getMessageForNoRowsReturned($message_to_show,
-    $analyzed_sql_results, $num_rows
-) {
-    if ($analyzed_sql_results['querytype'] == 'DELETE"') {
-        $message = Message::getMessageForDeletedRows($num_rows);
-    } elseif ($analyzed_sql_results['is_insert']) {
-        if ($analyzed_sql_results['querytype'] == 'REPLACE') {
-            // For REPLACE we get DELETED + INSERTED row count,
-            // so we have to call it affected
-            $message = Message::getMessageForAffectedRows($num_rows);
-        } else {
-            $message = Message::getMessageForInsertedRows($num_rows);
-        }
-        $insert_id = $GLOBALS['dbi']->insertId();
-        if ($insert_id != 0) {
-            // insert_id is id of FIRST record inserted in one insert,
-            // so if we inserted multiple rows, we had to increment this
-            $message->addMessage('[br]');
-            // need to use a temporary because the Message class
-            // currently supports adding parameters only to the first
-            // message
-            $_inserted = Message::notice(__('Inserted row id: %1$d'));
-            $_inserted->addParam($insert_id + $num_rows - 1);
-            $message->addMessage($_inserted);
-        }
-    } elseif ($analyzed_sql_results['is_affected']) {
-        $message = Message::getMessageForAffectedRows($num_rows);
-
-        // Ok, here is an explanation for the !$is_select.
-        // The form generated by sql_query_form.lib.php
-        // and db_sql.php has many submit buttons
-        // on the same form, and some confusion arises from the
-        // fact that $message_to_show is sent for every case.
-        // The $message_to_show containing a success message and sent with
-        // the form should not have priority over errors
-    } elseif (! empty($message_to_show)
-        && $analyzed_sql_results['querytype'] != 'SELECT'
-    ) {
-        $message = Message::rawSuccess(htmlspecialchars($message_to_show));
-    } elseif (! empty($GLOBALS['show_as_php'])) {
-        $message = Message::success(__('Showing as PHP code'));
-    } elseif (isset($GLOBALS['show_as_php'])) {
-        /* User disable showing as PHP, query is only displayed */
-        $message = Message::notice(__('Showing SQL query'));
-    } else {
-        $message = Message::success(
-            __('MySQL returned an empty result set (i.e. zero rows).')
-        );
-    }
-
-    if (isset($GLOBALS['querytime'])) {
-        $_querytime = Message::notice(
-            '(' . __('Query took %01.4f seconds.') . ')'
-        );
-        $_querytime->addParam($GLOBALS['querytime']);
-        $message->addMessage($_querytime);
-    }
-
-    // In case of ROLLBACK, notify the user.
-    if (isset($_REQUEST['rollback_query'])) {
-        $message->addMessage(__('[ROLLBACK occurred.]'));
-    }
-
-    return $message;
-}
-
-/**
- * Function to respond back when the query returns zero rows
- * This method is called
- * 1-> When browsing an empty table
- * 2-> When executing a query on a non empty table which returns zero results
- * 3-> When executing a query on an empty table
- * 4-> When executing an INSERT, UPDATE, DELETE query from the SQL tab
- * 5-> When deleting a row from BROWSE tab
- * 6-> When searching using the SEARCH tab which returns zero results
- * 7-> When changing the structure of the table except change operation
- *
- * @param array          $analyzed_sql_results analyzed sql results
- * @param string         $db                   current database
- * @param string         $table                current table
- * @param string         $message_to_show      message to show
- * @param int            $num_rows             number of rows
- * @param DisplayResults $displayResultsObject DisplayResult instance
- * @param array          $extra_data           extra data
- * @param string         $pmaThemeImage        uri of the theme image
- * @param object         $result               executed query results
- * @param string         $sql_query            sql query
- * @param string         $complete_query       complete sql query
- *
- * @return string html
- */
-function PMA_getQueryResponseForNoResultsReturned($analyzed_sql_results, $db,
-    $table, $message_to_show, $num_rows, $displayResultsObject, $extra_data,
-    $pmaThemeImage, $result, $sql_query, $complete_query
-) {
-    if (PMA_isDeleteTransformationInfo($analyzed_sql_results)) {
-        PMA_deleteTransformationInfo($db, $table, $analyzed_sql_results);
-    }
-
-    if (isset($extra_data['error'])) {
-        $message = PMA\libraries\Message::rawError($extra_data['error']);
-    } else {
-        $message = PMA_getMessageForNoRowsReturned(
-            isset($message_to_show) ? $message_to_show : null,
-            $analyzed_sql_results, $num_rows
-        );
-    }
-
-    $html_output = '';
-    $html_message = PMA\libraries\Util::getMessage(
-        $message, $GLOBALS['sql_query'], 'success'
-    );
-    $html_output .= $html_message;
-    if (!isset($GLOBALS['show_as_php'])) {
-
-        if (! empty($GLOBALS['reload'])) {
-            $extra_data['reload'] = 1;
-            $extra_data['db'] = $GLOBALS['db'];
-        }
-
-        // For ajax requests add message and sql_query as JSON
-        if (empty($_REQUEST['ajax_page_request'])) {
-            $extra_data['message'] = $message;
-            if ($GLOBALS['cfg']['ShowSQL']) {
-                $extra_data['sql_query'] = $html_message;
-            }
-        }
-
-        $response = PMA\libraries\Response::getInstance();
-        $response->addJSON(isset($extra_data) ? $extra_data : array());
-
-        if (!empty($analyzed_sql_results['is_select']) &&
-                !isset($extra_data['error'])) {
-            $url_query = isset($url_query) ? $url_query : null;
-
-            $displayParts = array(
-                'edit_lnk' => null,
-                'del_lnk' => null,
-                'sort_lnk' => '1',
-                'nav_bar'  => '0',
-                'bkm_form' => '1',
-                'text_btn' => '1',
-                'pview_lnk' => '1'
-            );
-
-            $html_output .= PMA_getHtmlForSqlQueryResultsTable(
-                $displayResultsObject,
-                $pmaThemeImage, $url_query, $displayParts,
-                false, 0, $num_rows, true, $result,
-                $analyzed_sql_results, true
-            );
-
-            $html_output .= $displayResultsObject->getCreateViewQueryResultOp(
-                $analyzed_sql_results
-            );
-
-            $cfgBookmark = PMA_Bookmark_getParams();
-            if ($cfgBookmark) {
-                $html_output .= PMA_getHtmlForBookmark(
-                    $displayParts,
-                    $cfgBookmark,
-                    $sql_query, $db, $table,
-                    isset($complete_query) ? $complete_query : $sql_query,
-                    $cfgBookmark['user']
-                );
-            }
-        }
-    }
-
-    return $html_output;
-}
-
-/**
- * Function to send response for ajax grid edit
- *
- * @param object $result result of the executed query
- *
- * @return void
- */
-function PMA_sendResponseForGridEdit($result)
-{
-    $row = $GLOBALS['dbi']->fetchRow($result);
-    $field_flags = $GLOBALS['dbi']->fieldFlags($result, 0);
-    if (stristr($field_flags, PMA\libraries\DisplayResults::BINARY_FIELD)) {
-        $row[0] = bin2hex($row[0]);
-    }
-    $response = PMA\libraries\Response::getInstance();
-    $response->addJSON('value', $row[0]);
-    exit;
-}
-
-/**
- * Function to get html for the sql query results div
- *
- * @param string  $previous_update_query_html html for the previously executed query
- * @param string  $profiling_chart_html       html for profiling
- * @param Message $missing_unique_column_msg  message for the missing unique column
- * @param Message $bookmark_created_msg       message for bookmark creation
- * @param string  $table_html                 html for the table for displaying sql
- *                                            results
- * @param string  $indexes_problems_html      html for displaying errors in indexes
- * @param string  $bookmark_support_html      html for displaying bookmark form
- *
- * @return string $html_output
- */
-function PMA_getHtmlForSqlQueryResults($previous_update_query_html,
-    $profiling_chart_html, $missing_unique_column_msg, $bookmark_created_msg,
-    $table_html, $indexes_problems_html, $bookmark_support_html
-) {
-    //begin the sqlqueryresults div here. container div
-    $html_output = '<div class="sqlqueryresults ajax">';
-    $html_output .= isset($previous_update_query_html)
-        ? $previous_update_query_html : '';
-    $html_output .= isset($profiling_chart_html) ? $profiling_chart_html : '';
-    $html_output .= isset($missing_unique_column_msg)
-        ? $missing_unique_column_msg->getDisplay() : '';
-    $html_output .= isset($bookmark_created_msg)
-        ? $bookmark_created_msg->getDisplay() : '';
-    $html_output .= $table_html;
-    $html_output .= isset($indexes_problems_html) ? $indexes_problems_html : '';
-    $html_output .= isset($bookmark_support_html) ? $bookmark_support_html : '';
-    $html_output .= '</div>'; // end sqlqueryresults div
-
-    return $html_output;
-}
-
-/**
- * Returns a message for successful creation of a bookmark or null if a bookmark
- * was not created
- *
- * @return Message $bookmark_created_msg
- */
-function PMA_getBookmarkCreatedMessage()
-{
-    if (isset($_GET['label'])) {
-        $bookmark_created_msg = Message::success(
-            __('Bookmark %s has been created.')
-        );
-        $bookmark_created_msg->addParam($_GET['label']);
-    } else {
-        $bookmark_created_msg = null;
-    }
-
-    return $bookmark_created_msg;
-}
-
-/**
- * Function to get html for the sql query results table
- *
- * @param DisplayResults $displayResultsObject instance of DisplayResult
- * @param string         $pmaThemeImage        theme image uri
- * @param string         $url_query            url query
- * @param array          $displayParts         the parts to display
- * @param bool           $editable             whether the result table is
- *                                             editable or not
- * @param int            $unlim_num_rows       unlimited number of rows
- * @param int            $num_rows             number of rows
- * @param bool           $showtable            whether to show table or not
- * @param object         $result               result of the executed query
- * @param array          $analyzed_sql_results analyzed sql results
- * @param bool           $is_limited_display   Show only limited operations or not
- *
- * @return String
- */
-function PMA_getHtmlForSqlQueryResultsTable($displayResultsObject,
-    $pmaThemeImage, $url_query, $displayParts,
-    $editable, $unlim_num_rows, $num_rows, $showtable, $result,
-    $analyzed_sql_results, $is_limited_display = false
-) {
-    $printview = isset($_REQUEST['printview']) ? $_REQUEST['printview'] : null;
-    $table_html = '';
-    $browse_dist = ! empty($_REQUEST['is_browse_distinct']);
-
-    if ($analyzed_sql_results['is_procedure']) {
-
-        do {
-            if (! isset($result)) {
-                $result = $GLOBALS['dbi']->storeResult();
-            }
-            $num_rows = $GLOBALS['dbi']->numRows($result);
-
-            if ($result !== false && $num_rows > 0) {
-
-                $fields_meta = $GLOBALS['dbi']->getFieldsMeta($result);
-                $fields_cnt  = count($fields_meta);
-
-                $displayResultsObject->setProperties(
-                    $num_rows,
-                    $fields_meta,
-                    $analyzed_sql_results['is_count'],
-                    $analyzed_sql_results['is_export'],
-                    $analyzed_sql_results['is_func'],
-                    $analyzed_sql_results['is_analyse'],
-                    $num_rows,
-                    $fields_cnt,
-                    $GLOBALS['querytime'],
-                    $pmaThemeImage,
-                    $GLOBALS['text_dir'],
-                    $analyzed_sql_results['is_maint'],
-                    $analyzed_sql_results['is_explain'],
-                    $analyzed_sql_results['is_show'],
-                    $showtable,
-                    $printview,
-                    $url_query,
-                    $editable,
-                    $browse_dist
-                );
-
-                $displayParts = array(
-                    'edit_lnk' => $displayResultsObject::NO_EDIT_OR_DELETE,
-                    'del_lnk' => $displayResultsObject::NO_EDIT_OR_DELETE,
-                    'sort_lnk' => '1',
-                    'nav_bar'  => '1',
-                    'bkm_form' => '1',
-                    'text_btn' => '1',
-                    'pview_lnk' => '1'
-                );
-
-                $table_html .= $displayResultsObject->getTable(
-                    $result,
-                    $displayParts,
-                    $analyzed_sql_results,
-                    $is_limited_display
-                );
-            }
-
-            $GLOBALS['dbi']->freeResult($result);
-            unset($result);
-
-        } while ($GLOBALS['dbi']->moreResults() && $GLOBALS['dbi']->nextResult());
-
-    } else {
-        if (isset($result) && $result) {
-            $fields_meta = $GLOBALS['dbi']->getFieldsMeta($result);
-            $fields_cnt  = count($fields_meta);
-        }
-        $_SESSION['is_multi_query'] = false;
-        $displayResultsObject->setProperties(
-            $unlim_num_rows,
-            $fields_meta,
-            $analyzed_sql_results['is_count'],
-            $analyzed_sql_results['is_export'],
-            $analyzed_sql_results['is_func'],
-            $analyzed_sql_results['is_analyse'],
-            $num_rows,
-            $fields_cnt, $GLOBALS['querytime'],
-            $pmaThemeImage, $GLOBALS['text_dir'],
-            $analyzed_sql_results['is_maint'],
-            $analyzed_sql_results['is_explain'],
-            $analyzed_sql_results['is_show'],
-            $showtable,
-            $printview,
-            $url_query,
-            $editable,
-            $browse_dist
-        );
-
-        $table_html .= $displayResultsObject->getTable(
-            $result,
-            $displayParts,
-            $analyzed_sql_results,
-            $is_limited_display
-        );
-        $GLOBALS['dbi']->freeResult($result);
-    }
-
-    return $table_html;
-}
-
-/**
- * Function to get html for the previous query if there is such. If not will return
- * null
- *
- * @param string $disp_query   display query
- * @param bool   $showSql      whether to show sql
- * @param array  $sql_data     sql data
- * @param string $disp_message display message
- *
- * @return string $previous_update_query_html
- */
-function PMA_getHtmlForPreviousUpdateQuery($disp_query, $showSql, $sql_data,
-    $disp_message
-) {
-    // previous update query (from tbl_replace)
-    if (isset($disp_query) && ($showSql == true) && empty($sql_data)) {
-        $previous_update_query_html = PMA\libraries\Util::getMessage(
-            $disp_message, $disp_query, 'success'
-        );
-    } else {
-        $previous_update_query_html = null;
-    }
-
-    return $previous_update_query_html;
-}
-
-/**
- * To get the message if a column index is missing. If not will return null
- *
- * @param string  $table      current table
- * @param string  $db         current database
- * @param boolean $editable   whether the results table can be editable or not
- * @param boolean $has_unique whether there is a unique key
- *
- * @return Message $message
- */
-function PMA_getMessageIfMissingColumnIndex($table, $db, $editable, $has_unique)
-{
-    if (!empty($table) && ($GLOBALS['dbi']->isSystemSchema($db) || !$editable)) {
-        $missing_unique_column_msg = Message::notice(
-            sprintf(
-                __(
-                    'Current selection does not contain a unique column.'
-                    . ' Grid edit, checkbox, Edit, Copy and Delete features'
-                    . ' are not available. %s'
-                ),
-                PMA\libraries\Util::showDocu(
-                    'config',
-                    'cfg_RowActionLinksWithoutUnique'
-                )
-            )
-        );
-    } elseif (! empty($table) && ! $has_unique) {
-        $missing_unique_column_msg = Message::notice(
-            sprintf(
-                __(
-                    'Current selection does not contain a unique column.'
-                    . ' Grid edit, Edit, Copy and Delete features may result in'
-                    . ' undesired behavior. %s'
-                ),
-                PMA\libraries\Util::showDocu(
-                    'config',
-                    'cfg_RowActionLinksWithoutUnique'
-                )
-            )
-        );
-    } else {
-        $missing_unique_column_msg = null;
-    }
-
-    return $missing_unique_column_msg;
-}
-
-/**
- * Function to get html to display problems in indexes
- *
- * @param string     $query_type     query type
- * @param array|null $selectedTables array of table names selected from the
- *                                   database structure page, for an action
- *                                   like check table, optimize table,
- *                                   analyze table or repair table
- * @param string     $db             current database
- *
- * @return string
- */
-function PMA_getHtmlForIndexesProblems($query_type, $selectedTables, $db)
-{
-    // BEGIN INDEX CHECK See if indexes should be checked.
-    if (isset($query_type)
-        && $query_type == 'check_tbl'
-        && isset($selectedTables)
-        && is_array($selectedTables)
-    ) {
-        $indexes_problems_html = '';
-        foreach ($selectedTables as $tbl_name) {
-            $check = PMA\libraries\Index::findDuplicates($tbl_name, $db);
-            if (! empty($check)) {
-                $indexes_problems_html .= sprintf(
-                    __('Problems with indexes of table `%s`'), $tbl_name
-                );
-                $indexes_problems_html .= $check;
-            }
-        }
-    } else {
-        $indexes_problems_html = null;
-    }
-
-    return $indexes_problems_html;
-}
-
-/**
- * Function to display results when the executed query returns non empty results
- *
- * @param object         $result               executed query results
- * @param array          $analyzed_sql_results analysed sql results
- * @param string         $db                   current database
- * @param string         $table                current table
- * @param string         $message              message to show
- * @param array          $sql_data             sql data
- * @param DisplayResults $displayResultsObject Instance of DisplayResults
- * @param string         $pmaThemeImage        uri of the theme image
- * @param int            $unlim_num_rows       unlimited number of rows
- * @param int            $num_rows             number of rows
- * @param string         $disp_query           display query
- * @param string         $disp_message         display message
- * @param array          $profiling_results    profiling results
- * @param string         $query_type           query type
- * @param array|null     $selectedTables       array of table names selected
- *                                             from the database structure page, for
- *                                             an action like check table,
- *                                             optimize table, analyze table or
- *                                             repair table
- * @param string         $sql_query            sql query
- * @param string         $complete_query       complete sql query
- *
- * @return string html
- */
-function PMA_getQueryResponseForResultsReturned($result, $analyzed_sql_results,
-    $db, $table, $message, $sql_data, $displayResultsObject, $pmaThemeImage,
-    $unlim_num_rows, $num_rows, $disp_query, $disp_message, $profiling_results,
-    $query_type, $selectedTables, $sql_query, $complete_query
-) {
-    // If we are retrieving the full value of a truncated field or the original
-    // value of a transformed field, show it here
-    if (isset($_REQUEST['grid_edit']) && $_REQUEST['grid_edit'] == true) {
-        PMA_sendResponseForGridEdit($result);
-        // script has exited at this point
-    }
-
-    // Gets the list of fields properties
-    if (isset($result) && $result) {
-        $fields_meta = $GLOBALS['dbi']->getFieldsMeta($result);
-    }
-
-    // Should be initialized these parameters before parsing
-    $showtable = isset($showtable) ? $showtable : null;
-    $url_query = isset($url_query) ? $url_query : null;
-
-    $response = PMA\libraries\Response::getInstance();
-    $header   = $response->getHeader();
-    $scripts  = $header->getScripts();
-
-    $just_one_table = PMA_resultSetHasJustOneTable($fields_meta);
-
-    // hide edit and delete links:
-    // - for information_schema
-    // - if the result set does not contain all the columns of a unique key
-    //   (unless this is an updatable view)
-    // - if the SELECT query contains a join or a subquery
-
-    $updatableView = false;
-
-    $statement = $analyzed_sql_results['statement'];
-    if ($statement instanceof SqlParser\Statements\SelectStatement) {
-        if (!empty($statement->expr)) {
-            if ($statement->expr[0]->expr === '*') {
-                $_table = new Table($table, $db);
-                $updatableView = $_table->isUpdatableView();
-            }
-        }
-
-        if ($analyzed_sql_results['join']
-            || $analyzed_sql_results['is_subquery']
-            || count($analyzed_sql_results['select_tables']) !== 1
-        ) {
-            $just_one_table = false;
-        }
-    }
-
-    $has_unique = PMA_resultSetContainsUniqueKey(
-        $db, $table, $fields_meta
-    );
-
-    $editable = ($has_unique
-        || $GLOBALS['cfg']['RowActionLinksWithoutUnique']
-        || $updatableView)
-        && $just_one_table;
-
-    $displayParts = array(
-        'edit_lnk' => $displayResultsObject::UPDATE_ROW,
-        'del_lnk' => $displayResultsObject::DELETE_ROW,
-        'sort_lnk' => '1',
-        'nav_bar'  => '1',
-        'bkm_form' => '1',
-        'text_btn' => '0',
-        'pview_lnk' => '1'
-    );
-
-    if ($GLOBALS['dbi']->isSystemSchema($db) || !$editable) {
-        $displayParts = array(
-            'edit_lnk' => $displayResultsObject::NO_EDIT_OR_DELETE,
-            'del_lnk' => $displayResultsObject::NO_EDIT_OR_DELETE,
-            'sort_lnk' => '1',
-            'nav_bar'  => '1',
-            'bkm_form' => '1',
-            'text_btn' => '1',
-            'pview_lnk' => '1'
-        );
-
-    }
-    if (isset($_REQUEST['printview']) && $_REQUEST['printview'] == '1') {
-        $displayParts = array(
-            'edit_lnk' => $displayResultsObject::NO_EDIT_OR_DELETE,
-            'del_lnk' => $displayResultsObject::NO_EDIT_OR_DELETE,
-            'sort_lnk' => '0',
-            'nav_bar'  => '0',
-            'bkm_form' => '0',
-            'text_btn' => '0',
-            'pview_lnk' => '0'
-        );
-    }
-
-    if (isset($_REQUEST['table_maintenance'])) {
-        $scripts->addFile('makegrid.js');
-        $scripts->addFile('sql.js');
-        $table_maintenance_html = '';
-        if (isset($message)) {
-            $message = Message::success($message);
-            $table_maintenance_html = PMA\libraries\Util::getMessage(
-                $message, $GLOBALS['sql_query'], 'success'
-            );
-        }
-        $table_maintenance_html .= PMA_getHtmlForSqlQueryResultsTable(
-            $displayResultsObject,
-            $pmaThemeImage, $url_query, $displayParts,
-            false, $unlim_num_rows, $num_rows, $showtable, $result,
-            $analyzed_sql_results
-        );
-        if (empty($sql_data) || ($sql_data['valid_queries'] = 1)) {
-            $response->addHTML($table_maintenance_html);
-            exit();
-        }
-    }
-
-    if (!isset($_REQUEST['printview']) || $_REQUEST['printview'] != '1') {
-        $scripts->addFile('makegrid.js');
-        $scripts->addFile('sql.js');
-        unset($GLOBALS['message']);
-        //we don't need to buffer the output in getMessage here.
-        //set a global variable and check against it in the function
-        $GLOBALS['buffer_message'] = false;
-    }
-
-    $previous_update_query_html = PMA_getHtmlForPreviousUpdateQuery(
-        isset($disp_query) ? $disp_query : null,
-        $GLOBALS['cfg']['ShowSQL'], isset($sql_data) ? $sql_data : null,
-        isset($disp_message) ? $disp_message : null
-    );
-
-    $profiling_chart_html = PMA_getHtmlForProfilingChart(
-        $url_query, $db, isset($profiling_results) ? $profiling_results :array()
-    );
-
-    $missing_unique_column_msg = PMA_getMessageIfMissingColumnIndex(
-        $table, $db, $editable, $has_unique
-    );
-
-    $bookmark_created_msg = PMA_getBookmarkCreatedMessage();
-
-    $table_html = PMA_getHtmlForSqlQueryResultsTable(
-        $displayResultsObject,
-        $pmaThemeImage, $url_query, $displayParts,
-        $editable, $unlim_num_rows, $num_rows, $showtable, $result,
-        $analyzed_sql_results
-    );
-
-    $indexes_problems_html = PMA_getHtmlForIndexesProblems(
-        isset($query_type) ? $query_type : null,
-        isset($selectedTables) ? $selectedTables : null, $db
-    );
-
-    $cfgBookmark = PMA_Bookmark_getParams();
-    if ($cfgBookmark) {
-        $bookmark_support_html = PMA_getHtmlForBookmark(
-            $displayParts,
-            $cfgBookmark,
-            $sql_query, $db, $table,
-            isset($complete_query) ? $complete_query : $sql_query,
-            $cfgBookmark['user']
-        );
-    } else {
-        $bookmark_support_html = '';
-    }
-
-    $html_output = isset($table_maintenance_html) ? $table_maintenance_html : '';
-
-    $html_output .= PMA_getHtmlForSqlQueryResults(
-        $previous_update_query_html, $profiling_chart_html,
-        $missing_unique_column_msg, $bookmark_created_msg,
-        $table_html, $indexes_problems_html, $bookmark_support_html
-    );
-
-    return $html_output;
-}
-
-/**
- * Function to execute the query and send the response
- *
- * @param array      $analyzed_sql_results   analysed sql results
- * @param bool       $is_gotofile            whether goto file or not
- * @param string     $db                     current database
- * @param string     $table                  current table
- * @param bool|null  $find_real_end          whether to find real end or not
- * @param string     $sql_query_for_bookmark the sql query to be stored as bookmark
- * @param array|null $extra_data             extra data
- * @param string     $message_to_show        message to show
- * @param string     $message                message
- * @param array|null $sql_data               sql data
- * @param string     $goto                   goto page url
- * @param string     $pmaThemeImage          uri of the PMA theme image
- * @param string     $disp_query             display query
- * @param string     $disp_message           display message
- * @param string     $query_type             query type
- * @param string     $sql_query              sql query
- * @param array|null $selectedTables         array of table names selected from the
- *                                           database structure page, for an action
- *                                           like check table, optimize table,
- *                                           analyze table or repair table
- * @param string     $complete_query         complete query
- *
- * @return void
- */
-function PMA_executeQueryAndSendQueryResponse($analyzed_sql_results,
-    $is_gotofile, $db, $table, $find_real_end, $sql_query_for_bookmark,
-    $extra_data, $message_to_show, $message, $sql_data, $goto, $pmaThemeImage,
-    $disp_query, $disp_message, $query_type, $sql_query, $selectedTables,
-    $complete_query
-) {
-    if ($analyzed_sql_results == null) {
-        // Parse and analyze the query
-        include_once 'libraries/parse_analyze.lib.php';
-        list(
-            $analyzed_sql_results,
-            $db,
-            $table_from_sql
-        ) = PMA_parseAnalyze($sql_query, $db);
-        // @todo: possibly refactor
-        extract($analyzed_sql_results);
-
-        if ($table != $table_from_sql && !empty($table_from_sql)) {
-            $table = $table_from_sql;
-        }
-    }
-
-    $html_output = PMA_executeQueryAndGetQueryResponse(
-        $analyzed_sql_results, // analyzed_sql_results
-        $is_gotofile, // is_gotofile
-        $db, // db
-        $table, // table
-        $find_real_end, // find_real_end
-        $sql_query_for_bookmark, // sql_query_for_bookmark
-        $extra_data, // extra_data
-        $message_to_show, // message_to_show
-        $message, // message
-        $sql_data, // sql_data
-        $goto, // goto
-        $pmaThemeImage, // pmaThemeImage
-        $disp_query, // disp_query
-        $disp_message, // disp_message
-        $query_type, // query_type
-        $sql_query, // sql_query
-        $selectedTables, // selectedTables
-        $complete_query // complete_query
-    );
-
-    $response = PMA\libraries\Response::getInstance();
-    $response->addHTML($html_output);
-}
-
-/**
- * Function to execute the query and send the response
- *
- * @param array      $analyzed_sql_results   analysed sql results
- * @param bool       $is_gotofile            whether goto file or not
- * @param string     $db                     current database
- * @param string     $table                  current table
- * @param bool|null  $find_real_end          whether to find real end or not
- * @param string     $sql_query_for_bookmark the sql query to be stored as bookmark
- * @param array|null $extra_data             extra data
- * @param string     $message_to_show        message to show
- * @param string     $message                message
- * @param array|null $sql_data               sql data
- * @param string     $goto                   goto page url
- * @param string     $pmaThemeImage          uri of the PMA theme image
- * @param string     $disp_query             display query
- * @param string     $disp_message           display message
- * @param string     $query_type             query type
- * @param string     $sql_query              sql query
- * @param array|null $selectedTables         array of table names selected from the
- *                                           database structure page, for an action
- *                                           like check table, optimize table,
- *                                           analyze table or repair table
- * @param string     $complete_query         complete query
- *
- * @return string html
- */
-function PMA_executeQueryAndGetQueryResponse($analyzed_sql_results,
-    $is_gotofile, $db, $table, $find_real_end, $sql_query_for_bookmark,
-    $extra_data, $message_to_show, $message, $sql_data, $goto, $pmaThemeImage,
-    $disp_query, $disp_message, $query_type, $sql_query, $selectedTables,
-    $complete_query
-) {
-    // Handle disable/enable foreign key checks
-    $default_fk_check = PMA\libraries\Util::handleDisableFKCheckInit();
-
-    // Handle remembered sorting order, only for single table query.
-    // Handling is not required when it's a union query
-    // (the parser never sets the 'union' key to 0).
-    // Handling is also not required if we came from the "Sort by key"
-    // drop-down.
-    if (! empty($analyzed_sql_results)
-        && PMA_isRememberSortingOrder($analyzed_sql_results)
-        && empty($analyzed_sql_results['union'])
-        && ! isset($_REQUEST['sort_by_key'])
-    ) {
-        if (! isset($_SESSION['sql_from_query_box'])) {
-            PMA_handleSortOrder($db, $table, $analyzed_sql_results, $sql_query);
-        } else {
-            unset($_SESSION['sql_from_query_box']);
-        }
-
-    }
-
-    $displayResultsObject = new PMA\libraries\DisplayResults(
-        $GLOBALS['db'], $GLOBALS['table'], $goto, $sql_query
-    );
-    $displayResultsObject->setConfigParamsForDisplayTable();
-
-    // assign default full_sql_query
-    $full_sql_query = $sql_query;
-
-    // Do append a "LIMIT" clause?
-    if (PMA_isAppendLimitClause($analyzed_sql_results)) {
-        $full_sql_query = PMA_getSqlWithLimitClause($analyzed_sql_results);
-    }
-
-    $GLOBALS['reload'] = PMA_hasCurrentDbChanged($db);
-    $GLOBALS['dbi']->selectDb($db);
-
-    // Execute the query
-    list($result, $num_rows, $unlim_num_rows, $profiling_results, $extra_data)
-        = PMA_executeTheQuery(
-            $analyzed_sql_results,
-            $full_sql_query,
-            $is_gotofile,
-            $db,
-            $table,
-            isset($find_real_end) ? $find_real_end : null,
-            isset($sql_query_for_bookmark) ? $sql_query_for_bookmark : null,
-            isset($extra_data) ? $extra_data : null
-        );
-
-    // No rows returned -> move back to the calling page
-    if ((0 == $num_rows && 0 == $unlim_num_rows)
-        || $analyzed_sql_results['is_affected']
-    ) {
-        $html_output = PMA_getQueryResponseForNoResultsReturned(
-            $analyzed_sql_results, $db, $table,
-            isset($message_to_show) ? $message_to_show : null,
-            $num_rows, $displayResultsObject, $extra_data,
-            $pmaThemeImage, isset($result) ? $result : null,
-            $sql_query, isset($complete_query) ? $complete_query : null
-        );
-    } else {
-        // At least one row is returned -> displays a table with results
-        $html_output = PMA_getQueryResponseForResultsReturned(
-            isset($result) ? $result : null,
-            $analyzed_sql_results,
-            $db,
-            $table,
-            isset($message) ? $message : null,
-            isset($sql_data) ? $sql_data : null,
-            $displayResultsObject,
-            $pmaThemeImage,
-            $unlim_num_rows,
-            $num_rows,
-            isset($disp_query) ? $disp_query : null,
-            isset($disp_message) ? $disp_message : null,
-            $profiling_results,
-            isset($query_type) ? $query_type : null,
-            isset($selectedTables) ? $selectedTables : null,
-            $sql_query,
-            isset($complete_query) ? $complete_query : null
-        );
-    }
-
-    // Handle disable/enable foreign key checks
-    PMA\libraries\Util::handleDisableFKCheckCleanup($default_fk_check);
-
-    return $html_output;
-}
-
-/**
- * Function to define pos to display a row
- *
- * @param Int $number_of_line Number of the line to display
- * @param Int $max_rows       Number of rows by page
- *
- * @return Int Start position to display the line
- */
-function PMA_getStartPosToDisplayRow($number_of_line, $max_rows = null)
-{
-    if (null === $max_rows) {
-        $max_rows = $_SESSION['tmpval']['max_rows'];
-    }
-
-    return @((ceil($number_of_line / $max_rows) - 1) * $max_rows);
-}
-
-/**
- * Function to calculate new pos if pos is higher than number of rows
- * of displayed table
- *
- * @param String   $db    Database name
- * @param String   $table Table name
- * @param Int|null $pos   Initial position
- *
- * @return Int Number of pos to display last page
- */
-function PMA_calculatePosForLastPage($db, $table, $pos)
-{
-    if (null === $pos) {
-        $pos = $_SESSION['tmpval']['pos'];
-    }
-
-    $_table = new Table($table, $db);
-    $unlim_num_rows = $_table->countRecords(true);
-    //If position is higher than number of rows
-    if ($unlim_num_rows <= $pos && 0 != $pos) {
-        $pos = PMA_getStartPosToDisplayRow($unlim_num_rows);
-    }
-
-    return $pos;
-}
diff --git a/#pma/libraries/sql_query_form.lib.php b/#pma/libraries/sql_query_form.lib.php
deleted file mode 100644
index 35ee7b70..00000000
--- a/#pma/libraries/sql_query_form.lib.php
+++ /dev/null
@@ -1,435 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * functions for displaying the sql query form
- *
- * @usedby  server_sql.php
- * @usedby  db_sql.php
- * @usedby  tbl_sql.php
- * @usedby  tbl_structure.php
- * @usedby  tbl_tracking.php
- * @package PhpMyAdmin
- */
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
-/**
- *
- */
-require_once './libraries/file_listing.lib.php'; // used for file listing
-require_once './libraries/bookmark.lib.php'; // used for bookmarks
-
-/**
- * return HTML for the sql query boxes
- *
- * @param boolean|string $query       query to display in the textarea
- *                                    or true to display last executed
- * @param boolean|string $display_tab sql|full|false
- *                                    what part to display
- *                                    false if not inside querywindow
- * @param string         $delimiter   delimiter
- *
- * @return string
- *
- * @usedby  server_sql.php
- * @usedby  db_sql.php
- * @usedby  tbl_sql.php
- * @usedby  tbl_structure.php
- * @usedby  tbl_tracking.php
- */
-function PMA_getHtmlForSqlQueryForm(
-    $query = true, $display_tab = false, $delimiter = ';'
-) {
-    $html = '';
-    if (! $display_tab) {
-        $display_tab = 'full';
-    }
-    // query to show
-    if (true === $query) {
-        $query = $GLOBALS['sql_query'];
-    }
-
-    // set enctype to multipart for file uploads
-    if ($GLOBALS['is_upload']) {
-        $enctype = ' enctype="multipart/form-data"';
-    } else {
-        $enctype = '';
-    }
-
-    $table  = '';
-    $db     = '';
-    if (! mb_strlen($GLOBALS['db'])) {
-        // prepare for server related
-        $goto   = empty($GLOBALS['goto']) ?
-                    'server_sql.php' : $GLOBALS['goto'];
-    } elseif (! mb_strlen($GLOBALS['table'])) {
-        // prepare for db related
-        $db     = $GLOBALS['db'];
-        $goto   = empty($GLOBALS['goto']) ?
-                    'db_sql.php' : $GLOBALS['goto'];
-    } else {
-        $table  = $GLOBALS['table'];
-        $db     = $GLOBALS['db'];
-        $goto   = empty($GLOBALS['goto']) ?
-                    'tbl_sql.php' : $GLOBALS['goto'];
-    }
-
-    // start output
-    $html .= '<form method="post" action="import.php" ' . $enctype;
-    $html .= ' class="ajax lock-page"';
-    $html .= ' id="sqlqueryform" name="sqlform">' . "\n";
-
-    $html .= '<input type="hidden" name="is_js_confirmed" value="0" />'
-        . "\n" . PMA_URL_getHiddenInputs($db, $table) . "\n"
-        . '<input type="hidden" name="pos" value="0" />' . "\n"
-        . '<input type="hidden" name="goto" value="'
-        . htmlspecialchars($goto) . '" />' . "\n"
-        . '<input type="hidden" name="message_to_show" value="'
-        . __('Your SQL query has been executed successfully.') . '" />'
-        . "\n" . '<input type="hidden" name="prev_sql_query" value="'
-        . htmlspecialchars($query) . '" />' . "\n";
-
-    // display querybox
-    if ($display_tab === 'full' || $display_tab === 'sql') {
-        $html .= PMA_getHtmlForSqlQueryFormInsert(
-            $query, $delimiter
-        );
-    }
-
-    // Bookmark Support
-    if ($display_tab === 'full') {
-        $cfgBookmark = PMA_Bookmark_getParams();
-        if ($cfgBookmark) {
-            $html .= PMA_getHtmlForSqlQueryFormBookmark();
-        }
-    }
-
-    // Encoding setting form appended by Y.Kawada
-    if (function_exists('PMA_Kanji_encodingForm')) {
-        $html .= PMA_Kanji_encodingForm();
-    }
-
-    $html .= '</form>' . "\n";
-    // print an empty div, which will be later filled with
-    // the sql query results by ajax
-    $html .= '<div id="sqlqueryresultsouter"></div>';
-
-    return $html;
-}
-
-/**
- * Get initial values for Sql Query Form Insert
- *
- * @param string $query query to display in the textarea
- *
- * @return array ($legend, $query, $columns_list)
- *
- * @usedby  PMA_getHtmlForSqlQueryFormInsert()
- */
-function PMA_initQueryForm($query)
-{
-    $columns_list    = array();
-    if (! mb_strlen($GLOBALS['db'])) {
-        // prepare for server related
-        $legend = sprintf(
-            __('Run SQL query/queries on server %s'),
-            '&quot;' . htmlspecialchars(
-                ! empty($GLOBALS['cfg']['Servers'][$GLOBALS['server']]['verbose'])
-                ? $GLOBALS['cfg']['Servers'][$GLOBALS['server']]['verbose']
-                : $GLOBALS['cfg']['Servers'][$GLOBALS['server']]['host']
-            ) . '&quot;'
-        );
-    } elseif (! mb_strlen($GLOBALS['table'])) {
-        // prepare for db related
-        $db     = $GLOBALS['db'];
-        // if you want navigation:
-        $tmp_db_link = '<a href="' . PMA\libraries\Util::getScriptNameForOption(
-            $GLOBALS['cfg']['DefaultTabDatabase'], 'database'
-        )
-            . PMA_URL_getCommon(array('db' => $db)) . '"';
-        $tmp_db_link .= '>'
-            . htmlspecialchars($db) . '</a>';
-        $legend = sprintf(__('Run SQL query/queries on database %s'), $tmp_db_link);
-        if (empty($query)) {
-            $query = PMA\libraries\Util::expandUserString(
-                $GLOBALS['cfg']['DefaultQueryDatabase'], 'backquote'
-            );
-        }
-    } else {
-        $db     = $GLOBALS['db'];
-        $table  = $GLOBALS['table'];
-        // Get the list and number of fields
-        // we do a try_query here, because we could be in the query window,
-        // trying to synchronize and the table has not yet been created
-        $columns_list = $GLOBALS['dbi']->getColumns(
-            $db, $GLOBALS['table'], null, true
-        );
-
-        $tmp_tbl_link = '<a href="' . PMA\libraries\Util::getScriptNameForOption(
-            $GLOBALS['cfg']['DefaultTabTable'], 'table'
-        ) . PMA_URL_getCommon(array('db' => $db, 'table' => $table)) . '" >';
-        $tmp_tbl_link .= htmlspecialchars($db)
-            . '.' . htmlspecialchars($table) . '</a>';
-        $legend = sprintf(__('Run SQL query/queries on table %s'), $tmp_tbl_link);
-        if (empty($query)) {
-            $query = PMA\libraries\Util::expandUserString(
-                $GLOBALS['cfg']['DefaultQueryTable'], 'backquote'
-            );
-        }
-    }
-    $legend .= ': ' . PMA\libraries\Util::showMySQLDocu('SELECT');
-
-    return array($legend, $query, $columns_list);
-}
-
-/**
- * return HTML for Sql Query Form Insert
- *
- * @param string $query     query to display in the textarea
- * @param string $delimiter default delimiter to use
- *
- * @return string
- *
- * @usedby  PMA_getHtmlForSqlQueryForm()
- */
-function PMA_getHtmlForSqlQueryFormInsert(
-    $query = '', $delimiter = ';'
-) {
-    // enable auto select text in textarea
-    if ($GLOBALS['cfg']['TextareaAutoSelect']) {
-        $auto_sel = ' onclick="selectContent(this, sql_box_locked, true);"';
-    } else {
-        $auto_sel = '';
-    }
-
-    $locking = '';
-    $height = $GLOBALS['cfg']['TextareaRows'] * 2;
-
-    list($legend, $query, $columns_list) = PMA_initQueryForm($query);
-
-    if (! empty($columns_list)) {
-        $sqlquerycontainer_id = 'sqlquerycontainer';
-    } else {
-        $sqlquerycontainer_id = 'sqlquerycontainerfull';
-    }
-
-    $html = '<a id="querybox"></a>'
-        . '<div id="queryboxcontainer">'
-        . '<fieldset id="queryboxf">';
-    $html .= '<legend>' . $legend . '</legend>';
-    $html .= '<div id="queryfieldscontainer">';
-    $html .= '<div id="' . $sqlquerycontainer_id . '">'
-        . '<textarea tabindex="100" name="sql_query" id="sqlquery"'
-        . '  cols="' . $GLOBALS['cfg']['TextareaCols'] . '"'
-        . '  rows="' . $height . '"'
-        . $auto_sel . $locking . '>'
-        . htmlspecialchars($query)
-        . '</textarea>';
-    $html .= '<div id="querymessage"></div>';
-    // Add buttons to generate query easily for
-    // select all, single select, insert, update and delete
-    if (! empty($columns_list)) {
-        $html .= '<input type="button" value="SELECT *" id="selectall"'
-            . ' class="button sqlbutton" />';
-        $html .= '<input type="button" value="SELECT" id="select"'
-            . ' class="button sqlbutton" />';
-        $html .= '<input type="button" value="INSERT" id="insert"'
-            . ' class="button sqlbutton" />';
-        $html .= '<input type="button" value="UPDATE" id="update"'
-            . ' class="button sqlbutton" />';
-        $html .= '<input type="button" value="DELETE" id="delete"'
-            . ' class="button sqlbutton" />';
-    }
-    $html .= '<input type="button" value="' . __('Clear') . '" id="clear"'
-        . ' class="button sqlbutton" />';
-    if ($GLOBALS['cfg']['CodemirrorEnable']) {
-        $html .= '<input type="button" value="' . __('Format') . '" id="format"'
-            . ' class="button sqlbutton" />';
-    }
-    $html .= '<input type="button" value="' . __('Get auto-saved query')
-        . '" id="saved" class="button sqlbutton" />';
-
-    // parameter binding
-    $html .= '<div>';
-    $html .= '<input type="checkbox" name="parameterized" id="parameterized" />';
-    $html .= '<label for="parameterized">' . __('Bind parameters') . '</label>';
-    $html .= PMA\libraries\Util::showDocu('faq', 'faq6-40');
-    $html .= '<div id="parametersDiv"></div>';
-    $html .= '</div>';
-
-    $html .= '</div>' . "\n";
-
-    if (! empty($columns_list)) {
-        $html .= '<div id="tablefieldscontainer">'
-            . '<label>' . __('Columns') . '</label>'
-            . '<select id="tablefields" name="dummy" '
-            . 'size="' . ($GLOBALS['cfg']['TextareaRows'] - 2) . '" '
-            . 'multiple="multiple" ondblclick="insertValueQuery()">';
-        foreach ($columns_list as $field) {
-            $html .= '<option value="'
-                . PMA\libraries\Util::backquote(htmlspecialchars($field['Field']))
-                . '"';
-            if (isset($field['Field'])
-                && mb_strlen($field['Field'])
-                && isset($field['Comment'])
-            ) {
-                $html .= ' title="' . htmlspecialchars($field['Comment']) . '"';
-            }
-            $html .= '>' . htmlspecialchars($field['Field']) . '</option>' . "\n";
-        }
-        $html .= '</select>'
-            . '<div id="tablefieldinsertbuttoncontainer">';
-        if (PMA\libraries\Util::showIcons('ActionLinksMode')) {
-            $html .= '<input type="button" class="button" name="insert"'
-                . ' value="&lt;&lt;" onclick="insertValueQuery()"'
-                . ' title="' . __('Insert') . '" />';
-        } else {
-            $html .= '<input type="button" class="button" name="insert"'
-                . ' value="' . __('Insert') . '"'
-                . ' onclick="insertValueQuery()" />';
-        }
-        $html .= '</div>' . "\n"
-            . '</div>' . "\n";
-    }
-
-    $html .= '<div class="clearfloat"></div>' . "\n";
-    $html .= '</div>' . "\n";
-
-    $cfgBookmark = PMA_Bookmark_getParams();
-    if ($cfgBookmark) {
-        $html .= '<div id="bookmarkoptions">';
-        $html .= '<div class="formelement">';
-        $html .= '<label for="bkm_label">'
-            . __('Bookmark this SQL query:') . '</label>';
-        $html .= '<input type="text" name="bkm_label" id="bkm_label"'
-            . ' tabindex="110" value="" />';
-        $html .= '</div>';
-        $html .= '<div class="formelement">';
-        $html .= '<input type="checkbox" name="bkm_all_users" tabindex="111"'
-            . ' id="id_bkm_all_users" value="true" />';
-        $html .= '<label for="id_bkm_all_users">'
-            . __('Let every user access this bookmark') . '</label>';
-        $html .= '</div>';
-        $html .= '<div class="formelement">';
-        $html .= '<input type="checkbox" name="bkm_replace" tabindex="112"'
-            . ' id="id_bkm_replace" value="true" />';
-        $html .= '<label for="id_bkm_replace">'
-            . __('Replace existing bookmark of same name') . '</label>';
-        $html .= '</div>';
-        $html .= '</div>';
-    }
-
-    $html .= '<div class="clearfloat"></div>' . "\n";
-    $html .= '</fieldset>' . "\n"
-        . '</div>' . "\n";
-
-    $html .= '<fieldset id="queryboxfooter" class="tblFooters">' . "\n";
-    $html .= '<div class="formelement">' . "\n";
-    $html .= '</div>' . "\n";
-
-    $html .= '<div class="formelement">';
-    $html .= '<label for="id_sql_delimiter">[ ' . __('Delimiter')
-        . '</label>' . "\n";
-    $html .= '<input type="text" name="sql_delimiter" tabindex="131" size="3" '
-        . 'value="' . $delimiter . '" '
-        . 'id="id_sql_delimiter" /> ]';
-    $html .= '</div>';
-
-    $html .= '<div class="formelement">';
-    $html .= '<input type="checkbox" name="show_query" value="1" '
-        . 'id="checkbox_show_query" tabindex="132" checked="checked" />'
-        . '<label for="checkbox_show_query">' . __('Show this query here again')
-        . '</label>';
-    $html .= '</div>';
-
-    $html .= '<div class="formelement">';
-    $html .= '<input type="checkbox" name="retain_query_box" value="1" '
-        . 'id="retain_query_box" tabindex="133" '
-        . ($GLOBALS['cfg']['RetainQueryBox'] === false
-            ? '' : ' checked="checked"')
-        . ' />'
-        . '<label for="retain_query_box">' . __('Retain query box')
-        . '</label>';
-    $html .= '</div>';
-
-    $html .= '<div class="formelement">';
-    $html .= '<input type="checkbox" name="rollback_query" value="1" '
-        . 'id="rollback_query" tabindex="134" />'
-        . '<label for="rollback_query">' . __('Rollback when finished')
-        . '</label>';
-    $html .= '</div>';
-
-    // Disable/Enable foreign key checks
-    $html .= '<div class="formelement">';
-    $html .= PMA\libraries\Util::getFKCheckbox();
-    $html .= '</div>';
-
-    $html .= '<input type="submit" id="button_submit_query" name="SQL"';
-
-    $html .= ' tabindex="200" value="' . __('Go') . '" />' . "\n";
-    $html .= '<div class="clearfloat"></div>' . "\n";
-    $html .= '</fieldset>' . "\n";
-
-    return $html;
-}
-
-/**
- * return HTML for sql Query Form Bookmark
- *
- * @return string|null
- *
- * @usedby  PMA_getHtmlForSqlQueryForm()
- */
-function PMA_getHtmlForSqlQueryFormBookmark()
-{
-    $bookmark_list = PMA_Bookmark_getList($GLOBALS['db']);
-    if (empty($bookmark_list) || count($bookmark_list) < 1) {
-        return null;
-    }
-
-    $html  = '<fieldset id="fieldsetBookmarkOptions">';
-    $html .= '<legend>';
-    $html .= __('Bookmarked SQL query') . '</legend>' . "\n";
-    $html .= '<div class="formelement">';
-    $html .= '<select name="id_bookmark" id="id_bookmark">' . "\n";
-    $html .= '<option value="">&nbsp;</option>' . "\n";
-    foreach ($bookmark_list as $key => $value) {
-        $html .= '<option value="' . htmlspecialchars($key) . '"'
-            . ' data-varcount="' . PMA_Bookmark_getVariableCount($value['query'])
-            . '">'
-            . htmlspecialchars($value['label']) . '</option>' . "\n";
-    }
-    // &nbsp; is required for correct display with styles/line height
-    $html .= '</select>&nbsp;' . "\n";
-    $html .= '</div>' . "\n";
-    $html .= '<div class="formelement">' . "\n";
-    $html .= '<input type="radio" name="action_bookmark" value="0"'
-        . ' id="radio_bookmark_exe" checked="checked" />'
-        . '<label for="radio_bookmark_exe">' . __('Submit')
-        . '</label>' . "\n";
-    $html .= '<input type="radio" name="action_bookmark" value="1"'
-        . ' id="radio_bookmark_view" />'
-        . '<label for="radio_bookmark_view">' . __('View only')
-        . '</label>' . "\n";
-    $html .= '<input type="radio" name="action_bookmark" value="2"'
-        . ' id="radio_bookmark_del" />'
-        . '<label for="radio_bookmark_del">' . __('Delete')
-        . '</label>' . "\n";
-    $html .= '</div>' . "\n";
-    $html .= '<div class="clearfloat"></div>' . "\n";
-    $html .= '<div class="formelement hide">' . "\n";
-    $html .= __('Variables');
-    $html .= PMA\libraries\Util::showDocu('faq', 'faqbookmark');
-    $html .= '<div id="bookmark_variables"></div>';
-    $html .= '</div>' . "\n";
-    $html .= '</fieldset>' . "\n";
-
-    $html .= '<fieldset id="fieldsetBookmarkOptionsFooter" class="tblFooters">';
-    $html .= '<input type="submit" name="SQL" id="button_submit_bookmark" value="'
-        . __('Go') . '" />';
-    $html .= '<div class="clearfloat"></div>' . "\n";
-    $html .= '</fieldset>' . "\n";
-
-    return $html;
-}
diff --git a/#pma/libraries/string.lib.php b/#pma/libraries/string.lib.php
deleted file mode 100644
index e1e54f37..00000000
--- a/#pma/libraries/string.lib.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/** String Functions for phpMyAdmin
- *
- * If mb_* functions don't exist, we create the ones we need and they'll use the
- * standard string functions.
- *
- * All mb_* functions created by PMA should behave as mb_* functions.
- *
- * @package PhpMyAdmin
- */
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
-if (!defined('MULTIBYTES_ON')) {
-    define('MULTIBYTES_ON', true);
-    define('MULTIBYTES_OFF', false);
-}
-
-if (@function_exists('mb_strlen')) {
-    if (!defined('MULTIBYTES_STATUS')) {
-        define('MULTIBYTES_STATUS', MULTIBYTES_ON);
-    }
-
-    include_once 'libraries/stringMb.lib.php';
-} else {
-    if (!defined('MULTIBYTES_STATUS')) {
-        define('MULTIBYTES_STATUS', MULTIBYTES_OFF);
-    }
-
-    include_once 'libraries/stringNative.lib.php';
-}
diff --git a/#pma/libraries/stringMb.lib.php b/#pma/libraries/stringMb.lib.php
deleted file mode 100644
index eb9790be..00000000
--- a/#pma/libraries/stringMb.lib.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/** String Functions for phpMyAdmin
- *
- * If mb_* functions don't exist, we create the ones we need and they'll use the
- * standard string functions.
- *
- * All mb_* functions created by PMA should behave as mb_* functions.
- *
- * @package PhpMyAdmin
- */
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
-if (!@function_exists('mb_ord')) {
-    /**
-     * Perform a regular expression match
-     *
-     * Take care: might not work with lookbehind expressions.
-     *
-     * @param string $pattern Pattern to search for
-     * @param string $subject Input string
-     * @param int    $offset  Start from search
-     *
-     * @return int 1 if matched, 0 if doesn't, false on failure
-     */
-    function mb_preg_strpos($pattern, $subject, $offset = 0)
-    {
-        $matches = array();
-        $bFind = preg_match(
-            $pattern, mb_substr($subject, $offset), $matches, PREG_OFFSET_CAPTURE
-        );
-        if (1 !== $bFind) {
-            return false;
-        }
-
-        return $matches[1][1] + $offset;
-    }
-
-    /**
-     * Get the ordinal value of a string
-     *
-     * @param string $string the string for which ord is required
-     *
-     * @return int the ord value
-     */
-    function mb_ord($string)
-    {
-        if (false === $string || null === $string || '' === $string) {
-            return 0;
-        }
-
-        $str = mb_convert_encoding($string, "UCS-4BE", "UTF-8");
-        $substr = mb_substr($str, 0, 1, "UCS-4BE");
-        $val = unpack("N", $substr);
-        return $val[1];
-    }
-
-    /**
-     * Get the character of an ASCII
-     *
-     * @param int $ascii the ASCII code for which character is required
-     *
-     * @return string the character
-     */
-    function mb_chr($ascii)
-    {
-        return mb_convert_encoding(
-            pack("N", $ascii),
-            mb_internal_encoding(),
-            'UCS-4BE'
-        );
-    }
-
-}
diff --git a/#pma/libraries/stringNative.lib.php b/#pma/libraries/stringNative.lib.php
deleted file mode 100644
index 557a02f8..00000000
--- a/#pma/libraries/stringNative.lib.php
+++ /dev/null
@@ -1,245 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/** String Functions for phpMyAdmin
- * If mb_* functions don't exist, we create the ones we need and they'll use the
- * standard string functions.
- * All mb_* functions created by PMA should behave as mb_* functions.
- *
- * @package PhpMyAdmin
- */
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
-//Define mb_* functions if they don't exist.
-if (!@function_exists('mb_strlen')) {
-    /**
-     * Returns length of string depending on current charset.
-     *
-     * @param string $string string to count
-     *
-     * @return int string length
-     */
-    function mb_strlen($string)
-    {
-        return strlen($string);
-    }
-
-    /**
-     * Returns substring from string, works depending on current charset.
-     *
-     * @param string $string string to count
-     * @param int    $start  start of substring
-     * @param int    $length length of substring
-     *
-     * @return string the sub string
-     */
-    function mb_substr($string, $start, $length = 2147483647)
-    {
-        if (null === $string || strlen($string) <= $start) {
-            return '';
-        }
-        if (null === $length) {
-            $length = 2147483647;
-        }
-        return substr($string, $start, $length);
-    }
-
-    /**
-     * Returns number of substring from string.
-     *
-     * @param string $string string to check
-     * @param int    $needle string to count
-     *
-     * @return int number of substring from the string
-     */
-    function mb_substrCount($string, $needle)
-    {
-        return substr_count($string, $needle);
-    }
-
-    /**
-     * Returns position of $needle in $haystack or false if not found
-     *
-     * @param string $haystack the string being checked
-     * @param string $needle   the string to find in haystack
-     * @param int    $offset   the search offset
-     *
-     * @return integer position of $needle in $haystack or false
-     */
-    function mb_strpos($haystack, $needle, $offset = 0)
-    {
-        return strpos($haystack, $needle, $offset);
-    }
-
-    /**
-     * Returns position of $needle in $haystack - case insensitive - or false if
-     * not found
-     *
-     * @param string $haystack the string being checked
-     * @param string $needle   the string to find in haystack
-     * @param int    $offset   the search offset
-     *
-     * @return integer position of $needle in $haystack or false
-     */
-    function mb_stripos($haystack, $needle, $offset = 0)
-    {
-        if (('' === $haystack || false === $haystack) && $offset >= strlen($haystack)
-        ) {
-            return false;
-        }
-        return stripos($haystack, $needle, $offset);
-    }
-
-    /**
-     * Returns position of last $needle in $haystack or false if not found
-     *
-     * @param string $haystack the string being checked
-     * @param string $needle   the string to find in haystack
-     * @param int    $offset   the search offset
-     *
-     * @return integer position of last $needle in $haystack or false
-     */
-    function mb_strrpos($haystack, $needle, $offset = 0)
-    {
-        return strrpos($haystack, $needle, $offset);
-    }
-
-    /**
-     * Returns position of last $needle in $haystack - case insensitive - or false
-     * if not found
-     *
-     * @param string $haystack the string being checked
-     * @param string $needle   the string to find in haystack
-     * @param int    $offset   the search offset
-     *
-     * @return integer position of last $needle in $haystack or false
-     */
-    function mb_strripos($haystack, $needle, $offset = 0)
-    {
-        if (('' === $haystack || false === $haystack) && $offset >= strlen($haystack)
-        ) {
-            return false;
-        }
-        return strripos($haystack, $needle, $offset);
-    }
-
-    /**
-     * Returns part of $haystack string starting from and including the first
-     * occurrence of $needle to the end of $haystack or false if not found
-     *
-     * @param string $haystack      the string being checked
-     * @param string $needle        the string to find in haystack
-     * @param bool   $before_needle the part before the needle
-     *
-     * @return string part of $haystack or false
-     */
-    function mb_strstr($haystack, $needle, $before_needle = false)
-    {
-        return strstr($haystack, $needle, $before_needle);
-    }
-
-    /**
-     * Returns part of $haystack string starting from and including the first
-     * occurrence of $needle to the end of $haystack - case insensitive - or false
-     * if not found
-     *
-     * @param string $haystack      the string being checked
-     * @param string $needle        the string to find in haystack
-     * @param bool   $before_needle the part before the needle
-     *
-     * @return string part of $haystack or false
-     */
-    function mb_stristr($haystack, $needle, $before_needle = false)
-    {
-        return stristr($haystack, $needle, $before_needle);
-    }
-
-    /**
-     * Returns the portion of haystack which starts at the last occurrence or false
-     * if not found
-     *
-     * @param string $haystack the string being checked
-     * @param string $needle   the string to find in haystack
-     *
-     * @return string portion of haystack which starts at the last occurrence or
-     *                         false
-     */
-    function mb_strrchr($haystack, $needle)
-    {
-        return strrchr($haystack, $needle);
-    }
-
-    /**
-     * Make a string lowercase
-     *
-     * @param string $string the string being lowercased
-     *
-     * @return string the lower case string
-     */
-    function mb_strtolower($string)
-    {
-        return strtolower($string);
-    }
-
-    /**
-     * Make a string uppercase
-     *
-     * @param string $string the string being uppercased
-     *
-     * @return string the upper case string
-     */
-    function mb_strtoupper($string)
-    {
-        return strtoupper($string);
-    }
-}
-
-//New functions.
-if (!@function_exists('mb_ord')) {
-    /**
-     * Perform a regular expression match
-     *
-     * @param string $pattern Pattern to search for
-     * @param string $subject Input string
-     * @param int    $offset  Start from search
-     *
-     * @return int 1 if matched, 0 if doesn't, false on failure
-     */
-    function mb_preg_strpos($pattern, $subject, $offset = 0)
-    {
-        $matches = array();
-        $bFind = preg_match(
-            $pattern, $subject, $matches, PREG_OFFSET_CAPTURE, $offset
-        );
-        if (1 !== $bFind) {
-            return false;
-        }
-
-        return $matches[1][1];
-    }
-
-    /**
-     * Get the ordinal value of a string
-     *
-     * @param string $string the string for which ord is required
-     *
-     * @return int the ord value
-     */
-    function mb_ord($string)
-    {
-        return ord($string);
-    }
-
-    /**
-     * Get the character of an ASCII
-     *
-     * @param int $ascii the ASCII code for which character is required
-     *
-     * @return string the character
-     */
-    function mb_chr($ascii)
-    {
-        return chr($ascii);
-    }
-}
\ No newline at end of file
diff --git a/#pma/libraries/sysinfo.lib.php b/#pma/libraries/sysinfo.lib.php
deleted file mode 100644
index e20cd3fe..00000000
--- a/#pma/libraries/sysinfo.lib.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Library for extracting information about system memory and cpu.
- * Currently supports all Windows and Linux platforms
- *
- * This code is based on the OS Classes from the phpsysinfo project
- * (http://phpsysinfo.github.io/phpsysinfo/)
- *
- * @package PhpMyAdmin-sysinfo
- */
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
-define(
-    'MEMORY_REGEXP',
-    '/^(MemTotal|MemFree|Cached|Buffers|SwapCached|SwapTotal|SwapFree):'
-    . '\s+(.*)\s*kB/im'
-);
-
-/**
- * Returns OS type used for sysinfo class
- *
- * @param string $php_os PHP_OS constant
- *
- * @return string
- */
-function PMA_getSysInfoOs($php_os = PHP_OS)
-{
-
-    // look for common UNIX-like systems
-    $unix_like = array('FreeBSD', 'DragonFly');
-    if (in_array($php_os, $unix_like)) {
-        $php_os = 'Linux';
-    }
-
-    return ucfirst($php_os);
-}
-
-/**
- * Gets sysinfo class mathing current OS
- *
- * @return \PMA\libraries\SysInfo|mixed sysinfo class
- */
-function PMA_getSysInfo()
-{
-    $php_os = PMA_getSysInfoOs();
-    $supported = array('Linux', 'WINNT', 'SunOS');
-
-    if (in_array($php_os, $supported)) {
-        $class_name = 'PMA\libraries\SysInfo' . $php_os;
-        /** @var \PMA\libraries\SysInfo $ret */
-        $ret = new $class_name();
-        if ($ret->supported()) {
-            return $ret;
-        }
-    }
-
-    return new \PMA\libraries\SysInfo();
-}
diff --git a/#pma/libraries/tbl_columns_definition_form.inc.php b/#pma/libraries/tbl_columns_definition_form.inc.php
deleted file mode 100644
index 4fa2de4b..00000000
--- a/#pma/libraries/tbl_columns_definition_form.inc.php
+++ /dev/null
@@ -1,416 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Display form for changing/adding table fields/columns.
- * Included by tbl_addfield.php and tbl_create.php
- *
- * @package PhpMyAdmin
- */
-use PMA\libraries\Table;
-use PMA\Util;
-
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
-/**
- * Check parameters
- */
-require_once 'libraries/util.lib.php';
-
-PMA\libraries\Util::checkParameters(
-    array('server', 'db', 'table', 'action', 'num_fields')
-);
-
-global $db, $table;
-
-/**
- * Initialize to avoid code execution path warnings
- */
-
-if (!isset($num_fields)) {
-    $num_fields = 0;
-}
-if (!isset($mime_map)) {
-    $mime_map = null;
-}
-if (!isset($columnMeta)) {
-    $columnMeta = array();
-}
-
-
-// Get available character sets and storage engines
-require_once './libraries/mysql_charsets.inc.php';
-
-$length_values_input_size = 8;
-
-$content_cells = array();
-
-/** @var string $db */
-$form_params = array(
-    'db' => $db
-);
-
-if ($action == 'tbl_create.php') {
-    $form_params['reload'] = 1;
-} else {
-    if ($action == 'tbl_addfield.php') {
-        $form_params = array_merge(
-            $form_params, array(
-            'field_where' => Util\get($_REQUEST, 'field_where'))
-        );
-        if (isset($_REQUEST['field_where'])) {
-            $form_params['after_field'] = $_REQUEST['after_field'];
-        }
-    }
-    $form_params['table'] = $table;
-}
-
-if (isset($num_fields)) {
-    $form_params['orig_num_fields'] = $num_fields;
-}
-
-$form_params = array_merge(
-    $form_params,
-    array(
-        'orig_field_where' => Util\get($_REQUEST, 'field_where'),
-        'orig_after_field' => Util\get($_REQUEST, 'after_field'),
-    )
-);
-
-if (isset($selected) && is_array($selected)) {
-    foreach ($selected as $o_fld_nr => $o_fld_val) {
-        $form_params['selected[' . $o_fld_nr . ']'] = $o_fld_val;
-    }
-}
-
-$is_backup = ($action != 'tbl_create.php' && $action != 'tbl_addfield.php');
-
-require_once './libraries/transformations.lib.php';
-$cfgRelation = PMA_getRelationsParam();
-
-$comments_map = PMA_getComments($db, $table);
-
-$move_columns = array();
-if (isset($fields_meta)) {
-    /** @var PMA\libraries\DatabaseInterface $dbi */
-    $dbi = \PMA\libraries\di\Container::getDefaultContainer()->get('dbi');
-    $move_columns = $dbi->getTable($db, $table)->getColumnsMeta();
-}
-
-$available_mime = array();
-if ($cfgRelation['mimework'] && $GLOBALS['cfg']['BrowseMIME']) {
-    $mime_map = PMA_getMIME($db, $table);
-    $available_mime = PMA_getAvailableMIMEtypes();
-}
-
-//  workaround for field_fulltext, because its submitted indices contain
-//  the index as a value, not a key. Inserted here for easier maintenance
-//  and less code to change in existing files.
-if (isset($field_fulltext) && is_array($field_fulltext)) {
-    foreach ($field_fulltext as $fulltext_nr => $fulltext_indexkey) {
-        $submit_fulltext[$fulltext_indexkey] = $fulltext_indexkey;
-    }
-}
-if (isset($_REQUEST['submit_num_fields'])
-    || isset($_REQUEST['submit_partition_change'])
-) {
-    //if adding new fields, set regenerate to keep the original values
-    $regenerate = 1;
-}
-
-$foreigners = PMA_getForeigners($db, $table, '', 'foreign');
-$child_references = null;
-// From MySQL 5.6.6 onwards columns with foreign keys can be renamed.
-// Hence, no need to get child references
-if (PMA_MYSQL_INT_VERSION < 50606) {
-    $child_references = PMA_getChildReferences($db, $table);
-}
-
-for ($columnNumber = 0; $columnNumber < $num_fields; $columnNumber++) {
-
-    $type = '';
-    $length = '';
-    $columnMeta = array();
-    $submit_attribute = null;
-    $extracted_columnspec = array();
-
-    if (!empty($regenerate)) {
-
-        $columnMeta = array_merge(
-            $columnMeta,
-            array(
-                'Field'        => Util\get(
-                    $_REQUEST, "field_name.${columnNumber}", false
-                ),
-                'Type'         => Util\get(
-                    $_REQUEST, "field_type.${columnNumber}", false
-                ),
-                'Collation'    => Util\get(
-                    $_REQUEST, "field_collation.${columnNumber}", ''
-                ),
-                'Null'         => Util\get(
-                    $_REQUEST, "field_null.${columnNumber}", ''
-                ),
-                'DefaultType'  => Util\get(
-                    $_REQUEST, "field_default_type.${columnNumber}", 'NONE'
-                ),
-                'DefaultValue' => Util\get(
-                    $_REQUEST, "field_default_value.${columnNumber}", ''
-                ),
-                'Extra'        => Util\get(
-                    $_REQUEST, "field_extra.${columnNumber}", false
-                ),
-                'Virtuality'   => Util\get(
-                    $_REQUEST, "field_virtuality.${columnNumber}", ''
-                ),
-                'Expression'   => Util\get(
-                    $_REQUEST, "field_expression.${columnNumber}", ''
-                ),
-            )
-        );
-
-        $columnMeta['Key'] = '';
-        $parts = explode(
-            '_', Util\get($_REQUEST, "field_key.${columnNumber}", ''), 2
-        );
-        if (count($parts) == 2 && $parts[1] == $columnNumber) {
-            $columnMeta['Key'] = Util\get(
-                array(
-                    'primary' => 'PRI',
-                    'index' => 'MUL',
-                    'unique' => 'UNI',
-                    'fulltext' => 'FULLTEXT',
-                    'spatial' => 'SPATIAL'
-                ),
-                $parts[0], ''
-            );
-        }
-
-        $columnMeta['Comment']
-            = isset($submit_fulltext[$columnNumber])
-            && ($submit_fulltext[$columnNumber] == $columnNumber)
-                ? 'FULLTEXT' : false;
-
-        switch ($columnMeta['DefaultType']) {
-        case 'NONE':
-            $columnMeta['Default'] = null;
-            break;
-        case 'USER_DEFINED':
-            $columnMeta['Default'] = $columnMeta['DefaultValue'];
-            break;
-        case 'NULL':
-        case 'CURRENT_TIMESTAMP':
-            $columnMeta['Default'] = $columnMeta['DefaultType'];
-            break;
-        }
-
-        $length = Util\get($_REQUEST, "field_length.${columnNumber}", $length);
-        $submit_attribute = Util\get(
-            $_REQUEST, "field_attribute.${columnNumber}", false
-        );
-        $comments_map[$columnMeta['Field']] = Util\get(
-            $_REQUEST, "field_comments.${columnNumber}"
-        );
-
-        $mime_map[$columnMeta['Field']] = array_merge(
-            $mime_map[$columnMeta['Field']],
-            array(
-                'mimetype' => Util\get($_REQUEST, "field_mimetype.${$columnNumber}"),
-                'transformation' => Util\get(
-                    $_REQUEST, "field_transformation.${$columnNumber}"
-                ),
-                'transformation_options' => Util\get(
-                    $_REQUEST, "field_transformation_options.${$columnNumber}"
-                ),
-            )
-        );
-
-    } elseif (isset($fields_meta[$columnNumber])) {
-        $columnMeta = $fields_meta[$columnNumber];
-        $virtual = array(
-            'VIRTUAL', 'PERSISTENT', 'VIRTUAL GENERATED', 'STORED GENERATED'
-        );
-        if (in_array($columnMeta['Extra'], $virtual)) {
-            $tableObj = new Table($GLOBALS['table'], $GLOBALS['db']);
-            $expressions = $tableObj->getColumnGenerationExpression(
-                $columnMeta['Field']
-            );
-            $columnMeta['Expression'] = $expressions[$columnMeta['Field']];
-        }
-        switch ($columnMeta['Default']) {
-        case null:
-            if (is_null($columnMeta['Default'])) { // null
-                if ($columnMeta['Null'] == 'YES') {
-                    $columnMeta['DefaultType'] = 'NULL';
-                    $columnMeta['DefaultValue'] = '';
-                } else {
-                    $columnMeta['DefaultType'] = 'NONE';
-                    $columnMeta['DefaultValue'] = '';
-                }
-            } else { // empty
-                $columnMeta['DefaultType'] = 'USER_DEFINED';
-                $columnMeta['DefaultValue'] = $columnMeta['Default'];
-            }
-            break;
-        case 'CURRENT_TIMESTAMP':
-            $columnMeta['DefaultType'] = 'CURRENT_TIMESTAMP';
-            $columnMeta['DefaultValue'] = '';
-            break;
-        default:
-            $columnMeta['DefaultType'] = 'USER_DEFINED';
-            $columnMeta['DefaultValue'] = $columnMeta['Default'];
-            break;
-        }
-    }
-
-    if (isset($columnMeta['Type'])) {
-        $extracted_columnspec = PMA\libraries\Util::extractColumnSpec(
-            $columnMeta['Type']
-        );
-        if ($extracted_columnspec['type'] == 'bit') {
-            $columnMeta['Default']
-                = PMA\libraries\Util::convertBitDefaultValue($columnMeta['Default']);
-        }
-        $type = $extracted_columnspec['type'];
-        if ($length == '') {
-            $length = $extracted_columnspec['spec_in_brackets'];
-        }
-    } else {
-        // creating a column
-        $columnMeta['Type'] = '';
-    }
-
-    // Variable tell if current column is bound in a foreign key constraint or not.
-    // MySQL version from 5.6.6 allow renaming columns with foreign keys
-    if (isset($columnMeta['Field'])
-        && isset($form_params['table'])
-        && PMA_MYSQL_INT_VERSION < 50606
-    ) {
-        $columnMeta['column_status'] = PMA_checkChildForeignReferences(
-            $form_params['db'],
-            $form_params['table'],
-            $columnMeta['Field'],
-            $foreigners,
-            $child_references
-        );
-    }
-
-    // some types, for example longtext, are reported as
-    // "longtext character set latin7" when their charset and / or collation
-    // differs from the ones of the corresponding database.
-    // rtrim the type, for cases like "float unsigned"
-    $type = rtrim(
-        preg_replace('/[\s]character set[\s][\S]+/', '', $type)
-    );
-
-    /**
-     * old column attributes
-     */
-    if ($is_backup) {
-
-        // old column name
-        if (isset($columnMeta['Field'])) {
-            $form_params['field_orig[' . $columnNumber . ']']
-                = $columnMeta['Field'];
-            if (isset($columnMeta['column_status'])
-                && !$columnMeta['column_status']['isEditable']
-            ) {
-                $form_params['field_name[' . $columnNumber . ']']
-                    = $columnMeta['Field'];
-            }
-        } else {
-            $form_params['field_orig[' . $columnNumber . ']'] = '';
-        }
-
-        // old column type
-        if (isset($columnMeta['Type'])) {
-            // keep in uppercase because the new type will be in uppercase
-            $form_params['field_type_orig[' . $columnNumber . ']'] = mb_strtoupper($type);
-            if (isset($columnMeta['column_status'])
-                && !$columnMeta['column_status']['isEditable']
-            ) {
-                $form_params['field_type[' . $columnNumber . ']'] = mb_strtoupper($type);
-            }
-        } else {
-            $form_params['field_type_orig[' . $columnNumber . ']'] = '';
-        }
-
-        // old column length
-        $form_params['field_length_orig[' . $columnNumber . ']'] = $length;
-
-        // old column default
-        $form_params = array_merge(
-            $form_params,
-            array(
-                "field_default_value_orig[${columnNumber}]" => Util\get(
-                    $columnMeta, 'Default', ''
-                ),
-                "field_default_type_orig[${columnNumber}]"  => Util\get(
-                    $columnMeta, 'DefaultType', ''
-                ),
-                "field_collation_orig[${columnNumber}]"     => Util\get(
-                    $columnMeta, 'Collation', ''
-                ),
-                "field_attribute_orig[${columnNumber}]"     => trim(
-                    Util\get($extracted_columnspec, 'attribute', '')
-                ),
-                "field_null_orig[${columnNumber}]"          => Util\get(
-                    $columnMeta, 'Null', ''
-                ),
-                "field_extra_orig[${columnNumber}]"         => Util\get(
-                    $columnMeta, 'Extra', ''
-                ),
-                "field_comments_orig[${columnNumber}]"      => Util\get(
-                    $columnMeta, 'Comment', ''
-                ),
-                "field_virtuality_orig[${columnNumber}]"    => Util\get(
-                    $columnMeta, 'Virtuality', ''
-                ),
-                "field_expression_orig[${columnNumber}]"    => Util\get(
-                    $columnMeta, 'Expression', ''
-                ),
-            )
-        );
-    }
-
-    $content_cells[$columnNumber] = array(
-        'columnNumber' => $columnNumber,
-        'columnMeta' => $columnMeta,
-        'type_upper' => mb_strtoupper($type),
-        'length_values_input_size' => $length_values_input_size,
-        'length' => $length,
-        'extracted_columnspec' => $extracted_columnspec,
-        'submit_attribute' => $submit_attribute,
-        'comments_map' => $comments_map,
-        'fields_meta' => isset($fields_meta) ? $fields_meta : null,
-        'is_backup' => $is_backup,
-        'move_columns' => $move_columns,
-        'cfgRelation' => $cfgRelation,
-        'available_mime' => $available_mime,
-        'mime_map' => isset($mime_map) ? $mime_map : array()
-    );
-} // end for
-
-$html = PMA\libraries\Template::get('columns_definitions/column_definitions_form')
-    ->render(
-        array(
-            'is_backup'     => $is_backup,
-            'fields_meta'   => isset($fields_meta) ? $fields_meta : null,
-            'mimework'      => $cfgRelation['mimework'],
-            'action'        => $action,
-            'form_params'   => $form_params,
-            'content_cells' => $content_cells,
-        )
-    );
-
-unset($form_params);
-
-$response = PMA\libraries\Response::getInstance();
-$response->getHeader()->getScripts()->addFiles(
-    array(
-        'jquery/jquery.uitablefilter.js',
-        'indexes.js'
-    )
-);
-$response->addHTML($html);
diff --git a/#pma/libraries/tbl_common.inc.php b/#pma/libraries/tbl_common.inc.php
deleted file mode 100644
index 5878717d..00000000
--- a/#pma/libraries/tbl_common.inc.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Common includes for the table level views
- *
- * @package PhpMyAdmin
- */
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
-/**
- * Gets some core libraries
- */
-require_once './libraries/bookmark.lib.php';
-
-// Check parameters
-PMA\libraries\Util::checkParameters(array('db', 'table'));
-
-$db_is_system_schema = $GLOBALS['dbi']->isSystemSchema($db);
-
-/**
- * Set parameters for links
- * @deprecated
- */
-$url_query = PMA_URL_getCommon(array('db' => $db, 'table' => $table));
-
-/**
- * Set parameters for links
- */
-$url_params = array();
-$url_params['db']    = $db;
-$url_params['table'] = $table;
-
-/**
- * Defines the urls to return to in case of error in a sql statement
- */
-$err_url_0 = PMA\libraries\Util::getScriptNameForOption(
-    $GLOBALS['cfg']['DefaultTabDatabase'], 'database'
-)
-    . PMA_URL_getCommon(array('db' => $db));
-
-$err_url = PMA\libraries\Util::getScriptNameForOption(
-    $GLOBALS['cfg']['DefaultTabTable'], 'table'
-)
-    . PMA_URL_getCommon($url_params);
-
-
-/**
- * Ensures the database and the table exist (else move to the "parent" script)
- * Skip test if we are exporting as we can't tell whether a table name is an alias (which would fail the test).
- */
-if (basename($_SERVER['PHP_SELF']) != 'tbl_export.php') {
-    require_once './libraries/db_table_exists.lib.php';
-}
diff --git a/#pma/libraries/tbl_info.inc.php b/#pma/libraries/tbl_info.inc.php
deleted file mode 100644
index dc8a325b..00000000
--- a/#pma/libraries/tbl_info.inc.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * extracts table properties from create statement
- *
- * @todo should be handled by class Table
- * @todo this should be recoded as functions, to avoid messing with global variables
- *
- * @package PhpMyAdmin
- */
-
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
-// Check parameters
-PMA\libraries\Util::checkParameters(array('db', 'table'));
-
-/**
- * Defining global variables, in case this script is included by a function.
- */
-global $showtable, $tbl_is_view, $tbl_storage_engine, $show_comment, $tbl_collation,
-       $table_info_num_rows, $auto_increment;
-
-/**
- * Gets table information
- */
-// Seems we need to do this in MySQL 5.0.2,
-// otherwise error #1046, no database selected
-$GLOBALS['dbi']->selectDb($GLOBALS['db']);
-
-
-/**
- * Holds information about the current table
- *
- * Table::getStatusInfo() does caching by default, but here
- * we force reading of the current table status
- * if $reread_info is true (for example, coming from tbl_operations.php
- * and we just changed the table's storage engine)
- *
- * @todo replace this by Table
- * @global array $GLOBALS['showtable']
- * @name $showtable
- */
-$GLOBALS['showtable'] = $GLOBALS['dbi']->getTable(
-    $GLOBALS['db'],
-    $GLOBALS['table']
-)->getStatusInfo(
-    null,
-    (isset($reread_info) && $reread_info ? true : false)
-);
-
-// need this test because when we are creating a table, we get 0 rows
-// from the SHOW TABLE query
-// and we don't want to mess up the $tbl_storage_engine coming from the form
-
-if ($showtable) {
-    if ($GLOBALS['dbi']->getTable($GLOBALS['db'], $GLOBALS['table'])->isView()) {
-        $tbl_is_view     = true;
-        $tbl_storage_engine = __('View');
-        $show_comment    = null;
-    } else {
-        $tbl_is_view     = false;
-        $tbl_storage_engine = isset($showtable['Engine'])
-            ? mb_strtoupper($showtable['Engine'])
-            : '';
-        $show_comment = '';
-        if (isset($showtable['Comment'])) {
-            $show_comment = $showtable['Comment'];
-        }
-    }
-    $tbl_collation       = empty($showtable['Collation'])
-        ? ''
-        : $showtable['Collation'];
-
-    if (null === $showtable['Rows']) {
-        $showtable['Rows']   = $GLOBALS['dbi']
-            ->getTable($GLOBALS['db'], $showtable['Name'])
-            ->countRecords(true);
-    }
-    $table_info_num_rows = isset($showtable['Rows']) ? $showtable['Rows'] : 0;
-    $row_format = isset($showtable['Row_format']) ? $showtable['Row_format'] : '';
-    $auto_increment      = isset($showtable['Auto_increment'])
-        ? $showtable['Auto_increment']
-        : '';
-
-    $create_options_tmp      = isset($showtable['Create_options'])
-        ? explode(' ', $showtable['Create_options'])
-        : array();
-    $create_options = array();
-
-    // export create options by its name as variables into global namespace
-    // f.e. pack_keys=1 becomes available as $pack_keys with value of '1'
-    unset($pack_keys);
-    foreach ($create_options_tmp as $each_create_option) {
-        $each_create_option = explode('=', $each_create_option);
-        if (isset($each_create_option[1])) {
-            // ensure there is no ambiguity for PHP 5 and 7
-            $create_options[$each_create_option[0]] = $each_create_option[1];
-        }
-    }
-    // we need explicit DEFAULT value here (different from '0')
-    $create_options['pack_keys'] = (! isset($create_options['pack_keys']) || strlen($create_options['pack_keys']) == 0)
-        ? 'DEFAULT'
-        : $create_options['pack_keys'];
-    unset($create_options_tmp, $each_create_option);
-} else {
-    $pack_keys = $row_format = null;
-}// end if
diff --git a/#pma/libraries/tbl_partition_definition.inc.php b/#pma/libraries/tbl_partition_definition.inc.php
deleted file mode 100644
index fb2f490f..00000000
--- a/#pma/libraries/tbl_partition_definition.inc.php
+++ /dev/null
@@ -1,146 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Table partition definition
- *
- * @package PhpMyAdmin
- */
-
-use PMA\libraries\Template;
-
-if (!isset($partitionDetails)) {
-
-    $partitionDetails = array();
-
-    // Extract some partitioning and subpartitioning parameters from the request
-    $partitionParams = array(
-        'partition_by', 'partition_expr',
-        'subpartition_by', 'subpartition_expr',
-    );
-    foreach ($partitionParams as $partitionParam) {
-        $partitionDetails[$partitionParam] = isset($_REQUEST[$partitionParam])
-            ? $_REQUEST[$partitionParam] : '';
-    }
-
-    if (PMA_isValid($_REQUEST['partition_count'], 'numeric')) {
-        // MySQL's limit is 8192, so do not allow more
-        $partition_count = min(intval($_REQUEST['partition_count']), 8192);
-    } else {
-        $partition_count = 0;
-    }
-    $partitionDetails['partition_count']
-        = ($partition_count === 0) ? '' : $partition_count;
-    if (PMA_isValid($_REQUEST['subpartition_count'], 'numeric')) {
-        // MySQL's limit is 8192, so do not allow more
-        $subpartition_count = min(intval($_REQUEST['subpartition_count']), 8192);
-    } else {
-        $subpartition_count = 0;
-    }
-    $partitionDetails['subpartition_count']
-        = ($subpartition_count === 0) ? '' : $subpartition_count;
-
-    // Only LIST and RANGE type parameters allow subpartitioning
-    $partitionDetails['can_have_subpartitions'] = $partition_count > 1
-        && isset($_REQUEST['partition_by'])
-        && ($_REQUEST['partition_by'] == 'RANGE'
-        || $_REQUEST['partition_by'] == 'RANGE COLUMNS'
-        || $_REQUEST['partition_by'] == 'LIST'
-        || $_REQUEST['partition_by'] == 'LIST COLUMNS');
-
-    // Values are specified only for LIST and RANGE type partitions
-    $partitionDetails['value_enabled'] = isset($_REQUEST['partition_by'])
-        && ($_REQUEST['partition_by'] == 'RANGE'
-        || $_REQUEST['partition_by'] == 'RANGE COLUMNS'
-        || $_REQUEST['partition_by'] == 'LIST'
-        || $_REQUEST['partition_by'] == 'LIST COLUMNS');
-
-    // Has partitions
-    if ($partition_count > 1) {
-        $partitions = isset($_REQUEST['partitions'])
-            ? $_REQUEST['partitions']
-            : array();
-
-        // Remove details of the additional partitions
-        // when number of partitions have been reduced
-        array_splice($partitions, $partition_count);
-
-        for ($i = 0; $i < $partition_count; $i++) {
-            if (! isset($partitions[$i])) { // Newly added partition
-                $partitions[$i] = array(
-                    'name' => 'p' . $i,
-                    'value_type' => '',
-                    'value' => '',
-                    'engine' => '',
-                    'comment' => '',
-                    'data_directory' => '',
-                    'index_directory' => '',
-                    'max_rows' => '',
-                    'min_rows' => '',
-                    'tablespace' => '',
-                    'node_group' => '',
-                );
-            }
-
-            $partition =& $partitions[$i];
-            $partition['prefix'] = 'partitions[' . $i . ']';
-
-            // Changing from HASH/KEY to RANGE/LIST
-            if (! isset($partition['value_type'])) {
-                $partition['value_type'] = '';
-                $partition['value'] = '';
-            }
-            if (! isset($partition['engine'])) { // When removing subpartitioning
-                $partition['engine'] = '';
-                $partition['comment'] = '';
-                $partition['data_directory'] = '';
-                $partition['index_directory'] = '';
-                $partition['max_rows'] = '';
-                $partition['min_rows'] = '';
-                $partition['tablespace'] = '';
-                $partition['node_group'] = '';
-            }
-
-            if ($subpartition_count > 1
-                && $partitionDetails['can_have_subpartitions'] == true
-            ) { // Has subpartitions
-                $partition['subpartition_count'] = $subpartition_count;
-
-                if (! isset($partition['subpartitions'])) {
-                    $partition['subpartitions'] = array();
-                }
-                $subpartitions =& $partition['subpartitions'];
-
-                // Remove details of the additional subpartitions
-                // when number of subpartitions have been reduced
-                array_splice($subpartitions, $subpartition_count);
-
-                for ($j = 0; $j < $subpartition_count; $j++) {
-                    if (! isset($subpartitions[$j])) { // Newly added subpartition
-                        $subpartitions[$j] = array(
-                            'name' => $partition['name'] . '_s' . $j,
-                            'engine' => '',
-                            'comment' => '',
-                            'data_directory' => '',
-                            'index_directory' => '',
-                            'max_rows' => '',
-                            'min_rows' => '',
-                            'tablespace' => '',
-                            'node_group' => '',
-                        );
-                    }
-
-                    $subpartition =& $subpartitions[$j];
-                    $subpartition['prefix'] = 'partitions[' . $i . ']'
-                        . '[subpartitions][' . $j . ']';
-                }
-            } else { // No subpartitions
-                unset($partition['subpartitions']);
-                unset($partition['subpartition_count']);
-            }
-        }
-        $partitionDetails['partitions'] = $partitions;
-    }
-}
-
-echo Template::get('columns_definitions/partitions')
-    ->render(array('partitionDetails' => $partitionDetails));
diff --git a/#pma/libraries/tcpdf/LICENSE.TXT b/#pma/libraries/tcpdf/LICENSE.TXT
deleted file mode 100644
index daf21f7d..00000000
--- a/#pma/libraries/tcpdf/LICENSE.TXT
+++ /dev/null
@@ -1,858 +0,0 @@
-**********************************************************************
-* TCPDF LICENSE
-**********************************************************************
-
-  TCPDF is free software: you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License as
-  published by the Free Software Foundation, either version 3 of the
-  License, or (at your option) any later version.
-
-**********************************************************************
-**********************************************************************
-
-                   GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-  This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
-  0. Additional Definitions.
-
-  As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
-  "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
-  An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
-  A "Combined Work" is a work produced by combining or linking an
-Application with the Library.  The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
-  The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
-  The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
-  1. Exception to Section 3 of the GNU GPL.
-
-  You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
-  2. Conveying Modified Versions.
-
-  If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
-   a) under this License, provided that you make a good faith effort to
-   ensure that, in the event an Application does not supply the
-   function or data, the facility still operates, and performs
-   whatever part of its purpose remains meaningful, or
-
-   b) under the GNU GPL, with none of the additional permissions of
-   this License applicable to that copy.
-
-  3. Object Code Incorporating Material from Library Header Files.
-
-  The object code form of an Application may incorporate material from
-a header file that is part of the Library.  You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
-   a) Give prominent notice with each copy of the object code that the
-   Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the object code with a copy of the GNU GPL and this license
-   document.
-
-  4. Combined Works.
-
-  You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
-   a) Give prominent notice with each copy of the Combined Work that
-   the Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
-   document.
-
-   c) For a Combined Work that displays copyright notices during
-   execution, include the copyright notice for the Library among
-   these notices, as well as a reference directing the user to the
-   copies of the GNU GPL and this license document.
-
-   d) Do one of the following:
-
-       0) Convey the Minimal Corresponding Source under the terms of this
-       License, and the Corresponding Application Code in a form
-       suitable for, and under terms that permit, the user to
-       recombine or relink the Application with a modified version of
-       the Linked Version to produce a modified Combined Work, in the
-       manner specified by section 6 of the GNU GPL for conveying
-       Corresponding Source.
-
-       1) Use a suitable shared library mechanism for linking with the
-       Library.  A suitable mechanism is one that (a) uses at run time
-       a copy of the Library already present on the user's computer
-       system, and (b) will operate properly with a modified version
-       of the Library that is interface-compatible with the Linked
-       Version.
-
-   e) Provide Installation Information, but only if you would otherwise
-   be required to provide such information under section 6 of the
-   GNU GPL, and only to the extent that such information is
-   necessary to install and execute a modified version of the
-   Combined Work produced by recombining or relinking the
-   Application with a modified version of the Linked Version. (If
-   you use option 4d0, the Installation Information must accompany
-   the Minimal Corresponding Source and Corresponding Application
-   Code. If you use option 4d1, you must provide the Installation
-   Information in the manner specified by section 6 of the GNU GPL
-   for conveying Corresponding Source.)
-
-  5. Combined Libraries.
-
-  You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
-   a) Accompany the combined library with a copy of the same work based
-   on the Library, uncombined with any other library facilities,
-   conveyed under the terms of this License.
-
-   b) Give prominent notice with the combined library that part of it
-   is a work based on the Library, and explaining where to find the
-   accompanying uncombined form of the same work.
-
-  6. Revised Versions of the GNU Lesser General Public License.
-
-  The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
-  Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
-  If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.
-
-**********************************************************************
-**********************************************************************
-
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
-
-**********************************************************************
-**********************************************************************
diff --git a/#pma/libraries/tcpdf/README.TXT b/#pma/libraries/tcpdf/README.TXT
deleted file mode 100644
index 2061fa7a..00000000
--- a/#pma/libraries/tcpdf/README.TXT
+++ /dev/null
@@ -1,117 +0,0 @@
-TCPDF - README
-============================================================
-
-I WISH TO IMPROVE AND EXPAND TCPDF BUT I NEED YOUR SUPPORT.
-PLEASE MAKE A DONATION:
-http://sourceforge.net/donate/index.php?group_id=128076
-or via PayPal at paypal@tecnick.com
-
-------------------------------------------------------------
-
-Name: TCPDF
-Version: 6.2.12
-Release date: 2015-09-12
-Author:	Nicola Asuni
-
-Copyright (c) 2002-2015:
-	Nicola Asuni
-	Tecnick.com LTD
-	www.tecnick.com
-
-URLs:
-	http://www.tcpdf.org
-	http://www.sourceforge.net/projects/tcpdf
-	https://github.com/tecnickcom/TCPDF
-
-Description:
-	TCPDF is a PHP class for generating PDF files on-the-fly without requiring external extensions.
-	This library includes also a class to extract data from existing PDF documents and
-	classes to generate 1D and 2D barcodes in various formats.
-
-Main Features:
-    * no external libraries are required for the basic functions;
-    * all standard page formats, custom page formats, custom margins and units of measure;
-    * UTF-8 Unicode and Right-To-Left languages;
-    * TrueTypeUnicode, OpenTypeUnicode v1, TrueType, OpenType v1, Type1 and CID-0 fonts;
-    * font subsetting;
-    * methods to publish some XHTML + CSS code, Javascript and Forms;
-    * images, graphic (geometric figures) and transformation methods;
-    * supports JPEG, PNG and SVG images natively, all images supported by GD (GD, GD2, GD2PART, GIF, JPEG, PNG, BMP, XBM, XPM) and all images supported via ImagMagick (http://www.imagemagick.org/script/formats.php)
-    * 1D and 2D barcodes: CODE 39, ANSI MH10.8M-1983, USD-3, 3 of 9, CODE 93, USS-93, Standard 2 of 5, Interleaved 2 of 5, CODE 128 A/B/C, 2 and 5 Digits UPC-Based Extension, EAN 8, EAN 13, UPC-A, UPC-E, MSI, POSTNET, PLANET, RMS4CC (Royal Mail 4-state Customer Code), CBC (Customer Bar Code), KIX (Klant index - Customer index), Intelligent Mail Barcode, Onecode, USPS-B-3200, CODABAR, CODE 11, PHARMACODE, PHARMACODE TWO-TRACKS, Datamatrix, QR-Code, PDF417;
-    * JPEG and PNG ICC profiles, Grayscale, RGB, CMYK, Spot Colors and Transparencies;
-    * automatic page header and footer management;
-    * document encryption up to 256 bit and digital signature certifications;
-    * transactions to UNDO commands;
-    * PDF annotations, including links, text and file attachments;
-    * text rendering modes (fill, stroke and clipping);
-    * multiple columns mode;
-    * no-write page regions;
-    * bookmarks, named destinations and table of content;
-    * text hyphenation;
-    * text stretching and spacing (tracking);
-    * automatic page break, line break and text alignments including justification;
-    * automatic page numbering and page groups;
-    * move and delete pages;
-    * page compression (requires php-zlib extension);
-    * XOBject Templates;
-	* Layers and object visibility.
-	* PDF/A-1b support.
-
-Installation (full instructions on http:  www.tcpdf.org):
-	1. copy the folder on your Web server
-	2. set your installation path and other parameters on the config/tcpdf_config.php
-	3. call the examples/example_001.php page with your browser to see an example
-
-Source Code Documentation:
-	http://www.tcpdf.org
-
-Additional Documentation:
-	http://www.tcpdf.org
-
-License:
-	Copyright (C) 2002-2014  Nicola Asuni - Tecnick.com LTD
-
-	TCPDF is free software: you can redistribute it and/or modify it
-	under the terms of the GNU Lesser General Public License as
-	published by the Free Software Foundation, either version 3 of the
-	License, or (at your option) any later version.
-
-	TCPDF is distributed in the hope that it will be useful, but
-	WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-	See the GNU Lesser General Public License for more details.
-
-	You should have received a copy of the License
-	along with TCPDF. If not, see
-	<http://www.tecnick.com/pagefiles/tcpdf/LICENSE.TXT>.
-
-	See LICENSE.TXT file for more information.
-
-Third party fonts:
-
-	This library may include third party font files released with different licenses.
-	
-	All the PHP files on the fonts directory are subject to the general TCPDF license (GNU-LGPLv3),
-	they do not contain any binary data but just a description of the general properties of a particular font.
-	These files can be also generated on the fly using the font utilities and TCPDF methods.
-	
-	All the original binary TTF font files have been renamed for compatibility with TCPDF and compressed using the gzcompress PHP function that uses the ZLIB data format (.z files).
-	
-	The binary files (.z) that begins with the prefix "free" have been extracted from the GNU FreeFont collection (GNU-GPLv3).
-	The binary files (.z) that begins with the prefix "pdfa" have been derived from the GNU FreeFont, so they are subject to the same license.
-	For the details of Copyright, License and other information, please check the files inside the directory fonts/freefont-20120503
-	Link : http://www.gnu.org/software/freefont/
-	
-	The binary files (.z) that begins with the prefix "dejavu" have been extracted from the DejaVu fonts 2.33 (Bitstream) collection.
-	For the details of Copyright, License and other information, please check the files inside the directory fonts/dejavu-fonts-ttf-2.33
-	Link : http://dejavu-fonts.org
-	
-	The binary files (.z) that begins with the prefix "ae" have been extracted from the Arabeyes.org collection (GNU-GPLv2).
-	Link : http://projects.arabeyes.org/
-
-ICC profile:
-    TCPDF includes the sRGB.icc profile from the icc-profiles-free Debian package:
-    https://packages.debian.org/source/stable/icc-profiles-free
-
-
-============================================================
diff --git a/#pma/libraries/tcpdf/config/tcpdf_config.php b/#pma/libraries/tcpdf/config/tcpdf_config.php
deleted file mode 100644
index 92317b12..00000000
--- a/#pma/libraries/tcpdf/config/tcpdf_config.php
+++ /dev/null
@@ -1,227 +0,0 @@
-<?php
-//============================================================+
-// File name   : tcpdf_config.php
-// Begin       : 2004-06-11
-// Last Update : 2014-12-11
-//
-// Description : Configuration file for TCPDF.
-// Author      : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
-// License     : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
-// -------------------------------------------------------------------
-// Copyright (C) 2004-2014  Nicola Asuni - Tecnick.com LTD
-//
-// This file is part of TCPDF software library.
-//
-// TCPDF is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// TCPDF is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-// See the GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with TCPDF.  If not, see <http://www.gnu.org/licenses/>.
-//
-// See LICENSE.TXT file for more information.
-//============================================================+
-
-/**
- * Configuration file for TCPDF.
- * @author Nicola Asuni
- * @package com.tecnick.tcpdf
- * @version 4.9.005
- * @since 2004-10-27
- */
-
-// IMPORTANT:
-// If you define the constant K_TCPDF_EXTERNAL_CONFIG, all the following settings will be ignored.
-// If you use the tcpdf_autoconfig.php, then you can overwrite some values here.
-
-
-/**
- * Installation path (/var/www/tcpdf/).
- * By default it is automatically calculated but you can also set it as a fixed string to improve performances.
- */
-//define ('K_PATH_MAIN', '');
-
-/**
- * URL path to tcpdf installation folder (http://localhost/tcpdf/).
- * By default it is automatically set but you can also set it as a fixed string to improve performances.
- */
-//define ('K_PATH_URL', '');
-
-/**
- * Path for PDF fonts.
- * By default it is automatically set but you can also set it as a fixed string to improve performances.
- */
-//define ('K_PATH_FONTS', K_PATH_MAIN.'fonts/');
-
-/**
- * Default images directory.
- * By default it is automatically set but you can also set it as a fixed string to improve performances.
- */
-//define ('K_PATH_IMAGES', '');
-
-/**
- * Deafult image logo used be the default Header() method.
- * Please set here your own logo or an empty string to disable it.
- */
-//define ('PDF_HEADER_LOGO', '');
-
-/**
- * Header logo image width in user units.
- */
-//define ('PDF_HEADER_LOGO_WIDTH', 0);
-
-/**
- * Cache directory for temporary files (full path).
- */
-//define ('K_PATH_CACHE', '/tmp/');
-
-/**
- * Generic name for a blank image.
- */
-define ('K_BLANK_IMAGE', '_blank.png');
-
-/**
- * Page format.
- */
-define ('PDF_PAGE_FORMAT', 'A4');
-
-/**
- * Page orientation (P=portrait, L=landscape).
- */
-define ('PDF_PAGE_ORIENTATION', 'P');
-
-/**
- * Document creator.
- */
-define ('PDF_CREATOR', 'TCPDF');
-
-/**
- * Document author.
- */
-define ('PDF_AUTHOR', 'TCPDF');
-
-/**
- * Header title.
- */
-define ('PDF_HEADER_TITLE', 'TCPDF Example');
-
-/**
- * Header description string.
- */
-define ('PDF_HEADER_STRING', "by Nicola Asuni - Tecnick.com\nwww.tcpdf.org");
-
-/**
- * Document unit of measure [pt=point, mm=millimeter, cm=centimeter, in=inch].
- */
-define ('PDF_UNIT', 'mm');
-
-/**
- * Header margin.
- */
-define ('PDF_MARGIN_HEADER', 5);
-
-/**
- * Footer margin.
- */
-define ('PDF_MARGIN_FOOTER', 10);
-
-/**
- * Top margin.
- */
-define ('PDF_MARGIN_TOP', 27);
-
-/**
- * Bottom margin.
- */
-define ('PDF_MARGIN_BOTTOM', 25);
-
-/**
- * Left margin.
- */
-define ('PDF_MARGIN_LEFT', 15);
-
-/**
- * Right margin.
- */
-define ('PDF_MARGIN_RIGHT', 15);
-
-/**
- * Default main font name.
- */
-define ('PDF_FONT_NAME_MAIN', 'helvetica');
-
-/**
- * Default main font size.
- */
-define ('PDF_FONT_SIZE_MAIN', 10);
-
-/**
- * Default data font name.
- */
-define ('PDF_FONT_NAME_DATA', 'helvetica');
-
-/**
- * Default data font size.
- */
-define ('PDF_FONT_SIZE_DATA', 8);
-
-/**
- * Default monospaced font name.
- */
-define ('PDF_FONT_MONOSPACED', 'courier');
-
-/**
- * Ratio used to adjust the conversion of pixels to user units.
- */
-define ('PDF_IMAGE_SCALE_RATIO', 1.25);
-
-/**
- * Magnification factor for titles.
- */
-define('HEAD_MAGNIFICATION', 1.1);
-
-/**
- * Height of cell respect font height.
- */
-define('K_CELL_HEIGHT_RATIO', 1.25);
-
-/**
- * Title magnification respect main font size.
- */
-define('K_TITLE_MAGNIFICATION', 1.3);
-
-/**
- * Reduction factor for small font.
- */
-define('K_SMALL_RATIO', 2/3);
-
-/**
- * Set to true to enable the special procedure used to avoid the overlappind of symbols on Thai language.
- */
-define('K_THAI_TOPCHARS', true);
-
-/**
- * If true allows to call TCPDF methods using HTML syntax
- * IMPORTANT: For security reason, disable this feature if you are printing user HTML content.
- */
-define('K_TCPDF_CALLS_IN_HTML', false);
-
-/**
- * If true and PHP version is greater than 5, then the Error() method throw new exception instead of terminating the execution.
- */
-define('K_TCPDF_THROW_EXCEPTION_ERROR', false);
-
-/**
- * Default timezone for datetime functions
- */
-define('K_TIMEZONE', 'UTC');
-
-//============================================================+
-// END OF FILE
-//============================================================+
diff --git a/#pma/libraries/tcpdf/fonts/dejavu-fonts-ttf-2.34/LICENSE b/#pma/libraries/tcpdf/fonts/dejavu-fonts-ttf-2.34/LICENSE
deleted file mode 100644
index 254e2cc4..00000000
--- a/#pma/libraries/tcpdf/fonts/dejavu-fonts-ttf-2.34/LICENSE
+++ /dev/null
@@ -1,99 +0,0 @@
-Fonts are (c) Bitstream (see below). DejaVu changes are in public domain.
-Glyphs imported from Arev fonts are (c) Tavmjong Bah (see below)
-
-Bitstream Vera Fonts Copyright
-------------------------------
-
-Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is
-a trademark of Bitstream, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of the fonts accompanying this license ("Fonts") and associated
-documentation files (the "Font Software"), to reproduce and distribute the
-Font Software, including without limitation the rights to use, copy, merge,
-publish, distribute, and/or sell copies of the Font Software, and to permit
-persons to whom the Font Software is furnished to do so, subject to the
-following conditions:
-
-The above copyright and trademark notices and this permission notice shall
-be included in all copies of one or more of the Font Software typefaces.
-
-The Font Software may be modified, altered, or added to, and in particular
-the designs of glyphs or characters in the Fonts may be modified and
-additional glyphs or characters may be added to the Fonts, only if the fonts
-are renamed to names not containing either the words "Bitstream" or the word
-"Vera".
-
-This License becomes null and void to the extent applicable to Fonts or Font
-Software that has been modified and is distributed under the "Bitstream
-Vera" names.
-
-The Font Software may be sold as part of a larger software package but no
-copy of one or more of the Font Software typefaces may be sold by itself.
-
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT,
-TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME
-FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING
-ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
-THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE
-FONT SOFTWARE.
-
-Except as contained in this notice, the names of Gnome, the Gnome
-Foundation, and Bitstream Inc., shall not be used in advertising or
-otherwise to promote the sale, use or other dealings in this Font Software
-without prior written authorization from the Gnome Foundation or Bitstream
-Inc., respectively. For further information, contact: fonts at gnome dot
-org. 
-
-Arev Fonts Copyright
-------------------------------
-
-Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the fonts accompanying this license ("Fonts") and
-associated documentation files (the "Font Software"), to reproduce
-and distribute the modifications to the Bitstream Vera Font Software,
-including without limitation the rights to use, copy, merge, publish,
-distribute, and/or sell copies of the Font Software, and to permit
-persons to whom the Font Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright and trademark notices and this permission notice
-shall be included in all copies of one or more of the Font Software
-typefaces.
-
-The Font Software may be modified, altered, or added to, and in
-particular the designs of glyphs or characters in the Fonts may be
-modified and additional glyphs or characters may be added to the
-Fonts, only if the fonts are renamed to names not containing either
-the words "Tavmjong Bah" or the word "Arev".
-
-This License becomes null and void to the extent applicable to Fonts
-or Font Software that has been modified and is distributed under the 
-"Tavmjong Bah Arev" names.
-
-The Font Software may be sold as part of a larger software package but
-no copy of one or more of the Font Software typefaces may be sold by
-itself.
-
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL
-TAVMJONG BAH BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
-
-Except as contained in this notice, the name of Tavmjong Bah shall not
-be used in advertising or otherwise to promote the sale, use or other
-dealings in this Font Software without prior written authorization
-from Tavmjong Bah. For further information, contact: tavmjong @ free
-. fr.
-
-$Id: LICENSE 2133 2007-11-28 02:46:28Z lechimp $
diff --git a/#pma/libraries/tcpdf/fonts/dejavusans.ctg.z b/#pma/libraries/tcpdf/fonts/dejavusans.ctg.z
deleted file mode 100644
index df25b649..00000000
Binary files a/#pma/libraries/tcpdf/fonts/dejavusans.ctg.z and /dev/null differ
diff --git a/#pma/libraries/tcpdf/fonts/dejavusans.php b/#pma/libraries/tcpdf/fonts/dejavusans.php
deleted file mode 100644
index 72147bee..00000000
--- a/#pma/libraries/tcpdf/fonts/dejavusans.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-// TCPDF FONT FILE DESCRIPTION
-$type='TrueTypeUnicode';
-$name='DejaVuSans';
-$up=-63;
-$ut=44;
-$dw=600;
-$diff='';
-$originalsize=741536;
-$enc='';
-$file='dejavusans.z';
-$ctg='dejavusans.ctg.z';
-$desc=array('Flags'=>32,'FontBBox'=>'[-1021 -415 1681 1167]','ItalicAngle'=>0,'Ascent'=>928,'Descent'=>-236,'Leading'=>0,'CapHeight'=>729,'XHeight'=>547,'StemV'=>34,'StemH'=>15,'AvgWidth'=>507,'MaxWidth'=>1735,'MissingWidth'=>600);
-$cbbox=array(0=>array(50,-177,550,705),33=>array(151,0,250,729),34=>array(96,458,364,729),35=>array(77,0,761,718),36=>array(83,-147,553,760),37=>array(55,-14,895,742),38=>array(63,-14,749,742),39=>array(96,458,179,729),40=>array(86,-132,310,759),41=>array(80,-132,304,759),42=>array(30,286,470,742),43=>array(106,0,732,627),44=>array(77,-116,220,124),45=>array(49,234,312,314),46=>array(107,0,210,124),47=>array(0,-93,337,729),48=>array(66,-14,570,742),49=>array(110,0,544,729),50=>array(73,0,536,742),51=>array(76,-14,556,742),52=>array(49,0,580,729),53=>array(77,-14,549,729),54=>array(70,-14,573,742),55=>array(82,0,551,729),56=>array(68,-14,568,742),57=>array(63,-14,566,742),58=>array(117,0,220,517),59=>array(77,-116,220,517),60=>array(106,46,732,581),61=>array(106,172,732,454),62=>array(106,46,732,581),63=>array(72,0,461,742),64=>array(66,-174,930,704),65=>array(8,0,676,729),66=>array(98,0,615,729),67=>array(56,-14,644,742),68=>array(98,0,711,729),69=>array(98,0,568,729),70=>array(98,0,517,729),71=>array(56,-14,693,742),72=>array(98,0,654,729),73=>array(98,0,197,729),74=>array(-52,-200,197,729),75=>array(98,0,677,729),76=>array(98,0,552,729),77=>array(98,0,765,729),78=>array(98,0,650,729),79=>array(56,-14,731,742),80=>array(98,0,569,729),81=>array(56,-129,731,742),82=>array(98,0,666,729),83=>array(66,-14,579,742),84=>array(-3,0,614,729),85=>array(87,-14,645,729),86=>array(8,0,676,729),87=>array(33,0,956,729),88=>array(30,0,654,729),89=>array(-2,0,613,729),90=>array(45,0,640,729),91=>array(86,-132,293,760),92=>array(0,-93,337,729),93=>array(97,-132,304,760),94=>array(106,457,732,729),95=>array(-10,-236,510,-166),96=>array(83,617,317,800),97=>array(60,-14,522,560),98=>array(91,-14,580,760),99=>array(55,-14,488,560),100=>array(55,-14,544,760),101=>array(55,-14,562,560),102=>array(23,0,371,760),103=>array(55,-208,544,560),104=>array(91,0,549,760),105=>array(94,0,184,760),106=>array(-18,-208,184,760),107=>array(91,0,576,760),108=>array(94,0,184,760),109=>array(91,0,889,560),110=>array(91,0,549,560),111=>array(55,-14,557,560),112=>array(91,-208,580,560),113=>array(55,-208,544,560),114=>array(91,0,411,560),115=>array(54,-14,472,560),116=>array(27,0,368,702),117=>array(85,-14,543,560),118=>array(30,0,562,547),119=>array(42,0,776,547),120=>array(29,0,559,547),121=>array(30,-208,562,547),122=>array(43,0,482,547),123=>array(125,-163,511,760),124=>array(127,-236,210,764),125=>array(125,-163,511,760),126=>array(106,228,732,399),161=>array(151,0,250,729),162=>array(84,-153,517,699),163=>array(63,0,548,742),164=>array(46,40,592,587),165=>array(40,0,595,729),166=>array(127,-171,210,699),167=>array(45,-95,454,742),168=>array(105,659,395,758),169=>array(138,0,862,725),170=>array(56,229,404,742),171=>array(77,69,518,517),172=>array(106,140,732,421),173=>array(49,234,312,314),174=>array(138,0,862,725),175=>array(104,673,396,745),176=>array(95,432,405,742),177=>array(106,0,732,627),178=>array(46,326,338,742),179=>array(48,319,350,742),180=>array(181,616,415,800),181=>array(85,-208,612,547),182=>array(77,-96,528,729),183=>array(107,285,210,409),184=>array(142,-193,344,0),185=>array(67,326,346,734),186=>array(47,229,424,742),187=>array(94,69,535,517),188=>array(67,-14,937,742),189=>array(67,-14,906,742),190=>array(48,-14,937,742),191=>array(70,-14,459,729),192=>array(8,0,676,927),193=>array(8,0,676,927),194=>array(8,0,676,928),195=>array(8,0,676,921),196=>array(8,0,676,913),197=>array(8,0,676,928),198=>array(4,0,910,729),199=>array(56,-193,644,742),200=>array(98,0,568,927),201=>array(98,0,568,927),202=>array(98,0,568,928),203=>array(98,0,568,913),204=>array(29,0,216,927),205=>array(79,0,265,927),206=>array(-1,0,297,928),207=>array(3,0,293,913),208=>array(5,0,716,729),209=>array(98,0,650,921),210=>array(56,-14,731,927),211=>array(56,-14,731,927),212=>array(56,-14,731,928),213=>array(56,-14,731,921),214=>array(56,-14,731,913),215=>array(137,31,701,596),216=>array(50,-34,737,761),217=>array(87,-14,645,927),218=>array(87,-14,645,927),219=>array(87,-14,645,928),220=>array(87,-14,645,913),221=>array(-2,0,613,927),222=>array(98,0,569,729),223=>array(91,-14,584,760),224=>array(60,-14,522,800),225=>array(60,-14,522,800),226=>array(60,-14,522,800),227=>array(60,-14,522,777),228=>array(60,-14,522,758),229=>array(60,-14,522,878),230=>array(60,-14,929,560),231=>array(55,-193,488,560),232=>array(55,-14,562,800),233=>array(55,-14,562,800),234=>array(55,-14,562,800),235=>array(55,-14,562,758),236=>array(-28,0,206,800),237=>array(70,0,304,800),238=>array(-17,0,295,800),239=>array(-6,0,284,758),240=>array(55,-14,557,760),241=>array(91,0,549,777),242=>array(55,-14,557,800),243=>array(55,-14,557,800),244=>array(55,-14,557,800),245=>array(55,-14,557,777),246=>array(55,-14,557,758),247=>array(106,73,732,554),248=>array(35,-46,576,592),249=>array(85,-14,543,800),250=>array(85,-14,543,800),251=>array(85,-14,543,800),252=>array(85,-14,543,758),253=>array(30,-208,562,800),254=>array(91,-208,580,760),255=>array(30,-208,562,758),256=>array(8,0,676,899),257=>array(60,-14,522,745),258=>array(8,0,676,946),259=>array(60,-14,522,765),260=>array(8,-193,706,729),261=>array(60,-193,563,560),262=>array(56,-14,644,927),263=>array(55,-14,488,800),264=>array(56,-14,644,928),265=>array(55,-14,488,800),266=>array(56,-14,644,914),267=>array(55,-14,488,760),268=>array(56,-14,644,928),269=>array(55,-14,488,800),270=>array(98,0,711,928),271=>array(55,-14,732,760),272=>array(5,0,716,729),273=>array(55,-14,619,760),274=>array(98,0,568,900),275=>array(55,-14,562,745),276=>array(98,0,568,928),277=>array(55,-14,562,785),278=>array(98,0,568,914),279=>array(55,-14,562,760),280=>array(98,-193,569,729),281=>array(55,-193,562,560),282=>array(98,0,568,925),283=>array(55,-14,562,797),284=>array(56,-14,693,928),285=>array(55,-208,544,800),286=>array(56,-14,693,928),287=>array(55,-208,544,785),288=>array(56,-14,693,914),289=>array(55,-208,544,760),290=>array(56,-250,693,742),291=>array(55,-208,544,775),292=>array(98,0,654,928),293=>array(-13,0,549,928),294=>array(98,0,818,729),295=>array(59,0,578,760),296=>array(-14,0,309,921),297=>array(-22,0,300,777),298=>array(1,0,293,899),299=>array(-7,0,285,745),300=>array(-5,0,300,928),301=>array(-14,0,292,785),302=>array(86,-193,268,729),303=>array(73,-193,255,760),304=>array(98,0,198,914),305=>array(94,0,184,560),306=>array(98,-200,492,729),307=>array(94,-208,461,760),308=>array(-52,-200,296,928),309=>array(-18,-208,295,800),310=>array(98,-235,677,729),311=>array(91,-235,576,760),312=>array(91,0,576,547),313=>array(98,0,552,928),314=>array(94,0,286,928),315=>array(98,-235,552,729),316=>array(66,-235,209,760),317=>array(98,0,552,729),318=>array(94,0,375,760),319=>array(98,0,552,729),320=>array(94,0,314,760),321=>array(-7,0,557,729),322=>array(1,0,285,760),323=>array(98,0,650,928),324=>array(91,0,549,803),325=>array(98,-235,650,729),326=>array(91,-235,549,560),327=>array(98,0,650,921),328=>array(91,0,549,800),329=>array(100,0,715,729),330=>array(98,-208,637,742),331=>array(91,-208,549,560),332=>array(56,-14,731,899),333=>array(55,-14,557,745),334=>array(56,-14,731,928),335=>array(55,-14,557,785),336=>array(56,-14,731,927),337=>array(55,-14,557,800),338=>array(56,0,1006,729),339=>array(55,-14,970,560),340=>array(98,0,666,928),341=>array(91,0,447,803),342=>array(98,-235,666,729),343=>array(63,-235,411,560),344=>array(98,0,666,921),345=>array(91,0,419,800),346=>array(66,-14,579,928),347=>array(54,-14,472,803),348=>array(66,-14,579,928),349=>array(54,-14,472,800),350=>array(66,-193,579,742),351=>array(54,-193,472,560),352=>array(66,-14,579,928),353=>array(54,-14,472,800),354=>array(-3,-193,614,729),355=>array(27,-193,368,702),356=>array(-3,0,614,921),357=>array(27,0,374,813),358=>array(-3,0,614,729),359=>array(27,0,368,702),360=>array(87,-14,645,921),361=>array(85,-14,543,777),362=>array(87,-14,645,899),363=>array(85,-14,543,745),364=>array(87,-14,645,928),365=>array(85,-14,543,785),366=>array(87,-14,645,929),367=>array(85,-14,543,849),368=>array(87,-14,645,927),369=>array(85,-14,546,800),370=>array(87,-193,645,729),371=>array(85,-193,613,560),372=>array(33,0,956,932),373=>array(42,0,776,803),374=>array(-2,0,613,932),375=>array(30,-208,562,803),376=>array(-2,0,613,913),377=>array(45,0,640,928),378=>array(43,0,482,803),379=>array(45,0,640,914),380=>array(43,0,482,760),381=>array(45,0,640,928),382=>array(43,0,482,800),383=>array(23,0,371,760),384=>array(16,-14,580,760),385=>array(-51,0,664,729),386=>array(98,0,615,729),387=>array(91,-14,580,760),388=>array(0,0,615,729),389=>array(0,-14,580,760),390=>array(56,-14,644,742),391=>array(56,-14,794,924),392=>array(55,-14,600,760),393=>array(5,0,716,729),394=>array(-51,0,760,729),395=>array(98,0,615,729),396=>array(55,-14,544,760),397=>array(55,-208,557,548),398=>array(64,0,534,729),399=>array(57,-14,731,742),400=>array(80,-14,560,742),401=>array(-52,-200,517,729),402=>array(-63,-208,371,760),403=>array(56,-14,824,924),404=>array(4,-210,683,729),405=>array(91,0,910,760),406=>array(98,0,347,729),407=>array(5,0,290,729),408=>array(98,0,746,742),409=>array(90,0,576,760),410=>array(5,0,271,760),411=>array(30,0,562,760),412=>array(87,-14,894,729),413=>array(-52,-200,650,729),414=>array(91,-208,549,560),415=>array(56,-14,731,742),416=>array(50,-14,764,760),417=>array(58,-14,603,615),418=>array(56,-14,851,742),419=>array(55,-208,668,560),420=>array(-51,0,618,729),421=>array(90,-208,580,760),422=>array(98,-129,666,729),423=>array(56,-14,569,742),424=>array(49,-14,467,560),425=>array(98,0,568,729),426=>array(-132,-208,355,760),427=>array(27,-208,368,702),428=>array(12,0,614,729),429=>array(27,0,368,760),430=>array(-3,-200,614,729),431=>array(84,-4,796,760),432=>array(86,-14,676,615),433=>array(38,-14,726,724),434=>array(98,-15,683,729),435=>array(-2,0,742,742),436=>array(30,-208,730,560),437=>array(45,0,640,729),438=>array(43,0,482,547),439=>array(78,-31,621,729),440=>array(45,-31,588,729),441=>array(51,-213,531,547),442=>array(55,-208,488,547),443=>array(73,0,536,742),444=>array(45,-31,622,729),445=>array(51,-213,531,547),446=>array(43,-14,456,702),447=>array(91,-208,580,560),448=>array(98,-208,197,729),449=>array(98,-208,394,729),450=>array(10,-208,451,729),451=>array(98,0,197,729),452=>array(98,0,1352,928),453=>array(98,0,1211,800),454=>array(55,-14,1071,800),455=>array(98,-200,768,729),456=>array(98,-208,733,760),457=>array(94,-208,367,760),458=>array(98,-200,868,729),459=>array(98,-208,839,760),460=>array(91,-208,733,760),461=>array(8,0,676,928),462=>array(60,-14,522,800),463=>array(-1,0,297,928),464=>array(-16,0,296,800),465=>array(56,-14,731,928),466=>array(55,-14,557,800),467=>array(87,-14,645,928),468=>array(85,-14,543,800),469=>array(87,-14,645,1025),470=>array(85,-14,543,899),471=>array(87,-14,645,1044),472=>array(85,-14,543,892),473=>array(87,-14,645,1044),474=>array(85,-14,543,892),475=>array(87,-14,645,1047),476=>array(85,-14,543,892),477=>array(55,-14,562,560),478=>array(8,0,676,1025),479=>array(60,-14,522,899),480=>array(8,0,676,1025),481=>array(60,-14,522,869),482=>array(4,0,910,900),483=>array(60,-14,929,743),484=>array(56,-14,752,742),485=>array(55,-208,622,560),486=>array(56,-14,693,928),487=>array(55,-208,544,798),488=>array(98,0,677,928),489=>array(-11,0,576,928),490=>array(56,-193,731,742),491=>array(55,-193,557,560),492=>array(56,-193,731,899),493=>array(55,-193,557,745),494=>array(78,-31,621,928),495=>array(43,-213,523,800),496=>array(-18,-208,299,800),497=>array(98,0,1352,729),498=>array(98,0,1211,729),499=>array(55,-14,1071,760),500=>array(56,-14,693,928),501=>array(55,-208,544,798),502=>array(98,-14,1022,729),503=>array(98,-208,626,742),504=>array(98,0,650,927),505=>array(91,0,549,799),506=>array(8,0,676,931),507=>array(60,-14,607,931),508=>array(4,0,910,928),509=>array(60,-14,929,798),510=>array(50,-34,737,928),511=>array(35,-46,576,798),512=>array(8,0,676,930),513=>array(60,-14,522,799),514=>array(8,0,676,901),515=>array(60,-14,522,785),516=>array(98,0,568,930),517=>array(55,-14,562,798),518=>array(98,0,568,901),519=>array(55,-14,562,785),520=>array(-43,0,306,930),521=>array(-30,0,313,798),522=>array(2,0,308,901),523=>array(-14,0,292,785),524=>array(56,-14,731,930),525=>array(55,-14,557,799),526=>array(56,-14,731,901),527=>array(55,-14,557,785),528=>array(97,0,666,930),529=>array(63,0,411,798),530=>array(98,0,666,901),531=>array(91,0,421,785),532=>array(87,-14,645,930),533=>array(85,-14,543,799),534=>array(87,-14,645,901),535=>array(85,-14,543,785),536=>array(66,-240,579,742),537=>array(54,-240,472,560),538=>array(-3,-240,614,729),539=>array(27,-240,368,702),540=>array(76,-210,556,742),541=>array(35,-211,467,560),542=>array(98,0,654,928),543=>array(-8,0,549,928),544=>array(98,-208,637,742),545=>array(55,-70,783,760),546=>array(55,-14,643,742),547=>array(55,-14,555,632),548=>array(45,-208,640,729),549=>array(43,-208,482,547),550=>array(8,0,676,914),551=>array(60,-14,522,760),552=>array(98,-193,568,729),553=>array(55,-193,562,560),554=>array(56,-14,731,1025),555=>array(55,-14,557,899),556=>array(56,-14,731,1025),557=>array(55,-14,557,864),558=>array(56,-14,731,914),559=>array(55,-14,557,760),560=>array(56,-14,731,1025),561=>array(55,-14,557,899),562=>array(-2,0,613,899),563=>array(30,-208,562,745),564=>array(67,-70,420,757),565=>array(91,-70,788,560),566=>array(27,-70,422,702),567=>array(-18,-208,184,547),568=>array(55,-14,943,760),569=>array(55,-208,943,560),570=>array(-1,-34,686,761),571=>array(6,-34,692,761),572=>array(4,-46,545,592),573=>array(5,0,552,729),574=>array(-38,-34,649,761),575=>array(54,-242,512,560),576=>array(43,-242,525,547),577=>array(39,0,569,729),578=>array(39,0,445,560),579=>array(5,0,615,729),580=>array(6,-14,726,729),581=>array(8,0,676,729),582=>array(98,-93,568,822),583=>array(55,-93,562,640),584=>array(-52,-200,290,729),585=>array(-18,-208,264,760),586=>array(56,-200,836,743),587=>array(55,-208,656,560),588=>array(5,0,666,729),589=>array(7,0,411,560),590=>array(-5,0,615,729),591=>array(5,-208,588,547),592=>array(85,-14,547,560),593=>array(55,-14,544,560),594=>array(91,-14,580,560),595=>array(91,-14,580,760),596=>array(62,-14,495,560),597=>array(55,-69,488,560),598=>array(55,-208,656,760),599=>array(55,-14,715,760),600=>array(55,-14,562,560),601=>array(55,-14,562,560),602=>array(61,-14,814,560),603=>array(65,-14,473,561),604=>array(65,-14,473,561),605=>array(65,-14,771,561),606=>array(55,-14,596,561),607=>array(-18,-208,264,547),608=>array(55,-208,715,760),609=>array(55,-208,544,547),610=>array(55,-14,539,560),611=>array(47,-210,549,547),612=>array(47,-14,549,547),613=>array(85,-208,543,547),614=>array(91,0,549,760),615=>array(91,-208,549,760),616=>array(7,0,265,760),617=>array(81,0,304,547),618=>array(57,0,314,547),619=>array(37,0,359,760),620=>array(38,0,416,760),621=>array(94,-208,296,760),622=>array(94,-213,651,760),623=>array(91,-13,889,548),624=>array(91,-208,889,548),625=>array(91,-208,889,560),626=>array(-18,-208,552,560),627=>array(91,-208,661,560),628=>array(87,0,549,547),629=>array(55,-14,557,560),630=>array(55,0,768,547),631=>array(72,-18,655,561),632=>array(55,-208,602,760),633=>array(0,-13,320,547),634=>array(0,-13,320,755),635=>array(0,-208,433,547),636=>array(91,-207,411,560),637=>array(91,-208,411,560),638=>array(64,0,437,560),639=>array(57,0,437,560),640=>array(91,0,574,547),641=>array(91,0,574,547),642=>array(54,-208,472,560),643=>array(-19,-208,355,760),644=>array(-19,-208,355,760),645=>array(27,-208,401,549),646=>array(-132,-208,355,760),647=>array(27,-156,368,546),648=>array(27,-208,370,702),649=>array(0,-14,634,547),650=>array(55,-15,564,547),651=>array(94,0,545,548),652=>array(30,0,562,547),653=>array(42,0,776,547),654=>array(30,0,562,760),655=>array(50,0,552,547),656=>array(43,-208,593,547),657=>array(43,-54,482,547),658=>array(43,-213,523,547),659=>array(53,-213,553,547),660=>array(43,0,456,759),661=>array(43,0,456,759),662=>array(43,0,456,759),663=>array(43,-213,456,760),664=>array(56,-14,731,742),665=>array(91,0,530,547),666=>array(55,-14,596,561),667=>array(55,-14,724,760),668=>array(91,0,563,547),669=>array(-132,-208,272,760),670=>array(91,-213,576,547),671=>array(91,0,493,547),672=>array(55,-208,746,759),673=>array(43,0,456,759),674=>array(43,0,456,759),675=>array(55,-14,970,760),676=>array(55,-213,1014,760),677=>array(55,-54,970,760),678=>array(27,0,781,702),679=>array(27,-208,629,760),680=>array(27,-70,723,702),681=>array(23,-208,804,760),682=>array(94,0,657,760),683=>array(94,0,610,760),684=>array(26,-15,489,640),685=>array(26,84,489,640),686=>array(0,-214,570,760),687=>array(0,-208,683,760),688=>array(57,326,346,751),689=>array(57,326,346,751),690=>array(-11,209,116,751),691=>array(57,326,259,640),692=>array(35,319,236,632),693=>array(35,209,307,632),694=>array(16,326,320,632),695=>array(26,326,489,632),696=>array(19,209,354,632),697=>array(78,557,203,800),698=>array(78,557,384,800),699=>array(85,489,228,729),700=>array(87,499,230,729),701=>array(96,616,239,856),702=>array(57,492,191,760),703=>array(57,492,191,760),704=>array(57,326,317,751),705=>array(57,326,317,751),706=>array(130,524,370,836),707=>array(130,524,370,836),708=>array(94,561,406,800),709=>array(94,561,406,800),710=>array(94,616,406,800),711=>array(94,616,406,800),712=>array(104,488,171,759),713=>array(104,673,396,745),714=>array(181,616,415,800),715=>array(83,617,317,800),716=>array(104,-148,171,123),717=>array(104,-156,396,-84),718=>array(83,-236,317,-54),719=>array(181,-236,415,-53),720=>array(54,0,229,517),721=>array(54,356,229,517),722=>array(57,249,191,517),723=>array(57,249,191,517),724=>array(140,229,360,448),725=>array(140,229,360,448),726=>array(49,125,341,417),727=>array(49,234,269,307),728=>array(97,645,403,785),729=>array(200,658,300,758),730=>array(116,610,384,878),731=>array(162,-193,344,0),732=>array(89,639,411,777),733=>array(117,616,460,800),734=>array(-0,233,334,504),735=>array(117,616,383,800),736=>array(57,208,374,632),737=>array(60,326,116,751),738=>array(57,326,320,648),739=>array(57,326,391,632),740=>array(57,326,317,751),741=>array(104,0,389,668),742=>array(104,0,389,668),743=>array(104,0,389,668),744=>array(104,0,389,668),745=>array(104,0,389,668),748=>array(94,-260,406,-21),749=>array(104,610,396,808),750=>array(85,489,428,729),755=>array(116,-240,384,28),759=>array(89,-192,411,-55),768=>array(-418,560,-184,800),769=>array(-320,560,-86,800),770=>array(-406,560,-94,800),771=>array(-412,639,-90,777),772=>array(-394,673,-102,745),773=>array(-510,686,10,755),774=>array(-407,645,-101,785),775=>array(-296,560,-206,760),776=>array(-395,560,-105,758),777=>array(-348,618,-129,810),778=>array(-385,610,-117,878),779=>array(-381,616,-38,800),780=>array(-404,560,-92,800),781=>array(-283,615,-217,832),782=>array(-383,615,-117,832),783=>array(-455,616,-112,800),784=>array(-407,645,-101,917),785=>array(-407,645,-101,785),786=>array(-235,489,-92,645),787=>array(-305,595,-187,844),788=>array(-305,595,-187,844),789=>array(-66,575,66,759),790=>array(-418,-266,-184,-83),791=>array(-320,-267,-86,-83),792=>array(-357,-240,-221,-24),793=>array(-279,-240,-143,-24),794=>array(-208,690,31,930),795=>array(-133,427,60,609),796=>array(-313,-241,-208,-32),797=>array(-370,-240,-130,-87),798=>array(-370,-240,-130,-87),799=>array(-357,-240,-143,-24),800=>array(-370,-184,-130,-117),801=>array(-315,-208,-23,63),802=>array(-317,-208,-25,63),803=>array(-296,-183,-206,-69),804=>array(-396,-183,-106,-84),805=>array(-355,-241,-146,-32),806=>array(-323,-240,-180,-84),807=>array(-358,-193,-156,0),808=>array(-338,-193,-156,0),809=>array(-283,-240,-217,-47),810=>array(-383,-211,-114,-50),811=>array(-452,-222,-51,-82),812=>array(-404,-240,-92,-57),813=>array(-407,-240,-95,-57),814=>array(-407,-222,-101,-82),815=>array(-407,-224,-101,-83),816=>array(-412,-222,-90,-84),817=>array(-394,-156,-102,-84),818=>array(-510,-236,10,-166),819=>array(-510,-236,10,-9),820=>array(-557,240,-41,381),821=>array(-316,221,-59,301),822=>array(-634,221,-0,301),823=>array(-574,-46,-33,592),824=>array(-741,-34,-54,761),825=>array(-291,-241,-187,-32),826=>array(-382,-206,-113,-44),827=>array(-359,-240,-139,-21),828=>array(-452,-222,-51,-82),829=>array(-354,619,-138,834),830=>array(-247,595,-109,853),831=>array(-510,528,10,755),832=>array(-418,617,-184,800),833=>array(-320,616,-86,800),834=>array(-412,639,-90,777),835=>array(-305,595,-187,844),836=>array(-387,659,-77,978),837=>array(-278,-208,-171,-45),838=>array(-396,639,-104,786),839=>array(-360,-226,-140,-35),840=>array(-365,-240,-135,-47),841=>array(-360,-240,-140,-21),842=>array(-411,616,-89,800),843=>array(-411,567,-89,850),844=>array(-411,596,-89,820),845=>array(-452,-230,-48,-30),846=>array(-350,-240,-150,-45),849=>array(-316,610,-184,878),850=>array(-407,547,-101,855),851=>array(-354,-240,-138,-24),855=>array(-316,610,-184,878),856=>array(-103,658,-3,758),858=>array(-430,-241,-71,-32),860=>array(-445,-237,445,-60),861=>array(-445,802,445,979),862=>array(-445,855,445,927),863=>array(-445,-156,445,-84),864=>array(-354,756,354,894),865=>array(-445,752,445,929),866=>array(-442,-230,447,-30),880=>array(98,0,555,729),881=>array(94,0,477,547),882=>array(98,0,764,729),883=>array(98,0,549,729),884=>array(78,557,203,800),885=>array(78,-208,203,35),886=>array(98,0,650,729),887=>array(91,0,559,547),890=>array(214,-208,321,-45),891=>array(62,-14,495,560),892=>array(55,-14,488,560),893=>array(62,-14,495,560),894=>array(77,-116,220,517),900=>array(181,616,415,800),901=>array(105,659,415,978),902=>array(8,0,676,800),903=>array(107,285,210,409),904=>array(-12,0,682,800),905=>array(-6,0,765,800),906=>array(-9,0,311,800),908=>array(-7,-14,750,800),910=>array(-15,0,821,800),911=>array(-18,0,752,800),912=>array(2,0,313,978),913=>array(8,0,676,729),914=>array(98,0,615,729),915=>array(98,0,552,729),916=>array(8,0,676,729),917=>array(98,0,568,729),918=>array(45,0,640,729),919=>array(98,0,654,729),920=>array(56,-14,731,742),921=>array(98,0,197,729),922=>array(98,0,677,729),923=>array(8,0,676,729),924=>array(98,0,765,729),925=>array(98,0,650,729),926=>array(98,0,548,729),927=>array(56,-14,731,742),928=>array(98,0,654,729),929=>array(98,0,569,729),931=>array(98,0,568,729),932=>array(-3,0,614,729),933=>array(-2,0,613,729),934=>array(56,0,731,729),935=>array(30,0,654,729),936=>array(56,0,732,729),937=>array(38,0,726,738),938=>array(3,0,293,913),939=>array(-2,0,613,913),940=>array(55,-12,611,800),941=>array(65,-14,473,800),942=>array(91,-208,549,800),943=>array(81,0,324,800),944=>array(73,-14,521,978),945=>array(55,-12,611,559),946=>array(94,-208,566,766),947=>array(16,-208,562,547),948=>array(55,-14,557,742),949=>array(65,-14,473,561),950=>array(52,-210,496,760),951=>array(91,-208,549,560),952=>array(55,-11,557,768),953=>array(81,0,304,547),954=>array(93,0,565,547),955=>array(30,0,562,760),956=>array(85,-208,612,547),957=>array(36,0,512,547),958=>array(52,-210,500,760),959=>array(55,-14,557,560),960=>array(36,-19,574,547),961=>array(91,-208,580,560),962=>array(55,-210,488,560),963=>array(55,-14,604,547),964=>array(49,0,553,547),965=>array(73,-14,521,547),966=>array(55,-208,602,551),967=>array(29,-208,549,547),968=>array(55,-208,602,547),969=>array(66,-14,769,547),970=>array(2,0,311,758),971=>array(73,-14,521,758),972=>array(55,-14,557,800),973=>array(73,-14,521,800),974=>array(66,-14,769,800),975=>array(98,-208,677,729),976=>array(82,-11,538,768),977=>array(55,-11,557,768),978=>array(42,0,665,734),979=>array(-15,0,829,800),980=>array(42,0,665,913),981=>array(55,-208,602,760),982=>array(32,-14,803,547),983=>array(55,-206,600,550),984=>array(56,-207,731,742),985=>array(55,-208,557,560),986=>array(68,-210,583,729),987=>array(55,-210,540,547),988=>array(98,0,517,729),989=>array(-94,-208,409,760),990=>array(87,-2,604,729),991=>array(93,0,566,759),992=>array(56,-208,797,742),993=>array(58,-180,573,559),994=>array(56,-213,877,729),995=>array(66,-208,769,547),996=>array(56,-208,660,742),997=>array(55,-208,568,560),998=>array(98,-213,735,729),999=>array(22,-14,571,575),1000=>array(39,-208,630,745),1001=>array(49,-208,552,560),1002=>array(56,0,714,742),1003=>array(26,0,599,560),1004=>array(56,-14,643,758),1005=>array(55,-14,544,758),1006=>array(21,-208,589,729),1007=>array(27,-208,510,726),1008=>array(55,-7,600,550),1009=>array(91,-208,580,560),1010=>array(55,-14,488,560),1011=>array(-18,-208,184,760),1012=>array(56,-14,731,742),1013=>array(55,-14,480,560),1014=>array(96,-14,521,560),1015=>array(98,0,569,729),1016=>array(91,-208,580,760),1017=>array(56,-14,644,742),1018=>array(98,0,765,729),1019=>array(62,-208,587,547),1020=>array(42,-208,580,560),1021=>array(56,-14,644,742),1022=>array(56,-14,644,742),1023=>array(56,-14,644,742),1024=>array(98,0,568,927),1025=>array(98,0,568,913),1026=>array(-3,-200,709,729),1027=>array(98,0,552,927),1028=>array(56,-14,644,742),1029=>array(66,-14,579,742),1030=>array(98,0,197,729),1031=>array(3,0,293,913),1032=>array(-52,-200,197,729),1033=>array(41,0,1023,729),1034=>array(98,0,975,729),1035=>array(-3,0,709,729),1036=>array(98,0,690,927),1037=>array(98,0,650,927),1038=>array(17,0,592,928),1039=>array(98,-157,654,729),1040=>array(8,0,676,729),1041=>array(98,0,615,729),1042=>array(98,0,615,729),1043=>array(98,0,552,729),1044=>array(49,-157,732,729),1045=>array(98,0,568,729),1046=>array(20,0,1058,729),1047=>array(66,-14,575,742),1048=>array(98,0,650,729),1049=>array(98,0,650,928),1050=>array(98,0,690,729),1051=>array(41,0,653,729),1052=>array(98,0,765,729),1053=>array(98,0,654,729),1054=>array(56,-14,731,742),1055=>array(98,0,654,729),1056=>array(98,0,569,729),1057=>array(56,-14,644,742),1058=>array(-3,0,614,729),1059=>array(17,0,592,729),1060=>array(59,0,802,729),1061=>array(30,0,654,729),1062=>array(98,-157,737,729),1063=>array(85,0,587,729),1064=>array(98,0,971,729),1065=>array(98,-157,1054,729),1066=>array(29,0,762,729),1067=>array(98,0,784,729),1068=>array(98,0,615,729),1069=>array(54,-14,642,742),1070=>array(103,-14,1023,742),1071=>array(66,0,597,729),1072=>array(60,-14,522,560),1073=>array(55,-14,562,777),1074=>array(91,0,530,547),1075=>array(91,0,477,547),1076=>array(52,-138,639,547),1077=>array(55,-14,562,560),1078=>array(34,0,867,547),1079=>array(65,-14,473,561),1080=>array(91,0,559,547),1081=>array(91,0,559,760),1082=>array(91,0,571,547),1083=>array(37,0,556,547),1084=>array(91,0,664,547),1085=>array(91,0,563,547),1086=>array(55,-14,557,560),1087=>array(91,0,563,547),1088=>array(91,-208,580,560),1089=>array(55,-14,488,560),1090=>array(29,0,553,547),1091=>array(30,-208,562,547),1092=>array(55,-208,800,729),1093=>array(29,0,559,547),1094=>array(91,-138,635,547),1095=>array(73,0,500,547),1096=>array(91,0,824,547),1097=>array(91,-138,896,547),1098=>array(30,0,647,547),1099=>array(91,0,701,560),1100=>array(91,0,530,547),1101=>array(55,-14,488,560),1102=>array(94,-14,787,560),1103=>array(57,0,517,547),1104=>array(55,-14,562,802),1105=>array(55,-14,562,758),1106=>array(23,-208,570,760),1107=>array(91,0,480,803),1108=>array(55,-14,488,560),1109=>array(54,-14,472,560),1110=>array(94,0,184,760),1111=>array(-6,0,284,758),1112=>array(-18,-208,184,760),1113=>array(37,0,843,547),1114=>array(91,0,839,547),1115=>array(23,0,567,760),1116=>array(91,0,571,803),1117=>array(91,0,559,802),1118=>array(30,-208,562,760),1119=>array(91,-138,563,547),1120=>array(56,-14,877,729),1121=>array(66,-14,769,547),1122=>array(15,0,711,729),1123=>array(15,0,613,760),1124=>array(103,-14,888,742),1125=>array(94,-14,688,560),1126=>array(8,0,871,729),1127=>array(25,0,758,547),1128=>array(98,0,1135,729),1129=>array(94,0,977,547),1130=>array(56,0,731,729),1131=>array(52,0,560,547),1132=>array(98,0,971,729),1133=>array(94,0,772,547),1134=>array(56,-208,556,935),1135=>array(44,-193,473,753),1136=>array(8,0,844,729),1137=>array(24,-208,852,765),1138=>array(56,-14,731,742),1139=>array(55,-14,557,560),1140=>array(8,0,769,742),1141=>array(24,0,640,560),1142=>array(8,0,769,930),1143=>array(24,0,640,800),1144=>array(56,-208,962,742),1145=>array(55,-208,875,560),1146=>array(56,-14,897,742),1147=>array(55,-14,704,560),1148=>array(58,-14,1122,932),1149=>array(74,-14,954,758),1150=>array(56,-14,877,900),1151=>array(66,-14,769,734),1152=>array(56,-208,644,742),1153=>array(55,-208,488,560),1154=>array(29,-44,474,457),1155=>array(-519,608,-93,810),1156=>array(-372,645,4,788),1157=>array(-288,595,-169,797),1158=>array(-288,595,-169,797),1159=>array(-776,606,4,788),1160=>array(-1021,-180,409,922),1161=>array(-957,-280,345,1022),1162=>array(98,-208,748,928),1163=>array(94,-208,652,760),1164=>array(16,0,615,729),1165=>array(19,0,534,702),1166=>array(98,0,610,729),1167=>array(91,-208,580,560),1168=>array(98,0,552,878),1169=>array(91,0,477,700),1170=>array(35,0,617,729),1171=>array(27,0,542,547),1172=>array(98,-200,600,729),1173=>array(91,-208,505,547),1174=>array(20,-157,1071,729),1175=>array(34,-138,876,547),1176=>array(66,-193,575,742),1177=>array(65,-193,473,561),1178=>array(98,-157,713,729),1179=>array(91,-138,587,547),1180=>array(98,0,690,729),1181=>array(91,0,571,547),1182=>array(16,0,690,729),1183=>array(30,0,571,760),1184=>array(24,0,837,729),1185=>array(21,0,688,547),1186=>array(98,-157,752,729),1187=>array(94,-138,656,547),1188=>array(98,0,1009,729),1189=>array(94,0,862,547),1190=>array(98,-200,1057,729),1191=>array(94,-208,891,547),1192=>array(56,-14,871,743),1193=>array(55,-14,684,560),1194=>array(56,-193,644,742),1195=>array(55,-193,488,560),1196=>array(-3,-157,614,729),1197=>array(29,-138,553,547),1198=>array(-2,0,613,729),1199=>array(30,-208,562,547),1200=>array(-2,0,613,729),1201=>array(30,-208,562,547),1202=>array(30,-157,654,729),1203=>array(29,-138,559,547),1204=>array(-3,-157,910,729),1205=>array(2,-138,782,547),1206=>array(85,-157,686,729),1207=>array(73,-138,590,547),1208=>array(85,0,587,729),1209=>array(73,0,500,547),1210=>array(85,0,587,729),1211=>array(91,0,549,760),1212=>array(10,-14,885,742),1213=>array(7,-14,675,560),1214=>array(10,-184,885,742),1215=>array(7,-161,675,560),1216=>array(98,0,197,729),1217=>array(20,0,1058,928),1218=>array(34,0,867,785),1219=>array(98,-200,651,729),1220=>array(93,-208,566,547),1221=>array(26,-208,751,729),1222=>array(22,-208,646,547),1223=>array(98,-200,654,729),1224=>array(94,-208,566,547),1225=>array(98,-208,752,729),1226=>array(94,-208,656,547),1227=>array(85,-157,587,729),1228=>array(73,-138,500,547),1229=>array(98,-208,863,729),1230=>array(94,-208,750,547),1231=>array(94,0,184,760),1232=>array(8,0,676,946),1233=>array(60,-14,522,765),1234=>array(8,0,676,913),1235=>array(60,-14,522,758),1236=>array(4,0,910,729),1237=>array(60,-14,929,560),1238=>array(98,0,568,928),1239=>array(55,-14,562,785),1240=>array(57,-14,731,742),1241=>array(55,-14,562,560),1242=>array(57,-14,731,913),1243=>array(55,-14,562,758),1244=>array(20,0,1058,913),1245=>array(34,0,867,758),1246=>array(66,-14,575,913),1247=>array(65,-14,473,758),1248=>array(78,-31,621,729),1249=>array(43,-213,523,547),1250=>array(98,0,650,899),1251=>array(91,0,559,745),1252=>array(98,0,650,913),1253=>array(91,0,559,758),1254=>array(56,-14,731,913),1255=>array(55,-14,557,758),1256=>array(56,-14,731,742),1257=>array(55,-14,557,560),1258=>array(56,-14,731,913),1259=>array(55,-14,557,758),1260=>array(54,-14,642,913),1261=>array(55,-14,488,758),1262=>array(17,0,592,899),1263=>array(30,-208,562,745),1264=>array(17,0,592,913),1265=>array(30,-208,562,758),1266=>array(17,0,592,927),1267=>array(30,-208,562,800),1268=>array(85,0,587,913),1269=>array(73,0,500,758),1270=>array(98,-157,552,729),1271=>array(91,-138,477,547),1272=>array(98,0,784,913),1273=>array(91,0,701,758),1274=>array(35,-208,617,729),1275=>array(27,-208,542,547),1276=>array(30,-200,646,729),1277=>array(29,-208,549,547),1278=>array(30,0,654,729),1279=>array(29,0,559,547),1280=>array(71,0,588,729),1281=>array(55,0,495,547),1282=>array(71,-14,908,729),1283=>array(55,-14,806,547),1284=>array(98,-14,876,742),1285=>array(83,-14,784,561),1286=>array(98,-208,654,742),1287=>array(83,-208,564,561),1288=>array(26,-14,974,729),1289=>array(22,-14,866,547),1290=>array(98,-14,1022,729),1291=>array(94,-14,876,547),1292=>array(56,-14,692,742),1293=>array(55,-14,534,560),1294=>array(-3,-14,675,729),1295=>array(2,-14,620,547),1296=>array(80,-14,560,742),1297=>array(65,-14,473,561),1298=>array(41,-200,653,729),1299=>array(37,-208,556,547),1300=>array(41,0,1139,729),1301=>array(37,0,962,547),1302=>array(98,0,863,729),1303=>array(91,-208,832,560),1304=>array(66,0,967,729),1305=>array(57,-14,933,560),1306=>array(56,-129,731,742),1307=>array(55,-208,544,560),1308=>array(33,0,956,729),1309=>array(42,0,776,547),1310=>array(98,0,690,729),1311=>array(91,0,571,547),1312=>array(41,-200,1056,729),1313=>array(37,-208,881,547),1314=>array(98,-200,1057,729),1315=>array(91,-208,888,547),1316=>array(98,-157,752,729),1317=>array(91,-138,653,547),1329=>array(87,-29,680,729),1330=>array(87,0,650,743),1331=>array(45,0,729,743),1332=>array(44,0,724,743),1333=>array(87,-14,650,729),1334=>array(87,0,692,744),1335=>array(92,0,616,729),1336=>array(87,0,650,743),1337=>array(87,-14,835,743),1338=>array(45,-14,729,729),1339=>array(92,0,650,729),1340=>array(92,0,533,729),1341=>array(92,-14,849,729),1342=>array(129,-13,763,742),1343=>array(87,0,645,729),1344=>array(34,-26,638,729),1345=>array(82,-23,688,744),1346=>array(49,0,729,743),1347=>array(51,0,715,735),1348=>array(87,-14,767,729),1349=>array(71,-14,668,743),1350=>array(0,-14,680,729),1351=>array(78,-15,684,729),1352=>array(87,0,645,743),1353=>array(59,-28,664,744),1354=>array(44,0,713,743),1355=>array(82,0,686,744),1356=>array(87,0,767,743),1357=>array(87,-14,645,729),1358=>array(49,0,729,729),1359=>array(73,-14,632,741),1360=>array(87,0,645,743),1361=>array(78,-14,675,743),1362=>array(92,0,538,729),1363=>array(59,0,752,729),1364=>array(24,0,679,743),1365=>array(56,-14,731,742),1366=>array(54,-13,746,729),1369=>array(57,492,191,760),1370=>array(87,499,230,729),1371=>array(0,620,234,803),1372=>array(2,618,356,893),1373=>array(-0,617,233,800),1374=>array(4,613,401,866),1375=>array(44,618,462,760),1377=>array(85,-14,883,547),1378=>array(91,-208,549,560),1379=>array(55,-208,648,560),1380=>array(91,-208,653,560),1381=>array(85,-14,548,760),1382=>array(55,-208,648,560),1383=>array(91,0,490,760),1384=>array(91,-208,549,560),1385=>array(91,-208,738,560),1386=>array(55,-14,648,760),1387=>array(91,-208,549,760),1388=>array(91,-208,303,547),1389=>array(91,-208,889,760),1390=>array(55,-14,557,760),1391=>array(85,-208,543,760),1392=>array(91,0,549,760),1393=>array(52,-15,523,760),1394=>array(91,-208,653,560),1395=>array(68,-14,544,768),1396=>array(85,-14,647,760),1397=>array(-21,-208,181,547),1398=>array(-19,-14,543,760),1399=>array(0,-208,435,560),1400=>array(91,0,549,560),1401=>array(5,-208,370,547),1402=>array(85,-208,883,547),1403=>array(54,-208,494,561),1404=>array(91,0,609,560),1405=>array(85,-14,543,560),1406=>array(85,-208,647,760),1407=>array(85,-14,889,560),1408=>array(91,-208,549,560),1409=>array(54,-208,543,560),1410=>array(91,0,449,547),1411=>array(85,-208,889,760),1412=>array(20,-208,580,560),1413=>array(54,-14,556,560),1414=>array(34,-208,766,760),1415=>array(85,-14,812,760),1417=>array(117,0,220,415),1418=>array(49,212,312,314),1456=>array(283,-217,356,-22),1457=>array(83,-217,438,-22),1458=>array(125,-217,454,-22),1459=>array(125,-217,454,-22),1460=>array(283,-159,356,-85),1461=>array(222,-159,417,-85),1462=>array(222,-217,417,-22),1463=>array(173,-159,466,-85),1464=>array(173,-193,466,-46),1465=>array(0,625,73,698),1466=>array(0,625,73,698),1467=>array(148,-237,465,-17),1468=>array(288,237,361,310),1469=>array(283,-217,356,-22),1470=>array(49,472,312,552),1471=>array(173,625,466,698),1472=>array(102,-98,193,645),1473=>array(637,625,710,698),1474=>array(96,625,169,698),1475=>array(102,0,193,547),1478=>array(50,0,357,547),1479=>array(173,-217,466,-22),1488=>array(91,0,578,547),1489=>array(43,0,535,547),1490=>array(43,-5,383,547),1491=>array(43,0,511,547),1492=>array(91,0,563,547),1493=>array(91,0,182,547),1494=>array(43,0,303,547),1495=>array(91,0,563,547),1496=>array(90,-14,593,552),1497=>array(66,204,157,547),1498=>array(43,-208,446,547),1499=>array(43,0,474,547),1500=>array(43,0,492,729),1501=>array(91,0,573,547),1502=>array(43,0,588,555),1503=>array(91,-208,182,547),1504=>array(43,0,309,547),1505=>array(90,-14,593,547),1506=>array(43,-93,535,547),1507=>array(91,-208,549,547),1508=>array(91,0,569,547),1509=>array(43,-208,497,548),1510=>array(43,0,502,547),1511=>array(91,-208,633,546),1512=>array(43,0,474,547),1513=>array(43,0,666,547),1514=>array(10,-4,566,547),1520=>array(91,0,380,547),1521=>array(66,0,332,547),1522=>array(66,204,312,547),1523=>array(91,361,325,547),1524=>array(91,361,554,547),1542=>array(0,-20,607,892),1543=>array(0,-20,607,895),1545=>array(65,0,685,635),1546=>array(65,0,904,635),1548=>array(107,0,250,240),1557=>array(123,624,377,868),1563=>array(107,0,250,633),1567=>array(72,0,461,742),1569=>array(80,42,390,483),1570=>array(-37,0,315,939),1571=>array(53,0,220,999),1572=>array(-42,-244,406,588),1573=>array(53,-244,220,760),1574=>array(63,-131,719,588),1575=>array(94,0,184,760),1576=>array(63,-171,865,327),1577=>array(68,-28,453,513),1578=>array(63,-10,865,391),1579=>array(63,-10,865,513),1580=>array(77,-244,645,425),1581=>array(77,-244,645,425),1582=>array(77,-244,645,586),1583=>array(61,-19,388,415),1584=>array(61,-19,388,586),1585=>array(-42,-244,423,269),1586=>array(-42,-244,423,464),1587=>array(63,-244,1138,366),1588=>array(63,-244,1138,586),1589=>array(63,-244,1134,362),1590=>array(63,-244,1134,464),1591=>array(70,0,857,760),1592=>array(70,0,857,760),1593=>array(57,-244,587,521),1594=>array(57,-244,587,659),1600=>array(-10,0,303,90),1601=>array(63,-45,952,635),1602=>array(52,-215,701,635),1603=>array(70,-27,722,760),1604=>array(70,-152,637,760),1605=>array(68,-240,546,369),1606=>array(72,-162,660,464),1607=>array(68,-28,453,358),1608=>array(-42,-244,406,315),1609=>array(63,-131,719,411),1610=>array(63,-244,719,411),1611=>array(107,591,393,825),1612=>array(107,591,393,874),1613=>array(107,-239,393,-5),1614=>array(107,591,393,708),1615=>array(107,590,393,874),1616=>array(107,-137,393,-20),1617=>array(98,599,402,869),1618=>array(115,610,383,878),1619=>array(74,590,426,719),1620=>array(164,593,331,808),1621=>array(164,-244,331,-29),1623=>array(107,615,393,898),1626=>array(119,616,381,775),1632=>array(215,220,322,342),1633=>array(136,0,342,635),1634=>array(40,0,492,635),1635=>array(37,0,509,635),1636=>array(85,-10,457,641),1637=>array(66,-10,471,643),1638=>array(42,0,493,635),1639=>array(29,0,508,635),1640=>array(29,0,508,635),1641=>array(49,0,493,640),1642=>array(65,0,472,635),1643=>array(0,-110,300,318),1644=>array(87,499,230,729),1645=>array(42,101,502,537),1646=>array(63,-10,865,327),1647=>array(52,-215,701,481),1648=>array(223,602,277,887),1652=>array(60,649,227,864),1657=>array(63,-10,865,575),1658=>array(63,-10,865,513),1659=>array(63,-244,865,327),1660=>array(63,-180,865,391),1661=>array(63,-10,865,464),1662=>array(63,-244,865,327),1663=>array(63,-10,865,513),1664=>array(63,-244,865,327),1665=>array(77,-244,645,710),1666=>array(77,-244,645,708),1667=>array(77,-244,645,425),1668=>array(77,-244,645,425),1669=>array(77,-244,645,708),1670=>array(77,-244,645,425),1671=>array(77,-244,645,425),1672=>array(61,-19,388,746),1673=>array(61,-180,388,415),1674=>array(61,-171,388,415),1675=>array(61,-171,388,746),1676=>array(61,-19,388,586),1677=>array(61,-146,388,415),1678=>array(61,-19,388,708),1679=>array(61,-19,388,684),1680=>array(61,-19,388,708),1681=>array(-42,-244,469,648),1682=>array(-42,-244,473,556),1683=>array(-42,-244,507,269),1684=>array(-42,-244,474,269),1685=>array(-42,-244,634,269),1686=>array(-42,-244,474,269),1687=>array(-42,-244,439,464),1688=>array(-42,-244,439,586),1689=>array(-42,-244,439,586),1690=>array(63,-244,1138,464),1691=>array(63,-244,1138,366),1692=>array(63,-244,1138,586),1693=>array(63,-244,1134,362),1694=>array(63,-244,1134,586),1695=>array(70,0,857,760),1696=>array(57,-244,587,781),1697=>array(63,-45,952,481),1698=>array(63,-171,952,481),1699=>array(63,-171,952,635),1700=>array(63,-45,952,757),1701=>array(63,-293,952,481),1702=>array(63,-45,952,757),1703=>array(52,-215,701,635),1704=>array(52,-215,701,757),1705=>array(63,-43,895,760),1706=>array(63,-43,1000,760),1707=>array(63,-43,895,760),1708=>array(70,-27,722,760),1709=>array(70,-27,722,854),1710=>array(70,-293,722,760),1711=>array(63,-43,895,896),1712=>array(63,-43,895,896),1713=>array(63,-43,895,903),1714=>array(63,-171,895,896),1715=>array(63,-293,895,896),1716=>array(63,-43,895,1025),1717=>array(70,-152,723,971),1718=>array(70,-152,637,952),1719=>array(70,-152,684,1025),1720=>array(70,-391,637,760),1721=>array(72,-317,660,464),1722=>array(72,-162,660,366),1723=>array(72,-162,660,636),1724=>array(72,-330,660,464),1725=>array(72,-162,660,586),1726=>array(70,-33,638,487),1727=>array(77,-244,645,586),1734=>array(-42,-244,406,556),1740=>array(63,-131,719,411),1742=>array(63,-131,719,556),1749=>array(68,-28,453,358),1776=>array(215,220,322,342),1777=>array(136,0,342,635),1778=>array(40,0,492,635),1779=>array(37,0,509,635),1780=>array(40,0,471,643),1781=>array(52,-5,485,643),1782=>array(102,0,445,640),1783=>array(29,0,508,635),1784=>array(29,0,508,635),1785=>array(49,0,493,640),1984=>array(66,-14,570,742),1985=>array(110,0,544,729),1986=>array(110,0,530,729),1987=>array(110,0,530,729),1988=>array(110,0,530,729),1989=>array(110,0,530,729),1990=>array(110,0,530,729),1991=>array(104,0,532,729),1992=>array(104,0,532,729),1993=>array(77,0,560,741),1994=>array(94,0,184,729),1995=>array(55,-14,516,447),1996=>array(30,0,394,731),1997=>array(30,0,562,430),1998=>array(91,0,563,430),1999=>array(91,0,563,430),2000=>array(55,0,539,735),2001=>array(91,0,563,581),2002=>array(55,0,738,741),2003=>array(94,0,408,729),2004=>array(30,0,344,729),2005=>array(91,0,504,729),2006=>array(94,0,518,729),2007=>array(30,0,256,729),2008=>array(94,0,865,513),2009=>array(30,0,443,729),2010=>array(30,0,754,729),2011=>array(91,0,563,430),2012=>array(30,0,595,729),2013=>array(94,0,679,729),2014=>array(94,0,436,729),2015=>array(55,0,630,729),2016=>array(30,0,443,729),2017=>array(30,0,595,729),2018=>array(55,0,539,729),2019=>array(94,0,436,729),2020=>array(94,0,436,612),2021=>array(94,0,428,729),2022=>array(55,0,539,729),2023=>array(55,0,539,729),2027=>array(106,673,398,745),2028=>array(32,609,468,800),2029=>array(205,658,305,758),2030=>array(93,616,405,800),2031=>array(44,616,456,800),2032=>array(32,609,468,800),2033=>array(44,616,456,800),2034=>array(200,-184,300,-84),2035=>array(104,659,394,758),2036=>array(98,557,216,760),2037=>array(98,557,216,760),2040=>array(49,0,511,498),2041=>array(49,0,511,483),2042=>array(-10,0,371,72),3647=>array(86,-138,571,769),3713=>array(63,-10,607,560),3714=>array(68,-17,691,568),3716=>array(67,-10,619,568),3719=>array(53,-238,415,568),3720=>array(62,-0,574,575),3722=>array(68,-234,690,568),3725=>array(56,-8,619,573),3732=>array(91,-14,592,560),3733=>array(63,-15,564,579),3734=>array(0,-240,587,560),3735=>array(42,-8,599,571),3737=>array(46,-14,593,568),3738=>array(36,-8,556,561),3739=>array(36,-8,556,760),3740=>array(43,-8,725,614),3741=>array(91,-14,676,760),3742=>array(51,-8,636,561),3743=>array(51,-8,636,760),3745=>array(31,-14,636,547),3746=>array(56,-8,619,760),3747=>array(68,-8,634,568),3749=>array(39,-8,583,568),3751=>array(56,-13,558,560),3754=>array(39,-8,688,679),3755=>array(62,-12,762,575),3757=>array(56,-14,558,560),3758=>array(68,-8,684,605),3759=>array(99,-166,742,579),3760=>array(54,-13,589,563),3761=>array(-578,639,-43,880),3762=>array(60,0,473,560),3763=>array(-425,0,473,806),3764=>array(-594,615,-73,926),3765=>array(-594,615,0,926),3766=>array(-594,615,-73,926),3767=>array(-594,615,0,926),3768=>array(-376,-350,-161,-38),3769=>array(-418,-306,-152,-40),3771=>array(-578,639,-43,880),3772=>array(-611,-278,6,-39),3773=>array(63,-240,619,715),3776=>array(60,-14,324,560),3777=>array(60,-14,598,560),3778=>array(-22,-5,398,896),3779=>array(45,-14,490,892),3780=>array(92,-11,445,886),3782=>array(72,-232,574,557),3784=>array(-366,618,-278,792),3785=>array(-563,609,-45,891),3786=>array(-595,598,22,869),3787=>array(-462,609,-182,890),3788=>array(-611,636,6,875),3789=>array(-425,620,-220,806),3792=>array(66,-14,570,547),3793=>array(48,-75,582,576),3794=>array(48,-66,545,711),3795=>array(11,-9,692,830),3796=>array(48,-83,601,711),3797=>array(48,-83,601,711),3798=>array(43,-8,744,812),3799=>array(63,-240,607,560),3800=>array(73,-210,680,557),3801=>array(51,-4,621,571),3804=>array(62,-12,947,575),3805=>array(62,-12,973,575),4256=>array(59,-15,815,828),4257=>array(54,-0,704,828),4258=>array(54,-148,649,837),4259=>array(54,-15,781,828),4260=>array(49,0,552,837),4261=>array(39,0,714,837),4262=>array(29,-15,695,828),4263=>array(59,-15,885,837),4264=>array(29,0,390,874),4265=>array(59,0,561,828),4266=>array(29,-15,784,828),4267=>array(59,-15,824,828),4268=>array(63,0,566,828),4269=>array(49,-167,806,837),4270=>array(24,-15,717,837),4271=>array(39,0,566,828),4272=>array(54,-15,853,828),4273=>array(63,-15,567,828),4274=>array(63,-0,566,837),4275=>array(49,-182,806,837),4276=>array(49,0,817,834),4277=>array(44,0,680,828),4278=>array(64,-15,566,837),4279=>array(54,0,557,828),4280=>array(59,-15,562,828),4281=>array(63,0,566,828),4282=>array(59,-15,764,837),4283=>array(59,-15,810,828),4284=>array(63,-0,566,828),4285=>array(49,-15,574,837),4286=>array(63,-0,566,828),4287=>array(29,0,695,828),4288=>array(29,-15,785,828),4289=>array(63,0,566,828),4290=>array(54,-15,635,837),4291=>array(29,0,532,828),4292=>array(54,0,540,828),4293=>array(39,-15,699,837),4304=>array(49,-15,459,592),4305=>array(49,-14,469,837),4306=>array(44,-235,537,551),4307=>array(49,-230,759,547),4308=>array(49,-236,449,547),4309=>array(49,-236,459,547),4310=>array(20,-14,452,838),4311=>array(49,-14,752,547),4312=>array(49,0,469,547),4313=>array(44,-236,456,542),4314=>array(49,-230,1016,552),4315=>array(49,-15,459,837),4316=>array(63,-15,474,833),4317=>array(49,-0,737,547),4318=>array(49,-15,459,833),4319=>array(49,-236,458,551),4320=>array(49,0,747,833),4321=>array(63,-15,474,827),4322=>array(44,-236,610,680),4323=>array(5,-236,464,571),4324=>array(49,-236,766,547),4325=>array(49,-236,449,828),4326=>array(49,-230,737,546),4327=>array(49,-236,459,538),4328=>array(29,-15,454,837),4329=>array(63,0,474,837),4330=>array(44,-236,527,532),4331=>array(49,-14,458,828),4332=>array(64,-15,488,837),4333=>array(49,-236,471,827),4334=>array(63,-15,474,827),4335=>array(10,-235,444,572),4336=>array(49,-15,459,837),4337=>array(59,-15,469,837),4338=>array(49,-141,458,547),4339=>array(49,-236,459,546),4340=>array(49,-236,458,837),4341=>array(49,-15,515,837),4342=>array(49,-236,778,547),4343=>array(44,-236,508,547),4344=>array(49,-236,459,538),4345=>array(39,-236,532,551),4346=>array(49,-77,459,547),4347=>array(54,-10,394,484),4348=>array(49,420,270,837),5121=>array(8,1,676,730),5122=>array(8,0,676,1037),5123=>array(8,0,676,729),5124=>array(8,0,676,914),5125=>array(98,0,711,729),5126=>array(98,0,711,914),5127=>array(98,0,711,913),5129=>array(98,0,711,729),5130=>array(58,0,671,729),5131=>array(58,0,671,914),5132=>array(98,1,827,730),5133=>array(8,1,776,730),5134=>array(98,0,827,729),5135=>array(8,0,776,729),5136=>array(98,0,827,914),5137=>array(8,0,776,914),5138=>array(98,0,909,729),5139=>array(98,0,909,729),5140=>array(98,0,909,914),5141=>array(98,0,909,914),5142=>array(98,0,711,914),5143=>array(98,0,869,729),5144=>array(58,0,909,729),5145=>array(98,0,869,914),5146=>array(58,0,909,914),5147=>array(58,0,671,914),5149=>array(98,629,198,729),5150=>array(67,326,488,734),5151=>array(46,356,362,714),5152=>array(46,356,362,714),5153=>array(67,398,334,674),5154=>array(67,391,334,667),5155=>array(67,398,338,667),5156=>array(67,398,334,667),5157=>array(35,327,405,733),5158=>array(67,326,331,734),5159=>array(98,312,198,412),5160=>array(67,503,334,563),5161=>array(67,399,334,667),5162=>array(67,399,334,691),5163=>array(8,1,1028,730),5164=>array(8,0,847,729),5165=>array(98,0,892,729),5166=>array(58,0,1055,729),5167=>array(8,0,676,729),5168=>array(8,0,676,1037),5169=>array(8,0,676,729),5170=>array(8,0,676,914),5171=>array(58,0,671,729),5172=>array(58,0,671,914),5173=>array(58,0,671,913),5175=>array(58,0,671,729),5176=>array(58,0,671,729),5177=>array(58,0,671,914),5178=>array(98,0,827,729),5179=>array(8,0,776,729),5180=>array(98,0,827,729),5181=>array(8,0,776,729),5182=>array(98,0,827,914),5183=>array(8,0,776,914),5184=>array(98,0,869,729),5185=>array(58,0,909,729),5186=>array(98,0,869,914),5187=>array(58,0,909,914),5188=>array(98,0,869,729),5189=>array(58,0,909,729),5190=>array(98,0,869,914),5191=>array(58,0,909,914),5192=>array(58,0,671,913),5193=>array(67,326,453,734),5194=>array(67,326,137,734),5196=>array(87,-14,645,729),5197=>array(87,0,645,1037),5198=>array(87,0,645,743),5199=>array(87,0,645,914),5200=>array(58,0,671,729),5201=>array(58,0,671,914),5202=>array(58,0,671,913),5204=>array(58,0,671,729),5205=>array(59,0,672,729),5206=>array(59,0,672,914),5207=>array(98,-14,834,729),5208=>array(87,-14,831,729),5209=>array(98,0,834,743),5210=>array(87,0,831,743),5211=>array(98,0,834,914),5212=>array(87,0,831,914),5213=>array(98,0,869,729),5214=>array(58,0,842,729),5215=>array(98,0,869,914),5216=>array(58,0,842,914),5217=>array(98,0,889,729),5218=>array(59,0,842,729),5219=>array(98,0,889,914),5220=>array(59,0,842,914),5221=>array(117,0,889,729),5222=>array(67,326,379,734),5223=>array(87,-14,823,734),5224=>array(87,0,823,743),5225=>array(58,0,811,734),5226=>array(59,0,835,734),5227=>array(34,0,530,743),5228=>array(98,0,594,1037),5229=>array(98,0,594,743),5230=>array(98,0,594,914),5231=>array(34,-14,530,729),5232=>array(34,-14,530,914),5233=>array(34,-14,623,913),5234=>array(98,-14,594,729),5235=>array(98,-14,594,914),5236=>array(98,0,762,743),5237=>array(34,0,712,743),5238=>array(98,0,781,743),5239=>array(98,0,758,743),5240=>array(98,0,781,914),5241=>array(98,0,758,914),5242=>array(98,-14,762,729),5243=>array(34,-14,712,729),5244=>array(98,-14,762,914),5245=>array(34,-14,712,914),5246=>array(98,-14,781,729),5247=>array(98,-14,758,729),5248=>array(98,-14,781,914),5249=>array(98,-14,758,914),5250=>array(117,-14,781,729),5251=>array(67,318,379,734),5252=>array(27,318,340,734),5253=>array(34,0,696,743),5254=>array(98,0,720,743),5255=>array(34,-14,696,734),5256=>array(98,-14,720,734),5257=>array(34,0,530,743),5258=>array(98,0,594,1037),5259=>array(98,0,594,743),5260=>array(98,0,594,914),5261=>array(34,-14,530,729),5262=>array(34,-14,530,914),5263=>array(34,-14,623,913),5264=>array(98,-14,594,729),5265=>array(98,-14,594,914),5266=>array(98,0,762,743),5267=>array(34,0,712,743),5268=>array(98,0,781,743),5269=>array(98,0,758,743),5270=>array(98,0,781,914),5271=>array(98,0,758,914),5272=>array(98,-14,762,729),5273=>array(34,-14,712,729),5274=>array(98,-14,762,914),5275=>array(34,-14,712,914),5276=>array(98,-14,781,729),5277=>array(98,-14,758,729),5278=>array(98,-14,781,914),5279=>array(98,-14,758,914),5280=>array(117,-14,781,729),5281=>array(67,318,379,734),5282=>array(67,318,379,734),5283=>array(58,0,512,729),5284=>array(98,0,552,1037),5285=>array(98,0,552,729),5286=>array(98,0,552,914),5287=>array(58,0,512,729),5288=>array(58,0,512,914),5289=>array(58,0,607,913),5290=>array(98,0,552,729),5291=>array(98,0,552,914),5292=>array(98,0,651,729),5293=>array(58,0,710,729),5294=>array(98,0,741,729),5295=>array(98,0,706,729),5296=>array(98,0,741,914),5297=>array(98,0,706,914),5298=>array(98,0,651,729),5299=>array(58,0,710,729),5300=>array(98,0,651,914),5301=>array(58,0,710,914),5302=>array(98,0,741,729),5303=>array(98,0,706,729),5304=>array(98,0,741,914),5305=>array(98,0,706,914),5306=>array(117,0,741,729),5307=>array(67,326,331,734),5308=>array(67,326,453,734),5309=>array(67,326,331,734),5312=>array(58,-14,817,436),5313=>array(34,-14,793,755),5314=>array(34,-14,793,436),5315=>array(5,-14,765,636),5316=>array(58,0,817,450),5317=>array(58,0,817,636),5318=>array(58,0,817,635),5319=>array(34,0,793,450),5320=>array(34,0,793,636),5321=>array(98,-14,1035,436),5322=>array(58,-14,977,436),5323=>array(98,0,1025,450),5324=>array(34,0,793,450),5325=>array(98,0,1025,636),5326=>array(34,0,793,636),5327=>array(34,0,793,635),5328=>array(67,484,545,736),5329=>array(67,318,397,734),5330=>array(67,484,545,736),5331=>array(58,0,817,450),5332=>array(34,0,793,755),5333=>array(34,0,793,450),5334=>array(34,0,793,636),5335=>array(58,0,817,450),5336=>array(58,0,817,636),5337=>array(58,0,817,635),5338=>array(34,0,793,450),5339=>array(34,0,793,636),5340=>array(98,0,1035,450),5341=>array(58,0,977,450),5342=>array(98,0,1025,450),5343=>array(34,0,972,450),5344=>array(98,0,1025,636),5345=>array(34,0,972,636),5346=>array(98,0,1035,450),5347=>array(58,0,977,450),5348=>array(98,0,1035,636),5349=>array(58,0,977,636),5350=>array(98,0,1025,450),5351=>array(34,0,972,450),5352=>array(98,0,1025,636),5353=>array(34,0,972,636),5354=>array(67,484,545,736),5356=>array(58,0,671,729),5357=>array(34,0,505,729),5358=>array(98,0,649,1037),5359=>array(98,0,569,729),5360=>array(98,0,569,914),5361=>array(34,0,505,729),5362=>array(34,0,505,914),5363=>array(34,0,600,913),5364=>array(98,0,569,729),5365=>array(98,0,569,914),5366=>array(98,0,736,729),5367=>array(34,0,696,729),5368=>array(98,0,758,729),5369=>array(98,0,713,729),5370=>array(98,0,758,914),5371=>array(98,0,713,914),5372=>array(98,0,736,729),5373=>array(34,0,696,729),5374=>array(98,0,736,914),5375=>array(34,0,696,914),5376=>array(98,0,758,729),5377=>array(98,0,713,729),5378=>array(98,0,758,914),5379=>array(98,0,713,914),5380=>array(117,0,758,729),5381=>array(67,326,363,734),5382=>array(67,318,365,741),5383=>array(67,326,363,734),5392=>array(34,-14,678,743),5393=>array(34,-14,678,743),5394=>array(34,-14,678,914),5395=>array(34,-14,857,464),5396=>array(34,-14,857,636),5397=>array(34,-14,857,464),5398=>array(34,-14,857,636),5399=>array(98,-14,875,743),5400=>array(34,-14,814,743),5401=>array(98,-14,875,743),5402=>array(34,-14,814,743),5403=>array(98,-14,875,914),5404=>array(34,-14,814,914),5405=>array(98,-14,1106,464),5406=>array(34,-14,1042,464),5407=>array(98,-14,1106,636),5408=>array(34,-14,1042,636),5409=>array(98,-14,1106,464),5410=>array(34,-14,1042,464),5411=>array(98,-14,1106,636),5412=>array(34,-14,1042,636),5413=>array(67,476,585,737),5414=>array(58,0,529,729),5415=>array(98,0,569,1037),5416=>array(98,0,569,729),5417=>array(98,0,569,914),5418=>array(58,0,529,729),5419=>array(58,0,531,914),5420=>array(58,0,626,913),5421=>array(98,0,569,729),5422=>array(98,0,569,914),5423=>array(98,0,746,729),5424=>array(58,0,723,729),5425=>array(98,0,758,729),5426=>array(98,0,760,729),5427=>array(98,0,758,914),5428=>array(98,0,760,914),5429=>array(98,0,746,729),5430=>array(58,0,723,729),5431=>array(98,0,749,914),5432=>array(58,0,723,914),5433=>array(98,0,758,729),5434=>array(98,0,760,729),5435=>array(98,0,758,914),5436=>array(98,0,760,914),5437=>array(117,0,758,729),5438=>array(67,326,363,734),5440=>array(67,399,334,667),5441=>array(67,326,429,734),5442=>array(98,-14,857,436),5443=>array(58,-14,817,436),5444=>array(58,0,817,450),5445=>array(98,0,857,755),5446=>array(98,0,857,450),5447=>array(98,0,857,636),5448=>array(98,0,569,729),5449=>array(98,0,569,914),5450=>array(98,0,569,729),5451=>array(34,0,505,729),5452=>array(34,0,505,914),5453=>array(34,0,505,729),5454=>array(98,0,736,914),5455=>array(34,0,696,914),5456=>array(67,326,363,734),5458=>array(58,0,671,729),5459=>array(73,0,676,744),5460=>array(73,-15,676,1037),5461=>array(73,-15,676,729),5462=>array(73,-15,676,914),5463=>array(38,0,668,662),5464=>array(38,0,668,914),5465=>array(58,0,688,662),5466=>array(58,0,688,914),5467=>array(98,0,886,914),5468=>array(58,0,909,914),5469=>array(67,326,462,695),5470=>array(87,-14,645,743),5471=>array(87,-14,645,743),5472=>array(87,-14,645,743),5473=>array(87,-14,645,743),5474=>array(87,-14,645,914),5475=>array(87,-14,645,914),5476=>array(41,0,671,729),5477=>array(41,0,671,914),5478=>array(59,0,689,729),5479=>array(59,0,689,914),5480=>array(98,0,907,914),5481=>array(59,0,842,914),5482=>array(67,326,467,734),5492=>array(34,0,772,743),5493=>array(58,0,796,743),5494=>array(58,0,796,914),5495=>array(34,-14,772,729),5496=>array(34,-14,772,914),5497=>array(58,-14,796,729),5498=>array(58,-14,796,914),5499=>array(67,318,508,734),5500=>array(98,0,654,729),5501=>array(67,326,429,734),5502=>array(67,0,1013,1037),5503=>array(67,0,1013,743),5504=>array(67,0,1013,914),5505=>array(67,-14,949,734),5506=>array(67,-14,949,914),5507=>array(67,-14,1013,734),5508=>array(67,-14,1013,914),5509=>array(67,318,798,734),5514=>array(34,0,772,743),5515=>array(58,0,796,743),5516=>array(34,-14,772,729),5517=>array(58,-14,796,729),5518=>array(67,0,1225,1037),5519=>array(67,0,1225,743),5520=>array(67,0,1225,914),5521=>array(67,-14,904,736),5522=>array(67,-14,904,914),5523=>array(67,-14,1225,736),5524=>array(67,-14,1225,914),5525=>array(67,332,645,736),5526=>array(67,332,1018,736),5536=>array(34,0,793,692),5537=>array(34,0,793,692),5538=>array(58,-242,817,450),5539=>array(58,-242,817,636),5540=>array(34,-242,793,450),5541=>array(34,-242,793,636),5542=>array(67,338,545,736),5543=>array(58,0,627,729),5544=>array(16,0,585,729),5545=>array(16,0,585,914),5546=>array(58,0,627,729),5547=>array(58,0,627,914),5548=>array(16,0,585,729),5549=>array(16,0,585,914),5550=>array(5,326,363,734),5551=>array(98,-14,594,729),5598=>array(98,0,711,729),5601=>array(56,0,669,729),5702=>array(67,326,413,734),5703=>array(67,240,413,820),5742=>array(57,0,391,306),5743=>array(67,0,949,743),5744=>array(67,0,1211,743),5745=>array(67,0,1598,743),5746=>array(67,0,1598,914),5747=>array(67,-14,1277,736),5748=>array(67,-14,1277,914),5749=>array(67,-14,1598,736),5750=>array(67,-14,1598,914),5760=>array(-10,246,487,328),5761=>array(-10,-125,502,328),5762=>array(-10,-125,722,328),5763=>array(-10,-125,941,328),5764=>array(-10,-125,1160,328),5765=>array(-10,-125,1379,328),5766=>array(-10,246,502,697),5767=>array(-10,246,722,697),5768=>array(-10,246,941,697),5769=>array(-10,246,1160,697),5770=>array(-10,246,1379,697),5771=>array(-10,-125,508,697),5772=>array(-10,-125,728,697),5773=>array(-10,-125,948,697),5774=>array(-10,-125,1168,697),5775=>array(-10,-125,1389,697),5776=>array(-10,41,502,533),5777=>array(-10,41,722,533),5778=>array(-10,41,939,533),5779=>array(-10,41,1159,533),5780=>array(-10,41,1379,533),5781=>array(-10,-125,508,697),5782=>array(-10,-125,762,697),5783=>array(-10,-83,798,328),5784=>array(-10,-240,1214,328),5785=>array(-10,246,1160,902),5786=>array(-10,82,693,328),5787=>array(55,28,517,544),5788=>array(-10,28,452,544),7424=>array(30,0,562,547),7425=>array(5,0,669,547),7426=>array(60,-14,929,560),7427=>array(30,0,530,547),7428=>array(55,-14,488,560),7429=>array(91,0,550,547),7430=>array(18,0,550,547),7431=>array(91,0,443,547),7432=>array(63,-14,471,561),7433=>array(94,-213,184,547),7434=>array(0,-14,310,547),7435=>array(91,0,576,547),7436=>array(1,0,498,560),7437=>array(91,0,664,547),7438=>array(91,0,559,547),7439=>array(55,-14,557,560),7440=>array(62,-14,495,560),7441=>array(55,22,629,524),7442=>array(55,57,629,489),7443=>array(25,2,663,543),7444=>array(55,-14,970,560),7446=>array(55,273,557,560),7447=>array(55,-14,557,273),7448=>array(74,0,475,547),7449=>array(24,0,507,547),7450=>array(24,0,507,547),7451=>array(29,0,553,547),7452=>array(91,-16,510,547),7453=>array(85,37,646,495),7454=>array(85,38,857,496),7455=>array(23,-238,583,560),7456=>array(30,0,562,547),7457=>array(42,0,776,547),7458=>array(43,0,482,547),7459=>array(59,-14,466,547),7462=>array(87,0,498,560),7463=>array(30,0,562,547),7464=>array(74,0,490,547),7465=>array(74,0,475,547),7466=>array(44,0,546,547),7467=>array(37,0,556,547),7468=>array(5,326,426,734),7469=>array(2,326,573,734),7470=>array(62,326,388,734),7472=>array(62,326,448,734),7473=>array(62,326,358,734),7474=>array(41,326,336,734),7475=>array(35,318,437,742),7476=>array(62,326,412,734),7477=>array(62,326,124,734),7478=>array(-33,214,124,734),7479=>array(62,326,426,734),7480=>array(62,326,348,734),7481=>array(62,326,482,734),7482=>array(62,326,410,734),7483=>array(62,326,410,734),7484=>array(35,318,460,742),7485=>array(35,318,405,742),7486=>array(62,326,358,734),7487=>array(62,326,419,734),7488=>array(-2,326,387,734),7489=>array(55,318,406,734),7490=>array(21,326,603,734),7491=>array(38,318,329,640),7492=>array(38,318,329,640),7493=>array(35,318,343,640),7494=>array(38,318,585,640),7495=>array(57,318,365,751),7496=>array(35,318,343,751),7497=>array(35,318,354,640),7498=>array(35,318,354,640),7499=>array(41,318,298,640),7500=>array(40,318,297,640),7501=>array(35,209,343,640),7502=>array(60,207,116,632),7503=>array(57,326,363,751),7504=>array(57,326,560,640),7505=>array(57,209,346,640),7506=>array(35,318,351,640),7507=>array(35,318,307,640),7508=>array(35,479,351,640),7509=>array(35,318,351,479),7510=>array(57,209,365,640),7511=>array(17,326,232,719),7512=>array(54,318,342,632),7513=>array(54,347,407,604),7514=>array(57,319,560,633),7515=>array(19,326,354,632),7517=>array(59,209,357,755),7518=>array(10,209,354,632),7519=>array(35,318,351,742),7520=>array(35,209,379,635),7521=>array(18,209,346,633),7522=>array(60,0,116,425),7523=>array(57,0,259,313),7524=>array(54,-8,342,306),7525=>array(19,0,354,306),7526=>array(59,-117,357,429),7527=>array(10,-117,354,306),7528=>array(59,-117,367,313),7529=>array(35,-117,379,309),7530=>array(18,-117,346,307),7543=>array(91,-208,580,560),7544=>array(62,326,412,734),7547=>array(57,0,314,547),7549=>array(24,-208,643,560),7557=>array(71,-208,273,760),7579=>array(35,318,343,640),7580=>array(35,318,307,640),7581=>array(35,287,307,640),7582=>array(35,318,351,751),7583=>array(41,318,298,640),7584=>array(15,326,234,751),7585=>array(-11,209,170,632),7586=>array(35,209,343,632),7587=>array(54,209,342,632),7588=>array(36,326,198,751),7589=>array(60,326,187,632),7590=>array(36,326,198,632),7591=>array(36,326,198,632),7592=>array(-83,209,172,751),7593=>array(60,209,187,751),7594=>array(44,209,172,751),7595=>array(55,326,314,640),7596=>array(57,209,560,640),7597=>array(57,209,560,633),7598=>array(-11,209,348,640),7599=>array(57,209,417,640),7600=>array(55,326,346,640),7601=>array(35,318,351,640),7602=>array(35,210,351,751),7603=>array(34,209,297,640),7604=>array(-11,209,224,751),7605=>array(17,209,232,719),7606=>array(46,318,445,632),7607=>array(35,318,355,632),7608=>array(57,317,321,632),7609=>array(60,326,343,632),7610=>array(19,326,354,632),7611=>array(27,326,304,632),7612=>array(27,209,374,632),7613=>array(27,296,304,632),7614=>array(27,207,330,632),7615=>array(35,320,351,756),7620=>array(-456,616,-44,800),7621=>array(-456,616,-44,800),7622=>array(-456,616,-44,800),7623=>array(-456,616,-44,800),7624=>array(-468,616,-32,800),7625=>array(-468,616,-32,800),7680=>array(8,-241,676,729),7681=>array(60,-241,522,560),7682=>array(98,0,615,914),7683=>array(90,-14,580,915),7684=>array(98,-183,615,729),7685=>array(91,-183,580,760),7686=>array(98,-156,615,729),7687=>array(91,-156,580,760),7688=>array(56,-193,644,928),7689=>array(55,-193,488,800),7690=>array(98,0,711,914),7691=>array(55,-14,544,942),7692=>array(98,-183,711,729),7693=>array(55,-183,544,760),7694=>array(98,-156,711,729),7695=>array(55,-156,544,760),7696=>array(98,-192,711,729),7697=>array(55,-193,544,760),7698=>array(98,-240,711,729),7699=>array(55,-240,544,760),7700=>array(98,0,568,1044),7701=>array(55,-14,562,921),7702=>array(98,0,568,1044),7703=>array(55,-14,562,921),7704=>array(98,-213,568,729),7705=>array(55,-213,562,560),7706=>array(98,-192,568,729),7707=>array(55,-192,562,560),7708=>array(98,-193,568,928),7709=>array(55,-193,562,785),7710=>array(98,0,517,914),7711=>array(23,0,371,942),7712=>array(56,-14,693,887),7713=>array(55,-208,544,745),7714=>array(98,0,654,913),7715=>array(90,0,549,915),7716=>array(98,-183,654,729),7717=>array(91,-183,549,760),7718=>array(98,0,654,914),7719=>array(-9,0,549,913),7720=>array(8,-193,654,729),7721=>array(1,-193,549,760),7722=>array(98,-222,654,729),7723=>array(91,-222,549,760),7724=>array(0,-192,322,729),7725=>array(-22,-192,300,760),7726=>array(3,0,293,1044),7727=>array(-6,0,284,886),7728=>array(98,0,677,928),7729=>array(91,0,576,928),7730=>array(98,-183,677,729),7731=>array(91,-183,576,760),7732=>array(98,-156,677,729),7733=>array(91,-156,576,760),7734=>array(98,-183,552,729),7735=>array(98,-183,189,760),7736=>array(1,-183,552,927),7737=>array(-1,-183,291,899),7738=>array(98,-156,552,729),7739=>array(-6,-156,286,760),7740=>array(98,-240,552,729),7741=>array(-17,-240,295,760),7742=>array(98,0,765,928),7743=>array(91,0,889,800),7744=>array(98,0,765,914),7745=>array(91,0,889,760),7746=>array(98,-183,765,729),7747=>array(91,-183,889,560),7748=>array(98,0,650,914),7749=>array(91,0,549,760),7750=>array(98,-183,650,729),7751=>array(91,-183,549,560),7752=>array(98,-156,650,729),7753=>array(91,-156,549,560),7754=>array(98,-240,650,729),7755=>array(91,-240,549,560),7756=>array(56,-14,731,1044),7757=>array(55,-14,557,881),7758=>array(56,-14,731,1042),7759=>array(55,-14,557,882),7760=>array(56,-14,731,1044),7761=>array(55,-14,557,921),7762=>array(56,-14,731,1044),7763=>array(55,-14,557,921),7764=>array(98,0,569,928),7765=>array(91,-208,580,800),7766=>array(98,0,569,914),7767=>array(91,-208,580,760),7768=>array(98,0,666,913),7769=>array(91,0,411,760),7770=>array(98,-183,666,729),7771=>array(91,-183,411,560),7772=>array(98,-183,666,899),7773=>array(91,-183,411,745),7774=>array(98,-156,666,729),7775=>array(41,-156,411,560),7776=>array(66,-14,579,914),7777=>array(54,-14,472,760),7778=>array(66,-183,579,742),7779=>array(54,-183,472,560),7780=>array(66,-14,579,928),7781=>array(54,-14,485,800),7782=>array(66,-14,579,1042),7783=>array(54,-14,472,973),7784=>array(66,-183,579,914),7785=>array(54,-183,472,733),7786=>array(-3,0,614,914),7787=>array(27,0,368,942),7788=>array(-3,-183,614,729),7789=>array(27,-183,368,702),7790=>array(-3,-156,614,729),7791=>array(27,-156,390,702),7792=>array(-3,-240,614,729),7793=>array(27,-240,394,702),7794=>array(87,-183,645,729),7795=>array(85,-183,543,560),7796=>array(87,-192,645,729),7797=>array(85,-192,543,560),7798=>array(87,-213,645,729),7799=>array(85,-213,543,560),7800=>array(87,-14,645,1044),7801=>array(85,-14,543,990),7802=>array(87,-14,645,1025),7803=>array(85,-14,543,869),7804=>array(8,0,676,936),7805=>array(30,0,562,777),7806=>array(8,-183,676,729),7807=>array(30,-183,562,547),7808=>array(33,0,956,931),7809=>array(42,0,776,802),7810=>array(33,0,956,931),7811=>array(42,0,776,803),7812=>array(33,0,956,913),7813=>array(42,0,776,758),7814=>array(33,0,956,913),7815=>array(42,0,776,760),7816=>array(33,-183,956,729),7817=>array(42,-183,776,547),7818=>array(30,0,654,914),7819=>array(29,0,559,760),7820=>array(30,0,654,913),7821=>array(29,0,559,758),7822=>array(-2,0,613,914),7823=>array(30,-208,562,760),7824=>array(45,0,640,928),7825=>array(43,0,482,800),7826=>array(45,-183,640,729),7827=>array(43,-183,482,547),7828=>array(45,-156,640,729),7829=>array(43,-156,482,547),7830=>array(91,-156,549,760),7831=>array(2,0,368,913),7832=>array(42,0,776,878),7833=>array(30,-208,562,878),7834=>array(60,-14,672,760),7835=>array(23,0,371,942),7836=>array(1,0,371,760),7837=>array(23,0,371,760),7838=>array(87,-14,713,743),7839=>array(55,-14,557,742),7840=>array(8,-183,676,729),7841=>array(60,-183,522,560),7842=>array(8,0,676,992),7843=>array(60,-14,522,810),7844=>array(8,0,676,1028),7845=>array(60,-14,585,846),7846=>array(8,0,676,1028),7847=>array(60,-14,522,847),7848=>array(8,0,676,1044),7849=>array(60,-14,577,862),7850=>array(8,0,676,1057),7851=>array(60,-14,522,875),7852=>array(8,-183,676,928),7853=>array(60,-183,522,800),7854=>array(8,0,676,1044),7855=>array(60,-14,522,877),7856=>array(8,0,676,1044),7857=>array(60,-14,522,877),7858=>array(8,0,676,1068),7859=>array(60,-14,522,901),7860=>array(8,0,676,1043),7861=>array(60,-14,522,876),7862=>array(8,-183,676,946),7863=>array(60,-183,522,765),7864=>array(98,-183,568,729),7865=>array(55,-183,562,560),7866=>array(98,0,568,992),7867=>array(55,-14,562,810),7868=>array(98,0,568,921),7869=>array(55,-14,562,777),7870=>array(98,0,637,1028),7871=>array(55,-14,613,846),7872=>array(98,0,568,1028),7873=>array(55,-14,562,847),7874=>array(98,0,620,1044),7875=>array(55,-14,605,862),7876=>array(98,0,568,1057),7877=>array(55,-14,562,875),7878=>array(98,-183,568,928),7879=>array(55,-183,562,800),7880=>array(44,0,263,992),7881=>array(33,0,252,811),7882=>array(98,-183,197,729),7883=>array(93,-183,184,760),7884=>array(56,-183,731,742),7885=>array(55,-183,557,560),7886=>array(56,-14,731,992),7887=>array(55,-14,557,810),7888=>array(56,-14,731,1028),7889=>array(55,-14,601,846),7890=>array(56,-14,731,1028),7891=>array(55,-14,557,847),7892=>array(56,-14,731,1044),7893=>array(55,-14,592,862),7894=>array(56,-14,731,1057),7895=>array(55,-14,557,875),7896=>array(56,-183,731,928),7897=>array(55,-183,557,800),7898=>array(50,-14,764,927),7899=>array(58,-14,603,800),7900=>array(50,-14,764,927),7901=>array(58,-14,603,800),7902=>array(50,-14,764,992),7903=>array(58,-14,603,810),7904=>array(50,-14,764,921),7905=>array(58,-14,603,777),7906=>array(50,-183,764,760),7907=>array(58,-183,603,615),7908=>array(87,-183,645,729),7909=>array(85,-183,543,560),7910=>array(87,-14,645,992),7911=>array(85,-14,543,810),7912=>array(84,-4,796,927),7913=>array(86,-14,676,800),7914=>array(84,-4,796,927),7915=>array(86,-14,676,800),7916=>array(84,-4,796,992),7917=>array(86,-14,676,810),7918=>array(84,-4,796,921),7919=>array(86,-14,676,777),7920=>array(84,-183,796,760),7921=>array(86,-183,676,615),7922=>array(-2,0,613,931),7923=>array(30,-208,562,802),7924=>array(-2,-183,613,729),7925=>array(30,-208,562,547),7926=>array(-2,0,613,996),7927=>array(30,-208,562,813),7928=>array(-2,0,613,921),7929=>array(30,-208,562,777),7930=>array(98,0,764,729),7931=>array(16,0,462,760),7936=>array(55,-12,611,797),7937=>array(55,-12,611,797),7938=>array(55,-12,611,800),7939=>array(55,-12,611,800),7940=>array(55,-12,611,800),7941=>array(55,-12,611,800),7942=>array(55,-12,611,928),7943=>array(55,-12,611,928),7944=>array(8,0,676,797),7945=>array(8,0,676,797),7946=>array(2,0,869,800),7947=>array(3,0,869,800),7948=>array(3,0,761,800),7949=>array(2,0,793,800),7950=>array(3,0,700,928),7951=>array(2,0,734,928),7952=>array(65,-14,473,797),7953=>array(65,-14,473,797),7954=>array(65,-14,473,800),7955=>array(65,-14,473,800),7956=>array(65,-14,486,800),7957=>array(65,-14,501,800),7960=>array(3,0,647,797),7961=>array(3,0,647,797),7962=>array(2,0,902,800),7963=>array(3,0,911,800),7964=>array(3,0,834,800),7965=>array(2,0,864,800),7968=>array(91,-208,549,797),7969=>array(91,-208,549,797),7970=>array(91,-208,549,800),7971=>array(91,-208,549,800),7972=>array(91,-208,549,800),7973=>array(91,-208,549,800),7974=>array(91,-208,549,928),7975=>array(91,-208,549,928),7976=>array(3,0,739,797),7977=>array(3,0,737,797),7978=>array(2,0,988,800),7979=>array(3,0,991,800),7980=>array(3,0,929,800),7981=>array(2,0,953,800),7982=>array(3,0,835,928),7983=>array(2,0,849,928),7984=>array(76,0,304,797),7985=>array(71,0,304,797),7986=>array(-39,0,340,800),7987=>array(-34,0,347,800),7988=>array(2,0,362,800),7989=>array(-22,0,366,800),7990=>array(-26,0,304,928),7991=>array(-28,0,304,928),7992=>array(3,0,282,797),7993=>array(3,0,276,797),7994=>array(2,0,537,800),7995=>array(3,0,537,800),7996=>array(3,0,472,800),7997=>array(2,0,501,800),7998=>array(3,0,392,928),7999=>array(2,0,395,928),8000=>array(55,-14,557,797),8001=>array(55,-14,557,797),8002=>array(55,-14,557,800),8003=>array(55,-14,557,800),8004=>array(55,-14,557,800),8005=>array(55,-14,557,800),8008=>array(3,-14,748,797),8009=>array(3,-14,792,797),8010=>array(2,-14,1039,800),8011=>array(3,-14,1043,800),8012=>array(3,-14,882,800),8013=>array(2,-14,914,800),8016=>array(73,-14,521,797),8017=>array(73,-14,521,797),8018=>array(73,-14,521,800),8019=>array(73,-14,521,800),8020=>array(73,-14,521,800),8021=>array(73,-14,521,800),8022=>array(73,-14,521,928),8023=>array(73,-14,521,928),8025=>array(3,0,786,797),8027=>array(3,0,1000,800),8029=>array(2,0,1014,800),8031=>array(2,0,900,928),8032=>array(66,-14,769,797),8033=>array(66,-14,769,797),8034=>array(66,-14,769,800),8035=>array(66,-14,769,800),8036=>array(66,-14,769,800),8037=>array(66,-14,769,800),8038=>array(66,-14,769,928),8039=>array(66,-14,769,928),8040=>array(3,0,764,797),8041=>array(3,0,805,797),8042=>array(2,0,1051,800),8043=>array(3,0,1057,800),8044=>array(3,0,908,800),8045=>array(2,0,934,800),8046=>array(3,0,883,928),8047=>array(2,0,914,928),8048=>array(55,-12,611,800),8049=>array(55,-12,611,800),8050=>array(65,-14,473,800),8051=>array(65,-14,473,800),8052=>array(91,-208,549,800),8053=>array(91,-208,549,800),8054=>array(-56,0,304,800),8055=>array(81,0,324,800),8056=>array(55,-14,557,800),8057=>array(55,-14,557,800),8058=>array(73,-14,521,800),8059=>array(73,-14,521,800),8060=>array(66,-14,769,800),8061=>array(66,-14,769,800),8064=>array(55,-208,611,797),8065=>array(55,-208,611,797),8066=>array(55,-208,611,800),8067=>array(55,-208,611,800),8068=>array(55,-208,611,800),8069=>array(55,-208,611,800),8070=>array(55,-208,611,928),8071=>array(55,-208,611,928),8072=>array(8,-208,676,797),8073=>array(8,-208,676,797),8074=>array(2,-208,869,800),8075=>array(3,-208,869,800),8076=>array(3,-208,761,800),8077=>array(2,-208,793,800),8078=>array(3,-208,700,928),8079=>array(2,-208,734,928),8080=>array(91,-208,549,797),8081=>array(91,-208,549,797),8082=>array(91,-208,549,800),8083=>array(91,-208,549,800),8084=>array(91,-208,549,800),8085=>array(91,-208,549,800),8086=>array(91,-208,549,928),8087=>array(91,-208,549,928),8088=>array(3,-208,739,797),8089=>array(3,-208,737,797),8090=>array(2,-208,988,800),8091=>array(3,-208,991,800),8092=>array(3,-208,929,800),8093=>array(2,-208,953,800),8094=>array(3,-208,835,928),8095=>array(2,-208,849,928),8096=>array(66,-208,769,797),8097=>array(66,-208,769,797),8098=>array(66,-208,769,800),8099=>array(66,-208,769,800),8100=>array(66,-208,769,800),8101=>array(66,-208,769,800),8102=>array(66,-208,769,928),8103=>array(66,-208,769,928),8104=>array(3,-208,764,797),8105=>array(3,-208,805,797),8106=>array(2,-208,1051,800),8107=>array(3,-208,1057,800),8108=>array(3,-208,908,800),8109=>array(2,-208,934,800),8110=>array(3,-208,883,928),8111=>array(2,-208,914,928),8112=>array(55,-12,611,785),8113=>array(55,-12,611,745),8114=>array(55,-208,611,800),8115=>array(55,-208,611,559),8116=>array(55,-208,611,800),8118=>array(55,-12,611,777),8119=>array(55,-208,611,777),8120=>array(8,0,676,928),8121=>array(8,0,676,899),8122=>array(-2,0,708,800),8123=>array(8,0,676,800),8124=>array(8,-208,676,729),8125=>array(190,595,309,797),8126=>array(214,-208,321,-45),8127=>array(190,595,309,797),8128=>array(89,639,411,777),8129=>array(89,659,411,928),8130=>array(91,-208,549,800),8131=>array(91,-208,549,560),8132=>array(91,-208,549,800),8134=>array(91,-208,549,777),8135=>array(91,-208,549,777),8136=>array(-2,0,741,800),8137=>array(-12,0,682,800),8138=>array(-2,0,833,800),8139=>array(-6,0,765,800),8140=>array(98,-208,654,729),8141=>array(67,595,446,800),8142=>array(88,595,447,800),8143=>array(89,595,411,928),8144=>array(-10,0,304,785),8145=>array(-14,0,304,745),8146=>array(-20,0,304,978),8147=>array(2,0,313,978),8150=>array(-14,0,309,777),8151=>array(-13,0,310,928),8152=>array(-5,0,300,928),8153=>array(1,0,293,899),8154=>array(-2,0,377,800),8155=>array(-9,0,311,800),8157=>array(62,595,443,800),8158=>array(73,595,461,800),8159=>array(89,595,411,928),8160=>array(73,-14,521,785),8161=>array(73,-14,521,745),8162=>array(73,-14,521,978),8163=>array(73,-14,521,978),8164=>array(91,-208,580,797),8165=>array(91,-208,580,797),8166=>array(73,-14,521,777),8167=>array(73,-14,521,928),8168=>array(-2,0,613,928),8169=>array(-2,0,613,899),8170=>array(-2,0,847,800),8171=>array(-15,0,821,800),8172=>array(3,0,651,797),8173=>array(83,659,395,978),8174=>array(105,659,415,978),8175=>array(83,617,317,800),8178=>array(66,-208,769,800),8179=>array(66,-208,769,547),8180=>array(66,-208,769,800),8182=>array(66,-14,769,777),8183=>array(66,-208,769,777),8184=>array(-2,-14,885,800),8185=>array(-7,-14,750,800),8186=>array(-2,0,884,800),8187=>array(-18,0,752,800),8188=>array(38,-208,726,738),8189=>array(181,616,415,800),8190=>array(190,595,309,797),8208=>array(49,234,312,314),8209=>array(49,234,312,314),8210=>array(49,239,587,309),8211=>array(49,239,451,309),8212=>array(49,239,951,309),8213=>array(0,239,1000,309),8214=>array(127,-236,371,764),8215=>array(-10,-236,510,-9),8216=>array(85,489,228,729),8217=>array(87,499,230,729),8218=>array(85,-116,228,124),8219=>array(87,499,230,729),8220=>array(85,489,428,729),8221=>array(85,489,428,729),8222=>array(85,-116,428,124),8223=>array(85,489,428,729),8224=>array(28,-96,472,729),8225=>array(28,-96,472,729),8226=>array(150,227,440,516),8227=>array(150,188,479,555),8228=>array(115,0,219,124),8229=>array(115,0,552,124),8230=>array(115,0,885,124),8231=>array(107,302,210,426),8240=>array(55,-14,1287,742),8241=>array(55,-14,1681,742),8242=>array(20,547,203,729),8243=>array(20,547,350,729),8244=>array(20,547,496,729),8245=>array(20,547,203,729),8246=>array(20,547,350,729),8247=>array(20,547,496,729),8248=>array(5,-236,333,-30),8249=>array(77,69,306,517),8250=>array(94,69,323,517),8251=>array(95,2,740,725),8252=>array(72,0,414,729),8253=>array(72,0,461,742),8254=>array(-10,686,510,755),8255=>array(-43,-237,847,-60),8256=>array(-43,752,847,929),8257=>array(-42,-236,286,229),8258=>array(30,-29,970,814),8259=>array(108,313,400,421),8260=>array(-183,-14,350,742),8261=>array(86,-132,293,760),8262=>array(86,-132,293,760),8263=>array(36,0,886,742),8264=>array(72,0,661,742),8265=>array(72,0,661,742),8266=>array(49,-123,448,545),8267=>array(115,-96,566,729),8268=>array(105,220,395,509),8269=>array(105,220,395,509),8270=>array(30,-29,470,427),8271=>array(139,-116,282,517),8272=>array(-43,-237,847,929),8273=>array(30,-7,470,929),8274=>array(71,-93,408,729),8275=>array(49,228,951,399),8276=>array(-43,-240,847,-63),8277=>array(152,98,686,631),8278=>array(122,149,464,589),8279=>array(20,547,643,729),8280=>array(175,125,663,613),8281=>array(175,120,663,608),8282=>array(107,0,210,729),8283=>array(49,-138,749,867),8284=>array(55,0,783,729),8285=>array(107,39,210,655),8286=>array(107,8,210,683),8304=>array(42,319,366,742),8305=>array(60,326,116,751),8308=>array(31,326,369,734),8309=>array(50,319,353,734),8310=>array(45,319,369,742),8311=>array(53,326,354,734),8312=>array(43,319,365,742),8313=>array(41,319,364,742),8314=>array(67,326,461,677),8315=>array(67,479,461,525),8316=>array(67,422,461,581),8317=>array(54,252,195,751),8318=>array(50,252,191,751),8319=>array(57,326,346,640),8320=>array(42,-7,366,416),8321=>array(67,0,346,408),8322=>array(46,0,338,416),8323=>array(48,-7,350,416),8324=>array(31,0,369,408),8325=>array(50,-7,353,408),8326=>array(45,-7,369,416),8327=>array(53,0,354,408),8328=>array(43,-7,365,416),8329=>array(41,-7,364,416),8330=>array(67,0,461,351),8331=>array(67,152,461,199),8332=>array(67,96,461,254),8333=>array(54,-74,195,425),8334=>array(50,-74,191,425),8336=>array(38,-8,329,313),8337=>array(35,-8,354,313),8338=>array(35,-8,351,313),8339=>array(57,0,391,306),8340=>array(35,-8,354,313),8341=>array(57,0,346,425),8342=>array(57,0,363,425),8343=>array(60,0,116,425),8344=>array(57,0,560,313),8345=>array(57,0,346,313),8346=>array(57,-117,365,313),8347=>array(57,0,320,322),8348=>array(17,0,232,393),8352=>array(42,0,835,729),8353=>array(56,-44,593,778),8354=>array(47,-14,587,742),8355=>array(65,0,599,729),8356=>array(63,0,548,742),8357=>array(91,-93,889,640),8358=>array(57,0,691,729),8359=>array(98,-14,1226,729),8360=>array(98,-14,1025,729),8361=>array(29,0,960,729),8362=>array(46,-14,743,729),8363=>array(55,-156,619,760),8364=>array(0,-14,570,742),8365=>array(20,0,636,729),8366=>array(10,0,626,729),8367=>array(102,-222,1205,742),8368=>array(22,-14,569,742),8369=>array(33,0,579,729),8370=>array(45,-81,586,809),8371=>array(8,0,627,729),8372=>array(57,-14,717,742),8373=>array(81,-147,556,760),8376=>array(10,0,626,729),8377=>array(52,0,585,729),8378=>array(5,2,649,731),8400=>array(-491,635,-26,760),8401=>array(-470,635,-5,760),8406=>array(-470,560,-26,760),8407=>array(-470,560,-26,760),8411=>array(-491,560,-10,758),8412=>array(-586,560,86,758),8417=>array(-470,560,-26,760),8448=>array(33,-24,980,752),8449=>array(33,-24,999,752),8450=>array(56,-14,644,742),8451=>array(95,-14,1053,742),8452=>array(-21,0,637,729),8453=>array(29,-24,987,752),8454=>array(29,-24,1038,752),8455=>array(80,-14,560,742),8456=>array(54,-146,642,611),8457=>array(95,0,894,742),8459=>array(36,-14,943,748),8460=>array(1,-128,693,731),8461=>array(98,0,751,729),8462=>array(35,0,566,760),8463=>array(44,0,566,760),8464=>array(29,-15,432,742),8465=>array(52,-14,659,742),8466=>array(33,-14,679,743),8467=>array(-14,-14,353,742),8468=>array(16,-14,763,760),8469=>array(97,0,704,729),8470=>array(26,0,969,729),8471=>array(138,0,862,724),8472=>array(54,-221,658,495),8473=>array(98,0,666,729),8474=>array(56,-129,731,742),8475=>array(32,-9,764,774),8476=>array(41,-14,803,743),8477=>array(98,0,774,729),8478=>array(83,0,814,729),8479=>array(98,-107,666,847),8480=>array(126,443,770,730),8481=>array(-2,0,1023,547),8482=>array(144,447,784,729),8483=>array(8,-108,676,846),8484=>array(45,0,700,729),8485=>array(43,-213,523,760),8486=>array(38,0,726,738),8487=>array(38,-14,726,724),8488=>array(12,-149,573,783),8489=>array(33,0,255,547),8490=>array(98,0,677,729),8491=>array(8,0,676,928),8492=>array(45,0,734,772),8493=>array(63,-12,652,742),8494=>array(61,-12,793,647),8495=>array(42,-14,547,533),8496=>array(79,-14,565,742),8497=>array(41,-16,758,755),8498=>array(98,0,517,729),8499=>array(28,-28,1032,751),8500=>array(51,-12,411,395),8501=>array(50,-14,712,742),8502=>array(-2,-14,653,743),8503=>array(13,-35,407,742),8504=>array(42,-35,591,742),8505=>array(34,0,355,760),8506=>array(44,-21,915,654),8507=>array(74,0,1162,547),8508=>array(18,-8,685,547),8509=>array(0,-194,669,560),8510=>array(98,0,648,729),8511=>array(98,0,750,729),8512=>array(12,-192,791,719),8513=>array(80,-14,716,742),8514=>array(4,0,458,729),8515=>array(3,0,457,729),8516=>array(-2,0,613,729),8517=>array(42,0,786,729),8518=>array(44,-14,709,760),8519=>array(44,-14,572,560),8520=>array(39,0,313,760),8521=>array(-114,-208,313,760),8523=>array(29,-14,715,742),8526=>array(40,0,441,547),8528=>array(67,-14,922,742),8529=>array(67,-14,932,742),8530=>array(67,-14,1335,742),8531=>array(67,-14,918,742),8532=>array(46,-14,918,742),8533=>array(67,-14,921,742),8534=>array(46,-14,921,742),8535=>array(48,-14,921,742),8536=>array(31,-14,921,742),8537=>array(67,-14,937,742),8538=>array(50,-14,937,742),8539=>array(67,-14,933,742),8540=>array(48,-14,933,742),8541=>array(50,-14,933,742),8542=>array(53,-14,933,742),8543=>array(67,-14,751,742),8544=>array(98,0,197,729),8545=>array(98,0,394,729),8546=>array(98,0,591,729),8547=>array(98,0,915,729),8548=>array(8,0,676,729),8549=>array(8,0,824,729),8550=>array(8,0,1021,729),8551=>array(8,0,1219,729),8552=>array(98,0,886,729),8553=>array(30,0,654,729),8554=>array(30,0,835,729),8555=>array(30,0,1032,729),8556=>array(98,0,552,729),8557=>array(56,-14,644,742),8558=>array(98,0,711,729),8559=>array(98,0,765,729),8560=>array(94,0,184,760),8561=>array(94,0,364,760),8562=>array(94,0,543,760),8563=>array(94,0,782,760),8564=>array(30,0,562,547),8565=>array(30,0,717,760),8566=>array(30,0,897,760),8567=>array(30,0,1077,760),8568=>array(94,0,786,760),8569=>array(29,0,559,547),8570=>array(29,0,729,760),8571=>array(29,0,908,760),8572=>array(94,0,184,760),8573=>array(55,-14,488,560),8574=>array(55,-14,544,760),8575=>array(91,0,889,560),8576=>array(59,0,1186,729),8577=>array(98,0,711,729),8578=>array(59,0,1186,729),8579=>array(56,-14,644,742),8580=>array(62,-14,495,560),8581=>array(56,-208,644,742),8585=>array(42,-14,918,742),8592=>array(49,100,781,527),8593=>array(205,0,632,732),8594=>array(57,100,789,527),8595=>array(205,-3,632,729),8596=>array(49,100,789,527),8597=>array(205,-8,632,732),8598=>array(141,25,703,587),8599=>array(141,25,703,587),8600=>array(141,25,703,587),8601=>array(141,25,703,587),8602=>array(49,100,781,527),8603=>array(57,100,789,527),8604=>array(21,103,827,414),8605=>array(11,103,816,414),8606=>array(49,100,781,527),8607=>array(206,0,633,732),8608=>array(57,100,789,527),8609=>array(206,-3,633,729),8610=>array(49,100,781,527),8611=>array(57,100,789,527),8612=>array(49,100,781,527),8613=>array(206,0,632,732),8614=>array(57,100,789,527),8615=>array(206,-3,632,729),8616=>array(206,0,632,732),8617=>array(49,100,780,565),8618=>array(58,100,789,565),8619=>array(49,100,780,565),8620=>array(58,100,789,565),8621=>array(49,100,789,527),8622=>array(49,93,789,534),8623=>array(146,-2,702,730),8624=>array(169,0,629,743),8625=>array(209,0,669,743),8626=>array(169,-14,629,729),8627=>array(209,-14,669,729),8628=>array(233,-3,760,604),8629=>array(49,100,656,626),8630=>array(22,203,799,668),8631=>array(39,203,816,668),8632=>array(108,25,788,729),8633=>array(55,-46,783,673),8634=>array(103,62,762,680),8635=>array(77,62,736,680),8636=>array(49,272,781,527),8637=>array(49,100,781,355),8638=>array(377,0,632,732),8639=>array(205,0,460,732),8640=>array(57,272,789,527),8641=>array(57,100,789,355),8642=>array(377,0,632,732),8643=>array(205,0,460,732),8644=>array(49,-47,789,674),8645=>array(58,-3,779,732),8646=>array(49,-47,789,674),8647=>array(49,-47,781,674),8648=>array(59,0,779,732),8649=>array(58,-47,790,674),8650=>array(59,-3,779,729),8651=>array(49,7,789,620),8652=>array(49,7,789,620),8653=>array(49,100,781,527),8654=>array(49,94,789,533),8655=>array(57,100,789,527),8656=>array(49,100,781,527),8657=>array(206,0,633,732),8658=>array(57,100,789,527),8659=>array(206,-3,633,729),8660=>array(49,100,789,527),8661=>array(205,-8,633,732),8662=>array(141,-23,751,587),8663=>array(92,-23,703,587),8664=>array(92,25,703,636),8665=>array(141,25,751,636),8666=>array(49,100,781,527),8667=>array(57,100,789,527),8668=>array(49,100,781,527),8669=>array(57,100,789,527),8670=>array(205,0,632,732),8671=>array(205,-3,632,729),8672=>array(49,100,781,527),8673=>array(205,0,633,732),8674=>array(57,100,789,527),8675=>array(205,-3,633,729),8676=>array(52,99,781,528),8677=>array(57,99,786,528),8678=>array(27,65,781,562),8679=>array(171,0,667,754),8680=>array(35,65,789,562),8681=>array(171,-25,667,729),8682=>array(171,0,667,754),8683=>array(171,0,667,754),8684=>array(156,0,682,754),8685=>array(171,0,667,754),8686=>array(171,0,667,754),8687=>array(171,0,667,754),8688=>array(57,65,811,562),8689=>array(60,0,788,729),8690=>array(60,0,788,729),8691=>array(171,-25,667,754),8692=>array(57,100,789,527),8693=>array(58,-3,779,732),8694=>array(57,-193,789,820),8695=>array(49,94,781,533),8696=>array(57,94,789,533),8697=>array(49,94,789,533),8698=>array(49,94,781,533),8699=>array(57,94,789,533),8700=>array(49,94,789,533),8701=>array(27,96,781,531),8702=>array(57,96,811,531),8703=>array(27,96,811,531),8704=>array(8,0,676,729),8705=>array(66,-14,554,742),8706=>array(46,-14,471,662),8707=>array(98,0,568,729),8708=>array(98,-46,568,776),8709=>array(76,-10,795,710),8710=>array(-3,0,672,719),8711=>array(-3,0,672,719),8712=>array(85,-10,786,710),8713=>array(85,-138,786,835),8714=>array(106,76,612,550),8715=>array(85,-10,786,710),8716=>array(85,-138,786,835),8717=>array(106,76,612,550),8718=>array(146,0,490,485),8719=>array(76,-192,680,719),8720=>array(76,-192,680,719),8721=>array(12,-192,654,719),8722=>array(106,272,732,355),8723=>array(106,0,732,627),8724=>array(106,0,732,729),8725=>array(0,-93,337,729),8726=>array(192,-54,529,768),8727=>array(127,0,710,627),8728=>array(158,160,468,470),8729=>array(168,168,458,458),8730=>array(30,-20,637,811),8731=>array(30,-20,637,933),8732=>array(30,-20,637,924),8733=>array(107,112,607,487),8734=>array(107,112,726,487),8735=>array(138,99,700,661),8736=>array(85,0,786,729),8737=>array(85,-53,786,729),8738=>array(116,-3,732,727),8739=>array(211,-214,289,771),8740=>array(50,-214,451,771),8741=>array(133,-214,367,771),8742=>array(50,-214,451,771),8743=>array(129,0,603,579),8744=>array(129,0,603,579),8745=>array(129,0,603,579),8746=>array(129,0,603,579),8747=>array(57,-212,464,757),8748=>array(57,-212,732,757),8749=>array(57,-212,1000,757),8750=>array(57,-212,464,757),8751=>array(57,-212,732,757),8752=>array(57,-212,1000,757),8753=>array(57,-213,522,757),8754=>array(57,-212,514,757),8755=>array(57,-212,515,757),8756=>array(59,100,577,604),8757=>array(59,100,577,604),8758=>array(79,100,182,604),8759=>array(59,100,577,604),8760=>array(106,272,732,552),8761=>array(106,78,732,552),8762=>array(105,78,732,552),8763=>array(106,78,732,552),8764=>array(106,228,732,399),8765=>array(106,228,732,399),8766=>array(79,149,759,479),8767=>array(106,42,732,584),8768=>array(102,0,273,626),8769=>array(106,77,732,553),8770=>array(106,133,732,454),8771=>array(106,172,732,494),8772=>array(106,48,732,603),8773=>array(106,90,732,594),8774=>array(106,12,732,594),8775=>array(106,-5,732,657),8776=>array(106,133,732,494),8777=>array(106,2,732,625),8778=>array(106,90,732,598),8779=>array(106,59,732,602),8780=>array(106,90,732,594),8781=>array(105,105,732,521),8782=>array(106,26,732,601),8783=>array(106,172,732,601),8784=>array(106,172,732,625),8785=>array(106,1,732,625),8786=>array(106,2,733,625),8787=>array(106,2,733,625),8788=>array(101,151,899,476),8789=>array(100,151,900,475),8790=>array(106,172,732,454),8791=>array(106,172,732,760),8792=>array(106,172,732,662),8793=>array(106,172,732,812),8794=>array(106,172,732,812),8795=>array(106,172,732,849),8796=>array(106,172,732,854),8797=>array(106,172,732,764),8798=>array(106,172,732,760),8799=>array(106,172,732,856),8800=>array(106,19,732,608),8801=>array(106,90,732,537),8802=>array(106,-24,732,650),8803=>array(106,0,732,629),8804=>array(106,0,732,582),8805=>array(106,0,732,582),8806=>array(106,-83,732,638),8807=>array(106,-83,732,638),8808=>array(106,-164,732,638),8809=>array(106,-164,732,638),8810=>array(72,22,975,609),8811=>array(72,22,975,609),8812=>array(86,-132,378,759),8813=>array(105,13,732,613),8814=>array(106,2,732,674),8815=>array(106,-47,732,625),8816=>array(106,-102,732,667),8817=>array(106,-102,732,667),8818=>array(106,-55,732,582),8819=>array(106,-39,732,582),8820=>array(106,-105,732,664),8821=>array(106,-102,732,667),8822=>array(102,-87,732,686),8823=>array(102,-87,732,686),8824=>array(102,-197,732,797),8825=>array(102,-197,732,797),8826=>array(106,-38,732,664),8827=>array(106,-38,732,664),8828=>array(106,-105,732,667),8829=>array(106,-105,732,667),8830=>array(106,-85,732,667),8831=>array(106,-85,732,667),8832=>array(106,-61,732,764),8833=>array(106,-138,732,687),8834=>array(100,80,738,546),8835=>array(100,80,738,546),8836=>array(100,-96,738,726),8837=>array(100,-100,738,722),8838=>array(93,0,732,613),8839=>array(106,0,745,613),8840=>array(93,-116,732,730),8841=>array(106,-116,745,730),8842=>array(93,-73,732,614),8843=>array(93,-73,732,614),8844=>array(129,0,603,579),8845=>array(129,0,603,579),8846=>array(129,2,603,582),8847=>array(106,0,732,568),8848=>array(106,0,732,568),8849=>array(106,-83,732,630),8850=>array(106,-83,732,630),8851=>array(106,0,674,626),8852=>array(106,0,674,626),8853=>array(91,-14,747,643),8854=>array(91,-14,747,643),8855=>array(91,-14,747,643),8856=>array(91,-14,747,643),8857=>array(91,-14,747,643),8858=>array(91,-14,747,643),8859=>array(91,-14,747,643),8860=>array(91,-14,747,643),8861=>array(91,-14,747,643),8862=>array(91,-14,747,643),8863=>array(91,-14,747,643),8864=>array(91,-14,747,643),8865=>array(91,-14,747,643),8866=>array(85,0,786,700),8867=>array(85,0,786,700),8868=>array(85,0,786,700),8869=>array(85,0,786,700),8870=>array(85,0,436,700),8871=>array(85,0,436,700),8872=>array(85,0,786,700),8873=>array(85,0,786,700),8874=>array(85,0,786,700),8875=>array(85,0,786,700),8876=>array(85,-40,786,740),8877=>array(85,-40,786,740),8878=>array(85,-40,786,740),8879=>array(85,-40,786,740),8880=>array(106,-43,724,670),8881=>array(106,-43,724,670),8882=>array(106,15,732,612),8883=>array(106,15,732,612),8884=>array(106,-48,732,674),8885=>array(106,-48,732,674),8886=>array(59,175,941,454),8887=>array(59,175,941,454),8888=>array(48,175,790,454),8889=>array(59,-47,779,674),8890=>array(116,0,404,701),8891=>array(98,0,634,740),8892=>array(98,0,634,740),8893=>array(98,0,634,740),8894=>array(138,0,700,562),8895=>array(138,0,700,562),8896=>array(-3,-192,823,719),8897=>array(-3,-192,823,719),8898=>array(68,-192,752,719),8899=>array(68,-192,752,719),8900=>array(3,-233,491,807),8901=>array(107,285,210,409),8902=>array(122,149,504,512),8903=>array(106,15,732,613),8904=>array(106,-30,894,657),8905=>array(106,-30,894,657),8906=>array(106,-30,894,657),8907=>array(106,-30,894,657),8908=>array(106,-30,894,657),8909=>array(106,172,732,494),8910=>array(48,0,684,579),8911=>array(48,0,684,579),8912=>array(93,-3,732,630),8913=>array(106,-3,745,630),8914=>array(103,0,735,663),8915=>array(103,-14,735,649),8916=>array(186,0,652,729),8917=>array(106,-100,732,729),8918=>array(106,46,732,581),8919=>array(106,46,732,581),8920=>array(72,22,1350,609),8921=>array(72,22,1350,609),8922=>array(106,-228,732,854),8923=>array(106,-228,732,854),8924=>array(106,0,732,582),8925=>array(106,0,732,582),8926=>array(106,-105,732,667),8927=>array(106,-105,732,667),8928=>array(106,-178,732,764),8929=>array(106,-178,732,764),8930=>array(106,-141,732,767),8931=>array(106,-141,732,767),8932=>array(106,-94,732,619),8933=>array(106,-94,732,619),8934=>array(106,-138,732,582),8935=>array(106,-138,732,582),8936=>array(106,-169,732,667),8937=>array(110,-171,736,667),8938=>array(106,-130,732,756),8939=>array(106,-130,732,756),8940=>array(106,-189,732,815),8941=>array(104,-189,730,815),8942=>array(448,-93,551,715),8943=>array(115,249,884,373),8944=>array(115,-93,884,715),8945=>array(115,-93,884,715),8946=>array(43,-10,957,710),8947=>array(85,-10,786,710),8948=>array(106,76,612,550),8949=>array(85,-10,786,910),8950=>array(85,-10,786,853),8951=>array(106,76,612,686),8952=>array(85,-144,786,710),8953=>array(85,-10,786,710),8954=>array(43,-10,957,710),8955=>array(85,-10,786,710),8956=>array(106,76,612,550),8957=>array(85,-10,786,853),8958=>array(106,76,612,686),8959=>array(106,0,765,720),8960=>array(36,-18,567,514),8961=>array(56,162,540,443),8962=>array(71,0,563,596),8963=>array(205,481,632,732),8964=>array(205,0,632,251),8965=>array(205,0,632,406),8966=>array(205,0,632,513),8967=>array(154,-29,334,788),8968=>array(86,-132,293,760),8969=>array(97,-132,304,760),8970=>array(86,-132,293,760),8971=>array(97,-132,304,760),8972=>array(369,-77,759,313),8973=>array(49,-77,439,313),8974=>array(369,243,759,634),8975=>array(49,243,439,634),8976=>array(106,140,732,421),8977=>array(3,126,510,634),8984=>array(121,0,879,759),8985=>array(106,140,732,421),8988=>array(86,425,403,760),8989=>array(65,425,383,760),8990=>array(86,-70,403,264),8991=>array(65,-70,383,264),8992=>array(210,-250,497,928),8993=>array(21,-237,307,942),8996=>array(76,227,1076,575),8997=>array(76,0,1076,575),8998=>array(76,0,1414,760),8999=>array(76,0,1076,760),9000=>array(59,0,1385,729),9003=>array(0,0,1338,760),9004=>array(73,-91,800,748),9075=>array(81,0,304,547),9076=>array(91,-208,580,560),9077=>array(66,-14,769,547),9082=>array(55,-12,611,559),9085=>array(13,-228,745,102),9095=>array(76,0,1096,748),9108=>array(17,0,856,727),9115=>array(86,-252,414,946),9116=>array(86,-252,181,942),9117=>array(86,-240,414,942),9118=>array(86,-252,414,946),9119=>array(319,-252,414,942),9120=>array(86,-240,414,942),9121=>array(86,-252,414,928),9122=>array(86,-252,181,942),9123=>array(86,-240,414,942),9124=>array(86,-252,414,928),9125=>array(319,-252,414,935),9126=>array(86,-240,414,935),9127=>array(330,-261,668,928),9128=>array(82,-252,420,940),9129=>array(330,-240,668,940),9130=>array(330,-256,420,943),9131=>array(82,-261,420,928),9132=>array(330,-252,668,940),9133=>array(82,-240,420,940),9134=>array(210,-250,307,942),9166=>array(27,65,781,729),9167=>array(91,0,854,596),9187=>array(73,-91,800,748),9189=>array(3,75,766,444),9192=>array(43,-129,601,294),9250=>array(-62,-14,580,760),9251=>array(71,-228,563,102),9312=>array(74,-10,822,738),9313=>array(74,-10,822,738),9314=>array(74,-10,822,738),9315=>array(74,-10,822,738),9316=>array(74,-10,822,738),9317=>array(74,-10,822,738),9318=>array(74,-10,822,738),9319=>array(74,-10,822,738),9320=>array(74,-10,822,738),9321=>array(74,-10,822,738),9472=>array(-10,242,612,326),9473=>array(-10,200,612,368),9474=>array(262,-302,340,973),9475=>array(223,-302,379,973),9476=>array(-10,242,612,326),9477=>array(-10,200,612,368),9478=>array(262,-302,340,973),9479=>array(223,-302,379,973),9480=>array(-10,242,612,326),9481=>array(-10,200,612,368),9482=>array(262,-302,340,973),9483=>array(223,-302,379,973),9484=>array(262,-302,612,326),9485=>array(262,-302,612,368),9486=>array(223,-302,612,326),9487=>array(223,-302,612,368),9488=>array(-10,-302,340,326),9489=>array(-10,-302,340,368),9490=>array(-10,-302,379,326),9491=>array(-10,-302,379,368),9492=>array(262,242,612,973),9493=>array(262,200,612,973),9494=>array(223,242,612,973),9495=>array(223,200,612,973),9496=>array(-10,242,340,973),9497=>array(-10,200,340,973),9498=>array(-10,242,379,973),9499=>array(-10,200,379,973),9500=>array(262,-302,612,973),9501=>array(262,-302,612,973),9502=>array(223,-302,612,973),9503=>array(223,-302,612,973),9504=>array(223,-302,612,973),9505=>array(223,-302,612,973),9506=>array(223,-302,612,973),9507=>array(223,-302,612,973),9508=>array(-10,-302,340,973),9509=>array(-10,-302,340,973),9510=>array(-10,-302,379,973),9511=>array(-10,-302,379,973),9512=>array(-10,-302,379,973),9513=>array(-10,-302,379,973),9514=>array(-10,-302,379,973),9515=>array(-10,-302,379,973),9516=>array(-10,-302,612,326),9517=>array(-10,-302,612,368),9518=>array(-10,-302,612,368),9519=>array(-10,-302,612,368),9520=>array(-10,-302,612,326),9521=>array(-10,-302,612,368),9522=>array(-10,-302,612,368),9523=>array(-10,-302,612,368),9524=>array(-10,242,612,973),9525=>array(-10,200,612,973),9526=>array(-10,200,612,973),9527=>array(-10,200,612,973),9528=>array(-10,242,612,973),9529=>array(-10,200,612,973),9530=>array(-10,200,612,973),9531=>array(-10,200,612,973),9532=>array(-10,-302,612,973),9533=>array(-10,-302,612,973),9534=>array(-10,-302,612,973),9535=>array(-10,-302,612,973),9536=>array(-10,-302,612,973),9537=>array(-10,-302,612,973),9538=>array(-10,-302,612,973),9539=>array(-10,-302,612,973),9540=>array(-10,-302,612,973),9541=>array(-10,-302,612,973),9542=>array(-10,-302,612,973),9543=>array(-10,-302,612,973),9544=>array(-10,-302,612,973),9545=>array(-10,-302,612,973),9546=>array(-10,-302,612,973),9547=>array(-10,-302,612,973),9548=>array(-10,242,612,326),9549=>array(-10,200,612,368),9550=>array(262,-302,340,973),9551=>array(223,-302,379,973),9552=>array(-10,158,612,410),9553=>array(184,-302,418,973),9554=>array(262,-302,612,410),9555=>array(184,-302,612,326),9556=>array(184,-302,612,410),9557=>array(-10,-302,340,410),9558=>array(-10,-302,418,326),9559=>array(-10,-302,418,410),9560=>array(262,158,612,973),9561=>array(184,242,612,973),9562=>array(184,158,612,973),9563=>array(-10,158,340,973),9564=>array(-10,242,418,973),9565=>array(-10,158,418,973),9566=>array(262,-302,612,973),9567=>array(184,-302,612,973),9568=>array(184,-302,612,973),9569=>array(-10,-302,340,973),9570=>array(-10,-302,418,973),9571=>array(-10,-302,418,973),9572=>array(-10,-302,612,410),9573=>array(-10,-302,612,326),9574=>array(-10,-302,612,410),9575=>array(-10,158,612,973),9576=>array(-10,242,612,973),9577=>array(-10,158,612,973),9578=>array(-10,-302,612,973),9579=>array(-10,-302,612,973),9580=>array(-10,-302,612,973),9581=>array(262,-302,612,326),9582=>array(-10,-302,340,326),9583=>array(-10,242,340,973),9584=>array(262,242,612,973),9585=>array(-53,-302,655,973),9586=>array(-53,-302,655,973),9587=>array(-53,-302,655,973),9588=>array(-10,242,311,326),9589=>array(262,284,340,973),9590=>array(311,242,612,326),9591=>array(262,-302,340,284),9592=>array(-10,200,311,368),9593=>array(223,284,379,973),9594=>array(311,200,612,368),9595=>array(223,-302,379,284),9596=>array(-10,200,612,368),9597=>array(223,-302,379,973),9598=>array(-10,200,612,368),9599=>array(223,-302,379,973),9600=>array(-10,260,779,770),9601=>array(-10,-250,779,-123),9602=>array(-10,-250,779,-5),9603=>array(-10,-250,779,132),9604=>array(-10,-250,779,260),9605=>array(-10,-250,779,387),9606=>array(-10,-250,779,515),9607=>array(-10,-250,779,642),9608=>array(-10,-250,779,770),9609=>array(-10,-250,680,770),9610=>array(-10,-250,582,770),9611=>array(-10,-250,483,770),9612=>array(-10,-250,384,770),9613=>array(-10,-250,286,770),9614=>array(-10,-250,187,770),9615=>array(-10,-250,88,770),9616=>array(384,-250,778,770),9617=>array(-10,-250,680,770),9618=>array(-10,-250,775,770),9619=>array(-10,-250,779,770),9620=>array(-10,642,779,770),9621=>array(680,-250,778,770),9622=>array(-10,-250,385,260),9623=>array(384,-250,779,260),9624=>array(-10,260,385,770),9625=>array(-10,-250,779,770),9626=>array(-10,-250,779,770),9627=>array(-10,-250,779,770),9628=>array(-10,-250,779,770),9629=>array(384,260,779,770),9630=>array(-10,-250,779,770),9631=>array(-10,-250,779,770),9632=>array(91,-123,854,643),9633=>array(91,-123,854,643),9634=>array(91,-123,854,643),9635=>array(91,-123,854,643),9636=>array(91,-123,854,643),9637=>array(91,-123,854,643),9638=>array(91,-123,854,643),9639=>array(91,-123,854,643),9640=>array(91,-123,854,643),9641=>array(91,-123,854,643),9642=>array(91,11,587,509),9643=>array(91,11,587,509),9644=>array(91,75,854,444),9645=>array(91,75,854,444),9646=>array(91,-122,459,642),9647=>array(91,-122,459,642),9648=>array(3,75,766,444),9649=>array(3,75,766,444),9650=>array(3,-123,766,643),9651=>array(3,-123,766,643),9652=>array(3,11,499,509),9653=>array(3,11,499,509),9654=>array(3,-123,766,643),9655=>array(3,-123,766,643),9656=>array(3,11,499,509),9657=>array(3,11,499,509),9658=>array(3,11,766,509),9659=>array(3,11,766,509),9660=>array(3,-123,766,643),9661=>array(3,-123,766,643),9662=>array(3,11,499,509),9663=>array(3,11,499,509),9664=>array(3,-123,766,643),9665=>array(3,-123,766,643),9666=>array(3,11,499,509),9667=>array(3,11,499,509),9668=>array(3,11,766,509),9669=>array(3,11,766,509),9670=>array(3,-123,766,643),9671=>array(3,-123,766,643),9672=>array(3,-123,766,643),9673=>array(55,-125,818,645),9674=>array(3,-233,491,807),9675=>array(55,-125,818,645),9676=>array(56,-125,817,644),9677=>array(55,-125,818,645),9678=>array(55,-125,818,645),9679=>array(55,-123,818,641),9680=>array(55,-123,818,641),9681=>array(55,-123,818,641),9682=>array(55,-123,818,641),9683=>array(55,-123,818,641),9684=>array(55,-123,818,641),9685=>array(55,-123,818,641),9686=>array(55,-125,436,645),9687=>array(91,-125,472,645),9688=>array(91,-10,700,770),9689=>array(91,-250,879,770),9690=>array(91,260,879,770),9691=>array(91,-250,879,260),9692=>array(3,260,384,645),9693=>array(3,260,384,645),9694=>array(3,-125,384,260),9695=>array(3,-125,384,260),9696=>array(55,260,818,645),9697=>array(55,-125,818,260),9698=>array(3,-123,766,643),9699=>array(3,-123,766,643),9700=>array(3,-123,766,643),9701=>array(3,-123,766,643),9702=>array(150,227,440,516),9703=>array(91,-123,854,643),9704=>array(91,-123,854,643),9705=>array(91,-123,854,643),9706=>array(91,-123,854,643),9707=>array(91,-123,854,643),9708=>array(3,-123,766,643),9709=>array(3,-123,766,643),9710=>array(3,-123,766,643),9711=>array(55,-250,1064,770),9712=>array(91,-123,854,643),9713=>array(91,-123,854,643),9714=>array(91,-123,854,643),9715=>array(91,-123,854,643),9716=>array(55,-123,818,641),9717=>array(55,-123,818,641),9718=>array(55,-123,818,641),9719=>array(55,-123,818,641),9720=>array(3,-123,766,643),9721=>array(3,-123,766,643),9722=>array(3,-123,766,643),9723=>array(91,-66,739,585),9724=>array(91,-66,739,585),9725=>array(91,-17,642,537),9726=>array(91,-17,642,537),9727=>array(3,-123,766,643),9728=>array(83,0,813,729),9729=>array(51,-2,949,360),9730=>array(49,0,848,729),9731=>array(83,-0,813,927),9732=>array(64,0,833,880),9733=>array(65,-4,832,723),9734=>array(65,-4,832,723),9735=>array(83,2,490,729),9736=>array(83,0,813,731),9737=>array(83,0,813,730),9738=>array(61,0,828,727),9739=>array(61,0,828,723),9740=>array(61,-1,610,722),9741=>array(61,0,952,723),9742=>array(68,0,1177,729),9743=>array(71,0,1180,729),9744=>array(90,0,807,729),9745=>array(89,0,808,729),9746=>array(89,0,808,729),9747=>array(75,78,457,656),9748=>array(49,0,870,933),9749=>array(74,0,822,731),9750=>array(84,0,813,731),9751=>array(84,0,813,727),9752=>array(78,0,819,729),9753=>array(83,140,813,574),9754=>array(84,113,813,569),9755=>array(84,113,813,569),9756=>array(87,104,810,569),9757=>array(72,0,537,724),9758=>array(86,103,810,569),9759=>array(72,-3,537,720),9760=>array(61,0,835,730),9761=>array(84,0,813,730),9762=>array(83,0,813,730),9763=>array(49,0,848,730),9764=>array(49,-2,620,727),9765=>array(83,0,663,731),9766=>array(83,-1,566,731),9767=>array(83,0,701,911),9768=>array(83,0,462,730),9769=>array(83,-1,813,729),9770=>array(87,0,810,730),9771=>array(83,0,814,731),9772=>array(83,0,627,731),9773=>array(83,0,813,730),9774=>array(83,0,813,730),9775=>array(83,0,813,730),9776=>array(83,0,813,729),9777=>array(83,0,814,729),9778=>array(83,0,813,729),9779=>array(83,0,813,729),9780=>array(83,0,813,729),9781=>array(83,0,813,729),9782=>array(83,0,813,729),9783=>array(83,0,813,729),9784=>array(66,-11,831,735),9785=>array(83,-73,959,804),9786=>array(83,-73,959,804),9787=>array(83,-73,959,804),9788=>array(83,0,813,730),9789=>array(358,0,814,730),9790=>array(83,0,539,730),9791=>array(85,-102,528,732),9792=>array(85,-125,647,731),9793=>array(85,-14,647,843),9794=>array(79,-14,831,720),9795=>array(166,0,730,730),9796=>array(219,0,677,730),9797=>array(121,0,774,730),9798=>array(127,0,769,730),9799=>array(240,0,656,730),9800=>array(45,0,851,731),9801=>array(89,0,807,730),9802=>array(94,0,802,731),9803=>array(113,31,784,679),9804=>array(140,0,756,730),9805=>array(53,-180,843,730),9806=>array(83,52,813,653),9807=>array(34,-96,863,730),9808=>array(83,-0,813,730),9809=>array(94,0,802,730),9810=>array(86,153,810,579),9811=>array(157,0,739,730),9812=>array(98,0,798,730),9813=>array(110,0,786,730),9814=>array(167,-1,729,729),9815=>array(214,0,683,730),9816=>array(165,0,732,730),9817=>array(148,-0,748,730),9818=>array(98,0,798,730),9819=>array(110,0,786,730),9820=>array(167,-1,729,729),9821=>array(214,0,683,730),9822=>array(162,0,734,730),9823=>array(148,-0,748,730),9824=>array(158,0,738,729),9825=>array(90,0,806,727),9826=>array(168,0,728,729),9827=>array(111,0,785,729),9828=>array(157,0,739,729),9829=>array(89,0,808,729),9830=>array(168,0,728,729),9831=>array(111,0,785,732),9832=>array(105,-1,791,729),9833=>array(84,-5,339,729),9834=>array(84,-5,554,729),9835=>array(184,-102,712,729),9836=>array(92,-5,804,729),9837=>array(88,-3,392,731),9838=>array(84,0,273,731),9839=>array(84,0,400,731),9840=>array(84,0,664,731),9841=>array(64,0,701,731),9842=>array(84,0,813,709),9843=>array(76,16,820,731),9844=>array(76,16,820,731),9845=>array(76,16,820,731),9846=>array(76,16,820,731),9847=>array(76,16,820,731),9848=>array(76,16,820,731),9849=>array(76,16,820,731),9850=>array(76,16,820,731),9851=>array(84,0,812,704),9852=>array(83,0,814,731),9853=>array(83,0,814,731),9854=>array(83,0,814,731),9855=>array(149,1,747,731),9856=>array(73,0,797,725),9857=>array(73,0,797,725),9858=>array(73,0,797,725),9859=>array(73,0,797,725),9860=>array(73,0,797,725),9861=>array(73,0,797,725),9862=>array(83,0,813,731),9863=>array(83,0,813,731),9864=>array(83,0,813,731),9865=>array(83,0,813,731),9866=>array(83,0,813,98),9867=>array(83,0,813,98),9868=>array(83,0,813,413),9869=>array(83,0,813,413),9870=>array(83,0,813,413),9871=>array(83,0,813,413),9872=>array(168,3,728,731),9873=>array(168,3,728,731),9874=>array(52,0,844,731),9875=>array(97,-10,799,732),9876=>array(131,0,765,729),9877=>array(61,-10,479,732),9878=>array(59,-10,837,732),9879=>array(61,0,835,732),9880=>array(145,0,750,732),9881=>array(95,-17,802,727),9882=>array(128,-9,768,733),9883=>array(127,0,769,728),9884=>array(127,0,769,729),9888=>array(49,0,848,729),9889=>array(83,2,619,730),9890=>array(85,-125,919,731),9891=>array(79,-206,1023,720),9892=>array(85,-186,1109,856),9893=>array(85,-125,837,917),9894=>array(131,-14,727,869),9895=>array(101,-170,741,884),9896=>array(188,-14,650,869),9897=>array(4,133,829,596),9898=>array(187,133,651,596),9899=>array(187,133,651,596),9900=>array(247,194,591,537),9901=>array(174,194,664,537),9902=>array(41,169,797,560),9903=>array(5,194,833,536),9904=>array(103,237,757,540),9905=>array(211,42,626,698),9906=>array(85,-125,647,731),9907=>array(168,-125,646,731),9908=>array(86,-125,646,731),9909=>array(86,-125,646,731),9910=>array(59,-118,791,643),9911=>array(194,-104,595,710),9912=>array(158,-125,543,731),9920=>array(42,4,796,553),9921=>array(42,4,796,724),9922=>array(42,4,796,553),9923=>array(42,4,796,724),9954=>array(85,-14,647,843),9985=>array(11,190,803,635),9986=>array(42,141,784,588),9987=>array(11,94,803,539),9988=>array(36,119,824,613),9990=>array(42,-14,796,742),9991=>array(42,-14,796,742),9992=>array(59,21,782,708),9993=>array(64,107,773,622),9996=>array(212,0,561,742),9997=>array(21,83,802,678),9998=>array(89,75,724,710),9999=>array(26,198,819,530),10000=>array(89,75,724,710),10001=>array(43,185,757,544),10002=>array(67,209,757,520),10003=>array(150,97,667,630),10004=>array(116,87,721,631),10005=>array(126,72,711,657),10006=>array(85,31,752,698),10007=>array(118,-9,701,732),10008=>array(123,0,754,739),10009=>array(55,0,783,729),10010=>array(55,0,783,729),10011=>array(55,0,783,729),10012=>array(55,0,783,729),10013=>array(165,0,673,729),10014=>array(131,0,678,729),10015=>array(155,0,683,729),10016=>array(55,0,783,729),10017=>array(91,-13,747,744),10018=>array(41,-14,797,742),10019=>array(42,-12,796,742),10020=>array(41,-14,797,742),10021=>array(41,-13,797,743),10022=>array(42,-14,796,745),10023=>array(42,-14,796,745),10025=>array(23,-10,815,744),10026=>array(42,-14,796,742),10027=>array(23,-9,814,743),10028=>array(23,-10,815,744),10029=>array(23,-9,814,743),10030=>array(23,-9,814,743),10031=>array(23,-9,814,743),10032=>array(24,12,815,714),10033=>array(64,0,773,729),10034=>array(74,0,764,729),10035=>array(55,0,783,729),10036=>array(31,-14,787,742),10037=>array(41,-14,797,742),10038=>array(91,-14,747,742),10039=>array(41,-14,797,742),10040=>array(41,-14,797,742),10041=>array(41,-14,797,742),10042=>array(55,0,783,729),10043=>array(82,-14,756,742),10044=>array(82,-14,756,742),10045=>array(79,-14,759,742),10046=>array(79,-14,759,742),10047=>array(54,0,784,709),10048=>array(54,0,784,709),10049=>array(41,-14,797,742),10050=>array(42,-14,796,742),10051=>array(79,-14,759,742),10052=>array(89,0,749,729),10053=>array(76,0,762,729),10054=>array(63,2,773,729),10055=>array(79,-13,759,742),10056=>array(47,-13,791,730),10057=>array(47,-13,791,730),10058=>array(41,-13,797,743),10059=>array(41,-13,797,743),10061=>array(50,-10,847,738),10063=>array(60,-49,837,729),10064=>array(60,0,837,777),10065=>array(60,-49,837,729),10066=>array(60,0,837,777),10070=>array(83,-2,813,728),10072=>array(377,-240,460,760),10073=>array(336,-240,502,760),10074=>array(253,-240,585,760),10075=>array(85,395,264,729),10076=>array(59,395,237,729),10077=>array(85,395,479,729),10078=>array(59,395,453,729),10081=>array(155,-93,772,851),10082=>array(202,-17,636,742),10083=>array(163,-17,675,742),10084=>array(54,83,784,645),10085=>array(168,-1,729,729),10086=>array(62,21,724,702),10087=>array(78,169,759,564),10088=>array(196,-139,648,769),10089=>array(196,-139,648,769),10090=>array(264,-132,574,758),10091=>array(264,-132,574,758),10092=>array(215,-240,607,760),10093=>array(232,-240,623,760),10094=>array(142,-240,685,760),10095=>array(153,-240,696,760),10096=>array(167,-240,656,760),10097=>array(183,-240,672,760),10098=>array(346,-241,535,760),10099=>array(303,-241,492,760),10100=>array(175,-163,634,760),10101=>array(204,-163,663,760),10102=>array(74,-10,822,738),10103=>array(74,-10,822,738),10104=>array(74,-10,822,738),10105=>array(74,-10,822,738),10106=>array(74,-10,822,738),10107=>array(74,-10,822,738),10108=>array(74,-10,822,738),10109=>array(74,-10,822,738),10110=>array(74,-10,822,738),10111=>array(74,-10,822,738),10112=>array(4,-52,833,780),10113=>array(4,-52,833,780),10114=>array(4,-52,833,780),10115=>array(4,-52,833,780),10116=>array(4,-52,833,780),10117=>array(4,-52,833,780),10118=>array(4,-52,833,780),10119=>array(4,-52,833,780),10120=>array(4,-52,833,780),10121=>array(4,-52,833,780),10122=>array(4,-52,833,780),10123=>array(4,-52,833,780),10124=>array(4,-52,833,780),10125=>array(4,-52,833,780),10126=>array(4,-52,833,780),10127=>array(4,-52,833,780),10128=>array(4,-52,833,780),10129=>array(4,-52,833,780),10130=>array(4,-52,833,780),10131=>array(4,-52,833,780),10132=>array(57,75,789,552),10136=>array(123,55,682,614),10137=>array(57,100,789,527),10138=>array(123,13,682,572),10139=>array(57,129,789,498),10140=>array(57,57,764,570),10141=>array(57,100,789,527),10142=>array(57,100,789,527),10143=>array(57,100,789,527),10144=>array(57,100,789,527),10145=>array(57,65,811,562),10146=>array(111,94,789,533),10147=>array(111,94,789,533),10148=>array(111,-4,789,631),10149=>array(57,100,789,548),10150=>array(57,79,789,527),10151=>array(240,-7,606,634),10152=>array(57,100,789,527),10153=>array(57,75,765,552),10154=>array(57,75,765,552),10155=>array(21,12,794,586),10156=>array(21,12,794,586),10157=>array(135,0,774,574),10158=>array(135,0,774,574),10159=>array(62,49,799,574),10161=>array(62,49,799,574),10162=>array(154,-20,721,585),10163=>array(63,157,789,470),10164=>array(81,55,682,655),10165=>array(57,173,789,454),10166=>array(82,-29,682,572),10167=>array(82,55,682,655),10168=>array(57,172,789,455),10169=>array(82,-28,682,572),10170=>array(56,84,789,543),10171=>array(73,140,779,487),10172=>array(79,167,774,460),10173=>array(79,118,774,509),10174=>array(57,81,789,546),10181=>array(54,-163,352,769),10182=>array(39,-163,336,769),10208=>array(3,-233,491,807),10214=>array(86,-132,398,760),10215=>array(85,-132,398,760),10216=>array(89,-132,310,759),10217=>array(80,-132,301,759),10218=>array(89,-132,476,759),10219=>array(80,-132,467,759),10224=>array(44,0,794,732),10225=>array(43,-3,793,729),10226=>array(39,53,814,658),10227=>array(39,61,814,666),10228=>array(57,-14,1108,643),10229=>array(49,100,1376,527),10230=>array(57,100,1385,527),10231=>array(49,100,1385,527),10232=>array(49,100,1376,527),10233=>array(57,100,1385,527),10234=>array(49,100,1385,527),10235=>array(49,100,1376,527),10236=>array(57,100,1385,527),10237=>array(49,100,1376,527),10238=>array(57,100,1385,527),10239=>array(57,100,1385,527),10241=>array(146,635,293,781),10242=>array(146,358,293,504),10243=>array(146,358,293,781),10244=>array(146,82,293,228),10245=>array(146,82,293,781),10246=>array(146,82,293,504),10247=>array(146,82,293,781),10248=>array(439,635,586,781),10249=>array(146,635,586,781),10250=>array(146,358,586,781),10251=>array(146,358,586,781),10252=>array(146,82,586,781),10253=>array(146,82,586,781),10254=>array(146,82,586,781),10255=>array(146,82,586,781),10256=>array(439,358,586,504),10257=>array(146,358,586,781),10258=>array(146,358,586,504),10259=>array(146,358,586,781),10260=>array(146,82,586,504),10261=>array(146,82,586,781),10262=>array(146,82,586,504),10263=>array(146,82,586,781),10264=>array(439,358,586,781),10265=>array(146,358,586,781),10266=>array(146,358,586,781),10267=>array(146,358,586,781),10268=>array(146,82,586,781),10269=>array(146,82,586,781),10270=>array(146,82,586,781),10271=>array(146,82,586,781),10272=>array(439,82,586,228),10273=>array(146,82,586,781),10274=>array(146,82,586,504),10275=>array(146,82,586,781),10276=>array(146,82,586,228),10277=>array(146,82,586,781),10278=>array(146,82,586,504),10279=>array(146,82,586,781),10280=>array(439,82,586,781),10281=>array(146,82,586,781),10282=>array(146,82,586,781),10283=>array(146,82,586,781),10284=>array(146,82,586,781),10285=>array(146,82,586,781),10286=>array(146,82,586,781),10287=>array(146,82,586,781),10288=>array(439,82,586,504),10289=>array(146,82,586,781),10290=>array(146,82,586,504),10291=>array(146,82,586,781),10292=>array(146,82,586,504),10293=>array(146,82,586,781),10294=>array(146,82,586,504),10295=>array(146,82,586,781),10296=>array(439,82,586,781),10297=>array(146,82,586,781),10298=>array(146,82,586,781),10299=>array(146,82,586,781),10300=>array(146,82,586,781),10301=>array(146,82,586,781),10302=>array(146,82,586,781),10303=>array(146,82,586,781),10304=>array(146,-195,293,-49),10305=>array(146,-195,293,781),10306=>array(146,-195,293,504),10307=>array(146,-195,293,781),10308=>array(146,-195,293,228),10309=>array(146,-195,293,781),10310=>array(146,-195,293,504),10311=>array(146,-195,293,781),10312=>array(146,-195,586,781),10313=>array(146,-195,586,781),10314=>array(146,-195,586,781),10315=>array(146,-195,586,781),10316=>array(146,-195,586,781),10317=>array(146,-195,586,781),10318=>array(146,-195,586,781),10319=>array(146,-195,586,781),10320=>array(146,-195,586,504),10321=>array(146,-195,586,781),10322=>array(146,-195,586,504),10323=>array(146,-195,586,781),10324=>array(146,-195,586,504),10325=>array(146,-195,586,781),10326=>array(146,-195,586,504),10327=>array(146,-195,586,781),10328=>array(146,-195,586,781),10329=>array(146,-195,586,781),10330=>array(146,-195,586,781),10331=>array(146,-195,586,781),10332=>array(146,-195,586,781),10333=>array(146,-195,586,781),10334=>array(146,-195,586,781),10335=>array(146,-195,586,781),10336=>array(146,-195,586,228),10337=>array(146,-195,586,781),10338=>array(146,-195,586,504),10339=>array(146,-195,586,781),10340=>array(146,-195,586,228),10341=>array(146,-195,586,781),10342=>array(146,-195,586,504),10343=>array(146,-195,586,781),10344=>array(146,-195,586,781),10345=>array(146,-195,586,781),10346=>array(146,-195,586,781),10347=>array(146,-195,586,781),10348=>array(146,-195,586,781),10349=>array(146,-195,586,781),10350=>array(146,-195,586,781),10351=>array(146,-195,586,781),10352=>array(146,-195,586,504),10353=>array(146,-195,586,781),10354=>array(146,-195,586,504),10355=>array(146,-195,586,781),10356=>array(146,-195,586,504),10357=>array(146,-195,586,781),10358=>array(146,-195,586,504),10359=>array(146,-195,586,781),10360=>array(146,-195,586,781),10361=>array(146,-195,586,781),10362=>array(146,-195,586,781),10363=>array(146,-195,586,781),10364=>array(146,-195,586,781),10365=>array(146,-195,586,781),10366=>array(146,-195,586,781),10367=>array(146,-195,586,781),10368=>array(439,-195,586,-49),10369=>array(146,-195,586,781),10370=>array(146,-195,586,504),10371=>array(146,-195,586,781),10372=>array(146,-195,586,228),10373=>array(146,-195,586,781),10374=>array(146,-195,586,504),10375=>array(146,-195,586,781),10376=>array(439,-195,586,781),10377=>array(146,-195,586,781),10378=>array(146,-195,586,781),10379=>array(146,-195,586,781),10380=>array(146,-195,586,781),10381=>array(146,-195,586,781),10382=>array(146,-195,586,781),10383=>array(146,-195,586,781),10384=>array(439,-195,586,504),10385=>array(146,-195,586,781),10386=>array(146,-195,586,504),10387=>array(146,-195,586,781),10388=>array(146,-195,586,504),10389=>array(146,-195,586,781),10390=>array(146,-195,586,504),10391=>array(146,-195,586,781),10392=>array(439,-195,586,781),10393=>array(146,-195,586,781),10394=>array(146,-195,586,781),10395=>array(146,-195,586,781),10396=>array(146,-195,586,781),10397=>array(146,-195,586,781),10398=>array(146,-195,586,781),10399=>array(146,-195,586,781),10400=>array(439,-195,586,228),10401=>array(146,-195,586,781),10402=>array(146,-195,586,504),10403=>array(146,-195,586,781),10404=>array(146,-195,586,228),10405=>array(146,-195,586,781),10406=>array(146,-195,586,504),10407=>array(146,-195,586,781),10408=>array(439,-195,586,781),10409=>array(146,-195,586,781),10410=>array(146,-195,586,781),10411=>array(146,-195,586,781),10412=>array(146,-195,586,781),10413=>array(146,-195,586,781),10414=>array(146,-195,586,781),10415=>array(146,-195,586,781),10416=>array(439,-195,586,504),10417=>array(146,-195,586,781),10418=>array(146,-195,586,504),10419=>array(146,-195,586,781),10420=>array(146,-195,586,504),10421=>array(146,-195,586,781),10422=>array(146,-195,586,504),10423=>array(146,-195,586,781),10424=>array(439,-195,586,781),10425=>array(146,-195,586,781),10426=>array(146,-195,586,781),10427=>array(146,-195,586,781),10428=>array(146,-195,586,781),10429=>array(146,-195,586,781),10430=>array(146,-195,586,781),10431=>array(146,-195,586,781),10432=>array(146,-195,586,-49),10433=>array(146,-195,586,781),10434=>array(146,-195,586,504),10435=>array(146,-195,586,781),10436=>array(146,-195,586,228),10437=>array(146,-195,586,781),10438=>array(146,-195,586,504),10439=>array(146,-195,586,781),10440=>array(146,-195,586,781),10441=>array(146,-195,586,781),10442=>array(146,-195,586,781),10443=>array(146,-195,586,781),10444=>array(146,-195,586,781),10445=>array(146,-195,586,781),10446=>array(146,-195,586,781),10447=>array(146,-195,586,781),10448=>array(146,-195,586,504),10449=>array(146,-195,586,781),10450=>array(146,-195,586,504),10451=>array(146,-195,586,781),10452=>array(146,-195,586,504),10453=>array(146,-195,586,781),10454=>array(146,-195,586,504),10455=>array(146,-195,586,781),10456=>array(146,-195,586,781),10457=>array(146,-195,586,781),10458=>array(146,-195,586,781),10459=>array(146,-195,586,781),10460=>array(146,-195,586,781),10461=>array(146,-195,586,781),10462=>array(146,-195,586,781),10463=>array(146,-195,586,781),10464=>array(146,-195,586,228),10465=>array(146,-195,586,781),10466=>array(146,-195,586,504),10467=>array(146,-195,586,781),10468=>array(146,-195,586,228),10469=>array(146,-195,586,781),10470=>array(146,-195,586,504),10471=>array(146,-195,586,781),10472=>array(146,-195,586,781),10473=>array(146,-195,586,781),10474=>array(146,-195,586,781),10475=>array(146,-195,586,781),10476=>array(146,-195,586,781),10477=>array(146,-195,586,781),10478=>array(146,-195,586,781),10479=>array(146,-195,586,781),10480=>array(146,-195,586,504),10481=>array(146,-195,586,781),10482=>array(146,-195,586,504),10483=>array(146,-195,586,781),10484=>array(146,-195,586,504),10485=>array(146,-195,586,781),10486=>array(146,-195,586,504),10487=>array(146,-195,586,781),10488=>array(146,-195,586,781),10489=>array(146,-195,586,781),10490=>array(146,-195,586,781),10491=>array(146,-195,586,781),10492=>array(146,-195,586,781),10493=>array(146,-195,586,781),10494=>array(146,-195,586,781),10495=>array(146,-195,586,781),10502=>array(49,100,781,527),10503=>array(57,100,789,527),10506=>array(125,0,713,732),10507=>array(125,-3,713,729),10560=>array(39,63,644,838),10561=>array(39,63,644,838),10627=>array(125,-163,609,760),10628=>array(125,-163,609,760),10702=>array(106,-226,732,747),10703=>array(106,15,894,612),10704=>array(106,15,894,612),10705=>array(106,-30,894,657),10706=>array(106,-30,894,657),10707=>array(106,-30,894,657),10708=>array(106,-30,894,657),10709=>array(106,-30,894,657),10731=>array(3,-233,491,807),10746=>array(106,0,732,627),10747=>array(106,0,732,627),10752=>array(28,-198,972,748),10753=>array(28,-198,972,748),10754=>array(28,-198,972,748),10764=>array(57,-212,1268,757),10765=>array(57,-212,464,757),10766=>array(57,-212,464,757),10767=>array(57,-212,464,757),10768=>array(57,-212,464,757),10769=>array(57,-212,522,757),10770=>array(57,-212,464,757),10771=>array(57,-212,464,757),10772=>array(57,-212,555,757),10773=>array(57,-212,464,757),10774=>array(57,-212,464,757),10775=>array(-32,-212,553,757),10776=>array(57,-212,464,757),10777=>array(57,-212,464,757),10778=>array(57,-212,464,757),10779=>array(57,-212,469,872),10780=>array(52,-327,464,757),10799=>array(137,31,701,596),10858=>array(106,228,732,552),10859=>array(106,78,732,552),10877=>array(106,-123,732,581),10878=>array(106,-123,732,581),10879=>array(106,-123,733,581),10880=>array(106,-123,732,581),10881=>array(106,-123,732,644),10882=>array(106,-123,732,644),10883=>array(106,-123,733,759),10884=>array(106,-123,732,756),10885=>array(106,-132,732,663),10886=>array(106,-132,732,663),10887=>array(106,-121,732,582),10888=>array(106,-121,732,582),10889=>array(106,-204,732,663),10890=>array(106,-204,732,663),10891=>array(106,-311,732,791),10892=>array(106,-311,732,791),10893=>array(106,-124,732,663),10894=>array(106,-124,732,663),10895=>array(106,-241,732,756),10896=>array(106,-241,732,756),10897=>array(106,-229,732,730),10898=>array(106,-229,732,730),10899=>array(106,-224,732,741),10900=>array(106,-224,732,741),10901=>array(106,-61,732,644),10902=>array(106,-61,732,644),10903=>array(106,-61,733,644),10904=>array(106,-61,732,644),10905=>array(106,-36,732,685),10906=>array(106,-36,732,685),10907=>array(106,-31,732,725),10908=>array(106,-31,732,725),10909=>array(106,8,732,645),10910=>array(106,23,732,645),10911=>array(106,-176,732,729),10912=>array(106,-176,732,729),10926=>array(106,50,732,601),10927=>array(106,-24,732,667),10928=>array(106,-24,732,667),10929=>array(106,-145,732,667),10930=>array(106,-145,732,667),10931=>array(106,-121,732,662),10932=>array(106,-121,732,662),10933=>array(106,-195,732,662),10934=>array(106,-195,732,662),10935=>array(106,-191,732,693),10936=>array(106,-191,732,693),10937=>array(106,-259,732,693),10938=>array(106,-259,732,693),11001=>array(106,-171,732,585),11002=>array(106,-171,732,585),11008=>array(88,-27,703,587),11009=>array(141,-27,755,587),11010=>array(88,25,703,640),11011=>array(141,25,755,640),11012=>array(27,65,789,562),11013=>array(27,65,781,562),11014=>array(171,0,667,754),11015=>array(171,-25,667,729),11016=>array(88,-27,703,587),11017=>array(141,-27,755,587),11018=>array(88,25,703,640),11019=>array(141,25,755,640),11020=>array(27,65,789,562),11021=>array(171,-25,667,754),11022=>array(57,-3,790,355),11023=>array(57,272,790,630),11024=>array(35,-3,768,355),11025=>array(35,272,768,630),11026=>array(91,-123,854,643),11027=>array(91,-123,854,643),11028=>array(91,-123,854,643),11029=>array(91,-123,854,643),11030=>array(3,-123,766,643),11031=>array(3,-123,766,643),11032=>array(3,-123,766,643),11033=>array(3,-123,766,643),11034=>array(91,-123,854,643),11039=>array(18,-26,852,767),11040=>array(18,-26,852,767),11041=>array(73,-91,800,748),11042=>array(73,-91,800,748),11043=>array(17,-35,856,692),11044=>array(55,-250,1064,770),11091=>array(38,-47,832,788),11092=>array(38,-47,832,788),11360=>array(5,0,552,729),11361=>array(5,0,271,760),11362=>array(-20,0,552,729),11363=>array(5,0,569,729),11364=>array(98,-200,666,729),11365=>array(35,-46,576,592),11366=>array(-12,-93,384,822),11367=>array(98,-157,752,729),11368=>array(91,-138,639,760),11369=>array(98,-157,677,729),11370=>array(91,-138,576,760),11371=>array(45,-157,738,729),11372=>array(43,-138,572,547),11373=>array(56,-14,683,743),11374=>array(98,-200,765,729),11375=>array(8,0,676,729),11376=>array(56,-14,683,743),11377=>array(30,0,734,560),11378=>array(33,0,1128,742),11379=>array(42,0,961,560),11380=>array(51,0,562,587),11381=>array(98,0,555,729),11382=>array(94,0,477,547),11383=>array(55,-12,602,551),11385=>array(0,-13,320,760),11386=>array(55,-14,557,560),11387=>array(48,0,400,547),11388=>array(-11,-117,116,425),11389=>array(5,326,426,734),11390=>array(66,-242,598,742),11391=>array(45,-242,640,729),11520=>array(60,-63,544,547),11521=>array(24,-235,556,546),11522=>array(39,-235,535,546),11523=>array(62,-10,572,807),11524=>array(51,-235,537,546),11525=>array(39,-236,862,546),11526=>array(0,-8,575,816),11527=>array(53,0,900,546),11528=>array(69,0,542,546),11529=>array(51,-235,556,816),11530=>array(39,0,903,546),11531=>array(53,-8,595,816),11532=>array(39,0,544,816),11533=>array(51,0,887,546),11534=>array(51,0,556,546),11535=>array(69,-235,767,816),11536=>array(51,0,880,816),11537=>array(51,0,545,816),11538=>array(50,-235,536,546),11539=>array(51,-235,884,661),11540=>array(60,-235,892,546),11541=>array(49,-235,784,816),11542=>array(39,0,545,546),11543=>array(51,-235,556,547),11544=>array(51,-235,551,546),11545=>array(39,-235,541,816),11546=>array(42,-235,532,547),11547=>array(60,-9,596,816),11548=>array(39,-235,870,547),11549=>array(29,-235,545,546),11550=>array(47,-235,547,546),11551=>array(34,-235,547,567),11552=>array(39,0,875,546),11553=>array(49,-235,544,816),11554=>array(60,0,538,626),11555=>array(61,-235,553,816),11556=>array(51,-235,603,546),11557=>array(60,-8,841,816),11568=>array(55,-14,591,380),11569=>array(56,-14,832,742),11570=>array(56,-14,832,742),11571=>array(31,0,651,729),11572=>array(33,0,652,729),11573=>array(31,0,604,729),11574=>array(73,0,488,729),11575=>array(8,0,676,729),11576=>array(8,0,676,729),11577=>array(98,0,568,729),11578=>array(64,0,534,729),11579=>array(73,-14,609,742),11580=>array(107,0,811,729),11581=>array(45,0,665,729),11582=>array(73,0,437,729),11583=>array(45,0,665,729),11584=>array(56,-14,832,742),11585=>array(56,-52,832,781),11586=>array(73,0,197,729),11587=>array(20,0,610,729),11588=>array(98,0,654,729),11589=>array(30,0,654,729),11590=>array(73,0,454,729),11591=>array(45,0,629,729),11592=>array(73,301,571,426),11593=>array(98,0,568,729),11594=>array(54,0,448,729),11595=>array(54,-15,899,742),11596=>array(54,0,725,729),11597=>array(98,0,650,729),11598=>array(100,0,566,729),11599=>array(98,0,197,729),11600=>array(54,0,725,729),11601=>array(98,0,198,729),11602=>array(78,-14,705,729),11603=>array(48,-14,584,742),11604=>array(56,-14,832,742),11605=>array(56,-54,832,742),11606=>array(98,0,654,729),11607=>array(98,0,222,729),11608=>array(73,0,676,729),11609=>array(56,-14,832,742),11610=>array(56,-14,832,780),11611=>array(56,-14,681,742),11612=>array(49,0,719,729),11613=>array(30,0,654,729),11614=>array(56,-14,681,742),11615=>array(98,0,568,729),11616=>array(8,0,676,729),11617=>array(98,0,654,729),11618=>array(98,0,559,729),11619=>array(56,0,732,729),11620=>array(98,0,495,729),11621=>array(56,0,732,729),11631=>array(26,522,489,729),11800=>array(70,-14,459,728),11806=>array(106,78,732,399),11810=>array(86,403,293,760),11811=>array(97,403,304,760),11812=>array(86,-132,293,225),11813=>array(97,-132,304,225),11822=>array(72,0,461,742),19904=>array(83,-158,813,729),19905=>array(83,-158,813,729),19906=>array(83,-158,813,729),19907=>array(83,-158,813,729),19908=>array(83,-158,813,729),19909=>array(83,-158,813,729),19910=>array(83,-158,813,729),19911=>array(83,-158,813,729),19912=>array(83,-158,813,729),19913=>array(83,-158,814,729),19914=>array(83,-158,813,729),19915=>array(83,-158,813,729),19916=>array(83,-158,813,729),19917=>array(83,-158,813,729),19918=>array(83,-158,813,729),19919=>array(83,-158,813,729),19920=>array(83,-158,814,729),19921=>array(83,-158,813,729),19922=>array(83,-158,814,729),19923=>array(83,-158,813,729),19924=>array(83,-158,813,729),19925=>array(83,-158,813,729),19926=>array(83,-158,813,729),19927=>array(83,-158,813,729),19928=>array(83,-158,813,729),19929=>array(83,-158,813,729),19930=>array(83,-158,813,729),19931=>array(83,-158,814,729),19932=>array(83,-158,813,729),19933=>array(83,-158,813,729),19934=>array(83,-158,814,729),19935=>array(83,-158,813,729),19936=>array(83,-158,813,729),19937=>array(83,-158,813,729),19938=>array(83,-158,813,729),19939=>array(83,-158,813,729),19940=>array(83,-158,813,729),19941=>array(83,-158,814,729),19942=>array(83,-158,813,729),19943=>array(83,-158,813,729),19944=>array(83,-158,814,729),19945=>array(83,-158,813,729),19946=>array(83,-158,814,729),19947=>array(83,-158,813,729),19948=>array(83,-158,814,729),19949=>array(83,-158,813,729),19950=>array(83,-158,814,729),19951=>array(83,-158,813,729),19952=>array(83,-158,814,729),19953=>array(83,-158,813,729),19954=>array(83,-158,813,729),19955=>array(83,-158,813,729),19956=>array(83,-158,813,729),19957=>array(83,-158,814,729),19958=>array(83,-158,813,729),19959=>array(83,-158,813,729),19960=>array(83,-158,813,729),19961=>array(83,-158,814,729),19962=>array(83,-158,813,729),19963=>array(83,-158,814,729),19964=>array(83,-158,814,729),19965=>array(83,-158,813,729),19966=>array(83,-158,813,729),19967=>array(83,-158,813,729),42192=>array(98,0,615,729),42193=>array(98,0,569,729),42194=>array(34,0,505,729),42195=>array(98,0,711,729),42196=>array(-3,0,614,729),42197=>array(-3,0,614,729),42198=>array(56,-14,693,742),42199=>array(98,0,677,729),42200=>array(-21,0,558,729),42201=>array(0,-14,414,729),42202=>array(56,-14,644,742),42203=>array(56,-14,644,742),42204=>array(45,0,640,729),42205=>array(98,0,517,729),42206=>array(98,0,517,729),42207=>array(98,0,765,729),42208=>array(98,0,650,729),42209=>array(98,0,552,729),42210=>array(66,-14,579,742),42211=>array(98,0,666,729),42212=>array(29,0,597,729),42213=>array(8,0,676,729),42214=>array(8,0,676,729),42215=>array(98,0,654,729),42216=>array(80,-14,716,742),42217=>array(98,0,512,743),42218=>array(33,0,956,729),42219=>array(30,0,654,729),42220=>array(-2,0,613,729),42221=>array(71,0,588,729),42222=>array(8,0,676,729),42223=>array(8,0,676,729),42224=>array(98,0,568,729),42225=>array(64,0,534,729),42226=>array(98,0,197,729),42227=>array(56,-14,731,742),42228=>array(87,-14,645,729),42229=>array(87,0,645,743),42230=>array(4,0,458,729),42231=>array(56,0,669,729),42232=>array(85,0,214,155),42233=>array(71,-156,214,155),42234=>array(85,0,511,155),42235=>array(85,-156,511,155),42236=>array(71,-156,214,517),42237=>array(85,0,214,517),42238=>array(85,0,502,354),42239=>array(85,172,502,454),42564=>array(56,-14,569,742),42565=>array(49,-14,467,560),42566=>array(98,0,347,729),42567=>array(81,0,304,547),42572=>array(58,-14,1122,645),42573=>array(74,-14,954,471),42576=>array(29,0,931,729),42577=>array(30,0,817,560),42580=>array(56,-14,977,742),42581=>array(55,-14,748,560),42582=>array(103,0,968,729),42583=>array(94,-14,752,560),42594=>array(49,-157,1004,729),42595=>array(52,-138,863,547),42596=>array(41,0,1008,729),42597=>array(37,0,852,547),42598=>array(98,0,1120,729),42599=>array(91,0,959,547),42600=>array(56,-14,731,742),42601=>array(55,-14,557,560),42602=>array(56,-14,799,742),42603=>array(55,-14,658,560),42604=>array(56,-14,1302,742),42605=>array(55,-14,964,560),42606=>array(28,-208,851,743),42634=>array(-3,-200,758,729),42635=>array(29,-208,660,547),42636=>array(-3,0,614,729),42637=>array(29,0,553,547),42644=>array(85,0,587,729),42645=>array(91,0,549,760),42760=>array(104,0,389,668),42761=>array(104,0,389,668),42762=>array(104,0,389,668),42763=>array(104,0,389,668),42764=>array(104,0,389,668),42765=>array(104,0,389,668),42766=>array(104,0,389,668),42767=>array(104,0,389,668),42768=>array(104,0,389,668),42769=>array(104,0,389,668),42770=>array(104,0,389,668),42771=>array(104,0,389,668),42772=>array(104,0,389,668),42773=>array(104,0,389,668),42774=>array(104,0,389,668),42779=>array(50,326,319,736),42780=>array(50,324,319,734),42781=>array(95,326,158,734),42782=>array(95,326,158,734),42783=>array(95,0,158,408),42786=>array(67,0,350,729),42787=>array(67,0,321,547),42788=>array(56,224,411,742),42789=>array(56,42,411,560),42790=>array(98,-200,654,729),42791=>array(91,-208,549,760),42792=>array(-3,-213,819,729),42793=>array(27,-213,650,702),42794=>array(80,-14,560,742),42795=>array(65,-200,473,561),42800=>array(91,0,437,547),42801=>array(54,-14,472,560),42802=>array(8,0,1241,729),42803=>array(60,-14,894,560),42804=>array(8,-14,1147,742),42805=>array(60,-14,935,560),42806=>array(8,-14,1055,729),42807=>array(60,-14,890,560),42808=>array(8,0,963,729),42809=>array(60,-14,788,560),42810=>array(8,0,963,729),42811=>array(60,-14,788,560),42812=>array(8,-208,951,729),42813=>array(60,-208,788,560),42814=>array(56,-14,644,742),42815=>array(62,-14,495,560),42816=>array(5,0,677,729),42817=>array(7,0,580,760),42822=>array(98,0,675,729),42823=>array(94,0,298,760),42824=>array(41,0,576,729),42825=>array(59,0,368,760),42826=>array(5,-14,802,742),42827=>array(5,-14,694,560),42830=>array(56,-14,1302,742),42831=>array(55,-14,964,560),42832=>array(5,0,569,729),42833=>array(-2,-208,580,560),42834=>array(24,0,700,729),42835=>array(24,-208,720,560),42838=>array(56,-178,731,742),42839=>array(55,-208,637,560),42852=>array(5,0,569,729),42853=>array(-2,-208,580,760),42854=>array(5,0,569,729),42855=>array(-2,-208,580,760),42880=>array(5,0,459,729),42881=>array(94,-208,184,560),42882=>array(98,-208,637,742),42883=>array(91,-208,549,560),42889=>array(117,0,220,517),42890=>array(78,161,298,380),42891=>array(151,235,250,729),42892=>array(96,458,179,729),42893=>array(85,0,587,729),42894=>array(38,-208,416,760),42896=>array(98,-157,733,729),42897=>array(91,-138,621,560),42912=>array(2,-14,778,742),42913=>array(2,-208,633,560),42914=>array(2,0,677,729),42915=>array(2,0,577,760),42916=>array(2,0,746,729),42917=>array(2,0,633,560),42918=>array(2,0,693,729),42919=>array(2,0,411,560),42920=>array(2,-14,633,742),42921=>array(2,-14,519,560),42922=>array(-51,0,703,729),43002=>array(91,0,824,547),43003=>array(58,0,477,729),43004=>array(34,0,505,729),43005=>array(98,0,765,729),43006=>array(98,0,197,928),43007=>array(33,0,1167,729),61184=>array(95,602,323,668),61185=>array(69,451,342,668),61186=>array(54,301,361,668),61187=>array(47,150,368,668),61188=>array(44,0,372,668),61189=>array(69,451,342,668),61190=>array(95,451,323,518),61191=>array(69,301,342,518),61192=>array(54,150,361,518),61193=>array(47,0,368,518),61194=>array(54,301,361,668),61195=>array(69,301,342,518),61196=>array(95,301,323,367),61197=>array(69,150,342,367),61198=>array(54,0,361,367),61199=>array(47,150,368,668),61200=>array(54,150,361,518),61201=>array(69,150,342,367),61202=>array(95,150,323,217),61203=>array(69,0,342,217),61204=>array(44,0,372,668),61205=>array(47,0,368,518),61206=>array(54,0,361,367),61207=>array(69,0,342,217),61208=>array(95,0,323,66),61209=>array(104,0,171,668),61440=>array(73,0,903,732),61441=>array(73,0,903,732),61442=>array(73,0,903,732),61443=>array(73,0,903,732),62464=>array(54,-15,526,828),62465=>array(54,-15,526,828),62466=>array(54,-15,570,837),62467=>array(54,0,835,837),62468=>array(54,-15,526,837),62469=>array(54,-15,526,837),62470=>array(54,-15,599,837),62471=>array(54,-15,828,837),62472=>array(54,0,501,837),62473=>array(54,-15,526,828),62474=>array(54,0,1115,837),62475=>array(54,-15,525,837),62476=>array(63,-15,536,828),62477=>array(54,0,815,837),62478=>array(54,-15,526,828),62479=>array(54,-15,526,844),62480=>array(54,0,860,837),62481=>array(63,-15,536,828),62482=>array(54,-15,677,837),62483=>array(24,-15,519,837),62484=>array(54,-15,818,837),62485=>array(54,-15,526,828),62486=>array(54,-15,841,837),62487=>array(54,-15,525,829),62488=>array(54,-15,525,837),62489=>array(64,0,536,837),62490=>array(55,-15,595,828),62491=>array(54,-15,525,828),62492=>array(64,-15,536,837),62493=>array(54,-15,545,828),62494=>array(63,-15,536,828),62495=>array(24,-15,492,837),62496=>array(54,-15,526,837),62497=>array(59,-15,530,837),62498=>array(54,-79,526,837),62499=>array(54,-15,525,838),62500=>array(54,-15,532,838),62501=>array(54,-15,594,837),62502=>array(54,-15,901,838),62504=>array(60,-235,872,816),62505=>array(49,-230,759,853),62506=>array(49,-15,459,765),62507=>array(49,-15,459,777),62508=>array(49,-15,459,875),62509=>array(49,-15,459,818),62510=>array(49,-15,459,887),62511=>array(49,-15,459,809),62512=>array(49,-236,449,765),62513=>array(49,-236,449,799),62514=>array(49,-236,449,901),62515=>array(49,-236,449,809),62516=>array(49,0,469,765),62517=>array(49,0,469,799),62518=>array(49,0,469,809),62519=>array(49,-0,737,765),62520=>array(49,-0,737,777),62521=>array(49,-0,737,895),62522=>array(49,-0,737,799),62523=>array(49,-0,737,809),62524=>array(29,-236,488,765),62525=>array(29,-236,488,777),62526=>array(29,-236,488,904),62527=>array(29,-236,488,799),62528=>array(29,-236,488,809),62529=>array(29,-236,488,852),63173=>array(55,-14,557,760),64256=>array(23,0,708,760),64257=>array(23,0,536,760),64258=>array(23,0,536,760),64259=>array(23,0,873,760),64260=>array(23,0,873,760),64261=>array(23,0,662,760),64262=>array(54,-14,837,742),64275=>array(83,-14,1111,760),64276=>array(85,-14,1111,760),64277=>array(85,-208,1111,760),64278=>array(85,-208,1111,760),64279=>array(85,-208,1451,760),64285=>array(66,44,157,547),64286=>array(167,625,473,765),64287=>array(36,44,329,547),64288=>array(38,0,562,547),64289=>array(85,0,772,547),64290=>array(43,0,717,547),64291=>array(91,0,764,547),64292=>array(43,0,716,547),64293=>array(43,0,716,760),64294=>array(91,0,764,547),64295=>array(43,0,716,547),64296=>array(47,-4,716,547),64297=>array(106,272,732,627),64298=>array(43,0,666,698),64299=>array(38,0,666,698),64300=>array(43,0,666,698),64301=>array(43,0,666,698),64302=>array(91,-159,578,547),64303=>array(91,-193,578,547),64304=>array(91,-159,578,547),64305=>array(43,0,535,547),64306=>array(43,-5,383,547),64307=>array(43,0,511,547),64308=>array(91,0,563,547),64309=>array(43,0,265,547),64310=>array(43,0,363,547),64312=>array(90,-14,593,552),64313=>array(43,204,264,547),64314=>array(43,-208,446,547),64315=>array(43,0,474,547),64316=>array(43,0,492,729),64318=>array(43,0,588,555),64320=>array(43,0,309,547),64321=>array(90,-14,593,547),64323=>array(91,-208,549,547),64324=>array(91,0,569,547),64326=>array(43,0,502,547),64327=>array(91,-208,633,546),64328=>array(43,0,474,547),64329=>array(43,0,666,547),64330=>array(10,-4,566,547),64331=>array(91,0,182,698),64332=>array(43,0,535,698),64333=>array(43,0,474,698),64334=>array(91,0,569,698),64335=>array(43,0,571,760),64338=>array(63,-244,865,327),64339=>array(63,-244,992,327),64340=>array(-10,-244,191,293),64341=>array(-10,-244,312,293),64342=>array(63,-244,865,327),64343=>array(63,-244,992,327),64344=>array(-10,-244,244,293),64345=>array(-10,-244,312,293),64346=>array(63,-244,865,327),64347=>array(63,-244,992,327),64348=>array(-10,-244,244,293),64349=>array(-10,-244,312,293),64350=>array(63,-10,865,513),64351=>array(63,-10,992,513),64352=>array(-10,0,191,610),64353=>array(-10,0,312,610),64354=>array(63,-10,865,513),64355=>array(63,-10,992,513),64356=>array(-10,0,244,610),64357=>array(-10,0,312,610),64358=>array(63,-10,865,575),64359=>array(63,-10,992,575),64360=>array(-10,0,273,672),64361=>array(-10,0,312,672),64362=>array(63,-45,952,757),64363=>array(63,-44,1045,659),64364=>array(-10,0,406,757),64365=>array(-10,0,516,684),64366=>array(63,-45,952,757),64367=>array(63,-44,1045,659),64368=>array(-10,0,406,757),64369=>array(-10,0,516,684),64370=>array(77,-244,645,425),64371=>array(77,-244,655,425),64372=>array(-10,-220,545,398),64373=>array(-10,-220,655,398),64374=>array(77,-244,645,425),64375=>array(77,-244,655,425),64376=>array(-10,-98,545,398),64377=>array(-10,-98,655,398),64378=>array(77,-244,645,425),64379=>array(77,-244,655,425),64380=>array(-10,-220,545,398),64381=>array(-10,-220,655,398),64382=>array(77,-244,645,425),64383=>array(77,-244,655,425),64384=>array(-10,-220,545,398),64385=>array(-10,-220,655,398),64386=>array(61,-146,388,415),64387=>array(61,-146,535,415),64388=>array(61,-19,388,586),64389=>array(61,-19,535,586),64390=>array(61,-19,388,708),64391=>array(61,-19,535,708),64392=>array(61,-19,388,746),64393=>array(61,-19,535,746),64394=>array(-42,-244,439,586),64395=>array(-42,-244,562,586),64396=>array(-42,-244,469,648),64397=>array(-42,-244,562,648),64398=>array(63,-43,895,760),64399=>array(63,-43,981,760),64400=>array(-10,0,476,760),64401=>array(-10,0,562,760),64402=>array(63,-43,895,896),64403=>array(63,-43,981,896),64404=>array(-10,0,476,896),64405=>array(-10,0,562,896),64406=>array(63,-293,895,896),64407=>array(63,-293,981,896),64408=>array(-10,-269,476,896),64409=>array(-10,-269,562,896),64410=>array(63,-43,895,903),64411=>array(63,-43,981,903),64412=>array(-10,0,476,903),64413=>array(-10,0,562,903),64414=>array(72,-162,660,366),64415=>array(72,-244,771,284),64416=>array(72,-162,660,636),64417=>array(72,-244,771,514),64418=>array(-10,0,273,672),64419=>array(-10,0,312,672),64426=>array(70,-33,638,487),64427=>array(70,-244,642,333),64428=>array(-10,-33,467,487),64429=>array(-10,-244,471,333),64467=>array(70,-27,722,854),64468=>array(70,-27,853,854),64469=>array(-10,0,476,928),64470=>array(-10,0,562,928),64473=>array(-42,-244,406,556),64474=>array(-42,-244,526,556),64488=>array(-10,0,191,293),64489=>array(-10,0,312,293),64508=>array(63,-131,719,411),64509=>array(63,-133,843,251),64510=>array(-10,-146,244,293),64511=>array(-10,-146,312,293),65056=>array(-445,752,0,929),65057=>array(0,752,445,929),65058=>array(-354,756,0,894),65059=>array(0,756,354,894),65136=>array(4,591,289,825),65137=>array(-10,0,303,825),65138=>array(4,591,289,874),65139=>array(51,0,271,177),65140=>array(4,-239,289,-5),65142=>array(4,591,289,708),65143=>array(-10,0,303,708),65144=>array(4,590,289,874),65145=>array(-10,0,303,874),65146=>array(4,-137,289,-20),65147=>array(-10,-137,303,90),65148=>array(-6,599,299,869),65149=>array(-10,0,303,869),65150=>array(12,610,279,878),65151=>array(-10,0,303,878),65152=>array(80,42,390,483),65153=>array(-37,0,315,939),65154=>array(-37,0,315,939),65155=>array(53,0,220,1028),65156=>array(53,0,314,1028),65157=>array(-42,-244,406,588),65158=>array(-42,-244,526,588),65159=>array(53,-244,220,760),65160=>array(53,-244,314,760),65161=>array(63,-131,719,588),65162=>array(63,-133,843,466),65163=>array(-10,0,227,613),65164=>array(-10,0,312,613),65165=>array(94,0,184,760),65166=>array(94,0,314,760),65167=>array(63,-171,865,327),65168=>array(63,-171,992,327),65169=>array(-10,-146,191,293),65170=>array(-10,-146,312,293),65171=>array(68,-28,453,513),65172=>array(71,0,546,513),65173=>array(63,-10,865,391),65174=>array(63,-10,992,391),65175=>array(-10,0,244,488),65176=>array(-10,0,312,488),65177=>array(63,-10,865,513),65178=>array(63,-10,992,513),65179=>array(-10,0,244,610),65180=>array(-10,0,312,610),65181=>array(77,-244,645,425),65182=>array(77,-244,655,425),65183=>array(-10,-146,545,398),65184=>array(-10,-146,655,398),65185=>array(77,-244,645,425),65186=>array(77,-244,655,425),65187=>array(-10,0,545,398),65188=>array(-10,0,655,398),65189=>array(77,-244,645,586),65190=>array(77,-244,655,586),65191=>array(-10,0,545,537),65192=>array(-10,0,655,537),65193=>array(61,-19,388,415),65194=>array(61,-19,535,415),65195=>array(61,-19,388,586),65196=>array(61,-19,535,586),65197=>array(-42,-244,423,269),65198=>array(-42,-244,562,269),65199=>array(-42,-244,423,464),65200=>array(-42,-244,562,464),65201=>array(63,-244,1138,366),65202=>array(63,-244,1285,366),65203=>array(-10,-14,755,366),65204=>array(-10,-14,902,366),65205=>array(63,-244,1138,586),65206=>array(63,-244,1285,586),65207=>array(-10,-14,755,586),65208=>array(-10,-14,902,586),65209=>array(63,-244,1134,362),65210=>array(63,-244,1235,362),65211=>array(-10,0,774,362),65212=>array(-10,0,877,362),65213=>array(63,-244,1134,464),65214=>array(63,-244,1235,464),65215=>array(-10,0,774,464),65216=>array(-10,0,877,464),65217=>array(70,0,857,760),65218=>array(70,0,959,760),65219=>array(-10,0,729,760),65220=>array(-10,0,830,760),65221=>array(70,0,857,760),65222=>array(70,0,959,760),65223=>array(-10,0,729,760),65224=>array(-10,0,830,760),65225=>array(57,-244,587,521),65226=>array(57,-244,587,382),65227=>array(-10,0,496,521),65228=>array(-10,0,492,382),65229=>array(57,-244,587,659),65230=>array(57,-244,587,537),65231=>array(-10,0,496,659),65232=>array(-10,0,492,537),65233=>array(63,-45,952,635),65234=>array(63,-44,1045,537),65235=>array(-10,0,406,635),65236=>array(-10,0,516,562),65237=>array(52,-215,701,635),65238=>array(52,-244,844,500),65239=>array(-10,0,406,635),65240=>array(-10,0,516,562),65241=>array(70,-27,722,760),65242=>array(70,-27,853,760),65243=>array(-10,0,476,760),65244=>array(-10,0,562,760),65245=>array(70,-152,637,760),65246=>array(70,-152,767,760),65247=>array(-10,0,210,760),65248=>array(-10,0,341,760),65249=>array(68,-240,546,369),65250=>array(68,-240,675,307),65251=>array(-10,-25,456,303),65252=>array(-10,-24,588,303),65253=>array(72,-162,660,464),65254=>array(72,-244,771,342),65255=>array(-10,0,191,488),65256=>array(-10,0,312,488),65257=>array(68,-28,453,358),65258=>array(71,0,546,366),65259=>array(-10,-33,467,487),65260=>array(-10,-244,471,333),65261=>array(-42,-244,406,315),65262=>array(-42,-244,526,315),65263=>array(63,-131,719,411),65264=>array(63,-133,843,251),65265=>array(63,-244,719,411),65266=>array(63,-244,843,251),65267=>array(-10,-146,244,293),65268=>array(-10,-146,312,293),65269=>array(-103,-10,468,866),65270=>array(-103,-10,606,866),65271=>array(-13,-10,468,955),65272=>array(-13,-10,606,955),65273=>array(11,-244,468,760),65274=>array(11,-244,606,760),65275=>array(41,-10,468,760),65276=>array(41,-10,606,760),65533=>array(15,-84,1011,912),65535=>array(50,-177,550,705));
-$cw=array(0=>600,32=>318,33=>401,34=>460,35=>838,36=>636,37=>950,38=>780,39=>275,40=>390,41=>390,42=>500,43=>838,44=>318,45=>361,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=>531,64=>1000,65=>684,66=>686,67=>698,68=>770,69=>632,70=>575,71=>775,72=>752,73=>295,74=>295,75=>656,76=>557,77=>863,78=>748,79=>787,80=>603,81=>787,82=>695,83=>635,84=>611,85=>732,86=>684,87=>989,88=>685,89=>611,90=>685,91=>390,92=>337,93=>390,94=>838,95=>500,96=>500,97=>613,98=>635,99=>550,100=>635,101=>615,102=>352,103=>635,104=>634,105=>278,106=>278,107=>579,108=>278,109=>974,110=>634,111=>612,112=>635,113=>635,114=>411,115=>521,116=>392,117=>634,118=>592,119=>818,120=>592,121=>592,122=>525,123=>636,124=>337,125=>636,126=>838,160=>318,161=>401,162=>636,163=>636,164=>636,165=>636,166=>337,167=>500,168=>500,169=>1000,170=>471,171=>612,172=>838,173=>361,174=>1000,175=>500,176=>500,177=>838,178=>401,179=>401,180=>500,181=>636,182=>636,183=>318,184=>500,185=>401,186=>471,187=>612,188=>969,189=>969,190=>969,191=>531,192=>684,193=>684,194=>684,195=>684,196=>684,197=>684,198=>974,199=>698,200=>632,201=>632,202=>632,203=>632,204=>295,205=>295,206=>295,207=>295,208=>775,209=>748,210=>787,211=>787,212=>787,213=>787,214=>787,215=>838,216=>787,217=>732,218=>732,219=>732,220=>732,221=>611,222=>605,223=>630,224=>613,225=>613,226=>613,227=>613,228=>613,229=>613,230=>982,231=>550,232=>615,233=>615,234=>615,235=>615,236=>278,237=>278,238=>278,239=>278,240=>612,241=>634,242=>612,243=>612,244=>612,245=>612,246=>612,247=>838,248=>612,249=>634,250=>634,251=>634,252=>634,253=>592,254=>635,255=>592,256=>684,257=>613,258=>684,259=>613,260=>684,261=>613,262=>698,263=>550,264=>698,265=>550,266=>698,267=>550,268=>698,269=>550,270=>770,271=>635,272=>775,273=>635,274=>632,275=>615,276=>632,277=>615,278=>632,279=>615,280=>632,281=>615,282=>632,283=>615,284=>775,285=>635,286=>775,287=>635,288=>775,289=>635,290=>775,291=>635,292=>752,293=>634,294=>916,295=>695,296=>295,297=>278,298=>295,299=>278,300=>295,301=>278,302=>295,303=>278,304=>295,305=>278,306=>590,307=>556,308=>295,309=>278,310=>656,311=>579,312=>579,313=>557,314=>278,315=>557,316=>278,317=>557,318=>375,319=>557,320=>342,321=>562,322=>284,323=>748,324=>634,325=>748,326=>634,327=>748,328=>634,329=>813,330=>748,331=>634,332=>787,333=>612,334=>787,335=>612,336=>787,337=>612,338=>1070,339=>1023,340=>695,341=>411,342=>695,343=>411,344=>695,345=>411,346=>635,347=>521,348=>635,349=>521,350=>635,351=>521,352=>635,353=>521,354=>611,355=>392,356=>611,357=>392,358=>611,359=>392,360=>732,361=>634,362=>732,363=>634,364=>732,365=>634,366=>732,367=>634,368=>732,369=>634,370=>732,371=>634,372=>989,373=>818,374=>611,375=>592,376=>611,377=>685,378=>525,379=>685,380=>525,381=>685,382=>525,383=>352,384=>635,385=>735,386=>686,387=>635,388=>686,389=>635,390=>703,391=>698,392=>550,393=>775,394=>819,395=>686,396=>635,397=>612,398=>632,399=>787,400=>614,401=>575,402=>352,403=>775,404=>687,405=>984,406=>354,407=>295,408=>746,409=>579,410=>278,411=>592,412=>974,413=>748,414=>634,415=>787,416=>913,417=>612,418=>949,419=>759,420=>652,421=>635,422=>695,423=>635,424=>521,425=>632,426=>336,427=>392,428=>611,429=>392,430=>611,431=>858,432=>634,433=>764,434=>721,435=>744,436=>730,437=>685,438=>525,439=>666,440=>666,441=>578,442=>525,443=>636,444=>666,445=>578,446=>510,447=>635,448=>295,449=>492,450=>459,451=>295,452=>1422,453=>1299,454=>1154,455=>835,456=>787,457=>457,458=>931,459=>924,460=>797,461=>684,462=>613,463=>295,464=>278,465=>787,466=>612,467=>732,468=>634,469=>732,470=>634,471=>732,472=>634,473=>732,474=>634,475=>732,476=>634,477=>615,478=>684,479=>613,480=>684,481=>613,482=>974,483=>982,484=>775,485=>635,486=>775,487=>635,488=>656,489=>579,490=>787,491=>612,492=>787,493=>612,494=>666,495=>578,496=>278,497=>1422,498=>1299,499=>1154,500=>775,501=>635,502=>1113,503=>682,504=>748,505=>634,506=>684,507=>613,508=>974,509=>982,510=>787,511=>612,512=>684,513=>613,514=>684,515=>613,516=>632,517=>615,518=>632,519=>615,520=>295,521=>278,522=>295,523=>278,524=>787,525=>612,526=>787,527=>612,528=>695,529=>411,530=>695,531=>411,532=>732,533=>634,534=>732,535=>634,536=>635,537=>521,538=>611,539=>392,540=>627,541=>521,542=>752,543=>634,544=>735,545=>838,546=>698,547=>610,548=>685,549=>525,550=>684,551=>613,552=>632,553=>615,554=>787,555=>612,556=>787,557=>612,558=>787,559=>612,560=>787,561=>612,562=>611,563=>592,564=>475,565=>843,566=>477,567=>278,568=>998,569=>998,570=>684,571=>698,572=>550,573=>557,574=>611,575=>521,576=>525,577=>603,578=>479,579=>686,580=>732,581=>684,582=>632,583=>615,584=>295,585=>278,586=>781,587=>635,588=>695,589=>411,590=>611,591=>592,592=>600,593=>635,594=>635,595=>635,596=>549,597=>550,598=>635,599=>696,600=>615,601=>615,602=>819,603=>541,604=>532,605=>775,606=>664,607=>278,608=>696,609=>635,610=>629,611=>596,612=>596,613=>634,614=>634,615=>634,616=>278,617=>338,618=>372,619=>396,620=>487,621=>278,622=>706,623=>974,624=>974,625=>974,626=>646,627=>642,628=>634,629=>612,630=>858,631=>728,632=>660,633=>414,634=>414,635=>414,636=>411,637=>411,638=>530,639=>530,640=>604,641=>604,642=>521,643=>336,644=>336,645=>461,646=>336,647=>392,648=>392,649=>634,650=>618,651=>598,652=>592,653=>818,654=>592,655=>611,656=>525,657=>525,658=>578,659=>578,660=>510,661=>510,662=>510,663=>510,664=>787,665=>580,666=>664,667=>708,668=>654,669=>292,670=>667,671=>507,672=>727,673=>510,674=>510,675=>1014,676=>1058,677=>1013,678=>830,679=>610,680=>778,681=>848,682=>706,683=>654,684=>515,685=>515,686=>661,687=>664,688=>404,689=>399,690=>175,691=>259,692=>295,693=>296,694=>379,695=>515,696=>373,697=>278,698=>460,699=>318,700=>318,701=>318,702=>307,703=>307,704=>370,705=>370,706=>500,707=>500,708=>500,709=>500,710=>500,711=>500,712=>275,713=>500,714=>500,715=>500,716=>275,717=>500,718=>500,719=>500,720=>337,721=>337,722=>307,723=>307,724=>500,725=>500,726=>390,727=>317,728=>500,729=>500,730=>500,731=>500,732=>500,733=>500,734=>315,735=>500,736=>426,737=>166,738=>373,739=>444,740=>370,741=>493,742=>493,743=>493,744=>493,745=>493,748=>500,749=>500,750=>518,755=>500,759=>500,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,832=>0,833=>0,834=>0,835=>0,836=>0,837=>0,838=>0,839=>0,840=>0,841=>0,842=>0,843=>0,844=>0,845=>0,846=>0,847=>0,849=>0,850=>0,851=>0,855=>0,856=>0,858=>0,860=>0,861=>0,862=>0,863=>0,864=>0,865=>0,866=>0,880=>654,881=>568,882=>862,883=>647,884=>278,885=>278,886=>748,887=>650,890=>500,891=>549,892=>550,893=>549,894=>337,900=>500,901=>500,902=>692,903=>318,904=>746,905=>871,906=>408,908=>813,910=>825,911=>826,912=>338,913=>684,914=>686,915=>557,916=>684,917=>632,918=>685,919=>752,920=>787,921=>295,922=>656,923=>684,924=>863,925=>748,926=>632,927=>787,928=>752,929=>603,931=>632,932=>611,933=>611,934=>787,935=>685,936=>787,937=>764,938=>295,939=>611,940=>659,941=>541,942=>634,943=>338,944=>579,945=>659,946=>638,947=>592,948=>612,949=>541,950=>544,951=>634,952=>612,953=>338,954=>589,955=>592,956=>636,957=>559,958=>558,959=>612,960=>602,961=>635,962=>587,963=>634,964=>602,965=>579,966=>660,967=>578,968=>660,969=>837,970=>338,971=>579,972=>612,973=>579,974=>837,975=>656,976=>614,977=>619,978=>699,979=>842,980=>699,981=>660,982=>837,983=>664,984=>787,985=>612,986=>648,987=>587,988=>575,989=>458,990=>660,991=>660,992=>865,993=>627,994=>934,995=>837,996=>758,997=>659,998=>792,999=>615,1000=>687,1001=>607,1002=>768,1003=>625,1004=>699,1005=>612,1006=>611,1007=>536,1008=>664,1009=>635,1010=>550,1011=>278,1012=>787,1013=>615,1014=>615,1015=>605,1016=>635,1017=>698,1018=>863,1019=>651,1020=>635,1021=>703,1022=>698,1023=>703,1024=>632,1025=>632,1026=>786,1027=>610,1028=>698,1029=>635,1030=>295,1031=>295,1032=>295,1033=>1094,1034=>1045,1035=>786,1036=>710,1037=>748,1038=>609,1039=>752,1040=>684,1041=>686,1042=>686,1043=>610,1044=>781,1045=>632,1046=>1077,1047=>641,1048=>748,1049=>748,1050=>710,1051=>752,1052=>863,1053=>752,1054=>787,1055=>752,1056=>603,1057=>698,1058=>611,1059=>609,1060=>861,1061=>685,1062=>776,1063=>686,1064=>1069,1065=>1094,1066=>833,1067=>882,1068=>686,1069=>698,1070=>1080,1071=>695,1072=>613,1073=>617,1074=>589,1075=>525,1076=>691,1077=>615,1078=>901,1079=>532,1080=>650,1081=>650,1082=>604,1083=>639,1084=>754,1085=>654,1086=>612,1087=>654,1088=>635,1089=>550,1090=>583,1091=>592,1092=>855,1093=>592,1094=>681,1095=>591,1096=>915,1097=>942,1098=>707,1099=>790,1100=>589,1101=>549,1102=>842,1103=>602,1104=>615,1105=>615,1106=>625,1107=>525,1108=>549,1109=>521,1110=>278,1111=>278,1112=>278,1113=>902,1114=>898,1115=>652,1116=>604,1117=>650,1118=>592,1119=>654,1120=>934,1121=>837,1122=>771,1123=>672,1124=>942,1125=>749,1126=>879,1127=>783,1128=>1160,1129=>1001,1130=>787,1131=>612,1132=>1027,1133=>824,1134=>636,1135=>541,1136=>856,1137=>876,1138=>787,1139=>612,1140=>781,1141=>665,1142=>781,1143=>665,1144=>992,1145=>904,1146=>953,1147=>758,1148=>1180,1149=>1028,1150=>934,1151=>837,1152=>698,1153=>550,1154=>502,1155=>0,1156=>0,1157=>0,1158=>0,1159=>0,1160=>418,1161=>418,1162=>772,1163=>677,1164=>686,1165=>589,1166=>603,1167=>635,1168=>610,1169=>525,1170=>675,1171=>590,1172=>624,1173=>530,1174=>1077,1175=>901,1176=>641,1177=>532,1178=>710,1179=>604,1180=>710,1181=>604,1182=>710,1183=>604,1184=>856,1185=>832,1186=>752,1187=>661,1188=>1014,1189=>877,1190=>1081,1191=>916,1192=>878,1193=>693,1194=>698,1195=>550,1196=>611,1197=>583,1198=>611,1199=>592,1200=>611,1201=>592,1202=>685,1203=>592,1204=>934,1205=>807,1206=>686,1207=>591,1208=>686,1209=>591,1210=>686,1211=>634,1212=>941,1213=>728,1214=>941,1215=>728,1216=>295,1217=>1077,1218=>901,1219=>656,1220=>604,1221=>776,1222=>670,1223=>752,1224=>661,1225=>776,1226=>681,1227=>686,1228=>591,1229=>888,1230=>774,1231=>278,1232=>684,1233=>613,1234=>684,1235=>613,1236=>974,1237=>982,1238=>632,1239=>615,1240=>787,1241=>615,1242=>787,1243=>615,1244=>1077,1245=>901,1246=>641,1247=>532,1248=>666,1249=>578,1250=>748,1251=>650,1252=>748,1253=>650,1254=>787,1255=>612,1256=>787,1257=>612,1258=>787,1259=>612,1260=>698,1261=>549,1262=>609,1263=>592,1264=>609,1265=>592,1266=>609,1267=>592,1268=>686,1269=>591,1270=>610,1271=>525,1272=>882,1273=>790,1274=>675,1275=>590,1276=>685,1277=>592,1278=>685,1279=>592,1280=>686,1281=>589,1282=>1006,1283=>897,1284=>975,1285=>869,1286=>679,1287=>588,1288=>1072,1289=>957,1290=>1113,1291=>967,1292=>775,1293=>660,1294=>773,1295=>711,1296=>614,1297=>541,1298=>752,1299=>639,1300=>1169,1301=>994,1302=>894,1303=>864,1304=>1032,1305=>986,1306=>787,1307=>635,1308=>989,1309=>818,1310=>710,1311=>604,1312=>1081,1313=>905,1314=>1081,1315=>912,1316=>793,1317=>683,1329=>766,1330=>732,1331=>753,1332=>753,1333=>732,1334=>772,1335=>640,1336=>732,1337=>859,1338=>753,1339=>691,1340=>533,1341=>922,1342=>863,1343=>732,1344=>716,1345=>766,1346=>753,1347=>767,1348=>792,1349=>728,1350=>729,1351=>757,1352=>732,1353=>713,1354=>800,1355=>768,1356=>792,1357=>732,1358=>753,1359=>705,1360=>694,1361=>744,1362=>538,1363=>811,1364=>757,1365=>787,1366=>790,1369=>307,1370=>318,1371=>234,1372=>361,1373=>238,1374=>405,1375=>500,1377=>974,1378=>634,1379=>658,1380=>663,1381=>634,1382=>635,1383=>515,1384=>634,1385=>738,1386=>658,1387=>634,1388=>271,1389=>980,1390=>623,1391=>634,1392=>634,1393=>608,1394=>634,1395=>629,1396=>634,1397=>271,1398=>634,1399=>499,1400=>634,1401=>404,1402=>974,1403=>560,1404=>648,1405=>634,1406=>634,1407=>974,1408=>634,1409=>633,1410=>435,1411=>974,1412=>636,1413=>609,1414=>805,1415=>812,1417=>337,1418=>361,1456=>0,1457=>0,1458=>0,1459=>0,1460=>0,1461=>0,1462=>0,1463=>0,1464=>0,1465=>0,1466=>0,1467=>0,1468=>0,1469=>0,1470=>361,1471=>0,1472=>295,1473=>0,1474=>0,1475=>295,1478=>441,1479=>0,1488=>668,1489=>578,1490=>412,1491=>546,1492=>653,1493=>272,1494=>346,1495=>653,1496=>648,1497=>224,1498=>537,1499=>529,1500=>568,1501=>664,1502=>679,1503=>272,1504=>400,1505=>649,1506=>626,1507=>640,1508=>625,1509=>540,1510=>593,1511=>709,1512=>564,1513=>708,1514=>657,1520=>471,1521=>423,1522=>331,1523=>416,1524=>645,1542=>637,1543=>637,1545=>757,1546=>977,1548=>323,1557=>0,1563=>318,1567=>531,1569=>470,1570=>278,1571=>278,1572=>483,1573=>278,1574=>783,1575=>278,1576=>941,1577=>524,1578=>941,1579=>941,1580=>646,1581=>646,1582=>646,1583=>445,1584=>445,1585=>483,1586=>483,1587=>1221,1588=>1221,1589=>1209,1590=>1209,1591=>925,1592=>925,1593=>597,1594=>597,1600=>293,1601=>1037,1602=>776,1603=>824,1604=>727,1605=>619,1606=>734,1607=>524,1608=>483,1609=>783,1610=>783,1611=>0,1612=>0,1613=>0,1614=>0,1615=>0,1616=>0,1617=>0,1618=>0,1619=>0,1620=>0,1621=>0,1623=>0,1626=>500,1632=>537,1633=>537,1634=>537,1635=>537,1636=>537,1637=>537,1638=>537,1639=>537,1640=>537,1641=>537,1642=>537,1643=>325,1644=>318,1645=>545,1646=>941,1647=>776,1648=>0,1652=>292,1657=>941,1658=>941,1659=>941,1660=>941,1661=>941,1662=>941,1663=>941,1664=>941,1665=>646,1666=>646,1667=>646,1668=>646,1669=>646,1670=>646,1671=>646,1672=>445,1673=>445,1674=>445,1675=>445,1676=>445,1677=>445,1678=>445,1679=>445,1680=>445,1681=>483,1682=>483,1683=>498,1684=>530,1685=>610,1686=>530,1687=>483,1688=>483,1689=>483,1690=>1221,1691=>1221,1692=>1221,1693=>1209,1694=>1209,1695=>925,1696=>597,1697=>1037,1698=>1037,1699=>1037,1700=>1037,1701=>1037,1702=>1037,1703=>776,1704=>776,1705=>895,1706=>1054,1707=>895,1708=>824,1709=>824,1710=>824,1711=>895,1712=>895,1713=>895,1714=>895,1715=>895,1716=>895,1717=>727,1718=>727,1719=>727,1720=>727,1721=>734,1722=>734,1723=>734,1724=>734,1725=>734,1726=>698,1727=>646,1734=>483,1740=>783,1742=>783,1749=>524,1776=>537,1777=>537,1778=>537,1779=>537,1780=>537,1781=>537,1782=>537,1783=>537,1784=>537,1785=>537,1984=>636,1985=>636,1986=>636,1987=>636,1988=>636,1989=>636,1990=>636,1991=>636,1992=>636,1993=>636,1994=>278,1995=>571,1996=>424,1997=>592,1998=>654,1999=>654,2000=>594,2001=>654,2002=>829,2003=>438,2004=>438,2005=>559,2006=>612,2007=>350,2008=>959,2009=>473,2010=>783,2011=>654,2012=>625,2013=>734,2014=>530,2015=>724,2016=>473,2017=>625,2018=>594,2019=>530,2020=>530,2021=>522,2022=>594,2023=>594,2027=>0,2028=>0,2029=>0,2030=>0,2031=>0,2032=>0,2033=>0,2034=>0,2035=>0,2036=>313,2037=>313,2040=>560,2041=>560,2042=>361,3647=>636,3713=>670,3714=>684,3716=>688,3719=>482,3720=>628,3722=>684,3725=>688,3732=>669,3733=>642,3734=>645,3735=>655,3737=>659,3738=>625,3739=>625,3740=>745,3741=>767,3742=>687,3743=>687,3745=>702,3746=>688,3747=>684,3749=>649,3751=>632,3754=>703,3755=>819,3757=>633,3758=>684,3759=>788,3760=>632,3761=>0,3762=>539,3763=>539,3764=>0,3765=>0,3766=>0,3767=>0,3768=>0,3769=>0,3771=>0,3772=>0,3773=>663,3776=>375,3777=>657,3778=>460,3779=>547,3780=>491,3782=>674,3784=>0,3785=>0,3786=>0,3787=>0,3788=>0,3789=>0,3792=>636,3793=>641,3794=>641,3795=>670,3796=>625,3797=>625,3798=>703,3799=>670,3800=>674,3801=>677,3804=>1028,3805=>1028,4256=>874,4257=>733,4258=>679,4259=>834,4260=>615,4261=>768,4262=>753,4263=>914,4264=>453,4265=>620,4266=>843,4267=>882,4268=>625,4269=>854,4270=>781,4271=>629,4272=>912,4273=>621,4274=>620,4275=>854,4276=>866,4277=>724,4278=>630,4279=>621,4280=>625,4281=>620,4282=>818,4283=>874,4284=>615,4285=>623,4286=>625,4287=>725,4288=>844,4289=>596,4290=>688,4291=>596,4292=>594,4293=>738,4304=>508,4305=>518,4306=>581,4307=>818,4308=>508,4309=>513,4310=>500,4311=>801,4312=>518,4313=>510,4314=>1064,4315=>522,4316=>522,4317=>786,4318=>508,4319=>518,4320=>796,4321=>522,4322=>654,4323=>522,4324=>825,4325=>513,4326=>786,4327=>518,4328=>518,4329=>522,4330=>571,4331=>522,4332=>518,4333=>520,4334=>522,4335=>454,4336=>508,4337=>518,4338=>508,4339=>508,4340=>518,4341=>554,4342=>828,4343=>552,4344=>508,4345=>571,4346=>508,4347=>448,4348=>324,5121=>684,5122=>684,5123=>684,5124=>684,5125=>769,5126=>769,5127=>769,5129=>769,5130=>769,5131=>769,5132=>835,5133=>834,5134=>835,5135=>834,5136=>835,5137=>834,5138=>967,5139=>1007,5140=>967,5141=>1007,5142=>769,5143=>967,5144=>1007,5145=>967,5146=>1007,5147=>769,5149=>256,5150=>543,5151=>423,5152=>423,5153=>389,5154=>389,5155=>393,5156=>389,5157=>466,5158=>385,5159=>256,5160=>389,5161=>389,5162=>389,5163=>1090,5164=>909,5165=>953,5166=>1117,5167=>684,5168=>684,5169=>684,5170=>684,5171=>729,5172=>729,5173=>729,5175=>729,5176=>729,5177=>729,5178=>835,5179=>684,5180=>835,5181=>834,5182=>835,5183=>834,5184=>967,5185=>1007,5186=>967,5187=>1007,5188=>967,5189=>1007,5190=>967,5191=>1007,5192=>729,5193=>508,5194=>192,5196=>732,5197=>732,5198=>732,5199=>732,5200=>730,5201=>730,5202=>730,5204=>730,5205=>730,5206=>730,5207=>921,5208=>889,5209=>921,5210=>889,5211=>921,5212=>889,5213=>928,5214=>900,5215=>928,5216=>900,5217=>947,5218=>900,5219=>947,5220=>900,5221=>947,5222=>434,5223=>877,5224=>877,5225=>866,5226=>890,5227=>628,5228=>628,5229=>628,5230=>628,5231=>628,5232=>628,5233=>628,5234=>628,5235=>628,5236=>860,5237=>771,5238=>815,5239=>816,5240=>815,5241=>816,5242=>860,5243=>771,5244=>860,5245=>771,5246=>815,5247=>816,5248=>815,5249=>816,5250=>815,5251=>407,5252=>407,5253=>750,5254=>775,5255=>750,5256=>775,5257=>628,5258=>628,5259=>628,5260=>628,5261=>628,5262=>628,5263=>628,5264=>628,5265=>628,5266=>860,5267=>771,5268=>815,5269=>816,5270=>815,5271=>816,5272=>860,5273=>771,5274=>860,5275=>771,5276=>815,5277=>816,5278=>815,5279=>816,5280=>815,5281=>435,5282=>435,5283=>610,5284=>557,5285=>557,5286=>557,5287=>610,5288=>610,5289=>610,5290=>557,5291=>557,5292=>749,5293=>769,5294=>746,5295=>764,5296=>746,5297=>764,5298=>749,5299=>769,5300=>749,5301=>769,5302=>746,5303=>764,5304=>746,5305=>764,5306=>746,5307=>386,5308=>508,5309=>386,5312=>852,5313=>852,5314=>852,5315=>852,5316=>852,5317=>852,5318=>852,5319=>852,5320=>852,5321=>1069,5322=>1035,5323=>1059,5324=>852,5325=>1059,5326=>852,5327=>852,5328=>600,5329=>453,5330=>600,5331=>852,5332=>852,5333=>852,5334=>852,5335=>852,5336=>852,5337=>852,5338=>852,5339=>852,5340=>1069,5341=>1035,5342=>1059,5343=>1030,5344=>1059,5345=>1030,5346=>1069,5347=>1035,5348=>1069,5349=>1035,5350=>1083,5351=>1030,5352=>1083,5353=>1030,5354=>600,5356=>729,5357=>603,5358=>603,5359=>603,5360=>603,5361=>603,5362=>603,5363=>603,5364=>603,5365=>603,5366=>834,5367=>754,5368=>792,5369=>771,5370=>792,5371=>771,5372=>834,5373=>754,5374=>834,5375=>754,5376=>792,5377=>771,5378=>792,5379=>771,5380=>792,5381=>418,5382=>420,5383=>418,5392=>712,5393=>712,5394=>712,5395=>892,5396=>892,5397=>892,5398=>892,5399=>910,5400=>872,5401=>910,5402=>872,5403=>910,5404=>872,5405=>1140,5406=>1100,5407=>1140,5408=>1100,5409=>1140,5410=>1100,5411=>1140,5412=>1100,5413=>641,5414=>627,5415=>627,5416=>627,5417=>627,5418=>627,5419=>627,5420=>627,5421=>627,5422=>627,5423=>844,5424=>781,5425=>816,5426=>818,5427=>816,5428=>818,5429=>844,5430=>781,5431=>844,5432=>781,5433=>816,5434=>818,5435=>816,5436=>818,5437=>816,5438=>418,5440=>389,5441=>484,5442=>916,5443=>916,5444=>916,5445=>916,5446=>916,5447=>916,5448=>603,5449=>603,5450=>603,5451=>603,5452=>603,5453=>603,5454=>834,5455=>754,5456=>418,5458=>729,5459=>684,5460=>684,5461=>684,5462=>684,5463=>726,5464=>726,5465=>726,5466=>726,5467=>924,5468=>1007,5469=>508,5470=>732,5471=>732,5472=>732,5473=>732,5474=>732,5475=>732,5476=>730,5477=>730,5478=>730,5479=>730,5480=>947,5481=>900,5482=>508,5492=>831,5493=>831,5494=>831,5495=>831,5496=>831,5497=>831,5498=>831,5499=>563,5500=>752,5501=>484,5502=>1047,5503=>1047,5504=>1047,5505=>1047,5506=>1047,5507=>1047,5508=>1047,5509=>825,5514=>831,5515=>831,5516=>831,5517=>831,5518=>1259,5519=>1259,5520=>1259,5521=>1002,5522=>1002,5523=>1259,5524=>1259,5525=>700,5526=>1073,5536=>852,5537=>852,5538=>852,5539=>852,5540=>852,5541=>852,5542=>600,5543=>643,5544=>643,5545=>643,5546=>643,5547=>643,5548=>643,5549=>643,5550=>418,5551=>628,5598=>770,5601=>767,5702=>468,5703=>468,5742=>444,5743=>1047,5744=>1310,5745=>1632,5746=>1632,5747=>1375,5748=>1375,5749=>1632,5750=>1632,5760=>477,5761=>493,5762=>712,5763=>931,5764=>1150,5765=>1370,5766=>493,5767=>712,5768=>931,5769=>1150,5770=>1370,5771=>498,5772=>718,5773=>938,5774=>1159,5775=>1379,5776=>493,5777=>712,5778=>930,5779=>1149,5780=>1370,5781=>498,5782=>752,5783=>789,5784=>1205,5785=>1150,5786=>683,5787=>507,5788=>507,7424=>592,7425=>717,7426=>982,7427=>586,7428=>550,7429=>605,7430=>605,7431=>491,7432=>541,7433=>278,7434=>395,7435=>579,7436=>583,7437=>754,7438=>650,7439=>612,7440=>550,7441=>684,7442=>684,7443=>684,7444=>1023,7446=>612,7447=>612,7448=>524,7449=>602,7450=>602,7451=>583,7452=>574,7453=>737,7454=>948,7455=>638,7456=>592,7457=>818,7458=>525,7459=>526,7462=>583,7463=>592,7464=>564,7465=>524,7466=>590,7467=>639,7468=>431,7469=>613,7470=>432,7472=>485,7473=>398,7474=>398,7475=>488,7476=>474,7477=>186,7478=>186,7479=>413,7480=>351,7481=>543,7482=>471,7483=>471,7484=>496,7485=>439,7486=>380,7487=>438,7488=>385,7489=>461,7490=>623,7491=>392,7492=>392,7493=>405,7494=>648,7495=>428,7496=>405,7497=>417,7498=>417,7499=>360,7500=>359,7501=>405,7502=>179,7503=>426,7504=>623,7505=>409,7506=>414,7507=>370,7508=>414,7509=>414,7510=>428,7511=>295,7512=>405,7513=>470,7514=>623,7515=>417,7517=>402,7518=>373,7519=>385,7520=>416,7521=>364,7522=>179,7523=>259,7524=>405,7525=>417,7526=>402,7527=>373,7528=>412,7529=>416,7530=>364,7543=>635,7544=>474,7547=>372,7549=>667,7557=>278,7579=>405,7580=>370,7581=>370,7582=>414,7583=>360,7584=>296,7585=>233,7586=>405,7587=>405,7588=>261,7589=>250,7590=>261,7591=>261,7592=>234,7593=>250,7594=>235,7595=>376,7596=>623,7597=>623,7598=>411,7599=>479,7600=>409,7601=>414,7602=>414,7603=>360,7604=>287,7605=>295,7606=>508,7607=>418,7608=>361,7609=>406,7610=>417,7611=>366,7612=>437,7613=>366,7614=>392,7615=>414,7620=>0,7621=>0,7622=>0,7623=>0,7624=>0,7625=>0,7680=>684,7681=>613,7682=>686,7683=>635,7684=>686,7685=>635,7686=>686,7687=>635,7688=>698,7689=>550,7690=>770,7691=>635,7692=>770,7693=>635,7694=>770,7695=>635,7696=>770,7697=>635,7698=>770,7699=>635,7700=>632,7701=>615,7702=>632,7703=>615,7704=>632,7705=>615,7706=>632,7707=>615,7708=>632,7709=>615,7710=>575,7711=>352,7712=>775,7713=>635,7714=>752,7715=>634,7716=>752,7717=>634,7718=>752,7719=>634,7720=>752,7721=>634,7722=>752,7723=>634,7724=>295,7725=>278,7726=>295,7727=>278,7728=>656,7729=>579,7730=>656,7731=>579,7732=>656,7733=>579,7734=>557,7735=>288,7736=>557,7737=>288,7738=>557,7739=>278,7740=>557,7741=>278,7742=>863,7743=>974,7744=>863,7745=>974,7746=>863,7747=>974,7748=>748,7749=>634,7750=>748,7751=>634,7752=>748,7753=>634,7754=>748,7755=>634,7756=>787,7757=>612,7758=>787,7759=>612,7760=>787,7761=>612,7762=>787,7763=>612,7764=>603,7765=>635,7766=>603,7767=>635,7768=>695,7769=>411,7770=>695,7771=>411,7772=>695,7773=>411,7774=>695,7775=>411,7776=>635,7777=>521,7778=>635,7779=>521,7780=>635,7781=>521,7782=>635,7783=>521,7784=>635,7785=>521,7786=>611,7787=>392,7788=>611,7789=>392,7790=>611,7791=>392,7792=>611,7793=>392,7794=>732,7795=>634,7796=>732,7797=>634,7798=>732,7799=>634,7800=>732,7801=>634,7802=>732,7803=>634,7804=>684,7805=>592,7806=>684,7807=>592,7808=>989,7809=>818,7810=>989,7811=>818,7812=>989,7813=>818,7814=>989,7815=>818,7816=>989,7817=>818,7818=>685,7819=>592,7820=>685,7821=>592,7822=>611,7823=>592,7824=>685,7825=>525,7826=>685,7827=>525,7828=>685,7829=>525,7830=>634,7831=>392,7832=>818,7833=>592,7834=>613,7835=>352,7836=>352,7837=>352,7838=>769,7839=>612,7840=>684,7841=>613,7842=>684,7843=>613,7844=>684,7845=>613,7846=>684,7847=>613,7848=>684,7849=>613,7850=>684,7851=>613,7852=>684,7853=>613,7854=>684,7855=>613,7856=>684,7857=>613,7858=>684,7859=>613,7860=>684,7861=>613,7862=>684,7863=>613,7864=>632,7865=>615,7866=>632,7867=>615,7868=>632,7869=>615,7870=>632,7871=>615,7872=>632,7873=>615,7874=>632,7875=>615,7876=>632,7877=>615,7878=>632,7879=>615,7880=>295,7881=>278,7882=>295,7883=>278,7884=>787,7885=>612,7886=>787,7887=>612,7888=>787,7889=>612,7890=>787,7891=>612,7892=>787,7893=>612,7894=>787,7895=>612,7896=>787,7897=>612,7898=>913,7899=>612,7900=>913,7901=>612,7902=>913,7903=>612,7904=>913,7905=>612,7906=>913,7907=>612,7908=>732,7909=>634,7910=>732,7911=>634,7912=>858,7913=>634,7914=>858,7915=>634,7916=>858,7917=>634,7918=>858,7919=>634,7920=>858,7921=>634,7922=>611,7923=>592,7924=>611,7925=>592,7926=>611,7927=>592,7928=>611,7929=>592,7930=>769,7931=>477,7936=>659,7937=>659,7938=>659,7939=>659,7940=>659,7941=>659,7942=>659,7943=>659,7944=>684,7945=>684,7946=>877,7947=>877,7948=>769,7949=>801,7950=>708,7951=>743,7952=>541,7953=>541,7954=>541,7955=>541,7956=>541,7957=>541,7960=>711,7961=>711,7962=>966,7963=>975,7964=>898,7965=>928,7968=>634,7969=>634,7970=>634,7971=>634,7972=>634,7973=>634,7974=>634,7975=>634,7976=>837,7977=>835,7978=>1086,7979=>1089,7980=>1027,7981=>1051,7982=>934,7983=>947,7984=>338,7985=>338,7986=>338,7987=>338,7988=>338,7989=>338,7990=>338,7991=>338,7992=>380,7993=>374,7994=>635,7995=>635,7996=>570,7997=>600,7998=>489,7999=>493,8000=>612,8001=>612,8002=>612,8003=>612,8004=>612,8005=>612,8008=>804,8009=>848,8010=>1095,8011=>1100,8012=>938,8013=>970,8016=>579,8017=>579,8018=>579,8019=>579,8020=>579,8021=>579,8022=>579,8023=>579,8025=>784,8027=>998,8029=>1012,8031=>897,8032=>837,8033=>837,8034=>837,8035=>837,8036=>837,8037=>837,8038=>837,8039=>837,8040=>802,8041=>843,8042=>1089,8043=>1095,8044=>946,8045=>972,8046=>921,8047=>952,8048=>659,8049=>659,8050=>541,8051=>548,8052=>634,8053=>654,8054=>338,8055=>338,8056=>612,8057=>612,8058=>579,8059=>579,8060=>837,8061=>837,8064=>659,8065=>659,8066=>659,8067=>659,8068=>659,8069=>659,8070=>659,8071=>659,8072=>684,8073=>684,8074=>877,8075=>877,8076=>769,8077=>801,8078=>708,8079=>743,8080=>634,8081=>634,8082=>634,8083=>634,8084=>634,8085=>634,8086=>634,8087=>634,8088=>837,8089=>835,8090=>1086,8091=>1089,8092=>1027,8093=>1051,8094=>934,8095=>947,8096=>837,8097=>837,8098=>837,8099=>837,8100=>837,8101=>837,8102=>837,8103=>837,8104=>802,8105=>843,8106=>1089,8107=>1095,8108=>946,8109=>972,8110=>921,8111=>952,8112=>659,8113=>659,8114=>659,8115=>659,8116=>659,8118=>659,8119=>659,8120=>684,8121=>684,8122=>716,8123=>692,8124=>684,8125=>500,8126=>500,8127=>500,8128=>500,8129=>500,8130=>634,8131=>634,8132=>654,8134=>634,8135=>634,8136=>805,8137=>746,8138=>931,8139=>871,8140=>752,8141=>500,8142=>500,8143=>500,8144=>338,8145=>338,8146=>338,8147=>338,8150=>338,8151=>338,8152=>295,8153=>295,8154=>475,8155=>408,8157=>500,8158=>500,8159=>500,8160=>579,8161=>579,8162=>579,8163=>579,8164=>635,8165=>635,8166=>579,8167=>579,8168=>611,8169=>611,8170=>845,8171=>825,8172=>685,8173=>500,8174=>500,8175=>500,8178=>837,8179=>837,8180=>837,8182=>837,8183=>837,8184=>941,8185=>813,8186=>922,8187=>826,8188=>764,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=>361,8209=>361,8210=>636,8211=>500,8212=>1000,8213=>1000,8214=>500,8215=>500,8216=>318,8217=>318,8218=>318,8219=>318,8220=>518,8221=>518,8222=>518,8223=>518,8224=>500,8225=>500,8226=>590,8227=>590,8228=>334,8229=>667,8230=>1000,8231=>318,8232=>0,8233=>0,8234=>0,8235=>0,8236=>0,8237=>0,8238=>0,8239=>200,8240=>1342,8241=>1735,8242=>227,8243=>374,8244=>520,8245=>227,8246=>374,8247=>520,8248=>339,8249=>400,8250=>400,8251=>838,8252=>485,8253=>531,8254=>500,8255=>804,8256=>804,8257=>250,8258=>1000,8259=>500,8260=>167,8261=>390,8262=>390,8263=>922,8264=>733,8265=>733,8266=>497,8267=>636,8268=>500,8269=>500,8270=>500,8271=>337,8272=>804,8273=>500,8274=>450,8275=>1000,8276=>804,8277=>838,8278=>586,8279=>663,8280=>838,8281=>838,8282=>318,8283=>797,8284=>838,8285=>318,8286=>318,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=>179,8308=>401,8309=>401,8310=>401,8311=>401,8312=>401,8313=>401,8314=>528,8315=>528,8316=>528,8317=>246,8318=>246,8319=>398,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=>392,8337=>417,8338=>414,8339=>444,8340=>417,8341=>404,8342=>426,8343=>166,8344=>623,8345=>398,8346=>428,8347=>373,8348=>295,8352=>877,8353=>636,8354=>636,8355=>636,8356=>636,8357=>974,8358=>748,8359=>1272,8360=>1074,8361=>989,8362=>784,8363=>636,8364=>636,8365=>636,8366=>636,8367=>1272,8368=>636,8369=>636,8370=>636,8371=>636,8372=>774,8373=>636,8376=>636,8377=>636,8378=>679,8400=>0,8401=>0,8406=>0,8407=>0,8411=>0,8412=>0,8417=>0,8448=>1019,8449=>1019,8450=>698,8451=>1123,8452=>642,8453=>1019,8454=>1067,8455=>614,8456=>698,8457=>952,8459=>988,8460=>754,8461=>850,8462=>634,8463=>634,8464=>470,8465=>697,8466=>720,8467=>413,8468=>818,8469=>801,8470=>1040,8471=>1000,8472=>697,8473=>701,8474=>787,8475=>798,8476=>814,8477=>792,8478=>896,8479=>684,8480=>1020,8481=>1074,8482=>1000,8483=>684,8484=>745,8485=>578,8486=>764,8487=>764,8488=>616,8489=>338,8490=>656,8491=>684,8492=>786,8493=>703,8494=>854,8495=>592,8496=>605,8497=>786,8498=>575,8499=>1069,8500=>462,8501=>745,8502=>674,8503=>466,8504=>645,8505=>380,8506=>926,8507=>1194,8508=>702,8509=>728,8510=>654,8511=>849,8512=>811,8513=>775,8514=>557,8515=>557,8516=>611,8517=>819,8518=>708,8519=>615,8520=>351,8521=>351,8523=>780,8526=>526,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=>295,8545=>492,8546=>689,8547=>923,8548=>684,8549=>922,8550=>1120,8551=>1317,8552=>917,8553=>685,8554=>933,8555=>1131,8556=>557,8557=>698,8558=>770,8559=>863,8560=>278,8561=>458,8562=>637,8563=>812,8564=>592,8565=>811,8566=>991,8567=>1170,8568=>819,8569=>592,8570=>822,8571=>1002,8572=>278,8573=>550,8574=>635,8575=>974,8576=>1245,8577=>770,8578=>1245,8579=>703,8580=>549,8581=>698,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=>684,8705=>636,8706=>517,8707=>632,8708=>632,8709=>871,8710=>669,8711=>669,8712=>871,8713=>871,8714=>718,8715=>871,8716=>871,8717=>718,8718=>636,8719=>757,8720=>757,8721=>674,8722=>838,8723=>838,8724=>838,8725=>337,8726=>637,8727=>838,8728=>626,8729=>626,8730=>637,8731=>637,8732=>637,8733=>714,8734=>833,8735=>838,8736=>896,8737=>896,8738=>838,8739=>500,8740=>500,8741=>500,8742=>500,8743=>732,8744=>732,8745=>732,8746=>732,8747=>521,8748=>789,8749=>1057,8750=>521,8751=>789,8752=>1057,8753=>521,8754=>521,8755=>521,8756=>636,8757=>636,8758=>260,8759=>636,8760=>838,8761=>838,8762=>838,8763=>838,8764=>838,8765=>838,8766=>838,8767=>838,8768=>375,8769=>838,8770=>838,8771=>838,8772=>838,8773=>838,8774=>838,8775=>838,8776=>838,8777=>838,8778=>838,8779=>838,8780=>838,8781=>838,8782=>838,8783=>838,8784=>838,8785=>838,8786=>839,8787=>839,8788=>1000,8789=>1000,8790=>838,8791=>838,8792=>838,8793=>838,8794=>838,8795=>838,8796=>838,8797=>838,8798=>838,8799=>838,8800=>838,8801=>838,8802=>838,8803=>838,8804=>838,8805=>838,8806=>838,8807=>838,8808=>838,8809=>838,8810=>1047,8811=>1047,8812=>464,8813=>838,8814=>838,8815=>838,8816=>838,8817=>838,8818=>838,8819=>838,8820=>838,8821=>838,8822=>838,8823=>838,8824=>838,8825=>838,8826=>838,8827=>838,8828=>838,8829=>838,8830=>838,8831=>838,8832=>838,8833=>838,8834=>838,8835=>838,8836=>838,8837=>838,8838=>838,8839=>838,8840=>838,8841=>838,8842=>838,8843=>838,8844=>732,8845=>732,8846=>732,8847=>838,8848=>838,8849=>838,8850=>838,8851=>780,8852=>780,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=>871,8867=>871,8868=>871,8869=>871,8870=>521,8871=>521,8872=>871,8873=>871,8874=>871,8875=>871,8876=>871,8877=>871,8878=>871,8879=>871,8880=>838,8881=>838,8882=>838,8883=>838,8884=>838,8885=>838,8886=>1000,8887=>1000,8888=>838,8889=>838,8890=>521,8891=>732,8892=>732,8893=>732,8894=>838,8895=>838,8896=>820,8897=>820,8898=>820,8899=>820,8900=>494,8901=>318,8902=>626,8903=>838,8904=>1000,8905=>1000,8906=>1000,8907=>1000,8908=>1000,8909=>838,8910=>732,8911=>732,8912=>838,8913=>838,8914=>838,8915=>838,8916=>838,8917=>838,8918=>838,8919=>838,8920=>1422,8921=>1422,8922=>838,8923=>838,8924=>838,8925=>838,8926=>838,8927=>838,8928=>838,8929=>838,8930=>838,8931=>838,8932=>838,8933=>838,8934=>838,8935=>838,8936=>838,8937=>838,8938=>838,8939=>838,8940=>838,8941=>838,8942=>1000,8943=>1000,8944=>1000,8945=>1000,8946=>1000,8947=>871,8948=>718,8949=>871,8950=>871,8951=>718,8952=>871,8953=>871,8954=>1000,8955=>871,8956=>718,8957=>871,8958=>718,8959=>871,8960=>602,8961=>602,8962=>635,8963=>838,8964=>838,8965=>838,8966=>838,8967=>488,8968=>390,8969=>390,8970=>390,8971=>390,8972=>809,8973=>809,8974=>809,8975=>809,8976=>838,8977=>513,8984=>1000,8985=>838,8988=>469,8989=>469,8990=>469,8991=>469,8992=>521,8993=>521,8996=>1152,8997=>1152,8998=>1414,8999=>1152,9000=>1443,9003=>1414,9004=>873,9075=>338,9076=>635,9077=>837,9082=>659,9085=>757,9095=>1152,9108=>873,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,9166=>838,9167=>945,9187=>873,9189=>769,9192=>636,9250=>635,9251=>635,9312=>896,9313=>896,9314=>896,9315=>896,9316=>896,9317=>896,9318=>896,9319=>896,9320=>896,9321=>896,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,9729=>1000,9730=>896,9731=>896,9732=>896,9733=>896,9734=>896,9735=>573,9736=>896,9737=>896,9738=>888,9739=>888,9740=>671,9741=>1013,9742=>1246,9743=>1250,9744=>896,9745=>896,9746=>896,9747=>532,9748=>896,9749=>896,9750=>896,9751=>896,9752=>896,9753=>896,9754=>896,9755=>896,9756=>896,9757=>609,9758=>896,9759=>609,9760=>896,9761=>896,9762=>896,9763=>896,9764=>669,9765=>746,9766=>649,9767=>784,9768=>545,9769=>896,9770=>896,9771=>896,9772=>710,9773=>896,9774=>896,9775=>896,9776=>896,9777=>896,9778=>896,9779=>896,9780=>896,9781=>896,9782=>896,9783=>896,9784=>896,9785=>1042,9786=>1042,9787=>1042,9788=>896,9789=>896,9790=>896,9791=>614,9792=>732,9793=>732,9794=>896,9795=>896,9796=>896,9797=>896,9798=>896,9799=>896,9800=>896,9801=>896,9802=>896,9803=>896,9804=>896,9805=>896,9806=>896,9807=>896,9808=>896,9809=>896,9810=>896,9811=>896,9812=>896,9813=>896,9814=>896,9815=>896,9816=>896,9817=>896,9818=>896,9819=>896,9820=>896,9821=>896,9822=>896,9823=>896,9824=>896,9825=>896,9826=>896,9827=>896,9828=>896,9829=>896,9830=>896,9831=>896,9832=>896,9833=>472,9834=>638,9835=>896,9836=>896,9837=>472,9838=>357,9839=>484,9840=>748,9841=>766,9842=>896,9843=>896,9844=>896,9845=>896,9846=>896,9847=>896,9848=>896,9849=>896,9850=>896,9851=>896,9852=>896,9853=>896,9854=>896,9855=>896,9856=>869,9857=>869,9858=>869,9859=>869,9860=>869,9861=>869,9862=>896,9863=>896,9864=>896,9865=>896,9866=>896,9867=>896,9868=>896,9869=>896,9870=>896,9871=>896,9872=>896,9873=>896,9874=>896,9875=>896,9876=>896,9877=>541,9878=>896,9879=>896,9880=>896,9881=>896,9882=>896,9883=>896,9884=>896,9888=>896,9889=>702,9890=>1004,9891=>1089,9892=>1175,9893=>903,9894=>838,9895=>838,9896=>838,9897=>838,9898=>838,9899=>838,9900=>838,9901=>838,9902=>838,9903=>838,9904=>844,9905=>838,9906=>732,9907=>732,9908=>732,9909=>732,9910=>850,9911=>732,9912=>732,9920=>838,9921=>838,9922=>838,9923=>838,9954=>732,9985=>838,9986=>838,9987=>838,9988=>838,9990=>838,9991=>838,9992=>838,9993=>838,9996=>838,9997=>838,9998=>838,9999=>838,10000=>838,10001=>838,10002=>838,10003=>838,10004=>838,10005=>838,10006=>838,10007=>838,10008=>838,10009=>838,10010=>838,10011=>838,10012=>838,10013=>838,10014=>838,10015=>838,10016=>838,10017=>838,10018=>838,10019=>838,10020=>838,10021=>838,10022=>838,10023=>838,10025=>838,10026=>838,10027=>838,10028=>838,10029=>838,10030=>838,10031=>838,10032=>838,10033=>838,10034=>838,10035=>838,10036=>838,10037=>838,10038=>838,10039=>838,10040=>838,10041=>838,10042=>838,10043=>838,10044=>838,10045=>838,10046=>838,10047=>838,10048=>838,10049=>838,10050=>838,10051=>838,10052=>838,10053=>838,10054=>838,10055=>838,10056=>838,10057=>838,10058=>838,10059=>838,10061=>896,10063=>896,10064=>896,10065=>896,10066=>896,10070=>896,10072=>838,10073=>838,10074=>838,10075=>322,10076=>322,10077=>538,10078=>538,10081=>838,10082=>838,10083=>838,10084=>838,10085=>838,10086=>838,10087=>838,10088=>838,10089=>838,10090=>838,10091=>838,10092=>838,10093=>838,10094=>838,10095=>838,10096=>838,10097=>838,10098=>838,10099=>838,10100=>838,10101=>838,10102=>896,10103=>896,10104=>896,10105=>896,10106=>896,10107=>896,10108=>896,10109=>896,10110=>896,10111=>896,10112=>838,10113=>838,10114=>838,10115=>838,10116=>838,10117=>838,10118=>838,10119=>838,10120=>838,10121=>838,10122=>838,10123=>838,10124=>838,10125=>838,10126=>838,10127=>838,10128=>838,10129=>838,10130=>838,10131=>838,10132=>838,10136=>838,10137=>838,10138=>838,10139=>838,10140=>838,10141=>838,10142=>838,10143=>838,10144=>838,10145=>838,10146=>838,10147=>838,10148=>838,10149=>838,10150=>838,10151=>838,10152=>838,10153=>838,10154=>838,10155=>838,10156=>838,10157=>838,10158=>838,10159=>838,10161=>838,10162=>838,10163=>838,10164=>838,10165=>838,10166=>838,10167=>838,10168=>838,10169=>838,10170=>838,10171=>838,10172=>838,10173=>838,10174=>838,10181=>390,10182=>390,10208=>494,10214=>495,10215=>495,10216=>390,10217=>390,10218=>556,10219=>556,10224=>838,10225=>838,10226=>838,10227=>838,10228=>1157,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,10502=>838,10503=>838,10506=>838,10507=>838,10560=>683,10561=>683,10627=>734,10628=>734,10702=>838,10703=>1000,10704=>1000,10705=>1000,10706=>1000,10707=>1000,10708=>1000,10709=>1000,10731=>494,10746=>838,10747=>838,10752=>1000,10753=>1000,10754=>1000,10764=>1325,10765=>521,10766=>521,10767=>521,10768=>521,10769=>521,10770=>521,10771=>521,10772=>521,10773=>521,10774=>521,10775=>521,10776=>521,10777=>521,10778=>521,10779=>521,10780=>521,10799=>838,10858=>838,10859=>838,10877=>838,10878=>838,10879=>838,10880=>838,10881=>838,10882=>838,10883=>838,10884=>838,10885=>838,10886=>838,10887=>838,10888=>838,10889=>838,10890=>838,10891=>838,10892=>838,10893=>838,10894=>838,10895=>838,10896=>838,10897=>838,10898=>838,10899=>838,10900=>838,10901=>838,10902=>838,10903=>838,10904=>838,10905=>838,10906=>838,10907=>838,10908=>838,10909=>838,10910=>838,10911=>838,10912=>838,10926=>838,10927=>838,10928=>838,10929=>838,10930=>838,10931=>838,10932=>838,10933=>838,10934=>838,10935=>838,10936=>838,10937=>838,10938=>838,11001=>838,11002=>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=>836,11023=>836,11024=>836,11025=>836,11026=>945,11027=>945,11028=>945,11029=>945,11030=>769,11031=>769,11032=>769,11033=>769,11034=>945,11039=>869,11040=>869,11041=>873,11042=>873,11043=>873,11044=>1119,11091=>869,11092=>869,11360=>557,11361=>278,11362=>557,11363=>603,11364=>695,11365=>613,11366=>392,11367=>752,11368=>634,11369=>656,11370=>579,11371=>685,11372=>525,11373=>781,11374=>863,11375=>684,11376=>781,11377=>734,11378=>1128,11379=>961,11380=>592,11381=>654,11382=>568,11383=>660,11385=>414,11386=>612,11387=>491,11388=>175,11389=>431,11390=>635,11391=>685,11520=>591,11521=>595,11522=>564,11523=>602,11524=>587,11525=>911,11526=>626,11527=>952,11528=>595,11529=>607,11530=>954,11531=>620,11532=>595,11533=>926,11534=>595,11535=>806,11536=>931,11537=>584,11538=>592,11539=>923,11540=>953,11541=>828,11542=>596,11543=>595,11544=>590,11545=>592,11546=>592,11547=>621,11548=>920,11549=>589,11550=>586,11551=>581,11552=>914,11553=>596,11554=>595,11555=>592,11556=>642,11557=>901,11568=>646,11569=>888,11570=>888,11571=>682,11572=>684,11573=>635,11574=>562,11575=>684,11576=>684,11577=>632,11578=>632,11579=>683,11580=>875,11581=>685,11582=>491,11583=>685,11584=>888,11585=>888,11586=>300,11587=>627,11588=>752,11589=>656,11590=>527,11591=>685,11592=>645,11593=>632,11594=>502,11595=>953,11596=>778,11597=>748,11598=>621,11599=>295,11600=>778,11601=>295,11602=>752,11603=>633,11604=>888,11605=>888,11606=>752,11607=>320,11608=>749,11609=>888,11610=>888,11611=>698,11612=>768,11613=>685,11614=>698,11615=>622,11616=>684,11617=>752,11618=>632,11619=>788,11620=>567,11621=>788,11631=>515,11800=>531,11806=>838,11810=>390,11811=>390,11812=>390,11813=>390,11822=>531,19904=>896,19905=>896,19906=>896,19907=>896,19908=>896,19909=>896,19910=>896,19911=>896,19912=>896,19913=>896,19914=>896,19915=>896,19916=>896,19917=>896,19918=>896,19919=>896,19920=>896,19921=>896,19922=>896,19923=>896,19924=>896,19925=>896,19926=>896,19927=>896,19928=>896,19929=>896,19930=>896,19931=>896,19932=>896,19933=>896,19934=>896,19935=>896,19936=>896,19937=>896,19938=>896,19939=>896,19940=>896,19941=>896,19942=>896,19943=>896,19944=>896,19945=>896,19946=>896,19947=>896,19948=>896,19949=>896,19950=>896,19951=>896,19952=>896,19953=>896,19954=>896,19955=>896,19956=>896,19957=>896,19958=>896,19959=>896,19960=>896,19961=>896,19962=>896,19963=>896,19964=>896,19965=>896,19966=>896,19967=>896,42192=>686,42193=>603,42194=>603,42195=>770,42196=>611,42197=>611,42198=>775,42199=>656,42200=>656,42201=>512,42202=>698,42203=>703,42204=>685,42205=>575,42206=>575,42207=>863,42208=>748,42209=>557,42210=>635,42211=>695,42212=>695,42213=>684,42214=>684,42215=>752,42216=>775,42217=>512,42218=>989,42219=>685,42220=>611,42221=>686,42222=>684,42223=>684,42224=>632,42225=>632,42226=>295,42227=>787,42228=>732,42229=>732,42230=>557,42231=>767,42232=>300,42233=>300,42234=>596,42235=>596,42236=>300,42237=>300,42238=>588,42239=>588,42564=>635,42565=>521,42566=>354,42567=>338,42572=>1180,42573=>1028,42576=>1029,42577=>906,42580=>1080,42581=>842,42582=>977,42583=>843,42594=>1062,42595=>912,42596=>1066,42597=>901,42598=>1178,42599=>1008,42600=>787,42601=>612,42602=>855,42603=>712,42604=>1358,42605=>1019,42606=>879,42634=>782,42635=>685,42636=>611,42637=>583,42644=>686,42645=>634,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=>252,42782=>252,42783=>252,42786=>385,42787=>356,42788=>472,42789=>472,42790=>752,42791=>634,42792=>878,42793=>709,42794=>614,42795=>541,42800=>491,42801=>521,42802=>1250,42803=>985,42804=>1203,42805=>990,42806=>1142,42807=>981,42808=>971,42809=>818,42810=>971,42811=>818,42812=>959,42813=>818,42814=>703,42815=>549,42816=>656,42817=>583,42822=>680,42823=>392,42824=>582,42825=>427,42826=>807,42827=>704,42830=>1358,42831=>1019,42832=>603,42833=>635,42834=>734,42835=>774,42838=>787,42839=>635,42852=>605,42853=>635,42854=>605,42855=>635,42880=>557,42881=>278,42882=>735,42883=>634,42889=>337,42890=>376,42891=>401,42892=>275,42893=>686,42894=>487,42896=>772,42897=>667,42912=>775,42913=>635,42914=>656,42915=>579,42916=>748,42917=>634,42918=>695,42919=>411,42920=>635,42921=>521,42922=>801,43002=>915,43003=>575,43004=>603,43005=>863,43006=>295,43007=>1199,61184=>213,61185=>238,61186=>257,61187=>264,61188=>267,61189=>238,61190=>213,61191=>238,61192=>257,61193=>264,61194=>257,61195=>238,61196=>213,61197=>238,61198=>257,61199=>264,61200=>257,61201=>238,61202=>213,61203=>238,61204=>267,61205=>264,61206=>257,61207=>238,61208=>213,61209=>275,61440=>977,61441=>977,61442=>977,61443=>977,62464=>580,62465=>580,62466=>624,62467=>889,62468=>585,62469=>580,62470=>653,62471=>882,62472=>555,62473=>580,62474=>1168,62475=>589,62476=>590,62477=>869,62478=>580,62479=>589,62480=>914,62481=>590,62482=>731,62483=>583,62484=>872,62485=>589,62486=>895,62487=>589,62488=>589,62489=>590,62490=>649,62491=>589,62492=>589,62493=>599,62494=>590,62495=>516,62496=>580,62497=>584,62498=>580,62499=>580,62500=>581,62501=>638,62502=>955,62504=>931,62505=>808,62506=>508,62507=>508,62508=>508,62509=>508,62510=>508,62511=>508,62512=>508,62513=>508,62514=>508,62515=>508,62516=>518,62517=>518,62518=>518,62519=>787,62520=>787,62521=>787,62522=>787,62523=>787,62524=>546,62525=>546,62526=>546,62527=>546,62528=>546,62529=>546,63173=>612,64256=>689,64257=>630,64258=>630,64259=>967,64260=>967,64261=>686,64262=>861,64275=>1202,64276=>1202,64277=>1196,64278=>1186,64279=>1529,64285=>224,64286=>0,64287=>331,64288=>636,64289=>856,64290=>774,64291=>906,64292=>771,64293=>843,64294=>855,64295=>807,64296=>875,64297=>838,64298=>708,64299=>708,64300=>708,64301=>708,64302=>668,64303=>668,64304=>668,64305=>578,64306=>412,64307=>546,64308=>653,64309=>355,64310=>406,64312=>648,64313=>330,64314=>537,64315=>529,64316=>568,64318=>679,64320=>399,64321=>649,64323=>640,64324=>625,64326=>593,64327=>709,64328=>564,64329=>708,64330=>657,64331=>272,64332=>578,64333=>529,64334=>625,64335=>629,64338=>941,64339=>982,64340=>278,64341=>302,64342=>941,64343=>982,64344=>278,64345=>302,64346=>941,64347=>982,64348=>278,64349=>302,64350=>941,64351=>982,64352=>278,64353=>302,64354=>941,64355=>982,64356=>278,64357=>302,64358=>941,64359=>982,64360=>278,64361=>302,64362=>1037,64363=>1035,64364=>478,64365=>506,64366=>1037,64367=>1035,64368=>478,64369=>506,64370=>646,64371=>646,64372=>618,64373=>646,64374=>646,64375=>646,64376=>618,64377=>646,64378=>646,64379=>646,64380=>618,64381=>646,64382=>646,64383=>646,64384=>618,64385=>646,64386=>445,64387=>525,64388=>445,64389=>525,64390=>445,64391=>525,64392=>445,64393=>525,64394=>483,64395=>552,64396=>483,64397=>552,64398=>895,64399=>895,64400=>476,64401=>552,64402=>895,64403=>895,64404=>476,64405=>552,64406=>895,64407=>895,64408=>476,64409=>552,64410=>895,64411=>895,64412=>476,64413=>552,64414=>734,64415=>761,64416=>734,64417=>761,64418=>278,64419=>302,64426=>698,64427=>632,64428=>527,64429=>461,64467=>824,64468=>843,64469=>476,64470=>552,64473=>483,64474=>517,64488=>278,64489=>302,64508=>783,64509=>833,64510=>278,64511=>302,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,65056=>0,65057=>0,65058=>0,65059=>0,65136=>293,65137=>293,65138=>293,65139=>262,65140=>293,65142=>293,65143=>293,65144=>293,65145=>293,65146=>293,65147=>293,65148=>293,65149=>293,65150=>293,65151=>293,65152=>470,65153=>278,65154=>305,65155=>278,65156=>305,65157=>483,65158=>517,65159=>278,65160=>305,65161=>783,65162=>833,65163=>278,65164=>302,65165=>278,65166=>305,65167=>941,65168=>982,65169=>278,65170=>302,65171=>524,65172=>536,65173=>941,65174=>982,65175=>278,65176=>302,65177=>941,65178=>982,65179=>278,65180=>302,65181=>646,65182=>646,65183=>618,65184=>646,65185=>646,65186=>646,65187=>618,65188=>646,65189=>646,65190=>646,65191=>618,65192=>646,65193=>445,65194=>525,65195=>445,65196=>525,65197=>483,65198=>552,65199=>483,65200=>552,65201=>1221,65202=>1275,65203=>838,65204=>892,65205=>1221,65206=>1275,65207=>838,65208=>892,65209=>1209,65210=>1225,65211=>849,65212=>867,65213=>1209,65214=>1225,65215=>849,65216=>867,65217=>925,65218=>949,65219=>796,65220=>820,65221=>925,65222=>949,65223=>796,65224=>820,65225=>597,65226=>532,65227=>597,65228=>482,65229=>597,65230=>532,65231=>523,65232=>482,65233=>1037,65234=>1035,65235=>478,65236=>506,65237=>776,65238=>834,65239=>478,65240=>506,65241=>824,65242=>843,65243=>476,65244=>552,65245=>727,65246=>757,65247=>305,65248=>331,65249=>619,65250=>666,65251=>536,65252=>578,65253=>734,65254=>761,65255=>278,65256=>302,65257=>524,65258=>536,65259=>527,65260=>461,65261=>483,65262=>517,65263=>783,65264=>833,65265=>783,65266=>833,65267=>278,65268=>302,65269=>570,65270=>597,65271=>570,65272=>597,65273=>570,65274=>597,65275=>570,65276=>597,65279=>0,65529=>0,65530=>0,65531=>0,65532=>0,65533=>1025,65535=>600);
-// --- EOF ---
diff --git a/#pma/libraries/tcpdf/fonts/dejavusans.z b/#pma/libraries/tcpdf/fonts/dejavusans.z
deleted file mode 100644
index d0c4d3de..00000000
Binary files a/#pma/libraries/tcpdf/fonts/dejavusans.z and /dev/null differ
diff --git a/#pma/libraries/tcpdf/fonts/dejavusansb.ctg.z b/#pma/libraries/tcpdf/fonts/dejavusansb.ctg.z
deleted file mode 100644
index 71cef637..00000000
Binary files a/#pma/libraries/tcpdf/fonts/dejavusansb.ctg.z and /dev/null differ
diff --git a/#pma/libraries/tcpdf/fonts/dejavusansb.php b/#pma/libraries/tcpdf/fonts/dejavusansb.php
deleted file mode 100644
index 5214aef7..00000000
--- a/#pma/libraries/tcpdf/fonts/dejavusansb.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-// TCPDF FONT FILE DESCRIPTION
-$type='TrueTypeUnicode';
-$name='DejaVuSans-Bold';
-$up=-63;
-$ut=44;
-$dw=600;
-$diff='';
-$originalsize=693876;
-$enc='';
-$file='dejavusansb.z';
-$ctg='dejavusansb.ctg.z';
-$desc=array('Flags'=>32,'FontBBox'=>'[-1069 -415 1975 1174]','ItalicAngle'=>0,'Ascent'=>928,'Descent'=>-236,'Leading'=>0,'CapHeight'=>729,'XHeight'=>547,'StemV'=>60,'StemH'=>26,'AvgWidth'=>573,'MaxWidth'=>2016,'MissingWidth'=>600);
-$cbbox=array(0=>array(50,-177,550,705),33=>array(140,0,316,729),34=>array(95,458,426,729),35=>array(68,0,770,718),36=>array(78,-147,628,760),37=>array(32,-14,970,742),38=>array(60,-14,830,742),39=>array(95,458,211,729),40=>array(86,-132,377,759),41=>array(80,-132,371,759),42=>array(20,278,503,742),43=>array(106,0,732,627),44=>array(53,-142,278,189),45=>array(54,217,361,359),46=>array(102,0,278,189),47=>array(0,-93,365,729),48=>array(48,-14,648,742),49=>array(113,0,627,729),50=>array(79,0,609,742),51=>array(67,-14,616,742),52=>array(45,0,650,729),53=>array(77,-14,626,729),54=>array(62,-14,642,741),55=>array(67,0,616,729),56=>array(61,-14,634,742),57=>array(52,-14,632,741),58=>array(112,0,288,547),59=>array(63,-142,288,547),60=>array(106,30,732,597),61=>array(106,144,732,482),62=>array(106,30,732,597),63=>array(69,0,515,742),64=>array(66,-174,929,703),65=>array(5,0,769,729),66=>array(92,0,692,729),67=>array(50,-14,670,742),68=>array(92,0,778,729),69=>array(92,0,610,729),70=>array(92,0,599,729),71=>array(50,-14,747,742),72=>array(92,0,745,729),73=>array(92,0,280,729),74=>array(-56,-200,280,729),75=>array(92,0,805,729),76=>array(92,0,610,729),77=>array(92,0,903,729),78=>array(92,0,745,729),79=>array(50,-14,800,742),80=>array(92,0,692,729),81=>array(50,-146,800,742),82=>array(92,0,750,729),83=>array(72,-14,647,742),84=>array(5,0,677,729),85=>array(92,-14,720,729),86=>array(5,0,769,729),87=>array(30,0,1072,729),88=>array(19,0,751,729),89=>array(-10,0,734,729),90=>array(45,0,680,729),91=>array(86,-132,389,760),92=>array(0,-93,365,729),93=>array(68,-132,371,760),94=>array(101,457,737,729),95=>array(0,-236,500,-143),96=>array(46,616,322,800),97=>array(43,-14,596,560),98=>array(84,-14,671,760),99=>array(43,-14,526,560),100=>array(45,-14,632,760),101=>array(43,-14,630,560),102=>array(19,0,444,760),103=>array(45,-216,632,559),104=>array(84,0,634,760),105=>array(84,0,259,760),106=>array(-33,-216,259,760),107=>array(84,0,684,760),108=>array(84,0,259,760),109=>array(83,0,963,560),110=>array(84,0,634,560),111=>array(43,-14,644,560),112=>array(84,-208,671,560),113=>array(45,-208,632,559),114=>array(84,0,490,560),115=>array(52,-14,548,560),116=>array(13,0,455,702),117=>array(78,-14,628,547),118=>array(15,0,637,547),119=>array(35,0,889,547),120=>array(15,0,630,547),121=>array(12,-216,634,547),122=>array(45,0,534,547),123=>array(125,-163,587,760),124=>array(127,-236,238,764),125=>array(125,-163,587,760),126=>array(106,212,732,415),161=>array(140,0,316,729),162=>array(85,-153,567,699),163=>array(61,0,613,742),164=>array(36,30,601,596),165=>array(12,0,684,729),166=>array(127,-171,238,699),167=>array(7,-95,496,742),168=>array(96,654,404,774),169=>array(138,0,862,725),170=>array(77,182,489,742),171=>array(77,67,552,519),172=>array(106,140,732,444),173=>array(54,217,361,359),174=>array(138,0,862,725),175=>array(96,668,404,760),176=>array(87,424,412,749),177=>array(106,0,732,627),178=>array(53,326,382,742),179=>array(44,319,384,742),180=>array(178,616,454,800),181=>array(85,-209,704,547),182=>array(63,-96,549,729),183=>array(102,253,278,442),184=>array(128,-196,349,0),185=>array(60,326,382,734),186=>array(57,182,507,742),187=>array(94,67,569,519),188=>array(49,-14,957,742),189=>array(49,-14,987,742),190=>array(51,-14,957,742),191=>array(69,-14,515,729),192=>array(5,0,769,927),193=>array(5,0,769,927),194=>array(5,0,769,927),195=>array(5,0,769,931),196=>array(5,0,769,927),197=>array(5,0,769,928),198=>array(0,0,1012,729),199=>array(50,-196,670,742),200=>array(92,0,610,927),201=>array(92,0,610,927),202=>array(92,0,610,927),203=>array(92,0,610,927),204=>array(11,0,280,927),205=>array(92,0,337,927),206=>array(1,0,370,927),207=>array(32,0,339,927),208=>array(16,0,787,729),209=>array(92,0,745,928),210=>array(50,-14,800,927),211=>array(50,-14,800,927),212=>array(50,-14,800,927),213=>array(50,-14,800,928),214=>array(50,-14,800,927),215=>array(125,20,713,607),216=>array(22,-36,823,765),217=>array(92,-14,720,927),218=>array(92,-14,720,927),219=>array(92,-14,720,927),220=>array(92,-14,720,927),221=>array(-10,0,734,927),222=>array(92,0,692,729),223=>array(84,-14,676,760),224=>array(43,-14,596,800),225=>array(43,-14,596,800),226=>array(43,-14,596,800),227=>array(43,-14,596,778),228=>array(43,-14,596,774),229=>array(43,-14,596,888),230=>array(43,-14,1000,560),231=>array(43,-196,526,560),232=>array(43,-14,630,800),233=>array(43,-14,630,800),234=>array(43,-14,630,800),235=>array(43,-14,630,774),236=>array(-21,0,259,800),237=>array(84,0,387,800),238=>array(-13,0,355,800),239=>array(17,0,325,774),240=>array(43,-14,644,760),241=>array(84,0,634,778),242=>array(43,-14,644,800),243=>array(43,-14,644,800),244=>array(43,-14,644,800),245=>array(43,-14,644,778),246=>array(43,-14,644,774),247=>array(106,42,732,585),248=>array(38,-46,645,594),249=>array(78,-14,628,800),250=>array(78,-14,628,800),251=>array(78,-14,628,800),252=>array(78,-14,628,774),253=>array(12,-216,634,800),254=>array(84,-208,671,760),255=>array(12,-216,634,774),256=>array(5,0,769,914),257=>array(43,-14,596,763),258=>array(5,0,769,935),259=>array(43,-14,596,780),260=>array(5,-196,769,729),261=>array(43,-196,596,560),262=>array(50,-14,670,927),263=>array(43,-14,557,800),264=>array(50,-14,670,927),265=>array(43,-14,542,800),266=>array(50,-14,670,927),267=>array(43,-14,526,760),268=>array(50,-14,670,927),269=>array(43,-14,537,800),270=>array(92,0,778,927),271=>array(45,-14,871,760),272=>array(16,0,787,729),273=>array(45,-14,707,760),274=>array(92,0,610,914),275=>array(43,-14,630,763),276=>array(92,0,610,927),277=>array(43,-14,630,784),278=>array(92,0,610,927),279=>array(43,-14,630,760),280=>array(92,-196,610,729),281=>array(43,-196,630,560),282=>array(92,0,610,927),283=>array(43,-14,630,800),284=>array(50,-14,747,927),285=>array(45,-216,632,800),286=>array(50,-14,747,927),287=>array(45,-216,632,784),288=>array(50,-14,747,927),289=>array(45,-216,632,760),290=>array(50,-224,747,742),291=>array(45,-216,632,765),292=>array(92,0,745,927),293=>array(-9,0,634,927),294=>array(92,0,882,729),295=>array(81,0,709,760),296=>array(16,0,355,928),297=>array(1,0,341,778),298=>array(32,0,339,914),299=>array(18,0,325,763),300=>array(21,0,350,927),301=>array(7,0,335,784),302=>array(92,-196,366,729),303=>array(84,-196,345,760),304=>array(92,0,280,927),305=>array(84,0,259,547),306=>array(92,-200,651,729),307=>array(84,-216,602,760),308=>array(-56,-200,370,927),309=>array(-33,-216,355,800),310=>array(92,-209,805,729),311=>array(84,-209,684,760),312=>array(84,0,684,547),313=>array(92,0,610,928),314=>array(84,0,357,928),315=>array(92,-209,610,729),316=>array(71,-209,273,760),317=>array(92,0,610,729),318=>array(84,0,479,760),319=>array(92,0,610,729),320=>array(84,0,484,760),321=>array(-45,0,615,729),322=>array(-18,0,390,760),323=>array(92,0,745,928),324=>array(84,0,634,803),325=>array(92,-209,745,729),326=>array(84,-209,634,560),327=>array(92,0,745,927),328=>array(84,0,634,800),329=>array(51,0,891,729),330=>array(84,-200,730,742),331=>array(84,-216,634,560),332=>array(50,-14,800,914),333=>array(43,-14,644,763),334=>array(50,-14,800,927),335=>array(43,-14,644,787),336=>array(50,-14,800,927),337=>array(43,-14,644,800),338=>array(50,-1,1094,730),339=>array(43,-14,1046,560),340=>array(92,0,750,928),341=>array(84,0,515,803),342=>array(92,-209,750,729),343=>array(71,-209,490,560),344=>array(92,0,750,927),345=>array(84,0,490,800),346=>array(72,-14,647,928),347=>array(52,-14,548,803),348=>array(72,-14,647,927),349=>array(52,-14,548,800),350=>array(72,-196,647,742),351=>array(52,-196,548,560),352=>array(72,-14,647,927),353=>array(52,-14,548,800),354=>array(5,-196,677,729),355=>array(13,-196,455,702),356=>array(5,0,677,930),357=>array(13,0,507,814),358=>array(5,0,677,729),359=>array(13,0,455,702),360=>array(92,-14,720,928),361=>array(78,-14,628,778),362=>array(92,-14,720,914),363=>array(78,-14,628,763),364=>array(92,-14,720,927),365=>array(78,-14,628,784),366=>array(92,-14,720,929),367=>array(78,-14,628,881),368=>array(92,-14,720,927),369=>array(78,-14,628,800),370=>array(92,-196,720,729),371=>array(78,-196,716,547),372=>array(30,0,1072,931),373=>array(35,0,889,800),374=>array(-10,0,734,931),375=>array(12,-216,634,800),376=>array(-10,0,734,927),377=>array(45,0,680,928),378=>array(45,0,534,803),379=>array(45,0,680,929),380=>array(45,0,534,760),381=>array(45,0,680,927),382=>array(45,0,534,800),383=>array(19,0,444,760),384=>array(9,-14,671,760),385=>array(-68,0,741,729),386=>array(92,0,692,729),387=>array(84,-14,671,760),388=>array(40,0,731,729),389=>array(25,-14,696,760),390=>array(50,-14,670,742),391=>array(50,-14,818,924),392=>array(43,-14,643,724),393=>array(16,0,787,729),394=>array(-68,0,827,729),395=>array(70,0,669,729),396=>array(45,-14,632,760),397=>array(43,-222,645,560),398=>array(92,0,610,729),399=>array(51,-14,800,742),400=>array(67,-14,616,742),401=>array(-56,-200,599,729),402=>array(-57,-208,444,760),403=>array(50,-14,868,924),404=>array(2,-211,793,730),405=>array(84,0,1000,760),406=>array(92,0,428,729),407=>array(5,0,384,729),408=>array(92,0,805,742),409=>array(84,0,684,760),410=>array(5,0,355,760),411=>array(-11,0,562,760),412=>array(83,-13,963,729),413=>array(-56,-200,745,729),414=>array(84,-208,634,560),415=>array(50,-14,800,742),416=>array(53,-14,854,761),417=>array(46,-14,708,609),418=>array(50,-14,1007,742),419=>array(43,-216,826,560),420=>array(-68,0,741,729),421=>array(84,-208,671,760),422=>array(92,-146,760,729),423=>array(26,-14,601,742),424=>array(15,-14,511,560),425=>array(92,0,610,729),426=>array(-31,-217,561,760),427=>array(13,-216,455,702),428=>array(15,0,701,729),429=>array(13,0,455,760),430=>array(5,-200,677,729),431=>array(91,-14,833,761),432=>array(75,-14,733,609),433=>array(27,-14,823,728),434=>array(92,0,772,729),435=>array(-10,0,796,742),436=>array(12,-216,778,560),437=>array(45,0,680,729),438=>array(45,0,534,547),439=>array(72,-33,728,729),440=>array(41,-33,696,729),441=>array(37,-215,586,547),442=>array(57,-208,534,547),443=>array(79,0,609,742),444=>array(41,-33,728,729),445=>array(37,-215,586,547),446=>array(36,-15,525,702),447=>array(84,-208,671,560),448=>array(92,-208,280,729),449=>array(92,-208,566,729),450=>array(5,-208,536,729),451=>array(99,0,274,729),452=>array(92,0,1510,927),453=>array(92,0,1364,800),454=>array(45,-14,1250,800),455=>array(92,-200,917,729),456=>array(92,-216,896,760),457=>array(84,-216,602,760),458=>array(92,-200,1117,729),459=>array(92,-216,1096,760),460=>array(84,-216,971,760),461=>array(5,0,769,927),462=>array(43,-14,596,800),463=>array(3,0,371,927),464=>array(2,0,370,800),465=>array(50,-14,800,927),466=>array(43,-14,644,800),467=>array(92,-14,720,927),468=>array(78,-14,628,800),469=>array(92,-14,720,1040),470=>array(78,-14,628,914),471=>array(92,-14,720,1114),472=>array(78,-14,628,917),473=>array(92,-14,720,1114),474=>array(78,-14,628,917),475=>array(92,-14,720,1114),476=>array(78,-14,628,917),477=>array(43,-14,630,560),478=>array(5,0,769,1040),479=>array(43,-14,596,914),480=>array(5,0,769,1042),481=>array(43,-14,596,914),482=>array(0,0,1012,914),483=>array(43,-14,1000,758),484=>array(50,-14,792,742),485=>array(45,-216,674,559),486=>array(50,-14,747,927),487=>array(45,-216,632,800),488=>array(92,0,805,927),489=>array(-5,0,684,927),490=>array(50,-196,800,742),491=>array(43,-196,644,560),492=>array(50,-196,800,914),493=>array(43,-196,644,763),494=>array(72,-33,728,927),495=>array(43,-215,593,793),496=>array(-33,-216,359,800),497=>array(92,0,1510,729),498=>array(92,0,1364,729),499=>array(45,-14,1250,760),500=>array(50,-14,747,928),501=>array(45,-216,632,800),502=>array(92,-14,1186,729),503=>array(92,-208,737,742),504=>array(92,0,745,927),505=>array(84,0,634,800),506=>array(5,0,769,931),507=>array(43,-14,708,931),508=>array(0,0,1012,927),509=>array(43,-14,1000,800),510=>array(22,-36,823,927),511=>array(38,-46,645,800),512=>array(5,0,769,928),513=>array(43,-14,596,800),514=>array(5,0,769,923),515=>array(43,-14,596,784),516=>array(92,0,610,928),517=>array(43,-14,630,800),518=>array(92,0,610,923),519=>array(43,-14,630,784),520=>array(-41,0,377,928),521=>array(-3,0,381,800),522=>array(23,0,351,923),523=>array(7,0,335,784),524=>array(50,-14,800,928),525=>array(43,-14,644,800),526=>array(50,-14,800,923),527=>array(43,-14,644,784),528=>array(92,0,750,928),529=>array(58,0,490,800),530=>array(92,0,750,923),531=>array(84,0,490,784),532=>array(92,-14,720,928),533=>array(78,-14,628,800),534=>array(92,-14,720,923),535=>array(78,-14,628,784),536=>array(72,-239,647,742),537=>array(52,-239,548,560),538=>array(5,-239,677,729),539=>array(13,-239,455,702),540=>array(67,-210,616,742),541=>array(49,-211,544,560),542=>array(92,0,745,927),543=>array(-12,0,634,927),544=>array(84,-208,730,742),545=>array(45,-75,822,760),546=>array(61,-14,748,742),547=>array(43,-14,616,646),548=>array(45,-216,680,729),549=>array(45,-216,534,547),550=>array(5,0,769,927),551=>array(43,-14,596,760),552=>array(92,-192,610,729),553=>array(43,-196,630,560),554=>array(50,-14,800,1040),555=>array(43,-14,644,914),556=>array(50,-14,800,1040),557=>array(43,-14,644,898),558=>array(50,-14,800,927),559=>array(43,-14,644,760),560=>array(50,-14,800,1042),561=>array(43,-14,644,914),562=>array(-10,0,734,914),563=>array(12,-216,634,763),564=>array(84,-75,449,760),565=>array(84,-75,824,560),566=>array(13,-76,469,702),567=>array(-33,-216,259,547),568=>array(45,-14,1043,760),569=>array(45,-208,1043,560),570=>array(-14,-36,788,765),571=>array(-34,-36,768,765),572=>array(-7,-46,600,594),573=>array(-1,0,610,729),574=>array(-60,-36,742,765),575=>array(52,-240,595,560),576=>array(45,-240,595,547),577=>array(40,0,741,729),578=>array(42,0,573,560),579=>array(6,0,692,729),580=>array(23,-14,789,729),581=>array(5,0,769,729),582=>array(92,-93,610,822),583=>array(43,-93,630,640),584=>array(-56,-200,360,729),585=>array(-33,-216,360,760),586=>array(48,-200,927,741),587=>array(45,-216,800,560),588=>array(6,0,750,729),589=>array(-21,0,490,560),590=>array(-10,0,734,729),591=>array(-4,-216,656,547),592=>array(78,-14,631,560),593=>array(45,-14,632,560),594=>array(84,-14,671,560),595=>array(84,-14,671,760),596=>array(43,-14,526,560),597=>array(43,-69,526,560),598=>array(45,-216,750,760),599=>array(45,-14,801,760),600=>array(43,-14,630,560),601=>array(43,-14,630,560),602=>array(59,-14,885,560),603=>array(54,-14,493,560),604=>array(54,-14,493,560),605=>array(54,-14,769,560),606=>array(54,-14,665,560),607=>array(-33,-216,360,547),608=>array(45,-216,801,760),609=>array(45,-216,632,547),610=>array(43,-14,545,546),611=>array(25,-211,619,547),612=>array(25,-21,619,547),613=>array(78,-214,628,547),614=>array(84,0,634,760),615=>array(84,-216,634,760),616=>array(84,0,461,760),617=>array(83,0,356,547),618=>array(84,0,461,547),619=>array(84,0,475,760),620=>array(84,0,609,760),621=>array(85,-216,429,760),622=>array(84,-215,793,760),623=>array(79,-14,959,546),624=>array(79,-209,959,546),625=>array(83,-216,964,560),626=>array(-33,-216,634,560),627=>array(84,-216,802,560),628=>array(84,0,623,547),629=>array(43,-14,644,560),630=>array(43,-1,826,547),631=>array(51,0,630,574),632=>array(60,-208,729,760),633=>array(84,-13,490,547),634=>array(84,-13,490,760),635=>array(84,-216,659,547),636=>array(84,-208,490,560),637=>array(83,-216,490,560),638=>array(84,0,530,547),639=>array(84,0,530,547),640=>array(52,0,590,547),641=>array(52,0,590,547),642=>array(52,-216,548,560),643=>array(-33,-216,431,760),644=>array(-11,-216,444,760),645=>array(84,-216,539,560),646=>array(-31,-217,561,760),647=>array(13,-155,455,547),648=>array(13,-216,455,702),649=>array(84,-14,836,547),650=>array(79,-14,693,547),651=>array(83,0,625,547),652=>array(15,0,637,547),653=>array(35,0,889,547),654=>array(12,0,634,763),655=>array(64,0,660,547),656=>array(45,-216,703,547),657=>array(45,-69,617,547),658=>array(43,-215,593,547),659=>array(57,-215,593,547),660=>array(36,0,525,759),661=>array(36,0,525,759),662=>array(36,0,525,759),663=>array(36,-208,525,759),664=>array(50,-14,800,742),665=>array(84,0,589,547),666=>array(54,-14,665,560),667=>array(43,0,693,760),668=>array(84,0,607,547),669=>array(-170,-216,341,760),670=>array(84,-213,684,547),671=>array(84,0,499,547),672=>array(45,-208,801,760),673=>array(36,0,525,759),674=>array(36,0,525,759),675=>array(45,-14,1108,760),676=>array(45,-215,1167,760),677=>array(45,-55,1107,760),678=>array(13,0,928,702),679=>array(13,-216,777,760),680=>array(13,-69,881,702),681=>array(19,-216,979,760),682=>array(84,0,815,760),683=>array(84,0,732,760),684=>array(22,0,569,641),685=>array(22,86,345,641),686=>array(-89,-214,629,760),687=>array(-89,-216,797,760),688=>array(54,326,406,751),689=>array(54,326,406,751),690=>array(-21,205,166,751),691=>array(54,326,314,640),692=>array(54,319,314,632),693=>array(54,205,421,632),694=>array(14,326,358,632),695=>array(22,326,569,632),696=>array(8,205,406,632),697=>array(78,557,218,800),698=>array(78,557,437,800),699=>array(103,418,318,729),700=>array(63,418,278,729),701=>array(124,616,296,856),702=>array(116,481,255,760),703=>array(116,481,255,760),704=>array(23,326,336,751),705=>array(23,326,336,751),706=>array(130,517,370,843),707=>array(130,517,370,843),708=>array(87,561,413,800),709=>array(87,561,413,800),710=>array(66,616,434,800),711=>array(66,616,434,800),712=>array(107,488,199,759),713=>array(96,668,404,760),714=>array(178,616,454,800),715=>array(46,616,322,800),716=>array(107,-81,199,190),717=>array(96,-184,404,-92),718=>array(46,-236,322,-52),719=>array(178,-236,454,-52),720=>array(45,0,246,547),721=>array(45,361,246,547),722=>array(116,269,255,547),723=>array(116,269,255,547),724=>array(138,238,357,458),725=>array(141,238,360,458),726=>array(54,119,362,427),727=>array(54,229,274,317),728=>array(86,639,414,784),729=>array(183,654,317,774),730=>array(111,610,389,888),731=>array(167,-196,376,0),732=>array(80,638,420,778),733=>array(94,616,479,800),734=>array(0,213,360,524),735=>array(111,616,387,800),736=>array(16,208,390,633),737=>array(54,326,166,751),738=>array(33,318,351,640),739=>array(10,326,403,632),740=>array(23,326,336,751),741=>array(96,0,404,693),742=>array(96,0,404,693),743=>array(96,0,404,693),744=>array(96,0,404,693),745=>array(96,0,404,693),748=>array(88,-260,414,-21),749=>array(96,605,404,822),750=>array(92,418,554,729),755=>array(111,-240,389,38),759=>array(80,-196,420,-84),768=>array(-455,616,-179,800),769=>array(-326,616,-50,800),770=>array(-435,616,-67,800),771=>array(-424,638,-84,778),772=>array(-405,668,-97,760),773=>array(-500,663,0,755),774=>array(-409,639,-81,784),775=>array(-338,617,-164,760),776=>array(-402,654,-94,774),777=>array(-370,616,-122,843),778=>array(-390,610,-112,888),779=>array(-404,616,-19,800),780=>array(-435,616,-67,800),781=>array(-297,615,-205,832),782=>array(-390,615,-113,832),783=>array(-484,616,-100,800),784=>array(-409,639,-81,882),785=>array(-409,639,-81,784),786=>array(-271,418,-69,563),787=>array(-266,595,-132,844),788=>array(-266,595,-132,844),789=>array(-89,616,89,800),790=>array(-455,-276,-179,-93),791=>array(-326,-276,-50,-93),792=>array(-380,-240,-211,-6),793=>array(-295,-240,-126,-6),794=>array(-224,658,47,929),795=>array(-175,400,21,609),796=>array(-331,-240,-216,-11),797=>array(-386,-240,-115,-59),798=>array(-389,-240,-118,-59),799=>array(-370,-240,-136,-6),800=>array(-389,-202,-118,-110),801=>array(-423,-216,-79,117),802=>array(-419,-216,-75,117),803=>array(-338,-212,-164,-70),804=>array(-402,-212,-94,-92),805=>array(-365,-240,-135,-11),806=>array(-327,-239,-125,-93),807=>array(-372,-196,-151,0),808=>array(-333,-196,-124,0),809=>array(-297,-240,-205,-47),810=>array(-405,-237,-97,-54),811=>array(-450,-239,-51,-94),812=>array(-435,-240,-67,-57),813=>array(-435,-240,-67,-57),814=>array(-409,-239,-81,-94),815=>array(-409,-240,-81,-95),816=>array(-424,-234,-84,-94),817=>array(-405,-184,-97,-92),818=>array(-500,-236,0,-143),819=>array(-500,-236,0,-9),820=>array(-625,212,1,415),821=>array(-471,214,-94,309),822=>array(-837,214,-86,309),823=>array(-655,-46,-48,594),824=>array(-825,-36,-24,765),825=>array(-285,-240,-170,-11),826=>array(-405,-238,-97,-55),827=>array(-332,-241,-98,-6),828=>array(-450,-239,-51,-94),829=>array(-379,585,-123,842),830=>array(-267,595,-127,867),831=>array(-500,528,0,755),832=>array(-455,616,-179,800),833=>array(-323,616,-47,800),834=>array(-421,638,-81,778),835=>array(-266,595,-132,844),836=>array(-404,654,-55,978),837=>array(-286,-208,-179,-45),838=>array(-403,639,-97,786),839=>array(-360,-226,-140,-35),840=>array(-379,-240,-121,-47),841=>array(-367,-240,-133,-21),842=>array(-420,616,-80,800),843=>array(-420,567,-80,850),844=>array(-420,573,-80,835),845=>array(-459,-230,-41,-30),846=>array(-357,-240,-143,-45),849=>array(-320,610,-179,888),850=>array(-409,640,-81,882),851=>array(-367,-240,-135,-9),855=>array(-320,610,-179,888),856=>array(-120,654,14,774),858=>array(-445,-240,-58,-11),860=>array(-433,-237,458,-79),861=>array(-433,802,458,960),862=>array(-445,797,445,889),863=>array(-445,-185,445,-93),864=>array(-362,756,362,894),865=>array(-445,769,445,927),866=>array(-449,-230,454,-30),880=>array(92,0,606,729),881=>array(84,0,481,547),882=>array(92,0,930,729),883=>array(92,0,744,729),884=>array(78,557,218,800),885=>array(78,-208,218,35),886=>array(92,0,745,729),887=>array(84,0,617,547),890=>array(202,-208,333,-45),891=>array(43,-14,526,560),892=>array(43,-14,526,560),893=>array(43,-14,526,560),894=>array(63,-142,288,547),900=>array(169,616,445,800),901=>array(96,654,445,978),902=>array(26,0,792,800),903=>array(102,253,278,442),904=>array(-24,0,771,800),905=>array(-18,0,915,800),906=>array(-21,0,450,800),908=>array(-19,-14,836,800),910=>array(-27,0,992,800),911=>array(-30,0,867,800),912=>array(23,-19,372,978),913=>array(5,0,769,729),914=>array(92,0,692,729),915=>array(92,0,610,729),916=>array(5,0,769,729),917=>array(92,0,610,729),918=>array(45,0,680,729),919=>array(92,0,745,729),920=>array(50,-14,800,742),921=>array(92,0,280,729),922=>array(92,0,805,729),923=>array(5,0,769,729),924=>array(92,0,903,729),925=>array(92,0,745,729),926=>array(98,0,548,729),927=>array(50,-14,800,742),928=>array(92,0,745,729),929=>array(92,0,692,729),931=>array(92,0,610,729),932=>array(5,0,677,729),933=>array(-10,0,734,729),934=>array(50,0,800,729),935=>array(19,0,751,729),936=>array(56,0,795,729),937=>array(27,0,823,742),938=>array(34,0,342,927),939=>array(-10,0,734,927),940=>array(48,-13,645,800),941=>array(54,-14,493,800),942=>array(84,-208,634,800),943=>array(77,-19,353,800),944=>array(78,-10,629,978),945=>array(48,-13,645,559),946=>array(84,-208,671,773),947=>array(15,-208,667,547),948=>array(43,-14,645,768),949=>array(54,-14,493,560),950=>array(43,-208,542,760),951=>array(84,-208,634,560),952=>array(43,-11,645,768),953=>array(78,-19,348,547),954=>array(84,0,655,547),955=>array(30,0,603,760),956=>array(85,-209,704,547),957=>array(15,0,635,547),958=>array(43,-208,542,760),959=>array(43,-14,644,560),960=>array(42,-19,732,547),961=>array(84,-208,671,562),962=>array(43,-208,526,560),963=>array(43,-14,727,547),964=>array(21,-19,612,547),965=>array(78,-10,629,547),966=>array(64,-208,725,552),967=>array(25,-208,620,547),968=>array(65,-208,724,547),969=>array(43,-13,826,547),970=>array(19,-19,355,774),971=>array(78,-10,629,774),972=>array(43,-14,644,800),973=>array(78,-10,629,800),974=>array(43,-13,826,800),975=>array(92,-208,805,729),976=>array(55,-11,575,768),977=>array(51,-11,612,768),978=>array(21,0,717,729),979=>array(-24,0,954,800),980=>array(21,0,717,927),981=>array(60,-208,729,760),982=>array(22,-13,843,547),983=>array(54,-205,688,548),984=>array(50,-208,800,742),985=>array(43,-208,644,560),986=>array(50,-208,678,729),987=>array(43,-208,541,547),988=>array(92,0,599,729),989=>array(-56,-208,437,760),990=>array(61,2,646,729),991=>array(82,0,571,759),992=>array(56,-208,843,742),993=>array(22,-180,537,559),994=>array(50,-213,1043,729),995=>array(59,-208,775,547),996=>array(50,-208,740,742),997=>array(45,-208,632,560),998=>array(92,-213,878,729),999=>array(21,-14,689,575),1000=>array(42,-208,692,745),1001=>array(46,-208,608,560),1002=>array(53,0,736,742),1003=>array(49,0,622,560),1004=>array(50,-14,715,758),1005=>array(83,-14,670,758),1006=>array(28,-208,654,729),1007=>array(27,-208,563,729),1008=>array(54,-7,688,548),1009=>array(84,-216,671,562),1010=>array(43,-14,526,560),1011=>array(-33,-216,259,760),1012=>array(50,-14,800,742),1013=>array(67,-14,550,560),1014=>array(81,-14,563,560),1015=>array(92,0,692,729),1016=>array(84,-208,671,760),1017=>array(50,-14,670,742),1018=>array(92,0,903,729),1019=>array(73,-208,649,547),1020=>array(33,-208,671,562),1021=>array(33,-14,653,742),1022=>array(50,-14,670,742),1023=>array(33,-14,653,742),1024=>array(92,0,610,927),1025=>array(92,0,610,927),1026=>array(5,-200,798,729),1027=>array(92,0,610,928),1028=>array(50,-14,670,742),1029=>array(72,-14,647,742),1030=>array(92,0,280,729),1031=>array(32,0,339,927),1032=>array(-56,-200,280,729),1033=>array(46,0,1102,729),1034=>array(92,0,1060,729),1035=>array(5,0,798,729),1036=>array(92,0,803,928),1037=>array(92,0,745,927),1038=>array(29,0,741,927),1039=>array(92,-157,745,729),1040=>array(5,0,769,729),1041=>array(92,0,692,729),1042=>array(92,0,692,729),1043=>array(92,0,610,729),1044=>array(60,-157,831,729),1045=>array(92,0,610,729),1046=>array(15,0,1209,729),1047=>array(66,-14,645,742),1048=>array(92,0,745,729),1049=>array(92,0,745,927),1050=>array(92,0,803,729),1051=>array(46,0,739,729),1052=>array(92,0,903,729),1053=>array(92,0,745,729),1054=>array(50,-14,800,742),1055=>array(92,0,745,729),1056=>array(92,0,692,729),1057=>array(50,-14,670,742),1058=>array(5,0,677,729),1059=>array(29,0,741,729),1060=>array(50,0,941,729),1061=>array(19,0,751,729),1062=>array(92,-157,868,729),1063=>array(81,0,716,729),1064=>array(92,0,1143,729),1065=>array(92,-157,1266,729),1066=>array(49,0,890,729),1067=>array(92,0,944,729),1068=>array(92,0,692,729),1069=>array(64,-14,684,742),1070=>array(92,-14,1119,742),1071=>array(64,0,678,729),1072=>array(43,-14,596,560),1073=>array(43,-14,655,792),1074=>array(84,0,589,547),1075=>array(84,0,499,547),1076=>array(56,-138,751,547),1077=>array(43,-14,630,560),1078=>array(15,0,980,547),1079=>array(49,-14,518,560),1080=>array(84,0,617,547),1081=>array(84,0,617,765),1082=>array(84,0,664,547),1083=>array(55,0,648,547),1084=>array(84,0,733,547),1085=>array(84,0,607,547),1086=>array(43,-14,644,560),1087=>array(84,0,607,547),1088=>array(84,-208,671,560),1089=>array(43,-14,526,560),1090=>array(4,0,575,547),1091=>array(12,-216,634,547),1092=>array(55,-208,937,760),1093=>array(15,0,630,547),1094=>array(84,-138,698,547),1095=>array(64,0,573,547),1096=>array(84,0,972,547),1097=>array(84,-138,1063,547),1098=>array(20,0,711,547),1099=>array(84,0,823,547),1100=>array(84,0,588,547),1101=>array(67,-14,550,560),1102=>array(84,-14,928,560),1103=>array(31,0,560,547),1104=>array(43,-14,630,803),1105=>array(43,-14,630,774),1106=>array(20,-216,669,760),1107=>array(84,0,520,803),1108=>array(43,-14,526,560),1109=>array(52,-14,548,560),1110=>array(84,0,259,760),1111=>array(17,0,325,774),1112=>array(-33,-216,259,760),1113=>array(44,0,942,547),1114=>array(84,0,912,547),1115=>array(20,0,656,760),1116=>array(84,0,664,803),1117=>array(84,0,617,803),1118=>array(12,-216,634,765),1119=>array(84,-138,607,547),1120=>array(50,-14,1043,729),1121=>array(43,-13,826,547),1122=>array(49,0,791,729),1123=>array(20,0,692,731),1124=>array(92,-14,948,742),1125=>array(84,-14,760,560),1126=>array(8,0,984,729),1127=>array(25,0,807,547),1128=>array(92,0,1351,729),1129=>array(84,0,1097,547),1130=>array(50,0,800,729),1131=>array(43,0,644,547),1132=>array(92,0,1137,729),1133=>array(84,0,964,547),1134=>array(54,-208,616,938),1135=>array(40,-193,493,756),1136=>array(9,0,1060,729),1137=>array(9,-208,1046,759),1138=>array(50,-14,800,742),1139=>array(43,-14,644,560),1140=>array(5,0,826,742),1141=>array(9,0,681,560),1142=>array(5,0,826,928),1143=>array(9,0,681,800),1144=>array(47,-216,1130,742),1145=>array(43,-216,1025,560),1146=>array(50,-14,1024,742),1147=>array(43,-14,820,560),1148=>array(57,-14,1348,928),1149=>array(47,-13,1126,828),1150=>array(50,-14,1043,910),1151=>array(43,-13,826,746),1152=>array(50,-208,670,742),1153=>array(43,-208,526,560),1154=>array(27,-33,521,488),1155=>array(-601,606,-85,822),1156=>array(-413,638,0,784),1157=>array(-365,595,-231,785),1158=>array(-365,595,-231,785),1159=>array(-796,592,4,788),1160=>array(-1069,-179,383,928),1161=>array(-996,-280,306,1022),1162=>array(92,-208,933,927),1163=>array(84,-208,782,765),1164=>array(23,0,692,729),1165=>array(0,0,567,702),1166=>array(92,0,702,729),1167=>array(84,-208,671,560),1168=>array(92,0,610,878),1169=>array(84,0,499,700),1170=>array(28,0,638,729),1171=>array(21,0,519,547),1172=>array(92,-200,728,729),1173=>array(84,-216,591,547),1174=>array(15,-157,1209,729),1175=>array(15,-138,980,547),1176=>array(66,-196,645,742),1177=>array(49,-196,518,560),1178=>array(92,-157,803,729),1179=>array(84,-138,664,547),1180=>array(92,0,803,729),1181=>array(84,0,664,547),1182=>array(23,0,803,729),1183=>array(7,0,664,760),1184=>array(24,0,1000,729),1185=>array(20,0,812,547),1186=>array(92,-157,932,729),1187=>array(84,-138,783,547),1188=>array(92,0,1075,729),1189=>array(84,0,847,547),1190=>array(92,-200,1193,729),1191=>array(84,-216,939,547),1192=>array(56,-14,924,743),1193=>array(55,-14,836,560),1194=>array(50,-196,670,742),1195=>array(43,-196,526,560),1196=>array(5,-157,677,729),1197=>array(4,-138,575,547),1198=>array(-10,0,734,729),1199=>array(12,-216,634,547),1200=>array(-10,0,734,729),1201=>array(12,-216,634,547),1202=>array(19,-157,751,729),1203=>array(15,-138,630,547),1204=>array(5,-157,1088,729),1205=>array(4,-138,976,547),1206=>array(81,-157,904,729),1207=>array(64,-138,749,547),1208=>array(81,0,716,729),1209=>array(64,0,573,547),1210=>array(81,0,716,729),1211=>array(84,0,634,760),1212=>array(7,-14,976,742),1213=>array(5,-14,761,560),1214=>array(7,-184,976,742),1215=>array(5,-161,761,560),1216=>array(92,0,280,729),1217=>array(15,0,1209,927),1218=>array(15,0,980,784),1219=>array(92,-200,769,729),1220=>array(84,-216,626,547),1221=>array(26,-208,926,729),1222=>array(21,-208,781,547),1223=>array(92,-200,745,729),1224=>array(84,-216,608,547),1225=>array(92,-208,933,729),1226=>array(84,-208,782,547),1227=>array(81,-157,716,729),1228=>array(64,-138,573,547),1229=>array(92,-208,1090,729),1230=>array(84,-208,908,547),1231=>array(84,0,259,760),1232=>array(5,0,769,935),1233=>array(43,-14,596,780),1234=>array(5,0,769,927),1235=>array(43,-14,596,774),1236=>array(0,0,1012,729),1237=>array(43,-14,1000,560),1238=>array(92,0,610,927),1239=>array(43,-14,630,784),1240=>array(51,-14,800,742),1241=>array(43,-14,630,560),1242=>array(51,-14,800,927),1243=>array(43,-14,630,774),1244=>array(15,0,1209,927),1245=>array(15,0,980,774),1246=>array(66,-14,645,927),1247=>array(49,-14,518,773),1248=>array(72,-33,728,729),1249=>array(43,-215,593,547),1250=>array(92,0,745,914),1251=>array(84,0,617,763),1252=>array(92,0,745,927),1253=>array(84,0,617,774),1254=>array(50,-14,800,927),1255=>array(43,-14,644,774),1256=>array(50,-14,800,742),1257=>array(43,-14,644,560),1258=>array(50,-14,800,927),1259=>array(43,-14,644,774),1260=>array(64,-14,684,927),1261=>array(67,-14,550,774),1262=>array(29,0,741,914),1263=>array(12,-216,634,763),1264=>array(29,0,741,927),1265=>array(12,-216,634,774),1266=>array(29,0,741,927),1267=>array(12,-216,634,800),1268=>array(81,0,716,927),1269=>array(64,0,573,774),1270=>array(92,-157,610,729),1271=>array(84,-138,499,547),1272=>array(92,0,944,927),1273=>array(84,0,823,774),1274=>array(28,-216,638,729),1275=>array(21,-217,519,547),1276=>array(19,-200,750,729),1277=>array(15,-216,620,547),1278=>array(19,0,751,729),1279=>array(15,0,630,547),1280=>array(70,0,670,729),1281=>array(44,0,524,547),1282=>array(70,-14,1081,729),1283=>array(44,-14,850,547),1284=>array(98,-14,1027,742),1285=>array(79,-14,836,560),1286=>array(98,-208,804,742),1287=>array(79,-208,668,560),1288=>array(26,-14,1150,729),1289=>array(21,-14,933,547),1290=>array(92,-14,1186,729),1291=>array(84,-14,939,547),1292=>array(50,-14,748,742),1293=>array(43,-14,544,546),1294=>array(5,-14,846,729),1295=>array(4,-14,709,547),1296=>array(67,-14,616,742),1297=>array(54,-14,493,560),1298=>array(46,-200,739,729),1299=>array(55,-216,648,547),1300=>array(46,0,1266,729),1301=>array(55,0,1053,547),1302=>array(92,0,1045,729),1303=>array(84,-208,964,560),1304=>array(64,0,1008,729),1305=>array(31,-14,965,560),1306=>array(50,-146,800,742),1307=>array(45,-208,632,559),1308=>array(30,0,1072,729),1309=>array(35,0,889,547),1310=>array(92,0,803,729),1311=>array(84,0,664,547),1312=>array(46,-200,1187,729),1313=>array(55,-216,980,547),1314=>array(92,-200,1193,729),1315=>array(84,-216,939,547),1316=>array(92,-157,933,729),1317=>array(84,-138,782,547),1329=>array(83,-38,731,729),1330=>array(83,0,655,743),1331=>array(26,0,728,743),1332=>array(22,0,731,743),1333=>array(83,-14,655,729),1334=>array(66,0,664,743),1335=>array(83,0,625,729),1336=>array(83,0,655,743),1337=>array(83,-13,903,742),1338=>array(26,-14,728,729),1339=>array(83,0,648,729),1340=>array(83,0,549,729),1341=>array(83,-14,888,729),1342=>array(62,-12,722,741),1343=>array(74,0,639,729),1344=>array(4,-46,598,729),1345=>array(66,-48,664,743),1346=>array(18,0,715,743),1347=>array(22,0,660,735),1348=>array(83,-14,780,729),1349=>array(57,-14,645,743),1350=>array(0,-14,697,729),1351=>array(57,-14,655,729),1352=>array(83,0,648,743),1353=>array(40,-48,638,743),1354=>array(18,0,789,743),1355=>array(57,0,654,743),1356=>array(83,0,780,743),1357=>array(92,-14,720,729),1358=>array(18,0,715,729),1359=>array(53,-14,641,743),1360=>array(83,0,648,743),1361=>array(57,-14,645,743),1362=>array(83,0,567,729),1363=>array(22,0,811,729),1364=>array(9,0,645,743),1365=>array(49,-14,799,742),1366=>array(44,-14,833,729),1369=>array(104,481,230,760),1370=>array(57,418,250,729),1371=>array(0,616,310,800),1372=>array(0,595,375,893),1373=>array(-7,614,290,847),1374=>array(0,586,460,878),1375=>array(40,618,434,893),1377=>array(71,-13,863,547),1378=>array(76,-208,571,560),1379=>array(40,-208,700,559),1380=>array(76,-208,703,560),1381=>array(71,-14,567,760),1382=>array(40,-208,700,559),1383=>array(76,0,532,760),1384=>array(76,-208,579,560),1385=>array(76,-208,756,560),1386=>array(40,-14,700,760),1387=>array(76,-208,571,760),1388=>array(76,-208,410,547),1389=>array(76,-208,909,760),1390=>array(40,-14,600,760),1391=>array(71,-208,567,760),1392=>array(76,0,571,760),1393=>array(26,-13,536,760),1394=>array(76,-208,703,560),1395=>array(62,-13,570,768),1396=>array(71,-13,699,760),1397=>array(-30,-216,233,547),1398=>array(-61,-13,567,760),1399=>array(13,-208,456,560),1400=>array(76,0,571,560),1401=>array(5,-208,375,547),1402=>array(71,-208,863,546),1403=>array(44,-208,533,560),1404=>array(76,0,622,560),1405=>array(71,-13,567,547),1406=>array(71,-208,699,760),1407=>array(71,-13,863,560),1408=>array(76,-208,571,560),1409=>array(44,-216,631,559),1410=>array(76,0,475,547),1411=>array(71,-208,863,760),1412=>array(-56,-208,604,560),1413=>array(44,-14,645,560),1414=>array(31,-190,774,760),1415=>array(71,-14,808,760),1417=>array(101,0,259,547),1418=>array(49,180,325,359),1456=>array(296,-229,394,-10),1457=>array(147,-229,501,-10),1458=>array(138,-229,492,-10),1459=>array(125,-229,492,-10),1460=>array(296,-171,394,-73),1461=>array(223,-171,467,-73),1462=>array(235,-229,455,-10),1463=>array(174,-171,516,0),1464=>array(187,-217,504,0),1465=>array(-24,547,73,723),1466=>array(-24,547,73,723),1467=>array(187,-239,528,-5),1468=>array(301,225,399,322),1469=>array(296,-217,394,-22),1470=>array(54,413,361,555),1471=>array(187,547,504,710),1472=>array(98,-98,273,645),1473=>array(753,613,851,710),1474=>array(137,613,235,710),1475=>array(98,0,273,547),1478=>array(78,0,462,547),1479=>array(187,-229,504,-10),1488=>array(84,0,644,547),1489=>array(43,0,567,547),1490=>array(43,-9,418,547),1491=>array(43,0,545,547),1492=>array(91,0,596,547),1493=>array(91,0,252,547),1494=>array(43,0,357,547),1495=>array(91,0,596,547),1496=>array(90,-13,624,553),1497=>array(66,164,228,547),1498=>array(43,-240,487,547),1499=>array(43,0,511,547),1500=>array(43,0,527,711),1501=>array(91,0,605,547),1502=>array(43,0,633,554),1503=>array(91,-240,252,547),1504=>array(43,0,362,547),1505=>array(90,-13,624,547),1506=>array(43,-101,575,547),1507=>array(91,-240,584,547),1508=>array(91,0,603,547),1509=>array(11,-240,543,548),1510=>array(33,0,564,547),1511=>array(91,-240,660,546),1512=>array(43,0,511,547),1513=>array(20,0,750,547),1514=>array(10,-4,592,547),1520=>array(91,0,574,547),1521=>array(66,0,524,547),1522=>array(66,164,500,547),1523=>array(84,361,360,547),1524=>array(84,361,626,547),1542=>array(-2,-20,630,892),1543=>array(-2,-20,630,897),1545=>array(65,0,811,635),1546=>array(65,0,1084,635),1548=>array(98,0,322,331),1557=>array(121,612,379,868),1563=>array(98,0,323,689),1567=>array(69,0,515,742),1569=>array(73,20,437,493),1570=>array(-20,0,362,955),1571=>array(75,0,259,993),1572=>array(-42,-244,547,603),1573=>array(76,-245,259,760),1574=>array(63,-107,863,603),1575=>array(84,0,259,760),1576=>array(63,-149,921,327),1577=>array(48,-30,540,513),1578=>array(63,-5,921,415),1579=>array(63,-5,921,537),1580=>array(77,-244,720,425),1581=>array(77,-244,720,425),1582=>array(77,-244,720,579),1583=>array(61,-15,442,415),1584=>array(61,-15,442,579),1585=>array(-42,-244,508,269),1586=>array(-42,-244,508,457),1587=>array(63,-244,1297,366),1588=>array(63,-244,1297,586),1589=>array(63,-244,1265,362),1590=>array(63,-244,1265,457),1591=>array(70,0,971,760),1592=>array(70,0,971,760),1593=>array(87,-244,720,521),1594=>array(87,-244,720,652),1600=>array(-10,0,352,125),1601=>array(63,-24,1082,627),1602=>array(52,-215,825,635),1603=>array(70,-27,814,760),1604=>array(70,-142,778,760),1605=>array(68,-244,660,369),1606=>array(62,-165,779,457),1607=>array(48,-30,540,358),1608=>array(-42,-244,547,322),1609=>array(63,-107,863,462),1610=>array(63,-244,863,462),1611=>array(107,591,393,825),1612=>array(107,591,393,881),1613=>array(107,-239,393,-5),1614=>array(107,591,393,723),1615=>array(107,590,393,881),1616=>array(107,-137,393,-5),1617=>array(88,599,412,869),1618=>array(115,610,383,878),1619=>array(59,584,441,735),1620=>array(154,601,335,822),1621=>array(155,-245,336,-23),1623=>array(107,615,393,906),1626=>array(99,616,401,775),1632=>array(218,195,392,366),1633=>array(140,0,431,635),1634=>array(12,0,598,635),1635=>array(12,0,597,635),1636=>array(74,-10,530,646),1637=>array(63,-10,547,643),1638=>array(37,0,574,635),1639=>array(15,0,596,635),1640=>array(15,0,596,635),1641=>array(32,0,590,640),1642=>array(65,0,545,635),1643=>array(0,-118,349,318),1644=>array(63,418,278,729),1645=>array(42,101,502,537),1646=>array(63,-5,921,327),1647=>array(52,-215,825,484),1648=>array(216,600,284,885),1652=>array(51,641,232,863),1657=>array(63,-5,921,599),1658=>array(63,-5,921,566),1659=>array(63,-244,921,327),1660=>array(63,-171,921,415),1661=>array(63,-5,921,566),1662=>array(63,-244,921,327),1663=>array(63,-5,921,566),1664=>array(63,-244,921,327),1665=>array(77,-244,720,725),1666=>array(77,-244,720,737),1667=>array(77,-244,720,425),1668=>array(77,-244,720,425),1669=>array(77,-244,720,737),1670=>array(77,-244,720,425),1671=>array(77,-244,720,425),1672=>array(61,-15,442,746),1673=>array(61,-180,442,415),1674=>array(61,-171,442,415),1675=>array(61,-171,442,746),1676=>array(61,-15,442,586),1677=>array(61,-146,442,415),1678=>array(61,-15,442,708),1679=>array(61,-15,442,684),1680=>array(61,-15,442,708),1681=>array(-42,-244,520,648),1682=>array(-42,-244,542,556),1683=>array(-42,-244,587,269),1684=>array(-42,-244,522,269),1685=>array(-42,-244,753,269),1686=>array(-42,-244,522,269),1687=>array(-42,-244,508,464),1688=>array(-42,-244,508,586),1689=>array(-42,-244,508,586),1690=>array(63,-244,1297,464),1691=>array(63,-244,1297,366),1692=>array(63,-244,1297,586),1693=>array(63,-244,1265,362),1694=>array(63,-244,1265,586),1695=>array(70,0,971,760),1696=>array(87,-244,720,781),1697=>array(63,-24,1082,484),1698=>array(63,-171,1082,484),1699=>array(63,-171,1082,635),1700=>array(63,-24,1082,786),1701=>array(63,-293,1082,484),1702=>array(63,-24,1082,786),1703=>array(52,-215,825,635),1704=>array(52,-215,825,757),1705=>array(63,-39,1024,760),1706=>array(63,-39,1194,760),1707=>array(63,-39,1024,760),1708=>array(70,-27,814,760),1709=>array(70,-27,814,854),1710=>array(70,-293,814,760),1711=>array(63,-39,1024,910),1712=>array(63,-39,1024,910),1713=>array(63,-39,1024,910),1714=>array(63,-171,1024,910),1715=>array(63,-293,1024,910),1716=>array(63,-39,1024,1025),1717=>array(70,-142,841,971),1718=>array(70,-142,778,952),1719=>array(70,-142,781,1025),1720=>array(70,-391,778,760),1721=>array(62,-317,779,464),1722=>array(62,-165,779,366),1723=>array(62,-165,779,636),1724=>array(62,-330,779,464),1725=>array(62,-165,779,586),1726=>array(70,-33,877,506),1727=>array(77,-244,720,579),1734=>array(-42,-244,547,556),1740=>array(63,-107,863,462),1742=>array(63,-107,863,556),1749=>array(48,-30,540,358),1776=>array(218,195,392,366),1777=>array(140,0,431,635),1778=>array(12,0,598,635),1779=>array(12,0,597,635),1780=>array(12,0,573,650),1781=>array(30,-8,580,643),1782=>array(85,0,514,645),1783=>array(15,0,596,635),1784=>array(15,0,596,635),1785=>array(32,0,590,640),1984=>array(48,-14,648,742),1985=>array(69,0,583,729),1986=>array(80,0,616,729),1987=>array(80,0,616,729),1988=>array(80,0,616,729),1989=>array(80,0,616,729),1990=>array(80,0,616,729),1991=>array(98,0,599,729),1992=>array(98,0,599,729),1993=>array(70,0,625,742),1994=>array(84,0,259,729),1995=>array(43,-14,504,465),1996=>array(15,0,529,729),1997=>array(15,0,637,451),1998=>array(84,0,607,451),1999=>array(84,0,607,451),2000=>array(46,0,548,742),2001=>array(84,0,607,667),2002=>array(43,0,820,742),2003=>array(84,0,467,729),2004=>array(84,0,467,729),2005=>array(84,0,584,729),2006=>array(84,0,604,729),2007=>array(15,0,360,729),2008=>array(84,0,938,532),2009=>array(15,0,491,729),2010=>array(15,0,811,729),2011=>array(84,0,607,451),2012=>array(15,0,637,729),2013=>array(84,0,869,729),2014=>array(84,0,543,729),2015=>array(43,0,692,729),2016=>array(15,0,491,729),2017=>array(15,0,637,729),2018=>array(43,0,531,729),2019=>array(84,0,543,729),2020=>array(84,0,543,581),2021=>array(84,0,543,729),2022=>array(43,0,531,729),2023=>array(43,0,531,729),2027=>array(95,668,403,760),2028=>array(63,638,438,777),2029=>array(185,654,319,774),2030=>array(65,616,433,800),2031=>array(33,616,438,803),2032=>array(63,638,438,777),2033=>array(33,616,438,803),2034=>array(183,-212,317,-92),2035=>array(96,654,404,774),2036=>array(63,418,278,729),2037=>array(103,418,318,729),2040=>array(84,0,607,562),2041=>array(84,0,607,564),2042=>array(-10,0,425,125),3647=>array(62,-147,638,760),3713=>array(43,-14,706,560),3714=>array(43,-14,723,560),3716=>array(43,-14,704,560),3719=>array(21,-241,521,561),3720=>array(42,0,705,560),3722=>array(40,-269,768,560),3725=>array(40,-24,713,610),3732=>array(42,-14,647,560),3733=>array(42,-19,647,561),3734=>array(-22,-240,684,560),3735=>array(20,-14,768,560),3737=>array(37,-15,681,560),3738=>array(38,-15,664,561),3739=>array(38,-15,664,760),3740=>array(60,-12,910,626),3741=>array(64,-14,762,760),3742=>array(76,-14,773,560),3743=>array(76,-14,773,760),3745=>array(24,-14,771,547),3746=>array(40,-23,713,760),3747=>array(48,-10,733,615),3749=>array(41,-33,693,560),3751=>array(33,-33,640,561),3754=>array(51,-21,819,724),3755=>array(44,-21,935,620),3757=>array(53,-20,662,606),3758=>array(48,-14,825,698),3759=>array(43,-259,897,648),3760=>array(36,-16,658,567),3761=>array(-653,610,-31,896),3762=>array(39,0,563,593),3763=>array(-479,0,563,875),3764=>array(-654,622,-62,950),3765=>array(-654,633,13,962),3766=>array(-654,622,-62,950),3767=>array(-654,633,13,962),3768=>array(-426,-385,-165,-55),3769=>array(-473,-316,-174,-28),3771=>array(-653,610,-31,896),3772=>array(-682,-311,15,-48),3773=>array(39,-220,691,776),3776=>array(83,-13,444,561),3777=>array(83,-13,818,561),3778=>array(-37,-14,458,936),3779=>array(23,-14,595,879),3780=>array(-15,-35,585,809),3782=>array(70,-240,688,582),3784=>array(-413,659,-297,844),3785=>array(-627,622,-22,918),3786=>array(-667,621,39,965),3787=>array(-521,612,-187,917),3788=>array(-682,603,15,866),3789=>array(-479,668,-229,875),3792=>array(66,-29,723,563),3793=>array(25,-139,721,586),3794=>array(31,-80,603,711),3795=>array(24,-14,882,981),3796=>array(48,-156,696,711),3797=>array(48,-156,696,711),3798=>array(64,-14,894,950),3799=>array(43,-240,706,560),3800=>array(72,-269,774,582),3801=>array(58,-14,858,564),3804=>array(44,-21,1301,620),3805=>array(44,-21,1305,620),4256=>array(47,-14,827,819),4257=>array(39,-0,719,819),4258=>array(37,-138,667,828),4259=>array(41,-15,793,819),4260=>array(29,0,572,828),4261=>array(24,0,729,828),4262=>array(15,-14,709,819),4263=>array(49,-14,890,828),4264=>array(4,0,415,862),4265=>array(39,0,581,819),4266=>array(18,-14,796,820),4267=>array(48,-14,837,819),4268=>array(43,0,586,819),4269=>array(37,-157,817,829),4270=>array(11,-14,731,822),4271=>array(20,0,585,823),4272=>array(43,-15,863,820),4273=>array(43,-15,587,820),4274=>array(43,-0,586,828),4275=>array(37,-170,817,828),4276=>array(37,0,828,825),4277=>array(28,0,695,820),4278=>array(44,0,586,828),4279=>array(34,0,577,820),4280=>array(39,-14,582,820),4281=>array(43,0,586,819),4282=>array(45,-14,778,827),4283=>array(46,-15,822,820),4284=>array(43,-0,586,819),4285=>array(29,-15,594,828),4286=>array(43,-0,586,819),4287=>array(15,0,726,819),4288=>array(18,-14,796,820),4289=>array(43,0,586,820),4290=>array(37,-15,652,828),4291=>array(9,0,552,820),4292=>array(33,0,561,820),4293=>array(24,-14,714,828),4304=>array(49,-14,505,599),4305=>array(49,-14,515,823),4306=>array(44,-232,578,561),4307=>array(49,-225,786,557),4308=>array(49,-232,496,557),4309=>array(49,-232,505,557),4310=>array(25,-14,502,828),4311=>array(49,-14,779,557),4312=>array(49,0,515,557),4313=>array(49,-232,506,542),4314=>array(49,-225,1025,562),4315=>array(49,-14,505,828),4316=>array(63,-14,520,819),4317=>array(49,-0,765,557),4318=>array(49,-14,505,818),4319=>array(49,-232,504,560),4320=>array(49,0,774,830),4321=>array(63,-14,520,818),4322=>array(49,-232,651,670),4323=>array(29,-232,533,604),4324=>array(49,-232,792,558),4325=>array(49,-232,496,818),4326=>array(49,-225,766,557),4327=>array(49,-232,505,549),4328=>array(20,-14,489,828),4329=>array(63,0,520,828),4330=>array(49,-232,573,548),4331=>array(49,-14,504,818),4332=>array(64,-15,534,828),4333=>array(49,-232,517,818),4334=>array(63,-14,520,818),4335=>array(24,-232,516,580),4336=>array(49,-15,505,823),4337=>array(49,-14,505,823),4338=>array(49,-146,504,557),4339=>array(49,-232,505,558),4340=>array(49,-232,504,828),4341=>array(49,-14,558,828),4342=>array(49,-232,803,557),4343=>array(49,-232,556,557),4344=>array(49,-232,505,549),4345=>array(44,-232,578,561),4346=>array(49,-111,505,557),4347=>array(49,0,399,500),4348=>array(24,400,294,828),5121=>array(5,0,769,729),5122=>array(5,0,769,1056),5123=>array(5,0,769,729),5124=>array(5,0,769,928),5125=>array(92,0,821,729),5126=>array(92,0,821,928),5127=>array(92,0,821,927),5129=>array(92,0,821,729),5130=>array(84,0,813,729),5131=>array(84,0,813,928),5132=>array(92,0,1013,729),5133=>array(5,0,925,729),5134=>array(92,0,1013,729),5135=>array(5,0,925,729),5136=>array(92,0,1013,928),5137=>array(5,0,925,928),5138=>array(92,0,1065,729),5139=>array(92,0,1056,729),5140=>array(92,0,1065,928),5141=>array(92,0,1056,928),5142=>array(92,0,821,928),5143=>array(92,0,1057,729),5144=>array(84,0,1058,729),5145=>array(92,0,1057,928),5146=>array(84,0,1058,928),5147=>array(84,0,813,928),5149=>array(92,607,226,728),5150=>array(60,326,473,734),5151=>array(31,338,379,722),5152=>array(31,338,379,722),5153=>array(60,392,338,711),5154=>array(60,352,338,670),5155=>array(60,392,338,670),5156=>array(60,392,338,670),5157=>array(31,327,518,749),5158=>array(60,326,414,734),5159=>array(92,304,226,424),5160=>array(60,494,338,569),5161=>array(60,392,338,670),5162=>array(60,392,338,693),5163=>array(5,0,1167,729),5164=>array(5,0,940,729),5165=>array(92,0,1170,729),5166=>array(84,0,1251,729),5167=>array(5,0,769,729),5168=>array(5,0,769,1056),5169=>array(5,0,769,729),5170=>array(5,0,769,928),5171=>array(73,0,802,729),5172=>array(73,0,802,928),5173=>array(73,0,802,927),5175=>array(73,0,802,729),5176=>array(73,0,802,729),5177=>array(73,0,802,928),5178=>array(92,0,1013,729),5179=>array(5,0,925,729),5180=>array(92,0,1013,729),5181=>array(5,0,925,729),5182=>array(92,0,1013,928),5183=>array(5,0,925,928),5184=>array(92,0,1046,729),5185=>array(73,0,1056,729),5186=>array(92,0,1046,928),5187=>array(73,0,1056,928),5188=>array(92,0,1046,729),5189=>array(73,0,1058,729),5190=>array(92,0,1046,928),5191=>array(73,0,1058,928),5192=>array(73,0,802,927),5193=>array(60,326,520,727),5194=>array(60,326,172,734),5196=>array(92,-14,720,729),5197=>array(92,0,720,1056),5198=>array(92,0,720,743),5199=>array(92,0,720,928),5200=>array(73,0,759,729),5201=>array(73,0,759,928),5202=>array(73,0,759,927),5204=>array(73,0,759,729),5205=>array(56,0,742,729),5206=>array(56,0,742,928),5207=>array(92,-14,964,729),5208=>array(92,-14,964,729),5209=>array(92,0,964,743),5210=>array(92,0,964,743),5211=>array(92,0,964,928),5212=>array(92,0,964,928),5213=>array(92,0,1003,729),5214=>array(73,0,970,729),5215=>array(92,0,1003,928),5216=>array(73,0,970,928),5217=>array(92,0,986,729),5218=>array(56,0,968,729),5219=>array(92,0,986,928),5220=>array(56,0,968,928),5221=>array(92,0,986,729),5222=>array(60,326,427,733),5223=>array(92,-14,949,734),5224=>array(92,0,949,743),5225=>array(73,0,967,734),5226=>array(56,0,960,734),5227=>array(41,0,651,743),5228=>array(92,0,702,1056),5229=>array(92,0,702,743),5230=>array(92,0,702,928),5231=>array(41,-14,651,729),5232=>array(41,-14,651,928),5233=>array(41,-14,708,927),5234=>array(92,-14,702,729),5235=>array(92,-14,702,928),5236=>array(92,0,937,743),5237=>array(41,0,891,743),5238=>array(92,0,939,743),5239=>array(92,0,891,743),5240=>array(92,0,939,928),5241=>array(92,0,891,928),5242=>array(92,-14,937,729),5243=>array(41,-14,891,729),5244=>array(92,-14,937,928),5245=>array(41,-14,891,928),5246=>array(92,-14,939,729),5247=>array(92,-14,891,729),5248=>array(92,-14,939,928),5249=>array(92,-14,891,928),5250=>array(92,-14,939,729),5251=>array(60,319,445,734),5252=>array(60,319,445,734),5253=>array(41,0,881,743),5254=>array(92,0,881,743),5255=>array(41,-14,881,734),5256=>array(92,-14,881,734),5257=>array(41,0,651,743),5258=>array(92,0,702,1056),5259=>array(92,0,702,743),5260=>array(92,0,702,928),5261=>array(41,-14,651,729),5262=>array(41,-14,651,928),5263=>array(41,-14,714,927),5264=>array(92,-14,702,729),5265=>array(92,-14,702,928),5266=>array(92,0,937,743),5267=>array(41,0,891,743),5268=>array(92,0,988,743),5269=>array(92,0,891,743),5270=>array(92,0,988,928),5271=>array(92,0,891,928),5272=>array(92,-14,937,729),5273=>array(41,-14,891,729),5274=>array(92,-14,937,928),5275=>array(41,-14,891,928),5276=>array(92,-14,988,729),5277=>array(92,-14,891,729),5278=>array(92,-14,988,928),5279=>array(92,-14,891,928),5280=>array(92,-14,988,729),5281=>array(60,319,445,734),5282=>array(60,319,445,734),5283=>array(27,0,535,729),5284=>array(92,0,599,1056),5285=>array(92,0,599,729),5286=>array(92,0,599,928),5287=>array(27,0,535,729),5288=>array(27,0,535,928),5289=>array(27,0,598,927),5290=>array(92,0,599,729),5291=>array(92,0,599,928),5292=>array(92,0,790,729),5293=>array(27,0,771,729),5294=>array(92,0,836,729),5295=>array(92,0,790,729),5296=>array(92,0,836,928),5297=>array(92,0,790,928),5298=>array(92,0,790,729),5299=>array(27,0,790,729),5300=>array(92,0,790,928),5301=>array(27,0,790,928),5302=>array(92,0,836,729),5303=>array(92,0,790,729),5304=>array(92,0,836,928),5305=>array(92,0,790,928),5306=>array(92,0,836,729),5307=>array(60,326,380,734),5308=>array(60,326,492,733),5309=>array(60,326,380,734),5312=>array(84,-14,947,468),5313=>array(41,-14,904,786),5314=>array(41,-14,904,468),5315=>array(41,-14,904,667),5316=>array(27,0,890,482),5317=>array(27,0,890,667),5318=>array(27,0,890,667),5319=>array(41,0,904,482),5320=>array(41,0,904,667),5321=>array(92,-14,1197,468),5322=>array(84,-14,1163,468),5323=>array(92,0,1172,482),5324=>array(41,0,1144,482),5325=>array(92,0,1172,667),5326=>array(41,0,1144,667),5327=>array(41,0,904,667),5328=>array(60,477,604,742),5329=>array(60,319,440,734),5330=>array(60,477,604,742),5331=>array(84,0,947,468),5332=>array(41,0,904,786),5333=>array(41,0,904,468),5334=>array(41,0,904,667),5335=>array(27,0,890,468),5336=>array(27,0,890,667),5337=>array(27,0,890,667),5338=>array(41,0,904,468),5339=>array(41,0,904,667),5340=>array(92,0,1190,468),5341=>array(84,0,1163,468),5342=>array(92,0,1199,468),5343=>array(41,0,1144,468),5344=>array(92,0,1199,667),5345=>array(41,0,1144,667),5346=>array(92,0,1187,468),5347=>array(27,0,1130,468),5348=>array(92,0,1187,667),5349=>array(27,0,1130,667),5350=>array(92,0,1199,468),5351=>array(41,0,1144,468),5352=>array(92,0,1199,667),5353=>array(41,0,1144,667),5354=>array(60,477,604,734),5356=>array(73,0,802,729),5357=>array(41,0,638,729),5358=>array(92,0,736,1056),5359=>array(92,0,689,729),5360=>array(92,0,689,928),5361=>array(41,0,638,729),5362=>array(41,0,638,928),5363=>array(41,0,694,927),5364=>array(92,0,689,729),5365=>array(92,0,689,928),5366=>array(92,0,906,729),5367=>array(41,0,875,729),5368=>array(92,0,926,729),5369=>array(92,0,905,729),5370=>array(92,0,926,928),5371=>array(92,0,905,928),5372=>array(92,0,906,729),5373=>array(41,0,875,729),5374=>array(92,0,906,928),5375=>array(41,0,875,928),5376=>array(92,0,926,729),5377=>array(92,0,905,729),5378=>array(92,0,926,928),5379=>array(92,0,905,928),5380=>array(92,0,926,729),5381=>array(60,326,437,734),5382=>array(60,319,404,742),5383=>array(60,326,437,734),5392=>array(41,-14,882,743),5393=>array(41,-14,882,743),5394=>array(41,-14,882,928),5395=>array(41,-14,1095,482),5396=>array(41,-14,1095,667),5397=>array(41,-14,1095,482),5398=>array(41,-14,1095,667),5399=>array(92,-14,1168,743),5400=>array(41,-14,1118,743),5401=>array(92,-14,1168,743),5402=>array(41,-14,1118,743),5403=>array(92,-14,1168,928),5404=>array(41,-14,1118,928),5405=>array(92,-14,1390,482),5406=>array(41,-14,1336,482),5407=>array(92,-14,1390,667),5408=>array(41,-14,1336,667),5409=>array(92,-14,1390,482),5410=>array(41,-14,1336,482),5411=>array(92,-14,1390,667),5412=>array(41,-14,1336,667),5413=>array(60,469,690,747),5414=>array(84,0,684,729),5415=>array(92,0,692,1056),5416=>array(92,0,692,729),5417=>array(92,0,692,928),5418=>array(84,0,684,729),5419=>array(84,0,684,928),5420=>array(84,0,750,927),5421=>array(92,0,692,729),5422=>array(92,0,692,928),5423=>array(92,0,911,729),5424=>array(84,0,919,729),5425=>array(92,0,929,729),5426=>array(92,0,912,729),5427=>array(92,0,929,928),5428=>array(92,0,912,928),5429=>array(92,0,911,729),5430=>array(84,0,919,729),5431=>array(92,0,911,928),5432=>array(84,0,919,928),5433=>array(92,0,929,729),5434=>array(92,0,912,729),5435=>array(92,0,929,928),5436=>array(92,0,912,928),5437=>array(92,0,929,928),5438=>array(60,326,438,734),5440=>array(60,392,338,670),5441=>array(60,326,454,734),5442=>array(92,-14,949,468),5443=>array(84,-14,941,468),5444=>array(27,0,884,482),5445=>array(92,0,949,786),5446=>array(92,0,949,482),5447=>array(92,0,949,667),5448=>array(92,0,692,729),5449=>array(92,0,692,928),5450=>array(92,0,692,729),5451=>array(41,0,641,729),5452=>array(41,0,641,928),5453=>array(41,0,641,729),5454=>array(92,0,911,928),5455=>array(41,0,875,928),5456=>array(60,326,438,727),5458=>array(73,0,802,729),5459=>array(51,0,769,743),5460=>array(51,-14,769,1056),5461=>array(51,-14,769,729),5462=>array(51,-14,769,928),5463=>array(73,0,844,663),5464=>array(73,0,844,928),5465=>array(84,0,855,663),5466=>array(84,0,855,928),5467=>array(92,0,1099,928),5468=>array(84,0,1058,928),5469=>array(60,311,546,675),5470=>array(92,-14,720,743),5471=>array(92,-14,720,743),5472=>array(92,-14,720,743),5473=>array(92,-14,720,743),5474=>array(92,-14,720,928),5475=>array(92,-14,720,928),5476=>array(54,0,759,729),5477=>array(54,0,759,928),5478=>array(56,0,762,729),5479=>array(56,0,762,928),5480=>array(92,0,1006,928),5481=>array(56,0,968,928),5482=>array(60,326,512,733),5492=>array(41,0,893,743),5493=>array(84,0,936,743),5494=>array(84,0,936,928),5495=>array(41,-14,893,729),5496=>array(41,-14,893,928),5497=>array(84,-14,936,729),5498=>array(84,-14,936,928),5499=>array(60,319,562,734),5500=>array(92,0,745,729),5501=>array(60,326,454,734),5502=>array(60,0,1197,1056),5503=>array(60,0,1197,743),5504=>array(60,0,1197,928),5505=>array(60,-14,1146,729),5506=>array(60,-14,1146,928),5507=>array(60,-14,1197,729),5508=>array(60,-14,1197,928),5509=>array(60,319,939,734),5514=>array(41,0,893,743),5515=>array(84,0,936,743),5516=>array(41,-14,893,729),5517=>array(84,-14,936,729),5518=>array(60,0,1550,1056),5519=>array(60,0,1550,743),5520=>array(60,0,1550,928),5521=>array(60,-14,1203,741),5522=>array(60,-14,1203,928),5523=>array(60,-14,1550,741),5524=>array(60,-14,1550,928),5525=>array(60,335,792,741),5526=>array(60,335,1217,741),5536=>array(41,0,904,709),5537=>array(41,0,904,709),5538=>array(27,-242,890,468),5539=>array(27,-242,890,667),5540=>array(41,-242,904,468),5541=>array(41,-242,904,667),5542=>array(60,344,604,734),5543=>array(84,0,771,729),5544=>array(5,0,692,729),5545=>array(5,0,692,928),5546=>array(84,0,771,729),5547=>array(84,0,771,928),5548=>array(5,0,692,729),5549=>array(5,0,692,928),5550=>array(15,326,438,734),5551=>array(92,-14,702,729),5598=>array(92,0,778,729),5601=>array(52,0,738,729),5702=>array(60,326,439,734),5703=>array(60,240,439,820),5742=>array(10,0,403,306),5743=>array(60,0,1146,743),5744=>array(60,0,1499,743),5745=>array(60,0,1975,743),5746=>array(60,0,1975,928),5747=>array(60,-14,1628,741),5748=>array(60,-14,1586,928),5749=>array(60,-14,1975,741),5750=>array(60,-14,1975,928),5760=>array(-10,219,553,354),5761=>array(-10,-125,646,354),5762=>array(-10,-125,955,354),5763=>array(-10,-125,1264,354),5764=>array(-10,-125,1572,354),5765=>array(-10,-125,1881,354),5766=>array(-10,219,637,697),5767=>array(-10,219,945,697),5768=>array(-10,219,1264,697),5769=>array(-10,219,1569,697),5770=>array(-10,219,1881,697),5771=>array(-10,-125,579,697),5772=>array(-10,-125,888,697),5773=>array(-10,-125,1198,697),5774=>array(-10,-125,1507,697),5775=>array(-10,-125,1817,697),5776=>array(-10,41,646,532),5777=>array(-10,41,955,532),5778=>array(-10,41,1264,532),5779=>array(-10,41,1572,532),5780=>array(-10,41,1881,532),5781=>array(-10,-125,579,697),5782=>array(-10,-125,948,697),5783=>array(-10,-109,798,354),5784=>array(-10,-254,1244,354),5785=>array(-10,219,1569,928),5786=>array(-10,14,750,354),5787=>array(55,-49,648,622),5788=>array(-10,-49,583,622),7424=>array(15,0,637,547),7425=>array(0,0,755,547),7426=>array(43,-14,1000,560),7427=>array(20,0,564,547),7428=>array(43,-14,526,560),7429=>array(84,-1,611,547),7430=>array(20,-1,611,547),7431=>array(92,0,480,547),7432=>array(54,-14,493,560),7433=>array(84,-213,259,547),7434=>array(44,-14,416,547),7435=>array(84,0,684,547),7436=>array(-18,0,499,547),7437=>array(84,0,733,547),7438=>array(84,0,617,547),7439=>array(43,-14,644,560),7440=>array(43,-14,526,560),7441=>array(43,-27,617,573),7442=>array(43,31,617,515),7443=>array(13,-28,653,579),7444=>array(43,-14,1046,560),7446=>array(43,273,644,560),7447=>array(44,-14,646,273),7448=>array(51,0,515,547),7449=>array(21,0,560,547),7450=>array(21,0,560,547),7451=>array(4,0,575,547),7452=>array(84,-14,607,547),7453=>array(85,10,646,560),7454=>array(69,10,857,561),7455=>array(19,-238,651,560),7456=>array(15,0,637,547),7457=>array(35,0,889,547),7458=>array(45,0,534,547),7459=>array(57,-14,581,547),7462=>array(84,0,499,547),7463=>array(15,0,637,547),7464=>array(84,0,607,547),7465=>array(51,0,515,547),7466=>array(84,0,698,547),7467=>array(55,0,648,547),7468=>array(3,326,484,734),7469=>array(0,326,638,734),7470=>array(58,326,436,734),7472=>array(58,326,490,734),7473=>array(58,326,384,734),7474=>array(58,326,384,734),7475=>array(31,318,471,742),7476=>array(58,326,469,734),7477=>array(58,326,176,734),7478=>array(-35,214,176,734),7479=>array(58,326,507,734),7480=>array(58,326,384,734),7481=>array(58,326,569,734),7482=>array(58,326,469,734),7483=>array(58,326,469,734),7484=>array(31,318,504,742),7485=>array(39,318,471,742),7486=>array(58,326,436,734),7487=>array(58,326,473,734),7488=>array(3,326,426,734),7489=>array(58,318,454,734),7490=>array(19,326,675,734),7491=>array(53,318,402,640),7492=>array(53,318,402,640),7493=>array(53,318,423,640),7494=>array(53,318,656,640),7495=>array(53,318,423,751),7496=>array(53,318,423,751),7497=>array(53,318,423,640),7498=>array(53,318,423,640),7499=>array(53,318,330,640),7500=>array(53,318,330,640),7501=>array(53,205,423,639),7502=>array(53,207,164,632),7503=>array(53,326,431,751),7504=>array(53,326,607,640),7505=>array(53,205,399,640),7506=>array(53,318,432,640),7507=>array(53,318,357,640),7508=>array(53,479,432,640),7509=>array(53,318,432,479),7510=>array(53,209,423,640),7511=>array(53,326,332,719),7512=>array(53,318,399,632),7513=>array(53,332,407,640),7514=>array(53,318,607,632),7515=>array(53,326,445,632),7517=>array(53,209,423,759),7518=>array(10,209,420,632),7519=>array(27,318,406,756),7520=>array(41,209,457,635),7521=>array(16,209,391,632),7522=>array(53,0,164,425),7523=>array(54,0,314,313),7524=>array(53,-8,399,306),7525=>array(53,0,445,306),7526=>array(53,-117,423,433),7527=>array(10,-117,420,306),7528=>array(53,-117,423,314),7529=>array(41,-117,457,309),7530=>array(16,-117,391,306),7543=>array(84,-216,671,559),7544=>array(58,326,469,734),7547=>array(84,0,461,547),7549=>array(5,-208,742,560),7557=>array(84,-216,434,760),7579=>array(53,318,423,640),7580=>array(53,318,357,640),7581=>array(53,288,357,640),7582=>array(53,318,432,751),7583=>array(53,318,330,640),7584=>array(53,326,321,751),7585=>array(53,205,292,632),7586=>array(53,205,423,632),7587=>array(53,207,399,632),7588=>array(53,326,291,751),7589=>array(53,326,226,632),7590=>array(53,326,291,632),7591=>array(53,326,291,632),7592=>array(53,205,375,751),7593=>array(53,205,270,751),7594=>array(53,205,274,751),7595=>array(53,326,314,632),7596=>array(53,205,608,640),7597=>array(53,209,607,632),7598=>array(53,205,506,640),7599=>array(53,205,505,640),7600=>array(53,326,393,632),7601=>array(53,318,432,640),7602=>array(53,209,486,751),7603=>array(53,205,366,640),7604=>array(53,205,340,751),7605=>array(53,205,332,719),7606=>array(53,318,527,632),7607=>array(53,298,438,632),7608=>array(53,318,383,632),7609=>array(53,326,395,632),7610=>array(53,326,445,632),7611=>array(53,326,361,632),7612=>array(53,205,468,632),7613=>array(53,288,414,632),7614=>array(53,206,399,632),7615=>array(53,320,370,756),7620=>array(-467,616,-35,800),7621=>array(-467,616,-35,800),7622=>array(-467,616,-35,800),7623=>array(-467,616,-35,800),7624=>array(-513,616,11,800),7625=>array(-513,616,11,800),7680=>array(5,-240,769,729),7681=>array(43,-240,596,560),7682=>array(92,0,692,928),7683=>array(84,-14,671,913),7684=>array(92,-212,692,729),7685=>array(84,-212,671,760),7686=>array(92,-184,692,729),7687=>array(84,-184,671,760),7688=>array(50,-196,670,927),7689=>array(43,-196,526,800),7690=>array(92,0,778,927),7691=>array(45,-14,632,942),7692=>array(92,-212,778,729),7693=>array(45,-212,632,760),7694=>array(92,-184,778,729),7695=>array(45,-184,632,760),7696=>array(92,-192,778,729),7697=>array(45,-196,632,760),7698=>array(92,-240,778,729),7699=>array(45,-240,632,760),7700=>array(92,0,610,1057),7701=>array(43,-14,630,927),7702=>array(92,0,610,1057),7703=>array(43,-14,630,927),7704=>array(92,-203,610,729),7705=>array(43,-203,630,560),7706=>array(92,-195,610,729),7707=>array(43,-195,630,560),7708=>array(92,-196,610,927),7709=>array(43,-196,630,784),7710=>array(92,0,599,928),7711=>array(19,0,444,942),7712=>array(50,-14,747,901),7713=>array(45,-216,632,760),7714=>array(92,0,745,928),7715=>array(84,0,634,913),7716=>array(92,-212,745,729),7717=>array(84,-212,634,760),7718=>array(92,0,745,927),7719=>array(23,0,634,927),7720=>array(45,-196,745,729),7721=>array(38,-196,634,760),7722=>array(92,-236,745,729),7723=>array(84,-236,634,760),7724=>array(16,-195,355,729),7725=>array(1,-195,341,760),7726=>array(40,0,378,1057),7727=>array(16,0,354,917),7728=>array(92,0,805,927),7729=>array(84,0,684,982),7730=>array(92,-212,805,729),7731=>array(84,-212,684,760),7732=>array(92,-184,805,729),7733=>array(84,-184,684,760),7734=>array(92,-212,610,729),7735=>array(83,-212,259,760),7736=>array(32,-212,610,942),7737=>array(18,-212,325,914),7738=>array(92,-184,610,729),7739=>array(20,-184,328,760),7740=>array(92,-240,610,729),7741=>array(-13,-240,355,760),7742=>array(92,0,903,927),7743=>array(83,0,963,800),7744=>array(92,0,903,928),7745=>array(83,0,963,760),7746=>array(92,-212,903,729),7747=>array(83,-212,963,560),7748=>array(92,0,745,928),7749=>array(84,0,634,760),7750=>array(92,-212,745,729),7751=>array(84,-212,634,560),7752=>array(92,-184,745,729),7753=>array(84,-184,634,560),7754=>array(92,-240,745,729),7755=>array(84,-240,634,560),7756=>array(50,-14,800,1057),7757=>array(43,-14,644,916),7758=>array(50,-14,800,1043),7759=>array(43,-14,644,900),7760=>array(50,-14,800,1057),7761=>array(43,-14,644,927),7762=>array(50,-14,800,1057),7763=>array(43,-14,644,927),7764=>array(92,0,692,927),7765=>array(84,-208,671,800),7766=>array(92,0,692,928),7767=>array(84,-208,671,760),7768=>array(92,0,750,928),7769=>array(84,0,490,760),7770=>array(92,-212,750,729),7771=>array(83,-212,490,560),7772=>array(92,-212,750,914),7773=>array(83,-212,490,759),7774=>array(92,-184,750,729),7775=>array(33,-184,490,560),7776=>array(72,-14,647,928),7777=>array(52,-14,548,760),7778=>array(72,-212,647,742),7779=>array(52,-212,548,560),7780=>array(72,-14,647,928),7781=>array(52,-14,548,816),7782=>array(72,-14,647,1053),7783=>array(52,-14,548,1002),7784=>array(72,-212,647,928),7785=>array(52,-212,548,762),7786=>array(5,0,677,927),7787=>array(13,0,455,942),7788=>array(5,-212,677,729),7789=>array(13,-212,455,702),7790=>array(5,-184,677,729),7791=>array(13,-184,455,702),7792=>array(5,-240,677,729),7793=>array(13,-240,455,702),7794=>array(92,-212,720,729),7795=>array(78,-212,628,547),7796=>array(92,-196,720,729),7797=>array(78,-195,628,547),7798=>array(92,-203,720,729),7799=>array(78,-203,628,547),7800=>array(92,-14,720,1057),7801=>array(78,-14,628,916),7802=>array(92,-14,720,1043),7803=>array(78,-14,628,887),7804=>array(5,0,769,928),7805=>array(15,0,637,778),7806=>array(5,-212,769,729),7807=>array(15,-212,637,547),7808=>array(30,0,1072,931),7809=>array(35,0,889,803),7810=>array(30,0,1072,931),7811=>array(35,0,889,803),7812=>array(30,0,1072,927),7813=>array(35,0,889,774),7814=>array(30,0,1072,927),7815=>array(35,0,889,760),7816=>array(30,-212,1072,729),7817=>array(35,-212,889,547),7818=>array(19,0,751,928),7819=>array(15,0,630,760),7820=>array(19,0,751,927),7821=>array(15,0,630,774),7822=>array(-10,0,734,928),7823=>array(12,-216,634,760),7824=>array(45,0,680,927),7825=>array(45,0,534,798),7826=>array(45,-212,680,729),7827=>array(45,-212,534,547),7828=>array(45,-184,680,729),7829=>array(45,-184,534,547),7830=>array(84,-184,634,760),7831=>array(13,0,455,927),7832=>array(35,0,889,888),7833=>array(12,-216,634,888),7834=>array(43,-14,758,760),7835=>array(19,0,444,942),7836=>array(-18,0,444,760),7837=>array(19,0,444,760),7838=>array(92,-14,823,743),7839=>array(43,-14,645,768),7840=>array(5,-212,769,729),7841=>array(43,-212,596,560),7842=>array(5,0,769,1025),7843=>array(43,-14,596,843),7844=>array(5,0,769,1054),7845=>array(43,-14,652,873),7846=>array(5,0,769,1054),7847=>array(43,-14,597,874),7848=>array(5,0,769,1093),7849=>array(43,-14,672,912),7850=>array(5,0,769,1068),7851=>array(43,-14,596,887),7852=>array(5,-212,769,927),7853=>array(43,-212,596,800),7854=>array(5,0,769,1057),7855=>array(43,-14,596,891),7856=>array(5,0,769,1057),7857=>array(43,-14,596,894),7858=>array(5,0,769,1123),7859=>array(43,-14,596,959),7860=>array(5,0,769,1068),7861=>array(43,-14,596,905),7862=>array(5,-212,769,935),7863=>array(43,-212,596,780),7864=>array(92,-212,610,729),7865=>array(43,-212,630,560),7866=>array(92,0,610,1025),7867=>array(43,-14,630,843),7868=>array(92,0,610,928),7869=>array(43,-14,630,778),7870=>array(92,0,684,1054),7871=>array(43,-14,688,873),7872=>array(92,0,621,1054),7873=>array(43,-14,630,874),7874=>array(92,0,686,1093),7875=>array(43,-14,681,912),7876=>array(92,0,610,1068),7877=>array(43,-14,630,887),7878=>array(92,-212,610,927),7879=>array(43,-212,630,800),7880=>array(66,0,313,1025),7881=>array(52,0,300,842),7882=>array(92,-212,280,729),7883=>array(83,-212,259,760),7884=>array(50,-212,800,742),7885=>array(43,-212,644,560),7886=>array(50,-14,800,1025),7887=>array(43,-14,644,843),7888=>array(50,-14,800,1054),7889=>array(43,-14,679,873),7890=>array(50,-14,800,1054),7891=>array(43,-14,644,874),7892=>array(50,-14,800,1093),7893=>array(43,-14,685,912),7894=>array(50,-14,800,1068),7895=>array(43,-14,644,887),7896=>array(50,-212,800,927),7897=>array(43,-212,644,800),7898=>array(53,-14,854,927),7899=>array(46,-14,708,800),7900=>array(53,-14,854,927),7901=>array(46,-14,708,800),7902=>array(53,-14,854,1025),7903=>array(46,-14,708,843),7904=>array(53,-14,854,928),7905=>array(46,-14,708,778),7906=>array(53,-212,854,761),7907=>array(46,-212,708,609),7908=>array(92,-212,720,729),7909=>array(78,-212,628,547),7910=>array(92,-14,720,1025),7911=>array(78,-14,628,843),7912=>array(91,-14,833,927),7913=>array(75,-14,733,800),7914=>array(91,-14,833,927),7915=>array(75,-14,733,800),7916=>array(91,-14,833,1025),7917=>array(75,-14,733,843),7918=>array(91,-14,833,928),7919=>array(75,-14,733,778),7920=>array(91,-212,833,761),7921=>array(75,-212,733,609),7922=>array(-10,0,734,931),7923=>array(12,-216,634,803),7924=>array(-10,-212,734,729),7925=>array(12,-216,634,547),7926=>array(-10,0,734,1029),7927=>array(12,-216,634,843),7928=>array(-10,0,734,928),7929=>array(12,-216,634,778),7930=>array(92,0,925,729),7931=>array(9,0,635,760),7936=>array(48,-13,645,785),7937=>array(48,-13,645,785),7938=>array(48,-13,645,800),7939=>array(48,-13,645,800),7940=>array(48,-13,645,800),7941=>array(48,-13,645,800),7942=>array(48,-13,645,928),7943=>array(48,-13,645,928),7944=>array(5,0,769,785),7945=>array(5,0,769,785),7946=>array(2,0,1036,800),7947=>array(3,0,1039,800),7948=>array(1,0,930,800),7949=>array(2,0,958,800),7950=>array(4,0,831,928),7951=>array(3,0,854,928),7952=>array(54,-14,493,785),7953=>array(54,-14,493,785),7954=>array(54,-14,498,800),7955=>array(54,-14,493,800),7956=>array(54,-14,531,800),7957=>array(54,-14,516,800),7960=>array(3,0,718,785),7961=>array(4,0,721,785),7962=>array(2,0,1026,800),7963=>array(3,0,1023,800),7964=>array(1,0,950,800),7965=>array(2,0,979,800),7968=>array(84,-208,634,785),7969=>array(84,-208,634,785),7970=>array(84,-208,634,800),7971=>array(84,-208,634,800),7972=>array(84,-208,634,800),7973=>array(84,-208,634,800),7974=>array(84,-208,634,928),7975=>array(84,-208,634,928),7976=>array(3,0,854,785),7977=>array(4,0,859,785),7978=>array(2,0,1159,800),7979=>array(3,0,1158,800),7980=>array(1,0,1088,800),7981=>array(2,0,1114,800),7982=>array(4,0,962,928),7983=>array(3,0,971,928),7984=>array(78,-19,348,785),7985=>array(78,-19,348,785),7986=>array(-27,-19,407,800),7987=>array(-58,-19,376,800),7988=>array(31,-19,446,800),7989=>array(-6,-19,438,800),7990=>array(-2,-19,348,928),7991=>array(-5,-19,348,928),7992=>array(3,0,391,785),7993=>array(4,0,397,785),7994=>array(2,0,685,800),7995=>array(3,0,693,800),7996=>array(1,0,620,800),7997=>array(2,0,646,800),7998=>array(4,0,512,928),7999=>array(3,0,512,928),8000=>array(43,-14,644,785),8001=>array(43,-14,644,785),8002=>array(43,-14,644,800),8003=>array(43,-14,644,800),8004=>array(43,-14,644,800),8005=>array(43,-14,644,800),8008=>array(3,-14,841,785),8009=>array(4,-14,883,785),8010=>array(2,-14,1171,800),8011=>array(3,-14,1173,800),8012=>array(1,-14,1002,800),8013=>array(2,-14,1032,800),8016=>array(78,-10,629,785),8017=>array(78,-10,629,785),8018=>array(78,-10,629,800),8019=>array(78,-10,629,800),8020=>array(78,-10,629,800),8021=>array(78,-10,629,800),8022=>array(78,-10,629,928),8023=>array(78,-10,629,928),8025=>array(4,0,940,785),8027=>array(3,0,1194,800),8029=>array(2,0,1208,800),8031=>array(3,0,1059,928),8032=>array(43,-13,826,785),8033=>array(43,-13,826,785),8034=>array(43,-13,826,800),8035=>array(43,-13,826,800),8036=>array(43,-13,826,800),8037=>array(43,-13,826,800),8038=>array(43,-13,826,928),8039=>array(43,-13,826,928),8040=>array(3,0,881,785),8041=>array(4,0,931,785),8042=>array(2,0,1219,800),8043=>array(3,-3,1224,800),8044=>array(1,0,1048,800),8045=>array(2,0,1078,800),8046=>array(4,0,1000,928),8047=>array(3,0,1048,928),8048=>array(48,-13,645,800),8049=>array(48,-13,645,800),8050=>array(54,-14,493,800),8051=>array(54,-14,493,800),8052=>array(84,-208,634,800),8053=>array(84,-208,634,800),8054=>array(-26,-19,348,800),8055=>array(77,-19,353,800),8056=>array(43,-14,644,800),8057=>array(43,-14,644,800),8058=>array(78,-10,629,800),8059=>array(78,-10,629,800),8060=>array(43,-13,826,800),8061=>array(43,-13,826,800),8064=>array(48,-208,645,785),8065=>array(48,-208,645,785),8066=>array(48,-208,645,800),8067=>array(48,-208,645,800),8068=>array(48,-208,645,800),8069=>array(48,-208,645,800),8070=>array(48,-208,645,928),8071=>array(48,-208,645,928),8072=>array(5,-208,769,785),8073=>array(5,-208,769,785),8074=>array(2,-208,1036,800),8075=>array(3,-208,1039,800),8076=>array(1,-208,930,800),8077=>array(2,-208,958,800),8078=>array(4,-208,831,928),8079=>array(3,-208,854,928),8080=>array(84,-208,634,785),8081=>array(84,-208,634,785),8082=>array(84,-208,634,800),8083=>array(84,-208,634,800),8084=>array(84,-208,634,800),8085=>array(84,-208,634,800),8086=>array(84,-208,634,928),8087=>array(84,-208,634,928),8088=>array(3,-208,854,785),8089=>array(4,-208,859,785),8090=>array(2,-208,1159,800),8091=>array(3,-208,1158,800),8092=>array(1,-208,1088,800),8093=>array(2,-208,1114,800),8094=>array(4,-208,962,928),8095=>array(3,-208,971,928),8096=>array(43,-208,826,785),8097=>array(43,-208,826,785),8098=>array(43,-208,826,800),8099=>array(43,-208,826,800),8100=>array(43,-208,826,800),8101=>array(43,-208,826,800),8102=>array(43,-208,826,928),8103=>array(43,-208,826,928),8104=>array(3,-208,881,785),8105=>array(4,-208,931,785),8106=>array(2,-208,1219,800),8107=>array(3,-208,1224,800),8108=>array(1,-208,1048,800),8109=>array(2,-208,1078,800),8110=>array(4,-208,1000,928),8111=>array(3,-208,1048,928),8112=>array(48,-13,645,784),8113=>array(48,-13,645,760),8114=>array(48,-208,645,800),8115=>array(48,-208,645,559),8116=>array(48,-208,645,800),8118=>array(48,-13,645,778),8119=>array(48,-208,645,778),8120=>array(5,0,769,927),8121=>array(5,0,769,914),8122=>array(-1,0,872,800),8123=>array(26,0,792,800),8124=>array(5,-208,769,729),8125=>array(183,595,317,785),8126=>array(202,-208,333,-45),8127=>array(183,595,317,785),8128=>array(80,638,420,778),8129=>array(80,654,420,928),8130=>array(84,-208,634,800),8131=>array(84,-208,634,560),8132=>array(84,-208,634,800),8134=>array(84,-208,634,778),8135=>array(84,-208,634,778),8136=>array(-1,0,856,800),8137=>array(-24,0,771,800),8138=>array(-1,0,988,800),8139=>array(-18,0,915,800),8140=>array(92,-208,745,729),8141=>array(34,595,468,800),8142=>array(63,595,478,800),8143=>array(80,595,420,928),8144=>array(3,-19,348,784),8145=>array(20,-19,348,760),8146=>array(-36,-19,348,978),8147=>array(23,-19,372,978),8150=>array(4,-19,348,778),8151=>array(-6,-19,348,928),8152=>array(21,0,350,927),8153=>array(32,0,339,914),8154=>array(-1,0,529,800),8155=>array(-21,0,450,800),8157=>array(40,595,474,800),8158=>array(45,595,489,800),8159=>array(80,595,420,928),8160=>array(78,-10,629,784),8161=>array(78,-10,629,760),8162=>array(78,-10,629,978),8163=>array(78,-10,629,978),8164=>array(84,-208,671,785),8165=>array(84,-208,671,785),8166=>array(78,-10,629,778),8167=>array(78,-10,629,928),8168=>array(-10,0,734,927),8169=>array(-10,0,734,914),8170=>array(-1,0,1030,800),8171=>array(-27,0,992,800),8172=>array(4,0,797,785),8173=>array(46,654,404,978),8174=>array(96,654,445,978),8175=>array(46,616,322,800),8178=>array(43,-208,826,800),8179=>array(43,-208,826,547),8180=>array(43,-208,826,800),8182=>array(43,-13,826,778),8183=>array(43,-208,826,778),8184=>array(-1,-14,1015,800),8185=>array(-19,-14,836,800),8186=>array(-1,0,1057,800),8187=>array(-30,0,867,800),8188=>array(27,-208,823,742),8189=>array(178,616,454,800),8190=>array(183,595,317,785),8208=>array(54,217,361,359),8209=>array(54,217,361,359),8210=>array(54,211,642,337),8211=>array(54,211,446,337),8212=>array(54,211,946,337),8213=>array(0,211,1000,337),8214=>array(127,-236,399,764),8215=>array(0,-236,500,-9),8216=>array(103,418,318,729),8217=>array(63,418,278,729),8218=>array(72,-122,287,189),8219=>array(63,418,278,729),8220=>array(103,418,565,729),8221=>array(92,418,554,729),8222=>array(72,-122,534,189),8223=>array(92,418,554,729),8224=>array(26,-96,470,729),8225=>array(25,-96,470,729),8226=>array(144,196,495,547),8227=>array(144,157,534,586),8228=>array(79,0,255,189),8229=>array(79,0,588,189),8230=>array(79,0,921,189),8231=>array(86,253,262,442),8240=>array(32,-14,1417,742),8241=>array(32,-14,1864,742),8242=>array(20,547,240,729),8243=>array(20,547,423,729),8244=>array(20,547,606,729),8245=>array(20,547,240,729),8246=>array(20,547,425,729),8247=>array(20,547,606,729),8248=>array(101,-238,632,29),8249=>array(77,67,318,519),8250=>array(94,67,335,519),8251=>array(72,0,900,829),8252=>array(69,0,558,729),8253=>array(69,0,515,742),8254=>array(0,663,500,755),8255=>array(-31,-237,859,-79),8256=>array(-31,769,859,927),8257=>array(-52,-235,296,231),8258=>array(20,-37,1003,832),8259=>array(96,220,404,358),8260=>array(-199,-14,366,742),8261=>array(86,-132,389,760),8262=>array(68,-132,371,760),8263=>array(34,0,996,742),8264=>array(69,0,760,742),8265=>array(69,0,760,742),8266=>array(49,-125,464,546),8267=>array(93,-96,579,729),8268=>array(75,189,425,541),8269=>array(75,189,425,541),8270=>array(20,0,503,464),8271=>array(104,-142,329,547),8272=>array(-31,-237,859,927),8273=>array(53,-14,439,797),8274=>array(30,-93,529,729),8275=>array(49,212,951,415),8276=>array(-31,-240,859,-82),8277=>array(152,98,686,631),8278=>array(110,93,574,645),8279=>array(20,547,789,729),8280=>array(76,21,762,708),8281=>array(126,71,712,657),8282=>array(102,0,280,729),8283=>array(49,-170,822,898),8284=>array(55,0,783,729),8285=>array(102,0,278,683),8286=>array(102,0,278,683),8304=>array(29,319,398,742),8305=>array(53,326,164,751),8308=>array(27,326,397,734),8309=>array(47,319,384,734),8310=>array(38,319,394,742),8311=>array(41,326,378,734),8312=>array(38,319,389,742),8313=>array(32,319,388,742),8314=>array(67,326,461,677),8315=>array(67,469,461,534),8316=>array(67,407,461,596),8317=>array(54,252,237,751),8318=>array(50,252,234,751),8319=>array(54,326,406,640),8320=>array(29,-7,398,416),8321=>array(60,0,382,408),8322=>array(53,0,382,416),8323=>array(44,-7,384,416),8324=>array(27,0,397,408),8325=>array(47,-7,384,408),8326=>array(38,-7,394,416),8327=>array(41,0,378,408),8328=>array(38,-7,389,416),8329=>array(32,-7,388,416),8330=>array(67,0,461,351),8331=>array(67,143,461,208),8332=>array(67,81,461,270),8333=>array(54,-74,237,425),8334=>array(50,-74,234,425),8336=>array(53,-8,402,313),8337=>array(53,-8,423,313),8338=>array(53,-8,432,313),8339=>array(10,0,403,306),8340=>array(53,-8,423,313),8341=>array(54,0,406,425),8342=>array(53,0,431,425),8343=>array(54,0,166,425),8344=>array(53,0,607,313),8345=>array(54,0,406,313),8346=>array(53,-117,423,313),8347=>array(33,-8,351,313),8348=>array(53,0,332,393),8352=>array(38,0,892,729),8353=>array(50,-44,634,778),8354=>array(29,-14,667,742),8355=>array(75,0,663,729),8356=>array(61,0,613,742),8357=>array(83,-93,963,640),8358=>array(43,0,794,729),8359=>array(92,-14,1470,729),8360=>array(92,-14,1157,729),8361=>array(13,0,1088,729),8362=>array(39,-14,859,729),8363=>array(30,-182,692,760),8364=>array(-19,-14,629,742),8365=>array(29,0,695,729),8366=>array(12,0,684,729),8367=>array(92,-223,1247,742),8368=>array(14,-14,648,742),8369=>array(34,0,696,729),8370=>array(50,-81,643,809),8371=>array(5,0,691,729),8372=>array(43,-14,816,742),8373=>array(72,-147,629,760),8376=>array(12,0,684,729),8377=>array(50,0,647,729),8378=>array(5,0,745,729),8400=>array(-498,628,-26,760),8401=>array(-470,628,1,760),8406=>array(-470,560,-26,760),8407=>array(-470,560,-26,760),8411=>array(-501,654,-1,774),8412=>array(-595,654,99,774),8417=>array(-470,560,-26,760),8448=>array(20,-24,1083,752),8449=>array(20,-24,1137,752),8450=>array(50,-14,670,742),8451=>array(87,-14,1147,749),8452=>array(64,0,832,729),8453=>array(20,-24,1064,752),8454=>array(20,-24,1117,752),8455=>array(67,-14,616,742),8456=>array(64,-146,684,611),8457=>array(87,0,1002,749),8459=>array(36,-14,1063,746),8460=>array(6,-125,809,747),8461=>array(100,0,788,729),8462=>array(31,0,654,760),8463=>array(10,0,625,760),8464=>array(36,-14,533,742),8465=>array(52,-14,659,743),8466=>array(37,-14,787,742),8467=>array(-14,-14,401,742),8468=>array(9,-14,936,760),8469=>array(92,0,745,729),8470=>array(34,0,1154,729),8471=>array(138,0,862,725),8472=>array(54,-221,658,495),8473=>array(92,0,709,729),8474=>array(50,-146,800,742),8475=>array(31,-14,904,768),8476=>array(41,-14,803,743),8477=>array(98,0,793,729),8478=>array(37,0,859,729),8479=>array(81,-112,694,887),8480=>array(127,444,792,731),8481=>array(3,0,1249,547),8482=>array(144,447,790,729),8483=>array(11,-113,729,885),8484=>array(45,0,709,729),8485=>array(26,-230,540,777),8486=>array(27,0,823,742),8487=>array(27,-14,823,728),8488=>array(-5,-159,670,729),8489=>array(1,0,271,566),8490=>array(92,0,805,729),8491=>array(5,0,769,928),8492=>array(41,-1,853,772),8493=>array(63,-19,767,742),8494=>array(61,-12,793,647),8495=>array(41,-14,591,533),8496=>array(72,-14,668,742),8497=>array(37,-14,860,773),8498=>array(92,0,599,729),8499=>array(38,-18,1156,751),8500=>array(29,-12,436,420),8501=>array(50,-14,761,742),8502=>array(19,-14,687,742),8503=>array(31,-35,439,742),8504=>array(63,-41,633,742),8505=>array(34,0,355,760),8506=>array(44,-27,932,723),8507=>array(69,0,1352,547),8508=>array(34,-14,765,547),8509=>array(-40,-208,700,561),8510=>array(92,0,627,729),8511=>array(92,0,771,729),8512=>array(12,-192,820,719),8513=>array(25,-14,723,742),8514=>array(9,0,527,729),8515=>array(43,0,561,729),8516=>array(0,0,744,729),8517=>array(21,0,786,729),8518=>array(34,-14,752,760),8519=>array(33,-14,635,560),8520=>array(15,0,353,760),8521=>array(-143,-216,354,760),8523=>array(41,-14,811,742),8526=>array(55,0,470,547),8528=>array(49,-14,983,742),8529=>array(49,-14,993,742),8530=>array(49,-14,1441,742),8531=>array(49,-14,989,742),8532=>array(53,-14,989,742),8533=>array(49,-14,989,742),8534=>array(53,-14,989,742),8535=>array(44,-14,989,742),8536=>array(27,-14,989,742),8537=>array(49,-14,999,742),8538=>array(47,-14,999,742),8539=>array(49,-14,994,742),8540=>array(44,-14,994,742),8541=>array(47,-14,994,742),8542=>array(41,-14,994,742),8543=>array(49,-14,814,742),8544=>array(92,0,280,729),8545=>array(92,0,566,729),8546=>array(92,0,853,729),8547=>array(92,0,1094,729),8548=>array(5,0,769,729),8549=>array(5,0,1007,729),8550=>array(5,0,1293,729),8551=>array(5,0,1580,729),8552=>array(92,0,1101,729),8553=>array(19,0,751,729),8554=>array(19,0,1028,729),8555=>array(19,0,1314,729),8556=>array(92,0,610,729),8557=>array(50,-14,670,742),8558=>array(92,0,778,729),8559=>array(92,0,903,729),8560=>array(84,0,259,760),8561=>array(84,0,523,760),8562=>array(84,0,788,760),8563=>array(84,0,946,760),8564=>array(15,0,637,547),8565=>array(15,0,878,760),8566=>array(15,0,1143,760),8567=>array(15,0,1407,760),8568=>array(84,0,954,760),8569=>array(15,0,630,547),8570=>array(15,0,885,760),8571=>array(15,0,1149,760),8572=>array(84,0,259,760),8573=>array(43,-14,526,560),8574=>array(45,-14,632,760),8575=>array(83,0,963,560),8576=>array(52,0,1236,729),8577=>array(92,0,778,729),8578=>array(52,0,1236,729),8579=>array(50,-14,670,742),8580=>array(43,-14,526,560),8581=>array(50,-208,670,742),8585=>array(29,-14,989,742),8592=>array(49,87,781,540),8593=>array(193,0,646,732),8594=>array(57,87,789,540),8595=>array(193,-3,646,729),8596=>array(49,87,789,540),8597=>array(193,-3,646,732),8598=>array(136,66,720,650),8599=>array(136,66,720,650),8600=>array(136,66,720,650),8601=>array(136,66,720,650),8602=>array(49,87,781,540),8603=>array(57,87,789,540),8604=>array(13,84,833,431),8605=>array(5,84,825,431),8606=>array(49,87,781,540),8607=>array(189,0,641,732),8608=>array(57,87,789,540),8609=>array(194,-3,646,729),8610=>array(49,87,793,540),8611=>array(45,87,789,540),8612=>array(49,87,781,540),8613=>array(193,0,646,732),8614=>array(57,87,789,540),8615=>array(193,0,646,732),8616=>array(193,0,646,732),8617=>array(49,87,781,565),8618=>array(57,87,789,565),8619=>array(49,87,781,565),8620=>array(57,87,789,565),8621=>array(49,87,789,540),8622=>array(49,86,789,541),8623=>array(123,-4,714,733),8624=>array(169,0,646,755),8625=>array(192,0,669,755),8626=>array(169,-26,646,729),8627=>array(192,-26,669,729),8628=>array(233,-3,772,621),8629=>array(49,87,673,626),8630=>array(11,198,816,685),8631=>array(22,198,828,685),8632=>array(118,13,788,729),8633=>array(49,-108,789,735),8634=>array(86,45,767,691),8635=>array(71,45,751,691),8636=>array(49,255,781,540),8637=>array(49,87,781,372),8638=>array(361,0,646,732),8639=>array(193,0,478,732),8640=>array(57,255,789,540),8641=>array(57,87,789,372),8642=>array(361,0,646,732),8643=>array(193,0,478,732),8644=>array(49,-59,789,686),8645=>array(47,-3,792,732),8646=>array(49,-59,789,686),8647=>array(49,-59,781,686),8648=>array(46,0,792,732),8649=>array(57,-59,789,686),8650=>array(46,-3,792,729),8651=>array(49,-5,789,632),8652=>array(49,-5,789,632),8653=>array(49,87,781,540),8654=>array(49,87,789,540),8655=>array(57,87,789,540),8656=>array(49,87,781,540),8657=>array(193,0,645,732),8658=>array(57,87,789,540),8659=>array(193,-3,645,729),8660=>array(49,87,789,540),8661=>array(193,-8,645,732),8662=>array(132,-26,755,596),8663=>array(88,-26,711,597),8664=>array(88,16,711,639),8665=>array(132,16,755,639),8666=>array(49,87,781,540),8667=>array(57,87,789,540),8668=>array(44,87,776,540),8669=>array(57,87,789,540),8670=>array(193,0,646,732),8671=>array(193,-3,646,729),8672=>array(49,87,781,540),8673=>array(193,0,646,732),8674=>array(57,87,789,540),8675=>array(193,-3,646,729),8676=>array(49,87,781,540),8677=>array(57,87,789,540),8678=>array(27,46,781,581),8679=>array(151,0,687,754),8680=>array(35,46,789,581),8681=>array(151,-25,687,729),8682=>array(151,0,687,754),8683=>array(151,0,687,754),8684=>array(151,0,687,754),8685=>array(151,0,687,754),8686=>array(151,0,687,754),8687=>array(151,0,687,754),8688=>array(35,46,789,581),8689=>array(60,0,788,729),8690=>array(60,0,788,729),8691=>array(151,-25,687,754),8692=>array(57,87,789,540),8693=>array(47,-3,792,732),8694=>array(57,-223,789,850),8695=>array(49,87,781,540),8696=>array(57,87,789,540),8697=>array(49,87,789,540),8698=>array(49,87,781,540),8699=>array(57,87,789,540),8700=>array(49,87,789,540),8701=>array(27,96,781,531),8702=>array(57,96,811,531),8703=>array(27,96,811,531),8704=>array(5,0,769,729),8705=>array(48,-14,629,742),8706=>array(29,-14,515,674),8707=>array(92,0,610,729),8708=>array(92,-46,610,775),8709=>array(47,-15,810,715),8710=>array(0,0,697,719),8711=>array(0,0,697,719),8712=>array(73,-2,824,730),8713=>array(73,-46,824,775),8714=>array(106,58,644,568),8715=>array(73,-2,824,730),8716=>array(73,-46,824,775),8717=>array(106,58,644,568),8718=>array(98,0,539,553),8719=>array(73,-192,712,719),8720=>array(73,-193,712,718),8721=>array(20,-192,697,719),8722=>array(106,256,732,371),8723=>array(106,0,732,627),8724=>array(49,0,647,729),8725=>array(0,-93,365,729),8726=>array(165,-49,530,772),8727=>array(118,0,720,626),8728=>array(150,151,475,477),8729=>array(102,253,278,442),8730=>array(37,-20,669,837),8731=>array(37,-20,669,933),8732=>array(36,-20,669,924),8733=>array(92,89,617,505),8734=>array(92,89,741,505),8735=>array(106,67,732,693),8736=>array(77,0,820,729),8737=>array(77,-44,820,729),8738=>array(116,-0,732,726),8739=>array(207,-207,322,773),8740=>array(48,-207,482,773),8741=>array(112,-207,417,773),8742=>array(48,-207,482,773),8743=>array(151,0,661,579),8744=>array(151,0,661,579),8745=>array(151,0,661,579),8746=>array(151,0,661,579),8747=>array(15,-227,548,754),8748=>array(15,-227,914,754),8749=>array(15,-227,1280,754),8750=>array(14,-227,548,754),8751=>array(38,-227,938,754),8752=>array(23,-227,1290,754),8753=>array(15,-227,616,754),8754=>array(14,-227,600,754),8755=>array(14,-227,588,754),8756=>array(60,78,637,647),8757=>array(60,78,637,647),8758=>array(59,79,235,647),8759=>array(60,78,637,647),8760=>array(106,256,732,631),8761=>array(106,45,800,584),8762=>array(106,-4,732,631),8763=>array(106,-34,732,660),8764=>array(106,212,732,415),8765=>array(106,212,732,415),8766=>array(65,131,772,497),8767=>array(106,42,732,584),8768=>array(85,0,289,626),8769=>array(106,76,732,551),8770=>array(106,110,732,482),8771=>array(106,144,732,517),8772=>array(106,0,732,637),8773=>array(106,37,732,628),8774=>array(106,-31,732,628),8775=>array(106,-86,732,726),8776=>array(106,110,732,517),8777=>array(106,8,732,614),8778=>array(106,37,732,628),8779=>array(106,-13,732,628),8780=>array(106,37,732,628),8781=>array(105,105,732,585),8782=>array(106,26,732,656),8783=>array(106,172,732,656),8784=>array(106,144,732,744),8785=>array(106,-117,732,743),8786=>array(105,-92,732,719),8787=>array(104,-92,731,719),8788=>array(98,102,965,520),8789=>array(96,102,966,520),8790=>array(106,144,732,482),8791=>array(106,144,732,839),8792=>array(106,144,732,704),8793=>array(106,144,732,840),8794=>array(106,144,732,840),8795=>array(106,144,732,959),8796=>array(106,144,732,952),8797=>array(106,144,732,762),8798=>array(106,144,732,786),8799=>array(106,144,732,903),8800=>array(106,-5,732,631),8801=>array(106,38,732,588),8802=>array(106,-69,732,695),8803=>array(106,-74,732,700),8804=>array(106,0,732,582),8805=>array(106,0,732,582),8806=>array(106,-106,732,617),8807=>array(106,-106,732,617),8808=>array(106,-185,732,617),8809=>array(106,-185,732,617),8810=>array(72,-34,974,660),8811=>array(72,-34,974,660),8812=>array(86,-132,414,759),8813=>array(105,-10,732,700),8814=>array(106,-4,732,690),8815=>array(106,-63,732,631),8816=>array(106,-112,732,645),8817=>array(106,-112,732,645),8818=>array(106,-84,732,582),8819=>array(106,-84,732,582),8820=>array(106,-112,732,645),8821=>array(106,-112,732,645),8822=>array(102,-119,732,678),8823=>array(102,-119,732,678),8824=>array(102,-221,732,779),8825=>array(102,-221,732,779),8826=>array(106,-55,732,681),8827=>array(106,-55,732,681),8828=>array(106,-177,732,684),8829=>array(106,-177,732,684),8830=>array(106,-132,732,684),8831=>array(106,-132,732,684),8832=>array(106,-89,732,781),8833=>array(106,-89,732,781),8834=>array(99,67,739,559),8835=>array(99,65,739,559),8836=>array(99,-96,739,726),8837=>array(99,-100,739,722),8838=>array(99,0,739,636),8839=>array(99,0,739,635),8840=>array(99,-124,739,759),8841=>array(99,-124,739,759),8842=>array(99,-97,739,636),8843=>array(99,-97,739,635),8844=>array(151,0,661,579),8845=>array(151,0,661,579),8846=>array(151,0,661,579),8847=>array(106,0,732,584),8848=>array(106,0,732,584),8849=>array(106,-115,732,667),8850=>array(106,-115,732,667),8851=>array(106,0,690,626),8852=>array(106,0,690,626),8853=>array(91,-14,747,643),8854=>array(91,-14,747,643),8855=>array(91,-14,747,643),8856=>array(91,-13,747,642),8857=>array(91,-14,747,643),8858=>array(91,-14,747,643),8859=>array(91,-14,747,643),8860=>array(91,-14,747,643),8861=>array(91,-14,747,643),8862=>array(77,-29,761,657),8863=>array(77,-29,761,657),8864=>array(77,-29,761,657),8865=>array(77,-29,761,657),8866=>array(85,0,829,705),8867=>array(85,0,829,705),8868=>array(85,0,829,705),8869=>array(85,0,829,705),8870=>array(85,0,457,705),8871=>array(85,0,457,705),8872=>array(85,0,829,705),8873=>array(85,0,829,705),8874=>array(85,0,829,705),8875=>array(85,0,829,705),8876=>array(85,-100,829,805),8877=>array(85,-100,829,805),8878=>array(85,-100,829,805),8879=>array(85,-100,829,805),8880=>array(106,-54,724,681),8881=>array(114,-54,732,681),8882=>array(106,-1,732,628),8883=>array(106,-1,732,628),8884=>array(106,-80,732,706),8885=>array(106,-80,732,706),8886=>array(60,151,940,477),8887=>array(60,151,940,477),8888=>array(60,151,778,477),8889=>array(43,-63,794,689),8890=>array(63,0,480,705),8891=>array(103,0,709,759),8892=>array(103,0,709,759),8893=>array(103,0,709,759),8894=>array(106,0,732,626),8895=>array(106,0,732,626),8896=>array(0,-192,843,719),8897=>array(0,-192,843,719),8898=>array(48,-192,794,719),8899=>array(48,-192,794,719),8900=>array(3,-233,491,807),8901=>array(102,253,278,442),8902=>array(83,112,543,549),8903=>array(106,-56,732,683),8904=>array(106,-48,894,674),8905=>array(106,-48,894,675),8906=>array(106,-48,894,675),8907=>array(106,-48,894,675),8908=>array(106,-48,894,675),8909=>array(106,144,732,517),8910=>array(49,0,763,579),8911=>array(49,0,763,579),8912=>array(93,-22,732,649),8913=>array(106,-22,745,649),8914=>array(83,0,755,639),8915=>array(83,-14,755,625),8916=>array(186,0,652,729),8917=>array(106,-100,732,729),8918=>array(106,30,732,597),8919=>array(106,30,732,597),8920=>array(72,-34,1350,660),8921=>array(72,-34,1350,660),8922=>array(106,-211,732,837),8923=>array(106,-211,732,837),8924=>array(106,0,732,582),8925=>array(106,0,732,582),8926=>array(106,-177,732,684),8927=>array(106,-177,732,684),8928=>array(106,-197,732,808),8929=>array(106,-263,732,742),8930=>array(106,-191,732,817),8931=>array(106,-191,732,817),8932=>array(106,-146,732,636),8933=>array(106,-146,732,636),8934=>array(106,-168,732,582),8935=>array(106,-168,732,582),8936=>array(106,-216,732,684),8937=>array(106,-216,732,684),8938=>array(106,-138,732,808),8939=>array(106,-138,732,808),8940=>array(106,-224,732,894),8941=>array(106,-224,732,894),8942=>array(412,-40,588,735),8943=>array(79,253,921,442),8944=>array(79,-40,921,735),8945=>array(79,-40,921,735),8946=>array(72,-2,1085,730),8947=>array(73,-2,824,730),8948=>array(106,58,644,568),8949=>array(73,-2,824,984),8950=>array(73,-2,824,919),8951=>array(106,58,644,741),8952=>array(73,-207,824,730),8953=>array(73,-2,824,730),8954=>array(72,-2,1085,730),8955=>array(73,-2,824,730),8956=>array(106,58,644,568),8957=>array(72,-2,824,919),8958=>array(106,58,644,741),8959=>array(106,0,791,732),8960=>array(31,-22,572,519),8961=>array(56,152,540,453),8962=>array(64,0,651,596),8963=>array(193,470,646,732),8964=>array(193,0,646,263),8965=>array(193,-12,646,423),8966=>array(193,-12,646,552),8967=>array(139,-39,349,798),8968=>array(86,-132,389,760),8969=>array(68,-132,371,760),8970=>array(86,-132,389,760),8971=>array(68,-132,371,760),8972=>array(352,-77,759,331),8973=>array(49,-77,457,331),8974=>array(352,226,759,634),8975=>array(49,226,457,634),8976=>array(106,140,732,444),8977=>array(3,113,536,646),8984=>array(84,0,843,759),8985=>array(106,140,732,444),8988=>array(86,425,403,760),8989=>array(65,425,383,760),8990=>array(86,-126,403,208),8991=>array(65,-126,383,208),8992=>array(235,-250,586,926),8993=>array(22,-240,373,940),8996=>array(76,215,1076,575),8997=>array(76,0,1076,575),8998=>array(76,0,1414,760),8999=>array(76,0,1076,760),9000=>array(59,0,1385,729),9003=>array(0,0,1338,760),9004=>array(73,-91,800,748),9075=>array(78,-19,348,547),9076=>array(84,-208,671,562),9077=>array(43,-13,826,547),9082=>array(48,-13,645,559),9085=>array(13,-228,850,99),9095=>array(76,0,1100,743),9108=>array(17,0,856,727),9115=>array(63,-252,438,928),9116=>array(63,-252,205,940),9117=>array(63,-240,438,940),9118=>array(63,-252,438,928),9119=>array(295,-252,438,940),9120=>array(63,-240,438,940),9121=>array(63,-252,438,928),9122=>array(63,-252,205,940),9123=>array(63,-240,438,940),9124=>array(63,-252,438,928),9125=>array(295,-252,438,940),9126=>array(63,-240,438,940),9127=>array(306,-261,668,928),9128=>array(82,-247,444,934),9129=>array(306,-240,668,934),9130=>array(306,-256,444,934),9131=>array(82,-261,444,928),9132=>array(306,-247,668,934),9133=>array(82,-240,444,934),9134=>array(235,-250,373,940),9166=>array(27,46,781,729),9167=>array(91,0,854,596),9187=>array(73,-91,800,748),9189=>array(3,75,766,444),9192=>array(39,-129,665,294),9250=>array(-81,-14,671,760),9251=>array(64,-228,651,99),9312=>array(59,-15,788,715),9313=>array(59,-15,788,715),9314=>array(59,-15,788,715),9315=>array(59,-15,788,715),9316=>array(59,-15,788,715),9317=>array(59,-15,788,715),9318=>array(59,-15,788,715),9319=>array(59,-15,788,715),9320=>array(59,-15,788,715),9321=>array(59,-15,788,715),9600=>array(-10,260,779,770),9601=>array(-10,-250,779,-123),9602=>array(-10,-250,779,-5),9603=>array(-10,-250,779,132),9604=>array(-10,-250,779,260),9605=>array(-10,-250,779,387),9606=>array(-10,-250,779,515),9607=>array(-10,-250,779,642),9608=>array(-10,-250,779,770),9609=>array(-10,-250,680,770),9610=>array(-10,-250,582,770),9611=>array(-10,-250,483,770),9612=>array(-10,-250,384,770),9613=>array(-10,-250,286,770),9614=>array(-10,-250,187,770),9615=>array(-10,-250,88,770),9616=>array(384,-250,778,770),9617=>array(-10,-250,680,770),9618=>array(-10,-250,779,770),9619=>array(-10,-250,779,770),9620=>array(-10,642,779,770),9621=>array(680,-250,778,770),9622=>array(-10,-250,385,260),9623=>array(384,-250,779,260),9624=>array(-10,260,385,770),9625=>array(-10,-250,779,770),9626=>array(-10,-250,779,770),9627=>array(-10,-250,779,770),9628=>array(-10,-250,779,770),9629=>array(384,260,779,770),9630=>array(-10,-250,779,770),9631=>array(-10,-250,779,770),9632=>array(91,-124,854,643),9633=>array(91,-124,854,643),9634=>array(91,-124,854,643),9635=>array(91,-124,854,643),9636=>array(91,-124,854,643),9637=>array(91,-124,854,643),9638=>array(91,-124,854,643),9639=>array(91,-124,854,643),9640=>array(91,-124,854,643),9641=>array(91,-124,854,643),9642=>array(91,11,587,509),9643=>array(91,11,587,509),9644=>array(91,75,854,444),9645=>array(91,75,854,444),9646=>array(91,-122,459,642),9647=>array(91,-122,459,642),9648=>array(3,75,766,444),9649=>array(3,75,766,444),9650=>array(3,-124,766,643),9651=>array(3,-124,766,643),9652=>array(3,11,499,509),9653=>array(3,11,499,509),9654=>array(3,-124,766,643),9655=>array(3,-124,766,643),9656=>array(3,11,499,509),9657=>array(3,11,499,509),9658=>array(3,11,766,509),9659=>array(3,11,766,509),9660=>array(3,-124,766,643),9661=>array(3,-124,766,643),9662=>array(3,11,499,509),9663=>array(3,11,499,509),9664=>array(3,-124,766,643),9665=>array(3,-124,766,643),9666=>array(3,11,499,509),9667=>array(3,11,499,509),9668=>array(3,11,766,509),9669=>array(3,11,766,509),9670=>array(3,-124,766,643),9671=>array(3,-124,766,643),9672=>array(3,-124,766,643),9673=>array(55,-125,818,645),9674=>array(3,-233,491,807),9675=>array(55,-125,818,645),9676=>array(56,-125,817,644),9677=>array(55,-125,818,645),9678=>array(55,-125,818,645),9679=>array(55,-123,818,641),9680=>array(55,-123,818,641),9681=>array(55,-123,818,641),9682=>array(55,-123,818,641),9683=>array(55,-123,818,641),9684=>array(55,-123,818,641),9685=>array(55,-123,818,641),9686=>array(55,-125,436,645),9687=>array(91,-125,472,645),9688=>array(91,-10,750,770),9689=>array(91,-250,879,770),9690=>array(91,260,879,770),9691=>array(91,-250,879,260),9692=>array(3,260,385,645),9693=>array(3,260,384,645),9694=>array(3,-125,384,260),9695=>array(3,-125,385,260),9696=>array(3,260,766,645),9697=>array(3,-125,766,260),9698=>array(3,-124,766,643),9699=>array(3,-124,766,643),9700=>array(3,-124,766,643),9701=>array(3,-124,766,643),9702=>array(144,196,495,547),9703=>array(91,-124,854,643),9704=>array(91,-124,854,643),9705=>array(91,-124,854,643),9706=>array(91,-124,854,643),9707=>array(91,-124,854,643),9708=>array(3,-124,766,643),9709=>array(3,-124,766,643),9710=>array(3,-124,766,643),9711=>array(55,-250,1064,770),9712=>array(91,-124,854,643),9713=>array(91,-124,854,643),9714=>array(91,-124,854,643),9715=>array(91,-124,854,643),9716=>array(55,-123,818,641),9717=>array(55,-123,818,641),9718=>array(55,-123,818,641),9719=>array(55,-123,818,641),9720=>array(3,-124,766,643),9721=>array(3,-124,766,643),9722=>array(3,-124,766,643),9723=>array(91,-66,739,585),9724=>array(91,-66,739,585),9725=>array(91,-17,642,537),9726=>array(91,-17,642,537),9727=>array(3,-124,766,643),9728=>array(83,0,813,729),9729=>array(51,-2,949,360),9730=>array(49,0,848,729),9731=>array(83,-0,813,927),9732=>array(64,0,833,880),9733=>array(65,-4,832,723),9734=>array(65,-4,832,723),9735=>array(83,2,490,729),9736=>array(83,0,813,731),9737=>array(83,0,813,730),9738=>array(61,0,828,727),9739=>array(61,0,828,723),9740=>array(61,-1,610,722),9741=>array(61,0,952,723),9742=>array(68,0,1177,729),9743=>array(71,0,1180,729),9744=>array(90,0,807,729),9745=>array(89,0,808,729),9746=>array(89,0,808,729),9747=>array(75,78,457,656),9748=>array(49,0,870,933),9749=>array(74,0,822,731),9750=>array(84,0,813,731),9751=>array(84,0,813,727),9752=>array(78,0,819,729),9753=>array(83,140,813,574),9754=>array(84,113,813,569),9755=>array(84,113,813,569),9756=>array(87,104,810,569),9757=>array(72,0,537,724),9758=>array(86,103,810,569),9759=>array(72,-3,537,720),9760=>array(61,0,835,730),9761=>array(84,0,813,730),9762=>array(83,0,813,730),9763=>array(49,0,848,730),9764=>array(49,-2,620,727),9765=>array(83,0,663,731),9766=>array(83,-1,566,731),9767=>array(83,0,701,911),9768=>array(83,0,462,730),9769=>array(83,-1,813,729),9770=>array(87,0,810,730),9771=>array(83,0,814,731),9772=>array(83,0,627,731),9773=>array(83,0,813,730),9774=>array(83,0,813,730),9775=>array(83,0,813,730),9776=>array(83,0,813,729),9777=>array(83,0,814,729),9778=>array(83,0,813,729),9779=>array(83,0,813,729),9780=>array(83,0,813,729),9781=>array(83,0,813,729),9782=>array(83,0,813,729),9783=>array(83,0,813,729),9784=>array(80,3,817,721),9785=>array(83,-73,959,804),9786=>array(83,-73,959,804),9787=>array(83,-73,959,804),9788=>array(83,0,813,730),9789=>array(358,0,814,730),9790=>array(83,0,539,730),9791=>array(85,-102,528,732),9792=>array(85,-125,647,731),9793=>array(85,-14,647,843),9794=>array(79,-14,831,720),9795=>array(166,0,730,730),9796=>array(219,0,677,730),9797=>array(121,0,774,730),9798=>array(127,0,769,730),9799=>array(240,0,656,730),9800=>array(45,0,851,731),9801=>array(89,0,807,730),9802=>array(94,0,802,731),9803=>array(113,31,784,679),9804=>array(140,0,756,730),9805=>array(53,-180,843,730),9806=>array(83,52,813,653),9807=>array(34,-96,863,730),9808=>array(83,-0,813,730),9809=>array(94,0,802,730),9810=>array(86,153,810,579),9811=>array(157,0,739,730),9812=>array(98,0,798,730),9813=>array(110,0,786,730),9814=>array(167,-1,729,729),9815=>array(214,0,683,730),9816=>array(165,0,732,730),9817=>array(148,-0,748,730),9818=>array(98,0,798,730),9819=>array(110,0,786,730),9820=>array(167,-1,729,729),9821=>array(214,0,683,730),9822=>array(162,0,734,730),9823=>array(148,-0,748,730),9824=>array(158,0,738,729),9825=>array(90,0,806,727),9826=>array(168,0,728,729),9827=>array(111,0,785,729),9828=>array(157,0,739,729),9829=>array(89,0,808,729),9830=>array(168,0,728,729),9831=>array(111,0,785,732),9832=>array(105,-1,791,729),9833=>array(84,-5,339,729),9834=>array(84,-5,554,729),9835=>array(184,-102,712,729),9836=>array(92,-5,804,729),9837=>array(88,-3,392,731),9838=>array(84,0,273,731),9839=>array(84,0,400,731),9840=>array(84,0,664,731),9841=>array(64,0,701,731),9842=>array(84,0,813,709),9843=>array(76,16,820,731),9844=>array(76,16,820,731),9845=>array(76,16,820,731),9846=>array(76,16,820,731),9847=>array(76,16,820,731),9848=>array(76,16,820,731),9849=>array(76,16,820,731),9850=>array(76,16,820,731),9851=>array(84,0,812,704),9852=>array(83,0,814,731),9853=>array(83,0,814,731),9854=>array(83,0,814,731),9855=>array(149,1,747,731),9856=>array(73,0,797,725),9857=>array(73,0,797,725),9858=>array(73,0,797,725),9859=>array(73,0,797,725),9860=>array(73,0,797,725),9861=>array(73,0,797,725),9862=>array(83,0,813,731),9863=>array(83,0,813,731),9864=>array(83,0,813,731),9865=>array(83,0,813,731),9866=>array(83,0,813,98),9867=>array(83,0,813,98),9868=>array(83,0,813,413),9869=>array(83,0,813,413),9870=>array(83,0,813,413),9871=>array(83,0,813,413),9872=>array(168,3,728,731),9873=>array(168,3,728,731),9874=>array(52,0,844,731),9875=>array(97,-10,799,732),9876=>array(131,0,765,729),9877=>array(61,-10,479,732),9878=>array(59,-10,837,732),9879=>array(61,0,835,732),9880=>array(145,0,750,732),9881=>array(95,-17,802,727),9882=>array(128,-9,768,733),9883=>array(127,0,769,728),9884=>array(127,0,769,729),9888=>array(49,0,848,729),9889=>array(83,2,619,730),9890=>array(85,-125,919,731),9891=>array(79,-206,1023,720),9892=>array(85,-186,1109,856),9893=>array(85,-125,837,917),9894=>array(131,-14,727,869),9895=>array(101,-170,741,884),9896=>array(188,-14,650,869),9897=>array(4,133,829,596),9898=>array(188,133,650,597),9899=>array(188,133,650,597),9900=>array(249,194,589,536),9901=>array(175,194,663,536),9902=>array(41,169,797,560),9903=>array(5,194,833,536),9904=>array(103,237,757,540),9905=>array(211,42,626,698),9906=>array(85,-125,647,731),9907=>array(168,-125,646,731),9908=>array(86,-125,646,731),9909=>array(86,-125,646,731),9910=>array(59,-118,791,643),9911=>array(194,-104,595,710),9912=>array(158,-125,543,731),9920=>array(42,4,796,553),9921=>array(42,4,796,724),9922=>array(42,4,796,553),9923=>array(42,4,796,724),9954=>array(85,-14,647,843),9985=>array(11,190,803,635),9986=>array(42,141,784,588),9987=>array(11,94,803,539),9988=>array(36,119,824,613),9990=>array(42,-14,796,742),9991=>array(42,-14,796,742),9992=>array(59,21,782,708),9993=>array(64,107,773,622),9996=>array(212,0,561,742),9997=>array(21,83,802,678),9998=>array(89,75,724,710),9999=>array(26,198,819,530),10000=>array(89,75,724,710),10001=>array(43,185,757,544),10002=>array(67,209,757,520),10003=>array(150,97,667,630),10004=>array(116,87,721,631),10005=>array(126,72,711,657),10006=>array(85,31,752,698),10007=>array(118,-9,701,732),10008=>array(123,0,754,739),10009=>array(55,0,783,729),10010=>array(55,0,783,729),10011=>array(55,0,783,729),10012=>array(55,0,783,729),10013=>array(165,0,673,729),10014=>array(131,0,678,729),10015=>array(155,0,683,729),10016=>array(55,0,783,729),10017=>array(91,-13,747,744),10018=>array(41,-14,797,742),10019=>array(42,-12,796,742),10020=>array(41,-14,797,742),10021=>array(41,-13,797,743),10022=>array(42,-14,796,745),10023=>array(42,-14,796,745),10025=>array(23,-9,814,743),10026=>array(42,-14,796,742),10027=>array(23,-9,814,743),10028=>array(23,-9,814,743),10029=>array(23,-9,814,743),10030=>array(23,-9,814,743),10031=>array(23,-9,814,743),10032=>array(24,12,815,714),10033=>array(64,0,773,729),10034=>array(74,0,764,729),10035=>array(55,0,783,729),10036=>array(31,-14,787,742),10037=>array(41,-14,797,742),10038=>array(91,-14,747,742),10039=>array(41,-14,797,742),10040=>array(41,-14,797,742),10041=>array(41,-14,797,742),10042=>array(55,0,783,729),10043=>array(82,-14,756,742),10044=>array(82,-14,756,742),10045=>array(84,-14,753,742),10046=>array(79,-14,759,742),10047=>array(54,0,784,709),10048=>array(54,0,784,709),10049=>array(41,-14,797,742),10050=>array(42,-14,796,742),10051=>array(79,-14,759,742),10052=>array(89,0,749,729),10053=>array(76,0,762,729),10054=>array(63,2,773,729),10055=>array(79,-13,759,742),10056=>array(47,-13,791,730),10057=>array(47,-13,791,730),10058=>array(41,-13,797,743),10059=>array(41,-13,797,743),10061=>array(50,-10,847,738),10063=>array(60,-49,837,729),10064=>array(60,0,837,777),10065=>array(60,-49,837,729),10066=>array(60,0,837,777),10070=>array(83,-2,813,728),10072=>array(377,-240,460,760),10073=>array(336,-240,502,760),10074=>array(253,-240,585,760),10075=>array(85,395,288,729),10076=>array(59,395,262,729),10077=>array(85,395,528,729),10078=>array(59,395,502,729),10081=>array(155,-93,772,851),10082=>array(202,-17,636,742),10083=>array(163,-17,675,742),10084=>array(54,83,784,645),10085=>array(168,-1,729,729),10086=>array(62,21,724,702),10087=>array(78,169,759,564),10088=>array(196,-139,648,769),10089=>array(196,-139,648,769),10090=>array(264,-132,574,758),10091=>array(264,-132,574,758),10092=>array(215,-240,607,760),10093=>array(232,-240,623,760),10094=>array(142,-240,685,760),10095=>array(153,-240,696,760),10096=>array(167,-240,656,760),10097=>array(183,-240,672,760),10098=>array(346,-241,535,760),10099=>array(303,-241,492,760),10100=>array(175,-163,634,760),10101=>array(204,-163,663,760),10102=>array(59,-15,788,715),10103=>array(59,-15,788,715),10104=>array(59,-15,788,715),10105=>array(59,-15,788,715),10106=>array(59,-15,788,715),10107=>array(59,-15,788,715),10108=>array(59,-15,788,715),10109=>array(59,-15,788,715),10110=>array(59,-15,788,715),10111=>array(59,-15,788,715),10112=>array(4,-52,833,780),10113=>array(4,-52,833,780),10114=>array(4,-52,833,780),10115=>array(4,-52,833,780),10116=>array(4,-52,833,780),10117=>array(4,-52,833,780),10118=>array(4,-52,833,780),10119=>array(4,-52,833,780),10120=>array(4,-52,833,780),10121=>array(4,-52,833,780),10122=>array(4,-52,833,780),10123=>array(4,-52,833,780),10124=>array(4,-52,833,780),10125=>array(4,-52,833,780),10126=>array(4,-52,833,780),10127=>array(4,-52,833,780),10128=>array(4,-52,833,780),10129=>array(4,-52,833,780),10130=>array(4,-52,833,780),10131=>array(4,-52,833,780),10132=>array(57,75,789,552),10136=>array(123,55,682,614),10137=>array(57,100,789,527),10138=>array(123,13,682,572),10139=>array(57,129,789,498),10140=>array(57,57,764,570),10141=>array(57,100,789,527),10142=>array(57,100,789,527),10143=>array(57,100,789,527),10144=>array(57,100,789,527),10145=>array(57,46,811,581),10146=>array(111,94,789,533),10147=>array(111,94,789,533),10148=>array(111,-4,789,631),10149=>array(57,100,789,548),10150=>array(57,79,789,527),10151=>array(240,-7,606,634),10152=>array(57,100,789,527),10153=>array(57,75,765,552),10154=>array(57,75,765,552),10155=>array(21,12,794,586),10156=>array(21,12,794,586),10157=>array(135,0,774,574),10158=>array(135,0,774,574),10159=>array(62,49,799,574),10161=>array(62,49,799,574),10162=>array(154,-20,721,585),10163=>array(63,157,789,470),10164=>array(81,55,682,655),10165=>array(57,173,789,454),10166=>array(82,-29,682,572),10167=>array(82,55,682,655),10168=>array(57,172,789,455),10169=>array(82,-28,682,572),10170=>array(56,84,789,543),10171=>array(73,140,779,487),10172=>array(79,167,774,460),10173=>array(79,118,774,509),10174=>array(57,81,789,546),10181=>array(54,-163,405,769),10182=>array(52,-163,403,769),10208=>array(3,-233,491,807),10214=>array(86,-132,419,760),10215=>array(86,-132,419,760),10216=>array(104,-132,377,759),10217=>array(80,-132,353,759),10218=>array(104,-132,641,759),10219=>array(80,-132,616,759),10224=>array(41,0,797,732),10225=>array(42,-3,798,729),10226=>array(9,45,816,685),10227=>array(22,45,830,685),10228=>array(57,-14,1108,643),10229=>array(49,87,1376,540),10230=>array(57,87,1385,540),10231=>array(49,87,1385,540),10232=>array(49,87,1376,540),10233=>array(57,87,1385,540),10234=>array(49,87,1385,540),10235=>array(49,87,1376,540),10236=>array(57,87,1385,540),10237=>array(49,87,1376,540),10238=>array(57,87,1385,540),10239=>array(57,87,1385,540),10241=>array(146,586,342,781),10242=>array(146,325,342,521),10243=>array(146,325,342,781),10244=>array(146,65,342,261),10245=>array(146,65,342,781),10246=>array(146,65,342,521),10247=>array(146,65,342,781),10248=>array(439,586,635,781),10249=>array(146,586,635,781),10250=>array(146,325,635,781),10251=>array(146,325,635,781),10252=>array(146,65,635,781),10253=>array(146,65,635,781),10254=>array(146,65,635,781),10255=>array(146,65,635,781),10256=>array(439,325,635,521),10257=>array(146,325,635,781),10258=>array(146,325,635,521),10259=>array(146,325,635,781),10260=>array(146,65,635,521),10261=>array(146,65,635,781),10262=>array(146,65,635,521),10263=>array(146,65,635,781),10264=>array(439,325,635,781),10265=>array(146,325,635,781),10266=>array(146,325,635,781),10267=>array(146,325,635,781),10268=>array(146,65,635,781),10269=>array(146,65,635,781),10270=>array(146,65,635,781),10271=>array(146,65,635,781),10272=>array(439,65,635,261),10273=>array(146,65,635,781),10274=>array(146,65,635,521),10275=>array(146,65,635,781),10276=>array(146,65,635,261),10277=>array(146,65,635,781),10278=>array(146,65,635,521),10279=>array(146,65,635,781),10280=>array(439,65,635,781),10281=>array(146,65,635,781),10282=>array(146,65,635,781),10283=>array(146,65,635,781),10284=>array(146,65,635,781),10285=>array(146,65,635,781),10286=>array(146,65,635,781),10287=>array(146,65,635,781),10288=>array(439,65,635,521),10289=>array(146,65,635,781),10290=>array(146,65,635,521),10291=>array(146,65,635,781),10292=>array(146,65,635,521),10293=>array(146,65,635,781),10294=>array(146,65,635,521),10295=>array(146,65,635,781),10296=>array(439,65,635,781),10297=>array(146,65,635,781),10298=>array(146,65,635,781),10299=>array(146,65,635,781),10300=>array(146,65,635,781),10301=>array(146,65,635,781),10302=>array(146,65,635,781),10303=>array(146,65,635,781),10304=>array(146,-195,342,0),10305=>array(146,-195,342,781),10306=>array(146,-195,342,521),10307=>array(146,-195,342,781),10308=>array(146,-195,342,261),10309=>array(146,-195,342,781),10310=>array(146,-195,342,521),10311=>array(146,-195,342,781),10312=>array(146,-195,635,781),10313=>array(146,-195,635,781),10314=>array(146,-195,635,781),10315=>array(146,-195,635,781),10316=>array(146,-195,635,781),10317=>array(146,-195,635,781),10318=>array(146,-195,635,781),10319=>array(146,-195,635,781),10320=>array(146,-195,635,521),10321=>array(146,-195,635,781),10322=>array(146,-195,635,521),10323=>array(146,-195,635,781),10324=>array(146,-195,635,521),10325=>array(146,-195,635,781),10326=>array(146,-195,635,521),10327=>array(146,-195,635,781),10328=>array(146,-195,635,781),10329=>array(146,-195,635,781),10330=>array(146,-195,635,781),10331=>array(146,-195,635,781),10332=>array(146,-195,635,781),10333=>array(146,-195,635,781),10334=>array(146,-195,635,781),10335=>array(146,-195,635,781),10336=>array(146,-195,635,261),10337=>array(146,-195,635,781),10338=>array(146,-195,635,521),10339=>array(146,-195,635,781),10340=>array(146,-195,635,261),10341=>array(146,-195,635,781),10342=>array(146,-195,635,521),10343=>array(146,-195,635,781),10344=>array(146,-195,635,781),10345=>array(146,-195,635,781),10346=>array(146,-195,635,781),10347=>array(146,-195,635,781),10348=>array(146,-195,635,781),10349=>array(146,-195,635,781),10350=>array(146,-195,635,781),10351=>array(146,-195,635,781),10352=>array(146,-195,635,521),10353=>array(146,-195,635,781),10354=>array(146,-195,635,521),10355=>array(146,-195,635,781),10356=>array(146,-195,635,521),10357=>array(146,-195,635,781),10358=>array(146,-195,635,521),10359=>array(146,-195,635,781),10360=>array(146,-195,635,781),10361=>array(146,-195,635,781),10362=>array(146,-195,635,781),10363=>array(146,-195,635,781),10364=>array(146,-195,635,781),10365=>array(146,-195,635,781),10366=>array(146,-195,635,781),10367=>array(146,-195,635,781),10368=>array(439,-195,635,0),10369=>array(146,-195,635,781),10370=>array(146,-195,635,521),10371=>array(146,-195,635,781),10372=>array(146,-195,635,261),10373=>array(146,-195,635,781),10374=>array(146,-195,635,521),10375=>array(146,-195,635,781),10376=>array(439,-195,635,781),10377=>array(146,-195,635,781),10378=>array(146,-195,635,781),10379=>array(146,-195,635,781),10380=>array(146,-195,635,781),10381=>array(146,-195,635,781),10382=>array(146,-195,635,781),10383=>array(146,-195,635,781),10384=>array(439,-195,635,521),10385=>array(146,-195,635,781),10386=>array(146,-195,635,521),10387=>array(146,-195,635,781),10388=>array(146,-195,635,521),10389=>array(146,-195,635,781),10390=>array(146,-195,635,521),10391=>array(146,-195,635,781),10392=>array(439,-195,635,781),10393=>array(146,-195,635,781),10394=>array(146,-195,635,781),10395=>array(146,-195,635,781),10396=>array(146,-195,635,781),10397=>array(146,-195,635,781),10398=>array(146,-195,635,781),10399=>array(146,-195,635,781),10400=>array(439,-195,635,261),10401=>array(146,-195,635,781),10402=>array(146,-195,635,521),10403=>array(146,-195,635,781),10404=>array(146,-195,635,261),10405=>array(146,-195,635,781),10406=>array(146,-195,635,521),10407=>array(146,-195,635,781),10408=>array(439,-195,635,781),10409=>array(146,-195,635,781),10410=>array(146,-195,635,781),10411=>array(146,-195,635,781),10412=>array(146,-195,635,781),10413=>array(146,-195,635,781),10414=>array(146,-195,635,781),10415=>array(146,-195,635,781),10416=>array(439,-195,635,521),10417=>array(146,-195,635,781),10418=>array(146,-195,635,521),10419=>array(146,-195,635,781),10420=>array(146,-195,635,521),10421=>array(146,-195,635,781),10422=>array(146,-195,635,521),10423=>array(146,-195,635,781),10424=>array(439,-195,635,781),10425=>array(146,-195,635,781),10426=>array(146,-195,635,781),10427=>array(146,-195,635,781),10428=>array(146,-195,635,781),10429=>array(146,-195,635,781),10430=>array(146,-195,635,781),10431=>array(146,-195,635,781),10432=>array(146,-195,635,0),10433=>array(146,-195,635,781),10434=>array(146,-195,635,521),10435=>array(146,-195,635,781),10436=>array(146,-195,635,261),10437=>array(146,-195,635,781),10438=>array(146,-195,635,521),10439=>array(146,-195,635,781),10440=>array(146,-195,635,781),10441=>array(146,-195,635,781),10442=>array(146,-195,635,781),10443=>array(146,-195,635,781),10444=>array(146,-195,635,781),10445=>array(146,-195,635,781),10446=>array(146,-195,635,781),10447=>array(146,-195,635,781),10448=>array(146,-195,635,521),10449=>array(146,-195,635,781),10450=>array(146,-195,635,521),10451=>array(146,-195,635,781),10452=>array(146,-195,635,521),10453=>array(146,-195,635,781),10454=>array(146,-195,635,521),10455=>array(146,-195,635,781),10456=>array(146,-195,635,781),10457=>array(146,-195,635,781),10458=>array(146,-195,635,781),10459=>array(146,-195,635,781),10460=>array(146,-195,635,781),10461=>array(146,-195,635,781),10462=>array(146,-195,635,781),10463=>array(146,-195,635,781),10464=>array(146,-195,635,261),10465=>array(146,-195,635,781),10466=>array(146,-195,635,521),10467=>array(146,-195,635,781),10468=>array(146,-195,635,261),10469=>array(146,-195,635,781),10470=>array(146,-195,635,521),10471=>array(146,-195,635,781),10472=>array(146,-195,635,781),10473=>array(146,-195,635,781),10474=>array(146,-195,635,781),10475=>array(146,-195,635,781),10476=>array(146,-195,635,781),10477=>array(146,-195,635,781),10478=>array(146,-195,635,781),10479=>array(146,-195,635,781),10480=>array(146,-195,635,521),10481=>array(146,-195,635,781),10482=>array(146,-195,635,521),10483=>array(146,-195,635,781),10484=>array(146,-195,635,521),10485=>array(146,-195,635,781),10486=>array(146,-195,635,521),10487=>array(146,-195,635,781),10488=>array(146,-195,635,781),10489=>array(146,-195,635,781),10490=>array(146,-195,635,781),10491=>array(146,-195,635,781),10492=>array(146,-195,635,781),10493=>array(146,-195,635,781),10494=>array(146,-195,635,781),10495=>array(146,-195,635,781),10502=>array(49,87,781,540),10503=>array(57,87,789,540),10506=>array(132,0,707,732),10507=>array(132,0,707,732),10560=>array(86,45,726,853),10561=>array(86,45,726,853),10627=>array(125,-163,628,760),10628=>array(125,-163,628,760),10702=>array(106,-258,732,800),10703=>array(106,-1,940,628),10704=>array(106,-1,940,628),10705=>array(106,-48,894,674),10706=>array(106,-48,894,674),10707=>array(106,-48,894,674),10708=>array(106,-48,894,675),10709=>array(106,-48,894,675),10731=>array(3,-233,491,807),10746=>array(106,0,732,627),10747=>array(106,0,732,627),10752=>array(28,-211,972,734),10753=>array(28,-211,972,734),10754=>array(28,-211,972,734),10764=>array(15,-227,1646,754),10765=>array(14,-227,548,754),10766=>array(14,-227,548,754),10767=>array(14,-227,548,754),10768=>array(14,-227,548,754),10769=>array(14,-227,576,754),10770=>array(14,-227,548,754),10771=>array(14,-227,548,754),10772=>array(14,-228,651,754),10773=>array(14,-227,548,754),10774=>array(14,-227,548,754),10775=>array(-30,-227,556,754),10776=>array(14,-227,548,754),10777=>array(14,-227,548,754),10778=>array(14,-227,548,754),10779=>array(15,-227,548,898),10780=>array(15,-372,548,754),10799=>array(125,20,713,607),10858=>array(106,212,732,660),10859=>array(106,-34,732,660),10877=>array(106,-150,732,632),10878=>array(106,-150,732,632),10879=>array(106,-150,732,632),10880=>array(106,-150,732,632),10881=>array(106,-150,732,688),10882=>array(106,-150,732,688),10883=>array(106,-150,732,827),10884=>array(106,-150,732,827),10885=>array(106,-217,732,630),10886=>array(106,-217,732,630),10887=>array(106,-124,732,582),10888=>array(106,-124,732,582),10889=>array(106,-281,732,630),10890=>array(106,-281,732,630),10891=>array(106,-303,732,814),10892=>array(106,-303,732,814),10893=>array(106,-183,732,653),10894=>array(106,-183,732,653),10895=>array(106,-245,732,765),10896=>array(106,-245,732,765),10897=>array(106,-278,732,782),10898=>array(106,-278,732,782),10899=>array(106,-263,732,771),10900=>array(106,-263,732,771),10901=>array(106,-50,732,733),10902=>array(106,-50,732,733),10903=>array(106,-50,732,733),10904=>array(106,-50,732,733),10905=>array(106,-45,732,678),10906=>array(106,-45,732,678),10907=>array(106,-81,732,724),10908=>array(106,-81,732,724),10909=>array(106,13,732,680),10910=>array(106,13,732,680),10911=>array(106,-239,732,746),10912=>array(106,-239,732,746),10926=>array(106,22,732,656),10927=>array(106,-83,732,684),10928=>array(106,-83,732,684),10929=>array(106,-246,732,684),10930=>array(106,-246,732,684),10931=>array(106,-205,732,672),10932=>array(106,-205,732,672),10933=>array(106,-304,732,672),10934=>array(106,-304,732,672),10935=>array(106,-252,732,713),10936=>array(106,-252,732,713),10937=>array(106,-316,732,713),10938=>array(106,-316,732,713),11001=>array(106,-195,732,609),11002=>array(106,-195,732,609),11008=>array(123,-23,744,598),11009=>array(94,-23,715,598),11010=>array(123,-23,744,598),11011=>array(94,-23,715,598),11012=>array(27,46,789,581),11013=>array(27,46,781,581),11014=>array(151,0,687,754),11015=>array(151,-25,687,729),11016=>array(123,-23,744,598),11017=>array(94,-23,715,598),11018=>array(123,-23,744,598),11019=>array(94,-23,715,598),11020=>array(27,46,789,581),11021=>array(151,-25,687,754),11022=>array(57,-25,800,372),11023=>array(57,255,800,652),11024=>array(38,-25,781,372),11025=>array(38,255,781,652),11026=>array(91,-124,854,643),11027=>array(91,-124,854,643),11028=>array(91,-124,854,643),11029=>array(91,-124,854,643),11030=>array(3,-124,766,643),11031=>array(3,-124,766,643),11032=>array(3,-124,766,643),11033=>array(3,-124,766,643),11034=>array(91,-124,854,643),11039=>array(18,-26,852,767),11040=>array(18,-26,852,767),11041=>array(73,-91,800,748),11042=>array(73,-91,800,748),11043=>array(17,-35,856,692),11044=>array(55,-250,1064,770),11091=>array(38,-47,832,788),11092=>array(38,-47,832,788),11360=>array(5,0,610,729),11361=>array(5,0,355,760),11362=>array(-17,0,610,729),11363=>array(6,0,692,729),11364=>array(92,-200,750,729),11365=>array(32,-46,639,594),11366=>array(13,-93,455,822),11367=>array(92,-157,932,729),11368=>array(84,-138,809,760),11369=>array(92,-157,805,729),11370=>array(84,-138,684,760),11371=>array(45,-157,768,729),11372=>array(45,-138,622,547),11373=>array(48,-14,769,741),11374=>array(92,-200,903,729),11375=>array(5,0,769,729),11376=>array(48,-14,769,741),11377=>array(15,0,778,560),11378=>array(30,0,1221,742),11379=>array(35,0,1056,560),11380=>array(38,0,637,586),11381=>array(92,0,606,729),11382=>array(84,0,481,547),11383=>array(64,0,725,552),11385=>array(84,-13,490,760),11386=>array(43,-14,644,560),11387=>array(78,0,467,547),11388=>array(-21,-121,166,425),11389=>array(3,326,484,734),11390=>array(72,-240,670,742),11391=>array(45,-240,680,729),11520=>array(45,-64,609,547),11521=>array(16,-232,625,546),11522=>array(41,-232,629,547),11523=>array(42,-10,585,807),11524=>array(40,-228,613,546),11525=>array(41,-228,988,546),11526=>array(20,-8,668,816),11527=>array(42,-9,974,547),11528=>array(39,0,589,547),11529=>array(41,-227,614,816),11530=>array(39,-9,985,546),11531=>array(42,-8,649,816),11532=>array(39,0,627,816),11533=>array(41,-8,988,546),11534=>array(41,-8,629,546),11535=>array(41,-228,846,816),11536=>array(42,-9,976,816),11537=>array(41,-9,630,816),11538=>array(46,-232,610,546),11539=>array(41,-228,984,661),11540=>array(45,-228,958,546),11541=>array(39,-228,978,816),11542=>array(44,0,628,546),11543=>array(41,-228,630,547),11544=>array(41,-232,627,546),11545=>array(44,-228,628,816),11546=>array(42,-232,610,547),11547=>array(43,-9,658,816),11548=>array(44,-228,989,547),11549=>array(44,-232,619,546),11550=>array(46,-232,639,546),11551=>array(44,-228,615,567),11552=>array(44,-9,1004,546),11553=>array(44,-228,619,816),11554=>array(42,-9,601,626),11555=>array(44,-228,622,816),11556=>array(42,-228,684,546),11557=>array(45,-8,959,816),11568=>array(55,-14,636,380),11569=>array(50,-14,892,742),11570=>array(50,-14,892,742),11571=>array(51,0,674,729),11572=>array(51,0,674,729),11573=>array(56,0,669,729),11574=>array(48,0,627,729),11575=>array(5,0,769,729),11576=>array(5,0,769,729),11577=>array(92,0,610,729),11578=>array(92,0,610,729),11579=>array(73,-14,729,742),11580=>array(73,0,916,729),11581=>array(92,0,754,729),11582=>array(92,0,549,729),11583=>array(92,0,754,729),11584=>array(50,-14,892,742),11585=>array(50,-84,892,815),11586=>array(92,0,281,729),11587=>array(21,0,720,729),11588=>array(92,0,745,729),11589=>array(-30,0,944,729),11590=>array(92,0,598,729),11591=>array(92,0,709,729),11592=>array(73,256,607,445),11593=>array(92,0,610,729),11594=>array(73,0,529,729),11595=>array(64,-14,892,742),11596=>array(82,0,695,729),11597=>array(92,0,745,729),11598=>array(92,0,610,729),11599=>array(92,0,280,729),11600=>array(82,0,695,729),11601=>array(92,0,281,729),11602=>array(42,-14,684,729),11603=>array(55,-14,636,742),11604=>array(50,-14,892,742),11605=>array(50,-95,892,742),11606=>array(92,0,745,729),11607=>array(92,0,281,729),11608=>array(92,0,744,729),11609=>array(50,-14,892,742),11610=>array(50,-14,892,823),11611=>array(50,-14,718,742),11612=>array(79,0,797,729),11613=>array(19,0,751,729),11614=>array(50,-14,718,742),11615=>array(92,0,610,729),11616=>array(5,0,769,729),11617=>array(92,0,745,729),11618=>array(92,0,599,729),11619=>array(50,0,800,729),11620=>array(92,0,654,729),11621=>array(50,0,800,729),11631=>array(64,490,651,729),11800=>array(69,-14,515,728),11807=>array(106,-34,732,415),11810=>array(86,403,389,760),11811=>array(68,403,371,760),11812=>array(86,-132,389,225),11813=>array(68,-132,371,225),11822=>array(69,0,515,742),19904=>array(83,-158,813,729),19905=>array(83,-158,813,729),19906=>array(83,-158,813,729),19907=>array(83,-158,813,729),19908=>array(83,-158,813,729),19909=>array(83,-158,813,729),19910=>array(83,-158,813,729),19911=>array(83,-158,813,729),19912=>array(83,-158,813,729),19913=>array(83,-158,814,729),19914=>array(83,-158,813,729),19915=>array(83,-158,813,729),19916=>array(83,-158,813,729),19917=>array(83,-158,813,729),19918=>array(83,-158,813,729),19919=>array(83,-158,813,729),19920=>array(83,-158,814,729),19921=>array(83,-158,813,729),19922=>array(83,-158,814,729),19923=>array(83,-158,813,729),19924=>array(83,-158,813,729),19925=>array(83,-158,813,729),19926=>array(83,-158,813,729),19927=>array(83,-158,813,729),19928=>array(83,-158,813,729),19929=>array(83,-158,813,729),19930=>array(83,-158,813,729),19931=>array(83,-158,814,729),19932=>array(83,-158,813,729),19933=>array(83,-158,813,729),19934=>array(83,-158,814,729),19935=>array(83,-158,813,729),19936=>array(83,-158,813,729),19937=>array(83,-158,813,729),19938=>array(83,-158,813,729),19939=>array(83,-158,813,729),19940=>array(83,-158,813,729),19941=>array(83,-158,814,729),19942=>array(83,-158,813,729),19943=>array(83,-158,813,729),19944=>array(83,-158,814,729),19945=>array(83,-158,813,729),19946=>array(83,-158,814,729),19947=>array(83,-158,813,729),19948=>array(83,-158,814,729),19949=>array(83,-158,813,729),19950=>array(83,-158,814,729),19951=>array(83,-158,813,729),19952=>array(83,-158,814,729),19953=>array(83,-158,813,729),19954=>array(83,-158,813,729),19955=>array(83,-158,813,729),19956=>array(83,-158,813,729),19957=>array(83,-158,814,729),19958=>array(83,-158,813,729),19959=>array(83,-158,813,729),19960=>array(83,-158,813,729),19961=>array(83,-158,814,729),19962=>array(83,-158,813,729),19963=>array(83,-158,814,729),19964=>array(83,-158,814,729),19965=>array(83,-158,813,729),19966=>array(83,-158,813,729),19967=>array(83,-158,813,729),42192=>array(92,0,692,729),42193=>array(92,0,692,729),42194=>array(41,0,641,729),42195=>array(92,0,778,729),42196=>array(5,0,677,729),42197=>array(5,0,677,729),42198=>array(50,-14,747,742),42199=>array(92,0,805,729),42200=>array(-30,0,683,729),42201=>array(0,-14,439,729),42202=>array(50,-14,670,742),42203=>array(50,-14,670,742),42204=>array(45,0,680,729),42205=>array(92,0,599,729),42206=>array(92,0,599,729),42207=>array(92,0,903,729),42208=>array(92,0,745,729),42209=>array(92,0,610,729),42210=>array(72,-14,647,742),42211=>array(92,0,750,729),42212=>array(20,0,678,729),42213=>array(5,0,769,729),42214=>array(5,0,769,729),42215=>array(92,0,745,729),42216=>array(25,-14,723,742),42217=>array(91,0,530,743),42218=>array(30,0,1072,729),42219=>array(19,0,751,729),42220=>array(-10,0,734,729),42221=>array(70,0,670,729),42222=>array(5,0,769,729),42223=>array(5,0,769,729),42224=>array(92,0,610,729),42225=>array(73,0,591,729),42226=>array(92,0,280,729),42227=>array(50,-14,800,742),42228=>array(92,-14,720,729),42229=>array(92,0,720,743),42230=>array(9,0,527,729),42231=>array(52,0,738,729),42232=>array(73,0,249,189),42233=>array(24,-142,249,189),42234=>array(73,0,601,189),42235=>array(73,-142,601,189),42236=>array(24,-142,249,547),42237=>array(73,0,249,547),42238=>array(73,0,515,405),42239=>array(73,134,515,492),42564=>array(26,-14,601,742),42565=>array(15,-14,511,560),42566=>array(92,0,428,729),42567=>array(83,0,356,547),42572=>array(57,-14,1348,654),42573=>array(47,-13,1126,547),42576=>array(49,0,1142,729),42577=>array(20,0,946,547),42580=>array(55,-14,1082,742),42581=>array(44,-14,888,560),42582=>array(92,0,1088,729),42583=>array(84,-14,880,560),42594=>array(60,-157,1058,729),42595=>array(56,-138,900,547),42596=>array(46,0,1069,729),42597=>array(55,0,888,547),42598=>array(92,0,1233,729),42599=>array(84,0,973,547),42600=>array(50,-14,800,742),42601=>array(43,-14,644,560),42602=>array(50,-14,987,742),42603=>array(43,-14,825,560),42604=>array(50,-14,1356,742),42605=>array(43,-14,1063,560),42606=>array(28,-208,933,743),42634=>array(5,-200,883,729),42635=>array(4,-216,709,547),42636=>array(5,0,677,729),42637=>array(4,0,575,547),42644=>array(81,0,716,729),42645=>array(84,0,634,760),42760=>array(96,0,404,693),42761=>array(96,0,404,693),42762=>array(96,0,404,693),42763=>array(96,0,404,693),42764=>array(96,0,404,693),42765=>array(96,0,404,693),42766=>array(96,0,404,693),42767=>array(96,0,404,693),42768=>array(96,0,404,693),42769=>array(96,0,404,693),42770=>array(96,0,404,693),42771=>array(96,0,404,693),42772=>array(96,0,404,693),42773=>array(96,0,404,693),42774=>array(96,0,404,693),42779=>array(58,326,342,736),42780=>array(58,324,342,734),42781=>array(88,326,199,734),42782=>array(88,326,199,734),42783=>array(88,0,199,408),42786=>array(67,0,409,729),42787=>array(67,0,355,547),42788=>array(56,224,479,742),42789=>array(56,42,479,560),42790=>array(92,-200,745,729),42791=>array(84,-216,634,760),42792=>array(5,-216,986,729),42793=>array(13,-215,810,702),42794=>array(67,-14,616,742),42795=>array(54,-202,493,560),42800=>array(92,0,473,547),42801=>array(52,-14,548,560),42802=>array(5,0,1344,729),42803=>array(43,-14,973,560),42804=>array(5,-14,1234,742),42805=>array(43,-14,1021,560),42806=>array(5,-14,1124,729),42807=>array(43,-14,970,560),42808=>array(5,0,1074,729),42809=>array(43,-14,907,560),42810=>array(5,0,1074,729),42811=>array(43,-14,907,560),42812=>array(5,-216,1030,729),42813=>array(43,-216,907,560),42814=>array(33,-14,653,742),42815=>array(43,-14,526,560),42816=>array(5,0,812,729),42817=>array(6,0,708,760),42822=>array(92,0,822,729),42823=>array(84,0,458,760),42824=>array(41,0,655,729),42825=>array(59,0,473,760),42826=>array(16,-14,902,742),42827=>array(5,-14,809,560),42830=>array(50,-14,1356,742),42831=>array(43,-14,1063,560),42832=>array(16,0,692,729),42833=>array(5,-208,671,560),42834=>array(34,0,907,729),42835=>array(34,-208,892,560),42838=>array(50,-188,800,742),42839=>array(45,-208,711,559),42852=>array(16,0,692,729),42853=>array(5,-208,671,760),42854=>array(16,0,692,729),42855=>array(5,-208,671,760),42880=>array(27,0,545,729),42881=>array(84,-208,259,547),42882=>array(84,-208,730,742),42883=>array(84,-208,634,560),42889=>array(112,0,288,547),42890=>array(83,141,303,405),42891=>array(140,245,316,729),42892=>array(95,458,211,729),42893=>array(81,0,716,729),42894=>array(84,-216,680,760),42896=>array(92,-157,868,729),42897=>array(84,-138,725,560),42912=>array(-11,-14,832,742),42913=>array(-11,-216,727,559),42914=>array(-11,0,805,729),42915=>array(-11,0,684,760),42916=>array(-11,0,848,729),42917=>array(-11,0,723,560),42918=>array(-11,0,781,729),42919=>array(-11,0,504,560),42920=>array(-11,-14,731,742),42921=>array(-11,-14,606,560),42922=>array(-68,0,794,729),43002=>array(84,0,972,547),43003=>array(84,0,591,729),43004=>array(41,0,641,729),43005=>array(92,0,903,729),43006=>array(92,0,280,928),43007=>array(31,0,1294,729),61184=>array(91,602,317,693),61185=>array(48,451,338,693),61186=>array(26,301,363,693),61187=>array(17,150,373,693),61188=>array(13,0,378,693),61189=>array(48,451,338,693),61190=>array(91,451,317,543),61191=>array(48,301,338,543),61192=>array(26,150,363,543),61193=>array(17,0,373,543),61194=>array(26,301,363,693),61195=>array(48,301,338,543),61196=>array(91,301,317,393),61197=>array(48,150,338,393),61198=>array(26,0,363,393),61199=>array(17,150,373,693),61200=>array(26,149,363,542),61201=>array(48,150,338,393),61202=>array(91,150,317,242),61203=>array(48,0,338,242),61204=>array(13,0,378,693),61205=>array(17,0,373,543),61206=>array(26,0,363,393),61207=>array(48,0,338,242),61208=>array(91,0,317,92),61209=>array(96,0,188,693),62464=>array(49,-14,563,819),62465=>array(49,-15,563,823),62466=>array(49,-14,604,828),62467=>array(49,0,853,828),62468=>array(49,-15,563,828),62469=>array(49,-15,563,828),62470=>array(29,-15,612,828),62471=>array(49,-14,846,828),62472=>array(49,0,541,828),62473=>array(49,-14,563,820),62474=>array(49,-6,1114,828),62475=>array(49,-14,563,828),62476=>array(63,-15,578,820),62477=>array(54,0,839,828),62478=>array(49,-15,563,819),62479=>array(49,-15,563,840),62480=>array(49,0,875,828),62481=>array(63,-14,578,819),62482=>array(44,-14,699,828),62483=>array(34,-14,570,828),62484=>array(49,-14,837,828),62485=>array(49,-14,563,819),62486=>array(49,0,858,828),62487=>array(49,-14,563,820),62488=>array(44,-14,558,828),62489=>array(64,0,579,828),62490=>array(50,-15,628,820),62491=>array(49,-14,563,819),62492=>array(63,-14,577,828),62493=>array(49,-14,581,820),62494=>array(63,-14,578,819),62495=>array(24,-14,546,828),62496=>array(49,-15,563,828),62497=>array(63,-15,577,828),62498=>array(49,-73,563,828),62499=>array(49,-15,563,830),62500=>array(49,-15,569,828),62501=>array(49,-14,627,828),62502=>array(49,-14,914,828),62504=>array(45,-228,960,816),62505=>array(54,-223,791,843),62506=>array(54,-14,510,761),62507=>array(54,-14,510,773),62508=>array(54,-14,510,866),62509=>array(54,-14,510,812),62510=>array(54,-14,510,877),62511=>array(54,-14,510,803),62512=>array(54,-232,501,761),62513=>array(54,-232,501,793),62514=>array(54,-232,501,891),62515=>array(54,-232,501,803),62516=>array(54,0,520,761),62517=>array(54,0,520,793),62518=>array(54,0,520,803),62519=>array(54,-0,770,761),62520=>array(54,-0,770,773),62521=>array(54,-0,770,884),62522=>array(54,-0,770,793),62523=>array(54,-0,770,803),62524=>array(54,-232,557,761),62525=>array(54,-232,557,773),62526=>array(54,-232,557,894),62527=>array(54,-232,557,793),62528=>array(54,-232,557,803),62529=>array(54,-232,557,844),63173=>array(43,-14,644,760),64256=>array(19,0,819,760),64257=>array(21,0,657,760),64258=>array(19,0,657,760),64259=>array(19,0,1031,760),64260=>array(19,0,1032,760),64261=>array(19,0,785,760),64262=>array(52,-14,997,742),64275=>array(74,-14,1300,760),64276=>array(78,-14,1301,760),64277=>array(78,-208,1300,760),64278=>array(78,-208,1300,760),64279=>array(78,-208,1629,760),64285=>array(66,32,228,547),64286=>array(182,635,510,780),64287=>array(66,32,500,547),64288=>array(38,0,590,547),64289=>array(85,0,855,547),64290=>array(43,0,731,547),64291=>array(91,0,778,547),64292=>array(43,0,730,547),64293=>array(43,0,730,739),64294=>array(91,0,778,547),64295=>array(43,0,730,547),64296=>array(47,-4,730,547),64297=>array(106,256,732,627),64298=>array(20,0,750,710),64299=>array(20,0,750,723),64300=>array(20,0,750,710),64301=>array(20,0,750,710),64302=>array(84,-171,644,547),64303=>array(84,-217,644,547),64304=>array(84,-171,644,547),64305=>array(43,0,567,547),64306=>array(43,-9,418,547),64307=>array(43,0,545,547),64308=>array(91,0,596,547),64309=>array(43,0,346,547),64310=>array(43,0,442,547),64312=>array(90,-13,624,553),64313=>array(43,164,369,547),64314=>array(43,-240,487,547),64315=>array(43,0,511,547),64316=>array(43,0,527,711),64318=>array(43,0,633,554),64320=>array(43,0,362,547),64321=>array(90,-13,624,547),64323=>array(91,-240,584,547),64324=>array(91,0,603,547),64326=>array(33,0,564,547),64327=>array(91,-240,660,546),64328=>array(43,0,511,547),64329=>array(20,0,750,547),64330=>array(10,-4,592,547),64331=>array(91,0,252,710),64332=>array(43,0,567,710),64333=>array(43,0,511,710),64334=>array(91,0,603,710),64335=>array(43,0,652,729),64338=>array(63,-244,921,327),64339=>array(63,-244,1068,327),64340=>array(-10,-244,292,293),64341=>array(-10,-244,418,293),64342=>array(63,-244,921,327),64343=>array(63,-244,1068,327),64344=>array(-10,-244,302,293),64345=>array(-10,-244,418,293),64346=>array(63,-244,921,327),64347=>array(63,-244,1068,327),64348=>array(-10,-244,302,293),64349=>array(-10,-244,418,293),64350=>array(63,-5,921,566),64351=>array(63,-5,1068,566),64352=>array(-10,0,292,640),64353=>array(-10,0,418,640),64354=>array(63,-5,921,566),64355=>array(63,-5,1068,566),64356=>array(-10,0,302,640),64357=>array(-10,0,418,640),64358=>array(63,-5,921,599),64359=>array(63,-5,1068,599),64360=>array(-10,0,333,672),64361=>array(-10,0,418,672),64362=>array(63,-24,1082,786),64363=>array(63,-29,1201,786),64364=>array(-10,0,575,786),64365=>array(-10,0,729,786),64366=>array(63,-24,1082,786),64367=>array(63,-29,1201,786),64368=>array(-10,0,575,786),64369=>array(-10,0,729,786),64370=>array(77,-244,720,425),64371=>array(77,-244,730,425),64372=>array(-10,-244,628,405),64373=>array(-10,-244,730,405),64374=>array(77,-244,720,425),64375=>array(77,-244,730,425),64376=>array(-10,-117,628,405),64377=>array(-10,-117,730,405),64378=>array(77,-244,720,425),64379=>array(77,-244,730,425),64380=>array(-10,-244,628,405),64381=>array(-10,-244,730,405),64382=>array(77,-244,720,425),64383=>array(77,-244,730,425),64384=>array(-10,-244,628,405),64385=>array(-10,-244,730,405),64386=>array(61,-146,442,415),64387=>array(61,-146,587,415),64388=>array(61,-15,442,586),64389=>array(61,-15,587,586),64390=>array(61,-15,442,708),64391=>array(61,-15,587,708),64392=>array(61,-15,442,746),64393=>array(61,-15,587,746),64394=>array(-42,-244,508,615),64395=>array(-42,-244,632,615),64396=>array(-42,-244,520,648),64397=>array(-42,-244,632,648),64398=>array(63,-39,1024,760),64399=>array(63,-39,1034,760),64400=>array(-10,0,582,760),64401=>array(-10,0,591,760),64402=>array(63,-39,1024,910),64403=>array(63,-39,1034,910),64404=>array(-10,0,582,910),64405=>array(-10,0,591,910),64406=>array(63,-293,1024,910),64407=>array(63,-293,1034,910),64408=>array(-10,-269,582,910),64409=>array(-10,-269,591,910),64410=>array(63,-39,1024,910),64411=>array(63,-39,1034,910),64412=>array(-10,0,582,910),64413=>array(-10,0,591,910),64414=>array(62,-165,779,366),64415=>array(62,-244,910,287),64416=>array(62,-165,779,636),64417=>array(62,-244,910,514),64418=>array(-10,0,333,672),64419=>array(-10,0,418,672),64426=>array(70,-33,877,506),64427=>array(70,-244,890,369),64428=>array(-10,-33,633,506),64429=>array(-10,-244,670,369),64467=>array(70,-27,814,854),64468=>array(70,-27,941,854),64469=>array(-10,0,582,928),64470=>array(-10,0,591,928),64473=>array(-42,-244,547,556),64474=>array(-42,-244,637,556),64488=>array(-10,0,292,293),64489=>array(-10,0,418,293),64508=>array(63,-107,863,462),64509=>array(63,-126,1021,291),64510=>array(-10,-166,302,293),64511=>array(-10,-166,418,293),65056=>array(-419,735,0,880),65057=>array(0,735,419,880),65058=>array(-362,756,0,894),65059=>array(0,756,362,894),65136=>array(28,591,313,825),65137=>array(-10,0,352,825),65138=>array(28,591,313,881),65139=>array(51,0,356,177),65140=>array(28,-239,313,-5),65142=>array(28,591,313,723),65143=>array(-10,0,352,723),65144=>array(28,590,313,881),65145=>array(-10,0,352,881),65146=>array(28,-137,313,-5),65147=>array(-10,-137,352,125),65148=>array(9,599,333,869),65149=>array(-10,0,352,869),65150=>array(36,610,304,878),65151=>array(-10,0,352,878),65152=>array(73,20,437,493),65153=>array(-20,0,362,955),65154=>array(-20,0,385,955),65155=>array(75,0,259,993),65156=>array(75,0,385,993),65157=>array(-42,-244,547,603),65158=>array(-42,-244,637,603),65159=>array(76,-245,259,760),65160=>array(76,-245,385,760),65161=>array(63,-107,863,603),65162=>array(63,-126,1021,480),65163=>array(-10,0,292,627),65164=>array(-10,0,418,627),65165=>array(84,0,259,760),65166=>array(84,0,385,760),65167=>array(63,-149,921,327),65168=>array(63,-149,1068,327),65169=>array(-10,-173,292,293),65170=>array(-10,-173,418,293),65171=>array(48,-30,540,513),65172=>array(65,0,616,513),65173=>array(63,-5,921,415),65174=>array(63,-5,1068,415),65175=>array(-10,0,302,488),65176=>array(-10,0,418,488),65177=>array(63,-5,921,537),65178=>array(63,-5,1068,537),65179=>array(-10,0,302,610),65180=>array(-10,0,418,610),65181=>array(77,-244,720,425),65182=>array(77,-244,730,425),65183=>array(-10,-173,628,405),65184=>array(-10,-173,730,405),65185=>array(77,-244,720,425),65186=>array(77,-244,730,425),65187=>array(-10,0,628,405),65188=>array(-10,0,730,405),65189=>array(77,-244,720,579),65190=>array(77,-244,730,579),65191=>array(-10,0,628,530),65192=>array(-10,0,730,530),65193=>array(61,-15,442,415),65194=>array(61,-15,587,415),65195=>array(61,-15,442,579),65196=>array(61,-15,587,579),65197=>array(-42,-244,508,269),65198=>array(-42,-244,632,269),65199=>array(-42,-244,508,457),65200=>array(-42,-244,632,457),65201=>array(63,-244,1297,366),65202=>array(63,-244,1423,366),65203=>array(-10,-14,901,366),65204=>array(-10,-14,1027,366),65205=>array(63,-244,1297,586),65206=>array(63,-244,1423,586),65207=>array(-10,-14,901,586),65208=>array(-10,-14,1027,586),65209=>array(63,-244,1265,362),65210=>array(63,-244,1374,362),65211=>array(-10,0,886,362),65212=>array(-10,0,995,362),65213=>array(63,-244,1265,457),65214=>array(63,-244,1374,457),65215=>array(-10,0,886,481),65216=>array(-10,0,995,481),65217=>array(70,0,971,760),65218=>array(70,0,1081,760),65219=>array(-10,0,875,760),65220=>array(-10,0,984,760),65221=>array(70,0,971,760),65222=>array(70,0,1081,760),65223=>array(-10,0,875,760),65224=>array(-10,0,984,760),65225=>array(87,-244,720,521),65226=>array(57,-244,693,382),65227=>array(-10,0,583,521),65228=>array(-10,0,574,382),65229=>array(87,-244,720,652),65230=>array(57,-244,693,530),65231=>array(-10,0,583,652),65232=>array(-10,0,574,530),65233=>array(63,-24,1082,627),65234=>array(63,-29,1201,627),65235=>array(-10,0,575,627),65236=>array(-10,0,729,627),65237=>array(52,-215,825,635),65238=>array(52,-244,911,476),65239=>array(-10,0,575,635),65240=>array(-10,0,729,635),65241=>array(70,-27,814,760),65242=>array(70,-27,941,760),65243=>array(-10,0,582,760),65244=>array(-10,0,591,760),65245=>array(70,-142,778,760),65246=>array(70,-142,902,760),65247=>array(-10,0,292,760),65248=>array(-10,0,418,760),65249=>array(68,-244,660,369),65250=>array(68,-244,794,311),65251=>array(-10,-23,546,311),65252=>array(-10,-23,680,311),65253=>array(62,-165,779,457),65254=>array(62,-244,910,383),65255=>array(-10,0,292,481),65256=>array(-10,0,418,481),65257=>array(48,-30,540,358),65258=>array(65,0,616,366),65259=>array(-10,-33,633,506),65260=>array(-10,-244,670,369),65261=>array(-42,-244,547,322),65262=>array(-42,-244,637,322),65263=>array(63,-107,863,462),65264=>array(63,-126,1021,291),65265=>array(63,-244,863,462),65266=>array(63,-244,1021,291),65267=>array(-10,-166,302,293),65268=>array(-10,-166,418,293),65269=>array(-62,-15,643,882),65270=>array(-62,-15,769,882),65271=>array(33,-15,643,944),65272=>array(33,-15,769,944),65273=>array(41,-245,643,760),65274=>array(41,-245,769,760),65275=>array(41,-15,643,760),65276=>array(41,-15,769,760),65533=>array(24,-139,1089,926),65535=>array(50,-177,550,705));
-$cw=array(0=>600,32=>348,33=>456,34=>521,35=>838,36=>696,37=>1002,38=>872,39=>306,40=>457,41=>457,42=>523,43=>838,44=>380,45=>415,46=>380,47=>365,48=>696,49=>696,50=>696,51=>696,52=>696,53=>696,54=>696,55=>696,56=>696,57=>696,58=>400,59=>400,60=>838,61=>838,62=>838,63=>580,64=>1000,65=>774,66=>762,67=>734,68=>830,69=>683,70=>683,71=>821,72=>837,73=>372,74=>372,75=>775,76=>637,77=>995,78=>837,79=>850,80=>733,81=>850,82=>770,83=>720,84=>682,85=>812,86=>774,87=>1103,88=>771,89=>724,90=>725,91=>457,92=>365,93=>457,94=>838,95=>500,96=>500,97=>675,98=>716,99=>593,100=>716,101=>678,102=>435,103=>716,104=>712,105=>343,106=>343,107=>665,108=>343,109=>1042,110=>712,111=>687,112=>716,113=>716,114=>493,115=>595,116=>478,117=>712,118=>652,119=>924,120=>645,121=>652,122=>582,123=>712,124=>365,125=>712,126=>838,160=>348,161=>456,162=>696,163=>696,164=>636,165=>696,166=>365,167=>500,168=>500,169=>1000,170=>564,171=>646,172=>838,173=>415,174=>1000,175=>500,176=>500,177=>838,178=>438,179=>438,180=>500,181=>736,182=>636,183=>380,184=>500,185=>438,186=>564,187=>646,188=>1035,189=>1035,190=>1035,191=>580,192=>774,193=>774,194=>774,195=>774,196=>774,197=>774,198=>1085,199=>734,200=>683,201=>683,202=>683,203=>683,204=>372,205=>372,206=>372,207=>372,208=>838,209=>837,210=>850,211=>850,212=>850,213=>850,214=>850,215=>838,216=>850,217=>812,218=>812,219=>812,220=>812,221=>724,222=>738,223=>719,224=>675,225=>675,226=>675,227=>675,228=>675,229=>675,230=>1048,231=>593,232=>678,233=>678,234=>678,235=>678,236=>343,237=>343,238=>343,239=>343,240=>687,241=>712,242=>687,243=>687,244=>687,245=>687,246=>687,247=>838,248=>687,249=>712,250=>712,251=>712,252=>712,253=>652,254=>716,255=>652,256=>774,257=>675,258=>774,259=>675,260=>774,261=>675,262=>734,263=>593,264=>734,265=>593,266=>734,267=>593,268=>734,269=>593,270=>830,271=>716,272=>838,273=>716,274=>683,275=>678,276=>683,277=>678,278=>683,279=>678,280=>683,281=>678,282=>683,283=>678,284=>821,285=>716,286=>821,287=>716,288=>821,289=>716,290=>821,291=>716,292=>837,293=>712,294=>974,295=>790,296=>372,297=>343,298=>372,299=>343,300=>372,301=>343,302=>372,303=>343,304=>372,305=>343,306=>744,307=>686,308=>372,309=>343,310=>775,311=>665,312=>665,313=>637,314=>343,315=>637,316=>343,317=>637,318=>479,319=>637,320=>557,321=>642,322=>371,323=>837,324=>712,325=>837,326=>712,327=>837,328=>712,329=>983,330=>837,331=>712,332=>850,333=>687,334=>850,335=>687,336=>850,337=>687,338=>1167,339=>1094,340=>770,341=>493,342=>770,343=>493,344=>770,345=>493,346=>720,347=>595,348=>720,349=>595,350=>720,351=>595,352=>720,353=>595,354=>682,355=>478,356=>682,357=>478,358=>682,359=>478,360=>812,361=>712,362=>812,363=>712,364=>812,365=>712,366=>812,367=>712,368=>812,369=>712,370=>812,371=>712,372=>1103,373=>924,374=>724,375=>652,376=>724,377=>725,378=>582,379=>725,380=>582,381=>725,382=>582,383=>435,384=>716,385=>811,386=>762,387=>716,388=>762,389=>716,390=>734,391=>734,392=>593,393=>838,394=>879,395=>757,396=>716,397=>688,398=>683,399=>849,400=>696,401=>683,402=>435,403=>821,404=>793,405=>1045,406=>436,407=>389,408=>775,409=>665,410=>360,411=>592,412=>1042,413=>837,414=>712,415=>850,416=>874,417=>687,418=>1083,419=>912,420=>782,421=>716,422=>770,423=>720,424=>595,425=>683,426=>552,427=>478,428=>707,429=>478,430=>682,431=>835,432=>712,433=>850,434=>813,435=>797,436=>778,437=>725,438=>582,439=>772,440=>772,441=>641,442=>582,443=>696,444=>772,445=>641,446=>573,447=>716,448=>372,449=>659,450=>544,451=>372,452=>1555,453=>1412,454=>1298,455=>1009,456=>980,457=>686,458=>1209,459=>1180,460=>1055,461=>774,462=>675,463=>372,464=>343,465=>850,466=>687,467=>812,468=>712,469=>812,470=>712,471=>812,472=>712,473=>812,474=>712,475=>812,476=>712,477=>678,478=>774,479=>675,480=>774,481=>675,482=>1085,483=>1048,484=>821,485=>716,486=>821,487=>716,488=>775,489=>665,490=>850,491=>687,492=>850,493=>687,494=>772,495=>582,496=>343,497=>1555,498=>1412,499=>1298,500=>821,501=>716,502=>1289,503=>787,504=>837,505=>712,506=>774,507=>675,508=>1085,509=>1048,510=>850,511=>687,512=>774,513=>675,514=>774,515=>675,516=>683,517=>678,518=>683,519=>678,520=>372,521=>343,522=>372,523=>343,524=>850,525=>687,526=>850,527=>687,528=>770,529=>493,530=>770,531=>493,532=>812,533=>712,534=>812,535=>712,536=>720,537=>595,538=>682,539=>478,540=>690,541=>607,542=>837,543=>712,544=>837,545=>865,546=>809,547=>659,548=>725,549=>582,550=>774,551=>675,552=>683,553=>678,554=>850,555=>687,556=>850,557=>687,558=>850,559=>687,560=>850,561=>687,562=>724,563=>652,564=>492,565=>867,566=>512,567=>343,568=>1088,569=>1088,570=>774,571=>734,572=>593,573=>637,574=>682,575=>595,576=>582,577=>782,578=>614,579=>762,580=>812,581=>774,582=>683,583=>678,584=>372,585=>343,586=>860,587=>791,588=>770,589=>493,590=>724,591=>652,592=>675,593=>716,594=>716,595=>716,596=>593,597=>593,598=>717,599=>792,600=>678,601=>678,602=>876,603=>557,604=>545,605=>815,606=>731,607=>343,608=>792,609=>716,610=>627,611=>644,612=>635,613=>712,614=>712,615=>712,616=>545,617=>440,618=>545,619=>559,620=>693,621=>343,622=>841,623=>1042,624=>1042,625=>1042,626=>712,627=>793,628=>707,629=>687,630=>909,631=>681,632=>796,633=>538,634=>538,635=>650,636=>493,637=>493,638=>596,639=>596,640=>642,641=>642,642=>595,643=>415,644=>435,645=>605,646=>552,647=>478,648=>478,649=>920,650=>772,651=>670,652=>652,653=>924,654=>652,655=>724,656=>694,657=>684,658=>641,659=>641,660=>573,661=>573,662=>573,663=>573,664=>850,665=>633,666=>731,667=>685,668=>691,669=>343,670=>732,671=>539,672=>792,673=>573,674=>573,675=>1156,676=>1214,677=>1155,678=>975,679=>769,680=>929,681=>1026,682=>862,683=>780,684=>591,685=>415,686=>677,687=>789,688=>456,689=>456,690=>219,691=>315,692=>315,693=>315,694=>411,695=>591,696=>417,697=>302,698=>521,699=>380,700=>380,701=>380,702=>366,703=>366,704=>326,705=>326,706=>500,707=>500,708=>500,709=>500,710=>500,711=>500,712=>306,713=>500,714=>500,715=>500,716=>306,717=>500,718=>500,719=>500,720=>337,721=>337,722=>366,723=>366,724=>500,725=>500,726=>416,727=>328,728=>500,729=>500,730=>500,731=>500,732=>500,733=>500,734=>351,735=>500,736=>412,737=>219,738=>381,739=>413,740=>326,741=>500,742=>500,743=>500,744=>500,745=>500,748=>500,749=>500,750=>657,755=>500,759=>500,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,832=>0,833=>0,834=>0,835=>0,836=>0,837=>0,838=>0,839=>0,840=>0,841=>0,842=>0,843=>0,844=>0,845=>0,846=>0,847=>0,849=>0,850=>0,851=>0,855=>0,856=>0,858=>0,860=>0,861=>0,862=>0,863=>0,864=>0,865=>0,866=>0,880=>698,881=>565,882=>1022,883=>836,884=>302,885=>302,886=>837,887=>701,890=>500,891=>593,892=>550,893=>549,894=>400,900=>441,901=>500,902=>797,903=>380,904=>846,905=>1009,906=>563,908=>891,910=>980,911=>894,912=>390,913=>774,914=>762,915=>637,916=>774,917=>683,918=>725,919=>837,920=>850,921=>372,922=>775,923=>774,924=>995,925=>837,926=>632,927=>850,928=>837,929=>733,931=>683,932=>682,933=>724,934=>850,935=>771,936=>850,937=>850,938=>372,939=>724,940=>687,941=>557,942=>712,943=>390,944=>675,945=>687,946=>716,947=>681,948=>687,949=>557,950=>591,951=>712,952=>687,953=>390,954=>710,955=>633,956=>736,957=>681,958=>591,959=>687,960=>791,961=>716,962=>593,963=>779,964=>638,965=>675,966=>782,967=>645,968=>794,969=>869,970=>390,971=>675,972=>687,973=>675,974=>869,975=>775,976=>651,977=>661,978=>746,979=>981,980=>746,981=>796,982=>869,983=>744,984=>850,985=>687,986=>734,987=>593,988=>683,989=>494,990=>702,991=>660,992=>919,993=>627,994=>1093,995=>837,996=>832,997=>716,998=>928,999=>744,1000=>733,1001=>650,1002=>789,1003=>671,1004=>752,1005=>716,1006=>682,1007=>590,1008=>744,1009=>716,1010=>593,1011=>343,1012=>850,1013=>645,1014=>644,1015=>738,1016=>716,1017=>734,1018=>995,1019=>732,1020=>716,1021=>698,1022=>734,1023=>698,1024=>683,1025=>683,1026=>878,1027=>637,1028=>734,1029=>720,1030=>372,1031=>372,1032=>372,1033=>1154,1034=>1130,1035=>878,1036=>817,1037=>837,1038=>771,1039=>837,1040=>774,1041=>762,1042=>762,1043=>637,1044=>891,1045=>683,1046=>1224,1047=>710,1048=>837,1049=>837,1050=>817,1051=>831,1052=>995,1053=>837,1054=>850,1055=>837,1056=>733,1057=>734,1058=>682,1059=>771,1060=>992,1061=>771,1062=>928,1063=>808,1064=>1235,1065=>1326,1066=>939,1067=>1036,1068=>762,1069=>734,1070=>1174,1071=>770,1072=>675,1073=>698,1074=>633,1075=>522,1076=>808,1077=>678,1078=>995,1079=>581,1080=>701,1081=>701,1082=>679,1083=>732,1084=>817,1085=>691,1086=>687,1087=>691,1088=>716,1089=>593,1090=>580,1091=>652,1092=>992,1093=>645,1094=>741,1095=>687,1096=>1062,1097=>1105,1098=>751,1099=>904,1100=>632,1101=>593,1102=>972,1103=>642,1104=>678,1105=>678,1106=>714,1107=>522,1108=>593,1109=>595,1110=>343,1111=>343,1112=>343,1113=>991,1114=>956,1115=>734,1116=>679,1117=>701,1118=>652,1119=>691,1120=>1093,1121=>869,1122=>840,1123=>736,1124=>1012,1125=>839,1126=>992,1127=>832,1128=>1358,1129=>1121,1130=>850,1131=>687,1132=>1236,1133=>1007,1134=>696,1135=>557,1136=>1075,1137=>1061,1138=>850,1139=>687,1140=>850,1141=>695,1142=>850,1143=>695,1144=>1148,1145=>1043,1146=>1074,1147=>863,1148=>1405,1149=>1173,1150=>1093,1151=>869,1152=>734,1153=>593,1154=>652,1155=>0,1156=>0,1157=>0,1158=>0,1159=>0,1160=>418,1161=>418,1162=>957,1163=>807,1164=>762,1165=>611,1166=>733,1167=>716,1168=>637,1169=>522,1170=>666,1171=>543,1172=>808,1173=>669,1174=>1224,1175=>995,1176=>710,1177=>581,1178=>775,1179=>679,1180=>817,1181=>679,1182=>817,1183=>679,1184=>1015,1185=>826,1186=>956,1187=>808,1188=>1103,1189=>874,1190=>1273,1191=>1017,1192=>952,1193=>858,1194=>734,1195=>593,1196=>682,1197=>580,1198=>724,1199=>652,1200=>724,1201=>652,1202=>771,1203=>645,1204=>1112,1205=>1000,1206=>808,1207=>687,1208=>808,1209=>687,1210=>808,1211=>712,1212=>1026,1213=>810,1214=>1026,1215=>810,1216=>372,1217=>1224,1218=>995,1219=>775,1220=>630,1221=>951,1222=>805,1223=>837,1224=>691,1225=>957,1226=>807,1227=>808,1228=>687,1229=>1115,1230=>933,1231=>343,1232=>774,1233=>675,1234=>774,1235=>675,1236=>1085,1237=>1048,1238=>683,1239=>678,1240=>849,1241=>678,1242=>849,1243=>678,1244=>1224,1245=>995,1246=>710,1247=>581,1248=>772,1249=>641,1250=>837,1251=>701,1252=>837,1253=>701,1254=>850,1255=>687,1256=>850,1257=>687,1258=>850,1259=>687,1260=>734,1261=>593,1262=>771,1263=>652,1264=>771,1265=>652,1266=>771,1267=>652,1268=>808,1269=>687,1270=>637,1271=>522,1272=>1036,1273=>904,1274=>666,1275=>543,1276=>771,1277=>645,1278=>771,1279=>645,1280=>762,1281=>608,1282=>1159,1283=>893,1284=>1119,1285=>920,1286=>828,1287=>693,1288=>1242,1289=>1017,1290=>1289,1291=>1013,1292=>839,1293=>638,1294=>938,1295=>803,1296=>696,1297=>557,1298=>831,1299=>732,1300=>1286,1301=>1068,1302=>1065,1303=>979,1304=>1082,1305=>1013,1306=>850,1307=>716,1308=>1103,1309=>924,1310=>817,1311=>679,1312=>1267,1313=>1059,1314=>1273,1315=>1017,1316=>957,1317=>807,1329=>813,1330=>729,1331=>728,1332=>731,1333=>729,1334=>733,1335=>652,1336=>720,1337=>903,1338=>728,1339=>666,1340=>558,1341=>961,1342=>788,1343=>713,1344=>651,1345=>730,1346=>715,1347=>704,1348=>780,1349=>689,1350=>715,1351=>708,1352=>731,1353=>677,1354=>867,1355=>711,1356=>780,1357=>731,1358=>715,1359=>693,1360=>666,1361=>698,1362=>576,1363=>833,1364=>698,1365=>763,1366=>855,1369=>330,1370=>342,1371=>308,1372=>374,1373=>313,1374=>461,1375=>468,1377=>938,1378=>642,1379=>704,1380=>708,1381=>642,1382=>644,1383=>565,1384=>642,1385=>756,1386=>704,1387=>643,1388=>310,1389=>984,1390=>638,1391=>643,1392=>643,1393=>603,1394=>643,1395=>642,1396=>643,1397=>309,1398=>643,1399=>486,1400=>643,1401=>366,1402=>938,1403=>573,1404=>666,1405=>643,1406=>643,1407=>934,1408=>643,1409=>643,1410=>479,1411=>934,1412=>648,1413=>620,1414=>813,1415=>812,1417=>360,1418=>374,1456=>0,1457=>0,1458=>0,1459=>0,1460=>0,1461=>0,1462=>0,1463=>0,1464=>0,1465=>0,1466=>0,1467=>0,1468=>0,1469=>0,1470=>415,1471=>0,1472=>372,1473=>0,1474=>0,1475=>372,1478=>497,1479=>0,1488=>728,1489=>610,1490=>447,1491=>588,1492=>687,1493=>343,1494=>400,1495=>687,1496=>679,1497=>294,1498=>578,1499=>566,1500=>605,1501=>696,1502=>724,1503=>343,1504=>453,1505=>680,1506=>666,1507=>675,1508=>658,1509=>661,1510=>653,1511=>736,1512=>602,1513=>758,1514=>683,1520=>664,1521=>567,1522=>519,1523=>444,1524=>710,1542=>667,1543=>667,1545=>884,1546=>1157,1548=>380,1557=>0,1563=>400,1567=>580,1569=>511,1570=>343,1571=>343,1572=>622,1573=>343,1574=>917,1575=>343,1576=>1005,1577=>590,1578=>1005,1579=>1005,1580=>721,1581=>721,1582=>721,1583=>513,1584=>513,1585=>576,1586=>576,1587=>1380,1588=>1380,1589=>1345,1590=>1345,1591=>1039,1592=>1039,1593=>683,1594=>683,1600=>342,1601=>1162,1602=>894,1603=>917,1604=>868,1605=>733,1606=>854,1607=>590,1608=>622,1609=>917,1610=>917,1611=>0,1612=>0,1613=>0,1614=>0,1615=>0,1616=>0,1617=>0,1618=>0,1619=>0,1620=>0,1621=>0,1623=>0,1626=>500,1632=>610,1633=>610,1634=>610,1635=>610,1636=>610,1637=>610,1638=>610,1639=>610,1640=>610,1641=>610,1642=>610,1643=>374,1644=>380,1645=>545,1646=>1005,1647=>894,1648=>0,1652=>292,1657=>1005,1658=>1005,1659=>1005,1660=>1005,1661=>1005,1662=>1005,1663=>1005,1664=>1005,1665=>721,1666=>721,1667=>721,1668=>721,1669=>721,1670=>721,1671=>721,1672=>445,1673=>445,1674=>445,1675=>445,1676=>445,1677=>445,1678=>445,1679=>445,1680=>445,1681=>576,1682=>576,1683=>576,1684=>576,1685=>681,1686=>576,1687=>576,1688=>576,1689=>576,1690=>1380,1691=>1380,1692=>1380,1693=>1345,1694=>1345,1695=>1039,1696=>683,1697=>1162,1698=>1162,1699=>1162,1700=>1162,1701=>1162,1702=>1162,1703=>894,1704=>894,1705=>1024,1706=>1271,1707=>1024,1708=>917,1709=>917,1710=>917,1711=>1024,1712=>1024,1713=>1024,1714=>1024,1715=>1024,1716=>1024,1717=>868,1718=>868,1719=>868,1720=>868,1721=>854,1722=>854,1723=>854,1724=>854,1725=>854,1726=>938,1727=>721,1734=>622,1740=>917,1742=>917,1749=>590,1776=>610,1777=>610,1778=>610,1779=>610,1780=>610,1781=>610,1782=>610,1783=>610,1784=>610,1785=>610,1984=>696,1985=>696,1986=>696,1987=>696,1988=>696,1989=>696,1990=>696,1991=>696,1992=>696,1993=>696,1994=>343,1995=>547,1996=>543,1997=>652,1998=>691,1999=>691,2000=>594,2001=>691,2002=>904,2003=>551,2004=>551,2005=>627,2006=>688,2007=>444,2008=>1022,2009=>506,2010=>826,2011=>691,2012=>652,2013=>912,2014=>627,2015=>707,2016=>506,2017=>652,2018=>574,2019=>627,2020=>627,2021=>627,2022=>574,2023=>574,2027=>0,2028=>0,2029=>0,2030=>0,2031=>0,2032=>0,2033=>0,2034=>0,2035=>0,2036=>380,2037=>380,2040=>691,2041=>691,2042=>415,3647=>696,3713=>790,3714=>748,3716=>749,3719=>569,3720=>742,3722=>744,3725=>761,3732=>706,3733=>704,3734=>747,3735=>819,3737=>730,3738=>727,3739=>727,3740=>922,3741=>827,3742=>866,3743=>866,3745=>836,3746=>761,3747=>770,3749=>769,3751=>713,3754=>827,3755=>1031,3757=>724,3758=>784,3759=>934,3760=>688,3761=>0,3762=>610,3763=>610,3764=>0,3765=>0,3766=>0,3767=>0,3768=>0,3769=>0,3771=>0,3772=>0,3773=>670,3776=>516,3777=>860,3778=>516,3779=>650,3780=>632,3782=>759,3784=>0,3785=>0,3786=>0,3787=>0,3788=>0,3789=>0,3792=>771,3793=>771,3794=>693,3795=>836,3796=>729,3797=>729,3798=>849,3799=>790,3800=>759,3801=>910,3804=>1363,3805=>1363,4256=>874,4257=>733,4258=>679,4259=>834,4260=>615,4261=>768,4262=>753,4263=>914,4264=>453,4265=>620,4266=>843,4267=>882,4268=>625,4269=>854,4270=>781,4271=>629,4272=>912,4273=>621,4274=>620,4275=>854,4276=>866,4277=>724,4278=>630,4279=>621,4280=>625,4281=>620,4282=>818,4283=>874,4284=>615,4285=>623,4286=>625,4287=>725,4288=>844,4289=>596,4290=>688,4291=>596,4292=>594,4293=>738,4304=>554,4305=>563,4306=>622,4307=>834,4308=>555,4309=>564,4310=>551,4311=>828,4312=>563,4313=>556,4314=>1074,4315=>568,4316=>568,4317=>814,4318=>554,4319=>563,4320=>823,4321=>568,4322=>700,4323=>591,4324=>852,4325=>560,4326=>814,4327=>563,4328=>553,4329=>568,4330=>622,4331=>568,4332=>553,4333=>566,4334=>568,4335=>540,4336=>554,4337=>559,4338=>553,4339=>554,4340=>553,4341=>587,4342=>853,4343=>604,4344=>563,4345=>622,4346=>554,4347=>448,4348=>324,5121=>774,5122=>774,5123=>774,5124=>774,5125=>905,5126=>905,5127=>905,5129=>905,5130=>905,5131=>905,5132=>1018,5133=>1009,5134=>1018,5135=>1009,5136=>1018,5137=>1009,5138=>1149,5139=>1140,5140=>1149,5141=>1140,5142=>905,5143=>1149,5144=>1142,5145=>1149,5146=>1142,5147=>905,5149=>310,5150=>529,5151=>425,5152=>425,5153=>395,5154=>395,5155=>395,5156=>395,5157=>564,5158=>470,5159=>310,5160=>395,5161=>395,5162=>395,5163=>1213,5164=>986,5165=>1216,5166=>1297,5167=>774,5168=>774,5169=>774,5170=>774,5171=>886,5172=>886,5173=>886,5175=>886,5176=>886,5177=>886,5178=>1018,5179=>1009,5180=>1018,5181=>1009,5182=>1018,5183=>1009,5184=>1149,5185=>1140,5186=>1149,5187=>1140,5188=>1149,5189=>1142,5190=>1149,5191=>1142,5192=>886,5193=>576,5194=>229,5196=>812,5197=>812,5198=>812,5199=>812,5200=>815,5201=>815,5202=>815,5204=>815,5205=>815,5206=>815,5207=>1056,5208=>1048,5209=>1056,5210=>1048,5211=>1056,5212=>1048,5213=>1060,5214=>1054,5215=>1060,5216=>1054,5217=>1060,5218=>1052,5219=>1060,5220=>1052,5221=>1060,5222=>483,5223=>1005,5224=>1005,5225=>1023,5226=>1017,5227=>743,5228=>743,5229=>743,5230=>743,5231=>743,5232=>743,5233=>743,5234=>743,5235=>743,5236=>1029,5237=>975,5238=>980,5239=>975,5240=>980,5241=>975,5242=>1029,5243=>975,5244=>1029,5245=>975,5246=>980,5247=>975,5248=>980,5249=>975,5250=>980,5251=>501,5252=>501,5253=>938,5254=>938,5255=>938,5256=>938,5257=>743,5258=>743,5259=>743,5260=>743,5261=>743,5262=>743,5263=>743,5264=>743,5265=>743,5266=>1029,5267=>975,5268=>1029,5269=>975,5270=>1029,5271=>975,5272=>1029,5273=>975,5274=>1029,5275=>975,5276=>1029,5277=>975,5278=>1029,5279=>975,5280=>1029,5281=>501,5282=>501,5283=>626,5284=>626,5285=>626,5286=>626,5287=>626,5288=>626,5289=>626,5290=>626,5291=>626,5292=>881,5293=>854,5294=>863,5295=>874,5296=>863,5297=>874,5298=>881,5299=>874,5300=>881,5301=>874,5302=>863,5303=>874,5304=>863,5305=>874,5306=>863,5307=>436,5308=>548,5309=>436,5312=>988,5313=>988,5314=>988,5315=>988,5316=>931,5317=>931,5318=>931,5319=>931,5320=>931,5321=>1238,5322=>1247,5323=>1200,5324=>1228,5325=>1200,5326=>1228,5327=>931,5328=>660,5329=>497,5330=>660,5331=>988,5332=>988,5333=>988,5334=>988,5335=>931,5336=>931,5337=>931,5338=>931,5339=>931,5340=>1231,5341=>1247,5342=>1283,5343=>1228,5344=>1283,5345=>1228,5346=>1228,5347=>1214,5348=>1228,5349=>1214,5350=>1283,5351=>1228,5352=>1283,5353=>1228,5354=>660,5356=>886,5357=>730,5358=>730,5359=>730,5360=>730,5361=>730,5362=>730,5363=>730,5364=>730,5365=>730,5366=>998,5367=>958,5368=>967,5369=>989,5370=>967,5371=>989,5372=>998,5373=>958,5374=>998,5375=>958,5376=>967,5377=>989,5378=>967,5379=>989,5380=>967,5381=>493,5382=>460,5383=>493,5392=>923,5393=>923,5394=>923,5395=>1136,5396=>1136,5397=>1136,5398=>1136,5399=>1209,5400=>1202,5401=>1209,5402=>1202,5403=>1209,5404=>1202,5405=>1431,5406=>1420,5407=>1431,5408=>1420,5409=>1431,5410=>1420,5411=>1431,5412=>1420,5413=>746,5414=>776,5415=>776,5416=>776,5417=>776,5418=>776,5419=>776,5420=>776,5421=>776,5422=>776,5423=>1003,5424=>1003,5425=>1013,5426=>996,5427=>1013,5428=>996,5429=>1003,5430=>1003,5431=>1003,5432=>1003,5433=>1013,5434=>996,5435=>1013,5436=>996,5437=>1013,5438=>495,5440=>395,5441=>510,5442=>1033,5443=>1033,5444=>976,5445=>976,5446=>976,5447=>976,5448=>733,5449=>733,5450=>733,5451=>733,5452=>733,5453=>733,5454=>1003,5455=>959,5456=>495,5458=>886,5459=>774,5460=>774,5461=>774,5462=>774,5463=>928,5464=>928,5465=>928,5466=>928,5467=>1172,5468=>1142,5469=>602,5470=>812,5471=>812,5472=>812,5473=>812,5474=>812,5475=>812,5476=>815,5477=>815,5478=>815,5479=>815,5480=>1060,5481=>1052,5482=>548,5492=>977,5493=>977,5494=>977,5495=>977,5496=>977,5497=>977,5498=>977,5499=>618,5500=>837,5501=>510,5502=>1238,5503=>1238,5504=>1238,5505=>1238,5506=>1238,5507=>1238,5508=>1238,5509=>989,5514=>977,5515=>977,5516=>977,5517=>977,5518=>1591,5519=>1591,5520=>1591,5521=>1295,5522=>1295,5523=>1591,5524=>1591,5525=>848,5526=>1273,5536=>988,5537=>988,5538=>931,5539=>931,5540=>931,5541=>931,5542=>660,5543=>776,5544=>776,5545=>776,5546=>776,5547=>776,5548=>776,5549=>776,5550=>495,5551=>743,5598=>830,5601=>830,5702=>496,5703=>496,5742=>413,5743=>1238,5744=>1591,5745=>2016,5746=>2016,5747=>1720,5748=>1678,5749=>2016,5750=>2016,5760=>543,5761=>637,5762=>945,5763=>1254,5764=>1563,5765=>1871,5766=>627,5767=>936,5768=>1254,5769=>1559,5770=>1871,5771=>569,5772=>877,5773=>1187,5774=>1497,5775=>1807,5776=>637,5777=>945,5778=>1240,5779=>1555,5780=>1871,5781=>569,5782=>569,5783=>789,5784=>1234,5785=>1559,5786=>740,5787=>638,5788=>638,7424=>652,7425=>833,7426=>1048,7427=>608,7428=>593,7429=>676,7430=>676,7431=>559,7432=>557,7433=>343,7434=>494,7435=>665,7436=>539,7437=>817,7438=>701,7439=>687,7440=>593,7441=>660,7442=>660,7443=>660,7444=>1094,7446=>687,7447=>687,7448=>556,7449=>642,7450=>642,7451=>580,7452=>634,7453=>737,7454=>948,7455=>695,7456=>652,7457=>924,7458=>582,7459=>646,7462=>539,7463=>652,7464=>691,7465=>556,7466=>781,7467=>732,7468=>487,7469=>683,7470=>480,7472=>523,7473=>430,7474=>430,7475=>517,7476=>527,7477=>234,7478=>234,7479=>488,7480=>401,7481=>626,7482=>527,7483=>527,7484=>535,7485=>509,7486=>461,7487=>485,7488=>430,7489=>511,7490=>695,7491=>458,7492=>458,7493=>479,7494=>712,7495=>479,7496=>479,7497=>479,7498=>479,7499=>386,7500=>386,7501=>479,7502=>219,7503=>487,7504=>664,7505=>456,7506=>488,7507=>414,7508=>488,7509=>488,7510=>479,7511=>388,7512=>456,7513=>462,7514=>664,7515=>501,7517=>451,7518=>429,7519=>433,7520=>493,7521=>406,7522=>219,7523=>315,7524=>456,7525=>501,7526=>451,7527=>429,7528=>451,7529=>493,7530=>406,7543=>716,7544=>527,7547=>545,7549=>747,7557=>514,7579=>479,7580=>414,7581=>414,7582=>488,7583=>386,7584=>377,7585=>348,7586=>479,7587=>456,7588=>347,7589=>281,7590=>347,7591=>347,7592=>431,7593=>326,7594=>330,7595=>370,7596=>664,7597=>664,7598=>562,7599=>562,7600=>448,7601=>488,7602=>542,7603=>422,7604=>396,7605=>388,7606=>583,7607=>494,7608=>399,7609=>451,7610=>501,7611=>417,7612=>523,7613=>470,7614=>455,7615=>425,7620=>0,7621=>0,7622=>0,7623=>0,7624=>0,7625=>0,7680=>774,7681=>675,7682=>762,7683=>716,7684=>762,7685=>716,7686=>762,7687=>716,7688=>734,7689=>593,7690=>830,7691=>716,7692=>830,7693=>716,7694=>830,7695=>716,7696=>830,7697=>716,7698=>830,7699=>716,7700=>683,7701=>678,7702=>683,7703=>678,7704=>683,7705=>678,7706=>683,7707=>678,7708=>683,7709=>678,7710=>683,7711=>435,7712=>821,7713=>716,7714=>837,7715=>712,7716=>837,7717=>712,7718=>837,7719=>712,7720=>837,7721=>712,7722=>837,7723=>712,7724=>372,7725=>343,7726=>372,7727=>343,7728=>775,7729=>665,7730=>775,7731=>665,7732=>775,7733=>665,7734=>637,7735=>343,7736=>637,7737=>343,7738=>637,7739=>343,7740=>637,7741=>343,7742=>995,7743=>1042,7744=>995,7745=>1042,7746=>995,7747=>1042,7748=>837,7749=>712,7750=>837,7751=>712,7752=>837,7753=>712,7754=>837,7755=>712,7756=>850,7757=>687,7758=>850,7759=>687,7760=>850,7761=>687,7762=>850,7763=>687,7764=>733,7765=>716,7766=>733,7767=>716,7768=>770,7769=>493,7770=>770,7771=>493,7772=>770,7773=>493,7774=>770,7775=>493,7776=>720,7777=>595,7778=>720,7779=>595,7780=>720,7781=>595,7782=>720,7783=>595,7784=>720,7785=>595,7786=>682,7787=>478,7788=>682,7789=>478,7790=>682,7791=>478,7792=>682,7793=>478,7794=>812,7795=>712,7796=>812,7797=>712,7798=>812,7799=>712,7800=>812,7801=>712,7802=>812,7803=>712,7804=>774,7805=>652,7806=>774,7807=>652,7808=>1103,7809=>924,7810=>1103,7811=>924,7812=>1103,7813=>924,7814=>1103,7815=>924,7816=>1103,7817=>924,7818=>771,7819=>645,7820=>771,7821=>645,7822=>724,7823=>652,7824=>725,7825=>582,7826=>725,7827=>582,7828=>725,7829=>582,7830=>712,7831=>478,7832=>924,7833=>652,7834=>675,7835=>435,7836=>435,7837=>435,7838=>896,7839=>687,7840=>774,7841=>675,7842=>774,7843=>675,7844=>774,7845=>675,7846=>774,7847=>675,7848=>774,7849=>675,7850=>774,7851=>675,7852=>774,7853=>675,7854=>774,7855=>675,7856=>774,7857=>675,7858=>774,7859=>675,7860=>774,7861=>675,7862=>774,7863=>675,7864=>683,7865=>678,7866=>683,7867=>678,7868=>683,7869=>678,7870=>683,7871=>678,7872=>683,7873=>678,7874=>683,7875=>678,7876=>683,7877=>678,7878=>683,7879=>678,7880=>372,7881=>343,7882=>372,7883=>343,7884=>850,7885=>687,7886=>850,7887=>687,7888=>850,7889=>687,7890=>850,7891=>687,7892=>850,7893=>687,7894=>850,7895=>687,7896=>850,7897=>687,7898=>874,7899=>687,7900=>874,7901=>687,7902=>874,7903=>687,7904=>874,7905=>687,7906=>874,7907=>687,7908=>812,7909=>712,7910=>812,7911=>712,7912=>835,7913=>712,7914=>835,7915=>712,7916=>835,7917=>712,7918=>835,7919=>712,7920=>835,7921=>712,7922=>724,7923=>652,7924=>724,7925=>652,7926=>724,7927=>652,7928=>724,7929=>652,7930=>953,7931=>644,7936=>687,7937=>687,7938=>687,7939=>687,7940=>687,7941=>687,7942=>687,7943=>687,7944=>774,7945=>774,7946=>1041,7947=>1043,7948=>935,7949=>963,7950=>835,7951=>859,7952=>557,7953=>557,7954=>557,7955=>557,7956=>557,7957=>557,7960=>792,7961=>794,7962=>1100,7963=>1096,7964=>1023,7965=>1052,7968=>712,7969=>712,7970=>712,7971=>712,7972=>712,7973=>712,7974=>712,7975=>712,7976=>945,7977=>951,7978=>1250,7979=>1250,7980=>1180,7981=>1206,7982=>1054,7983=>1063,7984=>390,7985=>390,7986=>390,7987=>390,7988=>390,7989=>390,7990=>390,7991=>390,7992=>483,7993=>489,7994=>777,7995=>785,7996=>712,7997=>738,7998=>604,7999=>604,8000=>687,8001=>687,8002=>687,8003=>687,8004=>687,8005=>687,8008=>892,8009=>933,8010=>1221,8011=>1224,8012=>1053,8013=>1082,8016=>675,8017=>675,8018=>675,8019=>675,8020=>675,8021=>675,8022=>675,8023=>675,8025=>930,8027=>1184,8029=>1199,8031=>1049,8032=>869,8033=>869,8034=>869,8035=>869,8036=>869,8037=>869,8038=>869,8039=>869,8040=>909,8041=>958,8042=>1246,8043=>1251,8044=>1076,8045=>1105,8046=>1028,8047=>1076,8048=>687,8049=>687,8050=>557,8051=>557,8052=>712,8053=>712,8054=>390,8055=>390,8056=>687,8057=>687,8058=>675,8059=>675,8060=>869,8061=>869,8064=>687,8065=>687,8066=>687,8067=>687,8068=>687,8069=>687,8070=>687,8071=>687,8072=>774,8073=>774,8074=>1041,8075=>1043,8076=>935,8077=>963,8078=>835,8079=>859,8080=>712,8081=>712,8082=>712,8083=>712,8084=>712,8085=>712,8086=>712,8087=>712,8088=>945,8089=>951,8090=>1250,8091=>1250,8092=>1180,8093=>1206,8094=>1054,8095=>1063,8096=>869,8097=>869,8098=>869,8099=>869,8100=>869,8101=>869,8102=>869,8103=>869,8104=>909,8105=>958,8106=>1246,8107=>1251,8108=>1076,8109=>1105,8110=>1028,8111=>1076,8112=>687,8113=>687,8114=>687,8115=>687,8116=>687,8118=>687,8119=>687,8120=>774,8121=>774,8122=>876,8123=>797,8124=>774,8125=>500,8126=>500,8127=>500,8128=>500,8129=>500,8130=>712,8131=>712,8132=>712,8134=>712,8135=>712,8136=>929,8137=>846,8138=>1080,8139=>1009,8140=>837,8141=>500,8142=>500,8143=>500,8144=>390,8145=>390,8146=>390,8147=>390,8150=>390,8151=>390,8152=>372,8153=>372,8154=>621,8155=>563,8157=>500,8158=>500,8159=>500,8160=>675,8161=>675,8162=>675,8163=>675,8164=>716,8165=>716,8166=>675,8167=>675,8168=>724,8169=>724,8170=>1020,8171=>980,8172=>838,8173=>500,8174=>500,8175=>500,8178=>869,8179=>869,8180=>869,8182=>869,8183=>869,8184=>1065,8185=>891,8186=>1084,8187=>894,8188=>850,8189=>500,8190=>500,8192=>500,8193=>1000,8194=>500,8195=>1000,8196=>330,8197=>250,8198=>167,8199=>696,8200=>380,8201=>200,8202=>100,8203=>0,8204=>0,8205=>0,8206=>0,8207=>0,8208=>415,8209=>415,8210=>696,8211=>500,8212=>1000,8213=>1000,8214=>500,8215=>500,8216=>380,8217=>380,8218=>380,8219=>380,8220=>657,8221=>657,8222=>657,8223=>657,8224=>500,8225=>500,8226=>639,8227=>639,8228=>333,8229=>667,8230=>1000,8231=>348,8232=>0,8233=>0,8234=>0,8235=>0,8236=>0,8237=>0,8238=>0,8239=>200,8240=>1440,8241=>1887,8242=>264,8243=>447,8244=>630,8245=>264,8246=>447,8247=>630,8248=>733,8249=>412,8250=>412,8251=>972,8252=>627,8253=>580,8254=>500,8255=>828,8256=>828,8257=>329,8258=>1023,8259=>500,8260=>167,8261=>457,8262=>457,8263=>1030,8264=>829,8265=>829,8266=>513,8267=>636,8268=>500,8269=>500,8270=>523,8271=>400,8272=>828,8273=>523,8274=>556,8275=>1000,8276=>828,8277=>838,8278=>684,8279=>813,8280=>838,8281=>838,8282=>380,8283=>872,8284=>838,8285=>380,8286=>380,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=>219,8308=>438,8309=>438,8310=>438,8311=>438,8312=>438,8313=>438,8314=>528,8315=>528,8316=>528,8317=>288,8318=>288,8319=>456,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=>288,8334=>288,8336=>458,8337=>479,8338=>488,8339=>413,8340=>479,8341=>456,8342=>487,8343=>219,8344=>664,8345=>456,8346=>479,8347=>381,8348=>388,8352=>929,8353=>696,8354=>696,8355=>696,8356=>696,8357=>1042,8358=>837,8359=>1518,8360=>1205,8361=>1103,8362=>904,8363=>696,8364=>696,8365=>696,8366=>696,8367=>1392,8368=>696,8369=>696,8370=>696,8371=>696,8372=>859,8373=>696,8376=>696,8377=>696,8378=>769,8400=>0,8401=>0,8406=>0,8407=>0,8411=>0,8412=>0,8417=>0,8448=>1120,8449=>1170,8450=>734,8451=>1211,8452=>896,8453=>1091,8454=>1144,8455=>614,8456=>698,8457=>1086,8459=>1073,8460=>913,8461=>888,8462=>712,8463=>712,8464=>597,8465=>697,8466=>856,8467=>472,8468=>974,8469=>837,8470=>1203,8471=>1000,8472=>697,8473=>750,8474=>850,8475=>938,8476=>814,8477=>801,8478=>896,8479=>710,8480=>1020,8481=>1281,8482=>1000,8483=>755,8484=>754,8485=>578,8486=>850,8487=>850,8488=>763,8489=>338,8490=>775,8491=>774,8492=>928,8493=>818,8494=>854,8495=>636,8496=>729,8497=>808,8498=>683,8499=>1184,8500=>465,8501=>794,8502=>731,8503=>494,8504=>684,8505=>380,8506=>945,8507=>1348,8508=>790,8509=>737,8510=>654,8511=>863,8512=>840,8513=>775,8514=>557,8515=>637,8516=>760,8517=>830,8518=>716,8519=>678,8520=>343,8521=>343,8523=>872,8526=>547,8528=>1035,8529=>1035,8530=>1483,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=>372,8545=>659,8546=>945,8547=>1099,8548=>774,8549=>1099,8550=>1386,8551=>1672,8552=>1121,8553=>771,8554=>1120,8555=>1407,8556=>637,8557=>734,8558=>830,8559=>995,8560=>343,8561=>607,8562=>872,8563=>984,8564=>652,8565=>962,8566=>1227,8567=>1491,8568=>969,8569=>645,8570=>969,8571=>1233,8572=>343,8573=>593,8574=>716,8575=>1042,8576=>1289,8577=>830,8578=>1289,8579=>734,8580=>593,8581=>734,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=>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=>774,8705=>696,8706=>544,8707=>683,8708=>683,8709=>856,8710=>697,8711=>697,8712=>896,8713=>896,8714=>750,8715=>896,8716=>896,8717=>750,8718=>636,8719=>787,8720=>787,8721=>718,8722=>838,8723=>838,8724=>696,8725=>365,8726=>696,8727=>838,8728=>626,8729=>380,8730=>667,8731=>667,8732=>667,8733=>712,8734=>833,8735=>838,8736=>896,8737=>896,8738=>838,8739=>500,8740=>500,8741=>500,8742=>500,8743=>812,8744=>812,8745=>812,8746=>812,8747=>610,8748=>929,8749=>1295,8750=>563,8751=>977,8752=>1313,8753=>563,8754=>563,8755=>563,8756=>696,8757=>696,8758=>294,8759=>696,8760=>838,8761=>838,8762=>838,8763=>838,8764=>838,8765=>838,8766=>838,8767=>838,8768=>375,8769=>838,8770=>838,8771=>838,8772=>838,8773=>838,8774=>838,8775=>838,8776=>838,8777=>838,8778=>838,8779=>838,8780=>838,8781=>838,8782=>838,8783=>838,8784=>838,8785=>838,8786=>838,8787=>838,8788=>1063,8789=>1063,8790=>838,8791=>838,8792=>838,8793=>838,8794=>838,8795=>838,8796=>838,8797=>838,8798=>838,8799=>838,8800=>838,8801=>838,8802=>838,8803=>838,8804=>838,8805=>838,8806=>838,8807=>838,8808=>841,8809=>841,8810=>1047,8811=>1047,8812=>500,8813=>838,8814=>838,8815=>838,8816=>838,8817=>838,8818=>838,8819=>838,8820=>838,8821=>838,8822=>838,8823=>838,8824=>838,8825=>838,8826=>838,8827=>838,8828=>838,8829=>838,8830=>838,8831=>838,8832=>838,8833=>838,8834=>838,8835=>838,8836=>838,8837=>838,8838=>838,8839=>838,8840=>838,8841=>838,8842=>838,8843=>838,8844=>812,8845=>812,8846=>812,8847=>838,8848=>838,8849=>838,8850=>838,8851=>796,8852=>796,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=>914,8867=>914,8868=>914,8869=>914,8870=>542,8871=>542,8872=>914,8873=>914,8874=>914,8875=>914,8876=>914,8877=>914,8878=>914,8879=>914,8880=>838,8881=>838,8882=>838,8883=>838,8884=>838,8885=>838,8886=>1000,8887=>1000,8888=>838,8889=>838,8890=>542,8891=>812,8892=>812,8893=>812,8894=>838,8895=>838,8896=>843,8897=>843,8898=>843,8899=>843,8900=>494,8901=>380,8902=>626,8903=>838,8904=>1000,8905=>1000,8906=>1000,8907=>1000,8908=>1000,8909=>838,8910=>812,8911=>812,8912=>838,8913=>838,8914=>838,8915=>838,8916=>838,8917=>838,8918=>838,8919=>838,8920=>1422,8921=>1422,8922=>838,8923=>838,8924=>838,8925=>838,8926=>838,8927=>838,8928=>838,8929=>838,8930=>838,8931=>838,8932=>838,8933=>838,8934=>838,8935=>838,8936=>838,8937=>838,8938=>838,8939=>838,8940=>838,8941=>838,8942=>1000,8943=>1000,8944=>1000,8945=>1000,8946=>1158,8947=>896,8948=>750,8949=>896,8950=>896,8951=>750,8952=>896,8953=>896,8954=>1158,8955=>896,8956=>750,8957=>896,8958=>750,8959=>896,8960=>602,8961=>602,8962=>716,8963=>838,8964=>838,8965=>838,8966=>838,8967=>488,8968=>457,8969=>457,8970=>457,8971=>457,8972=>809,8973=>809,8974=>809,8975=>809,8976=>838,8977=>539,8984=>928,8985=>838,8988=>469,8989=>469,8990=>469,8991=>469,8992=>610,8993=>610,8996=>1152,8997=>1152,8998=>1414,8999=>1152,9000=>1443,9003=>1414,9004=>873,9075=>390,9076=>716,9077=>869,9082=>687,9085=>863,9095=>1152,9108=>873,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=>610,9166=>838,9167=>945,9187=>873,9189=>769,9192=>696,9250=>716,9251=>716,9312=>847,9313=>847,9314=>847,9315=>847,9316=>847,9317=>847,9318=>847,9319=>847,9320=>847,9321=>847,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=>840,9689=>970,9690=>970,9691=>970,9692=>387,9693=>387,9694=>387,9695=>387,9696=>769,9697=>769,9698=>769,9699=>769,9700=>769,9701=>769,9702=>639,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,9729=>1000,9730=>896,9731=>896,9732=>896,9733=>896,9734=>896,9735=>573,9736=>896,9737=>896,9738=>888,9739=>888,9740=>671,9741=>1013,9742=>1246,9743=>1250,9744=>896,9745=>896,9746=>896,9747=>532,9748=>896,9749=>896,9750=>896,9751=>896,9752=>896,9753=>896,9754=>896,9755=>896,9756=>896,9757=>609,9758=>896,9759=>609,9760=>896,9761=>896,9762=>896,9763=>896,9764=>669,9765=>746,9766=>649,9767=>784,9768=>545,9769=>896,9770=>896,9771=>896,9772=>710,9773=>896,9774=>896,9775=>896,9776=>896,9777=>896,9778=>896,9779=>896,9780=>896,9781=>896,9782=>896,9783=>896,9784=>896,9785=>1042,9786=>1042,9787=>1042,9788=>896,9789=>896,9790=>896,9791=>614,9792=>732,9793=>732,9794=>896,9795=>896,9796=>896,9797=>896,9798=>896,9799=>896,9800=>896,9801=>896,9802=>896,9803=>896,9804=>896,9805=>896,9806=>896,9807=>896,9808=>896,9809=>896,9810=>896,9811=>896,9812=>896,9813=>896,9814=>896,9815=>896,9816=>896,9817=>896,9818=>896,9819=>896,9820=>896,9821=>896,9822=>896,9823=>896,9824=>896,9825=>896,9826=>896,9827=>896,9828=>896,9829=>896,9830=>896,9831=>896,9832=>896,9833=>472,9834=>638,9835=>896,9836=>896,9837=>472,9838=>357,9839=>484,9840=>748,9841=>766,9842=>896,9843=>896,9844=>896,9845=>896,9846=>896,9847=>896,9848=>896,9849=>896,9850=>896,9851=>896,9852=>896,9853=>896,9854=>896,9855=>896,9856=>869,9857=>869,9858=>869,9859=>869,9860=>869,9861=>869,9862=>896,9863=>896,9864=>896,9865=>896,9866=>896,9867=>896,9868=>896,9869=>896,9870=>896,9871=>896,9872=>896,9873=>896,9874=>896,9875=>896,9876=>896,9877=>541,9878=>896,9879=>896,9880=>896,9881=>896,9882=>896,9883=>896,9884=>896,9888=>896,9889=>702,9890=>1004,9891=>1089,9892=>1175,9893=>903,9894=>838,9895=>838,9896=>838,9897=>838,9898=>838,9899=>838,9900=>838,9901=>838,9902=>838,9903=>838,9904=>844,9905=>838,9906=>732,9907=>732,9908=>732,9909=>732,9910=>850,9911=>732,9912=>732,9920=>838,9921=>838,9922=>838,9923=>838,9954=>732,9985=>838,9986=>838,9987=>838,9988=>838,9990=>838,9991=>838,9992=>838,9993=>838,9996=>838,9997=>838,9998=>838,9999=>838,10000=>838,10001=>838,10002=>838,10003=>838,10004=>838,10005=>838,10006=>838,10007=>838,10008=>838,10009=>838,10010=>838,10011=>838,10012=>838,10013=>838,10014=>838,10015=>838,10016=>838,10017=>838,10018=>838,10019=>838,10020=>838,10021=>838,10022=>838,10023=>838,10025=>838,10026=>838,10027=>838,10028=>838,10029=>838,10030=>838,10031=>838,10032=>838,10033=>838,10034=>838,10035=>838,10036=>838,10037=>838,10038=>838,10039=>838,10040=>838,10041=>838,10042=>838,10043=>838,10044=>838,10045=>838,10046=>838,10047=>838,10048=>838,10049=>838,10050=>838,10051=>838,10052=>838,10053=>838,10054=>838,10055=>838,10056=>838,10057=>838,10058=>838,10059=>838,10061=>896,10063=>896,10064=>896,10065=>896,10066=>896,10070=>896,10072=>838,10073=>838,10074=>838,10075=>347,10076=>347,10077=>587,10078=>587,10081=>838,10082=>838,10083=>838,10084=>838,10085=>838,10086=>838,10087=>838,10088=>838,10089=>838,10090=>838,10091=>838,10092=>838,10093=>838,10094=>838,10095=>838,10096=>838,10097=>838,10098=>838,10099=>838,10100=>838,10101=>838,10102=>847,10103=>847,10104=>847,10105=>847,10106=>847,10107=>847,10108=>847,10109=>847,10110=>847,10111=>847,10112=>838,10113=>838,10114=>838,10115=>838,10116=>838,10117=>838,10118=>838,10119=>838,10120=>838,10121=>838,10122=>838,10123=>838,10124=>838,10125=>838,10126=>838,10127=>838,10128=>838,10129=>838,10130=>838,10131=>838,10132=>838,10136=>838,10137=>838,10138=>838,10139=>838,10140=>838,10141=>838,10142=>838,10143=>838,10144=>838,10145=>838,10146=>838,10147=>838,10148=>838,10149=>838,10150=>838,10151=>838,10152=>838,10153=>838,10154=>838,10155=>838,10156=>838,10157=>838,10158=>838,10159=>838,10161=>838,10162=>838,10163=>838,10164=>838,10165=>838,10166=>838,10167=>838,10168=>838,10169=>838,10170=>838,10171=>838,10172=>838,10173=>838,10174=>838,10181=>457,10182=>457,10208=>494,10214=>487,10215=>487,10216=>457,10217=>457,10218=>721,10219=>721,10224=>838,10225=>838,10226=>838,10227=>838,10228=>1157,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,10502=>838,10503=>838,10506=>838,10507=>838,10560=>838,10561=>838,10627=>753,10628=>753,10702=>838,10703=>1046,10704=>1046,10705=>1000,10706=>1000,10707=>1000,10708=>1000,10709=>1000,10731=>494,10746=>838,10747=>838,10752=>1000,10753=>1000,10754=>1000,10764=>1661,10765=>563,10766=>563,10767=>563,10768=>563,10769=>563,10770=>563,10771=>563,10772=>563,10773=>563,10774=>563,10775=>563,10776=>563,10777=>563,10778=>563,10779=>563,10780=>563,10799=>838,10858=>838,10859=>838,10877=>838,10878=>838,10879=>838,10880=>838,10881=>838,10882=>838,10883=>838,10884=>838,10885=>838,10886=>838,10887=>838,10888=>838,10889=>838,10890=>838,10891=>838,10892=>838,10893=>838,10894=>838,10895=>838,10896=>838,10897=>838,10898=>838,10899=>838,10900=>838,10901=>838,10902=>838,10903=>838,10904=>838,10905=>838,10906=>838,10907=>838,10908=>838,10909=>838,10910=>838,10911=>838,10912=>838,10926=>838,10927=>838,10928=>838,10929=>838,10930=>838,10931=>838,10932=>838,10933=>838,10934=>838,10935=>838,10936=>838,10937=>838,10938=>838,11001=>838,11002=>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,11039=>869,11040=>869,11041=>873,11042=>873,11043=>873,11044=>1119,11091=>869,11092=>869,11360=>637,11361=>360,11362=>637,11363=>733,11364=>770,11365=>675,11366=>478,11367=>956,11368=>712,11369=>775,11370=>665,11371=>725,11372=>582,11373=>860,11374=>995,11375=>774,11376=>860,11377=>778,11378=>1221,11379=>1056,11380=>652,11381=>698,11382=>565,11383=>782,11385=>538,11386=>687,11387=>559,11388=>219,11389=>487,11390=>720,11391=>725,11520=>663,11521=>676,11522=>661,11523=>629,11524=>661,11525=>1032,11526=>718,11527=>1032,11528=>648,11529=>667,11530=>1032,11531=>673,11532=>677,11533=>1036,11534=>680,11535=>886,11536=>1032,11537=>683,11538=>674,11539=>1035,11540=>1033,11541=>1027,11542=>676,11543=>673,11544=>667,11545=>667,11546=>660,11547=>671,11548=>1039,11549=>673,11550=>692,11551=>659,11552=>1048,11553=>660,11554=>654,11555=>670,11556=>733,11557=>1017,11568=>691,11569=>941,11570=>941,11571=>725,11572=>725,11573=>725,11574=>676,11575=>774,11576=>774,11577=>683,11578=>683,11579=>802,11580=>989,11581=>761,11582=>623,11583=>761,11584=>941,11585=>941,11586=>373,11587=>740,11588=>837,11589=>914,11590=>672,11591=>737,11592=>680,11593=>683,11594=>602,11595=>1039,11596=>778,11597=>837,11598=>683,11599=>372,11600=>778,11601=>373,11602=>725,11603=>691,11604=>941,11605=>941,11606=>837,11607=>373,11608=>836,11609=>941,11610=>941,11611=>734,11612=>876,11613=>771,11614=>734,11615=>683,11616=>774,11617=>837,11618=>683,11619=>850,11620=>697,11621=>850,11631=>716,11800=>580,11807=>838,11810=>457,11811=>457,11812=>457,11813=>457,11822=>580,19904=>896,19905=>896,19906=>896,19907=>896,19908=>896,19909=>896,19910=>896,19911=>896,19912=>896,19913=>896,19914=>896,19915=>896,19916=>896,19917=>896,19918=>896,19919=>896,19920=>896,19921=>896,19922=>896,19923=>896,19924=>896,19925=>896,19926=>896,19927=>896,19928=>896,19929=>896,19930=>896,19931=>896,19932=>896,19933=>896,19934=>896,19935=>896,19936=>896,19937=>896,19938=>896,19939=>896,19940=>896,19941=>896,19942=>896,19943=>896,19944=>896,19945=>896,19946=>896,19947=>896,19948=>896,19949=>896,19950=>896,19951=>896,19952=>896,19953=>896,19954=>896,19955=>896,19956=>896,19957=>896,19958=>896,19959=>896,19960=>896,19961=>896,19962=>896,19963=>896,19964=>896,19965=>896,19966=>896,19967=>896,42192=>762,42193=>733,42194=>733,42195=>830,42196=>682,42197=>682,42198=>821,42199=>775,42200=>775,42201=>530,42202=>734,42203=>734,42204=>725,42205=>683,42206=>683,42207=>995,42208=>837,42209=>637,42210=>720,42211=>770,42212=>770,42213=>774,42214=>774,42215=>837,42216=>775,42217=>530,42218=>1103,42219=>771,42220=>724,42221=>762,42222=>774,42223=>774,42224=>683,42225=>683,42226=>372,42227=>850,42228=>812,42229=>812,42230=>557,42231=>830,42232=>322,42233=>322,42234=>674,42235=>674,42236=>322,42237=>322,42238=>588,42239=>588,42564=>720,42565=>595,42566=>436,42567=>440,42572=>1405,42573=>1173,42576=>1234,42577=>1027,42580=>1174,42581=>972,42582=>1093,42583=>958,42594=>1085,42595=>924,42596=>1096,42597=>912,42598=>1260,42599=>997,42600=>850,42601=>687,42602=>1037,42603=>868,42604=>1406,42605=>1106,42606=>961,42634=>963,42635=>787,42636=>682,42637=>580,42644=>808,42645=>712,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=>400,42780=>400,42781=>287,42782=>287,42783=>287,42786=>444,42787=>390,42788=>540,42789=>540,42790=>837,42791=>712,42792=>1031,42793=>857,42794=>696,42795=>557,42800=>559,42801=>595,42802=>1349,42803=>1052,42804=>1284,42805=>1064,42806=>1216,42807=>1054,42808=>1079,42809=>922,42810=>1079,42811=>922,42812=>1035,42813=>922,42814=>698,42815=>549,42816=>656,42817=>688,42822=>850,42823=>542,42824=>683,42825=>531,42826=>918,42827=>814,42830=>1406,42831=>1106,42832=>733,42833=>716,42834=>948,42835=>937,42838=>850,42839=>716,42852=>738,42853=>716,42854=>738,42855=>716,42880=>637,42881=>343,42882=>837,42883=>712,42889=>400,42890=>386,42891=>456,42892=>306,42893=>808,42894=>693,42896=>928,42897=>768,42912=>821,42913=>716,42914=>775,42915=>665,42916=>837,42917=>712,42918=>770,42919=>493,42920=>720,42921=>595,42922=>886,43002=>1062,43003=>683,43004=>733,43005=>995,43006=>372,43007=>1325,61184=>216,61185=>242,61186=>267,61187=>277,61188=>282,61189=>242,61190=>216,61191=>242,61192=>267,61193=>277,61194=>267,61195=>242,61196=>216,61197=>242,61198=>267,61199=>277,61200=>267,61201=>242,61202=>216,61203=>242,61204=>282,61205=>277,61206=>267,61207=>242,61208=>216,61209=>282,62464=>612,62465=>612,62466=>653,62467=>902,62468=>622,62469=>622,62470=>661,62471=>895,62472=>589,62473=>622,62474=>1163,62475=>626,62476=>627,62477=>893,62478=>612,62479=>626,62480=>924,62481=>627,62482=>744,62483=>634,62484=>886,62485=>626,62486=>907,62487=>626,62488=>621,62489=>628,62490=>677,62491=>626,62492=>621,62493=>630,62494=>627,62495=>571,62496=>622,62497=>631,62498=>612,62499=>611,62500=>618,62501=>671,62502=>963,62504=>1023,62505=>844,62506=>563,62507=>563,62508=>563,62509=>563,62510=>563,62511=>563,62512=>555,62513=>555,62514=>555,62515=>555,62516=>573,62517=>573,62518=>573,62519=>824,62520=>824,62521=>824,62522=>824,62523=>824,62524=>611,62525=>611,62526=>611,62527=>611,62528=>611,62529=>611,63173=>687,64256=>810,64257=>741,64258=>741,64259=>1115,64260=>1116,64261=>808,64262=>1020,64275=>1388,64276=>1384,64277=>1378,64278=>1384,64279=>1713,64285=>294,64286=>0,64287=>519,64288=>665,64289=>939,64290=>788,64291=>920,64292=>786,64293=>857,64294=>869,64295=>821,64296=>890,64297=>838,64298=>758,64299=>758,64300=>758,64301=>758,64302=>728,64303=>728,64304=>728,64305=>610,64306=>447,64307=>588,64308=>687,64309=>437,64310=>485,64312=>679,64313=>435,64314=>578,64315=>566,64316=>605,64318=>724,64320=>453,64321=>680,64323=>675,64324=>658,64326=>653,64327=>736,64328=>602,64329=>758,64330=>683,64331=>343,64332=>610,64333=>566,64334=>658,64335=>710,64338=>1005,64339=>1059,64340=>375,64341=>408,64342=>1005,64343=>1059,64344=>375,64345=>408,64346=>1005,64347=>1059,64348=>375,64349=>408,64350=>1005,64351=>1059,64352=>375,64353=>408,64354=>1005,64355=>1059,64356=>375,64357=>408,64358=>1005,64359=>1059,64360=>375,64361=>408,64362=>1162,64363=>1191,64364=>655,64365=>720,64366=>1162,64367=>1191,64368=>655,64369=>720,64370=>721,64371=>721,64372=>721,64373=>721,64374=>721,64375=>721,64376=>721,64377=>721,64378=>721,64379=>721,64380=>721,64381=>721,64382=>721,64383=>721,64384=>721,64385=>721,64386=>513,64387=>578,64388=>513,64389=>578,64390=>513,64391=>578,64392=>513,64393=>578,64394=>576,64395=>622,64396=>576,64397=>622,64398=>1024,64399=>1024,64400=>582,64401=>582,64402=>1024,64403=>1024,64404=>582,64405=>582,64406=>1024,64407=>1024,64408=>582,64409=>582,64410=>1024,64411=>1024,64412=>582,64413=>582,64414=>854,64415=>900,64416=>854,64417=>900,64418=>375,64419=>408,64426=>938,64427=>880,64428=>693,64429=>660,64467=>824,64468=>843,64469=>476,64470=>552,64473=>622,64474=>627,64488=>375,64489=>408,64508=>917,64509=>1012,64510=>375,64511=>408,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,65056=>0,65057=>0,65058=>0,65059=>0,65136=>342,65137=>342,65138=>342,65139=>346,65140=>342,65142=>342,65143=>342,65144=>342,65145=>342,65146=>342,65147=>342,65148=>342,65149=>342,65150=>342,65151=>342,65152=>511,65153=>343,65154=>375,65155=>343,65156=>375,65157=>622,65158=>627,65159=>343,65160=>375,65161=>917,65162=>917,65163=>375,65164=>408,65165=>343,65166=>375,65167=>1005,65168=>1059,65169=>375,65170=>408,65171=>590,65172=>606,65173=>1005,65174=>1059,65175=>375,65176=>408,65177=>1005,65178=>1059,65179=>375,65180=>408,65181=>721,65182=>721,65183=>721,65184=>721,65185=>721,65186=>721,65187=>721,65188=>721,65189=>721,65190=>721,65191=>721,65192=>721,65193=>513,65194=>578,65195=>513,65196=>578,65197=>576,65198=>622,65199=>576,65200=>622,65201=>1380,65202=>1414,65203=>983,65204=>1018,65205=>1380,65206=>1414,65207=>983,65208=>1018,65209=>1345,65210=>1364,65211=>966,65212=>985,65213=>1345,65214=>1364,65215=>966,65216=>985,65217=>1039,65218=>1071,65219=>942,65220=>974,65221=>1039,65222=>1071,65223=>942,65224=>974,65225=>683,65226=>683,65227=>683,65228=>564,65229=>683,65230=>683,65231=>683,65232=>564,65233=>1162,65234=>1191,65235=>655,65236=>720,65237=>894,65238=>901,65239=>655,65240=>720,65241=>917,65242=>931,65243=>582,65244=>582,65245=>868,65246=>893,65247=>375,65248=>408,65249=>733,65250=>784,65251=>619,65252=>670,65253=>854,65254=>900,65255=>375,65256=>408,65257=>590,65258=>606,65259=>693,65260=>660,65261=>622,65262=>627,65263=>917,65264=>1012,65265=>917,65266=>1012,65267=>375,65268=>408,65269=>745,65270=>759,65271=>745,65272=>759,65273=>745,65274=>759,65275=>745,65276=>759,65279=>0,65529=>0,65530=>0,65531=>0,65532=>0,65533=>1113,65535=>600);
-// --- EOF ---
diff --git a/#pma/libraries/tcpdf/fonts/dejavusansb.z b/#pma/libraries/tcpdf/fonts/dejavusansb.z
deleted file mode 100644
index 07031ce3..00000000
Binary files a/#pma/libraries/tcpdf/fonts/dejavusansb.z and /dev/null differ
diff --git a/#pma/libraries/tcpdf/fonts/helvetica.php b/#pma/libraries/tcpdf/fonts/helvetica.php
deleted file mode 100644
index d1aa6d85..00000000
--- a/#pma/libraries/tcpdf/fonts/helvetica.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-// TCPDF FONT FILE DESCRIPTION
-$type='core';
-$name='Helvetica';
-$up=-100;
-$ut=50;
-$dw=513;
-$diff='';
-$enc='';
-$desc=array('Flags'=>32,'FontBBox'=>'[-166 -225 1000 931]','ItalicAngle'=>0,'Ascent'=>931,'Descent'=>-225,'Leading'=>0,'CapHeight'=>718,'XHeight'=>523,'StemV'=>88,'StemH'=>76,'AvgWidth'=>513,'MaxWidth'=>1015,'MissingWidth'=>513);
-$cw=array(0=>500,1=>500,2=>500,3=>500,4=>500,5=>500,6=>500,7=>500,8=>500,9=>500,10=>500,11=>500,12=>500,13=>500,14=>500,15=>500,16=>500,17=>500,18=>500,19=>500,20=>500,21=>500,22=>500,23=>500,24=>500,25=>500,26=>500,27=>500,28=>500,29=>500,30=>500,31=>500,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=>277,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=>500,128=>655,129=>500,130=>222,131=>278,132=>333,133=>1000,134=>556,135=>556,136=>333,137=>1000,138=>667,139=>250,140=>1000,141=>500,142=>611,143=>500,144=>500,145=>222,146=>221,147=>333,148=>333,149=>350,150=>556,151=>1000,152=>333,153=>1000,154=>500,155=>250,156=>938,157=>500,158=>500,159=>667,160=>278,161=>278,162=>556,163=>556,164=>556,165=>556,166=>260,167=>556,168=>333,169=>737,170=>370,171=>448,172=>584,173=>333,174=>737,175=>333,176=>606,177=>584,178=>350,179=>350,180=>333,181=>556,182=>537,183=>278,184=>333,185=>350,186=>365,187=>448,188=>869,189=>869,190=>879,191=>556,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=>666,223=>611,224=>556,225=>556,226=>556,227=>556,228=>556,229=>556,230=>896,231=>500,232=>556,233=>556,234=>556,235=>556,236=>251,237=>251,238=>251,239=>251,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=>555,255=>500);
-
-// --- EOF ---
diff --git a/#pma/libraries/tcpdf/include/tcpdf_colors.php b/#pma/libraries/tcpdf/include/tcpdf_colors.php
deleted file mode 100644
index 77f1c4cc..00000000
--- a/#pma/libraries/tcpdf/include/tcpdf_colors.php
+++ /dev/null
@@ -1,462 +0,0 @@
-<?php
-//============================================================+
-// File name   : tcpdf_colors.php
-// Version     : 1.0.004
-// Begin       : 2002-04-09
-// Last Update : 2014-04-25
-// Author      : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
-// License     : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
-// -------------------------------------------------------------------
-// Copyright (C) 2002-2013  Nicola Asuni - Tecnick.com LTD
-//
-// This file is part of TCPDF software library.
-//
-// TCPDF is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// TCPDF is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-// See the GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with TCPDF.  If not, see <http://www.gnu.org/licenses/>.
-//
-// See LICENSE.TXT file for more information.
-// -------------------------------------------------------------------
-//
-// Description : Array of WEB safe colors
-//
-//============================================================+
-
-/**
- * @file
- * PHP color class for TCPDF
- * @author Nicola Asuni
- * @package com.tecnick.tcpdf
- */
-
-/**
- * @class TCPDF_COLORS
- * PHP color class for TCPDF
- * @package com.tecnick.tcpdf
- * @version 1.0.004
- * @author Nicola Asuni - info@tecnick.com
- */
-class TCPDF_COLORS {
-
-	/**
-	 * Array of WEB safe colors
-	 * @public static
-	 */
-	public static $webcolor = array (
-		'aliceblue' => 'f0f8ff',
-		'antiquewhite' => 'faebd7',
-		'aqua' => '00ffff',
-		'aquamarine' => '7fffd4',
-		'azure' => 'f0ffff',
-		'beige' => 'f5f5dc',
-		'bisque' => 'ffe4c4',
-		'black' => '000000',
-		'blanchedalmond' => 'ffebcd',
-		'blue' => '0000ff',
-		'blueviolet' => '8a2be2',
-		'brown' => 'a52a2a',
-		'burlywood' => 'deb887',
-		'cadetblue' => '5f9ea0',
-		'chartreuse' => '7fff00',
-		'chocolate' => 'd2691e',
-		'coral' => 'ff7f50',
-		'cornflowerblue' => '6495ed',
-		'cornsilk' => 'fff8dc',
-		'crimson' => 'dc143c',
-		'cyan' => '00ffff',
-		'darkblue' => '00008b',
-		'darkcyan' => '008b8b',
-		'darkgoldenrod' => 'b8860b',
-		'dkgray' => 'a9a9a9',
-		'darkgray' => 'a9a9a9',
-		'darkgrey' => 'a9a9a9',
-		'darkgreen' => '006400',
-		'darkkhaki' => 'bdb76b',
-		'darkmagenta' => '8b008b',
-		'darkolivegreen' => '556b2f',
-		'darkorange' => 'ff8c00',
-		'darkorchid' => '9932cc',
-		'darkred' => '8b0000',
-		'darksalmon' => 'e9967a',
-		'darkseagreen' => '8fbc8f',
-		'darkslateblue' => '483d8b',
-		'darkslategray' => '2f4f4f',
-		'darkslategrey' => '2f4f4f',
-		'darkturquoise' => '00ced1',
-		'darkviolet' => '9400d3',
-		'deeppink' => 'ff1493',
-		'deepskyblue' => '00bfff',
-		'dimgray' => '696969',
-		'dimgrey' => '696969',
-		'dodgerblue' => '1e90ff',
-		'firebrick' => 'b22222',
-		'floralwhite' => 'fffaf0',
-		'forestgreen' => '228b22',
-		'fuchsia' => 'ff00ff',
-		'gainsboro' => 'dcdcdc',
-		'ghostwhite' => 'f8f8ff',
-		'gold' => 'ffd700',
-		'goldenrod' => 'daa520',
-		'gray' => '808080',
-		'grey' => '808080',
-		'green' => '008000',
-		'greenyellow' => 'adff2f',
-		'honeydew' => 'f0fff0',
-		'hotpink' => 'ff69b4',
-		'indianred' => 'cd5c5c',
-		'indigo' => '4b0082',
-		'ivory' => 'fffff0',
-		'khaki' => 'f0e68c',
-		'lavender' => 'e6e6fa',
-		'lavenderblush' => 'fff0f5',
-		'lawngreen' => '7cfc00',
-		'lemonchiffon' => 'fffacd',
-		'lightblue' => 'add8e6',
-		'lightcoral' => 'f08080',
-		'lightcyan' => 'e0ffff',
-		'lightgoldenrodyellow' => 'fafad2',
-		'ltgray' => 'd3d3d3',
-		'lightgray' => 'd3d3d3',
-		'lightgrey' => 'd3d3d3',
-		'lightgreen' => '90ee90',
-		'lightpink' => 'ffb6c1',
-		'lightsalmon' => 'ffa07a',
-		'lightseagreen' => '20b2aa',
-		'lightskyblue' => '87cefa',
-		'lightslategray' => '778899',
-		'lightslategrey' => '778899',
-		'lightsteelblue' => 'b0c4de',
-		'lightyellow' => 'ffffe0',
-		'lime' => '00ff00',
-		'limegreen' => '32cd32',
-		'linen' => 'faf0e6',
-		'magenta' => 'ff00ff',
-		'maroon' => '800000',
-		'mediumaquamarine' => '66cdaa',
-		'mediumblue' => '0000cd',
-		'mediumorchid' => 'ba55d3',
-		'mediumpurple' => '9370d8',
-		'mediumseagreen' => '3cb371',
-		'mediumslateblue' => '7b68ee',
-		'mediumspringgreen' => '00fa9a',
-		'mediumturquoise' => '48d1cc',
-		'mediumvioletred' => 'c71585',
-		'midnightblue' => '191970',
-		'mintcream' => 'f5fffa',
-		'mistyrose' => 'ffe4e1',
-		'moccasin' => 'ffe4b5',
-		'navajowhite' => 'ffdead',
-		'navy' => '000080',
-		'oldlace' => 'fdf5e6',
-		'olive' => '808000',
-		'olivedrab' => '6b8e23',
-		'orange' => 'ffa500',
-		'orangered' => 'ff4500',
-		'orchid' => 'da70d6',
-		'palegoldenrod' => 'eee8aa',
-		'palegreen' => '98fb98',
-		'paleturquoise' => 'afeeee',
-		'palevioletred' => 'd87093',
-		'papayawhip' => 'ffefd5',
-		'peachpuff' => 'ffdab9',
-		'peru' => 'cd853f',
-		'pink' => 'ffc0cb',
-		'plum' => 'dda0dd',
-		'powderblue' => 'b0e0e6',
-		'purple' => '800080',
-		'red' => 'ff0000',
-		'rosybrown' => 'bc8f8f',
-		'royalblue' => '4169e1',
-		'saddlebrown' => '8b4513',
-		'salmon' => 'fa8072',
-		'sandybrown' => 'f4a460',
-		'seagreen' => '2e8b57',
-		'seashell' => 'fff5ee',
-		'sienna' => 'a0522d',
-		'silver' => 'c0c0c0',
-		'skyblue' => '87ceeb',
-		'slateblue' => '6a5acd',
-		'slategray' => '708090',
-		'slategrey' => '708090',
-		'snow' => 'fffafa',
-		'springgreen' => '00ff7f',
-		'steelblue' => '4682b4',
-		'tan' => 'd2b48c',
-		'teal' => '008080',
-		'thistle' => 'd8bfd8',
-		'tomato' => 'ff6347',
-		'turquoise' => '40e0d0',
-		'violet' => 'ee82ee',
-		'wheat' => 'f5deb3',
-		'white' => 'ffffff',
-		'whitesmoke' => 'f5f5f5',
-		'yellow' => 'ffff00',
-		'yellowgreen' => '9acd32'
-	); // end of web colors
-
-	/**
-	 * Array of valid JavaScript color names
-	 * @public static
-	 */
-	public static $jscolor = array ('transparent', 'black', 'white', 'red', 'green', 'blue', 'cyan', 'magenta', 'yellow', 'dkGray', 'gray', 'ltGray');
-
-	/**
-	 * Array of Spot colors (C,M,Y,K,name)
-	 * Color keys must be in lowercase and without spaces.
-	 * As long as no open standard for spot colours exists, you have to buy a colour book by one of the colour manufacturers and insert the values and names of spot colours directly.
-	 * Common industry standard spot colors are: ANPA-COLOR, DIC, FOCOLTONE, GCMI, HKS, PANTONE, TOYO, TRUMATCH.
-	 * @public static
-	 */
-	public static $spotcolor = array (
-		// special registration colors
-		'none'    => array(  0,   0,   0,   0, 'None'),
-		'all'     => array(100, 100, 100, 100, 'All'),
-		// standard CMYK colors
-		'cyan'    => array(100,   0,   0,   0, 'Cyan'),
-		'magenta' => array(  0, 100,   0,   0, 'Magenta'),
-		'yellow'  => array(  0,   0, 100,   0, 'Yellow'),
-		'key'     => array(  0,   0,   0, 100, 'Key'),
-		// alias
-		'white'   => array(  0,   0,   0,   0, 'White'),
-		'black'   => array(  0,   0,   0, 100, 'Black'),
-		// standard RGB colors
-		'red'     => array(  0, 100, 100,   0, 'Red'),
-		'green'   => array(100,   0, 100,   0, 'Green'),
-		'blue'    => array(100, 100,   0,   0, 'Blue'),
-		// Add here standard spot colors or dynamically define them with AddSpotColor()
-		// ...
-	); // end of spot colors
-
-	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-	/**
-	 * Return the Spot color array.
-	 * @param $name (string) Name of the spot color.
-	 * @param $spotc (array) Reference to an array of spot colors.
-	 * @return (array) Spot color array or false if not defined.
-	 * @since 5.9.125 (2011-10-03)
-	 * @public static
-	 */
-	public static function getSpotColor($name, &$spotc) {
-		if (isset($spotc[$name])) {
-			return $spotc[$name];
-		}
-		$color = preg_replace('/[\s]*/', '', $name); // remove extra spaces
-		$color = strtolower($color);
-		if (isset(self::$spotcolor[$color])) {
-			if (!isset($spotc[$name])) {
-				$i = (1 + count($spotc));
-				$spotc[$name] = array('C' => self::$spotcolor[$color][0], 'M' => self::$spotcolor[$color][1], 'Y' => self::$spotcolor[$color][2], 'K' => self::$spotcolor[$color][3], 'name' => self::$spotcolor[$color][4], 'i' => $i);
-			}
-			return $spotc[self::$spotcolor[$color][4]];
-		}
-		return false;
-	}
-
-	/**
-	 * Returns an array (RGB or CMYK) from an html color name, or a six-digit (i.e. #3FE5AA), or three-digit (i.e. #7FF) hexadecimal color, or a javascript color array, or javascript color name.
-	 * @param $hcolor (string) HTML color.
-	 * @param $spotc (array) Reference to an array of spot colors.
-	 * @param $defcol (array) Color to return in case of error.
-	 * @return array RGB or CMYK color, or false in case of error.
-	 * @public static
-	 */
-	public static function convertHTMLColorToDec($hcolor, &$spotc, $defcol=array('R'=>128,'G'=>128,'B'=>128)) {
-		$color = preg_replace('/[\s]*/', '', $hcolor); // remove extra spaces
-		$color = strtolower($color);
-		// check for javascript color array syntax
-		if (strpos($color, '[') !== false) {
-			if (preg_match('/[\[][\"\'](t|g|rgb|cmyk)[\"\'][\,]?([0-9\.]*)[\,]?([0-9\.]*)[\,]?([0-9\.]*)[\,]?([0-9\.]*)[\]]/', $color, $m) > 0) {
-				$returncolor = array();
-				switch ($m[1]) {
-					case 'cmyk': {
-						// RGB
-						$returncolor['C'] = max(0, min(100, (floatval($m[2]) * 100)));
-						$returncolor['M'] = max(0, min(100, (floatval($m[3]) * 100)));
-						$returncolor['Y'] = max(0, min(100, (floatval($m[4]) * 100)));
-						$returncolor['K'] = max(0, min(100, (floatval($m[5]) * 100)));
-						break;
-					}
-					case 'rgb': {
-						// RGB
-						$returncolor['R'] = max(0, min(255, (floatval($m[2]) * 255)));
-						$returncolor['G'] = max(0, min(255, (floatval($m[3]) * 255)));
-						$returncolor['B'] = max(0, min(255, (floatval($m[4]) * 255)));
-						break;
-					}
-					case 'g': {
-						// grayscale
-						$returncolor['G'] = max(0, min(255, (floatval($m[2]) * 255)));
-						break;
-					}
-					case 't':
-					default: {
-						// transparent (empty array)
-						break;
-					}
-				}
-				return $returncolor;
-			}
-		} elseif ((substr($color, 0, 4) != 'cmyk') AND (substr($color, 0, 3) != 'rgb') AND (($dotpos = strpos($color, '.')) !== false)) {
-			// remove class parent (i.e.: color.red)
-			$color = substr($color, ($dotpos + 1));
-			if ($color == 'transparent') {
-				// transparent (empty array)
-				return array();
-			}
-		}
-		if (strlen($color) == 0) {
-			return $defcol;
-		}
-		// RGB ARRAY
-		if (substr($color, 0, 3) == 'rgb') {
-			$codes = substr($color, 4);
-			$codes = str_replace(')', '', $codes);
-			$returncolor = explode(',', $codes);
-			foreach ($returncolor as $key => $val) {
-				if (strpos($val, '%') > 0) {
-					// percentage
-					$returncolor[$key] = (255 * intval($val) / 100);
-				} else {
-					$returncolor[$key] = intval($val);
-				}
-				// normalize value
-				$returncolor[$key] = max(0, min(255, $returncolor[$key]));
-			}
-			return $returncolor;
-		}
-		// CMYK ARRAY
-		if (substr($color, 0, 4) == 'cmyk') {
-			$codes = substr($color, 5);
-			$codes = str_replace(')', '', $codes);
-			$returncolor = explode(',', $codes);
-			foreach ($returncolor as $key => $val) {
-				if (strpos($val, '%') !== false) {
-					// percentage
-					$returncolor[$key] = (100 * intval($val) / 100);
-				} else {
-					$returncolor[$key] = intval($val);
-				}
-				// normalize value
-				$returncolor[$key] = max(0, min(100, $returncolor[$key]));
-			}
-			return $returncolor;
-		}
-		if ($color[0] != '#') {
-			// COLOR NAME
-			if (isset(self::$webcolor[$color])) {
-				// web color
-				$color_code = self::$webcolor[$color];
-			} else {
-				// spot color
-				$returncolor = self::getSpotColor($color, $spotc);
-				if ($returncolor === false) {
-					$returncolor = $defcol;
-				}
-				return $returncolor;
-			}
-		} else {
-			$color_code = substr($color, 1);
-		}
-		// HEXADECIMAL REPRESENTATION
-		switch (strlen($color_code)) {
-			case 3: {
-				// 3-digit RGB hexadecimal representation
-				$r = substr($color_code, 0, 1);
-				$g = substr($color_code, 1, 1);
-				$b = substr($color_code, 2, 1);
-				$returncolor = array();
-				$returncolor['R'] = max(0, min(255, hexdec($r.$r)));
-				$returncolor['G'] = max(0, min(255, hexdec($g.$g)));
-				$returncolor['B'] = max(0, min(255, hexdec($b.$b)));
-				break;
-			}
-			case 6: {
-				// 6-digit RGB hexadecimal representation
-				$returncolor = array();
-				$returncolor['R'] = max(0, min(255, hexdec(substr($color_code, 0, 2))));
-				$returncolor['G'] = max(0, min(255, hexdec(substr($color_code, 2, 2))));
-				$returncolor['B'] = max(0, min(255, hexdec(substr($color_code, 4, 2))));
-				break;
-			}
-			case 8: {
-				// 8-digit CMYK hexadecimal representation
-				$returncolor = array();
-				$returncolor['C'] = max(0, min(100, round(hexdec(substr($color_code, 0, 2)) / 2.55)));
-				$returncolor['M'] = max(0, min(100, round(hexdec(substr($color_code, 2, 2)) / 2.55)));
-				$returncolor['Y'] = max(0, min(100, round(hexdec(substr($color_code, 4, 2)) / 2.55)));
-				$returncolor['K'] = max(0, min(100, round(hexdec(substr($color_code, 6, 2)) / 2.55)));
-				break;
-			}
-			default: {
-				$returncolor = $defcol;
-				break;
-			}
-		}
-		return $returncolor;
-	}
-
-	/**
-	 * Convert a color array into a string representation.
-	 * @param $c (array) Array of colors.
-	 * @return (string) The color array representation.
-	 * @since 5.9.137 (2011-12-01)
-	 * @public static
-	 */
-	public static function getColorStringFromArray($c) {
-		$c = array_values($c);
-		$color = '[';
-		switch (count($c)) {
-			case 4: {
-				// CMYK
-				$color .= sprintf('%F %F %F %F', (max(0, min(100, floatval($c[0]))) / 100), (max(0, min(100, floatval($c[1]))) / 100), (max(0, min(100, floatval($c[2]))) / 100), (max(0, min(100, floatval($c[3]))) / 100));
-				break;
-			}
-			case 3: {
-				// RGB
-				$color .= sprintf('%F %F %F', (max(0, min(255, floatval($c[0]))) / 255), (max(0, min(255, floatval($c[1]))) / 255), (max(0, min(255, floatval($c[2]))) / 255));
-				break;
-			}
-			case 1: {
-				// grayscale
-				$color .= sprintf('%F', (max(0, min(255, floatval($c[0]))) / 255));
-				break;
-			}
-		}
-		$color .= ']';
-		return $color;
-	}
-
-	/**
-	 * Convert color to javascript color.
-	 * @param $color (string) color name or "#RRGGBB"
-	 * @protected
-	 * @since 2.1.002 (2008-02-12)
-	 * @public static
-	 */
-	public static function _JScolor($color) {
-		if (substr($color, 0, 1) == '#') {
-			return sprintf("['RGB',%F,%F,%F]", (hexdec(substr($color, 1, 2)) / 255), (hexdec(substr($color, 3, 2)) / 255), (hexdec(substr($color, 5, 2)) / 255));
-		}
-		if (!in_array($color, self::$jscolor)) {
-			// default transparent color
-			$color = $jscolor[0];
-		}
-		return 'color.'.$color;
-	}
-
-
-} // END OF TCPDF_COLORS CLASS
-
-//============================================================+
-// END OF FILE
-//============================================================+
diff --git a/#pma/libraries/tcpdf/include/tcpdf_font_data.php b/#pma/libraries/tcpdf/include/tcpdf_font_data.php
deleted file mode 100644
index 974e72ec..00000000
--- a/#pma/libraries/tcpdf/include/tcpdf_font_data.php
+++ /dev/null
@@ -1,18447 +0,0 @@
-<?php
-//============================================================+
-// File name   : tcpdf_font_data.php
-// Version     : 1.0.001
-// Begin       : 2008-01-01
-// Last Update : 2013-04-01
-// Author      : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
-// License     : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
-// -------------------------------------------------------------------
-// Copyright (C) 2008-2013 Nicola Asuni - Tecnick.com LTD
-//
-// This file is part of TCPDF software library.
-//
-// TCPDF is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// TCPDF is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-// See the GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with TCPDF.  If not, see <http://www.gnu.org/licenses/>.
-//
-// See LICENSE.TXT file for more information.
-// -------------------------------------------------------------------
-//
-// Description : Unicode data and encoding maps for TCPDF.
-//
-//============================================================+
-
-/**
- * @file
- * Unicode data and encoding maps for TCPDF.
- * @author Nicola Asuni
- * @package com.tecnick.tcpdf
- */
-
-/**
- * @class TCPDF_FONT_DATA
- * Unicode data and encoding maps for TCPDF.
- * @package com.tecnick.tcpdf
- * @version 1.0.001
- * @author Nicola Asuni - info@tecnick.com
- */
-class TCPDF_FONT_DATA {
-
-/**
- * Unicode code for Left-to-Right Mark.
- * @public
- */
-public static $uni_LRM = 8206;
-
-/**
- * Unicode code for Right-to-Left Mark.
- * @public
- */
-public static $uni_RLM = 8207;
-
-/**
- * Unicode code for Left-to-Right Embedding.
- * @public
- */
-public static $uni_LRE = 8234;
-
-/**
- * Unicode code for Right-to-Left Embedding.
- * @public
- */
-public static $uni_RLE = 8235;
-
-/**
- * Unicode code for Pop Directional Format.
- * @public
- */
-public static $uni_PDF = 8236;
-
-/**
- * Unicode code for Left-to-Right Override.
- * @public
- */
-public static $uni_LRO = 8237;
-
-/**
- * Unicode code for Right-to-Left Override.
- * @public
- */
-public static $uni_RLO = 8238;
-
-/**
- * Pattern to test RTL (Righ-To-Left) strings using regular expressions.
- * @public
- */
-public static $uni_RE_PATTERN_RTL = "/(
-	  \xD6\xBE                                             # R
-	| \xD7[\x80\x83\x86\x90-\xAA\xB0-\xB4]                 # R
-	| \xDF[\x80-\xAA\xB4\xB5\xBA]                          # R
-	| \xE2\x80\x8F                                         # R
-	| \xEF\xAC[\x9D\x9F\xA0-\xA8\xAA-\xB6\xB8-\xBC\xBE]    # R
-	| \xEF\xAD[\x80\x81\x83\x84\x86-\x8F]                  # R
-	| \xF0\x90\xA0[\x80-\x85\x88\x8A-\xB5\xB7\xB8\xBC\xBF] # R
-	| \xF0\x90\xA4[\x80-\x99]                              # R
-	| \xF0\x90\xA8[\x80\x90-\x93\x95-\x97\x99-\xB3]        # R
-	| \xF0\x90\xA9[\x80-\x87\x90-\x98]                     # R
-	| \xE2\x80[\xAB\xAE]                                   # RLE & RLO
-	)/x";
-
-/**
- * Pattern to test Arabic strings using regular expressions. Source: http://www.w3.org/International/questions/qa-forms-utf-8
- * @public
- */
-public static $uni_RE_PATTERN_ARABIC = "/(
-		  \xD8[\x80-\x83\x8B\x8D\x9B\x9E\x9F\xA1-\xBA]  # AL
-		| \xD9[\x80-\x8A\xAD-\xAF\xB1-\xBF]             # AL
-		| \xDA[\x80-\xBF]                               # AL
-		| \xDB[\x80-\x95\x9D\xA5\xA6\xAE\xAF\xBA-\xBF]  # AL
-		| \xDC[\x80-\x8D\x90\x92-\xAF]                  # AL
-		| \xDD[\x8D-\xAD]                               # AL
-		| \xDE[\x80-\xA5\xB1]                           # AL
-		| \xEF\xAD[\x90-\xBF]                           # AL
-		| \xEF\xAE[\x80-\xB1]                           # AL
-		| \xEF\xAF[\x93-\xBF]                           # AL
-		| \xEF[\xB0-\xB3][\x80-\xBF]                    # AL
-		| \xEF\xB4[\x80-\xBD]                           # AL
-		| \xEF\xB5[\x90-\xBF]                           # AL
-		| \xEF\xB6[\x80-\x8F\x92-\xBF]                  # AL
-		| \xEF\xB7[\x80-\x87\xB0-\xBC]                  # AL
-		| \xEF\xB9[\xB0-\xB4\xB6-\xBF]                  # AL
-		| \xEF\xBA[\x80-\xBF]                           # AL
-		| \xEF\xBB[\x80-\xBC]                           # AL
-		| \xD9[\xA0-\xA9\xAB\xAC]                       # AN
-		)/x";
-
-/**
- * Array of Unicode types.
- * @public
- */
-public static $uni_type = array(
-0=>'BN',
-1=>'BN',
-2=>'BN',
-3=>'BN',
-4=>'BN',
-5=>'BN',
-6=>'BN',
-7=>'BN',
-8=>'BN',
-9=>'S',
-10=>'B',
-11=>'S',
-12=>'WS',
-13=>'B',
-14=>'BN',
-15=>'BN',
-16=>'BN',
-17=>'BN',
-18=>'BN',
-19=>'BN',
-20=>'BN',
-21=>'BN',
-22=>'BN',
-23=>'BN',
-24=>'BN',
-25=>'BN',
-26=>'BN',
-27=>'BN',
-28=>'B',
-29=>'B',
-30=>'B',
-31=>'S',
-32=>'WS',
-33=>'ON',
-34=>'ON',
-35=>'ET',
-36=>'ET',
-37=>'ET',
-38=>'ON',
-39=>'ON',
-40=>'ON',
-41=>'ON',
-42=>'ON',
-43=>'ES',
-44=>'CS',
-45=>'ES',
-46=>'CS',
-47=>'CS',
-48=>'EN',
-49=>'EN',
-50=>'EN',
-51=>'EN',
-52=>'EN',
-53=>'EN',
-54=>'EN',
-55=>'EN',
-56=>'EN',
-57=>'EN',
-58=>'CS',
-59=>'ON',
-60=>'ON',
-61=>'ON',
-62=>'ON',
-63=>'ON',
-64=>'ON',
-65=>'L',
-66=>'L',
-67=>'L',
-68=>'L',
-69=>'L',
-70=>'L',
-71=>'L',
-72=>'L',
-73=>'L',
-74=>'L',
-75=>'L',
-76=>'L',
-77=>'L',
-78=>'L',
-79=>'L',
-80=>'L',
-81=>'L',
-82=>'L',
-83=>'L',
-84=>'L',
-85=>'L',
-86=>'L',
-87=>'L',
-88=>'L',
-89=>'L',
-90=>'L',
-91=>'ON',
-92=>'ON',
-93=>'ON',
-94=>'ON',
-95=>'ON',
-96=>'ON',
-97=>'L',
-98=>'L',
-99=>'L',
-100=>'L',
-101=>'L',
-102=>'L',
-103=>'L',
-104=>'L',
-105=>'L',
-106=>'L',
-107=>'L',
-108=>'L',
-109=>'L',
-110=>'L',
-111=>'L',
-112=>'L',
-113=>'L',
-114=>'L',
-115=>'L',
-116=>'L',
-117=>'L',
-118=>'L',
-119=>'L',
-120=>'L',
-121=>'L',
-122=>'L',
-123=>'ON',
-124=>'ON',
-125=>'ON',
-126=>'ON',
-127=>'BN',
-128=>'BN',
-129=>'BN',
-130=>'BN',
-131=>'BN',
-132=>'BN',
-133=>'B',
-134=>'BN',
-135=>'BN',
-136=>'BN',
-137=>'BN',
-138=>'BN',
-139=>'BN',
-140=>'BN',
-141=>'BN',
-142=>'BN',
-143=>'BN',
-144=>'BN',
-145=>'BN',
-146=>'BN',
-147=>'BN',
-148=>'BN',
-149=>'BN',
-150=>'BN',
-151=>'BN',
-152=>'BN',
-153=>'BN',
-154=>'BN',
-155=>'BN',
-156=>'BN',
-157=>'BN',
-158=>'BN',
-159=>'BN',
-160=>'CS',
-161=>'ON',
-162=>'ET',
-163=>'ET',
-164=>'ET',
-165=>'ET',
-166=>'ON',
-167=>'ON',
-168=>'ON',
-169=>'ON',
-170=>'L',
-171=>'ON',
-172=>'ON',
-173=>'BN',
-174=>'ON',
-175=>'ON',
-176=>'ET',
-177=>'ET',
-178=>'EN',
-179=>'EN',
-180=>'ON',
-181=>'L',
-182=>'ON',
-183=>'ON',
-184=>'ON',
-185=>'EN',
-186=>'L',
-187=>'ON',
-188=>'ON',
-189=>'ON',
-190=>'ON',
-191=>'ON',
-192=>'L',
-193=>'L',
-194=>'L',
-195=>'L',
-196=>'L',
-197=>'L',
-198=>'L',
-199=>'L',
-200=>'L',
-201=>'L',
-202=>'L',
-203=>'L',
-204=>'L',
-205=>'L',
-206=>'L',
-207=>'L',
-208=>'L',
-209=>'L',
-210=>'L',
-211=>'L',
-212=>'L',
-213=>'L',
-214=>'L',
-215=>'ON',
-216=>'L',
-217=>'L',
-218=>'L',
-219=>'L',
-220=>'L',
-221=>'L',
-222=>'L',
-223=>'L',
-224=>'L',
-225=>'L',
-226=>'L',
-227=>'L',
-228=>'L',
-229=>'L',
-230=>'L',
-231=>'L',
-232=>'L',
-233=>'L',
-234=>'L',
-235=>'L',
-236=>'L',
-237=>'L',
-238=>'L',
-239=>'L',
-240=>'L',
-241=>'L',
-242=>'L',
-243=>'L',
-244=>'L',
-245=>'L',
-246=>'L',
-247=>'ON',
-248=>'L',
-249=>'L',
-250=>'L',
-251=>'L',
-252=>'L',
-253=>'L',
-254=>'L',
-255=>'L',
-256=>'L',
-257=>'L',
-258=>'L',
-259=>'L',
-260=>'L',
-261=>'L',
-262=>'L',
-263=>'L',
-264=>'L',
-265=>'L',
-266=>'L',
-267=>'L',
-268=>'L',
-269=>'L',
-270=>'L',
-271=>'L',
-272=>'L',
-273=>'L',
-274=>'L',
-275=>'L',
-276=>'L',
-277=>'L',
-278=>'L',
-279=>'L',
-280=>'L',
-281=>'L',
-282=>'L',
-283=>'L',
-284=>'L',
-285=>'L',
-286=>'L',
-287=>'L',
-288=>'L',
-289=>'L',
-290=>'L',
-291=>'L',
-292=>'L',
-293=>'L',
-294=>'L',
-295=>'L',
-296=>'L',
-297=>'L',
-298=>'L',
-299=>'L',
-300=>'L',
-301=>'L',
-302=>'L',
-303=>'L',
-304=>'L',
-305=>'L',
-306=>'L',
-307=>'L',
-308=>'L',
-309=>'L',
-310=>'L',
-311=>'L',
-312=>'L',
-313=>'L',
-314=>'L',
-315=>'L',
-316=>'L',
-317=>'L',
-318=>'L',
-319=>'L',
-320=>'L',
-321=>'L',
-322=>'L',
-323=>'L',
-324=>'L',
-325=>'L',
-326=>'L',
-327=>'L',
-328=>'L',
-329=>'L',
-330=>'L',
-331=>'L',
-332=>'L',
-333=>'L',
-334=>'L',
-335=>'L',
-336=>'L',
-337=>'L',
-338=>'L',
-339=>'L',
-340=>'L',
-341=>'L',
-342=>'L',
-343=>'L',
-344=>'L',
-345=>'L',
-346=>'L',
-347=>'L',
-348=>'L',
-349=>'L',
-350=>'L',
-351=>'L',
-352=>'L',
-353=>'L',
-354=>'L',
-355=>'L',
-356=>'L',
-357=>'L',
-358=>'L',
-359=>'L',
-360=>'L',
-361=>'L',
-362=>'L',
-363=>'L',
-364=>'L',
-365=>'L',
-366=>'L',
-367=>'L',
-368=>'L',
-369=>'L',
-370=>'L',
-371=>'L',
-372=>'L',
-373=>'L',
-374=>'L',
-375=>'L',
-376=>'L',
-377=>'L',
-378=>'L',
-379=>'L',
-380=>'L',
-381=>'L',
-382=>'L',
-383=>'L',
-384=>'L',
-385=>'L',
-386=>'L',
-387=>'L',
-388=>'L',
-389=>'L',
-390=>'L',
-391=>'L',
-392=>'L',
-393=>'L',
-394=>'L',
-395=>'L',
-396=>'L',
-397=>'L',
-398=>'L',
-399=>'L',
-400=>'L',
-401=>'L',
-402=>'L',
-403=>'L',
-404=>'L',
-405=>'L',
-406=>'L',
-407=>'L',
-408=>'L',
-409=>'L',
-410=>'L',
-411=>'L',
-412=>'L',
-413=>'L',
-414=>'L',
-415=>'L',
-416=>'L',
-417=>'L',
-418=>'L',
-419=>'L',
-420=>'L',
-421=>'L',
-422=>'L',
-423=>'L',
-424=>'L',
-425=>'L',
-426=>'L',
-427=>'L',
-428=>'L',
-429=>'L',
-430=>'L',
-431=>'L',
-432=>'L',
-433=>'L',
-434=>'L',
-435=>'L',
-436=>'L',
-437=>'L',
-438=>'L',
-439=>'L',
-440=>'L',
-441=>'L',
-442=>'L',
-443=>'L',
-444=>'L',
-445=>'L',
-446=>'L',
-447=>'L',
-448=>'L',
-449=>'L',
-450=>'L',
-451=>'L',
-452=>'L',
-453=>'L',
-454=>'L',
-455=>'L',
-456=>'L',
-457=>'L',
-458=>'L',
-459=>'L',
-460=>'L',
-461=>'L',
-462=>'L',
-463=>'L',
-464=>'L',
-465=>'L',
-466=>'L',
-467=>'L',
-468=>'L',
-469=>'L',
-470=>'L',
-471=>'L',
-472=>'L',
-473=>'L',
-474=>'L',
-475=>'L',
-476=>'L',
-477=>'L',
-478=>'L',
-479=>'L',
-480=>'L',
-481=>'L',
-482=>'L',
-483=>'L',
-484=>'L',
-485=>'L',
-486=>'L',
-487=>'L',
-488=>'L',
-489=>'L',
-490=>'L',
-491=>'L',
-492=>'L',
-493=>'L',
-494=>'L',
-495=>'L',
-496=>'L',
-497=>'L',
-498=>'L',
-499=>'L',
-500=>'L',
-501=>'L',
-502=>'L',
-503=>'L',
-504=>'L',
-505=>'L',
-506=>'L',
-507=>'L',
-508=>'L',
-509=>'L',
-510=>'L',
-511=>'L',
-512=>'L',
-513=>'L',
-514=>'L',
-515=>'L',
-516=>'L',
-517=>'L',
-518=>'L',
-519=>'L',
-520=>'L',
-521=>'L',
-522=>'L',
-523=>'L',
-524=>'L',
-525=>'L',
-526=>'L',
-527=>'L',
-528=>'L',
-529=>'L',
-530=>'L',
-531=>'L',
-532=>'L',
-533=>'L',
-534=>'L',
-535=>'L',
-536=>'L',
-537=>'L',
-538=>'L',
-539=>'L',
-540=>'L',
-541=>'L',
-542=>'L',
-543=>'L',
-544=>'L',
-545=>'L',
-546=>'L',
-547=>'L',
-548=>'L',
-549=>'L',
-550=>'L',
-551=>'L',
-552=>'L',
-553=>'L',
-554=>'L',
-555=>'L',
-556=>'L',
-557=>'L',
-558=>'L',
-559=>'L',
-560=>'L',
-561=>'L',
-562=>'L',
-563=>'L',
-564=>'L',
-565=>'L',
-566=>'L',
-567=>'L',
-568=>'L',
-569=>'L',
-570=>'L',
-571=>'L',
-572=>'L',
-573=>'L',
-574=>'L',
-575=>'L',
-576=>'L',
-577=>'L',
-578=>'L',
-579=>'L',
-580=>'L',
-581=>'L',
-582=>'L',
-583=>'L',
-584=>'L',
-585=>'L',
-586=>'L',
-587=>'L',
-588=>'L',
-589=>'L',
-590=>'L',
-591=>'L',
-592=>'L',
-593=>'L',
-594=>'L',
-595=>'L',
-596=>'L',
-597=>'L',
-598=>'L',
-599=>'L',
-600=>'L',
-601=>'L',
-602=>'L',
-603=>'L',
-604=>'L',
-605=>'L',
-606=>'L',
-607=>'L',
-608=>'L',
-609=>'L',
-610=>'L',
-611=>'L',
-612=>'L',
-613=>'L',
-614=>'L',
-615=>'L',
-616=>'L',
-617=>'L',
-618=>'L',
-619=>'L',
-620=>'L',
-621=>'L',
-622=>'L',
-623=>'L',
-624=>'L',
-625=>'L',
-626=>'L',
-627=>'L',
-628=>'L',
-629=>'L',
-630=>'L',
-631=>'L',
-632=>'L',
-633=>'L',
-634=>'L',
-635=>'L',
-636=>'L',
-637=>'L',
-638=>'L',
-639=>'L',
-640=>'L',
-641=>'L',
-642=>'L',
-643=>'L',
-644=>'L',
-645=>'L',
-646=>'L',
-647=>'L',
-648=>'L',
-649=>'L',
-650=>'L',
-651=>'L',
-652=>'L',
-653=>'L',
-654=>'L',
-655=>'L',
-656=>'L',
-657=>'L',
-658=>'L',
-659=>'L',
-660=>'L',
-661=>'L',
-662=>'L',
-663=>'L',
-664=>'L',
-665=>'L',
-666=>'L',
-667=>'L',
-668=>'L',
-669=>'L',
-670=>'L',
-671=>'L',
-672=>'L',
-673=>'L',
-674=>'L',
-675=>'L',
-676=>'L',
-677=>'L',
-678=>'L',
-679=>'L',
-680=>'L',
-681=>'L',
-682=>'L',
-683=>'L',
-684=>'L',
-685=>'L',
-686=>'L',
-687=>'L',
-688=>'L',
-689=>'L',
-690=>'L',
-691=>'L',
-692=>'L',
-693=>'L',
-694=>'L',
-695=>'L',
-696=>'L',
-697=>'ON',
-698=>'ON',
-699=>'L',
-700=>'L',
-701=>'L',
-702=>'L',
-703=>'L',
-704=>'L',
-705=>'L',
-706=>'ON',
-707=>'ON',
-708=>'ON',
-709=>'ON',
-710=>'ON',
-711=>'ON',
-712=>'ON',
-713=>'ON',
-714=>'ON',
-715=>'ON',
-716=>'ON',
-717=>'ON',
-718=>'ON',
-719=>'ON',
-720=>'L',
-721=>'L',
-722=>'ON',
-723=>'ON',
-724=>'ON',
-725=>'ON',
-726=>'ON',
-727=>'ON',
-728=>'ON',
-729=>'ON',
-730=>'ON',
-731=>'ON',
-732=>'ON',
-733=>'ON',
-734=>'ON',
-735=>'ON',
-736=>'L',
-737=>'L',
-738=>'L',
-739=>'L',
-740=>'L',
-741=>'ON',
-742=>'ON',
-743=>'ON',
-744=>'ON',
-745=>'ON',
-746=>'ON',
-747=>'ON',
-748=>'ON',
-749=>'ON',
-750=>'L',
-751=>'ON',
-752=>'ON',
-753=>'ON',
-754=>'ON',
-755=>'ON',
-756=>'ON',
-757=>'ON',
-758=>'ON',
-759=>'ON',
-760=>'ON',
-761=>'ON',
-762=>'ON',
-763=>'ON',
-764=>'ON',
-765=>'ON',
-766=>'ON',
-767=>'ON',
-768=>'NSM',
-769=>'NSM',
-770=>'NSM',
-771=>'NSM',
-772=>'NSM',
-773=>'NSM',
-774=>'NSM',
-775=>'NSM',
-776=>'NSM',
-777=>'NSM',
-778=>'NSM',
-779=>'NSM',
-780=>'NSM',
-781=>'NSM',
-782=>'NSM',
-783=>'NSM',
-784=>'NSM',
-785=>'NSM',
-786=>'NSM',
-787=>'NSM',
-788=>'NSM',
-789=>'NSM',
-790=>'NSM',
-791=>'NSM',
-792=>'NSM',
-793=>'NSM',
-794=>'NSM',
-795=>'NSM',
-796=>'NSM',
-797=>'NSM',
-798=>'NSM',
-799=>'NSM',
-800=>'NSM',
-801=>'NSM',
-802=>'NSM',
-803=>'NSM',
-804=>'NSM',
-805=>'NSM',
-806=>'NSM',
-807=>'NSM',
-808=>'NSM',
-809=>'NSM',
-810=>'NSM',
-811=>'NSM',
-812=>'NSM',
-813=>'NSM',
-814=>'NSM',
-815=>'NSM',
-816=>'NSM',
-817=>'NSM',
-818=>'NSM',
-819=>'NSM',
-820=>'NSM',
-821=>'NSM',
-822=>'NSM',
-823=>'NSM',
-824=>'NSM',
-825=>'NSM',
-826=>'NSM',
-827=>'NSM',
-828=>'NSM',
-829=>'NSM',
-830=>'NSM',
-831=>'NSM',
-832=>'NSM',
-833=>'NSM',
-834=>'NSM',
-835=>'NSM',
-836=>'NSM',
-837=>'NSM',
-838=>'NSM',
-839=>'NSM',
-840=>'NSM',
-841=>'NSM',
-842=>'NSM',
-843=>'NSM',
-844=>'NSM',
-845=>'NSM',
-846=>'NSM',
-847=>'NSM',
-848=>'NSM',
-849=>'NSM',
-850=>'NSM',
-851=>'NSM',
-852=>'NSM',
-853=>'NSM',
-854=>'NSM',
-855=>'NSM',
-856=>'NSM',
-857=>'NSM',
-858=>'NSM',
-859=>'NSM',
-860=>'NSM',
-861=>'NSM',
-862=>'NSM',
-863=>'NSM',
-864=>'NSM',
-865=>'NSM',
-866=>'NSM',
-867=>'NSM',
-868=>'NSM',
-869=>'NSM',
-870=>'NSM',
-871=>'NSM',
-872=>'NSM',
-873=>'NSM',
-874=>'NSM',
-875=>'NSM',
-876=>'NSM',
-877=>'NSM',
-878=>'NSM',
-879=>'NSM',
-884=>'ON',
-885=>'ON',
-890=>'L',
-891=>'L',
-892=>'L',
-893=>'L',
-894=>'ON',
-900=>'ON',
-901=>'ON',
-902=>'L',
-903=>'ON',
-904=>'L',
-905=>'L',
-906=>'L',
-908=>'L',
-910=>'L',
-911=>'L',
-912=>'L',
-913=>'L',
-914=>'L',
-915=>'L',
-916=>'L',
-917=>'L',
-918=>'L',
-919=>'L',
-920=>'L',
-921=>'L',
-922=>'L',
-923=>'L',
-924=>'L',
-925=>'L',
-926=>'L',
-927=>'L',
-928=>'L',
-929=>'L',
-931=>'L',
-932=>'L',
-933=>'L',
-934=>'L',
-935=>'L',
-936=>'L',
-937=>'L',
-938=>'L',
-939=>'L',
-940=>'L',
-941=>'L',
-942=>'L',
-943=>'L',
-944=>'L',
-945=>'L',
-946=>'L',
-947=>'L',
-948=>'L',
-949=>'L',
-950=>'L',
-951=>'L',
-952=>'L',
-953=>'L',
-954=>'L',
-955=>'L',
-956=>'L',
-957=>'L',
-958=>'L',
-959=>'L',
-960=>'L',
-961=>'L',
-962=>'L',
-963=>'L',
-964=>'L',
-965=>'L',
-966=>'L',
-967=>'L',
-968=>'L',
-969=>'L',
-970=>'L',
-971=>'L',
-972=>'L',
-973=>'L',
-974=>'L',
-976=>'L',
-977=>'L',
-978=>'L',
-979=>'L',
-980=>'L',
-981=>'L',
-982=>'L',
-983=>'L',
-984=>'L',
-985=>'L',
-986=>'L',
-987=>'L',
-988=>'L',
-989=>'L',
-990=>'L',
-991=>'L',
-992=>'L',
-993=>'L',
-994=>'L',
-995=>'L',
-996=>'L',
-997=>'L',
-998=>'L',
-999=>'L',
-1000=>'L',
-1001=>'L',
-1002=>'L',
-1003=>'L',
-1004=>'L',
-1005=>'L',
-1006=>'L',
-1007=>'L',
-1008=>'L',
-1009=>'L',
-1010=>'L',
-1011=>'L',
-1012=>'L',
-1013=>'L',
-1014=>'ON',
-1015=>'L',
-1016=>'L',
-1017=>'L',
-1018=>'L',
-1019=>'L',
-1020=>'L',
-1021=>'L',
-1022=>'L',
-1023=>'L',
-1024=>'L',
-1025=>'L',
-1026=>'L',
-1027=>'L',
-1028=>'L',
-1029=>'L',
-1030=>'L',
-1031=>'L',
-1032=>'L',
-1033=>'L',
-1034=>'L',
-1035=>'L',
-1036=>'L',
-1037=>'L',
-1038=>'L',
-1039=>'L',
-1040=>'L',
-1041=>'L',
-1042=>'L',
-1043=>'L',
-1044=>'L',
-1045=>'L',
-1046=>'L',
-1047=>'L',
-1048=>'L',
-1049=>'L',
-1050=>'L',
-1051=>'L',
-1052=>'L',
-1053=>'L',
-1054=>'L',
-1055=>'L',
-1056=>'L',
-1057=>'L',
-1058=>'L',
-1059=>'L',
-1060=>'L',
-1061=>'L',
-1062=>'L',
-1063=>'L',
-1064=>'L',
-1065=>'L',
-1066=>'L',
-1067=>'L',
-1068=>'L',
-1069=>'L',
-1070=>'L',
-1071=>'L',
-1072=>'L',
-1073=>'L',
-1074=>'L',
-1075=>'L',
-1076=>'L',
-1077=>'L',
-1078=>'L',
-1079=>'L',
-1080=>'L',
-1081=>'L',
-1082=>'L',
-1083=>'L',
-1084=>'L',
-1085=>'L',
-1086=>'L',
-1087=>'L',
-1088=>'L',
-1089=>'L',
-1090=>'L',
-1091=>'L',
-1092=>'L',
-1093=>'L',
-1094=>'L',
-1095=>'L',
-1096=>'L',
-1097=>'L',
-1098=>'L',
-1099=>'L',
-1100=>'L',
-1101=>'L',
-1102=>'L',
-1103=>'L',
-1104=>'L',
-1105=>'L',
-1106=>'L',
-1107=>'L',
-1108=>'L',
-1109=>'L',
-1110=>'L',
-1111=>'L',
-1112=>'L',
-1113=>'L',
-1114=>'L',
-1115=>'L',
-1116=>'L',
-1117=>'L',
-1118=>'L',
-1119=>'L',
-1120=>'L',
-1121=>'L',
-1122=>'L',
-1123=>'L',
-1124=>'L',
-1125=>'L',
-1126=>'L',
-1127=>'L',
-1128=>'L',
-1129=>'L',
-1130=>'L',
-1131=>'L',
-1132=>'L',
-1133=>'L',
-1134=>'L',
-1135=>'L',
-1136=>'L',
-1137=>'L',
-1138=>'L',
-1139=>'L',
-1140=>'L',
-1141=>'L',
-1142=>'L',
-1143=>'L',
-1144=>'L',
-1145=>'L',
-1146=>'L',
-1147=>'L',
-1148=>'L',
-1149=>'L',
-1150=>'L',
-1151=>'L',
-1152=>'L',
-1153=>'L',
-1154=>'L',
-1155=>'NSM',
-1156=>'NSM',
-1157=>'NSM',
-1158=>'NSM',
-1160=>'NSM',
-1161=>'NSM',
-1162=>'L',
-1163=>'L',
-1164=>'L',
-1165=>'L',
-1166=>'L',
-1167=>'L',
-1168=>'L',
-1169=>'L',
-1170=>'L',
-1171=>'L',
-1172=>'L',
-1173=>'L',
-1174=>'L',
-1175=>'L',
-1176=>'L',
-1177=>'L',
-1178=>'L',
-1179=>'L',
-1180=>'L',
-1181=>'L',
-1182=>'L',
-1183=>'L',
-1184=>'L',
-1185=>'L',
-1186=>'L',
-1187=>'L',
-1188=>'L',
-1189=>'L',
-1190=>'L',
-1191=>'L',
-1192=>'L',
-1193=>'L',
-1194=>'L',
-1195=>'L',
-1196=>'L',
-1197=>'L',
-1198=>'L',
-1199=>'L',
-1200=>'L',
-1201=>'L',
-1202=>'L',
-1203=>'L',
-1204=>'L',
-1205=>'L',
-1206=>'L',
-1207=>'L',
-1208=>'L',
-1209=>'L',
-1210=>'L',
-1211=>'L',
-1212=>'L',
-1213=>'L',
-1214=>'L',
-1215=>'L',
-1216=>'L',
-1217=>'L',
-1218=>'L',
-1219=>'L',
-1220=>'L',
-1221=>'L',
-1222=>'L',
-1223=>'L',
-1224=>'L',
-1225=>'L',
-1226=>'L',
-1227=>'L',
-1228=>'L',
-1229=>'L',
-1230=>'L',
-1231=>'L',
-1232=>'L',
-1233=>'L',
-1234=>'L',
-1235=>'L',
-1236=>'L',
-1237=>'L',
-1238=>'L',
-1239=>'L',
-1240=>'L',
-1241=>'L',
-1242=>'L',
-1243=>'L',
-1244=>'L',
-1245=>'L',
-1246=>'L',
-1247=>'L',
-1248=>'L',
-1249=>'L',
-1250=>'L',
-1251=>'L',
-1252=>'L',
-1253=>'L',
-1254=>'L',
-1255=>'L',
-1256=>'L',
-1257=>'L',
-1258=>'L',
-1259=>'L',
-1260=>'L',
-1261=>'L',
-1262=>'L',
-1263=>'L',
-1264=>'L',
-1265=>'L',
-1266=>'L',
-1267=>'L',
-1268=>'L',
-1269=>'L',
-1270=>'L',
-1271=>'L',
-1272=>'L',
-1273=>'L',
-1274=>'L',
-1275=>'L',
-1276=>'L',
-1277=>'L',
-1278=>'L',
-1279=>'L',
-1280=>'L',
-1281=>'L',
-1282=>'L',
-1283=>'L',
-1284=>'L',
-1285=>'L',
-1286=>'L',
-1287=>'L',
-1288=>'L',
-1289=>'L',
-1290=>'L',
-1291=>'L',
-1292=>'L',
-1293=>'L',
-1294=>'L',
-1295=>'L',
-1296=>'L',
-1297=>'L',
-1298=>'L',
-1299=>'L',
-1329=>'L',
-1330=>'L',
-1331=>'L',
-1332=>'L',
-1333=>'L',
-1334=>'L',
-1335=>'L',
-1336=>'L',
-1337=>'L',
-1338=>'L',
-1339=>'L',
-1340=>'L',
-1341=>'L',
-1342=>'L',
-1343=>'L',
-1344=>'L',
-1345=>'L',
-1346=>'L',
-1347=>'L',
-1348=>'L',
-1349=>'L',
-1350=>'L',
-1351=>'L',
-1352=>'L',
-1353=>'L',
-1354=>'L',
-1355=>'L',
-1356=>'L',
-1357=>'L',
-1358=>'L',
-1359=>'L',
-1360=>'L',
-1361=>'L',
-1362=>'L',
-1363=>'L',
-1364=>'L',
-1365=>'L',
-1366=>'L',
-1369=>'L',
-1370=>'L',
-1371=>'L',
-1372=>'L',
-1373=>'L',
-1374=>'L',
-1375=>'L',
-1377=>'L',
-1378=>'L',
-1379=>'L',
-1380=>'L',
-1381=>'L',
-1382=>'L',
-1383=>'L',
-1384=>'L',
-1385=>'L',
-1386=>'L',
-1387=>'L',
-1388=>'L',
-1389=>'L',
-1390=>'L',
-1391=>'L',
-1392=>'L',
-1393=>'L',
-1394=>'L',
-1395=>'L',
-1396=>'L',
-1397=>'L',
-1398=>'L',
-1399=>'L',
-1400=>'L',
-1401=>'L',
-1402=>'L',
-1403=>'L',
-1404=>'L',
-1405=>'L',
-1406=>'L',
-1407=>'L',
-1408=>'L',
-1409=>'L',
-1410=>'L',
-1411=>'L',
-1412=>'L',
-1413=>'L',
-1414=>'L',
-1415=>'L',
-1417=>'L',
-1418=>'ON',
-1425=>'NSM',
-1426=>'NSM',
-1427=>'NSM',
-1428=>'NSM',
-1429=>'NSM',
-1430=>'NSM',
-1431=>'NSM',
-1432=>'NSM',
-1433=>'NSM',
-1434=>'NSM',
-1435=>'NSM',
-1436=>'NSM',
-1437=>'NSM',
-1438=>'NSM',
-1439=>'NSM',
-1440=>'NSM',
-1441=>'NSM',
-1442=>'NSM',
-1443=>'NSM',
-1444=>'NSM',
-1445=>'NSM',
-1446=>'NSM',
-1447=>'NSM',
-1448=>'NSM',
-1449=>'NSM',
-1450=>'NSM',
-1451=>'NSM',
-1452=>'NSM',
-1453=>'NSM',
-1454=>'NSM',
-1455=>'NSM',
-1456=>'NSM',
-1457=>'NSM',
-1458=>'NSM',
-1459=>'NSM',
-1460=>'NSM',
-1461=>'NSM',
-1462=>'NSM',
-1463=>'NSM',
-1464=>'NSM',
-1465=>'NSM',
-1466=>'NSM',
-1467=>'NSM',
-1468=>'NSM',
-1469=>'NSM',
-1470=>'R',
-1471=>'NSM',
-1472=>'R',
-1473=>'NSM',
-1474=>'NSM',
-1475=>'R',
-1476=>'NSM',
-1477=>'NSM',
-1478=>'R',
-1479=>'NSM',
-1488=>'R',
-1489=>'R',
-1490=>'R',
-1491=>'R',
-1492=>'R',
-1493=>'R',
-1494=>'R',
-1495=>'R',
-1496=>'R',
-1497=>'R',
-1498=>'R',
-1499=>'R',
-1500=>'R',
-1501=>'R',
-1502=>'R',
-1503=>'R',
-1504=>'R',
-1505=>'R',
-1506=>'R',
-1507=>'R',
-1508=>'R',
-1509=>'R',
-1510=>'R',
-1511=>'R',
-1512=>'R',
-1513=>'R',
-1514=>'R',
-1520=>'R',
-1521=>'R',
-1522=>'R',
-1523=>'R',
-1524=>'R',
-1536=>'AL',
-1537=>'AL',
-1538=>'AL',
-1539=>'AL',
-1547=>'AL',
-1548=>'CS',
-1549=>'AL',
-1550=>'ON',
-1551=>'ON',
-1552=>'NSM',
-1553=>'NSM',
-1554=>'NSM',
-1555=>'NSM',
-1556=>'NSM',
-1557=>'NSM',
-1563=>'AL',
-1566=>'AL',
-1567=>'AL',
-1569=>'AL',
-1570=>'AL',
-1571=>'AL',
-1572=>'AL',
-1573=>'AL',
-1574=>'AL',
-1575=>'AL',
-1576=>'AL',
-1577=>'AL',
-1578=>'AL',
-1579=>'AL',
-1580=>'AL',
-1581=>'AL',
-1582=>'AL',
-1583=>'AL',
-1584=>'AL',
-1585=>'AL',
-1586=>'AL',
-1587=>'AL',
-1588=>'AL',
-1589=>'AL',
-1590=>'AL',
-1591=>'AL',
-1592=>'AL',
-1593=>'AL',
-1594=>'AL',
-1600=>'AL',
-1601=>'AL',
-1602=>'AL',
-1603=>'AL',
-1604=>'AL',
-1605=>'AL',
-1606=>'AL',
-1607=>'AL',
-1608=>'AL',
-1609=>'AL',
-1610=>'AL',
-1611=>'NSM',
-1612=>'NSM',
-1613=>'NSM',
-1614=>'NSM',
-1615=>'NSM',
-1616=>'NSM',
-1617=>'NSM',
-1618=>'NSM',
-1619=>'NSM',
-1620=>'NSM',
-1621=>'NSM',
-1622=>'NSM',
-1623=>'NSM',
-1624=>'NSM',
-1625=>'NSM',
-1626=>'NSM',
-1627=>'NSM',
-1628=>'NSM',
-1629=>'NSM',
-1630=>'NSM',
-1632=>'AN',
-1633=>'AN',
-1634=>'AN',
-1635=>'AN',
-1636=>'AN',
-1637=>'AN',
-1638=>'AN',
-1639=>'AN',
-1640=>'AN',
-1641=>'AN',
-1642=>'ET',
-1643=>'AN',
-1644=>'AN',
-1645=>'AL',
-1646=>'AL',
-1647=>'AL',
-1648=>'NSM',
-1649=>'AL',
-1650=>'AL',
-1651=>'AL',
-1652=>'AL',
-1653=>'AL',
-1654=>'AL',
-1655=>'AL',
-1656=>'AL',
-1657=>'AL',
-1658=>'AL',
-1659=>'AL',
-1660=>'AL',
-1661=>'AL',
-1662=>'AL',
-1663=>'AL',
-1664=>'AL',
-1665=>'AL',
-1666=>'AL',
-1667=>'AL',
-1668=>'AL',
-1669=>'AL',
-1670=>'AL',
-1671=>'AL',
-1672=>'AL',
-1673=>'AL',
-1674=>'AL',
-1675=>'AL',
-1676=>'AL',
-1677=>'AL',
-1678=>'AL',
-1679=>'AL',
-1680=>'AL',
-1681=>'AL',
-1682=>'AL',
-1683=>'AL',
-1684=>'AL',
-1685=>'AL',
-1686=>'AL',
-1687=>'AL',
-1688=>'AL',
-1689=>'AL',
-1690=>'AL',
-1691=>'AL',
-1692=>'AL',
-1693=>'AL',
-1694=>'AL',
-1695=>'AL',
-1696=>'AL',
-1697=>'AL',
-1698=>'AL',
-1699=>'AL',
-1700=>'AL',
-1701=>'AL',
-1702=>'AL',
-1703=>'AL',
-1704=>'AL',
-1705=>'AL',
-1706=>'AL',
-1707=>'AL',
-1708=>'AL',
-1709=>'AL',
-1710=>'AL',
-1711=>'AL',
-1712=>'AL',
-1713=>'AL',
-1714=>'AL',
-1715=>'AL',
-1716=>'AL',
-1717=>'AL',
-1718=>'AL',
-1719=>'AL',
-1720=>'AL',
-1721=>'AL',
-1722=>'AL',
-1723=>'AL',
-1724=>'AL',
-1725=>'AL',
-1726=>'AL',
-1727=>'AL',
-1728=>'AL',
-1729=>'AL',
-1730=>'AL',
-1731=>'AL',
-1732=>'AL',
-1733=>'AL',
-1734=>'AL',
-1735=>'AL',
-1736=>'AL',
-1737=>'AL',
-1738=>'AL',
-1739=>'AL',
-1740=>'AL',
-1741=>'AL',
-1742=>'AL',
-1743=>'AL',
-1744=>'AL',
-1745=>'AL',
-1746=>'AL',
-1747=>'AL',
-1748=>'AL',
-1749=>'AL',
-1750=>'NSM',
-1751=>'NSM',
-1752=>'NSM',
-1753=>'NSM',
-1754=>'NSM',
-1755=>'NSM',
-1756=>'NSM',
-1757=>'AL',
-1758=>'NSM',
-1759=>'NSM',
-1760=>'NSM',
-1761=>'NSM',
-1762=>'NSM',
-1763=>'NSM',
-1764=>'NSM',
-1765=>'AL',
-1766=>'AL',
-1767=>'NSM',
-1768=>'NSM',
-1769=>'ON',
-1770=>'NSM',
-1771=>'NSM',
-1772=>'NSM',
-1773=>'NSM',
-1774=>'AL',
-1775=>'AL',
-1776=>'EN',
-1777=>'EN',
-1778=>'EN',
-1779=>'EN',
-1780=>'EN',
-1781=>'EN',
-1782=>'EN',
-1783=>'EN',
-1784=>'EN',
-1785=>'EN',
-1786=>'AL',
-1787=>'AL',
-1788=>'AL',
-1789=>'AL',
-1790=>'AL',
-1791=>'AL',
-1792=>'AL',
-1793=>'AL',
-1794=>'AL',
-1795=>'AL',
-1796=>'AL',
-1797=>'AL',
-1798=>'AL',
-1799=>'AL',
-1800=>'AL',
-1801=>'AL',
-1802=>'AL',
-1803=>'AL',
-1804=>'AL',
-1805=>'AL',
-1807=>'BN',
-1808=>'AL',
-1809=>'NSM',
-1810=>'AL',
-1811=>'AL',
-1812=>'AL',
-1813=>'AL',
-1814=>'AL',
-1815=>'AL',
-1816=>'AL',
-1817=>'AL',
-1818=>'AL',
-1819=>'AL',
-1820=>'AL',
-1821=>'AL',
-1822=>'AL',
-1823=>'AL',
-1824=>'AL',
-1825=>'AL',
-1826=>'AL',
-1827=>'AL',
-1828=>'AL',
-1829=>'AL',
-1830=>'AL',
-1831=>'AL',
-1832=>'AL',
-1833=>'AL',
-1834=>'AL',
-1835=>'AL',
-1836=>'AL',
-1837=>'AL',
-1838=>'AL',
-1839=>'AL',
-1840=>'NSM',
-1841=>'NSM',
-1842=>'NSM',
-1843=>'NSM',
-1844=>'NSM',
-1845=>'NSM',
-1846=>'NSM',
-1847=>'NSM',
-1848=>'NSM',
-1849=>'NSM',
-1850=>'NSM',
-1851=>'NSM',
-1852=>'NSM',
-1853=>'NSM',
-1854=>'NSM',
-1855=>'NSM',
-1856=>'NSM',
-1857=>'NSM',
-1858=>'NSM',
-1859=>'NSM',
-1860=>'NSM',
-1861=>'NSM',
-1862=>'NSM',
-1863=>'NSM',
-1864=>'NSM',
-1865=>'NSM',
-1866=>'NSM',
-1869=>'AL',
-1870=>'AL',
-1871=>'AL',
-1872=>'AL',
-1873=>'AL',
-1874=>'AL',
-1875=>'AL',
-1876=>'AL',
-1877=>'AL',
-1878=>'AL',
-1879=>'AL',
-1880=>'AL',
-1881=>'AL',
-1882=>'AL',
-1883=>'AL',
-1884=>'AL',
-1885=>'AL',
-1886=>'AL',
-1887=>'AL',
-1888=>'AL',
-1889=>'AL',
-1890=>'AL',
-1891=>'AL',
-1892=>'AL',
-1893=>'AL',
-1894=>'AL',
-1895=>'AL',
-1896=>'AL',
-1897=>'AL',
-1898=>'AL',
-1899=>'AL',
-1900=>'AL',
-1901=>'AL',
-1920=>'AL',
-1921=>'AL',
-1922=>'AL',
-1923=>'AL',
-1924=>'AL',
-1925=>'AL',
-1926=>'AL',
-1927=>'AL',
-1928=>'AL',
-1929=>'AL',
-1930=>'AL',
-1931=>'AL',
-1932=>'AL',
-1933=>'AL',
-1934=>'AL',
-1935=>'AL',
-1936=>'AL',
-1937=>'AL',
-1938=>'AL',
-1939=>'AL',
-1940=>'AL',
-1941=>'AL',
-1942=>'AL',
-1943=>'AL',
-1944=>'AL',
-1945=>'AL',
-1946=>'AL',
-1947=>'AL',
-1948=>'AL',
-1949=>'AL',
-1950=>'AL',
-1951=>'AL',
-1952=>'AL',
-1953=>'AL',
-1954=>'AL',
-1955=>'AL',
-1956=>'AL',
-1957=>'AL',
-1958=>'NSM',
-1959=>'NSM',
-1960=>'NSM',
-1961=>'NSM',
-1962=>'NSM',
-1963=>'NSM',
-1964=>'NSM',
-1965=>'NSM',
-1966=>'NSM',
-1967=>'NSM',
-1968=>'NSM',
-1969=>'AL',
-1984=>'R',
-1985=>'R',
-1986=>'R',
-1987=>'R',
-1988=>'R',
-1989=>'R',
-1990=>'R',
-1991=>'R',
-1992=>'R',
-1993=>'R',
-1994=>'R',
-1995=>'R',
-1996=>'R',
-1997=>'R',
-1998=>'R',
-1999=>'R',
-2000=>'R',
-2001=>'R',
-2002=>'R',
-2003=>'R',
-2004=>'R',
-2005=>'R',
-2006=>'R',
-2007=>'R',
-2008=>'R',
-2009=>'R',
-2010=>'R',
-2011=>'R',
-2012=>'R',
-2013=>'R',
-2014=>'R',
-2015=>'R',
-2016=>'R',
-2017=>'R',
-2018=>'R',
-2019=>'R',
-2020=>'R',
-2021=>'R',
-2022=>'R',
-2023=>'R',
-2024=>'R',
-2025=>'R',
-2026=>'R',
-2027=>'NSM',
-2028=>'NSM',
-2029=>'NSM',
-2030=>'NSM',
-2031=>'NSM',
-2032=>'NSM',
-2033=>'NSM',
-2034=>'NSM',
-2035=>'NSM',
-2036=>'R',
-2037=>'R',
-2038=>'ON',
-2039=>'ON',
-2040=>'ON',
-2041=>'ON',
-2042=>'R',
-2305=>'NSM',
-2306=>'NSM',
-2307=>'L',
-2308=>'L',
-2309=>'L',
-2310=>'L',
-2311=>'L',
-2312=>'L',
-2313=>'L',
-2314=>'L',
-2315=>'L',
-2316=>'L',
-2317=>'L',
-2318=>'L',
-2319=>'L',
-2320=>'L',
-2321=>'L',
-2322=>'L',
-2323=>'L',
-2324=>'L',
-2325=>'L',
-2326=>'L',
-2327=>'L',
-2328=>'L',
-2329=>'L',
-2330=>'L',
-2331=>'L',
-2332=>'L',
-2333=>'L',
-2334=>'L',
-2335=>'L',
-2336=>'L',
-2337=>'L',
-2338=>'L',
-2339=>'L',
-2340=>'L',
-2341=>'L',
-2342=>'L',
-2343=>'L',
-2344=>'L',
-2345=>'L',
-2346=>'L',
-2347=>'L',
-2348=>'L',
-2349=>'L',
-2350=>'L',
-2351=>'L',
-2352=>'L',
-2353=>'L',
-2354=>'L',
-2355=>'L',
-2356=>'L',
-2357=>'L',
-2358=>'L',
-2359=>'L',
-2360=>'L',
-2361=>'L',
-2364=>'NSM',
-2365=>'L',
-2366=>'L',
-2367=>'L',
-2368=>'L',
-2369=>'NSM',
-2370=>'NSM',
-2371=>'NSM',
-2372=>'NSM',
-2373=>'NSM',
-2374=>'NSM',
-2375=>'NSM',
-2376=>'NSM',
-2377=>'L',
-2378=>'L',
-2379=>'L',
-2380=>'L',
-2381=>'NSM',
-2384=>'L',
-2385=>'NSM',
-2386=>'NSM',
-2387=>'NSM',
-2388=>'NSM',
-2392=>'L',
-2393=>'L',
-2394=>'L',
-2395=>'L',
-2396=>'L',
-2397=>'L',
-2398=>'L',
-2399=>'L',
-2400=>'L',
-2401=>'L',
-2402=>'NSM',
-2403=>'NSM',
-2404=>'L',
-2405=>'L',
-2406=>'L',
-2407=>'L',
-2408=>'L',
-2409=>'L',
-2410=>'L',
-2411=>'L',
-2412=>'L',
-2413=>'L',
-2414=>'L',
-2415=>'L',
-2416=>'L',
-2427=>'L',
-2428=>'L',
-2429=>'L',
-2430=>'L',
-2431=>'L',
-2433=>'NSM',
-2434=>'L',
-2435=>'L',
-2437=>'L',
-2438=>'L',
-2439=>'L',
-2440=>'L',
-2441=>'L',
-2442=>'L',
-2443=>'L',
-2444=>'L',
-2447=>'L',
-2448=>'L',
-2451=>'L',
-2452=>'L',
-2453=>'L',
-2454=>'L',
-2455=>'L',
-2456=>'L',
-2457=>'L',
-2458=>'L',
-2459=>'L',
-2460=>'L',
-2461=>'L',
-2462=>'L',
-2463=>'L',
-2464=>'L',
-2465=>'L',
-2466=>'L',
-2467=>'L',
-2468=>'L',
-2469=>'L',
-2470=>'L',
-2471=>'L',
-2472=>'L',
-2474=>'L',
-2475=>'L',
-2476=>'L',
-2477=>'L',
-2478=>'L',
-2479=>'L',
-2480=>'L',
-2482=>'L',
-2486=>'L',
-2487=>'L',
-2488=>'L',
-2489=>'L',
-2492=>'NSM',
-2493=>'L',
-2494=>'L',
-2495=>'L',
-2496=>'L',
-2497=>'NSM',
-2498=>'NSM',
-2499=>'NSM',
-2500=>'NSM',
-2503=>'L',
-2504=>'L',
-2507=>'L',
-2508=>'L',
-2509=>'NSM',
-2510=>'L',
-2519=>'L',
-2524=>'L',
-2525=>'L',
-2527=>'L',
-2528=>'L',
-2529=>'L',
-2530=>'NSM',
-2531=>'NSM',
-2534=>'L',
-2535=>'L',
-2536=>'L',
-2537=>'L',
-2538=>'L',
-2539=>'L',
-2540=>'L',
-2541=>'L',
-2542=>'L',
-2543=>'L',
-2544=>'L',
-2545=>'L',
-2546=>'ET',
-2547=>'ET',
-2548=>'L',
-2549=>'L',
-2550=>'L',
-2551=>'L',
-2552=>'L',
-2553=>'L',
-2554=>'L',
-2561=>'NSM',
-2562=>'NSM',
-2563=>'L',
-2565=>'L',
-2566=>'L',
-2567=>'L',
-2568=>'L',
-2569=>'L',
-2570=>'L',
-2575=>'L',
-2576=>'L',
-2579=>'L',
-2580=>'L',
-2581=>'L',
-2582=>'L',
-2583=>'L',
-2584=>'L',
-2585=>'L',
-2586=>'L',
-2587=>'L',
-2588=>'L',
-2589=>'L',
-2590=>'L',
-2591=>'L',
-2592=>'L',
-2593=>'L',
-2594=>'L',
-2595=>'L',
-2596=>'L',
-2597=>'L',
-2598=>'L',
-2599=>'L',
-2600=>'L',
-2602=>'L',
-2603=>'L',
-2604=>'L',
-2605=>'L',
-2606=>'L',
-2607=>'L',
-2608=>'L',
-2610=>'L',
-2611=>'L',
-2613=>'L',
-2614=>'L',
-2616=>'L',
-2617=>'L',
-2620=>'NSM',
-2622=>'L',
-2623=>'L',
-2624=>'L',
-2625=>'NSM',
-2626=>'NSM',
-2631=>'NSM',
-2632=>'NSM',
-2635=>'NSM',
-2636=>'NSM',
-2637=>'NSM',
-2649=>'L',
-2650=>'L',
-2651=>'L',
-2652=>'L',
-2654=>'L',
-2662=>'L',
-2663=>'L',
-2664=>'L',
-2665=>'L',
-2666=>'L',
-2667=>'L',
-2668=>'L',
-2669=>'L',
-2670=>'L',
-2671=>'L',
-2672=>'NSM',
-2673=>'NSM',
-2674=>'L',
-2675=>'L',
-2676=>'L',
-2689=>'NSM',
-2690=>'NSM',
-2691=>'L',
-2693=>'L',
-2694=>'L',
-2695=>'L',
-2696=>'L',
-2697=>'L',
-2698=>'L',
-2699=>'L',
-2700=>'L',
-2701=>'L',
-2703=>'L',
-2704=>'L',
-2705=>'L',
-2707=>'L',
-2708=>'L',
-2709=>'L',
-2710=>'L',
-2711=>'L',
-2712=>'L',
-2713=>'L',
-2714=>'L',
-2715=>'L',
-2716=>'L',
-2717=>'L',
-2718=>'L',
-2719=>'L',
-2720=>'L',
-2721=>'L',
-2722=>'L',
-2723=>'L',
-2724=>'L',
-2725=>'L',
-2726=>'L',
-2727=>'L',
-2728=>'L',
-2730=>'L',
-2731=>'L',
-2732=>'L',
-2733=>'L',
-2734=>'L',
-2735=>'L',
-2736=>'L',
-2738=>'L',
-2739=>'L',
-2741=>'L',
-2742=>'L',
-2743=>'L',
-2744=>'L',
-2745=>'L',
-2748=>'NSM',
-2749=>'L',
-2750=>'L',
-2751=>'L',
-2752=>'L',
-2753=>'NSM',
-2754=>'NSM',
-2755=>'NSM',
-2756=>'NSM',
-2757=>'NSM',
-2759=>'NSM',
-2760=>'NSM',
-2761=>'L',
-2763=>'L',
-2764=>'L',
-2765=>'NSM',
-2768=>'L',
-2784=>'L',
-2785=>'L',
-2786=>'NSM',
-2787=>'NSM',
-2790=>'L',
-2791=>'L',
-2792=>'L',
-2793=>'L',
-2794=>'L',
-2795=>'L',
-2796=>'L',
-2797=>'L',
-2798=>'L',
-2799=>'L',
-2801=>'ET',
-2817=>'NSM',
-2818=>'L',
-2819=>'L',
-2821=>'L',
-2822=>'L',
-2823=>'L',
-2824=>'L',
-2825=>'L',
-2826=>'L',
-2827=>'L',
-2828=>'L',
-2831=>'L',
-2832=>'L',
-2835=>'L',
-2836=>'L',
-2837=>'L',
-2838=>'L',
-2839=>'L',
-2840=>'L',
-2841=>'L',
-2842=>'L',
-2843=>'L',
-2844=>'L',
-2845=>'L',
-2846=>'L',
-2847=>'L',
-2848=>'L',
-2849=>'L',
-2850=>'L',
-2851=>'L',
-2852=>'L',
-2853=>'L',
-2854=>'L',
-2855=>'L',
-2856=>'L',
-2858=>'L',
-2859=>'L',
-2860=>'L',
-2861=>'L',
-2862=>'L',
-2863=>'L',
-2864=>'L',
-2866=>'L',
-2867=>'L',
-2869=>'L',
-2870=>'L',
-2871=>'L',
-2872=>'L',
-2873=>'L',
-2876=>'NSM',
-2877=>'L',
-2878=>'L',
-2879=>'NSM',
-2880=>'L',
-2881=>'NSM',
-2882=>'NSM',
-2883=>'NSM',
-2887=>'L',
-2888=>'L',
-2891=>'L',
-2892=>'L',
-2893=>'NSM',
-2902=>'NSM',
-2903=>'L',
-2908=>'L',
-2909=>'L',
-2911=>'L',
-2912=>'L',
-2913=>'L',
-2918=>'L',
-2919=>'L',
-2920=>'L',
-2921=>'L',
-2922=>'L',
-2923=>'L',
-2924=>'L',
-2925=>'L',
-2926=>'L',
-2927=>'L',
-2928=>'L',
-2929=>'L',
-2946=>'NSM',
-2947=>'L',
-2949=>'L',
-2950=>'L',
-2951=>'L',
-2952=>'L',
-2953=>'L',
-2954=>'L',
-2958=>'L',
-2959=>'L',
-2960=>'L',
-2962=>'L',
-2963=>'L',
-2964=>'L',
-2965=>'L',
-2969=>'L',
-2970=>'L',
-2972=>'L',
-2974=>'L',
-2975=>'L',
-2979=>'L',
-2980=>'L',
-2984=>'L',
-2985=>'L',
-2986=>'L',
-2990=>'L',
-2991=>'L',
-2992=>'L',
-2993=>'L',
-2994=>'L',
-2995=>'L',
-2996=>'L',
-2997=>'L',
-2998=>'L',
-2999=>'L',
-3000=>'L',
-3001=>'L',
-3006=>'L',
-3007=>'L',
-3008=>'NSM',
-3009=>'L',
-3010=>'L',
-3014=>'L',
-3015=>'L',
-3016=>'L',
-3018=>'L',
-3019=>'L',
-3020=>'L',
-3021=>'NSM',
-3031=>'L',
-3046=>'L',
-3047=>'L',
-3048=>'L',
-3049=>'L',
-3050=>'L',
-3051=>'L',
-3052=>'L',
-3053=>'L',
-3054=>'L',
-3055=>'L',
-3056=>'L',
-3057=>'L',
-3058=>'L',
-3059=>'ON',
-3060=>'ON',
-3061=>'ON',
-3062=>'ON',
-3063=>'ON',
-3064=>'ON',
-3065=>'ET',
-3066=>'ON',
-3073=>'L',
-3074=>'L',
-3075=>'L',
-3077=>'L',
-3078=>'L',
-3079=>'L',
-3080=>'L',
-3081=>'L',
-3082=>'L',
-3083=>'L',
-3084=>'L',
-3086=>'L',
-3087=>'L',
-3088=>'L',
-3090=>'L',
-3091=>'L',
-3092=>'L',
-3093=>'L',
-3094=>'L',
-3095=>'L',
-3096=>'L',
-3097=>'L',
-3098=>'L',
-3099=>'L',
-3100=>'L',
-3101=>'L',
-3102=>'L',
-3103=>'L',
-3104=>'L',
-3105=>'L',
-3106=>'L',
-3107=>'L',
-3108=>'L',
-3109=>'L',
-3110=>'L',
-3111=>'L',
-3112=>'L',
-3114=>'L',
-3115=>'L',
-3116=>'L',
-3117=>'L',
-3118=>'L',
-3119=>'L',
-3120=>'L',
-3121=>'L',
-3122=>'L',
-3123=>'L',
-3125=>'L',
-3126=>'L',
-3127=>'L',
-3128=>'L',
-3129=>'L',
-3134=>'NSM',
-3135=>'NSM',
-3136=>'NSM',
-3137=>'L',
-3138=>'L',
-3139=>'L',
-3140=>'L',
-3142=>'NSM',
-3143=>'NSM',
-3144=>'NSM',
-3146=>'NSM',
-3147=>'NSM',
-3148=>'NSM',
-3149=>'NSM',
-3157=>'NSM',
-3158=>'NSM',
-3168=>'L',
-3169=>'L',
-3174=>'L',
-3175=>'L',
-3176=>'L',
-3177=>'L',
-3178=>'L',
-3179=>'L',
-3180=>'L',
-3181=>'L',
-3182=>'L',
-3183=>'L',
-3202=>'L',
-3203=>'L',
-3205=>'L',
-3206=>'L',
-3207=>'L',
-3208=>'L',
-3209=>'L',
-3210=>'L',
-3211=>'L',
-3212=>'L',
-3214=>'L',
-3215=>'L',
-3216=>'L',
-3218=>'L',
-3219=>'L',
-3220=>'L',
-3221=>'L',
-3222=>'L',
-3223=>'L',
-3224=>'L',
-3225=>'L',
-3226=>'L',
-3227=>'L',
-3228=>'L',
-3229=>'L',
-3230=>'L',
-3231=>'L',
-3232=>'L',
-3233=>'L',
-3234=>'L',
-3235=>'L',
-3236=>'L',
-3237=>'L',
-3238=>'L',
-3239=>'L',
-3240=>'L',
-3242=>'L',
-3243=>'L',
-3244=>'L',
-3245=>'L',
-3246=>'L',
-3247=>'L',
-3248=>'L',
-3249=>'L',
-3250=>'L',
-3251=>'L',
-3253=>'L',
-3254=>'L',
-3255=>'L',
-3256=>'L',
-3257=>'L',
-3260=>'NSM',
-3261=>'L',
-3262=>'L',
-3263=>'L',
-3264=>'L',
-3265=>'L',
-3266=>'L',
-3267=>'L',
-3268=>'L',
-3270=>'L',
-3271=>'L',
-3272=>'L',
-3274=>'L',
-3275=>'L',
-3276=>'NSM',
-3277=>'NSM',
-3285=>'L',
-3286=>'L',
-3294=>'L',
-3296=>'L',
-3297=>'L',
-3298=>'NSM',
-3299=>'NSM',
-3302=>'L',
-3303=>'L',
-3304=>'L',
-3305=>'L',
-3306=>'L',
-3307=>'L',
-3308=>'L',
-3309=>'L',
-3310=>'L',
-3311=>'L',
-3313=>'ON',
-3314=>'ON',
-3330=>'L',
-3331=>'L',
-3333=>'L',
-3334=>'L',
-3335=>'L',
-3336=>'L',
-3337=>'L',
-3338=>'L',
-3339=>'L',
-3340=>'L',
-3342=>'L',
-3343=>'L',
-3344=>'L',
-3346=>'L',
-3347=>'L',
-3348=>'L',
-3349=>'L',
-3350=>'L',
-3351=>'L',
-3352=>'L',
-3353=>'L',
-3354=>'L',
-3355=>'L',
-3356=>'L',
-3357=>'L',
-3358=>'L',
-3359=>'L',
-3360=>'L',
-3361=>'L',
-3362=>'L',
-3363=>'L',
-3364=>'L',
-3365=>'L',
-3366=>'L',
-3367=>'L',
-3368=>'L',
-3370=>'L',
-3371=>'L',
-3372=>'L',
-3373=>'L',
-3374=>'L',
-3375=>'L',
-3376=>'L',
-3377=>'L',
-3378=>'L',
-3379=>'L',
-3380=>'L',
-3381=>'L',
-3382=>'L',
-3383=>'L',
-3384=>'L',
-3385=>'L',
-3390=>'L',
-3391=>'L',
-3392=>'L',
-3393=>'NSM',
-3394=>'NSM',
-3395=>'NSM',
-3398=>'L',
-3399=>'L',
-3400=>'L',
-3402=>'L',
-3403=>'L',
-3404=>'L',
-3405=>'NSM',
-3415=>'L',
-3424=>'L',
-3425=>'L',
-3430=>'L',
-3431=>'L',
-3432=>'L',
-3433=>'L',
-3434=>'L',
-3435=>'L',
-3436=>'L',
-3437=>'L',
-3438=>'L',
-3439=>'L',
-3458=>'L',
-3459=>'L',
-3461=>'L',
-3462=>'L',
-3463=>'L',
-3464=>'L',
-3465=>'L',
-3466=>'L',
-3467=>'L',
-3468=>'L',
-3469=>'L',
-3470=>'L',
-3471=>'L',
-3472=>'L',
-3473=>'L',
-3474=>'L',
-3475=>'L',
-3476=>'L',
-3477=>'L',
-3478=>'L',
-3482=>'L',
-3483=>'L',
-3484=>'L',
-3485=>'L',
-3486=>'L',
-3487=>'L',
-3488=>'L',
-3489=>'L',
-3490=>'L',
-3491=>'L',
-3492=>'L',
-3493=>'L',
-3494=>'L',
-3495=>'L',
-3496=>'L',
-3497=>'L',
-3498=>'L',
-3499=>'L',
-3500=>'L',
-3501=>'L',
-3502=>'L',
-3503=>'L',
-3504=>'L',
-3505=>'L',
-3507=>'L',
-3508=>'L',
-3509=>'L',
-3510=>'L',
-3511=>'L',
-3512=>'L',
-3513=>'L',
-3514=>'L',
-3515=>'L',
-3517=>'L',
-3520=>'L',
-3521=>'L',
-3522=>'L',
-3523=>'L',
-3524=>'L',
-3525=>'L',
-3526=>'L',
-3530=>'NSM',
-3535=>'L',
-3536=>'L',
-3537=>'L',
-3538=>'NSM',
-3539=>'NSM',
-3540=>'NSM',
-3542=>'NSM',
-3544=>'L',
-3545=>'L',
-3546=>'L',
-3547=>'L',
-3548=>'L',
-3549=>'L',
-3550=>'L',
-3551=>'L',
-3570=>'L',
-3571=>'L',
-3572=>'L',
-3585=>'L',
-3586=>'L',
-3587=>'L',
-3588=>'L',
-3589=>'L',
-3590=>'L',
-3591=>'L',
-3592=>'L',
-3593=>'L',
-3594=>'L',
-3595=>'L',
-3596=>'L',
-3597=>'L',
-3598=>'L',
-3599=>'L',
-3600=>'L',
-3601=>'L',
-3602=>'L',
-3603=>'L',
-3604=>'L',
-3605=>'L',
-3606=>'L',
-3607=>'L',
-3608=>'L',
-3609=>'L',
-3610=>'L',
-3611=>'L',
-3612=>'L',
-3613=>'L',
-3614=>'L',
-3615=>'L',
-3616=>'L',
-3617=>'L',
-3618=>'L',
-3619=>'L',
-3620=>'L',
-3621=>'L',
-3622=>'L',
-3623=>'L',
-3624=>'L',
-3625=>'L',
-3626=>'L',
-3627=>'L',
-3628=>'L',
-3629=>'L',
-3630=>'L',
-3631=>'L',
-3632=>'L',
-3633=>'NSM',
-3634=>'L',
-3635=>'L',
-3636=>'NSM',
-3637=>'NSM',
-3638=>'NSM',
-3639=>'NSM',
-3640=>'NSM',
-3641=>'NSM',
-3642=>'NSM',
-3647=>'ET',
-3648=>'L',
-3649=>'L',
-3650=>'L',
-3651=>'L',
-3652=>'L',
-3653=>'L',
-3654=>'L',
-3655=>'NSM',
-3656=>'NSM',
-3657=>'NSM',
-3658=>'NSM',
-3659=>'NSM',
-3660=>'NSM',
-3661=>'NSM',
-3662=>'NSM',
-3663=>'L',
-3664=>'L',
-3665=>'L',
-3666=>'L',
-3667=>'L',
-3668=>'L',
-3669=>'L',
-3670=>'L',
-3671=>'L',
-3672=>'L',
-3673=>'L',
-3674=>'L',
-3675=>'L',
-3713=>'L',
-3714=>'L',
-3716=>'L',
-3719=>'L',
-3720=>'L',
-3722=>'L',
-3725=>'L',
-3732=>'L',
-3733=>'L',
-3734=>'L',
-3735=>'L',
-3737=>'L',
-3738=>'L',
-3739=>'L',
-3740=>'L',
-3741=>'L',
-3742=>'L',
-3743=>'L',
-3745=>'L',
-3746=>'L',
-3747=>'L',
-3749=>'L',
-3751=>'L',
-3754=>'L',
-3755=>'L',
-3757=>'L',
-3758=>'L',
-3759=>'L',
-3760=>'L',
-3761=>'NSM',
-3762=>'L',
-3763=>'L',
-3764=>'NSM',
-3765=>'NSM',
-3766=>'NSM',
-3767=>'NSM',
-3768=>'NSM',
-3769=>'NSM',
-3771=>'NSM',
-3772=>'NSM',
-3773=>'L',
-3776=>'L',
-3777=>'L',
-3778=>'L',
-3779=>'L',
-3780=>'L',
-3782=>'L',
-3784=>'NSM',
-3785=>'NSM',
-3786=>'NSM',
-3787=>'NSM',
-3788=>'NSM',
-3789=>'NSM',
-3792=>'L',
-3793=>'L',
-3794=>'L',
-3795=>'L',
-3796=>'L',
-3797=>'L',
-3798=>'L',
-3799=>'L',
-3800=>'L',
-3801=>'L',
-3804=>'L',
-3805=>'L',
-3840=>'L',
-3841=>'L',
-3842=>'L',
-3843=>'L',
-3844=>'L',
-3845=>'L',
-3846=>'L',
-3847=>'L',
-3848=>'L',
-3849=>'L',
-3850=>'L',
-3851=>'L',
-3852=>'L',
-3853=>'L',
-3854=>'L',
-3855=>'L',
-3856=>'L',
-3857=>'L',
-3858=>'L',
-3859=>'L',
-3860=>'L',
-3861=>'L',
-3862=>'L',
-3863=>'L',
-3864=>'NSM',
-3865=>'NSM',
-3866=>'L',
-3867=>'L',
-3868=>'L',
-3869=>'L',
-3870=>'L',
-3871=>'L',
-3872=>'L',
-3873=>'L',
-3874=>'L',
-3875=>'L',
-3876=>'L',
-3877=>'L',
-3878=>'L',
-3879=>'L',
-3880=>'L',
-3881=>'L',
-3882=>'L',
-3883=>'L',
-3884=>'L',
-3885=>'L',
-3886=>'L',
-3887=>'L',
-3888=>'L',
-3889=>'L',
-3890=>'L',
-3891=>'L',
-3892=>'L',
-3893=>'NSM',
-3894=>'L',
-3895=>'NSM',
-3896=>'L',
-3897=>'NSM',
-3898=>'ON',
-3899=>'ON',
-3900=>'ON',
-3901=>'ON',
-3902=>'L',
-3903=>'L',
-3904=>'L',
-3905=>'L',
-3906=>'L',
-3907=>'L',
-3908=>'L',
-3909=>'L',
-3910=>'L',
-3911=>'L',
-3913=>'L',
-3914=>'L',
-3915=>'L',
-3916=>'L',
-3917=>'L',
-3918=>'L',
-3919=>'L',
-3920=>'L',
-3921=>'L',
-3922=>'L',
-3923=>'L',
-3924=>'L',
-3925=>'L',
-3926=>'L',
-3927=>'L',
-3928=>'L',
-3929=>'L',
-3930=>'L',
-3931=>'L',
-3932=>'L',
-3933=>'L',
-3934=>'L',
-3935=>'L',
-3936=>'L',
-3937=>'L',
-3938=>'L',
-3939=>'L',
-3940=>'L',
-3941=>'L',
-3942=>'L',
-3943=>'L',
-3944=>'L',
-3945=>'L',
-3946=>'L',
-3953=>'NSM',
-3954=>'NSM',
-3955=>'NSM',
-3956=>'NSM',
-3957=>'NSM',
-3958=>'NSM',
-3959=>'NSM',
-3960=>'NSM',
-3961=>'NSM',
-3962=>'NSM',
-3963=>'NSM',
-3964=>'NSM',
-3965=>'NSM',
-3966=>'NSM',
-3967=>'L',
-3968=>'NSM',
-3969=>'NSM',
-3970=>'NSM',
-3971=>'NSM',
-3972=>'NSM',
-3973=>'L',
-3974=>'NSM',
-3975=>'NSM',
-3976=>'L',
-3977=>'L',
-3978=>'L',
-3979=>'L',
-3984=>'NSM',
-3985=>'NSM',
-3986=>'NSM',
-3987=>'NSM',
-3988=>'NSM',
-3989=>'NSM',
-3990=>'NSM',
-3991=>'NSM',
-3993=>'NSM',
-3994=>'NSM',
-3995=>'NSM',
-3996=>'NSM',
-3997=>'NSM',
-3998=>'NSM',
-3999=>'NSM',
-4000=>'NSM',
-4001=>'NSM',
-4002=>'NSM',
-4003=>'NSM',
-4004=>'NSM',
-4005=>'NSM',
-4006=>'NSM',
-4007=>'NSM',
-4008=>'NSM',
-4009=>'NSM',
-4010=>'NSM',
-4011=>'NSM',
-4012=>'NSM',
-4013=>'NSM',
-4014=>'NSM',
-4015=>'NSM',
-4016=>'NSM',
-4017=>'NSM',
-4018=>'NSM',
-4019=>'NSM',
-4020=>'NSM',
-4021=>'NSM',
-4022=>'NSM',
-4023=>'NSM',
-4024=>'NSM',
-4025=>'NSM',
-4026=>'NSM',
-4027=>'NSM',
-4028=>'NSM',
-4030=>'L',
-4031=>'L',
-4032=>'L',
-4033=>'L',
-4034=>'L',
-4035=>'L',
-4036=>'L',
-4037=>'L',
-4038=>'NSM',
-4039=>'L',
-4040=>'L',
-4041=>'L',
-4042=>'L',
-4043=>'L',
-4044=>'L',
-4047=>'L',
-4048=>'L',
-4049=>'L',
-4096=>'L',
-4097=>'L',
-4098=>'L',
-4099=>'L',
-4100=>'L',
-4101=>'L',
-4102=>'L',
-4103=>'L',
-4104=>'L',
-4105=>'L',
-4106=>'L',
-4107=>'L',
-4108=>'L',
-4109=>'L',
-4110=>'L',
-4111=>'L',
-4112=>'L',
-4113=>'L',
-4114=>'L',
-4115=>'L',
-4116=>'L',
-4117=>'L',
-4118=>'L',
-4119=>'L',
-4120=>'L',
-4121=>'L',
-4122=>'L',
-4123=>'L',
-4124=>'L',
-4125=>'L',
-4126=>'L',
-4127=>'L',
-4128=>'L',
-4129=>'L',
-4131=>'L',
-4132=>'L',
-4133=>'L',
-4134=>'L',
-4135=>'L',
-4137=>'L',
-4138=>'L',
-4140=>'L',
-4141=>'NSM',
-4142=>'NSM',
-4143=>'NSM',
-4144=>'NSM',
-4145=>'L',
-4146=>'NSM',
-4150=>'NSM',
-4151=>'NSM',
-4152=>'L',
-4153=>'NSM',
-4160=>'L',
-4161=>'L',
-4162=>'L',
-4163=>'L',
-4164=>'L',
-4165=>'L',
-4166=>'L',
-4167=>'L',
-4168=>'L',
-4169=>'L',
-4170=>'L',
-4171=>'L',
-4172=>'L',
-4173=>'L',
-4174=>'L',
-4175=>'L',
-4176=>'L',
-4177=>'L',
-4178=>'L',
-4179=>'L',
-4180=>'L',
-4181=>'L',
-4182=>'L',
-4183=>'L',
-4184=>'NSM',
-4185=>'NSM',
-4256=>'L',
-4257=>'L',
-4258=>'L',
-4259=>'L',
-4260=>'L',
-4261=>'L',
-4262=>'L',
-4263=>'L',
-4264=>'L',
-4265=>'L',
-4266=>'L',
-4267=>'L',
-4268=>'L',
-4269=>'L',
-4270=>'L',
-4271=>'L',
-4272=>'L',
-4273=>'L',
-4274=>'L',
-4275=>'L',
-4276=>'L',
-4277=>'L',
-4278=>'L',
-4279=>'L',
-4280=>'L',
-4281=>'L',
-4282=>'L',
-4283=>'L',
-4284=>'L',
-4285=>'L',
-4286=>'L',
-4287=>'L',
-4288=>'L',
-4289=>'L',
-4290=>'L',
-4291=>'L',
-4292=>'L',
-4293=>'L',
-4304=>'L',
-4305=>'L',
-4306=>'L',
-4307=>'L',
-4308=>'L',
-4309=>'L',
-4310=>'L',
-4311=>'L',
-4312=>'L',
-4313=>'L',
-4314=>'L',
-4315=>'L',
-4316=>'L',
-4317=>'L',
-4318=>'L',
-4319=>'L',
-4320=>'L',
-4321=>'L',
-4322=>'L',
-4323=>'L',
-4324=>'L',
-4325=>'L',
-4326=>'L',
-4327=>'L',
-4328=>'L',
-4329=>'L',
-4330=>'L',
-4331=>'L',
-4332=>'L',
-4333=>'L',
-4334=>'L',
-4335=>'L',
-4336=>'L',
-4337=>'L',
-4338=>'L',
-4339=>'L',
-4340=>'L',
-4341=>'L',
-4342=>'L',
-4343=>'L',
-4344=>'L',
-4345=>'L',
-4346=>'L',
-4347=>'L',
-4348=>'L',
-4352=>'L',
-4353=>'L',
-4354=>'L',
-4355=>'L',
-4356=>'L',
-4357=>'L',
-4358=>'L',
-4359=>'L',
-4360=>'L',
-4361=>'L',
-4362=>'L',
-4363=>'L',
-4364=>'L',
-4365=>'L',
-4366=>'L',
-4367=>'L',
-4368=>'L',
-4369=>'L',
-4370=>'L',
-4371=>'L',
-4372=>'L',
-4373=>'L',
-4374=>'L',
-4375=>'L',
-4376=>'L',
-4377=>'L',
-4378=>'L',
-4379=>'L',
-4380=>'L',
-4381=>'L',
-4382=>'L',
-4383=>'L',
-4384=>'L',
-4385=>'L',
-4386=>'L',
-4387=>'L',
-4388=>'L',
-4389=>'L',
-4390=>'L',
-4391=>'L',
-4392=>'L',
-4393=>'L',
-4394=>'L',
-4395=>'L',
-4396=>'L',
-4397=>'L',
-4398=>'L',
-4399=>'L',
-4400=>'L',
-4401=>'L',
-4402=>'L',
-4403=>'L',
-4404=>'L',
-4405=>'L',
-4406=>'L',
-4407=>'L',
-4408=>'L',
-4409=>'L',
-4410=>'L',
-4411=>'L',
-4412=>'L',
-4413=>'L',
-4414=>'L',
-4415=>'L',
-4416=>'L',
-4417=>'L',
-4418=>'L',
-4419=>'L',
-4420=>'L',
-4421=>'L',
-4422=>'L',
-4423=>'L',
-4424=>'L',
-4425=>'L',
-4426=>'L',
-4427=>'L',
-4428=>'L',
-4429=>'L',
-4430=>'L',
-4431=>'L',
-4432=>'L',
-4433=>'L',
-4434=>'L',
-4435=>'L',
-4436=>'L',
-4437=>'L',
-4438=>'L',
-4439=>'L',
-4440=>'L',
-4441=>'L',
-4447=>'L',
-4448=>'L',
-4449=>'L',
-4450=>'L',
-4451=>'L',
-4452=>'L',
-4453=>'L',
-4454=>'L',
-4455=>'L',
-4456=>'L',
-4457=>'L',
-4458=>'L',
-4459=>'L',
-4460=>'L',
-4461=>'L',
-4462=>'L',
-4463=>'L',
-4464=>'L',
-4465=>'L',
-4466=>'L',
-4467=>'L',
-4468=>'L',
-4469=>'L',
-4470=>'L',
-4471=>'L',
-4472=>'L',
-4473=>'L',
-4474=>'L',
-4475=>'L',
-4476=>'L',
-4477=>'L',
-4478=>'L',
-4479=>'L',
-4480=>'L',
-4481=>'L',
-4482=>'L',
-4483=>'L',
-4484=>'L',
-4485=>'L',
-4486=>'L',
-4487=>'L',
-4488=>'L',
-4489=>'L',
-4490=>'L',
-4491=>'L',
-4492=>'L',
-4493=>'L',
-4494=>'L',
-4495=>'L',
-4496=>'L',
-4497=>'L',
-4498=>'L',
-4499=>'L',
-4500=>'L',
-4501=>'L',
-4502=>'L',
-4503=>'L',
-4504=>'L',
-4505=>'L',
-4506=>'L',
-4507=>'L',
-4508=>'L',
-4509=>'L',
-4510=>'L',
-4511=>'L',
-4512=>'L',
-4513=>'L',
-4514=>'L',
-4520=>'L',
-4521=>'L',
-4522=>'L',
-4523=>'L',
-4524=>'L',
-4525=>'L',
-4526=>'L',
-4527=>'L',
-4528=>'L',
-4529=>'L',
-4530=>'L',
-4531=>'L',
-4532=>'L',
-4533=>'L',
-4534=>'L',
-4535=>'L',
-4536=>'L',
-4537=>'L',
-4538=>'L',
-4539=>'L',
-4540=>'L',
-4541=>'L',
-4542=>'L',
-4543=>'L',
-4544=>'L',
-4545=>'L',
-4546=>'L',
-4547=>'L',
-4548=>'L',
-4549=>'L',
-4550=>'L',
-4551=>'L',
-4552=>'L',
-4553=>'L',
-4554=>'L',
-4555=>'L',
-4556=>'L',
-4557=>'L',
-4558=>'L',
-4559=>'L',
-4560=>'L',
-4561=>'L',
-4562=>'L',
-4563=>'L',
-4564=>'L',
-4565=>'L',
-4566=>'L',
-4567=>'L',
-4568=>'L',
-4569=>'L',
-4570=>'L',
-4571=>'L',
-4572=>'L',
-4573=>'L',
-4574=>'L',
-4575=>'L',
-4576=>'L',
-4577=>'L',
-4578=>'L',
-4579=>'L',
-4580=>'L',
-4581=>'L',
-4582=>'L',
-4583=>'L',
-4584=>'L',
-4585=>'L',
-4586=>'L',
-4587=>'L',
-4588=>'L',
-4589=>'L',
-4590=>'L',
-4591=>'L',
-4592=>'L',
-4593=>'L',
-4594=>'L',
-4595=>'L',
-4596=>'L',
-4597=>'L',
-4598=>'L',
-4599=>'L',
-4600=>'L',
-4601=>'L',
-4608=>'L',
-4609=>'L',
-4610=>'L',
-4611=>'L',
-4612=>'L',
-4613=>'L',
-4614=>'L',
-4615=>'L',
-4616=>'L',
-4617=>'L',
-4618=>'L',
-4619=>'L',
-4620=>'L',
-4621=>'L',
-4622=>'L',
-4623=>'L',
-4624=>'L',
-4625=>'L',
-4626=>'L',
-4627=>'L',
-4628=>'L',
-4629=>'L',
-4630=>'L',
-4631=>'L',
-4632=>'L',
-4633=>'L',
-4634=>'L',
-4635=>'L',
-4636=>'L',
-4637=>'L',
-4638=>'L',
-4639=>'L',
-4640=>'L',
-4641=>'L',
-4642=>'L',
-4643=>'L',
-4644=>'L',
-4645=>'L',
-4646=>'L',
-4647=>'L',
-4648=>'L',
-4649=>'L',
-4650=>'L',
-4651=>'L',
-4652=>'L',
-4653=>'L',
-4654=>'L',
-4655=>'L',
-4656=>'L',
-4657=>'L',
-4658=>'L',
-4659=>'L',
-4660=>'L',
-4661=>'L',
-4662=>'L',
-4663=>'L',
-4664=>'L',
-4665=>'L',
-4666=>'L',
-4667=>'L',
-4668=>'L',
-4669=>'L',
-4670=>'L',
-4671=>'L',
-4672=>'L',
-4673=>'L',
-4674=>'L',
-4675=>'L',
-4676=>'L',
-4677=>'L',
-4678=>'L',
-4679=>'L',
-4680=>'L',
-4682=>'L',
-4683=>'L',
-4684=>'L',
-4685=>'L',
-4688=>'L',
-4689=>'L',
-4690=>'L',
-4691=>'L',
-4692=>'L',
-4693=>'L',
-4694=>'L',
-4696=>'L',
-4698=>'L',
-4699=>'L',
-4700=>'L',
-4701=>'L',
-4704=>'L',
-4705=>'L',
-4706=>'L',
-4707=>'L',
-4708=>'L',
-4709=>'L',
-4710=>'L',
-4711=>'L',
-4712=>'L',
-4713=>'L',
-4714=>'L',
-4715=>'L',
-4716=>'L',
-4717=>'L',
-4718=>'L',
-4719=>'L',
-4720=>'L',
-4721=>'L',
-4722=>'L',
-4723=>'L',
-4724=>'L',
-4725=>'L',
-4726=>'L',
-4727=>'L',
-4728=>'L',
-4729=>'L',
-4730=>'L',
-4731=>'L',
-4732=>'L',
-4733=>'L',
-4734=>'L',
-4735=>'L',
-4736=>'L',
-4737=>'L',
-4738=>'L',
-4739=>'L',
-4740=>'L',
-4741=>'L',
-4742=>'L',
-4743=>'L',
-4744=>'L',
-4746=>'L',
-4747=>'L',
-4748=>'L',
-4749=>'L',
-4752=>'L',
-4753=>'L',
-4754=>'L',
-4755=>'L',
-4756=>'L',
-4757=>'L',
-4758=>'L',
-4759=>'L',
-4760=>'L',
-4761=>'L',
-4762=>'L',
-4763=>'L',
-4764=>'L',
-4765=>'L',
-4766=>'L',
-4767=>'L',
-4768=>'L',
-4769=>'L',
-4770=>'L',
-4771=>'L',
-4772=>'L',
-4773=>'L',
-4774=>'L',
-4775=>'L',
-4776=>'L',
-4777=>'L',
-4778=>'L',
-4779=>'L',
-4780=>'L',
-4781=>'L',
-4782=>'L',
-4783=>'L',
-4784=>'L',
-4786=>'L',
-4787=>'L',
-4788=>'L',
-4789=>'L',
-4792=>'L',
-4793=>'L',
-4794=>'L',
-4795=>'L',
-4796=>'L',
-4797=>'L',
-4798=>'L',
-4800=>'L',
-4802=>'L',
-4803=>'L',
-4804=>'L',
-4805=>'L',
-4808=>'L',
-4809=>'L',
-4810=>'L',
-4811=>'L',
-4812=>'L',
-4813=>'L',
-4814=>'L',
-4815=>'L',
-4816=>'L',
-4817=>'L',
-4818=>'L',
-4819=>'L',
-4820=>'L',
-4821=>'L',
-4822=>'L',
-4824=>'L',
-4825=>'L',
-4826=>'L',
-4827=>'L',
-4828=>'L',
-4829=>'L',
-4830=>'L',
-4831=>'L',
-4832=>'L',
-4833=>'L',
-4834=>'L',
-4835=>'L',
-4836=>'L',
-4837=>'L',
-4838=>'L',
-4839=>'L',
-4840=>'L',
-4841=>'L',
-4842=>'L',
-4843=>'L',
-4844=>'L',
-4845=>'L',
-4846=>'L',
-4847=>'L',
-4848=>'L',
-4849=>'L',
-4850=>'L',
-4851=>'L',
-4852=>'L',
-4853=>'L',
-4854=>'L',
-4855=>'L',
-4856=>'L',
-4857=>'L',
-4858=>'L',
-4859=>'L',
-4860=>'L',
-4861=>'L',
-4862=>'L',
-4863=>'L',
-4864=>'L',
-4865=>'L',
-4866=>'L',
-4867=>'L',
-4868=>'L',
-4869=>'L',
-4870=>'L',
-4871=>'L',
-4872=>'L',
-4873=>'L',
-4874=>'L',
-4875=>'L',
-4876=>'L',
-4877=>'L',
-4878=>'L',
-4879=>'L',
-4880=>'L',
-4882=>'L',
-4883=>'L',
-4884=>'L',
-4885=>'L',
-4888=>'L',
-4889=>'L',
-4890=>'L',
-4891=>'L',
-4892=>'L',
-4893=>'L',
-4894=>'L',
-4895=>'L',
-4896=>'L',
-4897=>'L',
-4898=>'L',
-4899=>'L',
-4900=>'L',
-4901=>'L',
-4902=>'L',
-4903=>'L',
-4904=>'L',
-4905=>'L',
-4906=>'L',
-4907=>'L',
-4908=>'L',
-4909=>'L',
-4910=>'L',
-4911=>'L',
-4912=>'L',
-4913=>'L',
-4914=>'L',
-4915=>'L',
-4916=>'L',
-4917=>'L',
-4918=>'L',
-4919=>'L',
-4920=>'L',
-4921=>'L',
-4922=>'L',
-4923=>'L',
-4924=>'L',
-4925=>'L',
-4926=>'L',
-4927=>'L',
-4928=>'L',
-4929=>'L',
-4930=>'L',
-4931=>'L',
-4932=>'L',
-4933=>'L',
-4934=>'L',
-4935=>'L',
-4936=>'L',
-4937=>'L',
-4938=>'L',
-4939=>'L',
-4940=>'L',
-4941=>'L',
-4942=>'L',
-4943=>'L',
-4944=>'L',
-4945=>'L',
-4946=>'L',
-4947=>'L',
-4948=>'L',
-4949=>'L',
-4950=>'L',
-4951=>'L',
-4952=>'L',
-4953=>'L',
-4954=>'L',
-4959=>'NSM',
-4960=>'L',
-4961=>'L',
-4962=>'L',
-4963=>'L',
-4964=>'L',
-4965=>'L',
-4966=>'L',
-4967=>'L',
-4968=>'L',
-4969=>'L',
-4970=>'L',
-4971=>'L',
-4972=>'L',
-4973=>'L',
-4974=>'L',
-4975=>'L',
-4976=>'L',
-4977=>'L',
-4978=>'L',
-4979=>'L',
-4980=>'L',
-4981=>'L',
-4982=>'L',
-4983=>'L',
-4984=>'L',
-4985=>'L',
-4986=>'L',
-4987=>'L',
-4988=>'L',
-4992=>'L',
-4993=>'L',
-4994=>'L',
-4995=>'L',
-4996=>'L',
-4997=>'L',
-4998=>'L',
-4999=>'L',
-5000=>'L',
-5001=>'L',
-5002=>'L',
-5003=>'L',
-5004=>'L',
-5005=>'L',
-5006=>'L',
-5007=>'L',
-5008=>'ON',
-5009=>'ON',
-5010=>'ON',
-5011=>'ON',
-5012=>'ON',
-5013=>'ON',
-5014=>'ON',
-5015=>'ON',
-5016=>'ON',
-5017=>'ON',
-5024=>'L',
-5025=>'L',
-5026=>'L',
-5027=>'L',
-5028=>'L',
-5029=>'L',
-5030=>'L',
-5031=>'L',
-5032=>'L',
-5033=>'L',
-5034=>'L',
-5035=>'L',
-5036=>'L',
-5037=>'L',
-5038=>'L',
-5039=>'L',
-5040=>'L',
-5041=>'L',
-5042=>'L',
-5043=>'L',
-5044=>'L',
-5045=>'L',
-5046=>'L',
-5047=>'L',
-5048=>'L',
-5049=>'L',
-5050=>'L',
-5051=>'L',
-5052=>'L',
-5053=>'L',
-5054=>'L',
-5055=>'L',
-5056=>'L',
-5057=>'L',
-5058=>'L',
-5059=>'L',
-5060=>'L',
-5061=>'L',
-5062=>'L',
-5063=>'L',
-5064=>'L',
-5065=>'L',
-5066=>'L',
-5067=>'L',
-5068=>'L',
-5069=>'L',
-5070=>'L',
-5071=>'L',
-5072=>'L',
-5073=>'L',
-5074=>'L',
-5075=>'L',
-5076=>'L',
-5077=>'L',
-5078=>'L',
-5079=>'L',
-5080=>'L',
-5081=>'L',
-5082=>'L',
-5083=>'L',
-5084=>'L',
-5085=>'L',
-5086=>'L',
-5087=>'L',
-5088=>'L',
-5089=>'L',
-5090=>'L',
-5091=>'L',
-5092=>'L',
-5093=>'L',
-5094=>'L',
-5095=>'L',
-5096=>'L',
-5097=>'L',
-5098=>'L',
-5099=>'L',
-5100=>'L',
-5101=>'L',
-5102=>'L',
-5103=>'L',
-5104=>'L',
-5105=>'L',
-5106=>'L',
-5107=>'L',
-5108=>'L',
-5121=>'L',
-5122=>'L',
-5123=>'L',
-5124=>'L',
-5125=>'L',
-5126=>'L',
-5127=>'L',
-5128=>'L',
-5129=>'L',
-5130=>'L',
-5131=>'L',
-5132=>'L',
-5133=>'L',
-5134=>'L',
-5135=>'L',
-5136=>'L',
-5137=>'L',
-5138=>'L',
-5139=>'L',
-5140=>'L',
-5141=>'L',
-5142=>'L',
-5143=>'L',
-5144=>'L',
-5145=>'L',
-5146=>'L',
-5147=>'L',
-5148=>'L',
-5149=>'L',
-5150=>'L',
-5151=>'L',
-5152=>'L',
-5153=>'L',
-5154=>'L',
-5155=>'L',
-5156=>'L',
-5157=>'L',
-5158=>'L',
-5159=>'L',
-5160=>'L',
-5161=>'L',
-5162=>'L',
-5163=>'L',
-5164=>'L',
-5165=>'L',
-5166=>'L',
-5167=>'L',
-5168=>'L',
-5169=>'L',
-5170=>'L',
-5171=>'L',
-5172=>'L',
-5173=>'L',
-5174=>'L',
-5175=>'L',
-5176=>'L',
-5177=>'L',
-5178=>'L',
-5179=>'L',
-5180=>'L',
-5181=>'L',
-5182=>'L',
-5183=>'L',
-5184=>'L',
-5185=>'L',
-5186=>'L',
-5187=>'L',
-5188=>'L',
-5189=>'L',
-5190=>'L',
-5191=>'L',
-5192=>'L',
-5193=>'L',
-5194=>'L',
-5195=>'L',
-5196=>'L',
-5197=>'L',
-5198=>'L',
-5199=>'L',
-5200=>'L',
-5201=>'L',
-5202=>'L',
-5203=>'L',
-5204=>'L',
-5205=>'L',
-5206=>'L',
-5207=>'L',
-5208=>'L',
-5209=>'L',
-5210=>'L',
-5211=>'L',
-5212=>'L',
-5213=>'L',
-5214=>'L',
-5215=>'L',
-5216=>'L',
-5217=>'L',
-5218=>'L',
-5219=>'L',
-5220=>'L',
-5221=>'L',
-5222=>'L',
-5223=>'L',
-5224=>'L',
-5225=>'L',
-5226=>'L',
-5227=>'L',
-5228=>'L',
-5229=>'L',
-5230=>'L',
-5231=>'L',
-5232=>'L',
-5233=>'L',
-5234=>'L',
-5235=>'L',
-5236=>'L',
-5237=>'L',
-5238=>'L',
-5239=>'L',
-5240=>'L',
-5241=>'L',
-5242=>'L',
-5243=>'L',
-5244=>'L',
-5245=>'L',
-5246=>'L',
-5247=>'L',
-5248=>'L',
-5249=>'L',
-5250=>'L',
-5251=>'L',
-5252=>'L',
-5253=>'L',
-5254=>'L',
-5255=>'L',
-5256=>'L',
-5257=>'L',
-5258=>'L',
-5259=>'L',
-5260=>'L',
-5261=>'L',
-5262=>'L',
-5263=>'L',
-5264=>'L',
-5265=>'L',
-5266=>'L',
-5267=>'L',
-5268=>'L',
-5269=>'L',
-5270=>'L',
-5271=>'L',
-5272=>'L',
-5273=>'L',
-5274=>'L',
-5275=>'L',
-5276=>'L',
-5277=>'L',
-5278=>'L',
-5279=>'L',
-5280=>'L',
-5281=>'L',
-5282=>'L',
-5283=>'L',
-5284=>'L',
-5285=>'L',
-5286=>'L',
-5287=>'L',
-5288=>'L',
-5289=>'L',
-5290=>'L',
-5291=>'L',
-5292=>'L',
-5293=>'L',
-5294=>'L',
-5295=>'L',
-5296=>'L',
-5297=>'L',
-5298=>'L',
-5299=>'L',
-5300=>'L',
-5301=>'L',
-5302=>'L',
-5303=>'L',
-5304=>'L',
-5305=>'L',
-5306=>'L',
-5307=>'L',
-5308=>'L',
-5309=>'L',
-5310=>'L',
-5311=>'L',
-5312=>'L',
-5313=>'L',
-5314=>'L',
-5315=>'L',
-5316=>'L',
-5317=>'L',
-5318=>'L',
-5319=>'L',
-5320=>'L',
-5321=>'L',
-5322=>'L',
-5323=>'L',
-5324=>'L',
-5325=>'L',
-5326=>'L',
-5327=>'L',
-5328=>'L',
-5329=>'L',
-5330=>'L',
-5331=>'L',
-5332=>'L',
-5333=>'L',
-5334=>'L',
-5335=>'L',
-5336=>'L',
-5337=>'L',
-5338=>'L',
-5339=>'L',
-5340=>'L',
-5341=>'L',
-5342=>'L',
-5343=>'L',
-5344=>'L',
-5345=>'L',
-5346=>'L',
-5347=>'L',
-5348=>'L',
-5349=>'L',
-5350=>'L',
-5351=>'L',
-5352=>'L',
-5353=>'L',
-5354=>'L',
-5355=>'L',
-5356=>'L',
-5357=>'L',
-5358=>'L',
-5359=>'L',
-5360=>'L',
-5361=>'L',
-5362=>'L',
-5363=>'L',
-5364=>'L',
-5365=>'L',
-5366=>'L',
-5367=>'L',
-5368=>'L',
-5369=>'L',
-5370=>'L',
-5371=>'L',
-5372=>'L',
-5373=>'L',
-5374=>'L',
-5375=>'L',
-5376=>'L',
-5377=>'L',
-5378=>'L',
-5379=>'L',
-5380=>'L',
-5381=>'L',
-5382=>'L',
-5383=>'L',
-5384=>'L',
-5385=>'L',
-5386=>'L',
-5387=>'L',
-5388=>'L',
-5389=>'L',
-5390=>'L',
-5391=>'L',
-5392=>'L',
-5393=>'L',
-5394=>'L',
-5395=>'L',
-5396=>'L',
-5397=>'L',
-5398=>'L',
-5399=>'L',
-5400=>'L',
-5401=>'L',
-5402=>'L',
-5403=>'L',
-5404=>'L',
-5405=>'L',
-5406=>'L',
-5407=>'L',
-5408=>'L',
-5409=>'L',
-5410=>'L',
-5411=>'L',
-5412=>'L',
-5413=>'L',
-5414=>'L',
-5415=>'L',
-5416=>'L',
-5417=>'L',
-5418=>'L',
-5419=>'L',
-5420=>'L',
-5421=>'L',
-5422=>'L',
-5423=>'L',
-5424=>'L',
-5425=>'L',
-5426=>'L',
-5427=>'L',
-5428=>'L',
-5429=>'L',
-5430=>'L',
-5431=>'L',
-5432=>'L',
-5433=>'L',
-5434=>'L',
-5435=>'L',
-5436=>'L',
-5437=>'L',
-5438=>'L',
-5439=>'L',
-5440=>'L',
-5441=>'L',
-5442=>'L',
-5443=>'L',
-5444=>'L',
-5445=>'L',
-5446=>'L',
-5447=>'L',
-5448=>'L',
-5449=>'L',
-5450=>'L',
-5451=>'L',
-5452=>'L',
-5453=>'L',
-5454=>'L',
-5455=>'L',
-5456=>'L',
-5457=>'L',
-5458=>'L',
-5459=>'L',
-5460=>'L',
-5461=>'L',
-5462=>'L',
-5463=>'L',
-5464=>'L',
-5465=>'L',
-5466=>'L',
-5467=>'L',
-5468=>'L',
-5469=>'L',
-5470=>'L',
-5471=>'L',
-5472=>'L',
-5473=>'L',
-5474=>'L',
-5475=>'L',
-5476=>'L',
-5477=>'L',
-5478=>'L',
-5479=>'L',
-5480=>'L',
-5481=>'L',
-5482=>'L',
-5483=>'L',
-5484=>'L',
-5485=>'L',
-5486=>'L',
-5487=>'L',
-5488=>'L',
-5489=>'L',
-5490=>'L',
-5491=>'L',
-5492=>'L',
-5493=>'L',
-5494=>'L',
-5495=>'L',
-5496=>'L',
-5497=>'L',
-5498=>'L',
-5499=>'L',
-5500=>'L',
-5501=>'L',
-5502=>'L',
-5503=>'L',
-5504=>'L',
-5505=>'L',
-5506=>'L',
-5507=>'L',
-5508=>'L',
-5509=>'L',
-5510=>'L',
-5511=>'L',
-5512=>'L',
-5513=>'L',
-5514=>'L',
-5515=>'L',
-5516=>'L',
-5517=>'L',
-5518=>'L',
-5519=>'L',
-5520=>'L',
-5521=>'L',
-5522=>'L',
-5523=>'L',
-5524=>'L',
-5525=>'L',
-5526=>'L',
-5527=>'L',
-5528=>'L',
-5529=>'L',
-5530=>'L',
-5531=>'L',
-5532=>'L',
-5533=>'L',
-5534=>'L',
-5535=>'L',
-5536=>'L',
-5537=>'L',
-5538=>'L',
-5539=>'L',
-5540=>'L',
-5541=>'L',
-5542=>'L',
-5543=>'L',
-5544=>'L',
-5545=>'L',
-5546=>'L',
-5547=>'L',
-5548=>'L',
-5549=>'L',
-5550=>'L',
-5551=>'L',
-5552=>'L',
-5553=>'L',
-5554=>'L',
-5555=>'L',
-5556=>'L',
-5557=>'L',
-5558=>'L',
-5559=>'L',
-5560=>'L',
-5561=>'L',
-5562=>'L',
-5563=>'L',
-5564=>'L',
-5565=>'L',
-5566=>'L',
-5567=>'L',
-5568=>'L',
-5569=>'L',
-5570=>'L',
-5571=>'L',
-5572=>'L',
-5573=>'L',
-5574=>'L',
-5575=>'L',
-5576=>'L',
-5577=>'L',
-5578=>'L',
-5579=>'L',
-5580=>'L',
-5581=>'L',
-5582=>'L',
-5583=>'L',
-5584=>'L',
-5585=>'L',
-5586=>'L',
-5587=>'L',
-5588=>'L',
-5589=>'L',
-5590=>'L',
-5591=>'L',
-5592=>'L',
-5593=>'L',
-5594=>'L',
-5595=>'L',
-5596=>'L',
-5597=>'L',
-5598=>'L',
-5599=>'L',
-5600=>'L',
-5601=>'L',
-5602=>'L',
-5603=>'L',
-5604=>'L',
-5605=>'L',
-5606=>'L',
-5607=>'L',
-5608=>'L',
-5609=>'L',
-5610=>'L',
-5611=>'L',
-5612=>'L',
-5613=>'L',
-5614=>'L',
-5615=>'L',
-5616=>'L',
-5617=>'L',
-5618=>'L',
-5619=>'L',
-5620=>'L',
-5621=>'L',
-5622=>'L',
-5623=>'L',
-5624=>'L',
-5625=>'L',
-5626=>'L',
-5627=>'L',
-5628=>'L',
-5629=>'L',
-5630=>'L',
-5631=>'L',
-5632=>'L',
-5633=>'L',
-5634=>'L',
-5635=>'L',
-5636=>'L',
-5637=>'L',
-5638=>'L',
-5639=>'L',
-5640=>'L',
-5641=>'L',
-5642=>'L',
-5643=>'L',
-5644=>'L',
-5645=>'L',
-5646=>'L',
-5647=>'L',
-5648=>'L',
-5649=>'L',
-5650=>'L',
-5651=>'L',
-5652=>'L',
-5653=>'L',
-5654=>'L',
-5655=>'L',
-5656=>'L',
-5657=>'L',
-5658=>'L',
-5659=>'L',
-5660=>'L',
-5661=>'L',
-5662=>'L',
-5663=>'L',
-5664=>'L',
-5665=>'L',
-5666=>'L',
-5667=>'L',
-5668=>'L',
-5669=>'L',
-5670=>'L',
-5671=>'L',
-5672=>'L',
-5673=>'L',
-5674=>'L',
-5675=>'L',
-5676=>'L',
-5677=>'L',
-5678=>'L',
-5679=>'L',
-5680=>'L',
-5681=>'L',
-5682=>'L',
-5683=>'L',
-5684=>'L',
-5685=>'L',
-5686=>'L',
-5687=>'L',
-5688=>'L',
-5689=>'L',
-5690=>'L',
-5691=>'L',
-5692=>'L',
-5693=>'L',
-5694=>'L',
-5695=>'L',
-5696=>'L',
-5697=>'L',
-5698=>'L',
-5699=>'L',
-5700=>'L',
-5701=>'L',
-5702=>'L',
-5703=>'L',
-5704=>'L',
-5705=>'L',
-5706=>'L',
-5707=>'L',
-5708=>'L',
-5709=>'L',
-5710=>'L',
-5711=>'L',
-5712=>'L',
-5713=>'L',
-5714=>'L',
-5715=>'L',
-5716=>'L',
-5717=>'L',
-5718=>'L',
-5719=>'L',
-5720=>'L',
-5721=>'L',
-5722=>'L',
-5723=>'L',
-5724=>'L',
-5725=>'L',
-5726=>'L',
-5727=>'L',
-5728=>'L',
-5729=>'L',
-5730=>'L',
-5731=>'L',
-5732=>'L',
-5733=>'L',
-5734=>'L',
-5735=>'L',
-5736=>'L',
-5737=>'L',
-5738=>'L',
-5739=>'L',
-5740=>'L',
-5741=>'L',
-5742=>'L',
-5743=>'L',
-5744=>'L',
-5745=>'L',
-5746=>'L',
-5747=>'L',
-5748=>'L',
-5749=>'L',
-5750=>'L',
-5760=>'WS',
-5761=>'L',
-5762=>'L',
-5763=>'L',
-5764=>'L',
-5765=>'L',
-5766=>'L',
-5767=>'L',
-5768=>'L',
-5769=>'L',
-5770=>'L',
-5771=>'L',
-5772=>'L',
-5773=>'L',
-5774=>'L',
-5775=>'L',
-5776=>'L',
-5777=>'L',
-5778=>'L',
-5779=>'L',
-5780=>'L',
-5781=>'L',
-5782=>'L',
-5783=>'L',
-5784=>'L',
-5785=>'L',
-5786=>'L',
-5787=>'ON',
-5788=>'ON',
-5792=>'L',
-5793=>'L',
-5794=>'L',
-5795=>'L',
-5796=>'L',
-5797=>'L',
-5798=>'L',
-5799=>'L',
-5800=>'L',
-5801=>'L',
-5802=>'L',
-5803=>'L',
-5804=>'L',
-5805=>'L',
-5806=>'L',
-5807=>'L',
-5808=>'L',
-5809=>'L',
-5810=>'L',
-5811=>'L',
-5812=>'L',
-5813=>'L',
-5814=>'L',
-5815=>'L',
-5816=>'L',
-5817=>'L',
-5818=>'L',
-5819=>'L',
-5820=>'L',
-5821=>'L',
-5822=>'L',
-5823=>'L',
-5824=>'L',
-5825=>'L',
-5826=>'L',
-5827=>'L',
-5828=>'L',
-5829=>'L',
-5830=>'L',
-5831=>'L',
-5832=>'L',
-5833=>'L',
-5834=>'L',
-5835=>'L',
-5836=>'L',
-5837=>'L',
-5838=>'L',
-5839=>'L',
-5840=>'L',
-5841=>'L',
-5842=>'L',
-5843=>'L',
-5844=>'L',
-5845=>'L',
-5846=>'L',
-5847=>'L',
-5848=>'L',
-5849=>'L',
-5850=>'L',
-5851=>'L',
-5852=>'L',
-5853=>'L',
-5854=>'L',
-5855=>'L',
-5856=>'L',
-5857=>'L',
-5858=>'L',
-5859=>'L',
-5860=>'L',
-5861=>'L',
-5862=>'L',
-5863=>'L',
-5864=>'L',
-5865=>'L',
-5866=>'L',
-5867=>'L',
-5868=>'L',
-5869=>'L',
-5870=>'L',
-5871=>'L',
-5872=>'L',
-5888=>'L',
-5889=>'L',
-5890=>'L',
-5891=>'L',
-5892=>'L',
-5893=>'L',
-5894=>'L',
-5895=>'L',
-5896=>'L',
-5897=>'L',
-5898=>'L',
-5899=>'L',
-5900=>'L',
-5902=>'L',
-5903=>'L',
-5904=>'L',
-5905=>'L',
-5906=>'NSM',
-5907=>'NSM',
-5908=>'NSM',
-5920=>'L',
-5921=>'L',
-5922=>'L',
-5923=>'L',
-5924=>'L',
-5925=>'L',
-5926=>'L',
-5927=>'L',
-5928=>'L',
-5929=>'L',
-5930=>'L',
-5931=>'L',
-5932=>'L',
-5933=>'L',
-5934=>'L',
-5935=>'L',
-5936=>'L',
-5937=>'L',
-5938=>'NSM',
-5939=>'NSM',
-5940=>'NSM',
-5941=>'L',
-5942=>'L',
-5952=>'L',
-5953=>'L',
-5954=>'L',
-5955=>'L',
-5956=>'L',
-5957=>'L',
-5958=>'L',
-5959=>'L',
-5960=>'L',
-5961=>'L',
-5962=>'L',
-5963=>'L',
-5964=>'L',
-5965=>'L',
-5966=>'L',
-5967=>'L',
-5968=>'L',
-5969=>'L',
-5970=>'NSM',
-5971=>'NSM',
-5984=>'L',
-5985=>'L',
-5986=>'L',
-5987=>'L',
-5988=>'L',
-5989=>'L',
-5990=>'L',
-5991=>'L',
-5992=>'L',
-5993=>'L',
-5994=>'L',
-5995=>'L',
-5996=>'L',
-5998=>'L',
-5999=>'L',
-6000=>'L',
-6002=>'NSM',
-6003=>'NSM',
-6016=>'L',
-6017=>'L',
-6018=>'L',
-6019=>'L',
-6020=>'L',
-6021=>'L',
-6022=>'L',
-6023=>'L',
-6024=>'L',
-6025=>'L',
-6026=>'L',
-6027=>'L',
-6028=>'L',
-6029=>'L',
-6030=>'L',
-6031=>'L',
-6032=>'L',
-6033=>'L',
-6034=>'L',
-6035=>'L',
-6036=>'L',
-6037=>'L',
-6038=>'L',
-6039=>'L',
-6040=>'L',
-6041=>'L',
-6042=>'L',
-6043=>'L',
-6044=>'L',
-6045=>'L',
-6046=>'L',
-6047=>'L',
-6048=>'L',
-6049=>'L',
-6050=>'L',
-6051=>'L',
-6052=>'L',
-6053=>'L',
-6054=>'L',
-6055=>'L',
-6056=>'L',
-6057=>'L',
-6058=>'L',
-6059=>'L',
-6060=>'L',
-6061=>'L',
-6062=>'L',
-6063=>'L',
-6064=>'L',
-6065=>'L',
-6066=>'L',
-6067=>'L',
-6068=>'L',
-6069=>'L',
-6070=>'L',
-6071=>'NSM',
-6072=>'NSM',
-6073=>'NSM',
-6074=>'NSM',
-6075=>'NSM',
-6076=>'NSM',
-6077=>'NSM',
-6078=>'L',
-6079=>'L',
-6080=>'L',
-6081=>'L',
-6082=>'L',
-6083=>'L',
-6084=>'L',
-6085=>'L',
-6086=>'NSM',
-6087=>'L',
-6088=>'L',
-6089=>'NSM',
-6090=>'NSM',
-6091=>'NSM',
-6092=>'NSM',
-6093=>'NSM',
-6094=>'NSM',
-6095=>'NSM',
-6096=>'NSM',
-6097=>'NSM',
-6098=>'NSM',
-6099=>'NSM',
-6100=>'L',
-6101=>'L',
-6102=>'L',
-6103=>'L',
-6104=>'L',
-6105=>'L',
-6106=>'L',
-6107=>'ET',
-6108=>'L',
-6109=>'NSM',
-6112=>'L',
-6113=>'L',
-6114=>'L',
-6115=>'L',
-6116=>'L',
-6117=>'L',
-6118=>'L',
-6119=>'L',
-6120=>'L',
-6121=>'L',
-6128=>'ON',
-6129=>'ON',
-6130=>'ON',
-6131=>'ON',
-6132=>'ON',
-6133=>'ON',
-6134=>'ON',
-6135=>'ON',
-6136=>'ON',
-6137=>'ON',
-6144=>'ON',
-6145=>'ON',
-6146=>'ON',
-6147=>'ON',
-6148=>'ON',
-6149=>'ON',
-6150=>'ON',
-6151=>'ON',
-6152=>'ON',
-6153=>'ON',
-6154=>'ON',
-6155=>'NSM',
-6156=>'NSM',
-6157=>'NSM',
-6158=>'WS',
-6160=>'L',
-6161=>'L',
-6162=>'L',
-6163=>'L',
-6164=>'L',
-6165=>'L',
-6166=>'L',
-6167=>'L',
-6168=>'L',
-6169=>'L',
-6176=>'L',
-6177=>'L',
-6178=>'L',
-6179=>'L',
-6180=>'L',
-6181=>'L',
-6182=>'L',
-6183=>'L',
-6184=>'L',
-6185=>'L',
-6186=>'L',
-6187=>'L',
-6188=>'L',
-6189=>'L',
-6190=>'L',
-6191=>'L',
-6192=>'L',
-6193=>'L',
-6194=>'L',
-6195=>'L',
-6196=>'L',
-6197=>'L',
-6198=>'L',
-6199=>'L',
-6200=>'L',
-6201=>'L',
-6202=>'L',
-6203=>'L',
-6204=>'L',
-6205=>'L',
-6206=>'L',
-6207=>'L',
-6208=>'L',
-6209=>'L',
-6210=>'L',
-6211=>'L',
-6212=>'L',
-6213=>'L',
-6214=>'L',
-6215=>'L',
-6216=>'L',
-6217=>'L',
-6218=>'L',
-6219=>'L',
-6220=>'L',
-6221=>'L',
-6222=>'L',
-6223=>'L',
-6224=>'L',
-6225=>'L',
-6226=>'L',
-6227=>'L',
-6228=>'L',
-6229=>'L',
-6230=>'L',
-6231=>'L',
-6232=>'L',
-6233=>'L',
-6234=>'L',
-6235=>'L',
-6236=>'L',
-6237=>'L',
-6238=>'L',
-6239=>'L',
-6240=>'L',
-6241=>'L',
-6242=>'L',
-6243=>'L',
-6244=>'L',
-6245=>'L',
-6246=>'L',
-6247=>'L',
-6248=>'L',
-6249=>'L',
-6250=>'L',
-6251=>'L',
-6252=>'L',
-6253=>'L',
-6254=>'L',
-6255=>'L',
-6256=>'L',
-6257=>'L',
-6258=>'L',
-6259=>'L',
-6260=>'L',
-6261=>'L',
-6262=>'L',
-6263=>'L',
-6272=>'L',
-6273=>'L',
-6274=>'L',
-6275=>'L',
-6276=>'L',
-6277=>'L',
-6278=>'L',
-6279=>'L',
-6280=>'L',
-6281=>'L',
-6282=>'L',
-6283=>'L',
-6284=>'L',
-6285=>'L',
-6286=>'L',
-6287=>'L',
-6288=>'L',
-6289=>'L',
-6290=>'L',
-6291=>'L',
-6292=>'L',
-6293=>'L',
-6294=>'L',
-6295=>'L',
-6296=>'L',
-6297=>'L',
-6298=>'L',
-6299=>'L',
-6300=>'L',
-6301=>'L',
-6302=>'L',
-6303=>'L',
-6304=>'L',
-6305=>'L',
-6306=>'L',
-6307=>'L',
-6308=>'L',
-6309=>'L',
-6310=>'L',
-6311=>'L',
-6312=>'L',
-6313=>'NSM',
-6400=>'L',
-6401=>'L',
-6402=>'L',
-6403=>'L',
-6404=>'L',
-6405=>'L',
-6406=>'L',
-6407=>'L',
-6408=>'L',
-6409=>'L',
-6410=>'L',
-6411=>'L',
-6412=>'L',
-6413=>'L',
-6414=>'L',
-6415=>'L',
-6416=>'L',
-6417=>'L',
-6418=>'L',
-6419=>'L',
-6420=>'L',
-6421=>'L',
-6422=>'L',
-6423=>'L',
-6424=>'L',
-6425=>'L',
-6426=>'L',
-6427=>'L',
-6428=>'L',
-6432=>'NSM',
-6433=>'NSM',
-6434=>'NSM',
-6435=>'L',
-6436=>'L',
-6437=>'L',
-6438=>'L',
-6439=>'NSM',
-6440=>'NSM',
-6441=>'NSM',
-6442=>'NSM',
-6443=>'NSM',
-6448=>'L',
-6449=>'L',
-6450=>'NSM',
-6451=>'L',
-6452=>'L',
-6453=>'L',
-6454=>'L',
-6455=>'L',
-6456=>'L',
-6457=>'NSM',
-6458=>'NSM',
-6459=>'NSM',
-6464=>'ON',
-6468=>'ON',
-6469=>'ON',
-6470=>'L',
-6471=>'L',
-6472=>'L',
-6473=>'L',
-6474=>'L',
-6475=>'L',
-6476=>'L',
-6477=>'L',
-6478=>'L',
-6479=>'L',
-6480=>'L',
-6481=>'L',
-6482=>'L',
-6483=>'L',
-6484=>'L',
-6485=>'L',
-6486=>'L',
-6487=>'L',
-6488=>'L',
-6489=>'L',
-6490=>'L',
-6491=>'L',
-6492=>'L',
-6493=>'L',
-6494=>'L',
-6495=>'L',
-6496=>'L',
-6497=>'L',
-6498=>'L',
-6499=>'L',
-6500=>'L',
-6501=>'L',
-6502=>'L',
-6503=>'L',
-6504=>'L',
-6505=>'L',
-6506=>'L',
-6507=>'L',
-6508=>'L',
-6509=>'L',
-6512=>'L',
-6513=>'L',
-6514=>'L',
-6515=>'L',
-6516=>'L',
-6528=>'L',
-6529=>'L',
-6530=>'L',
-6531=>'L',
-6532=>'L',
-6533=>'L',
-6534=>'L',
-6535=>'L',
-6536=>'L',
-6537=>'L',
-6538=>'L',
-6539=>'L',
-6540=>'L',
-6541=>'L',
-6542=>'L',
-6543=>'L',
-6544=>'L',
-6545=>'L',
-6546=>'L',
-6547=>'L',
-6548=>'L',
-6549=>'L',
-6550=>'L',
-6551=>'L',
-6552=>'L',
-6553=>'L',
-6554=>'L',
-6555=>'L',
-6556=>'L',
-6557=>'L',
-6558=>'L',
-6559=>'L',
-6560=>'L',
-6561=>'L',
-6562=>'L',
-6563=>'L',
-6564=>'L',
-6565=>'L',
-6566=>'L',
-6567=>'L',
-6568=>'L',
-6569=>'L',
-6576=>'L',
-6577=>'L',
-6578=>'L',
-6579=>'L',
-6580=>'L',
-6581=>'L',
-6582=>'L',
-6583=>'L',
-6584=>'L',
-6585=>'L',
-6586=>'L',
-6587=>'L',
-6588=>'L',
-6589=>'L',
-6590=>'L',
-6591=>'L',
-6592=>'L',
-6593=>'L',
-6594=>'L',
-6595=>'L',
-6596=>'L',
-6597=>'L',
-6598=>'L',
-6599=>'L',
-6600=>'L',
-6601=>'L',
-6608=>'L',
-6609=>'L',
-6610=>'L',
-6611=>'L',
-6612=>'L',
-6613=>'L',
-6614=>'L',
-6615=>'L',
-6616=>'L',
-6617=>'L',
-6622=>'ON',
-6623=>'ON',
-6624=>'ON',
-6625=>'ON',
-6626=>'ON',
-6627=>'ON',
-6628=>'ON',
-6629=>'ON',
-6630=>'ON',
-6631=>'ON',
-6632=>'ON',
-6633=>'ON',
-6634=>'ON',
-6635=>'ON',
-6636=>'ON',
-6637=>'ON',
-6638=>'ON',
-6639=>'ON',
-6640=>'ON',
-6641=>'ON',
-6642=>'ON',
-6643=>'ON',
-6644=>'ON',
-6645=>'ON',
-6646=>'ON',
-6647=>'ON',
-6648=>'ON',
-6649=>'ON',
-6650=>'ON',
-6651=>'ON',
-6652=>'ON',
-6653=>'ON',
-6654=>'ON',
-6655=>'ON',
-6656=>'L',
-6657=>'L',
-6658=>'L',
-6659=>'L',
-6660=>'L',
-6661=>'L',
-6662=>'L',
-6663=>'L',
-6664=>'L',
-6665=>'L',
-6666=>'L',
-6667=>'L',
-6668=>'L',
-6669=>'L',
-6670=>'L',
-6671=>'L',
-6672=>'L',
-6673=>'L',
-6674=>'L',
-6675=>'L',
-6676=>'L',
-6677=>'L',
-6678=>'L',
-6679=>'NSM',
-6680=>'NSM',
-6681=>'L',
-6682=>'L',
-6683=>'L',
-6686=>'L',
-6687=>'L',
-6912=>'NSM',
-6913=>'NSM',
-6914=>'NSM',
-6915=>'NSM',
-6916=>'L',
-6917=>'L',
-6918=>'L',
-6919=>'L',
-6920=>'L',
-6921=>'L',
-6922=>'L',
-6923=>'L',
-6924=>'L',
-6925=>'L',
-6926=>'L',
-6927=>'L',
-6928=>'L',
-6929=>'L',
-6930=>'L',
-6931=>'L',
-6932=>'L',
-6933=>'L',
-6934=>'L',
-6935=>'L',
-6936=>'L',
-6937=>'L',
-6938=>'L',
-6939=>'L',
-6940=>'L',
-6941=>'L',
-6942=>'L',
-6943=>'L',
-6944=>'L',
-6945=>'L',
-6946=>'L',
-6947=>'L',
-6948=>'L',
-6949=>'L',
-6950=>'L',
-6951=>'L',
-6952=>'L',
-6953=>'L',
-6954=>'L',
-6955=>'L',
-6956=>'L',
-6957=>'L',
-6958=>'L',
-6959=>'L',
-6960=>'L',
-6961=>'L',
-6962=>'L',
-6963=>'L',
-6964=>'NSM',
-6965=>'L',
-6966=>'NSM',
-6967=>'NSM',
-6968=>'NSM',
-6969=>'NSM',
-6970=>'NSM',
-6971=>'L',
-6972=>'NSM',
-6973=>'L',
-6974=>'L',
-6975=>'L',
-6976=>'L',
-6977=>'L',
-6978=>'NSM',
-6979=>'L',
-6980=>'L',
-6981=>'L',
-6982=>'L',
-6983=>'L',
-6984=>'L',
-6985=>'L',
-6986=>'L',
-6987=>'L',
-6992=>'L',
-6993=>'L',
-6994=>'L',
-6995=>'L',
-6996=>'L',
-6997=>'L',
-6998=>'L',
-6999=>'L',
-7000=>'L',
-7001=>'L',
-7002=>'L',
-7003=>'L',
-7004=>'L',
-7005=>'L',
-7006=>'L',
-7007=>'L',
-7008=>'L',
-7009=>'L',
-7010=>'L',
-7011=>'L',
-7012=>'L',
-7013=>'L',
-7014=>'L',
-7015=>'L',
-7016=>'L',
-7017=>'L',
-7018=>'L',
-7019=>'NSM',
-7020=>'NSM',
-7021=>'NSM',
-7022=>'NSM',
-7023=>'NSM',
-7024=>'NSM',
-7025=>'NSM',
-7026=>'NSM',
-7027=>'NSM',
-7028=>'L',
-7029=>'L',
-7030=>'L',
-7031=>'L',
-7032=>'L',
-7033=>'L',
-7034=>'L',
-7035=>'L',
-7036=>'L',
-7424=>'L',
-7425=>'L',
-7426=>'L',
-7427=>'L',
-7428=>'L',
-7429=>'L',
-7430=>'L',
-7431=>'L',
-7432=>'L',
-7433=>'L',
-7434=>'L',
-7435=>'L',
-7436=>'L',
-7437=>'L',
-7438=>'L',
-7439=>'L',
-7440=>'L',
-7441=>'L',
-7442=>'L',
-7443=>'L',
-7444=>'L',
-7445=>'L',
-7446=>'L',
-7447=>'L',
-7448=>'L',
-7449=>'L',
-7450=>'L',
-7451=>'L',
-7452=>'L',
-7453=>'L',
-7454=>'L',
-7455=>'L',
-7456=>'L',
-7457=>'L',
-7458=>'L',
-7459=>'L',
-7460=>'L',
-7461=>'L',
-7462=>'L',
-7463=>'L',
-7464=>'L',
-7465=>'L',
-7466=>'L',
-7467=>'L',
-7468=>'L',
-7469=>'L',
-7470=>'L',
-7471=>'L',
-7472=>'L',
-7473=>'L',
-7474=>'L',
-7475=>'L',
-7476=>'L',
-7477=>'L',
-7478=>'L',
-7479=>'L',
-7480=>'L',
-7481=>'L',
-7482=>'L',
-7483=>'L',
-7484=>'L',
-7485=>'L',
-7486=>'L',
-7487=>'L',
-7488=>'L',
-7489=>'L',
-7490=>'L',
-7491=>'L',
-7492=>'L',
-7493=>'L',
-7494=>'L',
-7495=>'L',
-7496=>'L',
-7497=>'L',
-7498=>'L',
-7499=>'L',
-7500=>'L',
-7501=>'L',
-7502=>'L',
-7503=>'L',
-7504=>'L',
-7505=>'L',
-7506=>'L',
-7507=>'L',
-7508=>'L',
-7509=>'L',
-7510=>'L',
-7511=>'L',
-7512=>'L',
-7513=>'L',
-7514=>'L',
-7515=>'L',
-7516=>'L',
-7517=>'L',
-7518=>'L',
-7519=>'L',
-7520=>'L',
-7521=>'L',
-7522=>'L',
-7523=>'L',
-7524=>'L',
-7525=>'L',
-7526=>'L',
-7527=>'L',
-7528=>'L',
-7529=>'L',
-7530=>'L',
-7531=>'L',
-7532=>'L',
-7533=>'L',
-7534=>'L',
-7535=>'L',
-7536=>'L',
-7537=>'L',
-7538=>'L',
-7539=>'L',
-7540=>'L',
-7541=>'L',
-7542=>'L',
-7543=>'L',
-7544=>'L',
-7545=>'L',
-7546=>'L',
-7547=>'L',
-7548=>'L',
-7549=>'L',
-7550=>'L',
-7551=>'L',
-7552=>'L',
-7553=>'L',
-7554=>'L',
-7555=>'L',
-7556=>'L',
-7557=>'L',
-7558=>'L',
-7559=>'L',
-7560=>'L',
-7561=>'L',
-7562=>'L',
-7563=>'L',
-7564=>'L',
-7565=>'L',
-7566=>'L',
-7567=>'L',
-7568=>'L',
-7569=>'L',
-7570=>'L',
-7571=>'L',
-7572=>'L',
-7573=>'L',
-7574=>'L',
-7575=>'L',
-7576=>'L',
-7577=>'L',
-7578=>'L',
-7579=>'L',
-7580=>'L',
-7581=>'L',
-7582=>'L',
-7583=>'L',
-7584=>'L',
-7585=>'L',
-7586=>'L',
-7587=>'L',
-7588=>'L',
-7589=>'L',
-7590=>'L',
-7591=>'L',
-7592=>'L',
-7593=>'L',
-7594=>'L',
-7595=>'L',
-7596=>'L',
-7597=>'L',
-7598=>'L',
-7599=>'L',
-7600=>'L',
-7601=>'L',
-7602=>'L',
-7603=>'L',
-7604=>'L',
-7605=>'L',
-7606=>'L',
-7607=>'L',
-7608=>'L',
-7609=>'L',
-7610=>'L',
-7611=>'L',
-7612=>'L',
-7613=>'L',
-7614=>'L',
-7615=>'L',
-7616=>'NSM',
-7617=>'NSM',
-7618=>'NSM',
-7619=>'NSM',
-7620=>'NSM',
-7621=>'NSM',
-7622=>'NSM',
-7623=>'NSM',
-7624=>'NSM',
-7625=>'NSM',
-7626=>'NSM',
-7678=>'NSM',
-7679=>'NSM',
-7680=>'L',
-7681=>'L',
-7682=>'L',
-7683=>'L',
-7684=>'L',
-7685=>'L',
-7686=>'L',
-7687=>'L',
-7688=>'L',
-7689=>'L',
-7690=>'L',
-7691=>'L',
-7692=>'L',
-7693=>'L',
-7694=>'L',
-7695=>'L',
-7696=>'L',
-7697=>'L',
-7698=>'L',
-7699=>'L',
-7700=>'L',
-7701=>'L',
-7702=>'L',
-7703=>'L',
-7704=>'L',
-7705=>'L',
-7706=>'L',
-7707=>'L',
-7708=>'L',
-7709=>'L',
-7710=>'L',
-7711=>'L',
-7712=>'L',
-7713=>'L',
-7714=>'L',
-7715=>'L',
-7716=>'L',
-7717=>'L',
-7718=>'L',
-7719=>'L',
-7720=>'L',
-7721=>'L',
-7722=>'L',
-7723=>'L',
-7724=>'L',
-7725=>'L',
-7726=>'L',
-7727=>'L',
-7728=>'L',
-7729=>'L',
-7730=>'L',
-7731=>'L',
-7732=>'L',
-7733=>'L',
-7734=>'L',
-7735=>'L',
-7736=>'L',
-7737=>'L',
-7738=>'L',
-7739=>'L',
-7740=>'L',
-7741=>'L',
-7742=>'L',
-7743=>'L',
-7744=>'L',
-7745=>'L',
-7746=>'L',
-7747=>'L',
-7748=>'L',
-7749=>'L',
-7750=>'L',
-7751=>'L',
-7752=>'L',
-7753=>'L',
-7754=>'L',
-7755=>'L',
-7756=>'L',
-7757=>'L',
-7758=>'L',
-7759=>'L',
-7760=>'L',
-7761=>'L',
-7762=>'L',
-7763=>'L',
-7764=>'L',
-7765=>'L',
-7766=>'L',
-7767=>'L',
-7768=>'L',
-7769=>'L',
-7770=>'L',
-7771=>'L',
-7772=>'L',
-7773=>'L',
-7774=>'L',
-7775=>'L',
-7776=>'L',
-7777=>'L',
-7778=>'L',
-7779=>'L',
-7780=>'L',
-7781=>'L',
-7782=>'L',
-7783=>'L',
-7784=>'L',
-7785=>'L',
-7786=>'L',
-7787=>'L',
-7788=>'L',
-7789=>'L',
-7790=>'L',
-7791=>'L',
-7792=>'L',
-7793=>'L',
-7794=>'L',
-7795=>'L',
-7796=>'L',
-7797=>'L',
-7798=>'L',
-7799=>'L',
-7800=>'L',
-7801=>'L',
-7802=>'L',
-7803=>'L',
-7804=>'L',
-7805=>'L',
-7806=>'L',
-7807=>'L',
-7808=>'L',
-7809=>'L',
-7810=>'L',
-7811=>'L',
-7812=>'L',
-7813=>'L',
-7814=>'L',
-7815=>'L',
-7816=>'L',
-7817=>'L',
-7818=>'L',
-7819=>'L',
-7820=>'L',
-7821=>'L',
-7822=>'L',
-7823=>'L',
-7824=>'L',
-7825=>'L',
-7826=>'L',
-7827=>'L',
-7828=>'L',
-7829=>'L',
-7830=>'L',
-7831=>'L',
-7832=>'L',
-7833=>'L',
-7834=>'L',
-7835=>'L',
-7840=>'L',
-7841=>'L',
-7842=>'L',
-7843=>'L',
-7844=>'L',
-7845=>'L',
-7846=>'L',
-7847=>'L',
-7848=>'L',
-7849=>'L',
-7850=>'L',
-7851=>'L',
-7852=>'L',
-7853=>'L',
-7854=>'L',
-7855=>'L',
-7856=>'L',
-7857=>'L',
-7858=>'L',
-7859=>'L',
-7860=>'L',
-7861=>'L',
-7862=>'L',
-7863=>'L',
-7864=>'L',
-7865=>'L',
-7866=>'L',
-7867=>'L',
-7868=>'L',
-7869=>'L',
-7870=>'L',
-7871=>'L',
-7872=>'L',
-7873=>'L',
-7874=>'L',
-7875=>'L',
-7876=>'L',
-7877=>'L',
-7878=>'L',
-7879=>'L',
-7880=>'L',
-7881=>'L',
-7882=>'L',
-7883=>'L',
-7884=>'L',
-7885=>'L',
-7886=>'L',
-7887=>'L',
-7888=>'L',
-7889=>'L',
-7890=>'L',
-7891=>'L',
-7892=>'L',
-7893=>'L',
-7894=>'L',
-7895=>'L',
-7896=>'L',
-7897=>'L',
-7898=>'L',
-7899=>'L',
-7900=>'L',
-7901=>'L',
-7902=>'L',
-7903=>'L',
-7904=>'L',
-7905=>'L',
-7906=>'L',
-7907=>'L',
-7908=>'L',
-7909=>'L',
-7910=>'L',
-7911=>'L',
-7912=>'L',
-7913=>'L',
-7914=>'L',
-7915=>'L',
-7916=>'L',
-7917=>'L',
-7918=>'L',
-7919=>'L',
-7920=>'L',
-7921=>'L',
-7922=>'L',
-7923=>'L',
-7924=>'L',
-7925=>'L',
-7926=>'L',
-7927=>'L',
-7928=>'L',
-7929=>'L',
-7936=>'L',
-7937=>'L',
-7938=>'L',
-7939=>'L',
-7940=>'L',
-7941=>'L',
-7942=>'L',
-7943=>'L',
-7944=>'L',
-7945=>'L',
-7946=>'L',
-7947=>'L',
-7948=>'L',
-7949=>'L',
-7950=>'L',
-7951=>'L',
-7952=>'L',
-7953=>'L',
-7954=>'L',
-7955=>'L',
-7956=>'L',
-7957=>'L',
-7960=>'L',
-7961=>'L',
-7962=>'L',
-7963=>'L',
-7964=>'L',
-7965=>'L',
-7968=>'L',
-7969=>'L',
-7970=>'L',
-7971=>'L',
-7972=>'L',
-7973=>'L',
-7974=>'L',
-7975=>'L',
-7976=>'L',
-7977=>'L',
-7978=>'L',
-7979=>'L',
-7980=>'L',
-7981=>'L',
-7982=>'L',
-7983=>'L',
-7984=>'L',
-7985=>'L',
-7986=>'L',
-7987=>'L',
-7988=>'L',
-7989=>'L',
-7990=>'L',
-7991=>'L',
-7992=>'L',
-7993=>'L',
-7994=>'L',
-7995=>'L',
-7996=>'L',
-7997=>'L',
-7998=>'L',
-7999=>'L',
-8000=>'L',
-8001=>'L',
-8002=>'L',
-8003=>'L',
-8004=>'L',
-8005=>'L',
-8008=>'L',
-8009=>'L',
-8010=>'L',
-8011=>'L',
-8012=>'L',
-8013=>'L',
-8016=>'L',
-8017=>'L',
-8018=>'L',
-8019=>'L',
-8020=>'L',
-8021=>'L',
-8022=>'L',
-8023=>'L',
-8025=>'L',
-8027=>'L',
-8029=>'L',
-8031=>'L',
-8032=>'L',
-8033=>'L',
-8034=>'L',
-8035=>'L',
-8036=>'L',
-8037=>'L',
-8038=>'L',
-8039=>'L',
-8040=>'L',
-8041=>'L',
-8042=>'L',
-8043=>'L',
-8044=>'L',
-8045=>'L',
-8046=>'L',
-8047=>'L',
-8048=>'L',
-8049=>'L',
-8050=>'L',
-8051=>'L',
-8052=>'L',
-8053=>'L',
-8054=>'L',
-8055=>'L',
-8056=>'L',
-8057=>'L',
-8058=>'L',
-8059=>'L',
-8060=>'L',
-8061=>'L',
-8064=>'L',
-8065=>'L',
-8066=>'L',
-8067=>'L',
-8068=>'L',
-8069=>'L',
-8070=>'L',
-8071=>'L',
-8072=>'L',
-8073=>'L',
-8074=>'L',
-8075=>'L',
-8076=>'L',
-8077=>'L',
-8078=>'L',
-8079=>'L',
-8080=>'L',
-8081=>'L',
-8082=>'L',
-8083=>'L',
-8084=>'L',
-8085=>'L',
-8086=>'L',
-8087=>'L',
-8088=>'L',
-8089=>'L',
-8090=>'L',
-8091=>'L',
-8092=>'L',
-8093=>'L',
-8094=>'L',
-8095=>'L',
-8096=>'L',
-8097=>'L',
-8098=>'L',
-8099=>'L',
-8100=>'L',
-8101=>'L',
-8102=>'L',
-8103=>'L',
-8104=>'L',
-8105=>'L',
-8106=>'L',
-8107=>'L',
-8108=>'L',
-8109=>'L',
-8110=>'L',
-8111=>'L',
-8112=>'L',
-8113=>'L',
-8114=>'L',
-8115=>'L',
-8116=>'L',
-8118=>'L',
-8119=>'L',
-8120=>'L',
-8121=>'L',
-8122=>'L',
-8123=>'L',
-8124=>'L',
-8125=>'ON',
-8126=>'L',
-8127=>'ON',
-8128=>'ON',
-8129=>'ON',
-8130=>'L',
-8131=>'L',
-8132=>'L',
-8134=>'L',
-8135=>'L',
-8136=>'L',
-8137=>'L',
-8138=>'L',
-8139=>'L',
-8140=>'L',
-8141=>'ON',
-8142=>'ON',
-8143=>'ON',
-8144=>'L',
-8145=>'L',
-8146=>'L',
-8147=>'L',
-8150=>'L',
-8151=>'L',
-8152=>'L',
-8153=>'L',
-8154=>'L',
-8155=>'L',
-8157=>'ON',
-8158=>'ON',
-8159=>'ON',
-8160=>'L',
-8161=>'L',
-8162=>'L',
-8163=>'L',
-8164=>'L',
-8165=>'L',
-8166=>'L',
-8167=>'L',
-8168=>'L',
-8169=>'L',
-8170=>'L',
-8171=>'L',
-8172=>'L',
-8173=>'ON',
-8174=>'ON',
-8175=>'ON',
-8178=>'L',
-8179=>'L',
-8180=>'L',
-8182=>'L',
-8183=>'L',
-8184=>'L',
-8185=>'L',
-8186=>'L',
-8187=>'L',
-8188=>'L',
-8189=>'ON',
-8190=>'ON',
-8192=>'WS',
-8193=>'WS',
-8194=>'WS',
-8195=>'WS',
-8196=>'WS',
-8197=>'WS',
-8198=>'WS',
-8199=>'WS',
-8200=>'WS',
-8201=>'WS',
-8202=>'WS',
-8203=>'BN',
-8204=>'BN',
-8205=>'BN',
-8206=>'L',
-8207=>'R',
-8208=>'ON',
-8209=>'ON',
-8210=>'ON',
-8211=>'ON',
-8212=>'ON',
-8213=>'ON',
-8214=>'ON',
-8215=>'ON',
-8216=>'ON',
-8217=>'ON',
-8218=>'ON',
-8219=>'ON',
-8220=>'ON',
-8221=>'ON',
-8222=>'ON',
-8223=>'ON',
-8224=>'ON',
-8225=>'ON',
-8226=>'ON',
-8227=>'ON',
-8228=>'ON',
-8229=>'ON',
-8230=>'ON',
-8231=>'ON',
-8232=>'WS',
-8233=>'B',
-8234=>'LRE',
-8235=>'RLE',
-8236=>'PDF',
-8237=>'LRO',
-8238=>'RLO',
-8239=>'CS',
-8240=>'ET',
-8241=>'ET',
-8242=>'ET',
-8243=>'ET',
-8244=>'ET',
-8245=>'ON',
-8246=>'ON',
-8247=>'ON',
-8248=>'ON',
-8249=>'ON',
-8250=>'ON',
-8251=>'ON',
-8252=>'ON',
-8253=>'ON',
-8254=>'ON',
-8255=>'ON',
-8256=>'ON',
-8257=>'ON',
-8258=>'ON',
-8259=>'ON',
-8260=>'CS',
-8261=>'ON',
-8262=>'ON',
-8263=>'ON',
-8264=>'ON',
-8265=>'ON',
-8266=>'ON',
-8267=>'ON',
-8268=>'ON',
-8269=>'ON',
-8270=>'ON',
-8271=>'ON',
-8272=>'ON',
-8273=>'ON',
-8274=>'ON',
-8275=>'ON',
-8276=>'ON',
-8277=>'ON',
-8278=>'ON',
-8279=>'ON',
-8280=>'ON',
-8281=>'ON',
-8282=>'ON',
-8283=>'ON',
-8284=>'ON',
-8285=>'ON',
-8286=>'ON',
-8287=>'WS',
-8288=>'BN',
-8289=>'BN',
-8290=>'BN',
-8291=>'BN',
-8298=>'BN',
-8299=>'BN',
-8300=>'BN',
-8301=>'BN',
-8302=>'BN',
-8303=>'BN',
-8304=>'EN',
-8305=>'L',
-8308=>'EN',
-8309=>'EN',
-8310=>'EN',
-8311=>'EN',
-8312=>'EN',
-8313=>'EN',
-8314=>'ES',
-8315=>'ES',
-8316=>'ON',
-8317=>'ON',
-8318=>'ON',
-8319=>'L',
-8320=>'EN',
-8321=>'EN',
-8322=>'EN',
-8323=>'EN',
-8324=>'EN',
-8325=>'EN',
-8326=>'EN',
-8327=>'EN',
-8328=>'EN',
-8329=>'EN',
-8330=>'ES',
-8331=>'ES',
-8332=>'ON',
-8333=>'ON',
-8334=>'ON',
-8336=>'L',
-8337=>'L',
-8338=>'L',
-8339=>'L',
-8340=>'L',
-8352=>'ET',
-8353=>'ET',
-8354=>'ET',
-8355=>'ET',
-8356=>'ET',
-8357=>'ET',
-8358=>'ET',
-8359=>'ET',
-8360=>'ET',
-8361=>'ET',
-8362=>'ET',
-8363=>'ET',
-8364=>'ET',
-8365=>'ET',
-8366=>'ET',
-8367=>'ET',
-8368=>'ET',
-8369=>'ET',
-8370=>'ET',
-8371=>'ET',
-8372=>'ET',
-8373=>'ET',
-8400=>'NSM',
-8401=>'NSM',
-8402=>'NSM',
-8403=>'NSM',
-8404=>'NSM',
-8405=>'NSM',
-8406=>'NSM',
-8407=>'NSM',
-8408=>'NSM',
-8409=>'NSM',
-8410=>'NSM',
-8411=>'NSM',
-8412=>'NSM',
-8413=>'NSM',
-8414=>'NSM',
-8415=>'NSM',
-8416=>'NSM',
-8417=>'NSM',
-8418=>'NSM',
-8419=>'NSM',
-8420=>'NSM',
-8421=>'NSM',
-8422=>'NSM',
-8423=>'NSM',
-8424=>'NSM',
-8425=>'NSM',
-8426=>'NSM',
-8427=>'NSM',
-8428=>'NSM',
-8429=>'NSM',
-8430=>'NSM',
-8431=>'NSM',
-8448=>'ON',
-8449=>'ON',
-8450=>'L',
-8451=>'ON',
-8452=>'ON',
-8453=>'ON',
-8454=>'ON',
-8455=>'L',
-8456=>'ON',
-8457=>'ON',
-8458=>'L',
-8459=>'L',
-8460=>'L',
-8461=>'L',
-8462=>'L',
-8463=>'L',
-8464=>'L',
-8465=>'L',
-8466=>'L',
-8467=>'L',
-8468=>'ON',
-8469=>'L',
-8470=>'ON',
-8471=>'ON',
-8472=>'ON',
-8473=>'L',
-8474=>'L',
-8475=>'L',
-8476=>'L',
-8477=>'L',
-8478=>'ON',
-8479=>'ON',
-8480=>'ON',
-8481=>'ON',
-8482=>'ON',
-8483=>'ON',
-8484=>'L',
-8485=>'ON',
-8486=>'L',
-8487=>'ON',
-8488=>'L',
-8489=>'ON',
-8490=>'L',
-8491=>'L',
-8492=>'L',
-8493=>'L',
-8494=>'ET',
-8495=>'L',
-8496=>'L',
-8497=>'L',
-8498=>'L',
-8499=>'L',
-8500=>'L',
-8501=>'L',
-8502=>'L',
-8503=>'L',
-8504=>'L',
-8505=>'L',
-8506=>'ON',
-8507=>'ON',
-8508=>'L',
-8509=>'L',
-8510=>'L',
-8511=>'L',
-8512=>'ON',
-8513=>'ON',
-8514=>'ON',
-8515=>'ON',
-8516=>'ON',
-8517=>'L',
-8518=>'L',
-8519=>'L',
-8520=>'L',
-8521=>'L',
-8522=>'ON',
-8523=>'ON',
-8524=>'ON',
-8525=>'ON',
-8526=>'L',
-8531=>'ON',
-8532=>'ON',
-8533=>'ON',
-8534=>'ON',
-8535=>'ON',
-8536=>'ON',
-8537=>'ON',
-8538=>'ON',
-8539=>'ON',
-8540=>'ON',
-8541=>'ON',
-8542=>'ON',
-8543=>'ON',
-8544=>'L',
-8545=>'L',
-8546=>'L',
-8547=>'L',
-8548=>'L',
-8549=>'L',
-8550=>'L',
-8551=>'L',
-8552=>'L',
-8553=>'L',
-8554=>'L',
-8555=>'L',
-8556=>'L',
-8557=>'L',
-8558=>'L',
-8559=>'L',
-8560=>'L',
-8561=>'L',
-8562=>'L',
-8563=>'L',
-8564=>'L',
-8565=>'L',
-8566=>'L',
-8567=>'L',
-8568=>'L',
-8569=>'L',
-8570=>'L',
-8571=>'L',
-8572=>'L',
-8573=>'L',
-8574=>'L',
-8575=>'L',
-8576=>'L',
-8577=>'L',
-8578=>'L',
-8579=>'L',
-8580=>'L',
-8592=>'ON',
-8593=>'ON',
-8594=>'ON',
-8595=>'ON',
-8596=>'ON',
-8597=>'ON',
-8598=>'ON',
-8599=>'ON',
-8600=>'ON',
-8601=>'ON',
-8602=>'ON',
-8603=>'ON',
-8604=>'ON',
-8605=>'ON',
-8606=>'ON',
-8607=>'ON',
-8608=>'ON',
-8609=>'ON',
-8610=>'ON',
-8611=>'ON',
-8612=>'ON',
-8613=>'ON',
-8614=>'ON',
-8615=>'ON',
-8616=>'ON',
-8617=>'ON',
-8618=>'ON',
-8619=>'ON',
-8620=>'ON',
-8621=>'ON',
-8622=>'ON',
-8623=>'ON',
-8624=>'ON',
-8625=>'ON',
-8626=>'ON',
-8627=>'ON',
-8628=>'ON',
-8629=>'ON',
-8630=>'ON',
-8631=>'ON',
-8632=>'ON',
-8633=>'ON',
-8634=>'ON',
-8635=>'ON',
-8636=>'ON',
-8637=>'ON',
-8638=>'ON',
-8639=>'ON',
-8640=>'ON',
-8641=>'ON',
-8642=>'ON',
-8643=>'ON',
-8644=>'ON',
-8645=>'ON',
-8646=>'ON',
-8647=>'ON',
-8648=>'ON',
-8649=>'ON',
-8650=>'ON',
-8651=>'ON',
-8652=>'ON',
-8653=>'ON',
-8654=>'ON',
-8655=>'ON',
-8656=>'ON',
-8657=>'ON',
-8658=>'ON',
-8659=>'ON',
-8660=>'ON',
-8661=>'ON',
-8662=>'ON',
-8663=>'ON',
-8664=>'ON',
-8665=>'ON',
-8666=>'ON',
-8667=>'ON',
-8668=>'ON',
-8669=>'ON',
-8670=>'ON',
-8671=>'ON',
-8672=>'ON',
-8673=>'ON',
-8674=>'ON',
-8675=>'ON',
-8676=>'ON',
-8677=>'ON',
-8678=>'ON',
-8679=>'ON',
-8680=>'ON',
-8681=>'ON',
-8682=>'ON',
-8683=>'ON',
-8684=>'ON',
-8685=>'ON',
-8686=>'ON',
-8687=>'ON',
-8688=>'ON',
-8689=>'ON',
-8690=>'ON',
-8691=>'ON',
-8692=>'ON',
-8693=>'ON',
-8694=>'ON',
-8695=>'ON',
-8696=>'ON',
-8697=>'ON',
-8698=>'ON',
-8699=>'ON',
-8700=>'ON',
-8701=>'ON',
-8702=>'ON',
-8703=>'ON',
-8704=>'ON',
-8705=>'ON',
-8706=>'ON',
-8707=>'ON',
-8708=>'ON',
-8709=>'ON',
-8710=>'ON',
-8711=>'ON',
-8712=>'ON',
-8713=>'ON',
-8714=>'ON',
-8715=>'ON',
-8716=>'ON',
-8717=>'ON',
-8718=>'ON',
-8719=>'ON',
-8720=>'ON',
-8721=>'ON',
-8722=>'ES',
-8723=>'ET',
-8724=>'ON',
-8725=>'ON',
-8726=>'ON',
-8727=>'ON',
-8728=>'ON',
-8729=>'ON',
-8730=>'ON',
-8731=>'ON',
-8732=>'ON',
-8733=>'ON',
-8734=>'ON',
-8735=>'ON',
-8736=>'ON',
-8737=>'ON',
-8738=>'ON',
-8739=>'ON',
-8740=>'ON',
-8741=>'ON',
-8742=>'ON',
-8743=>'ON',
-8744=>'ON',
-8745=>'ON',
-8746=>'ON',
-8747=>'ON',
-8748=>'ON',
-8749=>'ON',
-8750=>'ON',
-8751=>'ON',
-8752=>'ON',
-8753=>'ON',
-8754=>'ON',
-8755=>'ON',
-8756=>'ON',
-8757=>'ON',
-8758=>'ON',
-8759=>'ON',
-8760=>'ON',
-8761=>'ON',
-8762=>'ON',
-8763=>'ON',
-8764=>'ON',
-8765=>'ON',
-8766=>'ON',
-8767=>'ON',
-8768=>'ON',
-8769=>'ON',
-8770=>'ON',
-8771=>'ON',
-8772=>'ON',
-8773=>'ON',
-8774=>'ON',
-8775=>'ON',
-8776=>'ON',
-8777=>'ON',
-8778=>'ON',
-8779=>'ON',
-8780=>'ON',
-8781=>'ON',
-8782=>'ON',
-8783=>'ON',
-8784=>'ON',
-8785=>'ON',
-8786=>'ON',
-8787=>'ON',
-8788=>'ON',
-8789=>'ON',
-8790=>'ON',
-8791=>'ON',
-8792=>'ON',
-8793=>'ON',
-8794=>'ON',
-8795=>'ON',
-8796=>'ON',
-8797=>'ON',
-8798=>'ON',
-8799=>'ON',
-8800=>'ON',
-8801=>'ON',
-8802=>'ON',
-8803=>'ON',
-8804=>'ON',
-8805=>'ON',
-8806=>'ON',
-8807=>'ON',
-8808=>'ON',
-8809=>'ON',
-8810=>'ON',
-8811=>'ON',
-8812=>'ON',
-8813=>'ON',
-8814=>'ON',
-8815=>'ON',
-8816=>'ON',
-8817=>'ON',
-8818=>'ON',
-8819=>'ON',
-8820=>'ON',
-8821=>'ON',
-8822=>'ON',
-8823=>'ON',
-8824=>'ON',
-8825=>'ON',
-8826=>'ON',
-8827=>'ON',
-8828=>'ON',
-8829=>'ON',
-8830=>'ON',
-8831=>'ON',
-8832=>'ON',
-8833=>'ON',
-8834=>'ON',
-8835=>'ON',
-8836=>'ON',
-8837=>'ON',
-8838=>'ON',
-8839=>'ON',
-8840=>'ON',
-8841=>'ON',
-8842=>'ON',
-8843=>'ON',
-8844=>'ON',
-8845=>'ON',
-8846=>'ON',
-8847=>'ON',
-8848=>'ON',
-8849=>'ON',
-8850=>'ON',
-8851=>'ON',
-8852=>'ON',
-8853=>'ON',
-8854=>'ON',
-8855=>'ON',
-8856=>'ON',
-8857=>'ON',
-8858=>'ON',
-8859=>'ON',
-8860=>'ON',
-8861=>'ON',
-8862=>'ON',
-8863=>'ON',
-8864=>'ON',
-8865=>'ON',
-8866=>'ON',
-8867=>'ON',
-8868=>'ON',
-8869=>'ON',
-8870=>'ON',
-8871=>'ON',
-8872=>'ON',
-8873=>'ON',
-8874=>'ON',
-8875=>'ON',
-8876=>'ON',
-8877=>'ON',
-8878=>'ON',
-8879=>'ON',
-8880=>'ON',
-8881=>'ON',
-8882=>'ON',
-8883=>'ON',
-8884=>'ON',
-8885=>'ON',
-8886=>'ON',
-8887=>'ON',
-8888=>'ON',
-8889=>'ON',
-8890=>'ON',
-8891=>'ON',
-8892=>'ON',
-8893=>'ON',
-8894=>'ON',
-8895=>'ON',
-8896=>'ON',
-8897=>'ON',
-8898=>'ON',
-8899=>'ON',
-8900=>'ON',
-8901=>'ON',
-8902=>'ON',
-8903=>'ON',
-8904=>'ON',
-8905=>'ON',
-8906=>'ON',
-8907=>'ON',
-8908=>'ON',
-8909=>'ON',
-8910=>'ON',
-8911=>'ON',
-8912=>'ON',
-8913=>'ON',
-8914=>'ON',
-8915=>'ON',
-8916=>'ON',
-8917=>'ON',
-8918=>'ON',
-8919=>'ON',
-8920=>'ON',
-8921=>'ON',
-8922=>'ON',
-8923=>'ON',
-8924=>'ON',
-8925=>'ON',
-8926=>'ON',
-8927=>'ON',
-8928=>'ON',
-8929=>'ON',
-8930=>'ON',
-8931=>'ON',
-8932=>'ON',
-8933=>'ON',
-8934=>'ON',
-8935=>'ON',
-8936=>'ON',
-8937=>'ON',
-8938=>'ON',
-8939=>'ON',
-8940=>'ON',
-8941=>'ON',
-8942=>'ON',
-8943=>'ON',
-8944=>'ON',
-8945=>'ON',
-8946=>'ON',
-8947=>'ON',
-8948=>'ON',
-8949=>'ON',
-8950=>'ON',
-8951=>'ON',
-8952=>'ON',
-8953=>'ON',
-8954=>'ON',
-8955=>'ON',
-8956=>'ON',
-8957=>'ON',
-8958=>'ON',
-8959=>'ON',
-8960=>'ON',
-8961=>'ON',
-8962=>'ON',
-8963=>'ON',
-8964=>'ON',
-8965=>'ON',
-8966=>'ON',
-8967=>'ON',
-8968=>'ON',
-8969=>'ON',
-8970=>'ON',
-8971=>'ON',
-8972=>'ON',
-8973=>'ON',
-8974=>'ON',
-8975=>'ON',
-8976=>'ON',
-8977=>'ON',
-8978=>'ON',
-8979=>'ON',
-8980=>'ON',
-8981=>'ON',
-8982=>'ON',
-8983=>'ON',
-8984=>'ON',
-8985=>'ON',
-8986=>'ON',
-8987=>'ON',
-8988=>'ON',
-8989=>'ON',
-8990=>'ON',
-8991=>'ON',
-8992=>'ON',
-8993=>'ON',
-8994=>'ON',
-8995=>'ON',
-8996=>'ON',
-8997=>'ON',
-8998=>'ON',
-8999=>'ON',
-9000=>'ON',
-9001=>'ON',
-9002=>'ON',
-9003=>'ON',
-9004=>'ON',
-9005=>'ON',
-9006=>'ON',
-9007=>'ON',
-9008=>'ON',
-9009=>'ON',
-9010=>'ON',
-9011=>'ON',
-9012=>'ON',
-9013=>'ON',
-9014=>'L',
-9015=>'L',
-9016=>'L',
-9017=>'L',
-9018=>'L',
-9019=>'L',
-9020=>'L',
-9021=>'L',
-9022=>'L',
-9023=>'L',
-9024=>'L',
-9025=>'L',
-9026=>'L',
-9027=>'L',
-9028=>'L',
-9029=>'L',
-9030=>'L',
-9031=>'L',
-9032=>'L',
-9033=>'L',
-9034=>'L',
-9035=>'L',
-9036=>'L',
-9037=>'L',
-9038=>'L',
-9039=>'L',
-9040=>'L',
-9041=>'L',
-9042=>'L',
-9043=>'L',
-9044=>'L',
-9045=>'L',
-9046=>'L',
-9047=>'L',
-9048=>'L',
-9049=>'L',
-9050=>'L',
-9051=>'L',
-9052=>'L',
-9053=>'L',
-9054=>'L',
-9055=>'L',
-9056=>'L',
-9057=>'L',
-9058=>'L',
-9059=>'L',
-9060=>'L',
-9061=>'L',
-9062=>'L',
-9063=>'L',
-9064=>'L',
-9065=>'L',
-9066=>'L',
-9067=>'L',
-9068=>'L',
-9069=>'L',
-9070=>'L',
-9071=>'L',
-9072=>'L',
-9073=>'L',
-9074=>'L',
-9075=>'L',
-9076=>'L',
-9077=>'L',
-9078=>'L',
-9079=>'L',
-9080=>'L',
-9081=>'L',
-9082=>'L',
-9083=>'ON',
-9084=>'ON',
-9085=>'ON',
-9086=>'ON',
-9087=>'ON',
-9088=>'ON',
-9089=>'ON',
-9090=>'ON',
-9091=>'ON',
-9092=>'ON',
-9093=>'ON',
-9094=>'ON',
-9095=>'ON',
-9096=>'ON',
-9097=>'ON',
-9098=>'ON',
-9099=>'ON',
-9100=>'ON',
-9101=>'ON',
-9102=>'ON',
-9103=>'ON',
-9104=>'ON',
-9105=>'ON',
-9106=>'ON',
-9107=>'ON',
-9108=>'ON',
-9109=>'L',
-9110=>'ON',
-9111=>'ON',
-9112=>'ON',
-9113=>'ON',
-9114=>'ON',
-9115=>'ON',
-9116=>'ON',
-9117=>'ON',
-9118=>'ON',
-9119=>'ON',
-9120=>'ON',
-9121=>'ON',
-9122=>'ON',
-9123=>'ON',
-9124=>'ON',
-9125=>'ON',
-9126=>'ON',
-9127=>'ON',
-9128=>'ON',
-9129=>'ON',
-9130=>'ON',
-9131=>'ON',
-9132=>'ON',
-9133=>'ON',
-9134=>'ON',
-9135=>'ON',
-9136=>'ON',
-9137=>'ON',
-9138=>'ON',
-9139=>'ON',
-9140=>'ON',
-9141=>'ON',
-9142=>'ON',
-9143=>'ON',
-9144=>'ON',
-9145=>'ON',
-9146=>'ON',
-9147=>'ON',
-9148=>'ON',
-9149=>'ON',
-9150=>'ON',
-9151=>'ON',
-9152=>'ON',
-9153=>'ON',
-9154=>'ON',
-9155=>'ON',
-9156=>'ON',
-9157=>'ON',
-9158=>'ON',
-9159=>'ON',
-9160=>'ON',
-9161=>'ON',
-9162=>'ON',
-9163=>'ON',
-9164=>'ON',
-9165=>'ON',
-9166=>'ON',
-9167=>'ON',
-9168=>'ON',
-9169=>'ON',
-9170=>'ON',
-9171=>'ON',
-9172=>'ON',
-9173=>'ON',
-9174=>'ON',
-9175=>'ON',
-9176=>'ON',
-9177=>'ON',
-9178=>'ON',
-9179=>'ON',
-9180=>'ON',
-9181=>'ON',
-9182=>'ON',
-9183=>'ON',
-9184=>'ON',
-9185=>'ON',
-9186=>'ON',
-9187=>'ON',
-9188=>'ON',
-9189=>'ON',
-9190=>'ON',
-9191=>'ON',
-9216=>'ON',
-9217=>'ON',
-9218=>'ON',
-9219=>'ON',
-9220=>'ON',
-9221=>'ON',
-9222=>'ON',
-9223=>'ON',
-9224=>'ON',
-9225=>'ON',
-9226=>'ON',
-9227=>'ON',
-9228=>'ON',
-9229=>'ON',
-9230=>'ON',
-9231=>'ON',
-9232=>'ON',
-9233=>'ON',
-9234=>'ON',
-9235=>'ON',
-9236=>'ON',
-9237=>'ON',
-9238=>'ON',
-9239=>'ON',
-9240=>'ON',
-9241=>'ON',
-9242=>'ON',
-9243=>'ON',
-9244=>'ON',
-9245=>'ON',
-9246=>'ON',
-9247=>'ON',
-9248=>'ON',
-9249=>'ON',
-9250=>'ON',
-9251=>'ON',
-9252=>'ON',
-9253=>'ON',
-9254=>'ON',
-9280=>'ON',
-9281=>'ON',
-9282=>'ON',
-9283=>'ON',
-9284=>'ON',
-9285=>'ON',
-9286=>'ON',
-9287=>'ON',
-9288=>'ON',
-9289=>'ON',
-9290=>'ON',
-9312=>'ON',
-9313=>'ON',
-9314=>'ON',
-9315=>'ON',
-9316=>'ON',
-9317=>'ON',
-9318=>'ON',
-9319=>'ON',
-9320=>'ON',
-9321=>'ON',
-9322=>'ON',
-9323=>'ON',
-9324=>'ON',
-9325=>'ON',
-9326=>'ON',
-9327=>'ON',
-9328=>'ON',
-9329=>'ON',
-9330=>'ON',
-9331=>'ON',
-9332=>'ON',
-9333=>'ON',
-9334=>'ON',
-9335=>'ON',
-9336=>'ON',
-9337=>'ON',
-9338=>'ON',
-9339=>'ON',
-9340=>'ON',
-9341=>'ON',
-9342=>'ON',
-9343=>'ON',
-9344=>'ON',
-9345=>'ON',
-9346=>'ON',
-9347=>'ON',
-9348=>'ON',
-9349=>'ON',
-9350=>'ON',
-9351=>'ON',
-9352=>'EN',
-9353=>'EN',
-9354=>'EN',
-9355=>'EN',
-9356=>'EN',
-9357=>'EN',
-9358=>'EN',
-9359=>'EN',
-9360=>'EN',
-9361=>'EN',
-9362=>'EN',
-9363=>'EN',
-9364=>'EN',
-9365=>'EN',
-9366=>'EN',
-9367=>'EN',
-9368=>'EN',
-9369=>'EN',
-9370=>'EN',
-9371=>'EN',
-9372=>'L',
-9373=>'L',
-9374=>'L',
-9375=>'L',
-9376=>'L',
-9377=>'L',
-9378=>'L',
-9379=>'L',
-9380=>'L',
-9381=>'L',
-9382=>'L',
-9383=>'L',
-9384=>'L',
-9385=>'L',
-9386=>'L',
-9387=>'L',
-9388=>'L',
-9389=>'L',
-9390=>'L',
-9391=>'L',
-9392=>'L',
-9393=>'L',
-9394=>'L',
-9395=>'L',
-9396=>'L',
-9397=>'L',
-9398=>'L',
-9399=>'L',
-9400=>'L',
-9401=>'L',
-9402=>'L',
-9403=>'L',
-9404=>'L',
-9405=>'L',
-9406=>'L',
-9407=>'L',
-9408=>'L',
-9409=>'L',
-9410=>'L',
-9411=>'L',
-9412=>'L',
-9413=>'L',
-9414=>'L',
-9415=>'L',
-9416=>'L',
-9417=>'L',
-9418=>'L',
-9419=>'L',
-9420=>'L',
-9421=>'L',
-9422=>'L',
-9423=>'L',
-9424=>'L',
-9425=>'L',
-9426=>'L',
-9427=>'L',
-9428=>'L',
-9429=>'L',
-9430=>'L',
-9431=>'L',
-9432=>'L',
-9433=>'L',
-9434=>'L',
-9435=>'L',
-9436=>'L',
-9437=>'L',
-9438=>'L',
-9439=>'L',
-9440=>'L',
-9441=>'L',
-9442=>'L',
-9443=>'L',
-9444=>'L',
-9445=>'L',
-9446=>'L',
-9447=>'L',
-9448=>'L',
-9449=>'L',
-9450=>'ON',
-9451=>'ON',
-9452=>'ON',
-9453=>'ON',
-9454=>'ON',
-9455=>'ON',
-9456=>'ON',
-9457=>'ON',
-9458=>'ON',
-9459=>'ON',
-9460=>'ON',
-9461=>'ON',
-9462=>'ON',
-9463=>'ON',
-9464=>'ON',
-9465=>'ON',
-9466=>'ON',
-9467=>'ON',
-9468=>'ON',
-9469=>'ON',
-9470=>'ON',
-9471=>'ON',
-9472=>'ON',
-9473=>'ON',
-9474=>'ON',
-9475=>'ON',
-9476=>'ON',
-9477=>'ON',
-9478=>'ON',
-9479=>'ON',
-9480=>'ON',
-9481=>'ON',
-9482=>'ON',
-9483=>'ON',
-9484=>'ON',
-9485=>'ON',
-9486=>'ON',
-9487=>'ON',
-9488=>'ON',
-9489=>'ON',
-9490=>'ON',
-9491=>'ON',
-9492=>'ON',
-9493=>'ON',
-9494=>'ON',
-9495=>'ON',
-9496=>'ON',
-9497=>'ON',
-9498=>'ON',
-9499=>'ON',
-9500=>'ON',
-9501=>'ON',
-9502=>'ON',
-9503=>'ON',
-9504=>'ON',
-9505=>'ON',
-9506=>'ON',
-9507=>'ON',
-9508=>'ON',
-9509=>'ON',
-9510=>'ON',
-9511=>'ON',
-9512=>'ON',
-9513=>'ON',
-9514=>'ON',
-9515=>'ON',
-9516=>'ON',
-9517=>'ON',
-9518=>'ON',
-9519=>'ON',
-9520=>'ON',
-9521=>'ON',
-9522=>'ON',
-9523=>'ON',
-9524=>'ON',
-9525=>'ON',
-9526=>'ON',
-9527=>'ON',
-9528=>'ON',
-9529=>'ON',
-9530=>'ON',
-9531=>'ON',
-9532=>'ON',
-9533=>'ON',
-9534=>'ON',
-9535=>'ON',
-9536=>'ON',
-9537=>'ON',
-9538=>'ON',
-9539=>'ON',
-9540=>'ON',
-9541=>'ON',
-9542=>'ON',
-9543=>'ON',
-9544=>'ON',
-9545=>'ON',
-9546=>'ON',
-9547=>'ON',
-9548=>'ON',
-9549=>'ON',
-9550=>'ON',
-9551=>'ON',
-9552=>'ON',
-9553=>'ON',
-9554=>'ON',
-9555=>'ON',
-9556=>'ON',
-9557=>'ON',
-9558=>'ON',
-9559=>'ON',
-9560=>'ON',
-9561=>'ON',
-9562=>'ON',
-9563=>'ON',
-9564=>'ON',
-9565=>'ON',
-9566=>'ON',
-9567=>'ON',
-9568=>'ON',
-9569=>'ON',
-9570=>'ON',
-9571=>'ON',
-9572=>'ON',
-9573=>'ON',
-9574=>'ON',
-9575=>'ON',
-9576=>'ON',
-9577=>'ON',
-9578=>'ON',
-9579=>'ON',
-9580=>'ON',
-9581=>'ON',
-9582=>'ON',
-9583=>'ON',
-9584=>'ON',
-9585=>'ON',
-9586=>'ON',
-9587=>'ON',
-9588=>'ON',
-9589=>'ON',
-9590=>'ON',
-9591=>'ON',
-9592=>'ON',
-9593=>'ON',
-9594=>'ON',
-9595=>'ON',
-9596=>'ON',
-9597=>'ON',
-9598=>'ON',
-9599=>'ON',
-9600=>'ON',
-9601=>'ON',
-9602=>'ON',
-9603=>'ON',
-9604=>'ON',
-9605=>'ON',
-9606=>'ON',
-9607=>'ON',
-9608=>'ON',
-9609=>'ON',
-9610=>'ON',
-9611=>'ON',
-9612=>'ON',
-9613=>'ON',
-9614=>'ON',
-9615=>'ON',
-9616=>'ON',
-9617=>'ON',
-9618=>'ON',
-9619=>'ON',
-9620=>'ON',
-9621=>'ON',
-9622=>'ON',
-9623=>'ON',
-9624=>'ON',
-9625=>'ON',
-9626=>'ON',
-9627=>'ON',
-9628=>'ON',
-9629=>'ON',
-9630=>'ON',
-9631=>'ON',
-9632=>'ON',
-9633=>'ON',
-9634=>'ON',
-9635=>'ON',
-9636=>'ON',
-9637=>'ON',
-9638=>'ON',
-9639=>'ON',
-9640=>'ON',
-9641=>'ON',
-9642=>'ON',
-9643=>'ON',
-9644=>'ON',
-9645=>'ON',
-9646=>'ON',
-9647=>'ON',
-9648=>'ON',
-9649=>'ON',
-9650=>'ON',
-9651=>'ON',
-9652=>'ON',
-9653=>'ON',
-9654=>'ON',
-9655=>'ON',
-9656=>'ON',
-9657=>'ON',
-9658=>'ON',
-9659=>'ON',
-9660=>'ON',
-9661=>'ON',
-9662=>'ON',
-9663=>'ON',
-9664=>'ON',
-9665=>'ON',
-9666=>'ON',
-9667=>'ON',
-9668=>'ON',
-9669=>'ON',
-9670=>'ON',
-9671=>'ON',
-9672=>'ON',
-9673=>'ON',
-9674=>'ON',
-9675=>'ON',
-9676=>'ON',
-9677=>'ON',
-9678=>'ON',
-9679=>'ON',
-9680=>'ON',
-9681=>'ON',
-9682=>'ON',
-9683=>'ON',
-9684=>'ON',
-9685=>'ON',
-9686=>'ON',
-9687=>'ON',
-9688=>'ON',
-9689=>'ON',
-9690=>'ON',
-9691=>'ON',
-9692=>'ON',
-9693=>'ON',
-9694=>'ON',
-9695=>'ON',
-9696=>'ON',
-9697=>'ON',
-9698=>'ON',
-9699=>'ON',
-9700=>'ON',
-9701=>'ON',
-9702=>'ON',
-9703=>'ON',
-9704=>'ON',
-9705=>'ON',
-9706=>'ON',
-9707=>'ON',
-9708=>'ON',
-9709=>'ON',
-9710=>'ON',
-9711=>'ON',
-9712=>'ON',
-9713=>'ON',
-9714=>'ON',
-9715=>'ON',
-9716=>'ON',
-9717=>'ON',
-9718=>'ON',
-9719=>'ON',
-9720=>'ON',
-9721=>'ON',
-9722=>'ON',
-9723=>'ON',
-9724=>'ON',
-9725=>'ON',
-9726=>'ON',
-9727=>'ON',
-9728=>'ON',
-9729=>'ON',
-9730=>'ON',
-9731=>'ON',
-9732=>'ON',
-9733=>'ON',
-9734=>'ON',
-9735=>'ON',
-9736=>'ON',
-9737=>'ON',
-9738=>'ON',
-9739=>'ON',
-9740=>'ON',
-9741=>'ON',
-9742=>'ON',
-9743=>'ON',
-9744=>'ON',
-9745=>'ON',
-9746=>'ON',
-9747=>'ON',
-9748=>'ON',
-9749=>'ON',
-9750=>'ON',
-9751=>'ON',
-9752=>'ON',
-9753=>'ON',
-9754=>'ON',
-9755=>'ON',
-9756=>'ON',
-9757=>'ON',
-9758=>'ON',
-9759=>'ON',
-9760=>'ON',
-9761=>'ON',
-9762=>'ON',
-9763=>'ON',
-9764=>'ON',
-9765=>'ON',
-9766=>'ON',
-9767=>'ON',
-9768=>'ON',
-9769=>'ON',
-9770=>'ON',
-9771=>'ON',
-9772=>'ON',
-9773=>'ON',
-9774=>'ON',
-9775=>'ON',
-9776=>'ON',
-9777=>'ON',
-9778=>'ON',
-9779=>'ON',
-9780=>'ON',
-9781=>'ON',
-9782=>'ON',
-9783=>'ON',
-9784=>'ON',
-9785=>'ON',
-9786=>'ON',
-9787=>'ON',
-9788=>'ON',
-9789=>'ON',
-9790=>'ON',
-9791=>'ON',
-9792=>'ON',
-9793=>'ON',
-9794=>'ON',
-9795=>'ON',
-9796=>'ON',
-9797=>'ON',
-9798=>'ON',
-9799=>'ON',
-9800=>'ON',
-9801=>'ON',
-9802=>'ON',
-9803=>'ON',
-9804=>'ON',
-9805=>'ON',
-9806=>'ON',
-9807=>'ON',
-9808=>'ON',
-9809=>'ON',
-9810=>'ON',
-9811=>'ON',
-9812=>'ON',
-9813=>'ON',
-9814=>'ON',
-9815=>'ON',
-9816=>'ON',
-9817=>'ON',
-9818=>'ON',
-9819=>'ON',
-9820=>'ON',
-9821=>'ON',
-9822=>'ON',
-9823=>'ON',
-9824=>'ON',
-9825=>'ON',
-9826=>'ON',
-9827=>'ON',
-9828=>'ON',
-9829=>'ON',
-9830=>'ON',
-9831=>'ON',
-9832=>'ON',
-9833=>'ON',
-9834=>'ON',
-9835=>'ON',
-9836=>'ON',
-9837=>'ON',
-9838=>'ON',
-9839=>'ON',
-9840=>'ON',
-9841=>'ON',
-9842=>'ON',
-9843=>'ON',
-9844=>'ON',
-9845=>'ON',
-9846=>'ON',
-9847=>'ON',
-9848=>'ON',
-9849=>'ON',
-9850=>'ON',
-9851=>'ON',
-9852=>'ON',
-9853=>'ON',
-9854=>'ON',
-9855=>'ON',
-9856=>'ON',
-9857=>'ON',
-9858=>'ON',
-9859=>'ON',
-9860=>'ON',
-9861=>'ON',
-9862=>'ON',
-9863=>'ON',
-9864=>'ON',
-9865=>'ON',
-9866=>'ON',
-9867=>'ON',
-9868=>'ON',
-9869=>'ON',
-9870=>'ON',
-9871=>'ON',
-9872=>'ON',
-9873=>'ON',
-9874=>'ON',
-9875=>'ON',
-9876=>'ON',
-9877=>'ON',
-9878=>'ON',
-9879=>'ON',
-9880=>'ON',
-9881=>'ON',
-9882=>'ON',
-9883=>'ON',
-9884=>'ON',
-9888=>'ON',
-9889=>'ON',
-9890=>'ON',
-9891=>'ON',
-9892=>'ON',
-9893=>'ON',
-9894=>'ON',
-9895=>'ON',
-9896=>'ON',
-9897=>'ON',
-9898=>'ON',
-9899=>'ON',
-9900=>'L',
-9901=>'ON',
-9902=>'ON',
-9903=>'ON',
-9904=>'ON',
-9905=>'ON',
-9906=>'ON',
-9985=>'ON',
-9986=>'ON',
-9987=>'ON',
-9988=>'ON',
-9990=>'ON',
-9991=>'ON',
-9992=>'ON',
-9993=>'ON',
-9996=>'ON',
-9997=>'ON',
-9998=>'ON',
-9999=>'ON',
-10000=>'ON',
-10001=>'ON',
-10002=>'ON',
-10003=>'ON',
-10004=>'ON',
-10005=>'ON',
-10006=>'ON',
-10007=>'ON',
-10008=>'ON',
-10009=>'ON',
-10010=>'ON',
-10011=>'ON',
-10012=>'ON',
-10013=>'ON',
-10014=>'ON',
-10015=>'ON',
-10016=>'ON',
-10017=>'ON',
-10018=>'ON',
-10019=>'ON',
-10020=>'ON',
-10021=>'ON',
-10022=>'ON',
-10023=>'ON',
-10025=>'ON',
-10026=>'ON',
-10027=>'ON',
-10028=>'ON',
-10029=>'ON',
-10030=>'ON',
-10031=>'ON',
-10032=>'ON',
-10033=>'ON',
-10034=>'ON',
-10035=>'ON',
-10036=>'ON',
-10037=>'ON',
-10038=>'ON',
-10039=>'ON',
-10040=>'ON',
-10041=>'ON',
-10042=>'ON',
-10043=>'ON',
-10044=>'ON',
-10045=>'ON',
-10046=>'ON',
-10047=>'ON',
-10048=>'ON',
-10049=>'ON',
-10050=>'ON',
-10051=>'ON',
-10052=>'ON',
-10053=>'ON',
-10054=>'ON',
-10055=>'ON',
-10056=>'ON',
-10057=>'ON',
-10058=>'ON',
-10059=>'ON',
-10061=>'ON',
-10063=>'ON',
-10064=>'ON',
-10065=>'ON',
-10066=>'ON',
-10070=>'ON',
-10072=>'ON',
-10073=>'ON',
-10074=>'ON',
-10075=>'ON',
-10076=>'ON',
-10077=>'ON',
-10078=>'ON',
-10081=>'ON',
-10082=>'ON',
-10083=>'ON',
-10084=>'ON',
-10085=>'ON',
-10086=>'ON',
-10087=>'ON',
-10088=>'ON',
-10089=>'ON',
-10090=>'ON',
-10091=>'ON',
-10092=>'ON',
-10093=>'ON',
-10094=>'ON',
-10095=>'ON',
-10096=>'ON',
-10097=>'ON',
-10098=>'ON',
-10099=>'ON',
-10100=>'ON',
-10101=>'ON',
-10102=>'ON',
-10103=>'ON',
-10104=>'ON',
-10105=>'ON',
-10106=>'ON',
-10107=>'ON',
-10108=>'ON',
-10109=>'ON',
-10110=>'ON',
-10111=>'ON',
-10112=>'ON',
-10113=>'ON',
-10114=>'ON',
-10115=>'ON',
-10116=>'ON',
-10117=>'ON',
-10118=>'ON',
-10119=>'ON',
-10120=>'ON',
-10121=>'ON',
-10122=>'ON',
-10123=>'ON',
-10124=>'ON',
-10125=>'ON',
-10126=>'ON',
-10127=>'ON',
-10128=>'ON',
-10129=>'ON',
-10130=>'ON',
-10131=>'ON',
-10132=>'ON',
-10136=>'ON',
-10137=>'ON',
-10138=>'ON',
-10139=>'ON',
-10140=>'ON',
-10141=>'ON',
-10142=>'ON',
-10143=>'ON',
-10144=>'ON',
-10145=>'ON',
-10146=>'ON',
-10147=>'ON',
-10148=>'ON',
-10149=>'ON',
-10150=>'ON',
-10151=>'ON',
-10152=>'ON',
-10153=>'ON',
-10154=>'ON',
-10155=>'ON',
-10156=>'ON',
-10157=>'ON',
-10158=>'ON',
-10159=>'ON',
-10161=>'ON',
-10162=>'ON',
-10163=>'ON',
-10164=>'ON',
-10165=>'ON',
-10166=>'ON',
-10167=>'ON',
-10168=>'ON',
-10169=>'ON',
-10170=>'ON',
-10171=>'ON',
-10172=>'ON',
-10173=>'ON',
-10174=>'ON',
-10176=>'ON',
-10177=>'ON',
-10178=>'ON',
-10179=>'ON',
-10180=>'ON',
-10181=>'ON',
-10182=>'ON',
-10183=>'ON',
-10184=>'ON',
-10185=>'ON',
-10186=>'ON',
-10192=>'ON',
-10193=>'ON',
-10194=>'ON',
-10195=>'ON',
-10196=>'ON',
-10197=>'ON',
-10198=>'ON',
-10199=>'ON',
-10200=>'ON',
-10201=>'ON',
-10202=>'ON',
-10203=>'ON',
-10204=>'ON',
-10205=>'ON',
-10206=>'ON',
-10207=>'ON',
-10208=>'ON',
-10209=>'ON',
-10210=>'ON',
-10211=>'ON',
-10212=>'ON',
-10213=>'ON',
-10214=>'ON',
-10215=>'ON',
-10216=>'ON',
-10217=>'ON',
-10218=>'ON',
-10219=>'ON',
-10224=>'ON',
-10225=>'ON',
-10226=>'ON',
-10227=>'ON',
-10228=>'ON',
-10229=>'ON',
-10230=>'ON',
-10231=>'ON',
-10232=>'ON',
-10233=>'ON',
-10234=>'ON',
-10235=>'ON',
-10236=>'ON',
-10237=>'ON',
-10238=>'ON',
-10239=>'ON',
-10240=>'L',
-10241=>'L',
-10242=>'L',
-10243=>'L',
-10244=>'L',
-10245=>'L',
-10246=>'L',
-10247=>'L',
-10248=>'L',
-10249=>'L',
-10250=>'L',
-10251=>'L',
-10252=>'L',
-10253=>'L',
-10254=>'L',
-10255=>'L',
-10256=>'L',
-10257=>'L',
-10258=>'L',
-10259=>'L',
-10260=>'L',
-10261=>'L',
-10262=>'L',
-10263=>'L',
-10264=>'L',
-10265=>'L',
-10266=>'L',
-10267=>'L',
-10268=>'L',
-10269=>'L',
-10270=>'L',
-10271=>'L',
-10272=>'L',
-10273=>'L',
-10274=>'L',
-10275=>'L',
-10276=>'L',
-10277=>'L',
-10278=>'L',
-10279=>'L',
-10280=>'L',
-10281=>'L',
-10282=>'L',
-10283=>'L',
-10284=>'L',
-10285=>'L',
-10286=>'L',
-10287=>'L',
-10288=>'L',
-10289=>'L',
-10290=>'L',
-10291=>'L',
-10292=>'L',
-10293=>'L',
-10294=>'L',
-10295=>'L',
-10296=>'L',
-10297=>'L',
-10298=>'L',
-10299=>'L',
-10300=>'L',
-10301=>'L',
-10302=>'L',
-10303=>'L',
-10304=>'L',
-10305=>'L',
-10306=>'L',
-10307=>'L',
-10308=>'L',
-10309=>'L',
-10310=>'L',
-10311=>'L',
-10312=>'L',
-10313=>'L',
-10314=>'L',
-10315=>'L',
-10316=>'L',
-10317=>'L',
-10318=>'L',
-10319=>'L',
-10320=>'L',
-10321=>'L',
-10322=>'L',
-10323=>'L',
-10324=>'L',
-10325=>'L',
-10326=>'L',
-10327=>'L',
-10328=>'L',
-10329=>'L',
-10330=>'L',
-10331=>'L',
-10332=>'L',
-10333=>'L',
-10334=>'L',
-10335=>'L',
-10336=>'L',
-10337=>'L',
-10338=>'L',
-10339=>'L',
-10340=>'L',
-10341=>'L',
-10342=>'L',
-10343=>'L',
-10344=>'L',
-10345=>'L',
-10346=>'L',
-10347=>'L',
-10348=>'L',
-10349=>'L',
-10350=>'L',
-10351=>'L',
-10352=>'L',
-10353=>'L',
-10354=>'L',
-10355=>'L',
-10356=>'L',
-10357=>'L',
-10358=>'L',
-10359=>'L',
-10360=>'L',
-10361=>'L',
-10362=>'L',
-10363=>'L',
-10364=>'L',
-10365=>'L',
-10366=>'L',
-10367=>'L',
-10368=>'L',
-10369=>'L',
-10370=>'L',
-10371=>'L',
-10372=>'L',
-10373=>'L',
-10374=>'L',
-10375=>'L',
-10376=>'L',
-10377=>'L',
-10378=>'L',
-10379=>'L',
-10380=>'L',
-10381=>'L',
-10382=>'L',
-10383=>'L',
-10384=>'L',
-10385=>'L',
-10386=>'L',
-10387=>'L',
-10388=>'L',
-10389=>'L',
-10390=>'L',
-10391=>'L',
-10392=>'L',
-10393=>'L',
-10394=>'L',
-10395=>'L',
-10396=>'L',
-10397=>'L',
-10398=>'L',
-10399=>'L',
-10400=>'L',
-10401=>'L',
-10402=>'L',
-10403=>'L',
-10404=>'L',
-10405=>'L',
-10406=>'L',
-10407=>'L',
-10408=>'L',
-10409=>'L',
-10410=>'L',
-10411=>'L',
-10412=>'L',
-10413=>'L',
-10414=>'L',
-10415=>'L',
-10416=>'L',
-10417=>'L',
-10418=>'L',
-10419=>'L',
-10420=>'L',
-10421=>'L',
-10422=>'L',
-10423=>'L',
-10424=>'L',
-10425=>'L',
-10426=>'L',
-10427=>'L',
-10428=>'L',
-10429=>'L',
-10430=>'L',
-10431=>'L',
-10432=>'L',
-10433=>'L',
-10434=>'L',
-10435=>'L',
-10436=>'L',
-10437=>'L',
-10438=>'L',
-10439=>'L',
-10440=>'L',
-10441=>'L',
-10442=>'L',
-10443=>'L',
-10444=>'L',
-10445=>'L',
-10446=>'L',
-10447=>'L',
-10448=>'L',
-10449=>'L',
-10450=>'L',
-10451=>'L',
-10452=>'L',
-10453=>'L',
-10454=>'L',
-10455=>'L',
-10456=>'L',
-10457=>'L',
-10458=>'L',
-10459=>'L',
-10460=>'L',
-10461=>'L',
-10462=>'L',
-10463=>'L',
-10464=>'L',
-10465=>'L',
-10466=>'L',
-10467=>'L',
-10468=>'L',
-10469=>'L',
-10470=>'L',
-10471=>'L',
-10472=>'L',
-10473=>'L',
-10474=>'L',
-10475=>'L',
-10476=>'L',
-10477=>'L',
-10478=>'L',
-10479=>'L',
-10480=>'L',
-10481=>'L',
-10482=>'L',
-10483=>'L',
-10484=>'L',
-10485=>'L',
-10486=>'L',
-10487=>'L',
-10488=>'L',
-10489=>'L',
-10490=>'L',
-10491=>'L',
-10492=>'L',
-10493=>'L',
-10494=>'L',
-10495=>'L',
-10496=>'ON',
-10497=>'ON',
-10498=>'ON',
-10499=>'ON',
-10500=>'ON',
-10501=>'ON',
-10502=>'ON',
-10503=>'ON',
-10504=>'ON',
-10505=>'ON',
-10506=>'ON',
-10507=>'ON',
-10508=>'ON',
-10509=>'ON',
-10510=>'ON',
-10511=>'ON',
-10512=>'ON',
-10513=>'ON',
-10514=>'ON',
-10515=>'ON',
-10516=>'ON',
-10517=>'ON',
-10518=>'ON',
-10519=>'ON',
-10520=>'ON',
-10521=>'ON',
-10522=>'ON',
-10523=>'ON',
-10524=>'ON',
-10525=>'ON',
-10526=>'ON',
-10527=>'ON',
-10528=>'ON',
-10529=>'ON',
-10530=>'ON',
-10531=>'ON',
-10532=>'ON',
-10533=>'ON',
-10534=>'ON',
-10535=>'ON',
-10536=>'ON',
-10537=>'ON',
-10538=>'ON',
-10539=>'ON',
-10540=>'ON',
-10541=>'ON',
-10542=>'ON',
-10543=>'ON',
-10544=>'ON',
-10545=>'ON',
-10546=>'ON',
-10547=>'ON',
-10548=>'ON',
-10549=>'ON',
-10550=>'ON',
-10551=>'ON',
-10552=>'ON',
-10553=>'ON',
-10554=>'ON',
-10555=>'ON',
-10556=>'ON',
-10557=>'ON',
-10558=>'ON',
-10559=>'ON',
-10560=>'ON',
-10561=>'ON',
-10562=>'ON',
-10563=>'ON',
-10564=>'ON',
-10565=>'ON',
-10566=>'ON',
-10567=>'ON',
-10568=>'ON',
-10569=>'ON',
-10570=>'ON',
-10571=>'ON',
-10572=>'ON',
-10573=>'ON',
-10574=>'ON',
-10575=>'ON',
-10576=>'ON',
-10577=>'ON',
-10578=>'ON',
-10579=>'ON',
-10580=>'ON',
-10581=>'ON',
-10582=>'ON',
-10583=>'ON',
-10584=>'ON',
-10585=>'ON',
-10586=>'ON',
-10587=>'ON',
-10588=>'ON',
-10589=>'ON',
-10590=>'ON',
-10591=>'ON',
-10592=>'ON',
-10593=>'ON',
-10594=>'ON',
-10595=>'ON',
-10596=>'ON',
-10597=>'ON',
-10598=>'ON',
-10599=>'ON',
-10600=>'ON',
-10601=>'ON',
-10602=>'ON',
-10603=>'ON',
-10604=>'ON',
-10605=>'ON',
-10606=>'ON',
-10607=>'ON',
-10608=>'ON',
-10609=>'ON',
-10610=>'ON',
-10611=>'ON',
-10612=>'ON',
-10613=>'ON',
-10614=>'ON',
-10615=>'ON',
-10616=>'ON',
-10617=>'ON',
-10618=>'ON',
-10619=>'ON',
-10620=>'ON',
-10621=>'ON',
-10622=>'ON',
-10623=>'ON',
-10624=>'ON',
-10625=>'ON',
-10626=>'ON',
-10627=>'ON',
-10628=>'ON',
-10629=>'ON',
-10630=>'ON',
-10631=>'ON',
-10632=>'ON',
-10633=>'ON',
-10634=>'ON',
-10635=>'ON',
-10636=>'ON',
-10637=>'ON',
-10638=>'ON',
-10639=>'ON',
-10640=>'ON',
-10641=>'ON',
-10642=>'ON',
-10643=>'ON',
-10644=>'ON',
-10645=>'ON',
-10646=>'ON',
-10647=>'ON',
-10648=>'ON',
-10649=>'ON',
-10650=>'ON',
-10651=>'ON',
-10652=>'ON',
-10653=>'ON',
-10654=>'ON',
-10655=>'ON',
-10656=>'ON',
-10657=>'ON',
-10658=>'ON',
-10659=>'ON',
-10660=>'ON',
-10661=>'ON',
-10662=>'ON',
-10663=>'ON',
-10664=>'ON',
-10665=>'ON',
-10666=>'ON',
-10667=>'ON',
-10668=>'ON',
-10669=>'ON',
-10670=>'ON',
-10671=>'ON',
-10672=>'ON',
-10673=>'ON',
-10674=>'ON',
-10675=>'ON',
-10676=>'ON',
-10677=>'ON',
-10678=>'ON',
-10679=>'ON',
-10680=>'ON',
-10681=>'ON',
-10682=>'ON',
-10683=>'ON',
-10684=>'ON',
-10685=>'ON',
-10686=>'ON',
-10687=>'ON',
-10688=>'ON',
-10689=>'ON',
-10690=>'ON',
-10691=>'ON',
-10692=>'ON',
-10693=>'ON',
-10694=>'ON',
-10695=>'ON',
-10696=>'ON',
-10697=>'ON',
-10698=>'ON',
-10699=>'ON',
-10700=>'ON',
-10701=>'ON',
-10702=>'ON',
-10703=>'ON',
-10704=>'ON',
-10705=>'ON',
-10706=>'ON',
-10707=>'ON',
-10708=>'ON',
-10709=>'ON',
-10710=>'ON',
-10711=>'ON',
-10712=>'ON',
-10713=>'ON',
-10714=>'ON',
-10715=>'ON',
-10716=>'ON',
-10717=>'ON',
-10718=>'ON',
-10719=>'ON',
-10720=>'ON',
-10721=>'ON',
-10722=>'ON',
-10723=>'ON',
-10724=>'ON',
-10725=>'ON',
-10726=>'ON',
-10727=>'ON',
-10728=>'ON',
-10729=>'ON',
-10730=>'ON',
-10731=>'ON',
-10732=>'ON',
-10733=>'ON',
-10734=>'ON',
-10735=>'ON',
-10736=>'ON',
-10737=>'ON',
-10738=>'ON',
-10739=>'ON',
-10740=>'ON',
-10741=>'ON',
-10742=>'ON',
-10743=>'ON',
-10744=>'ON',
-10745=>'ON',
-10746=>'ON',
-10747=>'ON',
-10748=>'ON',
-10749=>'ON',
-10750=>'ON',
-10751=>'ON',
-10752=>'ON',
-10753=>'ON',
-10754=>'ON',
-10755=>'ON',
-10756=>'ON',
-10757=>'ON',
-10758=>'ON',
-10759=>'ON',
-10760=>'ON',
-10761=>'ON',
-10762=>'ON',
-10763=>'ON',
-10764=>'ON',
-10765=>'ON',
-10766=>'ON',
-10767=>'ON',
-10768=>'ON',
-10769=>'ON',
-10770=>'ON',
-10771=>'ON',
-10772=>'ON',
-10773=>'ON',
-10774=>'ON',
-10775=>'ON',
-10776=>'ON',
-10777=>'ON',
-10778=>'ON',
-10779=>'ON',
-10780=>'ON',
-10781=>'ON',
-10782=>'ON',
-10783=>'ON',
-10784=>'ON',
-10785=>'ON',
-10786=>'ON',
-10787=>'ON',
-10788=>'ON',
-10789=>'ON',
-10790=>'ON',
-10791=>'ON',
-10792=>'ON',
-10793=>'ON',
-10794=>'ON',
-10795=>'ON',
-10796=>'ON',
-10797=>'ON',
-10798=>'ON',
-10799=>'ON',
-10800=>'ON',
-10801=>'ON',
-10802=>'ON',
-10803=>'ON',
-10804=>'ON',
-10805=>'ON',
-10806=>'ON',
-10807=>'ON',
-10808=>'ON',
-10809=>'ON',
-10810=>'ON',
-10811=>'ON',
-10812=>'ON',
-10813=>'ON',
-10814=>'ON',
-10815=>'ON',
-10816=>'ON',
-10817=>'ON',
-10818=>'ON',
-10819=>'ON',
-10820=>'ON',
-10821=>'ON',
-10822=>'ON',
-10823=>'ON',
-10824=>'ON',
-10825=>'ON',
-10826=>'ON',
-10827=>'ON',
-10828=>'ON',
-10829=>'ON',
-10830=>'ON',
-10831=>'ON',
-10832=>'ON',
-10833=>'ON',
-10834=>'ON',
-10835=>'ON',
-10836=>'ON',
-10837=>'ON',
-10838=>'ON',
-10839=>'ON',
-10840=>'ON',
-10841=>'ON',
-10842=>'ON',
-10843=>'ON',
-10844=>'ON',
-10845=>'ON',
-10846=>'ON',
-10847=>'ON',
-10848=>'ON',
-10849=>'ON',
-10850=>'ON',
-10851=>'ON',
-10852=>'ON',
-10853=>'ON',
-10854=>'ON',
-10855=>'ON',
-10856=>'ON',
-10857=>'ON',
-10858=>'ON',
-10859=>'ON',
-10860=>'ON',
-10861=>'ON',
-10862=>'ON',
-10863=>'ON',
-10864=>'ON',
-10865=>'ON',
-10866=>'ON',
-10867=>'ON',
-10868=>'ON',
-10869=>'ON',
-10870=>'ON',
-10871=>'ON',
-10872=>'ON',
-10873=>'ON',
-10874=>'ON',
-10875=>'ON',
-10876=>'ON',
-10877=>'ON',
-10878=>'ON',
-10879=>'ON',
-10880=>'ON',
-10881=>'ON',
-10882=>'ON',
-10883=>'ON',
-10884=>'ON',
-10885=>'ON',
-10886=>'ON',
-10887=>'ON',
-10888=>'ON',
-10889=>'ON',
-10890=>'ON',
-10891=>'ON',
-10892=>'ON',
-10893=>'ON',
-10894=>'ON',
-10895=>'ON',
-10896=>'ON',
-10897=>'ON',
-10898=>'ON',
-10899=>'ON',
-10900=>'ON',
-10901=>'ON',
-10902=>'ON',
-10903=>'ON',
-10904=>'ON',
-10905=>'ON',
-10906=>'ON',
-10907=>'ON',
-10908=>'ON',
-10909=>'ON',
-10910=>'ON',
-10911=>'ON',
-10912=>'ON',
-10913=>'ON',
-10914=>'ON',
-10915=>'ON',
-10916=>'ON',
-10917=>'ON',
-10918=>'ON',
-10919=>'ON',
-10920=>'ON',
-10921=>'ON',
-10922=>'ON',
-10923=>'ON',
-10924=>'ON',
-10925=>'ON',
-10926=>'ON',
-10927=>'ON',
-10928=>'ON',
-10929=>'ON',
-10930=>'ON',
-10931=>'ON',
-10932=>'ON',
-10933=>'ON',
-10934=>'ON',
-10935=>'ON',
-10936=>'ON',
-10937=>'ON',
-10938=>'ON',
-10939=>'ON',
-10940=>'ON',
-10941=>'ON',
-10942=>'ON',
-10943=>'ON',
-10944=>'ON',
-10945=>'ON',
-10946=>'ON',
-10947=>'ON',
-10948=>'ON',
-10949=>'ON',
-10950=>'ON',
-10951=>'ON',
-10952=>'ON',
-10953=>'ON',
-10954=>'ON',
-10955=>'ON',
-10956=>'ON',
-10957=>'ON',
-10958=>'ON',
-10959=>'ON',
-10960=>'ON',
-10961=>'ON',
-10962=>'ON',
-10963=>'ON',
-10964=>'ON',
-10965=>'ON',
-10966=>'ON',
-10967=>'ON',
-10968=>'ON',
-10969=>'ON',
-10970=>'ON',
-10971=>'ON',
-10972=>'ON',
-10973=>'ON',
-10974=>'ON',
-10975=>'ON',
-10976=>'ON',
-10977=>'ON',
-10978=>'ON',
-10979=>'ON',
-10980=>'ON',
-10981=>'ON',
-10982=>'ON',
-10983=>'ON',
-10984=>'ON',
-10985=>'ON',
-10986=>'ON',
-10987=>'ON',
-10988=>'ON',
-10989=>'ON',
-10990=>'ON',
-10991=>'ON',
-10992=>'ON',
-10993=>'ON',
-10994=>'ON',
-10995=>'ON',
-10996=>'ON',
-10997=>'ON',
-10998=>'ON',
-10999=>'ON',
-11000=>'ON',
-11001=>'ON',
-11002=>'ON',
-11003=>'ON',
-11004=>'ON',
-11005=>'ON',
-11006=>'ON',
-11007=>'ON',
-11008=>'ON',
-11009=>'ON',
-11010=>'ON',
-11011=>'ON',
-11012=>'ON',
-11013=>'ON',
-11014=>'ON',
-11015=>'ON',
-11016=>'ON',
-11017=>'ON',
-11018=>'ON',
-11019=>'ON',
-11020=>'ON',
-11021=>'ON',
-11022=>'ON',
-11023=>'ON',
-11024=>'ON',
-11025=>'ON',
-11026=>'ON',
-11027=>'ON',
-11028=>'ON',
-11029=>'ON',
-11030=>'ON',
-11031=>'ON',
-11032=>'ON',
-11033=>'ON',
-11034=>'ON',
-11040=>'ON',
-11041=>'ON',
-11042=>'ON',
-11043=>'ON',
-11264=>'L',
-11265=>'L',
-11266=>'L',
-11267=>'L',
-11268=>'L',
-11269=>'L',
-11270=>'L',
-11271=>'L',
-11272=>'L',
-11273=>'L',
-11274=>'L',
-11275=>'L',
-11276=>'L',
-11277=>'L',
-11278=>'L',
-11279=>'L',
-11280=>'L',
-11281=>'L',
-11282=>'L',
-11283=>'L',
-11284=>'L',
-11285=>'L',
-11286=>'L',
-11287=>'L',
-11288=>'L',
-11289=>'L',
-11290=>'L',
-11291=>'L',
-11292=>'L',
-11293=>'L',
-11294=>'L',
-11295=>'L',
-11296=>'L',
-11297=>'L',
-11298=>'L',
-11299=>'L',
-11300=>'L',
-11301=>'L',
-11302=>'L',
-11303=>'L',
-11304=>'L',
-11305=>'L',
-11306=>'L',
-11307=>'L',
-11308=>'L',
-11309=>'L',
-11310=>'L',
-11312=>'L',
-11313=>'L',
-11314=>'L',
-11315=>'L',
-11316=>'L',
-11317=>'L',
-11318=>'L',
-11319=>'L',
-11320=>'L',
-11321=>'L',
-11322=>'L',
-11323=>'L',
-11324=>'L',
-11325=>'L',
-11326=>'L',
-11327=>'L',
-11328=>'L',
-11329=>'L',
-11330=>'L',
-11331=>'L',
-11332=>'L',
-11333=>'L',
-11334=>'L',
-11335=>'L',
-11336=>'L',
-11337=>'L',
-11338=>'L',
-11339=>'L',
-11340=>'L',
-11341=>'L',
-11342=>'L',
-11343=>'L',
-11344=>'L',
-11345=>'L',
-11346=>'L',
-11347=>'L',
-11348=>'L',
-11349=>'L',
-11350=>'L',
-11351=>'L',
-11352=>'L',
-11353=>'L',
-11354=>'L',
-11355=>'L',
-11356=>'L',
-11357=>'L',
-11358=>'L',
-11360=>'L',
-11361=>'L',
-11362=>'L',
-11363=>'L',
-11364=>'L',
-11365=>'L',
-11366=>'L',
-11367=>'L',
-11368=>'L',
-11369=>'L',
-11370=>'L',
-11371=>'L',
-11372=>'L',
-11380=>'L',
-11381=>'L',
-11382=>'L',
-11383=>'L',
-11392=>'L',
-11393=>'L',
-11394=>'L',
-11395=>'L',
-11396=>'L',
-11397=>'L',
-11398=>'L',
-11399=>'L',
-11400=>'L',
-11401=>'L',
-11402=>'L',
-11403=>'L',
-11404=>'L',
-11405=>'L',
-11406=>'L',
-11407=>'L',
-11408=>'L',
-11409=>'L',
-11410=>'L',
-11411=>'L',
-11412=>'L',
-11413=>'L',
-11414=>'L',
-11415=>'L',
-11416=>'L',
-11417=>'L',
-11418=>'L',
-11419=>'L',
-11420=>'L',
-11421=>'L',
-11422=>'L',
-11423=>'L',
-11424=>'L',
-11425=>'L',
-11426=>'L',
-11427=>'L',
-11428=>'L',
-11429=>'L',
-11430=>'L',
-11431=>'L',
-11432=>'L',
-11433=>'L',
-11434=>'L',
-11435=>'L',
-11436=>'L',
-11437=>'L',
-11438=>'L',
-11439=>'L',
-11440=>'L',
-11441=>'L',
-11442=>'L',
-11443=>'L',
-11444=>'L',
-11445=>'L',
-11446=>'L',
-11447=>'L',
-11448=>'L',
-11449=>'L',
-11450=>'L',
-11451=>'L',
-11452=>'L',
-11453=>'L',
-11454=>'L',
-11455=>'L',
-11456=>'L',
-11457=>'L',
-11458=>'L',
-11459=>'L',
-11460=>'L',
-11461=>'L',
-11462=>'L',
-11463=>'L',
-11464=>'L',
-11465=>'L',
-11466=>'L',
-11467=>'L',
-11468=>'L',
-11469=>'L',
-11470=>'L',
-11471=>'L',
-11472=>'L',
-11473=>'L',
-11474=>'L',
-11475=>'L',
-11476=>'L',
-11477=>'L',
-11478=>'L',
-11479=>'L',
-11480=>'L',
-11481=>'L',
-11482=>'L',
-11483=>'L',
-11484=>'L',
-11485=>'L',
-11486=>'L',
-11487=>'L',
-11488=>'L',
-11489=>'L',
-11490=>'L',
-11491=>'L',
-11492=>'L',
-11493=>'ON',
-11494=>'ON',
-11495=>'ON',
-11496=>'ON',
-11497=>'ON',
-11498=>'ON',
-11513=>'ON',
-11514=>'ON',
-11515=>'ON',
-11516=>'ON',
-11517=>'ON',
-11518=>'ON',
-11519=>'ON',
-11520=>'L',
-11521=>'L',
-11522=>'L',
-11523=>'L',
-11524=>'L',
-11525=>'L',
-11526=>'L',
-11527=>'L',
-11528=>'L',
-11529=>'L',
-11530=>'L',
-11531=>'L',
-11532=>'L',
-11533=>'L',
-11534=>'L',
-11535=>'L',
-11536=>'L',
-11537=>'L',
-11538=>'L',
-11539=>'L',
-11540=>'L',
-11541=>'L',
-11542=>'L',
-11543=>'L',
-11544=>'L',
-11545=>'L',
-11546=>'L',
-11547=>'L',
-11548=>'L',
-11549=>'L',
-11550=>'L',
-11551=>'L',
-11552=>'L',
-11553=>'L',
-11554=>'L',
-11555=>'L',
-11556=>'L',
-11557=>'L',
-11568=>'L',
-11569=>'L',
-11570=>'L',
-11571=>'L',
-11572=>'L',
-11573=>'L',
-11574=>'L',
-11575=>'L',
-11576=>'L',
-11577=>'L',
-11578=>'L',
-11579=>'L',
-11580=>'L',
-11581=>'L',
-11582=>'L',
-11583=>'L',
-11584=>'L',
-11585=>'L',
-11586=>'L',
-11587=>'L',
-11588=>'L',
-11589=>'L',
-11590=>'L',
-11591=>'L',
-11592=>'L',
-11593=>'L',
-11594=>'L',
-11595=>'L',
-11596=>'L',
-11597=>'L',
-11598=>'L',
-11599=>'L',
-11600=>'L',
-11601=>'L',
-11602=>'L',
-11603=>'L',
-11604=>'L',
-11605=>'L',
-11606=>'L',
-11607=>'L',
-11608=>'L',
-11609=>'L',
-11610=>'L',
-11611=>'L',
-11612=>'L',
-11613=>'L',
-11614=>'L',
-11615=>'L',
-11616=>'L',
-11617=>'L',
-11618=>'L',
-11619=>'L',
-11620=>'L',
-11621=>'L',
-11631=>'L',
-11648=>'L',
-11649=>'L',
-11650=>'L',
-11651=>'L',
-11652=>'L',
-11653=>'L',
-11654=>'L',
-11655=>'L',
-11656=>'L',
-11657=>'L',
-11658=>'L',
-11659=>'L',
-11660=>'L',
-11661=>'L',
-11662=>'L',
-11663=>'L',
-11664=>'L',
-11665=>'L',
-11666=>'L',
-11667=>'L',
-11668=>'L',
-11669=>'L',
-11670=>'L',
-11680=>'L',
-11681=>'L',
-11682=>'L',
-11683=>'L',
-11684=>'L',
-11685=>'L',
-11686=>'L',
-11688=>'L',
-11689=>'L',
-11690=>'L',
-11691=>'L',
-11692=>'L',
-11693=>'L',
-11694=>'L',
-11696=>'L',
-11697=>'L',
-11698=>'L',
-11699=>'L',
-11700=>'L',
-11701=>'L',
-11702=>'L',
-11704=>'L',
-11705=>'L',
-11706=>'L',
-11707=>'L',
-11708=>'L',
-11709=>'L',
-11710=>'L',
-11712=>'L',
-11713=>'L',
-11714=>'L',
-11715=>'L',
-11716=>'L',
-11717=>'L',
-11718=>'L',
-11720=>'L',
-11721=>'L',
-11722=>'L',
-11723=>'L',
-11724=>'L',
-11725=>'L',
-11726=>'L',
-11728=>'L',
-11729=>'L',
-11730=>'L',
-11731=>'L',
-11732=>'L',
-11733=>'L',
-11734=>'L',
-11736=>'L',
-11737=>'L',
-11738=>'L',
-11739=>'L',
-11740=>'L',
-11741=>'L',
-11742=>'L',
-11776=>'ON',
-11777=>'ON',
-11778=>'ON',
-11779=>'ON',
-11780=>'ON',
-11781=>'ON',
-11782=>'ON',
-11783=>'ON',
-11784=>'ON',
-11785=>'ON',
-11786=>'ON',
-11787=>'ON',
-11788=>'ON',
-11789=>'ON',
-11790=>'ON',
-11791=>'ON',
-11792=>'ON',
-11793=>'ON',
-11794=>'ON',
-11795=>'ON',
-11796=>'ON',
-11797=>'ON',
-11798=>'ON',
-11799=>'ON',
-11804=>'ON',
-11805=>'ON',
-11904=>'ON',
-11905=>'ON',
-11906=>'ON',
-11907=>'ON',
-11908=>'ON',
-11909=>'ON',
-11910=>'ON',
-11911=>'ON',
-11912=>'ON',
-11913=>'ON',
-11914=>'ON',
-11915=>'ON',
-11916=>'ON',
-11917=>'ON',
-11918=>'ON',
-11919=>'ON',
-11920=>'ON',
-11921=>'ON',
-11922=>'ON',
-11923=>'ON',
-11924=>'ON',
-11925=>'ON',
-11926=>'ON',
-11927=>'ON',
-11928=>'ON',
-11929=>'ON',
-11931=>'ON',
-11932=>'ON',
-11933=>'ON',
-11934=>'ON',
-11935=>'ON',
-11936=>'ON',
-11937=>'ON',
-11938=>'ON',
-11939=>'ON',
-11940=>'ON',
-11941=>'ON',
-11942=>'ON',
-11943=>'ON',
-11944=>'ON',
-11945=>'ON',
-11946=>'ON',
-11947=>'ON',
-11948=>'ON',
-11949=>'ON',
-11950=>'ON',
-11951=>'ON',
-11952=>'ON',
-11953=>'ON',
-11954=>'ON',
-11955=>'ON',
-11956=>'ON',
-11957=>'ON',
-11958=>'ON',
-11959=>'ON',
-11960=>'ON',
-11961=>'ON',
-11962=>'ON',
-11963=>'ON',
-11964=>'ON',
-11965=>'ON',
-11966=>'ON',
-11967=>'ON',
-11968=>'ON',
-11969=>'ON',
-11970=>'ON',
-11971=>'ON',
-11972=>'ON',
-11973=>'ON',
-11974=>'ON',
-11975=>'ON',
-11976=>'ON',
-11977=>'ON',
-11978=>'ON',
-11979=>'ON',
-11980=>'ON',
-11981=>'ON',
-11982=>'ON',
-11983=>'ON',
-11984=>'ON',
-11985=>'ON',
-11986=>'ON',
-11987=>'ON',
-11988=>'ON',
-11989=>'ON',
-11990=>'ON',
-11991=>'ON',
-11992=>'ON',
-11993=>'ON',
-11994=>'ON',
-11995=>'ON',
-11996=>'ON',
-11997=>'ON',
-11998=>'ON',
-11999=>'ON',
-12000=>'ON',
-12001=>'ON',
-12002=>'ON',
-12003=>'ON',
-12004=>'ON',
-12005=>'ON',
-12006=>'ON',
-12007=>'ON',
-12008=>'ON',
-12009=>'ON',
-12010=>'ON',
-12011=>'ON',
-12012=>'ON',
-12013=>'ON',
-12014=>'ON',
-12015=>'ON',
-12016=>'ON',
-12017=>'ON',
-12018=>'ON',
-12019=>'ON',
-12032=>'ON',
-12033=>'ON',
-12034=>'ON',
-12035=>'ON',
-12036=>'ON',
-12037=>'ON',
-12038=>'ON',
-12039=>'ON',
-12040=>'ON',
-12041=>'ON',
-12042=>'ON',
-12043=>'ON',
-12044=>'ON',
-12045=>'ON',
-12046=>'ON',
-12047=>'ON',
-12048=>'ON',
-12049=>'ON',
-12050=>'ON',
-12051=>'ON',
-12052=>'ON',
-12053=>'ON',
-12054=>'ON',
-12055=>'ON',
-12056=>'ON',
-12057=>'ON',
-12058=>'ON',
-12059=>'ON',
-12060=>'ON',
-12061=>'ON',
-12062=>'ON',
-12063=>'ON',
-12064=>'ON',
-12065=>'ON',
-12066=>'ON',
-12067=>'ON',
-12068=>'ON',
-12069=>'ON',
-12070=>'ON',
-12071=>'ON',
-12072=>'ON',
-12073=>'ON',
-12074=>'ON',
-12075=>'ON',
-12076=>'ON',
-12077=>'ON',
-12078=>'ON',
-12079=>'ON',
-12080=>'ON',
-12081=>'ON',
-12082=>'ON',
-12083=>'ON',
-12084=>'ON',
-12085=>'ON',
-12086=>'ON',
-12087=>'ON',
-12088=>'ON',
-12089=>'ON',
-12090=>'ON',
-12091=>'ON',
-12092=>'ON',
-12093=>'ON',
-12094=>'ON',
-12095=>'ON',
-12096=>'ON',
-12097=>'ON',
-12098=>'ON',
-12099=>'ON',
-12100=>'ON',
-12101=>'ON',
-12102=>'ON',
-12103=>'ON',
-12104=>'ON',
-12105=>'ON',
-12106=>'ON',
-12107=>'ON',
-12108=>'ON',
-12109=>'ON',
-12110=>'ON',
-12111=>'ON',
-12112=>'ON',
-12113=>'ON',
-12114=>'ON',
-12115=>'ON',
-12116=>'ON',
-12117=>'ON',
-12118=>'ON',
-12119=>'ON',
-12120=>'ON',
-12121=>'ON',
-12122=>'ON',
-12123=>'ON',
-12124=>'ON',
-12125=>'ON',
-12126=>'ON',
-12127=>'ON',
-12128=>'ON',
-12129=>'ON',
-12130=>'ON',
-12131=>'ON',
-12132=>'ON',
-12133=>'ON',
-12134=>'ON',
-12135=>'ON',
-12136=>'ON',
-12137=>'ON',
-12138=>'ON',
-12139=>'ON',
-12140=>'ON',
-12141=>'ON',
-12142=>'ON',
-12143=>'ON',
-12144=>'ON',
-12145=>'ON',
-12146=>'ON',
-12147=>'ON',
-12148=>'ON',
-12149=>'ON',
-12150=>'ON',
-12151=>'ON',
-12152=>'ON',
-12153=>'ON',
-12154=>'ON',
-12155=>'ON',
-12156=>'ON',
-12157=>'ON',
-12158=>'ON',
-12159=>'ON',
-12160=>'ON',
-12161=>'ON',
-12162=>'ON',
-12163=>'ON',
-12164=>'ON',
-12165=>'ON',
-12166=>'ON',
-12167=>'ON',
-12168=>'ON',
-12169=>'ON',
-12170=>'ON',
-12171=>'ON',
-12172=>'ON',
-12173=>'ON',
-12174=>'ON',
-12175=>'ON',
-12176=>'ON',
-12177=>'ON',
-12178=>'ON',
-12179=>'ON',
-12180=>'ON',
-12181=>'ON',
-12182=>'ON',
-12183=>'ON',
-12184=>'ON',
-12185=>'ON',
-12186=>'ON',
-12187=>'ON',
-12188=>'ON',
-12189=>'ON',
-12190=>'ON',
-12191=>'ON',
-12192=>'ON',
-12193=>'ON',
-12194=>'ON',
-12195=>'ON',
-12196=>'ON',
-12197=>'ON',
-12198=>'ON',
-12199=>'ON',
-12200=>'ON',
-12201=>'ON',
-12202=>'ON',
-12203=>'ON',
-12204=>'ON',
-12205=>'ON',
-12206=>'ON',
-12207=>'ON',
-12208=>'ON',
-12209=>'ON',
-12210=>'ON',
-12211=>'ON',
-12212=>'ON',
-12213=>'ON',
-12214=>'ON',
-12215=>'ON',
-12216=>'ON',
-12217=>'ON',
-12218=>'ON',
-12219=>'ON',
-12220=>'ON',
-12221=>'ON',
-12222=>'ON',
-12223=>'ON',
-12224=>'ON',
-12225=>'ON',
-12226=>'ON',
-12227=>'ON',
-12228=>'ON',
-12229=>'ON',
-12230=>'ON',
-12231=>'ON',
-12232=>'ON',
-12233=>'ON',
-12234=>'ON',
-12235=>'ON',
-12236=>'ON',
-12237=>'ON',
-12238=>'ON',
-12239=>'ON',
-12240=>'ON',
-12241=>'ON',
-12242=>'ON',
-12243=>'ON',
-12244=>'ON',
-12245=>'ON',
-12272=>'ON',
-12273=>'ON',
-12274=>'ON',
-12275=>'ON',
-12276=>'ON',
-12277=>'ON',
-12278=>'ON',
-12279=>'ON',
-12280=>'ON',
-12281=>'ON',
-12282=>'ON',
-12283=>'ON',
-12288=>'WS',
-12289=>'ON',
-12290=>'ON',
-12291=>'ON',
-12292=>'ON',
-12293=>'L',
-12294=>'L',
-12295=>'L',
-12296=>'ON',
-12297=>'ON',
-12298=>'ON',
-12299=>'ON',
-12300=>'ON',
-12301=>'ON',
-12302=>'ON',
-12303=>'ON',
-12304=>'ON',
-12305=>'ON',
-12306=>'ON',
-12307=>'ON',
-12308=>'ON',
-12309=>'ON',
-12310=>'ON',
-12311=>'ON',
-12312=>'ON',
-12313=>'ON',
-12314=>'ON',
-12315=>'ON',
-12316=>'ON',
-12317=>'ON',
-12318=>'ON',
-12319=>'ON',
-12320=>'ON',
-12321=>'L',
-12322=>'L',
-12323=>'L',
-12324=>'L',
-12325=>'L',
-12326=>'L',
-12327=>'L',
-12328=>'L',
-12329=>'L',
-12330=>'NSM',
-12331=>'NSM',
-12332=>'NSM',
-12333=>'NSM',
-12334=>'NSM',
-12335=>'NSM',
-12336=>'ON',
-12337=>'L',
-12338=>'L',
-12339=>'L',
-12340=>'L',
-12341=>'L',
-12342=>'ON',
-12343=>'ON',
-12344=>'L',
-12345=>'L',
-12346=>'L',
-12347=>'L',
-12348=>'L',
-12349=>'ON',
-12350=>'ON',
-12351=>'ON',
-12353=>'L',
-12354=>'L',
-12355=>'L',
-12356=>'L',
-12357=>'L',
-12358=>'L',
-12359=>'L',
-12360=>'L',
-12361=>'L',
-12362=>'L',
-12363=>'L',
-12364=>'L',
-12365=>'L',
-12366=>'L',
-12367=>'L',
-12368=>'L',
-12369=>'L',
-12370=>'L',
-12371=>'L',
-12372=>'L',
-12373=>'L',
-12374=>'L',
-12375=>'L',
-12376=>'L',
-12377=>'L',
-12378=>'L',
-12379=>'L',
-12380=>'L',
-12381=>'L',
-12382=>'L',
-12383=>'L',
-12384=>'L',
-12385=>'L',
-12386=>'L',
-12387=>'L',
-12388=>'L',
-12389=>'L',
-12390=>'L',
-12391=>'L',
-12392=>'L',
-12393=>'L',
-12394=>'L',
-12395=>'L',
-12396=>'L',
-12397=>'L',
-12398=>'L',
-12399=>'L',
-12400=>'L',
-12401=>'L',
-12402=>'L',
-12403=>'L',
-12404=>'L',
-12405=>'L',
-12406=>'L',
-12407=>'L',
-12408=>'L',
-12409=>'L',
-12410=>'L',
-12411=>'L',
-12412=>'L',
-12413=>'L',
-12414=>'L',
-12415=>'L',
-12416=>'L',
-12417=>'L',
-12418=>'L',
-12419=>'L',
-12420=>'L',
-12421=>'L',
-12422=>'L',
-12423=>'L',
-12424=>'L',
-12425=>'L',
-12426=>'L',
-12427=>'L',
-12428=>'L',
-12429=>'L',
-12430=>'L',
-12431=>'L',
-12432=>'L',
-12433=>'L',
-12434=>'L',
-12435=>'L',
-12436=>'L',
-12437=>'L',
-12438=>'L',
-12441=>'NSM',
-12442=>'NSM',
-12443=>'ON',
-12444=>'ON',
-12445=>'L',
-12446=>'L',
-12447=>'L',
-12448=>'ON',
-12449=>'L',
-12450=>'L',
-12451=>'L',
-12452=>'L',
-12453=>'L',
-12454=>'L',
-12455=>'L',
-12456=>'L',
-12457=>'L',
-12458=>'L',
-12459=>'L',
-12460=>'L',
-12461=>'L',
-12462=>'L',
-12463=>'L',
-12464=>'L',
-12465=>'L',
-12466=>'L',
-12467=>'L',
-12468=>'L',
-12469=>'L',
-12470=>'L',
-12471=>'L',
-12472=>'L',
-12473=>'L',
-12474=>'L',
-12475=>'L',
-12476=>'L',
-12477=>'L',
-12478=>'L',
-12479=>'L',
-12480=>'L',
-12481=>'L',
-12482=>'L',
-12483=>'L',
-12484=>'L',
-12485=>'L',
-12486=>'L',
-12487=>'L',
-12488=>'L',
-12489=>'L',
-12490=>'L',
-12491=>'L',
-12492=>'L',
-12493=>'L',
-12494=>'L',
-12495=>'L',
-12496=>'L',
-12497=>'L',
-12498=>'L',
-12499=>'L',
-12500=>'L',
-12501=>'L',
-12502=>'L',
-12503=>'L',
-12504=>'L',
-12505=>'L',
-12506=>'L',
-12507=>'L',
-12508=>'L',
-12509=>'L',
-12510=>'L',
-12511=>'L',
-12512=>'L',
-12513=>'L',
-12514=>'L',
-12515=>'L',
-12516=>'L',
-12517=>'L',
-12518=>'L',
-12519=>'L',
-12520=>'L',
-12521=>'L',
-12522=>'L',
-12523=>'L',
-12524=>'L',
-12525=>'L',
-12526=>'L',
-12527=>'L',
-12528=>'L',
-12529=>'L',
-12530=>'L',
-12531=>'L',
-12532=>'L',
-12533=>'L',
-12534=>'L',
-12535=>'L',
-12536=>'L',
-12537=>'L',
-12538=>'L',
-12539=>'ON',
-12540=>'L',
-12541=>'L',
-12542=>'L',
-12543=>'L',
-12549=>'L',
-12550=>'L',
-12551=>'L',
-12552=>'L',
-12553=>'L',
-12554=>'L',
-12555=>'L',
-12556=>'L',
-12557=>'L',
-12558=>'L',
-12559=>'L',
-12560=>'L',
-12561=>'L',
-12562=>'L',
-12563=>'L',
-12564=>'L',
-12565=>'L',
-12566=>'L',
-12567=>'L',
-12568=>'L',
-12569=>'L',
-12570=>'L',
-12571=>'L',
-12572=>'L',
-12573=>'L',
-12574=>'L',
-12575=>'L',
-12576=>'L',
-12577=>'L',
-12578=>'L',
-12579=>'L',
-12580=>'L',
-12581=>'L',
-12582=>'L',
-12583=>'L',
-12584=>'L',
-12585=>'L',
-12586=>'L',
-12587=>'L',
-12588=>'L',
-12593=>'L',
-12594=>'L',
-12595=>'L',
-12596=>'L',
-12597=>'L',
-12598=>'L',
-12599=>'L',
-12600=>'L',
-12601=>'L',
-12602=>'L',
-12603=>'L',
-12604=>'L',
-12605=>'L',
-12606=>'L',
-12607=>'L',
-12608=>'L',
-12609=>'L',
-12610=>'L',
-12611=>'L',
-12612=>'L',
-12613=>'L',
-12614=>'L',
-12615=>'L',
-12616=>'L',
-12617=>'L',
-12618=>'L',
-12619=>'L',
-12620=>'L',
-12621=>'L',
-12622=>'L',
-12623=>'L',
-12624=>'L',
-12625=>'L',
-12626=>'L',
-12627=>'L',
-12628=>'L',
-12629=>'L',
-12630=>'L',
-12631=>'L',
-12632=>'L',
-12633=>'L',
-12634=>'L',
-12635=>'L',
-12636=>'L',
-12637=>'L',
-12638=>'L',
-12639=>'L',
-12640=>'L',
-12641=>'L',
-12642=>'L',
-12643=>'L',
-12644=>'L',
-12645=>'L',
-12646=>'L',
-12647=>'L',
-12648=>'L',
-12649=>'L',
-12650=>'L',
-12651=>'L',
-12652=>'L',
-12653=>'L',
-12654=>'L',
-12655=>'L',
-12656=>'L',
-12657=>'L',
-12658=>'L',
-12659=>'L',
-12660=>'L',
-12661=>'L',
-12662=>'L',
-12663=>'L',
-12664=>'L',
-12665=>'L',
-12666=>'L',
-12667=>'L',
-12668=>'L',
-12669=>'L',
-12670=>'L',
-12671=>'L',
-12672=>'L',
-12673=>'L',
-12674=>'L',
-12675=>'L',
-12676=>'L',
-12677=>'L',
-12678=>'L',
-12679=>'L',
-12680=>'L',
-12681=>'L',
-12682=>'L',
-12683=>'L',
-12684=>'L',
-12685=>'L',
-12686=>'L',
-12688=>'L',
-12689=>'L',
-12690=>'L',
-12691=>'L',
-12692=>'L',
-12693=>'L',
-12694=>'L',
-12695=>'L',
-12696=>'L',
-12697=>'L',
-12698=>'L',
-12699=>'L',
-12700=>'L',
-12701=>'L',
-12702=>'L',
-12703=>'L',
-12704=>'L',
-12705=>'L',
-12706=>'L',
-12707=>'L',
-12708=>'L',
-12709=>'L',
-12710=>'L',
-12711=>'L',
-12712=>'L',
-12713=>'L',
-12714=>'L',
-12715=>'L',
-12716=>'L',
-12717=>'L',
-12718=>'L',
-12719=>'L',
-12720=>'L',
-12721=>'L',
-12722=>'L',
-12723=>'L',
-12724=>'L',
-12725=>'L',
-12726=>'L',
-12727=>'L',
-12736=>'ON',
-12737=>'ON',
-12738=>'ON',
-12739=>'ON',
-12740=>'ON',
-12741=>'ON',
-12742=>'ON',
-12743=>'ON',
-12744=>'ON',
-12745=>'ON',
-12746=>'ON',
-12747=>'ON',
-12748=>'ON',
-12749=>'ON',
-12750=>'ON',
-12751=>'ON',
-12784=>'L',
-12785=>'L',
-12786=>'L',
-12787=>'L',
-12788=>'L',
-12789=>'L',
-12790=>'L',
-12791=>'L',
-12792=>'L',
-12793=>'L',
-12794=>'L',
-12795=>'L',
-12796=>'L',
-12797=>'L',
-12798=>'L',
-12799=>'L',
-12800=>'L',
-12801=>'L',
-12802=>'L',
-12803=>'L',
-12804=>'L',
-12805=>'L',
-12806=>'L',
-12807=>'L',
-12808=>'L',
-12809=>'L',
-12810=>'L',
-12811=>'L',
-12812=>'L',
-12813=>'L',
-12814=>'L',
-12815=>'L',
-12816=>'L',
-12817=>'L',
-12818=>'L',
-12819=>'L',
-12820=>'L',
-12821=>'L',
-12822=>'L',
-12823=>'L',
-12824=>'L',
-12825=>'L',
-12826=>'L',
-12827=>'L',
-12828=>'L',
-12829=>'ON',
-12830=>'ON',
-12832=>'L',
-12833=>'L',
-12834=>'L',
-12835=>'L',
-12836=>'L',
-12837=>'L',
-12838=>'L',
-12839=>'L',
-12840=>'L',
-12841=>'L',
-12842=>'L',
-12843=>'L',
-12844=>'L',
-12845=>'L',
-12846=>'L',
-12847=>'L',
-12848=>'L',
-12849=>'L',
-12850=>'L',
-12851=>'L',
-12852=>'L',
-12853=>'L',
-12854=>'L',
-12855=>'L',
-12856=>'L',
-12857=>'L',
-12858=>'L',
-12859=>'L',
-12860=>'L',
-12861=>'L',
-12862=>'L',
-12863=>'L',
-12864=>'L',
-12865=>'L',
-12866=>'L',
-12867=>'L',
-12880=>'ON',
-12881=>'ON',
-12882=>'ON',
-12883=>'ON',
-12884=>'ON',
-12885=>'ON',
-12886=>'ON',
-12887=>'ON',
-12888=>'ON',
-12889=>'ON',
-12890=>'ON',
-12891=>'ON',
-12892=>'ON',
-12893=>'ON',
-12894=>'ON',
-12895=>'ON',
-12896=>'L',
-12897=>'L',
-12898=>'L',
-12899=>'L',
-12900=>'L',
-12901=>'L',
-12902=>'L',
-12903=>'L',
-12904=>'L',
-12905=>'L',
-12906=>'L',
-12907=>'L',
-12908=>'L',
-12909=>'L',
-12910=>'L',
-12911=>'L',
-12912=>'L',
-12913=>'L',
-12914=>'L',
-12915=>'L',
-12916=>'L',
-12917=>'L',
-12918=>'L',
-12919=>'L',
-12920=>'L',
-12921=>'L',
-12922=>'L',
-12923=>'L',
-12924=>'ON',
-12925=>'ON',
-12926=>'ON',
-12927=>'L',
-12928=>'L',
-12929=>'L',
-12930=>'L',
-12931=>'L',
-12932=>'L',
-12933=>'L',
-12934=>'L',
-12935=>'L',
-12936=>'L',
-12937=>'L',
-12938=>'L',
-12939=>'L',
-12940=>'L',
-12941=>'L',
-12942=>'L',
-12943=>'L',
-12944=>'L',
-12945=>'L',
-12946=>'L',
-12947=>'L',
-12948=>'L',
-12949=>'L',
-12950=>'L',
-12951=>'L',
-12952=>'L',
-12953=>'L',
-12954=>'L',
-12955=>'L',
-12956=>'L',
-12957=>'L',
-12958=>'L',
-12959=>'L',
-12960=>'L',
-12961=>'L',
-12962=>'L',
-12963=>'L',
-12964=>'L',
-12965=>'L',
-12966=>'L',
-12967=>'L',
-12968=>'L',
-12969=>'L',
-12970=>'L',
-12971=>'L',
-12972=>'L',
-12973=>'L',
-12974=>'L',
-12975=>'L',
-12976=>'L',
-12977=>'ON',
-12978=>'ON',
-12979=>'ON',
-12980=>'ON',
-12981=>'ON',
-12982=>'ON',
-12983=>'ON',
-12984=>'ON',
-12985=>'ON',
-12986=>'ON',
-12987=>'ON',
-12988=>'ON',
-12989=>'ON',
-12990=>'ON',
-12991=>'ON',
-12992=>'L',
-12993=>'L',
-12994=>'L',
-12995=>'L',
-12996=>'L',
-12997=>'L',
-12998=>'L',
-12999=>'L',
-13000=>'L',
-13001=>'L',
-13002=>'L',
-13003=>'L',
-13004=>'ON',
-13005=>'ON',
-13006=>'ON',
-13007=>'ON',
-13008=>'L',
-13009=>'L',
-13010=>'L',
-13011=>'L',
-13012=>'L',
-13013=>'L',
-13014=>'L',
-13015=>'L',
-13016=>'L',
-13017=>'L',
-13018=>'L',
-13019=>'L',
-13020=>'L',
-13021=>'L',
-13022=>'L',
-13023=>'L',
-13024=>'L',
-13025=>'L',
-13026=>'L',
-13027=>'L',
-13028=>'L',
-13029=>'L',
-13030=>'L',
-13031=>'L',
-13032=>'L',
-13033=>'L',
-13034=>'L',
-13035=>'L',
-13036=>'L',
-13037=>'L',
-13038=>'L',
-13039=>'L',
-13040=>'L',
-13041=>'L',
-13042=>'L',
-13043=>'L',
-13044=>'L',
-13045=>'L',
-13046=>'L',
-13047=>'L',
-13048=>'L',
-13049=>'L',
-13050=>'L',
-13051=>'L',
-13052=>'L',
-13053=>'L',
-13054=>'L',
-13056=>'L',
-13057=>'L',
-13058=>'L',
-13059=>'L',
-13060=>'L',
-13061=>'L',
-13062=>'L',
-13063=>'L',
-13064=>'L',
-13065=>'L',
-13066=>'L',
-13067=>'L',
-13068=>'L',
-13069=>'L',
-13070=>'L',
-13071=>'L',
-13072=>'L',
-13073=>'L',
-13074=>'L',
-13075=>'L',
-13076=>'L',
-13077=>'L',
-13078=>'L',
-13079=>'L',
-13080=>'L',
-13081=>'L',
-13082=>'L',
-13083=>'L',
-13084=>'L',
-13085=>'L',
-13086=>'L',
-13087=>'L',
-13088=>'L',
-13089=>'L',
-13090=>'L',
-13091=>'L',
-13092=>'L',
-13093=>'L',
-13094=>'L',
-13095=>'L',
-13096=>'L',
-13097=>'L',
-13098=>'L',
-13099=>'L',
-13100=>'L',
-13101=>'L',
-13102=>'L',
-13103=>'L',
-13104=>'L',
-13105=>'L',
-13106=>'L',
-13107=>'L',
-13108=>'L',
-13109=>'L',
-13110=>'L',
-13111=>'L',
-13112=>'L',
-13113=>'L',
-13114=>'L',
-13115=>'L',
-13116=>'L',
-13117=>'L',
-13118=>'L',
-13119=>'L',
-13120=>'L',
-13121=>'L',
-13122=>'L',
-13123=>'L',
-13124=>'L',
-13125=>'L',
-13126=>'L',
-13127=>'L',
-13128=>'L',
-13129=>'L',
-13130=>'L',
-13131=>'L',
-13132=>'L',
-13133=>'L',
-13134=>'L',
-13135=>'L',
-13136=>'L',
-13137=>'L',
-13138=>'L',
-13139=>'L',
-13140=>'L',
-13141=>'L',
-13142=>'L',
-13143=>'L',
-13144=>'L',
-13145=>'L',
-13146=>'L',
-13147=>'L',
-13148=>'L',
-13149=>'L',
-13150=>'L',
-13151=>'L',
-13152=>'L',
-13153=>'L',
-13154=>'L',
-13155=>'L',
-13156=>'L',
-13157=>'L',
-13158=>'L',
-13159=>'L',
-13160=>'L',
-13161=>'L',
-13162=>'L',
-13163=>'L',
-13164=>'L',
-13165=>'L',
-13166=>'L',
-13167=>'L',
-13168=>'L',
-13169=>'L',
-13170=>'L',
-13171=>'L',
-13172=>'L',
-13173=>'L',
-13174=>'L',
-13175=>'ON',
-13176=>'ON',
-13177=>'ON',
-13178=>'ON',
-13179=>'L',
-13180=>'L',
-13181=>'L',
-13182=>'L',
-13183=>'L',
-13184=>'L',
-13185=>'L',
-13186=>'L',
-13187=>'L',
-13188=>'L',
-13189=>'L',
-13190=>'L',
-13191=>'L',
-13192=>'L',
-13193=>'L',
-13194=>'L',
-13195=>'L',
-13196=>'L',
-13197=>'L',
-13198=>'L',
-13199=>'L',
-13200=>'L',
-13201=>'L',
-13202=>'L',
-13203=>'L',
-13204=>'L',
-13205=>'L',
-13206=>'L',
-13207=>'L',
-13208=>'L',
-13209=>'L',
-13210=>'L',
-13211=>'L',
-13212=>'L',
-13213=>'L',
-13214=>'L',
-13215=>'L',
-13216=>'L',
-13217=>'L',
-13218=>'L',
-13219=>'L',
-13220=>'L',
-13221=>'L',
-13222=>'L',
-13223=>'L',
-13224=>'L',
-13225=>'L',
-13226=>'L',
-13227=>'L',
-13228=>'L',
-13229=>'L',
-13230=>'L',
-13231=>'L',
-13232=>'L',
-13233=>'L',
-13234=>'L',
-13235=>'L',
-13236=>'L',
-13237=>'L',
-13238=>'L',
-13239=>'L',
-13240=>'L',
-13241=>'L',
-13242=>'L',
-13243=>'L',
-13244=>'L',
-13245=>'L',
-13246=>'L',
-13247=>'L',
-13248=>'L',
-13249=>'L',
-13250=>'L',
-13251=>'L',
-13252=>'L',
-13253=>'L',
-13254=>'L',
-13255=>'L',
-13256=>'L',
-13257=>'L',
-13258=>'L',
-13259=>'L',
-13260=>'L',
-13261=>'L',
-13262=>'L',
-13263=>'L',
-13264=>'L',
-13265=>'L',
-13266=>'L',
-13267=>'L',
-13268=>'L',
-13269=>'L',
-13270=>'L',
-13271=>'L',
-13272=>'L',
-13273=>'L',
-13274=>'L',
-13275=>'L',
-13276=>'L',
-13277=>'L',
-13278=>'ON',
-13279=>'ON',
-13280=>'L',
-13281=>'L',
-13282=>'L',
-13283=>'L',
-13284=>'L',
-13285=>'L',
-13286=>'L',
-13287=>'L',
-13288=>'L',
-13289=>'L',
-13290=>'L',
-13291=>'L',
-13292=>'L',
-13293=>'L',
-13294=>'L',
-13295=>'L',
-13296=>'L',
-13297=>'L',
-13298=>'L',
-13299=>'L',
-13300=>'L',
-13301=>'L',
-13302=>'L',
-13303=>'L',
-13304=>'L',
-13305=>'L',
-13306=>'L',
-13307=>'L',
-13308=>'L',
-13309=>'L',
-13310=>'L',
-13311=>'ON',
-13312=>'L',
-19893=>'L',
-19904=>'ON',
-19905=>'ON',
-19906=>'ON',
-19907=>'ON',
-19908=>'ON',
-19909=>'ON',
-19910=>'ON',
-19911=>'ON',
-19912=>'ON',
-19913=>'ON',
-19914=>'ON',
-19915=>'ON',
-19916=>'ON',
-19917=>'ON',
-19918=>'ON',
-19919=>'ON',
-19920=>'ON',
-19921=>'ON',
-19922=>'ON',
-19923=>'ON',
-19924=>'ON',
-19925=>'ON',
-19926=>'ON',
-19927=>'ON',
-19928=>'ON',
-19929=>'ON',
-19930=>'ON',
-19931=>'ON',
-19932=>'ON',
-19933=>'ON',
-19934=>'ON',
-19935=>'ON',
-19936=>'ON',
-19937=>'ON',
-19938=>'ON',
-19939=>'ON',
-19940=>'ON',
-19941=>'ON',
-19942=>'ON',
-19943=>'ON',
-19944=>'ON',
-19945=>'ON',
-19946=>'ON',
-19947=>'ON',
-19948=>'ON',
-19949=>'ON',
-19950=>'ON',
-19951=>'ON',
-19952=>'ON',
-19953=>'ON',
-19954=>'ON',
-19955=>'ON',
-19956=>'ON',
-19957=>'ON',
-19958=>'ON',
-19959=>'ON',
-19960=>'ON',
-19961=>'ON',
-19962=>'ON',
-19963=>'ON',
-19964=>'ON',
-19965=>'ON',
-19966=>'ON',
-19967=>'ON',
-19968=>'L',
-40891=>'L',
-40960=>'L',
-40961=>'L',
-40962=>'L',
-40963=>'L',
-40964=>'L',
-40965=>'L',
-40966=>'L',
-40967=>'L',
-40968=>'L',
-40969=>'L',
-40970=>'L',
-40971=>'L',
-40972=>'L',
-40973=>'L',
-40974=>'L',
-40975=>'L',
-40976=>'L',
-40977=>'L',
-40978=>'L',
-40979=>'L',
-40980=>'L',
-40981=>'L',
-40982=>'L',
-40983=>'L',
-40984=>'L',
-40985=>'L',
-40986=>'L',
-40987=>'L',
-40988=>'L',
-40989=>'L',
-40990=>'L',
-40991=>'L',
-40992=>'L',
-40993=>'L',
-40994=>'L',
-40995=>'L',
-40996=>'L',
-40997=>'L',
-40998=>'L',
-40999=>'L',
-41000=>'L',
-41001=>'L',
-41002=>'L',
-41003=>'L',
-41004=>'L',
-41005=>'L',
-41006=>'L',
-41007=>'L',
-41008=>'L',
-41009=>'L',
-41010=>'L',
-41011=>'L',
-41012=>'L',
-41013=>'L',
-41014=>'L',
-41015=>'L',
-41016=>'L',
-41017=>'L',
-41018=>'L',
-41019=>'L',
-41020=>'L',
-41021=>'L',
-41022=>'L',
-41023=>'L',
-41024=>'L',
-41025=>'L',
-41026=>'L',
-41027=>'L',
-41028=>'L',
-41029=>'L',
-41030=>'L',
-41031=>'L',
-41032=>'L',
-41033=>'L',
-41034=>'L',
-41035=>'L',
-41036=>'L',
-41037=>'L',
-41038=>'L',
-41039=>'L',
-41040=>'L',
-41041=>'L',
-41042=>'L',
-41043=>'L',
-41044=>'L',
-41045=>'L',
-41046=>'L',
-41047=>'L',
-41048=>'L',
-41049=>'L',
-41050=>'L',
-41051=>'L',
-41052=>'L',
-41053=>'L',
-41054=>'L',
-41055=>'L',
-41056=>'L',
-41057=>'L',
-41058=>'L',
-41059=>'L',
-41060=>'L',
-41061=>'L',
-41062=>'L',
-41063=>'L',
-41064=>'L',
-41065=>'L',
-41066=>'L',
-41067=>'L',
-41068=>'L',
-41069=>'L',
-41070=>'L',
-41071=>'L',
-41072=>'L',
-41073=>'L',
-41074=>'L',
-41075=>'L',
-41076=>'L',
-41077=>'L',
-41078=>'L',
-41079=>'L',
-41080=>'L',
-41081=>'L',
-41082=>'L',
-41083=>'L',
-41084=>'L',
-41085=>'L',
-41086=>'L',
-41087=>'L',
-41088=>'L',
-41089=>'L',
-41090=>'L',
-41091=>'L',
-41092=>'L',
-41093=>'L',
-41094=>'L',
-41095=>'L',
-41096=>'L',
-41097=>'L',
-41098=>'L',
-41099=>'L',
-41100=>'L',
-41101=>'L',
-41102=>'L',
-41103=>'L',
-41104=>'L',
-41105=>'L',
-41106=>'L',
-41107=>'L',
-41108=>'L',
-41109=>'L',
-41110=>'L',
-41111=>'L',
-41112=>'L',
-41113=>'L',
-41114=>'L',
-41115=>'L',
-41116=>'L',
-41117=>'L',
-41118=>'L',
-41119=>'L',
-41120=>'L',
-41121=>'L',
-41122=>'L',
-41123=>'L',
-41124=>'L',
-41125=>'L',
-41126=>'L',
-41127=>'L',
-41128=>'L',
-41129=>'L',
-41130=>'L',
-41131=>'L',
-41132=>'L',
-41133=>'L',
-41134=>'L',
-41135=>'L',
-41136=>'L',
-41137=>'L',
-41138=>'L',
-41139=>'L',
-41140=>'L',
-41141=>'L',
-41142=>'L',
-41143=>'L',
-41144=>'L',
-41145=>'L',
-41146=>'L',
-41147=>'L',
-41148=>'L',
-41149=>'L',
-41150=>'L',
-41151=>'L',
-41152=>'L',
-41153=>'L',
-41154=>'L',
-41155=>'L',
-41156=>'L',
-41157=>'L',
-41158=>'L',
-41159=>'L',
-41160=>'L',
-41161=>'L',
-41162=>'L',
-41163=>'L',
-41164=>'L',
-41165=>'L',
-41166=>'L',
-41167=>'L',
-41168=>'L',
-41169=>'L',
-41170=>'L',
-41171=>'L',
-41172=>'L',
-41173=>'L',
-41174=>'L',
-41175=>'L',
-41176=>'L',
-41177=>'L',
-41178=>'L',
-41179=>'L',
-41180=>'L',
-41181=>'L',
-41182=>'L',
-41183=>'L',
-41184=>'L',
-41185=>'L',
-41186=>'L',
-41187=>'L',
-41188=>'L',
-41189=>'L',
-41190=>'L',
-41191=>'L',
-41192=>'L',
-41193=>'L',
-41194=>'L',
-41195=>'L',
-41196=>'L',
-41197=>'L',
-41198=>'L',
-41199=>'L',
-41200=>'L',
-41201=>'L',
-41202=>'L',
-41203=>'L',
-41204=>'L',
-41205=>'L',
-41206=>'L',
-41207=>'L',
-41208=>'L',
-41209=>'L',
-41210=>'L',
-41211=>'L',
-41212=>'L',
-41213=>'L',
-41214=>'L',
-41215=>'L',
-41216=>'L',
-41217=>'L',
-41218=>'L',
-41219=>'L',
-41220=>'L',
-41221=>'L',
-41222=>'L',
-41223=>'L',
-41224=>'L',
-41225=>'L',
-41226=>'L',
-41227=>'L',
-41228=>'L',
-41229=>'L',
-41230=>'L',
-41231=>'L',
-41232=>'L',
-41233=>'L',
-41234=>'L',
-41235=>'L',
-41236=>'L',
-41237=>'L',
-41238=>'L',
-41239=>'L',
-41240=>'L',
-41241=>'L',
-41242=>'L',
-41243=>'L',
-41244=>'L',
-41245=>'L',
-41246=>'L',
-41247=>'L',
-41248=>'L',
-41249=>'L',
-41250=>'L',
-41251=>'L',
-41252=>'L',
-41253=>'L',
-41254=>'L',
-41255=>'L',
-41256=>'L',
-41257=>'L',
-41258=>'L',
-41259=>'L',
-41260=>'L',
-41261=>'L',
-41262=>'L',
-41263=>'L',
-41264=>'L',
-41265=>'L',
-41266=>'L',
-41267=>'L',
-41268=>'L',
-41269=>'L',
-41270=>'L',
-41271=>'L',
-41272=>'L',
-41273=>'L',
-41274=>'L',
-41275=>'L',
-41276=>'L',
-41277=>'L',
-41278=>'L',
-41279=>'L',
-41280=>'L',
-41281=>'L',
-41282=>'L',
-41283=>'L',
-41284=>'L',
-41285=>'L',
-41286=>'L',
-41287=>'L',
-41288=>'L',
-41289=>'L',
-41290=>'L',
-41291=>'L',
-41292=>'L',
-41293=>'L',
-41294=>'L',
-41295=>'L',
-41296=>'L',
-41297=>'L',
-41298=>'L',
-41299=>'L',
-41300=>'L',
-41301=>'L',
-41302=>'L',
-41303=>'L',
-41304=>'L',
-41305=>'L',
-41306=>'L',
-41307=>'L',
-41308=>'L',
-41309=>'L',
-41310=>'L',
-41311=>'L',
-41312=>'L',
-41313=>'L',
-41314=>'L',
-41315=>'L',
-41316=>'L',
-41317=>'L',
-41318=>'L',
-41319=>'L',
-41320=>'L',
-41321=>'L',
-41322=>'L',
-41323=>'L',
-41324=>'L',
-41325=>'L',
-41326=>'L',
-41327=>'L',
-41328=>'L',
-41329=>'L',
-41330=>'L',
-41331=>'L',
-41332=>'L',
-41333=>'L',
-41334=>'L',
-41335=>'L',
-41336=>'L',
-41337=>'L',
-41338=>'L',
-41339=>'L',
-41340=>'L',
-41341=>'L',
-41342=>'L',
-41343=>'L',
-41344=>'L',
-41345=>'L',
-41346=>'L',
-41347=>'L',
-41348=>'L',
-41349=>'L',
-41350=>'L',
-41351=>'L',
-41352=>'L',
-41353=>'L',
-41354=>'L',
-41355=>'L',
-41356=>'L',
-41357=>'L',
-41358=>'L',
-41359=>'L',
-41360=>'L',
-41361=>'L',
-41362=>'L',
-41363=>'L',
-41364=>'L',
-41365=>'L',
-41366=>'L',
-41367=>'L',
-41368=>'L',
-41369=>'L',
-41370=>'L',
-41371=>'L',
-41372=>'L',
-41373=>'L',
-41374=>'L',
-41375=>'L',
-41376=>'L',
-41377=>'L',
-41378=>'L',
-41379=>'L',
-41380=>'L',
-41381=>'L',
-41382=>'L',
-41383=>'L',
-41384=>'L',
-41385=>'L',
-41386=>'L',
-41387=>'L',
-41388=>'L',
-41389=>'L',
-41390=>'L',
-41391=>'L',
-41392=>'L',
-41393=>'L',
-41394=>'L',
-41395=>'L',
-41396=>'L',
-41397=>'L',
-41398=>'L',
-41399=>'L',
-41400=>'L',
-41401=>'L',
-41402=>'L',
-41403=>'L',
-41404=>'L',
-41405=>'L',
-41406=>'L',
-41407=>'L',
-41408=>'L',
-41409=>'L',
-41410=>'L',
-41411=>'L',
-41412=>'L',
-41413=>'L',
-41414=>'L',
-41415=>'L',
-41416=>'L',
-41417=>'L',
-41418=>'L',
-41419=>'L',
-41420=>'L',
-41421=>'L',
-41422=>'L',
-41423=>'L',
-41424=>'L',
-41425=>'L',
-41426=>'L',
-41427=>'L',
-41428=>'L',
-41429=>'L',
-41430=>'L',
-41431=>'L',
-41432=>'L',
-41433=>'L',
-41434=>'L',
-41435=>'L',
-41436=>'L',
-41437=>'L',
-41438=>'L',
-41439=>'L',
-41440=>'L',
-41441=>'L',
-41442=>'L',
-41443=>'L',
-41444=>'L',
-41445=>'L',
-41446=>'L',
-41447=>'L',
-41448=>'L',
-41449=>'L',
-41450=>'L',
-41451=>'L',
-41452=>'L',
-41453=>'L',
-41454=>'L',
-41455=>'L',
-41456=>'L',
-41457=>'L',
-41458=>'L',
-41459=>'L',
-41460=>'L',
-41461=>'L',
-41462=>'L',
-41463=>'L',
-41464=>'L',
-41465=>'L',
-41466=>'L',
-41467=>'L',
-41468=>'L',
-41469=>'L',
-41470=>'L',
-41471=>'L',
-41472=>'L',
-41473=>'L',
-41474=>'L',
-41475=>'L',
-41476=>'L',
-41477=>'L',
-41478=>'L',
-41479=>'L',
-41480=>'L',
-41481=>'L',
-41482=>'L',
-41483=>'L',
-41484=>'L',
-41485=>'L',
-41486=>'L',
-41487=>'L',
-41488=>'L',
-41489=>'L',
-41490=>'L',
-41491=>'L',
-41492=>'L',
-41493=>'L',
-41494=>'L',
-41495=>'L',
-41496=>'L',
-41497=>'L',
-41498=>'L',
-41499=>'L',
-41500=>'L',
-41501=>'L',
-41502=>'L',
-41503=>'L',
-41504=>'L',
-41505=>'L',
-41506=>'L',
-41507=>'L',
-41508=>'L',
-41509=>'L',
-41510=>'L',
-41511=>'L',
-41512=>'L',
-41513=>'L',
-41514=>'L',
-41515=>'L',
-41516=>'L',
-41517=>'L',
-41518=>'L',
-41519=>'L',
-41520=>'L',
-41521=>'L',
-41522=>'L',
-41523=>'L',
-41524=>'L',
-41525=>'L',
-41526=>'L',
-41527=>'L',
-41528=>'L',
-41529=>'L',
-41530=>'L',
-41531=>'L',
-41532=>'L',
-41533=>'L',
-41534=>'L',
-41535=>'L',
-41536=>'L',
-41537=>'L',
-41538=>'L',
-41539=>'L',
-41540=>'L',
-41541=>'L',
-41542=>'L',
-41543=>'L',
-41544=>'L',
-41545=>'L',
-41546=>'L',
-41547=>'L',
-41548=>'L',
-41549=>'L',
-41550=>'L',
-41551=>'L',
-41552=>'L',
-41553=>'L',
-41554=>'L',
-41555=>'L',
-41556=>'L',
-41557=>'L',
-41558=>'L',
-41559=>'L',
-41560=>'L',
-41561=>'L',
-41562=>'L',
-41563=>'L',
-41564=>'L',
-41565=>'L',
-41566=>'L',
-41567=>'L',
-41568=>'L',
-41569=>'L',
-41570=>'L',
-41571=>'L',
-41572=>'L',
-41573=>'L',
-41574=>'L',
-41575=>'L',
-41576=>'L',
-41577=>'L',
-41578=>'L',
-41579=>'L',
-41580=>'L',
-41581=>'L',
-41582=>'L',
-41583=>'L',
-41584=>'L',
-41585=>'L',
-41586=>'L',
-41587=>'L',
-41588=>'L',
-41589=>'L',
-41590=>'L',
-41591=>'L',
-41592=>'L',
-41593=>'L',
-41594=>'L',
-41595=>'L',
-41596=>'L',
-41597=>'L',
-41598=>'L',
-41599=>'L',
-41600=>'L',
-41601=>'L',
-41602=>'L',
-41603=>'L',
-41604=>'L',
-41605=>'L',
-41606=>'L',
-41607=>'L',
-41608=>'L',
-41609=>'L',
-41610=>'L',
-41611=>'L',
-41612=>'L',
-41613=>'L',
-41614=>'L',
-41615=>'L',
-41616=>'L',
-41617=>'L',
-41618=>'L',
-41619=>'L',
-41620=>'L',
-41621=>'L',
-41622=>'L',
-41623=>'L',
-41624=>'L',
-41625=>'L',
-41626=>'L',
-41627=>'L',
-41628=>'L',
-41629=>'L',
-41630=>'L',
-41631=>'L',
-41632=>'L',
-41633=>'L',
-41634=>'L',
-41635=>'L',
-41636=>'L',
-41637=>'L',
-41638=>'L',
-41639=>'L',
-41640=>'L',
-41641=>'L',
-41642=>'L',
-41643=>'L',
-41644=>'L',
-41645=>'L',
-41646=>'L',
-41647=>'L',
-41648=>'L',
-41649=>'L',
-41650=>'L',
-41651=>'L',
-41652=>'L',
-41653=>'L',
-41654=>'L',
-41655=>'L',
-41656=>'L',
-41657=>'L',
-41658=>'L',
-41659=>'L',
-41660=>'L',
-41661=>'L',
-41662=>'L',
-41663=>'L',
-41664=>'L',
-41665=>'L',
-41666=>'L',
-41667=>'L',
-41668=>'L',
-41669=>'L',
-41670=>'L',
-41671=>'L',
-41672=>'L',
-41673=>'L',
-41674=>'L',
-41675=>'L',
-41676=>'L',
-41677=>'L',
-41678=>'L',
-41679=>'L',
-41680=>'L',
-41681=>'L',
-41682=>'L',
-41683=>'L',
-41684=>'L',
-41685=>'L',
-41686=>'L',
-41687=>'L',
-41688=>'L',
-41689=>'L',
-41690=>'L',
-41691=>'L',
-41692=>'L',
-41693=>'L',
-41694=>'L',
-41695=>'L',
-41696=>'L',
-41697=>'L',
-41698=>'L',
-41699=>'L',
-41700=>'L',
-41701=>'L',
-41702=>'L',
-41703=>'L',
-41704=>'L',
-41705=>'L',
-41706=>'L',
-41707=>'L',
-41708=>'L',
-41709=>'L',
-41710=>'L',
-41711=>'L',
-41712=>'L',
-41713=>'L',
-41714=>'L',
-41715=>'L',
-41716=>'L',
-41717=>'L',
-41718=>'L',
-41719=>'L',
-41720=>'L',
-41721=>'L',
-41722=>'L',
-41723=>'L',
-41724=>'L',
-41725=>'L',
-41726=>'L',
-41727=>'L',
-41728=>'L',
-41729=>'L',
-41730=>'L',
-41731=>'L',
-41732=>'L',
-41733=>'L',
-41734=>'L',
-41735=>'L',
-41736=>'L',
-41737=>'L',
-41738=>'L',
-41739=>'L',
-41740=>'L',
-41741=>'L',
-41742=>'L',
-41743=>'L',
-41744=>'L',
-41745=>'L',
-41746=>'L',
-41747=>'L',
-41748=>'L',
-41749=>'L',
-41750=>'L',
-41751=>'L',
-41752=>'L',
-41753=>'L',
-41754=>'L',
-41755=>'L',
-41756=>'L',
-41757=>'L',
-41758=>'L',
-41759=>'L',
-41760=>'L',
-41761=>'L',
-41762=>'L',
-41763=>'L',
-41764=>'L',
-41765=>'L',
-41766=>'L',
-41767=>'L',
-41768=>'L',
-41769=>'L',
-41770=>'L',
-41771=>'L',
-41772=>'L',
-41773=>'L',
-41774=>'L',
-41775=>'L',
-41776=>'L',
-41777=>'L',
-41778=>'L',
-41779=>'L',
-41780=>'L',
-41781=>'L',
-41782=>'L',
-41783=>'L',
-41784=>'L',
-41785=>'L',
-41786=>'L',
-41787=>'L',
-41788=>'L',
-41789=>'L',
-41790=>'L',
-41791=>'L',
-41792=>'L',
-41793=>'L',
-41794=>'L',
-41795=>'L',
-41796=>'L',
-41797=>'L',
-41798=>'L',
-41799=>'L',
-41800=>'L',
-41801=>'L',
-41802=>'L',
-41803=>'L',
-41804=>'L',
-41805=>'L',
-41806=>'L',
-41807=>'L',
-41808=>'L',
-41809=>'L',
-41810=>'L',
-41811=>'L',
-41812=>'L',
-41813=>'L',
-41814=>'L',
-41815=>'L',
-41816=>'L',
-41817=>'L',
-41818=>'L',
-41819=>'L',
-41820=>'L',
-41821=>'L',
-41822=>'L',
-41823=>'L',
-41824=>'L',
-41825=>'L',
-41826=>'L',
-41827=>'L',
-41828=>'L',
-41829=>'L',
-41830=>'L',
-41831=>'L',
-41832=>'L',
-41833=>'L',
-41834=>'L',
-41835=>'L',
-41836=>'L',
-41837=>'L',
-41838=>'L',
-41839=>'L',
-41840=>'L',
-41841=>'L',
-41842=>'L',
-41843=>'L',
-41844=>'L',
-41845=>'L',
-41846=>'L',
-41847=>'L',
-41848=>'L',
-41849=>'L',
-41850=>'L',
-41851=>'L',
-41852=>'L',
-41853=>'L',
-41854=>'L',
-41855=>'L',
-41856=>'L',
-41857=>'L',
-41858=>'L',
-41859=>'L',
-41860=>'L',
-41861=>'L',
-41862=>'L',
-41863=>'L',
-41864=>'L',
-41865=>'L',
-41866=>'L',
-41867=>'L',
-41868=>'L',
-41869=>'L',
-41870=>'L',
-41871=>'L',
-41872=>'L',
-41873=>'L',
-41874=>'L',
-41875=>'L',
-41876=>'L',
-41877=>'L',
-41878=>'L',
-41879=>'L',
-41880=>'L',
-41881=>'L',
-41882=>'L',
-41883=>'L',
-41884=>'L',
-41885=>'L',
-41886=>'L',
-41887=>'L',
-41888=>'L',
-41889=>'L',
-41890=>'L',
-41891=>'L',
-41892=>'L',
-41893=>'L',
-41894=>'L',
-41895=>'L',
-41896=>'L',
-41897=>'L',
-41898=>'L',
-41899=>'L',
-41900=>'L',
-41901=>'L',
-41902=>'L',
-41903=>'L',
-41904=>'L',
-41905=>'L',
-41906=>'L',
-41907=>'L',
-41908=>'L',
-41909=>'L',
-41910=>'L',
-41911=>'L',
-41912=>'L',
-41913=>'L',
-41914=>'L',
-41915=>'L',
-41916=>'L',
-41917=>'L',
-41918=>'L',
-41919=>'L',
-41920=>'L',
-41921=>'L',
-41922=>'L',
-41923=>'L',
-41924=>'L',
-41925=>'L',
-41926=>'L',
-41927=>'L',
-41928=>'L',
-41929=>'L',
-41930=>'L',
-41931=>'L',
-41932=>'L',
-41933=>'L',
-41934=>'L',
-41935=>'L',
-41936=>'L',
-41937=>'L',
-41938=>'L',
-41939=>'L',
-41940=>'L',
-41941=>'L',
-41942=>'L',
-41943=>'L',
-41944=>'L',
-41945=>'L',
-41946=>'L',
-41947=>'L',
-41948=>'L',
-41949=>'L',
-41950=>'L',
-41951=>'L',
-41952=>'L',
-41953=>'L',
-41954=>'L',
-41955=>'L',
-41956=>'L',
-41957=>'L',
-41958=>'L',
-41959=>'L',
-41960=>'L',
-41961=>'L',
-41962=>'L',
-41963=>'L',
-41964=>'L',
-41965=>'L',
-41966=>'L',
-41967=>'L',
-41968=>'L',
-41969=>'L',
-41970=>'L',
-41971=>'L',
-41972=>'L',
-41973=>'L',
-41974=>'L',
-41975=>'L',
-41976=>'L',
-41977=>'L',
-41978=>'L',
-41979=>'L',
-41980=>'L',
-41981=>'L',
-41982=>'L',
-41983=>'L',
-41984=>'L',
-41985=>'L',
-41986=>'L',
-41987=>'L',
-41988=>'L',
-41989=>'L',
-41990=>'L',
-41991=>'L',
-41992=>'L',
-41993=>'L',
-41994=>'L',
-41995=>'L',
-41996=>'L',
-41997=>'L',
-41998=>'L',
-41999=>'L',
-42000=>'L',
-42001=>'L',
-42002=>'L',
-42003=>'L',
-42004=>'L',
-42005=>'L',
-42006=>'L',
-42007=>'L',
-42008=>'L',
-42009=>'L',
-42010=>'L',
-42011=>'L',
-42012=>'L',
-42013=>'L',
-42014=>'L',
-42015=>'L',
-42016=>'L',
-42017=>'L',
-42018=>'L',
-42019=>'L',
-42020=>'L',
-42021=>'L',
-42022=>'L',
-42023=>'L',
-42024=>'L',
-42025=>'L',
-42026=>'L',
-42027=>'L',
-42028=>'L',
-42029=>'L',
-42030=>'L',
-42031=>'L',
-42032=>'L',
-42033=>'L',
-42034=>'L',
-42035=>'L',
-42036=>'L',
-42037=>'L',
-42038=>'L',
-42039=>'L',
-42040=>'L',
-42041=>'L',
-42042=>'L',
-42043=>'L',
-42044=>'L',
-42045=>'L',
-42046=>'L',
-42047=>'L',
-42048=>'L',
-42049=>'L',
-42050=>'L',
-42051=>'L',
-42052=>'L',
-42053=>'L',
-42054=>'L',
-42055=>'L',
-42056=>'L',
-42057=>'L',
-42058=>'L',
-42059=>'L',
-42060=>'L',
-42061=>'L',
-42062=>'L',
-42063=>'L',
-42064=>'L',
-42065=>'L',
-42066=>'L',
-42067=>'L',
-42068=>'L',
-42069=>'L',
-42070=>'L',
-42071=>'L',
-42072=>'L',
-42073=>'L',
-42074=>'L',
-42075=>'L',
-42076=>'L',
-42077=>'L',
-42078=>'L',
-42079=>'L',
-42080=>'L',
-42081=>'L',
-42082=>'L',
-42083=>'L',
-42084=>'L',
-42085=>'L',
-42086=>'L',
-42087=>'L',
-42088=>'L',
-42089=>'L',
-42090=>'L',
-42091=>'L',
-42092=>'L',
-42093=>'L',
-42094=>'L',
-42095=>'L',
-42096=>'L',
-42097=>'L',
-42098=>'L',
-42099=>'L',
-42100=>'L',
-42101=>'L',
-42102=>'L',
-42103=>'L',
-42104=>'L',
-42105=>'L',
-42106=>'L',
-42107=>'L',
-42108=>'L',
-42109=>'L',
-42110=>'L',
-42111=>'L',
-42112=>'L',
-42113=>'L',
-42114=>'L',
-42115=>'L',
-42116=>'L',
-42117=>'L',
-42118=>'L',
-42119=>'L',
-42120=>'L',
-42121=>'L',
-42122=>'L',
-42123=>'L',
-42124=>'L',
-42128=>'ON',
-42129=>'ON',
-42130=>'ON',
-42131=>'ON',
-42132=>'ON',
-42133=>'ON',
-42134=>'ON',
-42135=>'ON',
-42136=>'ON',
-42137=>'ON',
-42138=>'ON',
-42139=>'ON',
-42140=>'ON',
-42141=>'ON',
-42142=>'ON',
-42143=>'ON',
-42144=>'ON',
-42145=>'ON',
-42146=>'ON',
-42147=>'ON',
-42148=>'ON',
-42149=>'ON',
-42150=>'ON',
-42151=>'ON',
-42152=>'ON',
-42153=>'ON',
-42154=>'ON',
-42155=>'ON',
-42156=>'ON',
-42157=>'ON',
-42158=>'ON',
-42159=>'ON',
-42160=>'ON',
-42161=>'ON',
-42162=>'ON',
-42163=>'ON',
-42164=>'ON',
-42165=>'ON',
-42166=>'ON',
-42167=>'ON',
-42168=>'ON',
-42169=>'ON',
-42170=>'ON',
-42171=>'ON',
-42172=>'ON',
-42173=>'ON',
-42174=>'ON',
-42175=>'ON',
-42176=>'ON',
-42177=>'ON',
-42178=>'ON',
-42179=>'ON',
-42180=>'ON',
-42181=>'ON',
-42182=>'ON',
-42752=>'ON',
-42753=>'ON',
-42754=>'ON',
-42755=>'ON',
-42756=>'ON',
-42757=>'ON',
-42758=>'ON',
-42759=>'ON',
-42760=>'ON',
-42761=>'ON',
-42762=>'ON',
-42763=>'ON',
-42764=>'ON',
-42765=>'ON',
-42766=>'ON',
-42767=>'ON',
-42768=>'ON',
-42769=>'ON',
-42770=>'ON',
-42771=>'ON',
-42772=>'ON',
-42773=>'ON',
-42774=>'ON',
-42775=>'ON',
-42776=>'ON',
-42777=>'ON',
-42778=>'ON',
-42784=>'ON',
-42785=>'ON',
-43008=>'L',
-43009=>'L',
-43010=>'NSM',
-43011=>'L',
-43012=>'L',
-43013=>'L',
-43014=>'NSM',
-43015=>'L',
-43016=>'L',
-43017=>'L',
-43018=>'L',
-43019=>'NSM',
-43020=>'L',
-43021=>'L',
-43022=>'L',
-43023=>'L',
-43024=>'L',
-43025=>'L',
-43026=>'L',
-43027=>'L',
-43028=>'L',
-43029=>'L',
-43030=>'L',
-43031=>'L',
-43032=>'L',
-43033=>'L',
-43034=>'L',
-43035=>'L',
-43036=>'L',
-43037=>'L',
-43038=>'L',
-43039=>'L',
-43040=>'L',
-43041=>'L',
-43042=>'L',
-43043=>'L',
-43044=>'L',
-43045=>'NSM',
-43046=>'NSM',
-43047=>'L',
-43048=>'ON',
-43049=>'ON',
-43050=>'ON',
-43051=>'ON',
-43072=>'L',
-43073=>'L',
-43074=>'L',
-43075=>'L',
-43076=>'L',
-43077=>'L',
-43078=>'L',
-43079=>'L',
-43080=>'L',
-43081=>'L',
-43082=>'L',
-43083=>'L',
-43084=>'L',
-43085=>'L',
-43086=>'L',
-43087=>'L',
-43088=>'L',
-43089=>'L',
-43090=>'L',
-43091=>'L',
-43092=>'L',
-43093=>'L',
-43094=>'L',
-43095=>'L',
-43096=>'L',
-43097=>'L',
-43098=>'L',
-43099=>'L',
-43100=>'L',
-43101=>'L',
-43102=>'L',
-43103=>'L',
-43104=>'L',
-43105=>'L',
-43106=>'L',
-43107=>'L',
-43108=>'L',
-43109=>'L',
-43110=>'L',
-43111=>'L',
-43112=>'L',
-43113=>'L',
-43114=>'L',
-43115=>'L',
-43116=>'L',
-43117=>'L',
-43118=>'L',
-43119=>'L',
-43120=>'L',
-43121=>'L',
-43122=>'L',
-43123=>'L',
-43124=>'ON',
-43125=>'ON',
-43126=>'ON',
-43127=>'ON',
-44032=>'L',
-55203=>'L',
-55296=>'L',
-56191=>'L',
-56192=>'L',
-56319=>'L',
-56320=>'L',
-57343=>'L',
-57344=>'L',
-63743=>'L',
-63744=>'L',
-63745=>'L',
-63746=>'L',
-63747=>'L',
-63748=>'L',
-63749=>'L',
-63750=>'L',
-63751=>'L',
-63752=>'L',
-63753=>'L',
-63754=>'L',
-63755=>'L',
-63756=>'L',
-63757=>'L',
-63758=>'L',
-63759=>'L',
-63760=>'L',
-63761=>'L',
-63762=>'L',
-63763=>'L',
-63764=>'L',
-63765=>'L',
-63766=>'L',
-63767=>'L',
-63768=>'L',
-63769=>'L',
-63770=>'L',
-63771=>'L',
-63772=>'L',
-63773=>'L',
-63774=>'L',
-63775=>'L',
-63776=>'L',
-63777=>'L',
-63778=>'L',
-63779=>'L',
-63780=>'L',
-63781=>'L',
-63782=>'L',
-63783=>'L',
-63784=>'L',
-63785=>'L',
-63786=>'L',
-63787=>'L',
-63788=>'L',
-63789=>'L',
-63790=>'L',
-63791=>'L',
-63792=>'L',
-63793=>'L',
-63794=>'L',
-63795=>'L',
-63796=>'L',
-63797=>'L',
-63798=>'L',
-63799=>'L',
-63800=>'L',
-63801=>'L',
-63802=>'L',
-63803=>'L',
-63804=>'L',
-63805=>'L',
-63806=>'L',
-63807=>'L',
-63808=>'L',
-63809=>'L',
-63810=>'L',
-63811=>'L',
-63812=>'L',
-63813=>'L',
-63814=>'L',
-63815=>'L',
-63816=>'L',
-63817=>'L',
-63818=>'L',
-63819=>'L',
-63820=>'L',
-63821=>'L',
-63822=>'L',
-63823=>'L',
-63824=>'L',
-63825=>'L',
-63826=>'L',
-63827=>'L',
-63828=>'L',
-63829=>'L',
-63830=>'L',
-63831=>'L',
-63832=>'L',
-63833=>'L',
-63834=>'L',
-63835=>'L',
-63836=>'L',
-63837=>'L',
-63838=>'L',
-63839=>'L',
-63840=>'L',
-63841=>'L',
-63842=>'L',
-63843=>'L',
-63844=>'L',
-63845=>'L',
-63846=>'L',
-63847=>'L',
-63848=>'L',
-63849=>'L',
-63850=>'L',
-63851=>'L',
-63852=>'L',
-63853=>'L',
-63854=>'L',
-63855=>'L',
-63856=>'L',
-63857=>'L',
-63858=>'L',
-63859=>'L',
-63860=>'L',
-63861=>'L',
-63862=>'L',
-63863=>'L',
-63864=>'L',
-63865=>'L',
-63866=>'L',
-63867=>'L',
-63868=>'L',
-63869=>'L',
-63870=>'L',
-63871=>'L',
-63872=>'L',
-63873=>'L',
-63874=>'L',
-63875=>'L',
-63876=>'L',
-63877=>'L',
-63878=>'L',
-63879=>'L',
-63880=>'L',
-63881=>'L',
-63882=>'L',
-63883=>'L',
-63884=>'L',
-63885=>'L',
-63886=>'L',
-63887=>'L',
-63888=>'L',
-63889=>'L',
-63890=>'L',
-63891=>'L',
-63892=>'L',
-63893=>'L',
-63894=>'L',
-63895=>'L',
-63896=>'L',
-63897=>'L',
-63898=>'L',
-63899=>'L',
-63900=>'L',
-63901=>'L',
-63902=>'L',
-63903=>'L',
-63904=>'L',
-63905=>'L',
-63906=>'L',
-63907=>'L',
-63908=>'L',
-63909=>'L',
-63910=>'L',
-63911=>'L',
-63912=>'L',
-63913=>'L',
-63914=>'L',
-63915=>'L',
-63916=>'L',
-63917=>'L',
-63918=>'L',
-63919=>'L',
-63920=>'L',
-63921=>'L',
-63922=>'L',
-63923=>'L',
-63924=>'L',
-63925=>'L',
-63926=>'L',
-63927=>'L',
-63928=>'L',
-63929=>'L',
-63930=>'L',
-63931=>'L',
-63932=>'L',
-63933=>'L',
-63934=>'L',
-63935=>'L',
-63936=>'L',
-63937=>'L',
-63938=>'L',
-63939=>'L',
-63940=>'L',
-63941=>'L',
-63942=>'L',
-63943=>'L',
-63944=>'L',
-63945=>'L',
-63946=>'L',
-63947=>'L',
-63948=>'L',
-63949=>'L',
-63950=>'L',
-63951=>'L',
-63952=>'L',
-63953=>'L',
-63954=>'L',
-63955=>'L',
-63956=>'L',
-63957=>'L',
-63958=>'L',
-63959=>'L',
-63960=>'L',
-63961=>'L',
-63962=>'L',
-63963=>'L',
-63964=>'L',
-63965=>'L',
-63966=>'L',
-63967=>'L',
-63968=>'L',
-63969=>'L',
-63970=>'L',
-63971=>'L',
-63972=>'L',
-63973=>'L',
-63974=>'L',
-63975=>'L',
-63976=>'L',
-63977=>'L',
-63978=>'L',
-63979=>'L',
-63980=>'L',
-63981=>'L',
-63982=>'L',
-63983=>'L',
-63984=>'L',
-63985=>'L',
-63986=>'L',
-63987=>'L',
-63988=>'L',
-63989=>'L',
-63990=>'L',
-63991=>'L',
-63992=>'L',
-63993=>'L',
-63994=>'L',
-63995=>'L',
-63996=>'L',
-63997=>'L',
-63998=>'L',
-63999=>'L',
-64000=>'L',
-64001=>'L',
-64002=>'L',
-64003=>'L',
-64004=>'L',
-64005=>'L',
-64006=>'L',
-64007=>'L',
-64008=>'L',
-64009=>'L',
-64010=>'L',
-64011=>'L',
-64012=>'L',
-64013=>'L',
-64014=>'L',
-64015=>'L',
-64016=>'L',
-64017=>'L',
-64018=>'L',
-64019=>'L',
-64020=>'L',
-64021=>'L',
-64022=>'L',
-64023=>'L',
-64024=>'L',
-64025=>'L',
-64026=>'L',
-64027=>'L',
-64028=>'L',
-64029=>'L',
-64030=>'L',
-64031=>'L',
-64032=>'L',
-64033=>'L',
-64034=>'L',
-64035=>'L',
-64036=>'L',
-64037=>'L',
-64038=>'L',
-64039=>'L',
-64040=>'L',
-64041=>'L',
-64042=>'L',
-64043=>'L',
-64044=>'L',
-64045=>'L',
-64048=>'L',
-64049=>'L',
-64050=>'L',
-64051=>'L',
-64052=>'L',
-64053=>'L',
-64054=>'L',
-64055=>'L',
-64056=>'L',
-64057=>'L',
-64058=>'L',
-64059=>'L',
-64060=>'L',
-64061=>'L',
-64062=>'L',
-64063=>'L',
-64064=>'L',
-64065=>'L',
-64066=>'L',
-64067=>'L',
-64068=>'L',
-64069=>'L',
-64070=>'L',
-64071=>'L',
-64072=>'L',
-64073=>'L',
-64074=>'L',
-64075=>'L',
-64076=>'L',
-64077=>'L',
-64078=>'L',
-64079=>'L',
-64080=>'L',
-64081=>'L',
-64082=>'L',
-64083=>'L',
-64084=>'L',
-64085=>'L',
-64086=>'L',
-64087=>'L',
-64088=>'L',
-64089=>'L',
-64090=>'L',
-64091=>'L',
-64092=>'L',
-64093=>'L',
-64094=>'L',
-64095=>'L',
-64096=>'L',
-64097=>'L',
-64098=>'L',
-64099=>'L',
-64100=>'L',
-64101=>'L',
-64102=>'L',
-64103=>'L',
-64104=>'L',
-64105=>'L',
-64106=>'L',
-64112=>'L',
-64113=>'L',
-64114=>'L',
-64115=>'L',
-64116=>'L',
-64117=>'L',
-64118=>'L',
-64119=>'L',
-64120=>'L',
-64121=>'L',
-64122=>'L',
-64123=>'L',
-64124=>'L',
-64125=>'L',
-64126=>'L',
-64127=>'L',
-64128=>'L',
-64129=>'L',
-64130=>'L',
-64131=>'L',
-64132=>'L',
-64133=>'L',
-64134=>'L',
-64135=>'L',
-64136=>'L',
-64137=>'L',
-64138=>'L',
-64139=>'L',
-64140=>'L',
-64141=>'L',
-64142=>'L',
-64143=>'L',
-64144=>'L',
-64145=>'L',
-64146=>'L',
-64147=>'L',
-64148=>'L',
-64149=>'L',
-64150=>'L',
-64151=>'L',
-64152=>'L',
-64153=>'L',
-64154=>'L',
-64155=>'L',
-64156=>'L',
-64157=>'L',
-64158=>'L',
-64159=>'L',
-64160=>'L',
-64161=>'L',
-64162=>'L',
-64163=>'L',
-64164=>'L',
-64165=>'L',
-64166=>'L',
-64167=>'L',
-64168=>'L',
-64169=>'L',
-64170=>'L',
-64171=>'L',
-64172=>'L',
-64173=>'L',
-64174=>'L',
-64175=>'L',
-64176=>'L',
-64177=>'L',
-64178=>'L',
-64179=>'L',
-64180=>'L',
-64181=>'L',
-64182=>'L',
-64183=>'L',
-64184=>'L',
-64185=>'L',
-64186=>'L',
-64187=>'L',
-64188=>'L',
-64189=>'L',
-64190=>'L',
-64191=>'L',
-64192=>'L',
-64193=>'L',
-64194=>'L',
-64195=>'L',
-64196=>'L',
-64197=>'L',
-64198=>'L',
-64199=>'L',
-64200=>'L',
-64201=>'L',
-64202=>'L',
-64203=>'L',
-64204=>'L',
-64205=>'L',
-64206=>'L',
-64207=>'L',
-64208=>'L',
-64209=>'L',
-64210=>'L',
-64211=>'L',
-64212=>'L',
-64213=>'L',
-64214=>'L',
-64215=>'L',
-64216=>'L',
-64217=>'L',
-64256=>'L',
-64257=>'L',
-64258=>'L',
-64259=>'L',
-64260=>'L',
-64261=>'L',
-64262=>'L',
-64275=>'L',
-64276=>'L',
-64277=>'L',
-64278=>'L',
-64279=>'L',
-64285=>'R',
-64286=>'NSM',
-64287=>'R',
-64288=>'R',
-64289=>'R',
-64290=>'R',
-64291=>'R',
-64292=>'R',
-64293=>'R',
-64294=>'R',
-64295=>'R',
-64296=>'R',
-64297=>'ES',
-64298=>'R',
-64299=>'R',
-64300=>'R',
-64301=>'R',
-64302=>'R',
-64303=>'R',
-64304=>'R',
-64305=>'R',
-64306=>'R',
-64307=>'R',
-64308=>'R',
-64309=>'R',
-64310=>'R',
-64312=>'R',
-64313=>'R',
-64314=>'R',
-64315=>'R',
-64316=>'R',
-64318=>'R',
-64320=>'R',
-64321=>'R',
-64323=>'R',
-64324=>'R',
-64326=>'R',
-64327=>'R',
-64328=>'R',
-64329=>'R',
-64330=>'R',
-64331=>'R',
-64332=>'R',
-64333=>'R',
-64334=>'R',
-64335=>'R',
-64336=>'AL',
-64337=>'AL',
-64338=>'AL',
-64339=>'AL',
-64340=>'AL',
-64341=>'AL',
-64342=>'AL',
-64343=>'AL',
-64344=>'AL',
-64345=>'AL',
-64346=>'AL',
-64347=>'AL',
-64348=>'AL',
-64349=>'AL',
-64350=>'AL',
-64351=>'AL',
-64352=>'AL',
-64353=>'AL',
-64354=>'AL',
-64355=>'AL',
-64356=>'AL',
-64357=>'AL',
-64358=>'AL',
-64359=>'AL',
-64360=>'AL',
-64361=>'AL',
-64362=>'AL',
-64363=>'AL',
-64364=>'AL',
-64365=>'AL',
-64366=>'AL',
-64367=>'AL',
-64368=>'AL',
-64369=>'AL',
-64370=>'AL',
-64371=>'AL',
-64372=>'AL',
-64373=>'AL',
-64374=>'AL',
-64375=>'AL',
-64376=>'AL',
-64377=>'AL',
-64378=>'AL',
-64379=>'AL',
-64380=>'AL',
-64381=>'AL',
-64382=>'AL',
-64383=>'AL',
-64384=>'AL',
-64385=>'AL',
-64386=>'AL',
-64387=>'AL',
-64388=>'AL',
-64389=>'AL',
-64390=>'AL',
-64391=>'AL',
-64392=>'AL',
-64393=>'AL',
-64394=>'AL',
-64395=>'AL',
-64396=>'AL',
-64397=>'AL',
-64398=>'AL',
-64399=>'AL',
-64400=>'AL',
-64401=>'AL',
-64402=>'AL',
-64403=>'AL',
-64404=>'AL',
-64405=>'AL',
-64406=>'AL',
-64407=>'AL',
-64408=>'AL',
-64409=>'AL',
-64410=>'AL',
-64411=>'AL',
-64412=>'AL',
-64413=>'AL',
-64414=>'AL',
-64415=>'AL',
-64416=>'AL',
-64417=>'AL',
-64418=>'AL',
-64419=>'AL',
-64420=>'AL',
-64421=>'AL',
-64422=>'AL',
-64423=>'AL',
-64424=>'AL',
-64425=>'AL',
-64426=>'AL',
-64427=>'AL',
-64428=>'AL',
-64429=>'AL',
-64430=>'AL',
-64431=>'AL',
-64432=>'AL',
-64433=>'AL',
-64467=>'AL',
-64468=>'AL',
-64469=>'AL',
-64470=>'AL',
-64471=>'AL',
-64472=>'AL',
-64473=>'AL',
-64474=>'AL',
-64475=>'AL',
-64476=>'AL',
-64477=>'AL',
-64478=>'AL',
-64479=>'AL',
-64480=>'AL',
-64481=>'AL',
-64482=>'AL',
-64483=>'AL',
-64484=>'AL',
-64485=>'AL',
-64486=>'AL',
-64487=>'AL',
-64488=>'AL',
-64489=>'AL',
-64490=>'AL',
-64491=>'AL',
-64492=>'AL',
-64493=>'AL',
-64494=>'AL',
-64495=>'AL',
-64496=>'AL',
-64497=>'AL',
-64498=>'AL',
-64499=>'AL',
-64500=>'AL',
-64501=>'AL',
-64502=>'AL',
-64503=>'AL',
-64504=>'AL',
-64505=>'AL',
-64506=>'AL',
-64507=>'AL',
-64508=>'AL',
-64509=>'AL',
-64510=>'AL',
-64511=>'AL',
-64512=>'AL',
-64513=>'AL',
-64514=>'AL',
-64515=>'AL',
-64516=>'AL',
-64517=>'AL',
-64518=>'AL',
-64519=>'AL',
-64520=>'AL',
-64521=>'AL',
-64522=>'AL',
-64523=>'AL',
-64524=>'AL',
-64525=>'AL',
-64526=>'AL',
-64527=>'AL',
-64528=>'AL',
-64529=>'AL',
-64530=>'AL',
-64531=>'AL',
-64532=>'AL',
-64533=>'AL',
-64534=>'AL',
-64535=>'AL',
-64536=>'AL',
-64537=>'AL',
-64538=>'AL',
-64539=>'AL',
-64540=>'AL',
-64541=>'AL',
-64542=>'AL',
-64543=>'AL',
-64544=>'AL',
-64545=>'AL',
-64546=>'AL',
-64547=>'AL',
-64548=>'AL',
-64549=>'AL',
-64550=>'AL',
-64551=>'AL',
-64552=>'AL',
-64553=>'AL',
-64554=>'AL',
-64555=>'AL',
-64556=>'AL',
-64557=>'AL',
-64558=>'AL',
-64559=>'AL',
-64560=>'AL',
-64561=>'AL',
-64562=>'AL',
-64563=>'AL',
-64564=>'AL',
-64565=>'AL',
-64566=>'AL',
-64567=>'AL',
-64568=>'AL',
-64569=>'AL',
-64570=>'AL',
-64571=>'AL',
-64572=>'AL',
-64573=>'AL',
-64574=>'AL',
-64575=>'AL',
-64576=>'AL',
-64577=>'AL',
-64578=>'AL',
-64579=>'AL',
-64580=>'AL',
-64581=>'AL',
-64582=>'AL',
-64583=>'AL',
-64584=>'AL',
-64585=>'AL',
-64586=>'AL',
-64587=>'AL',
-64588=>'AL',
-64589=>'AL',
-64590=>'AL',
-64591=>'AL',
-64592=>'AL',
-64593=>'AL',
-64594=>'AL',
-64595=>'AL',
-64596=>'AL',
-64597=>'AL',
-64598=>'AL',
-64599=>'AL',
-64600=>'AL',
-64601=>'AL',
-64602=>'AL',
-64603=>'AL',
-64604=>'AL',
-64605=>'AL',
-64606=>'AL',
-64607=>'AL',
-64608=>'AL',
-64609=>'AL',
-64610=>'AL',
-64611=>'AL',
-64612=>'AL',
-64613=>'AL',
-64614=>'AL',
-64615=>'AL',
-64616=>'AL',
-64617=>'AL',
-64618=>'AL',
-64619=>'AL',
-64620=>'AL',
-64621=>'AL',
-64622=>'AL',
-64623=>'AL',
-64624=>'AL',
-64625=>'AL',
-64626=>'AL',
-64627=>'AL',
-64628=>'AL',
-64629=>'AL',
-64630=>'AL',
-64631=>'AL',
-64632=>'AL',
-64633=>'AL',
-64634=>'AL',
-64635=>'AL',
-64636=>'AL',
-64637=>'AL',
-64638=>'AL',
-64639=>'AL',
-64640=>'AL',
-64641=>'AL',
-64642=>'AL',
-64643=>'AL',
-64644=>'AL',
-64645=>'AL',
-64646=>'AL',
-64647=>'AL',
-64648=>'AL',
-64649=>'AL',
-64650=>'AL',
-64651=>'AL',
-64652=>'AL',
-64653=>'AL',
-64654=>'AL',
-64655=>'AL',
-64656=>'AL',
-64657=>'AL',
-64658=>'AL',
-64659=>'AL',
-64660=>'AL',
-64661=>'AL',
-64662=>'AL',
-64663=>'AL',
-64664=>'AL',
-64665=>'AL',
-64666=>'AL',
-64667=>'AL',
-64668=>'AL',
-64669=>'AL',
-64670=>'AL',
-64671=>'AL',
-64672=>'AL',
-64673=>'AL',
-64674=>'AL',
-64675=>'AL',
-64676=>'AL',
-64677=>'AL',
-64678=>'AL',
-64679=>'AL',
-64680=>'AL',
-64681=>'AL',
-64682=>'AL',
-64683=>'AL',
-64684=>'AL',
-64685=>'AL',
-64686=>'AL',
-64687=>'AL',
-64688=>'AL',
-64689=>'AL',
-64690=>'AL',
-64691=>'AL',
-64692=>'AL',
-64693=>'AL',
-64694=>'AL',
-64695=>'AL',
-64696=>'AL',
-64697=>'AL',
-64698=>'AL',
-64699=>'AL',
-64700=>'AL',
-64701=>'AL',
-64702=>'AL',
-64703=>'AL',
-64704=>'AL',
-64705=>'AL',
-64706=>'AL',
-64707=>'AL',
-64708=>'AL',
-64709=>'AL',
-64710=>'AL',
-64711=>'AL',
-64712=>'AL',
-64713=>'AL',
-64714=>'AL',
-64715=>'AL',
-64716=>'AL',
-64717=>'AL',
-64718=>'AL',
-64719=>'AL',
-64720=>'AL',
-64721=>'AL',
-64722=>'AL',
-64723=>'AL',
-64724=>'AL',
-64725=>'AL',
-64726=>'AL',
-64727=>'AL',
-64728=>'AL',
-64729=>'AL',
-64730=>'AL',
-64731=>'AL',
-64732=>'AL',
-64733=>'AL',
-64734=>'AL',
-64735=>'AL',
-64736=>'AL',
-64737=>'AL',
-64738=>'AL',
-64739=>'AL',
-64740=>'AL',
-64741=>'AL',
-64742=>'AL',
-64743=>'AL',
-64744=>'AL',
-64745=>'AL',
-64746=>'AL',
-64747=>'AL',
-64748=>'AL',
-64749=>'AL',
-64750=>'AL',
-64751=>'AL',
-64752=>'AL',
-64753=>'AL',
-64754=>'AL',
-64755=>'AL',
-64756=>'AL',
-64757=>'AL',
-64758=>'AL',
-64759=>'AL',
-64760=>'AL',
-64761=>'AL',
-64762=>'AL',
-64763=>'AL',
-64764=>'AL',
-64765=>'AL',
-64766=>'AL',
-64767=>'AL',
-64768=>'AL',
-64769=>'AL',
-64770=>'AL',
-64771=>'AL',
-64772=>'AL',
-64773=>'AL',
-64774=>'AL',
-64775=>'AL',
-64776=>'AL',
-64777=>'AL',
-64778=>'AL',
-64779=>'AL',
-64780=>'AL',
-64781=>'AL',
-64782=>'AL',
-64783=>'AL',
-64784=>'AL',
-64785=>'AL',
-64786=>'AL',
-64787=>'AL',
-64788=>'AL',
-64789=>'AL',
-64790=>'AL',
-64791=>'AL',
-64792=>'AL',
-64793=>'AL',
-64794=>'AL',
-64795=>'AL',
-64796=>'AL',
-64797=>'AL',
-64798=>'AL',
-64799=>'AL',
-64800=>'AL',
-64801=>'AL',
-64802=>'AL',
-64803=>'AL',
-64804=>'AL',
-64805=>'AL',
-64806=>'AL',
-64807=>'AL',
-64808=>'AL',
-64809=>'AL',
-64810=>'AL',
-64811=>'AL',
-64812=>'AL',
-64813=>'AL',
-64814=>'AL',
-64815=>'AL',
-64816=>'AL',
-64817=>'AL',
-64818=>'AL',
-64819=>'AL',
-64820=>'AL',
-64821=>'AL',
-64822=>'AL',
-64823=>'AL',
-64824=>'AL',
-64825=>'AL',
-64826=>'AL',
-64827=>'AL',
-64828=>'AL',
-64829=>'AL',
-64830=>'ON',
-64831=>'ON',
-64848=>'AL',
-64849=>'AL',
-64850=>'AL',
-64851=>'AL',
-64852=>'AL',
-64853=>'AL',
-64854=>'AL',
-64855=>'AL',
-64856=>'AL',
-64857=>'AL',
-64858=>'AL',
-64859=>'AL',
-64860=>'AL',
-64861=>'AL',
-64862=>'AL',
-64863=>'AL',
-64864=>'AL',
-64865=>'AL',
-64866=>'AL',
-64867=>'AL',
-64868=>'AL',
-64869=>'AL',
-64870=>'AL',
-64871=>'AL',
-64872=>'AL',
-64873=>'AL',
-64874=>'AL',
-64875=>'AL',
-64876=>'AL',
-64877=>'AL',
-64878=>'AL',
-64879=>'AL',
-64880=>'AL',
-64881=>'AL',
-64882=>'AL',
-64883=>'AL',
-64884=>'AL',
-64885=>'AL',
-64886=>'AL',
-64887=>'AL',
-64888=>'AL',
-64889=>'AL',
-64890=>'AL',
-64891=>'AL',
-64892=>'AL',
-64893=>'AL',
-64894=>'AL',
-64895=>'AL',
-64896=>'AL',
-64897=>'AL',
-64898=>'AL',
-64899=>'AL',
-64900=>'AL',
-64901=>'AL',
-64902=>'AL',
-64903=>'AL',
-64904=>'AL',
-64905=>'AL',
-64906=>'AL',
-64907=>'AL',
-64908=>'AL',
-64909=>'AL',
-64910=>'AL',
-64911=>'AL',
-64914=>'AL',
-64915=>'AL',
-64916=>'AL',
-64917=>'AL',
-64918=>'AL',
-64919=>'AL',
-64920=>'AL',
-64921=>'AL',
-64922=>'AL',
-64923=>'AL',
-64924=>'AL',
-64925=>'AL',
-64926=>'AL',
-64927=>'AL',
-64928=>'AL',
-64929=>'AL',
-64930=>'AL',
-64931=>'AL',
-64932=>'AL',
-64933=>'AL',
-64934=>'AL',
-64935=>'AL',
-64936=>'AL',
-64937=>'AL',
-64938=>'AL',
-64939=>'AL',
-64940=>'AL',
-64941=>'AL',
-64942=>'AL',
-64943=>'AL',
-64944=>'AL',
-64945=>'AL',
-64946=>'AL',
-64947=>'AL',
-64948=>'AL',
-64949=>'AL',
-64950=>'AL',
-64951=>'AL',
-64952=>'AL',
-64953=>'AL',
-64954=>'AL',
-64955=>'AL',
-64956=>'AL',
-64957=>'AL',
-64958=>'AL',
-64959=>'AL',
-64960=>'AL',
-64961=>'AL',
-64962=>'AL',
-64963=>'AL',
-64964=>'AL',
-64965=>'AL',
-64966=>'AL',
-64967=>'AL',
-65008=>'AL',
-65009=>'AL',
-65010=>'AL',
-65011=>'AL',
-65012=>'AL',
-65013=>'AL',
-65014=>'AL',
-65015=>'AL',
-65016=>'AL',
-65017=>'AL',
-65018=>'AL',
-65019=>'AL',
-65020=>'AL',
-65021=>'ON',
-65024=>'NSM',
-65025=>'NSM',
-65026=>'NSM',
-65027=>'NSM',
-65028=>'NSM',
-65029=>'NSM',
-65030=>'NSM',
-65031=>'NSM',
-65032=>'NSM',
-65033=>'NSM',
-65034=>'NSM',
-65035=>'NSM',
-65036=>'NSM',
-65037=>'NSM',
-65038=>'NSM',
-65039=>'NSM',
-65040=>'ON',
-65041=>'ON',
-65042=>'ON',
-65043=>'ON',
-65044=>'ON',
-65045=>'ON',
-65046=>'ON',
-65047=>'ON',
-65048=>'ON',
-65049=>'ON',
-65056=>'NSM',
-65057=>'NSM',
-65058=>'NSM',
-65059=>'NSM',
-65072=>'ON',
-65073=>'ON',
-65074=>'ON',
-65075=>'ON',
-65076=>'ON',
-65077=>'ON',
-65078=>'ON',
-65079=>'ON',
-65080=>'ON',
-65081=>'ON',
-65082=>'ON',
-65083=>'ON',
-65084=>'ON',
-65085=>'ON',
-65086=>'ON',
-65087=>'ON',
-65088=>'ON',
-65089=>'ON',
-65090=>'ON',
-65091=>'ON',
-65092=>'ON',
-65093=>'ON',
-65094=>'ON',
-65095=>'ON',
-65096=>'ON',
-65097=>'ON',
-65098=>'ON',
-65099=>'ON',
-65100=>'ON',
-65101=>'ON',
-65102=>'ON',
-65103=>'ON',
-65104=>'CS',
-65105=>'ON',
-65106=>'CS',
-65108=>'ON',
-65109=>'CS',
-65110=>'ON',
-65111=>'ON',
-65112=>'ON',
-65113=>'ON',
-65114=>'ON',
-65115=>'ON',
-65116=>'ON',
-65117=>'ON',
-65118=>'ON',
-65119=>'ET',
-65120=>'ON',
-65121=>'ON',
-65122=>'ES',
-65123=>'ES',
-65124=>'ON',
-65125=>'ON',
-65126=>'ON',
-65128=>'ON',
-65129=>'ET',
-65130=>'ET',
-65131=>'ON',
-65136=>'AL',
-65137=>'AL',
-65138=>'AL',
-65139=>'AL',
-65140=>'AL',
-65142=>'AL',
-65143=>'AL',
-65144=>'AL',
-65145=>'AL',
-65146=>'AL',
-65147=>'AL',
-65148=>'AL',
-65149=>'AL',
-65150=>'AL',
-65151=>'AL',
-65152=>'AL',
-65153=>'AL',
-65154=>'AL',
-65155=>'AL',
-65156=>'AL',
-65157=>'AL',
-65158=>'AL',
-65159=>'AL',
-65160=>'AL',
-65161=>'AL',
-65162=>'AL',
-65163=>'AL',
-65164=>'AL',
-65165=>'AL',
-65166=>'AL',
-65167=>'AL',
-65168=>'AL',
-65169=>'AL',
-65170=>'AL',
-65171=>'AL',
-65172=>'AL',
-65173=>'AL',
-65174=>'AL',
-65175=>'AL',
-65176=>'AL',
-65177=>'AL',
-65178=>'AL',
-65179=>'AL',
-65180=>'AL',
-65181=>'AL',
-65182=>'AL',
-65183=>'AL',
-65184=>'AL',
-65185=>'AL',
-65186=>'AL',
-65187=>'AL',
-65188=>'AL',
-65189=>'AL',
-65190=>'AL',
-65191=>'AL',
-65192=>'AL',
-65193=>'AL',
-65194=>'AL',
-65195=>'AL',
-65196=>'AL',
-65197=>'AL',
-65198=>'AL',
-65199=>'AL',
-65200=>'AL',
-65201=>'AL',
-65202=>'AL',
-65203=>'AL',
-65204=>'AL',
-65205=>'AL',
-65206=>'AL',
-65207=>'AL',
-65208=>'AL',
-65209=>'AL',
-65210=>'AL',
-65211=>'AL',
-65212=>'AL',
-65213=>'AL',
-65214=>'AL',
-65215=>'AL',
-65216=>'AL',
-65217=>'AL',
-65218=>'AL',
-65219=>'AL',
-65220=>'AL',
-65221=>'AL',
-65222=>'AL',
-65223=>'AL',
-65224=>'AL',
-65225=>'AL',
-65226=>'AL',
-65227=>'AL',
-65228=>'AL',
-65229=>'AL',
-65230=>'AL',
-65231=>'AL',
-65232=>'AL',
-65233=>'AL',
-65234=>'AL',
-65235=>'AL',
-65236=>'AL',
-65237=>'AL',
-65238=>'AL',
-65239=>'AL',
-65240=>'AL',
-65241=>'AL',
-65242=>'AL',
-65243=>'AL',
-65244=>'AL',
-65245=>'AL',
-65246=>'AL',
-65247=>'AL',
-65248=>'AL',
-65249=>'AL',
-65250=>'AL',
-65251=>'AL',
-65252=>'AL',
-65253=>'AL',
-65254=>'AL',
-65255=>'AL',
-65256=>'AL',
-65257=>'AL',
-65258=>'AL',
-65259=>'AL',
-65260=>'AL',
-65261=>'AL',
-65262=>'AL',
-65263=>'AL',
-65264=>'AL',
-65265=>'AL',
-65266=>'AL',
-65267=>'AL',
-65268=>'AL',
-65269=>'AL',
-65270=>'AL',
-65271=>'AL',
-65272=>'AL',
-65273=>'AL',
-65274=>'AL',
-65275=>'AL',
-65276=>'AL',
-65279=>'BN',
-65281=>'ON',
-65282=>'ON',
-65283=>'ET',
-65284=>'ET',
-65285=>'ET',
-65286=>'ON',
-65287=>'ON',
-65288=>'ON',
-65289=>'ON',
-65290=>'ON',
-65291=>'ES',
-65292=>'CS',
-65293=>'ES',
-65294=>'CS',
-65295=>'CS',
-65296=>'EN',
-65297=>'EN',
-65298=>'EN',
-65299=>'EN',
-65300=>'EN',
-65301=>'EN',
-65302=>'EN',
-65303=>'EN',
-65304=>'EN',
-65305=>'EN',
-65306=>'CS',
-65307=>'ON',
-65308=>'ON',
-65309=>'ON',
-65310=>'ON',
-65311=>'ON',
-65312=>'ON',
-65313=>'L',
-65314=>'L',
-65315=>'L',
-65316=>'L',
-65317=>'L',
-65318=>'L',
-65319=>'L',
-65320=>'L',
-65321=>'L',
-65322=>'L',
-65323=>'L',
-65324=>'L',
-65325=>'L',
-65326=>'L',
-65327=>'L',
-65328=>'L',
-65329=>'L',
-65330=>'L',
-65331=>'L',
-65332=>'L',
-65333=>'L',
-65334=>'L',
-65335=>'L',
-65336=>'L',
-65337=>'L',
-65338=>'L',
-65339=>'ON',
-65340=>'ON',
-65341=>'ON',
-65342=>'ON',
-65343=>'ON',
-65344=>'ON',
-65345=>'L',
-65346=>'L',
-65347=>'L',
-65348=>'L',
-65349=>'L',
-65350=>'L',
-65351=>'L',
-65352=>'L',
-65353=>'L',
-65354=>'L',
-65355=>'L',
-65356=>'L',
-65357=>'L',
-65358=>'L',
-65359=>'L',
-65360=>'L',
-65361=>'L',
-65362=>'L',
-65363=>'L',
-65364=>'L',
-65365=>'L',
-65366=>'L',
-65367=>'L',
-65368=>'L',
-65369=>'L',
-65370=>'L',
-65371=>'ON',
-65372=>'ON',
-65373=>'ON',
-65374=>'ON',
-65375=>'ON',
-65376=>'ON',
-65377=>'ON',
-65378=>'ON',
-65379=>'ON',
-65380=>'ON',
-65381=>'ON',
-65382=>'L',
-65383=>'L',
-65384=>'L',
-65385=>'L',
-65386=>'L',
-65387=>'L',
-65388=>'L',
-65389=>'L',
-65390=>'L',
-65391=>'L',
-65392=>'L',
-65393=>'L',
-65394=>'L',
-65395=>'L',
-65396=>'L',
-65397=>'L',
-65398=>'L',
-65399=>'L',
-65400=>'L',
-65401=>'L',
-65402=>'L',
-65403=>'L',
-65404=>'L',
-65405=>'L',
-65406=>'L',
-65407=>'L',
-65408=>'L',
-65409=>'L',
-65410=>'L',
-65411=>'L',
-65412=>'L',
-65413=>'L',
-65414=>'L',
-65415=>'L',
-65416=>'L',
-65417=>'L',
-65418=>'L',
-65419=>'L',
-65420=>'L',
-65421=>'L',
-65422=>'L',
-65423=>'L',
-65424=>'L',
-65425=>'L',
-65426=>'L',
-65427=>'L',
-65428=>'L',
-65429=>'L',
-65430=>'L',
-65431=>'L',
-65432=>'L',
-65433=>'L',
-65434=>'L',
-65435=>'L',
-65436=>'L',
-65437=>'L',
-65438=>'L',
-65439=>'L',
-65440=>'L',
-65441=>'L',
-65442=>'L',
-65443=>'L',
-65444=>'L',
-65445=>'L',
-65446=>'L',
-65447=>'L',
-65448=>'L',
-65449=>'L',
-65450=>'L',
-65451=>'L',
-65452=>'L',
-65453=>'L',
-65454=>'L',
-65455=>'L',
-65456=>'L',
-65457=>'L',
-65458=>'L',
-65459=>'L',
-65460=>'L',
-65461=>'L',
-65462=>'L',
-65463=>'L',
-65464=>'L',
-65465=>'L',
-65466=>'L',
-65467=>'L',
-65468=>'L',
-65469=>'L',
-65470=>'L',
-65474=>'L',
-65475=>'L',
-65476=>'L',
-65477=>'L',
-65478=>'L',
-65479=>'L',
-65482=>'L',
-65483=>'L',
-65484=>'L',
-65485=>'L',
-65486=>'L',
-65487=>'L',
-65490=>'L',
-65491=>'L',
-65492=>'L',
-65493=>'L',
-65494=>'L',
-65495=>'L',
-65498=>'L',
-65499=>'L',
-65500=>'L',
-65504=>'ET',
-65505=>'ET',
-65506=>'ON',
-65507=>'ON',
-65508=>'ON',
-65509=>'ET',
-65510=>'ET',
-65512=>'ON',
-65513=>'ON',
-65514=>'ON',
-65515=>'ON',
-65516=>'ON',
-65517=>'ON',
-65518=>'ON',
-65529=>'ON',
-65530=>'ON',
-65531=>'ON',
-65532=>'ON',
-65533=>'ON',
-65536=>'L',
-65537=>'L',
-65538=>'L',
-65539=>'L',
-65540=>'L',
-65541=>'L',
-65542=>'L',
-65543=>'L',
-65544=>'L',
-65545=>'L',
-65546=>'L',
-65547=>'L',
-65549=>'L',
-65550=>'L',
-65551=>'L',
-65552=>'L',
-65553=>'L',
-65554=>'L',
-65555=>'L',
-65556=>'L',
-65557=>'L',
-65558=>'L',
-65559=>'L',
-65560=>'L',
-65561=>'L',
-65562=>'L',
-65563=>'L',
-65564=>'L',
-65565=>'L',
-65566=>'L',
-65567=>'L',
-65568=>'L',
-65569=>'L',
-65570=>'L',
-65571=>'L',
-65572=>'L',
-65573=>'L',
-65574=>'L',
-65576=>'L',
-65577=>'L',
-65578=>'L',
-65579=>'L',
-65580=>'L',
-65581=>'L',
-65582=>'L',
-65583=>'L',
-65584=>'L',
-65585=>'L',
-65586=>'L',
-65587=>'L',
-65588=>'L',
-65589=>'L',
-65590=>'L',
-65591=>'L',
-65592=>'L',
-65593=>'L',
-65594=>'L',
-65596=>'L',
-65597=>'L',
-65599=>'L',
-65600=>'L',
-65601=>'L',
-65602=>'L',
-65603=>'L',
-65604=>'L',
-65605=>'L',
-65606=>'L',
-65607=>'L',
-65608=>'L',
-65609=>'L',
-65610=>'L',
-65611=>'L',
-65612=>'L',
-65613=>'L',
-65616=>'L',
-65617=>'L',
-65618=>'L',
-65619=>'L',
-65620=>'L',
-65621=>'L',
-65622=>'L',
-65623=>'L',
-65624=>'L',
-65625=>'L',
-65626=>'L',
-65627=>'L',
-65628=>'L',
-65629=>'L',
-65664=>'L',
-65665=>'L',
-65666=>'L',
-65667=>'L',
-65668=>'L',
-65669=>'L',
-65670=>'L',
-65671=>'L',
-65672=>'L',
-65673=>'L',
-65674=>'L',
-65675=>'L',
-65676=>'L',
-65677=>'L',
-65678=>'L',
-65679=>'L',
-65680=>'L',
-65681=>'L',
-65682=>'L',
-65683=>'L',
-65684=>'L',
-65685=>'L',
-65686=>'L',
-65687=>'L',
-65688=>'L',
-65689=>'L',
-65690=>'L',
-65691=>'L',
-65692=>'L',
-65693=>'L',
-65694=>'L',
-65695=>'L',
-65696=>'L',
-65697=>'L',
-65698=>'L',
-65699=>'L',
-65700=>'L',
-65701=>'L',
-65702=>'L',
-65703=>'L',
-65704=>'L',
-65705=>'L',
-65706=>'L',
-65707=>'L',
-65708=>'L',
-65709=>'L',
-65710=>'L',
-65711=>'L',
-65712=>'L',
-65713=>'L',
-65714=>'L',
-65715=>'L',
-65716=>'L',
-65717=>'L',
-65718=>'L',
-65719=>'L',
-65720=>'L',
-65721=>'L',
-65722=>'L',
-65723=>'L',
-65724=>'L',
-65725=>'L',
-65726=>'L',
-65727=>'L',
-65728=>'L',
-65729=>'L',
-65730=>'L',
-65731=>'L',
-65732=>'L',
-65733=>'L',
-65734=>'L',
-65735=>'L',
-65736=>'L',
-65737=>'L',
-65738=>'L',
-65739=>'L',
-65740=>'L',
-65741=>'L',
-65742=>'L',
-65743=>'L',
-65744=>'L',
-65745=>'L',
-65746=>'L',
-65747=>'L',
-65748=>'L',
-65749=>'L',
-65750=>'L',
-65751=>'L',
-65752=>'L',
-65753=>'L',
-65754=>'L',
-65755=>'L',
-65756=>'L',
-65757=>'L',
-65758=>'L',
-65759=>'L',
-65760=>'L',
-65761=>'L',
-65762=>'L',
-65763=>'L',
-65764=>'L',
-65765=>'L',
-65766=>'L',
-65767=>'L',
-65768=>'L',
-65769=>'L',
-65770=>'L',
-65771=>'L',
-65772=>'L',
-65773=>'L',
-65774=>'L',
-65775=>'L',
-65776=>'L',
-65777=>'L',
-65778=>'L',
-65779=>'L',
-65780=>'L',
-65781=>'L',
-65782=>'L',
-65783=>'L',
-65784=>'L',
-65785=>'L',
-65786=>'L',
-65792=>'L',
-65793=>'ON',
-65794=>'L',
-65799=>'L',
-65800=>'L',
-65801=>'L',
-65802=>'L',
-65803=>'L',
-65804=>'L',
-65805=>'L',
-65806=>'L',
-65807=>'L',
-65808=>'L',
-65809=>'L',
-65810=>'L',
-65811=>'L',
-65812=>'L',
-65813=>'L',
-65814=>'L',
-65815=>'L',
-65816=>'L',
-65817=>'L',
-65818=>'L',
-65819=>'L',
-65820=>'L',
-65821=>'L',
-65822=>'L',
-65823=>'L',
-65824=>'L',
-65825=>'L',
-65826=>'L',
-65827=>'L',
-65828=>'L',
-65829=>'L',
-65830=>'L',
-65831=>'L',
-65832=>'L',
-65833=>'L',
-65834=>'L',
-65835=>'L',
-65836=>'L',
-65837=>'L',
-65838=>'L',
-65839=>'L',
-65840=>'L',
-65841=>'L',
-65842=>'L',
-65843=>'L',
-65847=>'L',
-65848=>'L',
-65849=>'L',
-65850=>'L',
-65851=>'L',
-65852=>'L',
-65853=>'L',
-65854=>'L',
-65855=>'L',
-65856=>'ON',
-65857=>'ON',
-65858=>'ON',
-65859=>'ON',
-65860=>'ON',
-65861=>'ON',
-65862=>'ON',
-65863=>'ON',
-65864=>'ON',
-65865=>'ON',
-65866=>'ON',
-65867=>'ON',
-65868=>'ON',
-65869=>'ON',
-65870=>'ON',
-65871=>'ON',
-65872=>'ON',
-65873=>'ON',
-65874=>'ON',
-65875=>'ON',
-65876=>'ON',
-65877=>'ON',
-65878=>'ON',
-65879=>'ON',
-65880=>'ON',
-65881=>'ON',
-65882=>'ON',
-65883=>'ON',
-65884=>'ON',
-65885=>'ON',
-65886=>'ON',
-65887=>'ON',
-65888=>'ON',
-65889=>'ON',
-65890=>'ON',
-65891=>'ON',
-65892=>'ON',
-65893=>'ON',
-65894=>'ON',
-65895=>'ON',
-65896=>'ON',
-65897=>'ON',
-65898=>'ON',
-65899=>'ON',
-65900=>'ON',
-65901=>'ON',
-65902=>'ON',
-65903=>'ON',
-65904=>'ON',
-65905=>'ON',
-65906=>'ON',
-65907=>'ON',
-65908=>'ON',
-65909=>'ON',
-65910=>'ON',
-65911=>'ON',
-65912=>'ON',
-65913=>'ON',
-65914=>'ON',
-65915=>'ON',
-65916=>'ON',
-65917=>'ON',
-65918=>'ON',
-65919=>'ON',
-65920=>'ON',
-65921=>'ON',
-65922=>'ON',
-65923=>'ON',
-65924=>'ON',
-65925=>'ON',
-65926=>'ON',
-65927=>'ON',
-65928=>'ON',
-65929=>'ON',
-65930=>'ON',
-66304=>'L',
-66305=>'L',
-66306=>'L',
-66307=>'L',
-66308=>'L',
-66309=>'L',
-66310=>'L',
-66311=>'L',
-66312=>'L',
-66313=>'L',
-66314=>'L',
-66315=>'L',
-66316=>'L',
-66317=>'L',
-66318=>'L',
-66319=>'L',
-66320=>'L',
-66321=>'L',
-66322=>'L',
-66323=>'L',
-66324=>'L',
-66325=>'L',
-66326=>'L',
-66327=>'L',
-66328=>'L',
-66329=>'L',
-66330=>'L',
-66331=>'L',
-66332=>'L',
-66333=>'L',
-66334=>'L',
-66336=>'L',
-66337=>'L',
-66338=>'L',
-66339=>'L',
-66352=>'L',
-66353=>'L',
-66354=>'L',
-66355=>'L',
-66356=>'L',
-66357=>'L',
-66358=>'L',
-66359=>'L',
-66360=>'L',
-66361=>'L',
-66362=>'L',
-66363=>'L',
-66364=>'L',
-66365=>'L',
-66366=>'L',
-66367=>'L',
-66368=>'L',
-66369=>'L',
-66370=>'L',
-66371=>'L',
-66372=>'L',
-66373=>'L',
-66374=>'L',
-66375=>'L',
-66376=>'L',
-66377=>'L',
-66378=>'L',
-66432=>'L',
-66433=>'L',
-66434=>'L',
-66435=>'L',
-66436=>'L',
-66437=>'L',
-66438=>'L',
-66439=>'L',
-66440=>'L',
-66441=>'L',
-66442=>'L',
-66443=>'L',
-66444=>'L',
-66445=>'L',
-66446=>'L',
-66447=>'L',
-66448=>'L',
-66449=>'L',
-66450=>'L',
-66451=>'L',
-66452=>'L',
-66453=>'L',
-66454=>'L',
-66455=>'L',
-66456=>'L',
-66457=>'L',
-66458=>'L',
-66459=>'L',
-66460=>'L',
-66461=>'L',
-66463=>'L',
-66464=>'L',
-66465=>'L',
-66466=>'L',
-66467=>'L',
-66468=>'L',
-66469=>'L',
-66470=>'L',
-66471=>'L',
-66472=>'L',
-66473=>'L',
-66474=>'L',
-66475=>'L',
-66476=>'L',
-66477=>'L',
-66478=>'L',
-66479=>'L',
-66480=>'L',
-66481=>'L',
-66482=>'L',
-66483=>'L',
-66484=>'L',
-66485=>'L',
-66486=>'L',
-66487=>'L',
-66488=>'L',
-66489=>'L',
-66490=>'L',
-66491=>'L',
-66492=>'L',
-66493=>'L',
-66494=>'L',
-66495=>'L',
-66496=>'L',
-66497=>'L',
-66498=>'L',
-66499=>'L',
-66504=>'L',
-66505=>'L',
-66506=>'L',
-66507=>'L',
-66508=>'L',
-66509=>'L',
-66510=>'L',
-66511=>'L',
-66512=>'L',
-66513=>'L',
-66514=>'L',
-66515=>'L',
-66516=>'L',
-66517=>'L',
-66560=>'L',
-66561=>'L',
-66562=>'L',
-66563=>'L',
-66564=>'L',
-66565=>'L',
-66566=>'L',
-66567=>'L',
-66568=>'L',
-66569=>'L',
-66570=>'L',
-66571=>'L',
-66572=>'L',
-66573=>'L',
-66574=>'L',
-66575=>'L',
-66576=>'L',
-66577=>'L',
-66578=>'L',
-66579=>'L',
-66580=>'L',
-66581=>'L',
-66582=>'L',
-66583=>'L',
-66584=>'L',
-66585=>'L',
-66586=>'L',
-66587=>'L',
-66588=>'L',
-66589=>'L',
-66590=>'L',
-66591=>'L',
-66592=>'L',
-66593=>'L',
-66594=>'L',
-66595=>'L',
-66596=>'L',
-66597=>'L',
-66598=>'L',
-66599=>'L',
-66600=>'L',
-66601=>'L',
-66602=>'L',
-66603=>'L',
-66604=>'L',
-66605=>'L',
-66606=>'L',
-66607=>'L',
-66608=>'L',
-66609=>'L',
-66610=>'L',
-66611=>'L',
-66612=>'L',
-66613=>'L',
-66614=>'L',
-66615=>'L',
-66616=>'L',
-66617=>'L',
-66618=>'L',
-66619=>'L',
-66620=>'L',
-66621=>'L',
-66622=>'L',
-66623=>'L',
-66624=>'L',
-66625=>'L',
-66626=>'L',
-66627=>'L',
-66628=>'L',
-66629=>'L',
-66630=>'L',
-66631=>'L',
-66632=>'L',
-66633=>'L',
-66634=>'L',
-66635=>'L',
-66636=>'L',
-66637=>'L',
-66638=>'L',
-66639=>'L',
-66640=>'L',
-66641=>'L',
-66642=>'L',
-66643=>'L',
-66644=>'L',
-66645=>'L',
-66646=>'L',
-66647=>'L',
-66648=>'L',
-66649=>'L',
-66650=>'L',
-66651=>'L',
-66652=>'L',
-66653=>'L',
-66654=>'L',
-66655=>'L',
-66656=>'L',
-66657=>'L',
-66658=>'L',
-66659=>'L',
-66660=>'L',
-66661=>'L',
-66662=>'L',
-66663=>'L',
-66664=>'L',
-66665=>'L',
-66666=>'L',
-66667=>'L',
-66668=>'L',
-66669=>'L',
-66670=>'L',
-66671=>'L',
-66672=>'L',
-66673=>'L',
-66674=>'L',
-66675=>'L',
-66676=>'L',
-66677=>'L',
-66678=>'L',
-66679=>'L',
-66680=>'L',
-66681=>'L',
-66682=>'L',
-66683=>'L',
-66684=>'L',
-66685=>'L',
-66686=>'L',
-66687=>'L',
-66688=>'L',
-66689=>'L',
-66690=>'L',
-66691=>'L',
-66692=>'L',
-66693=>'L',
-66694=>'L',
-66695=>'L',
-66696=>'L',
-66697=>'L',
-66698=>'L',
-66699=>'L',
-66700=>'L',
-66701=>'L',
-66702=>'L',
-66703=>'L',
-66704=>'L',
-66705=>'L',
-66706=>'L',
-66707=>'L',
-66708=>'L',
-66709=>'L',
-66710=>'L',
-66711=>'L',
-66712=>'L',
-66713=>'L',
-66714=>'L',
-66715=>'L',
-66716=>'L',
-66717=>'L',
-66720=>'L',
-66721=>'L',
-66722=>'L',
-66723=>'L',
-66724=>'L',
-66725=>'L',
-66726=>'L',
-66727=>'L',
-66728=>'L',
-66729=>'L',
-67584=>'R',
-67585=>'R',
-67586=>'R',
-67587=>'R',
-67588=>'R',
-67589=>'R',
-67592=>'R',
-67594=>'R',
-67595=>'R',
-67596=>'R',
-67597=>'R',
-67598=>'R',
-67599=>'R',
-67600=>'R',
-67601=>'R',
-67602=>'R',
-67603=>'R',
-67604=>'R',
-67605=>'R',
-67606=>'R',
-67607=>'R',
-67608=>'R',
-67609=>'R',
-67610=>'R',
-67611=>'R',
-67612=>'R',
-67613=>'R',
-67614=>'R',
-67615=>'R',
-67616=>'R',
-67617=>'R',
-67618=>'R',
-67619=>'R',
-67620=>'R',
-67621=>'R',
-67622=>'R',
-67623=>'R',
-67624=>'R',
-67625=>'R',
-67626=>'R',
-67627=>'R',
-67628=>'R',
-67629=>'R',
-67630=>'R',
-67631=>'R',
-67632=>'R',
-67633=>'R',
-67634=>'R',
-67635=>'R',
-67636=>'R',
-67637=>'R',
-67639=>'R',
-67640=>'R',
-67644=>'R',
-67647=>'R',
-67840=>'R',
-67841=>'R',
-67842=>'R',
-67843=>'R',
-67844=>'R',
-67845=>'R',
-67846=>'R',
-67847=>'R',
-67848=>'R',
-67849=>'R',
-67850=>'R',
-67851=>'R',
-67852=>'R',
-67853=>'R',
-67854=>'R',
-67855=>'R',
-67856=>'R',
-67857=>'R',
-67858=>'R',
-67859=>'R',
-67860=>'R',
-67861=>'R',
-67862=>'R',
-67863=>'R',
-67864=>'R',
-67865=>'R',
-67871=>'ON',
-68096=>'R',
-68097=>'NSM',
-68098=>'NSM',
-68099=>'NSM',
-68101=>'NSM',
-68102=>'NSM',
-68108=>'NSM',
-68109=>'NSM',
-68110=>'NSM',
-68111=>'NSM',
-68112=>'R',
-68113=>'R',
-68114=>'R',
-68115=>'R',
-68117=>'R',
-68118=>'R',
-68119=>'R',
-68121=>'R',
-68122=>'R',
-68123=>'R',
-68124=>'R',
-68125=>'R',
-68126=>'R',
-68127=>'R',
-68128=>'R',
-68129=>'R',
-68130=>'R',
-68131=>'R',
-68132=>'R',
-68133=>'R',
-68134=>'R',
-68135=>'R',
-68136=>'R',
-68137=>'R',
-68138=>'R',
-68139=>'R',
-68140=>'R',
-68141=>'R',
-68142=>'R',
-68143=>'R',
-68144=>'R',
-68145=>'R',
-68146=>'R',
-68147=>'R',
-68152=>'NSM',
-68153=>'NSM',
-68154=>'NSM',
-68159=>'NSM',
-68160=>'R',
-68161=>'R',
-68162=>'R',
-68163=>'R',
-68164=>'R',
-68165=>'R',
-68166=>'R',
-68167=>'R',
-68176=>'R',
-68177=>'R',
-68178=>'R',
-68179=>'R',
-68180=>'R',
-68181=>'R',
-68182=>'R',
-68183=>'R',
-68184=>'R',
-73728=>'L',
-73729=>'L',
-73730=>'L',
-73731=>'L',
-73732=>'L',
-73733=>'L',
-73734=>'L',
-73735=>'L',
-73736=>'L',
-73737=>'L',
-73738=>'L',
-73739=>'L',
-73740=>'L',
-73741=>'L',
-73742=>'L',
-73743=>'L',
-73744=>'L',
-73745=>'L',
-73746=>'L',
-73747=>'L',
-73748=>'L',
-73749=>'L',
-73750=>'L',
-73751=>'L',
-73752=>'L',
-73753=>'L',
-73754=>'L',
-73755=>'L',
-73756=>'L',
-73757=>'L',
-73758=>'L',
-73759=>'L',
-73760=>'L',
-73761=>'L',
-73762=>'L',
-73763=>'L',
-73764=>'L',
-73765=>'L',
-73766=>'L',
-73767=>'L',
-73768=>'L',
-73769=>'L',
-73770=>'L',
-73771=>'L',
-73772=>'L',
-73773=>'L',
-73774=>'L',
-73775=>'L',
-73776=>'L',
-73777=>'L',
-73778=>'L',
-73779=>'L',
-73780=>'L',
-73781=>'L',
-73782=>'L',
-73783=>'L',
-73784=>'L',
-73785=>'L',
-73786=>'L',
-73787=>'L',
-73788=>'L',
-73789=>'L',
-73790=>'L',
-73791=>'L',
-73792=>'L',
-73793=>'L',
-73794=>'L',
-73795=>'L',
-73796=>'L',
-73797=>'L',
-73798=>'L',
-73799=>'L',
-73800=>'L',
-73801=>'L',
-73802=>'L',
-73803=>'L',
-73804=>'L',
-73805=>'L',
-73806=>'L',
-73807=>'L',
-73808=>'L',
-73809=>'L',
-73810=>'L',
-73811=>'L',
-73812=>'L',
-73813=>'L',
-73814=>'L',
-73815=>'L',
-73816=>'L',
-73817=>'L',
-73818=>'L',
-73819=>'L',
-73820=>'L',
-73821=>'L',
-73822=>'L',
-73823=>'L',
-73824=>'L',
-73825=>'L',
-73826=>'L',
-73827=>'L',
-73828=>'L',
-73829=>'L',
-73830=>'L',
-73831=>'L',
-73832=>'L',
-73833=>'L',
-73834=>'L',
-73835=>'L',
-73836=>'L',
-73837=>'L',
-73838=>'L',
-73839=>'L',
-73840=>'L',
-73841=>'L',
-73842=>'L',
-73843=>'L',
-73844=>'L',
-73845=>'L',
-73846=>'L',
-73847=>'L',
-73848=>'L',
-73849=>'L',
-73850=>'L',
-73851=>'L',
-73852=>'L',
-73853=>'L',
-73854=>'L',
-73855=>'L',
-73856=>'L',
-73857=>'L',
-73858=>'L',
-73859=>'L',
-73860=>'L',
-73861=>'L',
-73862=>'L',
-73863=>'L',
-73864=>'L',
-73865=>'L',
-73866=>'L',
-73867=>'L',
-73868=>'L',
-73869=>'L',
-73870=>'L',
-73871=>'L',
-73872=>'L',
-73873=>'L',
-73874=>'L',
-73875=>'L',
-73876=>'L',
-73877=>'L',
-73878=>'L',
-73879=>'L',
-73880=>'L',
-73881=>'L',
-73882=>'L',
-73883=>'L',
-73884=>'L',
-73885=>'L',
-73886=>'L',
-73887=>'L',
-73888=>'L',
-73889=>'L',
-73890=>'L',
-73891=>'L',
-73892=>'L',
-73893=>'L',
-73894=>'L',
-73895=>'L',
-73896=>'L',
-73897=>'L',
-73898=>'L',
-73899=>'L',
-73900=>'L',
-73901=>'L',
-73902=>'L',
-73903=>'L',
-73904=>'L',
-73905=>'L',
-73906=>'L',
-73907=>'L',
-73908=>'L',
-73909=>'L',
-73910=>'L',
-73911=>'L',
-73912=>'L',
-73913=>'L',
-73914=>'L',
-73915=>'L',
-73916=>'L',
-73917=>'L',
-73918=>'L',
-73919=>'L',
-73920=>'L',
-73921=>'L',
-73922=>'L',
-73923=>'L',
-73924=>'L',
-73925=>'L',
-73926=>'L',
-73927=>'L',
-73928=>'L',
-73929=>'L',
-73930=>'L',
-73931=>'L',
-73932=>'L',
-73933=>'L',
-73934=>'L',
-73935=>'L',
-73936=>'L',
-73937=>'L',
-73938=>'L',
-73939=>'L',
-73940=>'L',
-73941=>'L',
-73942=>'L',
-73943=>'L',
-73944=>'L',
-73945=>'L',
-73946=>'L',
-73947=>'L',
-73948=>'L',
-73949=>'L',
-73950=>'L',
-73951=>'L',
-73952=>'L',
-73953=>'L',
-73954=>'L',
-73955=>'L',
-73956=>'L',
-73957=>'L',
-73958=>'L',
-73959=>'L',
-73960=>'L',
-73961=>'L',
-73962=>'L',
-73963=>'L',
-73964=>'L',
-73965=>'L',
-73966=>'L',
-73967=>'L',
-73968=>'L',
-73969=>'L',
-73970=>'L',
-73971=>'L',
-73972=>'L',
-73973=>'L',
-73974=>'L',
-73975=>'L',
-73976=>'L',
-73977=>'L',
-73978=>'L',
-73979=>'L',
-73980=>'L',
-73981=>'L',
-73982=>'L',
-73983=>'L',
-73984=>'L',
-73985=>'L',
-73986=>'L',
-73987=>'L',
-73988=>'L',
-73989=>'L',
-73990=>'L',
-73991=>'L',
-73992=>'L',
-73993=>'L',
-73994=>'L',
-73995=>'L',
-73996=>'L',
-73997=>'L',
-73998=>'L',
-73999=>'L',
-74000=>'L',
-74001=>'L',
-74002=>'L',
-74003=>'L',
-74004=>'L',
-74005=>'L',
-74006=>'L',
-74007=>'L',
-74008=>'L',
-74009=>'L',
-74010=>'L',
-74011=>'L',
-74012=>'L',
-74013=>'L',
-74014=>'L',
-74015=>'L',
-74016=>'L',
-74017=>'L',
-74018=>'L',
-74019=>'L',
-74020=>'L',
-74021=>'L',
-74022=>'L',
-74023=>'L',
-74024=>'L',
-74025=>'L',
-74026=>'L',
-74027=>'L',
-74028=>'L',
-74029=>'L',
-74030=>'L',
-74031=>'L',
-74032=>'L',
-74033=>'L',
-74034=>'L',
-74035=>'L',
-74036=>'L',
-74037=>'L',
-74038=>'L',
-74039=>'L',
-74040=>'L',
-74041=>'L',
-74042=>'L',
-74043=>'L',
-74044=>'L',
-74045=>'L',
-74046=>'L',
-74047=>'L',
-74048=>'L',
-74049=>'L',
-74050=>'L',
-74051=>'L',
-74052=>'L',
-74053=>'L',
-74054=>'L',
-74055=>'L',
-74056=>'L',
-74057=>'L',
-74058=>'L',
-74059=>'L',
-74060=>'L',
-74061=>'L',
-74062=>'L',
-74063=>'L',
-74064=>'L',
-74065=>'L',
-74066=>'L',
-74067=>'L',
-74068=>'L',
-74069=>'L',
-74070=>'L',
-74071=>'L',
-74072=>'L',
-74073=>'L',
-74074=>'L',
-74075=>'L',
-74076=>'L',
-74077=>'L',
-74078=>'L',
-74079=>'L',
-74080=>'L',
-74081=>'L',
-74082=>'L',
-74083=>'L',
-74084=>'L',
-74085=>'L',
-74086=>'L',
-74087=>'L',
-74088=>'L',
-74089=>'L',
-74090=>'L',
-74091=>'L',
-74092=>'L',
-74093=>'L',
-74094=>'L',
-74095=>'L',
-74096=>'L',
-74097=>'L',
-74098=>'L',
-74099=>'L',
-74100=>'L',
-74101=>'L',
-74102=>'L',
-74103=>'L',
-74104=>'L',
-74105=>'L',
-74106=>'L',
-74107=>'L',
-74108=>'L',
-74109=>'L',
-74110=>'L',
-74111=>'L',
-74112=>'L',
-74113=>'L',
-74114=>'L',
-74115=>'L',
-74116=>'L',
-74117=>'L',
-74118=>'L',
-74119=>'L',
-74120=>'L',
-74121=>'L',
-74122=>'L',
-74123=>'L',
-74124=>'L',
-74125=>'L',
-74126=>'L',
-74127=>'L',
-74128=>'L',
-74129=>'L',
-74130=>'L',
-74131=>'L',
-74132=>'L',
-74133=>'L',
-74134=>'L',
-74135=>'L',
-74136=>'L',
-74137=>'L',
-74138=>'L',
-74139=>'L',
-74140=>'L',
-74141=>'L',
-74142=>'L',
-74143=>'L',
-74144=>'L',
-74145=>'L',
-74146=>'L',
-74147=>'L',
-74148=>'L',
-74149=>'L',
-74150=>'L',
-74151=>'L',
-74152=>'L',
-74153=>'L',
-74154=>'L',
-74155=>'L',
-74156=>'L',
-74157=>'L',
-74158=>'L',
-74159=>'L',
-74160=>'L',
-74161=>'L',
-74162=>'L',
-74163=>'L',
-74164=>'L',
-74165=>'L',
-74166=>'L',
-74167=>'L',
-74168=>'L',
-74169=>'L',
-74170=>'L',
-74171=>'L',
-74172=>'L',
-74173=>'L',
-74174=>'L',
-74175=>'L',
-74176=>'L',
-74177=>'L',
-74178=>'L',
-74179=>'L',
-74180=>'L',
-74181=>'L',
-74182=>'L',
-74183=>'L',
-74184=>'L',
-74185=>'L',
-74186=>'L',
-74187=>'L',
-74188=>'L',
-74189=>'L',
-74190=>'L',
-74191=>'L',
-74192=>'L',
-74193=>'L',
-74194=>'L',
-74195=>'L',
-74196=>'L',
-74197=>'L',
-74198=>'L',
-74199=>'L',
-74200=>'L',
-74201=>'L',
-74202=>'L',
-74203=>'L',
-74204=>'L',
-74205=>'L',
-74206=>'L',
-74207=>'L',
-74208=>'L',
-74209=>'L',
-74210=>'L',
-74211=>'L',
-74212=>'L',
-74213=>'L',
-74214=>'L',
-74215=>'L',
-74216=>'L',
-74217=>'L',
-74218=>'L',
-74219=>'L',
-74220=>'L',
-74221=>'L',
-74222=>'L',
-74223=>'L',
-74224=>'L',
-74225=>'L',
-74226=>'L',
-74227=>'L',
-74228=>'L',
-74229=>'L',
-74230=>'L',
-74231=>'L',
-74232=>'L',
-74233=>'L',
-74234=>'L',
-74235=>'L',
-74236=>'L',
-74237=>'L',
-74238=>'L',
-74239=>'L',
-74240=>'L',
-74241=>'L',
-74242=>'L',
-74243=>'L',
-74244=>'L',
-74245=>'L',
-74246=>'L',
-74247=>'L',
-74248=>'L',
-74249=>'L',
-74250=>'L',
-74251=>'L',
-74252=>'L',
-74253=>'L',
-74254=>'L',
-74255=>'L',
-74256=>'L',
-74257=>'L',
-74258=>'L',
-74259=>'L',
-74260=>'L',
-74261=>'L',
-74262=>'L',
-74263=>'L',
-74264=>'L',
-74265=>'L',
-74266=>'L',
-74267=>'L',
-74268=>'L',
-74269=>'L',
-74270=>'L',
-74271=>'L',
-74272=>'L',
-74273=>'L',
-74274=>'L',
-74275=>'L',
-74276=>'L',
-74277=>'L',
-74278=>'L',
-74279=>'L',
-74280=>'L',
-74281=>'L',
-74282=>'L',
-74283=>'L',
-74284=>'L',
-74285=>'L',
-74286=>'L',
-74287=>'L',
-74288=>'L',
-74289=>'L',
-74290=>'L',
-74291=>'L',
-74292=>'L',
-74293=>'L',
-74294=>'L',
-74295=>'L',
-74296=>'L',
-74297=>'L',
-74298=>'L',
-74299=>'L',
-74300=>'L',
-74301=>'L',
-74302=>'L',
-74303=>'L',
-74304=>'L',
-74305=>'L',
-74306=>'L',
-74307=>'L',
-74308=>'L',
-74309=>'L',
-74310=>'L',
-74311=>'L',
-74312=>'L',
-74313=>'L',
-74314=>'L',
-74315=>'L',
-74316=>'L',
-74317=>'L',
-74318=>'L',
-74319=>'L',
-74320=>'L',
-74321=>'L',
-74322=>'L',
-74323=>'L',
-74324=>'L',
-74325=>'L',
-74326=>'L',
-74327=>'L',
-74328=>'L',
-74329=>'L',
-74330=>'L',
-74331=>'L',
-74332=>'L',
-74333=>'L',
-74334=>'L',
-74335=>'L',
-74336=>'L',
-74337=>'L',
-74338=>'L',
-74339=>'L',
-74340=>'L',
-74341=>'L',
-74342=>'L',
-74343=>'L',
-74344=>'L',
-74345=>'L',
-74346=>'L',
-74347=>'L',
-74348=>'L',
-74349=>'L',
-74350=>'L',
-74351=>'L',
-74352=>'L',
-74353=>'L',
-74354=>'L',
-74355=>'L',
-74356=>'L',
-74357=>'L',
-74358=>'L',
-74359=>'L',
-74360=>'L',
-74361=>'L',
-74362=>'L',
-74363=>'L',
-74364=>'L',
-74365=>'L',
-74366=>'L',
-74367=>'L',
-74368=>'L',
-74369=>'L',
-74370=>'L',
-74371=>'L',
-74372=>'L',
-74373=>'L',
-74374=>'L',
-74375=>'L',
-74376=>'L',
-74377=>'L',
-74378=>'L',
-74379=>'L',
-74380=>'L',
-74381=>'L',
-74382=>'L',
-74383=>'L',
-74384=>'L',
-74385=>'L',
-74386=>'L',
-74387=>'L',
-74388=>'L',
-74389=>'L',
-74390=>'L',
-74391=>'L',
-74392=>'L',
-74393=>'L',
-74394=>'L',
-74395=>'L',
-74396=>'L',
-74397=>'L',
-74398=>'L',
-74399=>'L',
-74400=>'L',
-74401=>'L',
-74402=>'L',
-74403=>'L',
-74404=>'L',
-74405=>'L',
-74406=>'L',
-74407=>'L',
-74408=>'L',
-74409=>'L',
-74410=>'L',
-74411=>'L',
-74412=>'L',
-74413=>'L',
-74414=>'L',
-74415=>'L',
-74416=>'L',
-74417=>'L',
-74418=>'L',
-74419=>'L',
-74420=>'L',
-74421=>'L',
-74422=>'L',
-74423=>'L',
-74424=>'L',
-74425=>'L',
-74426=>'L',
-74427=>'L',
-74428=>'L',
-74429=>'L',
-74430=>'L',
-74431=>'L',
-74432=>'L',
-74433=>'L',
-74434=>'L',
-74435=>'L',
-74436=>'L',
-74437=>'L',
-74438=>'L',
-74439=>'L',
-74440=>'L',
-74441=>'L',
-74442=>'L',
-74443=>'L',
-74444=>'L',
-74445=>'L',
-74446=>'L',
-74447=>'L',
-74448=>'L',
-74449=>'L',
-74450=>'L',
-74451=>'L',
-74452=>'L',
-74453=>'L',
-74454=>'L',
-74455=>'L',
-74456=>'L',
-74457=>'L',
-74458=>'L',
-74459=>'L',
-74460=>'L',
-74461=>'L',
-74462=>'L',
-74463=>'L',
-74464=>'L',
-74465=>'L',
-74466=>'L',
-74467=>'L',
-74468=>'L',
-74469=>'L',
-74470=>'L',
-74471=>'L',
-74472=>'L',
-74473=>'L',
-74474=>'L',
-74475=>'L',
-74476=>'L',
-74477=>'L',
-74478=>'L',
-74479=>'L',
-74480=>'L',
-74481=>'L',
-74482=>'L',
-74483=>'L',
-74484=>'L',
-74485=>'L',
-74486=>'L',
-74487=>'L',
-74488=>'L',
-74489=>'L',
-74490=>'L',
-74491=>'L',
-74492=>'L',
-74493=>'L',
-74494=>'L',
-74495=>'L',
-74496=>'L',
-74497=>'L',
-74498=>'L',
-74499=>'L',
-74500=>'L',
-74501=>'L',
-74502=>'L',
-74503=>'L',
-74504=>'L',
-74505=>'L',
-74506=>'L',
-74507=>'L',
-74508=>'L',
-74509=>'L',
-74510=>'L',
-74511=>'L',
-74512=>'L',
-74513=>'L',
-74514=>'L',
-74515=>'L',
-74516=>'L',
-74517=>'L',
-74518=>'L',
-74519=>'L',
-74520=>'L',
-74521=>'L',
-74522=>'L',
-74523=>'L',
-74524=>'L',
-74525=>'L',
-74526=>'L',
-74527=>'L',
-74528=>'L',
-74529=>'L',
-74530=>'L',
-74531=>'L',
-74532=>'L',
-74533=>'L',
-74534=>'L',
-74535=>'L',
-74536=>'L',
-74537=>'L',
-74538=>'L',
-74539=>'L',
-74540=>'L',
-74541=>'L',
-74542=>'L',
-74543=>'L',
-74544=>'L',
-74545=>'L',
-74546=>'L',
-74547=>'L',
-74548=>'L',
-74549=>'L',
-74550=>'L',
-74551=>'L',
-74552=>'L',
-74553=>'L',
-74554=>'L',
-74555=>'L',
-74556=>'L',
-74557=>'L',
-74558=>'L',
-74559=>'L',
-74560=>'L',
-74561=>'L',
-74562=>'L',
-74563=>'L',
-74564=>'L',
-74565=>'L',
-74566=>'L',
-74567=>'L',
-74568=>'L',
-74569=>'L',
-74570=>'L',
-74571=>'L',
-74572=>'L',
-74573=>'L',
-74574=>'L',
-74575=>'L',
-74576=>'L',
-74577=>'L',
-74578=>'L',
-74579=>'L',
-74580=>'L',
-74581=>'L',
-74582=>'L',
-74583=>'L',
-74584=>'L',
-74585=>'L',
-74586=>'L',
-74587=>'L',
-74588=>'L',
-74589=>'L',
-74590=>'L',
-74591=>'L',
-74592=>'L',
-74593=>'L',
-74594=>'L',
-74595=>'L',
-74596=>'L',
-74597=>'L',
-74598=>'L',
-74599=>'L',
-74600=>'L',
-74601=>'L',
-74602=>'L',
-74603=>'L',
-74604=>'L',
-74605=>'L',
-74606=>'L',
-74752=>'L',
-74753=>'L',
-74754=>'L',
-74755=>'L',
-74756=>'L',
-74757=>'L',
-74758=>'L',
-74759=>'L',
-74760=>'L',
-74761=>'L',
-74762=>'L',
-74763=>'L',
-74764=>'L',
-74765=>'L',
-74766=>'L',
-74767=>'L',
-74768=>'L',
-74769=>'L',
-74770=>'L',
-74771=>'L',
-74772=>'L',
-74773=>'L',
-74774=>'L',
-74775=>'L',
-74776=>'L',
-74777=>'L',
-74778=>'L',
-74779=>'L',
-74780=>'L',
-74781=>'L',
-74782=>'L',
-74783=>'L',
-74784=>'L',
-74785=>'L',
-74786=>'L',
-74787=>'L',
-74788=>'L',
-74789=>'L',
-74790=>'L',
-74791=>'L',
-74792=>'L',
-74793=>'L',
-74794=>'L',
-74795=>'L',
-74796=>'L',
-74797=>'L',
-74798=>'L',
-74799=>'L',
-74800=>'L',
-74801=>'L',
-74802=>'L',
-74803=>'L',
-74804=>'L',
-74805=>'L',
-74806=>'L',
-74807=>'L',
-74808=>'L',
-74809=>'L',
-74810=>'L',
-74811=>'L',
-74812=>'L',
-74813=>'L',
-74814=>'L',
-74815=>'L',
-74816=>'L',
-74817=>'L',
-74818=>'L',
-74819=>'L',
-74820=>'L',
-74821=>'L',
-74822=>'L',
-74823=>'L',
-74824=>'L',
-74825=>'L',
-74826=>'L',
-74827=>'L',
-74828=>'L',
-74829=>'L',
-74830=>'L',
-74831=>'L',
-74832=>'L',
-74833=>'L',
-74834=>'L',
-74835=>'L',
-74836=>'L',
-74837=>'L',
-74838=>'L',
-74839=>'L',
-74840=>'L',
-74841=>'L',
-74842=>'L',
-74843=>'L',
-74844=>'L',
-74845=>'L',
-74846=>'L',
-74847=>'L',
-74848=>'L',
-74849=>'L',
-74850=>'L',
-74864=>'L',
-74865=>'L',
-74866=>'L',
-74867=>'L',
-118784=>'L',
-118785=>'L',
-118786=>'L',
-118787=>'L',
-118788=>'L',
-118789=>'L',
-118790=>'L',
-118791=>'L',
-118792=>'L',
-118793=>'L',
-118794=>'L',
-118795=>'L',
-118796=>'L',
-118797=>'L',
-118798=>'L',
-118799=>'L',
-118800=>'L',
-118801=>'L',
-118802=>'L',
-118803=>'L',
-118804=>'L',
-118805=>'L',
-118806=>'L',
-118807=>'L',
-118808=>'L',
-118809=>'L',
-118810=>'L',
-118811=>'L',
-118812=>'L',
-118813=>'L',
-118814=>'L',
-118815=>'L',
-118816=>'L',
-118817=>'L',
-118818=>'L',
-118819=>'L',
-118820=>'L',
-118821=>'L',
-118822=>'L',
-118823=>'L',
-118824=>'L',
-118825=>'L',
-118826=>'L',
-118827=>'L',
-118828=>'L',
-118829=>'L',
-118830=>'L',
-118831=>'L',
-118832=>'L',
-118833=>'L',
-118834=>'L',
-118835=>'L',
-118836=>'L',
-118837=>'L',
-118838=>'L',
-118839=>'L',
-118840=>'L',
-118841=>'L',
-118842=>'L',
-118843=>'L',
-118844=>'L',
-118845=>'L',
-118846=>'L',
-118847=>'L',
-118848=>'L',
-118849=>'L',
-118850=>'L',
-118851=>'L',
-118852=>'L',
-118853=>'L',
-118854=>'L',
-118855=>'L',
-118856=>'L',
-118857=>'L',
-118858=>'L',
-118859=>'L',
-118860=>'L',
-118861=>'L',
-118862=>'L',
-118863=>'L',
-118864=>'L',
-118865=>'L',
-118866=>'L',
-118867=>'L',
-118868=>'L',
-118869=>'L',
-118870=>'L',
-118871=>'L',
-118872=>'L',
-118873=>'L',
-118874=>'L',
-118875=>'L',
-118876=>'L',
-118877=>'L',
-118878=>'L',
-118879=>'L',
-118880=>'L',
-118881=>'L',
-118882=>'L',
-118883=>'L',
-118884=>'L',
-118885=>'L',
-118886=>'L',
-118887=>'L',
-118888=>'L',
-118889=>'L',
-118890=>'L',
-118891=>'L',
-118892=>'L',
-118893=>'L',
-118894=>'L',
-118895=>'L',
-118896=>'L',
-118897=>'L',
-118898=>'L',
-118899=>'L',
-118900=>'L',
-118901=>'L',
-118902=>'L',
-118903=>'L',
-118904=>'L',
-118905=>'L',
-118906=>'L',
-118907=>'L',
-118908=>'L',
-118909=>'L',
-118910=>'L',
-118911=>'L',
-118912=>'L',
-118913=>'L',
-118914=>'L',
-118915=>'L',
-118916=>'L',
-118917=>'L',
-118918=>'L',
-118919=>'L',
-118920=>'L',
-118921=>'L',
-118922=>'L',
-118923=>'L',
-118924=>'L',
-118925=>'L',
-118926=>'L',
-118927=>'L',
-118928=>'L',
-118929=>'L',
-118930=>'L',
-118931=>'L',
-118932=>'L',
-118933=>'L',
-118934=>'L',
-118935=>'L',
-118936=>'L',
-118937=>'L',
-118938=>'L',
-118939=>'L',
-118940=>'L',
-118941=>'L',
-118942=>'L',
-118943=>'L',
-118944=>'L',
-118945=>'L',
-118946=>'L',
-118947=>'L',
-118948=>'L',
-118949=>'L',
-118950=>'L',
-118951=>'L',
-118952=>'L',
-118953=>'L',
-118954=>'L',
-118955=>'L',
-118956=>'L',
-118957=>'L',
-118958=>'L',
-118959=>'L',
-118960=>'L',
-118961=>'L',
-118962=>'L',
-118963=>'L',
-118964=>'L',
-118965=>'L',
-118966=>'L',
-118967=>'L',
-118968=>'L',
-118969=>'L',
-118970=>'L',
-118971=>'L',
-118972=>'L',
-118973=>'L',
-118974=>'L',
-118975=>'L',
-118976=>'L',
-118977=>'L',
-118978=>'L',
-118979=>'L',
-118980=>'L',
-118981=>'L',
-118982=>'L',
-118983=>'L',
-118984=>'L',
-118985=>'L',
-118986=>'L',
-118987=>'L',
-118988=>'L',
-118989=>'L',
-118990=>'L',
-118991=>'L',
-118992=>'L',
-118993=>'L',
-118994=>'L',
-118995=>'L',
-118996=>'L',
-118997=>'L',
-118998=>'L',
-118999=>'L',
-119000=>'L',
-119001=>'L',
-119002=>'L',
-119003=>'L',
-119004=>'L',
-119005=>'L',
-119006=>'L',
-119007=>'L',
-119008=>'L',
-119009=>'L',
-119010=>'L',
-119011=>'L',
-119012=>'L',
-119013=>'L',
-119014=>'L',
-119015=>'L',
-119016=>'L',
-119017=>'L',
-119018=>'L',
-119019=>'L',
-119020=>'L',
-119021=>'L',
-119022=>'L',
-119023=>'L',
-119024=>'L',
-119025=>'L',
-119026=>'L',
-119027=>'L',
-119028=>'L',
-119029=>'L',
-119040=>'L',
-119041=>'L',
-119042=>'L',
-119043=>'L',
-119044=>'L',
-119045=>'L',
-119046=>'L',
-119047=>'L',
-119048=>'L',
-119049=>'L',
-119050=>'L',
-119051=>'L',
-119052=>'L',
-119053=>'L',
-119054=>'L',
-119055=>'L',
-119056=>'L',
-119057=>'L',
-119058=>'L',
-119059=>'L',
-119060=>'L',
-119061=>'L',
-119062=>'L',
-119063=>'L',
-119064=>'L',
-119065=>'L',
-119066=>'L',
-119067=>'L',
-119068=>'L',
-119069=>'L',
-119070=>'L',
-119071=>'L',
-119072=>'L',
-119073=>'L',
-119074=>'L',
-119075=>'L',
-119076=>'L',
-119077=>'L',
-119078=>'L',
-119082=>'L',
-119083=>'L',
-119084=>'L',
-119085=>'L',
-119086=>'L',
-119087=>'L',
-119088=>'L',
-119089=>'L',
-119090=>'L',
-119091=>'L',
-119092=>'L',
-119093=>'L',
-119094=>'L',
-119095=>'L',
-119096=>'L',
-119097=>'L',
-119098=>'L',
-119099=>'L',
-119100=>'L',
-119101=>'L',
-119102=>'L',
-119103=>'L',
-119104=>'L',
-119105=>'L',
-119106=>'L',
-119107=>'L',
-119108=>'L',
-119109=>'L',
-119110=>'L',
-119111=>'L',
-119112=>'L',
-119113=>'L',
-119114=>'L',
-119115=>'L',
-119116=>'L',
-119117=>'L',
-119118=>'L',
-119119=>'L',
-119120=>'L',
-119121=>'L',
-119122=>'L',
-119123=>'L',
-119124=>'L',
-119125=>'L',
-119126=>'L',
-119127=>'L',
-119128=>'L',
-119129=>'L',
-119130=>'L',
-119131=>'L',
-119132=>'L',
-119133=>'L',
-119134=>'L',
-119135=>'L',
-119136=>'L',
-119137=>'L',
-119138=>'L',
-119139=>'L',
-119140=>'L',
-119141=>'L',
-119142=>'L',
-119143=>'NSM',
-119144=>'NSM',
-119145=>'NSM',
-119146=>'L',
-119147=>'L',
-119148=>'L',
-119149=>'L',
-119150=>'L',
-119151=>'L',
-119152=>'L',
-119153=>'L',
-119154=>'L',
-119155=>'BN',
-119156=>'BN',
-119157=>'BN',
-119158=>'BN',
-119159=>'BN',
-119160=>'BN',
-119161=>'BN',
-119162=>'BN',
-119163=>'NSM',
-119164=>'NSM',
-119165=>'NSM',
-119166=>'NSM',
-119167=>'NSM',
-119168=>'NSM',
-119169=>'NSM',
-119170=>'NSM',
-119171=>'L',
-119172=>'L',
-119173=>'NSM',
-119174=>'NSM',
-119175=>'NSM',
-119176=>'NSM',
-119177=>'NSM',
-119178=>'NSM',
-119179=>'NSM',
-119180=>'L',
-119181=>'L',
-119182=>'L',
-119183=>'L',
-119184=>'L',
-119185=>'L',
-119186=>'L',
-119187=>'L',
-119188=>'L',
-119189=>'L',
-119190=>'L',
-119191=>'L',
-119192=>'L',
-119193=>'L',
-119194=>'L',
-119195=>'L',
-119196=>'L',
-119197=>'L',
-119198=>'L',
-119199=>'L',
-119200=>'L',
-119201=>'L',
-119202=>'L',
-119203=>'L',
-119204=>'L',
-119205=>'L',
-119206=>'L',
-119207=>'L',
-119208=>'L',
-119209=>'L',
-119210=>'NSM',
-119211=>'NSM',
-119212=>'NSM',
-119213=>'NSM',
-119214=>'L',
-119215=>'L',
-119216=>'L',
-119217=>'L',
-119218=>'L',
-119219=>'L',
-119220=>'L',
-119221=>'L',
-119222=>'L',
-119223=>'L',
-119224=>'L',
-119225=>'L',
-119226=>'L',
-119227=>'L',
-119228=>'L',
-119229=>'L',
-119230=>'L',
-119231=>'L',
-119232=>'L',
-119233=>'L',
-119234=>'L',
-119235=>'L',
-119236=>'L',
-119237=>'L',
-119238=>'L',
-119239=>'L',
-119240=>'L',
-119241=>'L',
-119242=>'L',
-119243=>'L',
-119244=>'L',
-119245=>'L',
-119246=>'L',
-119247=>'L',
-119248=>'L',
-119249=>'L',
-119250=>'L',
-119251=>'L',
-119252=>'L',
-119253=>'L',
-119254=>'L',
-119255=>'L',
-119256=>'L',
-119257=>'L',
-119258=>'L',
-119259=>'L',
-119260=>'L',
-119261=>'L',
-119296=>'ON',
-119297=>'ON',
-119298=>'ON',
-119299=>'ON',
-119300=>'ON',
-119301=>'ON',
-119302=>'ON',
-119303=>'ON',
-119304=>'ON',
-119305=>'ON',
-119306=>'ON',
-119307=>'ON',
-119308=>'ON',
-119309=>'ON',
-119310=>'ON',
-119311=>'ON',
-119312=>'ON',
-119313=>'ON',
-119314=>'ON',
-119315=>'ON',
-119316=>'ON',
-119317=>'ON',
-119318=>'ON',
-119319=>'ON',
-119320=>'ON',
-119321=>'ON',
-119322=>'ON',
-119323=>'ON',
-119324=>'ON',
-119325=>'ON',
-119326=>'ON',
-119327=>'ON',
-119328=>'ON',
-119329=>'ON',
-119330=>'ON',
-119331=>'ON',
-119332=>'ON',
-119333=>'ON',
-119334=>'ON',
-119335=>'ON',
-119336=>'ON',
-119337=>'ON',
-119338=>'ON',
-119339=>'ON',
-119340=>'ON',
-119341=>'ON',
-119342=>'ON',
-119343=>'ON',
-119344=>'ON',
-119345=>'ON',
-119346=>'ON',
-119347=>'ON',
-119348=>'ON',
-119349=>'ON',
-119350=>'ON',
-119351=>'ON',
-119352=>'ON',
-119353=>'ON',
-119354=>'ON',
-119355=>'ON',
-119356=>'ON',
-119357=>'ON',
-119358=>'ON',
-119359=>'ON',
-119360=>'ON',
-119361=>'ON',
-119362=>'NSM',
-119363=>'NSM',
-119364=>'NSM',
-119365=>'ON',
-119552=>'ON',
-119553=>'ON',
-119554=>'ON',
-119555=>'ON',
-119556=>'ON',
-119557=>'ON',
-119558=>'ON',
-119559=>'ON',
-119560=>'ON',
-119561=>'ON',
-119562=>'ON',
-119563=>'ON',
-119564=>'ON',
-119565=>'ON',
-119566=>'ON',
-119567=>'ON',
-119568=>'ON',
-119569=>'ON',
-119570=>'ON',
-119571=>'ON',
-119572=>'ON',
-119573=>'ON',
-119574=>'ON',
-119575=>'ON',
-119576=>'ON',
-119577=>'ON',
-119578=>'ON',
-119579=>'ON',
-119580=>'ON',
-119581=>'ON',
-119582=>'ON',
-119583=>'ON',
-119584=>'ON',
-119585=>'ON',
-119586=>'ON',
-119587=>'ON',
-119588=>'ON',
-119589=>'ON',
-119590=>'ON',
-119591=>'ON',
-119592=>'ON',
-119593=>'ON',
-119594=>'ON',
-119595=>'ON',
-119596=>'ON',
-119597=>'ON',
-119598=>'ON',
-119599=>'ON',
-119600=>'ON',
-119601=>'ON',
-119602=>'ON',
-119603=>'ON',
-119604=>'ON',
-119605=>'ON',
-119606=>'ON',
-119607=>'ON',
-119608=>'ON',
-119609=>'ON',
-119610=>'ON',
-119611=>'ON',
-119612=>'ON',
-119613=>'ON',
-119614=>'ON',
-119615=>'ON',
-119616=>'ON',
-119617=>'ON',
-119618=>'ON',
-119619=>'ON',
-119620=>'ON',
-119621=>'ON',
-119622=>'ON',
-119623=>'ON',
-119624=>'ON',
-119625=>'ON',
-119626=>'ON',
-119627=>'ON',
-119628=>'ON',
-119629=>'ON',
-119630=>'ON',
-119631=>'ON',
-119632=>'ON',
-119633=>'ON',
-119634=>'ON',
-119635=>'ON',
-119636=>'ON',
-119637=>'ON',
-119638=>'ON',
-119648=>'L',
-119649=>'L',
-119650=>'L',
-119651=>'L',
-119652=>'L',
-119653=>'L',
-119654=>'L',
-119655=>'L',
-119656=>'L',
-119657=>'L',
-119658=>'L',
-119659=>'L',
-119660=>'L',
-119661=>'L',
-119662=>'L',
-119663=>'L',
-119664=>'L',
-119665=>'L',
-119808=>'L',
-119809=>'L',
-119810=>'L',
-119811=>'L',
-119812=>'L',
-119813=>'L',
-119814=>'L',
-119815=>'L',
-119816=>'L',
-119817=>'L',
-119818=>'L',
-119819=>'L',
-119820=>'L',
-119821=>'L',
-119822=>'L',
-119823=>'L',
-119824=>'L',
-119825=>'L',
-119826=>'L',
-119827=>'L',
-119828=>'L',
-119829=>'L',
-119830=>'L',
-119831=>'L',
-119832=>'L',
-119833=>'L',
-119834=>'L',
-119835=>'L',
-119836=>'L',
-119837=>'L',
-119838=>'L',
-119839=>'L',
-119840=>'L',
-119841=>'L',
-119842=>'L',
-119843=>'L',
-119844=>'L',
-119845=>'L',
-119846=>'L',
-119847=>'L',
-119848=>'L',
-119849=>'L',
-119850=>'L',
-119851=>'L',
-119852=>'L',
-119853=>'L',
-119854=>'L',
-119855=>'L',
-119856=>'L',
-119857=>'L',
-119858=>'L',
-119859=>'L',
-119860=>'L',
-119861=>'L',
-119862=>'L',
-119863=>'L',
-119864=>'L',
-119865=>'L',
-119866=>'L',
-119867=>'L',
-119868=>'L',
-119869=>'L',
-119870=>'L',
-119871=>'L',
-119872=>'L',
-119873=>'L',
-119874=>'L',
-119875=>'L',
-119876=>'L',
-119877=>'L',
-119878=>'L',
-119879=>'L',
-119880=>'L',
-119881=>'L',
-119882=>'L',
-119883=>'L',
-119884=>'L',
-119885=>'L',
-119886=>'L',
-119887=>'L',
-119888=>'L',
-119889=>'L',
-119890=>'L',
-119891=>'L',
-119892=>'L',
-119894=>'L',
-119895=>'L',
-119896=>'L',
-119897=>'L',
-119898=>'L',
-119899=>'L',
-119900=>'L',
-119901=>'L',
-119902=>'L',
-119903=>'L',
-119904=>'L',
-119905=>'L',
-119906=>'L',
-119907=>'L',
-119908=>'L',
-119909=>'L',
-119910=>'L',
-119911=>'L',
-119912=>'L',
-119913=>'L',
-119914=>'L',
-119915=>'L',
-119916=>'L',
-119917=>'L',
-119918=>'L',
-119919=>'L',
-119920=>'L',
-119921=>'L',
-119922=>'L',
-119923=>'L',
-119924=>'L',
-119925=>'L',
-119926=>'L',
-119927=>'L',
-119928=>'L',
-119929=>'L',
-119930=>'L',
-119931=>'L',
-119932=>'L',
-119933=>'L',
-119934=>'L',
-119935=>'L',
-119936=>'L',
-119937=>'L',
-119938=>'L',
-119939=>'L',
-119940=>'L',
-119941=>'L',
-119942=>'L',
-119943=>'L',
-119944=>'L',
-119945=>'L',
-119946=>'L',
-119947=>'L',
-119948=>'L',
-119949=>'L',
-119950=>'L',
-119951=>'L',
-119952=>'L',
-119953=>'L',
-119954=>'L',
-119955=>'L',
-119956=>'L',
-119957=>'L',
-119958=>'L',
-119959=>'L',
-119960=>'L',
-119961=>'L',
-119962=>'L',
-119963=>'L',
-119964=>'L',
-119966=>'L',
-119967=>'L',
-119970=>'L',
-119973=>'L',
-119974=>'L',
-119977=>'L',
-119978=>'L',
-119979=>'L',
-119980=>'L',
-119982=>'L',
-119983=>'L',
-119984=>'L',
-119985=>'L',
-119986=>'L',
-119987=>'L',
-119988=>'L',
-119989=>'L',
-119990=>'L',
-119991=>'L',
-119992=>'L',
-119993=>'L',
-119995=>'L',
-119997=>'L',
-119998=>'L',
-119999=>'L',
-120000=>'L',
-120001=>'L',
-120002=>'L',
-120003=>'L',
-120005=>'L',
-120006=>'L',
-120007=>'L',
-120008=>'L',
-120009=>'L',
-120010=>'L',
-120011=>'L',
-120012=>'L',
-120013=>'L',
-120014=>'L',
-120015=>'L',
-120016=>'L',
-120017=>'L',
-120018=>'L',
-120019=>'L',
-120020=>'L',
-120021=>'L',
-120022=>'L',
-120023=>'L',
-120024=>'L',
-120025=>'L',
-120026=>'L',
-120027=>'L',
-120028=>'L',
-120029=>'L',
-120030=>'L',
-120031=>'L',
-120032=>'L',
-120033=>'L',
-120034=>'L',
-120035=>'L',
-120036=>'L',
-120037=>'L',
-120038=>'L',
-120039=>'L',
-120040=>'L',
-120041=>'L',
-120042=>'L',
-120043=>'L',
-120044=>'L',
-120045=>'L',
-120046=>'L',
-120047=>'L',
-120048=>'L',
-120049=>'L',
-120050=>'L',
-120051=>'L',
-120052=>'L',
-120053=>'L',
-120054=>'L',
-120055=>'L',
-120056=>'L',
-120057=>'L',
-120058=>'L',
-120059=>'L',
-120060=>'L',
-120061=>'L',
-120062=>'L',
-120063=>'L',
-120064=>'L',
-120065=>'L',
-120066=>'L',
-120067=>'L',
-120068=>'L',
-120069=>'L',
-120071=>'L',
-120072=>'L',
-120073=>'L',
-120074=>'L',
-120077=>'L',
-120078=>'L',
-120079=>'L',
-120080=>'L',
-120081=>'L',
-120082=>'L',
-120083=>'L',
-120084=>'L',
-120086=>'L',
-120087=>'L',
-120088=>'L',
-120089=>'L',
-120090=>'L',
-120091=>'L',
-120092=>'L',
-120094=>'L',
-120095=>'L',
-120096=>'L',
-120097=>'L',
-120098=>'L',
-120099=>'L',
-120100=>'L',
-120101=>'L',
-120102=>'L',
-120103=>'L',
-120104=>'L',
-120105=>'L',
-120106=>'L',
-120107=>'L',
-120108=>'L',
-120109=>'L',
-120110=>'L',
-120111=>'L',
-120112=>'L',
-120113=>'L',
-120114=>'L',
-120115=>'L',
-120116=>'L',
-120117=>'L',
-120118=>'L',
-120119=>'L',
-120120=>'L',
-120121=>'L',
-120123=>'L',
-120124=>'L',
-120125=>'L',
-120126=>'L',
-120128=>'L',
-120129=>'L',
-120130=>'L',
-120131=>'L',
-120132=>'L',
-120134=>'L',
-120138=>'L',
-120139=>'L',
-120140=>'L',
-120141=>'L',
-120142=>'L',
-120143=>'L',
-120144=>'L',
-120146=>'L',
-120147=>'L',
-120148=>'L',
-120149=>'L',
-120150=>'L',
-120151=>'L',
-120152=>'L',
-120153=>'L',
-120154=>'L',
-120155=>'L',
-120156=>'L',
-120157=>'L',
-120158=>'L',
-120159=>'L',
-120160=>'L',
-120161=>'L',
-120162=>'L',
-120163=>'L',
-120164=>'L',
-120165=>'L',
-120166=>'L',
-120167=>'L',
-120168=>'L',
-120169=>'L',
-120170=>'L',
-120171=>'L',
-120172=>'L',
-120173=>'L',
-120174=>'L',
-120175=>'L',
-120176=>'L',
-120177=>'L',
-120178=>'L',
-120179=>'L',
-120180=>'L',
-120181=>'L',
-120182=>'L',
-120183=>'L',
-120184=>'L',
-120185=>'L',
-120186=>'L',
-120187=>'L',
-120188=>'L',
-120189=>'L',
-120190=>'L',
-120191=>'L',
-120192=>'L',
-120193=>'L',
-120194=>'L',
-120195=>'L',
-120196=>'L',
-120197=>'L',
-120198=>'L',
-120199=>'L',
-120200=>'L',
-120201=>'L',
-120202=>'L',
-120203=>'L',
-120204=>'L',
-120205=>'L',
-120206=>'L',
-120207=>'L',
-120208=>'L',
-120209=>'L',
-120210=>'L',
-120211=>'L',
-120212=>'L',
-120213=>'L',
-120214=>'L',
-120215=>'L',
-120216=>'L',
-120217=>'L',
-120218=>'L',
-120219=>'L',
-120220=>'L',
-120221=>'L',
-120222=>'L',
-120223=>'L',
-120224=>'L',
-120225=>'L',
-120226=>'L',
-120227=>'L',
-120228=>'L',
-120229=>'L',
-120230=>'L',
-120231=>'L',
-120232=>'L',
-120233=>'L',
-120234=>'L',
-120235=>'L',
-120236=>'L',
-120237=>'L',
-120238=>'L',
-120239=>'L',
-120240=>'L',
-120241=>'L',
-120242=>'L',
-120243=>'L',
-120244=>'L',
-120245=>'L',
-120246=>'L',
-120247=>'L',
-120248=>'L',
-120249=>'L',
-120250=>'L',
-120251=>'L',
-120252=>'L',
-120253=>'L',
-120254=>'L',
-120255=>'L',
-120256=>'L',
-120257=>'L',
-120258=>'L',
-120259=>'L',
-120260=>'L',
-120261=>'L',
-120262=>'L',
-120263=>'L',
-120264=>'L',
-120265=>'L',
-120266=>'L',
-120267=>'L',
-120268=>'L',
-120269=>'L',
-120270=>'L',
-120271=>'L',
-120272=>'L',
-120273=>'L',
-120274=>'L',
-120275=>'L',
-120276=>'L',
-120277=>'L',
-120278=>'L',
-120279=>'L',
-120280=>'L',
-120281=>'L',
-120282=>'L',
-120283=>'L',
-120284=>'L',
-120285=>'L',
-120286=>'L',
-120287=>'L',
-120288=>'L',
-120289=>'L',
-120290=>'L',
-120291=>'L',
-120292=>'L',
-120293=>'L',
-120294=>'L',
-120295=>'L',
-120296=>'L',
-120297=>'L',
-120298=>'L',
-120299=>'L',
-120300=>'L',
-120301=>'L',
-120302=>'L',
-120303=>'L',
-120304=>'L',
-120305=>'L',
-120306=>'L',
-120307=>'L',
-120308=>'L',
-120309=>'L',
-120310=>'L',
-120311=>'L',
-120312=>'L',
-120313=>'L',
-120314=>'L',
-120315=>'L',
-120316=>'L',
-120317=>'L',
-120318=>'L',
-120319=>'L',
-120320=>'L',
-120321=>'L',
-120322=>'L',
-120323=>'L',
-120324=>'L',
-120325=>'L',
-120326=>'L',
-120327=>'L',
-120328=>'L',
-120329=>'L',
-120330=>'L',
-120331=>'L',
-120332=>'L',
-120333=>'L',
-120334=>'L',
-120335=>'L',
-120336=>'L',
-120337=>'L',
-120338=>'L',
-120339=>'L',
-120340=>'L',
-120341=>'L',
-120342=>'L',
-120343=>'L',
-120344=>'L',
-120345=>'L',
-120346=>'L',
-120347=>'L',
-120348=>'L',
-120349=>'L',
-120350=>'L',
-120351=>'L',
-120352=>'L',
-120353=>'L',
-120354=>'L',
-120355=>'L',
-120356=>'L',
-120357=>'L',
-120358=>'L',
-120359=>'L',
-120360=>'L',
-120361=>'L',
-120362=>'L',
-120363=>'L',
-120364=>'L',
-120365=>'L',
-120366=>'L',
-120367=>'L',
-120368=>'L',
-120369=>'L',
-120370=>'L',
-120371=>'L',
-120372=>'L',
-120373=>'L',
-120374=>'L',
-120375=>'L',
-120376=>'L',
-120377=>'L',
-120378=>'L',
-120379=>'L',
-120380=>'L',
-120381=>'L',
-120382=>'L',
-120383=>'L',
-120384=>'L',
-120385=>'L',
-120386=>'L',
-120387=>'L',
-120388=>'L',
-120389=>'L',
-120390=>'L',
-120391=>'L',
-120392=>'L',
-120393=>'L',
-120394=>'L',
-120395=>'L',
-120396=>'L',
-120397=>'L',
-120398=>'L',
-120399=>'L',
-120400=>'L',
-120401=>'L',
-120402=>'L',
-120403=>'L',
-120404=>'L',
-120405=>'L',
-120406=>'L',
-120407=>'L',
-120408=>'L',
-120409=>'L',
-120410=>'L',
-120411=>'L',
-120412=>'L',
-120413=>'L',
-120414=>'L',
-120415=>'L',
-120416=>'L',
-120417=>'L',
-120418=>'L',
-120419=>'L',
-120420=>'L',
-120421=>'L',
-120422=>'L',
-120423=>'L',
-120424=>'L',
-120425=>'L',
-120426=>'L',
-120427=>'L',
-120428=>'L',
-120429=>'L',
-120430=>'L',
-120431=>'L',
-120432=>'L',
-120433=>'L',
-120434=>'L',
-120435=>'L',
-120436=>'L',
-120437=>'L',
-120438=>'L',
-120439=>'L',
-120440=>'L',
-120441=>'L',
-120442=>'L',
-120443=>'L',
-120444=>'L',
-120445=>'L',
-120446=>'L',
-120447=>'L',
-120448=>'L',
-120449=>'L',
-120450=>'L',
-120451=>'L',
-120452=>'L',
-120453=>'L',
-120454=>'L',
-120455=>'L',
-120456=>'L',
-120457=>'L',
-120458=>'L',
-120459=>'L',
-120460=>'L',
-120461=>'L',
-120462=>'L',
-120463=>'L',
-120464=>'L',
-120465=>'L',
-120466=>'L',
-120467=>'L',
-120468=>'L',
-120469=>'L',
-120470=>'L',
-120471=>'L',
-120472=>'L',
-120473=>'L',
-120474=>'L',
-120475=>'L',
-120476=>'L',
-120477=>'L',
-120478=>'L',
-120479=>'L',
-120480=>'L',
-120481=>'L',
-120482=>'L',
-120483=>'L',
-120484=>'L',
-120485=>'L',
-120488=>'L',
-120489=>'L',
-120490=>'L',
-120491=>'L',
-120492=>'L',
-120493=>'L',
-120494=>'L',
-120495=>'L',
-120496=>'L',
-120497=>'L',
-120498=>'L',
-120499=>'L',
-120500=>'L',
-120501=>'L',
-120502=>'L',
-120503=>'L',
-120504=>'L',
-120505=>'L',
-120506=>'L',
-120507=>'L',
-120508=>'L',
-120509=>'L',
-120510=>'L',
-120511=>'L',
-120512=>'L',
-120513=>'L',
-120514=>'L',
-120515=>'L',
-120516=>'L',
-120517=>'L',
-120518=>'L',
-120519=>'L',
-120520=>'L',
-120521=>'L',
-120522=>'L',
-120523=>'L',
-120524=>'L',
-120525=>'L',
-120526=>'L',
-120527=>'L',
-120528=>'L',
-120529=>'L',
-120530=>'L',
-120531=>'L',
-120532=>'L',
-120533=>'L',
-120534=>'L',
-120535=>'L',
-120536=>'L',
-120537=>'L',
-120538=>'L',
-120539=>'L',
-120540=>'L',
-120541=>'L',
-120542=>'L',
-120543=>'L',
-120544=>'L',
-120545=>'L',
-120546=>'L',
-120547=>'L',
-120548=>'L',
-120549=>'L',
-120550=>'L',
-120551=>'L',
-120552=>'L',
-120553=>'L',
-120554=>'L',
-120555=>'L',
-120556=>'L',
-120557=>'L',
-120558=>'L',
-120559=>'L',
-120560=>'L',
-120561=>'L',
-120562=>'L',
-120563=>'L',
-120564=>'L',
-120565=>'L',
-120566=>'L',
-120567=>'L',
-120568=>'L',
-120569=>'L',
-120570=>'L',
-120571=>'L',
-120572=>'L',
-120573=>'L',
-120574=>'L',
-120575=>'L',
-120576=>'L',
-120577=>'L',
-120578=>'L',
-120579=>'L',
-120580=>'L',
-120581=>'L',
-120582=>'L',
-120583=>'L',
-120584=>'L',
-120585=>'L',
-120586=>'L',
-120587=>'L',
-120588=>'L',
-120589=>'L',
-120590=>'L',
-120591=>'L',
-120592=>'L',
-120593=>'L',
-120594=>'L',
-120595=>'L',
-120596=>'L',
-120597=>'L',
-120598=>'L',
-120599=>'L',
-120600=>'L',
-120601=>'L',
-120602=>'L',
-120603=>'L',
-120604=>'L',
-120605=>'L',
-120606=>'L',
-120607=>'L',
-120608=>'L',
-120609=>'L',
-120610=>'L',
-120611=>'L',
-120612=>'L',
-120613=>'L',
-120614=>'L',
-120615=>'L',
-120616=>'L',
-120617=>'L',
-120618=>'L',
-120619=>'L',
-120620=>'L',
-120621=>'L',
-120622=>'L',
-120623=>'L',
-120624=>'L',
-120625=>'L',
-120626=>'L',
-120627=>'L',
-120628=>'L',
-120629=>'L',
-120630=>'L',
-120631=>'L',
-120632=>'L',
-120633=>'L',
-120634=>'L',
-120635=>'L',
-120636=>'L',
-120637=>'L',
-120638=>'L',
-120639=>'L',
-120640=>'L',
-120641=>'L',
-120642=>'L',
-120643=>'L',
-120644=>'L',
-120645=>'L',
-120646=>'L',
-120647=>'L',
-120648=>'L',
-120649=>'L',
-120650=>'L',
-120651=>'L',
-120652=>'L',
-120653=>'L',
-120654=>'L',
-120655=>'L',
-120656=>'L',
-120657=>'L',
-120658=>'L',
-120659=>'L',
-120660=>'L',
-120661=>'L',
-120662=>'L',
-120663=>'L',
-120664=>'L',
-120665=>'L',
-120666=>'L',
-120667=>'L',
-120668=>'L',
-120669=>'L',
-120670=>'L',
-120671=>'L',
-120672=>'L',
-120673=>'L',
-120674=>'L',
-120675=>'L',
-120676=>'L',
-120677=>'L',
-120678=>'L',
-120679=>'L',
-120680=>'L',
-120681=>'L',
-120682=>'L',
-120683=>'L',
-120684=>'L',
-120685=>'L',
-120686=>'L',
-120687=>'L',
-120688=>'L',
-120689=>'L',
-120690=>'L',
-120691=>'L',
-120692=>'L',
-120693=>'L',
-120694=>'L',
-120695=>'L',
-120696=>'L',
-120697=>'L',
-120698=>'L',
-120699=>'L',
-120700=>'L',
-120701=>'L',
-120702=>'L',
-120703=>'L',
-120704=>'L',
-120705=>'L',
-120706=>'L',
-120707=>'L',
-120708=>'L',
-120709=>'L',
-120710=>'L',
-120711=>'L',
-120712=>'L',
-120713=>'L',
-120714=>'L',
-120715=>'L',
-120716=>'L',
-120717=>'L',
-120718=>'L',
-120719=>'L',
-120720=>'L',
-120721=>'L',
-120722=>'L',
-120723=>'L',
-120724=>'L',
-120725=>'L',
-120726=>'L',
-120727=>'L',
-120728=>'L',
-120729=>'L',
-120730=>'L',
-120731=>'L',
-120732=>'L',
-120733=>'L',
-120734=>'L',
-120735=>'L',
-120736=>'L',
-120737=>'L',
-120738=>'L',
-120739=>'L',
-120740=>'L',
-120741=>'L',
-120742=>'L',
-120743=>'L',
-120744=>'L',
-120745=>'L',
-120746=>'L',
-120747=>'L',
-120748=>'L',
-120749=>'L',
-120750=>'L',
-120751=>'L',
-120752=>'L',
-120753=>'L',
-120754=>'L',
-120755=>'L',
-120756=>'L',
-120757=>'L',
-120758=>'L',
-120759=>'L',
-120760=>'L',
-120761=>'L',
-120762=>'L',
-120763=>'L',
-120764=>'L',
-120765=>'L',
-120766=>'L',
-120767=>'L',
-120768=>'L',
-120769=>'L',
-120770=>'L',
-120771=>'L',
-120772=>'L',
-120773=>'L',
-120774=>'L',
-120775=>'L',
-120776=>'L',
-120777=>'L',
-120778=>'L',
-120779=>'L',
-120782=>'EN',
-120783=>'EN',
-120784=>'EN',
-120785=>'EN',
-120786=>'EN',
-120787=>'EN',
-120788=>'EN',
-120789=>'EN',
-120790=>'EN',
-120791=>'EN',
-120792=>'EN',
-120793=>'EN',
-120794=>'EN',
-120795=>'EN',
-120796=>'EN',
-120797=>'EN',
-120798=>'EN',
-120799=>'EN',
-120800=>'EN',
-120801=>'EN',
-120802=>'EN',
-120803=>'EN',
-120804=>'EN',
-120805=>'EN',
-120806=>'EN',
-120807=>'EN',
-120808=>'EN',
-120809=>'EN',
-120810=>'EN',
-120811=>'EN',
-120812=>'EN',
-120813=>'EN',
-120814=>'EN',
-120815=>'EN',
-120816=>'EN',
-120817=>'EN',
-120818=>'EN',
-120819=>'EN',
-120820=>'EN',
-120821=>'EN',
-120822=>'EN',
-120823=>'EN',
-120824=>'EN',
-120825=>'EN',
-120826=>'EN',
-120827=>'EN',
-120828=>'EN',
-120829=>'EN',
-120830=>'EN',
-120831=>'EN',
-131072=>'L',
-173782=>'L',
-194560=>'L',
-194561=>'L',
-194562=>'L',
-194563=>'L',
-194564=>'L',
-194565=>'L',
-194566=>'L',
-194567=>'L',
-194568=>'L',
-194569=>'L',
-194570=>'L',
-194571=>'L',
-194572=>'L',
-194573=>'L',
-194574=>'L',
-194575=>'L',
-194576=>'L',
-194577=>'L',
-194578=>'L',
-194579=>'L',
-194580=>'L',
-194581=>'L',
-194582=>'L',
-194583=>'L',
-194584=>'L',
-194585=>'L',
-194586=>'L',
-194587=>'L',
-194588=>'L',
-194589=>'L',
-194590=>'L',
-194591=>'L',
-194592=>'L',
-194593=>'L',
-194594=>'L',
-194595=>'L',
-194596=>'L',
-194597=>'L',
-194598=>'L',
-194599=>'L',
-194600=>'L',
-194601=>'L',
-194602=>'L',
-194603=>'L',
-194604=>'L',
-194605=>'L',
-194606=>'L',
-194607=>'L',
-194608=>'L',
-194609=>'L',
-194610=>'L',
-194611=>'L',
-194612=>'L',
-194613=>'L',
-194614=>'L',
-194615=>'L',
-194616=>'L',
-194617=>'L',
-194618=>'L',
-194619=>'L',
-194620=>'L',
-194621=>'L',
-194622=>'L',
-194623=>'L',
-194624=>'L',
-194625=>'L',
-194626=>'L',
-194627=>'L',
-194628=>'L',
-194629=>'L',
-194630=>'L',
-194631=>'L',
-194632=>'L',
-194633=>'L',
-194634=>'L',
-194635=>'L',
-194636=>'L',
-194637=>'L',
-194638=>'L',
-194639=>'L',
-194640=>'L',
-194641=>'L',
-194642=>'L',
-194643=>'L',
-194644=>'L',
-194645=>'L',
-194646=>'L',
-194647=>'L',
-194648=>'L',
-194649=>'L',
-194650=>'L',
-194651=>'L',
-194652=>'L',
-194653=>'L',
-194654=>'L',
-194655=>'L',
-194656=>'L',
-194657=>'L',
-194658=>'L',
-194659=>'L',
-194660=>'L',
-194661=>'L',
-194662=>'L',
-194663=>'L',
-194664=>'L',
-194665=>'L',
-194666=>'L',
-194667=>'L',
-194668=>'L',
-194669=>'L',
-194670=>'L',
-194671=>'L',
-194672=>'L',
-194673=>'L',
-194674=>'L',
-194675=>'L',
-194676=>'L',
-194677=>'L',
-194678=>'L',
-194679=>'L',
-194680=>'L',
-194681=>'L',
-194682=>'L',
-194683=>'L',
-194684=>'L',
-194685=>'L',
-194686=>'L',
-194687=>'L',
-194688=>'L',
-194689=>'L',
-194690=>'L',
-194691=>'L',
-194692=>'L',
-194693=>'L',
-194694=>'L',
-194695=>'L',
-194696=>'L',
-194697=>'L',
-194698=>'L',
-194699=>'L',
-194700=>'L',
-194701=>'L',
-194702=>'L',
-194703=>'L',
-194704=>'L',
-194705=>'L',
-194706=>'L',
-194707=>'L',
-194708=>'L',
-194709=>'L',
-194710=>'L',
-194711=>'L',
-194712=>'L',
-194713=>'L',
-194714=>'L',
-194715=>'L',
-194716=>'L',
-194717=>'L',
-194718=>'L',
-194719=>'L',
-194720=>'L',
-194721=>'L',
-194722=>'L',
-194723=>'L',
-194724=>'L',
-194725=>'L',
-194726=>'L',
-194727=>'L',
-194728=>'L',
-194729=>'L',
-194730=>'L',
-194731=>'L',
-194732=>'L',
-194733=>'L',
-194734=>'L',
-194735=>'L',
-194736=>'L',
-194737=>'L',
-194738=>'L',
-194739=>'L',
-194740=>'L',
-194741=>'L',
-194742=>'L',
-194743=>'L',
-194744=>'L',
-194745=>'L',
-194746=>'L',
-194747=>'L',
-194748=>'L',
-194749=>'L',
-194750=>'L',
-194751=>'L',
-194752=>'L',
-194753=>'L',
-194754=>'L',
-194755=>'L',
-194756=>'L',
-194757=>'L',
-194758=>'L',
-194759=>'L',
-194760=>'L',
-194761=>'L',
-194762=>'L',
-194763=>'L',
-194764=>'L',
-194765=>'L',
-194766=>'L',
-194767=>'L',
-194768=>'L',
-194769=>'L',
-194770=>'L',
-194771=>'L',
-194772=>'L',
-194773=>'L',
-194774=>'L',
-194775=>'L',
-194776=>'L',
-194777=>'L',
-194778=>'L',
-194779=>'L',
-194780=>'L',
-194781=>'L',
-194782=>'L',
-194783=>'L',
-194784=>'L',
-194785=>'L',
-194786=>'L',
-194787=>'L',
-194788=>'L',
-194789=>'L',
-194790=>'L',
-194791=>'L',
-194792=>'L',
-194793=>'L',
-194794=>'L',
-194795=>'L',
-194796=>'L',
-194797=>'L',
-194798=>'L',
-194799=>'L',
-194800=>'L',
-194801=>'L',
-194802=>'L',
-194803=>'L',
-194804=>'L',
-194805=>'L',
-194806=>'L',
-194807=>'L',
-194808=>'L',
-194809=>'L',
-194810=>'L',
-194811=>'L',
-194812=>'L',
-194813=>'L',
-194814=>'L',
-194815=>'L',
-194816=>'L',
-194817=>'L',
-194818=>'L',
-194819=>'L',
-194820=>'L',
-194821=>'L',
-194822=>'L',
-194823=>'L',
-194824=>'L',
-194825=>'L',
-194826=>'L',
-194827=>'L',
-194828=>'L',
-194829=>'L',
-194830=>'L',
-194831=>'L',
-194832=>'L',
-194833=>'L',
-194834=>'L',
-194835=>'L',
-194836=>'L',
-194837=>'L',
-194838=>'L',
-194839=>'L',
-194840=>'L',
-194841=>'L',
-194842=>'L',
-194843=>'L',
-194844=>'L',
-194845=>'L',
-194846=>'L',
-194847=>'L',
-194848=>'L',
-194849=>'L',
-194850=>'L',
-194851=>'L',
-194852=>'L',
-194853=>'L',
-194854=>'L',
-194855=>'L',
-194856=>'L',
-194857=>'L',
-194858=>'L',
-194859=>'L',
-194860=>'L',
-194861=>'L',
-194862=>'L',
-194863=>'L',
-194864=>'L',
-194865=>'L',
-194866=>'L',
-194867=>'L',
-194868=>'L',
-194869=>'L',
-194870=>'L',
-194871=>'L',
-194872=>'L',
-194873=>'L',
-194874=>'L',
-194875=>'L',
-194876=>'L',
-194877=>'L',
-194878=>'L',
-194879=>'L',
-194880=>'L',
-194881=>'L',
-194882=>'L',
-194883=>'L',
-194884=>'L',
-194885=>'L',
-194886=>'L',
-194887=>'L',
-194888=>'L',
-194889=>'L',
-194890=>'L',
-194891=>'L',
-194892=>'L',
-194893=>'L',
-194894=>'L',
-194895=>'L',
-194896=>'L',
-194897=>'L',
-194898=>'L',
-194899=>'L',
-194900=>'L',
-194901=>'L',
-194902=>'L',
-194903=>'L',
-194904=>'L',
-194905=>'L',
-194906=>'L',
-194907=>'L',
-194908=>'L',
-194909=>'L',
-194910=>'L',
-194911=>'L',
-194912=>'L',
-194913=>'L',
-194914=>'L',
-194915=>'L',
-194916=>'L',
-194917=>'L',
-194918=>'L',
-194919=>'L',
-194920=>'L',
-194921=>'L',
-194922=>'L',
-194923=>'L',
-194924=>'L',
-194925=>'L',
-194926=>'L',
-194927=>'L',
-194928=>'L',
-194929=>'L',
-194930=>'L',
-194931=>'L',
-194932=>'L',
-194933=>'L',
-194934=>'L',
-194935=>'L',
-194936=>'L',
-194937=>'L',
-194938=>'L',
-194939=>'L',
-194940=>'L',
-194941=>'L',
-194942=>'L',
-194943=>'L',
-194944=>'L',
-194945=>'L',
-194946=>'L',
-194947=>'L',
-194948=>'L',
-194949=>'L',
-194950=>'L',
-194951=>'L',
-194952=>'L',
-194953=>'L',
-194954=>'L',
-194955=>'L',
-194956=>'L',
-194957=>'L',
-194958=>'L',
-194959=>'L',
-194960=>'L',
-194961=>'L',
-194962=>'L',
-194963=>'L',
-194964=>'L',
-194965=>'L',
-194966=>'L',
-194967=>'L',
-194968=>'L',
-194969=>'L',
-194970=>'L',
-194971=>'L',
-194972=>'L',
-194973=>'L',
-194974=>'L',
-194975=>'L',
-194976=>'L',
-194977=>'L',
-194978=>'L',
-194979=>'L',
-194980=>'L',
-194981=>'L',
-194982=>'L',
-194983=>'L',
-194984=>'L',
-194985=>'L',
-194986=>'L',
-194987=>'L',
-194988=>'L',
-194989=>'L',
-194990=>'L',
-194991=>'L',
-194992=>'L',
-194993=>'L',
-194994=>'L',
-194995=>'L',
-194996=>'L',
-194997=>'L',
-194998=>'L',
-194999=>'L',
-195000=>'L',
-195001=>'L',
-195002=>'L',
-195003=>'L',
-195004=>'L',
-195005=>'L',
-195006=>'L',
-195007=>'L',
-195008=>'L',
-195009=>'L',
-195010=>'L',
-195011=>'L',
-195012=>'L',
-195013=>'L',
-195014=>'L',
-195015=>'L',
-195016=>'L',
-195017=>'L',
-195018=>'L',
-195019=>'L',
-195020=>'L',
-195021=>'L',
-195022=>'L',
-195023=>'L',
-195024=>'L',
-195025=>'L',
-195026=>'L',
-195027=>'L',
-195028=>'L',
-195029=>'L',
-195030=>'L',
-195031=>'L',
-195032=>'L',
-195033=>'L',
-195034=>'L',
-195035=>'L',
-195036=>'L',
-195037=>'L',
-195038=>'L',
-195039=>'L',
-195040=>'L',
-195041=>'L',
-195042=>'L',
-195043=>'L',
-195044=>'L',
-195045=>'L',
-195046=>'L',
-195047=>'L',
-195048=>'L',
-195049=>'L',
-195050=>'L',
-195051=>'L',
-195052=>'L',
-195053=>'L',
-195054=>'L',
-195055=>'L',
-195056=>'L',
-195057=>'L',
-195058=>'L',
-195059=>'L',
-195060=>'L',
-195061=>'L',
-195062=>'L',
-195063=>'L',
-195064=>'L',
-195065=>'L',
-195066=>'L',
-195067=>'L',
-195068=>'L',
-195069=>'L',
-195070=>'L',
-195071=>'L',
-195072=>'L',
-195073=>'L',
-195074=>'L',
-195075=>'L',
-195076=>'L',
-195077=>'L',
-195078=>'L',
-195079=>'L',
-195080=>'L',
-195081=>'L',
-195082=>'L',
-195083=>'L',
-195084=>'L',
-195085=>'L',
-195086=>'L',
-195087=>'L',
-195088=>'L',
-195089=>'L',
-195090=>'L',
-195091=>'L',
-195092=>'L',
-195093=>'L',
-195094=>'L',
-195095=>'L',
-195096=>'L',
-195097=>'L',
-195098=>'L',
-195099=>'L',
-195100=>'L',
-195101=>'L',
-917505=>'BN',
-917536=>'BN',
-917537=>'BN',
-917538=>'BN',
-917539=>'BN',
-917540=>'BN',
-917541=>'BN',
-917542=>'BN',
-917543=>'BN',
-917544=>'BN',
-917545=>'BN',
-917546=>'BN',
-917547=>'BN',
-917548=>'BN',
-917549=>'BN',
-917550=>'BN',
-917551=>'BN',
-917552=>'BN',
-917553=>'BN',
-917554=>'BN',
-917555=>'BN',
-917556=>'BN',
-917557=>'BN',
-917558=>'BN',
-917559=>'BN',
-917560=>'BN',
-917561=>'BN',
-917562=>'BN',
-917563=>'BN',
-917564=>'BN',
-917565=>'BN',
-917566=>'BN',
-917567=>'BN',
-917568=>'BN',
-917569=>'BN',
-917570=>'BN',
-917571=>'BN',
-917572=>'BN',
-917573=>'BN',
-917574=>'BN',
-917575=>'BN',
-917576=>'BN',
-917577=>'BN',
-917578=>'BN',
-917579=>'BN',
-917580=>'BN',
-917581=>'BN',
-917582=>'BN',
-917583=>'BN',
-917584=>'BN',
-917585=>'BN',
-917586=>'BN',
-917587=>'BN',
-917588=>'BN',
-917589=>'BN',
-917590=>'BN',
-917591=>'BN',
-917592=>'BN',
-917593=>'BN',
-917594=>'BN',
-917595=>'BN',
-917596=>'BN',
-917597=>'BN',
-917598=>'BN',
-917599=>'BN',
-917600=>'BN',
-917601=>'BN',
-917602=>'BN',
-917603=>'BN',
-917604=>'BN',
-917605=>'BN',
-917606=>'BN',
-917607=>'BN',
-917608=>'BN',
-917609=>'BN',
-917610=>'BN',
-917611=>'BN',
-917612=>'BN',
-917613=>'BN',
-917614=>'BN',
-917615=>'BN',
-917616=>'BN',
-917617=>'BN',
-917618=>'BN',
-917619=>'BN',
-917620=>'BN',
-917621=>'BN',
-917622=>'BN',
-917623=>'BN',
-917624=>'BN',
-917625=>'BN',
-917626=>'BN',
-917627=>'BN',
-917628=>'BN',
-917629=>'BN',
-917630=>'BN',
-917631=>'BN',
-917760=>'NSM',
-917761=>'NSM',
-917762=>'NSM',
-917763=>'NSM',
-917764=>'NSM',
-917765=>'NSM',
-917766=>'NSM',
-917767=>'NSM',
-917768=>'NSM',
-917769=>'NSM',
-917770=>'NSM',
-917771=>'NSM',
-917772=>'NSM',
-917773=>'NSM',
-917774=>'NSM',
-917775=>'NSM',
-917776=>'NSM',
-917777=>'NSM',
-917778=>'NSM',
-917779=>'NSM',
-917780=>'NSM',
-917781=>'NSM',
-917782=>'NSM',
-917783=>'NSM',
-917784=>'NSM',
-917785=>'NSM',
-917786=>'NSM',
-917787=>'NSM',
-917788=>'NSM',
-917789=>'NSM',
-917790=>'NSM',
-917791=>'NSM',
-917792=>'NSM',
-917793=>'NSM',
-917794=>'NSM',
-917795=>'NSM',
-917796=>'NSM',
-917797=>'NSM',
-917798=>'NSM',
-917799=>'NSM',
-917800=>'NSM',
-917801=>'NSM',
-917802=>'NSM',
-917803=>'NSM',
-917804=>'NSM',
-917805=>'NSM',
-917806=>'NSM',
-917807=>'NSM',
-917808=>'NSM',
-917809=>'NSM',
-917810=>'NSM',
-917811=>'NSM',
-917812=>'NSM',
-917813=>'NSM',
-917814=>'NSM',
-917815=>'NSM',
-917816=>'NSM',
-917817=>'NSM',
-917818=>'NSM',
-917819=>'NSM',
-917820=>'NSM',
-917821=>'NSM',
-917822=>'NSM',
-917823=>'NSM',
-917824=>'NSM',
-917825=>'NSM',
-917826=>'NSM',
-917827=>'NSM',
-917828=>'NSM',
-917829=>'NSM',
-917830=>'NSM',
-917831=>'NSM',
-917832=>'NSM',
-917833=>'NSM',
-917834=>'NSM',
-917835=>'NSM',
-917836=>'NSM',
-917837=>'NSM',
-917838=>'NSM',
-917839=>'NSM',
-917840=>'NSM',
-917841=>'NSM',
-917842=>'NSM',
-917843=>'NSM',
-917844=>'NSM',
-917845=>'NSM',
-917846=>'NSM',
-917847=>'NSM',
-917848=>'NSM',
-917849=>'NSM',
-917850=>'NSM',
-917851=>'NSM',
-917852=>'NSM',
-917853=>'NSM',
-917854=>'NSM',
-917855=>'NSM',
-917856=>'NSM',
-917857=>'NSM',
-917858=>'NSM',
-917859=>'NSM',
-917860=>'NSM',
-917861=>'NSM',
-917862=>'NSM',
-917863=>'NSM',
-917864=>'NSM',
-917865=>'NSM',
-917866=>'NSM',
-917867=>'NSM',
-917868=>'NSM',
-917869=>'NSM',
-917870=>'NSM',
-917871=>'NSM',
-917872=>'NSM',
-917873=>'NSM',
-917874=>'NSM',
-917875=>'NSM',
-917876=>'NSM',
-917877=>'NSM',
-917878=>'NSM',
-917879=>'NSM',
-917880=>'NSM',
-917881=>'NSM',
-917882=>'NSM',
-917883=>'NSM',
-917884=>'NSM',
-917885=>'NSM',
-917886=>'NSM',
-917887=>'NSM',
-917888=>'NSM',
-917889=>'NSM',
-917890=>'NSM',
-917891=>'NSM',
-917892=>'NSM',
-917893=>'NSM',
-917894=>'NSM',
-917895=>'NSM',
-917896=>'NSM',
-917897=>'NSM',
-917898=>'NSM',
-917899=>'NSM',
-917900=>'NSM',
-917901=>'NSM',
-917902=>'NSM',
-917903=>'NSM',
-917904=>'NSM',
-917905=>'NSM',
-917906=>'NSM',
-917907=>'NSM',
-917908=>'NSM',
-917909=>'NSM',
-917910=>'NSM',
-917911=>'NSM',
-917912=>'NSM',
-917913=>'NSM',
-917914=>'NSM',
-917915=>'NSM',
-917916=>'NSM',
-917917=>'NSM',
-917918=>'NSM',
-917919=>'NSM',
-917920=>'NSM',
-917921=>'NSM',
-917922=>'NSM',
-917923=>'NSM',
-917924=>'NSM',
-917925=>'NSM',
-917926=>'NSM',
-917927=>'NSM',
-917928=>'NSM',
-917929=>'NSM',
-917930=>'NSM',
-917931=>'NSM',
-917932=>'NSM',
-917933=>'NSM',
-917934=>'NSM',
-917935=>'NSM',
-917936=>'NSM',
-917937=>'NSM',
-917938=>'NSM',
-917939=>'NSM',
-917940=>'NSM',
-917941=>'NSM',
-917942=>'NSM',
-917943=>'NSM',
-917944=>'NSM',
-917945=>'NSM',
-917946=>'NSM',
-917947=>'NSM',
-917948=>'NSM',
-917949=>'NSM',
-917950=>'NSM',
-917951=>'NSM',
-917952=>'NSM',
-917953=>'NSM',
-917954=>'NSM',
-917955=>'NSM',
-917956=>'NSM',
-917957=>'NSM',
-917958=>'NSM',
-917959=>'NSM',
-917960=>'NSM',
-917961=>'NSM',
-917962=>'NSM',
-917963=>'NSM',
-917964=>'NSM',
-917965=>'NSM',
-917966=>'NSM',
-917967=>'NSM',
-917968=>'NSM',
-917969=>'NSM',
-917970=>'NSM',
-917971=>'NSM',
-917972=>'NSM',
-917973=>'NSM',
-917974=>'NSM',
-917975=>'NSM',
-917976=>'NSM',
-917977=>'NSM',
-917978=>'NSM',
-917979=>'NSM',
-917980=>'NSM',
-917981=>'NSM',
-917982=>'NSM',
-917983=>'NSM',
-917984=>'NSM',
-917985=>'NSM',
-917986=>'NSM',
-917987=>'NSM',
-917988=>'NSM',
-917989=>'NSM',
-917990=>'NSM',
-917991=>'NSM',
-917992=>'NSM',
-917993=>'NSM',
-917994=>'NSM',
-917995=>'NSM',
-917996=>'NSM',
-917997=>'NSM',
-917998=>'NSM',
-917999=>'NSM',
-983040=>'L',
-1048573=>'L',
-1048576=>'L',
-1114109=>'L'
-);
-
-/**
- * Mirror unicode characters. For information on bidi mirroring, see UAX #9: Bidirectional Algorithm, at http://www.unicode.org/unicode/reports/tr9/
- * @public
- */
-public static $uni_mirror = array (
-0x0028=>0x0029,
-0x0029=>0x0028,
-0x003C=>0x003E,
-0x003E=>0x003C,
-0x005B=>0x005D,
-0x005D=>0x005B,
-0x007B=>0x007D,
-0x007D=>0x007B,
-0x00AB=>0x00BB,
-0x00BB=>0x00AB,
-0x0F3A=>0x0F3B,
-0x0F3B=>0x0F3A,
-0x0F3C=>0x0F3D,
-0x0F3D=>0x0F3C,
-0x169B=>0x169C,
-0x169C=>0x169B,
-0x2018=>0x2019,
-0x2019=>0x2018,
-0x201C=>0x201D,
-0x201D=>0x201C,
-0x2039=>0x203A,
-0x203A=>0x2039,
-0x2045=>0x2046,
-0x2046=>0x2045,
-0x207D=>0x207E,
-0x207E=>0x207D,
-0x208D=>0x208E,
-0x208E=>0x208D,
-0x2208=>0x220B,
-0x2209=>0x220C,
-0x220A=>0x220D,
-0x220B=>0x2208,
-0x220C=>0x2209,
-0x220D=>0x220A,
-0x2215=>0x29F5,
-0x223C=>0x223D,
-0x223D=>0x223C,
-0x2243=>0x22CD,
-0x2252=>0x2253,
-0x2253=>0x2252,
-0x2254=>0x2255,
-0x2255=>0x2254,
-0x2264=>0x2265,
-0x2265=>0x2264,
-0x2266=>0x2267,
-0x2267=>0x2266,
-0x2268=>0x2269,
-0x2269=>0x2268,
-0x226A=>0x226B,
-0x226B=>0x226A,
-0x226E=>0x226F,
-0x226F=>0x226E,
-0x2270=>0x2271,
-0x2271=>0x2270,
-0x2272=>0x2273,
-0x2273=>0x2272,
-0x2274=>0x2275,
-0x2275=>0x2274,
-0x2276=>0x2277,
-0x2277=>0x2276,
-0x2278=>0x2279,
-0x2279=>0x2278,
-0x227A=>0x227B,
-0x227B=>0x227A,
-0x227C=>0x227D,
-0x227D=>0x227C,
-0x227E=>0x227F,
-0x227F=>0x227E,
-0x2280=>0x2281,
-0x2281=>0x2280,
-0x2282=>0x2283,
-0x2283=>0x2282,
-0x2284=>0x2285,
-0x2285=>0x2284,
-0x2286=>0x2287,
-0x2287=>0x2286,
-0x2288=>0x2289,
-0x2289=>0x2288,
-0x228A=>0x228B,
-0x228B=>0x228A,
-0x228F=>0x2290,
-0x2290=>0x228F,
-0x2291=>0x2292,
-0x2292=>0x2291,
-0x2298=>0x29B8,
-0x22A2=>0x22A3,
-0x22A3=>0x22A2,
-0x22A6=>0x2ADE,
-0x22A8=>0x2AE4,
-0x22A9=>0x2AE3,
-0x22AB=>0x2AE5,
-0x22B0=>0x22B1,
-0x22B1=>0x22B0,
-0x22B2=>0x22B3,
-0x22B3=>0x22B2,
-0x22B4=>0x22B5,
-0x22B5=>0x22B4,
-0x22B6=>0x22B7,
-0x22B7=>0x22B6,
-0x22C9=>0x22CA,
-0x22CA=>0x22C9,
-0x22CB=>0x22CC,
-0x22CC=>0x22CB,
-0x22CD=>0x2243,
-0x22D0=>0x22D1,
-0x22D1=>0x22D0,
-0x22D6=>0x22D7,
-0x22D7=>0x22D6,
-0x22D8=>0x22D9,
-0x22D9=>0x22D8,
-0x22DA=>0x22DB,
-0x22DB=>0x22DA,
-0x22DC=>0x22DD,
-0x22DD=>0x22DC,
-0x22DE=>0x22DF,
-0x22DF=>0x22DE,
-0x22E0=>0x22E1,
-0x22E1=>0x22E0,
-0x22E2=>0x22E3,
-0x22E3=>0x22E2,
-0x22E4=>0x22E5,
-0x22E5=>0x22E4,
-0x22E6=>0x22E7,
-0x22E7=>0x22E6,
-0x22E8=>0x22E9,
-0x22E9=>0x22E8,
-0x22EA=>0x22EB,
-0x22EB=>0x22EA,
-0x22EC=>0x22ED,
-0x22ED=>0x22EC,
-0x22F0=>0x22F1,
-0x22F1=>0x22F0,
-0x22F2=>0x22FA,
-0x22F3=>0x22FB,
-0x22F4=>0x22FC,
-0x22F6=>0x22FD,
-0x22F7=>0x22FE,
-0x22FA=>0x22F2,
-0x22FB=>0x22F3,
-0x22FC=>0x22F4,
-0x22FD=>0x22F6,
-0x22FE=>0x22F7,
-0x2308=>0x2309,
-0x2309=>0x2308,
-0x230A=>0x230B,
-0x230B=>0x230A,
-0x2329=>0x232A,
-0x232A=>0x2329,
-0x2768=>0x2769,
-0x2769=>0x2768,
-0x276A=>0x276B,
-0x276B=>0x276A,
-0x276C=>0x276D,
-0x276D=>0x276C,
-0x276E=>0x276F,
-0x276F=>0x276E,
-0x2770=>0x2771,
-0x2771=>0x2770,
-0x2772=>0x2773,
-0x2773=>0x2772,
-0x2774=>0x2775,
-0x2775=>0x2774,
-0x27C3=>0x27C4,
-0x27C4=>0x27C3,
-0x27C5=>0x27C6,
-0x27C6=>0x27C5,
-0x27D5=>0x27D6,
-0x27D6=>0x27D5,
-0x27DD=>0x27DE,
-0x27DE=>0x27DD,
-0x27E2=>0x27E3,
-0x27E3=>0x27E2,
-0x27E4=>0x27E5,
-0x27E5=>0x27E4,
-0x27E6=>0x27E7,
-0x27E7=>0x27E6,
-0x27E8=>0x27E9,
-0x27E9=>0x27E8,
-0x27EA=>0x27EB,
-0x27EB=>0x27EA,
-0x2983=>0x2984,
-0x2984=>0x2983,
-0x2985=>0x2986,
-0x2986=>0x2985,
-0x2987=>0x2988,
-0x2988=>0x2987,
-0x2989=>0x298A,
-0x298A=>0x2989,
-0x298B=>0x298C,
-0x298C=>0x298B,
-0x298D=>0x2990,
-0x298E=>0x298F,
-0x298F=>0x298E,
-0x2990=>0x298D,
-0x2991=>0x2992,
-0x2992=>0x2991,
-0x2993=>0x2994,
-0x2994=>0x2993,
-0x2995=>0x2996,
-0x2996=>0x2995,
-0x2997=>0x2998,
-0x2998=>0x2997,
-0x29B8=>0x2298,
-0x29C0=>0x29C1,
-0x29C1=>0x29C0,
-0x29C4=>0x29C5,
-0x29C5=>0x29C4,
-0x29CF=>0x29D0,
-0x29D0=>0x29CF,
-0x29D1=>0x29D2,
-0x29D2=>0x29D1,
-0x29D4=>0x29D5,
-0x29D5=>0x29D4,
-0x29D8=>0x29D9,
-0x29D9=>0x29D8,
-0x29DA=>0x29DB,
-0x29DB=>0x29DA,
-0x29F5=>0x2215,
-0x29F8=>0x29F9,
-0x29F9=>0x29F8,
-0x29FC=>0x29FD,
-0x29FD=>0x29FC,
-0x2A2B=>0x2A2C,
-0x2A2C=>0x2A2B,
-0x2A2D=>0x2A2E,
-0x2A2E=>0x2A2D,
-0x2A34=>0x2A35,
-0x2A35=>0x2A34,
-0x2A3C=>0x2A3D,
-0x2A3D=>0x2A3C,
-0x2A64=>0x2A65,
-0x2A65=>0x2A64,
-0x2A79=>0x2A7A,
-0x2A7A=>0x2A79,
-0x2A7D=>0x2A7E,
-0x2A7E=>0x2A7D,
-0x2A7F=>0x2A80,
-0x2A80=>0x2A7F,
-0x2A81=>0x2A82,
-0x2A82=>0x2A81,
-0x2A83=>0x2A84,
-0x2A84=>0x2A83,
-0x2A8B=>0x2A8C,
-0x2A8C=>0x2A8B,
-0x2A91=>0x2A92,
-0x2A92=>0x2A91,
-0x2A93=>0x2A94,
-0x2A94=>0x2A93,
-0x2A95=>0x2A96,
-0x2A96=>0x2A95,
-0x2A97=>0x2A98,
-0x2A98=>0x2A97,
-0x2A99=>0x2A9A,
-0x2A9A=>0x2A99,
-0x2A9B=>0x2A9C,
-0x2A9C=>0x2A9B,
-0x2AA1=>0x2AA2,
-0x2AA2=>0x2AA1,
-0x2AA6=>0x2AA7,
-0x2AA7=>0x2AA6,
-0x2AA8=>0x2AA9,
-0x2AA9=>0x2AA8,
-0x2AAA=>0x2AAB,
-0x2AAB=>0x2AAA,
-0x2AAC=>0x2AAD,
-0x2AAD=>0x2AAC,
-0x2AAF=>0x2AB0,
-0x2AB0=>0x2AAF,
-0x2AB3=>0x2AB4,
-0x2AB4=>0x2AB3,
-0x2ABB=>0x2ABC,
-0x2ABC=>0x2ABB,
-0x2ABD=>0x2ABE,
-0x2ABE=>0x2ABD,
-0x2ABF=>0x2AC0,
-0x2AC0=>0x2ABF,
-0x2AC1=>0x2AC2,
-0x2AC2=>0x2AC1,
-0x2AC3=>0x2AC4,
-0x2AC4=>0x2AC3,
-0x2AC5=>0x2AC6,
-0x2AC6=>0x2AC5,
-0x2ACD=>0x2ACE,
-0x2ACE=>0x2ACD,
-0x2ACF=>0x2AD0,
-0x2AD0=>0x2ACF,
-0x2AD1=>0x2AD2,
-0x2AD2=>0x2AD1,
-0x2AD3=>0x2AD4,
-0x2AD4=>0x2AD3,
-0x2AD5=>0x2AD6,
-0x2AD6=>0x2AD5,
-0x2ADE=>0x22A6,
-0x2AE3=>0x22A9,
-0x2AE4=>0x22A8,
-0x2AE5=>0x22AB,
-0x2AEC=>0x2AED,
-0x2AED=>0x2AEC,
-0x2AF7=>0x2AF8,
-0x2AF8=>0x2AF7,
-0x2AF9=>0x2AFA,
-0x2AFA=>0x2AF9,
-0x2E02=>0x2E03,
-0x2E03=>0x2E02,
-0x2E04=>0x2E05,
-0x2E05=>0x2E04,
-0x2E09=>0x2E0A,
-0x2E0A=>0x2E09,
-0x2E0C=>0x2E0D,
-0x2E0D=>0x2E0C,
-0x2E1C=>0x2E1D,
-0x2E1D=>0x2E1C,
-0x3008=>0x3009,
-0x3009=>0x3008,
-0x300A=>0x300B,
-0x300B=>0x300A,
-0x300C=>0x300D,
-0x300D=>0x300C,
-0x300E=>0x300F,
-0x300F=>0x300E,
-0x3010=>0x3011,
-0x3011=>0x3010,
-0x3014=>0x3015,
-0x3015=>0x3014,
-0x3016=>0x3017,
-0x3017=>0x3016,
-0x3018=>0x3019,
-0x3019=>0x3018,
-0x301A=>0x301B,
-0x301B=>0x301A,
-0x301D=>0x301E,
-0x301E=>0x301D,
-0xFE59=>0xFE5A,
-0xFE5A=>0xFE59,
-0xFE5B=>0xFE5C,
-0xFE5C=>0xFE5B,
-0xFE5D=>0xFE5E,
-0xFE5E=>0xFE5D,
-0xFE64=>0xFE65,
-0xFE65=>0xFE64,
-0xFF08=>0xFF09,
-0xFF09=>0xFF08,
-0xFF1C=>0xFF1E,
-0xFF1E=>0xFF1C,
-0xFF3B=>0xFF3D,
-0xFF3D=>0xFF3B,
-0xFF5B=>0xFF5D,
-0xFF5D=>0xFF5B,
-0xFF5F=>0xFF60,
-0xFF60=>0xFF5F,
-0xFF62=>0xFF63,
-0xFF63=>0xFF62);
-
-/**
- * Arabic shape substitutions: char code => (isolated, final, initial, medial).
- * @public
- */
-public static $uni_arabicsubst = array(
-1569=>array(65152),
-1570=>array(65153, 65154, 65153, 65154),
-1571=>array(65155, 65156, 65155, 65156),
-1572=>array(65157, 65158),
-1573=>array(65159, 65160, 65159, 65160),
-1574=>array(65161, 65162, 65163, 65164),
-1575=>array(65165, 65166, 65165, 65166),
-1576=>array(65167, 65168, 65169, 65170),
-1577=>array(65171, 65172),
-1578=>array(65173, 65174, 65175, 65176),
-1579=>array(65177, 65178, 65179, 65180),
-1580=>array(65181, 65182, 65183, 65184),
-1581=>array(65185, 65186, 65187, 65188),
-1582=>array(65189, 65190, 65191, 65192),
-1583=>array(65193, 65194, 65193, 65194),
-1584=>array(65195, 65196, 65195, 65196),
-1585=>array(65197, 65198, 65197, 65198),
-1586=>array(65199, 65200, 65199, 65200),
-1587=>array(65201, 65202, 65203, 65204),
-1588=>array(65205, 65206, 65207, 65208),
-1589=>array(65209, 65210, 65211, 65212),
-1590=>array(65213, 65214, 65215, 65216),
-1591=>array(65217, 65218, 65219, 65220),
-1592=>array(65221, 65222, 65223, 65224),
-1593=>array(65225, 65226, 65227, 65228),
-1594=>array(65229, 65230, 65231, 65232),
-1601=>array(65233, 65234, 65235, 65236),
-1602=>array(65237, 65238, 65239, 65240),
-1603=>array(65241, 65242, 65243, 65244),
-1604=>array(65245, 65246, 65247, 65248),
-1605=>array(65249, 65250, 65251, 65252),
-1606=>array(65253, 65254, 65255, 65256),
-1607=>array(65257, 65258, 65259, 65260),
-1608=>array(65261, 65262, 65261, 65262),
-1609=>array(65263, 65264, 64488, 64489),
-1610=>array(65265, 65266, 65267, 65268),
-1649=>array(64336, 64337),
-1655=>array(64477),
-1657=>array(64358, 64359, 64360, 64361),
-1658=>array(64350, 64351, 64352, 64353),
-1659=>array(64338, 64339, 64340, 64341),
-1662=>array(64342, 64343, 64344, 64345),
-1663=>array(64354, 64355, 64356, 64357),
-1664=>array(64346, 64347, 64348, 64349),
-1667=>array(64374, 64375, 64376, 64377),
-1668=>array(64370, 64371, 64372, 64373),
-1670=>array(64378, 64379, 64380, 64381),
-1671=>array(64382, 64383, 64384, 64385),
-1672=>array(64392, 64393),
-1676=>array(64388, 64389),
-1677=>array(64386, 64387),
-1678=>array(64390, 64391),
-1681=>array(64396, 64397),
-1688=>array(64394, 64395, 64394, 64395),
-1700=>array(64362, 64363, 64364, 64365),
-1702=>array(64366, 64367, 64368, 64369),
-1705=>array(64398, 64399, 64400, 64401),
-1709=>array(64467, 64468, 64469, 64470),
-1711=>array(64402, 64403, 64404, 64405),
-1713=>array(64410, 64411, 64412, 64413),
-1715=>array(64406, 64407, 64408, 64409),
-1722=>array(64414, 64415),
-1723=>array(64416, 64417, 64418, 64419),
-1726=>array(64426, 64427, 64428, 64429),
-1728=>array(64420, 64421),
-1729=>array(64422, 64423, 64424, 64425),
-1733=>array(64480, 64481),
-1734=>array(64473, 64474),
-1735=>array(64471, 64472),
-1736=>array(64475, 64476),
-1737=>array(64482, 64483),
-1739=>array(64478, 64479),
-1740=>array(64508, 64509, 64510, 64511),
-1744=>array(64484, 64485, 64486, 64487),
-1746=>array(64430, 64431),
-1747=>array(64432, 64433)
-);
-
-/**
- * Arabic laa letter: (char code => isolated, final, initial, medial).
- * @public
- */
-public static $uni_laa_array = array (
-1570 =>array(65269, 65270, 65269, 65270),
-1571 =>array(65271, 65272, 65271, 65272),
-1573 =>array(65273, 65274, 65273, 65274),
-1575 =>array(65275, 65276, 65275, 65276)
-);
-
-/**
- * Array of character substitutions for sequences of two diacritics symbols.
- * Putting the combining mark and character in the same glyph allows us to avoid the two marks overlapping each other in an illegible manner.
- * second NSM char code => substitution char
- * @public
- */
-public static $uni_diacritics = array (
-1612=>64606, # Shadda + Dammatan
-1613=>64607, # Shadda + Kasratan
-1614=>64608, # Shadda + Fatha
-1615=>64609, # Shadda + Damma
-1616=>64610  # Shadda + Kasra
-);
-
-/**
- * Array of character substitutions from UTF-8 Unicode to Latin1.
- * @public
- */
-public static $uni_utf8tolatin = array (
-8364=>128, # Euro1
-338=>140,  # OE
-352=>138,  # Scaron
-376=>159,  # Ydieresis
-381=>142,  # Zcaron2
-8226=>149, # bullet3
-710=>136,  # circumflex
-8224=>134, # dagger
-8225=>135, # daggerdbl
-8230=>133, # ellipsis
-8212=>151, # emdash
-8211=>150, # endash
-402=>131,  # florin
-8249=>139, # guilsinglleft
-8250=>155, # guilsinglright
-339=>156,  # oe
-8240=>137, # perthousand
-8222=>132, # quotedblbase
-8220=>147, # quotedblleft
-8221=>148, # quotedblright
-8216=>145, # quoteleft
-8217=>146, # quoteright
-8218=>130, # quotesinglbase
-353=>154,  # scaron
-732=>152,  # tilde
-8482=>153, # trademark
-382=>158   # zcaron2
-);
-
-/**
- * Array of Encoding Maps.
- * @public static
- */
-public static $encmap = array(
-
-// encoding map for: cp874
-'cp874' => array(0=>'.notdef',1=>'.notdef',2=>'.notdef',3=>'.notdef',4=>'.notdef',5=>'.notdef',6=>'.notdef',7=>'.notdef',8=>'.notdef',9=>'.notdef',10=>'.notdef',11=>'.notdef',12=>'.notdef',13=>'.notdef',14=>'.notdef',15=>'.notdef',16=>'.notdef',17=>'.notdef',18=>'.notdef',19=>'.notdef',20=>'.notdef',21=>'.notdef',22=>'.notdef',23=>'.notdef',24=>'.notdef',25=>'.notdef',26=>'.notdef',27=>'.notdef',28=>'.notdef',29=>'.notdef',30=>'.notdef',31=>'.notdef',32=>'space',33=>'exclam',34=>'quotedbl',35=>'numbersign',36=>'dollar',37=>'percent',38=>'ampersand',39=>'quotesingle',40=>'parenleft',41=>'parenright',42=>'asterisk',43=>'plus',44=>'comma',45=>'hyphen',46=>'period',47=>'slash',48=>'zero',49=>'one',50=>'two',51=>'three',52=>'four',53=>'five',54=>'six',55=>'seven',56=>'eight',57=>'nine',58=>'colon',59=>'semicolon',60=>'less',61=>'equal',62=>'greater',63=>'question',64=>'at',65=>'A',66=>'B',67=>'C',68=>'D',69=>'E',70=>'F',71=>'G',72=>'H',73=>'I',74=>'J',75=>'K',76=>'L',77=>'M',78=>'N',79=>'O',80=>'P',81=>'Q',82=>'R',83=>'S',84=>'T',85=>'U',86=>'V',87=>'W',88=>'X',89=>'Y',90=>'Z',91=>'bracketleft',92=>'backslash',93=>'bracketright',94=>'asciicircum',95=>'underscore',96=>'grave',97=>'a',98=>'b',99=>'c',100=>'d',101=>'e',102=>'f',103=>'g',104=>'h',105=>'i',106=>'j',107=>'k',108=>'l',109=>'m',110=>'n',111=>'o',112=>'p',113=>'q',114=>'r',115=>'s',116=>'t',117=>'u',118=>'v',119=>'w',120=>'x',121=>'y',122=>'z',123=>'braceleft',124=>'bar',125=>'braceright',126=>'asciitilde',127=>'.notdef',128=>'Euro',129=>'.notdef',130=>'.notdef',131=>'.notdef',132=>'.notdef',133=>'ellipsis',134=>'.notdef',135=>'.notdef',136=>'.notdef',137=>'.notdef',138=>'.notdef',139=>'.notdef',140=>'.notdef',141=>'.notdef',142=>'.notdef',143=>'.notdef',144=>'.notdef',145=>'quoteleft',146=>'quoteright',147=>'quotedblleft',148=>'quotedblright',149=>'bullet',150=>'endash',151=>'emdash',152=>'.notdef',153=>'.notdef',154=>'.notdef',155=>'.notdef',156=>'.notdef',157=>'.notdef',158=>'.notdef',159=>'.notdef',160=>'space',161=>'kokaithai',162=>'khokhaithai',163=>'khokhuatthai',164=>'khokhwaithai',165=>'khokhonthai',166=>'khorakhangthai',167=>'ngonguthai',168=>'chochanthai',169=>'chochingthai',170=>'chochangthai',171=>'sosothai',172=>'chochoethai',173=>'yoyingthai',174=>'dochadathai',175=>'topatakthai',176=>'thothanthai',177=>'thonangmonthothai',178=>'thophuthaothai',179=>'nonenthai',180=>'dodekthai',181=>'totaothai',182=>'thothungthai',183=>'thothahanthai',184=>'thothongthai',185=>'nonuthai',186=>'bobaimaithai',187=>'poplathai',188=>'phophungthai',189=>'fofathai',190=>'phophanthai',191=>'fofanthai',192=>'phosamphaothai',193=>'momathai',194=>'yoyakthai',195=>'roruathai',196=>'ruthai',197=>'lolingthai',198=>'luthai',199=>'wowaenthai',200=>'sosalathai',201=>'sorusithai',202=>'sosuathai',203=>'hohipthai',204=>'lochulathai',205=>'oangthai',206=>'honokhukthai',207=>'paiyannoithai',208=>'saraathai',209=>'maihanakatthai',210=>'saraaathai',211=>'saraamthai',212=>'saraithai',213=>'saraiithai',214=>'sarauethai',215=>'saraueethai',216=>'sarauthai',217=>'sarauuthai',218=>'phinthuthai',219=>'.notdef',220=>'.notdef',221=>'.notdef',222=>'.notdef',223=>'bahtthai',224=>'saraethai',225=>'saraaethai',226=>'saraothai',227=>'saraaimaimuanthai',228=>'saraaimaimalaithai',229=>'lakkhangyaothai',230=>'maiyamokthai',231=>'maitaikhuthai',232=>'maiekthai',233=>'maithothai',234=>'maitrithai',235=>'maichattawathai',236=>'thanthakhatthai',237=>'nikhahitthai',238=>'yamakkanthai',239=>'fongmanthai',240=>'zerothai',241=>'onethai',242=>'twothai',243=>'threethai',244=>'fourthai',245=>'fivethai',246=>'sixthai',247=>'seventhai',248=>'eightthai',249=>'ninethai',250=>'angkhankhuthai',251=>'khomutthai',252=>'.notdef',253=>'.notdef',254=>'.notdef',255=>'.notdef'),
-
-// encoding map for: cp1250
-'cp1250' => array(0=>'.notdef',1=>'.notdef',2=>'.notdef',3=>'.notdef',4=>'.notdef',5=>'.notdef',6=>'.notdef',7=>'.notdef',8=>'.notdef',9=>'.notdef',10=>'.notdef',11=>'.notdef',12=>'.notdef',13=>'.notdef',14=>'.notdef',15=>'.notdef',16=>'.notdef',17=>'.notdef',18=>'.notdef',19=>'.notdef',20=>'.notdef',21=>'.notdef',22=>'.notdef',23=>'.notdef',24=>'.notdef',25=>'.notdef',26=>'.notdef',27=>'.notdef',28=>'.notdef',29=>'.notdef',30=>'.notdef',31=>'.notdef',32=>'space',33=>'exclam',34=>'quotedbl',35=>'numbersign',36=>'dollar',37=>'percent',38=>'ampersand',39=>'quotesingle',40=>'parenleft',41=>'parenright',42=>'asterisk',43=>'plus',44=>'comma',45=>'hyphen',46=>'period',47=>'slash',48=>'zero',49=>'one',50=>'two',51=>'three',52=>'four',53=>'five',54=>'six',55=>'seven',56=>'eight',57=>'nine',58=>'colon',59=>'semicolon',60=>'less',61=>'equal',62=>'greater',63=>'question',64=>'at',65=>'A',66=>'B',67=>'C',68=>'D',69=>'E',70=>'F',71=>'G',72=>'H',73=>'I',74=>'J',75=>'K',76=>'L',77=>'M',78=>'N',79=>'O',80=>'P',81=>'Q',82=>'R',83=>'S',84=>'T',85=>'U',86=>'V',87=>'W',88=>'X',89=>'Y',90=>'Z',91=>'bracketleft',92=>'backslash',93=>'bracketright',94=>'asciicircum',95=>'underscore',96=>'grave',97=>'a',98=>'b',99=>'c',100=>'d',101=>'e',102=>'f',103=>'g',104=>'h',105=>'i',106=>'j',107=>'k',108=>'l',109=>'m',110=>'n',111=>'o',112=>'p',113=>'q',114=>'r',115=>'s',116=>'t',117=>'u',118=>'v',119=>'w',120=>'x',121=>'y',122=>'z',123=>'braceleft',124=>'bar',125=>'braceright',126=>'asciitilde',127=>'.notdef',128=>'Euro',129=>'.notdef',130=>'quotesinglbase',131=>'.notdef',132=>'quotedblbase',133=>'ellipsis',134=>'dagger',135=>'daggerdbl',136=>'.notdef',137=>'perthousand',138=>'Scaron',139=>'guilsinglleft',140=>'Sacute',141=>'Tcaron',142=>'Zcaron',143=>'Zacute',144=>'.notdef',145=>'quoteleft',146=>'quoteright',147=>'quotedblleft',148=>'quotedblright',149=>'bullet',150=>'endash',151=>'emdash',152=>'.notdef',153=>'trademark',154=>'scaron',155=>'guilsinglright',156=>'sacute',157=>'tcaron',158=>'zcaron',159=>'zacute',160=>'space',161=>'caron',162=>'breve',163=>'Lslash',164=>'currency',165=>'Aogonek',166=>'brokenbar',167=>'section',168=>'dieresis',169=>'copyright',170=>'Scedilla',171=>'guillemotleft',172=>'logicalnot',173=>'hyphen',174=>'registered',175=>'Zdotaccent',176=>'degree',177=>'plusminus',178=>'ogonek',179=>'lslash',180=>'acute',181=>'mu',182=>'paragraph',183=>'periodcentered',184=>'cedilla',185=>'aogonek',186=>'scedilla',187=>'guillemotright',188=>'Lcaron',189=>'hungarumlaut',190=>'lcaron',191=>'zdotaccent',192=>'Racute',193=>'Aacute',194=>'Acircumflex',195=>'Abreve',196=>'Adieresis',197=>'Lacute',198=>'Cacute',199=>'Ccedilla',200=>'Ccaron',201=>'Eacute',202=>'Eogonek',203=>'Edieresis',204=>'Ecaron',205=>'Iacute',206=>'Icircumflex',207=>'Dcaron',208=>'Dcroat',209=>'Nacute',210=>'Ncaron',211=>'Oacute',212=>'Ocircumflex',213=>'Ohungarumlaut',214=>'Odieresis',215=>'multiply',216=>'Rcaron',217=>'Uring',218=>'Uacute',219=>'Uhungarumlaut',220=>'Udieresis',221=>'Yacute',222=>'Tcommaaccent',223=>'germandbls',224=>'racute',225=>'aacute',226=>'acircumflex',227=>'abreve',228=>'adieresis',229=>'lacute',230=>'cacute',231=>'ccedilla',232=>'ccaron',233=>'eacute',234=>'eogonek',235=>'edieresis',236=>'ecaron',237=>'iacute',238=>'icircumflex',239=>'dcaron',240=>'dcroat',241=>'nacute',242=>'ncaron',243=>'oacute',244=>'ocircumflex',245=>'ohungarumlaut',246=>'odieresis',247=>'divide',248=>'rcaron',249=>'uring',250=>'uacute',251=>'uhungarumlaut',252=>'udieresis',253=>'yacute',254=>'tcommaaccent',255=>'dotaccent'),
-
-// encoding map for: cp1251
-'cp1251' => array(0=>'.notdef',1=>'.notdef',2=>'.notdef',3=>'.notdef',4=>'.notdef',5=>'.notdef',6=>'.notdef',7=>'.notdef',8=>'.notdef',9=>'.notdef',10=>'.notdef',11=>'.notdef',12=>'.notdef',13=>'.notdef',14=>'.notdef',15=>'.notdef',16=>'.notdef',17=>'.notdef',18=>'.notdef',19=>'.notdef',20=>'.notdef',21=>'.notdef',22=>'.notdef',23=>'.notdef',24=>'.notdef',25=>'.notdef',26=>'.notdef',27=>'.notdef',28=>'.notdef',29=>'.notdef',30=>'.notdef',31=>'.notdef',32=>'space',33=>'exclam',34=>'quotedbl',35=>'numbersign',36=>'dollar',37=>'percent',38=>'ampersand',39=>'quotesingle',40=>'parenleft',41=>'parenright',42=>'asterisk',43=>'plus',44=>'comma',45=>'hyphen',46=>'period',47=>'slash',48=>'zero',49=>'one',50=>'two',51=>'three',52=>'four',53=>'five',54=>'six',55=>'seven',56=>'eight',57=>'nine',58=>'colon',59=>'semicolon',60=>'less',61=>'equal',62=>'greater',63=>'question',64=>'at',65=>'A',66=>'B',67=>'C',68=>'D',69=>'E',70=>'F',71=>'G',72=>'H',73=>'I',74=>'J',75=>'K',76=>'L',77=>'M',78=>'N',79=>'O',80=>'P',81=>'Q',82=>'R',83=>'S',84=>'T',85=>'U',86=>'V',87=>'W',88=>'X',89=>'Y',90=>'Z',91=>'bracketleft',92=>'backslash',93=>'bracketright',94=>'asciicircum',95=>'underscore',96=>'grave',97=>'a',98=>'b',99=>'c',100=>'d',101=>'e',102=>'f',103=>'g',104=>'h',105=>'i',106=>'j',107=>'k',108=>'l',109=>'m',110=>'n',111=>'o',112=>'p',113=>'q',114=>'r',115=>'s',116=>'t',117=>'u',118=>'v',119=>'w',120=>'x',121=>'y',122=>'z',123=>'braceleft',124=>'bar',125=>'braceright',126=>'asciitilde',127=>'.notdef',128=>'afii10051',129=>'afii10052',130=>'quotesinglbase',131=>'afii10100',132=>'quotedblbase',133=>'ellipsis',134=>'dagger',135=>'daggerdbl',136=>'Euro',137=>'perthousand',138=>'afii10058',139=>'guilsinglleft',140=>'afii10059',141=>'afii10061',142=>'afii10060',143=>'afii10145',144=>'afii10099',145=>'quoteleft',146=>'quoteright',147=>'quotedblleft',148=>'quotedblright',149=>'bullet',150=>'endash',151=>'emdash',152=>'.notdef',153=>'trademark',154=>'afii10106',155=>'guilsinglright',156=>'afii10107',157=>'afii10109',158=>'afii10108',159=>'afii10193',160=>'space',161=>'afii10062',162=>'afii10110',163=>'afii10057',164=>'currency',165=>'afii10050',166=>'brokenbar',167=>'section',168=>'afii10023',169=>'copyright',170=>'afii10053',171=>'guillemotleft',172=>'logicalnot',173=>'hyphen',174=>'registered',175=>'afii10056',176=>'degree',177=>'plusminus',178=>'afii10055',179=>'afii10103',180=>'afii10098',181=>'mu',182=>'paragraph',183=>'periodcentered',184=>'afii10071',185=>'afii61352',186=>'afii10101',187=>'guillemotright',188=>'afii10105',189=>'afii10054',190=>'afii10102',191=>'afii10104',192=>'afii10017',193=>'afii10018',194=>'afii10019',195=>'afii10020',196=>'afii10021',197=>'afii10022',198=>'afii10024',199=>'afii10025',200=>'afii10026',201=>'afii10027',202=>'afii10028',203=>'afii10029',204=>'afii10030',205=>'afii10031',206=>'afii10032',207=>'afii10033',208=>'afii10034',209=>'afii10035',210=>'afii10036',211=>'afii10037',212=>'afii10038',213=>'afii10039',214=>'afii10040',215=>'afii10041',216=>'afii10042',217=>'afii10043',218=>'afii10044',219=>'afii10045',220=>'afii10046',221=>'afii10047',222=>'afii10048',223=>'afii10049',224=>'afii10065',225=>'afii10066',226=>'afii10067',227=>'afii10068',228=>'afii10069',229=>'afii10070',230=>'afii10072',231=>'afii10073',232=>'afii10074',233=>'afii10075',234=>'afii10076',235=>'afii10077',236=>'afii10078',237=>'afii10079',238=>'afii10080',239=>'afii10081',240=>'afii10082',241=>'afii10083',242=>'afii10084',243=>'afii10085',244=>'afii10086',245=>'afii10087',246=>'afii10088',247=>'afii10089',248=>'afii10090',249=>'afii10091',250=>'afii10092',251=>'afii10093',252=>'afii10094',253=>'afii10095',254=>'afii10096',255=>'afii10097'),
-
-// encoding map for: cp1252
-'cp1252' => array(0=>'.notdef',1=>'.notdef',2=>'.notdef',3=>'.notdef',4=>'.notdef',5=>'.notdef',6=>'.notdef',7=>'.notdef',8=>'.notdef',9=>'.notdef',10=>'.notdef',11=>'.notdef',12=>'.notdef',13=>'.notdef',14=>'.notdef',15=>'.notdef',16=>'.notdef',17=>'.notdef',18=>'.notdef',19=>'.notdef',20=>'.notdef',21=>'.notdef',22=>'.notdef',23=>'.notdef',24=>'.notdef',25=>'.notdef',26=>'.notdef',27=>'.notdef',28=>'.notdef',29=>'.notdef',30=>'.notdef',31=>'.notdef',32=>'space',33=>'exclam',34=>'quotedbl',35=>'numbersign',36=>'dollar',37=>'percent',38=>'ampersand',39=>'quotesingle',40=>'parenleft',41=>'parenright',42=>'asterisk',43=>'plus',44=>'comma',45=>'hyphen',46=>'period',47=>'slash',48=>'zero',49=>'one',50=>'two',51=>'three',52=>'four',53=>'five',54=>'six',55=>'seven',56=>'eight',57=>'nine',58=>'colon',59=>'semicolon',60=>'less',61=>'equal',62=>'greater',63=>'question',64=>'at',65=>'A',66=>'B',67=>'C',68=>'D',69=>'E',70=>'F',71=>'G',72=>'H',73=>'I',74=>'J',75=>'K',76=>'L',77=>'M',78=>'N',79=>'O',80=>'P',81=>'Q',82=>'R',83=>'S',84=>'T',85=>'U',86=>'V',87=>'W',88=>'X',89=>'Y',90=>'Z',91=>'bracketleft',92=>'backslash',93=>'bracketright',94=>'asciicircum',95=>'underscore',96=>'grave',97=>'a',98=>'b',99=>'c',100=>'d',101=>'e',102=>'f',103=>'g',104=>'h',105=>'i',106=>'j',107=>'k',108=>'l',109=>'m',110=>'n',111=>'o',112=>'p',113=>'q',114=>'r',115=>'s',116=>'t',117=>'u',118=>'v',119=>'w',120=>'x',121=>'y',122=>'z',123=>'braceleft',124=>'bar',125=>'braceright',126=>'asciitilde',127=>'.notdef',128=>'Euro',129=>'.notdef',130=>'quotesinglbase',131=>'florin',132=>'quotedblbase',133=>'ellipsis',134=>'dagger',135=>'daggerdbl',136=>'circumflex',137=>'perthousand',138=>'Scaron',139=>'guilsinglleft',140=>'OE',141=>'.notdef',142=>'Zcaron',143=>'.notdef',144=>'.notdef',145=>'quoteleft',146=>'quoteright',147=>'quotedblleft',148=>'quotedblright',149=>'bullet',150=>'endash',151=>'emdash',152=>'tilde',153=>'trademark',154=>'scaron',155=>'guilsinglright',156=>'oe',157=>'.notdef',158=>'zcaron',159=>'Ydieresis',160=>'space',161=>'exclamdown',162=>'cent',163=>'sterling',164=>'currency',165=>'yen',166=>'brokenbar',167=>'section',168=>'dieresis',169=>'copyright',170=>'ordfeminine',171=>'guillemotleft',172=>'logicalnot',173=>'hyphen',174=>'registered',175=>'macron',176=>'degree',177=>'plusminus',178=>'twosuperior',179=>'threesuperior',180=>'acute',181=>'mu',182=>'paragraph',183=>'periodcentered',184=>'cedilla',185=>'onesuperior',186=>'ordmasculine',187=>'guillemotright',188=>'onequarter',189=>'onehalf',190=>'threequarters',191=>'questiondown',192=>'Agrave',193=>'Aacute',194=>'Acircumflex',195=>'Atilde',196=>'Adieresis',197=>'Aring',198=>'AE',199=>'Ccedilla',200=>'Egrave',201=>'Eacute',202=>'Ecircumflex',203=>'Edieresis',204=>'Igrave',205=>'Iacute',206=>'Icircumflex',207=>'Idieresis',208=>'Eth',209=>'Ntilde',210=>'Ograve',211=>'Oacute',212=>'Ocircumflex',213=>'Otilde',214=>'Odieresis',215=>'multiply',216=>'Oslash',217=>'Ugrave',218=>'Uacute',219=>'Ucircumflex',220=>'Udieresis',221=>'Yacute',222=>'Thorn',223=>'germandbls',224=>'agrave',225=>'aacute',226=>'acircumflex',227=>'atilde',228=>'adieresis',229=>'aring',230=>'ae',231=>'ccedilla',232=>'egrave',233=>'eacute',234=>'ecircumflex',235=>'edieresis',236=>'igrave',237=>'iacute',238=>'icircumflex',239=>'idieresis',240=>'eth',241=>'ntilde',242=>'ograve',243=>'oacute',244=>'ocircumflex',245=>'otilde',246=>'odieresis',247=>'divide',248=>'oslash',249=>'ugrave',250=>'uacute',251=>'ucircumflex',252=>'udieresis',253=>'yacute',254=>'thorn',255=>'ydieresis'),
-
-// encoding map for: cp1253
-'cp1253' => array(0=>'.notdef',1=>'.notdef',2=>'.notdef',3=>'.notdef',4=>'.notdef',5=>'.notdef',6=>'.notdef',7=>'.notdef',8=>'.notdef',9=>'.notdef',10=>'.notdef',11=>'.notdef',12=>'.notdef',13=>'.notdef',14=>'.notdef',15=>'.notdef',16=>'.notdef',17=>'.notdef',18=>'.notdef',19=>'.notdef',20=>'.notdef',21=>'.notdef',22=>'.notdef',23=>'.notdef',24=>'.notdef',25=>'.notdef',26=>'.notdef',27=>'.notdef',28=>'.notdef',29=>'.notdef',30=>'.notdef',31=>'.notdef',32=>'space',33=>'exclam',34=>'quotedbl',35=>'numbersign',36=>'dollar',37=>'percent',38=>'ampersand',39=>'quotesingle',40=>'parenleft',41=>'parenright',42=>'asterisk',43=>'plus',44=>'comma',45=>'hyphen',46=>'period',47=>'slash',48=>'zero',49=>'one',50=>'two',51=>'three',52=>'four',53=>'five',54=>'six',55=>'seven',56=>'eight',57=>'nine',58=>'colon',59=>'semicolon',60=>'less',61=>'equal',62=>'greater',63=>'question',64=>'at',65=>'A',66=>'B',67=>'C',68=>'D',69=>'E',70=>'F',71=>'G',72=>'H',73=>'I',74=>'J',75=>'K',76=>'L',77=>'M',78=>'N',79=>'O',80=>'P',81=>'Q',82=>'R',83=>'S',84=>'T',85=>'U',86=>'V',87=>'W',88=>'X',89=>'Y',90=>'Z',91=>'bracketleft',92=>'backslash',93=>'bracketright',94=>'asciicircum',95=>'underscore',96=>'grave',97=>'a',98=>'b',99=>'c',100=>'d',101=>'e',102=>'f',103=>'g',104=>'h',105=>'i',106=>'j',107=>'k',108=>'l',109=>'m',110=>'n',111=>'o',112=>'p',113=>'q',114=>'r',115=>'s',116=>'t',117=>'u',118=>'v',119=>'w',120=>'x',121=>'y',122=>'z',123=>'braceleft',124=>'bar',125=>'braceright',126=>'asciitilde',127=>'.notdef',128=>'Euro',129=>'.notdef',130=>'quotesinglbase',131=>'florin',132=>'quotedblbase',133=>'ellipsis',134=>'dagger',135=>'daggerdbl',136=>'.notdef',137=>'perthousand',138=>'.notdef',139=>'guilsinglleft',140=>'.notdef',141=>'.notdef',142=>'.notdef',143=>'.notdef',144=>'.notdef',145=>'quoteleft',146=>'quoteright',147=>'quotedblleft',148=>'quotedblright',149=>'bullet',150=>'endash',151=>'emdash',152=>'.notdef',153=>'trademark',154=>'.notdef',155=>'guilsinglright',156=>'.notdef',157=>'.notdef',158=>'.notdef',159=>'.notdef',160=>'space',161=>'dieresistonos',162=>'Alphatonos',163=>'sterling',164=>'currency',165=>'yen',166=>'brokenbar',167=>'section',168=>'dieresis',169=>'copyright',170=>'.notdef',171=>'guillemotleft',172=>'logicalnot',173=>'hyphen',174=>'registered',175=>'afii00208',176=>'degree',177=>'plusminus',178=>'twosuperior',179=>'threesuperior',180=>'tonos',181=>'mu',182=>'paragraph',183=>'periodcentered',184=>'Epsilontonos',185=>'Etatonos',186=>'Iotatonos',187=>'guillemotright',188=>'Omicrontonos',189=>'onehalf',190=>'Upsilontonos',191=>'Omegatonos',192=>'iotadieresistonos',193=>'Alpha',194=>'Beta',195=>'Gamma',196=>'Delta',197=>'Epsilon',198=>'Zeta',199=>'Eta',200=>'Theta',201=>'Iota',202=>'Kappa',203=>'Lambda',204=>'Mu',205=>'Nu',206=>'Xi',207=>'Omicron',208=>'Pi',209=>'Rho',210=>'.notdef',211=>'Sigma',212=>'Tau',213=>'Upsilon',214=>'Phi',215=>'Chi',216=>'Psi',217=>'Omega',218=>'Iotadieresis',219=>'Upsilondieresis',220=>'alphatonos',221=>'epsilontonos',222=>'etatonos',223=>'iotatonos',224=>'upsilondieresistonos',225=>'alpha',226=>'beta',227=>'gamma',228=>'delta',229=>'epsilon',230=>'zeta',231=>'eta',232=>'theta',233=>'iota',234=>'kappa',235=>'lambda',236=>'mu',237=>'nu',238=>'xi',239=>'omicron',240=>'pi',241=>'rho',242=>'sigma1',243=>'sigma',244=>'tau',245=>'upsilon',246=>'phi',247=>'chi',248=>'psi',249=>'omega',250=>'iotadieresis',251=>'upsilondieresis',252=>'omicrontonos',253=>'upsilontonos',254=>'omegatonos',255=>'.notdef'),
-
-// encoding map for: cp1254
-'cp1254' => array(0=>'.notdef',1=>'.notdef',2=>'.notdef',3=>'.notdef',4=>'.notdef',5=>'.notdef',6=>'.notdef',7=>'.notdef',8=>'.notdef',9=>'.notdef',10=>'.notdef',11=>'.notdef',12=>'.notdef',13=>'.notdef',14=>'.notdef',15=>'.notdef',16=>'.notdef',17=>'.notdef',18=>'.notdef',19=>'.notdef',20=>'.notdef',21=>'.notdef',22=>'.notdef',23=>'.notdef',24=>'.notdef',25=>'.notdef',26=>'.notdef',27=>'.notdef',28=>'.notdef',29=>'.notdef',30=>'.notdef',31=>'.notdef',32=>'space',33=>'exclam',34=>'quotedbl',35=>'numbersign',36=>'dollar',37=>'percent',38=>'ampersand',39=>'quotesingle',40=>'parenleft',41=>'parenright',42=>'asterisk',43=>'plus',44=>'comma',45=>'hyphen',46=>'period',47=>'slash',48=>'zero',49=>'one',50=>'two',51=>'three',52=>'four',53=>'five',54=>'six',55=>'seven',56=>'eight',57=>'nine',58=>'colon',59=>'semicolon',60=>'less',61=>'equal',62=>'greater',63=>'question',64=>'at',65=>'A',66=>'B',67=>'C',68=>'D',69=>'E',70=>'F',71=>'G',72=>'H',73=>'I',74=>'J',75=>'K',76=>'L',77=>'M',78=>'N',79=>'O',80=>'P',81=>'Q',82=>'R',83=>'S',84=>'T',85=>'U',86=>'V',87=>'W',88=>'X',89=>'Y',90=>'Z',91=>'bracketleft',92=>'backslash',93=>'bracketright',94=>'asciicircum',95=>'underscore',96=>'grave',97=>'a',98=>'b',99=>'c',100=>'d',101=>'e',102=>'f',103=>'g',104=>'h',105=>'i',106=>'j',107=>'k',108=>'l',109=>'m',110=>'n',111=>'o',112=>'p',113=>'q',114=>'r',115=>'s',116=>'t',117=>'u',118=>'v',119=>'w',120=>'x',121=>'y',122=>'z',123=>'braceleft',124=>'bar',125=>'braceright',126=>'asciitilde',127=>'.notdef',128=>'Euro',129=>'.notdef',130=>'quotesinglbase',131=>'florin',132=>'quotedblbase',133=>'ellipsis',134=>'dagger',135=>'daggerdbl',136=>'circumflex',137=>'perthousand',138=>'Scaron',139=>'guilsinglleft',140=>'OE',141=>'.notdef',142=>'.notdef',143=>'.notdef',144=>'.notdef',145=>'quoteleft',146=>'quoteright',147=>'quotedblleft',148=>'quotedblright',149=>'bullet',150=>'endash',151=>'emdash',152=>'tilde',153=>'trademark',154=>'scaron',155=>'guilsinglright',156=>'oe',157=>'.notdef',158=>'.notdef',159=>'Ydieresis',160=>'space',161=>'exclamdown',162=>'cent',163=>'sterling',164=>'currency',165=>'yen',166=>'brokenbar',167=>'section',168=>'dieresis',169=>'copyright',170=>'ordfeminine',171=>'guillemotleft',172=>'logicalnot',173=>'hyphen',174=>'registered',175=>'macron',176=>'degree',177=>'plusminus',178=>'twosuperior',179=>'threesuperior',180=>'acute',181=>'mu',182=>'paragraph',183=>'periodcentered',184=>'cedilla',185=>'onesuperior',186=>'ordmasculine',187=>'guillemotright',188=>'onequarter',189=>'onehalf',190=>'threequarters',191=>'questiondown',192=>'Agrave',193=>'Aacute',194=>'Acircumflex',195=>'Atilde',196=>'Adieresis',197=>'Aring',198=>'AE',199=>'Ccedilla',200=>'Egrave',201=>'Eacute',202=>'Ecircumflex',203=>'Edieresis',204=>'Igrave',205=>'Iacute',206=>'Icircumflex',207=>'Idieresis',208=>'Gbreve',209=>'Ntilde',210=>'Ograve',211=>'Oacute',212=>'Ocircumflex',213=>'Otilde',214=>'Odieresis',215=>'multiply',216=>'Oslash',217=>'Ugrave',218=>'Uacute',219=>'Ucircumflex',220=>'Udieresis',221=>'Idotaccent',222=>'Scedilla',223=>'germandbls',224=>'agrave',225=>'aacute',226=>'acircumflex',227=>'atilde',228=>'adieresis',229=>'aring',230=>'ae',231=>'ccedilla',232=>'egrave',233=>'eacute',234=>'ecircumflex',235=>'edieresis',236=>'igrave',237=>'iacute',238=>'icircumflex',239=>'idieresis',240=>'gbreve',241=>'ntilde',242=>'ograve',243=>'oacute',244=>'ocircumflex',245=>'otilde',246=>'odieresis',247=>'divide',248=>'oslash',249=>'ugrave',250=>'uacute',251=>'ucircumflex',252=>'udieresis',253=>'dotlessi',254=>'scedilla',255=>'ydieresis'),
-
-// encoding map for: cp1255
-'cp1255' => array(0=>'.notdef',1=>'.notdef',2=>'.notdef',3=>'.notdef',4=>'.notdef',5=>'.notdef',6=>'.notdef',7=>'.notdef',8=>'.notdef',9=>'.notdef',10=>'.notdef',11=>'.notdef',12=>'.notdef',13=>'.notdef',14=>'.notdef',15=>'.notdef',16=>'.notdef',17=>'.notdef',18=>'.notdef',19=>'.notdef',20=>'.notdef',21=>'.notdef',22=>'.notdef',23=>'.notdef',24=>'.notdef',25=>'.notdef',26=>'.notdef',27=>'.notdef',28=>'.notdef',29=>'.notdef',30=>'.notdef',31=>'.notdef',32=>'space',33=>'exclam',34=>'quotedbl',35=>'numbersign',36=>'dollar',37=>'percent',38=>'ampersand',39=>'quotesingle',40=>'parenleft',41=>'parenright',42=>'asterisk',43=>'plus',44=>'comma',45=>'hyphen',46=>'period',47=>'slash',48=>'zero',49=>'one',50=>'two',51=>'three',52=>'four',53=>'five',54=>'six',55=>'seven',56=>'eight',57=>'nine',58=>'colon',59=>'semicolon',60=>'less',61=>'equal',62=>'greater',63=>'question',64=>'at',65=>'A',66=>'B',67=>'C',68=>'D',69=>'E',70=>'F',71=>'G',72=>'H',73=>'I',74=>'J',75=>'K',76=>'L',77=>'M',78=>'N',79=>'O',80=>'P',81=>'Q',82=>'R',83=>'S',84=>'T',85=>'U',86=>'V',87=>'W',88=>'X',89=>'Y',90=>'Z',91=>'bracketleft',92=>'backslash',93=>'bracketright',94=>'asciicircum',95=>'underscore',96=>'grave',97=>'a',98=>'b',99=>'c',100=>'d',101=>'e',102=>'f',103=>'g',104=>'h',105=>'i',106=>'j',107=>'k',108=>'l',109=>'m',110=>'n',111=>'o',112=>'p',113=>'q',114=>'r',115=>'s',116=>'t',117=>'u',118=>'v',119=>'w',120=>'x',121=>'y',122=>'z',123=>'braceleft',124=>'bar',125=>'braceright',126=>'asciitilde',127=>'.notdef',128=>'Euro',129=>'.notdef',130=>'quotesinglbase',131=>'florin',132=>'quotedblbase',133=>'ellipsis',134=>'dagger',135=>'daggerdbl',136=>'circumflex',137=>'perthousand',138=>'.notdef',139=>'guilsinglleft',140=>'.notdef',141=>'.notdef',142=>'.notdef',143=>'.notdef',144=>'.notdef',145=>'quoteleft',146=>'quoteright',147=>'quotedblleft',148=>'quotedblright',149=>'bullet',150=>'endash',151=>'emdash',152=>'tilde',153=>'trademark',154=>'.notdef',155=>'guilsinglright',156=>'.notdef',157=>'.notdef',158=>'.notdef',159=>'.notdef',160=>'space',161=>'exclamdown',162=>'cent',163=>'sterling',164=>'afii57636',165=>'yen',166=>'brokenbar',167=>'section',168=>'dieresis',169=>'copyright',170=>'multiply',171=>'guillemotleft',172=>'logicalnot',173=>'sfthyphen',174=>'registered',175=>'macron',176=>'degree',177=>'plusminus',178=>'twosuperior',179=>'threesuperior',180=>'acute',181=>'mu',182=>'paragraph',183=>'middot',184=>'cedilla',185=>'onesuperior',186=>'divide',187=>'guillemotright',188=>'onequarter',189=>'onehalf',190=>'threequarters',191=>'questiondown',192=>'afii57799',193=>'afii57801',194=>'afii57800',195=>'afii57802',196=>'afii57793',197=>'afii57794',198=>'afii57795',199=>'afii57798',200=>'afii57797',201=>'afii57806',202=>'.notdef',203=>'afii57796',204=>'afii57807',205=>'afii57839',206=>'afii57645',207=>'afii57841',208=>'afii57842',209=>'afii57804',210=>'afii57803',211=>'afii57658',212=>'afii57716',213=>'afii57717',214=>'afii57718',215=>'gereshhebrew',216=>'gershayimhebrew',217=>'.notdef',218=>'.notdef',219=>'.notdef',220=>'.notdef',221=>'.notdef',222=>'.notdef',223=>'.notdef',224=>'afii57664',225=>'afii57665',226=>'afii57666',227=>'afii57667',228=>'afii57668',229=>'afii57669',230=>'afii57670',231=>'afii57671',232=>'afii57672',233=>'afii57673',234=>'afii57674',235=>'afii57675',236=>'afii57676',237=>'afii57677',238=>'afii57678',239=>'afii57679',240=>'afii57680',241=>'afii57681',242=>'afii57682',243=>'afii57683',244=>'afii57684',245=>'afii57685',246=>'afii57686',247=>'afii57687',248=>'afii57688',249=>'afii57689',250=>'afii57690',251=>'.notdef',252=>'.notdef',253=>'afii299',254=>'afii300',255=>'.notdef'),
-
-// encoding map for: cp1256
-'cp1256' => array(0=>'.notdef',1=>'.notdef',2=>'.notdef',3=>'.notdef',4=>'.notdef',5=>'.notdef',6=>'.notdef',7=>'.notdef',8=>'.notdef',9=>'.notdef',10=>'.notdef',11=>'.notdef',12=>'.notdef',13=>'.notdef',14=>'.notdef',15=>'.notdef',16=>'.notdef',17=>'.notdef',18=>'.notdef',19=>'.notdef',20=>'.notdef',21=>'.notdef',22=>'.notdef',23=>'.notdef',24=>'.notdef',25=>'.notdef',26=>'.notdef',27=>'.notdef',28=>'.notdef',29=>'.notdef',30=>'.notdef',31=>'.notdef',32=>'space',33=>'exclam',34=>'quotedbl',35=>'numbersign',36=>'dollar',37=>'percent',38=>'ampersand',39=>'quotesingle',40=>'parenleft',41=>'parenright',42=>'asterisk',43=>'plus',44=>'comma',45=>'hyphen',46=>'period',47=>'slash',48=>'zero',49=>'one',50=>'two',51=>'three',52=>'four',53=>'five',54=>'six',55=>'seven',56=>'eight',57=>'nine',58=>'colon',59=>'semicolon',60=>'less',61=>'equal',62=>'greater',63=>'question',64=>'at',65=>'A',66=>'B',67=>'C',68=>'D',69=>'E',70=>'F',71=>'G',72=>'H',73=>'I',74=>'J',75=>'K',76=>'L',77=>'M',78=>'N',79=>'O',80=>'P',81=>'Q',82=>'R',83=>'S',84=>'T',85=>'U',86=>'V',87=>'W',88=>'X',89=>'Y',90=>'Z',91=>'bracketleft',92=>'backslash',93=>'bracketright',94=>'asciicircum',95=>'underscore',96=>'grave',97=>'a',98=>'b',99=>'c',100=>'d',101=>'e',102=>'f',103=>'g',104=>'h',105=>'i',106=>'j',107=>'k',108=>'l',109=>'m',110=>'n',111=>'o',112=>'p',113=>'q',114=>'r',115=>'s',116=>'t',117=>'u',118=>'v',119=>'w',120=>'x',121=>'y',122=>'z',123=>'braceleft',124=>'bar',125=>'braceright',126=>'asciitilde',127=>'.notdef',128=>'Euro',129=>'afii57506',130=>'quotesinglbase',131=>'florin',132=>'quotedblbase',133=>'ellipsis',134=>'dagger',135=>'daggerdbl',136=>'circumflex',137=>'perthousand',138=>'afii57511',139=>'guilsinglleft',140=>'OE',141=>'afii57507',142=>'afii57508',143=>'afii57512',144=>'afii57509',145=>'quoteleft',146=>'quoteright',147=>'quotedblleft',148=>'quotedblright',149=>'bullet',150=>'endash',151=>'emdash',152=>'.notdef',153=>'trademark',154=>'afii57513',155=>'guilsinglright',156=>'oe',157=>'afii61664',158=>'afii301',159=>'afii57514',160=>'space',161=>'afii57388',162=>'cent',163=>'sterling',164=>'currency',165=>'yen',166=>'brokenbar',167=>'section',168=>'dieresis',169=>'copyright',170=>'.notdef',171=>'guillemotleft',172=>'logicalnot',173=>'hyphen',174=>'registered',175=>'macron',176=>'degree',177=>'plusminus',178=>'twosuperior',179=>'threesuperior',180=>'acute',181=>'mu',182=>'paragraph',183=>'periodcentered',184=>'cedilla',185=>'onesuperior',186=>'afii57403',187=>'guillemotright',188=>'onequarter',189=>'onehalf',190=>'threequarters',191=>'afii57407',192=>'.notdef',193=>'afii57409',194=>'afii57410',195=>'afii57411',196=>'afii57412',197=>'afii57413',198=>'afii57414',199=>'afii57415',200=>'afii57416',201=>'afii57417',202=>'afii57418',203=>'afii57419',204=>'afii57420',205=>'afii57421',206=>'afii57422',207=>'afii57423',208=>'afii57424',209=>'afii57425',210=>'afii57426',211=>'afii57427',212=>'afii57428',213=>'afii57429',214=>'afii57430',215=>'multiply',216=>'afii57431',217=>'afii57432',218=>'afii57433',219=>'afii57434',220=>'afii57440',221=>'afii57441',222=>'afii57442',223=>'afii57443',224=>'agrave',225=>'afii57444',226=>'acircumflex',227=>'afii57445',228=>'afii57446',229=>'afii57470',230=>'afii57448',231=>'ccedilla',232=>'egrave',233=>'eacute',234=>'ecircumflex',235=>'edieresis',236=>'afii57449',237=>'afii57450',238=>'icircumflex',239=>'idieresis',240=>'afii57451',241=>'afii57452',242=>'afii57453',243=>'afii57454',244=>'ocircumflex',245=>'afii57455',246=>'afii57456',247=>'divide',248=>'afii57457',249=>'ugrave',250=>'afii57458',251=>'ucircumflex',252=>'udieresis',253=>'afii299',254=>'afii300',255=>'afii57519'),
-
-// encoding map for: cp1257
-'cp1257' => array(0=>'.notdef',1=>'.notdef',2=>'.notdef',3=>'.notdef',4=>'.notdef',5=>'.notdef',6=>'.notdef',7=>'.notdef',8=>'.notdef',9=>'.notdef',10=>'.notdef',11=>'.notdef',12=>'.notdef',13=>'.notdef',14=>'.notdef',15=>'.notdef',16=>'.notdef',17=>'.notdef',18=>'.notdef',19=>'.notdef',20=>'.notdef',21=>'.notdef',22=>'.notdef',23=>'.notdef',24=>'.notdef',25=>'.notdef',26=>'.notdef',27=>'.notdef',28=>'.notdef',29=>'.notdef',30=>'.notdef',31=>'.notdef',32=>'space',33=>'exclam',34=>'quotedbl',35=>'numbersign',36=>'dollar',37=>'percent',38=>'ampersand',39=>'quotesingle',40=>'parenleft',41=>'parenright',42=>'asterisk',43=>'plus',44=>'comma',45=>'hyphen',46=>'period',47=>'slash',48=>'zero',49=>'one',50=>'two',51=>'three',52=>'four',53=>'five',54=>'six',55=>'seven',56=>'eight',57=>'nine',58=>'colon',59=>'semicolon',60=>'less',61=>'equal',62=>'greater',63=>'question',64=>'at',65=>'A',66=>'B',67=>'C',68=>'D',69=>'E',70=>'F',71=>'G',72=>'H',73=>'I',74=>'J',75=>'K',76=>'L',77=>'M',78=>'N',79=>'O',80=>'P',81=>'Q',82=>'R',83=>'S',84=>'T',85=>'U',86=>'V',87=>'W',88=>'X',89=>'Y',90=>'Z',91=>'bracketleft',92=>'backslash',93=>'bracketright',94=>'asciicircum',95=>'underscore',96=>'grave',97=>'a',98=>'b',99=>'c',100=>'d',101=>'e',102=>'f',103=>'g',104=>'h',105=>'i',106=>'j',107=>'k',108=>'l',109=>'m',110=>'n',111=>'o',112=>'p',113=>'q',114=>'r',115=>'s',116=>'t',117=>'u',118=>'v',119=>'w',120=>'x',121=>'y',122=>'z',123=>'braceleft',124=>'bar',125=>'braceright',126=>'asciitilde',127=>'.notdef',128=>'Euro',129=>'.notdef',130=>'quotesinglbase',131=>'.notdef',132=>'quotedblbase',133=>'ellipsis',134=>'dagger',135=>'daggerdbl',136=>'.notdef',137=>'perthousand',138=>'.notdef',139=>'guilsinglleft',140=>'.notdef',141=>'dieresis',142=>'caron',143=>'cedilla',144=>'.notdef',145=>'quoteleft',146=>'quoteright',147=>'quotedblleft',148=>'quotedblright',149=>'bullet',150=>'endash',151=>'emdash',152=>'.notdef',153=>'trademark',154=>'.notdef',155=>'guilsinglright',156=>'.notdef',157=>'macron',158=>'ogonek',159=>'.notdef',160=>'space',161=>'.notdef',162=>'cent',163=>'sterling',164=>'currency',165=>'.notdef',166=>'brokenbar',167=>'section',168=>'Oslash',169=>'copyright',170=>'Rcommaaccent',171=>'guillemotleft',172=>'logicalnot',173=>'hyphen',174=>'registered',175=>'AE',176=>'degree',177=>'plusminus',178=>'twosuperior',179=>'threesuperior',180=>'acute',181=>'mu',182=>'paragraph',183=>'periodcentered',184=>'oslash',185=>'onesuperior',186=>'rcommaaccent',187=>'guillemotright',188=>'onequarter',189=>'onehalf',190=>'threequarters',191=>'ae',192=>'Aogonek',193=>'Iogonek',194=>'Amacron',195=>'Cacute',196=>'Adieresis',197=>'Aring',198=>'Eogonek',199=>'Emacron',200=>'Ccaron',201=>'Eacute',202=>'Zacute',203=>'Edotaccent',204=>'Gcommaaccent',205=>'Kcommaaccent',206=>'Imacron',207=>'Lcommaaccent',208=>'Scaron',209=>'Nacute',210=>'Ncommaaccent',211=>'Oacute',212=>'Omacron',213=>'Otilde',214=>'Odieresis',215=>'multiply',216=>'Uogonek',217=>'Lslash',218=>'Sacute',219=>'Umacron',220=>'Udieresis',221=>'Zdotaccent',222=>'Zcaron',223=>'germandbls',224=>'aogonek',225=>'iogonek',226=>'amacron',227=>'cacute',228=>'adieresis',229=>'aring',230=>'eogonek',231=>'emacron',232=>'ccaron',233=>'eacute',234=>'zacute',235=>'edotaccent',236=>'gcommaaccent',237=>'kcommaaccent',238=>'imacron',239=>'lcommaaccent',240=>'scaron',241=>'nacute',242=>'ncommaaccent',243=>'oacute',244=>'omacron',245=>'otilde',246=>'odieresis',247=>'divide',248=>'uogonek',249=>'lslash',250=>'sacute',251=>'umacron',252=>'udieresis',253=>'zdotaccent',254=>'zcaron',255=>'dotaccent'),
-
-// encoding map for: cp1258
-'cp1258' => array(0=>'.notdef',1=>'.notdef',2=>'.notdef',3=>'.notdef',4=>'.notdef',5=>'.notdef',6=>'.notdef',7=>'.notdef',8=>'.notdef',9=>'.notdef',10=>'.notdef',11=>'.notdef',12=>'.notdef',13=>'.notdef',14=>'.notdef',15=>'.notdef',16=>'.notdef',17=>'.notdef',18=>'.notdef',19=>'.notdef',20=>'.notdef',21=>'.notdef',22=>'.notdef',23=>'.notdef',24=>'.notdef',25=>'.notdef',26=>'.notdef',27=>'.notdef',28=>'.notdef',29=>'.notdef',30=>'.notdef',31=>'.notdef',32=>'space',33=>'exclam',34=>'quotedbl',35=>'numbersign',36=>'dollar',37=>'percent',38=>'ampersand',39=>'quotesingle',40=>'parenleft',41=>'parenright',42=>'asterisk',43=>'plus',44=>'comma',45=>'hyphen',46=>'period',47=>'slash',48=>'zero',49=>'one',50=>'two',51=>'three',52=>'four',53=>'five',54=>'six',55=>'seven',56=>'eight',57=>'nine',58=>'colon',59=>'semicolon',60=>'less',61=>'equal',62=>'greater',63=>'question',64=>'at',65=>'A',66=>'B',67=>'C',68=>'D',69=>'E',70=>'F',71=>'G',72=>'H',73=>'I',74=>'J',75=>'K',76=>'L',77=>'M',78=>'N',79=>'O',80=>'P',81=>'Q',82=>'R',83=>'S',84=>'T',85=>'U',86=>'V',87=>'W',88=>'X',89=>'Y',90=>'Z',91=>'bracketleft',92=>'backslash',93=>'bracketright',94=>'asciicircum',95=>'underscore',96=>'grave',97=>'a',98=>'b',99=>'c',100=>'d',101=>'e',102=>'f',103=>'g',104=>'h',105=>'i',106=>'j',107=>'k',108=>'l',109=>'m',110=>'n',111=>'o',112=>'p',113=>'q',114=>'r',115=>'s',116=>'t',117=>'u',118=>'v',119=>'w',120=>'x',121=>'y',122=>'z',123=>'braceleft',124=>'bar',125=>'braceright',126=>'asciitilde',127=>'.notdef',128=>'Euro',129=>'.notdef',130=>'quotesinglbase',131=>'florin',132=>'quotedblbase',133=>'ellipsis',134=>'dagger',135=>'daggerdbl',136=>'circumflex',137=>'perthousand',138=>'.notdef',139=>'guilsinglleft',140=>'OE',141=>'.notdef',142=>'.notdef',143=>'.notdef',144=>'.notdef',145=>'quoteleft',146=>'quoteright',147=>'quotedblleft',148=>'quotedblright',149=>'bullet',150=>'endash',151=>'emdash',152=>'tilde',153=>'trademark',154=>'.notdef',155=>'guilsinglright',156=>'oe',157=>'.notdef',158=>'.notdef',159=>'Ydieresis',160=>'space',161=>'exclamdown',162=>'cent',163=>'sterling',164=>'currency',165=>'yen',166=>'brokenbar',167=>'section',168=>'dieresis',169=>'copyright',170=>'ordfeminine',171=>'guillemotleft',172=>'logicalnot',173=>'hyphen',174=>'registered',175=>'macron',176=>'degree',177=>'plusminus',178=>'twosuperior',179=>'threesuperior',180=>'acute',181=>'mu',182=>'paragraph',183=>'periodcentered',184=>'cedilla',185=>'onesuperior',186=>'ordmasculine',187=>'guillemotright',188=>'onequarter',189=>'onehalf',190=>'threequarters',191=>'questiondown',192=>'Agrave',193=>'Aacute',194=>'Acircumflex',195=>'Abreve',196=>'Adieresis',197=>'Aring',198=>'AE',199=>'Ccedilla',200=>'Egrave',201=>'Eacute',202=>'Ecircumflex',203=>'Edieresis',204=>'gravecomb',205=>'Iacute',206=>'Icircumflex',207=>'Idieresis',208=>'Dcroat',209=>'Ntilde',210=>'hookabovecomb',211=>'Oacute',212=>'Ocircumflex',213=>'Ohorn',214=>'Odieresis',215=>'multiply',216=>'Oslash',217=>'Ugrave',218=>'Uacute',219=>'Ucircumflex',220=>'Udieresis',221=>'Uhorn',222=>'tildecomb',223=>'germandbls',224=>'agrave',225=>'aacute',226=>'acircumflex',227=>'abreve',228=>'adieresis',229=>'aring',230=>'ae',231=>'ccedilla',232=>'egrave',233=>'eacute',234=>'ecircumflex',235=>'edieresis',236=>'acutecomb',237=>'iacute',238=>'icircumflex',239=>'idieresis',240=>'dcroat',241=>'ntilde',242=>'dotbelowcomb',243=>'oacute',244=>'ocircumflex',245=>'ohorn',246=>'odieresis',247=>'divide',248=>'oslash',249=>'ugrave',250=>'uacute',251=>'ucircumflex',252=>'udieresis',253=>'uhorn',254=>'dong',255=>'ydieresis'),
-
-// encoding map for: iso-8859-1
-'iso-8859-1' => array(0=>'.notdef',1=>'.notdef',2=>'.notdef',3=>'.notdef',4=>'.notdef',5=>'.notdef',6=>'.notdef',7=>'.notdef',8=>'.notdef',9=>'.notdef',10=>'.notdef',11=>'.notdef',12=>'.notdef',13=>'.notdef',14=>'.notdef',15=>'.notdef',16=>'.notdef',17=>'.notdef',18=>'.notdef',19=>'.notdef',20=>'.notdef',21=>'.notdef',22=>'.notdef',23=>'.notdef',24=>'.notdef',25=>'.notdef',26=>'.notdef',27=>'.notdef',28=>'.notdef',29=>'.notdef',30=>'.notdef',31=>'.notdef',32=>'space',33=>'exclam',34=>'quotedbl',35=>'numbersign',36=>'dollar',37=>'percent',38=>'ampersand',39=>'quotesingle',40=>'parenleft',41=>'parenright',42=>'asterisk',43=>'plus',44=>'comma',45=>'hyphen',46=>'period',47=>'slash',48=>'zero',49=>'one',50=>'two',51=>'three',52=>'four',53=>'five',54=>'six',55=>'seven',56=>'eight',57=>'nine',58=>'colon',59=>'semicolon',60=>'less',61=>'equal',62=>'greater',63=>'question',64=>'at',65=>'A',66=>'B',67=>'C',68=>'D',69=>'E',70=>'F',71=>'G',72=>'H',73=>'I',74=>'J',75=>'K',76=>'L',77=>'M',78=>'N',79=>'O',80=>'P',81=>'Q',82=>'R',83=>'S',84=>'T',85=>'U',86=>'V',87=>'W',88=>'X',89=>'Y',90=>'Z',91=>'bracketleft',92=>'backslash',93=>'bracketright',94=>'asciicircum',95=>'underscore',96=>'grave',97=>'a',98=>'b',99=>'c',100=>'d',101=>'e',102=>'f',103=>'g',104=>'h',105=>'i',106=>'j',107=>'k',108=>'l',109=>'m',110=>'n',111=>'o',112=>'p',113=>'q',114=>'r',115=>'s',116=>'t',117=>'u',118=>'v',119=>'w',120=>'x',121=>'y',122=>'z',123=>'braceleft',124=>'bar',125=>'braceright',126=>'asciitilde',127=>'.notdef',128=>'.notdef',129=>'.notdef',130=>'.notdef',131=>'.notdef',132=>'.notdef',133=>'.notdef',134=>'.notdef',135=>'.notdef',136=>'.notdef',137=>'.notdef',138=>'.notdef',139=>'.notdef',140=>'.notdef',141=>'.notdef',142=>'.notdef',143=>'.notdef',144=>'.notdef',145=>'.notdef',146=>'.notdef',147=>'.notdef',148=>'.notdef',149=>'.notdef',150=>'.notdef',151=>'.notdef',152=>'.notdef',153=>'.notdef',154=>'.notdef',155=>'.notdef',156=>'.notdef',157=>'.notdef',158=>'.notdef',159=>'.notdef',160=>'space',161=>'exclamdown',162=>'cent',163=>'sterling',164=>'currency',165=>'yen',166=>'brokenbar',167=>'section',168=>'dieresis',169=>'copyright',170=>'ordfeminine',171=>'guillemotleft',172=>'logicalnot',173=>'hyphen',174=>'registered',175=>'macron',176=>'degree',177=>'plusminus',178=>'twosuperior',179=>'threesuperior',180=>'acute',181=>'mu',182=>'paragraph',183=>'periodcentered',184=>'cedilla',185=>'onesuperior',186=>'ordmasculine',187=>'guillemotright',188=>'onequarter',189=>'onehalf',190=>'threequarters',191=>'questiondown',192=>'Agrave',193=>'Aacute',194=>'Acircumflex',195=>'Atilde',196=>'Adieresis',197=>'Aring',198=>'AE',199=>'Ccedilla',200=>'Egrave',201=>'Eacute',202=>'Ecircumflex',203=>'Edieresis',204=>'Igrave',205=>'Iacute',206=>'Icircumflex',207=>'Idieresis',208=>'Eth',209=>'Ntilde',210=>'Ograve',211=>'Oacute',212=>'Ocircumflex',213=>'Otilde',214=>'Odieresis',215=>'multiply',216=>'Oslash',217=>'Ugrave',218=>'Uacute',219=>'Ucircumflex',220=>'Udieresis',221=>'Yacute',222=>'Thorn',223=>'germandbls',224=>'agrave',225=>'aacute',226=>'acircumflex',227=>'atilde',228=>'adieresis',229=>'aring',230=>'ae',231=>'ccedilla',232=>'egrave',233=>'eacute',234=>'ecircumflex',235=>'edieresis',236=>'igrave',237=>'iacute',238=>'icircumflex',239=>'idieresis',240=>'eth',241=>'ntilde',242=>'ograve',243=>'oacute',244=>'ocircumflex',245=>'otilde',246=>'odieresis',247=>'divide',248=>'oslash',249=>'ugrave',250=>'uacute',251=>'ucircumflex',252=>'udieresis',253=>'yacute',254=>'thorn',255=>'ydieresis'),
-
-// encoding map for: iso-8859-2
-'iso-8859-2' => array(0=>'.notdef',1=>'.notdef',2=>'.notdef',3=>'.notdef',4=>'.notdef',5=>'.notdef',6=>'.notdef',7=>'.notdef',8=>'.notdef',9=>'.notdef',10=>'.notdef',11=>'.notdef',12=>'.notdef',13=>'.notdef',14=>'.notdef',15=>'.notdef',16=>'.notdef',17=>'.notdef',18=>'.notdef',19=>'.notdef',20=>'.notdef',21=>'.notdef',22=>'.notdef',23=>'.notdef',24=>'.notdef',25=>'.notdef',26=>'.notdef',27=>'.notdef',28=>'.notdef',29=>'.notdef',30=>'.notdef',31=>'.notdef',32=>'space',33=>'exclam',34=>'quotedbl',35=>'numbersign',36=>'dollar',37=>'percent',38=>'ampersand',39=>'quotesingle',40=>'parenleft',41=>'parenright',42=>'asterisk',43=>'plus',44=>'comma',45=>'hyphen',46=>'period',47=>'slash',48=>'zero',49=>'one',50=>'two',51=>'three',52=>'four',53=>'five',54=>'six',55=>'seven',56=>'eight',57=>'nine',58=>'colon',59=>'semicolon',60=>'less',61=>'equal',62=>'greater',63=>'question',64=>'at',65=>'A',66=>'B',67=>'C',68=>'D',69=>'E',70=>'F',71=>'G',72=>'H',73=>'I',74=>'J',75=>'K',76=>'L',77=>'M',78=>'N',79=>'O',80=>'P',81=>'Q',82=>'R',83=>'S',84=>'T',85=>'U',86=>'V',87=>'W',88=>'X',89=>'Y',90=>'Z',91=>'bracketleft',92=>'backslash',93=>'bracketright',94=>'asciicircum',95=>'underscore',96=>'grave',97=>'a',98=>'b',99=>'c',100=>'d',101=>'e',102=>'f',103=>'g',104=>'h',105=>'i',106=>'j',107=>'k',108=>'l',109=>'m',110=>'n',111=>'o',112=>'p',113=>'q',114=>'r',115=>'s',116=>'t',117=>'u',118=>'v',119=>'w',120=>'x',121=>'y',122=>'z',123=>'braceleft',124=>'bar',125=>'braceright',126=>'asciitilde',127=>'.notdef',128=>'.notdef',129=>'.notdef',130=>'.notdef',131=>'.notdef',132=>'.notdef',133=>'.notdef',134=>'.notdef',135=>'.notdef',136=>'.notdef',137=>'.notdef',138=>'.notdef',139=>'.notdef',140=>'.notdef',141=>'.notdef',142=>'.notdef',143=>'.notdef',144=>'.notdef',145=>'.notdef',146=>'.notdef',147=>'.notdef',148=>'.notdef',149=>'.notdef',150=>'.notdef',151=>'.notdef',152=>'.notdef',153=>'.notdef',154=>'.notdef',155=>'.notdef',156=>'.notdef',157=>'.notdef',158=>'.notdef',159=>'.notdef',160=>'space',161=>'Aogonek',162=>'breve',163=>'Lslash',164=>'currency',165=>'Lcaron',166=>'Sacute',167=>'section',168=>'dieresis',169=>'Scaron',170=>'Scedilla',171=>'Tcaron',172=>'Zacute',173=>'hyphen',174=>'Zcaron',175=>'Zdotaccent',176=>'degree',177=>'aogonek',178=>'ogonek',179=>'lslash',180=>'acute',181=>'lcaron',182=>'sacute',183=>'caron',184=>'cedilla',185=>'scaron',186=>'scedilla',187=>'tcaron',188=>'zacute',189=>'hungarumlaut',190=>'zcaron',191=>'zdotaccent',192=>'Racute',193=>'Aacute',194=>'Acircumflex',195=>'Abreve',196=>'Adieresis',197=>'Lacute',198=>'Cacute',199=>'Ccedilla',200=>'Ccaron',201=>'Eacute',202=>'Eogonek',203=>'Edieresis',204=>'Ecaron',205=>'Iacute',206=>'Icircumflex',207=>'Dcaron',208=>'Dcroat',209=>'Nacute',210=>'Ncaron',211=>'Oacute',212=>'Ocircumflex',213=>'Ohungarumlaut',214=>'Odieresis',215=>'multiply',216=>'Rcaron',217=>'Uring',218=>'Uacute',219=>'Uhungarumlaut',220=>'Udieresis',221=>'Yacute',222=>'Tcommaaccent',223=>'germandbls',224=>'racute',225=>'aacute',226=>'acircumflex',227=>'abreve',228=>'adieresis',229=>'lacute',230=>'cacute',231=>'ccedilla',232=>'ccaron',233=>'eacute',234=>'eogonek',235=>'edieresis',236=>'ecaron',237=>'iacute',238=>'icircumflex',239=>'dcaron',240=>'dcroat',241=>'nacute',242=>'ncaron',243=>'oacute',244=>'ocircumflex',245=>'ohungarumlaut',246=>'odieresis',247=>'divide',248=>'rcaron',249=>'uring',250=>'uacute',251=>'uhungarumlaut',252=>'udieresis',253=>'yacute',254=>'tcommaaccent',255=>'dotaccent'),
-
-// encoding map for: iso-8859-4
-'iso-8859-4' => array(0=>'.notdef',1=>'.notdef',2=>'.notdef',3=>'.notdef',4=>'.notdef',5=>'.notdef',6=>'.notdef',7=>'.notdef',8=>'.notdef',9=>'.notdef',10=>'.notdef',11=>'.notdef',12=>'.notdef',13=>'.notdef',14=>'.notdef',15=>'.notdef',16=>'.notdef',17=>'.notdef',18=>'.notdef',19=>'.notdef',20=>'.notdef',21=>'.notdef',22=>'.notdef',23=>'.notdef',24=>'.notdef',25=>'.notdef',26=>'.notdef',27=>'.notdef',28=>'.notdef',29=>'.notdef',30=>'.notdef',31=>'.notdef',32=>'space',33=>'exclam',34=>'quotedbl',35=>'numbersign',36=>'dollar',37=>'percent',38=>'ampersand',39=>'quotesingle',40=>'parenleft',41=>'parenright',42=>'asterisk',43=>'plus',44=>'comma',45=>'hyphen',46=>'period',47=>'slash',48=>'zero',49=>'one',50=>'two',51=>'three',52=>'four',53=>'five',54=>'six',55=>'seven',56=>'eight',57=>'nine',58=>'colon',59=>'semicolon',60=>'less',61=>'equal',62=>'greater',63=>'question',64=>'at',65=>'A',66=>'B',67=>'C',68=>'D',69=>'E',70=>'F',71=>'G',72=>'H',73=>'I',74=>'J',75=>'K',76=>'L',77=>'M',78=>'N',79=>'O',80=>'P',81=>'Q',82=>'R',83=>'S',84=>'T',85=>'U',86=>'V',87=>'W',88=>'X',89=>'Y',90=>'Z',91=>'bracketleft',92=>'backslash',93=>'bracketright',94=>'asciicircum',95=>'underscore',96=>'grave',97=>'a',98=>'b',99=>'c',100=>'d',101=>'e',102=>'f',103=>'g',104=>'h',105=>'i',106=>'j',107=>'k',108=>'l',109=>'m',110=>'n',111=>'o',112=>'p',113=>'q',114=>'r',115=>'s',116=>'t',117=>'u',118=>'v',119=>'w',120=>'x',121=>'y',122=>'z',123=>'braceleft',124=>'bar',125=>'braceright',126=>'asciitilde',127=>'.notdef',128=>'.notdef',129=>'.notdef',130=>'.notdef',131=>'.notdef',132=>'.notdef',133=>'.notdef',134=>'.notdef',135=>'.notdef',136=>'.notdef',137=>'.notdef',138=>'.notdef',139=>'.notdef',140=>'.notdef',141=>'.notdef',142=>'.notdef',143=>'.notdef',144=>'.notdef',145=>'.notdef',146=>'.notdef',147=>'.notdef',148=>'.notdef',149=>'.notdef',150=>'.notdef',151=>'.notdef',152=>'.notdef',153=>'.notdef',154=>'.notdef',155=>'.notdef',156=>'.notdef',157=>'.notdef',158=>'.notdef',159=>'.notdef',160=>'space',161=>'Aogonek',162=>'kgreenlandic',163=>'Rcommaaccent',164=>'currency',165=>'Itilde',166=>'Lcommaaccent',167=>'section',168=>'dieresis',169=>'Scaron',170=>'Emacron',171=>'Gcommaaccent',172=>'Tbar',173=>'hyphen',174=>'Zcaron',175=>'macron',176=>'degree',177=>'aogonek',178=>'ogonek',179=>'rcommaaccent',180=>'acute',181=>'itilde',182=>'lcommaaccent',183=>'caron',184=>'cedilla',185=>'scaron',186=>'emacron',187=>'gcommaaccent',188=>'tbar',189=>'Eng',190=>'zcaron',191=>'eng',192=>'Amacron',193=>'Aacute',194=>'Acircumflex',195=>'Atilde',196=>'Adieresis',197=>'Aring',198=>'AE',199=>'Iogonek',200=>'Ccaron',201=>'Eacute',202=>'Eogonek',203=>'Edieresis',204=>'Edotaccent',205=>'Iacute',206=>'Icircumflex',207=>'Imacron',208=>'Dcroat',209=>'Ncommaaccent',210=>'Omacron',211=>'Kcommaaccent',212=>'Ocircumflex',213=>'Otilde',214=>'Odieresis',215=>'multiply',216=>'Oslash',217=>'Uogonek',218=>'Uacute',219=>'Ucircumflex',220=>'Udieresis',221=>'Utilde',222=>'Umacron',223=>'germandbls',224=>'amacron',225=>'aacute',226=>'acircumflex',227=>'atilde',228=>'adieresis',229=>'aring',230=>'ae',231=>'iogonek',232=>'ccaron',233=>'eacute',234=>'eogonek',235=>'edieresis',236=>'edotaccent',237=>'iacute',238=>'icircumflex',239=>'imacron',240=>'dcroat',241=>'ncommaaccent',242=>'omacron',243=>'kcommaaccent',244=>'ocircumflex',245=>'otilde',246=>'odieresis',247=>'divide',248=>'oslash',249=>'uogonek',250=>'uacute',251=>'ucircumflex',252=>'udieresis',253=>'utilde',254=>'umacron',255=>'dotaccent'),
-
-// encoding map for: iso-8859-5
-'iso-8859-5' => array(0=>'.notdef',1=>'.notdef',2=>'.notdef',3=>'.notdef',4=>'.notdef',5=>'.notdef',6=>'.notdef',7=>'.notdef',8=>'.notdef',9=>'.notdef',10=>'.notdef',11=>'.notdef',12=>'.notdef',13=>'.notdef',14=>'.notdef',15=>'.notdef',16=>'.notdef',17=>'.notdef',18=>'.notdef',19=>'.notdef',20=>'.notdef',21=>'.notdef',22=>'.notdef',23=>'.notdef',24=>'.notdef',25=>'.notdef',26=>'.notdef',27=>'.notdef',28=>'.notdef',29=>'.notdef',30=>'.notdef',31=>'.notdef',32=>'space',33=>'exclam',34=>'quotedbl',35=>'numbersign',36=>'dollar',37=>'percent',38=>'ampersand',39=>'quotesingle',40=>'parenleft',41=>'parenright',42=>'asterisk',43=>'plus',44=>'comma',45=>'hyphen',46=>'period',47=>'slash',48=>'zero',49=>'one',50=>'two',51=>'three',52=>'four',53=>'five',54=>'six',55=>'seven',56=>'eight',57=>'nine',58=>'colon',59=>'semicolon',60=>'less',61=>'equal',62=>'greater',63=>'question',64=>'at',65=>'A',66=>'B',67=>'C',68=>'D',69=>'E',70=>'F',71=>'G',72=>'H',73=>'I',74=>'J',75=>'K',76=>'L',77=>'M',78=>'N',79=>'O',80=>'P',81=>'Q',82=>'R',83=>'S',84=>'T',85=>'U',86=>'V',87=>'W',88=>'X',89=>'Y',90=>'Z',91=>'bracketleft',92=>'backslash',93=>'bracketright',94=>'asciicircum',95=>'underscore',96=>'grave',97=>'a',98=>'b',99=>'c',100=>'d',101=>'e',102=>'f',103=>'g',104=>'h',105=>'i',106=>'j',107=>'k',108=>'l',109=>'m',110=>'n',111=>'o',112=>'p',113=>'q',114=>'r',115=>'s',116=>'t',117=>'u',118=>'v',119=>'w',120=>'x',121=>'y',122=>'z',123=>'braceleft',124=>'bar',125=>'braceright',126=>'asciitilde',127=>'.notdef',128=>'.notdef',129=>'.notdef',130=>'.notdef',131=>'.notdef',132=>'.notdef',133=>'.notdef',134=>'.notdef',135=>'.notdef',136=>'.notdef',137=>'.notdef',138=>'.notdef',139=>'.notdef',140=>'.notdef',141=>'.notdef',142=>'.notdef',143=>'.notdef',144=>'.notdef',145=>'.notdef',146=>'.notdef',147=>'.notdef',148=>'.notdef',149=>'.notdef',150=>'.notdef',151=>'.notdef',152=>'.notdef',153=>'.notdef',154=>'.notdef',155=>'.notdef',156=>'.notdef',157=>'.notdef',158=>'.notdef',159=>'.notdef',160=>'space',161=>'afii10023',162=>'afii10051',163=>'afii10052',164=>'afii10053',165=>'afii10054',166=>'afii10055',167=>'afii10056',168=>'afii10057',169=>'afii10058',170=>'afii10059',171=>'afii10060',172=>'afii10061',173=>'hyphen',174=>'afii10062',175=>'afii10145',176=>'afii10017',177=>'afii10018',178=>'afii10019',179=>'afii10020',180=>'afii10021',181=>'afii10022',182=>'afii10024',183=>'afii10025',184=>'afii10026',185=>'afii10027',186=>'afii10028',187=>'afii10029',188=>'afii10030',189=>'afii10031',190=>'afii10032',191=>'afii10033',192=>'afii10034',193=>'afii10035',194=>'afii10036',195=>'afii10037',196=>'afii10038',197=>'afii10039',198=>'afii10040',199=>'afii10041',200=>'afii10042',201=>'afii10043',202=>'afii10044',203=>'afii10045',204=>'afii10046',205=>'afii10047',206=>'afii10048',207=>'afii10049',208=>'afii10065',209=>'afii10066',210=>'afii10067',211=>'afii10068',212=>'afii10069',213=>'afii10070',214=>'afii10072',215=>'afii10073',216=>'afii10074',217=>'afii10075',218=>'afii10076',219=>'afii10077',220=>'afii10078',221=>'afii10079',222=>'afii10080',223=>'afii10081',224=>'afii10082',225=>'afii10083',226=>'afii10084',227=>'afii10085',228=>'afii10086',229=>'afii10087',230=>'afii10088',231=>'afii10089',232=>'afii10090',233=>'afii10091',234=>'afii10092',235=>'afii10093',236=>'afii10094',237=>'afii10095',238=>'afii10096',239=>'afii10097',240=>'afii61352',241=>'afii10071',242=>'afii10099',243=>'afii10100',244=>'afii10101',245=>'afii10102',246=>'afii10103',247=>'afii10104',248=>'afii10105',249=>'afii10106',250=>'afii10107',251=>'afii10108',252=>'afii10109',253=>'section',254=>'afii10110',255=>'afii10193'),
-
-// encoding map for: iso-8859-7
-'iso-8859-7' => array(0=>'.notdef',1=>'.notdef',2=>'.notdef',3=>'.notdef',4=>'.notdef',5=>'.notdef',6=>'.notdef',7=>'.notdef',8=>'.notdef',9=>'.notdef',10=>'.notdef',11=>'.notdef',12=>'.notdef',13=>'.notdef',14=>'.notdef',15=>'.notdef',16=>'.notdef',17=>'.notdef',18=>'.notdef',19=>'.notdef',20=>'.notdef',21=>'.notdef',22=>'.notdef',23=>'.notdef',24=>'.notdef',25=>'.notdef',26=>'.notdef',27=>'.notdef',28=>'.notdef',29=>'.notdef',30=>'.notdef',31=>'.notdef',32=>'space',33=>'exclam',34=>'quotedbl',35=>'numbersign',36=>'dollar',37=>'percent',38=>'ampersand',39=>'quotesingle',40=>'parenleft',41=>'parenright',42=>'asterisk',43=>'plus',44=>'comma',45=>'hyphen',46=>'period',47=>'slash',48=>'zero',49=>'one',50=>'two',51=>'three',52=>'four',53=>'five',54=>'six',55=>'seven',56=>'eight',57=>'nine',58=>'colon',59=>'semicolon',60=>'less',61=>'equal',62=>'greater',63=>'question',64=>'at',65=>'A',66=>'B',67=>'C',68=>'D',69=>'E',70=>'F',71=>'G',72=>'H',73=>'I',74=>'J',75=>'K',76=>'L',77=>'M',78=>'N',79=>'O',80=>'P',81=>'Q',82=>'R',83=>'S',84=>'T',85=>'U',86=>'V',87=>'W',88=>'X',89=>'Y',90=>'Z',91=>'bracketleft',92=>'backslash',93=>'bracketright',94=>'asciicircum',95=>'underscore',96=>'grave',97=>'a',98=>'b',99=>'c',100=>'d',101=>'e',102=>'f',103=>'g',104=>'h',105=>'i',106=>'j',107=>'k',108=>'l',109=>'m',110=>'n',111=>'o',112=>'p',113=>'q',114=>'r',115=>'s',116=>'t',117=>'u',118=>'v',119=>'w',120=>'x',121=>'y',122=>'z',123=>'braceleft',124=>'bar',125=>'braceright',126=>'asciitilde',127=>'.notdef',128=>'.notdef',129=>'.notdef',130=>'.notdef',131=>'.notdef',132=>'.notdef',133=>'.notdef',134=>'.notdef',135=>'.notdef',136=>'.notdef',137=>'.notdef',138=>'.notdef',139=>'.notdef',140=>'.notdef',141=>'.notdef',142=>'.notdef',143=>'.notdef',144=>'.notdef',145=>'.notdef',146=>'.notdef',147=>'.notdef',148=>'.notdef',149=>'.notdef',150=>'.notdef',151=>'.notdef',152=>'.notdef',153=>'.notdef',154=>'.notdef',155=>'.notdef',156=>'.notdef',157=>'.notdef',158=>'.notdef',159=>'.notdef',160=>'space',161=>'quoteleft',162=>'quoteright',163=>'sterling',164=>'.notdef',165=>'.notdef',166=>'brokenbar',167=>'section',168=>'dieresis',169=>'copyright',170=>'.notdef',171=>'guillemotleft',172=>'logicalnot',173=>'hyphen',174=>'.notdef',175=>'afii00208',176=>'degree',177=>'plusminus',178=>'twosuperior',179=>'threesuperior',180=>'tonos',181=>'dieresistonos',182=>'Alphatonos',183=>'periodcentered',184=>'Epsilontonos',185=>'Etatonos',186=>'Iotatonos',187=>'guillemotright',188=>'Omicrontonos',189=>'onehalf',190=>'Upsilontonos',191=>'Omegatonos',192=>'iotadieresistonos',193=>'Alpha',194=>'Beta',195=>'Gamma',196=>'Delta',197=>'Epsilon',198=>'Zeta',199=>'Eta',200=>'Theta',201=>'Iota',202=>'Kappa',203=>'Lambda',204=>'Mu',205=>'Nu',206=>'Xi',207=>'Omicron',208=>'Pi',209=>'Rho',210=>'.notdef',211=>'Sigma',212=>'Tau',213=>'Upsilon',214=>'Phi',215=>'Chi',216=>'Psi',217=>'Omega',218=>'Iotadieresis',219=>'Upsilondieresis',220=>'alphatonos',221=>'epsilontonos',222=>'etatonos',223=>'iotatonos',224=>'upsilondieresistonos',225=>'alpha',226=>'beta',227=>'gamma',228=>'delta',229=>'epsilon',230=>'zeta',231=>'eta',232=>'theta',233=>'iota',234=>'kappa',235=>'lambda',236=>'mu',237=>'nu',238=>'xi',239=>'omicron',240=>'pi',241=>'rho',242=>'sigma1',243=>'sigma',244=>'tau',245=>'upsilon',246=>'phi',247=>'chi',248=>'psi',249=>'omega',250=>'iotadieresis',251=>'upsilondieresis',252=>'omicrontonos',253=>'upsilontonos',254=>'omegatonos',255=>'.notdef'),
-
-// encoding map for: iso-8859-9
-'iso-8859-9' => array(0=>'.notdef',1=>'.notdef',2=>'.notdef',3=>'.notdef',4=>'.notdef',5=>'.notdef',6=>'.notdef',7=>'.notdef',8=>'.notdef',9=>'.notdef',10=>'.notdef',11=>'.notdef',12=>'.notdef',13=>'.notdef',14=>'.notdef',15=>'.notdef',16=>'.notdef',17=>'.notdef',18=>'.notdef',19=>'.notdef',20=>'.notdef',21=>'.notdef',22=>'.notdef',23=>'.notdef',24=>'.notdef',25=>'.notdef',26=>'.notdef',27=>'.notdef',28=>'.notdef',29=>'.notdef',30=>'.notdef',31=>'.notdef',32=>'space',33=>'exclam',34=>'quotedbl',35=>'numbersign',36=>'dollar',37=>'percent',38=>'ampersand',39=>'quotesingle',40=>'parenleft',41=>'parenright',42=>'asterisk',43=>'plus',44=>'comma',45=>'hyphen',46=>'period',47=>'slash',48=>'zero',49=>'one',50=>'two',51=>'three',52=>'four',53=>'five',54=>'six',55=>'seven',56=>'eight',57=>'nine',58=>'colon',59=>'semicolon',60=>'less',61=>'equal',62=>'greater',63=>'question',64=>'at',65=>'A',66=>'B',67=>'C',68=>'D',69=>'E',70=>'F',71=>'G',72=>'H',73=>'I',74=>'J',75=>'K',76=>'L',77=>'M',78=>'N',79=>'O',80=>'P',81=>'Q',82=>'R',83=>'S',84=>'T',85=>'U',86=>'V',87=>'W',88=>'X',89=>'Y',90=>'Z',91=>'bracketleft',92=>'backslash',93=>'bracketright',94=>'asciicircum',95=>'underscore',96=>'grave',97=>'a',98=>'b',99=>'c',100=>'d',101=>'e',102=>'f',103=>'g',104=>'h',105=>'i',106=>'j',107=>'k',108=>'l',109=>'m',110=>'n',111=>'o',112=>'p',113=>'q',114=>'r',115=>'s',116=>'t',117=>'u',118=>'v',119=>'w',120=>'x',121=>'y',122=>'z',123=>'braceleft',124=>'bar',125=>'braceright',126=>'asciitilde',127=>'.notdef',128=>'.notdef',129=>'.notdef',130=>'.notdef',131=>'.notdef',132=>'.notdef',133=>'.notdef',134=>'.notdef',135=>'.notdef',136=>'.notdef',137=>'.notdef',138=>'.notdef',139=>'.notdef',140=>'.notdef',141=>'.notdef',142=>'.notdef',143=>'.notdef',144=>'.notdef',145=>'.notdef',146=>'.notdef',147=>'.notdef',148=>'.notdef',149=>'.notdef',150=>'.notdef',151=>'.notdef',152=>'.notdef',153=>'.notdef',154=>'.notdef',155=>'.notdef',156=>'.notdef',157=>'.notdef',158=>'.notdef',159=>'.notdef',160=>'space',161=>'exclamdown',162=>'cent',163=>'sterling',164=>'currency',165=>'yen',166=>'brokenbar',167=>'section',168=>'dieresis',169=>'copyright',170=>'ordfeminine',171=>'guillemotleft',172=>'logicalnot',173=>'hyphen',174=>'registered',175=>'macron',176=>'degree',177=>'plusminus',178=>'twosuperior',179=>'threesuperior',180=>'acute',181=>'mu',182=>'paragraph',183=>'periodcentered',184=>'cedilla',185=>'onesuperior',186=>'ordmasculine',187=>'guillemotright',188=>'onequarter',189=>'onehalf',190=>'threequarters',191=>'questiondown',192=>'Agrave',193=>'Aacute',194=>'Acircumflex',195=>'Atilde',196=>'Adieresis',197=>'Aring',198=>'AE',199=>'Ccedilla',200=>'Egrave',201=>'Eacute',202=>'Ecircumflex',203=>'Edieresis',204=>'Igrave',205=>'Iacute',206=>'Icircumflex',207=>'Idieresis',208=>'Gbreve',209=>'Ntilde',210=>'Ograve',211=>'Oacute',212=>'Ocircumflex',213=>'Otilde',214=>'Odieresis',215=>'multiply',216=>'Oslash',217=>'Ugrave',218=>'Uacute',219=>'Ucircumflex',220=>'Udieresis',221=>'Idotaccent',222=>'Scedilla',223=>'germandbls',224=>'agrave',225=>'aacute',226=>'acircumflex',227=>'atilde',228=>'adieresis',229=>'aring',230=>'ae',231=>'ccedilla',232=>'egrave',233=>'eacute',234=>'ecircumflex',235=>'edieresis',236=>'igrave',237=>'iacute',238=>'icircumflex',239=>'idieresis',240=>'gbreve',241=>'ntilde',242=>'ograve',243=>'oacute',244=>'ocircumflex',245=>'otilde',246=>'odieresis',247=>'divide',248=>'oslash',249=>'ugrave',250=>'uacute',251=>'ucircumflex',252=>'udieresis',253=>'dotlessi',254=>'scedilla',255=>'ydieresis'),
-
-// encoding map for: iso-8859-11
-'iso-8859-11' => array(0=>'.notdef',1=>'.notdef',2=>'.notdef',3=>'.notdef',4=>'.notdef',5=>'.notdef',6=>'.notdef',7=>'.notdef',8=>'.notdef',9=>'.notdef',10=>'.notdef',11=>'.notdef',12=>'.notdef',13=>'.notdef',14=>'.notdef',15=>'.notdef',16=>'.notdef',17=>'.notdef',18=>'.notdef',19=>'.notdef',20=>'.notdef',21=>'.notdef',22=>'.notdef',23=>'.notdef',24=>'.notdef',25=>'.notdef',26=>'.notdef',27=>'.notdef',28=>'.notdef',29=>'.notdef',30=>'.notdef',31=>'.notdef',32=>'space',33=>'exclam',34=>'quotedbl',35=>'numbersign',36=>'dollar',37=>'percent',38=>'ampersand',39=>'quotesingle',40=>'parenleft',41=>'parenright',42=>'asterisk',43=>'plus',44=>'comma',45=>'hyphen',46=>'period',47=>'slash',48=>'zero',49=>'one',50=>'two',51=>'three',52=>'four',53=>'five',54=>'six',55=>'seven',56=>'eight',57=>'nine',58=>'colon',59=>'semicolon',60=>'less',61=>'equal',62=>'greater',63=>'question',64=>'at',65=>'A',66=>'B',67=>'C',68=>'D',69=>'E',70=>'F',71=>'G',72=>'H',73=>'I',74=>'J',75=>'K',76=>'L',77=>'M',78=>'N',79=>'O',80=>'P',81=>'Q',82=>'R',83=>'S',84=>'T',85=>'U',86=>'V',87=>'W',88=>'X',89=>'Y',90=>'Z',91=>'bracketleft',92=>'backslash',93=>'bracketright',94=>'asciicircum',95=>'underscore',96=>'grave',97=>'a',98=>'b',99=>'c',100=>'d',101=>'e',102=>'f',103=>'g',104=>'h',105=>'i',106=>'j',107=>'k',108=>'l',109=>'m',110=>'n',111=>'o',112=>'p',113=>'q',114=>'r',115=>'s',116=>'t',117=>'u',118=>'v',119=>'w',120=>'x',121=>'y',122=>'z',123=>'braceleft',124=>'bar',125=>'braceright',126=>'asciitilde',127=>'.notdef',128=>'.notdef',129=>'.notdef',130=>'.notdef',131=>'.notdef',132=>'.notdef',133=>'.notdef',134=>'.notdef',135=>'.notdef',136=>'.notdef',137=>'.notdef',138=>'.notdef',139=>'.notdef',140=>'.notdef',141=>'.notdef',142=>'.notdef',143=>'.notdef',144=>'.notdef',145=>'.notdef',146=>'.notdef',147=>'.notdef',148=>'.notdef',149=>'.notdef',150=>'.notdef',151=>'.notdef',152=>'.notdef',153=>'.notdef',154=>'.notdef',155=>'.notdef',156=>'.notdef',157=>'.notdef',158=>'.notdef',159=>'.notdef',160=>'space',161=>'kokaithai',162=>'khokhaithai',163=>'khokhuatthai',164=>'khokhwaithai',165=>'khokhonthai',166=>'khorakhangthai',167=>'ngonguthai',168=>'chochanthai',169=>'chochingthai',170=>'chochangthai',171=>'sosothai',172=>'chochoethai',173=>'yoyingthai',174=>'dochadathai',175=>'topatakthai',176=>'thothanthai',177=>'thonangmonthothai',178=>'thophuthaothai',179=>'nonenthai',180=>'dodekthai',181=>'totaothai',182=>'thothungthai',183=>'thothahanthai',184=>'thothongthai',185=>'nonuthai',186=>'bobaimaithai',187=>'poplathai',188=>'phophungthai',189=>'fofathai',190=>'phophanthai',191=>'fofanthai',192=>'phosamphaothai',193=>'momathai',194=>'yoyakthai',195=>'roruathai',196=>'ruthai',197=>'lolingthai',198=>'luthai',199=>'wowaenthai',200=>'sosalathai',201=>'sorusithai',202=>'sosuathai',203=>'hohipthai',204=>'lochulathai',205=>'oangthai',206=>'honokhukthai',207=>'paiyannoithai',208=>'saraathai',209=>'maihanakatthai',210=>'saraaathai',211=>'saraamthai',212=>'saraithai',213=>'saraiithai',214=>'sarauethai',215=>'saraueethai',216=>'sarauthai',217=>'sarauuthai',218=>'phinthuthai',219=>'.notdef',220=>'.notdef',221=>'.notdef',222=>'.notdef',223=>'bahtthai',224=>'saraethai',225=>'saraaethai',226=>'saraothai',227=>'saraaimaimuanthai',228=>'saraaimaimalaithai',229=>'lakkhangyaothai',230=>'maiyamokthai',231=>'maitaikhuthai',232=>'maiekthai',233=>'maithothai',234=>'maitrithai',235=>'maichattawathai',236=>'thanthakhatthai',237=>'nikhahitthai',238=>'yamakkanthai',239=>'fongmanthai',240=>'zerothai',241=>'onethai',242=>'twothai',243=>'threethai',244=>'fourthai',245=>'fivethai',246=>'sixthai',247=>'seventhai',248=>'eightthai',249=>'ninethai',250=>'angkhankhuthai',251=>'khomutthai',252=>'.notdef',253=>'.notdef',254=>'.notdef',255=>'.notdef'),
-
-// encoding map for: iso-8859-15
-'iso-8859-15' => array(0=>'.notdef',1=>'.notdef',2=>'.notdef',3=>'.notdef',4=>'.notdef',5=>'.notdef',6=>'.notdef',7=>'.notdef',8=>'.notdef',9=>'.notdef',10=>'.notdef',11=>'.notdef',12=>'.notdef',13=>'.notdef',14=>'.notdef',15=>'.notdef',16=>'.notdef',17=>'.notdef',18=>'.notdef',19=>'.notdef',20=>'.notdef',21=>'.notdef',22=>'.notdef',23=>'.notdef',24=>'.notdef',25=>'.notdef',26=>'.notdef',27=>'.notdef',28=>'.notdef',29=>'.notdef',30=>'.notdef',31=>'.notdef',32=>'space',33=>'exclam',34=>'quotedbl',35=>'numbersign',36=>'dollar',37=>'percent',38=>'ampersand',39=>'quotesingle',40=>'parenleft',41=>'parenright',42=>'asterisk',43=>'plus',44=>'comma',45=>'hyphen',46=>'period',47=>'slash',48=>'zero',49=>'one',50=>'two',51=>'three',52=>'four',53=>'five',54=>'six',55=>'seven',56=>'eight',57=>'nine',58=>'colon',59=>'semicolon',60=>'less',61=>'equal',62=>'greater',63=>'question',64=>'at',65=>'A',66=>'B',67=>'C',68=>'D',69=>'E',70=>'F',71=>'G',72=>'H',73=>'I',74=>'J',75=>'K',76=>'L',77=>'M',78=>'N',79=>'O',80=>'P',81=>'Q',82=>'R',83=>'S',84=>'T',85=>'U',86=>'V',87=>'W',88=>'X',89=>'Y',90=>'Z',91=>'bracketleft',92=>'backslash',93=>'bracketright',94=>'asciicircum',95=>'underscore',96=>'grave',97=>'a',98=>'b',99=>'c',100=>'d',101=>'e',102=>'f',103=>'g',104=>'h',105=>'i',106=>'j',107=>'k',108=>'l',109=>'m',110=>'n',111=>'o',112=>'p',113=>'q',114=>'r',115=>'s',116=>'t',117=>'u',118=>'v',119=>'w',120=>'x',121=>'y',122=>'z',123=>'braceleft',124=>'bar',125=>'braceright',126=>'asciitilde',127=>'.notdef',128=>'.notdef',129=>'.notdef',130=>'.notdef',131=>'.notdef',132=>'.notdef',133=>'.notdef',134=>'.notdef',135=>'.notdef',136=>'.notdef',137=>'.notdef',138=>'.notdef',139=>'.notdef',140=>'.notdef',141=>'.notdef',142=>'.notdef',143=>'.notdef',144=>'.notdef',145=>'.notdef',146=>'.notdef',147=>'.notdef',148=>'.notdef',149=>'.notdef',150=>'.notdef',151=>'.notdef',152=>'.notdef',153=>'.notdef',154=>'.notdef',155=>'.notdef',156=>'.notdef',157=>'.notdef',158=>'.notdef',159=>'.notdef',160=>'space',161=>'exclamdown',162=>'cent',163=>'sterling',164=>'Euro',165=>'yen',166=>'Scaron',167=>'section',168=>'scaron',169=>'copyright',170=>'ordfeminine',171=>'guillemotleft',172=>'logicalnot',173=>'hyphen',174=>'registered',175=>'macron',176=>'degree',177=>'plusminus',178=>'twosuperior',179=>'threesuperior',180=>'Zcaron',181=>'mu',182=>'paragraph',183=>'periodcentered',184=>'zcaron',185=>'onesuperior',186=>'ordmasculine',187=>'guillemotright',188=>'OE',189=>'oe',190=>'Ydieresis',191=>'questiondown',192=>'Agrave',193=>'Aacute',194=>'Acircumflex',195=>'Atilde',196=>'Adieresis',197=>'Aring',198=>'AE',199=>'Ccedilla',200=>'Egrave',201=>'Eacute',202=>'Ecircumflex',203=>'Edieresis',204=>'Igrave',205=>'Iacute',206=>'Icircumflex',207=>'Idieresis',208=>'Eth',209=>'Ntilde',210=>'Ograve',211=>'Oacute',212=>'Ocircumflex',213=>'Otilde',214=>'Odieresis',215=>'multiply',216=>'Oslash',217=>'Ugrave',218=>'Uacute',219=>'Ucircumflex',220=>'Udieresis',221=>'Yacute',222=>'Thorn',223=>'germandbls',224=>'agrave',225=>'aacute',226=>'acircumflex',227=>'atilde',228=>'adieresis',229=>'aring',230=>'ae',231=>'ccedilla',232=>'egrave',233=>'eacute',234=>'ecircumflex',235=>'edieresis',236=>'igrave',237=>'iacute',238=>'icircumflex',239=>'idieresis',240=>'eth',241=>'ntilde',242=>'ograve',243=>'oacute',244=>'ocircumflex',245=>'otilde',246=>'odieresis',247=>'divide',248=>'oslash',249=>'ugrave',250=>'uacute',251=>'ucircumflex',252=>'udieresis',253=>'yacute',254=>'thorn',255=>'ydieresis'),
-
-// encoding map for: iso-8859-16
-'iso-8859-16' => array(0=>'.notdef',1=>'.notdef',2=>'.notdef',3=>'.notdef',4=>'.notdef',5=>'.notdef',6=>'.notdef',7=>'.notdef',8=>'.notdef',9=>'.notdef',10=>'.notdef',11=>'.notdef',12=>'.notdef',13=>'.notdef',14=>'.notdef',15=>'.notdef',16=>'.notdef',17=>'.notdef',18=>'.notdef',19=>'.notdef',20=>'.notdef',21=>'.notdef',22=>'.notdef',23=>'.notdef',24=>'.notdef',25=>'.notdef',26=>'.notdef',27=>'.notdef',28=>'.notdef',29=>'.notdef',30=>'.notdef',31=>'.notdef',32=>'space',33=>'exclam',34=>'quotedbl',35=>'numbersign',36=>'dollar',37=>'percent',38=>'ampersand',39=>'quotesingle',40=>'parenleft',41=>'parenright',42=>'asterisk',43=>'plus',44=>'comma',45=>'hyphen',46=>'period',47=>'slash',48=>'zero',49=>'one',50=>'two',51=>'three',52=>'four',53=>'five',54=>'six',55=>'seven',56=>'eight',57=>'nine',58=>'colon',59=>'semicolon',60=>'less',61=>'equal',62=>'greater',63=>'question',64=>'at',65=>'A',66=>'B',67=>'C',68=>'D',69=>'E',70=>'F',71=>'G',72=>'H',73=>'I',74=>'J',75=>'K',76=>'L',77=>'M',78=>'N',79=>'O',80=>'P',81=>'Q',82=>'R',83=>'S',84=>'T',85=>'U',86=>'V',87=>'W',88=>'X',89=>'Y',90=>'Z',91=>'bracketleft',92=>'backslash',93=>'bracketright',94=>'asciicircum',95=>'underscore',96=>'grave',97=>'a',98=>'b',99=>'c',100=>'d',101=>'e',102=>'f',103=>'g',104=>'h',105=>'i',106=>'j',107=>'k',108=>'l',109=>'m',110=>'n',111=>'o',112=>'p',113=>'q',114=>'r',115=>'s',116=>'t',117=>'u',118=>'v',119=>'w',120=>'x',121=>'y',122=>'z',123=>'braceleft',124=>'bar',125=>'braceright',126=>'asciitilde',127=>'.notdef',128=>'.notdef',129=>'.notdef',130=>'.notdef',131=>'.notdef',132=>'.notdef',133=>'.notdef',134=>'.notdef',135=>'.notdef',136=>'.notdef',137=>'.notdef',138=>'.notdef',139=>'.notdef',140=>'.notdef',141=>'.notdef',142=>'.notdef',143=>'.notdef',144=>'.notdef',145=>'.notdef',146=>'.notdef',147=>'.notdef',148=>'.notdef',149=>'.notdef',150=>'.notdef',151=>'.notdef',152=>'.notdef',153=>'.notdef',154=>'.notdef',155=>'.notdef',156=>'.notdef',157=>'.notdef',158=>'.notdef',159=>'.notdef',160=>'space',161=>'Aogonek',162=>'aogonek',163=>'Lslash',164=>'Euro',165=>'quotedblbase',166=>'Scaron',167=>'section',168=>'scaron',169=>'copyright',170=>'Scommaaccent',171=>'guillemotleft',172=>'Zacute',173=>'hyphen',174=>'zacute',175=>'Zdotaccent',176=>'degree',177=>'plusminus',178=>'Ccaron',179=>'lslash',180=>'Zcaron',181=>'quotedblright',182=>'paragraph',183=>'periodcentered',184=>'zcaron',185=>'ccaron',186=>'scommaaccent',187=>'guillemotright',188=>'OE',189=>'oe',190=>'Ydieresis',191=>'zdotaccent',192=>'Agrave',193=>'Aacute',194=>'Acircumflex',195=>'Abreve',196=>'Adieresis',197=>'Cacute',198=>'AE',199=>'Ccedilla',200=>'Egrave',201=>'Eacute',202=>'Ecircumflex',203=>'Edieresis',204=>'Igrave',205=>'Iacute',206=>'Icircumflex',207=>'Idieresis',208=>'Dcroat',209=>'Nacute',210=>'Ograve',211=>'Oacute',212=>'Ocircumflex',213=>'Ohungarumlaut',214=>'Odieresis',215=>'Sacute',216=>'Uhungarumlaut',217=>'Ugrave',218=>'Uacute',219=>'Ucircumflex',220=>'Udieresis',221=>'Eogonek',222=>'Tcommaaccent',223=>'germandbls',224=>'agrave',225=>'aacute',226=>'acircumflex',227=>'abreve',228=>'adieresis',229=>'cacute',230=>'ae',231=>'ccedilla',232=>'egrave',233=>'eacute',234=>'ecircumflex',235=>'edieresis',236=>'igrave',237=>'iacute',238=>'icircumflex',239=>'idieresis',240=>'dcroat',241=>'nacute',242=>'ograve',243=>'oacute',244=>'ocircumflex',245=>'ohungarumlaut',246=>'odieresis',247=>'sacute',248=>'uhungarumlaut',249=>'ugrave',250=>'uacute',251=>'ucircumflex',252=>'udieresis',253=>'eogonek',254=>'tcommaaccent',255=>'ydieresis'),
-
-// encoding map for: koi8-r
-'koi8-r' => array(0=>'.notdef',1=>'.notdef',2=>'.notdef',3=>'.notdef',4=>'.notdef',5=>'.notdef',6=>'.notdef',7=>'.notdef',8=>'.notdef',9=>'.notdef',10=>'.notdef',11=>'.notdef',12=>'.notdef',13=>'.notdef',14=>'.notdef',15=>'.notdef',16=>'.notdef',17=>'.notdef',18=>'.notdef',19=>'.notdef',20=>'.notdef',21=>'.notdef',22=>'.notdef',23=>'.notdef',24=>'.notdef',25=>'.notdef',26=>'.notdef',27=>'.notdef',28=>'.notdef',29=>'.notdef',30=>'.notdef',31=>'.notdef',32=>'space',33=>'exclam',34=>'quotedbl',35=>'numbersign',36=>'dollar',37=>'percent',38=>'ampersand',39=>'quotesingle',40=>'parenleft',41=>'parenright',42=>'asterisk',43=>'plus',44=>'comma',45=>'hyphen',46=>'period',47=>'slash',48=>'zero',49=>'one',50=>'two',51=>'three',52=>'four',53=>'five',54=>'six',55=>'seven',56=>'eight',57=>'nine',58=>'colon',59=>'semicolon',60=>'less',61=>'equal',62=>'greater',63=>'question',64=>'at',65=>'A',66=>'B',67=>'C',68=>'D',69=>'E',70=>'F',71=>'G',72=>'H',73=>'I',74=>'J',75=>'K',76=>'L',77=>'M',78=>'N',79=>'O',80=>'P',81=>'Q',82=>'R',83=>'S',84=>'T',85=>'U',86=>'V',87=>'W',88=>'X',89=>'Y',90=>'Z',91=>'bracketleft',92=>'backslash',93=>'bracketright',94=>'asciicircum',95=>'underscore',96=>'grave',97=>'a',98=>'b',99=>'c',100=>'d',101=>'e',102=>'f',103=>'g',104=>'h',105=>'i',106=>'j',107=>'k',108=>'l',109=>'m',110=>'n',111=>'o',112=>'p',113=>'q',114=>'r',115=>'s',116=>'t',117=>'u',118=>'v',119=>'w',120=>'x',121=>'y',122=>'z',123=>'braceleft',124=>'bar',125=>'braceright',126=>'asciitilde',127=>'.notdef',128=>'SF100000',129=>'SF110000',130=>'SF010000',131=>'SF030000',132=>'SF020000',133=>'SF040000',134=>'SF080000',135=>'SF090000',136=>'SF060000',137=>'SF070000',138=>'SF050000',139=>'upblock',140=>'dnblock',141=>'block',142=>'lfblock',143=>'rtblock',144=>'ltshade',145=>'shade',146=>'dkshade',147=>'integraltp',148=>'filledbox',149=>'periodcentered',150=>'radical',151=>'approxequal',152=>'lessequal',153=>'greaterequal',154=>'space',155=>'integralbt',156=>'degree',157=>'twosuperior',158=>'periodcentered',159=>'divide',160=>'SF430000',161=>'SF240000',162=>'SF510000',163=>'afii10071',164=>'SF520000',165=>'SF390000',166=>'SF220000',167=>'SF210000',168=>'SF250000',169=>'SF500000',170=>'SF490000',171=>'SF380000',172=>'SF280000',173=>'SF270000',174=>'SF260000',175=>'SF360000',176=>'SF370000',177=>'SF420000',178=>'SF190000',179=>'afii10023',180=>'SF200000',181=>'SF230000',182=>'SF470000',183=>'SF480000',184=>'SF410000',185=>'SF450000',186=>'SF460000',187=>'SF400000',188=>'SF540000',189=>'SF530000',190=>'SF440000',191=>'copyright',192=>'afii10096',193=>'afii10065',194=>'afii10066',195=>'afii10088',196=>'afii10069',197=>'afii10070',198=>'afii10086',199=>'afii10068',200=>'afii10087',201=>'afii10074',202=>'afii10075',203=>'afii10076',204=>'afii10077',205=>'afii10078',206=>'afii10079',207=>'afii10080',208=>'afii10081',209=>'afii10097',210=>'afii10082',211=>'afii10083',212=>'afii10084',213=>'afii10085',214=>'afii10072',215=>'afii10067',216=>'afii10094',217=>'afii10093',218=>'afii10073',219=>'afii10090',220=>'afii10095',221=>'afii10091',222=>'afii10089',223=>'afii10092',224=>'afii10048',225=>'afii10017',226=>'afii10018',227=>'afii10040',228=>'afii10021',229=>'afii10022',230=>'afii10038',231=>'afii10020',232=>'afii10039',233=>'afii10026',234=>'afii10027',235=>'afii10028',236=>'afii10029',237=>'afii10030',238=>'afii10031',239=>'afii10032',240=>'afii10033',241=>'afii10049',242=>'afii10034',243=>'afii10035',244=>'afii10036',245=>'afii10037',246=>'afii10024',247=>'afii10019',248=>'afii10046',249=>'afii10045',250=>'afii10025',251=>'afii10042',252=>'afii10047',253=>'afii10043',254=>'afii10041',255=>'afii10044'),
-
-// encoding map for: koi8-u
-'koi8-u' => array(0=>'.notdef',1=>'.notdef',2=>'.notdef',3=>'.notdef',4=>'.notdef',5=>'.notdef',6=>'.notdef',7=>'.notdef',8=>'.notdef',9=>'.notdef',10=>'.notdef',11=>'.notdef',12=>'.notdef',13=>'.notdef',14=>'.notdef',15=>'.notdef',16=>'.notdef',17=>'.notdef',18=>'.notdef',19=>'.notdef',20=>'.notdef',21=>'.notdef',22=>'.notdef',23=>'.notdef',24=>'.notdef',25=>'.notdef',26=>'.notdef',27=>'.notdef',28=>'.notdef',29=>'.notdef',30=>'.notdef',31=>'.notdef',32=>'space',33=>'exclam',34=>'quotedbl',35=>'numbersign',36=>'dollar',37=>'percent',38=>'ampersand',39=>'quotesingle',40=>'parenleft',41=>'parenright',42=>'asterisk',43=>'plus',44=>'comma',45=>'hyphen',46=>'period',47=>'slash',48=>'zero',49=>'one',50=>'two',51=>'three',52=>'four',53=>'five',54=>'six',55=>'seven',56=>'eight',57=>'nine',58=>'colon',59=>'semicolon',60=>'less',61=>'equal',62=>'greater',63=>'question',64=>'at',65=>'A',66=>'B',67=>'C',68=>'D',69=>'E',70=>'F',71=>'G',72=>'H',73=>'I',74=>'J',75=>'K',76=>'L',77=>'M',78=>'N',79=>'O',80=>'P',81=>'Q',82=>'R',83=>'S',84=>'T',85=>'U',86=>'V',87=>'W',88=>'X',89=>'Y',90=>'Z',91=>'bracketleft',92=>'backslash',93=>'bracketright',94=>'asciicircum',95=>'underscore',96=>'grave',97=>'a',98=>'b',99=>'c',100=>'d',101=>'e',102=>'f',103=>'g',104=>'h',105=>'i',106=>'j',107=>'k',108=>'l',109=>'m',110=>'n',111=>'o',112=>'p',113=>'q',114=>'r',115=>'s',116=>'t',117=>'u',118=>'v',119=>'w',120=>'x',121=>'y',122=>'z',123=>'braceleft',124=>'bar',125=>'braceright',126=>'asciitilde',127=>'.notdef',128=>'SF100000',129=>'SF110000',130=>'SF010000',131=>'SF030000',132=>'SF020000',133=>'SF040000',134=>'SF080000',135=>'SF090000',136=>'SF060000',137=>'SF070000',138=>'SF050000',139=>'upblock',140=>'dnblock',141=>'block',142=>'lfblock',143=>'rtblock',144=>'ltshade',145=>'shade',146=>'dkshade',147=>'integraltp',148=>'filledbox',149=>'bullet',150=>'radical',151=>'approxequal',152=>'lessequal',153=>'greaterequal',154=>'space',155=>'integralbt',156=>'degree',157=>'twosuperior',158=>'periodcentered',159=>'divide',160=>'SF430000',161=>'SF240000',162=>'SF510000',163=>'afii10071',164=>'afii10101',165=>'SF390000',166=>'afii10103',167=>'afii10104',168=>'SF250000',169=>'SF500000',170=>'SF490000',171=>'SF380000',172=>'SF280000',173=>'afii10098',174=>'SF260000',175=>'SF360000',176=>'SF370000',177=>'SF420000',178=>'SF190000',179=>'afii10023',180=>'afii10053',181=>'SF230000',182=>'afii10055',183=>'afii10056',184=>'SF410000',185=>'SF450000',186=>'SF460000',187=>'SF400000',188=>'SF540000',189=>'afii10050',190=>'SF440000',191=>'copyright',192=>'afii10096',193=>'afii10065',194=>'afii10066',195=>'afii10088',196=>'afii10069',197=>'afii10070',198=>'afii10086',199=>'afii10068',200=>'afii10087',201=>'afii10074',202=>'afii10075',203=>'afii10076',204=>'afii10077',205=>'afii10078',206=>'afii10079',207=>'afii10080',208=>'afii10081',209=>'afii10097',210=>'afii10082',211=>'afii10083',212=>'afii10084',213=>'afii10085',214=>'afii10072',215=>'afii10067',216=>'afii10094',217=>'afii10093',218=>'afii10073',219=>'afii10090',220=>'afii10095',221=>'afii10091',222=>'afii10089',223=>'afii10092',224=>'afii10048',225=>'afii10017',226=>'afii10018',227=>'afii10040',228=>'afii10021',229=>'afii10022',230=>'afii10038',231=>'afii10020',232=>'afii10039',233=>'afii10026',234=>'afii10027',235=>'afii10028',236=>'afii10029',237=>'afii10030',238=>'afii10031',239=>'afii10032',240=>'afii10033',241=>'afii10049',242=>'afii10034',243=>'afii10035',244=>'afii10036',245=>'afii10037',246=>'afii10024',247=>'afii10019',248=>'afii10046',249=>'afii10045',250=>'afii10025',251=>'afii10042',252=>'afii10047',253=>'afii10043',254=>'afii10041',255=>'afii10044'),
-
-// encoding map for: symbol
-'symbol' => array(0=>'.notdef',1=>'.notdef',2=>'.notdef',3=>'.notdef',4=>'.notdef',5=>'.notdef',6=>'.notdef',7=>'.notdef',8=>'.notdef',9=>'.notdef',10=>'.notdef',11=>'.notdef',12=>'.notdef',13=>'.notdef',14=>'.notdef',15=>'.notdef',16=>'.notdef',17=>'.notdef',18=>'.notdef',19=>'.notdef',20=>'.notdef',21=>'.notdef',22=>'.notdef',23=>'.notdef',24=>'.notdef',25=>'.notdef',26=>'.notdef',27=>'.notdef',28=>'.notdef',29=>'.notdef',30=>'.notdef',31=>'.notdef',32=>'space',33=>'exclam',34=>'universal',35=>'numbersign',36=>'existential',37=>'percent',38=>'ampersand',39=>'suchthat',40=>'parenleft',41=>'parenright',42=>'asteriskmath',43=>'plus',44=>'comma',45=>'minus',46=>'period',47=>'slash',48=>'zero',49=>'one',50=>'two',51=>'three',52=>'four',53=>'five',54=>'six',55=>'seven',56=>'eight',57=>'nine',58=>'colon',59=>'semicolon',60=>'less',61=>'equal',62=>'greater',63=>'question',64=>'congruent',65=>'Alpha',66=>'Beta',67=>'Chi',68=>'Delta',69=>'Epsilon',70=>'Phi',71=>'Gamma',72=>'Eta',73=>'Iota',74=>'theta1',75=>'Kappa',76=>'Lambda',77=>'Mu',78=>'Nu',79=>'Omicron',80=>'Pi',81=>'Theta',82=>'Rho',83=>'Sigma',84=>'Tau',85=>'Upsilon',86=>'sigma1',87=>'Omega',88=>'Xi',89=>'Psi',90=>'Zeta',91=>'bracketleft',92=>'therefore',93=>'bracketright',94=>'perpendicular',95=>'underscore',96=>'radicalex',97=>'alpha',98=>'beta',99=>'chi',100=>'delta',101=>'epsilon',102=>'phi',103=>'gamma',104=>'eta',105=>'iota',106=>'phi1',107=>'kappa',108=>'lambda',109=>'mu',110=>'nu',111=>'omicron',112=>'pi',113=>'theta',114=>'rho',115=>'sigma',116=>'tau',117=>'upsilon',118=>'omega1',119=>'omega',120=>'xi',121=>'psi',122=>'zeta',123=>'braceleft',124=>'bar',125=>'braceright',126=>'similar',127=>'.notdef',128=>'.notdef',129=>'.notdef',130=>'.notdef',131=>'.notdef',132=>'.notdef',133=>'.notdef',134=>'.notdef',135=>'.notdef',136=>'.notdef',137=>'.notdef',138=>'.notdef',139=>'.notdef',140=>'.notdef',141=>'.notdef',142=>'.notdef',143=>'.notdef',144=>'.notdef',145=>'.notdef',146=>'.notdef',147=>'.notdef',148=>'.notdef',149=>'.notdef',150=>'.notdef',151=>'.notdef',152=>'.notdef',153=>'.notdef',154=>'.notdef',155=>'.notdef',156=>'.notdef',157=>'.notdef',158=>'.notdef',159=>'.notdef',160=>'Euro',161=>'Upsilon1',162=>'minute',163=>'lessequal',164=>'fraction',165=>'infinity',166=>'florin',167=>'club',168=>'diamond',169=>'heart',170=>'spade',171=>'arrowboth',172=>'arrowleft',173=>'arrowup',174=>'arrowright',175=>'arrowdown',176=>'degree',177=>'plusminus',178=>'second',179=>'greaterequal',180=>'multiply',181=>'proportional',182=>'partialdiff',183=>'bullet',184=>'divide',185=>'notequal',186=>'equivalence',187=>'approxequal',188=>'ellipsis',189=>'arrowvertex',190=>'arrowhorizex',191=>'carriagereturn',192=>'aleph',193=>'Ifraktur',194=>'Rfraktur',195=>'weierstrass',196=>'circlemultiply',197=>'circleplus',198=>'emptyset',199=>'intersection',200=>'union',201=>'propersuperset',202=>'reflexsuperset',203=>'notsubset',204=>'propersubset',205=>'reflexsubset',206=>'element',207=>'notelement',208=>'angle',209=>'gradient',210=>'registerserif',211=>'copyrightserif',212=>'trademarkserif',213=>'product',214=>'radical',215=>'dotmath',216=>'logicalnot',217=>'logicaland',218=>'logicalor',219=>'arrowdblboth',220=>'arrowdblleft',221=>'arrowdblup',222=>'arrowdblright',223=>'arrowdbldown',224=>'lozenge',225=>'angleleft',226=>'registersans',227=>'copyrightsans',228=>'trademarksans',229=>'summation',230=>'parenlefttp',231=>'parenleftex',232=>'parenleftbt',233=>'bracketlefttp',234=>'bracketleftex',235=>'bracketleftbt',236=>'bracelefttp',237=>'braceleftmid',238=>'braceleftbt',239=>'braceex',240=>'.notdef',241=>'angleright',242=>'integral',243=>'integraltp',244=>'integralex',245=>'integralbt',246=>'parenrighttp',247=>'parenrightex',248=>'parenrightbt',249=>'bracketrighttp',250=>'bracketrightex',251=>'bracketrightbt',252=>'bracerighttp',253=>'bracerightmid',254=>'bracerightbt',255=>'.notdef',1226=>'registered',1227=>'copyright',1228=>'trademark')
-
-); // end of encoding maps
-
-/**
- * ToUnicode map for Identity-H stream
- * @public static
- */
-public static $uni_identity_h = "/CIDInit /ProcSet findresource begin\n12 dict begin\nbegincmap\n/CIDSystemInfo << /Registry (Adobe) /Ordering (UCS) /Supplement 0 >> def\n/CMapName /Adobe-Identity-UCS def\n/CMapType 2 def\n/WMode 0 def\n1 begincodespacerange\n<0000> <FFFF>\nendcodespacerange\n100 beginbfrange\n<0000> <00ff> <0000>\n<0100> <01ff> <0100>\n<0200> <02ff> <0200>\n<0300> <03ff> <0300>\n<0400> <04ff> <0400>\n<0500> <05ff> <0500>\n<0600> <06ff> <0600>\n<0700> <07ff> <0700>\n<0800> <08ff> <0800>\n<0900> <09ff> <0900>\n<0a00> <0aff> <0a00>\n<0b00> <0bff> <0b00>\n<0c00> <0cff> <0c00>\n<0d00> <0dff> <0d00>\n<0e00> <0eff> <0e00>\n<0f00> <0fff> <0f00>\n<1000> <10ff> <1000>\n<1100> <11ff> <1100>\n<1200> <12ff> <1200>\n<1300> <13ff> <1300>\n<1400> <14ff> <1400>\n<1500> <15ff> <1500>\n<1600> <16ff> <1600>\n<1700> <17ff> <1700>\n<1800> <18ff> <1800>\n<1900> <19ff> <1900>\n<1a00> <1aff> <1a00>\n<1b00> <1bff> <1b00>\n<1c00> <1cff> <1c00>\n<1d00> <1dff> <1d00>\n<1e00> <1eff> <1e00>\n<1f00> <1fff> <1f00>\n<2000> <20ff> <2000>\n<2100> <21ff> <2100>\n<2200> <22ff> <2200>\n<2300> <23ff> <2300>\n<2400> <24ff> <2400>\n<2500> <25ff> <2500>\n<2600> <26ff> <2600>\n<2700> <27ff> <2700>\n<2800> <28ff> <2800>\n<2900> <29ff> <2900>\n<2a00> <2aff> <2a00>\n<2b00> <2bff> <2b00>\n<2c00> <2cff> <2c00>\n<2d00> <2dff> <2d00>\n<2e00> <2eff> <2e00>\n<2f00> <2fff> <2f00>\n<3000> <30ff> <3000>\n<3100> <31ff> <3100>\n<3200> <32ff> <3200>\n<3300> <33ff> <3300>\n<3400> <34ff> <3400>\n<3500> <35ff> <3500>\n<3600> <36ff> <3600>\n<3700> <37ff> <3700>\n<3800> <38ff> <3800>\n<3900> <39ff> <3900>\n<3a00> <3aff> <3a00>\n<3b00> <3bff> <3b00>\n<3c00> <3cff> <3c00>\n<3d00> <3dff> <3d00>\n<3e00> <3eff> <3e00>\n<3f00> <3fff> <3f00>\n<4000> <40ff> <4000>\n<4100> <41ff> <4100>\n<4200> <42ff> <4200>\n<4300> <43ff> <4300>\n<4400> <44ff> <4400>\n<4500> <45ff> <4500>\n<4600> <46ff> <4600>\n<4700> <47ff> <4700>\n<4800> <48ff> <4800>\n<4900> <49ff> <4900>\n<4a00> <4aff> <4a00>\n<4b00> <4bff> <4b00>\n<4c00> <4cff> <4c00>\n<4d00> <4dff> <4d00>\n<4e00> <4eff> <4e00>\n<4f00> <4fff> <4f00>\n<5000> <50ff> <5000>\n<5100> <51ff> <5100>\n<5200> <52ff> <5200>\n<5300> <53ff> <5300>\n<5400> <54ff> <5400>\n<5500> <55ff> <5500>\n<5600> <56ff> <5600>\n<5700> <57ff> <5700>\n<5800> <58ff> <5800>\n<5900> <59ff> <5900>\n<5a00> <5aff> <5a00>\n<5b00> <5bff> <5b00>\n<5c00> <5cff> <5c00>\n<5d00> <5dff> <5d00>\n<5e00> <5eff> <5e00>\n<5f00> <5fff> <5f00>\n<6000> <60ff> <6000>\n<6100> <61ff> <6100>\n<6200> <62ff> <6200>\n<6300> <63ff> <6300>\nendbfrange\n100 beginbfrange\n<6400> <64ff> <6400>\n<6500> <65ff> <6500>\n<6600> <66ff> <6600>\n<6700> <67ff> <6700>\n<6800> <68ff> <6800>\n<6900> <69ff> <6900>\n<6a00> <6aff> <6a00>\n<6b00> <6bff> <6b00>\n<6c00> <6cff> <6c00>\n<6d00> <6dff> <6d00>\n<6e00> <6eff> <6e00>\n<6f00> <6fff> <6f00>\n<7000> <70ff> <7000>\n<7100> <71ff> <7100>\n<7200> <72ff> <7200>\n<7300> <73ff> <7300>\n<7400> <74ff> <7400>\n<7500> <75ff> <7500>\n<7600> <76ff> <7600>\n<7700> <77ff> <7700>\n<7800> <78ff> <7800>\n<7900> <79ff> <7900>\n<7a00> <7aff> <7a00>\n<7b00> <7bff> <7b00>\n<7c00> <7cff> <7c00>\n<7d00> <7dff> <7d00>\n<7e00> <7eff> <7e00>\n<7f00> <7fff> <7f00>\n<8000> <80ff> <8000>\n<8100> <81ff> <8100>\n<8200> <82ff> <8200>\n<8300> <83ff> <8300>\n<8400> <84ff> <8400>\n<8500> <85ff> <8500>\n<8600> <86ff> <8600>\n<8700> <87ff> <8700>\n<8800> <88ff> <8800>\n<8900> <89ff> <8900>\n<8a00> <8aff> <8a00>\n<8b00> <8bff> <8b00>\n<8c00> <8cff> <8c00>\n<8d00> <8dff> <8d00>\n<8e00> <8eff> <8e00>\n<8f00> <8fff> <8f00>\n<9000> <90ff> <9000>\n<9100> <91ff> <9100>\n<9200> <92ff> <9200>\n<9300> <93ff> <9300>\n<9400> <94ff> <9400>\n<9500> <95ff> <9500>\n<9600> <96ff> <9600>\n<9700> <97ff> <9700>\n<9800> <98ff> <9800>\n<9900> <99ff> <9900>\n<9a00> <9aff> <9a00>\n<9b00> <9bff> <9b00>\n<9c00> <9cff> <9c00>\n<9d00> <9dff> <9d00>\n<9e00> <9eff> <9e00>\n<9f00> <9fff> <9f00>\n<a000> <a0ff> <a000>\n<a100> <a1ff> <a100>\n<a200> <a2ff> <a200>\n<a300> <a3ff> <a300>\n<a400> <a4ff> <a400>\n<a500> <a5ff> <a500>\n<a600> <a6ff> <a600>\n<a700> <a7ff> <a700>\n<a800> <a8ff> <a800>\n<a900> <a9ff> <a900>\n<aa00> <aaff> <aa00>\n<ab00> <abff> <ab00>\n<ac00> <acff> <ac00>\n<ad00> <adff> <ad00>\n<ae00> <aeff> <ae00>\n<af00> <afff> <af00>\n<b000> <b0ff> <b000>\n<b100> <b1ff> <b100>\n<b200> <b2ff> <b200>\n<b300> <b3ff> <b300>\n<b400> <b4ff> <b400>\n<b500> <b5ff> <b500>\n<b600> <b6ff> <b600>\n<b700> <b7ff> <b700>\n<b800> <b8ff> <b800>\n<b900> <b9ff> <b900>\n<ba00> <baff> <ba00>\n<bb00> <bbff> <bb00>\n<bc00> <bcff> <bc00>\n<bd00> <bdff> <bd00>\n<be00> <beff> <be00>\n<bf00> <bfff> <bf00>\n<c000> <c0ff> <c000>\n<c100> <c1ff> <c100>\n<c200> <c2ff> <c200>\n<c300> <c3ff> <c300>\n<c400> <c4ff> <c400>\n<c500> <c5ff> <c500>\n<c600> <c6ff> <c600>\n<c700> <c7ff> <c700>\nendbfrange\n56 beginbfrange\n<c800> <c8ff> <c800>\n<c900> <c9ff> <c900>\n<ca00> <caff> <ca00>\n<cb00> <cbff> <cb00>\n<cc00> <ccff> <cc00>\n<cd00> <cdff> <cd00>\n<ce00> <ceff> <ce00>\n<cf00> <cfff> <cf00>\n<d000> <d0ff> <d000>\n<d100> <d1ff> <d100>\n<d200> <d2ff> <d200>\n<d300> <d3ff> <d300>\n<d400> <d4ff> <d400>\n<d500> <d5ff> <d500>\n<d600> <d6ff> <d600>\n<d700> <d7ff> <d700>\n<d800> <d8ff> <d800>\n<d900> <d9ff> <d900>\n<da00> <daff> <da00>\n<db00> <dbff> <db00>\n<dc00> <dcff> <dc00>\n<dd00> <ddff> <dd00>\n<de00> <deff> <de00>\n<df00> <dfff> <df00>\n<e000> <e0ff> <e000>\n<e100> <e1ff> <e100>\n<e200> <e2ff> <e200>\n<e300> <e3ff> <e300>\n<e400> <e4ff> <e400>\n<e500> <e5ff> <e500>\n<e600> <e6ff> <e600>\n<e700> <e7ff> <e700>\n<e800> <e8ff> <e800>\n<e900> <e9ff> <e900>\n<ea00> <eaff> <ea00>\n<eb00> <ebff> <eb00>\n<ec00> <ecff> <ec00>\n<ed00> <edff> <ed00>\n<ee00> <eeff> <ee00>\n<ef00> <efff> <ef00>\n<f000> <f0ff> <f000>\n<f100> <f1ff> <f100>\n<f200> <f2ff> <f200>\n<f300> <f3ff> <f300>\n<f400> <f4ff> <f400>\n<f500> <f5ff> <f500>\n<f600> <f6ff> <f600>\n<f700> <f7ff> <f700>\n<f800> <f8ff> <f800>\n<f900> <f9ff> <f900>\n<fa00> <faff> <fa00>\n<fb00> <fbff> <fb00>\n<fc00> <fcff> <fc00>\n<fd00> <fdff> <fd00>\n<fe00> <feff> <fe00>\n<ff00> <ffff> <ff00>\nendbfrange\nendcmap\nCMapName currentdict /CMap defineresource pop\nend\nend";
-
-} // END OF TCPDF_FONT_DATA CLASS
-
-//============================================================+
-// END OF FILE
-//============================================================+
diff --git a/#pma/libraries/tcpdf/include/tcpdf_fonts.php b/#pma/libraries/tcpdf/include/tcpdf_fonts.php
deleted file mode 100644
index 70ca8939..00000000
--- a/#pma/libraries/tcpdf/include/tcpdf_fonts.php
+++ /dev/null
@@ -1,2649 +0,0 @@
-<?php
-//============================================================+
-// File name   : tcpdf_fonts.php
-// Version     : 1.1.0
-// Begin       : 2008-01-01
-// Last Update : 2014-12-10
-// Author      : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
-// License     : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
-// -------------------------------------------------------------------
-// Copyright (C) 2008-2014 Nicola Asuni - Tecnick.com LTD
-//
-// This file is part of TCPDF software library.
-//
-// TCPDF is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// TCPDF is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-// See the GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with TCPDF.  If not, see <http://www.gnu.org/licenses/>.
-//
-// See LICENSE.TXT file for more information.
-// -------------------------------------------------------------------
-//
-// Description :Font methods for TCPDF library.
-//
-//============================================================+
-
-/**
- * @file
- * Unicode data and font methods for TCPDF library.
- * @author Nicola Asuni
- * @package com.tecnick.tcpdf
- */
-
-/**
- * @class TCPDF_FONTS
- * Font methods for TCPDF library.
- * @package com.tecnick.tcpdf
- * @version 1.1.0
- * @author Nicola Asuni - info@tecnick.com
- */
-class TCPDF_FONTS {
-
-	/**
-	 * Static cache used for speed up uniord performances
-	 * @protected
-	 */
-	protected static $cache_uniord = array();
-
-	/**
-	 * Convert and add the selected TrueType or Type1 font to the fonts folder (that must be writeable).
-	 * @param $fontfile (string) Font file (full path).
-	 * @param $fonttype (string) Font type. Leave empty for autodetect mode. Valid values are: TrueTypeUnicode, TrueType, Type1, CID0JP = CID-0 Japanese, CID0KR = CID-0 Korean, CID0CS = CID-0 Chinese Simplified, CID0CT = CID-0 Chinese Traditional.
-	 * @param $enc (string) Name of the encoding table to use. Leave empty for default mode. Omit this parameter for TrueType Unicode and symbolic fonts like Symbol or ZapfDingBats.
-	 * @param $flags (int) Unsigned 32-bit integer containing flags specifying various characteristics of the font (PDF32000:2008 - 9.8.2 Font Descriptor Flags): +1 for fixed font; +4 for symbol or +32 for non-symbol; +64 for italic. Fixed and Italic mode are generally autodetected so you have to set it to 32 = non-symbolic font (default) or 4 = symbolic font.
-	 * @param $outpath (string) Output path for generated font files (must be writeable by the web server). Leave empty for default font folder.
-	 * @param $platid (int) Platform ID for CMAP table to extract (when building a Unicode font for Windows this value should be 3, for Macintosh should be 1).
-	 * @param $encid (int) Encoding ID for CMAP table to extract (when building a Unicode font for Windows this value should be 1, for Macintosh should be 0). When Platform ID is 3, legal values for Encoding ID are: 0=Symbol, 1=Unicode, 2=ShiftJIS, 3=PRC, 4=Big5, 5=Wansung, 6=Johab, 7=Reserved, 8=Reserved, 9=Reserved, 10=UCS-4.
-	 * @param $addcbbox (boolean) If true includes the character bounding box information on the php font file.
-	 * @param $link (boolean) If true link to system font instead of copying the font data (not transportable) - Note: do not work with Type1 fonts.
-	 * @return (string) TCPDF font name or boolean false in case of error.
-	 * @author Nicola Asuni
-	 * @since 5.9.123 (2010-09-30)
-	 * @public static
-	 */
-	public static function addTTFfont($fontfile, $fonttype='', $enc='', $flags=32, $outpath='', $platid=3, $encid=1, $addcbbox=false, $link=false) {
-		if (!file_exists($fontfile)) {
-			// Could not find file
-			return false;
-		}
-		// font metrics
-		$fmetric = array();
-		// build new font name for TCPDF compatibility
-		$font_path_parts = pathinfo($fontfile);
-		if (!isset($font_path_parts['filename'])) {
-			$font_path_parts['filename'] = substr($font_path_parts['basename'], 0, -(strlen($font_path_parts['extension']) + 1));
-		}
-		$font_name = strtolower($font_path_parts['filename']);
-		$font_name = preg_replace('/[^a-z0-9_]/', '', $font_name);
-		$search  = array('bold', 'oblique', 'italic', 'regular');
-		$replace = array('b', 'i', 'i', '');
-		$font_name = str_replace($search, $replace, $font_name);
-		if (empty($font_name)) {
-			// set generic name
-			$font_name = 'tcpdffont';
-		}
-		// set output path
-		if (empty($outpath)) {
-			$outpath = self::_getfontpath();
-		}
-		// check if this font already exist
-		if (@file_exists($outpath.$font_name.'.php')) {
-			// this font already exist (delete it from fonts folder to rebuild it)
-			return $font_name;
-		}
-		$fmetric['file'] = $font_name;
-		$fmetric['ctg'] = $font_name.'.ctg.z';
-		// get font data
-		$font = file_get_contents($fontfile);
-		$fmetric['originalsize'] = strlen($font);
-		// autodetect font type
-		if (empty($fonttype)) {
-			if (TCPDF_STATIC::_getULONG($font, 0) == 0x10000) {
-				// True Type (Unicode or not)
-				$fonttype = 'TrueTypeUnicode';
-			} elseif (substr($font, 0, 4) == 'OTTO') {
-				// Open Type (Unicode or not)
-				//Unsupported font format: OpenType with CFF data
-				return false;
-			} else {
-				// Type 1
-				$fonttype = 'Type1';
-			}
-		}
-		// set font type
-		switch ($fonttype) {
-			case 'CID0CT':
-			case 'CID0CS':
-			case 'CID0KR':
-			case 'CID0JP': {
-				$fmetric['type'] = 'cidfont0';
-				break;
-			}
-			case 'Type1': {
-				$fmetric['type'] = 'Type1';
-				if (empty($enc) AND (($flags & 4) == 0)) {
-					$enc = 'cp1252';
-				}
-				break;
-			}
-			case 'TrueType': {
-				$fmetric['type'] = 'TrueType';
-				break;
-			}
-			case 'TrueTypeUnicode':
-			default: {
-				$fmetric['type'] = 'TrueTypeUnicode';
-				break;
-			}
-		}
-		// set encoding maps (if any)
-		$fmetric['enc'] = preg_replace('/[^A-Za-z0-9_\-]/', '', $enc);
-		$fmetric['diff'] = '';
-		if (($fmetric['type'] == 'TrueType') OR ($fmetric['type'] == 'Type1')) {
-			if (!empty($enc) AND ($enc != 'cp1252') AND isset(TCPDF_FONT_DATA::$encmap[$enc])) {
-				// build differences from reference encoding
-				$enc_ref = TCPDF_FONT_DATA::$encmap['cp1252'];
-				$enc_target = TCPDF_FONT_DATA::$encmap[$enc];
-				$last = 0;
-				for ($i = 32; $i <= 255; ++$i) {
-					if ($enc_target[$i] != $enc_ref[$i]) {
-						if ($i != ($last + 1)) {
-							$fmetric['diff'] .= $i.' ';
-						}
-						$last = $i;
-						$fmetric['diff'] .= '/'.$enc_target[$i].' ';
-					}
-				}
-			}
-		}
-		// parse the font by type
-		if ($fmetric['type'] == 'Type1') {
-			// ---------- TYPE 1 ----------
-			// read first segment
-			$a = unpack('Cmarker/Ctype/Vsize', substr($font, 0, 6));
-			if ($a['marker'] != 128) {
-				// Font file is not a valid binary Type1
-				return false;
-			}
-			$fmetric['size1'] = $a['size'];
-			$data = substr($font, 6, $fmetric['size1']);
-			// read second segment
-			$a = unpack('Cmarker/Ctype/Vsize', substr($font, (6 + $fmetric['size1']), 6));
-			if ($a['marker'] != 128) {
-				// Font file is not a valid binary Type1
-				return false;
-			}
-			$fmetric['size2'] = $a['size'];
-			$encrypted = substr($font, (12 + $fmetric['size1']), $fmetric['size2']);
-			$data .= $encrypted;
-			// store compressed font
-			$fmetric['file'] .= '.z';
-			$fp = TCPDF_STATIC::fopenLocal($outpath.$fmetric['file'], 'wb');
-			fwrite($fp, gzcompress($data));
-			fclose($fp);
-			// get font info
-			$fmetric['Flags'] = $flags;
-			preg_match ('#/FullName[\s]*\(([^\)]*)#', $font, $matches);
-			$fmetric['name'] = preg_replace('/[^a-zA-Z0-9_\-]/', '', $matches[1]);
-			preg_match('#/FontBBox[\s]*{([^}]*)#', $font, $matches);
-			$fmetric['bbox'] = trim($matches[1]);
-			$bv = explode(' ', $fmetric['bbox']);
-			$fmetric['Ascent'] = intval($bv[3]);
-			$fmetric['Descent'] = intval($bv[1]);
-			preg_match('#/ItalicAngle[\s]*([0-9\+\-]*)#', $font, $matches);
-			$fmetric['italicAngle'] = intval($matches[1]);
-			if ($fmetric['italicAngle'] != 0) {
-				$fmetric['Flags'] |= 64;
-			}
-			preg_match('#/UnderlinePosition[\s]*([0-9\+\-]*)#', $font, $matches);
-			$fmetric['underlinePosition'] = intval($matches[1]);
-			preg_match('#/UnderlineThickness[\s]*([0-9\+\-]*)#', $font, $matches);
-			$fmetric['underlineThickness'] = intval($matches[1]);
-			preg_match('#/isFixedPitch[\s]*([^\s]*)#', $font, $matches);
-			if ($matches[1] == 'true') {
-				$fmetric['Flags'] |= 1;
-			}
-			// get internal map
-			$imap = array();
-			if (preg_match_all('#dup[\s]([0-9]+)[\s]*/([^\s]*)[\s]put#sU', $font, $fmap, PREG_SET_ORDER) > 0) {
-				foreach ($fmap as $v) {
-					$imap[$v[2]] = $v[1];
-				}
-			}
-			// decrypt eexec encrypted part
-			$r = 55665; // eexec encryption constant
-			$c1 = 52845;
-			$c2 = 22719;
-			$elen = strlen($encrypted);
-			$eplain = '';
-			for ($i = 0; $i < $elen; ++$i) {
-				$chr = ord($encrypted[$i]);
-				$eplain .= chr($chr ^ ($r >> 8));
-				$r = ((($chr + $r) * $c1 + $c2) % 65536);
-			}
-			if (preg_match('#/ForceBold[\s]*([^\s]*)#', $eplain, $matches) > 0) {
-				if ($matches[1] == 'true') {
-					$fmetric['Flags'] |= 0x40000;
-				}
-			}
-			if (preg_match('#/StdVW[\s]*\[([^\]]*)#', $eplain, $matches) > 0) {
-				$fmetric['StemV'] = intval($matches[1]);
-			} else {
-				$fmetric['StemV'] = 70;
-			}
-			if (preg_match('#/StdHW[\s]*\[([^\]]*)#', $eplain, $matches) > 0) {
-				$fmetric['StemH'] = intval($matches[1]);
-			} else {
-				$fmetric['StemH'] = 30;
-			}
-			if (preg_match('#/BlueValues[\s]*\[([^\]]*)#', $eplain, $matches) > 0) {
-				$bv = explode(' ', $matches[1]);
-				if (count($bv) >= 6) {
-					$v1 = intval($bv[2]);
-					$v2 = intval($bv[4]);
-					if ($v1 <= $v2) {
-						$fmetric['XHeight'] = $v1;
-						$fmetric['CapHeight'] = $v2;
-					} else {
-						$fmetric['XHeight'] = $v2;
-						$fmetric['CapHeight'] = $v1;
-					}
-				} else {
-					$fmetric['XHeight'] = 450;
-					$fmetric['CapHeight'] = 700;
-				}
-			} else {
-				$fmetric['XHeight'] = 450;
-				$fmetric['CapHeight'] = 700;
-			}
-			// get the number of random bytes at the beginning of charstrings
-			if (preg_match('#/lenIV[\s]*([0-9]*)#', $eplain, $matches) > 0) {
-				$lenIV = intval($matches[1]);
-			} else {
-				$lenIV = 4;
-			}
-			$fmetric['Leading'] = 0;
-			// get charstring data
-			$eplain = substr($eplain, (strpos($eplain, '/CharStrings') + 1));
-			preg_match_all('#/([A-Za-z0-9\.]*)[\s][0-9]+[\s]RD[\s](.*)[\s]ND#sU', $eplain, $matches, PREG_SET_ORDER);
-			if (!empty($enc) AND isset(TCPDF_FONT_DATA::$encmap[$enc])) {
-				$enc_map = TCPDF_FONT_DATA::$encmap[$enc];
-			} else {
-				$enc_map = false;
-			}
-			$fmetric['cw'] = '';
-			$fmetric['MaxWidth'] = 0;
-			$cwidths = array();
-			foreach ($matches as $k => $v) {
-				$cid = 0;
-				if (isset($imap[$v[1]])) {
-					$cid = $imap[$v[1]];
-				} elseif ($enc_map !== false) {
-					$cid = array_search($v[1], $enc_map);
-					if ($cid === false) {
-						$cid = 0;
-					} elseif ($cid > 1000) {
-						$cid -= 1000;
-					}
-				}
-				// decrypt charstring encrypted part
-				$r = 4330; // charstring encryption constant
-				$c1 = 52845;
-				$c2 = 22719;
-				$cd = $v[2];
-				$clen = strlen($cd);
-				$ccom = array();
-				for ($i = 0; $i < $clen; ++$i) {
-					$chr = ord($cd[$i]);
-					$ccom[] = ($chr ^ ($r >> 8));
-					$r = ((($chr + $r) * $c1 + $c2) % 65536);
-				}
-				// decode numbers
-				$cdec = array();
-				$ck = 0;
-				$i = $lenIV;
-				while ($i < $clen) {
-					if ($ccom[$i] < 32) {
-						$cdec[$ck] = $ccom[$i];
-						if (($ck > 0) AND ($cdec[$ck] == 13)) {
-							// hsbw command: update width
-							$cwidths[$cid] = $cdec[($ck - 1)];
-						}
-						++$i;
-					} elseif (($ccom[$i] >= 32) AND ($ccom[$i] <= 246)) {
-						$cdec[$ck] = ($ccom[$i] - 139);
-						++$i;
-					} elseif (($ccom[$i] >= 247) AND ($ccom[$i] <= 250)) {
-						$cdec[$ck] = ((($ccom[$i] - 247) * 256) + $ccom[($i + 1)] + 108);
-						$i += 2;
-					} elseif (($ccom[$i] >= 251) AND ($ccom[$i] <= 254)) {
-						$cdec[$ck] = ((-($ccom[$i] - 251) * 256) - $ccom[($i + 1)] - 108);
-						$i += 2;
-					} elseif ($ccom[$i] == 255) {
-						$sval = chr($ccom[($i + 1)]).chr($ccom[($i + 2)]).chr($ccom[($i + 3)]).chr($ccom[($i + 4)]);
-						$vsval = unpack('li', $sval);
-						$cdec[$ck] = $vsval['i'];
-						$i += 5;
-					}
-					++$ck;
-				}
-			} // end for each matches
-			$fmetric['MissingWidth'] = $cwidths[0];
-			$fmetric['MaxWidth'] = $fmetric['MissingWidth'];
-			$fmetric['AvgWidth'] = 0;
-			// set chars widths
-			for ($cid = 0; $cid <= 255; ++$cid) {
-				if (isset($cwidths[$cid])) {
-					if ($cwidths[$cid] > $fmetric['MaxWidth']) {
-						$fmetric['MaxWidth'] = $cwidths[$cid];
-					}
-					$fmetric['AvgWidth'] += $cwidths[$cid];
-					$fmetric['cw'] .= ','.$cid.'=>'.$cwidths[$cid];
-				} else {
-					$fmetric['cw'] .= ','.$cid.'=>'.$fmetric['MissingWidth'];
-				}
-			}
-			$fmetric['AvgWidth'] = round($fmetric['AvgWidth'] / count($cwidths));
-		} else {
-			// ---------- TRUE TYPE ----------
-			$offset = 0; // offset position of the font data
-			if (TCPDF_STATIC::_getULONG($font, $offset) != 0x10000) {
-				// sfnt version must be 0x00010000 for TrueType version 1.0.
-				return false;
-			}
-			if ($fmetric['type'] != 'cidfont0') {
-				if ($link) {
-					// creates a symbolic link to the existing font
-					symlink($fontfile, $outpath.$fmetric['file']);
-				} else {
-					// store compressed font
-					$fmetric['file'] .= '.z';
-					$fp = TCPDF_STATIC::fopenLocal($outpath.$fmetric['file'], 'wb');
-					fwrite($fp, gzcompress($font));
-					fclose($fp);
-				}
-			}
-			$offset += 4;
-			// get number of tables
-			$numTables = TCPDF_STATIC::_getUSHORT($font, $offset);
-			$offset += 2;
-			// skip searchRange, entrySelector and rangeShift
-			$offset += 6;
-			// tables array
-			$table = array();
-			// ---------- get tables ----------
-			for ($i = 0; $i < $numTables; ++$i) {
-				// get table info
-				$tag = substr($font, $offset, 4);
-				$offset += 4;
-				$table[$tag] = array();
-				$table[$tag]['checkSum'] = TCPDF_STATIC::_getULONG($font, $offset);
-				$offset += 4;
-				$table[$tag]['offset'] = TCPDF_STATIC::_getULONG($font, $offset);
-				$offset += 4;
-				$table[$tag]['length'] = TCPDF_STATIC::_getULONG($font, $offset);
-				$offset += 4;
-			}
-			// check magicNumber
-			$offset = $table['head']['offset'] + 12;
-			if (TCPDF_STATIC::_getULONG($font, $offset) != 0x5F0F3CF5) {
-				// magicNumber must be 0x5F0F3CF5
-				return false;
-			}
-			$offset += 4;
-			$offset += 2; // skip flags
-			// get FUnits
-			$fmetric['unitsPerEm'] = TCPDF_STATIC::_getUSHORT($font, $offset);
-			$offset += 2;
-			// units ratio constant
-			$urk = (1000 / $fmetric['unitsPerEm']);
-			$offset += 16; // skip created, modified
-			$xMin = round(TCPDF_STATIC::_getFWORD($font, $offset) * $urk);
-			$offset += 2;
-			$yMin = round(TCPDF_STATIC::_getFWORD($font, $offset) * $urk);
-			$offset += 2;
-			$xMax = round(TCPDF_STATIC::_getFWORD($font, $offset) * $urk);
-			$offset += 2;
-			$yMax = round(TCPDF_STATIC::_getFWORD($font, $offset) * $urk);
-			$offset += 2;
-			$fmetric['bbox'] = ''.$xMin.' '.$yMin.' '.$xMax.' '.$yMax.'';
-			$macStyle = TCPDF_STATIC::_getUSHORT($font, $offset);
-			$offset += 2;
-			// PDF font flags
-			$fmetric['Flags'] = $flags;
-			if (($macStyle & 2) == 2) {
-				// italic flag
-				$fmetric['Flags'] |= 64;
-			}
-			// get offset mode (indexToLocFormat : 0 = short, 1 = long)
-			$offset = $table['head']['offset'] + 50;
-			$short_offset = (TCPDF_STATIC::_getSHORT($font, $offset) == 0);
-			$offset += 2;
-			// get the offsets to the locations of the glyphs in the font, relative to the beginning of the glyphData table
-			$indexToLoc = array();
-			$offset = $table['loca']['offset'];
-			if ($short_offset) {
-				// short version
-				$tot_num_glyphs = floor($table['loca']['length'] / 2); // numGlyphs + 1
-				for ($i = 0; $i < $tot_num_glyphs; ++$i) {
-					$indexToLoc[$i] = TCPDF_STATIC::_getUSHORT($font, $offset) * 2;
-					if (isset($indexToLoc[($i - 1)]) && ($indexToLoc[$i] == $indexToLoc[($i - 1)])) {
-						// the last glyph didn't have an outline
-						unset($indexToLoc[($i - 1)]);
-					}
-					$offset += 2;
-				}
-			} else {
-				// long version
-				$tot_num_glyphs = floor($table['loca']['length'] / 4); // numGlyphs + 1
-				for ($i = 0; $i < $tot_num_glyphs; ++$i) {
-					$indexToLoc[$i] = TCPDF_STATIC::_getULONG($font, $offset);
-					if (isset($indexToLoc[($i - 1)]) && ($indexToLoc[$i] == $indexToLoc[($i - 1)])) {
-						// the last glyph didn't have an outline
-						unset($indexToLoc[($i - 1)]);
-					}
-					$offset += 4;
-				}
-			}
-			// get glyphs indexes of chars from cmap table
-			$offset = $table['cmap']['offset'] + 2;
-			$numEncodingTables = TCPDF_STATIC::_getUSHORT($font, $offset);
-			$offset += 2;
-			$encodingTables = array();
-			for ($i = 0; $i < $numEncodingTables; ++$i) {
-				$encodingTables[$i]['platformID'] = TCPDF_STATIC::_getUSHORT($font, $offset);
-				$offset += 2;
-				$encodingTables[$i]['encodingID'] = TCPDF_STATIC::_getUSHORT($font, $offset);
-				$offset += 2;
-				$encodingTables[$i]['offset'] = TCPDF_STATIC::_getULONG($font, $offset);
-				$offset += 4;
-			}
-			// ---------- get os/2 metrics ----------
-			$offset = $table['OS/2']['offset'];
-			$offset += 2; // skip version
-			// xAvgCharWidth
-			$fmetric['AvgWidth'] = round(TCPDF_STATIC::_getFWORD($font, $offset) * $urk);
-			$offset += 2;
-			// usWeightClass
-			$usWeightClass = round(TCPDF_STATIC::_getUFWORD($font, $offset) * $urk);
-			// estimate StemV and StemH (400 = usWeightClass for Normal - Regular font)
-			$fmetric['StemV'] = round((70 * $usWeightClass) / 400);
-			$fmetric['StemH'] = round((30 * $usWeightClass) / 400);
-			$offset += 2;
-			$offset += 2; // usWidthClass
-			$fsType = TCPDF_STATIC::_getSHORT($font, $offset);
-			$offset += 2;
-			if ($fsType == 2) {
-				// This Font cannot be modified, embedded or exchanged in any manner without first obtaining permission of the legal owner.
-				return false;
-			}
-			// ---------- get font name ----------
-			$fmetric['name'] = '';
-			$offset = $table['name']['offset'];
-			$offset += 2; // skip Format selector (=0).
-			// Number of NameRecords that follow n.
-			$numNameRecords = TCPDF_STATIC::_getUSHORT($font, $offset);
-			$offset += 2;
-			// Offset to start of string storage (from start of table).
-			$stringStorageOffset = TCPDF_STATIC::_getUSHORT($font, $offset);
-			$offset += 2;
-			for ($i = 0; $i < $numNameRecords; ++$i) {
-				$offset += 6; // skip Platform ID, Platform-specific encoding ID, Language ID.
-				// Name ID.
-				$nameID = TCPDF_STATIC::_getUSHORT($font, $offset);
-				$offset += 2;
-				if ($nameID == 6) {
-					// String length (in bytes).
-					$stringLength = TCPDF_STATIC::_getUSHORT($font, $offset);
-					$offset += 2;
-					// String offset from start of storage area (in bytes).
-					$stringOffset = TCPDF_STATIC::_getUSHORT($font, $offset);
-					$offset += 2;
-					$offset = ($table['name']['offset'] + $stringStorageOffset + $stringOffset);
-					$fmetric['name'] = substr($font, $offset, $stringLength);
-					$fmetric['name'] = preg_replace('/[^a-zA-Z0-9_\-]/', '', $fmetric['name']);
-					break;
-				} else {
-					$offset += 4; // skip String length, String offset
-				}
-			}
-			if (empty($fmetric['name'])) {
-				$fmetric['name'] = $font_name;
-			}
-			// ---------- get post data ----------
-			$offset = $table['post']['offset'];
-			$offset += 4; // skip Format Type
-			$fmetric['italicAngle'] = TCPDF_STATIC::_getFIXED($font, $offset);
-			$offset += 4;
-			$fmetric['underlinePosition'] = round(TCPDF_STATIC::_getFWORD($font, $offset) * $urk);
-			$offset += 2;
-			$fmetric['underlineThickness'] = round(TCPDF_STATIC::_getFWORD($font, $offset) * $urk);
-			$offset += 2;
-			$isFixedPitch = (TCPDF_STATIC::_getULONG($font, $offset) == 0) ? false : true;
-			$offset += 2;
-			if ($isFixedPitch) {
-				$fmetric['Flags'] |= 1;
-			}
-			// ---------- get hhea data ----------
-			$offset = $table['hhea']['offset'];
-			$offset += 4; // skip Table version number
-			// Ascender
-			$fmetric['Ascent'] = round(TCPDF_STATIC::_getFWORD($font, $offset) * $urk);
-			$offset += 2;
-			// Descender
-			$fmetric['Descent'] = round(TCPDF_STATIC::_getFWORD($font, $offset) * $urk);
-			$offset += 2;
-			// LineGap
-			$fmetric['Leading'] = round(TCPDF_STATIC::_getFWORD($font, $offset) * $urk);
-			$offset += 2;
-			// advanceWidthMax
-			$fmetric['MaxWidth'] = round(TCPDF_STATIC::_getUFWORD($font, $offset) * $urk);
-			$offset += 2;
-			$offset += 22; // skip some values
-			// get the number of hMetric entries in hmtx table
-			$numberOfHMetrics = TCPDF_STATIC::_getUSHORT($font, $offset);
-			// ---------- get maxp data ----------
-			$offset = $table['maxp']['offset'];
-			$offset += 4; // skip Table version number
-			// get the the number of glyphs in the font.
-			$numGlyphs = TCPDF_STATIC::_getUSHORT($font, $offset);
-			// ---------- get CIDToGIDMap ----------
-			$ctg = array();
-			foreach ($encodingTables as $enctable) {
-				// get only specified Platform ID and Encoding ID
-				if (($enctable['platformID'] == $platid) AND ($enctable['encodingID'] == $encid)) {
-					$offset = $table['cmap']['offset'] + $enctable['offset'];
-					$format = TCPDF_STATIC::_getUSHORT($font, $offset);
-					$offset += 2;
-					switch ($format) {
-						case 0: { // Format 0: Byte encoding table
-							$offset += 4; // skip length and version/language
-							for ($c = 0; $c < 256; ++$c) {
-								$g = TCPDF_STATIC::_getBYTE($font, $offset);
-								$ctg[$c] = $g;
-								++$offset;
-							}
-							break;
-						}
-						case 2: { // Format 2: High-byte mapping through table
-							$offset += 4; // skip length and version/language
-							$numSubHeaders = 0;
-							for ($i = 0; $i < 256; ++$i) {
-								// Array that maps high bytes to subHeaders: value is subHeader index * 8.
-								$subHeaderKeys[$i] = (TCPDF_STATIC::_getUSHORT($font, $offset) / 8);
-								$offset += 2;
-								if ($numSubHeaders < $subHeaderKeys[$i]) {
-									$numSubHeaders = $subHeaderKeys[$i];
-								}
-							}
-							// the number of subHeaders is equal to the max of subHeaderKeys + 1
-							++$numSubHeaders;
-							// read subHeader structures
-							$subHeaders = array();
-							$numGlyphIndexArray = 0;
-							for ($k = 0; $k < $numSubHeaders; ++$k) {
-								$subHeaders[$k]['firstCode'] = TCPDF_STATIC::_getUSHORT($font, $offset);
-								$offset += 2;
-								$subHeaders[$k]['entryCount'] = TCPDF_STATIC::_getUSHORT($font, $offset);
-								$offset += 2;
-								$subHeaders[$k]['idDelta'] = TCPDF_STATIC::_getUSHORT($font, $offset);
-								$offset += 2;
-								$subHeaders[$k]['idRangeOffset'] = TCPDF_STATIC::_getUSHORT($font, $offset);
-								$offset += 2;
-								$subHeaders[$k]['idRangeOffset'] -= (2 + (($numSubHeaders - $k - 1) * 8));
-								$subHeaders[$k]['idRangeOffset'] /= 2;
-								$numGlyphIndexArray += $subHeaders[$k]['entryCount'];
-							}
-							for ($k = 0; $k < $numGlyphIndexArray; ++$k) {
-								$glyphIndexArray[$k] = TCPDF_STATIC::_getUSHORT($font, $offset);
-								$offset += 2;
-							}
-							for ($i = 0; $i < 256; ++$i) {
-								$k = $subHeaderKeys[$i];
-								if ($k == 0) {
-									// one byte code
-									$c = $i;
-									$g = $glyphIndexArray[0];
-									$ctg[$c] = $g;
-								} else {
-									// two bytes code
-									$start_byte = $subHeaders[$k]['firstCode'];
-									$end_byte = $start_byte + $subHeaders[$k]['entryCount'];
-									for ($j = $start_byte; $j < $end_byte; ++$j) {
-										// combine high and low bytes
-										$c = (($i << 8) + $j);
-										$idRangeOffset = ($subHeaders[$k]['idRangeOffset'] + $j - $subHeaders[$k]['firstCode']);
-										$g = ($glyphIndexArray[$idRangeOffset] + $subHeaders[$k]['idDelta']) % 65536;
-										if ($g < 0) {
-											$g = 0;
-										}
-										$ctg[$c] = $g;
-									}
-								}
-							}
-							break;
-						}
-						case 4: { // Format 4: Segment mapping to delta values
-							$length = TCPDF_STATIC::_getUSHORT($font, $offset);
-							$offset += 2;
-							$offset += 2; // skip version/language
-							$segCount = floor(TCPDF_STATIC::_getUSHORT($font, $offset) / 2);
-							$offset += 2;
-							$offset += 6; // skip searchRange, entrySelector, rangeShift
-							$endCount = array(); // array of end character codes for each segment
-							for ($k = 0; $k < $segCount; ++$k) {
-								$endCount[$k] = TCPDF_STATIC::_getUSHORT($font, $offset);
-								$offset += 2;
-							}
-							$offset += 2; // skip reservedPad
-							$startCount = array(); // array of start character codes for each segment
-							for ($k = 0; $k < $segCount; ++$k) {
-								$startCount[$k] = TCPDF_STATIC::_getUSHORT($font, $offset);
-								$offset += 2;
-							}
-							$idDelta = array(); // delta for all character codes in segment
-							for ($k = 0; $k < $segCount; ++$k) {
-								$idDelta[$k] = TCPDF_STATIC::_getUSHORT($font, $offset);
-								$offset += 2;
-							}
-							$idRangeOffset = array(); // Offsets into glyphIdArray or 0
-							for ($k = 0; $k < $segCount; ++$k) {
-								$idRangeOffset[$k] = TCPDF_STATIC::_getUSHORT($font, $offset);
-								$offset += 2;
-							}
-							$gidlen = (floor($length / 2) - 8 - (4 * $segCount));
-							$glyphIdArray = array(); // glyph index array
-							for ($k = 0; $k < $gidlen; ++$k) {
-								$glyphIdArray[$k] = TCPDF_STATIC::_getUSHORT($font, $offset);
-								$offset += 2;
-							}
-							for ($k = 0; $k < $segCount; ++$k) {
-								for ($c = $startCount[$k]; $c <= $endCount[$k]; ++$c) {
-									if ($idRangeOffset[$k] == 0) {
-										$g = ($idDelta[$k] + $c) % 65536;
-									} else {
-										$gid = (floor($idRangeOffset[$k] / 2) + ($c - $startCount[$k]) - ($segCount - $k));
-										$g = ($glyphIdArray[$gid] + $idDelta[$k]) % 65536;
-									}
-									if ($g < 0) {
-										$g = 0;
-									}
-									$ctg[$c] = $g;
-								}
-							}
-							break;
-						}
-						case 6: { // Format 6: Trimmed table mapping
-							$offset += 4; // skip length and version/language
-							$firstCode = TCPDF_STATIC::_getUSHORT($font, $offset);
-							$offset += 2;
-							$entryCount = TCPDF_STATIC::_getUSHORT($font, $offset);
-							$offset += 2;
-							for ($k = 0; $k < $entryCount; ++$k) {
-								$c = ($k + $firstCode);
-								$g = TCPDF_STATIC::_getUSHORT($font, $offset);
-								$offset += 2;
-								$ctg[$c] = $g;
-							}
-							break;
-						}
-						case 8: { // Format 8: Mixed 16-bit and 32-bit coverage
-							$offset += 10; // skip reserved, length and version/language
-							for ($k = 0; $k < 8192; ++$k) {
-								$is32[$k] = TCPDF_STATIC::_getBYTE($font, $offset);
-								++$offset;
-							}
-							$nGroups = TCPDF_STATIC::_getULONG($font, $offset);
-							$offset += 4;
-							for ($i = 0; $i < $nGroups; ++$i) {
-								$startCharCode = TCPDF_STATIC::_getULONG($font, $offset);
-								$offset += 4;
-								$endCharCode = TCPDF_STATIC::_getULONG($font, $offset);
-								$offset += 4;
-								$startGlyphID = TCPDF_STATIC::_getULONG($font, $offset);
-								$offset += 4;
-								for ($k = $startCharCode; $k <= $endCharCode; ++$k) {
-									$is32idx = floor($c / 8);
-									if ((isset($is32[$is32idx])) AND (($is32[$is32idx] & (1 << (7 - ($c % 8)))) == 0)) {
-										$c = $k;
-									} else {
-										// 32 bit format
-										// convert to decimal (http://www.unicode.org/faq//utf_bom.html#utf16-4)
-										//LEAD_OFFSET = (0xD800 - (0x10000 >> 10)) = 55232
-										//SURROGATE_OFFSET = (0x10000 - (0xD800 << 10) - 0xDC00) = -56613888
-										$c = ((55232 + ($k >> 10)) << 10) + (0xDC00 + ($k & 0x3FF)) -56613888;
-									}
-									$ctg[$c] = 0;
-									++$startGlyphID;
-								}
-							}
-							break;
-						}
-						case 10: { // Format 10: Trimmed array
-							$offset += 10; // skip reserved, length and version/language
-							$startCharCode = TCPDF_STATIC::_getULONG($font, $offset);
-							$offset += 4;
-							$numChars = TCPDF_STATIC::_getULONG($font, $offset);
-							$offset += 4;
-							for ($k = 0; $k < $numChars; ++$k) {
-								$c = ($k + $startCharCode);
-								$g = TCPDF_STATIC::_getUSHORT($font, $offset);
-								$ctg[$c] = $g;
-								$offset += 2;
-							}
-							break;
-						}
-						case 12: { // Format 12: Segmented coverage
-							$offset += 10; // skip length and version/language
-							$nGroups = TCPDF_STATIC::_getULONG($font, $offset);
-							$offset += 4;
-							for ($k = 0; $k < $nGroups; ++$k) {
-								$startCharCode = TCPDF_STATIC::_getULONG($font, $offset);
-								$offset += 4;
-								$endCharCode = TCPDF_STATIC::_getULONG($font, $offset);
-								$offset += 4;
-								$startGlyphCode = TCPDF_STATIC::_getULONG($font, $offset);
-								$offset += 4;
-								for ($c = $startCharCode; $c <= $endCharCode; ++$c) {
-									$ctg[$c] = $startGlyphCode;
-									++$startGlyphCode;
-								}
-							}
-							break;
-						}
-						case 13: { // Format 13: Many-to-one range mappings
-							// to be implemented ...
-							break;
-						}
-						case 14: { // Format 14: Unicode Variation Sequences
-							// to be implemented ...
-							break;
-						}
-					}
-				}
-			}
-			if (!isset($ctg[0])) {
-				$ctg[0] = 0;
-			}
-			// get xHeight (height of x)
-			$offset = ($table['glyf']['offset'] + $indexToLoc[$ctg[120]] + 4);
-			$yMin = TCPDF_STATIC::_getFWORD($font, $offset);
-			$offset += 4;
-			$yMax = TCPDF_STATIC::_getFWORD($font, $offset);
-			$offset += 2;
-			$fmetric['XHeight'] = round(($yMax - $yMin) * $urk);
-			// get CapHeight (height of H)
-			$offset = ($table['glyf']['offset'] + $indexToLoc[$ctg[72]] + 4);
-			$yMin = TCPDF_STATIC::_getFWORD($font, $offset);
-			$offset += 4;
-			$yMax = TCPDF_STATIC::_getFWORD($font, $offset);
-			$offset += 2;
-			$fmetric['CapHeight'] = round(($yMax - $yMin) * $urk);
-			// ceate widths array
-			$cw = array();
-			$offset = $table['hmtx']['offset'];
-			for ($i = 0 ; $i < $numberOfHMetrics; ++$i) {
-				$cw[$i] = round(TCPDF_STATIC::_getUFWORD($font, $offset) * $urk);
-				$offset += 4; // skip lsb
-			}
-			if ($numberOfHMetrics < $numGlyphs) {
-				// fill missing widths with the last value
-				$cw = array_pad($cw, $numGlyphs, $cw[($numberOfHMetrics - 1)]);
-			}
-			$fmetric['MissingWidth'] = $cw[0];
-			$fmetric['cw'] = '';
-			$fmetric['cbbox'] = '';
-			for ($cid = 0; $cid <= 65535; ++$cid) {
-				if (isset($ctg[$cid])) {
-					if (isset($cw[$ctg[$cid]])) {
-						$fmetric['cw'] .= ','.$cid.'=>'.$cw[$ctg[$cid]];
-					}
-					if ($addcbbox AND isset($indexToLoc[$ctg[$cid]])) {
-						$offset = ($table['glyf']['offset'] + $indexToLoc[$ctg[$cid]]);
-						$xMin = round(TCPDF_STATIC::_getFWORD($font, $offset + 2) * $urk);
-						$yMin = round(TCPDF_STATIC::_getFWORD($font, $offset + 4) * $urk);
-						$xMax = round(TCPDF_STATIC::_getFWORD($font, $offset + 6) * $urk);
-						$yMax = round(TCPDF_STATIC::_getFWORD($font, $offset + 8) * $urk);
-						$fmetric['cbbox'] .= ','.$cid.'=>array('.$xMin.','.$yMin.','.$xMax.','.$yMax.')';
-					}
-				}
-			}
-		} // end of true type
-		if (($fmetric['type'] == 'TrueTypeUnicode') AND (count($ctg) == 256)) {
-			$fmetric['type'] = 'TrueType';
-		}
-		// ---------- create php font file ----------
-		$pfile = '<'.'?'.'php'."\n";
-		$pfile .= '// TCPDF FONT FILE DESCRIPTION'."\n";
-		$pfile .= '$type=\''.$fmetric['type'].'\';'."\n";
-		$pfile .= '$name=\''.$fmetric['name'].'\';'."\n";
-		$pfile .= '$up='.$fmetric['underlinePosition'].';'."\n";
-		$pfile .= '$ut='.$fmetric['underlineThickness'].';'."\n";
-		if ($fmetric['MissingWidth'] > 0) {
-			$pfile .= '$dw='.$fmetric['MissingWidth'].';'."\n";
-		} else {
-			$pfile .= '$dw='.$fmetric['AvgWidth'].';'."\n";
-		}
-		$pfile .= '$diff=\''.$fmetric['diff'].'\';'."\n";
-		if ($fmetric['type'] == 'Type1') {
-			// Type 1
-			$pfile .= '$enc=\''.$fmetric['enc'].'\';'."\n";
-			$pfile .= '$file=\''.$fmetric['file'].'\';'."\n";
-			$pfile .= '$size1='.$fmetric['size1'].';'."\n";
-			$pfile .= '$size2='.$fmetric['size2'].';'."\n";
-		} else {
-			$pfile .= '$originalsize='.$fmetric['originalsize'].';'."\n";
-			if ($fmetric['type'] == 'cidfont0') {
-				// CID-0
-				switch ($fonttype) {
-					case 'CID0JP': {
-						$pfile .= '// Japanese'."\n";
-						$pfile .= '$enc=\'UniJIS-UTF16-H\';'."\n";
-						$pfile .= '$cidinfo=array(\'Registry\'=>\'Adobe\', \'Ordering\'=>\'Japan1\',\'Supplement\'=>5);'."\n";
-						$pfile .= 'include(dirname(__FILE__).\'/uni2cid_aj16.php\');'."\n";
-						break;
-					}
-					case 'CID0KR': {
-						$pfile .= '// Korean'."\n";
-						$pfile .= '$enc=\'UniKS-UTF16-H\';'."\n";
-						$pfile .= '$cidinfo=array(\'Registry\'=>\'Adobe\', \'Ordering\'=>\'Korea1\',\'Supplement\'=>0);'."\n";
-						$pfile .= 'include(dirname(__FILE__).\'/uni2cid_ak12.php\');'."\n";
-						break;
-					}
-					case 'CID0CS': {
-						$pfile .= '// Chinese Simplified'."\n";
-						$pfile .= '$enc=\'UniGB-UTF16-H\';'."\n";
-						$pfile .= '$cidinfo=array(\'Registry\'=>\'Adobe\', \'Ordering\'=>\'GB1\',\'Supplement\'=>2);'."\n";
-						$pfile .= 'include(dirname(__FILE__).\'/uni2cid_ag15.php\');'."\n";
-						break;
-					}
-					case 'CID0CT':
-					default: {
-						$pfile .= '// Chinese Traditional'."\n";
-						$pfile .= '$enc=\'UniCNS-UTF16-H\';'."\n";
-						$pfile .= '$cidinfo=array(\'Registry\'=>\'Adobe\', \'Ordering\'=>\'CNS1\',\'Supplement\'=>0);'."\n";
-						$pfile .= 'include(dirname(__FILE__).\'/uni2cid_aj16.php\');'."\n";
-						break;
-					}
-				}
-			} else {
-				// TrueType
-				$pfile .= '$enc=\''.$fmetric['enc'].'\';'."\n";
-				$pfile .= '$file=\''.$fmetric['file'].'\';'."\n";
-				$pfile .= '$ctg=\''.$fmetric['ctg'].'\';'."\n";
-				// create CIDToGIDMap
-				$cidtogidmap = str_pad('', 131072, "\x00"); // (256 * 256 * 2) = 131072
-				foreach ($ctg as $cid => $gid) {
-					$cidtogidmap = self::updateCIDtoGIDmap($cidtogidmap, $cid, $ctg[$cid]);
-				}
-				// store compressed CIDToGIDMap
-				$fp = TCPDF_STATIC::fopenLocal($outpath.$fmetric['ctg'], 'wb');
-				fwrite($fp, gzcompress($cidtogidmap));
-				fclose($fp);
-			}
-		}
-		$pfile .= '$desc=array(';
-		$pfile .= '\'Flags\'=>'.$fmetric['Flags'].',';
-		$pfile .= '\'FontBBox\'=>\'['.$fmetric['bbox'].']\',';
-		$pfile .= '\'ItalicAngle\'=>'.$fmetric['italicAngle'].',';
-		$pfile .= '\'Ascent\'=>'.$fmetric['Ascent'].',';
-		$pfile .= '\'Descent\'=>'.$fmetric['Descent'].',';
-		$pfile .= '\'Leading\'=>'.$fmetric['Leading'].',';
-		$pfile .= '\'CapHeight\'=>'.$fmetric['CapHeight'].',';
-		$pfile .= '\'XHeight\'=>'.$fmetric['XHeight'].',';
-		$pfile .= '\'StemV\'=>'.$fmetric['StemV'].',';
-		$pfile .= '\'StemH\'=>'.$fmetric['StemH'].',';
-		$pfile .= '\'AvgWidth\'=>'.$fmetric['AvgWidth'].',';
-		$pfile .= '\'MaxWidth\'=>'.$fmetric['MaxWidth'].',';
-		$pfile .= '\'MissingWidth\'=>'.$fmetric['MissingWidth'].'';
-		$pfile .= ');'."\n";
-		if (!empty($fmetric['cbbox'])) {
-			$pfile .= '$cbbox=array('.substr($fmetric['cbbox'], 1).');'."\n";
-		}
-		$pfile .= '$cw=array('.substr($fmetric['cw'], 1).');'."\n";
-		$pfile .= '// --- EOF ---'."\n";
-		// store file
-		$fp = TCPDF_STATIC::fopenLocal($outpath.$font_name.'.php', 'w');
-		fwrite($fp, $pfile);
-		fclose($fp);
-		// return TCPDF font name
-		return $font_name;
-	}
-
-	/**
-	 * Returs the checksum of a TTF table.
-	 * @param $table (string) table to check
-	 * @param $length (int) length of table in bytes
-	 * @return int checksum
-	 * @author Nicola Asuni
-	 * @since 5.2.000 (2010-06-02)
-	 * @public static
-	 */
-	public static function _getTTFtableChecksum($table, $length) {
-		$sum = 0;
-		$tlen = ($length / 4);
-		$offset = 0;
-		for ($i = 0; $i < $tlen; ++$i) {
-			$v = unpack('Ni', substr($table, $offset, 4));
-			$sum += $v['i'];
-			$offset += 4;
-		}
-		$sum = unpack('Ni', pack('N', $sum));
-		return $sum['i'];
-	}
-
-	/**
-	 * Returns a subset of the TrueType font data without the unused glyphs.
-	 * @param $font (string) TrueType font data.
-	 * @param $subsetchars (array) Array of used characters (the glyphs to keep).
-	 * @return (string) A subset of TrueType font data without the unused glyphs.
-	 * @author Nicola Asuni
-	 * @since 5.2.000 (2010-06-02)
-	 * @public static
-	 */
-	public static function _getTrueTypeFontSubset($font, $subsetchars) {
-		ksort($subsetchars);
-		$offset = 0; // offset position of the font data
-		if (TCPDF_STATIC::_getULONG($font, $offset) != 0x10000) {
-			// sfnt version must be 0x00010000 for TrueType version 1.0.
-			return $font;
-		}
-		$offset += 4;
-		// get number of tables
-		$numTables = TCPDF_STATIC::_getUSHORT($font, $offset);
-		$offset += 2;
-		// skip searchRange, entrySelector and rangeShift
-		$offset += 6;
-		// tables array
-		$table = array();
-		// for each table
-		for ($i = 0; $i < $numTables; ++$i) {
-			// get table info
-			$tag = substr($font, $offset, 4);
-			$offset += 4;
-			$table[$tag] = array();
-			$table[$tag]['checkSum'] = TCPDF_STATIC::_getULONG($font, $offset);
-			$offset += 4;
-			$table[$tag]['offset'] = TCPDF_STATIC::_getULONG($font, $offset);
-			$offset += 4;
-			$table[$tag]['length'] = TCPDF_STATIC::_getULONG($font, $offset);
-			$offset += 4;
-		}
-		// check magicNumber
-		$offset = $table['head']['offset'] + 12;
-		if (TCPDF_STATIC::_getULONG($font, $offset) != 0x5F0F3CF5) {
-			// magicNumber must be 0x5F0F3CF5
-			return $font;
-		}
-		$offset += 4;
-		// get offset mode (indexToLocFormat : 0 = short, 1 = long)
-		$offset = $table['head']['offset'] + 50;
-		$short_offset = (TCPDF_STATIC::_getSHORT($font, $offset) == 0);
-		$offset += 2;
-		// get the offsets to the locations of the glyphs in the font, relative to the beginning of the glyphData table
-		$indexToLoc = array();
-		$offset = $table['loca']['offset'];
-		if ($short_offset) {
-			// short version
-			$tot_num_glyphs = floor($table['loca']['length'] / 2); // numGlyphs + 1
-			for ($i = 0; $i < $tot_num_glyphs; ++$i) {
-				$indexToLoc[$i] = TCPDF_STATIC::_getUSHORT($font, $offset) * 2;
-				$offset += 2;
-			}
-		} else {
-			// long version
-			$tot_num_glyphs = ($table['loca']['length'] / 4); // numGlyphs + 1
-			for ($i = 0; $i < $tot_num_glyphs; ++$i) {
-				$indexToLoc[$i] = TCPDF_STATIC::_getULONG($font, $offset);
-				$offset += 4;
-			}
-		}
-		// get glyphs indexes of chars from cmap table
-		$subsetglyphs = array(); // glyph IDs on key
-		$subsetglyphs[0] = true; // character codes that do not correspond to any glyph in the font should be mapped to glyph index 0
-		$offset = $table['cmap']['offset'] + 2;
-		$numEncodingTables = TCPDF_STATIC::_getUSHORT($font, $offset);
-		$offset += 2;
-		$encodingTables = array();
-		for ($i = 0; $i < $numEncodingTables; ++$i) {
-			$encodingTables[$i]['platformID'] = TCPDF_STATIC::_getUSHORT($font, $offset);
-			$offset += 2;
-			$encodingTables[$i]['encodingID'] = TCPDF_STATIC::_getUSHORT($font, $offset);
-			$offset += 2;
-			$encodingTables[$i]['offset'] = TCPDF_STATIC::_getULONG($font, $offset);
-			$offset += 4;
-		}
-		foreach ($encodingTables as $enctable) {
-			// get all platforms and encodings
-			$offset = $table['cmap']['offset'] + $enctable['offset'];
-			$format = TCPDF_STATIC::_getUSHORT($font, $offset);
-			$offset += 2;
-			switch ($format) {
-				case 0: { // Format 0: Byte encoding table
-					$offset += 4; // skip length and version/language
-					for ($c = 0; $c < 256; ++$c) {
-						if (isset($subsetchars[$c])) {
-							$g = TCPDF_STATIC::_getBYTE($font, $offset);
-							$subsetglyphs[$g] = true;
-						}
-						++$offset;
-					}
-					break;
-				}
-				case 2: { // Format 2: High-byte mapping through table
-					$offset += 4; // skip length and version/language
-					$numSubHeaders = 0;
-					for ($i = 0; $i < 256; ++$i) {
-						// Array that maps high bytes to subHeaders: value is subHeader index * 8.
-						$subHeaderKeys[$i] = (TCPDF_STATIC::_getUSHORT($font, $offset) / 8);
-						$offset += 2;
-						if ($numSubHeaders < $subHeaderKeys[$i]) {
-							$numSubHeaders = $subHeaderKeys[$i];
-						}
-					}
-					// the number of subHeaders is equal to the max of subHeaderKeys + 1
-					++$numSubHeaders;
-					// read subHeader structures
-					$subHeaders = array();
-					$numGlyphIndexArray = 0;
-					for ($k = 0; $k < $numSubHeaders; ++$k) {
-						$subHeaders[$k]['firstCode'] = TCPDF_STATIC::_getUSHORT($font, $offset);
-						$offset += 2;
-						$subHeaders[$k]['entryCount'] = TCPDF_STATIC::_getUSHORT($font, $offset);
-						$offset += 2;
-						$subHeaders[$k]['idDelta'] = TCPDF_STATIC::_getUSHORT($font, $offset);
-						$offset += 2;
-						$subHeaders[$k]['idRangeOffset'] = TCPDF_STATIC::_getUSHORT($font, $offset);
-						$offset += 2;
-						$subHeaders[$k]['idRangeOffset'] -= (2 + (($numSubHeaders - $k - 1) * 8));
-						$subHeaders[$k]['idRangeOffset'] /= 2;
-						$numGlyphIndexArray += $subHeaders[$k]['entryCount'];
-					}
-					for ($k = 0; $k < $numGlyphIndexArray; ++$k) {
-						$glyphIndexArray[$k] = TCPDF_STATIC::_getUSHORT($font, $offset);
-						$offset += 2;
-					}
-					for ($i = 0; $i < 256; ++$i) {
-						$k = $subHeaderKeys[$i];
-						if ($k == 0) {
-							// one byte code
-							$c = $i;
-							if (isset($subsetchars[$c])) {
-								$g = $glyphIndexArray[0];
-								$subsetglyphs[$g] = true;
-							}
-						} else {
-							// two bytes code
-							$start_byte = $subHeaders[$k]['firstCode'];
-							$end_byte = $start_byte + $subHeaders[$k]['entryCount'];
-							for ($j = $start_byte; $j < $end_byte; ++$j) {
-								// combine high and low bytes
-								$c = (($i << 8) + $j);
-								if (isset($subsetchars[$c])) {
-									$idRangeOffset = ($subHeaders[$k]['idRangeOffset'] + $j - $subHeaders[$k]['firstCode']);
-									$g = ($glyphIndexArray[$idRangeOffset] + $subHeaders[$k]['idDelta']) % 65536;
-									if ($g < 0) {
-										$g = 0;
-									}
-									$subsetglyphs[$g] = true;
-								}
-							}
-						}
-					}
-					break;
-				}
-				case 4: { // Format 4: Segment mapping to delta values
-					$length = TCPDF_STATIC::_getUSHORT($font, $offset);
-					$offset += 2;
-					$offset += 2; // skip version/language
-					$segCount = floor(TCPDF_STATIC::_getUSHORT($font, $offset) / 2);
-					$offset += 2;
-					$offset += 6; // skip searchRange, entrySelector, rangeShift
-					$endCount = array(); // array of end character codes for each segment
-					for ($k = 0; $k < $segCount; ++$k) {
-						$endCount[$k] = TCPDF_STATIC::_getUSHORT($font, $offset);
-						$offset += 2;
-					}
-					$offset += 2; // skip reservedPad
-					$startCount = array(); // array of start character codes for each segment
-					for ($k = 0; $k < $segCount; ++$k) {
-						$startCount[$k] = TCPDF_STATIC::_getUSHORT($font, $offset);
-						$offset += 2;
-					}
-					$idDelta = array(); // delta for all character codes in segment
-					for ($k = 0; $k < $segCount; ++$k) {
-						$idDelta[$k] = TCPDF_STATIC::_getUSHORT($font, $offset);
-						$offset += 2;
-					}
-					$idRangeOffset = array(); // Offsets into glyphIdArray or 0
-					for ($k = 0; $k < $segCount; ++$k) {
-						$idRangeOffset[$k] = TCPDF_STATIC::_getUSHORT($font, $offset);
-						$offset += 2;
-					}
-					$gidlen = (floor($length / 2) - 8 - (4 * $segCount));
-					$glyphIdArray = array(); // glyph index array
-					for ($k = 0; $k < $gidlen; ++$k) {
-						$glyphIdArray[$k] = TCPDF_STATIC::_getUSHORT($font, $offset);
-						$offset += 2;
-					}
-					for ($k = 0; $k < $segCount; ++$k) {
-						for ($c = $startCount[$k]; $c <= $endCount[$k]; ++$c) {
-							if (isset($subsetchars[$c])) {
-								if ($idRangeOffset[$k] == 0) {
-									$g = ($idDelta[$k] + $c) % 65536;
-								} else {
-									$gid = (floor($idRangeOffset[$k] / 2) + ($c - $startCount[$k]) - ($segCount - $k));
-									$g = ($glyphIdArray[$gid] + $idDelta[$k]) % 65536;
-								}
-								if ($g < 0) {
-									$g = 0;
-								}
-								$subsetglyphs[$g] = true;
-							}
-						}
-					}	
-					break;
-				}
-				case 6: { // Format 6: Trimmed table mapping
-					$offset += 4; // skip length and version/language
-					$firstCode = TCPDF_STATIC::_getUSHORT($font, $offset);
-					$offset += 2;
-					$entryCount = TCPDF_STATIC::_getUSHORT($font, $offset);
-					$offset += 2;
-					for ($k = 0; $k < $entryCount; ++$k) {
-						$c = ($k + $firstCode);
-						if (isset($subsetchars[$c])) {
-							$g = TCPDF_STATIC::_getUSHORT($font, $offset);
-							$subsetglyphs[$g] = true;
-						}
-						$offset += 2;
-					}
-					break;
-				}
-				case 8: { // Format 8: Mixed 16-bit and 32-bit coverage
-					$offset += 10; // skip reserved, length and version/language
-					for ($k = 0; $k < 8192; ++$k) {
-						$is32[$k] = TCPDF_STATIC::_getBYTE($font, $offset);
-						++$offset;
-					}
-					$nGroups = TCPDF_STATIC::_getULONG($font, $offset);
-					$offset += 4;
-					for ($i = 0; $i < $nGroups; ++$i) {
-						$startCharCode = TCPDF_STATIC::_getULONG($font, $offset);
-						$offset += 4;
-						$endCharCode = TCPDF_STATIC::_getULONG($font, $offset);
-						$offset += 4;
-						$startGlyphID = TCPDF_STATIC::_getULONG($font, $offset);
-						$offset += 4;
-						for ($k = $startCharCode; $k <= $endCharCode; ++$k) {
-							$is32idx = floor($c / 8);
-							if ((isset($is32[$is32idx])) AND (($is32[$is32idx] & (1 << (7 - ($c % 8)))) == 0)) {
-								$c = $k;
-							} else {
-								// 32 bit format
-								// convert to decimal (http://www.unicode.org/faq//utf_bom.html#utf16-4)
-								//LEAD_OFFSET = (0xD800 - (0x10000 >> 10)) = 55232
-								//SURROGATE_OFFSET = (0x10000 - (0xD800 << 10) - 0xDC00) = -56613888
-								$c = ((55232 + ($k >> 10)) << 10) + (0xDC00 + ($k & 0x3FF)) -56613888;
-							}
-							if (isset($subsetchars[$c])) {
-								$subsetglyphs[$startGlyphID] = true;
-							}
-							++$startGlyphID;
-						}
-					}
-					break;
-				}
-				case 10: { // Format 10: Trimmed array
-					$offset += 10; // skip reserved, length and version/language
-					$startCharCode = TCPDF_STATIC::_getULONG($font, $offset);
-					$offset += 4;
-					$numChars = TCPDF_STATIC::_getULONG($font, $offset);
-					$offset += 4;
-					for ($k = 0; $k < $numChars; ++$k) {
-						$c = ($k + $startCharCode);
-						if (isset($subsetchars[$c])) {
-							$g = TCPDF_STATIC::_getUSHORT($font, $offset);
-							$subsetglyphs[$g] = true;
-						}
-						$offset += 2;
-					}
-					break;
-				}
-				case 12: { // Format 12: Segmented coverage
-					$offset += 10; // skip length and version/language
-					$nGroups = TCPDF_STATIC::_getULONG($font, $offset);
-					$offset += 4;
-					for ($k = 0; $k < $nGroups; ++$k) {
-						$startCharCode = TCPDF_STATIC::_getULONG($font, $offset);
-						$offset += 4;
-						$endCharCode = TCPDF_STATIC::_getULONG($font, $offset);
-						$offset += 4;
-						$startGlyphCode = TCPDF_STATIC::_getULONG($font, $offset);
-						$offset += 4;
-						for ($c = $startCharCode; $c <= $endCharCode; ++$c) {
-							if (isset($subsetchars[$c])) {
-								$subsetglyphs[$startGlyphCode] = true;
-							}
-							++$startGlyphCode;
-						}
-					}
-					break;
-				}
-				case 13: { // Format 13: Many-to-one range mappings
-					// to be implemented ...
-					break;
-				}
-				case 14: { // Format 14: Unicode Variation Sequences
-					// to be implemented ...
-					break;
-				}
-			}
-		}
-		// include all parts of composite glyphs
-		$new_sga = $subsetglyphs;
-		while (!empty($new_sga)) {
-			$sga = $new_sga;
-			$new_sga = array();
-			foreach ($sga as $key => $val) {
-				if (isset($indexToLoc[$key])) {
-					$offset = ($table['glyf']['offset'] + $indexToLoc[$key]);
-					$numberOfContours = TCPDF_STATIC::_getSHORT($font, $offset);
-					$offset += 2;
-					if ($numberOfContours < 0) { // composite glyph
-						$offset += 8; // skip xMin, yMin, xMax, yMax
-						do {
-							$flags = TCPDF_STATIC::_getUSHORT($font, $offset);
-							$offset += 2;
-							$glyphIndex = TCPDF_STATIC::_getUSHORT($font, $offset);
-							$offset += 2;
-							if (!isset($subsetglyphs[$glyphIndex])) {
-								// add missing glyphs
-								$new_sga[$glyphIndex] = true;
-							}
-							// skip some bytes by case
-							if ($flags & 1) {
-								$offset += 4;
-							} else {
-								$offset += 2;
-							}
-							if ($flags & 8) {
-								$offset += 2;
-							} elseif ($flags & 64) {
-								$offset += 4;
-							} elseif ($flags & 128) {
-								$offset += 8;
-							}
-						} while ($flags & 32);
-					}
-				}
-			}
-			$subsetglyphs += $new_sga;
-		}
-		// sort glyphs by key (and remove duplicates)
-		ksort($subsetglyphs);
-		// build new glyf and loca tables
-		$glyf = '';
-		$loca = '';
-		$offset = 0;
-		$glyf_offset = $table['glyf']['offset'];
-		for ($i = 0; $i < $tot_num_glyphs; ++$i) {
-			if (isset($subsetglyphs[$i])) {
-				$length = ($indexToLoc[($i + 1)] - $indexToLoc[$i]);
-				$glyf .= substr($font, ($glyf_offset + $indexToLoc[$i]), $length);
-			} else {
-				$length = 0;
-			}
-			if ($short_offset) {
-				$loca .= pack('n', floor($offset / 2));
-			} else {
-				$loca .= pack('N', $offset);
-			}
-			$offset += $length;
-		}
-		// array of table names to preserve (loca and glyf tables will be added later)
-		// the cmap table is not needed and shall not be present, since the mapping from character codes to glyph descriptions is provided separately
-		$table_names = array ('head', 'hhea', 'hmtx', 'maxp', 'cvt ', 'fpgm', 'prep'); // minimum required table names
-		// get the tables to preserve
-		$offset = 12;
-		foreach ($table as $tag => $val) {
-			if (in_array($tag, $table_names)) {
-				$table[$tag]['data'] = substr($font, $table[$tag]['offset'], $table[$tag]['length']);
-				if ($tag == 'head') {
-					// set the checkSumAdjustment to 0
-					$table[$tag]['data'] = substr($table[$tag]['data'], 0, 8)."\x0\x0\x0\x0".substr($table[$tag]['data'], 12);
-				}
-				$pad = 4 - ($table[$tag]['length'] % 4);
-				if ($pad != 4) {
-					// the length of a table must be a multiple of four bytes
-					$table[$tag]['length'] += $pad;
-					$table[$tag]['data'] .= str_repeat("\x0", $pad);
-				}
-				$table[$tag]['offset'] = $offset;
-				$offset += $table[$tag]['length'];
-				// check sum is not changed (so keep the following line commented)
-				//$table[$tag]['checkSum'] = self::_getTTFtableChecksum($table[$tag]['data'], $table[$tag]['length']);
-			} else {
-				unset($table[$tag]);
-			}
-		}
-		// add loca
-		$table['loca']['data'] = $loca;
-		$table['loca']['length'] = strlen($loca);
-		$pad = 4 - ($table['loca']['length'] % 4);
-		if ($pad != 4) {
-			// the length of a table must be a multiple of four bytes
-			$table['loca']['length'] += $pad;
-			$table['loca']['data'] .= str_repeat("\x0", $pad);
-		}
-		$table['loca']['offset'] = $offset;
-		$table['loca']['checkSum'] = self::_getTTFtableChecksum($table['loca']['data'], $table['loca']['length']);
-		$offset += $table['loca']['length'];
-		// add glyf
-		$table['glyf']['data'] = $glyf;
-		$table['glyf']['length'] = strlen($glyf);
-		$pad = 4 - ($table['glyf']['length'] % 4);
-		if ($pad != 4) {
-			// the length of a table must be a multiple of four bytes
-			$table['glyf']['length'] += $pad;
-			$table['glyf']['data'] .= str_repeat("\x0", $pad);
-		}
-		$table['glyf']['offset'] = $offset;
-		$table['glyf']['checkSum'] = self::_getTTFtableChecksum($table['glyf']['data'], $table['glyf']['length']);
-		// rebuild font
-		$font = '';
-		$font .= pack('N', 0x10000); // sfnt version
-		$numTables = count($table);
-		$font .= pack('n', $numTables); // numTables
-		$entrySelector = floor(log($numTables, 2));
-		$searchRange = pow(2, $entrySelector) * 16;
-		$rangeShift = ($numTables * 16) - $searchRange;
-		$font .= pack('n', $searchRange); // searchRange
-		$font .= pack('n', $entrySelector); // entrySelector
-		$font .= pack('n', $rangeShift); // rangeShift
-		$offset = ($numTables * 16);
-		foreach ($table as $tag => $data) {
-			$font .= $tag; // tag
-			$font .= pack('N', $data['checkSum']); // checkSum
-			$font .= pack('N', ($data['offset'] + $offset)); // offset
-			$font .= pack('N', $data['length']); // length
-		}
-		foreach ($table as $data) {
-			$font .= $data['data'];
-		}
-		// set checkSumAdjustment on head table
-		$checkSumAdjustment = 0xB1B0AFBA - self::_getTTFtableChecksum($font, strlen($font));
-		$font = substr($font, 0, $table['head']['offset'] + 8).pack('N', $checkSumAdjustment).substr($font, $table['head']['offset'] + 12);
-		return $font;
-	}
-
-	/**
-	 * Outputs font widths
-	 * @param $font (array) font data
-	 * @param $cidoffset (int) offset for CID values
-	 * @return PDF command string for font widths
-	 * @author Nicola Asuni
-	 * @since 4.4.000 (2008-12-07)
-	 * @public static
-	 */
-	public static function _putfontwidths($font, $cidoffset=0) {
-		ksort($font['cw']);
-		$rangeid = 0;
-		$range = array();
-		$prevcid = -2;
-		$prevwidth = -1;
-		$interval = false;
-		// for each character
-		foreach ($font['cw'] as $cid => $width) {
-			$cid -= $cidoffset;
-			if ($font['subset'] AND (!isset($font['subsetchars'][$cid]))) {
-				// ignore the unused characters (font subsetting)
-				continue;
-			}
-			if ($width != $font['dw']) {
-				if ($cid == ($prevcid + 1)) {
-					// consecutive CID
-					if ($width == $prevwidth) {
-						if ($width == $range[$rangeid][0]) {
-							$range[$rangeid][] = $width;
-						} else {
-							array_pop($range[$rangeid]);
-							// new range
-							$rangeid = $prevcid;
-							$range[$rangeid] = array();
-							$range[$rangeid][] = $prevwidth;
-							$range[$rangeid][] = $width;
-						}
-						$interval = true;
-						$range[$rangeid]['interval'] = true;
-					} else {
-						if ($interval) {
-							// new range
-							$rangeid = $cid;
-							$range[$rangeid] = array();
-							$range[$rangeid][] = $width;
-						} else {
-							$range[$rangeid][] = $width;
-						}
-						$interval = false;
-					}
-				} else {
-					// new range
-					$rangeid = $cid;
-					$range[$rangeid] = array();
-					$range[$rangeid][] = $width;
-					$interval = false;
-				}
-				$prevcid = $cid;
-				$prevwidth = $width;
-			}
-		}
-		// optimize ranges
-		$prevk = -1;
-		$nextk = -1;
-		$prevint = false;
-		foreach ($range as $k => $ws) {
-			$cws = count($ws);
-			if (($k == $nextk) AND (!$prevint) AND ((!isset($ws['interval'])) OR ($cws < 4))) {
-				if (isset($range[$k]['interval'])) {
-					unset($range[$k]['interval']);
-				}
-				$range[$prevk] = array_merge($range[$prevk], $range[$k]);
-				unset($range[$k]);
-			} else {
-				$prevk = $k;
-			}
-			$nextk = $k + $cws;
-			if (isset($ws['interval'])) {
-				if ($cws > 3) {
-					$prevint = true;
-				} else {
-					$prevint = false;
-				}
-				if (isset($range[$k]['interval'])) {
-					unset($range[$k]['interval']);
-				}
-				--$nextk;
-			} else {
-				$prevint = false;
-			}
-		}
-		// output data
-		$w = '';
-		foreach ($range as $k => $ws) {
-			if (count(array_count_values($ws)) == 1) {
-				// interval mode is more compact
-				$w .= ' '.$k.' '.($k + count($ws) - 1).' '.$ws[0];
-			} else {
-				// range mode
-				$w .= ' '.$k.' [ '.implode(' ', $ws).' ]';
-			}
-		}
-		return '/W ['.$w.' ]';
-	}
-
-
-
-
-	/**
-	 * Update the CIDToGIDMap string with a new value.
-	 * @param $map (string) CIDToGIDMap.
-	 * @param $cid (int) CID value.
-	 * @param $gid (int) GID value.
-	 * @return (string) CIDToGIDMap.
-	 * @author Nicola Asuni
-	 * @since 5.9.123 (2011-09-29)
-	 * @public static
-	 */
-	public static function updateCIDtoGIDmap($map, $cid, $gid) {
-		if (($cid >= 0) AND ($cid <= 0xFFFF) AND ($gid >= 0)) {
-			if ($gid > 0xFFFF) {
-				$gid -= 0x10000;
-			}
-			$map[($cid * 2)] = chr($gid >> 8);
-			$map[(($cid * 2) + 1)] = chr($gid & 0xFF);
-		}
-		return $map;
-	}
-
-	/**
-	 * Return fonts path
-	 * @return string
-	 * @public static
-	 */
-	public static function _getfontpath() {
-		if (!defined('K_PATH_FONTS') AND is_dir($fdir = realpath(dirname(__FILE__).'/../fonts'))) {
-			if (substr($fdir, -1) != '/') {
-				$fdir .= '/';
-			}
-			define('K_PATH_FONTS', $fdir);
-		}
-		return defined('K_PATH_FONTS') ? K_PATH_FONTS : '';
-	}
-
-
-
-	/**
-	 * Return font full path
-	 * @param $file (string) Font file name.
-	 * @param $fontdir (string) Font directory (set to false fto search on default directories)
-	 * @return string Font full path or empty string
-	 * @author Nicola Asuni
-	 * @since 6.0.025
-	 * @public static
-	 */
-	public static function getFontFullPath($file, $fontdir=false) {
-		$fontfile = '';
-		// search files on various directories
-		if (($fontdir !== false) AND @file_exists($fontdir.$file)) {
-			$fontfile = $fontdir.$file;
-		} elseif (@file_exists(self::_getfontpath().$file)) {
-			$fontfile = self::_getfontpath().$file;
-		} elseif (@file_exists($file)) {
-			$fontfile = $file;
-		}
-		return $fontfile;
-	}
-
-
-
-
-	/**
-	 * Get a reference font size.
-	 * @param $size (string) String containing font size value.
-	 * @param $refsize (float) Reference font size in points.
-	 * @return float value in points
-	 * @public static
-	 */
-	public static function getFontRefSize($size, $refsize=12) {
-		switch ($size) {
-			case 'xx-small': {
-				$size = ($refsize - 4);
-				break;
-			}
-			case 'x-small': {
-				$size = ($refsize - 3);
-				break;
-			}
-			case 'small': {
-				$size = ($refsize - 2);
-				break;
-			}
-			case 'medium': {
-				$size = $refsize;
-				break;
-			}
-			case 'large': {
-				$size = ($refsize + 2);
-				break;
-			}
-			case 'x-large': {
-				$size = ($refsize + 4);
-				break;
-			}
-			case 'xx-large': {
-				$size = ($refsize + 6);
-				break;
-			}
-			case 'smaller': {
-				$size = ($refsize - 3);
-				break;
-			}
-			case 'larger': {
-				$size = ($refsize + 3);
-				break;
-			}
-		}
-		return $size;
-	}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-// ====================================================================================================================
-// REIMPLEMENTED
-// ====================================================================================================================
-
-
-
-
-
-
-
-
-	/**
-	 * Returns the unicode caracter specified by the value
-	 * @param $c (int) UTF-8 value
-	 * @param $unicode (boolean) True if we are in unicode mode, false otherwise.
-	 * @return Returns the specified character.
-	 * @since 2.3.000 (2008-03-05)
-	 * @public static
-	 */
-	public static function unichr($c, $unicode=true) {
-		if (!$unicode) {
-			return chr($c);
-		} elseif ($c <= 0x7F) {
-			// one byte
-			return chr($c);
-		} elseif ($c <= 0x7FF) {
-			// two bytes
-			return chr(0xC0 | $c >> 6).chr(0x80 | $c & 0x3F);
-		} elseif ($c <= 0xFFFF) {
-			// three bytes
-			return chr(0xE0 | $c >> 12).chr(0x80 | $c >> 6 & 0x3F).chr(0x80 | $c & 0x3F);
-		} elseif ($c <= 0x10FFFF) {
-			// four bytes
-			return chr(0xF0 | $c >> 18).chr(0x80 | $c >> 12 & 0x3F).chr(0x80 | $c >> 6 & 0x3F).chr(0x80 | $c & 0x3F);
-		} else {
-			return '';
-		}
-	}
-
-	/**
-	 * Returns the unicode caracter specified by UTF-8 value
-	 * @param $c (int) UTF-8 value
-	 * @return Returns the specified character.
-	 * @public static
-	 */
-	public static function unichrUnicode($c) {
-		return self::unichr($c, true);
-	}
-
-	/**
-	 * Returns the unicode caracter specified by ASCII value
-	 * @param $c (int) UTF-8 value
-	 * @return Returns the specified character.
-	 * @public static
-	 */
-	public static function unichrASCII($c) {
-		return self::unichr($c, false);
-	}
-
-	/**
-	 * Converts array of UTF-8 characters to UTF16-BE string.<br>
-	 * Based on: http://www.faqs.org/rfcs/rfc2781.html
-	 * <pre>
-	 *   Encoding UTF-16:
-	 *
-	 *   Encoding of a single character from an ISO 10646 character value to
-	 *    UTF-16 proceeds as follows. Let U be the character number, no greater
-	 *    than 0x10FFFF.
-	 *
-	 *    1) If U < 0x10000, encode U as a 16-bit unsigned integer and
-	 *       terminate.
-	 *
-	 *    2) Let U' = U - 0x10000. Because U is less than or equal to 0x10FFFF,
-	 *       U' must be less than or equal to 0xFFFFF. That is, U' can be
-	 *       represented in 20 bits.
-	 *
-	 *    3) Initialize two 16-bit unsigned integers, W1 and W2, to 0xD800 and
-	 *       0xDC00, respectively. These integers each have 10 bits free to
-	 *       encode the character value, for a total of 20 bits.
-	 *
-	 *    4) Assign the 10 high-order bits of the 20-bit U' to the 10 low-order
-	 *       bits of W1 and the 10 low-order bits of U' to the 10 low-order
-	 *       bits of W2. Terminate.
-	 *
-	 *    Graphically, steps 2 through 4 look like:
-	 *    U' = yyyyyyyyyyxxxxxxxxxx
-	 *    W1 = 110110yyyyyyyyyy
-	 *    W2 = 110111xxxxxxxxxx
-	 * </pre>
-	 * @param $unicode (array) array containing UTF-8 unicode values
-	 * @param $setbom (boolean) if true set the Byte Order Mark (BOM = 0xFEFF)
-	 * @return string
-	 * @protected
-	 * @author Nicola Asuni
-	 * @since 2.1.000 (2008-01-08)
-	 * @public static
-	 */
-	public static function arrUTF8ToUTF16BE($unicode, $setbom=false) {
-		$outstr = ''; // string to be returned
-		if ($setbom) {
-			$outstr .= "\xFE\xFF"; // Byte Order Mark (BOM)
-		}
-		foreach ($unicode as $char) {
-			if ($char == 0x200b) {
-				// skip Unicode Character 'ZERO WIDTH SPACE' (DEC:8203, U+200B)
-			} elseif ($char == 0xFFFD) {
-				$outstr .= "\xFF\xFD"; // replacement character
-			} elseif ($char < 0x10000) {
-				$outstr .= chr($char >> 0x08);
-				$outstr .= chr($char & 0xFF);
-			} else {
-				$char -= 0x10000;
-				$w1 = 0xD800 | ($char >> 0x0a);
-				$w2 = 0xDC00 | ($char & 0x3FF);
-				$outstr .= chr($w1 >> 0x08);
-				$outstr .= chr($w1 & 0xFF);
-				$outstr .= chr($w2 >> 0x08);
-				$outstr .= chr($w2 & 0xFF);
-			}
-		}
-		return $outstr;
-	}
-
-	/**
-	 * Convert an array of UTF8 values to array of unicode characters
-	 * @param $ta (array) The input array of UTF8 values.
-	 * @param $isunicode (boolean) True for Unicode mode, false otherwise.
-	 * @return Return array of unicode characters
-	 * @since 4.5.037 (2009-04-07)
-	 * @public static
-	 */
-	public static function UTF8ArrayToUniArray($ta, $isunicode=true) {
-		if ($isunicode) {
-			return array_map(array('TCPDF_FONTS', 'unichrUnicode'), $ta);
-		}
-		return array_map(array('TCPDF_FONTS', 'unichrASCII'), $ta);
-	}
-
-	/**
-	 * Extract a slice of the $strarr array and return it as string.
-	 * @param $strarr (string) The input array of characters.
-	 * @param $start (int) the starting element of $strarr.
-	 * @param $end (int) first element that will not be returned.
-	 * @param $unicode (boolean) True if we are in unicode mode, false otherwise.
-	 * @return Return part of a string
-	 * @public static
-	 */
-	public static function UTF8ArrSubString($strarr, $start='', $end='', $unicode=true) {
-		if (strlen($start) == 0) {
-			$start = 0;
-		}
-		if (strlen($end) == 0) {
-			$end = count($strarr);
-		}
-		$string = '';
-		for ($i = $start; $i < $end; ++$i) {
-			$string .= self::unichr($strarr[$i], $unicode);
-		}
-		return $string;
-	}
-
-	/**
-	 * Extract a slice of the $uniarr array and return it as string.
-	 * @param $uniarr (string) The input array of characters.
-	 * @param $start (int) the starting element of $strarr.
-	 * @param $end (int) first element that will not be returned.
-	 * @return Return part of a string
-	 * @since 4.5.037 (2009-04-07)
-	 * @public static
-	 */
-	public static function UniArrSubString($uniarr, $start='', $end='') {
-		if (strlen($start) == 0) {
-			$start = 0;
-		}
-		if (strlen($end) == 0) {
-			$end = count($uniarr);
-		}
-		$string = '';
-		for ($i=$start; $i < $end; ++$i) {
-			$string .= $uniarr[$i];
-		}
-		return $string;
-	}
-
-	/**
-	 * Converts UTF-8 characters array to array of Latin1 characters array<br>
-	 * @param $unicode (array) array containing UTF-8 unicode values
-	 * @return array
-	 * @author Nicola Asuni
-	 * @since 4.8.023 (2010-01-15)
-	 * @public static
-	 */
-	public static function UTF8ArrToLatin1Arr($unicode) {
-		$outarr = array(); // array to be returned
-		foreach ($unicode as $char) {
-			if ($char < 256) {
-				$outarr[] = $char;
-			} elseif (array_key_exists($char, TCPDF_FONT_DATA::$uni_utf8tolatin)) {
-				// map from UTF-8
-				$outarr[] = TCPDF_FONT_DATA::$uni_utf8tolatin[$char];
-			} elseif ($char == 0xFFFD) {
-				// skip
-			} else {
-				$outarr[] = 63; // '?' character
-			}
-		}
-		return $outarr;
-	}
-
-	/**
-	 * Converts UTF-8 characters array to array of Latin1 string<br>
-	 * @param $unicode (array) array containing UTF-8 unicode values
-	 * @return array
-	 * @author Nicola Asuni
-	 * @since 4.8.023 (2010-01-15)
-	 * @public static
-	 */
-	public static function UTF8ArrToLatin1($unicode) {
-		$outstr = ''; // string to be returned
-		foreach ($unicode as $char) {
-			if ($char < 256) {
-				$outstr .= chr($char);
-			} elseif (array_key_exists($char, TCPDF_FONT_DATA::$uni_utf8tolatin)) {
-				// map from UTF-8
-				$outstr .= chr(TCPDF_FONT_DATA::$uni_utf8tolatin[$char]);
-			} elseif ($char == 0xFFFD) {
-				// skip
-			} else {
-				$outstr .= '?';
-			}
-		}
-		return $outstr;
-	}
-
-	/**
-	 * Converts UTF-8 character to integer value.<br>
-	 * Uses the getUniord() method if the value is not cached.
-	 * @param $uch (string) character string to process.
-	 * @return integer Unicode value
-	 * @public static
-	 */
-	public static function uniord($uch) {
-		if (!isset(self::$cache_uniord[$uch])) {
-			self::$cache_uniord[$uch] = self::getUniord($uch);
-		}
-		return self::$cache_uniord[$uch];
-	}
-
-	/**
-	 * Converts UTF-8 character to integer value.<br>
-	 * Invalid byte sequences will be replaced with 0xFFFD (replacement character)<br>
-	 * Based on: http://www.faqs.org/rfcs/rfc3629.html
-	 * <pre>
-	 *    Char. number range  |        UTF-8 octet sequence
-	 *       (hexadecimal)    |              (binary)
-	 *    --------------------+-----------------------------------------------
-	 *    0000 0000-0000 007F | 0xxxxxxx
-	 *    0000 0080-0000 07FF | 110xxxxx 10xxxxxx
-	 *    0000 0800-0000 FFFF | 1110xxxx 10xxxxxx 10xxxxxx
-	 *    0001 0000-0010 FFFF | 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
-	 *    ---------------------------------------------------------------------
-	 *
-	 *   ABFN notation:
-	 *   ---------------------------------------------------------------------
-	 *   UTF8-octets = *( UTF8-char )
-	 *   UTF8-char   = UTF8-1 / UTF8-2 / UTF8-3 / UTF8-4
-	 *   UTF8-1      = %x00-7F
-	 *   UTF8-2      = %xC2-DF UTF8-tail
-	 *
-	 *   UTF8-3      = %xE0 %xA0-BF UTF8-tail / %xE1-EC 2( UTF8-tail ) /
-	 *                 %xED %x80-9F UTF8-tail / %xEE-EF 2( UTF8-tail )
-	 *   UTF8-4      = %xF0 %x90-BF 2( UTF8-tail ) / %xF1-F3 3( UTF8-tail ) /
-	 *                 %xF4 %x80-8F 2( UTF8-tail )
-	 *   UTF8-tail   = %x80-BF
-	 *   ---------------------------------------------------------------------
-	 * </pre>
-	 * @param $uch (string) character string to process.
-	 * @return integer Unicode value
-	 * @author Nicola Asuni
-	 * @public static
-	 */
-	public static function getUniord($uch) {
-		if (function_exists('mb_convert_encoding')) {
-			list(, $char) = @unpack('N', mb_convert_encoding($uch, 'UCS-4BE', 'UTF-8'));
-			if ($char >= 0) {
-				return $char;
-			}
-		}
-		$bytes = array(); // array containing single character byte sequences
-		$countbytes = 0;
-		$numbytes = 1; // number of octetc needed to represent the UTF-8 character
-		$length = strlen($uch);
-		for ($i = 0; $i < $length; ++$i) {
-			$char = ord($uch[$i]); // get one string character at time
-			if ($countbytes == 0) { // get starting octect
-				if ($char <= 0x7F) {
-					return $char; // use the character "as is" because is ASCII
-				} elseif (($char >> 0x05) == 0x06) { // 2 bytes character (0x06 = 110 BIN)
-					$bytes[] = ($char - 0xC0) << 0x06;
-					++$countbytes;
-					$numbytes = 2;
-				} elseif (($char >> 0x04) == 0x0E) { // 3 bytes character (0x0E = 1110 BIN)
-					$bytes[] = ($char - 0xE0) << 0x0C;
-					++$countbytes;
-					$numbytes = 3;
-				} elseif (($char >> 0x03) == 0x1E) { // 4 bytes character (0x1E = 11110 BIN)
-					$bytes[] = ($char - 0xF0) << 0x12;
-					++$countbytes;
-					$numbytes = 4;
-				} else {
-					// use replacement character for other invalid sequences
-					return 0xFFFD;
-				}
-			} elseif (($char >> 0x06) == 0x02) { // bytes 2, 3 and 4 must start with 0x02 = 10 BIN
-				$bytes[] = $char - 0x80;
-				++$countbytes;
-				if ($countbytes == $numbytes) {
-					// compose UTF-8 bytes to a single unicode value
-					$char = $bytes[0];
-					for ($j = 1; $j < $numbytes; ++$j) {
-						$char += ($bytes[$j] << (($numbytes - $j - 1) * 0x06));
-					}
-					if ((($char >= 0xD800) AND ($char <= 0xDFFF)) OR ($char >= 0x10FFFF)) {
-						// The definition of UTF-8 prohibits encoding character numbers between
-						// U+D800 and U+DFFF, which are reserved for use with the UTF-16
-						// encoding form (as surrogate pairs) and do not directly represent
-						// characters.
-						return 0xFFFD; // use replacement character
-					} else {
-						return $char;
-					}
-				}
-			} else {
-				// use replacement character for other invalid sequences
-				return 0xFFFD;
-			}
-		}
-		return 0xFFFD;
-	}
-
-	/**
-	 * Converts UTF-8 strings to codepoints array.<br>
-	 * Invalid byte sequences will be replaced with 0xFFFD (replacement character)<br>
-	 * @param $str (string) string to process.
-	 * @param $isunicode (boolean) True when the documetn is in Unicode mode, false otherwise.
-	 * @param $currentfont (array) Reference to current font array.
-	 * @return array containing codepoints (UTF-8 characters values)
-	 * @author Nicola Asuni
-	 * @public static
-	 */
-	public static function UTF8StringToArray($str, $isunicode=true, &$currentfont) {
-		if ($isunicode) {
-			// requires PCRE unicode support turned on
-			$chars = TCPDF_STATIC::pregSplit('//','u', $str, -1, PREG_SPLIT_NO_EMPTY);
-			$carr = array_map(array('TCPDF_FONTS', 'uniord'), $chars);
-		} else {
-			$chars = str_split($str);
-			$carr = array_map('ord', $chars);
-		}
-		$currentfont['subsetchars'] += array_fill_keys($carr, true);
-		return $carr;
-	}
-
-	/**
-	 * Converts UTF-8 strings to Latin1 when using the standard 14 core fonts.<br>
-	 * @param $str (string) string to process.
-	 * @param $isunicode (boolean) True when the documetn is in Unicode mode, false otherwise.
-	 * @param $currentfont (array) Reference to current font array.
-	 * @return string
-	 * @since 3.2.000 (2008-06-23)
-	 * @public static
-	 */
-	public static function UTF8ToLatin1($str, $isunicode=true, &$currentfont) {
-		$unicode = self::UTF8StringToArray($str, $isunicode, $currentfont); // array containing UTF-8 unicode values
-		return self::UTF8ArrToLatin1($unicode);
-	}
-
-	/**
-	 * Converts UTF-8 strings to UTF16-BE.<br>
-	 * @param $str (string) string to process.
-	 * @param $setbom (boolean) if true set the Byte Order Mark (BOM = 0xFEFF)
-	 * @param $isunicode (boolean) True when the documetn is in Unicode mode, false otherwise.
-	 * @param $currentfont (array) Reference to current font array.
-	 * @return string
-	 * @author Nicola Asuni
-	 * @since 1.53.0.TC005 (2005-01-05)
-	 * @public static
-	 */
-	public static function UTF8ToUTF16BE($str, $setbom=false, $isunicode=true, &$currentfont) {
-		if (!$isunicode) {
-			return $str; // string is not in unicode
-		}
-		$unicode = self::UTF8StringToArray($str, $isunicode, $currentfont); // array containing UTF-8 unicode values
-		return self::arrUTF8ToUTF16BE($unicode, $setbom);
-	}
-
-	/**
-	 * Reverse the RLT substrings using the Bidirectional Algorithm (http://unicode.org/reports/tr9/).
-	 * @param $str (string) string to manipulate.
-	 * @param $setbom (bool) if true set the Byte Order Mark (BOM = 0xFEFF)
-	 * @param $forcertl (bool) if true forces RTL text direction
-	 * @param $isunicode (boolean) True if the document is in Unicode mode, false otherwise.
-	 * @param $currentfont (array) Reference to current font array.
-	 * @return string
-	 * @author Nicola Asuni
-	 * @since 2.1.000 (2008-01-08)
-	 * @public static
-	 */
-	public static function utf8StrRev($str, $setbom=false, $forcertl=false, $isunicode=true, &$currentfont) {
-		return self::utf8StrArrRev(self::UTF8StringToArray($str, $isunicode, $currentfont), $str, $setbom, $forcertl, $isunicode, $currentfont);
-	}
-
-	/**
-	 * Reverse the RLT substrings array using the Bidirectional Algorithm (http://unicode.org/reports/tr9/).
-	 * @param $arr (array) array of unicode values.
-	 * @param $str (string) string to manipulate (or empty value).
-	 * @param $setbom (bool) if true set the Byte Order Mark (BOM = 0xFEFF)
-	 * @param $forcertl (bool) if true forces RTL text direction
-	 * @param $isunicode (boolean) True if the document is in Unicode mode, false otherwise.
-	 * @param $currentfont (array) Reference to current font array.
-	 * @return string
-	 * @author Nicola Asuni
-	 * @since 4.9.000 (2010-03-27)
-	 * @public static
-	 */
-	public static function utf8StrArrRev($arr, $str='', $setbom=false, $forcertl=false, $isunicode=true, &$currentfont) {
-		return self::arrUTF8ToUTF16BE(self::utf8Bidi($arr, $str, $forcertl, $isunicode, $currentfont), $setbom);
-	}
-
-	/**
-	 * Reverse the RLT substrings using the Bidirectional Algorithm (http://unicode.org/reports/tr9/).
-	 * @param $ta (array) array of characters composing the string.
-	 * @param $str (string) string to process
-	 * @param $forcertl (bool) if 'R' forces RTL, if 'L' forces LTR
-	 * @param $isunicode (boolean) True if the document is in Unicode mode, false otherwise.
-	 * @param $currentfont (array) Reference to current font array.
-	 * @return array of unicode chars
-	 * @author Nicola Asuni
-	 * @since 2.4.000 (2008-03-06)
-	 * @public static
-	 */
-	public static function utf8Bidi($ta, $str='', $forcertl=false, $isunicode=true, &$currentfont) {
-		// paragraph embedding level
-		$pel = 0;
-		// max level
-		$maxlevel = 0;
-		if (TCPDF_STATIC::empty_string($str)) {
-			// create string from array
-			$str = self::UTF8ArrSubString($ta, '', '', $isunicode);
-		}
-		// check if string contains arabic text
-		if (preg_match(TCPDF_FONT_DATA::$uni_RE_PATTERN_ARABIC, $str)) {
-			$arabic = true;
-		} else {
-			$arabic = false;
-		}
-		// check if string contains RTL text
-		if (!($forcertl OR $arabic OR preg_match(TCPDF_FONT_DATA::$uni_RE_PATTERN_RTL, $str))) {
-			return $ta;
-		}
-
-		// get number of chars
-		$numchars = count($ta);
-
-		if ($forcertl == 'R') {
-			$pel = 1;
-		} elseif ($forcertl == 'L') {
-			$pel = 0;
-		} else {
-			// P2. In each paragraph, find the first character of type L, AL, or R.
-			// P3. If a character is found in P2 and it is of type AL or R, then set the paragraph embedding level to one; otherwise, set it to zero.
-			for ($i=0; $i < $numchars; ++$i) {
-				$type = TCPDF_FONT_DATA::$uni_type[$ta[$i]];
-				if ($type == 'L') {
-					$pel = 0;
-					break;
-				} elseif (($type == 'AL') OR ($type == 'R')) {
-					$pel = 1;
-					break;
-				}
-			}
-		}
-
-		// Current Embedding Level
-		$cel = $pel;
-		// directional override status
-		$dos = 'N';
-		$remember = array();
-		// start-of-level-run
-		$sor = $pel % 2 ? 'R' : 'L';
-		$eor = $sor;
-
-		// Array of characters data
-		$chardata = Array();
-
-		// X1. Begin by setting the current embedding level to the paragraph embedding level. Set the directional override status to neutral. Process each character iteratively, applying rules X2 through X9. Only embedding levels from 0 to 61 are valid in this phase.
-		// In the resolution of levels in rules I1 and I2, the maximum embedding level of 62 can be reached.
-		for ($i=0; $i < $numchars; ++$i) {
-			if ($ta[$i] == TCPDF_FONT_DATA::$uni_RLE) {
-				// X2. With each RLE, compute the least greater odd embedding level.
-				//	a. If this new level would be valid, then this embedding code is valid. Remember (push) the current embedding level and override status. Reset the current level to this new level, and reset the override status to neutral.
-				//	b. If the new level would not be valid, then this code is invalid. Do not change the current level or override status.
-				$next_level = $cel + ($cel % 2) + 1;
-				if ($next_level < 62) {
-					$remember[] = array('num' => TCPDF_FONT_DATA::$uni_RLE, 'cel' => $cel, 'dos' => $dos);
-					$cel = $next_level;
-					$dos = 'N';
-					$sor = $eor;
-					$eor = $cel % 2 ? 'R' : 'L';
-				}
-			} elseif ($ta[$i] == TCPDF_FONT_DATA::$uni_LRE) {
-				// X3. With each LRE, compute the least greater even embedding level.
-				//	a. If this new level would be valid, then this embedding code is valid. Remember (push) the current embedding level and override status. Reset the current level to this new level, and reset the override status to neutral.
-				//	b. If the new level would not be valid, then this code is invalid. Do not change the current level or override status.
-				$next_level = $cel + 2 - ($cel % 2);
-				if ( $next_level < 62 ) {
-					$remember[] = array('num' => TCPDF_FONT_DATA::$uni_LRE, 'cel' => $cel, 'dos' => $dos);
-					$cel = $next_level;
-					$dos = 'N';
-					$sor = $eor;
-					$eor = $cel % 2 ? 'R' : 'L';
-				}
-			} elseif ($ta[$i] == TCPDF_FONT_DATA::$uni_RLO) {
-				// X4. With each RLO, compute the least greater odd embedding level.
-				//	a. If this new level would be valid, then this embedding code is valid. Remember (push) the current embedding level and override status. Reset the current level to this new level, and reset the override status to right-to-left.
-				//	b. If the new level would not be valid, then this code is invalid. Do not change the current level or override status.
-				$next_level = $cel + ($cel % 2) + 1;
-				if ($next_level < 62) {
-					$remember[] = array('num' => TCPDF_FONT_DATA::$uni_RLO, 'cel' => $cel, 'dos' => $dos);
-					$cel = $next_level;
-					$dos = 'R';
-					$sor = $eor;
-					$eor = $cel % 2 ? 'R' : 'L';
-				}
-			} elseif ($ta[$i] == TCPDF_FONT_DATA::$uni_LRO) {
-				// X5. With each LRO, compute the least greater even embedding level.
-				//	a. If this new level would be valid, then this embedding code is valid. Remember (push) the current embedding level and override status. Reset the current level to this new level, and reset the override status to left-to-right.
-				//	b. If the new level would not be valid, then this code is invalid. Do not change the current level or override status.
-				$next_level = $cel + 2 - ($cel % 2);
-				if ( $next_level < 62 ) {
-					$remember[] = array('num' => TCPDF_FONT_DATA::$uni_LRO, 'cel' => $cel, 'dos' => $dos);
-					$cel = $next_level;
-					$dos = 'L';
-					$sor = $eor;
-					$eor = $cel % 2 ? 'R' : 'L';
-				}
-			} elseif ($ta[$i] == TCPDF_FONT_DATA::$uni_PDF) {
-				// X7. With each PDF, determine the matching embedding or override code. If there was a valid matching code, restore (pop) the last remembered (pushed) embedding level and directional override.
-				if (count($remember)) {
-					$last = count($remember ) - 1;
-					if (($remember[$last]['num'] == TCPDF_FONT_DATA::$uni_RLE) OR
-						($remember[$last]['num'] == TCPDF_FONT_DATA::$uni_LRE) OR
-						($remember[$last]['num'] == TCPDF_FONT_DATA::$uni_RLO) OR
-						($remember[$last]['num'] == TCPDF_FONT_DATA::$uni_LRO)) {
-						$match = array_pop($remember);
-						$cel = $match['cel'];
-						$dos = $match['dos'];
-						$sor = $eor;
-						$eor = ($cel > $match['cel'] ? $cel : $match['cel']) % 2 ? 'R' : 'L';
-					}
-				}
-			} elseif (($ta[$i] != TCPDF_FONT_DATA::$uni_RLE) AND
-							 ($ta[$i] != TCPDF_FONT_DATA::$uni_LRE) AND
-							 ($ta[$i] != TCPDF_FONT_DATA::$uni_RLO) AND
-							 ($ta[$i] != TCPDF_FONT_DATA::$uni_LRO) AND
-							 ($ta[$i] != TCPDF_FONT_DATA::$uni_PDF)) {
-				// X6. For all types besides RLE, LRE, RLO, LRO, and PDF:
-				//	a. Set the level of the current character to the current embedding level.
-				//	b. Whenever the directional override status is not neutral, reset the current character type to the directional override status.
-				if ($dos != 'N') {
-					$chardir = $dos;
-				} else {
-					if (isset(TCPDF_FONT_DATA::$uni_type[$ta[$i]])) {
-						$chardir = TCPDF_FONT_DATA::$uni_type[$ta[$i]];
-					} else {
-						$chardir = 'L';
-					}
-				}
-				// stores string characters and other information
-				$chardata[] = array('char' => $ta[$i], 'level' => $cel, 'type' => $chardir, 'sor' => $sor, 'eor' => $eor);
-			}
-		} // end for each char
-
-		// X8. All explicit directional embeddings and overrides are completely terminated at the end of each paragraph. Paragraph separators are not included in the embedding.
-		// X9. Remove all RLE, LRE, RLO, LRO, PDF, and BN codes.
-		// X10. The remaining rules are applied to each run of characters at the same level. For each run, determine the start-of-level-run (sor) and end-of-level-run (eor) type, either L or R. This depends on the higher of the two levels on either side of the boundary (at the start or end of the paragraph, the level of the 'other' run is the base embedding level). If the higher level is odd, the type is R; otherwise, it is L.
-
-		// 3.3.3 Resolving Weak Types
-		// Weak types are now resolved one level run at a time. At level run boundaries where the type of the character on the other side of the boundary is required, the type assigned to sor or eor is used.
-		// Nonspacing marks are now resolved based on the previous characters.
-		$numchars = count($chardata);
-
-		// W1. Examine each nonspacing mark (NSM) in the level run, and change the type of the NSM to the type of the previous character. If the NSM is at the start of the level run, it will get the type of sor.
-		$prevlevel = -1; // track level changes
-		$levcount = 0; // counts consecutive chars at the same level
-		for ($i=0; $i < $numchars; ++$i) {
-			if ($chardata[$i]['type'] == 'NSM') {
-				if ($levcount) {
-					$chardata[$i]['type'] = $chardata[$i]['sor'];
-				} elseif ($i > 0) {
-					$chardata[$i]['type'] = $chardata[($i-1)]['type'];
-				}
-			}
-			if ($chardata[$i]['level'] != $prevlevel) {
-				$levcount = 0;
-			} else {
-				++$levcount;
-			}
-			$prevlevel = $chardata[$i]['level'];
-		}
-
-		// W2. Search backward from each instance of a European number until the first strong type (R, L, AL, or sor) is found. If an AL is found, change the type of the European number to Arabic number.
-		$prevlevel = -1;
-		$levcount = 0;
-		for ($i=0; $i < $numchars; ++$i) {
-			if ($chardata[$i]['char'] == 'EN') {
-				for ($j=$levcount; $j >= 0; $j--) {
-					if ($chardata[$j]['type'] == 'AL') {
-						$chardata[$i]['type'] = 'AN';
-					} elseif (($chardata[$j]['type'] == 'L') OR ($chardata[$j]['type'] == 'R')) {
-						break;
-					}
-				}
-			}
-			if ($chardata[$i]['level'] != $prevlevel) {
-				$levcount = 0;
-			} else {
-				++$levcount;
-			}
-			$prevlevel = $chardata[$i]['level'];
-		}
-
-		// W3. Change all ALs to R.
-		for ($i=0; $i < $numchars; ++$i) {
-			if ($chardata[$i]['type'] == 'AL') {
-				$chardata[$i]['type'] = 'R';
-			}
-		}
-
-		// W4. A single European separator between two European numbers changes to a European number. A single common separator between two numbers of the same type changes to that type.
-		$prevlevel = -1;
-		$levcount = 0;
-		for ($i=0; $i < $numchars; ++$i) {
-			if (($levcount > 0) AND (($i+1) < $numchars) AND ($chardata[($i+1)]['level'] == $prevlevel)) {
-				if (($chardata[$i]['type'] == 'ES') AND ($chardata[($i-1)]['type'] == 'EN') AND ($chardata[($i+1)]['type'] == 'EN')) {
-					$chardata[$i]['type'] = 'EN';
-				} elseif (($chardata[$i]['type'] == 'CS') AND ($chardata[($i-1)]['type'] == 'EN') AND ($chardata[($i+1)]['type'] == 'EN')) {
-					$chardata[$i]['type'] = 'EN';
-				} elseif (($chardata[$i]['type'] == 'CS') AND ($chardata[($i-1)]['type'] == 'AN') AND ($chardata[($i+1)]['type'] == 'AN')) {
-					$chardata[$i]['type'] = 'AN';
-				}
-			}
-			if ($chardata[$i]['level'] != $prevlevel) {
-				$levcount = 0;
-			} else {
-				++$levcount;
-			}
-			$prevlevel = $chardata[$i]['level'];
-		}
-
-		// W5. A sequence of European terminators adjacent to European numbers changes to all European numbers.
-		$prevlevel = -1;
-		$levcount = 0;
-		for ($i=0; $i < $numchars; ++$i) {
-			if ($chardata[$i]['type'] == 'ET') {
-				if (($levcount > 0) AND ($chardata[($i-1)]['type'] == 'EN')) {
-					$chardata[$i]['type'] = 'EN';
-				} else {
-					$j = $i+1;
-					while (($j < $numchars) AND ($chardata[$j]['level'] == $prevlevel)) {
-						if ($chardata[$j]['type'] == 'EN') {
-							$chardata[$i]['type'] = 'EN';
-							break;
-						} elseif ($chardata[$j]['type'] != 'ET') {
-							break;
-						}
-						++$j;
-					}
-				}
-			}
-			if ($chardata[$i]['level'] != $prevlevel) {
-				$levcount = 0;
-			} else {
-				++$levcount;
-			}
-			$prevlevel = $chardata[$i]['level'];
-		}
-
-		// W6. Otherwise, separators and terminators change to Other Neutral.
-		$prevlevel = -1;
-		$levcount = 0;
-		for ($i=0; $i < $numchars; ++$i) {
-			if (($chardata[$i]['type'] == 'ET') OR ($chardata[$i]['type'] == 'ES') OR ($chardata[$i]['type'] == 'CS')) {
-				$chardata[$i]['type'] = 'ON';
-			}
-			if ($chardata[$i]['level'] != $prevlevel) {
-				$levcount = 0;
-			} else {
-				++$levcount;
-			}
-			$prevlevel = $chardata[$i]['level'];
-		}
-
-		//W7. Search backward from each instance of a European number until the first strong type (R, L, or sor) is found. If an L is found, then change the type of the European number to L.
-		$prevlevel = -1;
-		$levcount = 0;
-		for ($i=0; $i < $numchars; ++$i) {
-			if ($chardata[$i]['char'] == 'EN') {
-				for ($j=$levcount; $j >= 0; $j--) {
-					if ($chardata[$j]['type'] == 'L') {
-						$chardata[$i]['type'] = 'L';
-					} elseif ($chardata[$j]['type'] == 'R') {
-						break;
-					}
-				}
-			}
-			if ($chardata[$i]['level'] != $prevlevel) {
-				$levcount = 0;
-			} else {
-				++$levcount;
-			}
-			$prevlevel = $chardata[$i]['level'];
-		}
-
-		// N1. A sequence of neutrals takes the direction of the surrounding strong text if the text on both sides has the same direction. European and Arabic numbers act as if they were R in terms of their influence on neutrals. Start-of-level-run (sor) and end-of-level-run (eor) are used at level run boundaries.
-		$prevlevel = -1;
-		$levcount = 0;
-		for ($i=0; $i < $numchars; ++$i) {
-			if (($levcount > 0) AND (($i+1) < $numchars) AND ($chardata[($i+1)]['level'] == $prevlevel)) {
-				if (($chardata[$i]['type'] == 'N') AND ($chardata[($i-1)]['type'] == 'L') AND ($chardata[($i+1)]['type'] == 'L')) {
-					$chardata[$i]['type'] = 'L';
-				} elseif (($chardata[$i]['type'] == 'N') AND
-				 (($chardata[($i-1)]['type'] == 'R') OR ($chardata[($i-1)]['type'] == 'EN') OR ($chardata[($i-1)]['type'] == 'AN')) AND
-				 (($chardata[($i+1)]['type'] == 'R') OR ($chardata[($i+1)]['type'] == 'EN') OR ($chardata[($i+1)]['type'] == 'AN'))) {
-					$chardata[$i]['type'] = 'R';
-				} elseif ($chardata[$i]['type'] == 'N') {
-					// N2. Any remaining neutrals take the embedding direction
-					$chardata[$i]['type'] = $chardata[$i]['sor'];
-				}
-			} elseif (($levcount == 0) AND (($i+1) < $numchars) AND ($chardata[($i+1)]['level'] == $prevlevel)) {
-				// first char
-				if (($chardata[$i]['type'] == 'N') AND ($chardata[$i]['sor'] == 'L') AND ($chardata[($i+1)]['type'] == 'L')) {
-					$chardata[$i]['type'] = 'L';
-				} elseif (($chardata[$i]['type'] == 'N') AND
-				 (($chardata[$i]['sor'] == 'R') OR ($chardata[$i]['sor'] == 'EN') OR ($chardata[$i]['sor'] == 'AN')) AND
-				 (($chardata[($i+1)]['type'] == 'R') OR ($chardata[($i+1)]['type'] == 'EN') OR ($chardata[($i+1)]['type'] == 'AN'))) {
-					$chardata[$i]['type'] = 'R';
-				} elseif ($chardata[$i]['type'] == 'N') {
-					// N2. Any remaining neutrals take the embedding direction
-					$chardata[$i]['type'] = $chardata[$i]['sor'];
-				}
-			} elseif (($levcount > 0) AND ((($i+1) == $numchars) OR (($i+1) < $numchars) AND ($chardata[($i+1)]['level'] != $prevlevel))) {
-				//last char
-				if (($chardata[$i]['type'] == 'N') AND ($chardata[($i-1)]['type'] == 'L') AND ($chardata[$i]['eor'] == 'L')) {
-					$chardata[$i]['type'] = 'L';
-				} elseif (($chardata[$i]['type'] == 'N') AND
-				 (($chardata[($i-1)]['type'] == 'R') OR ($chardata[($i-1)]['type'] == 'EN') OR ($chardata[($i-1)]['type'] == 'AN')) AND
-				 (($chardata[$i]['eor'] == 'R') OR ($chardata[$i]['eor'] == 'EN') OR ($chardata[$i]['eor'] == 'AN'))) {
-					$chardata[$i]['type'] = 'R';
-				} elseif ($chardata[$i]['type'] == 'N') {
-					// N2. Any remaining neutrals take the embedding direction
-					$chardata[$i]['type'] = $chardata[$i]['sor'];
-				}
-			} elseif ($chardata[$i]['type'] == 'N') {
-				// N2. Any remaining neutrals take the embedding direction
-				$chardata[$i]['type'] = $chardata[$i]['sor'];
-			}
-			if ($chardata[$i]['level'] != $prevlevel) {
-				$levcount = 0;
-			} else {
-				++$levcount;
-			}
-			$prevlevel = $chardata[$i]['level'];
-		}
-
-		// I1. For all characters with an even (left-to-right) embedding direction, those of type R go up one level and those of type AN or EN go up two levels.
-		// I2. For all characters with an odd (right-to-left) embedding direction, those of type L, EN or AN go up one level.
-		for ($i=0; $i < $numchars; ++$i) {
-			$odd = $chardata[$i]['level'] % 2;
-			if ($odd) {
-				if (($chardata[$i]['type'] == 'L') OR ($chardata[$i]['type'] == 'AN') OR ($chardata[$i]['type'] == 'EN')) {
-					$chardata[$i]['level'] += 1;
-				}
-			} else {
-				if ($chardata[$i]['type'] == 'R') {
-					$chardata[$i]['level'] += 1;
-				} elseif (($chardata[$i]['type'] == 'AN') OR ($chardata[$i]['type'] == 'EN')) {
-					$chardata[$i]['level'] += 2;
-				}
-			}
-			$maxlevel = max($chardata[$i]['level'],$maxlevel);
-		}
-
-		// L1. On each line, reset the embedding level of the following characters to the paragraph embedding level:
-		//	1. Segment separators,
-		//	2. Paragraph separators,
-		//	3. Any sequence of whitespace characters preceding a segment separator or paragraph separator, and
-		//	4. Any sequence of white space characters at the end of the line.
-		for ($i=0; $i < $numchars; ++$i) {
-			if (($chardata[$i]['type'] == 'B') OR ($chardata[$i]['type'] == 'S')) {
-				$chardata[$i]['level'] = $pel;
-			} elseif ($chardata[$i]['type'] == 'WS') {
-				$j = $i+1;
-				while ($j < $numchars) {
-					if ((($chardata[$j]['type'] == 'B') OR ($chardata[$j]['type'] == 'S')) OR
-						(($j == ($numchars-1)) AND ($chardata[$j]['type'] == 'WS'))) {
-						$chardata[$i]['level'] = $pel;
-						break;
-					} elseif ($chardata[$j]['type'] != 'WS') {
-						break;
-					}
-					++$j;
-				}
-			}
-		}
-
-		// Arabic Shaping
-		// Cursively connected scripts, such as Arabic or Syriac, require the selection of positional character shapes that depend on adjacent characters. Shaping is logically applied after the Bidirectional Algorithm is used and is limited to characters within the same directional run.
-		if ($arabic) {
-			$endedletter = array(1569,1570,1571,1572,1573,1575,1577,1583,1584,1585,1586,1608,1688);
-			$alfletter = array(1570,1571,1573,1575);
-			$chardata2 = $chardata;
-			$laaletter = false;
-			$charAL = array();
-			$x = 0;
-			for ($i=0; $i < $numchars; ++$i) {
-				if ((TCPDF_FONT_DATA::$uni_type[$chardata[$i]['char']] == 'AL') OR ($chardata[$i]['char'] == 32) OR ($chardata[$i]['char'] == 8204)) {
-					$charAL[$x] = $chardata[$i];
-					$charAL[$x]['i'] = $i;
-					$chardata[$i]['x'] = $x;
-					++$x;
-				}
-			}
-			$numAL = $x;
-			for ($i=0; $i < $numchars; ++$i) {
-				$thischar = $chardata[$i];
-				if ($i > 0) {
-					$prevchar = $chardata[($i-1)];
-				} else {
-					$prevchar = false;
-				}
-				if (($i+1) < $numchars) {
-					$nextchar = $chardata[($i+1)];
-				} else {
-					$nextchar = false;
-				}
-				if (TCPDF_FONT_DATA::$uni_type[$thischar['char']] == 'AL') {
-					$x = $thischar['x'];
-					if ($x > 0) {
-						$prevchar = $charAL[($x-1)];
-					} else {
-						$prevchar = false;
-					}
-					if (($x+1) < $numAL) {
-						$nextchar = $charAL[($x+1)];
-					} else {
-						$nextchar = false;
-					}
-					// if laa letter
-					if (($prevchar !== false) AND ($prevchar['char'] == 1604) AND (in_array($thischar['char'], $alfletter))) {
-						$arabicarr = TCPDF_FONT_DATA::$uni_laa_array;
-						$laaletter = true;
-						if ($x > 1) {
-							$prevchar = $charAL[($x-2)];
-						} else {
-							$prevchar = false;
-						}
-					} else {
-						$arabicarr = TCPDF_FONT_DATA::$uni_arabicsubst;
-						$laaletter = false;
-					}
-					if (($prevchar !== false) AND ($nextchar !== false) AND
-						((TCPDF_FONT_DATA::$uni_type[$prevchar['char']] == 'AL') OR (TCPDF_FONT_DATA::$uni_type[$prevchar['char']] == 'NSM')) AND
-						((TCPDF_FONT_DATA::$uni_type[$nextchar['char']] == 'AL') OR (TCPDF_FONT_DATA::$uni_type[$nextchar['char']] == 'NSM')) AND
-						($prevchar['type'] == $thischar['type']) AND
-						($nextchar['type'] == $thischar['type']) AND
-						($nextchar['char'] != 1567)) {
-						if (in_array($prevchar['char'], $endedletter)) {
-							if (isset($arabicarr[$thischar['char']][2])) {
-								// initial
-								$chardata2[$i]['char'] = $arabicarr[$thischar['char']][2];
-							}
-						} else {
-							if (isset($arabicarr[$thischar['char']][3])) {
-								// medial
-								$chardata2[$i]['char'] = $arabicarr[$thischar['char']][3];
-							}
-						}
-					} elseif (($nextchar !== false) AND
-						((TCPDF_FONT_DATA::$uni_type[$nextchar['char']] == 'AL') OR (TCPDF_FONT_DATA::$uni_type[$nextchar['char']] == 'NSM')) AND
-						($nextchar['type'] == $thischar['type']) AND
-						($nextchar['char'] != 1567)) {
-						if (isset($arabicarr[$chardata[$i]['char']][2])) {
-							// initial
-							$chardata2[$i]['char'] = $arabicarr[$thischar['char']][2];
-						}
-					} elseif ((($prevchar !== false) AND
-						((TCPDF_FONT_DATA::$uni_type[$prevchar['char']] == 'AL') OR (TCPDF_FONT_DATA::$uni_type[$prevchar['char']] == 'NSM')) AND
-						($prevchar['type'] == $thischar['type'])) OR
-						(($nextchar !== false) AND ($nextchar['char'] == 1567))) {
-						// final
-						if (($i > 1) AND ($thischar['char'] == 1607) AND
-							($chardata[$i-1]['char'] == 1604) AND
-							($chardata[$i-2]['char'] == 1604)) {
-							//Allah Word
-							// mark characters to delete with false
-							$chardata2[$i-2]['char'] = false;
-							$chardata2[$i-1]['char'] = false;
-							$chardata2[$i]['char'] = 65010;
-						} else {
-							if (($prevchar !== false) AND in_array($prevchar['char'], $endedletter)) {
-								if (isset($arabicarr[$thischar['char']][0])) {
-									// isolated
-									$chardata2[$i]['char'] = $arabicarr[$thischar['char']][0];
-								}
-							} else {
-								if (isset($arabicarr[$thischar['char']][1])) {
-									// final
-									$chardata2[$i]['char'] = $arabicarr[$thischar['char']][1];
-								}
-							}
-						}
-					} elseif (isset($arabicarr[$thischar['char']][0])) {
-						// isolated
-						$chardata2[$i]['char'] = $arabicarr[$thischar['char']][0];
-					}
-					// if laa letter
-					if ($laaletter) {
-						// mark characters to delete with false
-						$chardata2[($charAL[($x-1)]['i'])]['char'] = false;
-					}
-				} // end if AL (Arabic Letter)
-			} // end for each char
-			/*
-			 * Combining characters that can occur with Arabic Shadda (0651 HEX, 1617 DEC) are replaced.
-			 * Putting the combining mark and shadda in the same glyph allows us to avoid the two marks overlapping each other in an illegible manner.
-			 */
-			for ($i = 0; $i < ($numchars-1); ++$i) {
-				if (($chardata2[$i]['char'] == 1617) AND (isset(TCPDF_FONT_DATA::$uni_diacritics[($chardata2[$i+1]['char'])]))) {
-					// check if the subtitution font is defined on current font
-					if (isset($currentfont['cw'][(TCPDF_FONT_DATA::$uni_diacritics[($chardata2[$i+1]['char'])])])) {
-						$chardata2[$i]['char'] = false;
-						$chardata2[$i+1]['char'] = TCPDF_FONT_DATA::$uni_diacritics[($chardata2[$i+1]['char'])];
-					}
-				}
-			}
-			// remove marked characters
-			foreach ($chardata2 as $key => $value) {
-				if ($value['char'] === false) {
-					unset($chardata2[$key]);
-				}
-			}
-			$chardata = array_values($chardata2);
-			$numchars = count($chardata);
-			unset($chardata2);
-			unset($arabicarr);
-			unset($laaletter);
-			unset($charAL);
-		}
-
-		// L2. From the highest level found in the text to the lowest odd level on each line, including intermediate levels not actually present in the text, reverse any contiguous sequence of characters that are at that level or higher.
-		for ($j=$maxlevel; $j > 0; $j--) {
-			$ordarray = Array();
-			$revarr = Array();
-			$onlevel = false;
-			for ($i=0; $i < $numchars; ++$i) {
-				if ($chardata[$i]['level'] >= $j) {
-					$onlevel = true;
-					if (isset(TCPDF_FONT_DATA::$uni_mirror[$chardata[$i]['char']])) {
-						// L4. A character is depicted by a mirrored glyph if and only if (a) the resolved directionality of that character is R, and (b) the Bidi_Mirrored property value of that character is true.
-						$chardata[$i]['char'] = TCPDF_FONT_DATA::$uni_mirror[$chardata[$i]['char']];
-					}
-					$revarr[] = $chardata[$i];
-				} else {
-					if ($onlevel) {
-						$revarr = array_reverse($revarr);
-						$ordarray = array_merge($ordarray, $revarr);
-						$revarr = Array();
-						$onlevel = false;
-					}
-					$ordarray[] = $chardata[$i];
-				}
-			}
-			if ($onlevel) {
-				$revarr = array_reverse($revarr);
-				$ordarray = array_merge($ordarray, $revarr);
-			}
-			$chardata = $ordarray;
-		}
-		$ordarray = array();
-		foreach ($chardata as $cd) {
-			$ordarray[] = $cd['char'];
-			// store char values for subsetting
-			$currentfont['subsetchars'][$cd['char']] = true;
-		}
-		return $ordarray;
-	}
-
-} // END OF TCPDF_FONTS CLASS
-
-//============================================================+
-// END OF FILE
-//============================================================+
diff --git a/#pma/libraries/tcpdf/include/tcpdf_images.php b/#pma/libraries/tcpdf/include/tcpdf_images.php
deleted file mode 100644
index c2e3c36f..00000000
--- a/#pma/libraries/tcpdf/include/tcpdf_images.php
+++ /dev/null
@@ -1,364 +0,0 @@
-<?php
-//============================================================+
-// File name   : tcpdf_images.php
-// Version     : 1.0.005
-// Begin       : 2002-08-03
-// Last Update : 2014-11-15
-// Author      : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
-// License     : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
-// -------------------------------------------------------------------
-// Copyright (C) 2002-2014 Nicola Asuni - Tecnick.com LTD
-//
-// This file is part of TCPDF software library.
-//
-// TCPDF is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// TCPDF is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-// See the GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the License
-// along with TCPDF. If not, see
-// <http://www.tecnick.com/pagefiles/tcpdf/LICENSE.TXT>.
-//
-// See LICENSE.TXT file for more information.
-// -------------------------------------------------------------------
-//
-// Description :
-//   Static image methods used by the TCPDF class.
-//
-//============================================================+
-
-/**
- * @file
- * This is a PHP class that contains static image methods for the TCPDF class.<br>
- * @package com.tecnick.tcpdf
- * @author Nicola Asuni
- * @version 1.0.005
- */
-
-/**
- * @class TCPDF_IMAGES
- * Static image methods used by the TCPDF class.
- * @package com.tecnick.tcpdf
- * @brief PHP class for generating PDF documents without requiring external extensions.
- * @version 1.0.005
- * @author Nicola Asuni - info@tecnick.com
- */
-class TCPDF_IMAGES {
-
-	/**
-	 * Array of hinheritable SVG properties.
-	 * @since 5.0.000 (2010-05-02)
-	 * @public static
-	 */
-	public static $svginheritprop = array('clip-rule', 'color', 'color-interpolation', 'color-interpolation-filters', 'color-profile', 'color-rendering', 'cursor', 'direction', 'display', 'fill', 'fill-opacity', 'fill-rule', 'font', 'font-family', 'font-size', 'font-size-adjust', 'font-stretch', 'font-style', 'font-variant', 'font-weight', 'glyph-orientation-horizontal', 'glyph-orientation-vertical', 'image-rendering', 'kerning', 'letter-spacing', 'marker', 'marker-end', 'marker-mid', 'marker-start', 'pointer-events', 'shape-rendering', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'text-anchor', 'text-rendering', 'visibility', 'word-spacing', 'writing-mode');
-
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-	/**
-	 * Return the image type given the file name or array returned by getimagesize() function.
-	 * @param $imgfile (string) image file name
-	 * @param $iminfo (array) array of image information returned by getimagesize() function.
-	 * @return string image type
-	 * @since 4.8.017 (2009-11-27)
-	 * @public static
-	 */
-	public static function getImageFileType($imgfile, $iminfo=array()) {
-		$type = '';
-		if (isset($iminfo['mime']) AND !empty($iminfo['mime'])) {
-			$mime = explode('/', $iminfo['mime']);
-			if ((count($mime) > 1) AND ($mime[0] == 'image') AND (!empty($mime[1]))) {
-				$type = strtolower(trim($mime[1]));
-			}
-		}
-		if (empty($type)) {
-			$fileinfo = pathinfo($imgfile);
-			if (isset($fileinfo['extension']) AND (!TCPDF_STATIC::empty_string($fileinfo['extension']))) {
-				$type = strtolower(trim($fileinfo['extension']));
-			}
-		}
-		if ($type == 'jpg') {
-			$type = 'jpeg';
-		}
-		return $type;
-	}
-
-	/**
-	 * Set the transparency for the given GD image.
-	 * @param $new_image (image) GD image object
-	 * @param $image (image) GD image object.
-	 * return GD image object.
-	 * @since 4.9.016 (2010-04-20)
-	 * @public static
-	 */
-	public static function setGDImageTransparency($new_image, $image) {
-		// default transparency color (white)
-		$tcol = array('red' => 255, 'green' => 255, 'blue' => 255);
-		// transparency index
-		$tid = imagecolortransparent($image);
-		$palletsize = imagecolorstotal($image);
-		if (($tid >= 0) AND ($tid < $palletsize)) {
-			// get the colors for the transparency index
-			$tcol = imagecolorsforindex($image, $tid);
-		}
-		$tid = imagecolorallocate($new_image, $tcol['red'], $tcol['green'], $tcol['blue']);
-		imagefill($new_image, 0, 0, $tid);
-		imagecolortransparent($new_image, $tid);
-		return $new_image;
-	}
-
-	/**
-	 * Convert the loaded image to a PNG and then return a structure for the PDF creator.
-	 * This function requires GD library and write access to the directory defined on K_PATH_CACHE constant.
-	 * @param $image (image) Image object.
-	 * @param $tempfile (string) Temporary file name.
-	 * return image PNG image object.
-	 * @since 4.9.016 (2010-04-20)
-	 * @public static
-	 */
-	public static function _toPNG($image, $tempfile) {
-		// turn off interlaced mode
-		imageinterlace($image, 0);
-		// create temporary PNG image
-		imagepng($image, $tempfile);
-		// remove image from memory
-		imagedestroy($image);
-		// get PNG image data
-		$retvars = self::_parsepng($tempfile);
-		// tidy up by removing temporary image
-		unlink($tempfile);
-		return $retvars;
-	}
-
-	/**
-	 * Convert the loaded image to a JPEG and then return a structure for the PDF creator.
-	 * This function requires GD library and write access to the directory defined on K_PATH_CACHE constant.
-	 * @param $image (image) Image object.
-	 * @param $quality (int) JPEG quality.
-	 * @param $tempfile (string) Temporary file name.
-	 * return image JPEG image object.
-	 * @public static
-	 */
-	public static function _toJPEG($image, $quality, $tempfile) {
-		imagejpeg($image, $tempfile, $quality);
-		imagedestroy($image);
-		$retvars = self::_parsejpeg($tempfile);
-		// tidy up by removing temporary image
-		unlink($tempfile);
-		return $retvars;
-	}
-
-	/**
-	 * Extract info from a JPEG file without using the GD library.
-	 * @param $file (string) image file to parse
-	 * @return array structure containing the image data
-	 * @public static
-	 */
-	public static function _parsejpeg($file) {
-		// check if is a local file
-		if (!@file_exists($file)) {
-			// try to encode spaces on filename
-			$tfile = str_replace(' ', '%20', $file);
-			if (@file_exists($tfile)) {
-				$file = $tfile;
-			}
-		}
-		$a = getimagesize($file);
-		if (empty($a)) {
-			//Missing or incorrect image file
-			return false;
-		}
-		if ($a[2] != 2) {
-			// Not a JPEG file
-			return false;
-		}
-		// bits per pixel
-		$bpc = isset($a['bits']) ? intval($a['bits']) : 8;
-		// number of image channels
-		if (!isset($a['channels'])) {
-			$channels = 3;
-		} else {
-			$channels = intval($a['channels']);
-		}
-		// default colour space
-		switch ($channels) {
-			case 1: {
-				$colspace = 'DeviceGray';
-				break;
-			}
-			case 3: {
-				$colspace = 'DeviceRGB';
-				break;
-			}
-			case 4: {
-				$colspace = 'DeviceCMYK';
-				break;
-			}
-			default: {
-				$channels = 3;
-				$colspace = 'DeviceRGB';
-				break;
-			}
-		}
-		// get file content
-		$data = file_get_contents($file);
-		// check for embedded ICC profile
-		$icc = array();
-		$offset = 0;
-		while (($pos = strpos($data, "ICC_PROFILE\0", $offset)) !== false) {
-			// get ICC sequence length
-			$length = (TCPDF_STATIC::_getUSHORT($data, ($pos - 2)) - 16);
-			// marker sequence number
-			$msn = max(1, ord($data[($pos + 12)]));
-			// number of markers (total of APP2 used)
-			$nom = max(1, ord($data[($pos + 13)]));
-			// get sequence segment
-			$icc[($msn - 1)] = substr($data, ($pos + 14), $length);
-			// move forward to next sequence
-			$offset = ($pos + 14 + $length);
-		}
-		// order and compact ICC segments
-		if (count($icc) > 0) {
-			ksort($icc);
-			$icc = implode('', $icc);
-			if ((ord($icc[36]) != 0x61) OR (ord($icc[37]) != 0x63) OR (ord($icc[38]) != 0x73) OR (ord($icc[39]) != 0x70)) {
-				// invalid ICC profile
-				$icc = false;
-			}
-		} else {
-			$icc = false;
-		}
-		return array('w' => $a[0], 'h' => $a[1], 'ch' => $channels, 'icc' => $icc, 'cs' => $colspace, 'bpc' => $bpc, 'f' => 'DCTDecode', 'data' => $data);
-	}
-
-	/**
-	 * Extract info from a PNG file without using the GD library.
-	 * @param $file (string) image file to parse
-	 * @return array structure containing the image data
-	 * @public static
-	 */
-	public static function _parsepng($file) {
-		$f = @fopen($file, 'rb');
-		if ($f === false) {
-			// Can't open image file
-			return false;
-		}
-		//Check signature
-		if (fread($f, 8) != chr(137).'PNG'.chr(13).chr(10).chr(26).chr(10)) {
-			// Not a PNG file
-			return false;
-		}
-		//Read header chunk
-		fread($f, 4);
-		if (fread($f, 4) != 'IHDR') {
-			//Incorrect PNG file
-			return false;
-		}
-		$w = TCPDF_STATIC::_freadint($f);
-		$h = TCPDF_STATIC::_freadint($f);
-		$bpc = ord(fread($f, 1));
-		$ct = ord(fread($f, 1));
-		if ($ct == 0) {
-			$colspace = 'DeviceGray';
-		} elseif ($ct == 2) {
-			$colspace = 'DeviceRGB';
-		} elseif ($ct == 3) {
-			$colspace = 'Indexed';
-		} else {
-			// alpha channel
-			fclose($f);
-			return 'pngalpha';
-		}
-		if (ord(fread($f, 1)) != 0) {
-			// Unknown compression method
-			fclose($f);
-			return false;
-		}
-		if (ord(fread($f, 1)) != 0) {
-			// Unknown filter method
-			fclose($f);
-			return false;
-		}
-		if (ord(fread($f, 1)) != 0) {
-			// Interlacing not supported
-			fclose($f);
-			return false;
-		}
-		fread($f, 4);
-		$channels = ($ct == 2 ? 3 : 1);
-		$parms = '/DecodeParms << /Predictor 15 /Colors '.$channels.' /BitsPerComponent '.$bpc.' /Columns '.$w.' >>';
-		//Scan chunks looking for palette, transparency and image data
-		$pal = '';
-		$trns = '';
-		$data = '';
-		$icc = false;
-		$n = TCPDF_STATIC::_freadint($f);
-		do {
-			$type = fread($f, 4);
-			if ($type == 'PLTE') {
-				// read palette
-				$pal = TCPDF_STATIC::rfread($f, $n);
-				fread($f, 4);
-			} elseif ($type == 'tRNS') {
-				// read transparency info
-				$t = TCPDF_STATIC::rfread($f, $n);
-				if ($ct == 0) { // DeviceGray
-					$trns = array(ord($t[1]));
-				} elseif ($ct == 2) { // DeviceRGB
-					$trns = array(ord($t[1]), ord($t[3]), ord($t[5]));
-				} else { // Indexed
-					if ($n > 0) {
-						$trns = array();
-						for ($i = 0; $i < $n; ++ $i) {
-							$trns[] = ord($t{$i});
-						}
-					}
-				}
-				fread($f, 4);
-			} elseif ($type == 'IDAT') {
-				// read image data block
-				$data .= TCPDF_STATIC::rfread($f, $n);
-				fread($f, 4);
-			} elseif ($type == 'iCCP') {
-				// skip profile name
-				$len = 0;
-				while ((ord(fread($f, 1)) != 0) AND ($len < 80)) {
-					++$len;
-				}
-				// get compression method
-				if (ord(fread($f, 1)) != 0) {
-					// Unknown filter method
-					fclose($f);
-					return false;
-				}
-				// read ICC Color Profile
-				$icc = TCPDF_STATIC::rfread($f, ($n - $len - 2));
-				// decompress profile
-				$icc = gzuncompress($icc);
-				fread($f, 4);
-			} elseif ($type == 'IEND') {
-				break;
-			} else {
-				TCPDF_STATIC::rfread($f, $n + 4);
-			}
-			$n = TCPDF_STATIC::_freadint($f);
-		} while ($n);
-		if (($colspace == 'Indexed') AND (empty($pal))) {
-			// Missing palette
-			fclose($f);
-			return false;
-		}
-		fclose($f);
-		return array('w' => $w, 'h' => $h, 'ch' => $channels, 'icc' => $icc, 'cs' => $colspace, 'bpc' => $bpc, 'f' => 'FlateDecode', 'parms' => $parms, 'pal' => $pal, 'trns' => $trns, 'data' => $data);
-	}
-
-} // END OF TCPDF_IMAGES CLASS
-
-//============================================================+
-// END OF FILE
-//============================================================+
diff --git a/#pma/libraries/tcpdf/include/tcpdf_static.php b/#pma/libraries/tcpdf/include/tcpdf_static.php
deleted file mode 100644
index f6d4d2b9..00000000
--- a/#pma/libraries/tcpdf/include/tcpdf_static.php
+++ /dev/null
@@ -1,2606 +0,0 @@
-<?php
-//============================================================+
-// File name   : tcpdf_static.php
-// Version     : 1.1.3
-// Begin       : 2002-08-03
-// Last Update : 2015-04-28
-// Author      : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
-// License     : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
-// -------------------------------------------------------------------
-// Copyright (C) 2002-2015 Nicola Asuni - Tecnick.com LTD
-//
-// This file is part of TCPDF software library.
-//
-// TCPDF is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// TCPDF is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-// See the GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the License
-// along with TCPDF. If not, see
-// <http://www.tecnick.com/pagefiles/tcpdf/LICENSE.TXT>.
-//
-// See LICENSE.TXT file for more information.
-// -------------------------------------------------------------------
-//
-// Description :
-//   Static methods used by the TCPDF class.
-//
-//============================================================+
-
-/**
- * @file
- * This is a PHP class that contains static methods for the TCPDF class.<br>
- * @package com.tecnick.tcpdf
- * @author Nicola Asuni
- * @version 1.1.2
- */
-
-/**
- * @class TCPDF_STATIC
- * Static methods used by the TCPDF class.
- * @package com.tecnick.tcpdf
- * @brief PHP class for generating PDF documents without requiring external extensions.
- * @version 1.1.1
- * @author Nicola Asuni - info@tecnick.com
- */
-class TCPDF_STATIC {
-
-	/**
-	 * Current TCPDF version.
-	 * @private static
-	 */
-	private static $tcpdf_version = '6.2.12';
-
-	/**
-	 * String alias for total number of pages.
-	 * @public static
-	 */
-	public static $alias_tot_pages = '{:ptp:}';
-
-	/**
-	 * String alias for page number.
-	 * @public static
-	 */
-	public static $alias_num_page = '{:pnp:}';
-
-	/**
-	 * String alias for total number of pages in a single group.
-	 * @public static
-	 */
-	public static $alias_group_tot_pages = '{:ptg:}';
-
-	/**
-	 * String alias for group page number.
-	 * @public static
-	 */
-	public static $alias_group_num_page = '{:png:}';
-
-	/**
-	 * String alias for right shift compensation used to correctly align page numbers on the right.
-	 * @public static
-	 */
-	public static $alias_right_shift = '{rsc:';
-
-	/**
-	 * Encryption padding string.
-	 * @public static
-	 */
-	public static $enc_padding = "\x28\xBF\x4E\x5E\x4E\x75\x8A\x41\x64\x00\x4E\x56\xFF\xFA\x01\x08\x2E\x2E\x00\xB6\xD0\x68\x3E\x80\x2F\x0C\xA9\xFE\x64\x53\x69\x7A";
-
-	/**
-	 * ByteRange placemark used during digital signature process.
-	 * @since 4.6.028 (2009-08-25)
-	 * @public static
-	 */
-	public static $byterange_string = '/ByteRange[0 ********** ********** **********]';
-
-	/**
-	 * Array page boxes names
-	 * @public static
-	 */
-	public static $pageboxes = array('MediaBox', 'CropBox', 'BleedBox', 'TrimBox', 'ArtBox');
-
-	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-	/**
-	 * Return the current TCPDF version.
-	 * @return TCPDF version string
-	 * @since 5.9.012 (2010-11-10)
-	 * @public static
-	 */
-	public static function getTCPDFVersion() {
-		return self::$tcpdf_version;
-	}
-
-	/**
-	 * Return the current TCPDF producer.
-	 * @return TCPDF producer string
-	 * @since 6.0.000 (2013-03-16)
-	 * @public static
-	 */
-	public static function getTCPDFProducer() {
-		return "\x54\x43\x50\x44\x46\x20".self::getTCPDFVersion()."\x20\x28\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x74\x63\x70\x64\x66\x2e\x6f\x72\x67\x29";
-	}
-
-	/**
-	 * Sets the current active configuration setting of magic_quotes_runtime (if the set_magic_quotes_runtime function exist)
-	 * @param $mqr (boolean) FALSE for off, TRUE for on.
-	 * @since 4.6.025 (2009-08-17)
-	 * @public static
-	 */
-	public static function set_mqr($mqr) {
-		if (!defined('PHP_VERSION_ID')) {
-			$version = PHP_VERSION;
-			define('PHP_VERSION_ID', (($version[0] * 10000) + ($version[2] * 100) + $version[4]));
-		}
-		if (PHP_VERSION_ID < 50300) {
-			@set_magic_quotes_runtime($mqr);
-		}
-	}
-
-	/**
-	 * Gets the current active configuration setting of magic_quotes_runtime (if the get_magic_quotes_runtime function exist)
-	 * @return Returns 0 if magic quotes runtime is off or get_magic_quotes_runtime doesn't exist, 1 otherwise.
-	 * @since 4.6.025 (2009-08-17)
-	 * @public static
-	 */
-	public static function get_mqr() {
-		if (!defined('PHP_VERSION_ID')) {
-			$version = PHP_VERSION;
-			define('PHP_VERSION_ID', (($version[0] * 10000) + ($version[2] * 100) + $version[4]));
-		}
-		if (PHP_VERSION_ID < 50300) {
-			return @get_magic_quotes_runtime();
-		}
-		return 0;
-	}
-
-	/**
-	 * Check if the URL exist.
-	 * @param $url (string) URL to check.
-	 * @return Boolean true if the URl exist, false otherwise.
-	 * @since 5.9.204 (2013-01-28)
-	 * @public static
-	 */
-	public static function isValidURL($url) {
-		$headers = @get_headers($url);
-    	return (strpos($headers[0], '200') !== false);
-	}
-
-	/**
-	 * Removes SHY characters from text.
-	 * Unicode Data:<ul>
-	 * <li>Name : SOFT HYPHEN, commonly abbreviated as SHY</li>
-	 * <li>HTML Entity (decimal): "&amp;#173;"</li>
-	 * <li>HTML Entity (hex): "&amp;#xad;"</li>
-	 * <li>HTML Entity (named): "&amp;shy;"</li>
-	 * <li>How to type in Microsoft Windows: [Alt +00AD] or [Alt 0173]</li>
-	 * <li>UTF-8 (hex): 0xC2 0xAD (c2ad)</li>
-	 * <li>UTF-8 character: chr(194).chr(173)</li>
-	 * </ul>
-	 * @param $txt (string) input string
-	 * @param $unicode (boolean) True if we are in unicode mode, false otherwise.
-	 * @return string without SHY characters.
-	 * @since (4.5.019) 2009-02-28
-	 * @public static
-	 */
-	public static function removeSHY($txt='', $unicode=true) {
-		$txt = preg_replace('/([\\xc2]{1}[\\xad]{1})/', '', $txt);
-		if (!$unicode) {
-			$txt = preg_replace('/([\\xad]{1})/', '', $txt);
-		}
-		return $txt;
-	}
-
-
-	/**
-	 * Get the border mode accounting for multicell position (opens bottom side of multicell crossing pages)
-	 * @param $brd (mixed) Indicates if borders must be drawn around the cell block. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul>or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
-	 * @param $position (string) multicell position: 'start', 'middle', 'end'
-	 * @param $opencell (boolean) True when the cell is left open at the page bottom, false otherwise.
-	 * @return border mode array
-	 * @since 4.4.002 (2008-12-09)
-	 * @public static
-	 */
-	public static function getBorderMode($brd, $position='start', $opencell=true) {
-		if ((!$opencell) OR empty($brd)) {
-			return $brd;
-		}
-		if ($brd == 1) {
-			$brd = 'LTRB';
-		}
-		if (is_string($brd)) {
-			// convert string to array
-			$slen = strlen($brd);
-			$newbrd = array();
-			for ($i = 0; $i < $slen; ++$i) {
-				$newbrd[$brd[$i]] = array('cap' => 'square', 'join' => 'miter');
-			}
-			$brd = $newbrd;
-		}
-		foreach ($brd as $border => $style) {
-			switch ($position) {
-				case 'start': {
-					if (strpos($border, 'B') !== false) {
-						// remove bottom line
-						$newkey = str_replace('B', '', $border);
-						if (strlen($newkey) > 0) {
-							$brd[$newkey] = $style;
-						}
-						unset($brd[$border]);
-					}
-					break;
-				}
-				case 'middle': {
-					if (strpos($border, 'B') !== false) {
-						// remove bottom line
-						$newkey = str_replace('B', '', $border);
-						if (strlen($newkey) > 0) {
-							$brd[$newkey] = $style;
-						}
-						unset($brd[$border]);
-						$border = $newkey;
-					}
-					if (strpos($border, 'T') !== false) {
-						// remove bottom line
-						$newkey = str_replace('T', '', $border);
-						if (strlen($newkey) > 0) {
-							$brd[$newkey] = $style;
-						}
-						unset($brd[$border]);
-					}
-					break;
-				}
-				case 'end': {
-					if (strpos($border, 'T') !== false) {
-						// remove bottom line
-						$newkey = str_replace('T', '', $border);
-						if (strlen($newkey) > 0) {
-							$brd[$newkey] = $style;
-						}
-						unset($brd[$border]);
-					}
-					break;
-				}
-			}
-		}
-		return $brd;
-	}
-
-	/**
-	 * Determine whether a string is empty.
-	 * @param $str (string) string to be checked
-	 * @return boolean true if string is empty
-	 * @since 4.5.044 (2009-04-16)
-	 * @public static
-	 */
-	public static function empty_string($str) {
-		return (is_null($str) OR (is_string($str) AND (strlen($str) == 0)));
-	}
-
-	/**
-	 * Returns a temporary filename for caching object on filesystem.
-	 * @param $type (string) Type of file (name of the subdir on the tcpdf cache folder).
-	 * @param $file_id (string) TCPDF file_id.
-	 * @return string filename.
-	 * @since 4.5.000 (2008-12-31)
-	 * @public static
-	 */
-	public static function getObjFilename($type='tmp', $file_id='') {
-		return tempnam(K_PATH_CACHE, '__tcpdf_'.$file_id.'_'.$type.'_'.md5(TCPDF_STATIC::getRandomSeed()).'_');
-	}
-
-	/**
-	 * Add "\" before "\", "(" and ")"
-	 * @param $s (string) string to escape.
-	 * @return string escaped string.
-	 * @public static
-	 */
-	public static function _escape($s) {
-		// the chr(13) substitution fixes the Bugs item #1421290.
-		return strtr($s, array(')' => '\\)', '(' => '\\(', '\\' => '\\\\', chr(13) => '\r'));
-	}
-
-	/**
-	* Escape some special characters (&lt; &gt; &amp;) for XML output.
-	* @param $str (string) Input string to convert.
-	* @return converted string
-	* @since 5.9.121 (2011-09-28)
-	 * @public static
-	 */
-	public static function _escapeXML($str) {
-		$replaceTable = array("\0" => '', '&' => '&amp;', '<' => '&lt;', '>' => '&gt;');
-		$str = strtr($str, $replaceTable);
-		return $str;
-	}
-
-	/**
-	 * Creates a copy of a class object
-	 * @param $object (object) class object to be cloned
-	 * @return cloned object
-	 * @since 4.5.029 (2009-03-19)
-	 * @public static
-	 */
-	public static function objclone($object) {
-		if (($object instanceof Imagick) AND (version_compare(phpversion('imagick'), '3.0.1') !== 1)) {
-			// on the versions after 3.0.1 the clone() method was deprecated in favour of clone keyword
-			return @$object->clone();
-		}
-		return @clone($object);
-	}
-
-	/**
-	 * Output input data and compress it if possible.
-	 * @param $data (string) Data to output.
-	 * @param $length (int) Data length in bytes.
-	 * @since 5.9.086
-	 * @public static
-	 */
-	public static function sendOutputData($data, $length) {
-		if (!isset($_SERVER['HTTP_ACCEPT_ENCODING']) OR empty($_SERVER['HTTP_ACCEPT_ENCODING'])) {
-			// the content length may vary if the server is using compression
-			header('Content-Length: '.$length);
-		}
-		echo $data;
-	}
-
-	/**
-	 * Replace page number aliases with number.
-	 * @param $page (string) Page content.
-	 * @param $replace (array) Array of replacements (array keys are replacement strings, values are alias arrays).
-	 * @param $diff (int) If passed, this will be set to the total char number difference between alias and replacements.
-	 * @return replaced page content and updated $diff parameter as array.
-	 * @public static
-	 */
-	public static function replacePageNumAliases($page, $replace, $diff=0) {
-		foreach ($replace as $rep) {
-			foreach ($rep[3] as $a) {
-				if (strpos($page, $a) !== false) {
-					$page = str_replace($a, $rep[0], $page);
-					$diff += ($rep[2] - $rep[1]);
-				}
-			}
-		}
-		return array($page, $diff);
-	}
-
-	/**
-	 * Returns timestamp in seconds from formatted date-time.
-	 * @param $date (string) Formatted date-time.
-	 * @return int seconds.
-	 * @since 5.9.152 (2012-03-23)
-	 * @public static
-	 */
-	public static function getTimestamp($date) {
-		if (($date[0] == 'D') AND ($date[1] == ':')) {
-			// remove date prefix if present
-			$date = substr($date, 2);
-		}
-		return strtotime($date);
-	}
-
-	/**
-	 * Returns a formatted date-time.
-	 * @param $time (int) Time in seconds.
-	 * @return string escaped date string.
-	 * @since 5.9.152 (2012-03-23)
-	 * @public static
-	 */
-	public static function getFormattedDate($time) {
-		return substr_replace(date('YmdHisO', intval($time)), '\'', (0 - 2), 0).'\'';
-	}
-
-	/**
-	 * Returns a string containing random data to be used as a seed for encryption methods.
-	 * @param $seed (string) starting seed value
-	 * @return string containing random data
-	 * @author Nicola Asuni
-	 * @since 5.9.006 (2010-10-19)
-	 * @public static
-	 */
-	public static function getRandomSeed($seed='') {
-		$rnd = uniqid(rand().microtime(true), true);
-		if (function_exists('posix_getpid')) {
-			$rnd .= posix_getpid();
-		}
-		if (function_exists('openssl_random_pseudo_bytes') AND (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN')) {
-			// this is not used on windows systems because it is very slow for a know bug
-			$rnd .= openssl_random_pseudo_bytes(512);
-		} else {
-			for ($i = 0; $i < 23; ++$i) {
-				$rnd .= uniqid('', true);
-			}
-		}
-		return $rnd.$seed.__FILE__.serialize($_SERVER).microtime(true);
-	}
-
-	/**
-	 * Encrypts a string using MD5 and returns it's value as a binary string.
-	 * @param $str (string) input string
-	 * @return String MD5 encrypted binary string
-	 * @since 2.0.000 (2008-01-02)
-	 * @public static
-	 */
-	public static function _md5_16($str) {
-		return pack('H*', md5($str));
-	}
-
-	/**
-	 * Returns the input text exrypted using AES algorithm and the specified key.
-	 * This method requires openssl or mcrypt. Text is padded to 16bytes blocks
-	 * @param $key (string) encryption key
-	 * @param $text (String) input text to be encrypted
-	 * @return String encrypted text
-	 * @author Nicola Asuni
-	 * @since 5.0.005 (2010-05-11)
-	 * @public static
-	 */
-	public static function _AES($key, $text) {
-		// padding (RFC 2898, PKCS #5: Password-Based Cryptography Specification Version 2.0)
-		$padding = 16 - (strlen($text) % 16);
-		$text .= str_repeat(chr($padding), $padding);
-		if (extension_loaded('openssl')) {
-			$iv = openssl_random_pseudo_bytes (openssl_cipher_iv_length('aes-256-cbc'));
-			$text = openssl_encrypt($text, 'aes-256-cbc', $key, OPENSSL_RAW_DATA, $iv);
-			return $iv.substr($text, 0, -16);
-		}
-		$iv = mcrypt_create_iv(mcrypt_get_iv_size(MCRYPT_RIJNDAEL_128, MCRYPT_MODE_CBC), MCRYPT_RAND);
-		$text = mcrypt_encrypt(MCRYPT_RIJNDAEL_128, $key, $text, MCRYPT_MODE_CBC, $iv);
-		$text = $iv.$text;
-		return $text;
-	}
-
-	/**
-	 * Returns the input text exrypted using AES algorithm and the specified key.
-	 * This method requires openssl or mcrypt. Text is not padded
-	 * @param $key (string) encryption key
-	 * @param $text (String) input text to be encrypted
-	 * @return String encrypted text
-	 * @author Nicola Asuni
-	 * @since TODO
-	 * @public static
-	 */
-	public static function _AESnopad($key, $text) {
-		if (extension_loaded('openssl')) {
-			$iv = str_repeat("\x00", openssl_cipher_iv_length('aes-256-cbc'));
-			$text = openssl_encrypt($text, 'aes-256-cbc', $key, OPENSSL_RAW_DATA, $iv);
-			return substr($text, 0, -16);
-		}
-		$iv = str_repeat("\x00", mcrypt_get_iv_size(MCRYPT_RIJNDAEL_128, MCRYPT_MODE_CBC));
-		$text = mcrypt_encrypt(MCRYPT_RIJNDAEL_128, $key, $text, MCRYPT_MODE_CBC, $iv);
-		return $text;
-	}
-
-	/**
-	 * Returns the input text encrypted using RC4 algorithm and the specified key.
-	 * RC4 is the standard encryption algorithm used in PDF format
-	 * @param $key (string) Encryption key.
-	 * @param $text (String) Input text to be encrypted.
-	 * @param $last_enc_key (String) Reference to last RC4 key encrypted.
-	 * @param $last_enc_key_c (String) Reference to last RC4 computed key.
-	 * @return String encrypted text
-	 * @since 2.0.000 (2008-01-02)
-	 * @author Klemen Vodopivec, Nicola Asuni
-	 * @public static
-	 */
-	public static function _RC4($key, $text, &$last_enc_key, &$last_enc_key_c) {
-		if (function_exists('mcrypt_encrypt') AND ($out = @mcrypt_encrypt(MCRYPT_ARCFOUR, $key, $text, MCRYPT_MODE_STREAM, ''))) {
-			// try to use mcrypt function if exist
-			return $out;
-		}
-		if ($last_enc_key != $key) {
-			$k = str_repeat($key, ((256 / strlen($key)) + 1));
-			$rc4 = range(0, 255);
-			$j = 0;
-			for ($i = 0; $i < 256; ++$i) {
-				$t = $rc4[$i];
-				$j = ($j + $t + ord($k[$i])) % 256;
-				$rc4[$i] = $rc4[$j];
-				$rc4[$j] = $t;
-			}
-			$last_enc_key = $key;
-			$last_enc_key_c = $rc4;
-		} else {
-			$rc4 = $last_enc_key_c;
-		}
-		$len = strlen($text);
-		$a = 0;
-		$b = 0;
-		$out = '';
-		for ($i = 0; $i < $len; ++$i) {
-			$a = ($a + 1) % 256;
-			$t = $rc4[$a];
-			$b = ($b + $t) % 256;
-			$rc4[$a] = $rc4[$b];
-			$rc4[$b] = $t;
-			$k = $rc4[($rc4[$a] + $rc4[$b]) % 256];
-			$out .= chr(ord($text[$i]) ^ $k);
-		}
-		return $out;
-	}
-
-	/**
-	 * Return the permission code used on encryption (P value).
-	 * @param $permissions (Array) the set of permissions (specify the ones you want to block).
-	 * @param $mode (int) encryption strength: 0 = RC4 40 bit; 1 = RC4 128 bit; 2 = AES 128 bit; 3 = AES 256 bit.
-	 * @since 5.0.005 (2010-05-12)
-	 * @author Nicola Asuni
-	 * @public static
-	 */
-	public static function getUserPermissionCode($permissions, $mode=0) {
-		$options = array(
-			'owner' => 2, // bit 2 -- inverted logic: cleared by default
-			'print' => 4, // bit 3
-			'modify' => 8, // bit 4
-			'copy' => 16, // bit 5
-			'annot-forms' => 32, // bit 6
-			'fill-forms' => 256, // bit 9
-			'extract' => 512, // bit 10
-			'assemble' => 1024,// bit 11
-			'print-high' => 2048 // bit 12
-			);
-		$protection = 2147422012; // 32 bit: (01111111 11111111 00001111 00111100)
-		foreach ($permissions as $permission) {
-			if (isset($options[$permission])) {
-				if (($mode > 0) OR ($options[$permission] <= 32)) {
-					// set only valid permissions
-					if ($options[$permission] == 2) {
-						// the logic for bit 2 is inverted (cleared by default)
-						$protection += $options[$permission];
-					} else {
-						$protection -= $options[$permission];
-					}
-				}
-			}
-		}
-		return $protection;
-	}
-
-	/**
-	 * Convert hexadecimal string to string
-	 * @param $bs (string) byte-string to convert
-	 * @return String
-	 * @since 5.0.005 (2010-05-12)
-	 * @author Nicola Asuni
-	 * @public static
-	 */
-	public static function convertHexStringToString($bs) {
-		$string = ''; // string to be returned
-		$bslength = strlen($bs);
-		if (($bslength % 2) != 0) {
-			// padding
-			$bs .= '0';
-			++$bslength;
-		}
-		for ($i = 0; $i < $bslength; $i += 2) {
-			$string .= chr(hexdec($bs[$i].$bs[($i + 1)]));
-		}
-		return $string;
-	}
-
-	/**
-	 * Convert string to hexadecimal string (byte string)
-	 * @param $s (string) string to convert
-	 * @return byte string
-	 * @since 5.0.010 (2010-05-17)
-	 * @author Nicola Asuni
-	 * @public static
-	 */
-	public static function convertStringToHexString($s) {
-		$bs = '';
-		$chars = preg_split('//', $s, -1, PREG_SPLIT_NO_EMPTY);
-		foreach ($chars as $c) {
-			$bs .= sprintf('%02s', dechex(ord($c)));
-		}
-		return $bs;
-	}
-
-	/**
-	 * Convert encryption P value to a string of bytes, low-order byte first.
-	 * @param $protection (string) 32bit encryption permission value (P value)
-	 * @return String
-	 * @since 5.0.005 (2010-05-12)
-	 * @author Nicola Asuni
-	 * @public static
-	 */
-	public static function getEncPermissionsString($protection) {
-		$binprot = sprintf('%032b', $protection);
-		$str = chr(bindec(substr($binprot, 24, 8)));
-		$str .= chr(bindec(substr($binprot, 16, 8)));
-		$str .= chr(bindec(substr($binprot, 8, 8)));
-		$str .= chr(bindec(substr($binprot, 0, 8)));
-		return $str;
-	}
-
-	/**
-	 * Encode a name object.
-	 * @param $name (string) Name object to encode.
-	 * @return (string) Encoded name object.
-	 * @author Nicola Asuni
-	 * @since 5.9.097 (2011-06-23)
-	 * @public static
-	 */
-	public static function encodeNameObject($name) {
-		$escname = '';
-		$length = strlen($name);
-		for ($i = 0; $i < $length; ++$i) {
-			$chr = $name[$i];
-			if (preg_match('/[0-9a-zA-Z#_=-]/', $chr) == 1) {
-				$escname .= $chr;
-			} else {
-				$escname .= sprintf('#%02X', ord($chr));
-			}
-		}
-		return $escname;
-	}
-
-	/**
-	 * Convert JavaScript form fields properties array to Annotation Properties array.
-	 * @param $prop (array) javascript field properties. Possible values are described on official Javascript for Acrobat API reference.
-	 * @param $spot_colors (array) Reference to spot colors array.
-	 * @param $rtl (boolean) True if in Right-To-Left text direction mode, false otherwise.
-	 * @return array of annotation properties
-	 * @author Nicola Asuni
-	 * @since 4.8.000 (2009-09-06)
-	 * @public static
-	 */
-	public static function getAnnotOptFromJSProp($prop, &$spot_colors, $rtl=false) {
-		if (isset($prop['aopt']) AND is_array($prop['aopt'])) {
-			// the annotation options area lready defined
-			return $prop['aopt'];
-		}
-		$opt = array(); // value to be returned
-		// alignment: Controls how the text is laid out within the text field.
-		if (isset($prop['alignment'])) {
-			switch ($prop['alignment']) {
-				case 'left': {
-					$opt['q'] = 0;
-					break;
-				}
-				case 'center': {
-					$opt['q'] = 1;
-					break;
-				}
-				case 'right': {
-					$opt['q'] = 2;
-					break;
-				}
-				default: {
-					$opt['q'] = ($rtl)?2:0;
-					break;
-				}
-			}
-		}
-		// lineWidth: Specifies the thickness of the border when stroking the perimeter of a field's rectangle.
-		if (isset($prop['lineWidth'])) {
-			$linewidth = intval($prop['lineWidth']);
-		} else {
-			$linewidth = 1;
-		}
-		// borderStyle: The border style for a field.
-		if (isset($prop['borderStyle'])) {
-			switch ($prop['borderStyle']) {
-				case 'border.d':
-				case 'dashed': {
-					$opt['border'] = array(0, 0, $linewidth, array(3, 2));
-					$opt['bs'] = array('w'=>$linewidth, 's'=>'D', 'd'=>array(3, 2));
-					break;
-				}
-				case 'border.b':
-				case 'beveled': {
-					$opt['border'] = array(0, 0, $linewidth);
-					$opt['bs'] = array('w'=>$linewidth, 's'=>'B');
-					break;
-				}
-				case 'border.i':
-				case 'inset': {
-					$opt['border'] = array(0, 0, $linewidth);
-					$opt['bs'] = array('w'=>$linewidth, 's'=>'I');
-					break;
-				}
-				case 'border.u':
-				case 'underline': {
-					$opt['border'] = array(0, 0, $linewidth);
-					$opt['bs'] = array('w'=>$linewidth, 's'=>'U');
-					break;
-				}
-				case 'border.s':
-				case 'solid': {
-					$opt['border'] = array(0, 0, $linewidth);
-					$opt['bs'] = array('w'=>$linewidth, 's'=>'S');
-					break;
-				}
-				default: {
-					break;
-				}
-			}
-		}
-		if (isset($prop['border']) AND is_array($prop['border'])) {
-			$opt['border'] = $prop['border'];
-		}
-		if (!isset($opt['mk'])) {
-			$opt['mk'] = array();
-		}
-		if (!isset($opt['mk']['if'])) {
-			$opt['mk']['if'] = array();
-		}
-		$opt['mk']['if']['a'] = array(0.5, 0.5);
-		// buttonAlignX: Controls how space is distributed from the left of the button face with respect to the icon.
-		if (isset($prop['buttonAlignX'])) {
-			$opt['mk']['if']['a'][0] = $prop['buttonAlignX'];
-		}
-		// buttonAlignY: Controls how unused space is distributed from the bottom of the button face with respect to the icon.
-		if (isset($prop['buttonAlignY'])) {
-			$opt['mk']['if']['a'][1] = $prop['buttonAlignY'];
-		}
-		// buttonFitBounds: If true, the extent to which the icon may be scaled is set to the bounds of the button field.
-		if (isset($prop['buttonFitBounds']) AND ($prop['buttonFitBounds'] == 'true')) {
-			$opt['mk']['if']['fb'] = true;
-		}
-		// buttonScaleHow: Controls how the icon is scaled (if necessary) to fit inside the button face.
-		if (isset($prop['buttonScaleHow'])) {
-			switch ($prop['buttonScaleHow']) {
-				case 'scaleHow.proportional': {
-					$opt['mk']['if']['s'] = 'P';
-					break;
-				}
-				case 'scaleHow.anamorphic': {
-					$opt['mk']['if']['s'] = 'A';
-					break;
-				}
-			}
-		}
-		// buttonScaleWhen: Controls when an icon is scaled to fit inside the button face.
-		if (isset($prop['buttonScaleWhen'])) {
-			switch ($prop['buttonScaleWhen']) {
-				case 'scaleWhen.always': {
-					$opt['mk']['if']['sw'] = 'A';
-					break;
-				}
-				case 'scaleWhen.never': {
-					$opt['mk']['if']['sw'] = 'N';
-					break;
-				}
-				case 'scaleWhen.tooBig': {
-					$opt['mk']['if']['sw'] = 'B';
-					break;
-				}
-				case 'scaleWhen.tooSmall': {
-					$opt['mk']['if']['sw'] = 'S';
-					break;
-				}
-			}
-		}
-		// buttonPosition: Controls how the text and the icon of the button are positioned with respect to each other within the button face.
-		if (isset($prop['buttonPosition'])) {
-			switch ($prop['buttonPosition']) {
-				case 0:
-				case 'position.textOnly': {
-					$opt['mk']['tp'] = 0;
-					break;
-				}
-				case 1:
-				case 'position.iconOnly': {
-					$opt['mk']['tp'] = 1;
-					break;
-				}
-				case 2:
-				case 'position.iconTextV': {
-					$opt['mk']['tp'] = 2;
-					break;
-				}
-				case 3:
-				case 'position.textIconV': {
-					$opt['mk']['tp'] = 3;
-					break;
-				}
-				case 4:
-				case 'position.iconTextH': {
-					$opt['mk']['tp'] = 4;
-					break;
-				}
-				case 5:
-				case 'position.textIconH': {
-					$opt['mk']['tp'] = 5;
-					break;
-				}
-				case 6:
-				case 'position.overlay': {
-					$opt['mk']['tp'] = 6;
-					break;
-				}
-			}
-		}
-		// fillColor: Specifies the background color for a field.
-		if (isset($prop['fillColor'])) {
-			if (is_array($prop['fillColor'])) {
-				$opt['mk']['bg'] = $prop['fillColor'];
-			} else {
-				$opt['mk']['bg'] = TCPDF_COLORS::convertHTMLColorToDec($prop['fillColor'], $spot_colors);
-			}
-		}
-		// strokeColor: Specifies the stroke color for a field that is used to stroke the rectangle of the field with a line as large as the line width.
-		if (isset($prop['strokeColor'])) {
-			if (is_array($prop['strokeColor'])) {
-				$opt['mk']['bc'] = $prop['strokeColor'];
-			} else {
-				$opt['mk']['bc'] = TCPDF_COLORS::convertHTMLColorToDec($prop['strokeColor'], $spot_colors);
-			}
-		}
-		// rotation: The rotation of a widget in counterclockwise increments.
-		if (isset($prop['rotation'])) {
-			$opt['mk']['r'] = $prop['rotation'];
-		}
-		// charLimit: Limits the number of characters that a user can type into a text field.
-		if (isset($prop['charLimit'])) {
-			$opt['maxlen'] = intval($prop['charLimit']);
-		}
-		if (!isset($ff)) {
-			$ff = 0; // default value
-		}
-		// readonly: The read-only characteristic of a field. If a field is read-only, the user can see the field but cannot change it.
-		if (isset($prop['readonly']) AND ($prop['readonly'] == 'true')) {
-			$ff += 1 << 0;
-		}
-		// required: Specifies whether a field requires a value.
-		if (isset($prop['required']) AND ($prop['required'] == 'true')) {
-			$ff += 1 << 1;
-		}
-		// multiline: Controls how text is wrapped within the field.
-		if (isset($prop['multiline']) AND ($prop['multiline'] == 'true')) {
-			$ff += 1 << 12;
-		}
-		// password: Specifies whether the field should display asterisks when data is entered in the field.
-		if (isset($prop['password']) AND ($prop['password'] == 'true')) {
-			$ff += 1 << 13;
-		}
-		// NoToggleToOff: If set, exactly one radio button shall be selected at all times; selecting the currently selected button has no effect.
-		if (isset($prop['NoToggleToOff']) AND ($prop['NoToggleToOff'] == 'true')) {
-			$ff += 1 << 14;
-		}
-		// Radio: If set, the field is a set of radio buttons.
-		if (isset($prop['Radio']) AND ($prop['Radio'] == 'true')) {
-			$ff += 1 << 15;
-		}
-		// Pushbutton: If set, the field is a pushbutton that does not retain a permanent value.
-		if (isset($prop['Pushbutton']) AND ($prop['Pushbutton'] == 'true')) {
-			$ff += 1 << 16;
-		}
-		// Combo: If set, the field is a combo box; if clear, the field is a list box.
-		if (isset($prop['Combo']) AND ($prop['Combo'] == 'true')) {
-			$ff += 1 << 17;
-		}
-		// editable: Controls whether a combo box is editable.
-		if (isset($prop['editable']) AND ($prop['editable'] == 'true')) {
-			$ff += 1 << 18;
-		}
-		// Sort: If set, the field's option items shall be sorted alphabetically.
-		if (isset($prop['Sort']) AND ($prop['Sort'] == 'true')) {
-			$ff += 1 << 19;
-		}
-		// fileSelect: If true, sets the file-select flag in the Options tab of the text field (Field is Used for File Selection).
-		if (isset($prop['fileSelect']) AND ($prop['fileSelect'] == 'true')) {
-			$ff += 1 << 20;
-		}
-		// multipleSelection: If true, indicates that a list box allows a multiple selection of items.
-		if (isset($prop['multipleSelection']) AND ($prop['multipleSelection'] == 'true')) {
-			$ff += 1 << 21;
-		}
-		// doNotSpellCheck: If true, spell checking is not performed on this editable text field.
-		if (isset($prop['doNotSpellCheck']) AND ($prop['doNotSpellCheck'] == 'true')) {
-			$ff += 1 << 22;
-		}
-		// doNotScroll: If true, the text field does not scroll and the user, therefore, is limited by the rectangular region designed for the field.
-		if (isset($prop['doNotScroll']) AND ($prop['doNotScroll'] == 'true')) {
-			$ff += 1 << 23;
-		}
-		// comb: If set to true, the field background is drawn as series of boxes (one for each character in the value of the field) and each character of the content is drawn within those boxes. The number of boxes drawn is determined from the charLimit property. It applies only to text fields. The setter will also raise if any of the following field properties are also set multiline, password, and fileSelect. A side-effect of setting this property is that the doNotScroll property is also set.
-		if (isset($prop['comb']) AND ($prop['comb'] == 'true')) {
-			$ff += 1 << 24;
-		}
-		// radiosInUnison: If false, even if a group of radio buttons have the same name and export value, they behave in a mutually exclusive fashion, like HTML radio buttons.
-		if (isset($prop['radiosInUnison']) AND ($prop['radiosInUnison'] == 'true')) {
-			$ff += 1 << 25;
-		}
-		// richText: If true, the field allows rich text formatting.
-		if (isset($prop['richText']) AND ($prop['richText'] == 'true')) {
-			$ff += 1 << 25;
-		}
-		// commitOnSelChange: Controls whether a field value is committed after a selection change.
-		if (isset($prop['commitOnSelChange']) AND ($prop['commitOnSelChange'] == 'true')) {
-			$ff += 1 << 26;
-		}
-		$opt['ff'] = $ff;
-		// defaultValue: The default value of a field - that is, the value that the field is set to when the form is reset.
-		if (isset($prop['defaultValue'])) {
-			$opt['dv'] = $prop['defaultValue'];
-		}
-		$f = 4; // default value for annotation flags
-		// readonly: The read-only characteristic of a field. If a field is read-only, the user can see the field but cannot change it.
-		if (isset($prop['readonly']) AND ($prop['readonly'] == 'true')) {
-			$f += 1 << 6;
-		}
-		// display: Controls whether the field is hidden or visible on screen and in print.
-		if (isset($prop['display'])) {
-			if ($prop['display'] == 'display.visible') {
-				//
-			} elseif ($prop['display'] == 'display.hidden') {
-				$f += 1 << 1;
-			} elseif ($prop['display'] == 'display.noPrint') {
-				$f -= 1 << 2;
-			} elseif ($prop['display'] == 'display.noView') {
-				$f += 1 << 5;
-			}
-		}
-		$opt['f'] = $f;
-		// currentValueIndices: Reads and writes single or multiple values of a list box or combo box.
-		if (isset($prop['currentValueIndices']) AND is_array($prop['currentValueIndices'])) {
-			$opt['i'] = $prop['currentValueIndices'];
-		}
-		// value: The value of the field data that the user has entered.
-		if (isset($prop['value'])) {
-			if (is_array($prop['value'])) {
-				$opt['opt'] = array();
-				foreach ($prop['value'] AS $key => $optval) {
-					// exportValues: An array of strings representing the export values for the field.
-					if (isset($prop['exportValues'][$key])) {
-						$opt['opt'][$key] = array($prop['exportValues'][$key], $prop['value'][$key]);
-					} else {
-						$opt['opt'][$key] = $prop['value'][$key];
-					}
-				}
-			} else {
-				$opt['v'] = $prop['value'];
-			}
-		}
-		// richValue: This property specifies the text contents and formatting of a rich text field.
-		if (isset($prop['richValue'])) {
-			$opt['rv'] = $prop['richValue'];
-		}
-		// submitName: If nonempty, used during form submission instead of name. Only applicable if submitting in HTML format (that is, URL-encoded).
-		if (isset($prop['submitName'])) {
-			$opt['tm'] = $prop['submitName'];
-		}
-		// name: Fully qualified field name.
-		if (isset($prop['name'])) {
-			$opt['t'] = $prop['name'];
-		}
-		// userName: The user name (short description string) of the field.
-		if (isset($prop['userName'])) {
-			$opt['tu'] = $prop['userName'];
-		}
-		// highlight: Defines how a button reacts when a user clicks it.
-		if (isset($prop['highlight'])) {
-			switch ($prop['highlight']) {
-				case 'none':
-				case 'highlight.n': {
-					$opt['h'] = 'N';
-					break;
-				}
-				case 'invert':
-				case 'highlight.i': {
-					$opt['h'] = 'i';
-					break;
-				}
-				case 'push':
-				case 'highlight.p': {
-					$opt['h'] = 'P';
-					break;
-				}
-				case 'outline':
-				case 'highlight.o': {
-					$opt['h'] = 'O';
-					break;
-				}
-			}
-		}
-		// Unsupported options:
-		// - calcOrderIndex: Changes the calculation order of fields in the document.
-		// - delay: Delays the redrawing of a field's appearance.
-		// - defaultStyle: This property defines the default style attributes for the form field.
-		// - style: Allows the user to set the glyph style of a check box or radio button.
-		// - textColor, textFont, textSize
-		return $opt;
-	}
-
-	/**
-	 * Format the page numbers.
-	 * This method can be overriden for custom formats.
-	 * @param $num (int) page number
-	 * @since 4.2.005 (2008-11-06)
-	 * @public static
-	 */
-	public static function formatPageNumber($num) {
-		return number_format((float)$num, 0, '', '.');
-	}
-
-	/**
-	 * Format the page numbers on the Table Of Content.
-	 * This method can be overriden for custom formats.
-	 * @param $num (int) page number
-	 * @since 4.5.001 (2009-01-04)
-	 * @see addTOC(), addHTMLTOC()
-	 * @public static
-	 */
-	public static function formatTOCPageNumber($num) {
-		return number_format((float)$num, 0, '', '.');
-	}
-
-	/**
-	 * Extracts the CSS properties from a CSS string.
-	 * @param $cssdata (string) string containing CSS definitions.
-	 * @return An array where the keys are the CSS selectors and the values are the CSS properties.
-	 * @author Nicola Asuni
-	 * @since 5.1.000 (2010-05-25)
-	 * @public static
-	 */
-	public static function extractCSSproperties($cssdata) {
-		if (empty($cssdata)) {
-			return array();
-		}
-		// remove comments
-		$cssdata = preg_replace('/\/\*[^\*]*\*\//', '', $cssdata);
-		// remove newlines and multiple spaces
-		$cssdata = preg_replace('/[\s]+/', ' ', $cssdata);
-		// remove some spaces
-		$cssdata = preg_replace('/[\s]*([;:\{\}]{1})[\s]*/', '\\1', $cssdata);
-		// remove empty blocks
-		$cssdata = preg_replace('/([^\}\{]+)\{\}/', '', $cssdata);
-		// replace media type parenthesis
-		$cssdata = preg_replace('/@media[\s]+([^\{]*)\{/i', '@media \\1§', $cssdata);
-		$cssdata = preg_replace('/\}\}/si', '}§', $cssdata);
-		// trim string
-		$cssdata = trim($cssdata);
-		// find media blocks (all, braille, embossed, handheld, print, projection, screen, speech, tty, tv)
-		$cssblocks = array();
-		$matches = array();
-		if (preg_match_all('/@media[\s]+([^\§]*)§([^§]*)§/i', $cssdata, $matches) > 0) {
-			foreach ($matches[1] as $key => $type) {
-				$cssblocks[$type] = $matches[2][$key];
-			}
-			// remove media blocks
-			$cssdata = preg_replace('/@media[\s]+([^\§]*)§([^§]*)§/i', '', $cssdata);
-		}
-		// keep 'all' and 'print' media, other media types are discarded
-		if (isset($cssblocks['all']) AND !empty($cssblocks['all'])) {
-			$cssdata .= $cssblocks['all'];
-		}
-		if (isset($cssblocks['print']) AND !empty($cssblocks['print'])) {
-			$cssdata .= $cssblocks['print'];
-		}
-		// reset css blocks array
-		$cssblocks = array();
-		$matches = array();
-		// explode css data string into array
-		if (substr($cssdata, -1) == '}') {
-			// remove last parethesis
-			$cssdata = substr($cssdata, 0, -1);
-		}
-		$matches = explode('}', $cssdata);
-		foreach ($matches as $key => $block) {
-			// index 0 contains the CSS selector, index 1 contains CSS properties
-			$cssblocks[$key] = explode('{', $block);
-			if (!isset($cssblocks[$key][1])) {
-				// remove empty definitions
-				unset($cssblocks[$key]);
-			}
-		}
-		// split groups of selectors (comma-separated list of selectors)
-		foreach ($cssblocks as $key => $block) {
-			if (strpos($block[0], ',') > 0) {
-				$selectors = explode(',', $block[0]);
-				foreach ($selectors as $sel) {
-					$cssblocks[] = array(0 => trim($sel), 1 => $block[1]);
-				}
-				unset($cssblocks[$key]);
-			}
-		}
-		// covert array to selector => properties
-		$cssdata = array();
-		foreach ($cssblocks as $block) {
-			$selector = $block[0];
-			// calculate selector's specificity
-			$matches = array();
-			$a = 0; // the declaration is not from is a 'style' attribute
-			$b = intval(preg_match_all('/[\#]/', $selector, $matches)); // number of ID attributes
-			$c = intval(preg_match_all('/[\[\.]/', $selector, $matches)); // number of other attributes
-			$c += intval(preg_match_all('/[\:]link|visited|hover|active|focus|target|lang|enabled|disabled|checked|indeterminate|root|nth|first|last|only|empty|contains|not/i', $selector, $matches)); // number of pseudo-classes
-			$d = intval(preg_match_all('/[\>\+\~\s]{1}[a-zA-Z0-9]+/', ' '.$selector, $matches)); // number of element names
-			$d += intval(preg_match_all('/[\:][\:]/', $selector, $matches)); // number of pseudo-elements
-			$specificity = $a.$b.$c.$d;
-			// add specificity to the beginning of the selector
-			$cssdata[$specificity.' '.$selector] = $block[1];
-		}
-		// sort selectors alphabetically to account for specificity
-		ksort($cssdata, SORT_STRING);
-		// return array
-		return $cssdata;
-	}
-
-	/**
-	 * Cleanup HTML code (requires HTML Tidy library).
-	 * @param $html (string) htmlcode to fix
-	 * @param $default_css (string) CSS commands to add
-	 * @param $tagvs (array) parameters for setHtmlVSpace method
-	 * @param $tidy_options (array) options for tidy_parse_string function
-	 * @param $tagvspaces (array) Array of vertical spaces for tags.
-	 * @return string XHTML code cleaned up
-	 * @author Nicola Asuni
-	 * @since 5.9.017 (2010-11-16)
-	 * @see setHtmlVSpace()
-	 * @public static
-	 */
-	public static function fixHTMLCode($html, $default_css='', $tagvs='', $tidy_options='', &$tagvspaces) {
-		// configure parameters for HTML Tidy
-		if ($tidy_options === '') {
-			$tidy_options = array (
-				'clean' => 1,
-				'drop-empty-paras' => 0,
-				'drop-proprietary-attributes' => 1,
-				'fix-backslash' => 1,
-				'hide-comments' => 1,
-				'join-styles' => 1,
-				'lower-literals' => 1,
-				'merge-divs' => 1,
-				'merge-spans' => 1,
-				'output-xhtml' => 1,
-				'word-2000' => 1,
-				'wrap' => 0,
-				'output-bom' => 0,
-				//'char-encoding' => 'utf8',
-				//'input-encoding' => 'utf8',
-				//'output-encoding' => 'utf8'
-			);
-		}
-		// clean up the HTML code
-		$tidy = tidy_parse_string($html, $tidy_options);
-		// fix the HTML
-		$tidy->cleanRepair();
-		// get the CSS part
-		$tidy_head = tidy_get_head($tidy);
-		$css = $tidy_head->value;
-		$css = preg_replace('/<style([^>]+)>/ims', '<style>', $css);
-		$css = preg_replace('/<\/style>(.*)<style>/ims', "\n", $css);
-		$css = str_replace('/*<![CDATA[*/', '', $css);
-		$css = str_replace('/*]]>*/', '', $css);
-		preg_match('/<style>(.*)<\/style>/ims', $css, $matches);
-		if (isset($matches[1])) {
-			$css = strtolower($matches[1]);
-		} else {
-			$css = '';
-		}
-		// include default css
-		$css = '<style>'.$default_css.$css.'</style>';
-		// get the body part
-		$tidy_body = tidy_get_body($tidy);
-		$html = $tidy_body->value;
-		// fix some self-closing tags
-		$html = str_replace('<br>', '<br />', $html);
-		// remove some empty tag blocks
-		$html = preg_replace('/<div([^\>]*)><\/div>/', '', $html);
-		$html = preg_replace('/<p([^\>]*)><\/p>/', '', $html);
-		if ($tagvs !== '') {
-			// set vertical space for some XHTML tags
-			$tagvspaces = $tagvs;
-		}
-		// return the cleaned XHTML code + CSS
-		return $css.$html;
-	}
-
-	/**
-	 * Returns true if the CSS selector is valid for the selected HTML tag
-	 * @param $dom (array) array of HTML tags and properties
-	 * @param $key (int) key of the current HTML tag
-	 * @param $selector (string) CSS selector string
-	 * @return true if the selector is valid, false otherwise
-	 * @since 5.1.000 (2010-05-25)
-	 * @public static
-	 */
-	public static function isValidCSSSelectorForTag($dom, $key, $selector) {
-		$valid = false; // value to be returned
-		$tag = $dom[$key]['value'];
-		$class = array();
-		if (isset($dom[$key]['attribute']['class']) AND !empty($dom[$key]['attribute']['class'])) {
-			$class = explode(' ', strtolower($dom[$key]['attribute']['class']));
-		}
-		$id = '';
-		if (isset($dom[$key]['attribute']['id']) AND !empty($dom[$key]['attribute']['id'])) {
-			$id = strtolower($dom[$key]['attribute']['id']);
-		}
-		$selector = preg_replace('/([\>\+\~\s]{1})([\.]{1})([^\>\+\~\s]*)/si', '\\1*.\\3', $selector);
-		$matches = array();
-		if (preg_match_all('/([\>\+\~\s]{1})([a-zA-Z0-9\*]+)([^\>\+\~\s]*)/si', $selector, $matches, PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE) > 0) {
-			$parentop = array_pop($matches[1]);
-			$operator = $parentop[0];
-			$offset = $parentop[1];
-			$lasttag = array_pop($matches[2]);
-			$lasttag = strtolower(trim($lasttag[0]));
-			if (($lasttag == '*') OR ($lasttag == $tag)) {
-				// the last element on selector is our tag or 'any tag'
-				$attrib = array_pop($matches[3]);
-				$attrib = strtolower(trim($attrib[0]));
-				if (!empty($attrib)) {
-					// check if matches class, id, attribute, pseudo-class or pseudo-element
-					switch ($attrib[0]) {
-						case '.': { // class
-							if (in_array(substr($attrib, 1), $class)) {
-								$valid = true;
-							}
-							break;
-						}
-						case '#': { // ID
-							if (substr($attrib, 1) == $id) {
-								$valid = true;
-							}
-							break;
-						}
-						case '[': { // attribute
-							$attrmatch = array();
-							if (preg_match('/\[([a-zA-Z0-9]*)[\s]*([\~\^\$\*\|\=]*)[\s]*["]?([^"\]]*)["]?\]/i', $attrib, $attrmatch) > 0) {
-								$att = strtolower($attrmatch[1]);
-								$val = $attrmatch[3];
-								if (isset($dom[$key]['attribute'][$att])) {
-									switch ($attrmatch[2]) {
-										case '=': {
-											if ($dom[$key]['attribute'][$att] == $val) {
-												$valid = true;
-											}
-											break;
-										}
-										case '~=': {
-											if (in_array($val, explode(' ', $dom[$key]['attribute'][$att]))) {
-												$valid = true;
-											}
-											break;
-										}
-										case '^=': {
-											if ($val == substr($dom[$key]['attribute'][$att], 0, strlen($val))) {
-												$valid = true;
-											}
-											break;
-										}
-										case '$=': {
-											if ($val == substr($dom[$key]['attribute'][$att], -strlen($val))) {
-												$valid = true;
-											}
-											break;
-										}
-										case '*=': {
-											if (strpos($dom[$key]['attribute'][$att], $val) !== false) {
-												$valid = true;
-											}
-											break;
-										}
-										case '|=': {
-											if ($dom[$key]['attribute'][$att] == $val) {
-												$valid = true;
-											} elseif (preg_match('/'.$val.'[\-]{1}/i', $dom[$key]['attribute'][$att]) > 0) {
-												$valid = true;
-											}
-											break;
-										}
-										default: {
-											$valid = true;
-										}
-									}
-								}
-							}
-							break;
-						}
-						case ':': { // pseudo-class or pseudo-element
-							if ($attrib[1] == ':') { // pseudo-element
-								// pseudo-elements are not supported!
-								// (::first-line, ::first-letter, ::before, ::after)
-							} else { // pseudo-class
-								// pseudo-classes are not supported!
-								// (:root, :nth-child(n), :nth-last-child(n), :nth-of-type(n), :nth-last-of-type(n), :first-child, :last-child, :first-of-type, :last-of-type, :only-child, :only-of-type, :empty, :link, :visited, :active, :hover, :focus, :target, :lang(fr), :enabled, :disabled, :checked)
-							}
-							break;
-						}
-					} // end of switch
-				} else {
-					$valid = true;
-				}
-				if ($valid AND ($offset > 0)) {
-					$valid = false;
-					// check remaining selector part
-					$selector = substr($selector, 0, $offset);
-					switch ($operator) {
-						case ' ': { // descendant of an element
-							while ($dom[$key]['parent'] > 0) {
-								if (self::isValidCSSSelectorForTag($dom, $dom[$key]['parent'], $selector)) {
-									$valid = true;
-									break;
-								} else {
-									$key = $dom[$key]['parent'];
-								}
-							}
-							break;
-						}
-						case '>': { // child of an element
-							$valid = self::isValidCSSSelectorForTag($dom, $dom[$key]['parent'], $selector);
-							break;
-						}
-						case '+': { // immediately preceded by an element
-							for ($i = ($key - 1); $i > $dom[$key]['parent']; --$i) {
-								if ($dom[$i]['tag'] AND $dom[$i]['opening']) {
-									$valid = self::isValidCSSSelectorForTag($dom, $i, $selector);
-									break;
-								}
-							}
-							break;
-						}
-						case '~': { // preceded by an element
-							for ($i = ($key - 1); $i > $dom[$key]['parent']; --$i) {
-								if ($dom[$i]['tag'] AND $dom[$i]['opening']) {
-									if (self::isValidCSSSelectorForTag($dom, $i, $selector)) {
-										break;
-									}
-								}
-							}
-							break;
-						}
-					}
-				}
-			}
-		}
-		return $valid;
-	}
-
-	/**
-	 * Returns the styles array that apply for the selected HTML tag.
-	 * @param $dom (array) array of HTML tags and properties
-	 * @param $key (int) key of the current HTML tag
-	 * @param $css (array) array of CSS properties
-	 * @return array containing CSS properties
-	 * @since 5.1.000 (2010-05-25)
-	 * @public static
-	 */
-	public static function getCSSdataArray($dom, $key, $css) {
-		$cssarray = array(); // style to be returned
-		// get parent CSS selectors
-		$selectors = array();
-		if (isset($dom[($dom[$key]['parent'])]['csssel'])) {
-			$selectors = $dom[($dom[$key]['parent'])]['csssel'];
-		}
-		// get all styles that apply
-		foreach($css as $selector => $style) {
-			$pos = strpos($selector, ' ');
-			// get specificity
-			$specificity = substr($selector, 0, $pos);
-			// remove specificity
-			$selector = substr($selector, $pos);
-			// check if this selector apply to current tag
-			if (self::isValidCSSSelectorForTag($dom, $key, $selector)) {
-				if (!in_array($selector, $selectors)) {
-					// add style if not already added on parent selector
-					$cssarray[] = array('k' => $selector, 's' => $specificity, 'c' => $style);
-					$selectors[] = $selector;
-				}
-			}
-		}
-		if (isset($dom[$key]['attribute']['style'])) {
-			// attach inline style (latest properties have high priority)
-			$cssarray[] = array('k' => '', 's' => '1000', 'c' => $dom[$key]['attribute']['style']);
-		}
-		// order the css array to account for specificity
-		$cssordered = array();
-		foreach ($cssarray as $key => $val) {
-			$skey = sprintf('%04d', $key);
-			$cssordered[$val['s'].'_'.$skey] = $val;
-		}
-		// sort selectors alphabetically to account for specificity
-		ksort($cssordered, SORT_STRING);
-		return array($selectors, $cssordered);
-	}
-
-	/**
-	 * Compact CSS data array into single string.
-	 * @param $css (array) array of CSS properties
-	 * @return string containing merged CSS properties
-	 * @since 5.9.070 (2011-04-19)
-	 * @public static
-	 */
-	public static function getTagStyleFromCSSarray($css) {
-		$tagstyle = ''; // value to be returned
-		foreach ($css as $style) {
-			// split single css commands
-			$csscmds = explode(';', $style['c']);
-			foreach ($csscmds as $cmd) {
-				if (!empty($cmd)) {
-					$pos = strpos($cmd, ':');
-					if ($pos !== false) {
-						$cmd = substr($cmd, 0, ($pos + 1));
-						if (strpos($tagstyle, $cmd) !== false) {
-							// remove duplicate commands (last commands have high priority)
-							$tagstyle = preg_replace('/'.$cmd.'[^;]+/i', '', $tagstyle);
-						}
-					}
-				}
-			}
-			$tagstyle .= ';'.$style['c'];
-		}
-		// remove multiple semicolons
-		$tagstyle = preg_replace('/[;]+/', ';', $tagstyle);
-		return $tagstyle;
-	}
-
-	/**
-	 * Returns the Roman representation of an integer number
-	 * @param $number (int) number to convert
-	 * @return string roman representation of the specified number
-	 * @since 4.4.004 (2008-12-10)
-	 * @public static
-	 */
-	public static function intToRoman($number) {
-		$roman = '';
-		while ($number >= 1000) {
-			$roman .= 'M';
-			$number -= 1000;
-		}
-		while ($number >= 900) {
-			$roman .= 'CM';
-			$number -= 900;
-		}
-		while ($number >= 500) {
-			$roman .= 'D';
-			$number -= 500;
-		}
-		while ($number >= 400) {
-			$roman .= 'CD';
-			$number -= 400;
-		}
-		while ($number >= 100) {
-			$roman .= 'C';
-			$number -= 100;
-		}
-		while ($number >= 90) {
-			$roman .= 'XC';
-			$number -= 90;
-		}
-		while ($number >= 50) {
-			$roman .= 'L';
-			$number -= 50;
-		}
-		while ($number >= 40) {
-			$roman .= 'XL';
-			$number -= 40;
-		}
-		while ($number >= 10) {
-			$roman .= 'X';
-			$number -= 10;
-		}
-		while ($number >= 9) {
-			$roman .= 'IX';
-			$number -= 9;
-		}
-		while ($number >= 5) {
-			$roman .= 'V';
-			$number -= 5;
-		}
-		while ($number >= 4) {
-			$roman .= 'IV';
-			$number -= 4;
-		}
-		while ($number >= 1) {
-			$roman .= 'I';
-			--$number;
-		}
-		return $roman;
-	}
-
-	/**
-	 * Find position of last occurrence of a substring in a string
-	 * @param $haystack (string) The string to search in.
-	 * @param $needle (string) substring to search.
-	 * @param $offset (int) May be specified to begin searching an arbitrary number of characters into the string.
-	 * @return Returns the position where the needle exists. Returns FALSE if the needle was not found.
-	 * @since 4.8.038 (2010-03-13)
-	 * @public static
-	 */
-	public static function revstrpos($haystack, $needle, $offset = 0) {
-		$length = strlen($haystack);
-		$offset = ($offset > 0)?($length - $offset):abs($offset);
-		$pos = strpos(strrev($haystack), strrev($needle), $offset);
-		return ($pos === false)?false:($length - $pos - strlen($needle));
-	}
-
-	/**
-	 * Returns an array of hyphenation patterns.
-	 * @param $file (string) TEX file containing hypenation patterns. TEX pattrns can be downloaded from http://www.ctan.org/tex-archive/language/hyph-utf8/tex/generic/hyph-utf8/patterns/
-	 * @return array of hyphenation patterns
-	 * @author Nicola Asuni
-	 * @since 4.9.012 (2010-04-12)
-	 * @public static
-	 */
-	public static function getHyphenPatternsFromTEX($file) {
-		// TEX patterns are available at:
-		// http://www.ctan.org/tex-archive/language/hyph-utf8/tex/generic/hyph-utf8/patterns/
-		$data = file_get_contents($file);
-		$patterns = array();
-		// remove comments
-		$data = preg_replace('/\%[^\n]*/', '', $data);
-		// extract the patterns part
-		preg_match('/\\\\patterns\{([^\}]*)\}/i', $data, $matches);
-		$data = trim(substr($matches[0], 10, -1));
-		// extract each pattern
-		$patterns_array = preg_split('/[\s]+/', $data);
-		// create new language array of patterns
-		$patterns = array();
-		foreach($patterns_array as $val) {
-			if (!TCPDF_STATIC::empty_string($val)) {
-				$val = trim($val);
-				$val = str_replace('\'', '\\\'', $val);
-				$key = preg_replace('/[0-9]+/', '', $val);
-				$patterns[$key] = $val;
-			}
-		}
-		return $patterns;
-	}
-
-	/**
-	 * Get the Path-Painting Operators.
-	 * @param $style (string) Style of rendering. Possible values are:
-	 * <ul>
-	 *   <li>S or D: Stroke the path.</li>
-	 *   <li>s or d: Close and stroke the path.</li>
-	 *   <li>f or F: Fill the path, using the nonzero winding number rule to determine the region to fill.</li>
-	 *   <li>f* or F*: Fill the path, using the even-odd rule to determine the region to fill.</li>
-	 *   <li>B or FD or DF: Fill and then stroke the path, using the nonzero winding number rule to determine the region to fill.</li>
-	 *   <li>B* or F*D or DF*: Fill and then stroke the path, using the even-odd rule to determine the region to fill.</li>
-	 *   <li>b or fd or df: Close, fill, and then stroke the path, using the nonzero winding number rule to determine the region to fill.</li>
-	 *   <li>b or f*d or df*: Close, fill, and then stroke the path, using the even-odd rule to determine the region to fill.</li>
-	 *   <li>CNZ: Clipping mode using the even-odd rule to determine which regions lie inside the clipping path.</li>
-	 *   <li>CEO: Clipping mode using the nonzero winding number rule to determine which regions lie inside the clipping path</li>
-	 *   <li>n: End the path object without filling or stroking it.</li>
-	 * </ul>
-	 * @param $default (string) default style
-	 * @author Nicola Asuni
-	 * @since 5.0.000 (2010-04-30)
-	 * @public static
-	 */
-	public static function getPathPaintOperator($style, $default='S') {
-		$op = '';
-		switch($style) {
-			case 'S':
-			case 'D': {
-				$op = 'S';
-				break;
-			}
-			case 's':
-			case 'd': {
-				$op = 's';
-				break;
-			}
-			case 'f':
-			case 'F': {
-				$op = 'f';
-				break;
-			}
-			case 'f*':
-			case 'F*': {
-				$op = 'f*';
-				break;
-			}
-			case 'B':
-			case 'FD':
-			case 'DF': {
-				$op = 'B';
-				break;
-			}
-			case 'B*':
-			case 'F*D':
-			case 'DF*': {
-				$op = 'B*';
-				break;
-			}
-			case 'b':
-			case 'fd':
-			case 'df': {
-				$op = 'b';
-				break;
-			}
-			case 'b*':
-			case 'f*d':
-			case 'df*': {
-				$op = 'b*';
-				break;
-			}
-			case 'CNZ': {
-				$op = 'W n';
-				break;
-			}
-			case 'CEO': {
-				$op = 'W* n';
-				break;
-			}
-			case 'n': {
-				$op = 'n';
-				break;
-			}
-			default: {
-				if (!empty($default)) {
-					$op = self::getPathPaintOperator($default, '');
-				} else {
-					$op = '';
-				}
-			}
-		}
-		return $op;
-	}
-
-	/**
-	 * Get the product of two SVG tranformation matrices
-	 * @param $ta (array) first SVG tranformation matrix
-	 * @param $tb (array) second SVG tranformation matrix
-	 * @return transformation array
-	 * @author Nicola Asuni
-	 * @since 5.0.000 (2010-05-02)
-	 * @public static
-	 */
-	public static function getTransformationMatrixProduct($ta, $tb) {
-		$tm = array();
-		$tm[0] = ($ta[0] * $tb[0]) + ($ta[2] * $tb[1]);
-		$tm[1] = ($ta[1] * $tb[0]) + ($ta[3] * $tb[1]);
-		$tm[2] = ($ta[0] * $tb[2]) + ($ta[2] * $tb[3]);
-		$tm[3] = ($ta[1] * $tb[2]) + ($ta[3] * $tb[3]);
-		$tm[4] = ($ta[0] * $tb[4]) + ($ta[2] * $tb[5]) + $ta[4];
-		$tm[5] = ($ta[1] * $tb[4]) + ($ta[3] * $tb[5]) + $ta[5];
-		return $tm;
-	}
-
-	/**
-	 * Get the tranformation matrix from SVG transform attribute
-	 * @param $attribute (string) transformation
-	 * @return array of transformations
-	 * @author Nicola Asuni
-	 * @since 5.0.000 (2010-05-02)
-	 * @public static
-	 */
-	public static function getSVGTransformMatrix($attribute) {
-		// identity matrix
-		$tm = array(1, 0, 0, 1, 0, 0);
-		$transform = array();
-		if (preg_match_all('/(matrix|translate|scale|rotate|skewX|skewY)[\s]*\(([^\)]+)\)/si', $attribute, $transform, PREG_SET_ORDER) > 0) {
-			foreach ($transform as $key => $data) {
-				if (!empty($data[2])) {
-					$a = 1;
-					$b = 0;
-					$c = 0;
-					$d = 1;
-					$e = 0;
-					$f = 0;
-					$regs = array();
-					switch ($data[1]) {
-						case 'matrix': {
-							if (preg_match('/([a-z0-9\-\.]+)[\,\s]+([a-z0-9\-\.]+)[\,\s]+([a-z0-9\-\.]+)[\,\s]+([a-z0-9\-\.]+)[\,\s]+([a-z0-9\-\.]+)[\,\s]+([a-z0-9\-\.]+)/si', $data[2], $regs)) {
-								$a = $regs[1];
-								$b = $regs[2];
-								$c = $regs[3];
-								$d = $regs[4];
-								$e = $regs[5];
-								$f = $regs[6];
-							}
-							break;
-						}
-						case 'translate': {
-							if (preg_match('/([a-z0-9\-\.]+)[\,\s]+([a-z0-9\-\.]+)/si', $data[2], $regs)) {
-								$e = $regs[1];
-								$f = $regs[2];
-							} elseif (preg_match('/([a-z0-9\-\.]+)/si', $data[2], $regs)) {
-								$e = $regs[1];
-							}
-							break;
-						}
-						case 'scale': {
-							if (preg_match('/([a-z0-9\-\.]+)[\,\s]+([a-z0-9\-\.]+)/si', $data[2], $regs)) {
-								$a = $regs[1];
-								$d = $regs[2];
-							} elseif (preg_match('/([a-z0-9\-\.]+)/si', $data[2], $regs)) {
-								$a = $regs[1];
-								$d = $a;
-							}
-							break;
-						}
-						case 'rotate': {
-							if (preg_match('/([0-9\-\.]+)[\,\s]+([a-z0-9\-\.]+)[\,\s]+([a-z0-9\-\.]+)/si', $data[2], $regs)) {
-								$ang = deg2rad($regs[1]);
-								$x = $regs[2];
-								$y = $regs[3];
-								$a = cos($ang);
-								$b = sin($ang);
-								$c = -$b;
-								$d = $a;
-								$e = ($x * (1 - $a)) - ($y * $c);
-								$f = ($y * (1 - $d)) - ($x * $b);
-							} elseif (preg_match('/([0-9\-\.]+)/si', $data[2], $regs)) {
-								$ang = deg2rad($regs[1]);
-								$a = cos($ang);
-								$b = sin($ang);
-								$c = -$b;
-								$d = $a;
-								$e = 0;
-								$f = 0;
-							}
-							break;
-						}
-						case 'skewX': {
-							if (preg_match('/([0-9\-\.]+)/si', $data[2], $regs)) {
-								$c = tan(deg2rad($regs[1]));
-							}
-							break;
-						}
-						case 'skewY': {
-							if (preg_match('/([0-9\-\.]+)/si', $data[2], $regs)) {
-								$b = tan(deg2rad($regs[1]));
-							}
-							break;
-						}
-					}
-					$tm = self::getTransformationMatrixProduct($tm, array($a, $b, $c, $d, $e, $f));
-				}
-			}
-		}
-		return $tm;
-	}
-
-	/**
-	 * Returns the angle in radiants between two vectors
-	 * @param $x1 (int) X coordinate of first vector point
-	 * @param $y1 (int) Y coordinate of first vector point
-	 * @param $x2 (int) X coordinate of second vector point
-	 * @param $y2 (int) Y coordinate of second vector point
-	 * @author Nicola Asuni
-	 * @since 5.0.000 (2010-05-04)
-	 * @public static
-	 */
-	public static function getVectorsAngle($x1, $y1, $x2, $y2) {
-		$dprod = ($x1 * $x2) + ($y1 * $y2);
-		$dist1 = sqrt(($x1 * $x1) + ($y1 * $y1));
-		$dist2 = sqrt(($x2 * $x2) + ($y2 * $y2));
-		$angle = acos($dprod / ($dist1 * $dist2));
-		if (is_nan($angle)) {
-			$angle = M_PI;
-		}
-		if ((($x1 * $y2) - ($x2 * $y1)) < 0) {
-			$angle *= -1;
-		}
-		return $angle;
-	}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-// ====================================================================================================================
-// REIMPLEMENTED
-// ====================================================================================================================
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-	/**
-	 * Split string by a regular expression.
-	 * This is a wrapper for the preg_split function to avoid the bug: https://bugs.php.net/bug.php?id=45850
-	 * @param $pattern (string) The regular expression pattern to search for without the modifiers, as a string.
-	 * @param $modifiers (string) The modifiers part of the pattern,
-	 * @param $subject (string) The input string.
-	 * @param $limit (int) If specified, then only substrings up to limit are returned with the rest of the string being placed in the last substring. A limit of -1, 0 or NULL means "no limit" and, as is standard across PHP, you can use NULL to skip to the flags parameter.
-	 * @param $flags (int) The flags as specified on the preg_split PHP function.
-	 * @return Returns an array containing substrings of subject split along boundaries matched by pattern.modifier
-	 * @author Nicola Asuni
-	 * @since 6.0.023
-	 * @public static
-	 */
-	public static function pregSplit($pattern, $modifiers, $subject, $limit=NULL, $flags=NULL) {
-		// the bug only happens on PHP 5.2 when using the u modifier
-		if ((strpos($modifiers, 'u') === FALSE) OR (count(preg_split('//u', "\n\t", -1, PREG_SPLIT_NO_EMPTY)) == 2)) {
-			return preg_split($pattern.$modifiers, $subject, $limit, $flags);
-		}
-		// preg_split is bugged - try alternative solution
-		$ret = array();
-		while (($nl = strpos($subject, "\n")) !== FALSE) {
-			$ret = array_merge($ret, preg_split($pattern.$modifiers, substr($subject, 0, $nl), $limit, $flags));
-			$ret[] = "\n";
-			$subject = substr($subject, ($nl + 1));
-		}
-		if (strlen($subject) > 0) {
-			$ret = array_merge($ret, preg_split($pattern.$modifiers, $subject, $limit, $flags));
-		}
-		return $ret;
-	}
-
-	/**
-	 * Wrapper to use fopen only with local files
-	 * @param filename (string) Name of the file to open
-	 * @param $mode (string) 
-	 * @return Returns a file pointer resource on success, or FALSE on error.  
-	 * @public static
-	 */
-	public static function fopenLocal($filename, $mode) {
-		if (strpos($filename, '://') === false) {
-			$filename = 'file://'.$filename;
-		} elseif (stream_is_local($filename) !== true) {
-			return false;
-		}
-		return fopen($filename, $mode);
-	}
-
-	/**
-	 * Reads entire file into a string.
-	 * The file can be also an URL.
-	 * @param $file (string) Name of the file or URL to read.
-	 * @return The function returns the read data or FALSE on failure. 
-	 * @author Nicola Asuni
-	 * @since 6.0.025
-	 * @public static
-	 */
-	public static function fileGetContents($file) {
-		$alt = array($file);
-		//
-		if ((strlen($file) > 1)
-		    && ($file[0] === '/')
-		    && ($file[1] !== '/')
-		    && !empty($_SERVER['DOCUMENT_ROOT'])
-		    && ($_SERVER['DOCUMENT_ROOT'] !== '/')
-		) {
-		    $findroot = strpos($file, $_SERVER['DOCUMENT_ROOT']);
-		    if (($findroot === false) || ($findroot > 1)) {
-			$alt[] = htmlspecialchars_decode(urldecode($_SERVER['DOCUMENT_ROOT'].$file));
-		    }
-		}
-		//
-		$protocol = 'http';
-		if (!empty($_SERVER['HTTPS']) && (strtolower($_SERVER['HTTPS']) != 'off')) {
-		    $protocol .= 's';
-		}
-		//
-		$url = $file;
-		if (preg_match('%^//%', $url) && !empty($_SERVER['HTTP_HOST'])) {
-			$url = $protocol.':'.str_replace(' ', '%20', $url);
-		}
-		$url = htmlspecialchars_decode($url);
-		$alt[] = $url;
-		//
-		if (preg_match('%^(https?)://%', $url)
-		    && empty($_SERVER['HTTP_HOST'])
-		    && empty($_SERVER['DOCUMENT_ROOT'])
-		) {
-			$urldata = parse_url($url);
-			if (empty($urldata['query'])) {
-				$host = $protocol.'://'.$_SERVER['HTTP_HOST'];
-				if (strpos($url, $host) === 0) {
-				    // convert URL to full server path
-				    $tmp = str_replace($host, $_SERVER['DOCUMENT_ROOT'], $url);
-				    $alt[] = htmlspecialchars_decode(urldecode($tmp));
-				}
-			}
-		}
-		//
-		if (isset($_SERVER['SCRIPT_URI'])
-		    && !preg_match('%^(https?|ftp)://%', $file)
-		    && !preg_match('%^//%', $file)
-		) {
-		    $urldata = @parse_url($_SERVER['SCRIPT_URI']);
-		    return $urldata['scheme'].'://'.$urldata['host'].(($file[0] == '/') ? '' : '/').$file;
-		}
-		//
-		$alt = array_unique($alt);
-		//var_dump($alt);exit;//DEBUG
-		foreach ($alt as $path) {
-			$ret = @file_get_contents($path);
-			if ($ret !== false) {
-			    return $ret;
-			}
-			// try to use CURL for URLs
-			if (!ini_get('allow_url_fopen')
-				&& function_exists('curl_init')
-				&& preg_match('%^(https?|ftp)://%', $path)
-			) {
-				// try to get remote file data using cURL
-				$crs = curl_init();
-				curl_setopt($crs, CURLOPT_URL, $path);
-				curl_setopt($crs, CURLOPT_BINARYTRANSFER, true);
-				curl_setopt($crs, CURLOPT_FAILONERROR, true);
-				curl_setopt($crs, CURLOPT_RETURNTRANSFER, true);
-				if ((ini_get('open_basedir') == '') && (!ini_get('safe_mode'))) {
-				    curl_setopt($crs, CURLOPT_FOLLOWLOCATION, true);
-				}
-				curl_setopt($crs, CURLOPT_CONNECTTIMEOUT, 5);
-				curl_setopt($crs, CURLOPT_TIMEOUT, 30);
-				curl_setopt($crs, CURLOPT_SSL_VERIFYPEER, false);
-				curl_setopt($crs, CURLOPT_SSL_VERIFYHOST, false);
-				curl_setopt($crs, CURLOPT_USERAGENT, 'tc-lib-file');
-				$ret = curl_exec($crs);
-				curl_close($crs);
-				if ($ret !== false) {
-					return $ret;
-				}
-			}
-		}
-		return false;
-	}
-
-    
-
-	/**
-	 * Get ULONG from string (Big Endian 32-bit unsigned integer).
-	 * @param $str (string) string from where to extract value
-	 * @param $offset (int) point from where to read the data
-	 * @return int 32 bit value
-	 * @author Nicola Asuni
-	 * @since 5.2.000 (2010-06-02)
-	 * @public static
-	 */
-	public static function _getULONG($str, $offset) {
-		$v = unpack('Ni', substr($str, $offset, 4));
-		return $v['i'];
-	}
-
-	/**
-	 * Get USHORT from string (Big Endian 16-bit unsigned integer).
-	 * @param $str (string) string from where to extract value
-	 * @param $offset (int) point from where to read the data
-	 * @return int 16 bit value
-	 * @author Nicola Asuni
-	 * @since 5.2.000 (2010-06-02)
-	 * @public static
-	 */
-	public static function _getUSHORT($str, $offset) {
-		$v = unpack('ni', substr($str, $offset, 2));
-		return $v['i'];
-	}
-
-	/**
-	 * Get SHORT from string (Big Endian 16-bit signed integer).
-	 * @param $str (string) String from where to extract value.
-	 * @param $offset (int) Point from where to read the data.
-	 * @return int 16 bit value
-	 * @author Nicola Asuni
-	 * @since 5.2.000 (2010-06-02)
-	 * @public static
-	 */
-	public static function _getSHORT($str, $offset) {
-		$v = unpack('si', substr($str, $offset, 2));
-		return $v['i'];
-	}
-
-	/**
-	 * Get FWORD from string (Big Endian 16-bit signed integer).
-	 * @param $str (string) String from where to extract value.
-	 * @param $offset (int) Point from where to read the data.
-	 * @return int 16 bit value
-	 * @author Nicola Asuni
-	 * @since 5.9.123 (2011-09-30)
-	 * @public static
-	 */
-	public static function _getFWORD($str, $offset) {
-		$v = self::_getUSHORT($str, $offset);
-		if ($v > 0x7fff) {
-			$v -= 0x10000;
-		}
-		return $v;
-	}
-
-	/**
-	 * Get UFWORD from string (Big Endian 16-bit unsigned integer).
-	 * @param $str (string) string from where to extract value
-	 * @param $offset (int) point from where to read the data
-	 * @return int 16 bit value
-	 * @author Nicola Asuni
-	 * @since 5.9.123 (2011-09-30)
-	 * @public static
-	 */
-	public static function _getUFWORD($str, $offset) {
-		$v = self::_getUSHORT($str, $offset);
-		return $v;
-	}
-
-	/**
-	 * Get FIXED from string (32-bit signed fixed-point number (16.16).
-	 * @param $str (string) string from where to extract value
-	 * @param $offset (int) point from where to read the data
-	 * @return int 16 bit value
-	 * @author Nicola Asuni
-	 * @since 5.9.123 (2011-09-30)
-	 * @public static
-	 */
-	public static function _getFIXED($str, $offset) {
-		// mantissa
-		$m = self::_getFWORD($str, $offset);
-		// fraction
-		$f = self::_getUSHORT($str, ($offset + 2));
-		$v = floatval(''.$m.'.'.$f.'');
-		return $v;
-	}
-
-	/**
-	 * Get BYTE from string (8-bit unsigned integer).
-	 * @param $str (string) String from where to extract value.
-	 * @param $offset (int) Point from where to read the data.
-	 * @return int 8 bit value
-	 * @author Nicola Asuni
-	 * @since 5.2.000 (2010-06-02)
-	 * @public static
-	 */
-	public static function _getBYTE($str, $offset) {
-		$v = unpack('Ci', substr($str, $offset, 1));
-		return $v['i'];
-	}
-	/**
-	 * Binary-safe and URL-safe file read.
-	 * Reads up to length bytes from the file pointer referenced by handle. Reading stops as soon as one of the following conditions is met: length bytes have been read; EOF (end of file) is reached.
-	 * @param $handle (resource)
-	 * @param $length (int)
-	 * @return Returns the read string or FALSE in case of error.
-	 * @author Nicola Asuni
-	 * @since 4.5.027 (2009-03-16)
-	 * @public static
-	 */
-	public static function rfread($handle, $length) {
-		$data = fread($handle, $length);
-		if ($data === false) {
-			return false;
-		}
-		$rest = ($length - strlen($data));
-		if (($rest > 0) && !feof($handle)) {
-			$data .= self::rfread($handle, $rest);
-		}
-		return $data;
-	}
-
-	/**
-	 * Read a 4-byte (32 bit) integer from file.
-	 * @param $f (string) file name.
-	 * @return 4-byte integer
-	 * @public static
-	 */
-	public static function _freadint($f) {
-		$a = unpack('Ni', fread($f, 4));
-		return $a['i'];
-	}
-
-	
-	/**
-	 * Array of page formats
-	 * measures are calculated in this way: (inches * 72) or (millimeters * 72 / 25.4)
-	 * @public static
-	 */
-	public static $page_formats = array(
-		// ISO 216 A Series + 2 SIS 014711 extensions
-		'A0'                     => array( 2383.937,  3370.394), // = (  841 x 1189 ) mm  = ( 33.11 x 46.81 ) in
-		'A1'                     => array( 1683.780,  2383.937), // = (  594 x 841  ) mm  = ( 23.39 x 33.11 ) in
-		'A2'                     => array( 1190.551,  1683.780), // = (  420 x 594  ) mm  = ( 16.54 x 23.39 ) in
-		'A3'                     => array(  841.890,  1190.551), // = (  297 x 420  ) mm  = ( 11.69 x 16.54 ) in
-		'A4'                     => array(  595.276,   841.890), // = (  210 x 297  ) mm  = (  8.27 x 11.69 ) in
-		'A5'                     => array(  419.528,   595.276), // = (  148 x 210  ) mm  = (  5.83 x 8.27  ) in
-		'A6'                     => array(  297.638,   419.528), // = (  105 x 148  ) mm  = (  4.13 x 5.83  ) in
-		'A7'                     => array(  209.764,   297.638), // = (   74 x 105  ) mm  = (  2.91 x 4.13  ) in
-		'A8'                     => array(  147.402,   209.764), // = (   52 x 74   ) mm  = (  2.05 x 2.91  ) in
-		'A9'                     => array(  104.882,   147.402), // = (   37 x 52   ) mm  = (  1.46 x 2.05  ) in
-		'A10'                    => array(   73.701,   104.882), // = (   26 x 37   ) mm  = (  1.02 x 1.46  ) in
-		'A11'                    => array(   51.024,    73.701), // = (   18 x 26   ) mm  = (  0.71 x 1.02  ) in
-		'A12'                    => array(   36.850,    51.024), // = (   13 x 18   ) mm  = (  0.51 x 0.71  ) in
-		// ISO 216 B Series + 2 SIS 014711 extensions
-		'B0'                     => array( 2834.646,  4008.189), // = ( 1000 x 1414 ) mm  = ( 39.37 x 55.67 ) in
-		'B1'                     => array( 2004.094,  2834.646), // = (  707 x 1000 ) mm  = ( 27.83 x 39.37 ) in
-		'B2'                     => array( 1417.323,  2004.094), // = (  500 x 707  ) mm  = ( 19.69 x 27.83 ) in
-		'B3'                     => array( 1000.630,  1417.323), // = (  353 x 500  ) mm  = ( 13.90 x 19.69 ) in
-		'B4'                     => array(  708.661,  1000.630), // = (  250 x 353  ) mm  = (  9.84 x 13.90 ) in
-		'B5'                     => array(  498.898,   708.661), // = (  176 x 250  ) mm  = (  6.93 x 9.84  ) in
-		'B6'                     => array(  354.331,   498.898), // = (  125 x 176  ) mm  = (  4.92 x 6.93  ) in
-		'B7'                     => array(  249.449,   354.331), // = (   88 x 125  ) mm  = (  3.46 x 4.92  ) in
-		'B8'                     => array(  175.748,   249.449), // = (   62 x 88   ) mm  = (  2.44 x 3.46  ) in
-		'B9'                     => array(  124.724,   175.748), // = (   44 x 62   ) mm  = (  1.73 x 2.44  ) in
-		'B10'                    => array(   87.874,   124.724), // = (   31 x 44   ) mm  = (  1.22 x 1.73  ) in
-		'B11'                    => array(   62.362,    87.874), // = (   22 x 31   ) mm  = (  0.87 x 1.22  ) in
-		'B12'                    => array(   42.520,    62.362), // = (   15 x 22   ) mm  = (  0.59 x 0.87  ) in
-		// ISO 216 C Series + 2 SIS 014711 extensions + 5 EXTENSION
-		'C0'                     => array( 2599.370,  3676.535), // = (  917 x 1297 ) mm  = ( 36.10 x 51.06 ) in
-		'C1'                     => array( 1836.850,  2599.370), // = (  648 x 917  ) mm  = ( 25.51 x 36.10 ) in
-		'C2'                     => array( 1298.268,  1836.850), // = (  458 x 648  ) mm  = ( 18.03 x 25.51 ) in
-		'C3'                     => array(  918.425,  1298.268), // = (  324 x 458  ) mm  = ( 12.76 x 18.03 ) in
-		'C4'                     => array(  649.134,   918.425), // = (  229 x 324  ) mm  = (  9.02 x 12.76 ) in
-		'C5'                     => array(  459.213,   649.134), // = (  162 x 229  ) mm  = (  6.38 x 9.02  ) in
-		'C6'                     => array(  323.150,   459.213), // = (  114 x 162  ) mm  = (  4.49 x 6.38  ) in
-		'C7'                     => array(  229.606,   323.150), // = (   81 x 114  ) mm  = (  3.19 x 4.49  ) in
-		'C8'                     => array(  161.575,   229.606), // = (   57 x 81   ) mm  = (  2.24 x 3.19  ) in
-		'C9'                     => array(  113.386,   161.575), // = (   40 x 57   ) mm  = (  1.57 x 2.24  ) in
-		'C10'                    => array(   79.370,   113.386), // = (   28 x 40   ) mm  = (  1.10 x 1.57  ) in
-		'C11'                    => array(   56.693,    79.370), // = (   20 x 28   ) mm  = (  0.79 x 1.10  ) in
-		'C12'                    => array(   39.685,    56.693), // = (   14 x 20   ) mm  = (  0.55 x 0.79  ) in
-		'C76'                    => array(  229.606,   459.213), // = (   81 x 162  ) mm  = (  3.19 x 6.38  ) in
-		'DL'                     => array(  311.811,   623.622), // = (  110 x 220  ) mm  = (  4.33 x 8.66  ) in
-		'DLE'                    => array(  323.150,   637.795), // = (  114 x 225  ) mm  = (  4.49 x 8.86  ) in
-		'DLX'                    => array(  340.158,   666.142), // = (  120 x 235  ) mm  = (  4.72 x 9.25  ) in
-		'DLP'                    => array(  280.630,   595.276), // = (   99 x 210  ) mm  = (  3.90 x 8.27  ) in (1/3 A4)
-		// SIS 014711 E Series
-		'E0'                     => array( 2491.654,  3517.795), // = (  879 x 1241 ) mm  = ( 34.61 x 48.86 ) in
-		'E1'                     => array( 1757.480,  2491.654), // = (  620 x 879  ) mm  = ( 24.41 x 34.61 ) in
-		'E2'                     => array( 1247.244,  1757.480), // = (  440 x 620  ) mm  = ( 17.32 x 24.41 ) in
-		'E3'                     => array(  878.740,  1247.244), // = (  310 x 440  ) mm  = ( 12.20 x 17.32 ) in
-		'E4'                     => array(  623.622,   878.740), // = (  220 x 310  ) mm  = (  8.66 x 12.20 ) in
-		'E5'                     => array(  439.370,   623.622), // = (  155 x 220  ) mm  = (  6.10 x 8.66  ) in
-		'E6'                     => array(  311.811,   439.370), // = (  110 x 155  ) mm  = (  4.33 x 6.10  ) in
-		'E7'                     => array(  221.102,   311.811), // = (   78 x 110  ) mm  = (  3.07 x 4.33  ) in
-		'E8'                     => array(  155.906,   221.102), // = (   55 x 78   ) mm  = (  2.17 x 3.07  ) in
-		'E9'                     => array(  110.551,   155.906), // = (   39 x 55   ) mm  = (  1.54 x 2.17  ) in
-		'E10'                    => array(   76.535,   110.551), // = (   27 x 39   ) mm  = (  1.06 x 1.54  ) in
-		'E11'                    => array(   53.858,    76.535), // = (   19 x 27   ) mm  = (  0.75 x 1.06  ) in
-		'E12'                    => array(   36.850,    53.858), // = (   13 x 19   ) mm  = (  0.51 x 0.75  ) in
-		// SIS 014711 G Series
-		'G0'                     => array( 2715.591,  3838.110), // = (  958 x 1354 ) mm  = ( 37.72 x 53.31 ) in
-		'G1'                     => array( 1919.055,  2715.591), // = (  677 x 958  ) mm  = ( 26.65 x 37.72 ) in
-		'G2'                     => array( 1357.795,  1919.055), // = (  479 x 677  ) mm  = ( 18.86 x 26.65 ) in
-		'G3'                     => array(  958.110,  1357.795), // = (  338 x 479  ) mm  = ( 13.31 x 18.86 ) in
-		'G4'                     => array(  677.480,   958.110), // = (  239 x 338  ) mm  = (  9.41 x 13.31 ) in
-		'G5'                     => array(  479.055,   677.480), // = (  169 x 239  ) mm  = (  6.65 x 9.41  ) in
-		'G6'                     => array(  337.323,   479.055), // = (  119 x 169  ) mm  = (  4.69 x 6.65  ) in
-		'G7'                     => array(  238.110,   337.323), // = (   84 x 119  ) mm  = (  3.31 x 4.69  ) in
-		'G8'                     => array(  167.244,   238.110), // = (   59 x 84   ) mm  = (  2.32 x 3.31  ) in
-		'G9'                     => array(  119.055,   167.244), // = (   42 x 59   ) mm  = (  1.65 x 2.32  ) in
-		'G10'                    => array(   82.205,   119.055), // = (   29 x 42   ) mm  = (  1.14 x 1.65  ) in
-		'G11'                    => array(   59.528,    82.205), // = (   21 x 29   ) mm  = (  0.83 x 1.14  ) in
-		'G12'                    => array(   39.685,    59.528), // = (   14 x 21   ) mm  = (  0.55 x 0.83  ) in
-		// ISO Press
-		'RA0'                    => array( 2437.795,  3458.268), // = (  860 x 1220 ) mm  = ( 33.86 x 48.03 ) in
-		'RA1'                    => array( 1729.134,  2437.795), // = (  610 x 860  ) mm  = ( 24.02 x 33.86 ) in
-		'RA2'                    => array( 1218.898,  1729.134), // = (  430 x 610  ) mm  = ( 16.93 x 24.02 ) in
-		'RA3'                    => array(  864.567,  1218.898), // = (  305 x 430  ) mm  = ( 12.01 x 16.93 ) in
-		'RA4'                    => array(  609.449,   864.567), // = (  215 x 305  ) mm  = (  8.46 x 12.01 ) in
-		'SRA0'                   => array( 2551.181,  3628.346), // = (  900 x 1280 ) mm  = ( 35.43 x 50.39 ) in
-		'SRA1'                   => array( 1814.173,  2551.181), // = (  640 x 900  ) mm  = ( 25.20 x 35.43 ) in
-		'SRA2'                   => array( 1275.591,  1814.173), // = (  450 x 640  ) mm  = ( 17.72 x 25.20 ) in
-		'SRA3'                   => array(  907.087,  1275.591), // = (  320 x 450  ) mm  = ( 12.60 x 17.72 ) in
-		'SRA4'                   => array(  637.795,   907.087), // = (  225 x 320  ) mm  = (  8.86 x 12.60 ) in
-		// German DIN 476
-		'4A0'                    => array( 4767.874,  6740.787), // = ( 1682 x 2378 ) mm  = ( 66.22 x 93.62 ) in
-		'2A0'                    => array( 3370.394,  4767.874), // = ( 1189 x 1682 ) mm  = ( 46.81 x 66.22 ) in
-		// Variations on the ISO Standard
-		'A2_EXTRA'               => array( 1261.417,  1754.646), // = (  445 x 619  ) mm  = ( 17.52 x 24.37 ) in
-		'A3+'                    => array(  932.598,  1369.134), // = (  329 x 483  ) mm  = ( 12.95 x 19.02 ) in
-		'A3_EXTRA'               => array(  912.756,  1261.417), // = (  322 x 445  ) mm  = ( 12.68 x 17.52 ) in
-		'A3_SUPER'               => array(  864.567,  1440.000), // = (  305 x 508  ) mm  = ( 12.01 x 20.00 ) in
-		'SUPER_A3'               => array(  864.567,  1380.472), // = (  305 x 487  ) mm  = ( 12.01 x 19.17 ) in
-		'A4_EXTRA'               => array(  666.142,   912.756), // = (  235 x 322  ) mm  = (  9.25 x 12.68 ) in
-		'A4_SUPER'               => array(  649.134,   912.756), // = (  229 x 322  ) mm  = (  9.02 x 12.68 ) in
-		'SUPER_A4'               => array(  643.465,  1009.134), // = (  227 x 356  ) mm  = (  8.94 x 14.02 ) in
-		'A4_LONG'                => array(  595.276,   986.457), // = (  210 x 348  ) mm  = (  8.27 x 13.70 ) in
-		'F4'                     => array(  595.276,   935.433), // = (  210 x 330  ) mm  = (  8.27 x 12.99 ) in
-		'SO_B5_EXTRA'            => array(  572.598,   782.362), // = (  202 x 276  ) mm  = (  7.95 x 10.87 ) in
-		'A5_EXTRA'               => array(  490.394,   666.142), // = (  173 x 235  ) mm  = (  6.81 x 9.25  ) in
-		// ANSI Series
-		'ANSI_E'                 => array( 2448.000,  3168.000), // = (  864 x 1118 ) mm  = ( 34.00 x 44.00 ) in
-		'ANSI_D'                 => array( 1584.000,  2448.000), // = (  559 x 864  ) mm  = ( 22.00 x 34.00 ) in
-		'ANSI_C'                 => array( 1224.000,  1584.000), // = (  432 x 559  ) mm  = ( 17.00 x 22.00 ) in
-		'ANSI_B'                 => array(  792.000,  1224.000), // = (  279 x 432  ) mm  = ( 11.00 x 17.00 ) in
-		'ANSI_A'                 => array(  612.000,   792.000), // = (  216 x 279  ) mm  = (  8.50 x 11.00 ) in
-		// Traditional 'Loose' North American Paper Sizes
-		'USLEDGER'               => array( 1224.000,   792.000), // = (  432 x 279  ) mm  = ( 17.00 x 11.00 ) in
-		'LEDGER'                 => array( 1224.000,   792.000), // = (  432 x 279  ) mm  = ( 17.00 x 11.00 ) in
-		'ORGANIZERK'             => array(  792.000,  1224.000), // = (  279 x 432  ) mm  = ( 11.00 x 17.00 ) in
-		'BIBLE'                  => array(  792.000,  1224.000), // = (  279 x 432  ) mm  = ( 11.00 x 17.00 ) in
-		'USTABLOID'              => array(  792.000,  1224.000), // = (  279 x 432  ) mm  = ( 11.00 x 17.00 ) in
-		'TABLOID'                => array(  792.000,  1224.000), // = (  279 x 432  ) mm  = ( 11.00 x 17.00 ) in
-		'ORGANIZERM'             => array(  612.000,   792.000), // = (  216 x 279  ) mm  = (  8.50 x 11.00 ) in
-		'USLETTER'               => array(  612.000,   792.000), // = (  216 x 279  ) mm  = (  8.50 x 11.00 ) in
-		'LETTER'                 => array(  612.000,   792.000), // = (  216 x 279  ) mm  = (  8.50 x 11.00 ) in
-		'USLEGAL'                => array(  612.000,  1008.000), // = (  216 x 356  ) mm  = (  8.50 x 14.00 ) in
-		'LEGAL'                  => array(  612.000,  1008.000), // = (  216 x 356  ) mm  = (  8.50 x 14.00 ) in
-		'GOVERNMENTLETTER'       => array(  576.000,   756.000), // = (  203 x 267  ) mm  = (  8.00 x 10.50 ) in
-		'GLETTER'                => array(  576.000,   756.000), // = (  203 x 267  ) mm  = (  8.00 x 10.50 ) in
-		'JUNIORLEGAL'            => array(  576.000,   360.000), // = (  203 x 127  ) mm  = (  8.00 x 5.00  ) in
-		'JLEGAL'                 => array(  576.000,   360.000), // = (  203 x 127  ) mm  = (  8.00 x 5.00  ) in
-		// Other North American Paper Sizes
-		'QUADDEMY'               => array( 2520.000,  3240.000), // = (  889 x 1143 ) mm  = ( 35.00 x 45.00 ) in
-		'SUPER_B'                => array(  936.000,  1368.000), // = (  330 x 483  ) mm  = ( 13.00 x 19.00 ) in
-		'QUARTO'                 => array(  648.000,   792.000), // = (  229 x 279  ) mm  = (  9.00 x 11.00 ) in
-		'GOVERNMENTLEGAL'        => array(  612.000,   936.000), // = (  216 x 330  ) mm  = (  8.50 x 13.00 ) in
-		'FOLIO'                  => array(  612.000,   936.000), // = (  216 x 330  ) mm  = (  8.50 x 13.00 ) in
-		'MONARCH'                => array(  522.000,   756.000), // = (  184 x 267  ) mm  = (  7.25 x 10.50 ) in
-		'EXECUTIVE'              => array(  522.000,   756.000), // = (  184 x 267  ) mm  = (  7.25 x 10.50 ) in
-		'ORGANIZERL'             => array(  396.000,   612.000), // = (  140 x 216  ) mm  = (  5.50 x 8.50  ) in
-		'STATEMENT'              => array(  396.000,   612.000), // = (  140 x 216  ) mm  = (  5.50 x 8.50  ) in
-		'MEMO'                   => array(  396.000,   612.000), // = (  140 x 216  ) mm  = (  5.50 x 8.50  ) in
-		'FOOLSCAP'               => array(  595.440,   936.000), // = (  210 x 330  ) mm  = (  8.27 x 13.00 ) in
-		'COMPACT'                => array(  306.000,   486.000), // = (  108 x 171  ) mm  = (  4.25 x 6.75  ) in
-		'ORGANIZERJ'             => array(  198.000,   360.000), // = (   70 x 127  ) mm  = (  2.75 x 5.00  ) in
-		// Canadian standard CAN 2-9.60M
-		'P1'                     => array( 1587.402,  2437.795), // = (  560 x 860  ) mm  = ( 22.05 x 33.86 ) in
-		'P2'                     => array( 1218.898,  1587.402), // = (  430 x 560  ) mm  = ( 16.93 x 22.05 ) in
-		'P3'                     => array(  793.701,  1218.898), // = (  280 x 430  ) mm  = ( 11.02 x 16.93 ) in
-		'P4'                     => array(  609.449,   793.701), // = (  215 x 280  ) mm  = (  8.46 x 11.02 ) in
-		'P5'                     => array(  396.850,   609.449), // = (  140 x 215  ) mm  = (  5.51 x 8.46  ) in
-		'P6'                     => array(  303.307,   396.850), // = (  107 x 140  ) mm  = (  4.21 x 5.51  ) in
-		// North American Architectural Sizes
-		'ARCH_E'                 => array( 2592.000,  3456.000), // = (  914 x 1219 ) mm  = ( 36.00 x 48.00 ) in
-		'ARCH_E1'                => array( 2160.000,  3024.000), // = (  762 x 1067 ) mm  = ( 30.00 x 42.00 ) in
-		'ARCH_D'                 => array( 1728.000,  2592.000), // = (  610 x 914  ) mm  = ( 24.00 x 36.00 ) in
-		'BROADSHEET'             => array( 1296.000,  1728.000), // = (  457 x 610  ) mm  = ( 18.00 x 24.00 ) in
-		'ARCH_C'                 => array( 1296.000,  1728.000), // = (  457 x 610  ) mm  = ( 18.00 x 24.00 ) in
-		'ARCH_B'                 => array(  864.000,  1296.000), // = (  305 x 457  ) mm  = ( 12.00 x 18.00 ) in
-		'ARCH_A'                 => array(  648.000,   864.000), // = (  229 x 305  ) mm  = (  9.00 x 12.00 ) in
-		// -- North American Envelope Sizes
-		// - Announcement Envelopes
-		'ANNENV_A2'              => array(  314.640,   414.000), // = (  111 x 146  ) mm  = (  4.37 x 5.75  ) in
-		'ANNENV_A6'              => array(  342.000,   468.000), // = (  121 x 165  ) mm  = (  4.75 x 6.50  ) in
-		'ANNENV_A7'              => array(  378.000,   522.000), // = (  133 x 184  ) mm  = (  5.25 x 7.25  ) in
-		'ANNENV_A8'              => array(  396.000,   584.640), // = (  140 x 206  ) mm  = (  5.50 x 8.12  ) in
-		'ANNENV_A10'             => array(  450.000,   692.640), // = (  159 x 244  ) mm  = (  6.25 x 9.62  ) in
-		'ANNENV_SLIM'            => array(  278.640,   638.640), // = (   98 x 225  ) mm  = (  3.87 x 8.87  ) in
-		// - Commercial Envelopes
-		'COMMENV_N6_1/4'         => array(  252.000,   432.000), // = (   89 x 152  ) mm  = (  3.50 x 6.00  ) in
-		'COMMENV_N6_3/4'         => array(  260.640,   468.000), // = (   92 x 165  ) mm  = (  3.62 x 6.50  ) in
-		'COMMENV_N8'             => array(  278.640,   540.000), // = (   98 x 191  ) mm  = (  3.87 x 7.50  ) in
-		'COMMENV_N9'             => array(  278.640,   638.640), // = (   98 x 225  ) mm  = (  3.87 x 8.87  ) in
-		'COMMENV_N10'            => array(  296.640,   684.000), // = (  105 x 241  ) mm  = (  4.12 x 9.50  ) in
-		'COMMENV_N11'            => array(  324.000,   746.640), // = (  114 x 263  ) mm  = (  4.50 x 10.37 ) in
-		'COMMENV_N12'            => array(  342.000,   792.000), // = (  121 x 279  ) mm  = (  4.75 x 11.00 ) in
-		'COMMENV_N14'            => array(  360.000,   828.000), // = (  127 x 292  ) mm  = (  5.00 x 11.50 ) in
-		// - Catalogue Envelopes
-		'CATENV_N1'              => array(  432.000,   648.000), // = (  152 x 229  ) mm  = (  6.00 x 9.00  ) in
-		'CATENV_N1_3/4'          => array(  468.000,   684.000), // = (  165 x 241  ) mm  = (  6.50 x 9.50  ) in
-		'CATENV_N2'              => array(  468.000,   720.000), // = (  165 x 254  ) mm  = (  6.50 x 10.00 ) in
-		'CATENV_N3'              => array(  504.000,   720.000), // = (  178 x 254  ) mm  = (  7.00 x 10.00 ) in
-		'CATENV_N6'              => array(  540.000,   756.000), // = (  191 x 267  ) mm  = (  7.50 x 10.50 ) in
-		'CATENV_N7'              => array(  576.000,   792.000), // = (  203 x 279  ) mm  = (  8.00 x 11.00 ) in
-		'CATENV_N8'              => array(  594.000,   810.000), // = (  210 x 286  ) mm  = (  8.25 x 11.25 ) in
-		'CATENV_N9_1/2'          => array(  612.000,   756.000), // = (  216 x 267  ) mm  = (  8.50 x 10.50 ) in
-		'CATENV_N9_3/4'          => array(  630.000,   810.000), // = (  222 x 286  ) mm  = (  8.75 x 11.25 ) in
-		'CATENV_N10_1/2'         => array(  648.000,   864.000), // = (  229 x 305  ) mm  = (  9.00 x 12.00 ) in
-		'CATENV_N12_1/2'         => array(  684.000,   900.000), // = (  241 x 318  ) mm  = (  9.50 x 12.50 ) in
-		'CATENV_N13_1/2'         => array(  720.000,   936.000), // = (  254 x 330  ) mm  = ( 10.00 x 13.00 ) in
-		'CATENV_N14_1/4'         => array(  810.000,   882.000), // = (  286 x 311  ) mm  = ( 11.25 x 12.25 ) in
-		'CATENV_N14_1/2'         => array(  828.000,  1044.000), // = (  292 x 368  ) mm  = ( 11.50 x 14.50 ) in
-		// Japanese (JIS P 0138-61) Standard B-Series
-		'JIS_B0'                 => array( 2919.685,  4127.244), // = ( 1030 x 1456 ) mm  = ( 40.55 x 57.32 ) in
-		'JIS_B1'                 => array( 2063.622,  2919.685), // = (  728 x 1030 ) mm  = ( 28.66 x 40.55 ) in
-		'JIS_B2'                 => array( 1459.843,  2063.622), // = (  515 x 728  ) mm  = ( 20.28 x 28.66 ) in
-		'JIS_B3'                 => array( 1031.811,  1459.843), // = (  364 x 515  ) mm  = ( 14.33 x 20.28 ) in
-		'JIS_B4'                 => array(  728.504,  1031.811), // = (  257 x 364  ) mm  = ( 10.12 x 14.33 ) in
-		'JIS_B5'                 => array(  515.906,   728.504), // = (  182 x 257  ) mm  = (  7.17 x 10.12 ) in
-		'JIS_B6'                 => array(  362.835,   515.906), // = (  128 x 182  ) mm  = (  5.04 x 7.17  ) in
-		'JIS_B7'                 => array(  257.953,   362.835), // = (   91 x 128  ) mm  = (  3.58 x 5.04  ) in
-		'JIS_B8'                 => array(  181.417,   257.953), // = (   64 x 91   ) mm  = (  2.52 x 3.58  ) in
-		'JIS_B9'                 => array(  127.559,   181.417), // = (   45 x 64   ) mm  = (  1.77 x 2.52  ) in
-		'JIS_B10'                => array(   90.709,   127.559), // = (   32 x 45   ) mm  = (  1.26 x 1.77  ) in
-		'JIS_B11'                => array(   62.362,    90.709), // = (   22 x 32   ) mm  = (  0.87 x 1.26  ) in
-		'JIS_B12'                => array(   45.354,    62.362), // = (   16 x 22   ) mm  = (  0.63 x 0.87  ) in
-		// PA Series
-		'PA0'                    => array( 2381.102,  3174.803), // = (  840 x 1120 ) mm  = ( 33.07 x 44.09 ) in
-		'PA1'                    => array( 1587.402,  2381.102), // = (  560 x 840  ) mm  = ( 22.05 x 33.07 ) in
-		'PA2'                    => array( 1190.551,  1587.402), // = (  420 x 560  ) mm  = ( 16.54 x 22.05 ) in
-		'PA3'                    => array(  793.701,  1190.551), // = (  280 x 420  ) mm  = ( 11.02 x 16.54 ) in
-		'PA4'                    => array(  595.276,   793.701), // = (  210 x 280  ) mm  = (  8.27 x 11.02 ) in
-		'PA5'                    => array(  396.850,   595.276), // = (  140 x 210  ) mm  = (  5.51 x 8.27  ) in
-		'PA6'                    => array(  297.638,   396.850), // = (  105 x 140  ) mm  = (  4.13 x 5.51  ) in
-		'PA7'                    => array(  198.425,   297.638), // = (   70 x 105  ) mm  = (  2.76 x 4.13  ) in
-		'PA8'                    => array(  147.402,   198.425), // = (   52 x 70   ) mm  = (  2.05 x 2.76  ) in
-		'PA9'                    => array(   99.213,   147.402), // = (   35 x 52   ) mm  = (  1.38 x 2.05  ) in
-		'PA10'                   => array(   73.701,    99.213), // = (   26 x 35   ) mm  = (  1.02 x 1.38  ) in
-		// Standard Photographic Print Sizes
-		'PASSPORT_PHOTO'         => array(   99.213,   127.559), // = (   35 x 45   ) mm  = (  1.38 x 1.77  ) in
-		'E'                      => array(  233.858,   340.157), // = (   82 x 120  ) mm  = (  3.25 x 4.72  ) in
-		'L'                      => array(  252.283,   360.000), // = (   89 x 127  ) mm  = (  3.50 x 5.00  ) in
-		'3R'                     => array(  252.283,   360.000), // = (   89 x 127  ) mm  = (  3.50 x 5.00  ) in
-		'KG'                     => array(  289.134,   430.866), // = (  102 x 152  ) mm  = (  4.02 x 5.98  ) in
-		'4R'                     => array(  289.134,   430.866), // = (  102 x 152  ) mm  = (  4.02 x 5.98  ) in
-		'4D'                     => array(  340.157,   430.866), // = (  120 x 152  ) mm  = (  4.72 x 5.98  ) in
-		'2L'                     => array(  360.000,   504.567), // = (  127 x 178  ) mm  = (  5.00 x 7.01  ) in
-		'5R'                     => array(  360.000,   504.567), // = (  127 x 178  ) mm  = (  5.00 x 7.01  ) in
-		'8P'                     => array(  430.866,   575.433), // = (  152 x 203  ) mm  = (  5.98 x 7.99  ) in
-		'6R'                     => array(  430.866,   575.433), // = (  152 x 203  ) mm  = (  5.98 x 7.99  ) in
-		'6P'                     => array(  575.433,   720.000), // = (  203 x 254  ) mm  = (  7.99 x 10.00 ) in
-		'8R'                     => array(  575.433,   720.000), // = (  203 x 254  ) mm  = (  7.99 x 10.00 ) in
-		'6PW'                    => array(  575.433,   864.567), // = (  203 x 305  ) mm  = (  7.99 x 12.01 ) in
-		'S8R'                    => array(  575.433,   864.567), // = (  203 x 305  ) mm  = (  7.99 x 12.01 ) in
-		'4P'                     => array(  720.000,   864.567), // = (  254 x 305  ) mm  = ( 10.00 x 12.01 ) in
-		'10R'                    => array(  720.000,   864.567), // = (  254 x 305  ) mm  = ( 10.00 x 12.01 ) in
-		'4PW'                    => array(  720.000,  1080.000), // = (  254 x 381  ) mm  = ( 10.00 x 15.00 ) in
-		'S10R'                   => array(  720.000,  1080.000), // = (  254 x 381  ) mm  = ( 10.00 x 15.00 ) in
-		'11R'                    => array(  790.866,  1009.134), // = (  279 x 356  ) mm  = ( 10.98 x 14.02 ) in
-		'S11R'                   => array(  790.866,  1224.567), // = (  279 x 432  ) mm  = ( 10.98 x 17.01 ) in
-		'12R'                    => array(  864.567,  1080.000), // = (  305 x 381  ) mm  = ( 12.01 x 15.00 ) in
-		'S12R'                   => array(  864.567,  1292.598), // = (  305 x 456  ) mm  = ( 12.01 x 17.95 ) in
-		// Common Newspaper Sizes
-		'NEWSPAPER_BROADSHEET'   => array( 2125.984,  1700.787), // = (  750 x 600  ) mm  = ( 29.53 x 23.62 ) in
-		'NEWSPAPER_BERLINER'     => array( 1332.283,   892.913), // = (  470 x 315  ) mm  = ( 18.50 x 12.40 ) in
-		'NEWSPAPER_TABLOID'      => array( 1218.898,   793.701), // = (  430 x 280  ) mm  = ( 16.93 x 11.02 ) in
-		'NEWSPAPER_COMPACT'      => array( 1218.898,   793.701), // = (  430 x 280  ) mm  = ( 16.93 x 11.02 ) in
-		// Business Cards
-		'CREDIT_CARD'            => array(  153.014,   242.646), // = (   54 x 86   ) mm  = (  2.13 x 3.37  ) in
-		'BUSINESS_CARD'          => array(  153.014,   242.646), // = (   54 x 86   ) mm  = (  2.13 x 3.37  ) in
-		'BUSINESS_CARD_ISO7810'  => array(  153.014,   242.646), // = (   54 x 86   ) mm  = (  2.13 x 3.37  ) in
-		'BUSINESS_CARD_ISO216'   => array(  147.402,   209.764), // = (   52 x 74   ) mm  = (  2.05 x 2.91  ) in
-		'BUSINESS_CARD_IT'       => array(  155.906,   240.945), // = (   55 x 85   ) mm  = (  2.17 x 3.35  ) in
-		'BUSINESS_CARD_UK'       => array(  155.906,   240.945), // = (   55 x 85   ) mm  = (  2.17 x 3.35  ) in
-		'BUSINESS_CARD_FR'       => array(  155.906,   240.945), // = (   55 x 85   ) mm  = (  2.17 x 3.35  ) in
-		'BUSINESS_CARD_DE'       => array(  155.906,   240.945), // = (   55 x 85   ) mm  = (  2.17 x 3.35  ) in
-		'BUSINESS_CARD_ES'       => array(  155.906,   240.945), // = (   55 x 85   ) mm  = (  2.17 x 3.35  ) in
-		'BUSINESS_CARD_CA'       => array(  144.567,   252.283), // = (   51 x 89   ) mm  = (  2.01 x 3.50  ) in
-		'BUSINESS_CARD_US'       => array(  144.567,   252.283), // = (   51 x 89   ) mm  = (  2.01 x 3.50  ) in
-		'BUSINESS_CARD_JP'       => array(  155.906,   257.953), // = (   55 x 91   ) mm  = (  2.17 x 3.58  ) in
-		'BUSINESS_CARD_HK'       => array(  153.071,   255.118), // = (   54 x 90   ) mm  = (  2.13 x 3.54  ) in
-		'BUSINESS_CARD_AU'       => array(  155.906,   255.118), // = (   55 x 90   ) mm  = (  2.17 x 3.54  ) in
-		'BUSINESS_CARD_DK'       => array(  155.906,   255.118), // = (   55 x 90   ) mm  = (  2.17 x 3.54  ) in
-		'BUSINESS_CARD_SE'       => array(  155.906,   255.118), // = (   55 x 90   ) mm  = (  2.17 x 3.54  ) in
-		'BUSINESS_CARD_RU'       => array(  141.732,   255.118), // = (   50 x 90   ) mm  = (  1.97 x 3.54  ) in
-		'BUSINESS_CARD_CZ'       => array(  141.732,   255.118), // = (   50 x 90   ) mm  = (  1.97 x 3.54  ) in
-		'BUSINESS_CARD_FI'       => array(  141.732,   255.118), // = (   50 x 90   ) mm  = (  1.97 x 3.54  ) in
-		'BUSINESS_CARD_HU'       => array(  141.732,   255.118), // = (   50 x 90   ) mm  = (  1.97 x 3.54  ) in
-		'BUSINESS_CARD_IL'       => array(  141.732,   255.118), // = (   50 x 90   ) mm  = (  1.97 x 3.54  ) in
-		// Billboards
-		'4SHEET'                 => array( 2880.000,  4320.000), // = ( 1016 x 1524 ) mm  = ( 40.00 x 60.00 ) in
-		'6SHEET'                 => array( 3401.575,  5102.362), // = ( 1200 x 1800 ) mm  = ( 47.24 x 70.87 ) in
-		'12SHEET'                => array( 8640.000,  4320.000), // = ( 3048 x 1524 ) mm  = (120.00 x 60.00 ) in
-		'16SHEET'                => array( 5760.000,  8640.000), // = ( 2032 x 3048 ) mm  = ( 80.00 x 120.00) in
-		'32SHEET'                => array(11520.000,  8640.000), // = ( 4064 x 3048 ) mm  = (160.00 x 120.00) in
-		'48SHEET'                => array(17280.000,  8640.000), // = ( 6096 x 3048 ) mm  = (240.00 x 120.00) in
-		'64SHEET'                => array(23040.000,  8640.000), // = ( 8128 x 3048 ) mm  = (320.00 x 120.00) in
-		'96SHEET'                => array(34560.000,  8640.000), // = (12192 x 3048 ) mm  = (480.00 x 120.00) in
-		// -- Old European Sizes
-		// - Old Imperial English Sizes
-		'EN_EMPEROR'             => array( 3456.000,  5184.000), // = ( 1219 x 1829 ) mm  = ( 48.00 x 72.00 ) in
-		'EN_ANTIQUARIAN'         => array( 2232.000,  3816.000), // = (  787 x 1346 ) mm  = ( 31.00 x 53.00 ) in
-		'EN_GRAND_EAGLE'         => array( 2070.000,  3024.000), // = (  730 x 1067 ) mm  = ( 28.75 x 42.00 ) in
-		'EN_DOUBLE_ELEPHANT'     => array( 1926.000,  2880.000), // = (  679 x 1016 ) mm  = ( 26.75 x 40.00 ) in
-		'EN_ATLAS'               => array( 1872.000,  2448.000), // = (  660 x 864  ) mm  = ( 26.00 x 34.00 ) in
-		'EN_COLOMBIER'           => array( 1692.000,  2484.000), // = (  597 x 876  ) mm  = ( 23.50 x 34.50 ) in
-		'EN_ELEPHANT'            => array( 1656.000,  2016.000), // = (  584 x 711  ) mm  = ( 23.00 x 28.00 ) in
-		'EN_DOUBLE_DEMY'         => array( 1620.000,  2556.000), // = (  572 x 902  ) mm  = ( 22.50 x 35.50 ) in
-		'EN_IMPERIAL'            => array( 1584.000,  2160.000), // = (  559 x 762  ) mm  = ( 22.00 x 30.00 ) in
-		'EN_PRINCESS'            => array( 1548.000,  2016.000), // = (  546 x 711  ) mm  = ( 21.50 x 28.00 ) in
-		'EN_CARTRIDGE'           => array( 1512.000,  1872.000), // = (  533 x 660  ) mm  = ( 21.00 x 26.00 ) in
-		'EN_DOUBLE_LARGE_POST'   => array( 1512.000,  2376.000), // = (  533 x 838  ) mm  = ( 21.00 x 33.00 ) in
-		'EN_ROYAL'               => array( 1440.000,  1800.000), // = (  508 x 635  ) mm  = ( 20.00 x 25.00 ) in
-		'EN_SHEET'               => array( 1404.000,  1692.000), // = (  495 x 597  ) mm  = ( 19.50 x 23.50 ) in
-		'EN_HALF_POST'           => array( 1404.000,  1692.000), // = (  495 x 597  ) mm  = ( 19.50 x 23.50 ) in
-		'EN_SUPER_ROYAL'         => array( 1368.000,  1944.000), // = (  483 x 686  ) mm  = ( 19.00 x 27.00 ) in
-		'EN_DOUBLE_POST'         => array( 1368.000,  2196.000), // = (  483 x 775  ) mm  = ( 19.00 x 30.50 ) in
-		'EN_MEDIUM'              => array( 1260.000,  1656.000), // = (  445 x 584  ) mm  = ( 17.50 x 23.00 ) in
-		'EN_DEMY'                => array( 1260.000,  1620.000), // = (  445 x 572  ) mm  = ( 17.50 x 22.50 ) in
-		'EN_LARGE_POST'          => array( 1188.000,  1512.000), // = (  419 x 533  ) mm  = ( 16.50 x 21.00 ) in
-		'EN_COPY_DRAUGHT'        => array( 1152.000,  1440.000), // = (  406 x 508  ) mm  = ( 16.00 x 20.00 ) in
-		'EN_POST'                => array( 1116.000,  1386.000), // = (  394 x 489  ) mm  = ( 15.50 x 19.25 ) in
-		'EN_CROWN'               => array( 1080.000,  1440.000), // = (  381 x 508  ) mm  = ( 15.00 x 20.00 ) in
-		'EN_PINCHED_POST'        => array( 1062.000,  1332.000), // = (  375 x 470  ) mm  = ( 14.75 x 18.50 ) in
-		'EN_BRIEF'               => array(  972.000,  1152.000), // = (  343 x 406  ) mm  = ( 13.50 x 16.00 ) in
-		'EN_FOOLSCAP'            => array(  972.000,  1224.000), // = (  343 x 432  ) mm  = ( 13.50 x 17.00 ) in
-		'EN_SMALL_FOOLSCAP'      => array(  954.000,  1188.000), // = (  337 x 419  ) mm  = ( 13.25 x 16.50 ) in
-		'EN_POTT'                => array(  900.000,  1080.000), // = (  318 x 381  ) mm  = ( 12.50 x 15.00 ) in
-		// - Old Imperial Belgian Sizes
-		'BE_GRAND_AIGLE'         => array( 1984.252,  2948.031), // = (  700 x 1040 ) mm  = ( 27.56 x 40.94 ) in
-		'BE_COLOMBIER'           => array( 1757.480,  2409.449), // = (  620 x 850  ) mm  = ( 24.41 x 33.46 ) in
-		'BE_DOUBLE_CARRE'        => array( 1757.480,  2607.874), // = (  620 x 920  ) mm  = ( 24.41 x 36.22 ) in
-		'BE_ELEPHANT'            => array( 1746.142,  2182.677), // = (  616 x 770  ) mm  = ( 24.25 x 30.31 ) in
-		'BE_PETIT_AIGLE'         => array( 1700.787,  2381.102), // = (  600 x 840  ) mm  = ( 23.62 x 33.07 ) in
-		'BE_GRAND_JESUS'         => array( 1559.055,  2069.291), // = (  550 x 730  ) mm  = ( 21.65 x 28.74 ) in
-		'BE_JESUS'               => array( 1530.709,  2069.291), // = (  540 x 730  ) mm  = ( 21.26 x 28.74 ) in
-		'BE_RAISIN'              => array( 1417.323,  1842.520), // = (  500 x 650  ) mm  = ( 19.69 x 25.59 ) in
-		'BE_GRAND_MEDIAN'        => array( 1303.937,  1714.961), // = (  460 x 605  ) mm  = ( 18.11 x 23.82 ) in
-		'BE_DOUBLE_POSTE'        => array( 1233.071,  1601.575), // = (  435 x 565  ) mm  = ( 17.13 x 22.24 ) in
-		'BE_COQUILLE'            => array( 1218.898,  1587.402), // = (  430 x 560  ) mm  = ( 16.93 x 22.05 ) in
-		'BE_PETIT_MEDIAN'        => array( 1176.378,  1502.362), // = (  415 x 530  ) mm  = ( 16.34 x 20.87 ) in
-		'BE_RUCHE'               => array( 1020.472,  1303.937), // = (  360 x 460  ) mm  = ( 14.17 x 18.11 ) in
-		'BE_PROPATRIA'           => array(  977.953,  1218.898), // = (  345 x 430  ) mm  = ( 13.58 x 16.93 ) in
-		'BE_LYS'                 => array(  898.583,  1125.354), // = (  317 x 397  ) mm  = ( 12.48 x 15.63 ) in
-		'BE_POT'                 => array(  870.236,  1088.504), // = (  307 x 384  ) mm  = ( 12.09 x 15.12 ) in
-		'BE_ROSETTE'             => array(  765.354,   983.622), // = (  270 x 347  ) mm  = ( 10.63 x 13.66 ) in
-		// - Old Imperial French Sizes
-		'FR_UNIVERS'             => array( 2834.646,  3685.039), // = ( 1000 x 1300 ) mm  = ( 39.37 x 51.18 ) in
-		'FR_DOUBLE_COLOMBIER'    => array( 2551.181,  3571.654), // = (  900 x 1260 ) mm  = ( 35.43 x 49.61 ) in
-		'FR_GRANDE_MONDE'        => array( 2551.181,  3571.654), // = (  900 x 1260 ) mm  = ( 35.43 x 49.61 ) in
-		'FR_DOUBLE_SOLEIL'       => array( 2267.717,  3401.575), // = (  800 x 1200 ) mm  = ( 31.50 x 47.24 ) in
-		'FR_DOUBLE_JESUS'        => array( 2154.331,  3174.803), // = (  760 x 1120 ) mm  = ( 29.92 x 44.09 ) in
-		'FR_GRAND_AIGLE'         => array( 2125.984,  3004.724), // = (  750 x 1060 ) mm  = ( 29.53 x 41.73 ) in
-		'FR_PETIT_AIGLE'         => array( 1984.252,  2664.567), // = (  700 x 940  ) mm  = ( 27.56 x 37.01 ) in
-		'FR_DOUBLE_RAISIN'       => array( 1842.520,  2834.646), // = (  650 x 1000 ) mm  = ( 25.59 x 39.37 ) in
-		'FR_JOURNAL'             => array( 1842.520,  2664.567), // = (  650 x 940  ) mm  = ( 25.59 x 37.01 ) in
-		'FR_COLOMBIER_AFFICHE'   => array( 1785.827,  2551.181), // = (  630 x 900  ) mm  = ( 24.80 x 35.43 ) in
-		'FR_DOUBLE_CAVALIER'     => array( 1757.480,  2607.874), // = (  620 x 920  ) mm  = ( 24.41 x 36.22 ) in
-		'FR_CLOCHE'              => array( 1700.787,  2267.717), // = (  600 x 800  ) mm  = ( 23.62 x 31.50 ) in
-		'FR_SOLEIL'              => array( 1700.787,  2267.717), // = (  600 x 800  ) mm  = ( 23.62 x 31.50 ) in
-		'FR_DOUBLE_CARRE'        => array( 1587.402,  2551.181), // = (  560 x 900  ) mm  = ( 22.05 x 35.43 ) in
-		'FR_DOUBLE_COQUILLE'     => array( 1587.402,  2494.488), // = (  560 x 880  ) mm  = ( 22.05 x 34.65 ) in
-		'FR_JESUS'               => array( 1587.402,  2154.331), // = (  560 x 760  ) mm  = ( 22.05 x 29.92 ) in
-		'FR_RAISIN'              => array( 1417.323,  1842.520), // = (  500 x 650  ) mm  = ( 19.69 x 25.59 ) in
-		'FR_CAVALIER'            => array( 1303.937,  1757.480), // = (  460 x 620  ) mm  = ( 18.11 x 24.41 ) in
-		'FR_DOUBLE_COURONNE'     => array( 1303.937,  2040.945), // = (  460 x 720  ) mm  = ( 18.11 x 28.35 ) in
-		'FR_CARRE'               => array( 1275.591,  1587.402), // = (  450 x 560  ) mm  = ( 17.72 x 22.05 ) in
-		'FR_COQUILLE'            => array( 1247.244,  1587.402), // = (  440 x 560  ) mm  = ( 17.32 x 22.05 ) in
-		'FR_DOUBLE_TELLIERE'     => array( 1247.244,  1927.559), // = (  440 x 680  ) mm  = ( 17.32 x 26.77 ) in
-		'FR_DOUBLE_CLOCHE'       => array( 1133.858,  1700.787), // = (  400 x 600  ) mm  = ( 15.75 x 23.62 ) in
-		'FR_DOUBLE_POT'          => array( 1133.858,  1757.480), // = (  400 x 620  ) mm  = ( 15.75 x 24.41 ) in
-		'FR_ECU'                 => array( 1133.858,  1474.016), // = (  400 x 520  ) mm  = ( 15.75 x 20.47 ) in
-		'FR_COURONNE'            => array( 1020.472,  1303.937), // = (  360 x 460  ) mm  = ( 14.17 x 18.11 ) in
-		'FR_TELLIERE'            => array(  963.780,  1247.244), // = (  340 x 440  ) mm  = ( 13.39 x 17.32 ) in
-		'FR_POT'                 => array(  878.740,  1133.858), // = (  310 x 400  ) mm  = ( 12.20 x 15.75 ) in
-	);
-
-
-	/**
-	 * Get page dimensions from format name.
-	 * @param $format (mixed) The format name @see self::$page_format<ul>
-	 * @return array containing page width and height in points
-	 * @since 5.0.010 (2010-05-17)
-	 * @public static
-	 */
-	public static function getPageSizeFromFormat($format) {
-		if (isset(self::$page_formats[$format])) {
-			return self::$page_formats[$format];
-		}
-		return self::$page_formats['A4'];
-	}
-
-	/**
-	 * Set page boundaries.
-	 * @param $page (int) page number
-	 * @param $type (string) valid values are: <ul><li>'MediaBox' : the boundaries of the physical medium on which the page shall be displayed or printed;</li><li>'CropBox' : the visible region of default user space;</li><li>'BleedBox' : the region to which the contents of the page shall be clipped when output in a production environment;</li><li>'TrimBox' : the intended dimensions of the finished page after trimming;</li><li>'ArtBox' : the page's meaningful content (including potential white space).</li></ul>
-	 * @param $llx (float) lower-left x coordinate in user units.
-	 * @param $lly (float) lower-left y coordinate in user units.
-	 * @param $urx (float) upper-right x coordinate in user units.
-	 * @param $ury (float) upper-right y coordinate in user units.
-	 * @param $points (boolean) If true uses user units as unit of measure, otherwise uses PDF points.
-	 * @param $k (float) Scale factor (number of points in user unit).
-	 * @param $pagedim (array) Array of page dimensions.
-	 * @return pagedim array of page dimensions.
-	 * @since 5.0.010 (2010-05-17)
-	 * @public static
-	 */
-	public static function setPageBoxes($page, $type, $llx, $lly, $urx, $ury, $points=false, $k, $pagedim=array()) {
-		if (!isset($pagedim[$page])) {
-			// initialize array
-			$pagedim[$page] = array();
-		}
-		if (!in_array($type, self::$pageboxes)) {
-			return;
-		}
-		if ($points) {
-			$k = 1;
-		}
-		$pagedim[$page][$type]['llx'] = ($llx * $k);
-		$pagedim[$page][$type]['lly'] = ($lly * $k);
-		$pagedim[$page][$type]['urx'] = ($urx * $k);
-		$pagedim[$page][$type]['ury'] = ($ury * $k);
-		return $pagedim;
-	}
-
-	/**
-	 * Swap X and Y coordinates of page boxes (change page boxes orientation).
-	 * @param $page (int) page number
-	 * @param $pagedim (array) Array of page dimensions.
-	 * @return pagedim array of page dimensions.
-	 * @since 5.0.010 (2010-05-17)
-	 * @public static
-	 */
-	public static function swapPageBoxCoordinates($page, $pagedim) {
-		foreach (self::$pageboxes as $type) {
-			// swap X and Y coordinates
-			if (isset($pagedim[$page][$type])) {
-				$tmp = $pagedim[$page][$type]['llx'];
-				$pagedim[$page][$type]['llx'] = $pagedim[$page][$type]['lly'];
-				$pagedim[$page][$type]['lly'] = $tmp;
-				$tmp = $pagedim[$page][$type]['urx'];
-				$pagedim[$page][$type]['urx'] = $pagedim[$page][$type]['ury'];
-				$pagedim[$page][$type]['ury'] = $tmp;
-			}
-		}
-		return $pagedim;
-	}
-
-	/**
-	 * Get the canonical page layout mode.
-	 * @param $layout (string) The page layout. Possible values are:<ul><li>SinglePage Display one page at a time</li><li>OneColumn Display the pages in one column</li><li>TwoColumnLeft Display the pages in two columns, with odd-numbered pages on the left</li><li>TwoColumnRight Display the pages in two columns, with odd-numbered pages on the right</li><li>TwoPageLeft (PDF 1.5) Display the pages two at a time, with odd-numbered pages on the left</li><li>TwoPageRight (PDF 1.5) Display the pages two at a time, with odd-numbered pages on the right</li></ul>
-	 * @return (string) Canonical page layout name.
-	 * @public static
-	 */
-	public static function getPageLayoutMode($layout='SinglePage') {
-		switch ($layout) {
-			case 'default':
-			case 'single':
-			case 'SinglePage': {
-				$layout_mode = 'SinglePage';
-				break;
-			}
-			case 'continuous':
-			case 'OneColumn': {
-				$layout_mode = 'OneColumn';
-				break;
-			}
-			case 'two':
-			case 'TwoColumnLeft': {
-				$layout_mode = 'TwoColumnLeft';
-				break;
-			}
-			case 'TwoColumnRight': {
-				$layout_mode = 'TwoColumnRight';
-				break;
-			}
-			case 'TwoPageLeft': {
-				$layout_mode = 'TwoPageLeft';
-				break;
-			}
-			case 'TwoPageRight': {
-				$layout_mode = 'TwoPageRight';
-				break;
-			}
-			default: {
-				$layout_mode = 'SinglePage';
-			}
-		}
-		return $layout_mode;
-	}
-
-	/**
-	 * Get the canonical page layout mode.
-	 * @param $mode (string) A name object specifying how the document should be displayed when opened:<ul><li>UseNone Neither document outline nor thumbnail images visible</li><li>UseOutlines Document outline visible</li><li>UseThumbs Thumbnail images visible</li><li>FullScreen Full-screen mode, with no menu bar, window controls, or any other window visible</li><li>UseOC (PDF 1.5) Optional content group panel visible</li><li>UseAttachments (PDF 1.6) Attachments panel visible</li></ul>
-	 * @return (string) Canonical page mode name.
-	 * @public static
-	 */
-	public static function getPageMode($mode='UseNone') {
-		switch ($mode) {
-			case 'UseNone': {
-				$page_mode = 'UseNone';
-				break;
-			}
-			case 'UseOutlines': {
-				$page_mode = 'UseOutlines';
-				break;
-			}
-			case 'UseThumbs': {
-				$page_mode = 'UseThumbs';
-				break;
-			}
-			case 'FullScreen': {
-				$page_mode = 'FullScreen';
-				break;
-			}
-			case 'UseOC': {
-				$page_mode = 'UseOC';
-				break;
-			}
-			case '': {
-				$page_mode = 'UseAttachments';
-				break;
-			}
-			default: {
-				$page_mode = 'UseNone';
-			}
-		}
-		return $page_mode;
-	}
-
-
-} // END OF TCPDF_STATIC CLASS
-
-//============================================================+
-// END OF FILE
-//============================================================+
diff --git a/#pma/libraries/tcpdf/tcpdf.php b/#pma/libraries/tcpdf/tcpdf.php
deleted file mode 100644
index 599a3f8b..00000000
--- a/#pma/libraries/tcpdf/tcpdf.php
+++ /dev/null
@@ -1,24479 +0,0 @@
-<?php
-//============================================================+
-// File name   : tcpdf.php
-// Version     : 6.2.12
-// Begin       : 2002-08-03
-// Last Update : 2015-06-18
-// Author      : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
-// License     : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
-// -------------------------------------------------------------------
-// Copyright (C) 2002-2015 Nicola Asuni - Tecnick.com LTD
-//
-// This file is part of TCPDF software library.
-//
-// TCPDF is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// TCPDF is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-// See the GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the License
-// along with TCPDF. If not, see
-// <http://www.tecnick.com/pagefiles/tcpdf/LICENSE.TXT>.
-//
-// See LICENSE.TXT file for more information.
-// -------------------------------------------------------------------
-//
-// Description :
-//   This is a PHP class for generating PDF documents without requiring external extensions.
-//
-// NOTE:
-//   This class was originally derived in 2002 from the Public
-//   Domain FPDF class by Olivier Plathey (http://www.fpdf.org),
-//   but now is almost entirely rewritten and contains thousands of
-//   new lines of code and hundreds new features.
-//
-// Main features:
-//  * no external libraries are required for the basic functions;
-//  * all standard page formats, custom page formats, custom margins and units of measure;
-//  * UTF-8 Unicode and Right-To-Left languages;
-//  * TrueTypeUnicode, TrueType, Type1 and CID-0 fonts;
-//  * font subsetting;
-//  * methods to publish some XHTML + CSS code, Javascript and Forms;
-//  * images, graphic (geometric figures) and transformation methods;
-//  * supports JPEG, PNG and SVG images natively, all images supported by GD (GD, GD2, GD2PART, GIF, JPEG, PNG, BMP, XBM, XPM) and all images supported via ImagMagick (http://www.imagemagick.org/www/formats.html)
-//  * 1D and 2D barcodes: CODE 39, ANSI MH10.8M-1983, USD-3, 3 of 9, CODE 93, USS-93, Standard 2 of 5, Interleaved 2 of 5, CODE 128 A/B/C, 2 and 5 Digits UPC-Based Extension, EAN 8, EAN 13, UPC-A, UPC-E, MSI, POSTNET, PLANET, RMS4CC (Royal Mail 4-state Customer Code), CBC (Customer Bar Code), KIX (Klant index - Customer index), Intelligent Mail Barcode, Onecode, USPS-B-3200, CODABAR, CODE 11, PHARMACODE, PHARMACODE TWO-TRACKS, Datamatrix, QR-Code, PDF417;
-//  * JPEG and PNG ICC profiles, Grayscale, RGB, CMYK, Spot Colors and Transparencies;
-//  * automatic page header and footer management;
-//  * document encryption up to 256 bit and digital signature certifications;
-//  * transactions to UNDO commands;
-//  * PDF annotations, including links, text and file attachments;
-//  * text rendering modes (fill, stroke and clipping);
-//  * multiple columns mode;
-//  * no-write page regions;
-//  * bookmarks, named destinations and table of content;
-//  * text hyphenation;
-//  * text stretching and spacing (tracking);
-//  * automatic page break, line break and text alignments including justification;
-//  * automatic page numbering and page groups;
-//  * move and delete pages;
-//  * page compression (requires php-zlib extension);
-//  * XOBject Templates;
-//  * Layers and object visibility.
-//	* PDF/A-1b support
-//============================================================+
-
-/**
- * @file
- * This is a PHP class for generating PDF documents without requiring external extensions.<br>
- * TCPDF project (http://www.tcpdf.org) was originally derived in 2002 from the Public Domain FPDF class by Olivier Plathey (http://www.fpdf.org), but now is almost entirely rewritten.<br>
- * <h3>TCPDF main features are:</h3>
- * <ul>
- * <li>no external libraries are required for the basic functions;</li>
- * <li>all standard page formats, custom page formats, custom margins and units of measure;</li>
- * <li>UTF-8 Unicode and Right-To-Left languages;</li>
- * <li>TrueTypeUnicode, TrueType, Type1 and CID-0 fonts;</li>
- * <li>font subsetting;</li>
- * <li>methods to publish some XHTML + CSS code, Javascript and Forms;</li>
- * <li>images, graphic (geometric figures) and transformation methods;
- * <li>supports JPEG, PNG and SVG images natively, all images supported by GD (GD, GD2, GD2PART, GIF, JPEG, PNG, BMP, XBM, XPM) and all images supported via ImagMagick (http://www.imagemagick.org/www/formats.html)</li>
- * <li>1D and 2D barcodes: CODE 39, ANSI MH10.8M-1983, USD-3, 3 of 9, CODE 93, USS-93, Standard 2 of 5, Interleaved 2 of 5, CODE 128 A/B/C, 2 and 5 Digits UPC-Based Extension, EAN 8, EAN 13, UPC-A, UPC-E, MSI, POSTNET, PLANET, RMS4CC (Royal Mail 4-state Customer Code), CBC (Customer Bar Code), KIX (Klant index - Customer index), Intelligent Mail Barcode, Onecode, USPS-B-3200, CODABAR, CODE 11, PHARMACODE, PHARMACODE TWO-TRACKS, Datamatrix, QR-Code, PDF417;</li>
- * <li>JPEG and PNG ICC profiles, Grayscale, RGB, CMYK, Spot Colors and Transparencies;</li>
- * <li>automatic page header and footer management;</li>
- * <li>document encryption up to 256 bit and digital signature certifications;</li>
- * <li>transactions to UNDO commands;</li>
- * <li>PDF annotations, including links, text and file attachments;</li>
- * <li>text rendering modes (fill, stroke and clipping);</li>
- * <li>multiple columns mode;</li>
- * <li>no-write page regions;</li>
- * <li>bookmarks, named destinations and table of content;</li>
- * <li>text hyphenation;</li>
- * <li>text stretching and spacing (tracking);</li>
- * <li>automatic page break, line break and text alignments including justification;</li>
- * <li>automatic page numbering and page groups;</li>
- * <li>move and delete pages;</li>
- * <li>page compression (requires php-zlib extension);</li>
- * <li>XOBject Templates;</li>
- * <li>Layers and object visibility;</li>
- * <li>PDF/A-1b support.</li>
- * </ul>
- * Tools to encode your unicode fonts are on fonts/utils directory.</p>
- * @package com.tecnick.tcpdf
- * @author Nicola Asuni
- * @version 6.2.8
- */
-
-// TCPDF configuration
-require_once(dirname(__FILE__).'/tcpdf_autoconfig.php');
-// TCPDF static font methods and data
-require_once(dirname(__FILE__).'/include/tcpdf_font_data.php');
-// TCPDF static font methods and data
-require_once(dirname(__FILE__).'/include/tcpdf_fonts.php');
-// TCPDF static color methods and data
-require_once(dirname(__FILE__).'/include/tcpdf_colors.php');
-// TCPDF static image methods and data
-require_once(dirname(__FILE__).'/include/tcpdf_images.php');
-// TCPDF static methods and data
-require_once(dirname(__FILE__).'/include/tcpdf_static.php');
-
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-/**
- * @class TCPDF
- * PHP class for generating PDF documents without requiring external extensions.
- * TCPDF project (http://www.tcpdf.org) has been originally derived in 2002 from the Public Domain FPDF class by Olivier Plathey (http://www.fpdf.org), but now is almost entirely rewritten.<br>
- * @package com.tecnick.tcpdf
- * @brief PHP class for generating PDF documents without requiring external extensions.
- * @version 6.2.8
- * @author Nicola Asuni - info@tecnick.com
- */
-class TCPDF {
-
-	// Protected properties
-
-	/**
-	 * Current page number.
-	 * @protected
-	 */
-	protected $page;
-
-	/**
-	 * Current object number.
-	 * @protected
-	 */
-	protected $n;
-
-	/**
-	 * Array of object offsets.
-	 * @protected
-	 */
-	protected $offsets = array();
-
-	/**
-	 * Array of object IDs for each page.
-	 * @protected
-	 */
-	protected $pageobjects = array();
-
-	/**
-	 * Buffer holding in-memory PDF.
-	 * @protected
-	 */
-	protected $buffer;
-
-	/**
-	 * Array containing pages.
-	 * @protected
-	 */
-	protected $pages = array();
-
-	/**
-	 * Current document state.
-	 * @protected
-	 */
-	protected $state;
-
-	/**
-	 * Compression flag.
-	 * @protected
-	 */
-	protected $compress;
-
-	/**
-	 * Current page orientation (P = Portrait, L = Landscape).
-	 * @protected
-	 */
-	protected $CurOrientation;
-
-	/**
-	 * Page dimensions.
-	 * @protected
-	 */
-	protected $pagedim = array();
-
-	/**
-	 * Scale factor (number of points in user unit).
-	 * @protected
-	 */
-	protected $k;
-
-	/**
-	 * Width of page format in points.
-	 * @protected
-	 */
-	protected $fwPt;
-
-	/**
-	 * Height of page format in points.
-	 * @protected
-	 */
-	protected $fhPt;
-
-	/**
-	 * Current width of page in points.
-	 * @protected
-	 */
-	protected $wPt;
-
-	/**
-	 * Current height of page in points.
-	 * @protected
-	 */
-	protected $hPt;
-
-	/**
-	 * Current width of page in user unit.
-	 * @protected
-	 */
-	protected $w;
-
-	/**
-	 * Current height of page in user unit.
-	 * @protected
-	 */
-	protected $h;
-
-	/**
-	 * Left margin.
-	 * @protected
-	 */
-	protected $lMargin;
-
-	/**
-	 * Right margin.
-	 * @protected
-	 */
-	protected $rMargin;
-
-	/**
-	 * Cell left margin (used by regions).
-	 * @protected
-	 */
-	protected $clMargin;
-
-	/**
-	 * Cell right margin (used by regions).
-	 * @protected
-	 */
-	protected $crMargin;
-
-	/**
-	 * Top margin.
-	 * @protected
-	 */
-	protected $tMargin;
-
-	/**
-	 * Page break margin.
-	 * @protected
-	 */
-	protected $bMargin;
-
-	/**
-	 * Array of cell internal paddings ('T' => top, 'R' => right, 'B' => bottom, 'L' => left).
-	 * @since 5.9.000 (2010-10-03)
-	 * @protected
-	 */
-	protected $cell_padding = array('T' => 0, 'R' => 0, 'B' => 0, 'L' => 0);
-
-	/**
-	 * Array of cell margins ('T' => top, 'R' => right, 'B' => bottom, 'L' => left).
-	 * @since 5.9.000 (2010-10-04)
-	 * @protected
-	 */
-	protected $cell_margin = array('T' => 0, 'R' => 0, 'B' => 0, 'L' => 0);
-
-	/**
-	 * Current horizontal position in user unit for cell positioning.
-	 * @protected
-	 */
-	protected $x;
-
-	/**
-	 * Current vertical position in user unit for cell positioning.
-	 * @protected
-	 */
-	protected $y;
-
-	/**
-	 * Height of last cell printed.
-	 * @protected
-	 */
-	protected $lasth;
-
-	/**
-	 * Line width in user unit.
-	 * @protected
-	 */
-	protected $LineWidth;
-
-	/**
-	 * Array of standard font names.
-	 * @protected
-	 */
-	protected $CoreFonts;
-
-	/**
-	 * Array of used fonts.
-	 * @protected
-	 */
-	protected $fonts = array();
-
-	/**
-	 * Array of font files.
-	 * @protected
-	 */
-	protected $FontFiles = array();
-
-	/**
-	 * Array of encoding differences.
-	 * @protected
-	 */
-	protected $diffs = array();
-
-	/**
-	 * Array of used images.
-	 * @protected
-	 */
-	protected $images = array();
-
-	/**
-	 * Depth of the svg tag, to keep track if the svg tag is a subtag or the root tag.
-	 * @protected
-	 */
-	protected $svg_tag_depth = 0;
-
-	/**
-	 * Array of Annotations in pages.
-	 * @protected
-	 */
-	protected $PageAnnots = array();
-
-	/**
-	 * Array of internal links.
-	 * @protected
-	 */
-	protected $links = array();
-
-	/**
-	 * Current font family.
-	 * @protected
-	 */
-	protected $FontFamily;
-
-	/**
-	 * Current font style.
-	 * @protected
-	 */
-	protected $FontStyle;
-
-	/**
-	 * Current font ascent (distance between font top and baseline).
-	 * @protected
-	 * @since 2.8.000 (2007-03-29)
-	 */
-	protected $FontAscent;
-
-	/**
-	 * Current font descent (distance between font bottom and baseline).
-	 * @protected
-	 * @since 2.8.000 (2007-03-29)
-	 */
-	protected $FontDescent;
-
-	/**
-	 * Underlining flag.
-	 * @protected
-	 */
-	protected $underline;
-
-	/**
-	 * Overlining flag.
-	 * @protected
-	 */
-	protected $overline;
-
-	/**
-	 * Current font info.
-	 * @protected
-	 */
-	protected $CurrentFont;
-
-	/**
-	 * Current font size in points.
-	 * @protected
-	 */
-	protected $FontSizePt;
-
-	/**
-	 * Current font size in user unit.
-	 * @protected
-	 */
-	protected $FontSize;
-
-	/**
-	 * Commands for drawing color.
-	 * @protected
-	 */
-	protected $DrawColor;
-
-	/**
-	 * Commands for filling color.
-	 * @protected
-	 */
-	protected $FillColor;
-
-	/**
-	 * Commands for text color.
-	 * @protected
-	 */
-	protected $TextColor;
-
-	/**
-	 * Indicates whether fill and text colors are different.
-	 * @protected
-	 */
-	protected $ColorFlag;
-
-	/**
-	 * Automatic page breaking.
-	 * @protected
-	 */
-	protected $AutoPageBreak;
-
-	/**
-	 * Threshold used to trigger page breaks.
-	 * @protected
-	 */
-	protected $PageBreakTrigger;
-
-	/**
-	 * Flag set when processing page header.
-	 * @protected
-	 */
-	protected $InHeader = false;
-
-	/**
-	 * Flag set when processing page footer.
-	 * @protected
-	 */
-	protected $InFooter = false;
-
-	/**
-	 * Zoom display mode.
-	 * @protected
-	 */
-	protected $ZoomMode;
-
-	/**
-	 * Layout display mode.
-	 * @protected
-	 */
-	protected $LayoutMode;
-
-	/**
-	 * If true set the document information dictionary in Unicode.
-	 * @protected
-	 */
-	protected $docinfounicode = true;
-
-	/**
-	 * Document title.
-	 * @protected
-	 */
-	protected $title = '';
-
-	/**
-	 * Document subject.
-	 * @protected
-	 */
-	protected $subject = '';
-
-	/**
-	 * Document author.
-	 * @protected
-	 */
-	protected $author = '';
-
-	/**
-	 * Document keywords.
-	 * @protected
-	 */
-	protected $keywords = '';
-
-	/**
-	 * Document creator.
-	 * @protected
-	 */
-	protected $creator = '';
-
-	/**
-	 * Starting page number.
-	 * @protected
-	 */
-	protected $starting_page_number = 1;
-
-	/**
-	 * The right-bottom (or left-bottom for RTL) corner X coordinate of last inserted image.
-	 * @since 2002-07-31
-	 * @author Nicola Asuni
-	 * @protected
-	 */
-	protected $img_rb_x;
-
-	/**
-	 * The right-bottom corner Y coordinate of last inserted image.
-	 * @since 2002-07-31
-	 * @author Nicola Asuni
-	 * @protected
-	 */
-	protected $img_rb_y;
-
-	/**
-	 * Adjusting factor to convert pixels to user units.
-	 * @since 2004-06-14
-	 * @author Nicola Asuni
-	 * @protected
-	 */
-	protected $imgscale = 1;
-
-	/**
-	 * Boolean flag set to true when the input text is unicode (require unicode fonts).
-	 * @since 2005-01-02
-	 * @author Nicola Asuni
-	 * @protected
-	 */
-	protected $isunicode = false;
-
-	/**
-	 * PDF version.
-	 * @since 1.5.3
-	 * @protected
-	 */
-	protected $PDFVersion = '1.7';
-
-	/**
-	 * ID of the stored default header template (-1 = not set).
-	 * @protected
-	 */
-	protected $header_xobjid = false;
-
-	/**
-	 * If true reset the Header Xobject template at each page
-	 * @protected
-	 */
-	protected $header_xobj_autoreset = false;
-
-	/**
-	 * Minimum distance between header and top page margin.
-	 * @protected
-	 */
-	protected $header_margin;
-
-	/**
-	 * Minimum distance between footer and bottom page margin.
-	 * @protected
-	 */
-	protected $footer_margin;
-
-	/**
-	 * Original left margin value.
-	 * @protected
-	 * @since 1.53.0.TC013
-	 */
-	protected $original_lMargin;
-
-	/**
-	 * Original right margin value.
-	 * @protected
-	 * @since 1.53.0.TC013
-	 */
-	protected $original_rMargin;
-
-	/**
-	 * Default font used on page header.
-	 * @protected
-	 */
-	protected $header_font;
-
-	/**
-	 * Default font used on page footer.
-	 * @protected
-	 */
-	protected $footer_font;
-
-	/**
-	 * Language templates.
-	 * @protected
-	 */
-	protected $l;
-
-	/**
-	 * Barcode to print on page footer (only if set).
-	 * @protected
-	 */
-	protected $barcode = false;
-
-	/**
-	 * Boolean flag to print/hide page header.
-	 * @protected
-	 */
-	protected $print_header = true;
-
-	/**
-	 * Boolean flag to print/hide page footer.
-	 * @protected
-	 */
-	protected $print_footer = true;
-
-	/**
-	 * Header image logo.
-	 * @protected
-	 */
-	protected $header_logo = '';
-
-	/**
-	 * Width of header image logo in user units.
-	 * @protected
-	 */
-	protected $header_logo_width = 30;
-
-	/**
-	 * Title to be printed on default page header.
-	 * @protected
-	 */
-	protected $header_title = '';
-
-	/**
-	 * String to pring on page header after title.
-	 * @protected
-	 */
-	protected $header_string = '';
-
-	/**
-	 * Color for header text (RGB array).
-	 * @since 5.9.174 (2012-07-25)
-	 * @protected
-	 */
-	protected $header_text_color = array(0,0,0);
-
-	/**
-	 * Color for header line (RGB array).
-	 * @since 5.9.174 (2012-07-25)
-	 * @protected
-	 */
-	protected $header_line_color = array(0,0,0);
-
-	/**
-	 * Color for footer text (RGB array).
-	 * @since 5.9.174 (2012-07-25)
-	 * @protected
-	 */
-	protected $footer_text_color = array(0,0,0);
-
-	/**
-	 * Color for footer line (RGB array).
-	 * @since 5.9.174 (2012-07-25)
-	 * @protected
-	 */
-	protected $footer_line_color = array(0,0,0);
-
-	/**
-	 * Text shadow data array.
-	 * @since 5.9.174 (2012-07-25)
-	 * @protected
-	 */
-	protected $txtshadow = array('enabled'=>false, 'depth_w'=>0, 'depth_h'=>0, 'color'=>false, 'opacity'=>1, 'blend_mode'=>'Normal');
-
-	/**
-	 * Default number of columns for html table.
-	 * @protected
-	 */
-	protected $default_table_columns = 4;
-
-	// variables for html parser
-
-	/**
-	 * HTML PARSER: array to store current link and rendering styles.
-	 * @protected
-	 */
-	protected $HREF = array();
-
-	/**
-	 * List of available fonts on filesystem.
-	 * @protected
-	 */
-	protected $fontlist = array();
-
-	/**
-	 * Current foreground color.
-	 * @protected
-	 */
-	protected $fgcolor;
-
-	/**
-	 * HTML PARSER: array of boolean values, true in case of ordered list (OL), false otherwise.
-	 * @protected
-	 */
-	protected $listordered = array();
-
-	/**
-	 * HTML PARSER: array count list items on nested lists.
-	 * @protected
-	 */
-	protected $listcount = array();
-
-	/**
-	 * HTML PARSER: current list nesting level.
-	 * @protected
-	 */
-	protected $listnum = 0;
-
-	/**
-	 * HTML PARSER: indent amount for lists.
-	 * @protected
-	 */
-	protected $listindent = 0;
-
-	/**
-	 * HTML PARSER: current list indententation level.
-	 * @protected
-	 */
-	protected $listindentlevel = 0;
-
-	/**
-	 * Current background color.
-	 * @protected
-	 */
-	protected $bgcolor;
-
-	/**
-	 * Temporary font size in points.
-	 * @protected
-	 */
-	protected $tempfontsize = 10;
-
-	/**
-	 * Spacer string for LI tags.
-	 * @protected
-	 */
-	protected $lispacer = '';
-
-	/**
-	 * Default encoding.
-	 * @protected
-	 * @since 1.53.0.TC010
-	 */
-	protected $encoding = 'UTF-8';
-
-	/**
-	 * PHP internal encoding.
-	 * @protected
-	 * @since 1.53.0.TC016
-	 */
-	protected $internal_encoding;
-
-	/**
-	 * Boolean flag to indicate if the document language is Right-To-Left.
-	 * @protected
-	 * @since 2.0.000
-	 */
-	protected $rtl = false;
-
-	/**
-	 * Boolean flag used to force RTL or LTR string direction.
-	 * @protected
-	 * @since 2.0.000
-	 */
-	protected $tmprtl = false;
-
-	// --- Variables used for document encryption:
-
-	/**
-	 * IBoolean flag indicating whether document is protected.
-	 * @protected
-	 * @since 2.0.000 (2008-01-02)
-	 */
-	protected $encrypted;
-
-	/**
-	 * Array containing encryption settings.
-	 * @protected
-	 * @since 5.0.005 (2010-05-11)
-	 */
-	protected $encryptdata = array();
-
-	/**
-	 * Last RC4 key encrypted (cached for optimisation).
-	 * @protected
-	 * @since 2.0.000 (2008-01-02)
-	 */
-	protected $last_enc_key;
-
-	/**
-	 * Last RC4 computed key.
-	 * @protected
-	 * @since 2.0.000 (2008-01-02)
-	 */
-	protected $last_enc_key_c;
-
-	/**
-	 * File ID (used on document trailer).
-	 * @protected
-	 * @since 5.0.005 (2010-05-12)
-	 */
-	protected $file_id;
-
-	// --- bookmark ---
-
-	/**
-	 * Outlines for bookmark.
-	 * @protected
-	 * @since 2.1.002 (2008-02-12)
-	 */
-	protected $outlines = array();
-
-	/**
-	 * Outline root for bookmark.
-	 * @protected
-	 * @since 2.1.002 (2008-02-12)
-	 */
-	protected $OutlineRoot;
-
-	// --- javascript and form ---
-
-	/**
-	 * Javascript code.
-	 * @protected
-	 * @since 2.1.002 (2008-02-12)
-	 */
-	protected $javascript = '';
-
-	/**
-	 * Javascript counter.
-	 * @protected
-	 * @since 2.1.002 (2008-02-12)
-	 */
-	protected $n_js;
-
-	/**
-	 * line through state
-	 * @protected
-	 * @since 2.8.000 (2008-03-19)
-	 */
-	protected $linethrough;
-
-	/**
-	 * Array with additional document-wide usage rights for the document.
-	 * @protected
-	 * @since 5.8.014 (2010-08-23)
-	 */
-	protected $ur = array();
-
-	/**
-	 * DPI (Dot Per Inch) Document Resolution (do not change).
-	 * @protected
-	 * @since 3.0.000 (2008-03-27)
-	 */
-	protected $dpi = 72;
-
-	/**
-	 * Array of page numbers were a new page group was started (the page numbers are the keys of the array).
-	 * @protected
-	 * @since 3.0.000 (2008-03-27)
-	 */
-	protected $newpagegroup = array();
-
-	/**
-	 * Array that contains the number of pages in each page group.
-	 * @protected
-	 * @since 3.0.000 (2008-03-27)
-	 */
-	protected $pagegroups = array();
-
-	/**
-	 * Current page group number.
-	 * @protected
-	 * @since 3.0.000 (2008-03-27)
-	 */
-	protected $currpagegroup = 0;
-
-	/**
-	 * Array of transparency objects and parameters.
-	 * @protected
-	 * @since 3.0.000 (2008-03-27)
-	 */
-	protected $extgstates;
-
-	/**
-	 * Set the default JPEG compression quality (1-100).
-	 * @protected
-	 * @since 3.0.000 (2008-03-27)
-	 */
-	protected $jpeg_quality;
-
-	/**
-	 * Default cell height ratio.
-	 * @protected
-	 * @since 3.0.014 (2008-05-23)
-	 */
-	protected $cell_height_ratio = K_CELL_HEIGHT_RATIO;
-
-	/**
-	 * PDF viewer preferences.
-	 * @protected
-	 * @since 3.1.000 (2008-06-09)
-	 */
-	protected $viewer_preferences;
-
-	/**
-	 * A name object specifying how the document should be displayed when opened.
-	 * @protected
-	 * @since 3.1.000 (2008-06-09)
-	 */
-	protected $PageMode;
-
-	/**
-	 * Array for storing gradient information.
-	 * @protected
-	 * @since 3.1.000 (2008-06-09)
-	 */
-	protected $gradients = array();
-
-	/**
-	 * Array used to store positions inside the pages buffer (keys are the page numbers).
-	 * @protected
-	 * @since 3.2.000 (2008-06-26)
-	 */
-	protected $intmrk = array();
-
-	/**
-	 * Array used to store positions inside the pages buffer (keys are the page numbers).
-	 * @protected
-	 * @since 5.7.000 (2010-08-03)
-	 */
-	protected $bordermrk = array();
-
-	/**
-	 * Array used to store page positions to track empty pages (keys are the page numbers).
-	 * @protected
-	 * @since 5.8.007 (2010-08-18)
-	 */
-	protected $emptypagemrk = array();
-
-	/**
-	 * Array used to store content positions inside the pages buffer (keys are the page numbers).
-	 * @protected
-	 * @since 4.6.021 (2009-07-20)
-	 */
-	protected $cntmrk = array();
-
-	/**
-	 * Array used to store footer positions of each page.
-	 * @protected
-	 * @since 3.2.000 (2008-07-01)
-	 */
-	protected $footerpos = array();
-
-	/**
-	 * Array used to store footer length of each page.
-	 * @protected
-	 * @since 4.0.014 (2008-07-29)
-	 */
-	protected $footerlen = array();
-
-	/**
-	 * Boolean flag to indicate if a new line is created.
-	 * @protected
-	 * @since 3.2.000 (2008-07-01)
-	 */
-	protected $newline = true;
-
-	/**
-	 * End position of the latest inserted line.
-	 * @protected
-	 * @since 3.2.000 (2008-07-01)
-	 */
-	protected $endlinex = 0;
-
-	/**
-	 * PDF string for width value of the last line.
-	 * @protected
-	 * @since 4.0.006 (2008-07-16)
-	 */
-	protected $linestyleWidth = '';
-
-	/**
-	 * PDF string for CAP value of the last line.
-	 * @protected
-	 * @since 4.0.006 (2008-07-16)
-	 */
-	protected $linestyleCap = '0 J';
-
-	/**
-	 * PDF string for join value of the last line.
-	 * @protected
-	 * @since 4.0.006 (2008-07-16)
-	 */
-	protected $linestyleJoin = '0 j';
-
-	/**
-	 * PDF string for dash value of the last line.
-	 * @protected
-	 * @since 4.0.006 (2008-07-16)
-	 */
-	protected $linestyleDash = '[] 0 d';
-
-	/**
-	 * Boolean flag to indicate if marked-content sequence is open.
-	 * @protected
-	 * @since 4.0.013 (2008-07-28)
-	 */
-	protected $openMarkedContent = false;
-
-	/**
-	 * Count the latest inserted vertical spaces on HTML.
-	 * @protected
-	 * @since 4.0.021 (2008-08-24)
-	 */
-	protected $htmlvspace = 0;
-
-	/**
-	 * Array of Spot colors.
-	 * @protected
-	 * @since 4.0.024 (2008-09-12)
-	 */
-	protected $spot_colors = array();
-
-	/**
-	 * Symbol used for HTML unordered list items.
-	 * @protected
-	 * @since 4.0.028 (2008-09-26)
-	 */
-	protected $lisymbol = '';
-
-	/**
-	 * String used to mark the beginning and end of EPS image blocks.
-	 * @protected
-	 * @since 4.1.000 (2008-10-18)
-	 */
-	protected $epsmarker = 'x#!#EPS#!#x';
-
-	/**
-	 * Array of transformation matrix.
-	 * @protected
-	 * @since 4.2.000 (2008-10-29)
-	 */
-	protected $transfmatrix = array();
-
-	/**
-	 * Current key for transformation matrix.
-	 * @protected
-	 * @since 4.8.005 (2009-09-17)
-	 */
-	protected $transfmatrix_key = 0;
-
-	/**
-	 * Booklet mode for double-sided pages.
-	 * @protected
-	 * @since 4.2.000 (2008-10-29)
-	 */
-	protected $booklet = false;
-
-	/**
-	 * Epsilon value used for float calculations.
-	 * @protected
-	 * @since 4.2.000 (2008-10-29)
-	 */
-	protected $feps = 0.005;
-
-	/**
-	 * Array used for custom vertical spaces for HTML tags.
-	 * @protected
-	 * @since 4.2.001 (2008-10-30)
-	 */
-	protected $tagvspaces = array();
-
-	/**
-	 * HTML PARSER: custom indent amount for lists. Negative value means disabled.
-	 * @protected
-	 * @since 4.2.007 (2008-11-12)
-	 */
-	protected $customlistindent = -1;
-
-	/**
-	 * Boolean flag to indicate if the border of the cell sides that cross the page should be removed.
-	 * @protected
-	 * @since 4.2.010 (2008-11-14)
-	 */
-	protected $opencell = true;
-
-	/**
-	 * Array of files to embedd.
-	 * @protected
-	 * @since 4.4.000 (2008-12-07)
-	 */
-	protected $embeddedfiles = array();
-
-	/**
-	 * Boolean flag to indicate if we are inside a PRE tag.
-	 * @protected
-	 * @since 4.4.001 (2008-12-08)
-	 */
-	protected $premode = false;
-
-	/**
-	 * Array used to store positions of graphics transformation blocks inside the page buffer.
-	 * keys are the page numbers
-	 * @protected
-	 * @since 4.4.002 (2008-12-09)
-	 */
-	protected $transfmrk = array();
-
-	/**
-	 * Default color for html links.
-	 * @protected
-	 * @since 4.4.003 (2008-12-09)
-	 */
-	protected $htmlLinkColorArray = array(0, 0, 255);
-
-	/**
-	 * Default font style to add to html links.
-	 * @protected
-	 * @since 4.4.003 (2008-12-09)
-	 */
-	protected $htmlLinkFontStyle = 'U';
-
-	/**
-	 * Counts the number of pages.
-	 * @protected
-	 * @since 4.5.000 (2008-12-31)
-	 */
-	protected $numpages = 0;
-
-	/**
-	 * Array containing page lengths in bytes.
-	 * @protected
-	 * @since 4.5.000 (2008-12-31)
-	 */
-	protected $pagelen = array();
-
-	/**
-	 * Counts the number of pages.
-	 * @protected
-	 * @since 4.5.000 (2008-12-31)
-	 */
-	protected $numimages = 0;
-
-	/**
-	 * Store the image keys.
-	 * @protected
-	 * @since 4.5.000 (2008-12-31)
-	 */
-	protected $imagekeys = array();
-
-	/**
-	 * Length of the buffer in bytes.
-	 * @protected
-	 * @since 4.5.000 (2008-12-31)
-	 */
-	protected $bufferlen = 0;
-
-	/**
-	 * Counts the number of fonts.
-	 * @protected
-	 * @since 4.5.000 (2009-01-02)
-	 */
-	protected $numfonts = 0;
-
-	/**
-	 * Store the font keys.
-	 * @protected
-	 * @since 4.5.000 (2009-01-02)
-	 */
-	protected $fontkeys = array();
-
-	/**
-	 * Store the font object IDs.
-	 * @protected
-	 * @since 4.8.001 (2009-09-09)
-	 */
-	protected $font_obj_ids = array();
-
-	/**
-	 * Store the fage status (true when opened, false when closed).
-	 * @protected
-	 * @since 4.5.000 (2009-01-02)
-	 */
-	protected $pageopen = array();
-
-	/**
-	 * Default monospace font.
-	 * @protected
-	 * @since 4.5.025 (2009-03-10)
-	 */
-	protected $default_monospaced_font = 'courier';
-
-	/**
-	 * Cloned copy of the current class object.
-	 * @protected
-	 * @since 4.5.029 (2009-03-19)
-	 */
-	protected $objcopy;
-
-	/**
-	 * Array used to store the lengths of cache files.
-	 * @protected
-	 * @since 4.5.029 (2009-03-19)
-	 */
-	protected $cache_file_length = array();
-
-	/**
-	 * Table header content to be repeated on each new page.
-	 * @protected
-	 * @since 4.5.030 (2009-03-20)
-	 */
-	protected $thead = '';
-
-	/**
-	 * Margins used for table header.
-	 * @protected
-	 * @since 4.5.030 (2009-03-20)
-	 */
-	protected $theadMargins = array();
-
-	/**
-	 * Boolean flag to enable document digital signature.
-	 * @protected
-	 * @since 4.6.005 (2009-04-24)
-	 */
-	protected $sign = false;
-
-	/**
-	 * Digital signature data.
-	 * @protected
-	 * @since 4.6.005 (2009-04-24)
-	 */
-	protected $signature_data = array();
-
-	/**
-	 * Digital signature max length.
-	 * @protected
-	 * @since 4.6.005 (2009-04-24)
-	 */
-	protected $signature_max_length = 11742;
-
-	/**
-	 * Data for digital signature appearance.
-	 * @protected
-	 * @since 5.3.011 (2010-06-16)
-	 */
-	protected $signature_appearance = array('page' => 1, 'rect' => '0 0 0 0');
-
-	/**
-	 * Array of empty digital signature appearances.
-	 * @protected
-	 * @since 5.9.101 (2011-07-06)
-	 */
-	protected $empty_signature_appearance = array();
-
-	/**
-	 * Boolean flag to enable document timestamping with TSA.
-	 * @protected
-	 * @since 6.0.085 (2014-06-19)
-	 */
-	protected $tsa_timestamp = false;
-
-	/**
-	 * Timestamping data.
-	 * @protected
-	 * @since 6.0.085 (2014-06-19)
-	 */
-	protected $tsa_data = array();
-
-	/**
-	 * Regular expression used to find blank characters (required for word-wrapping).
-	 * @protected
-	 * @since 4.6.006 (2009-04-28)
-	 */
-	protected $re_spaces = '/[^\S\xa0]/';
-
-	/**
-	 * Array of $re_spaces parts.
-	 * @protected
-	 * @since 5.5.011 (2010-07-09)
-	 */
-	protected $re_space = array('p' => '[^\S\xa0]', 'm' => '');
-
-	/**
-	 * Digital signature object ID.
-	 * @protected
-	 * @since 4.6.022 (2009-06-23)
-	 */
-	protected $sig_obj_id = 0;
-
-	/**
-	 * ID of page objects.
-	 * @protected
-	 * @since 4.7.000 (2009-08-29)
-	 */
-	protected $page_obj_id = array();
-
-	/**
-	 * List of form annotations IDs.
-	 * @protected
-	 * @since 4.8.000 (2009-09-07)
-	 */
-	protected $form_obj_id = array();
-
-	/**
-	 * Deafult Javascript field properties. Possible values are described on official Javascript for Acrobat API reference. Annotation options can be directly specified using the 'aopt' entry.
-	 * @protected
-	 * @since 4.8.000 (2009-09-07)
-	 */
-	protected $default_form_prop = array('lineWidth'=>1, 'borderStyle'=>'solid', 'fillColor'=>array(255, 255, 255), 'strokeColor'=>array(128, 128, 128));
-
-	/**
-	 * Javascript objects array.
-	 * @protected
-	 * @since 4.8.000 (2009-09-07)
-	 */
-	protected $js_objects = array();
-
-	/**
-	 * Current form action (used during XHTML rendering).
-	 * @protected
-	 * @since 4.8.000 (2009-09-07)
-	 */
-	protected $form_action = '';
-
-	/**
-	 * Current form encryption type (used during XHTML rendering).
-	 * @protected
-	 * @since 4.8.000 (2009-09-07)
-	 */
-	protected $form_enctype = 'application/x-www-form-urlencoded';
-
-	/**
-	 * Current method to submit forms.
-	 * @protected
-	 * @since 4.8.000 (2009-09-07)
-	 */
-	protected $form_mode = 'post';
-
-	/**
-	 * List of fonts used on form fields (fontname => fontkey).
-	 * @protected
-	 * @since 4.8.001 (2009-09-09)
-	 */
-	protected $annotation_fonts = array();
-
-	/**
-	 * List of radio buttons parent objects.
-	 * @protected
-	 * @since 4.8.001 (2009-09-09)
-	 */
-	protected $radiobutton_groups = array();
-
-	/**
-	 * List of radio group objects IDs.
-	 * @protected
-	 * @since 4.8.001 (2009-09-09)
-	 */
-	protected $radio_groups = array();
-
-	/**
-	 * Text indentation value (used for text-indent CSS attribute).
-	 * @protected
-	 * @since 4.8.006 (2009-09-23)
-	 */
-	protected $textindent = 0;
-
-	/**
-	 * Store page number when startTransaction() is called.
-	 * @protected
-	 * @since 4.8.006 (2009-09-23)
-	 */
-	protected $start_transaction_page = 0;
-
-	/**
-	 * Store Y position when startTransaction() is called.
-	 * @protected
-	 * @since 4.9.001 (2010-03-28)
-	 */
-	protected $start_transaction_y = 0;
-
-	/**
-	 * True when we are printing the thead section on a new page.
-	 * @protected
-	 * @since 4.8.027 (2010-01-25)
-	 */
-	protected $inthead = false;
-
-	/**
-	 * Array of column measures (width, space, starting Y position).
-	 * @protected
-	 * @since 4.9.001 (2010-03-28)
-	 */
-	protected $columns = array();
-
-	/**
-	 * Number of colums.
-	 * @protected
-	 * @since 4.9.001 (2010-03-28)
-	 */
-	protected $num_columns = 1;
-
-	/**
-	 * Current column number.
-	 * @protected
-	 * @since 4.9.001 (2010-03-28)
-	 */
-	protected $current_column = 0;
-
-	/**
-	 * Starting page for columns.
-	 * @protected
-	 * @since 4.9.001 (2010-03-28)
-	 */
-	protected $column_start_page = 0;
-
-	/**
-	 * Maximum page and column selected.
-	 * @protected
-	 * @since 5.8.000 (2010-08-11)
-	 */
-	protected $maxselcol = array('page' => 0, 'column' => 0);
-
-	/**
-	 * Array of: X difference between table cell x start and starting page margin, cellspacing, cellpadding.
-	 * @protected
-	 * @since 5.8.000 (2010-08-11)
-	 */
-	protected $colxshift = array('x' => 0, 's' => array('H' => 0, 'V' => 0), 'p' => array('L' => 0, 'T' => 0, 'R' => 0, 'B' => 0));
-
-	/**
-	 * Text rendering mode: 0 = Fill text; 1 = Stroke text; 2 = Fill, then stroke text; 3 = Neither fill nor stroke text (invisible); 4 = Fill text and add to path for clipping; 5 = Stroke text and add to path for clipping; 6 = Fill, then stroke text and add to path for clipping; 7 = Add text to path for clipping.
-	 * @protected
-	 * @since 4.9.008 (2010-04-03)
-	 */
-	protected $textrendermode = 0;
-
-	/**
-	 * Text stroke width in doc units.
-	 * @protected
-	 * @since 4.9.008 (2010-04-03)
-	 */
-	protected $textstrokewidth = 0;
-
-	/**
-	 * Current stroke color.
-	 * @protected
-	 * @since 4.9.008 (2010-04-03)
-	 */
-	protected $strokecolor;
-
-	/**
-	 * Default unit of measure for document.
-	 * @protected
-	 * @since 5.0.000 (2010-04-22)
-	 */
-	protected $pdfunit = 'mm';
-
-	/**
-	 * Boolean flag true when we are on TOC (Table Of Content) page.
-	 * @protected
-	 */
-	protected $tocpage = false;
-
-	/**
-	 * Boolean flag: if true convert vector images (SVG, EPS) to raster image using GD or ImageMagick library.
-	 * @protected
-	 * @since 5.0.000 (2010-04-26)
-	 */
-	protected $rasterize_vector_images = false;
-
-	/**
-	 * Boolean flag: if true enables font subsetting by default.
-	 * @protected
-	 * @since 5.3.002 (2010-06-07)
-	 */
-	protected $font_subsetting = true;
-
-	/**
-	 * Array of default graphic settings.
-	 * @protected
-	 * @since 5.5.008 (2010-07-02)
-	 */
-	protected $default_graphic_vars = array();
-
-	/**
-	 * Array of XObjects.
-	 * @protected
-	 * @since 5.8.014 (2010-08-23)
-	 */
-	protected $xobjects = array();
-
-	/**
-	 * Boolean value true when we are inside an XObject.
-	 * @protected
-	 * @since 5.8.017 (2010-08-24)
-	 */
-	protected $inxobj = false;
-
-	/**
-	 * Current XObject ID.
-	 * @protected
-	 * @since 5.8.017 (2010-08-24)
-	 */
-	protected $xobjid = '';
-
-	/**
-	 * Percentage of character stretching.
-	 * @protected
-	 * @since 5.9.000 (2010-09-29)
-	 */
-	protected $font_stretching = 100;
-
-	/**
-	 * Increases or decreases the space between characters in a text by the specified amount (tracking).
-	 * @protected
-	 * @since 5.9.000 (2010-09-29)
-	 */
-	protected $font_spacing = 0;
-
-	/**
-	 * Array of no-write regions.
-	 * ('page' => page number or empy for current page, 'xt' => X top, 'yt' => Y top, 'xb' => X bottom, 'yb' => Y bottom, 'side' => page side 'L' = left or 'R' = right)
-	 * @protected
-	 * @since 5.9.003 (2010-10-14)
-	 */
-	protected $page_regions = array();
-
-	/**
-	 * Boolean value true when page region check is active.
-	 * @protected
-	 */
-	protected $check_page_regions = true;
-
-	/**
-	 * Array of PDF layers data.
-	 * @protected
-	 * @since 5.9.102 (2011-07-13)
-	 */
-	protected $pdflayers = array();
-
-	/**
-	 * A dictionary of names and corresponding destinations (Dests key on document Catalog).
-	 * @protected
-	 * @since 5.9.097 (2011-06-23)
-	 */
-	protected $dests = array();
-
-	/**
-	 * Object ID for Named Destinations
-	 * @protected
-	 * @since 5.9.097 (2011-06-23)
-	 */
-	protected $n_dests;
-
-	/**
-	 * Embedded Files Names
-	 * @protected
-	 * @since 5.9.204 (2013-01-23)
-	 */
-	protected $efnames = array();
-
-	/**
-	 * Directory used for the last SVG image.
-	 * @protected
-	 * @since 5.0.000 (2010-05-05)
-	 */
-	protected $svgdir = '';
-
-	/**
-	 *  Deafult unit of measure for SVG.
-	 * @protected
-	 * @since 5.0.000 (2010-05-02)
-	 */
-	protected $svgunit = 'px';
-
-	/**
-	 * Array of SVG gradients.
-	 * @protected
-	 * @since 5.0.000 (2010-05-02)
-	 */
-	protected $svggradients = array();
-
-	/**
-	 * ID of last SVG gradient.
-	 * @protected
-	 * @since 5.0.000 (2010-05-02)
-	 */
-	protected $svggradientid = 0;
-
-	/**
-	 * Boolean value true when in SVG defs group.
-	 * @protected
-	 * @since 5.0.000 (2010-05-02)
-	 */
-	protected $svgdefsmode = false;
-
-	/**
-	 * Array of SVG defs.
-	 * @protected
-	 * @since 5.0.000 (2010-05-02)
-	 */
-	protected $svgdefs = array();
-
-	/**
-	 * Boolean value true when in SVG clipPath tag.
-	 * @protected
-	 * @since 5.0.000 (2010-04-26)
-	 */
-	protected $svgclipmode = false;
-
-	/**
-	 * Array of SVG clipPath commands.
-	 * @protected
-	 * @since 5.0.000 (2010-05-02)
-	 */
-	protected $svgclippaths = array();
-
-	/**
-	 * Array of SVG clipPath tranformation matrix.
-	 * @protected
-	 * @since 5.8.022 (2010-08-31)
-	 */
-	protected $svgcliptm = array();
-
-	/**
-	 * ID of last SVG clipPath.
-	 * @protected
-	 * @since 5.0.000 (2010-05-02)
-	 */
-	protected $svgclipid = 0;
-
-	/**
-	 * SVG text.
-	 * @protected
-	 * @since 5.0.000 (2010-05-02)
-	 */
-	protected $svgtext = '';
-
-	/**
-	 * SVG text properties.
-	 * @protected
-	 * @since 5.8.013 (2010-08-23)
-	 */
-	protected $svgtextmode = array();
-
-	/**
-	 * Array of SVG properties.
-	 * @protected
-	 * @since 5.0.000 (2010-05-02)
-	 */
-	protected $svgstyles = array(array(
-		'alignment-baseline' => 'auto',
-		'baseline-shift' => 'baseline',
-		'clip' => 'auto',
-		'clip-path' => 'none',
-		'clip-rule' => 'nonzero',
-		'color' => 'black',
-		'color-interpolation' => 'sRGB',
-		'color-interpolation-filters' => 'linearRGB',
-		'color-profile' => 'auto',
-		'color-rendering' => 'auto',
-		'cursor' => 'auto',
-		'direction' => 'ltr',
-		'display' => 'inline',
-		'dominant-baseline' => 'auto',
-		'enable-background' => 'accumulate',
-		'fill' => 'black',
-		'fill-opacity' => 1,
-		'fill-rule' => 'nonzero',
-		'filter' => 'none',
-		'flood-color' => 'black',
-		'flood-opacity' => 1,
-		'font' => '',
-		'font-family' => 'helvetica',
-		'font-size' => 'medium',
-		'font-size-adjust' => 'none',
-		'font-stretch' => 'normal',
-		'font-style' => 'normal',
-		'font-variant' => 'normal',
-		'font-weight' => 'normal',
-		'glyph-orientation-horizontal' => '0deg',
-		'glyph-orientation-vertical' => 'auto',
-		'image-rendering' => 'auto',
-		'kerning' => 'auto',
-		'letter-spacing' => 'normal',
-		'lighting-color' => 'white',
-		'marker' => '',
-		'marker-end' => 'none',
-		'marker-mid' => 'none',
-		'marker-start' => 'none',
-		'mask' => 'none',
-		'opacity' => 1,
-		'overflow' => 'auto',
-		'pointer-events' => 'visiblePainted',
-		'shape-rendering' => 'auto',
-		'stop-color' => 'black',
-		'stop-opacity' => 1,
-		'stroke' => 'none',
-		'stroke-dasharray' => 'none',
-		'stroke-dashoffset' => 0,
-		'stroke-linecap' => 'butt',
-		'stroke-linejoin' => 'miter',
-		'stroke-miterlimit' => 4,
-		'stroke-opacity' => 1,
-		'stroke-width' => 1,
-		'text-anchor' => 'start',
-		'text-decoration' => 'none',
-		'text-rendering' => 'auto',
-		'unicode-bidi' => 'normal',
-		'visibility' => 'visible',
-		'word-spacing' => 'normal',
-		'writing-mode' => 'lr-tb',
-		'text-color' => 'black',
-		'transfmatrix' => array(1, 0, 0, 1, 0, 0)
-		));
-
-	/**
-	 * If true force sRGB color profile for all document.
-	 * @protected
-	 * @since 5.9.121 (2011-09-28)
-	 */
-	protected $force_srgb = false;
-
-	/**
-	 * If true set the document to PDF/A mode.
-	 * @protected
-	 * @since 5.9.121 (2011-09-27)
-	 */
-	protected $pdfa_mode = false;
-
-	/**
-	 * Document creation date-time
-	 * @protected
-	 * @since 5.9.152 (2012-03-22)
-	 */
-	protected $doc_creation_timestamp;
-
-	/**
-	 * Document modification date-time
-	 * @protected
-	 * @since 5.9.152 (2012-03-22)
-	 */
-	protected $doc_modification_timestamp;
-
-	/**
-	 * Custom XMP data.
-	 * @protected
-	 * @since 5.9.128 (2011-10-06)
-	 */
-	protected $custom_xmp = '';
-
-	/**
-	 * Overprint mode array.
-	 * (Check the "Entries in a Graphics State Parameter Dictionary" on PDF 32000-1:2008).
-	 * @protected
-	 * @since 5.9.152 (2012-03-23)
-	 */
-	protected $overprint = array('OP' => false, 'op' => false, 'OPM' => 0);
-
-	/**
-	 * Alpha mode array.
-	 * (Check the "Entries in a Graphics State Parameter Dictionary" on PDF 32000-1:2008).
-	 * @protected
-	 * @since 5.9.152 (2012-03-23)
-	 */
-	protected $alpha = array('CA' => 1, 'ca' => 1, 'BM' => '/Normal', 'AIS' => false);
-
-	/**
-	 * Define the page boundaries boxes to be set on document.
-	 * @protected
-	 * @since 5.9.152 (2012-03-23)
-	 */
-	protected $page_boxes = array('MediaBox', 'CropBox', 'BleedBox', 'TrimBox', 'ArtBox');
-
-	/**
-	 * If true print TCPDF meta link.
-	 * @protected
-	 * @since 5.9.152 (2012-03-23)
-	 */
-	protected $tcpdflink = true;
-
-	/**
-	 * Cache array for computed GD gamma values.
-	 * @protected
-	 * @since 5.9.1632 (2012-06-05)
-	 */
-	protected $gdgammacache = array();
-
-	//------------------------------------------------------------
-	// METHODS
-	//------------------------------------------------------------
-
-	/**
-	 * This is the class constructor.
-	 * It allows to set up the page format, the orientation and the measure unit used in all the methods (except for the font sizes).
-	 * 
-	 * IMPORTANT: Please note that this method sets the mb_internal_encoding to ASCII, so if you are using the mbstring module functions with TCPDF you need to correctly set/unset the mb_internal_encoding when needed.
-	 * 
-	 * @param $orientation (string) page orientation. Possible values are (case insensitive):<ul><li>P or Portrait (default)</li><li>L or Landscape</li><li>'' (empty string) for automatic orientation</li></ul>
-	 * @param $unit (string) User measure unit. Possible values are:<ul><li>pt: point</li><li>mm: millimeter (default)</li><li>cm: centimeter</li><li>in: inch</li></ul><br />A point equals 1/72 of inch, that is to say about 0.35 mm (an inch being 2.54 cm). This is a very common unit in typography; font sizes are expressed in that unit.
-	 * @param $format (mixed) The format used for pages. It can be either: one of the string values specified at getPageSizeFromFormat() or an array of parameters specified at setPageFormat().
-	 * @param $unicode (boolean) TRUE means that the input text is unicode (default = true)
-	 * @param $encoding (string) Charset encoding (used only when converting back html entities); default is UTF-8.
-	 * @param $diskcache (boolean) DEPRECATED FEATURE
-	 * @param $pdfa (boolean) If TRUE set the document to PDF/A mode.
-	 * @public
-	 * @see getPageSizeFromFormat(), setPageFormat()
-	 */
-	public function __construct($orientation='P', $unit='mm', $format='A4', $unicode=true, $encoding='UTF-8', $diskcache=false, $pdfa=false) {
-		/* Set internal character encoding to ASCII */
-		if (function_exists('mb_internal_encoding') AND mb_internal_encoding()) {
-			$this->internal_encoding = mb_internal_encoding();
-			mb_internal_encoding('ASCII');
-		}
-		// set file ID for trailer
-		$serformat = (is_array($format) ? json_encode($format) : $format);
-		$this->file_id = md5(TCPDF_STATIC::getRandomSeed('TCPDF'.$orientation.$unit.$serformat.$encoding));
-		$this->font_obj_ids = array();
-		$this->page_obj_id = array();
-		$this->form_obj_id = array();
-		// set pdf/a mode
-		$this->pdfa_mode = $pdfa;
-		$this->force_srgb = false;
-		// set language direction
-		$this->rtl = false;
-		$this->tmprtl = false;
-		// some checks
-		$this->_dochecks();
-		// initialization of properties
-		$this->isunicode = $unicode;
-		$this->page = 0;
-		$this->transfmrk[0] = array();
-		$this->pagedim = array();
-		$this->n = 2;
-		$this->buffer = '';
-		$this->pages = array();
-		$this->state = 0;
-		$this->fonts = array();
-		$this->FontFiles = array();
-		$this->diffs = array();
-		$this->images = array();
-		$this->links = array();
-		$this->gradients = array();
-		$this->InFooter = false;
-		$this->lasth = 0;
-		$this->FontFamily = defined('PDF_FONT_NAME_MAIN')?PDF_FONT_NAME_MAIN:'helvetica';
-		$this->FontStyle = '';
-		$this->FontSizePt = 12;
-		$this->underline = false;
-		$this->overline = false;
-		$this->linethrough = false;
-		$this->DrawColor = '0 G';
-		$this->FillColor = '0 g';
-		$this->TextColor = '0 g';
-		$this->ColorFlag = false;
-		$this->pdflayers = array();
-		// encryption values
-		$this->encrypted = false;
-		$this->last_enc_key = '';
-		// standard Unicode fonts
-		$this->CoreFonts = array(
-			'courier'=>'Courier',
-			'courierB'=>'Courier-Bold',
-			'courierI'=>'Courier-Oblique',
-			'courierBI'=>'Courier-BoldOblique',
-			'helvetica'=>'Helvetica',
-			'helveticaB'=>'Helvetica-Bold',
-			'helveticaI'=>'Helvetica-Oblique',
-			'helveticaBI'=>'Helvetica-BoldOblique',
-			'times'=>'Times-Roman',
-			'timesB'=>'Times-Bold',
-			'timesI'=>'Times-Italic',
-			'timesBI'=>'Times-BoldItalic',
-			'symbol'=>'Symbol',
-			'zapfdingbats'=>'ZapfDingbats'
-		);
-		// set scale factor
-		$this->setPageUnit($unit);
-		// set page format and orientation
-		$this->setPageFormat($format, $orientation);
-		// page margins (1 cm)
-		$margin = 28.35 / $this->k;
-		$this->SetMargins($margin, $margin);
-		$this->clMargin = $this->lMargin;
-		$this->crMargin = $this->rMargin;
-		// internal cell padding
-		$cpadding = $margin / 10;
-		$this->setCellPaddings($cpadding, 0, $cpadding, 0);
-		// cell margins
-		$this->setCellMargins(0, 0, 0, 0);
-		// line width (0.2 mm)
-		$this->LineWidth = 0.57 / $this->k;
-		$this->linestyleWidth = sprintf('%F w', ($this->LineWidth * $this->k));
-		$this->linestyleCap = '0 J';
-		$this->linestyleJoin = '0 j';
-		$this->linestyleDash = '[] 0 d';
-		// automatic page break
-		$this->SetAutoPageBreak(true, (2 * $margin));
-		// full width display mode
-		$this->SetDisplayMode('fullwidth');
-		// compression
-		$this->SetCompression();
-		// set default PDF version number
-		$this->setPDFVersion();
-		$this->tcpdflink = true;
-		$this->encoding = $encoding;
-		$this->HREF = array();
-		$this->getFontsList();
-		$this->fgcolor = array('R' => 0, 'G' => 0, 'B' => 0);
-		$this->strokecolor = array('R' => 0, 'G' => 0, 'B' => 0);
-		$this->bgcolor = array('R' => 255, 'G' => 255, 'B' => 255);
-		$this->extgstates = array();
-		$this->setTextShadow();
-		// signature
-		$this->sign = false;
-		$this->tsa_timestamp = false;
-		$this->tsa_data = array();
-		$this->signature_appearance = array('page' => 1, 'rect' => '0 0 0 0', 'name' => 'Signature');
-		$this->empty_signature_appearance = array();
-		// user's rights
-		$this->ur['enabled'] = false;
-		$this->ur['document'] = '/FullSave';
-		$this->ur['annots'] = '/Create/Delete/Modify/Copy/Import/Export';
-		$this->ur['form'] = '/Add/Delete/FillIn/Import/Export/SubmitStandalone/SpawnTemplate';
-		$this->ur['signature'] = '/Modify';
-		$this->ur['ef'] = '/Create/Delete/Modify/Import';
-		$this->ur['formex'] = '';
-		// set default JPEG quality
-		$this->jpeg_quality = 75;
-		// initialize some settings
-		TCPDF_FONTS::utf8Bidi(array(''), '', false, $this->isunicode, $this->CurrentFont);
-		// set default font
-		$this->SetFont($this->FontFamily, $this->FontStyle, $this->FontSizePt);
-		$this->setHeaderFont(array($this->FontFamily, $this->FontStyle, $this->FontSizePt));
-		$this->setFooterFont(array($this->FontFamily, $this->FontStyle, $this->FontSizePt));
-		// check if PCRE Unicode support is enabled
-		if ($this->isunicode AND (@preg_match('/\pL/u', 'a') == 1)) {
-			// PCRE unicode support is turned ON
-			// \s     : any whitespace character
-			// \p{Z}  : any separator
-			// \p{Lo} : Unicode letter or ideograph that does not have lowercase and uppercase variants. Is used to chunk chinese words.
-			// \xa0   : Unicode Character 'NO-BREAK SPACE' (U+00A0)
-			//$this->setSpacesRE('/(?!\xa0)[\s\p{Z}\p{Lo}]/u');
-			$this->setSpacesRE('/(?!\xa0)[\s\p{Z}]/u');
-		} else {
-			// PCRE unicode support is turned OFF
-			$this->setSpacesRE('/[^\S\xa0]/');
-		}
-		$this->default_form_prop = array('lineWidth'=>1, 'borderStyle'=>'solid', 'fillColor'=>array(255, 255, 255), 'strokeColor'=>array(128, 128, 128));
-		// set document creation and modification timestamp
-		$this->doc_creation_timestamp = time();
-		$this->doc_modification_timestamp = $this->doc_creation_timestamp;
-		// get default graphic vars
-		$this->default_graphic_vars = $this->getGraphicVars();
-		$this->header_xobj_autoreset = false;
-		$this->custom_xmp = '';
-		// Call cleanup method after script execution finishes or exit() is called.
-		// NOTE: This will not be executed if the process is killed with a SIGTERM or SIGKILL signal.
-		register_shutdown_function(array($this, '_destroy'), true);
-	}
-
-	/**
-	 * Default destructor.
-	 * @public
-	 * @since 1.53.0.TC016
-	 */
-	public function __destruct() {
-		// restore internal encoding
-		if (isset($this->internal_encoding) AND !empty($this->internal_encoding)) {
-			mb_internal_encoding($this->internal_encoding);
-		}
-		// cleanup
-		$this->_destroy(true);
-	}
-
-	/**
-	 * Set the units of measure for the document.
-	 * @param $unit (string) User measure unit. Possible values are:<ul><li>pt: point</li><li>mm: millimeter (default)</li><li>cm: centimeter</li><li>in: inch</li></ul><br />A point equals 1/72 of inch, that is to say about 0.35 mm (an inch being 2.54 cm). This is a very common unit in typography; font sizes are expressed in that unit.
-	 * @public
-	 * @since 3.0.015 (2008-06-06)
-	 */
-	public function setPageUnit($unit) {
-		$unit = strtolower($unit);
-		//Set scale factor
-		switch ($unit) {
-			// points
-			case 'px':
-			case 'pt': {
-				$this->k = 1;
-				break;
-			}
-			// millimeters
-			case 'mm': {
-				$this->k = $this->dpi / 25.4;
-				break;
-			}
-			// centimeters
-			case 'cm': {
-				$this->k = $this->dpi / 2.54;
-				break;
-			}
-			// inches
-			case 'in': {
-				$this->k = $this->dpi;
-				break;
-			}
-			// unsupported unit
-			default : {
-				$this->Error('Incorrect unit: '.$unit);
-				break;
-			}
-		}
-		$this->pdfunit = $unit;
-		if (isset($this->CurOrientation)) {
-			$this->setPageOrientation($this->CurOrientation);
-		}
-	}
-
-	/**
-	 * Change the format of the current page
-	 * @param $format (mixed) The format used for pages. It can be either: one of the string values specified at getPageSizeFromFormat() documentation or an array of two numbers (width, height) or an array containing the following measures and options:<ul>
-	 * <li>['format'] = page format name (one of the above);</li>
-	 * <li>['Rotate'] : The number of degrees by which the page shall be rotated clockwise when displayed or printed. The value shall be a multiple of 90.</li>
-	 * <li>['PZ'] : The page's preferred zoom (magnification) factor.</li>
-	 * <li>['MediaBox'] : the boundaries of the physical medium on which the page shall be displayed or printed:</li>
-	 * <li>['MediaBox']['llx'] : lower-left x coordinate</li>
-	 * <li>['MediaBox']['lly'] : lower-left y coordinate</li>
-	 * <li>['MediaBox']['urx'] : upper-right x coordinate</li>
-	 * <li>['MediaBox']['ury'] : upper-right y coordinate</li>
-	 * <li>['CropBox'] : the visible region of default user space:</li>
-	 * <li>['CropBox']['llx'] : lower-left x coordinate</li>
-	 * <li>['CropBox']['lly'] : lower-left y coordinate</li>
-	 * <li>['CropBox']['urx'] : upper-right x coordinate</li>
-	 * <li>['CropBox']['ury'] : upper-right y coordinate</li>
-	 * <li>['BleedBox'] : the region to which the contents of the page shall be clipped when output in a production environment:</li>
-	 * <li>['BleedBox']['llx'] : lower-left x coordinate</li>
-	 * <li>['BleedBox']['lly'] : lower-left y coordinate</li>
-	 * <li>['BleedBox']['urx'] : upper-right x coordinate</li>
-	 * <li>['BleedBox']['ury'] : upper-right y coordinate</li>
-	 * <li>['TrimBox'] : the intended dimensions of the finished page after trimming:</li>
-	 * <li>['TrimBox']['llx'] : lower-left x coordinate</li>
-	 * <li>['TrimBox']['lly'] : lower-left y coordinate</li>
-	 * <li>['TrimBox']['urx'] : upper-right x coordinate</li>
-	 * <li>['TrimBox']['ury'] : upper-right y coordinate</li>
-	 * <li>['ArtBox'] : the extent of the page's meaningful content:</li>
-	 * <li>['ArtBox']['llx'] : lower-left x coordinate</li>
-	 * <li>['ArtBox']['lly'] : lower-left y coordinate</li>
-	 * <li>['ArtBox']['urx'] : upper-right x coordinate</li>
-	 * <li>['ArtBox']['ury'] : upper-right y coordinate</li>
-	 * <li>['BoxColorInfo'] :specify the colours and other visual characteristics that should be used in displaying guidelines on the screen for each of the possible page boundaries other than the MediaBox:</li>
-	 * <li>['BoxColorInfo'][BOXTYPE]['C'] : an array of three numbers in the range 0-255, representing the components in the DeviceRGB colour space.</li>
-	 * <li>['BoxColorInfo'][BOXTYPE]['W'] : the guideline width in default user units</li>
-	 * <li>['BoxColorInfo'][BOXTYPE]['S'] : the guideline style: S = Solid; D = Dashed</li>
-	 * <li>['BoxColorInfo'][BOXTYPE]['D'] : dash array defining a pattern of dashes and gaps to be used in drawing dashed guidelines</li>
-	 * <li>['trans'] : the style and duration of the visual transition to use when moving from another page to the given page during a presentation</li>
-	 * <li>['trans']['Dur'] : The page's display duration (also called its advance timing): the maximum length of time, in seconds, that the page shall be displayed during presentations before the viewer application shall automatically advance to the next page.</li>
-	 * <li>['trans']['S'] : transition style : Split, Blinds, Box, Wipe, Dissolve, Glitter, R, Fly, Push, Cover, Uncover, Fade</li>
-	 * <li>['trans']['D'] : The duration of the transition effect, in seconds.</li>
-	 * <li>['trans']['Dm'] : (Split and Blinds transition styles only) The dimension in which the specified transition effect shall occur: H = Horizontal, V = Vertical. Default value: H.</li>
-	 * <li>['trans']['M'] : (Split, Box and Fly transition styles only) The direction of motion for the specified transition effect: I = Inward from the edges of the page, O = Outward from the center of the pageDefault value: I.</li>
-	 * <li>['trans']['Di'] : (Wipe, Glitter, Fly, Cover, Uncover and Push transition styles only) The direction in which the specified transition effect shall moves, expressed in degrees counterclockwise starting from a left-to-right direction. If the value is a number, it shall be one of: 0 = Left to right, 90 = Bottom to top (Wipe only), 180 = Right to left (Wipe only), 270 = Top to bottom, 315 = Top-left to bottom-right (Glitter only). If the value is a name, it shall be None, which is relevant only for the Fly transition when the value of SS is not 1.0. Default value: 0.</li>
-	 * <li>['trans']['SS'] : (Fly transition style only) The starting or ending scale at which the changes shall be drawn. If M specifies an inward transition, the scale of the changes drawn shall progress from SS to 1.0 over the course of the transition. If M specifies an outward transition, the scale of the changes drawn shall progress from 1.0 to SS over the course of the transition. Default: 1.0.</li>
-	 * <li>['trans']['B'] : (Fly transition style only) If true, the area that shall be flown in is rectangular and opaque. Default: false.</li>
-	 * </ul>
-	 * @param $orientation (string) page orientation. Possible values are (case insensitive):<ul>
-	 * <li>P or Portrait (default)</li>
-	 * <li>L or Landscape</li>
-	 * <li>'' (empty string) for automatic orientation</li>
-	 * </ul>
-	 * @protected
-	 * @since 3.0.015 (2008-06-06)
-	 * @see getPageSizeFromFormat()
-	 */
-	protected function setPageFormat($format, $orientation='P') {
-		if (!empty($format) AND isset($this->pagedim[$this->page])) {
-			// remove inherited values
-			unset($this->pagedim[$this->page]);
-		}
-		if (is_string($format)) {
-			// get page measures from format name
-			$pf = TCPDF_STATIC::getPageSizeFromFormat($format);
-			$this->fwPt = $pf[0];
-			$this->fhPt = $pf[1];
-		} else {
-			// the boundaries of the physical medium on which the page shall be displayed or printed
-			if (isset($format['MediaBox'])) {
-				$this->pagedim = TCPDF_STATIC::setPageBoxes($this->page, 'MediaBox', $format['MediaBox']['llx'], $format['MediaBox']['lly'], $format['MediaBox']['urx'], $format['MediaBox']['ury'], false, $this->k, $this->pagedim);
-				$this->fwPt = (($format['MediaBox']['urx'] - $format['MediaBox']['llx']) * $this->k);
-				$this->fhPt = (($format['MediaBox']['ury'] - $format['MediaBox']['lly']) * $this->k);
-			} else {
-				if (isset($format[0]) AND is_numeric($format[0]) AND isset($format[1]) AND is_numeric($format[1])) {
-					$pf = array(($format[0] * $this->k), ($format[1] * $this->k));
-				} else {
-					if (!isset($format['format'])) {
-						// default value
-						$format['format'] = 'A4';
-					}
-					$pf = TCPDF_STATIC::getPageSizeFromFormat($format['format']);
-				}
-				$this->fwPt = $pf[0];
-				$this->fhPt = $pf[1];
-				$this->pagedim = TCPDF_STATIC::setPageBoxes($this->page, 'MediaBox', 0, 0, $this->fwPt, $this->fhPt, true, $this->k, $this->pagedim);
-			}
-			// the visible region of default user space
-			if (isset($format['CropBox'])) {
-				$this->pagedim = TCPDF_STATIC::setPageBoxes($this->page, 'CropBox', $format['CropBox']['llx'], $format['CropBox']['lly'], $format['CropBox']['urx'], $format['CropBox']['ury'], false, $this->k, $this->pagedim);
-			}
-			// the region to which the contents of the page shall be clipped when output in a production environment
-			if (isset($format['BleedBox'])) {
-				$this->pagedim = TCPDF_STATIC::setPageBoxes($this->page, 'BleedBox', $format['BleedBox']['llx'], $format['BleedBox']['lly'], $format['BleedBox']['urx'], $format['BleedBox']['ury'], false, $this->k, $this->pagedim);
-			}
-			// the intended dimensions of the finished page after trimming
-			if (isset($format['TrimBox'])) {
-				$this->pagedim = TCPDF_STATIC::setPageBoxes($this->page, 'TrimBox', $format['TrimBox']['llx'], $format['TrimBox']['lly'], $format['TrimBox']['urx'], $format['TrimBox']['ury'], false, $this->k, $this->pagedim);
-			}
-			// the page's meaningful content (including potential white space)
-			if (isset($format['ArtBox'])) {
-				$this->pagedim = TCPDF_STATIC::setPageBoxes($this->page, 'ArtBox', $format['ArtBox']['llx'], $format['ArtBox']['lly'], $format['ArtBox']['urx'], $format['ArtBox']['ury'], false, $this->k, $this->pagedim);
-			}
-			// specify the colours and other visual characteristics that should be used in displaying guidelines on the screen for the various page boundaries
-			if (isset($format['BoxColorInfo'])) {
-				$this->pagedim[$this->page]['BoxColorInfo'] = $format['BoxColorInfo'];
-			}
-			if (isset($format['Rotate']) AND (($format['Rotate'] % 90) == 0)) {
-				// The number of degrees by which the page shall be rotated clockwise when displayed or printed. The value shall be a multiple of 90.
-				$this->pagedim[$this->page]['Rotate'] = intval($format['Rotate']);
-			}
-			if (isset($format['PZ'])) {
-				// The page's preferred zoom (magnification) factor
-				$this->pagedim[$this->page]['PZ'] = floatval($format['PZ']);
-			}
-			if (isset($format['trans'])) {
-				// The style and duration of the visual transition to use when moving from another page to the given page during a presentation
-				if (isset($format['trans']['Dur'])) {
-					// The page's display duration
-					$this->pagedim[$this->page]['trans']['Dur'] = floatval($format['trans']['Dur']);
-				}
-				$stansition_styles = array('Split', 'Blinds', 'Box', 'Wipe', 'Dissolve', 'Glitter', 'R', 'Fly', 'Push', 'Cover', 'Uncover', 'Fade');
-				if (isset($format['trans']['S']) AND in_array($format['trans']['S'], $stansition_styles)) {
-					// The transition style that shall be used when moving to this page from another during a presentation
-					$this->pagedim[$this->page]['trans']['S'] = $format['trans']['S'];
-					$valid_effect = array('Split', 'Blinds');
-					$valid_vals = array('H', 'V');
-					if (isset($format['trans']['Dm']) AND in_array($format['trans']['S'], $valid_effect) AND in_array($format['trans']['Dm'], $valid_vals)) {
-						$this->pagedim[$this->page]['trans']['Dm'] = $format['trans']['Dm'];
-					}
-					$valid_effect = array('Split', 'Box', 'Fly');
-					$valid_vals = array('I', 'O');
-					if (isset($format['trans']['M']) AND in_array($format['trans']['S'], $valid_effect) AND in_array($format['trans']['M'], $valid_vals)) {
-						$this->pagedim[$this->page]['trans']['M'] = $format['trans']['M'];
-					}
-					$valid_effect = array('Wipe', 'Glitter', 'Fly', 'Cover', 'Uncover', 'Push');
-					if (isset($format['trans']['Di']) AND in_array($format['trans']['S'], $valid_effect)) {
-						if (((($format['trans']['Di'] == 90) OR ($format['trans']['Di'] == 180)) AND ($format['trans']['S'] == 'Wipe'))
-							OR (($format['trans']['Di'] == 315) AND ($format['trans']['S'] == 'Glitter'))
-							OR (($format['trans']['Di'] == 0) OR ($format['trans']['Di'] == 270))) {
-							$this->pagedim[$this->page]['trans']['Di'] = intval($format['trans']['Di']);
-						}
-					}
-					if (isset($format['trans']['SS']) AND ($format['trans']['S'] == 'Fly')) {
-						$this->pagedim[$this->page]['trans']['SS'] = floatval($format['trans']['SS']);
-					}
-					if (isset($format['trans']['B']) AND ($format['trans']['B'] === true) AND ($format['trans']['S'] == 'Fly')) {
-						$this->pagedim[$this->page]['trans']['B'] = 'true';
-					}
-				} else {
-					$this->pagedim[$this->page]['trans']['S'] = 'R';
-				}
-				if (isset($format['trans']['D'])) {
-					// The duration of the transition effect, in seconds
-					$this->pagedim[$this->page]['trans']['D'] = floatval($format['trans']['D']);
-				} else {
-					$this->pagedim[$this->page]['trans']['D'] = 1;
-				}
-			}
-		}
-		$this->setPageOrientation($orientation);
-	}
-
-	/**
-	 * Set page orientation.
-	 * @param $orientation (string) page orientation. Possible values are (case insensitive):<ul><li>P or Portrait (default)</li><li>L or Landscape</li><li>'' (empty string) for automatic orientation</li></ul>
-	 * @param $autopagebreak (boolean) Boolean indicating if auto-page-break mode should be on or off.
-	 * @param $bottommargin (float) bottom margin of the page.
-	 * @public
-	 * @since 3.0.015 (2008-06-06)
-	 */
-	public function setPageOrientation($orientation, $autopagebreak='', $bottommargin='') {
-		if (!isset($this->pagedim[$this->page]['MediaBox'])) {
-			// the boundaries of the physical medium on which the page shall be displayed or printed
-			$this->pagedim = TCPDF_STATIC::setPageBoxes($this->page, 'MediaBox', 0, 0, $this->fwPt, $this->fhPt, true, $this->k, $this->pagedim);
-		}
-		if (!isset($this->pagedim[$this->page]['CropBox'])) {
-			// the visible region of default user space
-			$this->pagedim = TCPDF_STATIC::setPageBoxes($this->page, 'CropBox', $this->pagedim[$this->page]['MediaBox']['llx'], $this->pagedim[$this->page]['MediaBox']['lly'], $this->pagedim[$this->page]['MediaBox']['urx'], $this->pagedim[$this->page]['MediaBox']['ury'], true, $this->k, $this->pagedim);
-		}
-		if (!isset($this->pagedim[$this->page]['BleedBox'])) {
-			// the region to which the contents of the page shall be clipped when output in a production environment
-			$this->pagedim = TCPDF_STATIC::setPageBoxes($this->page, 'BleedBox', $this->pagedim[$this->page]['CropBox']['llx'], $this->pagedim[$this->page]['CropBox']['lly'], $this->pagedim[$this->page]['CropBox']['urx'], $this->pagedim[$this->page]['CropBox']['ury'], true, $this->k, $this->pagedim);
-		}
-		if (!isset($this->pagedim[$this->page]['TrimBox'])) {
-			// the intended dimensions of the finished page after trimming
-			$this->pagedim = TCPDF_STATIC::setPageBoxes($this->page, 'TrimBox', $this->pagedim[$this->page]['CropBox']['llx'], $this->pagedim[$this->page]['CropBox']['lly'], $this->pagedim[$this->page]['CropBox']['urx'], $this->pagedim[$this->page]['CropBox']['ury'], true, $this->k, $this->pagedim);
-		}
-		if (!isset($this->pagedim[$this->page]['ArtBox'])) {
-			// the page's meaningful content (including potential white space)
-			$this->pagedim = TCPDF_STATIC::setPageBoxes($this->page, 'ArtBox', $this->pagedim[$this->page]['CropBox']['llx'], $this->pagedim[$this->page]['CropBox']['lly'], $this->pagedim[$this->page]['CropBox']['urx'], $this->pagedim[$this->page]['CropBox']['ury'], true, $this->k, $this->pagedim);
-		}
-		if (!isset($this->pagedim[$this->page]['Rotate'])) {
-			// The number of degrees by which the page shall be rotated clockwise when displayed or printed. The value shall be a multiple of 90.
-			$this->pagedim[$this->page]['Rotate'] = 0;
-		}
-		if (!isset($this->pagedim[$this->page]['PZ'])) {
-			// The page's preferred zoom (magnification) factor
-			$this->pagedim[$this->page]['PZ'] = 1;
-		}
-		if ($this->fwPt > $this->fhPt) {
-			// landscape
-			$default_orientation = 'L';
-		} else {
-			// portrait
-			$default_orientation = 'P';
-		}
-		$valid_orientations = array('P', 'L');
-		if (empty($orientation)) {
-			$orientation = $default_orientation;
-		} else {
-			$orientation = strtoupper($orientation[0]);
-		}
-		if (in_array($orientation, $valid_orientations) AND ($orientation != $default_orientation)) {
-			$this->CurOrientation = $orientation;
-			$this->wPt = $this->fhPt;
-			$this->hPt = $this->fwPt;
-		} else {
-			$this->CurOrientation = $default_orientation;
-			$this->wPt = $this->fwPt;
-			$this->hPt = $this->fhPt;
-		}
-		if ((abs($this->pagedim[$this->page]['MediaBox']['urx'] - $this->hPt) < $this->feps) AND (abs($this->pagedim[$this->page]['MediaBox']['ury'] - $this->wPt) < $this->feps)){
-			// swap X and Y coordinates (change page orientation)
-			$this->pagedim = TCPDF_STATIC::swapPageBoxCoordinates($this->page, $this->pagedim);
-		}
-		$this->w = ($this->wPt / $this->k);
-		$this->h = ($this->hPt / $this->k);
-		if (TCPDF_STATIC::empty_string($autopagebreak)) {
-			if (isset($this->AutoPageBreak)) {
-				$autopagebreak = $this->AutoPageBreak;
-			} else {
-				$autopagebreak = true;
-			}
-		}
-		if (TCPDF_STATIC::empty_string($bottommargin)) {
-			if (isset($this->bMargin)) {
-				$bottommargin = $this->bMargin;
-			} else {
-				// default value = 2 cm
-				$bottommargin = 2 * 28.35 / $this->k;
-			}
-		}
-		$this->SetAutoPageBreak($autopagebreak, $bottommargin);
-		// store page dimensions
-		$this->pagedim[$this->page]['w'] = $this->wPt;
-		$this->pagedim[$this->page]['h'] = $this->hPt;
-		$this->pagedim[$this->page]['wk'] = $this->w;
-		$this->pagedim[$this->page]['hk'] = $this->h;
-		$this->pagedim[$this->page]['tm'] = $this->tMargin;
-		$this->pagedim[$this->page]['bm'] = $bottommargin;
-		$this->pagedim[$this->page]['lm'] = $this->lMargin;
-		$this->pagedim[$this->page]['rm'] = $this->rMargin;
-		$this->pagedim[$this->page]['pb'] = $autopagebreak;
-		$this->pagedim[$this->page]['or'] = $this->CurOrientation;
-		$this->pagedim[$this->page]['olm'] = $this->original_lMargin;
-		$this->pagedim[$this->page]['orm'] = $this->original_rMargin;
-	}
-
-	/**
-	 * Set regular expression to detect withespaces or word separators.
-	 * The pattern delimiter must be the forward-slash character "/".
-	 * Some example patterns are:
-	 * <pre>
-	 * Non-Unicode or missing PCRE unicode support: "/[^\S\xa0]/"
-	 * Unicode and PCRE unicode support: "/(?!\xa0)[\s\p{Z}]/u"
-	 * Unicode and PCRE unicode support in Chinese mode: "/(?!\xa0)[\s\p{Z}\p{Lo}]/u"
-	 * if PCRE unicode support is turned ON ("\P" is the negate class of "\p"):
-	 *      \s     : any whitespace character
-	 *      \p{Z}  : any separator
-	 *      \p{Lo} : Unicode letter or ideograph that does not have lowercase and uppercase variants. Is used to chunk chinese words.
-	 *      \xa0   : Unicode Character 'NO-BREAK SPACE' (U+00A0)
-	 * </pre>
-	 * @param $re (string) regular expression (leave empty for default).
-	 * @public
-	 * @since 4.6.016 (2009-06-15)
-	 */
-	public function setSpacesRE($re='/[^\S\xa0]/') {
-		$this->re_spaces = $re;
-		$re_parts = explode('/', $re);
-		// get pattern parts
-		$this->re_space = array();
-		if (isset($re_parts[1]) AND !empty($re_parts[1])) {
-			$this->re_space['p'] = $re_parts[1];
-		} else {
-			$this->re_space['p'] = '[\s]';
-		}
-		// set pattern modifiers
-		if (isset($re_parts[2]) AND !empty($re_parts[2])) {
-			$this->re_space['m'] = $re_parts[2];
-		} else {
-			$this->re_space['m'] = '';
-		}
-	}
-
-	/**
-	 * Enable or disable Right-To-Left language mode
-	 * @param $enable (Boolean) if true enable Right-To-Left language mode.
-	 * @param $resetx (Boolean) if true reset the X position on direction change.
-	 * @public
-	 * @since 2.0.000 (2008-01-03)
-	 */
-	public function setRTL($enable, $resetx=true) {
-		$enable = $enable ? true : false;
-		$resetx = ($resetx AND ($enable != $this->rtl));
-		$this->rtl = $enable;
-		$this->tmprtl = false;
-		if ($resetx) {
-			$this->Ln(0);
-		}
-	}
-
-	/**
-	 * Return the RTL status
-	 * @return boolean
-	 * @public
-	 * @since 4.0.012 (2008-07-24)
-	 */
-	public function getRTL() {
-		return $this->rtl;
-	}
-
-	/**
-	 * Force temporary RTL language direction
-	 * @param $mode (mixed) can be false, 'L' for LTR or 'R' for RTL
-	 * @public
-	 * @since 2.1.000 (2008-01-09)
-	 */
-	public function setTempRTL($mode) {
-		$newmode = false;
-		switch (strtoupper($mode)) {
-			case 'LTR':
-			case 'L': {
-				if ($this->rtl) {
-					$newmode = 'L';
-				}
-				break;
-			}
-			case 'RTL':
-			case 'R': {
-				if (!$this->rtl) {
-					$newmode = 'R';
-				}
-				break;
-			}
-			case false:
-			default: {
-				$newmode = false;
-				break;
-			}
-		}
-		$this->tmprtl = $newmode;
-	}
-
-	/**
-	 * Return the current temporary RTL status
-	 * @return boolean
-	 * @public
-	 * @since 4.8.014 (2009-11-04)
-	 */
-	public function isRTLTextDir() {
-		return ($this->rtl OR ($this->tmprtl == 'R'));
-	}
-
-	/**
-	 * Set the last cell height.
-	 * @param $h (float) cell height.
-	 * @author Nicola Asuni
-	 * @public
-	 * @since 1.53.0.TC034
-	 */
-	public function setLastH($h) {
-		$this->lasth = $h;
-	}
-
-	/**
-	 * Return the cell height
-	 * @param $fontsize (int) Font size in internal units
-	 * @param $padding (boolean) If true add cell padding
-	 * @public
-	 */
-	public function getCellHeight($fontsize, $padding=TRUE) {
-		$height = ($fontsize * $this->cell_height_ratio);
-		if ($padding) {
-			$height += ($this->cell_padding['T'] + $this->cell_padding['B']);
-		}
-		return round($height, 6);
-	}
-
-	/**
-	 * Reset the last cell height.
-	 * @public
-	 * @since 5.9.000 (2010-10-03)
-	 */
-	public function resetLastH() {
-		$this->lasth = $this->getCellHeight($this->FontSize);
-	}
-
-	/**
-	 * Get the last cell height.
-	 * @return last cell height
-	 * @public
-	 * @since 4.0.017 (2008-08-05)
-	 */
-	public function getLastH() {
-		return $this->lasth;
-	}
-
-	/**
-	 * Set the adjusting factor to convert pixels to user units.
-	 * @param $scale (float) adjusting factor to convert pixels to user units.
-	 * @author Nicola Asuni
-	 * @public
-	 * @since 1.5.2
-	 */
-	public function setImageScale($scale) {
-		$this->imgscale = $scale;
-	}
-
-	/**
-	 * Returns the adjusting factor to convert pixels to user units.
-	 * @return float adjusting factor to convert pixels to user units.
-	 * @author Nicola Asuni
-	 * @public
-	 * @since 1.5.2
-	 */
-	public function getImageScale() {
-		return $this->imgscale;
-	}
-
-	/**
-	 * Returns an array of page dimensions:
-	 * <ul><li>$this->pagedim[$this->page]['w'] = page width in points</li><li>$this->pagedim[$this->page]['h'] = height in points</li><li>$this->pagedim[$this->page]['wk'] = page width in user units</li><li>$this->pagedim[$this->page]['hk'] = page height in user units</li><li>$this->pagedim[$this->page]['tm'] = top margin</li><li>$this->pagedim[$this->page]['bm'] = bottom margin</li><li>$this->pagedim[$this->page]['lm'] = left margin</li><li>$this->pagedim[$this->page]['rm'] = right margin</li><li>$this->pagedim[$this->page]['pb'] = auto page break</li><li>$this->pagedim[$this->page]['or'] = page orientation</li><li>$this->pagedim[$this->page]['olm'] = original left margin</li><li>$this->pagedim[$this->page]['orm'] = original right margin</li><li>$this->pagedim[$this->page]['Rotate'] = The number of degrees by which the page shall be rotated clockwise when displayed or printed. The value shall be a multiple of 90.</li><li>$this->pagedim[$this->page]['PZ'] = The page's preferred zoom (magnification) factor.</li><li>$this->pagedim[$this->page]['trans'] : the style and duration of the visual transition to use when moving from another page to the given page during a presentation<ul><li>$this->pagedim[$this->page]['trans']['Dur'] = The page's display duration (also called its advance timing): the maximum length of time, in seconds, that the page shall be displayed during presentations before the viewer application shall automatically advance to the next page.</li><li>$this->pagedim[$this->page]['trans']['S'] = transition style : Split, Blinds, Box, Wipe, Dissolve, Glitter, R, Fly, Push, Cover, Uncover, Fade</li><li>$this->pagedim[$this->page]['trans']['D'] = The duration of the transition effect, in seconds.</li><li>$this->pagedim[$this->page]['trans']['Dm'] = (Split and Blinds transition styles only) The dimension in which the specified transition effect shall occur: H = Horizontal, V = Vertical. Default value: H.</li><li>$this->pagedim[$this->page]['trans']['M'] = (Split, Box and Fly transition styles only) The direction of motion for the specified transition effect: I = Inward from the edges of the page, O = Outward from the center of the pageDefault value: I.</li><li>$this->pagedim[$this->page]['trans']['Di'] = (Wipe, Glitter, Fly, Cover, Uncover and Push transition styles only) The direction in which the specified transition effect shall moves, expressed in degrees counterclockwise starting from a left-to-right direction. If the value is a number, it shall be one of: 0 = Left to right, 90 = Bottom to top (Wipe only), 180 = Right to left (Wipe only), 270 = Top to bottom, 315 = Top-left to bottom-right (Glitter only). If the value is a name, it shall be None, which is relevant only for the Fly transition when the value of SS is not 1.0. Default value: 0.</li><li>$this->pagedim[$this->page]['trans']['SS'] = (Fly transition style only) The starting or ending scale at which the changes shall be drawn. If M specifies an inward transition, the scale of the changes drawn shall progress from SS to 1.0 over the course of the transition. If M specifies an outward transition, the scale of the changes drawn shall progress from 1.0 to SS over the course of the transition. Default: 1.0. </li><li>$this->pagedim[$this->page]['trans']['B'] = (Fly transition style only) If true, the area that shall be flown in is rectangular and opaque. Default: false.</li></ul></li><li>$this->pagedim[$this->page]['MediaBox'] : the boundaries of the physical medium on which the page shall be displayed or printed<ul><li>$this->pagedim[$this->page]['MediaBox']['llx'] = lower-left x coordinate in points</li><li>$this->pagedim[$this->page]['MediaBox']['lly'] = lower-left y coordinate in points</li><li>$this->pagedim[$this->page]['MediaBox']['urx'] = upper-right x coordinate in points</li><li>$this->pagedim[$this->page]['MediaBox']['ury'] = upper-right y coordinate in points</li></ul></li><li>$this->pagedim[$this->page]['CropBox'] : the visible region of default user space<ul><li>$this->pagedim[$this->page]['CropBox']['llx'] = lower-left x coordinate in points</li><li>$this->pagedim[$this->page]['CropBox']['lly'] = lower-left y coordinate in points</li><li>$this->pagedim[$this->page]['CropBox']['urx'] = upper-right x coordinate in points</li><li>$this->pagedim[$this->page]['CropBox']['ury'] = upper-right y coordinate in points</li></ul></li><li>$this->pagedim[$this->page]['BleedBox'] : the region to which the contents of the page shall be clipped when output in a production environment<ul><li>$this->pagedim[$this->page]['BleedBox']['llx'] = lower-left x coordinate in points</li><li>$this->pagedim[$this->page]['BleedBox']['lly'] = lower-left y coordinate in points</li><li>$this->pagedim[$this->page]['BleedBox']['urx'] = upper-right x coordinate in points</li><li>$this->pagedim[$this->page]['BleedBox']['ury'] = upper-right y coordinate in points</li></ul></li><li>$this->pagedim[$this->page]['TrimBox'] : the intended dimensions of the finished page after trimming<ul><li>$this->pagedim[$this->page]['TrimBox']['llx'] = lower-left x coordinate in points</li><li>$this->pagedim[$this->page]['TrimBox']['lly'] = lower-left y coordinate in points</li><li>$this->pagedim[$this->page]['TrimBox']['urx'] = upper-right x coordinate in points</li><li>$this->pagedim[$this->page]['TrimBox']['ury'] = upper-right y coordinate in points</li></ul></li><li>$this->pagedim[$this->page]['ArtBox'] : the extent of the page's meaningful content<ul><li>$this->pagedim[$this->page]['ArtBox']['llx'] = lower-left x coordinate in points</li><li>$this->pagedim[$this->page]['ArtBox']['lly'] = lower-left y coordinate in points</li><li>$this->pagedim[$this->page]['ArtBox']['urx'] = upper-right x coordinate in points</li><li>$this->pagedim[$this->page]['ArtBox']['ury'] = upper-right y coordinate in points</li></ul></li></ul>
-	 * @param $pagenum (int) page number (empty = current page)
-	 * @return array of page dimensions.
-	 * @author Nicola Asuni
-	 * @public
-	 * @since 4.5.027 (2009-03-16)
-	 */
-	public function getPageDimensions($pagenum='') {
-		if (empty($pagenum)) {
-			$pagenum = $this->page;
-		}
-		return $this->pagedim[$pagenum];
-	}
-
-	/**
-	 * Returns the page width in units.
-	 * @param $pagenum (int) page number (empty = current page)
-	 * @return int page width.
-	 * @author Nicola Asuni
-	 * @public
-	 * @since 1.5.2
-	 * @see getPageDimensions()
-	 */
-	public function getPageWidth($pagenum='') {
-		if (empty($pagenum)) {
-			return $this->w;
-		}
-		return $this->pagedim[$pagenum]['w'];
-	}
-
-	/**
-	 * Returns the page height in units.
-	 * @param $pagenum (int) page number (empty = current page)
-	 * @return int page height.
-	 * @author Nicola Asuni
-	 * @public
-	 * @since 1.5.2
-	 * @see getPageDimensions()
-	 */
-	public function getPageHeight($pagenum='') {
-		if (empty($pagenum)) {
-			return $this->h;
-		}
-		return $this->pagedim[$pagenum]['h'];
-	}
-
-	/**
-	 * Returns the page break margin.
-	 * @param $pagenum (int) page number (empty = current page)
-	 * @return int page break margin.
-	 * @author Nicola Asuni
-	 * @public
-	 * @since 1.5.2
-	 * @see getPageDimensions()
-	 */
-	public function getBreakMargin($pagenum='') {
-		if (empty($pagenum)) {
-			return $this->bMargin;
-		}
-		return $this->pagedim[$pagenum]['bm'];
-	}
-
-	/**
-	 * Returns the scale factor (number of points in user unit).
-	 * @return int scale factor.
-	 * @author Nicola Asuni
-	 * @public
-	 * @since 1.5.2
-	 */
-	public function getScaleFactor() {
-		return $this->k;
-	}
-
-	/**
-	 * Defines the left, top and right margins.
-	 * @param $left (float) Left margin.
-	 * @param $top (float) Top margin.
-	 * @param $right (float) Right margin. Default value is the left one.
-	 * @param $keepmargins (boolean) if true overwrites the default page margins
-	 * @public
-	 * @since 1.0
-	 * @see SetLeftMargin(), SetTopMargin(), SetRightMargin(), SetAutoPageBreak()
-	 */
-	public function SetMargins($left, $top, $right=-1, $keepmargins=false) {
-		//Set left, top and right margins
-		$this->lMargin = $left;
-		$this->tMargin = $top;
-		if ($right == -1) {
-			$right = $left;
-		}
-		$this->rMargin = $right;
-		if ($keepmargins) {
-			// overwrite original values
-			$this->original_lMargin = $this->lMargin;
-			$this->original_rMargin = $this->rMargin;
-		}
-	}
-
-	/**
-	 * Defines the left margin. The method can be called before creating the first page. If the current abscissa gets out of page, it is brought back to the margin.
-	 * @param $margin (float) The margin.
-	 * @public
-	 * @since 1.4
-	 * @see SetTopMargin(), SetRightMargin(), SetAutoPageBreak(), SetMargins()
-	 */
-	public function SetLeftMargin($margin) {
-		//Set left margin
-		$this->lMargin = $margin;
-		if (($this->page > 0) AND ($this->x < $margin)) {
-			$this->x = $margin;
-		}
-	}
-
-	/**
-	 * Defines the top margin. The method can be called before creating the first page.
-	 * @param $margin (float) The margin.
-	 * @public
-	 * @since 1.5
-	 * @see SetLeftMargin(), SetRightMargin(), SetAutoPageBreak(), SetMargins()
-	 */
-	public function SetTopMargin($margin) {
-		//Set top margin
-		$this->tMargin = $margin;
-		if (($this->page > 0) AND ($this->y < $margin)) {
-			$this->y = $margin;
-		}
-	}
-
-	/**
-	 * Defines the right margin. The method can be called before creating the first page.
-	 * @param $margin (float) The margin.
-	 * @public
-	 * @since 1.5
-	 * @see SetLeftMargin(), SetTopMargin(), SetAutoPageBreak(), SetMargins()
-	 */
-	public function SetRightMargin($margin) {
-		$this->rMargin = $margin;
-		if (($this->page > 0) AND ($this->x > ($this->w - $margin))) {
-			$this->x = $this->w - $margin;
-		}
-	}
-
-	/**
-	 * Set the same internal Cell padding for top, right, bottom, left-
-	 * @param $pad (float) internal padding.
-	 * @public
-	 * @since 2.1.000 (2008-01-09)
-	 * @see getCellPaddings(), setCellPaddings()
-	 */
-	public function SetCellPadding($pad) {
-		if ($pad >= 0) {
-			$this->cell_padding['L'] = $pad;
-			$this->cell_padding['T'] = $pad;
-			$this->cell_padding['R'] = $pad;
-			$this->cell_padding['B'] = $pad;
-		}
-	}
-
-	/**
-	 * Set the internal Cell paddings.
-	 * @param $left (float) left padding
-	 * @param $top (float) top padding
-	 * @param $right (float) right padding
-	 * @param $bottom (float) bottom padding
-	 * @public
-	 * @since 5.9.000 (2010-10-03)
-	 * @see getCellPaddings(), SetCellPadding()
-	 */
-	public function setCellPaddings($left='', $top='', $right='', $bottom='') {
-		if (($left !== '') AND ($left >= 0)) {
-			$this->cell_padding['L'] = $left;
-		}
-		if (($top !== '') AND ($top >= 0)) {
-			$this->cell_padding['T'] = $top;
-		}
-		if (($right !== '') AND ($right >= 0)) {
-			$this->cell_padding['R'] = $right;
-		}
-		if (($bottom !== '') AND ($bottom >= 0)) {
-			$this->cell_padding['B'] = $bottom;
-		}
-	}
-
-	/**
-	 * Get the internal Cell padding array.
-	 * @return array of padding values
-	 * @public
-	 * @since 5.9.000 (2010-10-03)
-	 * @see setCellPaddings(), SetCellPadding()
-	 */
-	public function getCellPaddings() {
-		return $this->cell_padding;
-	}
-
-	/**
-	 * Set the internal Cell margins.
-	 * @param $left (float) left margin
-	 * @param $top (float) top margin
-	 * @param $right (float) right margin
-	 * @param $bottom (float) bottom margin
-	 * @public
-	 * @since 5.9.000 (2010-10-03)
-	 * @see getCellMargins()
-	 */
-	public function setCellMargins($left='', $top='', $right='', $bottom='') {
-		if (($left !== '') AND ($left >= 0)) {
-			$this->cell_margin['L'] = $left;
-		}
-		if (($top !== '') AND ($top >= 0)) {
-			$this->cell_margin['T'] = $top;
-		}
-		if (($right !== '') AND ($right >= 0)) {
-			$this->cell_margin['R'] = $right;
-		}
-		if (($bottom !== '') AND ($bottom >= 0)) {
-			$this->cell_margin['B'] = $bottom;
-		}
-	}
-
-	/**
-	 * Get the internal Cell margin array.
-	 * @return array of margin values
-	 * @public
-	 * @since 5.9.000 (2010-10-03)
-	 * @see setCellMargins()
-	 */
-	public function getCellMargins() {
-		return $this->cell_margin;
-	}
-
-	/**
-	 * Adjust the internal Cell padding array to take account of the line width.
-	 * @param $brd (mixed) Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
-	 * @return array of adjustments
-	 * @public
-	 * @since 5.9.000 (2010-10-03)
-	 */
-	protected function adjustCellPadding($brd=0) {
-		if (empty($brd)) {
-			return;
-		}
-		if (is_string($brd)) {
-			// convert string to array
-			$slen = strlen($brd);
-			$newbrd = array();
-			for ($i = 0; $i < $slen; ++$i) {
-				$newbrd[$brd[$i]] = true;
-			}
-			$brd = $newbrd;
-		} elseif (($brd === 1) OR ($brd === true) OR (is_numeric($brd) AND (intval($brd) > 0))) {
-			$brd = array('LRTB' => true);
-		}
-		if (!is_array($brd)) {
-			return;
-		}
-		// store current cell padding
-		$cp = $this->cell_padding;
-		// select border mode
-		if (isset($brd['mode'])) {
-			$mode = $brd['mode'];
-			unset($brd['mode']);
-		} else {
-			$mode = 'normal';
-		}
-		// process borders
-		foreach ($brd as $border => $style) {
-			$line_width = $this->LineWidth;
-			if (is_array($style) AND isset($style['width'])) {
-				// get border width
-				$line_width = $style['width'];
-			}
-			$adj = 0; // line width inside the cell
-			switch ($mode) {
-				case 'ext': {
-					$adj = 0;
-					break;
-				}
-				case 'int': {
-					$adj = $line_width;
-					break;
-				}
-				case 'normal':
-				default: {
-					$adj = ($line_width / 2);
-					break;
-				}
-			}
-			// correct internal cell padding if required to avoid overlap between text and lines
-			if ((strpos($border,'T') !== false) AND ($this->cell_padding['T'] < $adj)) {
-				$this->cell_padding['T'] = $adj;
-			}
-			if ((strpos($border,'R') !== false) AND ($this->cell_padding['R'] < $adj)) {
-				$this->cell_padding['R'] = $adj;
-			}
-			if ((strpos($border,'B') !== false) AND ($this->cell_padding['B'] < $adj)) {
-				$this->cell_padding['B'] = $adj;
-			}
-			if ((strpos($border,'L') !== false) AND ($this->cell_padding['L'] < $adj)) {
-				$this->cell_padding['L'] = $adj;
-			}
-		}
-		return array('T' => ($this->cell_padding['T'] - $cp['T']), 'R' => ($this->cell_padding['R'] - $cp['R']), 'B' => ($this->cell_padding['B'] - $cp['B']), 'L' => ($this->cell_padding['L'] - $cp['L']));
-	}
-
-	/**
-	 * Enables or disables the automatic page breaking mode. When enabling, the second parameter is the distance from the bottom of the page that defines the triggering limit. By default, the mode is on and the margin is 2 cm.
-	 * @param $auto (boolean) Boolean indicating if mode should be on or off.
-	 * @param $margin (float) Distance from the bottom of the page.
-	 * @public
-	 * @since 1.0
-	 * @see Cell(), MultiCell(), AcceptPageBreak()
-	 */
-	public function SetAutoPageBreak($auto, $margin=0) {
-		$this->AutoPageBreak = $auto ? true : false;
-		$this->bMargin = $margin;
-		$this->PageBreakTrigger = $this->h - $margin;
-	}
-
-	/**
-	 * Return the auto-page-break mode (true or false).
-	 * @return boolean auto-page-break mode
-	 * @public
-	 * @since 5.9.088
-	 */
-	public function getAutoPageBreak() {
-		return $this->AutoPageBreak;
-	}
-
-	/**
-	 * Defines the way the document is to be displayed by the viewer.
-	 * @param $zoom (mixed) The zoom to use. It can be one of the following string values or a number indicating the zooming factor to use. <ul><li>fullpage: displays the entire page on screen </li><li>fullwidth: uses maximum width of window</li><li>real: uses real size (equivalent to 100% zoom)</li><li>default: uses viewer default mode</li></ul>
-	 * @param $layout (string) The page layout. Possible values are:<ul><li>SinglePage Display one page at a time</li><li>OneColumn Display the pages in one column</li><li>TwoColumnLeft Display the pages in two columns, with odd-numbered pages on the left</li><li>TwoColumnRight Display the pages in two columns, with odd-numbered pages on the right</li><li>TwoPageLeft (PDF 1.5) Display the pages two at a time, with odd-numbered pages on the left</li><li>TwoPageRight (PDF 1.5) Display the pages two at a time, with odd-numbered pages on the right</li></ul>
-	 * @param $mode (string) A name object specifying how the document should be displayed when opened:<ul><li>UseNone Neither document outline nor thumbnail images visible</li><li>UseOutlines Document outline visible</li><li>UseThumbs Thumbnail images visible</li><li>FullScreen Full-screen mode, with no menu bar, window controls, or any other window visible</li><li>UseOC (PDF 1.5) Optional content group panel visible</li><li>UseAttachments (PDF 1.6) Attachments panel visible</li></ul>
-	 * @public
-	 * @since 1.2
-	 */
-	public function SetDisplayMode($zoom, $layout='SinglePage', $mode='UseNone') {
-		if (($zoom == 'fullpage') OR ($zoom == 'fullwidth') OR ($zoom == 'real') OR ($zoom == 'default') OR (!is_string($zoom))) {
-			$this->ZoomMode = $zoom;
-		} else {
-			$this->Error('Incorrect zoom display mode: '.$zoom);
-		}
-		$this->LayoutMode = TCPDF_STATIC::getPageLayoutMode($layout);
-		$this->PageMode = TCPDF_STATIC::getPageMode($mode);
-	}
-
-	/**
-	 * Activates or deactivates page compression. When activated, the internal representation of each page is compressed, which leads to a compression ratio of about 2 for the resulting document. Compression is on by default.
-	 * Note: the Zlib extension is required for this feature. If not present, compression will be turned off.
-	 * @param $compress (boolean) Boolean indicating if compression must be enabled.
-	 * @public
-	 * @since 1.4
-	 */
-	public function SetCompression($compress=true) {
-		if (function_exists('gzcompress')) {
-			$this->compress = $compress ? true : false;
-		} else {
-			$this->compress = false;
-		}
-	}
-
-	/**
-	 * Set flag to force sRGB_IEC61966-2.1 black scaled ICC color profile for the whole document.
-	 * @param $mode (boolean) If true force sRGB output intent.
-	 * @public
-	 * @since 5.9.121 (2011-09-28)
-	 */
-	public function setSRGBmode($mode=false) {
-		$this->force_srgb = $mode ? true : false;
-	}
-
-	/**
-	 * Turn on/off Unicode mode for document information dictionary (meta tags).
-	 * This has effect only when unicode mode is set to false.
-	 * @param $unicode (boolean) if true set the meta information in Unicode
-	 * @since 5.9.027 (2010-12-01)
-	 * @public
-	 */
-	public function SetDocInfoUnicode($unicode=true) {
-		$this->docinfounicode = $unicode ? true : false;
-	}
-
-	/**
-	 * Defines the title of the document.
-	 * @param $title (string) The title.
-	 * @public
-	 * @since 1.2
-	 * @see SetAuthor(), SetCreator(), SetKeywords(), SetSubject()
-	 */
-	public function SetTitle($title) {
-		$this->title = $title;
-	}
-
-	/**
-	 * Defines the subject of the document.
-	 * @param $subject (string) The subject.
-	 * @public
-	 * @since 1.2
-	 * @see SetAuthor(), SetCreator(), SetKeywords(), SetTitle()
-	 */
-	public function SetSubject($subject) {
-		$this->subject = $subject;
-	}
-
-	/**
-	 * Defines the author of the document.
-	 * @param $author (string) The name of the author.
-	 * @public
-	 * @since 1.2
-	 * @see SetCreator(), SetKeywords(), SetSubject(), SetTitle()
-	 */
-	public function SetAuthor($author) {
-		$this->author = $author;
-	}
-
-	/**
-	 * Associates keywords with the document, generally in the form 'keyword1 keyword2 ...'.
-	 * @param $keywords (string) The list of keywords.
-	 * @public
-	 * @since 1.2
-	 * @see SetAuthor(), SetCreator(), SetSubject(), SetTitle()
-	 */
-	public function SetKeywords($keywords) {
-		$this->keywords = $keywords;
-	}
-
-	/**
-	 * Defines the creator of the document. This is typically the name of the application that generates the PDF.
-	 * @param $creator (string) The name of the creator.
-	 * @public
-	 * @since 1.2
-	 * @see SetAuthor(), SetKeywords(), SetSubject(), SetTitle()
-	 */
-	public function SetCreator($creator) {
-		$this->creator = $creator;
-	}
-
-	/**
-	 * Throw an exception or print an error message and die if the K_TCPDF_PARSER_THROW_EXCEPTION_ERROR constant is set to true.
-	 * @param $msg (string) The error message
-	 * @public
-	 * @since 1.0
-	 */
-	public function Error($msg) {
-		// unset all class variables
-		$this->_destroy(true);
-		if (defined('K_TCPDF_THROW_EXCEPTION_ERROR') AND !K_TCPDF_THROW_EXCEPTION_ERROR) {
-			die('<strong>TCPDF ERROR: </strong>'.$msg);
-		} else {
-			throw new Exception('TCPDF ERROR: '.$msg);
-		}
-	}
-
-	/**
-	 * This method begins the generation of the PDF document.
-	 * It is not necessary to call it explicitly because AddPage() does it automatically.
-	 * Note: no page is created by this method
-	 * @public
-	 * @since 1.0
-	 * @see AddPage(), Close()
-	 */
-	public function Open() {
-		$this->state = 1;
-	}
-
-	/**
-	 * Terminates the PDF document.
-	 * It is not necessary to call this method explicitly because Output() does it automatically.
-	 * If the document contains no page, AddPage() is called to prevent from getting an invalid document.
-	 * @public
-	 * @since 1.0
-	 * @see Open(), Output()
-	 */
-	public function Close() {
-		if ($this->state == 3) {
-			return;
-		}
-		if ($this->page == 0) {
-			$this->AddPage();
-		}
-		$this->endLayer();
-		if ($this->tcpdflink) {
-			// save current graphic settings
-			$gvars = $this->getGraphicVars();
-			$this->setEqualColumns();
-			$this->lastpage(true);
-			$this->SetAutoPageBreak(false);
-			$this->x = 0;
-			$this->y = $this->h - (1 / $this->k);
-			$this->lMargin = 0;
-			$this->_outSaveGraphicsState();
-			$font = defined('PDF_FONT_NAME_MAIN')?PDF_FONT_NAME_MAIN:'helvetica';
-			$this->SetFont($font, '', 1);
-			$this->setTextRenderingMode(0, false, false);
-			$msg = "\x50\x6f\x77\x65\x72\x65\x64\x20\x62\x79\x20\x54\x43\x50\x44\x46\x20\x28\x77\x77\x77\x2e\x74\x63\x70\x64\x66\x2e\x6f\x72\x67\x29";
-			$lnk = "\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x74\x63\x70\x64\x66\x2e\x6f\x72\x67";
-			$this->Cell(0, 0, $msg, 0, 0, 'L', 0, $lnk, 0, false, 'D', 'B');
-			$this->_outRestoreGraphicsState();
-			// restore graphic settings
-			$this->setGraphicVars($gvars);
-		}
-		// close page
-		$this->endPage();
-		// close document
-		$this->_enddoc();
-		// unset all class variables (except critical ones)
-		$this->_destroy(false);
-	}
-
-	/**
-	 * Move pointer at the specified document page and update page dimensions.
-	 * @param $pnum (int) page number (1 ... numpages)
-	 * @param $resetmargins (boolean) if true reset left, right, top margins and Y position.
-	 * @public
-	 * @since 2.1.000 (2008-01-07)
-	 * @see getPage(), lastpage(), getNumPages()
-	 */
-	public function setPage($pnum, $resetmargins=false) {
-		if (($pnum == $this->page) AND ($this->state == 2)) {
-			return;
-		}
-		if (($pnum > 0) AND ($pnum <= $this->numpages)) {
-			$this->state = 2;
-			// save current graphic settings
-			//$gvars = $this->getGraphicVars();
-			$oldpage = $this->page;
-			$this->page = $pnum;
-			$this->wPt = $this->pagedim[$this->page]['w'];
-			$this->hPt = $this->pagedim[$this->page]['h'];
-			$this->w = $this->pagedim[$this->page]['wk'];
-			$this->h = $this->pagedim[$this->page]['hk'];
-			$this->tMargin = $this->pagedim[$this->page]['tm'];
-			$this->bMargin = $this->pagedim[$this->page]['bm'];
-			$this->original_lMargin = $this->pagedim[$this->page]['olm'];
-			$this->original_rMargin = $this->pagedim[$this->page]['orm'];
-			$this->AutoPageBreak = $this->pagedim[$this->page]['pb'];
-			$this->CurOrientation = $this->pagedim[$this->page]['or'];
-			$this->SetAutoPageBreak($this->AutoPageBreak, $this->bMargin);
-			// restore graphic settings
-			//$this->setGraphicVars($gvars);
-			if ($resetmargins) {
-				$this->lMargin = $this->pagedim[$this->page]['olm'];
-				$this->rMargin = $this->pagedim[$this->page]['orm'];
-				$this->SetY($this->tMargin);
-			} else {
-				// account for booklet mode
-				if ($this->pagedim[$this->page]['olm'] != $this->pagedim[$oldpage]['olm']) {
-					$deltam = $this->pagedim[$this->page]['olm'] - $this->pagedim[$this->page]['orm'];
-					$this->lMargin += $deltam;
-					$this->rMargin -= $deltam;
-				}
-			}
-		} else {
-			$this->Error('Wrong page number on setPage() function: '.$pnum);
-		}
-	}
-
-	/**
-	 * Reset pointer to the last document page.
-	 * @param $resetmargins (boolean) if true reset left, right, top margins and Y position.
-	 * @public
-	 * @since 2.0.000 (2008-01-04)
-	 * @see setPage(), getPage(), getNumPages()
-	 */
-	public function lastPage($resetmargins=false) {
-		$this->setPage($this->getNumPages(), $resetmargins);
-	}
-
-	/**
-	 * Get current document page number.
-	 * @return int page number
-	 * @public
-	 * @since 2.1.000 (2008-01-07)
-	 * @see setPage(), lastpage(), getNumPages()
-	 */
-	public function getPage() {
-		return $this->page;
-	}
-
-	/**
-	 * Get the total number of insered pages.
-	 * @return int number of pages
-	 * @public
-	 * @since 2.1.000 (2008-01-07)
-	 * @see setPage(), getPage(), lastpage()
-	 */
-	public function getNumPages() {
-		return $this->numpages;
-	}
-
-	/**
-	 * Adds a new TOC (Table Of Content) page to the document.
-	 * @param $orientation (string) page orientation.
-	 * @param $format (mixed) The format used for pages. It can be either: one of the string values specified at getPageSizeFromFormat() or an array of parameters specified at setPageFormat().
-	 * @param $keepmargins (boolean) if true overwrites the default page margins with the current margins
-	 * @public
-	 * @since 5.0.001 (2010-05-06)
-	 * @see AddPage(), startPage(), endPage(), endTOCPage()
-	 */
-	public function addTOCPage($orientation='', $format='', $keepmargins=false) {
-		$this->AddPage($orientation, $format, $keepmargins, true);
-	}
-
-	/**
-	 * Terminate the current TOC (Table Of Content) page
-	 * @public
-	 * @since 5.0.001 (2010-05-06)
-	 * @see AddPage(), startPage(), endPage(), addTOCPage()
-	 */
-	public function endTOCPage() {
-		$this->endPage(true);
-	}
-
-	/**
-	 * Adds a new page to the document. If a page is already present, the Footer() method is called first to output the footer (if enabled). Then the page is added, the current position set to the top-left corner according to the left and top margins (or top-right if in RTL mode), and Header() is called to display the header (if enabled).
-	 * The origin of the coordinate system is at the top-left corner (or top-right for RTL) and increasing ordinates go downwards.
-	 * @param $orientation (string) page orientation. Possible values are (case insensitive):<ul><li>P or PORTRAIT (default)</li><li>L or LANDSCAPE</li></ul>
-	 * @param $format (mixed) The format used for pages. It can be either: one of the string values specified at getPageSizeFromFormat() or an array of parameters specified at setPageFormat().
-	 * @param $keepmargins (boolean) if true overwrites the default page margins with the current margins
-	 * @param $tocpage (boolean) if true set the tocpage state to true (the added page will be used to display Table Of Content).
-	 * @public
-	 * @since 1.0
-	 * @see startPage(), endPage(), addTOCPage(), endTOCPage(), getPageSizeFromFormat(), setPageFormat()
-	 */
-	public function AddPage($orientation='', $format='', $keepmargins=false, $tocpage=false) {
-		if ($this->inxobj) {
-			// we are inside an XObject template
-			return;
-		}
-		if (!isset($this->original_lMargin) OR $keepmargins) {
-			$this->original_lMargin = $this->lMargin;
-		}
-		if (!isset($this->original_rMargin) OR $keepmargins) {
-			$this->original_rMargin = $this->rMargin;
-		}
-		// terminate previous page
-		$this->endPage();
-		// start new page
-		$this->startPage($orientation, $format, $tocpage);
-	}
-
-	/**
-	 * Terminate the current page
-	 * @param $tocpage (boolean) if true set the tocpage state to false (end the page used to display Table Of Content).
-	 * @public
-	 * @since 4.2.010 (2008-11-14)
-	 * @see AddPage(), startPage(), addTOCPage(), endTOCPage()
-	 */
-	public function endPage($tocpage=false) {
-		// check if page is already closed
-		if (($this->page == 0) OR ($this->numpages > $this->page) OR (!$this->pageopen[$this->page])) {
-			return;
-		}
-		// print page footer
-		$this->setFooter();
-		// close page
-		$this->_endpage();
-		// mark page as closed
-		$this->pageopen[$this->page] = false;
-		if ($tocpage) {
-			$this->tocpage = false;
-		}
-	}
-
-	/**
-	 * Starts a new page to the document. The page must be closed using the endPage() function.
-	 * The origin of the coordinate system is at the top-left corner and increasing ordinates go downwards.
-	 * @param $orientation (string) page orientation. Possible values are (case insensitive):<ul><li>P or PORTRAIT (default)</li><li>L or LANDSCAPE</li></ul>
-	 * @param $format (mixed) The format used for pages. It can be either: one of the string values specified at getPageSizeFromFormat() or an array of parameters specified at setPageFormat().
-	 * @param $tocpage (boolean) if true the page is designated to contain the Table-Of-Content.
-	 * @since 4.2.010 (2008-11-14)
-	 * @see AddPage(), endPage(), addTOCPage(), endTOCPage(), getPageSizeFromFormat(), setPageFormat()
-	 * @public
-	 */
-	public function startPage($orientation='', $format='', $tocpage=false) {
-		if ($tocpage) {
-			$this->tocpage = true;
-		}
-		// move page numbers of documents to be attached
-		if ($this->tocpage) {
-			// move reference to unexistent pages (used for page attachments)
-			// adjust outlines
-			$tmpoutlines = $this->outlines;
-			foreach ($tmpoutlines as $key => $outline) {
-				if (!$outline['f'] AND ($outline['p'] > $this->numpages)) {
-					$this->outlines[$key]['p'] = ($outline['p'] + 1);
-				}
-			}
-			// adjust dests
-			$tmpdests = $this->dests;
-			foreach ($tmpdests as $key => $dest) {
-				if (!$dest['f'] AND ($dest['p'] > $this->numpages)) {
-					$this->dests[$key]['p'] = ($dest['p'] + 1);
-				}
-			}
-			// adjust links
-			$tmplinks = $this->links;
-			foreach ($tmplinks as $key => $link) {
-				if (!$link['f'] AND ($link['p'] > $this->numpages)) {
-					$this->links[$key]['p'] = ($link['p'] + 1);
-				}
-			}
-		}
-		if ($this->numpages > $this->page) {
-			// this page has been already added
-			$this->setPage($this->page + 1);
-			$this->SetY($this->tMargin);
-			return;
-		}
-		// start a new page
-		if ($this->state == 0) {
-			$this->Open();
-		}
-		++$this->numpages;
-		$this->swapMargins($this->booklet);
-		// save current graphic settings
-		$gvars = $this->getGraphicVars();
-		// start new page
-		$this->_beginpage($orientation, $format);
-		// mark page as open
-		$this->pageopen[$this->page] = true;
-		// restore graphic settings
-		$this->setGraphicVars($gvars);
-		// mark this point
-		$this->setPageMark();
-		// print page header
-		$this->setHeader();
-		// restore graphic settings
-		$this->setGraphicVars($gvars);
-		// mark this point
-		$this->setPageMark();
-		// print table header (if any)
-		$this->setTableHeader();
-		// set mark for empty page check
-		$this->emptypagemrk[$this->page]= $this->pagelen[$this->page];
-	}
-
-	/**
-	 * Set start-writing mark on current page stream used to put borders and fills.
-	 * Borders and fills are always created after content and inserted on the position marked by this method.
-	 * This function must be called after calling Image() function for a background image.
-	 * Background images must be always inserted before calling Multicell() or WriteHTMLCell() or WriteHTML() functions.
-	 * @public
-	 * @since 4.0.016 (2008-07-30)
-	 */
-	public function setPageMark() {
-		$this->intmrk[$this->page] = $this->pagelen[$this->page];
-		$this->bordermrk[$this->page] = $this->intmrk[$this->page];
-		$this->setContentMark();
-	}
-
-	/**
-	 * Set start-writing mark on selected page.
-	 * Borders and fills are always created after content and inserted on the position marked by this method.
-	 * @param $page (int) page number (default is the current page)
-	 * @protected
-	 * @since 4.6.021 (2009-07-20)
-	 */
-	protected function setContentMark($page=0) {
-		if ($page <= 0) {
-			$page = $this->page;
-		}
-		if (isset($this->footerlen[$page])) {
-			$this->cntmrk[$page] = $this->pagelen[$page] - $this->footerlen[$page];
-		} else {
-			$this->cntmrk[$page] = $this->pagelen[$page];
-		}
-	}
-
-	/**
-	 * Set header data.
-	 * @param $ln (string) header image logo
-	 * @param $lw (string) header image logo width in mm
-	 * @param $ht (string) string to print as title on document header
-	 * @param $hs (string) string to print on document header
-	 * @param $tc (array) RGB array color for text.
-	 * @param $lc (array) RGB array color for line.
-	 * @public
-	 */
-	public function setHeaderData($ln='', $lw=0, $ht='', $hs='', $tc=array(0,0,0), $lc=array(0,0,0)) {
-		$this->header_logo = $ln;
-		$this->header_logo_width = $lw;
-		$this->header_title = $ht;
-		$this->header_string = $hs;
-		$this->header_text_color = $tc;
-		$this->header_line_color = $lc;
-	}
-
-	/**
-	 * Set footer data.
-	 * @param $tc (array) RGB array color for text.
-	 * @param $lc (array) RGB array color for line.
-	 * @public
-	 */
-	public function setFooterData($tc=array(0,0,0), $lc=array(0,0,0)) {
-		$this->footer_text_color = $tc;
-		$this->footer_line_color = $lc;
-	}
-
-	/**
-	 * Returns header data:
-	 * <ul><li>$ret['logo'] = logo image</li><li>$ret['logo_width'] = width of the image logo in user units</li><li>$ret['title'] = header title</li><li>$ret['string'] = header description string</li></ul>
-	 * @return array()
-	 * @public
-	 * @since 4.0.012 (2008-07-24)
-	 */
-	public function getHeaderData() {
-		$ret = array();
-		$ret['logo'] = $this->header_logo;
-		$ret['logo_width'] = $this->header_logo_width;
-		$ret['title'] = $this->header_title;
-		$ret['string'] = $this->header_string;
-		$ret['text_color'] = $this->header_text_color;
-		$ret['line_color'] = $this->header_line_color;
-		return $ret;
-	}
-
-	/**
-	 * Set header margin.
-	 * (minimum distance between header and top page margin)
-	 * @param $hm (int) distance in user units
-	 * @public
-	 */
-	public function setHeaderMargin($hm=10) {
-		$this->header_margin = $hm;
-	}
-
-	/**
-	 * Returns header margin in user units.
-	 * @return float
-	 * @since 4.0.012 (2008-07-24)
-	 * @public
-	 */
-	public function getHeaderMargin() {
-		return $this->header_margin;
-	}
-
-	/**
-	 * Set footer margin.
-	 * (minimum distance between footer and bottom page margin)
-	 * @param $fm (int) distance in user units
-	 * @public
-	 */
-	public function setFooterMargin($fm=10) {
-		$this->footer_margin = $fm;
-	}
-
-	/**
-	 * Returns footer margin in user units.
-	 * @return float
-	 * @since 4.0.012 (2008-07-24)
-	 * @public
-	 */
-	public function getFooterMargin() {
-		return $this->footer_margin;
-	}
-	/**
-	 * Set a flag to print page header.
-	 * @param $val (boolean) set to true to print the page header (default), false otherwise.
-	 * @public
-	 */
-	public function setPrintHeader($val=true) {
-		$this->print_header = $val ? true : false;
-	}
-
-	/**
-	 * Set a flag to print page footer.
-	 * @param $val (boolean) set to true to print the page footer (default), false otherwise.
-	 * @public
-	 */
-	public function setPrintFooter($val=true) {
-		$this->print_footer = $val ? true : false;
-	}
-
-	/**
-	 * Return the right-bottom (or left-bottom for RTL) corner X coordinate of last inserted image
-	 * @return float
-	 * @public
-	 */
-	public function getImageRBX() {
-		return $this->img_rb_x;
-	}
-
-	/**
-	 * Return the right-bottom (or left-bottom for RTL) corner Y coordinate of last inserted image
-	 * @return float
-	 * @public
-	 */
-	public function getImageRBY() {
-		return $this->img_rb_y;
-	}
-
-	/**
-	 * Reset the xobject template used by Header() method.
-	 * @public
-	 */
-	public function resetHeaderTemplate() {
-		$this->header_xobjid = false;
-	}
-
-	/**
-	 * Set a flag to automatically reset the xobject template used by Header() method at each page.
-	 * @param $val (boolean) set to true to reset Header xobject template at each page, false otherwise.
-	 * @public
-	 */
-	public function setHeaderTemplateAutoreset($val=true) {
-		$this->header_xobj_autoreset = $val ? true : false;
-	}
-
-	/**
-	 * This method is used to render the page header.
-	 * It is automatically called by AddPage() and could be overwritten in your own inherited class.
-	 * @public
-	 */
-	public function Header() {
-		if ($this->header_xobjid === false) {
-			// start a new XObject Template
-			$this->header_xobjid = $this->startTemplate($this->w, $this->tMargin);
-			$headerfont = $this->getHeaderFont();
-			$headerdata = $this->getHeaderData();
-			$this->y = $this->header_margin;
-			if ($this->rtl) {
-				$this->x = $this->w - $this->original_rMargin;
-			} else {
-				$this->x = $this->original_lMargin;
-			}
-			if (($headerdata['logo']) AND ($headerdata['logo'] != K_BLANK_IMAGE)) {
-				$imgtype = TCPDF_IMAGES::getImageFileType(K_PATH_IMAGES.$headerdata['logo']);
-				if (($imgtype == 'eps') OR ($imgtype == 'ai')) {
-					$this->ImageEps(K_PATH_IMAGES.$headerdata['logo'], '', '', $headerdata['logo_width']);
-				} elseif ($imgtype == 'svg') {
-					$this->ImageSVG(K_PATH_IMAGES.$headerdata['logo'], '', '', $headerdata['logo_width']);
-				} else {
-					$this->Image(K_PATH_IMAGES.$headerdata['logo'], '', '', $headerdata['logo_width']);
-				}
-				$imgy = $this->getImageRBY();
-			} else {
-				$imgy = $this->y;
-			}
-			$cell_height = $this->getCellHeight($headerfont[2] / $this->k);
-			// set starting margin for text data cell
-			if ($this->getRTL()) {
-				$header_x = $this->original_rMargin + ($headerdata['logo_width'] * 1.1);
-			} else {
-				$header_x = $this->original_lMargin + ($headerdata['logo_width'] * 1.1);
-			}
-			$cw = $this->w - $this->original_lMargin - $this->original_rMargin - ($headerdata['logo_width'] * 1.1);
-			$this->SetTextColorArray($this->header_text_color);
-			// header title
-			$this->SetFont($headerfont[0], 'B', $headerfont[2] + 1);
-			$this->SetX($header_x);
-			$this->Cell($cw, $cell_height, $headerdata['title'], 0, 1, '', 0, '', 0);
-			// header string
-			$this->SetFont($headerfont[0], $headerfont[1], $headerfont[2]);
-			$this->SetX($header_x);
-			$this->MultiCell($cw, $cell_height, $headerdata['string'], 0, '', 0, 1, '', '', true, 0, false, true, 0, 'T', false);
-			// print an ending header line
-			$this->SetLineStyle(array('width' => 0.85 / $this->k, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => $headerdata['line_color']));
-			$this->SetY((2.835 / $this->k) + max($imgy, $this->y));
-			if ($this->rtl) {
-				$this->SetX($this->original_rMargin);
-			} else {
-				$this->SetX($this->original_lMargin);
-			}
-			$this->Cell(($this->w - $this->original_lMargin - $this->original_rMargin), 0, '', 'T', 0, 'C');
-			$this->endTemplate();
-		}
-		// print header template
-		$x = 0;
-		$dx = 0;
-		if (!$this->header_xobj_autoreset AND $this->booklet AND (($this->page % 2) == 0)) {
-			// adjust margins for booklet mode
-			$dx = ($this->original_lMargin - $this->original_rMargin);
-		}
-		if ($this->rtl) {
-			$x = $this->w + $dx;
-		} else {
-			$x = 0 + $dx;
-		}
-		$this->printTemplate($this->header_xobjid, $x, 0, 0, 0, '', '', false);
-		if ($this->header_xobj_autoreset) {
-			// reset header xobject template at each page
-			$this->header_xobjid = false;
-		}
-	}
-
-	/**
-	 * This method is used to render the page footer.
-	 * It is automatically called by AddPage() and could be overwritten in your own inherited class.
-	 * @public
-	 */
-	public function Footer() {
-		$cur_y = $this->y;
-		$this->SetTextColorArray($this->footer_text_color);
-		//set style for cell border
-		$line_width = (0.85 / $this->k);
-		$this->SetLineStyle(array('width' => $line_width, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => $this->footer_line_color));
-		//print document barcode
-		$barcode = $this->getBarcode();
-		if (!empty($barcode)) {
-			$this->Ln($line_width);
-			$barcode_width = round(($this->w - $this->original_lMargin - $this->original_rMargin) / 3);
-			$style = array(
-				'position' => $this->rtl?'R':'L',
-				'align' => $this->rtl?'R':'L',
-				'stretch' => false,
-				'fitwidth' => true,
-				'cellfitalign' => '',
-				'border' => false,
-				'padding' => 0,
-				'fgcolor' => array(0,0,0),
-				'bgcolor' => false,
-				'text' => false
-			);
-			$this->write1DBarcode($barcode, 'C128', '', $cur_y + $line_width, '', (($this->footer_margin / 3) - $line_width), 0.3, $style, '');
-		}
-		$w_page = isset($this->l['w_page']) ? $this->l['w_page'].' ' : '';
-		if (empty($this->pagegroups)) {
-			$pagenumtxt = $w_page.$this->getAliasNumPage().' / '.$this->getAliasNbPages();
-		} else {
-			$pagenumtxt = $w_page.$this->getPageNumGroupAlias().' / '.$this->getPageGroupAlias();
-		}
-		$this->SetY($cur_y);
-		//Print page number
-		if ($this->getRTL()) {
-			$this->SetX($this->original_rMargin);
-			$this->Cell(0, 0, $pagenumtxt, 'T', 0, 'L');
-		} else {
-			$this->SetX($this->original_lMargin);
-			$this->Cell(0, 0, $this->getAliasRightShift().$pagenumtxt, 'T', 0, 'R');
-		}
-	}
-
-	/**
-	 * This method is used to render the page header.
-	 * @protected
-	 * @since 4.0.012 (2008-07-24)
-	 */
-	protected function setHeader() {
-		if (!$this->print_header OR ($this->state != 2)) {
-			return;
-		}
-		$this->InHeader = true;
-		$this->setGraphicVars($this->default_graphic_vars);
-		$temp_thead = $this->thead;
-		$temp_theadMargins = $this->theadMargins;
-		$lasth = $this->lasth;
-		$newline = $this->newline;
-		$this->_outSaveGraphicsState();
-		$this->rMargin = $this->original_rMargin;
-		$this->lMargin = $this->original_lMargin;
-		$this->SetCellPadding(0);
-		//set current position
-		if ($this->rtl) {
-			$this->SetXY($this->original_rMargin, $this->header_margin);
-		} else {
-			$this->SetXY($this->original_lMargin, $this->header_margin);
-		}
-		$this->SetFont($this->header_font[0], $this->header_font[1], $this->header_font[2]);
-		$this->Header();
-		//restore position
-		if ($this->rtl) {
-			$this->SetXY($this->original_rMargin, $this->tMargin);
-		} else {
-			$this->SetXY($this->original_lMargin, $this->tMargin);
-		}
-		$this->_outRestoreGraphicsState();
-		$this->lasth = $lasth;
-		$this->thead = $temp_thead;
-		$this->theadMargins = $temp_theadMargins;
-		$this->newline = $newline;
-		$this->InHeader = false;
-	}
-
-	/**
-	 * This method is used to render the page footer.
-	 * @protected
-	 * @since 4.0.012 (2008-07-24)
-	 */
-	protected function setFooter() {
-		if ($this->state != 2) {
-			return;
-		}
-		$this->InFooter = true;
-		// save current graphic settings
-		$gvars = $this->getGraphicVars();
-		// mark this point
-		$this->footerpos[$this->page] = $this->pagelen[$this->page];
-		$this->_out("\n");
-		if ($this->print_footer) {
-			$this->setGraphicVars($this->default_graphic_vars);
-			$this->current_column = 0;
-			$this->num_columns = 1;
-			$temp_thead = $this->thead;
-			$temp_theadMargins = $this->theadMargins;
-			$lasth = $this->lasth;
-			$this->_outSaveGraphicsState();
-			$this->rMargin = $this->original_rMargin;
-			$this->lMargin = $this->original_lMargin;
-			$this->SetCellPadding(0);
-			//set current position
-			$footer_y = $this->h - $this->footer_margin;
-			if ($this->rtl) {
-				$this->SetXY($this->original_rMargin, $footer_y);
-			} else {
-				$this->SetXY($this->original_lMargin, $footer_y);
-			}
-			$this->SetFont($this->footer_font[0], $this->footer_font[1], $this->footer_font[2]);
-			$this->Footer();
-			//restore position
-			if ($this->rtl) {
-				$this->SetXY($this->original_rMargin, $this->tMargin);
-			} else {
-				$this->SetXY($this->original_lMargin, $this->tMargin);
-			}
-			$this->_outRestoreGraphicsState();
-			$this->lasth = $lasth;
-			$this->thead = $temp_thead;
-			$this->theadMargins = $temp_theadMargins;
-		}
-		// restore graphic settings
-		$this->setGraphicVars($gvars);
-		$this->current_column = $gvars['current_column'];
-		$this->num_columns = $gvars['num_columns'];
-		// calculate footer length
-		$this->footerlen[$this->page] = $this->pagelen[$this->page] - $this->footerpos[$this->page] + 1;
-		$this->InFooter = false;
-	}
-
-	/**
-	 * Check if we are on the page body (excluding page header and footer).
-	 * @return true if we are not in page header nor in page footer, false otherwise.
-	 * @protected
-	 * @since 5.9.091 (2011-06-15)
-	 */
-	protected function inPageBody() {
-		return (($this->InHeader === false) AND ($this->InFooter === false));
-	}
-
-	/**
-	 * This method is used to render the table header on new page (if any).
-	 * @protected
-	 * @since 4.5.030 (2009-03-25)
-	 */
-	protected function setTableHeader() {
-		if ($this->num_columns > 1) {
-			// multi column mode
-			return;
-		}
-		if (isset($this->theadMargins['top'])) {
-			// restore the original top-margin
-			$this->tMargin = $this->theadMargins['top'];
-			$this->pagedim[$this->page]['tm'] = $this->tMargin;
-			$this->y = $this->tMargin;
-		}
-		if (!TCPDF_STATIC::empty_string($this->thead) AND (!$this->inthead)) {
-			// set margins
-			$prev_lMargin = $this->lMargin;
-			$prev_rMargin = $this->rMargin;
-			$prev_cell_padding = $this->cell_padding;
-			$this->lMargin = $this->theadMargins['lmargin'] + ($this->pagedim[$this->page]['olm'] - $this->pagedim[$this->theadMargins['page']]['olm']);
-			$this->rMargin = $this->theadMargins['rmargin'] + ($this->pagedim[$this->page]['orm'] - $this->pagedim[$this->theadMargins['page']]['orm']);
-			$this->cell_padding = $this->theadMargins['cell_padding'];
-			if ($this->rtl) {
-				$this->x = $this->w - $this->rMargin;
-			} else {
-				$this->x = $this->lMargin;
-			}
-			// account for special "cell" mode
-			if ($this->theadMargins['cell']) {
-				if ($this->rtl) {
-					$this->x -= $this->cell_padding['R'];
-				} else {
-					$this->x += $this->cell_padding['L'];
-				}
-			}
-			$gvars = $this->getGraphicVars();
-			if (!empty($this->theadMargins['gvars'])) {
-				// set the correct graphic style
-				$this->setGraphicVars($this->theadMargins['gvars']);
-				$this->rMargin = $gvars['rMargin'];
-				$this->lMargin = $gvars['lMargin'];
-			}
-			// print table header
-			$this->writeHTML($this->thead, false, false, false, false, '');
-			$this->setGraphicVars($gvars);
-			// set new top margin to skip the table headers
-			if (!isset($this->theadMargins['top'])) {
-				$this->theadMargins['top'] = $this->tMargin;
-			}
-			// store end of header position
-			if (!isset($this->columns[0]['th'])) {
-				$this->columns[0]['th'] = array();
-			}
-			$this->columns[0]['th']['\''.$this->page.'\''] = $this->y;
-			$this->tMargin = $this->y;
-			$this->pagedim[$this->page]['tm'] = $this->tMargin;
-			$this->lasth = 0;
-			$this->lMargin = $prev_lMargin;
-			$this->rMargin = $prev_rMargin;
-			$this->cell_padding = $prev_cell_padding;
-		}
-	}
-
-	/**
-	 * Returns the current page number.
-	 * @return int page number
-	 * @public
-	 * @since 1.0
-	 * @see getAliasNbPages()
-	 */
-	public function PageNo() {
-		return $this->page;
-	}
-
-	/**
-	 * Returns the array of spot colors.
-	 * @return (array) Spot colors array.
-	 * @public
-	 * @since 6.0.038 (2013-09-30)
-	 */
-	public function getAllSpotColors() {
-		return $this->spot_colors;
-	}
-
-	/**
-	 * Defines a new spot color.
-	 * It can be expressed in RGB components or gray scale.
-	 * The method can be called before the first page is created and the value is retained from page to page.
-	 * @param $name (string) Full name of the spot color.
-	 * @param $c (float) Cyan color for CMYK. Value between 0 and 100.
-	 * @param $m (float) Magenta color for CMYK. Value between 0 and 100.
-	 * @param $y (float) Yellow color for CMYK. Value between 0 and 100.
-	 * @param $k (float) Key (Black) color for CMYK. Value between 0 and 100.
-	 * @public
-	 * @since 4.0.024 (2008-09-12)
-	 * @see SetDrawSpotColor(), SetFillSpotColor(), SetTextSpotColor()
-	 */
-	public function AddSpotColor($name, $c, $m, $y, $k) {
-		if (!isset($this->spot_colors[$name])) {
-			$i = (1 + count($this->spot_colors));
-			$this->spot_colors[$name] = array('C' => $c, 'M' => $m, 'Y' => $y, 'K' => $k, 'name' => $name, 'i' => $i);
-		}
-	}
-
-	/**
-	 * Set the spot color for the specified type ('draw', 'fill', 'text').
-	 * @param $type (string) Type of object affected by this color: ('draw', 'fill', 'text').
-	 * @param $name (string) Name of the spot color.
-	 * @param $tint (float) Intensity of the color (from 0 to 100 ; 100 = full intensity by default).
-	 * @return (string) PDF color command.
-	 * @public
-	 * @since 5.9.125 (2011-10-03)
-	 */
-	public function setSpotColor($type, $name, $tint=100) {
-		$spotcolor = TCPDF_COLORS::getSpotColor($name, $this->spot_colors);
-		if ($spotcolor === false) {
-			$this->Error('Undefined spot color: '.$name.', you must add it using the AddSpotColor() method.');
-		}
-		$tint = (max(0, min(100, $tint)) / 100);
-		$pdfcolor = sprintf('/CS%d ', $this->spot_colors[$name]['i']);
-		switch ($type) {
-			case 'draw': {
-				$pdfcolor .= sprintf('CS %F SCN', $tint);
-				$this->DrawColor = $pdfcolor;
-				$this->strokecolor = $spotcolor;
-				break;
-			}
-			case 'fill': {
-				$pdfcolor .= sprintf('cs %F scn', $tint);
-				$this->FillColor = $pdfcolor;
-				$this->bgcolor = $spotcolor;
-				break;
-			}
-			case 'text': {
-				$pdfcolor .= sprintf('cs %F scn', $tint);
-				$this->TextColor = $pdfcolor;
-				$this->fgcolor = $spotcolor;
-				break;
-			}
-		}
-		$this->ColorFlag = ($this->FillColor != $this->TextColor);
-		if ($this->state == 2) {
-			$this->_out($pdfcolor);
-		}
-		if ($this->inxobj) {
-			// we are inside an XObject template
-			$this->xobjects[$this->xobjid]['spot_colors'][$name] = $this->spot_colors[$name];
-		}
-		return $pdfcolor;
-	}
-
-	/**
-	 * Defines the spot color used for all drawing operations (lines, rectangles and cell borders).
-	 * @param $name (string) Name of the spot color.
-	 * @param $tint (float) Intensity of the color (from 0 to 100 ; 100 = full intensity by default).
-	 * @public
-	 * @since 4.0.024 (2008-09-12)
-	 * @see AddSpotColor(), SetFillSpotColor(), SetTextSpotColor()
-	 */
-	public function SetDrawSpotColor($name, $tint=100) {
-		$this->setSpotColor('draw', $name, $tint);
-	}
-
-	/**
-	 * Defines the spot color used for all filling operations (filled rectangles and cell backgrounds).
-	 * @param $name (string) Name of the spot color.
-	 * @param $tint (float) Intensity of the color (from 0 to 100 ; 100 = full intensity by default).
-	 * @public
-	 * @since 4.0.024 (2008-09-12)
-	 * @see AddSpotColor(), SetDrawSpotColor(), SetTextSpotColor()
-	 */
-	public function SetFillSpotColor($name, $tint=100) {
-		$this->setSpotColor('fill', $name, $tint);
-	}
-
-	/**
-	 * Defines the spot color used for text.
-	 * @param $name (string) Name of the spot color.
-	 * @param $tint (int) Intensity of the color (from 0 to 100 ; 100 = full intensity by default).
-	 * @public
-	 * @since 4.0.024 (2008-09-12)
-	 * @see AddSpotColor(), SetDrawSpotColor(), SetFillSpotColor()
-	 */
-	public function SetTextSpotColor($name, $tint=100) {
-		$this->setSpotColor('text', $name, $tint);
-	}
-
-	/**
-	 * Set the color array for the specified type ('draw', 'fill', 'text').
-	 * It can be expressed in RGB, CMYK or GRAY SCALE components.
-	 * The method can be called before the first page is created and the value is retained from page to page.
-	 * @param $type (string) Type of object affected by this color: ('draw', 'fill', 'text').
-	 * @param $color (array) Array of colors (1=gray, 3=RGB, 4=CMYK or 5=spotcolor=CMYK+name values).
-	 * @param $ret (boolean) If true do not send the PDF command.
-	 * @return (string) The PDF command or empty string.
-	 * @public
-	 * @since 3.1.000 (2008-06-11)
-	 */
-	public function setColorArray($type, $color, $ret=false) {
-		if (is_array($color)) {
-			$color = array_values($color);
-			// component: grey, RGB red or CMYK cyan
-			$c = isset($color[0]) ? $color[0] : -1;
-			// component: RGB green or CMYK magenta
-			$m = isset($color[1]) ? $color[1] : -1;
-			// component: RGB blue or CMYK yellow
-			$y = isset($color[2]) ? $color[2] : -1;
-			// component: CMYK black
-			$k = isset($color[3]) ? $color[3] : -1;
-			// color name
-			$name = isset($color[4]) ? $color[4] : '';
-			if ($c >= 0) {
-				return $this->setColor($type, $c, $m, $y, $k, $ret, $name);
-			}
-		}
-		return '';
-	}
-
-	/**
-	 * Defines the color used for all drawing operations (lines, rectangles and cell borders).
-	 * It can be expressed in RGB, CMYK or GRAY SCALE components.
-	 * The method can be called before the first page is created and the value is retained from page to page.
-	 * @param $color (array) Array of colors (1, 3 or 4 values).
-	 * @param $ret (boolean) If true do not send the PDF command.
-	 * @return string the PDF command
-	 * @public
-	 * @since 3.1.000 (2008-06-11)
-	 * @see SetDrawColor()
-	 */
-	public function SetDrawColorArray($color, $ret=false) {
-		return $this->setColorArray('draw', $color, $ret);
-	}
-
-	/**
-	 * Defines the color used for all filling operations (filled rectangles and cell backgrounds).
-	 * It can be expressed in RGB, CMYK or GRAY SCALE components.
-	 * The method can be called before the first page is created and the value is retained from page to page.
-	 * @param $color (array) Array of colors (1, 3 or 4 values).
-	 * @param $ret (boolean) If true do not send the PDF command.
-	 * @public
-	 * @since 3.1.000 (2008-6-11)
-	 * @see SetFillColor()
-	 */
-	public function SetFillColorArray($color, $ret=false) {
-		return $this->setColorArray('fill', $color, $ret);
-	}
-
-	/**
-	 * Defines the color used for text. It can be expressed in RGB components or gray scale.
-	 * The method can be called before the first page is created and the value is retained from page to page.
-	 * @param $color (array) Array of colors (1, 3 or 4 values).
-	 * @param $ret (boolean) If true do not send the PDF command.
-	 * @public
-	 * @since 3.1.000 (2008-6-11)
-	 * @see SetFillColor()
-	 */
-	public function SetTextColorArray($color, $ret=false) {
-		return $this->setColorArray('text', $color, $ret);
-	}
-
-	/**
-	 * Defines the color used by the specified type ('draw', 'fill', 'text').
-	 * @param $type (string) Type of object affected by this color: ('draw', 'fill', 'text').
-	 * @param $col1 (float) GRAY level for single color, or Red color for RGB (0-255), or CYAN color for CMYK (0-100).
-	 * @param $col2 (float) GREEN color for RGB (0-255), or MAGENTA color for CMYK (0-100).
-	 * @param $col3 (float) BLUE color for RGB (0-255), or YELLOW color for CMYK (0-100).
-	 * @param $col4 (float) KEY (BLACK) color for CMYK (0-100).
-	 * @param $ret (boolean) If true do not send the command.
-	 * @param $name (string) spot color name (if any)
-	 * @return (string) The PDF command or empty string.
-	 * @public
-	 * @since 5.9.125 (2011-10-03)
-	 */
-	public function setColor($type, $col1=0, $col2=-1, $col3=-1, $col4=-1, $ret=false, $name='') {
-		// set default values
-		if (!is_numeric($col1)) {
-			$col1 = 0;
-		}
-		if (!is_numeric($col2)) {
-			$col2 = -1;
-		}
-		if (!is_numeric($col3)) {
-			$col3 = -1;
-		}
-		if (!is_numeric($col4)) {
-			$col4 = -1;
-		}
-		// set color by case
-		$suffix = '';
-		if (($col2 == -1) AND ($col3 == -1) AND ($col4 == -1)) {
-			// Grey scale
-			$col1 = max(0, min(255, $col1));
-			$intcolor = array('G' => $col1);
-			$pdfcolor = sprintf('%F ', ($col1 / 255));
-			$suffix = 'g';
-		} elseif ($col4 == -1) {
-			// RGB
-			$col1 = max(0, min(255, $col1));
-			$col2 = max(0, min(255, $col2));
-			$col3 = max(0, min(255, $col3));
-			$intcolor = array('R' => $col1, 'G' => $col2, 'B' => $col3);
-			$pdfcolor = sprintf('%F %F %F ', ($col1 / 255), ($col2 / 255), ($col3 / 255));
-			$suffix = 'rg';
-		} else {
-			$col1 = max(0, min(100, $col1));
-			$col2 = max(0, min(100, $col2));
-			$col3 = max(0, min(100, $col3));
-			$col4 = max(0, min(100, $col4));
-			if (empty($name)) {
-				// CMYK
-				$intcolor = array('C' => $col1, 'M' => $col2, 'Y' => $col3, 'K' => $col4);
-				$pdfcolor = sprintf('%F %F %F %F ', ($col1 / 100), ($col2 / 100), ($col3 / 100), ($col4 / 100));
-				$suffix = 'k';
-			} else {
-				// SPOT COLOR
-				$intcolor = array('C' => $col1, 'M' => $col2, 'Y' => $col3, 'K' => $col4, 'name' => $name);
-				$this->AddSpotColor($name, $col1, $col2, $col3, $col4);
-				$pdfcolor = $this->setSpotColor($type, $name, 100);
-			}
-		}
-		switch ($type) {
-			case 'draw': {
-				$pdfcolor .= strtoupper($suffix);
-				$this->DrawColor = $pdfcolor;
-				$this->strokecolor = $intcolor;
-				break;
-			}
-			case 'fill': {
-				$pdfcolor .= $suffix;
-				$this->FillColor = $pdfcolor;
-				$this->bgcolor = $intcolor;
-				break;
-			}
-			case 'text': {
-				$pdfcolor .= $suffix;
-				$this->TextColor = $pdfcolor;
-				$this->fgcolor = $intcolor;
-				break;
-			}
-		}
-		$this->ColorFlag = ($this->FillColor != $this->TextColor);
-		if (($type != 'text') AND ($this->state == 2)) {
-			if (!$ret) {
-				$this->_out($pdfcolor);
-			}
-			return $pdfcolor;
-		}
-		return '';
-	}
-
-	/**
-	 * Defines the color used for all drawing operations (lines, rectangles and cell borders). It can be expressed in RGB components or gray scale. The method can be called before the first page is created and the value is retained from page to page.
-	 * @param $col1 (float) GRAY level for single color, or Red color for RGB (0-255), or CYAN color for CMYK (0-100).
-	 * @param $col2 (float) GREEN color for RGB (0-255), or MAGENTA color for CMYK (0-100).
-	 * @param $col3 (float) BLUE color for RGB (0-255), or YELLOW color for CMYK (0-100).
-	 * @param $col4 (float) KEY (BLACK) color for CMYK (0-100).
-	 * @param $ret (boolean) If true do not send the command.
-	 * @param $name (string) spot color name (if any)
-	 * @return string the PDF command
-	 * @public
-	 * @since 1.3
-	 * @see SetDrawColorArray(), SetFillColor(), SetTextColor(), Line(), Rect(), Cell(), MultiCell()
-	 */
-	public function SetDrawColor($col1=0, $col2=-1, $col3=-1, $col4=-1, $ret=false, $name='') {
-		return $this->setColor('draw', $col1, $col2, $col3, $col4, $ret, $name);
-	}
-
-	/**
-	 * Defines the color used for all filling operations (filled rectangles and cell backgrounds). It can be expressed in RGB components or gray scale. The method can be called before the first page is created and the value is retained from page to page.
-	 * @param $col1 (float) GRAY level for single color, or Red color for RGB (0-255), or CYAN color for CMYK (0-100).
-	 * @param $col2 (float) GREEN color for RGB (0-255), or MAGENTA color for CMYK (0-100).
-	 * @param $col3 (float) BLUE color for RGB (0-255), or YELLOW color for CMYK (0-100).
-	 * @param $col4 (float) KEY (BLACK) color for CMYK (0-100).
-	 * @param $ret (boolean) If true do not send the command.
-	 * @param $name (string) Spot color name (if any).
-	 * @return (string) The PDF command.
-	 * @public
-	 * @since 1.3
-	 * @see SetFillColorArray(), SetDrawColor(), SetTextColor(), Rect(), Cell(), MultiCell()
-	 */
-	public function SetFillColor($col1=0, $col2=-1, $col3=-1, $col4=-1, $ret=false, $name='') {
-		return $this->setColor('fill', $col1, $col2, $col3, $col4, $ret, $name);
-	}
-
-	/**
-	 * Defines the color used for text. It can be expressed in RGB components or gray scale. The method can be called before the first page is created and the value is retained from page to page.
-	 * @param $col1 (float) GRAY level for single color, or Red color for RGB (0-255), or CYAN color for CMYK (0-100).
-	 * @param $col2 (float) GREEN color for RGB (0-255), or MAGENTA color for CMYK (0-100).
-	 * @param $col3 (float) BLUE color for RGB (0-255), or YELLOW color for CMYK (0-100).
-	 * @param $col4 (float) KEY (BLACK) color for CMYK (0-100).
-	 * @param $ret (boolean) If true do not send the command.
-	 * @param $name (string) Spot color name (if any).
-	 * @return (string) Empty string.
-	 * @public
-	 * @since 1.3
-	 * @see SetTextColorArray(), SetDrawColor(), SetFillColor(), Text(), Cell(), MultiCell()
-	 */
-	public function SetTextColor($col1=0, $col2=-1, $col3=-1, $col4=-1, $ret=false, $name='') {
-		return $this->setColor('text', $col1, $col2, $col3, $col4, $ret, $name);
-	}
-
-	/**
-	 * Returns the length of a string in user unit. A font must be selected.<br>
-	 * @param $s (string) The string whose length is to be computed
-	 * @param $fontname (string) Family font. It can be either a name defined by AddFont() or one of the standard families. It is also possible to pass an empty string, in that case, the current family is retained.
-	 * @param $fontstyle (string) Font style. Possible values are (case insensitive):<ul><li>empty string: regular</li><li>B: bold</li><li>I: italic</li><li>U: underline</li><li>D: line-through</li><li>O: overline</li></ul> or any combination. The default value is regular.
-	 * @param $fontsize (float) Font size in points. The default value is the current size.
-	 * @param $getarray (boolean) if true returns an array of characters widths, if false returns the total length.
-	 * @return mixed int total string length or array of characted widths
-	 * @author Nicola Asuni
-	 * @public
-	 * @since 1.2
-	 */
-	public function GetStringWidth($s, $fontname='', $fontstyle='', $fontsize=0, $getarray=false) {
-		return $this->GetArrStringWidth(TCPDF_FONTS::utf8Bidi(TCPDF_FONTS::UTF8StringToArray($s, $this->isunicode, $this->CurrentFont), $s, $this->tmprtl, $this->isunicode, $this->CurrentFont), $fontname, $fontstyle, $fontsize, $getarray);
-	}
-
-	/**
-	 * Returns the string length of an array of chars in user unit or an array of characters widths. A font must be selected.<br>
-	 * @param $sa (string) The array of chars whose total length is to be computed
-	 * @param $fontname (string) Family font. It can be either a name defined by AddFont() or one of the standard families. It is also possible to pass an empty string, in that case, the current family is retained.
-	 * @param $fontstyle (string) Font style. Possible values are (case insensitive):<ul><li>empty string: regular</li><li>B: bold</li><li>I: italic</li><li>U: underline</li><li>D: line through</li><li>O: overline</li></ul> or any combination. The default value is regular.
-	 * @param $fontsize (float) Font size in points. The default value is the current size.
-	 * @param $getarray (boolean) if true returns an array of characters widths, if false returns the total length.
-	 * @return mixed int total string length or array of characted widths
-	 * @author Nicola Asuni
-	 * @public
-	 * @since 2.4.000 (2008-03-06)
-	 */
-	public function GetArrStringWidth($sa, $fontname='', $fontstyle='', $fontsize=0, $getarray=false) {
-		// store current values
-		if (!TCPDF_STATIC::empty_string($fontname)) {
-			$prev_FontFamily = $this->FontFamily;
-			$prev_FontStyle = $this->FontStyle;
-			$prev_FontSizePt = $this->FontSizePt;
-			$this->SetFont($fontname, $fontstyle, $fontsize, '', 'default', false);
-		}
-		// convert UTF-8 array to Latin1 if required
-		if ($this->isunicode AND (!$this->isUnicodeFont())) {
-			$sa = TCPDF_FONTS::UTF8ArrToLatin1Arr($sa);
-		}
-		$w = 0; // total width
-		$wa = array(); // array of characters widths
-		foreach ($sa as $ck => $char) {
-			// character width
-			$cw = $this->GetCharWidth($char, isset($sa[($ck + 1)]));
-			$wa[] = $cw;
-			$w += $cw;
-		}
-		// restore previous values
-		if (!TCPDF_STATIC::empty_string($fontname)) {
-			$this->SetFont($prev_FontFamily, $prev_FontStyle, $prev_FontSizePt, '', 'default', false);
-		}
-		if ($getarray) {
-			return $wa;
-		}
-		return $w;
-	}
-
-	/**
-	 * Returns the length of the char in user unit for the current font considering current stretching and spacing (tracking).
-	 * @param $char (int) The char code whose length is to be returned
-	 * @param $notlast (boolean) If false ignore the font-spacing.
-	 * @return float char width
-	 * @author Nicola Asuni
-	 * @public
-	 * @since 2.4.000 (2008-03-06)
-	 */
-	public function GetCharWidth($char, $notlast=true) {
-		// get raw width
-		$chw = $this->getRawCharWidth($char);
-		if (($this->font_spacing < 0) OR (($this->font_spacing > 0) AND $notlast)) {
-			// increase/decrease font spacing
-			$chw += $this->font_spacing;
-		}
-		if ($this->font_stretching != 100) {
-			// fixed stretching mode
-			$chw *= ($this->font_stretching / 100);
-		}
-		return $chw;
-	}
-
-	/**
-	 * Returns the length of the char in user unit for the current font.
-	 * @param $char (int) The char code whose length is to be returned
-	 * @return float char width
-	 * @author Nicola Asuni
-	 * @public
-	 * @since 5.9.000 (2010-09-28)
-	 */
-	public function getRawCharWidth($char) {
-		if ($char == 173) {
-			// SHY character will not be printed
-			return (0);
-		}
-		if (isset($this->CurrentFont['cw'][$char])) {
-			$w = $this->CurrentFont['cw'][$char];
-		} elseif (isset($this->CurrentFont['dw'])) {
-			// default width
-			$w = $this->CurrentFont['dw'];
-		} elseif (isset($this->CurrentFont['cw'][32])) {
-			// default width
-			$w = $this->CurrentFont['cw'][32];
-		} else {
-			$w = 600;
-		}
-		return $this->getAbsFontMeasure($w);
-	}
-
-	/**
-	 * Returns the numbero of characters in a string.
-	 * @param $s (string) The input string.
-	 * @return int number of characters
-	 * @public
-	 * @since 2.0.0001 (2008-01-07)
-	 */
-	public function GetNumChars($s) {
-		if ($this->isUnicodeFont()) {
-			return count(TCPDF_FONTS::UTF8StringToArray($s, $this->isunicode, $this->CurrentFont));
-		}
-		return strlen($s);
-	}
-
-	/**
-	 * Fill the list of available fonts ($this->fontlist).
-	 * @protected
-	 * @since 4.0.013 (2008-07-28)
-	 */
-	protected function getFontsList() {
-		if (($fontsdir = opendir(TCPDF_FONTS::_getfontpath())) !== false) {
-			while (($file = readdir($fontsdir)) !== false) {
-				if (substr($file, -4) == '.php') {
-					array_push($this->fontlist, strtolower(basename($file, '.php')));
-				}
-			}
-			closedir($fontsdir);
-		}
-	}
-
-	/**
-	 * Imports a TrueType, Type1, core, or CID0 font and makes it available.
-	 * It is necessary to generate a font definition file first (read /fonts/utils/README.TXT).
-	 * The definition file (and the font file itself when embedding) must be present either in the current directory or in the one indicated by K_PATH_FONTS if the constant is defined. If it could not be found, the error "Could not include font definition file" is generated.
-	 * @param $family (string) Font family. The name can be chosen arbitrarily. If it is a standard family name, it will override the corresponding font.
-	 * @param $style (string) Font style. Possible values are (case insensitive):<ul><li>empty string: regular (default)</li><li>B: bold</li><li>I: italic</li><li>BI or IB: bold italic</li></ul>
-	 * @param $fontfile (string) The font definition file. By default, the name is built from the family and style, in lower case with no spaces.
-	 * @return array containing the font data, or false in case of error.
-	 * @param $subset (mixed) if true embedd only a subset of the font (stores only the information related to the used characters); if false embedd full font; if 'default' uses the default value set using setFontSubsetting(). This option is valid only for TrueTypeUnicode fonts. If you want to enable users to change the document, set this parameter to false. If you subset the font, the person who receives your PDF would need to have your same font in order to make changes to your PDF. The file size of the PDF would also be smaller because you are embedding only part of a font.
-	 * @public
-	 * @since 1.5
-	 * @see SetFont(), setFontSubsetting()
-	 */
-	public function AddFont($family, $style='', $fontfile='', $subset='default') {
-		if ($subset === 'default') {
-			$subset = $this->font_subsetting;
-		}
-		if ($this->pdfa_mode) {
-			$subset = false;
-		}
-		if (TCPDF_STATIC::empty_string($family)) {
-			if (!TCPDF_STATIC::empty_string($this->FontFamily)) {
-				$family = $this->FontFamily;
-			} else {
-				$this->Error('Empty font family');
-			}
-		}
-		// move embedded styles on $style
-		if (substr($family, -1) == 'I') {
-			$style .= 'I';
-			$family = substr($family, 0, -1);
-		}
-		if (substr($family, -1) == 'B') {
-			$style .= 'B';
-			$family = substr($family, 0, -1);
-		}
-		// normalize family name
-		$family = strtolower($family);
-		if ((!$this->isunicode) AND ($family == 'arial')) {
-			$family = 'helvetica';
-		}
-		if (($family == 'symbol') OR ($family == 'zapfdingbats')) {
-			$style = '';
-		}
-		if ($this->pdfa_mode AND (isset($this->CoreFonts[$family]))) {
-			// all fonts must be embedded
-			$family = 'pdfa'.$family;
-		}
-		$tempstyle = strtoupper($style);
-		$style = '';
-		// underline
-		if (strpos($tempstyle, 'U') !== false) {
-			$this->underline = true;
-		} else {
-			$this->underline = false;
-		}
-		// line-through (deleted)
-		if (strpos($tempstyle, 'D') !== false) {
-			$this->linethrough = true;
-		} else {
-			$this->linethrough = false;
-		}
-		// overline
-		if (strpos($tempstyle, 'O') !== false) {
-			$this->overline = true;
-		} else {
-			$this->overline = false;
-		}
-		// bold
-		if (strpos($tempstyle, 'B') !== false) {
-			$style .= 'B';
-		}
-		// oblique
-		if (strpos($tempstyle, 'I') !== false) {
-			$style .= 'I';
-		}
-		$bistyle = $style;
-		$fontkey = $family.$style;
-		$font_style = $style.($this->underline ? 'U' : '').($this->linethrough ? 'D' : '').($this->overline ? 'O' : '');
-		$fontdata = array('fontkey' => $fontkey, 'family' => $family, 'style' => $font_style);
-		// check if the font has been already added
-		$fb = $this->getFontBuffer($fontkey);
-		if ($fb !== false) {
-			if ($this->inxobj) {
-				// we are inside an XObject template
-				$this->xobjects[$this->xobjid]['fonts'][$fontkey] = $fb['i'];
-			}
-			return $fontdata;
-		}
-		// get specified font directory (if any)
-		$fontdir = false;
-		if (!TCPDF_STATIC::empty_string($fontfile)) {
-			$fontdir = dirname($fontfile);
-			if (TCPDF_STATIC::empty_string($fontdir) OR ($fontdir == '.')) {
-				$fontdir = '';
-			} else {
-				$fontdir .= '/';
-			}
-		}
-		// true when the font style variation is missing
-		$missing_style = false;
-		// search and include font file
-		if (TCPDF_STATIC::empty_string($fontfile) OR (!@file_exists($fontfile))) {
-			// build a standard filenames for specified font
-			$tmp_fontfile = str_replace(' ', '', $family).strtolower($style).'.php';
-			$fontfile = TCPDF_FONTS::getFontFullPath($tmp_fontfile, $fontdir);
-			if (TCPDF_STATIC::empty_string($fontfile)) {
-				$missing_style = true;
-				// try to remove the style part
-				$tmp_fontfile = str_replace(' ', '', $family).'.php';
-				$fontfile = TCPDF_FONTS::getFontFullPath($tmp_fontfile, $fontdir);
-			}
-		}
-		// include font file
-		if (!TCPDF_STATIC::empty_string($fontfile) AND (@file_exists($fontfile))) {
-			include($fontfile);
-		} else {
-			$this->Error('Could not include font definition file: '.$family.'');
-		}
-		// check font parameters
-		if ((!isset($type)) OR (!isset($cw))) {
-			$this->Error('The font definition file has a bad format: '.$fontfile.'');
-		}
-		// SET default parameters
-		if (!isset($file) OR TCPDF_STATIC::empty_string($file)) {
-			$file = '';
-		}
-		if (!isset($enc) OR TCPDF_STATIC::empty_string($enc)) {
-			$enc = '';
-		}
-		if (!isset($cidinfo) OR TCPDF_STATIC::empty_string($cidinfo)) {
-			$cidinfo = array('Registry'=>'Adobe', 'Ordering'=>'Identity', 'Supplement'=>0);
-			$cidinfo['uni2cid'] = array();
-		}
-		if (!isset($ctg) OR TCPDF_STATIC::empty_string($ctg)) {
-			$ctg = '';
-		}
-		if (!isset($desc) OR TCPDF_STATIC::empty_string($desc)) {
-			$desc = array();
-		}
-		if (!isset($up) OR TCPDF_STATIC::empty_string($up)) {
-			$up = -100;
-		}
-		if (!isset($ut) OR TCPDF_STATIC::empty_string($ut)) {
-			$ut = 50;
-		}
-		if (!isset($cw) OR TCPDF_STATIC::empty_string($cw)) {
-			$cw = array();
-		}
-		if (!isset($dw) OR TCPDF_STATIC::empty_string($dw)) {
-			// set default width
-			if (isset($desc['MissingWidth']) AND ($desc['MissingWidth'] > 0)) {
-				$dw = $desc['MissingWidth'];
-			} elseif (isset($cw[32])) {
-				$dw = $cw[32];
-			} else {
-				$dw = 600;
-			}
-		}
-		++$this->numfonts;
-		if ($type == 'core') {
-			$name = $this->CoreFonts[$fontkey];
-			$subset = false;
-		} elseif (($type == 'TrueType') OR ($type == 'Type1')) {
-			$subset = false;
-		} elseif ($type == 'TrueTypeUnicode') {
-			$enc = 'Identity-H';
-		} elseif ($type == 'cidfont0') {
-			if ($this->pdfa_mode) {
-				$this->Error('All fonts must be embedded in PDF/A mode!');
-			}
-		} else {
-			$this->Error('Unknow font type: '.$type.'');
-		}
-		// set name if unset
-		if (!isset($name) OR empty($name)) {
-			$name = $fontkey;
-		}
-		// create artificial font style variations if missing (only works with non-embedded fonts)
-		if (($type != 'core') AND $missing_style) {
-			// style variations
-			$styles = array('' => '', 'B' => ',Bold', 'I' => ',Italic', 'BI' => ',BoldItalic');
-			$name .= $styles[$bistyle];
-			// artificial bold
-			if (strpos($bistyle, 'B') !== false) {
-				if (isset($desc['StemV'])) {
-					// from normal to bold
-					$desc['StemV'] = round($desc['StemV'] * 1.75);
-				} else {
-					// bold
-					$desc['StemV'] = 123;
-				}
-			}
-			// artificial italic
-			if (strpos($bistyle, 'I') !== false) {
-				if (isset($desc['ItalicAngle'])) {
-					$desc['ItalicAngle'] -= 11;
-				} else {
-					$desc['ItalicAngle'] = -11;
-				}
-				if (isset($desc['Flags'])) {
-					$desc['Flags'] |= 64; //bit 7
-				} else {
-					$desc['Flags'] = 64;
-				}
-			}
-		}
-		// check if the array of characters bounding boxes is defined
-		if (!isset($cbbox)) {
-			$cbbox = array();
-		}
-		// initialize subsetchars
-		$subsetchars = array_fill(0, 255, true);
-		$this->setFontBuffer($fontkey, array('fontkey' => $fontkey, 'i' => $this->numfonts, 'type' => $type, 'name' => $name, 'desc' => $desc, 'up' => $up, 'ut' => $ut, 'cw' => $cw, 'cbbox' => $cbbox, 'dw' => $dw, 'enc' => $enc, 'cidinfo' => $cidinfo, 'file' => $file, 'ctg' => $ctg, 'subset' => $subset, 'subsetchars' => $subsetchars));
-		if ($this->inxobj) {
-			// we are inside an XObject template
-			$this->xobjects[$this->xobjid]['fonts'][$fontkey] = $this->numfonts;
-		}
-		if (isset($diff) AND (!empty($diff))) {
-			//Search existing encodings
-			$d = 0;
-			$nb = count($this->diffs);
-			for ($i=1; $i <= $nb; ++$i) {
-				if ($this->diffs[$i] == $diff) {
-					$d = $i;
-					break;
-				}
-			}
-			if ($d == 0) {
-				$d = $nb + 1;
-				$this->diffs[$d] = $diff;
-			}
-			$this->setFontSubBuffer($fontkey, 'diff', $d);
-		}
-		if (!TCPDF_STATIC::empty_string($file)) {
-			if (!isset($this->FontFiles[$file])) {
-				if ((strcasecmp($type,'TrueType') == 0) OR (strcasecmp($type, 'TrueTypeUnicode') == 0)) {
-					$this->FontFiles[$file] = array('length1' => $originalsize, 'fontdir' => $fontdir, 'subset' => $subset, 'fontkeys' => array($fontkey));
-				} elseif ($type != 'core') {
-					$this->FontFiles[$file] = array('length1' => $size1, 'length2' => $size2, 'fontdir' => $fontdir, 'subset' => $subset, 'fontkeys' => array($fontkey));
-				}
-			} else {
-				// update fontkeys that are sharing this font file
-				$this->FontFiles[$file]['subset'] = ($this->FontFiles[$file]['subset'] AND $subset);
-				if (!in_array($fontkey, $this->FontFiles[$file]['fontkeys'])) {
-					$this->FontFiles[$file]['fontkeys'][] = $fontkey;
-				}
-			}
-		}
-		return $fontdata;
-	}
-
-	/**
-	 * Sets the font used to print character strings.
-	 * The font can be either a standard one or a font added via the AddFont() method. Standard fonts use Windows encoding cp1252 (Western Europe).
-	 * The method can be called before the first page is created and the font is retained from page to page.
-	 * If you just wish to change the current font size, it is simpler to call SetFontSize().
-	 * Note: for the standard fonts, the font metric files must be accessible. There are three possibilities for this:<ul><li>They are in the current directory (the one where the running script lies)</li><li>They are in one of the directories defined by the include_path parameter</li><li>They are in the directory defined by the K_PATH_FONTS constant</li></ul><br />
-	 * @param $family (string) Family font. It can be either a name defined by AddFont() or one of the standard Type1 families (case insensitive):<ul><li>times (Times-Roman)</li><li>timesb (Times-Bold)</li><li>timesi (Times-Italic)</li><li>timesbi (Times-BoldItalic)</li><li>helvetica (Helvetica)</li><li>helveticab (Helvetica-Bold)</li><li>helveticai (Helvetica-Oblique)</li><li>helveticabi (Helvetica-BoldOblique)</li><li>courier (Courier)</li><li>courierb (Courier-Bold)</li><li>courieri (Courier-Oblique)</li><li>courierbi (Courier-BoldOblique)</li><li>symbol (Symbol)</li><li>zapfdingbats (ZapfDingbats)</li></ul> It is also possible to pass an empty string. In that case, the current family is retained.
-	 * @param $style (string) Font style. Possible values are (case insensitive):<ul><li>empty string: regular</li><li>B: bold</li><li>I: italic</li><li>U: underline</li><li>D: line through</li><li>O: overline</li></ul> or any combination. The default value is regular. Bold and italic styles do not apply to Symbol and ZapfDingbats basic fonts or other fonts when not defined.
-	 * @param $size (float) Font size in points. The default value is the current size. If no size has been specified since the beginning of the document, the value taken is 12
-	 * @param $fontfile (string) The font definition file. By default, the name is built from the family and style, in lower case with no spaces.
-	 * @param $subset (mixed) if true embedd only a subset of the font (stores only the information related to the used characters); if false embedd full font; if 'default' uses the default value set using setFontSubsetting(). This option is valid only for TrueTypeUnicode fonts. If you want to enable users to change the document, set this parameter to false. If you subset the font, the person who receives your PDF would need to have your same font in order to make changes to your PDF. The file size of the PDF would also be smaller because you are embedding only part of a font.
-	 * @param $out (boolean) if true output the font size command, otherwise only set the font properties.
-	 * @author Nicola Asuni
-	 * @public
-	 * @since 1.0
-	 * @see AddFont(), SetFontSize()
-	 */
-	public function SetFont($family, $style='', $size=null, $fontfile='', $subset='default', $out=true) {
-		//Select a font; size given in points
-		if ($size === null) {
-			$size = $this->FontSizePt;
-		}
-		if ($size < 0) {
-			$size = 0;
-		}
-		// try to add font (if not already added)
-		$fontdata = $this->AddFont($family, $style, $fontfile, $subset);
-		$this->FontFamily = $fontdata['family'];
-		$this->FontStyle = $fontdata['style'];
-		if (isset($this->CurrentFont['fontkey']) AND isset($this->CurrentFont['subsetchars'])) {
-			// save subset chars of the previous font
-			$this->setFontSubBuffer($this->CurrentFont['fontkey'], 'subsetchars', $this->CurrentFont['subsetchars']);
-		}
-		$this->CurrentFont = $this->getFontBuffer($fontdata['fontkey']);
-		$this->SetFontSize($size, $out);
-	}
-
-	/**
-	 * Defines the size of the current font.
-	 * @param $size (float) The font size in points.
-	 * @param $out (boolean) if true output the font size command, otherwise only set the font properties.
-	 * @public
-	 * @since 1.0
-	 * @see SetFont()
-	 */
-	public function SetFontSize($size, $out=true) {
-		// font size in points
-		$this->FontSizePt = $size;
-		// font size in user units
-		$this->FontSize = $size / $this->k;
-		// calculate some font metrics
-		if (isset($this->CurrentFont['desc']['FontBBox'])) {
-			$bbox = explode(' ', substr($this->CurrentFont['desc']['FontBBox'], 1, -1));
-			$font_height = ((intval($bbox[3]) - intval($bbox[1])) * $size / 1000);
-		} else {
-			$font_height = $size * 1.219;
-		}
-		if (isset($this->CurrentFont['desc']['Ascent']) AND ($this->CurrentFont['desc']['Ascent'] > 0)) {
-			$font_ascent = ($this->CurrentFont['desc']['Ascent'] * $size / 1000);
-		}
-		if (isset($this->CurrentFont['desc']['Descent']) AND ($this->CurrentFont['desc']['Descent'] <= 0)) {
-			$font_descent = (- $this->CurrentFont['desc']['Descent'] * $size / 1000);
-		}
-		if (!isset($font_ascent) AND !isset($font_descent)) {
-			// core font
-			$font_ascent = 0.76 * $font_height;
-			$font_descent = $font_height - $font_ascent;
-		} elseif (!isset($font_descent)) {
-			$font_descent = $font_height - $font_ascent;
-		} elseif (!isset($font_ascent)) {
-			$font_ascent = $font_height - $font_descent;
-		}
-		$this->FontAscent = ($font_ascent / $this->k);
-		$this->FontDescent = ($font_descent / $this->k);
-		if ($out AND ($this->page > 0) AND (isset($this->CurrentFont['i'])) AND ($this->state == 2)) {
-			$this->_out(sprintf('BT /F%d %F Tf ET', $this->CurrentFont['i'], $this->FontSizePt));
-		}
-	}
-
-	/**
-	 * Returns the bounding box of the current font in user units.
-	 * @return array
-	 * @public
-	 * @since 5.9.152 (2012-03-23)
-	 */
-	public function getFontBBox() {
-		$fbbox = array();
-		if (isset($this->CurrentFont['desc']['FontBBox'])) {
-			$tmpbbox = explode(' ', substr($this->CurrentFont['desc']['FontBBox'], 1, -1));
-			$fbbox = array_map(array($this,'getAbsFontMeasure'), $tmpbbox);
-		} else {
-			// Find max width
-			if (isset($this->CurrentFont['desc']['MaxWidth'])) {
-				$maxw = $this->getAbsFontMeasure(intval($this->CurrentFont['desc']['MaxWidth']));
-			} else {
-				$maxw = 0;
-				if (isset($this->CurrentFont['desc']['MissingWidth'])) {
-					$maxw = max($maxw, $this->CurrentFont['desc']['MissingWidth']);
-				}
-				if (isset($this->CurrentFont['desc']['AvgWidth'])) {
-					$maxw = max($maxw, $this->CurrentFont['desc']['AvgWidth']);
-				}
-				if (isset($this->CurrentFont['dw'])) {
-					$maxw = max($maxw, $this->CurrentFont['dw']);
-				}
-				foreach ($this->CurrentFont['cw'] as $char => $w) {
-					$maxw = max($maxw, $w);
-				}
-				if ($maxw == 0) {
-					$maxw = 600;
-				}
-				$maxw = $this->getAbsFontMeasure($maxw);
-			}
-			$fbbox = array(0, (0 - $this->FontDescent), $maxw, $this->FontAscent);
-		}
-		return $fbbox;
-	}
-
-	/**
-	 * Convert a relative font measure into absolute value.
-	 * @param $s (int) Font measure.
-	 * @return float Absolute measure.
-	 * @since 5.9.186 (2012-09-13)
-	 */
-	public function getAbsFontMeasure($s) {
-		return ($s * $this->FontSize / 1000);
-	}
-
-	/**
-	 * Returns the glyph bounding box of the specified character in the current font in user units.
-	 * @param $char (int) Input character code.
-	 * @return mixed array(xMin, yMin, xMax, yMax) or FALSE if not defined.
-	 * @since 5.9.186 (2012-09-13)
-	 */
-	public function getCharBBox($char) {
-		$c = intval($char);
-		if (isset($this->CurrentFont['cw'][$c])) {
-			// glyph is defined ... use zero width & height for glyphs without outlines
-			$result = array(0,0,0,0);
-			if (isset($this->CurrentFont['cbbox'][$c])) {
-				$result = $this->CurrentFont['cbbox'][$c];
-			}
-			return array_map(array($this,'getAbsFontMeasure'), $result);
-		}
-		return false;
-	}
-
-	/**
-	 * Return the font descent value
-	 * @param $font (string) font name
-	 * @param $style (string) font style
-	 * @param $size (float) The size (in points)
-	 * @return int font descent
-	 * @public
-	 * @author Nicola Asuni
-	 * @since 4.9.003 (2010-03-30)
-	 */
-	public function getFontDescent($font, $style='', $size=0) {
-		$fontdata = $this->AddFont($font, $style);
-		$fontinfo = $this->getFontBuffer($fontdata['fontkey']);
-		if (isset($fontinfo['desc']['Descent']) AND ($fontinfo['desc']['Descent'] <= 0)) {
-			$descent = (- $fontinfo['desc']['Descent'] * $size / 1000);
-		} else {
-			$descent = (1.219 * 0.24 * $size);
-		}
-		return ($descent / $this->k);
-	}
-
-	/**
-	 * Return the font ascent value.
-	 * @param $font (string) font name
-	 * @param $style (string) font style
-	 * @param $size (float) The size (in points)
-	 * @return int font ascent
-	 * @public
-	 * @author Nicola Asuni
-	 * @since 4.9.003 (2010-03-30)
-	 */
-	public function getFontAscent($font, $style='', $size=0) {
-		$fontdata = $this->AddFont($font, $style);
-		$fontinfo = $this->getFontBuffer($fontdata['fontkey']);
-		if (isset($fontinfo['desc']['Ascent']) AND ($fontinfo['desc']['Ascent'] > 0)) {
-			$ascent = ($fontinfo['desc']['Ascent'] * $size / 1000);
-		} else {
-			$ascent = 1.219 * 0.76 * $size;
-		}
-		return ($ascent / $this->k);
-	}
-
-	/**
-	 * Return true in the character is present in the specified font.
-	 * @param $char (mixed) Character to check (integer value or string)
-	 * @param $font (string) Font name (family name).
-	 * @param $style (string) Font style.
-	 * @return (boolean) true if the char is defined, false otherwise.
-	 * @public
-	 * @since 5.9.153 (2012-03-28)
-	 */
-	public function isCharDefined($char, $font='', $style='') {
-		if (is_string($char)) {
-			// get character code
-			$char = TCPDF_FONTS::UTF8StringToArray($char, $this->isunicode, $this->CurrentFont);
-			$char = $char[0];
-		}
-		if (TCPDF_STATIC::empty_string($font)) {
-			if (TCPDF_STATIC::empty_string($style)) {
-				return (isset($this->CurrentFont['cw'][intval($char)]));
-			}
-			$font = $this->FontFamily;
-		}
-		$fontdata = $this->AddFont($font, $style);
-		$fontinfo = $this->getFontBuffer($fontdata['fontkey']);
-		return (isset($fontinfo['cw'][intval($char)]));
-	}
-
-	/**
-	 * Replace missing font characters on selected font with specified substitutions.
-	 * @param $text (string) Text to process.
-	 * @param $font (string) Font name (family name).
-	 * @param $style (string) Font style.
-	 * @param $subs (array) Array of possible character substitutions. The key is the character to check (integer value) and the value is a single intege value or an array of possible substitutes.
-	 * @return (string) Processed text.
-	 * @public
-	 * @since 5.9.153 (2012-03-28)
-	 */
-	public function replaceMissingChars($text, $font='', $style='', $subs=array()) {
-		if (empty($subs)) {
-			return $text;
-		}
-		if (TCPDF_STATIC::empty_string($font)) {
-			$font = $this->FontFamily;
-		}
-		$fontdata = $this->AddFont($font, $style);
-		$fontinfo = $this->getFontBuffer($fontdata['fontkey']);
-		$uniarr = TCPDF_FONTS::UTF8StringToArray($text, $this->isunicode, $this->CurrentFont);
-		foreach ($uniarr as $k => $chr) {
-			if (!isset($fontinfo['cw'][$chr])) {
-				// this character is missing on the selected font
-				if (isset($subs[$chr])) {
-					// we have available substitutions
-					if (is_array($subs[$chr])) {
-						foreach($subs[$chr] as $s) {
-							if (isset($fontinfo['cw'][$s])) {
-								$uniarr[$k] = $s;
-								break;
-							}
-						}
-					} elseif (isset($fontinfo['cw'][$subs[$chr]])) {
-						$uniarr[$k] = $subs[$chr];
-					}
-				}
-			}
-		}
-		return TCPDF_FONTS::UniArrSubString(TCPDF_FONTS::UTF8ArrayToUniArray($uniarr, $this->isunicode));
-	}
-
-	/**
-	 * Defines the default monospaced font.
-	 * @param $font (string) Font name.
-	 * @public
-	 * @since 4.5.025
-	 */
-	public function SetDefaultMonospacedFont($font) {
-		$this->default_monospaced_font = $font;
-	}
-
-	/**
-	 * Creates a new internal link and returns its identifier. An internal link is a clickable area which directs to another place within the document.<br />
-	 * The identifier can then be passed to Cell(), Write(), Image() or Link(). The destination is defined with SetLink().
-	 * @public
-	 * @since 1.5
-	 * @see Cell(), Write(), Image(), Link(), SetLink()
-	 */
-	public function AddLink() {
-		// create a new internal link
-		$n = count($this->links) + 1;
-		$this->links[$n] = array('p' => 0, 'y' => 0, 'f' => false);
-		return $n;
-	}
-
-	/**
-	 * Defines the page and position a link points to.
-	 * @param $link (int) The link identifier returned by AddLink()
-	 * @param $y (float) Ordinate of target position; -1 indicates the current position. The default value is 0 (top of page)
-	 * @param $page (int) Number of target page; -1 indicates the current page (default value). If you prefix a page number with the * character, then this page will not be changed when adding/deleting/moving pages. 
-	 * @public
-	 * @since 1.5
-	 * @see AddLink()
-	 */
-	public function SetLink($link, $y=0, $page=-1) {
-		$fixed = false;
-		if (!empty($page) AND ($page[0] == '*')) {
-			$page = intval(substr($page, 1));
-			// this page number will not be changed when moving/add/deleting pages
-			$fixed = true;
-		}
-		if ($page < 0) {
-			$page = $this->page;
-		}
-		if ($y == -1) {
-			$y = $this->y;
-		}
-		$this->links[$link] = array('p' => $page, 'y' => $y, 'f' => $fixed);
-	}
-
-	/**
-	 * Puts a link on a rectangular area of the page.
-	 * Text or image links are generally put via Cell(), Write() or Image(), but this method can be useful for instance to define a clickable area inside an image.
-	 * @param $x (float) Abscissa of the upper-left corner of the rectangle
-	 * @param $y (float) Ordinate of the upper-left corner of the rectangle
-	 * @param $w (float) Width of the rectangle
-	 * @param $h (float) Height of the rectangle
-	 * @param $link (mixed) URL or identifier returned by AddLink()
-	 * @param $spaces (int) number of spaces on the text to link
-	 * @public
-	 * @since 1.5
-	 * @see AddLink(), Annotation(), Cell(), Write(), Image()
-	 */
-	public function Link($x, $y, $w, $h, $link, $spaces=0) {
-		$this->Annotation($x, $y, $w, $h, $link, array('Subtype'=>'Link'), $spaces);
-	}
-
-	/**
-	 * Puts a markup annotation on a rectangular area of the page.
-	 * !!!!THE ANNOTATION SUPPORT IS NOT YET FULLY IMPLEMENTED !!!!
-	 * @param $x (float) Abscissa of the upper-left corner of the rectangle
-	 * @param $y (float) Ordinate of the upper-left corner of the rectangle
-	 * @param $w (float) Width of the rectangle
-	 * @param $h (float) Height of the rectangle
-	 * @param $text (string) annotation text or alternate content
-	 * @param $opt (array) array of options (see section 8.4 of PDF reference 1.7).
-	 * @param $spaces (int) number of spaces on the text to link
-	 * @public
-	 * @since 4.0.018 (2008-08-06)
-	 */
-	public function Annotation($x, $y, $w, $h, $text, $opt=array('Subtype'=>'Text'), $spaces=0) {
-		if ($this->inxobj) {
-			// store parameters for later use on template
-			$this->xobjects[$this->xobjid]['annotations'][] = array('x' => $x, 'y' => $y, 'w' => $w, 'h' => $h, 'text' => $text, 'opt' => $opt, 'spaces' => $spaces);
-			return;
-		}
-		if ($x === '') {
-			$x = $this->x;
-		}
-		if ($y === '') {
-			$y = $this->y;
-		}
-		// check page for no-write regions and adapt page margins if necessary
-		list($x, $y) = $this->checkPageRegions($h, $x, $y);
-		// recalculate coordinates to account for graphic transformations
-		if (isset($this->transfmatrix) AND !empty($this->transfmatrix)) {
-			for ($i=$this->transfmatrix_key; $i > 0; --$i) {
-				$maxid = count($this->transfmatrix[$i]) - 1;
-				for ($j=$maxid; $j >= 0; --$j) {
-					$ctm = $this->transfmatrix[$i][$j];
-					if (isset($ctm['a'])) {
-						$x = $x * $this->k;
-						$y = ($this->h - $y) * $this->k;
-						$w = $w * $this->k;
-						$h = $h * $this->k;
-						// top left
-						$xt = $x;
-						$yt = $y;
-						$x1 = ($ctm['a'] * $xt) + ($ctm['c'] * $yt) + $ctm['e'];
-						$y1 = ($ctm['b'] * $xt) + ($ctm['d'] * $yt) + $ctm['f'];
-						// top right
-						$xt = $x + $w;
-						$yt = $y;
-						$x2 = ($ctm['a'] * $xt) + ($ctm['c'] * $yt) + $ctm['e'];
-						$y2 = ($ctm['b'] * $xt) + ($ctm['d'] * $yt) + $ctm['f'];
-						// bottom left
-						$xt = $x;
-						$yt = $y - $h;
-						$x3 = ($ctm['a'] * $xt) + ($ctm['c'] * $yt) + $ctm['e'];
-						$y3 = ($ctm['b'] * $xt) + ($ctm['d'] * $yt) + $ctm['f'];
-						// bottom right
-						$xt = $x + $w;
-						$yt = $y - $h;
-						$x4 = ($ctm['a'] * $xt) + ($ctm['c'] * $yt) + $ctm['e'];
-						$y4 = ($ctm['b'] * $xt) + ($ctm['d'] * $yt) + $ctm['f'];
-						// new coordinates (rectangle area)
-						$x = min($x1, $x2, $x3, $x4);
-						$y = max($y1, $y2, $y3, $y4);
-						$w = (max($x1, $x2, $x3, $x4) - $x) / $this->k;
-						$h = ($y - min($y1, $y2, $y3, $y4)) / $this->k;
-						$x = $x / $this->k;
-						$y = $this->h - ($y / $this->k);
-					}
-				}
-			}
-		}
-		if ($this->page <= 0) {
-			$page = 1;
-		} else {
-			$page = $this->page;
-		}
-		if (!isset($this->PageAnnots[$page])) {
-			$this->PageAnnots[$page] = array();
-		}
-		$this->PageAnnots[$page][] = array('n' => ++$this->n, 'x' => $x, 'y' => $y, 'w' => $w, 'h' => $h, 'txt' => $text, 'opt' => $opt, 'numspaces' => $spaces);
-		if (!$this->pdfa_mode) {
-			if ((($opt['Subtype'] == 'FileAttachment') OR ($opt['Subtype'] == 'Sound')) AND (!TCPDF_STATIC::empty_string($opt['FS']))
-				AND (@file_exists($opt['FS']) OR TCPDF_STATIC::isValidURL($opt['FS']))
-				AND (!isset($this->embeddedfiles[basename($opt['FS'])]))) {
-				$this->embeddedfiles[basename($opt['FS'])] = array('f' => ++$this->n, 'n' => ++$this->n, 'file' => $opt['FS']);
-			}
-		}
-		// Add widgets annotation's icons
-		if (isset($opt['mk']['i']) AND @file_exists($opt['mk']['i'])) {
-			$this->Image($opt['mk']['i'], '', '', 10, 10, '', '', '', false, 300, '', false, false, 0, false, true);
-		}
-		if (isset($opt['mk']['ri']) AND @file_exists($opt['mk']['ri'])) {
-			$this->Image($opt['mk']['ri'], '', '', 0, 0, '', '', '', false, 300, '', false, false, 0, false, true);
-		}
-		if (isset($opt['mk']['ix']) AND @file_exists($opt['mk']['ix'])) {
-			$this->Image($opt['mk']['ix'], '', '', 0, 0, '', '', '', false, 300, '', false, false, 0, false, true);
-		}
-	}
-
-	/**
-	 * Embedd the attached files.
-	 * @since 4.4.000 (2008-12-07)
-	 * @protected
-	 * @see Annotation()
-	 */
-	protected function _putEmbeddedFiles() {
-		if ($this->pdfa_mode) {
-			// embedded files are not allowed in PDF/A mode
-			return;
-		}
-		reset($this->embeddedfiles);
-		foreach ($this->embeddedfiles as $filename => $filedata) {
-			$data = TCPDF_STATIC::fileGetContents($filedata['file']);
-			if ($data !== FALSE) {
-				$rawsize = strlen($data);
-				if ($rawsize > 0) {
-					// update name tree
-					$this->efnames[$filename] = $filedata['f'].' 0 R';
-					// embedded file specification object
-					$out = $this->_getobj($filedata['f'])."\n";
-					$out .= '<</Type /Filespec /F '.$this->_datastring($filename, $filedata['f']).' /EF <</F '.$filedata['n'].' 0 R>> >>';
-					$out .= "\n".'endobj';
-					$this->_out($out);
-					// embedded file object
-					$filter = '';
-					if ($this->compress) {
-						$data = gzcompress($data);
-						$filter = ' /Filter /FlateDecode';
-					}
-					$stream = $this->_getrawstream($data, $filedata['n']);
-					$out = $this->_getobj($filedata['n'])."\n";
-					$out .= '<< /Type /EmbeddedFile'.$filter.' /Length '.strlen($stream).' /Params <</Size '.$rawsize.'>> >>';
-					$out .= ' stream'."\n".$stream."\n".'endstream';
-					$out .= "\n".'endobj';
-					$this->_out($out);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Prints a text cell at the specified position.
-	 * This method allows to place a string precisely on the page.
-	 * @param $x (float) Abscissa of the cell origin
-	 * @param $y (float) Ordinate of the cell origin
-	 * @param $txt (string) String to print
-	 * @param $fstroke (int) outline size in user units (false = disable)
-	 * @param $fclip (boolean) if true activate clipping mode (you must call StartTransform() before this function and StopTransform() to stop the clipping tranformation).
-	 * @param $ffill (boolean) if true fills the text
-	 * @param $border (mixed) Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
-	 * @param $ln (int) Indicates where the current position should go after the call. Possible values are:<ul><li>0: to the right (or left for RTL languages)</li><li>1: to the beginning of the next line</li><li>2: below</li></ul>Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value: 0.
-	 * @param $align (string) Allows to center or align the text. Possible values are:<ul><li>L or empty string: left align (default value)</li><li>C: center</li><li>R: right align</li><li>J: justify</li></ul>
-	 * @param $fill (boolean) Indicates if the cell background must be painted (true) or transparent (false).
-	 * @param $link (mixed) URL or identifier returned by AddLink().
-	 * @param $stretch (int) font stretch mode: <ul><li>0 = disabled</li><li>1 = horizontal scaling only if text is larger than cell width</li><li>2 = forced horizontal scaling to fit cell width</li><li>3 = character spacing only if text is larger than cell width</li><li>4 = forced character spacing to fit cell width</li></ul> General font stretching and scaling values will be preserved when possible.
-	 * @param $ignore_min_height (boolean) if true ignore automatic minimum height value.
-	 * @param $calign (string) cell vertical alignment relative to the specified Y value. Possible values are:<ul><li>T : cell top</li><li>A : font top</li><li>L : font baseline</li><li>D : font bottom</li><li>B : cell bottom</li></ul>
-	 * @param $valign (string) text vertical alignment inside the cell. Possible values are:<ul><li>T : top</li><li>C : center</li><li>B : bottom</li></ul>
-	 * @param $rtloff (boolean) if true uses the page top-left corner as origin of axis for $x and $y initial position.
-	 * @public
-	 * @since 1.0
-	 * @see Cell(), Write(), MultiCell(), WriteHTML(), WriteHTMLCell()
-	 */
-	public function Text($x, $y, $txt, $fstroke=false, $fclip=false, $ffill=true, $border=0, $ln=0, $align='', $fill=false, $link='', $stretch=0, $ignore_min_height=false, $calign='T', $valign='M', $rtloff=false) {
-		$textrendermode = $this->textrendermode;
-		$textstrokewidth = $this->textstrokewidth;
-		$this->setTextRenderingMode($fstroke, $ffill, $fclip);
-		$this->SetXY($x, $y, $rtloff);
-		$this->Cell(0, 0, $txt, $border, $ln, $align, $fill, $link, $stretch, $ignore_min_height, $calign, $valign);
-		// restore previous rendering mode
-		$this->textrendermode = $textrendermode;
-		$this->textstrokewidth = $textstrokewidth;
-	}
-
-	/**
-	 * Whenever a page break condition is met, the method is called, and the break is issued or not depending on the returned value.
-	 * The default implementation returns a value according to the mode selected by SetAutoPageBreak().<br />
-	 * This method is called automatically and should not be called directly by the application.
-	 * @return boolean
-	 * @public
-	 * @since 1.4
-	 * @see SetAutoPageBreak()
-	 */
-	public function AcceptPageBreak() {
-		if ($this->num_columns > 1) {
-			// multi column mode
-			if ($this->current_column < ($this->num_columns - 1)) {
-				// go to next column
-				$this->selectColumn($this->current_column + 1);
-			} elseif ($this->AutoPageBreak) {
-				// add a new page
-				$this->AddPage();
-				// set first column
-				$this->selectColumn(0);
-			}
-			// avoid page breaking from checkPageBreak()
-			return false;
-		}
-		return $this->AutoPageBreak;
-	}
-
-	/**
-	 * Add page if needed.
-	 * @param $h (float) Cell height. Default value: 0.
-	 * @param $y (mixed) starting y position, leave empty for current position.
-	 * @param $addpage (boolean) if true add a page, otherwise only return the true/false state
-	 * @return boolean true in case of page break, false otherwise.
-	 * @since 3.2.000 (2008-07-01)
-	 * @protected
-	 */
-	protected function checkPageBreak($h=0, $y='', $addpage=true) {
-		if (TCPDF_STATIC::empty_string($y)) {
-			$y = $this->y;
-		}
-		$current_page = $this->page;
-		if ((($y + $h) > $this->PageBreakTrigger) AND ($this->inPageBody()) AND ($this->AcceptPageBreak())) {
-			if ($addpage) {
-				//Automatic page break
-				$x = $this->x;
-				$this->AddPage($this->CurOrientation);
-				$this->y = $this->tMargin;
-				$oldpage = $this->page - 1;
-				if ($this->rtl) {
-					if ($this->pagedim[$this->page]['orm'] != $this->pagedim[$oldpage]['orm']) {
-						$this->x = $x - ($this->pagedim[$this->page]['orm'] - $this->pagedim[$oldpage]['orm']);
-					} else {
-						$this->x = $x;
-					}
-				} else {
-					if ($this->pagedim[$this->page]['olm'] != $this->pagedim[$oldpage]['olm']) {
-						$this->x = $x + ($this->pagedim[$this->page]['olm'] - $this->pagedim[$oldpage]['olm']);
-					} else {
-						$this->x = $x;
-					}
-				}
-			}
-			return true;
-		}
-		if ($current_page != $this->page) {
-			// account for columns mode
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Prints a cell (rectangular area) with optional borders, background color and character string. The upper-left corner of the cell corresponds to the current position. The text can be aligned or centered. After the call, the current position moves to the right or to the next line. It is possible to put a link on the text.<br />
-	 * If automatic page breaking is enabled and the cell goes beyond the limit, a page break is done before outputting.
-	 * @param $w (float) Cell width. If 0, the cell extends up to the right margin.
-	 * @param $h (float) Cell height. Default value: 0.
-	 * @param $txt (string) String to print. Default value: empty string.
-	 * @param $border (mixed) Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
-	 * @param $ln (int) Indicates where the current position should go after the call. Possible values are:<ul><li>0: to the right (or left for RTL languages)</li><li>1: to the beginning of the next line</li><li>2: below</li></ul> Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value: 0.
-	 * @param $align (string) Allows to center or align the text. Possible values are:<ul><li>L or empty string: left align (default value)</li><li>C: center</li><li>R: right align</li><li>J: justify</li></ul>
-	 * @param $fill (boolean) Indicates if the cell background must be painted (true) or transparent (false).
-	 * @param $link (mixed) URL or identifier returned by AddLink().
-	 * @param $stretch (int) font stretch mode: <ul><li>0 = disabled</li><li>1 = horizontal scaling only if text is larger than cell width</li><li>2 = forced horizontal scaling to fit cell width</li><li>3 = character spacing only if text is larger than cell width</li><li>4 = forced character spacing to fit cell width</li></ul> General font stretching and scaling values will be preserved when possible.
-	 * @param $ignore_min_height (boolean) if true ignore automatic minimum height value.
-	 * @param $calign (string) cell vertical alignment relative to the specified Y value. Possible values are:<ul><li>T : cell top</li><li>C : center</li><li>B : cell bottom</li><li>A : font top</li><li>L : font baseline</li><li>D : font bottom</li></ul>
-	 * @param $valign (string) text vertical alignment inside the cell. Possible values are:<ul><li>T : top</li><li>C : center</li><li>B : bottom</li></ul>
-	 * @public
-	 * @since 1.0
-	 * @see SetFont(), SetDrawColor(), SetFillColor(), SetTextColor(), SetLineWidth(), AddLink(), Ln(), MultiCell(), Write(), SetAutoPageBreak()
-	 */
-	public function Cell($w, $h=0, $txt='', $border=0, $ln=0, $align='', $fill=false, $link='', $stretch=0, $ignore_min_height=false, $calign='T', $valign='M') {
-		$prev_cell_margin = $this->cell_margin;
-		$prev_cell_padding = $this->cell_padding;
-		$this->adjustCellPadding($border);
-		if (!$ignore_min_height) {
-			$min_cell_height = $this->getCellHeight($this->FontSize);
-			if ($h < $min_cell_height) {
-				$h = $min_cell_height;
-			}
-		}
-		$this->checkPageBreak($h + $this->cell_margin['T'] + $this->cell_margin['B']);
-		// apply text shadow if enabled
-		if ($this->txtshadow['enabled']) {
-			// save data
-			$x = $this->x;
-			$y = $this->y;
-			$bc = $this->bgcolor;
-			$fc = $this->fgcolor;
-			$sc = $this->strokecolor;
-			$alpha = $this->alpha;
-			// print shadow
-			$this->x += $this->txtshadow['depth_w'];
-			$this->y += $this->txtshadow['depth_h'];
-			$this->SetFillColorArray($this->txtshadow['color']);
-			$this->SetTextColorArray($this->txtshadow['color']);
-			$this->SetDrawColorArray($this->txtshadow['color']);
-			if ($this->txtshadow['opacity'] != $alpha['CA']) {
-				$this->setAlpha($this->txtshadow['opacity'], $this->txtshadow['blend_mode']);
-			}
-			if ($this->state == 2) {
-				$this->_out($this->getCellCode($w, $h, $txt, $border, $ln, $align, $fill, $link, $stretch, true, $calign, $valign));
-			}
-			//restore data
-			$this->x = $x;
-			$this->y = $y;
-			$this->SetFillColorArray($bc);
-			$this->SetTextColorArray($fc);
-			$this->SetDrawColorArray($sc);
-			if ($this->txtshadow['opacity'] != $alpha['CA']) {
-				$this->setAlpha($alpha['CA'], $alpha['BM'], $alpha['ca'], $alpha['AIS']);
-			}
-		}
-		if ($this->state == 2) {
-			$this->_out($this->getCellCode($w, $h, $txt, $border, $ln, $align, $fill, $link, $stretch, true, $calign, $valign));
-		}
-		$this->cell_padding = $prev_cell_padding;
-		$this->cell_margin = $prev_cell_margin;
-	}
-
-	/**
-	 * Returns the PDF string code to print a cell (rectangular area) with optional borders, background color and character string. The upper-left corner of the cell corresponds to the current position. The text can be aligned or centered. After the call, the current position moves to the right or to the next line. It is possible to put a link on the text.<br />
-	 * If automatic page breaking is enabled and the cell goes beyond the limit, a page break is done before outputting.
-	 * @param $w (float) Cell width. If 0, the cell extends up to the right margin.
-	 * @param $h (float) Cell height. Default value: 0.
-	 * @param $txt (string) String to print. Default value: empty string.
-	 * @param $border (mixed) Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
-	 * @param $ln (int) Indicates where the current position should go after the call. Possible values are:<ul><li>0: to the right (or left for RTL languages)</li><li>1: to the beginning of the next line</li><li>2: below</li></ul>Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value: 0.
-	 * @param $align (string) Allows to center or align the text. Possible values are:<ul><li>L or empty string: left align (default value)</li><li>C: center</li><li>R: right align</li><li>J: justify</li></ul>
-	 * @param $fill (boolean) Indicates if the cell background must be painted (true) or transparent (false).
-	 * @param $link (mixed) URL or identifier returned by AddLink().
-	 * @param $stretch (int) font stretch mode: <ul><li>0 = disabled</li><li>1 = horizontal scaling only if text is larger than cell width</li><li>2 = forced horizontal scaling to fit cell width</li><li>3 = character spacing only if text is larger than cell width</li><li>4 = forced character spacing to fit cell width</li></ul> General font stretching and scaling values will be preserved when possible.
-	 * @param $ignore_min_height (boolean) if true ignore automatic minimum height value.
-	 * @param $calign (string) cell vertical alignment relative to the specified Y value. Possible values are:<ul><li>T : cell top</li><li>C : center</li><li>B : cell bottom</li><li>A : font top</li><li>L : font baseline</li><li>D : font bottom</li></ul>
-	 * @param $valign (string) text vertical alignment inside the cell. Possible values are:<ul><li>T : top</li><li>M : middle</li><li>B : bottom</li></ul>
-	 * @return string containing cell code
-	 * @protected
-	 * @since 1.0
-	 * @see Cell()
-	 */
-	protected function getCellCode($w, $h=0, $txt='', $border=0, $ln=0, $align='', $fill=false, $link='', $stretch=0, $ignore_min_height=false, $calign='T', $valign='M') {
-		// replace 'NO-BREAK SPACE' (U+00A0) character with a simple space
-		$txt = str_replace(TCPDF_FONTS::unichr(160, $this->isunicode), ' ', $txt);
-		$prev_cell_margin = $this->cell_margin;
-		$prev_cell_padding = $this->cell_padding;
-		$txt = TCPDF_STATIC::removeSHY($txt, $this->isunicode);
-		$rs = ''; //string to be returned
-		$this->adjustCellPadding($border);
-		if (!$ignore_min_height) {
-			$min_cell_height = $this->getCellHeight($this->FontSize);
-			if ($h < $min_cell_height) {
-				$h = $min_cell_height;
-			}
-		}
-		$k = $this->k;
-		// check page for no-write regions and adapt page margins if necessary
-		list($this->x, $this->y) = $this->checkPageRegions($h, $this->x, $this->y);
-		if ($this->rtl) {
-			$x = $this->x - $this->cell_margin['R'];
-		} else {
-			$x = $this->x + $this->cell_margin['L'];
-		}
-		$y = $this->y + $this->cell_margin['T'];
-		$prev_font_stretching = $this->font_stretching;
-		$prev_font_spacing = $this->font_spacing;
-		// cell vertical alignment
-		switch ($calign) {
-			case 'A': {
-				// font top
-				switch ($valign) {
-					case 'T': {
-						// top
-						$y -= $this->cell_padding['T'];
-						break;
-					}
-					case 'B': {
-						// bottom
-						$y -= ($h - $this->cell_padding['B'] - $this->FontAscent - $this->FontDescent);
-						break;
-					}
-					default:
-					case 'C':
-					case 'M': {
-						// center
-						$y -= (($h - $this->FontAscent - $this->FontDescent) / 2);
-						break;
-					}
-				}
-				break;
-			}
-			case 'L': {
-				// font baseline
-				switch ($valign) {
-					case 'T': {
-						// top
-						$y -= ($this->cell_padding['T'] + $this->FontAscent);
-						break;
-					}
-					case 'B': {
-						// bottom
-						$y -= ($h - $this->cell_padding['B'] - $this->FontDescent);
-						break;
-					}
-					default:
-					case 'C':
-					case 'M': {
-						// center
-						$y -= (($h + $this->FontAscent - $this->FontDescent) / 2);
-						break;
-					}
-				}
-				break;
-			}
-			case 'D': {
-				// font bottom
-				switch ($valign) {
-					case 'T': {
-						// top
-						$y -= ($this->cell_padding['T'] + $this->FontAscent + $this->FontDescent);
-						break;
-					}
-					case 'B': {
-						// bottom
-						$y -= ($h - $this->cell_padding['B']);
-						break;
-					}
-					default:
-					case 'C':
-					case 'M': {
-						// center
-						$y -= (($h + $this->FontAscent + $this->FontDescent) / 2);
-						break;
-					}
-				}
-				break;
-			}
-			case 'B': {
-				// cell bottom
-				$y -= $h;
-				break;
-			}
-			case 'C':
-			case 'M': {
-				// cell center
-				$y -= ($h / 2);
-				break;
-			}
-			default:
-			case 'T': {
-				// cell top
-				break;
-			}
-		}
-		// text vertical alignment
-		switch ($valign) {
-			case 'T': {
-				// top
-				$yt = $y + $this->cell_padding['T'];
-				break;
-			}
-			case 'B': {
-				// bottom
-				$yt = $y + $h - $this->cell_padding['B'] - $this->FontAscent - $this->FontDescent;
-				break;
-			}
-			default:
-			case 'C':
-			case 'M': {
-				// center
-				$yt = $y + (($h - $this->FontAscent - $this->FontDescent) / 2);
-				break;
-			}
-		}
-		$basefonty = $yt + $this->FontAscent;
-		if (TCPDF_STATIC::empty_string($w) OR ($w <= 0)) {
-			if ($this->rtl) {
-				$w = $x - $this->lMargin;
-			} else {
-				$w = $this->w - $this->rMargin - $x;
-			}
-		}
-		$s = '';
-		// fill and borders
-		if (is_string($border) AND (strlen($border) == 4)) {
-			// full border
-			$border = 1;
-		}
-		if ($fill OR ($border == 1)) {
-			if ($fill) {
-				$op = ($border == 1) ? 'B' : 'f';
-			} else {
-				$op = 'S';
-			}
-			if ($this->rtl) {
-				$xk = (($x - $w) * $k);
-			} else {
-				$xk = ($x * $k);
-			}
-			$s .= sprintf('%F %F %F %F re %s ', $xk, (($this->h - $y) * $k), ($w * $k), (-$h * $k), $op);
-		}
-		// draw borders
-		$s .= $this->getCellBorder($x, $y, $w, $h, $border);
-		if ($txt != '') {
-			$txt2 = $txt;
-			if ($this->isunicode) {
-				if (($this->CurrentFont['type'] == 'core') OR ($this->CurrentFont['type'] == 'TrueType') OR ($this->CurrentFont['type'] == 'Type1')) {
-					$txt2 = TCPDF_FONTS::UTF8ToLatin1($txt2, $this->isunicode, $this->CurrentFont);
-				} else {
-					$unicode = TCPDF_FONTS::UTF8StringToArray($txt, $this->isunicode, $this->CurrentFont); // array of UTF-8 unicode values
-					$unicode = TCPDF_FONTS::utf8Bidi($unicode, '', $this->tmprtl, $this->isunicode, $this->CurrentFont);
-					// replace thai chars (if any)
-					if (defined('K_THAI_TOPCHARS') AND (K_THAI_TOPCHARS == true)) {
-						// number of chars
-						$numchars = count($unicode);
-						// po pla, for far, for fan
-						$longtail = array(0x0e1b, 0x0e1d, 0x0e1f);
-						// do chada, to patak
-						$lowtail = array(0x0e0e, 0x0e0f);
-						// mai hun arkad, sara i, sara ii, sara ue, sara uee
-						$upvowel = array(0x0e31, 0x0e34, 0x0e35, 0x0e36, 0x0e37);
-						// mai ek, mai tho, mai tri, mai chattawa, karan
-						$tonemark = array(0x0e48, 0x0e49, 0x0e4a, 0x0e4b, 0x0e4c);
-						// sara u, sara uu, pinthu
-						$lowvowel = array(0x0e38, 0x0e39, 0x0e3a);
-						$output = array();
-						for ($i = 0; $i < $numchars; $i++) {
-							if (($unicode[$i] >= 0x0e00) && ($unicode[$i] <= 0x0e5b)) {
-								$ch0 = $unicode[$i];
-								$ch1 = ($i > 0) ? $unicode[($i - 1)] : 0;
-								$ch2 = ($i > 1) ? $unicode[($i - 2)] : 0;
-								$chn = ($i < ($numchars - 1)) ? $unicode[($i + 1)] : 0;
-								if (in_array($ch0, $tonemark)) {
-									if ($chn == 0x0e33) {
-										// sara um
-										if (in_array($ch1, $longtail)) {
-											// tonemark at upper left
-											$output[] = $this->replaceChar($ch0, (0xf713 + $ch0 - 0x0e48));
-										} else {
-											// tonemark at upper right (normal position)
-											$output[] = $ch0;
-										}
-									} elseif (in_array($ch1, $longtail) OR (in_array($ch2, $longtail) AND in_array($ch1, $lowvowel))) {
-										// tonemark at lower left
-										$output[] = $this->replaceChar($ch0, (0xf705 + $ch0 - 0x0e48));
-									} elseif (in_array($ch1, $upvowel)) {
-										if (in_array($ch2, $longtail)) {
-											// tonemark at upper left
-											$output[] = $this->replaceChar($ch0, (0xf713 + $ch0 - 0x0e48));
-										} else {
-											// tonemark at upper right (normal position)
-											$output[] = $ch0;
-										}
-									} else {
-										// tonemark at lower right
-										$output[] = $this->replaceChar($ch0, (0xf70a + $ch0 - 0x0e48));
-									}
-								} elseif (($ch0 == 0x0e33) AND (in_array($ch1, $longtail) OR (in_array($ch2, $longtail) AND in_array($ch1, $tonemark)))) {
-									// add lower left nikhahit and sara aa
-									if ($this->isCharDefined(0xf711) AND $this->isCharDefined(0x0e32)) {
-										$output[] = 0xf711;
-										$this->CurrentFont['subsetchars'][0xf711] = true;
-										$output[] = 0x0e32;
-										$this->CurrentFont['subsetchars'][0x0e32] = true;
-									} else {
-										$output[] = $ch0;
-									}
-								} elseif (in_array($ch1, $longtail)) {
-									if ($ch0 == 0x0e31) {
-										// lower left mai hun arkad
-										$output[] = $this->replaceChar($ch0, 0xf710);
-									} elseif (in_array($ch0, $upvowel)) {
-										// lower left
-										$output[] = $this->replaceChar($ch0, (0xf701 + $ch0 - 0x0e34));
-									} elseif ($ch0 == 0x0e47) {
-										// lower left mai tai koo
-										$output[] = $this->replaceChar($ch0, 0xf712);
-									} else {
-										// normal character
-										$output[] = $ch0;
-									}
-								} elseif (in_array($ch1, $lowtail) AND in_array($ch0, $lowvowel)) {
-									// lower vowel
-									$output[] = $this->replaceChar($ch0, (0xf718 + $ch0 - 0x0e38));
-								} elseif (($ch0 == 0x0e0d) AND in_array($chn, $lowvowel)) {
-									// yo ying without lower part
-									$output[] = $this->replaceChar($ch0, 0xf70f);
-								} elseif (($ch0 == 0x0e10) AND in_array($chn, $lowvowel)) {
-									// tho santan without lower part
-									$output[] = $this->replaceChar($ch0, 0xf700);
-								} else {
-									$output[] = $ch0;
-								}
-							} else {
-								// non-thai character
-								$output[] = $unicode[$i];
-							}
-						}
-						$unicode = $output;
-						// update font subsetchars
-						$this->setFontSubBuffer($this->CurrentFont['fontkey'], 'subsetchars', $this->CurrentFont['subsetchars']);
-					} // end of K_THAI_TOPCHARS
-					$txt2 = TCPDF_FONTS::arrUTF8ToUTF16BE($unicode, false);
-				}
-			}
-			$txt2 = TCPDF_STATIC::_escape($txt2);
-			// get current text width (considering general font stretching and spacing)
-			$txwidth = $this->GetStringWidth($txt);
-			$width = $txwidth;
-			// check for stretch mode
-			if ($stretch > 0) {
-				// calculate ratio between cell width and text width
-				if ($width <= 0) {
-					$ratio = 1;
-				} else {
-					$ratio = (($w - $this->cell_padding['L'] - $this->cell_padding['R']) / $width);
-				}
-				// check if stretching is required
-				if (($ratio < 1) OR (($ratio > 1) AND (($stretch % 2) == 0))) {
-					// the text will be stretched to fit cell width
-					if ($stretch > 2) {
-						// set new character spacing
-						$this->font_spacing += ($w - $this->cell_padding['L'] - $this->cell_padding['R'] - $width) / (max(($this->GetNumChars($txt) - 1), 1) * ($this->font_stretching / 100));
-					} else {
-						// set new horizontal stretching
-						$this->font_stretching *= $ratio;
-					}
-					// recalculate text width (the text fills the entire cell)
-					$width = $w - $this->cell_padding['L'] - $this->cell_padding['R'];
-					// reset alignment
-					$align = '';
-				}
-			}
-			if ($this->font_stretching != 100) {
-				// apply font stretching
-				$rs .= sprintf('BT %F Tz ET ', $this->font_stretching);
-			}
-			if ($this->font_spacing != 0) {
-				// increase/decrease font spacing
-				$rs .= sprintf('BT %F Tc ET ', ($this->font_spacing * $this->k));
-			}
-			if ($this->ColorFlag AND ($this->textrendermode < 4)) {
-				$s .= 'q '.$this->TextColor.' ';
-			}
-			// rendering mode
-			$s .= sprintf('BT %d Tr %F w ET ', $this->textrendermode, ($this->textstrokewidth * $this->k));
-			// count number of spaces
-			$ns = substr_count($txt, chr(32));
-			// Justification
-			$spacewidth = 0;
-			if (($align == 'J') AND ($ns > 0)) {
-				if ($this->isUnicodeFont()) {
-					// get string width without spaces
-					$width = $this->GetStringWidth(str_replace(' ', '', $txt));
-					// calculate average space width
-					$spacewidth = -1000 * ($w - $width - $this->cell_padding['L'] - $this->cell_padding['R']) / ($ns?$ns:1) / ($this->FontSize?$this->FontSize:1);
-					if ($this->font_stretching != 100) {
-						// word spacing is affected by stretching
-						$spacewidth /= ($this->font_stretching / 100);
-					}
-					// set word position to be used with TJ operator
-					$txt2 = str_replace(chr(0).chr(32), ') '.sprintf('%F', $spacewidth).' (', $txt2);
-					$unicode_justification = true;
-				} else {
-					// get string width
-					$width = $txwidth;
-					// new space width
-					$spacewidth = (($w - $width - $this->cell_padding['L'] - $this->cell_padding['R']) / ($ns?$ns:1)) * $this->k;
-					if ($this->font_stretching != 100) {
-						// word spacing (Tw) is affected by stretching
-						$spacewidth /= ($this->font_stretching / 100);
-					}
-					// set word spacing
-					$rs .= sprintf('BT %F Tw ET ', $spacewidth);
-				}
-				$width = $w - $this->cell_padding['L'] - $this->cell_padding['R'];
-			}
-			// replace carriage return characters
-			$txt2 = str_replace("\r", ' ', $txt2);
-			switch ($align) {
-				case 'C': {
-					$dx = ($w - $width) / 2;
-					break;
-				}
-				case 'R': {
-					if ($this->rtl) {
-						$dx = $this->cell_padding['R'];
-					} else {
-						$dx = $w - $width - $this->cell_padding['R'];
-					}
-					break;
-				}
-				case 'L': {
-					if ($this->rtl) {
-						$dx = $w - $width - $this->cell_padding['L'];
-					} else {
-						$dx = $this->cell_padding['L'];
-					}
-					break;
-				}
-				case 'J':
-				default: {
-					if ($this->rtl) {
-						$dx = $this->cell_padding['R'];
-					} else {
-						$dx = $this->cell_padding['L'];
-					}
-					break;
-				}
-			}
-			if ($this->rtl) {
-				$xdx = $x - $dx - $width;
-			} else {
-				$xdx = $x + $dx;
-			}
-			$xdk = $xdx * $k;
-			// print text
-			$s .= sprintf('BT %F %F Td [(%s)] TJ ET', $xdk, (($this->h - $basefonty) * $k), $txt2);
-			if (isset($uniblock)) {
-				// print overlapping characters as separate string
-				$xshift = 0; // horizontal shift
-				$ty = (($this->h - $basefonty + (0.2 * $this->FontSize)) * $k);
-				$spw = (($w - $txwidth - $this->cell_padding['L'] - $this->cell_padding['R']) / ($ns?$ns:1));
-				foreach ($uniblock as $uk => $uniarr) {
-					if (($uk % 2) == 0) {
-						// x space to skip
-						if ($spacewidth != 0) {
-							// justification shift
-							$xshift += (count(array_keys($uniarr, 32)) * $spw);
-						}
-						$xshift += $this->GetArrStringWidth($uniarr); // + shift justification
-					} else {
-						// character to print
-						$topchr = TCPDF_FONTS::arrUTF8ToUTF16BE($uniarr, false);
-						$topchr = TCPDF_STATIC::_escape($topchr);
-						$s .= sprintf(' BT %F %F Td [(%s)] TJ ET', ($xdk + ($xshift * $k)), $ty, $topchr);
-					}
-				}
-			}
-			if ($this->underline) {
-				$s .= ' '.$this->_dounderlinew($xdx, $basefonty, $width);
-			}
-			if ($this->linethrough) {
-				$s .= ' '.$this->_dolinethroughw($xdx, $basefonty, $width);
-			}
-			if ($this->overline) {
-				$s .= ' '.$this->_dooverlinew($xdx, $basefonty, $width);
-			}
-			if ($this->ColorFlag AND ($this->textrendermode < 4)) {
-				$s .= ' Q';
-			}
-			if ($link) {
-				$this->Link($xdx, $yt, $width, ($this->FontAscent + $this->FontDescent), $link, $ns);
-			}
-		}
-		// output cell
-		if ($s) {
-			// output cell
-			$rs .= $s;
-			if ($this->font_spacing != 0) {
-				// reset font spacing mode
-				$rs .= ' BT 0 Tc ET';
-			}
-			if ($this->font_stretching != 100) {
-				// reset font stretching mode
-				$rs .= ' BT 100 Tz ET';
-			}
-		}
-		// reset word spacing
-		if (!$this->isUnicodeFont() AND ($align == 'J')) {
-			$rs .= ' BT 0 Tw ET';
-		}
-		// reset stretching and spacing
-		$this->font_stretching = $prev_font_stretching;
-		$this->font_spacing = $prev_font_spacing;
-		$this->lasth = $h;
-		if ($ln > 0) {
-			//Go to the beginning of the next line
-			$this->y = $y + $h + $this->cell_margin['B'];
-			if ($ln == 1) {
-				if ($this->rtl) {
-					$this->x = $this->w - $this->rMargin;
-				} else {
-					$this->x = $this->lMargin;
-				}
-			}
-		} else {
-			// go left or right by case
-			if ($this->rtl) {
-				$this->x = $x - $w - $this->cell_margin['L'];
-			} else {
-				$this->x = $x + $w + $this->cell_margin['R'];
-			}
-		}
-		$gstyles = ''.$this->linestyleWidth.' '.$this->linestyleCap.' '.$this->linestyleJoin.' '.$this->linestyleDash.' '.$this->DrawColor.' '.$this->FillColor."\n";
-		$rs = $gstyles.$rs;
-		$this->cell_padding = $prev_cell_padding;
-		$this->cell_margin = $prev_cell_margin;
-		return $rs;
-	}
-
-	/**
-	 * Replace a char if is defined on the current font.
-	 * @param $oldchar (int) Integer code (unicode) of the character to replace.
-	 * @param $newchar (int) Integer code (unicode) of the new character.
-	 * @return int the replaced char or the old char in case the new char i not defined
-	 * @protected
-	 * @since 5.9.167 (2012-06-22)
-	 */
-	protected function replaceChar($oldchar, $newchar) {
-		if ($this->isCharDefined($newchar)) {
-			// add the new char on the subset list
-			$this->CurrentFont['subsetchars'][$newchar] = true;
-			// return the new character
-			return $newchar;
-		}
-		// return the old char
-		return $oldchar;
-	}
-
-	/**
-	 * Returns the code to draw the cell border
-	 * @param $x (float) X coordinate.
-	 * @param $y (float) Y coordinate.
-	 * @param $w (float) Cell width.
-	 * @param $h (float) Cell height.
-	 * @param $brd (mixed) Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
-	 * @return string containing cell border code
-	 * @protected
-	 * @see SetLineStyle()
-	 * @since 5.7.000 (2010-08-02)
-	 */
-	protected function getCellBorder($x, $y, $w, $h, $brd) {
-		$s = ''; // string to be returned
-		if (empty($brd)) {
-			return $s;
-		}
-		if ($brd == 1) {
-			$brd = array('LRTB' => true);
-		}
-		// calculate coordinates for border
-		$k = $this->k;
-		if ($this->rtl) {
-			$xeL = ($x - $w) * $k;
-			$xeR = $x * $k;
-		} else {
-			$xeL = $x * $k;
-			$xeR = ($x + $w) * $k;
-		}
-		$yeL = (($this->h - ($y + $h)) * $k);
-		$yeT = (($this->h - $y) * $k);
-		$xeT = $xeL;
-		$xeB = $xeR;
-		$yeR = $yeT;
-		$yeB = $yeL;
-		if (is_string($brd)) {
-			// convert string to array
-			$slen = strlen($brd);
-			$newbrd = array();
-			for ($i = 0; $i < $slen; ++$i) {
-				$newbrd[$brd[$i]] = array('cap' => 'square', 'join' => 'miter');
-			}
-			$brd = $newbrd;
-		}
-		if (isset($brd['mode'])) {
-			$mode = $brd['mode'];
-			unset($brd['mode']);
-		} else {
-			$mode = 'normal';
-		}
-		foreach ($brd as $border => $style) {
-			if (is_array($style) AND !empty($style)) {
-				// apply border style
-				$prev_style = $this->linestyleWidth.' '.$this->linestyleCap.' '.$this->linestyleJoin.' '.$this->linestyleDash.' '.$this->DrawColor.' ';
-				$s .= $this->SetLineStyle($style, true)."\n";
-			}
-			switch ($mode) {
-				case 'ext': {
-					$off = (($this->LineWidth / 2) * $k);
-					$xL = $xeL - $off;
-					$xR = $xeR + $off;
-					$yT = $yeT + $off;
-					$yL = $yeL - $off;
-					$xT = $xL;
-					$xB = $xR;
-					$yR = $yT;
-					$yB = $yL;
-					$w += $this->LineWidth;
-					$h += $this->LineWidth;
-					break;
-				}
-				case 'int': {
-					$off = ($this->LineWidth / 2) * $k;
-					$xL = $xeL + $off;
-					$xR = $xeR - $off;
-					$yT = $yeT - $off;
-					$yL = $yeL + $off;
-					$xT = $xL;
-					$xB = $xR;
-					$yR = $yT;
-					$yB = $yL;
-					$w -= $this->LineWidth;
-					$h -= $this->LineWidth;
-					break;
-				}
-				case 'normal':
-				default: {
-					$xL = $xeL;
-					$xT = $xeT;
-					$xB = $xeB;
-					$xR = $xeR;
-					$yL = $yeL;
-					$yT = $yeT;
-					$yB = $yeB;
-					$yR = $yeR;
-					break;
-				}
-			}
-			// draw borders by case
-			if (strlen($border) == 4) {
-				$s .= sprintf('%F %F %F %F re S ', $xT, $yT, ($w * $k), (-$h * $k));
-			} elseif (strlen($border) == 3) {
-				if (strpos($border,'B') === false) { // LTR
-					$s .= sprintf('%F %F m ', $xL, $yL);
-					$s .= sprintf('%F %F l ', $xT, $yT);
-					$s .= sprintf('%F %F l ', $xR, $yR);
-					$s .= sprintf('%F %F l ', $xB, $yB);
-					$s .= 'S ';
-				} elseif (strpos($border,'L') === false) { // TRB
-					$s .= sprintf('%F %F m ', $xT, $yT);
-					$s .= sprintf('%F %F l ', $xR, $yR);
-					$s .= sprintf('%F %F l ', $xB, $yB);
-					$s .= sprintf('%F %F l ', $xL, $yL);
-					$s .= 'S ';
-				} elseif (strpos($border,'T') === false) { // RBL
-					$s .= sprintf('%F %F m ', $xR, $yR);
-					$s .= sprintf('%F %F l ', $xB, $yB);
-					$s .= sprintf('%F %F l ', $xL, $yL);
-					$s .= sprintf('%F %F l ', $xT, $yT);
-					$s .= 'S ';
-				} elseif (strpos($border,'R') === false) { // BLT
-					$s .= sprintf('%F %F m ', $xB, $yB);
-					$s .= sprintf('%F %F l ', $xL, $yL);
-					$s .= sprintf('%F %F l ', $xT, $yT);
-					$s .= sprintf('%F %F l ', $xR, $yR);
-					$s .= 'S ';
-				}
-			} elseif (strlen($border) == 2) {
-				if ((strpos($border,'L') !== false) AND (strpos($border,'T') !== false)) { // LT
-					$s .= sprintf('%F %F m ', $xL, $yL);
-					$s .= sprintf('%F %F l ', $xT, $yT);
-					$s .= sprintf('%F %F l ', $xR, $yR);
-					$s .= 'S ';
-				} elseif ((strpos($border,'T') !== false) AND (strpos($border,'R') !== false)) { // TR
-					$s .= sprintf('%F %F m ', $xT, $yT);
-					$s .= sprintf('%F %F l ', $xR, $yR);
-					$s .= sprintf('%F %F l ', $xB, $yB);
-					$s .= 'S ';
-				} elseif ((strpos($border,'R') !== false) AND (strpos($border,'B') !== false)) { // RB
-					$s .= sprintf('%F %F m ', $xR, $yR);
-					$s .= sprintf('%F %F l ', $xB, $yB);
-					$s .= sprintf('%F %F l ', $xL, $yL);
-					$s .= 'S ';
-				} elseif ((strpos($border,'B') !== false) AND (strpos($border,'L') !== false)) { // BL
-					$s .= sprintf('%F %F m ', $xB, $yB);
-					$s .= sprintf('%F %F l ', $xL, $yL);
-					$s .= sprintf('%F %F l ', $xT, $yT);
-					$s .= 'S ';
-				} elseif ((strpos($border,'L') !== false) AND (strpos($border,'R') !== false)) { // LR
-					$s .= sprintf('%F %F m ', $xL, $yL);
-					$s .= sprintf('%F %F l ', $xT, $yT);
-					$s .= 'S ';
-					$s .= sprintf('%F %F m ', $xR, $yR);
-					$s .= sprintf('%F %F l ', $xB, $yB);
-					$s .= 'S ';
-				} elseif ((strpos($border,'T') !== false) AND (strpos($border,'B') !== false)) { // TB
-					$s .= sprintf('%F %F m ', $xT, $yT);
-					$s .= sprintf('%F %F l ', $xR, $yR);
-					$s .= 'S ';
-					$s .= sprintf('%F %F m ', $xB, $yB);
-					$s .= sprintf('%F %F l ', $xL, $yL);
-					$s .= 'S ';
-				}
-			} else { // strlen($border) == 1
-				if (strpos($border,'L') !== false) { // L
-					$s .= sprintf('%F %F m ', $xL, $yL);
-					$s .= sprintf('%F %F l ', $xT, $yT);
-					$s .= 'S ';
-				} elseif (strpos($border,'T') !== false) { // T
-					$s .= sprintf('%F %F m ', $xT, $yT);
-					$s .= sprintf('%F %F l ', $xR, $yR);
-					$s .= 'S ';
-				} elseif (strpos($border,'R') !== false) { // R
-					$s .= sprintf('%F %F m ', $xR, $yR);
-					$s .= sprintf('%F %F l ', $xB, $yB);
-					$s .= 'S ';
-				} elseif (strpos($border,'B') !== false) { // B
-					$s .= sprintf('%F %F m ', $xB, $yB);
-					$s .= sprintf('%F %F l ', $xL, $yL);
-					$s .= 'S ';
-				}
-			}
-			if (is_array($style) AND !empty($style)) {
-				// reset border style to previous value
-				$s .= "\n".$this->linestyleWidth.' '.$this->linestyleCap.' '.$this->linestyleJoin.' '.$this->linestyleDash.' '.$this->DrawColor."\n";
-			}
-		}
-		return $s;
-	}
-
-	/**
-	 * This method allows printing text with line breaks.
-	 * They can be automatic (as soon as the text reaches the right border of the cell) or explicit (via the \n character). As many cells as necessary are output, one below the other.<br />
-	 * Text can be aligned, centered or justified. The cell block can be framed and the background painted.
-	 * @param $w (float) Width of cells. If 0, they extend up to the right margin of the page.
-	 * @param $h (float) Cell minimum height. The cell extends automatically if needed.
-	 * @param $txt (string) String to print
-	 * @param $border (mixed) Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
-	 * @param $align (string) Allows to center or align the text. Possible values are:<ul><li>L or empty string: left align</li><li>C: center</li><li>R: right align</li><li>J: justification (default value when $ishtml=false)</li></ul>
-	 * @param $fill (boolean) Indicates if the cell background must be painted (true) or transparent (false).
-	 * @param $ln (int) Indicates where the current position should go after the call. Possible values are:<ul><li>0: to the right</li><li>1: to the beginning of the next line [DEFAULT]</li><li>2: below</li></ul>
-	 * @param $x (float) x position in user units
-	 * @param $y (float) y position in user units
-	 * @param $reseth (boolean) if true reset the last cell height (default true).
-	 * @param $stretch (int) font stretch mode: <ul><li>0 = disabled</li><li>1 = horizontal scaling only if text is larger than cell width</li><li>2 = forced horizontal scaling to fit cell width</li><li>3 = character spacing only if text is larger than cell width</li><li>4 = forced character spacing to fit cell width</li></ul> General font stretching and scaling values will be preserved when possible.
-	 * @param $ishtml (boolean) INTERNAL USE ONLY -- set to true if $txt is HTML content (default = false). Never set this parameter to true, use instead writeHTMLCell() or writeHTML() methods.
-	 * @param $autopadding (boolean) if true, uses internal padding and automatically adjust it to account for line width.
-	 * @param $maxh (float) maximum height. It should be >= $h and less then remaining space to the bottom of the page, or 0 for disable this feature. This feature works only when $ishtml=false.
-	 * @param $valign (string) Vertical alignment of text (requires $maxh = $h > 0). Possible values are:<ul><li>T: TOP</li><li>M: middle</li><li>B: bottom</li></ul>. This feature works only when $ishtml=false and the cell must fit in a single page.
-	 * @param $fitcell (boolean) if true attempt to fit all the text within the cell by reducing the font size (do not work in HTML mode). $maxh must be greater than 0 and equal to $h.
-	 * @return int Return the number of cells or 1 for html mode.
-	 * @public
-	 * @since 1.3
-	 * @see SetFont(), SetDrawColor(), SetFillColor(), SetTextColor(), SetLineWidth(), Cell(), Write(), SetAutoPageBreak()
-	 */
-	public function MultiCell($w, $h, $txt, $border=0, $align='J', $fill=false, $ln=1, $x='', $y='', $reseth=true, $stretch=0, $ishtml=false, $autopadding=true, $maxh=0, $valign='T', $fitcell=false) {
-		$prev_cell_margin = $this->cell_margin;
-		$prev_cell_padding = $this->cell_padding;
-		// adjust internal padding
-		$this->adjustCellPadding($border);
-		$mc_padding = $this->cell_padding;
-		$mc_margin = $this->cell_margin;
-		$this->cell_padding['T'] = 0;
-		$this->cell_padding['B'] = 0;
-		$this->setCellMargins(0, 0, 0, 0);
-		if (TCPDF_STATIC::empty_string($this->lasth) OR $reseth) {
-			// reset row height
-			$this->resetLastH();
-		}
-		if (!TCPDF_STATIC::empty_string($y)) {
-			$this->SetY($y);
-		} else {
-			$y = $this->GetY();
-		}
-		$resth = 0;
-		if (($h > 0) AND $this->inPageBody() AND (($y + $h + $mc_margin['T'] + $mc_margin['B']) > $this->PageBreakTrigger)) {
-			// spit cell in more pages/columns
-			$newh = ($this->PageBreakTrigger - $y);
-			$resth = ($h - $newh); // cell to be printed on the next page/column
-			$h = $newh;
-		}
-		// get current page number
-		$startpage = $this->page;
-		// get current column
-		$startcolumn = $this->current_column;
-		if (!TCPDF_STATIC::empty_string($x)) {
-			$this->SetX($x);
-		} else {
-			$x = $this->GetX();
-		}
-		// check page for no-write regions and adapt page margins if necessary
-		list($x, $y) = $this->checkPageRegions(0, $x, $y);
-		// apply margins
-		$oy = $y + $mc_margin['T'];
-		if ($this->rtl) {
-			$ox = ($this->w - $x - $mc_margin['R']);
-		} else {
-			$ox = ($x + $mc_margin['L']);
-		}
-		$this->x = $ox;
-		$this->y = $oy;
-		// set width
-		if (TCPDF_STATIC::empty_string($w) OR ($w <= 0)) {
-			if ($this->rtl) {
-				$w = ($this->x - $this->lMargin - $mc_margin['L']);
-			} else {
-				$w = ($this->w - $this->x - $this->rMargin - $mc_margin['R']);
-			}
-		}
-		// store original margin values
-		$lMargin = $this->lMargin;
-		$rMargin = $this->rMargin;
-		if ($this->rtl) {
-			$this->rMargin = ($this->w - $this->x);
-			$this->lMargin = ($this->x - $w);
-		} else {
-			$this->lMargin = ($this->x);
-			$this->rMargin = ($this->w - $this->x - $w);
-		}
-		$this->clMargin = $this->lMargin;
-		$this->crMargin = $this->rMargin;
-		if ($autopadding) {
-			// add top padding
-			$this->y += $mc_padding['T'];
-		}
-		if ($ishtml) { // ******* Write HTML text
-			$this->writeHTML($txt, true, false, $reseth, true, $align);
-			$nl = 1;
-		} else { // ******* Write simple text
-			$prev_FontSizePt = $this->FontSizePt;
-			if ($fitcell) {
-				// ajust height values
-				$tobottom = ($this->h - $this->y - $this->bMargin - $this->cell_padding['T'] - $this->cell_padding['B']);
-				$h = $maxh = max(min($h, $tobottom), min($maxh, $tobottom));
-			}
-			// vertical alignment
-			if ($maxh > 0) {
-				// get text height
-				$text_height = $this->getStringHeight($w, $txt, $reseth, $autopadding, $mc_padding, $border);
-				if ($fitcell AND ($text_height > $maxh) AND ($this->FontSizePt > 1)) {
-					// try to reduce font size to fit text on cell (use a quick search algorithm)
-					$fmin = 1;
-					$fmax = $this->FontSizePt;
-					$diff_epsilon = (1 / $this->k); // one point (min resolution)
-					$maxit = (2 * min(100, max(10, intval($fmax)))); // max number of iterations
-					while ($maxit >= 0) {
-						$fmid = (($fmax + $fmin) / 2);
-						$this->SetFontSize($fmid, false);
-						$this->resetLastH();
-						$text_height = $this->getStringHeight($w, $txt, $reseth, $autopadding, $mc_padding, $border);
-						$diff = ($maxh - $text_height);
-						if ($diff >= 0) {
-							if ($diff <= $diff_epsilon) {
-								break;
-							}
-							$fmin = $fmid;
-						} else {
-							$fmax = $fmid;
-						}
-						--$maxit;
-					}
-					if ($maxit < 0) {
-						// premature exit, we get the minimum font value to fit the cell
-						$this->SetFontSize($fmin);
-						$this->resetLastH();
-						$text_height = $this->getStringHeight($w, $txt, $reseth, $autopadding, $mc_padding, $border);
-					} else {
-						$this->SetFontSize($fmid);
-						$this->resetLastH();
-					}
-				}
-				if ($text_height < $maxh) {
-					if ($valign == 'M') {
-						// text vertically centered
-						$this->y += (($maxh - $text_height) / 2);
-					} elseif ($valign == 'B') {
-						// text vertically aligned on bottom
-						$this->y += ($maxh - $text_height);
-					}
-				}
-			}
-			$nl = $this->Write($this->lasth, $txt, '', 0, $align, true, $stretch, false, true, $maxh, 0, $mc_margin);
-			if ($fitcell) {
-				// restore font size
-				$this->SetFontSize($prev_FontSizePt);
-			}
-		}
-		if ($autopadding) {
-			// add bottom padding
-			$this->y += $mc_padding['B'];
-		}
-		// Get end-of-text Y position
-		$currentY = $this->y;
-		// get latest page number
-		$endpage = $this->page;
-		if ($resth > 0) {
-			$skip = ($endpage - $startpage);
-			$tmpresth = $resth;
-			while ($tmpresth > 0) {
-				if ($skip <= 0) {
-					// add a page (or trig AcceptPageBreak() for multicolumn mode)
-					$this->checkPageBreak($this->PageBreakTrigger + 1);
-				}
-				if ($this->num_columns > 1) {
-					$tmpresth -= ($this->h - $this->y - $this->bMargin);
-				} else {
-					$tmpresth -= ($this->h - $this->tMargin - $this->bMargin);
-				}
-				--$skip;
-			}
-			$currentY = $this->y;
-			$endpage = $this->page;
-		}
-		// get latest column
-		$endcolumn = $this->current_column;
-		if ($this->num_columns == 0) {
-			$this->num_columns = 1;
-		}
-		// disable page regions check
-		$check_page_regions = $this->check_page_regions;
-		$this->check_page_regions = false;
-		// get border modes
-		$border_start = TCPDF_STATIC::getBorderMode($border, $position='start', $this->opencell);
-		$border_end = TCPDF_STATIC::getBorderMode($border, $position='end', $this->opencell);
-		$border_middle = TCPDF_STATIC::getBorderMode($border, $position='middle', $this->opencell);
-		// design borders around HTML cells.
-		for ($page = $startpage; $page <= $endpage; ++$page) { // for each page
-			$ccode = '';
-			$this->setPage($page);
-			if ($this->num_columns < 2) {
-				// single-column mode
-				$this->SetX($x);
-				$this->y = $this->tMargin;
-			}
-			// account for margin changes
-			if ($page > $startpage) {
-				if (($this->rtl) AND ($this->pagedim[$page]['orm'] != $this->pagedim[$startpage]['orm'])) {
-					$this->x -= ($this->pagedim[$page]['orm'] - $this->pagedim[$startpage]['orm']);
-				} elseif ((!$this->rtl) AND ($this->pagedim[$page]['olm'] != $this->pagedim[$startpage]['olm'])) {
-					$this->x += ($this->pagedim[$page]['olm'] - $this->pagedim[$startpage]['olm']);
-				}
-			}
-			if ($startpage == $endpage) {
-				// single page
-				for ($column = $startcolumn; $column <= $endcolumn; ++$column) { // for each column
-					$this->selectColumn($column);
-					if ($this->rtl) {
-						$this->x -= $mc_margin['R'];
-					} else {
-						$this->x += $mc_margin['L'];
-					}
-					if ($startcolumn == $endcolumn) { // single column
-						$cborder = $border;
-						$h = max($h, ($currentY - $oy));
-						$this->y = $oy;
-					} elseif ($column == $startcolumn) { // first column
-						$cborder = $border_start;
-						$this->y = $oy;
-						$h = $this->h - $this->y - $this->bMargin;
-					} elseif ($column == $endcolumn) { // end column
-						$cborder = $border_end;
-						$h = $currentY - $this->y;
-						if ($resth > $h) {
-							$h = $resth;
-						}
-					} else { // middle column
-						$cborder = $border_middle;
-						$h = $this->h - $this->y - $this->bMargin;
-						$resth -= $h;
-					}
-					$ccode .= $this->getCellCode($w, $h, '', $cborder, 1, '', $fill, '', 0, true)."\n";
-				} // end for each column
-			} elseif ($page == $startpage) { // first page
-				for ($column = $startcolumn; $column < $this->num_columns; ++$column) { // for each column
-					$this->selectColumn($column);
-					if ($this->rtl) {
-						$this->x -= $mc_margin['R'];
-					} else {
-						$this->x += $mc_margin['L'];
-					}
-					if ($column == $startcolumn) { // first column
-						$cborder = $border_start;
-						$this->y = $oy;
-						$h = $this->h - $this->y - $this->bMargin;
-					} else { // middle column
-						$cborder = $border_middle;
-						$h = $this->h - $this->y - $this->bMargin;
-						$resth -= $h;
-					}
-					$ccode .= $this->getCellCode($w, $h, '', $cborder, 1, '', $fill, '', 0, true)."\n";
-				} // end for each column
-			} elseif ($page == $endpage) { // last page
-				for ($column = 0; $column <= $endcolumn; ++$column) { // for each column
-					$this->selectColumn($column);
-					if ($this->rtl) {
-						$this->x -= $mc_margin['R'];
-					} else {
-						$this->x += $mc_margin['L'];
-					}
-					if ($column == $endcolumn) {
-						// end column
-						$cborder = $border_end;
-						$h = $currentY - $this->y;
-						if ($resth > $h) {
-							$h = $resth;
-						}
-					} else {
-						// middle column
-						$cborder = $border_middle;
-						$h = $this->h - $this->y - $this->bMargin;
-						$resth -= $h;
-					}
-					$ccode .= $this->getCellCode($w, $h, '', $cborder, 1, '', $fill, '', 0, true)."\n";
-				} // end for each column
-			} else { // middle page
-				for ($column = 0; $column < $this->num_columns; ++$column) { // for each column
-					$this->selectColumn($column);
-					if ($this->rtl) {
-						$this->x -= $mc_margin['R'];
-					} else {
-						$this->x += $mc_margin['L'];
-					}
-					$cborder = $border_middle;
-					$h = $this->h - $this->y - $this->bMargin;
-					$resth -= $h;
-					$ccode .= $this->getCellCode($w, $h, '', $cborder, 1, '', $fill, '', 0, true)."\n";
-				} // end for each column
-			}
-			if ($cborder OR $fill) {
-				$offsetlen = strlen($ccode);
-				// draw border and fill
-				if ($this->inxobj) {
-					// we are inside an XObject template
-					if (end($this->xobjects[$this->xobjid]['transfmrk']) !== false) {
-						$pagemarkkey = key($this->xobjects[$this->xobjid]['transfmrk']);
-						$pagemark = $this->xobjects[$this->xobjid]['transfmrk'][$pagemarkkey];
-						$this->xobjects[$this->xobjid]['transfmrk'][$pagemarkkey] += $offsetlen;
-					} else {
-						$pagemark = $this->xobjects[$this->xobjid]['intmrk'];
-						$this->xobjects[$this->xobjid]['intmrk'] += $offsetlen;
-					}
-					$pagebuff = $this->xobjects[$this->xobjid]['outdata'];
-					$pstart = substr($pagebuff, 0, $pagemark);
-					$pend = substr($pagebuff, $pagemark);
-					$this->xobjects[$this->xobjid]['outdata'] = $pstart.$ccode.$pend;
-				} else {
-					if (end($this->transfmrk[$this->page]) !== false) {
-						$pagemarkkey = key($this->transfmrk[$this->page]);
-						$pagemark = $this->transfmrk[$this->page][$pagemarkkey];
-						$this->transfmrk[$this->page][$pagemarkkey] += $offsetlen;
-					} elseif ($this->InFooter) {
-						$pagemark = $this->footerpos[$this->page];
-						$this->footerpos[$this->page] += $offsetlen;
-					} else {
-						$pagemark = $this->intmrk[$this->page];
-						$this->intmrk[$this->page] += $offsetlen;
-					}
-					$pagebuff = $this->getPageBuffer($this->page);
-					$pstart = substr($pagebuff, 0, $pagemark);
-					$pend = substr($pagebuff, $pagemark);
-					$this->setPageBuffer($this->page, $pstart.$ccode.$pend);
-				}
-			}
-		} // end for each page
-		// restore page regions check
-		$this->check_page_regions = $check_page_regions;
-		// Get end-of-cell Y position
-		$currentY = $this->GetY();
-		// restore previous values
-		if ($this->num_columns > 1) {
-			$this->selectColumn();
-		} else {
-			// restore original margins
-			$this->lMargin = $lMargin;
-			$this->rMargin = $rMargin;
-			if ($this->page > $startpage) {
-				// check for margin variations between pages (i.e. booklet mode)
-				$dl = ($this->pagedim[$this->page]['olm'] - $this->pagedim[$startpage]['olm']);
-				$dr = ($this->pagedim[$this->page]['orm'] - $this->pagedim[$startpage]['orm']);
-				if (($dl != 0) OR ($dr != 0)) {
-					$this->lMargin += $dl;
-					$this->rMargin += $dr;
-				}
-			}
-		}
-		if ($ln > 0) {
-			//Go to the beginning of the next line
-			$this->SetY($currentY + $mc_margin['B']);
-			if ($ln == 2) {
-				$this->SetX($x + $w + $mc_margin['L'] + $mc_margin['R']);
-			}
-		} else {
-			// go left or right by case
-			$this->setPage($startpage);
-			$this->y = $y;
-			$this->SetX($x + $w + $mc_margin['L'] + $mc_margin['R']);
-		}
-		$this->setContentMark();
-		$this->cell_padding = $prev_cell_padding;
-		$this->cell_margin = $prev_cell_margin;
-		$this->clMargin = $this->lMargin;
-		$this->crMargin = $this->rMargin;
-		return $nl;
-	}
-
-	/**
-	 * This method return the estimated number of lines for print a simple text string using Multicell() method.
-	 * @param $txt (string) String for calculating his height
-	 * @param $w (float) Width of cells. If 0, they extend up to the right margin of the page.
-	 * @param $reseth (boolean) if true reset the last cell height (default false).
-	 * @param $autopadding (boolean) if true, uses internal padding and automatically adjust it to account for line width (default true).
-	 * @param $cellpadding (float) Internal cell padding, if empty uses default cell padding.
-	 * @param $border (mixed) Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
-	 * @return float Return the minimal height needed for multicell method for printing the $txt param.
-	 * @author Alexander Escalona Fern\E1ndez, Nicola Asuni
-	 * @public
-	 * @since 4.5.011
-	 */
-	public function getNumLines($txt, $w=0, $reseth=false, $autopadding=true, $cellpadding='', $border=0) {
-		if ($txt === NULL) {
-			return 0;
-		}
-		if ($txt === '') {
-			// empty string
-			return 1;
-		}
-		// adjust internal padding
-		$prev_cell_padding = $this->cell_padding;
-		$prev_lasth = $this->lasth;
-		if (is_array($cellpadding)) {
-			$this->cell_padding = $cellpadding;
-		}
-		$this->adjustCellPadding($border);
-		if (TCPDF_STATIC::empty_string($w) OR ($w <= 0)) {
-			if ($this->rtl) {
-				$w = $this->x - $this->lMargin;
-			} else {
-				$w = $this->w - $this->rMargin - $this->x;
-			}
-		}
-		$wmax = $w - $this->cell_padding['L'] - $this->cell_padding['R'];
-		if ($reseth) {
-			// reset row height
-			$this->resetLastH();
-		}
-		$lines = 1;
-		$sum = 0;
-		$chars = TCPDF_FONTS::utf8Bidi(TCPDF_FONTS::UTF8StringToArray($txt, $this->isunicode, $this->CurrentFont), $txt, $this->tmprtl, $this->isunicode, $this->CurrentFont);
-		$charsWidth = $this->GetArrStringWidth($chars, '', '', 0, true);
-		$length = count($chars);
-		$lastSeparator = -1;
-		for ($i = 0; $i < $length; ++$i) {
-			$c = $chars[$i];
-			$charWidth = $charsWidth[$i];
-			if (($c != 160)
-					AND (($c == 173)
-						OR preg_match($this->re_spaces, TCPDF_FONTS::unichr($c, $this->isunicode))
-						OR (($c == 45)
-							AND ($i > 0) AND ($i < ($length - 1))
-							AND @preg_match('/[\p{L}]/'.$this->re_space['m'], TCPDF_FONTS::unichr($chars[($i - 1)], $this->isunicode))
-							AND @preg_match('/[\p{L}]/'.$this->re_space['m'], TCPDF_FONTS::unichr($chars[($i + 1)], $this->isunicode))
-						)
-					)
-				) {
-				$lastSeparator = $i;
-			}
-			if ((($sum + $charWidth) > $wmax) OR ($c == 10)) {
-				++$lines;
-				if ($c == 10) {
-					$lastSeparator = -1;
-					$sum = 0;
-				} elseif ($lastSeparator != -1) {
-					$i = $lastSeparator;
-					$lastSeparator = -1;
-					$sum = 0;
-				} else {
-					$sum = $charWidth;
-				}
-			} else {
-				$sum += $charWidth;
-			}
-		}
-		if ($chars[($length - 1)] == 10) {
-			--$lines;
-		}
-		$this->cell_padding = $prev_cell_padding;
-		$this->lasth = $prev_lasth;
-		return $lines;
-	}
-
-	/**
-	 * This method return the estimated height needed for printing a simple text string using the Multicell() method.
-	 * Generally, if you want to know the exact height for a block of content you can use the following alternative technique:
-	 * @pre
-	 *  // store current object
-	 *  $pdf->startTransaction();
-	 *  // store starting values
-	 *  $start_y = $pdf->GetY();
-	 *  $start_page = $pdf->getPage();
-	 *  // call your printing functions with your parameters
-	 *  // - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-	 *  $pdf->MultiCell($w=0, $h=0, $txt, $border=1, $align='L', $fill=false, $ln=1, $x='', $y='', $reseth=true, $stretch=0, $ishtml=false, $autopadding=true, $maxh=0);
-	 *  // - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-	 *  // get the new Y
-	 *  $end_y = $pdf->GetY();
-	 *  $end_page = $pdf->getPage();
-	 *  // calculate height
-	 *  $height = 0;
-	 *  if ($end_page == $start_page) {
-	 *  	$height = $end_y - $start_y;
-	 *  } else {
-	 *  	for ($page=$start_page; $page <= $end_page; ++$page) {
-	 *  		$this->setPage($page);
-	 *  		if ($page == $start_page) {
-	 *  			// first page
-	 *  			$height = $this->h - $start_y - $this->bMargin;
-	 *  		} elseif ($page == $end_page) {
-	 *  			// last page
-	 *  			$height = $end_y - $this->tMargin;
-	 *  		} else {
-	 *  			$height = $this->h - $this->tMargin - $this->bMargin;
-	 *  		}
-	 *  	}
-	 *  }
-	 *  // restore previous object
-	 *  $pdf = $pdf->rollbackTransaction();
-	 *
-	 * @param $w (float) Width of cells. If 0, they extend up to the right margin of the page.
-	 * @param $txt (string) String for calculating his height
-	 * @param $reseth (boolean) if true reset the last cell height (default false).
-	 * @param $autopadding (boolean) if true, uses internal padding and automatically adjust it to account for line width (default true).
-	 * @param $cellpadding (float) Internal cell padding, if empty uses default cell padding.
-	 * @param $border (mixed) Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
-	 * @return float Return the minimal height needed for multicell method for printing the $txt param.
-	 * @author Nicola Asuni, Alexander Escalona Fern\E1ndez
-	 * @public
-	 */
-	public function getStringHeight($w, $txt, $reseth=false, $autopadding=true, $cellpadding='', $border=0) {
-		// adjust internal padding
-		$prev_cell_padding = $this->cell_padding;
-		$prev_lasth = $this->lasth;
-		if (is_array($cellpadding)) {
-			$this->cell_padding = $cellpadding;
-		}
-		$this->adjustCellPadding($border);
-		$lines = $this->getNumLines($txt, $w, $reseth, $autopadding, $cellpadding, $border);
-		$height = $this->getCellHeight(($lines * $this->FontSize), $autopadding);
-		$this->cell_padding = $prev_cell_padding;
-		$this->lasth = $prev_lasth;
-		return $height;
-	}
-
-	/**
-	 * This method prints text from the current position.<br />
-	 * @param $h (float) Line height
-	 * @param $txt (string) String to print
-	 * @param $link (mixed) URL or identifier returned by AddLink()
-	 * @param $fill (boolean) Indicates if the cell background must be painted (true) or transparent (false).
-	 * @param $align (string) Allows to center or align the text. Possible values are:<ul><li>L or empty string: left align (default value)</li><li>C: center</li><li>R: right align</li><li>J: justify</li></ul>
-	 * @param $ln (boolean) if true set cursor at the bottom of the line, otherwise set cursor at the top of the line.
-	 * @param $stretch (int) font stretch mode: <ul><li>0 = disabled</li><li>1 = horizontal scaling only if text is larger than cell width</li><li>2 = forced horizontal scaling to fit cell width</li><li>3 = character spacing only if text is larger than cell width</li><li>4 = forced character spacing to fit cell width</li></ul> General font stretching and scaling values will be preserved when possible.
-	 * @param $firstline (boolean) if true prints only the first line and return the remaining string.
-	 * @param $firstblock (boolean) if true the string is the starting of a line.
-	 * @param $maxh (float) maximum height. It should be >= $h and less then remaining space to the bottom of the page, or 0 for disable this feature.
-	 * @param $wadj (float) first line width will be reduced by this amount (used in HTML mode).
-	 * @param $margin (array) margin array of the parent container
-	 * @return mixed Return the number of cells or the remaining string if $firstline = true.
-	 * @public
-	 * @since 1.5
-	 */
-	public function Write($h, $txt, $link='', $fill=false, $align='', $ln=false, $stretch=0, $firstline=false, $firstblock=false, $maxh=0, $wadj=0, $margin='') {
-		// check page for no-write regions and adapt page margins if necessary
-		list($this->x, $this->y) = $this->checkPageRegions($h, $this->x, $this->y);
-		if (strlen($txt) == 0) {
-			// fix empty text
-			$txt = ' ';
-		}
-		if ($margin === '') {
-			// set default margins
-			$margin = $this->cell_margin;
-		}
-		// remove carriage returns
-		$s = str_replace("\r", '', $txt);
-		// check if string contains arabic text
-		if (preg_match(TCPDF_FONT_DATA::$uni_RE_PATTERN_ARABIC, $s)) {
-			$arabic = true;
-		} else {
-			$arabic = false;
-		}
-		// check if string contains RTL text
-		if ($arabic OR ($this->tmprtl == 'R') OR preg_match(TCPDF_FONT_DATA::$uni_RE_PATTERN_RTL, $s)) {
-			$rtlmode = true;
-		} else {
-			$rtlmode = false;
-		}
-		// get a char width
-		$chrwidth = $this->GetCharWidth(46); // dot character
-		// get array of unicode values
-		$chars = TCPDF_FONTS::UTF8StringToArray($s, $this->isunicode, $this->CurrentFont);
-		// calculate maximum width for a single character on string
-		$chrw = $this->GetArrStringWidth($chars, '', '', 0, true);
-		array_walk($chrw, array($this, 'getRawCharWidth'));
-		$maxchwidth = max($chrw);
-		// get array of chars
-		$uchars = TCPDF_FONTS::UTF8ArrayToUniArray($chars, $this->isunicode);
-		// get the number of characters
-		$nb = count($chars);
-		// replacement for SHY character (minus symbol)
-		$shy_replacement = 45;
-		$shy_replacement_char = TCPDF_FONTS::unichr($shy_replacement, $this->isunicode);
-		// widht for SHY replacement
-		$shy_replacement_width = $this->GetCharWidth($shy_replacement);
-		// page width
-		$pw = $w = $this->w - $this->lMargin - $this->rMargin;
-		// calculate remaining line width ($w)
-		if ($this->rtl) {
-			$w = $this->x - $this->lMargin;
-		} else {
-			$w = $this->w - $this->rMargin - $this->x;
-		}
-		// max column width
-		$wmax = ($w - $wadj);
-		if (!$firstline) {
-			$wmax -= ($this->cell_padding['L'] + $this->cell_padding['R']);
-		}
-		if ((!$firstline) AND (($chrwidth > $wmax) OR ($maxchwidth > $wmax))) {
-			// the maximum width character do not fit on column
-			return '';
-		}
-		// minimum row height
-		$row_height = max($h, $this->getCellHeight($this->FontSize));
-		// max Y
-		$maxy = $this->y + $maxh - max($row_height, $h);
-		$start_page = $this->page;
-		$i = 0; // character position
-		$j = 0; // current starting position
-		$sep = -1; // position of the last blank space
-		$prevsep = $sep; // previous separator
-		$shy = false; // true if the last blank is a soft hypen (SHY)
-		$prevshy = $shy; // previous shy mode
-		$l = 0; // current string length
-		$nl = 0; //number of lines
-		$linebreak = false;
-		$pc = 0; // previous character
-		// for each character
-		while ($i < $nb) {
-			if (($maxh > 0) AND ($this->y > $maxy) ) {
-				break;
-			}
-			//Get the current character
-			$c = $chars[$i];
-			if ($c == 10) { // 10 = "\n" = new line
-				//Explicit line break
-				if ($align == 'J') {
-					if ($this->rtl) {
-						$talign = 'R';
-					} else {
-						$talign = 'L';
-					}
-				} else {
-					$talign = $align;
-				}
-				$tmpstr = TCPDF_FONTS::UniArrSubString($uchars, $j, $i);
-				if ($firstline) {
-					$startx = $this->x;
-					$tmparr = array_slice($chars, $j, ($i - $j));
-					if ($rtlmode) {
-						$tmparr = TCPDF_FONTS::utf8Bidi($tmparr, $tmpstr, $this->tmprtl, $this->isunicode, $this->CurrentFont);
-					}
-					$linew = $this->GetArrStringWidth($tmparr);
-					unset($tmparr);
-					if ($this->rtl) {
-						$this->endlinex = $startx - $linew;
-					} else {
-						$this->endlinex = $startx + $linew;
-					}
-					$w = $linew;
-					$tmpcellpadding = $this->cell_padding;
-					if ($maxh == 0) {
-						$this->SetCellPadding(0);
-					}
-				}
-				if ($firstblock AND $this->isRTLTextDir()) {
-					$tmpstr = $this->stringRightTrim($tmpstr);
-				}
-				// Skip newlines at the beginning of a page or column
-				if (!empty($tmpstr) OR ($this->y < ($this->PageBreakTrigger - $row_height))) {
-					$this->Cell($w, $h, $tmpstr, 0, 1, $talign, $fill, $link, $stretch);
-				}
-				unset($tmpstr);
-				if ($firstline) {
-					$this->cell_padding = $tmpcellpadding;
-					return (TCPDF_FONTS::UniArrSubString($uchars, $i));
-				}
-				++$nl;
-				$j = $i + 1;
-				$l = 0;
-				$sep = -1;
-				$prevsep = $sep;
-				$shy = false;
-				// account for margin changes
-				if ((($this->y + $this->lasth) > $this->PageBreakTrigger) AND ($this->inPageBody())) {
-					$this->AcceptPageBreak();
-					if ($this->rtl) {
-						$this->x -= $margin['R'];
-					} else {
-						$this->x += $margin['L'];
-					}
-					$this->lMargin += $margin['L'];
-					$this->rMargin += $margin['R'];
-				}
-				$w = $this->getRemainingWidth();
-				$wmax = ($w - $this->cell_padding['L'] - $this->cell_padding['R']);
-			} else {
-				// 160 is the non-breaking space.
-				// 173 is SHY (Soft Hypen).
-				// \p{Z} or \p{Separator}: any kind of Unicode whitespace or invisible separator.
-				// \p{Lo} or \p{Other_Letter}: a Unicode letter or ideograph that does not have lowercase and uppercase variants.
-				// \p{Lo} is needed because Chinese characters are packed next to each other without spaces in between.
-				if (($c != 160)
-					AND (($c == 173)
-						OR preg_match($this->re_spaces, TCPDF_FONTS::unichr($c, $this->isunicode))
-						OR (($c == 45)
-							AND ($i < ($nb - 1))
-							AND @preg_match('/[\p{L}]/'.$this->re_space['m'], TCPDF_FONTS::unichr($pc, $this->isunicode))
-							AND @preg_match('/[\p{L}]/'.$this->re_space['m'], TCPDF_FONTS::unichr($chars[($i + 1)], $this->isunicode))
-						)
-					)
-				) {
-					// update last blank space position
-					$prevsep = $sep;
-					$sep = $i;
-					// check if is a SHY
-					if (($c == 173) OR ($c == 45)) {
-						$prevshy = $shy;
-						$shy = true;
-						if ($pc == 45) {
-							$tmp_shy_replacement_width = 0;
-							$tmp_shy_replacement_char = '';
-						} else {
-							$tmp_shy_replacement_width = $shy_replacement_width;
-							$tmp_shy_replacement_char = $shy_replacement_char;
-						}
-					} else {
-						$shy = false;
-					}
-				}
-				// update string length
-				if ($this->isUnicodeFont() AND ($arabic)) {
-					// with bidirectional algorithm some chars may be changed affecting the line length
-					// *** very slow ***
-					$l = $this->GetArrStringWidth(TCPDF_FONTS::utf8Bidi(array_slice($chars, $j, ($i - $j)), '', $this->tmprtl, $this->isunicode, $this->CurrentFont));
-				} else {
-					$l += $this->GetCharWidth($c);
-				}
-				if (($l > $wmax) OR (($c == 173) AND (($l + $tmp_shy_replacement_width) >= $wmax))) {
-					if (($c == 173) AND (($l + $tmp_shy_replacement_width) > $wmax)) {
-						$sep = $prevsep;
-						$shy = $prevshy;
-					}
-					// we have reached the end of column
-					if ($sep == -1) {
-						// check if the line was already started
-						if (($this->rtl AND ($this->x <= ($this->w - $this->rMargin - $this->cell_padding['R'] - $margin['R'] - $chrwidth)))
-							OR ((!$this->rtl) AND ($this->x >= ($this->lMargin + $this->cell_padding['L'] + $margin['L'] + $chrwidth)))) {
-							// print a void cell and go to next line
-							$this->Cell($w, $h, '', 0, 1);
-							$linebreak = true;
-							if ($firstline) {
-								return (TCPDF_FONTS::UniArrSubString($uchars, $j));
-							}
-						} else {
-							// truncate the word because do not fit on column
-							$tmpstr = TCPDF_FONTS::UniArrSubString($uchars, $j, $i);
-							if ($firstline) {
-								$startx = $this->x;
-								$tmparr = array_slice($chars, $j, ($i - $j));
-								if ($rtlmode) {
-									$tmparr = TCPDF_FONTS::utf8Bidi($tmparr, $tmpstr, $this->tmprtl, $this->isunicode, $this->CurrentFont);
-								}
-								$linew = $this->GetArrStringWidth($tmparr);
-								unset($tmparr);
-								if ($this->rtl) {
-									$this->endlinex = $startx - $linew;
-								} else {
-									$this->endlinex = $startx + $linew;
-								}
-								$w = $linew;
-								$tmpcellpadding = $this->cell_padding;
-								if ($maxh == 0) {
-									$this->SetCellPadding(0);
-								}
-							}
-							if ($firstblock AND $this->isRTLTextDir()) {
-								$tmpstr = $this->stringRightTrim($tmpstr);
-							}
-							$this->Cell($w, $h, $tmpstr, 0, 1, $align, $fill, $link, $stretch);
-							unset($tmpstr);
-							if ($firstline) {
-								$this->cell_padding = $tmpcellpadding;
-								return (TCPDF_FONTS::UniArrSubString($uchars, $i));
-							}
-							$j = $i;
-							--$i;
-						}
-					} else {
-						// word wrapping
-						if ($this->rtl AND (!$firstblock) AND ($sep < $i)) {
-							$endspace = 1;
-						} else {
-							$endspace = 0;
-						}
-						// check the length of the next string
-						$strrest = TCPDF_FONTS::UniArrSubString($uchars, ($sep + $endspace));
-						$nextstr = TCPDF_STATIC::pregSplit('/'.$this->re_space['p'].'/', $this->re_space['m'], $this->stringTrim($strrest));
-						if (isset($nextstr[0]) AND ($this->GetStringWidth($nextstr[0]) > $pw)) {
-							// truncate the word because do not fit on a full page width
-							$tmpstr = TCPDF_FONTS::UniArrSubString($uchars, $j, $i);
-							if ($firstline) {
-								$startx = $this->x;
-								$tmparr = array_slice($chars, $j, ($i - $j));
-								if ($rtlmode) {
-									$tmparr = TCPDF_FONTS::utf8Bidi($tmparr, $tmpstr, $this->tmprtl, $this->isunicode, $this->CurrentFont);
-								}
-								$linew = $this->GetArrStringWidth($tmparr);
-								unset($tmparr);
-								if ($this->rtl) {
-									$this->endlinex = ($startx - $linew);
-								} else {
-									$this->endlinex = ($startx + $linew);
-								}
-								$w = $linew;
-								$tmpcellpadding = $this->cell_padding;
-								if ($maxh == 0) {
-									$this->SetCellPadding(0);
-								}
-							}
-							if ($firstblock AND $this->isRTLTextDir()) {
-								$tmpstr = $this->stringRightTrim($tmpstr);
-							}
-							$this->Cell($w, $h, $tmpstr, 0, 1, $align, $fill, $link, $stretch);
-							unset($tmpstr);
-							if ($firstline) {
-								$this->cell_padding = $tmpcellpadding;
-								return (TCPDF_FONTS::UniArrSubString($uchars, $i));
-							}
-							$j = $i;
-							--$i;
-						} else {
-							// word wrapping
-							if ($shy) {
-								// add hypen (minus symbol) at the end of the line
-								$shy_width = $tmp_shy_replacement_width;
-								if ($this->rtl) {
-									$shy_char_left = $tmp_shy_replacement_char;
-									$shy_char_right = '';
-								} else {
-									$shy_char_left = '';
-									$shy_char_right = $tmp_shy_replacement_char;
-								}
-							} else {
-								$shy_width = 0;
-								$shy_char_left = '';
-								$shy_char_right = '';
-							}
-							$tmpstr = TCPDF_FONTS::UniArrSubString($uchars, $j, ($sep + $endspace));
-							if ($firstline) {
-								$startx = $this->x;
-								$tmparr = array_slice($chars, $j, (($sep + $endspace) - $j));
-								if ($rtlmode) {
-									$tmparr = TCPDF_FONTS::utf8Bidi($tmparr, $tmpstr, $this->tmprtl, $this->isunicode, $this->CurrentFont);
-								}
-								$linew = $this->GetArrStringWidth($tmparr);
-								unset($tmparr);
-								if ($this->rtl) {
-									$this->endlinex = $startx - $linew - $shy_width;
-								} else {
-									$this->endlinex = $startx + $linew + $shy_width;
-								}
-								$w = $linew;
-								$tmpcellpadding = $this->cell_padding;
-								if ($maxh == 0) {
-									$this->SetCellPadding(0);
-								}
-							}
-							// print the line
-							if ($firstblock AND $this->isRTLTextDir()) {
-								$tmpstr = $this->stringRightTrim($tmpstr);
-							}
-							$this->Cell($w, $h, $shy_char_left.$tmpstr.$shy_char_right, 0, 1, $align, $fill, $link, $stretch);
-							unset($tmpstr);
-							if ($firstline) {
-								if ($chars[$sep] == 45) {
-									$endspace += 1;
-								}
-								// return the remaining text
-								$this->cell_padding = $tmpcellpadding;
-								return (TCPDF_FONTS::UniArrSubString($uchars, ($sep + $endspace)));
-							}
-							$i = $sep;
-							$sep = -1;
-							$shy = false;
-							$j = ($i + 1);
-						}
-					}
-					// account for margin changes
-					if ((($this->y + $this->lasth) > $this->PageBreakTrigger) AND ($this->inPageBody())) {
-						$this->AcceptPageBreak();
-						if ($this->rtl) {
-							$this->x -= $margin['R'];
-						} else {
-							$this->x += $margin['L'];
-						}
-						$this->lMargin += $margin['L'];
-						$this->rMargin += $margin['R'];
-					}
-					$w = $this->getRemainingWidth();
-					$wmax = $w - $this->cell_padding['L'] - $this->cell_padding['R'];
-					if ($linebreak) {
-						$linebreak = false;
-					} else {
-						++$nl;
-						$l = 0;
-					}
-				}
-			}
-			// save last character
-			$pc = $c;
-			++$i;
-		} // end while i < nb
-		// print last substring (if any)
-		if ($l > 0) {
-			switch ($align) {
-				case 'J':
-				case 'C': {
-					$w = $w;
-					break;
-				}
-				case 'L': {
-					if ($this->rtl) {
-						$w = $w;
-					} else {
-						$w = $l;
-					}
-					break;
-				}
-				case 'R': {
-					if ($this->rtl) {
-						$w = $l;
-					} else {
-						$w = $w;
-					}
-					break;
-				}
-				default: {
-					$w = $l;
-					break;
-				}
-			}
-			$tmpstr = TCPDF_FONTS::UniArrSubString($uchars, $j, $nb);
-			if ($firstline) {
-				$startx = $this->x;
-				$tmparr = array_slice($chars, $j, ($nb - $j));
-				if ($rtlmode) {
-					$tmparr = TCPDF_FONTS::utf8Bidi($tmparr, $tmpstr, $this->tmprtl, $this->isunicode, $this->CurrentFont);
-				}
-				$linew = $this->GetArrStringWidth($tmparr);
-				unset($tmparr);
-				if ($this->rtl) {
-					$this->endlinex = $startx - $linew;
-				} else {
-					$this->endlinex = $startx + $linew;
-				}
-				$w = $linew;
-				$tmpcellpadding = $this->cell_padding;
-				if ($maxh == 0) {
-					$this->SetCellPadding(0);
-				}
-			}
-			if ($firstblock AND $this->isRTLTextDir()) {
-				$tmpstr = $this->stringRightTrim($tmpstr);
-			}
-			$this->Cell($w, $h, $tmpstr, 0, $ln, $align, $fill, $link, $stretch);
-			unset($tmpstr);
-			if ($firstline) {
-				$this->cell_padding = $tmpcellpadding;
-				return (TCPDF_FONTS::UniArrSubString($uchars, $nb));
-			}
-			++$nl;
-		}
-		if ($firstline) {
-			return '';
-		}
-		return $nl;
-	}
-
-	/**
-	 * Returns the remaining width between the current position and margins.
-	 * @return int Return the remaining width
-	 * @protected
-	 */
-	protected function getRemainingWidth() {
-		list($this->x, $this->y) = $this->checkPageRegions(0, $this->x, $this->y);
-		if ($this->rtl) {
-			return ($this->x - $this->lMargin);
-		} else {
-			return ($this->w - $this->rMargin - $this->x);
-		}
-	}
-
-	/**
-	 * Set the block dimensions accounting for page breaks and page/column fitting
-	 * @param $w (float) width
-	 * @param $h (float) height
-	 * @param $x (float) X coordinate
-	 * @param $y (float) Y coodiante
-	 * @param $fitonpage (boolean) if true the block is resized to not exceed page dimensions.
-	 * @return array($w, $h, $x, $y)
-	 * @protected
-	 * @since 5.5.009 (2010-07-05)
-	 */
-	protected function fitBlock($w, $h, $x, $y, $fitonpage=false) {
-		if ($w <= 0) {
-			// set maximum width
-			$w = ($this->w - $this->lMargin - $this->rMargin);
-			if ($w <= 0) {
-				$w = 1;
-			}
-		}
-		if ($h <= 0) {
-			// set maximum height
-			$h = ($this->PageBreakTrigger - $this->tMargin);
-			if ($h <= 0) {
-				$h = 1;
-			}
-		}
-		// resize the block to be vertically contained on a single page or single column
-		if ($fitonpage OR $this->AutoPageBreak) {
-			$ratio_wh = ($w / $h);
-			if ($h > ($this->PageBreakTrigger - $this->tMargin)) {
-				$h = $this->PageBreakTrigger - $this->tMargin;
-				$w = ($h * $ratio_wh);
-			}
-			// resize the block to be horizontally contained on a single page or single column
-			if ($fitonpage) {
-				$maxw = ($this->w - $this->lMargin - $this->rMargin);
-				if ($w > $maxw) {
-					$w = $maxw;
-					$h = ($w / $ratio_wh);
-				}
-			}
-		}
-		// Check whether we need a new page or new column first as this does not fit
-		$prev_x = $this->x;
-		$prev_y = $this->y;
-		if ($this->checkPageBreak($h, $y) OR ($this->y < $prev_y)) {
-			$y = $this->y;
-			if ($this->rtl) {
-				$x += ($prev_x - $this->x);
-			} else {
-				$x += ($this->x - $prev_x);
-			}
-			$this->newline = true;
-		}
-		// resize the block to be contained on the remaining available page or column space
-		if ($fitonpage) {
-			$ratio_wh = ($w / $h);
-			if (($y + $h) > $this->PageBreakTrigger) {
-				$h = $this->PageBreakTrigger - $y;
-				$w = ($h * $ratio_wh);
-			}
-			if ((!$this->rtl) AND (($x + $w) > ($this->w - $this->rMargin))) {
-				$w = $this->w - $this->rMargin - $x;
-				$h = ($w / $ratio_wh);
-			} elseif (($this->rtl) AND (($x - $w) < ($this->lMargin))) {
-				$w = $x - $this->lMargin;
-				$h = ($w / $ratio_wh);
-			}
-		}
-		return array($w, $h, $x, $y);
-	}
-
-	/**
-	 * Puts an image in the page.
-	 * The upper-left corner must be given.
-	 * The dimensions can be specified in different ways:<ul>
-	 * <li>explicit width and height (expressed in user unit)</li>
-	 * <li>one explicit dimension, the other being calculated automatically in order to keep the original proportions</li>
-	 * <li>no explicit dimension, in which case the image is put at 72 dpi</li></ul>
-	 * Supported formats are JPEG and PNG images whitout GD library and all images supported by GD: GD, GD2, GD2PART, GIF, JPEG, PNG, BMP, XBM, XPM;
-	 * The format can be specified explicitly or inferred from the file extension.<br />
-	 * It is possible to put a link on the image.<br />
-	 * Remark: if an image is used several times, only one copy will be embedded in the file.<br />
-	 * @param $file (string) Name of the file containing the image or a '@' character followed by the image data string. To link an image without embedding it on the document, set an asterisk character before the URL (i.e.: '*http://www.example.com/image.jpg').
-	 * @param $x (float) Abscissa of the upper-left corner (LTR) or upper-right corner (RTL).
-	 * @param $y (float) Ordinate of the upper-left corner (LTR) or upper-right corner (RTL).
-	 * @param $w (float) Width of the image in the page. If not specified or equal to zero, it is automatically calculated.
-	 * @param $h (float) Height of the image in the page. If not specified or equal to zero, it is automatically calculated.
-	 * @param $type (string) Image format. Possible values are (case insensitive): JPEG and PNG (whitout GD library) and all images supported by GD: GD, GD2, GD2PART, GIF, JPEG, PNG, BMP, XBM, XPM;. If not specified, the type is inferred from the file extension.
-	 * @param $link (mixed) URL or identifier returned by AddLink().
-	 * @param $align (string) Indicates the alignment of the pointer next to image insertion relative to image height. The value can be:<ul><li>T: top-right for LTR or top-left for RTL</li><li>M: middle-right for LTR or middle-left for RTL</li><li>B: bottom-right for LTR or bottom-left for RTL</li><li>N: next line</li></ul>
-	 * @param $resize (mixed) If true resize (reduce) the image to fit $w and $h (requires GD or ImageMagick library); if false do not resize; if 2 force resize in all cases (upscaling and downscaling).
-	 * @param $dpi (int) dot-per-inch resolution used on resize
-	 * @param $palign (string) Allows to center or align the image on the current line. Possible values are:<ul><li>L : left align</li><li>C : center</li><li>R : right align</li><li>'' : empty string : left for LTR or right for RTL</li></ul>
-	 * @param $ismask (boolean) true if this image is a mask, false otherwise
-	 * @param $imgmask (mixed) image object returned by this function or false
-	 * @param $border (mixed) Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
-	 * @param $fitbox (mixed) If not false scale image dimensions proportionally to fit within the ($w, $h) box. $fitbox can be true or a 2 characters string indicating the image alignment inside the box. The first character indicate the horizontal alignment (L = left, C = center, R = right) the second character indicate the vertical algnment (T = top, M = middle, B = bottom).
-	 * @param $hidden (boolean) If true do not display the image.
-	 * @param $fitonpage (boolean) If true the image is resized to not exceed page dimensions.
-	 * @param $alt (boolean) If true the image will be added as alternative and not directly printed (the ID of the image will be returned).
-	 * @param $altimgs (array) Array of alternate images IDs. Each alternative image must be an array with two values: an integer representing the image ID (the value returned by the Image method) and a boolean value to indicate if the image is the default for printing.
-	 * @return image information
-	 * @public
-	 * @since 1.1
-	 */
-	public function Image($file, $x='', $y='', $w=0, $h=0, $type='', $link='', $align='', $resize=false, $dpi=300, $palign='', $ismask=false, $imgmask=false, $border=0, $fitbox=false, $hidden=false, $fitonpage=false, $alt=false, $altimgs=array()) {
-		if ($this->state != 2) {
-			return;
-		}
-		if (strcmp($x, '') === 0) {
-			$x = $this->x;
-		}
-		if (strcmp($y, '') === 0) {
-			$y = $this->y;
-		}
-		// check page for no-write regions and adapt page margins if necessary
-		list($x, $y) = $this->checkPageRegions($h, $x, $y);
-		$exurl = ''; // external streams
-		$imsize = FALSE;
-		// check if we are passing an image as file or string
-		if ($file[0] === '@') {
-			// image from string
-			$imgdata = substr($file, 1);
-		} else { // image file
-			if ($file[0] === '*') {
-				// image as external stream
-				$file = substr($file, 1);
-				$exurl = $file;
-			}
-			// check if is a local file
-			if (!@file_exists($file)) {
-				// try to encode spaces on filename
-				$tfile = str_replace(' ', '%20', $file);
-				if (@file_exists($tfile)) {
-					$file = $tfile;
-				}
-			}
-			if (($imsize = @getimagesize($file)) === FALSE) {
-				if (in_array($file, $this->imagekeys)) {
-					// get existing image data
-					$info = $this->getImageBuffer($file);
-					$imsize = array($info['w'], $info['h']);
-				} elseif (strpos($file, '__tcpdf_'.$this->file_id.'_img') === FALSE) {
-					$imgdata = TCPDF_STATIC::fileGetContents($file);
-				}
-			}
-		}
-		if (!empty($imgdata)) {
-			// copy image to cache
-			$original_file = $file;
-			$file = TCPDF_STATIC::getObjFilename('img', $this->file_id);
-			$fp = TCPDF_STATIC::fopenLocal($file, 'w');
-			if (!$fp) {
-				$this->Error('Unable to write file: '.$file);
-			}
-			fwrite($fp, $imgdata);
-			fclose($fp);
-			unset($imgdata);
-			$imsize = @getimagesize($file);
-			if ($imsize === FALSE) {
-				unlink($file);
-				$file = $original_file;
-			}
-		}
-		if ($imsize === FALSE) {
-			if (($w > 0) AND ($h > 0)) {
-				// get measures from specified data
-				$pw = $this->getHTMLUnitToUnits($w, 0, $this->pdfunit, true) * $this->imgscale * $this->k;
-				$ph = $this->getHTMLUnitToUnits($h, 0, $this->pdfunit, true) * $this->imgscale * $this->k;
-				$imsize = array($pw, $ph);
-			} else {
-				$this->Error('[Image] Unable to get the size of the image: '.$file);
-			}
-		}
-		// file hash
-		$filehash = md5($file);
-		// get original image width and height in pixels
-		list($pixw, $pixh) = $imsize;
-		// calculate image width and height on document
-		if (($w <= 0) AND ($h <= 0)) {
-			// convert image size to document unit
-			$w = $this->pixelsToUnits($pixw);
-			$h = $this->pixelsToUnits($pixh);
-		} elseif ($w <= 0) {
-			$w = $h * $pixw / $pixh;
-		} elseif ($h <= 0) {
-			$h = $w * $pixh / $pixw;
-		} elseif (($fitbox !== false) AND ($w > 0) AND ($h > 0)) {
-			if (strlen($fitbox) !== 2) {
-				// set default alignment
-				$fitbox = '--';
-			}
-			// scale image dimensions proportionally to fit within the ($w, $h) box
-			if ((($w * $pixh) / ($h * $pixw)) < 1) {
-				// store current height
-				$oldh = $h;
-				// calculate new height
-				$h = $w * $pixh / $pixw;
-				// height difference
-				$hdiff = ($oldh - $h);
-				// vertical alignment
-				switch (strtoupper($fitbox[1])) {
-					case 'T': {
-						break;
-					}
-					case 'M': {
-						$y += ($hdiff / 2);
-						break;
-					}
-					case 'B': {
-						$y += $hdiff;
-						break;
-					}
-				}
-			} else {
-				// store current width
-				$oldw = $w;
-				// calculate new width
-				$w = $h * $pixw / $pixh;
-				// width difference
-				$wdiff = ($oldw - $w);
-				// horizontal alignment
-				switch (strtoupper($fitbox[0])) {
-					case 'L': {
-						if ($this->rtl) {
-							$x -= $wdiff;
-						}
-						break;
-					}
-					case 'C': {
-						if ($this->rtl) {
-							$x -= ($wdiff / 2);
-						} else {
-							$x += ($wdiff / 2);
-						}
-						break;
-					}
-					case 'R': {
-						if (!$this->rtl) {
-							$x += $wdiff;
-						}
-						break;
-					}
-				}
-			}
-		}
-		// fit the image on available space
-		list($w, $h, $x, $y) = $this->fitBlock($w, $h, $x, $y, $fitonpage);
-		// calculate new minimum dimensions in pixels
-		$neww = round($w * $this->k * $dpi / $this->dpi);
-		$newh = round($h * $this->k * $dpi / $this->dpi);
-		// check if resize is necessary (resize is used only to reduce the image)
-		$newsize = ($neww * $newh);
-		$pixsize = ($pixw * $pixh);
-		if (intval($resize) == 2) {
-			$resize = true;
-		} elseif ($newsize >= $pixsize) {
-			$resize = false;
-		}
-		// check if image has been already added on document
-		$newimage = true;
-		if (in_array($file, $this->imagekeys)) {
-			$newimage = false;
-			// get existing image data
-			$info = $this->getImageBuffer($file);
-			if (strpos($file, '__tcpdf_'.$this->file_id.'_imgmask_') === FALSE) {
-				// check if the newer image is larger
-				$oldsize = ($info['w'] * $info['h']);
-				if ((($oldsize < $newsize) AND ($resize)) OR (($oldsize < $pixsize) AND (!$resize))) {
-					$newimage = true;
-				}
-			}
-		} elseif (($ismask === false) AND ($imgmask === false) AND (strpos($file, '__tcpdf_'.$this->file_id.'_imgmask_') === FALSE)) {
-			// create temp image file (without alpha channel)
-			$tempfile_plain = K_PATH_CACHE.'__tcpdf_'.$this->file_id.'_imgmask_plain_'.$filehash;
-			// create temp alpha file
-			$tempfile_alpha = K_PATH_CACHE.'__tcpdf_'.$this->file_id.'_imgmask_alpha_'.$filehash;
-			// check for cached images
-			if (in_array($tempfile_plain, $this->imagekeys)) {
-				// get existing image data
-				$info = $this->getImageBuffer($tempfile_plain);
-				// check if the newer image is larger
-				$oldsize = ($info['w'] * $info['h']);
-				if ((($oldsize < $newsize) AND ($resize)) OR (($oldsize < $pixsize) AND (!$resize))) {
-					$newimage = true;
-				} else {
-					$newimage = false;
-					// embed mask image
-					$imgmask = $this->Image($tempfile_alpha, $x, $y, $w, $h, 'PNG', '', '', $resize, $dpi, '', true, false);
-					// embed image, masked with previously embedded mask
-					return $this->Image($tempfile_plain, $x, $y, $w, $h, $type, $link, $align, $resize, $dpi, $palign, false, $imgmask);
-				}
-			}
-		}
-		if ($newimage) {
-			//First use of image, get info
-			$type = strtolower($type);
-			if ($type == '') {
-				$type = TCPDF_IMAGES::getImageFileType($file, $imsize);
-			} elseif ($type == 'jpg') {
-				$type = 'jpeg';
-			}
-			$mqr = TCPDF_STATIC::get_mqr();
-			TCPDF_STATIC::set_mqr(false);
-			// Specific image handlers (defined on TCPDF_IMAGES CLASS)
-			$mtd = '_parse'.$type;
-			// GD image handler function
-			$gdfunction = 'imagecreatefrom'.$type;
-			$info = false;
-			if ((method_exists('TCPDF_IMAGES', $mtd)) AND (!($resize AND (function_exists($gdfunction) OR extension_loaded('imagick'))))) {
-				// TCPDF image functions
-				$info = TCPDF_IMAGES::$mtd($file);
-				if (($ismask === false) AND ($imgmask === false) AND (strpos($file, '__tcpdf_'.$this->file_id.'_imgmask_') === FALSE)
-					AND (($info === 'pngalpha') OR (isset($info['trns']) AND !empty($info['trns'])))) {
-					return $this->ImagePngAlpha($file, $x, $y, $pixw, $pixh, $w, $h, 'PNG', $link, $align, $resize, $dpi, $palign, $filehash);
-				}
-			}
-			if (($info === false) AND function_exists($gdfunction)) {
-				try {
-					// GD library
-					$img = $gdfunction($file);
-					if ($img !== false) {
-						if ($resize) {
-							$imgr = imagecreatetruecolor($neww, $newh);
-							if (($type == 'gif') OR ($type == 'png')) {
-								$imgr = TCPDF_IMAGES::setGDImageTransparency($imgr, $img);
-							}
-							imagecopyresampled($imgr, $img, 0, 0, 0, 0, $neww, $newh, $pixw, $pixh);
-							$img = $imgr;
-						}
-						if (($type == 'gif') OR ($type == 'png')) {
-							$info = TCPDF_IMAGES::_toPNG($img, TCPDF_STATIC::getObjFilename('img', $this->file_id));
-						} else {
-							$info = TCPDF_IMAGES::_toJPEG($img, $this->jpeg_quality, TCPDF_STATIC::getObjFilename('img', $this->file_id));
-						}
-					}
-				} catch(Exception $e) {
-					$info = false;
-				}
-			}
-			if (($info === false) AND extension_loaded('imagick')) {
-				try {
-					// ImageMagick library
-					$img = new Imagick();
-					if ($type == 'svg') {
-						if ($file[0] === '@') {
-							// image from string
-							$svgimg = substr($file, 1);
-						} else {
-							// get SVG file content
-							$svgimg = TCPDF_STATIC::fileGetContents($file);
-						}
-						if ($svgimg !== FALSE) {
-							// get width and height
-							$regs = array();
-							if (preg_match('/<svg([^\>]*)>/si', $svgimg, $regs)) {
-								$svgtag = $regs[1];
-								$tmp = array();
-								if (preg_match('/[\s]+width[\s]*=[\s]*"([^"]*)"/si', $svgtag, $tmp)) {
-									$ow = $this->getHTMLUnitToUnits($tmp[1], 1, $this->svgunit, false);
-									$owu = sprintf('%F', ($ow * $dpi / 72)).$this->pdfunit;
-									$svgtag = preg_replace('/[\s]+width[\s]*=[\s]*"[^"]*"/si', ' width="'.$owu.'"', $svgtag, 1);
-								} else {
-									$ow = $w;
-								}
-								$tmp = array();
-								if (preg_match('/[\s]+height[\s]*=[\s]*"([^"]*)"/si', $svgtag, $tmp)) {
-									$oh = $this->getHTMLUnitToUnits($tmp[1], 1, $this->svgunit, false);
-									$ohu = sprintf('%F', ($oh * $dpi / 72)).$this->pdfunit;
-									$svgtag = preg_replace('/[\s]+height[\s]*=[\s]*"[^"]*"/si', ' height="'.$ohu.'"', $svgtag, 1);
-								} else {
-									$oh = $h;
-								}
-								$tmp = array();
-								if (!preg_match('/[\s]+viewBox[\s]*=[\s]*"[\s]*([0-9\.]+)[\s]+([0-9\.]+)[\s]+([0-9\.]+)[\s]+([0-9\.]+)[\s]*"/si', $svgtag, $tmp)) {
-									$vbw = ($ow * $this->imgscale * $this->k);
-									$vbh = ($oh * $this->imgscale * $this->k);
-									$vbox = sprintf(' viewBox="0 0 %F %F" ', $vbw, $vbh);
-									$svgtag = $vbox.$svgtag;
-								}
-								$svgimg = preg_replace('/<svg([^\>]*)>/si', '<svg'.$svgtag.'>', $svgimg, 1);
-							}
-							$img->readImageBlob($svgimg);
-						}
-					} else {
-						$img->readImage($file);
-					}
-					if ($resize) {
-						$img->resizeImage($neww, $newh, 10, 1, false);
-					}
-					$img->setCompressionQuality($this->jpeg_quality);
-					$img->setImageFormat('jpeg');
-					$tempname = TCPDF_STATIC::getObjFilename('img', $this->file_id);
-					$img->writeImage($tempname);
-					$info = TCPDF_IMAGES::_parsejpeg($tempname);
-					unlink($tempname);
-					$img->destroy();
-				} catch(Exception $e) {
-					$info = false;
-				}
-			}
-			if ($info === false) {
-				// unable to process image
-				return;
-			}
-			TCPDF_STATIC::set_mqr($mqr);
-			if ($ismask) {
-				// force grayscale
-				$info['cs'] = 'DeviceGray';
-			}
-			if ($imgmask !== false) {
-				$info['masked'] = $imgmask;
-			}
-			if (!empty($exurl)) {
-				$info['exurl'] = $exurl;
-			}
-			// array of alternative images
-			$info['altimgs'] = $altimgs;
-			// add image to document
-			$info['i'] = $this->setImageBuffer($file, $info);
-		}
-		// set alignment
-		$this->img_rb_y = $y + $h;
-		// set alignment
-		if ($this->rtl) {
-			if ($palign == 'L') {
-				$ximg = $this->lMargin;
-			} elseif ($palign == 'C') {
-				$ximg = ($this->w + $this->lMargin - $this->rMargin - $w) / 2;
-			} elseif ($palign == 'R') {
-				$ximg = $this->w - $this->rMargin - $w;
-			} else {
-				$ximg = $x - $w;
-			}
-			$this->img_rb_x = $ximg;
-		} else {
-			if ($palign == 'L') {
-				$ximg = $this->lMargin;
-			} elseif ($palign == 'C') {
-				$ximg = ($this->w + $this->lMargin - $this->rMargin - $w) / 2;
-			} elseif ($palign == 'R') {
-				$ximg = $this->w - $this->rMargin - $w;
-			} else {
-				$ximg = $x;
-			}
-			$this->img_rb_x = $ximg + $w;
-		}
-		if ($ismask OR $hidden) {
-			// image is not displayed
-			return $info['i'];
-		}
-		$xkimg = $ximg * $this->k;
-		if (!$alt) {
-			// only non-alternative immages will be set
-			$this->_out(sprintf('q %F 0 0 %F %F %F cm /I%u Do Q', ($w * $this->k), ($h * $this->k), $xkimg, (($this->h - ($y + $h)) * $this->k), $info['i']));
-		}
-		if (!empty($border)) {
-			$bx = $this->x;
-			$by = $this->y;
-			$this->x = $ximg;
-			if ($this->rtl) {
-				$this->x += $w;
-			}
-			$this->y = $y;
-			$this->Cell($w, $h, '', $border, 0, '', 0, '', 0, true);
-			$this->x = $bx;
-			$this->y = $by;
-		}
-		if ($link) {
-			$this->Link($ximg, $y, $w, $h, $link, 0);
-		}
-		// set pointer to align the next text/objects
-		switch($align) {
-			case 'T': {
-				$this->y = $y;
-				$this->x = $this->img_rb_x;
-				break;
-			}
-			case 'M': {
-				$this->y = $y + round($h/2);
-				$this->x = $this->img_rb_x;
-				break;
-			}
-			case 'B': {
-				$this->y = $this->img_rb_y;
-				$this->x = $this->img_rb_x;
-				break;
-			}
-			case 'N': {
-				$this->SetY($this->img_rb_y);
-				break;
-			}
-			default:{
-				break;
-			}
-		}
-		$this->endlinex = $this->img_rb_x;
-		if ($this->inxobj) {
-			// we are inside an XObject template
-			$this->xobjects[$this->xobjid]['images'][] = $info['i'];
-		}
-		return $info['i'];
-	}
-
-	/**
-	 * Extract info from a PNG image with alpha channel using the Imagick or GD library.
-	 * @param $file (string) Name of the file containing the image.
-	 * @param $x (float) Abscissa of the upper-left corner.
-	 * @param $y (float) Ordinate of the upper-left corner.
-	 * @param $wpx (float) Original width of the image in pixels.
-	 * @param $hpx (float) original height of the image in pixels.
-	 * @param $w (float) Width of the image in the page. If not specified or equal to zero, it is automatically calculated.
-	 * @param $h (float) Height of the image in the page. If not specified or equal to zero, it is automatically calculated.
-	 * @param $type (string) Image format. Possible values are (case insensitive): JPEG and PNG (whitout GD library) and all images supported by GD: GD, GD2, GD2PART, GIF, JPEG, PNG, BMP, XBM, XPM;. If not specified, the type is inferred from the file extension.
-	 * @param $link (mixed) URL or identifier returned by AddLink().
-	 * @param $align (string) Indicates the alignment of the pointer next to image insertion relative to image height. The value can be:<ul><li>T: top-right for LTR or top-left for RTL</li><li>M: middle-right for LTR or middle-left for RTL</li><li>B: bottom-right for LTR or bottom-left for RTL</li><li>N: next line</li></ul>
-	 * @param $resize (boolean) If true resize (reduce) the image to fit $w and $h (requires GD library).
-	 * @param $dpi (int) dot-per-inch resolution used on resize
-	 * @param $palign (string) Allows to center or align the image on the current line. Possible values are:<ul><li>L : left align</li><li>C : center</li><li>R : right align</li><li>'' : empty string : left for LTR or right for RTL</li></ul>
-	 * @param $filehash (string) File hash used to build unique file names.
-	 * @author Nicola Asuni
-	 * @protected
-	 * @since 4.3.007 (2008-12-04)
-	 * @see Image()
-	 */
-	protected function ImagePngAlpha($file, $x, $y, $wpx, $hpx, $w, $h, $type, $link, $align, $resize, $dpi, $palign, $filehash='') {
-		// create temp images
-		if (empty($filehash)) {
-			$filehash = md5($file);
-		}
-		// create temp image file (without alpha channel)
-		$tempfile_plain = K_PATH_CACHE.'__tcpdf_'.$this->file_id.'_imgmask_plain_'.$filehash;
-		// create temp alpha file
-		$tempfile_alpha = K_PATH_CACHE.'__tcpdf_'.$this->file_id.'_imgmask_alpha_'.$filehash;
-		$parsed = false;
-		$parse_error = '';
-		// ImageMagick extension
-		if (($parsed === false) AND extension_loaded('imagick')) {
-			try {
-				// ImageMagick library
-				$img = new Imagick();
-				$img->readImage($file);
-				// clone image object
-				$imga = TCPDF_STATIC::objclone($img);
-				// extract alpha channel
-				if (method_exists($img, 'setImageAlphaChannel') AND defined('Imagick::ALPHACHANNEL_EXTRACT')) {
-					$img->setImageAlphaChannel(Imagick::ALPHACHANNEL_EXTRACT);
-				} else {
-					$img->separateImageChannel(8); // 8 = (imagick::CHANNEL_ALPHA | imagick::CHANNEL_OPACITY | imagick::CHANNEL_MATTE);
-					$img->negateImage(true);
-				}
-				$img->setImageFormat('png');
-				$img->writeImage($tempfile_alpha);
-				// remove alpha channel
-				if (method_exists($imga, 'setImageMatte')) {
-					$imga->setImageMatte(false);
-				} else {
-					$imga->separateImageChannel(39); // 39 = (imagick::CHANNEL_ALL & ~(imagick::CHANNEL_ALPHA | imagick::CHANNEL_OPACITY | imagick::CHANNEL_MATTE));
-				}
-				$imga->setImageFormat('png');
-				$imga->writeImage($tempfile_plain);
-				$parsed = true;
-			} catch (Exception $e) {
-				// Imagemagick fails, try with GD
-				$parse_error = 'Imagick library error: '.$e->getMessage();
-			}
-		}
-		// GD extension
-		if (($parsed === false) AND function_exists('imagecreatefrompng')) {
-			try {
-				// generate images
-				$img = imagecreatefrompng($file);
-				$imgalpha = imagecreate($wpx, $hpx);
-				// generate gray scale palette (0 -> 255)
-				for ($c = 0; $c < 256; ++$c) {
-					ImageColorAllocate($imgalpha, $c, $c, $c);
-				}
-				// extract alpha channel
-				for ($xpx = 0; $xpx < $wpx; ++$xpx) {
-					for ($ypx = 0; $ypx < $hpx; ++$ypx) {
-						$color = imagecolorat($img, $xpx, $ypx);
-						// get and correct gamma color
-						$alpha = $this->getGDgamma($img, $color);
-						imagesetpixel($imgalpha, $xpx, $ypx, $alpha);
-					}
-				}
-				imagepng($imgalpha, $tempfile_alpha);
-				imagedestroy($imgalpha);
-				// extract image without alpha channel
-				$imgplain = imagecreatetruecolor($wpx, $hpx);
-				imagecopy($imgplain, $img, 0, 0, 0, 0, $wpx, $hpx);
-				imagepng($imgplain, $tempfile_plain);
-				imagedestroy($imgplain);
-				$parsed = true;
-			} catch (Exception $e) {
-				// GD fails
-				$parse_error = 'GD library error: '.$e->getMessage();
-			}
-		}
-		if ($parsed === false) {
-			if (empty($parse_error)) {
-				$this->Error('TCPDF requires the Imagick or GD extension to handle PNG images with alpha channel.');
-			} else {
-				$this->Error($parse_error);
-			}
-		}
-		// embed mask image
-		$imgmask = $this->Image($tempfile_alpha, $x, $y, $w, $h, 'PNG', '', '', $resize, $dpi, '', true, false);
-		// embed image, masked with previously embedded mask
-		$this->Image($tempfile_plain, $x, $y, $w, $h, $type, $link, $align, $resize, $dpi, $palign, false, $imgmask);
-	}
-
-	/**
-	 * Get the GD-corrected PNG gamma value from alpha color
-	 * @param $img (int) GD image Resource ID.
-	 * @param $c (int) alpha color
-	 * @protected
-	 * @since 4.3.007 (2008-12-04)
-	 */
-	protected function getGDgamma($img, $c) {
-		if (!isset($this->gdgammacache['#'.$c])) {
-			$colors = imagecolorsforindex($img, $c);
-			// GD alpha is only 7 bit (0 -> 127)
-			$this->gdgammacache['#'.$c] = (((127 - $colors['alpha']) / 127) * 255);
-			// correct gamma
-			$this->gdgammacache['#'.$c] = (pow(($this->gdgammacache['#'.$c] / 255), 2.2) * 255);
-			// store the latest values on cache to improve performances
-			if (count($this->gdgammacache) > 8) {
-				// remove one element from the cache array
-				array_shift($this->gdgammacache);
-			}
-		}
-		return $this->gdgammacache['#'.$c];
-	}
-
-	/**
-	 * Performs a line break.
-	 * The current abscissa goes back to the left margin and the ordinate increases by the amount passed in parameter.
-	 * @param $h (float) The height of the break. By default, the value equals the height of the last printed cell.
-	 * @param $cell (boolean) if true add the current left (or right o for RTL) padding to the X coordinate
-	 * @public
-	 * @since 1.0
-	 * @see Cell()
-	 */
-	public function Ln($h='', $cell=false) {
-		if (($this->num_columns > 1) AND ($this->y == $this->columns[$this->current_column]['y']) AND isset($this->columns[$this->current_column]['x']) AND ($this->x == $this->columns[$this->current_column]['x'])) {
-			// revove vertical space from the top of the column
-			return;
-		}
-		if ($cell) {
-			if ($this->rtl) {
-				$cellpadding = $this->cell_padding['R'];
-			} else {
-				$cellpadding = $this->cell_padding['L'];
-			}
-		} else {
-			$cellpadding = 0;
-		}
-		if ($this->rtl) {
-			$this->x = $this->w - $this->rMargin - $cellpadding;
-		} else {
-			$this->x = $this->lMargin + $cellpadding;
-		}
-		if (is_string($h)) {
-			$h = $this->lasth;
-		}
-		$this->y += $h;
-		$this->newline = true;
-	}
-
-	/**
-	 * Returns the relative X value of current position.
-	 * The value is relative to the left border for LTR languages and to the right border for RTL languages.
-	 * @return float
-	 * @public
-	 * @since 1.2
-	 * @see SetX(), GetY(), SetY()
-	 */
-	public function GetX() {
-		//Get x position
-		if ($this->rtl) {
-			return ($this->w - $this->x);
-		} else {
-			return $this->x;
-		}
-	}
-
-	/**
-	 * Returns the absolute X value of current position.
-	 * @return float
-	 * @public
-	 * @since 1.2
-	 * @see SetX(), GetY(), SetY()
-	 */
-	public function GetAbsX() {
-		return $this->x;
-	}
-
-	/**
-	 * Returns the ordinate of the current position.
-	 * @return float
-	 * @public
-	 * @since 1.0
-	 * @see SetY(), GetX(), SetX()
-	 */
-	public function GetY() {
-		return $this->y;
-	}
-
-	/**
-	 * Defines the abscissa of the current position.
-	 * If the passed value is negative, it is relative to the right of the page (or left if language is RTL).
-	 * @param $x (float) The value of the abscissa in user units.
-	 * @param $rtloff (boolean) if true always uses the page top-left corner as origin of axis.
-	 * @public
-	 * @since 1.2
-	 * @see GetX(), GetY(), SetY(), SetXY()
-	 */
-	public function SetX($x, $rtloff=false) {
-		$x = floatval($x);
-		if (!$rtloff AND $this->rtl) {
-			if ($x >= 0) {
-				$this->x = $this->w - $x;
-			} else {
-				$this->x = abs($x);
-			}
-		} else {
-			if ($x >= 0) {
-				$this->x = $x;
-			} else {
-				$this->x = $this->w + $x;
-			}
-		}
-		if ($this->x < 0) {
-			$this->x = 0;
-		}
-		if ($this->x > $this->w) {
-			$this->x = $this->w;
-		}
-	}
-
-	/**
-	 * Moves the current abscissa back to the left margin and sets the ordinate.
-	 * If the passed value is negative, it is relative to the bottom of the page.
-	 * @param $y (float) The value of the ordinate in user units.
-	 * @param $resetx (bool) if true (default) reset the X position.
-	 * @param $rtloff (boolean) if true always uses the page top-left corner as origin of axis.
-	 * @public
-	 * @since 1.0
-	 * @see GetX(), GetY(), SetY(), SetXY()
-	 */
-	public function SetY($y, $resetx=true, $rtloff=false) {
-		$y = floatval($y);
-		if ($resetx) {
-			//reset x
-			if (!$rtloff AND $this->rtl) {
-				$this->x = $this->w - $this->rMargin;
-			} else {
-				$this->x = $this->lMargin;
-			}
-		}
-		if ($y >= 0) {
-			$this->y = $y;
-		} else {
-			$this->y = $this->h + $y;
-		}
-		if ($this->y < 0) {
-			$this->y = 0;
-		}
-		if ($this->y > $this->h) {
-			$this->y = $this->h;
-		}
-	}
-
-	/**
-	 * Defines the abscissa and ordinate of the current position.
-	 * If the passed values are negative, they are relative respectively to the right and bottom of the page.
-	 * @param $x (float) The value of the abscissa.
-	 * @param $y (float) The value of the ordinate.
-	 * @param $rtloff (boolean) if true always uses the page top-left corner as origin of axis.
-	 * @public
-	 * @since 1.2
-	 * @see SetX(), SetY()
-	 */
-	public function SetXY($x, $y, $rtloff=false) {
-		$this->SetY($y, false, $rtloff);
-		$this->SetX($x, $rtloff);
-	}
-
-	/**
-	 * Set the absolute X coordinate of the current pointer.
-	 * @param $x (float) The value of the abscissa in user units.
-	 * @public
-	 * @since 5.9.186 (2012-09-13)
-	 * @see setAbsX(), setAbsY(), SetAbsXY()
-	 */
-	public function SetAbsX($x) {
-		$this->x = floatval($x);
-	}
-
-	/**
-	 * Set the absolute Y coordinate of the current pointer.
-	 * @param $y (float) (float) The value of the ordinate in user units.
-	 * @public
-	 * @since 5.9.186 (2012-09-13)
-	 * @see setAbsX(), setAbsY(), SetAbsXY()
-	 */
-	public function SetAbsY($y) {
-		$this->y = floatval($y);
-	}
-
-	/**
-	 * Set the absolute X and Y coordinates of the current pointer.
-	 * @param $x (float) The value of the abscissa in user units.
-	 * @param $y (float) (float) The value of the ordinate in user units.
-	 * @public
-	 * @since 5.9.186 (2012-09-13)
-	 * @see setAbsX(), setAbsY(), SetAbsXY()
-	 */
-	public function SetAbsXY($x, $y) {
-		$this->SetAbsX($x);
-		$this->SetAbsY($y);
-	}
-
-	/**
-	 * Send the document to a given destination: string, local file or browser.
-	 * In the last case, the plug-in may be used (if present) or a download ("Save as" dialog box) may be forced.<br />
-	 * The method first calls Close() if necessary to terminate the document.
-	 * @param $name (string) The name of the file when saved. Note that special characters are removed and blanks characters are replaced with the underscore character.
-	 * @param $dest (string) Destination where to send the document. It can take one of the following values:<ul><li>I: send the file inline to the browser (default). The plug-in is used if available. The name given by name is used when one selects the "Save as" option on the link generating the PDF.</li><li>D: send to the browser and force a file download with the name given by name.</li><li>F: save to a local server file with the name given by name.</li><li>S: return the document as a string (name is ignored).</li><li>FI: equivalent to F + I option</li><li>FD: equivalent to F + D option</li><li>E: return the document as base64 mime multi-part email attachment (RFC 2045)</li></ul>
-	 * @return string
-	 * @public
-	 * @since 1.0
-	 * @see Close()
-	 */
-	public function Output($name='doc.pdf', $dest='I') {
-		//Output PDF to some destination
-		//Finish document if necessary
-		if ($this->state < 3) {
-			$this->Close();
-		}
-		//Normalize parameters
-		if (is_bool($dest)) {
-			$dest = $dest ? 'D' : 'F';
-		}
-		$dest = strtoupper($dest);
-		if ($dest[0] != 'F') {
-			$name = preg_replace('/[\s]+/', '_', $name);
-			$name = preg_replace('/[^a-zA-Z0-9_\.-]/', '', $name);
-		}
-		if ($this->sign) {
-			// *** apply digital signature to the document ***
-			// get the document content
-			$pdfdoc = $this->getBuffer();
-			// remove last newline
-			$pdfdoc = substr($pdfdoc, 0, -1);
-			// remove filler space
-			$byterange_string_len = strlen(TCPDF_STATIC::$byterange_string);
-			// define the ByteRange
-			$byte_range = array();
-			$byte_range[0] = 0;
-			$byte_range[1] = strpos($pdfdoc, TCPDF_STATIC::$byterange_string) + $byterange_string_len + 10;
-			$byte_range[2] = $byte_range[1] + $this->signature_max_length + 2;
-			$byte_range[3] = strlen($pdfdoc) - $byte_range[2];
-			$pdfdoc = substr($pdfdoc, 0, $byte_range[1]).substr($pdfdoc, $byte_range[2]);
-			// replace the ByteRange
-			$byterange = sprintf('/ByteRange[0 %u %u %u]', $byte_range[1], $byte_range[2], $byte_range[3]);
-			$byterange .= str_repeat(' ', ($byterange_string_len - strlen($byterange)));
-			$pdfdoc = str_replace(TCPDF_STATIC::$byterange_string, $byterange, $pdfdoc);
-			// write the document to a temporary folder
-			$tempdoc = TCPDF_STATIC::getObjFilename('doc', $this->file_id);
-			$f = TCPDF_STATIC::fopenLocal($tempdoc, 'wb');
-			if (!$f) {
-				$this->Error('Unable to create temporary file: '.$tempdoc);
-			}
-			$pdfdoc_length = strlen($pdfdoc);
-			fwrite($f, $pdfdoc, $pdfdoc_length);
-			fclose($f);
-			// get digital signature via openssl library
-			$tempsign = TCPDF_STATIC::getObjFilename('sig', $this->file_id);
-			if (empty($this->signature_data['extracerts'])) {
-				openssl_pkcs7_sign($tempdoc, $tempsign, $this->signature_data['signcert'], array($this->signature_data['privkey'], $this->signature_data['password']), array(), PKCS7_BINARY | PKCS7_DETACHED);
-			} else {
-				openssl_pkcs7_sign($tempdoc, $tempsign, $this->signature_data['signcert'], array($this->signature_data['privkey'], $this->signature_data['password']), array(), PKCS7_BINARY | PKCS7_DETACHED, $this->signature_data['extracerts']);
-			}
-			// read signature
-			$signature = file_get_contents($tempsign);
-			// extract signature
-			$signature = substr($signature, $pdfdoc_length);
-			$signature = substr($signature, (strpos($signature, "%%EOF\n\n------") + 13));
-			$tmparr = explode("\n\n", $signature);
-			$signature = $tmparr[1];
-			// decode signature
-			$signature = base64_decode(trim($signature));
-			// add TSA timestamp to signature
-			$signature = $this->applyTSA($signature);
-			// convert signature to hex
-			$signature = current(unpack('H*', $signature));
-			$signature = str_pad($signature, $this->signature_max_length, '0');
-			// Add signature to the document
-			$this->buffer = substr($pdfdoc, 0, $byte_range[1]).'<'.$signature.'>'.substr($pdfdoc, $byte_range[1]);
-			$this->bufferlen = strlen($this->buffer);
-		}
-		switch($dest) {
-			case 'I': {
-				// Send PDF to the standard output
-				if (ob_get_contents()) {
-					$this->Error('Some data has already been output, can\'t send PDF file');
-				}
-				if (php_sapi_name() != 'cli') {
-					// send output to a browser
-					header('Content-Type: application/pdf');
-					if (headers_sent()) {
-						$this->Error('Some data has already been output to browser, can\'t send PDF file');
-					}
-					header('Cache-Control: private, must-revalidate, post-check=0, pre-check=0, max-age=1');
-					//header('Cache-Control: public, must-revalidate, max-age=0'); // HTTP/1.1
-					header('Pragma: public');
-					header('Expires: Sat, 26 Jul 1997 05:00:00 GMT'); // Date in the past
-					header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
-					header('Content-Disposition: inline; filename="'.basename($name).'"');
-					TCPDF_STATIC::sendOutputData($this->getBuffer(), $this->bufferlen);
-				} else {
-					echo $this->getBuffer();
-				}
-				break;
-			}
-			case 'D': {
-				// download PDF as file
-				if (ob_get_contents()) {
-					$this->Error('Some data has already been output, can\'t send PDF file');
-				}
-				header('Content-Description: File Transfer');
-				if (headers_sent()) {
-					$this->Error('Some data has already been output to browser, can\'t send PDF file');
-				}
-				header('Cache-Control: private, must-revalidate, post-check=0, pre-check=0, max-age=1');
-				//header('Cache-Control: public, must-revalidate, max-age=0'); // HTTP/1.1
-				header('Pragma: public');
-				header('Expires: Sat, 26 Jul 1997 05:00:00 GMT'); // Date in the past
-				header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
-				// force download dialog
-				if (strpos(php_sapi_name(), 'cgi') === false) {
-					header('Content-Type: application/force-download');
-					header('Content-Type: application/octet-stream', false);
-					header('Content-Type: application/download', false);
-					header('Content-Type: application/pdf', false);
-				} else {
-					header('Content-Type: application/pdf');
-				}
-				// use the Content-Disposition header to supply a recommended filename
-				header('Content-Disposition: attachment; filename="'.basename($name).'"');
-				header('Content-Transfer-Encoding: binary');
-				TCPDF_STATIC::sendOutputData($this->getBuffer(), $this->bufferlen);
-				break;
-			}
-			case 'F':
-			case 'FI':
-			case 'FD': {
-				// save PDF to a local file
-				$f = TCPDF_STATIC::fopenLocal($name, 'wb');
-				if (!$f) {
-					$this->Error('Unable to create output file: '.$name);
-				}
-				fwrite($f, $this->getBuffer(), $this->bufferlen);
-				fclose($f);
-				if ($dest == 'FI') {
-					// send headers to browser
-					header('Content-Type: application/pdf');
-					header('Cache-Control: private, must-revalidate, post-check=0, pre-check=0, max-age=1');
-					//header('Cache-Control: public, must-revalidate, max-age=0'); // HTTP/1.1
-					header('Pragma: public');
-					header('Expires: Sat, 26 Jul 1997 05:00:00 GMT'); // Date in the past
-					header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
-					header('Content-Disposition: inline; filename="'.basename($name).'"');
-					TCPDF_STATIC::sendOutputData(file_get_contents($name), filesize($name));
-				} elseif ($dest == 'FD') {
-					// send headers to browser
-					if (ob_get_contents()) {
-						$this->Error('Some data has already been output, can\'t send PDF file');
-					}
-					header('Content-Description: File Transfer');
-					if (headers_sent()) {
-						$this->Error('Some data has already been output to browser, can\'t send PDF file');
-					}
-					header('Cache-Control: private, must-revalidate, post-check=0, pre-check=0, max-age=1');
-					header('Pragma: public');
-					header('Expires: Sat, 26 Jul 1997 05:00:00 GMT'); // Date in the past
-					header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
-					// force download dialog
-					if (strpos(php_sapi_name(), 'cgi') === false) {
-						header('Content-Type: application/force-download');
-						header('Content-Type: application/octet-stream', false);
-						header('Content-Type: application/download', false);
-						header('Content-Type: application/pdf', false);
-					} else {
-						header('Content-Type: application/pdf');
-					}
-					// use the Content-Disposition header to supply a recommended filename
-					header('Content-Disposition: attachment; filename="'.basename($name).'"');
-					header('Content-Transfer-Encoding: binary');
-					TCPDF_STATIC::sendOutputData(file_get_contents($name), filesize($name));
-				}
-				break;
-			}
-			case 'E': {
-				// return PDF as base64 mime multi-part email attachment (RFC 2045)
-				$retval = 'Content-Type: application/pdf;'."\r\n";
-				$retval .= ' name="'.$name.'"'."\r\n";
-				$retval .= 'Content-Transfer-Encoding: base64'."\r\n";
-				$retval .= 'Content-Disposition: attachment;'."\r\n";
-				$retval .= ' filename="'.$name.'"'."\r\n\r\n";
-				$retval .= chunk_split(base64_encode($this->getBuffer()), 76, "\r\n");
-				return $retval;
-			}
-			case 'S': {
-				// returns PDF as a string
-				return $this->getBuffer();
-			}
-			default: {
-				$this->Error('Incorrect output destination: '.$dest);
-			}
-		}
-		return '';
-	}
-
-	/**
-	 * Unset all class variables except the following critical variables.
-	 * @param $destroyall (boolean) if true destroys all class variables, otherwise preserves critical variables.
-	 * @param $preserve_objcopy (boolean) if true preserves the objcopy variable
-	 * @public
-	 * @since 4.5.016 (2009-02-24)
-	 */
-	public function _destroy($destroyall=false, $preserve_objcopy=false) {
-		if ($destroyall AND !$preserve_objcopy) {
-			// remove all temporary files
-			$tmpfiles = glob(K_PATH_CACHE.'__tcpdf_'.$this->file_id.'_*');
-			if (!empty($tmpfiles)) {
-				array_map('unlink', $tmpfiles);
-			}
-		}
-		$preserve = array(
-			'file_id',
-			'internal_encoding',
-			'state',
-			'bufferlen',
-			'buffer',
-			'cached_files',
-			'sign',
-			'signature_data',
-			'signature_max_length',
-			'byterange_string',
-			'tsa_timestamp',
-			'tsa_data'
-		);
-		foreach (array_keys(get_object_vars($this)) as $val) {
-			if ($destroyall OR !in_array($val, $preserve)) {
-				if ((!$preserve_objcopy OR ($val != 'objcopy')) AND ($val != 'file_id') AND isset($this->$val)) {
-					unset($this->$val);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Check for locale-related bug
-	 * @protected
-	 */
-	protected function _dochecks() {
-		//Check for locale-related bug
-		if (1.1 == 1) {
-			$this->Error('Don\'t alter the locale before including class file');
-		}
-		//Check for decimal separator
-		if (sprintf('%.1F', 1.0) != '1.0') {
-			setlocale(LC_NUMERIC, 'C');
-		}
-	}
-
-	/**
-	 * Return an array containing variations for the basic page number alias.
-	 * @param $a (string) Base alias.
-	 * @return array of page number aliases
-	 * @protected
-	 */
-	protected function getInternalPageNumberAliases($a= '') {
-		$alias = array();
-		// build array of Unicode + ASCII variants (the order is important)
-		$alias = array('u' => array(), 'a' => array());
-		$u = '{'.$a.'}';
-		$alias['u'][] = TCPDF_STATIC::_escape($u);
-		if ($this->isunicode) {
-			$alias['u'][] = TCPDF_STATIC::_escape(TCPDF_FONTS::UTF8ToLatin1($u, $this->isunicode, $this->CurrentFont));
-			$alias['u'][] = TCPDF_STATIC::_escape(TCPDF_FONTS::utf8StrRev($u, false, $this->tmprtl, $this->isunicode, $this->CurrentFont));
-			$alias['a'][] = TCPDF_STATIC::_escape(TCPDF_FONTS::UTF8ToLatin1($a, $this->isunicode, $this->CurrentFont));
-			$alias['a'][] = TCPDF_STATIC::_escape(TCPDF_FONTS::utf8StrRev($a, false, $this->tmprtl, $this->isunicode, $this->CurrentFont));
-		}
-		$alias['a'][] = TCPDF_STATIC::_escape($a);
-		return $alias;
-	}
-
-	/**
-	 * Return an array containing all internal page aliases.
-	 * @return array of page number aliases
-	 * @protected
-	 */
-	protected function getAllInternalPageNumberAliases() {
-		$basic_alias = array(TCPDF_STATIC::$alias_tot_pages, TCPDF_STATIC::$alias_num_page, TCPDF_STATIC::$alias_group_tot_pages, TCPDF_STATIC::$alias_group_num_page, TCPDF_STATIC::$alias_right_shift);
-		$pnalias = array();
-		foreach($basic_alias as $k => $a) {
-			$pnalias[$k] = $this->getInternalPageNumberAliases($a);
-		}
-		return $pnalias;
-	}
-
-	/**
-	 * Replace right shift page number aliases with spaces to correct right alignment.
-	 * This works perfectly only when using monospaced fonts.
-	 * @param $page (string) Page content.
-	 * @param $aliases (array) Array of page aliases.
-	 * @param $diff (int) initial difference to add.
-	 * @return replaced page content.
-	 * @protected
-	 */
-	protected function replaceRightShiftPageNumAliases($page, $aliases, $diff) {
-		foreach ($aliases as $type => $alias) {
-			foreach ($alias as $a) {
-				// find position of compensation factor
-				$startnum = (strpos($a, ':') + 1);
-				$a = substr($a, 0, $startnum);
-				if (($pos = strpos($page, $a)) !== false) {
-					// end of alias
-					$endnum = strpos($page, '}', $pos);
-					// string to be replaced
-					$aa = substr($page, $pos, ($endnum - $pos + 1));
-					// get compensation factor
-					$ratio = substr($page, ($pos + $startnum), ($endnum - $pos - $startnum));
-					$ratio = preg_replace('/[^0-9\.]/', '', $ratio);
-					$ratio = floatval($ratio);
-					if ($type == 'u') {
-						$chrdiff = floor(($diff + 12) * $ratio);
-						$shift = str_repeat(' ', $chrdiff);
-						$shift = TCPDF_FONTS::UTF8ToUTF16BE($shift, false, $this->isunicode, $this->CurrentFont);
-					} else {
-						$chrdiff = floor(($diff + 11) * $ratio);
-						$shift = str_repeat(' ', $chrdiff);
-					}
-					$page = str_replace($aa, $shift, $page);
-				}
-			}
-		}
-		return $page;
-	}
-
-	/**
-	 * Set page boxes to be included on page descriptions.
-	 * @param $boxes (array) Array of page boxes to set on document: ('MediaBox', 'CropBox', 'BleedBox', 'TrimBox', 'ArtBox').
-	 * @protected
-	 */
-	protected function setPageBoxTypes($boxes) {
-		$this->page_boxes = array();
-		foreach ($boxes as $box) {
-			if (in_array($box, TCPDF_STATIC::$pageboxes)) {
-				$this->page_boxes[] = $box;
-			}
-		}
-	}
-
-	/**
-	 * Output pages (and replace page number aliases).
-	 * @protected
-	 */
-	protected function _putpages() {
-		$filter = ($this->compress) ? '/Filter /FlateDecode ' : '';
-		// get internal aliases for page numbers
-		$pnalias = $this->getAllInternalPageNumberAliases();
-		$num_pages = $this->numpages;
-		$ptpa = TCPDF_STATIC::formatPageNumber(($this->starting_page_number + $num_pages - 1));
-		$ptpu = TCPDF_FONTS::UTF8ToUTF16BE($ptpa, false, $this->isunicode, $this->CurrentFont);
-		$ptp_num_chars = $this->GetNumChars($ptpa);
-		$pagegroupnum = 0;
-		$groupnum = 0;
-		$ptgu = 1;
-		$ptga = 1;
-		$ptg_num_chars = 1;
-		for ($n = 1; $n <= $num_pages; ++$n) {
-			// get current page
-			$temppage = $this->getPageBuffer($n);
-			$pagelen = strlen($temppage);
-			// set replacements for total pages number
-			$pnpa = TCPDF_STATIC::formatPageNumber(($this->starting_page_number + $n - 1));
-			$pnpu = TCPDF_FONTS::UTF8ToUTF16BE($pnpa, false, $this->isunicode, $this->CurrentFont);
-			$pnp_num_chars = $this->GetNumChars($pnpa);
-			$pdiff = 0; // difference used for right shift alignment of page numbers
-			$gdiff = 0; // difference used for right shift alignment of page group numbers
-			if (!empty($this->pagegroups)) {
-				if (isset($this->newpagegroup[$n])) {
-					$pagegroupnum = 0;
-					++$groupnum;
-					$ptga = TCPDF_STATIC::formatPageNumber($this->pagegroups[$groupnum]);
-					$ptgu = TCPDF_FONTS::UTF8ToUTF16BE($ptga, false, $this->isunicode, $this->CurrentFont);
-					$ptg_num_chars = $this->GetNumChars($ptga);
-				}
-				++$pagegroupnum;
-				$pnga = TCPDF_STATIC::formatPageNumber($pagegroupnum);
-				$pngu = TCPDF_FONTS::UTF8ToUTF16BE($pnga, false, $this->isunicode, $this->CurrentFont);
-				$png_num_chars = $this->GetNumChars($pnga);
-				// replace page numbers
-				$replace = array();
-				$replace[] = array($ptgu, $ptg_num_chars, 9, $pnalias[2]['u']);
-				$replace[] = array($ptga, $ptg_num_chars, 7, $pnalias[2]['a']);
-				$replace[] = array($pngu, $png_num_chars, 9, $pnalias[3]['u']);
-				$replace[] = array($pnga, $png_num_chars, 7, $pnalias[3]['a']);
-				list($temppage, $gdiff) = TCPDF_STATIC::replacePageNumAliases($temppage, $replace, $gdiff);
-			}
-			// replace page numbers
-			$replace = array();
-			$replace[] = array($ptpu, $ptp_num_chars, 9, $pnalias[0]['u']);
-			$replace[] = array($ptpa, $ptp_num_chars, 7, $pnalias[0]['a']);
-			$replace[] = array($pnpu, $pnp_num_chars, 9, $pnalias[1]['u']);
-			$replace[] = array($pnpa, $pnp_num_chars, 7, $pnalias[1]['a']);
-			list($temppage, $pdiff) = TCPDF_STATIC::replacePageNumAliases($temppage, $replace, $pdiff);
-			// replace right shift alias
-			$temppage = $this->replaceRightShiftPageNumAliases($temppage, $pnalias[4], max($pdiff, $gdiff));
-			// replace EPS marker
-			$temppage = str_replace($this->epsmarker, '', $temppage);
-			//Page
-			$this->page_obj_id[$n] = $this->_newobj();
-			$out = '<<';
-			$out .= ' /Type /Page';
-			$out .= ' /Parent 1 0 R';
-			if (empty($this->signature_data['approval']) OR ($this->signature_data['approval'] != 'A')) {
-				$out .= ' /LastModified '.$this->_datestring(0, $this->doc_modification_timestamp);
-			}
-			$out .= ' /Resources 2 0 R';
-			foreach ($this->page_boxes as $box) {
-				$out .= ' /'.$box;
-				$out .= sprintf(' [%F %F %F %F]', $this->pagedim[$n][$box]['llx'], $this->pagedim[$n][$box]['lly'], $this->pagedim[$n][$box]['urx'], $this->pagedim[$n][$box]['ury']);
-			}
-			if (isset($this->pagedim[$n]['BoxColorInfo']) AND !empty($this->pagedim[$n]['BoxColorInfo'])) {
-				$out .= ' /BoxColorInfo <<';
-				foreach ($this->page_boxes as $box) {
-					if (isset($this->pagedim[$n]['BoxColorInfo'][$box])) {
-						$out .= ' /'.$box.' <<';
-						if (isset($this->pagedim[$n]['BoxColorInfo'][$box]['C'])) {
-							$color = $this->pagedim[$n]['BoxColorInfo'][$box]['C'];
-							$out .= ' /C [';
-							$out .= sprintf(' %F %F %F', ($color[0] / 255), ($color[1] / 255), ($color[2] / 255));
-							$out .= ' ]';
-						}
-						if (isset($this->pagedim[$n]['BoxColorInfo'][$box]['W'])) {
-							$out .= ' /W '.($this->pagedim[$n]['BoxColorInfo'][$box]['W'] * $this->k);
-						}
-						if (isset($this->pagedim[$n]['BoxColorInfo'][$box]['S'])) {
-							$out .= ' /S /'.$this->pagedim[$n]['BoxColorInfo'][$box]['S'];
-						}
-						if (isset($this->pagedim[$n]['BoxColorInfo'][$box]['D'])) {
-							$dashes = $this->pagedim[$n]['BoxColorInfo'][$box]['D'];
-							$out .= ' /D [';
-							foreach ($dashes as $dash) {
-								$out .= sprintf(' %F', ($dash * $this->k));
-							}
-							$out .= ' ]';
-						}
-						$out .= ' >>';
-					}
-				}
-				$out .= ' >>';
-			}
-			$out .= ' /Contents '.($this->n + 1).' 0 R';
-			$out .= ' /Rotate '.$this->pagedim[$n]['Rotate'];
-			if (!$this->pdfa_mode) {
-				$out .= ' /Group << /Type /Group /S /Transparency /CS /DeviceRGB >>';
-			}
-			if (isset($this->pagedim[$n]['trans']) AND !empty($this->pagedim[$n]['trans'])) {
-				// page transitions
-				if (isset($this->pagedim[$n]['trans']['Dur'])) {
-					$out .= ' /Dur '.$this->pagedim[$n]['trans']['Dur'];
-				}
-				$out .= ' /Trans <<';
-				$out .= ' /Type /Trans';
-				if (isset($this->pagedim[$n]['trans']['S'])) {
-					$out .= ' /S /'.$this->pagedim[$n]['trans']['S'];
-				}
-				if (isset($this->pagedim[$n]['trans']['D'])) {
-					$out .= ' /D '.$this->pagedim[$n]['trans']['D'];
-				}
-				if (isset($this->pagedim[$n]['trans']['Dm'])) {
-					$out .= ' /Dm /'.$this->pagedim[$n]['trans']['Dm'];
-				}
-				if (isset($this->pagedim[$n]['trans']['M'])) {
-					$out .= ' /M /'.$this->pagedim[$n]['trans']['M'];
-				}
-				if (isset($this->pagedim[$n]['trans']['Di'])) {
-					$out .= ' /Di '.$this->pagedim[$n]['trans']['Di'];
-				}
-				if (isset($this->pagedim[$n]['trans']['SS'])) {
-					$out .= ' /SS '.$this->pagedim[$n]['trans']['SS'];
-				}
-				if (isset($this->pagedim[$n]['trans']['B'])) {
-					$out .= ' /B '.$this->pagedim[$n]['trans']['B'];
-				}
-				$out .= ' >>';
-			}
-			$out .= $this->_getannotsrefs($n);
-			$out .= ' /PZ '.$this->pagedim[$n]['PZ'];
-			$out .= ' >>';
-			$out .= "\n".'endobj';
-			$this->_out($out);
-			//Page content
-			$p = ($this->compress) ? gzcompress($temppage) : $temppage;
-			$this->_newobj();
-			$p = $this->_getrawstream($p);
-			$this->_out('<<'.$filter.'/Length '.strlen($p).'>> stream'."\n".$p."\n".'endstream'."\n".'endobj');
-		}
-		//Pages root
-		$out = $this->_getobj(1)."\n";
-		$out .= '<< /Type /Pages /Kids [';
-		foreach($this->page_obj_id as $page_obj) {
-			$out .= ' '.$page_obj.' 0 R';
-		}
-		$out .= ' ] /Count '.$num_pages.' >>';
-		$out .= "\n".'endobj';
-		$this->_out($out);
-	}
-
-	/**
-	 * Get references to page annotations.
-	 * @param $n (int) page number
-	 * @return string
-	 * @protected
-	 * @author Nicola Asuni
-	 * @since 5.0.010 (2010-05-17)
-	 */
-	protected function _getannotsrefs($n) {
-		if (!(isset($this->PageAnnots[$n]) OR ($this->sign AND isset($this->signature_data['cert_type'])))) {
-			return '';
-		}
-		$out = ' /Annots [';
-		if (isset($this->PageAnnots[$n])) {
-			foreach ($this->PageAnnots[$n] as $key => $val) {
-				if (!in_array($val['n'], $this->radio_groups)) {
-					$out .= ' '.$val['n'].' 0 R';
-				}
-			}
-			// add radiobutton groups
-			if (isset($this->radiobutton_groups[$n])) {
-				foreach ($this->radiobutton_groups[$n] as $key => $data) {
-					if (isset($data['n'])) {
-						$out .= ' '.$data['n'].' 0 R';
-					}
-				}
-			}
-		}
-		if ($this->sign AND ($n == $this->signature_appearance['page']) AND isset($this->signature_data['cert_type'])) {
-			// set reference for signature object
-			$out .= ' '.$this->sig_obj_id.' 0 R';
-		}
-		if (!empty($this->empty_signature_appearance)) {
-			foreach ($this->empty_signature_appearance as $esa) {
-				if ($esa['page'] == $n) {
-					// set reference for empty signature objects
-					$out .= ' '.$esa['objid'].' 0 R';
-				}
-			}
-		}
-		$out .= ' ]';
-		return $out;
-	}
-
-	/**
-	 * Output annotations objects for all pages.
-	 * !!! THIS METHOD IS NOT YET COMPLETED !!!
-	 * See section 12.5 of PDF 32000_2008 reference.
-	 * @protected
-	 * @author Nicola Asuni
-	 * @since 4.0.018 (2008-08-06)
-	 */
-	protected function _putannotsobjs() {
-		// reset object counter
-		for ($n=1; $n <= $this->numpages; ++$n) {
-			if (isset($this->PageAnnots[$n])) {
-				// set page annotations
-				foreach ($this->PageAnnots[$n] as $key => $pl) {
-					$annot_obj_id = $this->PageAnnots[$n][$key]['n'];
-					// create annotation object for grouping radiobuttons
-					if (isset($this->radiobutton_groups[$n][$pl['txt']]) AND is_array($this->radiobutton_groups[$n][$pl['txt']])) {
-						$radio_button_obj_id = $this->radiobutton_groups[$n][$pl['txt']]['n'];
-						$annots = '<<';
-						$annots .= ' /Type /Annot';
-						$annots .= ' /Subtype /Widget';
-						$annots .= ' /Rect [0 0 0 0]';
-						if ($this->radiobutton_groups[$n][$pl['txt']]['#readonly#']) {
-							// read only
-							$annots .= ' /F 68';
-							$annots .= ' /Ff 49153';
-						} else {
-							$annots .= ' /F 4'; // default print for PDF/A
-							$annots .= ' /Ff 49152';
-						}
-						$annots .= ' /T '.$this->_datastring($pl['txt'], $radio_button_obj_id);
-						if (isset($pl['opt']['tu']) AND is_string($pl['opt']['tu'])) {
-							$annots .= ' /TU '.$this->_datastring($pl['opt']['tu'], $radio_button_obj_id);
-						}
-						$annots .= ' /FT /Btn';
-						$annots .= ' /Kids [';
-						$defval = '';
-						foreach ($this->radiobutton_groups[$n][$pl['txt']] as $key => $data) {
-							if (isset($data['kid'])) {
-								$annots .= ' '.$data['kid'].' 0 R';
-								if ($data['def'] !== 'Off') {
-									$defval = $data['def'];
-								}
-							}
-						}
-						$annots .= ' ]';
-						if (!empty($defval)) {
-							$annots .= ' /V /'.$defval;
-						}
-						$annots .= ' >>';
-						$this->_out($this->_getobj($radio_button_obj_id)."\n".$annots."\n".'endobj');
-						$this->form_obj_id[] = $radio_button_obj_id;
-						// store object id to be used on Parent entry of Kids
-						$this->radiobutton_groups[$n][$pl['txt']] = $radio_button_obj_id;
-					}
-					$formfield = false;
-					$pl['opt'] = array_change_key_case($pl['opt'], CASE_LOWER);
-					$a = $pl['x'] * $this->k;
-					$b = $this->pagedim[$n]['h'] - (($pl['y'] + $pl['h']) * $this->k);
-					$c = $pl['w'] * $this->k;
-					$d = $pl['h'] * $this->k;
-					$rect = sprintf('%F %F %F %F', $a, $b, $a+$c, $b+$d);
-					// create new annotation object
-					$annots = '<</Type /Annot';
-					$annots .= ' /Subtype /'.$pl['opt']['subtype'];
-					$annots .= ' /Rect ['.$rect.']';
-					$ft = array('Btn', 'Tx', 'Ch', 'Sig');
-					if (isset($pl['opt']['ft']) AND in_array($pl['opt']['ft'], $ft)) {
-						$annots .= ' /FT /'.$pl['opt']['ft'];
-						$formfield = true;
-					}
-					$annots .= ' /Contents '.$this->_textstring($pl['txt'], $annot_obj_id);
-					$annots .= ' /P '.$this->page_obj_id[$n].' 0 R';
-					$annots .= ' /NM '.$this->_datastring(sprintf('%04u-%04u', $n, $key), $annot_obj_id);
-					$annots .= ' /M '.$this->_datestring($annot_obj_id, $this->doc_modification_timestamp);
-					if (isset($pl['opt']['f'])) {
-						$fval = 0;
-						if (is_array($pl['opt']['f'])) {
-							foreach ($pl['opt']['f'] as $f) {
-								switch (strtolower($f)) {
-									case 'invisible': {
-										$fval += 1 << 0;
-										break;
-									}
-									case 'hidden': {
-										$fval += 1 << 1;
-										break;
-									}
-									case 'print': {
-										$fval += 1 << 2;
-										break;
-									}
-									case 'nozoom': {
-										$fval += 1 << 3;
-										break;
-									}
-									case 'norotate': {
-										$fval += 1 << 4;
-										break;
-									}
-									case 'noview': {
-										$fval += 1 << 5;
-										break;
-									}
-									case 'readonly': {
-										$fval += 1 << 6;
-										break;
-									}
-									case 'locked': {
-										$fval += 1 << 8;
-										break;
-									}
-									case 'togglenoview': {
-										$fval += 1 << 9;
-										break;
-									}
-									case 'lockedcontents': {
-										$fval += 1 << 10;
-										break;
-									}
-									default: {
-										break;
-									}
-								}
-							}
-						} else {
-							$fval = intval($pl['opt']['f']);
-						}
-					} else {
-						$fval = 4;
-					}
-					if ($this->pdfa_mode) {
-						// force print flag for PDF/A mode
-						$fval |= 4;
-					}
-					$annots .= ' /F '.intval($fval);
-					if (isset($pl['opt']['as']) AND is_string($pl['opt']['as'])) {
-						$annots .= ' /AS /'.$pl['opt']['as'];
-					}
-					if (isset($pl['opt']['ap'])) {
-						// appearance stream
-						$annots .= ' /AP <<';
-						if (is_array($pl['opt']['ap'])) {
-							foreach ($pl['opt']['ap'] as $apmode => $apdef) {
-								// $apmode can be: n = normal; r = rollover; d = down;
-								$annots .= ' /'.strtoupper($apmode);
-								if (is_array($apdef)) {
-									$annots .= ' <<';
-									foreach ($apdef as $apstate => $stream) {
-										// reference to XObject that define the appearance for this mode-state
-										$apsobjid = $this->_putAPXObject($c, $d, $stream);
-										$annots .= ' /'.$apstate.' '.$apsobjid.' 0 R';
-									}
-									$annots .= ' >>';
-								} else {
-									// reference to XObject that define the appearance for this mode
-									$apsobjid = $this->_putAPXObject($c, $d, $apdef);
-									$annots .= ' '.$apsobjid.' 0 R';
-								}
-							}
-						} else {
-							$annots .= $pl['opt']['ap'];
-						}
-						$annots .= ' >>';
-					}
-					if (isset($pl['opt']['bs']) AND (is_array($pl['opt']['bs']))) {
-						$annots .= ' /BS <<';
-						$annots .= ' /Type /Border';
-						if (isset($pl['opt']['bs']['w'])) {
-							$annots .= ' /W '.intval($pl['opt']['bs']['w']);
-						}
-						$bstyles = array('S', 'D', 'B', 'I', 'U');
-						if (isset($pl['opt']['bs']['s']) AND in_array($pl['opt']['bs']['s'], $bstyles)) {
-							$annots .= ' /S /'.$pl['opt']['bs']['s'];
-						}
-						if (isset($pl['opt']['bs']['d']) AND (is_array($pl['opt']['bs']['d']))) {
-							$annots .= ' /D [';
-							foreach ($pl['opt']['bs']['d'] as $cord) {
-								$annots .= ' '.intval($cord);
-							}
-							$annots .= ']';
-						}
-						$annots .= ' >>';
-					} else {
-						$annots .= ' /Border [';
-						if (isset($pl['opt']['border']) AND (count($pl['opt']['border']) >= 3)) {
-							$annots .= intval($pl['opt']['border'][0]).' ';
-							$annots .= intval($pl['opt']['border'][1]).' ';
-							$annots .= intval($pl['opt']['border'][2]);
-							if (isset($pl['opt']['border'][3]) AND is_array($pl['opt']['border'][3])) {
-								$annots .= ' [';
-								foreach ($pl['opt']['border'][3] as $dash) {
-									$annots .= intval($dash).' ';
-								}
-								$annots .= ']';
-							}
-						} else {
-							$annots .= '0 0 0';
-						}
-						$annots .= ']';
-					}
-					if (isset($pl['opt']['be']) AND (is_array($pl['opt']['be']))) {
-						$annots .= ' /BE <<';
-						$bstyles = array('S', 'C');
-						if (isset($pl['opt']['be']['s']) AND in_array($pl['opt']['be']['s'], $bstyles)) {
-							$annots .= ' /S /'.$pl['opt']['bs']['s'];
-						} else {
-							$annots .= ' /S /S';
-						}
-						if (isset($pl['opt']['be']['i']) AND ($pl['opt']['be']['i'] >= 0) AND ($pl['opt']['be']['i'] <= 2)) {
-							$annots .= ' /I '.sprintf(' %F', $pl['opt']['be']['i']);
-						}
-						$annots .= '>>';
-					}
-					if (isset($pl['opt']['c']) AND (is_array($pl['opt']['c'])) AND !empty($pl['opt']['c'])) {
-						$annots .= ' /C '.TCPDF_COLORS::getColorStringFromArray($pl['opt']['c']);
-					}
-					//$annots .= ' /StructParent ';
-					//$annots .= ' /OC ';
-					$markups = array('text', 'freetext', 'line', 'square', 'circle', 'polygon', 'polyline', 'highlight', 'underline', 'squiggly', 'strikeout', 'stamp', 'caret', 'ink', 'fileattachment', 'sound');
-					if (in_array(strtolower($pl['opt']['subtype']), $markups)) {
-						// this is a markup type
-						if (isset($pl['opt']['t']) AND is_string($pl['opt']['t'])) {
-							$annots .= ' /T '.$this->_textstring($pl['opt']['t'], $annot_obj_id);
-						}
-						//$annots .= ' /Popup ';
-						if (isset($pl['opt']['ca'])) {
-							$annots .= ' /CA '.sprintf('%F', floatval($pl['opt']['ca']));
-						}
-						if (isset($pl['opt']['rc'])) {
-							$annots .= ' /RC '.$this->_textstring($pl['opt']['rc'], $annot_obj_id);
-						}
-						$annots .= ' /CreationDate '.$this->_datestring($annot_obj_id, $this->doc_creation_timestamp);
-						//$annots .= ' /IRT ';
-						if (isset($pl['opt']['subj'])) {
-							$annots .= ' /Subj '.$this->_textstring($pl['opt']['subj'], $annot_obj_id);
-						}
-						//$annots .= ' /RT ';
-						//$annots .= ' /IT ';
-						//$annots .= ' /ExData ';
-					}
-					$lineendings = array('Square', 'Circle', 'Diamond', 'OpenArrow', 'ClosedArrow', 'None', 'Butt', 'ROpenArrow', 'RClosedArrow', 'Slash');
-					// Annotation types
-					switch (strtolower($pl['opt']['subtype'])) {
-						case 'text': {
-							if (isset($pl['opt']['open'])) {
-								$annots .= ' /Open '. (strtolower($pl['opt']['open']) == 'true' ? 'true' : 'false');
-							}
-							$iconsapp = array('Comment', 'Help', 'Insert', 'Key', 'NewParagraph', 'Note', 'Paragraph');
-							if (isset($pl['opt']['name']) AND in_array($pl['opt']['name'], $iconsapp)) {
-								$annots .= ' /Name /'.$pl['opt']['name'];
-							} else {
-								$annots .= ' /Name /Note';
-							}
-							$statemodels = array('Marked', 'Review');
-							if (isset($pl['opt']['statemodel']) AND in_array($pl['opt']['statemodel'], $statemodels)) {
-								$annots .= ' /StateModel /'.$pl['opt']['statemodel'];
-							} else {
-								$pl['opt']['statemodel'] = 'Marked';
-								$annots .= ' /StateModel /'.$pl['opt']['statemodel'];
-							}
-							if ($pl['opt']['statemodel'] == 'Marked') {
-								$states = array('Accepted', 'Unmarked');
-							} else {
-								$states = array('Accepted', 'Rejected', 'Cancelled', 'Completed', 'None');
-							}
-							if (isset($pl['opt']['state']) AND in_array($pl['opt']['state'], $states)) {
-								$annots .= ' /State /'.$pl['opt']['state'];
-							} else {
-								if ($pl['opt']['statemodel'] == 'Marked') {
-									$annots .= ' /State /Unmarked';
-								} else {
-									$annots .= ' /State /None';
-								}
-							}
-							break;
-						}
-						case 'link': {
-							if (is_string($pl['txt'])) {
-								if ($pl['txt'][0] == '#') {
-									// internal destination
-									$annots .= ' /Dest /'.TCPDF_STATIC::encodeNameObject(substr($pl['txt'], 1));
-								} elseif ($pl['txt'][0] == '%') {
-									// embedded PDF file
-									$filename = basename(substr($pl['txt'], 1));
-									$annots .= ' /A << /S /GoToE /D [0 /Fit] /NewWindow true /T << /R /C /P '.($n - 1).' /A '.$this->embeddedfiles[$filename]['a'].' >> >>';
-								} elseif ($pl['txt'][0] == '*') {
-									// embedded generic file
-									$filename = basename(substr($pl['txt'], 1));
-									$jsa = 'var D=event.target.doc;var MyData=D.dataObjects;for (var i in MyData) if (MyData[i].path=="'.$filename.'") D.exportDataObject( { cName : MyData[i].name, nLaunch : 2});';
-									$annots .= ' /A << /S /JavaScript /JS '.$this->_textstring($jsa, $annot_obj_id).'>>';
-								} else {
-									$parsedUrl = parse_url($pl['txt']);
-									if (empty($parsedUrl['scheme']) AND (strtolower(substr($parsedUrl['path'], -4)) == '.pdf')) {
-										// relative link to a PDF file
-										$dest = '[0 /Fit]'; // default page 0
-										if (!empty($parsedUrl['fragment'])) {
-											// check for named destination
-											$tmp = explode('=', $parsedUrl['fragment']);
-											$dest = '('.((count($tmp) == 2) ? $tmp[1] : $tmp[0]).')';
-										}
-										$annots .= ' /A <</S /GoToR /D '.$dest.' /F '.$this->_datastring($this->unhtmlentities($parsedUrl['path']), $annot_obj_id).' /NewWindow true>>';
-									} else {
-										// external URI link
-										$annots .= ' /A <</S /URI /URI '.$this->_datastring($this->unhtmlentities($pl['txt']), $annot_obj_id).'>>';
-									}
-								}
-							} elseif (isset($this->links[$pl['txt']])) {
-								// internal link ID
-								$l = $this->links[$pl['txt']];
-								if (isset($this->page_obj_id[($l['p'])])) {
-									$annots .= sprintf(' /Dest [%u 0 R /XYZ 0 %F null]', $this->page_obj_id[($l['p'])], ($this->pagedim[$l['p']]['h'] - ($l['y'] * $this->k)));
-								}
-							}
-							$hmodes = array('N', 'I', 'O', 'P');
-							if (isset($pl['opt']['h']) AND in_array($pl['opt']['h'], $hmodes)) {
-								$annots .= ' /H /'.$pl['opt']['h'];
-							} else {
-								$annots .= ' /H /I';
-							}
-							//$annots .= ' /PA ';
-							//$annots .= ' /Quadpoints ';
-							break;
-						}
-						case 'freetext': {
-							if (isset($pl['opt']['da']) AND !empty($pl['opt']['da'])) {
-								$annots .= ' /DA ('.$pl['opt']['da'].')';
-							}
-							if (isset($pl['opt']['q']) AND ($pl['opt']['q'] >= 0) AND ($pl['opt']['q'] <= 2)) {
-								$annots .= ' /Q '.intval($pl['opt']['q']);
-							}
-							if (isset($pl['opt']['rc'])) {
-								$annots .= ' /RC '.$this->_textstring($pl['opt']['rc'], $annot_obj_id);
-							}
-							if (isset($pl['opt']['ds'])) {
-								$annots .= ' /DS '.$this->_textstring($pl['opt']['ds'], $annot_obj_id);
-							}
-							if (isset($pl['opt']['cl']) AND is_array($pl['opt']['cl'])) {
-								$annots .= ' /CL [';
-								foreach ($pl['opt']['cl'] as $cl) {
-									$annots .= sprintf('%F ', $cl * $this->k);
-								}
-								$annots .= ']';
-							}
-							$tfit = array('FreeText', 'FreeTextCallout', 'FreeTextTypeWriter');
-							if (isset($pl['opt']['it']) AND in_array($pl['opt']['it'], $tfit)) {
-								$annots .= ' /IT /'.$pl['opt']['it'];
-							}
-							if (isset($pl['opt']['rd']) AND is_array($pl['opt']['rd'])) {
-								$l = $pl['opt']['rd'][0] * $this->k;
-								$r = $pl['opt']['rd'][1] * $this->k;
-								$t = $pl['opt']['rd'][2] * $this->k;
-								$b = $pl['opt']['rd'][3] * $this->k;
-								$annots .= ' /RD ['.sprintf('%F %F %F %F', $l, $r, $t, $b).']';
-							}
-							if (isset($pl['opt']['le']) AND in_array($pl['opt']['le'], $lineendings)) {
-								$annots .= ' /LE /'.$pl['opt']['le'];
-							}
-							break;
-						}
-						case 'line': {
-							break;
-						}
-						case 'square': {
-							break;
-						}
-						case 'circle': {
-							break;
-						}
-						case 'polygon': {
-							break;
-						}
-						case 'polyline': {
-							break;
-						}
-						case 'highlight': {
-							break;
-						}
-						case 'underline': {
-							break;
-						}
-						case 'squiggly': {
-							break;
-						}
-						case 'strikeout': {
-							break;
-						}
-						case 'stamp': {
-							break;
-						}
-						case 'caret': {
-							break;
-						}
-						case 'ink': {
-							break;
-						}
-						case 'popup': {
-							break;
-						}
-						case 'fileattachment': {
-							if ($this->pdfa_mode) {
-								// embedded files are not allowed in PDF/A mode
-								break;
-							}
-							if (!isset($pl['opt']['fs'])) {
-								break;
-							}
-							$filename = basename($pl['opt']['fs']);
-							if (isset($this->embeddedfiles[$filename]['f'])) {
-								$annots .= ' /FS '.$this->embeddedfiles[$filename]['f'].' 0 R';
-								$iconsapp = array('Graph', 'Paperclip', 'PushPin', 'Tag');
-								if (isset($pl['opt']['name']) AND in_array($pl['opt']['name'], $iconsapp)) {
-									$annots .= ' /Name /'.$pl['opt']['name'];
-								} else {
-									$annots .= ' /Name /PushPin';
-								}
-								// index (zero-based) of the annotation in the Annots array of this page
-								$this->embeddedfiles[$filename]['a'] = $key;
-							}
-							break;
-						}
-						case 'sound': {
-							if (!isset($pl['opt']['fs'])) {
-								break;
-							}
-							$filename = basename($pl['opt']['fs']);
-							if (isset($this->embeddedfiles[$filename]['f'])) {
-								// ... TO BE COMPLETED ...
-								// /R /C /B /E /CO /CP
-								$annots .= ' /Sound '.$this->embeddedfiles[$filename]['f'].' 0 R';
-								$iconsapp = array('Speaker', 'Mic');
-								if (isset($pl['opt']['name']) AND in_array($pl['opt']['name'], $iconsapp)) {
-									$annots .= ' /Name /'.$pl['opt']['name'];
-								} else {
-									$annots .= ' /Name /Speaker';
-								}
-							}
-							break;
-						}
-						case 'movie': {
-							break;
-						}
-						case 'widget': {
-							$hmode = array('N', 'I', 'O', 'P', 'T');
-							if (isset($pl['opt']['h']) AND in_array($pl['opt']['h'], $hmode)) {
-								$annots .= ' /H /'.$pl['opt']['h'];
-							}
-							if (isset($pl['opt']['mk']) AND (is_array($pl['opt']['mk'])) AND !empty($pl['opt']['mk'])) {
-								$annots .= ' /MK <<';
-								if (isset($pl['opt']['mk']['r'])) {
-									$annots .= ' /R '.$pl['opt']['mk']['r'];
-								}
-								if (isset($pl['opt']['mk']['bc']) AND (is_array($pl['opt']['mk']['bc']))) {
-									$annots .= ' /BC '.TCPDF_COLORS::getColorStringFromArray($pl['opt']['mk']['bc']);
-								}
-								if (isset($pl['opt']['mk']['bg']) AND (is_array($pl['opt']['mk']['bg']))) {
-									$annots .= ' /BG '.TCPDF_COLORS::getColorStringFromArray($pl['opt']['mk']['bg']);
-								}
-								if (isset($pl['opt']['mk']['ca'])) {
-									$annots .= ' /CA '.$pl['opt']['mk']['ca'];
-								}
-								if (isset($pl['opt']['mk']['rc'])) {
-									$annots .= ' /RC '.$pl['opt']['mk']['rc'];
-								}
-								if (isset($pl['opt']['mk']['ac'])) {
-									$annots .= ' /AC '.$pl['opt']['mk']['ac'];
-								}
-								if (isset($pl['opt']['mk']['i'])) {
-									$info = $this->getImageBuffer($pl['opt']['mk']['i']);
-									if ($info !== false) {
-										$annots .= ' /I '.$info['n'].' 0 R';
-									}
-								}
-								if (isset($pl['opt']['mk']['ri'])) {
-									$info = $this->getImageBuffer($pl['opt']['mk']['ri']);
-									if ($info !== false) {
-										$annots .= ' /RI '.$info['n'].' 0 R';
-									}
-								}
-								if (isset($pl['opt']['mk']['ix'])) {
-									$info = $this->getImageBuffer($pl['opt']['mk']['ix']);
-									if ($info !== false) {
-										$annots .= ' /IX '.$info['n'].' 0 R';
-									}
-								}
-								if (isset($pl['opt']['mk']['if']) AND (is_array($pl['opt']['mk']['if'])) AND !empty($pl['opt']['mk']['if'])) {
-									$annots .= ' /IF <<';
-									$if_sw = array('A', 'B', 'S', 'N');
-									if (isset($pl['opt']['mk']['if']['sw']) AND in_array($pl['opt']['mk']['if']['sw'], $if_sw)) {
-										$annots .= ' /SW /'.$pl['opt']['mk']['if']['sw'];
-									}
-									$if_s = array('A', 'P');
-									if (isset($pl['opt']['mk']['if']['s']) AND in_array($pl['opt']['mk']['if']['s'], $if_s)) {
-										$annots .= ' /S /'.$pl['opt']['mk']['if']['s'];
-									}
-									if (isset($pl['opt']['mk']['if']['a']) AND (is_array($pl['opt']['mk']['if']['a'])) AND !empty($pl['opt']['mk']['if']['a'])) {
-										$annots .= sprintf(' /A [%F %F]', $pl['opt']['mk']['if']['a'][0], $pl['opt']['mk']['if']['a'][1]);
-									}
-									if (isset($pl['opt']['mk']['if']['fb']) AND ($pl['opt']['mk']['if']['fb'])) {
-										$annots .= ' /FB true';
-									}
-									$annots .= '>>';
-								}
-								if (isset($pl['opt']['mk']['tp']) AND ($pl['opt']['mk']['tp'] >= 0) AND ($pl['opt']['mk']['tp'] <= 6)) {
-									$annots .= ' /TP '.intval($pl['opt']['mk']['tp']);
-								}
-								$annots .= '>>';
-							} // end MK
-							// --- Entries for field dictionaries ---
-							if (isset($this->radiobutton_groups[$n][$pl['txt']])) {
-								// set parent
-								$annots .= ' /Parent '.$this->radiobutton_groups[$n][$pl['txt']].' 0 R';
-							}
-							if (isset($pl['opt']['t']) AND is_string($pl['opt']['t'])) {
-								$annots .= ' /T '.$this->_datastring($pl['opt']['t'], $annot_obj_id);
-							}
-							if (isset($pl['opt']['tu']) AND is_string($pl['opt']['tu'])) {
-								$annots .= ' /TU '.$this->_datastring($pl['opt']['tu'], $annot_obj_id);
-							}
-							if (isset($pl['opt']['tm']) AND is_string($pl['opt']['tm'])) {
-								$annots .= ' /TM '.$this->_datastring($pl['opt']['tm'], $annot_obj_id);
-							}
-							if (isset($pl['opt']['ff'])) {
-								if (is_array($pl['opt']['ff'])) {
-									// array of bit settings
-									$flag = 0;
-									foreach($pl['opt']['ff'] as $val) {
-										$flag += 1 << ($val - 1);
-									}
-								} else {
-									$flag = intval($pl['opt']['ff']);
-								}
-								$annots .= ' /Ff '.$flag;
-							}
-							if (isset($pl['opt']['maxlen'])) {
-								$annots .= ' /MaxLen '.intval($pl['opt']['maxlen']);
-							}
-							if (isset($pl['opt']['v'])) {
-								$annots .= ' /V';
-								if (is_array($pl['opt']['v'])) {
-									foreach ($pl['opt']['v'] AS $optval) {
-										if (is_float($optval)) {
-											$optval = sprintf('%F', $optval);
-										}
-										$annots .= ' '.$optval;
-									}
-								} else {
-									$annots .= ' '.$this->_textstring($pl['opt']['v'], $annot_obj_id);
-								}
-							}
-							if (isset($pl['opt']['dv'])) {
-								$annots .= ' /DV';
-								if (is_array($pl['opt']['dv'])) {
-									foreach ($pl['opt']['dv'] AS $optval) {
-										if (is_float($optval)) {
-											$optval = sprintf('%F', $optval);
-										}
-										$annots .= ' '.$optval;
-									}
-								} else {
-									$annots .= ' '.$this->_textstring($pl['opt']['dv'], $annot_obj_id);
-								}
-							}
-							if (isset($pl['opt']['rv'])) {
-								$annots .= ' /RV';
-								if (is_array($pl['opt']['rv'])) {
-									foreach ($pl['opt']['rv'] AS $optval) {
-										if (is_float($optval)) {
-											$optval = sprintf('%F', $optval);
-										}
-										$annots .= ' '.$optval;
-									}
-								} else {
-									$annots .= ' '.$this->_textstring($pl['opt']['rv'], $annot_obj_id);
-								}
-							}
-							if (isset($pl['opt']['a']) AND !empty($pl['opt']['a'])) {
-								$annots .= ' /A << '.$pl['opt']['a'].' >>';
-							}
-							if (isset($pl['opt']['aa']) AND !empty($pl['opt']['aa'])) {
-								$annots .= ' /AA << '.$pl['opt']['aa'].' >>';
-							}
-							if (isset($pl['opt']['da']) AND !empty($pl['opt']['da'])) {
-								$annots .= ' /DA ('.$pl['opt']['da'].')';
-							}
-							if (isset($pl['opt']['q']) AND ($pl['opt']['q'] >= 0) AND ($pl['opt']['q'] <= 2)) {
-								$annots .= ' /Q '.intval($pl['opt']['q']);
-							}
-							if (isset($pl['opt']['opt']) AND (is_array($pl['opt']['opt'])) AND !empty($pl['opt']['opt'])) {
-								$annots .= ' /Opt [';
-								foreach($pl['opt']['opt'] AS $copt) {
-									if (is_array($copt)) {
-										$annots .= ' ['.$this->_textstring($copt[0], $annot_obj_id).' '.$this->_textstring($copt[1], $annot_obj_id).']';
-									} else {
-										$annots .= ' '.$this->_textstring($copt, $annot_obj_id);
-									}
-								}
-								$annots .= ']';
-							}
-							if (isset($pl['opt']['ti'])) {
-								$annots .= ' /TI '.intval($pl['opt']['ti']);
-							}
-							if (isset($pl['opt']['i']) AND (is_array($pl['opt']['i'])) AND !empty($pl['opt']['i'])) {
-								$annots .= ' /I [';
-								foreach($pl['opt']['i'] AS $copt) {
-									$annots .= intval($copt).' ';
-								}
-								$annots .= ']';
-							}
-							break;
-						}
-						case 'screen': {
-							break;
-						}
-						case 'printermark': {
-							break;
-						}
-						case 'trapnet': {
-							break;
-						}
-						case 'watermark': {
-							break;
-						}
-						case '3d': {
-							break;
-						}
-						default: {
-							break;
-						}
-					}
-					$annots .= '>>';
-					// create new annotation object
-					$this->_out($this->_getobj($annot_obj_id)."\n".$annots."\n".'endobj');
-					if ($formfield AND !isset($this->radiobutton_groups[$n][$pl['txt']])) {
-						// store reference of form object
-						$this->form_obj_id[] = $annot_obj_id;
-					}
-				}
-			}
-		} // end for each page
-	}
-
-	/**
-	 * Put appearance streams XObject used to define annotation's appearance states.
-	 * @param $w (int) annotation width
-	 * @param $h (int) annotation height
-	 * @param $stream (string) appearance stream
-	 * @return int object ID
-	 * @protected
-	 * @since 4.8.001 (2009-09-09)
-	 */
-	protected function _putAPXObject($w=0, $h=0, $stream='') {
-		$stream = trim($stream);
-		$out = $this->_getobj()."\n";
-		$this->xobjects['AX'.$this->n] = array('n' => $this->n);
-		$out .= '<<';
-		$out .= ' /Type /XObject';
-		$out .= ' /Subtype /Form';
-		$out .= ' /FormType 1';
-		if ($this->compress) {
-			$stream = gzcompress($stream);
-			$out .= ' /Filter /FlateDecode';
-		}
-		$rect = sprintf('%F %F', $w, $h);
-		$out .= ' /BBox [0 0 '.$rect.']';
-		$out .= ' /Matrix [1 0 0 1 0 0]';
-		$out .= ' /Resources 2 0 R';
-		$stream = $this->_getrawstream($stream);
-		$out .= ' /Length '.strlen($stream);
-		$out .= ' >>';
-		$out .= ' stream'."\n".$stream."\n".'endstream';
-		$out .= "\n".'endobj';
-		$this->_out($out);
-		return $this->n;
-	}
-
-	/**
-	 * Output fonts.
-	 * @author Nicola Asuni
-	 * @protected
-	 */
-	protected function _putfonts() {
-		$nf = $this->n;
-		foreach ($this->diffs as $diff) {
-			//Encodings
-			$this->_newobj();
-			$this->_out('<< /Type /Encoding /BaseEncoding /WinAnsiEncoding /Differences ['.$diff.'] >>'."\n".'endobj');
-		}
-		$mqr = TCPDF_STATIC::get_mqr();
-		TCPDF_STATIC::set_mqr(false);
-		foreach ($this->FontFiles as $file => $info) {
-			// search and get font file to embedd
-			$fontfile = TCPDF_FONTS::getFontFullPath($file, $info['fontdir']);
-			if (!TCPDF_STATIC::empty_string($fontfile)) {
-				$font = file_get_contents($fontfile);
-				$compressed = (substr($file, -2) == '.z');
-				if ((!$compressed) AND (isset($info['length2']))) {
-					$header = (ord($font[0]) == 128);
-					if ($header) {
-						// strip first binary header
-						$font = substr($font, 6);
-					}
-					if ($header AND (ord($font[$info['length1']]) == 128)) {
-						// strip second binary header
-						$font = substr($font, 0, $info['length1']).substr($font, ($info['length1'] + 6));
-					}
-				} elseif ($info['subset'] AND ((!$compressed) OR ($compressed AND function_exists('gzcompress')))) {
-					if ($compressed) {
-						// uncompress font
-						$font = gzuncompress($font);
-					}
-					// merge subset characters
-					$subsetchars = array(); // used chars
-					foreach ($info['fontkeys'] as $fontkey) {
-						$fontinfo = $this->getFontBuffer($fontkey);
-						$subsetchars += $fontinfo['subsetchars'];
-					}
-					// rebuild a font subset
-					$font = TCPDF_FONTS::_getTrueTypeFontSubset($font, $subsetchars);
-					// calculate new font length
-					$info['length1'] = strlen($font);
-					if ($compressed) {
-						// recompress font
-						$font = gzcompress($font);
-					}
-				}
-				$this->_newobj();
-				$this->FontFiles[$file]['n'] = $this->n;
-				$stream = $this->_getrawstream($font);
-				$out = '<< /Length '.strlen($stream);
-				if ($compressed) {
-					$out .= ' /Filter /FlateDecode';
-				}
-				$out .= ' /Length1 '.$info['length1'];
-				if (isset($info['length2'])) {
-					$out .= ' /Length2 '.$info['length2'].' /Length3 0';
-				}
-				$out .= ' >>';
-				$out .= ' stream'."\n".$stream."\n".'endstream';
-				$out .= "\n".'endobj';
-				$this->_out($out);
-			}
-		}
-		TCPDF_STATIC::set_mqr($mqr);
-		foreach ($this->fontkeys as $k) {
-			//Font objects
-			$font = $this->getFontBuffer($k);
-			$type = $font['type'];
-			$name = $font['name'];
-			if ($type == 'core') {
-				// standard core font
-				$out = $this->_getobj($this->font_obj_ids[$k])."\n";
-				$out .= '<</Type /Font';
-				$out .= ' /Subtype /Type1';
-				$out .= ' /BaseFont /'.$name;
-				$out .= ' /Name /F'.$font['i'];
-				if ((strtolower($name) != 'symbol') AND (strtolower($name) != 'zapfdingbats')) {
-					$out .= ' /Encoding /WinAnsiEncoding';
-				}
-				if ($k == 'helvetica') {
-					// add default font for annotations
-					$this->annotation_fonts[$k] = $font['i'];
-				}
-				$out .= ' >>';
-				$out .= "\n".'endobj';
-				$this->_out($out);
-			} elseif (($type == 'Type1') OR ($type == 'TrueType')) {
-				// additional Type1 or TrueType font
-				$out = $this->_getobj($this->font_obj_ids[$k])."\n";
-				$out .= '<</Type /Font';
-				$out .= ' /Subtype /'.$type;
-				$out .= ' /BaseFont /'.$name;
-				$out .= ' /Name /F'.$font['i'];
-				$out .= ' /FirstChar 32 /LastChar 255';
-				$out .= ' /Widths '.($this->n + 1).' 0 R';
-				$out .= ' /FontDescriptor '.($this->n + 2).' 0 R';
-				if ($font['enc']) {
-					if (isset($font['diff'])) {
-						$out .= ' /Encoding '.($nf + $font['diff']).' 0 R';
-					} else {
-						$out .= ' /Encoding /WinAnsiEncoding';
-					}
-				}
-				$out .= ' >>';
-				$out .= "\n".'endobj';
-				$this->_out($out);
-				// Widths
-				$this->_newobj();
-				$s = '[';
-				for ($i = 32; $i < 256; ++$i) {
-					if (isset($font['cw'][$i])) {
-						$s .= $font['cw'][$i].' ';
-					} else {
-						$s .= $font['dw'].' ';
-					}
-				}
-				$s .= ']';
-				$s .= "\n".'endobj';
-				$this->_out($s);
-				//Descriptor
-				$this->_newobj();
-				$s = '<</Type /FontDescriptor /FontName /'.$name;
-				foreach ($font['desc'] as $fdk => $fdv) {
-					if (is_float($fdv)) {
-						$fdv = sprintf('%F', $fdv);
-					}
-					$s .= ' /'.$fdk.' '.$fdv.'';
-				}
-				if (!TCPDF_STATIC::empty_string($font['file'])) {
-					$s .= ' /FontFile'.($type == 'Type1' ? '' : '2').' '.$this->FontFiles[$font['file']]['n'].' 0 R';
-				}
-				$s .= '>>';
-				$s .= "\n".'endobj';
-				$this->_out($s);
-			} else {
-				// additional types
-				$mtd = '_put'.strtolower($type);
-				if (!method_exists($this, $mtd)) {
-					$this->Error('Unsupported font type: '.$type);
-				}
-				$this->$mtd($font);
-			}
-		}
-	}
-
-	/**
-	 * Adds unicode fonts.<br>
-	 * Based on PDF Reference 1.3 (section 5)
-	 * @param $font (array) font data
-	 * @protected
-	 * @author Nicola Asuni
-	 * @since 1.52.0.TC005 (2005-01-05)
-	 */
-	protected function _puttruetypeunicode($font) {
-		$fontname = '';
-		if ($font['subset']) {
-			// change name for font subsetting
-			$subtag = sprintf('%06u', $font['i']);
-			$subtag = strtr($subtag, '0123456789', 'ABCDEFGHIJ');
-			$fontname .= $subtag.'+';
-		}
-		$fontname .= $font['name'];
-		// Type0 Font
-		// A composite font composed of other fonts, organized hierarchically
-		$out = $this->_getobj($this->font_obj_ids[$font['fontkey']])."\n";
-		$out .= '<< /Type /Font';
-		$out .= ' /Subtype /Type0';
-		$out .= ' /BaseFont /'.$fontname;
-		$out .= ' /Name /F'.$font['i'];
-		$out .= ' /Encoding /'.$font['enc'];
-		$out .= ' /ToUnicode '.($this->n + 1).' 0 R';
-		$out .= ' /DescendantFonts ['.($this->n + 2).' 0 R]';
-		$out .= ' >>';
-		$out .= "\n".'endobj';
-		$this->_out($out);
-		// ToUnicode map for Identity-H
-		$stream = TCPDF_FONT_DATA::$uni_identity_h;
-		// ToUnicode Object
-		$this->_newobj();
-		$stream = ($this->compress) ? gzcompress($stream) : $stream;
-		$filter = ($this->compress) ? '/Filter /FlateDecode ' : '';
-		$stream = $this->_getrawstream($stream);
-		$this->_out('<<'.$filter.'/Length '.strlen($stream).'>> stream'."\n".$stream."\n".'endstream'."\n".'endobj');
-		// CIDFontType2
-		// A CIDFont whose glyph descriptions are based on TrueType font technology
-		$oid = $this->_newobj();
-		$out = '<< /Type /Font';
-		$out .= ' /Subtype /CIDFontType2';
-		$out .= ' /BaseFont /'.$fontname;
-		// A dictionary containing entries that define the character collection of the CIDFont.
-		$cidinfo = '/Registry '.$this->_datastring($font['cidinfo']['Registry'], $oid);
-		$cidinfo .= ' /Ordering '.$this->_datastring($font['cidinfo']['Ordering'], $oid);
-		$cidinfo .= ' /Supplement '.$font['cidinfo']['Supplement'];
-		$out .= ' /CIDSystemInfo << '.$cidinfo.' >>';
-		$out .= ' /FontDescriptor '.($this->n + 1).' 0 R';
-		$out .= ' /DW '.$font['dw']; // default width
-		$out .= "\n".TCPDF_FONTS::_putfontwidths($font, 0);
-		if (isset($font['ctg']) AND (!TCPDF_STATIC::empty_string($font['ctg']))) {
-			$out .= "\n".'/CIDToGIDMap '.($this->n + 2).' 0 R';
-		}
-		$out .= ' >>';
-		$out .= "\n".'endobj';
-		$this->_out($out);
-		// Font descriptor
-		// A font descriptor describing the CIDFont default metrics other than its glyph widths
-		$this->_newobj();
-		$out = '<< /Type /FontDescriptor';
-		$out .= ' /FontName /'.$fontname;
-		foreach ($font['desc'] as $key => $value) {
-			if (is_float($value)) {
-				$value = sprintf('%F', $value);
-			}
-			$out .= ' /'.$key.' '.$value;
-		}
-		$fontdir = false;
-		if (!TCPDF_STATIC::empty_string($font['file'])) {
-			// A stream containing a TrueType font
-			$out .= ' /FontFile2 '.$this->FontFiles[$font['file']]['n'].' 0 R';
-			$fontdir = $this->FontFiles[$font['file']]['fontdir'];
-		}
-		$out .= ' >>';
-		$out .= "\n".'endobj';
-		$this->_out($out);
-		if (isset($font['ctg']) AND (!TCPDF_STATIC::empty_string($font['ctg']))) {
-			$this->_newobj();
-			// Embed CIDToGIDMap
-			// A specification of the mapping from CIDs to glyph indices
-			// search and get CTG font file to embedd
-			$ctgfile = strtolower($font['ctg']);
-			// search and get ctg font file to embedd
-			$fontfile = TCPDF_FONTS::getFontFullPath($ctgfile, $fontdir);
-			if (TCPDF_STATIC::empty_string($fontfile)) {
-				$this->Error('Font file not found: '.$ctgfile);
-			}
-			$stream = $this->_getrawstream(file_get_contents($fontfile));
-			$out = '<< /Length '.strlen($stream).'';
-			if (substr($fontfile, -2) == '.z') { // check file extension
-				// Decompresses data encoded using the public-domain
-				// zlib/deflate compression method, reproducing the
-				// original text or binary data
-				$out .= ' /Filter /FlateDecode';
-			}
-			$out .= ' >>';
-			$out .= ' stream'."\n".$stream."\n".'endstream';
-			$out .= "\n".'endobj';
-			$this->_out($out);
-		}
-	}
-
-	/**
-	 * Output CID-0 fonts.
-	 * A Type 0 CIDFont contains glyph descriptions based on the Adobe Type 1 font format
-	 * @param $font (array) font data
-	 * @protected
-	 * @author Andrew Whitehead, Nicola Asuni, Yukihiro Nakadaira
-	 * @since 3.2.000 (2008-06-23)
-	 */
-	protected function _putcidfont0($font) {
-		$cidoffset = 0;
-		if (!isset($font['cw'][1])) {
-			$cidoffset = 31;
-		}
-		if (isset($font['cidinfo']['uni2cid'])) {
-			// convert unicode to cid.
-			$uni2cid = $font['cidinfo']['uni2cid'];
-			$cw = array();
-			foreach ($font['cw'] as $uni => $width) {
-				if (isset($uni2cid[$uni])) {
-					$cw[($uni2cid[$uni] + $cidoffset)] = $width;
-				} elseif ($uni < 256) {
-					$cw[$uni] = $width;
-				} // else unknown character
-			}
-			$font = array_merge($font, array('cw' => $cw));
-		}
-		$name = $font['name'];
-		$enc = $font['enc'];
-		if ($enc) {
-			$longname = $name.'-'.$enc;
-		} else {
-			$longname = $name;
-		}
-		$out = $this->_getobj($this->font_obj_ids[$font['fontkey']])."\n";
-		$out .= '<</Type /Font';
-		$out .= ' /Subtype /Type0';
-		$out .= ' /BaseFont /'.$longname;
-		$out .= ' /Name /F'.$font['i'];
-		if ($enc) {
-			$out .= ' /Encoding /'.$enc;
-		}
-		$out .= ' /DescendantFonts ['.($this->n + 1).' 0 R]';
-		$out .= ' >>';
-		$out .= "\n".'endobj';
-		$this->_out($out);
-		$oid = $this->_newobj();
-		$out = '<</Type /Font';
-		$out .= ' /Subtype /CIDFontType0';
-		$out .= ' /BaseFont /'.$name;
-		$cidinfo = '/Registry '.$this->_datastring($font['cidinfo']['Registry'], $oid);
-		$cidinfo .= ' /Ordering '.$this->_datastring($font['cidinfo']['Ordering'], $oid);
-		$cidinfo .= ' /Supplement '.$font['cidinfo']['Supplement'];
-		$out .= ' /CIDSystemInfo <<'.$cidinfo.'>>';
-		$out .= ' /FontDescriptor '.($this->n + 1).' 0 R';
-		$out .= ' /DW '.$font['dw'];
-		$out .= "\n".TCPDF_FONTS::_putfontwidths($font, $cidoffset);
-		$out .= ' >>';
-		$out .= "\n".'endobj';
-		$this->_out($out);
-		$this->_newobj();
-		$s = '<</Type /FontDescriptor /FontName /'.$name;
-		foreach ($font['desc'] as $k => $v) {
-			if ($k != 'Style') {
-				if (is_float($v)) {
-					$v = sprintf('%F', $v);
-				}
-				$s .= ' /'.$k.' '.$v.'';
-			}
-		}
-		$s .= '>>';
-		$s .= "\n".'endobj';
-		$this->_out($s);
-	}
-
-	/**
-	 * Output images.
-	 * @protected
-	 */
-	protected function _putimages() {
-		$filter = ($this->compress) ? '/Filter /FlateDecode ' : '';
-		foreach ($this->imagekeys as $file) {
-			$info = $this->getImageBuffer($file);
-			// set object for alternate images array
-			if ((!$this->pdfa_mode) AND isset($info['altimgs']) AND !empty($info['altimgs'])) {
-				$altoid = $this->_newobj();
-				$out = '[';
-				foreach ($info['altimgs'] as $altimage) {
-					if (isset($this->xobjects['I'.$altimage[0]]['n'])) {
-						$out .= ' << /Image '.$this->xobjects['I'.$altimage[0]]['n'].' 0 R';
-						$out .= ' /DefaultForPrinting';
-						if ($altimage[1] === true) {
-							$out .= ' true';
-						} else {
-							$out .= ' false';
-						}
-						$out .= ' >>';
-					}
-				}
-				$out .= ' ]';
-				$out .= "\n".'endobj';
-				$this->_out($out);
-			}
-			// set image object
-			$oid = $this->_newobj();
-			$this->xobjects['I'.$info['i']] = array('n' => $oid);
-			$this->setImageSubBuffer($file, 'n', $this->n);
-			$out = '<</Type /XObject';
-			$out .= ' /Subtype /Image';
-			$out .= ' /Width '.$info['w'];
-			$out .= ' /Height '.$info['h'];
-			if (array_key_exists('masked', $info)) {
-				$out .= ' /SMask '.($this->n - 1).' 0 R';
-			}
-			// set color space
-			$icc = false;
-			if (isset($info['icc']) AND ($info['icc'] !== false)) {
-				// ICC Colour Space
-				$icc = true;
-				$out .= ' /ColorSpace [/ICCBased '.($this->n + 1).' 0 R]';
-			} elseif ($info['cs'] == 'Indexed') {
-				// Indexed Colour Space
-				$out .= ' /ColorSpace [/Indexed /DeviceRGB '.((strlen($info['pal']) / 3) - 1).' '.($this->n + 1).' 0 R]';
-			} else {
-				// Device Colour Space
-				$out .= ' /ColorSpace /'.$info['cs'];
-			}
-			if ($info['cs'] == 'DeviceCMYK') {
-				$out .= ' /Decode [1 0 1 0 1 0 1 0]';
-			}
-			$out .= ' /BitsPerComponent '.$info['bpc'];
-			if (isset($altoid) AND ($altoid > 0)) {
-				// reference to alternate images dictionary
-				$out .= ' /Alternates '.$altoid.' 0 R';
-			}
-			if (isset($info['exurl']) AND !empty($info['exurl'])) {
-				// external stream
-				$out .= ' /Length 0';
-				$out .= ' /F << /FS /URL /F '.$this->_datastring($info['exurl'], $oid).' >>';
-				if (isset($info['f'])) {
-					$out .= ' /FFilter /'.$info['f'];
-				}
-				$out .= ' >>';
-				$out .= ' stream'."\n".'endstream';
-			} else {
-				if (isset($info['f'])) {
-					$out .= ' /Filter /'.$info['f'];
-				}
-				if (isset($info['parms'])) {
-					$out .= ' '.$info['parms'];
-				}
-				if (isset($info['trns']) AND is_array($info['trns'])) {
-					$trns = '';
-					$count_info = count($info['trns']);
-					if ($info['cs'] == 'Indexed') {
-						$maxval =(pow(2, $info['bpc']) - 1);
-						for ($i = 0; $i < $count_info; ++$i) {
-							if (($info['trns'][$i] != 0) AND ($info['trns'][$i] != $maxval)) {
-								// this is not a binary type mask @TODO: create a SMask
-								$trns = '';
-								break;
-							} elseif (empty($trns) AND ($info['trns'][$i] == 0)) {
-								// store the first fully transparent value
-								$trns .= $i.' '.$i.' ';
-							}
-						}
-					} else {
-						// grayscale or RGB
-						for ($i = 0; $i < $count_info; ++$i) {
-							if ($info['trns'][$i] == 0) {
-								$trns .= $info['trns'][$i].' '.$info['trns'][$i].' ';
-							}
-						}
-					}
-					// Colour Key Masking
-					if (!empty($trns)) {
-						$out .= ' /Mask ['.$trns.']';
-					}
-				}
-				$stream = $this->_getrawstream($info['data']);
-				$out .= ' /Length '.strlen($stream).' >>';
-				$out .= ' stream'."\n".$stream."\n".'endstream';
-			}
-			$out .= "\n".'endobj';
-			$this->_out($out);
-			if ($icc) {
-				// ICC colour profile
-				$this->_newobj();
-				$icc = ($this->compress) ? gzcompress($info['icc']) : $info['icc'];
-				$icc = $this->_getrawstream($icc);
-				$this->_out('<</N '.$info['ch'].' /Alternate /'.$info['cs'].' '.$filter.'/Length '.strlen($icc).'>> stream'."\n".$icc."\n".'endstream'."\n".'endobj');
-			} elseif ($info['cs'] == 'Indexed') {
-				// colour palette
-				$this->_newobj();
-				$pal = ($this->compress) ? gzcompress($info['pal']) : $info['pal'];
-				$pal = $this->_getrawstream($pal);
-				$this->_out('<<'.$filter.'/Length '.strlen($pal).'>> stream'."\n".$pal."\n".'endstream'."\n".'endobj');
-			}
-		}
-	}
-
-	/**
-	 * Output Form XObjects Templates.
-	 * @author Nicola Asuni
-	 * @since 5.8.017 (2010-08-24)
-	 * @protected
-	 * @see startTemplate(), endTemplate(), printTemplate()
-	 */
-	protected function _putxobjects() {
-		foreach ($this->xobjects as $key => $data) {
-			if (isset($data['outdata'])) {
-				$stream = str_replace($this->epsmarker, '', trim($data['outdata']));
-				$out = $this->_getobj($data['n'])."\n";
-				$out .= '<<';
-				$out .= ' /Type /XObject';
-				$out .= ' /Subtype /Form';
-				$out .= ' /FormType 1';
-				if ($this->compress) {
-					$stream = gzcompress($stream);
-					$out .= ' /Filter /FlateDecode';
-				}
-				$out .= sprintf(' /BBox [%F %F %F %F]', ($data['x'] * $this->k), (-$data['y'] * $this->k), (($data['w'] + $data['x']) * $this->k), (($data['h'] - $data['y']) * $this->k));
-				$out .= ' /Matrix [1 0 0 1 0 0]';
-				$out .= ' /Resources <<';
-				$out .= ' /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]';
-				if (!$this->pdfa_mode) {
-					// transparency
-					if (isset($data['extgstates']) AND !empty($data['extgstates'])) {
-						$out .= ' /ExtGState <<';
-						foreach ($data['extgstates'] as $k => $extgstate) {
-							if (isset($this->extgstates[$k]['name'])) {
-								$out .= ' /'.$this->extgstates[$k]['name'];
-							} else {
-								$out .= ' /GS'.$k;
-							}
-							$out .= ' '.$this->extgstates[$k]['n'].' 0 R';
-						}
-						$out .= ' >>';
-					}
-					if (isset($data['gradients']) AND !empty($data['gradients'])) {
-						$gp = '';
-						$gs = '';
-						foreach ($data['gradients'] as $id => $grad) {
-							// gradient patterns
-							$gp .= ' /p'.$id.' '.$this->gradients[$id]['pattern'].' 0 R';
-							// gradient shadings
-							$gs .= ' /Sh'.$id.' '.$this->gradients[$id]['id'].' 0 R';
-						}
-						$out .= ' /Pattern <<'.$gp.' >>';
-						$out .= ' /Shading <<'.$gs.' >>';
-					}
-				}
-				// spot colors
-				if (isset($data['spot_colors']) AND !empty($data['spot_colors'])) {
-					$out .= ' /ColorSpace <<';
-					foreach ($data['spot_colors'] as $name => $color) {
-						$out .= ' /CS'.$color['i'].' '.$this->spot_colors[$name]['n'].' 0 R';
-					}
-					$out .= ' >>';
-				}
-				// fonts
-				if (!empty($data['fonts'])) {
-					$out .= ' /Font <<';
-					foreach ($data['fonts'] as $fontkey => $fontid) {
-						$out .= ' /F'.$fontid.' '.$this->font_obj_ids[$fontkey].' 0 R';
-					}
-					$out .= ' >>';
-				}
-				// images or nested xobjects
-				if (!empty($data['images']) OR !empty($data['xobjects'])) {
-					$out .= ' /XObject <<';
-					foreach ($data['images'] as $imgid) {
-						$out .= ' /I'.$imgid.' '.$this->xobjects['I'.$imgid]['n'].' 0 R';
-					}
-					foreach ($data['xobjects'] as $sub_id => $sub_objid) {
-						$out .= ' /'.$sub_id.' '.$sub_objid['n'].' 0 R';
-					}
-					$out .= ' >>';
-				}
-				$out .= ' >>'; //end resources
-				if (isset($data['group']) AND ($data['group'] !== false)) {
-					// set transparency group
-					$out .= ' /Group << /Type /Group /S /Transparency';
-					if (is_array($data['group'])) {
-						if (isset($data['group']['CS']) AND !empty($data['group']['CS'])) {
-							$out .= ' /CS /'.$data['group']['CS'];
-						}
-						if (isset($data['group']['I'])) {
-							$out .= ' /I /'.($data['group']['I']===true?'true':'false');
-						}
-						if (isset($data['group']['K'])) {
-							$out .= ' /K /'.($data['group']['K']===true?'true':'false');
-						}
-					}
-					$out .= ' >>';
-				}
-				$stream = $this->_getrawstream($stream, $data['n']);
-				$out .= ' /Length '.strlen($stream);
-				$out .= ' >>';
-				$out .= ' stream'."\n".$stream."\n".'endstream';
-				$out .= "\n".'endobj';
-				$this->_out($out);
-			}
-		}
-	}
-
-	/**
-	 * Output Spot Colors Resources.
-	 * @protected
-	 * @since 4.0.024 (2008-09-12)
-	 */
-	protected function _putspotcolors() {
-		foreach ($this->spot_colors as $name => $color) {
-			$this->_newobj();
-			$this->spot_colors[$name]['n'] = $this->n;
-			$out = '[/Separation /'.str_replace(' ', '#20', $name);
-			$out .= ' /DeviceCMYK <<';
-			$out .= ' /Range [0 1 0 1 0 1 0 1] /C0 [0 0 0 0]';
-			$out .= ' '.sprintf('/C1 [%F %F %F %F] ', ($color['C'] / 100), ($color['M'] / 100), ($color['Y'] / 100), ($color['K'] / 100));
-			$out .= ' /FunctionType 2 /Domain [0 1] /N 1>>]';
-			$out .= "\n".'endobj';
-			$this->_out($out);
-		}
-	}
-
-	/**
-	 * Return XObjects Dictionary.
-	 * @return string XObjects dictionary
-	 * @protected
-	 * @since 5.8.014 (2010-08-23)
-	 */
-	protected function _getxobjectdict() {
-		$out = '';
-		foreach ($this->xobjects as $id => $objid) {
-			$out .= ' /'.$id.' '.$objid['n'].' 0 R';
-		}
-		return $out;
-	}
-
-	/**
-	 * Output Resources Dictionary.
-	 * @protected
-	 */
-	protected function _putresourcedict() {
-		$out = $this->_getobj(2)."\n";
-		$out .= '<< /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]';
-		$out .= ' /Font <<';
-		foreach ($this->fontkeys as $fontkey) {
-			$font = $this->getFontBuffer($fontkey);
-			$out .= ' /F'.$font['i'].' '.$font['n'].' 0 R';
-		}
-		$out .= ' >>';
-		$out .= ' /XObject <<';
-		$out .= $this->_getxobjectdict();
-		$out .= ' >>';
-		// layers
-		if (!empty($this->pdflayers)) {
-			$out .= ' /Properties <<';
-			foreach ($this->pdflayers as $layer) {
-				$out .= ' /'.$layer['layer'].' '.$layer['objid'].' 0 R';
-			}
-			$out .= ' >>';
-		}
-		if (!$this->pdfa_mode) {
-			// transparency
-			if (isset($this->extgstates) AND !empty($this->extgstates)) {
-				$out .= ' /ExtGState <<';
-				foreach ($this->extgstates as $k => $extgstate) {
-					if (isset($extgstate['name'])) {
-						$out .= ' /'.$extgstate['name'];
-					} else {
-						$out .= ' /GS'.$k;
-					}
-					$out .= ' '.$extgstate['n'].' 0 R';
-				}
-				$out .= ' >>';
-			}
-			if (isset($this->gradients) AND !empty($this->gradients)) {
-				$gp = '';
-				$gs = '';
-				foreach ($this->gradients as $id => $grad) {
-					// gradient patterns
-					$gp .= ' /p'.$id.' '.$grad['pattern'].' 0 R';
-					// gradient shadings
-					$gs .= ' /Sh'.$id.' '.$grad['id'].' 0 R';
-				}
-				$out .= ' /Pattern <<'.$gp.' >>';
-				$out .= ' /Shading <<'.$gs.' >>';
-			}
-		}
-		// spot colors
-		if (isset($this->spot_colors) AND !empty($this->spot_colors)) {
-			$out .= ' /ColorSpace <<';
-			foreach ($this->spot_colors as $color) {
-				$out .= ' /CS'.$color['i'].' '.$color['n'].' 0 R';
-			}
-			$out .= ' >>';
-		}
-		$out .= ' >>';
-		$out .= "\n".'endobj';
-		$this->_out($out);
-	}
-
-	/**
-	 * Output Resources.
-	 * @protected
-	 */
-	protected function _putresources() {
-		$this->_putextgstates();
-		$this->_putocg();
-		$this->_putfonts();
-		$this->_putimages();
-		$this->_putspotcolors();
-		$this->_putshaders();
-		$this->_putxobjects();
-		$this->_putresourcedict();
-		$this->_putdests();
-		$this->_putEmbeddedFiles();
-		$this->_putannotsobjs();
-		$this->_putjavascript();
-		$this->_putbookmarks();
-		$this->_putencryption();
-	}
-
-	/**
-	 * Adds some Metadata information (Document Information Dictionary)
-	 * (see Chapter 14.3.3 Document Information Dictionary of PDF32000_2008.pdf Reference)
-	 * @return int object id
-	 * @protected
-	 */
-	protected function _putinfo() {
-		$oid = $this->_newobj();
-		$out = '<<';
-		// store current isunicode value
-		$prev_isunicode = $this->isunicode;
-		if ($this->docinfounicode) {
-			$this->isunicode = true;
-		}
-		if (!TCPDF_STATIC::empty_string($this->title)) {
-			// The document's title.
-			$out .= ' /Title '.$this->_textstring($this->title, $oid);
-		}
-		if (!TCPDF_STATIC::empty_string($this->author)) {
-			// The name of the person who created the document.
-			$out .= ' /Author '.$this->_textstring($this->author, $oid);
-		}
-		if (!TCPDF_STATIC::empty_string($this->subject)) {
-			// The subject of the document.
-			$out .= ' /Subject '.$this->_textstring($this->subject, $oid);
-		}
-		if (!TCPDF_STATIC::empty_string($this->keywords)) {
-			// Keywords associated with the document.
-			$out .= ' /Keywords '.$this->_textstring($this->keywords, $oid);
-		}
-		if (!TCPDF_STATIC::empty_string($this->creator)) {
-			// If the document was converted to PDF from another format, the name of the conforming product that created the original document from which it was converted.
-			$out .= ' /Creator '.$this->_textstring($this->creator, $oid);
-		}
-		// restore previous isunicode value
-		$this->isunicode = $prev_isunicode;
-		// default producer
-		$out .= ' /Producer '.$this->_textstring(TCPDF_STATIC::getTCPDFProducer(), $oid);
-		// The date and time the document was created, in human-readable form
-		$out .= ' /CreationDate '.$this->_datestring(0, $this->doc_creation_timestamp);
-		// The date and time the document was most recently modified, in human-readable form
-		$out .= ' /ModDate '.$this->_datestring(0, $this->doc_modification_timestamp);
-		// A name object indicating whether the document has been modified to include trapping information
-		$out .= ' /Trapped /False';
-		$out .= ' >>';
-		$out .= "\n".'endobj';
-		$this->_out($out);
-		return $oid;
-	}
-
-	/**
-	 * Set additional XMP data to be added on the default XMP data just before the end of "x:xmpmeta" tag.
-	 * IMPORTANT: This data is added as-is without controls, so you have to validate your data before using this method!
-	 * @param $xmp (string) Custom XMP data.
-	 * @since 5.9.128 (2011-10-06)
-	 * @public
-	 */
-	public function setExtraXMP($xmp) {
-		$this->custom_xmp = $xmp;
-	}
-
-	/**
-	 * Put XMP data object and return ID.
-	 * @return (int) The object ID.
-	 * @since 5.9.121 (2011-09-28)
-	 * @protected
-	 */
-	protected function _putXMP() {
-		$oid = $this->_newobj();
-		// store current isunicode value
-		$prev_isunicode = $this->isunicode;
-		$this->isunicode = true;
-		$prev_encrypted = $this->encrypted;
-		$this->encrypted = false;
-		// set XMP data
-		$xmp = '<?xpacket begin="'.TCPDF_FONTS::unichr(0xfeff, $this->isunicode).'" id="W5M0MpCehiHzreSzNTczkc9d"?>'."\n";
-		$xmp .= '<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Adobe XMP Core 4.2.1-c043 52.372728, 2009/01/18-15:08:04">'."\n";
-		$xmp .= "\t".'<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">'."\n";
-		$xmp .= "\t\t".'<rdf:Description rdf:about="" xmlns:dc="http://purl.org/dc/elements/1.1/">'."\n";
-		$xmp .= "\t\t\t".'<dc:format>application/pdf</dc:format>'."\n";
-		$xmp .= "\t\t\t".'<dc:title>'."\n";
-		$xmp .= "\t\t\t\t".'<rdf:Alt>'."\n";
-		$xmp .= "\t\t\t\t\t".'<rdf:li xml:lang="x-default">'.TCPDF_STATIC::_escapeXML($this->title).'</rdf:li>'."\n";
-		$xmp .= "\t\t\t\t".'</rdf:Alt>'."\n";
-		$xmp .= "\t\t\t".'</dc:title>'."\n";
-		$xmp .= "\t\t\t".'<dc:creator>'."\n";
-		$xmp .= "\t\t\t\t".'<rdf:Seq>'."\n";
-		$xmp .= "\t\t\t\t\t".'<rdf:li>'.TCPDF_STATIC::_escapeXML($this->author).'</rdf:li>'."\n";
-		$xmp .= "\t\t\t\t".'</rdf:Seq>'."\n";
-		$xmp .= "\t\t\t".'</dc:creator>'."\n";
-		$xmp .= "\t\t\t".'<dc:description>'."\n";
-		$xmp .= "\t\t\t\t".'<rdf:Alt>'."\n";
-		$xmp .= "\t\t\t\t\t".'<rdf:li xml:lang="x-default">'.TCPDF_STATIC::_escapeXML($this->subject).'</rdf:li>'."\n";
-		$xmp .= "\t\t\t\t".'</rdf:Alt>'."\n";
-		$xmp .= "\t\t\t".'</dc:description>'."\n";
-		$xmp .= "\t\t\t".'<dc:subject>'."\n";
-		$xmp .= "\t\t\t\t".'<rdf:Bag>'."\n";
-		$xmp .= "\t\t\t\t\t".'<rdf:li>'.TCPDF_STATIC::_escapeXML($this->keywords).'</rdf:li>'."\n";
-		$xmp .= "\t\t\t\t".'</rdf:Bag>'."\n";
-		$xmp .= "\t\t\t".'</dc:subject>'."\n";
-		$xmp .= "\t\t".'</rdf:Description>'."\n";
-		// convert doc creation date format
-		$dcdate = TCPDF_STATIC::getFormattedDate($this->doc_creation_timestamp);
-		$doccreationdate = substr($dcdate, 0, 4).'-'.substr($dcdate, 4, 2).'-'.substr($dcdate, 6, 2);
-		$doccreationdate .= 'T'.substr($dcdate, 8, 2).':'.substr($dcdate, 10, 2).':'.substr($dcdate, 12, 2);
-		$doccreationdate .= substr($dcdate, 14, 3).':'.substr($dcdate, 18, 2);
-		$doccreationdate = TCPDF_STATIC::_escapeXML($doccreationdate);
-		// convert doc modification date format
-		$dmdate = TCPDF_STATIC::getFormattedDate($this->doc_modification_timestamp);
-		$docmoddate = substr($dmdate, 0, 4).'-'.substr($dmdate, 4, 2).'-'.substr($dmdate, 6, 2);
-		$docmoddate .= 'T'.substr($dmdate, 8, 2).':'.substr($dmdate, 10, 2).':'.substr($dmdate, 12, 2);
-		$docmoddate .= substr($dmdate, 14, 3).':'.substr($dmdate, 18, 2);
-		$docmoddate = TCPDF_STATIC::_escapeXML($docmoddate);
-		$xmp .= "\t\t".'<rdf:Description rdf:about="" xmlns:xmp="http://ns.adobe.com/xap/1.0/">'."\n";
-		$xmp .= "\t\t\t".'<xmp:CreateDate>'.$doccreationdate.'</xmp:CreateDate>'."\n";
-		$xmp .= "\t\t\t".'<xmp:CreatorTool>'.$this->creator.'</xmp:CreatorTool>'."\n";
-		$xmp .= "\t\t\t".'<xmp:ModifyDate>'.$docmoddate.'</xmp:ModifyDate>'."\n";
-		$xmp .= "\t\t\t".'<xmp:MetadataDate>'.$doccreationdate.'</xmp:MetadataDate>'."\n";
-		$xmp .= "\t\t".'</rdf:Description>'."\n";
-		$xmp .= "\t\t".'<rdf:Description rdf:about="" xmlns:pdf="http://ns.adobe.com/pdf/1.3/">'."\n";
-		$xmp .= "\t\t\t".'<pdf:Keywords>'.TCPDF_STATIC::_escapeXML($this->keywords).'</pdf:Keywords>'."\n";
-		$xmp .= "\t\t\t".'<pdf:Producer>'.TCPDF_STATIC::_escapeXML(TCPDF_STATIC::getTCPDFProducer()).'</pdf:Producer>'."\n";
-		$xmp .= "\t\t".'</rdf:Description>'."\n";
-		$xmp .= "\t\t".'<rdf:Description rdf:about="" xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/">'."\n";
-		$uuid = 'uuid:'.substr($this->file_id, 0, 8).'-'.substr($this->file_id, 8, 4).'-'.substr($this->file_id, 12, 4).'-'.substr($this->file_id, 16, 4).'-'.substr($this->file_id, 20, 12);
-		$xmp .= "\t\t\t".'<xmpMM:DocumentID>'.$uuid.'</xmpMM:DocumentID>'."\n";
-		$xmp .= "\t\t\t".'<xmpMM:InstanceID>'.$uuid.'</xmpMM:InstanceID>'."\n";
-		$xmp .= "\t\t".'</rdf:Description>'."\n";
-		if ($this->pdfa_mode) {
-			$xmp .= "\t\t".'<rdf:Description rdf:about="" xmlns:pdfaid="http://www.aiim.org/pdfa/ns/id/">'."\n";
-			$xmp .= "\t\t\t".'<pdfaid:part>1</pdfaid:part>'."\n";
-			$xmp .= "\t\t\t".'<pdfaid:conformance>B</pdfaid:conformance>'."\n";
-			$xmp .= "\t\t".'</rdf:Description>'."\n";
-		}
-		// XMP extension schemas
-		$xmp .= "\t\t".'<rdf:Description rdf:about="" xmlns:pdfaExtension="http://www.aiim.org/pdfa/ns/extension/" xmlns:pdfaSchema="http://www.aiim.org/pdfa/ns/schema#" xmlns:pdfaProperty="http://www.aiim.org/pdfa/ns/property#">'."\n";
-		$xmp .= "\t\t\t".'<pdfaExtension:schemas>'."\n";
-		$xmp .= "\t\t\t\t".'<rdf:Bag>'."\n";
-		$xmp .= "\t\t\t\t\t".'<rdf:li rdf:parseType="Resource">'."\n";
-		$xmp .= "\t\t\t\t\t\t".'<pdfaSchema:namespaceURI>http://ns.adobe.com/pdf/1.3/</pdfaSchema:namespaceURI>'."\n";
-		$xmp .= "\t\t\t\t\t\t".'<pdfaSchema:prefix>pdf</pdfaSchema:prefix>'."\n";
-		$xmp .= "\t\t\t\t\t\t".'<pdfaSchema:schema>Adobe PDF Schema</pdfaSchema:schema>'."\n";
-		$xmp .= "\t\t\t\t\t".'</rdf:li>'."\n";
-		$xmp .= "\t\t\t\t\t".'<rdf:li rdf:parseType="Resource">'."\n";
-		$xmp .= "\t\t\t\t\t\t".'<pdfaSchema:namespaceURI>http://ns.adobe.com/xap/1.0/mm/</pdfaSchema:namespaceURI>'."\n";
-		$xmp .= "\t\t\t\t\t\t".'<pdfaSchema:prefix>xmpMM</pdfaSchema:prefix>'."\n";
-		$xmp .= "\t\t\t\t\t\t".'<pdfaSchema:schema>XMP Media Management Schema</pdfaSchema:schema>'."\n";
-		$xmp .= "\t\t\t\t\t\t".'<pdfaSchema:property>'."\n";
-		$xmp .= "\t\t\t\t\t\t\t".'<rdf:Seq>'."\n";
-		$xmp .= "\t\t\t\t\t\t\t\t".'<rdf:li rdf:parseType="Resource">'."\n";
-		$xmp .= "\t\t\t\t\t\t\t\t\t".'<pdfaProperty:category>internal</pdfaProperty:category>'."\n";
-		$xmp .= "\t\t\t\t\t\t\t\t\t".'<pdfaProperty:description>UUID based identifier for specific incarnation of a document</pdfaProperty:description>'."\n";
-		$xmp .= "\t\t\t\t\t\t\t\t\t".'<pdfaProperty:name>InstanceID</pdfaProperty:name>'."\n";
-		$xmp .= "\t\t\t\t\t\t\t\t\t".'<pdfaProperty:valueType>URI</pdfaProperty:valueType>'."\n";
-		$xmp .= "\t\t\t\t\t\t\t\t".'</rdf:li>'."\n";
-		$xmp .= "\t\t\t\t\t\t\t".'</rdf:Seq>'."\n";
-		$xmp .= "\t\t\t\t\t\t".'</pdfaSchema:property>'."\n";
-		$xmp .= "\t\t\t\t\t".'</rdf:li>'."\n";
-		$xmp .= "\t\t\t\t\t".'<rdf:li rdf:parseType="Resource">'."\n";
-		$xmp .= "\t\t\t\t\t\t".'<pdfaSchema:namespaceURI>http://www.aiim.org/pdfa/ns/id/</pdfaSchema:namespaceURI>'."\n";
-		$xmp .= "\t\t\t\t\t\t".'<pdfaSchema:prefix>pdfaid</pdfaSchema:prefix>'."\n";
-		$xmp .= "\t\t\t\t\t\t".'<pdfaSchema:schema>PDF/A ID Schema</pdfaSchema:schema>'."\n";
-		$xmp .= "\t\t\t\t\t\t".'<pdfaSchema:property>'."\n";
-		$xmp .= "\t\t\t\t\t\t\t".'<rdf:Seq>'."\n";
-		$xmp .= "\t\t\t\t\t\t\t\t".'<rdf:li rdf:parseType="Resource">'."\n";
-		$xmp .= "\t\t\t\t\t\t\t\t\t".'<pdfaProperty:category>internal</pdfaProperty:category>'."\n";
-		$xmp .= "\t\t\t\t\t\t\t\t\t".'<pdfaProperty:description>Part of PDF/A standard</pdfaProperty:description>'."\n";
-		$xmp .= "\t\t\t\t\t\t\t\t\t".'<pdfaProperty:name>part</pdfaProperty:name>'."\n";
-		$xmp .= "\t\t\t\t\t\t\t\t\t".'<pdfaProperty:valueType>Integer</pdfaProperty:valueType>'."\n";
-		$xmp .= "\t\t\t\t\t\t\t\t".'</rdf:li>'."\n";
-		$xmp .= "\t\t\t\t\t\t\t\t".'<rdf:li rdf:parseType="Resource">'."\n";
-		$xmp .= "\t\t\t\t\t\t\t\t\t".'<pdfaProperty:category>internal</pdfaProperty:category>'."\n";
-		$xmp .= "\t\t\t\t\t\t\t\t\t".'<pdfaProperty:description>Amendment of PDF/A standard</pdfaProperty:description>'."\n";
-		$xmp .= "\t\t\t\t\t\t\t\t\t".'<pdfaProperty:name>amd</pdfaProperty:name>'."\n";
-		$xmp .= "\t\t\t\t\t\t\t\t\t".'<pdfaProperty:valueType>Text</pdfaProperty:valueType>'."\n";
-		$xmp .= "\t\t\t\t\t\t\t\t".'</rdf:li>'."\n";
-		$xmp .= "\t\t\t\t\t\t\t\t".'<rdf:li rdf:parseType="Resource">'."\n";
-		$xmp .= "\t\t\t\t\t\t\t\t\t".'<pdfaProperty:category>internal</pdfaProperty:category>'."\n";
-		$xmp .= "\t\t\t\t\t\t\t\t\t".'<pdfaProperty:description>Conformance level of PDF/A standard</pdfaProperty:description>'."\n";
-		$xmp .= "\t\t\t\t\t\t\t\t\t".'<pdfaProperty:name>conformance</pdfaProperty:name>'."\n";
-		$xmp .= "\t\t\t\t\t\t\t\t\t".'<pdfaProperty:valueType>Text</pdfaProperty:valueType>'."\n";
-		$xmp .= "\t\t\t\t\t\t\t\t".'</rdf:li>'."\n";
-		$xmp .= "\t\t\t\t\t\t\t".'</rdf:Seq>'."\n";
-		$xmp .= "\t\t\t\t\t\t".'</pdfaSchema:property>'."\n";
-		$xmp .= "\t\t\t\t\t".'</rdf:li>'."\n";
-		$xmp .= "\t\t\t\t".'</rdf:Bag>'."\n";
-		$xmp .= "\t\t\t".'</pdfaExtension:schemas>'."\n";
-		$xmp .= "\t\t".'</rdf:Description>'."\n";
-		$xmp .= "\t".'</rdf:RDF>'."\n";
-		$xmp .= $this->custom_xmp;
-		$xmp .= '</x:xmpmeta>'."\n";
-		$xmp .= '<?xpacket end="w"?>';
-		$out = '<< /Type /Metadata /Subtype /XML /Length '.strlen($xmp).' >> stream'."\n".$xmp."\n".'endstream'."\n".'endobj';
-		// restore previous isunicode value
-		$this->isunicode = $prev_isunicode;
-		$this->encrypted = $prev_encrypted;
-		$this->_out($out);
-		return $oid;
-	}
-
-	/**
-	 * Output Catalog.
-	 * @return int object id
-	 * @protected
-	 */
-	protected function _putcatalog() {
-		// put XMP
-		$xmpobj = $this->_putXMP();
-		// if required, add standard sRGB_IEC61966-2.1 blackscaled ICC colour profile
-		if ($this->pdfa_mode OR $this->force_srgb) {
-			$iccobj = $this->_newobj();
-			$icc = file_get_contents(dirname(__FILE__).'/include/sRGB.icc');
-			$filter = '';
-			if ($this->compress) {
-				$filter = ' /Filter /FlateDecode';
-				$icc = gzcompress($icc);
-			}
-			$icc = $this->_getrawstream($icc);
-			$this->_out('<</N 3 '.$filter.'/Length '.strlen($icc).'>> stream'."\n".$icc."\n".'endstream'."\n".'endobj');
-		}
-		// start catalog
-		$oid = $this->_newobj();
-		$out = '<< /Type /Catalog';
-		$out .= ' /Version /'.$this->PDFVersion;
-		//$out .= ' /Extensions <<>>';
-		$out .= ' /Pages 1 0 R';
-		//$out .= ' /PageLabels ' //...;
-		$out .= ' /Names <<';
-		if ((!$this->pdfa_mode) AND !empty($this->n_js)) {
-			$out .= ' /JavaScript '.$this->n_js;
-		}
-		if (!empty($this->efnames)) {
-			$out .= ' /EmbeddedFiles <</Names [';
-			foreach ($this->efnames AS $fn => $fref) {
-				$out .= ' '.$this->_datastring($fn).' '.$fref;
-			}
-			$out .= ' ]>>';
-		}
-		$out .= ' >>';
-		if (!empty($this->dests)) {
-			$out .= ' /Dests '.($this->n_dests).' 0 R';
-		}
-		$out .= $this->_putviewerpreferences();
-		if (isset($this->LayoutMode) AND (!TCPDF_STATIC::empty_string($this->LayoutMode))) {
-			$out .= ' /PageLayout /'.$this->LayoutMode;
-		}
-		if (isset($this->PageMode) AND (!TCPDF_STATIC::empty_string($this->PageMode))) {
-			$out .= ' /PageMode /'.$this->PageMode;
-		}
-		if (count($this->outlines) > 0) {
-			$out .= ' /Outlines '.$this->OutlineRoot.' 0 R';
-			$out .= ' /PageMode /UseOutlines';
-		}
-		//$out .= ' /Threads []';
-		if ($this->ZoomMode == 'fullpage') {
-			$out .= ' /OpenAction ['.$this->page_obj_id[1].' 0 R /Fit]';
-		} elseif ($this->ZoomMode == 'fullwidth') {
-			$out .= ' /OpenAction ['.$this->page_obj_id[1].' 0 R /FitH null]';
-		} elseif ($this->ZoomMode == 'real') {
-			$out .= ' /OpenAction ['.$this->page_obj_id[1].' 0 R /XYZ null null 1]';
-		} elseif (!is_string($this->ZoomMode)) {
-			$out .= sprintf(' /OpenAction ['.$this->page_obj_id[1].' 0 R /XYZ null null %F]', ($this->ZoomMode / 100));
-		}
-		//$out .= ' /AA <<>>';
-		//$out .= ' /URI <<>>';
-		$out .= ' /Metadata '.$xmpobj.' 0 R';
-		//$out .= ' /StructTreeRoot <<>>';
-		//$out .= ' /MarkInfo <<>>';
-		if (isset($this->l['a_meta_language'])) {
-			$out .= ' /Lang '.$this->_textstring($this->l['a_meta_language'], $oid);
-		}
-		//$out .= ' /SpiderInfo <<>>';
-		// set OutputIntent to sRGB IEC61966-2.1 if required
-		if ($this->pdfa_mode OR $this->force_srgb) {
-			$out .= ' /OutputIntents [<<';
-			$out .= ' /Type /OutputIntent';
-			$out .= ' /S /GTS_PDFA1';
-			$out .= ' /OutputCondition '.$this->_textstring('sRGB IEC61966-2.1', $oid);
-			$out .= ' /OutputConditionIdentifier '.$this->_textstring('sRGB IEC61966-2.1', $oid);
-			$out .= ' /RegistryName '.$this->_textstring('http://www.color.org', $oid);
-			$out .= ' /Info '.$this->_textstring('sRGB IEC61966-2.1', $oid);
-			$out .= ' /DestOutputProfile '.$iccobj.' 0 R';
-			$out .= ' >>]';
-		}
-		//$out .= ' /PieceInfo <<>>';
-		if (!empty($this->pdflayers)) {
-			$lyrobjs = '';
-			$lyrobjs_off = '';
-			$lyrobjs_lock = '';
-			foreach ($this->pdflayers as $layer) {
-				$layer_obj_ref = ' '.$layer['objid'].' 0 R';
-				$lyrobjs .= $layer_obj_ref;
-				if ($layer['view'] === false) {
-					$lyrobjs_off .= $layer_obj_ref;
-				}
-				if ($layer['lock']) {
-					$lyrobjs_lock .= $layer_obj_ref;
-				}
-			}
-			$out .= ' /OCProperties << /OCGs ['.$lyrobjs.']';
-			$out .= ' /D <<';
-			$out .= ' /Name '.$this->_textstring('Layers', $oid);
-			$out .= ' /Creator '.$this->_textstring('TCPDF', $oid);
-			$out .= ' /BaseState /ON';
-			$out .= ' /OFF ['.$lyrobjs_off.']';
-			$out .= ' /Locked ['.$lyrobjs_lock.']';
-			$out .= ' /Intent /View';
-			$out .= ' /AS [';
-			$out .= ' << /Event /Print /OCGs ['.$lyrobjs.'] /Category [/Print] >>';
-			$out .= ' << /Event /View /OCGs ['.$lyrobjs.'] /Category [/View] >>';
-			$out .= ' ]';
-			$out .= ' /Order ['.$lyrobjs.']';
-			$out .= ' /ListMode /AllPages';
-			//$out .= ' /RBGroups ['..']';
-			//$out .= ' /Locked ['..']';
-			$out .= ' >>';
-			$out .= ' >>';
-		}
-		// AcroForm
-		if (!empty($this->form_obj_id)
-			OR ($this->sign AND isset($this->signature_data['cert_type']))
-			OR !empty($this->empty_signature_appearance)) {
-			$out .= ' /AcroForm <<';
-			$objrefs = '';
-			if ($this->sign AND isset($this->signature_data['cert_type'])) {
-				// set reference for signature object
-				$objrefs .= $this->sig_obj_id.' 0 R';
-			}
-			if (!empty($this->empty_signature_appearance)) {
-				foreach ($this->empty_signature_appearance as $esa) {
-					// set reference for empty signature objects
-					$objrefs .= ' '.$esa['objid'].' 0 R';
-				}
-			}
-			if (!empty($this->form_obj_id)) {
-				foreach($this->form_obj_id as $objid) {
-					$objrefs .= ' '.$objid.' 0 R';
-				}
-			}
-			$out .= ' /Fields ['.$objrefs.']';
-			// It's better to turn off this value and set the appearance stream for each annotation (/AP) to avoid conflicts with signature fields.
-			if (empty($this->signature_data['approval']) OR ($this->signature_data['approval'] != 'A')) {
-				$out .= ' /NeedAppearances false';
-			}
-			if ($this->sign AND isset($this->signature_data['cert_type'])) {
-				if ($this->signature_data['cert_type'] > 0) {
-					$out .= ' /SigFlags 3';
-				} else {
-					$out .= ' /SigFlags 1';
-				}
-			}
-			//$out .= ' /CO ';
-			if (isset($this->annotation_fonts) AND !empty($this->annotation_fonts)) {
-				$out .= ' /DR <<';
-				$out .= ' /Font <<';
-				foreach ($this->annotation_fonts as $fontkey => $fontid) {
-					$out .= ' /F'.$fontid.' '.$this->font_obj_ids[$fontkey].' 0 R';
-				}
-				$out .= ' >> >>';
-			}
-			$font = $this->getFontBuffer('helvetica');
-			$out .= ' /DA (/F'.$font['i'].' 0 Tf 0 g)';
-			$out .= ' /Q '.(($this->rtl)?'2':'0');
-			//$out .= ' /XFA ';
-			$out .= ' >>';
-			// signatures
-			if ($this->sign AND isset($this->signature_data['cert_type']) 
-				AND (empty($this->signature_data['approval']) OR ($this->signature_data['approval'] != 'A'))) {
-				if ($this->signature_data['cert_type'] > 0) {
-					$out .= ' /Perms << /DocMDP '.($this->sig_obj_id + 1).' 0 R >>';
-				} else {
-					$out .= ' /Perms << /UR3 '.($this->sig_obj_id + 1).' 0 R >>';
-				}
-			}
-		}
-		//$out .= ' /Legal <<>>';
-		//$out .= ' /Requirements []';
-		//$out .= ' /Collection <<>>';
-		//$out .= ' /NeedsRendering true';
-		$out .= ' >>';
-		$out .= "\n".'endobj';
-		$this->_out($out);
-		return $oid;
-	}
-
-	/**
-	 * Output viewer preferences.
-	 * @return string for viewer preferences
-	 * @author Nicola asuni
-	 * @since 3.1.000 (2008-06-09)
-	 * @protected
-	 */
-	protected function _putviewerpreferences() {
-		$vp = $this->viewer_preferences;
-		$out = ' /ViewerPreferences <<';
-		if ($this->rtl) {
-			$out .= ' /Direction /R2L';
-		} else {
-			$out .= ' /Direction /L2R';
-		}
-		if (isset($vp['HideToolbar']) AND ($vp['HideToolbar'])) {
-			$out .= ' /HideToolbar true';
-		}
-		if (isset($vp['HideMenubar']) AND ($vp['HideMenubar'])) {
-			$out .= ' /HideMenubar true';
-		}
-		if (isset($vp['HideWindowUI']) AND ($vp['HideWindowUI'])) {
-			$out .= ' /HideWindowUI true';
-		}
-		if (isset($vp['FitWindow']) AND ($vp['FitWindow'])) {
-			$out .= ' /FitWindow true';
-		}
-		if (isset($vp['CenterWindow']) AND ($vp['CenterWindow'])) {
-			$out .= ' /CenterWindow true';
-		}
-		if (isset($vp['DisplayDocTitle']) AND ($vp['DisplayDocTitle'])) {
-			$out .= ' /DisplayDocTitle true';
-		}
-		if (isset($vp['NonFullScreenPageMode'])) {
-			$out .= ' /NonFullScreenPageMode /'.$vp['NonFullScreenPageMode'];
-		}
-		if (isset($vp['ViewArea'])) {
-			$out .= ' /ViewArea /'.$vp['ViewArea'];
-		}
-		if (isset($vp['ViewClip'])) {
-			$out .= ' /ViewClip /'.$vp['ViewClip'];
-		}
-		if (isset($vp['PrintArea'])) {
-			$out .= ' /PrintArea /'.$vp['PrintArea'];
-		}
-		if (isset($vp['PrintClip'])) {
-			$out .= ' /PrintClip /'.$vp['PrintClip'];
-		}
-		if (isset($vp['PrintScaling'])) {
-			$out .= ' /PrintScaling /'.$vp['PrintScaling'];
-		}
-		if (isset($vp['Duplex']) AND (!TCPDF_STATIC::empty_string($vp['Duplex']))) {
-			$out .= ' /Duplex /'.$vp['Duplex'];
-		}
-		if (isset($vp['PickTrayByPDFSize'])) {
-			if ($vp['PickTrayByPDFSize']) {
-				$out .= ' /PickTrayByPDFSize true';
-			} else {
-				$out .= ' /PickTrayByPDFSize false';
-			}
-		}
-		if (isset($vp['PrintPageRange'])) {
-			$PrintPageRangeNum = '';
-			foreach ($vp['PrintPageRange'] as $k => $v) {
-				$PrintPageRangeNum .= ' '.($v - 1).'';
-			}
-			$out .= ' /PrintPageRange ['.substr($PrintPageRangeNum,1).']';
-		}
-		if (isset($vp['NumCopies'])) {
-			$out .= ' /NumCopies '.intval($vp['NumCopies']);
-		}
-		$out .= ' >>';
-		return $out;
-	}
-
-	/**
-	 * Output PDF File Header (7.5.2).
-	 * @protected
-	 */
-	protected function _putheader() {
-		$this->_out('%PDF-'.$this->PDFVersion);
-		$this->_out('%'.chr(0xe2).chr(0xe3).chr(0xcf).chr(0xd3));
-	}
-
-	/**
-	 * Output end of document (EOF).
-	 * @protected
-	 */
-	protected function _enddoc() {
-		if (isset($this->CurrentFont['fontkey']) AND isset($this->CurrentFont['subsetchars'])) {
-			// save subset chars of the previous font
-			$this->setFontSubBuffer($this->CurrentFont['fontkey'], 'subsetchars', $this->CurrentFont['subsetchars']);
-		}
-		$this->state = 1;
-		$this->_putheader();
-		$this->_putpages();
-		$this->_putresources();
-		// empty signature fields
-		if (!empty($this->empty_signature_appearance)) {
-			foreach ($this->empty_signature_appearance as $key => $esa) {
-				// widget annotation for empty signature
-				$out = $this->_getobj($esa['objid'])."\n";
-				$out .= '<< /Type /Annot';
-				$out .= ' /Subtype /Widget';
-				$out .= ' /Rect ['.$esa['rect'].']';
-				$out .= ' /P '.$this->page_obj_id[($esa['page'])].' 0 R'; // link to signature appearance page
-				$out .= ' /F 4';
-				$out .= ' /FT /Sig';
-				$signame = $esa['name'].sprintf(' [%03d]', ($key + 1));
-				$out .= ' /T '.$this->_textstring($signame, $esa['objid']);
-				$out .= ' /Ff 0';
-				$out .= ' >>';
-				$out .= "\n".'endobj';
-				$this->_out($out);
-			}
-		}
-		// Signature
-		if ($this->sign AND isset($this->signature_data['cert_type'])) {
-			// widget annotation for signature
-			$out = $this->_getobj($this->sig_obj_id)."\n";
-			$out .= '<< /Type /Annot';
-			$out .= ' /Subtype /Widget';
-			$out .= ' /Rect ['.$this->signature_appearance['rect'].']';
-			$out .= ' /P '.$this->page_obj_id[($this->signature_appearance['page'])].' 0 R'; // link to signature appearance page
-			$out .= ' /F 4';
-			$out .= ' /FT /Sig';
-			$out .= ' /T '.$this->_textstring($this->signature_appearance['name'], $this->sig_obj_id);
-			$out .= ' /Ff 0';
-			$out .= ' /V '.($this->sig_obj_id + 1).' 0 R';
-			$out .= ' >>';
-			$out .= "\n".'endobj';
-			$this->_out($out);
-			// signature
-			$this->_putsignature();
-		}
-		// Info
-		$objid_info = $this->_putinfo();
-		// Catalog
-		$objid_catalog = $this->_putcatalog();
-		// Cross-ref
-		$o = $this->bufferlen;
-		// XREF section
-		$this->_out('xref');
-		$this->_out('0 '.($this->n + 1));
-		$this->_out('0000000000 65535 f ');
-		$freegen = ($this->n + 2);
-		for ($i=1; $i <= $this->n; ++$i) {
-			if (!isset($this->offsets[$i]) AND ($i > 1)) {
-				$this->_out(sprintf('0000000000 %05d f ', $freegen));
-				++$freegen;
-			} else {
-				$this->_out(sprintf('%010d 00000 n ', $this->offsets[$i]));
-			}
-		}
-		// TRAILER
-		$out = 'trailer'."\n";
-		$out .= '<<';
-		$out .= ' /Size '.($this->n + 1);
-		$out .= ' /Root '.$objid_catalog.' 0 R';
-		$out .= ' /Info '.$objid_info.' 0 R';
-		if ($this->encrypted) {
-			$out .= ' /Encrypt '.$this->encryptdata['objid'].' 0 R';
-		}
-		$out .= ' /ID [ <'.$this->file_id.'> <'.$this->file_id.'> ]';
-		$out .= ' >>';
-		$this->_out($out);
-		$this->_out('startxref');
-		$this->_out($o);
-		$this->_out('%%EOF');
-		$this->state = 3; // end-of-doc
-	}
-
-	/**
-	 * Initialize a new page.
-	 * @param $orientation (string) page orientation. Possible values are (case insensitive):<ul><li>P or PORTRAIT (default)</li><li>L or LANDSCAPE</li></ul>
-	 * @param $format (mixed) The format used for pages. It can be either: one of the string values specified at getPageSizeFromFormat() or an array of parameters specified at setPageFormat().
-	 * @protected
-	 * @see getPageSizeFromFormat(), setPageFormat()
-	 */
-	protected function _beginpage($orientation='', $format='') {
-		++$this->page;
-		$this->pageobjects[$this->page] = array();
-		$this->setPageBuffer($this->page, '');
-		// initialize array for graphics tranformation positions inside a page buffer
-		$this->transfmrk[$this->page] = array();
-		$this->state = 2;
-		if (TCPDF_STATIC::empty_string($orientation)) {
-			if (isset($this->CurOrientation)) {
-				$orientation = $this->CurOrientation;
-			} elseif ($this->fwPt > $this->fhPt) {
-				// landscape
-				$orientation = 'L';
-			} else {
-				// portrait
-				$orientation = 'P';
-			}
-		}
-		if (TCPDF_STATIC::empty_string($format)) {
-			$this->pagedim[$this->page] = $this->pagedim[($this->page - 1)];
-			$this->setPageOrientation($orientation);
-		} else {
-			$this->setPageFormat($format, $orientation);
-		}
-		if ($this->rtl) {
-			$this->x = $this->w - $this->rMargin;
-		} else {
-			$this->x = $this->lMargin;
-		}
-		$this->y = $this->tMargin;
-		if (isset($this->newpagegroup[$this->page])) {
-			// start a new group
-			$this->currpagegroup = $this->newpagegroup[$this->page];
-			$this->pagegroups[$this->currpagegroup] = 1;
-		} elseif (isset($this->currpagegroup) AND ($this->currpagegroup > 0)) {
-			++$this->pagegroups[$this->currpagegroup];
-		}
-	}
-
-	/**
-	 * Mark end of page.
-	 * @protected
-	 */
-	protected function _endpage() {
-		$this->setVisibility('all');
-		$this->state = 1;
-	}
-
-	/**
-	 * Begin a new object and return the object number.
-	 * @return int object number
-	 * @protected
-	 */
-	protected function _newobj() {
-		$this->_out($this->_getobj());
-		return $this->n;
-	}
-
-	/**
-	 * Return the starting object string for the selected object ID.
-	 * @param $objid (int) Object ID (leave empty to get a new ID).
-	 * @return string the starting object string
-	 * @protected
-	 * @since 5.8.009 (2010-08-20)
-	 */
-	protected function _getobj($objid='') {
-		if ($objid === '') {
-			++$this->n;
-			$objid = $this->n;
-		}
-		$this->offsets[$objid] = $this->bufferlen;
-		$this->pageobjects[$this->page][] = $objid;
-		return $objid.' 0 obj';
-	}
-
-	/**
-	 * Underline text.
-	 * @param $x (int) X coordinate
-	 * @param $y (int) Y coordinate
-	 * @param $txt (string) text to underline
-	 * @protected
-	 */
-	protected function _dounderline($x, $y, $txt) {
-		$w = $this->GetStringWidth($txt);
-		return $this->_dounderlinew($x, $y, $w);
-	}
-
-	/**
-	 * Underline for rectangular text area.
-	 * @param $x (int) X coordinate
-	 * @param $y (int) Y coordinate
-	 * @param $w (int) width to underline
-	 * @protected
-	 * @since 4.8.008 (2009-09-29)
-	 */
-	protected function _dounderlinew($x, $y, $w) {
-		$linew = - $this->CurrentFont['ut'] / 1000 * $this->FontSizePt;
-		return sprintf('%F %F %F %F re f', $x * $this->k, ((($this->h - $y) * $this->k) + $linew), $w * $this->k, $linew);
-	}
-
-	/**
-	 * Line through text.
-	 * @param $x (int) X coordinate
-	 * @param $y (int) Y coordinate
-	 * @param $txt (string) text to linethrough
-	 * @protected
-	 */
-	protected function _dolinethrough($x, $y, $txt) {
-		$w = $this->GetStringWidth($txt);
-		return $this->_dolinethroughw($x, $y, $w);
-	}
-
-	/**
-	 * Line through for rectangular text area.
-	 * @param $x (int) X coordinate
-	 * @param $y (int) Y coordinate
-	 * @param $w (int) line length (width)
-	 * @protected
-	 * @since 4.9.008 (2009-09-29)
-	 */
-	protected function _dolinethroughw($x, $y, $w) {
-		$linew = - $this->CurrentFont['ut'] / 1000 * $this->FontSizePt;
-		return sprintf('%F %F %F %F re f', $x * $this->k, ((($this->h - $y) * $this->k) + $linew + ($this->FontSizePt / 3)), $w * $this->k, $linew);
-	}
-
-	/**
-	 * Overline text.
-	 * @param $x (int) X coordinate
-	 * @param $y (int) Y coordinate
-	 * @param $txt (string) text to overline
-	 * @protected
-	 * @since 4.9.015 (2010-04-19)
-	 */
-	protected function _dooverline($x, $y, $txt) {
-		$w = $this->GetStringWidth($txt);
-		return $this->_dooverlinew($x, $y, $w);
-	}
-
-	/**
-	 * Overline for rectangular text area.
-	 * @param $x (int) X coordinate
-	 * @param $y (int) Y coordinate
-	 * @param $w (int) width to overline
-	 * @protected
-	 * @since 4.9.015 (2010-04-19)
-	 */
-	protected function _dooverlinew($x, $y, $w) {
-		$linew = - $this->CurrentFont['ut'] / 1000 * $this->FontSizePt;
-		return sprintf('%F %F %F %F re f', $x * $this->k, (($this->h - $y + $this->FontAscent) * $this->k) - $linew, $w * $this->k, $linew);
-
-	}
-
-	/**
-	 * Format a data string for meta information
-	 * @param $s (string) data string to escape.
-	 * @param $n (int) object ID
-	 * @return string escaped string.
-	 * @protected
-	 */
-	protected function _datastring($s, $n=0) {
-		if ($n == 0) {
-			$n = $this->n;
-		}
-		$s = $this->_encrypt_data($n, $s);
-		return '('. TCPDF_STATIC::_escape($s).')';
-	}
-
-	/**
-	 * Set the document creation timestamp
-	 * @param $time (mixed) Document creation timestamp in seconds or date-time string.
-	 * @public
-	 * @since 5.9.152 (2012-03-23)
-	 */
-	public function setDocCreationTimestamp($time) {
-		if (is_string($time)) {
-			$time = TCPDF_STATIC::getTimestamp($time);
-		}
-		$this->doc_creation_timestamp = intval($time);
-	}
-
-	/**
-	 * Set the document modification timestamp
-	 * @param $time (mixed) Document modification timestamp in seconds or date-time string.
-	 * @public
-	 * @since 5.9.152 (2012-03-23)
-	 */
-	public function setDocModificationTimestamp($time) {
-		if (is_string($time)) {
-			$time = TCPDF_STATIC::getTimestamp($time);
-		}
-		$this->doc_modification_timestamp = intval($time);
-	}
-
-	/**
-	 * Returns document creation timestamp in seconds.
-	 * @return (int) Creation timestamp in seconds.
-	 * @public
-	 * @since 5.9.152 (2012-03-23)
-	 */
-	public function getDocCreationTimestamp() {
-		return $this->doc_creation_timestamp;
-	}
-
-	/**
-	 * Returns document modification timestamp in seconds.
-	 * @return (int) Modfication timestamp in seconds.
-	 * @public
-	 * @since 5.9.152 (2012-03-23)
-	 */
-	public function getDocModificationTimestamp() {
-		return $this->doc_modification_timestamp;
-	}
-
-	/**
-	 * Returns a formatted date for meta information
-	 * @param $n (int) Object ID.
-	 * @param $timestamp (int) Timestamp to convert.
-	 * @return string escaped date string.
-	 * @protected
-	 * @since 4.6.028 (2009-08-25)
-	 */
-	protected function _datestring($n=0, $timestamp=0) {
-		if ((empty($timestamp)) OR ($timestamp < 0)) {
-			$timestamp = $this->doc_creation_timestamp;
-		}
-		return $this->_datastring('D:'.TCPDF_STATIC::getFormattedDate($timestamp), $n);
-	}
-
-	/**
-	 * Format a text string for meta information
-	 * @param $s (string) string to escape.
-	 * @param $n (int) object ID
-	 * @return string escaped string.
-	 * @protected
-	 */
-	protected function _textstring($s, $n=0) {
-		if ($this->isunicode) {
-			//Convert string to UTF-16BE
-			$s = TCPDF_FONTS::UTF8ToUTF16BE($s, true, $this->isunicode, $this->CurrentFont);
-		}
-		return $this->_datastring($s, $n);
-	}
-
-	/**
-	 * get raw output stream.
-	 * @param $s (string) string to output.
-	 * @param $n (int) object reference for encryption mode
-	 * @protected
-	 * @author Nicola Asuni
-	 * @since 5.5.000 (2010-06-22)
-	 */
-	protected function _getrawstream($s, $n=0) {
-		if ($n <= 0) {
-			// default to current object
-			$n = $this->n;
-		}
-		return $this->_encrypt_data($n, $s);
-	}
-
-	/**
-	 * Output a string to the document.
-	 * @param $s (string) string to output.
-	 * @protected
-	 */
-	protected function _out($s) {
-		if ($this->state == 2) {
-			if ($this->inxobj) {
-				// we are inside an XObject template
-				$this->xobjects[$this->xobjid]['outdata'] .= $s."\n";
-			} elseif ((!$this->InFooter) AND isset($this->footerlen[$this->page]) AND ($this->footerlen[$this->page] > 0)) {
-				// puts data before page footer
-				$pagebuff = $this->getPageBuffer($this->page);
-				$page = substr($pagebuff, 0, -$this->footerlen[$this->page]);
-				$footer = substr($pagebuff, -$this->footerlen[$this->page]);
-				$this->setPageBuffer($this->page, $page.$s."\n".$footer);
-				// update footer position
-				$this->footerpos[$this->page] += strlen($s."\n");
-			} else {
-				// set page data
-				$this->setPageBuffer($this->page, $s."\n", true);
-			}
-		} elseif ($this->state > 0) {
-			// set general data
-			$this->setBuffer($s."\n");
-		}
-	}
-
-	/**
-	 * Set header font.
-	 * @param $font (array) Array describing the basic font parameters: (family, style, size).
-	 * @public
-	 * @since 1.1
-	 */
-	public function setHeaderFont($font) {
-		$this->header_font = $font;
-	}
-
-	/**
-	 * Get header font.
-	 * @return array() Array describing the basic font parameters: (family, style, size).
-	 * @public
-	 * @since 4.0.012 (2008-07-24)
-	 */
-	public function getHeaderFont() {
-		return $this->header_font;
-	}
-
-	/**
-	 * Set footer font.
-	 * @param $font (array) Array describing the basic font parameters: (family, style, size).
-	 * @public
-	 * @since 1.1
-	 */
-	public function setFooterFont($font) {
-		$this->footer_font = $font;
-	}
-
-	/**
-	 * Get Footer font.
-	 * @return array() Array describing the basic font parameters: (family, style, size).
-	 * @public
-	 * @since 4.0.012 (2008-07-24)
-	 */
-	public function getFooterFont() {
-		return $this->footer_font;
-	}
-
-	/**
-	 * Set language array.
-	 * @param $language (array)
-	 * @public
-	 * @since 1.1
-	 */
-	public function setLanguageArray($language) {
-		$this->l = $language;
-		if (isset($this->l['a_meta_dir'])) {
-			$this->rtl = $this->l['a_meta_dir']=='rtl' ? true : false;
-		} else {
-			$this->rtl = false;
-		}
-	}
-
-	/**
-	 * Returns the PDF data.
-	 * @public
-	 */
-	public function getPDFData() {
-		if ($this->state < 3) {
-			$this->Close();
-		}
-		return $this->buffer;
-	}
-
-	/**
-	 * Output anchor link.
-	 * @param $url (string) link URL or internal link (i.e.: &lt;a href="#23,4.5"&gt;link to page 23 at 4.5 Y position&lt;/a&gt;)
-	 * @param $name (string) link name
-	 * @param $fill (boolean) Indicates if the cell background must be painted (true) or transparent (false).
-	 * @param $firstline (boolean) if true prints only the first line and return the remaining string.
-	 * @param $color (array) array of RGB text color
-	 * @param $style (string) font style (U, D, B, I)
-	 * @param $firstblock (boolean) if true the string is the starting of a line.
-	 * @return the number of cells used or the remaining text if $firstline = true;
-	 * @public
-	 */
-	public function addHtmlLink($url, $name, $fill=false, $firstline=false, $color='', $style=-1, $firstblock=false) {
-		if (isset($url[1]) AND ($url[0] == '#') AND is_numeric($url[1])) {
-			// convert url to internal link
-			$lnkdata = explode(',', $url);
-			if (isset($lnkdata[0]) ) {
-				$page = substr($lnkdata[0], 1);
-				if (isset($lnkdata[1]) AND (strlen($lnkdata[1]) > 0)) {
-					$lnky = floatval($lnkdata[1]);
-				} else {
-					$lnky = 0;
-				}
-				$url = $this->AddLink();
-				$this->SetLink($url, $lnky, $page);
-			}
-		}
-		// store current settings
-		$prevcolor = $this->fgcolor;
-		$prevstyle = $this->FontStyle;
-		if (empty($color)) {
-			$this->SetTextColorArray($this->htmlLinkColorArray);
-		} else {
-			$this->SetTextColorArray($color);
-		}
-		if ($style == -1) {
-			$this->SetFont('', $this->FontStyle.$this->htmlLinkFontStyle);
-		} else {
-			$this->SetFont('', $this->FontStyle.$style);
-		}
-		$ret = $this->Write($this->lasth, $name, $url, $fill, '', false, 0, $firstline, $firstblock, 0);
-		// restore settings
-		$this->SetFont('', $prevstyle);
-		$this->SetTextColorArray($prevcolor);
-		return $ret;
-	}
-
-	/**
-	 * Converts pixels to User's Units.
-	 * @param $px (int) pixels
-	 * @return float value in user's unit
-	 * @public
-	 * @see setImageScale(), getImageScale()
-	 */
-	public function pixelsToUnits($px) {
-		return ($px / ($this->imgscale * $this->k));
-	}
-
-	/**
-	 * Reverse function for htmlentities.
-	 * Convert entities in UTF-8.
-	 * @param $text_to_convert (string) Text to convert.
-	 * @return string converted text string
-	 * @public
-	 */
-	public function unhtmlentities($text_to_convert) {
-		return @html_entity_decode($text_to_convert, ENT_QUOTES, $this->encoding);
-	}
-
-	// ENCRYPTION METHODS ----------------------------------
-
-	/**
-	 * Compute encryption key depending on object number where the encrypted data is stored.
-	 * This is used for all strings and streams without crypt filter specifier.
-	 * @param $n (int) object number
-	 * @return int object key
-	 * @protected
-	 * @author Nicola Asuni
-	 * @since 2.0.000 (2008-01-02)
-	 */
-	protected function _objectkey($n) {
-		$objkey = $this->encryptdata['key'].pack('VXxx', $n);
-		if ($this->encryptdata['mode'] == 2) { // AES-128
-			// AES padding
-			$objkey .= "\x73\x41\x6C\x54"; // sAlT
-		}
-		$objkey = substr(TCPDF_STATIC::_md5_16($objkey), 0, (($this->encryptdata['Length'] / 8) + 5));
-		$objkey = substr($objkey, 0, 16);
-		return $objkey;
-	}
-
-	/**
-	 * Encrypt the input string.
-	 * @param $n (int) object number
-	 * @param $s (string) data string to encrypt
-	 * @return encrypted string
-	 * @protected
-	 * @author Nicola Asuni
-	 * @since 5.0.005 (2010-05-11)
-	 */
-	protected function _encrypt_data($n, $s) {
-		if (!$this->encrypted) {
-			return $s;
-		}
-		switch ($this->encryptdata['mode']) {
-			case 0:   // RC4-40
-			case 1: { // RC4-128
-				$s = TCPDF_STATIC::_RC4($this->_objectkey($n), $s, $this->last_enc_key, $this->last_enc_key_c);
-				break;
-			}
-			case 2: { // AES-128
-				$s = TCPDF_STATIC::_AES($this->_objectkey($n), $s);
-				break;
-			}
-			case 3: { // AES-256
-				$s = TCPDF_STATIC::_AES($this->encryptdata['key'], $s);
-				break;
-			}
-		}
-		return $s;
-	}
-
-	/**
-	 * Put encryption on PDF document.
-	 * @protected
-	 * @author Nicola Asuni
-	 * @since 2.0.000 (2008-01-02)
-	 */
-	protected function _putencryption() {
-		if (!$this->encrypted) {
-			return;
-		}
-		$this->encryptdata['objid'] = $this->_newobj();
-		$out = '<<';
-		if (!isset($this->encryptdata['Filter']) OR empty($this->encryptdata['Filter'])) {
-			$this->encryptdata['Filter'] = 'Standard';
-		}
-		$out .= ' /Filter /'.$this->encryptdata['Filter'];
-		if (isset($this->encryptdata['SubFilter']) AND !empty($this->encryptdata['SubFilter'])) {
-			$out .= ' /SubFilter /'.$this->encryptdata['SubFilter'];
-		}
-		if (!isset($this->encryptdata['V']) OR empty($this->encryptdata['V'])) {
-			$this->encryptdata['V'] = 1;
-		}
-		// V is a code specifying the algorithm to be used in encrypting and decrypting the document
-		$out .= ' /V '.$this->encryptdata['V'];
-		if (isset($this->encryptdata['Length']) AND !empty($this->encryptdata['Length'])) {
-			// The length of the encryption key, in bits. The value shall be a multiple of 8, in the range 40 to 256
-			$out .= ' /Length '.$this->encryptdata['Length'];
-		} else {
-			$out .= ' /Length 40';
-		}
-		if ($this->encryptdata['V'] >= 4) {
-			if (!isset($this->encryptdata['StmF']) OR empty($this->encryptdata['StmF'])) {
-				$this->encryptdata['StmF'] = 'Identity';
-			}
-			if (!isset($this->encryptdata['StrF']) OR empty($this->encryptdata['StrF'])) {
-				// The name of the crypt filter that shall be used when decrypting all strings in the document.
-				$this->encryptdata['StrF'] = 'Identity';
-			}
-			// A dictionary whose keys shall be crypt filter names and whose values shall be the corresponding crypt filter dictionaries.
-			if (isset($this->encryptdata['CF']) AND !empty($this->encryptdata['CF'])) {
-				$out .= ' /CF <<';
-				$out .= ' /'.$this->encryptdata['StmF'].' <<';
-				$out .= ' /Type /CryptFilter';
-				if (isset($this->encryptdata['CF']['CFM']) AND !empty($this->encryptdata['CF']['CFM'])) {
-					// The method used
-					$out .= ' /CFM /'.$this->encryptdata['CF']['CFM'];
-					if ($this->encryptdata['pubkey']) {
-						$out .= ' /Recipients [';
-						foreach ($this->encryptdata['Recipients'] as $rec) {
-							$out .= ' <'.$rec.'>';
-						}
-						$out .= ' ]';
-						if (isset($this->encryptdata['CF']['EncryptMetadata']) AND (!$this->encryptdata['CF']['EncryptMetadata'])) {
-							$out .= ' /EncryptMetadata false';
-						} else {
-							$out .= ' /EncryptMetadata true';
-						}
-					}
-				} else {
-					$out .= ' /CFM /None';
-				}
-				if (isset($this->encryptdata['CF']['AuthEvent']) AND !empty($this->encryptdata['CF']['AuthEvent'])) {
-					// The event to be used to trigger the authorization that is required to access encryption keys used by this filter.
-					$out .= ' /AuthEvent /'.$this->encryptdata['CF']['AuthEvent'];
-				} else {
-					$out .= ' /AuthEvent /DocOpen';
-				}
-				if (isset($this->encryptdata['CF']['Length']) AND !empty($this->encryptdata['CF']['Length'])) {
-					// The bit length of the encryption key.
-					$out .= ' /Length '.$this->encryptdata['CF']['Length'];
-				}
-				$out .= ' >> >>';
-			}
-			// The name of the crypt filter that shall be used by default when decrypting streams.
-			$out .= ' /StmF /'.$this->encryptdata['StmF'];
-			// The name of the crypt filter that shall be used when decrypting all strings in the document.
-			$out .= ' /StrF /'.$this->encryptdata['StrF'];
-			if (isset($this->encryptdata['EFF']) AND !empty($this->encryptdata['EFF'])) {
-				// The name of the crypt filter that shall be used when encrypting embedded file streams that do not have their own crypt filter specifier.
-				$out .= ' /EFF /'.$this->encryptdata[''];
-			}
-		}
-		// Additional encryption dictionary entries for the standard security handler
-		if ($this->encryptdata['pubkey']) {
-			if (($this->encryptdata['V'] < 4) AND isset($this->encryptdata['Recipients']) AND !empty($this->encryptdata['Recipients'])) {
-				$out .= ' /Recipients [';
-				foreach ($this->encryptdata['Recipients'] as $rec) {
-					$out .= ' <'.$rec.'>';
-				}
-				$out .= ' ]';
-			}
-		} else {
-			$out .= ' /R';
-			if ($this->encryptdata['V'] == 5) { // AES-256
-				$out .= ' 5';
-				$out .= ' /OE ('.TCPDF_STATIC::_escape($this->encryptdata['OE']).')';
-				$out .= ' /UE ('.TCPDF_STATIC::_escape($this->encryptdata['UE']).')';
-				$out .= ' /Perms ('.TCPDF_STATIC::_escape($this->encryptdata['perms']).')';
-			} elseif ($this->encryptdata['V'] == 4) { // AES-128
-				$out .= ' 4';
-			} elseif ($this->encryptdata['V'] < 2) { // RC-40
-				$out .= ' 2';
-			} else { // RC-128
-				$out .= ' 3';
-			}
-			$out .= ' /O ('.TCPDF_STATIC::_escape($this->encryptdata['O']).')';
-			$out .= ' /U ('.TCPDF_STATIC::_escape($this->encryptdata['U']).')';
-			$out .= ' /P '.$this->encryptdata['P'];
-			if (isset($this->encryptdata['EncryptMetadata']) AND (!$this->encryptdata['EncryptMetadata'])) {
-				$out .= ' /EncryptMetadata false';
-			} else {
-				$out .= ' /EncryptMetadata true';
-			}
-		}
-		$out .= ' >>';
-		$out .= "\n".'endobj';
-		$this->_out($out);
-	}
-
-	/**
-	 * Compute U value (used for encryption)
-	 * @return string U value
-	 * @protected
-	 * @since 2.0.000 (2008-01-02)
-	 * @author Nicola Asuni
-	 */
-	protected function _Uvalue() {
-		if ($this->encryptdata['mode'] == 0) { // RC4-40
-			return TCPDF_STATIC::_RC4($this->encryptdata['key'], TCPDF_STATIC::$enc_padding, $this->last_enc_key, $this->last_enc_key_c);
-		} elseif ($this->encryptdata['mode'] < 3) { // RC4-128, AES-128
-			$tmp = TCPDF_STATIC::_md5_16(TCPDF_STATIC::$enc_padding.$this->encryptdata['fileid']);
-			$enc = TCPDF_STATIC::_RC4($this->encryptdata['key'], $tmp, $this->last_enc_key, $this->last_enc_key_c);
-			$len = strlen($tmp);
-			for ($i = 1; $i <= 19; ++$i) {
-				$ek = '';
-				for ($j = 0; $j < $len; ++$j) {
-					$ek .= chr(ord($this->encryptdata['key'][$j]) ^ $i);
-				}
-				$enc = TCPDF_STATIC::_RC4($ek, $enc, $this->last_enc_key, $this->last_enc_key_c);
-			}
-			$enc .= str_repeat("\x00", 16);
-			return substr($enc, 0, 32);
-		} elseif ($this->encryptdata['mode'] == 3) { // AES-256
-			$seed = TCPDF_STATIC::_md5_16(TCPDF_STATIC::getRandomSeed());
-			// User Validation Salt
-			$this->encryptdata['UVS'] = substr($seed, 0, 8);
-			// User Key Salt
-			$this->encryptdata['UKS'] = substr($seed, 8, 16);
-			return hash('sha256', $this->encryptdata['user_password'].$this->encryptdata['UVS'], true).$this->encryptdata['UVS'].$this->encryptdata['UKS'];
-		}
-	}
-
-	/**
-	 * Compute UE value (used for encryption)
-	 * @return string UE value
-	 * @protected
-	 * @since 5.9.006 (2010-10-19)
-	 * @author Nicola Asuni
-	 */
-	protected function _UEvalue() {
-		$hashkey = hash('sha256', $this->encryptdata['user_password'].$this->encryptdata['UKS'], true);
-		return TCPDF_STATIC::_AESnopad($hashkey, $this->encryptdata['key']);
-	}
-
-	/**
-	 * Compute O value (used for encryption)
-	 * @return string O value
-	 * @protected
-	 * @since 2.0.000 (2008-01-02)
-	 * @author Nicola Asuni
-	 */
-	protected function _Ovalue() {
-		if ($this->encryptdata['mode'] < 3) { // RC4-40, RC4-128, AES-128
-			$tmp = TCPDF_STATIC::_md5_16($this->encryptdata['owner_password']);
-			if ($this->encryptdata['mode'] > 0) {
-				for ($i = 0; $i < 50; ++$i) {
-					$tmp = TCPDF_STATIC::_md5_16($tmp);
-				}
-			}
-			$owner_key = substr($tmp, 0, ($this->encryptdata['Length'] / 8));
-			$enc = TCPDF_STATIC::_RC4($owner_key, $this->encryptdata['user_password'], $this->last_enc_key, $this->last_enc_key_c);
-			if ($this->encryptdata['mode'] > 0) {
-				$len = strlen($owner_key);
-				for ($i = 1; $i <= 19; ++$i) {
-					$ek = '';
-					for ($j = 0; $j < $len; ++$j) {
-						$ek .= chr(ord($owner_key[$j]) ^ $i);
-					}
-					$enc = TCPDF_STATIC::_RC4($ek, $enc, $this->last_enc_key, $this->last_enc_key_c);
-				}
-			}
-			return $enc;
-		} elseif ($this->encryptdata['mode'] == 3) { // AES-256
-			$seed = TCPDF_STATIC::_md5_16(TCPDF_STATIC::getRandomSeed());
-			// Owner Validation Salt
-			$this->encryptdata['OVS'] = substr($seed, 0, 8);
-			// Owner Key Salt
-			$this->encryptdata['OKS'] = substr($seed, 8, 16);
-			return hash('sha256', $this->encryptdata['owner_password'].$this->encryptdata['OVS'].$this->encryptdata['U'], true).$this->encryptdata['OVS'].$this->encryptdata['OKS'];
-		}
-	}
-
-	/**
-	 * Compute OE value (used for encryption)
-	 * @return string OE value
-	 * @protected
-	 * @since 5.9.006 (2010-10-19)
-	 * @author Nicola Asuni
-	 */
-	protected function _OEvalue() {
-		$hashkey = hash('sha256', $this->encryptdata['owner_password'].$this->encryptdata['OKS'].$this->encryptdata['U'], true);
-		return TCPDF_STATIC::_AESnopad($hashkey, $this->encryptdata['key']);
-	}
-
-	/**
-	 * Convert password for AES-256 encryption mode
-	 * @param $password (string) password
-	 * @return string password
-	 * @protected
-	 * @since 5.9.006 (2010-10-19)
-	 * @author Nicola Asuni
-	 */
-	protected function _fixAES256Password($password) {
-		$psw = ''; // password to be returned
-		$psw_array = TCPDF_FONTS::utf8Bidi(TCPDF_FONTS::UTF8StringToArray($password, $this->isunicode, $this->CurrentFont), $password, $this->rtl, $this->isunicode, $this->CurrentFont);
-		foreach ($psw_array as $c) {
-			$psw .= TCPDF_FONTS::unichr($c, $this->isunicode);
-		}
-		return substr($psw, 0, 127);
-	}
-
-	/**
-	 * Compute encryption key
-	 * @protected
-	 * @since 2.0.000 (2008-01-02)
-	 * @author Nicola Asuni
-	 */
-	protected function _generateencryptionkey() {
-		$keybytelen = ($this->encryptdata['Length'] / 8);
-		if (!$this->encryptdata['pubkey']) { // standard mode
-			if ($this->encryptdata['mode'] == 3) { // AES-256
-				// generate 256 bit random key
-				$this->encryptdata['key'] = substr(hash('sha256', TCPDF_STATIC::getRandomSeed(), true), 0, $keybytelen);
-				// truncate passwords
-				$this->encryptdata['user_password'] = $this->_fixAES256Password($this->encryptdata['user_password']);
-				$this->encryptdata['owner_password'] = $this->_fixAES256Password($this->encryptdata['owner_password']);
-				// Compute U value
-				$this->encryptdata['U'] = $this->_Uvalue();
-				// Compute UE value
-				$this->encryptdata['UE'] = $this->_UEvalue();
-				// Compute O value
-				$this->encryptdata['O'] = $this->_Ovalue();
-				// Compute OE value
-				$this->encryptdata['OE'] = $this->_OEvalue();
-				// Compute P value
-				$this->encryptdata['P'] = $this->encryptdata['protection'];
-				// Computing the encryption dictionary's Perms (permissions) value
-				$perms = TCPDF_STATIC::getEncPermissionsString($this->encryptdata['protection']); // bytes 0-3
-				$perms .= chr(255).chr(255).chr(255).chr(255); // bytes 4-7
-				if (isset($this->encryptdata['CF']['EncryptMetadata']) AND (!$this->encryptdata['CF']['EncryptMetadata'])) { // byte 8
-					$perms .= 'F';
-				} else {
-					$perms .= 'T';
-				}
-				$perms .= 'adb'; // bytes 9-11
-				$perms .= 'nick'; // bytes 12-15
-				$this->encryptdata['perms'] = TCPDF_STATIC::_AESnopad($this->encryptdata['key'], $perms);
-			} else { // RC4-40, RC4-128, AES-128
-				// Pad passwords
-				$this->encryptdata['user_password'] = substr($this->encryptdata['user_password'].TCPDF_STATIC::$enc_padding, 0, 32);
-				$this->encryptdata['owner_password'] = substr($this->encryptdata['owner_password'].TCPDF_STATIC::$enc_padding, 0, 32);
-				// Compute O value
-				$this->encryptdata['O'] = $this->_Ovalue();
-				// get default permissions (reverse byte order)
-				$permissions = TCPDF_STATIC::getEncPermissionsString($this->encryptdata['protection']);
-				// Compute encryption key
-				$tmp = TCPDF_STATIC::_md5_16($this->encryptdata['user_password'].$this->encryptdata['O'].$permissions.$this->encryptdata['fileid']);
-				if ($this->encryptdata['mode'] > 0) {
-					for ($i = 0; $i < 50; ++$i) {
-						$tmp = TCPDF_STATIC::_md5_16(substr($tmp, 0, $keybytelen));
-					}
-				}
-				$this->encryptdata['key'] = substr($tmp, 0, $keybytelen);
-				// Compute U value
-				$this->encryptdata['U'] = $this->_Uvalue();
-				// Compute P value
-				$this->encryptdata['P'] = $this->encryptdata['protection'];
-			}
-		} else { // Public-Key mode
-			// random 20-byte seed
-			$seed = sha1(TCPDF_STATIC::getRandomSeed(), true);
-			$recipient_bytes = '';
-			foreach ($this->encryptdata['pubkeys'] as $pubkey) {
-				// for each public certificate
-				if (isset($pubkey['p'])) {
-					$pkprotection = TCPDF_STATIC::getUserPermissionCode($pubkey['p'], $this->encryptdata['mode']);
-				} else {
-					$pkprotection = $this->encryptdata['protection'];
-				}
-				// get default permissions (reverse byte order)
-				$pkpermissions = TCPDF_STATIC::getEncPermissionsString($pkprotection);
-				// envelope data
-				$envelope = $seed.$pkpermissions;
-				// write the envelope data to a temporary file
-				$tempkeyfile = TCPDF_STATIC::getObjFilename('key', $this->file_id);
-				$f = TCPDF_STATIC::fopenLocal($tempkeyfile, 'wb');
-				if (!$f) {
-					$this->Error('Unable to create temporary key file: '.$tempkeyfile);
-				}
-				$envelope_length = strlen($envelope);
-				fwrite($f, $envelope, $envelope_length);
-				fclose($f);
-				$tempencfile = TCPDF_STATIC::getObjFilename('enc', $this->file_id);
-				if (!openssl_pkcs7_encrypt($tempkeyfile, $tempencfile, $pubkey['c'], array(), PKCS7_BINARY | PKCS7_DETACHED)) {
-					$this->Error('Unable to encrypt the file: '.$tempkeyfile);
-				}
-				// read encryption signature
-				$signature = file_get_contents($tempencfile, false, null, $envelope_length);
-				// extract signature
-				$signature = substr($signature, strpos($signature, 'Content-Disposition'));
-				$tmparr = explode("\n\n", $signature);
-				$signature = trim($tmparr[1]);
-				unset($tmparr);
-				// decode signature
-				$signature = base64_decode($signature);
-				// convert signature to hex
-				$hexsignature = current(unpack('H*', $signature));
-				// store signature on recipients array
-				$this->encryptdata['Recipients'][] = $hexsignature;
-				// The bytes of each item in the Recipients array of PKCS#7 objects in the order in which they appear in the array
-				$recipient_bytes .= $signature;
-			}
-			// calculate encryption key
-			if ($this->encryptdata['mode'] == 3) { // AES-256
-				$this->encryptdata['key'] = substr(hash('sha256', $seed.$recipient_bytes, true), 0, $keybytelen);
-			} else { // RC4-40, RC4-128, AES-128
-				$this->encryptdata['key'] = substr(sha1($seed.$recipient_bytes, true), 0, $keybytelen);
-			}
-		}
-	}
-
-	/**
-	 * Set document protection
-	 * Remark: the protection against modification is for people who have the full Acrobat product.
-	 * If you don't set any password, the document will open as usual. If you set a user password, the PDF viewer will ask for it before displaying the document. The master password, if different from the user one, can be used to get full access.
-	 * Note: protecting a document requires to encrypt it, which increases the processing time a lot. This can cause a PHP time-out in some cases, especially if the document contains images or fonts.
-	 * @param $permissions (Array) the set of permissions (specify the ones you want to block):<ul><li>print : Print the document;</li><li>modify : Modify the contents of the document by operations other than those controlled by 'fill-forms', 'extract' and 'assemble';</li><li>copy : Copy or otherwise extract text and graphics from the document;</li><li>annot-forms : Add or modify text annotations, fill in interactive form fields, and, if 'modify' is also set, create or modify interactive form fields (including signature fields);</li><li>fill-forms : Fill in existing interactive form fields (including signature fields), even if 'annot-forms' is not specified;</li><li>extract : Extract text and graphics (in support of accessibility to users with disabilities or for other purposes);</li><li>assemble : Assemble the document (insert, rotate, or delete pages and create bookmarks or thumbnail images), even if 'modify' is not set;</li><li>print-high : Print the document to a representation from which a faithful digital copy of the PDF content could be generated. When this is not set, printing is limited to a low-level representation of the appearance, possibly of degraded quality.</li><li>owner : (inverted logic - only for public-key) when set permits change of encryption and enables all other permissions.</li></ul>
-	 * @param $user_pass (String) user password. Empty by default.
-	 * @param $owner_pass (String) owner password. If not specified, a random value is used.
-	 * @param $mode (int) encryption strength: 0 = RC4 40 bit; 1 = RC4 128 bit; 2 = AES 128 bit; 3 = AES 256 bit.
-	 * @param $pubkeys (String) array of recipients containing public-key certificates ('c') and permissions ('p'). For example: array(array('c' => 'file://../examples/data/cert/tcpdf.crt', 'p' => array('print')))
-	 * @public
-	 * @since 2.0.000 (2008-01-02)
-	 * @author Nicola Asuni
-	 */
-	public function SetProtection($permissions=array('print', 'modify', 'copy', 'annot-forms', 'fill-forms', 'extract', 'assemble', 'print-high'), $user_pass='', $owner_pass=null, $mode=0, $pubkeys=null) {
-		if ($this->pdfa_mode) {
-			// encryption is not allowed in PDF/A mode
-			return;
-		}
-		$this->encryptdata['protection'] = TCPDF_STATIC::getUserPermissionCode($permissions, $mode);
-		if (($pubkeys !== null) AND (is_array($pubkeys))) {
-			// public-key mode
-			$this->encryptdata['pubkeys'] = $pubkeys;
-			if ($mode == 0) {
-				// public-Key Security requires at least 128 bit
-				$mode = 1;
-			}
-			if (!function_exists('openssl_pkcs7_encrypt')) {
-				$this->Error('Public-Key Security requires openssl library.');
-			}
-			// Set Public-Key filter (available are: Entrust.PPKEF, Adobe.PPKLite, Adobe.PubSec)
-			$this->encryptdata['pubkey'] = true;
-			$this->encryptdata['Filter'] = 'Adobe.PubSec';
-			$this->encryptdata['StmF'] = 'DefaultCryptFilter';
-			$this->encryptdata['StrF'] = 'DefaultCryptFilter';
-		} else {
-			// standard mode (password mode)
-			$this->encryptdata['pubkey'] = false;
-			$this->encryptdata['Filter'] = 'Standard';
-			$this->encryptdata['StmF'] = 'StdCF';
-			$this->encryptdata['StrF'] = 'StdCF';
-		}
-		if ($mode > 1) { // AES
-			if (!extension_loaded('openssl') && !extension_loaded('mcrypt')) {
-				$this->Error('AES encryption requires openssl or mcrypt extension (http://www.php.net/manual/en/mcrypt.requirements.php).');
-			}
-			if (extension_loaded('openssl') && !in_array('aes-256-cbc', openssl_get_cipher_methods())) {
-				$this->Error('AES encryption requires openssl/aes-256-cbc cypher.');
-			}
-			if (extension_loaded('mcrypt') && mcrypt_get_cipher_name(MCRYPT_RIJNDAEL_128) === false) {
-				$this->Error('AES encryption requires MCRYPT_RIJNDAEL_128 cypher.');
-			}
-			if (($mode == 3) AND !function_exists('hash')) {
-				// the Hash extension requires no external libraries and is enabled by default as of PHP 5.1.2.
-				$this->Error('AES 256 encryption requires HASH Message Digest Framework (http://www.php.net/manual/en/book.hash.php).');
-			}
-		}
-		if ($owner_pass === null) {
-			$owner_pass = md5(TCPDF_STATIC::getRandomSeed());
-		}
-		$this->encryptdata['user_password'] = $user_pass;
-		$this->encryptdata['owner_password'] = $owner_pass;
-		$this->encryptdata['mode'] = $mode;
-		switch ($mode) {
-			case 0: { // RC4 40 bit
-				$this->encryptdata['V'] = 1;
-				$this->encryptdata['Length'] = 40;
-				$this->encryptdata['CF']['CFM'] = 'V2';
-				break;
-			}
-			case 1: { // RC4 128 bit
-				$this->encryptdata['V'] = 2;
-				$this->encryptdata['Length'] = 128;
-				$this->encryptdata['CF']['CFM'] = 'V2';
-				if ($this->encryptdata['pubkey']) {
-					$this->encryptdata['SubFilter'] = 'adbe.pkcs7.s4';
-					$this->encryptdata['Recipients'] = array();
-				}
-				break;
-			}
-			case 2: { // AES 128 bit
-				$this->encryptdata['V'] = 4;
-				$this->encryptdata['Length'] = 128;
-				$this->encryptdata['CF']['CFM'] = 'AESV2';
-				$this->encryptdata['CF']['Length'] = 128;
-				if ($this->encryptdata['pubkey']) {
-					$this->encryptdata['SubFilter'] = 'adbe.pkcs7.s5';
-					$this->encryptdata['Recipients'] = array();
-				}
-				break;
-			}
-			case 3: { // AES 256 bit
-				$this->encryptdata['V'] = 5;
-				$this->encryptdata['Length'] = 256;
-				$this->encryptdata['CF']['CFM'] = 'AESV3';
-				$this->encryptdata['CF']['Length'] = 256;
-				if ($this->encryptdata['pubkey']) {
-					$this->encryptdata['SubFilter'] = 'adbe.pkcs7.s5';
-					$this->encryptdata['Recipients'] = array();
-				}
-				break;
-			}
-		}
-		$this->encrypted = true;
-		$this->encryptdata['fileid'] = TCPDF_STATIC::convertHexStringToString($this->file_id);
-		$this->_generateencryptionkey();
-	}
-
-	// END OF ENCRYPTION FUNCTIONS -------------------------
-
-	// START TRANSFORMATIONS SECTION -----------------------
-
-	/**
-	 * Starts a 2D tranformation saving current graphic state.
-	 * This function must be called before scaling, mirroring, translation, rotation and skewing.
-	 * Use StartTransform() before, and StopTransform() after the transformations to restore the normal behavior.
-	 * @public
-	 * @since 2.1.000 (2008-01-07)
-	 * @see StartTransform(), StopTransform()
-	 */
-	public function StartTransform() {
-		if ($this->state != 2) {
-			return;
-		}
-		$this->_outSaveGraphicsState();
-		if ($this->inxobj) {
-			// we are inside an XObject template
-			$this->xobjects[$this->xobjid]['transfmrk'][] = strlen($this->xobjects[$this->xobjid]['outdata']);
-		} else {
-			$this->transfmrk[$this->page][] = $this->pagelen[$this->page];
-		}
-		++$this->transfmatrix_key;
-		$this->transfmatrix[$this->transfmatrix_key] = array();
-	}
-
-	/**
-	 * Stops a 2D tranformation restoring previous graphic state.
-	 * This function must be called after scaling, mirroring, translation, rotation and skewing.
-	 * Use StartTransform() before, and StopTransform() after the transformations to restore the normal behavior.
-	 * @public
-	 * @since 2.1.000 (2008-01-07)
-	 * @see StartTransform(), StopTransform()
-	 */
-	public function StopTransform() {
-		if ($this->state != 2) {
-			return;
-		}
-		$this->_outRestoreGraphicsState();
-		if (isset($this->transfmatrix[$this->transfmatrix_key])) {
-			array_pop($this->transfmatrix[$this->transfmatrix_key]);
-			--$this->transfmatrix_key;
-		}
-		if ($this->inxobj) {
-			// we are inside an XObject template
-			array_pop($this->xobjects[$this->xobjid]['transfmrk']);
-		} else {
-			array_pop($this->transfmrk[$this->page]);
-		}
-	}
-	/**
-	 * Horizontal Scaling.
-	 * @param $s_x (float) scaling factor for width as percent. 0 is not allowed.
-	 * @param $x (int) abscissa of the scaling center. Default is current x position
-	 * @param $y (int) ordinate of the scaling center. Default is current y position
-	 * @public
-	 * @since 2.1.000 (2008-01-07)
-	 * @see StartTransform(), StopTransform()
-	 */
-	public function ScaleX($s_x, $x='', $y='') {
-		$this->Scale($s_x, 100, $x, $y);
-	}
-
-	/**
-	 * Vertical Scaling.
-	 * @param $s_y (float) scaling factor for height as percent. 0 is not allowed.
-	 * @param $x (int) abscissa of the scaling center. Default is current x position
-	 * @param $y (int) ordinate of the scaling center. Default is current y position
-	 * @public
-	 * @since 2.1.000 (2008-01-07)
-	 * @see StartTransform(), StopTransform()
-	 */
-	public function ScaleY($s_y, $x='', $y='') {
-		$this->Scale(100, $s_y, $x, $y);
-	}
-
-	/**
-	 * Vertical and horizontal proportional Scaling.
-	 * @param $s (float) scaling factor for width and height as percent. 0 is not allowed.
-	 * @param $x (int) abscissa of the scaling center. Default is current x position
-	 * @param $y (int) ordinate of the scaling center. Default is current y position
-	 * @public
-	 * @since 2.1.000 (2008-01-07)
-	 * @see StartTransform(), StopTransform()
-	 */
-	public function ScaleXY($s, $x='', $y='') {
-		$this->Scale($s, $s, $x, $y);
-	}
-
-	/**
-	 * Vertical and horizontal non-proportional Scaling.
-	 * @param $s_x (float) scaling factor for width as percent. 0 is not allowed.
-	 * @param $s_y (float) scaling factor for height as percent. 0 is not allowed.
-	 * @param $x (int) abscissa of the scaling center. Default is current x position
-	 * @param $y (int) ordinate of the scaling center. Default is current y position
-	 * @public
-	 * @since 2.1.000 (2008-01-07)
-	 * @see StartTransform(), StopTransform()
-	 */
-	public function Scale($s_x, $s_y, $x='', $y='') {
-		if ($x === '') {
-			$x = $this->x;
-		}
-		if ($y === '') {
-			$y = $this->y;
-		}
-		if (($s_x == 0) OR ($s_y == 0)) {
-			$this->Error('Please do not use values equal to zero for scaling');
-		}
-		$y = ($this->h - $y) * $this->k;
-		$x *= $this->k;
-		//calculate elements of transformation matrix
-		$s_x /= 100;
-		$s_y /= 100;
-		$tm = array();
-		$tm[0] = $s_x;
-		$tm[1] = 0;
-		$tm[2] = 0;
-		$tm[3] = $s_y;
-		$tm[4] = $x * (1 - $s_x);
-		$tm[5] = $y * (1 - $s_y);
-		//scale the coordinate system
-		$this->Transform($tm);
-	}
-
-	/**
-	 * Horizontal Mirroring.
-	 * @param $x (int) abscissa of the point. Default is current x position
-	 * @public
-	 * @since 2.1.000 (2008-01-07)
-	 * @see StartTransform(), StopTransform()
-	 */
-	public function MirrorH($x='') {
-		$this->Scale(-100, 100, $x);
-	}
-
-	/**
-	 * Verical Mirroring.
-	 * @param $y (int) ordinate of the point. Default is current y position
-	 * @public
-	 * @since 2.1.000 (2008-01-07)
-	 * @see StartTransform(), StopTransform()
-	 */
-	public function MirrorV($y='') {
-		$this->Scale(100, -100, '', $y);
-	}
-
-	/**
-	 * Point reflection mirroring.
-	 * @param $x (int) abscissa of the point. Default is current x position
-	 * @param $y (int) ordinate of the point. Default is current y position
-	 * @public
-	 * @since 2.1.000 (2008-01-07)
-	 * @see StartTransform(), StopTransform()
-	 */
-	public function MirrorP($x='',$y='') {
-		$this->Scale(-100, -100, $x, $y);
-	}
-
-	/**
-	 * Reflection against a straight line through point (x, y) with the gradient angle (angle).
-	 * @param $angle (float) gradient angle of the straight line. Default is 0 (horizontal line).
-	 * @param $x (int) abscissa of the point. Default is current x position
-	 * @param $y (int) ordinate of the point. Default is current y position
-	 * @public
-	 * @since 2.1.000 (2008-01-07)
-	 * @see StartTransform(), StopTransform()
-	 */
-	public function MirrorL($angle=0, $x='',$y='') {
-		$this->Scale(-100, 100, $x, $y);
-		$this->Rotate(-2*($angle-90), $x, $y);
-	}
-
-	/**
-	 * Translate graphic object horizontally.
-	 * @param $t_x (int) movement to the right (or left for RTL)
-	 * @public
-	 * @since 2.1.000 (2008-01-07)
-	 * @see StartTransform(), StopTransform()
-	 */
-	public function TranslateX($t_x) {
-		$this->Translate($t_x, 0);
-	}
-
-	/**
-	 * Translate graphic object vertically.
-	 * @param $t_y (int) movement to the bottom
-	 * @public
-	 * @since 2.1.000 (2008-01-07)
-	 * @see StartTransform(), StopTransform()
-	 */
-	public function TranslateY($t_y) {
-		$this->Translate(0, $t_y);
-	}
-
-	/**
-	 * Translate graphic object horizontally and vertically.
-	 * @param $t_x (int) movement to the right
-	 * @param $t_y (int) movement to the bottom
-	 * @public
-	 * @since 2.1.000 (2008-01-07)
-	 * @see StartTransform(), StopTransform()
-	 */
-	public function Translate($t_x, $t_y) {
-		//calculate elements of transformation matrix
-		$tm = array();
-		$tm[0] = 1;
-		$tm[1] = 0;
-		$tm[2] = 0;
-		$tm[3] = 1;
-		$tm[4] = $t_x * $this->k;
-		$tm[5] = -$t_y * $this->k;
-		//translate the coordinate system
-		$this->Transform($tm);
-	}
-
-	/**
-	 * Rotate object.
-	 * @param $angle (float) angle in degrees for counter-clockwise rotation
-	 * @param $x (int) abscissa of the rotation center. Default is current x position
-	 * @param $y (int) ordinate of the rotation center. Default is current y position
-	 * @public
-	 * @since 2.1.000 (2008-01-07)
-	 * @see StartTransform(), StopTransform()
-	 */
-	public function Rotate($angle, $x='', $y='') {
-		if ($x === '') {
-			$x = $this->x;
-		}
-		if ($y === '') {
-			$y = $this->y;
-		}
-		$y = ($this->h - $y) * $this->k;
-		$x *= $this->k;
-		//calculate elements of transformation matrix
-		$tm = array();
-		$tm[0] = cos(deg2rad($angle));
-		$tm[1] = sin(deg2rad($angle));
-		$tm[2] = -$tm[1];
-		$tm[3] = $tm[0];
-		$tm[4] = $x + ($tm[1] * $y) - ($tm[0] * $x);
-		$tm[5] = $y - ($tm[0] * $y) - ($tm[1] * $x);
-		//rotate the coordinate system around ($x,$y)
-		$this->Transform($tm);
-	}
-
-	/**
-	 * Skew horizontally.
-	 * @param $angle_x (float) angle in degrees between -90 (skew to the left) and 90 (skew to the right)
-	 * @param $x (int) abscissa of the skewing center. default is current x position
-	 * @param $y (int) ordinate of the skewing center. default is current y position
-	 * @public
-	 * @since 2.1.000 (2008-01-07)
-	 * @see StartTransform(), StopTransform()
-	 */
-	public function SkewX($angle_x, $x='', $y='') {
-		$this->Skew($angle_x, 0, $x, $y);
-	}
-
-	/**
-	 * Skew vertically.
-	 * @param $angle_y (float) angle in degrees between -90 (skew to the bottom) and 90 (skew to the top)
-	 * @param $x (int) abscissa of the skewing center. default is current x position
-	 * @param $y (int) ordinate of the skewing center. default is current y position
-	 * @public
-	 * @since 2.1.000 (2008-01-07)
-	 * @see StartTransform(), StopTransform()
-	 */
-	public function SkewY($angle_y, $x='', $y='') {
-		$this->Skew(0, $angle_y, $x, $y);
-	}
-
-	/**
-	 * Skew.
-	 * @param $angle_x (float) angle in degrees between -90 (skew to the left) and 90 (skew to the right)
-	 * @param $angle_y (float) angle in degrees between -90 (skew to the bottom) and 90 (skew to the top)
-	 * @param $x (int) abscissa of the skewing center. default is current x position
-	 * @param $y (int) ordinate of the skewing center. default is current y position
-	 * @public
-	 * @since 2.1.000 (2008-01-07)
-	 * @see StartTransform(), StopTransform()
-	 */
-	public function Skew($angle_x, $angle_y, $x='', $y='') {
-		if ($x === '') {
-			$x = $this->x;
-		}
-		if ($y === '') {
-			$y = $this->y;
-		}
-		if (($angle_x <= -90) OR ($angle_x >= 90) OR ($angle_y <= -90) OR ($angle_y >= 90)) {
-			$this->Error('Please use values between -90 and +90 degrees for Skewing.');
-		}
-		$x *= $this->k;
-		$y = ($this->h - $y) * $this->k;
-		//calculate elements of transformation matrix
-		$tm = array();
-		$tm[0] = 1;
-		$tm[1] = tan(deg2rad($angle_y));
-		$tm[2] = tan(deg2rad($angle_x));
-		$tm[3] = 1;
-		$tm[4] = -$tm[2] * $y;
-		$tm[5] = -$tm[1] * $x;
-		//skew the coordinate system
-		$this->Transform($tm);
-	}
-
-	/**
-	 * Apply graphic transformations.
-	 * @param $tm (array) transformation matrix
-	 * @protected
-	 * @since 2.1.000 (2008-01-07)
-	 * @see StartTransform(), StopTransform()
-	 */
-	protected function Transform($tm) {
-		if ($this->state != 2) {
-			return;
-		}
-		$this->_out(sprintf('%F %F %F %F %F %F cm', $tm[0], $tm[1], $tm[2], $tm[3], $tm[4], $tm[5]));
-		// add tranformation matrix
-		$this->transfmatrix[$this->transfmatrix_key][] = array('a' => $tm[0], 'b' => $tm[1], 'c' => $tm[2], 'd' => $tm[3], 'e' => $tm[4], 'f' => $tm[5]);
-		// update transformation mark
-		if ($this->inxobj) {
-			// we are inside an XObject template
-			if (end($this->xobjects[$this->xobjid]['transfmrk']) !== false) {
-				$key = key($this->xobjects[$this->xobjid]['transfmrk']);
-				$this->xobjects[$this->xobjid]['transfmrk'][$key] = strlen($this->xobjects[$this->xobjid]['outdata']);
-			}
-		} elseif (end($this->transfmrk[$this->page]) !== false) {
-			$key = key($this->transfmrk[$this->page]);
-			$this->transfmrk[$this->page][$key] = $this->pagelen[$this->page];
-		}
-	}
-
-	// END TRANSFORMATIONS SECTION -------------------------
-
-	// START GRAPHIC FUNCTIONS SECTION ---------------------
-	// The following section is based on the code provided by David Hernandez Sanz
-
-	/**
-	 * Defines the line width. By default, the value equals 0.2 mm. The method can be called before the first page is created and the value is retained from page to page.
-	 * @param $width (float) The width.
-	 * @public
-	 * @since 1.0
-	 * @see Line(), Rect(), Cell(), MultiCell()
-	 */
-	public function SetLineWidth($width) {
-		//Set line width
-		$this->LineWidth = $width;
-		$this->linestyleWidth = sprintf('%F w', ($width * $this->k));
-		if ($this->state == 2) {
-			$this->_out($this->linestyleWidth);
-		}
-	}
-
-	/**
-	 * Returns the current the line width.
-	 * @return int Line width
-	 * @public
-	 * @since 2.1.000 (2008-01-07)
-	 * @see Line(), SetLineWidth()
-	 */
-	public function GetLineWidth() {
-		return $this->LineWidth;
-	}
-
-	/**
-	 * Set line style.
-	 * @param $style (array) Line style. Array with keys among the following:
-	 * <ul>
-	 *	 <li>width (float): Width of the line in user units.</li>
-	 *	 <li>cap (string): Type of cap to put on the line. Possible values are:
-	 * butt, round, square. The difference between "square" and "butt" is that
-	 * "square" projects a flat end past the end of the line.</li>
-	 *	 <li>join (string): Type of join. Possible values are: miter, round,
-	 * bevel.</li>
-	 *	 <li>dash (mixed): Dash pattern. Is 0 (without dash) or string with
-	 * series of length values, which are the lengths of the on and off dashes.
-	 * For example: "2" represents 2 on, 2 off, 2 on, 2 off, ...; "2,1" is 2 on,
-	 * 1 off, 2 on, 1 off, ...</li>
-	 *	 <li>phase (integer): Modifier on the dash pattern which is used to shift
-	 * the point at which the pattern starts.</li>
-	 *	 <li>color (array): Draw color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K) or array(C,M,Y,K,SpotColorName).</li>
-	 * </ul>
-	 * @param $ret (boolean) if true do not send the command.
-	 * @return string the PDF command
-	 * @public
-	 * @since 2.1.000 (2008-01-08)
-	 */
-	public function SetLineStyle($style, $ret=false) {
-		$s = ''; // string to be returned
-		if (!is_array($style)) {
-			return;
-		}
-		if (isset($style['width'])) {
-			$this->LineWidth = $style['width'];
-			$this->linestyleWidth = sprintf('%F w', ($style['width'] * $this->k));
-			$s .= $this->linestyleWidth.' ';
-		}
-		if (isset($style['cap'])) {
-			$ca = array('butt' => 0, 'round'=> 1, 'square' => 2);
-			if (isset($ca[$style['cap']])) {
-				$this->linestyleCap = $ca[$style['cap']].' J';
-				$s .= $this->linestyleCap.' ';
-			}
-		}
-		if (isset($style['join'])) {
-			$ja = array('miter' => 0, 'round' => 1, 'bevel' => 2);
-			if (isset($ja[$style['join']])) {
-				$this->linestyleJoin = $ja[$style['join']].' j';
-				$s .= $this->linestyleJoin.' ';
-			}
-		}
-		if (isset($style['dash'])) {
-			$dash_string = '';
-			if ($style['dash']) {
-				if (preg_match('/^.+,/', $style['dash']) > 0) {
-					$tab = explode(',', $style['dash']);
-				} else {
-					$tab = array($style['dash']);
-				}
-				$dash_string = '';
-				foreach ($tab as $i => $v) {
-					if ($i) {
-						$dash_string .= ' ';
-					}
-					$dash_string .= sprintf('%F', $v);
-				}
-			}
-			if (!isset($style['phase']) OR !$style['dash']) {
-				$style['phase'] = 0;
-			}
-			$this->linestyleDash = sprintf('[%s] %F d', $dash_string, $style['phase']);
-			$s .= $this->linestyleDash.' ';
-		}
-		if (isset($style['color'])) {
-			$s .= $this->SetDrawColorArray($style['color'], true).' ';
-		}
-		if (!$ret AND ($this->state == 2)) {
-			$this->_out($s);
-		}
-		return $s;
-	}
-
-	/**
-	 * Begin a new subpath by moving the current point to coordinates (x, y), omitting any connecting line segment.
-	 * @param $x (float) Abscissa of point.
-	 * @param $y (float) Ordinate of point.
-	 * @protected
-	 * @since 2.1.000 (2008-01-08)
-	 */
-	protected function _outPoint($x, $y) {
-		if ($this->state == 2) {
-			$this->_out(sprintf('%F %F m', ($x * $this->k), (($this->h - $y) * $this->k)));
-		}
-	}
-
-	/**
-	 * Append a straight line segment from the current point to the point (x, y).
-	 * The new current point shall be (x, y).
-	 * @param $x (float) Abscissa of end point.
-	 * @param $y (float) Ordinate of end point.
-	 * @protected
-	 * @since 2.1.000 (2008-01-08)
-	 */
-	protected function _outLine($x, $y) {
-		if ($this->state == 2) {
-			$this->_out(sprintf('%F %F l', ($x * $this->k), (($this->h - $y) * $this->k)));
-		}
-	}
-
-	/**
-	 * Append a rectangle to the current path as a complete subpath, with lower-left corner (x, y) and dimensions widthand height in user space.
-	 * @param $x (float) Abscissa of upper-left corner.
-	 * @param $y (float) Ordinate of upper-left corner.
-	 * @param $w (float) Width.
-	 * @param $h (float) Height.
-	 * @param $op (string) options
-	 * @protected
-	 * @since 2.1.000 (2008-01-08)
-	 */
-	protected function _outRect($x, $y, $w, $h, $op) {
-		if ($this->state == 2) {
-			$this->_out(sprintf('%F %F %F %F re %s', ($x * $this->k), (($this->h - $y) * $this->k), ($w * $this->k), (-$h * $this->k), $op));
-		}
-	}
-
-	/**
-	 * Append a cubic Bezier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using (x1, y1) and (x2, y2) as the Bezier control points.
-	 * The new current point shall be (x3, y3).
-	 * @param $x1 (float) Abscissa of control point 1.
-	 * @param $y1 (float) Ordinate of control point 1.
-	 * @param $x2 (float) Abscissa of control point 2.
-	 * @param $y2 (float) Ordinate of control point 2.
-	 * @param $x3 (float) Abscissa of end point.
-	 * @param $y3 (float) Ordinate of end point.
-	 * @protected
-	 * @since 2.1.000 (2008-01-08)
-	 */
-	protected function _outCurve($x1, $y1, $x2, $y2, $x3, $y3) {
-		if ($this->state == 2) {
-			$this->_out(sprintf('%F %F %F %F %F %F c', ($x1 * $this->k), (($this->h - $y1) * $this->k), ($x2 * $this->k), (($this->h - $y2) * $this->k), ($x3 * $this->k), (($this->h - $y3) * $this->k)));
-		}
-	}
-
-	/**
-	 * Append a cubic Bezier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using the current point and (x2, y2) as the Bezier control points.
-	 * The new current point shall be (x3, y3).
-	 * @param $x2 (float) Abscissa of control point 2.
-	 * @param $y2 (float) Ordinate of control point 2.
-	 * @param $x3 (float) Abscissa of end point.
-	 * @param $y3 (float) Ordinate of end point.
-	 * @protected
-	 * @since 4.9.019 (2010-04-26)
-	 */
-	protected function _outCurveV($x2, $y2, $x3, $y3) {
-		if ($this->state == 2) {
-			$this->_out(sprintf('%F %F %F %F v', ($x2 * $this->k), (($this->h - $y2) * $this->k), ($x3 * $this->k), (($this->h - $y3) * $this->k)));
-		}
-	}
-
-	/**
-	 * Append a cubic Bezier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using (x1, y1) and (x3, y3) as the Bezier control points.
-	 * The new current point shall be (x3, y3).
-	 * @param $x1 (float) Abscissa of control point 1.
-	 * @param $y1 (float) Ordinate of control point 1.
-	 * @param $x3 (float) Abscissa of end point.
-	 * @param $y3 (float) Ordinate of end point.
-	 * @protected
-	 * @since 2.1.000 (2008-01-08)
-	 */
-	protected function _outCurveY($x1, $y1, $x3, $y3) {
-		if ($this->state == 2) {
-			$this->_out(sprintf('%F %F %F %F y', ($x1 * $this->k), (($this->h - $y1) * $this->k), ($x3 * $this->k), (($this->h - $y3) * $this->k)));
-		}
-	}
-
-	/**
-	 * Draws a line between two points.
-	 * @param $x1 (float) Abscissa of first point.
-	 * @param $y1 (float) Ordinate of first point.
-	 * @param $x2 (float) Abscissa of second point.
-	 * @param $y2 (float) Ordinate of second point.
-	 * @param $style (array) Line style. Array like for SetLineStyle(). Default value: default line style (empty array).
-	 * @public
-	 * @since 1.0
-	 * @see SetLineWidth(), SetDrawColor(), SetLineStyle()
-	 */
-	public function Line($x1, $y1, $x2, $y2, $style=array()) {
-		if ($this->state != 2) {
-			return;
-		}
-		if (is_array($style)) {
-			$this->SetLineStyle($style);
-		}
-		$this->_outPoint($x1, $y1);
-		$this->_outLine($x2, $y2);
-		$this->_out('S');
-	}
-
-	/**
-	 * Draws a rectangle.
-	 * @param $x (float) Abscissa of upper-left corner.
-	 * @param $y (float) Ordinate of upper-left corner.
-	 * @param $w (float) Width.
-	 * @param $h (float) Height.
-	 * @param $style (string) Style of rendering. See the getPathPaintOperator() function for more information.
-	 * @param $border_style (array) Border style of rectangle. Array with keys among the following:
-	 * <ul>
-	 *	 <li>all: Line style of all borders. Array like for SetLineStyle().</li>
-	 *	 <li>L, T, R, B or combinations: Line style of left, top, right or bottom border. Array like for SetLineStyle().</li>
-	 * </ul>
-	 * If a key is not present or is null, the correspondent border is not drawn. Default value: default line style (empty array).
-	 * @param $fill_color (array) Fill color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K) or array(C,M,Y,K,SpotColorName). Default value: default color (empty array).
-	 * @public
-	 * @since 1.0
-	 * @see SetLineStyle()
-	 */
-	public function Rect($x, $y, $w, $h, $style='', $border_style=array(), $fill_color=array()) {
-		if ($this->state != 2) {
-			return;
-		}
-		if (empty($style)) {
-			$style = 'S';
-		}
-		if (!(strpos($style, 'F') === false) AND !empty($fill_color)) {
-			// set background color
-			$this->SetFillColorArray($fill_color);
-		}
-		if (!empty($border_style)) {
-			if (isset($border_style['all']) AND !empty($border_style['all'])) {
-				//set global style for border
-				$this->SetLineStyle($border_style['all']);
-				$border_style = array();
-			} else {
-				// remove stroke operator from style
-				$opnostroke = array('S' => '', 'D' => '', 's' => '', 'd' => '', 'B' => 'F', 'FD' => 'F', 'DF' => 'F', 'B*' => 'F*', 'F*D' => 'F*', 'DF*' => 'F*', 'b' => 'f', 'fd' => 'f', 'df' => 'f', 'b*' => 'f*', 'f*d' => 'f*', 'df*' => 'f*' );
-				if (isset($opnostroke[$style])) {
-					$style = $opnostroke[$style];
-				}
-			}
-		}
-		if (!empty($style)) {
-			$op = TCPDF_STATIC::getPathPaintOperator($style);
-			$this->_outRect($x, $y, $w, $h, $op);
-		}
-		if (!empty($border_style)) {
-			$border_style2 = array();
-			foreach ($border_style as $line => $value) {
-				$length = strlen($line);
-				for ($i = 0; $i < $length; ++$i) {
-					$border_style2[$line[$i]] = $value;
-				}
-			}
-			$border_style = $border_style2;
-			if (isset($border_style['L']) AND $border_style['L']) {
-				$this->Line($x, $y, $x, $y + $h, $border_style['L']);
-			}
-			if (isset($border_style['T']) AND $border_style['T']) {
-				$this->Line($x, $y, $x + $w, $y, $border_style['T']);
-			}
-			if (isset($border_style['R']) AND $border_style['R']) {
-				$this->Line($x + $w, $y, $x + $w, $y + $h, $border_style['R']);
-			}
-			if (isset($border_style['B']) AND $border_style['B']) {
-				$this->Line($x, $y + $h, $x + $w, $y + $h, $border_style['B']);
-			}
-		}
-	}
-
-	/**
-	 * Draws a Bezier curve.
-	 * The Bezier curve is a tangent to the line between the control points at
-	 * either end of the curve.
-	 * @param $x0 (float) Abscissa of start point.
-	 * @param $y0 (float) Ordinate of start point.
-	 * @param $x1 (float) Abscissa of control point 1.
-	 * @param $y1 (float) Ordinate of control point 1.
-	 * @param $x2 (float) Abscissa of control point 2.
-	 * @param $y2 (float) Ordinate of control point 2.
-	 * @param $x3 (float) Abscissa of end point.
-	 * @param $y3 (float) Ordinate of end point.
-	 * @param $style (string) Style of rendering. See the getPathPaintOperator() function for more information.
-	 * @param $line_style (array) Line style of curve. Array like for SetLineStyle(). Default value: default line style (empty array).
-	 * @param $fill_color (array) Fill color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K) or array(C,M,Y,K,SpotColorName). Default value: default color (empty array).
-	 * @public
-	 * @see SetLineStyle()
-	 * @since 2.1.000 (2008-01-08)
-	 */
-	public function Curve($x0, $y0, $x1, $y1, $x2, $y2, $x3, $y3, $style='', $line_style=array(), $fill_color=array()) {
-		if ($this->state != 2) {
-			return;
-		}
-		if (!(false === strpos($style, 'F')) AND isset($fill_color)) {
-			$this->SetFillColorArray($fill_color);
-		}
-		$op = TCPDF_STATIC::getPathPaintOperator($style);
-		if ($line_style) {
-			$this->SetLineStyle($line_style);
-		}
-		$this->_outPoint($x0, $y0);
-		$this->_outCurve($x1, $y1, $x2, $y2, $x3, $y3);
-		$this->_out($op);
-	}
-
-	/**
-	 * Draws a poly-Bezier curve.
-	 * Each Bezier curve segment is a tangent to the line between the control points at
-	 * either end of the curve.
-	 * @param $x0 (float) Abscissa of start point.
-	 * @param $y0 (float) Ordinate of start point.
-	 * @param $segments (float) An array of bezier descriptions. Format: array(x1, y1, x2, y2, x3, y3).
-	 * @param $style (string) Style of rendering. See the getPathPaintOperator() function for more information.
-	 * @param $line_style (array) Line style of curve. Array like for SetLineStyle(). Default value: default line style (empty array).
-	 * @param $fill_color (array) Fill color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K) or array(C,M,Y,K,SpotColorName). Default value: default color (empty array).
-	 * @public
-	 * @see SetLineStyle()
-	 * @since 3.0008 (2008-05-12)
-	 */
-	public function Polycurve($x0, $y0, $segments, $style='', $line_style=array(), $fill_color=array()) {
-		if ($this->state != 2) {
-			return;
-		}
-		if (!(false === strpos($style, 'F')) AND isset($fill_color)) {
-			$this->SetFillColorArray($fill_color);
-		}
-		$op = TCPDF_STATIC::getPathPaintOperator($style);
-		if ($op == 'f') {
-			$line_style = array();
-		}
-		if ($line_style) {
-			$this->SetLineStyle($line_style);
-		}
-		$this->_outPoint($x0, $y0);
-		foreach ($segments as $segment) {
-			list($x1, $y1, $x2, $y2, $x3, $y3) = $segment;
-			$this->_outCurve($x1, $y1, $x2, $y2, $x3, $y3);
-		}
-		$this->_out($op);
-	}
-
-	/**
-	 * Draws an ellipse.
-	 * An ellipse is formed from n Bezier curves.
-	 * @param $x0 (float) Abscissa of center point.
-	 * @param $y0 (float) Ordinate of center point.
-	 * @param $rx (float) Horizontal radius.
-	 * @param $ry (float) Vertical radius (if ry = 0 then is a circle, see Circle()). Default value: 0.
-	 * @param $angle: (float) Angle oriented (anti-clockwise). Default value: 0.
-	 * @param $astart: (float) Angle start of draw line. Default value: 0.
-	 * @param $afinish: (float) Angle finish of draw line. Default value: 360.
-	 * @param $style (string) Style of rendering. See the getPathPaintOperator() function for more information.
-	 * @param $line_style (array) Line style of ellipse. Array like for SetLineStyle(). Default value: default line style (empty array).
-	 * @param $fill_color (array) Fill color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K) or array(C,M,Y,K,SpotColorName). Default value: default color (empty array).
-	 * @param $nc (integer) Number of curves used to draw a 90 degrees portion of ellipse.
-	 * @author Nicola Asuni
-	 * @public
-	 * @since 2.1.000 (2008-01-08)
-	 */
-	public function Ellipse($x0, $y0, $rx, $ry='', $angle=0, $astart=0, $afinish=360, $style='', $line_style=array(), $fill_color=array(), $nc=2) {
-		if ($this->state != 2) {
-			return;
-		}
-		if (TCPDF_STATIC::empty_string($ry) OR ($ry == 0)) {
-			$ry = $rx;
-		}
-		if (!(false === strpos($style, 'F')) AND isset($fill_color)) {
-			$this->SetFillColorArray($fill_color);
-		}
-		$op = TCPDF_STATIC::getPathPaintOperator($style);
-		if ($op == 'f') {
-			$line_style = array();
-		}
-		if ($line_style) {
-			$this->SetLineStyle($line_style);
-		}
-		$this->_outellipticalarc($x0, $y0, $rx, $ry, $angle, $astart, $afinish, false, $nc, true, true, false);
-		$this->_out($op);
-	}
-
-	/**
-	 * Append an elliptical arc to the current path.
-	 * An ellipse is formed from n Bezier curves.
-	 * @param $xc (float) Abscissa of center point.
-	 * @param $yc (float) Ordinate of center point.
-	 * @param $rx (float) Horizontal radius.
-	 * @param $ry (float) Vertical radius (if ry = 0 then is a circle, see Circle()). Default value: 0.
-	 * @param $xang: (float) Angle between the X-axis and the major axis of the ellipse. Default value: 0.
-	 * @param $angs: (float) Angle start of draw line. Default value: 0.
-	 * @param $angf: (float) Angle finish of draw line. Default value: 360.
-	 * @param $pie (boolean) if true do not mark the border point (used to draw pie sectors).
-	 * @param $nc (integer) Number of curves used to draw a 90 degrees portion of ellipse.
-	 * @param $startpoint (boolean) if true output a starting point.
-	 * @param $ccw (boolean) if true draws in counter-clockwise.
-	 * @param $svg (boolean) if true the angles are in svg mode (already calculated).
-	 * @return array bounding box coordinates (x min, y min, x max, y max)
-	 * @author Nicola Asuni
-	 * @protected
-	 * @since 4.9.019 (2010-04-26)
-	 */
-	protected function _outellipticalarc($xc, $yc, $rx, $ry, $xang=0, $angs=0, $angf=360, $pie=false, $nc=2, $startpoint=true, $ccw=true, $svg=false) {
-		if (($rx <= 0) OR ($ry < 0)) {
-			return;
-		}
-		$k = $this->k;
-		if ($nc < 2) {
-			$nc = 2;
-		}
-		$xmin = 2147483647;
-		$ymin = 2147483647;
-		$xmax = 0;
-		$ymax = 0;
-		if ($pie) {
-			// center of the arc
-			$this->_outPoint($xc, $yc);
-		}
-		$xang = deg2rad((float) $xang);
-		$angs = deg2rad((float) $angs);
-		$angf = deg2rad((float) $angf);
-		if ($svg) {
-			$as = $angs;
-			$af = $angf;
-		} else {
-			$as = atan2((sin($angs) / $ry), (cos($angs) / $rx));
-			$af = atan2((sin($angf) / $ry), (cos($angf) / $rx));
-		}
-		if ($as < 0) {
-			$as += (2 * M_PI);
-		}
-		if ($af < 0) {
-			$af += (2 * M_PI);
-		}
-		if ($ccw AND ($as > $af)) {
-			// reverse rotation
-			$as -= (2 * M_PI);
-		} elseif (!$ccw AND ($as < $af)) {
-			// reverse rotation
-			$af -= (2 * M_PI);
-		}
-		$total_angle = ($af - $as);
-		if ($nc < 2) {
-			$nc = 2;
-		}
-		// total arcs to draw
-		$nc *= (2 * abs($total_angle) / M_PI);
-		$nc = round($nc) + 1;
-		// angle of each arc
-		$arcang = ($total_angle / $nc);
-		// center point in PDF coordinates
-		$x0 = $xc;
-		$y0 = ($this->h - $yc);
-		// starting angle
-		$ang = $as;
-		$alpha = sin($arcang) * ((sqrt(4 + (3 * pow(tan(($arcang) / 2), 2))) - 1) / 3);
-		$cos_xang = cos($xang);
-		$sin_xang = sin($xang);
-		$cos_ang = cos($ang);
-		$sin_ang = sin($ang);
-		// first arc point
-		$px1 = $x0 + ($rx * $cos_xang * $cos_ang) - ($ry * $sin_xang * $sin_ang);
-		$py1 = $y0 + ($rx * $sin_xang * $cos_ang) + ($ry * $cos_xang * $sin_ang);
-		// first Bezier control point
-		$qx1 = ($alpha * ((-$rx * $cos_xang * $sin_ang) - ($ry * $sin_xang * $cos_ang)));
-		$qy1 = ($alpha * ((-$rx * $sin_xang * $sin_ang) + ($ry * $cos_xang * $cos_ang)));
-		if ($pie) {
-			// line from center to arc starting point
-			$this->_outLine($px1, $this->h - $py1);
-		} elseif ($startpoint) {
-			// arc starting point
-			$this->_outPoint($px1, $this->h - $py1);
-		}
-		// draw arcs
-		for ($i = 1; $i <= $nc; ++$i) {
-			// starting angle
-			$ang = $as + ($i * $arcang);
-			if ($i == $nc) {
-				$ang = $af;
-			}
-			$cos_ang = cos($ang);
-			$sin_ang = sin($ang);
-			// second arc point
-			$px2 = $x0 + ($rx * $cos_xang * $cos_ang) - ($ry * $sin_xang * $sin_ang);
-			$py2 = $y0 + ($rx * $sin_xang * $cos_ang) + ($ry * $cos_xang * $sin_ang);
-			// second Bezier control point
-			$qx2 = ($alpha * ((-$rx * $cos_xang * $sin_ang) - ($ry * $sin_xang * $cos_ang)));
-			$qy2 = ($alpha * ((-$rx * $sin_xang * $sin_ang) + ($ry * $cos_xang * $cos_ang)));
-			// draw arc
-			$cx1 = ($px1 + $qx1);
-			$cy1 = ($this->h - ($py1 + $qy1));
-			$cx2 = ($px2 - $qx2);
-			$cy2 = ($this->h - ($py2 - $qy2));
-			$cx3 = $px2;
-			$cy3 = ($this->h - $py2);
-			$this->_outCurve($cx1, $cy1, $cx2, $cy2, $cx3, $cy3);
-			// get bounding box coordinates
-			$xmin = min($xmin, $cx1, $cx2, $cx3);
-			$ymin = min($ymin, $cy1, $cy2, $cy3);
-			$xmax = max($xmax, $cx1, $cx2, $cx3);
-			$ymax = max($ymax, $cy1, $cy2, $cy3);
-			// move to next point
-			$px1 = $px2;
-			$py1 = $py2;
-			$qx1 = $qx2;
-			$qy1 = $qy2;
-		}
-		if ($pie) {
-			$this->_outLine($xc, $yc);
-			// get bounding box coordinates
-			$xmin = min($xmin, $xc);
-			$ymin = min($ymin, $yc);
-			$xmax = max($xmax, $xc);
-			$ymax = max($ymax, $yc);
-		}
-		return array($xmin, $ymin, $xmax, $ymax);
-	}
-
-	/**
-	 * Draws a circle.
-	 * A circle is formed from n Bezier curves.
-	 * @param $x0 (float) Abscissa of center point.
-	 * @param $y0 (float) Ordinate of center point.
-	 * @param $r (float) Radius.
-	 * @param $angstr: (float) Angle start of draw line. Default value: 0.
-	 * @param $angend: (float) Angle finish of draw line. Default value: 360.
-	 * @param $style (string) Style of rendering. See the getPathPaintOperator() function for more information.
-	 * @param $line_style (array) Line style of circle. Array like for SetLineStyle(). Default value: default line style (empty array).
-	 * @param $fill_color (array) Fill color. Format: array(red, green, blue). Default value: default color (empty array).
-	 * @param $nc (integer) Number of curves used to draw a 90 degrees portion of circle.
-	 * @public
-	 * @since 2.1.000 (2008-01-08)
-	 */
-	public function Circle($x0, $y0, $r, $angstr=0, $angend=360, $style='', $line_style=array(), $fill_color=array(), $nc=2) {
-		$this->Ellipse($x0, $y0, $r, $r, 0, $angstr, $angend, $style, $line_style, $fill_color, $nc);
-	}
-
-	/**
-	 * Draws a polygonal line
-	 * @param $p (array) Points 0 to ($np - 1). Array with values (x0, y0, x1, y1,..., x(np-1), y(np - 1))
-	 * @param $style (string) Style of rendering. See the getPathPaintOperator() function for more information.
-	 * @param $line_style (array) Line style of polygon. Array with keys among the following:
-	 * <ul>
-	 *	 <li>all: Line style of all lines. Array like for SetLineStyle().</li>
-	 *	 <li>0 to ($np - 1): Line style of each line. Array like for SetLineStyle().</li>
-	 * </ul>
-	 * If a key is not present or is null, not draws the line. Default value is default line style (empty array).
-	 * @param $fill_color (array) Fill color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K) or array(C,M,Y,K,SpotColorName). Default value: default color (empty array).
-	 * @since 4.8.003 (2009-09-15)
-	 * @public
-	 */
-	public function PolyLine($p, $style='', $line_style=array(), $fill_color=array()) {
-		$this->Polygon($p, $style, $line_style, $fill_color, false);
-	}
-
-	/**
-	 * Draws a polygon.
-	 * @param $p (array) Points 0 to ($np - 1). Array with values (x0, y0, x1, y1,..., x(np-1), y(np - 1))
-	 * @param $style (string) Style of rendering. See the getPathPaintOperator() function for more information.
-	 * @param $line_style (array) Line style of polygon. Array with keys among the following:
-	 * <ul>
-	 *	 <li>all: Line style of all lines. Array like for SetLineStyle().</li>
-	 *	 <li>0 to ($np - 1): Line style of each line. Array like for SetLineStyle().</li>
-	 * </ul>
-	 * If a key is not present or is null, not draws the line. Default value is default line style (empty array).
-	 * @param $fill_color (array) Fill color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K) or array(C,M,Y,K,SpotColorName). Default value: default color (empty array).
-	 * @param $closed (boolean) if true the polygon is closes, otherwise will remain open
-	 * @public
-	 * @since 2.1.000 (2008-01-08)
-	 */
-	public function Polygon($p, $style='', $line_style=array(), $fill_color=array(), $closed=true) {
-		if ($this->state != 2) {
-			return;
-		}
-		$nc = count($p); // number of coordinates
-		$np = $nc / 2; // number of points
-		if ($closed) {
-			// close polygon by adding the first 2 points at the end (one line)
-			for ($i = 0; $i < 4; ++$i) {
-				$p[$nc + $i] = $p[$i];
-			}
-			// copy style for the last added line
-			if (isset($line_style[0])) {
-				$line_style[$np] = $line_style[0];
-			}
-			$nc += 4;
-		}
-		if (!(false === strpos($style, 'F')) AND isset($fill_color)) {
-			$this->SetFillColorArray($fill_color);
-		}
-		$op = TCPDF_STATIC::getPathPaintOperator($style);
-		if ($op == 'f') {
-			$line_style = array();
-		}
-		$draw = true;
-		if ($line_style) {
-			if (isset($line_style['all'])) {
-				$this->SetLineStyle($line_style['all']);
-			} else {
-				$draw = false;
-				if ($op == 'B') {
-					// draw fill
-					$op = 'f';
-					$this->_outPoint($p[0], $p[1]);
-					for ($i = 2; $i < $nc; $i = $i + 2) {
-						$this->_outLine($p[$i], $p[$i + 1]);
-					}
-					$this->_out($op);
-				}
-				// draw outline
-				$this->_outPoint($p[0], $p[1]);
-				for ($i = 2; $i < $nc; $i = $i + 2) {
-					$line_num = ($i / 2) - 1;
-					if (isset($line_style[$line_num])) {
-						if ($line_style[$line_num] != 0) {
-							if (is_array($line_style[$line_num])) {
-								$this->_out('S');
-								$this->SetLineStyle($line_style[$line_num]);
-								$this->_outPoint($p[$i - 2], $p[$i - 1]);
-								$this->_outLine($p[$i], $p[$i + 1]);
-								$this->_out('S');
-								$this->_outPoint($p[$i], $p[$i + 1]);
-							} else {
-								$this->_outLine($p[$i], $p[$i + 1]);
-							}
-						}
-					} else {
-						$this->_outLine($p[$i], $p[$i + 1]);
-					}
-				}
-				$this->_out($op);
-			}
-		}
-		if ($draw) {
-			$this->_outPoint($p[0], $p[1]);
-			for ($i = 2; $i < $nc; $i = $i + 2) {
-				$this->_outLine($p[$i], $p[$i + 1]);
-			}
-			$this->_out($op);
-		}
-	}
-
-	/**
-	 * Draws a regular polygon.
-	 * @param $x0 (float) Abscissa of center point.
-	 * @param $y0 (float) Ordinate of center point.
-	 * @param $r: (float) Radius of inscribed circle.
-	 * @param $ns (integer) Number of sides.
-	 * @param $angle (float) Angle oriented (anti-clockwise). Default value: 0.
-	 * @param $draw_circle (boolean) Draw inscribed circle or not. Default value: false.
-	 * @param $style (string) Style of rendering. See the getPathPaintOperator() function for more information.
-	 * @param $line_style (array) Line style of polygon sides. Array with keys among the following:
-	 * <ul>
-	 *	 <li>all: Line style of all sides. Array like for SetLineStyle().</li>
-	 *	 <li>0 to ($ns - 1): Line style of each side. Array like for SetLineStyle().</li>
-	 * </ul>
-	 * If a key is not present or is null, not draws the side. Default value is default line style (empty array).
-	 * @param $fill_color (array) Fill color. Format: array(red, green, blue). Default value: default color (empty array).
-	 * @param $circle_style (string) Style of rendering of inscribed circle (if draws). Possible values are:
-	 * <ul>
-	 *	 <li>D or empty string: Draw (default).</li>
-	 *	 <li>F: Fill.</li>
-	 *	 <li>DF or FD: Draw and fill.</li>
-	 *	 <li>CNZ: Clipping mode (using the even-odd rule to determine which regions lie inside the clipping path).</li>
-	 *	 <li>CEO: Clipping mode (using the nonzero winding number rule to determine which regions lie inside the clipping path).</li>
-	 * </ul>
-	 * @param $circle_outLine_style (array) Line style of inscribed circle (if draws). Array like for SetLineStyle(). Default value: default line style (empty array).
-	 * @param $circle_fill_color (array) Fill color of inscribed circle (if draws). Format: array(red, green, blue). Default value: default color (empty array).
-	 * @public
-	 * @since 2.1.000 (2008-01-08)
-	 */
-	public function RegularPolygon($x0, $y0, $r, $ns, $angle=0, $draw_circle=false, $style='', $line_style=array(), $fill_color=array(), $circle_style='', $circle_outLine_style=array(), $circle_fill_color=array()) {
-		if (3 > $ns) {
-			$ns = 3;
-		}
-		if ($draw_circle) {
-			$this->Circle($x0, $y0, $r, 0, 360, $circle_style, $circle_outLine_style, $circle_fill_color);
-		}
-		$p = array();
-		for ($i = 0; $i < $ns; ++$i) {
-			$a = $angle + ($i * 360 / $ns);
-			$a_rad = deg2rad((float) $a);
-			$p[] = $x0 + ($r * sin($a_rad));
-			$p[] = $y0 + ($r * cos($a_rad));
-		}
-		$this->Polygon($p, $style, $line_style, $fill_color);
-	}
-
-	/**
-	 * Draws a star polygon
-	 * @param $x0 (float) Abscissa of center point.
-	 * @param $y0 (float) Ordinate of center point.
-	 * @param $r (float) Radius of inscribed circle.
-	 * @param $nv (integer) Number of vertices.
-	 * @param $ng (integer) Number of gap (if ($ng % $nv = 1) then is a regular polygon).
-	 * @param $angle: (float) Angle oriented (anti-clockwise). Default value: 0.
-	 * @param $draw_circle: (boolean) Draw inscribed circle or not. Default value is false.
-	 * @param $style (string) Style of rendering. See the getPathPaintOperator() function for more information.
-	 * @param $line_style (array) Line style of polygon sides. Array with keys among the following:
-	 * <ul>
-	 *	 <li>all: Line style of all sides. Array like for
-	 * SetLineStyle().</li>
-	 *	 <li>0 to (n - 1): Line style of each side. Array like for SetLineStyle().</li>
-	 * </ul>
-	 * If a key is not present or is null, not draws the side. Default value is default line style (empty array).
-	 * @param $fill_color (array) Fill color. Format: array(red, green, blue). Default value: default color (empty array).
-	 * @param $circle_style (string) Style of rendering of inscribed circle (if draws). Possible values are:
-	 * <ul>
-	 *	 <li>D or empty string: Draw (default).</li>
-	 *	 <li>F: Fill.</li>
-	 *	 <li>DF or FD: Draw and fill.</li>
-	 *	 <li>CNZ: Clipping mode (using the even-odd rule to determine which regions lie inside the clipping path).</li>
-	 *	 <li>CEO: Clipping mode (using the nonzero winding number rule to determine which regions lie inside the clipping path).</li>
-	 * </ul>
-	 * @param $circle_outLine_style (array) Line style of inscribed circle (if draws). Array like for SetLineStyle(). Default value: default line style (empty array).
-	 * @param $circle_fill_color (array) Fill color of inscribed circle (if draws). Format: array(red, green, blue). Default value: default color (empty array).
-	 * @public
-	 * @since 2.1.000 (2008-01-08)
-	 */
-	public function StarPolygon($x0, $y0, $r, $nv, $ng, $angle=0, $draw_circle=false, $style='', $line_style=array(), $fill_color=array(), $circle_style='', $circle_outLine_style=array(), $circle_fill_color=array()) {
-		if ($nv < 2) {
-			$nv = 2;
-		}
-		if ($draw_circle) {
-			$this->Circle($x0, $y0, $r, 0, 360, $circle_style, $circle_outLine_style, $circle_fill_color);
-		}
-		$p2 = array();
-		$visited = array();
-		for ($i = 0; $i < $nv; ++$i) {
-			$a = $angle + ($i * 360 / $nv);
-			$a_rad = deg2rad((float) $a);
-			$p2[] = $x0 + ($r * sin($a_rad));
-			$p2[] = $y0 + ($r * cos($a_rad));
-			$visited[] = false;
-		}
-		$p = array();
-		$i = 0;
-		do {
-			$p[] = $p2[$i * 2];
-			$p[] = $p2[($i * 2) + 1];
-			$visited[$i] = true;
-			$i += $ng;
-			$i %= $nv;
-		} while (!$visited[$i]);
-		$this->Polygon($p, $style, $line_style, $fill_color);
-	}
-
-	/**
-	 * Draws a rounded rectangle.
-	 * @param $x (float) Abscissa of upper-left corner.
-	 * @param $y (float) Ordinate of upper-left corner.
-	 * @param $w (float) Width.
-	 * @param $h (float) Height.
-	 * @param $r (float) the radius of the circle used to round off the corners of the rectangle.
-	 * @param $round_corner (string) Draws rounded corner or not. String with a 0 (not rounded i-corner) or 1 (rounded i-corner) in i-position. Positions are, in order and begin to 0: top right, bottom right, bottom left and top left. Default value: all rounded corner ("1111").
-	 * @param $style (string) Style of rendering. See the getPathPaintOperator() function for more information.
-	 * @param $border_style (array) Border style of rectangle. Array like for SetLineStyle(). Default value: default line style (empty array).
-	 * @param $fill_color (array) Fill color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K) or array(C,M,Y,K,SpotColorName). Default value: default color (empty array).
-	 * @public
-	 * @since 2.1.000 (2008-01-08)
-	 */
-	public function RoundedRect($x, $y, $w, $h, $r, $round_corner='1111', $style='', $border_style=array(), $fill_color=array()) {
-		$this->RoundedRectXY($x, $y, $w, $h, $r, $r, $round_corner, $style, $border_style, $fill_color);
-	}
-
-	/**
-	 * Draws a rounded rectangle.
-	 * @param $x (float) Abscissa of upper-left corner.
-	 * @param $y (float) Ordinate of upper-left corner.
-	 * @param $w (float) Width.
-	 * @param $h (float) Height.
-	 * @param $rx (float) the x-axis radius of the ellipse used to round off the corners of the rectangle.
-	 * @param $ry (float) the y-axis radius of the ellipse used to round off the corners of the rectangle.
-	 * @param $round_corner (string) Draws rounded corner or not. String with a 0 (not rounded i-corner) or 1 (rounded i-corner) in i-position. Positions are, in order and begin to 0: top right, bottom right, bottom left and top left. Default value: all rounded corner ("1111").
-	 * @param $style (string) Style of rendering. See the getPathPaintOperator() function for more information.
-	 * @param $border_style (array) Border style of rectangle. Array like for SetLineStyle(). Default value: default line style (empty array).
-	 * @param $fill_color (array) Fill color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K) or array(C,M,Y,K,SpotColorName). Default value: default color (empty array).
-	 * @public
-	 * @since 4.9.019 (2010-04-22)
-	 */
-	public function RoundedRectXY($x, $y, $w, $h, $rx, $ry, $round_corner='1111', $style='', $border_style=array(), $fill_color=array()) {
-		if ($this->state != 2) {
-			return;
-		}
-		if (($round_corner == '0000') OR (($rx == $ry) AND ($rx == 0))) {
-			// Not rounded
-			$this->Rect($x, $y, $w, $h, $style, $border_style, $fill_color);
-			return;
-		}
-		// Rounded
-		if (!(false === strpos($style, 'F')) AND isset($fill_color)) {
-			$this->SetFillColorArray($fill_color);
-		}
-		$op = TCPDF_STATIC::getPathPaintOperator($style);
-		if ($op == 'f') {
-			$border_style = array();
-		}
-		if ($border_style) {
-			$this->SetLineStyle($border_style);
-		}
-		$MyArc = 4 / 3 * (sqrt(2) - 1);
-		$this->_outPoint($x + $rx, $y);
-		$xc = $x + $w - $rx;
-		$yc = $y + $ry;
-		$this->_outLine($xc, $y);
-		if ($round_corner[0]) {
-			$this->_outCurve($xc + ($rx * $MyArc), $yc - $ry, $xc + $rx, $yc - ($ry * $MyArc), $xc + $rx, $yc);
-		} else {
-			$this->_outLine($x + $w, $y);
-		}
-		$xc = $x + $w - $rx;
-		$yc = $y + $h - $ry;
-		$this->_outLine($x + $w, $yc);
-		if ($round_corner[1]) {
-			$this->_outCurve($xc + $rx, $yc + ($ry * $MyArc), $xc + ($rx * $MyArc), $yc + $ry, $xc, $yc + $ry);
-		} else {
-			$this->_outLine($x + $w, $y + $h);
-		}
-		$xc = $x + $rx;
-		$yc = $y + $h - $ry;
-		$this->_outLine($xc, $y + $h);
-		if ($round_corner[2]) {
-			$this->_outCurve($xc - ($rx * $MyArc), $yc + $ry, $xc - $rx, $yc + ($ry * $MyArc), $xc - $rx, $yc);
-		} else {
-			$this->_outLine($x, $y + $h);
-		}
-		$xc = $x + $rx;
-		$yc = $y + $ry;
-		$this->_outLine($x, $yc);
-		if ($round_corner[3]) {
-			$this->_outCurve($xc - $rx, $yc - ($ry * $MyArc), $xc - ($rx * $MyArc), $yc - $ry, $xc, $yc - $ry);
-		} else {
-			$this->_outLine($x, $y);
-			$this->_outLine($x + $rx, $y);
-		}
-		$this->_out($op);
-	}
-
-	/**
-	 * Draws a grahic arrow.
-	 * @param $x0 (float) Abscissa of first point.
-	 * @param $y0 (float) Ordinate of first point.
-	 * @param $x1 (float) Abscissa of second point.
-	 * @param $y1 (float) Ordinate of second point.
-	 * @param $head_style (int) (0 = draw only arrowhead arms, 1 = draw closed arrowhead, but no fill, 2 = closed and filled arrowhead, 3 = filled arrowhead)
-	 * @param $arm_size (float) length of arrowhead arms
-	 * @param $arm_angle (int) angle between an arm and the shaft
-	 * @author Piotr Galecki, Nicola Asuni, Andy Meier
-	 * @since 4.6.018 (2009-07-10)
-	 */
-	public function Arrow($x0, $y0, $x1, $y1, $head_style=0, $arm_size=5, $arm_angle=15) {
-		// getting arrow direction angle
-		// 0 deg angle is when both arms go along X axis. angle grows clockwise.
-		$dir_angle = atan2(($y0 - $y1), ($x0 - $x1));
-		if ($dir_angle < 0) {
-			$dir_angle += (2 * M_PI);
-		}
-		$arm_angle = deg2rad($arm_angle);
-		$sx1 = $x1;
-		$sy1 = $y1;
-		if ($head_style > 0) {
-			// calculate the stopping point for the arrow shaft
-			$sx1 = $x1 + (($arm_size - $this->LineWidth) * cos($dir_angle));
-			$sy1 = $y1 + (($arm_size - $this->LineWidth) * sin($dir_angle));
-		}
-		// main arrow line / shaft
-		$this->Line($x0, $y0, $sx1, $sy1);
-		// left arrowhead arm tip
-		$x2L = $x1 + ($arm_size * cos($dir_angle + $arm_angle));
-		$y2L = $y1 + ($arm_size * sin($dir_angle + $arm_angle));
-		// right arrowhead arm tip
-		$x2R = $x1 + ($arm_size * cos($dir_angle - $arm_angle));
-		$y2R = $y1 + ($arm_size * sin($dir_angle - $arm_angle));
-		$mode = 'D';
-		$style = array();
-		switch ($head_style) {
-			case 0: {
-				// draw only arrowhead arms
-				$mode = 'D';
-				$style = array(1, 1, 0);
-				break;
-			}
-			case 1: {
-				// draw closed arrowhead, but no fill
-				$mode = 'D';
-				break;
-			}
-			case 2: {
-				// closed and filled arrowhead
-				$mode = 'DF';
-				break;
-			}
-			case 3: {
-				// filled arrowhead
-				$mode = 'F';
-				break;
-			}
-		}
-		$this->Polygon(array($x2L, $y2L, $x1, $y1, $x2R, $y2R), $mode, $style, array());
-	}
-
-	// END GRAPHIC FUNCTIONS SECTION -----------------------
-
-	/**
-	 * Add a Named Destination.
-	 * NOTE: destination names are unique, so only last entry will be saved.
-	 * @param $name (string) Destination name.
-	 * @param $y (float) Y position in user units of the destiantion on the selected page (default = -1 = current position; 0 = page start;).
-	 * @param $page (int|string) Target page number (leave empty for current page). If you prefix a page number with the * character, then this page will not be changed when adding/deleting/moving pages.
-	 * @param $x (float) X position in user units of the destiantion on the selected page (default = -1 = current position;).
-	 * @return (string) Stripped named destination identifier or false in case of error.
-	 * @public
-	 * @author Christian Deligant, Nicola Asuni
-	 * @since 5.9.097 (2011-06-23)
-	 */
-	public function setDestination($name, $y=-1, $page='', $x=-1) {
-		// remove unsupported characters
-		$name = TCPDF_STATIC::encodeNameObject($name);
-		if (TCPDF_STATIC::empty_string($name)) {
-			return false;
-		}
-		if ($y == -1) {
-			$y = $this->GetY();
-		} elseif ($y < 0) {
-			$y = 0;
-		} elseif ($y > $this->h) {
-			$y = $this->h;
-		}
-		if ($x == -1) {
-			$x = $this->GetX();
-		} elseif ($x < 0) {
-			$x = 0;
-		} elseif ($x > $this->w) {
-			$x = $this->w;
-		}
-		$fixed = false;
-		if (!empty($page) AND ($page[0] == '*')) {
-			$page = intval(substr($page, 1));
-			// this page number will not be changed when moving/add/deleting pages
-			$fixed = true;
-		}
-		if (empty($page)) {
-			$page = $this->PageNo();
-			if (empty($page)) {
-				return;
-			}
-		}
-		$this->dests[$name] = array('x' => $x, 'y' => $y, 'p' => $page, 'f' => $fixed);
-		return $name;
-	}
-
-	/**
-	 * Return the Named Destination array.
-	 * @return (array) Named Destination array.
-	 * @public
-	 * @author Nicola Asuni
-	 * @since 5.9.097 (2011-06-23)
-	 */
-	public function getDestination() {
-		return $this->dests;
-	}
-
-	/**
-	 * Insert Named Destinations.
-	 * @protected
-	 * @author Johannes G\FCntert, Nicola Asuni
-	 * @since 5.9.098 (2011-06-23)
-	 */
-	protected function _putdests() {
-		if (empty($this->dests)) {
-			return;
-		}
-		$this->n_dests = $this->_newobj();
-		$out = ' <<';
-		foreach($this->dests as $name => $o) {
-			$out .= ' /'.$name.' '.sprintf('[%u 0 R /XYZ %F %F null]', $this->page_obj_id[($o['p'])], ($o['x'] * $this->k), ($this->pagedim[$o['p']]['h'] - ($o['y'] * $this->k)));
-		}
-		$out .= ' >>';
-		$out .= "\n".'endobj';
-		$this->_out($out);
-	}
-
-	/**
-	 * Adds a bookmark - alias for Bookmark().
-	 * @param $txt (string) Bookmark description.
-	 * @param $level (int) Bookmark level (minimum value is 0).
-	 * @param $y (float) Y position in user units of the bookmark on the selected page (default = -1 = current position; 0 = page start;).
-	 * @param $page (int|string) Target page number (leave empty for current page). If you prefix a page number with the * character, then this page will not be changed when adding/deleting/moving pages.
-	 * @param $style (string) Font style: B = Bold, I = Italic, BI = Bold + Italic.
-	 * @param $color (array) RGB color array (values from 0 to 255).
-	 * @param $x (float) X position in user units of the bookmark on the selected page (default = -1 = current position;).
-	 * @param $link (mixed) URL, or numerical link ID, or named destination (# character followed by the destination name), or embedded file (* character followed by the file name).
-	 * @public
-	 */
-	public function setBookmark($txt, $level=0, $y=-1, $page='', $style='', $color=array(0,0,0), $x=-1, $link='') {
-		$this->Bookmark($txt, $level, $y, $page, $style, $color, $x, $link);
-	}
-
-	/**
-	 * Adds a bookmark.
-	 * @param $txt (string) Bookmark description.
-	 * @param $level (int) Bookmark level (minimum value is 0).
-	 * @param $y (float) Y position in user units of the bookmark on the selected page (default = -1 = current position; 0 = page start;).
-	 * @param $page (int|string) Target page number (leave empty for current page). If you prefix a page number with the * character, then this page will not be changed when adding/deleting/moving pages.
-	 * @param $style (string) Font style: B = Bold, I = Italic, BI = Bold + Italic.
-	 * @param $color (array) RGB color array (values from 0 to 255).
-	 * @param $x (float) X position in user units of the bookmark on the selected page (default = -1 = current position;).
-	 * @param $link (mixed) URL, or numerical link ID, or named destination (# character followed by the destination name), or embedded file (* character followed by the file name).
-	 * @public
-	 * @since 2.1.002 (2008-02-12)
-	 */
-	public function Bookmark($txt, $level=0, $y=-1, $page='', $style='', $color=array(0,0,0), $x=-1, $link='') {
-		if ($level < 0) {
-			$level = 0;
-		}
-		if (isset($this->outlines[0])) {
-			$lastoutline = end($this->outlines);
-			$maxlevel = $lastoutline['l'] + 1;
-		} else {
-			$maxlevel = 0;
-		}
-		if ($level > $maxlevel) {
-			$level = $maxlevel;
-		}
-		if ($y == -1) {
-			$y = $this->GetY();
-		} elseif ($y < 0) {
-			$y = 0;
-		} elseif ($y > $this->h) {
-			$y = $this->h;
-		}
-		if ($x == -1) {
-			$x = $this->GetX();
-		} elseif ($x < 0) {
-			$x = 0;
-		} elseif ($x > $this->w) {
-			$x = $this->w;
-		}
-		$fixed = false;
-		if (!empty($page) AND ($page[0] == '*')) {
-			$page = intval(substr($page, 1));
-			// this page number will not be changed when moving/add/deleting pages
-			$fixed = true;
-		}
-		if (empty($page)) {
-			$page = $this->PageNo();
-			if (empty($page)) {
-				return;
-			}
-		}
-		$this->outlines[] = array('t' => $txt, 'l' => $level, 'x' => $x, 'y' => $y, 'p' => $page, 'f' => $fixed, 's' => strtoupper($style), 'c' => $color, 'u' => $link);
-	}
-
-	/**
-	 * Sort bookmarks for page and key.
-	 * @protected
-	 * @since 5.9.119 (2011-09-19)
-	 */
-	protected function sortBookmarks() {
-		// get sorting columns
-		$outline_p = array();
-		$outline_y = array();
-		foreach ($this->outlines as $key => $row) {
-			$outline_p[$key] = $row['p'];
-			$outline_k[$key] = $key;
-		}
-		// sort outlines by page and original position
-		array_multisort($outline_p, SORT_NUMERIC, SORT_ASC, $outline_k, SORT_NUMERIC, SORT_ASC, $this->outlines);
-	}
-
-	/**
-	 * Create a bookmark PDF string.
-	 * @protected
-	 * @author Olivier Plathey, Nicola Asuni
-	 * @since 2.1.002 (2008-02-12)
-	 */
-	protected function _putbookmarks() {
-		$nb = count($this->outlines);
-		if ($nb == 0) {
-			return;
-		}
-		// sort bookmarks
-		$this->sortBookmarks();
-		$lru = array();
-		$level = 0;
-		foreach ($this->outlines as $i => $o) {
-			if ($o['l'] > 0) {
-				$parent = $lru[($o['l'] - 1)];
-				//Set parent and last pointers
-				$this->outlines[$i]['parent'] = $parent;
-				$this->outlines[$parent]['last'] = $i;
-				if ($o['l'] > $level) {
-					//Level increasing: set first pointer
-					$this->outlines[$parent]['first'] = $i;
-				}
-			} else {
-				$this->outlines[$i]['parent'] = $nb;
-			}
-			if (($o['l'] <= $level) AND ($i > 0)) {
-				//Set prev and next pointers
-				$prev = $lru[$o['l']];
-				$this->outlines[$prev]['next'] = $i;
-				$this->outlines[$i]['prev'] = $prev;
-			}
-			$lru[$o['l']] = $i;
-			$level = $o['l'];
-		}
-		//Outline items
-		$n = $this->n + 1;
-		$nltags = '/<br[\s]?\/>|<\/(blockquote|dd|dl|div|dt|h1|h2|h3|h4|h5|h6|hr|li|ol|p|pre|ul|tcpdf|table|tr|td)>/si';
-		foreach ($this->outlines as $i => $o) {
-			$oid = $this->_newobj();
-			// covert HTML title to string
-			$title = preg_replace($nltags, "\n", $o['t']);
-			$title = preg_replace("/[\r]+/si", '', $title);
-			$title = preg_replace("/[\n]+/si", "\n", $title);
-			$title = strip_tags($title);
-			$title = $this->stringTrim($title);
-			$out = '<</Title '.$this->_textstring($title, $oid);
-			$out .= ' /Parent '.($n + $o['parent']).' 0 R';
-			if (isset($o['prev'])) {
-				$out .= ' /Prev '.($n + $o['prev']).' 0 R';
-			}
-			if (isset($o['next'])) {
-				$out .= ' /Next '.($n + $o['next']).' 0 R';
-			}
-			if (isset($o['first'])) {
-				$out .= ' /First '.($n + $o['first']).' 0 R';
-			}
-			if (isset($o['last'])) {
-				$out .= ' /Last '.($n + $o['last']).' 0 R';
-			}
-			if (isset($o['u']) AND !empty($o['u'])) {
-				// link
-				if (is_string($o['u'])) {
-					if ($o['u'][0] == '#') {
-						// internal destination
-						$out .= ' /Dest /'.TCPDF_STATIC::encodeNameObject(substr($o['u'], 1));
-					} elseif ($o['u'][0] == '%') {
-						// embedded PDF file
-						$filename = basename(substr($o['u'], 1));
-						$out .= ' /A <</S /GoToE /D [0 /Fit] /NewWindow true /T << /R /C /P '.($o['p'] - 1).' /A '.$this->embeddedfiles[$filename]['a'].' >> >>';
-					} elseif ($o['u'][0] == '*') {
-						// embedded generic file
-						$filename = basename(substr($o['u'], 1));
-						$jsa = 'var D=event.target.doc;var MyData=D.dataObjects;for (var i in MyData) if (MyData[i].path=="'.$filename.'") D.exportDataObject( { cName : MyData[i].name, nLaunch : 2});';
-						$out .= ' /A <</S /JavaScript /JS '.$this->_textstring($jsa, $oid).'>>';
-					} else {
-						// external URI link
-						$out .= ' /A <</S /URI /URI '.$this->_datastring($this->unhtmlentities($o['u']), $oid).'>>';
-					}
-				} elseif (isset($this->links[$o['u']])) {
-					// internal link ID
-					$l = $this->links[$o['u']];
-					if (isset($this->page_obj_id[($l['p'])])) {
-						$out .= sprintf(' /Dest [%u 0 R /XYZ 0 %F null]', $this->page_obj_id[($l['p'])], ($this->pagedim[$l['p']]['h'] - ($l['y'] * $this->k)));
-					}
-				}
-			} elseif (isset($this->page_obj_id[($o['p'])])) {
-				// link to a page
-				$out .= ' '.sprintf('/Dest [%u 0 R /XYZ %F %F null]', $this->page_obj_id[($o['p'])], ($o['x'] * $this->k), ($this->pagedim[$o['p']]['h'] - ($o['y'] * $this->k)));
-			}
-			// set font style
-			$style = 0;
-			if (!empty($o['s'])) {
-				// bold
-				if (strpos($o['s'], 'B') !== false) {
-					$style |= 2;
-				}
-				// oblique
-				if (strpos($o['s'], 'I') !== false) {
-					$style |= 1;
-				}
-			}
-			$out .= sprintf(' /F %d', $style);
-			// set bookmark color
-			if (isset($o['c']) AND is_array($o['c']) AND (count($o['c']) == 3)) {
-				$color = array_values($o['c']);
-				$out .= sprintf(' /C [%F %F %F]', ($color[0] / 255), ($color[1] / 255), ($color[2] / 255));
-			} else {
-				// black
-				$out .= ' /C [0.0 0.0 0.0]';
-			}
-			$out .= ' /Count 0'; // normally closed item
-			$out .= ' >>';
-			$out .= "\n".'endobj';
-			$this->_out($out);
-		}
-		//Outline root
-		$this->OutlineRoot = $this->_newobj();
-		$this->_out('<< /Type /Outlines /First '.$n.' 0 R /Last '.($n + $lru[0]).' 0 R >>'."\n".'endobj');
-	}
-
-	// --- JAVASCRIPT ------------------------------------------------------
-
-	/**
-	 * Adds a javascript
-	 * @param $script (string) Javascript code
-	 * @public
-	 * @author Johannes G\FCntert, Nicola Asuni
-	 * @since 2.1.002 (2008-02-12)
-	 */
-	public function IncludeJS($script) {
-		$this->javascript .= $script;
-	}
-
-	/**
-	 * Adds a javascript object and return object ID
-	 * @param $script (string) Javascript code
-	 * @param $onload (boolean) if true executes this object when opening the document
-	 * @return int internal object ID
-	 * @public
-	 * @author Nicola Asuni
-	 * @since 4.8.000 (2009-09-07)
-	 */
-	public function addJavascriptObject($script, $onload=false) {
-		if ($this->pdfa_mode) {
-			// javascript is not allowed in PDF/A mode
-			return false;
-		}
-		++$this->n;
-		$this->js_objects[$this->n] = array('n' => $this->n, 'js' => $script, 'onload' => $onload);
-		return $this->n;
-	}
-
-	/**
-	 * Create a javascript PDF string.
-	 * @protected
-	 * @author Johannes G\FCntert, Nicola Asuni
-	 * @since 2.1.002 (2008-02-12)
-	 */
-	protected function _putjavascript() {
-		if ($this->pdfa_mode OR (empty($this->javascript) AND empty($this->js_objects))) {
-			return;
-		}
-		if (strpos($this->javascript, 'this.addField') > 0) {
-			if (!$this->ur['enabled']) {
-				//$this->setUserRights();
-			}
-			// the following two lines are used to avoid form fields duplication after saving
-			// The addField method only works when releasing user rights (UR3)
-			$jsa = sprintf("ftcpdfdocsaved=this.addField('%s','%s',%d,[%F,%F,%F,%F]);", 'tcpdfdocsaved', 'text', 0, 0, 1, 0, 1);
-			$jsb = "getField('tcpdfdocsaved').value='saved';";
-			$this->javascript = $jsa."\n".$this->javascript."\n".$jsb;
-		}
-		// name tree for javascript
-		$this->n_js = '<< /Names [';
-		if (!empty($this->javascript)) {
-			$this->n_js .= ' (EmbeddedJS) '.($this->n + 1).' 0 R';
-		}
-		if (!empty($this->js_objects)) {
-			foreach ($this->js_objects as $key => $val) {
-				if ($val['onload']) {
-					$this->n_js .= ' (JS'.$key.') '.$key.' 0 R';
-				}
-			}
-		}
-		$this->n_js .= ' ] >>';
-		// default Javascript object
-		if (!empty($this->javascript)) {
-			$obj_id = $this->_newobj();
-			$out = '<< /S /JavaScript';
-			$out .= ' /JS '.$this->_textstring($this->javascript, $obj_id);
-			$out .= ' >>';
-			$out .= "\n".'endobj';
-			$this->_out($out);
-		}
-		// additional Javascript objects
-		if (!empty($this->js_objects)) {
-			foreach ($this->js_objects as $key => $val) {
-				$out = $this->_getobj($key)."\n".' << /S /JavaScript /JS '.$this->_textstring($val['js'], $key).' >>'."\n".'endobj';
-				$this->_out($out);
-			}
-		}
-	}
-
-	/**
-	 * Adds a javascript form field.
-	 * @param $type (string) field type
-	 * @param $name (string) field name
-	 * @param $x (int) horizontal position
-	 * @param $y (int) vertical position
-	 * @param $w (int) width
-	 * @param $h (int) height
-	 * @param $prop (array) javascript field properties. Possible values are described on official Javascript for Acrobat API reference.
-	 * @protected
-	 * @author Denis Van Nuffelen, Nicola Asuni
-	 * @since 2.1.002 (2008-02-12)
-	 */
-	protected function _addfield($type, $name, $x, $y, $w, $h, $prop) {
-		if ($this->rtl) {
-			$x = $x - $w;
-		}
-		// the followind avoid fields duplication after saving the document
-		$this->javascript .= "if (getField('tcpdfdocsaved').value != 'saved') {";
-		$k = $this->k;
-		$this->javascript .= sprintf("f".$name."=this.addField('%s','%s',%u,[%F,%F,%F,%F]);", $name, $type, $this->PageNo()-1, $x*$k, ($this->h-$y)*$k+1, ($x+$w)*$k, ($this->h-$y-$h)*$k+1)."\n";
-		$this->javascript .= 'f'.$name.'.textSize='.$this->FontSizePt.";\n";
-		while (list($key, $val) = each($prop)) {
-			if (strcmp(substr($key, -5), 'Color') == 0) {
-				$val = TCPDF_COLORS::_JScolor($val);
-			} else {
-				$val = "'".$val."'";
-			}
-			$this->javascript .= 'f'.$name.'.'.$key.'='.$val.";\n";
-		}
-		if ($this->rtl) {
-			$this->x -= $w;
-		} else {
-			$this->x += $w;
-		}
-		$this->javascript .= '}';
-	}
-
-	// --- FORM FIELDS -----------------------------------------------------
-
-
-
-	/**
-	 * Set default properties for form fields.
-	 * @param $prop (array) javascript field properties. Possible values are described on official Javascript for Acrobat API reference.
-	 * @public
-	 * @author Nicola Asuni
-	 * @since 4.8.000 (2009-09-06)
-	 */
-	public function setFormDefaultProp($prop=array()) {
-		$this->default_form_prop = $prop;
-	}
-
-	/**
-	 * Return the default properties for form fields.
-	 * @return array $prop javascript field properties. Possible values are described on official Javascript for Acrobat API reference.
-	 * @public
-	 * @author Nicola Asuni
-	 * @since 4.8.000 (2009-09-06)
-	 */
-	public function getFormDefaultProp() {
-		return $this->default_form_prop;
-	}
-
-	/**
-	 * Creates a text field
-	 * @param $name (string) field name
-	 * @param $w (float) Width of the rectangle
-	 * @param $h (float) Height of the rectangle
-	 * @param $prop (array) javascript field properties. Possible values are described on official Javascript for Acrobat API reference.
-	 * @param $opt (array) annotation parameters. Possible values are described on official PDF32000_2008 reference.
-	 * @param $x (float) Abscissa of the upper-left corner of the rectangle
-	 * @param $y (float) Ordinate of the upper-left corner of the rectangle
-	 * @param $js (boolean) if true put the field using JavaScript (requires Acrobat Writer to be rendered).
-	 * @public
-	 * @author Nicola Asuni
-	 * @since 4.8.000 (2009-09-07)
-	 */
-	public function TextField($name, $w, $h, $prop=array(), $opt=array(), $x='', $y='', $js=false) {
-		if ($x === '') {
-			$x = $this->x;
-		}
-		if ($y === '') {
-			$y = $this->y;
-		}
-		// check page for no-write regions and adapt page margins if necessary
-		list($x, $y) = $this->checkPageRegions($h, $x, $y);
-		if ($js) {
-			$this->_addfield('text', $name, $x, $y, $w, $h, $prop);
-			return;
-		}
-		// get default style
-		$prop = array_merge($this->getFormDefaultProp(), $prop);
-		// get annotation data
-		$popt = TCPDF_STATIC::getAnnotOptFromJSProp($prop, $this->spot_colors, $this->rtl);
-		// set default appearance stream
-		$this->annotation_fonts[$this->CurrentFont['fontkey']] = $this->CurrentFont['i'];
-		$fontstyle = sprintf('/F%d %F Tf %s', $this->CurrentFont['i'], $this->FontSizePt, $this->TextColor);
-		$popt['da'] = $fontstyle;
-		// build appearance stream
-		$popt['ap'] = array();
-		$popt['ap']['n'] = '/Tx BMC q '.$fontstyle.' ';
-		$text = '';
-		if (isset($prop['value']) AND !empty($prop['value'])) {
-			$text = $prop['value'];
-		} elseif (isset($opt['v']) AND !empty($opt['v'])) {
-			$text = $opt['v'];
-		}
-		$tmpid = $this->startTemplate($w, $h, false);
-		$align = '';
-		if (isset($popt['q'])) {
-			switch ($popt['q']) {
-				case 0: {
-					$align = 'L';
-					break;
-				}
-				case 1: {
-					$align = 'C';
-					break;
-				}
-				case 2: {
-					$align = 'R';
-					break;
-				}
-				default: {
-					$align = '';
-					break;
-				}
-			}
-		}
-		$this->MultiCell($w, $h, $text, 0, $align, false, 0, 0, 0, true, 0, false, true, 0, 'T', false);
-		$this->endTemplate();
-		--$this->n;
-		$popt['ap']['n'] .= $this->xobjects[$tmpid]['outdata'];
-		unset($this->xobjects[$tmpid]);
-		$popt['ap']['n'] .= 'Q EMC';
-		// merge options
-		$opt = array_merge($popt, $opt);
-		// remove some conflicting options
-		unset($opt['bs']);
-		// set remaining annotation data
-		$opt['Subtype'] = 'Widget';
-		$opt['ft'] = 'Tx';
-		$opt['t'] = $name;
-		// Additional annotation's parameters (check _putannotsobj() method):
-		//$opt['f']
-		//$opt['as']
-		//$opt['bs']
-		//$opt['be']
-		//$opt['c']
-		//$opt['border']
-		//$opt['h']
-		//$opt['mk'];
-		//$opt['mk']['r']
-		//$opt['mk']['bc'];
-		//$opt['mk']['bg'];
-		unset($opt['mk']['ca']);
-		unset($opt['mk']['rc']);
-		unset($opt['mk']['ac']);
-		unset($opt['mk']['i']);
-		unset($opt['mk']['ri']);
-		unset($opt['mk']['ix']);
-		unset($opt['mk']['if']);
-		//$opt['mk']['if']['sw'];
-		//$opt['mk']['if']['s'];
-		//$opt['mk']['if']['a'];
-		//$opt['mk']['if']['fb'];
-		unset($opt['mk']['tp']);
-		//$opt['tu']
-		//$opt['tm']
-		//$opt['ff']
-		//$opt['v']
-		//$opt['dv']
-		//$opt['a']
-		//$opt['aa']
-		//$opt['q']
-		$this->Annotation($x, $y, $w, $h, $name, $opt, 0);
-		if ($this->rtl) {
-			$this->x -= $w;
-		} else {
-			$this->x += $w;
-		}
-	}
-
-	/**
-	 * Creates a RadioButton field.
-	 * @param $name (string) Field name.
-	 * @param $w (int) Width of the radio button.
-	 * @param $prop (array) Javascript field properties. Possible values are described on official Javascript for Acrobat API reference.
-	 * @param $opt (array) Annotation parameters. Possible values are described on official PDF32000_2008 reference.
-	 * @param $onvalue (string) Value to be returned if selected.
-	 * @param $checked (boolean) Define the initial state.
-	 * @param $x (float) Abscissa of the upper-left corner of the rectangle
-	 * @param $y (float) Ordinate of the upper-left corner of the rectangle
-	 * @param $js (boolean) If true put the field using JavaScript (requires Acrobat Writer to be rendered).
-	 * @public
-	 * @author Nicola Asuni
-	 * @since 4.8.000 (2009-09-07)
-	 */
-	public function RadioButton($name, $w, $prop=array(), $opt=array(), $onvalue='On', $checked=false, $x='', $y='', $js=false) {
-		if ($x === '') {
-			$x = $this->x;
-		}
-		if ($y === '') {
-			$y = $this->y;
-		}
-		// check page for no-write regions and adapt page margins if necessary
-		list($x, $y) = $this->checkPageRegions($w, $x, $y);
-		if ($js) {
-			$this->_addfield('radiobutton', $name, $x, $y, $w, $w, $prop);
-			return;
-		}
-		if (TCPDF_STATIC::empty_string($onvalue)) {
-			$onvalue = 'On';
-		}
-		if ($checked) {
-			$defval = $onvalue;
-		} else {
-			$defval = 'Off';
-		}
-		// set font
-		$font = 'zapfdingbats';
-		if ($this->pdfa_mode) {
-			// all fonts must be embedded
-			$font = 'pdfa'.$font;
-		}
-		$this->AddFont($font);
-		$tmpfont = $this->getFontBuffer($font);
-		// set data for parent group
-		if (!isset($this->radiobutton_groups[$this->page])) {
-			$this->radiobutton_groups[$this->page] = array();
-		}
-		if (!isset($this->radiobutton_groups[$this->page][$name])) {
-			$this->radiobutton_groups[$this->page][$name] = array();
-			++$this->n;
-			$this->radiobutton_groups[$this->page][$name]['n'] = $this->n;
-			$this->radio_groups[] = $this->n;
-		}
-		$kid = ($this->n + 1);
-		// save object ID to be added on Kids entry on parent object
-		$this->radiobutton_groups[$this->page][$name][] = array('kid' => $kid, 'def' => $defval);
-		// get default style
-		$prop = array_merge($this->getFormDefaultProp(), $prop);
-		$prop['NoToggleToOff'] = 'true';
-		$prop['Radio'] = 'true';
-		$prop['borderStyle'] = 'inset';
-		// get annotation data
-		$popt = TCPDF_STATIC::getAnnotOptFromJSProp($prop, $this->spot_colors, $this->rtl);
-		// set additional default options
-		$this->annotation_fonts[$tmpfont['fontkey']] = $tmpfont['i'];
-		$fontstyle = sprintf('/F%d %F Tf %s', $tmpfont['i'], $this->FontSizePt, $this->TextColor);
-		$popt['da'] = $fontstyle;
-		// build appearance stream
-		$popt['ap'] = array();
-		$popt['ap']['n'] = array();
-		$fx = ((($w - $this->getAbsFontMeasure($tmpfont['cw'][108])) / 2) * $this->k);
-		$fy = (($w - ((($tmpfont['desc']['Ascent'] - $tmpfont['desc']['Descent']) * $this->FontSizePt / 1000) / $this->k)) * $this->k);
-		$popt['ap']['n'][$onvalue] = sprintf('q %s BT /F%d %F Tf %F %F Td ('.chr(108).') Tj ET Q', $this->TextColor, $tmpfont['i'], $this->FontSizePt, $fx, $fy);
-		$popt['ap']['n']['Off'] = sprintf('q %s BT /F%d %F Tf %F %F Td ('.chr(109).') Tj ET Q', $this->TextColor, $tmpfont['i'], $this->FontSizePt, $fx, $fy);
-		if (!isset($popt['mk'])) {
-			$popt['mk'] = array();
-		}
-		$popt['mk']['ca'] = '(l)';
-		// merge options
-		$opt = array_merge($popt, $opt);
-		// set remaining annotation data
-		$opt['Subtype'] = 'Widget';
-		$opt['ft'] = 'Btn';
-		if ($checked) {
-			$opt['v'] = array('/'.$onvalue);
-			$opt['as'] = $onvalue;
-		} else {
-			$opt['as'] = 'Off';
-		}
-		// store readonly flag
-		if (!isset($this->radiobutton_groups[$this->page][$name]['#readonly#'])) {
-			$this->radiobutton_groups[$this->page][$name]['#readonly#'] = false;
-		}
-		$this->radiobutton_groups[$this->page][$name]['#readonly#'] |= ($opt['f'] & 64);
-		$this->Annotation($x, $y, $w, $w, $name, $opt, 0);
-		if ($this->rtl) {
-			$this->x -= $w;
-		} else {
-			$this->x += $w;
-		}
-	}
-
-	/**
-	 * Creates a List-box field
-	 * @param $name (string) field name
-	 * @param $w (int) width
-	 * @param $h (int) height
-	 * @param $values (array) array containing the list of values.
-	 * @param $prop (array) javascript field properties. Possible values are described on official Javascript for Acrobat API reference.
-	 * @param $opt (array) annotation parameters. Possible values are described on official PDF32000_2008 reference.
-	 * @param $x (float) Abscissa of the upper-left corner of the rectangle
-	 * @param $y (float) Ordinate of the upper-left corner of the rectangle
-	 * @param $js (boolean) if true put the field using JavaScript (requires Acrobat Writer to be rendered).
-	 * @public
-	 * @author Nicola Asuni
-	 * @since 4.8.000 (2009-09-07)
-	 */
-	public function ListBox($name, $w, $h, $values, $prop=array(), $opt=array(), $x='', $y='', $js=false) {
-		if ($x === '') {
-			$x = $this->x;
-		}
-		if ($y === '') {
-			$y = $this->y;
-		}
-		// check page for no-write regions and adapt page margins if necessary
-		list($x, $y) = $this->checkPageRegions($h, $x, $y);
-		if ($js) {
-			$this->_addfield('listbox', $name, $x, $y, $w, $h, $prop);
-			$s = '';
-			foreach ($values as $value) {
-				if (is_array($value)) {
-					$s .= ',[\''.addslashes($value[1]).'\',\''.addslashes($value[0]).'\']';
-				} else {
-					$s .= ',[\''.addslashes($value).'\',\''.addslashes($value).'\']';
-				}
-			}
-			$this->javascript .= 'f'.$name.'.setItems('.substr($s, 1).');'."\n";
-			return;
-		}
-		// get default style
-		$prop = array_merge($this->getFormDefaultProp(), $prop);
-		// get annotation data
-		$popt = TCPDF_STATIC::getAnnotOptFromJSProp($prop, $this->spot_colors, $this->rtl);
-		// set additional default values
-		$this->annotation_fonts[$this->CurrentFont['fontkey']] = $this->CurrentFont['i'];
-		$fontstyle = sprintf('/F%d %F Tf %s', $this->CurrentFont['i'], $this->FontSizePt, $this->TextColor);
-		$popt['da'] = $fontstyle;
-		// build appearance stream
-		$popt['ap'] = array();
-		$popt['ap']['n'] = '/Tx BMC q '.$fontstyle.' ';
-		$text = '';
-		foreach($values as $item) {
-			if (is_array($item)) {
-				$text .= $item[1]."\n";
-			} else {
-				$text .= $item."\n";
-			}
-		}
-		$tmpid = $this->startTemplate($w, $h, false);
-		$this->MultiCell($w, $h, $text, 0, '', false, 0, 0, 0, true, 0, false, true, 0, 'T', false);
-		$this->endTemplate();
-		--$this->n;
-		$popt['ap']['n'] .= $this->xobjects[$tmpid]['outdata'];
-		unset($this->xobjects[$tmpid]);
-		$popt['ap']['n'] .= 'Q EMC';
-		// merge options
-		$opt = array_merge($popt, $opt);
-		// set remaining annotation data
-		$opt['Subtype'] = 'Widget';
-		$opt['ft'] = 'Ch';
-		$opt['t'] = $name;
-		$opt['opt'] = $values;
-		unset($opt['mk']['ca']);
-		unset($opt['mk']['rc']);
-		unset($opt['mk']['ac']);
-		unset($opt['mk']['i']);
-		unset($opt['mk']['ri']);
-		unset($opt['mk']['ix']);
-		unset($opt['mk']['if']);
-		unset($opt['mk']['tp']);
-		$this->Annotation($x, $y, $w, $h, $name, $opt, 0);
-		if ($this->rtl) {
-			$this->x -= $w;
-		} else {
-			$this->x += $w;
-		}
-	}
-
-	/**
-	 * Creates a Combo-box field
-	 * @param $name (string) field name
-	 * @param $w (int) width
-	 * @param $h (int) height
-	 * @param $values (array) array containing the list of values.
-	 * @param $prop (array) javascript field properties. Possible values are described on official Javascript for Acrobat API reference.
-	 * @param $opt (array) annotation parameters. Possible values are described on official PDF32000_2008 reference.
-	 * @param $x (float) Abscissa of the upper-left corner of the rectangle
-	 * @param $y (float) Ordinate of the upper-left corner of the rectangle
-	 * @param $js (boolean) if true put the field using JavaScript (requires Acrobat Writer to be rendered).
-	 * @public
-	 * @author Nicola Asuni
-	 * @since 4.8.000 (2009-09-07)
-	 */
-	public function ComboBox($name, $w, $h, $values, $prop=array(), $opt=array(), $x='', $y='', $js=false) {
-		if ($x === '') {
-			$x = $this->x;
-		}
-		if ($y === '') {
-			$y = $this->y;
-		}
-		// check page for no-write regions and adapt page margins if necessary
-		list($x, $y) = $this->checkPageRegions($h, $x, $y);
-		if ($js) {
-			$this->_addfield('combobox', $name, $x, $y, $w, $h, $prop);
-			$s = '';
-			foreach ($values as $value) {
-				if (is_array($value)) {
-					$s .= ',[\''.addslashes($value[1]).'\',\''.addslashes($value[0]).'\']';
-				} else {
-					$s .= ',[\''.addslashes($value).'\',\''.addslashes($value).'\']';
-				}
-			}
-			$this->javascript .= 'f'.$name.'.setItems('.substr($s, 1).');'."\n";
-			return;
-		}
-		// get default style
-		$prop = array_merge($this->getFormDefaultProp(), $prop);
-		$prop['Combo'] = true;
-		// get annotation data
-		$popt = TCPDF_STATIC::getAnnotOptFromJSProp($prop, $this->spot_colors, $this->rtl);
-		// set additional default options
-		$this->annotation_fonts[$this->CurrentFont['fontkey']] = $this->CurrentFont['i'];
-		$fontstyle = sprintf('/F%d %F Tf %s', $this->CurrentFont['i'], $this->FontSizePt, $this->TextColor);
-		$popt['da'] = $fontstyle;
-		// build appearance stream
-		$popt['ap'] = array();
-		$popt['ap']['n'] = '/Tx BMC q '.$fontstyle.' ';
-		$text = '';
-		foreach($values as $item) {
-			if (is_array($item)) {
-				$text .= $item[1]."\n";
-			} else {
-				$text .= $item."\n";
-			}
-		}
-		$tmpid = $this->startTemplate($w, $h, false);
-		$this->MultiCell($w, $h, $text, 0, '', false, 0, 0, 0, true, 0, false, true, 0, 'T', false);
-		$this->endTemplate();
-		--$this->n;
-		$popt['ap']['n'] .= $this->xobjects[$tmpid]['outdata'];
-		unset($this->xobjects[$tmpid]);
-		$popt['ap']['n'] .= 'Q EMC';
-		// merge options
-		$opt = array_merge($popt, $opt);
-		// set remaining annotation data
-		$opt['Subtype'] = 'Widget';
-		$opt['ft'] = 'Ch';
-		$opt['t'] = $name;
-		$opt['opt'] = $values;
-		unset($opt['mk']['ca']);
-		unset($opt['mk']['rc']);
-		unset($opt['mk']['ac']);
-		unset($opt['mk']['i']);
-		unset($opt['mk']['ri']);
-		unset($opt['mk']['ix']);
-		unset($opt['mk']['if']);
-		unset($opt['mk']['tp']);
-		$this->Annotation($x, $y, $w, $h, $name, $opt, 0);
-		if ($this->rtl) {
-			$this->x -= $w;
-		} else {
-			$this->x += $w;
-		}
-	}
-
-	/**
-	 * Creates a CheckBox field
-	 * @param $name (string) field name
-	 * @param $w (int) width
-	 * @param $checked (boolean) define the initial state.
-	 * @param $prop (array) javascript field properties. Possible values are described on official Javascript for Acrobat API reference.
-	 * @param $opt (array) annotation parameters. Possible values are described on official PDF32000_2008 reference.
-	 * @param $onvalue (string) value to be returned if selected.
-	 * @param $x (float) Abscissa of the upper-left corner of the rectangle
-	 * @param $y (float) Ordinate of the upper-left corner of the rectangle
-	 * @param $js (boolean) if true put the field using JavaScript (requires Acrobat Writer to be rendered).
-	 * @public
-	 * @author Nicola Asuni
-	 * @since 4.8.000 (2009-09-07)
-	 */
-	public function CheckBox($name, $w, $checked=false, $prop=array(), $opt=array(), $onvalue='Yes', $x='', $y='', $js=false) {
-		if ($x === '') {
-			$x = $this->x;
-		}
-		if ($y === '') {
-			$y = $this->y;
-		}
-		// check page for no-write regions and adapt page margins if necessary
-		list($x, $y) = $this->checkPageRegions($w, $x, $y);
-		if ($js) {
-			$this->_addfield('checkbox', $name, $x, $y, $w, $w, $prop);
-			return;
-		}
-		if (!isset($prop['value'])) {
-			$prop['value'] = array('Yes');
-		}
-		// get default style
-		$prop = array_merge($this->getFormDefaultProp(), $prop);
-		$prop['borderStyle'] = 'inset';
-		// get annotation data
-		$popt = TCPDF_STATIC::getAnnotOptFromJSProp($prop, $this->spot_colors, $this->rtl);
-		// set additional default options
-		$font = 'zapfdingbats';
-		if ($this->pdfa_mode) {
-			// all fonts must be embedded
-			$font = 'pdfa'.$font;
-		}
-		$this->AddFont($font);
-		$tmpfont = $this->getFontBuffer($font);
-		$this->annotation_fonts[$tmpfont['fontkey']] = $tmpfont['i'];
-		$fontstyle = sprintf('/F%d %F Tf %s', $tmpfont['i'], $this->FontSizePt, $this->TextColor);
-		$popt['da'] = $fontstyle;
-		// build appearance stream
-		$popt['ap'] = array();
-		$popt['ap']['n'] = array();
-		$fx = ((($w - $this->getAbsFontMeasure($tmpfont['cw'][110])) / 2) * $this->k);
-		$fy = (($w - ((($tmpfont['desc']['Ascent'] - $tmpfont['desc']['Descent']) * $this->FontSizePt / 1000) / $this->k)) * $this->k);
-		$popt['ap']['n']['Yes'] = sprintf('q %s BT /F%d %F Tf %F %F Td ('.chr(110).') Tj ET Q', $this->TextColor, $tmpfont['i'], $this->FontSizePt, $fx, $fy);
-		$popt['ap']['n']['Off'] = sprintf('q %s BT /F%d %F Tf %F %F Td ('.chr(111).') Tj ET Q', $this->TextColor, $tmpfont['i'], $this->FontSizePt, $fx, $fy);
-		// merge options
-		$opt = array_merge($popt, $opt);
-		// set remaining annotation data
-		$opt['Subtype'] = 'Widget';
-		$opt['ft'] = 'Btn';
-		$opt['t'] = $name;
-		if (TCPDF_STATIC::empty_string($onvalue)) {
-			$onvalue = 'Yes';
-		}
-		$opt['opt'] = array($onvalue);
-		if ($checked) {
-			$opt['v'] = array('/Yes');
-			$opt['as'] = 'Yes';
-		} else {
-			$opt['v'] = array('/Off');
-			$opt['as'] = 'Off';
-		}
-		$this->Annotation($x, $y, $w, $w, $name, $opt, 0);
-		if ($this->rtl) {
-			$this->x -= $w;
-		} else {
-			$this->x += $w;
-		}
-	}
-
-	/**
-	 * Creates a button field
-	 * @param $name (string) field name
-	 * @param $w (int) width
-	 * @param $h (int) height
-	 * @param $caption (string) caption.
-	 * @param $action (mixed) action triggered by pressing the button. Use a string to specify a javascript action. Use an array to specify a form action options as on section 12.7.5 of PDF32000_2008.
-	 * @param $prop (array) javascript field properties. Possible values are described on official Javascript for Acrobat API reference.
-	 * @param $opt (array) annotation parameters. Possible values are described on official PDF32000_2008 reference.
-	 * @param $x (float) Abscissa of the upper-left corner of the rectangle
-	 * @param $y (float) Ordinate of the upper-left corner of the rectangle
-	 * @param $js (boolean) if true put the field using JavaScript (requires Acrobat Writer to be rendered).
-	 * @public
-	 * @author Nicola Asuni
-	 * @since 4.8.000 (2009-09-07)
-	 */
-	public function Button($name, $w, $h, $caption, $action, $prop=array(), $opt=array(), $x='', $y='', $js=false) {
-		if ($x === '') {
-			$x = $this->x;
-		}
-		if ($y === '') {
-			$y = $this->y;
-		}
-		// check page for no-write regions and adapt page margins if necessary
-		list($x, $y) = $this->checkPageRegions($h, $x, $y);
-		if ($js) {
-			$this->_addfield('button', $name, $this->x, $this->y, $w, $h, $prop);
-			$this->javascript .= 'f'.$name.".buttonSetCaption('".addslashes($caption)."');\n";
-			$this->javascript .= 'f'.$name.".setAction('MouseUp','".addslashes($action)."');\n";
-			$this->javascript .= 'f'.$name.".highlight='push';\n";
-			$this->javascript .= 'f'.$name.".print=false;\n";
-			return;
-		}
-		// get default style
-		$prop = array_merge($this->getFormDefaultProp(), $prop);
-		$prop['Pushbutton'] = 'true';
-		$prop['highlight'] = 'push';
-		$prop['display'] = 'display.noPrint';
-		// get annotation data
-		$popt = TCPDF_STATIC::getAnnotOptFromJSProp($prop, $this->spot_colors, $this->rtl);
-		$this->annotation_fonts[$this->CurrentFont['fontkey']] = $this->CurrentFont['i'];
-		$fontstyle = sprintf('/F%d %F Tf %s', $this->CurrentFont['i'], $this->FontSizePt, $this->TextColor);
-		$popt['da'] = $fontstyle;
-		// build appearance stream
-		$popt['ap'] = array();
-		$popt['ap']['n'] = '/Tx BMC q '.$fontstyle.' ';
-		$tmpid = $this->startTemplate($w, $h, false);
-		$bw = (2 / $this->k); // border width
-		$border = array(
-			'L' => array('width' => $bw, 'cap' => 'square', 'join' => 'miter', 'dash' => 0, 'color' => array(231)),
-			'R' => array('width' => $bw, 'cap' => 'square', 'join' => 'miter', 'dash' => 0, 'color' => array(51)),
-			'T' => array('width' => $bw, 'cap' => 'square', 'join' => 'miter', 'dash' => 0, 'color' => array(231)),
-			'B' => array('width' => $bw, 'cap' => 'square', 'join' => 'miter', 'dash' => 0, 'color' => array(51)));
-		$this->SetFillColor(204);
-		$this->Cell($w, $h, $caption, $border, 0, 'C', true, '', 1, false, 'T', 'M');
-		$this->endTemplate();
-		--$this->n;
-		$popt['ap']['n'] .= $this->xobjects[$tmpid]['outdata'];
-		unset($this->xobjects[$tmpid]);
-		$popt['ap']['n'] .= 'Q EMC';
-		// set additional default options
-		if (!isset($popt['mk'])) {
-			$popt['mk'] = array();
-		}
-		$ann_obj_id = ($this->n + 1);
-		if (!empty($action) AND !is_array($action)) {
-			$ann_obj_id = ($this->n + 2);
-		}
-		$popt['mk']['ca'] = $this->_textstring($caption, $ann_obj_id);
-		$popt['mk']['rc'] = $this->_textstring($caption, $ann_obj_id);
-		$popt['mk']['ac'] = $this->_textstring($caption, $ann_obj_id);
-		// merge options
-		$opt = array_merge($popt, $opt);
-		// set remaining annotation data
-		$opt['Subtype'] = 'Widget';
-		$opt['ft'] = 'Btn';
-		$opt['t'] = $caption;
-		$opt['v'] = $name;
-		if (!empty($action)) {
-			if (is_array($action)) {
-				// form action options as on section 12.7.5 of PDF32000_2008.
-				$opt['aa'] = '/D <<';
-				$bmode = array('SubmitForm', 'ResetForm', 'ImportData');
-				foreach ($action AS $key => $val) {
-					if (($key == 'S') AND in_array($val, $bmode)) {
-						$opt['aa'] .= ' /S /'.$val;
-					} elseif (($key == 'F') AND (!empty($val))) {
-						$opt['aa'] .= ' /F '.$this->_datastring($val, $ann_obj_id);
-					} elseif (($key == 'Fields') AND is_array($val) AND !empty($val)) {
-						$opt['aa'] .= ' /Fields [';
-						foreach ($val AS $field) {
-							$opt['aa'] .= ' '.$this->_textstring($field, $ann_obj_id);
-						}
-						$opt['aa'] .= ']';
-					} elseif (($key == 'Flags')) {
-						$ff = 0;
-						if (is_array($val)) {
-							foreach ($val AS $flag) {
-								switch ($flag) {
-									case 'Include/Exclude': {
-										$ff += 1 << 0;
-										break;
-									}
-									case 'IncludeNoValueFields': {
-										$ff += 1 << 1;
-										break;
-									}
-									case 'ExportFormat': {
-										$ff += 1 << 2;
-										break;
-									}
-									case 'GetMethod': {
-										$ff += 1 << 3;
-										break;
-									}
-									case 'SubmitCoordinates': {
-										$ff += 1 << 4;
-										break;
-									}
-									case 'XFDF': {
-										$ff += 1 << 5;
-										break;
-									}
-									case 'IncludeAppendSaves': {
-										$ff += 1 << 6;
-										break;
-									}
-									case 'IncludeAnnotations': {
-										$ff += 1 << 7;
-										break;
-									}
-									case 'SubmitPDF': {
-										$ff += 1 << 8;
-										break;
-									}
-									case 'CanonicalFormat': {
-										$ff += 1 << 9;
-										break;
-									}
-									case 'ExclNonUserAnnots': {
-										$ff += 1 << 10;
-										break;
-									}
-									case 'ExclFKey': {
-										$ff += 1 << 11;
-										break;
-									}
-									case 'EmbedForm': {
-										$ff += 1 << 13;
-										break;
-									}
-								}
-							}
-						} else {
-							$ff = intval($val);
-						}
-						$opt['aa'] .= ' /Flags '.$ff;
-					}
-				}
-				$opt['aa'] .= ' >>';
-			} else {
-				// Javascript action or raw action command
-				$js_obj_id = $this->addJavascriptObject($action);
-				$opt['aa'] = '/D '.$js_obj_id.' 0 R';
-			}
-		}
-		$this->Annotation($x, $y, $w, $h, $name, $opt, 0);
-		if ($this->rtl) {
-			$this->x -= $w;
-		} else {
-			$this->x += $w;
-		}
-	}
-
-	// --- END FORMS FIELDS ------------------------------------------------
-
-	/**
-	 * Add certification signature (DocMDP or UR3)
-	 * You can set only one signature type
-	 * @protected
-	 * @author Nicola Asuni
-	 * @since 4.6.008 (2009-05-07)
-	 */
-	protected function _putsignature() {
-		if ((!$this->sign) OR (!isset($this->signature_data['cert_type']))) {
-			return;
-		}
-		$sigobjid = ($this->sig_obj_id + 1);
-		$out = $this->_getobj($sigobjid)."\n";
-		$out .= '<< /Type /Sig';
-		$out .= ' /Filter /Adobe.PPKLite';
-		$out .= ' /SubFilter /adbe.pkcs7.detached';
-		$out .= ' '.TCPDF_STATIC::$byterange_string;
-		$out .= ' /Contents<'.str_repeat('0', $this->signature_max_length).'>';
-		if (empty($this->signature_data['approval']) OR ($this->signature_data['approval'] != 'A')) {
-			$out .= ' /Reference ['; // array of signature reference dictionaries
-			$out .= ' << /Type /SigRef';
-			if ($this->signature_data['cert_type'] > 0) {
-				$out .= ' /TransformMethod /DocMDP';
-				$out .= ' /TransformParams <<';
-				$out .= ' /Type /TransformParams';
-				$out .= ' /P '.$this->signature_data['cert_type'];
-				$out .= ' /V /1.2';
-			} else {
-				$out .= ' /TransformMethod /UR3';
-				$out .= ' /TransformParams <<';
-				$out .= ' /Type /TransformParams';
-				$out .= ' /V /2.2';
-				if (!TCPDF_STATIC::empty_string($this->ur['document'])) {
-					$out .= ' /Document['.$this->ur['document'].']';
-				}
-				if (!TCPDF_STATIC::empty_string($this->ur['form'])) {
-					$out .= ' /Form['.$this->ur['form'].']';
-				}
-				if (!TCPDF_STATIC::empty_string($this->ur['signature'])) {
-					$out .= ' /Signature['.$this->ur['signature'].']';
-				}
-				if (!TCPDF_STATIC::empty_string($this->ur['annots'])) {
-					$out .= ' /Annots['.$this->ur['annots'].']';
-				}
-				if (!TCPDF_STATIC::empty_string($this->ur['ef'])) {
-					$out .= ' /EF['.$this->ur['ef'].']';
-				}
-				if (!TCPDF_STATIC::empty_string($this->ur['formex'])) {
-					$out .= ' /FormEX['.$this->ur['formex'].']';
-				}
-			}
-			$out .= ' >>'; // close TransformParams
-			// optional digest data (values must be calculated and replaced later)
-			//$out .= ' /Data ********** 0 R';
-			//$out .= ' /DigestMethod/MD5';
-			//$out .= ' /DigestLocation[********** 34]';
-			//$out .= ' /DigestValue<********************************>';
-			$out .= ' >>';
-			$out .= ' ]'; // end of reference
-		}
-		if (isset($this->signature_data['info']['Name']) AND !TCPDF_STATIC::empty_string($this->signature_data['info']['Name'])) {
-			$out .= ' /Name '.$this->_textstring($this->signature_data['info']['Name'], $sigobjid);
-		}
-		if (isset($this->signature_data['info']['Location']) AND !TCPDF_STATIC::empty_string($this->signature_data['info']['Location'])) {
-			$out .= ' /Location '.$this->_textstring($this->signature_data['info']['Location'], $sigobjid);
-		}
-		if (isset($this->signature_data['info']['Reason']) AND !TCPDF_STATIC::empty_string($this->signature_data['info']['Reason'])) {
-			$out .= ' /Reason '.$this->_textstring($this->signature_data['info']['Reason'], $sigobjid);
-		}
-		if (isset($this->signature_data['info']['ContactInfo']) AND !TCPDF_STATIC::empty_string($this->signature_data['info']['ContactInfo'])) {
-			$out .= ' /ContactInfo '.$this->_textstring($this->signature_data['info']['ContactInfo'], $sigobjid);
-		}
-		$out .= ' /M '.$this->_datestring($sigobjid, $this->doc_modification_timestamp);
-		$out .= ' >>';
-		$out .= "\n".'endobj';
-		$this->_out($out);
-	}
-
-	/**
-	 * Set User's Rights for PDF Reader
-	 * WARNING: This is experimental and currently do not work.
-	 * Check the PDF Reference 8.7.1 Transform Methods,
-	 * Table 8.105 Entries in the UR transform parameters dictionary
-	 * @param $enable (boolean) if true enable user's rights on PDF reader
-	 * @param $document (string) Names specifying additional document-wide usage rights for the document. The only defined value is "/FullSave", which permits a user to save the document along with modified form and/or annotation data.
-	 * @param $annots (string) Names specifying additional annotation-related usage rights for the document. Valid names in PDF 1.5 and later are /Create/Delete/Modify/Copy/Import/Export, which permit the user to perform the named operation on annotations.
-	 * @param $form (string) Names specifying additional form-field-related usage rights for the document. Valid names are: /Add/Delete/FillIn/Import/Export/SubmitStandalone/SpawnTemplate
-	 * @param $signature (string) Names specifying additional signature-related usage rights for the document. The only defined value is /Modify, which permits a user to apply a digital signature to an existing signature form field or clear a signed signature form field.
-	 * @param $ef (string) Names specifying additional usage rights for named embedded files in the document. Valid names are /Create/Delete/Modify/Import, which permit the user to perform the named operation on named embedded files
-	 Names specifying additional embedded-files-related usage rights for the document.
-	 * @param $formex (string) Names specifying additional form-field-related usage rights. The only valid name is BarcodePlaintext, which permits text form field data to be encoded as a plaintext two-dimensional barcode.
-	 * @public
-	 * @author Nicola Asuni
-	 * @since 2.9.000 (2008-03-26)
-	 */
-	public function setUserRights(
-			$enable=true,
-			$document='/FullSave',
-			$annots='/Create/Delete/Modify/Copy/Import/Export',
-			$form='/Add/Delete/FillIn/Import/Export/SubmitStandalone/SpawnTemplate',
-			$signature='/Modify',
-			$ef='/Create/Delete/Modify/Import',
-			$formex='') {
-		$this->ur['enabled'] = $enable;
-		$this->ur['document'] = $document;
-		$this->ur['annots'] = $annots;
-		$this->ur['form'] = $form;
-		$this->ur['signature'] = $signature;
-		$this->ur['ef'] = $ef;
-		$this->ur['formex'] = $formex;
-		if (!$this->sign) {
-			$this->setSignature('', '', '', '', 0, array());
-		}
-	}
-
-	/**
-	 * Enable document signature (requires the OpenSSL Library).
-	 * The digital signature improve document authenticity and integrity and allows o enable extra features on Acrobat Reader.
-	 * To create self-signed signature: openssl req -x509 -nodes -days 365000 -newkey rsa:1024 -keyout tcpdf.crt -out tcpdf.crt
-	 * To export crt to p12: openssl pkcs12 -export -in tcpdf.crt -out tcpdf.p12
-	 * To convert pfx certificate to pem: openssl pkcs12 -in tcpdf.pfx -out tcpdf.crt -nodes
-	 * @param $signing_cert (mixed) signing certificate (string or filename prefixed with 'file://')
-	 * @param $private_key (mixed) private key (string or filename prefixed with 'file://')
-	 * @param $private_key_password (string) password
-	 * @param $extracerts (string) specifies the name of a file containing a bunch of extra certificates to include in the signature which can for example be used to help the recipient to verify the certificate that you used.
-	 * @param $cert_type (int) The access permissions granted for this document. Valid values shall be: 1 = No changes to the document shall be permitted; any change to the document shall invalidate the signature; 2 = Permitted changes shall be filling in forms, instantiating page templates, and signing; other changes shall invalidate the signature; 3 = Permitted changes shall be the same as for 2, as well as annotation creation, deletion, and modification; other changes shall invalidate the signature.
-	 * @param $info (array) array of option information: Name, Location, Reason, ContactInfo.
-	 * @param $approval (string) Enable approval signature eg. for PDF incremental update
-	 * @public
-	 * @author Nicola Asuni
-	 * @since 4.6.005 (2009-04-24)
-	 */
-	public function setSignature($signing_cert='', $private_key='', $private_key_password='', $extracerts='', $cert_type=2, $info=array(), $approval='') {
-		// to create self-signed signature: openssl req -x509 -nodes -days 365000 -newkey rsa:1024 -keyout tcpdf.crt -out tcpdf.crt
-		// to export crt to p12: openssl pkcs12 -export -in tcpdf.crt -out tcpdf.p12
-		// to convert pfx certificate to pem: openssl
-		//     OpenSSL> pkcs12 -in <cert.pfx> -out <cert.crt> -nodes
-		$this->sign = true;
-		++$this->n;
-		$this->sig_obj_id = $this->n; // signature widget
-		++$this->n; // signature object ($this->sig_obj_id + 1)
-		$this->signature_data = array();
-		if (strlen($signing_cert) == 0) {
-			$this->Error('Please provide a certificate file and password!');
-		}
-		if (strlen($private_key) == 0) {
-			$private_key = $signing_cert;
-		}
-		$this->signature_data['signcert'] = $signing_cert;
-		$this->signature_data['privkey'] = $private_key;
-		$this->signature_data['password'] = $private_key_password;
-		$this->signature_data['extracerts'] = $extracerts;
-		$this->signature_data['cert_type'] = $cert_type;
-		$this->signature_data['info'] = $info;
-		$this->signature_data['approval'] = $approval;
-	}
-
-	/**
-	 * Set the digital signature appearance (a cliccable rectangle area to get signature properties)
-	 * @param $x (float) Abscissa of the upper-left corner.
-	 * @param $y (float) Ordinate of the upper-left corner.
-	 * @param $w (float) Width of the signature area.
-	 * @param $h (float) Height of the signature area.
-	 * @param $page (int) option page number (if < 0 the current page is used).
-	 * @param $name (string) Name of the signature.
-	 * @public
-	 * @author Nicola Asuni
-	 * @since 5.3.011 (2010-06-17)
-	 */
-	public function setSignatureAppearance($x=0, $y=0, $w=0, $h=0, $page=-1, $name='') {
-		$this->signature_appearance = $this->getSignatureAppearanceArray($x, $y, $w, $h, $page, $name);
-	}
-
-	/**
-	 * Add an empty digital signature appearance (a cliccable rectangle area to get signature properties)
-	 * @param $x (float) Abscissa of the upper-left corner.
-	 * @param $y (float) Ordinate of the upper-left corner.
-	 * @param $w (float) Width of the signature area.
-	 * @param $h (float) Height of the signature area.
-	 * @param $page (int) option page number (if < 0 the current page is used).
-	 * @param $name (string) Name of the signature.
-	 * @public
-	 * @author Nicola Asuni
-	 * @since 5.9.101 (2011-07-06)
-	 */
-	public function addEmptySignatureAppearance($x=0, $y=0, $w=0, $h=0, $page=-1, $name='') {
-		++$this->n;
-		$this->empty_signature_appearance[] = array('objid' => $this->n) + $this->getSignatureAppearanceArray($x, $y, $w, $h, $page, $name);
-	}
-
-	/**
-	 * Get the array that defines the signature appearance (page and rectangle coordinates).
-	 * @param $x (float) Abscissa of the upper-left corner.
-	 * @param $y (float) Ordinate of the upper-left corner.
-	 * @param $w (float) Width of the signature area.
-	 * @param $h (float) Height of the signature area.
-	 * @param $page (int) option page number (if < 0 the current page is used).
-	 * @param $name (string) Name of the signature.
-	 * @return (array) Array defining page and rectangle coordinates of signature appearance.
-	 * @protected
-	 * @author Nicola Asuni
-	 * @since 5.9.101 (2011-07-06)
-	 */
-	protected function getSignatureAppearanceArray($x=0, $y=0, $w=0, $h=0, $page=-1, $name='') {
-		$sigapp = array();
-		if (($page < 1) OR ($page > $this->numpages)) {
-			$sigapp['page'] = $this->page;
-		} else {
-			$sigapp['page'] = intval($page);
-		}
-		if (empty($name)) {
-			$sigapp['name'] = 'Signature';
-		} else {
-			$sigapp['name'] = $name;
-		}
-		$a = $x * $this->k;
-		$b = $this->pagedim[($sigapp['page'])]['h'] - (($y + $h) * $this->k);
-		$c = $w * $this->k;
-		$d = $h * $this->k;
-		$sigapp['rect'] = sprintf('%F %F %F %F', $a, $b, ($a + $c), ($b + $d));
-		return $sigapp;
-	}
-
-	/**
-	 * Enable document timestamping (requires the OpenSSL Library).
-	 * The trusted timestamping improve document security that means that no one should be able to change the document once it has been recorded.
-	 * Use with digital signature only!
-	 * @param $tsa_host (string) Time Stamping Authority (TSA) server (prefixed with 'https://')
-	 * @param $tsa_username (string) Specifies the username for TSA authorization (optional) OR specifies the TSA authorization PEM file (see: example_66.php, optional)
-	 * @param $tsa_password (string) Specifies the password for TSA authorization (optional)
-	 * @param $tsa_cert (string) Specifies the location of TSA certificate for authorization (optional for cURL)
-	 * @public
-	 * @author Richard Stockinger
-	 * @since 6.0.090 (2014-06-16)
-	 */
-	public function setTimeStamp($tsa_host='', $tsa_username='', $tsa_password='', $tsa_cert='') {
-		$this->tsa_data = array();
-		if (!function_exists('curl_init')) {
-			$this->Error('Please enable cURL PHP extension!');
-		}
-		if (strlen($tsa_host) == 0) {
-			$this->Error('Please specify the host of Time Stamping Authority (TSA)!');
-		}
-		$this->tsa_data['tsa_host'] = $tsa_host;
-		if (is_file($tsa_username)) {
-			$this->tsa_data['tsa_auth'] = $tsa_username;
-		} else {
-			$this->tsa_data['tsa_username'] = $tsa_username;
-		}
-		$this->tsa_data['tsa_password'] = $tsa_password;
-		$this->tsa_data['tsa_cert'] = $tsa_cert;
-		$this->tsa_timestamp = true;
-	}
-
-	/**
-	 * NOT YET IMPLEMENTED
-	 * Request TSA for a timestamp
-	 * @param $signature (string) Digital signature as binary string
-	 * @return (string) Timestamped digital signature
-	 * @protected
-	 * @author Richard Stockinger
-	 * @since 6.0.090 (2014-06-16)
-	 */
-	protected function applyTSA($signature) {
-		if (!$this->tsa_timestamp) {
-			return $signature;
-		}
-		//@TODO: implement this feature
-		return $signature;
-	}
-
-	/**
-	 * Create a new page group.
-	 * NOTE: call this function before calling AddPage()
-	 * @param $page (int) starting group page (leave empty for next page).
-	 * @public
-	 * @since 3.0.000 (2008-03-27)
-	 */
-	public function startPageGroup($page='') {
-		if (empty($page)) {
-			$page = $this->page + 1;
-		}
-		$this->newpagegroup[$page] = sizeof($this->newpagegroup) + 1;
-	}
-
-	/**
-	 * Set the starting page number.
-	 * @param $num (int) Starting page number.
-	 * @since 5.9.093 (2011-06-16)
-	 * @public
-	 */
-	public function setStartingPageNumber($num=1) {
-		$this->starting_page_number = max(0, intval($num));
-	}
-
-	/**
-	 * Returns the string alias used right align page numbers.
-	 * If the current font is unicode type, the returned string wil contain an additional open curly brace.
-	 * @return string
-	 * @since 5.9.099 (2011-06-27)
-	 * @public
-	 */
-	public function getAliasRightShift() {
-		// calculate aproximatively the ratio between widths of aliases and replacements.
-		$ref = '{'.TCPDF_STATIC::$alias_right_shift.'}{'.TCPDF_STATIC::$alias_tot_pages.'}{'.TCPDF_STATIC::$alias_num_page.'}';
-		$rep = str_repeat(' ', $this->GetNumChars($ref));
-		$wrep = $this->GetStringWidth($rep);
-		if ($wrep > 0) {
-			$wdiff = max(1, ($this->GetStringWidth($ref) / $wrep));
-		} else {
-			$wdiff = 1;
-		}
-		$sdiff = sprintf('%F', $wdiff);
-		$alias = TCPDF_STATIC::$alias_right_shift.$sdiff.'}';
-		if ($this->isUnicodeFont()) {
-			$alias = '{'.$alias;
-		}
-		return $alias;
-	}
-
-	/**
-	 * Returns the string alias used for the total number of pages.
-	 * If the current font is unicode type, the returned string is surrounded by additional curly braces.
-	 * This alias will be replaced by the total number of pages in the document.
-	 * @return string
-	 * @since 4.0.018 (2008-08-08)
-	 * @public
-	 */
-	public function getAliasNbPages() {
-		if ($this->isUnicodeFont()) {
-			return '{'.TCPDF_STATIC::$alias_tot_pages.'}';
-		}
-		return TCPDF_STATIC::$alias_tot_pages;
-	}
-
-	/**
-	 * Returns the string alias used for the page number.
-	 * If the current font is unicode type, the returned string is surrounded by additional curly braces.
-	 * This alias will be replaced by the page number.
-	 * @return string
-	 * @since 4.5.000 (2009-01-02)
-	 * @public
-	 */
-	public function getAliasNumPage() {
-		if ($this->isUnicodeFont()) {
-			return '{'.TCPDF_STATIC::$alias_num_page.'}';
-		}
-		return TCPDF_STATIC::$alias_num_page;
-	}
-
-	/**
-	 * Return the alias for the total number of pages in the current page group.
-	 * If the current font is unicode type, the returned string is surrounded by additional curly braces.
-	 * This alias will be replaced by the total number of pages in this group.
-	 * @return alias of the current page group
-	 * @public
-	 * @since 3.0.000 (2008-03-27)
-	 */
-	public function getPageGroupAlias() {
-		if ($this->isUnicodeFont()) {
-			return '{'.TCPDF_STATIC::$alias_group_tot_pages.'}';
-		}
-		return TCPDF_STATIC::$alias_group_tot_pages;
-	}
-
-	/**
-	 * Return the alias for the page number on the current page group.
-	 * If the current font is unicode type, the returned string is surrounded by additional curly braces.
-	 * This alias will be replaced by the page number (relative to the belonging group).
-	 * @return alias of the current page group
-	 * @public
-	 * @since 4.5.000 (2009-01-02)
-	 */
-	public function getPageNumGroupAlias() {
-		if ($this->isUnicodeFont()) {
-			return '{'.TCPDF_STATIC::$alias_group_num_page.'}';
-		}
-		return TCPDF_STATIC::$alias_group_num_page;
-	}
-
-	/**
-	 * Return the current page in the group.
-	 * @return current page in the group
-	 * @public
-	 * @since 3.0.000 (2008-03-27)
-	 */
-	public function getGroupPageNo() {
-		return $this->pagegroups[$this->currpagegroup];
-	}
-
-	/**
-	 * Returns the current group page number formatted as a string.
-	 * @public
-	 * @since 4.3.003 (2008-11-18)
-	 * @see PaneNo(), formatPageNumber()
-	 */
-	public function getGroupPageNoFormatted() {
-		return TCPDF_STATIC::formatPageNumber($this->getGroupPageNo());
-	}
-
-	/**
-	 * Returns the current page number formatted as a string.
-	 * @public
-	 * @since 4.2.005 (2008-11-06)
-	 * @see PaneNo(), formatPageNumber()
-	 */
-	public function PageNoFormatted() {
-		return TCPDF_STATIC::formatPageNumber($this->PageNo());
-	}
-
-	/**
-	 * Put pdf layers.
-	 * @protected
-	 * @since 3.0.000 (2008-03-27)
-	 */
-	protected function _putocg() {
-		if (empty($this->pdflayers)) {
-			return;
-		}
-		foreach ($this->pdflayers as $key => $layer) {
-			 $this->pdflayers[$key]['objid'] = $this->_newobj();
-			 $out = '<< /Type /OCG';
-			 $out .= ' /Name '.$this->_textstring($layer['name'], $this->pdflayers[$key]['objid']);
-			 $out .= ' /Usage <<';
-			 if (isset($layer['print']) AND ($layer['print'] !== NULL)) {
-				$out .= ' /Print <</PrintState /'.($layer['print']?'ON':'OFF').'>>';
-			 }
-			 $out .= ' /View <</ViewState /'.($layer['view']?'ON':'OFF').'>>';
-			 $out .= ' >> >>';
-			 $out .= "\n".'endobj';
-			 $this->_out($out);
-		}
-	}
-
-	/**
-	 * Start a new pdf layer.
-	 * @param $name (string) Layer name (only a-z letters and numbers). Leave empty for automatic name.
-	 * @param $print (boolean|null) Set to TRUE to print this layer, FALSE to not print and NULL to not set this option
-	 * @param $view (boolean) Set to true to view this layer.
-	 * @param $lock (boolean) If true lock the layer
-	 * @public
-	 * @since 5.9.102 (2011-07-13)
-	 */
-	public function startLayer($name='', $print=true, $view=true, $lock=true) {
-		if ($this->state != 2) {
-			return;
-		}
-		$layer = sprintf('LYR%03d', (count($this->pdflayers) + 1));
-		if (empty($name)) {
-			$name = $layer;
-		} else {
-			$name = preg_replace('/[^a-zA-Z0-9_\-]/', '', $name);
-		}
-		$this->pdflayers[] = array('layer' => $layer, 'name' => $name, 'print' => $print, 'view' => $view, 'lock' => $lock);
-		$this->openMarkedContent = true;
-		$this->_out('/OC /'.$layer.' BDC');
-	}
-
-	/**
-	 * End the current PDF layer.
-	 * @public
-	 * @since 5.9.102 (2011-07-13)
-	 */
-	public function endLayer() {
-		if ($this->state != 2) {
-			return;
-		}
-		if ($this->openMarkedContent) {
-			// close existing open marked-content layer
-			$this->_out('EMC');
-			$this->openMarkedContent = false;
-		}
-	}
-
-	/**
-	 * Set the visibility of the successive elements.
-	 * This can be useful, for instance, to put a background
-	 * image or color that will show on screen but won't print.
-	 * @param $v (string) visibility mode. Legal values are: all, print, screen or view.
-	 * @public
-	 * @since 3.0.000 (2008-03-27)
-	 */
-	public function setVisibility($v) {
-		if ($this->state != 2) {
-			return;
-		}
-		$this->endLayer();
-		switch($v) {
-			case 'print': {
-				$this->startLayer('Print', true, false);
-				break;
-			}
-			case 'view':
-			case 'screen': {
-				$this->startLayer('View', false, true);
-				break;
-			}
-			case 'all': {
-				$this->_out('');
-				break;
-			}
-			default: {
-				$this->Error('Incorrect visibility: '.$v);
-				break;
-			}
-		}
-	}
-
-	/**
-	 * Add transparency parameters to the current extgstate
-	 * @param $parms (array) parameters
-	 * @return the number of extgstates
-	 * @protected
-	 * @since 3.0.000 (2008-03-27)
-	 */
-	protected function addExtGState($parms) {
-		if ($this->pdfa_mode) {
-			// transparencies are not allowed in PDF/A mode
-			return;
-		}
-		// check if this ExtGState already exist
-		foreach ($this->extgstates as $i => $ext) {
-			if ($ext['parms'] == $parms) {
-				if ($this->inxobj) {
-					// we are inside an XObject template
-					$this->xobjects[$this->xobjid]['extgstates'][$i] = $ext;
-				}
-				// return reference to existing ExtGState
-				return $i;
-			}
-		}
-		$n = (count($this->extgstates) + 1);
-		$this->extgstates[$n] = array('parms' => $parms);
-		if ($this->inxobj) {
-			// we are inside an XObject template
-			$this->xobjects[$this->xobjid]['extgstates'][$n] = $this->extgstates[$n];
-		}
-		return $n;
-	}
-
-	/**
-	 * Add an extgstate
-	 * @param $gs (array) extgstate
-	 * @protected
-	 * @since 3.0.000 (2008-03-27)
-	 */
-	protected function setExtGState($gs) {
-		if ($this->pdfa_mode OR ($this->state != 2)) {
-			// transparency is not allowed in PDF/A mode
-			return;
-		}
-		$this->_out(sprintf('/GS%d gs', $gs));
-	}
-
-	/**
-	 * Put extgstates for object transparency
-	 * @protected
-	 * @since 3.0.000 (2008-03-27)
-	 */
-	protected function _putextgstates() {
-		foreach ($this->extgstates as $i => $ext) {
-			$this->extgstates[$i]['n'] = $this->_newobj();
-			$out = '<< /Type /ExtGState';
-			foreach ($ext['parms'] as $k => $v) {
-				if (is_float($v)) {
-					$v = sprintf('%F', $v);
-				} elseif ($v === true) {
-					$v = 'true';
-				} elseif ($v === false) {
-					$v = 'false';
-				}
-				$out .= ' /'.$k.' '.$v;
-			}
-			$out .= ' >>';
-			$out .= "\n".'endobj';
-			$this->_out($out);
-		}
-	}
-
-	/**
-	 * Set overprint mode for stroking (OP) and non-stroking (op) painting operations.
-	 * (Check the "Entries in a Graphics State Parameter Dictionary" on PDF 32000-1:2008).
-	 * @param $stroking (boolean) If true apply overprint for stroking operations.
-	 * @param $nonstroking (boolean) If true apply overprint for painting operations other than stroking.
-	 * @param $mode (integer) Overprint mode: (0 = each source colour component value replaces the value previously painted for the corresponding device colorant; 1 = a tint value of 0.0 for a source colour component shall leave the corresponding component of the previously painted colour unchanged).
-	 * @public
-	 * @since 5.9.152 (2012-03-23)
-	 */
-	public function setOverprint($stroking=true, $nonstroking='', $mode=0) {
-		if ($this->state != 2) {
-			return;
-		}
-		$stroking = $stroking ? true : false;
-		if (TCPDF_STATIC::empty_string($nonstroking)) {
-			// default value if not set
-			$nonstroking = $stroking;
-		} else {
-			$nonstroking = $nonstroking ? true : false;
-		}
-		if (($mode != 0) AND ($mode != 1)) {
-			$mode = 0;
-		}
-		$this->overprint = array('OP' => $stroking, 'op' => $nonstroking, 'OPM' => $mode);
-		$gs = $this->addExtGState($this->overprint);
-		$this->setExtGState($gs);
-	}
-
-	/**
-	 * Get the overprint mode array (OP, op, OPM).
-	 * (Check the "Entries in a Graphics State Parameter Dictionary" on PDF 32000-1:2008).
-	 * @return array.
-	 * @public
-	 * @since 5.9.152 (2012-03-23)
-	 */
-	public function getOverprint() {
-		return $this->overprint;
-	}
-
-	/**
-	 * Set alpha for stroking (CA) and non-stroking (ca) operations.
-	 * @param $stroking (float) Alpha value for stroking operations: real value from 0 (transparent) to 1 (opaque).
-	 * @param $bm (string) blend mode, one of the following: Normal, Multiply, Screen, Overlay, Darken, Lighten, ColorDodge, ColorBurn, HardLight, SoftLight, Difference, Exclusion, Hue, Saturation, Color, Luminosity
-	 * @param $nonstroking (float) Alpha value for non-stroking operations: real value from 0 (transparent) to 1 (opaque).
-	 * @param $ais (boolean)
-	 * @public
-	 * @since 3.0.000 (2008-03-27)
-	 */
-	public function setAlpha($stroking=1, $bm='Normal', $nonstroking='', $ais=false) {
-		if ($this->pdfa_mode) {
-			// transparency is not allowed in PDF/A mode
-			return;
-		}
-		$stroking = floatval($stroking);
-		if (TCPDF_STATIC::empty_string($nonstroking)) {
-			// default value if not set
-			$nonstroking = $stroking;
-		} else {
-			$nonstroking = floatval($nonstroking);
-		}
-		if ($bm[0] == '/') {
-			// remove trailing slash
-			$bm = substr($bm, 1);
-		}
-		if (!in_array($bm, array('Normal', 'Multiply', 'Screen', 'Overlay', 'Darken', 'Lighten', 'ColorDodge', 'ColorBurn', 'HardLight', 'SoftLight', 'Difference', 'Exclusion', 'Hue', 'Saturation', 'Color', 'Luminosity'))) {
-			$bm = 'Normal';
-		}
-		$ais = $ais ? true : false;
-		$this->alpha = array('CA' => $stroking, 'ca' => $nonstroking, 'BM' => '/'.$bm, 'AIS' => $ais);
-		$gs = $this->addExtGState($this->alpha);
-		$this->setExtGState($gs);
-	}
-
-	/**
-	 * Get the alpha mode array (CA, ca, BM, AIS).
-	 * (Check the "Entries in a Graphics State Parameter Dictionary" on PDF 32000-1:2008).
-	 * @return array.
-	 * @public
-	 * @since 5.9.152 (2012-03-23)
-	 */
-	public function getAlpha() {
-		return $this->alpha;
-	}
-
-	/**
-	 * Set the default JPEG compression quality (1-100)
-	 * @param $quality (int) JPEG quality, integer between 1 and 100
-	 * @public
-	 * @since 3.0.000 (2008-03-27)
-	 */
-	public function setJPEGQuality($quality) {
-		if (($quality < 1) OR ($quality > 100)) {
-			$quality = 75;
-		}
-		$this->jpeg_quality = intval($quality);
-	}
-
-	/**
-	 * Set the default number of columns in a row for HTML tables.
-	 * @param $cols (int) number of columns
-	 * @public
-	 * @since 3.0.014 (2008-06-04)
-	 */
-	public function setDefaultTableColumns($cols=4) {
-		$this->default_table_columns = intval($cols);
-	}
-
-	/**
-	 * Set the height of the cell (line height) respect the font height.
-	 * @param $h (int) cell proportion respect font height (typical value = 1.25).
-	 * @public
-	 * @since 3.0.014 (2008-06-04)
-	 */
-	public function setCellHeightRatio($h) {
-		$this->cell_height_ratio = $h;
-	}
-
-	/**
-	 * return the height of cell repect font height.
-	 * @public
-	 * @since 4.0.012 (2008-07-24)
-	 */
-	public function getCellHeightRatio() {
-		return $this->cell_height_ratio;
-	}
-
-	/**
-	 * Set the PDF version (check PDF reference for valid values).
-	 * @param $version (string) PDF document version.
-	 * @public
-	 * @since 3.1.000 (2008-06-09)
-	 */
-	public function setPDFVersion($version='1.7') {
-		if ($this->pdfa_mode) {
-			// PDF/A mode
-			$this->PDFVersion = '1.4';
-		} else {
-			$this->PDFVersion = $version;
-		}
-	}
-
-	/**
-	 * Set the viewer preferences dictionary controlling the way the document is to be presented on the screen or in print.
-	 * (see Section 8.1 of PDF reference, "Viewer Preferences").
-	 * <ul><li>HideToolbar boolean (Optional) A flag specifying whether to hide the viewer application's tool bars when the document is active. Default value: false.</li><li>HideMenubar boolean (Optional) A flag specifying whether to hide the viewer application's menu bar when the document is active. Default value: false.</li><li>HideWindowUI boolean (Optional) A flag specifying whether to hide user interface elements in the document's window (such as scroll bars and navigation controls), leaving only the document's contents displayed. Default value: false.</li><li>FitWindow boolean (Optional) A flag specifying whether to resize the document's window to fit the size of the first displayed page. Default value: false.</li><li>CenterWindow boolean (Optional) A flag specifying whether to position the document's window in the center of the screen. Default value: false.</li><li>DisplayDocTitle boolean (Optional; PDF 1.4) A flag specifying whether the window's title bar should display the document title taken from the Title entry of the document information dictionary (see Section 10.2.1, "Document Information Dictionary"). If false, the title bar should instead display the name of the PDF file containing the document. Default value: false.</li><li>NonFullScreenPageMode name (Optional) The document's page mode, specifying how to display the document on exiting full-screen mode:<ul><li>UseNone Neither document outline nor thumbnail images visible</li><li>UseOutlines Document outline visible</li><li>UseThumbs Thumbnail images visible</li><li>UseOC Optional content group panel visible</li></ul>This entry is meaningful only if the value of the PageMode entry in the catalog dictionary (see Section 3.6.1, "Document Catalog") is FullScreen; it is ignored otherwise. Default value: UseNone.</li><li>ViewArea name (Optional; PDF 1.4) The name of the page boundary representing the area of a page to be displayed when viewing the document on the screen. Valid values are (see Section 10.10.1, "Page Boundaries").:<ul><li>MediaBox</li><li>CropBox (default)</li><li>BleedBox</li><li>TrimBox</li><li>ArtBox</li></ul></li><li>ViewClip name (Optional; PDF 1.4) The name of the page boundary to which the contents of a page are to be clipped when viewing the document on the screen. Valid values are (see Section 10.10.1, "Page Boundaries").:<ul><li>MediaBox</li><li>CropBox (default)</li><li>BleedBox</li><li>TrimBox</li><li>ArtBox</li></ul></li><li>PrintArea name (Optional; PDF 1.4) The name of the page boundary representing the area of a page to be rendered when printing the document. Valid values are (see Section 10.10.1, "Page Boundaries").:<ul><li>MediaBox</li><li>CropBox (default)</li><li>BleedBox</li><li>TrimBox</li><li>ArtBox</li></ul></li><li>PrintClip name (Optional; PDF 1.4) The name of the page boundary to which the contents of a page are to be clipped when printing the document. Valid values are (see Section 10.10.1, "Page Boundaries").:<ul><li>MediaBox</li><li>CropBox (default)</li><li>BleedBox</li><li>TrimBox</li><li>ArtBox</li></ul></li><li>PrintScaling name (Optional; PDF 1.6) The page scaling option to be selected when a print dialog is displayed for this document. Valid values are: <ul><li>None, which indicates that the print dialog should reflect no page scaling</li><li>AppDefault (default), which indicates that applications should use the current print scaling</li></ul></li><li>Duplex name (Optional; PDF 1.7) The paper handling option to use when printing the file from the print dialog. The following values are valid:<ul><li>Simplex - Print single-sided</li><li>DuplexFlipShortEdge - Duplex and flip on the short edge of the sheet</li><li>DuplexFlipLongEdge - Duplex and flip on the long edge of the sheet</li></ul>Default value: none</li><li>PickTrayByPDFSize boolean (Optional; PDF 1.7) A flag specifying whether the PDF page size is used to select the input paper tray. This setting influences only the preset values used to populate the print dialog presented by a PDF viewer application. If PickTrayByPDFSize is true, the check box in the print dialog associated with input paper tray is checked. Note: This setting has no effect on Mac OS systems, which do not provide the ability to pick the input tray by size.</li><li>PrintPageRange array (Optional; PDF 1.7) The page numbers used to initialize the print dialog box when the file is printed. The first page of the PDF file is denoted by 1. Each pair consists of the first and last pages in the sub-range. An odd number of integers causes this entry to be ignored. Negative numbers cause the entire array to be ignored. Default value: as defined by PDF viewer application</li><li>NumCopies integer (Optional; PDF 1.7) The number of copies to be printed when the print dialog is opened for this file. Supported values are the integers 2 through 5. Values outside this range are ignored. Default value: as defined by PDF viewer application, but typically 1</li></ul>
-	 * @param $preferences (array) array of options.
-	 * @author Nicola Asuni
-	 * @public
-	 * @since 3.1.000 (2008-06-09)
-	 */
-	public function setViewerPreferences($preferences) {
-		$this->viewer_preferences = $preferences;
-	}
-
-	/**
-	 * Paints color transition registration bars
-	 * @param $x (float) abscissa of the top left corner of the rectangle.
-	 * @param $y (float) ordinate of the top left corner of the rectangle.
-	 * @param $w (float) width of the rectangle.
-	 * @param $h (float) height of the rectangle.
-	 * @param $transition (boolean) if true prints tcolor transitions to white.
-	 * @param $vertical (boolean) if true prints bar vertically.
-	 * @param $colors (string) colors to print separated by comma. Valid values are: A,W,R,G,B,C,M,Y,K,RGB,CMYK,ALL,ALLSPOT,<SPOT_COLOR_NAME>. Where: A = grayscale black, W = grayscale white, R = RGB red, G RGB green, B RGB blue, C = CMYK cyan, M = CMYK magenta, Y = CMYK yellow, K = CMYK key/black, RGB = RGB registration color, CMYK = CMYK registration color, ALL = Spot registration color, ALLSPOT = print all defined spot colors, <SPOT_COLOR_NAME> = name of the spot color to print.
-	 * @author Nicola Asuni
-	 * @since 4.9.000 (2010-03-26)
-	 * @public
-	 */
-	public function colorRegistrationBar($x, $y, $w, $h, $transition=true, $vertical=false, $colors='A,R,G,B,C,M,Y,K') {
-		if (strpos($colors, 'ALLSPOT') !== false) {
-			// expand spot colors
-			$spot_colors = '';
-			foreach ($this->spot_colors as $spot_color_name => $v) {
-				$spot_colors .= ','.$spot_color_name;
-			}
-			if (!empty($spot_colors)) {
-				$spot_colors = substr($spot_colors, 1);
-				$colors = str_replace('ALLSPOT', $spot_colors, $colors);
-			} else {
-				$colors = str_replace('ALLSPOT', 'NONE', $colors);
-			}
-		}
-		$bars = explode(',', $colors);
-		$numbars = count($bars); // number of bars to print
-		if ($numbars <= 0) {
-			return;
-		}
-		// set bar measures
-		if ($vertical) {
-			$coords = array(0, 0, 0, 1);
-			$wb = $w / $numbars; // bar width
-			$hb = $h; // bar height
-			$xd = $wb; // delta x
-			$yd = 0; // delta y
-		} else {
-			$coords = array(1, 0, 0, 0);
-			$wb = $w; // bar width
-			$hb = $h / $numbars; // bar height
-			$xd = 0; // delta x
-			$yd = $hb; // delta y
-		}
-		$xb = $x;
-		$yb = $y;
-		foreach ($bars as $col) {
-			switch ($col) {
-				// set transition colors
-				case 'A': { // BLACK (GRAYSCALE)
-					$col_a = array(255);
-					$col_b = array(0);
-					break;
-				}
-				case 'W': { // WHITE (GRAYSCALE)
-					$col_a = array(0);
-					$col_b = array(255);
-					break;
-				}
-				case 'R': { // RED (RGB)
-					$col_a = array(255,255,255);
-					$col_b = array(255,0,0);
-					break;
-				}
-				case 'G': { // GREEN (RGB)
-					$col_a = array(255,255,255);
-					$col_b = array(0,255,0);
-					break;
-				}
-				case 'B': { // BLUE (RGB)
-					$col_a = array(255,255,255);
-					$col_b = array(0,0,255);
-					break;
-				}
-				case 'C': { // CYAN (CMYK)
-					$col_a = array(0,0,0,0);
-					$col_b = array(100,0,0,0);
-					break;
-				}
-				case 'M': { // MAGENTA (CMYK)
-					$col_a = array(0,0,0,0);
-					$col_b = array(0,100,0,0);
-					break;
-				}
-				case 'Y': { // YELLOW (CMYK)
-					$col_a = array(0,0,0,0);
-					$col_b = array(0,0,100,0);
-					break;
-				}
-				case 'K': { // KEY - BLACK (CMYK)
-					$col_a = array(0,0,0,0);
-					$col_b = array(0,0,0,100);
-					break;
-				}
-				case 'RGB': { // BLACK REGISTRATION (RGB)
-					$col_a = array(255,255,255);
-					$col_b = array(0,0,0);
-					break;
-				}
-				case 'CMYK': { // BLACK REGISTRATION (CMYK)
-					$col_a = array(0,0,0,0);
-					$col_b = array(100,100,100,100);
-					break;
-				}
-				case 'ALL': { // SPOT COLOR REGISTRATION
-					$col_a = array(0,0,0,0,'None');
-					$col_b = array(100,100,100,100,'All');
-					break;
-				}
-				case 'NONE': { // SKIP THIS COLOR
-					$col_a = array(0,0,0,0,'None');
-					$col_b = array(0,0,0,0,'None');
-					break;
-				}
-				default: { // SPECIFIC SPOT COLOR NAME
-					$col_a = array(0,0,0,0,'None');
-					$col_b = TCPDF_COLORS::getSpotColor($col, $this->spot_colors);
-					if ($col_b === false) {
-						// in case of error defaults to the registration color
-						$col_b = array(100,100,100,100,'All');
-					}
-					break;
-				}
-			}
-			if ($col != 'NONE') {
-				if ($transition) {
-					// color gradient
-					$this->LinearGradient($xb, $yb, $wb, $hb, $col_a, $col_b, $coords);
-				} else {
-					$this->SetFillColorArray($col_b);
-					// colored rectangle
-					$this->Rect($xb, $yb, $wb, $hb, 'F', array());
-				}
-				$xb += $xd;
-				$yb += $yd;
-			}
-		}
-	}
-
-	/**
-	 * Paints crop marks.
-	 * @param $x (float) abscissa of the crop mark center.
-	 * @param $y (float) ordinate of the crop mark center.
-	 * @param $w (float) width of the crop mark.
-	 * @param $h (float) height of the crop mark.
-	 * @param $type (string) type of crop mark, one symbol per type separated by comma: T = TOP, F = BOTTOM, L = LEFT, R = RIGHT, TL = A = TOP-LEFT, TR = B = TOP-RIGHT, BL = C = BOTTOM-LEFT, BR = D = BOTTOM-RIGHT.
-	 * @param $color (array) crop mark color (default spot registration color).
-	 * @author Nicola Asuni
-	 * @since 4.9.000 (2010-03-26)
-	 * @public
-	 */
-	public function cropMark($x, $y, $w, $h, $type='T,R,B,L', $color=array(100,100,100,100,'All')) {
-		$this->SetLineStyle(array('width' => (0.5 / $this->k), 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => $color));
-		$type = strtoupper($type);
-		$type = preg_replace('/[^A-Z\-\,]*/', '', $type);
-		// split type in single components
-		$type = str_replace('-', ',', $type);
-		$type = str_replace('TL', 'T,L', $type);
-		$type = str_replace('TR', 'T,R', $type);
-		$type = str_replace('BL', 'F,L', $type);
-		$type = str_replace('BR', 'F,R', $type);
-		$type = str_replace('A', 'T,L', $type);
-		$type = str_replace('B', 'T,R', $type);
-		$type = str_replace('T,RO', 'BO', $type);
-		$type = str_replace('C', 'F,L', $type);
-		$type = str_replace('D', 'F,R', $type);
-		$crops = explode(',', strtoupper($type));
-		// remove duplicates
-		$crops = array_unique($crops);
-		$dw = ($w / 4); // horizontal space to leave before the intersection point
-		$dh = ($h / 4); // vertical space to leave before the intersection point
-		foreach ($crops as $crop) {
-			switch ($crop) {
-				case 'T':
-				case 'TOP': {
-					$x1 = $x;
-					$y1 = ($y - $h);
-					$x2 = $x;
-					$y2 = ($y - $dh);
-					break;
-				}
-				case 'F':
-				case 'BOTTOM': {
-					$x1 = $x;
-					$y1 = ($y + $dh);
-					$x2 = $x;
-					$y2 = ($y + $h);
-					break;
-				}
-				case 'L':
-				case 'LEFT': {
-					$x1 = ($x - $w);
-					$y1 = $y;
-					$x2 = ($x - $dw);
-					$y2 = $y;
-					break;
-				}
-				case 'R':
-				case 'RIGHT': {
-					$x1 = ($x + $dw);
-					$y1 = $y;
-					$x2 = ($x + $w);
-					$y2 = $y;
-					break;
-				}
-			}
-			$this->Line($x1, $y1, $x2, $y2);
-		}
-	}
-
-	/**
-	 * Paints a registration mark
-	 * @param $x (float) abscissa of the registration mark center.
-	 * @param $y (float) ordinate of the registration mark center.
-	 * @param $r (float) radius of the crop mark.
-	 * @param $double (boolean) if true print two concentric crop marks.
-	 * @param $cola (array) crop mark color (default spot registration color 'All').
-	 * @param $colb (array) second crop mark color (default spot registration color 'None').
-	 * @author Nicola Asuni
-	 * @since 4.9.000 (2010-03-26)
-	 * @public
-	 */
-	public function registrationMark($x, $y, $r, $double=false, $cola=array(100,100,100,100,'All'), $colb=array(0,0,0,0,'None')) {
-		$line_style = array('width' => max((0.5 / $this->k),($r / 30)), 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => $cola);
-		$this->SetFillColorArray($cola);
-		$this->PieSector($x, $y, $r, 90, 180, 'F');
-		$this->PieSector($x, $y, $r, 270, 360, 'F');
-		$this->Circle($x, $y, $r, 0, 360, 'C', $line_style, array(), 8);
-		if ($double) {
-			$ri = $r * 0.5;
-			$this->SetFillColorArray($colb);
-			$this->PieSector($x, $y, $ri, 90, 180, 'F');
-			$this->PieSector($x, $y, $ri, 270, 360, 'F');
-			$this->SetFillColorArray($cola);
-			$this->PieSector($x, $y, $ri, 0, 90, 'F');
-			$this->PieSector($x, $y, $ri, 180, 270, 'F');
-			$this->Circle($x, $y, $ri, 0, 360, 'C', $line_style, array(), 8);
-		}
-	}
-
-	/**
-	 * Paints a CMYK registration mark
-	 * @param $x (float) abscissa of the registration mark center.
-	 * @param $y (float) ordinate of the registration mark center.
-	 * @param $r (float) radius of the crop mark.
-	 * @author Nicola Asuni
-	 * @since 6.0.038 (2013-09-30)
-	 * @public
-	 */
-	public function registrationMarkCMYK($x, $y, $r) {
-		// line width
-		$lw = max((0.5 / $this->k),($r / 8));
-		// internal radius
-		$ri = ($r * 0.6);
-		// external radius
-		$re = ($r * 1.3);
-		// Cyan
-		$this->SetFillColorArray(array(100,0,0,0));
-		$this->PieSector($x, $y, $ri, 270, 360, 'F');
-		// Magenta
-		$this->SetFillColorArray(array(0,100,0,0));
-		$this->PieSector($x, $y, $ri, 0, 90, 'F');
-		// Yellow
-		$this->SetFillColorArray(array(0,0,100,0));
-		$this->PieSector($x, $y, $ri, 90, 180, 'F');
-		// Key - black
-		$this->SetFillColorArray(array(0,0,0,100));
-		$this->PieSector($x, $y, $ri, 180, 270, 'F');
-		// registration color
-		$line_style = array('width' => $lw, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(100,100,100,100,'All'));
-		$this->SetFillColorArray(array(100,100,100,100,'All'));
-		// external circle
-		$this->Circle($x, $y, $r, 0, 360, 'C', $line_style, array(), 8);
-		// cross lines
-		$this->Line($x, ($y - $re), $x, ($y - $ri));
-		$this->Line($x, ($y + $ri), $x, ($y + $re));
-		$this->Line(($x - $re), $y, ($x - $ri), $y);
-		$this->Line(($x + $ri), $y, ($x + $re), $y);
-	}
-
-	/**
-	 * Paints a linear colour gradient.
-	 * @param $x (float) abscissa of the top left corner of the rectangle.
-	 * @param $y (float) ordinate of the top left corner of the rectangle.
-	 * @param $w (float) width of the rectangle.
-	 * @param $h (float) height of the rectangle.
-	 * @param $col1 (array) first color (Grayscale, RGB or CMYK components).
-	 * @param $col2 (array) second color (Grayscale, RGB or CMYK components).
-	 * @param $coords (array) array of the form (x1, y1, x2, y2) which defines the gradient vector (see linear_gradient_coords.jpg). The default value is from left to right (x1=0, y1=0, x2=1, y2=0).
-	 * @author Andreas W\FCrmser, Nicola Asuni
-	 * @since 3.1.000 (2008-06-09)
-	 * @public
-	 */
-	public function LinearGradient($x, $y, $w, $h, $col1=array(), $col2=array(), $coords=array(0,0,1,0)) {
-		$this->Clip($x, $y, $w, $h);
-		$this->Gradient(2, $coords, array(array('color' => $col1, 'offset' => 0, 'exponent' => 1), array('color' => $col2, 'offset' => 1, 'exponent' => 1)), array(), false);
-	}
-
-	/**
-	 * Paints a radial colour gradient.
-	 * @param $x (float) abscissa of the top left corner of the rectangle.
-	 * @param $y (float) ordinate of the top left corner of the rectangle.
-	 * @param $w (float) width of the rectangle.
-	 * @param $h (float) height of the rectangle.
-	 * @param $col1 (array) first color (Grayscale, RGB or CMYK components).
-	 * @param $col2 (array) second color (Grayscale, RGB or CMYK components).
-	 * @param $coords (array) array of the form (fx, fy, cx, cy, r) where (fx, fy) is the starting point of the gradient with color1, (cx, cy) is the center of the circle with color2, and r is the radius of the circle (see radial_gradient_coords.jpg). (fx, fy) should be inside the circle, otherwise some areas will not be defined.
-	 * @author Andreas W\FCrmser, Nicola Asuni
-	 * @since 3.1.000 (2008-06-09)
-	 * @public
-	 */
-	public function RadialGradient($x, $y, $w, $h, $col1=array(), $col2=array(), $coords=array(0.5,0.5,0.5,0.5,1)) {
-		$this->Clip($x, $y, $w, $h);
-		$this->Gradient(3, $coords, array(array('color' => $col1, 'offset' => 0, 'exponent' => 1), array('color' => $col2, 'offset' => 1, 'exponent' => 1)), array(), false);
-	}
-
-	/**
-	 * Paints a coons patch mesh.
-	 * @param $x (float) abscissa of the top left corner of the rectangle.
-	 * @param $y (float) ordinate of the top left corner of the rectangle.
-	 * @param $w (float) width of the rectangle.
-	 * @param $h (float) height of the rectangle.
-	 * @param $col1 (array) first color (lower left corner) (RGB components).
-	 * @param $col2 (array) second color (lower right corner) (RGB components).
-	 * @param $col3 (array) third color (upper right corner) (RGB components).
-	 * @param $col4 (array) fourth color (upper left corner) (RGB components).
-	 * @param $coords (array) <ul><li>for one patch mesh: array(float x1, float y1, .... float x12, float y12): 12 pairs of coordinates (normally from 0 to 1) which specify the Bezier control points that define the patch. First pair is the lower left edge point, next is its right control point (control point 2). Then the other points are defined in the order: control point 1, edge point, control point 2 going counter-clockwise around the patch. Last (x12, y12) is the first edge point's left control point (control point 1).</li><li>for two or more patch meshes: array[number of patches]: arrays with the following keys for each patch: f: where to put that patch (0 = first patch, 1, 2, 3 = right, top and left of precedent patch - I didn't figure this out completely - just try and error ;-) points: 12 pairs of coordinates of the Bezier control points as above for the first patch, 8 pairs of coordinates for the following patches, ignoring the coordinates already defined by the precedent patch (I also didn't figure out the order of these - also: try and see what's happening) colors: must be 4 colors for the first patch, 2 colors for the following patches</li></ul>
-	 * @param $coords_min (array) minimum value used by the coordinates. If a coordinate's value is smaller than this it will be cut to coords_min. default: 0
-	 * @param $coords_max (array) maximum value used by the coordinates. If a coordinate's value is greater than this it will be cut to coords_max. default: 1
-	 * @param $antialias (boolean) A flag indicating whether to filter the shading function to prevent aliasing artifacts.
-	 * @author Andreas W\FCrmser, Nicola Asuni
-	 * @since 3.1.000 (2008-06-09)
-	 * @public
-	 */
-	public function CoonsPatchMesh($x, $y, $w, $h, $col1=array(), $col2=array(), $col3=array(), $col4=array(), $coords=array(0.00,0.0,0.33,0.00,0.67,0.00,1.00,0.00,1.00,0.33,1.00,0.67,1.00,1.00,0.67,1.00,0.33,1.00,0.00,1.00,0.00,0.67,0.00,0.33), $coords_min=0, $coords_max=1, $antialias=false) {
-		if ($this->pdfa_mode OR ($this->state != 2)) {
-			return;
-		}
-		$this->Clip($x, $y, $w, $h);
-		$n = count($this->gradients) + 1;
-		$this->gradients[$n] = array();
-		$this->gradients[$n]['type'] = 6; //coons patch mesh
-		$this->gradients[$n]['coords'] = array();
-		$this->gradients[$n]['antialias'] = $antialias;
-		$this->gradients[$n]['colors'] = array();
-		$this->gradients[$n]['transparency'] = false;
-		//check the coords array if it is the simple array or the multi patch array
-		if (!isset($coords[0]['f'])) {
-			//simple array -> convert to multi patch array
-			if (!isset($col1[1])) {
-				$col1[1] = $col1[2] = $col1[0];
-			}
-			if (!isset($col2[1])) {
-				$col2[1] = $col2[2] = $col2[0];
-			}
-			if (!isset($col3[1])) {
-				$col3[1] = $col3[2] = $col3[0];
-			}
-			if (!isset($col4[1])) {
-				$col4[1] = $col4[2] = $col4[0];
-			}
-			$patch_array[0]['f'] = 0;
-			$patch_array[0]['points'] = $coords;
-			$patch_array[0]['colors'][0]['r'] = $col1[0];
-			$patch_array[0]['colors'][0]['g'] = $col1[1];
-			$patch_array[0]['colors'][0]['b'] = $col1[2];
-			$patch_array[0]['colors'][1]['r'] = $col2[0];
-			$patch_array[0]['colors'][1]['g'] = $col2[1];
-			$patch_array[0]['colors'][1]['b'] = $col2[2];
-			$patch_array[0]['colors'][2]['r'] = $col3[0];
-			$patch_array[0]['colors'][2]['g'] = $col3[1];
-			$patch_array[0]['colors'][2]['b'] = $col3[2];
-			$patch_array[0]['colors'][3]['r'] = $col4[0];
-			$patch_array[0]['colors'][3]['g'] = $col4[1];
-			$patch_array[0]['colors'][3]['b'] = $col4[2];
-		} else {
-			//multi patch array
-			$patch_array = $coords;
-		}
-		$bpcd = 65535; //16 bits per coordinate
-		//build the data stream
-		$this->gradients[$n]['stream'] = '';
-		$count_patch = count($patch_array);
-		for ($i=0; $i < $count_patch; ++$i) {
-			$this->gradients[$n]['stream'] .= chr($patch_array[$i]['f']); //start with the edge flag as 8 bit
-			$count_points = count($patch_array[$i]['points']);
-			for ($j=0; $j < $count_points; ++$j) {
-				//each point as 16 bit
-				$patch_array[$i]['points'][$j] = (($patch_array[$i]['points'][$j] - $coords_min) / ($coords_max - $coords_min)) * $bpcd;
-				if ($patch_array[$i]['points'][$j] < 0) {
-					$patch_array[$i]['points'][$j] = 0;
-				}
-				if ($patch_array[$i]['points'][$j] > $bpcd) {
-					$patch_array[$i]['points'][$j] = $bpcd;
-				}
-				$this->gradients[$n]['stream'] .= chr(floor($patch_array[$i]['points'][$j] / 256));
-				$this->gradients[$n]['stream'] .= chr(floor($patch_array[$i]['points'][$j] % 256));
-			}
-			$count_cols = count($patch_array[$i]['colors']);
-			for ($j=0; $j < $count_cols; ++$j) {
-				//each color component as 8 bit
-				$this->gradients[$n]['stream'] .= chr($patch_array[$i]['colors'][$j]['r']);
-				$this->gradients[$n]['stream'] .= chr($patch_array[$i]['colors'][$j]['g']);
-				$this->gradients[$n]['stream'] .= chr($patch_array[$i]['colors'][$j]['b']);
-			}
-		}
-		//paint the gradient
-		$this->_out('/Sh'.$n.' sh');
-		//restore previous Graphic State
-		$this->_outRestoreGraphicsState();
-		if ($this->inxobj) {
-			// we are inside an XObject template
-			$this->xobjects[$this->xobjid]['gradients'][$n] = $this->gradients[$n];
-		}
-	}
-
-	/**
-	 * Set a rectangular clipping area.
-	 * @param $x (float) abscissa of the top left corner of the rectangle (or top right corner for RTL mode).
-	 * @param $y (float) ordinate of the top left corner of the rectangle.
-	 * @param $w (float) width of the rectangle.
-	 * @param $h (float) height of the rectangle.
-	 * @author Andreas W\FCrmser, Nicola Asuni
-	 * @since 3.1.000 (2008-06-09)
-	 * @protected
-	 */
-	protected function Clip($x, $y, $w, $h) {
-		if ($this->state != 2) {
-			 return;
-		}
-		if ($this->rtl) {
-			$x = $this->w - $x - $w;
-		}
-		//save current Graphic State
-		$s = 'q';
-		//set clipping area
-		$s .= sprintf(' %F %F %F %F re W n', $x*$this->k, ($this->h-$y)*$this->k, $w*$this->k, -$h*$this->k);
-		//set up transformation matrix for gradient
-		$s .= sprintf(' %F 0 0 %F %F %F cm', $w*$this->k, $h*$this->k, $x*$this->k, ($this->h-($y+$h))*$this->k);
-		$this->_out($s);
-	}
-
-	/**
-	 * Output gradient.
-	 * @param $type (int) type of gradient (1 Function-based shading; 2 Axial shading; 3 Radial shading; 4 Free-form Gouraud-shaded triangle mesh; 5 Lattice-form Gouraud-shaded triangle mesh; 6 Coons patch mesh; 7 Tensor-product patch mesh). (Not all types are currently supported)
-	 * @param $coords (array) array of coordinates.
-	 * @param $stops (array) array gradient color components: color = array of GRAY, RGB or CMYK color components; offset = (0 to 1) represents a location along the gradient vector; exponent = exponent of the exponential interpolation function (default = 1).
-	 * @param $background (array) An array of colour components appropriate to the colour space, specifying a single background colour value.
-	 * @param $antialias (boolean) A flag indicating whether to filter the shading function to prevent aliasing artifacts.
-	 * @author Nicola Asuni
-	 * @since 3.1.000 (2008-06-09)
-	 * @public
-	 */
-	public function Gradient($type, $coords, $stops, $background=array(), $antialias=false) {
-		if ($this->pdfa_mode OR ($this->state != 2)) {
-			return;
-		}
-		$n = count($this->gradients) + 1;
-		$this->gradients[$n] = array();
-		$this->gradients[$n]['type'] = $type;
-		$this->gradients[$n]['coords'] = $coords;
-		$this->gradients[$n]['antialias'] = $antialias;
-		$this->gradients[$n]['colors'] = array();
-		$this->gradients[$n]['transparency'] = false;
-		// color space
-		$numcolspace = count($stops[0]['color']);
-		$bcolor = array_values($background);
-		switch($numcolspace) {
-			case 5:   // SPOT
-			case 4: { // CMYK
-				$this->gradients[$n]['colspace'] = 'DeviceCMYK';
-				if (!empty($background)) {
-					$this->gradients[$n]['background'] = sprintf('%F %F %F %F', $bcolor[0]/100, $bcolor[1]/100, $bcolor[2]/100, $bcolor[3]/100);
-				}
-				break;
-			}
-			case 3: { // RGB
-				$this->gradients[$n]['colspace'] = 'DeviceRGB';
-				if (!empty($background)) {
-					$this->gradients[$n]['background'] = sprintf('%F %F %F', $bcolor[0]/255, $bcolor[1]/255, $bcolor[2]/255);
-				}
-				break;
-			}
-			case 1: { // GRAY SCALE
-				$this->gradients[$n]['colspace'] = 'DeviceGray';
-				if (!empty($background)) {
-					$this->gradients[$n]['background'] = sprintf('%F', $bcolor[0]/255);
-				}
-				break;
-			}
-		}
-		$num_stops = count($stops);
-		$last_stop_id = $num_stops - 1;
-		foreach ($stops as $key => $stop) {
-			$this->gradients[$n]['colors'][$key] = array();
-			// offset represents a location along the gradient vector
-			if (isset($stop['offset'])) {
-				$this->gradients[$n]['colors'][$key]['offset'] = $stop['offset'];
-			} else {
-				if ($key == 0) {
-					$this->gradients[$n]['colors'][$key]['offset'] = 0;
-				} elseif ($key == $last_stop_id) {
-					$this->gradients[$n]['colors'][$key]['offset'] = 1;
-				} else {
-					$offsetstep = (1 - $this->gradients[$n]['colors'][($key - 1)]['offset']) / ($num_stops - $key);
-					$this->gradients[$n]['colors'][$key]['offset'] = $this->gradients[$n]['colors'][($key - 1)]['offset'] + $offsetstep;
-				}
-			}
-			if (isset($stop['opacity'])) {
-				$this->gradients[$n]['colors'][$key]['opacity'] = $stop['opacity'];
-				if ((!$this->pdfa_mode) AND ($stop['opacity'] < 1)) {
-					$this->gradients[$n]['transparency'] = true;
-				}
-			} else {
-				$this->gradients[$n]['colors'][$key]['opacity'] = 1;
-			}
-			// exponent for the exponential interpolation function
-			if (isset($stop['exponent'])) {
-				$this->gradients[$n]['colors'][$key]['exponent'] = $stop['exponent'];
-			} else {
-				$this->gradients[$n]['colors'][$key]['exponent'] = 1;
-			}
-			// set colors
-			$color = array_values($stop['color']);
-			switch($numcolspace) {
-				case 5:   // SPOT
-				case 4: { // CMYK
-					$this->gradients[$n]['colors'][$key]['color'] = sprintf('%F %F %F %F', $color[0]/100, $color[1]/100, $color[2]/100, $color[3]/100);
-					break;
-				}
-				case 3: { // RGB
-					$this->gradients[$n]['colors'][$key]['color'] = sprintf('%F %F %F', $color[0]/255, $color[1]/255, $color[2]/255);
-					break;
-				}
-				case 1: { // GRAY SCALE
-					$this->gradients[$n]['colors'][$key]['color'] = sprintf('%F', $color[0]/255);
-					break;
-				}
-			}
-		}
-		if ($this->gradients[$n]['transparency']) {
-			// paint luminosity gradient
-			$this->_out('/TGS'.$n.' gs');
-		}
-		//paint the gradient
-		$this->_out('/Sh'.$n.' sh');
-		//restore previous Graphic State
-		$this->_outRestoreGraphicsState();
-		if ($this->inxobj) {
-			// we are inside an XObject template
-			$this->xobjects[$this->xobjid]['gradients'][$n] = $this->gradients[$n];
-		}
-	}
-
-	/**
-	 * Output gradient shaders.
-	 * @author Nicola Asuni
-	 * @since 3.1.000 (2008-06-09)
-	 * @protected
-	 */
-	function _putshaders() {
-		if ($this->pdfa_mode) {
-			return;
-		}
-		$idt = count($this->gradients); //index for transparency gradients
-		foreach ($this->gradients as $id => $grad) {
-			if (($grad['type'] == 2) OR ($grad['type'] == 3)) {
-				$fc = $this->_newobj();
-				$out = '<<';
-				$out .= ' /FunctionType 3';
-				$out .= ' /Domain [0 1]';
-				$functions = '';
-				$bounds = '';
-				$encode = '';
-				$i = 1;
-				$num_cols = count($grad['colors']);
-				$lastcols = $num_cols - 1;
-				for ($i = 1; $i < $num_cols; ++$i) {
-					$functions .= ($fc + $i).' 0 R ';
-					if ($i < $lastcols) {
-						$bounds .= sprintf('%F ', $grad['colors'][$i]['offset']);
-					}
-					$encode .= '0 1 ';
-				}
-				$out .= ' /Functions ['.trim($functions).']';
-				$out .= ' /Bounds ['.trim($bounds).']';
-				$out .= ' /Encode ['.trim($encode).']';
-				$out .= ' >>';
-				$out .= "\n".'endobj';
-				$this->_out($out);
-				for ($i = 1; $i < $num_cols; ++$i) {
-					$this->_newobj();
-					$out = '<<';
-					$out .= ' /FunctionType 2';
-					$out .= ' /Domain [0 1]';
-					$out .= ' /C0 ['.$grad['colors'][($i - 1)]['color'].']';
-					$out .= ' /C1 ['.$grad['colors'][$i]['color'].']';
-					$out .= ' /N '.$grad['colors'][$i]['exponent'];
-					$out .= ' >>';
-					$out .= "\n".'endobj';
-					$this->_out($out);
-				}
-				// set transparency functions
-				if ($grad['transparency']) {
-					$ft = $this->_newobj();
-					$out = '<<';
-					$out .= ' /FunctionType 3';
-					$out .= ' /Domain [0 1]';
-					$functions = '';
-					$i = 1;
-					$num_cols = count($grad['colors']);
-					for ($i = 1; $i < $num_cols; ++$i) {
-						$functions .= ($ft + $i).' 0 R ';
-					}
-					$out .= ' /Functions ['.trim($functions).']';
-					$out .= ' /Bounds ['.trim($bounds).']';
-					$out .= ' /Encode ['.trim($encode).']';
-					$out .= ' >>';
-					$out .= "\n".'endobj';
-					$this->_out($out);
-					for ($i = 1; $i < $num_cols; ++$i) {
-						$this->_newobj();
-						$out = '<<';
-						$out .= ' /FunctionType 2';
-						$out .= ' /Domain [0 1]';
-						$out .= ' /C0 ['.$grad['colors'][($i - 1)]['opacity'].']';
-						$out .= ' /C1 ['.$grad['colors'][$i]['opacity'].']';
-						$out .= ' /N '.$grad['colors'][$i]['exponent'];
-						$out .= ' >>';
-						$out .= "\n".'endobj';
-						$this->_out($out);
-					}
-				}
-			}
-			// set shading object
-			$this->_newobj();
-			$out = '<< /ShadingType '.$grad['type'];
-			if (isset($grad['colspace'])) {
-				$out .= ' /ColorSpace /'.$grad['colspace'];
-			} else {
-				$out .= ' /ColorSpace /DeviceRGB';
-			}
-			if (isset($grad['background']) AND !empty($grad['background'])) {
-				$out .= ' /Background ['.$grad['background'].']';
-			}
-			if (isset($grad['antialias']) AND ($grad['antialias'] === true)) {
-				$out .= ' /AntiAlias true';
-			}
-			if ($grad['type'] == 2) {
-				$out .= ' '.sprintf('/Coords [%F %F %F %F]', $grad['coords'][0], $grad['coords'][1], $grad['coords'][2], $grad['coords'][3]);
-				$out .= ' /Domain [0 1]';
-				$out .= ' /Function '.$fc.' 0 R';
-				$out .= ' /Extend [true true]';
-				$out .= ' >>';
-			} elseif ($grad['type'] == 3) {
-				//x0, y0, r0, x1, y1, r1
-				//at this this time radius of inner circle is 0
-				$out .= ' '.sprintf('/Coords [%F %F 0 %F %F %F]', $grad['coords'][0], $grad['coords'][1], $grad['coords'][2], $grad['coords'][3], $grad['coords'][4]);
-				$out .= ' /Domain [0 1]';
-				$out .= ' /Function '.$fc.' 0 R';
-				$out .= ' /Extend [true true]';
-				$out .= ' >>';
-			} elseif ($grad['type'] == 6) {
-				$out .= ' /BitsPerCoordinate 16';
-				$out .= ' /BitsPerComponent 8';
-				$out .= ' /Decode[0 1 0 1 0 1 0 1 0 1]';
-				$out .= ' /BitsPerFlag 8';
-				$stream = $this->_getrawstream($grad['stream']);
-				$out .= ' /Length '.strlen($stream);
-				$out .= ' >>';
-				$out .= ' stream'."\n".$stream."\n".'endstream';
-			}
-			$out .= "\n".'endobj';
-			$this->_out($out);
-			if ($grad['transparency']) {
-				$shading_transparency = preg_replace('/\/ColorSpace \/[^\s]+/si', '/ColorSpace /DeviceGray', $out);
-				$shading_transparency = preg_replace('/\/Function [0-9]+ /si', '/Function '.$ft.' ', $shading_transparency);
-			}
-			$this->gradients[$id]['id'] = $this->n;
-			// set pattern object
-			$this->_newobj();
-			$out = '<< /Type /Pattern /PatternType 2';
-			$out .= ' /Shading '.$this->gradients[$id]['id'].' 0 R';
-			$out .= ' >>';
-			$out .= "\n".'endobj';
-			$this->_out($out);
-			$this->gradients[$id]['pattern'] = $this->n;
-			// set shading and pattern for transparency mask
-			if ($grad['transparency']) {
-				// luminosity pattern
-				$idgs = $id + $idt;
-				$this->_newobj();
-				$this->_out($shading_transparency);
-				$this->gradients[$idgs]['id'] = $this->n;
-				$this->_newobj();
-				$out = '<< /Type /Pattern /PatternType 2';
-				$out .= ' /Shading '.$this->gradients[$idgs]['id'].' 0 R';
-				$out .= ' >>';
-				$out .= "\n".'endobj';
-				$this->_out($out);
-				$this->gradients[$idgs]['pattern'] = $this->n;
-				// luminosity XObject
-				$oid = $this->_newobj();
-				$this->xobjects['LX'.$oid] = array('n' => $oid);
-				$filter = '';
-				$stream = 'q /a0 gs /Pattern cs /p'.$idgs.' scn 0 0 '.$this->wPt.' '.$this->hPt.' re f Q';
-				if ($this->compress) {
-					$filter = ' /Filter /FlateDecode';
-					$stream = gzcompress($stream);
-				}
-				$stream = $this->_getrawstream($stream);
-				$out = '<< /Type /XObject /Subtype /Form /FormType 1'.$filter;
-				$out .= ' /Length '.strlen($stream);
-				$rect = sprintf('%F %F', $this->wPt, $this->hPt);
-				$out .= ' /BBox [0 0 '.$rect.']';
-				$out .= ' /Group << /Type /Group /S /Transparency /CS /DeviceGray >>';
-				$out .= ' /Resources <<';
-				$out .= ' /ExtGState << /a0 << /ca 1 /CA 1 >> >>';
-				$out .= ' /Pattern << /p'.$idgs.' '.$this->gradients[$idgs]['pattern'].' 0 R >>';
-				$out .= ' >>';
-				$out .= ' >> ';
-				$out .= ' stream'."\n".$stream."\n".'endstream';
-				$out .= "\n".'endobj';
-				$this->_out($out);
-				// SMask
-				$this->_newobj();
-				$out = '<< /Type /Mask /S /Luminosity /G '.($this->n - 1).' 0 R >>'."\n".'endobj';
-				$this->_out($out);
-				// ExtGState
-				$this->_newobj();
-				$out = '<< /Type /ExtGState /SMask '.($this->n - 1).' 0 R /AIS false >>'."\n".'endobj';
-				$this->_out($out);
-				$this->extgstates[] = array('n' => $this->n, 'name' => 'TGS'.$id);
-			}
-		}
-	}
-
-	/**
-	 * Draw the sector of a circle.
-	 * It can be used for instance to render pie charts.
-	 * @param $xc (float) abscissa of the center.
-	 * @param $yc (float) ordinate of the center.
-	 * @param $r (float) radius.
-	 * @param $a (float) start angle (in degrees).
-	 * @param $b (float) end angle (in degrees).
-	 * @param $style (string) Style of rendering. See the getPathPaintOperator() function for more information.
-	 * @param $cw: (float) indicates whether to go clockwise (default: true).
-	 * @param $o: (float) origin of angles (0 for 3 o'clock, 90 for noon, 180 for 9 o'clock, 270 for 6 o'clock). Default: 90.
-	 * @author Maxime Delorme, Nicola Asuni
-	 * @since 3.1.000 (2008-06-09)
-	 * @public
-	 */
-	public function PieSector($xc, $yc, $r, $a, $b, $style='FD', $cw=true, $o=90) {
-		$this->PieSectorXY($xc, $yc, $r, $r, $a, $b, $style, $cw, $o);
-	}
-
-	/**
-	 * Draw the sector of an ellipse.
-	 * It can be used for instance to render pie charts.
-	 * @param $xc (float) abscissa of the center.
-	 * @param $yc (float) ordinate of the center.
-	 * @param $rx (float) the x-axis radius.
-	 * @param $ry (float) the y-axis radius.
-	 * @param $a (float) start angle (in degrees).
-	 * @param $b (float) end angle (in degrees).
-	 * @param $style (string) Style of rendering. See the getPathPaintOperator() function for more information.
-	 * @param $cw: (float) indicates whether to go clockwise.
-	 * @param $o: (float) origin of angles (0 for 3 o'clock, 90 for noon, 180 for 9 o'clock, 270 for 6 o'clock).
-	 * @param $nc (integer) Number of curves used to draw a 90 degrees portion of arc.
-	 * @author Maxime Delorme, Nicola Asuni
-	 * @since 3.1.000 (2008-06-09)
-	 * @public
-	 */
-	public function PieSectorXY($xc, $yc, $rx, $ry, $a, $b, $style='FD', $cw=false, $o=0, $nc=2) {
-		if ($this->state != 2) {
-			 return;
-		}
-		if ($this->rtl) {
-			$xc = ($this->w - $xc);
-		}
-		$op = TCPDF_STATIC::getPathPaintOperator($style);
-		if ($op == 'f') {
-			$line_style = array();
-		}
-		if ($cw) {
-			$d = $b;
-			$b = (360 - $a + $o);
-			$a = (360 - $d + $o);
-		} else {
-			$b += $o;
-			$a += $o;
-		}
-		$this->_outellipticalarc($xc, $yc, $rx, $ry, 0, $a, $b, true, $nc);
-		$this->_out($op);
-	}
-
-	/**
-	 * Embed vector-based Adobe Illustrator (AI) or AI-compatible EPS files.
-	 * NOTE: EPS is not yet fully implemented, use the setRasterizeVectorImages() method to enable/disable rasterization of vector images using ImageMagick library.
-	 * Only vector drawing is supported, not text or bitmap.
-	 * Although the script was successfully tested with various AI format versions, best results are probably achieved with files that were exported in the AI3 format (tested with Illustrator CS2, Freehand MX and Photoshop CS2).
-	 * @param $file (string) Name of the file containing the image or a '@' character followed by the EPS/AI data string.
-	 * @param $x (float) Abscissa of the upper-left corner.
-	 * @param $y (float) Ordinate of the upper-left corner.
-	 * @param $w (float) Width of the image in the page. If not specified or equal to zero, it is automatically calculated.
-	 * @param $h (float) Height of the image in the page. If not specified or equal to zero, it is automatically calculated.
-	 * @param $link (mixed) URL or identifier returned by AddLink().
-	 * @param $useBoundingBox (boolean) specifies whether to position the bounding box (true) or the complete canvas (false) at location (x,y). Default value is true.
-	 * @param $align (string) Indicates the alignment of the pointer next to image insertion relative to image height. The value can be:<ul><li>T: top-right for LTR or top-left for RTL</li><li>M: middle-right for LTR or middle-left for RTL</li><li>B: bottom-right for LTR or bottom-left for RTL</li><li>N: next line</li></ul>
-	 * @param $palign (string) Allows to center or align the image on the current line. Possible values are:<ul><li>L : left align</li><li>C : center</li><li>R : right align</li><li>'' : empty string : left for LTR or right for RTL</li></ul>
-	 * @param $border (mixed) Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
-	 * @param $fitonpage (boolean) if true the image is resized to not exceed page dimensions.
-	 * @param $fixoutvals (boolean) if true remove values outside the bounding box.
-	 * @author Valentin Schmidt, Nicola Asuni
-	 * @since 3.1.000 (2008-06-09)
-	 * @public
-	 */
-	public function ImageEps($file, $x='', $y='', $w=0, $h=0, $link='', $useBoundingBox=true, $align='', $palign='', $border=0, $fitonpage=false, $fixoutvals=false) {
-		if ($this->state != 2) {
-			 return;
-		}
-		if ($this->rasterize_vector_images AND ($w > 0) AND ($h > 0)) {
-			// convert EPS to raster image using GD or ImageMagick libraries
-			return $this->Image($file, $x, $y, $w, $h, 'EPS', $link, $align, true, 300, $palign, false, false, $border, false, false, $fitonpage);
-		}
-		if ($x === '') {
-			$x = $this->x;
-		}
-		if ($y === '') {
-			$y = $this->y;
-		}
-		// check page for no-write regions and adapt page margins if necessary
-		list($x, $y) = $this->checkPageRegions($h, $x, $y);
-		$k = $this->k;
-		if ($file[0] === '@') { // image from string
-			$data = substr($file, 1);
-		} else { // EPS/AI file
-			$data = TCPDF_STATIC::fileGetContents($file);
-		}
-		if ($data === FALSE) {
-			$this->Error('EPS file not found: '.$file);
-		}
-		$regs = array();
-		// EPS/AI compatibility check (only checks files created by Adobe Illustrator!)
-		preg_match("/%%Creator:([^\r\n]+)/", $data, $regs); # find Creator
-		if (count($regs) > 1) {
-			$version_str = trim($regs[1]); # e.g. "Adobe Illustrator(R) 8.0"
-			if (strpos($version_str, 'Adobe Illustrator') !== false) {
-				$versexp = explode(' ', $version_str);
-				$version = (float)array_pop($versexp);
-				if ($version >= 9) {
-					$this->Error('This version of Adobe Illustrator file is not supported: '.$file);
-				}
-			}
-		}
-		// strip binary bytes in front of PS-header
-		$start = strpos($data, '%!PS-Adobe');
-		if ($start > 0) {
-			$data = substr($data, $start);
-		}
-		// find BoundingBox params
-		preg_match("/%%BoundingBox:([^\r\n]+)/", $data, $regs);
-		if (count($regs) > 1) {
-			list($x1, $y1, $x2, $y2) = explode(' ', trim($regs[1]));
-		} else {
-			$this->Error('No BoundingBox found in EPS/AI file: '.$file);
-		}
-		$start = strpos($data, '%%EndSetup');
-		if ($start === false) {
-			$start = strpos($data, '%%EndProlog');
-		}
-		if ($start === false) {
-			$start = strpos($data, '%%BoundingBox');
-		}
-		$data = substr($data, $start);
-		$end = strpos($data, '%%PageTrailer');
-		if ($end===false) {
-			$end = strpos($data, 'showpage');
-		}
-		if ($end) {
-			$data = substr($data, 0, $end);
-		}
-		// calculate image width and height on document
-		if (($w <= 0) AND ($h <= 0)) {
-			$w = ($x2 - $x1) / $k;
-			$h = ($y2 - $y1) / $k;
-		} elseif ($w <= 0) {
-			$w = ($x2-$x1) / $k * ($h / (($y2 - $y1) / $k));
-		} elseif ($h <= 0) {
-			$h = ($y2 - $y1) / $k * ($w / (($x2 - $x1) / $k));
-		}
-		// fit the image on available space
-		list($w, $h, $x, $y) = $this->fitBlock($w, $h, $x, $y, $fitonpage);
-		if ($this->rasterize_vector_images) {
-			// convert EPS to raster image using GD or ImageMagick libraries
-			return $this->Image($file, $x, $y, $w, $h, 'EPS', $link, $align, true, 300, $palign, false, false, $border, false, false, $fitonpage);
-		}
-		// set scaling factors
-		$scale_x = $w / (($x2 - $x1) / $k);
-		$scale_y = $h / (($y2 - $y1) / $k);
-		// set alignment
-		$this->img_rb_y = $y + $h;
-		// set alignment
-		if ($this->rtl) {
-			if ($palign == 'L') {
-				$ximg = $this->lMargin;
-			} elseif ($palign == 'C') {
-				$ximg = ($this->w + $this->lMargin - $this->rMargin - $w) / 2;
-			} elseif ($palign == 'R') {
-				$ximg = $this->w - $this->rMargin - $w;
-			} else {
-				$ximg = $x - $w;
-			}
-			$this->img_rb_x = $ximg;
-		} else {
-			if ($palign == 'L') {
-				$ximg = $this->lMargin;
-			} elseif ($palign == 'C') {
-				$ximg = ($this->w + $this->lMargin - $this->rMargin - $w) / 2;
-			} elseif ($palign == 'R') {
-				$ximg = $this->w - $this->rMargin - $w;
-			} else {
-				$ximg = $x;
-			}
-			$this->img_rb_x = $ximg + $w;
-		}
-		if ($useBoundingBox) {
-			$dx = $ximg * $k - $x1;
-			$dy = $y * $k - $y1;
-		} else {
-			$dx = $ximg * $k;
-			$dy = $y * $k;
-		}
-		// save the current graphic state
-		$this->_out('q'.$this->epsmarker);
-		// translate
-		$this->_out(sprintf('%F %F %F %F %F %F cm', 1, 0, 0, 1, $dx, $dy + ($this->hPt - (2 * $y * $k) - ($y2 - $y1))));
-		// scale
-		if (isset($scale_x)) {
-			$this->_out(sprintf('%F %F %F %F %F %F cm', $scale_x, 0, 0, $scale_y, $x1 * (1 - $scale_x), $y2 * (1 - $scale_y)));
-		}
-		// handle pc/unix/mac line endings
-		$lines = preg_split('/[\r\n]+/si', $data, -1, PREG_SPLIT_NO_EMPTY);
-		$u=0;
-		$cnt = count($lines);
-		for ($i=0; $i < $cnt; ++$i) {
-			$line = $lines[$i];
-			if (($line == '') OR ($line[0] == '%')) {
-				continue;
-			}
-			$len = strlen($line);
-			// check for spot color names
-			$color_name = '';
-			if (strcasecmp('x', substr(trim($line), -1)) == 0) {
-				if (preg_match('/\([^\)]*\)/', $line, $matches) > 0) {
-					// extract spot color name
-					$color_name = $matches[0];
-					// remove color name from string
-					$line = str_replace(' '.$color_name, '', $line);
-					// remove pharentesis from color name
-					$color_name = substr($color_name, 1, -1);
-				}
-			}
-			$chunks = explode(' ', $line);
-			$cmd = trim(array_pop($chunks));
-			// RGB
-			if (($cmd == 'Xa') OR ($cmd == 'XA')) {
-				$b = array_pop($chunks);
-				$g = array_pop($chunks);
-				$r = array_pop($chunks);
-				$this->_out(''.$r.' '.$g.' '.$b.' '.($cmd=='Xa'?'rg':'RG')); //substr($line, 0, -2).'rg' -> in EPS (AI8): c m y k r g b rg!
-				continue;
-			}
-			$skip = false;
-			if ($fixoutvals) {
-				// check for values outside the bounding box
-				switch ($cmd) {
-					case 'm':
-					case 'l':
-					case 'L': {
-						// skip values outside bounding box
-						foreach ($chunks as $key => $val) {
-							if ((($key % 2) == 0) AND (($val < $x1) OR ($val > $x2))) {
-								$skip = true;
-							} elseif ((($key % 2) != 0) AND (($val < $y1) OR ($val > $y2))) {
-								$skip = true;
-							}
-						}
-					}
-				}
-			}
-			switch ($cmd) {
-				case 'm':
-				case 'l':
-				case 'v':
-				case 'y':
-				case 'c':
-				case 'k':
-				case 'K':
-				case 'g':
-				case 'G':
-				case 's':
-				case 'S':
-				case 'J':
-				case 'j':
-				case 'w':
-				case 'M':
-				case 'd':
-				case 'n': {
-					if ($skip) {
-						break;
-					}
-					$this->_out($line);
-					break;
-				}
-				case 'x': {// custom fill color
-					if (empty($color_name)) {
-						// CMYK color
-						list($col_c, $col_m, $col_y, $col_k) = $chunks;
-						$this->_out(''.$col_c.' '.$col_m.' '.$col_y.' '.$col_k.' k');
-					} else {
-						// Spot Color (CMYK + tint)
-						list($col_c, $col_m, $col_y, $col_k, $col_t) = $chunks;
-						$this->AddSpotColor($color_name, ($col_c * 100), ($col_m * 100), ($col_y * 100), ($col_k * 100));
-						$color_cmd = sprintf('/CS%d cs %F scn', $this->spot_colors[$color_name]['i'], (1 - $col_t));
-						$this->_out($color_cmd);
-					}
-					break;
-				}
-				case 'X': { // custom stroke color
-					if (empty($color_name)) {
-						// CMYK color
-						list($col_c, $col_m, $col_y, $col_k) = $chunks;
-						$this->_out(''.$col_c.' '.$col_m.' '.$col_y.' '.$col_k.' K');
-					} else {
-						// Spot Color (CMYK + tint)
-						list($col_c, $col_m, $col_y, $col_k, $col_t) = $chunks;
-						$this->AddSpotColor($color_name, ($col_c * 100), ($col_m * 100), ($col_y * 100), ($col_k * 100));
-						$color_cmd = sprintf('/CS%d CS %F SCN', $this->spot_colors[$color_name]['i'], (1 - $col_t));
-						$this->_out($color_cmd);
-					}
-					break;
-				}
-				case 'Y':
-				case 'N':
-				case 'V':
-				case 'L':
-				case 'C': {
-					if ($skip) {
-						break;
-					}
-					$line[($len - 1)] = strtolower($cmd);
-					$this->_out($line);
-					break;
-				}
-				case 'b':
-				case 'B': {
-					$this->_out($cmd . '*');
-					break;
-				}
-				case 'f':
-				case 'F': {
-					if ($u > 0) {
-						$isU = false;
-						$max = min(($i + 5), $cnt);
-						for ($j = ($i + 1); $j < $max; ++$j) {
-							$isU = ($isU OR (($lines[$j] == 'U') OR ($lines[$j] == '*U')));
-						}
-						if ($isU) {
-							$this->_out('f*');
-						}
-					} else {
-						$this->_out('f*');
-					}
-					break;
-				}
-				case '*u': {
-					++$u;
-					break;
-				}
-				case '*U': {
-					--$u;
-					break;
-				}
-			}
-		}
-		// restore previous graphic state
-		$this->_out($this->epsmarker.'Q');
-		if (!empty($border)) {
-			$bx = $this->x;
-			$by = $this->y;
-			$this->x = $ximg;
-			if ($this->rtl) {
-				$this->x += $w;
-			}
-			$this->y = $y;
-			$this->Cell($w, $h, '', $border, 0, '', 0, '', 0, true);
-			$this->x = $bx;
-			$this->y = $by;
-		}
-		if ($link) {
-			$this->Link($ximg, $y, $w, $h, $link, 0);
-		}
-		// set pointer to align the next text/objects
-		switch($align) {
-			case 'T':{
-				$this->y = $y;
-				$this->x = $this->img_rb_x;
-				break;
-			}
-			case 'M':{
-				$this->y = $y + round($h/2);
-				$this->x = $this->img_rb_x;
-				break;
-			}
-			case 'B':{
-				$this->y = $this->img_rb_y;
-				$this->x = $this->img_rb_x;
-				break;
-			}
-			case 'N':{
-				$this->SetY($this->img_rb_y);
-				break;
-			}
-			default:{
-				break;
-			}
-		}
-		$this->endlinex = $this->img_rb_x;
-	}
-
-	/**
-	 * Set document barcode.
-	 * @param $bc (string) barcode
-	 * @public
-	 */
-	public function setBarcode($bc='') {
-		$this->barcode = $bc;
-	}
-
-	/**
-	 * Get current barcode.
-	 * @return string
-	 * @public
-	 * @since 4.0.012 (2008-07-24)
-	 */
-	public function getBarcode() {
-		return $this->barcode;
-	}
-
-	/**
-	 * Print a Linear Barcode.
-	 * @param $code (string) code to print
-	 * @param $type (string) type of barcode (see tcpdf_barcodes_1d.php for supported formats).
-	 * @param $x (int) x position in user units (empty string = current x position)
-	 * @param $y (int) y position in user units (empty string = current y position)
-	 * @param $w (int) width in user units (empty string = remaining page width)
-	 * @param $h (int) height in user units (empty string = remaining page height)
-	 * @param $xres (float) width of the smallest bar in user units (empty string = default value = 0.4mm)
-	 * @param $style (array) array of options:<ul>
-	 * <li>boolean $style['border'] if true prints a border</li>
-	 * <li>int $style['padding'] padding to leave around the barcode in user units (set to 'auto' for automatic padding)</li>
-	 * <li>int $style['hpadding'] horizontal padding in user units (set to 'auto' for automatic padding)</li>
-	 * <li>int $style['vpadding'] vertical padding in user units (set to 'auto' for automatic padding)</li>
-	 * <li>array $style['fgcolor'] color array for bars and text</li>
-	 * <li>mixed $style['bgcolor'] color array for background (set to false for transparent)</li>
-	 * <li>boolean $style['text'] if true prints text below the barcode</li>
-	 * <li>string $style['label'] override default label</li>
-	 * <li>string $style['font'] font name for text</li><li>int $style['fontsize'] font size for text</li>
-	 * <li>int $style['stretchtext']: 0 = disabled; 1 = horizontal scaling only if necessary; 2 = forced horizontal scaling; 3 = character spacing only if necessary; 4 = forced character spacing.</li>
-	 * <li>string $style['position'] horizontal position of the containing barcode cell on the page: L = left margin; C = center; R = right margin.</li>
-	 * <li>string $style['align'] horizontal position of the barcode on the containing rectangle: L = left; C = center; R = right.</li>
-	 * <li>string $style['stretch'] if true stretch the barcode to best fit the available width, otherwise uses $xres resolution for a single bar.</li>
-	 * <li>string $style['fitwidth'] if true reduce the width to fit the barcode width + padding. When this option is enabled the 'stretch' option is automatically disabled.</li>
-	 * <li>string $style['cellfitalign'] this option works only when 'fitwidth' is true and 'position' is unset or empty. Set the horizontal position of the containing barcode cell inside the specified rectangle: L = left; C = center; R = right.</li></ul>
-	 * @param $align (string) Indicates the alignment of the pointer next to barcode insertion relative to barcode height. The value can be:<ul><li>T: top-right for LTR or top-left for RTL</li><li>M: middle-right for LTR or middle-left for RTL</li><li>B: bottom-right for LTR or bottom-left for RTL</li><li>N: next line</li></ul>
-	 * @author Nicola Asuni
-	 * @since 3.1.000 (2008-06-09)
-	 * @public
-	 */
-	public function write1DBarcode($code, $type, $x='', $y='', $w='', $h='', $xres='', $style='', $align='') {
-		if (TCPDF_STATIC::empty_string(trim($code))) {
-			return;
-		}
-		require_once(dirname(__FILE__).'/tcpdf_barcodes_1d.php');
-		// save current graphic settings
-		$gvars = $this->getGraphicVars();
-		// create new barcode object
-		$barcodeobj = new TCPDFBarcode($code, $type);
-		$arrcode = $barcodeobj->getBarcodeArray();
-		if (($arrcode === false) OR empty($arrcode) OR ($arrcode['maxw'] <= 0)) {
-			$this->Error('Error in 1D barcode string');
-		}
-		if ($arrcode['maxh'] <= 0) {
-			$arrcode['maxh'] = 1;
-		}
-		// set default values
-		if (!isset($style['position'])) {
-			$style['position'] = '';
-		} elseif ($style['position'] == 'S') {
-			// keep this for backward compatibility
-			$style['position'] = '';
-			$style['stretch'] = true;
-		}
-		if (!isset($style['fitwidth'])) {
-			if (!isset($style['stretch'])) {
-				$style['fitwidth'] = true;
-			} else {
-				$style['fitwidth'] = false;
-			}
-		}
-		if ($style['fitwidth']) {
-			// disable stretch
-			$style['stretch'] = false;
-		}
-		if (!isset($style['stretch'])) {
-			if (($w === '') OR ($w <= 0)) {
-				$style['stretch'] = false;
-			} else {
-				$style['stretch'] = true;
-			}
-		}
-		if (!isset($style['fgcolor'])) {
-			$style['fgcolor'] = array(0,0,0); // default black
-		}
-		if (!isset($style['bgcolor'])) {
-			$style['bgcolor'] = false; // default transparent
-		}
-		if (!isset($style['border'])) {
-			$style['border'] = false;
-		}
-		$fontsize = 0;
-		if (!isset($style['text'])) {
-			$style['text'] = false;
-		}
-		if ($style['text'] AND isset($style['font'])) {
-			if (isset($style['fontsize'])) {
-				$fontsize = $style['fontsize'];
-			}
-			$this->SetFont($style['font'], '', $fontsize);
-		}
-		if (!isset($style['stretchtext'])) {
-			$style['stretchtext'] = 4;
-		}
-		if ($x === '') {
-			$x = $this->x;
-		}
-		if ($y === '') {
-			$y = $this->y;
-		}
-		// check page for no-write regions and adapt page margins if necessary
-		list($x, $y) = $this->checkPageRegions($h, $x, $y);
-		if (($w === '') OR ($w <= 0)) {
-			if ($this->rtl) {
-				$w = $x - $this->lMargin;
-			} else {
-				$w = $this->w - $this->rMargin - $x;
-			}
-		}
-		// padding
-		if (!isset($style['padding'])) {
-			$padding = 0;
-		} elseif ($style['padding'] === 'auto') {
-			$padding = 10 * ($w / ($arrcode['maxw'] + 20));
-		} else {
-			$padding = floatval($style['padding']);
-		}
-		// horizontal padding
-		if (!isset($style['hpadding'])) {
-			$hpadding = $padding;
-		} elseif ($style['hpadding'] === 'auto') {
-			$hpadding = 10 * ($w / ($arrcode['maxw'] + 20));
-		} else {
-			$hpadding = floatval($style['hpadding']);
-		}
-		// vertical padding
-		if (!isset($style['vpadding'])) {
-			$vpadding = $padding;
-		} elseif ($style['vpadding'] === 'auto') {
-			$vpadding = ($hpadding / 2);
-		} else {
-			$vpadding = floatval($style['vpadding']);
-		}
-		// calculate xres (single bar width)
-		$max_xres = ($w - (2 * $hpadding)) / $arrcode['maxw'];
-		if ($style['stretch']) {
-			$xres = $max_xres;
-		} else {
-			if (TCPDF_STATIC::empty_string($xres)) {
-				$xres = (0.141 * $this->k); // default bar width = 0.4 mm
-			}
-			if ($xres > $max_xres) {
-				// correct xres to fit on $w
-				$xres = $max_xres;
-			}
-			if ((isset($style['padding']) AND ($style['padding'] === 'auto'))
-				OR (isset($style['hpadding']) AND ($style['hpadding'] === 'auto'))) {
-				$hpadding = 10 * $xres;
-				if (isset($style['vpadding']) AND ($style['vpadding'] === 'auto')) {
-					$vpadding = ($hpadding / 2);
-				}
-			}
-		}
-		if ($style['fitwidth']) {
-			$wold = $w;
-			$w = (($arrcode['maxw'] * $xres) + (2 * $hpadding));
-			if (isset($style['cellfitalign'])) {
-				switch ($style['cellfitalign']) {
-					case 'L': {
-						if ($this->rtl) {
-							$x -= ($wold - $w);
-						}
-						break;
-					}
-					case 'R': {
-						if (!$this->rtl) {
-							$x += ($wold - $w);
-						}
-						break;
-					}
-					case 'C': {
-						if ($this->rtl) {
-							$x -= (($wold - $w) / 2);
-						} else {
-							$x += (($wold - $w) / 2);
-						}
-						break;
-					}
-					default : {
-						break;
-					}
-				}
-			}
-		}
-		$text_height = $this->getCellHeight($fontsize / $this->k);
-		// height
-		if (($h === '') OR ($h <= 0)) {
-			// set default height
-			$h = (($arrcode['maxw'] * $xres) / 3) + (2 * $vpadding) + $text_height;
-		}
-		$barh = $h - $text_height - (2 * $vpadding);
-		if ($barh <=0) {
-			// try to reduce font or padding to fit barcode on available height
-			if ($text_height > $h) {
-				$fontsize = (($h * $this->k) / (4 * $this->cell_height_ratio));
-				$text_height = $this->getCellHeight($fontsize / $this->k);
-				$this->SetFont($style['font'], '', $fontsize);
-			}
-			if ($vpadding > 0) {
-				$vpadding = (($h - $text_height) / 4);
-			}
-			$barh = $h - $text_height - (2 * $vpadding);
-		}
-		// fit the barcode on available space
-		list($w, $h, $x, $y) = $this->fitBlock($w, $h, $x, $y, false);
-		// set alignment
-		$this->img_rb_y = $y + $h;
-		// set alignment
-		if ($this->rtl) {
-			if ($style['position'] == 'L') {
-				$xpos = $this->lMargin;
-			} elseif ($style['position'] == 'C') {
-				$xpos = ($this->w + $this->lMargin - $this->rMargin - $w) / 2;
-			} elseif ($style['position'] == 'R') {
-				$xpos = $this->w - $this->rMargin - $w;
-			} else {
-				$xpos = $x - $w;
-			}
-			$this->img_rb_x = $xpos;
-		} else {
-			if ($style['position'] == 'L') {
-				$xpos = $this->lMargin;
-			} elseif ($style['position'] == 'C') {
-				$xpos = ($this->w + $this->lMargin - $this->rMargin - $w) / 2;
-			} elseif ($style['position'] == 'R') {
-				$xpos = $this->w - $this->rMargin - $w;
-			} else {
-				$xpos = $x;
-			}
-			$this->img_rb_x = $xpos + $w;
-		}
-		$xpos_rect = $xpos;
-		if (!isset($style['align'])) {
-			$style['align'] = 'C';
-		}
-		switch ($style['align']) {
-			case 'L': {
-				$xpos = $xpos_rect + $hpadding;
-				break;
-			}
-			case 'R': {
-				$xpos = $xpos_rect + ($w - ($arrcode['maxw'] * $xres)) - $hpadding;
-				break;
-			}
-			case 'C':
-			default : {
-				$xpos = $xpos_rect + (($w - ($arrcode['maxw'] * $xres)) / 2);
-				break;
-			}
-		}
-		$xpos_text = $xpos;
-		// barcode is always printed in LTR direction
-		$tempRTL = $this->rtl;
-		$this->rtl = false;
-		// print background color
-		if ($style['bgcolor']) {
-			$this->Rect($xpos_rect, $y, $w, $h, $style['border'] ? 'DF' : 'F', '', $style['bgcolor']);
-		} elseif ($style['border']) {
-			$this->Rect($xpos_rect, $y, $w, $h, 'D');
-		}
-		// set foreground color
-		$this->SetDrawColorArray($style['fgcolor']);
-		$this->SetTextColorArray($style['fgcolor']);
-		// print bars
-		foreach ($arrcode['bcode'] as $k => $v) {
-			$bw = ($v['w'] * $xres);
-			if ($v['t']) {
-				// draw a vertical bar
-				$ypos = $y + $vpadding + ($v['p'] * $barh / $arrcode['maxh']);
-				$this->Rect($xpos, $ypos, $bw, ($v['h'] * $barh / $arrcode['maxh']), 'F', array(), $style['fgcolor']);
-			}
-			$xpos += $bw;
-		}
-		// print text
-		if ($style['text']) {
-			if (isset($style['label']) AND !TCPDF_STATIC::empty_string($style['label'])) {
-				$label = $style['label'];
-			} else {
-				$label = $code;
-			}
-			$txtwidth = ($arrcode['maxw'] * $xres);
-			if ($this->GetStringWidth($label) > $txtwidth) {
-				$style['stretchtext'] = 2;
-			}
-			// print text
-			$this->x = $xpos_text;
-			$this->y = $y + $vpadding + $barh;
-			$cellpadding = $this->cell_padding;
-			$this->SetCellPadding(0);
-			$this->Cell($txtwidth, '', $label, 0, 0, 'C', false, '', $style['stretchtext'], false, 'T', 'T');
-			$this->cell_padding = $cellpadding;
-		}
-		// restore original direction
-		$this->rtl = $tempRTL;
-		// restore previous settings
-		$this->setGraphicVars($gvars);
-		// set pointer to align the next text/objects
-		switch($align) {
-			case 'T':{
-				$this->y = $y;
-				$this->x = $this->img_rb_x;
-				break;
-			}
-			case 'M':{
-				$this->y = $y + round($h / 2);
-				$this->x = $this->img_rb_x;
-				break;
-			}
-			case 'B':{
-				$this->y = $this->img_rb_y;
-				$this->x = $this->img_rb_x;
-				break;
-			}
-			case 'N':{
-				$this->SetY($this->img_rb_y);
-				break;
-			}
-			default:{
-				break;
-			}
-		}
-		$this->endlinex = $this->img_rb_x;
-	}
-
-	/**
-	 * Print 2D Barcode.
-	 * @param $code (string) code to print
-	 * @param $type (string) type of barcode (see tcpdf_barcodes_2d.php for supported formats).
-	 * @param $x (int) x position in user units
-	 * @param $y (int) y position in user units
-	 * @param $w (int) width in user units
-	 * @param $h (int) height in user units
-	 * @param $style (array) array of options:<ul>
-	 * <li>boolean $style['border'] if true prints a border around the barcode</li>
-	 * <li>int $style['padding'] padding to leave around the barcode in barcode units (set to 'auto' for automatic padding)</li>
-	 * <li>int $style['hpadding'] horizontal padding in barcode units (set to 'auto' for automatic padding)</li>
-	 * <li>int $style['vpadding'] vertical padding in barcode units (set to 'auto' for automatic padding)</li>
-	 * <li>int $style['module_width'] width of a single module in points</li>
-	 * <li>int $style['module_height'] height of a single module in points</li>
-	 * <li>array $style['fgcolor'] color array for bars and text</li>
-	 * <li>mixed $style['bgcolor'] color array for background or false for transparent</li>
-	 * <li>string $style['position'] barcode position on the page: L = left margin; C = center; R = right margin; S = stretch</li><li>$style['module_width'] width of a single module in points</li>
-	 * <li>$style['module_height'] height of a single module in points</li></ul>
-	 * @param $align (string) Indicates the alignment of the pointer next to barcode insertion relative to barcode height. The value can be:<ul><li>T: top-right for LTR or top-left for RTL</li><li>M: middle-right for LTR or middle-left for RTL</li><li>B: bottom-right for LTR or bottom-left for RTL</li><li>N: next line</li></ul>
-	 * @param $distort (boolean) if true distort the barcode to fit width and height, otherwise preserve aspect ratio
-	 * @author Nicola Asuni
-	 * @since 4.5.037 (2009-04-07)
-	 * @public
-	 */
-	public function write2DBarcode($code, $type, $x='', $y='', $w='', $h='', $style='', $align='', $distort=false) {
-		if (TCPDF_STATIC::empty_string(trim($code))) {
-			return;
-		}
-		require_once(dirname(__FILE__).'/tcpdf_barcodes_2d.php');
-		// save current graphic settings
-		$gvars = $this->getGraphicVars();
-		// create new barcode object
-		$barcodeobj = new TCPDF2DBarcode($code, $type);
-		$arrcode = $barcodeobj->getBarcodeArray();
-		if (($arrcode === false) OR empty($arrcode) OR !isset($arrcode['num_rows']) OR ($arrcode['num_rows'] == 0) OR !isset($arrcode['num_cols']) OR ($arrcode['num_cols'] == 0)) {
-			$this->Error('Error in 2D barcode string');
-		}
-		// set default values
-		if (!isset($style['position'])) {
-			$style['position'] = '';
-		}
-		if (!isset($style['fgcolor'])) {
-			$style['fgcolor'] = array(0,0,0); // default black
-		}
-		if (!isset($style['bgcolor'])) {
-			$style['bgcolor'] = false; // default transparent
-		}
-		if (!isset($style['border'])) {
-			$style['border'] = false;
-		}
-		// padding
-		if (!isset($style['padding'])) {
-			$style['padding'] = 0;
-		} elseif ($style['padding'] === 'auto') {
-			$style['padding'] = 4;
-		}
-		if (!isset($style['hpadding'])) {
-			$style['hpadding'] = $style['padding'];
-		} elseif ($style['hpadding'] === 'auto') {
-			$style['hpadding'] = 4;
-		}
-		if (!isset($style['vpadding'])) {
-			$style['vpadding'] = $style['padding'];
-		} elseif ($style['vpadding'] === 'auto') {
-			$style['vpadding'] = 4;
-		}
-		$hpad = (2 * $style['hpadding']);
-		$vpad = (2 * $style['vpadding']);
-		// cell (module) dimension
-		if (!isset($style['module_width'])) {
-			$style['module_width'] = 1; // width of a single module in points
-		}
-		if (!isset($style['module_height'])) {
-			$style['module_height'] = 1; // height of a single module in points
-		}
-		if ($x === '') {
-			$x = $this->x;
-		}
-		if ($y === '') {
-			$y = $this->y;
-		}
-		// check page for no-write regions and adapt page margins if necessary
-		list($x, $y) = $this->checkPageRegions($h, $x, $y);
-		// number of barcode columns and rows
-		$rows = $arrcode['num_rows'];
-		$cols = $arrcode['num_cols'];
-		if (($rows <= 0) || ($cols <= 0)){
-			$this->Error('Error in 2D barcode string');
-		}
-		// module width and height
-		$mw = $style['module_width'];
-		$mh = $style['module_height'];
-		if (($mw <= 0) OR ($mh <= 0)) {
-			$this->Error('Error in 2D barcode string');
-		}
-		// get max dimensions
-		if ($this->rtl) {
-			$maxw = $x - $this->lMargin;
-		} else {
-			$maxw = $this->w - $this->rMargin - $x;
-		}
-		$maxh = ($this->h - $this->tMargin - $this->bMargin);
-		$ratioHW = ((($rows * $mh) + $hpad) / (($cols * $mw) + $vpad));
-		$ratioWH = ((($cols * $mw) + $vpad) / (($rows * $mh) + $hpad));
-		if (!$distort) {
-			if (($maxw * $ratioHW) > $maxh) {
-				$maxw = $maxh * $ratioWH;
-			}
-			if (($maxh * $ratioWH) > $maxw) {
-				$maxh = $maxw * $ratioHW;
-			}
-		}
-		// set maximum dimensions
-		if ($w > $maxw) {
-			$w = $maxw;
-		}
-		if ($h > $maxh) {
-			$h = $maxh;
-		}
-		// set dimensions
-		if ((($w === '') OR ($w <= 0)) AND (($h === '') OR ($h <= 0))) {
-			$w = ($cols + $hpad) * ($mw / $this->k);
-			$h = ($rows + $vpad) * ($mh / $this->k);
-		} elseif (($w === '') OR ($w <= 0)) {
-			$w = $h * $ratioWH;
-		} elseif (($h === '') OR ($h <= 0)) {
-			$h = $w * $ratioHW;
-		}
-		// barcode size (excluding padding)
-		$bw = ($w * $cols) / ($cols + $hpad);
-		$bh = ($h * $rows) / ($rows + $vpad);
-		// dimension of single barcode cell unit
-		$cw = $bw / $cols;
-		$ch = $bh / $rows;
-		if (!$distort) {
-			if (($cw / $ch) > ($mw / $mh)) {
-				// correct horizontal distortion
-				$cw = $ch * $mw / $mh;
-				$bw = $cw * $cols;
-				$style['hpadding'] = ($w - $bw) / (2 * $cw);
-			} else {
-				// correct vertical distortion
-				$ch = $cw * $mh / $mw;
-				$bh = $ch * $rows;
-				$style['vpadding'] = ($h - $bh) / (2 * $ch);
-			}
-		}
-		// fit the barcode on available space
-		list($w, $h, $x, $y) = $this->fitBlock($w, $h, $x, $y, false);
-		// set alignment
-		$this->img_rb_y = $y + $h;
-		// set alignment
-		if ($this->rtl) {
-			if ($style['position'] == 'L') {
-				$xpos = $this->lMargin;
-			} elseif ($style['position'] == 'C') {
-				$xpos = ($this->w + $this->lMargin - $this->rMargin - $w) / 2;
-			} elseif ($style['position'] == 'R') {
-				$xpos = $this->w - $this->rMargin - $w;
-			} else {
-				$xpos = $x - $w;
-			}
-			$this->img_rb_x = $xpos;
-		} else {
-			if ($style['position'] == 'L') {
-				$xpos = $this->lMargin;
-			} elseif ($style['position'] == 'C') {
-				$xpos = ($this->w + $this->lMargin - $this->rMargin - $w) / 2;
-			} elseif ($style['position'] == 'R') {
-				$xpos = $this->w - $this->rMargin - $w;
-			} else {
-				$xpos = $x;
-			}
-			$this->img_rb_x = $xpos + $w;
-		}
-		$xstart = $xpos + ($style['hpadding'] * $cw);
-		$ystart = $y + ($style['vpadding'] * $ch);
-		// barcode is always printed in LTR direction
-		$tempRTL = $this->rtl;
-		$this->rtl = false;
-		// print background color
-		if ($style['bgcolor']) {
-			$this->Rect($xpos, $y, $w, $h, $style['border'] ? 'DF' : 'F', '', $style['bgcolor']);
-		} elseif ($style['border']) {
-			$this->Rect($xpos, $y, $w, $h, 'D');
-		}
-		// set foreground color
-		$this->SetDrawColorArray($style['fgcolor']);
-		// print barcode cells
-		// for each row
-		for ($r = 0; $r < $rows; ++$r) {
-			$xr = $xstart;
-			// for each column
-			for ($c = 0; $c < $cols; ++$c) {
-				if ($arrcode['bcode'][$r][$c] == 1) {
-					// draw a single barcode cell
-					$this->Rect($xr, $ystart, $cw, $ch, 'F', array(), $style['fgcolor']);
-				}
-				$xr += $cw;
-			}
-			$ystart += $ch;
-		}
-		// restore original direction
-		$this->rtl = $tempRTL;
-		// restore previous settings
-		$this->setGraphicVars($gvars);
-		// set pointer to align the next text/objects
-		switch($align) {
-			case 'T':{
-				$this->y = $y;
-				$this->x = $this->img_rb_x;
-				break;
-			}
-			case 'M':{
-				$this->y = $y + round($h/2);
-				$this->x = $this->img_rb_x;
-				break;
-			}
-			case 'B':{
-				$this->y = $this->img_rb_y;
-				$this->x = $this->img_rb_x;
-				break;
-			}
-			case 'N':{
-				$this->SetY($this->img_rb_y);
-				break;
-			}
-			default:{
-				break;
-			}
-		}
-		$this->endlinex = $this->img_rb_x;
-	}
-
-	/**
-	 * Returns an array containing current margins:
-	 * <ul>
-			<li>$ret['left'] = left margin</li>
-			<li>$ret['right'] = right margin</li>
-			<li>$ret['top'] = top margin</li>
-			<li>$ret['bottom'] = bottom margin</li>
-			<li>$ret['header'] = header margin</li>
-			<li>$ret['footer'] = footer margin</li>
-			<li>$ret['cell'] = cell padding array</li>
-			<li>$ret['padding_left'] = cell left padding</li>
-			<li>$ret['padding_top'] = cell top padding</li>
-			<li>$ret['padding_right'] = cell right padding</li>
-			<li>$ret['padding_bottom'] = cell bottom padding</li>
-	 * </ul>
-	 * @return array containing all margins measures
-	 * @public
-	 * @since 3.2.000 (2008-06-23)
-	 */
-	public function getMargins() {
-		$ret = array(
-			'left' => $this->lMargin,
-			'right' => $this->rMargin,
-			'top' => $this->tMargin,
-			'bottom' => $this->bMargin,
-			'header' => $this->header_margin,
-			'footer' => $this->footer_margin,
-			'cell' => $this->cell_padding,
-			'padding_left' => $this->cell_padding['L'],
-			'padding_top' => $this->cell_padding['T'],
-			'padding_right' => $this->cell_padding['R'],
-			'padding_bottom' => $this->cell_padding['B']
-		);
-		return $ret;
-	}
-
-	/**
-	 * Returns an array containing original margins:
-	 * <ul>
-			<li>$ret['left'] = left margin</li>
-			<li>$ret['right'] = right margin</li>
-	 * </ul>
-	 * @return array containing all margins measures
-	 * @public
-	 * @since 4.0.012 (2008-07-24)
-	 */
-	public function getOriginalMargins() {
-		$ret = array(
-			'left' => $this->original_lMargin,
-			'right' => $this->original_rMargin
-		);
-		return $ret;
-	}
-
-	/**
-	 * Returns the current font size.
-	 * @return current font size
-	 * @public
-	 * @since 3.2.000 (2008-06-23)
-	 */
-	public function getFontSize() {
-		return $this->FontSize;
-	}
-
-	/**
-	 * Returns the current font size in points unit.
-	 * @return current font size in points unit
-	 * @public
-	 * @since 3.2.000 (2008-06-23)
-	 */
-	public function getFontSizePt() {
-		return $this->FontSizePt;
-	}
-
-	/**
-	 * Returns the current font family name.
-	 * @return string current font family name
-	 * @public
-	 * @since 4.3.008 (2008-12-05)
-	 */
-	public function getFontFamily() {
-		return $this->FontFamily;
-	}
-
-	/**
-	 * Returns the current font style.
-	 * @return string current font style
-	 * @public
-	 * @since 4.3.008 (2008-12-05)
-	 */
-	public function getFontStyle() {
-		return $this->FontStyle;
-	}
-
-	/**
-	 * Cleanup HTML code (requires HTML Tidy library).
-	 * @param $html (string) htmlcode to fix
-	 * @param $default_css (string) CSS commands to add
-	 * @param $tagvs (array) parameters for setHtmlVSpace method
-	 * @param $tidy_options (array) options for tidy_parse_string function
-	 * @return string XHTML code cleaned up
-	 * @author Nicola Asuni
-	 * @public
-	 * @since 5.9.017 (2010-11-16)
-	 * @see setHtmlVSpace()
-	 */
-	public function fixHTMLCode($html, $default_css='', $tagvs='', $tidy_options='') {
-		return TCPDF_STATIC::fixHTMLCode($html, $default_css, $tagvs, $tidy_options, $this->tagvspaces);
-	}
-
-	/**
-	 * Returns the border width from CSS property
-	 * @param $width (string) border width
-	 * @return int with in user units
-	 * @protected
-	 * @since 5.7.000 (2010-08-02)
-	 */
-	protected function getCSSBorderWidth($width) {
-		if ($width == 'thin') {
-			$width = (2 / $this->k);
-		} elseif ($width == 'medium') {
-			$width = (4 / $this->k);
-		} elseif ($width == 'thick') {
-			$width = (6 / $this->k);
-		} else {
-			$width = $this->getHTMLUnitToUnits($width, 1, 'px', false);
-		}
-		return $width;
-	}
-
-	/**
-	 * Returns the border dash style from CSS property
-	 * @param $style (string) border style to convert
-	 * @return int sash style (return -1 in case of none or hidden border)
-	 * @protected
-	 * @since 5.7.000 (2010-08-02)
-	 */
-	protected function getCSSBorderDashStyle($style) {
-		switch (strtolower($style)) {
-			case 'none':
-			case 'hidden': {
-				$dash = -1;
-				break;
-			}
-			case 'dotted': {
-				$dash = 1;
-				break;
-			}
-			case 'dashed': {
-				$dash = 3;
-				break;
-			}
-			case 'double':
-			case 'groove':
-			case 'ridge':
-			case 'inset':
-			case 'outset':
-			case 'solid':
-			default: {
-				$dash = 0;
-				break;
-			}
-		}
-		return $dash;
-	}
-
-	/**
-	 * Returns the border style array from CSS border properties
-	 * @param $cssborder (string) border properties
-	 * @return array containing border properties
-	 * @protected
-	 * @since 5.7.000 (2010-08-02)
-	 */
-	protected function getCSSBorderStyle($cssborder) {
-		$bprop = preg_split('/[\s]+/', trim($cssborder));
-		$border = array(); // value to be returned
-		switch (count($bprop)) {
-			case 3: {
-				$width = $bprop[0];
-				$style = $bprop[1];
-				$color = $bprop[2];
-				break;
-			}
-			case 2: {
-				$width = 'medium';
-				$style = $bprop[0];
-				$color = $bprop[1];
-				break;
-			}
-			case 1: {
-				$width = 'medium';
-				$style = $bprop[0];
-				$color = 'black';
-				break;
-			}
-			default: {
-				$width = 'medium';
-				$style = 'solid';
-				$color = 'black';
-				break;
-			}
-		}
-		if ($style == 'none') {
-			return array();
-		}
-		$border['cap'] = 'square';
-		$border['join'] = 'miter';
-		$border['dash'] = $this->getCSSBorderDashStyle($style);
-		if ($border['dash'] < 0) {
-			return array();
-		}
-		$border['width'] = $this->getCSSBorderWidth($width);
-		$border['color'] = TCPDF_COLORS::convertHTMLColorToDec($color, $this->spot_colors);
-		return $border;
-	}
-
-	/**
-	 * Get the internal Cell padding from CSS attribute.
-	 * @param $csspadding (string) padding properties
-	 * @param $width (float) width of the containing element
-	 * @return array of cell paddings
-	 * @public
-	 * @since 5.9.000 (2010-10-04)
-	 */
-	public function getCSSPadding($csspadding, $width=0) {
-		$padding = preg_split('/[\s]+/', trim($csspadding));
-		$cell_padding = array(); // value to be returned
-		switch (count($padding)) {
-			case 4: {
-				$cell_padding['T'] = $padding[0];
-				$cell_padding['R'] = $padding[1];
-				$cell_padding['B'] = $padding[2];
-				$cell_padding['L'] = $padding[3];
-				break;
-			}
-			case 3: {
-				$cell_padding['T'] = $padding[0];
-				$cell_padding['R'] = $padding[1];
-				$cell_padding['B'] = $padding[2];
-				$cell_padding['L'] = $padding[1];
-				break;
-			}
-			case 2: {
-				$cell_padding['T'] = $padding[0];
-				$cell_padding['R'] = $padding[1];
-				$cell_padding['B'] = $padding[0];
-				$cell_padding['L'] = $padding[1];
-				break;
-			}
-			case 1: {
-				$cell_padding['T'] = $padding[0];
-				$cell_padding['R'] = $padding[0];
-				$cell_padding['B'] = $padding[0];
-				$cell_padding['L'] = $padding[0];
-				break;
-			}
-			default: {
-				return $this->cell_padding;
-			}
-		}
-		if ($width == 0) {
-			$width = $this->w - $this->lMargin - $this->rMargin;
-		}
-		$cell_padding['T'] = $this->getHTMLUnitToUnits($cell_padding['T'], $width, 'px', false);
-		$cell_padding['R'] = $this->getHTMLUnitToUnits($cell_padding['R'], $width, 'px', false);
-		$cell_padding['B'] = $this->getHTMLUnitToUnits($cell_padding['B'], $width, 'px', false);
-		$cell_padding['L'] = $this->getHTMLUnitToUnits($cell_padding['L'], $width, 'px', false);
-		return $cell_padding;
-	}
-
-	/**
-	 * Get the internal Cell margin from CSS attribute.
-	 * @param $cssmargin (string) margin properties
-	 * @param $width (float) width of the containing element
-	 * @return array of cell margins
-	 * @public
-	 * @since 5.9.000 (2010-10-04)
-	 */
-	public function getCSSMargin($cssmargin, $width=0) {
-		$margin = preg_split('/[\s]+/', trim($cssmargin));
-		$cell_margin = array(); // value to be returned
-		switch (count($margin)) {
-			case 4: {
-				$cell_margin['T'] = $margin[0];
-				$cell_margin['R'] = $margin[1];
-				$cell_margin['B'] = $margin[2];
-				$cell_margin['L'] = $margin[3];
-				break;
-			}
-			case 3: {
-				$cell_margin['T'] = $margin[0];
-				$cell_margin['R'] = $margin[1];
-				$cell_margin['B'] = $margin[2];
-				$cell_margin['L'] = $margin[1];
-				break;
-			}
-			case 2: {
-				$cell_margin['T'] = $margin[0];
-				$cell_margin['R'] = $margin[1];
-				$cell_margin['B'] = $margin[0];
-				$cell_margin['L'] = $margin[1];
-				break;
-			}
-			case 1: {
-				$cell_margin['T'] = $margin[0];
-				$cell_margin['R'] = $margin[0];
-				$cell_margin['B'] = $margin[0];
-				$cell_margin['L'] = $margin[0];
-				break;
-			}
-			default: {
-				return $this->cell_margin;
-			}
-		}
-		if ($width == 0) {
-			$width = $this->w - $this->lMargin - $this->rMargin;
-		}
-		$cell_margin['T'] = $this->getHTMLUnitToUnits(str_replace('auto', '0', $cell_margin['T']), $width, 'px', false);
-		$cell_margin['R'] = $this->getHTMLUnitToUnits(str_replace('auto', '0', $cell_margin['R']), $width, 'px', false);
-		$cell_margin['B'] = $this->getHTMLUnitToUnits(str_replace('auto', '0', $cell_margin['B']), $width, 'px', false);
-		$cell_margin['L'] = $this->getHTMLUnitToUnits(str_replace('auto', '0', $cell_margin['L']), $width, 'px', false);
-		return $cell_margin;
-	}
-
-	/**
-	 * Get the border-spacing from CSS attribute.
-	 * @param $cssbspace (string) border-spacing CSS properties
-	 * @param $width (float) width of the containing element
-	 * @return array of border spacings
-	 * @public
-	 * @since 5.9.010 (2010-10-27)
-	 */
-	public function getCSSBorderMargin($cssbspace, $width=0) {
-		$space = preg_split('/[\s]+/', trim($cssbspace));
-		$border_spacing = array(); // value to be returned
-		switch (count($space)) {
-			case 2: {
-				$border_spacing['H'] = $space[0];
-				$border_spacing['V'] = $space[1];
-				break;
-			}
-			case 1: {
-				$border_spacing['H'] = $space[0];
-				$border_spacing['V'] = $space[0];
-				break;
-			}
-			default: {
-				return array('H' => 0, 'V' => 0);
-			}
-		}
-		if ($width == 0) {
-			$width = $this->w - $this->lMargin - $this->rMargin;
-		}
-		$border_spacing['H'] = $this->getHTMLUnitToUnits($border_spacing['H'], $width, 'px', false);
-		$border_spacing['V'] = $this->getHTMLUnitToUnits($border_spacing['V'], $width, 'px', false);
-		return $border_spacing;
-	}
-
-	/**
-	 * Returns the letter-spacing value from CSS value
-	 * @param $spacing (string) letter-spacing value
-	 * @param $parent (float) font spacing (tracking) value of the parent element
-	 * @return float quantity to increases or decreases the space between characters in a text.
-	 * @protected
-	 * @since 5.9.000 (2010-10-02)
-	 */
-	protected function getCSSFontSpacing($spacing, $parent=0) {
-		$val = 0; // value to be returned
-		$spacing = trim($spacing);
-		switch ($spacing) {
-			case 'normal': {
-				$val = 0;
-				break;
-			}
-			case 'inherit': {
-				if ($parent == 'normal') {
-					$val = 0;
-				} else {
-					$val = $parent;
-				}
-				break;
-			}
-			default: {
-				$val = $this->getHTMLUnitToUnits($spacing, 0, 'px', false);
-			}
-		}
-		return $val;
-	}
-
-	/**
-	 * Returns the percentage of font stretching from CSS value
-	 * @param $stretch (string) stretch mode
-	 * @param $parent (float) stretch value of the parent element
-	 * @return float font stretching percentage
-	 * @protected
-	 * @since 5.9.000 (2010-10-02)
-	 */
-	protected function getCSSFontStretching($stretch, $parent=100) {
-		$val = 100; // value to be returned
-		$stretch = trim($stretch);
-		switch ($stretch) {
-			case 'ultra-condensed': {
-				$val = 40;
-				break;
-			}
-			case 'extra-condensed': {
-				$val = 55;
-				break;
-			}
-			case 'condensed': {
-				$val = 70;
-				break;
-			}
-			case 'semi-condensed': {
-				$val = 85;
-				break;
-			}
-			case 'normal': {
-				$val = 100;
-				break;
-			}
-			case 'semi-expanded': {
-				$val = 115;
-				break;
-			}
-			case 'expanded': {
-				$val = 130;
-				break;
-			}
-			case 'extra-expanded': {
-				$val = 145;
-				break;
-			}
-			case 'ultra-expanded': {
-				$val = 160;
-				break;
-			}
-			case 'wider': {
-				$val = ($parent + 10);
-				break;
-			}
-			case 'narrower': {
-				$val = ($parent - 10);
-				break;
-			}
-			case 'inherit': {
-				if ($parent == 'normal') {
-					$val = 100;
-				} else {
-					$val = $parent;
-				}
-				break;
-			}
-			default: {
-				$val = $this->getHTMLUnitToUnits($stretch, 100, '%', false);
-			}
-		}
-		return $val;
-	}
-
-	/**
-	 * Convert HTML string containing font size value to points
-	 * @param $val (string) String containing font size value and unit.
-	 * @param $refsize (float) Reference font size in points.
-	 * @param $parent_size (float) Parent font size in points.
-	 * @param $defaultunit (string) Default unit (can be one of the following: %, em, ex, px, in, mm, pc, pt).
-	 * @return float value in points
-	 * @public
-	 */
-	public function getHTMLFontUnits($val, $refsize=12, $parent_size=12, $defaultunit='pt') {
-		$refsize = TCPDF_FONTS::getFontRefSize($refsize);
-		$parent_size = TCPDF_FONTS::getFontRefSize($parent_size, $refsize);
-		switch ($val) {
-			case 'xx-small': {
-				$size = ($refsize - 4);
-				break;
-			}
-			case 'x-small': {
-				$size = ($refsize - 3);
-				break;
-			}
-			case 'small': {
-				$size = ($refsize - 2);
-				break;
-			}
-			case 'medium': {
-				$size = $refsize;
-				break;
-			}
-			case 'large': {
-				$size = ($refsize + 2);
-				break;
-			}
-			case 'x-large': {
-				$size = ($refsize + 4);
-				break;
-			}
-			case 'xx-large': {
-				$size = ($refsize + 6);
-				break;
-			}
-			case 'smaller': {
-				$size = ($parent_size - 3);
-				break;
-			}
-			case 'larger': {
-				$size = ($parent_size + 3);
-				break;
-			}
-			default: {
-				$size = $this->getHTMLUnitToUnits($val, $parent_size, $defaultunit, true);
-			}
-		}
-		return $size;
-	}
-
-	/**
-	 * Returns the HTML DOM array.
-	 * @param $html (string) html code
-	 * @return array
-	 * @protected
-	 * @since 3.2.000 (2008-06-20)
-	 */
-	protected function getHtmlDomArray($html) {
-		// array of CSS styles ( selector => properties).
-		$css = array();
-		// get CSS array defined at previous call
-		$matches = array();
-		if (preg_match_all('/<cssarray>([^\<]*)<\/cssarray>/isU', $html, $matches) > 0) {
-			if (isset($matches[1][0])) {
-				$css = array_merge($css, json_decode($this->unhtmlentities($matches[1][0]), true));
-			}
-			$html = preg_replace('/<cssarray>(.*?)<\/cssarray>/isU', '', $html);
-		}
-		// extract external CSS files
-		$matches = array();
-		if (preg_match_all('/<link([^\>]*)>/isU', $html, $matches) > 0) {
-			foreach ($matches[1] as $key => $link) {
-				$type = array();
-				if (preg_match('/type[\s]*=[\s]*"text\/css"/', $link, $type)) {
-					$type = array();
-					preg_match('/media[\s]*=[\s]*"([^"]*)"/', $link, $type);
-					// get 'all' and 'print' media, other media types are discarded
-					// (all, braille, embossed, handheld, print, projection, screen, speech, tty, tv)
-					if (empty($type) OR (isset($type[1]) AND (($type[1] == 'all') OR ($type[1] == 'print')))) {
-						$type = array();
-						if (preg_match('/href[\s]*=[\s]*"([^"]*)"/', $link, $type) > 0) {
-							// read CSS data file
-							$cssdata = TCPDF_STATIC::fileGetContents(trim($type[1]));
-							if (($cssdata !== FALSE) AND (strlen($cssdata) > 0)) {
-								$css = array_merge($css, TCPDF_STATIC::extractCSSproperties($cssdata));
-							}
-						}
-					}
-				}
-			}
-		}
-		// extract style tags
-		$matches = array();
-		if (preg_match_all('/<style([^\>]*)>([^\<]*)<\/style>/isU', $html, $matches) > 0) {
-			foreach ($matches[1] as $key => $media) {
-				$type = array();
-				preg_match('/media[\s]*=[\s]*"([^"]*)"/', $media, $type);
-				// get 'all' and 'print' media, other media types are discarded
-				// (all, braille, embossed, handheld, print, projection, screen, speech, tty, tv)
-				if (empty($type) OR (isset($type[1]) AND (($type[1] == 'all') OR ($type[1] == 'print')))) {
-					$cssdata = $matches[2][$key];
-					$css = array_merge($css, TCPDF_STATIC::extractCSSproperties($cssdata));
-				}
-			}
-		}
-		// create a special tag to contain the CSS array (used for table content)
-		$csstagarray = '<cssarray>'.htmlentities(json_encode($css)).'</cssarray>';
-		// remove head and style blocks
-		$html = preg_replace('/<head([^\>]*)>(.*?)<\/head>/siU', '', $html);
-		$html = preg_replace('/<style([^\>]*)>([^\<]*)<\/style>/isU', '', $html);
-		// define block tags
-		$blocktags = array('blockquote','br','dd','dl','div','dt','h1','h2','h3','h4','h5','h6','hr','li','ol','p','pre','ul','tcpdf','table','tr','td');
-		// define self-closing tags
-		$selfclosingtags = array('area','base','basefont','br','hr','input','img','link','meta');
-		// remove all unsupported tags (the line below lists all supported tags)
-		$html = strip_tags($html, '<marker/><a><b><blockquote><body><br><br/><dd><del><div><dl><dt><em><font><form><h1><h2><h3><h4><h5><h6><hr><hr/><i><img><input><label><li><ol><option><p><pre><s><select><small><span><strike><strong><sub><sup><table><tablehead><tcpdf><td><textarea><th><thead><tr><tt><u><ul>');
-		//replace some blank characters
-		$html = preg_replace('/<pre/', '<xre', $html); // preserve pre tag
-		$html = preg_replace('/<(table|tr|td|th|tcpdf|blockquote|dd|div|dl|dt|form|h1|h2|h3|h4|h5|h6|br|hr|li|ol|ul|p)([^\>]*)>[\n\r\t]+/', '<\\1\\2>', $html);
-		$html = preg_replace('@(\r\n|\r)@', "\n", $html);
-		$repTable = array("\t" => ' ', "\0" => ' ', "\x0B" => ' ', "\\" => "\\\\");
-		$html = strtr($html, $repTable);
-		$offset = 0;
-		while (($offset < strlen($html)) AND ($pos = strpos($html, '</pre>', $offset)) !== false) {
-			$html_a = substr($html, 0, $offset);
-			$html_b = substr($html, $offset, ($pos - $offset + 6));
-			while (preg_match("'<xre([^\>]*)>(.*?)\n(.*?)</pre>'si", $html_b)) {
-				// preserve newlines on <pre> tag
-				$html_b = preg_replace("'<xre([^\>]*)>(.*?)\n(.*?)</pre>'si", "<xre\\1>\\2<br />\\3</pre>", $html_b);
-			}
-			while (preg_match("'<xre([^\>]*)>(.*?)".$this->re_space['p']."(.*?)</pre>'".$this->re_space['m'], $html_b)) {
-				// preserve spaces on <pre> tag
-				$html_b = preg_replace("'<xre([^\>]*)>(.*?)".$this->re_space['p']."(.*?)</pre>'".$this->re_space['m'], "<xre\\1>\\2&nbsp;\\3</pre>", $html_b);
-			}
-			$html = $html_a.$html_b.substr($html, $pos + 6);
-			$offset = strlen($html_a.$html_b);
-		}
-		$offset = 0;
-		while (($offset < strlen($html)) AND ($pos = strpos($html, '</textarea>', $offset)) !== false) {
-			$html_a = substr($html, 0, $offset);
-			$html_b = substr($html, $offset, ($pos - $offset + 11));
-			while (preg_match("'<textarea([^\>]*)>(.*?)\n(.*?)</textarea>'si", $html_b)) {
-				// preserve newlines on <textarea> tag
-				$html_b = preg_replace("'<textarea([^\>]*)>(.*?)\n(.*?)</textarea>'si", "<textarea\\1>\\2<TBR>\\3</textarea>", $html_b);
-				$html_b = preg_replace("'<textarea([^\>]*)>(.*?)[\"](.*?)</textarea>'si", "<textarea\\1>\\2''\\3</textarea>", $html_b);
-			}
-			$html = $html_a.$html_b.substr($html, $pos + 11);
-			$offset = strlen($html_a.$html_b);
-		}
-		$html = preg_replace('/([\s]*)<option/si', '<option', $html);
-		$html = preg_replace('/<\/option>([\s]*)/si', '</option>', $html);
-		$offset = 0;
-		while (($offset < strlen($html)) AND ($pos = strpos($html, '</option>', $offset)) !== false) {
-			$html_a = substr($html, 0, $offset);
-			$html_b = substr($html, $offset, ($pos - $offset + 9));
-			while (preg_match("'<option([^\>]*)>(.*?)</option>'si", $html_b)) {
-				$html_b = preg_replace("'<option([\s]+)value=\"([^\"]*)\"([^\>]*)>(.*?)</option>'si", "\\2#!TaB!#\\4#!NwL!#", $html_b);
-				$html_b = preg_replace("'<option([^\>]*)>(.*?)</option>'si", "\\2#!NwL!#", $html_b);
-			}
-			$html = $html_a.$html_b.substr($html, $pos + 9);
-			$offset = strlen($html_a.$html_b);
-		}
-		if (preg_match("'</select'si", $html)) {
-			$html = preg_replace("'<select([^\>]*)>'si", "<select\\1 opt=\"", $html);
-			$html = preg_replace("'#!NwL!#</select>'si", "\" />", $html);
-		}
-		$html = str_replace("\n", ' ', $html);
-		// restore textarea newlines
-		$html = str_replace('<TBR>', "\n", $html);
-		// remove extra spaces from code
-		$html = preg_replace('/[\s]+<\/(table|tr|ul|ol|dl)>/', '</\\1>', $html);
-		$html = preg_replace('/'.$this->re_space['p'].'+<\/(td|th|li|dt|dd)>/'.$this->re_space['m'], '</\\1>', $html);
-		$html = preg_replace('/[\s]+<(tr|td|th|li|dt|dd)/', '<\\1', $html);
-		$html = preg_replace('/'.$this->re_space['p'].'+<(ul|ol|dl|br)/'.$this->re_space['m'], '<\\1', $html);
-		$html = preg_replace('/<\/(table|tr|td|th|blockquote|dd|dt|dl|div|dt|h1|h2|h3|h4|h5|h6|hr|li|ol|ul|p)>[\s]+</', '</\\1><', $html);
-		$html = preg_replace('/<\/(td|th)>/', '<marker style="font-size:0"/></\\1>', $html);
-		$html = preg_replace('/<\/table>([\s]*)<marker style="font-size:0"\/>/', '</table>', $html);
-		$html = preg_replace('/'.$this->re_space['p'].'+<img/'.$this->re_space['m'], chr(32).'<img', $html);
-		$html = preg_replace('/<img([^\>]*)>[\s]+([^\<])/xi', '<img\\1>&nbsp;\\2', $html);
-		$html = preg_replace('/<img([^\>]*)>/xi', '<img\\1><span><marker style="font-size:0"/></span>', $html);
-		$html = preg_replace('/<xre/', '<pre', $html); // restore pre tag
-		$html = preg_replace('/<textarea([^\>]*)>([^\<]*)<\/textarea>/xi', '<textarea\\1 value="\\2" />', $html);
-		$html = preg_replace('/<li([^\>]*)><\/li>/', '<li\\1>&nbsp;</li>', $html);
-		$html = preg_replace('/<li([^\>]*)>'.$this->re_space['p'].'*<img/'.$this->re_space['m'], '<li\\1><font size="1">&nbsp;</font><img', $html);
-		$html = preg_replace('/<([^\>\/]*)>[\s]/', '<\\1>&nbsp;', $html); // preserve some spaces
-		$html = preg_replace('/[\s]<\/([^\>]*)>/', '&nbsp;</\\1>', $html); // preserve some spaces
-		$html = preg_replace('/<su([bp])/', '<zws/><su\\1', $html); // fix sub/sup alignment
-		$html = preg_replace('/<\/su([bp])>/', '</su\\1><zws/>', $html); // fix sub/sup alignment
-		$html = preg_replace('/'.$this->re_space['p'].'+/'.$this->re_space['m'], chr(32), $html); // replace multiple spaces with a single space
-		// trim string
-		$html = $this->stringTrim($html);
-		// fix br tag after li
-		$html = preg_replace('/<li><br([^\>]*)>/', '<li> <br\\1>', $html);
-		// fix first image tag alignment
-		$html = preg_replace('/^<img/', '<span style="font-size:0"><br /></span> <img', $html, 1);
-		// pattern for generic tag
-		$tagpattern = '/(<[^>]+>)/';
-		// explodes the string
-		$a = preg_split($tagpattern, $html, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
-		// count elements
-		$maxel = count($a);
-		$elkey = 0;
-		$key = 0;
-		// create an array of elements
-		$dom = array();
-		$dom[$key] = array();
-		// set inheritable properties fot the first void element
-		// possible inheritable properties are: azimuth, border-collapse, border-spacing, caption-side, color, cursor, direction, empty-cells, font, font-family, font-stretch, font-size, font-size-adjust, font-style, font-variant, font-weight, letter-spacing, line-height, list-style, list-style-image, list-style-position, list-style-type, orphans, page, page-break-inside, quotes, speak, speak-header, text-align, text-indent, text-transform, volume, white-space, widows, word-spacing
-		$dom[$key]['tag'] = false;
-		$dom[$key]['block'] = false;
-		$dom[$key]['value'] = '';
-		$dom[$key]['parent'] = 0;
-		$dom[$key]['hide'] = false;
-		$dom[$key]['fontname'] = $this->FontFamily;
-		$dom[$key]['fontstyle'] = $this->FontStyle;
-		$dom[$key]['fontsize'] = $this->FontSizePt;
-		$dom[$key]['font-stretch'] = $this->font_stretching;
-		$dom[$key]['letter-spacing'] = $this->font_spacing;
-		$dom[$key]['stroke'] = $this->textstrokewidth;
-		$dom[$key]['fill'] = (($this->textrendermode % 2) == 0);
-		$dom[$key]['clip'] = ($this->textrendermode > 3);
-		$dom[$key]['line-height'] = $this->cell_height_ratio;
-		$dom[$key]['bgcolor'] = false;
-		$dom[$key]['fgcolor'] = $this->fgcolor; // color
-		$dom[$key]['strokecolor'] = $this->strokecolor;
-		$dom[$key]['align'] = '';
-		$dom[$key]['listtype'] = '';
-		$dom[$key]['text-indent'] = 0;
-		$dom[$key]['text-transform'] = '';
-		$dom[$key]['border'] = array();
-		$dom[$key]['dir'] = $this->rtl?'rtl':'ltr';
-		$thead = false; // true when we are inside the THEAD tag
-		++$key;
-		$level = array();
-		array_push($level, 0); // root
-		while ($elkey < $maxel) {
-			$dom[$key] = array();
-			$element = $a[$elkey];
-			$dom[$key]['elkey'] = $elkey;
-			if (preg_match($tagpattern, $element)) {
-				// html tag
-				$element = substr($element, 1, -1);
-				// get tag name
-				preg_match('/[\/]?([a-zA-Z0-9]*)/', $element, $tag);
-				$tagname = strtolower($tag[1]);
-				// check if we are inside a table header
-				if ($tagname == 'thead') {
-					if ($element[0] == '/') {
-						$thead = false;
-					} else {
-						$thead = true;
-					}
-					++$elkey;
-					continue;
-				}
-				$dom[$key]['tag'] = true;
-				$dom[$key]['value'] = $tagname;
-				if (in_array($dom[$key]['value'], $blocktags)) {
-					$dom[$key]['block'] = true;
-				} else {
-					$dom[$key]['block'] = false;
-				}
-				if ($element[0] == '/') {
-					// *** closing html tag
-					$dom[$key]['opening'] = false;
-					$dom[$key]['parent'] = end($level);
-					array_pop($level);
-					$dom[$key]['hide'] = $dom[($dom[($dom[$key]['parent'])]['parent'])]['hide'];
-					$dom[$key]['fontname'] = $dom[($dom[($dom[$key]['parent'])]['parent'])]['fontname'];
-					$dom[$key]['fontstyle'] = $dom[($dom[($dom[$key]['parent'])]['parent'])]['fontstyle'];
-					$dom[$key]['fontsize'] = $dom[($dom[($dom[$key]['parent'])]['parent'])]['fontsize'];
-					$dom[$key]['font-stretch'] = $dom[($dom[($dom[$key]['parent'])]['parent'])]['font-stretch'];
-					$dom[$key]['letter-spacing'] = $dom[($dom[($dom[$key]['parent'])]['parent'])]['letter-spacing'];
-					$dom[$key]['stroke'] = $dom[($dom[($dom[$key]['parent'])]['parent'])]['stroke'];
-					$dom[$key]['fill'] = $dom[($dom[($dom[$key]['parent'])]['parent'])]['fill'];
-					$dom[$key]['clip'] = $dom[($dom[($dom[$key]['parent'])]['parent'])]['clip'];
-					$dom[$key]['line-height'] = $dom[($dom[($dom[$key]['parent'])]['parent'])]['line-height'];
-					$dom[$key]['bgcolor'] = $dom[($dom[($dom[$key]['parent'])]['parent'])]['bgcolor'];
-					$dom[$key]['fgcolor'] = $dom[($dom[($dom[$key]['parent'])]['parent'])]['fgcolor'];
-					$dom[$key]['strokecolor'] = $dom[($dom[($dom[$key]['parent'])]['parent'])]['strokecolor'];
-					$dom[$key]['align'] = $dom[($dom[($dom[$key]['parent'])]['parent'])]['align'];
-					$dom[$key]['text-transform'] = $dom[($dom[($dom[$key]['parent'])]['parent'])]['text-transform'];
-					$dom[$key]['dir'] = $dom[($dom[($dom[$key]['parent'])]['parent'])]['dir'];
-					if (isset($dom[($dom[($dom[$key]['parent'])]['parent'])]['listtype'])) {
-						$dom[$key]['listtype'] = $dom[($dom[($dom[$key]['parent'])]['parent'])]['listtype'];
-					}
-					// set the number of columns in table tag
-					if (($dom[$key]['value'] == 'tr') AND (!isset($dom[($dom[($dom[$key]['parent'])]['parent'])]['cols']))) {
-						$dom[($dom[($dom[$key]['parent'])]['parent'])]['cols'] = $dom[($dom[$key]['parent'])]['cols'];
-					}
-					if (($dom[$key]['value'] == 'td') OR ($dom[$key]['value'] == 'th')) {
-						$dom[($dom[$key]['parent'])]['content'] = $csstagarray;
-						for ($i = ($dom[$key]['parent'] + 1); $i < $key; ++$i) {
-							$dom[($dom[$key]['parent'])]['content'] .= stripslashes($a[$dom[$i]['elkey']]);
-						}
-						$key = $i;
-						// mark nested tables
-						$dom[($dom[$key]['parent'])]['content'] = str_replace('<table', '<table nested="true"', $dom[($dom[$key]['parent'])]['content']);
-						// remove thead sections from nested tables
-						$dom[($dom[$key]['parent'])]['content'] = str_replace('<thead>', '', $dom[($dom[$key]['parent'])]['content']);
-						$dom[($dom[$key]['parent'])]['content'] = str_replace('</thead>', '', $dom[($dom[$key]['parent'])]['content']);
-					}
-					// store header rows on a new table
-					if (($dom[$key]['value'] == 'tr') AND ($dom[($dom[$key]['parent'])]['thead'] === true)) {
-						if (TCPDF_STATIC::empty_string($dom[($dom[($dom[$key]['parent'])]['parent'])]['thead'])) {
-							$dom[($dom[($dom[$key]['parent'])]['parent'])]['thead'] = $csstagarray.$a[$dom[($dom[($dom[$key]['parent'])]['parent'])]['elkey']];
-						}
-						for ($i = $dom[$key]['parent']; $i <= $key; ++$i) {
-							$dom[($dom[($dom[$key]['parent'])]['parent'])]['thead'] .= $a[$dom[$i]['elkey']];
-						}
-						if (!isset($dom[($dom[$key]['parent'])]['attribute'])) {
-							$dom[($dom[$key]['parent'])]['attribute'] = array();
-						}
-						// header elements must be always contained in a single page
-						$dom[($dom[$key]['parent'])]['attribute']['nobr'] = 'true';
-					}
-					if (($dom[$key]['value'] == 'table') AND (!TCPDF_STATIC::empty_string($dom[($dom[$key]['parent'])]['thead']))) {
-						// remove the nobr attributes from the table header
-						$dom[($dom[$key]['parent'])]['thead'] = str_replace(' nobr="true"', '', $dom[($dom[$key]['parent'])]['thead']);
-						$dom[($dom[$key]['parent'])]['thead'] .= '</tablehead>';
-					}
-				} else {
-					// *** opening or self-closing html tag
-					$dom[$key]['opening'] = true;
-					$dom[$key]['parent'] = end($level);
-					if ((substr($element, -1, 1) == '/') OR (in_array($dom[$key]['value'], $selfclosingtags))) {
-						// self-closing tag
-						$dom[$key]['self'] = true;
-					} else {
-						// opening tag
-						array_push($level, $key);
-						$dom[$key]['self'] = false;
-					}
-					// copy some values from parent
-					$parentkey = 0;
-					if ($key > 0) {
-						$parentkey = $dom[$key]['parent'];
-						$dom[$key]['hide'] = $dom[$parentkey]['hide'];
-						$dom[$key]['fontname'] = $dom[$parentkey]['fontname'];
-						$dom[$key]['fontstyle'] = $dom[$parentkey]['fontstyle'];
-						$dom[$key]['fontsize'] = $dom[$parentkey]['fontsize'];
-						$dom[$key]['font-stretch'] = $dom[$parentkey]['font-stretch'];
-						$dom[$key]['letter-spacing'] = $dom[$parentkey]['letter-spacing'];
-						$dom[$key]['stroke'] = $dom[$parentkey]['stroke'];
-						$dom[$key]['fill'] = $dom[$parentkey]['fill'];
-						$dom[$key]['clip'] = $dom[$parentkey]['clip'];
-						$dom[$key]['line-height'] = $dom[$parentkey]['line-height'];
-						$dom[$key]['bgcolor'] = $dom[$parentkey]['bgcolor'];
-						$dom[$key]['fgcolor'] = $dom[$parentkey]['fgcolor'];
-						$dom[$key]['strokecolor'] = $dom[$parentkey]['strokecolor'];
-						$dom[$key]['align'] = $dom[$parentkey]['align'];
-						$dom[$key]['listtype'] = $dom[$parentkey]['listtype'];
-						$dom[$key]['text-indent'] = $dom[$parentkey]['text-indent'];
-						$dom[$key]['text-transform'] = $dom[$parentkey]['text-transform'];
-						$dom[$key]['border'] = array();
-						$dom[$key]['dir'] = $dom[$parentkey]['dir'];
-					}
-					// get attributes
-					preg_match_all('/([^=\s]*)[\s]*=[\s]*"([^"]*)"/', $element, $attr_array, PREG_PATTERN_ORDER);
-					$dom[$key]['attribute'] = array(); // reset attribute array
-					while (list($id, $name) = each($attr_array[1])) {
-						$dom[$key]['attribute'][strtolower($name)] = $attr_array[2][$id];
-					}
-					if (!empty($css)) {
-						// merge CSS style to current style
-						list($dom[$key]['csssel'], $dom[$key]['cssdata']) = TCPDF_STATIC::getCSSdataArray($dom, $key, $css);
-						$dom[$key]['attribute']['style'] = TCPDF_STATIC::getTagStyleFromCSSarray($dom[$key]['cssdata']);
-					}
-					// split style attributes
-					if (isset($dom[$key]['attribute']['style']) AND !empty($dom[$key]['attribute']['style'])) {
-						// get style attributes
-						preg_match_all('/([^;:\s]*):([^;]*)/', $dom[$key]['attribute']['style'], $style_array, PREG_PATTERN_ORDER);
-						$dom[$key]['style'] = array(); // reset style attribute array
-						while (list($id, $name) = each($style_array[1])) {
-							// in case of duplicate attribute the last replace the previous
-							$dom[$key]['style'][strtolower($name)] = trim($style_array[2][$id]);
-						}
-						// --- get some style attributes ---
-						// text direction
-						if (isset($dom[$key]['style']['direction'])) {
-							$dom[$key]['dir'] = $dom[$key]['style']['direction'];
-						}
-						// display
-						if (isset($dom[$key]['style']['display'])) {
-							$dom[$key]['hide'] = (trim(strtolower($dom[$key]['style']['display'])) == 'none');
-						}
-						// font family
-						if (isset($dom[$key]['style']['font-family'])) {
-							$dom[$key]['fontname'] = $this->getFontFamilyName($dom[$key]['style']['font-family']);
-						}
-						// list-style-type
-						if (isset($dom[$key]['style']['list-style-type'])) {
-							$dom[$key]['listtype'] = trim(strtolower($dom[$key]['style']['list-style-type']));
-							if ($dom[$key]['listtype'] == 'inherit') {
-								$dom[$key]['listtype'] = $dom[$parentkey]['listtype'];
-							}
-						}
-						// text-indent
-						if (isset($dom[$key]['style']['text-indent'])) {
-							$dom[$key]['text-indent'] = $this->getHTMLUnitToUnits($dom[$key]['style']['text-indent']);
-							if ($dom[$key]['text-indent'] == 'inherit') {
-								$dom[$key]['text-indent'] = $dom[$parentkey]['text-indent'];
-							}
-						}
-						// text-transform
-						if (isset($dom[$key]['style']['text-transform'])) {
-							$dom[$key]['text-transform'] = $dom[$key]['style']['text-transform'];
-						}
-						// font size
-						if (isset($dom[$key]['style']['font-size'])) {
-							$fsize = trim($dom[$key]['style']['font-size']);
-							$dom[$key]['fontsize'] = $this->getHTMLFontUnits($fsize, $dom[0]['fontsize'], $dom[$parentkey]['fontsize'], 'pt');
-						}
-						// font-stretch
-						if (isset($dom[$key]['style']['font-stretch'])) {
-							$dom[$key]['font-stretch'] = $this->getCSSFontStretching($dom[$key]['style']['font-stretch'], $dom[$parentkey]['font-stretch']);
-						}
-						// letter-spacing
-						if (isset($dom[$key]['style']['letter-spacing'])) {
-							$dom[$key]['letter-spacing'] = $this->getCSSFontSpacing($dom[$key]['style']['letter-spacing'], $dom[$parentkey]['letter-spacing']);
-						}
-						// line-height (internally is the cell height ratio)
-						if (isset($dom[$key]['style']['line-height'])) {
-							$lineheight = trim($dom[$key]['style']['line-height']);
-							switch ($lineheight) {
-								// A normal line height. This is default
-								case 'normal': {
-									$dom[$key]['line-height'] = $dom[0]['line-height'];
-									break;
-								}
-								case 'inherit': {
-									$dom[$key]['line-height'] = $dom[$parentkey]['line-height'];
-								}
-								default: {
-									if (is_numeric($lineheight)) {
-										// convert to percentage of font height
-										$lineheight = ($lineheight * 100).'%';
-									}
-									$dom[$key]['line-height'] = $this->getHTMLUnitToUnits($lineheight, 1, '%', true);
-									if (substr($lineheight, -1) !== '%') {
-										if ($dom[$key]['fontsize'] <= 0) {
-											$dom[$key]['line-height'] = 1;
-										} else {
-											$dom[$key]['line-height'] = (($dom[$key]['line-height'] - $this->cell_padding['T'] - $this->cell_padding['B']) / $dom[$key]['fontsize']);
-										}
-									}
-								}
-							}
-						}
-						// font style
-						if (isset($dom[$key]['style']['font-weight'])) {
-							if (strtolower($dom[$key]['style']['font-weight'][0]) == 'n') {
-								if (strpos($dom[$key]['fontstyle'], 'B') !== false) {
-									$dom[$key]['fontstyle'] = str_replace('B', '', $dom[$key]['fontstyle']);
-								}
-							} elseif (strtolower($dom[$key]['style']['font-weight'][0]) == 'b') {
-								$dom[$key]['fontstyle'] .= 'B';
-							}
-						}
-						if (isset($dom[$key]['style']['font-style']) AND (strtolower($dom[$key]['style']['font-style'][0]) == 'i')) {
-							$dom[$key]['fontstyle'] .= 'I';
-						}
-						// font color
-						if (isset($dom[$key]['style']['color']) AND (!TCPDF_STATIC::empty_string($dom[$key]['style']['color']))) {
-							$dom[$key]['fgcolor'] = TCPDF_COLORS::convertHTMLColorToDec($dom[$key]['style']['color'], $this->spot_colors);
-						} elseif ($dom[$key]['value'] == 'a') {
-							$dom[$key]['fgcolor'] = $this->htmlLinkColorArray;
-						}
-						// background color
-						if (isset($dom[$key]['style']['background-color']) AND (!TCPDF_STATIC::empty_string($dom[$key]['style']['background-color']))) {
-							$dom[$key]['bgcolor'] = TCPDF_COLORS::convertHTMLColorToDec($dom[$key]['style']['background-color'], $this->spot_colors);
-						}
-						// text-decoration
-						if (isset($dom[$key]['style']['text-decoration'])) {
-							$decors = explode(' ', strtolower($dom[$key]['style']['text-decoration']));
-							foreach ($decors as $dec) {
-								$dec = trim($dec);
-								if (!TCPDF_STATIC::empty_string($dec)) {
-									if ($dec[0] == 'u') {
-										// underline
-										$dom[$key]['fontstyle'] .= 'U';
-									} elseif ($dec[0] == 'l') {
-										// line-through
-										$dom[$key]['fontstyle'] .= 'D';
-									} elseif ($dec[0] == 'o') {
-										// overline
-										$dom[$key]['fontstyle'] .= 'O';
-									}
-								}
-							}
-						} elseif ($dom[$key]['value'] == 'a') {
-							$dom[$key]['fontstyle'] = $this->htmlLinkFontStyle;
-						}
-						// check for width attribute
-						if (isset($dom[$key]['style']['width'])) {
-							$dom[$key]['width'] = $dom[$key]['style']['width'];
-						}
-						// check for height attribute
-						if (isset($dom[$key]['style']['height'])) {
-							$dom[$key]['height'] = $dom[$key]['style']['height'];
-						}
-						// check for text alignment
-						if (isset($dom[$key]['style']['text-align'])) {
-							$dom[$key]['align'] = strtoupper($dom[$key]['style']['text-align'][0]);
-						}
-						// check for CSS border properties
-						if (isset($dom[$key]['style']['border'])) {
-							$borderstyle = $this->getCSSBorderStyle($dom[$key]['style']['border']);
-							if (!empty($borderstyle)) {
-								$dom[$key]['border']['LTRB'] = $borderstyle;
-							}
-						}
-						if (isset($dom[$key]['style']['border-color'])) {
-							$brd_colors = preg_split('/[\s]+/', trim($dom[$key]['style']['border-color']));
-							if (isset($brd_colors[3])) {
-								$dom[$key]['border']['L']['color'] = TCPDF_COLORS::convertHTMLColorToDec($brd_colors[3], $this->spot_colors);
-							}
-							if (isset($brd_colors[1])) {
-								$dom[$key]['border']['R']['color'] = TCPDF_COLORS::convertHTMLColorToDec($brd_colors[1], $this->spot_colors);
-							}
-							if (isset($brd_colors[0])) {
-								$dom[$key]['border']['T']['color'] = TCPDF_COLORS::convertHTMLColorToDec($brd_colors[0], $this->spot_colors);
-							}
-							if (isset($brd_colors[2])) {
-								$dom[$key]['border']['B']['color'] = TCPDF_COLORS::convertHTMLColorToDec($brd_colors[2], $this->spot_colors);
-							}
-						}
-						if (isset($dom[$key]['style']['border-width'])) {
-							$brd_widths = preg_split('/[\s]+/', trim($dom[$key]['style']['border-width']));
-							if (isset($brd_widths[3])) {
-								$dom[$key]['border']['L']['width'] = $this->getCSSBorderWidth($brd_widths[3]);
-							}
-							if (isset($brd_widths[1])) {
-								$dom[$key]['border']['R']['width'] = $this->getCSSBorderWidth($brd_widths[1]);
-							}
-							if (isset($brd_widths[0])) {
-								$dom[$key]['border']['T']['width'] = $this->getCSSBorderWidth($brd_widths[0]);
-							}
-							if (isset($brd_widths[2])) {
-								$dom[$key]['border']['B']['width'] = $this->getCSSBorderWidth($brd_widths[2]);
-							}
-						}
-						if (isset($dom[$key]['style']['border-style'])) {
-							$brd_styles = preg_split('/[\s]+/', trim($dom[$key]['style']['border-style']));
-							if (isset($brd_styles[3]) AND ($brd_styles[3]!='none')) {
-								$dom[$key]['border']['L']['cap'] = 'square';
-								$dom[$key]['border']['L']['join'] = 'miter';
-								$dom[$key]['border']['L']['dash'] = $this->getCSSBorderDashStyle($brd_styles[3]);
-								if ($dom[$key]['border']['L']['dash'] < 0) {
-									$dom[$key]['border']['L'] = array();
-								}
-							}
-							if (isset($brd_styles[1])) {
-								$dom[$key]['border']['R']['cap'] = 'square';
-								$dom[$key]['border']['R']['join'] = 'miter';
-								$dom[$key]['border']['R']['dash'] = $this->getCSSBorderDashStyle($brd_styles[1]);
-								if ($dom[$key]['border']['R']['dash'] < 0) {
-									$dom[$key]['border']['R'] = array();
-								}
-							}
-							if (isset($brd_styles[0])) {
-								$dom[$key]['border']['T']['cap'] = 'square';
-								$dom[$key]['border']['T']['join'] = 'miter';
-								$dom[$key]['border']['T']['dash'] = $this->getCSSBorderDashStyle($brd_styles[0]);
-								if ($dom[$key]['border']['T']['dash'] < 0) {
-									$dom[$key]['border']['T'] = array();
-								}
-							}
-							if (isset($brd_styles[2])) {
-								$dom[$key]['border']['B']['cap'] = 'square';
-								$dom[$key]['border']['B']['join'] = 'miter';
-								$dom[$key]['border']['B']['dash'] = $this->getCSSBorderDashStyle($brd_styles[2]);
-								if ($dom[$key]['border']['B']['dash'] < 0) {
-									$dom[$key]['border']['B'] = array();
-								}
-							}
-						}
-						$cellside = array('L' => 'left', 'R' => 'right', 'T' => 'top', 'B' => 'bottom');
-						foreach ($cellside as $bsk => $bsv) {
-							if (isset($dom[$key]['style']['border-'.$bsv])) {
-								$borderstyle = $this->getCSSBorderStyle($dom[$key]['style']['border-'.$bsv]);
-								if (!empty($borderstyle)) {
-									$dom[$key]['border'][$bsk] = $borderstyle;
-								}
-							}
-							if (isset($dom[$key]['style']['border-'.$bsv.'-color'])) {
-								$dom[$key]['border'][$bsk]['color'] = TCPDF_COLORS::convertHTMLColorToDec($dom[$key]['style']['border-'.$bsv.'-color'], $this->spot_colors);
-							}
-							if (isset($dom[$key]['style']['border-'.$bsv.'-width'])) {
-								$dom[$key]['border'][$bsk]['width'] = $this->getCSSBorderWidth($dom[$key]['style']['border-'.$bsv.'-width']);
-							}
-							if (isset($dom[$key]['style']['border-'.$bsv.'-style'])) {
-								$dom[$key]['border'][$bsk]['dash'] = $this->getCSSBorderDashStyle($dom[$key]['style']['border-'.$bsv.'-style']);
-								if ($dom[$key]['border'][$bsk]['dash'] < 0) {
-									$dom[$key]['border'][$bsk] = array();
-								}
-							}
-						}
-						// check for CSS padding properties
-						if (isset($dom[$key]['style']['padding'])) {
-							$dom[$key]['padding'] = $this->getCSSPadding($dom[$key]['style']['padding']);
-						} else {
-							$dom[$key]['padding'] = $this->cell_padding;
-						}
-						foreach ($cellside as $psk => $psv) {
-							if (isset($dom[$key]['style']['padding-'.$psv])) {
-								$dom[$key]['padding'][$psk] = $this->getHTMLUnitToUnits($dom[$key]['style']['padding-'.$psv], 0, 'px', false);
-							}
-						}
-						// check for CSS margin properties
-						if (isset($dom[$key]['style']['margin'])) {
-							$dom[$key]['margin'] = $this->getCSSMargin($dom[$key]['style']['margin']);
-						} else {
-							$dom[$key]['margin'] = $this->cell_margin;
-						}
-						foreach ($cellside as $psk => $psv) {
-							if (isset($dom[$key]['style']['margin-'.$psv])) {
-								$dom[$key]['margin'][$psk] = $this->getHTMLUnitToUnits(str_replace('auto', '0', $dom[$key]['style']['margin-'.$psv]), 0, 'px', false);
-							}
-						}
-						// check for CSS border-spacing properties
-						if (isset($dom[$key]['style']['border-spacing'])) {
-							$dom[$key]['border-spacing'] = $this->getCSSBorderMargin($dom[$key]['style']['border-spacing']);
-						}
-						// page-break-inside
-						if (isset($dom[$key]['style']['page-break-inside']) AND ($dom[$key]['style']['page-break-inside'] == 'avoid')) {
-							$dom[$key]['attribute']['nobr'] = 'true';
-						}
-						// page-break-before
-						if (isset($dom[$key]['style']['page-break-before'])) {
-							if ($dom[$key]['style']['page-break-before'] == 'always') {
-								$dom[$key]['attribute']['pagebreak'] = 'true';
-							} elseif ($dom[$key]['style']['page-break-before'] == 'left') {
-								$dom[$key]['attribute']['pagebreak'] = 'left';
-							} elseif ($dom[$key]['style']['page-break-before'] == 'right') {
-								$dom[$key]['attribute']['pagebreak'] = 'right';
-							}
-						}
-						// page-break-after
-						if (isset($dom[$key]['style']['page-break-after'])) {
-							if ($dom[$key]['style']['page-break-after'] == 'always') {
-								$dom[$key]['attribute']['pagebreakafter'] = 'true';
-							} elseif ($dom[$key]['style']['page-break-after'] == 'left') {
-								$dom[$key]['attribute']['pagebreakafter'] = 'left';
-							} elseif ($dom[$key]['style']['page-break-after'] == 'right') {
-								$dom[$key]['attribute']['pagebreakafter'] = 'right';
-							}
-						}
-					}
-					if (isset($dom[$key]['attribute']['display'])) {
-						$dom[$key]['hide'] = (trim(strtolower($dom[$key]['attribute']['display'])) == 'none');
-					}
-					if (isset($dom[$key]['attribute']['border']) AND ($dom[$key]['attribute']['border'] != 0)) {
-						$borderstyle = $this->getCSSBorderStyle($dom[$key]['attribute']['border'].' solid black');
-						if (!empty($borderstyle)) {
-							$dom[$key]['border']['LTRB'] = $borderstyle;
-						}
-					}
-					// check for font tag
-					if ($dom[$key]['value'] == 'font') {
-						// font family
-						if (isset($dom[$key]['attribute']['face'])) {
-							$dom[$key]['fontname'] = $this->getFontFamilyName($dom[$key]['attribute']['face']);
-						}
-						// font size
-						if (isset($dom[$key]['attribute']['size'])) {
-							if ($key > 0) {
-								if ($dom[$key]['attribute']['size'][0] == '+') {
-									$dom[$key]['fontsize'] = $dom[($dom[$key]['parent'])]['fontsize'] + intval(substr($dom[$key]['attribute']['size'], 1));
-								} elseif ($dom[$key]['attribute']['size'][0] == '-') {
-									$dom[$key]['fontsize'] = $dom[($dom[$key]['parent'])]['fontsize'] - intval(substr($dom[$key]['attribute']['size'], 1));
-								} else {
-									$dom[$key]['fontsize'] = intval($dom[$key]['attribute']['size']);
-								}
-							} else {
-								$dom[$key]['fontsize'] = intval($dom[$key]['attribute']['size']);
-							}
-						}
-					}
-					// force natural alignment for lists
-					if ((($dom[$key]['value'] == 'ul') OR ($dom[$key]['value'] == 'ol') OR ($dom[$key]['value'] == 'dl'))
-						AND (!isset($dom[$key]['align']) OR TCPDF_STATIC::empty_string($dom[$key]['align']) OR ($dom[$key]['align'] != 'J'))) {
-						if ($this->rtl) {
-							$dom[$key]['align'] = 'R';
-						} else {
-							$dom[$key]['align'] = 'L';
-						}
-					}
-					if (($dom[$key]['value'] == 'small') OR ($dom[$key]['value'] == 'sup') OR ($dom[$key]['value'] == 'sub')) {
-						if (!isset($dom[$key]['attribute']['size']) AND !isset($dom[$key]['style']['font-size'])) {
-							$dom[$key]['fontsize'] = $dom[$key]['fontsize'] * K_SMALL_RATIO;
-						}
-					}
-					if (($dom[$key]['value'] == 'strong') OR ($dom[$key]['value'] == 'b')) {
-						$dom[$key]['fontstyle'] .= 'B';
-					}
-					if (($dom[$key]['value'] == 'em') OR ($dom[$key]['value'] == 'i')) {
-						$dom[$key]['fontstyle'] .= 'I';
-					}
-					if ($dom[$key]['value'] == 'u') {
-						$dom[$key]['fontstyle'] .= 'U';
-					}
-					if (($dom[$key]['value'] == 'del') OR ($dom[$key]['value'] == 's') OR ($dom[$key]['value'] == 'strike')) {
-						$dom[$key]['fontstyle'] .= 'D';
-					}
-					if (!isset($dom[$key]['style']['text-decoration']) AND ($dom[$key]['value'] == 'a')) {
-						$dom[$key]['fontstyle'] = $this->htmlLinkFontStyle;
-					}
-					if (($dom[$key]['value'] == 'pre') OR ($dom[$key]['value'] == 'tt')) {
-						$dom[$key]['fontname'] = $this->default_monospaced_font;
-					}
-					if (!empty($dom[$key]['value']) AND ($dom[$key]['value'][0] == 'h') AND (intval($dom[$key]['value']{1}) > 0) AND (intval($dom[$key]['value']{1}) < 7)) {
-						// headings h1, h2, h3, h4, h5, h6
-						if (!isset($dom[$key]['attribute']['size']) AND !isset($dom[$key]['style']['font-size'])) {
-							$headsize = (4 - intval($dom[$key]['value']{1})) * 2;
-							$dom[$key]['fontsize'] = $dom[0]['fontsize'] + $headsize;
-						}
-						if (!isset($dom[$key]['style']['font-weight'])) {
-							$dom[$key]['fontstyle'] .= 'B';
-						}
-					}
-					if (($dom[$key]['value'] == 'table')) {
-						$dom[$key]['rows'] = 0; // number of rows
-						$dom[$key]['trids'] = array(); // IDs of TR elements
-						$dom[$key]['thead'] = ''; // table header rows
-					}
-					if (($dom[$key]['value'] == 'tr')) {
-						$dom[$key]['cols'] = 0;
-						if ($thead) {
-							$dom[$key]['thead'] = true;
-							// rows on thead block are printed as a separate table
-						} else {
-							$dom[$key]['thead'] = false;
-							// store the number of rows on table element
-							++$dom[($dom[$key]['parent'])]['rows'];
-							// store the TR elements IDs on table element
-							array_push($dom[($dom[$key]['parent'])]['trids'], $key);
-						}
-					}
-					if (($dom[$key]['value'] == 'th') OR ($dom[$key]['value'] == 'td')) {
-						if (isset($dom[$key]['attribute']['colspan'])) {
-							$colspan = intval($dom[$key]['attribute']['colspan']);
-						} else {
-							$colspan = 1;
-						}
-						$dom[$key]['attribute']['colspan'] = $colspan;
-						$dom[($dom[$key]['parent'])]['cols'] += $colspan;
-					}
-					// text direction
-					if (isset($dom[$key]['attribute']['dir'])) {
-						$dom[$key]['dir'] = $dom[$key]['attribute']['dir'];
-					}
-					// set foreground color attribute
-					if (isset($dom[$key]['attribute']['color']) AND (!TCPDF_STATIC::empty_string($dom[$key]['attribute']['color']))) {
-						$dom[$key]['fgcolor'] = TCPDF_COLORS::convertHTMLColorToDec($dom[$key]['attribute']['color'], $this->spot_colors);
-					} elseif (!isset($dom[$key]['style']['color']) AND ($dom[$key]['value'] == 'a')) {
-						$dom[$key]['fgcolor'] = $this->htmlLinkColorArray;
-					}
-					// set background color attribute
-					if (isset($dom[$key]['attribute']['bgcolor']) AND (!TCPDF_STATIC::empty_string($dom[$key]['attribute']['bgcolor']))) {
-						$dom[$key]['bgcolor'] = TCPDF_COLORS::convertHTMLColorToDec($dom[$key]['attribute']['bgcolor'], $this->spot_colors);
-					}
-					// set stroke color attribute
-					if (isset($dom[$key]['attribute']['strokecolor']) AND (!TCPDF_STATIC::empty_string($dom[$key]['attribute']['strokecolor']))) {
-						$dom[$key]['strokecolor'] = TCPDF_COLORS::convertHTMLColorToDec($dom[$key]['attribute']['strokecolor'], $this->spot_colors);
-					}
-					// check for width attribute
-					if (isset($dom[$key]['attribute']['width'])) {
-						$dom[$key]['width'] = $dom[$key]['attribute']['width'];
-					}
-					// check for height attribute
-					if (isset($dom[$key]['attribute']['height'])) {
-						$dom[$key]['height'] = $dom[$key]['attribute']['height'];
-					}
-					// check for text alignment
-					if (isset($dom[$key]['attribute']['align']) AND (!TCPDF_STATIC::empty_string($dom[$key]['attribute']['align'])) AND ($dom[$key]['value'] !== 'img')) {
-						$dom[$key]['align'] = strtoupper($dom[$key]['attribute']['align'][0]);
-					}
-					// check for text rendering mode (the following attributes do not exist in HTML)
-					if (isset($dom[$key]['attribute']['stroke'])) {
-						// font stroke width
-						$dom[$key]['stroke'] = $this->getHTMLUnitToUnits($dom[$key]['attribute']['stroke'], $dom[$key]['fontsize'], 'pt', true);
-					}
-					if (isset($dom[$key]['attribute']['fill'])) {
-						// font fill
-						if ($dom[$key]['attribute']['fill'] == 'true') {
-							$dom[$key]['fill'] = true;
-						} else {
-							$dom[$key]['fill'] = false;
-						}
-					}
-					if (isset($dom[$key]['attribute']['clip'])) {
-						// clipping mode
-						if ($dom[$key]['attribute']['clip'] == 'true') {
-							$dom[$key]['clip'] = true;
-						} else {
-							$dom[$key]['clip'] = false;
-						}
-					}
-				} // end opening tag
-			} else {
-				// text
-				$dom[$key]['tag'] = false;
-				$dom[$key]['block'] = false;
-				$dom[$key]['parent'] = end($level);
-				$dom[$key]['dir'] = $dom[$dom[$key]['parent']]['dir'];
-				if (!empty($dom[$dom[$key]['parent']]['text-transform'])) {
-					// text-transform for unicode requires mb_convert_case (Multibyte String Functions)
-					if (function_exists('mb_convert_case')) {
-						$ttm = array('capitalize' => MB_CASE_TITLE, 'uppercase' => MB_CASE_UPPER, 'lowercase' => MB_CASE_LOWER);
-						if (isset($ttm[$dom[$dom[$key]['parent']]['text-transform']])) {
-							$element = mb_convert_case($element, $ttm[$dom[$dom[$key]['parent']]['text-transform']], $this->encoding);
-						}
-					} elseif (!$this->isunicode) {
-						switch ($dom[$dom[$key]['parent']]['text-transform']) {
-							case 'capitalize': {
-								$element = ucwords(strtolower($element));
-								break;
-							}
-							case 'uppercase': {
-								$element = strtoupper($element);
-								break;
-							}
-							case 'lowercase': {
-								$element = strtolower($element);
-								break;
-							}
-						}
-					}
-				}
-				$dom[$key]['value'] = stripslashes($this->unhtmlentities($element));
-			}
-			++$elkey;
-			++$key;
-		}
-		return $dom;
-	}
-
-	/**
-	 * Returns the string used to find spaces
-	 * @return string
-	 * @protected
-	 * @author Nicola Asuni
-	 * @since 4.8.024 (2010-01-15)
-	 */
-	protected function getSpaceString() {
-		$spacestr = chr(32);
-		if ($this->isUnicodeFont()) {
-			$spacestr = chr(0).chr(32);
-		}
-		return $spacestr;
-	}
-
-	/**
-	 * Return an hash code used to ensure that the serialized data has been generated by this TCPDF instance.
-	 * @param $data (string) serialized data
-	 * @return string
-	 * @public static
-	 */
-	protected function getHashForTCPDFtagParams($data) {
-		return md5(strlen($data).$this->file_id.$data);
-	}
-
-	/**
-	 * Serialize an array of parameters to be used with TCPDF tag in HTML code.
-	 * @param $data (array) parameters array
-	 * @return string containing serialized data
-	 * @public static
-	 */
-	public function serializeTCPDFtagParameters($data) {
-		$encoded = urlencode(json_encode($data));
-		return $this->getHashForTCPDFtagParams($encoded).$encoded;
-	}
-
-	/**
-	 * Unserialize parameters to be used with TCPDF tag in HTML code.
-	 * @param $data (string) serialized data
-	 * @return array containing unserialized data
-	 * @protected static
-	 */
-	protected function unserializeTCPDFtagParameters($data) {
-		$hash = substr($data, 0, 32);
-		$encoded = substr($data, 32);
-		if ($hash != $this->getHashForTCPDFtagParams($encoded)) {
-			$this->Error('Invalid parameters');
-		}
-		return json_decode(urldecode($encoded), true);
-	}
-
-	/**
-	 * Prints a cell (rectangular area) with optional borders, background color and html text string.
-	 * The upper-left corner of the cell corresponds to the current position. After the call, the current position moves to the right or to the next line.<br />
-	 * If automatic page breaking is enabled and the cell goes beyond the limit, a page break is done before outputting.
-	 * IMPORTANT: The HTML must be well formatted - try to clean-up it using an application like HTML-Tidy before submitting.
-	 * Supported tags are: a, b, blockquote, br, dd, del, div, dl, dt, em, font, h1, h2, h3, h4, h5, h6, hr, i, img, li, ol, p, pre, small, span, strong, sub, sup, table, tcpdf, td, th, thead, tr, tt, u, ul
-	 * NOTE: all the HTML attributes must be enclosed in double-quote.
-	 * @param $w (float) Cell width. If 0, the cell extends up to the right margin.
-	 * @param $h (float) Cell minimum height. The cell extends automatically if needed.
-	 * @param $x (float) upper-left corner X coordinate
-	 * @param $y (float) upper-left corner Y coordinate
-	 * @param $html (string) html text to print. Default value: empty string.
-	 * @param $border (mixed) Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
-	 * @param $ln (int) Indicates where the current position should go after the call. Possible values are:<ul><li>0: to the right (or left for RTL language)</li><li>1: to the beginning of the next line</li><li>2: below</li></ul>
-Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value: 0.
-	 * @param $fill (boolean) Indicates if the cell background must be painted (true) or transparent (false).
-	 * @param $reseth (boolean) if true reset the last cell height (default true).
-	 * @param $align (string) Allows to center or align the text. Possible values are:<ul><li>L : left align</li><li>C : center</li><li>R : right align</li><li>'' : empty string : left for LTR or right for RTL</li></ul>
-	 * @param $autopadding (boolean) if true, uses internal padding and automatically adjust it to account for line width.
-	 * @see Multicell(), writeHTML()
-	 * @public
-	 */
-	public function writeHTMLCell($w, $h, $x, $y, $html='', $border=0, $ln=0, $fill=false, $reseth=true, $align='', $autopadding=true) {
-		return $this->MultiCell($w, $h, $html, $border, $align, $fill, $ln, $x, $y, $reseth, 0, true, $autopadding, 0, 'T', false);
-	}
-
-	/**
-	 * Allows to preserve some HTML formatting (limited support).<br />
-	 * IMPORTANT: The HTML must be well formatted - try to clean-up it using an application like HTML-Tidy before submitting.
-	 * Supported tags are: a, b, blockquote, br, dd, del, div, dl, dt, em, font, h1, h2, h3, h4, h5, h6, hr, i, img, li, ol, p, pre, small, span, strong, sub, sup, table, tcpdf, td, th, thead, tr, tt, u, ul
-	 * NOTE: all the HTML attributes must be enclosed in double-quote.
-	 * @param $html (string) text to display
-	 * @param $ln (boolean) if true add a new line after text (default = true)
-	 * @param $fill (boolean) Indicates if the background must be painted (true) or transparent (false).
-	 * @param $reseth (boolean) if true reset the last cell height (default false).
-	 * @param $cell (boolean) if true add the current left (or right for RTL) padding to each Write (default false).
-	 * @param $align (string) Allows to center or align the text. Possible values are:<ul><li>L : left align</li><li>C : center</li><li>R : right align</li><li>'' : empty string : left for LTR or right for RTL</li></ul>
-	 * @public
-	 */
-	public function writeHTML($html, $ln=true, $fill=false, $reseth=false, $cell=false, $align='') {
-		$gvars = $this->getGraphicVars();
-		// store current values
-		$prev_cell_margin = $this->cell_margin;
-		$prev_cell_padding = $this->cell_padding;
-		$prevPage = $this->page;
-		$prevlMargin = $this->lMargin;
-		$prevrMargin = $this->rMargin;
-		$curfontname = $this->FontFamily;
-		$curfontstyle = $this->FontStyle;
-		$curfontsize = $this->FontSizePt;
-		$curfontascent = $this->getFontAscent($curfontname, $curfontstyle, $curfontsize);
-		$curfontdescent = $this->getFontDescent($curfontname, $curfontstyle, $curfontsize);
-		$curfontstretcing = $this->font_stretching;
-		$curfonttracking = $this->font_spacing;
-		$this->newline = true;
-		$newline = true;
-		$startlinepage = $this->page;
-		$minstartliney = $this->y;
-		$maxbottomliney = 0;
-		$startlinex = $this->x;
-		$startliney = $this->y;
-		$yshift = 0;
-		$loop = 0;
-		$curpos = 0;
-		$this_method_vars = array();
-		$undo = false;
-		$fontaligned = false;
-		$reverse_dir = false; // true when the text direction is reversed
-		$this->premode = false;
-		if ($this->inxobj) {
-			// we are inside an XObject template
-			$pask = count($this->xobjects[$this->xobjid]['annotations']);
-		} elseif (isset($this->PageAnnots[$this->page])) {
-			$pask = count($this->PageAnnots[$this->page]);
-		} else {
-			$pask = 0;
-		}
-		if ($this->inxobj) {
-			// we are inside an XObject template
-			$startlinepos = strlen($this->xobjects[$this->xobjid]['outdata']);
-		} elseif (!$this->InFooter) {
-			if (isset($this->footerlen[$this->page])) {
-				$this->footerpos[$this->page] = $this->pagelen[$this->page] - $this->footerlen[$this->page];
-			} else {
-				$this->footerpos[$this->page] = $this->pagelen[$this->page];
-			}
-			$startlinepos = $this->footerpos[$this->page];
-		} else {
-			// we are inside the footer
-			$startlinepos = $this->pagelen[$this->page];
-		}
-		$lalign = $align;
-		$plalign = $align;
-		if ($this->rtl) {
-			$w = $this->x - $this->lMargin;
-		} else {
-			$w = $this->w - $this->rMargin - $this->x;
-		}
-		$w -= ($this->cell_padding['L'] + $this->cell_padding['R']);
-		if ($cell) {
-			if ($this->rtl) {
-				$this->x -= $this->cell_padding['R'];
-				$this->lMargin += $this->cell_padding['R'];
-			} else {
-				$this->x += $this->cell_padding['L'];
-				$this->rMargin += $this->cell_padding['L'];
-			}
-		}
-		if ($this->customlistindent >= 0) {
-			$this->listindent = $this->customlistindent;
-		} else {
-			$this->listindent = $this->GetStringWidth('000000');
-		}
-		$this->listindentlevel = 0;
-		// save previous states
-		$prev_cell_height_ratio = $this->cell_height_ratio;
-		$prev_listnum = $this->listnum;
-		$prev_listordered = $this->listordered;
-		$prev_listcount = $this->listcount;
-		$prev_lispacer = $this->lispacer;
-		$this->listnum = 0;
-		$this->listordered = array();
-		$this->listcount = array();
-		$this->lispacer = '';
-		if ((TCPDF_STATIC::empty_string($this->lasth)) OR ($reseth)) {
-			// reset row height
-			$this->resetLastH();
-		}
-		$dom = $this->getHtmlDomArray($html);
-		$maxel = count($dom);
-		$key = 0;
-		while ($key < $maxel) {
-			if ($dom[$key]['tag'] AND $dom[$key]['opening'] AND $dom[$key]['hide']) {
-				// store the node key
-				$hidden_node_key = $key;
-				if ($dom[$key]['self']) {
-					// skip just this self-closing tag
-					++$key;
-				} else {
-					// skip this and all children tags
-					while (($key < $maxel) AND (!$dom[$key]['tag'] OR $dom[$key]['opening'] OR ($dom[$key]['parent'] != $hidden_node_key))) {
-						// skip hidden objects
-						++$key;
-					}
-					++$key;
-				}
-			}
-			if ($dom[$key]['tag'] AND isset($dom[$key]['attribute']['pagebreak'])) {
-				// check for pagebreak
-				if (($dom[$key]['attribute']['pagebreak'] == 'true') OR ($dom[$key]['attribute']['pagebreak'] == 'left') OR ($dom[$key]['attribute']['pagebreak'] == 'right')) {
-					// add a page (or trig AcceptPageBreak() for multicolumn mode)
-					$this->checkPageBreak($this->PageBreakTrigger + 1);
-					$this->htmlvspace = ($this->PageBreakTrigger + 1);
-				}
-				if ((($dom[$key]['attribute']['pagebreak'] == 'left') AND (((!$this->rtl) AND (($this->page % 2) == 0)) OR (($this->rtl) AND (($this->page % 2) != 0))))
-					OR (($dom[$key]['attribute']['pagebreak'] == 'right') AND (((!$this->rtl) AND (($this->page % 2) != 0)) OR (($this->rtl) AND (($this->page % 2) == 0))))) {
-					// add a page (or trig AcceptPageBreak() for multicolumn mode)
-					$this->checkPageBreak($this->PageBreakTrigger + 1);
-					$this->htmlvspace = ($this->PageBreakTrigger + 1);
-				}
-			}
-			if ($dom[$key]['tag'] AND $dom[$key]['opening'] AND isset($dom[$key]['attribute']['nobr']) AND ($dom[$key]['attribute']['nobr'] == 'true')) {
-				if (isset($dom[($dom[$key]['parent'])]['attribute']['nobr']) AND ($dom[($dom[$key]['parent'])]['attribute']['nobr'] == 'true')) {
-					$dom[$key]['attribute']['nobr'] = false;
-				} else {
-					// store current object
-					$this->startTransaction();
-					// save this method vars
-					$this_method_vars['html'] = $html;
-					$this_method_vars['ln'] = $ln;
-					$this_method_vars['fill'] = $fill;
-					$this_method_vars['reseth'] = $reseth;
-					$this_method_vars['cell'] = $cell;
-					$this_method_vars['align'] = $align;
-					$this_method_vars['gvars'] = $gvars;
-					$this_method_vars['prevPage'] = $prevPage;
-					$this_method_vars['prev_cell_margin'] = $prev_cell_margin;
-					$this_method_vars['prev_cell_padding'] = $prev_cell_padding;
-					$this_method_vars['prevlMargin'] = $prevlMargin;
-					$this_method_vars['prevrMargin'] = $prevrMargin;
-					$this_method_vars['curfontname'] = $curfontname;
-					$this_method_vars['curfontstyle'] = $curfontstyle;
-					$this_method_vars['curfontsize'] = $curfontsize;
-					$this_method_vars['curfontascent'] = $curfontascent;
-					$this_method_vars['curfontdescent'] = $curfontdescent;
-					$this_method_vars['curfontstretcing'] = $curfontstretcing;
-					$this_method_vars['curfonttracking'] = $curfonttracking;
-					$this_method_vars['minstartliney'] = $minstartliney;
-					$this_method_vars['maxbottomliney'] = $maxbottomliney;
-					$this_method_vars['yshift'] = $yshift;
-					$this_method_vars['startlinepage'] = $startlinepage;
-					$this_method_vars['startlinepos'] = $startlinepos;
-					$this_method_vars['startlinex'] = $startlinex;
-					$this_method_vars['startliney'] = $startliney;
-					$this_method_vars['newline'] = $newline;
-					$this_method_vars['loop'] = $loop;
-					$this_method_vars['curpos'] = $curpos;
-					$this_method_vars['pask'] = $pask;
-					$this_method_vars['lalign'] = $lalign;
-					$this_method_vars['plalign'] = $plalign;
-					$this_method_vars['w'] = $w;
-					$this_method_vars['prev_cell_height_ratio'] = $prev_cell_height_ratio;
-					$this_method_vars['prev_listnum'] = $prev_listnum;
-					$this_method_vars['prev_listordered'] = $prev_listordered;
-					$this_method_vars['prev_listcount'] = $prev_listcount;
-					$this_method_vars['prev_lispacer'] = $prev_lispacer;
-					$this_method_vars['fontaligned'] = $fontaligned;
-					$this_method_vars['key'] = $key;
-					$this_method_vars['dom'] = $dom;
-				}
-			}
-			// print THEAD block
-			if (($dom[$key]['value'] == 'tr') AND isset($dom[$key]['thead']) AND $dom[$key]['thead']) {
-				if (isset($dom[$key]['parent']) AND isset($dom[$dom[$key]['parent']]['thead']) AND !TCPDF_STATIC::empty_string($dom[$dom[$key]['parent']]['thead'])) {
-					$this->inthead = true;
-					// print table header (thead)
-					$this->writeHTML($this->thead, false, false, false, false, '');
-					// check if we are on a new page or on a new column
-					if (($this->y < $this->start_transaction_y) OR ($this->checkPageBreak($this->lasth, '', false))) {
-						// we are on a new page or on a new column and the total object height is less than the available vertical space.
-						// restore previous object
-						$this->rollbackTransaction(true);
-						// restore previous values
-						foreach ($this_method_vars as $vkey => $vval) {
-							$$vkey = $vval;
-						}
-						// disable table header
-						$tmp_thead = $this->thead;
-						$this->thead = '';
-						// add a page (or trig AcceptPageBreak() for multicolumn mode)
-						$pre_y = $this->y;
-						if ((!$this->checkPageBreak($this->PageBreakTrigger + 1)) AND ($this->y < $pre_y)) {
-							// fix for multicolumn mode
-							$startliney = $this->y;
-						}
-						$this->start_transaction_page = $this->page;
-						$this->start_transaction_y = $this->y;
-						// restore table header
-						$this->thead = $tmp_thead;
-						// fix table border properties
-						if (isset($dom[$dom[$key]['parent']]['attribute']['cellspacing'])) {
-							$tmp_cellspacing = $this->getHTMLUnitToUnits($dom[$dom[$key]['parent']]['attribute']['cellspacing'], 1, 'px');
-						} elseif (isset($dom[$dom[$key]['parent']]['border-spacing'])) {
-							$tmp_cellspacing = $dom[$dom[$key]['parent']]['border-spacing']['V'];
-						} else {
-							$tmp_cellspacing = 0;
-						}
-						$dom[$dom[$key]['parent']]['borderposition']['page'] = $this->page;
-						$dom[$dom[$key]['parent']]['borderposition']['column'] = $this->current_column;
-						$dom[$dom[$key]['parent']]['borderposition']['y'] = $this->y + $tmp_cellspacing;
-						$xoffset = ($this->x - $dom[$dom[$key]['parent']]['borderposition']['x']);
-						$dom[$dom[$key]['parent']]['borderposition']['x'] += $xoffset;
-						$dom[$dom[$key]['parent']]['borderposition']['xmax'] += $xoffset;
-						// print table header (thead)
-						$this->writeHTML($this->thead, false, false, false, false, '');
-					}
-				}
-				// move $key index forward to skip THEAD block
-				while ( ($key < $maxel) AND (!(
-					($dom[$key]['tag'] AND $dom[$key]['opening'] AND ($dom[$key]['value'] == 'tr') AND (!isset($dom[$key]['thead']) OR !$dom[$key]['thead']))
-					OR ($dom[$key]['tag'] AND (!$dom[$key]['opening']) AND ($dom[$key]['value'] == 'table'))) )) {
-					++$key;
-				}
-			}
-			if ($dom[$key]['tag'] OR ($key == 0)) {
-				if ((($dom[$key]['value'] == 'table') OR ($dom[$key]['value'] == 'tr')) AND (isset($dom[$key]['align']))) {
-					$dom[$key]['align'] = ($this->rtl) ? 'R' : 'L';
-				}
-				// vertically align image in line
-				if ((!$this->newline) AND ($dom[$key]['value'] == 'img') AND (isset($dom[$key]['height'])) AND ($dom[$key]['height'] > 0)) {
-					// get image height
-					$imgh = $this->getHTMLUnitToUnits($dom[$key]['height'], ($dom[$key]['fontsize'] / $this->k), 'px');
-					$autolinebreak = false;
-					if (!empty($dom[$key]['width'])) {
-						$imgw = $this->getHTMLUnitToUnits($dom[$key]['width'], ($dom[$key]['fontsize'] / $this->k), 'px', false);
-						if (($imgw <= ($this->w - $this->lMargin - $this->rMargin - $this->cell_padding['L'] - $this->cell_padding['R']))
-							AND ((($this->rtl) AND (($this->x - $imgw) < ($this->lMargin + $this->cell_padding['L'])))
-							OR ((!$this->rtl) AND (($this->x + $imgw) > ($this->w - $this->rMargin - $this->cell_padding['R']))))) {
-							// add automatic line break
-							$autolinebreak = true;
-							$this->Ln('', $cell);
-							if ((!$dom[($key-1)]['tag']) AND ($dom[($key-1)]['value'] == ' ')) {
-								// go back to evaluate this line break
-								--$key;
-							}
-						}
-					}
-					if (!$autolinebreak) {
-						if ($this->inPageBody()) {
-							$pre_y = $this->y;
-							// check for page break
-							if ((!$this->checkPageBreak($imgh)) AND ($this->y < $pre_y)) {
-								// fix for multicolumn mode
-								$startliney = $this->y;
-							}
-						}
-						if ($this->page > $startlinepage) {
-							// fix line splitted over two pages
-							if (isset($this->footerlen[$startlinepage])) {
-								$curpos = $this->pagelen[$startlinepage] - $this->footerlen[$startlinepage];
-							}
-							// line to be moved one page forward
-							$pagebuff = $this->getPageBuffer($startlinepage);
-							$linebeg = substr($pagebuff, $startlinepos, ($curpos - $startlinepos));
-							$tstart = substr($pagebuff, 0, $startlinepos);
-							$tend = substr($this->getPageBuffer($startlinepage), $curpos);
-							// remove line from previous page
-							$this->setPageBuffer($startlinepage, $tstart.''.$tend);
-							$pagebuff = $this->getPageBuffer($this->page);
-							$tstart = substr($pagebuff, 0, $this->cntmrk[$this->page]);
-							$tend = substr($pagebuff, $this->cntmrk[$this->page]);
-							// add line start to current page
-							$yshift = ($minstartliney - $this->y);
-							if ($fontaligned) {
-								$yshift += ($curfontsize / $this->k);
-							}
-							$try = sprintf('1 0 0 1 0 %F cm', ($yshift * $this->k));
-							$this->setPageBuffer($this->page, $tstart."\nq\n".$try."\n".$linebeg."\nQ\n".$tend);
-							// shift the annotations and links
-							if (isset($this->PageAnnots[$this->page])) {
-								$next_pask = count($this->PageAnnots[$this->page]);
-							} else {
-								$next_pask = 0;
-							}
-							if (isset($this->PageAnnots[$startlinepage])) {
-								foreach ($this->PageAnnots[$startlinepage] as $pak => $pac) {
-									if ($pak >= $pask) {
-										$this->PageAnnots[$this->page][] = $pac;
-										unset($this->PageAnnots[$startlinepage][$pak]);
-										$npak = count($this->PageAnnots[$this->page]) - 1;
-										$this->PageAnnots[$this->page][$npak]['y'] -= $yshift;
-									}
-								}
-							}
-							$pask = $next_pask;
-							$startlinepos = $this->cntmrk[$this->page];
-							$startlinepage = $this->page;
-							$startliney = $this->y;
-							$this->newline = false;
-						}
-						$this->y += ($this->getCellHeight($curfontsize / $this->k) - ($curfontdescent * $this->cell_height_ratio) - $imgh);
-						$minstartliney = min($this->y, $minstartliney);
-						$maxbottomliney = ($startliney + $this->getCellHeight($curfontsize / $this->k));
-					}
-				} elseif (isset($dom[$key]['fontname']) OR isset($dom[$key]['fontstyle']) OR isset($dom[$key]['fontsize']) OR isset($dom[$key]['line-height'])) {
-					// account for different font size
-					$pfontname = $curfontname;
-					$pfontstyle = $curfontstyle;
-					$pfontsize = $curfontsize;
-					$fontname = (isset($dom[$key]['fontname']) ? $dom[$key]['fontname'] : $curfontname);
-					$fontstyle = (isset($dom[$key]['fontstyle']) ? $dom[$key]['fontstyle'] : $curfontstyle);
-					$fontsize = (isset($dom[$key]['fontsize']) ? $dom[$key]['fontsize'] : $curfontsize);
-					$fontascent = $this->getFontAscent($fontname, $fontstyle, $fontsize);
-					$fontdescent = $this->getFontDescent($fontname, $fontstyle, $fontsize);
-					if (($fontname != $curfontname) OR ($fontstyle != $curfontstyle) OR ($fontsize != $curfontsize)
-						OR ($this->cell_height_ratio != $dom[$key]['line-height'])
-						OR ($dom[$key]['tag'] AND $dom[$key]['opening'] AND ($dom[$key]['value'] == 'li')) ) {
-						if (($key < ($maxel - 1)) AND (
-								($dom[$key]['tag'] AND $dom[$key]['opening'] AND ($dom[$key]['value'] == 'li'))
-								OR ($this->cell_height_ratio != $dom[$key]['line-height'])
-								OR (!$this->newline AND is_numeric($fontsize) AND is_numeric($curfontsize)
-								AND ($fontsize >= 0) AND ($curfontsize >= 0)
-								AND (($fontsize != $curfontsize) OR ($fontstyle != $curfontstyle) OR ($fontname != $curfontname)))
-							)) {
-							if ($this->page > $startlinepage) {
-								// fix lines splitted over two pages
-								if (isset($this->footerlen[$startlinepage])) {
-									$curpos = $this->pagelen[$startlinepage] - $this->footerlen[$startlinepage];
-								}
-								// line to be moved one page forward
-								$pagebuff = $this->getPageBuffer($startlinepage);
-								$linebeg = substr($pagebuff, $startlinepos, ($curpos - $startlinepos));
-								$tstart = substr($pagebuff, 0, $startlinepos);
-								$tend = substr($this->getPageBuffer($startlinepage), $curpos);
-								// remove line start from previous page
-								$this->setPageBuffer($startlinepage, $tstart.''.$tend);
-								$pagebuff = $this->getPageBuffer($this->page);
-								$tstart = substr($pagebuff, 0, $this->cntmrk[$this->page]);
-								$tend = substr($pagebuff, $this->cntmrk[$this->page]);
-								// add line start to current page
-								$yshift = ($minstartliney - $this->y);
-								$try = sprintf('1 0 0 1 0 %F cm', ($yshift * $this->k));
-								$this->setPageBuffer($this->page, $tstart."\nq\n".$try."\n".$linebeg."\nQ\n".$tend);
-								// shift the annotations and links
-								if (isset($this->PageAnnots[$this->page])) {
-									$next_pask = count($this->PageAnnots[$this->page]);
-								} else {
-									$next_pask = 0;
-								}
-								if (isset($this->PageAnnots[$startlinepage])) {
-									foreach ($this->PageAnnots[$startlinepage] as $pak => $pac) {
-										if ($pak >= $pask) {
-											$this->PageAnnots[$this->page][] = $pac;
-											unset($this->PageAnnots[$startlinepage][$pak]);
-											$npak = count($this->PageAnnots[$this->page]) - 1;
-											$this->PageAnnots[$this->page][$npak]['y'] -= $yshift;
-										}
-									}
-								}
-								$pask = $next_pask;
-								$startlinepos = $this->cntmrk[$this->page];
-								$startlinepage = $this->page;
-								$startliney = $this->y;
-							}
-							if (!isset($dom[$key]['line-height'])) {
-								$dom[$key]['line-height'] = $this->cell_height_ratio;
-							}
-							if (!$dom[$key]['block']) {
-								if (!(isset($dom[($key + 1)]) AND $dom[($key + 1)]['tag'] AND (!$dom[($key + 1)]['opening']) AND ($dom[($key + 1)]['value'] != 'li') AND $dom[$key]['tag'] AND (!$dom[$key]['opening']))) {
-									$this->y += (((($curfontsize * $this->cell_height_ratio) - ($fontsize * $dom[$key]['line-height'])) / $this->k) + $curfontascent - $fontascent - $curfontdescent + $fontdescent) / 2;
-								}
-								if (($dom[$key]['value'] != 'sup') AND ($dom[$key]['value'] != 'sub')) {
-									$current_line_align_data = array($key, $minstartliney, $maxbottomliney);
-									if (isset($line_align_data) AND (($line_align_data[0] == ($key - 1)) OR (($line_align_data[0] == ($key - 2)) AND (isset($dom[($key - 1)])) AND (preg_match('/^([\s]+)$/', $dom[($key - 1)]['value']) > 0)))) {
-										$minstartliney = min($this->y, $line_align_data[1]);
-										$maxbottomliney = max(($this->y + $this->getCellHeight($fontsize / $this->k)), $line_align_data[2]);
-									} else {
-										$minstartliney = min($this->y, $minstartliney);
-										$maxbottomliney = max(($this->y + $this->getCellHeight($fontsize / $this->k)), $maxbottomliney);
-									}
-									$line_align_data = $current_line_align_data;
-								}
-							}
-							$this->cell_height_ratio = $dom[$key]['line-height'];
-							$fontaligned = true;
-						}
-						$this->SetFont($fontname, $fontstyle, $fontsize);
-						// reset row height
-						$this->resetLastH();
-						$curfontname = $fontname;
-						$curfontstyle = $fontstyle;
-						$curfontsize = $fontsize;
-						$curfontascent = $fontascent;
-						$curfontdescent = $fontdescent;
-					}
-				}
-				// set text rendering mode
-				$textstroke = isset($dom[$key]['stroke']) ? $dom[$key]['stroke'] : $this->textstrokewidth;
-				$textfill = isset($dom[$key]['fill']) ? $dom[$key]['fill'] : (($this->textrendermode % 2) == 0);
-				$textclip = isset($dom[$key]['clip']) ? $dom[$key]['clip'] : ($this->textrendermode > 3);
-				$this->setTextRenderingMode($textstroke, $textfill, $textclip);
-				if (isset($dom[$key]['font-stretch']) AND ($dom[$key]['font-stretch'] !== false)) {
-					$this->setFontStretching($dom[$key]['font-stretch']);
-				}
-				if (isset($dom[$key]['letter-spacing']) AND ($dom[$key]['letter-spacing'] !== false)) {
-					$this->setFontSpacing($dom[$key]['letter-spacing']);
-				}
-				if (($plalign == 'J') AND $dom[$key]['block']) {
-					$plalign = '';
-				}
-				// get current position on page buffer
-				$curpos = $this->pagelen[$startlinepage];
-				if (isset($dom[$key]['bgcolor']) AND ($dom[$key]['bgcolor'] !== false)) {
-					$this->SetFillColorArray($dom[$key]['bgcolor']);
-					$wfill = true;
-				} else {
-					$wfill = $fill | false;
-				}
-				if (isset($dom[$key]['fgcolor']) AND ($dom[$key]['fgcolor'] !== false)) {
-					$this->SetTextColorArray($dom[$key]['fgcolor']);
-				}
-				if (isset($dom[$key]['strokecolor']) AND ($dom[$key]['strokecolor'] !== false)) {
-					$this->SetDrawColorArray($dom[$key]['strokecolor']);
-				}
-				if (isset($dom[$key]['align'])) {
-					$lalign = $dom[$key]['align'];
-				}
-				if (TCPDF_STATIC::empty_string($lalign)) {
-					$lalign = $align;
-				}
-			}
-			// align lines
-			if ($this->newline AND (strlen($dom[$key]['value']) > 0) AND ($dom[$key]['value'] != 'td') AND ($dom[$key]['value'] != 'th')) {
-				$newline = true;
-				$fontaligned = false;
-				// we are at the beginning of a new line
-				if (isset($startlinex)) {
-					$yshift = ($minstartliney - $startliney);
-					if (($yshift > 0) OR ($this->page > $startlinepage)) {
-						$yshift = 0;
-					}
-					$t_x = 0;
-					// the last line must be shifted to be aligned as requested
-					$linew = abs($this->endlinex - $startlinex);
-					if ($this->inxobj) {
-						// we are inside an XObject template
-						$pstart = substr($this->xobjects[$this->xobjid]['outdata'], 0, $startlinepos);
-						if (isset($opentagpos)) {
-							$midpos = $opentagpos;
-						} else {
-							$midpos = 0;
-						}
-						if ($midpos > 0) {
-							$pmid = substr($this->xobjects[$this->xobjid]['outdata'], $startlinepos, ($midpos - $startlinepos));
-							$pend = substr($this->xobjects[$this->xobjid]['outdata'], $midpos);
-						} else {
-							$pmid = substr($this->xobjects[$this->xobjid]['outdata'], $startlinepos);
-							$pend = '';
-						}
-					} else {
-						$pstart = substr($this->getPageBuffer($startlinepage), 0, $startlinepos);
-						if (isset($opentagpos) AND isset($this->footerlen[$startlinepage]) AND (!$this->InFooter)) {
-							$this->footerpos[$startlinepage] = $this->pagelen[$startlinepage] - $this->footerlen[$startlinepage];
-							$midpos = min($opentagpos, $this->footerpos[$startlinepage]);
-						} elseif (isset($opentagpos)) {
-							$midpos = $opentagpos;
-						} elseif (isset($this->footerlen[$startlinepage]) AND (!$this->InFooter)) {
-							$this->footerpos[$startlinepage] = $this->pagelen[$startlinepage] - $this->footerlen[$startlinepage];
-							$midpos = $this->footerpos[$startlinepage];
-						} else {
-							$midpos = 0;
-						}
-						if ($midpos > 0) {
-							$pmid = substr($this->getPageBuffer($startlinepage), $startlinepos, ($midpos - $startlinepos));
-							$pend = substr($this->getPageBuffer($startlinepage), $midpos);
-						} else {
-							$pmid = substr($this->getPageBuffer($startlinepage), $startlinepos);
-							$pend = '';
-						}
-					}
-					if ((isset($plalign) AND ((($plalign == 'C') OR ($plalign == 'J') OR (($plalign == 'R') AND (!$this->rtl)) OR (($plalign == 'L') AND ($this->rtl)))))) {
-						// calculate shifting amount
-						$tw = $w;
-						if (($plalign == 'J') AND $this->isRTLTextDir() AND ($this->num_columns > 1)) {
-							$tw += $this->cell_padding['R'];
-						}
-						if ($this->lMargin != $prevlMargin) {
-							$tw += ($prevlMargin - $this->lMargin);
-						}
-						if ($this->rMargin != $prevrMargin) {
-							$tw += ($prevrMargin - $this->rMargin);
-						}
-						$one_space_width = $this->GetStringWidth(chr(32));
-						$no = 0; // number of spaces on a line contained on a single block
-						if ($this->isRTLTextDir()) { // RTL
-							// remove left space if exist
-							$pos1 = TCPDF_STATIC::revstrpos($pmid, '[(');
-							if ($pos1 > 0) {
-								$pos1 = intval($pos1);
-								if ($this->isUnicodeFont()) {
-									$pos2 = intval(TCPDF_STATIC::revstrpos($pmid, '[('.chr(0).chr(32)));
-									$spacelen = 2;
-								} else {
-									$pos2 = intval(TCPDF_STATIC::revstrpos($pmid, '[('.chr(32)));
-									$spacelen = 1;
-								}
-								if ($pos1 == $pos2) {
-									$pmid = substr($pmid, 0, ($pos1 + 2)).substr($pmid, ($pos1 + 2 + $spacelen));
-									if (substr($pmid, $pos1, 4) == '[()]') {
-										$linew -= $one_space_width;
-									} elseif ($pos1 == strpos($pmid, '[(')) {
-										$no = 1;
-									}
-								}
-							}
-						} else { // LTR
-							// remove right space if exist
-							$pos1 = TCPDF_STATIC::revstrpos($pmid, ')]');
-							if ($pos1 > 0) {
-								$pos1 = intval($pos1);
-								if ($this->isUnicodeFont()) {
-									$pos2 = intval(TCPDF_STATIC::revstrpos($pmid, chr(0).chr(32).')]')) + 2;
-									$spacelen = 2;
-								} else {
-									$pos2 = intval(TCPDF_STATIC::revstrpos($pmid, chr(32).')]')) + 1;
-									$spacelen = 1;
-								}
-								if ($pos1 == $pos2) {
-									$pmid = substr($pmid, 0, ($pos1 - $spacelen)).substr($pmid, $pos1);
-									$linew -= $one_space_width;
-								}
-							}
-						}
-						$mdiff = ($tw - $linew);
-						if ($plalign == 'C') {
-							if ($this->rtl) {
-								$t_x = -($mdiff / 2);
-							} else {
-								$t_x = ($mdiff / 2);
-							}
-						} elseif ($plalign == 'R') {
-							// right alignment on LTR document
-							$t_x = $mdiff;
-						} elseif ($plalign == 'L') {
-							// left alignment on RTL document
-							$t_x = -$mdiff;
-						} elseif (($plalign == 'J') AND ($plalign == $lalign)) {
-							// Justification
-							if ($this->isRTLTextDir()) {
-								// align text on the left
-								$t_x = -$mdiff;
-							}
-							$ns = 0; // number of spaces
-							$pmidtemp = $pmid;
-							// escape special characters
-							$pmidtemp = preg_replace('/[\\\][\(]/x', '\\#!#OP#!#', $pmidtemp);
-							$pmidtemp = preg_replace('/[\\\][\)]/x', '\\#!#CP#!#', $pmidtemp);
-							// search spaces
-							if (preg_match_all('/\[\(([^\)]*)\)\]/x', $pmidtemp, $lnstring, PREG_PATTERN_ORDER)) {
-								$spacestr = $this->getSpaceString();
-								$maxkk = count($lnstring[1]) - 1;
-								for ($kk=0; $kk <= $maxkk; ++$kk) {
-									// restore special characters
-									$lnstring[1][$kk] = str_replace('#!#OP#!#', '(', $lnstring[1][$kk]);
-									$lnstring[1][$kk] = str_replace('#!#CP#!#', ')', $lnstring[1][$kk]);
-									// store number of spaces on the strings
-									$lnstring[2][$kk] = substr_count($lnstring[1][$kk], $spacestr);
-									// count total spaces on line
-									$ns += $lnstring[2][$kk];
-									$lnstring[3][$kk] = $ns;
-								}
-								if ($ns == 0) {
-									$ns = 1;
-								}
-								// calculate additional space to add to each existing space
-								$spacewidth = ($mdiff / ($ns - $no)) * $this->k;
-								if ($this->FontSize <= 0) {
-									$this->FontSize = 1;
-								}
-								$spacewidthu = -1000 * ($mdiff + (($ns + $no) * $one_space_width)) / $ns / $this->FontSize;
-								if ($this->font_spacing != 0) {
-									// fixed spacing mode
-									$osw = -1000 * $this->font_spacing / $this->FontSize;
-									$spacewidthu += $osw;
-								}
-								$nsmax = $ns;
-								$ns = 0;
-								reset($lnstring);
-								$offset = 0;
-								$strcount = 0;
-								$prev_epsposbeg = 0;
-								$textpos = 0;
-								if ($this->isRTLTextDir()) {
-									$textpos = $this->wPt;
-								}
-								while (preg_match('/([0-9\.\+\-]*)[\s](Td|cm|m|l|c|re)[\s]/x', $pmid, $strpiece, PREG_OFFSET_CAPTURE, $offset) == 1) {
-									// check if we are inside a string section '[( ... )]'
-									$stroffset = strpos($pmid, '[(', $offset);
-									if (($stroffset !== false) AND ($stroffset <= $strpiece[2][1])) {
-										// set offset to the end of string section
-										$offset = strpos($pmid, ')]', $stroffset);
-										while (($offset !== false) AND ($pmid[($offset - 1)] == '\\')) {
-											$offset = strpos($pmid, ')]', ($offset + 1));
-										}
-										if ($offset === false) {
-											$this->Error('HTML Justification: malformed PDF code.');
-										}
-										continue;
-									}
-									if ($this->isRTLTextDir()) {
-										$spacew = ($spacewidth * ($nsmax - $ns));
-									} else {
-										$spacew = ($spacewidth * $ns);
-									}
-									$offset = $strpiece[2][1] + strlen($strpiece[2][0]);
-									$epsposend = strpos($pmid, $this->epsmarker.'Q', $offset);				
-									if ($epsposend !== null) {
-										$epsposend += strlen($this->epsmarker.'Q');
-										$epsposbeg = strpos($pmid, 'q'.$this->epsmarker, $offset);
-										if ($epsposbeg === null) {
-											$epsposbeg = strpos($pmid, 'q'.$this->epsmarker, ($prev_epsposbeg - 6));
-											$prev_epsposbeg = $epsposbeg;
-										}
-										if (($epsposbeg > 0) AND ($epsposend > 0) AND ($offset > $epsposbeg) AND ($offset < $epsposend)) {
-											// shift EPS images
-											$trx = sprintf('1 0 0 1 %F 0 cm', $spacew);
-											$pmid_b = substr($pmid, 0, $epsposbeg);
-											$pmid_m = substr($pmid, $epsposbeg, ($epsposend - $epsposbeg));
-											$pmid_e = substr($pmid, $epsposend);
-											$pmid = $pmid_b."\nq\n".$trx."\n".$pmid_m."\nQ\n".$pmid_e;
-											$offset = $epsposend;
-											continue;
-										}
-									}
-									$currentxpos = 0;
-									// shift blocks of code
-									switch ($strpiece[2][0]) {
-										case 'Td':
-										case 'cm':
-										case 'm':
-										case 'l': {
-											// get current X position
-											preg_match('/([0-9\.\+\-]*)[\s]('.$strpiece[1][0].')[\s]('.$strpiece[2][0].')([\s]*)/x', $pmid, $xmatches);
-											if (!isset($xmatches[1])) {
-												break;
-											}
-											$currentxpos = $xmatches[1];
-											$textpos = $currentxpos;
-											if (($strcount <= $maxkk) AND ($strpiece[2][0] == 'Td')) {
-												$ns = $lnstring[3][$strcount];
-												if ($this->isRTLTextDir()) {
-													$spacew = ($spacewidth * ($nsmax - $ns));
-												}
-												++$strcount;
-											}
-											// justify block
-											if (preg_match('/([0-9\.\+\-]*)[\s]('.$strpiece[1][0].')[\s]('.$strpiece[2][0].')([\s]*)/x', $pmid, $pmatch) == 1) {
-												$newpmid = sprintf('%F',(floatval($pmatch[1]) + $spacew)).' '.$pmatch[2].' x*#!#*x'.$pmatch[3].$pmatch[4];
-												$pmid = str_replace($pmatch[0], $newpmid, $pmid);
-												unset($pmatch, $newpmid);
-											}
-											break;
-										}
-										case 're': {
-											// justify block
-											if (!TCPDF_STATIC::empty_string($this->lispacer)) {
-												$this->lispacer = '';
-												continue;
-											}
-											preg_match('/([0-9\.\+\-]*)[\s]([0-9\.\+\-]*)[\s]([0-9\.\+\-]*)[\s]('.$strpiece[1][0].')[\s](re)([\s]*)/x', $pmid, $xmatches);
-											if (!isset($xmatches[1])) {
-												break;
-											}
-											$currentxpos = $xmatches[1];
-											$x_diff = 0;
-											$w_diff = 0;
-											if ($this->isRTLTextDir()) { // RTL
-												if ($currentxpos < $textpos) {
-													$x_diff = ($spacewidth * ($nsmax - $lnstring[3][$strcount]));
-													$w_diff = ($spacewidth * $lnstring[2][$strcount]);
-												} else {
-													if ($strcount > 0) {
-														$x_diff = ($spacewidth * ($nsmax - $lnstring[3][($strcount - 1)]));
-														$w_diff = ($spacewidth * $lnstring[2][($strcount - 1)]);
-													}
-												}
-											} else { // LTR
-												if ($currentxpos > $textpos) {
-													if ($strcount > 0) {
-														$x_diff = ($spacewidth * $lnstring[3][($strcount - 1)]);
-													}
-													$w_diff = ($spacewidth * $lnstring[2][$strcount]);
-												} else {
-													if ($strcount > 1) {
-														$x_diff = ($spacewidth * $lnstring[3][($strcount - 2)]);
-													}
-													if ($strcount > 0) {
-														$w_diff = ($spacewidth * $lnstring[2][($strcount - 1)]);
-													}
-												}
-											}
-											if (preg_match('/('.$xmatches[1].')[\s]('.$xmatches[2].')[\s]('.$xmatches[3].')[\s]('.$strpiece[1][0].')[\s](re)([\s]*)/x', $pmid, $pmatch) == 1) {
-												$newx = sprintf('%F',(floatval($pmatch[1]) + $x_diff));
-												$neww = sprintf('%F',(floatval($pmatch[3]) + $w_diff));
-												$newpmid = $newx.' '.$pmatch[2].' '.$neww.' '.$pmatch[4].' x*#!#*x'.$pmatch[5].$pmatch[6];
-												$pmid = str_replace($pmatch[0], $newpmid, $pmid);
-												unset($pmatch, $newpmid, $newx, $neww);
-											}
-											break;
-										}
-										case 'c': {
-											// get current X position
-											preg_match('/([0-9\.\+\-]*)[\s]([0-9\.\+\-]*)[\s]([0-9\.\+\-]*)[\s]([0-9\.\+\-]*)[\s]([0-9\.\+\-]*)[\s]('.$strpiece[1][0].')[\s](c)([\s]*)/x', $pmid, $xmatches);
-											if (!isset($xmatches[1])) {
-												break;
-											}
-											$currentxpos = $xmatches[1];
-											// justify block
-											if (preg_match('/('.$xmatches[1].')[\s]('.$xmatches[2].')[\s]('.$xmatches[3].')[\s]('.$xmatches[4].')[\s]('.$xmatches[5].')[\s]('.$strpiece[1][0].')[\s](c)([\s]*)/x', $pmid, $pmatch) == 1) {
-												$newx1 = sprintf('%F',(floatval($pmatch[1]) + $spacew));
-												$newx2 = sprintf('%F',(floatval($pmatch[3]) + $spacew));
-												$newx3 = sprintf('%F',(floatval($pmatch[5]) + $spacew));
-												$newpmid = $newx1.' '.$pmatch[2].' '.$newx2.' '.$pmatch[4].' '.$newx3.' '.$pmatch[6].' x*#!#*x'.$pmatch[7].$pmatch[8];
-												$pmid = str_replace($pmatch[0], $newpmid, $pmid);
-												unset($pmatch, $newpmid, $newx1, $newx2, $newx3);
-											}
-											break;
-										}
-									}
-									// shift the annotations and links
-									$cxpos = ($currentxpos / $this->k);
-									$lmpos = ($this->lMargin + $this->cell_padding['L'] + $this->feps);
-									if ($this->inxobj) {
-										// we are inside an XObject template
-										foreach ($this->xobjects[$this->xobjid]['annotations'] as $pak => $pac) {
-											if (($pac['y'] >= $minstartliney) AND (($pac['x'] * $this->k) >= ($currentxpos - $this->feps)) AND (($pac['x'] * $this->k) <= ($currentxpos + $this->feps))) {
-												if ($cxpos > $lmpos) {
-													$this->xobjects[$this->xobjid]['annotations'][$pak]['x'] += ($spacew / $this->k);
-													$this->xobjects[$this->xobjid]['annotations'][$pak]['w'] += (($spacewidth * $pac['numspaces']) / $this->k);
-												} else {
-													$this->xobjects[$this->xobjid]['annotations'][$pak]['w'] += (($spacewidth * $pac['numspaces']) / $this->k);
-												}
-												break;
-											}
-										}
-									} elseif (isset($this->PageAnnots[$this->page])) {
-										foreach ($this->PageAnnots[$this->page] as $pak => $pac) {
-											if (($pac['y'] >= $minstartliney) AND (($pac['x'] * $this->k) >= ($currentxpos - $this->feps)) AND (($pac['x'] * $this->k) <= ($currentxpos + $this->feps))) {
-												if ($cxpos > $lmpos) {
-													$this->PageAnnots[$this->page][$pak]['x'] += ($spacew / $this->k);
-													$this->PageAnnots[$this->page][$pak]['w'] += (($spacewidth * $pac['numspaces']) / $this->k);
-												} else {
-													$this->PageAnnots[$this->page][$pak]['w'] += (($spacewidth * $pac['numspaces']) / $this->k);
-												}
-												break;
-											}
-										}
-									}
-								} // end of while
-								// remove markers
-								$pmid = str_replace('x*#!#*x', '', $pmid);
-								if ($this->isUnicodeFont()) {
-									// multibyte characters
-									$spacew = $spacewidthu;
-									if ($this->font_stretching != 100) {
-										// word spacing is affected by stretching
-										$spacew /= ($this->font_stretching / 100);
-									}
-									// escape special characters
-									$pos = 0;
-									$pmid = preg_replace('/[\\\][\(]/x', '\\#!#OP#!#', $pmid);
-									$pmid = preg_replace('/[\\\][\)]/x', '\\#!#CP#!#', $pmid);
-									if (preg_match_all('/\[\(([^\)]*)\)\]/x', $pmid, $pamatch) > 0) {
-										foreach($pamatch[0] as $pk => $pmatch) {
-											$replace = $pamatch[1][$pk];
-											$replace = str_replace('#!#OP#!#', '(', $replace);
-											$replace = str_replace('#!#CP#!#', ')', $replace);
-											$newpmid = '[('.str_replace(chr(0).chr(32), ') '.sprintf('%F', $spacew).' (', $replace).')]';
-											$pos = strpos($pmid, $pmatch, $pos);
-											if ($pos !== FALSE) {
-												$pmid = substr_replace($pmid, $newpmid, $pos, strlen($pmatch));
-											}
-											++$pos;
-										}
-										unset($pamatch);
-									}
-									if ($this->inxobj) {
-										// we are inside an XObject template
-										$this->xobjects[$this->xobjid]['outdata'] = $pstart."\n".$pmid."\n".$pend;
-									} else {
-										$this->setPageBuffer($startlinepage, $pstart."\n".$pmid."\n".$pend);
-									}
-									$endlinepos = strlen($pstart."\n".$pmid."\n");
-								} else {
-									// non-unicode (single-byte characters)
-									if ($this->font_stretching != 100) {
-										// word spacing (Tw) is affected by stretching
-										$spacewidth /= ($this->font_stretching / 100);
-									}
-									$rs = sprintf('%F Tw', $spacewidth);
-									$pmid = preg_replace("/\[\(/x", $rs.' [(', $pmid);
-									if ($this->inxobj) {
-										// we are inside an XObject template
-										$this->xobjects[$this->xobjid]['outdata'] = $pstart."\n".$pmid."\nBT 0 Tw ET\n".$pend;
-									} else {
-										$this->setPageBuffer($startlinepage, $pstart."\n".$pmid."\nBT 0 Tw ET\n".$pend);
-									}
-									$endlinepos = strlen($pstart."\n".$pmid."\nBT 0 Tw ET\n");
-								}
-							}
-						} // end of J
-					} // end if $startlinex
-					if (($t_x != 0) OR ($yshift < 0)) {
-						// shift the line
-						$trx = sprintf('1 0 0 1 %F %F cm', ($t_x * $this->k), ($yshift * $this->k));
-						$pstart .= "\nq\n".$trx."\n".$pmid."\nQ\n";
-						$endlinepos = strlen($pstart);
-						if ($this->inxobj) {
-							// we are inside an XObject template
-							$this->xobjects[$this->xobjid]['outdata'] = $pstart.$pend;
-							foreach ($this->xobjects[$this->xobjid]['annotations'] as $pak => $pac) {
-								if ($pak >= $pask) {
-									$this->xobjects[$this->xobjid]['annotations'][$pak]['x'] += $t_x;
-									$this->xobjects[$this->xobjid]['annotations'][$pak]['y'] -= $yshift;
-								}
-							}
-						} else {
-							$this->setPageBuffer($startlinepage, $pstart.$pend);
-							// shift the annotations and links
-							if (isset($this->PageAnnots[$this->page])) {
-								foreach ($this->PageAnnots[$this->page] as $pak => $pac) {
-									if ($pak >= $pask) {
-										$this->PageAnnots[$this->page][$pak]['x'] += $t_x;
-										$this->PageAnnots[$this->page][$pak]['y'] -= $yshift;
-									}
-								}
-							}
-						}
-						$this->y -= $yshift;
-					}
-				}
-				$pbrk = $this->checkPageBreak($this->lasth);
-				$this->newline = false;
-				$startlinex = $this->x;
-				$startliney = $this->y;
-				if ($dom[$dom[$key]['parent']]['value'] == 'sup') {
-					$startliney -= ((0.3 * $this->FontSizePt) / $this->k);
-				} elseif ($dom[$dom[$key]['parent']]['value'] == 'sub') {
-					$startliney -= (($this->FontSizePt / 0.7) / $this->k);
-				} else {
-					$minstartliney = $startliney;
-					$maxbottomliney = ($this->y + $this->getCellHeight($fontsize / $this->k));
-				}
-				$startlinepage = $this->page;
-				if (isset($endlinepos) AND (!$pbrk)) {
-					$startlinepos = $endlinepos;
-				} else {
-					if ($this->inxobj) {
-						// we are inside an XObject template
-						$startlinepos = strlen($this->xobjects[$this->xobjid]['outdata']);
-					} elseif (!$this->InFooter) {
-						if (isset($this->footerlen[$this->page])) {
-							$this->footerpos[$this->page] = $this->pagelen[$this->page] - $this->footerlen[$this->page];
-						} else {
-							$this->footerpos[$this->page] = $this->pagelen[$this->page];
-						}
-						$startlinepos = $this->footerpos[$this->page];
-					} else {
-						$startlinepos = $this->pagelen[$this->page];
-					}
-				}
-				unset($endlinepos);
-				$plalign = $lalign;
-				if (isset($this->PageAnnots[$this->page])) {
-					$pask = count($this->PageAnnots[$this->page]);
-				} else {
-					$pask = 0;
-				}
-				if (!($dom[$key]['tag'] AND !$dom[$key]['opening'] AND ($dom[$key]['value'] == 'table')
-					AND (isset($this->emptypagemrk[$this->page]))
-					AND ($this->emptypagemrk[$this->page] == $this->pagelen[$this->page]))) {
-					$this->SetFont($fontname, $fontstyle, $fontsize);
-					if ($wfill) {
-						$this->SetFillColorArray($this->bgcolor);
-					}
-				}
-			} // end newline
-			if (isset($opentagpos)) {
-				unset($opentagpos);
-			}
-			if ($dom[$key]['tag']) {
-				if ($dom[$key]['opening']) {
-					// get text indentation (if any)
-					if (isset($dom[$key]['text-indent']) AND $dom[$key]['block']) {
-						$this->textindent = $dom[$key]['text-indent'];
-						$this->newline = true;
-					}
-					// table
-					if (($dom[$key]['value'] == 'table') AND isset($dom[$key]['cols']) AND ($dom[$key]['cols'] > 0)) {
-						// available page width
-						if ($this->rtl) {
-							$wtmp = $this->x - $this->lMargin;
-						} else {
-							$wtmp = $this->w - $this->rMargin - $this->x;
-						}
-						// get cell spacing
-						if (isset($dom[$key]['attribute']['cellspacing'])) {
-							$clsp = $this->getHTMLUnitToUnits($dom[$key]['attribute']['cellspacing'], 1, 'px');
-							$cellspacing = array('H' => $clsp, 'V' => $clsp);
-						} elseif (isset($dom[$key]['border-spacing'])) {
-							$cellspacing = $dom[$key]['border-spacing'];
-						} else {
-							$cellspacing = array('H' => 0, 'V' => 0);
-						}
-						// table width
-						if (isset($dom[$key]['width'])) {
-							$table_width = $this->getHTMLUnitToUnits($dom[$key]['width'], $wtmp, 'px');
-						} else {
-							$table_width = $wtmp;
-						}
-						$table_width -= (2 * $cellspacing['H']);
-						if (!$this->inthead) {
-							$this->y += $cellspacing['V'];
-						}
-						if ($this->rtl) {
-							$cellspacingx = -$cellspacing['H'];
-						} else {
-							$cellspacingx = $cellspacing['H'];
-						}
-						// total table width without cellspaces
-						$table_columns_width = ($table_width - ($cellspacing['H'] * ($dom[$key]['cols'] - 1)));
-						// minimum column width
-						$table_min_column_width = ($table_columns_width / $dom[$key]['cols']);
-						// array of custom column widths
-						$table_colwidths = array_fill(0, $dom[$key]['cols'], $table_min_column_width);
-					}
-					// table row
-					if ($dom[$key]['value'] == 'tr') {
-						// reset column counter
-						$colid = 0;
-					}
-					// table cell
-					if (($dom[$key]['value'] == 'td') OR ($dom[$key]['value'] == 'th')) {
-						$trid = $dom[$key]['parent'];
-						$table_el = $dom[$trid]['parent'];
-						if (!isset($dom[$table_el]['cols'])) {
-							$dom[$table_el]['cols'] = $dom[$trid]['cols'];
-						}
-						// store border info
-						$tdborder = 0;
-						if (isset($dom[$key]['border']) AND !empty($dom[$key]['border'])) {
-							$tdborder = $dom[$key]['border'];
-						}
-						$colspan = intval($dom[$key]['attribute']['colspan']);
-						if ($colspan <= 0) {
-							$colspan = 1;
-						}
-						$old_cell_padding = $this->cell_padding;
-						if (isset($dom[($dom[$trid]['parent'])]['attribute']['cellpadding'])) {
-							$crclpd = $this->getHTMLUnitToUnits($dom[($dom[$trid]['parent'])]['attribute']['cellpadding'], 1, 'px');
-							$current_cell_padding = array('L' => $crclpd, 'T' => $crclpd, 'R' => $crclpd, 'B' => $crclpd);
-						} elseif (isset($dom[($dom[$trid]['parent'])]['padding'])) {
-							$current_cell_padding = $dom[($dom[$trid]['parent'])]['padding'];
-						} else {
-							$current_cell_padding = array('L' => 0, 'T' => 0, 'R' => 0, 'B' => 0);
-						}
-						$this->cell_padding = $current_cell_padding;
-						if (isset($dom[$key]['height'])) {
-							// minimum cell height
-							$cellh = $this->getHTMLUnitToUnits($dom[$key]['height'], 0, 'px');
-						} else {
-							$cellh = 0;
-						}
-						if (isset($dom[$key]['content'])) {
-							$cell_content = $dom[$key]['content'];
-						} else {
-							$cell_content = '&nbsp;';
-						}
-						$tagtype = $dom[$key]['value'];
-						$parentid = $key;
-						while (($key < $maxel) AND (!(($dom[$key]['tag']) AND (!$dom[$key]['opening']) AND ($dom[$key]['value'] == $tagtype) AND ($dom[$key]['parent'] == $parentid)))) {
-							// move $key index forward
-							++$key;
-						}
-						if (!isset($dom[$trid]['startpage'])) {
-							$dom[$trid]['startpage'] = $this->page;
-						} else {
-							$this->setPage($dom[$trid]['startpage']);
-						}
-						if (!isset($dom[$trid]['startcolumn'])) {
-							$dom[$trid]['startcolumn'] = $this->current_column;
-						} elseif ($this->current_column != $dom[$trid]['startcolumn']) {
-							$tmpx = $this->x;
-							$this->selectColumn($dom[$trid]['startcolumn']);
-							$this->x = $tmpx;
-						}
-						if (!isset($dom[$trid]['starty'])) {
-							$dom[$trid]['starty'] = $this->y;
-						} else {
-							$this->y = $dom[$trid]['starty'];
-						}
-						if (!isset($dom[$trid]['startx'])) {
-							$dom[$trid]['startx'] = $this->x;
-							$this->x += $cellspacingx;
-						} else {
-							$this->x += ($cellspacingx / 2);
-						}
-						if (isset($dom[$parentid]['attribute']['rowspan'])) {
-							$rowspan = intval($dom[$parentid]['attribute']['rowspan']);
-						} else {
-							$rowspan = 1;
-						}
-						// skip row-spanned cells started on the previous rows
-						if (isset($dom[$table_el]['rowspans'])) {
-							$rsk = 0;
-							$rskmax = count($dom[$table_el]['rowspans']);
-							while ($rsk < $rskmax) {
-								$trwsp = $dom[$table_el]['rowspans'][$rsk];
-								$rsstartx = $trwsp['startx'];
-								$rsendx = $trwsp['endx'];
-								// account for margin changes
-								if ($trwsp['startpage'] < $this->page) {
-									if (($this->rtl) AND ($this->pagedim[$this->page]['orm'] != $this->pagedim[$trwsp['startpage']]['orm'])) {
-										$dl = ($this->pagedim[$this->page]['orm'] - $this->pagedim[$trwsp['startpage']]['orm']);
-										$rsstartx -= $dl;
-										$rsendx -= $dl;
-									} elseif ((!$this->rtl) AND ($this->pagedim[$this->page]['olm'] != $this->pagedim[$trwsp['startpage']]['olm'])) {
-										$dl = ($this->pagedim[$this->page]['olm'] - $this->pagedim[$trwsp['startpage']]['olm']);
-										$rsstartx += $dl;
-										$rsendx += $dl;
-									}
-								}
-								if (($trwsp['rowspan'] > 0)
-									AND ($rsstartx > ($this->x - $cellspacing['H'] - $current_cell_padding['L'] - $this->feps))
-									AND ($rsstartx < ($this->x + $cellspacing['H'] + $current_cell_padding['R'] + $this->feps))
-									AND (($trwsp['starty'] < ($this->y - $this->feps)) OR ($trwsp['startpage'] < $this->page) OR ($trwsp['startcolumn'] < $this->current_column))) {
-									// set the starting X position of the current cell
-									$this->x = $rsendx + $cellspacingx;
-									// increment column indicator
-									$colid += $trwsp['colspan'];
-									if (($trwsp['rowspan'] == 1)
-										AND (isset($dom[$trid]['endy']))
-										AND (isset($dom[$trid]['endpage']))
-										AND (isset($dom[$trid]['endcolumn']))
-										AND ($trwsp['endpage'] == $dom[$trid]['endpage'])
-										AND ($trwsp['endcolumn'] == $dom[$trid]['endcolumn'])) {
-										// set ending Y position for row
-										$dom[$table_el]['rowspans'][$rsk]['endy'] = max($dom[$trid]['endy'], $trwsp['endy']);
-										$dom[$trid]['endy'] = $dom[$table_el]['rowspans'][$rsk]['endy'];
-									}
-									$rsk = 0;
-								} else {
-									++$rsk;
-								}
-							}
-						}
-						if (isset($dom[$parentid]['width'])) {
-							// user specified width
-							$cellw = $this->getHTMLUnitToUnits($dom[$parentid]['width'], $table_columns_width, 'px');
-							$tmpcw = ($cellw / $colspan);
-							for ($i = 0; $i < $colspan; ++$i) {
-								$table_colwidths[($colid + $i)] = $tmpcw;
-							}
-						} else {
-							// inherit column width
-							$cellw = 0;
-							for ($i = 0; $i < $colspan; ++$i) {
-								$cellw += (isset($table_colwidths[($colid + $i)]) ? $table_colwidths[($colid + $i)] : 0);
-							}
-						}
-						$cellw += (($colspan - 1) * $cellspacing['H']);
-						// increment column indicator
-						$colid += $colspan;
-						// add rowspan information to table element
-						if ($rowspan > 1) {
-							$trsid = array_push($dom[$table_el]['rowspans'], array('trid' => $trid, 'rowspan' => $rowspan, 'mrowspan' => $rowspan, 'colspan' => $colspan, 'startpage' => $this->page, 'startcolumn' => $this->current_column, 'startx' => $this->x, 'starty' => $this->y));
-						}
-						$cellid = array_push($dom[$trid]['cellpos'], array('startx' => $this->x));
-						if ($rowspan > 1) {
-							$dom[$trid]['cellpos'][($cellid - 1)]['rowspanid'] = ($trsid - 1);
-						}
-						// push background colors
-						if (isset($dom[$parentid]['bgcolor']) AND ($dom[$parentid]['bgcolor'] !== false)) {
-							$dom[$trid]['cellpos'][($cellid - 1)]['bgcolor'] = $dom[$parentid]['bgcolor'];
-						}
-						// store border info
-						if (isset($tdborder) AND !empty($tdborder)) {
-							$dom[$trid]['cellpos'][($cellid - 1)]['border'] = $tdborder;
-						}
-						$prevLastH = $this->lasth;
-						// store some info for multicolumn mode
-						if ($this->rtl) {
-							$this->colxshift['x'] = $this->w - $this->x - $this->rMargin;
-						} else {
-							$this->colxshift['x'] = $this->x - $this->lMargin;
-						}
-						$this->colxshift['s'] = $cellspacing;
-						$this->colxshift['p'] = $current_cell_padding;
-						// ****** write the cell content ******
-						$this->MultiCell($cellw, $cellh, $cell_content, false, $lalign, false, 2, '', '', true, 0, true, true, 0, 'T', false);
-						// restore some values
-						$this->colxshift = array('x' => 0, 's' => array('H' => 0, 'V' => 0), 'p' => array('L' => 0, 'T' => 0, 'R' => 0, 'B' => 0));
-						$this->lasth = $prevLastH;
-						$this->cell_padding = $old_cell_padding;
-						$dom[$trid]['cellpos'][($cellid - 1)]['endx'] = $this->x;
-						// update the end of row position
-						if ($rowspan <= 1) {
-							if (isset($dom[$trid]['endy'])) {
-								if (($this->page == $dom[$trid]['endpage']) AND ($this->current_column == $dom[$trid]['endcolumn'])) {
-									$dom[$trid]['endy'] = max($this->y, $dom[$trid]['endy']);
-								} elseif (($this->page > $dom[$trid]['endpage']) OR ($this->current_column > $dom[$trid]['endcolumn'])) {
-									$dom[$trid]['endy'] = $this->y;
-								}
-							} else {
-								$dom[$trid]['endy'] = $this->y;
-							}
-							if (isset($dom[$trid]['endpage'])) {
-								$dom[$trid]['endpage'] = max($this->page, $dom[$trid]['endpage']);
-							} else {
-								$dom[$trid]['endpage'] = $this->page;
-							}
-							if (isset($dom[$trid]['endcolumn'])) {
-								$dom[$trid]['endcolumn'] = max($this->current_column, $dom[$trid]['endcolumn']);
-							} else {
-								$dom[$trid]['endcolumn'] = $this->current_column;
-							}
-						} else {
-							// account for row-spanned cells
-							$dom[$table_el]['rowspans'][($trsid - 1)]['endx'] = $this->x;
-							$dom[$table_el]['rowspans'][($trsid - 1)]['endy'] = $this->y;
-							$dom[$table_el]['rowspans'][($trsid - 1)]['endpage'] = $this->page;
-							$dom[$table_el]['rowspans'][($trsid - 1)]['endcolumn'] = $this->current_column;
-						}
-						if (isset($dom[$table_el]['rowspans'])) {
-							// update endy and endpage on rowspanned cells
-							foreach ($dom[$table_el]['rowspans'] as $k => $trwsp) {
-								if ($trwsp['rowspan'] > 0) {
-									if (isset($dom[$trid]['endpage'])) {
-										if (($trwsp['endpage'] == $dom[$trid]['endpage']) AND ($trwsp['endcolumn'] == $dom[$trid]['endcolumn'])) {
-											$dom[$table_el]['rowspans'][$k]['endy'] = max($dom[$trid]['endy'], $trwsp['endy']);
-										} elseif (($trwsp['endpage'] < $dom[$trid]['endpage']) OR ($trwsp['endcolumn'] < $dom[$trid]['endcolumn'])) {
-											$dom[$table_el]['rowspans'][$k]['endy'] = $dom[$trid]['endy'];
-											$dom[$table_el]['rowspans'][$k]['endpage'] = $dom[$trid]['endpage'];
-											$dom[$table_el]['rowspans'][$k]['endcolumn'] = $dom[$trid]['endcolumn'];
-										} else {
-											$dom[$trid]['endy'] = $this->pagedim[$dom[$trid]['endpage']]['hk'] - $this->pagedim[$dom[$trid]['endpage']]['bm'];
-										}
-									}
-								}
-							}
-						}
-						$this->x += ($cellspacingx / 2);
-					} else {
-						// opening tag (or self-closing tag)
-						if (!isset($opentagpos)) {
-							if ($this->inxobj) {
-								// we are inside an XObject template
-								$opentagpos = strlen($this->xobjects[$this->xobjid]['outdata']);
-							} elseif (!$this->InFooter) {
-								if (isset($this->footerlen[$this->page])) {
-									$this->footerpos[$this->page] = $this->pagelen[$this->page] - $this->footerlen[$this->page];
-								} else {
-									$this->footerpos[$this->page] = $this->pagelen[$this->page];
-								}
-								$opentagpos = $this->footerpos[$this->page];
-							}
-						}
-						$dom = $this->openHTMLTagHandler($dom, $key, $cell);
-					}
-				} else { // closing tag
-					$prev_numpages = $this->numpages;
-					$old_bordermrk = $this->bordermrk[$this->page];
-					$dom = $this->closeHTMLTagHandler($dom, $key, $cell, $maxbottomliney);
-					if ($this->bordermrk[$this->page] > $old_bordermrk) {
-						$startlinepos += ($this->bordermrk[$this->page] - $old_bordermrk);
-					}
-					if ($prev_numpages > $this->numpages) {
-						$startlinepage = $this->page;
-					}
-				}
-			} elseif (strlen($dom[$key]['value']) > 0) {
-				// print list-item
-				if (!TCPDF_STATIC::empty_string($this->lispacer) AND ($this->lispacer != '^')) {
-					$this->SetFont($pfontname, $pfontstyle, $pfontsize);
-					$this->resetLastH();
-					$minstartliney = $this->y;
-					$maxbottomliney = ($startliney + $this->getCellHeight($this->FontSize));
-					if (is_numeric($pfontsize) AND ($pfontsize > 0)) {
-						$this->putHtmlListBullet($this->listnum, $this->lispacer, $pfontsize);
-					}
-					$this->SetFont($curfontname, $curfontstyle, $curfontsize);
-					$this->resetLastH();
-					if (is_numeric($pfontsize) AND ($pfontsize > 0) AND is_numeric($curfontsize) AND ($curfontsize > 0) AND ($pfontsize != $curfontsize)) {
-						$pfontascent = $this->getFontAscent($pfontname, $pfontstyle, $pfontsize);
-						$pfontdescent = $this->getFontDescent($pfontname, $pfontstyle, $pfontsize);
-						$this->y += ($this->getCellHeight(($pfontsize - $curfontsize) / $this->k) + $pfontascent - $curfontascent - $pfontdescent + $curfontdescent) / 2;
-						$minstartliney = min($this->y, $minstartliney);
-						$maxbottomliney = max(($this->y + $this->getCellHeight($pfontsize / $this->k)), $maxbottomliney);
-					}
-				}
-				// text
-				$this->htmlvspace = 0;
-				if ((!$this->premode) AND $this->isRTLTextDir()) {
-					// reverse spaces order
-					$lsp = ''; // left spaces
-					$rsp = ''; // right spaces
-					if (preg_match('/^('.$this->re_space['p'].'+)/'.$this->re_space['m'], $dom[$key]['value'], $matches)) {
-						$lsp = $matches[1];
-					}
-					if (preg_match('/('.$this->re_space['p'].'+)$/'.$this->re_space['m'], $dom[$key]['value'], $matches)) {
-						$rsp = $matches[1];
-					}
-					$dom[$key]['value'] = $rsp.$this->stringTrim($dom[$key]['value']).$lsp;
-				}
-				if ($newline) {
-					if (!$this->premode) {
-						$prelen = strlen($dom[$key]['value']);
-						if ($this->isRTLTextDir()) {
-							// right trim except non-breaking space
-							$dom[$key]['value'] = $this->stringRightTrim($dom[$key]['value']);
-						} else {
-							// left trim except non-breaking space
-							$dom[$key]['value'] = $this->stringLeftTrim($dom[$key]['value']);
-						}
-						$postlen = strlen($dom[$key]['value']);
-						if (($postlen == 0) AND ($prelen > 0)) {
-							$dom[$key]['trimmed_space'] = true;
-						}
-					}
-					$newline = false;
-					$firstblock = true;
-				} else {
-					$firstblock = false;
-					// replace empty multiple spaces string with a single space
-					$dom[$key]['value'] = preg_replace('/^'.$this->re_space['p'].'+$/'.$this->re_space['m'], chr(32), $dom[$key]['value']);
-				}
-				$strrest = '';
-				if ($this->rtl) {
-					$this->x -= $this->textindent;
-				} else {
-					$this->x += $this->textindent;
-				}
-				if (!isset($dom[$key]['trimmed_space']) OR !$dom[$key]['trimmed_space']) {
-					$strlinelen = $this->GetStringWidth($dom[$key]['value']);
-					if (!empty($this->HREF) AND (isset($this->HREF['url']))) {
-						// HTML <a> Link
-						$hrefcolor = '';
-						if (isset($dom[($dom[$key]['parent'])]['fgcolor']) AND ($dom[($dom[$key]['parent'])]['fgcolor'] !== false)) {
-							$hrefcolor = $dom[($dom[$key]['parent'])]['fgcolor'];
-						}
-						$hrefstyle = -1;
-						if (isset($dom[($dom[$key]['parent'])]['fontstyle']) AND ($dom[($dom[$key]['parent'])]['fontstyle'] !== false)) {
-							$hrefstyle = $dom[($dom[$key]['parent'])]['fontstyle'];
-						}
-						$strrest = $this->addHtmlLink($this->HREF['url'], $dom[$key]['value'], $wfill, true, $hrefcolor, $hrefstyle, true);
-					} else {
-						$wadj = 0; // space to leave for block continuity
-						if ($this->rtl) {
-							$cwa = ($this->x - $this->lMargin);
-						} else {
-							$cwa = ($this->w - $this->rMargin - $this->x);
-						}
-						if (($strlinelen < $cwa) AND (isset($dom[($key + 1)])) AND ($dom[($key + 1)]['tag']) AND (!$dom[($key + 1)]['block'])) {
-							// check the next text blocks for continuity
-							$nkey = ($key + 1);
-							$write_block = true;
-							$same_textdir = true;
-							$tmp_fontname = $this->FontFamily;
-							$tmp_fontstyle = $this->FontStyle;
-							$tmp_fontsize = $this->FontSizePt;
-							while ($write_block AND isset($dom[$nkey])) {
-								if ($dom[$nkey]['tag']) {
-									if ($dom[$nkey]['block']) {
-										// end of block
-										$write_block = false;
-									}
-									$tmp_fontname = isset($dom[$nkey]['fontname']) ? $dom[$nkey]['fontname'] : $this->FontFamily;
-									$tmp_fontstyle = isset($dom[$nkey]['fontstyle']) ? $dom[$nkey]['fontstyle'] : $this->FontStyle;
-									$tmp_fontsize = isset($dom[$nkey]['fontsize']) ? $dom[$nkey]['fontsize'] : $this->FontSizePt;
-									$same_textdir = ($dom[$nkey]['dir'] == $dom[$key]['dir']);
-								} else {
-									$nextstr = TCPDF_STATIC::pregSplit('/'.$this->re_space['p'].'+/', $this->re_space['m'], $dom[$nkey]['value']);
-									if (isset($nextstr[0]) AND $same_textdir) {
-										$wadj += $this->GetStringWidth($nextstr[0], $tmp_fontname, $tmp_fontstyle, $tmp_fontsize);
-										if (isset($nextstr[1])) {
-											$write_block = false;
-										}
-									}
-								}
-								++$nkey;
-							}
-						}
-						if (($wadj > 0) AND (($strlinelen + $wadj) >= $cwa)) {
-							$wadj = 0;
-							$nextstr = TCPDF_STATIC::pregSplit('/'.$this->re_space['p'].'/', $this->re_space['m'], $dom[$key]['value']);
-							$numblks = count($nextstr);
-							if ($numblks > 1) {
-								// try to split on blank spaces
-								$wadj = ($cwa - $strlinelen + $this->GetStringWidth($nextstr[($numblks - 1)]));
-							} else {
-								// set the entire block on new line
-								$wadj = $this->GetStringWidth($nextstr[0]);
-							}
-						}
-						// check for reversed text direction
-						if (($wadj > 0) AND (($this->rtl AND ($this->tmprtl === 'L')) OR (!$this->rtl AND ($this->tmprtl === 'R')))) {
-							// LTR text on RTL direction or RTL text on LTR direction
-							$reverse_dir = true;
-							$this->rtl = !$this->rtl;
-							$revshift = ($strlinelen + $wadj + 0.000001); // add little quantity for rounding problems
-							if ($this->rtl) {
-								$this->x += $revshift;
-							} else {
-								$this->x -= $revshift;
-							}
-							$xws = $this->x;
-						}
-						// ****** write only until the end of the line and get the rest ******
-						$strrest = $this->Write($this->lasth, $dom[$key]['value'], '', $wfill, '', false, 0, true, $firstblock, 0, $wadj);
-						// restore default direction
-						if ($reverse_dir AND ($wadj == 0)) {
-							$this->x = $xws;
-							$this->rtl = !$this->rtl;
-							$reverse_dir = false;
-						}
-					}
-				}
-				$this->textindent = 0;
-				if (strlen($strrest) > 0) {
-					// store the remaining string on the previous $key position
-					$this->newline = true;
-					if ($strrest == $dom[$key]['value']) {
-						// used to avoid infinite loop
-						++$loop;
-					} else {
-						$loop = 0;
-					}
-					$dom[$key]['value'] = $strrest;
-					if ($cell) {
-						if ($this->rtl) {
-							$this->x -= $this->cell_padding['R'];
-						} else {
-							$this->x += $this->cell_padding['L'];
-						}
-					}
-					if ($loop < 3) {
-						--$key;
-					}
-				} else {
-					$loop = 0;
-					// add the positive font spacing of the last character (if any)
-					 if ($this->font_spacing > 0) {
-					 	if ($this->rtl) {
-							$this->x -= $this->font_spacing;
-						} else {
-							$this->x += $this->font_spacing;
-						}
-					}
-				}
-			}
-			++$key;
-			if (isset($dom[$key]['tag']) AND $dom[$key]['tag'] AND (!isset($dom[$key]['opening']) OR !$dom[$key]['opening']) AND isset($dom[($dom[$key]['parent'])]['attribute']['nobr']) AND ($dom[($dom[$key]['parent'])]['attribute']['nobr'] == 'true')) {
-				// check if we are on a new page or on a new column
-				if ((!$undo) AND (($this->y < $this->start_transaction_y) OR (($dom[$key]['value'] == 'tr') AND ($dom[($dom[$key]['parent'])]['endy'] < $this->start_transaction_y)))) {
-					// we are on a new page or on a new column and the total object height is less than the available vertical space.
-					// restore previous object
-					$this->rollbackTransaction(true);
-					// restore previous values
-					foreach ($this_method_vars as $vkey => $vval) {
-						$$vkey = $vval;
-					}
-					if (!empty($dom[$key]['thead'])) {
-						$this->inthead = true;
-					}
-					// add a page (or trig AcceptPageBreak() for multicolumn mode)
-					$pre_y = $this->y;
-					if ((!$this->checkPageBreak($this->PageBreakTrigger + 1)) AND ($this->y < $pre_y)) {
-						$startliney = $this->y;
-					}
-					$undo = true; // avoid infinite loop
-				} else {
-					$undo = false;
-				}
-			}
-		} // end for each $key
-		// align the last line
-		if (isset($startlinex)) {
-			$yshift = ($minstartliney - $startliney);
-			if (($yshift > 0) OR ($this->page > $startlinepage)) {
-				$yshift = 0;
-			}
-			$t_x = 0;
-			// the last line must be shifted to be aligned as requested
-			$linew = abs($this->endlinex - $startlinex);
-			if ($this->inxobj) {
-				// we are inside an XObject template
-				$pstart = substr($this->xobjects[$this->xobjid]['outdata'], 0, $startlinepos);
-				if (isset($opentagpos)) {
-					$midpos = $opentagpos;
-				} else {
-					$midpos = 0;
-				}
-				if ($midpos > 0) {
-					$pmid = substr($this->xobjects[$this->xobjid]['outdata'], $startlinepos, ($midpos - $startlinepos));
-					$pend = substr($this->xobjects[$this->xobjid]['outdata'], $midpos);
-				} else {
-					$pmid = substr($this->xobjects[$this->xobjid]['outdata'], $startlinepos);
-					$pend = '';
-				}
-			} else {
-				$pstart = substr($this->getPageBuffer($startlinepage), 0, $startlinepos);
-				if (isset($opentagpos) AND isset($this->footerlen[$startlinepage]) AND (!$this->InFooter)) {
-					$this->footerpos[$startlinepage] = $this->pagelen[$startlinepage] - $this->footerlen[$startlinepage];
-					$midpos = min($opentagpos, $this->footerpos[$startlinepage]);
-				} elseif (isset($opentagpos)) {
-					$midpos = $opentagpos;
-				} elseif (isset($this->footerlen[$startlinepage]) AND (!$this->InFooter)) {
-					$this->footerpos[$startlinepage] = $this->pagelen[$startlinepage] - $this->footerlen[$startlinepage];
-					$midpos = $this->footerpos[$startlinepage];
-				} else {
-					$midpos = 0;
-				}
-				if ($midpos > 0) {
-					$pmid = substr($this->getPageBuffer($startlinepage), $startlinepos, ($midpos - $startlinepos));
-					$pend = substr($this->getPageBuffer($startlinepage), $midpos);
-				} else {
-					$pmid = substr($this->getPageBuffer($startlinepage), $startlinepos);
-					$pend = '';
-				}
-			}
-			if ((isset($plalign) AND ((($plalign == 'C') OR (($plalign == 'R') AND (!$this->rtl)) OR (($plalign == 'L') AND ($this->rtl)))))) {
-				// calculate shifting amount
-				$tw = $w;
-				if ($this->lMargin != $prevlMargin) {
-					$tw += ($prevlMargin - $this->lMargin);
-				}
-				if ($this->rMargin != $prevrMargin) {
-					$tw += ($prevrMargin - $this->rMargin);
-				}
-				$one_space_width = $this->GetStringWidth(chr(32));
-				$no = 0; // number of spaces on a line contained on a single block
-				if ($this->isRTLTextDir()) { // RTL
-					// remove left space if exist
-					$pos1 = TCPDF_STATIC::revstrpos($pmid, '[(');
-					if ($pos1 > 0) {
-						$pos1 = intval($pos1);
-						if ($this->isUnicodeFont()) {
-							$pos2 = intval(TCPDF_STATIC::revstrpos($pmid, '[('.chr(0).chr(32)));
-							$spacelen = 2;
-						} else {
-							$pos2 = intval(TCPDF_STATIC::revstrpos($pmid, '[('.chr(32)));
-							$spacelen = 1;
-						}
-						if ($pos1 == $pos2) {
-							$pmid = substr($pmid, 0, ($pos1 + 2)).substr($pmid, ($pos1 + 2 + $spacelen));
-							if (substr($pmid, $pos1, 4) == '[()]') {
-								$linew -= $one_space_width;
-							} elseif ($pos1 == strpos($pmid, '[(')) {
-								$no = 1;
-							}
-						}
-					}
-				} else { // LTR
-					// remove right space if exist
-					$pos1 = TCPDF_STATIC::revstrpos($pmid, ')]');
-					if ($pos1 > 0) {
-						$pos1 = intval($pos1);
-						if ($this->isUnicodeFont()) {
-							$pos2 = intval(TCPDF_STATIC::revstrpos($pmid, chr(0).chr(32).')]')) + 2;
-							$spacelen = 2;
-						} else {
-							$pos2 = intval(TCPDF_STATIC::revstrpos($pmid, chr(32).')]')) + 1;
-							$spacelen = 1;
-						}
-						if ($pos1 == $pos2) {
-							$pmid = substr($pmid, 0, ($pos1 - $spacelen)).substr($pmid, $pos1);
-							$linew -= $one_space_width;
-						}
-					}
-				}
-				$mdiff = ($tw - $linew);
-				if ($plalign == 'C') {
-					if ($this->rtl) {
-						$t_x = -($mdiff / 2);
-					} else {
-						$t_x = ($mdiff / 2);
-					}
-				} elseif ($plalign == 'R') {
-					// right alignment on LTR document
-					$t_x = $mdiff;
-				} elseif ($plalign == 'L') {
-					// left alignment on RTL document
-					$t_x = -$mdiff;
-				}
-			} // end if startlinex
-			if (($t_x != 0) OR ($yshift < 0)) {
-				// shift the line
-				$trx = sprintf('1 0 0 1 %F %F cm', ($t_x * $this->k), ($yshift * $this->k));
-				$pstart .= "\nq\n".$trx."\n".$pmid."\nQ\n";
-				$endlinepos = strlen($pstart);
-				if ($this->inxobj) {
-					// we are inside an XObject template
-					$this->xobjects[$this->xobjid]['outdata'] = $pstart.$pend;
-					foreach ($this->xobjects[$this->xobjid]['annotations'] as $pak => $pac) {
-						if ($pak >= $pask) {
-							$this->xobjects[$this->xobjid]['annotations'][$pak]['x'] += $t_x;
-							$this->xobjects[$this->xobjid]['annotations'][$pak]['y'] -= $yshift;
-						}
-					}
-				} else {
-					$this->setPageBuffer($startlinepage, $pstart.$pend);
-					// shift the annotations and links
-					if (isset($this->PageAnnots[$this->page])) {
-						foreach ($this->PageAnnots[$this->page] as $pak => $pac) {
-							if ($pak >= $pask) {
-								$this->PageAnnots[$this->page][$pak]['x'] += $t_x;
-								$this->PageAnnots[$this->page][$pak]['y'] -= $yshift;
-							}
-						}
-					}
-				}
-				$this->y -= $yshift;
-				$yshift = 0;
-			}
-		}
-		// restore previous values
-		$this->setGraphicVars($gvars);
-		if ($this->num_columns > 1) {
-			$this->selectColumn();
-		} elseif ($this->page > $prevPage) {
-			$this->lMargin = $this->pagedim[$this->page]['olm'];
-			$this->rMargin = $this->pagedim[$this->page]['orm'];
-		}
-		// restore previous list state
-		$this->cell_height_ratio = $prev_cell_height_ratio;
-		$this->listnum = $prev_listnum;
-		$this->listordered = $prev_listordered;
-		$this->listcount = $prev_listcount;
-		$this->lispacer = $prev_lispacer;
-		if ($ln AND (!($cell AND ($dom[$key-1]['value'] == 'table')))) {
-			$this->Ln($this->lasth);
-			if (($this->y < $maxbottomliney) AND ($startlinepage == $this->page)) {
-				$this->y = $maxbottomliney;
-			}
-		}
-		unset($dom);
-	}
-
-	/**
-	 * Process opening tags.
-	 * @param $dom (array) html dom array
-	 * @param $key (int) current element id
-	 * @param $cell (boolean) if true add the default left (or right if RTL) padding to each new line (default false).
-	 * @return $dom array
-	 * @protected
-	 */
-	protected function openHTMLTagHandler($dom, $key, $cell) {
-		$tag = $dom[$key];
-		$parent = $dom[($dom[$key]['parent'])];
-		$firsttag = ($key == 1);
-		// check for text direction attribute
-		if (isset($tag['dir'])) {
-			$this->setTempRTL($tag['dir']);
-		} else {
-			$this->tmprtl = false;
-		}
-		if ($tag['block']) {
-			$hbz = 0; // distance from y to line bottom
-			$hb = 0; // vertical space between block tags
-			// calculate vertical space for block tags
-			if (isset($this->tagvspaces[$tag['value']][0]['h']) AND ($this->tagvspaces[$tag['value']][0]['h'] >= 0)) {
-				$cur_h = $this->tagvspaces[$tag['value']][0]['h'];
-			} elseif (isset($tag['fontsize'])) {
-				$cur_h = $this->getCellHeight($tag['fontsize'] / $this->k);
-			} else {
-				$cur_h = $this->getCellHeight($this->FontSize);
-			}
-			if (isset($this->tagvspaces[$tag['value']][0]['n'])) {
-				$on = $this->tagvspaces[$tag['value']][0]['n'];
-			} elseif (preg_match('/[h][0-9]/', $tag['value']) > 0) {
-				$on = 0.6;
-			} else {
-				$on = 1;
-			}
-			if ((!isset($this->tagvspaces[$tag['value']])) AND (in_array($tag['value'], array('div', 'dt', 'dd', 'li', 'br', 'hr')))) {
-				$hb = 0;
-			} else {
-				$hb = ($on * $cur_h);
-			}
-			if (($this->htmlvspace <= 0) AND ($on > 0)) {
-				if (isset($parent['fontsize'])) {
-					$hbz = (($parent['fontsize'] / $this->k) * $this->cell_height_ratio);
-				} else {
-					$hbz = $this->getCellHeight($this->FontSize);
-				}
-			}
-			if (isset($dom[($key - 1)]) AND ($dom[($key - 1)]['value'] == 'table')) {
-				// fix vertical space after table
-				$hbz = 0;
-			}
-			// closing vertical space
-			$hbc = 0;
-			if (isset($this->tagvspaces[$tag['value']][1]['h']) AND ($this->tagvspaces[$tag['value']][1]['h'] >= 0)) {
-				$pre_h = $this->tagvspaces[$tag['value']][1]['h'];
-			} elseif (isset($parent['fontsize'])) {
-				$pre_h = $this->getCellHeight($parent['fontsize'] / $this->k);
-			} else {
-				$pre_h = $this->getCellHeight($this->FontSize);
-			}
-			if (isset($this->tagvspaces[$tag['value']][1]['n'])) {
-				$cn = $this->tagvspaces[$tag['value']][1]['n'];
-			} elseif (preg_match('/[h][0-9]/', $tag['value']) > 0) {
-				$cn = 0.6;
-			} else {
-				$cn = 1;
-			}
-			if (isset($this->tagvspaces[$tag['value']][1])) {
-				$hbc = ($cn * $pre_h);
-			}
-		}
-		// Opening tag
-		switch($tag['value']) {
-			case 'table': {
-				$cp = 0;
-				$cs = 0;
-				$dom[$key]['rowspans'] = array();
-				if (!isset($dom[$key]['attribute']['nested']) OR ($dom[$key]['attribute']['nested'] != 'true')) {
-					$this->htmlvspace = 0;
-					// set table header
-					if (!TCPDF_STATIC::empty_string($dom[$key]['thead'])) {
-						// set table header
-						$this->thead = $dom[$key]['thead'];
-						if (!isset($this->theadMargins) OR (empty($this->theadMargins))) {
-							$this->theadMargins = array();
-							$this->theadMargins['cell_padding'] = $this->cell_padding;
-							$this->theadMargins['lmargin'] = $this->lMargin;
-							$this->theadMargins['rmargin'] = $this->rMargin;
-							$this->theadMargins['page'] = $this->page;
-							$this->theadMargins['cell'] = $cell;
-							$this->theadMargins['gvars'] = $this->getGraphicVars();
-						}
-					}
-				}
-				// store current margins and page
-				$dom[$key]['old_cell_padding'] = $this->cell_padding;
-				if (isset($tag['attribute']['cellpadding'])) {
-					$pad = $this->getHTMLUnitToUnits($tag['attribute']['cellpadding'], 1, 'px');
-					$this->SetCellPadding($pad);
-				} elseif (isset($tag['padding'])) {
-					$this->cell_padding = $tag['padding'];
-				}
-				if (isset($tag['attribute']['cellspacing'])) {
-					$cs = $this->getHTMLUnitToUnits($tag['attribute']['cellspacing'], 1, 'px');
-				} elseif (isset($tag['border-spacing'])) {
-					$cs = $tag['border-spacing']['V'];
-				}
-				$prev_y = $this->y;
-				if ($this->checkPageBreak(((2 * $cp) + (2 * $cs) + $this->lasth), '', false) OR ($this->y < $prev_y)) {
-					$this->inthead = true;
-					// add a page (or trig AcceptPageBreak() for multicolumn mode)
-					$this->checkPageBreak($this->PageBreakTrigger + 1);
-				}
-				break;
-			}
-			case 'tr': {
-				// array of columns positions
-				$dom[$key]['cellpos'] = array();
-				break;
-			}
-			case 'hr': {
-				if ((isset($tag['height'])) AND ($tag['height'] != '')) {
-					$hrHeight = $this->getHTMLUnitToUnits($tag['height'], 1, 'px');
-				} else {
-					$hrHeight = $this->GetLineWidth();
-				}
-				$this->addHTMLVertSpace($hbz, max($hb, ($hrHeight / 2)), $cell, $firsttag);
-				$x = $this->GetX();
-				$y = $this->GetY();
-				$wtmp = $this->w - $this->lMargin - $this->rMargin;
-				if ($cell) {
-					$wtmp -= ($this->cell_padding['L'] + $this->cell_padding['R']);
-				}
-				if ((isset($tag['width'])) AND ($tag['width'] != '')) {
-					$hrWidth = $this->getHTMLUnitToUnits($tag['width'], $wtmp, 'px');
-				} else {
-					$hrWidth = $wtmp;
-				}
-				$prevlinewidth = $this->GetLineWidth();
-				$this->SetLineWidth($hrHeight);
-				$this->Line($x, $y, $x + $hrWidth, $y);
-				$this->SetLineWidth($prevlinewidth);
-				$this->addHTMLVertSpace(max($hbc, ($hrHeight / 2)), 0, $cell, !isset($dom[($key + 1)]));
-				break;
-			}
-			case 'a': {
-				if (array_key_exists('href', $tag['attribute'])) {
-					$this->HREF['url'] = $tag['attribute']['href'];
-				}
-				break;
-			}
-			case 'img': {
-				if (!empty($tag['attribute']['src'])) {
-					if ($tag['attribute']['src'][0] === '@') {
-						// data stream
-						$tag['attribute']['src'] = '@'.base64_decode(substr($tag['attribute']['src'], 1));
-						$type = '';
-					} else {
-						// get image type
-						$type = TCPDF_IMAGES::getImageFileType($tag['attribute']['src']);
-					}
-					if (!isset($tag['width'])) {
-						$tag['width'] = 0;
-					}
-					if (!isset($tag['height'])) {
-						$tag['height'] = 0;
-					}
-					//if (!isset($tag['attribute']['align'])) {
-						// the only alignment supported is "bottom"
-						// further development is required for other modes.
-						$tag['attribute']['align'] = 'bottom';
-					//}
-					switch($tag['attribute']['align']) {
-						case 'top': {
-							$align = 'T';
-							break;
-						}
-						case 'middle': {
-							$align = 'M';
-							break;
-						}
-						case 'bottom': {
-							$align = 'B';
-							break;
-						}
-						default: {
-							$align = 'B';
-							break;
-						}
-					}
-					$prevy = $this->y;
-					$xpos = $this->x;
-					$imglink = '';
-					if (isset($this->HREF['url']) AND !TCPDF_STATIC::empty_string($this->HREF['url'])) {
-						$imglink = $this->HREF['url'];
-						if ($imglink[0] == '#') {
-							// convert url to internal link
-							$lnkdata = explode(',', $imglink);
-							if (isset($lnkdata[0])) {
-								$page = intval(substr($lnkdata[0], 1));
-								if (empty($page) OR ($page <= 0)) {
-									$page = $this->page;
-								}
-								if (isset($lnkdata[1]) AND (strlen($lnkdata[1]) > 0)) {
-									$lnky = floatval($lnkdata[1]);
-								} else {
-									$lnky = 0;
-								}
-								$imglink = $this->AddLink();
-								$this->SetLink($imglink, $lnky, $page);
-							}
-						}
-					}
-					$border = 0;
-					if (isset($tag['border']) AND !empty($tag['border'])) {
-						// currently only support 1 (frame) or a combination of 'LTRB'
-						$border = $tag['border'];
-					}
-					$iw = '';
-					if (isset($tag['width'])) {
-						$iw = $this->getHTMLUnitToUnits($tag['width'], ($tag['fontsize'] / $this->k), 'px', false);
-					}
-					$ih = '';
-					if (isset($tag['height'])) {
-						$ih = $this->getHTMLUnitToUnits($tag['height'], ($tag['fontsize'] / $this->k), 'px', false);
-					}
-					if (($type == 'eps') OR ($type == 'ai')) {
-						$this->ImageEps($tag['attribute']['src'], $xpos, $this->y, $iw, $ih, $imglink, true, $align, '', $border, true);
-					} elseif ($type == 'svg') {
-						$this->ImageSVG($tag['attribute']['src'], $xpos, $this->y, $iw, $ih, $imglink, $align, '', $border, true);
-					} else {
-						$this->Image($tag['attribute']['src'], $xpos, $this->y, $iw, $ih, '', $imglink, $align, false, 300, '', false, false, $border, false, false, true);
-					}
-					switch($align) {
-						case 'T': {
-							$this->y = $prevy;
-							break;
-						}
-						case 'M': {
-							$this->y = (($this->img_rb_y + $prevy - ($this->getCellHeight($tag['fontsize'] / $this->k))) / 2);
-							break;
-						}
-						case 'B': {
-							$this->y = $this->img_rb_y - ($this->getCellHeight($tag['fontsize'] / $this->k) - ($this->getFontDescent($tag['fontname'], $tag['fontstyle'], $tag['fontsize']) * $this->cell_height_ratio));
-							break;
-						}
-					}
-				}
-				break;
-			}
-			case 'dl': {
-				++$this->listnum;
-				if ($this->listnum == 1) {
-					$this->addHTMLVertSpace($hbz, $hb, $cell, $firsttag);
-				} else {
-					$this->addHTMLVertSpace(0, 0, $cell, $firsttag);
-				}
-				break;
-			}
-			case 'dt': {
-				$this->addHTMLVertSpace($hbz, $hb, $cell, $firsttag);
-				break;
-			}
-			case 'dd': {
-				if ($this->rtl) {
-					$this->rMargin += $this->listindent;
-				} else {
-					$this->lMargin += $this->listindent;
-				}
-				++$this->listindentlevel;
-				$this->addHTMLVertSpace($hbz, $hb, $cell, $firsttag);
-				break;
-			}
-			case 'ul':
-			case 'ol': {
-				++$this->listnum;
-				if ($tag['value'] == 'ol') {
-					$this->listordered[$this->listnum] = true;
-				} else {
-					$this->listordered[$this->listnum] = false;
-				}
-				if (isset($tag['attribute']['start'])) {
-					$this->listcount[$this->listnum] = intval($tag['attribute']['start']) - 1;
-				} else {
-					$this->listcount[$this->listnum] = 0;
-				}
-				if ($this->rtl) {
-					$this->rMargin += $this->listindent;
-					$this->x -= $this->listindent;
-				} else {
-					$this->lMargin += $this->listindent;
-					$this->x += $this->listindent;
-				}
-				++$this->listindentlevel;
-				if ($this->listnum == 1) {
-					if ($key > 1) {
-						$this->addHTMLVertSpace($hbz, $hb, $cell, $firsttag);
-					}
-				} else {
-					$this->addHTMLVertSpace(0, 0, $cell, $firsttag);
-				}
-				break;
-			}
-			case 'li': {
-				if ($key > 2) {
-					$this->addHTMLVertSpace($hbz, $hb, $cell, $firsttag);
-				}
-				if ($this->listordered[$this->listnum]) {
-					// ordered item
-					if (isset($parent['attribute']['type']) AND !TCPDF_STATIC::empty_string($parent['attribute']['type'])) {
-						$this->lispacer = $parent['attribute']['type'];
-					} elseif (isset($parent['listtype']) AND !TCPDF_STATIC::empty_string($parent['listtype'])) {
-						$this->lispacer = $parent['listtype'];
-					} elseif (isset($this->lisymbol) AND !TCPDF_STATIC::empty_string($this->lisymbol)) {
-						$this->lispacer = $this->lisymbol;
-					} else {
-						$this->lispacer = '#';
-					}
-					++$this->listcount[$this->listnum];
-					if (isset($tag['attribute']['value'])) {
-						$this->listcount[$this->listnum] = intval($tag['attribute']['value']);
-					}
-				} else {
-					// unordered item
-					if (isset($parent['attribute']['type']) AND !TCPDF_STATIC::empty_string($parent['attribute']['type'])) {
-						$this->lispacer = $parent['attribute']['type'];
-					} elseif (isset($parent['listtype']) AND !TCPDF_STATIC::empty_string($parent['listtype'])) {
-						$this->lispacer = $parent['listtype'];
-					} elseif (isset($this->lisymbol) AND !TCPDF_STATIC::empty_string($this->lisymbol)) {
-						$this->lispacer = $this->lisymbol;
-					} else {
-						$this->lispacer = '!';
-					}
-				}
-				break;
-			}
-			case 'blockquote': {
-				if ($this->rtl) {
-					$this->rMargin += $this->listindent;
-				} else {
-					$this->lMargin += $this->listindent;
-				}
-				++$this->listindentlevel;
-				$this->addHTMLVertSpace($hbz, $hb, $cell, $firsttag);
-				break;
-			}
-			case 'br': {
-				$this->addHTMLVertSpace($hbz, $hb, $cell, $firsttag);
-				break;
-			}
-			case 'div': {
-				$this->addHTMLVertSpace($hbz, $hb, $cell, $firsttag);
-				break;
-			}
-			case 'p': {
-				$this->addHTMLVertSpace($hbz, $hb, $cell, $firsttag);
-				break;
-			}
-			case 'pre': {
-				$this->addHTMLVertSpace($hbz, $hb, $cell, $firsttag);
-				$this->premode = true;
-				break;
-			}
-			case 'sup': {
-				$this->SetXY($this->GetX(), $this->GetY() - ((0.7 * $this->FontSizePt) / $this->k));
-				break;
-			}
-			case 'sub': {
-				$this->SetXY($this->GetX(), $this->GetY() + ((0.3 * $this->FontSizePt) / $this->k));
-				break;
-			}
-			case 'h1':
-			case 'h2':
-			case 'h3':
-			case 'h4':
-			case 'h5':
-			case 'h6': {
-				$this->addHTMLVertSpace($hbz, $hb, $cell, $firsttag);
-				break;
-			}
-			// Form fields (since 4.8.000 - 2009-09-07)
-			case 'form': {
-				if (isset($tag['attribute']['action'])) {
-					$this->form_action = $tag['attribute']['action'];
-				} else {
-					$this->Error('Please explicitly set action attribute path!');
-				}
-				if (isset($tag['attribute']['enctype'])) {
-					$this->form_enctype = $tag['attribute']['enctype'];
-				} else {
-					$this->form_enctype = 'application/x-www-form-urlencoded';
-				}
-				if (isset($tag['attribute']['method'])) {
-					$this->form_mode = $tag['attribute']['method'];
-				} else {
-					$this->form_mode = 'post';
-				}
-				break;
-			}
-			case 'input': {
-				if (isset($tag['attribute']['name']) AND !TCPDF_STATIC::empty_string($tag['attribute']['name'])) {
-					$name = $tag['attribute']['name'];
-				} else {
-					break;
-				}
-				$prop = array();
-				$opt = array();
-				if (isset($tag['attribute']['readonly']) AND !TCPDF_STATIC::empty_string($tag['attribute']['readonly'])) {
-					$prop['readonly'] = true;
-				}
-				if (isset($tag['attribute']['value']) AND !TCPDF_STATIC::empty_string($tag['attribute']['value'])) {
-					$value = $tag['attribute']['value'];
-				}
-				if (isset($tag['attribute']['maxlength']) AND !TCPDF_STATIC::empty_string($tag['attribute']['maxlength'])) {
-					$opt['maxlen'] = intval($tag['attribute']['maxlength']);
-				}
-				$h = $this->getCellHeight($this->FontSize);
-				if (isset($tag['attribute']['size']) AND !TCPDF_STATIC::empty_string($tag['attribute']['size'])) {
-					$w = intval($tag['attribute']['size']) * $this->GetStringWidth(chr(32)) * 2;
-				} else {
-					$w = $h;
-				}
-				if (isset($tag['attribute']['checked']) AND (($tag['attribute']['checked'] == 'checked') OR ($tag['attribute']['checked'] == 'true'))) {
-					$checked = true;
-				} else {
-					$checked = false;
-				}
-				if (isset($tag['align'])) {
-					switch ($tag['align']) {
-						case 'C': {
-							$opt['q'] = 1;
-							break;
-						}
-						case 'R': {
-							$opt['q'] = 2;
-							break;
-						}
-						case 'L':
-						default: {
-							break;
-						}
-					}
-				}
-				switch ($tag['attribute']['type']) {
-					case 'text': {
-						if (isset($value)) {
-							$opt['v'] = $value;
-						}
-						$this->TextField($name, $w, $h, $prop, $opt, '', '', false);
-						break;
-					}
-					case 'password': {
-						if (isset($value)) {
-							$opt['v'] = $value;
-						}
-						$prop['password'] = 'true';
-						$this->TextField($name, $w, $h, $prop, $opt, '', '', false);
-						break;
-					}
-					case 'checkbox': {
-						if (!isset($value)) {
-							break;
-						}
-						$this->CheckBox($name, $w, $checked, $prop, $opt, $value, '', '', false);
-						break;
-					}
-					case 'radio': {
-						if (!isset($value)) {
-							break;
-						}
-						$this->RadioButton($name, $w, $prop, $opt, $value, $checked, '', '', false);
-						break;
-					}
-					case 'submit': {
-						if (!isset($value)) {
-							$value = 'submit';
-						}
-						$w = $this->GetStringWidth($value) * 1.5;
-						$h *= 1.6;
-						$prop = array('lineWidth'=>1, 'borderStyle'=>'beveled', 'fillColor'=>array(196, 196, 196), 'strokeColor'=>array(255, 255, 255));
-						$action = array();
-						$action['S'] = 'SubmitForm';
-						$action['F'] = $this->form_action;
-						if ($this->form_enctype != 'FDF') {
-							$action['Flags'] = array('ExportFormat');
-						}
-						if ($this->form_mode == 'get') {
-							$action['Flags'] = array('GetMethod');
-						}
-						$this->Button($name, $w, $h, $value, $action, $prop, $opt, '', '', false);
-						break;
-					}
-					case 'reset': {
-						if (!isset($value)) {
-							$value = 'reset';
-						}
-						$w = $this->GetStringWidth($value) * 1.5;
-						$h *= 1.6;
-						$prop = array('lineWidth'=>1, 'borderStyle'=>'beveled', 'fillColor'=>array(196, 196, 196), 'strokeColor'=>array(255, 255, 255));
-						$this->Button($name, $w, $h, $value, array('S'=>'ResetForm'), $prop, $opt, '', '', false);
-						break;
-					}
-					case 'file': {
-						$prop['fileSelect'] = 'true';
-						$this->TextField($name, $w, $h, $prop, $opt, '', '', false);
-						if (!isset($value)) {
-							$value = '*';
-						}
-						$w = $this->GetStringWidth($value) * 2;
-						$h *= 1.2;
-						$prop = array('lineWidth'=>1, 'borderStyle'=>'beveled', 'fillColor'=>array(196, 196, 196), 'strokeColor'=>array(255, 255, 255));
-						$jsaction = 'var f=this.getField(\''.$name.'\'); f.browseForFileToSubmit();';
-						$this->Button('FB_'.$name, $w, $h, $value, $jsaction, $prop, $opt, '', '', false);
-						break;
-					}
-					case 'hidden': {
-						if (isset($value)) {
-							$opt['v'] = $value;
-						}
-						$opt['f'] = array('invisible', 'hidden');
-						$this->TextField($name, 0, 0, $prop, $opt, '', '', false);
-						break;
-					}
-					case 'image': {
-						// THIS TYPE MUST BE FIXED
-						if (isset($tag['attribute']['src']) AND !TCPDF_STATIC::empty_string($tag['attribute']['src'])) {
-							$img = $tag['attribute']['src'];
-						} else {
-							break;
-						}
-						$value = 'img';
-						//$opt['mk'] = array('i'=>$img, 'tp'=>1, 'if'=>array('sw'=>'A', 's'=>'A', 'fb'=>false));
-						if (isset($tag['attribute']['onclick']) AND !empty($tag['attribute']['onclick'])) {
-							$jsaction = $tag['attribute']['onclick'];
-						} else {
-							$jsaction = '';
-						}
-						$this->Button($name, $w, $h, $value, $jsaction, $prop, $opt, '', '', false);
-						break;
-					}
-					case 'button': {
-						if (!isset($value)) {
-							$value = ' ';
-						}
-						$w = $this->GetStringWidth($value) * 1.5;
-						$h *= 1.6;
-						$prop = array('lineWidth'=>1, 'borderStyle'=>'beveled', 'fillColor'=>array(196, 196, 196), 'strokeColor'=>array(255, 255, 255));
-						if (isset($tag['attribute']['onclick']) AND !empty($tag['attribute']['onclick'])) {
-							$jsaction = $tag['attribute']['onclick'];
-						} else {
-							$jsaction = '';
-						}
-						$this->Button($name, $w, $h, $value, $jsaction, $prop, $opt, '', '', false);
-						break;
-					}
-				}
-				break;
-			}
-			case 'textarea': {
-				$prop = array();
-				$opt = array();
-				if (isset($tag['attribute']['readonly']) AND !TCPDF_STATIC::empty_string($tag['attribute']['readonly'])) {
-					$prop['readonly'] = true;
-				}
-				if (isset($tag['attribute']['name']) AND !TCPDF_STATIC::empty_string($tag['attribute']['name'])) {
-					$name = $tag['attribute']['name'];
-				} else {
-					break;
-				}
-				if (isset($tag['attribute']['value']) AND !TCPDF_STATIC::empty_string($tag['attribute']['value'])) {
-					$opt['v'] = $tag['attribute']['value'];
-				}
-				if (isset($tag['attribute']['cols']) AND !TCPDF_STATIC::empty_string($tag['attribute']['cols'])) {
-					$w = intval($tag['attribute']['cols']) * $this->GetStringWidth(chr(32)) * 2;
-				} else {
-					$w = 40;
-				}
-				if (isset($tag['attribute']['rows']) AND !TCPDF_STATIC::empty_string($tag['attribute']['rows'])) {
-					$h = intval($tag['attribute']['rows']) * $this->getCellHeight($this->FontSize);
-				} else {
-					$h = 10;
-				}
-				$prop['multiline'] = 'true';
-				$this->TextField($name, $w, $h, $prop, $opt, '', '', false);
-				break;
-			}
-			case 'select': {
-				$h = $this->getCellHeight($this->FontSize);
-				if (isset($tag['attribute']['size']) AND !TCPDF_STATIC::empty_string($tag['attribute']['size'])) {
-					$h *= ($tag['attribute']['size'] + 1);
-				}
-				$prop = array();
-				$opt = array();
-				if (isset($tag['attribute']['name']) AND !TCPDF_STATIC::empty_string($tag['attribute']['name'])) {
-					$name = $tag['attribute']['name'];
-				} else {
-					break;
-				}
-				$w = 0;
-				if (isset($tag['attribute']['opt']) AND !TCPDF_STATIC::empty_string($tag['attribute']['opt'])) {
-					$options = explode('#!NwL!#', $tag['attribute']['opt']);
-					$values = array();
-					foreach ($options as $val) {
-						if (strpos($val, '#!TaB!#') !== false) {
-							$opts = explode('#!TaB!#', $val);
-							$values[] = $opts;
-							$w = max($w, $this->GetStringWidth($opts[1]));
-						} else {
-							$values[] = $val;
-							$w = max($w, $this->GetStringWidth($val));
-						}
-					}
-				} else {
-					break;
-				}
-				$w *= 2;
-				if (isset($tag['attribute']['multiple']) AND ($tag['attribute']['multiple']='multiple')) {
-					$prop['multipleSelection'] = 'true';
-					$this->ListBox($name, $w, $h, $values, $prop, $opt, '', '', false);
-				} else {
-					$this->ComboBox($name, $w, $h, $values, $prop, $opt, '', '', false);
-				}
-				break;
-			}
-			case 'tcpdf': {
-				if (defined('K_TCPDF_CALLS_IN_HTML') AND (K_TCPDF_CALLS_IN_HTML === true)) {
-					// Special tag used to call TCPDF methods
-					if (isset($tag['attribute']['method'])) {
-						$tcpdf_method = $tag['attribute']['method'];
-						if (method_exists($this, $tcpdf_method)) {
-							if (isset($tag['attribute']['params']) AND (!empty($tag['attribute']['params']))) {
-								$params = $this->unserializeTCPDFtagParameters($tag['attribute']['params']);
-								call_user_func_array(array($this, $tcpdf_method), $params);
-							} else {
-								$this->$tcpdf_method();
-							}
-							$this->newline = true;
-						}
-					}
-				}
-				break;
-			}
-			default: {
-				break;
-			}
-		}
-		// define tags that support borders and background colors
-		$bordertags = array('blockquote','br','dd','dl','div','dt','h1','h2','h3','h4','h5','h6','hr','li','ol','p','pre','ul','tcpdf','table');
-		if (in_array($tag['value'], $bordertags)) {
-			// set border
-			$dom[$key]['borderposition'] = $this->getBorderStartPosition();
-		}
-		if ($dom[$key]['self'] AND isset($dom[$key]['attribute']['pagebreakafter'])) {
-			$pba = $dom[$key]['attribute']['pagebreakafter'];
-			// check for pagebreak
-			if (($pba == 'true') OR ($pba == 'left') OR ($pba == 'right')) {
-				// add a page (or trig AcceptPageBreak() for multicolumn mode)
-				$this->checkPageBreak($this->PageBreakTrigger + 1);
-			}
-			if ((($pba == 'left') AND (((!$this->rtl) AND (($this->page % 2) == 0)) OR (($this->rtl) AND (($this->page % 2) != 0))))
-				OR (($pba == 'right') AND (((!$this->rtl) AND (($this->page % 2) != 0)) OR (($this->rtl) AND (($this->page % 2) == 0))))) {
-				// add a page (or trig AcceptPageBreak() for multicolumn mode)
-				$this->checkPageBreak($this->PageBreakTrigger + 1);
-			}
-		}
-		return $dom;
-	}
-
-	/**
-	 * Process closing tags.
-	 * @param $dom (array) html dom array
-	 * @param $key (int) current element id
-	 * @param $cell (boolean) if true add the default left (or right if RTL) padding to each new line (default false).
-	 * @param $maxbottomliney (int) maximum y value of current line
-	 * @return $dom array
-	 * @protected
-	 */
-	protected function closeHTMLTagHandler($dom, $key, $cell, $maxbottomliney=0) {
-		$tag = $dom[$key];
-		$parent = $dom[($dom[$key]['parent'])];
-		$lasttag = ((!isset($dom[($key + 1)])) OR ((!isset($dom[($key + 2)])) AND ($dom[($key + 1)]['value'] == 'marker')));
-		$in_table_head = false;
-		// maximum x position (used to draw borders)
-		if ($this->rtl) {
-			$xmax = $this->w;
-		} else {
-			$xmax = 0;
-		}
-		if ($tag['block']) {
-			$hbz = 0; // distance from y to line bottom
-			$hb = 0; // vertical space between block tags
-			// calculate vertical space for block tags
-			if (isset($this->tagvspaces[$tag['value']][1]['h']) AND ($this->tagvspaces[$tag['value']][1]['h'] >= 0)) {
-				$pre_h = $this->tagvspaces[$tag['value']][1]['h'];
-			} elseif (isset($parent['fontsize'])) {
-				$pre_h = $this->getCellHeight($parent['fontsize'] / $this->k);
-			} else {
-				$pre_h = $this->getCellHeight($this->FontSize);
-			}
-			if (isset($this->tagvspaces[$tag['value']][1]['n'])) {
-				$cn = $this->tagvspaces[$tag['value']][1]['n'];
-			} elseif (preg_match('/[h][0-9]/', $tag['value']) > 0) {
-				$cn = 0.6;
-			} else {
-				$cn = 1;
-			}
-			if ((!isset($this->tagvspaces[$tag['value']])) AND ($tag['value'] == 'div')) {
-				$hb = 0;
-			} else {
-				$hb = ($cn * $pre_h);
-			}
-			if ($maxbottomliney > $this->PageBreakTrigger) {
-				$hbz = $this->getCellHeight($this->FontSize);
-			} elseif ($this->y < $maxbottomliney) {
-				$hbz = ($maxbottomliney - $this->y);
-			}
-		}
-		// Closing tag
-		switch($tag['value']) {
-			case 'tr': {
-				$table_el = $dom[($dom[$key]['parent'])]['parent'];
-				if (!isset($parent['endy'])) {
-					$dom[($dom[$key]['parent'])]['endy'] = $this->y;
-					$parent['endy'] = $this->y;
-				}
-				if (!isset($parent['endpage'])) {
-					$dom[($dom[$key]['parent'])]['endpage'] = $this->page;
-					$parent['endpage'] = $this->page;
-				}
-				if (!isset($parent['endcolumn'])) {
-					$dom[($dom[$key]['parent'])]['endcolumn'] = $this->current_column;
-					$parent['endcolumn'] = $this->current_column;
-				}
-				// update row-spanned cells
-				if (isset($dom[$table_el]['rowspans'])) {
-					foreach ($dom[$table_el]['rowspans'] as $k => $trwsp) {
-						$dom[$table_el]['rowspans'][$k]['rowspan'] -= 1;
-						if ($dom[$table_el]['rowspans'][$k]['rowspan'] == 0) {
-							if (($dom[$table_el]['rowspans'][$k]['endpage'] == $parent['endpage']) AND ($dom[$table_el]['rowspans'][$k]['endcolumn'] == $parent['endcolumn'])) {
-								$dom[($dom[$key]['parent'])]['endy'] = max($dom[$table_el]['rowspans'][$k]['endy'], $parent['endy']);
-							} elseif (($dom[$table_el]['rowspans'][$k]['endpage'] > $parent['endpage']) OR ($dom[$table_el]['rowspans'][$k]['endcolumn'] > $parent['endcolumn'])) {
-								$dom[($dom[$key]['parent'])]['endy'] = $dom[$table_el]['rowspans'][$k]['endy'];
-								$dom[($dom[$key]['parent'])]['endpage'] = $dom[$table_el]['rowspans'][$k]['endpage'];
-								$dom[($dom[$key]['parent'])]['endcolumn'] = $dom[$table_el]['rowspans'][$k]['endcolumn'];
-							}
-						}
-					}
-					// report new endy and endpage to the rowspanned cells
-					foreach ($dom[$table_el]['rowspans'] as $k => $trwsp) {
-						if ($dom[$table_el]['rowspans'][$k]['rowspan'] == 0) {
-							$dom[$table_el]['rowspans'][$k]['endpage'] = max($dom[$table_el]['rowspans'][$k]['endpage'], $dom[($dom[$key]['parent'])]['endpage']);
-							$dom[($dom[$key]['parent'])]['endpage'] = $dom[$table_el]['rowspans'][$k]['endpage'];
-							$dom[$table_el]['rowspans'][$k]['endcolumn'] = max($dom[$table_el]['rowspans'][$k]['endcolumn'], $dom[($dom[$key]['parent'])]['endcolumn']);
-							$dom[($dom[$key]['parent'])]['endcolumn'] = $dom[$table_el]['rowspans'][$k]['endcolumn'];
-							$dom[$table_el]['rowspans'][$k]['endy'] = max($dom[$table_el]['rowspans'][$k]['endy'], $dom[($dom[$key]['parent'])]['endy']);
-							$dom[($dom[$key]['parent'])]['endy'] = $dom[$table_el]['rowspans'][$k]['endy'];
-						}
-					}
-					// update remaining rowspanned cells
-					foreach ($dom[$table_el]['rowspans'] as $k => $trwsp) {
-						if ($dom[$table_el]['rowspans'][$k]['rowspan'] == 0) {
-							$dom[$table_el]['rowspans'][$k]['endpage'] = $dom[($dom[$key]['parent'])]['endpage'];
-							$dom[$table_el]['rowspans'][$k]['endcolumn'] = $dom[($dom[$key]['parent'])]['endcolumn'];
-							$dom[$table_el]['rowspans'][$k]['endy'] = $dom[($dom[$key]['parent'])]['endy'];
-						}
-					}
-				}
-				$prev_page = $this->page;
-				$this->setPage($dom[($dom[$key]['parent'])]['endpage']);
-				if ($this->num_columns > 1) {
-					if (($prev_page < $this->page)
-						AND ((($this->current_column == 0) AND ($dom[($dom[$key]['parent'])]['endcolumn'] == ($this->num_columns - 1)))
-							OR ($this->current_column == $dom[($dom[$key]['parent'])]['endcolumn']))) {
-						// page jump
-						$this->selectColumn(0);
-						$dom[($dom[$key]['parent'])]['endcolumn'] = 0;
-						$dom[($dom[$key]['parent'])]['endy'] = $this->y;
-					} else {
-						$this->selectColumn($dom[($dom[$key]['parent'])]['endcolumn']);
-						$this->y = $dom[($dom[$key]['parent'])]['endy'];
-					}
-				} else {
-					$this->y = $dom[($dom[$key]['parent'])]['endy'];
-				}
-				if (isset($dom[$table_el]['attribute']['cellspacing'])) {
-					$this->y += $this->getHTMLUnitToUnits($dom[$table_el]['attribute']['cellspacing'], 1, 'px');
-				} elseif (isset($dom[$table_el]['border-spacing'])) {
-					$this->y += $dom[$table_el]['border-spacing']['V'];
-				}
-				$this->Ln(0, $cell);
-				if ($this->current_column == $parent['startcolumn']) {
-					$this->x = $parent['startx'];
-				}
-				// account for booklet mode
-				if ($this->page > $parent['startpage']) {
-					if (($this->rtl) AND ($this->pagedim[$this->page]['orm'] != $this->pagedim[$parent['startpage']]['orm'])) {
-						$this->x -= ($this->pagedim[$this->page]['orm'] - $this->pagedim[$parent['startpage']]['orm']);
-					} elseif ((!$this->rtl) AND ($this->pagedim[$this->page]['olm'] != $this->pagedim[$parent['startpage']]['olm'])) {
-						$this->x += ($this->pagedim[$this->page]['olm'] - $this->pagedim[$parent['startpage']]['olm']);
-					}
-				}
-				break;
-			}
-			case 'tablehead':
-				// closing tag used for the thead part
-				$in_table_head = true;
-				$this->inthead = false;
-			case 'table': {
-				$table_el = $parent;
-				// set default border
-				if (isset($table_el['attribute']['border']) AND ($table_el['attribute']['border'] > 0)) {
-					// set default border
-					$border = array('LTRB' => array('width' => $this->getCSSBorderWidth($table_el['attribute']['border']), 'cap'=>'square', 'join'=>'miter', 'dash'=> 0, 'color'=>array(0,0,0)));
-				} else {
-					$border = 0;
-				}
-				$default_border = $border;
-				// fix bottom line alignment of last line before page break
-				foreach ($dom[($dom[$key]['parent'])]['trids'] as $j => $trkey) {
-					// update row-spanned cells
-					if (isset($dom[($dom[$key]['parent'])]['rowspans'])) {
-						foreach ($dom[($dom[$key]['parent'])]['rowspans'] as $k => $trwsp) {
-							if (isset($prevtrkey) AND ($trwsp['trid'] == $prevtrkey) AND ($trwsp['mrowspan'] > 0)) {
-								$dom[($dom[$key]['parent'])]['rowspans'][$k]['trid'] = $trkey;
-							}
-							if ($dom[($dom[$key]['parent'])]['rowspans'][$k]['trid'] == $trkey) {
-								$dom[($dom[$key]['parent'])]['rowspans'][$k]['mrowspan'] -= 1;
-							}
-						}
-					}
-					if (isset($prevtrkey) AND ($dom[$trkey]['startpage'] > $dom[$prevtrkey]['endpage'])) {
-						$pgendy = $this->pagedim[$dom[$prevtrkey]['endpage']]['hk'] - $this->pagedim[$dom[$prevtrkey]['endpage']]['bm'];
-						$dom[$prevtrkey]['endy'] = $pgendy;
-						// update row-spanned cells
-						if (isset($dom[($dom[$key]['parent'])]['rowspans'])) {
-							foreach ($dom[($dom[$key]['parent'])]['rowspans'] as $k => $trwsp) {
-								if (($trwsp['trid'] == $prevtrkey) AND ($trwsp['mrowspan'] >= 0) AND ($trwsp['endpage'] == $dom[$prevtrkey]['endpage'])) {
-									$dom[($dom[$key]['parent'])]['rowspans'][$k]['endy'] = $pgendy;
-									$dom[($dom[$key]['parent'])]['rowspans'][$k]['mrowspan'] = -1;
-								}
-							}
-						}
-					}
-					$prevtrkey = $trkey;
-					$table_el = $dom[($dom[$key]['parent'])];
-				}
-				// for each row
-				if (count($table_el['trids']) > 0) {
-					unset($xmax);
-				}
-				foreach ($table_el['trids'] as $j => $trkey) {
-					$parent = $dom[$trkey];
-					if (!isset($xmax)) {
-						$xmax = $parent['cellpos'][(count($parent['cellpos']) - 1)]['endx'];
-					}
-					// for each cell on the row
-					foreach ($parent['cellpos'] as $k => $cellpos) {
-						if (isset($cellpos['rowspanid']) AND ($cellpos['rowspanid'] >= 0)) {
-							$cellpos['startx'] = $table_el['rowspans'][($cellpos['rowspanid'])]['startx'];
-							$cellpos['endx'] = $table_el['rowspans'][($cellpos['rowspanid'])]['endx'];
-							$endy = $table_el['rowspans'][($cellpos['rowspanid'])]['endy'];
-							$startpage = $table_el['rowspans'][($cellpos['rowspanid'])]['startpage'];
-							$endpage = $table_el['rowspans'][($cellpos['rowspanid'])]['endpage'];
-							$startcolumn = $table_el['rowspans'][($cellpos['rowspanid'])]['startcolumn'];
-							$endcolumn = $table_el['rowspans'][($cellpos['rowspanid'])]['endcolumn'];
-						} else {
-							$endy = $parent['endy'];
-							$startpage = $parent['startpage'];
-							$endpage = $parent['endpage'];
-							$startcolumn = $parent['startcolumn'];
-							$endcolumn = $parent['endcolumn'];
-						}
-						if ($this->num_columns == 0) {
-							$this->num_columns = 1;
-						}
-						if (isset($cellpos['border'])) {
-							$border = $cellpos['border'];
-						}
-						if (isset($cellpos['bgcolor']) AND ($cellpos['bgcolor']) !== false) {
-							$this->SetFillColorArray($cellpos['bgcolor']);
-							$fill = true;
-						} else {
-							$fill = false;
-						}
-						$x = $cellpos['startx'];
-						$y = $parent['starty'];
-						$starty = $y;
-						$w = abs($cellpos['endx'] - $cellpos['startx']);
-						// get border modes
-						$border_start = TCPDF_STATIC::getBorderMode($border, $position='start', $this->opencell);
-						$border_end = TCPDF_STATIC::getBorderMode($border, $position='end', $this->opencell);
-						$border_middle = TCPDF_STATIC::getBorderMode($border, $position='middle', $this->opencell);
-						// design borders around HTML cells.
-						for ($page = $startpage; $page <= $endpage; ++$page) { // for each page
-							$ccode = '';
-							$this->setPage($page);
-							if ($this->num_columns < 2) {
-								// single-column mode
-								$this->x = $x;
-								$this->y = $this->tMargin;
-							}
-							// account for margin changes
-							if ($page > $startpage) {
-								if (($this->rtl) AND ($this->pagedim[$page]['orm'] != $this->pagedim[$startpage]['orm'])) {
-									$this->x -= ($this->pagedim[$page]['orm'] - $this->pagedim[$startpage]['orm']);
-								} elseif ((!$this->rtl) AND ($this->pagedim[$page]['olm'] != $this->pagedim[$startpage]['olm'])) {
-									$this->x += ($this->pagedim[$page]['olm'] - $this->pagedim[$startpage]['olm']);
-								}
-							}
-							if ($startpage == $endpage) { // single page
-								$deltacol = 0;
-								$deltath = 0;
-								for ($column = $startcolumn; $column <= $endcolumn; ++$column) { // for each column
-									$this->selectColumn($column);
-									if ($startcolumn == $endcolumn) { // single column
-										$cborder = $border;
-										$h = $endy - $parent['starty'];
-										$this->y = $y;
-										$this->x = $x;
-									} elseif ($column == $startcolumn) { // first column
-										$cborder = $border_start;
-										$this->y = $starty;
-										$this->x = $x;
-										$h = $this->h - $this->y - $this->bMargin;
-										if ($this->rtl) {
-											$deltacol = $this->x + $this->rMargin - $this->w;
-										} else {
-											$deltacol = $this->x - $this->lMargin;
-										}
-									} elseif ($column == $endcolumn) { // end column
-										$cborder = $border_end;
-										if (isset($this->columns[$column]['th']['\''.$page.'\''])) {
-											$this->y = $this->columns[$column]['th']['\''.$page.'\''];
-										}
-										$this->x += $deltacol;
-										$h = $endy - $this->y;
-									} else { // middle column
-										$cborder = $border_middle;
-										if (isset($this->columns[$column]['th']['\''.$page.'\''])) {
-											$this->y = $this->columns[$column]['th']['\''.$page.'\''];
-										}
-										$this->x += $deltacol;
-										$h = $this->h - $this->y - $this->bMargin;
-									}
-									$ccode .= $this->getCellCode($w, $h, '', $cborder, 1, '', $fill, '', 0, true)."\n";
-								} // end for each column
-							} elseif ($page == $startpage) { // first page
-								$deltacol = 0;
-								$deltath = 0;
-								for ($column = $startcolumn; $column < $this->num_columns; ++$column) { // for each column
-									$this->selectColumn($column);
-									if ($column == $startcolumn) { // first column
-										$cborder = $border_start;
-										$this->y = $starty;
-										$this->x = $x;
-										$h = $this->h - $this->y - $this->bMargin;
-										if ($this->rtl) {
-											$deltacol = $this->x + $this->rMargin - $this->w;
-										} else {
-											$deltacol = $this->x - $this->lMargin;
-										}
-									} else { // middle column
-										$cborder = $border_middle;
-										if (isset($this->columns[$column]['th']['\''.$page.'\''])) {
-											$this->y = $this->columns[$column]['th']['\''.$page.'\''];
-										}
-										$this->x += $deltacol;
-										$h = $this->h - $this->y - $this->bMargin;
-									}
-									$ccode .= $this->getCellCode($w, $h, '', $cborder, 1, '', $fill, '', 0, true)."\n";
-								} // end for each column
-							} elseif ($page == $endpage) { // last page
-								$deltacol = 0;
-								$deltath = 0;
-								for ($column = 0; $column <= $endcolumn; ++$column) { // for each column
-									$this->selectColumn($column);
-									if ($column == $endcolumn) { // end column
-										$cborder = $border_end;
-										if (isset($this->columns[$column]['th']['\''.$page.'\''])) {
-											$this->y = $this->columns[$column]['th']['\''.$page.'\''];
-										}
-										$this->x += $deltacol;
-										$h = $endy - $this->y;
-									} else { // middle column
-										$cborder = $border_middle;
-										if (isset($this->columns[$column]['th']['\''.$page.'\''])) {
-											$this->y = $this->columns[$column]['th']['\''.$page.'\''];
-										}
-										$this->x += $deltacol;
-										$h = $this->h - $this->y - $this->bMargin;
-									}
-									$ccode .= $this->getCellCode($w, $h, '', $cborder, 1, '', $fill, '', 0, true)."\n";
-								} // end for each column
-							} else { // middle page
-								$deltacol = 0;
-								$deltath = 0;
-								for ($column = 0; $column < $this->num_columns; ++$column) { // for each column
-									$this->selectColumn($column);
-									$cborder = $border_middle;
-									if (isset($this->columns[$column]['th']['\''.$page.'\''])) {
-										$this->y = $this->columns[$column]['th']['\''.$page.'\''];
-									}
-									$this->x += $deltacol;
-									$h = $this->h - $this->y - $this->bMargin;
-									$ccode .= $this->getCellCode($w, $h, '', $cborder, 1, '', $fill, '', 0, true)."\n";
-								} // end for each column
-							}
-							if (!empty($cborder) OR !empty($fill)) {
-								$offsetlen = strlen($ccode);
-								// draw border and fill
-								if ($this->inxobj) {
-									// we are inside an XObject template
-									if (end($this->xobjects[$this->xobjid]['transfmrk']) !== false) {
-										$pagemarkkey = key($this->xobjects[$this->xobjid]['transfmrk']);
-										$pagemark = $this->xobjects[$this->xobjid]['transfmrk'][$pagemarkkey];
-										$this->xobjects[$this->xobjid]['transfmrk'][$pagemarkkey] += $offsetlen;
-									} else {
-										$pagemark = $this->xobjects[$this->xobjid]['intmrk'];
-										$this->xobjects[$this->xobjid]['intmrk'] += $offsetlen;
-									}
-									$pagebuff = $this->xobjects[$this->xobjid]['outdata'];
-									$pstart = substr($pagebuff, 0, $pagemark);
-									$pend = substr($pagebuff, $pagemark);
-									$this->xobjects[$this->xobjid]['outdata'] = $pstart.$ccode.$pend;
-								} else {
-									// draw border and fill
-									if (end($this->transfmrk[$this->page]) !== false) {
-										$pagemarkkey = key($this->transfmrk[$this->page]);
-										$pagemark = $this->transfmrk[$this->page][$pagemarkkey];
-									} elseif ($this->InFooter) {
-										$pagemark = $this->footerpos[$this->page];
-									} else {
-										$pagemark = $this->intmrk[$this->page];
-									}
-									$pagebuff = $this->getPageBuffer($this->page);
-									$pstart = substr($pagebuff, 0, $pagemark);
-									$pend = substr($pagebuff, $pagemark);
-									$this->setPageBuffer($this->page, $pstart.$ccode.$pend);
-								}
-							}
-						} // end for each page
-						// restore default border
-						$border = $default_border;
-					} // end for each cell on the row
-					if (isset($table_el['attribute']['cellspacing'])) {
-						$this->y += $this->getHTMLUnitToUnits($table_el['attribute']['cellspacing'], 1, 'px');
-					} elseif (isset($table_el['border-spacing'])) {
-						$this->y += $table_el['border-spacing']['V'];
-					}
-					$this->Ln(0, $cell);
-					$this->x = $parent['startx'];
-					if ($endpage > $startpage) {
-						if (($this->rtl) AND ($this->pagedim[$endpage]['orm'] != $this->pagedim[$startpage]['orm'])) {
-							$this->x += ($this->pagedim[$endpage]['orm'] - $this->pagedim[$startpage]['orm']);
-						} elseif ((!$this->rtl) AND ($this->pagedim[$endpage]['olm'] != $this->pagedim[$startpage]['olm'])) {
-							$this->x += ($this->pagedim[$endpage]['olm'] - $this->pagedim[$startpage]['olm']);
-						}
-					}
-				}
-				if (!$in_table_head) { // we are not inside a thead section
-					$this->cell_padding = $table_el['old_cell_padding'];
-					// reset row height
-					$this->resetLastH();
-					if (($this->page == ($this->numpages - 1)) AND ($this->pageopen[$this->numpages])) {
-						$plendiff = ($this->pagelen[$this->numpages] - $this->emptypagemrk[$this->numpages]);
-						if (($plendiff > 0) AND ($plendiff < 60)) {
-							$pagediff = substr($this->getPageBuffer($this->numpages), $this->emptypagemrk[$this->numpages], $plendiff);
-							if (substr($pagediff, 0, 5) == 'BT /F') {
-								// the difference is only a font setting
-								$plendiff = 0;
-							}
-						}
-						if ($plendiff == 0) {
-							// remove last blank page
-							$this->deletePage($this->numpages);
-						}
-					}
-					if (isset($this->theadMargins['top'])) {
-						// restore top margin
-						$this->tMargin = $this->theadMargins['top'];
-					}
-					if (!isset($table_el['attribute']['nested']) OR ($table_el['attribute']['nested'] != 'true')) {
-						// reset main table header
-						$this->thead = '';
-						$this->theadMargins = array();
-						$this->pagedim[$this->page]['tm'] = $this->tMargin;
-					}
-				}
-				$parent = $table_el;
-				break;
-			}
-			case 'a': {
-				$this->HREF = '';
-				break;
-			}
-			case 'sup': {
-				$this->SetXY($this->GetX(), $this->GetY() + ((0.7 * $parent['fontsize']) / $this->k));
-				break;
-			}
-			case 'sub': {
-				$this->SetXY($this->GetX(), $this->GetY() - ((0.3 * $parent['fontsize']) / $this->k));
-				break;
-			}
-			case 'div': {
-				$this->addHTMLVertSpace($hbz, $hb, $cell, false, $lasttag);
-				break;
-			}
-			case 'blockquote': {
-				if ($this->rtl) {
-					$this->rMargin -= $this->listindent;
-				} else {
-					$this->lMargin -= $this->listindent;
-				}
-				--$this->listindentlevel;
-				$this->addHTMLVertSpace($hbz, $hb, $cell, false, $lasttag);
-				break;
-			}
-			case 'p': {
-				$this->addHTMLVertSpace($hbz, $hb, $cell, false, $lasttag);
-				break;
-			}
-			case 'pre': {
-				$this->addHTMLVertSpace($hbz, $hb, $cell, false, $lasttag);
-				$this->premode = false;
-				break;
-			}
-			case 'dl': {
-				--$this->listnum;
-				if ($this->listnum <= 0) {
-					$this->listnum = 0;
-					$this->addHTMLVertSpace($hbz, $hb, $cell, false, $lasttag);
-				} else {
-					$this->addHTMLVertSpace(0, 0, $cell, false, $lasttag);
-				}
-				$this->resetLastH();
-				break;
-			}
-			case 'dt': {
-				$this->lispacer = '';
-				$this->addHTMLVertSpace(0, 0, $cell, false, $lasttag);
-				break;
-			}
-			case 'dd': {
-				$this->lispacer = '';
-				if ($this->rtl) {
-					$this->rMargin -= $this->listindent;
-				} else {
-					$this->lMargin -= $this->listindent;
-				}
-				--$this->listindentlevel;
-				$this->addHTMLVertSpace(0, 0, $cell, false, $lasttag);
-				break;
-			}
-			case 'ul':
-			case 'ol': {
-				--$this->listnum;
-				$this->lispacer = '';
-				if ($this->rtl) {
-					$this->rMargin -= $this->listindent;
-				} else {
-					$this->lMargin -= $this->listindent;
-				}
-				--$this->listindentlevel;
-				if ($this->listnum <= 0) {
-					$this->listnum = 0;
-					$this->addHTMLVertSpace($hbz, $hb, $cell, false, $lasttag);
-				} else {
-					$this->addHTMLVertSpace(0, 0, $cell, false, $lasttag);
-				}
-				$this->resetLastH();
-				break;
-			}
-			case 'li': {
-				$this->lispacer = '';
-				$this->addHTMLVertSpace(0, 0, $cell, false, $lasttag);
-				break;
-			}
-			case 'h1':
-			case 'h2':
-			case 'h3':
-			case 'h4':
-			case 'h5':
-			case 'h6': {
-				$this->addHTMLVertSpace($hbz, $hb, $cell, false, $lasttag);
-				break;
-			}
-			// Form fields (since 4.8.000 - 2009-09-07)
-			case 'form': {
-				$this->form_action = '';
-				$this->form_enctype = 'application/x-www-form-urlencoded';
-				break;
-			}
-			default : {
-				break;
-			}
-		}
-		// draw border and background (if any)
-		$this->drawHTMLTagBorder($parent, $xmax);
-		if (isset($dom[($dom[$key]['parent'])]['attribute']['pagebreakafter'])) {
-			$pba = $dom[($dom[$key]['parent'])]['attribute']['pagebreakafter'];
-			// check for pagebreak
-			if (($pba == 'true') OR ($pba == 'left') OR ($pba == 'right')) {
-				// add a page (or trig AcceptPageBreak() for multicolumn mode)
-				$this->checkPageBreak($this->PageBreakTrigger + 1);
-			}
-			if ((($pba == 'left') AND (((!$this->rtl) AND (($this->page % 2) == 0)) OR (($this->rtl) AND (($this->page % 2) != 0))))
-				OR (($pba == 'right') AND (((!$this->rtl) AND (($this->page % 2) != 0)) OR (($this->rtl) AND (($this->page % 2) == 0))))) {
-				// add a page (or trig AcceptPageBreak() for multicolumn mode)
-				$this->checkPageBreak($this->PageBreakTrigger + 1);
-			}
-		}
-		$this->tmprtl = false;
-		return $dom;
-	}
-
-	/**
-	 * Add vertical spaces if needed.
-	 * @param $hbz (string) Distance between current y and line bottom.
-	 * @param $hb (string) The height of the break.
-	 * @param $cell (boolean) if true add the default left (or right if RTL) padding to each new line (default false).
-	 * @param $firsttag (boolean) set to true when the tag is the first.
-	 * @param $lasttag (boolean) set to true when the tag is the last.
-	 * @protected
-	 */
-	protected function addHTMLVertSpace($hbz=0, $hb=0, $cell=false, $firsttag=false, $lasttag=false) {
-		if ($firsttag) {
-			$this->Ln(0, $cell);
-			$this->htmlvspace = 0;
-			return;
-		}
-		if ($lasttag) {
-			$this->Ln($hbz, $cell);
-			$this->htmlvspace = 0;
-			return;
-		}
-		if ($hb < $this->htmlvspace) {
-			$hd = 0;
-		} else {
-			$hd = $hb - $this->htmlvspace;
-			$this->htmlvspace = $hb;
-		}
-		$this->Ln(($hbz + $hd), $cell);
-	}
-
-	/**
-	 * Return the starting coordinates to draw an html border
-	 * @return array containing top-left border coordinates
-	 * @protected
-	 * @since 5.7.000 (2010-08-03)
-	 */
-	protected function getBorderStartPosition() {
-		if ($this->rtl) {
-			$xmax = $this->lMargin;
-		} else {
-			$xmax = $this->w - $this->rMargin;
-		}
-		return array('page' => $this->page, 'column' => $this->current_column, 'x' => $this->x, 'y' => $this->y, 'xmax' => $xmax);
-	}
-
-	/**
-	 * Draw an HTML block border and fill
-	 * @param $tag (array) array of tag properties.
-	 * @param $xmax (int) end X coordinate for border.
-	 * @protected
-	 * @since 5.7.000 (2010-08-03)
-	 */
-	protected function drawHTMLTagBorder($tag, $xmax) {
-		if (!isset($tag['borderposition'])) {
-			// nothing to draw
-			return;
-		}
-		$prev_x = $this->x;
-		$prev_y = $this->y;
-		$prev_lasth = $this->lasth;
-		$border = 0;
-		$fill = false;
-		$this->lasth = 0;
-		if (isset($tag['border']) AND !empty($tag['border'])) {
-			// get border style
-			$border = $tag['border'];
-			if (!TCPDF_STATIC::empty_string($this->thead) AND (!$this->inthead)) {
-				// border for table header
-				$border = TCPDF_STATIC::getBorderMode($border, $position='middle', $this->opencell);
-			}
-		}
-		if (isset($tag['bgcolor']) AND ($tag['bgcolor'] !== false)) {
-			// get background color
-			$old_bgcolor = $this->bgcolor;
-			$this->SetFillColorArray($tag['bgcolor']);
-			$fill = true;
-		}
-		if (!$border AND !$fill) {
-			// nothing to draw
-			return;
-		}
-		if (isset($tag['attribute']['cellspacing'])) {
-			$clsp = $this->getHTMLUnitToUnits($tag['attribute']['cellspacing'], 1, 'px');
-			$cellspacing = array('H' => $clsp, 'V' => $clsp);
-		} elseif (isset($tag['border-spacing'])) {
-			$cellspacing = $tag['border-spacing'];
-		} else {
-			$cellspacing = array('H' => 0, 'V' => 0);
-		}
-		if (($tag['value'] != 'table') AND (is_array($border)) AND (!empty($border))) {
-			// draw the border externally respect the sqare edge.
-			$border['mode'] = 'ext';
-		}
-		if ($this->rtl) {
-			if ($xmax >= $tag['borderposition']['x']) {
-				$xmax = $tag['borderposition']['xmax'];
-			}
-			$w = ($tag['borderposition']['x'] - $xmax);
-		} else {
-			if ($xmax <= $tag['borderposition']['x']) {
-				$xmax = $tag['borderposition']['xmax'];
-			}
-			$w = ($xmax - $tag['borderposition']['x']);
-		}
-		if ($w <= 0) {
-			return;
-		}
-		$w += $cellspacing['H'];
-		$startpage = $tag['borderposition']['page'];
-		$startcolumn = $tag['borderposition']['column'];
-		$x = $tag['borderposition']['x'];
-		$y = $tag['borderposition']['y'];
-		$endpage = $this->page;
-		$starty = $tag['borderposition']['y'] - $cellspacing['V'];
-		$currentY = $this->y;
-		$this->x = $x;
-		// get latest column
-		$endcolumn = $this->current_column;
-		if ($this->num_columns == 0) {
-			$this->num_columns = 1;
-		}
-		// get border modes
-		$border_start = TCPDF_STATIC::getBorderMode($border, $position='start', $this->opencell);
-		$border_end = TCPDF_STATIC::getBorderMode($border, $position='end', $this->opencell);
-		$border_middle = TCPDF_STATIC::getBorderMode($border, $position='middle', $this->opencell);
-		// temporary disable page regions
-		$temp_page_regions = $this->page_regions;
-		$this->page_regions = array();
-		// design borders around HTML cells.
-		for ($page = $startpage; $page <= $endpage; ++$page) { // for each page
-			$ccode = '';
-			$this->setPage($page);
-			if ($this->num_columns < 2) {
-				// single-column mode
-				$this->x = $x;
-				$this->y = $this->tMargin;
-			}
-			// account for margin changes
-			if ($page > $startpage) {
-				if (($this->rtl) AND ($this->pagedim[$page]['orm'] != $this->pagedim[$startpage]['orm'])) {
-					$this->x -= ($this->pagedim[$page]['orm'] - $this->pagedim[$startpage]['orm']);
-				} elseif ((!$this->rtl) AND ($this->pagedim[$page]['olm'] != $this->pagedim[$startpage]['olm'])) {
-					$this->x += ($this->pagedim[$page]['olm'] - $this->pagedim[$startpage]['olm']);
-				}
-			}
-			if ($startpage == $endpage) {
-				// single page
-				for ($column = $startcolumn; $column <= $endcolumn; ++$column) { // for each column
-					$this->selectColumn($column);
-					if ($startcolumn == $endcolumn) { // single column
-						$cborder = $border;
-						$h = ($currentY - $y) + $cellspacing['V'];
-						$this->y = $starty;
-					} elseif ($column == $startcolumn) { // first column
-						$cborder = $border_start;
-						$this->y = $starty;
-						$h = $this->h - $this->y - $this->bMargin;
-					} elseif ($column == $endcolumn) { // end column
-						$cborder = $border_end;
-						$h = $currentY - $this->y;
-					} else { // middle column
-						$cborder = $border_middle;
-						$h = $this->h - $this->y - $this->bMargin;
-					}
-					$ccode .= $this->getCellCode($w, $h, '', $cborder, 1, '', $fill, '', 0, true)."\n";
-				} // end for each column
-			} elseif ($page == $startpage) { // first page
-				for ($column = $startcolumn; $column < $this->num_columns; ++$column) { // for each column
-					$this->selectColumn($column);
-					if ($column == $startcolumn) { // first column
-						$cborder = $border_start;
-						$this->y = $starty;
-						$h = $this->h - $this->y - $this->bMargin;
-					} else { // middle column
-						$cborder = $border_middle;
-						$h = $this->h - $this->y - $this->bMargin;
-					}
-					$ccode .= $this->getCellCode($w, $h, '', $cborder, 1, '', $fill, '', 0, true)."\n";
-				} // end for each column
-			} elseif ($page == $endpage) { // last page
-				for ($column = 0; $column <= $endcolumn; ++$column) { // for each column
-					$this->selectColumn($column);
-					if ($column == $endcolumn) {
-						// end column
-						$cborder = $border_end;
-						$h = $currentY - $this->y;
-					} else {
-						// middle column
-						$cborder = $border_middle;
-						$h = $this->h - $this->y - $this->bMargin;
-					}
-					$ccode .= $this->getCellCode($w, $h, '', $cborder, 1, '', $fill, '', 0, true)."\n";
-				} // end for each column
-			} else { // middle page
-				for ($column = 0; $column < $this->num_columns; ++$column) { // for each column
-					$this->selectColumn($column);
-					$cborder = $border_middle;
-					$h = $this->h - $this->y - $this->bMargin;
-					$ccode .= $this->getCellCode($w, $h, '', $cborder, 1, '', $fill, '', 0, true)."\n";
-				} // end for each column
-			}
-			if ($cborder OR $fill) {
-				$offsetlen = strlen($ccode);
-				// draw border and fill
-				if ($this->inxobj) {
-					// we are inside an XObject template
-					if (end($this->xobjects[$this->xobjid]['transfmrk']) !== false) {
-						$pagemarkkey = key($this->xobjects[$this->xobjid]['transfmrk']);
-						$pagemark = $this->xobjects[$this->xobjid]['transfmrk'][$pagemarkkey];
-						$this->xobjects[$this->xobjid]['transfmrk'][$pagemarkkey] += $offsetlen;
-					} else {
-						$pagemark = $this->xobjects[$this->xobjid]['intmrk'];
-						$this->xobjects[$this->xobjid]['intmrk'] += $offsetlen;
-					}
-					$pagebuff = $this->xobjects[$this->xobjid]['outdata'];
-					$pstart = substr($pagebuff, 0, $pagemark);
-					$pend = substr($pagebuff, $pagemark);
-					$this->xobjects[$this->xobjid]['outdata'] = $pstart.$ccode.$pend;
-				} else {
-					if (end($this->transfmrk[$this->page]) !== false) {
-						$pagemarkkey = key($this->transfmrk[$this->page]);
-						$pagemark = $this->transfmrk[$this->page][$pagemarkkey];
-					} elseif ($this->InFooter) {
-						$pagemark = $this->footerpos[$this->page];
-					} else {
-						$pagemark = $this->intmrk[$this->page];
-					}
-					$pagebuff = $this->getPageBuffer($this->page);
-					$pstart = substr($pagebuff, 0, $pagemark);
-					$pend = substr($pagebuff, $pagemark);
-					$this->setPageBuffer($this->page, $pstart.$ccode.$pend);
-					$this->bordermrk[$this->page] += $offsetlen;
-					$this->cntmrk[$this->page] += $offsetlen;
-				}
-			}
-		} // end for each page
-		// restore page regions
-		$this->page_regions = $temp_page_regions;
-		if (isset($old_bgcolor)) {
-			// restore background color
-			$this->SetFillColorArray($old_bgcolor);
-		}
-		// restore pointer position
-		$this->x = $prev_x;
-		$this->y = $prev_y;
-		$this->lasth = $prev_lasth;
-	}
-
-	/**
-	 * Set the default bullet to be used as LI bullet symbol
-	 * @param $symbol (string) character or string to be used (legal values are: '' = automatic, '!' = auto bullet, '#' = auto numbering, 'disc', 'disc', 'circle', 'square', '1', 'decimal', 'decimal-leading-zero', 'i', 'lower-roman', 'I', 'upper-roman', 'a', 'lower-alpha', 'lower-latin', 'A', 'upper-alpha', 'upper-latin', 'lower-greek', 'img|type|width|height|image.ext')
-	 * @public
-	 * @since 4.0.028 (2008-09-26)
-	 */
-	public function setLIsymbol($symbol='!') {
-		// check for custom image symbol
-		if (substr($symbol, 0, 4) == 'img|') {
-			$this->lisymbol = $symbol;
-			return;
-		}
-		$symbol = strtolower($symbol);
-		$valid_symbols = array('!', '#', 'disc', 'circle', 'square', '1', 'decimal', 'decimal-leading-zero', 'i', 'lower-roman', 'I', 'upper-roman', 'a', 'lower-alpha', 'lower-latin', 'A', 'upper-alpha', 'upper-latin', 'lower-greek');
-		if (in_array($symbol, $valid_symbols)) {
-			$this->lisymbol = $symbol;
-		} else {
-			$this->lisymbol = '';
-		}
-	}
-
-	/**
-	 * Set the booklet mode for double-sided pages.
-	 * @param $booklet (boolean) true set the booklet mode on, false otherwise.
-	 * @param $inner (float) Inner page margin.
-	 * @param $outer (float) Outer page margin.
-	 * @public
-	 * @since 4.2.000 (2008-10-29)
-	 */
-	public function SetBooklet($booklet=true, $inner=-1, $outer=-1) {
-		$this->booklet = $booklet;
-		if ($inner >= 0) {
-			$this->lMargin = $inner;
-		}
-		if ($outer >= 0) {
-			$this->rMargin = $outer;
-		}
-	}
-
-	/**
-	 * Swap the left and right margins.
-	 * @param $reverse (boolean) if true swap left and right margins.
-	 * @protected
-	 * @since 4.2.000 (2008-10-29)
-	 */
-	protected function swapMargins($reverse=true) {
-		if ($reverse) {
-			// swap left and right margins
-			$mtemp = $this->original_lMargin;
-			$this->original_lMargin = $this->original_rMargin;
-			$this->original_rMargin = $mtemp;
-			$deltam = $this->original_lMargin - $this->original_rMargin;
-			$this->lMargin += $deltam;
-			$this->rMargin -= $deltam;
-		}
-	}
-
-	/**
-	 * Set the vertical spaces for HTML tags.
-	 * The array must have the following structure (example):
-	 * $tagvs = array('h1' => array(0 => array('h' => '', 'n' => 2), 1 => array('h' => 1.3, 'n' => 1)));
-	 * The first array level contains the tag names,
-	 * the second level contains 0 for opening tags or 1 for closing tags,
-	 * the third level contains the vertical space unit (h) and the number spaces to add (n).
-	 * If the h parameter is not specified, default values are used.
-	 * @param $tagvs (array) array of tags and relative vertical spaces.
-	 * @public
-	 * @since 4.2.001 (2008-10-30)
-	 */
-	public function setHtmlVSpace($tagvs) {
-		$this->tagvspaces = $tagvs;
-	}
-
-	/**
-	 * Set custom width for list indentation.
-	 * @param $width (float) width of the indentation. Use negative value to disable it.
-	 * @public
-	 * @since 4.2.007 (2008-11-12)
-	 */
-	public function setListIndentWidth($width) {
-		return $this->customlistindent = floatval($width);
-	}
-
-	/**
-	 * Set the top/bottom cell sides to be open or closed when the cell cross the page.
-	 * @param $isopen (boolean) if true keeps the top/bottom border open for the cell sides that cross the page.
-	 * @public
-	 * @since 4.2.010 (2008-11-14)
-	 */
-	public function setOpenCell($isopen) {
-		$this->opencell = $isopen;
-	}
-
-	/**
-	 * Set the color and font style for HTML links.
-	 * @param $color (array) RGB array of colors
-	 * @param $fontstyle (string) additional font styles to add
-	 * @public
-	 * @since 4.4.003 (2008-12-09)
-	 */
-	public function setHtmlLinksStyle($color=array(0,0,255), $fontstyle='U') {
-		$this->htmlLinkColorArray = $color;
-		$this->htmlLinkFontStyle = $fontstyle;
-	}
-
-	/**
-	 * Convert HTML string containing value and unit of measure to user's units or points.
-	 * @param $htmlval (string) String containing values and unit.
-	 * @param $refsize (string) Reference value in points.
-	 * @param $defaultunit (string) Default unit (can be one of the following: %, em, ex, px, in, mm, pc, pt).
-	 * @param $points (boolean) If true returns points, otherwise returns value in user's units.
-	 * @return float value in user's unit or point if $points=true
-	 * @public
-	 * @since 4.4.004 (2008-12-10)
-	 */
-	public function getHTMLUnitToUnits($htmlval, $refsize=1, $defaultunit='px', $points=false) {
-		$supportedunits = array('%', 'em', 'ex', 'px', 'in', 'cm', 'mm', 'pc', 'pt');
-		$retval = 0;
-		$value = 0;
-		$unit = 'px';
-		if ($points) {
-			$k = 1;
-		} else {
-			$k = $this->k;
-		}
-		if (in_array($defaultunit, $supportedunits)) {
-			$unit = $defaultunit;
-		}
-		if (is_numeric($htmlval)) {
-			$value = floatval($htmlval);
-		} elseif (preg_match('/([0-9\.\-\+]+)/', $htmlval, $mnum)) {
-			$value = floatval($mnum[1]);
-			if (preg_match('/([a-z%]+)/', $htmlval, $munit)) {
-				if (in_array($munit[1], $supportedunits)) {
-					$unit = $munit[1];
-				}
-			}
-		}
-		switch ($unit) {
-			// percentage
-			case '%': {
-				$retval = (($value * $refsize) / 100);
-				break;
-			}
-			// relative-size
-			case 'em': {
-				$retval = ($value * $refsize);
-				break;
-			}
-			// height of lower case 'x' (about half the font-size)
-			case 'ex': {
-				$retval = ($value * ($refsize / 2));
-				break;
-			}
-			// absolute-size
-			case 'in': {
-				$retval = (($value * $this->dpi) / $k);
-				break;
-			}
-			// centimeters
-			case 'cm': {
-				$retval = (($value / 2.54 * $this->dpi) / $k);
-				break;
-			}
-			// millimeters
-			case 'mm': {
-				$retval = (($value / 25.4 * $this->dpi) / $k);
-				break;
-			}
-			// one pica is 12 points
-			case 'pc': {
-				$retval = (($value * 12) / $k);
-				break;
-			}
-			// points
-			case 'pt': {
-				$retval = ($value / $k);
-				break;
-			}
-			// pixels
-			case 'px': {
-				$retval = $this->pixelsToUnits($value);
-				if ($points) {
-					$retval *= $this->k;
-				}
-				break;
-			}
-		}
-		return $retval;
-	}
-
-	/**
-	 * Output an HTML list bullet or ordered item symbol
-	 * @param $listdepth (int) list nesting level
-	 * @param $listtype (string) type of list
-	 * @param $size (float) current font size
-	 * @protected
-	 * @since 4.4.004 (2008-12-10)
-	 */
-	protected function putHtmlListBullet($listdepth, $listtype='', $size=10) {
-		if ($this->state != 2) {
-			return;
-		}
-		$size /= $this->k;
-		$fill = '';
-		$bgcolor = $this->bgcolor;
-		$color = $this->fgcolor;
-		$strokecolor = $this->strokecolor;
-		$width = 0;
-		$textitem = '';
-		$tmpx = $this->x;
-		$lspace = $this->GetStringWidth('  ');
-		if ($listtype == '^') {
-			// special symbol used for avoid justification of rect bullet
-			$this->lispacer = '';
-			return;
-		} elseif ($listtype == '!') {
-			// set default list type for unordered list
-			$deftypes = array('disc', 'circle', 'square');
-			$listtype = $deftypes[($listdepth - 1) % 3];
-		} elseif ($listtype == '#') {
-			// set default list type for ordered list
-			$listtype = 'decimal';
-		} elseif (substr($listtype, 0, 4) == 'img|') {
-			// custom image type ('img|type|width|height|image.ext')
-			$img = explode('|', $listtype);
-			$listtype = 'img';
-		}
-		switch ($listtype) {
-			// unordered types
-			case 'none': {
-				break;
-			}
-			case 'disc': {
-				$r = $size / 6;
-				$lspace += (2 * $r);
-				if ($this->rtl) {
-					$this->x += $lspace;
-				} else {
-					$this->x -= $lspace;
-				}
-				$this->Circle(($this->x + $r), ($this->y + ($this->lasth / 2)), $r, 0, 360, 'F', array(), $color, 8);
-				break;
-			}
-			case 'circle': {
-				$r = $size / 6;
-				$lspace += (2 * $r);
-				if ($this->rtl) {
-					$this->x += $lspace;
-				} else {
-					$this->x -= $lspace;
-				}
-				$prev_line_style = $this->linestyleWidth.' '.$this->linestyleCap.' '.$this->linestyleJoin.' '.$this->linestyleDash.' '.$this->DrawColor;
-				$new_line_style = array('width' => ($r / 3), 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'phase' => 0, 'color'=>$color);
-				$this->Circle(($this->x + $r), ($this->y + ($this->lasth / 2)), ($r * (1 - (1/6))), 0, 360, 'D', $new_line_style, array(), 8);
-				$this->_out($prev_line_style); // restore line settings
-				break;
-			}
-			case 'square': {
-				$l = $size / 3;
-				$lspace += $l;
-				if ($this->rtl) {;
-					$this->x += $lspace;
-				} else {
-					$this->x -= $lspace;
-				}
-				$this->Rect($this->x, ($this->y + (($this->lasth - $l) / 2)), $l, $l, 'F', array(), $color);
-				break;
-			}
-			case 'img': {
-				// 1=>type, 2=>width, 3=>height, 4=>image.ext
-				$lspace += $img[2];
-				if ($this->rtl) {;
-					$this->x += $lspace;
-				} else {
-					$this->x -= $lspace;
-				}
-				$imgtype = strtolower($img[1]);
-				$prev_y = $this->y;
-				switch ($imgtype) {
-					case 'svg': {
-						$this->ImageSVG($img[4], $this->x, ($this->y + (($this->lasth - $img[3]) / 2)), $img[2], $img[3], '', 'T', '', 0, false);
-						break;
-					}
-					case 'ai':
-					case 'eps': {
-						$this->ImageEps($img[4], $this->x, ($this->y + (($this->lasth - $img[3]) / 2)), $img[2], $img[3], '', true, 'T', '', 0, false);
-						break;
-					}
-					default: {
-						$this->Image($img[4], $this->x, ($this->y + (($this->lasth - $img[3]) / 2)), $img[2], $img[3], $img[1], '', 'T', false, 300, '', false, false, 0, false, false, false);
-						break;
-					}
-				}
-				$this->y = $prev_y;
-				break;
-			}
-			// ordered types
-			// $this->listcount[$this->listnum];
-			// $textitem
-			case '1':
-			case 'decimal': {
-				$textitem = $this->listcount[$this->listnum];
-				break;
-			}
-			case 'decimal-leading-zero': {
-				$textitem = sprintf('%02d', $this->listcount[$this->listnum]);
-				break;
-			}
-			case 'i':
-			case 'lower-roman': {
-				$textitem = strtolower(TCPDF_STATIC::intToRoman($this->listcount[$this->listnum]));
-				break;
-			}
-			case 'I':
-			case 'upper-roman': {
-				$textitem = TCPDF_STATIC::intToRoman($this->listcount[$this->listnum]);
-				break;
-			}
-			case 'a':
-			case 'lower-alpha':
-			case 'lower-latin': {
-				$textitem = chr(97 + $this->listcount[$this->listnum] - 1);
-				break;
-			}
-			case 'A':
-			case 'upper-alpha':
-			case 'upper-latin': {
-				$textitem = chr(65 + $this->listcount[$this->listnum] - 1);
-				break;
-			}
-			case 'lower-greek': {
-				$textitem = TCPDF_FONTS::unichr((945 + $this->listcount[$this->listnum] - 1), $this->isunicode);
-				break;
-			}
-			/*
-			// Types to be implemented (special handling)
-			case 'hebrew': {
-				break;
-			}
-			case 'armenian': {
-				break;
-			}
-			case 'georgian': {
-				break;
-			}
-			case 'cjk-ideographic': {
-				break;
-			}
-			case 'hiragana': {
-				break;
-			}
-			case 'katakana': {
-				break;
-			}
-			case 'hiragana-iroha': {
-				break;
-			}
-			case 'katakana-iroha': {
-				break;
-			}
-			*/
-			default: {
-				$textitem = $this->listcount[$this->listnum];
-			}
-		}
-		if (!TCPDF_STATIC::empty_string($textitem)) {
-			// Check whether we need a new page or new column
-			$prev_y = $this->y;
-			$h = $this->getCellHeight($this->FontSize);
-			if ($this->checkPageBreak($h) OR ($this->y < $prev_y)) {
-				$tmpx = $this->x;
-			}
-			// print ordered item
-			if ($this->rtl) {
-				$textitem = '.'.$textitem;
-			} else {
-				$textitem = $textitem.'.';
-			}
-			$lspace += $this->GetStringWidth($textitem);
-			if ($this->rtl) {
-				$this->x += $lspace;
-			} else {
-				$this->x -= $lspace;
-			}
-			$this->Write($this->lasth, $textitem, '', false, '', false, 0, false);
-		}
-		$this->x = $tmpx;
-		$this->lispacer = '^';
-		// restore colors
-		$this->SetFillColorArray($bgcolor);
-		$this->SetDrawColorArray($strokecolor);
-		$this->SettextColorArray($color);
-	}
-
-	/**
-	 * Returns current graphic variables as array.
-	 * @return array of graphic variables
-	 * @protected
-	 * @since 4.2.010 (2008-11-14)
-	 */
-	protected function getGraphicVars() {
-		$grapvars = array(
-			'FontFamily' => $this->FontFamily,
-			'FontStyle' => $this->FontStyle,
-			'FontSizePt' => $this->FontSizePt,
-			'rMargin' => $this->rMargin,
-			'lMargin' => $this->lMargin,
-			'cell_padding' => $this->cell_padding,
-			'cell_margin' => $this->cell_margin,
-			'LineWidth' => $this->LineWidth,
-			'linestyleWidth' => $this->linestyleWidth,
-			'linestyleCap' => $this->linestyleCap,
-			'linestyleJoin' => $this->linestyleJoin,
-			'linestyleDash' => $this->linestyleDash,
-			'textrendermode' => $this->textrendermode,
-			'textstrokewidth' => $this->textstrokewidth,
-			'DrawColor' => $this->DrawColor,
-			'FillColor' => $this->FillColor,
-			'TextColor' => $this->TextColor,
-			'ColorFlag' => $this->ColorFlag,
-			'bgcolor' => $this->bgcolor,
-			'fgcolor' => $this->fgcolor,
-			'htmlvspace' => $this->htmlvspace,
-			'listindent' => $this->listindent,
-			'listindentlevel' => $this->listindentlevel,
-			'listnum' => $this->listnum,
-			'listordered' => $this->listordered,
-			'listcount' => $this->listcount,
-			'lispacer' => $this->lispacer,
-			'cell_height_ratio' => $this->cell_height_ratio,
-			'font_stretching' => $this->font_stretching,
-			'font_spacing' => $this->font_spacing,
-			'alpha' => $this->alpha,
-			// extended
-			'lasth' => $this->lasth,
-			'tMargin' => $this->tMargin,
-			'bMargin' => $this->bMargin,
-			'AutoPageBreak' => $this->AutoPageBreak,
-			'PageBreakTrigger' => $this->PageBreakTrigger,
-			'x' => $this->x,
-			'y' => $this->y,
-			'w' => $this->w,
-			'h' => $this->h,
-			'wPt' => $this->wPt,
-			'hPt' => $this->hPt,
-			'fwPt' => $this->fwPt,
-			'fhPt' => $this->fhPt,
-			'page' => $this->page,
-			'current_column' => $this->current_column,
-			'num_columns' => $this->num_columns
-			);
-		return $grapvars;
-	}
-
-	/**
-	 * Set graphic variables.
-	 * @param $gvars (array) array of graphic variablesto restore
-	 * @param $extended (boolean) if true restore extended graphic variables
-	 * @protected
-	 * @since 4.2.010 (2008-11-14)
-	 */
-	protected function setGraphicVars($gvars, $extended=false) {
-		if ($this->state != 2) {
-			 return;
-		}
-		$this->FontFamily = $gvars['FontFamily'];
-		$this->FontStyle = $gvars['FontStyle'];
-		$this->FontSizePt = $gvars['FontSizePt'];
-		$this->rMargin = $gvars['rMargin'];
-		$this->lMargin = $gvars['lMargin'];
-		$this->cell_padding = $gvars['cell_padding'];
-		$this->cell_margin = $gvars['cell_margin'];
-		$this->LineWidth = $gvars['LineWidth'];
-		$this->linestyleWidth = $gvars['linestyleWidth'];
-		$this->linestyleCap = $gvars['linestyleCap'];
-		$this->linestyleJoin = $gvars['linestyleJoin'];
-		$this->linestyleDash = $gvars['linestyleDash'];
-		$this->textrendermode = $gvars['textrendermode'];
-		$this->textstrokewidth = $gvars['textstrokewidth'];
-		$this->DrawColor = $gvars['DrawColor'];
-		$this->FillColor = $gvars['FillColor'];
-		$this->TextColor = $gvars['TextColor'];
-		$this->ColorFlag = $gvars['ColorFlag'];
-		$this->bgcolor = $gvars['bgcolor'];
-		$this->fgcolor = $gvars['fgcolor'];
-		$this->htmlvspace = $gvars['htmlvspace'];
-		$this->listindent = $gvars['listindent'];
-		$this->listindentlevel = $gvars['listindentlevel'];
-		$this->listnum = $gvars['listnum'];
-		$this->listordered = $gvars['listordered'];
-		$this->listcount = $gvars['listcount'];
-		$this->lispacer = $gvars['lispacer'];
-		$this->cell_height_ratio = $gvars['cell_height_ratio'];
-		$this->font_stretching = $gvars['font_stretching'];
-		$this->font_spacing = $gvars['font_spacing'];
-		$this->alpha = $gvars['alpha'];
-		if ($extended) {
-			// restore extended values
-			$this->lasth = $gvars['lasth'];
-			$this->tMargin = $gvars['tMargin'];
-			$this->bMargin = $gvars['bMargin'];
-			$this->AutoPageBreak = $gvars['AutoPageBreak'];
-			$this->PageBreakTrigger = $gvars['PageBreakTrigger'];
-			$this->x = $gvars['x'];
-			$this->y = $gvars['y'];
-			$this->w = $gvars['w'];
-			$this->h = $gvars['h'];
-			$this->wPt = $gvars['wPt'];
-			$this->hPt = $gvars['hPt'];
-			$this->fwPt = $gvars['fwPt'];
-			$this->fhPt = $gvars['fhPt'];
-			$this->page = $gvars['page'];
-			$this->current_column = $gvars['current_column'];
-			$this->num_columns = $gvars['num_columns'];
-		}
-		$this->_out(''.$this->linestyleWidth.' '.$this->linestyleCap.' '.$this->linestyleJoin.' '.$this->linestyleDash.' '.$this->DrawColor.' '.$this->FillColor.'');
-		if (!TCPDF_STATIC::empty_string($this->FontFamily)) {
-			$this->SetFont($this->FontFamily, $this->FontStyle, $this->FontSizePt);
-		}
-	}
-
-	/**
-	 * Outputs the "save graphics state" operator 'q'
-	 * @protected
-	 */
-	protected function _outSaveGraphicsState() {
-		$this->_out('q');
-	}
-
-	/**
-	 * Outputs the "restore graphics state" operator 'Q'
-	 * @protected
-	 */
-	protected function _outRestoreGraphicsState() {
-		$this->_out('Q');
-	}
-
-	/**
-	 * Set buffer content (always append data).
-	 * @param $data (string) data
-	 * @protected
-	 * @since 4.5.000 (2009-01-02)
-	 */
-	protected function setBuffer($data) {
-		$this->bufferlen += strlen($data);
-		$this->buffer .= $data;
-	}
-
-	/**
-	 * Replace the buffer content
-	 * @param $data (string) data
-	 * @protected
-	 * @since 5.5.000 (2010-06-22)
-	 */
-	protected function replaceBuffer($data) {
-		$this->bufferlen = strlen($data);
-		$this->buffer = $data;
-	}
-
-	/**
-	 * Get buffer content.
-	 * @return string buffer content
-	 * @protected
-	 * @since 4.5.000 (2009-01-02)
-	 */
-	protected function getBuffer() {
-		return $this->buffer;
-	}
-
-	/**
-	 * Set page buffer content.
-	 * @param $page (int) page number
-	 * @param $data (string) page data
-	 * @param $append (boolean) if true append data, false replace.
-	 * @protected
-	 * @since 4.5.000 (2008-12-31)
-	 */
-	protected function setPageBuffer($page, $data, $append=false) {
-		if ($append) {
-			$this->pages[$page] .= $data;
-		} else {
-			$this->pages[$page] = $data;
-		}
-		if ($append AND isset($this->pagelen[$page])) {
-			$this->pagelen[$page] += strlen($data);
-		} else {
-			$this->pagelen[$page] = strlen($data);
-		}
-	}
-
-	/**
-	 * Get page buffer content.
-	 * @param $page (int) page number
-	 * @return string page buffer content or false in case of error
-	 * @protected
-	 * @since 4.5.000 (2008-12-31)
-	 */
-	protected function getPageBuffer($page) {
-		if (isset($this->pages[$page])) {
-			return $this->pages[$page];
-		}
-		return false;
-	}
-
-	/**
-	 * Set image buffer content.
-	 * @param $image (string) image key
-	 * @param $data (array) image data
-	 * @return int image index number
-	 * @protected
-	 * @since 4.5.000 (2008-12-31)
-	 */
-	protected function setImageBuffer($image, $data) {
-		if (($data['i'] = array_search($image, $this->imagekeys)) === FALSE) {
-			$this->imagekeys[$this->numimages] = $image;
-			$data['i'] = $this->numimages;
-			++$this->numimages;
-		}
-		$this->images[$image] = $data;
-		return $data['i'];
-	}
-
-	/**
-	 * Set image buffer content for a specified sub-key.
-	 * @param $image (string) image key
-	 * @param $key (string) image sub-key
-	 * @param $data (array) image data
-	 * @protected
-	 * @since 4.5.000 (2008-12-31)
-	 */
-	protected function setImageSubBuffer($image, $key, $data) {
-		if (!isset($this->images[$image])) {
-			$this->setImageBuffer($image, array());
-		}
-		$this->images[$image][$key] = $data;
-	}
-
-	/**
-	 * Get image buffer content.
-	 * @param $image (string) image key
-	 * @return string image buffer content or false in case of error
-	 * @protected
-	 * @since 4.5.000 (2008-12-31)
-	 */
-	protected function getImageBuffer($image) {
-		if (isset($this->images[$image])) {
-			return $this->images[$image];
-		}
-		return false;
-	}
-
-	/**
-	 * Set font buffer content.
-	 * @param $font (string) font key
-	 * @param $data (array) font data
-	 * @protected
-	 * @since 4.5.000 (2009-01-02)
-	 */
-	protected function setFontBuffer($font, $data) {
-		$this->fonts[$font] = $data;
-		if (!in_array($font, $this->fontkeys)) {
-			$this->fontkeys[] = $font;
-			// store object ID for current font
-			++$this->n;
-			$this->font_obj_ids[$font] = $this->n;
-			$this->setFontSubBuffer($font, 'n', $this->n);
-		}
-	}
-
-	/**
-	 * Set font buffer content.
-	 * @param $font (string) font key
-	 * @param $key (string) font sub-key
-	 * @param $data (array) font data
-	 * @protected
-	 * @since 4.5.000 (2009-01-02)
-	 */
-	protected function setFontSubBuffer($font, $key, $data) {
-		if (!isset($this->fonts[$font])) {
-			$this->setFontBuffer($font, array());
-		}
-		$this->fonts[$font][$key] = $data;
-	}
-
-	/**
-	 * Get font buffer content.
-	 * @param $font (string) font key
-	 * @return string font buffer content or false in case of error
-	 * @protected
-	 * @since 4.5.000 (2009-01-02)
-	 */
-	protected function getFontBuffer($font) {
-		if (isset($this->fonts[$font])) {
-			return $this->fonts[$font];
-		}
-		return false;
-	}
-
-	/**
-	 * Move a page to a previous position.
-	 * @param $frompage (int) number of the source page
-	 * @param $topage (int) number of the destination page (must be less than $frompage)
-	 * @return true in case of success, false in case of error.
-	 * @public
-	 * @since 4.5.000 (2009-01-02)
-	 */
-	public function movePage($frompage, $topage) {
-		if (($frompage > $this->numpages) OR ($frompage <= $topage)) {
-			return false;
-		}
-		if ($frompage == $this->page) {
-			// close the page before moving it
-			$this->endPage();
-		}
-		// move all page-related states
-		$tmppage = $this->getPageBuffer($frompage);
-		$tmppagedim = $this->pagedim[$frompage];
-		$tmppagelen = $this->pagelen[$frompage];
-		$tmpintmrk = $this->intmrk[$frompage];
-		$tmpbordermrk = $this->bordermrk[$frompage];
-		$tmpcntmrk = $this->cntmrk[$frompage];
-		$tmppageobjects = $this->pageobjects[$frompage];
-		if (isset($this->footerpos[$frompage])) {
-			$tmpfooterpos = $this->footerpos[$frompage];
-		}
-		if (isset($this->footerlen[$frompage])) {
-			$tmpfooterlen = $this->footerlen[$frompage];
-		}
-		if (isset($this->transfmrk[$frompage])) {
-			$tmptransfmrk = $this->transfmrk[$frompage];
-		}
-		if (isset($this->PageAnnots[$frompage])) {
-			$tmpannots = $this->PageAnnots[$frompage];
-		}
-		if (isset($this->newpagegroup) AND !empty($this->newpagegroup)) {
-			for ($i = $frompage; $i > $topage; --$i) {
-				if (isset($this->newpagegroup[$i]) AND (($i + $this->pagegroups[$this->newpagegroup[$i]]) > $frompage)) {
-					--$this->pagegroups[$this->newpagegroup[$i]];
-					break;
-				}
-			}
-			for ($i = $topage; $i > 0; --$i) {
-				if (isset($this->newpagegroup[$i]) AND (($i + $this->pagegroups[$this->newpagegroup[$i]]) > $topage)) {
-					++$this->pagegroups[$this->newpagegroup[$i]];
-					break;
-				}
-			}
-		}
-		for ($i = $frompage; $i > $topage; --$i) {
-			$j = $i - 1;
-			// shift pages down
-			$this->setPageBuffer($i, $this->getPageBuffer($j));
-			$this->pagedim[$i] = $this->pagedim[$j];
-			$this->pagelen[$i] = $this->pagelen[$j];
-			$this->intmrk[$i] = $this->intmrk[$j];
-			$this->bordermrk[$i] = $this->bordermrk[$j];
-			$this->cntmrk[$i] = $this->cntmrk[$j];
-			$this->pageobjects[$i] = $this->pageobjects[$j];
-			if (isset($this->footerpos[$j])) {
-				$this->footerpos[$i] = $this->footerpos[$j];
-			} elseif (isset($this->footerpos[$i])) {
-				unset($this->footerpos[$i]);
-			}
-			if (isset($this->footerlen[$j])) {
-				$this->footerlen[$i] = $this->footerlen[$j];
-			} elseif (isset($this->footerlen[$i])) {
-				unset($this->footerlen[$i]);
-			}
-			if (isset($this->transfmrk[$j])) {
-				$this->transfmrk[$i] = $this->transfmrk[$j];
-			} elseif (isset($this->transfmrk[$i])) {
-				unset($this->transfmrk[$i]);
-			}
-			if (isset($this->PageAnnots[$j])) {
-				$this->PageAnnots[$i] = $this->PageAnnots[$j];
-			} elseif (isset($this->PageAnnots[$i])) {
-				unset($this->PageAnnots[$i]);
-			}
-			if (isset($this->newpagegroup[$j])) {
-				$this->newpagegroup[$i] = $this->newpagegroup[$j];
-				unset($this->newpagegroup[$j]);
-			}
-			if ($this->currpagegroup == $j) {
-				$this->currpagegroup = $i;
-			}
-		}
-		$this->setPageBuffer($topage, $tmppage);
-		$this->pagedim[$topage] = $tmppagedim;
-		$this->pagelen[$topage] = $tmppagelen;
-		$this->intmrk[$topage] = $tmpintmrk;
-		$this->bordermrk[$topage] = $tmpbordermrk;
-		$this->cntmrk[$topage] = $tmpcntmrk;
-		$this->pageobjects[$topage] = $tmppageobjects;
-		if (isset($tmpfooterpos)) {
-			$this->footerpos[$topage] = $tmpfooterpos;
-		} elseif (isset($this->footerpos[$topage])) {
-			unset($this->footerpos[$topage]);
-		}
-		if (isset($tmpfooterlen)) {
-			$this->footerlen[$topage] = $tmpfooterlen;
-		} elseif (isset($this->footerlen[$topage])) {
-			unset($this->footerlen[$topage]);
-		}
-		if (isset($tmptransfmrk)) {
-			$this->transfmrk[$topage] = $tmptransfmrk;
-		} elseif (isset($this->transfmrk[$topage])) {
-			unset($this->transfmrk[$topage]);
-		}
-		if (isset($tmpannots)) {
-			$this->PageAnnots[$topage] = $tmpannots;
-		} elseif (isset($this->PageAnnots[$topage])) {
-			unset($this->PageAnnots[$topage]);
-		}
-		// adjust outlines
-		$tmpoutlines = $this->outlines;
-		foreach ($tmpoutlines as $key => $outline) {
-			if (!$outline['f']) {
-				if (($outline['p'] >= $topage) AND ($outline['p'] < $frompage)) {
-					$this->outlines[$key]['p'] = ($outline['p'] + 1);
-				} elseif ($outline['p'] == $frompage) {
-					$this->outlines[$key]['p'] = $topage;
-				}
-			}
-		}
-		// adjust dests
-		$tmpdests = $this->dests;
-		foreach ($tmpdests as $key => $dest) {
-			if (!$dest['f']) {
-				if (($dest['p'] >= $topage) AND ($dest['p'] < $frompage)) {
-					$this->dests[$key]['p'] = ($dest['p'] + 1);
-				} elseif ($dest['p'] == $frompage) {
-					$this->dests[$key]['p'] = $topage;
-				}
-			}
-		}
-		// adjust links
-		$tmplinks = $this->links;
-		foreach ($tmplinks as $key => $link) {
-			if (!$link['f']) {
-				if (($link['p'] >= $topage) AND ($link['p'] < $frompage)) {
-					$this->links[$key]['p'] = ($link['p'] + 1);
-				} elseif ($link['p'] == $frompage) {
-					$this->links[$key]['p'] = $topage;
-				}
-			}
-		}
-		// adjust javascript
-		$jfrompage = $frompage;
-		$jtopage = $topage;
-		if (preg_match_all('/this\.addField\(\'([^\']*)\',\'([^\']*)\',([0-9]+)/', $this->javascript, $pamatch) > 0) {
-			foreach($pamatch[0] as $pk => $pmatch) {
-				$pagenum = intval($pamatch[3][$pk]) + 1;
-				if (($pagenum >= $jtopage) AND ($pagenum < $jfrompage)) {
-					$newpage = ($pagenum + 1);
-				} elseif ($pagenum == $jfrompage) {
-					$newpage = $jtopage;
-				} else {
-					$newpage = $pagenum;
-				}
-				--$newpage;
-				$newjs = "this.addField(\'".$pamatch[1][$pk]."\',\'".$pamatch[2][$pk]."\',".$newpage;
-				$this->javascript = str_replace($pmatch, $newjs, $this->javascript);
-			}
-			unset($pamatch);
-		}
-		// return to last page
-		$this->lastPage(true);
-		return true;
-	}
-
-	/**
-	 * Remove the specified page.
-	 * @param $page (int) page to remove
-	 * @return true in case of success, false in case of error.
-	 * @public
-	 * @since 4.6.004 (2009-04-23)
-	 */
-	public function deletePage($page) {
-		if (($page < 1) OR ($page > $this->numpages)) {
-			return false;
-		}
-		// delete current page
-		unset($this->pages[$page]);
-		unset($this->pagedim[$page]);
-		unset($this->pagelen[$page]);
-		unset($this->intmrk[$page]);
-		unset($this->bordermrk[$page]);
-		unset($this->cntmrk[$page]);
-		foreach ($this->pageobjects[$page] as $oid) {
-			if (isset($this->offsets[$oid])){
-				unset($this->offsets[$oid]);
-			}
-		}
-		unset($this->pageobjects[$page]);
-		if (isset($this->footerpos[$page])) {
-			unset($this->footerpos[$page]);
-		}
-		if (isset($this->footerlen[$page])) {
-			unset($this->footerlen[$page]);
-		}
-		if (isset($this->transfmrk[$page])) {
-			unset($this->transfmrk[$page]);
-		}
-		if (isset($this->PageAnnots[$page])) {
-			unset($this->PageAnnots[$page]);
-		}
-		if (isset($this->newpagegroup) AND !empty($this->newpagegroup)) {
-			for ($i = $page; $i > 0; --$i) {
-				if (isset($this->newpagegroup[$i]) AND (($i + $this->pagegroups[$this->newpagegroup[$i]]) > $page)) {
-					--$this->pagegroups[$this->newpagegroup[$i]];
-					break;
-				}
-			}
-		}
-		if (isset($this->pageopen[$page])) {
-			unset($this->pageopen[$page]);
-		}
-		if ($page < $this->numpages) {
-			// update remaining pages
-			for ($i = $page; $i < $this->numpages; ++$i) {
-				$j = $i + 1;
-				// shift pages
-				$this->setPageBuffer($i, $this->getPageBuffer($j));
-				$this->pagedim[$i] = $this->pagedim[$j];
-				$this->pagelen[$i] = $this->pagelen[$j];
-				$this->intmrk[$i] = $this->intmrk[$j];
-				$this->bordermrk[$i] = $this->bordermrk[$j];
-				$this->cntmrk[$i] = $this->cntmrk[$j];
-				$this->pageobjects[$i] = $this->pageobjects[$j];
-				if (isset($this->footerpos[$j])) {
-					$this->footerpos[$i] = $this->footerpos[$j];
-				} elseif (isset($this->footerpos[$i])) {
-					unset($this->footerpos[$i]);
-				}
-				if (isset($this->footerlen[$j])) {
-					$this->footerlen[$i] = $this->footerlen[$j];
-				} elseif (isset($this->footerlen[$i])) {
-					unset($this->footerlen[$i]);
-				}
-				if (isset($this->transfmrk[$j])) {
-					$this->transfmrk[$i] = $this->transfmrk[$j];
-				} elseif (isset($this->transfmrk[$i])) {
-					unset($this->transfmrk[$i]);
-				}
-				if (isset($this->PageAnnots[$j])) {
-					$this->PageAnnots[$i] = $this->PageAnnots[$j];
-				} elseif (isset($this->PageAnnots[$i])) {
-					unset($this->PageAnnots[$i]);
-				}
-				if (isset($this->newpagegroup[$j])) {
-					$this->newpagegroup[$i] = $this->newpagegroup[$j];
-					unset($this->newpagegroup[$j]);
-				}
-				if ($this->currpagegroup == $j) {
-					$this->currpagegroup = $i;
-				}
-				if (isset($this->pageopen[$j])) {
-					$this->pageopen[$i] = $this->pageopen[$j];
-				} elseif (isset($this->pageopen[$i])) {
-					unset($this->pageopen[$i]);
-				}
-			}
-			// remove last page
-			unset($this->pages[$this->numpages]);
-			unset($this->pagedim[$this->numpages]);
-			unset($this->pagelen[$this->numpages]);
-			unset($this->intmrk[$this->numpages]);
-			unset($this->bordermrk[$this->numpages]);
-			unset($this->cntmrk[$this->numpages]);
-			foreach ($this->pageobjects[$this->numpages] as $oid) {
-				if (isset($this->offsets[$oid])){
-					unset($this->offsets[$oid]);
-				}
-			}
-			unset($this->pageobjects[$this->numpages]);
-			if (isset($this->footerpos[$this->numpages])) {
-				unset($this->footerpos[$this->numpages]);
-			}
-			if (isset($this->footerlen[$this->numpages])) {
-				unset($this->footerlen[$this->numpages]);
-			}
-			if (isset($this->transfmrk[$this->numpages])) {
-				unset($this->transfmrk[$this->numpages]);
-			}
-			if (isset($this->PageAnnots[$this->numpages])) {
-				unset($this->PageAnnots[$this->numpages]);
-			}
-			if (isset($this->newpagegroup[$this->numpages])) {
-				unset($this->newpagegroup[$this->numpages]);
-			}
-			if ($this->currpagegroup == $this->numpages) {
-				$this->currpagegroup = ($this->numpages - 1);
-			}
-			if (isset($this->pagegroups[$this->numpages])) {
-				unset($this->pagegroups[$this->numpages]);
-			}
-			if (isset($this->pageopen[$this->numpages])) {
-				unset($this->pageopen[$this->numpages]);
-			}
-		}
-		--$this->numpages;
-		$this->page = $this->numpages;
-		// adjust outlines
-		$tmpoutlines = $this->outlines;
-		foreach ($tmpoutlines as $key => $outline) {
-			if (!$outline['f']) {
-				if ($outline['p'] > $page) {
-					$this->outlines[$key]['p'] = $outline['p'] - 1;
-				} elseif ($outline['p'] == $page) {
-					unset($this->outlines[$key]);
-				}
-			}
-		}
-		// adjust dests
-		$tmpdests = $this->dests;
-		foreach ($tmpdests as $key => $dest) {
-			if (!$dest['f']) {
-				if ($dest['p'] > $page) {
-					$this->dests[$key]['p'] = $dest['p'] - 1;
-				} elseif ($dest['p'] == $page) {
-					unset($this->dests[$key]);
-				}
-			}
-		}
-		// adjust links
-		$tmplinks = $this->links;
-		foreach ($tmplinks as $key => $link) {
-			if (!$link['f']) {
-				if ($link['p'] > $page) {
-					$this->links[$key]['p'] = $link['p'] - 1;
-				} elseif ($link['p'] == $page) {
-					unset($this->links[$key]);
-				}
-			}
-		}
-		// adjust javascript
-		$jpage = $page;
-		if (preg_match_all('/this\.addField\(\'([^\']*)\',\'([^\']*)\',([0-9]+)/', $this->javascript, $pamatch) > 0) {
-			foreach($pamatch[0] as $pk => $pmatch) {
-				$pagenum = intval($pamatch[3][$pk]) + 1;
-				if ($pagenum >= $jpage) {
-					$newpage = ($pagenum - 1);
-				} elseif ($pagenum == $jpage) {
-					$newpage = 1;
-				} else {
-					$newpage = $pagenum;
-				}
-				--$newpage;
-				$newjs = "this.addField(\'".$pamatch[1][$pk]."\',\'".$pamatch[2][$pk]."\',".$newpage;
-				$this->javascript = str_replace($pmatch, $newjs, $this->javascript);
-			}
-			unset($pamatch);
-		}
-		// return to last page
-		if ($this->numpages > 0) {
-			$this->lastPage(true);
-		}
-		return true;
-	}
-
-	/**
-	 * Clone the specified page to a new page.
-	 * @param $page (int) number of page to copy (0 = current page)
-	 * @return true in case of success, false in case of error.
-	 * @public
-	 * @since 4.9.015 (2010-04-20)
-	 */
-	public function copyPage($page=0) {
-		if ($page == 0) {
-			// default value
-			$page = $this->page;
-		}
-		if (($page < 1) OR ($page > $this->numpages)) {
-			return false;
-		}
-		// close the last page
-		$this->endPage();
-		// copy all page-related states
-		++$this->numpages;
-		$this->page = $this->numpages;
-		$this->setPageBuffer($this->page, $this->getPageBuffer($page));
-		$this->pagedim[$this->page] = $this->pagedim[$page];
-		$this->pagelen[$this->page] = $this->pagelen[$page];
-		$this->intmrk[$this->page] = $this->intmrk[$page];
-		$this->bordermrk[$this->page] = $this->bordermrk[$page];
-		$this->cntmrk[$this->page] = $this->cntmrk[$page];
-		$this->pageobjects[$this->page] = $this->pageobjects[$page];
-		$this->pageopen[$this->page] = false;
-		if (isset($this->footerpos[$page])) {
-			$this->footerpos[$this->page] = $this->footerpos[$page];
-		}
-		if (isset($this->footerlen[$page])) {
-			$this->footerlen[$this->page] = $this->footerlen[$page];
-		}
-		if (isset($this->transfmrk[$page])) {
-			$this->transfmrk[$this->page] = $this->transfmrk[$page];
-		}
-		if (isset($this->PageAnnots[$page])) {
-			$this->PageAnnots[$this->page] = $this->PageAnnots[$page];
-		}
-		if (isset($this->newpagegroup[$page])) {
-			// start a new group
-			$this->newpagegroup[$this->page] = sizeof($this->newpagegroup) + 1;
-			$this->currpagegroup = $this->newpagegroup[$this->page];
-			$this->pagegroups[$this->currpagegroup] = 1;
-		} elseif (isset($this->currpagegroup) AND ($this->currpagegroup > 0)) {
-			++$this->pagegroups[$this->currpagegroup];
-		}
-		// copy outlines
-		$tmpoutlines = $this->outlines;
-		foreach ($tmpoutlines as $key => $outline) {
-			if ($outline['p'] == $page) {
-				$this->outlines[] = array('t' => $outline['t'], 'l' => $outline['l'], 'x' => $outline['x'], 'y' => $outline['y'], 'p' => $this->page, 'f' => $outline['f'], 's' => $outline['s'], 'c' => $outline['c']);
-			}
-		}
-		// copy links
-		$tmplinks = $this->links;
-		foreach ($tmplinks as $key => $link) {
-			if ($link['p'] == $page) {
-				$this->links[] = array('p' => $this->page, 'y' => $link['y'], 'f' => $link['f']);
-			}
-		}
-		// return to last page
-		$this->lastPage(true);
-		return true;
-	}
-
-	/**
-	 * Output a Table of Content Index (TOC).
-	 * This method must be called after all Bookmarks were set.
-	 * Before calling this method you have to open the page using the addTOCPage() method.
-	 * After calling this method you have to call endTOCPage() to close the TOC page.
-	 * You can override this method to achieve different styles.
-	 * @param $page (int) page number where this TOC should be inserted (leave empty for current page).
-	 * @param $numbersfont (string) set the font for page numbers (please use monospaced font for better alignment).
-	 * @param $filler (string) string used to fill the space between text and page number.
-	 * @param $toc_name (string) name to use for TOC bookmark.
-	 * @param $style (string) Font style for title: B = Bold, I = Italic, BI = Bold + Italic.
-	 * @param $color (array) RGB color array for bookmark title (values from 0 to 255).
-	 * @public
-	 * @author Nicola Asuni
-	 * @since 4.5.000 (2009-01-02)
-	 * @see addTOCPage(), endTOCPage(), addHTMLTOC()
-	 */
-	public function addTOC($page='', $numbersfont='', $filler='.', $toc_name='TOC', $style='', $color=array(0,0,0)) {
-		$fontsize = $this->FontSizePt;
-		$fontfamily = $this->FontFamily;
-		$fontstyle = $this->FontStyle;
-		$w = $this->w - $this->lMargin - $this->rMargin;
-		$spacer = $this->GetStringWidth(chr(32)) * 4;
-		$lmargin = $this->lMargin;
-		$rmargin = $this->rMargin;
-		$x_start = $this->GetX();
-		$page_first = $this->page;
-		$current_page = $this->page;
-		$page_fill_start = false;
-		$page_fill_end = false;
-		$current_column = $this->current_column;
-		if (TCPDF_STATIC::empty_string($numbersfont)) {
-			$numbersfont = $this->default_monospaced_font;
-		}
-		if (TCPDF_STATIC::empty_string($filler)) {
-			$filler = ' ';
-		}
-		if (TCPDF_STATIC::empty_string($page)) {
-			$gap = ' ';
-		} else {
-			$gap = '';
-			if ($page < 1) {
-				$page = 1;
-			}
-		}
-		$this->SetFont($numbersfont, $fontstyle, $fontsize);
-		$numwidth = $this->GetStringWidth('00000');
-		$maxpage = 0; //used for pages on attached documents
-		foreach ($this->outlines as $key => $outline) {
-			// check for extra pages (used for attachments)
-			if (($this->page > $page_first) AND ($outline['p'] >= $this->numpages)) {
-				$outline['p'] += ($this->page - $page_first);
-			}
-			if ($this->rtl) {
-				$aligntext = 'R';
-				$alignnum = 'L';
-			} else {
-				$aligntext = 'L';
-				$alignnum = 'R';
-			}
-			if ($outline['l'] == 0) {
-				$this->SetFont($fontfamily, $outline['s'].'B', $fontsize);
-			} else {
-				$this->SetFont($fontfamily, $outline['s'], $fontsize - $outline['l']);
-			}
-			$this->SetTextColorArray($outline['c']);
-			// check for page break
-			$this->checkPageBreak(2 * $this->getCellHeight($this->FontSize));
-			// set margins and X position
-			if (($this->page == $current_page) AND ($this->current_column == $current_column)) {
-				$this->lMargin = $lmargin;
-				$this->rMargin = $rmargin;
-			} else {
-				if ($this->current_column != $current_column) {
-					if ($this->rtl) {
-						$x_start = $this->w - $this->columns[$this->current_column]['x'];
-					} else {
-						$x_start = $this->columns[$this->current_column]['x'];
-					}
-				}
-				$lmargin = $this->lMargin;
-				$rmargin = $this->rMargin;
-				$current_page = $this->page;
-				$current_column = $this->current_column;
-			}
-			$this->SetX($x_start);
-			$indent = ($spacer * $outline['l']);
-			if ($this->rtl) {
-				$this->x -= $indent;
-				$this->rMargin = $this->w - $this->x;
-			} else {
-				$this->x += $indent;
-				$this->lMargin = $this->x;
-			}
-			$link = $this->AddLink();
-			$this->SetLink($link, $outline['y'], $outline['p']);
-			// write the text
-			if ($this->rtl) {
-				$txt = ' '.$outline['t'];
-			} else {
-				$txt = $outline['t'].' ';
-			}
-			$this->Write(0, $txt, $link, false, $aligntext, false, 0, false, false, 0, $numwidth, '');
-			if ($this->rtl) {
-				$tw = $this->x - $this->lMargin;
-			} else {
-				$tw = $this->w - $this->rMargin - $this->x;
-			}
-			$this->SetFont($numbersfont, $fontstyle, $fontsize);
-			if (TCPDF_STATIC::empty_string($page)) {
-				$pagenum = $outline['p'];
-			} else {
-				// placemark to be replaced with the correct number
-				$pagenum = '{#'.($outline['p']).'}';
-				if ($this->isUnicodeFont()) {
-					$pagenum = '{'.$pagenum.'}';
-				}
-				$maxpage = max($maxpage, $outline['p']);
-			}
-			$fw = ($tw - $this->GetStringWidth($pagenum.$filler));
-			$wfiller = $this->GetStringWidth($filler);
-			if ($wfiller > 0) {
-				$numfills = floor($fw / $wfiller);
-			} else {
-				$numfills = 0;
-			}
-			if ($numfills > 0) {
-				$rowfill = str_repeat($filler, $numfills);
-			} else {
-				$rowfill = '';
-			}
-			if ($this->rtl) {
-				$pagenum = $pagenum.$gap.$rowfill;
-			} else {
-				$pagenum = $rowfill.$gap.$pagenum;
-			}
-			// write the number
-			$this->Cell($tw, 0, $pagenum, 0, 1, $alignnum, 0, $link, 0);
-		}
-		$page_last = $this->getPage();
-		$numpages = ($page_last - $page_first + 1);
-		// account for booklet mode
-		if ($this->booklet) {
-			// check if a blank page is required before TOC
-			$page_fill_start = ((($page_first % 2) == 0) XOR (($page % 2) == 0));
-			$page_fill_end = (!((($numpages % 2) == 0) XOR ($page_fill_start)));
-			if ($page_fill_start) {
-				// add a page at the end (to be moved before TOC)
-				$this->addPage();
-				++$page_last;
-				++$numpages;
-			}
-			if ($page_fill_end) {
-				// add a page at the end
-				$this->addPage();
-				++$page_last;
-				++$numpages;
-			}
-		}
-		$maxpage = max($maxpage, $page_last);
-		if (!TCPDF_STATIC::empty_string($page)) {
-			for ($p = $page_first; $p <= $page_last; ++$p) {
-				// get page data
-				$temppage = $this->getPageBuffer($p);
-				for ($n = 1; $n <= $maxpage; ++$n) {
-					// update page numbers
-					$a = '{#'.$n.'}';
-					// get page number aliases
-					$pnalias = $this->getInternalPageNumberAliases($a);
-					// calculate replacement number
-					if (($n >= $page) AND ($n <= $this->numpages)) {
-						$np = $n + $numpages;
-					} else {
-						$np = $n;
-					}
-					$na = TCPDF_STATIC::formatTOCPageNumber(($this->starting_page_number + $np - 1));
-					$nu = TCPDF_FONTS::UTF8ToUTF16BE($na, false, $this->isunicode, $this->CurrentFont);
-					// replace aliases with numbers
-					foreach ($pnalias['u'] as $u) {
-						$sfill = str_repeat($filler, max(0, (strlen($u) - strlen($nu.' '))));
-						if ($this->rtl) {
-							$nr = $nu.TCPDF_FONTS::UTF8ToUTF16BE(' '.$sfill, false, $this->isunicode, $this->CurrentFont);
-						} else {
-							$nr = TCPDF_FONTS::UTF8ToUTF16BE($sfill.' ', false, $this->isunicode, $this->CurrentFont).$nu;
-						}
-						$temppage = str_replace($u, $nr, $temppage);
-					}
-					foreach ($pnalias['a'] as $a) {
-						$sfill = str_repeat($filler, max(0, (strlen($a) - strlen($na.' '))));
-						if ($this->rtl) {
-							$nr = $na.' '.$sfill;
-						} else {
-							$nr = $sfill.' '.$na;
-						}
-						$temppage = str_replace($a, $nr, $temppage);
-					}
-				}
-				// save changes
-				$this->setPageBuffer($p, $temppage);
-			}
-			// move pages
-			$this->Bookmark($toc_name, 0, 0, $page_first, $style, $color);
-			if ($page_fill_start) {
-				$this->movePage($page_last, $page_first);
-			}
-			for ($i = 0; $i < $numpages; ++$i) {
-				$this->movePage($page_last, $page);
-			}
-		}
-	}
-
-	/**
-	 * Output a Table Of Content Index (TOC) using HTML templates.
-	 * This method must be called after all Bookmarks were set.
-	 * Before calling this method you have to open the page using the addTOCPage() method.
-	 * After calling this method you have to call endTOCPage() to close the TOC page.
-	 * @param $page (int) page number where this TOC should be inserted (leave empty for current page).
-	 * @param $toc_name (string) name to use for TOC bookmark.
-	 * @param $templates (array) array of html templates. Use: "#TOC_DESCRIPTION#" for bookmark title, "#TOC_PAGE_NUMBER#" for page number.
-	 * @param $correct_align (boolean) if true correct the number alignment (numbers must be in monospaced font like courier and right aligned on LTR, or left aligned on RTL)
-	 * @param $style (string) Font style for title: B = Bold, I = Italic, BI = Bold + Italic.
-	 * @param $color (array) RGB color array for title (values from 0 to 255).
-	 * @public
-	 * @author Nicola Asuni
-	 * @since 5.0.001 (2010-05-06)
-	 * @see addTOCPage(), endTOCPage(), addTOC()
-	 */
-	public function addHTMLTOC($page='', $toc_name='TOC', $templates=array(), $correct_align=true, $style='', $color=array(0,0,0)) {
-		$filler = ' ';
-		$prev_htmlLinkColorArray = $this->htmlLinkColorArray;
-		$prev_htmlLinkFontStyle = $this->htmlLinkFontStyle;
-		// set new style for link
-		$this->htmlLinkColorArray = array();
-		$this->htmlLinkFontStyle = '';
-		$page_first = $this->getPage();
-		$page_fill_start = false;
-		$page_fill_end = false;
-		// get the font type used for numbers in each template
-		$current_font = $this->FontFamily;
-		foreach ($templates as $level => $html) {
-			$dom = $this->getHtmlDomArray($html);
-			foreach ($dom as $key => $value) {
-				if ($value['value'] == '#TOC_PAGE_NUMBER#') {
-					$this->SetFont($dom[($key - 1)]['fontname']);
-					$templates['F'.$level] = $this->isUnicodeFont();
-				}
-			}
-		}
-		$this->SetFont($current_font);
-		$maxpage = 0; //used for pages on attached documents
-		foreach ($this->outlines as $key => $outline) {
-			// get HTML template
-			$row = $templates[$outline['l']];
-			if (TCPDF_STATIC::empty_string($page)) {
-				$pagenum = $outline['p'];
-			} else {
-				// placemark to be replaced with the correct number
-				$pagenum = '{#'.($outline['p']).'}';
-				if ($templates['F'.$outline['l']]) {
-					$pagenum = '{'.$pagenum.'}';
-				}
-				$maxpage = max($maxpage, $outline['p']);
-			}
-			// replace templates with current values
-			$row = str_replace('#TOC_DESCRIPTION#', $outline['t'], $row);
-			$row = str_replace('#TOC_PAGE_NUMBER#', $pagenum, $row);
-			// add link to page
-			$row = '<a href="#'.$outline['p'].','.$outline['y'].'">'.$row.'</a>';
-			// write bookmark entry
-			$this->writeHTML($row, false, false, true, false, '');
-		}
-		// restore link styles
-		$this->htmlLinkColorArray = $prev_htmlLinkColorArray;
-		$this->htmlLinkFontStyle = $prev_htmlLinkFontStyle;
-		// move TOC page and replace numbers
-		$page_last = $this->getPage();
-		$numpages = ($page_last - $page_first + 1);
-		// account for booklet mode
-		if ($this->booklet) {
-			// check if a blank page is required before TOC
-			$page_fill_start = ((($page_first % 2) == 0) XOR (($page % 2) == 0));
-			$page_fill_end = (!((($numpages % 2) == 0) XOR ($page_fill_start)));
-			if ($page_fill_start) {
-				// add a page at the end (to be moved before TOC)
-				$this->addPage();
-				++$page_last;
-				++$numpages;
-			}
-			if ($page_fill_end) {
-				// add a page at the end
-				$this->addPage();
-				++$page_last;
-				++$numpages;
-			}
-		}
-		$maxpage = max($maxpage, $page_last);
-		if (!TCPDF_STATIC::empty_string($page)) {
-			for ($p = $page_first; $p <= $page_last; ++$p) {
-				// get page data
-				$temppage = $this->getPageBuffer($p);
-				for ($n = 1; $n <= $maxpage; ++$n) {
-					// update page numbers
-					$a = '{#'.$n.'}';
-					// get page number aliases
-					$pnalias = $this->getInternalPageNumberAliases($a);
-					// calculate replacement number
-					if ($n >= $page) {
-						$np = $n + $numpages;
-					} else {
-						$np = $n;
-					}
-					$na = TCPDF_STATIC::formatTOCPageNumber(($this->starting_page_number + $np - 1));
-					$nu = TCPDF_FONTS::UTF8ToUTF16BE($na, false, $this->isunicode, $this->CurrentFont);
-					// replace aliases with numbers
-					foreach ($pnalias['u'] as $u) {
-						if ($correct_align) {
-							$sfill = str_repeat($filler, (strlen($u) - strlen($nu.' ')));
-							if ($this->rtl) {
-								$nr = $nu.TCPDF_FONTS::UTF8ToUTF16BE(' '.$sfill, false, $this->isunicode, $this->CurrentFont);
-							} else {
-								$nr = TCPDF_FONTS::UTF8ToUTF16BE($sfill.' ', false, $this->isunicode, $this->CurrentFont).$nu;
-							}
-						} else {
-							$nr = $nu;
-						}
-						$temppage = str_replace($u, $nr, $temppage);
-					}
-					foreach ($pnalias['a'] as $a) {
-						if ($correct_align) {
-							$sfill = str_repeat($filler, (strlen($a) - strlen($na.' ')));
-							if ($this->rtl) {
-								$nr = $na.' '.$sfill;
-							} else {
-								$nr = $sfill.' '.$na;
-							}
-						} else {
-							$nr = $na;
-						}
-						$temppage = str_replace($a, $nr, $temppage);
-					}
-				}
-				// save changes
-				$this->setPageBuffer($p, $temppage);
-			}
-			// move pages
-			$this->Bookmark($toc_name, 0, 0, $page_first, $style, $color);
-			if ($page_fill_start) {
-				$this->movePage($page_last, $page_first);
-			}
-			for ($i = 0; $i < $numpages; ++$i) {
-				$this->movePage($page_last, $page);
-			}
-		}
-	}
-
-	/**
-	 * Stores a copy of the current TCPDF object used for undo operation.
-	 * @public
-	 * @since 4.5.029 (2009-03-19)
-	 */
-	public function startTransaction() {
-		if (isset($this->objcopy)) {
-			// remove previous copy
-			$this->commitTransaction();
-		}
-		// record current page number and Y position
-		$this->start_transaction_page = $this->page;
-		$this->start_transaction_y = $this->y;
-		// clone current object
-		$this->objcopy = TCPDF_STATIC::objclone($this);
-	}
-
-	/**
-	 * Delete the copy of the current TCPDF object used for undo operation.
-	 * @public
-	 * @since 4.5.029 (2009-03-19)
-	 */
-	public function commitTransaction() {
-		if (isset($this->objcopy)) {
-			$this->objcopy->_destroy(true, true);
-			unset($this->objcopy);
-		}
-	}
-
-	/**
-	 * This method allows to undo the latest transaction by returning the latest saved TCPDF object with startTransaction().
-	 * @param $self (boolean) if true restores current class object to previous state without the need of reassignment via the returned value.
-	 * @return TCPDF object.
-	 * @public
-	 * @since 4.5.029 (2009-03-19)
-	 */
-	public function rollbackTransaction($self=false) {
-		if (isset($this->objcopy)) {
-			$this->_destroy(true, true);
-			if ($self) {
-				$objvars = get_object_vars($this->objcopy);
-				foreach ($objvars as $key => $value) {
-					$this->$key = $value;
-				}
-			}
-			return $this->objcopy;
-		}
-		return $this;
-	}
-
-	// --- MULTI COLUMNS METHODS -----------------------
-
-	/**
-	 * Set multiple columns of the same size
-	 * @param $numcols (int) number of columns (set to zero to disable columns mode)
-	 * @param $width (int) column width
-	 * @param $y (int) column starting Y position (leave empty for current Y position)
-	 * @public
-	 * @since 4.9.001 (2010-03-28)
-	 */
-	public function setEqualColumns($numcols=0, $width=0, $y='') {
-		$this->columns = array();
-		if ($numcols < 2) {
-			$numcols = 0;
-			$this->columns = array();
-		} else {
-			// maximum column width
-			$maxwidth = ($this->w - $this->original_lMargin - $this->original_rMargin) / $numcols;
-			if (($width == 0) OR ($width > $maxwidth)) {
-				$width = $maxwidth;
-			}
-			if (TCPDF_STATIC::empty_string($y)) {
-				$y = $this->y;
-			}
-			// space between columns
-			$space = (($this->w - $this->original_lMargin - $this->original_rMargin - ($numcols * $width)) / ($numcols - 1));
-			// fill the columns array (with, space, starting Y position)
-			for ($i = 0; $i < $numcols; ++$i) {
-				$this->columns[$i] = array('w' => $width, 's' => $space, 'y' => $y);
-			}
-		}
-		$this->num_columns = $numcols;
-		$this->current_column = 0;
-		$this->column_start_page = $this->page;
-		$this->selectColumn(0);
-	}
-
-	/**
-	 * Remove columns and reset page margins.
-	 * @public
-	 * @since 5.9.072 (2011-04-26)
-	 */
-	public function resetColumns() {
-		$this->lMargin = $this->original_lMargin;
-		$this->rMargin = $this->original_rMargin;
-		$this->setEqualColumns();
-	}
-
-	/**
-	 * Set columns array.
-	 * Each column is represented by an array of arrays with the following keys: (w = width, s = space between columns, y = column top position).
-	 * @param $columns (array)
-	 * @public
-	 * @since 4.9.001 (2010-03-28)
-	 */
-	public function setColumnsArray($columns) {
-		$this->columns = $columns;
-		$this->num_columns = count($columns);
-		$this->current_column = 0;
-		$this->column_start_page = $this->page;
-		$this->selectColumn(0);
-	}
-
-	/**
-	 * Set position at a given column
-	 * @param $col (int) column number (from 0 to getNumberOfColumns()-1); empty string = current column.
-	 * @public
-	 * @since 4.9.001 (2010-03-28)
-	 */
-	public function selectColumn($col='') {
-		if (is_string($col)) {
-			$col = $this->current_column;
-		} elseif ($col >= $this->num_columns) {
-			$col = 0;
-		}
-		$xshift = array('x' => 0, 's' => array('H' => 0, 'V' => 0), 'p' => array('L' => 0, 'T' => 0, 'R' => 0, 'B' => 0));
-		$enable_thead = false;
-		if ($this->num_columns > 1) {
-			if ($col != $this->current_column) {
-				// move Y pointer at the top of the column
-				if ($this->column_start_page == $this->page) {
-					$this->y = $this->columns[$col]['y'];
-				} else {
-					$this->y = $this->tMargin;
-				}
-				// Avoid to write table headers more than once
-				if (($this->page > $this->maxselcol['page']) OR (($this->page == $this->maxselcol['page']) AND ($col > $this->maxselcol['column']))) {
-					$enable_thead = true;
-					$this->maxselcol['page'] = $this->page;
-					$this->maxselcol['column'] = $col;
-				}
-			}
-			$xshift = $this->colxshift;
-			// set X position of the current column by case
-			$listindent = ($this->listindentlevel * $this->listindent);
-			// calculate column X position
-			$colpos = 0;
-			for ($i = 0; $i < $col; ++$i) {
-				$colpos += ($this->columns[$i]['w'] + $this->columns[$i]['s']);
-			}
-			if ($this->rtl) {
-				$x = $this->w - $this->original_rMargin - $colpos;
-				$this->rMargin = ($this->w - $x + $listindent);
-				$this->lMargin = ($x - $this->columns[$col]['w']);
-				$this->x = $x - $listindent;
-			} else {
-				$x = $this->original_lMargin + $colpos;
-				$this->lMargin = ($x + $listindent);
-				$this->rMargin = ($this->w - $x - $this->columns[$col]['w']);
-				$this->x = $x + $listindent;
-			}
-			$this->columns[$col]['x'] = $x;
-		}
-		$this->current_column = $col;
-		// fix for HTML mode
-		$this->newline = true;
-		// print HTML table header (if any)
-		if ((!TCPDF_STATIC::empty_string($this->thead)) AND (!$this->inthead)) {
-			if ($enable_thead) {
-				// print table header
-				$this->writeHTML($this->thead, false, false, false, false, '');
-				$this->y += $xshift['s']['V'];
-				// store end of header position
-				if (!isset($this->columns[$col]['th'])) {
-					$this->columns[$col]['th'] = array();
-				}
-				$this->columns[$col]['th']['\''.$this->page.'\''] = $this->y;
-				$this->lasth = 0;
-			} elseif (isset($this->columns[$col]['th']['\''.$this->page.'\''])) {
-				$this->y = $this->columns[$col]['th']['\''.$this->page.'\''];
-			}
-		}
-		// account for an html table cell over multiple columns
-		if ($this->rtl) {
-			$this->rMargin += $xshift['x'];
-			$this->x -= ($xshift['x'] + $xshift['p']['R']);
-		} else {
-			$this->lMargin += $xshift['x'];
-			$this->x += $xshift['x'] + $xshift['p']['L'];
-		}
-	}
-
-	/**
-	 * Return the current column number
-	 * @return int current column number
-	 * @public
-	 * @since 5.5.011 (2010-07-08)
-	 */
-	public function getColumn() {
-		return $this->current_column;
-	}
-
-	/**
-	 * Return the current number of columns.
-	 * @return int number of columns
-	 * @public
-	 * @since 5.8.018 (2010-08-25)
-	 */
-	public function getNumberOfColumns() {
-		return $this->num_columns;
-	}
-
-	/**
-	 * Set Text rendering mode.
-	 * @param $stroke (int) outline size in user units (0 = disable).
-	 * @param $fill (boolean) if true fills the text (default).
-	 * @param $clip (boolean) if true activate clipping mode
-	 * @public
-	 * @since 4.9.008 (2009-04-02)
-	 */
-	public function setTextRenderingMode($stroke=0, $fill=true, $clip=false) {
-		// Ref.: PDF 32000-1:2008 - 9.3.6 Text Rendering Mode
-		// convert text rendering parameters
-		if ($stroke < 0) {
-			$stroke = 0;
-		}
-		if ($fill === true) {
-			if ($stroke > 0) {
-				if ($clip === true) {
-					// Fill, then stroke text and add to path for clipping
-					$textrendermode = 6;
-				} else {
-					// Fill, then stroke text
-					$textrendermode = 2;
-				}
-				$textstrokewidth = $stroke;
-			} else {
-				if ($clip === true) {
-					// Fill text and add to path for clipping
-					$textrendermode = 4;
-				} else {
-					// Fill text
-					$textrendermode = 0;
-				}
-			}
-		} else {
-			if ($stroke > 0) {
-				if ($clip === true) {
-					// Stroke text and add to path for clipping
-					$textrendermode = 5;
-				} else {
-					// Stroke text
-					$textrendermode = 1;
-				}
-				$textstrokewidth = $stroke;
-			} else {
-				if ($clip === true) {
-					// Add text to path for clipping
-					$textrendermode = 7;
-				} else {
-					// Neither fill nor stroke text (invisible)
-					$textrendermode = 3;
-				}
-			}
-		}
-		$this->textrendermode = $textrendermode;
-		$this->textstrokewidth = $stroke;
-	}
-
-	/**
-	 * Set parameters for drop shadow effect for text.
-	 * @param $params (array) Array of parameters: enabled (boolean) set to true to enable shadow; depth_w (float) shadow width in user units; depth_h (float) shadow height in user units; color (array) shadow color or false to use the stroke color; opacity (float) Alpha value: real value from 0 (transparent) to 1 (opaque); blend_mode (string) blend mode, one of the following: Normal, Multiply, Screen, Overlay, Darken, Lighten, ColorDodge, ColorBurn, HardLight, SoftLight, Difference, Exclusion, Hue, Saturation, Color, Luminosity.
-	 * @since 5.9.174 (2012-07-25)
-	 * @public
-	*/
-	public function setTextShadow($params=array('enabled'=>false, 'depth_w'=>0, 'depth_h'=>0, 'color'=>false, 'opacity'=>1, 'blend_mode'=>'Normal')) {
-		if (isset($params['enabled'])) {
-			$this->txtshadow['enabled'] = $params['enabled']?true:false;
-		} else {
-			$this->txtshadow['enabled'] = false;
-		}
-		if (isset($params['depth_w'])) {
-			$this->txtshadow['depth_w'] = floatval($params['depth_w']);
-		} else {
-			$this->txtshadow['depth_w'] = 0;
-		}
-		if (isset($params['depth_h'])) {
-			$this->txtshadow['depth_h'] = floatval($params['depth_h']);
-		} else {
-			$this->txtshadow['depth_h'] = 0;
-		}
-		if (isset($params['color']) AND ($params['color'] !== false) AND is_array($params['color'])) {
-			$this->txtshadow['color'] = $params['color'];
-		} else {
-			$this->txtshadow['color'] = $this->strokecolor;
-		}
-		if (isset($params['opacity'])) {
-			$this->txtshadow['opacity'] = min(1, max(0, floatval($params['opacity'])));
-		} else {
-			$this->txtshadow['opacity'] = 1;
-		}
-		if (isset($params['blend_mode']) AND in_array($params['blend_mode'], array('Normal', 'Multiply', 'Screen', 'Overlay', 'Darken', 'Lighten', 'ColorDodge', 'ColorBurn', 'HardLight', 'SoftLight', 'Difference', 'Exclusion', 'Hue', 'Saturation', 'Color', 'Luminosity'))) {
-			$this->txtshadow['blend_mode'] = $params['blend_mode'];
-		} else {
-			$this->txtshadow['blend_mode'] = 'Normal';
-		}
-		if ((($this->txtshadow['depth_w'] == 0) AND ($this->txtshadow['depth_h'] == 0)) OR ($this->txtshadow['opacity'] == 0)) {
-			$this->txtshadow['enabled'] = false;
-		}
-	}
-
-	/**
-	 * Return the text shadow parameters array.
-	 * @return Array of parameters.
-	 * @since 5.9.174 (2012-07-25)
-	 * @public
-	 */
-	public function getTextShadow() {
-		return $this->txtshadow;
-	}
-
-	/**
-	 * Returns an array of chars containing soft hyphens.
-	 * @param $word (array) array of chars
-	 * @param $patterns (array) Array of hypenation patterns.
-	 * @param $dictionary (array) Array of words to be returned without applying the hyphenation algorithm.
-	 * @param $leftmin (int) Minimum number of character to leave on the left of the word without applying the hyphens.
-	 * @param $rightmin (int) Minimum number of character to leave on the right of the word without applying the hyphens.
-	 * @param $charmin (int) Minimum word length to apply the hyphenation algorithm.
-	 * @param $charmax (int) Maximum length of broken piece of word.
-	 * @return array text with soft hyphens
-	 * @author Nicola Asuni
-	 * @since 4.9.012 (2010-04-12)
-	 * @protected
-	 */
-	protected function hyphenateWord($word, $patterns, $dictionary=array(), $leftmin=1, $rightmin=2, $charmin=1, $charmax=8) {
-		$hyphenword = array(); // hyphens positions
-		$numchars = count($word);
-		if ($numchars <= $charmin) {
-			return $word;
-		}
-		$word_string = TCPDF_FONTS::UTF8ArrSubString($word, '', '', $this->isunicode);
-		// some words will be returned as-is
-		$pattern = '/^([a-zA-Z0-9_\.\-]+)@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([a-zA-Z0-9\-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$/';
-		if (preg_match($pattern, $word_string) > 0) {
-			// email
-			return $word;
-		}
-		$pattern = '/(([a-zA-Z0-9\-]+\.)?)((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([a-zA-Z0-9\-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$/';
-		if (preg_match($pattern, $word_string) > 0) {
-			// URL
-			return $word;
-		}
-		if (isset($dictionary[$word_string])) {
-			return TCPDF_FONTS::UTF8StringToArray($dictionary[$word_string], $this->isunicode, $this->CurrentFont);
-		}
-		// surround word with '_' characters
-		$tmpword = array_merge(array(46), $word, array(46));
-		$tmpnumchars = $numchars + 2;
-		$maxpos = $tmpnumchars - 1;
-		for ($pos = 0; $pos < $maxpos; ++$pos) {
-			$imax = min(($tmpnumchars - $pos), $charmax);
-			for ($i = 1; $i <= $imax; ++$i) {
-				$subword = strtolower(TCPDF_FONTS::UTF8ArrSubString($tmpword, $pos, ($pos + $i), $this->isunicode));
-				if (isset($patterns[$subword])) {
-					$pattern = TCPDF_FONTS::UTF8StringToArray($patterns[$subword], $this->isunicode, $this->CurrentFont);
-					$pattern_length = count($pattern);
-					$digits = 1;
-					for ($j = 0; $j < $pattern_length; ++$j) {
-						// check if $pattern[$j] is a number = hyphenation level (only numbers from 1 to 5 are valid)
-						if (($pattern[$j] >= 48) AND ($pattern[$j] <= 57)) {
-							if ($j == 0) {
-								$zero = $pos - 1;
-							} else {
-								$zero = $pos + $j - $digits;
-							}
-							// get hyphenation level
-							$level = ($pattern[$j] - 48);
-							// if two levels from two different patterns match at the same point, the higher one is selected.
-							if (!isset($hyphenword[$zero]) OR ($hyphenword[$zero] < $level)) {
-								$hyphenword[$zero] = $level;
-							}
-							++$digits;
-						}
-					}
-				}
-			}
-		}
-		$inserted = 0;
-		$maxpos = $numchars - $rightmin;
-		for ($i = $leftmin; $i <= $maxpos; ++$i) {
-			// only odd levels indicate allowed hyphenation points
-			if (isset($hyphenword[$i]) AND (($hyphenword[$i] % 2) != 0)) {
-				// 173 = soft hyphen character
-				array_splice($word, $i + $inserted, 0, 173);
-				++$inserted;
-			}
-		}
-		return $word;
-	}
-
-	/**
-	 * Returns text with soft hyphens.
-	 * @param $text (string) text to process
-	 * @param $patterns (mixed) Array of hypenation patterns or a TEX file containing hypenation patterns. TEX patterns can be downloaded from http://www.ctan.org/tex-archive/language/hyph-utf8/tex/generic/hyph-utf8/patterns/
-	 * @param $dictionary (array) Array of words to be returned without applying the hyphenation algorithm.
-	 * @param $leftmin (int) Minimum number of character to leave on the left of the word without applying the hyphens.
-	 * @param $rightmin (int) Minimum number of character to leave on the right of the word without applying the hyphens.
-	 * @param $charmin (int) Minimum word length to apply the hyphenation algorithm.
-	 * @param $charmax (int) Maximum length of broken piece of word.
-	 * @return array text with soft hyphens
-	 * @author Nicola Asuni
-	 * @since 4.9.012 (2010-04-12)
-	 * @public
-	 */
-	public function hyphenateText($text, $patterns, $dictionary=array(), $leftmin=1, $rightmin=2, $charmin=1, $charmax=8) {
-		$text = $this->unhtmlentities($text);
-		$word = array(); // last word
-		$txtarr = array(); // text to be returned
-		$intag = false; // true if we are inside an HTML tag
-		$skip = false; // true to skip hyphenation
-		if (!is_array($patterns)) {
-			$patterns = TCPDF_STATIC::getHyphenPatternsFromTEX($patterns);
-		}
-		// get array of characters
-		$unichars = TCPDF_FONTS::UTF8StringToArray($text, $this->isunicode, $this->CurrentFont);
-		// for each char
-		foreach ($unichars as $char) {
-			if ((!$intag) AND (!$skip) AND TCPDF_FONT_DATA::$uni_type[$char] == 'L') {
-				// letter character
-				$word[] = $char;
-			} else {
-				// other type of character
-				if (!TCPDF_STATIC::empty_string($word)) {
-					// hypenate the word
-					$txtarr = array_merge($txtarr, $this->hyphenateWord($word, $patterns, $dictionary, $leftmin, $rightmin, $charmin, $charmax));
-					$word = array();
-				}
-				$txtarr[] = $char;
-				if (chr($char) == '<') {
-					// we are inside an HTML tag
-					$intag = true;
-				} elseif ($intag AND (chr($char) == '>')) {
-					// end of HTML tag
-					$intag = false;
-					// check for style tag
-					$expected = array(115, 116, 121, 108, 101); // = 'style'
-					$current = array_slice($txtarr, -6, 5); // last 5 chars
-					$compare = array_diff($expected, $current);
-					if (empty($compare)) {
-						// check if it is a closing tag
-						$expected = array(47); // = '/'
-						$current = array_slice($txtarr, -7, 1);
-						$compare = array_diff($expected, $current);
-						if (empty($compare)) {
-							// closing style tag
-							$skip = false;
-						} else {
-							// opening style tag
-							$skip = true;
-						}
-					}
-				}
-			}
-		}
-		if (!TCPDF_STATIC::empty_string($word)) {
-			// hypenate the word
-			$txtarr = array_merge($txtarr, $this->hyphenateWord($word, $patterns, $dictionary, $leftmin, $rightmin, $charmin, $charmax));
-		}
-		// convert char array to string and return
-		return TCPDF_FONTS::UTF8ArrSubString($txtarr, '', '', $this->isunicode);
-	}
-
-	/**
-	 * Enable/disable rasterization of vector images using ImageMagick library.
-	 * @param $mode (boolean) if true enable rasterization, false otherwise.
-	 * @public
-	 * @since 5.0.000 (2010-04-27)
-	 */
-	public function setRasterizeVectorImages($mode) {
-		$this->rasterize_vector_images = $mode;
-	}
-
-	/**
-	 * Enable or disable default option for font subsetting.
-	 * @param $enable (boolean) if true enable font subsetting by default.
-	 * @author Nicola Asuni
-	 * @public
-	 * @since 5.3.002 (2010-06-07)
-	 */
-	public function setFontSubsetting($enable=true) {
-		if ($this->pdfa_mode) {
-			$this->font_subsetting = false;
-		} else {
-			$this->font_subsetting = $enable ? true : false;
-		}
-	}
-
-	/**
-	 * Return the default option for font subsetting.
-	 * @return boolean default font subsetting state.
-	 * @author Nicola Asuni
-	 * @public
-	 * @since 5.3.002 (2010-06-07)
-	 */
-	public function getFontSubsetting() {
-		return $this->font_subsetting;
-	}
-
-	/**
-	 * Left trim the input string
-	 * @param $str (string) string to trim
-	 * @param $replace (string) string that replace spaces.
-	 * @return left trimmed string
-	 * @author Nicola Asuni
-	 * @public
-	 * @since 5.8.000 (2010-08-11)
-	 */
-	public function stringLeftTrim($str, $replace='') {
-		return preg_replace('/^'.$this->re_space['p'].'+/'.$this->re_space['m'], $replace, $str);
-	}
-
-	/**
-	 * Right trim the input string
-	 * @param $str (string) string to trim
-	 * @param $replace (string) string that replace spaces.
-	 * @return right trimmed string
-	 * @author Nicola Asuni
-	 * @public
-	 * @since 5.8.000 (2010-08-11)
-	 */
-	public function stringRightTrim($str, $replace='') {
-		return preg_replace('/'.$this->re_space['p'].'+$/'.$this->re_space['m'], $replace, $str);
-	}
-
-	/**
-	 * Trim the input string
-	 * @param $str (string) string to trim
-	 * @param $replace (string) string that replace spaces.
-	 * @return trimmed string
-	 * @author Nicola Asuni
-	 * @public
-	 * @since 5.8.000 (2010-08-11)
-	 */
-	public function stringTrim($str, $replace='') {
-		$str = $this->stringLeftTrim($str, $replace);
-		$str = $this->stringRightTrim($str, $replace);
-		return $str;
-	}
-
-	/**
-	 * Return true if the current font is unicode type.
-	 * @return true for unicode font, false otherwise.
-	 * @author Nicola Asuni
-	 * @public
-	 * @since 5.8.002 (2010-08-14)
-	 */
-	public function isUnicodeFont() {
-		return (($this->CurrentFont['type'] == 'TrueTypeUnicode') OR ($this->CurrentFont['type'] == 'cidfont0'));
-	}
-
-	/**
-	 * Return normalized font name
-	 * @param $fontfamily (string) property string containing font family names
-	 * @return string normalized font name
-	 * @author Nicola Asuni
-	 * @public
-	 * @since 5.8.004 (2010-08-17)
-	 */
-	public function getFontFamilyName($fontfamily) {
-		// remove spaces and symbols
-		$fontfamily = preg_replace('/[^a-z0-9_\,]/', '', strtolower($fontfamily));
-		// extract all font names
-		$fontslist = preg_split('/[,]/', $fontfamily);
-		// find first valid font name
-		foreach ($fontslist as $font) {
-			// replace font variations
-			$font = preg_replace('/regular$/', '', $font);
-			$font = preg_replace('/italic$/', 'I', $font);
-			$font = preg_replace('/oblique$/', 'I', $font);
-			$font = preg_replace('/bold([I]?)$/', 'B\\1', $font);
-			// replace common family names and core fonts
-			$pattern = array();
-			$replacement = array();
-			$pattern[] = '/^serif|^cursive|^fantasy|^timesnewroman/';
-			$replacement[] = 'times';
-			$pattern[] = '/^sansserif/';
-			$replacement[] = 'helvetica';
-			$pattern[] = '/^monospace/';
-			$replacement[] = 'courier';
-			$font = preg_replace($pattern, $replacement, $font);
-			if (in_array(strtolower($font), $this->fontlist) OR in_array($font, $this->fontkeys)) {
-				return $font;
-			}
-		}
-		// return current font as default
-		return $this->CurrentFont['fontkey'];
-	}
-
-	/**
-	 * Start a new XObject Template.
-	 * An XObject Template is a PDF block that is a self-contained description of any sequence of graphics objects (including path objects, text objects, and sampled images).
-	 * An XObject Template may be painted multiple times, either on several pages or at several locations on the same page and produces the same results each time, subject only to the graphics state at the time it is invoked.
-	 * Note: X,Y coordinates will be reset to 0,0.
-	 * @param $w (int) Template width in user units (empty string or zero = page width less margins).
-	 * @param $h (int) Template height in user units (empty string or zero = page height less margins).
-	 * @param $group (mixed) Set transparency group. Can be a boolean value or an array specifying optional parameters: 'CS' (solour space name), 'I' (boolean flag to indicate isolated group) and 'K' (boolean flag to indicate knockout group).
-	 * @return int the XObject Template ID in case of success or false in case of error.
-	 * @author Nicola Asuni
-	 * @public
-	 * @since 5.8.017 (2010-08-24)
-	 * @see endTemplate(), printTemplate()
-	 */
-	public function startTemplate($w=0, $h=0, $group=false) {
-		if ($this->inxobj) {
-			// we are already inside an XObject template
-			return false;
-		}
-		$this->inxobj = true;
-		++$this->n;
-		// XObject ID
-		$this->xobjid = 'XT'.$this->n;
-		// object ID
-		$this->xobjects[$this->xobjid] = array('n' => $this->n);
-		// store current graphic state
-		$this->xobjects[$this->xobjid]['gvars'] = $this->getGraphicVars();
-		// initialize data
-		$this->xobjects[$this->xobjid]['intmrk'] = 0;
-		$this->xobjects[$this->xobjid]['transfmrk'] = array();
-		$this->xobjects[$this->xobjid]['outdata'] = '';
-		$this->xobjects[$this->xobjid]['xobjects'] = array();
-		$this->xobjects[$this->xobjid]['images'] = array();
-		$this->xobjects[$this->xobjid]['fonts'] = array();
-		$this->xobjects[$this->xobjid]['annotations'] = array();
-		$this->xobjects[$this->xobjid]['extgstates'] = array();
-		$this->xobjects[$this->xobjid]['gradients'] = array();
-		$this->xobjects[$this->xobjid]['spot_colors'] = array();
-		// set new environment
-		$this->num_columns = 1;
-		$this->current_column = 0;
-		$this->SetAutoPageBreak(false);
-		if (($w === '') OR ($w <= 0)) {
-			$w = $this->w - $this->lMargin - $this->rMargin;
-		}
-		if (($h === '') OR ($h <= 0)) {
-			$h = $this->h - $this->tMargin - $this->bMargin;
-		}
-		$this->xobjects[$this->xobjid]['x'] = 0;
-		$this->xobjects[$this->xobjid]['y'] = 0;
-		$this->xobjects[$this->xobjid]['w'] = $w;
-		$this->xobjects[$this->xobjid]['h'] = $h;
-		$this->w = $w;
-		$this->h = $h;
-		$this->wPt = $this->w * $this->k;
-		$this->hPt = $this->h * $this->k;
-		$this->fwPt = $this->wPt;
-		$this->fhPt = $this->hPt;
-		$this->x = 0;
-		$this->y = 0;
-		$this->lMargin = 0;
-		$this->rMargin = 0;
-		$this->tMargin = 0;
-		$this->bMargin = 0;
-		// set group mode
-		$this->xobjects[$this->xobjid]['group'] = $group;
-		return $this->xobjid;
-	}
-
-	/**
-	 * End the current XObject Template started with startTemplate() and restore the previous graphic state.
-	 * An XObject Template is a PDF block that is a self-contained description of any sequence of graphics objects (including path objects, text objects, and sampled images).
-	 * An XObject Template may be painted multiple times, either on several pages or at several locations on the same page and produces the same results each time, subject only to the graphics state at the time it is invoked.
-	 * @return int the XObject Template ID in case of success or false in case of error.
-	 * @author Nicola Asuni
-	 * @public
-	 * @since 5.8.017 (2010-08-24)
-	 * @see startTemplate(), printTemplate()
-	 */
-	public function endTemplate() {
-		if (!$this->inxobj) {
-			// we are not inside a template
-			return false;
-		}
-		$this->inxobj = false;
-		// restore previous graphic state
-		$this->setGraphicVars($this->xobjects[$this->xobjid]['gvars'], true);
-		return $this->xobjid;
-	}
-
-	/**
-	 * Print an XObject Template.
-	 * You can print an XObject Template inside the currently opened Template.
-	 * An XObject Template is a PDF block that is a self-contained description of any sequence of graphics objects (including path objects, text objects, and sampled images).
-	 * An XObject Template may be painted multiple times, either on several pages or at several locations on the same page and produces the same results each time, subject only to the graphics state at the time it is invoked.
-	 * @param $id (string) The ID of XObject Template to print.
-	 * @param $x (int) X position in user units (empty string = current x position)
-	 * @param $y (int) Y position in user units (empty string = current y position)
-	 * @param $w (int) Width in user units (zero = remaining page width)
-	 * @param $h (int) Height in user units (zero = remaining page height)
-	 * @param $align (string) Indicates the alignment of the pointer next to template insertion relative to template height. The value can be:<ul><li>T: top-right for LTR or top-left for RTL</li><li>M: middle-right for LTR or middle-left for RTL</li><li>B: bottom-right for LTR or bottom-left for RTL</li><li>N: next line</li></ul>
-	 * @param $palign (string) Allows to center or align the template on the current line. Possible values are:<ul><li>L : left align</li><li>C : center</li><li>R : right align</li><li>'' : empty string : left for LTR or right for RTL</li></ul>
-	 * @param $fitonpage (boolean) If true the template is resized to not exceed page dimensions.
-	 * @author Nicola Asuni
-	 * @public
-	 * @since 5.8.017 (2010-08-24)
-	 * @see startTemplate(), endTemplate()
-	 */
-	public function printTemplate($id, $x='', $y='', $w=0, $h=0, $align='', $palign='', $fitonpage=false) {
-		if ($this->state != 2) {
-			 return;
-		}
-		if (!isset($this->xobjects[$id])) {
-			$this->Error('The XObject Template \''.$id.'\' doesn\'t exist!');
-		}
-		if ($this->inxobj) {
-			if ($id == $this->xobjid) {
-				// close current template
-				$this->endTemplate();
-			} else {
-				// use the template as resource for the template currently opened
-				$this->xobjects[$this->xobjid]['xobjects'][$id] = $this->xobjects[$id];
-			}
-		}
-		// set default values
-		if ($x === '') {
-			$x = $this->x;
-		}
-		if ($y === '') {
-			$y = $this->y;
-		}
-		// check page for no-write regions and adapt page margins if necessary
-		list($x, $y) = $this->checkPageRegions($h, $x, $y);
-		$ow = $this->xobjects[$id]['w'];
-		if ($ow <= 0) {
-			$ow = 1;
-		}
-		$oh = $this->xobjects[$id]['h'];
-		if ($oh <= 0) {
-			$oh = 1;
-		}
-		// calculate template width and height on document
-		if (($w <= 0) AND ($h <= 0)) {
-			$w = $ow;
-			$h = $oh;
-		} elseif ($w <= 0) {
-			$w = $h * $ow / $oh;
-		} elseif ($h <= 0) {
-			$h = $w * $oh / $ow;
-		}
-		// fit the template on available space
-		list($w, $h, $x, $y) = $this->fitBlock($w, $h, $x, $y, $fitonpage);
-		// set page alignment
-		$rb_y = $y + $h;
-		// set alignment
-		if ($this->rtl) {
-			if ($palign == 'L') {
-				$xt = $this->lMargin;
-			} elseif ($palign == 'C') {
-				$xt = ($this->w + $this->lMargin - $this->rMargin - $w) / 2;
-			} elseif ($palign == 'R') {
-				$xt = $this->w - $this->rMargin - $w;
-			} else {
-				$xt = $x - $w;
-			}
-			$rb_x = $xt;
-		} else {
-			if ($palign == 'L') {
-				$xt = $this->lMargin;
-			} elseif ($palign == 'C') {
-				$xt = ($this->w + $this->lMargin - $this->rMargin - $w) / 2;
-			} elseif ($palign == 'R') {
-				$xt = $this->w - $this->rMargin - $w;
-			} else {
-				$xt = $x;
-			}
-			$rb_x = $xt + $w;
-		}
-		// print XObject Template + Transformation matrix
-		$this->StartTransform();
-		// translate and scale
-		$sx = ($w / $ow);
-		$sy = ($h / $oh);
-		$tm = array();
-		$tm[0] = $sx;
-		$tm[1] = 0;
-		$tm[2] = 0;
-		$tm[3] = $sy;
-		$tm[4] = $xt * $this->k;
-		$tm[5] = ($this->h - $h - $y) * $this->k;
-		$this->Transform($tm);
-		// set object
-		$this->_out('/'.$id.' Do');
-		$this->StopTransform();
-		// add annotations
-		if (!empty($this->xobjects[$id]['annotations'])) {
-			foreach ($this->xobjects[$id]['annotations'] as $annot) {
-				// transform original coordinates
-				$coordlt = TCPDF_STATIC::getTransformationMatrixProduct($tm, array(1, 0, 0, 1, ($annot['x'] * $this->k), (-$annot['y'] * $this->k)));
-				$ax = ($coordlt[4] / $this->k);
-				$ay = ($this->h - $h - ($coordlt[5] / $this->k));
-				$coordrb = TCPDF_STATIC::getTransformationMatrixProduct($tm, array(1, 0, 0, 1, (($annot['x'] + $annot['w']) * $this->k), ((-$annot['y'] - $annot['h']) * $this->k)));
-				$aw = ($coordrb[4] / $this->k) - $ax;
-				$ah = ($this->h - $h - ($coordrb[5] / $this->k)) - $ay;
-				$this->Annotation($ax, $ay, $aw, $ah, $annot['text'], $annot['opt'], $annot['spaces']);
-			}
-		}
-		// set pointer to align the next text/objects
-		switch($align) {
-			case 'T': {
-				$this->y = $y;
-				$this->x = $rb_x;
-				break;
-			}
-			case 'M': {
-				$this->y = $y + round($h/2);
-				$this->x = $rb_x;
-				break;
-			}
-			case 'B': {
-				$this->y = $rb_y;
-				$this->x = $rb_x;
-				break;
-			}
-			case 'N': {
-				$this->SetY($rb_y);
-				break;
-			}
-			default:{
-				break;
-			}
-		}
-	}
-
-	/**
-	 * Set the percentage of character stretching.
-	 * @param $perc (int) percentage of stretching (100 = no stretching)
-	 * @author Nicola Asuni
-	 * @public
-	 * @since 5.9.000 (2010-09-29)
-	 */
-	public function setFontStretching($perc=100) {
-		$this->font_stretching = $perc;
-	}
-
-	/**
-	 * Get the percentage of character stretching.
-	 * @return float stretching value
-	 * @author Nicola Asuni
-	 * @public
-	 * @since 5.9.000 (2010-09-29)
-	 */
-	public function getFontStretching() {
-		return $this->font_stretching;
-	}
-
-	/**
-	 * Set the amount to increase or decrease the space between characters in a text.
-	 * @param $spacing (float) amount to increase or decrease the space between characters in a text (0 = default spacing)
-	 * @author Nicola Asuni
-	 * @public
-	 * @since 5.9.000 (2010-09-29)
-	 */
-	public function setFontSpacing($spacing=0) {
-		$this->font_spacing = $spacing;
-	}
-
-	/**
-	 * Get the amount to increase or decrease the space between characters in a text.
-	 * @return int font spacing (tracking) value
-	 * @author Nicola Asuni
-	 * @public
-	 * @since 5.9.000 (2010-09-29)
-	 */
-	public function getFontSpacing() {
-		return $this->font_spacing;
-	}
-
-	/**
-	 * Return an array of no-write page regions
-	 * @return array of no-write page regions
-	 * @author Nicola Asuni
-	 * @public
-	 * @since 5.9.003 (2010-10-13)
-	 * @see setPageRegions(), addPageRegion()
-	 */
-	public function getPageRegions() {
-		return $this->page_regions;
-	}
-
-	/**
-	 * Set no-write regions on page.
-	 * A no-write region is a portion of the page with a rectangular or trapezium shape that will not be covered when writing text or html code.
-	 * A region is always aligned on the left or right side of the page ad is defined using a vertical segment.
-	 * You can set multiple regions for the same page.
-	 * @param $regions (array) array of no-write regions. For each region you can define an array as follow: ('page' => page number or empy for current page, 'xt' => X top, 'yt' => Y top, 'xb' => X bottom, 'yb' => Y bottom, 'side' => page side 'L' = left or 'R' = right). Omit this parameter to remove all regions.
-	 * @author Nicola Asuni
-	 * @public
-	 * @since 5.9.003 (2010-10-13)
-	 * @see addPageRegion(), getPageRegions()
-	 */
-	public function setPageRegions($regions=array()) {
-		// empty current regions array
-		$this->page_regions = array();
-		// add regions
-		foreach ($regions as $data) {
-			$this->addPageRegion($data);
-		}
-	}
-
-	/**
-	 * Add a single no-write region on selected page.
-	 * A no-write region is a portion of the page with a rectangular or trapezium shape that will not be covered when writing text or html code.
-	 * A region is always aligned on the left or right side of the page ad is defined using a vertical segment.
-	 * You can set multiple regions for the same page.
-	 * @param $region (array) array of a single no-write region array: ('page' => page number or empy for current page, 'xt' => X top, 'yt' => Y top, 'xb' => X bottom, 'yb' => Y bottom, 'side' => page side 'L' = left or 'R' = right).
-	 * @author Nicola Asuni
-	 * @public
-	 * @since 5.9.003 (2010-10-13)
-	 * @see setPageRegions(), getPageRegions()
-	 */
-	public function addPageRegion($region) {
-		if (!isset($region['page']) OR empty($region['page'])) {
-			$region['page'] = $this->page;
-		}
-		if (isset($region['xt']) AND isset($region['xb']) AND ($region['xt'] > 0) AND ($region['xb'] > 0)
-			AND isset($region['yt'])  AND isset($region['yb']) AND ($region['yt'] >= 0) AND ($region['yt'] < $region['yb'])
-			AND isset($region['side']) AND (($region['side'] == 'L') OR ($region['side'] == 'R'))) {
-			$this->page_regions[] = $region;
-		}
-	}
-
-	/**
-	 * Remove a single no-write region.
-	 * @param $key (int) region key
-	 * @author Nicola Asuni
-	 * @public
-	 * @since 5.9.003 (2010-10-13)
-	 * @see setPageRegions(), getPageRegions()
-	 */
-	public function removePageRegion($key) {
-		if (isset($this->page_regions[$key])) {
-			unset($this->page_regions[$key]);
-		}
-	}
-
-	/**
-	 * Check page for no-write regions and adapt current coordinates and page margins if necessary.
-	 * A no-write region is a portion of the page with a rectangular or trapezium shape that will not be covered when writing text or html code.
-	 * A region is always aligned on the left or right side of the page ad is defined using a vertical segment.
-	 * @param $h (float) height of the text/image/object to print in user units
-	 * @param $x (float) current X coordinate in user units
-	 * @param $y (float) current Y coordinate in user units
-	 * @return array($x, $y)
-	 * @author Nicola Asuni
-	 * @protected
-	 * @since 5.9.003 (2010-10-13)
-	 */
-	protected function checkPageRegions($h, $x, $y) {
-		// set default values
-		if ($x === '') {
-			$x = $this->x;
-		}
-		if ($y === '') {
-			$y = $this->y;
-		}
-		if (!$this->check_page_regions OR empty($this->page_regions)) {
-			// no page regions defined
-			return array($x, $y);
-		}
-		if (empty($h)) {
-			$h = $this->getCellHeight($this->FontSize);
-		}
-		// check for page break
-		if ($this->checkPageBreak($h, $y)) {
-			// the content will be printed on a new page
-			$x = $this->x;
-			$y = $this->y;
-		}
-		if ($this->num_columns > 1) {
-			if ($this->rtl) {
-				$this->lMargin = ($this->columns[$this->current_column]['x'] - $this->columns[$this->current_column]['w']);
-			} else {
-				$this->rMargin = ($this->w - $this->columns[$this->current_column]['x'] - $this->columns[$this->current_column]['w']);
-			}
-		} else {
-			if ($this->rtl) {
-				$this->lMargin = max($this->clMargin, $this->original_lMargin);
-			} else {
-				$this->rMargin = max($this->crMargin, $this->original_rMargin);
-			}
-		}
-		// adjust coordinates and page margins
-		foreach ($this->page_regions as $regid => $regdata) {
-			if ($regdata['page'] == $this->page) {
-				// check region boundaries
-				if (($y > ($regdata['yt'] - $h)) AND ($y <= $regdata['yb'])) {
-					// Y is inside the region
-					$minv = ($regdata['xb'] - $regdata['xt']) / ($regdata['yb'] - $regdata['yt']); // inverse of angular coefficient
-					$yt = max($y, $regdata['yt']);
-					$yb = min(($yt + $h), $regdata['yb']);
-					$xt = (($yt - $regdata['yt']) * $minv) + $regdata['xt'];
-					$xb = (($yb - $regdata['yt']) * $minv) + $regdata['xt'];
-					if ($regdata['side'] == 'L') { // left side
-						$new_margin = max($xt, $xb);
-						if ($this->lMargin < $new_margin) {
-							if ($this->rtl) {
-								// adjust left page margin
-								$this->lMargin = max(0, $new_margin);
-							}
-							if ($x < $new_margin) {
-								// adjust x position
-								$x = $new_margin;
-								if ($new_margin > ($this->w - $this->rMargin)) {
-									// adjust y position
-									$y = $regdata['yb'] - $h;
-								}
-							}
-						}
-					} elseif ($regdata['side'] == 'R') { // right side
-						$new_margin = min($xt, $xb);
-						if (($this->w - $this->rMargin) > $new_margin) {
-							if (!$this->rtl) {
-								// adjust right page margin
-								$this->rMargin = max(0, ($this->w - $new_margin));
-							}
-							if ($x > $new_margin) {
-								// adjust x position
-								$x = $new_margin;
-								if ($new_margin > $this->lMargin) {
-									// adjust y position
-									$y = $regdata['yb'] - $h;
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-		return array($x, $y);
-	}
-
-	// --- SVG METHODS ---------------------------------------------------------
-
-	/**
-	 * Embedd a Scalable Vector Graphics (SVG) image.
-	 * NOTE: SVG standard is not yet fully implemented, use the setRasterizeVectorImages() method to enable/disable rasterization of vector images using ImageMagick library.
-	 * @param $file (string) Name of the SVG file or a '@' character followed by the SVG data string.
-	 * @param $x (float) Abscissa of the upper-left corner.
-	 * @param $y (float) Ordinate of the upper-left corner.
-	 * @param $w (float) Width of the image in the page. If not specified or equal to zero, it is automatically calculated.
-	 * @param $h (float) Height of the image in the page. If not specified or equal to zero, it is automatically calculated.
-	 * @param $link (mixed) URL or identifier returned by AddLink().
-	 * @param $align (string) Indicates the alignment of the pointer next to image insertion relative to image height. The value can be:<ul><li>T: top-right for LTR or top-left for RTL</li><li>M: middle-right for LTR or middle-left for RTL</li><li>B: bottom-right for LTR or bottom-left for RTL</li><li>N: next line</li></ul> If the alignment is an empty string, then the pointer will be restored on the starting SVG position.
-	 * @param $palign (string) Allows to center or align the image on the current line. Possible values are:<ul><li>L : left align</li><li>C : center</li><li>R : right align</li><li>'' : empty string : left for LTR or right for RTL</li></ul>
-	 * @param $border (mixed) Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
-	 * @param $fitonpage (boolean) if true the image is resized to not exceed page dimensions.
-	 * @author Nicola Asuni
-	 * @since 5.0.000 (2010-05-02)
-	 * @public
-	 */
-	public function ImageSVG($file, $x='', $y='', $w=0, $h=0, $link='', $align='', $palign='', $border=0, $fitonpage=false) {
-		if ($this->state != 2) {
-			 return;
-		}
-		// reset SVG vars
-		$this->svggradients = array();
-		$this->svggradientid = 0;
-		$this->svgdefsmode = false;
-		$this->svgdefs = array();
-		$this->svgclipmode = false;
-		$this->svgclippaths = array();
-		$this->svgcliptm = array();
-		$this->svgclipid = 0;
-		$this->svgtext = '';
-		$this->svgtextmode = array();
-		if ($this->rasterize_vector_images AND ($w > 0) AND ($h > 0)) {
-			// convert SVG to raster image using GD or ImageMagick libraries
-			return $this->Image($file, $x, $y, $w, $h, 'SVG', $link, $align, true, 300, $palign, false, false, $border, false, false, false);
-		}
-		if ($file[0] === '@') { // image from string
-			$this->svgdir = '';
-			$svgdata = substr($file, 1);
-		} else { // SVG file
-			$this->svgdir = dirname($file);
-			$svgdata = TCPDF_STATIC::fileGetContents($file);
-		}
-		if ($svgdata === FALSE) {
-			$this->Error('SVG file not found: '.$file);
-		}
-		if ($x === '') {
-			$x = $this->x;
-		}
-		if ($y === '') {
-			$y = $this->y;
-		}
-		// check page for no-write regions and adapt page margins if necessary
-		list($x, $y) = $this->checkPageRegions($h, $x, $y);
-		$k = $this->k;
-		$ox = 0;
-		$oy = 0;
-		$ow = $w;
-		$oh = $h;
-		$aspect_ratio_align = 'xMidYMid';
-		$aspect_ratio_ms = 'meet';
-		$regs = array();
-		// get original image width and height
-		preg_match('/<svg([^\>]*)>/si', $svgdata, $regs);
-		if (isset($regs[1]) AND !empty($regs[1])) {
-			$tmp = array();
-			if (preg_match('/[\s]+x[\s]*=[\s]*"([^"]*)"/si', $regs[1], $tmp)) {
-				$ox = $this->getHTMLUnitToUnits($tmp[1], 0, $this->svgunit, false);
-			}
-			$tmp = array();
-			if (preg_match('/[\s]+y[\s]*=[\s]*"([^"]*)"/si', $regs[1], $tmp)) {
-				$oy = $this->getHTMLUnitToUnits($tmp[1], 0, $this->svgunit, false);
-			}
-			$tmp = array();
-			if (preg_match('/[\s]+width[\s]*=[\s]*"([^"]*)"/si', $regs[1], $tmp)) {
-				$ow = $this->getHTMLUnitToUnits($tmp[1], 1, $this->svgunit, false);
-			}
-			$tmp = array();
-			if (preg_match('/[\s]+height[\s]*=[\s]*"([^"]*)"/si', $regs[1], $tmp)) {
-				$oh = $this->getHTMLUnitToUnits($tmp[1], 1, $this->svgunit, false);
-			}
-			$tmp = array();
-			$view_box = array();
-			if (preg_match('/[\s]+viewBox[\s]*=[\s]*"[\s]*([0-9\.\-]+)[\s]+([0-9\.\-]+)[\s]+([0-9\.]+)[\s]+([0-9\.]+)[\s]*"/si', $regs[1], $tmp)) {
-				if (count($tmp) == 5) {
-					array_shift($tmp);
-					foreach ($tmp as $key => $val) {
-						$view_box[$key] = $this->getHTMLUnitToUnits($val, 0, $this->svgunit, false);
-					}
-					$ox = $view_box[0];
-					$oy = $view_box[1];
-				}
-				// get aspect ratio
-				$tmp = array();
-				if (preg_match('/[\s]+preserveAspectRatio[\s]*=[\s]*"([^"]*)"/si', $regs[1], $tmp)) {
-					$aspect_ratio = preg_split('/[\s]+/si', $tmp[1]);
-					switch (count($aspect_ratio)) {
-						case 3: {
-							$aspect_ratio_align = $aspect_ratio[1];
-							$aspect_ratio_ms = $aspect_ratio[2];
-							break;
-						}
-						case 2: {
-							$aspect_ratio_align = $aspect_ratio[0];
-							$aspect_ratio_ms = $aspect_ratio[1];
-							break;
-						}
-						case 1: {
-							$aspect_ratio_align = $aspect_ratio[0];
-							$aspect_ratio_ms = 'meet';
-							break;
-						}
-					}
-				}
-			}
-		}
-		if ($ow <= 0) {
-			$ow = 1;
-		}
-		if ($oh <= 0) {
-			$oh = 1;
-		}
-		// calculate image width and height on document
-		if (($w <= 0) AND ($h <= 0)) {
-			// convert image size to document unit
-			$w = $ow;
-			$h = $oh;
-		} elseif ($w <= 0) {
-			$w = $h * $ow / $oh;
-		} elseif ($h <= 0) {
-			$h = $w * $oh / $ow;
-		}
-		// fit the image on available space
-		list($w, $h, $x, $y) = $this->fitBlock($w, $h, $x, $y, $fitonpage);
-		if ($this->rasterize_vector_images) {
-			// convert SVG to raster image using GD or ImageMagick libraries
-			return $this->Image($file, $x, $y, $w, $h, 'SVG', $link, $align, true, 300, $palign, false, false, $border, false, false, false);
-		}
-		// set alignment
-		$this->img_rb_y = $y + $h;
-		// set alignment
-		if ($this->rtl) {
-			if ($palign == 'L') {
-				$ximg = $this->lMargin;
-			} elseif ($palign == 'C') {
-				$ximg = ($this->w + $this->lMargin - $this->rMargin - $w) / 2;
-			} elseif ($palign == 'R') {
-				$ximg = $this->w - $this->rMargin - $w;
-			} else {
-				$ximg = $x - $w;
-			}
-			$this->img_rb_x = $ximg;
-		} else {
-			if ($palign == 'L') {
-				$ximg = $this->lMargin;
-			} elseif ($palign == 'C') {
-				$ximg = ($this->w + $this->lMargin - $this->rMargin - $w) / 2;
-			} elseif ($palign == 'R') {
-				$ximg = $this->w - $this->rMargin - $w;
-			} else {
-				$ximg = $x;
-			}
-			$this->img_rb_x = $ximg + $w;
-		}
-		// store current graphic vars
-		$gvars = $this->getGraphicVars();
-		// store SVG position and scale factors
-		$svgoffset_x = ($ximg - $ox) * $this->k;
-		$svgoffset_y = -($y - $oy) * $this->k;
-		if (isset($view_box[2]) AND ($view_box[2] > 0) AND ($view_box[3] > 0)) {
-			$ow = $view_box[2];
-			$oh = $view_box[3];
-		} else {
-			if ($ow <= 0) {
-				$ow = $w;
-			}
-			if ($oh <= 0) {
-				$oh = $h;
-			}
-		}
-		$svgscale_x = $w / $ow;
-		$svgscale_y = $h / $oh;
-		// scaling and alignment
-		if ($aspect_ratio_align != 'none') {
-			// store current scaling values
-			$svgscale_old_x = $svgscale_x;
-			$svgscale_old_y = $svgscale_y;
-			// force uniform scaling
-			if ($aspect_ratio_ms == 'slice') {
-				// the entire viewport is covered by the viewBox
-				if ($svgscale_x > $svgscale_y) {
-					$svgscale_y = $svgscale_x;
-				} elseif ($svgscale_x < $svgscale_y) {
-					$svgscale_x = $svgscale_y;
-				}
-			} else { // meet
-				// the entire viewBox is visible within the viewport
-				if ($svgscale_x < $svgscale_y) {
-					$svgscale_y = $svgscale_x;
-				} elseif ($svgscale_x > $svgscale_y) {
-					$svgscale_x = $svgscale_y;
-				}
-			}
-			// correct X alignment
-			switch (substr($aspect_ratio_align, 1, 3)) {
-				case 'Min': {
-					// do nothing
-					break;
-				}
-				case 'Max': {
-					$svgoffset_x += (($w * $this->k) - ($ow * $this->k * $svgscale_x));
-					break;
-				}
-				default:
-				case 'Mid': {
-					$svgoffset_x += ((($w * $this->k) - ($ow * $this->k * $svgscale_x)) / 2);
-					break;
-				}
-			}
-			// correct Y alignment
-			switch (substr($aspect_ratio_align, 5)) {
-				case 'Min': {
-					// do nothing
-					break;
-				}
-				case 'Max': {
-					$svgoffset_y -= (($h * $this->k) - ($oh * $this->k * $svgscale_y));
-					break;
-				}
-				default:
-				case 'Mid': {
-					$svgoffset_y -= ((($h * $this->k) - ($oh * $this->k * $svgscale_y)) / 2);
-					break;
-				}
-			}
-		}
-		// store current page break mode
-		$page_break_mode = $this->AutoPageBreak;
-		$page_break_margin = $this->getBreakMargin();
-		$cell_padding = $this->cell_padding;
-		$this->SetCellPadding(0);
-		$this->SetAutoPageBreak(false);
-		// save the current graphic state
-		$this->_out('q'.$this->epsmarker);
-		// set initial clipping mask
-		$this->Rect($ximg, $y, $w, $h, 'CNZ', array(), array());
-		// scale and translate
-		$e = $ox * $this->k * (1 - $svgscale_x);
-		$f = ($this->h - $oy) * $this->k * (1 - $svgscale_y);
-		$this->_out(sprintf('%F %F %F %F %F %F cm', $svgscale_x, 0, 0, $svgscale_y, ($e + $svgoffset_x), ($f + $svgoffset_y)));
-		// creates a new XML parser to be used by the other XML functions
-		$this->parser = xml_parser_create('UTF-8');
-		// the following function allows to use parser inside object
-		xml_set_object($this->parser, $this);
-		// disable case-folding for this XML parser
-		xml_parser_set_option($this->parser, XML_OPTION_CASE_FOLDING, 0);
-		// sets the element handler functions for the XML parser
-		xml_set_element_handler($this->parser, 'startSVGElementHandler', 'endSVGElementHandler');
-		// sets the character data handler function for the XML parser
-		xml_set_character_data_handler($this->parser, 'segSVGContentHandler');
-		// start parsing an XML document
-		if (!xml_parse($this->parser, $svgdata)) {
-			$error_message = sprintf('SVG Error: %s at line %d', xml_error_string(xml_get_error_code($this->parser)), xml_get_current_line_number($this->parser));
-			$this->Error($error_message);
-		}
-		// free this XML parser
-		xml_parser_free($this->parser);
-		// restore previous graphic state
-		$this->_out($this->epsmarker.'Q');
-		// restore graphic vars
-		$this->setGraphicVars($gvars);
-		$this->lasth = $gvars['lasth'];
-		if (!empty($border)) {
-			$bx = $this->x;
-			$by = $this->y;
-			$this->x = $ximg;
-			if ($this->rtl) {
-				$this->x += $w;
-			}
-			$this->y = $y;
-			$this->Cell($w, $h, '', $border, 0, '', 0, '', 0, true);
-			$this->x = $bx;
-			$this->y = $by;
-		}
-		if ($link) {
-			$this->Link($ximg, $y, $w, $h, $link, 0);
-		}
-		// set pointer to align the next text/objects
-		switch($align) {
-			case 'T':{
-				$this->y = $y;
-				$this->x = $this->img_rb_x;
-				break;
-			}
-			case 'M':{
-				$this->y = $y + round($h/2);
-				$this->x = $this->img_rb_x;
-				break;
-			}
-			case 'B':{
-				$this->y = $this->img_rb_y;
-				$this->x = $this->img_rb_x;
-				break;
-			}
-			case 'N':{
-				$this->SetY($this->img_rb_y);
-				break;
-			}
-			default:{
-				// restore pointer to starting position
-				$this->x = $gvars['x'];
-				$this->y = $gvars['y'];
-				$this->page = $gvars['page'];
-				$this->current_column = $gvars['current_column'];
-				$this->tMargin = $gvars['tMargin'];
-				$this->bMargin = $gvars['bMargin'];
-				$this->w = $gvars['w'];
-				$this->h = $gvars['h'];
-				$this->wPt = $gvars['wPt'];
-				$this->hPt = $gvars['hPt'];
-				$this->fwPt = $gvars['fwPt'];
-				$this->fhPt = $gvars['fhPt'];
-				break;
-			}
-		}
-		$this->endlinex = $this->img_rb_x;
-		// restore page break
-		$this->SetAutoPageBreak($page_break_mode, $page_break_margin);
-		$this->cell_padding = $cell_padding;
-	}
-
-	/**
-	 * Convert SVG transformation matrix to PDF.
-	 * @param $tm (array) original SVG transformation matrix
-	 * @return array transformation matrix
-	 * @protected
-	 * @since 5.0.000 (2010-05-02)
-	 */
-	protected function convertSVGtMatrix($tm) {
-		$a = $tm[0];
-		$b = -$tm[1];
-		$c = -$tm[2];
-		$d = $tm[3];
-		$e = $this->getHTMLUnitToUnits($tm[4], 1, $this->svgunit, false) * $this->k;
-		$f = -$this->getHTMLUnitToUnits($tm[5], 1, $this->svgunit, false) * $this->k;
-		$x = 0;
-		$y = $this->h * $this->k;
-		$e = ($x * (1 - $a)) - ($y * $c) + $e;
-		$f = ($y * (1 - $d)) - ($x * $b) + $f;
-		return array($a, $b, $c, $d, $e, $f);
-	}
-
-	/**
-	 * Apply SVG graphic transformation matrix.
-	 * @param $tm (array) original SVG transformation matrix
-	 * @protected
-	 * @since 5.0.000 (2010-05-02)
-	 */
-	protected function SVGTransform($tm) {
-		$this->Transform($this->convertSVGtMatrix($tm));
-	}
-
-	/**
-	 * Apply the requested SVG styles (*** TO BE COMPLETED ***)
-	 * @param $svgstyle (array) array of SVG styles to apply
-	 * @param $prevsvgstyle (array) array of previous SVG style
-	 * @param $x (int) X origin of the bounding box
-	 * @param $y (int) Y origin of the bounding box
-	 * @param $w (int) width of the bounding box
-	 * @param $h (int) height of the bounding box
-	 * @param $clip_function (string) clip function
-	 * @param $clip_params (array) array of parameters for clipping function
-	 * @return object style
-	 * @author Nicola Asuni
-	 * @since 5.0.000 (2010-05-02)
-	 * @protected
-	 */
-	protected function setSVGStyles($svgstyle, $prevsvgstyle, $x=0, $y=0, $w=1, $h=1, $clip_function='', $clip_params=array()) {
-		if ($this->state != 2) {
-			 return;
-		}
-		$objstyle = '';
-		$minlen = (0.01 / $this->k); // minimum acceptable length
-		if (!isset($svgstyle['opacity'])) {
-			return $objstyle;
-		}
-		// clip-path
-		$regs = array();
-		if (preg_match('/url\([\s]*\#([^\)]*)\)/si', $svgstyle['clip-path'], $regs)) {
-			$clip_path = $this->svgclippaths[$regs[1]];
-			foreach ($clip_path as $cp) {
-				$this->startSVGElementHandler('clip-path', $cp['name'], $cp['attribs'], $cp['tm']);
-			}
-		}
-		// opacity
-		if ($svgstyle['opacity'] != 1) {
-			$this->setAlpha($svgstyle['opacity'], 'Normal', $svgstyle['opacity'], false);
-		}
-		// color
-		$fill_color = TCPDF_COLORS::convertHTMLColorToDec($svgstyle['color'], $this->spot_colors);
-		$this->SetFillColorArray($fill_color);
-		// text color
-		$text_color = TCPDF_COLORS::convertHTMLColorToDec($svgstyle['text-color'], $this->spot_colors);
-		$this->SetTextColorArray($text_color);
-		// clip
-		if (preg_match('/rect\(([a-z0-9\-\.]*)[\s]*([a-z0-9\-\.]*)[\s]*([a-z0-9\-\.]*)[\s]*([a-z0-9\-\.]*)\)/si', $svgstyle['clip'], $regs)) {
-			$top = (isset($regs[1])?$this->getHTMLUnitToUnits($regs[1], 0, $this->svgunit, false):0);
-			$right = (isset($regs[2])?$this->getHTMLUnitToUnits($regs[2], 0, $this->svgunit, false):0);
-			$bottom = (isset($regs[3])?$this->getHTMLUnitToUnits($regs[3], 0, $this->svgunit, false):0);
-			$left = (isset($regs[4])?$this->getHTMLUnitToUnits($regs[4], 0, $this->svgunit, false):0);
-			$cx = $x + $left;
-			$cy = $y + $top;
-			$cw = $w - $left - $right;
-			$ch = $h - $top - $bottom;
-			if ($svgstyle['clip-rule'] == 'evenodd') {
-				$clip_rule = 'CNZ';
-			} else {
-				$clip_rule = 'CEO';
-			}
-			$this->Rect($cx, $cy, $cw, $ch, $clip_rule, array(), array());
-		}
-		// fill
-		$regs = array();
-		if (preg_match('/url\([\s]*\#([^\)]*)\)/si', $svgstyle['fill'], $regs)) {
-			// gradient
-			$gradient = $this->svggradients[$regs[1]];
-			if (isset($gradient['xref'])) {
-				// reference to another gradient definition
-				$newgradient = $this->svggradients[$gradient['xref']];
-				$newgradient['coords'] = $gradient['coords'];
-				$newgradient['mode'] = $gradient['mode'];
-				$newgradient['type'] = $gradient['type'];
-				$newgradient['gradientUnits'] = $gradient['gradientUnits'];
-				if (isset($gradient['gradientTransform'])) {
-					$newgradient['gradientTransform'] = $gradient['gradientTransform'];
-				}
-				$gradient = $newgradient;
-			}
-			//save current Graphic State
-			$this->_outSaveGraphicsState();
-			//set clipping area
-			if (!empty($clip_function) AND method_exists($this, $clip_function)) {
-				$bbox = call_user_func_array(array($this, $clip_function), $clip_params);
-				if ((!isset($gradient['type']) OR ($gradient['type'] != 3)) AND is_array($bbox) AND (count($bbox) == 4)) {
-					list($x, $y, $w, $h) = $bbox;
-				}
-			}
-			if ($gradient['mode'] == 'measure') {
-				if (!isset($gradient['coords'][4])) {
-					$gradient['coords'][4] = 0.5;
-				}
-				if (isset($gradient['gradientTransform']) AND !empty($gradient['gradientTransform'])) {
-					$gtm = $gradient['gradientTransform'];
-					// apply transformation matrix
-					$xa = ($gtm[0] * $gradient['coords'][0]) + ($gtm[2] * $gradient['coords'][1]) + $gtm[4];
-					$ya = ($gtm[1] * $gradient['coords'][0]) + ($gtm[3] * $gradient['coords'][1]) + $gtm[5];
-					$xb = ($gtm[0] * $gradient['coords'][2]) + ($gtm[2] * $gradient['coords'][3]) + $gtm[4];
-					$yb = ($gtm[1] * $gradient['coords'][2]) + ($gtm[3] * $gradient['coords'][3]) + $gtm[5];
-					$r = sqrt(pow(($gtm[0] * $gradient['coords'][4]), 2) + pow(($gtm[1] * $gradient['coords'][4]), 2));
-					$gradient['coords'][0] = $xa;
-					$gradient['coords'][1] = $ya;
-					$gradient['coords'][2] = $xb;
-					$gradient['coords'][3] = $yb;
-					$gradient['coords'][4] = $r;
-				}
-				// convert SVG coordinates to user units
-				$gradient['coords'][0] = $this->getHTMLUnitToUnits($gradient['coords'][0], 0, $this->svgunit, false);
-				$gradient['coords'][1] = $this->getHTMLUnitToUnits($gradient['coords'][1], 0, $this->svgunit, false);
-				$gradient['coords'][2] = $this->getHTMLUnitToUnits($gradient['coords'][2], 0, $this->svgunit, false);
-				$gradient['coords'][3] = $this->getHTMLUnitToUnits($gradient['coords'][3], 0, $this->svgunit, false);
-				$gradient['coords'][4] = $this->getHTMLUnitToUnits($gradient['coords'][4], 0, $this->svgunit, false);
-				if ($w <= $minlen) {
-					$w = $minlen;
-				}
-				if ($h <= $minlen) {
-					$h = $minlen;
-				}
-				// shift units
-				if ($gradient['gradientUnits'] == 'objectBoundingBox') {
-					// convert to SVG coordinate system
-					$gradient['coords'][0] += $x;
-					$gradient['coords'][1] += $y;
-					$gradient['coords'][2] += $x;
-					$gradient['coords'][3] += $y;
-				}
-				// calculate percentages
-				$gradient['coords'][0] = (($gradient['coords'][0] - $x) / $w);
-				$gradient['coords'][1] = (($gradient['coords'][1] - $y) / $h);
-				$gradient['coords'][2] = (($gradient['coords'][2] - $x) / $w);
-				$gradient['coords'][3] = (($gradient['coords'][3] - $y) / $h);
-				$gradient['coords'][4] /= $w;
-			} elseif ($gradient['mode'] == 'percentage') {
-				foreach($gradient['coords'] as $key => $val) {
-					$gradient['coords'][$key] = (intval($val) / 100);
-					if ($val < 0) {
-						$gradient['coords'][$key] = 0;
-					} elseif ($val > 1) {
-						$gradient['coords'][$key] = 1;
-					}
-				}
-			}
-			if (($gradient['type'] == 2) AND ($gradient['coords'][0] == $gradient['coords'][2]) AND ($gradient['coords'][1] == $gradient['coords'][3])) {
-				// single color (no shading)
-				$gradient['coords'][0] = 1;
-				$gradient['coords'][1] = 0;
-				$gradient['coords'][2] = 0.999;
-				$gradient['coords'][3] = 0;
-			}
-			// swap Y coordinates
-			$tmp = $gradient['coords'][1];
-			$gradient['coords'][1] = $gradient['coords'][3];
-			$gradient['coords'][3] = $tmp;
-			// set transformation map for gradient
-			$cy = ($this->h - $y);
-			if ($gradient['type'] == 3) {
-				// circular gradient
-				$cy -= ($gradient['coords'][1] * ($w + $h));
-				$h = $w = max($w, $h);
-			} else {
-				$cy -= $h;
-			}
-			$this->_out(sprintf('%F 0 0 %F %F %F cm', ($w * $this->k), ($h * $this->k), ($x * $this->k), ($cy * $this->k)));
-			if (count($gradient['stops']) > 1) {
-				$this->Gradient($gradient['type'], $gradient['coords'], $gradient['stops'], array(), false);
-			}
-		} elseif ($svgstyle['fill'] != 'none') {
-			$fill_color = TCPDF_COLORS::convertHTMLColorToDec($svgstyle['fill'], $this->spot_colors);
-			if ($svgstyle['fill-opacity'] != 1) {
-				$this->setAlpha($this->alpha['CA'], 'Normal', $svgstyle['fill-opacity'], false);
-			}
-			$this->SetFillColorArray($fill_color);
-			if ($svgstyle['fill-rule'] == 'evenodd') {
-				$objstyle .= 'F*';
-			} else {
-				$objstyle .= 'F';
-			}
-		}
-		// stroke
-		if ($svgstyle['stroke'] != 'none') {
-			if ($svgstyle['stroke-opacity'] != 1) {
-				$this->setAlpha($svgstyle['stroke-opacity'], 'Normal', $this->alpha['ca'], false);
-			} elseif (preg_match('/rgba\(\d+%?,\s*\d+%?,\s*\d+%?,\s*(\d+(?:\.\d+)?)\)/i', $svgstyle['stroke'], $rgba_matches)) {
-				$this->setAlpha($rgba_matches[1], 'Normal', $this->alpha['ca'], false);
-			}
-			$stroke_style = array(
-				'color' => TCPDF_COLORS::convertHTMLColorToDec($svgstyle['stroke'], $this->spot_colors),
-				'width' => $this->getHTMLUnitToUnits($svgstyle['stroke-width'], 0, $this->svgunit, false),
-				'cap' => $svgstyle['stroke-linecap'],
-				'join' => $svgstyle['stroke-linejoin']
-				);
-			if (isset($svgstyle['stroke-dasharray']) AND !empty($svgstyle['stroke-dasharray']) AND ($svgstyle['stroke-dasharray'] != 'none')) {
-				$stroke_style['dash'] = $svgstyle['stroke-dasharray'];
-			}
-			$this->SetLineStyle($stroke_style);
-			$objstyle .= 'D';
-		}
-		// font
-		$regs = array();
-		if (!empty($svgstyle['font'])) {
-			if (preg_match('/font-family[\s]*:[\s]*([^\;\"]*)/si', $svgstyle['font'], $regs)) {
-				$font_family = $this->getFontFamilyName($regs[1]);
-			} else {
-				$font_family = $svgstyle['font-family'];
-			}
-			if (preg_match('/font-size[\s]*:[\s]*([^\s\;\"]*)/si', $svgstyle['font'], $regs)) {
-				$font_size = trim($regs[1]);
-			} else {
-				$font_size = $svgstyle['font-size'];
-			}
-			if (preg_match('/font-style[\s]*:[\s]*([^\s\;\"]*)/si', $svgstyle['font'], $regs)) {
-				$font_style = trim($regs[1]);
-			} else {
-				$font_style = $svgstyle['font-style'];
-			}
-			if (preg_match('/font-weight[\s]*:[\s]*([^\s\;\"]*)/si', $svgstyle['font'], $regs)) {
-				$font_weight = trim($regs[1]);
-			} else {
-				$font_weight = $svgstyle['font-weight'];
-			}
-			if (preg_match('/font-stretch[\s]*:[\s]*([^\s\;\"]*)/si', $svgstyle['font'], $regs)) {
-				$font_stretch = trim($regs[1]);
-			} else {
-				$font_stretch = $svgstyle['font-stretch'];
-			}
-			if (preg_match('/letter-spacing[\s]*:[\s]*([^\s\;\"]*)/si', $svgstyle['font'], $regs)) {
-				$font_spacing = trim($regs[1]);
-			} else {
-				$font_spacing = $svgstyle['letter-spacing'];
-			}
-		} else {
-			$font_family = $this->getFontFamilyName($svgstyle['font-family']);
-			$font_size = $svgstyle['font-size'];
-			$font_style = $svgstyle['font-style'];
-			$font_weight = $svgstyle['font-weight'];
-			$font_stretch = $svgstyle['font-stretch'];
-			$font_spacing = $svgstyle['letter-spacing'];
-		}
-		$font_size = $this->getHTMLFontUnits($font_size, $this->svgstyles[0]['font-size'], $prevsvgstyle['font-size'], $this->svgunit);
-		$font_stretch = $this->getCSSFontStretching($font_stretch, $svgstyle['font-stretch']);
-		$font_spacing = $this->getCSSFontSpacing($font_spacing, $svgstyle['letter-spacing']);
-		switch ($font_style) {
-			case 'italic': {
-				$font_style = 'I';
-				break;
-			}
-			case 'oblique': {
-				$font_style = 'I';
-				break;
-			}
-			default:
-			case 'normal': {
-				$font_style = '';
-				break;
-			}
-		}
-		switch ($font_weight) {
-			case 'bold':
-			case 'bolder': {
-				$font_style .= 'B';
-				break;
-			}
-			case 'normal': {
-				if ((substr($font_family, -1) == 'I') AND (substr($font_family, -2, 1) == 'B')) {
-					$font_family = substr($font_family, 0, -2).'I';
-				} elseif (substr($font_family, -1) == 'B') {
-					$font_family = substr($font_family, 0, -1);
-				}
-				break;
-			}
-		}
-		switch ($svgstyle['text-decoration']) {
-			case 'underline': {
-				$font_style .= 'U';
-				break;
-			}
-			case 'overline': {
-				$font_style .= 'O';
-				break;
-			}
-			case 'line-through': {
-				$font_style .= 'D';
-				break;
-			}
-			default:
-			case 'none': {
-				break;
-			}
-		}
-		$this->SetFont($font_family, $font_style, $font_size);
-		$this->setFontStretching($font_stretch);
-		$this->setFontSpacing($font_spacing);
-		return $objstyle;
-	}
-
-	/**
-	 * Draws an SVG path
-	 * @param $d (string) attribute d of the path SVG element
-	 * @param $style (string) Style of rendering. Possible values are:
-	 * <ul>
-	 *	 <li>D or empty string: Draw (default).</li>
-	 *	 <li>F: Fill.</li>
-	 *	 <li>F*: Fill using the even-odd rule to determine which regions lie inside the clipping path.</li>
-	 *	 <li>DF or FD: Draw and fill.</li>
-	 *	 <li>DF* or FD*: Draw and fill using the even-odd rule to determine which regions lie inside the clipping path.</li>
-	 *	 <li>CNZ: Clipping mode (using the even-odd rule to determine which regions lie inside the clipping path).</li>
-	 *	 <li>CEO: Clipping mode (using the nonzero winding number rule to determine which regions lie inside the clipping path).</li>
-	 * </ul>
-	 * @return array of container box measures (x, y, w, h)
-	 * @author Nicola Asuni
-	 * @since 5.0.000 (2010-05-02)
-	 * @protected
-	 */
-	protected function SVGPath($d, $style='') {
-		if ($this->state != 2) {
-			 return;
-		}
-		// set fill/stroke style
-		$op = TCPDF_STATIC::getPathPaintOperator($style, '');
-		if (empty($op)) {
-			return;
-		}
-		$paths = array();
-		$d = preg_replace('/([0-9ACHLMQSTVZ])([\-\+])/si', '\\1 \\2', $d);
-		preg_match_all('/([ACHLMQSTVZ])[\s]*([^ACHLMQSTVZ\"]*)/si', $d, $paths, PREG_SET_ORDER);
-		$x = 0;
-		$y = 0;
-		$x1 = 0;
-		$y1 = 0;
-		$x2 = 0;
-		$y2 = 0;
-		$xmin = 2147483647;
-		$xmax = 0;
-		$ymin = 2147483647;
-		$ymax = 0;
-		$relcoord = false;
-		$minlen = (0.01 / $this->k); // minimum acceptable length (3 point)
-		$firstcmd = true; // used to print first point
-		// draw curve pieces
-		foreach ($paths as $key => $val) {
-			// get curve type
-			$cmd = trim($val[1]);
-			if (strtolower($cmd) == $cmd) {
-				// use relative coordinated instead of absolute
-				$relcoord = true;
-				$xoffset = $x;
-				$yoffset = $y;
-			} else {
-				$relcoord = false;
-				$xoffset = 0;
-				$yoffset = 0;
-			}
-			$params = array();
-			if (isset($val[2])) {
-				// get curve parameters
-				$rawparams = preg_split('/([\,\s]+)/si', trim($val[2]));
-				$params = array();
-				foreach ($rawparams as $ck => $cp) {
-					$params[$ck] = $this->getHTMLUnitToUnits($cp, 0, $this->svgunit, false);
-					if (abs($params[$ck]) < $minlen) {
-						// approximate little values to zero
-						$params[$ck] = 0;
-					}
-				}
-			}
-			// store current origin point
-			$x0 = $x;
-			$y0 = $y;
-			switch (strtoupper($cmd)) {
-				case 'M': { // moveto
-					foreach ($params as $ck => $cp) {
-						if (($ck % 2) == 0) {
-							$x = $cp + $xoffset;
-						} else {
-							$y = $cp + $yoffset;
-							if ($firstcmd OR (abs($x0 - $x) >= $minlen) OR (abs($y0 - $y) >= $minlen)) {
-								if ($ck == 1) {
-									$this->_outPoint($x, $y);
-									$firstcmd = false;
-								} else {
-									$this->_outLine($x, $y);
-								}
-								$x0 = $x;
-								$y0 = $y;
-							}
-							$xmin = min($xmin, $x);
-							$ymin = min($ymin, $y);
-							$xmax = max($xmax, $x);
-							$ymax = max($ymax, $y);
-							if ($relcoord) {
-								$xoffset = $x;
-								$yoffset = $y;
-							}
-						}
-					}
-					break;
-				}
-				case 'L': { // lineto
-					foreach ($params as $ck => $cp) {
-						if (($ck % 2) == 0) {
-							$x = $cp + $xoffset;
-						} else {
-							$y = $cp + $yoffset;
-							if ((abs($x0 - $x) >= $minlen) OR (abs($y0 - $y) >= $minlen)) {
-								$this->_outLine($x, $y);
-								$x0 = $x;
-								$y0 = $y;
-							}
-							$xmin = min($xmin, $x);
-							$ymin = min($ymin, $y);
-							$xmax = max($xmax, $x);
-							$ymax = max($ymax, $y);
-							if ($relcoord) {
-								$xoffset = $x;
-								$yoffset = $y;
-							}
-						}
-					}
-					break;
-				}
-				case 'H': { // horizontal lineto
-					foreach ($params as $ck => $cp) {
-						$x = $cp + $xoffset;
-						if ((abs($x0 - $x) >= $minlen) OR (abs($y0 - $y) >= $minlen)) {
-							$this->_outLine($x, $y);
-							$x0 = $x;
-							$y0 = $y;
-						}
-						$xmin = min($xmin, $x);
-						$xmax = max($xmax, $x);
-						if ($relcoord) {
-							$xoffset = $x;
-						}
-					}
-					break;
-				}
-				case 'V': { // vertical lineto
-					foreach ($params as $ck => $cp) {
-						$y = $cp + $yoffset;
-						if ((abs($x0 - $x) >= $minlen) OR (abs($y0 - $y) >= $minlen)) {
-							$this->_outLine($x, $y);
-							$x0 = $x;
-							$y0 = $y;
-						}
-						$ymin = min($ymin, $y);
-						$ymax = max($ymax, $y);
-						if ($relcoord) {
-							$yoffset = $y;
-						}
-					}
-					break;
-				}
-				case 'C': { // curveto
-					foreach ($params as $ck => $cp) {
-						$params[$ck] = $cp;
-						if ((($ck + 1) % 6) == 0) {
-							$x1 = $params[($ck - 5)] + $xoffset;
-							$y1 = $params[($ck - 4)] + $yoffset;
-							$x2 = $params[($ck - 3)] + $xoffset;
-							$y2 = $params[($ck - 2)] + $yoffset;
-							$x = $params[($ck - 1)] + $xoffset;
-							$y = $params[($ck)] + $yoffset;
-							$this->_outCurve($x1, $y1, $x2, $y2, $x, $y);
-							$xmin = min($xmin, $x, $x1, $x2);
-							$ymin = min($ymin, $y, $y1, $y2);
-							$xmax = max($xmax, $x, $x1, $x2);
-							$ymax = max($ymax, $y, $y1, $y2);
-							if ($relcoord) {
-								$xoffset = $x;
-								$yoffset = $y;
-							}
-						}
-					}
-					break;
-				}
-				case 'S': { // shorthand/smooth curveto
-					foreach ($params as $ck => $cp) {
-						$params[$ck] = $cp;
-						if ((($ck + 1) % 4) == 0) {
-							if (($key > 0) AND ((strtoupper($paths[($key - 1)][1]) == 'C') OR (strtoupper($paths[($key - 1)][1]) == 'S'))) {
-								$x1 = (2 * $x) - $x2;
-								$y1 = (2 * $y) - $y2;
-							} else {
-								$x1 = $x;
-								$y1 = $y;
-							}
-							$x2 = $params[($ck - 3)] + $xoffset;
-							$y2 = $params[($ck - 2)] + $yoffset;
-							$x = $params[($ck - 1)] + $xoffset;
-							$y = $params[($ck)] + $yoffset;
-							$this->_outCurve($x1, $y1, $x2, $y2, $x, $y);
-							$xmin = min($xmin, $x, $x1, $x2);
-							$ymin = min($ymin, $y, $y1, $y2);
-							$xmax = max($xmax, $x, $x1, $x2);
-							$ymax = max($ymax, $y, $y1, $y2);
-							if ($relcoord) {
-								$xoffset = $x;
-								$yoffset = $y;
-							}
-						}
-					}
-					break;
-				}
-				case 'Q': { // quadratic Bezier curveto
-					foreach ($params as $ck => $cp) {
-						$params[$ck] = $cp;
-						if ((($ck + 1) % 4) == 0) {
-							// convert quadratic points to cubic points
-							$x1 = $params[($ck - 3)] + $xoffset;
-							$y1 = $params[($ck - 2)] + $yoffset;
-							$xa = ($x + (2 * $x1)) / 3;
-							$ya = ($y + (2 * $y1)) / 3;
-							$x = $params[($ck - 1)] + $xoffset;
-							$y = $params[($ck)] + $yoffset;
-							$xb = ($x + (2 * $x1)) / 3;
-							$yb = ($y + (2 * $y1)) / 3;
-							$this->_outCurve($xa, $ya, $xb, $yb, $x, $y);
-							$xmin = min($xmin, $x, $xa, $xb);
-							$ymin = min($ymin, $y, $ya, $yb);
-							$xmax = max($xmax, $x, $xa, $xb);
-							$ymax = max($ymax, $y, $ya, $yb);
-							if ($relcoord) {
-								$xoffset = $x;
-								$yoffset = $y;
-							}
-						}
-					}
-					break;
-				}
-				case 'T': { // shorthand/smooth quadratic Bezier curveto
-					foreach ($params as $ck => $cp) {
-						$params[$ck] = $cp;
-						if (($ck % 2) != 0) {
-							if (($key > 0) AND ((strtoupper($paths[($key - 1)][1]) == 'Q') OR (strtoupper($paths[($key - 1)][1]) == 'T'))) {
-								$x1 = (2 * $x) - $x1;
-								$y1 = (2 * $y) - $y1;
-							} else {
-								$x1 = $x;
-								$y1 = $y;
-							}
-							// convert quadratic points to cubic points
-							$xa = ($x + (2 * $x1)) / 3;
-							$ya = ($y + (2 * $y1)) / 3;
-							$x = $params[($ck - 1)] + $xoffset;
-							$y = $params[($ck)] + $yoffset;
-							$xb = ($x + (2 * $x1)) / 3;
-							$yb = ($y + (2 * $y1)) / 3;
-							$this->_outCurve($xa, $ya, $xb, $yb, $x, $y);
-							$xmin = min($xmin, $x, $xa, $xb);
-							$ymin = min($ymin, $y, $ya, $yb);
-							$xmax = max($xmax, $x, $xa, $xb);
-							$ymax = max($ymax, $y, $ya, $yb);
-							if ($relcoord) {
-								$xoffset = $x;
-								$yoffset = $y;
-							}
-						}
-					}
-					break;
-				}
-				case 'A': { // elliptical arc
-					foreach ($params as $ck => $cp) {
-						$params[$ck] = $cp;
-						if ((($ck + 1) % 7) == 0) {
-							$x0 = $x;
-							$y0 = $y;
-							$rx = abs($params[($ck - 6)]);
-							$ry = abs($params[($ck - 5)]);
-							$ang = -$rawparams[($ck - 4)];
-							$angle = deg2rad($ang);
-							$fa = $rawparams[($ck - 3)]; // large-arc-flag
-							$fs = $rawparams[($ck - 2)]; // sweep-flag
-							$x = $params[($ck - 1)] + $xoffset;
-							$y = $params[$ck] + $yoffset;
-							if ((abs($x0 - $x) < $minlen) AND (abs($y0 - $y) < $minlen)) {
-								// endpoints are almost identical
-								$xmin = min($xmin, $x);
-								$ymin = min($ymin, $y);
-								$xmax = max($xmax, $x);
-								$ymax = max($ymax, $y);
-							} else {
-								$cos_ang = cos($angle);
-								$sin_ang = sin($angle);
-								$a = (($x0 - $x) / 2);
-								$b = (($y0 - $y) / 2);
-								$xa = ($a * $cos_ang) - ($b * $sin_ang);
-								$ya = ($a * $sin_ang) + ($b * $cos_ang);
-								$rx2 = $rx * $rx;
-								$ry2 = $ry * $ry;
-								$xa2 = $xa * $xa;
-								$ya2 = $ya * $ya;
-								$delta = ($xa2 / $rx2) + ($ya2 / $ry2);
-								if ($delta > 1) {
-									$rx *= sqrt($delta);
-									$ry *= sqrt($delta);
-									$rx2 = $rx * $rx;
-									$ry2 = $ry * $ry;
-								}
-								$numerator = (($rx2 * $ry2) - ($rx2 * $ya2) - ($ry2 * $xa2));
-								if ($numerator < 0) {
-									$root = 0;
-								} else {
-									$root = sqrt($numerator / (($rx2 * $ya2) + ($ry2 * $xa2)));
-								}
-								if ($fa == $fs){
-									$root *= -1;
-								}
-								$cax = $root * (($rx * $ya) / $ry);
-								$cay = -$root * (($ry * $xa) / $rx);
-								// coordinates of ellipse center
-								$cx = ($cax * $cos_ang) - ($cay * $sin_ang) + (($x0 + $x) / 2);
-								$cy = ($cax * $sin_ang) + ($cay * $cos_ang) + (($y0 + $y) / 2);
-								// get angles
-								$angs = TCPDF_STATIC::getVectorsAngle(1, 0, (($xa - $cax) / $rx), (($cay - $ya) / $ry));
-								$dang = TCPDF_STATIC::getVectorsAngle((($xa - $cax) / $rx), (($ya - $cay) / $ry), ((-$xa - $cax) / $rx), ((-$ya - $cay) / $ry));
-								if (($fs == 0) AND ($dang > 0)) {
-									$dang -= (2 * M_PI);
-								} elseif (($fs == 1) AND ($dang < 0)) {
-									$dang += (2 * M_PI);
-								}
-								$angf = $angs - $dang;
-								if ((($fs == 0) AND ($angs > $angf)) OR (($fs == 1) AND ($angs < $angf))) {
-									// reverse angles
-									$tmp = $angs;
-									$angs = $angf;
-									$angf = $tmp;
-								}
-								$angs = round(rad2deg($angs), 6);
-								$angf = round(rad2deg($angf), 6);
-								// covent angles to positive values
-								if (($angs < 0) AND ($angf < 0)) {
-									$angs += 360;
-									$angf += 360;
-								}
-								$pie = false;
-								if (($key == 0) AND (isset($paths[($key + 1)][1])) AND (trim($paths[($key + 1)][1]) == 'z')) {
-									$pie = true;
-								}
-								list($axmin, $aymin, $axmax, $aymax) = $this->_outellipticalarc($cx, $cy, $rx, $ry, $ang, $angs, $angf, $pie, 2, false, ($fs == 0), true);
-								$xmin = min($xmin, $x, $axmin);
-								$ymin = min($ymin, $y, $aymin);
-								$xmax = max($xmax, $x, $axmax);
-								$ymax = max($ymax, $y, $aymax);
-							}
-							if ($relcoord) {
-								$xoffset = $x;
-								$yoffset = $y;
-							}
-						}
-					}
-					break;
-				}
-				case 'Z': {
-					$this->_out('h');
-					break;
-				}
-			}
-			$firstcmd = false;
-		} // end foreach
-		if (!empty($op)) {
-			$this->_out($op);
-		}
-		return array($xmin, $ymin, ($xmax - $xmin), ($ymax - $ymin));
-	}
-
-	/**
-	 * Return the tag name without the namespace
-	 * @param $name (string) Tag name
-	 * @protected
-	 */
-	protected function removeTagNamespace($name) {
-		if(strpos($name, ':') !== false) {
-			$parts = explode(':', $name);
-			return $parts[(sizeof($parts) - 1)];
-		}
-		return $name;
-	}
-		
-	/**
-	 * Sets the opening SVG element handler function for the XML parser. (*** TO BE COMPLETED ***)
-	 * @param $parser (resource) The first parameter, parser, is a reference to the XML parser calling the handler.
-	 * @param $name (string) The second parameter, name, contains the name of the element for which this handler is called. If case-folding is in effect for this parser, the element name will be in uppercase letters.
-	 * @param $attribs (array) The third parameter, attribs, contains an associative array with the element's attributes (if any). The keys of this array are the attribute names, the values are the attribute values. Attribute names are case-folded on the same criteria as element names. Attribute values are not case-folded. The original order of the attributes can be retrieved by walking through attribs the normal way, using each(). The first key in the array was the first attribute, and so on.
-	 * @param $ctm (array) tranformation matrix for clipping mode (starting transformation matrix).
-	 * @author Nicola Asuni
-	 * @since 5.0.000 (2010-05-02)
-	 * @protected
-	 */
-	protected function startSVGElementHandler($parser, $name, $attribs, $ctm=array()) {
-		$name = $this->removeTagNamespace($name);
-		// check if we are in clip mode
-		if ($this->svgclipmode) {
-			$this->svgclippaths[$this->svgclipid][] = array('name' => $name, 'attribs' => $attribs, 'tm' => $this->svgcliptm[$this->svgclipid]);
-			return;
-		}
-		if ($this->svgdefsmode AND !in_array($name, array('clipPath', 'linearGradient', 'radialGradient', 'stop'))) {
-			if (isset($attribs['id'])) {
-				$attribs['child_elements'] = array();
-				$this->svgdefs[$attribs['id']] = array('name' => $name, 'attribs' => $attribs);
-				return;
-			}
-			if (end($this->svgdefs) !== FALSE) {
-				$last_svgdefs_id = key($this->svgdefs);
-				if (isset($this->svgdefs[$last_svgdefs_id]['attribs']['child_elements'])) {
-					$attribs['id'] = 'DF_'.(count($this->svgdefs[$last_svgdefs_id]['attribs']['child_elements']) + 1);
-					$this->svgdefs[$last_svgdefs_id]['attribs']['child_elements'][$attribs['id']] = array('name' => $name, 'attribs' => $attribs);
-					return;
-				}
-			}
-			return;
-		}
-		$clipping = false;
-		if ($parser == 'clip-path') {
-			// set clipping mode
-			$clipping = true;
-		}
-		// get styling properties
-		$prev_svgstyle = $this->svgstyles[max(0,(count($this->svgstyles) - 1))]; // previous style
-		$svgstyle = $this->svgstyles[0]; // set default style
-		if ($clipping AND !isset($attribs['fill']) AND (!isset($attribs['style']) OR (!preg_match('/[;\"\s]{1}fill[\s]*:[\s]*([^;\"]*)/si', $attribs['style'], $attrval)))) {
-			// default fill attribute for clipping
-			$attribs['fill'] = 'none';
-		}
-		if (isset($attribs['style']) AND !TCPDF_STATIC::empty_string($attribs['style']) AND ($attribs['style'][0] != ';')) {
-			// fix style for regular expression
-			$attribs['style'] = ';'.$attribs['style'];
-		}
-		foreach ($prev_svgstyle as $key => $val) {
-			if (in_array($key, TCPDF_IMAGES::$svginheritprop)) {
-				// inherit previous value
-				$svgstyle[$key] = $val;
-			}
-			if (isset($attribs[$key]) AND !TCPDF_STATIC::empty_string($attribs[$key])) {
-				// specific attribute settings
-				if ($attribs[$key] == 'inherit') {
-					$svgstyle[$key] = $val;
-				} else {
-					$svgstyle[$key] = $attribs[$key];
-				}
-			} elseif (isset($attribs['style']) AND !TCPDF_STATIC::empty_string($attribs['style'])) {
-				// CSS style syntax
-				$attrval = array();
-				if (preg_match('/[;\"\s]{1}'.$key.'[\s]*:[\s]*([^;\"]*)/si', $attribs['style'], $attrval) AND isset($attrval[1])) {
-					if ($attrval[1] == 'inherit') {
-						$svgstyle[$key] = $val;
-					} else {
-						$svgstyle[$key] = $attrval[1];
-					}
-				}
-			}
-		}
-		// transformation matrix
-		if (!empty($ctm)) {
-			$tm = $ctm;
-		} else {
-			$tm = array(1,0,0,1,0,0);
-		}
-		if (isset($attribs['transform']) AND !empty($attribs['transform'])) {
-			$tm = TCPDF_STATIC::getTransformationMatrixProduct($tm, TCPDF_STATIC::getSVGTransformMatrix($attribs['transform']));
-		}
-		$svgstyle['transfmatrix'] = $tm;
-		$invisible = false;
-		if (($svgstyle['visibility'] == 'hidden') OR ($svgstyle['visibility'] == 'collapse') OR ($svgstyle['display'] == 'none')) {
-			// the current graphics element is invisible (nothing is painted)
-			$invisible = true;
-		}
-		// process tag
-		switch($name) {
-			case 'defs': {
-				$this->svgdefsmode = true;
-				break;
-			}
-			// clipPath
-			case 'clipPath': {
-				if ($invisible) {
-					break;
-				}
-				$this->svgclipmode = true;
-				if (!isset($attribs['id'])) {
-					$attribs['id'] = 'CP_'.(count($this->svgcliptm) + 1);
-				}
-				$this->svgclipid = $attribs['id'];
-				$this->svgclippaths[$this->svgclipid] = array();
-				$this->svgcliptm[$this->svgclipid] = $tm;
-				break;
-			}
-			case 'svg': {
-				// start of SVG object
-				if(++$this->svg_tag_depth <= 1) {
-					break;
-				}
-				// inner SVG
-				array_push($this->svgstyles, $svgstyle);
-				$this->StartTransform();
-				$svgX = (isset($attribs['x'])?$attribs['x']:0);
-				$svgY = (isset($attribs['y'])?$attribs['y']:0);
-				$svgW = (isset($attribs['width'])?$attribs['width']:0);
-				$svgH = (isset($attribs['height'])?$attribs['height']:0);
-				// set x, y position using transform matrix
-				$tm = TCPDF_STATIC::getTransformationMatrixProduct($tm, array( 1, 0, 0, 1, $svgX, $svgY));
-				$this->SVGTransform($tm);
-				// set clipping for width and height
-				$x = 0;
-				$y = 0;
-				$w = (isset($attribs['width'])?$this->getHTMLUnitToUnits($attribs['width'], 0, $this->svgunit, false):$this->w);
-				$h = (isset($attribs['height'])?$this->getHTMLUnitToUnits($attribs['height'], 0, $this->svgunit, false):$this->h);
-				// draw clipping rect
-				$this->Rect($x, $y, $w, $h, 'CNZ', array(), array());
-				// parse viewbox, calculate extra transformation matrix
-				if (isset($attribs['viewBox'])) {
-					$tmp = array();
-					preg_match_all("/[0-9]+/", $attribs['viewBox'], $tmp);
-					$tmp = $tmp[0];
-					if (sizeof($tmp) == 4) {
-						$vx = $tmp[0];
-						$vy = $tmp[1];
-						$vw = $tmp[2];
-						$vh = $tmp[3];
-						// get aspect ratio
-						$tmp = array();
-						$aspectX = 'xMid';
-						$aspectY = 'YMid';
-						$fit = 'meet';
-						if (isset($attribs['preserveAspectRatio'])) {
-							if($attribs['preserveAspectRatio'] == 'none') {
-								$fit = 'none';
-							} else {
-								preg_match_all('/[a-zA-Z]+/', $attribs['preserveAspectRatio'], $tmp);
-								$tmp = $tmp[0];
-								if ((sizeof($tmp) == 2) AND (strlen($tmp[0]) == 8) AND (in_array($tmp[1], array('meet', 'slice', 'none')))) {
-									$aspectX = substr($tmp[0], 0, 4);
-									$aspectY = substr($tmp[0], 4, 4);
-									$fit = $tmp[1];
-								}
-							}
-						}
-						$wr = ($svgW / $vw);
-						$hr = ($svgH / $vh);
-						$ax = $ay = 0;
-						if ((($fit == 'meet') AND ($hr < $wr)) OR (($fit == 'slice') AND ($hr > $wr))) {
-							if ($aspectX == 'xMax') {
-								$ax = (($vw * ($wr / $hr)) - $vw);
-							}
-							if ($aspectX == 'xMid') {
-								$ax = ((($vw * ($wr / $hr)) - $vw) / 2);
-							}
-							$wr = $hr;
-						} elseif ((($fit == 'meet') AND ($hr > $wr)) OR (($fit == 'slice') AND ($hr < $wr))) {
-							if ($aspectY == 'YMax') {
-								$ay = (($vh * ($hr / $wr)) - $vh);
-							}
-							if ($aspectY == 'YMid') {
-								$ay = ((($vh * ($hr / $wr)) - $vh) / 2);
-							}
-							$hr = $wr;
-						}
-						$newtm = array($wr, 0, 0, $hr, (($wr * ($ax - $vx)) - $svgX), (($hr * ($ay - $vy)) - $svgY));
-						$tm = TCPDF_STATIC::getTransformationMatrixProduct($tm, $newtm);
-						$this->SVGTransform($tm);
-					}
-				}
-				$this->setSVGStyles($svgstyle, $prev_svgstyle);
-				break;
-			}
-			case 'g': {
-				// group together related graphics elements
-				array_push($this->svgstyles, $svgstyle);
-				$this->StartTransform();
-				$x = (isset($attribs['x'])?$attribs['x']:0);
-				$y = (isset($attribs['y'])?$attribs['y']:0);
-				$w = 1;//(isset($attribs['width'])?$attribs['width']:1);
-				$h = 1;//(isset($attribs['height'])?$attribs['height']:1);
-				$tm = TCPDF_STATIC::getTransformationMatrixProduct($tm, array($w, 0, 0, $h, $x, $y));
-				$this->SVGTransform($tm);
-				$this->setSVGStyles($svgstyle, $prev_svgstyle);
-				break;
-			}
-			case 'linearGradient': {
-				if ($this->pdfa_mode) {
-					break;
-				}
-				if (!isset($attribs['id'])) {
-					$attribs['id'] = 'GR_'.(count($this->svggradients) + 1);
-				}
-				$this->svggradientid = $attribs['id'];
-				$this->svggradients[$this->svggradientid] = array();
-				$this->svggradients[$this->svggradientid]['type'] = 2;
-				$this->svggradients[$this->svggradientid]['stops'] = array();
-				if (isset($attribs['gradientUnits'])) {
-					$this->svggradients[$this->svggradientid]['gradientUnits'] = $attribs['gradientUnits'];
-				} else {
-					$this->svggradients[$this->svggradientid]['gradientUnits'] = 'objectBoundingBox';
-				}
-				//$attribs['spreadMethod']
-				if (((!isset($attribs['x1'])) AND (!isset($attribs['y1'])) AND (!isset($attribs['x2'])) AND (!isset($attribs['y2'])))
-					OR ((isset($attribs['x1']) AND (substr($attribs['x1'], -1) == '%'))
-						OR (isset($attribs['y1']) AND (substr($attribs['y1'], -1) == '%'))
-						OR (isset($attribs['x2']) AND (substr($attribs['x2'], -1) == '%'))
-						OR (isset($attribs['y2']) AND (substr($attribs['y2'], -1) == '%')))) {
-					$this->svggradients[$this->svggradientid]['mode'] = 'percentage';
-				} else {
-					$this->svggradients[$this->svggradientid]['mode'] = 'measure';
-				}
-				$x1 = (isset($attribs['x1'])?$attribs['x1']:'0');
-				$y1 = (isset($attribs['y1'])?$attribs['y1']:'0');
-				$x2 = (isset($attribs['x2'])?$attribs['x2']:'100');
-				$y2 = (isset($attribs['y2'])?$attribs['y2']:'0');
-				if (isset($attribs['gradientTransform'])) {
-					$this->svggradients[$this->svggradientid]['gradientTransform'] = TCPDF_STATIC::getSVGTransformMatrix($attribs['gradientTransform']);
-				}
-				$this->svggradients[$this->svggradientid]['coords'] = array($x1, $y1, $x2, $y2);
-				if (isset($attribs['xlink:href']) AND !empty($attribs['xlink:href'])) {
-					// gradient is defined on another place
-					$this->svggradients[$this->svggradientid]['xref'] = substr($attribs['xlink:href'], 1);
-				}
-				break;
-			}
-			case 'radialGradient': {
-				if ($this->pdfa_mode) {
-					break;
-				}
-				if (!isset($attribs['id'])) {
-					$attribs['id'] = 'GR_'.(count($this->svggradients) + 1);
-				}
-				$this->svggradientid = $attribs['id'];
-				$this->svggradients[$this->svggradientid] = array();
-				$this->svggradients[$this->svggradientid]['type'] = 3;
-				$this->svggradients[$this->svggradientid]['stops'] = array();
-				if (isset($attribs['gradientUnits'])) {
-					$this->svggradients[$this->svggradientid]['gradientUnits'] = $attribs['gradientUnits'];
-				} else {
-					$this->svggradients[$this->svggradientid]['gradientUnits'] = 'objectBoundingBox';
-				}
-				//$attribs['spreadMethod']
-				if (((!isset($attribs['cx'])) AND (!isset($attribs['cy'])))
-					OR ((isset($attribs['cx']) AND (substr($attribs['cx'], -1) == '%'))
-					OR (isset($attribs['cy']) AND (substr($attribs['cy'], -1) == '%')))) {
-					$this->svggradients[$this->svggradientid]['mode'] = 'percentage';
-				} elseif (isset($attribs['r']) AND is_numeric($attribs['r']) AND ($attribs['r']) <= 1) {
-					$this->svggradients[$this->svggradientid]['mode'] = 'ratio';
-				} else {
-					$this->svggradients[$this->svggradientid]['mode'] = 'measure';
-				}
-				$cx = (isset($attribs['cx']) ? $attribs['cx'] : 0.5);
-				$cy = (isset($attribs['cy']) ? $attribs['cy'] : 0.5);
-				$fx = (isset($attribs['fx']) ? $attribs['fx'] : $cx);
-				$fy = (isset($attribs['fy']) ? $attribs['fy'] : $cy);
-				$r = (isset($attribs['r']) ? $attribs['r'] : 0.5);
-				if (isset($attribs['gradientTransform'])) {
-					$this->svggradients[$this->svggradientid]['gradientTransform'] = TCPDF_STATIC::getSVGTransformMatrix($attribs['gradientTransform']);
-				}
-				$this->svggradients[$this->svggradientid]['coords'] = array($cx, $cy, $fx, $fy, $r);
-				if (isset($attribs['xlink:href']) AND !empty($attribs['xlink:href'])) {
-					// gradient is defined on another place
-					$this->svggradients[$this->svggradientid]['xref'] = substr($attribs['xlink:href'], 1);
-				}
-				break;
-			}
-			case 'stop': {
-				// gradient stops
-				if (substr($attribs['offset'], -1) == '%') {
-					$offset = floatval(substr($attribs['offset'], -1)) / 100;
-				} else {
-					$offset = floatval($attribs['offset']);
-					if ($offset > 1) {
-						$offset /= 100;
-					}
-				}
-				$stop_color = isset($svgstyle['stop-color'])?TCPDF_COLORS::convertHTMLColorToDec($svgstyle['stop-color'], $this->spot_colors):'black';
-				$opacity = isset($svgstyle['stop-opacity'])?$svgstyle['stop-opacity']:1;
-				$this->svggradients[$this->svggradientid]['stops'][] = array('offset' => $offset, 'color' => $stop_color, 'opacity' => $opacity);
-				break;
-			}
-			// paths
-			case 'path': {
-				if ($invisible) {
-					break;
-				}
-				if (isset($attribs['d'])) {
-					$d = trim($attribs['d']);
-					if (!empty($d)) {
-						$x = (isset($attribs['x'])?$attribs['x']:0);
-						$y = (isset($attribs['y'])?$attribs['y']:0);
-						$w = (isset($attribs['width'])?$attribs['width']:1);
-						$h = (isset($attribs['height'])?$attribs['height']:1);
-						$tm = TCPDF_STATIC::getTransformationMatrixProduct($tm, array($w, 0, 0, $h, $x, $y));
-						if ($clipping) {
-							$this->SVGTransform($tm);
-							$this->SVGPath($d, 'CNZ');
-						} else {
-							$this->StartTransform();
-							$this->SVGTransform($tm);
-							$obstyle = $this->setSVGStyles($svgstyle, $prev_svgstyle, $x, $y, $w, $h, 'SVGPath', array($d, 'CNZ'));
-							if (!empty($obstyle)) {
-								$this->SVGPath($d, $obstyle);
-							}
-							$this->StopTransform();
-						}
-					}
-				}
-				break;
-			}
-			// shapes
-			case 'rect': {
-				if ($invisible) {
-					break;
-				}
-				$x = (isset($attribs['x'])?$this->getHTMLUnitToUnits($attribs['x'], 0, $this->svgunit, false):0);
-				$y = (isset($attribs['y'])?$this->getHTMLUnitToUnits($attribs['y'], 0, $this->svgunit, false):0);
-				$w = (isset($attribs['width'])?$this->getHTMLUnitToUnits($attribs['width'], 0, $this->svgunit, false):0);
-				$h = (isset($attribs['height'])?$this->getHTMLUnitToUnits($attribs['height'], 0, $this->svgunit, false):0);
-				$rx = (isset($attribs['rx'])?$this->getHTMLUnitToUnits($attribs['rx'], 0, $this->svgunit, false):0);
-				$ry = (isset($attribs['ry'])?$this->getHTMLUnitToUnits($attribs['ry'], 0, $this->svgunit, false):$rx);
-				if ($clipping) {
-					$this->SVGTransform($tm);
-					$this->RoundedRectXY($x, $y, $w, $h, $rx, $ry, '1111', 'CNZ', array(), array());
-				} else {
-					$this->StartTransform();
-					$this->SVGTransform($tm);
-					$obstyle = $this->setSVGStyles($svgstyle, $prev_svgstyle, $x, $y, $w, $h, 'RoundedRectXY', array($x, $y, $w, $h, $rx, $ry, '1111', 'CNZ'));
-					if (!empty($obstyle)) {
-						$this->RoundedRectXY($x, $y, $w, $h, $rx, $ry, '1111', $obstyle, array(), array());
-					}
-					$this->StopTransform();
-				}
-				break;
-			}
-			case 'circle': {
-				if ($invisible) {
-					break;
-				}
-				$r = (isset($attribs['r']) ? $this->getHTMLUnitToUnits($attribs['r'], 0, $this->svgunit, false) : 0);
-				$cx = (isset($attribs['cx']) ? $this->getHTMLUnitToUnits($attribs['cx'], 0, $this->svgunit, false) : (isset($attribs['x']) ? $this->getHTMLUnitToUnits($attribs['x'], 0, $this->svgunit, false) : 0));
-				$cy = (isset($attribs['cy']) ? $this->getHTMLUnitToUnits($attribs['cy'], 0, $this->svgunit, false) : (isset($attribs['y']) ? $this->getHTMLUnitToUnits($attribs['y'], 0, $this->svgunit, false) : 0));
-				$x = ($cx - $r);
-				$y = ($cy - $r);
-				$w = (2 * $r);
-				$h = $w;
-				if ($clipping) {
-					$this->SVGTransform($tm);
-					$this->Circle($cx, $cy, $r, 0, 360, 'CNZ', array(), array(), 8);
-				} else {
-					$this->StartTransform();
-					$this->SVGTransform($tm);
-					$obstyle = $this->setSVGStyles($svgstyle, $prev_svgstyle, $x, $y, $w, $h, 'Circle', array($cx, $cy, $r, 0, 360, 'CNZ'));
-					if (!empty($obstyle)) {
-						$this->Circle($cx, $cy, $r, 0, 360, $obstyle, array(), array(), 8);
-					}
-					$this->StopTransform();
-				}
-				break;
-			}
-			case 'ellipse': {
-				if ($invisible) {
-					break;
-				}
-				$rx = (isset($attribs['rx']) ? $this->getHTMLUnitToUnits($attribs['rx'], 0, $this->svgunit, false) : 0);
-				$ry = (isset($attribs['ry']) ? $this->getHTMLUnitToUnits($attribs['ry'], 0, $this->svgunit, false) : 0);
-				$cx = (isset($attribs['cx']) ? $this->getHTMLUnitToUnits($attribs['cx'], 0, $this->svgunit, false) : (isset($attribs['x']) ? $this->getHTMLUnitToUnits($attribs['x'], 0, $this->svgunit, false) : 0));
-				$cy = (isset($attribs['cy']) ? $this->getHTMLUnitToUnits($attribs['cy'], 0, $this->svgunit, false) : (isset($attribs['y']) ? $this->getHTMLUnitToUnits($attribs['y'], 0, $this->svgunit, false) : 0));
-				$x = ($cx - $rx);
-				$y = ($cy - $ry);
-				$w = (2 * $rx);
-				$h = (2 * $ry);
-				if ($clipping) {
-					$this->SVGTransform($tm);
-					$this->Ellipse($cx, $cy, $rx, $ry, 0, 0, 360, 'CNZ', array(), array(), 8);
-				} else {
-					$this->StartTransform();
-					$this->SVGTransform($tm);
-					$obstyle = $this->setSVGStyles($svgstyle, $prev_svgstyle, $x, $y, $w, $h, 'Ellipse', array($cx, $cy, $rx, $ry, 0, 0, 360, 'CNZ'));
-					if (!empty($obstyle)) {
-						$this->Ellipse($cx, $cy, $rx, $ry, 0, 0, 360, $obstyle, array(), array(), 8);
-					}
-					$this->StopTransform();
-				}
-				break;
-			}
-			case 'line': {
-				if ($invisible) {
-					break;
-				}
-				$x1 = (isset($attribs['x1'])?$this->getHTMLUnitToUnits($attribs['x1'], 0, $this->svgunit, false):0);
-				$y1 = (isset($attribs['y1'])?$this->getHTMLUnitToUnits($attribs['y1'], 0, $this->svgunit, false):0);
-				$x2 = (isset($attribs['x2'])?$this->getHTMLUnitToUnits($attribs['x2'], 0, $this->svgunit, false):0);
-				$y2 = (isset($attribs['y2'])?$this->getHTMLUnitToUnits($attribs['y2'], 0, $this->svgunit, false):0);
-				$x = $x1;
-				$y = $y1;
-				$w = abs($x2 - $x1);
-				$h = abs($y2 - $y1);
-				if (!$clipping) {
-					$this->StartTransform();
-					$this->SVGTransform($tm);
-					$obstyle = $this->setSVGStyles($svgstyle, $prev_svgstyle, $x, $y, $w, $h, 'Line', array($x1, $y1, $x2, $y2));
-					$this->Line($x1, $y1, $x2, $y2);
-					$this->StopTransform();
-				}
-				break;
-			}
-			case 'polyline':
-			case 'polygon': {
-				if ($invisible) {
-					break;
-				}
-				$points = (isset($attribs['points'])?$attribs['points']:'0 0');
-				$points = trim($points);
-				// note that point may use a complex syntax not covered here
-				$points = preg_split('/[\,\s]+/si', $points);
-				if (count($points) < 4) {
-					break;
-				}
-				$p = array();
-				$xmin = 2147483647;
-				$xmax = 0;
-				$ymin = 2147483647;
-				$ymax = 0;
-				foreach ($points as $key => $val) {
-					$p[$key] = $this->getHTMLUnitToUnits($val, 0, $this->svgunit, false);
-					if (($key % 2) == 0) {
-						// X coordinate
-						$xmin = min($xmin, $p[$key]);
-						$xmax = max($xmax, $p[$key]);
-					} else {
-						// Y coordinate
-						$ymin = min($ymin, $p[$key]);
-						$ymax = max($ymax, $p[$key]);
-					}
-				}
-				$x = $xmin;
-				$y = $ymin;
-				$w = ($xmax - $xmin);
-				$h = ($ymax - $ymin);
-				if ($name == 'polyline') {
-					$this->StartTransform();
-					$this->SVGTransform($tm);
-					$obstyle = $this->setSVGStyles($svgstyle, $prev_svgstyle, $x, $y, $w, $h, 'PolyLine', array($p, 'CNZ'));
-					if (!empty($obstyle)) {
-						$this->PolyLine($p, $obstyle, array(), array());
-					}
-					$this->StopTransform();
-				} else { // polygon
-					if ($clipping) {
-						$this->SVGTransform($tm);
-						$this->Polygon($p, 'CNZ', array(), array(), true);
-					} else {
-						$this->StartTransform();
-						$this->SVGTransform($tm);
-						$obstyle = $this->setSVGStyles($svgstyle, $prev_svgstyle, $x, $y, $w, $h, 'Polygon', array($p, 'CNZ'));
-						if (!empty($obstyle)) {
-							$this->Polygon($p, $obstyle, array(), array(), true);
-						}
-						$this->StopTransform();
-					}
-				}
-				break;
-			}
-			// image
-			case 'image': {
-				if ($invisible) {
-					break;
-				}
-				if (!isset($attribs['xlink:href']) OR empty($attribs['xlink:href'])) {
-					break;
-				}
-				$x = (isset($attribs['x'])?$this->getHTMLUnitToUnits($attribs['x'], 0, $this->svgunit, false):0);
-				$y = (isset($attribs['y'])?$this->getHTMLUnitToUnits($attribs['y'], 0, $this->svgunit, false):0);
-				$w = (isset($attribs['width'])?$this->getHTMLUnitToUnits($attribs['width'], 0, $this->svgunit, false):0);
-				$h = (isset($attribs['height'])?$this->getHTMLUnitToUnits($attribs['height'], 0, $this->svgunit, false):0);
-				$img = $attribs['xlink:href'];
-				if (!$clipping) {
-					$this->StartTransform();
-					$this->SVGTransform($tm);
-					$obstyle = $this->setSVGStyles($svgstyle, $prev_svgstyle, $x, $y, $w, $h);
-					if (preg_match('/^data:image\/[^;]+;base64,/', $img, $m) > 0) {
-						// embedded image encoded as base64
-						$img = '@'.base64_decode(substr($img, strlen($m[0])));
-					} else {
-						// fix image path
-						if (!TCPDF_STATIC::empty_string($this->svgdir) AND (($img[0] == '.') OR (basename($img) == $img))) {
-							// replace relative path with full server path
-							$img = $this->svgdir.'/'.$img;
-						}
-						if (($img[0] == '/') AND !empty($_SERVER['DOCUMENT_ROOT']) AND ($_SERVER['DOCUMENT_ROOT'] != '/')) {
-							$findroot = strpos($img, $_SERVER['DOCUMENT_ROOT']);
-							if (($findroot === false) OR ($findroot > 1)) {
-								if (substr($_SERVER['DOCUMENT_ROOT'], -1) == '/') {
-									$img = substr($_SERVER['DOCUMENT_ROOT'], 0, -1).$img;
-								} else {
-									$img = $_SERVER['DOCUMENT_ROOT'].$img;
-								}
-							}
-						}
-						$img = urldecode($img);
-						$testscrtype = @parse_url($img);
-						if (!isset($testscrtype['query']) OR empty($testscrtype['query'])) {
-							// convert URL to server path
-							$img = str_replace(K_PATH_URL, K_PATH_MAIN, $img);
-						}
-					}
-					// get image type
-					$imgtype = TCPDF_IMAGES::getImageFileType($img);
-					if (($imgtype == 'eps') OR ($imgtype == 'ai')) {
-						$this->ImageEps($img, $x, $y, $w, $h);
-					} elseif ($imgtype == 'svg') {
-						// store SVG vars
-						$svggradients = $this->svggradients;
-						$svggradientid = $this->svggradientid;
-						$svgdefsmode = $this->svgdefsmode;
-						$svgdefs = $this->svgdefs;
-						$svgclipmode = $this->svgclipmode;
-						$svgclippaths = $this->svgclippaths;
-						$svgcliptm = $this->svgcliptm;
-						$svgclipid = $this->svgclipid;
-						$svgtext = $this->svgtext;
-						$svgtextmode = $this->svgtextmode;
-						$this->ImageSVG($img, $x, $y, $w, $h);
-						// restore SVG vars
-						$this->svggradients = $svggradients;
-						$this->svggradientid = $svggradientid;
-						$this->svgdefsmode = $svgdefsmode;
-						$this->svgdefs = $svgdefs;
-						$this->svgclipmode = $svgclipmode;
-						$this->svgclippaths = $svgclippaths;
-						$this->svgcliptm = $svgcliptm;
-						$this->svgclipid = $svgclipid;
-						$this->svgtext = $svgtext;
-						$this->svgtextmode = $svgtextmode;
-					} else {
-						$this->Image($img, $x, $y, $w, $h);
-					}
-					$this->StopTransform();
-				}
-				break;
-			}
-			// text
-			case 'text':
-			case 'tspan': {
-				if (isset($this->svgtextmode['text-anchor']) AND !empty($this->svgtext)) {
-					// @TODO: unsupported feature
-				}
-				// only basic support - advanced features must be implemented
-				$this->svgtextmode['invisible'] = $invisible;
-				if ($invisible) {
-					break;
-				}
-				array_push($this->svgstyles, $svgstyle);
-				if (isset($attribs['x'])) {
-					$x = $this->getHTMLUnitToUnits($attribs['x'], 0, $this->svgunit, false);
-				} elseif ($name == 'tspan') {
-					$x = $this->x;
-				} else {
-					$x = 0;
-				}
-				if (isset($attribs['dx'])) {
-					$x += $this->getHTMLUnitToUnits($attribs['dx'], 0, $this->svgunit, false);
-				}
-				if (isset($attribs['y'])) {
-					$y = $this->getHTMLUnitToUnits($attribs['y'], 0, $this->svgunit, false);
-				} elseif ($name == 'tspan') {
-					$y = $this->y;
-				} else {
-					$y = 0;
-				}
-				if (isset($attribs['dy'])) {
-					$y += $this->getHTMLUnitToUnits($attribs['dy'], 0, $this->svgunit, false);
-				}
-				$svgstyle['text-color'] = $svgstyle['fill'];
-				$this->svgtext = '';
-				if (isset($svgstyle['text-anchor'])) {
-					$this->svgtextmode['text-anchor'] = $svgstyle['text-anchor'];
-				} else {
-					$this->svgtextmode['text-anchor'] = 'start';
-				}
-				if (isset($svgstyle['direction'])) {
-					if ($svgstyle['direction'] == 'rtl') {
-						$this->svgtextmode['rtl'] = true;
-					} else {
-						$this->svgtextmode['rtl'] = false;
-					}
-				} else {
-					$this->svgtextmode['rtl'] = false;
-				}
-				if (isset($svgstyle['stroke']) AND ($svgstyle['stroke'] != 'none') AND isset($svgstyle['stroke-width']) AND ($svgstyle['stroke-width'] > 0)) {
-					$this->svgtextmode['stroke'] = $this->getHTMLUnitToUnits($svgstyle['stroke-width'], 0, $this->svgunit, false);
-				} else {
-					$this->svgtextmode['stroke'] = false;
-				}
-				$this->StartTransform();
-				$this->SVGTransform($tm);
-				$obstyle = $this->setSVGStyles($svgstyle, $prev_svgstyle, $x, $y, 1, 1);
-				$this->x = $x;
-				$this->y = $y;
-				break;
-			}
-			// use
-			case 'use': {
-				if (isset($attribs['xlink:href']) AND !empty($attribs['xlink:href'])) {
-					$svgdefid = substr($attribs['xlink:href'], 1);
-					if (isset($this->svgdefs[$svgdefid])) {
-						$use = $this->svgdefs[$svgdefid];
-						if (isset($attribs['xlink:href'])) {
-							unset($attribs['xlink:href']);
-						}
-						if (isset($attribs['id'])) {
-							unset($attribs['id']);
-						}
-						if (isset($use['attribs']['x']) AND isset($attribs['x'])) {
-							$attribs['x'] += $use['attribs']['x'];
-						}
-						if (isset($use['attribs']['y']) AND isset($attribs['y'])) {
-							$attribs['y'] += $use['attribs']['y'];
-						}
-						if (empty($attribs['style'])) {
-							$attribs['style'] = '';
-						}
-						if (!empty($use['attribs']['style'])) {
-							// merge styles
-							$attribs['style'] = str_replace(';;',';',';'.$use['attribs']['style'].$attribs['style']);
-						}
-						$attribs = array_merge($use['attribs'], $attribs);
-						$this->startSVGElementHandler($parser, $use['name'], $attribs);
-						return;
-					}
-				}
-				break;
-			}
-			default: {
-				break;
-			}
-		} // end of switch
-		// process child elements
-		if (!empty($attribs['child_elements'])) {
-			$child_elements = $attribs['child_elements'];
-			unset($attribs['child_elements']);
-			foreach($child_elements as $child_element) {
-				if (empty($child_element['attribs']['closing_tag'])) {
-					$this->startSVGElementHandler('child-tag', $child_element['name'], $child_element['attribs']);
-				} else {
-					if (isset($child_element['attribs']['content'])) {
-						$this->svgtext = $child_element['attribs']['content'];
-					}
-					$this->endSVGElementHandler('child-tag', $child_element['name']);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Sets the closing SVG element handler function for the XML parser.
-	 * @param $parser (resource) The first parameter, parser, is a reference to the XML parser calling the handler.
-	 * @param $name (string) The second parameter, name, contains the name of the element for which this handler is called. If case-folding is in effect for this parser, the element name will be in uppercase letters.
-	 * @author Nicola Asuni
-	 * @since 5.0.000 (2010-05-02)
-	 * @protected
-	 */
-	protected function endSVGElementHandler($parser, $name) {
-		$name = $this->removeTagNamespace($name);
-		if ($this->svgdefsmode AND !in_array($name, array('defs', 'clipPath', 'linearGradient', 'radialGradient', 'stop'))) {;
-			if (end($this->svgdefs) !== FALSE) {
-				$last_svgdefs_id = key($this->svgdefs);
-				if (isset($this->svgdefs[$last_svgdefs_id]['attribs']['child_elements'])) {
-					foreach($this->svgdefs[$last_svgdefs_id]['attribs']['child_elements'] as $child_element) {
-						if (isset($child_element['attribs']['id']) AND ($child_element['name'] == $name)) {
-							$this->svgdefs[$last_svgdefs_id]['attribs']['child_elements'][$child_element['attribs']['id'].'_CLOSE'] = array('name' => $name, 'attribs' => array('closing_tag' => TRUE, 'content' => $this->svgtext));
-							return;
-						}
-					}
-					if ($this->svgdefs[$last_svgdefs_id]['name'] == $name) {
-						$this->svgdefs[$last_svgdefs_id]['attribs']['child_elements'][$last_svgdefs_id.'_CLOSE'] = array('name' => $name, 'attribs' => array('closing_tag' => TRUE, 'content' => $this->svgtext));
-						return;
-					}
-				}
-			}
-			return;
-		}
-		switch($name) {
-			case 'defs': {
-				$this->svgdefsmode = false;
-				break;
-			}
-			// clipPath
-			case 'clipPath': {
-				$this->svgclipmode = false;
-				break;
-			}
-			case 'svg': {
-				if (--$this->svg_tag_depth <= 0) {
-					break;
-				}
-			}
-			case 'g': {
-				// ungroup: remove last style from array
-				array_pop($this->svgstyles);
-				$this->StopTransform();
-				break;
-			}
-			case 'text':
-			case 'tspan': {
-				if ($this->svgtextmode['invisible']) {
-					// This implementation must be fixed to following the rule:
-					// If the 'visibility' property is set to hidden on a 'tspan', 'tref' or 'altGlyph' element, then the text is invisible but still takes up space in text layout calculations.
-					break;
-				}
-				// print text
-				$text = $this->svgtext;
-				//$text = $this->stringTrim($text);
-				$textlen = $this->GetStringWidth($text);
-				if ($this->svgtextmode['text-anchor'] != 'start') {
-					// check if string is RTL text
-					if ($this->svgtextmode['text-anchor'] == 'end') {
-						if ($this->svgtextmode['rtl']) {
-							$this->x += $textlen;
-						} else {
-							$this->x -= $textlen;
-						}
-					} elseif ($this->svgtextmode['text-anchor'] == 'middle') {
-						if ($this->svgtextmode['rtl']) {
-							$this->x += ($textlen / 2);
-						} else {
-							$this->x -= ($textlen / 2);
-						}
-					}
-				}
-				$textrendermode = $this->textrendermode;
-				$textstrokewidth = $this->textstrokewidth;
-				$this->setTextRenderingMode($this->svgtextmode['stroke'], true, false);
-				if ($name == 'text') {
-					// store current coordinates
-					$tmpx = $this->x;
-					$tmpy = $this->y;
-				}
-				// print the text
-				$this->Cell($textlen, 0, $text, 0, 0, '', false, '', 0, false, 'L', 'T');
-				if ($name == 'text') {
-					// restore coordinates
-					$this->x = $tmpx;
-					$this->y = $tmpy;
-				}
-				// restore previous rendering mode
-				$this->textrendermode = $textrendermode;
-				$this->textstrokewidth = $textstrokewidth;
-				$this->svgtext = '';
-				$this->StopTransform();
-				if (!$this->svgdefsmode) {
-					array_pop($this->svgstyles);
-				}
-				break;
-			}
-			default: {
-				break;
-			}
-		}
-	}
-
-	/**
-	 * Sets the character data handler function for the XML parser.
-	 * @param $parser (resource) The first parameter, parser, is a reference to the XML parser calling the handler.
-	 * @param $data (string) The second parameter, data, contains the character data as a string.
-	 * @author Nicola Asuni
-	 * @since 5.0.000 (2010-05-02)
-	 * @protected
-	 */
-	protected function segSVGContentHandler($parser, $data) {
-		$this->svgtext .= $data;
-	}
-
-	// --- END SVG METHODS -----------------------------------------------------
-
-} // END OF TCPDF CLASS
-
-//============================================================+
-// END OF FILE
-//============================================================+
diff --git a/#pma/libraries/tcpdf/tcpdf_autoconfig.php b/#pma/libraries/tcpdf/tcpdf_autoconfig.php
deleted file mode 100644
index 6ec9ce83..00000000
--- a/#pma/libraries/tcpdf/tcpdf_autoconfig.php
+++ /dev/null
@@ -1,241 +0,0 @@
-<?php
-//============================================================+
-// File name   : tcpdf_autoconfig.php
-// Version     : 1.1.1
-// Begin       : 2013-05-16
-// Last Update : 2014-12-18
-// Authors     : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
-// License     : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
-// -------------------------------------------------------------------
-// Copyright (C) 2011-2014 Nicola Asuni - Tecnick.com LTD
-//
-// This file is part of TCPDF software library.
-//
-// TCPDF is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// TCPDF is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-// See the GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the License
-// along with TCPDF. If not, see
-// <http://www.tecnick.com/pagefiles/tcpdf/LICENSE.TXT>.
-//
-// See LICENSE.TXT file for more information.
-// -------------------------------------------------------------------
-//
-// Description : Try to automatically configure some TCPDF
-//               constants if not defined.
-//
-//============================================================+
-
-/**
- * @file
- * Try to automatically configure some TCPDF constants if not defined.
- * @package com.tecnick.tcpdf
- * @version 1.1.1
- */
-
-// DOCUMENT_ROOT fix for IIS Webserver
-if ((!isset($_SERVER['DOCUMENT_ROOT'])) OR (empty($_SERVER['DOCUMENT_ROOT']))) {
-	if(isset($_SERVER['SCRIPT_FILENAME'])) {
-		$_SERVER['DOCUMENT_ROOT'] = str_replace( '\\', '/', substr($_SERVER['SCRIPT_FILENAME'], 0, 0-strlen($_SERVER['PHP_SELF'])));
-	} elseif(isset($_SERVER['PATH_TRANSLATED'])) {
-		$_SERVER['DOCUMENT_ROOT'] = str_replace( '\\', '/', substr(str_replace('\\\\', '\\', $_SERVER['PATH_TRANSLATED']), 0, 0-strlen($_SERVER['PHP_SELF'])));
-	} else {
-		// define here your DOCUMENT_ROOT path if the previous fails (e.g. '/var/www')
-		$_SERVER['DOCUMENT_ROOT'] = '/';
-	}
-}
-$_SERVER['DOCUMENT_ROOT'] = str_replace('//', '/', $_SERVER['DOCUMENT_ROOT']);
-if (substr($_SERVER['DOCUMENT_ROOT'], -1) != '/') {
-	$_SERVER['DOCUMENT_ROOT'] .= '/';
-}
-
-// Load main configuration file only if the K_TCPDF_EXTERNAL_CONFIG constant is set to false.
-if (!defined('K_TCPDF_EXTERNAL_CONFIG') OR !K_TCPDF_EXTERNAL_CONFIG) {
-	// define a list of default config files in order of priority
-	$tcpdf_config_files = array(dirname(__FILE__).'/config/tcpdf_config.php', '/etc/php-tcpdf/tcpdf_config.php', '/etc/tcpdf/tcpdf_config.php', '/etc/tcpdf_config.php');
-	foreach ($tcpdf_config_files as $tcpdf_config) {
-		if (@file_exists($tcpdf_config) AND is_readable($tcpdf_config)) {
-			require_once($tcpdf_config);
-			break;
-		}
-	}
-}
-
-if (!defined('K_PATH_MAIN')) {
-	define ('K_PATH_MAIN', dirname(__FILE__).'/');
-}
-
-if (!defined('K_PATH_FONTS')) {
-	define ('K_PATH_FONTS', K_PATH_MAIN.'fonts/');
-}
-
-if (!defined('K_PATH_URL')) {
-	$k_path_url = K_PATH_MAIN; // default value for console mode
-	if (isset($_SERVER['HTTP_HOST']) AND (!empty($_SERVER['HTTP_HOST']))) {
-		if(isset($_SERVER['HTTPS']) AND (!empty($_SERVER['HTTPS'])) AND (strtolower($_SERVER['HTTPS']) != 'off')) {
-			$k_path_url = 'https://';
-		} else {
-			$k_path_url = 'http://';
-		}
-		$k_path_url .= $_SERVER['HTTP_HOST'];
-		$k_path_url .= str_replace( '\\', '/', substr(K_PATH_MAIN, (strlen($_SERVER['DOCUMENT_ROOT']) - 1)));
-	}
-	define ('K_PATH_URL', $k_path_url);
-}
-
-if (!defined('K_PATH_IMAGES')) {
-	$tcpdf_images_dirs = array(K_PATH_MAIN.'examples/images/', K_PATH_MAIN.'images/', '/usr/share/doc/php-tcpdf/examples/images/', '/usr/share/doc/tcpdf/examples/images/', '/usr/share/doc/php/tcpdf/examples/images/', '/var/www/tcpdf/images/', '/var/www/html/tcpdf/images/', '/usr/local/apache2/htdocs/tcpdf/images/', K_PATH_MAIN);
-	foreach ($tcpdf_images_dirs as $tcpdf_images_path) {
-		if (@file_exists($tcpdf_images_path)) {
-			define ('K_PATH_IMAGES', $tcpdf_images_path);
-			break;
-		}
-	}
-}
-
-if (!defined('PDF_HEADER_LOGO')) {
-	$tcpdf_header_logo = '';
-	if (@file_exists(K_PATH_IMAGES.'tcpdf_logo.jpg')) {
-		$tcpdf_header_logo = 'tcpdf_logo.jpg';
-	}
-	define ('PDF_HEADER_LOGO', $tcpdf_header_logo);
-}
-
-if (!defined('PDF_HEADER_LOGO_WIDTH')) {
-	if (!empty($tcpdf_header_logo)) {
-		define ('PDF_HEADER_LOGO_WIDTH', 30);
-	} else {
-		define ('PDF_HEADER_LOGO_WIDTH', 0);
-	}
-}
-
-if (!defined('K_PATH_CACHE')) {
-	$K_PATH_CACHE = ini_get('upload_tmp_dir') ? ini_get('upload_tmp_dir') : sys_get_temp_dir();
-	if (substr($K_PATH_CACHE, -1) != '/') {
-		$K_PATH_CACHE .= '/';
-	}
-	define ('K_PATH_CACHE', $K_PATH_CACHE);
-}
-
-if (!defined('K_BLANK_IMAGE')) {
-	define ('K_BLANK_IMAGE', '_blank.png');
-}
-
-if (!defined('PDF_PAGE_FORMAT')) {
-	define ('PDF_PAGE_FORMAT', 'A4');
-}
-
-if (!defined('PDF_PAGE_ORIENTATION')) {
-	define ('PDF_PAGE_ORIENTATION', 'P');
-}
-
-if (!defined('PDF_CREATOR')) {
-	define ('PDF_CREATOR', 'TCPDF');
-}
-
-if (!defined('PDF_AUTHOR')) {
-	define ('PDF_AUTHOR', 'TCPDF');
-}
-
-if (!defined('PDF_HEADER_TITLE')) {
-	define ('PDF_HEADER_TITLE', 'TCPDF Example');
-}
-
-if (!defined('PDF_HEADER_STRING')) {
-	define ('PDF_HEADER_STRING', "by Nicola Asuni - Tecnick.com\nwww.tcpdf.org");
-}
-
-if (!defined('PDF_UNIT')) {
-	define ('PDF_UNIT', 'mm');
-}
-
-if (!defined('PDF_MARGIN_HEADER')) {
-	define ('PDF_MARGIN_HEADER', 5);
-}
-
-if (!defined('PDF_MARGIN_FOOTER')) {
-	define ('PDF_MARGIN_FOOTER', 10);
-}
-
-if (!defined('PDF_MARGIN_TOP')) {
-	define ('PDF_MARGIN_TOP', 27);
-}
-
-if (!defined('PDF_MARGIN_BOTTOM')) {
-	define ('PDF_MARGIN_BOTTOM', 25);
-}
-
-if (!defined('PDF_MARGIN_LEFT')) {
-	define ('PDF_MARGIN_LEFT', 15);
-}
-
-if (!defined('PDF_MARGIN_RIGHT')) {
-	define ('PDF_MARGIN_RIGHT', 15);
-}
-
-if (!defined('PDF_FONT_NAME_MAIN')) {
-	define ('PDF_FONT_NAME_MAIN', 'helvetica');
-}
-
-if (!defined('PDF_FONT_SIZE_MAIN')) {
-	define ('PDF_FONT_SIZE_MAIN', 10);
-}
-
-if (!defined('PDF_FONT_NAME_DATA')) {
-	define ('PDF_FONT_NAME_DATA', 'helvetica');
-}
-
-if (!defined('PDF_FONT_SIZE_DATA')) {
-	define ('PDF_FONT_SIZE_DATA', 8);
-}
-
-if (!defined('PDF_FONT_MONOSPACED')) {
-	define ('PDF_FONT_MONOSPACED', 'courier');
-}
-
-if (!defined('PDF_IMAGE_SCALE_RATIO')) {
-	define ('PDF_IMAGE_SCALE_RATIO', 1.25);
-}
-
-if (!defined('HEAD_MAGNIFICATION')) {
-	define('HEAD_MAGNIFICATION', 1.1);
-}
-
-if (!defined('K_CELL_HEIGHT_RATIO')) {
-	define('K_CELL_HEIGHT_RATIO', 1.25);
-}
-
-if (!defined('K_TITLE_MAGNIFICATION')) {
-	define('K_TITLE_MAGNIFICATION', 1.3);
-}
-
-if (!defined('K_SMALL_RATIO')) {
-	define('K_SMALL_RATIO', 2/3);
-}
-
-if (!defined('K_THAI_TOPCHARS')) {
-	define('K_THAI_TOPCHARS', true);
-}
-
-if (!defined('K_TCPDF_CALLS_IN_HTML')) {
-	define('K_TCPDF_CALLS_IN_HTML', false);
-}
-
-if (!defined('K_TCPDF_THROW_EXCEPTION_ERROR')) {
-	define('K_TCPDF_THROW_EXCEPTION_ERROR', false);
-}
-
-if (!defined('K_TIMEZONE')) {
-	define('K_TIMEZONE', @date_default_timezone_get());
-}
-
-//============================================================+
-// END OF FILE
-//============================================================+
diff --git a/#pma/libraries/tracking.lib.php b/#pma/libraries/tracking.lib.php
deleted file mode 100644
index 6e2dace0..00000000
--- a/#pma/libraries/tracking.lib.php
+++ /dev/null
@@ -1,1756 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Functions used for database and table tracking
- *
- * @package PhpMyAdmin
- */
-use PMA\libraries\Message;
-use PMA\libraries\Response;
-use PMA\libraries\Tracker;
-
-/**
- * Filters tracking entries
- *
- * @param array  $data           the entries to filter
- * @param string $filter_ts_from "from" date
- * @param string $filter_ts_to   "to" date
- * @param array  $filter_users   users
- *
- * @return array filtered entries
- */
-function PMA_filterTracking(
-    $data, $filter_ts_from, $filter_ts_to, $filter_users
-) {
-    $tmp_entries = array();
-    $id = 0;
-    foreach ($data as $entry) {
-        $timestamp = strtotime($entry['date']);
-        $filtered_user = in_array($entry['username'], $filter_users);
-        if ($timestamp >= $filter_ts_from
-            && $timestamp <= $filter_ts_to
-            && (in_array('*', $filter_users) || $filtered_user)
-        ) {
-            $tmp_entries[] = array(
-                'id'        => $id,
-                'timestamp' => $timestamp,
-                'username'  => $entry['username'],
-                'statement' => $entry['statement']
-            );
-        }
-        $id++;
-    }
-    return($tmp_entries);
-}
-
-/**
- * Function to get html for data definition and data manipulation statements
- *
- * @param string $url_query    url query
- * @param int    $last_version last version
- * @param string $db           database
- * @param array  $selected     selected tables
- * @param string $type         type of the table; table, view or both
- *
- * @return string
- */
-function PMA_getHtmlForDataDefinitionAndManipulationStatements($url_query,
-    $last_version, $db, $selected, $type = 'both'
-) {
-    $html  = '<div id="div_create_version">';
-    $html .= '<form method="post" action="' . $url_query . '">';
-    $html .= PMA_URL_getHiddenInputs($db);
-    foreach ($selected as $selected_table) {
-        $html .= '<input type="hidden" name="selected[]"'
-            . ' value="' . htmlspecialchars($selected_table) . '" />';
-    }
-
-    $html .= '<fieldset>';
-    $html .= '<legend>';
-    if (count($selected) == 1) {
-        $html .= sprintf(
-            __('Create version %1$s of %2$s'),
-            ($last_version + 1),
-            htmlspecialchars($db . '.' . $selected[0])
-        );
-    } else {
-        $html .= sprintf(__('Create version %1$s'), ($last_version + 1));
-    }
-    $html .= '</legend>';
-    $html .= '<input type="hidden" name="version" value="' . ($last_version + 1)
-        . '" />';
-    $html .= '<p>' . __('Track these data definition statements:')
-        . '</p>';
-
-    if ($type == 'both' || $type == 'table') {
-        $html .= '<input type="checkbox" name="alter_table" value="true"'
-            . (mb_stripos(
-                $GLOBALS['cfg']['Server']['tracking_default_statements'],
-                'ALTER TABLE'
-            ) !== false ? ' checked="checked"' : '')
-            . ' /> ALTER TABLE<br/>';
-        $html .= '<input type="checkbox" name="rename_table" value="true"'
-            . (mb_stripos(
-                $GLOBALS['cfg']['Server']['tracking_default_statements'],
-                'RENAME TABLE'
-            ) !== false ? ' checked="checked"' : '')
-            . ' /> RENAME TABLE<br/>';
-        $html .= '<input type="checkbox" name="create_table" value="true"'
-            . (mb_stripos(
-                $GLOBALS['cfg']['Server']['tracking_default_statements'],
-                'CREATE TABLE'
-            ) !== false ? ' checked="checked"' : '')
-            . ' /> CREATE TABLE<br/>';
-        $html .= '<input type="checkbox" name="drop_table" value="true"'
-            . (mb_stripos(
-                $GLOBALS['cfg']['Server']['tracking_default_statements'],
-                'DROP TABLE'
-            ) !== false ? ' checked="checked"' : '')
-            . ' /> DROP TABLE<br/>';
-    }
-    if ($type == 'both') {
-        $html .= '<br/>';
-    }
-    if ($type == 'both' || $type == 'view') {
-        $html .= '<input type="checkbox" name="alter_view" value="true"'
-            . (mb_stripos(
-                $GLOBALS['cfg']['Server']['tracking_default_statements'],
-                'ALTER VIEW'
-            ) !== false ? ' checked="checked"' : '')
-            . ' /> ALTER VIEW<br/>';
-        $html .= '<input type="checkbox" name="create_view" value="true"'
-            . (mb_stripos(
-                $GLOBALS['cfg']['Server']['tracking_default_statements'],
-                'CREATE VIEW'
-            ) !== false ? ' checked="checked"' : '')
-            . ' /> CREATE VIEW<br/>';
-        $html .= '<input type="checkbox" name="drop_view" value="true"'
-            . (mb_stripos(
-                $GLOBALS['cfg']['Server']['tracking_default_statements'],
-                'DROP VIEW'
-            ) !== false ? ' checked="checked"' : '')
-            . ' /> DROP VIEW<br/>';
-    }
-    $html .= '<br/>';
-
-    $html .= '<input type="checkbox" name="create_index" value="true"'
-        . (mb_stripos(
-            $GLOBALS['cfg']['Server']['tracking_default_statements'],
-            'CREATE INDEX'
-        ) !== false ? ' checked="checked"' : '')
-        . ' /> CREATE INDEX<br/>';
-    $html .= '<input type="checkbox" name="drop_index" value="true"'
-        . (mb_stripos(
-            $GLOBALS['cfg']['Server']['tracking_default_statements'],
-            'DROP INDEX'
-        ) !== false ? ' checked="checked"' : '')
-        . ' /> DROP INDEX<br/>';
-    $html .= '<p>' . __('Track these data manipulation statements:') . '</p>';
-    $html .= '<input type="checkbox" name="insert" value="true"'
-        . (mb_stripos(
-            $GLOBALS['cfg']['Server']['tracking_default_statements'],
-            'INSERT'
-        ) !== false ? ' checked="checked"' : '')
-        . ' /> INSERT<br/>';
-    $html .= '<input type="checkbox" name="update" value="true"'
-        . (mb_stripos(
-            $GLOBALS['cfg']['Server']['tracking_default_statements'],
-            'UPDATE'
-        ) !== false ? ' checked="checked"' : '')
-        . ' /> UPDATE<br/>';
-    $html .= '<input type="checkbox" name="delete" value="true"'
-        . (mb_stripos(
-            $GLOBALS['cfg']['Server']['tracking_default_statements'],
-            'DELETE'
-        ) !== false ? ' checked="checked"' : '')
-        . ' /> DELETE<br/>';
-    $html .= '<input type="checkbox" name="truncate" value="true"'
-        . (mb_stripos(
-            $GLOBALS['cfg']['Server']['tracking_default_statements'],
-            'TRUNCATE'
-        ) !== false ? ' checked="checked"' : '')
-        . ' /> TRUNCATE<br/>';
-    $html .= '</fieldset>';
-
-    $html .= '<fieldset class="tblFooters">';
-    $html .= '<input type="hidden" name="submit_create_version" value="1" />';
-    $html .= '<input type="submit" value="' . __('Create version') . '" />';
-    $html .= '</fieldset>';
-
-    $html .= '</form>';
-    $html .= '</div>';
-
-    return $html;
-}
-
-/**
- * Function to get html for activate/deactivate tracking
- *
- * @param string $action       activate|deactivate
- * @param string $url_query    url query
- * @param int    $last_version last version
- *
- * @return string
- */
-function PMA_getHtmlForActivateDeactivateTracking(
-    $action, $url_query, $last_version
-) {
-    $html = '<div>';
-    $html .= '<form method="post" action="tbl_tracking.php' . $url_query . '">';
-    $html .= '<fieldset>';
-    $html .= '<legend>';
-
-    switch($action) {
-    case 'activate':
-        $legend = __('Activate tracking for %s');
-        $value = "activate_now";
-        $button = __('Activate now');
-        break;
-    case 'deactivate':
-        $legend = __('Deactivate tracking for %s');
-        $value = "deactivate_now";
-        $button = __('Deactivate now');
-        break;
-    default:
-        $legend = '';
-        $value = '';
-        $button = '';
-    }
-
-    $html .= sprintf(
-        $legend,
-        htmlspecialchars($GLOBALS['db'] . '.' . $GLOBALS['table'])
-    );
-    $html .= '</legend>';
-    $html .= '<input type="hidden" name="version" value="' . $last_version . '" />';
-    $html .= '<input type="hidden" name="toggle_activation" value="' . $value
-        . '" />';
-    $html .= '<input type="submit" value="' . $button . '" />';
-    $html .= '</fieldset>';
-    $html .= '</form>';
-    $html .= '</div>';
-
-    return $html;
-}
-
-/**
- * Function to get the list versions of the table
- *
- * @return array
- */
-function PMA_getListOfVersionsOfTable()
-{
-    $cfgRelation = PMA_getRelationsParam();
-    $sql_query = " SELECT * FROM " .
-        PMA\libraries\Util::backquote($cfgRelation['db']) . "." .
-        PMA\libraries\Util::backquote($cfgRelation['tracking']) .
-        " WHERE db_name = '" . $GLOBALS['dbi']->escapeString($_REQUEST['db']) .
-        "' " .
-        " AND table_name = '" .
-        $GLOBALS['dbi']->escapeString($_REQUEST['table']) . "' " .
-        " ORDER BY version DESC ";
-
-    return PMA_queryAsControlUser($sql_query);
-}
-
-/**
- * Function to get html for displaying last version number
- *
- * @param array  $sql_result    sql result
- * @param int    $last_version  last version
- * @param array  $url_params    url parameters
- * @param string $url_query     url query
- * @param string $pmaThemeImage path to theme's image folder
- * @param string $text_dir      text direction
- *
- * @return string
- */
-function PMA_getHtmlForTableVersionDetails(
-    $sql_result, $last_version, $url_params,
-    $url_query, $pmaThemeImage, $text_dir
-) {
-    $tracking_active = false;
-
-    $html  = '<form method="post" action="tbl_tracking.php" name="versionsForm"'
-        . ' id="versionsForm" class="ajax">';
-    $html .= PMA_URL_getHiddenInputs($GLOBALS['db'], $GLOBALS['table']);
-    $html .= '<table id="versions" class="data">';
-    $html .= '<thead>';
-    $html .= '<tr>';
-    $html .= '<th></th>';
-    $html .= '<th>' . __('Version') . '</th>';
-    $html .= '<th>' . __('Created') . '</th>';
-    $html .= '<th>' . __('Updated') . '</th>';
-    $html .= '<th>' . __('Status') . '</th>';
-    $html .= '<th>' . __('Action') . '</th>';
-    $html .= '<th>' . __('Show') . '</th>';
-    $html .= '</tr>';
-    $html .= '</thead>';
-    $html .= '<tbody>';
-
-    $style = 'odd';
-    $GLOBALS['dbi']->dataSeek($sql_result, 0);
-    $delete = PMA\libraries\Util::getIcon('b_drop.png', __('Delete version'));
-    $report = PMA\libraries\Util::getIcon('b_report.png', __('Tracking report'));
-    $structure = PMA\libraries\Util::getIcon(
-        'b_props.png',
-        __('Structure snapshot')
-    );
-
-    while ($version = $GLOBALS['dbi']->fetchArray($sql_result)) {
-        if ($version['version'] == $last_version) {
-            if ($version['tracking_active'] == 1) {
-                $tracking_active = true;
-            } else {
-                $tracking_active = false;
-            }
-        }
-        $delete_link = 'tbl_tracking.php' . $url_query . '&amp;version='
-            . htmlspecialchars($version['version'])
-            . '&amp;submit_delete_version=true';
-        $checkbox_id = 'selected_versions_' . htmlspecialchars($version['version']);
-
-        $html .= '<tr class="' . $style . '">';
-        $html .= '<td class="center">';
-        $html .= '<input type="checkbox" name="selected_versions[]"'
-            . ' class="checkall" id="' . $checkbox_id . '"'
-            . ' value="' . htmlspecialchars($version['version']) . '"/>';
-        $html .= '</td>';
-        $html .= '<th class="floatright">';
-        $html .= '<label for="' . $checkbox_id . '">'
-            . htmlspecialchars($version['version']) . '</label>';
-        $html .= '</th>';
-        $html .= '<td>' . htmlspecialchars($version['date_created']) . '</td>';
-        $html .= '<td>' . htmlspecialchars($version['date_updated']) . '</td>';
-        $html .= '<td>' . PMA_getVersionStatus($version) . '</td>';
-        $html .= '<td><a class="delete_version_anchor ajax"'
-            . ' href="' . $delete_link . '" >' . $delete . '</a></td>';
-        $html .= '<td><a href="tbl_tracking.php';
-        $html .= PMA_URL_getCommon(
-            $url_params + array(
-                'report' => 'true', 'version' => $version['version']
-            )
-        );
-        $html .= '">' . $report . '</a>';
-        $html .= '&nbsp;&nbsp;';
-        $html .= '<a href="tbl_tracking.php';
-        $html .= PMA_URL_getCommon(
-            $url_params + array(
-                'snapshot' => 'true', 'version' => $version['version']
-            )
-        );
-        $html .= '">' . $structure . '</a>';
-        $html .= '</td>';
-        $html .= '</tr>';
-
-        if ($style == 'even') {
-            $style = 'odd';
-        } else {
-            $style = 'even';
-        }
-    }
-
-    $html .= '</tbody>';
-    $html .= '</table>';
-
-    $html .= PMA\libraries\Util::getWithSelected(
-        $pmaThemeImage,
-        $text_dir,
-        "versionsForm"
-    );
-    $html .= PMA\libraries\Util::getButtonOrImage(
-        'submit_mult', 'mult_submit', 'submit_mult_delete_version',
-        __('Delete version'), 'b_drop.png', 'delete_version'
-    );
-
-    $html .= '</form>';
-
-    if ($tracking_active) {
-        $html .= PMA_getHtmlForActivateDeactivateTracking(
-            'deactivate', $url_query, $last_version
-        );
-    } else {
-        $html .= PMA_getHtmlForActivateDeactivateTracking(
-            'activate', $url_query, $last_version
-        );
-    }
-
-    return $html;
-}
-
-/**
- * Function to get the last version number of a table
- *
- * @param array $sql_result sql result
- *
- * @return int
- */
-function PMA_getTableLastVersionNumber($sql_result)
-{
-    $maxversion = $GLOBALS['dbi']->fetchArray($sql_result);
-    return intval($maxversion['version']);
-}
-
-/**
- * Function to get sql results for selectable tables
- *
- * @return array
- */
-function PMA_getSQLResultForSelectableTables()
-{
-    include_once 'libraries/relation.lib.php';
-    $cfgRelation = PMA_getRelationsParam();
-
-    $sql_query = " SELECT DISTINCT db_name, table_name FROM " .
-        PMA\libraries\Util::backquote($cfgRelation['db']) . "." .
-        PMA\libraries\Util::backquote($cfgRelation['tracking']) .
-        " WHERE db_name = '" . $GLOBALS['dbi']->escapeString($GLOBALS['db']) .
-        "' " .
-        " ORDER BY db_name, table_name";
-
-    return PMA_queryAsControlUser($sql_query);
-}
-
-/**
- * Function to get html for selectable table rows
- *
- * @param array  $selectable_tables_sql_result sql results for selectable rows
- * @param string $url_query                    url query
- *
- * @return string
- */
-function PMA_getHtmlForSelectableTables($selectable_tables_sql_result, $url_query)
-{
-    $html = '<form method="post" action="tbl_tracking.php' . $url_query . '">';
-    $html .= '<select name="table" class="autosubmit">';
-    while ($entries = $GLOBALS['dbi']->fetchArray($selectable_tables_sql_result)) {
-        if (Tracker::isTracked($entries['db_name'], $entries['table_name'])) {
-            $status = ' (' . __('active') . ')';
-        } else {
-            $status = ' (' . __('not active') . ')';
-        }
-        if ($entries['table_name'] == $_REQUEST['table']) {
-            $s = ' selected="selected"';
-        } else {
-            $s = '';
-        }
-        $html .= '<option value="' . htmlspecialchars($entries['table_name'])
-            . '"' . $s . '>' . htmlspecialchars($entries['db_name']) . ' . '
-            . htmlspecialchars($entries['table_name']) . $status . '</option>'
-            . "\n";
-    }
-    $html .= '</select>';
-    $html .= '<input type="hidden" name="show_versions_submit" value="1" />';
-    $html .= '</form>';
-
-    return $html;
-}
-
-/**
- * Function to get html for tracking report and tracking report export
- *
- * @param string  $url_query        url query
- * @param array   $data             data
- * @param array   $url_params       url params
- * @param boolean $selection_schema selection schema
- * @param boolean $selection_data   selection data
- * @param boolean $selection_both   selection both
- * @param int     $filter_ts_to     filter time stamp from
- * @param int     $filter_ts_from   filter time stamp tp
- * @param array   $filter_users     filter users
- *
- * @return string
- */
-function PMA_getHtmlForTrackingReport($url_query, $data, $url_params,
-    $selection_schema, $selection_data, $selection_both, $filter_ts_to,
-    $filter_ts_from, $filter_users
-) {
-    $html = '<h3>' . __('Tracking report')
-        . '  [<a href="tbl_tracking.php' . $url_query . '">' . __('Close')
-        . '</a>]</h3>';
-
-    $html .= '<small>' . __('Tracking statements') . ' '
-        . htmlspecialchars($data['tracking']) . '</small><br/>';
-    $html .= '<br/>';
-
-    list($str1, $str2, $str3, $str4, $str5) = PMA_getHtmlForElementsOfTrackingReport(
-        $selection_schema, $selection_data, $selection_both
-    );
-
-    // Prepare delete link content here
-    $drop_image_or_text = '';
-    if (PMA\libraries\Util::showIcons('ActionLinksMode')) {
-        $drop_image_or_text .= PMA\libraries\Util::getImage(
-            'b_drop.png', __('Delete tracking data row from report')
-        );
-    }
-    if (PMA\libraries\Util::showText('ActionLinksMode')) {
-        $drop_image_or_text .= __('Delete');
-    }
-
-    /*
-     *  First, list tracked data definition statements
-     */
-    if (count($data['ddlog']) == 0 && count($data['dmlog']) == 0) {
-        $msg = Message::notice(__('No data'));
-        $msg->display();
-    }
-
-    $html .= PMA_getHtmlForTrackingReportExportForm1(
-        $data, $url_params, $selection_schema, $selection_data, $selection_both,
-        $filter_ts_to, $filter_ts_from, $filter_users, $str1, $str2, $str3,
-        $str4, $str5, $drop_image_or_text
-    );
-
-    $html .= PMA_getHtmlForTrackingReportExportForm2(
-        $url_params, $str1, $str2, $str3, $str4, $str5
-    );
-
-    $html .= "<br/><br/><hr/><br/>\n";
-
-    return $html;
-}
-
-/**
- * Generate HTML element for report form
- *
- * @param boolean $selection_schema selection schema
- * @param boolean $selection_data   selection data
- * @param boolean $selection_both   selection both
- *
- * @return array
- */
-function PMA_getHtmlForElementsOfTrackingReport(
-    $selection_schema, $selection_data, $selection_both
-) {
-    $str1 = '<select name="logtype">'
-        . '<option value="schema"'
-        . ($selection_schema ? ' selected="selected"' : '') . '>'
-        . __('Structure only') . '</option>'
-        . '<option value="data"'
-        . ($selection_data ? ' selected="selected"' : '') . '>'
-        . __('Data only') . '</option>'
-        . '<option value="schema_and_data"'
-        . ($selection_both ? ' selected="selected"' : '') . '>'
-        . __('Structure and data') . '</option>'
-        . '</select>';
-    $str2 = '<input type="text" name="date_from" value="'
-        . htmlspecialchars($_REQUEST['date_from']) . '" size="19" />';
-    $str3 = '<input type="text" name="date_to" value="'
-        . htmlspecialchars($_REQUEST['date_to']) . '" size="19" />';
-    $str4 = '<input type="text" name="users" value="'
-        . htmlspecialchars($_REQUEST['users']) . '" />';
-    $str5 = '<input type="hidden" name="list_report" value="1" />'
-        . '<input type="submit" value="' . __('Go') . '" />';
-    return array($str1, $str2, $str3, $str4, $str5);
-}
-
-/**
- * Generate HTML for export form
- *
- * @param array   $data               data
- * @param array   $url_params         url params
- * @param boolean $selection_schema   selection schema
- * @param boolean $selection_data     selection data
- * @param boolean $selection_both     selection both
- * @param int     $filter_ts_to       filter time stamp from
- * @param int     $filter_ts_from     filter time stamp tp
- * @param array   $filter_users       filter users
- * @param string  $str1               HTML for logtype select
- * @param string  $str2               HTML for "from date"
- * @param string  $str3               HTML for "to date"
- * @param string  $str4               HTML for user
- * @param string  $str5               HTML for "list report"
- * @param string  $drop_image_or_text HTML for image or text
- *
- * @return string HTML for form
- */
-function PMA_getHtmlForTrackingReportExportForm1(
-    $data, $url_params, $selection_schema, $selection_data, $selection_both,
-    $filter_ts_to, $filter_ts_from, $filter_users, $str1, $str2, $str3,
-    $str4, $str5, $drop_image_or_text
-) {
-    $ddlog_count = 0;
-
-    $html = '<form method="post" action="tbl_tracking.php'
-        . PMA_URL_getCommon(
-            $url_params + array(
-                'report' => 'true', 'version' => $_REQUEST['version']
-            )
-        )
-        . '">';
-
-    $html .= sprintf(
-        __('Show %1$s with dates from %2$s to %3$s by user %4$s %5$s'),
-        $str1, $str2, $str3, $str4, $str5
-    );
-
-    if ($selection_schema || $selection_both && count($data['ddlog']) > 0) {
-        list($temp, $ddlog_count) = PMA_getHtmlForDataDefinitionStatements(
-            $data, $filter_users, $filter_ts_from, $filter_ts_to, $url_params,
-            $drop_image_or_text
-        );
-        $html .= $temp;
-        unset($temp);
-    } //endif
-
-    /*
-     *  Secondly, list tracked data manipulation statements
-     */
-    if (($selection_data || $selection_both) && count($data['dmlog']) > 0) {
-        $html .= PMA_getHtmlForDataManipulationStatements(
-            $data, $filter_users, $filter_ts_from, $filter_ts_to, $url_params,
-            $ddlog_count, $drop_image_or_text
-        );
-    }
-    $html .= '</form>';
-    return $html;
-}
-
-/**
- * Generate HTML for export form
- *
- * @param array  $url_params Parameters
- * @param string $str1       HTML for logtype select
- * @param string $str2       HTML for "from date"
- * @param string $str3       HTML for "to date"
- * @param string $str4       HTML for user
- * @param string $str5       HTML for "list report"
- *
- * @return string HTML for form
- */
-function PMA_getHtmlForTrackingReportExportForm2(
-    $url_params, $str1, $str2, $str3, $str4, $str5
-) {
-    $html = '<form method="post" action="tbl_tracking.php'
-        . PMA_URL_getCommon(
-            $url_params + array(
-                'report' => 'true', 'version' => $_REQUEST['version']
-            )
-        )
-        . '">';
-    $html .= sprintf(
-        __('Show %1$s with dates from %2$s to %3$s by user %4$s %5$s'),
-        $str1, $str2, $str3, $str4, $str5
-    );
-    $html .= '</form>';
-
-    $html .= '<form class="disableAjax" method="post" action="tbl_tracking.php'
-        . PMA_URL_getCommon(
-            $url_params
-            + array('report' => 'true', 'version' => $_REQUEST['version'])
-        )
-        . '">';
-    $html .= '<input type="hidden" name="logtype" value="'
-        . htmlspecialchars($_REQUEST['logtype']) . '" />';
-    $html .= '<input type="hidden" name="date_from" value="'
-        . htmlspecialchars($_REQUEST['date_from']) . '" />';
-    $html .= '<input type="hidden" name="date_to" value="'
-        . htmlspecialchars($_REQUEST['date_to']) . '" />';
-    $html .= '<input type="hidden" name="users" value="'
-        . htmlspecialchars($_REQUEST['users']) . '" />';
-
-    $str_export1 = '<select name="export_type">'
-        . '<option value="sqldumpfile">' . __('SQL dump (file download)')
-        . '</option>'
-        . '<option value="sqldump">' . __('SQL dump') . '</option>'
-        . '<option value="execution" onclick="alert(\''
-        . PMA_escapeJsString(
-            __('This option will replace your table and contained data.')
-        )
-        . '\')">' . __('SQL execution') . '</option>' . '</select>';
-
-    $str_export2 = '<input type="hidden" name="report_export" value="1" />'
-        . '<input type="submit" value="' . __('Go') . '" />';
-
-    $html .= "<br/>" . sprintf(__('Export as %s'), $str_export1)
-        . $str_export2 . "<br/>";
-    $html .= '</form>';
-    return $html;
-}
-
-/**
- * Function to get html for data manipulation statements
- *
- * @param array  $data               data
- * @param array  $filter_users       filter users
- * @param int    $filter_ts_from     filter time staml from
- * @param int    $filter_ts_to       filter time stamp to
- * @param array  $url_params         url parameters
- * @param int    $ddlog_count        data definition log count
- * @param string $drop_image_or_text drop image or text
- *
- * @return string
- */
-function PMA_getHtmlForDataManipulationStatements($data, $filter_users,
-    $filter_ts_from, $filter_ts_to, $url_params, $ddlog_count,
-    $drop_image_or_text
-) {
-    // no need for the secondth returned parameter
-    list($html,) = PMA_getHtmlForDataStatements(
-        $data, $filter_users, $filter_ts_from, $filter_ts_to, $url_params,
-        $drop_image_or_text, 'dmlog', __('Data manipulation statement'),
-        $ddlog_count, 'dml_versions'
-    );
-
-    return $html;
-}
-
-/**
- * Function to get html for one data manipulation statement
- *
- * @param array  $entry              entry
- * @param array  $filter_users       filter users
- * @param int    $filter_ts_from     filter time stamp from
- * @param int    $filter_ts_to       filter time stamp to
- * @param string $style              style
- * @param int    $line_number        line number
- * @param array  $url_params         url parameters
- * @param int    $offset             line number offset
- * @param string $drop_image_or_text drop image or text
- * @param string $delete_param       parameter for delete
- *
- * @return string
- */
-function PMA_getHtmlForOneStatement($entry, $filter_users,
-    $filter_ts_from, $filter_ts_to, $style, $line_number, $url_params, $offset,
-    $drop_image_or_text, $delete_param
-) {
-    $statement  = PMA\libraries\Util::formatSql($entry['statement'], true);
-    $timestamp = strtotime($entry['date']);
-    $filtered_user = in_array($entry['username'], $filter_users);
-    $html = null;
-
-    if ($timestamp >= $filter_ts_from
-        && $timestamp <= $filter_ts_to
-        && (in_array('*', $filter_users) || $filtered_user)
-    ) {
-        $html = '<tr class="noclick ' . $style . '">';
-        $html .= '<td class="right"><small>' . $line_number . '</small></td>';
-        $html .= '<td><small>'
-            . htmlspecialchars($entry['date']) . '</small></td>';
-        $html .= '<td><small>'
-            . htmlspecialchars($entry['username']) . '</small></td>';
-        $html .= '<td>' . $statement . '</td>';
-        $html .= '<td class="nowrap"><a  class="delete_entry_anchor ajax"'
-            . ' href="tbl_tracking.php'
-            . PMA_URL_getCommon(
-                $url_params + array(
-                    'report' => 'true',
-                    'version' => $_REQUEST['version'],
-                    $delete_param => ($line_number - $offset),
-                )
-            )
-            . '">'
-            . $drop_image_or_text
-            . '</a></td>';
-        $html .= '</tr>';
-    }
-
-    return $html;
-}
-/**
- * Function to get html for data definition statements in schema snapshot
- *
- * @param array  $data               data
- * @param array  $filter_users       filter users
- * @param int    $filter_ts_from     filter time stamp from
- * @param int    $filter_ts_to       filter time stamp to
- * @param array  $url_params         url parameters
- * @param string $drop_image_or_text drop image or text
- *
- * @return array
- */
-function PMA_getHtmlForDataDefinitionStatements($data, $filter_users,
-    $filter_ts_from, $filter_ts_to, $url_params, $drop_image_or_text
-) {
-    list($html, $line_number) = PMA_getHtmlForDataStatements(
-        $data, $filter_users, $filter_ts_from, $filter_ts_to, $url_params,
-        $drop_image_or_text, 'ddlog', __('Data definition statement'),
-        1, 'ddl_versions'
-    );
-
-    return array($html, $line_number);
-}
-
-/**
- * Function to get html for data statements in schema snapshot
- *
- * @param array  $data               data
- * @param array  $filter_users       filter users
- * @param int    $filter_ts_from     filter time stamp from
- * @param int    $filter_ts_to       filter time stamp to
- * @param array  $url_params         url parameters
- * @param string $drop_image_or_text drop image or text
- * @param string $which_log          dmlog|ddlog
- * @param string $header_message     message for this section
- * @param int    $line_number        line number
- * @param string $table_id           id for the table element
- *
- * @return array
- */
-function PMA_getHtmlForDataStatements($data, $filter_users,
-    $filter_ts_from, $filter_ts_to, $url_params, $drop_image_or_text,
-    $which_log, $header_message, $line_number, $table_id
-) {
-    $offset = $line_number;
-    $html  = '<table id="' . $table_id . '" class="data" width="100%">';
-    $html .= '<thead>';
-    $html .= '<tr>';
-    $html .= '<th width="18">#</th>';
-    $html .= '<th width="100">' . __('Date') . '</th>';
-    $html .= '<th width="60">' . __('Username') . '</th>';
-    $html .= '<th>' . $header_message . '</th>';
-    $html .= '<th>' . __('Action') . '</th>';
-    $html .= '</tr>';
-    $html .= '</thead>';
-    $html .= '<tbody>';
-
-    $style = 'odd';
-    foreach ($data[$which_log] as $entry) {
-        $html .= PMA_getHtmlForOneStatement(
-            $entry, $filter_users, $filter_ts_from, $filter_ts_to, $style,
-            $line_number, $url_params, $offset, $drop_image_or_text,
-            'delete_' . $which_log
-        );
-        if ($style == 'even') {
-            $style = 'odd';
-        } else {
-            $style = 'even';
-        }
-        $line_number++;
-    }
-    $html .= '</tbody>';
-    $html .= '</table>';
-
-    return array($html, $line_number);
-}
-
-/**
- * Function to get html for schema snapshot
- *
- * @param string $url_query url query
- *
- * @return string
- */
-function PMA_getHtmlForSchemaSnapshot($url_query)
-{
-    $html = '<h3>' . __('Structure snapshot')
-        . '  [<a href="tbl_tracking.php' . $url_query . '">' . __('Close')
-        . '</a>]</h3>';
-    $data = Tracker::getTrackedData(
-        $_REQUEST['db'], $_REQUEST['table'], $_REQUEST['version']
-    );
-
-    // Get first DROP TABLE/VIEW and CREATE TABLE/VIEW statements
-    $drop_create_statements = $data['ddlog'][0]['statement'];
-
-    if (mb_strstr($data['ddlog'][0]['statement'], 'DROP TABLE')
-        || mb_strstr($data['ddlog'][0]['statement'], 'DROP VIEW')
-    ) {
-        $drop_create_statements .= $data['ddlog'][1]['statement'];
-    }
-    // Print SQL code
-    $html .= PMA\libraries\Util::getMessage(
-        sprintf(
-            __('Version %s snapshot (SQL code)'),
-            htmlspecialchars($_REQUEST['version'])
-        ),
-        $drop_create_statements
-    );
-
-    // Unserialize snapshot
-    $temp = PMA_safeUnserialize($data['schema_snapshot']);
-    if ($temp === null) {
-        $temp = array('COLUMNS' => array(), 'INDEXES' => array());
-    }
-    $columns = $temp['COLUMNS'];
-    $indexes = $temp['INDEXES'];
-    $html .= PMA_getHtmlForColumns($columns);
-
-    if (count($indexes) > 0) {
-        $html .= PMA_getHtmlForIndexes($indexes);
-    } // endif
-    $html .= '<br /><hr /><br />';
-
-    return $html;
-}
-
-/**
- * Function to get html for displaying columns in the schema snapshot
- *
- * @param array $columns columns
- *
- * @return string
- */
-function PMA_getHtmlForColumns($columns)
-{
-    $html = '<h3>' . __('Structure') . '</h3>';
-    $html .= '<table id="tablestructure" class="data">';
-    $html .= '<thead>';
-    $html .= '<tr>';
-    $html .= '<th>' . __('#') . '</th>';
-    $html .= '<th>' . __('Column') . '</th>';
-    $html .= '<th>' . __('Type') . '</th>';
-    $html .= '<th>' . __('Collation') . '</th>';
-    $html .= '<th>' . __('Null') . '</th>';
-    $html .= '<th>' . __('Default') . '</th>';
-    $html .= '<th>' . __('Extra') . '</th>';
-    $html .= '<th>' . __('Comment') . '</th>';
-    $html .= '</tr>';
-    $html .= '</thead>';
-    $html .= '<tbody>';
-    $style = 'odd';
-    $index = 1;
-    foreach ($columns as $field) {
-        $html .= PMA_getHtmlForField($index++, $field, $style);
-        if ($style == 'even') {
-            $style = 'odd';
-        } else {
-            $style = 'even';
-        }
-    }
-
-    $html .= '</tbody>';
-    $html .= '</table>';
-
-    return $html;
-}
-
-/**
- * Function to get html for field
- *
- * @param int    $index index
- * @param array  $field field
- * @param string $style style
- *
- * @return string
- */
-function PMA_getHtmlForField($index, $field, $style)
-{
-    $html = '<tr class="noclick ' . $style . '">';
-    $html .= '<td>' . $index . '</td>';
-    $html .= '<td><b>' . htmlspecialchars($field['Field']);
-    if ($field['Key'] == 'PRI') {
-        $html .= ' ' . PMA\libraries\Util::getImage(
-            'b_primary.png', __('Primary')
-        );
-    } elseif (! empty($field['Key'])) {
-        $html .= ' ' . PMA\libraries\Util::getImage(
-            'bd_primary.png', __('Index')
-        );
-    }
-    $html .= '</b></td>';
-    $html .= "\n";
-    $html .= '<td>' . htmlspecialchars($field['Type']) . '</td>';
-    $html .= '<td>' . htmlspecialchars($field['Collation']) . '</td>';
-    $html .= '<td>' . (($field['Null'] == 'YES') ? __('Yes') : __('No')) . '</td>';
-    $html .= '<td>';
-    if (isset($field['Default'])) {
-        $extracted_columnspec = PMA\libraries\Util::extractColumnSpec(
-            $field['Type']
-        );
-        if ($extracted_columnspec['type'] == 'bit') {
-            // here, $field['Default'] contains something like b'010'
-            $html .= PMA\libraries\Util::convertBitDefaultValue($field['Default']);
-        } else {
-            $html .= htmlspecialchars($field['Default']);
-        }
-    } else {
-        if ($field['Null'] == 'YES') {
-            $html .= '<i>NULL</i>';
-        } else {
-            $html .= '<i>' . _pgettext('None for default', 'None') . '</i>';
-        }
-    }
-    $html .= '</td>';
-    $html .= '<td>' . htmlspecialchars($field['Extra']) . '</td>';
-    $html .= '<td>' . htmlspecialchars($field['Comment']) . '</td>';
-    $html .= '</tr>';
-
-    return $html;
-}
-
-/**
- * Function to get html for the indexes in schema snapshot
- *
- * @param array $indexes indexes
- *
- * @return string
- */
-function PMA_getHtmlForIndexes($indexes)
-{
-    $html = '<h3>' . __('Indexes') . '</h3>';
-    $html .= '<table id="tablestructure_indexes" class="data">';
-    $html .= '<thead>';
-    $html .= '<tr>';
-    $html .= '<th>' . __('Keyname') . '</th>';
-    $html .= '<th>' . __('Type') . '</th>';
-    $html .= '<th>' . __('Unique') . '</th>';
-    $html .= '<th>' . __('Packed') . '</th>';
-    $html .= '<th>' . __('Column') . '</th>';
-    $html .= '<th>' . __('Cardinality') . '</th>';
-    $html .= '<th>' . __('Collation') . '</th>';
-    $html .= '<th>' . __('Null') . '</th>';
-    $html .= '<th>' . __('Comment') . '</th>';
-    $html .= '</tr>';
-    $html .= '<tbody>';
-
-    $style = 'odd';
-    foreach ($indexes as $index) {
-        $html .= PMA_getHtmlForIndex($index, $style);
-        if ($style == 'even') {
-            $style = 'odd';
-        } else {
-            $style = 'even';
-        }
-    }
-    $html .= '</tbody>';
-    $html .= '</table>';
-    return $html;
-}
-
-/**
- * Function to get html for an index in schema snapshot
- *
- * @param array  $index index
- * @param string $style style
- *
- * @return string
- */
-function PMA_getHtmlForIndex($index, $style)
-{
-    if ($index['Non_unique'] == 0) {
-        $str_unique = __('Yes');
-    } else {
-        $str_unique = __('No');
-    }
-    if ($index['Packed'] != '') {
-        $str_packed = __('Yes');
-    } else {
-        $str_packed = __('No');
-    }
-
-    $html  = '<tr class="noclick ' . $style . '">';
-    $html .= '<td><b>' . htmlspecialchars($index['Key_name']) . '</b></td>';
-    $html .= '<td>' . htmlspecialchars($index['Index_type']) . '</td>';
-    $html .= '<td>' . $str_unique . '</td>';
-    $html .= '<td>' . $str_packed . '</td>';
-    $html .= '<td>' . htmlspecialchars($index['Column_name']) . '</td>';
-    $html .= '<td>' . htmlspecialchars($index['Cardinality']) . '</td>';
-    $html .= '<td>' . htmlspecialchars($index['Collation']) . '</td>';
-    $html .= '<td>' . htmlspecialchars($index['Null']) . '</td>';
-    $html .= '<td>' . htmlspecialchars($index['Comment']) . '</td>';
-    $html .= '</tr>';
-
-    return $html;
-}
-
-/**
- * Function to handle the tracking report
- *
- * @param array &$data tracked data
- *
- * @return string HTML for the message
- */
-function PMA_deleteTrackingReportRows(&$data)
-{
-    $html = '';
-    if (isset($_REQUEST['delete_ddlog'])) {
-        // Delete ddlog row data
-        $html .= PMA_deleteFromTrackingReportLog(
-            $data,
-            'ddlog',
-            'DDL',
-            __('Tracking data definition successfully deleted')
-        );
-    }
-
-    if (isset($_REQUEST['delete_dmlog'])) {
-        // Delete dmlog row data
-        $html .= PMA_deleteFromTrackingReportLog(
-            $data,
-            'dmlog',
-            'DML',
-            __('Tracking data manipulation successfully deleted')
-        );
-    }
-    return $html;
-}
-
-/**
- * Function to delete from a tracking report log
- *
- * @param array  &$data     tracked data
- * @param string $which_log ddlog|dmlog
- * @param string $type      DDL|DML
- * @param string $message   success message
- *
- * @return string HTML for the message
- */
-function PMA_deleteFromTrackingReportLog(&$data, $which_log, $type, $message)
-{
-    $html = '';
-    $delete_id = $_REQUEST['delete_' . $which_log];
-
-    // Only in case of valid id
-    if ($delete_id == (int)$delete_id) {
-        unset($data[$which_log][$delete_id]);
-
-        $successfullyDeleted = Tracker::changeTrackingData(
-            $_REQUEST['db'],
-            $_REQUEST['table'],
-            $_REQUEST['version'],
-            $type,
-            $data[$which_log]
-        );
-        if ($successfullyDeleted) {
-            $msg = Message::success($message);
-        } else {
-            $msg = Message::rawError(__('Query error'));
-        }
-        $html .= $msg->getDisplay();
-    }
-    return $html;
-}
-
-/**
- * Function to export as sql dump
- *
- * @param array $entries entries
- *
- * @return string HTML SQL query form
- */
-function PMA_exportAsSQLDump($entries)
-{
-    $html = '';
-    $new_query = "# "
-        . __(
-            'You can execute the dump by creating and using a temporary database. '
-            . 'Please ensure that you have the privileges to do so.'
-        )
-        . "\n"
-        . "# " . __('Comment out these two lines if you do not need them.') . "\n"
-        . "\n"
-        . "CREATE database IF NOT EXISTS pma_temp_db; \n"
-        . "USE pma_temp_db; \n"
-        . "\n";
-
-    foreach ($entries as $entry) {
-        $new_query .= $entry['statement'];
-    }
-    $msg = Message::success(
-        __('SQL statements exported. Please copy the dump or execute it.')
-    );
-    $html .= $msg->getDisplay();
-
-    $db_temp = $GLOBALS['db'];
-    $table_temp = $GLOBALS['table'];
-
-    $GLOBALS['db'] = $GLOBALS['table'] = '';
-    include_once './libraries/sql_query_form.lib.php';
-
-    $html .= PMA_getHtmlForSqlQueryForm($new_query, 'sql');
-
-    $GLOBALS['db'] = $db_temp;
-    $GLOBALS['table'] = $table_temp;
-
-    return $html;
-}
-
-/**
- * Function to export as sql execution
- *
- * @param array $entries entries
- *
- * @return array
- */
-function PMA_exportAsSQLExecution($entries)
-{
-    $sql_result = array();
-    foreach ($entries as $entry) {
-        $sql_result = $GLOBALS['dbi']->query("/*NOTRACK*/\n" . $entry['statement']);
-    }
-
-    return $sql_result;
-}
-
-/**
- * Function to export as entries
- *
- * @param array $entries entries
- *
- * @return void
- */
-function PMA_exportAsFileDownload($entries)
-{
-    @ini_set('url_rewriter.tags', '');
-
-    // Replace all multiple whitespaces by a single space
-    $table = htmlspecialchars(preg_replace('/\s+/', ' ', $_REQUEST['table']));
-    $dump = "# " . sprintf(
-        __('Tracking report for table `%s`'), $table
-    )
-    . "\n" . "# " . date('Y-m-d H:i:s') . "\n";
-    foreach ($entries as $entry) {
-        $dump .= $entry['statement'];
-    }
-    $filename = 'log_' . $table . '.sql';
-    PMA\libraries\Response::getInstance()->disable();
-    PMA_downloadHeader(
-        $filename,
-        'text/x-sql',
-        strlen($dump)
-    );
-    echo $dump;
-
-    exit();
-}
-
-/**
- * Function to activate or deactivate tracking
- *
- * @param string $action activate|deactivate
- *
- * @return string HTML for the success message
- */
-function PMA_changeTracking($action)
-{
-    $html = '';
-    if ($action == 'activate') {
-        $method = 'activateTracking';
-        $message = __('Tracking for %1$s was activated at version %2$s.');
-    } else {
-        $method = 'deactivateTracking';
-        $message = __('Tracking for %1$s was deactivated at version %2$s.');
-    }
-    $status = Tracker::$method(
-        $GLOBALS['db'], $GLOBALS['table'], $_REQUEST['version']
-    );
-    if ($status) {
-        $msg = Message::success(
-            sprintf(
-                $message,
-                htmlspecialchars($GLOBALS['db'] . '.' . $GLOBALS['table']),
-                htmlspecialchars($_REQUEST['version'])
-            )
-        );
-        $html .= $msg->getDisplay();
-    }
-
-    return $html;
-}
-
-/**
- * Function to get tracking set
- *
- * @return string
- */
-function PMA_getTrackingSet()
-{
-    $tracking_set = '';
-
-    // a key is absent from the request if it has been removed from
-    // tracking_default_statements in the config
-    if (isset($_REQUEST['alter_table']) && $_REQUEST['alter_table'] == true) {
-        $tracking_set .= 'ALTER TABLE,';
-    }
-    if (isset($_REQUEST['rename_table']) && $_REQUEST['rename_table'] == true) {
-        $tracking_set .= 'RENAME TABLE,';
-    }
-    if (isset($_REQUEST['create_table']) && $_REQUEST['create_table'] == true) {
-        $tracking_set .= 'CREATE TABLE,';
-    }
-    if (isset($_REQUEST['drop_table']) && $_REQUEST['drop_table'] == true) {
-        $tracking_set .= 'DROP TABLE,';
-    }
-    if (isset($_REQUEST['alter_view']) && $_REQUEST['alter_view'] == true) {
-        $tracking_set .= 'ALTER VIEW,';
-    }
-    if (isset($_REQUEST['create_view']) && $_REQUEST['create_view'] == true) {
-        $tracking_set .= 'CREATE VIEW,';
-    }
-    if (isset($_REQUEST['drop_view']) && $_REQUEST['drop_view'] == true) {
-        $tracking_set .= 'DROP VIEW,';
-    }
-    if (isset($_REQUEST['create_index']) && $_REQUEST['create_index'] == true) {
-        $tracking_set .= 'CREATE INDEX,';
-    }
-    if (isset($_REQUEST['drop_index']) && $_REQUEST['drop_index'] == true) {
-        $tracking_set .= 'DROP INDEX,';
-    }
-    if (isset($_REQUEST['insert']) && $_REQUEST['insert'] == true) {
-        $tracking_set .= 'INSERT,';
-    }
-    if (isset($_REQUEST['update']) && $_REQUEST['update'] == true) {
-        $tracking_set .= 'UPDATE,';
-    }
-    if (isset($_REQUEST['delete']) && $_REQUEST['delete'] == true) {
-        $tracking_set .= 'DELETE,';
-    }
-    if (isset($_REQUEST['truncate']) && $_REQUEST['truncate'] == true) {
-        $tracking_set .= 'TRUNCATE,';
-    }
-    $tracking_set = rtrim($tracking_set, ',');
-
-    return $tracking_set;
-}
-
-/**
- * Deletes a tracking version
- *
- * @param string $version tracking version
- *
- * @return string HTML of the success message
- */
-function PMA_deleteTrackingVersion($version)
-{
-    $html = '';
-    $versionDeleted = Tracker::deleteTracking(
-        $GLOBALS['db'],
-        $GLOBALS['table'],
-        $version
-    );
-    if ($versionDeleted) {
-        $msg = Message::success(
-            sprintf(
-                __('Version %1$s of %2$s was deleted.'),
-                htmlspecialchars($version),
-                htmlspecialchars($GLOBALS['db'] . '.' . $GLOBALS['table'])
-            )
-        );
-        $html .= $msg->getDisplay();
-    }
-
-    return $html;
-}
-
-/**
- * Function to create the tracking version
- *
- * @return string HTML of the success message
- */
-function PMA_createTrackingVersion()
-{
-    $html = '';
-    $tracking_set = PMA_getTrackingSet();
-
-    $versionCreated = Tracker::createVersion(
-        $GLOBALS['db'],
-        $GLOBALS['table'],
-        $_REQUEST['version'],
-        $tracking_set,
-        $GLOBALS['dbi']->getTable($GLOBALS['db'], $GLOBALS['table'])->isView()
-    );
-    if ($versionCreated) {
-        $msg = Message::success(
-            sprintf(
-                __('Version %1$s was created, tracking for %2$s is active.'),
-                htmlspecialchars($_REQUEST['version']),
-                htmlspecialchars($GLOBALS['db'] . '.' . $GLOBALS['table'])
-            )
-        );
-        $html .= $msg->getDisplay();
-    }
-
-    return $html;
-}
-
-/**
- * Create tracking version for multiple tables
- *
- * @param array $selected list of selected tables
- *
- * @return void
- */
-function PMA_createTrackingForMultipleTables($selected)
-{
-    $tracking_set = PMA_getTrackingSet();
-
-    foreach ($selected as $selected_table) {
-        Tracker::createVersion(
-            $GLOBALS['db'],
-            $selected_table,
-            $_REQUEST['version'],
-            $tracking_set,
-            $GLOBALS['dbi']->getTable($GLOBALS['db'], $selected_table)->isView()
-        );
-    }
-}
-
-/**
- * Function to get the entries
- *
- * @param array $data           data
- * @param int   $filter_ts_from filter time stamp from
- * @param int   $filter_ts_to   filter time stamp to
- * @param array $filter_users   filter users
- *
- * @return array
- */
-function PMA_getEntries($data, $filter_ts_from, $filter_ts_to, $filter_users)
-{
-    $entries = array();
-    // Filtering data definition statements
-    if ($_REQUEST['logtype'] == 'schema'
-        || $_REQUEST['logtype'] == 'schema_and_data'
-    ) {
-        $entries = array_merge(
-            $entries,
-            PMA_filterTracking(
-                $data['ddlog'], $filter_ts_from, $filter_ts_to, $filter_users
-            )
-        );
-    }
-
-    // Filtering data manipulation statements
-    if ($_REQUEST['logtype'] == 'data'
-        || $_REQUEST['logtype'] == 'schema_and_data'
-    ) {
-        $entries = array_merge(
-            $entries,
-            PMA_filterTracking(
-                $data['dmlog'], $filter_ts_from, $filter_ts_to, $filter_users
-            )
-        );
-    }
-
-    // Sort it
-    $ids = $timestamps = $usernames = $statements = array();
-    foreach ($entries as $key => $row) {
-        $ids[$key]        = $row['id'];
-        $timestamps[$key] = $row['timestamp'];
-        $usernames[$key]  = $row['username'];
-        $statements[$key] = $row['statement'];
-    }
-
-    array_multisort(
-        $timestamps, SORT_ASC, $ids, SORT_ASC, $usernames,
-        SORT_ASC, $statements, SORT_ASC, $entries
-    );
-
-    return $entries;
-}
-
-/**
- * Function to get version status
- *
- * @param array $version version info
- *
- * @return string $version_status The status message
- */
-function PMA_getVersionStatus($version)
-{
-    if ($version['tracking_active'] == 1) {
-        return __('active');
-    } else {
-        return __('not active');
-    }
-}
-
-/**
- * Display untracked tables
- *
- * @param string $db               current database
- * @param array  $untracked_tables untracked tables
- * @param string $url_query        url query string
- * @param string $pmaThemeImage    path to theme's image folder
- * @param string $text_dir         text direction
- *
- * @return void
- */
-function PMA_displayUntrackedTables(
-    $db, $untracked_tables, $url_query, $pmaThemeImage, $text_dir
-) {
-    ?>
-    <h3><?php echo __('Untracked tables');?></h3>
-    <form method="post" action="db_tracking.php" name="untrackedForm"
-        id="untrackedForm" class="ajax">
-    <?php
-    echo PMA_URL_getHiddenInputs($db)
-    ?>
-    <table id="noversions" class="data">
-    <thead>
-    <tr>
-        <th></th>
-        <th style="width: 300px"><?php echo __('Table');?></th>
-        <th><?php echo __('Action');?></th>
-    </tr>
-    </thead>
-    <tbody>
-    <?php
-
-    // Print out list of untracked tables
-    $style = 'odd';
-    foreach ($untracked_tables as $key => $tablename) {
-        $style = PMA_displayOneUntrackedTable($db, $tablename, $url_query, $style);
-    }
-    ?>
-    </tbody>
-    </table>
-    <?php
-    echo PMA\libraries\Util::getWithSelected(
-        $pmaThemeImage,
-        $text_dir,
-        "untrackedForm"
-    );
-    echo PMA\libraries\Util::getButtonOrImage(
-        'submit_mult', 'mult_submit', 'submit_mult_track',
-        __('Track table'), 'eye.png', 'track'
-    );
-    ?>
-    </form>
-    <?php
-}
-
-/**
- * Display one untracked table
- *
- * @param string $db        current database
- * @param string $tablename the table name for which to display a line
- * @param string $url_query url query string
- * @param string $style     odd|even
- *
- * @return string $style        changed style (even|odd)
- */
-function PMA_displayOneUntrackedTable($db, $tablename, $url_query, $style)
-{
-    $checkbox_id = "selected_tbl_"
-        . htmlspecialchars($tablename);
-    if (Tracker::getVersion($db, $tablename) == -1) {
-        $my_link = '<a href="tbl_tracking.php' . $url_query
-            . '&amp;table=' . htmlspecialchars($tablename) . '">';
-        $my_link .= PMA\libraries\Util::getIcon('eye.png', __('Track table'));
-        $my_link .= '</a>';
-        ?>
-        <tr class="<?php echo $style;?>">
-            <td class="center">
-                <input type="checkbox" name="selected_tbl[]"
-                    class="checkall" id="<?php echo $checkbox_id;?>"
-                    value="<?php echo htmlspecialchars($tablename);?>"/>
-            </td>
-            <th>
-                <label for="<?php echo $checkbox_id;?>">
-                    <?php echo htmlspecialchars($tablename);?>
-                </label>
-            </th>
-            <td><?php echo $my_link;?></td>
-        </tr>
-        <?php
-        if ($style == 'even') {
-            $style = 'odd';
-        } else {
-            $style = 'even';
-        }
-    }
-    return $style;
-}
-
-/**
- * Get untracked tables
- *
- * @param string $db current database
- *
- * @return array $untracked_tables
- */
-function PMA_getUntrackedTables($db)
-{
-    $untracked_tables = array();
-    $sep = $GLOBALS['cfg']['NavigationTreeTableSeparator'];
-
-    // Get list of tables
-    $table_list = PMA\libraries\Util::getTableList($db);
-
-    // For each table try to get the tracking version
-    foreach ($table_list as $key => $value) {
-        // If $value is a table group.
-        if (array_key_exists(('is' . $sep . 'group'), $value)
-            && $value['is' . $sep . 'group']
-        ) {
-            foreach ($value as $temp_table) {
-                // If $temp_table is a table with the value for 'Name' is set,
-                // rather than a property of the table group.
-                if (is_array($temp_table)
-                    && array_key_exists('Name', $temp_table)
-                ) {
-                    $tracking_version = Tracker::getVersion(
-                        $db,
-                        $temp_table['Name']
-                    );
-                    if ($tracking_version == -1) {
-                        $untracked_tables[] = $temp_table['Name'];
-                    }
-                }
-            }
-        } else { // If $value is a table.
-            if (Tracker::getVersion($db, $value['Name']) == -1) {
-                $untracked_tables[] = $value['Name'];
-            }
-        }
-    }
-    return $untracked_tables;
-}
-
-/**
- * Display tracked tables
- *
- * @param string $db                current database
- * @param object $all_tables_result result set of tracked tables
- * @param string $url_query         url query string
- * @param string $pmaThemeImage     path to theme's image folder
- * @param string $text_dir          text direction
- * @param array  $cfgRelation       configuration storage info
- *
- * @return void
- */
-function PMA_displayTrackedTables(
-    $db, $all_tables_result, $url_query, $pmaThemeImage, $text_dir, $cfgRelation
-) {
-    ?>
-    <div id="tracked_tables">
-    <h3><?php echo __('Tracked tables');?></h3>
-
-    <form method="post" action="db_tracking.php" name="trackedForm"
-        id="trackedForm" class="ajax">
-    <?php
-    echo PMA_URL_getHiddenInputs($db)
-    ?>
-    <table id="versions" class="data">
-    <thead>
-    <tr>
-        <th></th>
-        <th><?php echo __('Table');?></th>
-        <th><?php echo __('Last version');?></th>
-        <th><?php echo __('Created');?></th>
-        <th><?php echo __('Updated');?></th>
-        <th><?php echo __('Status');?></th>
-        <th><?php echo __('Action');?></th>
-        <th><?php echo __('Show');?></th>
-    </tr>
-    </thead>
-    <tbody>
-    <?php
-
-    // Print out information about versions
-
-    $delete = PMA\libraries\Util::getIcon('b_drop.png', __('Delete tracking'));
-    $versions = PMA\libraries\Util::getIcon('b_versions.png', __('Versions'));
-    $report = PMA\libraries\Util::getIcon('b_report.png', __('Tracking report'));
-    $structure = PMA\libraries\Util::getIcon(
-        'b_props.png',
-        __('Structure snapshot')
-    );
-
-    $style = 'odd';
-    while ($one_result = $GLOBALS['dbi']->fetchArray($all_tables_result)) {
-        list($table_name, $version_number) = $one_result;
-        $table_query = ' SELECT * FROM ' .
-             PMA\libraries\Util::backquote($cfgRelation['db']) . '.' .
-             PMA\libraries\Util::backquote($cfgRelation['tracking']) .
-             ' WHERE `db_name` = \''
-             . $GLOBALS['dbi']->escapeString($_REQUEST['db'])
-             . '\' AND `table_name`  = \''
-             . $GLOBALS['dbi']->escapeString($table_name)
-             . '\' AND `version` = \'' . $version_number . '\'';
-
-        $table_result = PMA_queryAsControlUser($table_query);
-        $version_data = $GLOBALS['dbi']->fetchArray($table_result);
-
-        $tbl_link = 'tbl_tracking.php' . $url_query . '&amp;table='
-            . htmlspecialchars($version_data['table_name']);
-        $delete_link = 'db_tracking.php' . $url_query . '&amp;table='
-            . htmlspecialchars($version_data['table_name'])
-            . '&amp;delete_tracking=true&amp';
-        $checkbox_id = "selected_tbl_"
-            . htmlspecialchars($version_data['table_name']);
-        ?>
-        <tr class="<?php echo $style;?>">
-            <td class="center">
-                <input type="checkbox" name="selected_tbl[]"
-                class="checkall" id="<?php echo $checkbox_id;?>"
-                value="<?php echo htmlspecialchars($version_data['table_name']);?>"/>
-            </td>
-            <th>
-                <label for="<?php echo $checkbox_id;?>">
-                    <?php echo htmlspecialchars($version_data['table_name']);?>
-                </label>
-            </th>
-            <td class="right"><?php echo $version_data['version'];?></td>
-            <td><?php echo $version_data['date_created'];?></td>
-            <td><?php echo $version_data['date_updated'];?></td>
-            <td>
-            <?php
-            PMA_displayStatusButton($version_data, $tbl_link);
-            ?>
-            </td>
-            <td>
-            <a class="delete_tracking_anchor ajax"
-               href="<?php echo $delete_link;?>" >
-            <?php echo $delete; ?></a>
-        <?php
-        echo '</td>'
-            , '<td>'
-            , '<a href="' , $tbl_link , '">' , $versions , '</a>'
-            , '&nbsp;&nbsp;'
-            , '<a href="' , $tbl_link , '&amp;report=true&amp;version='
-            , $version_data['version'] , '">' , $report , '</a>'
-            , '&nbsp;&nbsp;'
-            , '<a href="' . $tbl_link , '&amp;snapshot=true&amp;version='
-            , $version_data['version'] , '">' , $structure , '</a>'
-            , '</td>'
-            , '</tr>';
-        if ($style == 'even') {
-            $style = 'odd';
-        } else {
-            $style = 'even';
-        }
-    }
-    ?>
-    </tbody>
-    </table>
-    <?php
-    echo PMA\libraries\Util::getWithSelected(
-        $pmaThemeImage,
-        $text_dir,
-        "trackedForm"
-    );
-    echo PMA\libraries\Util::getButtonOrImage(
-        'submit_mult', 'mult_submit', 'submit_mult_delete_tracking',
-        __('Delete tracking'), 'b_drop.png', 'delete_tracking'
-    );
-    ?>
-    </form>
-    </div>
-    <?php
-}
-
-/**
- * Display tracking status button
- *
- * @param array  $version_data data about tracking versions
- * @param string $tbl_link     link for tbl_tracking.php
- *
- * @return void
- */
-function PMA_displayStatusButton($version_data, $tbl_link)
-{
-    $state = PMA_getVersionStatus($version_data);
-    $options = array(
-        0 => array(
-            'label' => __('not active'),
-            'value' => 'deactivate_now',
-            'selected' => ($state != 'active')
-        ),
-        1 => array(
-            'label' => __('active'),
-            'value' => 'activate_now',
-            'selected' => ($state == 'active')
-        )
-    );
-    echo PMA\libraries\Util::toggleButton(
-        $tbl_link . '&amp;version=' . $version_data['version'],
-        'toggle_activation',
-        $options,
-        null
-    );
-}
diff --git a/#pma/libraries/transformations.lib.php b/#pma/libraries/transformations.lib.php
deleted file mode 100644
index d3caaff6..00000000
--- a/#pma/libraries/transformations.lib.php
+++ /dev/null
@@ -1,452 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Set of functions used with the relation and pdf feature
- *
- * This file also provides basic functions to use in other plugins!
- * These are declared in the 'GLOBAL Plugin functions' section
- *
- * Please use short and expressive names.
- * For now, special characters which aren't allowed in
- * filenames or functions should not be used.
- *
- * Please provide a comment for your function,
- * what it does and what parameters are available.
- *
- * @package PhpMyAdmin
- */
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
-/**
- * Returns array of options from string with options separated by comma,
- * removes quotes
- *
- * <code>
- * PMA_Transformation_getOptions("'option ,, quoted',abd,'2,3',");
- * // array {
- * //     'option ,, quoted',
- * //     'abc',
- * //     '2,3',
- * //     '',
- * // }
- * </code>
- *
- * @param string $option_string comma separated options
- *
- * @return array options
- */
-function PMA_Transformation_getOptions($option_string)
-{
-    $result = array();
-
-    if (! mb_strlen($option_string)
-        || ! $transform_options = preg_split('/,/', $option_string)
-    ) {
-        return $result;
-    }
-
-    while (($option = array_shift($transform_options)) !== null) {
-        $trimmed = trim($option);
-        if (mb_strlen($trimmed) > 1
-            && $trimmed[0] == "'"
-            && $trimmed[mb_strlen($trimmed) - 1] == "'"
-        ) {
-            // '...'
-            $option = mb_substr($trimmed, 1, -1);
-        } elseif (isset($trimmed[0]) && $trimmed[0] == "'") {
-            // '...,
-            $trimmed = ltrim($option);
-            while (($option = array_shift($transform_options)) !== null) {
-                // ...,
-                $trimmed .= ',' . $option;
-                $rtrimmed = rtrim($trimmed);
-                if ($rtrimmed[mb_strlen($rtrimmed) - 1] == "'") {
-                    // ,...'
-                    break;
-                }
-            }
-            $option = mb_substr($rtrimmed, 1, -1);
-        }
-        $result[] = stripslashes($option);
-    }
-
-    return $result;
-}
-
-/**
- * Gets all available MIME-types
- *
- * @access  public
- * @staticvar   array   mimetypes
- * @return array    array[mimetype], array[transformation]
- */
-function PMA_getAvailableMIMEtypes()
-{
-    static $stack = null;
-
-    if (null !== $stack) {
-        return $stack;
-    }
-
-    $stack = array();
-    $sub_dirs = array(
-        'input/' => 'input_',
-        'output/' => '',
-        '' => ''
-    );
-
-    foreach ($sub_dirs as $sd => $prefix) {
-        $handle = opendir('libraries/plugins/transformations/' . $sd);
-
-        if (! $handle) {
-            $stack[$prefix . 'transformation'] = array();
-            $stack[$prefix . 'transformation_file'] = array();
-            continue;
-        }
-
-        $filestack = array();
-        while ($file = readdir($handle)) {
-            // Ignore hidden files
-            if ($file[0] == '.') {
-                continue;
-            }
-            // Ignore old plugins (.class in filename)
-            if (strpos($file, '.class') !== false) {
-                continue;
-            }
-            $filestack[] = $file;
-        }
-
-        closedir($handle);
-        sort($filestack);
-
-        foreach ($filestack as $file) {
-            if (preg_match('|^[^.].*_.*_.*\.php$|', $file)) {
-                // File contains transformation functions.
-                $parts = explode('_', str_replace('.php', '', $file));
-                $mimetype = $parts[0] . "/" . $parts[1];
-                $stack['mimetype'][$mimetype] = $mimetype;
-
-                $stack[$prefix . 'transformation'][] = $mimetype . ': ' . $parts[2];
-                $stack[$prefix . 'transformation_file'][] = $sd . $file;
-                if ($sd === '') {
-                    $stack['input_transformation'][] = $mimetype . ': ' . $parts[2];
-                    $stack['input_transformation_file'][] = $sd . $file;
-                }
-
-            } elseif (preg_match('|^[^.].*\.php$|', $file)) {
-                // File is a plain mimetype, no functions.
-                $base = str_replace('.php', '', $file);
-
-                if ($base != 'global') {
-                    $mimetype = str_replace('_', '/', $base);
-                    $stack['mimetype'][$mimetype] = $mimetype;
-                    $stack['empty_mimetype'][$mimetype] = $mimetype;
-                }
-            }
-        }
-    }
-    return $stack;
-}
-
-/**
- * Returns the class name of the transformation
- *
- * @param string $filename transformation file name
- *
- * @return string the class name of transformation
- */
-function PMA_getTransformationClassName($filename)
-{
-    // get the transformation class name
-    $class_name = explode(".php", $filename);
-    $class_name = 'PMA\\' . str_replace('/', '\\', $class_name[0]);
-
-    return $class_name;
-}
-
-/**
- * Returns the description of the transformation
- *
- * @param string $file transformation file
- *
- * @return String the description of the transformation
- */
-function PMA_getTransformationDescription($file)
-{
-    $include_file = 'libraries/plugins/transformations/' . $file;
-    /* @var $class_name PMA\libraries\plugins\TransformationsInterface */
-    $class_name = PMA_getTransformationClassName($include_file);
-    // include and instantiate the class
-    include_once $include_file;
-    return $class_name::getInfo();
-}
-
-/**
- * Returns the name of the transformation
- *
- * @param string $file transformation file
- *
- * @return String the name of the transformation
- */
-function PMA_getTransformationName($file)
-{
-    $include_file = 'libraries/plugins/transformations/' . $file;
-    /* @var $class_name PMA\libraries\plugins\TransformationsInterface */
-    $class_name = PMA_getTransformationClassName($include_file);
-    // include and instantiate the class
-    include_once $include_file;
-    return $class_name::getName();
-}
-
-/**
- * Gets the mimetypes for all columns of a table
- *
- * @param string  $db       the name of the db to check for
- * @param string  $table    the name of the table to check for
- * @param boolean $strict   whether to include only results having a mimetype set
- * @param boolean $fullName whether to use full column names as the key
- *
- * @access public
- *
- * @return array [field_name][field_key] = field_value
- */
-function PMA_getMIME($db, $table, $strict = false, $fullName = false)
-{
-    $cfgRelation = PMA_getRelationsParam();
-
-    if (! $cfgRelation['commwork']) {
-        return false;
-    }
-
-    $com_qry = '';
-    if ($fullName) {
-        $com_qry .= "SELECT CONCAT("
-            . "`db_name`, '.', `table_name`, '.', `column_name`"
-            . ") AS column_name, ";
-    } else {
-        $com_qry  = "SELECT `column_name`, ";
-    }
-    $com_qry .= '`mimetype`,
-                `transformation`,
-                `transformation_options`,
-                `input_transformation`,
-                `input_transformation_options`
-         FROM ' . PMA\libraries\Util::backquote($cfgRelation['db']) . '.'
-        . PMA\libraries\Util::backquote($cfgRelation['column_info']) . '
-         WHERE `db_name`    = \'' . $GLOBALS['dbi']->escapeString($db) . '\'
-           AND `table_name` = \'' . $GLOBALS['dbi']->escapeString($table) . '\'
-           AND ( `mimetype` != \'\'' . (!$strict ? '
-              OR `transformation` != \'\'
-              OR `transformation_options` != \'\'
-              OR `input_transformation` != \'\'
-              OR `input_transformation_options` != \'\'' : '') . ')';
-    $result = $GLOBALS['dbi']->fetchResult(
-        $com_qry, 'column_name', null, $GLOBALS['controllink']
-    );
-
-    foreach ($result as $column => $values) {
-        // replacements in mimetype and transformation
-        $values = str_replace("jpeg", "JPEG", $values);
-        $values = str_replace("png", "PNG", $values);
-
-        // convert mimetype to new format (f.e. Text_Plain, etc)
-        $delimiter_space = '- ';
-        $delimiter = "_";
-        $values['mimetype'] = str_replace(
-            $delimiter_space,
-            $delimiter,
-            ucwords(
-                str_replace(
-                    $delimiter,
-                    $delimiter_space,
-                    $values['mimetype']
-                )
-            )
-        );
-
-        // For transformation of form
-        // output/image_jpeg__inline.inc.php
-        // extract dir part.
-        $dir = explode('/', $values['transformation']);
-        $subdir = '';
-        if (count($dir) === 2) {
-            $subdir = $dir[0] . '/';
-            $values['transformation'] = $dir[1];
-        }
-
-        $values['transformation'] = str_replace(
-            $delimiter_space,
-            $delimiter,
-            ucwords(
-                str_replace(
-                    $delimiter,
-                    $delimiter_space,
-                    $values['transformation']
-                )
-            )
-        );
-        $values['transformation'] = $subdir . $values['transformation'];
-        $result[$column] = $values;
-    }
-
-    return $result;
-} // end of the 'PMA_getMIME()' function
-
-/**
- * Set a single mimetype to a certain value.
- *
- * @param string  $db                 the name of the db
- * @param string  $table              the name of the table
- * @param string  $key                the name of the column
- * @param string  $mimetype           the mimetype of the column
- * @param string  $transformation     the transformation of the column
- * @param string  $transformationOpts the transformation options of the column
- * @param string  $inputTransform     the input transformation of the column
- * @param string  $inputTransformOpts the input transformation options of the column
- * @param boolean $forcedelete        force delete, will erase any existing
- *                                    comments for this column
- *
- * @access  public
- *
- * @return boolean  true, if comment-query was made.
- */
-function PMA_setMIME($db, $table, $key, $mimetype, $transformation,
-    $transformationOpts, $inputTransform, $inputTransformOpts, $forcedelete = false
-) {
-    $cfgRelation = PMA_getRelationsParam();
-
-    if (! $cfgRelation['commwork']) {
-        return false;
-    }
-
-    // lowercase mimetype & transformation
-    $mimetype = mb_strtolower($mimetype);
-    $transformation = mb_strtolower($transformation);
-
-    $test_qry = '
-         SELECT `mimetype`,
-                `comment`
-           FROM ' . PMA\libraries\Util::backquote($cfgRelation['db']) . '.'
-        . PMA\libraries\Util::backquote($cfgRelation['column_info']) . '
-          WHERE `db_name`     = \'' . $GLOBALS['dbi']->escapeString($db) . '\'
-            AND `table_name`  = \'' . $GLOBALS['dbi']->escapeString($table) . '\'
-            AND `column_name` = \'' . $GLOBALS['dbi']->escapeString($key) . '\'';
-
-    $test_rs   = PMA_queryAsControlUser(
-        $test_qry, true, PMA\libraries\DatabaseInterface::QUERY_STORE
-    );
-
-    if ($test_rs && $GLOBALS['dbi']->numRows($test_rs) > 0) {
-        $row = @$GLOBALS['dbi']->fetchAssoc($test_rs);
-        $GLOBALS['dbi']->freeResult($test_rs);
-
-        $transformationLength = mb_strlen($transformation);
-        if (! $forcedelete
-            && (mb_strlen($mimetype) || $transformationLength
-            || mb_strlen($transformationOpts)
-            || mb_strlen($row['comment']))
-        ) {
-            $upd_query = 'UPDATE '
-                . PMA\libraries\Util::backquote($cfgRelation['db']) . '.'
-                . PMA\libraries\Util::backquote($cfgRelation['column_info'])
-                . ' SET '
-                . '`mimetype` = \''
-                . $GLOBALS['dbi']->escapeString($mimetype) . '\', '
-                . '`transformation` = \''
-                . $GLOBALS['dbi']->escapeString($transformation) . '\', '
-                . '`transformation_options` = \''
-                . $GLOBALS['dbi']->escapeString($transformationOpts) . '\', '
-                . '`input_transformation` = \''
-                . $GLOBALS['dbi']->escapeString($inputTransform) . '\', '
-                . '`input_transformation_options` = \''
-                . $GLOBALS['dbi']->escapeString($inputTransformOpts) . '\'';
-        } else {
-            $upd_query = 'DELETE FROM '
-                . PMA\libraries\Util::backquote($cfgRelation['db'])
-                . '.' . PMA\libraries\Util::backquote($cfgRelation['column_info']);
-        }
-        $upd_query .= '
-            WHERE `db_name`     = \'' . $GLOBALS['dbi']->escapeString($db) . '\'
-              AND `table_name`  = \'' . $GLOBALS['dbi']->escapeString($table)
-                . '\'
-              AND `column_name` = \'' . $GLOBALS['dbi']->escapeString($key)
-                . '\'';
-    } elseif (mb_strlen($mimetype)
-        || mb_strlen($transformation)
-        || mb_strlen($transformationOpts)
-    ) {
-
-        $upd_query = 'INSERT INTO '
-            . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . '.' . PMA\libraries\Util::backquote($cfgRelation['column_info'])
-            . ' (db_name, table_name, column_name, mimetype, '
-            . 'transformation, transformation_options, '
-            . 'input_transformation, input_transformation_options) '
-            . ' VALUES('
-            . '\'' . $GLOBALS['dbi']->escapeString($db) . '\','
-            . '\'' . $GLOBALS['dbi']->escapeString($table) . '\','
-            . '\'' . $GLOBALS['dbi']->escapeString($key) . '\','
-            . '\'' . $GLOBALS['dbi']->escapeString($mimetype) . '\','
-            . '\'' . $GLOBALS['dbi']->escapeString($transformation) . '\','
-            . '\'' . $GLOBALS['dbi']->escapeString($transformationOpts) . '\','
-            . '\'' . $GLOBALS['dbi']->escapeString($inputTransform) . '\','
-            . '\'' . $GLOBALS['dbi']->escapeString($inputTransformOpts) . '\')';
-    }
-
-    if (isset($upd_query)) {
-        return PMA_queryAsControlUser($upd_query);
-    } else {
-        return false;
-    }
-} // end of 'PMA_setMIME()' function
-
-
-/**
- * GLOBAL Plugin functions
- */
-
-/**
- * Delete related transformation details
- * after deleting database. table or column
- *
- * @param string $db     Database name
- * @param string $table  Table name
- * @param string $column Column name
- *
- * @return boolean State of the query execution
- */
-function PMA_clearTransformations($db, $table = '', $column = '')
-{
-    $cfgRelation = PMA_getRelationsParam();
-
-    if (! isset($cfgRelation['column_info'])) {
-        return false;
-    }
-
-    $delete_sql = 'DELETE FROM '
-        . PMA\libraries\Util::backquote($cfgRelation['db']) . '.'
-        . PMA\libraries\Util::backquote($cfgRelation['column_info'])
-        . ' WHERE ';
-
-    if (($column != '') && ($table != '')) {
-
-        $delete_sql .= '`db_name` = \'' . $db . '\' AND '
-            . '`table_name` = \'' . $table . '\' AND '
-            . '`column_name` = \'' . $column . '\' ';
-
-    } else if ($table != '') {
-
-        $delete_sql .= '`db_name` = \'' . $db . '\' AND '
-            . '`table_name` = \'' . $table . '\' ';
-
-    } else {
-        $delete_sql .= '`db_name` = \'' . $db . '\' ';
-    }
-
-    return $GLOBALS['dbi']->tryQuery($delete_sql);
-
-}
-
diff --git a/#pma/libraries/url_generating.lib.php b/#pma/libraries/url_generating.lib.php
deleted file mode 100644
index 76970d18..00000000
--- a/#pma/libraries/url_generating.lib.php
+++ /dev/null
@@ -1,247 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * URL/hidden inputs generating.
- *
- * @package PhpMyAdmin
- */
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
-/**
- * Generates text with hidden inputs.
- *
- * @param string|array $db     optional database name
- *                             (can also be an array of parameters)
- * @param string       $table  optional table name
- * @param int          $indent indenting level
- * @param string|array $skip   do not generate a hidden field for this parameter
- *                             (can be an array of strings)
- *
- * @see PMA_URL_getCommon()
- *
- * @return string   string with input fields
- *
- * @access  public
- */
-function PMA_URL_getHiddenInputs($db = '', $table = '',
-    $indent = 0, $skip = array()
-) {
-    if (is_array($db)) {
-        $params  =& $db;
-        $_indent = empty($table) ? $indent : $table;
-        $_skip   = empty($indent) ? $skip : $indent;
-        $indent  =& $_indent;
-        $skip    =& $_skip;
-    } else {
-        $params = array();
-        if (mb_strlen($db)) {
-            $params['db'] = $db;
-        }
-        if (mb_strlen($table)) {
-            $params['table'] = $table;
-        }
-    }
-
-    if (! empty($GLOBALS['server'])
-        && $GLOBALS['server'] != $GLOBALS['cfg']['ServerDefault']
-    ) {
-        $params['server'] = $GLOBALS['server'];
-    }
-    if (empty($_COOKIE['pma_lang']) && ! empty($GLOBALS['lang'])) {
-        $params['lang'] = $GLOBALS['lang'];
-    }
-    if (empty($_COOKIE['pma_collation_connection'])
-        && ! empty($GLOBALS['collation_connection'])
-    ) {
-        $params['collation_connection'] = $GLOBALS['collation_connection'];
-    }
-
-    $params['token'] = $_SESSION[' PMA_token '];
-
-    if (! is_array($skip)) {
-        if (isset($params[$skip])) {
-            unset($params[$skip]);
-        }
-    } else {
-        foreach ($skip as $skipping) {
-            if (isset($params[$skipping])) {
-                unset($params[$skipping]);
-            }
-        }
-    }
-
-    return PMA_getHiddenFields($params);
-}
-
-/**
- * create hidden form fields from array with name => value
- *
- * <code>
- * $values = array(
- *     'aaa' => aaa,
- *     'bbb' => array(
- *          'bbb_0',
- *          'bbb_1',
- *     ),
- *     'ccc' => array(
- *          'a' => 'ccc_a',
- *          'b' => 'ccc_b',
- *     ),
- * );
- * echo PMA_getHiddenFields($values);
- *
- * // produces:
- * <input type="hidden" name="aaa" Value="aaa" />
- * <input type="hidden" name="bbb[0]" Value="bbb_0" />
- * <input type="hidden" name="bbb[1]" Value="bbb_1" />
- * <input type="hidden" name="ccc[a]" Value="ccc_a" />
- * <input type="hidden" name="ccc[b]" Value="ccc_b" />
- * </code>
- *
- * @param array  $values hidden values
- * @param string $pre    prefix
- *
- * @return string form fields of type hidden
- */
-function PMA_getHiddenFields($values, $pre = '')
-{
-    $fields = '';
-
-    foreach ($values as $name => $value) {
-        if (! empty($pre)) {
-            $name = $pre . '[' . $name . ']';
-        }
-
-        if (is_array($value)) {
-            $fields .= PMA_getHiddenFields($value, $name);
-        } else {
-            // do not generate an ending "\n" because
-            // PMA_URL_getHiddenInputs() is sometimes called
-            // from a JS document.write()
-            $fields .= '<input type="hidden" name="' . htmlspecialchars($name)
-                . '" value="' . htmlspecialchars($value) . '" />';
-        }
-    }
-
-    return $fields;
-}
-
-/**
- * Generates text with URL parameters.
- *
- * <code>
- * $params['myparam'] = 'myvalue';
- * $params['db']      = 'mysql';
- * $params['table']   = 'rights';
- * // note the missing ?
- * echo 'script.php' . PMA_URL_getCommon($params);
- * // produces with cookies enabled:
- * // script.php?myparam=myvalue&amp;db=mysql&amp;table=rights
- * // with cookies disabled:
- * // script.php?server=1&amp;lang=en&amp;myparam=myvalue&amp;db=mysql
- * // &amp;table=rights
- *
- * // note the missing ?
- * echo 'script.php' . PMA_URL_getCommon();
- * // produces with cookies enabled:
- * // script.php
- * // with cookies disabled:
- * // script.php?server=1&amp;lang=en
- * </code>
- *
- * @param mixed  $params  optional, Contains an associative array with url params
- *
- * @param string $encode  'html' to use htmlspecialchars() on the resulting
- *                        URL (for a normal URL displayed in HTML) or
- *                        something else to avoid using htmlspecialchars()
- *                        (for a URL sent via a header);
- *                        if not set,'html' is assumed
- *
- * @param string $divider optional character to use instead of '?'
- *
- * @return string   string with URL parameters
- * @access  public
- */
-function PMA_URL_getCommon($params = array(), $encode = 'html', $divider = '?')
-{
-    $separator = PMA_URL_getArgSeparator();
-
-    // avoid overwriting when creating navi panel links to servers
-    if (isset($GLOBALS['server'])
-        && $GLOBALS['server'] != $GLOBALS['cfg']['ServerDefault']
-        && ! isset($params['server'])
-        && ! defined('PMA_SETUP')
-    ) {
-        $params['server'] = $GLOBALS['server'];
-    }
-
-    if (empty($_COOKIE['pma_lang']) && ! empty($GLOBALS['lang'])) {
-        $params['lang'] = $GLOBALS['lang'];
-    }
-    if (empty($_COOKIE['pma_collation_connection'])
-        && ! empty($GLOBALS['collation_connection'])
-    ) {
-        $params['collation_connection'] = $GLOBALS['collation_connection'];
-    }
-
-    if (isset($_SESSION[' PMA_token '])) {
-        $params['token'] = $_SESSION[' PMA_token '];
-    }
-
-    if (empty($params)) {
-        return '';
-    }
-
-    $query = $divider . http_build_query($params, null, $separator);
-
-    if ($encode === 'html') {
-        $query = htmlspecialchars($query);
-    }
-
-    return $query;
-}
-
-/**
- * Returns url separator
- *
- * extracted from arg_separator.input as set in php.ini
- * we do not use arg_separator.output to avoid problems with &amp; and &
- *
- * @param string $encode whether to encode separator or not,
- * currently 'none' or 'html'
- *
- * @return string  character used for separating url parts usually ; or &
- * @access  public
- */
-function PMA_URL_getArgSeparator($encode = 'none')
-{
-    static $separator = null;
-    static $html_separator = null;
-
-    if (null === $separator) {
-        // use separators defined by php, but prefer ';'
-        // as recommended by W3C
-        // (see https://www.w3.org/TR/1999/REC-html401-19991224/appendix/notes.html#h-B.2.2)
-        $arg_separator = ini_get('arg_separator.input');
-        if (mb_strpos($arg_separator, ';') !== false) {
-            $separator = ';';
-        } elseif (mb_strlen($arg_separator) > 0) {
-            $separator = $arg_separator{0};
-        } else {
-            $separator = '&';
-        }
-        $html_separator = htmlentities($separator);
-    }
-
-    switch ($encode) {
-    case 'html':
-        return $html_separator;
-    case 'text' :
-    case 'none' :
-    default :
-        return $separator;
-    }
-}
-
diff --git a/#pma/libraries/user_preferences.inc.php b/#pma/libraries/user_preferences.inc.php
deleted file mode 100644
index 4ab7ff9b..00000000
--- a/#pma/libraries/user_preferences.inc.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Common header for user preferences pages
- *
- * @package PhpMyAdmin
- */
-use PMA\libraries\Message;
-
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-// build user preferences menu
-
-$form_param = isset($_GET['form']) ? $_GET['form'] : null;
-if (! isset($forms[$form_param])) {
-    $forms_keys = array_keys($forms);
-    $form_param = array_shift($forms_keys);
-}
-$tabs_icons = array(
-    'Features'    => 'b_tblops.png',
-    'Sql_queries' => 'b_sql.png',
-    'Navi_panel'  => 'b_select.png',
-    'Main_panel'  => 'b_props.png',
-    'Import'      => 'b_import.png',
-    'Export'      => 'b_export.png');
-
-$content = PMA\libraries\Util::getHtmlTab(
-    array(
-        'link' => 'prefs_manage.php',
-        'text' => __('Manage your settings')
-    )
-) . "\n";
-$script_name = basename($GLOBALS['PMA_PHP_SELF']);
-foreach (array_keys($forms) as $formset) {
-    $tab = array(
-        'link' => 'prefs_forms.php',
-        'text' => PMA_lang('Form_' . $formset),
-        'icon' => $tabs_icons[$formset],
-        'active' => ($script_name == 'prefs_forms.php' && $formset == $form_param));
-    $content .= PMA\libraries\Util::getHtmlTab($tab, array('form' => $formset))
-        . "\n";
-}
-echo PMA\libraries\Template::get('list/unordered')->render(
-    array(
-        'id' => 'topmenu2',
-        'class' => 'user_prefs_tabs',
-        'content' => $content,
-    )
-);
-echo '<div class="clearfloat"></div>';
-
-
-// show "configuration saved" message and reload navigation panel if needed
-if (!empty($_GET['saved'])) {
-    Message::rawSuccess(__('Configuration has been saved.'))->display();
-}
-
-/* debug code
-$arr = $cf->getConfigArray();
-$arr2 = array();
-foreach ($arr as $k => $v) {
-    $arr2[] = "<b>$k</b> " . var_export($v, true);
-}
-$arr2 = implode(', ', $arr2);
-$arr2 .= '<br />Blacklist: ' . (empty($cfg['UserprefsDisallow'])
-        ? '<i>empty</i>'
-        : implode(', ', $cfg['UserprefsDisallow']));
-$msg = Message::notice('Settings: ' . $arr2);
-$msg->display();
-//*/
-
-// warn about using session storage for settings
-$cfgRelation = PMA_getRelationsParam();
-if (! $cfgRelation['userconfigwork']) {
-    $msg = __(
-        'Your preferences will be saved for current session only. Storing them '
-        . 'permanently requires %sphpMyAdmin configuration storage%s.'
-    );
-    $msg = PMA_sanitize(
-        sprintf($msg, '[doc@linked-tables]', '[/doc]')
-    );
-    Message::notice($msg)->display();
-}
diff --git a/#pma/libraries/user_preferences.lib.php b/#pma/libraries/user_preferences.lib.php
deleted file mode 100644
index 7e8b5de5..00000000
--- a/#pma/libraries/user_preferences.lib.php
+++ /dev/null
@@ -1,290 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Functions for displaying user preferences pages
- *
- * @package PhpMyAdmin
- */
-use PMA\libraries\config\ConfigFile;
-use PMA\libraries\Message;
-
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
-/**
- * Common initialization for user preferences modification pages
- *
- * @param ConfigFile $cf Config file instance
- *
- * @return void
- */
-function PMA_userprefsPageInit(ConfigFile $cf)
-{
-    $forms_all_keys = PMA_readUserprefsFieldNames($GLOBALS['forms']);
-    $cf->resetConfigData(); // start with a clean instance
-    $cf->setAllowedKeys($forms_all_keys);
-    $cf->setCfgUpdateReadMapping(
-        array(
-            'Server/hide_db' => 'Servers/1/hide_db',
-            'Server/only_db' => 'Servers/1/only_db'
-        )
-    );
-    $cf->updateWithGlobalConfig($GLOBALS['cfg']);
-}
-
-/**
- * Loads user preferences
- *
- * Returns an array:
- * * config_data - path => value pairs
- * * mtime - last modification time
- * * type - 'db' (config read from pmadb) or 'session' (read from user session)
- *
- * @return array
- */
-function PMA_loadUserprefs()
-{
-    $cfgRelation = PMA_getRelationsParam();
-    if (! $cfgRelation['userconfigwork']) {
-        // no pmadb table, use session storage
-        if (! isset($_SESSION['userconfig'])) {
-            $_SESSION['userconfig'] = array(
-                'db' => array(),
-                'ts' => time());
-        }
-        return array(
-            'config_data' => $_SESSION['userconfig']['db'],
-            'mtime' => $_SESSION['userconfig']['ts'],
-            'type' => 'session');
-    }
-    // load configuration from pmadb
-    $query_table = PMA\libraries\Util::backquote($cfgRelation['db']) . '.'
-        . PMA\libraries\Util::backquote($cfgRelation['userconfig']);
-    $query = 'SELECT `config_data`, UNIX_TIMESTAMP(`timevalue`) ts'
-        . ' FROM ' . $query_table
-        . ' WHERE `username` = \''
-        . $GLOBALS['dbi']->escapeString($cfgRelation['user'])
-        . '\'';
-    $row = $GLOBALS['dbi']->fetchSingleRow($query, 'ASSOC', $GLOBALS['controllink']);
-
-    return array(
-        'config_data' => $row ? (array)json_decode($row['config_data']) : array(),
-        'mtime' => $row ? $row['ts'] : time(),
-        'type' => 'db');
-}
-
-/**
- * Saves user preferences
- *
- * @param array $config_array configuration array
- *
- * @return true|PMA\libraries\Message
- */
-function PMA_saveUserprefs(array $config_array)
-{
-    $cfgRelation = PMA_getRelationsParam();
-    $server = isset($GLOBALS['server'])
-        ? $GLOBALS['server']
-        : $GLOBALS['cfg']['ServerDefault'];
-    $cache_key = 'server_' . $server;
-    if (! $cfgRelation['userconfigwork']) {
-        // no pmadb table, use session storage
-        $_SESSION['userconfig'] = array(
-            'db' => $config_array,
-            'ts' => time());
-        if (isset($_SESSION['cache'][$cache_key]['userprefs'])) {
-            unset($_SESSION['cache'][$cache_key]['userprefs']);
-        }
-        return true;
-    }
-
-    // save configuration to pmadb
-    $query_table = PMA\libraries\Util::backquote($cfgRelation['db']) . '.'
-        . PMA\libraries\Util::backquote($cfgRelation['userconfig']);
-    $query = 'SELECT `username` FROM ' . $query_table
-        . ' WHERE `username` = \''
-        . $GLOBALS['dbi']->escapeString($cfgRelation['user'])
-        . '\'';
-
-    $has_config = $GLOBALS['dbi']->fetchValue(
-        $query, 0, 0, $GLOBALS['controllink']
-    );
-    $config_data = json_encode($config_array);
-    if ($has_config) {
-        $query = 'UPDATE ' . $query_table
-            . ' SET `timevalue` = NOW(), `config_data` = \''
-            . $GLOBALS['dbi']->escapeString($config_data)
-            . '\''
-            . ' WHERE `username` = \''
-            . $GLOBALS['dbi']->escapeString($cfgRelation['user'])
-            . '\'';
-    } else {
-        $query = 'INSERT INTO ' . $query_table
-            . ' (`username`, `timevalue`,`config_data`) '
-            . 'VALUES (\''
-            . $GLOBALS['dbi']->escapeString($cfgRelation['user']) . '\', NOW(), '
-            . '\'' . $GLOBALS['dbi']->escapeString($config_data) . '\')';
-    }
-    if (isset($_SESSION['cache'][$cache_key]['userprefs'])) {
-        unset($_SESSION['cache'][$cache_key]['userprefs']);
-    }
-    if (!$GLOBALS['dbi']->tryQuery($query, $GLOBALS['controllink'])) {
-        $message = Message::error(__('Could not save configuration'));
-        $message->addMessage('<br /><br />');
-        $message->addMessage(
-            Message::rawError(
-                $GLOBALS['dbi']->getError($GLOBALS['controllink'])
-            )
-        );
-        return $message;
-    }
-    return true;
-}
-
-/**
- * Returns a user preferences array filtered by $cfg['UserprefsDisallow']
- * (blacklist) and keys from user preferences form (whitelist)
- *
- * @param array $config_data path => value pairs
- *
- * @return array
- */
-function PMA_applyUserprefs(array $config_data)
-{
-    $cfg = array();
-    $blacklist = array_flip($GLOBALS['cfg']['UserprefsDisallow']);
-    if (!$GLOBALS['cfg']['UserprefsDeveloperTab']) {
-        // disallow everything in the Developers tab
-        $blacklist['DBG/sql'] = true;
-    }
-    $whitelist = array_flip(PMA_readUserprefsFieldNames());
-    // whitelist some additional fields which are custom handled
-    $whitelist['ThemeDefault'] = true;
-    $whitelist['fontsize'] = true;
-    $whitelist['lang'] = true;
-    $whitelist['collation_connection'] = true;
-    $whitelist['Server/hide_db'] = true;
-    $whitelist['Server/only_db'] = true;
-    foreach ($config_data as $path => $value) {
-        if (! isset($whitelist[$path]) || isset($blacklist[$path])) {
-            continue;
-        }
-        PMA_arrayWrite($path, $cfg, $value);
-    }
-    return $cfg;
-}
-
-/**
- * Reads user preferences field names
- *
- * @param array|null $forms Forms
- *
- * @return array
- */
-function PMA_readUserprefsFieldNames(array $forms = null)
-{
-    static $names;
-
-    if (defined('TESTSUITE')) {
-        $names = null;
-    }
-
-    // return cached results
-    if ($names !== null) {
-        return $names;
-    }
-    if (is_null($forms)) {
-        $forms = array();
-        include 'libraries/config/user_preferences.forms.php';
-    }
-    $names = array();
-    foreach ($forms as $formset) {
-        foreach ($formset as $form) {
-            foreach ($form as $k => $v) {
-                $names[] = is_int($k) ? $v : $k;
-            }
-        }
-    }
-    return $names;
-}
-
-/**
- * Updates one user preferences option (loads and saves to database).
- *
- * No validation is done!
- *
- * @param string $path          configuration
- * @param mixed  $value         value
- * @param mixed  $default_value default value
- *
- * @return void
- */
-function PMA_persistOption($path, $value, $default_value)
-{
-    $prefs = PMA_loadUserprefs();
-    if ($value === $default_value) {
-        if (isset($prefs['config_data'][$path])) {
-            unset($prefs['config_data'][$path]);
-        } else {
-            return;
-        }
-    } else {
-        $prefs['config_data'][$path] = $value;
-    }
-    PMA_saveUserprefs($prefs['config_data']);
-}
-
-/**
- * Redirects after saving new user preferences
- *
- * @param string $file_name Filename
- * @param array  $params    URL parameters
- * @param string $hash      Hash value
- *
- * @return void
- */
-function PMA_userprefsRedirect($file_name,
-    $params = null, $hash = null
-) {
-    // redirect
-    $url_params = array('saved' => 1);
-    if (is_array($params)) {
-        $url_params = array_merge($params, $url_params);
-    }
-    if ($hash) {
-        $hash = '#' . urlencode($hash);
-    }
-    PMA_sendHeaderLocation('./' . $file_name
-        . PMA_URL_getCommon($url_params, '&') . $hash
-    );
-}
-
-/**
- * Shows form which allows to quickly load
- * settings stored in browser's local storage
- *
- * @return string
- */
-function PMA_userprefsAutoloadGetHeader()
-{
-    if (isset($_REQUEST['prefs_autoload'])
-        && $_REQUEST['prefs_autoload'] == 'hide'
-    ) {
-        $_SESSION['userprefs_autoload'] = true;
-        return '';
-    }
-
-    $script_name = basename(basename($GLOBALS['PMA_PHP_SELF']));
-    $return_url = htmlspecialchars(
-        $script_name . '?' . http_build_query($_GET, '', '&')
-    );
-
-    return PMA\libraries\Template::get('prefs_autoload')
-        ->render(
-            array(
-                'hiddenInputs' => PMA_URL_getHiddenInputs(),
-                'return_url' => $return_url,
-            )
-        );
-}
diff --git a/#pma/libraries/util.lib.php b/#pma/libraries/util.lib.php
deleted file mode 100644
index 4b7590c9..00000000
--- a/#pma/libraries/util.lib.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Util file creation
- *
- * @package PhpMyAdmin
- */
-namespace PMA\Util;
-
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
-/**
- * Access to a multidimensional array by dot notation
- *
- * @param array        $array   List of values
- * @param string|array $path    Path to searched value
- * @param mixed        $default Default value
- *
- * @return mixed Searched value
- */
-function get($array, $path, $default = null)
-{
-    if (is_string($path)) {
-        $path = explode('.', $path);
-    }
-    $p = array_shift($path);
-    while (isset($p)) {
-        if (!isset($array[$p])) {
-            return $default;
-        }
-        $array = $array[$p];
-        $p = array_shift($path);
-    }
-    return $array;
-}
\ No newline at end of file
diff --git a/#pma/libraries/vendor_config.php b/#pma/libraries/vendor_config.php
deleted file mode 100644
index 54bd4bb2..00000000
--- a/#pma/libraries/vendor_config.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * File for vendor customisation, you can change here paths or some behaviour,
- * which vendors such as Linux distributions might want to change.
- *
- * For changing this file you should know what you are doing. For this reason
- * options here are not part of normal configuration.
- *
- * @package PhpMyAdmin
- */
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
-/**
- * Path to changelog file, can be gzip compressed. Useful when you want to
- * have documentation somewhere else, eg. /usr/share/doc.
- */
-define('CHANGELOG_FILE', './ChangeLog');
-
-/**
- * Path to license file. Useful when you want to have documentation somewhere
- * else, eg. /usr/share/doc.
- */
-define('LICENSE_FILE', './LICENSE');
-
-/**
- * Path to config file generated using setup script.
- */
-define('SETUP_CONFIG_FILE', './config/config.inc.php');
-
-/**
- * Whether setup requires writable directory where config
- * file will be generated.
- */
-define('SETUP_DIR_WRITABLE', true);
-
-/**
- * Directory where SQL scripts to create/upgrade configuration storage reside.
- */
-define('SQL_DIR', './sql/');
-
-/**
- * Directory where configuration files are stored.
- * It is not used directly in code, just a convenient
- * define used further in this file.
- */
-define('CONFIG_DIR', '');
-
-/**
- * Filename of a configuration file.
- */
-define('CONFIG_FILE', CONFIG_DIR . 'config.inc.php');
-
-/**
- * Filename of custom header file.
- */
-define('CUSTOM_HEADER_FILE', CONFIG_DIR . 'config.header.inc.php');
-
-/**
- * Filename of custom footer file.
- */
-define('CUSTOM_FOOTER_FILE', CONFIG_DIR . 'config.footer.inc.php');
-
-/**
- * Default value for check for version upgrades.
- */
-define('VERSION_CHECK_DEFAULT', true);
-
-/**
- * Path to gettext.inc file. Useful when you want php-gettext somewhere else,
- * eg. /usr/share/php/gettext/gettext.inc.
- */
-define('GETTEXT_INC', './libraries/php-gettext/gettext.inc');
-/**
- * Path to tcpdf.php file. Useful when you want to use system tcpdf,
- * eg. /usr/share/php/tcpdf/tcpdf.php.
- */
-define('TCPDF_INC', './libraries/tcpdf/tcpdf.php');
-
-/**
- * Path to the phpseclib. Useful when you want to use system phpseclib.
- */
-define('PHPSECLIB_INC_DIR', './libraries/phpseclib/');
-
-/**
- * Path to the udan11/sql-parser. Useful when you want to use system version.
- */
-define('SQL_PARSER_AUTOLOAD', './libraries/sql-parser/autoload.php');
-
-/**
- * Path to files with compiled locales (*.mo)
- */
-define('LOCALE_PATH', './locale/');
-
-/**
- * Avoid referring to nonexistent files (causes warnings when open_basedir
- * is used)
- */
-define('K_PATH_IMAGES', '');
diff --git a/#pma/libraries/zip_extension.lib.php b/#pma/libraries/zip_extension.lib.php
deleted file mode 100644
index 7eda5736..00000000
--- a/#pma/libraries/zip_extension.lib.php
+++ /dev/null
@@ -1,192 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Interface for the zip extension
- *
- * @package PhpMyAdmin
- */
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
-/**
- * Gets zip file contents
- *
- * @param string $file           zip file
- * @param string $specific_entry regular expression to match a file
- *
- * @return array ($error_message, $file_data); $error_message
- *                  is empty if no error
- */
-function PMA_getZipContents($file, $specific_entry = null)
-{
-    $error_message = '';
-    $file_data = '';
-    $zip_handle = zip_open($file);
-    if (!is_resource($zip_handle)) {
-        $error_message = __('Error in ZIP archive:')
-            . ' ' . PMA_getZipError($zip_handle);
-        return (array('error' => $error_message, 'data' => $file_data));
-    }
-
-    $first_zip_entry = zip_read($zip_handle);
-    if (false === $first_zip_entry) {
-        $error_message = __('No files found inside ZIP archive!');
-        zip_close($zip_handle);
-        return (array('error' => $error_message, 'data' => $file_data));
-    }
-
-    /* Is the the zip really an ODS file? */
-    $read = zip_entry_read($first_zip_entry);
-    $ods_mime = 'application/vnd.oasis.opendocument.spreadsheet';
-    if (!strcmp($ods_mime, $read)) {
-        $specific_entry = '/^content\.xml$/';
-    }
-
-    if (!isset($specific_entry)) {
-        zip_entry_open($zip_handle, $first_zip_entry, 'r');
-        /* File pointer has already been moved,
-         * so include what was read above */
-        $file_data = $read;
-        $file_data .= zip_entry_read(
-            $first_zip_entry,
-            zip_entry_filesize($first_zip_entry)
-        );
-        zip_entry_close($first_zip_entry);
-        zip_close($zip_handle);
-        return (array('error' => $error_message, 'data' => $file_data));
-    }
-
-    /* Return the correct contents, not just the first entry */
-    for ( ; ; ) {
-        $entry = zip_read($zip_handle);
-        if (is_resource($entry)) {
-            if (preg_match($specific_entry, zip_entry_name($entry))) {
-                zip_entry_open($zip_handle, $entry, 'r');
-                $file_data = zip_entry_read(
-                    $entry,
-                    zip_entry_filesize($entry)
-                );
-                zip_entry_close($entry);
-                break;
-            }
-        } else {
-            /**
-             * Either we have reached the end of the zip and still
-             * haven't found $specific_entry or there was a parsing
-             * error that we must display
-             */
-            if ($entry === false) {
-                $error_message = __('Error in ZIP archive:')
-                    . ' Could not find "' . $specific_entry . '"';
-            } else {
-                $error_message = __('Error in ZIP archive:')
-                    . ' ' . PMA_getZipError($zip_handle);
-            }
-
-            break;
-        }
-    }
-
-    zip_close($zip_handle);
-    return (array('error' => $error_message, 'data' => $file_data));
-}
-
-/**
- * Returns the file name of the first file that matches the given $file_regexp.
- *
- * @param string $file_regexp regular expression for the file name to match
- * @param string $file        zip archive
- *
- * @return string the file name of the first file that matches the given regexp
- */
-function PMA_findFileFromZipArchive($file_regexp, $file)
-{
-    $zip_handle = zip_open($file);
-    if (is_resource($zip_handle)) {
-        $entry = zip_read($zip_handle);
-        while (is_resource($entry)) {
-            if (preg_match($file_regexp, zip_entry_name($entry))) {
-                $file_name = zip_entry_name($entry);
-                zip_close($zip_handle);
-                return $file_name;
-            }
-            $entry = zip_read($zip_handle);
-        }
-    }
-    zip_close($zip_handle);
-    return false;
-}
-
-/**
- * Returns the number of files in the zip archive.
- *
- * @param string $file zip archive
- *
- * @return int the number of files in the zip archive
- */
-function PMA_getNoOfFilesInZip($file)
-{
-    $count = 0;
-    $zip_handle = zip_open($file);
-    if (is_resource($zip_handle)) {
-        $entry = zip_read($zip_handle);
-        while (is_resource($entry)) {
-            $count++;
-            $entry = zip_read($zip_handle);
-        }
-        zip_close($zip_handle);
-    }
-    return $count;
-}
-
-/**
- * Extracts a set of files from the given zip archive to a given destinations.
- *
- * @param string $zip_path path to the zip archive
- * @param string $entry    file in the archive that should be extracted
- *
- * @return string|bool data on sucess, false otherwise
- */
-function PMA_zipExtract($zip_path, $entry)
-{
-    $zip = new ZipArchive;
-    if ($zip->open($zip_path) === true) {
-        $result = $zip->getFromName($entry);
-        $zip->close();
-        return $result;
-    }
-    return false;
-}
-
-/**
-  * Gets zip error message
-  *
-  * @param resource $code error code
-  *
-  * @return string error message
- */
-function PMA_getZipError($code)
-{
-    // I don't think this needs translation
-    switch ($code) {
-    case ZIPARCHIVE::ER_MULTIDISK:
-        $message = 'Multi-disk zip archives not supported';
-        break;
-    case ZIPARCHIVE::ER_READ:
-        $message = 'Read error';
-        break;
-    case ZIPARCHIVE::ER_CRC:
-        $message = 'CRC error';
-        break;
-    case ZIPARCHIVE::ER_NOZIP:
-        $message = 'Not a zip archive';
-        break;
-    case ZIPARCHIVE::ER_INCONS:
-        $message = 'Zip archive inconsistent';
-        break;
-    default:
-        $message = $code;
-    }
-    return $message;
-}
diff --git a/#pma/license.php b/#pma/license.php
deleted file mode 100644
index 05f6f056..00000000
--- a/#pma/license.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Simple script to set correct charset for the license
- *
- * Note: please do not fold this script into a general script
- * that would read any file using a GET parameter, it would open a hole
- *
- * @package PhpMyAdmin
- */
-
-/**
- * Gets core libraries and defines some variables
- */
-require 'libraries/common.inc.php';
-
-$response = PMA\libraries\Response::getInstance();
-$response->disable();
-
-/**
- *
- */
-header('Content-type: text/plain; charset=utf-8');
-
-$filename = LICENSE_FILE;
-
-// Check if the file is available, some distributions remove these.
-if (@is_readable($filename)) {
-    readfile($filename);
-} else {
-    printf(
-        __(
-            'The %s file is not available on this system, please visit ' .
-            'www.phpmyadmin.net for more information.'
-        ), $filename
-    );
-}
diff --git a/#pma/lint.php b/#pma/lint.php
deleted file mode 100644
index 39d57c56..00000000
--- a/#pma/lint.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Represents the interface between the linter and  the query editor.
- *
- * @package PhpMyAdmin
- */
-use PMA\libraries\Linter;
-
-$_GET['ajax_request'] = 'true';
-
-/**
- * Loading common files. Used to check for authorization, localization and to
- * load the parsing library.
- */
-require_once 'libraries/common.inc.php';
-
-/**
- * The SQL query to be analyzed.
- *
- * This does not need to be checked again XSS or MySQL injections because it is
- * never executed, just parsed.
- *
- * The client, which will recieve the JSON response will decode the message and
- * and any HTML fragments that are displayed to the user will be encoded anyway.
- *
- * @var string
- */
-$sql_query = !empty($_POST['sql_query']) ? $_POST['sql_query'] : '';
-
-// Disabling standard response.
-PMA\libraries\Response::getInstance()->disable();
-
-PMA_headerJSON();
-
-if (! empty($_POST['options'])) {
-    $options = $_POST['options'];
-
-    if (! empty($options['routine_editor'])) {
-        $sql_query = 'CREATE PROCEDURE `a`() ' . $sql_query;
-    } elseif (! empty($options['trigger_editor'])) {
-        $sql_query = 'CREATE TRIGGER `a` AFTER INSERT ON `b` FOR EACH ROW ' . $sql_query;
-    } elseif (! empty($options['event_editor'])) {
-        $sql_query = 'CREATE EVENT `a` ON SCHEDULE EVERY MINUTE DO ' . $sql_query;
-    }
-}
-
-echo json_encode(Linter::lint($sql_query));
diff --git a/#pma/locale/az/LC_MESSAGES/phpmyadmin.mo b/#pma/locale/az/LC_MESSAGES/phpmyadmin.mo
deleted file mode 100644
index 387754c7..00000000
Binary files a/#pma/locale/az/LC_MESSAGES/phpmyadmin.mo and /dev/null differ
diff --git a/#pma/locale/bg/LC_MESSAGES/phpmyadmin.mo b/#pma/locale/bg/LC_MESSAGES/phpmyadmin.mo
deleted file mode 100644
index f1cbf510..00000000
Binary files a/#pma/locale/bg/LC_MESSAGES/phpmyadmin.mo and /dev/null differ
diff --git a/#pma/locale/bn/LC_MESSAGES/phpmyadmin.mo b/#pma/locale/bn/LC_MESSAGES/phpmyadmin.mo
deleted file mode 100644
index ff4708d2..00000000
Binary files a/#pma/locale/bn/LC_MESSAGES/phpmyadmin.mo and /dev/null differ
diff --git a/#pma/locale/ca/LC_MESSAGES/phpmyadmin.mo b/#pma/locale/ca/LC_MESSAGES/phpmyadmin.mo
deleted file mode 100644
index 3a936e72..00000000
Binary files a/#pma/locale/ca/LC_MESSAGES/phpmyadmin.mo and /dev/null differ
diff --git a/#pma/locale/cs/LC_MESSAGES/phpmyadmin.mo b/#pma/locale/cs/LC_MESSAGES/phpmyadmin.mo
deleted file mode 100644
index 7920deb7..00000000
Binary files a/#pma/locale/cs/LC_MESSAGES/phpmyadmin.mo and /dev/null differ
diff --git a/#pma/locale/da/LC_MESSAGES/phpmyadmin.mo b/#pma/locale/da/LC_MESSAGES/phpmyadmin.mo
deleted file mode 100644
index 76c01093..00000000
Binary files a/#pma/locale/da/LC_MESSAGES/phpmyadmin.mo and /dev/null differ
diff --git a/#pma/locale/de/LC_MESSAGES/phpmyadmin.mo b/#pma/locale/de/LC_MESSAGES/phpmyadmin.mo
deleted file mode 100644
index 4cf95d66..00000000
Binary files a/#pma/locale/de/LC_MESSAGES/phpmyadmin.mo and /dev/null differ
diff --git a/#pma/locale/el/LC_MESSAGES/phpmyadmin.mo b/#pma/locale/el/LC_MESSAGES/phpmyadmin.mo
deleted file mode 100644
index c9c5f942..00000000
Binary files a/#pma/locale/el/LC_MESSAGES/phpmyadmin.mo and /dev/null differ
diff --git a/#pma/locale/en_GB/LC_MESSAGES/phpmyadmin.mo b/#pma/locale/en_GB/LC_MESSAGES/phpmyadmin.mo
deleted file mode 100644
index a02eb632..00000000
Binary files a/#pma/locale/en_GB/LC_MESSAGES/phpmyadmin.mo and /dev/null differ
diff --git a/#pma/locale/es/LC_MESSAGES/phpmyadmin.mo b/#pma/locale/es/LC_MESSAGES/phpmyadmin.mo
deleted file mode 100644
index be8037fd..00000000
Binary files a/#pma/locale/es/LC_MESSAGES/phpmyadmin.mo and /dev/null differ
diff --git a/#pma/locale/et/LC_MESSAGES/phpmyadmin.mo b/#pma/locale/et/LC_MESSAGES/phpmyadmin.mo
deleted file mode 100644
index f0247470..00000000
Binary files a/#pma/locale/et/LC_MESSAGES/phpmyadmin.mo and /dev/null differ
diff --git a/#pma/locale/fi/LC_MESSAGES/phpmyadmin.mo b/#pma/locale/fi/LC_MESSAGES/phpmyadmin.mo
deleted file mode 100644
index aeb5ef72..00000000
Binary files a/#pma/locale/fi/LC_MESSAGES/phpmyadmin.mo and /dev/null differ
diff --git a/#pma/locale/fr/LC_MESSAGES/phpmyadmin.mo b/#pma/locale/fr/LC_MESSAGES/phpmyadmin.mo
deleted file mode 100644
index f55d9972..00000000
Binary files a/#pma/locale/fr/LC_MESSAGES/phpmyadmin.mo and /dev/null differ
diff --git a/#pma/locale/gl/LC_MESSAGES/phpmyadmin.mo b/#pma/locale/gl/LC_MESSAGES/phpmyadmin.mo
deleted file mode 100644
index 13d1d073..00000000
Binary files a/#pma/locale/gl/LC_MESSAGES/phpmyadmin.mo and /dev/null differ
diff --git a/#pma/locale/hu/LC_MESSAGES/phpmyadmin.mo b/#pma/locale/hu/LC_MESSAGES/phpmyadmin.mo
deleted file mode 100644
index b8043434..00000000
Binary files a/#pma/locale/hu/LC_MESSAGES/phpmyadmin.mo and /dev/null differ
diff --git a/#pma/locale/hy/LC_MESSAGES/phpmyadmin.mo b/#pma/locale/hy/LC_MESSAGES/phpmyadmin.mo
deleted file mode 100644
index 602f4b4b..00000000
Binary files a/#pma/locale/hy/LC_MESSAGES/phpmyadmin.mo and /dev/null differ
diff --git a/#pma/locale/ia/LC_MESSAGES/phpmyadmin.mo b/#pma/locale/ia/LC_MESSAGES/phpmyadmin.mo
deleted file mode 100644
index 8607012d..00000000
Binary files a/#pma/locale/ia/LC_MESSAGES/phpmyadmin.mo and /dev/null differ
diff --git a/#pma/locale/id/LC_MESSAGES/phpmyadmin.mo b/#pma/locale/id/LC_MESSAGES/phpmyadmin.mo
deleted file mode 100644
index 5d54b179..00000000
Binary files a/#pma/locale/id/LC_MESSAGES/phpmyadmin.mo and /dev/null differ
diff --git a/#pma/locale/it/LC_MESSAGES/phpmyadmin.mo b/#pma/locale/it/LC_MESSAGES/phpmyadmin.mo
deleted file mode 100644
index 11bb5cd1..00000000
Binary files a/#pma/locale/it/LC_MESSAGES/phpmyadmin.mo and /dev/null differ
diff --git a/#pma/locale/ja/LC_MESSAGES/phpmyadmin.mo b/#pma/locale/ja/LC_MESSAGES/phpmyadmin.mo
deleted file mode 100644
index 26f021d9..00000000
Binary files a/#pma/locale/ja/LC_MESSAGES/phpmyadmin.mo and /dev/null differ
diff --git a/#pma/locale/ko/LC_MESSAGES/phpmyadmin.mo b/#pma/locale/ko/LC_MESSAGES/phpmyadmin.mo
deleted file mode 100644
index 55c3df5d..00000000
Binary files a/#pma/locale/ko/LC_MESSAGES/phpmyadmin.mo and /dev/null differ
diff --git a/#pma/locale/lt/LC_MESSAGES/phpmyadmin.mo b/#pma/locale/lt/LC_MESSAGES/phpmyadmin.mo
deleted file mode 100644
index 1f6004d4..00000000
Binary files a/#pma/locale/lt/LC_MESSAGES/phpmyadmin.mo and /dev/null differ
diff --git a/#pma/locale/nb/LC_MESSAGES/phpmyadmin.mo b/#pma/locale/nb/LC_MESSAGES/phpmyadmin.mo
deleted file mode 100644
index efadaaf4..00000000
Binary files a/#pma/locale/nb/LC_MESSAGES/phpmyadmin.mo and /dev/null differ
diff --git a/#pma/locale/nl/LC_MESSAGES/phpmyadmin.mo b/#pma/locale/nl/LC_MESSAGES/phpmyadmin.mo
deleted file mode 100644
index 1adb21b9..00000000
Binary files a/#pma/locale/nl/LC_MESSAGES/phpmyadmin.mo and /dev/null differ
diff --git a/#pma/locale/pl/LC_MESSAGES/phpmyadmin.mo b/#pma/locale/pl/LC_MESSAGES/phpmyadmin.mo
deleted file mode 100644
index be55c141..00000000
Binary files a/#pma/locale/pl/LC_MESSAGES/phpmyadmin.mo and /dev/null differ
diff --git a/#pma/locale/pt/LC_MESSAGES/phpmyadmin.mo b/#pma/locale/pt/LC_MESSAGES/phpmyadmin.mo
deleted file mode 100644
index e09ad74f..00000000
Binary files a/#pma/locale/pt/LC_MESSAGES/phpmyadmin.mo and /dev/null differ
diff --git a/#pma/locale/pt_BR/LC_MESSAGES/phpmyadmin.mo b/#pma/locale/pt_BR/LC_MESSAGES/phpmyadmin.mo
deleted file mode 100644
index d35b1622..00000000
Binary files a/#pma/locale/pt_BR/LC_MESSAGES/phpmyadmin.mo and /dev/null differ
diff --git a/#pma/locale/ro/LC_MESSAGES/phpmyadmin.mo b/#pma/locale/ro/LC_MESSAGES/phpmyadmin.mo
deleted file mode 100644
index 82059634..00000000
Binary files a/#pma/locale/ro/LC_MESSAGES/phpmyadmin.mo and /dev/null differ
diff --git a/#pma/locale/ru/LC_MESSAGES/phpmyadmin.mo b/#pma/locale/ru/LC_MESSAGES/phpmyadmin.mo
deleted file mode 100644
index 25a50bbf..00000000
Binary files a/#pma/locale/ru/LC_MESSAGES/phpmyadmin.mo and /dev/null differ
diff --git a/#pma/locale/si/LC_MESSAGES/phpmyadmin.mo b/#pma/locale/si/LC_MESSAGES/phpmyadmin.mo
deleted file mode 100644
index 71167eea..00000000
Binary files a/#pma/locale/si/LC_MESSAGES/phpmyadmin.mo and /dev/null differ
diff --git a/#pma/locale/sk/LC_MESSAGES/phpmyadmin.mo b/#pma/locale/sk/LC_MESSAGES/phpmyadmin.mo
deleted file mode 100644
index c6fb3557..00000000
Binary files a/#pma/locale/sk/LC_MESSAGES/phpmyadmin.mo and /dev/null differ
diff --git a/#pma/locale/sl/LC_MESSAGES/phpmyadmin.mo b/#pma/locale/sl/LC_MESSAGES/phpmyadmin.mo
deleted file mode 100644
index ea292605..00000000
Binary files a/#pma/locale/sl/LC_MESSAGES/phpmyadmin.mo and /dev/null differ
diff --git a/#pma/locale/sq/LC_MESSAGES/phpmyadmin.mo b/#pma/locale/sq/LC_MESSAGES/phpmyadmin.mo
deleted file mode 100644
index 849d1132..00000000
Binary files a/#pma/locale/sq/LC_MESSAGES/phpmyadmin.mo and /dev/null differ
diff --git a/#pma/locale/sr@latin/LC_MESSAGES/phpmyadmin.mo b/#pma/locale/sr@latin/LC_MESSAGES/phpmyadmin.mo
deleted file mode 100644
index b468ffe6..00000000
Binary files a/#pma/locale/sr@latin/LC_MESSAGES/phpmyadmin.mo and /dev/null differ
diff --git a/#pma/locale/sv/LC_MESSAGES/phpmyadmin.mo b/#pma/locale/sv/LC_MESSAGES/phpmyadmin.mo
deleted file mode 100644
index df70d5ea..00000000
Binary files a/#pma/locale/sv/LC_MESSAGES/phpmyadmin.mo and /dev/null differ
diff --git a/#pma/locale/tr/LC_MESSAGES/phpmyadmin.mo b/#pma/locale/tr/LC_MESSAGES/phpmyadmin.mo
deleted file mode 100644
index 712df625..00000000
Binary files a/#pma/locale/tr/LC_MESSAGES/phpmyadmin.mo and /dev/null differ
diff --git a/#pma/locale/uk/LC_MESSAGES/phpmyadmin.mo b/#pma/locale/uk/LC_MESSAGES/phpmyadmin.mo
deleted file mode 100644
index 9d736fe9..00000000
Binary files a/#pma/locale/uk/LC_MESSAGES/phpmyadmin.mo and /dev/null differ
diff --git a/#pma/locale/vi/LC_MESSAGES/phpmyadmin.mo b/#pma/locale/vi/LC_MESSAGES/phpmyadmin.mo
deleted file mode 100644
index e0504268..00000000
Binary files a/#pma/locale/vi/LC_MESSAGES/phpmyadmin.mo and /dev/null differ
diff --git a/#pma/locale/zh_CN/LC_MESSAGES/phpmyadmin.mo b/#pma/locale/zh_CN/LC_MESSAGES/phpmyadmin.mo
deleted file mode 100644
index b561e21f..00000000
Binary files a/#pma/locale/zh_CN/LC_MESSAGES/phpmyadmin.mo and /dev/null differ
diff --git a/#pma/locale/zh_TW/LC_MESSAGES/phpmyadmin.mo b/#pma/locale/zh_TW/LC_MESSAGES/phpmyadmin.mo
deleted file mode 100644
index 6b9a532a..00000000
Binary files a/#pma/locale/zh_TW/LC_MESSAGES/phpmyadmin.mo and /dev/null differ
diff --git a/#pma/logout.php b/#pma/logout.php
deleted file mode 100644
index 3bfa8f72..00000000
--- a/#pma/logout.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Logout script
- *
- * @package PhpMyAdmin
- */
-require_once 'libraries/common.inc.php';
-
-if ($token_mismatch) {
-    PMA_sendHeaderLocation('./index.php');
-} else {
-    $auth_plugin->logOut();
-}
-
diff --git a/#pma/navigation.php b/#pma/navigation.php
deleted file mode 100644
index fd36d1b3..00000000
--- a/#pma/navigation.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * The navigation panel - displays server, db and table selection tree
- *
- * @package PhpMyAdmin-Navigation
- */
-
-// Include common functionalities
-use PMA\libraries\config\PageSettings;
-use PMA\libraries\navigation\Navigation;
-
-require_once './libraries/common.inc.php';
-
-// Also initialises the collapsible tree class
-$response = PMA\libraries\Response::getInstance();
-$navigation = new Navigation();
-if (! $response->isAjax()) {
-    $response->addHTML(
-        PMA\libraries\Message::error(
-            __('Fatal error: The navigation can only be accessed via AJAX')
-        )
-    );
-    exit;
-}
-
-if (isset($_REQUEST['getNaviSettings']) && $_REQUEST['getNaviSettings']) {
-    $response->addJSON('message', PageSettings::getNaviSettings());
-    exit();
-}
-
-$cfgRelation = PMA_getRelationsParam();
-if ($cfgRelation['navwork']) {
-    if (isset($_REQUEST['hideNavItem'])) {
-        if (! empty($_REQUEST['itemName'])
-            && ! empty($_REQUEST['itemType'])
-            && ! empty($_REQUEST['dbName'])
-        ) {
-            $navigation->hideNavigationItem(
-                $_REQUEST['itemName'],
-                $_REQUEST['itemType'],
-                $_REQUEST['dbName'],
-                (! empty($_REQUEST['tableName']) ? $_REQUEST['tableName'] : null)
-            );
-        }
-        exit;
-    }
-
-    if (isset($_REQUEST['unhideNavItem'])) {
-        if (! empty($_REQUEST['itemName'])
-            && ! empty($_REQUEST['itemType'])
-            && ! empty($_REQUEST['dbName'])
-        ) {
-            $navigation->unhideNavigationItem(
-                $_REQUEST['itemName'],
-                $_REQUEST['itemType'],
-                $_REQUEST['dbName'],
-                (! empty($_REQUEST['tableName']) ? $_REQUEST['tableName'] : null)
-            );
-        }
-        exit;
-    }
-
-    if (isset($_REQUEST['showUnhideDialog'])) {
-        if (! empty($_REQUEST['dbName'])) {
-            $response->addJSON(
-                'message',
-                $navigation->getItemUnhideDialog($_REQUEST['dbName'])
-            );
-        }
-        exit;
-    }
-}
-
-// Do the magic
-$response->addJSON('message', $navigation->getDisplay());
diff --git a/#pma/normalization.php b/#pma/normalization.php
deleted file mode 100644
index 30003b85..00000000
--- a/#pma/normalization.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Normalization process (temporarily specific to 1NF)
- *
- * @package PhpMyAdmin
- */
-
-/**
- *
- */
-require_once 'libraries/common.inc.php';
-require_once 'libraries/transformations.lib.php';
-require_once 'libraries/normalization.lib.php';
-
-if (isset($_REQUEST['getColumns'])) {
-    $html = '<option selected disabled>' . __('Select one…') . '</option>'
-        . '<option value="no_such_col">' . __('No such column') . '</option>';
-    //get column whose datatype falls under string category
-    $html .= PMA_getHtmlForColumnsList(
-        $db,
-        $table,
-        _pgettext('string types', 'String')
-    );
-    echo $html;
-    exit;
-}
-if (isset($_REQUEST['splitColumn'])) {
-    $num_fields = min(4096, intval($_REQUEST['numFields']));
-    $html = PMA_getHtmlForCreateNewColumn($num_fields, $db, $table);
-    $html .= PMA_URL_getHiddenInputs($db, $table);
-    echo $html;
-    exit;
-}
-if (isset($_REQUEST['addNewPrimary'])) {
-    $num_fields = 1;
-    $columnMeta = array('Field'=>$table . "_id", 'Extra'=>'auto_increment');
-    $html = PMA_getHtmlForCreateNewColumn(
-        $num_fields, $db, $table, $columnMeta
-    );
-    $html .= PMA_URL_getHiddenInputs($db, $table);
-    echo $html;
-    exit;
-}
-if (isset($_REQUEST['findPdl'])) {
-    $html = PMA_findPartialDependencies($table, $db);
-    echo $html;
-    exit;
-}
-
-if (isset($_REQUEST['getNewTables2NF'])) {
-    $partialDependencies = json_decode($_REQUEST['pd']);
-    $html = PMA_getHtmlForNewTables2NF($partialDependencies, $table);
-    echo $html;
-    exit;
-}
-
-if (isset($_REQUEST['getNewTables3NF'])) {
-    $dependencies = json_decode($_REQUEST['pd']);
-    $tables = json_decode($_REQUEST['tables']);
-    $newTables = PMA_getHtmlForNewTables3NF($dependencies, $tables, $db);
-    PMA\libraries\Response::getInstance()->disable();
-    PMA_headerJSON();
-    echo json_encode($newTables);
-    exit;
-}
-
-$response = PMA\libraries\Response::getInstance();
-$header = $response->getHeader();
-$scripts = $header->getScripts();
-$scripts->addFile('normalization.js');
-$scripts->addFile('jquery/jquery.uitablefilter.js');
-$normalForm = '1nf';
-if (PMA_isValid($_REQUEST['normalizeTo'], array('1nf', '2nf', '3nf'))) {
-    $normalForm = $_REQUEST['normalizeTo'];
-}
-if (isset($_REQUEST['createNewTables2NF'])) {
-    $partialDependencies = json_decode($_REQUEST['pd']);
-    $tablesName = json_decode($_REQUEST['newTablesName']);
-    $res = PMA_createNewTablesFor2NF($partialDependencies, $tablesName, $table, $db);
-    $response->addJSON($res);
-    exit;
-}
-if (isset($_REQUEST['createNewTables3NF'])) {
-    $newtables = json_decode($_REQUEST['newTables']);
-    $res = PMA_createNewTablesFor3NF($newtables, $db);
-    $response->addJSON($res);
-    exit;
-}
-if (isset($_POST['repeatingColumns'])) {
-    $repeatingColumns = $_POST['repeatingColumns'];
-    $newTable = $_POST['newTable'];
-    $newColumn = $_POST['newColumn'];
-    $primary_columns = $_POST['primary_columns'];
-    $res = PMA_moveRepeatingGroup(
-        $repeatingColumns, $primary_columns, $newTable, $newColumn, $table, $db
-    );
-    $response->addJSON($res);
-    exit;
-}
-if (isset($_REQUEST['step1'])) {
-    $html = PMA_getHtmlFor1NFStep1($db, $table, $normalForm);
-    $response->addHTML($html);
-} else if (isset($_REQUEST['step2'])) {
-    $res = PMA_getHtmlContentsFor1NFStep2($db, $table);
-    $response->addJSON($res);
-} else if (isset($_REQUEST['step3'])) {
-    $res = PMA_getHtmlContentsFor1NFStep3($db, $table);
-    $response->addJSON($res);
-} else if (isset($_REQUEST['step4'])) {
-    $res = PMA_getHtmlContentsFor1NFStep4($db, $table);
-    $response->addJSON($res);
-} else if (isset($_REQUEST['step']) && $_REQUEST['step'] == '2.1') {
-    $res = PMA_getHtmlFor2NFstep1($db, $table);
-    $response->addJSON($res);
-} else if (isset($_REQUEST['step']) && $_REQUEST['step'] == '3.1') {
-    $tables = $_REQUEST['tables'];
-    $res = PMA_getHtmlFor3NFstep1($db, $tables);
-    $response->addJSON($res);
-} else {
-    $response->addHTML(PMA_getHtmlForNormalizetable());
-}
diff --git a/#pma/phpmyadmin.css.php b/#pma/phpmyadmin.css.php
deleted file mode 100644
index 68faed8c..00000000
--- a/#pma/phpmyadmin.css.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Main stylesheet loader
- *
- * @package PhpMyAdmin
- */
- use PMA\libraries\OutputBuffering;
-
-/**
- *
- */
-
-define('PMA_MINIMUM_COMMON', true);
-require_once 'libraries/common.inc.php';
-
-// MSIE 6 (at least some unpatched versions) has problems loading CSS
-// when zlib_compression is on
-if (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER == '6'
-    && (ini_get('zlib.output_compression'))
-) {
-    @ini_set('zlib.output_compression', 'Off');
-} else {
-    $buffer = OutputBuffering::getInstance();
-    $buffer->start();
-    register_shutdown_function(
-        function () {
-            echo OutputBuffering::getInstance()->getContents();
-        }
-    );
-}
-
-// Send correct type:
-header('Content-Type: text/css; charset=UTF-8');
-
-// Cache output in client - the nocache query parameter makes sure that this
-// file is reloaded when config changes
-header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 3600) . ' GMT');
-
-$_SESSION['PMA_Theme_Manager']->printCss();
diff --git a/#pma/phpunit.xml.dist b/#pma/phpunit.xml.dist
deleted file mode 100644
index ac0488f7..00000000
--- a/#pma/phpunit.xml.dist
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="test/bootstrap-dist.php"
-         backupGlobals="true"
-         backupStaticAttributes="false"
-         colors="true"
-         verbose="true">
-
-    <selenium>
-        <browser name="Firefox on localhost"
-                 browser="firefox"
-                 host="127.0.0.1"
-                 port="4444"
-                 timeout="30000"/>
-    </selenium>
-
-    <testsuites>
-        <testsuite name="Classes">
-            <directory suffix="Test.php">test/classes</directory>
-        </testsuite>
-        <testsuite name="Engines">
-            <directory suffix="_test.php">test/engines</directory>
-        </testsuite>
-        <testsuite name="Unit">
-            <file>test/Environment_test.php</file>
-            <directory suffix="_test.php">test/libraries/core</directory>
-            <directory suffix="_test.php">test/libraries/common</directory>
-            <directory suffix="_test.php">test/libraries/rte</directory>
-            <directory suffix="_test.php">test/libraries</directory>
-        </testsuite>
-        <!-- <testsuite name="Selenium">
-            <directory suffix="Test.php">test/selenium</directory>
-        </testsuite> -->
-    </testsuites>
-
-    <logging>
-        <log type="coverage-clover" target="build/logs/clover.xml"/>
-        <log type="junit" target="build/logs/junit.xml" logIncompleteSkipped="false"/>
-    </logging>
-
-    <filter>
-        <whitelist addUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">.</directory>
-            <exclude>
-                <!-- excluding the tests from the coverage -->
-                <directory>test/</directory>
-                <!-- we don't care about coverage of embedded libraries -->
-                <directory suffix=".inc">libraries/php-gettext</directory>
-                <directory suffix=".php">libraries/bfShapeFiles</directory>
-                <directory suffix=".php">libraries/php-gettext</directory>
-                <directory suffix=".php">libraries/phpseclib</directory>
-                <directory suffix=".php">libraries/sql-parser</directory>
-                <directory suffix=".php">libraries/tcpdf</directory>
-                <!-- examples for users -->
-                <directory suffix=".php">examples</directory>
-                <!-- maintenance scripts -->
-                <directory suffix=".php">scripts</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-</phpunit>
diff --git a/#pma/phpunit.xml.hhvm b/#pma/phpunit.xml.hhvm
deleted file mode 100644
index 7ae089b8..00000000
--- a/#pma/phpunit.xml.hhvm
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="test/bootstrap-dist.php"
-         backupGlobals="true"
-         backupStaticAttributes="false"
-         strict="true"
-         timeoutForSmallTests="10"
-         timeoutForMediumTests="30"
-         colors="true"
-         verbose="true">
-
-    <testsuites>
-        <testsuite name="Classes">
-            <directory suffix="Test.php">test/classes</directory>
-        </testsuite>
-        <testsuite name="Engines">
-            <directory suffix="_test.php">test/engines</directory>
-        </testsuite>
-        <testsuite name="Unit">
-            <file>test/Environment_test.php</file>
-            <directory suffix="_test.php">test/libraries/core</directory>
-            <directory suffix="_test.php">test/libraries/common</directory>
-            <directory suffix="_test.php">test/libraries/rte</directory>
-            <directory suffix="_test.php">test/libraries</directory>
-        </testsuite>
-    </testsuites>
-
-    <logging>
-        <log type="junit" target="build/logs/junit.xml" logIncompleteSkipped="false"/>
-    </logging>
-</phpunit>
diff --git a/#pma/phpunit.xml.nocoverage b/#pma/phpunit.xml.nocoverage
deleted file mode 100644
index 1683df5b..00000000
--- a/#pma/phpunit.xml.nocoverage
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="test/bootstrap-dist.php"
-         backupGlobals="true"
-         backupStaticAttributes="false"
-         strict="true"
-         timeoutForSmallTests="3"
-         colors="true"
-         verbose="true">
-
-    <selenium>
-        <browser name="Firefox on localhost"
-                 browser="*firefox"
-                 host="127.0.0.1"
-                 port="4444"
-                 timeout="30000"/>
-    </selenium>
-
-    <testsuites>
-        <testsuite name="Classes">
-            <directory suffix="Test.php">test/classes</directory>
-        </testsuite>
-        <testsuite name="Engines">
-            <directory suffix="_test.php">test/engines</directory>
-        </testsuite>
-        <testsuite name="Unit">
-            <file>test/Environment_test.php</file>
-            <directory suffix="_test.php">test/libraries/core</directory>
-            <directory suffix="_test.php">test/libraries/common</directory>
-            <directory suffix="_test.php">test/libraries/rte</directory>
-            <directory suffix="_test.php">test/libraries</directory>
-        </testsuite>
-        <testsuite name="Selenium">
-            <directory suffix="Test.php">test/selenium</directory>
-        </testsuite>
-    </testsuites>
-
-    <logging>
-        <log type="junit" target="build/logs/junit.xml" logIncompleteSkipped="false"/>
-    </logging>
-</phpunit>
diff --git a/#pma/prefs_forms.php b/#pma/prefs_forms.php
deleted file mode 100644
index 0261f66f..00000000
--- a/#pma/prefs_forms.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * User preferences page
- *
- * @package PhpMyAdmin
- */
-use PMA\libraries\config\ConfigFile;
-use PMA\libraries\config\FormDisplay;
-use PMA\libraries\Response;
-
-/**
- * Gets some core libraries and displays a top message if required
- */
-require_once 'libraries/common.inc.php';
-require_once 'libraries/user_preferences.lib.php';
-require_once 'libraries/config/config_functions.lib.php';
-require_once 'libraries/config/messages.inc.php';
-require 'libraries/config/user_preferences.forms.php';
-
-$cf = new ConfigFile($GLOBALS['PMA_Config']->base_settings);
-PMA_userprefsPageInit($cf);
-
-// handle form processing
-
-$form_param = isset($_GET['form']) ? $_GET['form'] : null;
-if (! isset($forms[$form_param])) {
-    $forms_keys = array_keys($forms);
-    $form_param = array_shift($forms_keys);
-}
-
-$form_display = new FormDisplay($cf);
-foreach ($forms[$form_param] as $form_name => $form) {
-    // skip Developer form if no setting is available
-    if ($form_name == 'Developer' && !$GLOBALS['cfg']['UserprefsDeveloperTab']) {
-        continue;
-    }
-    $form_display->registerForm($form_name, $form, 1);
-}
-
-if (isset($_POST['revert'])) {
-    // revert erroneous fields to their default values
-    $form_display->fixErrors();
-    // redirect
-    $url_params = array('form' => $form_param);
-    PMA_sendHeaderLocation(
-        './prefs_forms.php'
-        . PMA_URL_getCommon($url_params, 'text')
-    );
-    exit;
-}
-
-$error = null;
-if ($form_display->process(false) && !$form_display->hasErrors()) {
-    // save settings
-    $result = PMA_saveUserprefs($cf->getConfigArray());
-    if ($result === true) {
-        // reload config
-        $GLOBALS['PMA_Config']->loadUserPreferences();
-        $tabHash = isset($_POST['tab_hash']) ? $_POST['tab_hash'] : null;
-        $hash = ltrim($tabHash, '#');
-        PMA_userprefsRedirect(
-            'prefs_forms.php',
-            array('form' => $form_param),
-            $hash
-        );
-        exit;
-    } else {
-        $error = $result;
-    }
-}
-
-// display forms
-$response = Response::getInstance();
-$header   = $response->getHeader();
-$scripts  = $header->getScripts();
-$scripts->addFile('config.js');
-
-require 'libraries/user_preferences.inc.php';
-if ($error) {
-    $error->display();
-}
-if ($form_display->hasErrors()) {
-    // form has errors
-    ?>
-    <div class="error config-form">
-        <b>
-            <?php echo __('Cannot save settings, submitted form contains errors!') ?>
-        </b>
-        <?php echo $form_display->displayErrors(); ?>
-    </div>
-    <?php
-}
-echo $form_display->getDisplay(true, true);
-
-if ($response->isAjax()) {
-    $response->addJSON('_disableNaviSettings', true);
-} else {
-    define('PMA_DISABLE_NAVI_SETTINGS', true);
-}
diff --git a/#pma/prefs_manage.php b/#pma/prefs_manage.php
deleted file mode 100644
index 3d8e9cdf..00000000
--- a/#pma/prefs_manage.php
+++ /dev/null
@@ -1,383 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * User preferences management page
- *
- * @package PhpMyAdmin
- */
-use PMA\libraries\config\ConfigFile;
-use PMA\libraries\config\FormDisplay;
-use PMA\libraries\Message;
-use PMA\libraries\Response;
-use PMA\libraries\Util;
-
-/**
- * Gets some core libraries and displays a top message if required
- */
-require_once 'libraries/common.inc.php';
-require_once 'libraries/user_preferences.lib.php';
-require_once 'libraries/config/config_functions.lib.php';
-require_once 'libraries/config/messages.inc.php';
-require 'libraries/config/user_preferences.forms.php';
-
-$cf = new ConfigFile($GLOBALS['PMA_Config']->base_settings);
-PMA_userprefsPageInit($cf);
-
-$error = '';
-if (isset($_POST['submit_export'])
-    && isset($_POST['export_type'])
-    && $_POST['export_type'] == 'text_file'
-) {
-    // export to JSON file
-    PMA\libraries\Response::getInstance()->disable();
-    $filename = 'phpMyAdmin-config-' . urlencode(PMA_getenv('HTTP_HOST')) . '.json';
-    PMA_downloadHeader($filename, 'application/json');
-    $settings = PMA_loadUserprefs();
-    echo json_encode($settings['config_data'], JSON_PRETTY_PRINT);
-    exit;
-} else if (isset($_POST['submit_get_json'])) {
-    $settings = PMA_loadUserprefs();
-    $response = PMA\libraries\Response::getInstance();
-    $response->addJSON('prefs', json_encode($settings['config_data']));
-    $response->addJSON('mtime', $settings['mtime']);
-    exit;
-} else if (isset($_POST['submit_import'])) {
-    // load from JSON file
-    $json = '';
-    if (isset($_POST['import_type'])
-        && $_POST['import_type'] == 'text_file'
-        && isset($_FILES['import_file'])
-        && $_FILES['import_file']['error'] == UPLOAD_ERR_OK
-        && is_uploaded_file($_FILES['import_file']['tmp_name'])
-    ) {
-        // read JSON from uploaded file
-        $open_basedir = @ini_get('open_basedir');
-        $file_to_unlink = '';
-        $import_file = $_FILES['import_file']['tmp_name'];
-
-        // If we are on a server with open_basedir, we must move the file
-        // before opening it. The doc explains how to create the "./tmp"
-        // directory
-        if (!empty($open_basedir)) {
-            $tmp_subdir = (PMA_IS_WINDOWS ? '.\\tmp\\' : 'tmp/');
-            if (@is_writable($tmp_subdir)) {
-                $import_file_new = tempnam($tmp_subdir, 'prefs');
-                $file_to_unlink = $import_file_new;
-                if (move_uploaded_file($import_file, $import_file_new)) {
-                    $import_file = $import_file_new;
-                }
-            }
-        }
-        $json = file_get_contents($import_file);
-        if ($file_to_unlink) {
-            unlink($file_to_unlink);
-        }
-    } else {
-        // read from POST value (json)
-        $json = isset($_POST['json']) ? $_POST['json'] : null;
-    }
-
-    // hide header message
-    $_SESSION['userprefs_autoload'] = true;
-
-    $config = json_decode($json, true);
-    $return_url = isset($_POST['return_url']) ? $_POST['return_url'] : null;
-    if (! is_array($config)) {
-        $error = __('Could not import configuration');
-    } else {
-        // sanitize input values: treat them as though
-        // they came from HTTP POST request
-        $form_display = new FormDisplay($cf);
-        foreach ($forms as $formset_id => $formset) {
-            foreach ($formset as $form_name => $form) {
-                $form_display->registerForm($formset_id . ': ' . $form_name, $form);
-            }
-        }
-        $new_config = $cf->getFlatDefaultConfig();
-        if (!empty($_POST['import_merge'])) {
-            $new_config = array_merge($new_config, $cf->getConfigArray());
-        }
-        $new_config = array_merge($new_config, $config);
-        $_POST_bak = $_POST;
-        foreach ($new_config as $k => $v) {
-            $_POST[str_replace('/', '-', $k)] = $v;
-        }
-        $cf->resetConfigData();
-        $all_ok = $form_display->process(true, false);
-        $all_ok = $all_ok && !$form_display->hasErrors();
-        $_POST = $_POST_bak;
-
-        if (!$all_ok && isset($_POST['fix_errors'])) {
-            $form_display->fixErrors();
-            $all_ok = true;
-        }
-        if (!$all_ok) {
-            // mimic original form and post json in a hidden field
-            include 'libraries/user_preferences.inc.php';
-            $msg = Message::error(
-                __('Configuration contains incorrect data for some fields.')
-            );
-            $msg->display();
-            echo '<div class="config-form">';
-            echo $form_display->displayErrors();
-            echo '</div>';
-            echo '<form action="prefs_manage.php" method="post">';
-            echo PMA_URL_getHiddenInputs() , "\n";
-            echo '<input type="hidden" name="json" value="'
-                , htmlspecialchars($json) , '" />';
-            echo '<input type="hidden" name="fix_errors" value="1" />';
-            if (! empty($_POST['import_merge'])) {
-                echo '<input type="hidden" name="import_merge" value="1" />';
-            }
-            if ($return_url) {
-                echo '<input type="hidden" name="return_url" value="'
-                    , htmlspecialchars($return_url) , '" />';
-            }
-            echo '<p>';
-            echo __('Do you want to import remaining settings?');
-            echo '</p>';
-            echo '<input type="submit" name="submit_import" value="'
-                , __('Yes') , '" />';
-            echo '<input type="submit" name="submit_ignore" value="'
-                , __('No') , '" />';
-            echo '</form>';
-            exit;
-        }
-
-        // check for ThemeDefault and fontsize
-        $params = array();
-        if (isset($config['ThemeDefault'])
-            && $_SESSION['PMA_Theme_Manager']->theme->getId() != $config['ThemeDefault']
-            && $_SESSION['PMA_Theme_Manager']->checkTheme($config['ThemeDefault'])
-        ) {
-            $_SESSION['PMA_Theme_Manager']->setActiveTheme($config['ThemeDefault']);
-            $_SESSION['PMA_Theme_Manager']->setThemeCookie();
-        }
-        if (isset($config['fontsize'])
-            && $config['fontsize'] != $GLOBALS['PMA_Config']->get('fontsize')
-        ) {
-            $params['set_fontsize'] = $config['fontsize'];
-        }
-        if (isset($config['lang'])
-            && $config['lang'] != $GLOBALS['lang']
-        ) {
-            $params['lang'] = $config['lang'];
-        }
-        if (isset($config['collation_connection'])
-            && $config['collation_connection'] != $GLOBALS['collation_connection']
-        ) {
-            $params['collation_connection'] = $config['collation_connection'];
-        }
-
-        // save settings
-        $result = PMA_saveUserprefs($cf->getConfigArray());
-        if ($result === true) {
-            if ($return_url) {
-                $query =  PMA\libraries\Util::splitURLQuery($return_url);
-                $return_url = parse_url($return_url, PHP_URL_PATH);
-
-                foreach ($query as $q) {
-                    $pos = mb_strpos($q, '=');
-                    $k = mb_substr($q, 0, $pos);
-                    if ($k == 'token') {
-                        continue;
-                    }
-                    $params[$k] = mb_substr($q, $pos + 1);
-                }
-            } else {
-                $return_url = 'prefs_manage.php';
-            }
-            // reload config
-            $GLOBALS['PMA_Config']->loadUserPreferences();
-            PMA_userprefsRedirect($return_url, $params);
-            exit;
-        } else {
-            $error = $result;
-        }
-    }
-} else if (isset($_POST['submit_clear'])) {
-    $result = PMA_saveUserprefs(array());
-    if ($result === true) {
-        $params = array();
-        if ($GLOBALS['PMA_Config']->get('fontsize') != '82%') {
-            $GLOBALS['PMA_Config']->removeCookie('pma_fontsize');
-        }
-        $GLOBALS['PMA_Config']->removeCookie('pma_collaction_connection');
-        $GLOBALS['PMA_Config']->removeCookie('pma_lang');
-        PMA_userprefsRedirect('prefs_manage.php', $params);
-        exit;
-    } else {
-        $error = $result;
-    }
-    exit;
-}
-
-$response = Response::getInstance();
-$header   = $response->getHeader();
-$scripts = $header->getScripts();
-$scripts->addFile('config.js');
-
-require 'libraries/user_preferences.inc.php';
-if ($error) {
-    if (!$error instanceof Message) {
-        $error = Message::error($error);
-    }
-    $error->display();
-}
-?>
-<script type="text/javascript">
-<?php
-PMA_printJsValue("PMA_messages['strSavedOn']", __('Saved on: @DATE@'));
-?>
-</script>
-<div id="maincontainer">
-    <div id="main_pane_left">
-        <div class="group">
-<?php
-echo '<h2>' , __('Import') , '</h2>'
-    , '<form class="group-cnt prefs-form disableAjax" name="prefs_import"'
-    , ' action="prefs_manage.php" method="post" enctype="multipart/form-data">'
-    , Util::generateHiddenMaxFileSize($GLOBALS['max_upload_size'])
-    , PMA_URL_getHiddenInputs()
-    , '<input type="hidden" name="json" value="" />'
-    , '<input type="radio" id="import_text_file" name="import_type"'
-    , ' value="text_file" checked="checked" />'
-    , '<label for="import_text_file">' . __('Import from file') . '</label>'
-    , '<div id="opts_import_text_file" class="prefsmanage_opts">'
-    , '<label for="input_import_file">' , __('Browse your computer:') , '</label>'
-    , '<input type="file" name="import_file" id="input_import_file" />'
-    , '</div>'
-    , '<input type="radio" id="import_local_storage" name="import_type"'
-    , ' value="local_storage" disabled="disabled" />'
-    , '<label for="import_local_storage">'
-    , __('Import from browser\'s storage') , '</label>'
-    , '<div id="opts_import_local_storage" class="prefsmanage_opts disabled">'
-    , '<div class="localStorage-supported">'
-    , __('Settings will be imported from your browser\'s local storage.')
-    , '<br />'
-    , '<div class="localStorage-exists">'
-    , __('Saved on: @DATE@')
-    , '</div>'
-    , '<div class="localStorage-empty">';
-Message::notice(__('You have no saved settings!'))->display();
-echo  '</div>'
-    , '</div>'
-    , '<div class="localStorage-unsupported">';
-Message::notice(
-    __('This feature is not supported by your web browser')
-)->display();
-echo '</div>'
-    , '</div>'
-    , '<input type="checkbox" id="import_merge" name="import_merge" />'
-    , '<label for="import_merge">'
-    , __('Merge with current configuration') . '</label>'
-    , '<br /><br />'
-    , '<input type="submit" name="submit_import" value="'
-    , __('Go') . '" />'
-    , '</form>'
-    , '</div>';
-if (file_exists('setup/index.php')) {
-            // show only if setup script is available, allows to disable this message
-            // by simply removing setup directory
-            ?>
-            <div class="group">
-            <h2><?php echo __('More settings') ?></h2>
-            <div class="group-cnt">
-                <?php
-                echo sprintf(
-                    __(
-                        'You can set more settings by modifying config.inc.php, eg. '
-                        . 'by using %sSetup script%s.'
-                    ), '<a href="setup/index.php" target="_blank">', '</a>'
-                ) , PMA\libraries\Util::showDocu('setup', 'setup-script');
-                ?>
-            </div>
-            </div>
-        <?php
-}
-        ?>
-    </div>
-    <div id="main_pane_right">
-        <div class="group">
-            <h2><?php echo __('Export'); ?></h2>
-            <div class="click-hide-message group-cnt" style="display:none">
-                <?php
-                Message::rawSuccess(
-                    __('Configuration has been saved.')
-                )->display();
-                ?>
-            </div>
-            <form class="group-cnt prefs-form disableAjax" name="prefs_export"
-                  action="prefs_manage.php" method="post">
-                <?php echo PMA_URL_getHiddenInputs(); ?>
-                <div style="padding-bottom:0.5em">
-                    <input type="radio" id="export_text_file" name="export_type"
-                           value="text_file" checked="checked" />
-                    <label for="export_text_file">
-                        <?php echo __('Save as file'); ?>
-                    </label><br />
-                    <input type="radio" id="export_local_storage" name="export_type"
-                           value="local_storage" disabled="disabled" />
-                    <label for="export_local_storage">
-                        <?php echo __('Save to browser\'s storage'); ?></label>
-                </div>
-                <div id="opts_export_local_storage"
-                     class="prefsmanage_opts disabled">
-                    <span class="localStorage-supported">
-                        <?php
-                        echo __(
-                            'Settings will be saved in your browser\'s local '
-                            . 'storage.'
-                        );
-                        ?>
-                        <div class="localStorage-exists">
-                            <b>
-                                <?php
-                                echo __(
-                                    'Existing settings will be overwritten!'
-                                );
-                                ?>
-                            </b>
-                        </div>
-                    </span>
-                    <div class="localStorage-unsupported">
-                        <?php
-                        Message::notice(
-                            __('This feature is not supported by your web browser')
-                        )->display();
-                        ?>
-                    </div>
-                </div>
-                <br />
-                <?php
-                echo '<input type="submit" name="submit_export" value="' , __(
-                    'Go'
-                ) , '" />';
-                ?>
-            </form>
-        </div>
-        <div class="group">
-            <h2><?php echo __('Reset'); ?></h2>
-            <form class="group-cnt prefs-form disableAjax" name="prefs_reset"
-                  action="prefs_manage.php" method="post">
-                <?php
-                echo PMA_URL_getHiddenInputs() , __(
-                    'You can reset all your settings and restore them to default '
-                    . 'values.'
-                );
-                ?>
-                <br /><br />
-                <input type="submit" name="submit_clear"
-                       value="<?php echo __('Reset'); ?>"/>
-            </form>
-        </div>
-    </div>
-    <br class="clearfloat" />
-</div>
-
-<?php
-if ($response->isAjax()) {
-    $response->addJSON('_disableNaviSettings', true);
-} else {
-    define('PMA_DISABLE_NAVI_SETTINGS', true);
-}
diff --git a/#pma/print.css b/#pma/print.css
deleted file mode 100644
index 1aa2f982..00000000
--- a/#pma/print.css
+++ /dev/null
@@ -1,92 +0,0 @@
-.nowrap {
-    white-space: nowrap;
-}
-
-.hide {
-    display: none;
-}
-
-body, table, th, td {
-    color:             #000;
-    background-color:  #fff;
-}
-
-img {
-    border: 0;
-}
-
-table, th, td {
-    border: .1em solid #000;
-}
-
-table {
-    border-collapse:   collapse;
-    border-spacing:    0;
-}
-
-th, td {
-    padding:           0.2em;
-}
-
-th {
-    font-weight:       bold;
-    background-color:  #e5e5e5;
-}
-
-th.vtop, td.vtop {
-    vertical-align: top;
-}
-
-th.vbottom, td.vbottom {
-    vertical-align: bottom;
-}
-
-@media print {
-    .print_ignore {
-        display: none;
-    }
-
-    .nowrap {
-        white-space: nowrap;
-    }
-
-    .hide {
-        display: none;
-    }
-
-    body, table, th, td {
-        color:             #000;
-        background-color:  #fff;
-    }
-
-    img {
-        border: 0;
-    }
-
-    table, th, td {
-        border: .1em solid #000;
-    }
-
-    table {
-        border-collapse:   collapse;
-        border-spacing:    0;
-    }
-
-    th, td {
-        padding:           0.2em;
-    }
-
-    th {
-        font-weight:       bold;
-        background-color:  #e5e5e5;
-    }
-
-    th.vtop, td.vtop {
-        vertical-align: top;
-    }
-
-    th.vbottom, td.vbottom {
-        vertical-align: bottom;
-    }
-}
-
diff --git a/#pma/robots.txt b/#pma/robots.txt
deleted file mode 100644
index 1f53798b..00000000
--- a/#pma/robots.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-User-agent: *
-Disallow: /
diff --git a/#pma/schema_export.php b/#pma/schema_export.php
deleted file mode 100644
index 9aebd9a2..00000000
--- a/#pma/schema_export.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Schema export handler
- *
- * @package PhpMyAdmin
- */
-use PMA\libraries\plugins\SchemaPlugin;
-
-/**
- * Gets some core libraries
- */
-require_once 'libraries/common.inc.php';
-
-/**
- * get all variables needed for exporting relational schema
- * in $cfgRelation
- */
-$cfgRelation = PMA_getRelationsParam();
-
-require_once 'libraries/pmd_common.php';
-require_once 'libraries/plugin_interface.lib.php';
-
-if (! isset($_REQUEST['export_type'])) {
-    PMA\libraries\Util::checkParameters(array('export_type'));
-}
-
-/**
- * Include the appropriate Schema Class depending on $export_type
- * default is PDF
- */
-PMA_processExportSchema($_REQUEST['export_type']);
-
-/**
- * get all the export options and verify
- * call and include the appropriate Schema Class depending on $export_type
- *
- * @param string $export_type format of the export
- *
- * @return void
- */
-function PMA_processExportSchema($export_type)
-{
-    /**
-     * default is PDF, otherwise validate it's only letters a-z
-     */
-    if (! isset($export_type) || ! preg_match('/^[a-zA-Z]+$/', $export_type)) {
-        $export_type = 'pdf';
-    }
-
-    // sanitize this parameter which will be used below in a file inclusion
-    $export_type = PMA_securePath($export_type);
-
-    // get the specific plugin
-    /* @var $export_plugin SchemaPlugin */
-    $export_plugin = PMA_getPlugin(
-        "schema",
-        $export_type,
-        'libraries/plugins/schema/'
-    );
-
-    // Check schema export type
-    if (! isset($export_plugin)) {
-        PMA_fatalError(__('Bad type!'));
-    }
-
-    $GLOBALS['dbi']->selectDb($GLOBALS['db']);
-    $export_plugin->exportSchema($GLOBALS['db']);
-}
diff --git a/#pma/server_binlog.php b/#pma/server_binlog.php
deleted file mode 100644
index 811e4bc8..00000000
--- a/#pma/server_binlog.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-
-/**
- * Handles server binary log page.
- *
- * @package PhpMyAdmin
- */
-
-namespace PMA;
-
-use PMA\libraries\controllers\server\ServerCollationsController;
-use PMA\libraries\Response;
-
-require_once 'libraries/common.inc.php';
-
-$container = libraries\di\Container::getDefaultContainer();
-$container->factory(
-    'PMA\libraries\controllers\server\ServerBinlogController'
-);
-$container->alias(
-    'ServerBinlogController',
-    'PMA\libraries\controllers\server\ServerBinlogController'
-);
-$container->set('PMA\libraries\Response', Response::getInstance());
-$container->alias('response', 'PMA\libraries\Response');
-
-/** @var ServerBinlogController $controller */
-$controller = $container->get(
-    'ServerBinlogController', array()
-);
-$controller->indexAction();
diff --git a/#pma/server_collations.php b/#pma/server_collations.php
deleted file mode 100644
index adbd9536..00000000
--- a/#pma/server_collations.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-
-/**
- * Handles server charsets and collations page.
- *
- * @package PhpMyAdmin
- */
-
-namespace PMA;
-
-use PMA\libraries\controllers\server\ServerCollationsController;
-use PMA\libraries\Response;
-
-require_once 'libraries/common.inc.php';
-
-$container = libraries\di\Container::getDefaultContainer();
-$container->factory(
-    'PMA\libraries\controllers\server\ServerCollationsController'
-);
-$container->alias(
-    'ServerCollationsController',
-    'PMA\libraries\controllers\server\ServerCollationsController'
-);
-$container->set('PMA\libraries\Response', Response::getInstance());
-$container->alias('response', 'PMA\libraries\Response');
-
-/** @var ServerCollationsController $controller */
-$controller = $container->get(
-    'ServerCollationsController', array()
-);
-$controller->indexAction();
diff --git a/#pma/server_databases.php b/#pma/server_databases.php
deleted file mode 100644
index 9dcd589e..00000000
--- a/#pma/server_databases.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-
-/**
- * Handles server databases page.
- *
- * @package PhpMyAdmin
- */
-
-namespace PMA;
-
-use PMA\libraries\controllers\server\ServerDatabasesController;
-use PMA\libraries\Response;
-
-require_once 'libraries/common.inc.php';
-
-$container = libraries\di\Container::getDefaultContainer();
-$container->factory(
-    'PMA\libraries\controllers\server\ServerDatabasesController'
-);
-$container->alias(
-    'ServerDatabasesController',
-    'PMA\libraries\controllers\server\ServerDatabasesController'
-);
-$container->set('PMA\libraries\Response', Response::getInstance());
-$container->alias('response', 'PMA\libraries\Response');
-
-/** @var ServerDatabasesController $controller */
-$controller = $container->get(
-    'ServerDatabasesController', array()
-);
-$controller->indexAction();
diff --git a/#pma/server_engines.php b/#pma/server_engines.php
deleted file mode 100644
index f935279a..00000000
--- a/#pma/server_engines.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-
-/**
- * Handles server engines page.
- *
- * @package PhpMyAdmin
- */
-
-namespace PMA;
-
-use PMA\libraries\controllers\server\ServerEnginesController;
-use PMA\libraries\Response;
-
-require_once 'libraries/common.inc.php';
-
-$container = libraries\di\Container::getDefaultContainer();
-$container->factory(
-    'PMA\libraries\controllers\server\ServerEnginesController'
-);
-$container->alias(
-    'ServerEnginesController',
-    'PMA\libraries\controllers\server\ServerEnginesController'
-);
-$container->set('PMA\libraries\Response', Response::getInstance());
-$container->alias('response', 'PMA\libraries\Response');
-
-/** @var ServerEnginesController $controller */
-$controller = $container->get(
-    'ServerEnginesController', array()
-);
-$controller->indexAction();
diff --git a/#pma/server_export.php b/#pma/server_export.php
deleted file mode 100644
index 13337b49..00000000
--- a/#pma/server_export.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * object the server export page
- *
- * @package PhpMyAdmin
- */
-use PMA\libraries\config\PageSettings;
-use PMA\libraries\Response;
-
-/**
- * Does the common work
- */
-require_once 'libraries/common.inc.php';
-require_once 'libraries/config/user_preferences.forms.php';
-require_once 'libraries/config/page_settings.forms.php';
-require_once 'libraries/server_common.inc.php';
-require_once 'libraries/display_export.lib.php';
-
-PageSettings::showGroup('Export');
-
-$response = Response::getInstance();
-$header   = $response->getHeader();
-$scripts  = $header->getScripts();
-$scripts->addFile('export.js');
-
-$export_page_title = __('View dump (schema) of databases') . "\n";
-
-$select_item = isset($tmp_select)? $tmp_select : '';
-$multi_values  = PMA_getHtmlForExportSelectOptions($select_item);
-
-require_once 'libraries/display_export.lib.php';
-
-if (! isset($sql_query)) {
-    $sql_query = '';
-}
-if (! isset($num_tables)) {
-    $num_tables = 0;
-}
-if (! isset($unlim_num_rows)) {
-    $unlim_num_rows = 0;
-}
-$response = Response::getInstance();
-$response->addHTML(
-    PMA_getExportDisplay(
-        'server', $db, $table, $sql_query, $num_tables,
-        $unlim_num_rows, $multi_values
-    )
-);
diff --git a/#pma/server_import.php b/#pma/server_import.php
deleted file mode 100644
index a9e5f2ec..00000000
--- a/#pma/server_import.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Server import page
- *
- * @package PhpMyAdmin
- */
-use PMA\libraries\config\PageSettings;
-use PMA\libraries\Response;
-
-/**
- *
- */
-require_once 'libraries/common.inc.php';
-require_once 'libraries/config/user_preferences.forms.php';
-require_once 'libraries/config/page_settings.forms.php';
-
-PageSettings::showGroup('Import');
-
-$response = PMA\libraries\Response::getInstance();
-$header   = $response->getHeader();
-$scripts  = $header->getScripts();
-$scripts->addFile('import.js');
-
-/**
- * Does the common work
- */
-require 'libraries/server_common.inc.php';
-
-require 'libraries/display_import.lib.php';
-$response = Response::getInstance();
-$response->addHTML(
-    PMA_getImportDisplay(
-        'server', $db, $table, $max_upload_size
-    )
-);
diff --git a/#pma/server_plugins.php b/#pma/server_plugins.php
deleted file mode 100644
index 4392eed8..00000000
--- a/#pma/server_plugins.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-
-/**
- * Handles server plugins page.
- *
- * @package PhpMyAdmin
- */
-
-namespace PMA;
-
-use PMA\libraries\controllers\server\ServerPluginsController;
-use PMA\libraries\Response;
-
-require_once 'libraries/common.inc.php';
-
-$container = \PMA\libraries\di\Container::getDefaultContainer();
-$container->factory(
-    'PMA\libraries\controllers\server\ServerPluginsController'
-);
-$container->alias(
-    'ServerPluginsController',
-    'PMA\libraries\controllers\server\ServerPluginsController'
-);
-$container->set('PMA\libraries\Response', Response::getInstance());
-$container->alias('response', 'PMA\libraries\Response');
-
-/** @var ServerPluginsController $controller */
-$controller = $container->get(
-    'ServerPluginsController', array()
-);
-$controller->indexAction();
diff --git a/#pma/server_privileges.php b/#pma/server_privileges.php
deleted file mode 100644
index c7b1c4f7..00000000
--- a/#pma/server_privileges.php
+++ /dev/null
@@ -1,456 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Server privileges and users manipulations
- *
- * @package PhpMyAdmin
- */
-
-/**
- * include common file
- */
-require_once 'libraries/common.inc.php';
-
-/**
- * functions implementation for this script
- */
-require_once 'libraries/display_change_password.lib.php';
-require_once 'libraries/server_privileges.lib.php';
-require_once 'libraries/check_user_privileges.lib.php';
-
-$cfgRelation = PMA_getRelationsParam();
-
-/**
- * Does the common work
- */
-$response = PMA\libraries\Response::getInstance();
-$header   = $response->getHeader();
-$scripts  = $header->getScripts();
-$scripts->addFile('server_privileges.js');
-
-if ((isset($_REQUEST['viewing_mode'])
-    && $_REQUEST['viewing_mode'] == 'server')
-    && $GLOBALS['cfgRelation']['menuswork']
-) {
-    include_once 'libraries/server_users.lib.php';
-    $response->addHTML('<div>');
-    $response->addHTML(PMA_getHtmlForSubMenusOnUsersPage('server_privileges.php'));
-}
-
-/**
- * Sets globals from $_POST patterns, for privileges and max_* vars
- */
-
-$post_patterns = array(
-    '/_priv$/i',
-    '/^max_/i'
-);
-
-PMA_setPostAsGlobal($post_patterns);
-
-require 'libraries/server_common.inc.php';
-
-/**
- * Messages are built using the message name
- */
-$strPrivDescAllPrivileges = __('Includes all privileges except GRANT.');
-$strPrivDescAlter = __('Allows altering the structure of existing tables.');
-$strPrivDescAlterRoutine = __('Allows altering and dropping stored routines.');
-$strPrivDescCreateDb = __('Allows creating new databases and tables.');
-$strPrivDescCreateRoutine = __('Allows creating stored routines.');
-$strPrivDescCreateTbl = __('Allows creating new tables.');
-$strPrivDescCreateTmpTable = __('Allows creating temporary tables.');
-$strPrivDescCreateUser = __('Allows creating, dropping and renaming user accounts.');
-$strPrivDescCreateView = __('Allows creating new views.');
-$strPrivDescDelete = __('Allows deleting data.');
-$strPrivDescDropDb = __('Allows dropping databases and tables.');
-$strPrivDescDropTbl = __('Allows dropping tables.');
-$strPrivDescEvent = __('Allows to set up events for the event scheduler.');
-$strPrivDescExecute = __('Allows executing stored routines.');
-$strPrivDescFile = __('Allows importing data from and exporting data into files.');
-$strPrivDescGrantTbl = __(
-    'Allows user to give to other users or remove from other users the privileges '
-    . 'that user possess yourself.'
-);
-$strPrivDescIndex = __('Allows creating and dropping indexes.');
-$strPrivDescInsert = __('Allows inserting and replacing data.');
-$strPrivDescLockTables = __('Allows locking tables for the current thread.');
-$strPrivDescMaxConnections = __(
-    'Limits the number of new connections the user may open per hour.'
-);
-$strPrivDescMaxQuestions = __(
-    'Limits the number of queries the user may send to the server per hour.'
-);
-$strPrivDescMaxUpdates = __(
-    'Limits the number of commands that change any table or database '
-    . 'the user may execute per hour.'
-);
-$strPrivDescMaxUserConnections = __(
-    'Limits the number of simultaneous connections the user may have.'
-);
-$strPrivDescProcess = __('Allows viewing processes of all users.');
-$strPrivDescReferences = __('Has no effect in this MySQL version.');
-$strPrivDescReload = __(
-    'Allows reloading server settings and flushing the server\'s caches.'
-);
-$strPrivDescReplClient = __(
-    'Allows the user to ask where the slaves / masters are.'
-);
-$strPrivDescReplSlave = __('Needed for the replication slaves.');
-$strPrivDescSelect = __('Allows reading data.');
-$strPrivDescShowDb = __('Gives access to the complete list of databases.');
-$strPrivDescShowView = __('Allows performing SHOW CREATE VIEW queries.');
-$strPrivDescShutdown = __('Allows shutting down the server.');
-$strPrivDescSuper = __(
-    'Allows connecting, even if maximum number of connections is reached; '
-    . 'required for most administrative operations like setting global variables '
-    . 'or killing threads of other users.'
-);
-$strPrivDescTrigger = __('Allows creating and dropping triggers.');
-$strPrivDescUpdate = __('Allows changing data.');
-$strPrivDescUsage = __('No privileges.');
-
-$_add_user_error = false;
-/**
- * Get DB information: username, hostname, dbname,
- * tablename, db_and_table, dbname_is_wildcard
- */
-list(
-    $username, $hostname, $dbname, $tablename, $routinename,
-    $db_and_table, $dbname_is_wildcard
-) = PMA_getDataForDBInfo();
-
-/**
- * Checks if the user is allowed to do what he tries to...
- */
-if (!$GLOBALS['is_superuser'] && !$GLOBALS['is_grantuser']
-    && !$GLOBALS['is_createuser']
-) {
-    $response->addHTML(PMA_getHtmlForSubPageHeader('privileges', '', false));
-    $response->addHTML(
-        PMA\libraries\Message::error(__('No Privileges'))
-            ->getDisplay()
-    );
-    exit;
-}
-
-/**
- * Checks if the user is using "Change Login Information / Copy User" dialog
- * only to update the password
- */
-if (isset($_REQUEST['change_copy']) && $username == $_REQUEST['old_username']
-    && $hostname == $_REQUEST['old_hostname']
-) {
-    $response->addHTML(
-        PMA\libraries\Message::error(
-            __(
-                "Username and hostname didn't change. "
-                . "If you only want to change the password, "
-                . "'Change password' tab should be used."
-            )
-        )->getDisplay()
-    );
-    $response->setRequestStatus(false);
-    exit;
-}
-
-/**
- * Changes / copies a user, part I
- */
-list($queries, $password) = PMA_getDataForChangeOrCopyUser();
-
-/**
- * Adds a user
- *   (Changes / copies a user, part II)
- */
-list($ret_message, $ret_queries, $queries_for_display, $sql_query, $_add_user_error)
-    = PMA_addUser(
-        isset($dbname)? $dbname : null,
-        isset($username)? $username : null,
-        isset($hostname)? $hostname : null,
-        isset($password)? $password : null,
-        $cfgRelation['menuswork']
-    );
-//update the old variables
-if (isset($ret_queries)) {
-    $queries = $ret_queries;
-    unset($ret_queries);
-}
-if (isset($ret_message)) {
-    $message = $ret_message;
-    unset($ret_message);
-}
-
-/**
- * Changes / copies a user, part III
- */
-if (isset($_REQUEST['change_copy'])) {
-    $queries = PMA_getDbSpecificPrivsQueriesForChangeOrCopyUser(
-        $queries, $username, $hostname
-    );
-}
-
-$itemType = '';
-if (! empty($routinename)) {
-    $itemType = PMA_getRoutineType($dbname, $routinename);
-}
-
-/**
- * Updates privileges
- */
-if (! empty($_POST['update_privs'])) {
-    if (is_array($dbname)) {
-        foreach ($dbname as $key => $db_name) {
-            list($sql_query[$key], $message) = PMA_updatePrivileges(
-                (isset($username) ? $username : ''),
-                (isset($hostname) ? $hostname : ''),
-                (isset($tablename)
-                    ? $tablename
-                    : (isset($routinename) ? $routinename : '')),
-                (isset($db_name) ? $db_name : ''),
-                $itemType
-            );
-        }
-
-        $sql_query = implode("\n", $sql_query);
-    } else {
-        list($sql_query, $message) = PMA_updatePrivileges(
-            (isset($username) ? $username : ''),
-            (isset($hostname) ? $hostname : ''),
-            (isset($tablename)
-                ? $tablename
-                : (isset($routinename) ? $routinename : '')),
-            (isset($dbname) ? $dbname : ''),
-            $itemType
-        );
-    }
-}
-
-/**
- * Assign users to user groups
- */
-if (! empty($_REQUEST['changeUserGroup']) && $cfgRelation['menuswork']
-    && $GLOBALS['is_superuser'] && $GLOBALS['is_createuser']
-) {
-    PMA_setUserGroup($username, $_REQUEST['userGroup']);
-    $message = PMA\libraries\Message::success();
-}
-
-/**
- * Revokes Privileges
- */
-if (isset($_REQUEST['revokeall'])) {
-    list ($message, $sql_query) = PMA_getMessageAndSqlQueryForPrivilegesRevoke(
-        (isset($dbname) ? $dbname : ''),
-        (isset($tablename)
-            ? $tablename
-            : (isset($routinename) ? $routinename : '')),
-        $username,
-        $hostname,
-        $itemType
-    );
-}
-
-/**
- * Updates the password
- */
-if (isset($_REQUEST['change_pw'])) {
-    $message = PMA_updatePassword(
-        $err_url, $username, $hostname
-    );
-}
-
-/**
- * Deletes users
- *   (Changes / copies a user, part IV)
- */
-if (isset($_REQUEST['delete'])
-    || (isset($_REQUEST['change_copy']) && $_REQUEST['mode'] < 4)
-) {
-    include_once 'libraries/relation_cleanup.lib.php';
-    $queries = PMA_getDataForDeleteUsers($queries);
-    if (empty($_REQUEST['change_copy'])) {
-        list($sql_query, $message) = PMA_deleteUser($queries);
-    }
-}
-
-/**
- * Changes / copies a user, part V
- */
-if (isset($_REQUEST['change_copy'])) {
-    $queries = PMA_getDataForQueries($queries, $queries_for_display);
-    $message = PMA\libraries\Message::success();
-    $sql_query = join("\n", $queries);
-}
-
-/**
- * Reloads the privilege tables into memory
- */
-$message_ret = PMA_updateMessageForReload();
-if (isset($message_ret)) {
-    $message = $message_ret;
-    unset($message_ret);
-}
-
-/**
- * If we are in an Ajax request for Create User/Edit User/Revoke User/
- * Flush Privileges, show $message and exit.
- */
-if ($GLOBALS['is_ajax_request']
-    && empty($_REQUEST['ajax_page_request'])
-    && ! isset($_REQUEST['export'])
-    && (! isset($_REQUEST['submit_mult']) || $_REQUEST['submit_mult'] != 'export')
-    && ((! isset($_REQUEST['initial']) || $_REQUEST['initial'] === null
-    || $_REQUEST['initial'] === '')
-    || (isset($_REQUEST['delete']) && $_REQUEST['delete'] === __('Go')))
-    && ! isset($_REQUEST['showall'])
-    && ! isset($_REQUEST['edit_user_group_dialog'])
-    && ! isset($_REQUEST['db_specific'])
-) {
-    $extra_data = PMA_getExtraDataForAjaxBehavior(
-        (isset($password) ? $password : ''),
-        (isset($sql_query) ? $sql_query : ''),
-        (isset($hostname) ? $hostname : ''),
-        (isset($username) ? $username : '')
-    );
-
-    if (! empty($message) && $message instanceof PMA\libraries\Message) {
-        $response = PMA\libraries\Response::getInstance();
-        $response->setRequestStatus($message->isSuccess());
-        $response->addJSON('message', $message);
-        $response->addJSON($extra_data);
-        exit;
-    }
-}
-
-/**
- * Displays the links
- */
-if (isset($_REQUEST['viewing_mode']) && $_REQUEST['viewing_mode'] == 'db') {
-    $GLOBALS['db'] = $_REQUEST['db'] = $_REQUEST['checkprivsdb'];
-
-    $url_query .= '&amp;goto=db_operations.php';
-
-    // Gets the database structure
-    $sub_part = '_structure';
-    ob_start();
-
-    list(
-        $tables,
-        $num_tables,
-        $total_num_tables,
-        $sub_part,
-        $is_show_stats,
-        $db_is_system_schema,
-        $tooltip_truename,
-        $tooltip_aliasname,
-        $pos
-    ) = PMA\libraries\Util::getDbInfo($db, isset($sub_part) ? $sub_part : '');
-
-    $content = ob_get_contents();
-    ob_end_clean();
-    $response->addHTML($content . "\n");
-} else {
-    if (! empty($GLOBALS['message'])) {
-        $response->addHTML(PMA\libraries\Util::getMessage($GLOBALS['message']));
-        unset($GLOBALS['message']);
-    }
-}
-
-/**
- * Displays the page
- */
-$response->addHTML(
-    PMA_getHtmlForUserGroupDialog(
-        isset($username)? $username : null,
-        $cfgRelation['menuswork']
-    )
-);
-
-// export user definition
-if (isset($_REQUEST['export'])
-    || (isset($_REQUEST['submit_mult']) && $_REQUEST['submit_mult'] == 'export')
-) {
-    list($title, $export) = PMA_getListForExportUserDefinition(
-        isset($username) ? $username : null,
-        isset($hostname) ? $hostname : null
-    );
-
-    unset($username, $hostname, $grants, $one_grant);
-
-    $response = PMA\libraries\Response::getInstance();
-    if ($GLOBALS['is_ajax_request']) {
-        $response->addJSON('message', $export);
-        $response->addJSON('title', $title);
-        exit;
-    } else {
-        $response->addHTML("<h2>$title</h2>$export");
-    }
-}
-
-if (isset($_REQUEST['adduser'])) {
-    // Add user
-    $response->addHTML(
-        PMA_getHtmlForAddUser((isset($dbname) ? $dbname : ''))
-    );
-} elseif (isset($_REQUEST['checkprivsdb'])) {
-    if (isset($_REQUEST['checkprivstable'])) {
-        // check the privileges for a particular table.
-        $response->addHTML(
-            PMA_getHtmlForSpecificTablePrivileges(
-                $_REQUEST['checkprivsdb'], $_REQUEST['checkprivstable']
-            )
-        );
-    } else {
-        // check the privileges for a particular database.
-        $response->addHTML(
-            PMA_getHtmlForSpecificDbPrivileges($_REQUEST['checkprivsdb'])
-        );
-    }
-} else {
-    if (isset($dbname) && ! is_array($dbname)) {
-        $url_dbname = urlencode(
-            str_replace(
-                array('\_', '\%'),
-                array('_', '%'),
-                $_REQUEST['dbname']
-            )
-        );
-    }
-
-    if (! isset($username)) {
-        // No username is given --> display the overview
-        $response->addHTML(
-            PMA_getHtmlForUserOverview($pmaThemeImage, $text_dir)
-        );
-    } else if (!empty($routinename)) {
-        $response->addHTML(
-            PMA_getHtmlForRoutineSpecificPrivilges(
-                $username, $hostname, $dbname, $routinename,
-                (isset($url_dbname) ? $url_dbname : '')
-            )
-        );
-    } else {
-        // A user was selected -> display the user's properties
-        // In an Ajax request, prevent cached values from showing
-        if ($GLOBALS['is_ajax_request'] == true) {
-            header('Cache-Control: no-cache');
-        }
-
-        $response->addHTML(
-            PMA_getHtmlForUserProperties(
-                (isset($dbname_is_wildcard) ? $dbname_is_wildcard : ''),
-                (isset($url_dbname) ? $url_dbname : ''),
-                $username, $hostname,
-                (isset($dbname) ? $dbname : ''),
-                (isset($tablename) ? $tablename : '')
-            )
-        );
-    }
-}
-
-if ((isset($_REQUEST['viewing_mode']) && $_REQUEST['viewing_mode'] == 'server')
-    && $GLOBALS['cfgRelation']['menuswork']
-) {
-    $response->addHTML('</div>');
-}
diff --git a/#pma/server_replication.php b/#pma/server_replication.php
deleted file mode 100644
index e5a5f080..00000000
--- a/#pma/server_replication.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Server replications
- *
- * @package PhpMyAdmin
- */
-
-/**
- * include files
- */
-require_once 'libraries/common.inc.php';
-require_once 'libraries/server_common.inc.php';
-
-require_once 'libraries/replication.inc.php';
-require_once 'libraries/replication_gui.lib.php';
-
-/**
- * Does the common work
- */
-$response = PMA\libraries\Response::getInstance();
-$header   = $response->getHeader();
-$scripts  = $header->getScripts();
-$scripts->addFile('server_privileges.js');
-$scripts->addFile('replication.js');
-
-/**
- * Checks if the user is allowed to do what he tries to...
- */
-if (! $is_superuser) {
-    $html  = PMA_getHtmlForSubPageHeader('replication');
-    $html .= PMA\libraries\Message::error(__('No Privileges'))->getDisplay();
-    $response->addHTML($html);
-    exit;
-}
-
-// change $GLOBALS['url_params'] with $_REQUEST['url_params']
-// only if it is an array
-if (isset($_REQUEST['url_params']) && is_array($_REQUEST['url_params'])) {
-    $GLOBALS['url_params'] = $_REQUEST['url_params'];
-}
-
-/**
- * Handling control requests
- */
-PMA_handleControlRequest();
-
-/**
- * start output
- */
-$response->addHTML('<div id="replication">');
-$response->addHTML(PMA_getHtmlForSubPageHeader('replication'));
-
-// Display error messages
-$response->addHTML(PMA_getHtmlForErrorMessage());
-
-if ($GLOBALS['replication_info']['master']['status']) {
-    $response->addHTML(PMA_getHtmlForMasterReplication());
-} elseif (! isset($_REQUEST['mr_configure'])
-    && ! isset($_REQUEST['repl_clear_scr'])
-) {
-    $response->addHTML(PMA_getHtmlForNotServerReplication());
-}
-
-if (isset($_REQUEST['mr_configure'])) {
-    // Render the 'Master configuration' section
-    $response->addHTML(PMA_getHtmlForMasterConfiguration());
-    exit;
-}
-
-$response->addHTML('</div>');
-
-if (! isset($_REQUEST['repl_clear_scr'])) {
-    // Render the 'Slave configuration' section
-    $response->addHTML(
-        PMA_getHtmlForSlaveConfiguration(
-            $GLOBALS['replication_info']['slave']['status'],
-            $server_slave_replication
-        )
-    );
-}
-if (isset($_REQUEST['sl_configure'])) {
-    $response->addHTML(PMA_getHtmlForReplicationChangeMaster("slave_changemaster"));
-}
diff --git a/#pma/server_sql.php b/#pma/server_sql.php
deleted file mode 100644
index 8072dd4a..00000000
--- a/#pma/server_sql.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Server SQL executor
- *
- * @package PhpMyAdmin
- */
-use PMA\libraries\config\PageSettings;
-use PMA\libraries\Response;
-
-/**
- *
- */
-require_once 'libraries/common.inc.php';
-require_once 'libraries/config/user_preferences.forms.php';
-require_once 'libraries/config/page_settings.forms.php';
-
-PageSettings::showGroup('Sql_queries');
-
-/**
- * Does the common work
- */
-$response = Response::getInstance();
-$header   = $response->getHeader();
-$scripts  = $header->getScripts();
-$scripts->addFile('makegrid.js');
-$scripts->addFile('jquery/jquery.uitablefilter.js');
-$scripts->addFile('sql.js');
-
-require_once 'libraries/server_common.inc.php';
-require_once 'libraries/sql_query_form.lib.php';
-
-/**
- * Query box, bookmark, insert data from textfile
- */
-$response->addHTML(PMA_getHtmlForSqlQueryForm());
diff --git a/#pma/server_status.php b/#pma/server_status.php
deleted file mode 100644
index d04a5779..00000000
--- a/#pma/server_status.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * object the server status page: processes, connections and traffic
- *
- * @package PhpMyAdmin
- */
-
-use PMA\libraries\Message;
-use PMA\libraries\ServerStatusData;
-
-require_once 'libraries/common.inc.php';
-require_once 'libraries/server_common.inc.php';
-require_once 'libraries/server_status.lib.php';
-
-/**
- * Replication library
- */
-require_once 'libraries/replication.inc.php';
-require_once 'libraries/replication_gui.lib.php';
-
-/**
- * start output
- */
-$response = PMA\libraries\Response::getInstance();
-$response->addHTML('<div>');
-
-$serverStatusData = new ServerStatusData();
-$response->addHTML($serverStatusData->getMenuHtml());
-if ($serverStatusData->dataLoaded) {
-    $response->addHTML(PMA_getHtmlForServerStatus($serverStatusData));
-} else {
-    $response->addHTML(
-        Message::error(
-            __('Not enough privilege to view server status.')
-        )->getDisplay()
-    );
-}
-$response->addHTML('</div>');
-exit;
diff --git a/#pma/server_status_advisor.php b/#pma/server_status_advisor.php
deleted file mode 100644
index ca7a7511..00000000
--- a/#pma/server_status_advisor.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * displays the advisor feature
- *
- * @package PhpMyAdmin
- */
-
-use PMA\libraries\Message;
-use PMA\libraries\ServerStatusData;
-
-require_once 'libraries/common.inc.php';
-require_once 'libraries/server_status_advisor.lib.php';
-require_once 'libraries/replication.inc.php';
-require_once 'libraries/replication_gui.lib.php';
-
-$serverStatusData = new ServerStatusData();
-
-$response = PMA\libraries\Response::getInstance();
-$scripts = $response->getHeader()->getScripts();
-$scripts->addFile('server_status_advisor.js');
-
-/**
- * Output
- */
-$response->addHTML('<div>');
-$response->addHTML($serverStatusData->getMenuHtml());
-if ($serverStatusData->dataLoaded) {
-    $response->addHTML(PMA_getHtmlForAdvisor());
-} else {
-    $response->addHTML(
-        Message::error(
-            __('Not enough privilege to view the advisor.')
-        )->getDisplay()
-    );
-}
-$response->addHTML('</div>');
-
-exit;
diff --git a/#pma/server_status_monitor.php b/#pma/server_status_monitor.php
deleted file mode 100644
index dc88e8f3..00000000
--- a/#pma/server_status_monitor.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Server status monitor feature
- *
- * @package PhpMyAdmin
- */
-
-use PMA\libraries\ServerStatusData;
-
-require_once 'libraries/common.inc.php';
-require_once 'libraries/server_common.inc.php';
-require_once 'libraries/server_status_monitor.lib.php';
-require_once 'libraries/replication.inc.php';
-require_once 'libraries/replication_gui.lib.php';
-
-/**
- * Ajax request
- */
-if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
-    // Send with correct charset
-    header('Content-Type: text/html; charset=UTF-8');
-
-    // real-time charting data
-    if (isset($_REQUEST['chart_data'])) {
-        switch($_REQUEST['type']) {
-        case 'chartgrid': // Data for the monitor
-            $ret = PMA_getJsonForChartingData();
-            PMA\libraries\Response::getInstance()->addJSON('message', $ret);
-            exit;
-        }
-    }
-
-    if (isset($_REQUEST['log_data'])) {
-
-        $start = intval($_REQUEST['time_start']);
-        $end = intval($_REQUEST['time_end']);
-
-        if ($_REQUEST['type'] == 'slow') {
-            $return = PMA_getJsonForLogDataTypeSlow($start, $end);
-            PMA\libraries\Response::getInstance()->addJSON('message', $return);
-            exit;
-        }
-
-        if ($_REQUEST['type'] == 'general') {
-            $return = PMA_getJsonForLogDataTypeGeneral($start, $end);
-            PMA\libraries\Response::getInstance()->addJSON('message', $return);
-            exit;
-        }
-    }
-
-    if (isset($_REQUEST['logging_vars'])) {
-        $loggingVars = PMA_getJsonForLoggingVars();
-        PMA\libraries\Response::getInstance()->addJSON('message', $loggingVars);
-        exit;
-    }
-
-    if (isset($_REQUEST['query_analyzer'])) {
-        $return = PMA_getJsonForQueryAnalyzer();
-        PMA\libraries\Response::getInstance()->addJSON('message', $return);
-        exit;
-    }
-}
-
-/**
- * JS Includes
- */
-$header   = $response->getHeader();
-$scripts  = $header->getScripts();
-$scripts->addFile('jquery/jquery.tablesorter.js');
-$scripts->addFile('jquery/jquery.sortableTable.js');
-$scripts->addFile('jquery/jquery-ui-timepicker-addon.js');
-// for charting
-$scripts->addFile('jqplot/jquery.jqplot.js');
-$scripts->addFile('jqplot/plugins/jqplot.pieRenderer.js');
-$scripts->addFile('jqplot/plugins/jqplot.canvasTextRenderer.js');
-$scripts->addFile('jqplot/plugins/jqplot.canvasAxisLabelRenderer.js');
-$scripts->addFile('jqplot/plugins/jqplot.dateAxisRenderer.js');
-$scripts->addFile('jqplot/plugins/jqplot.highlighter.js');
-$scripts->addFile('jqplot/plugins/jqplot.cursor.js');
-$scripts->addFile('jqplot/plugins/jqplot.byteFormatter.js');
-
-$scripts->addFile('server_status_monitor.js');
-$scripts->addFile('server_status_sorter.js');
-
-
-/**
- * start output
- */
-$ServerStatusData = new ServerStatusData();
-
-/**
- * Output
- */
-$response->addHTML('<div>');
-$response->addHTML($ServerStatusData->getMenuHtml());
-$response->addHTML(PMA_getHtmlForMonitor($ServerStatusData));
-$response->addHTML(PMA_getHtmlForClientSideDataAndLinks($ServerStatusData));
-$response->addHTML('</div>');
-exit;
diff --git a/#pma/server_status_processes.php b/#pma/server_status_processes.php
deleted file mode 100644
index 2533ac31..00000000
--- a/#pma/server_status_processes.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * displays the server status > processes list
- *
- * @package PhpMyAdmin
- */
-
-use PMA\libraries\ServerStatusData;
-
-require_once 'libraries/common.inc.php';
-require_once 'libraries/server_common.inc.php';
-require_once 'libraries/server_status_processes.lib.php';
-
-/**
- * Replication library
- */
-require_once 'libraries/replication.inc.php';
-require_once 'libraries/replication_gui.lib.php';
-
-$ServerStatusData = new ServerStatusData();
-$response = PMA\libraries\Response::getInstance();
-
-/**
- * Kills a selected process
- * on ajax request
- */
-if ($response->isAjax() && !empty($_REQUEST['kill'])) {
-    $kill = intval($_REQUEST['kill']);
-    $query = $GLOBALS['dbi']->getKillQuery($kill);
-    if ($GLOBALS['dbi']->tryQuery($query)) {
-        $message = PMA\libraries\Message::success(
-            __('Thread %s was successfully killed.')
-        );
-        $response->setRequestStatus(true);
-    } else {
-        $message = PMA\libraries\Message::error(
-            __(
-                'phpMyAdmin was unable to kill thread %s.'
-                . ' It probably has already been closed.'
-            )
-        );
-        $response->setRequestStatus(false);
-    }
-    $message->addParam($kill);
-    $response->addJSON('message', $message);
-} elseif ($response->isAjax() && !empty($_REQUEST['refresh'])) {
-    // Only sends the process list table
-    $response->addHTML(PMA_getHtmlForServerProcessList());
-} else {
-    // Load the full page
-    $header   = $response->getHeader();
-    $scripts  = $header->getScripts();
-    $scripts->addFile('server_status_processes.js');
-    $response->addHTML('<div>');
-    $response->addHTML($ServerStatusData->getMenuHtml());
-    $response->addHTML(PMA_getHtmlForProcessListFilter());
-    $response->addHTML(PMA_getHtmlForServerProcesslist());
-    $response->addHTML(PMA_getHtmlForProcessListAutoRefresh());
-    $response->addHTML('</div>');
-}
-exit;
diff --git a/#pma/server_status_queries.php b/#pma/server_status_queries.php
deleted file mode 100644
index be539fb2..00000000
--- a/#pma/server_status_queries.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-
-/**
- * Displays query statistics for the server
- *
- * @package PhpMyAdmin
- */
-
-use PMA\libraries\Message;
-use PMA\libraries\ServerStatusData;
-
-require_once 'libraries/common.inc.php';
-require_once 'libraries/server_common.inc.php';
-require_once 'libraries/server_status_queries.lib.php';
-require_once 'libraries/replication.inc.php';
-require_once 'libraries/replication_gui.lib.php';
-
-$serverStatusData = new ServerStatusData();
-
-$response = PMA\libraries\Response::getInstance();
-$header   = $response->getHeader();
-$scripts  = $header->getScripts();
-$scripts->addFile('server_status_queries.js');
-
-// for charting
-$scripts->addFile('chart.js');
-$scripts->addFile('jqplot/jquery.jqplot.js');
-$scripts->addFile('jqplot/plugins/jqplot.pieRenderer.js');
-$scripts->addFile('jqplot/plugins/jqplot.highlighter.js');
-$scripts->addFile('jquery/jquery.tablesorter.js');
-$scripts->addFile('server_status_sorter.js');
-
-// Add the html content to the response
-$response->addHTML('<div>');
-$response->addHTML($serverStatusData->getMenuHtml());
-if ($serverStatusData->dataLoaded) {
-    $response->addHTML(PMA_getHtmlForQueryStatistics($serverStatusData));
-} else {
-    $response->addHTML(
-        Message::error(
-            __('Not enough privilege to view query statistics.')
-        )->getDisplay()
-    );
-}
-$response->addHTML('</div>');
-exit;
diff --git a/#pma/server_status_variables.php b/#pma/server_status_variables.php
deleted file mode 100644
index 331c0857..00000000
--- a/#pma/server_status_variables.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Displays a list of server status variables
- *
- * @package PhpMyAdmin
- */
-
-use PMA\libraries\Message;
-use PMA\libraries\ServerStatusData;
-
-require_once 'libraries/common.inc.php';
-require_once 'libraries/server_common.inc.php';
-require_once 'libraries/server_status_variables.lib.php';
-require_once 'libraries/replication.inc.php';
-require_once 'libraries/replication_gui.lib.php';
-
-/**
- * flush status variables if requested
- */
-if (isset($_REQUEST['flush'])) {
-    $_flush_commands = array(
-        'STATUS',
-        'TABLES',
-        'QUERY CACHE',
-    );
-
-    if (in_array($_REQUEST['flush'], $_flush_commands)) {
-        $GLOBALS['dbi']->query('FLUSH ' . $_REQUEST['flush'] . ';');
-    }
-    unset($_flush_commands);
-}
-
-$serverStatusData = new ServerStatusData();
-
-$response = PMA\libraries\Response::getInstance();
-$header   = $response->getHeader();
-$scripts  = $header->getScripts();
-$scripts->addFile('server_status_variables.js');
-$scripts->addFile('jquery/jquery.tablesorter.js');
-$scripts->addFile('server_status_sorter.js');
-
-$response->addHTML('<div>');
-$response->addHTML($serverStatusData->getMenuHtml());
-if ($serverStatusData->dataLoaded) {
-    $response->addHTML(PMA_getHtmlForFilter($serverStatusData));
-    $response->addHTML(PMA_getHtmlForLinkSuggestions($serverStatusData));
-    $response->addHTML(PMA_getHtmlForVariablesList($serverStatusData));
-} else {
-    $response->addHTML(
-        Message::error(
-            __('Not enough privilege to view status variables.')
-        )->getDisplay()
-    );
-}
-$response->addHTML('</div>');
-
-exit;
diff --git a/#pma/server_user_groups.php b/#pma/server_user_groups.php
deleted file mode 100644
index 72f4ff2a..00000000
--- a/#pma/server_user_groups.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Displays the 'User groups' sub page under 'Users' page.
- *
- * @package PhpMyAdmin
- */
-
-require_once 'libraries/common.inc.php';
-require_once 'libraries/server_users.lib.php';
-require_once 'libraries/server_user_groups.lib.php';
-
-PMA_getRelationsParam();
-if (! $GLOBALS['cfgRelation']['menuswork']) {
-    exit;
-}
-
-$response = PMA\libraries\Response::getInstance();
-$header   = $response->getHeader();
-$scripts  = $header->getScripts();
-$scripts->addFile('server_user_groups.js');
-
-/**
- * Only allowed to superuser
- */
-if (! $GLOBALS['is_superuser']) {
-    $response->addHTML(
-        PMA\libraries\Message::error(__('No Privileges'))
-            ->getDisplay()
-    );
-    exit;
-}
-
-$response->addHTML('<div>');
-$response->addHTML(PMA_getHtmlForSubMenusOnUsersPage('server_user_groups.php'));
-
-/**
- * Delete user group
- */
-if (! empty($_REQUEST['deleteUserGroup'])) {
-    PMA_deleteUserGroup($_REQUEST['userGroup']);
-}
-
-/**
- * Add a new user group
- */
-if (! empty($_REQUEST['addUserGroupSubmit'])) {
-    PMA_editUserGroup($_REQUEST['userGroup'], true);
-}
-
-/**
- * Update a user group
- */
-if (! empty($_REQUEST['editUserGroupSubmit'])) {
-    PMA_editUserGroup($_REQUEST['userGroup']);
-}
-
-if (isset($_REQUEST['viewUsers'])) {
-    // Display users belonging to a user group
-    $response->addHTML(PMA_getHtmlForListingUsersofAGroup($_REQUEST['userGroup']));
-}
-
-if (isset($_REQUEST['addUserGroup'])) {
-    // Display add user group dialog
-    $response->addHTML(PMA_getHtmlToEditUserGroup());
-} elseif (isset($_REQUEST['editUserGroup'])) {
-    // Display edit user group dialog
-    $response->addHTML(PMA_getHtmlToEditUserGroup($_REQUEST['userGroup']));
-} else {
-    // Display user groups table
-    $response->addHTML(PMA_getHtmlForUserGroupsTable());
-}
-
-$response->addHTML('</div>');
diff --git a/#pma/server_variables.php b/#pma/server_variables.php
deleted file mode 100644
index a5c35ff6..00000000
--- a/#pma/server_variables.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-
-/**
- * Handles server variables page.
- *
- * @package PhpMyAdmin
- */
-
-namespace PMA;
-
-use PMA\libraries\controllers\server\ServerVariablesController;
-use PMA\libraries\Response;
-
-require_once 'libraries/common.inc.php';
-
-$container = libraries\di\Container::getDefaultContainer();
-$container->factory(
-    'PMA\libraries\controllers\server\ServerVariablesController'
-);
-$container->alias(
-    'ServerVariablesController',
-    'PMA\libraries\controllers\server\ServerVariablesController'
-);
-$container->set('PMA\libraries\Response', Response::getInstance());
-$container->alias('response', 'PMA\libraries\Response');
-
-/** @var ServerVariablesController $controller */
-$controller = $container->get(
-    'ServerVariablesController', array()
-);
-$controller->indexAction();
diff --git a/#pma/setup/ajax.js b/#pma/setup/ajax.js
deleted file mode 100644
index 98d985a4..00000000
--- a/#pma/setup/ajax.js
+++ /dev/null
@@ -1,11 +0,0 @@
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Dummy implementation of the ajax page loader
- */
-var AJAX = {
-    registerOnload: function (idx, func) {
-        $(document).ready(func);
-    },
-    registerTeardown: function (idx, func) {
-    }
-};
diff --git a/#pma/setup/config.php b/#pma/setup/config.php
deleted file mode 100644
index db9e7c90..00000000
--- a/#pma/setup/config.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Front controller for config view / download and clear
- *
- * @package PhpMyAdmin-Setup
- */
-use PMA\libraries\config\FormDisplay;
-use PMA\setup\lib\ConfigGenerator;
-
-/**
- * Core libraries.
- */
-require './lib/common.inc.php';
-
-require './libraries/config/setup.forms.php';
-
-/**
- * Loads configuration file path
- *
- * Do this in a function to avoid messing up with global $cfg
- *
- * @param string $config_file_path
- *
- * @return array
- */
-function loadConfig($config_file_path)
-{
-    $cfg = array();
-    if (file_exists($config_file_path)) {
-        include $config_file_path;
-    }
-    return $cfg;
-}
-
-$form_display = new FormDisplay($GLOBALS['ConfigFile']);
-$form_display->registerForm('_config.php', $forms['_config.php']);
-$form_display->save('_config.php');
-$config_file_path = $GLOBALS['ConfigFile']->getFilePath();
-
-if (isset($_POST['eol'])) {
-    $_SESSION['eol'] = ($_POST['eol'] == 'unix') ? 'unix' : 'win';
-}
-
-if (PMA_ifSetOr($_POST['submit_clear'], '')) {
-    //
-    // Clear current config and return to main page
-    //
-    $GLOBALS['ConfigFile']->resetConfigData();
-    // drop post data
-    header('HTTP/1.1 303 See Other');
-    header('Location: index.php' . PMA_URL_getCommon());
-    exit;
-} elseif (PMA_ifSetOr($_POST['submit_download'], '')) {
-    //
-    // Output generated config file
-    //
-    PMA_downloadHeader('config.inc.php', 'text/plain');
-    echo ConfigGenerator::getConfigFile($GLOBALS['ConfigFile']);
-    exit;
-} elseif (PMA_ifSetOr($_POST['submit_save'], '')) {
-    //
-    // Save generated config file on the server
-    //
-    $result = @file_put_contents(
-        $config_file_path,
-        ConfigGenerator::getConfigFile($GLOBALS['ConfigFile'])
-    );
-    if ($result === false) {
-        $state = 'config_not_saved';
-    } else {
-        $state = 'config_saved';
-    }
-    header('HTTP/1.1 303 See Other');
-    header('Location: index.php' . PMA_URL_getCommon() . '&action_done=' . $state);
-    exit;
-} elseif (PMA_ifSetOr($_POST['submit_load'], '')) {
-    //
-    // Load config file from the server
-    //
-    $GLOBALS['ConfigFile']->setConfigData(
-        loadConfig($config_file_path)
-    );
-    header('HTTP/1.1 303 See Other');
-    header('Location: index.php' . PMA_URL_getCommon());
-    exit;
-} elseif (PMA_ifSetOr($_POST['submit_delete'], '')) {
-    //
-    // Delete config file on the server
-    //
-    @unlink($config_file_path);
-    header('HTTP/1.1 303 See Other');
-    header('Location: index.php' . PMA_URL_getCommon());
-    exit;
-} else {
-    //
-    // Show generated config file in a <textarea>
-    //
-    header('HTTP/1.1 303 See Other');
-    header('Location: index.php' . PMA_URL_getCommon() . '&page=config');
-    exit;
-}
diff --git a/#pma/setup/frames/config.inc.php b/#pma/setup/frames/config.inc.php
deleted file mode 100644
index c04359a9..00000000
--- a/#pma/setup/frames/config.inc.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Config file view and save screen
- *
- * @package PhpMyAdmin-Setup
- */
-
-use PMA\setup\lib\ConfigGenerator;
-
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
-/**
- * Core libraries.
- */
-require_once './libraries/config/FormDisplay.tpl.php';
-require_once './setup/lib/index.lib.php';
-
-$config_readable = false;
-$config_writable = false;
-$config_exists = false;
-PMA_checkConfigRw($config_readable, $config_writable, $config_exists);
-echo '<h2>' , __('Configuration file') , '</h2>';
-
-echo PMA_displayFormTop('config.php');
-echo '<input type="hidden" name="eol" value="'
-    , htmlspecialchars(PMA_ifSetOr($_GET['eol'], 'unix')) , '" />';
-echo PMA_displayFieldsetTop('config.inc.php', '', null, array('class' => 'simple'));
-echo '<tr>';
-echo '<td>';
-echo '<textarea cols="50" rows="20" name="textconfig" '
-    , 'id="textconfig" spellcheck="false">';
-echo htmlspecialchars(ConfigGenerator::getConfigFile($GLOBALS['ConfigFile']));
-echo '</textarea>';
-echo '</td>';
-echo '</tr>';
-echo '<tr>';
-echo '<td class="lastrow" style="text-align: left">';
-echo '<input type="submit" name="submit_download" value="'
-    , __('Download') , '" class="green" />';
-echo '<input type="submit" name="submit_save" value="' , __('Save') , '"';
-if (!$config_writable) {
-    echo ' disabled="disabled"';
-}
-echo '/>';
-echo '</td>';
-echo '</tr>';
-
-echo PMA_displayFieldsetBottomSimple();
-echo PMA_displayFormBottom();
diff --git a/#pma/setup/frames/form.inc.php b/#pma/setup/frames/form.inc.php
deleted file mode 100644
index 3ab5c0fd..00000000
--- a/#pma/setup/frames/form.inc.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Form edit view
- *
- * @package PhpMyAdmin-Setup
- */
-
-use PMA\libraries\config\FormDisplay;
-
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
-/**
- * Core libraries.
- */
-require_once './setup/lib/form_processing.lib.php';
-
-require './libraries/config/setup.forms.php';
-
-$formset_id = PMA_isValid($_GET['formset'], 'scalar') ? $_GET['formset'] : null;
-$mode = isset($_GET['mode']) ? $_GET['mode'] : null;
-if (! isset($forms[$formset_id]) || substr($formset_id, 0, 1) === '_') {
-    PMA_fatalError(__('Incorrect formset, check $formsets array in setup/frames/form.inc.php!'));
-}
-
-if (isset($GLOBALS['strConfigFormset_' . $formset_id])) {
-    echo '<h2>' , $GLOBALS['strConfigFormset_' . $formset_id] , '</h2>';
-}
-$form_display = new FormDisplay($GLOBALS['ConfigFile']);
-foreach ($forms[$formset_id] as $form_name => $form) {
-    $form_display->registerForm($form_name, $form);
-}
-PMA_Process_formset($form_display);
diff --git a/#pma/setup/frames/index.inc.php b/#pma/setup/frames/index.inc.php
deleted file mode 100644
index 370bf748..00000000
--- a/#pma/setup/frames/index.inc.php
+++ /dev/null
@@ -1,326 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Overview (main page)
- *
- * @package PhpMyAdmin-Setup
- */
-
-use PMA\libraries\config\ConfigFile;
-use PMA\libraries\config\FormDisplay;
-use PMA\libraries\config\ServerConfigChecks;
-use PMA\libraries\LanguageManager;
-
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
-/**
- * Core libraries.
- */
-require_once './libraries/display_select_lang.lib.php';
-require_once './setup/lib/index.lib.php';
-require_once './libraries/config/FormDisplay.tpl.php';
-
-// prepare unfiltered language list
-$all_languages = LanguageManager::getInstance()->sortedLanguages();
-
-/** @var ConfigFile $cf */
-$cf = $GLOBALS['ConfigFile'];
-$separator = PMA_URL_getArgSeparator('html');
-
-// message handling
-PMA_messagesBegin();
-
-//
-// Check phpMyAdmin version
-//
-if (isset($_GET['version_check'])) {
-    PMA_versionCheck();
-}
-
-//
-// Perform various security, compatibility and consistency checks
-//
-$configChecker = new ServerConfigChecks($GLOBALS['ConfigFile']);
-$configChecker->performConfigChecks();
-
-//
-// Check whether we can read/write configuration
-//
-$config_readable = false;
-$config_writable = false;
-$config_exists = false;
-PMA_checkConfigRw($config_readable, $config_writable, $config_exists);
-if (!$config_writable || !$config_readable) {
-    PMA_messagesSet(
-        'error', 'config_rw', __('Cannot load or save configuration'),
-        PMA_sanitize(
-            __(
-                'Please create web server writable folder [em]config[/em] in '
-                . 'phpMyAdmin top level directory as described in '
-                . '[doc@setup_script]documentation[/doc]. Otherwise you will be '
-                . 'only able to download or display it.'
-            )
-        )
-    );
-}
-//
-// Check https connection
-//
-$is_https = !empty($_SERVER['HTTPS'])
-    && mb_strtolower($_SERVER['HTTPS']) == 'on';
-if (!$is_https) {
-    $text = __(
-        'You are not using a secure connection; all data (including potentially '
-        . 'sensitive information, like passwords) is transferred unencrypted!'
-    );
-
-    $text .= ' <a href="#" onclick="window.location.href = \'https:\' + window.location.href.substring(window.location.protocol.length);">';
-
-    // Temporary workaround to use tranlated message in older releases
-    $text .= str_replace(
-        array('[a@%s]', '[/a]'),
-        array('', ''),
-        __(
-            'If your server is also configured to accept HTTPS requests '
-            . 'follow [a@%s]this link[/a] to use a secure connection.'
-        )
-    );
-    $text .= '</a>';
-    PMA_messagesSet('notice', 'no_https', __('Insecure connection'), $text);
-}
-
-echo '<form id="select_lang" method="post" action="'
-    , htmlspecialchars($_SERVER['REQUEST_URI']) , '">';
-echo PMA_URL_getHiddenInputs();
-echo '<bdo lang="en" dir="ltr"><label for="lang">';
-echo __('Language') , (__('Language') != 'Language' ? ' - Language' : '');
-echo '</label></bdo><br />';
-echo '<select id="lang" name="lang" class="autosubmit" lang="en" dir="ltr">';
-
-// create language list
-$lang_list = array();
-foreach ($all_languages as $each_lang) {
-    //Is current one active?
-    $selected = $each_lang->isActive() ? ' selected="selected"' : '';
-    echo '<option value="' , $each_lang->getCode() , '"' , $selected , '>' , $each_lang->getName()
-        , '</option>' , "\n";
-}
-
-echo '</select>';
-echo '</form>';
-
-// Check for done action info and set notice message if present
-switch ($action_done) {
-case 'config_saved':
-    /* Use uniqid to display this message every time configuration is saved */
-    PMA_messagesSet(
-        'notice', uniqid('config_saved'), __('Configuration saved.'),
-        PMA_sanitize(
-            __(
-                'Configuration saved to file config/config.inc.php in phpMyAdmin '
-                . 'top level directory, copy it to top level one and delete '
-                . 'directory config to use it.'
-            )
-        )
-    );
-    break;
-case 'config_not_saved':
-    /* Use uniqid to display this message every time configuration is saved */
-    PMA_messagesSet(
-        'notice', uniqid('config_not_saved'), __('Configuration not saved!'),
-        PMA_sanitize(
-            __(
-                'Please create web server writable folder [em]config[/em] in '
-                . 'phpMyAdmin top level directory as described in '
-                . '[doc@setup_script]documentation[/doc]. Otherwise you will be '
-                . 'only able to download or display it.'
-            )
-        )
-    );
-    break;
-default:
-    break;
-}
-
-echo '<h2>' , __('Overview') , '</h2>';
-
-// message handling
-PMA_messagesEnd();
-PMA_messagesShowHtml();
-
-echo '<a href="#" id="show_hidden_messages" style="display:none">';
-echo __('Show hidden messages (#MSG_COUNT)');
-echo '</a>';
-
-echo '<fieldset class="simple"><legend>';
-echo __('Servers');
-echo '</legend>';
-
-//
-// Display server list
-//
-echo PMA_displayFormTop(
-    'index.php', 'get',
-    array(
-        'page' => 'servers',
-        'mode' => 'add'
-    )
-);
-echo '<div class="form">';
-if ($cf->getServerCount() > 0) {
-    echo '<table cellspacing="0" class="datatable" style="table-layout: fixed">';
-    echo '<tr>';
-    echo '<th>#</th>';
-    echo '<th>' , __('Name') , '</th>';
-    echo '<th>' , __('Authentication type') , '</th>';
-    echo '<th colspan="2">DSN</th>';
-    echo '</tr>';
-
-    foreach ($cf->getServers() as $id => $server) {
-        echo '<tr>';
-        echo '<td>' , $id  , '</td>';
-        echo '<td>' , htmlspecialchars($cf->getServerName($id)) , '</td>';
-        echo '<td>'
-            , htmlspecialchars($cf->getValue("Servers/$id/auth_type"))
-            ,  '</td>';
-        echo '<td>' , htmlspecialchars($cf->getServerDSN($id)) , '</td>';
-        echo '<td style="white-space: nowrap">';
-        echo '<small>';
-        echo '<a href="' , PMA_URL_getCommon() , $separator , 'page=servers'
-            , $separator , 'mode=edit' , $separator , 'id=' , $id , '">'
-            , __('Edit') , '</a>';
-        echo ' | ';
-        echo '<a href="' , PMA_URL_getCommon() , $separator , 'page=servers'
-            , $separator , 'mode=remove' , $separator , 'id=' , $id , '">'
-            , __('Delete') , '</a>';
-        echo '</small>';
-        echo '</td>';
-        echo '</tr>';
-    }
-    echo '</table>';
-} else {
-    echo '<table width="100%">';
-    echo '<tr>';
-    echo '<td>';
-    echo '<i>' , __('There are no configured servers') , '</i>';
-    echo '</td>';
-    echo '</tr>';
-    echo '</table>';
-}
-
-echo '<table width="100%">';
-echo '<tr>';
-echo '<td class="lastrow" style="text-align: left">';
-echo '<input type="submit" name="submit" value="' , __('New server') , '" />';
-echo '</td>';
-echo '</tr>';
-echo '</table>';
-echo '</div>';
-
-echo PMA_displayFormBottom();
-
-echo '</fieldset>';
-
-echo '<fieldset class="simple"><legend>' , __('Configuration file') , '</legend>';
-
-//
-// Display config file settings and load/save form
-//
-$form_display = new FormDisplay($cf);
-
-echo PMA_displayFormTop('config.php');
-echo '<table width="100%" cellspacing="0">';
-
-// Display language list
-$opts = array(
-    'doc' => $form_display->getDocLink('DefaultLang'),
-    'values' => array(),
-    'values_escaped' => true);
-foreach ($all_languages as $each_lang) {
-    $opts['values'][$each_lang->getCode()] = $each_lang->getName();
-}
-echo PMA_displayInput(
-    'DefaultLang', __('Default language'), 'select',
-    $cf->getValue('DefaultLang'), '', true, $opts
-);
-
-// Display server list
-$opts = array(
-    'doc' => $form_display->getDocLink('ServerDefault'),
-    'values' => array(),
-    'values_disabled' => array());
-if ($cf->getServerCount() > 0) {
-    $opts['values']['0'] = __('let the user choose');
-    $opts['values']['-'] = '------------------------------';
-    if ($cf->getServerCount() == 1) {
-        $opts['values_disabled'][] = '0';
-    }
-    $opts['values_disabled'][] = '-';
-
-    foreach ($cf->getServers() as $id => $server) {
-        $opts['values'][(string)$id] = $cf->getServerName($id) . " [$id]";
-    }
-} else {
-    $opts['values']['1'] = __('- none -');
-    $opts['values_escaped'] = true;
-}
-echo PMA_displayInput(
-    'ServerDefault', __('Default server'), 'select',
-    $cf->getValue('ServerDefault'), '', true, $opts
-);
-
-// Display EOL list
-$opts = array(
-    'values' => array(
-        'unix' => 'UNIX / Linux (\n)',
-        'win' => 'Windows (\r\n)'),
-    'values_escaped' => true);
-$eol = PMA_ifSetOr($_SESSION['eol'], (PMA_IS_WINDOWS ? 'win' : 'unix'));
-echo PMA_displayInput(
-    'eol', __('End of line'), 'select',
-    $eol, '', true, $opts
-);
-
-echo '<tr>';
-echo '<td colspan="2" class="lastrow" style="text-align: left">';
-echo '<input type="submit" name="submit_display" value="' , __('Display') , '" />';
-echo '<input type="submit" name="submit_download" value="' , __('Download') , '" />';
-echo '&nbsp; &nbsp;';
-
-echo '<input type="submit" name="submit_save" value="' , __('Save') , '"';
-if (!$config_writable) {
-    echo ' disabled="disabled"';
-}
-echo '/>';
-
-echo '<input type="submit" name="submit_load" value="' , __('Load') , '"';
-if (!$config_exists) {
-    echo ' disabled="disabled"';
-}
-echo '/>';
-
-echo '<input type="submit" name="submit_delete" value="' , __('Delete') , '"';
-if (!$config_exists || !$config_writable) {
-    echo ' disabled="disabled"';
-}
-echo '/>';
-
-echo '&nbsp; &nbsp;';
-echo '<input type="submit" name="submit_clear" value="' , __('Clear')
-    , '" class="red" />';
-echo '</td>';
-echo '</tr>';
-echo '</table>';
-
-echo PMA_displayFormBottom();
-
-echo '</fieldset>';
-echo '<div id="footer">';
-echo '<a href="../url.php?url=https://www.phpmyadmin.net/">' , __('phpMyAdmin homepage') , '</a>';
-echo '<a href="../url.php?url=https://www.phpmyadmin.net/donate/">'
-    ,  __('Donate') , '</a>';
-echo '<a href="' ,  PMA_URL_getCommon() , $separator , 'version_check=1">'
-    , __('Check for latest version') , '</a>';
-echo '</div>';
diff --git a/#pma/setup/frames/menu.inc.php b/#pma/setup/frames/menu.inc.php
deleted file mode 100644
index 7771afc7..00000000
--- a/#pma/setup/frames/menu.inc.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Menu items
- *
- * @package PhpMyAdmin-Setup
- */
-
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
-$formset_id = isset($_GET['formset']) ? $_GET['formset'] : null;
-
-$separator = PMA_URL_getArgSeparator('html');
-echo '<ul>';
-echo '<li><a href="index.php' , PMA_URL_getCommon() , '"'
-    , ($formset_id === null ? ' class="active' : '')
-    , '">' , __('Overview') , '</a></li>';
-
-$formsets = array(
-    'Features'    => __('Features'),
-    'Sql_queries' => __('SQL queries'),
-    'Navi_panel'  => __('Navigation panel'),
-    'Main_panel'  => __('Main panel'),
-    'Import'      => __('Import'),
-    'Export'      => __('Export')
-);
-
-foreach ($formsets as $formset => $label) {
-    echo '<li><a href="' , PMA_URL_getCommon() , $separator , 'page=form'
-        , $separator , 'formset=' , $formset , '" '
-        , ($formset_id === $formset ? ' class="active' : '')
-        , '">' , $label , '</a></li>';
-}
-
-echo '</ul>';
diff --git a/#pma/setup/frames/servers.inc.php b/#pma/setup/frames/servers.inc.php
deleted file mode 100644
index 0e6669bc..00000000
--- a/#pma/setup/frames/servers.inc.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Server create and edit view
- *
- * @package PhpMyAdmin-Setup
- */
-
-use PMA\libraries\config\ConfigFile;
-use PMA\libraries\config\FormDisplay;
-
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
-/**
- * Core libraries.
- */
-require_once './setup/lib/form_processing.lib.php';
-
-require './libraries/config/setup.forms.php';
-
-$mode = isset($_GET['mode']) ? $_GET['mode'] : null;
-$id = PMA_isValid($_GET['id'], 'numeric') ? intval($_GET['id']) : null;
-
-/** @var ConfigFile $cf */
-$cf = $GLOBALS['ConfigFile'];
-$server_exists = !empty($id) && $cf->get("Servers/$id") !== null;
-
-if ($mode == 'edit' && $server_exists) {
-    $page_title = __('Edit server')
-        . ' ' . $id
-        . ' <small>(' . htmlspecialchars($cf->getServerDSN($id)) . ')</small>';
-} elseif ($mode == 'remove' && $server_exists) {
-    $cf->removeServer($id);
-    header('Location: index.php' . PMA_URL_getCommon());
-    exit;
-} elseif ($mode == 'revert' && $server_exists) {
-    // handled by process_formset()
-} else {
-    $page_title = __('Add a new server');
-    $id = 0;
-}
-if (isset($page_title)) {
-    echo '<h2>' , $page_title . '</h2>';
-}
-$form_display = new FormDisplay($cf);
-foreach ($forms['Servers'] as $form_name => $form) {
-    $form_display->registerForm($form_name, $form, $id);
-}
-PMA_Process_formset($form_display);
diff --git a/#pma/setup/index.php b/#pma/setup/index.php
deleted file mode 100644
index 9720a2f2..00000000
--- a/#pma/setup/index.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Front controller for setup script
- *
- * @package PhpMyAdmin-Setup
- * @license https://www.gnu.org/licenses/gpl.html GNU GPL 2.0
- */
-
-/**
- * Core libraries.
- */
-require './lib/common.inc.php';
-
-$page = PMA_isValid($_GET['page'], 'scalar') ? $_GET['page'] : null;
-$page = preg_replace('/[^a-z]/', '', $page);
-if ($page === '') {
-    $page = 'index';
-}
-if (!file_exists("./setup/frames/$page.inc.php")) {
-    // it will happen only when entering URL by hand, we don't care for these cases
-    PMA_fatalError(__('Wrong GET file attribute value'));
-}
-
-// Handle done action info
-$action_done = PMA_isValid($_GET['action_done'], 'scalar') ? $_GET['action_done'] : null;
-$action_done = preg_replace('/[^a-z_]/', '', $action_done);
-
-PMA_noCacheHeader();
-
-?>
-<!DOCTYPE HTML>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta charset="utf-8" />
-<title>phpMyAdmin setup</title>
-<link href="../favicon.ico" rel="icon" type="image/x-icon" />
-<link href="../favicon.ico" rel="shortcut icon" type="image/x-icon" />
-<link href="styles.css" rel="stylesheet" type="text/css" />
-<script type="text/javascript" src="../js/jquery/jquery-2.1.4.min.js"></script>
-<script type="text/javascript" src="../js/jquery/jquery-ui-1.11.4.min.js">
-</script>
-<script type="text/javascript" src="ajax.js"></script>
-<script type="text/javascript" src="../js/config.js"></script>
-<script type="text/javascript" src="scripts.js"></script>
-<script type="text/javascript" src="../js/messages.php"></script>
-</head>
-<body>
-<h1><span class="blue">php</span><span class="orange">MyAdmin</span>  setup</h1>
-<div id="menu">
-<?php
-require './setup/frames/menu.inc.php';
-?>
-</div>
-<div id="page">
-<?php
-require "./setup/frames/$page.inc.php";
-?>
-</div>
-</body>
-</html>
diff --git a/#pma/setup/lib/ConfigGenerator.php b/#pma/setup/lib/ConfigGenerator.php
deleted file mode 100644
index 48ba56d6..00000000
--- a/#pma/setup/lib/ConfigGenerator.php
+++ /dev/null
@@ -1,182 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Config file generator
- *
- * @package PhpMyAdmin-Setup
- */
-namespace PMA\setup\lib;
-
-use PMA\libraries\config\ConfigFile;
-
-/**
- * Config file generation class
- *
- * @package PhpMyAdmin
- */
-class ConfigGenerator
-{
-    /**
-     * Creates config file
-     *
-     * @param ConfigFile $cf Config file instance
-     *
-     * @return string
-     */
-    public static function getConfigFile(ConfigFile $cf)
-    {
-        $crlf = (isset($_SESSION['eol']) && $_SESSION['eol'] == 'win')
-            ? "\r\n"
-            : "\n";
-        $conf = $cf->getConfig();
-
-        // header
-        $ret = '<?php' . $crlf
-            . '/*' . $crlf
-            . ' * Generated configuration file' . $crlf
-            . ' * Generated by: phpMyAdmin '
-                . $GLOBALS['PMA_Config']->get('PMA_VERSION')
-                . ' setup script' . $crlf
-            . ' * Date: ' . gmdate(DATE_RFC1123) . $crlf
-            . ' */' . $crlf . $crlf;
-
-        //servers
-        if (! empty($conf['Servers'])) {
-            $ret .= self::getServerPart($cf, $crlf, $conf['Servers']);
-            unset($conf['Servers']);
-        }
-
-        // other settings
-        $persistKeys = $cf->getPersistKeysMap();
-
-        foreach ($conf as $k => $v) {
-            $k = preg_replace('/[^A-Za-z0-9_]/', '_', $k);
-            $ret .= self::_getVarExport($k, $v, $crlf);
-            if (isset($persistKeys[$k])) {
-                unset($persistKeys[$k]);
-            }
-        }
-        // keep 1d array keys which are present in $persist_keys (config.values.php)
-        foreach (array_keys($persistKeys) as $k) {
-            if (mb_strpos($k, '/') === false) {
-                $k = preg_replace('/[^A-Za-z0-9_]/', '_', $k);
-                $ret .= self::_getVarExport($k, $cf->getDefault($k), $crlf);
-            }
-        }
-        $ret .= '?' . '>';
-
-        return $ret;
-    }
-
-    /**
-     * Returns exported configuration variable
-     *
-     * @param string $var_name  configuration name
-     * @param mixed  $var_value configuration value(s)
-     * @param string $crlf      line ending
-     *
-     * @return string
-     */
-    private static function _getVarExport($var_name, $var_value, $crlf)
-    {
-        if (!is_array($var_value) || empty($var_value)) {
-            return "\$cfg['$var_name'] = "
-                . var_export($var_value, true) . ';' . $crlf;
-        }
-        $ret = '';
-        if (self::_isZeroBasedArray($var_value)) {
-            $ret = "\$cfg['$var_name'] = "
-                . self::_exportZeroBasedArray($var_value, $crlf)
-                . ';' . $crlf;
-        } else {
-            // string keys: $cfg[key][subkey] = value
-            foreach ($var_value as $k => $v) {
-                $k = preg_replace('/[^A-Za-z0-9_]/', '_', $k);
-                $ret .= "\$cfg['$var_name']['$k'] = "
-                    . var_export($v, true) . ';' . $crlf;
-            }
-        }
-        return $ret;
-    }
-
-    /**
-     * Check whether $array is a continuous 0-based array
-     *
-     * @param array $array Array to check
-     *
-     * @return boolean
-     */
-    private static function _isZeroBasedArray(array $array)
-    {
-        for ($i = 0, $nb = count($array); $i < $nb; $i++) {
-            if (! isset($array[$i])) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Exports continuous 0-based array
-     *
-     * @param array  $array Array to export
-     * @param string $crlf  Newline string
-     *
-     * @return string
-     */
-    private static function _exportZeroBasedArray(array $array, $crlf)
-    {
-        $retv = array();
-        foreach ($array as $v) {
-            $retv[] = var_export($v, true);
-        }
-        $ret = "array(";
-        if (count($retv) <= 4) {
-            // up to 4 values - one line
-            $ret .= implode(', ', $retv);
-        } else {
-            // more than 4 values - value per line
-            $imax = count($retv);
-            for ($i = 0; $i < $imax; $i++) {
-                $ret .= ($i > 0 ? ',' : '') . $crlf . '    ' . $retv[$i];
-            }
-        }
-        $ret .= ')';
-        return $ret;
-    }
-
-    /**
-     * Generate server part of config file
-     *
-     * @param ConfigFile $cf      Config file
-     * @param string     $crlf    Carriage return char
-     * @param array      $servers Servers list
-     *
-     * @return string
-     */
-    protected static function getServerPart(ConfigFile $cf, $crlf, $servers)
-    {
-        if ($cf->getServerCount() === 0) {
-            return null;
-        }
-
-        $ret = "/* Servers configuration */$crlf\$i = 0;" . $crlf . $crlf;
-        foreach ($servers as $id => $server) {
-            $ret .= '/* Server: '
-                . strtr($cf->getServerName($id) . " [$id] ", '*/', '-')
-                . "*/" . $crlf
-                . '$i++;' . $crlf;
-            foreach ($server as $k => $v) {
-                $k = preg_replace('/[^A-Za-z0-9_]/', '_', $k);
-                $ret .= "\$cfg['Servers'][\$i]['$k'] = "
-                    . (is_array($v) && self::_isZeroBasedArray($v)
-                        ? self::_exportZeroBasedArray($v, $crlf)
-                        : var_export($v, true))
-                    . ';' . $crlf;
-            }
-            $ret .= $crlf;
-        }
-        $ret .= '/* End of servers configuration */' . $crlf . $crlf;
-        return $ret;
-    }
-}
diff --git a/#pma/setup/lib/common.inc.php b/#pma/setup/lib/common.inc.php
deleted file mode 100644
index 0a1df376..00000000
--- a/#pma/setup/lib/common.inc.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Loads libraries/common.inc.php and preforms some additional actions
- *
- * @package PhpMyAdmin-Setup
- */
-use PMA\libraries\config\ConfigFile;
-
-/**
- * Do not include full common.
- * @ignore
- */
-define('PMA_MINIMUM_COMMON', true);
-define('PMA_SETUP', true);
-chdir('..');
-
-if (!file_exists('./libraries/common.inc.php')) {
-    die('Bad invocation!');
-}
-
-require_once './libraries/common.inc.php';
-require_once './libraries/config/config_functions.lib.php';
-require_once './libraries/config/messages.inc.php';
-require_once './libraries/url_generating.lib.php';
-require_once './libraries/user_preferences.lib.php';
-
-// use default error handler
-restore_error_handler();
-
-// Save current language in a cookie, required since we use PMA_MINIMUM_COMMON
-$GLOBALS['PMA_Config']->setCookie('pma_lang', $GLOBALS['lang']);
-
-$GLOBALS['ConfigFile'] = new ConfigFile();
-$GLOBALS['ConfigFile']->setPersistKeys(
-    array(
-        'DefaultLang',
-        'ServerDefault',
-        'UploadDir',
-        'SaveDir',
-        'Servers/1/verbose',
-        'Servers/1/host',
-        'Servers/1/port',
-        'Servers/1/socket',
-        'Servers/1/connect_type',
-        'Servers/1/auth_type',
-        'Servers/1/user',
-        'Servers/1/password'
-    )
-);
-
-// allows for redirection even after sending some data
-ob_start();
-
diff --git a/#pma/setup/lib/form_processing.lib.php b/#pma/setup/lib/form_processing.lib.php
deleted file mode 100644
index 9a6b9fff..00000000
--- a/#pma/setup/lib/form_processing.lib.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Formset processing library
- *
- * @package PhpMyAdmin-Setup
- */
-use PMA\libraries\config\FormDisplay;
-
-/**
- * Processes forms registered in $form_display, handles error correction
- *
- * @param FormDisplay $form_display Form to display
- *
- * @return void
- */
-function PMA_Process_formset(FormDisplay $form_display)
-{
-    if (isset($_GET['mode']) && $_GET['mode'] == 'revert') {
-        // revert erroneous fields to their default values
-        $form_display->fixErrors();
-        PMA_generateHeader303();
-    }
-
-    if (!$form_display->process(false)) {
-        // handle form view and failed POST
-        echo $form_display->getDisplay(true, true);
-        return;
-    }
-
-    // check for form errors
-    if (!$form_display->hasErrors()) {
-        PMA_generateHeader303();
-        return;
-    }
-
-    // form has errors, show warning
-    $separator = PMA_URL_getArgSeparator('html');
-    $page = isset($_GET['page']) ? htmlspecialchars($_GET['page']) : null;
-    $formset = isset($_GET['formset']) ? htmlspecialchars($_GET['formset']) : null;
-    $formset = $formset ? "{$separator}formset=$formset" : '';
-    $formId = PMA_isValid($_GET['id'], 'numeric') ? $_GET['id'] : null;
-    if ($formId === null && $page == 'servers') {
-        // we've just added a new server, get its id
-        $formId = $form_display->getConfigFile()->getServerCount();
-    }
-    $formId = $formId ? "{$separator}id=$formId" : '';
-    ?>
-    <div class="error">
-        <h4><?php echo __('Warning') ?></h4>
-        <?php echo __('Submitted form contains errors') ?><br />
-        <a href="<?php echo PMA_URL_getCommon() , $separator ?>page=<?php echo $page , $formset , $formId , $separator ?>mode=revert">
-            <?php echo __('Try to revert erroneous fields to their default values') ?>
-        </a>
-    </div>
-    <?php echo $form_display->displayErrors() ?>
-    <a class="btn" href="index.php<?php echo PMA_URL_getCommon() ?>">
-        <?php echo __('Ignore errors') ?>
-    </a>
-    &nbsp;
-    <a class="btn" href="<?php echo PMA_URL_getCommon() , $separator ?>page=<?php echo $page , $formset , $formId , $separator ?>mode=edit">
-        <?php echo __('Show form') ?>
-    </a>
-    <?php
-}
-
-/**
- * Generate header for 303
- *
- * @return void
- */
-function PMA_generateHeader303()
-{
-    // drop post data
-    header('HTTP/1.1 303 See Other');
-    header('Location: index.php' . PMA_URL_getCommon());
-
-    if (!defined('TESTSUITE')) {
-        exit;
-    }
-}
diff --git a/#pma/setup/lib/index.lib.php b/#pma/setup/lib/index.lib.php
deleted file mode 100644
index c4de5964..00000000
--- a/#pma/setup/lib/index.lib.php
+++ /dev/null
@@ -1,213 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Various checks and message functions used on index page.
- *
- * @package PhpMyAdmin-Setup
- */
-
-use PMA\libraries\VersionInformation;
-
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
-/**
- * Initializes message list
- *
- * @return void
- */
-function PMA_messagesBegin()
-{
-    if (! isset($_SESSION['messages']) || !is_array($_SESSION['messages'])) {
-        $_SESSION['messages'] = array('error' => array(), 'notice' => array());
-    } else {
-        // reset message states
-        foreach ($_SESSION['messages'] as &$messages) {
-            foreach ($messages as &$msg) {
-                $msg['fresh'] = false;
-                $msg['active'] = false;
-            }
-        }
-    }
-}
-
-/**
- * Adds a new message to message list
- *
- * @param string $type    one of: notice, error
- * @param string $msgId   unique message identifier
- * @param string $title   language string id (in $str array)
- * @param string $message message text
- *
- * @return void
- */
-function PMA_messagesSet($type, $msgId, $title, $message)
-{
-    $fresh = ! isset($_SESSION['messages'][$type][$msgId]);
-    $_SESSION['messages'][$type][$msgId] = array(
-        'fresh' => $fresh,
-        'active' => true,
-        'title' => $title,
-        'message' => $message);
-}
-
-/**
- * Cleans up message list
- *
- * @return void
- */
-function PMA_messagesEnd()
-{
-    foreach ($_SESSION['messages'] as &$messages) {
-        $remove_ids = array();
-        foreach ($messages as $id => &$msg) {
-            if ($msg['active'] == false) {
-                $remove_ids[] = $id;
-            }
-        }
-        foreach ($remove_ids as $id) {
-            unset($messages[$id]);
-        }
-    }
-}
-
-/**
- * Prints message list, must be called after PMA_messagesEnd()
- *
- * @return void
- */
-function PMA_messagesShowHtml()
-{
-    $old_ids = array();
-    foreach ($_SESSION['messages'] as $type => $messages) {
-        foreach ($messages as $id => $msg) {
-            echo '<div class="' , $type , '" id="' , $id , '">'
-                , '<h4>' , $msg['title'] , '</h4>'
-                , $msg['message'] , '</div>';
-            if (!$msg['fresh'] && $type != 'error') {
-                $old_ids[] = $id;
-            }
-        }
-    }
-
-    echo "\n" , '<script type="text/javascript">';
-    foreach ($old_ids as $id) {
-        echo "\nhiddenMessages.push('$id');";
-    }
-    echo "\n</script>\n";
-}
-
-/**
- * Checks for newest phpMyAdmin version and sets result as a new notice
- *
- * @return void
- */
-function PMA_versionCheck()
-{
-    // version check messages should always be visible so let's make
-    // a unique message id each time we run it
-    $message_id = uniqid('version_check');
-
-    // Fetch data
-    $versionInformation = new VersionInformation();
-    $version_data = $versionInformation->getLatestVersion();
-
-    if (empty($version_data)) {
-        PMA_messagesSet(
-            'error',
-            $message_id,
-            __('Version check'),
-            __(
-                'Reading of version failed. '
-                . 'Maybe you\'re offline or the upgrade server does not respond.'
-            )
-        );
-        return;
-    }
-
-    $releases = $version_data->releases;
-    $latestCompatible = $versionInformation->getLatestCompatibleVersion($releases);
-    if ($latestCompatible != null) {
-        $version = $latestCompatible['version'];
-        $date = $latestCompatible['date'];
-    } else {
-        return;
-    }
-
-    $version_upstream = $versionInformation->versionToInt($version);
-    if ($version_upstream === false) {
-        PMA_messagesSet(
-            'error',
-            $message_id,
-            __('Version check'),
-            __('Got invalid version string from server')
-        );
-        return;
-    }
-
-    $version_local = $versionInformation->versionToInt(
-        $GLOBALS['PMA_Config']->get('PMA_VERSION')
-    );
-    if ($version_local === false) {
-        PMA_messagesSet(
-            'error',
-            $message_id,
-            __('Version check'),
-            __('Unparsable version string')
-        );
-        return;
-    }
-
-    if ($version_upstream > $version_local) {
-        $version = htmlspecialchars($version);
-        $date = htmlspecialchars($date);
-        PMA_messagesSet(
-            'notice',
-            $message_id,
-            __('Version check'),
-            sprintf(__('A newer version of phpMyAdmin is available and you should consider upgrading. The newest version is %s, released on %s.'), $version, $date)
-        );
-    } else {
-        if ($version_local % 100 == 0) {
-            PMA_messagesSet(
-                'notice',
-                $message_id,
-                __('Version check'),
-                PMA_sanitize(sprintf(__('You are using Git version, run [kbd]git pull[/kbd] :-)[br]The latest stable version is %s, released on %s.'), $version, $date))
-            );
-        } else {
-            PMA_messagesSet(
-                'notice',
-                $message_id,
-                __('Version check'),
-                __('No newer stable version is available')
-            );
-        }
-    }
-}
-
-/**
- * Checks whether config file is readable/writable
- *
- * @param bool &$is_readable whether the file is readable
- * @param bool &$is_writable whether the file is writable
- * @param bool &$file_exists whether the file exists
- *
- * @return void
- */
-function PMA_checkConfigRw(&$is_readable, &$is_writable, &$file_exists)
-{
-    $file_path = $GLOBALS['ConfigFile']->getFilePath();
-    $file_dir = dirname($file_path);
-    $is_readable = true;
-    $is_writable = @is_dir($file_dir);
-    if (SETUP_DIR_WRITABLE) {
-        $is_writable = $is_writable && @is_writable($file_dir);
-    }
-    $file_exists = file_exists($file_path);
-    if ($file_exists) {
-        $is_readable = is_readable($file_path);
-        $is_writable = $is_writable && @is_writable($file_path);
-    }
-}
diff --git a/#pma/setup/scripts.js b/#pma/setup/scripts.js
deleted file mode 100644
index e912bec0..00000000
--- a/#pma/setup/scripts.js
+++ /dev/null
@@ -1,215 +0,0 @@
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Functions used in Setup configuration forms
- */
-
-// show this window in top frame
-if (top != self) {
-    window.top.location.href = location;
-}
-
-// ------------------------------------------------------------------
-// Messages
-//
-
-// stores hidden message ids
-var hiddenMessages = [];
-
-$(function () {
-    var hidden = hiddenMessages.length;
-    for (var i = 0; i < hidden; i++) {
-        $('#' + hiddenMessages[i]).css('display', 'none');
-    }
-    if (hidden > 0) {
-        var link = $('#show_hidden_messages');
-        link.click(function (e) {
-            e.preventDefault();
-            for (var i = 0; i < hidden; i++) {
-                $('#' + hiddenMessages[i]).show(500);
-            }
-            $(this).remove();
-        });
-        link.html(link.html().replace('#MSG_COUNT', hidden));
-        link.css('display', '');
-    }
-});
-
-//set document width
-$(document).ready(function(){
-    width = 0;
-    $('ul.tabs li').each(function(){
-        width += $(this).width() + 10;
-    });
-    var contentWidth = width;
-    width += 250;
-    $('body').css('min-width', width);
-    $('.tabs_contents').css('min-width', contentWidth);
-});
-
-//
-// END: Messages
-// ------------------------------------------------------------------
-
-// ------------------------------------------------------------------
-// Form validation and field operations
-//
-
-/**
- * Calls server-side validation procedures
- *
- * @param {Element} parent  input field in <fieldset> or <fieldset>
- * @param {String}  id      validator id
- * @param {Object}  values  values hash {element1_id: value, ...}
- */
-function ajaxValidate(parent, id, values)
-{
-    parent = $(parent);
-    // ensure that parent is a fieldset
-    if (parent.attr('tagName') != 'FIELDSET') {
-        parent = parent.closest('fieldset');
-        if (parent.length === 0) {
-            return false;
-        }
-    }
-
-    if (parent.data('ajax') !== null) {
-        parent.data('ajax').abort();
-    }
-
-    parent.data('ajax', $.ajax({
-        url: 'validate.php',
-        cache: false,
-        type: 'POST',
-        data: {
-            token: parent.closest('form').find('input[name=token]').val(),
-            id: id,
-            values: JSON.stringify(values)
-        },
-        success: function (response) {
-            if (response === null) {
-                return;
-            }
-
-            var error = {};
-            if (typeof response != 'object') {
-                error[parent.id] = [response];
-            } else if (typeof response.error != 'undefined') {
-                error[parent.id] = [response.error];
-            } else {
-                for (var key in response) {
-                    var value = response[key];
-                    error[key] = jQuery.isArray(value) ? value : [value];
-                }
-            }
-            displayErrors(error);
-        },
-        complete: function () {
-            parent.removeData('ajax');
-        }
-    }));
-
-    return true;
-}
-
-/**
- * Automatic form submission on change.
- */
-$(document).on('change', '.autosubmit', function (e) {
-    e.target.form.submit();
-});
-
-$.extend(true, validators, {
-    // field validators
-    _field: {
-        /**
-         * hide_db field
-         *
-         * @param {boolean} isKeyUp
-         */
-        hide_db: function (isKeyUp) {
-            if (!isKeyUp && this.value !== '') {
-                var data = {};
-                data[this.id] = this.value;
-                ajaxValidate(this, 'Servers/1/hide_db', data);
-            }
-            return true;
-        },
-        /**
-         * TrustedProxies field
-         *
-         * @param {boolean} isKeyUp
-         */
-        TrustedProxies: function (isKeyUp) {
-            if (!isKeyUp && this.value !== '') {
-                var data = {};
-                data[this.id] = this.value;
-                ajaxValidate(this, 'TrustedProxies', data);
-            }
-            return true;
-        }
-    },
-    // fieldset validators
-    _fieldset: {
-        /**
-         * Validates Server fieldset
-         *
-         * @param {boolean} isKeyUp
-         */
-        Server: function (isKeyUp) {
-            if (!isKeyUp) {
-                ajaxValidate(this, 'Server', getAllValues());
-            }
-            return true;
-        },
-        /**
-         * Validates Server_login_options fieldset
-         *
-         * @param {boolean} isKeyUp
-         */
-        Server_login_options: function (isKeyUp) {
-            return validators._fieldset.Server.apply(this, [isKeyUp]);
-        },
-        /**
-         * Validates Server_pmadb fieldset
-         *
-         * @param {boolean} isKeyUp
-         */
-        Server_pmadb: function (isKeyUp) {
-            if (isKeyUp) {
-                return true;
-            }
-
-            var prefix = getIdPrefix($(this).find('input'));
-            if ($('#' + prefix + 'pmadb').val() !== '') {
-                ajaxValidate(this, 'Server_pmadb', getAllValues());
-            }
-
-            return true;
-        }
-    }
-});
-
-//
-// END: Form validation and field operations
-// ------------------------------------------------------------------
-
-// ------------------------------------------------------------------
-// User preferences allow/disallow UI
-//
-
-$(function () {
-    $('.userprefs-allow').click(function (e) {
-        if (this != e.target) {
-            return;
-        }
-        var el = $(this).find('input');
-        if (el.prop('disabled')) {
-            return;
-        }
-        el.prop('checked', !el.prop('checked'));
-    });
-});
-
-//
-// END: User preferences allow/disallow UI
-// ------------------------------------------------------------------
diff --git a/#pma/setup/styles.css b/#pma/setup/styles.css
deleted file mode 100644
index 1b82725d..00000000
--- a/#pma/setup/styles.css
+++ /dev/null
@@ -1,608 +0,0 @@
-/* global styles */
-
-body {
-    margin-right: auto;
-    min-width: 960px;
-    padding-bottom: 1em;
-    color: #444;
-    font: .8em sans-serif;
-    background: url(../themes/pmahomme/img/left_nav_bg.png) repeat-y 80px 0 #f3f3f3;
-}
-
-input,
-button,
-select,
-textarea,
-th,
-td {
-    font: 1em sans-serif;
-}
-
-img {
-    border: 0;
-}
-
-a,
-a:link,
-a:visited,
-a:active {
-    text-decoration: none;
-    color: #235a81;
-    cursor: pointer;
-    outline: none;
-
-}
-
-a:hover {
-    text-decoration: underline;
-    color: #235a81;
-}
-
-h1 {
-    font-size: 1.5em;
-}
-
-/* language selection box */
-
-#select_lang {
-    position: absolute;
-    right: 1em;
-    top: 1em;
-}
-
-/* menu */
-
-#menu {
-    float: left;
-    width: 220px;
-    font-size: 1.1em;
-}
-
-#menu ul {
-    margin: 1em 1em 1em .5em;
-    padding: 0;
-    list-style: none;
-}
-
-#menu li a {
-    padding: .5em .6em;
-    margin-right: .6em;
-    display: block;
-    color: #333;
-    text-decoration: none;
-    zoom: 1; /* IE fix */
-}
-
-#menu li a:hover, #menu li a:active, #menu li a.active {
-    background-color: #e4e4e4;
-}
-
-/* page contents and footer layout */
-
-#page {
-    margin-left: 220px;
-    margin-right: 25px;
-}
-
-#footer {
-    margin-top: 1em;
-}
-
-#footer a {
-    margin-right: 0.5em;
-    text-decoration: none;
-    font-size: small;
-}
-
-/* phpMyAdmin logo colors */
-
-.blue {
-    color: #666699;
-}
-
-.orange {
-    color: #FF9900;
-}
-
-.red {
-    color: #C00;
-}
-
-/* main page messages */
-
-/* message boxes: error, confirmation */
-.success h4,
-.notice h4,
-div.error h4 {
-    border-bottom: 1px solid;
-    font-weight: bold;
-    margin: 0 0 .2em 0;
-}
-
-div.success,
-div.notice,
-div.error {
-    margin: .5em 0 1.3em 0;
-    border: 1px solid;
-    background: no-repeat 10px 10px;
-    padding: 10px 10px 10px 25px;
-
-    -moz-border-radius: 5px;
-    -webkit-border-radius: 5px;
-    border-radius: 5px;
-
-    -moz-box-shadow: 0 1px 1px #fff inset;
-    -webkit-box-shadow: 0 1px 1px #fff inset;
-    box-shadow: 0 1px 1px #fff inset;
-}
-
-.success a,
-.notice a,
-.error a {
-    text-decoration: underline;
-}
-
-.success {
-    color: #000;
-    background-color: #ebf8a4;
-}
-
-h1.success,
-div.success {
-    border-color: #a2d246;
-    background: url(../themes/pmahomme/img/s_success.png) no-repeat 5px 10px;
-}
-.success h4 {
-    border-color: #00FF00;
-}
-
-.notice {
-    color: #000;
-    background-color: #e8eef1;
-}
-
-h1.notice,
-div.notice {
-    border-color: #3a6c7e;
-    background: url(../themes/pmahomme/img/s_notice.png) no-repeat 5px 10px;
-}
-
-.notice h4 {
-    border-color: #ffb10a;
-}
-
-.error {
-    border: 1px solid maroon !important;
-    color: #000;
-    background: pink;
-}
-
-h1.error,
-div.error {
-    border-color: #333;
-    background: url(../themes/pmahomme/img/s_error.png) no-repeat 5px 10px;
-}
-
-div.error h4 {
-    border-color: #ff0000;
-}
-
-div.notice[id^=version_check] {
-    border-color: #002DFF;
-    background-color: #EEF;
-}
-
-div.notice[id^=version_check] h4 {
-    border-color: #002DFF;
-}
-
-
-
-/* form tabs */
-
-ul.tabs {
-    margin: 1.1em 2px 0;
-    padding: 0 0 3px 0;
-    list-style: none;
-    font-weight: bold;
-}
-
-ul.tabs li {
-    float: left;
-    margin-bottom: -1px;
-}
-
-ul.tabs li a {
-    display: block;
-    margin: 1px .2em 0;
-    white-space: nowrap;
-    text-decoration: none;
-    border: 1px solid #D5D5D5;
-    border-bottom: 1px solid #aaa;
-}
-
-ul.tabs li a {
-    padding: 7px 10px;
-    -webkit-border-radius: 5px 5px 0 0;
-    -moz-border-radius: 5px 5px 0 0;
-    border-radius: 5px 5px 0 0;
-    background: #f2f2f2;
-    color: #555;
-    text-shadow: 0 1px 0 #fff;
-}
-
-ul.tabs li a:hover,
-ul.tabs li a:active {
-    background: #e5e5e5;
-}
-
-ul.tabs li.active a {
-    background-color: #fff;
-    margin-top: 1px;
-    color: #000;
-    text-shadow: none;
-    border-color: #aaa;
-    border-bottom: 1px solid #fff;
-}
-
-.tabs_contents {
-    margin-top: 13px;
-}
-
-.tabs_contents fieldset {
-    margin-top: 0;
-}
-
-.tabs_contents legend {
-    display: none;
-}
-
-/* "restore default value" and "set value: foo" buttons */
-
-.restore-default img, .set-value img {
-    margin-bottom: -3px;
-}
-
-.userprefs-comment {
-    cursor: help;
-    float: right;
-}
-
-/* forms */
-
-fieldset {
-    margin-top: 1em;
-    border-radius: 4px 4px 0 0;
-    -moz-border-radius: 4px 4px 0 0;
-    -webkit-border-radius: 4px 4px 0 0;
-    border: #aaa solid 1px;
-    padding: 1.5em;
-    background: #eee;
-    text-shadow: 0 1px 0 #fff;
-    -moz-box-shadow: 1px 1px 2px #fff inset;
-    -webkit-box-shadow: 1px 1px 2px #fff inset;
-    box-shadow: 1px 1px 2px #fff inset;
-}
-
-fieldset.optbox {
-    padding: 0;
-}
-
-fieldset fieldset {
-    margin: .8em;
-    border: 1px solid #aaa;
-    background: #E8E8E8;
-}
-
-fieldset legend {
-    font-weight: bold;
-    color: #444;
-    padding: 5px 10px;
-    border-radius: 2px;
-    -moz-border-radius: 2px;
-    -webkit-border-radius: 2px;
-    border: 1px solid #aaa;
-    background-color: #fff;
-    -moz-box-shadow: 3px 3px 15px #bbb;
-    -webkit-box-shadow: 3px 3px 15px #bbb;
-    box-shadow: 3px 3px 15px #bbb;
-}
-
-.form {
-    border: 2px #DEE1FF solid;
-}
-
-fieldset p {
-    margin: 0;
-    padding: .5em;
-    background: #fff;
-    border-top: 0;
-}
-
-fieldset .errors { /* form error list */
-    margin: 0 -2px 1em -2px;
-    padding: 0.5em 1.5em;
-    background: #FBEAD9;
-    border: 1px #C83838 solid;
-    border-width: 1px 0;
-    list-style: none;
-    font-family: sans-serif;
-    font-size: small;
-}
-
-fieldset .inline_errors { /* field error list */
-    margin: 0.3em 0.3em 0.3em 0;
-    padding: 0;
-    list-style: none;
-    color: #9A0000;
-    font-size: small;
-}
-
-table caption, table th, table td {
-    text-shadow: 0 1px 0 #FFFFFF;
-}
-
-fieldset th {
-    width: 40%;
-    min-width: 350px;
-    padding: 0.3em 0.3em 0.3em 0.5em;
-    text-align: left;
-    font-weight: bold;
-    vertical-align: top;
-}
-
-fieldset.simple th {
-    width: auto;
-    min-width: 0;
-}
-
-fieldset .doc {
-    margin-left: 1em;
-}
-
-fieldset td {
-    padding-top: 0.3em;
-    vertical-align: top;
-}
-
-fieldset td.userprefs-allow {
-    padding: 0;
-    vertical-align: middle;
-    text-align: center;
-    width: 3em;
-}
-
-fieldset td.userprefs-allow:hover {
-    cursor: pointer;
-    background-color: #EEE;
-}
-
-fieldset th small {
-    display: block;
-    font-weight: normal;
-    font-family: sans-serif;
-    font-size: x-small;
-    color: #666;
-}
-
-fieldset th, fieldset td, .form .lastrow {
-    border-top: 1px solid #D5D5D5;
-}
-
-fieldset .group-header th {
-    background: #EAEDFF;
-    border: none;
-}
-
-fieldset .group-field-1 th, fieldset .group-header-2 th {
-    padding-left: 1em;
-}
-
-fieldset .group-field-2 th, fieldset .group-header-3 th {
-    padding-left: 2em;
-}
-
-fieldset .group-field-3 th {
-    padding-left: 3em;
-}
-
-fieldset .lastrow, .form .lastrow {
-    border-top: 1px #000 solid;
-    background: #D3DCE3;
-    padding: .5em;
-    text-align: center;
-}
-
-input[type=text],
-input[type=password],
-input[type=number] {
-    border-radius: 2px;
-    -moz-border-radius: 2px;
-    -webkit-border-radius: 2px;
-
-    box-shadow: 0 1px 2px #ddd;
-    -moz-box-shadow: 0 1px 2px #ddd;
-    -webkit-box-shadow: 0 1px 2px #ddd;
-
-    background: white;
-    border: 1px solid #aaa;
-    color: #555;
-    padding: 4px;
-    margin: 6px;
-}
-
-input[type=submit],
-button[type=submit]:not(.mult_submit) {
-    font-weight: bold !important;
-}
-
-input[type=submit],
-button[type=submit]:not(.mult_submit),
-input[type=reset],
-input[name=submit_reset],
-input.button {
-    margin-left: 14px;
-    border: 1px solid #aaa;
-    padding: 3px 7px;
-    color: #111;
-    text-decoration: none;
-    background: #ddd;
-
-    border-radius: 12px;
-    -webkit-border-radius: 12px;
-    -moz-border-radius: 12px;
-
-    text-shadow: 0 1px 0 #fff;
-
-    background-image: url(../themes/svg_gradient.php?from=ffffff&to=cccccc);
-    background-size: 100% 100%;
-    background: -webkit-linear-gradient(top, #ffffff, #cccccc);
-    background: -moz-linear-gradient(top, #ffffff, #cccccc);
-    background: -ms-linear-gradient(top, #ffffff, #cccccc);
-    background: -o-linear-gradient(top, #ffffff, #cccccc);
-}
-
-input[type=submit]:hover,
-button[type=submit]:not(.mult_submit):hover,
-input[type=reset]:hover,
-input[name=submit_reset]:hover,
-input.button:hover {
-    position: relative;
-    background-image: url(../themes/svg_gradient.php?from=cccccc&to=dddddd);
-    background-size: 100% 100%;
-    background: -webkit-linear-gradient(top, #cccccc, #dddddd);
-    background: -moz-linear-gradient(top, #cccccc, #dddddd);
-    background: -ms-linear-gradient(top, #cccccc, #dddddd);
-    background: -o-linear-gradient(top, #cccccc, #dddddd);
-    cursor: pointer;
-}
-
-input[type=submit]:active,
-button[type=submit]:not(.mult_submit):active,
-input[type=reset]:active,
-input[name=submit_reset]:active,
-input.button:active {
-    position: relative;
-    top: 1px;
-    left: 1px;
-}
-
-input[type="checkbox"],
-input[type="radio"] {
-    vertical-align: -11%;
-}
-
-
-select {
-    -moz-border-radius: 2px;
-    -webkit-border-radius: 2px;
-    border-radius: 2px;
-
-    -moz-box-shadow: 0 1px 2px #ddd;
-    -webkit-box-shadow: 0 1px 2px #ddd;
-    box-shadow: 0 1px 2px #ddd;
-
-    border: 1px solid #aaa;
-    color: #333;
-    padding: 3px;
-    background: white;
-    margin: 6px;
-}
-
-fieldset.simple th, fieldset.simple td {
-    border-top: none;
-    border-bottom: 1px #555 dotted;
-}
-
-fieldset.simple .lastrow {
-    border: 0;
-}
-
-/* form elements */
-
-span.checkbox {
-    padding: 2px;
-    display: inline-block;
-}
-
-.custom { /* customized field */
-    background: #FFC;
-}
-
-.checkbox.custom {
-    padding: 1px;
-    border: 1px #EDEC90 solid;
-}
-
-.field-error {
-    border-color: #C11 !important;
-}
-
-.field-comment {
-
-    position: relative;
-}
-
-.field-comment-mark {
-    cursor: help;
-    padding: 0 0.2em;
-    font-weight: bold;
-    font-style: italic;
-}
-
-.field-comment-warning {
-    color: #A00;
-}
-
-.green { /* default form button */
-    color: #080 !important;
-}
-
-table.datatable {
-    margin: 0.5em 0 1em;
-}
-
-table.datatable th {
-    padding: 0 1em 0 0.5em;
-    border-bottom: 1px #999 solid;
-    text-align: left;
-}
-
-table.datatable td {
-    padding: 1px 0.5em;
-    border-bottom: 1px #DEE1FF solid;
-}
-
-/* textarea with config file's contents */
-
-#textconfig {
-    width: 100%;
-    border: 0;
-}
-
-/* error list */
-
-dd {
-    margin-left: 0.5em;
-}
-
-dd:before {
-    content: "\25B8  ";
-}
-
-/* links on failed validation page, when saving a form */
-
-a.btn {
-    padding: 1px 5px;
-    text-decoration: none;
-    background: #E2E8FF;
-    border: 1px #A6C8FF solid;
-    border-top-color: #AFD0FF;
-    border-left-color: #AFD0FF;
-    font-weight: bold;
-}
-
-a.btn:hover, a.btn:active {
-    background: #E6F5FF;
-    color: #004C96;
-}
diff --git a/#pma/setup/validate.php b/#pma/setup/validate.php
deleted file mode 100644
index c53c0e73..00000000
--- a/#pma/setup/validate.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Validation callback.
- *
- * @package PhpMyAdmin-Setup
- */
-
-/**
- * Core libraries.
- */
-require './lib/common.inc.php';
-
-$validators = array();
-require './libraries/config/Validator.php';
-
-PMA_headerJSON();
-
-$ids = PMA_isValid($_POST['id'], 'scalar') ? $_POST['id'] : null;
-$vids = explode(',', $ids);
-$vals = PMA_isValid($_POST['values'], 'scalar') ? $_POST['values'] : null;
-$values = json_decode($vals);
-if (!($values instanceof stdClass)) {
-    PMA_fatalError(__('Wrong data'));
-}
-$values = (array)$values;
-$result = PMA\libraries\config\Validator::validate($GLOBALS['ConfigFile'], $vids, $values, true);
-if ($result === false) {
-    $result = sprintf(
-        __('Wrong data or no validation for %s'),
-        implode(',', $vids)
-    );
-}
-echo $result !== true ? json_encode($result) : '';
diff --git a/#pma/show_config_errors.php b/#pma/show_config_errors.php
deleted file mode 100644
index 993975bb..00000000
--- a/#pma/show_config_errors.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Simple wrapper just to enable error reporting and include config
- *
- * @package PhpMyAdmin
- */
-
-// rfc2616 - Section 14.21
-header('Expires: ' . gmdate(DATE_RFC1123));
-// HTTP/1.1
-header(
-    'Cache-Control: no-store, no-cache, must-revalidate,'
-    . '  pre-check=0, post-check=0, max-age=0'
-);
-if (isset($_SERVER['HTTP_USER_AGENT'])
-    && stristr($_SERVER['HTTP_USER_AGENT'], 'MSIE')
-) {
-
-    /* FIXME: Why is this special case for IE needed? */
-    header('Pragma: public');
-} else {
-    header('Pragma: no-cache'); // HTTP/1.0
-    // test case: exporting a database into a .gz file with Safari
-    // would produce files not having the current time
-    // (added this header for Safari but should not harm other browsers)
-    header('Last-Modified: ' . gmdate(DATE_RFC1123));
-}
-header('Content-Type: text/html; charset=utf-8');
-
-require 'libraries/vendor_config.php';
-
-error_reporting(E_ALL);
-/**
- * Read config file.
- */
-if (is_readable(CONFIG_FILE)) {
-    include CONFIG_FILE;
-}
diff --git a/#pma/sql.php b/#pma/sql.php
deleted file mode 100644
index 5e77676e..00000000
--- a/#pma/sql.php
+++ /dev/null
@@ -1,222 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * SQL executor
- *
- * @todo    we must handle the case if sql.php is called directly with a query
- *          that returns 0 rows - to prevent cyclic redirects or includes
- * @package PhpMyAdmin
- */
-use PMA\libraries\config\PageSettings;
-use PMA\libraries\Response;
-use PMA\libraries\Util;
-
-/**
- * Gets some core libraries
- */
-require_once 'libraries/common.inc.php';
-require_once 'libraries/check_user_privileges.lib.php';
-require_once 'libraries/bookmark.lib.php';
-require_once 'libraries/sql.lib.php';
-require_once 'libraries/config/user_preferences.forms.php';
-require_once 'libraries/config/page_settings.forms.php';
-
-PageSettings::showGroup('Browse');
-
-
-$response = Response::getInstance();
-$header   = $response->getHeader();
-$scripts  = $header->getScripts();
-$scripts->addFile('jquery/jquery-ui-timepicker-addon.js');
-$scripts->addFile('jquery/jquery.uitablefilter.js');
-$scripts->addFile('tbl_change.js');
-$scripts->addFile('indexes.js');
-$scripts->addFile('gis_data_editor.js');
-$scripts->addFile('multi_column_sort.js');
-
-/**
- * Set ajax_reload in the response if it was already set
- */
-if (isset($ajax_reload) && $ajax_reload['reload'] === true) {
-    $response->addJSON('ajax_reload', $ajax_reload);
-}
-
-
-/**
- * Defines the url to return to in case of error in a sql statement
- */
-$is_gotofile  = true;
-if (empty($goto)) {
-    if (empty($table)) {
-        $goto = Util::getScriptNameForOption(
-            $GLOBALS['cfg']['DefaultTabDatabase'], 'database'
-        );
-    } else {
-        $goto = Util::getScriptNameForOption(
-            $GLOBALS['cfg']['DefaultTabTable'], 'table'
-        );
-    }
-} // end if
-
-if (! isset($err_url)) {
-    $err_url = (! empty($back) ? $back : $goto)
-        . '?' . PMA_URL_getCommon(array('db' => $GLOBALS['db']))
-        . ((mb_strpos(' ' . $goto, 'db_') != 1
-            && mb_strlen($table))
-            ? '&amp;table=' . urlencode($table)
-            : ''
-        );
-} // end if
-
-// Coming from a bookmark dialog
-if (isset($_POST['bkm_fields']['bkm_sql_query'])) {
-    $sql_query = $_POST['bkm_fields']['bkm_sql_query'];
-} elseif (isset($_GET['sql_query'])) {
-    $sql_query = $_GET['sql_query'];
-}
-
-// This one is just to fill $db
-if (isset($_POST['bkm_fields']['bkm_database'])) {
-    $db = $_POST['bkm_fields']['bkm_database'];
-}
-
-
-// During grid edit, if we have a relational field, show the dropdown for it.
-if (isset($_REQUEST['get_relational_values'])
-    && $_REQUEST['get_relational_values'] == true
-) {
-    PMA_getRelationalValues($db, $table);
-    // script has exited at this point
-}
-
-// Just like above, find possible values for enum fields during grid edit.
-if (isset($_REQUEST['get_enum_values']) && $_REQUEST['get_enum_values'] == true) {
-    PMA_getEnumOrSetValues($db, $table, "enum");
-    // script has exited at this point
-}
-
-
-// Find possible values for set fields during grid edit.
-if (isset($_REQUEST['get_set_values']) && $_REQUEST['get_set_values'] == true) {
-    PMA_getEnumOrSetValues($db, $table, "set");
-    // script has exited at this point
-}
-
-if (isset($_REQUEST['get_default_fk_check_value'])
-    && $_REQUEST['get_default_fk_check_value'] == true
-) {
-    $response = Response::getInstance();
-    $response->addJSON(
-        'default_fk_check_value', Util::isForeignKeyCheck()
-    );
-    exit;
-}
-
-/**
- * Check ajax request to set the column order and visibility
- */
-if (isset($_REQUEST['set_col_prefs']) && $_REQUEST['set_col_prefs'] == true) {
-    PMA_setColumnOrderOrVisibility($table, $db);
-    // script has exited at this point
-}
-
-// Default to browse if no query set and we have table
-// (needed for browsing from DefaultTabTable)
-$tableLength = mb_strlen($table);
-$dbLength = mb_strlen($db);
-if (empty($sql_query) && $tableLength && $dbLength) {
-    $sql_query = PMA_getDefaultSqlQueryForBrowse($db, $table);
-
-    // set $goto to what will be displayed if query returns 0 rows
-    $goto = '';
-} else {
-    // Now we can check the parameters
-    Util::checkParameters(array('sql_query'));
-}
-
-/**
- * Parse and analyze the query
- */
-require_once 'libraries/parse_analyze.lib.php';
-list(
-    $analyzed_sql_results,
-    $db,
-    $table_from_sql
-) = PMA_parseAnalyze($sql_query, $db);
-// @todo: possibly refactor
-extract($analyzed_sql_results);
-
-if ($table != $table_from_sql && !empty($table_from_sql)) {
-    $table = $table_from_sql;
-}
-
-
-/**
- * Check rights in case of DROP DATABASE
- *
- * This test may be bypassed if $is_js_confirmed = 1 (already checked with js)
- * but since a malicious user may pass this variable by url/form, we don't take
- * into account this case.
- */
-if (PMA_hasNoRightsToDropDatabase(
-    $analyzed_sql_results, $cfg['AllowUserDropDatabase'], $is_superuser
-)) {
-    Util::mysqlDie(
-        __('"DROP DATABASE" statements are disabled.'),
-        '',
-        false,
-        $err_url
-    );
-} // end if
-
-/**
- * Need to find the real end of rows?
- */
-if (isset($find_real_end) && $find_real_end) {
-    $unlim_num_rows = PMA_findRealEndOfRows($db, $table);
-}
-
-
-/**
- * Bookmark add
- */
-if (isset($_POST['store_bkm'])) {
-    PMA_addBookmark($goto);
-    // script has exited at this point
-} // end if
-
-
-/**
- * Sets or modifies the $goto variable if required
- */
-if ($goto == 'sql.php') {
-    $is_gotofile = false;
-    $goto = 'sql.php' . PMA_URL_getCommon(
-        array(
-            'db' => $db,
-            'table' => $table,
-            'sql_query' => $sql_query
-        )
-    );
-} // end if
-
-PMA_executeQueryAndSendQueryResponse(
-    $analyzed_sql_results, // analyzed_sql_results
-    $is_gotofile, // is_gotofile
-    $db, // db
-    $table, // table
-    isset($find_real_end) ? $find_real_end : null, // find_real_end
-    isset($import_text) ? $import_text : null, // sql_query_for_bookmark
-    isset($extra_data) ? $extra_data : null, // extra_data
-    isset($message_to_show) ? $message_to_show : null, // message_to_show
-    isset($message) ? $message : null, // message
-    isset($sql_data) ? $sql_data : null, // sql_data
-    $goto, // goto
-    $pmaThemeImage, // pmaThemeImage
-    isset($disp_query) ? $display_query : null, // disp_query
-    isset($disp_message) ? $disp_message : null, // disp_message
-    isset($query_type) ? $query_type : null, // query_type
-    $sql_query, // sql_query
-    isset($selected) ? $selected : null, // selectedTables
-    isset($complete_query) ? $complete_query : null // complete_query
-);
diff --git a/#pma/sql/create_tables.sql b/#pma/sql/create_tables.sql
deleted file mode 100644
index f906115f..00000000
--- a/#pma/sql/create_tables.sql
+++ /dev/null
@@ -1,355 +0,0 @@
--- --------------------------------------------------------
--- SQL Commands to set up the pmadb as described in the documentation.
---
--- This file is meant for use with MySQL 5 and above!
---
--- This script expects the user pma to already be existing. If we would put a
--- line here to create him too many users might just use this script and end
--- up with having the same password for the controluser.
---
--- This user "pma" must be defined in config.inc.php (controluser/controlpass)
---
--- Please don't forget to set up the tablenames in config.inc.php
---
-
--- --------------------------------------------------------
-
---
--- Database : `phpmyadmin`
---
-CREATE DATABASE IF NOT EXISTS `phpmyadmin`
-  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
-USE phpmyadmin;
-
--- --------------------------------------------------------
-
---
--- Privileges
---
--- (activate this statement if necessary)
--- GRANT SELECT, INSERT, DELETE, UPDATE, ALTER ON `phpmyadmin`.* TO
---    'pma'@localhost;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma__bookmark`
---
-
-CREATE TABLE IF NOT EXISTS `pma__bookmark` (
-  `id` int(11) NOT NULL auto_increment,
-  `dbase` varchar(255) NOT NULL default '',
-  `user` varchar(255) NOT NULL default '',
-  `label` varchar(255) COLLATE utf8_general_ci NOT NULL default '',
-  `query` text NOT NULL,
-  PRIMARY KEY  (`id`)
-)
-  COMMENT='Bookmarks'
-  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma__column_info`
---
-
-CREATE TABLE IF NOT EXISTS `pma__column_info` (
-  `id` int(5) unsigned NOT NULL auto_increment,
-  `db_name` varchar(64) NOT NULL default '',
-  `table_name` varchar(64) NOT NULL default '',
-  `column_name` varchar(64) NOT NULL default '',
-  `comment` varchar(255) COLLATE utf8_general_ci NOT NULL default '',
-  `mimetype` varchar(255) COLLATE utf8_general_ci NOT NULL default '',
-  `transformation` varchar(255) NOT NULL default '',
-  `transformation_options` varchar(255) NOT NULL default '',
-  `input_transformation` varchar(255) NOT NULL default '',
-  `input_transformation_options` varchar(255) NOT NULL default '',
-  PRIMARY KEY  (`id`),
-  UNIQUE KEY `db_name` (`db_name`,`table_name`,`column_name`)
-)
-  COMMENT='Column information for phpMyAdmin'
-  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma__history`
---
-
-CREATE TABLE IF NOT EXISTS `pma__history` (
-  `id` bigint(20) unsigned NOT NULL auto_increment,
-  `username` varchar(64) NOT NULL default '',
-  `db` varchar(64) NOT NULL default '',
-  `table` varchar(64) NOT NULL default '',
-  `timevalue` timestamp NOT NULL default CURRENT_TIMESTAMP,
-  `sqlquery` text NOT NULL,
-  PRIMARY KEY  (`id`),
-  KEY `username` (`username`,`db`,`table`,`timevalue`)
-)
-  COMMENT='SQL history for phpMyAdmin'
-  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma__pdf_pages`
---
-
-CREATE TABLE IF NOT EXISTS `pma__pdf_pages` (
-  `db_name` varchar(64) NOT NULL default '',
-  `page_nr` int(10) unsigned NOT NULL auto_increment,
-  `page_descr` varchar(50) COLLATE utf8_general_ci NOT NULL default '',
-  PRIMARY KEY  (`page_nr`),
-  KEY `db_name` (`db_name`)
-)
-  COMMENT='PDF relation pages for phpMyAdmin'
-  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma__recent`
---
-
-CREATE TABLE IF NOT EXISTS `pma__recent` (
-  `username` varchar(64) NOT NULL,
-  `tables` text NOT NULL,
-  PRIMARY KEY (`username`)
-)
-  COMMENT='Recently accessed tables'
-  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma__favorite`
---
-
-CREATE TABLE IF NOT EXISTS `pma__favorite` (
-  `username` varchar(64) NOT NULL,
-  `tables` text NOT NULL,
-  PRIMARY KEY (`username`)
-)
-  COMMENT='Favorite tables'
-  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma__table_uiprefs`
---
-
-CREATE TABLE IF NOT EXISTS `pma__table_uiprefs` (
-  `username` varchar(64) NOT NULL,
-  `db_name` varchar(64) NOT NULL,
-  `table_name` varchar(64) NOT NULL,
-  `prefs` text NOT NULL,
-  `last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  PRIMARY KEY (`username`,`db_name`,`table_name`)
-)
-  COMMENT='Tables'' UI preferences'
-  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma__relation`
---
-
-CREATE TABLE IF NOT EXISTS `pma__relation` (
-  `master_db` varchar(64) NOT NULL default '',
-  `master_table` varchar(64) NOT NULL default '',
-  `master_field` varchar(64) NOT NULL default '',
-  `foreign_db` varchar(64) NOT NULL default '',
-  `foreign_table` varchar(64) NOT NULL default '',
-  `foreign_field` varchar(64) NOT NULL default '',
-  PRIMARY KEY  (`master_db`,`master_table`,`master_field`),
-  KEY `foreign_field` (`foreign_db`,`foreign_table`)
-)
-  COMMENT='Relation table'
-  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma__table_coords`
---
-
-CREATE TABLE IF NOT EXISTS `pma__table_coords` (
-  `db_name` varchar(64) NOT NULL default '',
-  `table_name` varchar(64) NOT NULL default '',
-  `pdf_page_number` int(11) NOT NULL default '0',
-  `x` float unsigned NOT NULL default '0',
-  `y` float unsigned NOT NULL default '0',
-  PRIMARY KEY  (`db_name`,`table_name`,`pdf_page_number`)
-)
-  COMMENT='Table coordinates for phpMyAdmin PDF output'
-  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma__table_info`
---
-
-CREATE TABLE IF NOT EXISTS `pma__table_info` (
-  `db_name` varchar(64) NOT NULL default '',
-  `table_name` varchar(64) NOT NULL default '',
-  `display_field` varchar(64) NOT NULL default '',
-  PRIMARY KEY  (`db_name`,`table_name`)
-)
-  COMMENT='Table information for phpMyAdmin'
-  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma__tracking`
---
-
-CREATE TABLE IF NOT EXISTS `pma__tracking` (
-  `db_name` varchar(64) NOT NULL,
-  `table_name` varchar(64) NOT NULL,
-  `version` int(10) unsigned NOT NULL,
-  `date_created` datetime NOT NULL,
-  `date_updated` datetime NOT NULL,
-  `schema_snapshot` text NOT NULL,
-  `schema_sql` text,
-  `data_sql` longtext,
-  `tracking` set('UPDATE','REPLACE','INSERT','DELETE','TRUNCATE','CREATE DATABASE','ALTER DATABASE','DROP DATABASE','CREATE TABLE','ALTER TABLE','RENAME TABLE','DROP TABLE','CREATE INDEX','DROP INDEX','CREATE VIEW','ALTER VIEW','DROP VIEW') default NULL,
-  `tracking_active` int(1) unsigned NOT NULL default '1',
-  PRIMARY KEY  (`db_name`,`table_name`,`version`)
-)
-  COMMENT='Database changes tracking for phpMyAdmin'
-  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma__userconfig`
---
-
-CREATE TABLE IF NOT EXISTS `pma__userconfig` (
-  `username` varchar(64) NOT NULL,
-  `timevalue` timestamp NOT NULL default CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  `config_data` text NOT NULL,
-  PRIMARY KEY  (`username`)
-)
-  COMMENT='User preferences storage for phpMyAdmin'
-  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma__users`
---
-
-CREATE TABLE IF NOT EXISTS `pma__users` (
-  `username` varchar(64) NOT NULL,
-  `usergroup` varchar(64) NOT NULL,
-  PRIMARY KEY (`username`,`usergroup`)
-)
-  COMMENT='Users and their assignments to user groups'
-  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma__usergroups`
---
-
-CREATE TABLE IF NOT EXISTS `pma__usergroups` (
-  `usergroup` varchar(64) NOT NULL,
-  `tab` varchar(64) NOT NULL,
-  `allowed` enum('Y','N') NOT NULL DEFAULT 'N',
-  PRIMARY KEY (`usergroup`,`tab`,`allowed`)
-)
-  COMMENT='User groups with configured menu items'
-  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma__navigationhiding`
---
-
-CREATE TABLE IF NOT EXISTS `pma__navigationhiding` (
-  `username` varchar(64) NOT NULL,
-  `item_name` varchar(64) NOT NULL,
-  `item_type` varchar(64) NOT NULL,
-  `db_name` varchar(64) NOT NULL,
-  `table_name` varchar(64) NOT NULL,
-  PRIMARY KEY (`username`,`item_name`,`item_type`,`db_name`,`table_name`)
-)
-  COMMENT='Hidden items of navigation tree'
-  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma__savedsearches`
---
-
-CREATE TABLE IF NOT EXISTS `pma__savedsearches` (
-  `id` int(5) unsigned NOT NULL auto_increment,
-  `username` varchar(64) NOT NULL default '',
-  `db_name` varchar(64) NOT NULL default '',
-  `search_name` varchar(64) NOT NULL default '',
-  `search_data` text NOT NULL,
-  PRIMARY KEY  (`id`),
-  UNIQUE KEY `u_savedsearches_username_dbname` (`username`,`db_name`,`search_name`)
-)
-  COMMENT='Saved searches'
-  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma__central_columns`
---
-
-CREATE TABLE IF NOT EXISTS `pma__central_columns` (
-  `db_name` varchar(64) NOT NULL,
-  `col_name` varchar(64) NOT NULL,
-  `col_type` varchar(64) NOT NULL,
-  `col_length` text,
-  `col_collation` varchar(64) NOT NULL,
-  `col_isNull` boolean NOT NULL,
-  `col_extra` varchar(255) default '',
-  `col_default` text,
-  PRIMARY KEY (`db_name`,`col_name`)
-)
-  COMMENT='Central list of columns'
-  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma__designer_settings`
---
-
-CREATE TABLE IF NOT EXISTS `pma__designer_settings` (
-  `username` varchar(64) NOT NULL,
-  `settings_data` text NOT NULL,
-  PRIMARY KEY (`username`)
-)
-  COMMENT='Settings related to Designer'
-  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma__export_templates`
---
-
-CREATE TABLE IF NOT EXISTS `pma__export_templates` (
-  `id` int(5) unsigned NOT NULL AUTO_INCREMENT,
-  `username` varchar(64) NOT NULL,
-  `export_type` varchar(10) NOT NULL,
-  `template_name` varchar(64) NOT NULL,
-  `template_data` text NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `u_user_type_template` (`username`,`export_type`,`template_name`)
-)
-  COMMENT='Saved export templates'
-  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
diff --git a/#pma/sql/upgrade_column_info_4_3_0+.sql b/#pma/sql/upgrade_column_info_4_3_0+.sql
deleted file mode 100644
index b5bdc0c1..00000000
--- a/#pma/sql/upgrade_column_info_4_3_0+.sql
+++ /dev/null
@@ -1,47 +0,0 @@
--- -------------------------------------------------------------
--- SQL Commands to upgrade pmadb.pma__column_info table
--- for normal phpMyAdmin operation
---
--- This file is meant for use with phpMyAdmin 4.3.0 and above!
--- For older releases, please use create_tables.sql
---
--- Please don't forget to set up the table names in config.inc.php
---
-
--- --------------------------------------------------------
-
---
--- Database : `phpmyadmin`
---
-USE `phpmyadmin`;
-
--- --------------------------------------------------------
-
---
--- Update table structure for table `pma__column_info`
---
-UPDATE `pma__column_info`
-  SET `mimetype` = REPLACE(`mimetype`, 'octet-stream', 'octetstream');
-UPDATE `pma__column_info`
-  SET `transformation` = REPLACE(REPLACE(`transformation`, '__', '_'), 'inc.php', 'class.php');
-UPDATE `pma__column_info`
-  SET `transformation` = ''
-  WHERE `transformation` = '_';
-UPDATE `pma__column_info`
-  SET `transformation` = CONCAT('output/', `transformation`)
-  WHERE `transformation` IN (
-    'application_octetstream_download.class.php',
-    'application_octetstream_hex.class.php',
-    'image_jpeg_inline.class.php',
-    'image_jpeg_link.class.php',
-    'image_png_inline.class.php',
-    'text_plain_bool2text.class.php',
-    'text_plain_dateformat.class.php',
-    'text_plain_external.class.php',
-    'text_plain_formatted.class.php',
-    'text_plain_imagelink.class.php',
-    'text_plain_sql.class.php'
-  );
-ALTER TABLE `pma__column_info`
-  ADD `input_transformation` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '',
-  ADD `input_transformation_options` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '';
diff --git a/#pma/sql/upgrade_tables_mysql_4_1_2+.sql b/#pma/sql/upgrade_tables_mysql_4_1_2+.sql
deleted file mode 100644
index df4046a4..00000000
--- a/#pma/sql/upgrade_tables_mysql_4_1_2+.sql
+++ /dev/null
@@ -1,144 +0,0 @@
--- -------------------------------------------------------------
--- SQL Commands to upgrade pmadb for normal phpMyAdmin operation
--- with MySQL 4.1.2 and above.
---
--- This file is meant for use with MySQL 4.1.2 and above!
--- For older MySQL releases, please use create_tables.sql
---
--- If you are running one MySQL 4.1.0 or 4.1.1, please create the tables using
--- create_tables.sql, then use this script.
---
--- Please don't forget to set up the tablenames in config.inc.php
---
-
--- --------------------------------------------------------
-
---
--- Database : `phpmyadmin`
---
-ALTER DATABASE `phpmyadmin`
-  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
-USE phpmyadmin;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma__bookmark`
---
-ALTER TABLE `pma__bookmark`
-  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
-
-ALTER TABLE `pma__bookmark`
-  CHANGE `dbase` `dbase` VARCHAR( 255 ) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '';
-ALTER TABLE `pma__bookmark`
-  CHANGE `user` `user` VARCHAR( 255 ) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '';
-ALTER TABLE `pma__bookmark`
-  CHANGE `label` `label` VARCHAR( 255 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '';
-ALTER TABLE `pma__bookmark`
-  CHANGE `query` `query` TEXT CHARACTER SET utf8 COLLATE utf8_bin NOT NULL;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma__column_info`
---
-
-ALTER TABLE `pma__column_info`
-  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
-
-ALTER TABLE `pma__column_info`
-  CHANGE `db_name` `db_name` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '';
-ALTER TABLE `pma__column_info`
-  CHANGE `table_name` `table_name` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '';
-ALTER TABLE `pma__column_info`
-  CHANGE `column_name` `column_name` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '';
-ALTER TABLE `pma__column_info`
-  CHANGE `comment` `comment` VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '';
-ALTER TABLE `pma__column_info`
-  CHANGE `mimetype` `mimetype` VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '';
-ALTER TABLE `pma__column_info`
-  CHANGE `transformation` `transformation` VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '';
-ALTER TABLE `pma__column_info`
-  CHANGE `transformation_options` `transformation_options` VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '';
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma__history`
---
-ALTER TABLE `pma__history`
-  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
-
-ALTER TABLE `pma__history`
-  CHANGE `username` `username` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '';
-ALTER TABLE `pma__history`
-  CHANGE `db` `db` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '';
-ALTER TABLE `pma__history`
-  CHANGE `table` `table` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '';
-ALTER TABLE `pma__history`
-  CHANGE `sqlquery` `sqlquery` TEXT CHARACTER SET utf8 COLLATE utf8_bin NOT NULL;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma__pdf_pages`
---
-
-ALTER TABLE `pma__pdf_pages`
-  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
-
-ALTER TABLE `pma__pdf_pages`
-  CHANGE `db_name` `db_name` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '';
-ALTER TABLE `pma__pdf_pages`
-  CHANGE `page_descr` `page_descr` VARCHAR(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL default '';
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma__relation`
---
-ALTER TABLE `pma__relation`
-  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
-
-ALTER TABLE `pma__relation`
-  CHANGE `master_db` `master_db` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '';
-ALTER TABLE `pma__relation`
-  CHANGE `master_table` `master_table` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '';
-ALTER TABLE `pma__relation`
-  CHANGE `master_field` `master_field` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '';
-ALTER TABLE `pma__relation`
-  CHANGE `foreign_db` `foreign_db` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '';
-ALTER TABLE `pma__relation`
-  CHANGE `foreign_table` `foreign_table` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '';
-ALTER TABLE `pma__relation`
-  CHANGE `foreign_field` `foreign_field` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '';
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma__table_coords`
---
-
-ALTER TABLE `pma__table_coords`
-  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
-
-ALTER TABLE `pma__table_coords`
-  CHANGE `db_name` `db_name` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '';
-ALTER TABLE `pma__table_coords`
-  CHANGE `table_name` `table_name` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '';
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma__table_info`
---
-
-ALTER TABLE `pma__table_info`
-  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
-
-ALTER TABLE `pma__table_info`
-  CHANGE `db_name` `db_name` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '';
-ALTER TABLE `pma__table_info`
-  CHANGE `table_name` `table_name` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '';
-ALTER TABLE `pma__table_info`
-  CHANGE `display_field` `display_field` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '';
diff --git a/#pma/tbl_addfield.php b/#pma/tbl_addfield.php
deleted file mode 100644
index 90424f57..00000000
--- a/#pma/tbl_addfield.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Displays add field form and handles it
- *
- * @package PhpMyAdmin
- */
-
-/**
- * Get some core libraries
- */
-require_once 'libraries/common.inc.php';
-
-$response = PMA\libraries\Response::getInstance();
-$header   = $response->getHeader();
-$scripts  = $header->getScripts();
-$scripts->addFile('tbl_structure.js');
-
-// Check parameters
-PMA\libraries\Util::checkParameters(array('db', 'table'));
-
-
-/**
- * Defines the url to return to in case of error in a sql statement
- */
-$err_url = 'tbl_sql.php' . PMA_URL_getCommon(
-    array(
-        'db' => $db, 'table' => $table
-    )
-);
-
-/**
- * The form used to define the field to add has been submitted
- */
-$abort = false;
-
-// check number of fields to be created
-if (isset($_REQUEST['submit_num_fields'])) {
-    if (isset($_REQUEST['orig_after_field'])) {
-        $_REQUEST['after_field'] = $_REQUEST['orig_after_field'];
-    }
-    if (isset($_REQUEST['orig_field_where'])) {
-        $_REQUEST['field_where'] = $_REQUEST['orig_field_where'];
-    }
-    $num_fields = min(
-        intval($_REQUEST['orig_num_fields']) + intval($_REQUEST['added_fields']),
-        4096
-    );
-    $regenerate = true;
-} elseif (isset($_REQUEST['num_fields']) && intval($_REQUEST['num_fields']) > 0) {
-    $num_fields = min(4096, intval($_REQUEST['num_fields']));
-} else {
-    $num_fields = 1;
-}
-
-if (isset($_REQUEST['do_save_data'])) {
-    //avoid an incorrect calling of PMA_updateColumns() via
-    //tbl_structure.php below
-    unset($_REQUEST['do_save_data']);
-
-    include_once 'libraries/create_addfield.lib.php';
-
-    list($result, $sql_query) = PMA_tryColumnCreationQuery($db, $table, $err_url);
-
-    if ($result === true) {
-        // If comments were sent, enable relation stuff
-        include_once 'libraries/transformations.lib.php';
-
-        // Update comment table for mime types [MIME]
-        if (isset($_REQUEST['field_mimetype'])
-            && is_array($_REQUEST['field_mimetype'])
-            && $cfg['BrowseMIME']
-        ) {
-            foreach ($_REQUEST['field_mimetype'] as $fieldindex => $mimetype) {
-                if (isset($_REQUEST['field_name'][$fieldindex])
-                    && mb_strlen($_REQUEST['field_name'][$fieldindex])
-                ) {
-                    PMA_setMIME(
-                        $db, $table,
-                        $_REQUEST['field_name'][$fieldindex],
-                        $mimetype,
-                        $_REQUEST['field_transformation'][$fieldindex],
-                        $_REQUEST['field_transformation_options'][$fieldindex],
-                        $_REQUEST['field_input_transformation'][$fieldindex],
-                        $_REQUEST['field_input_transformation_options'][$fieldindex]
-                    );
-                }
-            }
-        }
-
-        // Go back to the structure sub-page
-        $message = PMA\libraries\Message::success(
-            __('Table %1$s has been altered successfully.')
-        );
-        $message->addParam($table);
-        $response->addJSON(
-            'message',
-            PMA\libraries\Util::getMessage($message, $sql_query, 'success')
-        );
-        exit;
-    } else {
-        $error_message_html = PMA\libraries\Util::mysqlDie(
-            '',
-            '',
-            false,
-            $err_url,
-            false
-        );
-        $response->addHTML($error_message_html);
-        $response->setRequestStatus(false);
-        exit;
-    }
-} // end do alter table
-
-/**
- * Displays the form used to define the new field
- */
-if ($abort == false) {
-    /**
-     * Gets tables information
-     */
-    include_once 'libraries/tbl_common.inc.php';
-    include_once 'libraries/tbl_info.inc.php';
-
-    $active_page = 'tbl_structure.php';
-    /**
-     * Display the form
-     */
-    $action = 'tbl_addfield.php';
-    include_once 'libraries/tbl_columns_definition_form.inc.php';
-}
diff --git a/#pma/tbl_change.php b/#pma/tbl_change.php
deleted file mode 100644
index 2022abd4..00000000
--- a/#pma/tbl_change.php
+++ /dev/null
@@ -1,236 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Displays form for editing and inserting new table rows
- *
- * register_globals_save (mark this file save for disabling register globals)
- *
- * @package PhpMyAdmin
- */
-use PMA\libraries\config\PageSettings;
-use PMA\libraries\Response;
-use PMA\libraries\Util;
-
-/**
- * Gets the variables sent or posted to this script and displays the header
- */
-require_once 'libraries/common.inc.php';
-require_once 'libraries/config/user_preferences.forms.php';
-require_once 'libraries/config/page_settings.forms.php';
-
-PageSettings::showGroup('Edit');
-
-/**
- * Ensures db and table are valid, else moves to the "parent" script
- */
-require_once 'libraries/db_table_exists.lib.php';
-
-/**
- * functions implementation for this script
- */
-require_once 'libraries/insert_edit.lib.php';
-require_once 'libraries/transformations.lib.php';
-
-/**
- * Determine whether Insert or Edit and set global variables
- */
-list(
-    $insert_mode, $where_clause, $where_clause_array, $where_clauses,
-    $result, $rows, $found_unique_key, $after_insert
-) = PMA_determineInsertOrEdit(
-    isset($where_clause) ? $where_clause : null, $db, $table
-);
-// Increase number of rows if unsaved rows are more
-if (!empty($unsaved_values) && count($rows) < count($unsaved_values)) {
-    $rows = array_fill(0, count($unsaved_values), false);
-}
-/**
- * file listing
-*/
-require_once 'libraries/file_listing.lib.php';
-
-/**
- * Defines the url to return to in case of error in a sql statement
- * (at this point, $GLOBALS['goto'] will be set but could be empty)
- */
-if (empty($GLOBALS['goto'])) {
-    if (mb_strlen($table)) {
-        // avoid a problem (see bug #2202709)
-        $GLOBALS['goto'] = 'tbl_sql.php';
-    } else {
-        $GLOBALS['goto'] = 'db_sql.php';
-    }
-}
-
-
-$_url_params = PMA_getUrlParameters($db, $table);
-$err_url = $GLOBALS['goto'] . PMA_URL_getCommon($_url_params);
-unset($_url_params);
-
-$comments_map = PMA_getCommentsMap($db, $table);
-
-/**
- * START REGULAR OUTPUT
- */
-
-/**
- * Load JavaScript files
- */
-$response = Response::getInstance();
-$header   = $response->getHeader();
-$scripts  = $header->getScripts();
-$scripts->addFile('sql.js');
-$scripts->addFile('tbl_change.js');
-$scripts->addFile('big_ints.js');
-$scripts->addFile('jquery/jquery-ui-timepicker-addon.js');
-$scripts->addFile('jquery/jquery.validate.js');
-$scripts->addFile('jquery/additional-methods.js');
-$scripts->addFile('gis_data_editor.js');
-
-/**
- * Displays the query submitted and its result
- *
- * $disp_message come from tbl_replace.php
- */
-if (! empty($disp_message)) {
-    $response->addHTML(Util::getMessage($disp_message, null));
-}
-
-$table_columns = PMA_getTableColumns($db, $table);
-
-// retrieve keys into foreign fields, if any
-$foreigners = PMA_getForeigners($db, $table);
-
-// Retrieve form parameters for insert/edit form
-$_form_params = PMA_getFormParametersForInsertForm(
-    $db, $table, $where_clauses, $where_clause_array, $err_url
-);
-
-/**
- * Displays the form
- */
-// autocomplete feature of IE kills the "onchange" event handler and it
-//        must be replaced by the "onpropertychange" one in this case
-$chg_evt_handler = (PMA_USR_BROWSER_AGENT == 'IE'
-    && PMA_USR_BROWSER_VER >= 5
-    && PMA_USR_BROWSER_VER < 7
-)
-     ? 'onpropertychange'
-     : 'onchange';
-// Had to put the URI because when hosted on an https server,
-// some browsers send wrongly this form to the http server.
-
-$html_output = '';
-// Set if we passed the first timestamp field
-$timestamp_seen = false;
-$columns_cnt     = count($table_columns);
-
-$tabindex              = 0;
-$tabindex_for_function = +3000;
-$tabindex_for_null     = +6000;
-$tabindex_for_value    = 0;
-$o_rows                = 0;
-$biggest_max_file_size = 0;
-
-$url_params['db'] = $db;
-$url_params['table'] = $table;
-$url_params = PMA_urlParamsInEditMode(
-    $url_params, $where_clause_array, $where_clause
-);
-
-$has_blob_field = false;
-foreach ($table_columns as $column) {
-    if (PMA_isColumn(
-        $column,
-        array('blob', 'tinyblob', 'mediumblob', 'longblob')
-    )) {
-        $has_blob_field = true;
-        break;
-    }
-}
-
-//Insert/Edit form
-//If table has blob fields we have to disable ajax.
-$html_output .= PMA_getHtmlForInsertEditFormHeader($has_blob_field, $is_upload);
-
-$html_output .= PMA_URL_getHiddenInputs($_form_params);
-
-$titles['Browse'] = Util::getIcon('b_browse.png', __('Browse foreign values'));
-
-// user can toggle the display of Function column and column types
-// (currently does not work for multi-edits)
-if (! $cfg['ShowFunctionFields'] || ! $cfg['ShowFieldTypesInDataEditView']) {
-    $html_output .= __('Show');
-}
-
-if (! $cfg['ShowFunctionFields']) {
-    $html_output .= PMA_showTypeOrFunction('function', $url_params, false);
-}
-
-if (! $cfg['ShowFieldTypesInDataEditView']) {
-    $html_output .= PMA_showTypeOrFunction('type', $url_params, false);
-}
-
-$GLOBALS['plugin_scripts'] = array();
-foreach ($rows as $row_id => $current_row) {
-    if (empty($current_row)) {
-        $current_row = array();
-    }
-
-    $jsvkey = $row_id;
-    $vkey = '[multi_edit][' . $jsvkey . ']';
-
-    $current_result = (isset($result) && is_array($result) && isset($result[$row_id])
-        ? $result[$row_id]
-        : $result);
-    $repopulate = array();
-    $checked = true;
-    if (isset($unsaved_values[$row_id])) {
-        $repopulate = $unsaved_values[$row_id];
-        $checked = false;
-    }
-    if ($insert_mode && $row_id > 0) {
-        $html_output .= PMA_getHtmlForIgnoreOption($row_id, $checked);
-    }
-
-    $html_output .= PMA_getHtmlForInsertEditRow(
-        $url_params, $table_columns, $comments_map, $timestamp_seen,
-        $current_result, $chg_evt_handler, $jsvkey, $vkey, $insert_mode,
-        $current_row, $o_rows, $tabindex, $columns_cnt,
-        $is_upload, $tabindex_for_function, $foreigners, $tabindex_for_null,
-        $tabindex_for_value, $table, $db, $row_id, $titles,
-        $biggest_max_file_size, $text_dir, $repopulate, $where_clause_array
-    );
-} // end foreach on multi-edit
-$scripts->addFiles($GLOBALS['plugin_scripts']);
-unset($unsaved_values, $checked, $repopulate, $GLOBALS['plugin_scripts']);
-
-if (! isset($after_insert)) {
-    $after_insert = 'back';
-}
-
-//action panel
-$html_output .= PMA_getActionsPanel(
-    $where_clause, $after_insert, $tabindex,
-    $tabindex_for_value, $found_unique_key
-);
-
-if ($biggest_max_file_size > 0) {
-    $html_output .= '        '
-        . Util::generateHiddenMaxFileSize(
-            $biggest_max_file_size
-        ) . "\n";
-}
-$html_output .= '</form>';
-
-$html_output .= PMA_getHtmlForGisEditor();
-// end Insert/Edit form
-
-if ($insert_mode) {
-    //Continue insertion form
-    $html_output .= PMA_getContinueInsertionForm(
-        $table, $db, $where_clause_array, $err_url
-    );
-}
-
-$response->addHTML($html_output);
diff --git a/#pma/tbl_chart.php b/#pma/tbl_chart.php
deleted file mode 100644
index 1de35d8a..00000000
--- a/#pma/tbl_chart.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * handles creation of the chart
- *
- * @package PhpMyAdmin
- */
-
-namespace PMA;
-
-use PMA\libraries\controllers\table\TableChartController;
-use PMA\libraries\Response;
-
-require_once 'libraries/common.inc.php';
-
-$container = libraries\di\Container::getDefaultContainer();
-$container->factory('PMA\libraries\controllers\table\TableChartController');
-$container->alias(
-    'TableChartController', 'PMA\libraries\controllers\table\TableChartController'
-);
-$container->set('PMA\libraries\Response', Response::getInstance());
-$container->alias('response', 'PMA\libraries\Response');
-
-/* Define dependencies for the concerned controller */
-$dependency_definitions = array(
-    "sql_query" => &$GLOBALS['sql_query'],
-    "url_query" => &$GLOBALS['url_query'],
-    "cfg" => &$GLOBALS['cfg']
-);
-
-/** @var TableChartController $controller */
-$controller = $container->get('TableChartController', $dependency_definitions);
-$controller->indexAction();
diff --git a/#pma/tbl_create.php b/#pma/tbl_create.php
deleted file mode 100644
index c465c28c..00000000
--- a/#pma/tbl_create.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Displays table create form and handles it
- *
- * @package PhpMyAdmin
- */
-
-/**
- * Get some core libraries
- */
-require_once 'libraries/common.inc.php';
-require_once 'libraries/create_addfield.lib.php';
-
-// Check parameters
-PMA\libraries\Util::checkParameters(array('db'));
-
-/* Check if database name is empty */
-if (mb_strlen($db) == 0) {
-    PMA\libraries\Util::mysqlDie(
-        __('The database name is empty!'), '', false, 'index.php'
-    );
-}
-
-/**
- * Selects the database to work with
- */
-if (!$GLOBALS['dbi']->selectDb($db)) {
-    PMA\libraries\Util::mysqlDie(
-        sprintf(__('\'%s\' database does not exist.'), htmlspecialchars($db)),
-        '',
-        false,
-        'index.php'
-    );
-}
-
-if ($GLOBALS['dbi']->getColumns($db, $table)) {
-    // table exists already
-    PMA\libraries\Util::mysqlDie(
-        sprintf(__('Table %s already exists!'), htmlspecialchars($table)),
-        '',
-        false,
-        'db_structure.php' . PMA_URL_getCommon(array('db' => $db))
-    );
-}
-
-// for libraries/tbl_columns_definition_form.inc.php
-// check number of fields to be created
-$num_fields = PMA_getNumberOfFieldsFromRequest();
-
-$action = 'tbl_create.php';
-
-/**
- * The form used to define the structure of the table has been submitted
- */
-if (isset($_REQUEST['do_save_data'])) {
-    $sql_query = PMA_getTableCreationQuery($db, $table);
-
-    // If there is a request for SQL previewing.
-    if (isset($_REQUEST['preview_sql'])) {
-        PMA_previewSQL($sql_query);
-    }
-    // Executes the query
-    $result = $GLOBALS['dbi']->tryQuery($sql_query);
-
-    if ($result) {
-        // If comments were sent, enable relation stuff
-        include_once 'libraries/transformations.lib.php';
-        // Update comment table for mime types [MIME]
-        if (isset($_REQUEST['field_mimetype'])
-            && is_array($_REQUEST['field_mimetype'])
-            && $cfg['BrowseMIME']
-        ) {
-            foreach ($_REQUEST['field_mimetype'] as $fieldindex => $mimetype) {
-                if (isset($_REQUEST['field_name'][$fieldindex])
-                    && mb_strlen($_REQUEST['field_name'][$fieldindex])
-                ) {
-                    PMA_setMIME(
-                        $db, $table,
-                        $_REQUEST['field_name'][$fieldindex], $mimetype,
-                        $_REQUEST['field_transformation'][$fieldindex],
-                        $_REQUEST['field_transformation_options'][$fieldindex],
-                        $_REQUEST['field_input_transformation'][$fieldindex],
-                        $_REQUEST['field_input_transformation_options'][$fieldindex]
-                    );
-                }
-            }
-        }
-    } else {
-        $response = PMA\libraries\Response::getInstance();
-        $response->setRequestStatus(false);
-        $response->addJSON('message', $GLOBALS['dbi']->getError());
-    }
-    exit;
-} // end do create table
-
-//This global variable needs to be reset for the headerclass to function properly
-$GLOBAL['table'] = '';
-
-/**
- * Displays the form used to define the structure of the table
- */
-require 'libraries/tbl_columns_definition_form.inc.php';
diff --git a/#pma/tbl_export.php b/#pma/tbl_export.php
deleted file mode 100644
index 740e2249..00000000
--- a/#pma/tbl_export.php
+++ /dev/null
@@ -1,145 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Table export
- *
- * @package PhpMyAdmin
- */
-use PMA\libraries\config\PageSettings;
-use PMA\libraries\Response;
-
-/**
- *
- */
-require_once 'libraries/common.inc.php';
-require_once 'libraries/display_export.lib.php';
-require_once 'libraries/config/user_preferences.forms.php';
-require_once 'libraries/config/page_settings.forms.php';
-
-PageSettings::showGroup('Export');
-
-$response = PMA\libraries\Response::getInstance();
-$header   = $response->getHeader();
-$scripts  = $header->getScripts();
-$scripts->addFile('export.js');
-
-// Get the relation settings
-$cfgRelation = PMA_getRelationsParam();
-
-// handling export template actions
-if (isset($_REQUEST['templateAction']) && $cfgRelation['exporttemplateswork']) {
-    PMA_handleExportTemplateActions($cfgRelation);
-    exit;
-}
-
-/**
- * Gets tables information and displays top links
- */
-require_once 'libraries/tbl_common.inc.php';
-$url_query .= '&amp;goto=tbl_export.php&amp;back=tbl_export.php';
-require_once 'libraries/tbl_info.inc.php';
-
-// Dump of a table
-
-$export_page_title = __('View dump (schema) of table');
-
-// When we have some query, we need to remove LIMIT from that and possibly
-// generate WHERE clause (if we are asked to export specific rows)
-
-if (! empty($sql_query)) {
-    $parser = new SqlParser\Parser($sql_query);
-
-    if ((!empty($parser->statements[0]))
-        && ($parser->statements[0] instanceof SqlParser\Statements\SelectStatement)
-    ) {
-
-        // Finding aliases and removing them, but we keep track of them to be
-        // able to replace them in select expression too.
-        $aliases = array();
-        foreach ($parser->statements[0]->from as $from) {
-            if ((!empty($from->table)) && (!empty($from->alias))) {
-                $aliases[$from->alias] = $from->table;
-                // We remove the alias of the table because they are going to
-                // be replaced anyway.
-                $from->alias = null;
-                $from->expr = null; // Force rebuild.
-            }
-        }
-
-        // Rebuilding the SELECT and FROM clauses.
-        if (count($parser->statements[0]->from) > 0
-            && count($parser->statements[0]->union) === 0
-        ) {
-            $replaces = array(
-                array(
-                    'FROM', 'FROM ' . SqlParser\Components\ExpressionArray::build(
-                        $parser->statements[0]->from
-                    ),
-                ),
-            );
-        }
-
-        // Checking if the WHERE clause has to be replaced.
-        if ((!empty($where_clause)) && (is_array($where_clause))) {
-            $replaces[] = array(
-                'WHERE', 'WHERE (' . implode(') OR (', $where_clause) . ')'
-            );
-        }
-
-        // Preparing to remove the LIMIT clause.
-        $replaces[] = array('LIMIT', '');
-
-        // Replacing the clauses.
-        $sql_query = SqlParser\Utils\Query::replaceClauses(
-            $parser->statements[0],
-            $parser->list,
-            $replaces
-        );
-
-        // Removing the aliases by finding the alias followed by a dot.
-        $tokens = SqlParser\Lexer::getTokens($sql_query);
-        foreach ($aliases as $alias => $table) {
-            $tokens = SqlParser\Utils\Tokens::replaceTokens(
-                $tokens,
-                array(
-                    array(
-                        'value_str' => $alias,
-                    ),
-                    array(
-                        'type' => SqlParser\Token::TYPE_OPERATOR,
-                        'value_str' => '.',
-                    )
-                ),
-                array(
-                    new SqlParser\Token($table),
-                    new SqlParser\Token('.',SqlParser\Token::TYPE_OPERATOR)
-                )
-            );
-        }
-        $sql_query = SqlParser\TokensList::build($tokens);
-    }
-
-    echo PMA\libraries\Util::getMessage(PMA\libraries\Message::success());
-}
-
-require_once 'libraries/display_export.lib.php';
-
-if (! isset($sql_query)) {
-    $sql_query = '';
-}
-if (! isset($num_tables)) {
-    $num_tables = 0;
-}
-if (! isset($unlim_num_rows)) {
-    $unlim_num_rows = 0;
-}
-if (! isset($multi_values)) {
-    $multi_values = '';
-}
-$response = Response::getInstance();
-$response->addHTML(
-    PMA_getExportDisplay(
-        'table', $db, $table, $sql_query, $num_tables,
-        $unlim_num_rows, $multi_values
-    )
-);
diff --git a/#pma/tbl_find_replace.php b/#pma/tbl_find_replace.php
deleted file mode 100644
index d3ec712b..00000000
--- a/#pma/tbl_find_replace.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Handles find and replace tab
- *
- * Displays find and replace form, allows previewing and do the replacing
- *
- * @package PhpMyAdmin
- */
-
-/**
- * Gets some core libraries
- */
-require_once 'libraries/common.inc.php';
-require_once 'libraries/tbl_common.inc.php';
-require_once 'libraries/tbl_info.inc.php';
-
-$container = \PMA\libraries\di\Container::getDefaultContainer();
-$container->factory('PMA\libraries\controllers\table\TableSearchController');
-$container->alias(
-    'TableSearchController', 'PMA\libraries\controllers\table\TableSearchController'
-);
-$container->set('PMA\libraries\Response', PMA\libraries\Response::getInstance());
-$container->alias('response', 'PMA\libraries\Response');
-
-$dependency_definitions = array(
-    'searchType' => 'replace',
-    'url_query' => &$url_query
-);
-
-/** @var PMA\libraries\controllers\table\TableSearchController $controller */
-$controller = $container->get('TableSearchController', $dependency_definitions);
-$controller->indexAction();
diff --git a/#pma/tbl_get_field.php b/#pma/tbl_get_field.php
deleted file mode 100644
index 95f8b67b..00000000
--- a/#pma/tbl_get_field.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Provides download to a given field defined in parameters.
- *
- * @package PhpMyAdmin
- */
-
-/**
- * Common functions.
- */
-// we don't want the usual PMA\libraries\Response-generated HTML above the column's
-// data
-define('PMA_BYPASS_GET_INSTANCE', 1);
-require_once 'libraries/common.inc.php';
-require_once 'libraries/mime.lib.php';
-
-/* Check parameters */
-PMA\libraries\Util::checkParameters(
-    array('db', 'table')
-);
-
-/* Select database */
-if (!$GLOBALS['dbi']->selectDb($db)) {
-    PMA\libraries\Util::mysqlDie(
-        sprintf(__('\'%s\' database does not exist.'), htmlspecialchars($db)),
-        '', false
-    );
-}
-
-/* Check if table exists */
-if (!$GLOBALS['dbi']->getColumns($db, $table)) {
-    PMA\libraries\Util::mysqlDie(__('Invalid table name'));
-}
-
-/* Grab data */
-$sql = 'SELECT ' . PMA\libraries\Util::backquote($_GET['transform_key'])
-    . ' FROM ' . PMA\libraries\Util::backquote($table)
-    . ' WHERE ' . $_GET['where_clause'] . ';';
-$result = $GLOBALS['dbi']->fetchValue($sql);
-
-/* Check return code */
-if ($result === false) {
-    PMA\libraries\Util::mysqlDie(
-        __('MySQL returned an empty result set (i.e. zero rows).'), $sql
-    );
-}
-
-/* Avoid corrupting data */
-@ini_set('url_rewriter.tags', '');
-
-PMA_downloadHeader(
-    $table . '-' .  $_GET['transform_key'] . '.bin',
-    PMA_detectMIME($result),
-    strlen($result)
-);
-echo $result;
diff --git a/#pma/tbl_gis_visualization.php b/#pma/tbl_gis_visualization.php
deleted file mode 100644
index 72feb468..00000000
--- a/#pma/tbl_gis_visualization.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * handles creation of the GIS visualizations.
- *
- * @package PhpMyAdmin
- */
-
-namespace PMA;
-
-use PMA\libraries\controllers\table\TableGisVisualizationController;
-use PMA\libraries\Response;
-use PMA\libraries\Util;
-
-require_once 'libraries/common.inc.php';
-
-$container = libraries\di\Container::getDefaultContainer();
-$container->factory(
-    'PMA\libraries\controllers\table\TableGisVisualizationController'
-);
-$container->alias(
-    'TableGisVisualizationController',
-    'PMA\libraries\controllers\table\TableGisVisualizationController'
-);
-$container->set('PMA\libraries\Response', Response::getInstance());
-$container->alias('response', 'PMA\libraries\Response');
-
-/* Define dependencies for the concerned controller */
-$dependency_definitions = array(
-    "sql_query" => &$GLOBALS['sql_query'],
-    "url_params" => &$GLOBALS['url_params'],
-    "goto" => Util::getScriptNameForOption(
-        $GLOBALS['cfg']['DefaultTabDatabase'], 'database'
-    ),
-    "back" => 'sql.php',
-    "visualizationSettings" => array()
-);
-
-/** @var TableGisVisualizationController $controller */
-$controller = $container->get(
-    'TableGisVisualizationController', $dependency_definitions
-);
-$controller->indexAction();
diff --git a/#pma/tbl_import.php b/#pma/tbl_import.php
deleted file mode 100644
index 342e212a..00000000
--- a/#pma/tbl_import.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Table import
- *
- * @package PhpMyAdmin
- */
-use PMA\libraries\config\PageSettings;
-
-/**
- *
- */
-require_once 'libraries/common.inc.php';
-require_once 'libraries/config/user_preferences.forms.php';
-require_once 'libraries/config/page_settings.forms.php';
-
-PageSettings::showGroup('Import');
-
-$response = PMA\libraries\Response::getInstance();
-$header   = $response->getHeader();
-$scripts  = $header->getScripts();
-$scripts->addFile('import.js');
-
-/**
- * Gets tables information and displays top links
- */
-require_once 'libraries/tbl_common.inc.php';
-$url_query .= '&amp;goto=tbl_import.php&amp;back=tbl_import.php';
-
-require_once 'libraries/tbl_info.inc.php';
-
-require 'libraries/display_import.lib.php';
-$response = PMA\libraries\Response::getInstance();
-$response->addHTML(
-    PMA_getImportDisplay(
-        'table', $db, $table, $max_upload_size
-    )
-);
diff --git a/#pma/tbl_indexes.php b/#pma/tbl_indexes.php
deleted file mode 100644
index 467e6289..00000000
--- a/#pma/tbl_indexes.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Displays index edit/creation form and handles it
- *
- * @package PhpMyAdmin
- */
-
-namespace PMA;
-
-use PMA\libraries\controllers\table\TableIndexesController;
-use PMA\libraries\Index;
-use PMA\libraries\Response;
-
-require_once 'libraries/common.inc.php';
-
-$container = libraries\di\Container::getDefaultContainer();
-$container->factory('PMA\libraries\controllers\table\TableIndexesController');
-$container->alias(
-    'TableIndexesController',
-    'PMA\libraries\controllers\table\TableIndexesController'
-);
-$container->set('PMA\libraries\Response', Response::getInstance());
-$container->alias('response', 'PMA\libraries\Response');
-
-/* Define dependencies for the concerned controller */
-$db = $container->get('db');
-$table = $container->get('table');
-$dbi = $container->get('dbi');
-
-if (!isset($_REQUEST['create_edit_table'])) {
-    include_once 'libraries/tbl_common.inc.php';
-}
-if (isset($_REQUEST['index'])) {
-    if (is_array($_REQUEST['index'])) {
-        // coming already from form
-        $index = new Index($_REQUEST['index']);
-    } else {
-        $index = $dbi->getTable($db, $table)->getIndex($_REQUEST['index']);
-    }
-} else {
-    $index = new Index;
-}
-
-$dependency_definitions = array(
-    "index" => $index
-);
-
-/** @var TableIndexesController $controller */
-$controller = $container->get('TableIndexesController', $dependency_definitions);
-$controller->indexAction();
diff --git a/#pma/tbl_operations.php b/#pma/tbl_operations.php
deleted file mode 100644
index 3c3754d7..00000000
--- a/#pma/tbl_operations.php
+++ /dev/null
@@ -1,450 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Various table operations
- *
- * @package PhpMyAdmin
- */
-use PMA\libraries\Partition;
-use PMA\libraries\Table;
-
-/**
- *
- */
-require_once 'libraries/common.inc.php';
-
-/**
- * functions implementation for this script
- */
-require_once 'libraries/check_user_privileges.lib.php';
-require_once 'libraries/operations.lib.php';
-
-$pma_table = new Table($GLOBALS['table'], $GLOBALS['db']);
-
-/**
- * Load JavaScript files
- */
-$response = PMA\libraries\Response::getInstance();
-$header   = $response->getHeader();
-$scripts  = $header->getScripts();
-$scripts->addFile('tbl_operations.js');
-
-/**
- * Runs common work
- */
-require 'libraries/tbl_common.inc.php';
-$url_query .= '&amp;goto=tbl_operations.php&amp;back=tbl_operations.php';
-$url_params['goto'] = $url_params['back'] = 'tbl_operations.php';
-
-/**
- * Gets relation settings
- */
-$cfgRelation = PMA_getRelationsParam();
-
-/**
- * Gets available MySQL charsets and storage engines
- */
-require_once 'libraries/mysql_charsets.inc.php';
-
-// reselect current db (needed in some cases probably due to
-// the calling of relation.lib.php)
-$GLOBALS['dbi']->selectDb($GLOBALS['db']);
-
-/**
- * Gets tables information
- */
-require 'libraries/tbl_info.inc.php';
-
-// set initial value of these variables, based on the current table engine
-list($is_myisam_or_aria, $is_innodb, $is_isam,
-    $is_berkeleydb, $is_aria, $is_pbxt
-) = PMA_setGlobalVariablesForEngine($tbl_storage_engine);
-
-if ($is_aria) {
-    // the value for transactional can be implicit
-    // (no create option found, in this case it means 1)
-    // or explicit (option found with a value of 0 or 1)
-    // ($create_options['transactional'] may have been set by libraries/tbl_info.inc.php,
-    // from the $create_options)
-    $create_options['transactional'] = (isset($create_options['transactional']) && $create_options['transactional'] == '0')
-        ? '0'
-        : '1';
-    $create_options['page_checksum'] = (isset($create_options['page_checksum'])) ? $create_options['page_checksum'] : '';
-}
-
-$reread_info = false;
-$table_alters = array();
-
-/**
- * If the table has to be moved to some other database
- */
-if (isset($_REQUEST['submit_move']) || isset($_REQUEST['submit_copy'])) {
-    //$_message = '';
-    PMA_moveOrCopyTable($db, $table);
-    // This was ended in an Ajax call
-    exit;
-}
-/**
- * If the table has to be maintained
- */
-if (isset($_REQUEST['table_maintenance'])) {
-    include_once 'sql.php';
-    unset($result);
-}
-/**
- * Updates table comment, type and options if required
- */
-if (isset($_REQUEST['submitoptions'])) {
-    $_message = '';
-    $warning_messages = array();
-
-    if (isset($_REQUEST['new_name'])) {
-        // Get original names before rename operation
-        $oldTable = $pma_table->getName();
-        $oldDb = $pma_table->getDbName();
-
-        if ($pma_table->rename($_REQUEST['new_name'])) {
-            if (isset($_REQUEST['adjust_privileges'])
-                && ! empty($_REQUEST['adjust_privileges'])
-            ) {
-                PMA_AdjustPrivileges_renameOrMoveTable(
-                    $oldDb, $oldTable, $_REQUEST['db'], $_REQUEST['new_name']
-                );
-            }
-
-            // Reselect the original DB
-            $GLOBALS['db'] = $oldDb;
-            $GLOBALS['dbi']->selectDb($oldDb);
-
-            $_message .= $pma_table->getLastMessage();
-            $result = true;
-            $GLOBALS['table'] = $pma_table->getName();
-            $reread_info = true;
-            $reload = true;
-        } else {
-            $_message .= $pma_table->getLastError();
-            $result = false;
-        }
-    }
-
-    if (! empty($_REQUEST['new_tbl_storage_engine'])
-        && mb_strtoupper($_REQUEST['new_tbl_storage_engine']) !== $tbl_storage_engine
-    ) {
-        $new_tbl_storage_engine = mb_strtoupper($_REQUEST['new_tbl_storage_engine']);
-        // reset the globals for the new engine
-        list($is_myisam_or_aria, $is_innodb, $is_isam,
-            $is_berkeleydb, $is_aria, $is_pbxt
-        ) = PMA_setGlobalVariablesForEngine($new_tbl_storage_engine);
-
-        if ($is_aria) {
-            $create_options['transactional'] = (isset($create_options['transactional']) && $create_options['transactional'] == '0')
-                ? '0'
-                : '1';
-            $create_options['page_checksum'] = (isset($create_options['page_checksum'])) ? $create_options['page_checksum'] : '';
-        }
-    } else {
-        $new_tbl_storage_engine = '';
-    }
-
-    $table_alters = PMA_getTableAltersArray(
-        $is_myisam_or_aria, $is_isam, $create_options['pack_keys'],
-        (empty($create_options['checksum']) ? '0' : '1'),
-        $is_aria,
-        ((isset($create_options['page_checksum'])) ? $create_options['page_checksum'] : ''),
-        (empty($create_options['delay_key_write']) ? '0' : '1'),
-        $is_innodb, $is_pbxt, $create_options['row_format'],
-        $new_tbl_storage_engine,
-        ((isset($create_options['transactional']) && $create_options['transactional'] == '0') ? '0' : '1'),
-        $tbl_collation
-    );
-
-    if (count($table_alters) > 0) {
-        $sql_query      = 'ALTER TABLE '
-            . PMA\libraries\Util::backquote($GLOBALS['table']);
-        $sql_query     .= "\r\n" . implode("\r\n", $table_alters);
-        $sql_query     .= ';';
-        $result        .= $GLOBALS['dbi']->query($sql_query) ? true : false;
-        $reread_info    = true;
-        unset($table_alters);
-        $warning_messages = PMA_getWarningMessagesArray();
-    }
-
-    if (isset($_REQUEST['tbl_collation'])
-        && ! empty($_REQUEST['tbl_collation'])
-        && isset($_REQUEST['change_all_collations'])
-        && ! empty($_REQUEST['change_all_collations'])
-    ) {
-        PMA_changeAllColumnsCollation(
-            $GLOBALS['db'], $GLOBALS['table'], $_REQUEST['tbl_collation']
-        );
-    }
-}
-/**
- * Reordering the table has been requested by the user
- */
-if (isset($_REQUEST['submitorderby']) && ! empty($_REQUEST['order_field'])) {
-    list($sql_query, $result) = PMA_getQueryAndResultForReorderingTable();
-} // end if
-
-/**
- * A partition operation has been requested by the user
- */
-if (isset($_REQUEST['submit_partition'])
-    && ! empty($_REQUEST['partition_operation'])
-) {
-    list($sql_query, $result) = PMA_getQueryAndResultForPartition();
-} // end if
-
-if ($reread_info) {
-    // to avoid showing the old value (for example the AUTO_INCREMENT) after
-    // a change, clear the cache
-    $GLOBALS['dbi']->clearTableCache();
-    include 'libraries/tbl_info.inc.php';
-}
-unset($reread_info);
-
-if (isset($result) && empty($message_to_show)) {
-    if (empty($_message)) {
-        if (empty($sql_query)) {
-            $_message = PMA\libraries\Message::success(__('No change'));
-        } else {
-            $_message = $result
-                ? PMA\libraries\Message::success()
-                : PMA\libraries\Message::error();
-        }
-
-        if (isset($GLOBALS['ajax_request'])
-            && $GLOBALS['ajax_request'] == true
-        ) {
-            $response = PMA\libraries\Response::getInstance();
-            $response->setRequestStatus($_message->isSuccess());
-            $response->addJSON('message', $_message);
-            if (!empty($sql_query)) {
-                $response->addJSON(
-                    'sql_query', PMA\libraries\Util::getMessage(null, $sql_query)
-                );
-            }
-            exit;
-        }
-    } else {
-        $_message = $result
-            ? PMA\libraries\Message::success($_message)
-            : PMA\libraries\Message::error($_message);
-    }
-
-    if (! empty($warning_messages)) {
-        $_message = new PMA\libraries\Message;
-        $_message->addMessages($warning_messages);
-        $_message->isError(true);
-        if (isset($GLOBALS['ajax_request'])
-            && $GLOBALS['ajax_request'] == true
-        ) {
-            $response = PMA\libraries\Response::getInstance();
-            $response->setRequestStatus(false);
-            $response->addJSON('message', $_message);
-            if (!empty($sql_query)) {
-                $response->addJSON(
-                    'sql_query', PMA\libraries\Util::getMessage(null, $sql_query)
-                );
-            }
-            exit;
-        }
-        unset($warning_messages);
-    }
-
-    if (empty($sql_query)) {
-        $response->addHTML(
-            $_message->getDisplay()
-        );
-    } else {
-        $response->addHTML(
-            PMA\libraries\Util::getMessage($_message, $sql_query)
-        );
-    }
-    unset($_message);
-}
-
-$url_params['goto']
-    = $url_params['back']
-        = 'tbl_operations.php';
-
-/**
- * Get columns names
- */
-$columns = $GLOBALS['dbi']->getColumns($GLOBALS['db'], $GLOBALS['table']);
-
-/**
- * Displays the page
- */
-$response->addHTML('<div id="boxContainer" data-box-width="300">');
-
-/**
- * Order the table
- */
-$hideOrderTable = false;
-// `ALTER TABLE ORDER BY` does not make sense for InnoDB tables that contain
-// a user-defined clustered index (PRIMARY KEY or NOT NULL UNIQUE index).
-// InnoDB always orders table rows according to such an index if one is present.
-if ($tbl_storage_engine == 'INNODB') {
-    $indexes = PMA\libraries\Index::getFromTable($GLOBALS['table'], $GLOBALS['db']);
-    foreach ($indexes as $name => $idx) {
-        if ($name == 'PRIMARY') {
-            $hideOrderTable = true;
-            break;
-        } elseif (! $idx->getNonUnique()) {
-            $notNull = true;
-            foreach ($idx->getColumns() as $column) {
-                if ($column->getNull()) {
-                    $notNull = false;
-                    break;
-                }
-            }
-            if ($notNull) {
-                $hideOrderTable = true;
-                break;
-            }
-        }
-    }
-}
-if (! $hideOrderTable) {
-    $response->addHTML(PMA_getHtmlForOrderTheTable($columns));
-}
-
-/**
- * Move table
- */
-$response->addHTML(PMA_getHtmlForMoveTable());
-
-if (mb_strstr($show_comment, '; InnoDB free') === false) {
-    if (mb_strstr($show_comment, 'InnoDB free') === false) {
-        // only user entered comment
-        $comment = $show_comment;
-    } else {
-        // here we have just InnoDB generated part
-        $comment = '';
-    }
-} else {
-    // remove InnoDB comment from end, just the minimal part (*? is non greedy)
-    $comment = preg_replace('@; InnoDB free:.*?$@', '', $show_comment);
-}
-
-// PACK_KEYS: MyISAM or ISAM
-// DELAY_KEY_WRITE, CHECKSUM, : MyISAM only
-// AUTO_INCREMENT: MyISAM and InnoDB since 5.0.3, PBXT
-
-// Here should be version check for InnoDB, however it is supported
-// in >5.0.4, >4.1.12 and >4.0.11, so I decided not to
-// check for version
-
-$response->addHTML(
-    PMA_getTableOptionDiv(
-        $comment, $tbl_collation, $tbl_storage_engine,
-        $is_myisam_or_aria, $is_isam, $create_options['pack_keys'],
-        $auto_increment,
-        (empty($create_options['delay_key_write']) ? '0' : '1'),
-        ((isset($create_options['transactional']) && $create_options['transactional'] == '0') ? '0' : '1'),
-        ((isset($create_options['page_checksum'])) ? $create_options['page_checksum'] : ''),
-        $is_innodb, $is_pbxt, $is_aria, (empty($create_options['checksum']) ? '0' : '1')
-    )
-);
-
-/**
- * Copy table
- */
-$response->addHTML(PMA_getHtmlForCopytable());
-
-/**
- * Table maintenance
- */
-$response->addHTML(
-    PMA_getHtmlForTableMaintenance(
-        $is_myisam_or_aria,
-        $is_innodb,
-        $is_berkeleydb,
-        $url_params
-    )
-);
-
-if (! (isset($db_is_system_schema) && $db_is_system_schema)) {
-    $truncate_table_url_params = array();
-    $drop_table_url_params = array();
-
-    if (! $tbl_is_view
-        && ! (isset($db_is_system_schema) && $db_is_system_schema)
-    ) {
-        $this_sql_query = 'TRUNCATE TABLE '
-            . PMA\libraries\Util::backquote($GLOBALS['table']);
-        $truncate_table_url_params = array_merge(
-            $url_params,
-            array(
-                'sql_query' => $this_sql_query,
-                'goto' => 'tbl_structure.php',
-                'reload' => '1',
-                'message_to_show' => sprintf(
-                    __('Table %s has been emptied.'),
-                    htmlspecialchars($table)
-                ),
-            )
-        );
-    }
-    if (! (isset($db_is_system_schema) && $db_is_system_schema)) {
-        $this_sql_query = 'DROP TABLE '
-            . PMA\libraries\Util::backquote($GLOBALS['table']);
-        $drop_table_url_params = array_merge(
-            $url_params,
-            array(
-                'sql_query' => $this_sql_query,
-                'goto' => 'db_operations.php',
-                'reload' => '1',
-                'purge' => '1',
-                'message_to_show' => sprintf(
-                    ($tbl_is_view
-                        ? __('View %s has been dropped.')
-                        : __('Table %s has been dropped.')
-                    ),
-                    htmlspecialchars($table)
-                ),
-                // table name is needed to avoid running
-                // PMA_relationsCleanupDatabase() on the whole db later
-                'table' => $GLOBALS['table'],
-            )
-        );
-    }
-    $response->addHTML(
-        PMA_getHtmlForDeleteDataOrTable(
-            $truncate_table_url_params,
-            $drop_table_url_params
-        )
-    );
-}
-
-if (Partition::havePartitioning()) {
-    $partition_names = Partition::getPartitionNames($db, $table);
-    // show the Partition maintenance section only if we detect a partition
-    if (! is_null($partition_names[0])) {
-        $response->addHTML(
-            PMA_getHtmlForPartitionMaintenance($partition_names, $url_params)
-        );
-    } // end if
-} // end if
-unset($partition_names);
-
-// Referential integrity check
-// The Referential integrity check was intended for the non-InnoDB
-// tables for which the relations are defined in pmadb
-// so I assume that if the current table is InnoDB, I don't display
-// this choice (InnoDB maintains integrity by itself)
-
-if ($cfgRelation['relwork'] && ! $is_innodb) {
-    $GLOBALS['dbi']->selectDb($GLOBALS['db']);
-    $foreign = PMA_getForeigners($GLOBALS['db'], $GLOBALS['table'], '', 'internal');
-
-    if (! empty($foreign)) {
-        $response->addHTML(
-            PMA_getHtmlForReferentialIntegrityCheck($foreign, $url_params)
-        );
-    } // end if ($foreign)
-
-} // end  if (!empty($cfg['Server']['relation']))
-
-$response->addHTML('</div>');
diff --git a/#pma/tbl_recent_favorite.php b/#pma/tbl_recent_favorite.php
deleted file mode 100644
index ba292a4a..00000000
--- a/#pma/tbl_recent_favorite.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Browse recent and favourite tables chosen from navigation
- *
- * @package PhpMyAdmin
- */
-
-use PMA\libraries\RecentFavoriteTable;
-
-require_once 'libraries/common.inc.php';
-
-RecentFavoriteTable::getInstance('recent')
-    ->removeIfInvalid($_REQUEST['db'], $_REQUEST['table']);
-
-RecentFavoriteTable::getInstance('favorite')
-    ->removeIfInvalid($_REQUEST['db'], $_REQUEST['table']);
-
-require 'sql.php';
diff --git a/#pma/tbl_relation.php b/#pma/tbl_relation.php
deleted file mode 100644
index f2f1a3bd..00000000
--- a/#pma/tbl_relation.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Display table relations for viewing and editing
- *
- * includes phpMyAdmin relations and InnoDB relations
- *
- * @todo fix name handling: currently names with dots (.) are not properly handled
- * for internal relations (but foreign keys relations are correct)
- * @todo foreign key constraints require both fields being of equal type and size
- * @todo check foreign fields to be from same type and size, all other makes no sense
- * @todo if above todos are fullfilled we can add all fields meet requirements
- * in the select dropdown
- * @package PhpMyAdmin
- */
-
-/**
- * Get the TableRelationController
- */
-namespace PMA;
-
-use PMA\libraries\controllers\table\TableRelationController;
-use PMA\libraries\Response;
-use PMA\libraries\Table;
-use PMA\libraries\Util;
-
-require_once 'libraries/common.inc.php';
-
-$container = libraries\di\Container::getDefaultContainer();
-$container->factory('PMA\libraries\controllers\table\TableRelationController');
-$container->alias(
-    'TableRelationController',
-    'PMA\libraries\controllers\table\TableRelationController'
-);
-$container->set('PMA\libraries\Response', Response::getInstance());
-$container->alias('response', 'PMA\libraries\Response');
-
-/* Define dependencies for the concerned controller */
-$db = $container->get('db');
-$table = $container->get('table');
-$dbi = $container->get('dbi');
-$options_array = array(
-    'CASCADE' => 'CASCADE',
-    'SET_NULL' => 'SET NULL',
-    'NO_ACTION' => 'NO ACTION',
-    'RESTRICT' => 'RESTRICT',
-);
-$cfgRelation = PMA_getRelationsParam();
-$tbl_storage_engine = mb_strtoupper(
-    $dbi->getTable($db, $table)->getStatusInfo('Engine')
-);
-$upd_query = new Table($table, $db, $dbi);
-
-$dependency_definitions = array(
-    "options_array" => $options_array,
-    "cfgRelation" => $cfgRelation,
-    "tbl_storage_engine" => $tbl_storage_engine,
-    "upd_query" => $upd_query
-);
-if ($cfgRelation['relwork']) {
-    $dependency_definitions['existrel'] = PMA_getForeigners(
-        $db, $table, '', 'internal'
-    );
-}
-if (Util::isForeignKeySupported($tbl_storage_engine)) {
-    $dependency_definitions['existrel_foreign'] = PMA_getForeigners(
-        $db, $table, '', 'foreign'
-    );
-}
-if ($cfgRelation['displaywork']) {
-    $dependency_definitions['disp'] = PMA_getDisplayField($db, $table);
-} else {
-    $dependency_definitions['disp'] = 'asas';
-}
-
-/** @var TableRelationController $controller */
-$controller = $container->get('TableRelationController', $dependency_definitions);
-$controller->indexAction();
diff --git a/#pma/tbl_replace.php b/#pma/tbl_replace.php
deleted file mode 100644
index 668d2c3b..00000000
--- a/#pma/tbl_replace.php
+++ /dev/null
@@ -1,474 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Manipulation of table data like inserting, replacing and updating
- *
- * Usually called as form action from tbl_change.php to insert or update table rows
- *
- * @todo 'edit_next' tends to not work as expected if used ...
- * at least there is no order by it needs the original query
- * and the row number and than replace the LIMIT clause
- *
- * @package PhpMyAdmin
- */
-use PMA\libraries\plugins\IOTransformationsPlugin;
-use PMA\libraries\Table;
-
-/**
- * Gets some core libraries
- */
-require_once 'libraries/common.inc.php';
-
-/**
- * functions implementation for this script
- */
-require_once 'libraries/insert_edit.lib.php';
-require_once 'libraries/transformations.lib.php';
-
-// Check parameters
-PMA\libraries\Util::checkParameters(array('db', 'table', 'goto'));
-
-$GLOBALS['dbi']->selectDb($GLOBALS['db']);
-
-/**
- * Initializes some variables
- */
-$goto_include = false;
-
-$response = PMA\libraries\Response::getInstance();
-$header = $response->getHeader();
-$scripts = $header->getScripts();
-$scripts->addFile('makegrid.js');
-// Needed for generation of Inline Edit anchors
-$scripts->addFile('sql.js');
-$scripts->addFile('indexes.js');
-$scripts->addFile('gis_data_editor.js');
-
-// check whether insert row mode, if so include tbl_change.php
-PMA_isInsertRow();
-
-$after_insert_actions = array('new_insert', 'same_insert', 'edit_next');
-if (isset($_REQUEST['after_insert'])
-    && in_array($_REQUEST['after_insert'], $after_insert_actions)
-) {
-    $url_params['after_insert'] = $_REQUEST['after_insert'];
-    if (isset($_REQUEST['where_clause'])) {
-        foreach ($_REQUEST['where_clause'] as $one_where_clause) {
-            if ($_REQUEST['after_insert'] == 'same_insert') {
-                $url_params['where_clause'][] = $one_where_clause;
-            } elseif ($_REQUEST['after_insert'] == 'edit_next') {
-                PMA_setSessionForEditNext($one_where_clause);
-            }
-        }
-    }
-}
-//get $goto_include for different cases
-$goto_include = PMA_getGotoInclude($goto_include);
-
-// Defines the url to return in case of failure of the query
-$err_url = PMA_getErrorUrl($url_params);
-
-/**
- * Prepares the update/insert of a row
- */
-list($loop_array, $using_key, $is_insert, $is_insertignore)
-    = PMA_getParamsForUpdateOrInsert();
-
-$query = array();
-$value_sets = array();
-$func_no_param = array(
-    'CONNECTION_ID',
-    'CURRENT_USER',
-    'CURDATE',
-    'CURTIME',
-    'CURRENT_DATE',
-    'CURRENT_TIME',
-    'DATABASE',
-    'LAST_INSERT_ID',
-    'NOW',
-    'PI',
-    'RAND',
-    'SYSDATE',
-    'UNIX_TIMESTAMP',
-    'USER',
-    'UTC_DATE',
-    'UTC_TIME',
-    'UTC_TIMESTAMP',
-    'UUID',
-    'UUID_SHORT',
-    'VERSION',
-);
-$func_optional_param = array(
-    'RAND',
-    'UNIX_TIMESTAMP',
-);
-
-$gis_from_text_functions = array(
-    'GeomFromText',
-    'GeomCollFromText',
-    'LineFromText',
-    'MLineFromText',
-    'PointFromText',
-    'MPointFromText',
-    'PolyFromText',
-    'MPolyFromText',
-);
-
-$gis_from_wkb_functions = array(
-    'GeomFromWKB',
-    'GeomCollFromWKB',
-    'LineFromWKB',
-    'MLineFromWKB',
-    'PointFromWKB',
-    'MPointFromWKB',
-    'PolyFromWKB',
-    'MPolyFromWKB',
-);
-
-//if some posted fields need to be transformed.
-$mime_map = PMA_getMIME($GLOBALS['db'], $GLOBALS['table']);
-if ($mime_map === false) {
-    $mime_map = array();
-}
-
-$query_fields = array();
-$insert_errors = array();
-$row_skipped = false;
-$unsaved_values = array();
-foreach ($loop_array as $rownumber => $where_clause) {
-    // skip fields to be ignored
-    if (! $using_key && isset($_REQUEST['insert_ignore_' . $where_clause])) {
-        continue;
-    }
-
-    // Defines the SET part of the sql query
-    $query_values = array();
-
-    // Map multi-edit keys to single-level arrays, dependent on how we got the fields
-    $multi_edit_columns
-        = isset($_REQUEST['fields']['multi_edit'][$rownumber])
-        ? $_REQUEST['fields']['multi_edit'][$rownumber]
-        : array();
-    $multi_edit_columns_name
-        = isset($_REQUEST['fields_name']['multi_edit'][$rownumber])
-        ? $_REQUEST['fields_name']['multi_edit'][$rownumber]
-        : array();
-    $multi_edit_columns_prev
-        = isset($_REQUEST['fields_prev']['multi_edit'][$rownumber])
-        ? $_REQUEST['fields_prev']['multi_edit'][$rownumber]
-        : null;
-    $multi_edit_funcs
-        = isset($_REQUEST['funcs']['multi_edit'][$rownumber])
-        ? $_REQUEST['funcs']['multi_edit'][$rownumber]
-        : null;
-    $multi_edit_salt
-        = isset($_REQUEST['salt']['multi_edit'][$rownumber])
-        ? $_REQUEST['salt']['multi_edit'][$rownumber]
-        :null;
-    $multi_edit_columns_type
-        = isset($_REQUEST['fields_type']['multi_edit'][$rownumber])
-        ? $_REQUEST['fields_type']['multi_edit'][$rownumber]
-        : null;
-    $multi_edit_columns_null
-        = isset($_REQUEST['fields_null']['multi_edit'][$rownumber])
-        ? $_REQUEST['fields_null']['multi_edit'][$rownumber]
-        : null;
-    $multi_edit_columns_null_prev
-        = isset($_REQUEST['fields_null_prev']['multi_edit'][$rownumber])
-        ? $_REQUEST['fields_null_prev']['multi_edit'][$rownumber]
-        : null;
-    $multi_edit_auto_increment
-        = isset($_REQUEST['auto_increment']['multi_edit'][$rownumber])
-        ? $_REQUEST['auto_increment']['multi_edit'][$rownumber]
-        : null;
-    $multi_edit_virtual
-        = isset($_REQUEST['virtual']['multi_edit'][$rownumber])
-        ? $_REQUEST['virtual']['multi_edit'][$rownumber]
-        : null;
-
-    // When a select field is nullified, it's not present in $_REQUEST
-    // so initialize it; this way, the foreach($multi_edit_columns) will process it
-    foreach ($multi_edit_columns_name as $key => $val) {
-        if (! isset($multi_edit_columns[$key])) {
-            $multi_edit_columns[$key] = '';
-        }
-    }
-
-    // Iterate in the order of $multi_edit_columns_name,
-    // not $multi_edit_columns, to avoid problems
-    // when inserting multiple entries
-    $insert_fail = false;
-    foreach ($multi_edit_columns_name as $key => $column_name) {
-        $current_value = $multi_edit_columns[$key];
-        // Note: $key is an md5 of the fieldname. The actual fieldname is
-        // available in $multi_edit_columns_name[$key]
-
-        $file_to_insert = new PMA\libraries\File();
-        $file_to_insert->checkTblChangeForm($key, $rownumber);
-
-        $possibly_uploaded_val = $file_to_insert->getContent();
-        if ($possibly_uploaded_val !== false) {
-            $current_value = $possibly_uploaded_val;
-        }
-        // Apply Input Transformation if defined
-        if (!empty($mime_map[$column_name])
-            && !empty($mime_map[$column_name]['input_transformation'])
-        ) {
-            $filename = 'libraries/plugins/transformations/'
-                . $mime_map[$column_name]['input_transformation'];
-            if (is_file($filename)) {
-                include_once $filename;
-                $classname = PMA_getTransformationClassName($filename);
-                /** @var IOTransformationsPlugin $transformation_plugin */
-                $transformation_plugin = new $classname();
-                $transformation_options = PMA_Transformation_getOptions(
-                    $mime_map[$column_name]['input_transformation_options']
-                );
-                $current_value = $transformation_plugin->applyTransformation(
-                    $current_value, $transformation_options
-                );
-                // check if transformation was successful or not
-                // and accordingly set error messages & insert_fail
-                if (method_exists($transformation_plugin, 'isSuccess')
-                    && !$transformation_plugin->isSuccess()
-                ) {
-                    $insert_fail = true;
-                    $row_skipped = true;
-                    $insert_errors[] = sprintf(
-                        __('Row: %1$s, Column: %2$s, Error: %3$s'),
-                        $rownumber, $column_name,
-                        $transformation_plugin->getError()
-                    );
-                }
-            }
-        }
-
-        if ($file_to_insert->isError()) {
-            $insert_errors[] = $file_to_insert->getError();
-        }
-        // delete $file_to_insert temporary variable
-        $file_to_insert->cleanUp();
-
-        $current_value = PMA_getCurrentValueForDifferentTypes(
-            $possibly_uploaded_val, $key, $multi_edit_columns_type,
-            $current_value, $multi_edit_auto_increment,
-            $rownumber, $multi_edit_columns_name, $multi_edit_columns_null,
-            $multi_edit_columns_null_prev, $is_insert,
-            $using_key, $where_clause, $table, $multi_edit_funcs
-        );
-
-        $current_value_as_an_array = PMA_getCurrentValueAsAnArrayForMultipleEdit(
-            $multi_edit_funcs,
-            $multi_edit_salt, $gis_from_text_functions, $current_value,
-            $gis_from_wkb_functions, $func_optional_param, $func_no_param, $key
-        );
-
-        if (! isset($multi_edit_virtual) || ! isset($multi_edit_virtual[$key])) {
-            list($query_values, $query_fields)
-                = PMA_getQueryValuesForInsertAndUpdateInMultipleEdit(
-                    $multi_edit_columns_name, $multi_edit_columns_null, $current_value,
-                    $multi_edit_columns_prev, $multi_edit_funcs, $is_insert,
-                    $query_values, $query_fields, $current_value_as_an_array,
-                    $value_sets, $key, $multi_edit_columns_null_prev
-                );
-        }
-        if (isset($multi_edit_columns_null[$key])) {
-            $multi_edit_columns[$key] = null;
-        }
-    } //end of foreach
-
-    // temporarily store rows not inserted
-    // so that they can be populated again.
-    if ($insert_fail) {
-        $unsaved_values[$rownumber] = $multi_edit_columns;
-    }
-    if (!$insert_fail && count($query_values) > 0) {
-        if ($is_insert) {
-            $value_sets[] = implode(', ', $query_values);
-        } else {
-            // build update query
-            $query[] = 'UPDATE ' . PMA\libraries\Util::backquote($GLOBALS['table'])
-                . ' SET ' . implode(', ', $query_values)
-                . ' WHERE ' . $where_clause
-                . ($_REQUEST['clause_is_unique'] ? '' : ' LIMIT 1');
-        }
-    }
-} // end foreach ($loop_array as $where_clause)
-unset(
-    $multi_edit_columns_name, $multi_edit_columns_prev, $multi_edit_funcs,
-    $multi_edit_columns_type, $multi_edit_columns_null, $func_no_param,
-    $multi_edit_auto_increment, $current_value_as_an_array, $key, $current_value,
-    $loop_array, $where_clause, $using_key,  $multi_edit_columns_null_prev,
-    $insert_fail
-);
-
-// Builds the sql query
-if ($is_insert && count($value_sets) > 0) {
-    $query = PMA_buildSqlQuery($is_insertignore, $query_fields, $value_sets);
-} elseif (empty($query) && ! isset($_REQUEST['preview_sql']) && !$row_skipped) {
-    // No change -> move back to the calling script
-    //
-    // Note: logic passes here for inline edit
-    $message = PMA\libraries\Message::success(__('No change'));
-    $active_page = $goto_include;
-    include '' . PMA_securePath($goto_include);
-    exit;
-}
-unset($multi_edit_columns, $is_insertignore);
-
-// If there is a request for SQL previewing.
-if (isset($_REQUEST['preview_sql'])) {
-    PMA_previewSQL($query);
-}
-
-/**
- * Executes the sql query and get the result, then move back to the calling
- * page
- */
-list ($url_params, $total_affected_rows, $last_messages, $warning_messages,
-    $error_messages, $return_to_sql_query)
-        = PMA_executeSqlQuery($url_params, $query);
-
-if ($is_insert && (count($value_sets) > 0 || $row_skipped)) {
-    $message = PMA\libraries\Message::getMessageForInsertedRows(
-        $total_affected_rows
-    );
-    $unsaved_values = array_values($unsaved_values);
-} else {
-    $message = PMA\libraries\Message::getMessageForAffectedRows(
-        $total_affected_rows
-    );
-}
-if ($row_skipped) {
-    $goto_include = 'tbl_change.php';
-    $message->addMessages($insert_errors, '<br />');
-    $message->isError(true);
-}
-
-$message->addMessages($last_messages, '<br />');
-
-if (! empty($warning_messages)) {
-    $message->addMessages($warning_messages, '<br />');
-    $message->isError(true);
-}
-if (! empty($error_messages)) {
-    $message->addMessages($error_messages);
-    $message->isError(true);
-}
-unset(
-    $error_messages, $warning_messages, $total_affected_rows,
-    $last_messages, $last_message, $row_skipped, $insert_errors
-);
-
-/**
- * The following section only applies to grid editing.
- * However, verifying isAjax() is not enough to ensure we are coming from
- * grid editing. If we are coming from the Edit or Copy link in Browse mode,
- * ajax_page_request is present in the POST parameters.
- */
-if ($response->isAjax() && ! isset($_POST['ajax_page_request'])) {
-    /**
-     * If we are in grid editing, we need to process the relational and
-     * transformed fields, if they were edited. After that, output the correct
-     * link/transformed value and exit
-     *
-     * Logic taken from libraries/DisplayResults.php
-     */
-
-    if (isset($_REQUEST['rel_fields_list']) && $_REQUEST['rel_fields_list'] != '') {
-
-        $map = PMA_getForeigners($db, $table, '', 'both');
-
-        $relation_fields = array();
-        parse_str($_REQUEST['rel_fields_list'], $relation_fields);
-
-        // loop for each relation cell
-        /** @var array $relation_fields */
-        foreach ($relation_fields as $cell_index => $curr_rel_field) {
-            foreach ($curr_rel_field as $relation_field => $relation_field_value) {
-                $where_comparison = "='" . $relation_field_value . "'";
-                $dispval = PMA_getDisplayValueForForeignTableColumn(
-                    $where_comparison, $map, $relation_field
-                );
-
-                $extra_data['relations'][$cell_index]
-                    = PMA_getLinkForRelationalDisplayField(
-                        $map, $relation_field, $where_comparison,
-                        $dispval, $relation_field_value
-                    );
-            }
-        }   // end of loop for each relation cell
-    }
-    if (isset($_REQUEST['do_transformations'])
-        && $_REQUEST['do_transformations'] == true
-    ) {
-        $edited_values = array();
-        parse_str($_REQUEST['transform_fields_list'], $edited_values);
-
-        if (! isset($extra_data)) {
-            $extra_data = array();
-        }
-        $transformation_types = array(
-            "input_transformation",
-            "transformation"
-        );
-        foreach ($mime_map as $transformation) {
-            $column_name = $transformation['column_name'];
-            foreach ($transformation_types as $type) {
-                $file = PMA_securePath($transformation[$type]);
-                $extra_data = PMA_transformEditedValues(
-                    $db, $table, $transformation, $edited_values, $file,
-                    $column_name, $extra_data, $type
-                );
-            }
-        }   // end of loop for each $mime_map
-    }
-
-    // Need to check the inline edited value can be truncated by MySQL
-    // without informing while saving
-    $column_name = $_REQUEST['fields_name']['multi_edit'][0][0];
-
-    PMA_verifyWhetherValueCanBeTruncatedAndAppendExtraData(
-        $db, $table, $column_name, $extra_data
-    );
-
-    /**Get the total row count of the table*/
-    $_table = new Table($_REQUEST['table'], $_REQUEST['db']);
-    $extra_data['row_count'] = $_table->countRecords();
-
-    $extra_data['sql_query']
-        = PMA\libraries\Util::getMessage($message, $GLOBALS['display_query']);
-
-    $response = PMA\libraries\Response::getInstance();
-    $response->setRequestStatus($message->isSuccess());
-    $response->addJSON('message', $message);
-    $response->addJSON($extra_data);
-    exit;
-}
-
-if (! empty($return_to_sql_query)) {
-    $disp_query = $GLOBALS['sql_query'];
-    $disp_message = $message;
-    unset($message);
-    $GLOBALS['sql_query'] = $return_to_sql_query;
-}
-
-$scripts->addFile('tbl_change.js');
-$scripts->addFile('big_ints.js');
-
-$active_page = $goto_include;
-
-/**
- * If user asked for "and then Insert another new row" we have to remove
- * WHERE clause information so that tbl_change.php does not go back
- * to the current record
- */
-if (isset($_REQUEST['after_insert']) && 'new_insert' == $_REQUEST['after_insert']) {
-    unset($_REQUEST['where_clause']);
-}
-
-/**
- * Load target page.
- */
-require '' . PMA_securePath($goto_include);
-exit;
diff --git a/#pma/tbl_row_action.php b/#pma/tbl_row_action.php
deleted file mode 100644
index 6deca0ef..00000000
--- a/#pma/tbl_row_action.php
+++ /dev/null
@@ -1,174 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * handle row specific actions like edit, delete, export
- *
- * @package PhpMyAdmin
- */
-
-/**
- *
- */
-require_once 'libraries/common.inc.php';
-require_once 'libraries/mysql_charsets.inc.php';
-require_once 'libraries/sql.lib.php';
-
-if (isset($_REQUEST['submit_mult'])) {
-    $submit_mult = $_REQUEST['submit_mult'];
-    // workaround for IE problem:
-} elseif (isset($_REQUEST['submit_mult_delete_x'])) {
-    $submit_mult = 'row_delete';
-} elseif (isset($_REQUEST['submit_mult_change_x'])) {
-    $submit_mult = 'row_edit';
-} elseif (isset($_REQUEST['submit_mult_export_x'])) {
-    $submit_mult = 'row_export';
-}
-
-// If the 'Ask for confirmation' button was pressed, this can only come
-// from 'delete' mode, so we set it straight away.
-if (isset($_REQUEST['mult_btn'])) {
-    $submit_mult = 'row_delete';
-}
-
-if (! isset($submit_mult)) {
-    $submit_mult = 'row_edit';
-}
-
-switch($submit_mult) {
-case 'row_delete':
-case 'row_edit':
-case 'row_copy':
-case 'row_export':
-    // leave as is
-    break;
-
-case 'export':
-    $submit_mult = 'row_export';
-    break;
-
-case 'delete':
-    $submit_mult = 'row_delete';
-    break;
-
-case 'copy':
-    $submit_mult = 'row_copy';
-    break;
-
-case 'edit':
-default:
-    $submit_mult = 'row_edit';
-    break;
-}
-
-if (!empty($submit_mult)) {
-
-    if (isset($_REQUEST['goto'])
-        && (! isset($_REQUEST['rows_to_delete'])
-        || ! is_array($_REQUEST['rows_to_delete']))
-    ) {
-        $response = PMA\libraries\Response::getInstance();
-        $response->setRequestStatus(false);
-        $response->addJSON('message', __('No row selected.'));
-    }
-
-    switch($submit_mult) {
-    /** @noinspection PhpMissingBreakStatementInspection */
-    case 'row_copy':
-        $_REQUEST['default_action'] = 'insert';
-        // no break to allow for fallthough
-    case 'row_edit':
-        // As we got the rows to be edited from the
-        // 'rows_to_delete' checkbox, we use the index of it as the
-        // indicating WHERE clause. Then we build the array which is used
-        // for the tbl_change.php script.
-        $where_clause = array();
-        if (isset($_REQUEST['rows_to_delete'])
-            && is_array($_REQUEST['rows_to_delete'])
-        ) {
-            foreach ($_REQUEST['rows_to_delete'] as $i => $i_where_clause) {
-                $where_clause[] = $i_where_clause;
-            }
-        }
-        $active_page = 'tbl_change.php';
-        include 'tbl_change.php';
-        break;
-
-    case 'row_export':
-        // Needed to allow SQL export
-        $single_table = true;
-
-        // As we got the rows to be exported from the
-        // 'rows_to_delete' checkbox, we use the index of it as the
-        // indicating WHERE clause. Then we build the array which is used
-        // for the tbl_change.php script.
-        $where_clause = array();
-        if (isset($_REQUEST['rows_to_delete'])
-            && is_array($_REQUEST['rows_to_delete'])
-        ) {
-            foreach ($_REQUEST['rows_to_delete'] as $i => $i_where_clause) {
-                $where_clause[] = $i_where_clause;
-            }
-        }
-        $active_page = 'tbl_export.php';
-        include 'tbl_export.php';
-        break;
-
-    case 'row_delete':
-    default:
-        $action = 'tbl_row_action.php';
-        $err_url = 'tbl_row_action.php'
-            . PMA_URL_getCommon($GLOBALS['url_params']);
-        if (! isset($_REQUEST['mult_btn'])) {
-            $original_sql_query = $sql_query;
-            if (! empty($url_query)) {
-                $original_url_query = $url_query;
-            }
-        }
-        include 'libraries/mult_submits.inc.php';
-        $_url_params = $GLOBALS['url_params'];
-        $_url_params['goto'] = 'tbl_sql.php';
-        $url_query = PMA_URL_getCommon($_url_params);
-
-
-        /**
-         * Show result of multi submit operation
-         */
-        // sql_query is not set when user does not confirm multi-delete
-        if ((! empty($submit_mult) || isset($_REQUEST['mult_btn']))
-            && ! empty($sql_query)
-        ) {
-            $disp_message = __('Your SQL query has been executed successfully.');
-            $disp_query = $sql_query;
-        }
-
-        if (isset($original_sql_query)) {
-            $sql_query = $original_sql_query;
-        }
-
-        if (isset($original_url_query)) {
-            $url_query = $original_url_query;
-        }
-
-        $active_page = 'sql.php';
-        PMA_executeQueryAndSendQueryResponse(
-            null, // analyzed_sql_results
-            false, // is_gotofile
-            $db, // db
-            $table, // table
-            null, // find_real_end
-            null, // sql_query_for_bookmark
-            null, // extra_data
-            null, // message_to_show
-            null, // message
-            null, // sql_data
-            $goto, // goto
-            $pmaThemeImage, // pmaThemeImage
-            null, // disp_query
-            null, // disp_message
-            null, // query_type
-            $sql_query, // sql_query
-            null, // selectedTables
-            null // complete_query
-        );
-    }
-}
diff --git a/#pma/tbl_select.php b/#pma/tbl_select.php
deleted file mode 100644
index 0c55d77a..00000000
--- a/#pma/tbl_select.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Handles table search tab
- *
- * display table search form, create SQL query from form data
- * and call PMA_executeQueryAndSendQueryResponse() to execute it
- *
- * @package PhpMyAdmin
- */
-
-/**
- * Gets some core libraries
- */
-require_once 'libraries/common.inc.php';
-require_once 'libraries/tbl_common.inc.php';
-require_once 'libraries/tbl_info.inc.php';
-
-use PMA\libraries\controllers\table\TableSearchController;
-
-$container = \PMA\libraries\di\Container::getDefaultContainer();
-$container->factory('PMA\libraries\controllers\table\TableSearchController');
-$container->alias(
-    'TableSearchController', 'PMA\libraries\controllers\table\TableSearchController'
-);
-$container->set('PMA\libraries\Response', PMA\libraries\Response::getInstance());
-$container->alias('response', 'PMA\libraries\Response');
-
-/* Define dependencies for the concerned controller */
-$dependency_definitions = array(
-    'searchType' => 'normal',
-    'url_query' => &$url_query
-);
-
-/** @var TableSearchController $controller */
-$controller = $container->get('TableSearchController', $dependency_definitions);
-$controller->indexAction();
diff --git a/#pma/tbl_sql.php b/#pma/tbl_sql.php
deleted file mode 100644
index 764cf72d..00000000
--- a/#pma/tbl_sql.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Table SQL executor
- *
- * @package PhpMyAdmin
- */
-use PMA\libraries\config\PageSettings;
-
-/**
- *
- */
-require_once 'libraries/common.inc.php';
-require_once 'libraries/config/user_preferences.forms.php';
-require_once 'libraries/config/page_settings.forms.php';
-
-PageSettings::showGroup('Sql_queries');
-
-/**
- * Runs common work
- */
-$response = PMA\libraries\Response::getInstance();
-$header   = $response->getHeader();
-$scripts  = $header->getScripts();
-$scripts->addFile('makegrid.js');
-$scripts->addFile('jquery/jquery.uitablefilter.js');
-$scripts->addFile('sql.js');
-
-require 'libraries/tbl_common.inc.php';
-$url_query .= '&amp;goto=tbl_sql.php&amp;back=tbl_sql.php';
-
-require_once 'libraries/sql_query_form.lib.php';
-
-$err_url   = 'tbl_sql.php' . $err_url;
-// After a syntax error, we return to this script
-// with the typed query in the textarea.
-$goto = 'tbl_sql.php';
-$back = 'tbl_sql.php';
-
-/**
- * Get table information
- */
-require_once 'libraries/tbl_info.inc.php';
-
-/**
- * Query box, bookmark, insert data from textfile
- */
-$response->addHTML(
-    PMA_getHtmlForSqlQueryForm(
-        true, false,
-        isset($_REQUEST['delimiter'])
-        ? htmlspecialchars($_REQUEST['delimiter'])
-        : ';'
-    )
-);
diff --git a/#pma/tbl_structure.php b/#pma/tbl_structure.php
deleted file mode 100644
index 7932cc09..00000000
--- a/#pma/tbl_structure.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Displays table structure infos like columns, indexes, size, rows
- * and allows manipulation of indexes and columns
- *
- * @package PhpMyAdmin
- */
-
-namespace PMA;
-
-use PMA\libraries\controllers\table\TableStructureController;
-use PMA\libraries\Response;
-
-require_once 'libraries/common.inc.php';
-require_once 'libraries/tbl_info.inc.php';
-require_once 'libraries/mysql_charsets.inc.php';
-require_once 'libraries/bookmark.lib.php';
-require_once 'libraries/config/messages.inc.php';
-require_once 'libraries/config/user_preferences.forms.php';
-require_once 'libraries/config/page_settings.forms.php';
-
-$container = libraries\di\Container::getDefaultContainer();
-$container->factory('PMA\libraries\controllers\table\TableStructureController');
-$container->alias(
-    'TableStructureController',
-    'PMA\libraries\controllers\table\TableStructureController'
-);
-$container->set('PMA\libraries\Response', Response::getInstance());
-$container->alias('response', 'PMA\libraries\Response');
-
-global $db, $table, $db_is_system_schema, $tbl_is_view, $tbl_storage_engine,
-    $table_info_num_rows, $tbl_collation, $showtable;
-/* Define dependencies for the concerned controller */
-$dependency_definitions = array(
-    'db' => $db,
-    'table' => $table,
-    'url_query' => &$GLOBALS['url_query'],
-    'db_is_system_schema' => $db_is_system_schema,
-    'tbl_is_view' => $tbl_is_view,
-    'tbl_storage_engine' => $tbl_storage_engine,
-    'table_info_num_rows' => $table_info_num_rows,
-    'tbl_collation' => $tbl_collation,
-    'showtable' => $showtable
-);
-
-/** @var TableStructureController $controller */
-$controller = $container->get('TableStructureController', $dependency_definitions);
-$controller->indexAction();
diff --git a/#pma/tbl_tracking.php b/#pma/tbl_tracking.php
deleted file mode 100644
index f4e23c42..00000000
--- a/#pma/tbl_tracking.php
+++ /dev/null
@@ -1,210 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Table tracking page
- *
- * @package PhpMyAdmin
- */
-
-// Run common work
-use PMA\libraries\Tracker;
-
-require_once './libraries/common.inc.php';
-
-require_once './libraries/tracking.lib.php';
-
-//Get some js files needed for Ajax requests
-$response = PMA\libraries\Response::getInstance();
-$header   = $response->getHeader();
-$scripts  = $header->getScripts();
-$scripts->addFile('jquery/jquery.tablesorter.js');
-$scripts->addFile('tbl_tracking.js');
-
-define('TABLE_MAY_BE_ABSENT', true);
-require './libraries/tbl_common.inc.php';
-
-if (Tracker::isActive()
-    && Tracker::isTracked($GLOBALS["db"], $GLOBALS["table"])
-    && ! (isset($_REQUEST['toggle_activation'])
-    && $_REQUEST['toggle_activation'] == 'deactivate_now')
-    && ! (isset($_REQUEST['report_export'])
-    && $_REQUEST['export_type'] == 'sqldumpfile')
-) {
-    $msg = PMA\libraries\Message::notice(
-        sprintf(
-            __('Tracking of %s is activated.'),
-            htmlspecialchars($GLOBALS["db"] . '.' . $GLOBALS["table"])
-        )
-    );
-    PMA\libraries\Response::getInstance()->addHTML($msg->getDisplay());
-}
-
-$url_query .= '&amp;goto=tbl_tracking.php&amp;back=tbl_tracking.php';
-$url_params['goto'] = 'tbl_tracking.php';
-$url_params['back'] = 'tbl_tracking.php';
-
-// Init vars for tracking report
-if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) {
-    $data = Tracker::getTrackedData(
-        $_REQUEST['db'], $_REQUEST['table'], $_REQUEST['version']
-    );
-
-    $selection_schema = false;
-    $selection_data   = false;
-    $selection_both  = false;
-
-    if (! isset($_REQUEST['logtype'])) {
-        $_REQUEST['logtype'] = 'schema_and_data';
-    }
-    if ($_REQUEST['logtype'] == 'schema') {
-        $selection_schema = true;
-    } elseif ($_REQUEST['logtype'] == 'data') {
-        $selection_data   = true;
-    } else {
-        $selection_both   = true;
-    }
-    if (! isset($_REQUEST['date_from'])) {
-        $_REQUEST['date_from'] = $data['date_from'];
-    }
-    if (! isset($_REQUEST['date_to'])) {
-        $_REQUEST['date_to'] = $data['date_to'];
-    }
-    if (! isset($_REQUEST['users'])) {
-        $_REQUEST['users'] = '*';
-    }
-    $filter_ts_from = strtotime($_REQUEST['date_from']);
-    $filter_ts_to   = strtotime($_REQUEST['date_to']);
-    $filter_users   = array_map('trim', explode(',', $_REQUEST['users']));
-}
-
-// Prepare export
-if (isset($_REQUEST['report_export'])) {
-    $entries = PMA_getEntries($data, $filter_ts_from, $filter_ts_to, $filter_users);
-}
-
-// Export as file download
-if (isset($_REQUEST['report_export'])
-    && $_REQUEST['export_type'] == 'sqldumpfile'
-) {
-    PMA_exportAsFileDownload($entries);
-}
-
-$html = '<br />';
-
-/**
- * Actions
- */
-if (isset($_REQUEST['submit_mult'])) {
-    if (! empty($_REQUEST['selected_versions'])) {
-        if ($_REQUEST['submit_mult'] == 'delete_version') {
-            foreach ($_REQUEST['selected_versions'] as $version) {
-                PMA_deleteTrackingVersion($version);
-            }
-            $html .= PMA\libraries\Message::success(
-                __('Tracking versions deleted successfully.')
-            )->getDisplay();
-        }
-    } else {
-        $html .= PMA\libraries\Message::notice(
-            __('No versions selected.')
-        )->getDisplay();
-    }
-}
-
-if (isset($_REQUEST['submit_delete_version'])) {
-    $html .= PMA_deleteTrackingVersion($_REQUEST['version']);
-}
-
-// Create tracking version
-if (isset($_REQUEST['submit_create_version'])) {
-    $html .= PMA_createTrackingVersion();
-}
-
-// Deactivate tracking
-if (isset($_REQUEST['toggle_activation'])
-    && $_REQUEST['toggle_activation'] == 'deactivate_now'
-) {
-    $html .= PMA_changeTracking('deactivate');
-}
-
-// Activate tracking
-if (isset($_REQUEST['toggle_activation'])
-    && $_REQUEST['toggle_activation'] == 'activate_now'
-) {
-    $html .= PMA_changeTracking('activate');
-}
-
-// Export as SQL execution
-if (isset($_REQUEST['report_export']) && $_REQUEST['export_type'] == 'execution') {
-    $sql_result = PMA_exportAsSQLExecution($entries);
-    $msg = PMA\libraries\Message::success(__('SQL statements executed.'));
-    $html .= $msg->getDisplay();
-}
-
-// Export as SQL dump
-if (isset($_REQUEST['report_export']) && $_REQUEST['export_type'] == 'sqldump') {
-    $html .= PMA_exportAsSQLDump($entries);
-}
-
-/*
- * Schema snapshot
- */
-if (isset($_REQUEST['snapshot'])) {
-    $html .= PMA_getHtmlForSchemaSnapshot($url_query);
-}
-// end of snapshot report
-
-/*
- *  Tracking report
- */
-if (isset($_REQUEST['report'])
-    && (isset($_REQUEST['delete_ddlog']) || isset($_REQUEST['delete_dmlog']))
-) {
-    $html .= PMA_deleteTrackingReportRows($data);
-}
-
-if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) {
-    $html .= PMA_getHtmlForTrackingReport(
-        $url_query, $data, $url_params, $selection_schema, $selection_data,
-        $selection_both, $filter_ts_to, $filter_ts_from, $filter_users
-    );
-} // end of report
-
-
-/*
- * List selectable tables
- */
-$selectable_tables_sql_result = PMA_getSQLResultForSelectableTables();
-if ($GLOBALS['dbi']->numRows($selectable_tables_sql_result) > 0) {
-    $html .= PMA_getHtmlForSelectableTables(
-        $selectable_tables_sql_result, $url_query
-    );
-}
-$html .= '<br />';
-
-/*
- * List versions of current table
- */
-$sql_result = PMA_getListOfVersionsOfTable();
-$last_version = PMA_getTableLastVersionNumber($sql_result);
-if ($last_version > 0) {
-    $html .= PMA_getHtmlForTableVersionDetails(
-        $sql_result, $last_version, $url_params,
-        $url_query, $pmaThemeImage, $text_dir
-    );
-}
-
-$type = $GLOBALS['dbi']->getTable($GLOBALS['db'], $GLOBALS['table'])
-    ->isView() ? 'view' : 'table';
-$html .= PMA_getHtmlForDataDefinitionAndManipulationStatements(
-    'tbl_tracking.php' . $url_query,
-    $last_version,
-    $GLOBALS['db'],
-    array($GLOBALS['table']),
-    $type
-);
-
-$html .= '<br class="clearfloat"/>';
-
-$response = PMA\libraries\Response::getInstance();
-$response->addHTML($html);
diff --git a/#pma/tbl_triggers.php b/#pma/tbl_triggers.php
deleted file mode 100644
index d96c922b..00000000
--- a/#pma/tbl_triggers.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Triggers management.
- *
- * @package PhpMyAdmin
- */
-
-require_once './db_triggers.php';
diff --git a/#pma/tbl_zoom_select.php b/#pma/tbl_zoom_select.php
deleted file mode 100644
index d3be0762..00000000
--- a/#pma/tbl_zoom_select.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Handles table zoom search tab
- *
- * display table zoom search form, create SQL queries from form data
- *
- * @package PhpMyAdmin
- */
-
-/**
- * Gets some core libraries
- */
-require_once './libraries/common.inc.php';
-require_once 'libraries/tbl_common.inc.php';
-require_once 'libraries/tbl_info.inc.php';
-
-$container = \PMA\libraries\di\Container::getDefaultContainer();
-$container->factory('PMA\libraries\controllers\table\TableSearchController');
-$container->alias(
-    'TableSearchController', 'PMA\libraries\controllers\table\TableSearchController'
-);
-$container->set('PMA\libraries\Response', PMA\libraries\Response::getInstance());
-$container->alias('response', 'PMA\libraries\Response');
-
-/* Define dependencies for the concerned controller */
-$dependency_definitions = array(
-    'searchType' => 'zoom',
-    'url_query' => &$url_query
-);
-
-/** @var PMA\libraries\controllers\table\TableSearchController $controller */
-$controller = $container->get('TableSearchController', $dependency_definitions);
-$controller->indexAction();
diff --git a/#pma/templates/columns_definitions/column_adjust_privileges.phtml b/#pma/templates/columns_definitions/column_adjust_privileges.phtml
deleted file mode 100644
index 265fe9e2..00000000
--- a/#pma/templates/columns_definitions/column_adjust_privileges.phtml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php if ($privs_available) : ?>
-    <input name="field_adjust_privileges[<?= $columnNumber; ?>]"
-           id="field_<?= $columnNumber; ?>_<?= ($ci - $ci_offset); ?>"
-           checked="checked"
-           type="checkbox"
-           value="NULL"
-           class="allow_null"/>
-
-<?php else : ?>
-    <input name="field_adjust_privileges[<?= $columnNumber; ?>]"
-           id="field_<?= $columnNumber; ?>_<?= ($ci - $ci_offset); ?>"
-           disabled
-           type="checkbox"
-           value="NULL"
-           class="allow_null"
-           title="<?= __('You don\'t have sufficient privileges to perform this '
-           . 'operation; Please refer to the documentation for more details');?>"/>
-<?php endif; ?>
\ No newline at end of file
diff --git a/#pma/templates/columns_definitions/column_attribute.phtml b/#pma/templates/columns_definitions/column_attribute.phtml
deleted file mode 100644
index 9bad584b..00000000
--- a/#pma/templates/columns_definitions/column_attribute.phtml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-$attribute_types = $GLOBALS['PMA_Types']->getAttributes();
-$cnt_attribute_types = count($attribute_types);
-
-$attribute = '';
-if (isset($submit_attribute) && $submit_attribute != false) {
-    $attribute = $submit_attribute;
-} elseif (isset($columnMeta['Extra'])
-    && $columnMeta['Extra'] == 'on update CURRENT_TIMESTAMP') {
-    $attribute = 'on update CURRENT_TIMESTAMP';
-} elseif (isset($extracted_columnspec['attribute'])) {
-    $attribute = $extracted_columnspec['attribute'];
-}
-
-$attribute = mb_strtoupper($attribute);
-?>
-<select style="width: 7em;"
-        name="field_attribute[<?= $columnNumber; ?>]"
-        id="field_<?= $columnNumber; ?>_<?= ($ci - $ci_offset); ?>">
-    <?php for ($j = 0; $j < $cnt_attribute_types; $j++): ?>
-        <option value="<?= $attribute_types[$j];?>"
-                <?php if ($attribute == mb_strtoupper($attribute_types[$j])): ?>
-                    selected="selected"
-                <?php endif; ?>>
-            <?= $attribute_types[$j]; ?>
-        </option>
-    <?php endfor; ?>
-</select>
\ No newline at end of file
diff --git a/#pma/templates/columns_definitions/column_attributes.phtml b/#pma/templates/columns_definitions/column_attributes.phtml
deleted file mode 100644
index 7fc1f14c..00000000
--- a/#pma/templates/columns_definitions/column_attributes.phtml
+++ /dev/null
@@ -1,231 +0,0 @@
-<?php
-// Cell index: If certain fields get left out, the counter shouldn't change.
-$ci = 0;
-
-// Every time a cell shall be left out the STRG-jumping feature, $ci_offset
-// has to be incremented ($ci_offset++)
-$ci_offset = -1;
-?>
-
-<td class="center">
-    <!-- column name -->
-    <?= PMA\libraries\Template::get('columns_definitions/column_name')
-        ->render(array(
-            'columnNumber' => $columnNumber,
-            'ci' => $ci++,
-            'ci_offset' => $ci_offset,
-            'columnMeta' => isset($columnMeta) ? $columnMeta : null,
-            'cfgRelation' => $cfgRelation
-        )); ?>
-</td>
-<td class="center">
-    <!-- column type -->
-    <?= PMA\libraries\Template::get('columns_definitions/column_type')
-        ->render(array(
-            'columnNumber' => $columnNumber,
-            'ci' => $ci++,
-            'ci_offset' => $ci_offset,
-            'type_upper' => $type_upper,
-            'columnMeta' => isset($columnMeta) ? $columnMeta : null
-        )); ?>
-</td>
-<td class="center">
-    <!-- column length -->
-    <?= PMA\libraries\Template::get('columns_definitions/column_length')
-        ->render(array(
-            'columnNumber' => $columnNumber,
-            'ci' => $ci++,
-            'ci_offset' => $ci_offset,
-            'length_values_input_size' => $length_values_input_size,
-            'length_to_display' => $length
-        )); ?>
-</td>
-<td class="center">
-    <!-- column default -->
-    <?= PMA\libraries\Template::get('columns_definitions/column_default')
-        ->render(array(
-            'columnNumber' => $columnNumber,
-            'ci' => $ci++,
-            'ci_offset' => $ci_offset,
-            'type_upper' => isset($type_upper) ? $type_upper : null,
-            'columnMeta' => isset($columnMeta) ? $columnMeta : null
-        )); ?>
-</td>
-<td class="center">
-    <!-- column collation -->
-    <?php $tmp_collation = empty($columnMeta['Collation']) ? null : $columnMeta['Collation']; ?>
-    <?= PMA_generateCharsetDropdownBox(
-        PMA_CSDROPDOWN_COLLATION,
-        'field_collation[' . $columnNumber . ']',
-        'field_' . $columnNumber . '_' . ($ci - $ci_offset),
-        $tmp_collation,
-        false
-    ); ?>
-</td>
-<td class="center">
-    <!-- column attribute -->
-    <?= PMA\libraries\Template::get('columns_definitions/column_attribute')
-        ->render(array(
-            'columnNumber' => $columnNumber,
-            'ci' => $ci++,
-            'ci_offset' => $ci_offset,
-            'extracted_columnspec' => isset($extracted_columnspec) ? $extracted_columnspec : null,
-            'columnMeta' => isset($columnMeta) ? $columnMeta : null,
-            'submit_attribute' => isset($submit_attribute) ? $submit_attribute : null,
-        )); ?>
-</td>
-<td class="center">
-    <!-- column NULL -->
-    <?= PMA\libraries\Template::get('columns_definitions/column_null')
-        ->render(array(
-            'columnNumber' => $columnNumber,
-            'ci' => $ci++,
-            'ci_offset' => $ci_offset,
-            'columnMeta' => isset($columnMeta) ? $columnMeta : null
-        )); ?>
-</td>
-<?php if (isset($_REQUEST['change_column']) && !empty($_REQUEST['change_column'])): ?>
-    <!-- column Adjust privileges, Only for 'Edit' Column(s) -->
-    <td class="center">
-        <?php $privs_available = $GLOBALS['col_priv'] && $GLOBALS['is_reload_priv']; ?>
-        <?= PMA\libraries\Template::get('columns_definitions/column_adjust_privileges')
-            ->render(array(
-                'columnNumber' => $columnNumber,
-                'ci' => $ci++,
-                'ci_offset' => $ci_offset,
-                'privs_available' => $privs_available
-            )); ?>
-    </td>
-<?php endif; ?>
-<?php if (!$is_backup): ?>
-    <!-- column indexes, See my other comment about  this 'if'. -->
-    <td class="center">
-        <?= PMA\libraries\Template::get('columns_definitions/column_indexes')
-            ->render(array(
-                'columnNumber' => $columnNumber,
-                'ci' => $ci++,
-                'ci_offset' => $ci_offset,
-                'columnMeta' => $columnMeta
-            )); ?>
-    </td>
-<?php endif; ?>
-<td class="center">
-    <!-- column auto_increment -->
-    <?= PMA\libraries\Template::get('columns_definitions/column_auto_increment')
-        ->render(array(
-            'columnNumber' => $columnNumber,
-            'ci' => $ci++,
-            'ci_offset' => $ci_offset,
-            'columnMeta' => $columnMeta
-        )); ?>
-</td>
-<td class="center">
-    <!-- column comments -->
-    <?= PMA\libraries\Template::get('columns_definitions/column_comment')
-        ->render(array(
-            'columnNumber' => $columnNumber,
-            'ci' => $ci++,
-            'ci_offset' => $ci_offset,
-            'columnMeta' => isset($columnMeta) ? $columnMeta : null,
-            'comments_map' => $comments_map
-        )); ?>
-</td>
- <!-- column virtuality -->
-<?php if (PMA\libraries\Util::isVirtualColumnsSupported()): ?>
-    <td class="center">
-        <?= PMA\libraries\Template::get('columns_definitions/column_virtuality')
-            ->render(array(
-                'columnNumber' => $columnNumber,
-                'ci' => $ci++,
-                'ci_offset' => $ci_offset,
-                'columnMeta' => isset($columnMeta) ? $columnMeta : null
-            )); ?>
-    </td>
-<?php endif; ?>
-<!-- move column -->
-<?php if (isset($fields_meta)): ?>
-    <?php $current_index = 0;
-    for ($mi = 0, $cols = count($move_columns); $mi < $cols; $mi++) {
-        if ($move_columns[$mi]->name == $columnMeta['Field']) {
-            $current_index = $mi;
-            break;
-        }
-    } ?>
-
-    <td class="center">
-        <?= PMA\libraries\Template::get('columns_definitions/move_column')
-            ->render(array(
-                'columnNumber' => $columnNumber,
-                'ci' => $ci++,
-                'ci_offset' => $ci_offset,
-                'columnMeta' => $columnMeta,
-                'move_columns' => $move_columns,
-                'current_index' => $current_index
-            )); ?>
-    </td>
-<?php endif; ?>
-
-<?php if ($cfgRelation['mimework'] && $GLOBALS['cfg']['BrowseMIME'] && $cfgRelation['commwork']): ?>
-    <td class="center">
-        <!-- Column Mime-type -->
-        <?= PMA\libraries\Template::get('columns_definitions/mime_type')
-            ->render(array(
-                'columnNumber' => $columnNumber,
-                'ci' => $ci++,
-                'ci_offset' => $ci_offset,
-                'available_mime' => $available_mime,
-                'columnMeta' => $columnMeta,
-                'mime_map' => $mime_map
-            )); ?>
-    </td>
-    <td class="center">
-        <!-- Column Browser transformation -->
-        <?= PMA\libraries\Template::get('columns_definitions/transformation')
-            ->render(array(
-                'columnNumber' => $columnNumber,
-                'ci' => $ci++,
-                'ci_offset' => $ci_offset,
-                'available_mime' => $available_mime,
-                'columnMeta' => $columnMeta,
-                'mime_map' => $mime_map,
-                'type' => 'transformation'
-            )); ?>
-    </td>
-    <td class="center">
-        <!-- column Transformation options -->
-        <?= PMA\libraries\Template::get('columns_definitions/transformation_option')
-            ->render(array(
-                'columnNumber' => $columnNumber,
-                'ci' => $ci++,
-                'ci_offset' => $ci_offset,
-                'columnMeta' => $columnMeta,
-                'mime_map' => $mime_map,
-                'type_prefix' => '',
-            )); ?>
-    </td>
-    <td class="center">
-        <!-- Column Input transformation -->
-        <?= PMA\libraries\Template::get('columns_definitions/transformation')
-            ->render(array(
-                'columnNumber' => $columnNumber,
-                'ci' => $ci++,
-                'ci_offset' => $ci_offset,
-                'available_mime' => $available_mime,
-                'columnMeta' => $columnMeta,
-                'mime_map' => $mime_map,
-                'type' => 'input_transformation'
-            )); ?>
-    </td>
-    <td class="center">
-        <!-- column Input transformation options -->
-        <?= PMA\libraries\Template::get('columns_definitions/transformation_option')
-            ->render(array(
-                'columnNumber' => $columnNumber,
-                'ci' => $ci++,
-                'ci_offset' => $ci_offset,
-                'columnMeta' => $columnMeta,
-                'mime_map' => $mime_map,
-                'type_prefix' => 'input_',
-            )); ?>
-    </td>
-<?php endif; ?>
\ No newline at end of file
diff --git a/#pma/templates/columns_definitions/column_auto_increment.phtml b/#pma/templates/columns_definitions/column_auto_increment.phtml
deleted file mode 100644
index e688ff6e..00000000
--- a/#pma/templates/columns_definitions/column_auto_increment.phtml
+++ /dev/null
@@ -1,8 +0,0 @@
-<input name="field_extra[<?= $columnNumber; ?>]"
-       id="field_<?= $columnNumber?>_<?= ($ci - $ci_offset); ?>"
-       <?php if (isset($columnMeta['Extra'])
-                    && mb_strtolower($columnMeta['Extra']) == 'auto_increment'): ?>
-           checked="checked"
-       <?php endif; ?>
-       type="checkbox"
-       value="AUTO_INCREMENT" />
\ No newline at end of file
diff --git a/#pma/templates/columns_definitions/column_comment.phtml b/#pma/templates/columns_definitions/column_comment.phtml
deleted file mode 100644
index 3233c4e0..00000000
--- a/#pma/templates/columns_definitions/column_comment.phtml
+++ /dev/null
@@ -1,10 +0,0 @@
-<input id="field_<?= $columnNumber; ?>_<?= ($ci - $ci_offset); ?>"
-       type="text"
-       name="field_comments[<?= $columnNumber; ?>]"
-       size="12"
-       maxlength="<?= PMA_MYSQL_INT_VERSION >= 50503 ? 1024 : 255; ?>"
-       value="<?= (isset($columnMeta['Field']) && is_array($comments_map) && isset($comments_map[$columnMeta['Field']])) ?
-                htmlspecialchars($comments_map[$columnMeta['Field']])
-                : ''
-              ?>"
-       class="textfield" />
\ No newline at end of file
diff --git a/#pma/templates/columns_definitions/column_default.phtml b/#pma/templates/columns_definitions/column_default.phtml
deleted file mode 100644
index 2ef2fd9a..00000000
--- a/#pma/templates/columns_definitions/column_default.phtml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-// here we put 'NONE' as the default value of drop-down; otherwise
-// users would have problems if they forget to enter the default
-// value (example, for an INT)
-$default_options = array(
-    'NONE'              =>  _pgettext('for default', 'None'),
-    'USER_DEFINED'      =>  __('As defined:'),
-    'NULL'              => 'NULL',
-    'CURRENT_TIMESTAMP' => 'CURRENT_TIMESTAMP',
-);
-
-// for a TIMESTAMP, do not show the string "CURRENT_TIMESTAMP" as a default
-// value
-$defaultValue = '';
-if (isset($columnMeta['DefaultValue'])) {
-    $defaultValue = $columnMeta['DefaultValue'];
-}
-if ($type_upper == 'BIT') {
-    $defaultValue = PMA\libraries\Util::convertBitDefaultValue($columnMeta['DefaultValue']);
-} elseif ($type_upper == 'BINARY' || $type_upper == 'VARBINARY') {
-    $defaultValue = bin2hex($columnMeta['DefaultValue']);
-}
-?>
-
-<select name="field_default_type[<?= $columnNumber; ?>]"
-        id="field_<?= $columnNumber; ?>_<?=($ci - $ci_offset); ?>"
-        class="default_type">
-    <?php foreach ($default_options as $key => $value): ?>
-        <option value="<?= $key; ?>"
-                <?php if (isset($columnMeta['DefaultType']) && $columnMeta['DefaultType'] == $key): ?>
-                    selected="selected"
-                <?php endif; ?>>
-            <?= $value; ?>
-        </option>
-    <?php endforeach; ?>
-</select>
-<br />
-<?php if ($GLOBALS['cfg']['CharEditing'] == 'textarea'): ?>
-    <textarea name="field_default_value[<?= $columnNumber; ?>]"
-              cols="15"
-              class="textfield
-              default_value">
-        <?= htmlspecialchars($defaultValue); ?>
-    </textarea>
-<?php else: ?>
-    <input type="text"
-           name="field_default_value[<?= $columnNumber; ?>]"
-           size="12"
-           value="<?= htmlspecialchars($defaultValue); ?>"
-           class="textfield default_value" />
-<?php endif; ?>
\ No newline at end of file
diff --git a/#pma/templates/columns_definitions/column_definitions_form.phtml b/#pma/templates/columns_definitions/column_definitions_form.phtml
deleted file mode 100644
index f9e86f3a..00000000
--- a/#pma/templates/columns_definitions/column_definitions_form.phtml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?php
-use PMA\libraries\Partition;
-use PMA\libraries\StorageEngine;
-
-?>
-<form method="post"
-      action="<?= $action; ?>"
-      class="<?= ($action == 'tbl_create.php' ? 'create_table' : 'append_fields'); ?>_form ajax lock-page">
-    <?= PMA_URL_getHiddenInputs($form_params); ?>
-   <!-- happens when an index has been set on a column -->
-   <!-- and a column is added to the table creation dialog -->
-   <!-- This contains a JSON-encoded string -->
-    <input type="hidden"
-           name="primary_indexes"
-           value="<?= (! empty($_REQUEST['primary_indexes'])) ?
-                      htmlspecialchars($_REQUEST['primary_indexes'])
-                      : '[]'
-                  ?>">
-    <input type="hidden"
-           name="unique_indexes"
-           value="<?= (! empty($_REQUEST['unique_indexes'])) ?
-                      htmlspecialchars($_REQUEST['unique_indexes'])
-                      : '[]'
-                  ?>">
-    <input type="hidden"
-           name="indexes"
-           value="<?= (! empty($_REQUEST['indexes'])) ?
-                      htmlspecialchars($_REQUEST['indexes'])
-                      : '[]'
-                  ?>">
-    <input type="hidden"
-           name="fulltext_indexes"
-           value="<?= (! empty($_REQUEST['fulltext_indexes'])) ?
-                      htmlspecialchars($_REQUEST['fulltext_indexes'])
-                      : '[]'
-                  ?>">
-    <input type="hidden"
-           name="spatial_indexes"
-           value="<?= (! empty($_REQUEST['spatial_indexes'])) ?
-                      htmlspecialchars($_REQUEST['spatial_indexes'])
-                      : '[]'
-                  ?>">
-
-    <?php if ($action == 'tbl_create.php'): ?>
-        <div id="table_name_col_no_outer">
-            <table id="table_name_col_no">
-                <tr class="vmiddle floatleft">
-                    <td><?= __('Table name'); ?>:&nbsp;
-                    <input type="text"
-                           name="table"
-                           size="40"
-                           maxlength="64"
-                           value="<?= (isset($_REQUEST['table']) ? htmlspecialchars($_REQUEST['table']) : '') ?>"
-                           class="textfield" autofocus required />
-                    </td>
-                    <td>
-                        <?= __('Add'); ?>
-                        <input type="number"
-                               id="added_fields"
-                               name="added_fields"
-                               size="2"
-                               value="1"
-                               min="1"
-                               onfocus="this.select()" />
-                        <?= __('column(s)'); ?>
-                        <input type="button"
-                               name="submit_num_fields"
-                               value="<?= __('Go'); ?>" />
-                    </td>
-                </tr>
-            </table>
-        </div>
-    <?php endif; ?>
-    <?php if (is_array($content_cells)): ?>
-        <?= PMA\libraries\Template::get(
-            'columns_definitions/table_fields_definitions'
-        )->render(array(
-            'is_backup' => $is_backup,
-            'fields_meta' => $fields_meta,
-            'mimework' => $mimework,
-            'content_cells' => $content_cells
-        )); ?>
-    <?php endif; ?>
-    <?php if ($action == 'tbl_create.php'): ?>
-        <table>
-            <tr class="vtop">
-                <th>
-                    <?= __('Table comments:'); ?>
-                </th>
-                <td width="25">&nbsp;</td>
-                <th>
-                    <?= __('Collation:'); ?>
-                </th>
-                <td width="25">&nbsp;</td>
-                <th>
-                    <?= __('Storage Engine:'); ?>
-                    <?= PMA\libraries\Util::showMySQLDocu('Storage_engines'); ?>
-                </th>
-                <td width="25">&nbsp;</td>
-                <th>
-                    <?= __('Connection:'); ?>
-                    <?= PMA\libraries\Util::showMySQLDocu('federated-create-connection'); ?>
-                </th>
-            </tr>
-            <tr>
-                <td>
-                    <input type="text"
-                           name="comment"
-                           size="40"
-                           maxlength="60"
-                           value="<?= (isset($_REQUEST['comment']) ? htmlspecialchars($_REQUEST['comment']): ''); ?>"
-                           class="textfield" />
-                </td>
-                <td width="25">&nbsp;</td>
-                <td>
-                    <?= PMA_generateCharsetDropdownBox(
-                        PMA_CSDROPDOWN_COLLATION,
-                        'tbl_collation',
-                        null,
-                        isset($_REQUEST['tbl_collation']) ? $_REQUEST['tbl_collation'] : null,
-                        false
-                    ); ?>
-                </td>
-                <td width="25">&nbsp;</td>
-                <td>
-                    <?= StorageEngine::getHtmlSelect(
-                        'tbl_storage_engine',
-                        null,
-                        (isset($_REQUEST['tbl_storage_engine']) ? $_REQUEST['tbl_storage_engine'] : null)
-                    ); ?>
-                </td>
-                <td width="25">&nbsp;</td>
-                <td>
-                    <input type="text"
-                           name="connection"
-                           size="40"
-                           value="<?= (isset($_REQUEST['connection']) ? htmlspecialchars($_REQUEST['connection']) : ''); ?>"
-                           placeholder="scheme://user_name[:password]@host_name[:port_num]/db_name/tbl_name"
-                           class="textfield"
-                           required="required" />
-                </td>
-            </tr>
-            <?php if (Partition::havePartitioning()): ?>
-                <tr class="vtop">
-                    <th colspan="5">
-                        <?= __('PARTITION definition:'); ?>
-                        &nbsp;
-                        <?= PMA\libraries\Util::showMySQLDocu('Partitioning'); ?>
-                    </th>
-                </tr>
-                <tr>
-                    <td colspan="5">
-                        <?php include 'libraries/tbl_partition_definition.inc.php'; ?>
-                    </td>
-                </tr>
-            <?php endif; ?>
-        </table>
-        <br />
-    <?php endif; ?>
-    <fieldset class="tblFooters">
-        <input type="button"
-               class="preview_sql"
-               value="<?= __('Preview SQL') ?>" />
-        <input type="submit"
-               name="do_save_data"
-               value="<?= __('Save'); ?>" />
-    </fieldset>
-    <div id="properties_message">
-    </div>
-</form>
\ No newline at end of file
diff --git a/#pma/templates/columns_definitions/column_extra.phtml b/#pma/templates/columns_definitions/column_extra.phtml
deleted file mode 100644
index d39268f5..00000000
--- a/#pma/templates/columns_definitions/column_extra.phtml
+++ /dev/null
@@ -1,7 +0,0 @@
-<input name="col_extra[<?= $columnNumber;?>]"
-       id="field_<?= $columnNumber; ?>_<?= ($ci - $ci_offset); ?>"
-       <?php if (! empty($columnMeta['Extra']) && $columnMeta['Extra'] == 'auto_increment'): ?>
-           checked="checked"
-       <?php endif; ?>
-       type="checkbox"
-       value="auto_increment" />
\ No newline at end of file
diff --git a/#pma/templates/columns_definitions/column_indexes.phtml b/#pma/templates/columns_definitions/column_indexes.phtml
deleted file mode 100644
index 94cf03aa..00000000
--- a/#pma/templates/columns_definitions/column_indexes.phtml
+++ /dev/null
@@ -1,30 +0,0 @@
-<select name="field_key[<?= $columnNumber;?>]"
-        id="field_<?= $columnNumber; ?>_<?= ($ci - $ci_offset);?>"
-        data-index="">
-    <option value="none_<?= $columnNumber; ?>">---</option>
-    <option value="primary_<?= $columnNumber; ?>"
-            title="<?= __("Primary"); ?>"
-            <?= ((isset($columnMeta['Key']) && $columnMeta['Key'] == 'PRI') ? 'selected="selected"' : '');?>>
-        PRIMARY
-    </option>
-    <option value="unique_<?= $columnNumber; ?>"
-            title="<?= __("Unique"); ?>"
-        <?= ((isset($columnMeta['Key']) && $columnMeta['Key'] == 'UNI') ? 'selected="selected"' : '');?>>
-        UNIQUE
-    </option>
-    <option value="index_<?= $columnNumber; ?>"
-            title="<?= __("Index"); ?>"
-        <?= ((isset($columnMeta['Key']) && $columnMeta['Key'] == 'MUL') ? 'selected="selected"' : '');?>>
-        INDEX
-    </option>
-    <option value="fulltext_<?= $columnNumber; ?>"
-            title="<?= __("Fulltext"); ?>"
-        <?= ((isset($columnMeta['Key']) && $columnMeta['Key'] == 'FULLTEXT') ? 'selected="selected"' : '');?>>
-        FULLTEXT
-    </option>
-    <option value="spatial_<?= $columnNumber; ?>"
-            title="<?= __("Spatial"); ?>"
-        <?= ((isset($columnMeta['Key']) && $columnMeta['Key'] == 'SPATIAL') ? 'selected="selected"' : '');?>>
-        SPATIAL
-    </option>
-</select>
\ No newline at end of file
diff --git a/#pma/templates/columns_definitions/column_length.phtml b/#pma/templates/columns_definitions/column_length.phtml
deleted file mode 100644
index dafd5d7b..00000000
--- a/#pma/templates/columns_definitions/column_length.phtml
+++ /dev/null
@@ -1,11 +0,0 @@
-<input id="field_<?= $columnNumber; ?>_<?= ($ci - $ci_offset); ?>"
-       type="text"
-       name="field_length[<?= $columnNumber; ?>]"
-       size="<?= $length_values_input_size ?>"
-       value="<?= htmlspecialchars($length_to_display); ?>"
-       class="textfield" />
-<p class="enum_notice" id="enum_notice_<?= $columnNumber ?>_<?= ($ci - $ci_offset); ?>">
-    <a href="#" class="open_enum_editor">
-        <?= __('Edit ENUM/SET values'); ?>
-    </a>
-</p>
\ No newline at end of file
diff --git a/#pma/templates/columns_definitions/column_name.phtml b/#pma/templates/columns_definitions/column_name.phtml
deleted file mode 100644
index 9659679f..00000000
--- a/#pma/templates/columns_definitions/column_name.phtml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-$title = '';
-if (isset($columnMeta['column_status'])) {
-    if ($columnMeta['column_status']['isReferenced']) {
-        $title .= sprintf(
-            __('Referenced by %s.'),
-            implode(",", $columnMeta['column_status']['references'])
-        );
-    }
-    if ($columnMeta['column_status']['isForeignKey']) {
-        if (!empty($title)) {
-            $title .= "\n";
-        }
-        $title .=  __('Is a foreign key.');
-    }
-}
-if (empty($title)) {
-    $title = __('Column');
-}
-?>
-<input id="field_<?= $columnNumber; ?>_<?= ($ci - $ci_offset); ?>"
-       <?php if (isset($columnMeta['column_status'])
-           && !$columnMeta['column_status']['isEditable']): ?>
-           disabled="disabled"
-       <?php endif; ?>
-       type="text"
-       name="field_name[<?= $columnNumber; ?>]"
-       maxlength="64"
-       class="textfield"
-       title="<?= $title; ?>"
-       size="10"
-       value="<?= isset($columnMeta['Field'])? htmlspecialchars($columnMeta['Field']) : '' ?>" />
-
-<?php if ($cfgRelation['centralcolumnswork']
-    && !(isset($columnMeta['column_status'])
-        && !$columnMeta['column_status']['isEditable'])
-): ?>
-    <p style="font-size:80%;margin:5px 2px"
-       id="central_columns_<?= $columnNumber; ?>_<?= ($ci - $ci_offset); ?>">
-        <a data-maxrows="<?= intval($GLOBALS['cfg']['MaxRows']); ?>"
-           href="#"
-           class="central_columns_dialog">
-            <?= __('Pick from Central Columns'); ?>
-        </a>
-    </p>
-<?php endif; ?>
diff --git a/#pma/templates/columns_definitions/column_null.phtml b/#pma/templates/columns_definitions/column_null.phtml
deleted file mode 100644
index 72134ed3..00000000
--- a/#pma/templates/columns_definitions/column_null.phtml
+++ /dev/null
@@ -1,8 +0,0 @@
-<input name="field_null[<?= $columnNumber; ?>]"
-       id="field_<?= $columnNumber; ?>_<?= ($ci - $ci_offset); ?>"
-       <?php if (! empty($columnMeta['Null']) && $columnMeta['Null'] != 'NO' && $columnMeta['Null'] != 'NOT NULL'): ?>
-           checked="checked"
-       <?php endif; ?>
-       type="checkbox"
-       value="NULL"
-       class="allow_null"/>
\ No newline at end of file
diff --git a/#pma/templates/columns_definitions/column_type.phtml b/#pma/templates/columns_definitions/column_type.phtml
deleted file mode 100644
index ae2527ea..00000000
--- a/#pma/templates/columns_definitions/column_type.phtml
+++ /dev/null
@@ -1,8 +0,0 @@
-<select class="column_type"
-        name="field_type[<?= $columnNumber; ?>]"
-        id="field_<?= $columnNumber; ?>_<?= ($ci - $ci_offset); ?>"
-        <?php if (isset($columnMeta['column_status']) && !$columnMeta['column_status']['isEditable']): ?>
-            disabled="disabled"
-        <?php endif; ?>>
-    <?= PMA\libraries\Util::getSupportedDatatypes(true, $type_upper); ?>
-</select>
\ No newline at end of file
diff --git a/#pma/templates/columns_definitions/column_virtuality.phtml b/#pma/templates/columns_definitions/column_virtuality.phtml
deleted file mode 100644
index 2255257a..00000000
--- a/#pma/templates/columns_definitions/column_virtuality.phtml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-$options = array(
-    ''           =>  '',
-    'VIRTUAL'    => 'VIRTUAL',
-);
-$serverType = PMA\libraries\Util::getServerType();
-if ($serverType == 'MariaDB') {
-    $options['PERSISTENT'] = 'PERSISTENT';
-} else {
-    $options['STORED'] = 'STORED';
-}
-
-$expression = '';
-if (isset($columnMeta['Expression'])) {
-    $expression = $columnMeta['Expression'];
-}
-?>
-
-<select name="field_virtuality[<?= $columnNumber; ?>]"
-        id="field_<?= $columnNumber; ?>_<?=($ci - $ci_offset); ?>"
-        class="virtuality">
-    <?php foreach ($options as $key => $value): ?>
-        <option value="<?= $key; ?>"
-                <?php if (isset($columnMeta['Extra'])
-                    && $key != ''
-                    && strpos($columnMeta['Extra'], $key) === 0): ?>
-                    selected="selected"
-                <?php endif; ?>>
-            <?= $value; ?>
-        </option>
-    <?php endforeach; ?>
-</select>
-<br />
-<?php if ($GLOBALS['cfg']['CharEditing'] == 'textarea'): ?>
-    <textarea name="field_expression[<?= $columnNumber; ?>]"
-              cols="15"
-              class="textfield
-              expression">
-        <?= htmlspecialchars($expression); ?>
-    </textarea>
-<?php else: ?>
-    <input type="text"
-           name="field_expression[<?= $columnNumber; ?>]"
-           size="12"
-           value="<?= htmlspecialchars($expression); ?>"
-           placeholder="<?= __('Expression'); ?>"
-           class="textfield expression" />
-<?php endif; ?>
\ No newline at end of file
diff --git a/#pma/templates/columns_definitions/mime_type.phtml b/#pma/templates/columns_definitions/mime_type.phtml
deleted file mode 100644
index d0a6e9f8..00000000
--- a/#pma/templates/columns_definitions/mime_type.phtml
+++ /dev/null
@@ -1,17 +0,0 @@
-<select id="field_<?= $columnNumber;?>_<?=($ci - $ci_offset); ?>"
-        size="1"
-        name="field_mimetype[<?= $columnNumber; ?>]">
-    <option value="">&nbsp;</option>
-    <?php if (isset($available_mime['mimetype'])
-                && is_array($available_mime['mimetype'])): ?>
-        <?php foreach ($available_mime['mimetype'] as $mimetype): ?>
-            <?php $checked = (isset($columnMeta['Field'])
-                             && isset($mime_map[$columnMeta['Field']]['mimetype'])
-                             && ($mime_map[$columnMeta['Field']]['mimetype'] == str_replace('/', '_', $mimetype))
-                                    ? 'selected ' : '');?>
-            <option value="<?= str_replace('/', '_', $mimetype)?>" <?= $checked; ?>>
-                <?= htmlspecialchars(strtolower($mimetype)); ?>
-            </option>
-        <?php endforeach; ?>
-    <?php endif; ?>
-</select>
\ No newline at end of file
diff --git a/#pma/templates/columns_definitions/move_column.phtml b/#pma/templates/columns_definitions/move_column.phtml
deleted file mode 100644
index a4e07676..00000000
--- a/#pma/templates/columns_definitions/move_column.phtml
+++ /dev/null
@@ -1,15 +0,0 @@
-<select id="field_<?= $columnNumber; ?>_<?= ($ci - $ci_offset); ?>"
-        name="field_move_to[<?= $columnNumber; ?>]"
-        size="1"
-        width="5em">
-    <option value="" selected="selected">&nbsp;</option>
-    <option value="-first" <?= ($current_index == 0 ? ' disabled="disabled"' : ''); ?>>
-        <?= __('first'); ?>
-    </option>
-    <?php for ($mi = 0, $cols = count($move_columns); $mi < $cols; $mi++): ?>
-        <option value="<?= htmlspecialchars($move_columns[$mi]->name); ?>"
-                <?= (($current_index == $mi || $current_index == $mi + 1) ? ' disabled="disabled"' : '');?>>
-            <?= sprintf(__('after %s'), PMA\libraries\Util::backquote(htmlspecialchars($move_columns[$mi]->name))); ?>
-        </option>
-    <?php endfor; ?>
-</select>
\ No newline at end of file
diff --git a/#pma/templates/columns_definitions/partitions.phtml b/#pma/templates/columns_definitions/partitions.phtml
deleted file mode 100644
index e0dedddb..00000000
--- a/#pma/templates/columns_definitions/partitions.phtml
+++ /dev/null
@@ -1,174 +0,0 @@
-<?php
-$partitionOptions = array('', 'HASH', 'LINEAR HASH', 'KEY', 'LINEAR KEY', 'RANGE', 'RANGE COLUMNS', 'LIST', 'LIST COLUMNS');
-$subPartitionOptions = array('', 'HASH', 'LINEAR HASH', 'KEY', 'LINEAR KEY');
-$valueTypeOptions = array('', 'LESS THAN', 'LESS THAN MAXVALUE', 'IN');
-?>
-
-<table id="partition_table">
-    <tr class="vmiddle">
-        <td><label for="partition_by"><?= __('Partition by:'); ?></label></td>
-        <td>
-            <select name="partition_by" id="partition_by">
-                <?php foreach ($partitionOptions as $option): ?>
-                    <option value="<?= $option?>"
-                        <?php if ($partitionDetails['partition_by'] == $option): ?>
-                            selected="selected"
-                        <?php endif; ?>
-                    >
-                        <?= $option; ?>
-                    </option>
-                <?php endforeach; ?>
-            </select>
-        </td>
-        <td>(
-            <input name="partition_expr" type="text"
-                   placeholder="<?= __('Expression or column list'); ?>"
-                   value="<?= htmlspecialchars($partitionDetails['partition_expr']); ?>"/>
-        )</td>
-    </tr>
-    <tr class="vmiddle">
-        <td><label for="partition_count"><?= __('Partitions:'); ?></label></td>
-        <td>
-            <input name="partition_count" type="number" min="2"
-                   value="<?= htmlspecialchars($partitionDetails['partition_count']); ?>" />
-        </td>
-    </tr>
-    <?php if ($partitionDetails['can_have_subpartitions']): ?>
-        <tr class="vmiddle">
-            <td><label for="subpartition_by"><?= __('Subpartition by:'); ?></label></td>
-            <td>
-                <select name="subpartition_by" id="subpartition_by">
-                    <?php foreach ($subPartitionOptions as $option): ?>
-                    <option value="<?= $option?>"
-                        <?php if ($partitionDetails['subpartition_by'] == $option): ?>
-                            selected="selected"
-                        <?php endif; ?>
-                    >
-                        <?= $option; ?>
-                    </option>
-                <?php endforeach; ?>
-                </select>
-            </td>
-            <td>(
-                <input name="subpartition_expr" type="text"
-                       placeholder="<?= __('Expression or column list'); ?>"
-                       value="<?= htmlspecialchars($partitionDetails['subpartition_expr']); ?>"/>
-            )</td>
-        </tr>
-        <tr class="vmiddle">
-            <td><label for="subpartition_count"><?= __('Subpartitions:'); ?></label></td>
-            <td>
-                <input name="subpartition_count" type="number" min="2"
-                       value="<?= htmlspecialchars($partitionDetails['subpartition_count']); ?>" />
-            </td>
-        </tr>
-    <?php endif; ?>
-</table>
-
-<?php if ($partitionDetails['partition_count'] > 1): ?>
-    <table id="partition_definition_table">
-        <tr>
-            <th><?= __('Partition'); ?></th>
-            <?php if ($partitionDetails['value_enabled']): ?>
-                <th><?= __('Values'); ?></th>
-            <?php endif; ?>
-            <?php if ($partitionDetails['can_have_subpartitions'] && $partitionDetails['subpartition_count'] > 1): ?>
-                <th><?= __('Subpartition'); ?></th>
-            <?php endif; ?>
-            <th><?= __('Engine'); ?></th>
-            <th><?= __('Comment'); ?></th>
-            <th><?= __('Data directory'); ?></th>
-            <th><?= __('Index directory'); ?></th>
-            <th><?= __('Max rows'); ?></th>
-            <th><?= __('Min rows'); ?></th>
-            <th><?= __('Table space'); ?></th>
-            <th><?= __('Node group'); ?></th>
-        </tr>
-        <?php $odd = true; ?>
-        <?php foreach ($partitionDetails['partitions'] as $partition): ?>
-            <?php $rowspan = ! empty($partition['subpartition_count']) ? ($partition['subpartition_count'] + 1) : 2; ?>
-            <tr class="<?= ($odd ? 'odd' : 'even'); ?>">
-                <td rowspan="<?= $rowspan; ?>">
-                    <input type="text" name="<?= $partition['prefix']; ?>[name]"
-                       value="<?= htmlspecialchars($partition['name']); ?>" />
-                </td>
-                <?php if ($partitionDetails['value_enabled']): ?>
-                    <td rowspan="<?= $rowspan; ?>" class="vmiddle">
-                        <select class="partition_value"
-                                name="<?= $partition['prefix']; ?>[value_type]">
-                            <?php foreach ($valueTypeOptions as $option): ?>
-                                <option value="<?= $option?>"
-                                    <?php if ($partition['value_type'] == $option): ?>
-                                        selected="selected"
-                                    <?php endif; ?>
-                                >
-                                    <?= $option; ?>
-                                </option>
-                            <?php endforeach; ?>
-                        </select>
-                        <input type="text" class="partition_value"
-                               name="<?= $partition['prefix']; ?>[value]"
-                               value="<?= $partition['value']; ?>" />
-                    </td>
-                <?php endif; ?>
-            </tr>
-
-            <?php
-            if (isset($partition['subpartitions'])):
-                $subpartitions = $partition['subpartitions'];
-            else:
-                $subpartitions = array($partition);
-            endif;
-            ?>
-
-            <?php foreach ($subpartitions as $subpartition): ?>
-                <tr class="<?= ($odd ? 'odd' : 'even'); ?>">
-                    <?php if ($partitionDetails['can_have_subpartitions'] && $partitionDetails['subpartition_count'] > 1): ?>
-                        <td>
-                            <input type="text" name="<?= $subpartition['prefix']; ?>[name]"
-                               value="<?= htmlspecialchars($subpartition['name']); ?>" />
-                        </td>
-                    <?php endif; ?>
-                    <td>
-                        <?= PMA\libraries\StorageEngine::getHtmlSelect(
-                            $subpartition['prefix'] . '[engine]',
-                            null,
-                            $subpartition['engine'],
-                            false,
-                            true
-                        ); ?>
-                    </td>
-                    <td>
-                        <?php  //Please keep this at one line to avoid extra spaces in textarea value. ?>
-                        <textarea name="<?= $subpartition['prefix']; ?>[comment]"><?= htmlspecialchars($subpartition['comment']); ?></textarea>
-                    </td>
-                    <td>
-                        <input type="text" name="<?= $subpartition['prefix']; ?>[data_directory]"
-                               value="<?= htmlspecialchars($subpartition['data_directory']); ?>" />
-                    </td>
-                    <td>
-                        <input type="text" name="<?= $subpartition['prefix']; ?>[index_directory]"
-                               value="<?= htmlspecialchars($subpartition['index_directory']); ?>" />
-                    </td>
-                    <td>
-                        <input type="number" name="<?= $subpartition['prefix']; ?>[max_rows]"
-                               value="<?= htmlspecialchars($subpartition['max_rows']); ?>" />
-                    </td>
-                    <td>
-                        <input type="number" min="0" name="<?= $subpartition['prefix']; ?>[min_rows]"
-                               value="<?= htmlspecialchars($subpartition['min_rows']); ?>" />
-                    </td>
-                    <td>
-                        <input type="text" min="0" name="<?= $subpartition['prefix']; ?>[tablespace]"
-                               value="<?= htmlspecialchars($subpartition['tablespace']); ?>" />
-                    </td>
-                    <td>
-                        <input type="text" name="<?= $subpartition['prefix']; ?>[node_group]"
-                               value="<?= htmlspecialchars($subpartition['node_group']); ?>" />
-                    </td>
-                </tr>
-            <?php endforeach; ?>
-            <?php $odd = !$odd; ?>
-        <?php endforeach; ?>
-    </table>
-<?php endif; ?>
\ No newline at end of file
diff --git a/#pma/templates/columns_definitions/table_fields_definitions.phtml b/#pma/templates/columns_definitions/table_fields_definitions.phtml
deleted file mode 100644
index 057c8bc0..00000000
--- a/#pma/templates/columns_definitions/table_fields_definitions.phtml
+++ /dev/null
@@ -1,133 +0,0 @@
-<table id="table_columns" class="noclick">
-    <caption class="tblHeaders">
-        <?= __('Structure'); ?>
-        <?= PMA\libraries\Util::showMySQLDocu('CREATE_TABLE'); ?>
-    </caption>
-    <tr>
-        <th>
-            <?= __('Name'); ?>
-        </th>
-        <th>
-            <?= __('Type') , PMA\libraries\Util::showMySQLDocu('data-types'); ?>
-        </th>
-        <th>
-            <?= __('Length/Values') , PMA\libraries\Util::showHint(
-                    __(
-                        'If column type is "enum" or "set", please enter the values using'
-                        . ' this format: \'a\',\'b\',\'c\'…<br />If you ever need to put'
-                        . ' a backslash ("\") or a single quote ("\'") amongst those'
-                        . ' values, precede it with a backslash (for example \'\\\\xyz\''
-                        . ' or \'a\\\'b\').'
-                    )
-                ); ?>
-        </th>
-        <th>
-            <?= __('Default') , PMA\libraries\Util::showHint(
-                    __(
-                        'For default values, please enter just a single value,'
-                        . ' without backslash escaping or quotes, using this format: a'
-                    )
-                ); ?>
-        </th>
-        <th>
-            <?= __('Collation'); ?>
-        </th>
-        <th>
-            <?= __('Attributes'); ?>
-        </th>
-        <th>
-            <?= __('Null'); ?>
-        </th>
-
-        <!-- Only for 'Edit' Column(s) -->
-        <?php if (isset($_REQUEST['change_column'])
-            && ! empty($_REQUEST['change_column'])
-        ): ?>
-            <th>
-                <?= __('Adjust privileges') , PMA\libraries\Util::showDocu('faq', 'faq6-39'); ?>
-            </th>
-        <?php endif; ?>
-
-        <?php
-        // We could remove this 'if' and let the key information be shown and
-        // editable. However, for this to work, structure.lib.php must be modified
-        // to use the key fields, as tbl_addfield does.
-        if (!$is_backup): ?>
-            <th>
-                <?= __('Index'); ?>
-            </th>
-        <?php endif; ?>
-
-        <th>
-            <abbr title="AUTO_INCREMENT">A_I</abbr>
-        </th>
-        <th>
-            <?= __('Comments'); ?>
-        </th>
-
-        <?php if (PMA\libraries\Util::isVirtualColumnsSupported()): ?>
-            <th>
-                <?= __('Virtuality'); ?>
-            </th>
-        <?php endif; ?>
-
-        <?php if (isset($fields_meta)): ?>
-            <th>
-                <?= __('Move column'); ?>
-            </th>
-        <?php endif; ?>
-
-        <?php if ($mimework && $GLOBALS['cfg']['BrowseMIME']): ?>
-            <th>
-                <?= __('MIME type'); ?>
-            </th>
-            <th>
-                <a href="transformation_overview.php<?= PMA_URL_getCommon(); ?>#transformation"
-                   title="<?= __('List of available transformations and their options'); ?>"
-                   target="_blank">
-                    <?= __('Browser display transformation'); ?>
-                </a>
-            </th>
-            <th>
-                <?= __('Browser display transformation options'); ?>
-                <?= PMA\libraries\Util::showHint(
-                    __(
-                        'Please enter the values for transformation options using this'
-                        . ' format: \'a\', 100, b,\'c\'…<br />If you ever need to put'
-                        . ' a backslash ("\") or a single quote ("\'") amongst those'
-                        . ' values, precede it with a backslash (for example \'\\\\xyz\''
-                        . ' or \'a\\\'b\').'
-                    )
-                ); ?>
-            </th>
-            <th>
-                <a href="transformation_overview.php<?= PMA_URL_getCommon(); ?>#input_transformation"
-                   title="<?= __('List of available transformations and their options'); ?>"
-                   target="_blank">
-                    <?= __('Input transformation'); ?>
-                </a>
-            </th>
-            <th>
-                <?= __('Input transformation options'); ?>
-                <?= PMA\libraries\Util::showHint(
-                    __(
-                        'Please enter the values for transformation options using this'
-                        . ' format: \'a\', 100, b,\'c\'…<br />If you ever need to put'
-                        . ' a backslash ("\") or a single quote ("\'") amongst those'
-                        . ' values, precede it with a backslash (for example \'\\\\xyz\''
-                        . ' or \'a\\\'b\').'
-                    )
-                ); ?>
-            </th>
-        <?php endif; ?>
-    </tr>
-    <?php $odd_row = true;?>
-    <?php foreach($content_cells as $content_row): ?>
-        <tr class="<?= ($odd_row ? 'odd' : 'even'); ?>">
-            <?php $odd_row = !$odd_row; ?>
-            <?= PMA\libraries\Template::get('columns_definitions/column_attributes')
-                ->render($content_row); ?>
-        </tr>
-    <?php endforeach; ?>
-</table>
-<br />
\ No newline at end of file
diff --git a/#pma/templates/columns_definitions/transformation.phtml b/#pma/templates/columns_definitions/transformation.phtml
deleted file mode 100644
index 96467007..00000000
--- a/#pma/templates/columns_definitions/transformation.phtml
+++ /dev/null
@@ -1,27 +0,0 @@
-<select id="field_<?= $columnNumber; ?>_<?= ($ci - $ci_offset); ?>"
-        size="1"
-        name="field_<?= $type;?>[<?= $columnNumber;?>]">
-    <option value="" title="<?= __('None'); ?>"></option>
-    <?php if (isset($available_mime[$type]) && is_array($available_mime[$type])): ?>
-        <?php foreach ($available_mime[$type] as $mimekey => $transform): ?>
-            <?php
-                $checked = isset($columnMeta['Field'])
-                         && isset($mime_map[$columnMeta['Field']][$type])
-                         && preg_match('@' . preg_quote($available_mime[$type . '_file'][$mimekey], '@') . '3?@i',
-                                        $mime_map[$columnMeta['Field']][$type]) ? 'selected ' : '';
-                $tooltip = PMA_getTransformationDescription(
-                    $available_mime[$type . '_file'][$mimekey]
-                );
-                $parts = explode(":", $transform);
-                $name = PMA_getTransformationName(
-                    $available_mime[$type . '_file'][$mimekey]
-                ) . ' (' . strtolower($parts[0]) . ":" . $parts[1] . ')';
-            ?>
-            <option value="<?= $available_mime[$type . '_file'][$mimekey]; ?>"
-                    <?= $checked; ?>
-                    title="<?= htmlspecialchars($tooltip); ?>">
-                <?= htmlspecialchars($name); ?>
-            </option>
-        <?php endforeach; ?>
-    <?php endif; ?>
-</select>
diff --git a/#pma/templates/columns_definitions/transformation_option.phtml b/#pma/templates/columns_definitions/transformation_option.phtml
deleted file mode 100644
index bb19e3f0..00000000
--- a/#pma/templates/columns_definitions/transformation_option.phtml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php $options_key = $type_prefix . 'transformation_options'; ?>
-<input id="field_<?= $columnNumber; ?>_<?= ($ci - $ci_offset); ?>"
-       type="text"
-       name="field_<?= $options_key; ?>[<?= $columnNumber; ?>]"
-       size="16"
-       class="textfield"
-       value="<?= (isset($columnMeta['Field']) && isset($mime_map[$columnMeta['Field']][$options_key])) ?
-                htmlspecialchars($mime_map[$columnMeta['Field']][$options_key])
-                : '' ?>" />
diff --git a/#pma/templates/components/error_message.phtml b/#pma/templates/components/error_message.phtml
deleted file mode 100644
index 2a67ea5a..00000000
--- a/#pma/templates/components/error_message.phtml
+++ /dev/null
@@ -1,4 +0,0 @@
-<div class="error">
-    <img src="themes/dot.gif" title="" alt="" class="icon ic_s_error" />
-    <?= $msg; ?>
-</div>
\ No newline at end of file
diff --git a/#pma/templates/database/create_table.phtml b/#pma/templates/database/create_table.phtml
deleted file mode 100644
index 45995385..00000000
--- a/#pma/templates/database/create_table.phtml
+++ /dev/null
@@ -1,23 +0,0 @@
-<form id="create_table_form_minimal" method="post" action="tbl_create.php" class="lock-page">
-    <fieldset>
-        <legend>
-        <?php if (PMA\libraries\Util::showIcons('ActionLinksMode')): ?>
-            <?= PMA\libraries\Util::getImage('b_table_add.png'); ?>&nbsp
-        <?php endif; ?>
-        <?= __('Create table'); ?>
-        </legend>
-        <?= PMA_URL_getHiddenInputs($db); ?>
-        <div class="formelement">
-            <?= __('Name'); ?>:
-            <input type="text" name="table" maxlength="64" size="30" required="required" />
-        </div>
-        <div class="formelement">
-            <?= __('Number of columns'); ?>:
-            <input type="number" min="1" name="num_fields" value="4" required="required" />
-        </div>
-        <div class="clearfloat"></div>
-    </fieldset>
-    <fieldset class="tblFooters">
-        <input type="submit" value="<?= __('Go'); ?>" />
-    </fieldset>
-</form>
\ No newline at end of file
diff --git a/#pma/templates/database/designer/aggregate_query_panel.phtml b/#pma/templates/database/designer/aggregate_query_panel.phtml
deleted file mode 100644
index ec00ee91..00000000
--- a/#pma/templates/database/designer/aggregate_query_panel.phtml
+++ /dev/null
@@ -1,84 +0,0 @@
-<table id="query_Aggregate" style="display:none;"width="5%" cellpadding="0" cellspacing="0">
-    <tbody>
-        <tr>
-            <td class="frams1" width="10px">
-            </td>
-            <td class="frams5" width="99%" >
-            </td>
-            <td class="frams2" width="10px">
-                <div class="bor">
-                </div>
-            </td>
-        </tr>
-        <tr>
-            <td class="frams8">
-            </td>
-            <td class="input_tab">
-                <table width="168" class="center" cellpadding="2" cellspacing="0">
-                    <thead>
-                        <tr>
-                            <td colspan="2" class="center nowrap">
-                                <strong>
-                                    <?= __('Aggregate'); ?>
-                                </strong>
-                            </td>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        <tr>
-                            <td width="58" class="nowrap">
-                                <?= __('Operator'); ?>
-                            </td>
-                            <td width="102">
-                                <select name="operator" id="e_operator">
-                                    <option value="---" selected="selected">
-                                        ---
-                                    </option>
-                                    <option value="sum" >
-                                        SUM
-                                    </option>
-                                    <option value="min">
-                                        MIN
-                                    </option>
-                                    <option value="max">
-                                        MAX
-                                    </option>
-                                    <option value="avg">
-                                        AVG
-                                    </option>
-                                    <option value="count">
-                                        COUNT
-                                    </option>
-                                </select>
-                            </td>
-                        </tr>
-                    </tbody>
-                    <tbody>
-                        <tr>
-                            <td colspan="2" class="center nowrap">
-                                <input type="button" id="ok_edit_Aggr" class="butt" name="Button" value="<?= __('OK'); ?>" />
-                                <input type="button"
-                                       class="butt"
-                                       name="Button"
-                                       value="<?= __('Cancel'); ?>"
-                                       onclick="document.getElementById('query_Aggregate').style.display = 'none';" />
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </td>
-            <td class="frams6">
-            </td>
-        </tr>
-        <tr>
-            <td class="frams4">
-                <div class="bor">
-                </div>
-            </td>
-            <td class="frams7">
-            </td>
-            <td class="frams3">
-            </td>
-        </tr>
-    </tbody>
-</table>
\ No newline at end of file
diff --git a/#pma/templates/database/designer/canvas.phtml b/#pma/templates/database/designer/canvas.phtml
deleted file mode 100644
index 5110ccc0..00000000
--- a/#pma/templates/database/designer/canvas.phtml
+++ /dev/null
@@ -1,3 +0,0 @@
-<div id="osn_tab">
-    <canvas class="pmd" id="canvas" width="100" height="100" ></canvas>
-</div>
\ No newline at end of file
diff --git a/#pma/templates/database/designer/database_tables.phtml b/#pma/templates/database/designer/database_tables.phtml
deleted file mode 100644
index 03161efd..00000000
--- a/#pma/templates/database/designer/database_tables.phtml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?php for ($i = 0, $l = count($GLOBALS['PMD']["TABLE_NAME"]); $i < $l; $i++) :
-    $t_n = $GLOBALS['PMD']["TABLE_NAME"][$i];
-    $t_n_url = $GLOBALS['PMD_URL']["TABLE_NAME"][$i]; ?>
-    <input name="t_x[<?= $t_n_url; ?>]" type="hidden" id="t_x_<?= $t_n_url; ?>_" />
-    <input name="t_y[<?= $t_n_url; ?>]" type="hidden" id="t_y_<?= $t_n_url; ?>_" />
-    <input name="t_v[<?= $t_n_url; ?>]" type="hidden" id="t_v_<?= $t_n_url; ?>_" />
-    <input name="t_h[<?= $t_n_url; ?>]" type="hidden" id="t_h_<?= $t_n_url; ?>_" />
-    <!-- Why should we put styles here?! -->
-    <table id="<?= $t_n_url; ?>"
-           cellpadding="0"
-           cellspacing="0"
-           class="pmd_tab"
-           style="position:absolute; left:<?= (isset($tab_pos[$t_n]) ? $tab_pos[$t_n]["X"] : rand(20, 700)); ?>px; top:<?= (isset($tab_pos[$t_n]) ? $tab_pos[$t_n]["Y"] : rand(20, 550)); ?>px; display:<?= (isset($tab_pos[$t_n]) || $display_page == -1) ? 'block;' : 'none';?>; z-index: 1;">
-        <thead>
-            <tr class="header">
-                <?php if (isset($_REQUEST['query'])) : ?>
-                    <td class="select_all">
-                        <input class="select_all_1"
-                               type="checkbox"
-                               style="margin: 0;"
-                               value="select_all_<?= htmlspecialchars($t_n_url); ?>"
-                               id="select_all_<?= htmlspecialchars($t_n_url); ?>"
-                               title="select all"
-                               pmd_url_table_name="<?= htmlspecialchars($t_n_url); ?>"
-                               pmd_out_owner="<?= htmlspecialchars($GLOBALS['PMD_OUT']['OWNER'][$i]); ?>">
-                    </td>
-                <?php endif; ?>
-                <td class="small_tab"
-                    title="<?= __('Show/hide columns'); ?>"
-                    id="id_hide_tbody_<?= $t_n_url; ?>"
-                    table_name="<?= htmlspecialchars($t_n_url); ?>"
-                    onmouseover="this.className='small_tab2';"
-                    onmouseout="this.className='small_tab';" ><?= (! isset($tab_pos[$t_n]) || ! empty($tab_pos[$t_n]["V"])) ? 'v' : '&gt;'; ?>
-                </td>
-                <td class="small_tab_pref small_tab_pref_1"
-                    table_name_small="<?= $GLOBALS['PMD_URL']["TABLE_NAME_SMALL"][$i]; ?>"
-                    onmouseover="this.className='small_tab_pref2 small_tab_pref_1';"
-                    onmouseout="this.className='small_tab_pref small_tab_pref_1';" >
-                    <img src="<?= $_SESSION['PMA_Theme']->getImgPath('pmd/exec_small.png'); ?>"
-                         title="<?= __('See table structure'); ?>" />
-                </td>
-                <td id="id_zag_<?= htmlspecialchars($t_n_url); ?>"
-                    class="tab_zag nowrap tab_zag_noquery"
-                    onmousedown="cur_click=document.getElementById('<?= $t_n_url; ?>');"
-                    table_name="<?= htmlspecialchars($t_n_url); ?>"
-                    query_set="<?= isset($_REQUEST['query']) ? 1 : 0 ; ?>" >
-                    <span class="owner">
-                        <?= $GLOBALS['PMD_OUT']["OWNER"][$i]; ?>
-                    </span>
-                    <?= $GLOBALS['PMD_OUT']['TABLE_NAME_SMALL'][$i]; ?>
-                </td>
-                <?php if (isset($_REQUEST['query'])) : ?>
-                    <td class="tab_zag tab_zag_query"
-                        id="id_zag_<?= htmlspecialchars($t_n_url); ?>_2"
-                        table_name="<?= htmlspecialchars($t_n_url); ?>"
-                        onmousedown="cur_click=document.getElementById('<?= htmlspecialchars($t_n_url); ?>');">
-                    </td>
-               <?php endif; ?>
-            </tr>
-        </thead>
-        <tbody id="id_tbody_<?= $t_n_url; ?>" style="<?= (isset($tab_pos[$t_n]) && empty($tab_pos[$t_n]["V"])) ? 'display: none' : ''; ?>">
-            <?php $display_field = PMA_getDisplayField(
-                $_GET['db'],
-                $GLOBALS['PMD']["TABLE_NAME_SMALL"][$i]
-            );
-            for ($j = 0, $id_cnt = count($tab_column[$t_n]["COLUMN_ID"]); $j < $id_cnt; $j++) :
-                $tmpColumn = $t_n . "." . $tab_column[$t_n]["COLUMN_NAME"][$j];
-                $click_field_param = array(
-                    $GLOBALS['PMD_URL']["TABLE_NAME_SMALL"][$i],
-                    urlencode($tab_column[$t_n]["COLUMN_NAME"][$j])
-                );
-                if (!PMA\libraries\Util::isForeignKeySupported($GLOBALS['PMD']['TABLE_TYPE'][$i])) {
-                    $click_field_param[] = isset($tables_pk_or_unique_keys[$tmpColumn]) ? 1 : 0;
-                } else {
-                    // if foreign keys are supported, it's not necessary that the
-                    // index is a primary key
-                    $click_field_param[] = isset($tables_all_keys[$tmpColumn]) ? 1 : 0;
-                }
-                ?>
-                <tr id="id_tr_<?= $GLOBALS['PMD_URL']["TABLE_NAME_SMALL"][$i]; ?>.<?= urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]); ?>"
-                    <?= ($display_field == $tab_column[$t_n]["COLUMN_NAME"][$j]) ? 'class="tab_field_3"' : 'class="tab_field"'; ?>
-                    onmouseover="old_class = this.className; this.className = 'tab_field_2';"
-                    onmouseout="this.className = old_class;"
-                    click_field_param="<?= implode($click_field_param, ','); ?>">
-                    <?php if (isset($_REQUEST['query'])) : ?>
-                        <td class="select_all">
-                            <input class="select_all_store_col"
-                                   value="<?= htmlspecialchars($t_n_url) , urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]); ?>"
-                                   type="checkbox"
-                                   id="select_<?= htmlspecialchars($t_n_url); ?>._<?= urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]); ?>"
-                                   style="margin: 0;"
-                                   title="select_<?= urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]); ?>"
-                                   store_column_param="<?= urlencode($GLOBALS['PMD_OUT']["TABLE_NAME_SMALL"][$i]); ?>,<?= htmlspecialchars($GLOBALS['PMD_OUT']["OWNER"][$i]); ?>,<?= urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]); ?>">
-                        </td>
-                    <?php endif; ?>
-                    <td width="10px" colspan="3" id="<?= $t_n_url; ?>.<?= urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]); ?>">
-                        <div class="nowrap">
-                            <?php if (isset($tables_pk_or_unique_keys[$t_n . "." . $tab_column[$t_n]["COLUMN_NAME"][$j]])) : ?>
-                                <img src="<?= $_SESSION['PMA_Theme']->getImgPath('pmd/FieldKey_small.png'); ?>" alt="*" />
-                            <?php else :
-                                $type = 'pmd/Field_small';
-                                if (strstr($tab_column[$t_n]["TYPE"][$j], 'char')
-                                    || strstr($tab_column[$t_n]["TYPE"][$j], 'text')
-                                ) {
-                                    $type .= '_char';
-                                } elseif (strstr($tab_column[$t_n]["TYPE"][$j], 'int')
-                                    || strstr($tab_column[$t_n]["TYPE"][$j], 'float')
-                                    || strstr($tab_column[$t_n]["TYPE"][$j], 'double')
-                                    || strstr($tab_column[$t_n]["TYPE"][$j], 'decimal')
-                                ) {
-                                    $type .= '_int';
-                                } elseif (strstr($tab_column[$t_n]["TYPE"][$j], 'date')
-                                    || strstr($tab_column[$t_n]["TYPE"][$j], 'time')
-                                    || strstr($tab_column[$t_n]["TYPE"][$j], 'year')
-                                ) {
-                                    $type .= '_date';
-                                }
-                                ?>
-                                <img src="<?= $_SESSION['PMA_Theme']->getImgPath($type); ?>.png" alt="*" />
-                            <?php endif; ?>
-                            <?= htmlspecialchars(
-                                $tab_column[$t_n]["COLUMN_NAME"][$j] . " : "
-                                . $tab_column[$t_n]["TYPE"][$j],
-                                ENT_QUOTES
-                            ); ?>
-                        </div>
-                    </td>
-                    <?php if (isset($_REQUEST['query'])) : ?>
-                        <td class="small_tab_pref small_tab_pref_click_opt"
-                            onmouseover="this.className='small_tab_pref2 small_tab_pref_click_opt'"
-                            onmouseout="this.className='small_tab_pref small_tab_pref_click_opt'"
-                            Click_option_param="pmd_optionse,<?= urlencode($tab_column[$t_n]['COLUMN_NAME'][$j]); ?>,<?= $GLOBALS['PMD_OUT']['TABLE_NAME_SMALL'][$i]; ?>" >
-                            <img src="<?= $_SESSION['PMA_Theme']->getImgPath('pmd/exec_small.png'); ?>" title="options" />
-                        </td>
-                    <?php endif; ?>
-                </tr>
-            <?php endfor; ?>
-        </tbody>
-    </table>
-<?php endfor; ?>
diff --git a/#pma/templates/database/designer/delete_relation_panel.phtml b/#pma/templates/database/designer/delete_relation_panel.phtml
deleted file mode 100644
index cc905015..00000000
--- a/#pma/templates/database/designer/delete_relation_panel.phtml
+++ /dev/null
@@ -1,47 +0,0 @@
-<table id="layer_upd_relation" style="display:none;" width="5%" cellpadding="0" cellspacing="0">
-    <tbody>
-        <tr>
-            <td class="frams1" width="10px">
-            </td>
-            <td class="frams5" width="99%">
-            </td>
-            <td class="frams2" width="10px">
-                <div class="bor">
-                </div>
-            </td>
-        </tr>
-        <tr>
-            <td class="frams8">
-            </td>
-            <td class="input_tab">
-                <table width="100%" class="center" cellpadding="2" cellspacing="0">
-                    <tr>
-                        <td colspan="3" class="center nowrap">
-                            <strong>
-                                <?= __('Delete relation'); ?>
-                            </strong>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td colspan="3" class="center nowrap">
-                            <input id="del_button" name="Button" type="button" class="butt" value="<?= __('Delete'); ?>" />
-                            <input id="cancel_button" type="button" class="butt" name="Button" value="<?= __('Cancel'); ?>" />
-                        </td>
-                    </tr>
-                </table>
-            </td>
-            <td class="frams6">
-            </td>
-        </tr>
-        <tr>
-            <td class="frams4">
-                <div class="bor">
-                </div>
-            </td>
-            <td class="frams7">
-            </td>
-            <td class="frams3">
-            </td>
-        </tr>
-    </tbody>
-</table>
\ No newline at end of file
diff --git a/#pma/templates/database/designer/edit_delete_pages.phtml b/#pma/templates/database/designer/edit_delete_pages.phtml
deleted file mode 100644
index 9d39e499..00000000
--- a/#pma/templates/database/designer/edit_delete_pages.phtml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php $cfgRelation = PMA_getRelationsParam(); ?>
-<form action="db_designer.php" method="post" name="edit_delete_pages" id="edit_delete_pages" class="ajax">
-    <?= PMA_URL_getHiddenInputs($db); ?>
-    <fieldset id="page_edit_delete_options">
-        <input type="hidden" name="operation" value="<?= $operation; ?>" />
-        <label for="selected_page">
-            <?= $operation == 'editPage' ? __("Page to open") : __("Page to delete"); ?>:
-        </label>
-        <?= PMA_getHtmlForPageSelector($cfgRelation, $db); ?>
-    </fieldset>
-</form>
\ No newline at end of file
diff --git a/#pma/templates/database/designer/having_query_panel.phtml b/#pma/templates/database/designer/having_query_panel.phtml
deleted file mode 100644
index 2b268e8a..00000000
--- a/#pma/templates/database/designer/having_query_panel.phtml
+++ /dev/null
@@ -1,138 +0,0 @@
-<table id="query_having" style="display:none;" width="5%" cellpadding="0" cellspacing="0">
-    <tbody>
-        <tr>
-            <td class="frams1" width="10px">
-            </td>
-            <td class="frams5" width="99%" >
-            </td>
-            <td class="frams2" width="10px">
-                <div class="bor">
-                </div>
-            </td>
-        </tr>
-        <tr>
-            <td class="frams8">
-            </td>
-            <td class="input_tab">
-                <table width="168" class="center" cellpadding="2" cellspacing="0">
-                    <thead>
-                        <tr>
-                            <td colspan="2" class="center nowrap">
-                                <strong>
-                                    HAVING
-                                </strong>
-                            </td>
-                        </tr>
-                    </thead>
-                    <tbody id="rename_to">
-                        <tr>
-                            <td width="58" class="nowrap">
-                                <?= __('Operator'); ?>
-                            </td>
-                            <td width="102">
-                                <select name="hoperator" id="hoperator">
-                                    <option value="---" selected="selected">
-                                        ---
-                                    </option>
-                                    <option value="None" >
-                                        None
-                                    </option>
-                                    <option value="sum" >
-                                        SUM
-                                    </option>
-                                    <option value="min">
-                                        MIN
-                                    </option>
-                                    <option value="max">
-                                        MAX
-                                    </option>
-                                    <option value="avg">
-                                        AVG
-                                    </option>
-                                    <option value="count">
-                                        COUNT
-                                    </option>
-                                </select>
-                            </td>
-                        </tr>
-                        <tr>
-                            <tr>
-                                <td width="58" class="nowrap">
-                                    <?= __('Operator'); ?>
-                                </td>
-                                <td width="102">
-                                    <select name="hrel_opt" id="hrel_opt">
-                                        <option value="--" selected="selected">
-                                            --
-                                        </option>
-                                        <option value="=">
-                                            =
-                                        </option>
-                                        <option value="&gt;">
-                                            &gt;
-                                        </option>
-                                        <option value="&lt;">
-                                            &lt;
-                                        </option>
-                                        <option value="&gt;=">
-                                            &gt;=
-                                        </option>
-                                        <option value="&lt;=">
-                                            &lt;=
-                                        </option>
-                                        <option value="NOT">
-                                            NOT
-                                        </option>
-                                        <option value="IN">
-                                            IN
-                                        </option>
-                                        <option value="EXCEPT">
-                                            <?= __('Except'); ?>
-                                        </option>
-                                        <option value="NOT IN">
-                                            NOT IN
-                                        </option>
-                                    </select>
-                                </td>
-                        </tr>
-                        <tr>
-                            <td class="nowrap">
-                                <?= __('Value'); ?>
-                                <br />
-                                <?= __('subquery'); ?>
-                            </td>
-                            <td>
-                                <textarea id="hQuery" value="" cols="18">
-                                </textarea>
-                            </td>
-                        </tr>
-                    </tbody>
-                    <tbody>
-                        <tr>
-                            <td colspan="2" class="center nowrap">
-                                <input type="button" id="ok_edit_having" class="butt" name="Button" value="<?= __('OK'); ?>" />
-                                <input type="button"
-                                       class="butt"
-                                       name="Button"
-                                       value="<?= __('Cancel'); ?>"
-                                       onclick="document.getElementById('query_having').style.display = 'none';" />
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </td>
-            <td class="frams6">
-            </td>
-        </tr>
-        <tr>
-            <td class="frams4">
-                <div class="bor">
-                </div>
-            </td>
-            <td class="frams7">
-            </td>
-            <td class="frams3">
-            </td>
-        </tr>
-    </tbody>
-</table>
\ No newline at end of file
diff --git a/#pma/templates/database/designer/js_fields.phtml b/#pma/templates/database/designer/js_fields.phtml
deleted file mode 100644
index 5e633883..00000000
--- a/#pma/templates/database/designer/js_fields.phtml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php $cfgRelation = PMA_getRelationsParam(); ?>
-<!-- Do not expand HTML here, invisible characters will make javascript crash -->
-<div id="script_server" class="hide"><?= htmlspecialchars($GLOBALS['server']); ?></div>
-<div id="script_db" class="hide"><?= htmlspecialchars($_GET['db']); ?></div>
-<div id="script_token" class="hide"><?= htmlspecialchars($_GET['token']); ?></div>
-<div id="script_tables" class="hide"><?= htmlspecialchars(json_encode($script_tables)); ?></div>
-<div id="script_contr" class="hide"><?= htmlspecialchars(json_encode($script_contr)); ?></div>
-<div id="script_display_field" class="hide"><?= htmlspecialchars(json_encode($script_display_field)); ?></div>
-<div id="script_display_page" class="hide"><?= htmlspecialchars($display_page); ?></div>
-<div id="pmd_tables_enabled" class="hide"><?= htmlspecialchars($cfgRelation['pdfwork']); ?></div>
\ No newline at end of file
diff --git a/#pma/templates/database/designer/new_relation_panel.phtml b/#pma/templates/database/designer/new_relation_panel.phtml
deleted file mode 100644
index bc449a0e..00000000
--- a/#pma/templates/database/designer/new_relation_panel.phtml
+++ /dev/null
@@ -1,108 +0,0 @@
-<table id="layer_new_relation" style="display:none;" width="5%" cellpadding="0" cellspacing="0">
-    <tbody>
-        <tr>
-            <td class="frams1" width="10px">
-            </td>
-            <td class="frams5" width="99%" >
-            </td>
-            <td class="frams2" width="10px">
-                <div class="bor">
-                </div>
-            </td>
-        </tr>
-        <tr>
-            <td class="frams8">
-            </td>
-            <td class="input_tab">
-                <table width="168" class="center" cellpadding="2" cellspacing="0">
-                    <thead>
-                        <tr>
-                            <td colspan="2" class="center nowrap">
-                                <strong>
-                                    <?= __('Create relation'); ?>
-                                </strong>
-                            </td>
-                        </tr>
-                    </thead>
-                    <tbody id="foreign_relation">
-                        <tr>
-                            <td colspan="2" class="center nowrap">
-                                <strong>
-                                    FOREIGN KEY
-                                </strong>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td width="58" class="nowrap">
-                                on delete
-                            </td>
-                            <td width="102">
-                                <select name="on_delete" id="on_delete">
-                                    <option value="nix" selected="selected">
-                                        --
-                                    </option>
-                                    <option value="CASCADE">
-                                        CASCADE
-                                    </option>
-                                    <option value="SET NULL">
-                                        SET NULL
-                                    </option>
-                                    <option value="NO ACTION">
-                                        NO ACTION
-                                    </option>
-                                    <option value="RESTRICT">
-                                        RESTRICT
-                                    </option>
-                                </select>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td class="nowrap">
-                                on update
-                            </td>
-                            <td>
-                                <select name="on_update" id="on_update">
-                                    <option value="nix" selected="selected">
-                                        --
-                                    </option>
-                                    <option value="CASCADE">
-                                        CASCADE
-                                    </option>
-                                    <option value="SET NULL">
-                                        SET NULL
-                                    </option>
-                                    <option value="NO ACTION">
-                                        NO ACTION
-                                    </option>
-                                    <option value="RESTRICT">
-                                        RESTRICT
-                                    </option>
-                                </select>
-                            </td>
-                        </tr>
-                    </tbody>
-                    <tbody>
-                        <tr>
-                            <td colspan="2" class="center nowrap">
-                                <input type="button" id="ok_new_rel_panel" class="butt" name="Button" value="<?= __('OK'); ?>" />
-                                <input type="button" id="cancel_new_rel_panel" class="butt" name="Button" value="<?= __('Cancel'); ?>" />
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </td>
-            <td class="frams6">
-            </td>
-        </tr>
-        <tr>
-            <td class="frams4">
-                <div class="bor">
-                </div>
-            </td>
-            <td class="frams7">
-            </td>
-            <td class="frams3">
-            </td>
-        </tr>
-    </tbody>
-</table>
\ No newline at end of file
diff --git a/#pma/templates/database/designer/options_panel.phtml b/#pma/templates/database/designer/options_panel.phtml
deleted file mode 100644
index cfe9cbb5..00000000
--- a/#pma/templates/database/designer/options_panel.phtml
+++ /dev/null
@@ -1,273 +0,0 @@
-<table id="pmd_optionse" style="display:none;" width="5%" cellpadding="0" cellspacing="0">
-    <tbody>
-        <tr>
-            <td class="frams1" width="10px">
-            </td>
-            <td class="frams5" width="99%" >
-            </td>
-            <td class="frams2" width="10px">
-                <div class="bor">
-                </div>
-            </td>
-        </tr>
-        <tr>
-            <td class="frams8">
-            </td>
-            <td class="input_tab">
-                <table width="168" class="center" cellpadding="2" cellspacing="0">
-                    <thead>
-                        <tr>
-                            <td colspan="2" rowspan="2" id="option_col_name" class="center nowrap">
-                            </td>
-                        </tr>
-                    </thead>
-                    <tbody id="where">
-                        <tr>
-                            <td class="center nowrap">
-                                <b>
-                                    WHERE
-                                </b>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td width="58" class="nowrap">
-                                <?= __('Relation operator'); ?>
-                            </td>
-                            <td width="102">
-                                <select name="rel_opt" id="rel_opt">
-                                    <option value="--" selected="selected">
-                                        --
-                                    </option>
-                                    <option value="=">
-                                        =
-                                    </option>
-                                    <option value="&gt;">
-                                        &gt;
-                                    </option>
-                                    <option value="&lt;">
-                                        &lt;
-                                    </option>
-                                    <option value="&gt;=">
-                                        &gt;=
-                                    </option>
-                                    <option value="&lt;=">
-                                        &lt;=
-                                    </option>
-                                    <option value="NOT">
-                                        NOT
-                                    </option>
-                                    <option value="IN">
-                                        IN
-                                    </option>
-                                    <option value="EXCEPT">
-                                        <?= __('Except'); ?>
-                                    </option>
-                                    <option value="NOT IN">
-                                        NOT IN
-                                    </option>
-                                </select>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td class="nowrap">
-                                <?= __('Value'); ?>
-                                <br />
-                                <?= __('subquery'); ?>
-                            </td>
-                            <td>
-                                <textarea id="Query" value="" cols="18">
-                                </textarea>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td class="center nowrap">
-                                <b>
-                                    <?= __('Rename to'); ?>
-                                </b>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td width="58" class="nowrap">
-                                <?= __('New name'); ?>
-                            </td>
-                            <td width="102">
-                                <input type="text" value="" id="new_name"/>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td class="center nowrap">
-                                <b>
-                                    <?= __('Aggregate'); ?>
-                                </b>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td width="58" class="nowrap">
-                                <?= __('Operator'); ?>
-                            </td>
-                            <td width="102">
-                                <select name="operator" id="operator">
-                                    <option value="---" selected="selected">
-                                        ---
-                                    </option>
-                                    <option value="sum" >
-                                        SUM
-                                    </option>
-                                    <option value="min">
-                                        MIN
-                                    </option>
-                                    <option value="max">
-                                        MAX
-                                    </option>
-                                    <option value="avg">
-                                        AVG
-                                    </option>
-                                    <option value="count">
-                                        COUNT
-                                    </option>
-                                </select>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td width="58" class="center nowrap">
-                                <b>
-                                    GROUP BY
-                                </b>
-                            </td>
-                            <td>
-                                <input type="checkbox" value="groupby" id="groupby"/>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td width="58" class="center nowrap">
-                                <b>
-                                    ORDER BY
-                                </b>
-                            </td>
-                            <td>
-                                <select name="orderby" id="orderby">
-                                    <option value="---" selected="selected">
-                                        ---
-                                    </option>
-                                    <option value="ASC" >
-                                        ASC
-                                    </option>
-                                    <option value="DESC">
-                                        DESC
-                                    </option>
-                                </select>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td class="center nowrap">
-                                <b>
-                                    HAVING
-                                </b>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td width="58" class="nowrap">
-                                <?= __('Operator'); ?>
-                            </td>
-                            <td width="102">
-                                <select name="h_operator" id="h_operator">
-                                    <option value="---" selected="selected">
-                                        ---
-                                    </option>
-                                    <option value="None" >
-                                        <?= __('None'); ?>
-                                    </option>
-                                    <option value="sum" >
-                                        SUM
-                                    </option>
-                                    <option value="min">
-                                        MIN
-                                    </option>
-                                    <option value="max">
-                                        MAX
-                                    </option>
-                                    <option value="avg">
-                                        AVG
-                                    </option>
-                                    <option value="count">
-                                        COUNT
-                                    </option>
-                                </select>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td width="58" class="nowrap">
-                                <?= __('Relation operator'); ?>
-                            </td>
-                            <td width="102">
-                                <select name="h_rel_opt" id="h_rel_opt">
-                                    <option value="--" selected="selected">
-                                        --
-                                    </option>
-                                    <option value="=">
-                                        =
-                                    </option>
-                                    <option value="&gt;">
-                                        &gt;
-                                    </option>
-                                    <option value="&lt;">
-                                        &lt;
-                                    </option>
-                                    <option value="&gt;=">
-                                        &gt;=
-                                    </option>
-                                    <option value="&lt;=">
-                                        &lt;=
-                                    </option>
-                                    <option value="NOT">
-                                        NOT
-                                    </option>
-                                    <option value="IN">
-                                        IN
-                                    </option>
-                                    <option value="EXCEPT">
-                                        <?= __('Except'); ?>
-                                    </option>
-                                    <option value="NOT IN">
-                                        NOT IN
-                                    </option>
-                                </select>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td width="58" class="nowrap">
-                                <?= __('Value'); ?>
-                                <br/>
-                                <?= __('subquery'); ?>
-                            </td>
-                            <td width="102">
-                                <textarea id="having" value="" cols="18">
-                                </textarea>
-                            </td>
-                        </tr>
-                    </tbody>
-                    <tbody>
-                        <tr>
-                            <td colspan="2" class="center nowrap">
-                                <input type="button" id="ok_add_object" class="butt" name="Button" value="<?= __('OK'); ?>" />
-                                <input type="button" id="cancel_close_option" class="butt" name="Button" value="<?= __('Cancel'); ?>" />
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </td>
-            <td class="frams6">
-            </td>
-        </tr>
-        <tr>
-            <td class="frams4">
-                <div class="bor">
-                </div>
-            </td>
-            <td class="frams7">
-            </td>
-            <td class="frams3">
-            </td>
-        </tr>
-    </tbody>
-</table>
\ No newline at end of file
diff --git a/#pma/templates/database/designer/page_save_as.phtml b/#pma/templates/database/designer/page_save_as.phtml
deleted file mode 100644
index 6bd5c59a..00000000
--- a/#pma/templates/database/designer/page_save_as.phtml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-$cfgRelation = PMA_getRelationsParam();
-$choices = array(
-    'same' => __('Save to selected page'),
-    'new' => __('Create a page and save to it')
-);
-?>
-<form action="db_designer.php" method="post" name="save_as_pages" id="save_as_pages" class="ajax">
-    <?= PMA_URL_getHiddenInputs($db); ?>
-    <fieldset id="page_save_as_options">
-        <table>
-            <tbody>
-                <tr>
-                    <td>
-                        <input type="hidden" name="operation" value="savePage" />
-                        <?= PMA_getHtmlForPageSelector($cfgRelation, $db); ?>
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <?= PMA\libraries\Util::getRadioFields('save_page', $choices, 'same', true); ?>
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <label for="selected_value"><?= __('New page name'); ?></label>
-                        <input type="text" name="selected_value" id="selected_value" />
-                    </td>
-                </tr>
-            </tbody>
-        </table>
-    </fieldset>
-</form>
\ No newline at end of file
diff --git a/#pma/templates/database/designer/page_selector.phtml b/#pma/templates/database/designer/page_selector.phtml
deleted file mode 100644
index 67863d2d..00000000
--- a/#pma/templates/database/designer/page_selector.phtml
+++ /dev/null
@@ -1,10 +0,0 @@
-<select name="selected_page" id="selected_page">
-    <option value="0">-- <?= __('Select page'); ?> --</option>
-    <?php if ($cfgRelation['pdfwork']) : $pages = PMA_getPageIdsAndNames($db); ?>
-        <?php foreach ($pages as $nr => $desc) : ?>
-            <option value="<?= $nr; ?>">
-                <?= htmlspecialchars($desc); ?>
-            </option>
-        <?php endforeach; ?>
-    <?php endif; ?>
-</select>
\ No newline at end of file
diff --git a/#pma/templates/database/designer/query_details.phtml b/#pma/templates/database/designer/query_details.phtml
deleted file mode 100644
index a461bb23..00000000
--- a/#pma/templates/database/designer/query_details.phtml
+++ /dev/null
@@ -1,19 +0,0 @@
-<div class="panel">
-    <div style="clear:both;">
-    </div>
-    <div id="ab">
-    </div>
-    <div style="clear:both;">
-    </div>
-</div>
-<a class="trigger" href="#">
-    <?= __('Active options'); ?>
-</a>
-<div id="box">
-    <form method="post" action="db_qbe.php" id="vqb_form">
-        <textarea cols="80" name="sql_query" id="textSqlquery" rows="15">
-        </textarea>
-        <input type="hidden" name="submit_sql" value="true">
-        <?= PMA_URL_getHiddenInputs($_GET['db']); ?>
-    </form>
-</div>
\ No newline at end of file
diff --git a/#pma/templates/database/designer/rename_to_panel.phtml b/#pma/templates/database/designer/rename_to_panel.phtml
deleted file mode 100644
index 42f4dba0..00000000
--- a/#pma/templates/database/designer/rename_to_panel.phtml
+++ /dev/null
@@ -1,66 +0,0 @@
-
-<table id="query_rename_to" style="display:none;" width="5%" cellpadding="0" cellspacing="0">
-    <tbody>
-        <tr>
-            <td class="frams1" width="10px">
-            </td>
-            <td class="frams5" width="99%" >
-            </td>
-            <td class="frams2" width="10px">
-                <div class="bor">
-                </div>
-            </td>
-        </tr>
-        <tr>
-            <td class="frams8">
-            </td>
-            <td class="input_tab">
-                <table width="168" class="center" cellpadding="2" cellspacing="0">
-                    <thead>
-                        <tr>
-                            <td colspan="2" class="center nowrap">
-                                <strong>
-                                    <?= __('Rename to'); ?>
-                                </strong>
-                            </td>
-                        </tr>
-                    </thead>
-                    <tbody id="rename_to">
-                        <tr>
-                            <td width="58" class="nowrap">
-                                <?= __('New name'); ?>
-                            </td>
-                            <td width="102">
-                                <input type="text" value="" id="e_rename"/>
-                            </td>
-                        </tr>
-                    </tbody>
-                    <tbody>
-                        <tr>
-                            <td colspan="2" class="center nowrap">
-                                <input type="button" id="ok_edit_rename" class="butt" name="Button" value="<?= __('OK'); ?>" />
-                                <input type="button"
-                                       class="butt"
-                                       name="Button"
-                                       value="<?= __('Cancel'); ?>"
-                                       onclick="document.getElementById('query_rename_to').style.display = 'none';" />
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </td>
-            <td class="frams6">
-            </td>
-        </tr>
-        <tr>
-            <td class="frams4">
-                <div class="bor">
-                </div>
-            </td>
-            <td class="frams7">
-            </td>
-            <td class="frams3">
-            </td>
-        </tr>
-    </tbody>
-</table>
\ No newline at end of file
diff --git a/#pma/templates/database/designer/schema_export.phtml b/#pma/templates/database/designer/schema_export.phtml
deleted file mode 100644
index c01f6a7d..00000000
--- a/#pma/templates/database/designer/schema_export.phtml
+++ /dev/null
@@ -1,11 +0,0 @@
-<form method="post" action="schema_export.php" class="disableAjax" id="id_export_pages">
-    <fieldset>
-        <?= PMA_URL_getHiddenInputs($db); ?>
-        <label><?= __('Select Export Relational Type'); ?></label><br/>
-        <?= PMA_pluginGetChoice(
-            'Schema', 'export_type', $export_list, 'format'
-        ); ?>
-        <input type="hidden" name="page_number" value="<?= htmlspecialchars($page); ?>" />
-        <?= PMA_pluginGetOptions('Schema', $export_list); ?>
-    </fieldset>
-</form>
diff --git a/#pma/templates/database/designer/side_menu.phtml b/#pma/templates/database/designer/side_menu.phtml
deleted file mode 100644
index de50373d..00000000
--- a/#pma/templates/database/designer/side_menu.phtml
+++ /dev/null
@@ -1,189 +0,0 @@
-<?php
-function getImg($path)
-{
-    return $_SESSION['PMA_Theme']->getImgPath($path);
-}
-?>
-<?php if (!$visualBuilder) : ?>
-    <div id="name-panel" style="overflow:hidden">
-        <span id="page_name" style="border:none">
-            <?= $selected_page == null ? __("Untitled") : htmlspecialchars($selected_page); ?>
-        </span>
-        <span id="saved_state" style="border:none">
-            <?= $selected_page == null ? '*' : ''; ?>
-        </span>
-    </div>
-<?php endif; ?>
-<div class="pmd_header side-menu" id="side_menu">
-    <a class="M_butt" id="key_Show_left_menu" href="#">
-        <img title="<?= __('Show/Hide tables list'); ?>"
-             alt="v"
-             src="<?= getImg('pmd/downarrow2_m.png'); ?>"
-             data-down="<?= getImg('pmd/downarrow2_m.png'); ?>"
-             data-up="<?= getImg('pmd/uparrow2_m.png'); ?>" />
-        <span class="hide hidable">
-            <?= __('Show/Hide tables list'); ?>
-        </span>
-    </a>
-    <a href="#" id="toggleFullscreen" class="M_butt">
-        <img title="<?= __('View in fullscreen'); ?>"
-             src="<?= getImg('pmd/viewInFullscreen.png'); ?>"
-             data-enter="<?= getImg('pmd/viewInFullscreen.png'); ?>"
-             data-exit="<?= getImg('pmd/exitFullscreen.png'); ?>" />
-        <span class="hide hidable"
-              data-exit="<?= __('Exit fullscreen'); ?>"
-              data-enter="<?= __('View in fullscreen'); ?>">
-            <?= __('View in fullscreen'); ?>
-        </span>
-    </a>
-    <?php if (! $visualBuilder) : ?>
-        <a id="newPage" href="#" class="M_butt">
-            <img title="<?= __('New page'); ?>"
-                 alt=""
-                 src="<?= getImg('pmd/page_add.png'); ?>" />
-            <span class="hide hidable">
-                <?= __('New page'); ?>
-            </span>
-        </a>
-        <a href="#" id="editPage" class="M_butt ajax">
-            <img title="<?= __('Open page'); ?>"
-                 src="<?= getImg('pmd/page_edit.png'); ?>" />
-            <span class="hide hidable">
-                <?= __('Open page'); ?>
-            </span>
-        </a>
-        <a href="#" id="savePos" class="M_butt">
-            <img title="<?= __('Save page'); ?>"
-                 src="<?= getImg('pmd/save.png'); ?>" />
-            <span class="hide hidable">
-                <?= __('Save page'); ?>
-            </span>
-        </a>
-        <a href="#" id="SaveAs" class="M_butt ajax">
-            <img title="<?= __('Save page as'); ?>"
-                 src="<?= getImg('pmd/save_as.png'); ?>" />
-            <span class="hide hidable">
-                <?= __('Save page as'); ?>
-            </span>
-        </a>
-        <a href="#" id="delPages" class="M_butt ajax">
-            <img title="<?= __('Delete pages'); ?>"
-                 src="<?= getImg('pmd/page_delete.png'); ?>" />
-            <span class="hide hidable">
-                <?= __('Delete pages'); ?>
-            </span>
-        </a>
-        <a href="#" id="StartTableNew" class="M_butt">
-            <img title="<?= __('Create table'); ?>"
-                 src="<?= getImg('pmd/table.png'); ?>" />
-            <span class="hide hidable">
-                <?= __('Create table'); ?>
-            </span>
-        </a>
-        <a href="#" class="M_butt" id="rel_button">
-            <img title="<?= __('Create relation'); ?>"
-                 src="<?= getImg('pmd/relation.png'); ?>" />
-            <span class="hide hidable">
-                <?= __('Create relation'); ?>
-            </span>
-        </a>
-        <a href="#" class="M_butt" id="display_field_button">
-            <img title="<?= __('Choose column to display'); ?>"
-                 src="<?= getImg('pmd/display_field.png'); ?>" />
-            <span class="hide hidable">
-                <?= __('Choose column to display'); ?>
-            </span>
-        </a>
-        <a href="#" id="reloadPage" class="M_butt">
-            <img title="<?= __('Reload'); ?>"
-                 src="<?= getImg('pmd/reload.png'); ?>" />
-            <span class="hide hidable">
-                <?= __('Reload'); ?>
-            </span>
-        </a>
-        <a href="<?= PMA\libraries\Util::getDocuLink('faq', 'faq6-31'); ?>"
-           target="documentation"
-           class="M_butt">
-            <img title="<?= __('Help'); ?>"
-                 src="<?= getImg('pmd/help.png'); ?>" />
-            <span class="hide hidable">
-                <?= __('Help'); ?>
-            </span>
-        </a>
-    <?php endif; ?>
-    <a href="#" class="<?= $params_array['angular_direct']; ?>" id="angular_direct_button">
-        <img title="<?= __('Angular links'); ?> / <?= __('Direct links'); ?>"
-             src="<?= getImg('pmd/ang_direct.png'); ?>" />
-        <span class="hide hidable">
-            <?= __('Angular links'); ?> / <?= __('Direct links'); ?>
-        </span>
-    </a>
-    <a href="#" class="<?= $params_array['snap_to_grid']; ?>" id="grid_button">
-        <img title="<?= __('Snap to grid'); ?>" src="<?= getImg('pmd/grid.png'); ?>" />
-        <span class="hide hidable">
-            <?= __('Snap to grid'); ?>
-        </span>
-    </a>
-    <a href="#" class="<?= $params_array['small_big_all']; ?>" id="key_SB_all">
-        <img title="<?= __('Small/Big All'); ?>"
-             alt="v"
-             src="<?= getImg('pmd/downarrow1.png'); ?>"
-             data-down="<?= getImg('pmd/downarrow1.png'); ?>"
-             data-right="<?= getImg('pmd/rightarrow1.png') ?>" />
-        <span class="hide hidable">
-            <?= __('Small/Big All'); ?>
-        </span>
-    </a>
-    <a href="#" id="SmallTabInvert" class="M_butt" >
-        <img title="<?= __('Toggle small/big'); ?>"
-             src="<?= getImg('pmd/bottom.png'); ?>" />
-        <span class="hide hidable">
-            <?= __('Toggle small/big'); ?>
-        </span>
-    </a>
-    <a href="#" id="relLineInvert" class="<?= $params_array['relation_lines']; ?>" >
-        <img title="<?= __('Toggle relation lines'); ?>"
-             src="<?= getImg('pmd/toggle_lines.png'); ?>" />
-        <span class="hide hidable">
-            <?= __('Toggle relation lines'); ?>
-        </span>
-    </a>
-    <?php if (! $visualBuilder) : ?>
-        <a href="#" id="exportPages" class="M_butt" >
-            <img title="<?= __('Export schema'); ?>"
-                 src="<?= getImg('pmd/export.png'); ?>" />
-            <span class="hide hidable">
-                <?= __('Export schema'); ?>
-            </span>
-        </a>
-    <?php else: ?>
-        <a class="M_butt"
-           href="#"
-           onclick="build_query('SQL Query on Database', 0)"
-           onmousedown="return false;"
-           class="M_butt">
-            <img title="<?= __('Build Query'); ?>"
-                 src="<?= getImg('pmd/query_builder.png'); ?>" />
-            <span class="hide hidable">
-                <?= __('Build Query'); ?>
-            </span>
-        </a>
-    <?php endif; ?>
-    <a href="#" class="<?= $params_array['side_menu']; ?>" id="key_Left_Right">
-        <img title="<?= __('Move Menu'); ?>" alt=">"
-             data-right="<?= getImg('pmd/2leftarrow_m.png'); ?>"
-             src="<?= getImg('pmd/2rightarrow_m.png'); ?>" />
-        <span class="hide hidable">
-            <?= __('Move Menu'); ?>
-        </span>
-    </a>
-    <a href="#" class="<?= $params_array['pin_text']; ?>" id="pin_Text">
-        <img title="<?= __('Pin text'); ?>"
-             alt=">"
-             data-right="<?= getImg('pmd/anchor.png'); ?>"
-             src="<?= getImg('pmd/anchor.png'); ?>" />
-        <span class="hide hidable">
-            <?= __('Pin text'); ?>
-        </span>
-    </a>
-</div>
\ No newline at end of file
diff --git a/#pma/templates/database/designer/table_list.phtml b/#pma/templates/database/designer/table_list.phtml
deleted file mode 100644
index b4a15587..00000000
--- a/#pma/templates/database/designer/table_list.phtml
+++ /dev/null
@@ -1,69 +0,0 @@
-<div id="layer_menu" style="display:none;">
-    <div class="center">
-        <a href="#" class="M_butt" target="_self" >
-            <img title="<?= __('Hide/Show all'); ?>"
-                 alt="v"
-                 id="key_HS_all"
-                 src="<?= $_SESSION['PMA_Theme']->getImgPath('pmd/downarrow1.png'); ?>"
-                 data-down="<?= $_SESSION['PMA_Theme']->getImgPath('pmd/downarrow1.png'); ?>"
-                 data-right="<?= $_SESSION['PMA_Theme']->getImgPath('pmd/rightarrow1.png'); ?>" />
-        </a>
-        <a href="#" class="M_butt" target="_self" >
-            <img alt="v"
-                 id="key_HS"
-                 title="<?= __('Hide/Show Tables with no relation'); ?>"
-                 src="<?= $_SESSION['PMA_Theme']->getImgPath('pmd/downarrow2.png'); ?>"
-                 data-down="<?= $_SESSION['PMA_Theme']->getImgPath('pmd/downarrow2.png'); ?>"
-                 data-right="<?= $_SESSION['PMA_Theme']->getImgPath('pmd/rightarrow2.png'); ?>" />
-        </a>
-    </div>
-    <div id="id_scroll_tab" class="scroll_tab">
-        <table width="100%" style="padding-left: 3px;">
-            <?php $name_cnt = count($GLOBALS['PMD']['TABLE_NAME']);
-            for ($i = 0; $i < $name_cnt; $i++) :
-                $checked = (isset($tab_pos[$GLOBALS['PMD']["TABLE_NAME"][$i]])
-                    && $tab_pos[$GLOBALS['PMD']["TABLE_NAME"][$i]]["H"])
-                    || $display_page == -1; ?>
-                <tr>
-                    <td title="<?= __('Structure'); ?>"
-                        width="1px"
-                        onmouseover="this.className='L_butt2_2'"
-                        onmouseout="this.className='L_butt2_1'"
-                        class="L_butt2_1">
-                        <img alt=""
-                             table_name="<?= $GLOBALS['PMD_URL']['TABLE_NAME_SMALL'][$i]; ?>"
-                             class="scroll_tab_struct"
-                             src="<?= $_SESSION['PMA_Theme']->getImgPath('pmd/exec.png'); ?>"/>
-                    </td>
-                    <td width="1px">
-                        <input class="scroll_tab_checkbox"
-                               title="<?= __('Hide'); ?>"
-                               id="check_vis_<?= $GLOBALS['PMD_URL']["TABLE_NAME"][$i]; ?>"
-                               style="margin:0;"
-                               type="checkbox"
-                               value="<?= $GLOBALS['PMD_URL']["TABLE_NAME"][$i]; ?>"
-                               <?php if ($checked) : ?>checked="checked"<?php endif; ?> />
-                    </td>
-                    <td class="pmd_Tabs"
-                        onmouseover="this.className='pmd_Tabs2'"
-                        onmouseout="this.className='pmd_Tabs'"
-                        pmd_url_table_name="<?= $GLOBALS['PMD_URL']['TABLE_NAME'][$i]; ?>">
-                        <?= $GLOBALS['PMD_OUT']["TABLE_NAME"][$i]; ?>
-                    </td>
-                </tr>
-            <?php endfor; ?>
-        </table>
-    </div>
-    <!-- end id_scroll_tab -->
-    <div class="center">
-        <?= __('Number of tables:'); ?> <?= $name_cnt; ?>
-    </div>
-    <div id="layer_menu_sizer" onmousedown="layer_menu_cur_click=1">
-        <div class="floatleft">
-            <img class="icon"
-                 data-right="<?= $_SESSION['PMA_Theme']->getImgPath('pmd/resizeright.png'); ?>"
-                 src="<?= $_SESSION['PMA_Theme']->getImgPath('pmd/resize.png'); ?>"/>
-        </div>
-    </div>
-</div>
-<!-- end layer_menu -->
\ No newline at end of file
diff --git a/#pma/templates/database/designer/where_query_panel.phtml b/#pma/templates/database/designer/where_query_panel.phtml
deleted file mode 100644
index e588f411..00000000
--- a/#pma/templates/database/designer/where_query_panel.phtml
+++ /dev/null
@@ -1,103 +0,0 @@
-<table id="query_where" style="display:none;"width="5%" cellpadding="0" cellspacing="0">
-    <tbody>
-        <tr>
-            <td class="frams1" width="10px">
-            </td>
-            <td class="frams5" width="99%" >
-            </td>
-            <td class="frams2" width="10px">
-                <div class="bor">
-                </div>
-            </td>
-        </tr>
-        <tr>
-            <td class="frams8">
-            </td>
-            <td class="input_tab">
-                <table width="168" class="center" cellpadding="2" cellspacing="0">
-                    <thead>
-                        <tr>
-                            <td colspan="2" class="center nowrap">
-                                <strong>
-                                    WHERE
-                                </strong>
-                            </td>
-                        </tr>
-                    </thead>
-                    <tbody id="rename_to">
-                        <tr>
-                            <td width="58" class="nowrap">
-                                <?= __('Operator'); ?>
-                            </td>
-                            <td width="102">
-                                <select name="erel_opt" id="erel_opt">
-                                    <option value="--" selected="selected">
-                                        --
-                                    </option>
-                                    <option value="=" >
-                                        =
-                                    </option>
-                                    <option value="&gt;">
-                                        &gt;
-                                    </option>
-                                    <option value="&lt;">
-                                        &lt;
-                                    </option>
-                                    <option value="&gt;=">
-                                        &gt;=
-                                    </option>
-                                    <option value="&lt;=">
-                                        &lt;=
-                                    </option>
-                                    <option value="NOT">
-                                        NOT
-                                    </option>
-                                    <option value="IN">
-                                        IN
-                                    </option>
-                                    <option value="EXCEPT">
-                                        <?= __('Except'); ?>
-                                    </option>
-                                    <option value="NOT IN">
-                                        NOT IN
-                                    </option>
-                                </select>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td class="nowrap">
-                                <?= __('Value'); ?>
-                                <br />
-                                <?= __('subquery'); ?>
-                            </td>
-                            <td>
-                                <textarea id="eQuery" value="" cols="18">
-                                </textarea>
-                            </td>
-                        </tr>
-                    </tbody>
-                    <tbody>
-                        <tr>
-                            <td colspan="2" class="center nowrap">
-                                <input type="button" id="ok_edit_where" class="butt" name="Button" value="<?= __('OK'); ?>" />
-                                <input type="button" class="butt" name="Button" value="<?= __('Cancel'); ?>" onclick="document.getElementById('query_where').style.display = 'none'" />
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </td>
-            <td class="frams6">
-            </td>
-        </tr>
-        <tr>
-            <td class="frams4">
-                <div class="bor">
-                </div>
-            </td>
-            <td class="frams7">
-            </td>
-            <td class="frams3">
-            </td>
-        </tr>
-    </tbody>
-</table>
\ No newline at end of file
diff --git a/#pma/templates/database/structure/body_for_table_summary.phtml b/#pma/templates/database/structure/body_for_table_summary.phtml
deleted file mode 100644
index 715bebd0..00000000
--- a/#pma/templates/database/structure/body_for_table_summary.phtml
+++ /dev/null
@@ -1,93 +0,0 @@
-<tbody id="tbl_summary_row">
-<tr>
-<th class="print_ignore"></th>
-<th class="tbl_num nowrap">
-    <?php
-    printf(_ngettext('%s table', '%s tables', $num_tables),
-        PMA\libraries\Util::formatNumber($num_tables, 0)); ?>
-</th>
-<?php if ($server_slave_status): ?>
-    <th> <?= __('Replication'); ?> </th>
-<?php endif; ?>
-<?php
-$sum_colspan = ($db_is_system_schema ? 4 : 7);
-if ($GLOBALS['cfg']['NumFavoriteTables'] == 0) {
-    $sum_colspan--;
-} ?>
-<th colspan="<?= $sum_colspan; ?>" class="print_ignore" ><?= __('Sum'); ?></th>
-<?php
-$row_count_sum = PMA\libraries\Util::formatNumber($sum_entries, 0);
-// If a table shows approximate rows count, display update-all-real-count anchor.
-$row_sum_url = array();
-if (isset($approx_rows)) {
-    $row_sum_url = array(
-        'ajax_request'       => true,
-        'db'                 => $GLOBALS['db'],
-        'real_row_count'     => 'true',
-        'real_row_count_all' => 'true'
-    );
-}
-$cell_text = ($approx_rows)
-        ? '<a href="db_structure.php' . PMA_URL_getCommon($row_sum_url)
-        . '" class="ajax row_count_sum">' . '~' . $row_count_sum . '</a>'
-        : $row_count_sum;
-?>
-<th class="value tbl_rows"><?= $cell_text; ?></th>
-<?php if (!($GLOBALS['cfg']['PropertiesNumColumns'] > 1)): ?>
-    <?php
-        // MySQL <= 5.5.2
-        $default_engine = $GLOBALS['dbi']->fetchValue(
-            "SELECT @@storage_engine;"
-        );
-        if (empty($default_engine)) {
-            // MySQL >= 5.5.3
-            $default_engine = $GLOBALS['dbi']->fetchValue(
-                "SELECT @@default_storage_engine;"
-            );
-        }
-    ?>
-    <th class="center">
-        <dfn title="<?php printf(__('%s is the default storage engine on this MySQL server.'),
-                $default_engine); ?>"><?= $default_engine; ?></dfn>
-    </th>
-    <th>
-        <?php if (! empty($db_collation)): ?>
-            <dfn title="<?= PMA_getCollationDescr($db_collation) , ' (' , __('Default') , ')'; ?>">
-                <?= $db_collation; ?>
-            </dfn>
-        <?php endif; ?>
-    </th>
-<?php endif; ?>
-<?php if ($is_show_stats): ?>
-    <?php
-        list($sum_formatted, $unit) = PMA\libraries\Util::formatByteDown(
-            $sum_size, 3, 1
-        );
-        list($overhead_formatted, $overhead_unit)
-            = PMA\libraries\Util::formatByteDown($overhead_size, 3, 1);
-    ?>
-    <th class="value tbl_size"><?= $sum_formatted , ' ' , $unit; ?></th>
-    <th class="value tbl_overhead"><?= $overhead_formatted , ' ' , $overhead_unit; ?></th>
-<?php endif; ?>
-<?php if ($GLOBALS['cfg']['ShowDbStructureComment']): ?>
-    <th></th>
-<?php endif; ?>
-<?php if ($GLOBALS['cfg']['ShowDbStructureCreation']): ?>
-    <th class="value tbl_creation">
-        <?= ($create_time_all
-                ? PMA\libraries\Util::localisedDate(strtotime($create_time_all))
-                : '-'); ?>
-    </th>
-<?php endif; ?>
-<?php if ($GLOBALS['cfg']['ShowDbStructureLastUpdate']): ?>
-    <th class="value tbl_last_update"><?= ($update_time_all
-                ? PMA\libraries\Util::localisedDate(strtotime($update_time_all))
-                : '-'); ?></th>
-<?php endif; ?>
-<?php if ($GLOBALS['cfg']['ShowDbStructureLastCheck']): ?>
-    <th class="value tbl_last_check"><?= ($check_time_all
-                ? PMA\libraries\Util::localisedDate(strtotime($check_time_all))
-                : '-');?></th>
-<?php endif; ?>
-</tr>
-</tbody>
\ No newline at end of file
diff --git a/#pma/templates/database/structure/browse_table.phtml b/#pma/templates/database/structure/browse_table.phtml
deleted file mode 100644
index afdfd1a3..00000000
--- a/#pma/templates/database/structure/browse_table.phtml
+++ /dev/null
@@ -1,3 +0,0 @@
-<a href="sql.php<?= $tbl_url_query; ?>&amp;pos=0">
-    <?= $title; ?>
-</a>
\ No newline at end of file
diff --git a/#pma/templates/database/structure/browse_table_label.phtml b/#pma/templates/database/structure/browse_table_label.phtml
deleted file mode 100644
index 53b1b286..00000000
--- a/#pma/templates/database/structure/browse_table_label.phtml
+++ /dev/null
@@ -1,3 +0,0 @@
-<a href="sql.php<?= $tbl_url_query; ?>&amp;pos=0" title="<?= $title; ?>">
-    <?= $truename; ?>
-</a>
\ No newline at end of file
diff --git a/#pma/templates/database/structure/check_all_tables.phtml b/#pma/templates/database/structure/check_all_tables.phtml
deleted file mode 100644
index fea011f8..00000000
--- a/#pma/templates/database/structure/check_all_tables.phtml
+++ /dev/null
@@ -1,42 +0,0 @@
-<div class="clearfloat print_ignore">
-    <img class="selectallarrow" src="<?= $pmaThemeImage , 'arrow_' , $text_dir , '.png'; ?>" width="38" height="22" alt="<?php __('With selected:'); ?>" />
-    <input type="checkbox" id="tablesForm_checkall" class="checkall_box" title="<?= __('Check all'); ?>" />
-    <label for="tablesForm_checkall"><?= __('Check all'); ?></label>
-    <?php if ($overhead_check != ''): ?>
-         / <a href="#" onclick="unMarkAllRows('tablesForm'); <?= $overhead_check; ?> return false;"><?= __('Check tables having overhead'); ?></a>
-    <?php endif; ?>
-    <select name="submit_mult" style="margin: 0 3em 0 3em;">
-        <option value="<?= __('With selected:'); ?>" selected="selected"><?= __('With selected:'); ?></option>
-        <option value="copy_tbl"><?= __('Copy table')?></option>
-        <option value="show_create" ><?= __('Show create'); ?></option>
-        <option value="export" ><?= __('Export'); ?></option>
-        <?php if (!$db_is_system_schema
-                    && !$GLOBALS['cfg']['DisableMultiTableMaintenance']): ?>
-            <optgroup label="<?= __('Delete data or table'); ?>">
-                <option value="empty_tbl" ><?= __('Empty'); ?></option>
-                <option value="drop_tbl" ><?= __('Drop'); ?></option>
-            </optgroup>
-            <optgroup label="<?= __('Table maintenance'); ?>">
-                <option value="analyze_tbl" ><?= __('Analyze table'); ?></option>
-                <option value="check_tbl" ><?= __('Check table'); ?></option>
-                <option value="checksum_tbl" ><?= __('Checksum table'); ?></option>
-                <option value="optimize_tbl" ><?= __('Optimize table'); ?></option>
-                <option value="repair_tbl" ><?= __('Repair table'); ?></option>
-            </optgroup>
-            <optgroup label="<?= __('Prefix'); ?>">
-                <option value="add_prefix_tbl" ><?= __('Add prefix to table'); ?></option>
-                <option value="replace_prefix_tbl" ><?= __('Replace table prefix'); ?></option>
-                <option value="copy_tbl_change_prefix" ><?= __('Copy table with prefix'); ?></option>
-            </optgroup>
-        <?php endif; ?>
-        <?php if (isset($GLOBALS['cfgRelation']['centralcolumnswork'])
-                    && $GLOBALS['cfgRelation']['centralcolumnswork']): ?>
-            <optgroup label="<?= __('Central columns'); ?>">
-                <option value="sync_unique_columns_central_list" ><?= __('Add columns to central list'); ?></option>
-                <option value="delete_unique_columns_central_list" ><?= __('Remove columns from central list'); ?></option>
-                <option value="make_consistent_with_central_list" ><?= __('Make consistent with central list'); ?></option>
-            </optgroup>
-        <?php endif; ?>
-    </select>
-    <?= implode("\n", $hidden_fields); ?>
-</div>
\ No newline at end of file
diff --git a/#pma/templates/database/structure/empty_table.phtml b/#pma/templates/database/structure/empty_table.phtml
deleted file mode 100644
index 00a58c6b..00000000
--- a/#pma/templates/database/structure/empty_table.phtml
+++ /dev/null
@@ -1,3 +0,0 @@
-<a class="truncate_table_anchor ajax" href="sql.php<?= $tbl_url_query; ?>&amp;sql_query=<?= $sql_query; ?>&amp;message_to_show=<?= $message_to_show; ?>">
-    <?= $title; ?>
-</a>
\ No newline at end of file
diff --git a/#pma/templates/database/structure/favorite_anchor.phtml b/#pma/templates/database/structure/favorite_anchor.phtml
deleted file mode 100644
index 83b99edf..00000000
--- a/#pma/templates/database/structure/favorite_anchor.phtml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-// Check if current table is already in favorite list.
-$fav_params = array('db' => $db,
-    'ajax_request' => true,
-    'favorite_table' => $current_table['TABLE_NAME'],
-    (($already_favorite ? 'remove' : 'add') . '_favorite') => true
-);
-?>
-<a id="<?= md5($current_table['TABLE_NAME']); ?>_favorite_anchor"
-   class="ajax favorite_table_anchor"
-   href="<?= 'db_structure.php' , PMA_URL_getCommon($fav_params); ?>"
-   title="<?= $already_favorite ? __("Remove from Favorites") : __("Add to Favorites"); ?>"
-   data-favtargets="<?= md5($db . "." . $current_table['TABLE_NAME']); ?>" >
-    <?= !$already_favorite ? $titles['NoFavorite'] : $titles['Favorite']; ?>
-</a>
\ No newline at end of file
diff --git a/#pma/templates/database/structure/print_view_data_dictionary_link.phtml b/#pma/templates/database/structure/print_view_data_dictionary_link.phtml
deleted file mode 100644
index d1830b1e..00000000
--- a/#pma/templates/database/structure/print_view_data_dictionary_link.phtml
+++ /dev/null
@@ -1,7 +0,0 @@
-<p class="print_ignore">
-    <a href="#" id="printView">
-        <?= PMA\libraries\Util::getIcon('b_print.png', __('Print'), true); ?>
-    </a>
-    <a href="db_datadict.php<?= $url_query; ?>" target="print_view">
-        <?= PMA\libraries\Util::getIcon('b_tblanalyse.png', __('Data dictionary'), true); ?></a>
-</p>
\ No newline at end of file
diff --git a/#pma/templates/database/structure/search_table.phtml b/#pma/templates/database/structure/search_table.phtml
deleted file mode 100644
index 043f92ba..00000000
--- a/#pma/templates/database/structure/search_table.phtml
+++ /dev/null
@@ -1,3 +0,0 @@
-<a href="tbl_select.php<?= $tbl_url_query; ?>">
-    <?= $title; ?>
-</a>
\ No newline at end of file
diff --git a/#pma/templates/database/structure/show_create.phtml b/#pma/templates/database/structure/show_create.phtml
deleted file mode 100644
index 670220d3..00000000
--- a/#pma/templates/database/structure/show_create.phtml
+++ /dev/null
@@ -1,35 +0,0 @@
-<div class="show_create_results">
-    <h2><?= __('Showing create queries'); ?></h2>
-    <?php
-        $views = array();
-        $tables = array();
-        foreach ($db_objects as $object) {
-            if ($GLOBALS['dbi']->getTable($db, $object)->isView()) {
-                $views [] = $object;
-            } else {
-                $tables [] = $object;
-            }
-        }
-    ?>
-    <?php if (! empty($tables)): ?>
-        <?= PMA\libraries\Template::get('database/structure/show_create_row')->render(
-            array(
-              'db' => $db,
-              'title' => __('Tables'),
-              'raw_title' => 'Table',
-              'db_objects' => $tables
-            )
-        ) ?>
-    <?php endif; ?>
-
-    <?php if (! empty($views)): ?>
-        <?= PMA\libraries\Template::get('database/structure/show_create_row')->render(
-            array(
-                'db' => $db,
-                'title' => __('Views'),
-                'raw_title' => 'View',
-                'db_objects' => $views
-            )
-        ) ?>
-    <?php endif; ?>
-</div>
\ No newline at end of file
diff --git a/#pma/templates/database/structure/show_create_row.phtml b/#pma/templates/database/structure/show_create_row.phtml
deleted file mode 100644
index 9abba307..00000000
--- a/#pma/templates/database/structure/show_create_row.phtml
+++ /dev/null
@@ -1,22 +0,0 @@
-<fieldset>
-    <legend><?= $title; ?></legend>
-    <table class="show_create">
-        <thead>
-        <tr>
-            <th><?= $raw_title; ?></th>
-            <th>Create <?= $raw_title; ?></th>
-        </tr>
-        </thead>
-        <tbody>
-        <?php $odd = true; ?>
-        <?php foreach ($db_objects as $object): ?>
-            <?php $row_class = ($odd) ? 'odd' : 'even'; ?>
-            <tr class="<?= $row_class; ?>">
-                <td><strong><?= PMA_mimeDefaultFunction($object); ?></strong></td>
-                <td><?= PMA_mimeDefaultFunction($GLOBALS['dbi']->getTable($db, $object)->showCreate()); ?></td>
-            </tr>
-            <?php $odd = ! $odd; ?>
-        <?php endforeach; ?>
-        </tbody>
-    </table>
-</fieldset>
\ No newline at end of file
diff --git a/#pma/templates/database/structure/sortable_header.phtml b/#pma/templates/database/structure/sortable_header.phtml
deleted file mode 100644
index 43c655f2..00000000
--- a/#pma/templates/database/structure/sortable_header.phtml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-$requested_sort = 'table';
-$requested_sort_order = $future_sort_order = $initial_sort_order;
-// If the user requested a sort
-if (isset($_REQUEST['sort'])) {
-    $requested_sort = $_REQUEST['sort'];
-    if (isset($_REQUEST['sort_order'])) {
-        $requested_sort_order = $_REQUEST['sort_order'];
-    }
-}
-$order_img = '';
-$order_link_params = array();
-$order_link_params['title'] = __('Sort');
-// If this column was requested to be sorted.
-if ($requested_sort == $sort) {
-    if ($requested_sort_order == 'ASC') {
-        $future_sort_order = 'DESC';
-        // current sort order is ASC
-        $order_img  = ' ' . PMA\libraries\Util::getImage(
-            's_asc.png',
-            __('Ascending'),
-            array('class' => 'sort_arrow', 'title' => '')
-        );
-        $order_img .= ' ' . PMA\libraries\Util::getImage(
-            's_desc.png',
-             __('Descending'),
-            array('class' => 'sort_arrow hide', 'title' => '')
-        );
-        // but on mouse over, show the reverse order (DESC)
-        $order_link_params['onmouseover'] = "$('.sort_arrow').toggle();";
-        // on mouse out, show current sort order (ASC)
-        $order_link_params['onmouseout'] = "$('.sort_arrow').toggle();";
-    } else {
-        $future_sort_order = 'ASC';
-        // current sort order is DESC
-        $order_img  = ' ' . PMA\libraries\Util::getImage(
-            's_asc.png',
-            __('Ascending'),
-            array('class' => 'sort_arrow hide', 'title' => '')
-        );
-        $order_img .= ' ' . PMA\libraries\Util::getImage(
-            's_desc.png',
-            __('Descending'),
-            array('class' => 'sort_arrow', 'title' => '')
-        );
-        // but on mouse over, show the reverse order (ASC)
-        $order_link_params['onmouseover'] = "$('.sort_arrow').toggle();";
-        // on mouse out, show current sort order (DESC)
-        $order_link_params['onmouseout'] = "$('.sort_arrow').toggle();";
-    }
-}
-$_url_params = array(
-    'db' => $_REQUEST['db'],
-    'pos' => 0, // We set the position back to 0 every time they sort.
-    'sort' => $sort,
-    'sort_order' => $future_sort_order,
-);
-
-if (PMA_isValid($_REQUEST['tbl_type'], array('view', 'table'))) {
-     $_url_params['tbl_type'] = $_REQUEST['tbl_type'];
-}
-if (! empty($_REQUEST['tbl_group'])) {
-    $_url_params['tbl_group'] = $_REQUEST['tbl_group'];
-}
-
-$url = 'db_structure.php' . PMA_URL_getCommon($_url_params);
-
-echo PMA\libraries\Util::linkOrButton(
-    $url, $title . $order_img, $order_link_params
-);
diff --git a/#pma/templates/database/structure/structure_table_row.phtml b/#pma/templates/database/structure/structure_table_row.phtml
deleted file mode 100644
index 5c2165c2..00000000
--- a/#pma/templates/database/structure/structure_table_row.phtml
+++ /dev/null
@@ -1,187 +0,0 @@
-<tr class="<?= ($odd_row ? 'odd' : 'even') , ($table_is_view ? ' is_view' : '') ?>"
-    id="row_tbl_<?= $curr; ?>">
-    <td class="center print_ignore">
-        <input type="checkbox"
-               name="selected_tbl[]"
-               class="checkall"
-               value="<?= htmlspecialchars($current_table['TABLE_NAME']); ?>"
-               id="checkbox_tbl_<?= $curr; ?>" />
-    </td>
-    <th>
-        <?= $browse_table_label , $tracking_icon; ?>
-    </th>
-    <?php if ($server_slave_status): ?>
-        <td class="center">
-            <?= ($ignored ? PMA\libraries\Util::getImage('s_cancel.png', __('Not replicated')) : ''); ?>
-            <?= ($do ? PMA\libraries\Util::getImage('s_success.png', __('Replicated')) : ''); ?>
-        </td>
-    <?php endif; ?>
-
-    <?php
-    //Favorite table anchor.
-    ?>
-    <?php if ($GLOBALS['cfg']['NumFavoriteTables'] > 0): ?>
-        <td class="center print_ignore">
-            <?= PMA\libraries\Template::get('database/structure/favorite_anchor')->render(
-                array(
-                    'db' => $db,
-                    'current_table' => $current_table,
-                    'titles' => $titles,
-                    'already_favorite' => $already_favorite
-                )
-            ); ?>
-        </td>
-    <?php endif; ?>
-
-    <td class="center print_ignore">
-        <?= $browse_table; ?>
-    </td>
-    <td class="center print_ignore">
-        <a href="tbl_structure.php<?= $tbl_url_query; ?>">
-            <?= $titles['Structure']; ?>
-        </a>
-    </td>
-    <td class="center print_ignore">
-        <?= $search_table; ?>
-    </td>
-
-    <?php if (!$db_is_system_schema): ?>
-        <td class="insert_table center print_ignore">
-            <a href="tbl_change.php<?= $tbl_url_query; ?>"><?= $titles['Insert']; ?></a>
-        </td>
-        <td class="center print_ignore"><?= $empty_table; ?></td>
-        <td class="center print_ignore">
-            <a class="ajax drop_table_anchor <?= ($table_is_view || $current_table['ENGINE'] == null) ? ' view' : '' ?>"
-               href="sql.php<?= $tbl_url_query; ?>&amp;reload=1&amp;purge=1&amp;sql_query=<?= urlencode($drop_query); ?>&amp;message_to_show=<?= urlencode($drop_message); ?>" >
-                <?= $titles['Drop']; ?>
-            </a>
-        </td>
-    <?php endif; ?>
-
-    <?php if (isset($current_table['TABLE_ROWS']) &&
-        ($current_table['ENGINE'] != null || $table_is_view)): ?>
-
-        <?php
-        // Get the row count.
-        $row_count = PMA\libraries\Util::formatNumber($current_table['TABLE_ROWS'], 0);
-
-        // Content to be appended into 'tbl_rows' cell.
-        // If row count is approximate, display it as an anchor to get real count.
-        ?>
-        <td class="value tbl_rows"
-            data-table="<?= htmlspecialchars($current_table['TABLE_NAME']); ?>">
-            <?php if ($approx_rows): ?>
-                <a href="db_structure.php<?= PMA_URL_getCommon(
-                    array(
-                        'ajax_request'   => true,
-                        'db'             => $GLOBALS['db'],
-                        'table'          => $current_table['TABLE_NAME'],
-                        'real_row_count' => 'true'
-                    )
-                ); ?>" class="ajax real_row_count">
-                    <bdi>
-                        ~<?= $row_count; ?>
-                    </bdi>
-                </a>
-            <?php else: ?>
-                <?= $row_count; ?>
-            <?php endif; ?>
-            <?= $show_superscript; ?>
-        </td>
-
-        <?php if (!($GLOBALS['cfg']['PropertiesNumColumns'] > 1)): ?>
-            <td class="nowrap">
-                <?php if (!empty($current_table['ENGINE'])): ?>
-                    <?= $current_table['ENGINE']; ?>
-                <?php elseif ($table_is_view): ?>
-                    <?= __('View'); ?>
-                <?php endif; ?>
-            </td>
-            <?php if (mb_strlen($collation)): ?>
-                <td class="nowrap">
-                    <?= $collation; ?>
-                </td>
-            <?php endif; ?>
-        <?php endif; ?>
-
-        <?php if ($is_show_stats): ?>
-            <td class="value tbl_size">
-                <a href="tbl_structure.php<?= $tbl_url_query ?>#showusage">
-                    <span><?= $formatted_size; ?></span>
-                    <span class="unit"><?= $unit; ?></span>
-                </a>
-            </td>
-            <td class="value tbl_overhead">
-                <?= $overhead; ?>
-            </td>
-        <?php endif; ?>
-
-        <?php if ($GLOBALS['cfg']['ShowDbStructureComment']): ?>
-            <?php $comment = $current_table['Comment']; ?>
-            <td>
-                <?php if (mb_strlen($comment) > $GLOBALS['cfg']['LimitChars']): ?>
-                    <abbr title="<?= htmlspecialchars($comment); ?>">
-                        <?= htmlspecialchars(
-                            mb_substr(
-                                $comment, 0, $GLOBALS['cfg']['LimitChars']
-                            )
-                        ); ?>
-                        ...
-                    </abbr>
-                <?php else: ?>
-                    <?= htmlspecialchars($comment); ?>
-                <?php endif; ?>
-            </td>
-        <?php endif; ?>
-
-        <?php if ($GLOBALS['cfg']['ShowDbStructureCreation']): ?>
-            <td class="value tbl_creation">
-                <?= $create_time ? PMA\libraries\Util::localisedDate(strtotime($create_time)) : '-'; ?>
-            </td>
-        <?php endif; ?>
-
-        <?php if ($GLOBALS['cfg']['ShowDbStructureLastUpdate']): ?>
-            <td class="value tbl_last_update">
-                <?= $update_time ? PMA\libraries\Util::localisedDate(strtotime($update_time)) : '-'; ?>
-            </td>
-        <?php endif; ?>
-
-        <?php if ($GLOBALS['cfg']['ShowDbStructureLastCheck']): ?>
-            <td class="value tbl_last_check">
-                <?= $check_time ? PMA\libraries\Util::localisedDate(strtotime($check_time)) : '-'; ?>
-            </td>
-        <?php endif; ?>
-
-    <?php elseif ($table_is_view): ?>
-
-        <td class="value tbl_rows">-</td>
-        <td class="nowrap">
-            <?= __('View'); ?>
-        </td>
-        <td class="nowrap">---</td>
-        <?php if ($is_show_stats): ?>
-            <td class="value tbl_size">-</td>
-            <td class="value tbl_overhead">-</td>
-        <?php endif; ?>
-        <?php if ($GLOBALS['cfg']['ShowDbStructureComment']): ?>
-            <td></td>
-        <?php endif; ?>
-        <?php if ($GLOBALS['cfg']['ShowDbStructureCreation']): ?>
-            <td class="value tbl_creation">-</td>
-        <?php endif; ?>
-        <?php if ($GLOBALS['cfg']['ShowDbStructureLastUpdate']): ?>
-            <td class="value tbl_last_update">-</td>
-        <?php endif; ?>
-        <?php if ($GLOBALS['cfg']['ShowDbStructureLastCheck']): ?>
-            <td class="value tbl_last_check">-</td>
-        <?php endif; ?>
-
-    <?php else: ?>
-
-        <td colspan="<?= $colspan_for_structure - ($db_is_system_schema ? 6 : 9); ?>"
-            class="center">
-            <?= __('in use'); ?>
-        </td>
-
-    <?php endif; ?>
-</tr>
\ No newline at end of file
diff --git a/#pma/templates/database/structure/table_header.phtml b/#pma/templates/database/structure/table_header.phtml
deleted file mode 100644
index 15aa81a9..00000000
--- a/#pma/templates/database/structure/table_header.phtml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-$cnt = 0; // Let's count the columns...
-
-if ($db_is_system_schema) {
-    $action_colspan = 3;
-} else {
-    $action_colspan = 6;
-}
-if ($GLOBALS['cfg']['NumFavoriteTables'] > 0) {
-    $action_colspan++;
-}
-?>
-<form method="post" action="db_structure.php" name="tablesForm" id="tablesForm">
-<?= PMA_URL_getHiddenInputs($db); ?>
-<table class="data">
-    <thead>
-        <tr>
-            <th class="print_ignore"></th>
-            <th><?= PMA\libraries\Template::get('database/structure/sortable_header')->render(
-                   array(
-                       'title' => __('Table'),
-                       'sort' => 'table',
-                       'initial_sort_order' => 'ASC'
-                   )
-                ); ?></th>
-            <?php if ($replication): ?>
-                <th><?= __('Replication'); ?></th>
-            <?php endif; ?>
-            <th colspan="<?= $action_colspan; ?>" class="print_ignore">
-                <?= __('Action'); ?>
-            </th>
-            <!-- larger values are more interesting so default sort order is DESC-->
-            <th>
-                <?= PMA\libraries\Template::get('database/structure/sortable_header')->render(
-                    array(
-                        'title' => __('Rows'),
-                        'sort' => 'records',
-                        'initial_sort_order' => 'DESC'
-                    )
-                ); ?>
-                <?= PMA\libraries\Util::showHint(PMA_sanitize(
-                    __('May be approximate. Click on the number to get the exact'
-                        . ' count. See [doc@faq3-11]FAQ 3.11[/doc].'))); ?>
-            </th>
-            <?php if (!($GLOBALS['cfg']['PropertiesNumColumns'] > 1)): ?>
-                <th><?= PMA\libraries\Template::get('database/structure/sortable_header')->render(
-                        array(
-                            'title' => __('Type'),
-                            'sort' => 'type',
-                            'initial_sort_order' => 'ASC'
-                        )
-                    ); $cnt++; ?></th>
-                <th><?= PMA\libraries\Template::get('database/structure/sortable_header')->render(
-                        array(
-                            'title' => __('Collation'),
-                            'sort' => 'collation',
-                            'initial_sort_order' => 'ASC'
-                        )
-                    ); $cnt++; ?></th>
-            <?php endif; ?>
-
-            <?php if ($GLOBALS['is_show_stats']): ?>
-                <!-- larger values are more interesting so default sort order is DESC -->
-                <th><?= PMA\libraries\Template::get('database/structure/sortable_header')->render(
-                        array(
-                            'title' => __('Size'),
-                            'sort' => 'size',
-                            'initial_sort_order' => 'DESC'
-                        )
-                    ); $cnt++; ?></th>
-                <!-- larger values are more interesting so default sort order is DESC -->
-                <th><?= PMA\libraries\Template::get('database/structure/sortable_header')->render(
-                        array(
-                            'title' => __('Overhead'),
-                            'sort' => 'overhead',
-                            'initial_sort_order' => 'DESC'
-                        )
-                    ); $cnt++; ?></th>
-            <?php endif; ?>
-
-            <?php if ($GLOBALS['cfg']['ShowDbStructureComment']): ?>
-                <th><?= PMA\libraries\Template::get('database/structure/sortable_header')->render(
-                        array(
-                            'title' => __('Comment'),
-                            'sort' => 'comment',
-                            'initial_sort_order' => 'ASC'
-                        )
-                    ); $cnt++; ?></th>
-            <?php endif; ?>
-
-            <?php if ($GLOBALS['cfg']['ShowDbStructureCreation']): ?>
-                <!-- newer values are more interesting so default sort order is DESC -->
-                <th><?= PMA\libraries\Template::get('database/structure/sortable_header')->render(
-                        array(
-                            'title' => __('Creation'),
-                            'sort' => 'creation',
-                            'initial_sort_order' => 'DESC'
-                        )
-                    ); $cnt++; ?></th>
-            <?php endif; ?>
-
-            <?php if ($GLOBALS['cfg']['ShowDbStructureLastUpdate']): ?>
-                <!-- newer values are more interesting so default sort order is DESC -->
-                <th><?= PMA\libraries\Template::get('database/structure/sortable_header')->render(
-                        array(
-                            'title' => __('Last update'),
-                            'sort' => 'last_update',
-                            'initial_sort_order' => 'DESC'
-                        )
-                    ); $cnt++; ?></th>
-            <?php endif; ?>
-
-            <?php if ($GLOBALS['cfg']['ShowDbStructureLastCheck']): ?>
-                <!-- newer values are more interesting so default sort order is DESC -->
-                <th><?= PMA\libraries\Template::get('database/structure/sortable_header')->render(
-                        array(
-                            'title' => __('Last check'),
-                            'sort' => 'last_check',
-                            'initial_sort_order' => 'DESC'
-                        )
-                    ); $cnt++; ?></th>
-            <?php endif; ?>
-        </tr>
-    </thead>
-    <tbody>
-        <?php $GLOBALS['colspan_for_structure'] = $cnt + $action_colspan + 3; ?>
\ No newline at end of file
diff --git a/#pma/templates/database/structure/tracking_icon.phtml b/#pma/templates/database/structure/tracking_icon.phtml
deleted file mode 100644
index fea22c47..00000000
--- a/#pma/templates/database/structure/tracking_icon.phtml
+++ /dev/null
@@ -1,11 +0,0 @@
-<a href="tbl_tracking.php<?= $url_query; ?>&amp;table=<?= $truename; ?>">
-    <?php if ($is_tracked): ?>
-        <?= PMA\libraries\Util::getImage(
-            'eye.png', __('Tracking is active.')
-        ); ?>
-    <?php else: ?>
-        <?= PMA\libraries\Util::getImage(
-            'eye_grey.png', __('Tracking is not active.')
-        ); ?>
-    <?php endif; ?>
-</a>
\ No newline at end of file
diff --git a/#pma/templates/error/report_form.phtml b/#pma/templates/error/report_form.phtml
deleted file mode 100644
index aaf1eca6..00000000
--- a/#pma/templates/error/report_form.phtml
+++ /dev/null
@@ -1,34 +0,0 @@
-<form action="error_report.php" method="post" name="report_frm" id="report_frm"
-      class="ajax">
-    <fieldset style="padding-top:0">
-
-        <p>
-            <?= __(
-                'This report automatically includes data about the error and'
-                . ' information about relevant configuration settings.'
-                . ' It will be sent to the phpMyAdmin team for debugging the error.'
-            ) ?>
-        </p>
-
-        <div class="label"><label><strong>
-                    <?= __('Can you tell us the steps leading to this error? It decisively helps in debugging:') ?>
-                </strong></label>
-        </div>
-        <textarea class="report-description" name="description"
-                  id="report_description"></textarea>
-
-        <div class="label"><label><p>
-                    <?= __('You may examine the data in the error report:') ?>
-                </p></label></div>
-        <pre class="report-data"><?= htmlspecialchars($report_data) ?></pre>
-
-        <input type="checkbox" name="always_send" id="always_send_checkbox" />
-        <label for="always_send_checkbox">
-            <?= __('Automatically send report next time') ?>
-        </label>
-
-    </fieldset>
-
-    <?= $hidden_inputs ?>
-    <?= $hidden_fields ?>
-</form>
\ No newline at end of file
diff --git a/#pma/templates/header_location.phtml b/#pma/templates/header_location.phtml
deleted file mode 100644
index 3362e015..00000000
--- a/#pma/templates/header_location.phtml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Manage HTML redirection
- *
- * @package PhpMyAdmin-template
- *
- * @param string $uri Redirection location
- */
-$uri = isset($uri) ? $uri : null;
-?>
-<html>
-<head>
-    <title>- - -</title>
-    <meta http-equiv="expires" content="0">
-    <meta http-equiv="Pragma" content="no-cache">
-    <meta http-equiv="Cache-Control" content="no-cache">
-    <meta http-equiv="Refresh" content="0;url=<?= htmlspecialchars($uri) ?>">
-    <script type="text/javascript">
-        //<![CDATA[
-        setTimeout("window.location = decodeURI('<?= PMA_escapeJsString($uri) ?>')", 2000);
-        //]]>
-    </script>
-</head>
-<body>
-<script type="text/javascript">
-    //<![CDATA[
-    document.write('<p><a href="<?= PMA_escapeJsString(htmlspecialchars($uri)) ?>"><?php echo __('Go') ?></a></p>');
-    //]]>
-</script>
-</body>
-</html>
diff --git a/#pma/templates/javascript/display.phtml b/#pma/templates/javascript/display.phtml
deleted file mode 100644
index d037e42b..00000000
--- a/#pma/templates/javascript/display.phtml
+++ /dev/null
@@ -1,7 +0,0 @@
-<script type="text/javascript">
-if (typeof configInlineParams === "undefined" || !Array.isArray(configInlineParams)) configInlineParams = [];
-configInlineParams.push(function() {
-<?= implode(";\n", $js_array); ?>;
-});
-if (typeof configScriptLoaded !== "undefined" && configInlineParams) loadInlineConfig();
-</script>
\ No newline at end of file
diff --git a/#pma/templates/list/item.phtml b/#pma/templates/list/item.phtml
deleted file mode 100644
index c3efdde8..00000000
--- a/#pma/templates/list/item.phtml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Display item of a list.
- *
- * $content - mandatory string - Content to display
- * $id - optional string - Contains the id of li tag
- * $class - optional string - Contains the class name(s) of li tag
- * $mysql_help_page - optional string - Related help page
- * $url - optional array: - href - optional string - Destination page or anchor
- *                        - target - optional string - Target of link
- *                        - class - optional string - Class of link
- *                        - title - optional string - Title of link
- */
-?>
-<li <?= !empty($id) ? ' id="' . $id . '"' : null ?>
-    <?= !empty($class) ? ' class="' . $class . '"' : null ?>>
-
-    <?php if (isset($url) && is_array($url) && array_filter($url)) : ?>
-        <a<?= !empty($url['href']) ? ' href="' . $url['href'] . '"' : null ?>
-        <?= !empty($url['target'])
-            ? ' target="' . $url['target'] . '"'
-            : null;
-        ?>
-        <?= !empty($url['target']) && $url['target'] == '_blank'
-            ? ' rel="noopener noreferrer"'
-            : null;
-        ?>
-        <?= !empty($url['id']) ? ' id="' . $url['id'] . '"' : null; ?>
-        <?= !empty($url['class'])
-            ? ' class="' . $url['class'] . '"'
-            : null;
-        ?>
-        <?= !empty($url['title'])
-            ? ' title="' . $url['title'] . '"'
-            : null;
-        ?>>
-    <?php endif; ?>
-        <?= $content ?>
-    <?php if (isset($url) && is_array($url) && array_filter($url)) : ?>
-        </a>
-    <?php endif; ?>
-    <?php if (!empty($mysql_help_page)): ?>
-        <?= PMA\libraries\Util::showMySQLDocu($mysql_help_page) ?>
-    <?php endif; ?>
-</li>
diff --git a/#pma/templates/list/unordered.phtml b/#pma/templates/list/unordered.phtml
deleted file mode 100644
index c65a549a..00000000
--- a/#pma/templates/list/unordered.phtml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/**
- * Display unordered list.
- *
- * $class - optional string - Contains the class name(s) of ul tag
- * $id - optional string - Contains the id of ul tag
- * $item - mandatory string|array - If string, this is the content
- *                                - Else, see templates/list/item.phtml
- * $content - mandatory string - Content to display if $item is empty
- */
-?>
-<ul<?= !empty($class) ? ' class="' . $class . '"' : null ?>
-    <?= !empty($id) ? ' id="' . $id . '"' : null ?>>
-
-    <?php if (!empty($items)): ?>
-        <?php foreach ($items as $item): ?>
-            <?php if (!is_array($item)): ?>
-                <?php $item = array('content' => $item) ?>
-            <?php endif; ?>
-            <?= PMA\libraries\Template::get('list/item')
-                ->render($item)
-            ?>
-        <?php endforeach; ?>
-    <?php elseif (!empty($content)): ?>
-        <?= $content ?>
-    <?php endif; ?>
-</ul>
\ No newline at end of file
diff --git a/#pma/templates/navigation/logo.phtml b/#pma/templates/navigation/logo.phtml
deleted file mode 100644
index c7e15614..00000000
--- a/#pma/templates/navigation/logo.phtml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Manage logo display
- *
- * @package PhpMyAdmin-template
- *
- * @param bool   $displayLogo Display logo or not
- * @param bool   $useLogoLink Use link on logo or not
- * @param string $logoLink    Destination of link on logo
- * @param string $linkAttribs Link's attributes
- */
-$displayLogo = isset($displayLogo) ? $displayLogo : true;
-$useLogoLink = isset($useLogoLink) ? $useLogoLink : false;
-$logoLink = isset($logoLink) ? $logoLink : '#';
-$linkAttribs = isset($linkAttribs) ? $linkAttribs : null;
-if (!isset($logo)) {
-    $logo = null;
-    if (isset($GLOBALS['pmaThemeImage'])) {
-        $imgTag = '<img src="' . $GLOBALS['pmaThemeImage'] . '%s" '
-            . 'alt="phpMyAdmin" id="imgpmalogo" />';
-        if (@file_exists($GLOBALS['pmaThemeImage'] . 'logo_left.png')) {
-            $logo = sprintf($imgTag, 'logo_left.png');
-        } elseif (@file_exists($GLOBALS['pmaThemeImage'] . 'pma_logo2.png')) {
-            $logo = sprintf($imgTag, 'pma_logo2.png');
-        }
-    }
-}
-?>
-<!-- LOGO START -->
-<?php if (false === $displayLogo) : ?>
-    <!-- LOGO END -->
-    <?php return;
-      endif;
-    ?>
-<div id="pmalogo">
-    <?php if (true === $useLogoLink) : ?>
-        <a href="<?= $logoLink; ?>"<?= isset($linkAttribs) ? ' ' . $linkAttribs : null; ?>>
-    <?php endif; ?>
-    <?= $logo; ?>
-    <?php if (true === $useLogoLink) : ?>
-        </a>
-    <?php endif; ?>
-</div>
-<!-- LOGO END -->
\ No newline at end of file
diff --git a/#pma/templates/prefs_autoload.phtml b/#pma/templates/prefs_autoload.phtml
deleted file mode 100644
index 37863e95..00000000
--- a/#pma/templates/prefs_autoload.phtml
+++ /dev/null
@@ -1,15 +0,0 @@
-<div id="prefs_autoload" class="notice print_ignore" style="display:none">
-    <form action="prefs_manage.php" method="post" class="disableAjax">
-        <?= $hiddenInputs; ?>
-        <input type="hidden" name="json" value="" />
-        <input type="hidden" name="submit_import" value="1" />
-        <input type="hidden" name="return_url" value="<?= $return_url ?>" />
-        <?= __(
-            'Your browser has phpMyAdmin configuration for this domain. '
-            . 'Would you like to import it for current session?'
-        ) ?>
-        <br />
-        <a href="#yes"><?= __('Yes') ?></a>
-        / <a href="#no"><?= __('No') ?></a>
-    </form>
-</div>
\ No newline at end of file
diff --git a/#pma/templates/preview_sql.phtml b/#pma/templates/preview_sql.phtml
deleted file mode 100644
index 263957d1..00000000
--- a/#pma/templates/preview_sql.phtml
+++ /dev/null
@@ -1,11 +0,0 @@
-<div class="preview_sql">
-    <?php if (empty($query_data)): ?>
-        <?= __('No change'); ?>
-    <?php elseif (is_array($query_data)): ?>
-        <?php foreach ($query_data as $query): ?>
-            <?= PMA\libraries\Util::formatSql($query); ?>
-        <?php endforeach; ?>
-    <?php else: ?>
-        <?= PMA\libraries\Util::formatSql($query_data); ?>
-    <?php endif; ?>
-</div>
\ No newline at end of file
diff --git a/#pma/templates/privileges/add_privileges_database.phtml b/#pma/templates/privileges/add_privileges_database.phtml
deleted file mode 100644
index 9e035314..00000000
--- a/#pma/templates/privileges/add_privileges_database.phtml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php use PMA\libraries\Util; ?>
-<label for="text_dbname"><?= __('Add privileges on the following database(s):'); ?></label>
-
-<?php if (! empty($databases)) : ?>
-    <select name="pred_dbname[]" multiple="multiple">
-        <?php foreach ($databases as $database) : ?>
-            <?php $escapedDatabase = Util::escapeMysqlWildcards($database); ?>
-            <option value="<?= htmlspecialchars($escapedDatabase); ?>">
-                <?= htmlspecialchars($database); ?>
-            </option>
-        <?php endforeach; ?>
-    </select>
-<?php endif; ?>
-
-<input type="text" id="text_dbname" name="dbname" />
-<?= Util::showHint(__('Wildcards % and _ should be escaped with a \ to use them literally.'))?>
\ No newline at end of file
diff --git a/#pma/templates/privileges/add_privileges_routine.phtml b/#pma/templates/privileges/add_privileges_routine.phtml
deleted file mode 100644
index e8e6abe8..00000000
--- a/#pma/templates/privileges/add_privileges_routine.phtml
+++ /dev/null
@@ -1,14 +0,0 @@
-<input type="hidden" name="dbname" value="<?= htmlspecialchars($database); ?>"/>
-
-<label for="text_routinename"><?= __('Add privileges on the following routine:'); ?></label>
-
-<?php if (! empty($routines)) : ?>
-    <select name="pred_routinename" class="autosubmit">
-        <option value="" selected="selected"><?= __('Use text field'); ?>:</option>
-        <?php foreach ($routines as $routine) : ?>
-            <option value="<?= htmlspecialchars($routine); ?>"><?= htmlspecialchars($routine); ?></option>
-        <?php endforeach; ?>
-    </select>
-<?php endif; ?>
-
-<input type="text" id="text_routinename" name="routinename" />
\ No newline at end of file
diff --git a/#pma/templates/privileges/add_privileges_table.phtml b/#pma/templates/privileges/add_privileges_table.phtml
deleted file mode 100644
index e515215f..00000000
--- a/#pma/templates/privileges/add_privileges_table.phtml
+++ /dev/null
@@ -1,14 +0,0 @@
-<input type="hidden" name="dbname" value="<?= htmlspecialchars($database); ?>"/>
-
-<label for="text_tablename"><?= __('Add privileges on the following table:'); ?></label>
-
-<?php if (! empty($tables)) : ?>
-    <select name="pred_tablename" class="autosubmit">
-        <option value="" selected="selected"><?= __('Use text field'); ?>:</option>
-        <?php foreach ($tables as $table) : ?>
-            <option value="<?= htmlspecialchars($table); ?>"><?= htmlspecialchars($table); ?></option>
-        <?php endforeach; ?>
-    </select>
-<?php endif; ?>
-
-<input type="text" id="text_tablename" name="tablename" />
\ No newline at end of file
diff --git a/#pma/templates/privileges/edit_routine_privileges.phtml b/#pma/templates/privileges/edit_routine_privileges.phtml
deleted file mode 100644
index a4689789..00000000
--- a/#pma/templates/privileges/edit_routine_privileges.phtml
+++ /dev/null
@@ -1,26 +0,0 @@
-<div id="edit_user_dialog">
-    <?= $header; ?>
-    <form class="submenu-item" name="usersForm" id="addUsersForm" action="server_privileges.php" method="post">
-        <?= PMA_URL_getHiddenInputs(); ?>
-        <input type="hidden" name="username" value="<?= htmlspecialchars($username); ?>">
-        <input type="hidden" name="hostname" value="<?= htmlspecialchars($hostname); ?>">
-        <input type="hidden" name="dbname" value="<?= htmlspecialchars($database); ?>">
-        <input type="hidden" name="routinename" value="<?= htmlspecialchars($routine); ?>">
-        <input type="hidden" name="grant_count" value="<?= $grantCount; ?>">
-        <fieldset id="fieldset_user_global_rights">
-            <legend data-submenu-label="<?= __('Routine')?>">
-                <?= __('Routine-specific privileges'); ?>
-            </legend>
-            <p>
-                <small>
-                    <i><?= __('Note: MySQL privilege names are expressed in English.'); ?></i>
-                </small>
-            </p>
-            <?= $privCheckboxes; ?>
-        </fieldset>
-        <fieldset id="fieldset_user_privtable_footer" class="tblFooters">
-            <input type="hidden" name="update_privs" value="1">
-            <input type="submit" value="<?= __('Go')?>">
-        </fieldset>
-    </form>
-</div>
\ No newline at end of file
diff --git a/#pma/templates/privileges/privileges_summary.phtml b/#pma/templates/privileges/privileges_summary.phtml
deleted file mode 100644
index cc764cd3..00000000
--- a/#pma/templates/privileges/privileges_summary.phtml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php use PMA\libraries\Template; ?>
-<form class="submenu-item" action="server_privileges.php" id="<?= $formId; ?>" method="post">
-    <?= PMA_URL_getHiddenInputs(); ?>
-    <input type="hidden" name="username" value="<?= htmlspecialchars($userName); ?>" />
-    <input type="hidden" name="hostname" value="<?= htmlspecialchars($hostName); ?>" />
-
-    <fieldset>
-        <legend data-submenu-label="<?= $subMenuLabel; ?>">
-            <?= $legend; ?>
-        </legend>
-
-        <table class="data">
-            <thead>
-                <tr>
-                    <th><?= $typeLabel; ?></th>
-                    <th><?= __('Privileges'); ?></th>
-                    <th><?= __('Grant'); ?></th>
-                    <?php if ($type == 'database') : ?>
-                        <th><?= __('Table-specific privileges'); ?></th>
-                    <?php elseif ($type == 'table') : ?>
-                        <th><?= __('Column-specific privileges'); ?></th>
-                    <?php endif; ?>
-                    <th colspan="2"><?= __('Action'); ?></th>
-                </tr>
-            </thead>
-
-            <tbody>
-                <?php if (count($privileges) == 0) : ?>
-                    <?php $colspan = ($type == 'database' ? 7 : ($type == 'table' ? 6 : 5)); ?>
-                    <tr class="odd">
-                        <td colspan="<?= $colspan; ?>"><center><i><?= __('None') ?></i></center></td>
-                    </tr>
-                <?php else : ?>
-                    <?php $odd = true; ?>
-                    <?php foreach ($privileges as $privilege) : ?>
-                        <?= Template::get('privileges/privileges_summary_row')
-                                ->render(
-                                    array_merge(
-                                        $privilege,
-                                        array(
-                                            'odd'  => $odd,
-                                            'type' => $type,
-                                        )
-                                    )
-                                ); ?>
-                        <?php $odd = !$odd; ?>
-                    <?php endforeach; ?>
-                <?php endif; ?>
-            </tbody>
-        </table>
-
-        <?php if ($type == 'database') : ?>
-            <?= Template::get('privileges/add_privileges_database')
-                    ->render(array('databases' => $databases)); ?>
-        <?php elseif ($type == 'table') : ?>
-            <?= Template::get('privileges/add_privileges_table')
-                    ->render(array('database' => $database, 'tables' => $tables)); ?>
-        <?php else: // routine ?>
-            <?= Template::get('privileges/add_privileges_routine')
-                    ->render(array('database' => $database, 'routines' => $routines)); ?>
-        <?php endif; ?>
-
-    </fieldset>
-
-    <fieldset class="tblFooters">
-        <input type="submit" value="<?= __('Go'); ?>" />
-    </fieldset>
-</form>
\ No newline at end of file
diff --git a/#pma/templates/privileges/privileges_summary_row.phtml b/#pma/templates/privileges/privileges_summary_row.phtml
deleted file mode 100644
index 11eb252c..00000000
--- a/#pma/templates/privileges/privileges_summary_row.phtml
+++ /dev/null
@@ -1,14 +0,0 @@
-<tr class="<?= ($odd ? 'odd' : 'even'); ?>">
-    <td><?= htmlspecialchars($name); ?></td>
-    <td><code><?= $privileges; ?></code></td>
-    <td><?= ($grant ? __('Yes') : __('No')); ?></td>
-
-    <?php if ($type == 'database') : ?>
-        <td><?= ($tablePrivs ? __('Yes') : __('No')); ?></td>
-    <?php elseif ($type == 'table') : ?>
-        <td><?= ($columnPrivs ? __('Yes') : __('No')); ?></td>
-    <?php endif; ?>
-
-    <td><?= $editLink; ?></td>
-    <td><?= $revokeLink; ?></td>
-</tr>
\ No newline at end of file
diff --git a/#pma/templates/secondary_tabs.phtml b/#pma/templates/secondary_tabs.phtml
deleted file mode 100644
index 40c51343..00000000
--- a/#pma/templates/secondary_tabs.phtml
+++ /dev/null
@@ -1,6 +0,0 @@
-<ul id="topmenu2">
-    <?php foreach ($sub_tabs as $tab): ?>
-        <?= PMA\libraries\Util::getHtmlTab($tab, $url_params); ?>
-    <?php endforeach; ?>
-</ul>
-<div class="clearfloat"></div>
\ No newline at end of file
diff --git a/#pma/templates/server/binlog/log_row.phtml b/#pma/templates/server/binlog/log_row.phtml
deleted file mode 100644
index a83768f6..00000000
--- a/#pma/templates/server/binlog/log_row.phtml
+++ /dev/null
@@ -1,8 +0,0 @@
-<tr class="noclick <?= ($odd_row ? 'odd' : 'even'); ?>">
-    <td><?= $value['Log_name']; ?></td>
-    <td class="right"><?= $value['Pos']; ?></td>
-    <td><?= $value['Event_type']; ?></td>
-    <td class="right"><?= $value['Server_id']; ?></td>
-    <td class="right"><?= (isset($value['Orig_log_pos']) ? $value['Orig_log_pos'] : $value['End_log_pos']); ?></td>
-    <td><?= \PMA\libraries\Util::formatSql($value['Info'], ! $dontlimitchars); ?></td>
-</tr>
\ No newline at end of file
diff --git a/#pma/templates/server/binlog/log_selector.phtml b/#pma/templates/server/binlog/log_selector.phtml
deleted file mode 100644
index 0f8ad9ed..00000000
--- a/#pma/templates/server/binlog/log_selector.phtml
+++ /dev/null
@@ -1,27 +0,0 @@
-<form action="server_binlog.php" method="get">
-    <?= PMA_URL_getHiddenInputs($url_params); ?>
-    <fieldset>
-        <legend>
-            <?= __('Select binary log to view'); ?>
-        </legend>
-        <?php $full_size = 0; ?>
-        <select name="log">
-            <?php foreach ($binary_logs as $each_log): ?>
-                <option value="<?= htmlspecialchars($each_log['Log_name']); ?>"<?= ($each_log['Log_name'] == $_REQUEST['log'] ? ' selected="selected"' : ''); ?>>
-                    <?= htmlspecialchars($each_log['Log_name']); ?>
-                    <?php if (isset($each_log['File_size'])): ?>
-                        (<?= implode(' ', \PMA\libraries\Util::formatByteDown($each_log['File_size'], 3, 2)); ?>)
-                        <?php $full_size += $each_log['File_size']; ?>
-                    <?php endif; ?>
-                </option>
-            <?php endforeach; ?>
-        </select>
-        <?= count($binary_logs) . ' ' . __('Files') . ', '; ?>
-        <?php if ($full_size > 0): ?>
-            <?= implode(' ', \PMA\libraries\Util::formatByteDown($full_size)); ?>
-        <?php endif; ?>
-    </fieldset>
-    <fieldset class="tblFooters">
-        <input type="submit" value="<?= __('Go'); ?>" />
-    </fieldset>
-</form>
diff --git a/#pma/templates/server/collations/charsets.phtml b/#pma/templates/server/collations/charsets.phtml
deleted file mode 100644
index 0e7382f8..00000000
--- a/#pma/templates/server/collations/charsets.phtml
+++ /dev/null
@@ -1,30 +0,0 @@
-<div id="div_mysql_charset_collations">
-    <table class="data noclick">
-        <tr>
-            <th id="collationHeader"><?= __('Collation'); ?></th>
-            <th><?= __('Description'); ?></th>
-        </tr>
-        <?php foreach ($mysqlCharsets as $current_charset): ?>
-            <tr>
-                <th colspan="2" class="right">
-                    <?= htmlspecialchars($current_charset); ?>
-                    <?php if (! empty($mysqlCharsetsDesc[$current_charset])): ?>
-                        (<i><?= htmlspecialchars($mysqlCharsetsDesc[$current_charset]); ?></i>)
-                    <?php endif; ?>
-                </th>
-            </tr>
-            <?php $odd_row = true; ?>
-            <?php foreach ($mysqlCollations[$current_charset] as $current_collation): ?>
-                <tr class="
-                    <?= ($odd_row ? 'odd' : 'even'); ?>
-                    <?= ($mysqlDftCollations[$current_charset] == $current_collation ? ' marked' : ''); ?>
-                    <?= ($mysqlCollAvailable[$current_collation] ? '' : ' disabled'); ?>
-                    ">
-                    <td><?= htmlspecialchars($current_collation); ?></td>
-                    <td><?= PMA_getCollationDescr($current_collation); ?></td>
-                </tr>
-                <?php $odd_row = ! $odd_row; ?>
-            <?php endforeach; ?>
-        <?php endforeach; ?>
-    </table>
-</div>
\ No newline at end of file
diff --git a/#pma/templates/server/databases/create.phtml b/#pma/templates/server/databases/create.phtml
deleted file mode 100644
index a8b71d7f..00000000
--- a/#pma/templates/server/databases/create.phtml
+++ /dev/null
@@ -1,36 +0,0 @@
-<ul>
-    <li id="li_create_database" class="no_bullets">
-        <?php if ($GLOBALS['is_create_db_priv']): ?>
-            <form method="post" action="server_databases.php" id="create_database_form" class="ajax">
-                <strong>
-                    <label for="text_create_db">
-                        <?= \PMA\libraries\Util::getImage('b_newdb.png') , ' ' , __('Create database'); ?>
-                    </label>&nbsp;<?= \PMA\libraries\Util::showMySQLDocu('CREATE_DATABASE'); ?>
-                </strong>
-                <br />
-
-                <?= PMA_URL_getHiddenInputs('', '', 5); ?>
-                <input type="hidden" name="reload" value="1" />
-                <?php if (! empty($dbstats)): ?>
-                    <input type="hidden" name="dbstats" value="1" />
-                <?php endif; ?>
-
-                <input type="text" name="new_db" value="<?= htmlspecialchars($GLOBALS['db_to_create']); ?>"
-                       maxlength="64" class="textfield" id="text_create_db" required
-                       placeholder="<?= __('Database name'); ?>" />
-                <?= PMA_generateCharsetDropdownBox(PMA_CSDROPDOWN_COLLATION, 'db_collation', null, null, true); ?>
-                <input type="submit" value="<?= __('Create'); ?>" id="buttonGo" />
-            </form>
-        <?php else: ?>
-            <!-- db creation no privileges message -->
-            <strong>
-                <?= \PMA\libraries\Util::getImage('b_newdb.png') , ' ' , __('Create database'); ?>&nbsp;<?= \PMA\libraries\Util::showMySQLDocu('CREATE_DATABASE'); ?>
-            </strong>
-            <br />
-
-            <span class="noPrivileges">
-                <?= \PMA\libraries\Util::getImage('s_error2.png', '', array('hspace' => 2, 'border' => 0, 'align' => 'middle')) , ' ' , __('No Privileges'); ?>
-            </span>
-        <?php endif; ?>
-    </li>
-</ul>
diff --git a/#pma/templates/server/databases/table_footer.phtml b/#pma/templates/server/databases/table_footer.phtml
deleted file mode 100644
index fdaccc9d..00000000
--- a/#pma/templates/server/databases/table_footer.phtml
+++ /dev/null
@@ -1,42 +0,0 @@
-<tfoot>
-    <tr>
-        <?php if ($GLOBALS['is_superuser'] || $GLOBALS['cfg']['AllowUserDropDatabase']): ?>
-            <th></th>
-        <?php endif; ?>
-        <th>
-            <?= __('Total'); ?>: <span id="databases_count"><?= $databaseCount; ?></span>
-        </th>
-        <?php foreach ($column_order as $stat_name => $stat):
-            if (! array_key_exists($stat_name, $first_database)) {
-                continue;
-            }
-            if ($stat['format'] === 'byte') {
-                list($value, $unit) = \PMA\libraries\Util::formatByteDown($stat['footer'], 3, 1);
-            } elseif ($stat['format'] === 'number') {
-                $value = \PMA\libraries\Util::formatNumber($stat['footer'], 0);
-            } else {
-                $value = htmlentities($stat['footer'], 0);
-            } ?>
-
-            <th class="value">
-                <?php if (isset($stat['description_function'])): ?>
-                    <dfn title="<?= $stat['description_function']($stat['footer']); ?>">
-                        <?= $value; ?>
-                    </dfn>
-                <?php else: ?>
-                    <?= $value; ?>
-                <?php endif; ?>
-            </th>
-            <?php if ($stat['format'] === 'byte'): ?>
-                <th class="unit"><?= $unit; ?></th>
-            <?php endif; ?>
-        <?php endforeach; ?>
-        <?php if ($master_replication): ?>
-            <th></th>
-        <?php endif; ?>
-        <?php if ($slave_replication): ?>
-            <th></th>
-        <?php endif; ?>
-        <th></th>
-    </tr>
-</tfoot>
\ No newline at end of file
diff --git a/#pma/templates/server/databases/table_header.phtml b/#pma/templates/server/databases/table_header.phtml
deleted file mode 100644
index ed8fbf21..00000000
--- a/#pma/templates/server/databases/table_header.phtml
+++ /dev/null
@@ -1,40 +0,0 @@
-<thead>
-    <tr>
-        <?php if ($GLOBALS['is_superuser'] || $GLOBALS['cfg']['AllowUserDropDatabase']): ?>
-            <th></th>
-        <?php endif; ?>
-        <th>
-            <a href="server_databases.php<?= PMA_URL_getCommon($_url_params); ?>">
-                <?= __('Database'); ?>
-                <?= ($sort_by == 'SCHEMA_NAME' ?  \PMA\libraries\Util::getImage('s_' . $sort_order . '.png', $sort_order_text) : ''); ?>
-            </a>
-        </th>
-        <?php foreach ($column_order as $stat_name => $stat):
-            if (! array_key_exists($stat_name, $first_database)) {
-                continue;
-            }
-            $_url_params['sort_by'] = $stat_name;
-            $_url_params['sort_order'] = ($sort_by == $stat_name && $sort_order == 'desc') ? 'asc' : 'desc'; ?>
-
-            <th <?php if ($stat['format'] === 'byte'): ?>colspan="2"<?php endif; ?>>
-                <a href="server_databases.php<?= PMA_URL_getCommon($_url_params); ?>">
-                    <?= $stat['disp_name']; ?>
-                    <?= ($sort_by == $stat_name ?  \PMA\libraries\Util::getImage('s_' . $sort_order . '.png', $sort_order_text) : ''); ?>
-                </a>
-            </th>
-        <?php endforeach; ?>
-        <?php if ($master_replication): ?>
-            <th>
-                <?= __('Master replication'); ?>
-            </th>
-        <?php endif; ?>
-        <?php if ($slave_replication): ?>
-            <th>
-                <?= __('Slave replication'); ?>
-            </th>
-        <?php endif; ?>
-        <th>
-            <?= __('Action'); ?>
-        </th>
-    </tr>
-</thead>
\ No newline at end of file
diff --git a/#pma/templates/server/databases/table_row.phtml b/#pma/templates/server/databases/table_row.phtml
deleted file mode 100644
index 20259f48..00000000
--- a/#pma/templates/server/databases/table_row.phtml
+++ /dev/null
@@ -1,65 +0,0 @@
-<tr <?= $tr_class ? ('class="' . $tr_class . '"') : ''; ?>>
-    <?php if ($GLOBALS['is_superuser'] || $GLOBALS['cfg']['AllowUserDropDatabase']): ?>
-        <td class="tool">
-            <input type="checkbox" name="selected_dbs[]" class="checkall"
-                   title="<?= htmlspecialchars($current['SCHEMA_NAME']); ?>"
-                   value="<?= htmlspecialchars($current['SCHEMA_NAME']); ?>"
-            <?php if ($GLOBALS['dbi']->isSystemSchema($current['SCHEMA_NAME'], true)): ?>
-                disabled="disabled";
-            <?php endif; ?>
-            />
-        </td>
-    <?php endif; ?>
-    <td class="name">
-        <a href="<?= \PMA\libraries\Util::getScriptNameForOption($GLOBALS['cfg']['DefaultTabDatabase'], 'database') , $url_query , '&amp;db=' , urlencode($current['SCHEMA_NAME']); ?>"
-           title="<?= sprintf(__('Jump to database'), htmlspecialchars($current['SCHEMA_NAME'])); ?>">
-            <?= htmlspecialchars($current['SCHEMA_NAME']); ?>
-        </a>
-    </td>
-    <?php foreach ($column_order as $stat_name => $stat):
-        if (! array_key_exists($stat_name, $current)) {
-            continue;
-        }
-
-        if ($stat['format'] === 'byte') {
-            list($value, $unit) = \PMA\libraries\Util::formatByteDown($current[$stat_name], 3, 1);
-        } elseif ($stat['format'] === 'number') {
-            $value = \PMA\libraries\Util::formatNumber($current[$stat_name], 0);
-        } else {
-            $value = htmlentities($current[$stat_name], 0);
-        } ?>
-
-        <td class="value">
-            <?php if (isset($stat['description_function'])): ?>
-                <dfn title="<?= $stat['description_function']($stat['footer']); ?>">
-                    <?= $value; ?>
-                </dfn>
-            <?php else: ?>
-                <?= $value; ?>
-            <?php endif; ?>
-        </td>
-        <?php if ($stat['format'] === 'byte'): ?>
-            <td class="unit"><?= $unit; ?></td>
-        <?php endif; ?>
-    <?php endforeach; ?>
-
-    <?php if ($master_replication_status): ?>
-        <td class="tool" style="text-align: center;">
-            <?= $master_replication; ?>
-        </td>
-    <?php endif; ?>
-
-    <?php if ($slave_replication_status): ?>
-        <td class="tool" style="text-align: center;">
-            <?= $slave_replication; ?>
-        </td>
-    <?php endif; ?>
-
-    <td class="tool">
-        <a onclick="PMA_commonActions.setDb('<?= PMA_jsFormat($current['SCHEMA_NAME']) ?>');"
-           href="server_privileges.php<?= $url_query; ?>&amp;db=<?= urlencode($current['SCHEMA_NAME']); ?>&amp;checkprivsdb=<?= urlencode($current['SCHEMA_NAME']); ?>"
-           title="<?= htmlspecialchars(sprintf(__('Check privileges for database "%s".'), $current['SCHEMA_NAME'])); ?>">
-           <?= \PMA\libraries\Util::getIcon('s_rights.png', __('Check privileges')); ?>
-        </a>
-    </td>
-</tr>
diff --git a/#pma/templates/server/engines/engine.phtml b/#pma/templates/server/engines/engine.phtml
deleted file mode 100644
index 3c055295..00000000
--- a/#pma/templates/server/engines/engine.phtml
+++ /dev/null
@@ -1,42 +0,0 @@
-<h2>
-    <?= \PMA\libraries\Util::getImage('b_engine.png'),
-            '    ', htmlspecialchars($title),
-            '    ', \PMA\libraries\Util::showMySQLDocu($helpPage); ?>
-</h2>
-<p>
-    <em>
-        <?= htmlspecialchars($comment); ?>
-    </em>
-</p>
-<?php if (! empty($infoPages) && is_array($infoPages)): ?>
-    <p>
-        <strong>[</strong>
-            <?php if (empty($_REQUEST['page'])): ?>
-                <strong><?= __('Variables'); ?></strong>
-            <?php else: ?>
-                <a href="server_engines.php<?= PMA_URL_getCommon(array('engine' => $_REQUEST['engine'])); ?>">
-                    <?= __('Variables'); ?>
-                </a>
-            <?php endif; ?>
-            <?php foreach ($infoPages as $current => $label): ?>
-                <strong>|</strong>
-                <?php if (isset($_REQUEST['page']) && $_REQUEST['page'] == $current): ?>
-                    <strong><?= htmlspecialchars($label); ?></strong>
-                <?php else: ?>
-                    <a href="server_engines.php<?= PMA_URL_getCommon(array('engine' => $_REQUEST['engine'], 'page' => $current)); ?>">
-                        <?= htmlspecialchars($label); ?>
-                    </a>
-                <?php endif; ?>
-            <?php endforeach; ?>
-        <strong>]</strong>
-    </p>
-<?php endif; ?>
-
-<?php if (! empty($pageOutput)): ?>
-    <?= $pageOutput; ?>
-<?php else: ?>
-    <p>
-        <?= $support; ?>
-    </p>
-    <?= $variables; ?>
-<?php endif; ?>
\ No newline at end of file
diff --git a/#pma/templates/server/engines/engines.phtml b/#pma/templates/server/engines/engines.phtml
deleted file mode 100644
index db92474b..00000000
--- a/#pma/templates/server/engines/engines.phtml
+++ /dev/null
@@ -1,25 +0,0 @@
-<table class="noclick">
-    <thead>
-        <tr>
-            <th><?= __('Storage Engine'); ?></th>
-            <th><?= __('Description'); ?></th>
-        </tr>
-    </thead>
-    <tbody>
-        <?php $odd_row = true; ?>
-        <?php foreach ($engines as $engine => $details): ?>
-            <tr class="
-                <?= $odd_row ? 'odd' : 'even'; ?>
-                <?= $details['Support'] == 'NO' || $details['Support'] == 'DISABLED' ? ' disabled' : ''; ?>
-                <?= $details['Support'] == 'DEFAULT' ? ' marked' : ''; ?>">
-                <td>
-                    <a rel="newpage" href="server_engines.php<?= PMA_URL_getCommon(array('engine' => $engine)); ?>">
-                        <?= htmlspecialchars($details['Engine']); ?>
-                    </a>
-                </td>
-                <td><?= htmlspecialchars($details['Comment']); ?></td>
-            </tr>
-            <?php $odd_row = !$odd_row; ?>
-        <?php endforeach; ?>
-    </tbody>
-</table>
\ No newline at end of file
diff --git a/#pma/templates/server/plugins/section.phtml b/#pma/templates/server/plugins/section.phtml
deleted file mode 100644
index c9d4d8b0..00000000
--- a/#pma/templates/server/plugins/section.phtml
+++ /dev/null
@@ -1,33 +0,0 @@
-<table class="data_full_width"
-    id="plugins-<?= preg_replace('/[^a-z]/', '', mb_strtolower($plugin_type)); ?>">
-    <caption class="tblHeaders">
-        <?= htmlspecialchars($plugin_type); ?>
-    </caption>
-    <thead>
-        <tr>
-            <th><?=  __('Plugin'); ?></th>
-            <th><?=  __('Description'); ?></th>
-            <th><?=  __('Version'); ?></th>
-            <th><?=  __('Author'); ?></th>
-            <th><?=  __('License'); ?></th>
-        </tr>
-    </thead>
-    <tbody>
-        <?php $odd_row = true; ?>
-        <?php foreach ($plugin_list as $plugin): ?>
-            <tr class="noclick <?= ($odd_row ? 'odd' : 'even'); ?>">
-                <th>
-                    <?= htmlspecialchars($plugin['plugin_name']); ?>
-                    <?php if (! $plugin['is_active']): ?>
-                        <small class="attention"><?= __('disabled'); ?></small>
-                    <?php endif; ?>
-                </th>
-                <td><?= htmlspecialchars($plugin['plugin_description']); ?></td>
-                <td><?= htmlspecialchars($plugin['plugin_type_version']); ?></td>
-                <td><?= htmlspecialchars($plugin['plugin_author']); ?></td>
-                <td><?= htmlspecialchars($plugin['plugin_license']); ?></td>
-            </tr>
-            <?php $odd_row = !$odd_row; ?>
-        <?php endforeach; ?>
-    </tbody>
-</table>
\ No newline at end of file
diff --git a/#pma/templates/server/plugins/section_links.phtml b/#pma/templates/server/plugins/section_links.phtml
deleted file mode 100644
index 4c3d3768..00000000
--- a/#pma/templates/server/plugins/section_links.phtml
+++ /dev/null
@@ -1,8 +0,0 @@
-<div id="sectionlinks">
-<?php foreach ($plugins as $plugin_type => $plugin_list): ?>
-    <a href="#plugins-<?= preg_replace('/[^a-z]/', '', mb_strtolower($plugin_type)); ?>">
-         <?= htmlspecialchars($plugin_type); ?>
-    </a>
-<?php endforeach; ?>
-</div>
-<br />
\ No newline at end of file
diff --git a/#pma/templates/server/variables/link_template.phtml b/#pma/templates/server/variables/link_template.phtml
deleted file mode 100644
index b2e68aab..00000000
--- a/#pma/templates/server/variables/link_template.phtml
+++ /dev/null
@@ -1,11 +0,0 @@
-<a style="display: none;" href="<?= $url; ?>" class="ajax saveLink">
-    <?= \PMA\libraries\Util::getIcon('b_save.png', __('Save')); ?>
-</a>
-<a style="display: none;" href="#" class="cancelLink">
-    <?= \PMA\libraries\Util::getIcon('b_close.png', __('Cancel')); ?>
-</a>
-<?= \PMA\libraries\Util::getImage(
-    'b_help.png',
-    __('Documentation'),
-    array('style' => 'display:none', 'id' => 'docImage')
-) ?>
\ No newline at end of file
diff --git a/#pma/templates/server/variables/session_variable_row.phtml b/#pma/templates/server/variables/session_variable_row.phtml
deleted file mode 100644
index b98afa85..00000000
--- a/#pma/templates/server/variables/session_variable_row.phtml
+++ /dev/null
@@ -1,5 +0,0 @@
-<tr class="var-row <?= $rowClass; ?>">
-    <td class="var-action"></td>
-    <td class="var-name session">(<?= __('Session value'); ?> )</td>
-    <td class="var-value value">&nbsp;<?= htmlspecialchars($value); ?></td>
-</tr>
\ No newline at end of file
diff --git a/#pma/templates/server/variables/variable_filter.phtml b/#pma/templates/server/variables/variable_filter.phtml
deleted file mode 100644
index 1f897e10..00000000
--- a/#pma/templates/server/variables/variable_filter.phtml
+++ /dev/null
@@ -1,9 +0,0 @@
-<fieldset id="tableFilter">
-    <legend><?= __('Filters'); ?></legend>
-    <div class="formelement">
-        <label for="filterText"><?= __('Containing the word:'); ?></label>
-        <input name="filterText" type="text" id="filterText"
-               style="vertical-align: baseline;"
-               value="<?= htmlspecialchars($filterValue); ?>" />
-    </div>
-</fieldset>
\ No newline at end of file
diff --git a/#pma/templates/server/variables/variable_row.phtml b/#pma/templates/server/variables/variable_row.phtml
deleted file mode 100644
index 8da5826e..00000000
--- a/#pma/templates/server/variables/variable_row.phtml
+++ /dev/null
@@ -1,24 +0,0 @@
-<tr class="var-row <?= $rowClass; ?>">
-    <td class="var-action">
-    <?php if ($editable): ?>
-        <a href="#" data-variable="<?= htmlspecialchars($name) ?>" class="editLink"><?= \PMA\libraries\Util::getIcon('b_edit.png', __('Edit')) ?></a>
-    <?php else: ?>
-        <span title="<?= __('This is a read-only variable and can not be edited') ?>" class="read_only_var">
-            <?= \PMA\libraries\Util::getIcon('bd_edit.png', __('Edit')) ?>
-        </span>
-    <?php endif; ?>
-    </td>
-    <td class="var-name">
-    <?php if ($docLink != null): ?>
-        <span title="<?= htmlspecialchars(str_replace('_', ' ', $name)); ?>">
-            <?= \PMA\libraries\Util::showMySQLDocu($docLink[1], false, $docLink[2] . '_' . $docLink[0], true)
-                , htmlspecialchars(str_replace('_', ' ', $name))
-                , '</a>'
-            ?>
-        </span>
-    <?php else: ?>
-        <?= htmlspecialchars(str_replace('_', ' ', $name)); ?>
-    <?php endif; ?>
-    </td>
-    <td class="var-value value <?= ($isSuperuser ? ' editable' : '') ?>">&nbsp;<?= htmlspecialchars($value); ?></td>
-</tr>
diff --git a/#pma/templates/server/variables/variable_table_head.phtml b/#pma/templates/server/variables/variable_table_head.phtml
deleted file mode 100644
index a1ac15ba..00000000
--- a/#pma/templates/server/variables/variable_table_head.phtml
+++ /dev/null
@@ -1,7 +0,0 @@
-<thead>
-    <tr class="var-header var-row">
-        <td class="var-action"><?= __('Action'); ?></td>
-        <td class="var-name"><?= __('Variable'); ?></td>
-        <td class="var-value"><?= __('Session value'); ?> / <?= __('Global value'); ?></td>
-    </tr>
-</thead>
\ No newline at end of file
diff --git a/#pma/templates/startAndNumberOfRowsPanel.phtml b/#pma/templates/startAndNumberOfRowsPanel.phtml
deleted file mode 100644
index d50474db..00000000
--- a/#pma/templates/startAndNumberOfRowsPanel.phtml
+++ /dev/null
@@ -1,20 +0,0 @@
-<fieldset>
-    <div>
-        <label for="pos"><?= __('Start row:'); ?></label>
-        <input type="number" name="pos" min="0" required="required"
-            <?php if ($unlim_num_rows > 0) : ?>
-                max="<?= ($unlim_num_rows - 1); ?>"
-            <?php endif; ?>
-            value="<?= htmlspecialchars($pos); ?>" />
-
-        <label for="session_max_rows"><?= __('Number of rows:'); ?></label>
-        <input type="number" name="session_max_rows" min="1"
-               value="<?= htmlspecialchars($rows); ?>" required="required" />
-        <input type="submit" name="submit" class="Go"
-               value="<?= __('Go'); ?>" />
-        <input type="hidden" name="sql_query"
-               value="<?= htmlspecialchars($sql_query); ?>" />
-        <input type="hidden" name="unlim_num_rows"
-               value="<?= htmlspecialchars($unlim_num_rows); ?>" />
-    </div>
-</fieldset>
\ No newline at end of file
diff --git a/#pma/templates/table/chart/tbl_chart.phtml b/#pma/templates/table/chart/tbl_chart.phtml
deleted file mode 100644
index 673f9a71..00000000
--- a/#pma/templates/table/chart/tbl_chart.phtml
+++ /dev/null
@@ -1,162 +0,0 @@
-<?php require_once 'libraries/url_generating.lib.php'; ?>
-<script type="text/javascript">
-    pma_token = '<?= $_SESSION[' PMA_token ']; ?>';
-    url_query = '<?= $url_query; ?>';
-</script>
-<!-- Display Chart options -->
-<div id="div_view_options">
-    <form method="post" id="tblchartform" action="tbl_chart.php" class="ajax">
-        <?= PMA_URL_getHiddenInputs($url_params); ?>
-        <fieldset>
-            <legend>
-                <?= __('Display chart'); ?>
-            </legend>
-            <div class="chartOption">
-                <div class="formelement">
-                    <input type="radio" name="chartType" value="bar" id="radio_bar" />
-                    <label for ="radio_bar"><?= _pgettext('Chart type', 'Bar') ?></label>
-                </div>
-                <div class="formelement">
-                    <input type="radio" name="chartType" value="column" id="radio_column" />
-                    <label for ="radio_column"><?= _pgettext('Chart type', 'Column') ?></label>
-                </div>
-                <div class="formelement">
-                    <input type="radio" name="chartType" value="line" id="radio_line" checked="checked" />
-                    <label for ="radio_line"><?= _pgettext('Chart type', 'Line') ?></label>
-                </div>
-                <div class="formelement">
-                    <input type="radio" name="chartType" value="spline" id="radio_spline" />
-                    <label for ="radio_spline"><?= _pgettext('Chart type', 'Spline') ?></label>
-                </div>
-                <div class="formelement">
-                    <input type="radio" name="chartType" value="area" id="radio_area" />
-                    <label for ="radio_area"><?= _pgettext('Chart type', 'Area') ?></label>
-                </div>
-                <span class="span_pie" style="display:none;">
-                    <input type="radio" name="chartType" value="pie" id="radio_pie" />
-                    <label for ="radio_pie"><?= _pgettext('Chart type', 'Pie') ?></label>
-                </span>
-                <span class="span_timeline" style="display:none;">
-                    <input type="radio" name="chartType" value="timeline" id="radio_timeline" />
-                    <label for ="radio_timeline"><?= _pgettext('Chart type', 'Timeline') ?></label>
-                </span>
-                <span class="span_scatter" style="display:none;">
-                <input type="radio" name="chartType" value="scatter" id="radio_scatter" />
-                <label for ="radio_scatter"><?= _pgettext('Chart type', 'Scatter') ?></label>
-                </span>
-                <br /><br />
-                <span class="barStacked" style="display:none;">
-                    <input type="checkbox" name="barStacked" value="1" id="checkbox_barStacked" />
-                    <label for ="checkbox_barStacked"><?= __('Stacked') ?></label>
-                </span>
-                <br /><br />
-                <label for ="chartTitle"><?= __('Chart title:') ?></label>
-                <input type="text" name="chartTitle" id="chartTitle" />
-            </div>
-            <?php $xaxis = null; ?>
-            <div class="chartOption">
-                <label for="select_chartXAxis"><?= __('X-Axis:'); ?></label>
-                <select name="chartXAxis" id="select_chartXAxis">
-                    <?php foreach ($keys as $idx => $key) : ?>
-                        <?php if ($xaxis === null) : ?>
-                            <?php $xaxis = $idx; ?>
-                        <?php endif; ?>
-                        <?php if ($xaxis === $idx) : ?>
-                            <option value="<?= htmlspecialchars($idx); ?>" selected="selected"><?= htmlspecialchars($key); ?></option>
-                        <?php else : ?>
-                            <option value="<?= htmlspecialchars($idx); ?>"><?= htmlspecialchars($key); ?></option>
-                        <?php endif; ?>
-                    <?php endforeach; ?>
-                </select>
-                <br />
-                <label for="select_chartSeries">
-                    <?= __('Series:'); ?>
-                </label>
-                <select name="chartSeries" id="select_chartSeries" multiple="multiple">
-                    <?php foreach ($keys as $idx => $key) : ?>
-                        <?php if (in_array($fields_meta[$idx]->type, $numeric_types)) : ?>
-                            <?php if ($idx == $xaxis && $numeric_column_count > 1) : ?>
-                                <option value="<?= htmlspecialchars($idx); ?>"><?= htmlspecialchars($key); ?></option>
-                            <?php else : ?>
-                                <option value="<?= htmlspecialchars($idx); ?>" selected="selected"><?= htmlspecialchars($key); ?></option>
-                            <?php endif; ?>
-                        <?php endif; ?>
-                    <?php endforeach;?>
-                </select>
-                <input type="hidden" name="dateTimeCols" value="
-                    <?php $date_time_types = array('date', 'datetime', 'timestamp'); ?>
-                    <?php foreach ($keys as $idx => $key): ?>
-                        <?php if (in_array($fields_meta[$idx]->type, $date_time_types)): ?>
-                            <?= $idx , ' ' ?>
-                        <?php endif; ?>
-                    <?php endforeach; ?>"
-                />
-                <input type="hidden" name="numericCols" value="
-                    <?php foreach ($keys as $idx => $key): ?>
-                        <?php if (in_array($fields_meta[$idx]->type, $numeric_types)): ?>
-                            <?= $idx , ' ' ?>
-                        <?php endif; ?>
-                    <?php endforeach; ?>"
-                />
-            </div>
-            <div class="chartOption">
-                <label for="xaxis_panel">
-                    <?= __('X-Axis label:'); ?>
-                </label>
-                <input style="margin-top:0;" type="text" name="xaxis_label" id="xaxis_label" value="<?= (($xaxis == -1) ? __('X Values') : htmlspecialchars($keys[$xaxis])); ?>" />
-                <br />
-                <label for="yaxis_label">
-                    <?= __('Y-Axis label:'); ?>
-                </label>
-                <input type="text" name="yaxis_label" id="yaxis_label" value="<?= __('Y Values'); ?>" />
-                <br />
-            </div>
-            <p style="clear:both;">&nbsp;</p>
-            <div>
-                <input type="checkbox" id="chkAlternative" name="chkAlternative" value="alternativeFormat" />
-                <label for="chkAlternative"><?= __('Series names are in a column'); ?></label>
-                <br />
-                <label for="select_seriesColumn">
-                    <?= __('Series column:'); ?>
-                </label>
-                <select name="chartSeriesColumn" id="select_seriesColumn" disabled>
-                    <?php foreach ($keys as $idx => $key) : ?>
-                        <option value="<?= htmlspecialchars($idx) ?>"
-                            <?php if ($idx == 1): ?>
-                                selected="selected"
-                            <?php endif; ?>
-                            <?php $seriesColumn = $idx; ?>">
-                                <?= htmlspecialchars($key); ?>
-                        </option>
-                    <?php endforeach; ?>
-                </select>
-                <label for="select_valueColumn">
-                    <?= __('Value Column:'); ?>
-                </label>
-                <select name="chartValueColumn" id="select_valueColumn" disabled>
-                    <?php $selected = false;
-                    foreach ($keys as $idx => $key) : ?>
-                        <?php if (in_array($fields_meta[$idx]->type, $numeric_types)) : ?>
-                            <?php if (! $selected && $idx != $xaxis && $idx != $seriesColumn) : ?>
-                                <option value="<?= htmlspecialchars($idx); ?>" selected="selected"><?= htmlspecialchars($key); $selected = true; ?></option>
-                            <?php else: ?>
-                                <option value="<?= htmlspecialchars($idx); ?>"><?= htmlspecialchars($key); ?></option>
-                            <?php endif; ?>
-                        <?php endif; ?>
-                    <?php endforeach; ?>
-                </select>
-            </div>
-            <?= PMA\libraries\Util::getStartAndNumberOfRowsPanel($sql_query); ?>
-            <p style="clear:both;">&nbsp;</p>
-            <div id="resizer" style="width:600px; height:400px;">
-                <div style="position: absolute; right: 10px; top: 10px; cursor: pointer; z-index: 1000;">
-                    <a class="disableAjax" id="saveChart" href="#" download="chart.png">
-                        <?= PMA\libraries\Util::getImage('b_saveimage', __('Save chart as image')); ?>
-                    </a>
-                </div>
-                <div id="querychart" dir="ltr">
-                </div>
-            </div>
-        </fieldset>
-    </form>
-</div>
\ No newline at end of file
diff --git a/#pma/templates/table/gis_visualization/gis_visualization.phtml b/#pma/templates/table/gis_visualization/gis_visualization.phtml
deleted file mode 100644
index b6b956be..00000000
--- a/#pma/templates/table/gis_visualization/gis_visualization.phtml
+++ /dev/null
@@ -1,80 +0,0 @@
-<div id="div_view_options">
-    <fieldset>
-        <legend><?= __('Display GIS Visualization'); ?></legend>
-        <div id="gis_div" style="position:relative;">
-            <form method="post" action="tbl_gis_visualization.php">
-                <?= PMA_URL_getHiddenInputs($url_params); ?>
-                <label for="labelColumn">
-                    <?= __("Label column"); ?>
-                </label>
-                <select name="visualizationSettings[labelColumn]" id="labelColumn" class="autosubmit">
-                    <option value=""><?= __("-- None --"); ?></option>
-                    <?php foreach ($labelCandidates as $value): ?>
-                        <option value="<?= htmlspecialchars($value); ?>" <?= ($value == $visualizationSettings['labelColumn'] ? 'selected="selected"' : ''); ?>>
-                            <?= htmlspecialchars($value); ?>
-                        </option>
-                    <?php endforeach; ?>
-                </select>
-                <label for="spatialColumn">
-                    <?= __("Spatial column"); ?>
-                </label>
-                <select name="visualizationSettings[spatialColumn]" id="spatialColumn" class="autosubmit">
-                    <?php foreach ($spatialCandidates as $value): ?>
-                        <option value="<?= htmlspecialchars($value); ?>" <?= ($value == $visualizationSettings['spatialColumn'] ? 'selected="selected"' : ''); ?>>
-                            <?= htmlspecialchars($value); ?>
-                        </option>
-                    <?php endforeach; ?>
-                </select>
-                <input type="hidden" name="displayVisualization" value="redraw">
-                    <tr>
-                        <td class="choice" colspan="2">
-                            <input type="checkbox"
-                                   name="visualizationSettings[choice]"
-                                   id="choice" value="useBaseLayer"
-                                   <?php if (isset($visualizationSettings['choice'])): ?>
-                                        checked="checked"
-                                   <?php endif; ?>/>
-                            <label for="choice" id="labelChoice">
-                                <?= __("Use OpenStreetMaps as Base Layer"); ?>
-                            </label>
-                        </td>
-                    </tr>
-                <?= PMA\libraries\Util::getStartAndNumberOfRowsPanel($sql_query); ?>
-            </form>
-
-            <div class="pma_quick_warp" style="width: 50px; position: absolute; right: 0; top: 0; cursor: pointer;">
-                <div class="drop_list">
-                    <span class="drop_button" style="padding: 0; border: 0;">
-                        <?= PMA\libraries\Util::getImage('b_saveimage', __('Save')); ?>
-                    </span>
-                    <ul>
-                        <li class="warp_link">
-                            <a href="<?= $downloadUrl , '&fileFormat=png'; ?>" class="disableAjax">PNG</a>
-                        </li>
-                        <li class="warp_link">
-                            <a href="<?= $downloadUrl , '&fileFormat=pdf'; ?>" class="disableAjax">PDF</a>
-                        </li>
-                        <li class="warp_link">
-                            <a href="<?= $downloadUrl , '&fileFormat=svg'; ?>" class="disableAjax">SVG</a>
-                        </li>
-                    </ul>
-                </div>
-            </div>
-        </div>
-
-        <div style="clear:both;">&nbsp;</div>
-
-        <div id="placeholder"
-             style="width:<?= htmlspecialchars($visualizationSettings['width']); ?>px;height:<?= htmlspecialchars($visualizationSettings['height']); ?>px;">
-            <?= $visualization; ?>
-        </div>
-        <div id="openlayersmap"></div>
-        <input type="hidden" id="pmaThemeImage" value="<?= $GLOBALS['pmaThemeImage']; ?>" />
-        <script language="javascript" type="text/javascript">
-            function drawOpenLayers()
-            {
-                    <?= $drawOl; ?>
-            }
-        </script>
-    </fieldset>
-</div>
diff --git a/#pma/templates/table/index_form.phtml b/#pma/templates/table/index_form.phtml
deleted file mode 100644
index f0f28483..00000000
--- a/#pma/templates/table/index_form.phtml
+++ /dev/null
@@ -1,245 +0,0 @@
-<form action="tbl_indexes.php"
-      method="post"
-      name="index_frm"
-      id="index_frm"
-      class="ajax"
-      onsubmit="if (typeof(this.elements['index[Key_name]'].disabled) != 'undefined') this.elements['index[Key_name]'].disabled = false;">
-
-    <?= PMA_URL_getHiddenInputs($form_params); ?>
-
-    <fieldset id="index_edit_fields">
-        <div class="index_info">
-            <div>
-                <div class="label">
-                    <strong>
-                        <label for="input_index_name">
-                            <?= __('Index name:') , PMA\libraries\Util::showHint(
-                                PMA\libraries\Message::notice(
-                                    __(
-                                        '"PRIMARY" <b>must</b> be the name of and <b>only of</b> a primary key!'
-                                    )
-                                )
-                            ); ?>
-                        </label>
-                    </strong>
-                </div>
-
-                <input type="text"
-                       name="index[Key_name]"
-                       id="input_index_name"
-                       size="25"
-                       maxlength="64"
-                       value="<?= htmlspecialchars($index->getName()); ?>"
-                       onfocus="this.select()" />
-            </div>
-
-            <div>
-                <div class="label">
-                    <strong>
-                        <label for="select_index_choice">
-                            <?= __('Index choice:') , PMA\libraries\Util::showMySQLDocu('ALTER_TABLE'); ?>
-                        </label>
-                    </strong>
-                </div>
-
-                <?= $index->generateIndexChoiceSelector(isset($_REQUEST['create_edit_table'])); ?>
-            </div>
-
-            <?= PMA\libraries\Util::getDivForSliderEffect(
-                'indexoptions', __('Options')
-            ); ?>
-
-            <div>
-
-                <div class="label">
-                    <strong>
-                        <label for="input_key_block_size">
-                            <?= __('Key block size:'); ?>
-                        </label>
-                    </strong>
-                </div>
-
-                <input type="text"
-                       name="index[Key_block_size]"
-                       id="input_key_block_size"
-                       size="30"
-                       value="<?= htmlspecialchars($index->getKeyBlockSize()) ?>" />
-            </div>
-
-            <div>
-
-                <div class="label">
-                    <strong>
-                        <label for="select_index_type">
-                            <?= __('Index type:') , PMA\libraries\Util::showMySQLDocu('ALTER_TABLE'); ?>
-                        </label>
-                    </strong>
-                </div>
-
-                <?= $index->generateIndexTypeSelector(); ?>
-            </div>
-
-            <div>
-                <div class="label">
-                    <strong>
-                        <label for="input_parser">
-                            <?= __('Parser:'); ?>
-                        </label>
-                    </strong>
-                </div>
-
-                <input type="text"
-                       name="index[Parser]"
-                       id="input_parse"
-                       size="30"
-                       value="<?= htmlspecialchars($index->getParser()) ?>" />
-            </div>
-
-            <div>
-                <div class="label">
-                    <strong>
-                        <label for="input_index_comment">
-                            <?= __('Comment:'); ?>
-                        </label>
-                    </strong>
-                </div>
-
-                <input type="text"
-                       name="index[Index_comment]"
-                       id="input_index_comment"
-                       size="30"
-                       maxlength="1024"
-                       value="<?= htmlspecialchars($index->getComment()) ?>" />
-            </div>
-        </div>
-        <!-- end of indexoptions div -->
-
-        <div class="clearfloat"></div>
-
-        <table id="index_columns">
-            <thead>
-                <tr>
-                    <th></th>
-                    <th>
-                        <?= __('Column') ?>
-                    </th>
-                    <th>
-                        <?= __('Size') ?>
-                    </th>
-                </tr>
-            </thead>
-            <?php $odd_row = true;
-            $spatial_types = array(
-                'geometry',
-                'point',
-                'linestring',
-                'polygon',
-                'multipoint',
-                'multilinestring',
-                'multipolygon',
-                'geomtrycollection'
-            ); ?>
-            <tbody>
-
-                <?php /* @var $column PMA\libraries\IndexColumn */
-                foreach ($index->getColumns() as $column): ?>
-
-                    <tr class="<?= $odd_row ? 'odd' : 'even'; ?>noclick">
-                        <td>
-                            <span class="drag_icon" title="<?= __('Drag to reorder') ?>"></span>
-                        </td>
-                        <td>
-                            <select name="index[columns][names][]">
-                                <option value="">
-                                    -- <?= __('Ignore'); ?> --
-                                </option>
-
-                                <?php
-                                foreach ($fields as $field_name => $field_type):
-                                    if (($index->getChoice() != 'FULLTEXT'
-                                            || preg_match('/(char|text)/i', $field_type))
-                                        && ($index->getChoice() != 'SPATIAL'
-                                            || in_array($field_type, $spatial_types))): ?>
-
-                                        <option value="<?= htmlspecialchars($field_name) ?>"
-                                                <?php if ($field_name == $column->getName()): ?>
-                                                    selected="selected"
-                                                <?php endif; ?>>
-
-                                            <?= htmlspecialchars($field_name); ?> [<?= htmlspecialchars($field_type); ?>]
-                                        </option>
-                                    <?php endif;
-                                endforeach; ?>
-                            </select>
-                        </td>
-                        <td>
-                            <input type="text"
-                                   size="5"
-                                   onfocus="this.select()"name="index[columns][sub_parts][]"
-                                   value="<?= ($index->getChoice() != 'SPATIAL') ?
-                                       $column->getSubPart()
-                                       : ''
-                                    ?>" />
-                        </td>
-                    </tr>
-
-                    <?php
-                    $odd_row = !$odd_row;
-
-                endforeach;
-
-                for ($i = 0; $i < $add_fields; $i++): ?>
-
-                    <tr class="<?= $odd_row ? 'odd' : 'even'; ?>noclick">
-                        <td>
-                            <span class="drag_icon" title="<?= __('Drag to reorder') ?>"></span>
-                        </td>
-                        <td>
-                            <select name="index[columns][names][]">
-                                <option value="">-- <?= __('Ignore') ?> --</option>
-
-                                <?php
-                                $j = 0;
-                                foreach ($fields as $field_name => $field_type):
-                                    if (isset($_REQUEST['create_edit_table'])) {
-                                        $col_index = $field_type[1];
-                                        $field_type = $field_type[0];
-                                    } ?>
-
-                                    <option value="<?= htmlspecialchars((isset($col_index)) ? $col_index : $field_name); ?>"
-                                            <?= ($j++ == $i ? ' selected="selected"' : ''); ?>>
-                                        <?= htmlspecialchars($field_name) ?> [<?= htmlspecialchars($field_type); ?>]
-                                    </option>
-                                    <?= "\n";
-                                endforeach; ?>
-                            </select>
-                        </td>
-                        <td>
-                            <input type="text"
-                                   size="5"
-                                   onfocus="this.select()"
-                                   name="index[columns][sub_parts][]"
-                                   value="" />
-                        </td>
-                    </tr>
-                    <?php
-                    $odd_row = !$odd_row;
-                 endfor; ?>
-
-            </tbody>
-        </table>
-        <div class="add_more">
-
-            <div class="slider"></div>
-            <div class="add_fields hide">
-                <input type="submit"
-                       id="add_fields"
-                       value="<?= sprintf(__('Add %s column(s) to index'), 1); ?>" />
-            </div>
-        </div>
-    </fieldset>
-    <fieldset class="tblFooters">
-        <button type="submit" id="preview_index_frm"><?= __('Preview SQL'); ?></button>
-        <input type="submit" id="save_index_frm" value="<?= __('Go'); ?>" />
-    </fieldset>
-</form>
\ No newline at end of file
diff --git a/#pma/templates/table/relation/common_form.phtml b/#pma/templates/table/relation/common_form.phtml
deleted file mode 100644
index d475fd7d..00000000
--- a/#pma/templates/table/relation/common_form.phtml
+++ /dev/null
@@ -1,138 +0,0 @@
-<form method="post" action="tbl_relation.php">
-    <?= PMA_URL_getHiddenInputs($db, $table); ?>
-    <!-- InnoDB  -->
-    <?php if (PMA\libraries\Util::isForeignKeySupported($tbl_storage_engine)): ?>
-        <fieldset>
-            <legend><?= __('Foreign key constraints'); ?></legend>
-            <table id="foreign_keys" class="relationalTable">
-                <tr>
-                    <th><?= __('Actions'); ?></th>
-                    <th><?= __('Constraint properties'); ?></th>
-                    <?php if (strtoupper($tbl_storage_engine) == 'INNODB'): ?>
-                        <th><?= __('Column') , PMA\libraries\Util::showHint(__(
-                                'Creating a foreign key over a non-indexed column would automatically create'
-                                . ' an index on it. Alternatively, you can define an index below, before creating'
-                                . ' the foreign key.'
-                            )) ?>
-                        </th>
-                    <?php else: ?>
-                        <th><?= __('Column') , PMA\libraries\Util::showHint(__(
-                                'Only columns with index will be displayed. You can define an'
-                                . ' index below.'
-                            )) ?>
-                        </th>
-                    <?php endif; ?>
-                    <th colspan="3">
-                        <?= __('Foreign key constraint'); ?> (<?= $tbl_storage_engine; ?>)
-                    </th>
-                </tr>
-                <tr>
-                    <th></th>
-                    <th></th>
-                    <th></th>
-                    <th><?= __('Database'); ?></th>
-                    <th><?= __('Table'); ?></th>
-                    <th><?= __('Column'); ?></th>
-                </tr>
-                <?php $odd_row = true; $i = 0; ?>
-                <?php if (! empty($existrel_foreign)): ?>
-                    <?php foreach ($existrel_foreign as $key => $one_key): ?>
-                        <?= PMA\libraries\Template::get('table/relation/foreign_key_row')->render(
-                            array(
-                                'one_key' => $one_key,
-                                'odd_row' => $odd_row,
-                                'columns' => $columns,
-                                'i' => $i++,
-                                'options_array' => $options_array,
-                                'tbl_storage_engine' => $tbl_storage_engine,
-                                'db' => $db
-                            )
-                        );
-                        $odd_row = ! $odd_row;?>
-                    <?php endforeach; ?>
-                <?php endif; ?>
-                <?= PMA\libraries\Template::get('table/relation/foreign_key_row')->render(
-                    array(
-                        'one_key' => array(),
-                        'odd_row' => $odd_row,
-                        'columns' => $columns,
-                        'i' => $i++,
-                        'options_array' => $options_array,
-                        'tbl_storage_engine' => $tbl_storage_engine,
-                        'db' => $db
-                    )
-                ); ?>
-                <tr>
-                    <td colspan="5">
-                        <a class="formelement clearfloat add_foreign_key" href="">
-                            <?= __('+ Add constraint'); ?>
-                    </td>
-                </tr>
-            </table>
-        </fieldset>
-    <?php endif; ?>
-
-    <?php if ($cfgRelation['relwork']): ?>
-        <?php if (PMA\libraries\Util::isForeignKeySupported($tbl_storage_engine)): ?>
-            <br/>
-            <?= PMA\libraries\Util::getDivForSliderEffect('ir_div', __('Internal relations')) ?>
-        <?php endif; ?>
-
-        <?php $save_row = array_values($columns);
-        $saved_row_cnt  = count($save_row);?>
-        <fieldset>
-            <legend><?= __('Internal relations') , PMA\libraries\Util::showDocu('config', 'cfg_Servers_relation'); ?></legend>
-            <table id="internal_relations" class="relationalTable">
-                <tr>
-                    <th><?= __('Column'); ?></th>
-                    <th><?= __('Internal relation'); ?>
-                        <?php if (PMA\libraries\Util::isForeignKeySupported($tbl_storage_engine)): ?>
-                            <?= PMA\libraries\Util::showHint(__(
-                                'An internal relation is not necessary when a corresponding'
-                                . ' FOREIGN KEY relation exists.')); ?>
-                        <?php endif; ?>
-                    </th>
-                    <?php $odd_row = true; ?>
-                    <?php for ($i = 0; $i < $saved_row_cnt; $i++): ?>
-                        <?= PMA\libraries\Template::get('table/relation/internal_relational_row')->render(
-                            array(
-                                'save_row' => $save_row,
-                                'i' => $i,
-                                'odd_row' => $odd_row,
-                                'existrel' => $existrel,
-                                'db' => $db
-                            )
-                        );
-                        $odd_row = ! $odd_row; ?>
-                    <?php endfor; ?>
-            </table>
-        </fieldset>
-        <?php if (PMA\libraries\Util::isForeignKeySupported($tbl_storage_engine)): ?>
-            </div>
-        <?php endif; ?>
-    <?php endif; ?>
-
-    <?php if ($cfgRelation['displaywork']): ?>
-        <?php $save_row = array_values($columns);?>
-        <?php $disp = PMA_getDisplayField($db, $table); ?>
-        <fieldset>
-            <label><?= __('Choose column to display:'); ?></label>
-            <select name="display_field">
-                <option value="">---</option>
-                <?php foreach ($save_row as $row): ?>
-                    <option value="<?= htmlspecialchars($row['Field']); ?>"
-                        <?php if (isset($disp) && $row['Field'] == $disp): ?>
-                            selected="selected"
-                        <?php endif; ?>>
-                        <?= htmlspecialchars($row['Field']); ?>
-                    </option>
-                <?php endforeach; ?>
-            </select>
-        </fieldset>
-    <?php endif; ?>
-
-    <fieldset class="tblFooters">
-        <input type="button" class="preview_sql" value="<?= __('Preview SQL'); ?>" />
-        <input type="submit" value="<?= __('Save'); ?>" />
-    </fieldset>
-</form>
\ No newline at end of file
diff --git a/#pma/templates/table/relation/dropdown_generate.phtml b/#pma/templates/table/relation/dropdown_generate.phtml
deleted file mode 100644
index d9536dec..00000000
--- a/#pma/templates/table/relation/dropdown_generate.phtml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?= (! empty($dropdown_question)
-    ? htmlspecialchars($dropdown_question) . '&nbsp;&nbsp;'
-    : ''); ?><select name="<?= htmlspecialchars($select_name); ?>">
-<?php foreach ($choices as $one_value => $one_label): ?>
-    <option value="<?= htmlspecialchars($one_value); ?>"
-            <?php if ($selected_value == $one_value): ?>
-                selected="selected"
-            <?php endif; ?>>
-        <?= htmlspecialchars($one_label); ?>
-    </option>
-<?php endforeach; ?>
-</select>
\ No newline at end of file
diff --git a/#pma/templates/table/relation/foreign_key_row.phtml b/#pma/templates/table/relation/foreign_key_row.phtml
deleted file mode 100644
index f54990d8..00000000
--- a/#pma/templates/table/relation/foreign_key_row.phtml
+++ /dev/null
@@ -1,200 +0,0 @@
-<?php
-use PMA\libraries\DatabaseInterface;
-use PMA\libraries\Table;
-use PMA\libraries\Util;
-
-$js_msg = '';
-$this_params = null;
-if (isset($one_key['constraint'])) {
-    $drop_fk_query = 'ALTER TABLE ' . PMA\libraries\Util::backquote($GLOBALS['table'])
-        . ' DROP FOREIGN KEY '
-        . PMA\libraries\Util::backquote($one_key['constraint']) . ';';
-    $this_params = $GLOBALS['url_params'];
-    $this_params['goto'] = 'tbl_relation.php';
-    $this_params['back'] = 'tbl_relation.php';
-    $this_params['sql_query'] = $drop_fk_query;
-    $this_params['message_to_show'] = sprintf(
-        __('Foreign key constraint %s has been dropped'),
-        $one_key['constraint']
-    );
-    $js_msg = PMA_jsFormat(
-        'ALTER TABLE ' . $GLOBALS['table']
-        . ' DROP FOREIGN KEY '
-        . $one_key['constraint'] . ';'
-    );
-}
-
-// For ON DELETE and ON UPDATE, the default action
-// is RESTRICT as per MySQL doc; however, a SHOW CREATE TABLE
-// won't display the clause if it's set as RESTRICT.
-$on_delete = isset($one_key['on_delete'])
-    ? $one_key['on_delete'] : 'RESTRICT';
-$on_update = isset($one_key['on_update'])
-    ? $one_key['on_update'] : 'RESTRICT';
-
-$column_array = array();
-$column_array[''] = '';
-foreach ($columns as $column) {
-    if (strtoupper($tbl_storage_engine) == 'INNODB'
-        || ! empty($column['Key'])
-    ) {
-        $column_array[$column['Field']] = $column['Field'];
-    }
-}
-
-$foreign_table = false;
-// foreign database dropdown
-$foreign_db = (isset($one_key['ref_db_name'])) ? $one_key['ref_db_name'] : $db;
-
-$tables = array();
-if ($foreign_db) {
-    $foreign_table = isset($one_key['ref_table_name'])
-        ? $one_key['ref_table_name'] : '';
-
-    $tables_rs = $GLOBALS['dbi']->query(
-        'SHOW TABLE STATUS FROM ' . Util::backquote($foreign_db),
-        null,
-        DatabaseInterface::QUERY_STORE
-    );
-    while ($row = $GLOBALS['dbi']->fetchRow($tables_rs)) {
-        if (isset($row[1])
-            && mb_strtoupper($row[1]) == $tbl_storage_engine
-        ) {
-            $tables[] = $row[0];
-        }
-    }
-}
-?>
-<tr class="<?= ($odd_row ? 'odd' : 'even'); ?>">
-    <!-- Drop key anchor -->
-    <td>
-        <?php if (isset($one_key['constraint'])): ?>
-            <input type="hidden"
-                   class="drop_foreign_key_msg"
-                   value="<?= $js_msg; ?>" />
-            <a class="drop_foreign_key_anchor ajax"
-               href="sql.php<?= PMA_URL_getCommon($this_params); ?>" >
-                <?= PMA\libraries\Util::getIcon('b_drop.png', __('Drop')); ?>
-            </a>
-        <?php endif; ?>
-    </td>
-    <td>
-        <span class="formelement clearfloat">
-            <input type="text" name="constraint_name[<?= $i; ?>]"
-                   value="<?= (isset($one_key['constraint'])) ?
-                       htmlspecialchars($one_key['constraint'])
-                       : ''
-                       ?>"
-                   placeholder="<?= __('Constraint name'); ?>"
-                   maxlength="64" />
-        </span>
-        <div class="floatleft">
-            <span class="formelement">
-                <?= PMA\libraries\Template::get('table/relation/dropdown_generate')->render(
-                    array(
-                        'dropdown_question' => 'ON DELETE',
-                        'select_name' => 'on_delete[' . $i . ']',
-                        'choices' => $options_array,
-                        'selected_value' => $on_delete
-                    )
-                ); ?>
-            </span>
-            <span class="formelement">
-                <?= PMA\libraries\Template::get('table/relation/dropdown_generate')->render(
-                    array(
-                        'dropdown_question' => 'ON UPDATE',
-                        'select_name' => 'on_update[' . $i . ']',
-                        'choices' => $options_array,
-                        'selected_value' => $on_update
-                    )
-                ); ?>
-            </span>
-        </div>
-    </td>
-    <td>
-        <?php if (isset($one_key['index_list'])): ?>
-            <?php foreach ($one_key['index_list'] as $key => $column): ?>
-                <span class="formelement clearfloat">
-                    <?= PMA\libraries\Template::get('table/relation/dropdown_generate')->render(
-                        array(
-                            'dropdown_question' => '',
-                            'select_name' => 'foreign_key_fields_name[' . $i . '][]',
-                            'choices' => $column_array,
-                            'selected_value' => $column
-                        )
-                    ); ?>
-                </span>
-            <?php endforeach; ?>
-        <?php else: ?>
-            <span class="formelement clearfloat">
-                <?= PMA\libraries\Template::get('table/relation/dropdown_generate')->render(
-                    array(
-                        'dropdown_question' => '',
-                        'select_name' => 'foreign_key_fields_name[' . $i . '][]',
-                        'choices' => $column_array,
-                        'selected_value' => ''
-                    )
-                ); ?>
-            </span>
-        <?php endif; ?>
-        <a class="formelement clearfloat add_foreign_key_field"
-           href=""
-           data-index="<?= $i; ?>">
-            <?= __('+ Add column'); ?>
-        </a>
-    </td>
-    <td>
-        <span class="formelement clearfloat">
-            <?= PMA\libraries\Template::get('table/relation/relational_dropdown')->render(
-                array(
-                    'name' => 'destination_foreign_db[' . $i . ']',
-                    'title' => __('Database'),
-                    'values' => $GLOBALS['dblist']->databases,
-                    'foreign' => $foreign_db
-                )
-            ); ?>
-    </td>
-    <td>
-        <span class="formelement clearfloat">
-            <?= PMA\libraries\Template::get('table/relation/relational_dropdown')->render(
-                array(
-                    'name' => 'destination_foreign_table[' . $i . ']',
-                    'title' => __('Table'),
-                    'values' => $tables,
-                    'foreign' => $foreign_table
-                )
-            ); ?>
-        </span>
-    </td>
-    <td>
-        <?php if ($foreign_db && $foreign_table): ?>
-            <?php foreach ($one_key['ref_index_list'] as $foreign_column): ?>
-                <?php
-                $table_obj = new Table($foreign_table, $foreign_db);
-                $columns = $table_obj->getUniqueColumns(false, false);
-                ?>
-                <span class="formelement clearfloat">
-                    <?= PMA\libraries\Template::get('table/relation/relational_dropdown')->render(
-                        array(
-                            'name' => 'destination_foreign_column[' . $i . '][]',
-                            'title' => __('Column'),
-                            'values' => $columns,
-                            'foreign' => $foreign_column
-                        )
-                    ); ?>
-                </span>
-            <?php endforeach; ?>
-        <?php else: ?>
-            <span class="formelement clearfloat">
-                <?= PMA\libraries\Template::get('table/relation/relational_dropdown')->render(
-                    array(
-                        'name' => 'destination_foreign_column[' . $i . '][]',
-                        'title' => __('Column'),
-                        'values' => array(),
-                        'foreign' => ''
-                    )
-                ); ?>
-            </span>
-        <?php endif; ?>
-    </td>
-</tr>
\ No newline at end of file
diff --git a/#pma/templates/table/relation/internal_relational_row.phtml b/#pma/templates/table/relation/internal_relational_row.phtml
deleted file mode 100644
index b5b7a50c..00000000
--- a/#pma/templates/table/relation/internal_relational_row.phtml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-use PMA\libraries\Table;
-
-$myfield = $save_row[$i]['Field'];
-// Use an md5 as array index to avoid having special characters
-// in the name attribute (see bug #1746964 )
-$myfield_md5 = md5($myfield);
-$myfield_html = htmlspecialchars($myfield);
-
-$foreign_table = false;
-$foreign_column = false;
-
-// database dropdown
-if (isset($existrel[$myfield])) {
-    $foreign_db = $existrel[$myfield]['foreign_db'];
-} else {
-    $foreign_db = $db;
-}
-
-// table dropdown
-$tables = array();
-if ($foreign_db) {
-    if (isset($existrel[$myfield])) {
-        $foreign_table = $existrel[$myfield]['foreign_table'];
-    }
-    $tables_rs = $GLOBALS['dbi']->query(
-        'SHOW TABLES FROM ' . PMA\libraries\Util::backquote($foreign_db),
-        null,
-        PMA\libraries\DatabaseInterface::QUERY_STORE
-    );
-    while ($row = $GLOBALS['dbi']->fetchRow($tables_rs)) {
-        $tables[] = $row[0];
-    }
-}
-
-// column dropdown
-$columns = array();
-if ($foreign_db && $foreign_table) {
-    if (isset($existrel[$myfield])) {
-        $foreign_column = $existrel[$myfield]['foreign_field'];
-    }
-    $table_obj = new Table($foreign_table, $foreign_db);
-    $columns = $table_obj->getUniqueColumns(false, false);
-}
-?>
-<tr class="<?= ($odd_row ? 'odd' : 'even'); ?>">
-    <td class="vmiddle">
-        <strong><?= $myfield_html; ?></strong>
-        <input type="hidden" name="fields_name[<?= $myfield_md5; ?>]"
-               value="<?= $myfield_html; ?>"/>
-    </td>
-
-    <td>
-        <?= PMA\libraries\Template::get('table/relation/relational_dropdown')->render(
-            array(
-                'name' => 'destination_db[' . $myfield_md5 . ']',
-                'title' => __('Database'),
-                'values' => $GLOBALS['dblist']->databases,
-                'foreign' => $foreign_db
-            )
-        ); ?>
-        <?= PMA\libraries\Template::get('table/relation/relational_dropdown')->render(
-            array(
-                'name' => 'destination_table[' . $myfield_md5 . ']',
-                'title' => __('Table'),
-                'values' => $tables,
-                'foreign' => $foreign_table
-            )
-        ); ?>
-        <?= PMA\libraries\Template::get('table/relation/relational_dropdown')->render(
-            array(
-                'name' => 'destination_column[' . $myfield_md5 . ']',
-                'title' => __('Column'),
-                'values' => $columns,
-                'foreign' => $foreign_column
-            )
-        ); ?>
-    </td>
-</tr>
\ No newline at end of file
diff --git a/#pma/templates/table/relation/relational_dropdown.phtml b/#pma/templates/table/relation/relational_dropdown.phtml
deleted file mode 100644
index c2e6f4b4..00000000
--- a/#pma/templates/table/relation/relational_dropdown.phtml
+++ /dev/null
@@ -1,18 +0,0 @@
-<select name="<?= $name; ?>" title="<?= $title; ?>">
-    <option value=""></option>
-    <?php $seen_key = false; ?>
-    <?php foreach ($values as $value): ?>
-        <option value="<?= htmlspecialchars($value); ?>"
-                <?php if ($foreign && $value == $foreign): ?>
-                    selected="selected"
-                    <?php $seen_key = true; ?>
-                <?php endif; ?>>
-            <?= htmlspecialchars($value); ?>
-        </option>
-    <?php endforeach; ?>
-    <?php if (is_string($foreign) && ! $seen_key): ?>
-        <option value="<?= htmlspecialchars($foreign); ?>" selected="selected">
-            <?= htmlspecialchars($foreign); ?>
-        </option>
-    <?php endif; ?>
-</select>
\ No newline at end of file
diff --git a/#pma/templates/table/search/column_comparison_operators.phtml b/#pma/templates/table/search/column_comparison_operators.phtml
deleted file mode 100644
index 176691ca..00000000
--- a/#pma/templates/table/search/column_comparison_operators.phtml
+++ /dev/null
@@ -1,7 +0,0 @@
-<select name="criteriaColumnOperators[<?= $search_index; ?>]"
-        onchange="changeValueFieldType(this, <?= $search_index; ?>)">
-    <?= $GLOBALS['PMA_Types']->getTypeOperatorsHtml(
-        preg_replace('@\(.*@s', '', $columnTypes[$column_index]),
-        $columnNullFlags[$column_index], $selected_operator
-    ); ?>
-</select>
\ No newline at end of file
diff --git a/#pma/templates/table/search/fields_table.phtml b/#pma/templates/table/search/fields_table.phtml
deleted file mode 100644
index d084aa25..00000000
--- a/#pma/templates/table/search/fields_table.phtml
+++ /dev/null
@@ -1,26 +0,0 @@
-<table class="data" <?php if ($searchType == 'zoom'): ?>
-                        id="tableFieldsId"
-                   <?php endif; ?>>
-    <?= PMA\libraries\Template::get('table/search/table_header')
-        ->render(array(
-            'geomColumnFlag' => $geomColumnFlag
-        )); ?>
-    <tbody>
-    <?php if ($searchType == 'zoom'): ?>
-        <?= PMA\libraries\Template::get('table/search/rows_zoom')
-            ->render(array(
-                'self' => $self,
-                'columnNames' => $columnNames
-        )) ?>
-    <?php else: ?>
-        <?= PMA\libraries\Template::get('table/search/rows_normal')
-            ->render(array(
-                'self' => $self,
-                'geomColumnFlag' => $geomColumnFlag,
-                'columnNames' => $columnNames,
-                'columnTypes' => $columnTypes,
-                'columnCollations' => $columnCollations
-        )) ?>
-    <?php endif; ?>
-    </tbody>
-</table>
\ No newline at end of file
diff --git a/#pma/templates/table/search/form_tag.phtml b/#pma/templates/table/search/form_tag.phtml
deleted file mode 100644
index dfe730e7..00000000
--- a/#pma/templates/table/search/form_tag.phtml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-$scriptName = '';
-$formId = '';
-switch ($searchType) {
-    case 'normal' :
-        $scriptName = 'tbl_select.php';
-        $formId = 'tbl_search_form';
-        break;
-    case 'zoom' :
-        $scriptName = 'tbl_zoom_select.php';
-        $formId = 'zoom_search_form';
-        break;
-    case 'replace' :
-        $scriptName = 'tbl_find_replace.php';
-        $formId = 'find_replace_form';
-        break;
-}
-?>
-<form method="post" action="<?= $scriptName; ?>" name="insertForm" id="<?= $formId; ?>" class="ajax lock-page">
-    <?= PMA_URL_getHiddenInputs($db, $table); ?>
-    <input type="hidden" name="goto" value="<?= $goto; ?>" />
-    <input type="hidden" name="back" value="<?= $scriptName; ?>" />
\ No newline at end of file
diff --git a/#pma/templates/table/search/geom_func.phtml b/#pma/templates/table/search/geom_func.phtml
deleted file mode 100644
index 55642e77..00000000
--- a/#pma/templates/table/search/geom_func.phtml
+++ /dev/null
@@ -1,39 +0,0 @@
-<!-- Displays 'Function' column if it is present -->
-<td>
-    <?php
-    $geom_types = PMA\libraries\Util::getGISDatatypes();
-    ?>
-
-    <?php
-    /**
-     * if a geometry column is present
-     */
-    if (in_array($columnTypes[$column_index], $geom_types)): ?>
-        <select class="geom_func"
-                name="geom_func[<?= $column_index; ?>]">
-
-            <?php
-            // get the relevant list of GIS functions
-            $funcs = PMA\libraries\Util::getGISFunctions(
-                $columnTypes[$column_index], true, true
-            );
-            ?>
-
-            <?php
-            /**
-            * For each function in the list of functions,
-            * add an option to select list
-            */
-            foreach ($funcs as $func_name => $func): ?>
-                <?php $name = htmlspecialchars(
-                    isset($func['display']) ? $func['display'] : $func_name
-                ); ?>
-                <option value="<?= $name; ?>">
-                    <?= $name; ?>
-                </option>
-            <?php endforeach; ?>
-        </select>
-    <?php else: ?>
-        &nbsp;
-    <?php endif; ?>
-</td>
\ No newline at end of file
diff --git a/#pma/templates/table/search/input_box.phtml b/#pma/templates/table/search/input_box.phtml
deleted file mode 100644
index 9898135b..00000000
--- a/#pma/templates/table/search/input_box.phtml
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-// Get inputbox based on different column types
-// (Foreign key, geometrical, enum)
-if ($_foreigners
-    && PMA_searchColumnInForeigners($_foreigners, $column_name)): ?>
-    <?php if (is_array($foreignData['disp_row'])): ?>
-        <select name="criteriaValues[<?= $column_index; ?>]"
-                id="<?= $column_id , $column_index ?>">
-            <?= PMA_foreignDropdown(
-                $foreignData['disp_row'], $foreignData['foreign_field'],
-                $foreignData['foreign_display'], '', $foreignMaxLimit
-            ) ?>
-        </select>
-    <?php elseif ($foreignData['foreign_link'] == true): ?>
-        <input type="text"
-               id="<?= $column_id , $column_index; ?>"
-               name="criteriaValues[<?= $column_index; ?>]"
-               id="field_<?= md5($column_name); ?>[<?= $column_index; ?>]"
-               class="textfield"
-               <?php if (isset($criteriaValues[$column_index])
-                   && is_string($criteriaValues[$column_index])
-               ): ?>
-                   value="<?= htmlspecialchars($criteriaValues[$column_index]); ?>"
-               <?php endif; ?> />
-        <a class="ajax browse_foreign"
-           href="<?= ('browse_foreigners.php') , PMA_URL_getCommon(array('db' => $db, 'table' => $table))
-                    , ('&amp;field=') , urlencode($column_name)
-                    , ('&amp;fieldkey=') , $column_index
-                    , ('&amp;fromsearch=1')
-                ?>">
-
-            <?= str_replace("'", "\\'", $titles['Browse']); ?>
-        </a>
-    <?php endif; ?>
-
-<?php elseif (in_array($column_type, PMA\libraries\Util::getGISDatatypes())): ?>
-    <input type="text"
-           name="criteriaValues[<?= $column_index; ?>]"
-           size="40"
-           class="textfield"
-           id="field_<?= $column_index; ?>" />
-    <?php if ($in_fbs): ?>
-
-        <?php
-        $edit_url = 'gis_data_editor.php' . PMA_URL_getCommon();
-        $edit_str = PMA\libraries\Util::getIcon('b_edit.png', __('Edit/Insert'));
-        ?>
-
-        <span class="open_search_gis_editor">
-            <?= PMA\libraries\Util::linkOrButton(
-                $edit_url, $edit_str, array(), false, false, '_blank'
-            ); ?>
-        </span>
-    <?php endif; ?>
-
-<?php elseif (strncasecmp($column_type, 'enum', 4) == 0
-    || (strncasecmp($column_type, 'set', 3) == 0
-        && $in_zoom_search_edit)
-): ?>
-
-    <?php
-    $in_zoom_search_edit = false;
-    $column_type = htmlspecialchars($column_type);
-    $value = explode(', ', str_replace("'", '', mb_substr($column_type, 5, -1)));
-    $cnt_value = count($value);
-    /*
-     * Enum in edit mode   --> dropdown
-     * Enum in search mode --> multiselect
-     * Set in edit mode    --> multiselect
-     * Set in search mode  --> input (skipped here, so the 'else'
-     *                                 section would handle it)
-     */
-    ?>
-
-    <?php if ((strncasecmp($column_type, 'enum', 4) && ! $in_zoom_search_edit)
-        || (strncasecmp($column_type, 'set', 3) && $in_zoom_search_edit)
-    ): ?>
-        <select name="criteriaValues[<?= $column_index; ?>]"
-                id="<?= $column_id , $column_index; ?>">
-    <?php else: ?>
-        <select name="criteriaValues[<?= $column_index; ?>]"
-                id="<?= $column_id , $column_index; ?>"
-                multiple="multiple"
-                size="<?= min(3, $cnt_value); ?>">
-    <?php endif; ?>
-
-        <!-- Add select options-->
-        <?php for ($j = 0; $j < $cnt_value; $j++): ?>
-            <?php if (isset($criteriaValues[$column_index])
-                && is_array($criteriaValues[$column_index])
-                && in_array($value[$j], $criteriaValues[$column_index])
-            ): ?>
-                <option value="<?= htmlspecialchars($value[$j]); ?>"
-                        selected>
-                    <?php echo htmlspecialchars($value[$j]); ?>
-                </option>
-            <?php else: ?>
-                <option value="<?= htmlspecialchars($value[$j]); ?>">
-                    <?php echo htmlspecialchars($value[$j]); ?>
-                </option>
-            <?php endif; ?>
-        <?php endfor; ?>
-    </select>
-
-<?php else: ?>
-<!-- other cases-->
-
-    <?php
-    $the_class = 'textfield';
-
-    if ($column_type == 'date') {
-        $the_class .= ' datefield';
-    } elseif ($column_type == 'datetime'
-        || substr($column_type, 0, 9) == 'timestamp'
-    ) {
-        $the_class .= ' datetimefield';
-    } elseif (substr($column_type, 0, 3) == 'bit') {
-        $the_class .= ' bit';
-    }
-    ?>
-    <input type="text"
-           name="criteriaValues[<?= $column_index; ?>]"
-           size="40"
-           class="<?= $the_class; ?>"
-           id="<?= $column_id , $column_index; ?>"
-           <?php if (isset($criteriaValues[$column_index])
-               && is_string($criteriaValues[$column_index])
-           ): ?>
-               value="<?= htmlspecialchars($criteriaValues[$column_index]); ?>"
-           <?php endif; ?>/>
-
-<?php endif; ?>
diff --git a/#pma/templates/table/search/options.phtml b/#pma/templates/table/search/options.phtml
deleted file mode 100644
index 89908c0e..00000000
--- a/#pma/templates/table/search/options.phtml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?= PMA\libraries\Util::getDivForSliderEffect(
-    'searchoptions', __('Options')
-); ?>
-
-<!-- Displays columns select list for selecting distinct columns in the search -->
-<fieldset id="fieldset_select_fields">
-    <legend>
-        <?= __('Select columns (at least one):'); ?>
-    </legend>
-    <select name="columnsToDisplay[]"
-            size="<?= min(count($columnNames), 10); ?>"
-            multiple="multiple">
-        <?php
-        /**
-         * Displays the list of the fields
-         */
-        foreach ($columnNames as $each_field): ?>
-            <option value="<?= htmlspecialchars($each_field); ?>"
-                    selected="selected">
-                <?= htmlspecialchars($each_field); ?>
-            </option>
-        <?php endforeach; ?>
-    </select>
-    <input type="checkbox"
-           name="distinct"
-           value="DISTINCT"
-           id="oDistinct" />
-    <label for="oDistinct">
-        DISTINCT
-    </label>
-</fieldset>
-
-<!-- Displays input box for custom 'Where' clause to be used in the search -->
-<fieldset id="fieldset_search_conditions">
-    <legend>
-        <em><?= __('Or'); ?></em>
-        <?= __('Add search conditions (body of the "where" clause):'); ?>
-    </legend>
-    <?= PMA\libraries\Util::showMySQLDocu('Functions'); ?>
-    <input type="text" name="customWhereClause" class="textfield" size="64" />
-</fieldset>
-
-<!-- Displays option of changing default number of rows displayed per page -->
-<fieldset id="fieldset_limit_rows">
-    <legend><?= __('Number of rows per page'); ?></legend>
-    <input type="number"
-           name="session_max_rows"
-           required="required"
-           min="1"
-           value="<?= intval($GLOBALS['cfg']['MaxRows']); ?>"
-           class="textfield" />
-</fieldset>
-
-<!-- Displays option for ordering search results by a column value (Asc or Desc) -->
-<fieldset id="fieldset_display_order">
-    <legend><?= __('Display order:'); ?></legend>
-    <select name="orderByColumn"><option value="--nil--"></option>
-        <?php foreach ($columnNames as $each_field): ?>
-            <option value="<?= htmlspecialchars($each_field); ?>">
-                <?= htmlspecialchars($each_field); ?>
-            </option>
-        <?php endforeach; ?>
-    </select>
-
-    <?= PMA\libraries\Util::getRadioFields(
-        'order',
-        array(
-            'ASC' => __('Ascending'),
-            'DESC' => __('Descending')
-        ),
-        'ASC',
-        false,
-        true,
-        "formelement"
-    ); ?>
-
-</fieldset>
-<br style="clear: both;" />
diff --git a/#pma/templates/table/search/options_zoom.phtml b/#pma/templates/table/search/options_zoom.phtml
deleted file mode 100644
index d288db04..00000000
--- a/#pma/templates/table/search/options_zoom.phtml
+++ /dev/null
@@ -1,48 +0,0 @@
-<table class="data">
-    <!-- Select options for data label -->
-    <tr>
-        <td>
-            <label for="dataLabel">
-                <?= __("Use this column to label each point"); ?>
-            </label>
-        </td>
-        <td>
-            <select name="dataLabel" id="dataLabel" >
-                <option value = "">
-                    <?= __('None'); ?>
-                </option>
-                <?php for ($j = 0, $nb = count($columnNames); $j < $nb; $j++): ?>
-                    <?php if (isset($dataLabel)
-                        && $dataLabel == htmlspecialchars($columnNames[$j])
-                    ): ?>
-                        <option value="<?= htmlspecialchars($columnNames[$j]); ?>"
-                                selected="selected">
-                            <?= htmlspecialchars($columnNames[$j]); ?>
-                        </option>
-                    <?php else: ?>
-                        <option value="<?= htmlspecialchars($columnNames[$j]); ?>" >
-                            <?= htmlspecialchars($columnNames[$j]); ?>
-                        </option>
-                    <?php endif; ?>
-                <?php endfor; ?>
-            </select>
-        </td>
-    </tr>
-    <!-- Inputbox for changing default maximum rows to plot -->
-    <tr>
-        <td>
-            <label for="maxRowPlotLimit">
-                <?= __("Maximum rows to plot"); ?>
-            </label>
-        </td>
-        <td>
-            <input type="number"
-                   name="maxPlotLimit"
-                   id="maxRowPlotLimit"
-                   required="required"
-                   value="<?= ((! empty($_POST['maxPlotLimit']))
-                       ? intval($_POST['maxPlotLimit'])
-                       : intval($GLOBALS['cfg']['maxRowPlotLimit'])); ?>" />
-        </td>
-    </tr>
-</table>
diff --git a/#pma/templates/table/search/replace_preview.phtml b/#pma/templates/table/search/replace_preview.phtml
deleted file mode 100644
index 785ee201..00000000
--- a/#pma/templates/table/search/replace_preview.phtml
+++ /dev/null
@@ -1,42 +0,0 @@
-<form method="post"
-      action="tbl_find_replace.php"
-      name="previewForm"
-      id="previewForm">
-    <?= PMA_URL_getHiddenInputs($db, $table); ?>
-    <input type="hidden" name="replace" value="true" />
-    <input type="hidden" name="columnIndex" value="<?= $columnIndex; ?>" />
-    <input type="hidden" name="findString" value="<?= htmlspecialchars($find); ?>" />
-    <input type="hidden" name="replaceWith" value="<?= htmlspecialchars($replaceWith); ?>" />
-    <input type="hidden" name="useRegex" value="<?= $useRegex; ?>" />
-
-    <fieldset id="fieldset_find_replace_preview">
-        <legend><?= __('Find and replace - preview'); ?></legend>
-        <table id="previewTable">
-            <thead>
-            <tr>
-                <th><?= __('Count'); ?></th>
-                <th><?= __('Original string'); ?></th>
-                <th><?= __('Replaced string'); ?></th>
-            </tr>
-            </thead>
-            <tbody>
-            <?php $odd = true; ?>
-            <?php if (is_array($result)): ?>
-                <?php foreach ($result as $row): ?>
-                    <?php $val = $row[0]; $replaced = $row[1]; $count = $row[2]; ?>
-                    <tr class="<?= ($odd ? 'odd' : 'even'); ?>">
-                        <td class="right"><?= htmlspecialchars($count); ?></td>
-                        <td><?= htmlspecialchars($val); ?></td>
-                        <td><?= htmlspecialchars($replaced); ?></td>
-                    </tr>
-                    <?php $odd = ! $odd; ?>
-                <?php endforeach; ?>
-            <?php endif; ?>
-            </tbody>
-        </table>
-    </fieldset>
-
-    <fieldset class="tblFooters">
-        <input type="submit" name="replace" value="<?= __('Replace'); ?>" />
-    </fieldset>
-</form>
\ No newline at end of file
diff --git a/#pma/templates/table/search/rows_normal.phtml b/#pma/templates/table/search/rows_normal.phtml
deleted file mode 100644
index e3e3d2b0..00000000
--- a/#pma/templates/table/search/rows_normal.phtml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-$odd_row = true;
-// for every column present in table
-for (
-    $column_index = 0, $nb = count($columnNames);
-    $column_index < $nb;
-    $column_index++
-): ?>
-    <tr class="noclick <?= $odd_row ? 'odd' : 'even'; ?>">
-        <?php $odd_row = !$odd_row; ?>
-        <!-- If 'Function' column is present -->
-        <?php if ($geomColumnFlag): ?>
-            <?= PMA\libraries\Template::get('table/search/geom_func')
-                ->render(array(
-                    'column_index' => $column_index,
-                    'columnTypes' => $columnTypes,
-                )); ?>
-        <?php endif; ?>
-        <!-- Displays column's name, type, collation and value -->
-        <th>
-            <?= htmlspecialchars($columnNames[$column_index]); ?>
-        </th>
-        <?php $properties = $self->getColumnProperties($column_index, $column_index); ?>
-        <td dir="ltr">
-            <?= htmlspecialchars($properties['type']); ?>
-        </td>
-        <td>
-            <?= $properties['collation']; ?>
-        </td>
-        <td>
-            <?= $properties['func']; ?>
-        </td>
-        <!-- here, the data-type attribute is needed for a date/time picker-->
-        <td data-type="<?= htmlspecialchars($properties['type']); ?>">
-            <?= $properties['value']; ?>
-        </td>
-    </tr>
-    <!-- Displays hidden fields -->
-    <tr>
-        <td>
-            <input type="hidden"
-                   name="criteriaColumnNames[<?= $column_index; ?>]"
-                   value="<?= htmlspecialchars($columnNames[$column_index]); ?>" />
-            <input type="hidden"
-                   name="criteriaColumnTypes[<?= $column_index; ?>]"
-                   value="<?= htmlspecialchars($columnTypes[$column_index]); ?>" />
-            <input type="hidden"
-                   name="criteriaColumnCollations[<?= $column_index; ?>]"
-                   value="<?= $columnCollations[$column_index]; ?>" />
-        </td>
-    </tr>
-<?php endfor; ?>
\ No newline at end of file
diff --git a/#pma/templates/table/search/rows_zoom.phtml b/#pma/templates/table/search/rows_zoom.phtml
deleted file mode 100644
index a3f393a6..00000000
--- a/#pma/templates/table/search/rows_zoom.phtml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-$odd_row = true;
-$type = $collation = $func = $value = array();
-/**
- * Get already set search criteria (if any)
- */
-
-// Displays column rows for search criteria input
-for ($i = 0; $i < 4; $i++): ?>
-    <?php
-    // After X-Axis and Y-Axis column rows, display additional criteria
-    // option
-    if ($i == 2): ?>
-        <tr>
-            <td>
-                <?= __("Additional search criteria"); ?>
-            </td>
-        </tr>
-    <?php endif; ?>
-    <tr class="noclick <?= ($odd_row ? 'odd' : 'even'); ?>">
-        <?php $odd_row = ! $odd_row; ?>
-        <!-- Select options for column names -->
-        <th>
-            <select name="criteriaColumnNames[]" id="tableid_<?= $i; ?>" >
-                <option value="pma_null">
-                    <?= __('None'); ?>
-                </option>
-                <?php for ($j = 0, $nb = count($columnNames); $j < $nb; $j++): ?>
-                    <?php if (isset($_POST['criteriaColumnNames'][$i])
-                        && $_POST['criteriaColumnNames'][$i] == htmlspecialchars($columnNames[$j])
-                    ): ?>
-                        <option value="<?= htmlspecialchars($columnNames[$j]); ?>" selected="selected">
-                            <?= htmlspecialchars($columnNames[$j]); ?>
-                        </option>
-                    <?php else: ?>
-                        <option value="<?= htmlspecialchars($columnNames[$j]); ?>">
-                            <?= htmlspecialchars($columnNames[$j]); ?>
-                        </option>
-                    <?php endif; ?>
-                <?php endfor; ?>
-            </select>
-        </th>
-        <?php
-        if (isset($_POST['criteriaColumnNames'])
-            && $_POST['criteriaColumnNames'][$i] != 'pma_null'
-        ) {
-            $key = array_search(
-                $_POST['criteriaColumnNames'][$i],
-                $columnNames
-            );
-            $properties = $self->getColumnProperties($i, $key);
-            $type[$i] = $properties['type'];
-            $collation[$i] = $properties['collation'];
-            $func[$i] = $properties['func'];
-            $value[$i] = $properties['value'];
-        } ?>
-        <!-- Column type -->
-        <td dir="ltr">
-            <?= (isset($type[$i]) ? htmlspecialchars($type[$i]) : ''); ?>
-        </td>
-        <!-- Column Collation -->
-        <td>
-            <?= (isset($collation[$i]) ? $collation[$i] : ''); ?>
-        </td>
-        <!-- Select options for column operators -->
-        <td>
-            <?= (isset($func[$i]) ? $func[$i] : ''); ?>
-        </td>
-        <!-- Inputbox for search criteria value -->
-        <td>
-            <?= (isset($value[$i]) ? $value[$i] : ''); ?>
-        </td>
-    </tr>
-    <!-- Displays hidden fields -->
-    <tr>
-        <td>
-            <input type="hidden"
-                   name="criteriaColumnTypes[<?= $i; ?>]"
-                   id="types_<?= $i; ?>"
-                <?php if (isset($_POST['criteriaColumnTypes'][$i])): ?>
-                    value="<?= htmlspecialchars($_POST['criteriaColumnTypes'][$i]); ?>"
-                <?php endif; ?> />
-            <input type="hidden"
-                   name="criteriaColumnCollations[<?= $i; ?>]"
-                   id="collations_<?= $i; ?>" />
-        </td>
-    </tr>
-<?php endfor; ?>
diff --git a/#pma/templates/table/search/search_and_replace.phtml b/#pma/templates/table/search/search_and_replace.phtml
deleted file mode 100644
index fe766fe3..00000000
--- a/#pma/templates/table/search/search_and_replace.phtml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?= __('Find:'); ?>
-<input type="text" value="" name="find" required />
-<?= __('Replace with:'); ?>
-<input type="text" value="" name="replaceWith" />
-
-<?= __('Column:'); ?>
-<select name="columnIndex">
-    <?php for ($i = 0, $nb = count($columnNames); $i < $nb; $i++): ?>
-        <?php $type = preg_replace('@\(.*@s', '', $columnTypes[$i]); ?>
-        <?php if ($GLOBALS['PMA_Types']->getTypeClass($type) == 'CHAR'): ?>
-            <?php $column = $columnNames[$i]; ?>
-            <option value="<?= $i; ?>">
-                <?= htmlspecialchars($column); ?>
-            </option>
-        <?php endif; ?>
-    <?php endfor; ?>
-</select>
-
-<br>
-<?= PMA\libraries\Util::getCheckbox(
-    'useRegex',
-    __('Use regular expression'),
-    false,
-    false,
-    'useRegex'
-); ?>
\ No newline at end of file
diff --git a/#pma/templates/table/search/selection_form.phtml b/#pma/templates/table/search/selection_form.phtml
deleted file mode 100644
index bb53545a..00000000
--- a/#pma/templates/table/search/selection_form.phtml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?= PMA\libraries\Template::get('table/search/form_tag')
-    ->render(array(
-        'searchType' => $searchType,
-        'db' => $db,
-        'table' => $table,
-        'goto' => $goto
-    )) ?>
-<?php if ($searchType == 'zoom'): ?>
-    <fieldset id="fieldset_zoom_search">
-        <fieldset id="inputSection">
-            <legend>
-                <?= __('Do a "query by example" (wildcard: "%") for two different columns'); ?>
-            </legend>
-            <?= PMA\libraries\Template::get('table/search/fields_table')
-                ->render(array(
-                    'self' => $self,
-                    'searchType' => $searchType,
-                    'geomColumnFlag' => $geomColumnFlag,
-                    'columnNames' => $columnNames,
-                    'columnTypes' => $columnTypes,
-                    'columnCollations' => $columnCollations
-                ))
-            ?>
-            <?= PMA\libraries\Template::get('table/search/options_zoom')
-                ->render(array(
-                    'dataLabel' => $dataLabel,
-                    'columnNames' => $columnNames
-            )) ?>
-        </fieldset>
-    </fieldset>
-<?php elseif ($searchType == 'normal'): ?>
-    <fieldset id="fieldset_table_search">
-        <fieldset id="fieldset_table_qbe">
-            <legend>
-                <?= __('Do a "query by example" (wildcard: "%")'); ?>
-            </legend>
-            <?= PMA\libraries\Template::get('table/search/fields_table')
-                ->render(array(
-                    'self' => $self,
-                    'searchType' => $searchType,
-                    'geomColumnFlag' => $geomColumnFlag,
-                    'columnNames' => $columnNames,
-                    'columnTypes' => $columnTypes,
-                    'columnCollations' => $columnCollations
-                )); ?>
-            <div id="gis_editor">
-            </div>
-            <div id="popup_background">
-            </div>
-        </fieldset>
-        <?= PMA\libraries\Template::get('table/search/options')
-            ->render(array(
-                'columnNames' => $columnNames
-            )); ?>
-    </fieldset>
-<?php elseif ($searchType == 'replace'): ?>
-    <fieldset id="fieldset_find_replace">
-        <fieldset id="fieldset_find">
-            <legend>
-                <?= __('Find and replace'); ?>
-            </legend>
-            <?= PMA\libraries\Template::get('table/search/search_and_replace')
-                ->render(array(
-                    'columnNames' => $columnNames,
-                    'columnTypes' => $columnTypes
-                )); ?>
-        </fieldset>
-    </fieldset>
-<?php endif; ?>
-
-<!--Displays selection form's footer elements-->
-<fieldset class="tblFooters">
-    <input type="submit"
-           name="<?= ($searchType == 'zoom' ? 'zoom_submit' : 'submit'); ?>"
-           <?php if ($searchType == 'zoom'): ?>
-               id="inputFormSubmitId"
-           <?php endif; ?>
-           value="<?= __('Go'); ?>" />
-</fieldset>
-</form>
-<div id="sqlqueryresultsouter"></div>
\ No newline at end of file
diff --git a/#pma/templates/table/search/table_header.phtml b/#pma/templates/table/search/table_header.phtml
deleted file mode 100644
index 5841167f..00000000
--- a/#pma/templates/table/search/table_header.phtml
+++ /dev/null
@@ -1,12 +0,0 @@
-<thead>
-    <tr>
-        <?php if ($geomColumnFlag): ?>
-            <th><?= __('Function'); ?></th>
-        <?php endif; ?>
-        <th><?= __('Column'); ?></th>
-        <th><?= __('Type'); ?></th>
-        <th><?= __('Collation'); ?></th>
-        <th><?= __('Operator'); ?></th>
-        <th><?= __('Value'); ?></th>
-    </tr>
-</thead>
\ No newline at end of file
diff --git a/#pma/templates/table/search/zoom_result_form.phtml b/#pma/templates/table/search/zoom_result_form.phtml
deleted file mode 100644
index 83dd332a..00000000
--- a/#pma/templates/table/search/zoom_result_form.phtml
+++ /dev/null
@@ -1,99 +0,0 @@
-<form method="post" action="tbl_zoom_select.php" name="displayResultForm" id="zoom_display_form" class="ajax">
-    <?= PMA_URL_getHiddenInputs($_db, $_table); ?>
-    <input type="hidden" name="goto" value="<?= $goto; ?>" />
-    <input type="hidden" name="back" value="tbl_zoom_select.php" />
-
-    <fieldset id="displaySection">
-        <legend><?= __('Browse/Edit the points');?></legend>
-
-    <!-- JSON encode the data(query result) -->
-        <center>
-            <?php if (isset($_POST['zoom_submit']) && ! empty($data)): ?>
-                <div id="resizer">
-                    <center>
-                        <a href="#" onclick="displayHelp();">
-                            <?= __('How to use'); ?>
-                        </a>
-                    </center>
-                    <div id="querydata" style="display:none">
-                        <?= htmlspecialchars(json_encode($data)); ?>
-                    </div>
-                    <div id="querychart"></div>
-                    <button class="button-reset">
-                        <?= __('Reset zoom'); ?></button>
-                </div>
-            <?php endif; ?>
-        </center>
-
-    <!-- Displays rows in point edit form -->
-        <div id="dataDisplay" style="display:none">
-            <table>
-                <thead>
-                <tr>
-                    <th><?= __('Column'); ?> </th>
-                    <th><?= __('Null'); ?> </th>
-                    <th><?= __('Value'); ?> </th>
-                </tr>
-                </thead>
-                <tbody>
-                <?php $odd_row = true; ?>
-                <?php for (
-                    $column_index = 0, $nb = count($_columnNames);
-                    $column_index < $nb;
-                    $column_index++
-                ): ?>
-                    <?php
-                    $foreignData = PMA_getForeignData(
-                        $_foreigners,
-                        $_columnNames[$column_index],
-                        false,
-                        '',
-                        ''
-                    ); ?>
-                <?php endfor; ?>
-                <?php for (
-                    $column_index = 0, $nb = count($_columnNames);
-                    $column_index < $nb;
-                    $column_index++
-                ): ?>
-                    <?php
-                        $fieldpopup = $_columnNames[$column_index];
-                        $foreignData = PMA_getForeignData($_foreigners, $fieldpopup, false, '', '' );?>
-                    <tr class="noclick <?= ($odd_row ? 'odd' : 'even'); ?>">
-                        <?php $odd_row = ! $odd_row; ?>
-                        <!-- Display column Names -->
-                        <th><?= htmlspecialchars($_columnNames[$column_index]); ?></th>
-                        <!-- Null checkbox if column can be null -->
-                        <th>
-                            <?php if ($_columnNullFlags[$column_index] == 'YES'): ?>
-                                <input type="checkbox" class="checkbox_null"
-                                       name="criteriaColumnNullFlags[<?= $column_index; ?>]"
-                                       id="edit_fields_null_id_'<?= $column_index;?>" />
-                            <?php endif; ?>
-                        </th>
-<!-- Column's Input box-->
-                        <th>
-                            <?= PMA\libraries\Template::get('table/search/input_box')->render(array(
-                                    'str' => '',
-                                    'column_type' => $_columnTypes[$column_index],
-                                    'column_id' => ($_columnTypes[$column_index]) ? 'edit_fieldID_' : 'fieldID_',
-                                    'in_zoom_search_edit' => true,
-                                    '_foreigners' => $_foreigners,
-                                    'column_name' => $fieldpopup,
-                                    'foreignData' => $foreignData,
-                                    'table' => $_table,
-                                    'column_index' => $column_index,
-                                    'foreignMaxLimit' => $GLOBALS['cfg']['ForeignKeyMaxLimit'],
-                                    'criteriaValues' => '',
-                                    'db' => $_db,
-                                    'titles' => $titles,
-                                    'in_fbs' => false
-                                ));?>
-                        </th>
-                    </tr>
-                <?php endfor; ?>
-                </tbody>
-            </table>
-        </div>
-        <input type="hidden" id="queryID" name="sql_query" />
-</form>
diff --git a/#pma/templates/table/secondary_tabs.phtml b/#pma/templates/table/secondary_tabs.phtml
deleted file mode 100644
index 35a418b2..00000000
--- a/#pma/templates/table/secondary_tabs.phtml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php $cfgRelation = PMA_getRelationsParam(); ?>
-<?php if ($cfgRelation['relwork'] ||
-    PMA\libraries\Util::isForeignKeySupported($engine)): ?>
-    <ul id="topmenu2">
-        <?= PMA\libraries\Util::getHtmlTab(array(
-            'icon' => 'b_props',
-            'link' => 'tbl_structure.php',
-            'text' => __('Table structure'),
-            'id' => 'table_strucuture_id'
-        ), $url_params); ?>
-        <?= PMA\libraries\Util::getHtmlTab(array(
-            'icon' => 'b_relations',
-            'link' => 'tbl_relation.php',
-            'text' => __('Relation view'),
-            'id' => 'table_relation_id'
-        ), $url_params); ?>
-    </ul>
-    <div class="clearfloat"></div>
-<?php endif; ?>
\ No newline at end of file
diff --git a/#pma/templates/table/structure/action_row_in_structure_table.phtml b/#pma/templates/table/structure/action_row_in_structure_table.phtml
deleted file mode 100644
index d5dc69bf..00000000
--- a/#pma/templates/table/structure/action_row_in_structure_table.phtml
+++ /dev/null
@@ -1,28 +0,0 @@
-<li class="<?= $class; ?>">
-<?php if ($type == 'text'
-        || $type == 'blob'
-        || 'ARCHIVE' == $tbl_storage_engine
-        || $hasField
-    ): ?>
-    <?= $titles['No' . $action]; ?>
-<?php else: ?>
-    <a rel="samepage" class="ajax add_key print_ignore
-        <?php if ($hasLinkClass): ?>
-             add_primary_key_anchor"
-        <?php elseif ($action=='Index'): ?>
-             add_index_anchor"
-        <?php elseif ($action=='Unique'): ?>
-             add_unique_anchor"
-        <?php elseif ($action=='Spatial'): ?>
-             add_spatial_anchor"
-        <?php else: ?>
-            "
-        <?php endif; ?> href="tbl_structure.php<?= $url_query; ?>&amp;add_key=1&amp;sql_query=<?= urlencode(
-                'ALTER TABLE ' . PMA\libraries\Util::backquote($GLOBALS['table'])
-                . ($isPrimary ? ($primary ? ' DROP PRIMARY KEY,' : '') : '')
-                . ' ' . $syntax . '('
-                . PMA\libraries\Util::backquote($row['Field']) . ');'); ?>&amp;message_to_show=<?= urlencode(sprintf($message, htmlspecialchars($row['Field']))); ?>" >
-            <?= $titles[$action]; ?>
-    </a>
-<?php endif; ?>
-</li>
\ No newline at end of file
diff --git a/#pma/templates/table/structure/actions_in_table_structure.phtml b/#pma/templates/table/structure/actions_in_table_structure.phtml
deleted file mode 100644
index e6ea36e8..00000000
--- a/#pma/templates/table/structure/actions_in_table_structure.phtml
+++ /dev/null
@@ -1,141 +0,0 @@
-<td class="print_ignore"><ul class="table-structure-actions resizable-menu">
-    <!-- Add primary -->
-    <?php use PMA\libraries\Util; ?>
-
-    <?= PMA\libraries\Template::get('table/structure/action_row_in_structure_table')->render(
-            array(
-                'type' => $type,
-                'tbl_storage_engine' => $tbl_storage_engine,
-                'class' => 'primary nowrap',
-                'hasField' => ($primary && $primary->hasColumn($field_name)),
-                'hasLinkClass' => true,
-                'url_query' => $url_query,
-                'primary' => $primary,
-                'syntax' => 'ADD PRIMARY KEY',
-                'message' => __('A primary key has been added on %s.'),
-                'action' => 'Primary',
-                'titles' => $titles,
-                'row' => $row,
-                'isPrimary' => true
-            )
-        )
-    ?>
-    <!-- Add unique -->
-    <?= PMA\libraries\Template::get('table/structure/action_row_in_structure_table')->render(
-            array(
-                'type' => $type,
-                'tbl_storage_engine' => $tbl_storage_engine,
-                'class' => 'add_unique unique nowrap',
-                'hasField' => in_array($field_name, $columns_with_unique_index),
-                'hasLinkClass' => false,
-                'url_query' => $url_query,
-                'primary' => $primary,
-                'syntax' => 'ADD UNIQUE',
-                'message' => __('An index has been added on %s.'),
-                'action' => 'Unique',
-                'titles' => $titles,
-                'row' => $row,
-                'isPrimary' => false
-            )
-        )
-    ?>
-    <!-- Add index -->
-    <?= PMA\libraries\Template::get('table/structure/action_row_in_structure_table')->render(
-            array(
-                'type' => $type,
-                'tbl_storage_engine' => $tbl_storage_engine,
-                'class' => 'add_index nowrap',
-                'hasField' => false,
-                'hasLinkClass' => false,
-                'url_query' => $url_query,
-                'primary' => $primary,
-                'syntax' => 'ADD INDEX',
-                'message' => __('An index has been added on %s.'),
-                'action' => 'Index',
-                'titles' => $titles,
-                'row' => $row,
-                'isPrimary' => false
-            )
-        )
-    ?>
-
-    <!-- Add spatial -->
-    <?php $spatial_types = array(
-            'geometry', 'point', 'linestring', 'polygon', 'multipoint',
-            'multilinestring', 'multipolygon', 'geomtrycollection'
-        );
-    ?>
-    <?= PMA\libraries\Template::get('table/structure/action_row_in_structure_table')->render(
-            array(
-                'type' => $type,
-                'tbl_storage_engine' => $tbl_storage_engine,
-                'class' => 'spatial nowrap',
-                'hasField' => ! (in_array($type, $spatial_types) && ('MYISAM' == $tbl_storage_engine || PMA_MYSQL_INT_VERSION >= 50705)),
-                'hasLinkClass' => false,
-                'url_query' => $url_query,
-                'primary' => $primary,
-                'syntax' => 'ADD SPATIAL',
-                'message' => __('An index has been added on %s.'),
-                'action' => 'Spatial',
-                'titles' => $titles,
-                'row' => $row,
-                'isPrimary' => false
-            )
-        )
-    ?>
-    <!-- FULLTEXT is possible on TEXT, CHAR and VARCHAR -->
-    <li class="fulltext nowrap">
-    <?php if (! empty($tbl_storage_engine)
-                && ($tbl_storage_engine == 'MYISAM'
-                || $tbl_storage_engine == 'ARIA'
-                || $tbl_storage_engine == 'MARIA'
-                || ($tbl_storage_engine == 'INNODB' && PMA_MYSQL_INT_VERSION >= 50604))
-                && (mb_strpos($type, 'text') !== false
-                || mb_strpos($type, 'char') !== false)
-            ): ?>
-        <a rel="samepage" class="ajax add_key add_fulltext_anchor" href="tbl_structure.php<?= $url_query; ?>&amp;add_key=1&amp;sql_query=<?= urlencode(
-            'ALTER TABLE ' . Util::backquote($GLOBALS['table'])
-            . ' ADD FULLTEXT(' . Util::backquote($row['Field'])
-            . ');'); ?>&amp;message_to_show=<?= urlencode(sprintf(
-                __('An index has been added on %s.'),
-                htmlspecialchars($row['Field']))); ?>">
-            <?= $titles['IdxFulltext']; ?>
-        </a>
-    <?php else: ?>
-        <?= $titles['NoIdxFulltext']; ?>
-    <?php endif; ?>
-    </li>
-    <!-- Distinct value action -->
-    <li class="browse nowrap">
-        <a href="sql.php<?= $url_query; ?>&amp;sql_query=<?= urlencode(
-                'SELECT COUNT(*) AS ' . PMA\libraries\Util::backquote(__('Rows'))
-                . ', ' . PMA\libraries\Util::backquote($row['Field'])
-                . ' FROM ' . PMA\libraries\Util::backquote($GLOBALS['table'])
-                . ' GROUP BY ' . PMA\libraries\Util::backquote($row['Field'])
-                . ' ORDER BY ' . PMA\libraries\Util::backquote($row['Field'])
-            ); ?>&amp;is_browse_distinct=1">
-            <?= $titles['DistinctValues']; ?>
-        </a>
-    </li>
-    <?php if ($GLOBALS['cfgRelation']['centralcolumnswork']): ?>
-        <li class="browse nowrap">
-        <?php if ($isInCentralColumns): ?>
-            <a href="#" onclick="$('input:checkbox').prop('checked', false);
-                $('#checkbox_row_<?= $rownum; ?>').prop('checked', true);
-                $('button[value=remove_from_central_columns]').click();">
-            <?= PMA\libraries\Util::getIcon(
-                'centralColumns_delete.png',
-                __('Remove from central columns')
-            ); ?></a>
-        <?php else: ?>
-            <a href="#" onclick="$('input:checkbox').prop('checked', false);
-                $('#checkbox_row_<?= $rownum ?>').prop('checked', true);
-                $('button[value=add_to_central_columns]').click();">
-            <?= PMA\libraries\Util::getIcon(
-                'centralColumns_add.png',
-                __('Add to central columns')
-            ); ?></a>
-        <?php endif; ?>
-        </li>
-    <?php endif; ?>
-</ul></td>
\ No newline at end of file
diff --git a/#pma/templates/table/structure/add_column.phtml b/#pma/templates/table/structure/add_column.phtml
deleted file mode 100644
index 18348868..00000000
--- a/#pma/templates/table/structure/add_column.phtml
+++ /dev/null
@@ -1,26 +0,0 @@
-<form method="post" action="tbl_addfield.php" id="addColumns" name="addColumns" onsubmit="return checkFormElementInRange(this, 'num_fields', '<?= str_replace('\'', '\\\'', __('You have to add at least one column.')); ?>', 1)">
-    <?= PMA_URL_getHiddenInputs($GLOBALS['db'], $GLOBALS['table']); ?>
-    <?php if (PMA\libraries\Util::showIcons('ActionLinksMode')): ?>
-        <?= PMA\libraries\Util::getImage('b_insrow.png', __('Add column')); ?>&nbsp;
-    <?php endif; ?>
-    <?php $num_fields = '<input type="number" name="num_fields" value="1" onfocus="this.select()" min="1" required />'; ?>
-    <?= sprintf(__('Add %s column(s)'), $num_fields); ?>
-    <input type="hidden" name="field_where" value="after"/>&nbsp;
-    <!-- I tried displaying the drop-down inside the label but with Firefox the drop-down was blinking -->
-    <select name="after_field" onchange="checkFirst()">
-        <option value="first" data-pos = "first">
-            <?= __('at beginning of table'); ?>
-        </option>
-        <?php $cols_count = count($columns_list);
-         foreach ($columns_list as $one_column_name): ?>
-            <?php if (--$cols_count == 0): ?>
-                <option value="<?= htmlspecialchars($one_column_name); ?>" selected="selected">
-            <?php else: ?>
-                <option value="<?= htmlspecialchars($one_column_name); ?>">
-            <?php endif; ?>
-            <?= sprintf(__('after %s'), htmlspecialchars($one_column_name)); ?>
-            </option>
-        <?php endforeach; ?>
-    </select>
-    <input type="submit" value="<?= __('Go'); ?>" />
-</form>
\ No newline at end of file
diff --git a/#pma/templates/table/structure/check_all_table_column.phtml b/#pma/templates/table/structure/check_all_table_column.phtml
deleted file mode 100644
index 701ed206..00000000
--- a/#pma/templates/table/structure/check_all_table_column.phtml
+++ /dev/null
@@ -1,56 +0,0 @@
-<div class="print_ignore" >
-    <?= PMA\libraries\Util::getWithSelected($pmaThemeImage, $text_dir, "fieldsForm") ?>
-    <?= PMA\libraries\Util::getButtonOrImage(
-    'submit_mult', 'mult_submit', 'submit_mult_browse',
-    __('Browse'), 'b_browse.png', 'browse'
-    ) ?>
-
-    <?php if (! $tbl_is_view && ! $db_is_system_schema): ?>
-        <?= PMA\libraries\Util::getButtonOrImage(
-        'submit_mult', 'mult_submit change_columns_anchor ajax',
-        'submit_mult_change', __('Change'), 'b_edit.png', 'change'
-        ) ?>
-        <?= PMA\libraries\Util::getButtonOrImage(
-        'submit_mult', 'mult_submit', 'submit_mult_drop',
-        __('Drop'), 'b_drop.png', 'drop'
-        ) ?>
-
-        <?php if ('ARCHIVE' != $tbl_storage_engine): ?>
-            <?= PMA\libraries\Util::getButtonOrImage(
-                'submit_mult', 'mult_submit', 'submit_mult_primary',
-                __('Primary'), 'b_primary.png', 'primary'
-            ) ?>
-            <?= PMA\libraries\Util::getButtonOrImage(
-                'submit_mult', 'mult_submit', 'submit_mult_unique',
-                __('Unique'), 'b_unique.png', 'unique'
-            ) ?>
-            <?= PMA\libraries\Util::getButtonOrImage(
-                'submit_mult', 'mult_submit', 'submit_mult_index',
-                __('Index'), 'b_index.png', 'index'
-            ) ?>
-
-            <?php if (! empty($tbl_storage_engine)
-                        && ($tbl_storage_engine == 'MYISAM'
-                        || $tbl_storage_engine == 'ARIA'
-                        || $tbl_storage_engine == 'MARIA')): ?>
-                <?= PMA\libraries\Util::getButtonOrImage(
-                    'submit_mult', 'mult_submit', 'submit_mult_fulltext',
-                    __('Fulltext'), 'b_ftext.png', 'ftext'
-                ) ?>
-            <?php endif; ?>
-
-            <?php if ($GLOBALS['cfgRelation']['centralcolumnswork']): ?>
-                <?= PMA\libraries\Util::getButtonOrImage(
-                    'submit_mult', 'mult_submit', 'submit_mult_central_columns_add',
-                    __('Add to central columns'), 'centralColumns_add.png',
-                    'add_to_central_columns'
-                ) ?>
-                <?= PMA\libraries\Util::getButtonOrImage(
-                    'submit_mult', 'mult_submit', 'submit_mult_central_columns_remove',
-                    __('Remove from central columns'), 'centralColumns_delete.png',
-                    'remove_from_central_columns'
-                ) ?>
-            <?php endif; ?>
-        <?php endif; ?>
-    <?php endif; ?>
-</div>
\ No newline at end of file
diff --git a/#pma/templates/table/structure/display_partitions.phtml b/#pma/templates/table/structure/display_partitions.phtml
deleted file mode 100644
index e22edfca..00000000
--- a/#pma/templates/table/structure/display_partitions.phtml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?php use PMA\libraries\Message;
-use PMA\libraries\Util; ?>
-<div id="partitions">
-    <fieldset>
-        <legend><?= __('Partitions')
-            , Util::showMySQLDocu('partitioning'); ?>
-        </legend>
-        <?php if (empty($partitions)): ?>
-            <?= Message::notice(__('No partitioning defined!'))->getDisplay(); ?>
-        <?php else: ?>
-            <p>
-                <?= __('Partitioned by:');?>
-                <code><?= htmlspecialchars($partitionMethod) , '(' , htmlspecialchars($partitionExpression) , ' )'; ?></code>
-            </p>
-            <?php if ($hasSubPartitions): ?>
-                <p>
-                    <?= __('Sub partitioned by:'); ?>
-                    <code><?= htmlspecialchars($subPartitionMethod) , '(' , htmlspecialchars($subPartitionExpression) , ' )'; ?></code>
-                <p>
-            <?php endif; ?>
-            <table>
-                <thead>
-                    <tr>
-                        <th colspan="2">#</th>
-                        <th><?= __('Partition'); ?></th>
-                        <?php if ($hasDescription): ?>
-                            <th><?= __('Expression'); ?></th>
-                        <?php endif; ?>
-                        <th><?= __('Rows'); ?></th>
-                        <th><?= __('Data length'); ?></th>
-                        <th><?= __('Index length'); ?></th>
-                        <th><?= __('Comment'); ?></th>
-                        <th colspan="<?= $rangeOrList ? '7' : '6'; ?>">
-                            <?= __('Action'); ?>
-                        </th>
-                    </tr>
-                </thead>
-                <tbody>
-                <?php $odd = true; ?>
-                <?php foreach ($partitions as $partition): ?>
-                    <tr class="noclick <?= ($odd ? 'odd' : 'even') , ($hasSubPartitions ? ' marked' : '') ?>">
-                        <?php if ($hasSubPartitions): ?>
-                            <td><?= $partition->getOrdinal(); ?></td>
-                            <td></td>
-                        <?php else: ?>
-                            <td colspan="2"><?= $partition->getOrdinal(); ?></td>
-                        <?php endif; ?>
-                        <th><?= htmlspecialchars($partition->getName()); ?></th>
-                        <?php if ($hasDescription): ?>
-                            <td>
-                                <code>
-                                    <?= htmlspecialchars($partition->getExpression())
-                                        , ($partition->getMethod() == 'LIST' ? ' IN (' : ' < ')
-                                        , htmlspecialchars($partition->getDescription())
-                                        , ($partition->getMethod() == 'LIST' ? ')' : '');
-                                    ?>
-                                </code>
-                            </td>
-                        <?php endif; ?>
-                        <td class="value"><?= $partition->getRows(); ?></td>
-                        <td class="value"><?php
-                            list($value, $unit) = Util::formatByteDown(
-                                $partition->getDataLength(), 3, 1
-                            );
-                            ?>
-                            <span><?= $value; ?></span>
-                            <span class="unit"><?= $unit; ?></span>
-                        </td>
-                        <td class="value"><?php
-                            list($value, $unit) = Util::formatByteDown(
-                                $partition->getIndexLength(), 3, 1
-                            );
-                            ?>
-                            <span><?= $value; ?></span>
-                            <span class="unit"><?= $unit; ?></span>
-                        </td>
-                        <td><?= htmlspecialchars($partition->getComment()); ?></td>
-                        <?php foreach ($actionIcons as $action => $icon): ?>
-                            <td>
-                                <a  href="tbl_structure.php<?= $url_query; ?>&amp;partition_maintenance=1&amp;sql_query=<?= urlencode(
-                                        "ALTER TABLE " . Util::backquote($table) . $action . " PARTITION " . $partition->getName()
-                                    ) ?>"
-                                    id="partition_action_<?= $action; ?>"
-                                    name="partition_action_<?= $action; ?>"
-                                    class="ajax"
-                                >
-                                    <?= $icon; ?>
-                                </a>
-                            </td>
-                        <?php endforeach; ?>
-
-                        <?php if ($hasSubPartitions): ?>
-                            <?php foreach ($partition->getSubPartitions() as $subParition): ?>
-                                <tr class="noclick <?= $odd ? 'odd' : 'even' ?>">
-                                    <td></td>
-                                    <td><?= $subParition->getOrdinal(); ?></td>
-                                    <td><?= htmlspecialchars($subParition->getName()); ?></td>
-                                    <?php if ($hasDescription): ?>
-                                        <td></td>
-                                    <?php endif; ?>
-                                    <td class="value"><?= $subParition->getRows(); ?></td>
-                                    <td class="value"><?php
-                                        list($value, $unit) = Util::formatByteDown(
-                                            $subParition->getDataLength(), 3, 1
-                                        );
-                                        ?>
-                                        <span><?= $value; ?></span>
-                                        <span class="unit"><?= $unit; ?></span>
-                                    </td>
-                                    <td class="value"><?php
-                                        list($value, $unit) = Util::formatByteDown(
-                                            $subParition->getIndexLength(), 3, 1
-                                        );
-                                        ?>
-                                        <span><?= $value; ?></span>
-                                        <span class="unit"><?= $unit; ?></span>
-                                    </td>
-                                    <td><?= htmlspecialchars($subParition->getComment()); ?></td>
-                                    <td colspan="<?= $rangeOrList ? '7' : '6'; ?>"></td>
-                                </tr>
-                            <?php endforeach; ?>
-                        <?php endif; ?>
-                    </tr>
-                    <?php $odd = ! $odd; ?>
-                <?php endforeach; ?>
-                </tbody>
-            </table>
-        <?php endif; ?>
-    </fieldset>
-    <fieldset class="tblFooters print_ignore">
-        <form action="tbl_structure.php" method="post">
-            <?= PMA_URL_getHiddenInputs($db, $table); ?>
-            <input type="hidden" name="edit_partitioning" value="true" />
-            <?php if (empty($partitions)): ?>
-                <input type="submit" name="edit_partitioning" value="<?= __('Partition table'); ?>" />
-            <?php else: ?>
-                <?= Util::linkOrButton($removeUrl, __('Remove partitioning'), ['class' => 'button ajax', 'id' => 'remove_partitioning'])?>
-                <input type="submit" name="edit_partitioning" value="<?= __('Edit partitioning'); ?>" />
-            <?php endif; ?>
-        </form>
-    </fieldset>
-</div>
diff --git a/#pma/templates/table/structure/display_structure.phtml b/#pma/templates/table/structure/display_structure.phtml
deleted file mode 100644
index 26d612b4..00000000
--- a/#pma/templates/table/structure/display_structure.phtml
+++ /dev/null
@@ -1,227 +0,0 @@
-<?php
-use PMA\libraries\Partition;
-use PMA\libraries\Template;
-use PMA\libraries\Util;
-
-$rownum = 0; $odd_row = true; ?>
-<form method="post" action="tbl_structure.php" name="fieldsForm" id="fieldsForm" class="ajax<?= $HideStructureActions; ?>">
-    <?= PMA_URL_getHiddenInputs($db, $table); ?>
-    <input type="hidden" name="table_type" value=
-    <?php if ($db_is_system_schema): ?>
-        "information_schema" />
-    <?php elseif ($tbl_is_view): ?>
-        "view" />
-    <?php else: ?>
-        "table" />
-    <?php endif; ?>
-    <table id="tablestructure" class="data topmargin">
-        <!-- table header -->
-        <?= PMA\libraries\Template::get('table/structure/table_structure_header')->render(
-            array(
-                'db_is_system_schema' => $db_is_system_schema,
-                'tbl_is_view' => $tbl_is_view
-            )
-        ); ?>
-        <tbody>
-        <!-- table body -->
-        <?php foreach($fields as $row): ?>
-            <?php
-                $rownum++;
-                $columns_list[] = $row['Field'];
-                $field_charset = $row['Collation'];
-
-                $extracted_columnspec = Util::extractColumnSpec($row['Type']);
-                $attribute = $extracted_columnspec['attribute'];
-                if (strpos($row['Extra'], 'on update CURRENT_TIMESTAMP') !== false) {
-                    $attribute = 'on update CURRENT_TIMESTAMP';
-                }
-
-                if (! isset($row['Default'])) {
-                    if ($row['Null'] == 'YES') {
-                        $row['Default'] = '<i>NULL</i>';
-                    }
-                } else {
-                    $row['Default'] = htmlspecialchars($row['Default']);
-                }
-
-                $field_name    = htmlspecialchars($row['Field']);
-                $displayed_field_name = $field_name;
-                $comments = '';  //For column comments
-                // underline commented fields and display a hover-title (CSS only)
-
-                if (isset($comments_map[$row['Field']])) {
-                    $displayed_field_name = '<span class="commented_column" title="'
-                        . htmlspecialchars($comments_map[$row['Field']]) . '">'
-                        . $field_name . '</span>';
-                    $comments = htmlspecialchars($comments_map[$row['Field']]);
-                }
-
-                if ($primary && $primary->hasColumn($field_name)) {
-                    $displayed_field_name .= Util::getImage(
-                        'b_primary.png', __('Primary')
-                    );
-                }
-                if (in_array($field_name, $columns_with_index)) {
-                    $displayed_field_name .= Util::getImage(
-                        'bd_primary.png', __('Index')
-                    );
-                }
-            ?>
-        <tr class="<?= ($odd_row ? 'odd': 'even'); ?>">
-            <?php $odd_row = !$odd_row; ?>
-            <?= PMA\libraries\Template::get('table/structure/table_structure_row')->render(
-                array(
-                    'row' => $row,
-                    'rownum' => $rownum,
-                    'displayed_field_name' => $displayed_field_name,
-                    'type_nowrap' => Util::getClassForType($extracted_columnspec['type']),
-                    'extracted_columnspec' => $extracted_columnspec,
-                    'attribute' => $attribute,
-                    'tbl_is_view' => $tbl_is_view,
-                    'db_is_system_schema' => $db_is_system_schema,
-                    'url_query' => $url_query,
-                    'field_encoded' => urlencode($row['Field']),
-                    'titles' => $titles,
-                    'table' => $table,
-                    'tbl_storage_engine' => $tbl_storage_engine,
-                    'field_charset' => $field_charset,
-                    'comments' => $comments
-                )
-            ); ?>
-            <?php if (! $tbl_is_view && ! $db_is_system_schema): ?>
-                <?= Template::get('table/structure/actions_in_table_structure')->render(
-                    array(
-                        'extracted_columnspec' => $extracted_columnspec,
-                        'type' => (!empty($extracted_columnspec['print_type'])) ? $extracted_columnspec['print_type'] : ' ',
-                        'tbl_storage_engine' => $tbl_storage_engine,
-                        'primary' => $primary,
-                        'field_name' => $field_name,
-                        'url_query' => $url_query,
-                        'titles' => $titles,
-                        'row' => $row,
-                        'rownum' => $rownum,
-                        'columns_with_unique_index' => $columns_with_unique_index,
-                        'isInCentralColumns' => in_array($row['Field'], $central_list) ? true : false
-                    )
-                ); ?>
-            <?php endif; ?>
-        </tr>
-        <?php endforeach; ?>
-        </tbody>
-    </table>
-    <?= Template::get('table/structure/check_all_table_column')->render(
-        array(
-            'pmaThemeImage' => $GLOBALS['pmaThemeImage'],
-            'text_dir' => $GLOBALS['text_dir'],
-            'tbl_is_view' => $tbl_is_view,
-            'db_is_system_schema' => $db_is_system_schema,
-            'tbl_storage_engine' => $tbl_storage_engine
-        )
-    ); ?>
-</form>
-<hr class="print_ignore"/>
-<?= Template::get('table/structure/move_columns_dialog')->render(); ?>
-<!--Work on the table-->
-<div id="structure-action-links">
-    <?php if ($tbl_is_view && ! $db_is_system_schema): ?>
-        <?= Util::linkOrButton(
-            $edit_view_url,
-            Util::getIcon('b_edit.png', __('Edit view'), true)
-        ); ?>
-    <?php endif; ?>
-    <?= Template::get('table/structure/optional_action_links')->render(
-        array(
-            'url_query' => $url_query,
-            'tbl_is_view' => $tbl_is_view,
-            'db_is_system_schema' => $db_is_system_schema
-        )
-    ); ?>
-</div>
-<?php if (! $tbl_is_view && ! $db_is_system_schema): ?>
-    <br />
-    <?= Template::get('table/structure/add_column')->render(
-        array('columns_list' => $columns_list)
-    ); ?>
-<?php endif; ?>
-
-<!--Displays indexes-->
-<?php if (! $tbl_is_view
-    && ! $db_is_system_schema && 'ARCHIVE' !=  $tbl_storage_engine): ?>
-    <?= PMA_getHtmlForDisplayIndexes(); ?>
-<?php endif; ?>
-
-<!--Display partition details-->
-<?php if (Partition::havePartitioning()):
-    $partition_names = Partition::getPartitionNames($db, $table);
-
-    // detect partitioning
-    if (! empty($partition_names) && ! is_null($partition_names[0])):
-
-        $partitions = Partition::getPartitions($db, $table);
-        $firstPartition = $partitions[0];
-        $rangeOrList = $firstPartition->getMethod() == 'RANGE'
-            || $firstPartition->getMethod() == 'RANGE COLUMNS'
-            || $firstPartition->getMethod() == 'LIST'
-            || $firstPartition->getMethod() == 'LIST COLUMNS';
-        $subParitions = $firstPartition->getSubPartitions();
-        $hasSubPartitions = $firstPartition->hasSubPartitions();
-        if ($hasSubPartitions) {
-            $firstSubPartition = $subParitions[0];
-        }
-
-        $actionIcons = array(
-            'ANALYZE' => Util::getIcon('b_search.png', __('Analyze')),
-            'CHECK' => Util::getIcon('eye.png', __('Check')),
-            'OPTIMIZE' => Util::getIcon('normalize.png', __('Optimize')),
-            'REBUILD' => Util::getIcon('s_tbl.png', __('Rebuild')),
-            'REPAIR' => Util::getIcon('b_tblops.png', __('Repair')),
-            'TRUNCATE' => Util::getIcon('b_empty.png', __('Truncate')),
-        );
-        if ($rangeOrList) {
-            $actionIcons['DROP'] = Util::getIcon('b_drop.png', __('Drop'));
-        }
-
-        echo Util::getDivForSliderEffect(
-            'partitions', __('Partitions')
-        );
-
-        $tmp_partition_description = $firstPartition->getDescription();
-
-        $removeSQL = "ALTER TABLE " . Util::backquote($table) . " REMOVE PARTITIONING";
-        $removeUrl = 'sql.php' . $url_query . '&sql_query=' . urlencode($removeSQL);
-
-        echo Template::get('table/structure/display_partitions')->render(
-            array(
-                'db' => $db,
-                'table' => $table,
-                'url_query'  => $url_query,
-                'partitions' => $partitions,
-                'partitionMethod' => $firstPartition->getMethod(),
-                'partitionExpression' => $firstPartition->getExpression(),
-                'hasDescription' => ! empty($tmp_partition_description),
-                'hasSubPartitions' => $hasSubPartitions,
-                'subPartitionMethod' => $hasSubPartitions ? $firstSubPartition->getMethod() : null,
-                'subPartitionExpression' => $hasSubPartitions ? $firstSubPartition->getExpression() : null,
-                'actionIcons' => $actionIcons,
-                'rangeOrList' => $rangeOrList,
-                'removeUrl' => $removeUrl,
-            )
-        );
-    else:
-        echo Template::get('table/structure/display_partitions')->render(
-            array(
-                'db' => $db,
-                'table' => $table,
-            )
-        );
-    endif;
-    ?>
-    <!-- For closing Slider effect div-->
-    </div>
-<?php endif; ?>
-
-<!--Displays Space usage and row statistics-->
-<?php if ($GLOBALS['cfg']['ShowStats']): ?>
-    <?= $tablestats;  ?>
-<?php endif; ?>
-<div class="clearfloat"></div>
diff --git a/#pma/templates/table/structure/display_table_stats.phtml b/#pma/templates/table/structure/display_table_stats.phtml
deleted file mode 100644
index 79fa0a96..00000000
--- a/#pma/templates/table/structure/display_table_stats.phtml
+++ /dev/null
@@ -1,79 +0,0 @@
-<div id="tablestatistics">
-    <?php $odd_row = false; ?>
-    <fieldset>
-        <legend><?= __('Information'); ?></legend>
-        <p> <strong> <?= __('Table comments:') ?> </strong>
-            <?= isset($showtable['TABLE_COMMENT']) ? htmlspecialchars($showtable['TABLE_COMMENT']) : '';?>
-        </p>
-        <a id="showusage"></a>
-
-        <?php if (! $tbl_is_view && ! $db_is_system_schema): ?>
-            <table id="tablespaceusage" class="data">
-                <caption class="tblHeaders"><?= __('Space usage'); ?></caption>
-                <tbody>
-                    <tr class="<?= (($odd_row = !$odd_row) ? 'odd' : 'even'); ?>">
-                        <th class="name"><?= __('Data'); ?></th>
-                        <td class="value"><?= $data_size; ?></td>
-                        <td class="unit"><?= $data_unit; ?></td>
-                    </tr>
-
-                <?php if (isset($index_size)): ?>
-                    <tr class="<?= (($odd_row = !$odd_row) ? 'odd' : 'even'); ?>">
-                        <th class="name"><?= __('Index'); ?></th>
-                        <td class="value"><?= $index_size; ?></td>
-                        <td class="unit"><?= $index_unit; ?></td>
-                    </tr>
-                <?php endif; ?>
-
-                <?php if (isset($free_size)): ?>
-                    <tr class="<?= (($odd_row = !$odd_row) ? 'odd' : 'even'); ?>">
-                        <th class="name"><?= __('Overhead'); ?></th>
-                        <td class="value"><?= $free_size; ?></td>
-                        <td class="unit"><?= $free_unit; ?></td>
-                    </tr>
-                    <tr class="<?= (($odd_row = !$odd_row) ? 'odd' : 'even'); ?>">
-                        <th class="name"><?= __('Effective'); ?></th>
-                        <td class="value"><?= $effect_size; ?></td>
-                        <td class="unit"><?= $effect_unit; ?></td>
-                    </tr>
-                <?php endif; ?>
-
-                <?php if (isset($tot_size) && $mergetable == false): ?>
-                    <tr class="<?= (($odd_row = !$odd_row) ? 'odd' : 'even'); ?>">
-                        <th class="name"><?= __('Total'); ?></th>
-                        <td class="value"><?= $tot_size; ?></td>
-                        <td class="unit"><?= $tot_unit; ?></td>
-                    </tr>
-                <?php endif; ?>
-
-                <!-- Optimize link if overhead -->
-                <?php if (isset($free_size)
-                            && ($tbl_storage_engine == 'MYISAM'
-                            || $tbl_storage_engine == 'ARIA'
-                            || $tbl_storage_engine == 'MARIA'
-                            || $tbl_storage_engine == 'BDB')): ?>
-                    <tr class="tblFooters">
-                        <td colspan="3" class="center">
-                            <a href="sql.php<?= $url_query; ?>&pos=0&amp;sql_query=<?= urlencode(
-                                    'OPTIMIZE TABLE ' . PMA\libraries\Util::backquote($GLOBALS['table'])); ?>">
-                                <?= PMA\libraries\Util::getIcon('b_tbloptimize.png', __('Optimize table')); ?>
-                            </a>
-                        </td>
-                    </tr>
-                <?php endif; ?>
-                </tbody>
-            </table>
-        <?php endif; ?>
-        <?= PMA\libraries\Template::get('table/structure/row_stats_table')->render(
-              array(
-                  'showtable' => $showtable,
-                  'tbl_collation' => $tbl_collation,
-                  'is_innodb' => $is_innodb,
-                  'mergetable' => $mergetable,
-                  'avg_size' => (isset ($avg_size) ? $avg_size : ''),
-                  'avg_unit' => (isset ($avg_unit) ? $avg_unit : '')
-              )
-            )
-        ?>
-    </fieldset>
-</div>
diff --git a/#pma/templates/table/structure/move_columns_dialog.phtml b/#pma/templates/table/structure/move_columns_dialog.phtml
deleted file mode 100644
index 8e6d5c65..00000000
--- a/#pma/templates/table/structure/move_columns_dialog.phtml
+++ /dev/null
@@ -1,8 +0,0 @@
-<div id="move_columns_dialog" title="<?= __('Move columns'); ?>" style="display: none">
-    <p><?= __('Move the columns by dragging them up and down.'); ?></p>
-    <form action="tbl_structure.php">
-        <div><?= PMA_URL_getHiddenInputs($GLOBALS['db'], $GLOBALS['table']); ?>
-            <ul></ul>
-        </div>
-    </form>
-</div>
\ No newline at end of file
diff --git a/#pma/templates/table/structure/optional_action_links.phtml b/#pma/templates/table/structure/optional_action_links.phtml
deleted file mode 100644
index b88dbb74..00000000
--- a/#pma/templates/table/structure/optional_action_links.phtml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-use PMA\libraries\Tracker;
-use PMA\libraries\Util;
-
-?>
-<a href="#" id="printView"><?= Util::getIcon('b_print.png', __('Print'), true); ?></a>
-<?php if (! $tbl_is_view && ! $db_is_system_schema): ?>
-    <a href="sql.php<?= $url_query; ?>&amp;session_max_rows=all&amp;sql_query=<?= urlencode(
-                'SELECT * FROM ' . Util::backquote($GLOBALS['table'])
-                . ' PROCEDURE ANALYSE()'
-            ); ?>" style="margin-right: 0;">
-            <?= Util::getIcon(
-                'b_tblanalyse.png',
-                __('Propose table structure'),
-                true
-            ); ?>
-    </a>
-    <?= Util::showMySQLDocu('procedure_analyse'); ?>
-    <?php if (Tracker::isActive()): ?>
-        <a href="tbl_tracking.php<?= $url_query; ?>">
-            <?= Util::getIcon('eye.png', __('Track table'), true); ?>
-        </a>
-    <?php endif; ?>
-    <a href="#" id="move_columns_anchor">
-        <?= Util::getIcon('b_move.png', __('Move columns'), true); ?>
-    </a>
-    <a href="normalization.php<?= $url_query; ?>">
-        <?= Util::getIcon('normalize.png', __('Improve table structure'), true); ?>
-    </a>
-<?php endif; ?>
-<?php if ($tbl_is_view && ! $db_is_system_schema): ?>
-    <?php if (Tracker::isActive()): ?>
-        <a href="tbl_tracking.php<?= $url_query; ?>">
-            <?= Util::getIcon('eye.png', __('Track view'), true); ?>
-        </a>
-    <?php endif; ?>
-<?php endif; ?>
\ No newline at end of file
diff --git a/#pma/templates/table/structure/partition_definition_form.phtml b/#pma/templates/table/structure/partition_definition_form.phtml
deleted file mode 100644
index 22a44b77..00000000
--- a/#pma/templates/table/structure/partition_definition_form.phtml
+++ /dev/null
@@ -1,13 +0,0 @@
-<form action="tbl_structure.php" method="post">
-
-    <?= PMA_URL_getHiddenInputs($db, $table); ?>
-    <input type="hidden" name="edit_partitioning" value="true" />
-
-    <fieldset>
-        <legend><?= __('Edit partitioning'); ?></legend>
-        <?php include 'libraries/tbl_partition_definition.inc.php'; ?>
-    </fieldset>
-    <fieldset class="tblFooters">
-        <input type="submit" name="save_partitioning" value="<?= __('Save'); ?>">
-    </fieldset>
-</form>
\ No newline at end of file
diff --git a/#pma/templates/table/structure/row_stats_table.phtml b/#pma/templates/table/structure/row_stats_table.phtml
deleted file mode 100644
index 248ff09f..00000000
--- a/#pma/templates/table/structure/row_stats_table.phtml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php $odd_row = false; ?>
-<table id="tablerowstats" class="data">
-<caption class="tblHeaders"><?= __('Row statistics'); ?></caption>
-<tbody>
-    <?php if (isset($showtable['Row_format'])): ?>
-        <tr class="<?= (($odd_row = !$odd_row) ? 'odd' : 'even'); ?>">
-        <th class="name"><?= __('Format'); ?></th>
-        <?php if ($showtable['Row_format'] == 'Fixed'): ?>
-            <td class="value"><?= __('static'); ?></td>
-        <?php elseif ($showtable['Row_format'] == 'Dynamic'): ?>
-            <td class="value"><?= __('dynamic'); ?></td>
-        <?php else: ?>
-            <td class="value"><?= $showtable['Row_format']; ?></td>
-        <?php endif; ?>
-        </tr>
-    <?php endif; ?>
-
-    <?php if (! empty($showtable['Create_options'])): ?>
-        <tr class="<?= (($odd_row = !$odd_row) ? 'odd' : 'even'); ?>">
-        <th class="name"><?= __('Options'); ?></th>
-        <?php if ($showtable['Create_options'] == 'partitioned'): ?>
-            <td class="value"><?= __('partitioned'); ?></td>
-        <?php else: ?>
-            <td class="value"><?= $showtable['Create_options']; ?></td>
-        <?php endif; ?>
-        </tr>
-    <?php endif; ?>
-
-    <?php if (!empty($tbl_collation)): ?>
-        <tr class="<?= (($odd_row = !$odd_row) ? 'odd' : 'even'); ?>">
-        <th class="name"><?= __('Collation'); ?></th>
-        <td class="value">
-            <dfn title="<?= PMA_getCollationDescr($tbl_collation); ?>">
-                <?= $tbl_collation; ?>
-            </dfn>
-        </td>
-        </tr>
-    <?php endif; ?>
-
-    <?php if (!$is_innodb && isset($showtable['Rows'])): ?>
-        <tr class="<?= (($odd_row = !$odd_row) ? 'odd' : 'even'); ?>">
-        <th class="name"><?= __('Rows'); ?></th>
-        <td class="value"><?= PMA\libraries\Util::formatNumber($showtable['Rows'], 0); ?></td>
-        </tr>
-    <?php endif; ?>
-
-    <?php if (!$is_innodb
-        && isset($showtable['Avg_row_length'])
-        && $showtable['Avg_row_length'] > 0
-        ): ?>
-        <?php list($avg_row_length_value, $avg_row_length_unit)
-            = PMA\libraries\Util::formatByteDown($showtable['Avg_row_length'], 6, 1); ?>
-        <tr class="<?= (($odd_row = !$odd_row) ? 'odd' : 'even'); ?>">
-        <th class="name"><?= __('Row length'); ?></th>
-        <td class="value"><?= $avg_row_length_value , ' ' , $avg_row_length_unit; ?></td>
-        </tr>
-        <?php unset($avg_row_length_value, $avg_row_length_unit); ?>
-    <?php endif; ?>
-
-    <?php if (!$is_innodb
-            && isset($showtable['Data_length'])
-            && isset($showtable['Rows'])
-            && $showtable['Rows'] > 0
-            && $mergetable == false): ?>
-        <tr class="<?= (($odd_row = !$odd_row) ? 'odd' : 'even'); ?>">
-        <th class="name"><?= __('Row size'); ?></th>
-        <td class="value"><?= $avg_size , ' ' , $avg_unit; ?></td>
-        </tr>
-    <?php endif; ?>
-
-    <?php if (isset($showtable['Auto_increment'])): ?>
-        <tr class="<?= (($odd_row = !$odd_row) ? 'odd' : 'even'); ?>">
-        <th class="name"><?= __('Next autoindex'); ?></th>
-        <td class="value"><?= PMA\libraries\Util::formatNumber($showtable['Auto_increment'], 0); ?></td>
-        </tr>
-    <?php endif; ?>
-
-    <?php if (isset($showtable['Create_time'])): ?>
-        <tr class="<?= (($odd_row = !$odd_row) ? 'odd' : 'even'); ?>">
-        <th class="name"><?= __('Creation'); ?></th>
-        <td class="value"><?= PMA\libraries\Util::localisedDate(strtotime($showtable['Create_time'])); ?></td>
-        </tr>
-    <?php endif; ?>
-
-    <?php if (isset($showtable['Update_time'])): ?>
-        <tr class="<?= (($odd_row = !$odd_row) ? 'odd' : 'even'); ?>">
-        <th class="name"><?= __('Last update'); ?></th>
-        <td class="value"><?= PMA\libraries\Util::localisedDate(strtotime($showtable['Update_time'])); ?></td>
-        </tr>
-    <?php endif; ?>
-
-    <?php if (isset($showtable['Check_time'])): ?>
-        <tr class="<?= (($odd_row = !$odd_row) ? 'odd' : 'even'); ?>">
-        <th class="name"><?= __('Last check'); ?></th>
-        <td class="value"><?= PMA\libraries\Util::localisedDate(strtotime($showtable['Check_time'])); ?></td>
-        </tr>
-    <?php endif; ?>
-</tbody>
-</table>
\ No newline at end of file
diff --git a/#pma/templates/table/structure/table_structure_header.phtml b/#pma/templates/table/structure/table_structure_header.phtml
deleted file mode 100644
index 835ea97a..00000000
--- a/#pma/templates/table/structure/table_structure_header.phtml
+++ /dev/null
@@ -1,28 +0,0 @@
-<thead>
-<tr>
-    <th class="print_ignore"></th>
-    <th>#</th>
-    <th><?php use PMA\libraries\Util; ?>
-
-        <?= __('Name'); ?></th>
-    <th><?= __('Type'); ?></th>
-    <th><?= __('Collation'); ?></th>
-    <th><?= __('Attributes'); ?></th>
-    <th><?= __('Null'); ?></th>
-    <th><?= __('Default'); ?></th>
-    <?php if ($GLOBALS['cfg']['ShowColumnComments']): ?>
-        <th><?= __('Comments'); ?></th>
-    <?php endif; ?>
-    <th><?= __('Extra'); ?></th>
-     <!-- see tbl_structure.js, function moreOptsMenuResize() -->
-     <?php if (! $db_is_system_schema && ! $tbl_is_view): ?>
-        <?php
-            $colspan = 9;
-            if (Util::showIcons('ActionLinksMode')) {
-                $colspan--;
-            }
-        ?>
-        <th colspan="<?= $colspan; ?>" class="action print_ignore"><?= __('Action'); ?></th>
-    <?php endif; ?>
-</tr>
-</thead>
\ No newline at end of file
diff --git a/#pma/templates/table/structure/table_structure_row.phtml b/#pma/templates/table/structure/table_structure_row.phtml
deleted file mode 100644
index 4a35201d..00000000
--- a/#pma/templates/table/structure/table_structure_row.phtml
+++ /dev/null
@@ -1,55 +0,0 @@
-<td class="center print_ignore">
-    <input type="checkbox" class="checkall" name="selected_fld[]" value="<?= htmlspecialchars($row['Field']); ?>" id="checkbox_row_<?= $rownum; ?>"/>
-</td>
-<td class="right"><?= $rownum; ?></td>
-<th class="nowrap">
-    <label for="checkbox_row_<?= $rownum; ?>">
-        <?= preg_replace('/[\x00-\x1F]/', '&#x2051;', $displayed_field_name); ?>
-    </label>
-</th>
-<td <?= $type_nowrap; ?>>
-    <bdo dir="ltr" lang="en"><?= $extracted_columnspec['displayed_type']; ?>
-        <?php if ($GLOBALS['cfgRelation']['commwork'] && $GLOBALS['cfgRelation']['mimework']
-                    && $GLOBALS['cfg']['BrowseMIME'] && isset($mime_map[$row['Field']]['mimetype'])): ?>
-    <br />MIME: <?= strtolower(str_replace('_', '/', $mime_map[$row['Field']]['mimetype'])); ?>
-        <?php endif; ?>
-    </bdo>
-</td>
-<td>
-<?php if (! empty($field_charset)): ?>
-    <dfn title="<?= PMA_getCollationDescr($field_charset); ?>"><?= $field_charset; ?></dfn>
-<?php endif; ?>
-</td>
-<td class="column_attribute nowrap"><?= $attribute; ?></td>
-<td><?= (($row['Null'] == 'YES') ? __('Yes') : __('No')); ?></td>
-<td class="nowrap">
-    <?php if (isset($row['Default'])): ?>
-        <?php if ($extracted_columnspec['type'] == 'bit'): ?>
-            <?= PMA\libraries\Util::convertBitDefaultValue($row['Default']); ?>
-        <?php else: ?>
-            <?= $row['Default']; ?>
-        <?php endif;?>
-    <?php else: ?>
-        <i><?= _pgettext('None for default', 'None'); ?></i>
-    <?php endif; ?>
-</td>
-<?php if ($GLOBALS['cfg']['ShowColumnComments']): ?>
-    <td>
-        <?= $comments; ?>
-    </td>
-<?php endif; ?>
-<td class="nowrap"><?= mb_strtoupper($row['Extra']); ?></td>
-<?php if (! $tbl_is_view && ! $db_is_system_schema): ?>
-    <td class="edit center print_ignore">
-        <a class="change_column_anchor ajax" href="tbl_structure.php<?= $url_query; ?>&amp;field=<?= $field_encoded; ?>&amp;change_column=1">
-            <?= $titles['Change']; ?>
-        </a>
-    </td>
-    <td class="drop center print_ignore">
-        <a class="drop_column_anchor ajax" href="sql.php<?= $url_query; ?>&amp;sql_query=<?= urlencode(
-                'ALTER TABLE ' . PMA\libraries\Util::backquote($table)
-                . ' DROP ' . PMA\libraries\Util::backquote($row['Field']) . ';'); ?>&amp;dropped_column=<?= $field_encoded; ?>&amp;purge=1&amp;message_to_show=<?= urlencode(sprintf(__('Column %s has been dropped.'), htmlspecialchars($row['Field']))) ?>" >
-            <?= $titles['Drop']; ?>
-        </a>
-    </td>
-<?php endif; ?>
\ No newline at end of file
diff --git a/#pma/templates/test/add_data.phtml b/#pma/templates/test/add_data.phtml
deleted file mode 100644
index 1df76706..00000000
--- a/#pma/templates/test/add_data.phtml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?= $variable1; ?>
-<?= $variable2;
\ No newline at end of file
diff --git a/#pma/templates/test/echo.phtml b/#pma/templates/test/echo.phtml
deleted file mode 100644
index a32fd41b..00000000
--- a/#pma/templates/test/echo.phtml
+++ /dev/null
@@ -1 +0,0 @@
-<?= $variable;
\ No newline at end of file
diff --git a/#pma/templates/test/set_helper.phtml b/#pma/templates/test/set_helper.phtml
deleted file mode 100644
index d3dd0b6f..00000000
--- a/#pma/templates/test/set_helper.phtml
+++ /dev/null
@@ -1 +0,0 @@
-<?= $this->hello($variable);
\ No newline at end of file
diff --git a/#pma/templates/test/static.phtml b/#pma/templates/test/static.phtml
deleted file mode 100644
index 703390d1..00000000
--- a/#pma/templates/test/static.phtml
+++ /dev/null
@@ -1 +0,0 @@
-static content
\ No newline at end of file
diff --git a/#pma/templates/test/trim.phtml b/#pma/templates/test/trim.phtml
deleted file mode 100644
index 56b4ac49..00000000
--- a/#pma/templates/test/trim.phtml
+++ /dev/null
@@ -1 +0,0 @@
-outer <element> value </element> value
\ No newline at end of file
diff --git a/#pma/test/.htaccess b/#pma/test/.htaccess
deleted file mode 100644
index 0970a23a..00000000
--- a/#pma/test/.htaccess
+++ /dev/null
@@ -1,6 +0,0 @@
-# This folder does NOT need to be accessible over HTTP
-# In most cases the tests included here will be run from a command line interface.
-
-# (the following directive denies access by default)
-# For more information see: https://httpd.apache.org/docs/current/mod/mod_authz_host.html#allow
-Order allow,deny
diff --git a/#pma/test/AllSeleniumTests.php b/#pma/test/AllSeleniumTests.php
deleted file mode 100644
index dcafe1f9..00000000
--- a/#pma/test/AllSeleniumTests.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * runs all defined Selenium tests
- *
- * @package    PhpMyAdmin-test
- * @subpackage Selenium
- */
-
-require_once 'PHPUnit/TextUI/TestRunner.php';
-require_once __DIR__ . '/selenium/PmaSeleniumLoginTest.php';
-require_once __DIR__ . '/selenium/PmaSeleniumXssTest.php';
-require_once __DIR__ . '/selenium/PmaSeleniumPrivilegesTest.php';
-require_once __DIR__ . '/selenium/PmaSeleniumCreateDropDatabaseTest.php';
-require_once __DIR__ . '/selenium/PmaSeleniumCreateRemoveUserTest.php';
-
-/**
- * AllSeleniumTests class
- *
- * Runs all the selenium test cases
- *
- * @package    PhpMyAdmin-test
- * @subpackage Selenium
- */
-class AllSeleniumTests
-{
-    /**
-     * Main method
-     *
-     * @return void
-     */
-    public static function main()
-    {
-        $parameters = array();
-        PHPUnit_TextUI_TestRunner::run(self::suite(), $parameters);
-    }
-
-    /**
-     * Creates a SeleniumTestSuite and add all the selenium test cases to it
-     *
-     * @return PHPUnit_Extensions_SeleniumTestSuite
-     */
-    public static function suite()
-    {
-        $suite = new PHPUnit_Extensions_SeleniumTestSuite('phpMyAdmin');
-
-        $suite->addTestSuite('PmaSeleniumLoginTest');
-        $suite->addTestSuite('PmaSeleniumXssTest');
-        $suite->addTestSuite('PmaSeleniumPrivilegesTest');
-        $suite->addTestSuite('PmaSeleniumCreateDropDatabaseTest');
-        $suite->addTestSuite('PmaSeleniumCreateRemoveUserTest');
-        return $suite;
-    }
-}
diff --git a/#pma/test/Environment_test.php b/#pma/test/Environment_test.php
deleted file mode 100644
index f3782862..00000000
--- a/#pma/test/Environment_test.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for environment like OS, PHP, modules, ...
- *
- * @package PhpMyAdmin-test
- */
-
-/**
- *
- */
-require_once 'config.sample.inc.php';
-
-/**
- * Environment tests
- *
- * @package PhpMyAdmin-test
- */
-class Environment_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Tests PHP version
-     *
-     * @return void
-     */
-    public function testPhpVersion()
-    {
-        $this->assertTrue(
-            version_compare('5.5', phpversion(), '<='),
-            'phpMyAdmin requires PHP 5.5 or above'
-        );
-    }
-
-    /**
-     * Tests MySQL connection
-     *
-     * @return void
-     */
-    public function testMySQL()
-    {
-        try {
-            $pdo = new PDO(
-                "mysql:host=" . $GLOBALS['TESTSUITE_SERVER'],
-                $GLOBALS['TESTSUITE_USER'],
-                $GLOBALS['TESTSUITE_PASSWORD']
-            );
-            $this->assertNull(
-                $pdo->errorCode(),
-                "Error when trying to connect to database"
-            );
-
-            $pdo->exec("SHOW DATABASES;");
-            $this->assertEquals(
-                0,
-                $pdo->errorCode(),
-                'Error trying to show tables for database'
-            );
-        } catch (Exception $e) {
-            $this->markTestSkipped("Error: " . $e->getMessage());
-        }
-
-        // Check id MySQL server is 5 version
-        preg_match(
-            "/^(\d+)?\.(\d+)?\.(\*|\d+)/",
-            $pdo->getAttribute(constant("PDO::ATTR_SERVER_VERSION")),
-            $version_parts
-        );
-        $this->assertEquals(5, $version_parts[1]);
-    }
-}
diff --git a/#pma/test/PMATestCase.php b/#pma/test/PMATestCase.php
deleted file mode 100644
index 66d56f7a..00000000
--- a/#pma/test/PMATestCase.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Base class for phpMyAdmin tests
- *
- * @package PhpMyAdmin-test
- */
-
-/**
- * Base class for phpMyAdmin tests.
- *
- * @package PhpMyAdmin-test
- */
-class PMATestCase extends PHPUnit_Framework_TestCase
-{
-    public static function setUpBeforeClass()
-    {
-        require 'libraries/config.default.php';
-        $GLOBALS['cfg'] = $cfg;
-    }
-}
\ No newline at end of file
diff --git a/#pma/test/README.rst b/#pma/test/README.rst
deleted file mode 100644
index 0fa088e5..00000000
--- a/#pma/test/README.rst
+++ /dev/null
@@ -1,59 +0,0 @@
-PhpMyAdmin test suite
-=====================
-
-This directory is protected from web visitors by a .htaccess file.
-
-For more information on allowing http access to this directory see:
-https://httpd.apache.org/docs/current/mod/mod_authz_host.html#allow
-
-Please visit the wiki for more information on unit testing:
-https://wiki.phpmyadmin.net/pma/UnitTesting
-
-Selenium tests
---------------
-
-To be able to run Selenium tests, you need to have webserver, database
-and Selenium running. Following environment variables configure where
-testsuite connects:
-
-TESTSUITE_SERVER
-    Database server to use.
-TESTSUITE_USER
-    Username for connecting to database.
-TESTSUITE_PASSWORD
-    Password for connecting to database.
-TESTSUITE_DATABASE
-    Database to use for testing.
-TESTSUITE_URL
-    URL where tested phpMyAdmin is available.
-
-Additionally you need to configure link to Selenium and browsers. You
-can either setup Selenium locally or use BrowserStack automated testing.
-
-For local setup, define following:
-
-TESTSUITE_SELENIUM_HOST
-    Host where Selenium is running.
-TESTSUITE_SELENIUM_PORT
-    Port where to connect.
-TESTSUITE_SELENIUM_BROWSER
-    Browser to use for testing inside Selenium.
-
-With BrowserStack, set following:
-
-TESTSUITE_BROWSERSTACK_UNAME
-    BrowserStack username.
-TESTSUITE_BROWSERSTACK_KEY
-    BrowserStack access key.
-
-For example you can use following setup in ``phpunit.xml``::
-
-    <php>
-        <env name="TESTSUITE_SERVER" value="localhost"/>
-        <env name="TESTSUITE_USER" value="root"/>
-        <env name="TESTSUITE_PASSWORD" value="root"/>
-        <env name="TESTSUITE_DATABASE" value="test"/>
-        <env name="TESTSUITE_PHPMYADMIN_HOST" value="http://localhost/phpmyadmin/" />
-        <env name="TESTSUITE_SELENIUM_HOST" value="127.0.0.1" />
-        <env name="TESTSUITE_SELENIUM_PORT" value="4444" />
-    </php>
diff --git a/#pma/test/bootstrap-dist.php b/#pma/test/bootstrap-dist.php
deleted file mode 100644
index 0188e49b..00000000
--- a/#pma/test/bootstrap-dist.php
+++ /dev/null
@@ -1,177 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Bootstrap for phpMyAdmin tests
- *
- * @package PhpMyAdmin-test
- */
-
-/**
- * Set precision to sane value, with higher values
- * things behave slightly unexpectedly, for example
- * round(1.2, 2) returns 1.199999999999999956.
- */
-ini_set('precision', 14);
-
-// Let PHP complain about all errors
-error_reporting(E_ALL);
-
-// Ensure PHP has set timezone
-date_default_timezone_set('UTC');
-
-// Adding phpMyAdmin sources to include path
-set_include_path(
-    get_include_path() . PATH_SEPARATOR . dirname(realpath("../index.php"))
-);
-
-// Setting constants for testing
-define('PHPMYADMIN', 1);
-define('TESTSUITE', 1);
-define('PMA_MYSQL_INT_VERSION', 55000);
-define('PMA_MYSQL_STR_VERSION', '5.50.00');
-define('PMA_MYSQL_VERSION_COMMENT', 'MySQL Community Server (GPL)');
-
-// Selenium tests setup
-$test_defaults = array(
-    'TESTSUITE_SERVER' => 'localhost',
-    'TESTSUITE_USER' => 'root',
-    'TESTSUITE_PASSWORD' => '',
-    'TESTSUITE_DATABASE' => 'test',
-    'TESTSUITE_URL' => 'http://localhost/phpmyadmin/',
-    'TESTSUITE_SELENIUM_HOST' => '',
-    'TESTSUITE_SELENIUM_PORT' => '4444',
-    'TESTSUITE_SELENIUM_BROWSER' => 'firefox',
-    'TESTSUITE_SELENIUM_COVERAGE' => '',
-    'TESTSUITE_BROWSERSTACK_USER' => '',
-    'TESTSUITE_BROWSERSTACK_KEY' => '',
-    'TESTSUITE_FULL' => '',
-);
-foreach ($test_defaults as $varname => $defvalue) {
-    $envvar = getenv($varname);
-    if ($envvar) {
-        $GLOBALS[$varname] = $envvar;
-    } else {
-        $GLOBALS[$varname] = $defvalue;
-    }
-}
-
-require_once 'libraries/vendor_config.php';
-require_once 'libraries/autoloader.php';
-require_once 'libraries/core.lib.php';
-$CFG = new PMA\libraries\Config();
-// Initialize PMA_VERSION variable
-define('PMA_VERSION', $CFG->get('PMA_VERSION'));
-unset($CFG);
-require_once 'libraries/sql-parser/autoload.php';
-
-/* Ensure default langauge is active */
-require_once 'libraries/php-gettext/gettext.inc';
-PMA\libraries\LanguageManager::getInstance()->getLanguage('en')->activate();
-
-// Set proxy information from env, if available
-$http_proxy = getenv('http_proxy');
-if ($http_proxy && ($url_info = parse_url($http_proxy))) {
-    define('PROXY_URL', $url_info['host'] . ':' . $url_info['port']);
-    define('PROXY_USER', empty($url_info['user']) ? '' : $url_info['user']);
-    define('PROXY_PASS', empty($url_info['pass']) ? '' : $url_info['pass']);
-} else {
-    define('PROXY_URL', '');
-    define('PROXY_USER', '');
-    define('PROXY_PASS', '');
-}
-
-// Ensure we have session started
-session_start();
-
-// Standard environment for tests
-$_SESSION[' PMA_token '] = 'token';
-$_SESSION['tmpval']['pftext'] = 'F';
-$GLOBALS['lang'] = 'en';
-$GLOBALS['is_ajax_request'] = false;
-$GLOBALS['cell_align_left'] = 'left';
-
-// Check whether we have runkit extension
-define('PMA_HAS_RUNKIT', function_exists('runkit_constant_redefine'));
-$GLOBALS['runkit_internal_override'] = ini_get('runkit.internal_override');
-
-
-/**
- * Function to emulate headers() function by storing headers in GLOBAL array
- *
- * @param string  $string             header string
- * @param boolean $replace            .
- * @param integer $http_response_code .
- *
- * @return void
- */
-function test_header($string, $replace = true, $http_response_code = 200)
-{
-    if (! isset($GLOBALS['header'])) {
-        $GLOBALS['header'] = array();
-    }
-
-    $GLOBALS['header'][] = $string;
-}
-
-/**
- * Function to emulate headers_send.
- *
- * @return boolean false
- */
-function test_headers_sent()
-{
-    return false;
-}
-
-/**
- * Function to emulate date() function
- *
- * @param string $date_format arg
- *
- * @return string dummy date
- */
-function test_date($date_format)
-{
-    return '0000-00-00 00:00:00';
-}
-
-if (PMA_HAS_RUNKIT && $GLOBALS['runkit_internal_override']) {
-    echo "Enabling headers testing using runkit...\n";
-    runkit_function_rename('header', 'test_header_override');
-    runkit_function_rename('headers_sent', 'test_headers_sent_override');
-    runkit_function_rename('test_header', 'header');
-    runkit_function_rename('test_headers_sent', 'headers_sent');
-    define('PMA_TEST_HEADERS', true);
-} else {
-    echo "No headers testing.\n";
-    echo "Please install runkit and enable runkit.internal_override!\n";
-}
-
-/**
- * Overrides date function
- *
- * @return boolean whether function was overridden or not
- */
-function setupForTestsUsingDate()
-{
-    if (PMA_HAS_RUNKIT && $GLOBALS['runkit_internal_override']) {
-        runkit_function_rename('date', 'test_date_override');
-        runkit_function_rename('test_date', 'date');
-        return true;
-    } else {
-        return false;
-    }
-}
-
-/**
- * Restores date function
- *
- * @return void
- */
-function tearDownForTestsUsingDate()
-{
-    if (PMA_HAS_RUNKIT && $GLOBALS['runkit_internal_override']) {
-        runkit_function_rename('date', 'test_date');
-        runkit_function_rename('test_date_override', 'date');
-    }
-}
diff --git a/#pma/test/classes/AdvisorTest.php b/#pma/test/classes/AdvisorTest.php
deleted file mode 100644
index 83fbd3c3..00000000
--- a/#pma/test/classes/AdvisorTest.php
+++ /dev/null
@@ -1,275 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for Advisor class
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-require_once 'libraries/url_generating.lib.php';
-require_once 'test/PMATestCase.php';
-
-use PMA\libraries\Advisor;
-use PMA\libraries\Theme;
-
-/**
- * Tests behaviour of PMA_Advisor class
- *
- * @package PhpMyAdmin-test
- */
-class AdvisorTest extends PMATestCase
-{
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     *
-     * @return void
-     */
-    public function setup()
-    {
-        $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
-        $GLOBALS['server'] = 1;
-    }
-
-    /**
-     * Tests string escaping
-     *
-     * @param string $text     Text to escape
-     * @param string $expected Expected output
-     *
-     * @return void
-     *
-     * @dataProvider escapeStrings
-     */
-    public function testEscape($text, $expected)
-    {
-        $this->assertEquals(Advisor::escapePercent($text), $expected);
-    }
-
-    /**
-     * return of escape Strings
-     *
-     * @return array
-     */
-    public function escapeStrings()
-    {
-        return array(
-            array('80%', '80%%'),
-            array('%s%', '%s%%'),
-            array('80% foo', '80%% foo'),
-            array('%s% foo', '%s%% foo'),
-            );
-    }
-
-    /**
-     * test for parseRulesFile
-     *
-     * @return void
-     */
-    public function testParse()
-    {
-        $advisor = new Advisor();
-        $parseResult = $advisor->parseRulesFile();
-        $this->assertEquals($parseResult['errors'], array());
-    }
-
-    /**
-     * test for ADVISOR_bytime
-     *
-     * @return void
-     */
-    public function testAdvisorBytime()
-    {
-        $result = ADVISOR_bytime(10, 2);
-        $this->assertEquals("10 per second", $result);
-
-        $result = ADVISOR_bytime(0.02, 2);
-        $this->assertEquals("1.2 per minute", $result);
-
-        $result = ADVISOR_bytime(0.003, 2);
-        $this->assertEquals("10.8 per hour", $result);
-    }
-
-    /**
-     * test for ADVISOR_timespanFormat
-     *
-     * @return void
-     */
-    public function testAdvisorTimespanFormat()
-    {
-        $result = ADVISOR_timespanFormat(1200);
-        $this->assertEquals("0 days, 0 hours, 20 minutes and 0 seconds", $result);
-
-        $result = ADVISOR_timespanFormat(100);
-        $this->assertEquals("0 days, 0 hours, 1 minutes and 40 seconds", $result);
-    }
-
-    /**
-     * Test for adding rule
-     *
-     * @param array  $rule     Rule to test
-     * @param array  $expected Expected rendered rule in fired/errors list
-     * @param string $error    Expected error string (null if none error expected)
-     *
-     * @return void
-     *
-     * @depends testParse
-     * @dataProvider rulesProvider
-     */
-    public function testAddRule($rule, $expected, $error)
-    {
-        $advisor = new Advisor();
-        $parseResult = $advisor->parseRulesFile();
-        $this->assertEquals($parseResult['errors'], array());
-        $advisor->setVariable('value', 0);
-        $advisor->addRule('fired', $rule);
-        $runResult = $advisor->getRunResult();
-        if (isset($runResult['errors']) || !is_null($error)) {
-            $this->assertEquals(array($error), $runResult['errors']);
-        }
-        if (isset($runResult['fired']) || $expected != array()) {
-            $this->assertEquals(array($expected), $runResult['fired']);
-        }
-    }
-
-    /**
-     * rules Provider
-     *
-     * @return array
-     */
-    public function rulesProvider()
-    {
-        return array(
-            array(
-                array(
-                    'justification' => 'foo',
-                    'name' => 'Basic',
-                    'issue' => 'issue',
-                    'recommendation' => 'Recommend'
-                ),
-                array(
-                    'justification' => 'foo',
-                    'id' => 'Basic',
-                    'name' => 'Basic',
-                    'issue' => 'issue',
-                    'recommendation' => 'Recommend'
-                ),
-                null,
-            ),
-            array(
-                array(
-                    'justification' => 'foo',
-                    'name' => 'Variable',
-                    'issue' => 'issue',
-                    'recommendation' => 'Recommend {status_var}'
-                ),
-                array(
-                    'justification' => 'foo',
-                    'id' => 'Variable',
-                    'name' => 'Variable',
-                    'issue' => 'issue',
-                    'recommendation' => 'Recommend <a href="server_variables.php?' .
-                    'lang=en&amp;token=token&filter=status_var">status_var</a>'
-                ),
-                null,
-            ),
-            array(
-                array(
-                    'justification' => '%s foo | value',
-                    'name' => 'Format',
-                    'issue' => 'issue',
-                    'recommendation' => 'Recommend'
-                ),
-                array(
-                    'justification' => '0 foo',
-                    'id' => 'Format',
-                    'name' => 'Format',
-                    'issue' => 'issue',
-                    'recommendation' => 'Recommend'
-                ),
-                null,
-            ),
-            array(
-                array(
-                    'justification' => '%s% foo | value',
-                    'name' => 'Percent',
-                    'issue' => 'issue',
-                    'recommendation' => 'Recommend'
-                ),
-                array(
-                    'justification' => '0% foo',
-                    'id' => 'Percent',
-                    'name' => 'Percent',
-                    'issue' => 'issue',
-                    'recommendation' => 'Recommend'
-                ),
-                null,
-            ),
-            array(
-                array(
-                    'justification' => '%s% %d foo | value, value',
-                    'name' => 'Double',
-                    'issue' => 'issue',
-                    'recommendation' => 'Recommend'
-                ),
-                array(
-                    'justification' => '0% 0 foo',
-                    'id' => 'Double',
-                    'name' => 'Double',
-                    'issue' => 'issue',
-                    'recommendation' => 'Recommend'
-                ),
-                null,
-            ),
-            array(
-                array(
-                    'justification' => '"\'foo',
-                    'name' => 'Quotes',
-                    'issue' => 'issue',
-                    'recommendation' => 'Recommend"\''
-                ),
-                array(
-                    'justification' => '"\'foo',
-                    'id' => 'Quotes',
-                    'name' => 'Quotes',
-                    'issue' => 'issue',
-                    'recommendation' => 'Recommend"\''
-                ),
-                null,
-            ),
-            array(
-                array(
-                    'justification' => 'foo | fsafdsa',
-                    'name' => 'Failure',
-                    'issue' => 'issue',
-                    'recommendation' => 'Recommend'
-                ),
-                array(),
-                'Failed formatting string for rule \'Failure\'. PHP threw ' .
-                'following error: Use of undefined constant fsafdsa - ' .
-                'assumed \'fsafdsa\'<br />Executed code: $value = array(fsafdsa);',
-            ),
-            array(
-                array(
-                    'justification' => 'Version string (%s) | value',
-                    'name' => 'Distribution',
-                    'issue' => 'official MySQL binaries.',
-                    'recommendation' => 'See <a href="https://example.com/">web</a>',
-                ),
-                array(
-                    'justification' => 'Version string (0)',
-                    'name' => 'Distribution',
-                    'issue' => 'official MySQL binaries.',
-                    'recommendation' => 'See <a href="./url.php?url=https%3A%2F%2F' .
-                        'example.com%2F" target="_blank" rel="noopener noreferrer">web</a>',
-                    'id' => 'Distribution'
-                ),
-                null,
-            ),
-        );
-    }
-}
diff --git a/#pma/test/classes/ConfigGeneratorTest.php b/#pma/test/classes/ConfigGeneratorTest.php
deleted file mode 100644
index 59c42fe9..00000000
--- a/#pma/test/classes/ConfigGeneratorTest.php
+++ /dev/null
@@ -1,205 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for methods under Config file generator
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test
- */
-use PMA\libraries\Config;
-use PMA\libraries\config\ConfigFile;
-use PMA\setup\lib\ConfigGenerator;
-
-require_once 'test/PMATestCase.php';
-
-/**
- * Tests for PMA\setup\lib\ConfigGenerator
- *
- * @package PhpMyAdmin-test
- */
-class ConfigGeneratorTest extends PMATestCase
-{
-
-    /**
-     * Test for ConfigGenerator::getConfigFile
-     *
-     * @return void
-     * @group medium
-     */
-    public function testGetConfigFile()
-    {
-        unset($_SESSION['eol']);
-
-        $GLOBALS['PMA_Config'] = new Config();
-
-        $GLOBALS['server'] = 0;
-        $cf = new ConfigFile();
-        $_SESSION['ConfigFile0'] = array('a', 'b', 'c');
-        $_SESSION['ConfigFile0']['Servers'] = array(
-            array(1, 2, 3)
-        );
-
-        $cf->setPersistKeys(array("1/", 2));
-
-        $result = ConfigGenerator::getConfigFile($cf);
-
-        $this->assertContains(
-            "<?php\n" .
-            "/*\n" .
-            " * Generated configuration file\n" .
-            " * Generated by: phpMyAdmin " .
-            $GLOBALS['PMA_Config']->get('PMA_VERSION') . " setup script\n",
-            $result
-        );
-
-        $this->assertContains(
-            "/* Servers configuration */\n" .
-            '$i = 0;' . "\n\n" .
-            "/* Server: localhost [0] */\n" .
-            '$i++;' . "\n" .
-            '$cfg[\'Servers\'][$i][\'0\'] = 1;' . "\n" .
-            '$cfg[\'Servers\'][$i][\'1\'] = 2;' . "\n" .
-            '$cfg[\'Servers\'][$i][\'2\'] = 3;' . "\n\n" .
-            "/* End of servers configuration */\n\n",
-            $result
-        );
-
-        $this->assertContains(
-            '?>',
-            $result
-        );
-    }
-
-    /**
-     * Test for ConfigGenerator::_getVarExport
-     *
-     * @return void
-     */
-    public function testGetVarExport()
-    {
-        $reflection = new \ReflectionClass('PMA\setup\lib\ConfigGenerator');
-        $method = $reflection->getMethod('_getVarExport');
-        $method->setAccessible(true);
-
-        $this->assertEquals(
-            '$cfg[\'var_name\'] = 1;' . "\n",
-            $method->invoke(null, 'var_name', 1, "\n")
-        );
-
-        $this->assertEquals(
-            '$cfg[\'var_name\'] = array (' .
-            "\n);\n",
-            $method->invoke(null, 'var_name', array(), "\n")
-        );
-
-        $this->assertEquals(
-            '$cfg[\'var_name\'] = array(1, 2, 3);' . "\n",
-            $method->invoke(
-                null,
-                'var_name',
-                array(1, 2, 3),
-                "\n"
-            )
-        );
-
-        $this->assertEquals(
-            '$cfg[\'var_name\'][\'1a\'] = \'foo\';' . "\n" .
-            '$cfg[\'var_name\'][\'b\'] = \'bar\';' . "\n",
-            $method->invoke(
-                null,
-                'var_name',
-                array(
-                    '1a' => 'foo',
-                    'b' => 'bar'
-                ),
-                "\n"
-            )
-        );
-    }
-
-    /**
-     * Test for ConfigGenerator::_isZeroBasedArray
-     *
-     * @return void
-     */
-    public function testIsZeroBasedArray()
-    {
-        $reflection = new \ReflectionClass('PMA\setup\lib\ConfigGenerator');
-        $method = $reflection->getMethod('_isZeroBasedArray');
-        $method->setAccessible(true);
-
-        $this->assertFalse(
-            $method->invoke(
-                null,
-                array(
-                    'a' => 1,
-                    'b' => 2
-                )
-            )
-        );
-
-        $this->assertFalse(
-            $method->invoke(
-                null,
-                array(
-                    0 => 1,
-                    1 => 2,
-                    3 => 3,
-                )
-            )
-        );
-
-        $this->assertTrue(
-            $method->invoke(
-                null,
-                array()
-            )
-        );
-
-        $this->assertTrue(
-            $method->invoke(
-                null,
-                array(1, 2, 3)
-            )
-        );
-    }
-
-    /**
-     * Test for ConfigGenerator::_exportZeroBasedArray
-     *
-     * @return void
-     */
-    public function testExportZeroBasedArray()
-    {
-        $reflection = new \ReflectionClass('PMA\setup\lib\ConfigGenerator');
-        $method = $reflection->getMethod('_exportZeroBasedArray');
-        $method->setAccessible(true);
-
-        $arr = array(1, 2, 3, 4);
-
-        $result = $method->invoke(null, $arr, "\n");
-
-        $this->assertEquals(
-            'array(1, 2, 3, 4)',
-            $result
-        );
-
-        $arr = array(1, 2, 3, 4, 7, 'foo');
-
-        $result = $method->invoke(null, $arr, "\n");
-
-        $this->assertEquals(
-            'array(' . "\n" .
-            '    1,' . "\n" .
-            '    2,' . "\n" .
-            '    3,' . "\n" .
-            '    4,' . "\n" .
-            '    7,' . "\n" .
-            '    \'foo\')',
-            $result
-        );
-    }
-}
diff --git a/#pma/test/classes/ConfigTest.php b/#pma/test/classes/ConfigTest.php
deleted file mode 100644
index 729efb57..00000000
--- a/#pma/test/classes/ConfigTest.php
+++ /dev/null
@@ -1,970 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Test for PMA\libraries\Config class
- *
- * @package PhpMyAdmin-test
- * @group current
- */
-
-/*
- * Include to test.
- */
-use PMA\libraries\Theme;
-
-require_once 'libraries/relation.lib.php';
-require_once 'libraries/url_generating.lib.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * Tests behaviour of PMA\libraries\Config class
- *
- * @package PhpMyAdmin-test
- */
-class ConfigTest extends PMATestCase
-{
-    /**
-     * Turn off backup globals
-     */
-    protected $backupGlobals = false;
-
-    /**
-     * @var PMA\libraries\Config
-     */
-    protected $object;
-
-    /**
-     * @var object to test file permission
-     */
-    protected $permTestObj;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     *
-     * @return void
-     */
-    protected function setUp()
-    {
-        $this->object = new PMA\libraries\Config;
-        $GLOBALS['server'] = 0;
-        $_SESSION['is_git_revision'] = true;
-        $GLOBALS['PMA_Config'] = new PMA\libraries\Config(CONFIG_FILE);
-        $GLOBALS['cfg']['ProxyUrl'] = '';
-
-        //for testing file permissions
-        $this->permTestObj = new PMA\libraries\Config("./config.sample.inc.php");
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     *
-     * @return void
-     */
-    protected function tearDown()
-    {
-        unset($this->object);
-        unset($this->permTestObj);
-    }
-
-    /**
-     * Test for CheckSystem
-     *
-     * @return void
-     * @group medium
-     */
-    public function testCheckSystem()
-    {
-        $this->object->checkSystem();
-
-        $this->assertNotNull($this->object->get('PMA_VERSION'));
-        $this->assertNotEmpty($this->object->get('PMA_THEME_VERSION'));
-        $this->assertNotEmpty($this->object->get('PMA_THEME_GENERATION'));
-    }
-
-    /**
-     * Test for GetFontsizeForm
-     *
-     * @return void
-     */
-    public function testGetFontsizeForm()
-    {
-        $this->assertContains(
-            '<form name="form_fontsize_selection" id="form_fontsize_selection"',
-            PMA\libraries\Config::getFontsizeForm()
-        );
-
-        $this->assertContains(
-            '<label for="select_fontsize">',
-            PMA\libraries\Config::getFontsizeForm()
-        );
-
-        //test getFontsizeOptions for "em" unit
-        $fontsize = $GLOBALS['PMA_Config']->get('fontsize');
-        $GLOBALS['PMA_Config']->set('fontsize', '');
-        $_COOKIE['pma_fontsize'] = "10em";
-        $this->assertContains(
-            '<option value="7em"',
-            PMA\libraries\Config::getFontsizeForm()
-        );
-        $this->assertContains(
-            '<option value="8em"',
-            PMA\libraries\Config::getFontsizeForm()
-        );
-
-        //test getFontsizeOptions for "pt" unit
-        $_COOKIE['pma_fontsize'] = "10pt";
-        $this->assertContains(
-            '<option value="2pt"',
-            PMA\libraries\Config::getFontsizeForm()
-        );
-        $this->assertContains(
-            '<option value="4pt"',
-            PMA\libraries\Config::getFontsizeForm()
-        );
-
-        //test getFontsizeOptions for "px" unit
-        $_COOKIE['pma_fontsize'] = "10px";
-        $this->assertContains(
-            '<option value="5px"',
-            PMA\libraries\Config::getFontsizeForm()
-        );
-        $this->assertContains(
-            '<option value="6px"',
-            PMA\libraries\Config::getFontsizeForm()
-        );
-
-        //test getFontsizeOptions for unknown unit
-        $_COOKIE['pma_fontsize'] = "10abc";
-        $this->assertContains(
-            '<option value="7abc"',
-            PMA\libraries\Config::getFontsizeForm()
-        );
-        $this->assertContains(
-            '<option value="8abc"',
-            PMA\libraries\Config::getFontsizeForm()
-        );
-        unset($_COOKIE['pma_fontsize']);
-        //rollback the fontsize setting
-        $GLOBALS['PMA_Config']->set('fontsize', $fontsize);
-    }
-
-    /**
-     * Test for checkOutputCompression
-     *
-     * @return void
-     */
-    public function testCheckOutputCompression()
-    {
-
-        $this->object->set('OBGzip', 'auto');
-
-        $this->object->set('PMA_USR_BROWSER_AGENT', 'IE');
-        $this->object->set('PMA_USR_BROWSER_VER', 6);
-        $this->object->checkOutputCompression();
-        $this->assertFalse($this->object->get("OBGzip"));
-
-        $this->object->set('OBGzip', 'auto');
-        $this->object->set('PMA_USR_BROWSER_AGENT', 'MOZILLA');
-        $this->object->set('PMA_USR_BROWSER_VER', 5);
-        $this->object->checkOutputCompression();
-        $this->assertTrue($this->object->get("OBGzip"));
-    }
-
-    /**
-     * Tests client parsing code.
-     *
-     * @param string $agent   User agent string
-     * @param string $os      Expected parsed OS (or null if none)
-     * @param string $browser Expected parsed browser (or null if none)
-     * @param string $version Expected browser version (or null if none)
-     *
-     * @return void
-     *
-     * @dataProvider userAgentProvider
-     */
-    public function testCheckClient($agent, $os, $browser = null, $version = null)
-    {
-        $_SERVER['HTTP_USER_AGENT'] = $agent;
-        $this->object->checkClient();
-        $this->assertEquals($os, $this->object->get('PMA_USR_OS'));
-        if ($os != null) {
-            $this->assertEquals(
-                $browser,
-                $this->object->get('PMA_USR_BROWSER_AGENT')
-            );
-        }
-        if ($version != null) {
-            $this->assertEquals(
-                $version,
-                $this->object->get('PMA_USR_BROWSER_VER')
-            );
-        }
-    }
-
-    /**
-     * user Agent Provider
-     *
-     * @return array
-     */
-    public function userAgentProvider()
-    {
-        return array(
-            array(
-                'Opera/9.80 (X11; Linux x86_64; U; pl) Presto/2.7.62 Version/11.00',
-                'Linux',
-                'OPERA',
-                '9.80',
-            ),
-            array(
-                'Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en-US) AppleWebKit/'
-                . '528.16 OmniWeb/622.8.0.112941',
-                'Mac',
-                'OMNIWEB',
-                '622',
-            ),
-            array(
-                'Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 5.1)',
-                'Win',
-                'IE',
-                '8.0',
-            ),
-            array(
-                'Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0)',
-                'Win',
-                'IE',
-                '9.0',
-            ),
-            array(
-                'Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.2; Win64; x64; '
-                . 'Trident/6.0)',
-                'Win',
-                'IE',
-                '10.0',
-            ),
-            array(
-                'Mozilla/5.0 (IE 11.0; Windows NT 6.3; Trident/7.0; .NET4.0E; '
-                . '.NET4.0C; rv:11.0) like Gecko',
-                'Win',
-                'IE',
-                '11.0',
-            ),
-            array(
-                'Mozilla/5.0 (Windows NT 6.3; WOW64; Trident/7.0; .NET4.0E; '
-                . '.NET4.0C; .NET CLR 3.5.30729; .NET CLR 2.0.50727; '
-                . '.NET CLR 3.0.30729; InfoPath.3; rv:11.0) like Gecko',
-                'Win',
-                'IE',
-                '11.0',
-            ),
-            array(
-                'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.22 (KHTML, '
-                . 'like Gecko) Chrome/25.0.1364.172 Safari/537.22',
-                'Win',
-                'CHROME',
-                '25.0.1364.172',
-            ),
-            array(
-                'Mozilla/5.0 (Unknown; U; Unix BSD/SYSV system; C -) '
-                . 'AppleWebKit/527+ (KHTML, like Gecko, Safari/419.3) Arora/0.10.2',
-                'Unix',
-                'SAFARI',
-                '5.0.419',
-            ),
-            array(
-                'Mozilla/5.0 (Windows; U; Win95; en-US; rv:1.9b) Gecko/20031208',
-                'Win',
-                'GECKO',
-                '1.9',
-            ),
-            array(
-                'Mozilla/5.0 (compatible; Konqueror/4.5; NetBSD 5.0.2; X11; '
-                . 'amd64; en_US) KHTML/4.5.4 (like Gecko)',
-                'Other',
-                'KONQUEROR',
-            ),
-            array(
-                'Mozilla/5.0 (X11; Linux x86_64; rv:5.0) Gecko/20100101 Firefox/5.0',
-                'Linux',
-                'FIREFOX',
-                '5.0',
-            ),
-            array(
-                'Mozilla/5.0 (X11; Linux x86_64; rv:12.0) Gecko/20100101 '
-                . 'Firefox/12.0',
-                'Linux',
-                'FIREFOX',
-                '12.0',
-            ),
-            /**
-             * @todo Is this version really expected?
-             */
-            array(
-                'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/535.4+ (KHTML, like G'
-                . 'ecko) Version/5.0 Safari/535.4+ SUSE/12.1 (3.2.1) Epiphany/3.2.1',
-                'Linux',
-                'SAFARI',
-                '5.0',
-            ),
-        );
-
-    }
-
-
-    /**
-     * test for CheckGd2
-     *
-     * @return void
-     */
-    public function testCheckGd2()
-    {
-        $prevIsGb2Val = $this->object->get('PMA_IS_GD2');
-
-        $this->object->set('GD2Available', 'yes');
-        $this->object->checkGd2();
-        $this->assertEquals(1, $this->object->get('PMA_IS_GD2'));
-
-        $this->object->set('GD2Available', 'no');
-        $this->object->checkGd2();
-        $this->assertEquals(0, $this->object->get('PMA_IS_GD2'));
-
-        $this->object->set('GD2Available', $prevIsGb2Val);
-
-        if (!@function_exists('imagecreatetruecolor')) {
-            $this->object->checkGd2();
-            $this->assertEquals(
-                0,
-                $this->object->get('PMA_IS_GD2'),
-                'imagecreatetruecolor does not exist, PMA_IS_GD2 should be 0'
-            );
-        }
-
-        if (@function_exists('gd_info')) {
-            $this->object->checkGd2();
-            $gd_nfo = gd_info();
-            if (mb_strstr($gd_nfo["GD Version"], '2.')) {
-                $this->assertEquals(
-                    1,
-                    $this->object->get('PMA_IS_GD2'),
-                    'GD Version >= 2, PMA_IS_GD2 should be 1'
-                );
-            } else {
-                $this->assertEquals(
-                    0,
-                    $this->object->get('PMA_IS_GD2'),
-                    'GD Version < 2, PMA_IS_GD2 should be 0'
-                );
-            }
-        }
-
-        /* Get GD version string from phpinfo output */
-        ob_start();
-        phpinfo(INFO_MODULES); /* Only modules */
-        $a = strip_tags(ob_get_contents());
-        ob_end_clean();
-
-        if (preg_match('@GD Version[[:space:]]*\(.*\)@', $a, $v)) {
-            if (mb_strstr($v, '2.')) {
-                $this->assertEquals(
-                    1,
-                    $this->object->get('PMA_IS_GD2'),
-                    'PMA_IS_GD2 should be 1'
-                );
-            } else {
-                $this->assertEquals(
-                    0,
-                    $this->object->get('PMA_IS_GD2'),
-                    'PMA_IS_GD2 should be 0'
-                );
-            }
-        }
-    }
-
-    /**
-     * Web server detection test
-     *
-     * @param string  $server Server identification
-     * @param boolean $iis    Whether server should be detected as IIS
-     *
-     * @return void
-     *
-     * @dataProvider serverNames
-     */
-    public function testCheckWebServer($server, $iis)
-    {
-        $_SERVER['SERVER_SOFTWARE'] = $server;
-        $this->object->checkWebServer();
-        $this->assertEquals($iis, $this->object->get('PMA_IS_IIS'));
-        unset($_SERVER['SERVER_SOFTWARE']);
-    }
-
-
-    /**
-     * return server names
-     *
-     * @return array
-     */
-    public function serverNames()
-    {
-        return array(
-            array(
-                "Microsoft-IIS 7.0",
-                1,
-            ),
-            array(
-                "Apache/2.2.17",
-                0,
-            ),
-        );
-    }
-
-
-    /**
-     * test for CheckWebServerOs
-     *
-     * @return void
-     */
-    public function testCheckWebServerOs()
-    {
-        $this->object->checkWebServerOs();
-
-        if (defined('PHP_OS')) {
-            if (stristr(PHP_OS, 'darwin')) {
-                $this->assertEquals(0, $this->object->get('PMA_IS_WINDOWS'));
-            } elseif (stristr(PHP_OS, 'win')) {
-                $this->assertEquals(1, $this->object->get('PMA_IS_WINDOWS'));
-            } elseif (stristr(PHP_OS, 'OS/2')) {
-                $this->assertEquals(1, $this->object->get('PMA_IS_WINDOWS'));
-            } elseif (stristr(PHP_OS, 'Linux')) {
-                $this->assertEquals(0, $this->object->get('PMA_IS_WINDOWS'));
-            } else {
-                $this->markTestIncomplete('Not known PHP_OS: ' . PHP_OS);
-            }
-        } else {
-            $this->assertEquals(0, $this->object->get('PMA_IS_WINDOWS'));
-
-            define('PHP_OS', 'Windows');
-            $this->assertEquals(1, $this->object->get('PMA_IS_WINDOWS'));
-        }
-    }
-
-    /**
-     * Tests loading of default values
-     *
-     * @return void
-     *
-     * @group large
-     */
-    public function testLoadDefaults()
-    {
-        $prevDefaultSource = $this->object->default_source;
-
-        $this->object->default_source = 'unexisted.file.php';
-        $this->assertFalse($this->object->loadDefaults());
-
-        $this->object->default_source = $prevDefaultSource;
-
-        include $this->object->default_source;
-
-        $loadedConf = $cfg;
-        unset($cfg);
-
-        $this->assertTrue($this->object->loadDefaults());
-
-        $this->assertEquals(
-            $this->object->default_source_mtime,
-            filemtime($prevDefaultSource)
-        );
-        $this->assertEquals(
-            $loadedConf['Servers'][1],
-            $this->object->default_server
-        );
-
-        unset($loadedConf['Servers']);
-
-        $this->assertEquals($loadedConf, $this->object->default);
-
-        $expectedSettings = array_replace_recursive(
-            $this->object->settings,
-            $loadedConf
-        );
-
-        $this->assertEquals(
-            $expectedSettings,
-            $this->object->settings,
-            'Settings loaded wrong'
-        );
-
-        $this->assertFalse($this->object->error_config_default_file);
-    }
-
-    /**
-     * test for CheckConfigSource
-     *
-     * @return void
-     */
-    public function testCheckConfigSource()
-    {
-        $this->object->setSource('unexisted.config.php');
-        $this->assertFalse($this->object->checkConfigSource());
-        $this->assertEquals(0, $this->object->source_mtime);
-
-        $this->object->setSource('libraries/config.default.php');
-
-        $this->assertNotEmpty($this->object->getSource());
-        $this->assertTrue($this->object->checkConfigSource());
-    }
-
-    /**
-     * Test getting and setting config values
-     *
-     * @return void
-     */
-    public function testGetAndSet()
-    {
-        $this->assertNull($this->object->get("unresisting_setting"));
-
-        $this->object->set('test_setting', 'test_value');
-
-        $this->assertEquals('test_value', $this->object->get('test_setting'));
-    }
-
-    /**
-     * Tests setting configuration source
-     *
-     * @return void
-     */
-    public function testGetSetSource()
-    {
-        echo $this->object->getSource();
-
-        $this->assertEmpty($this->object->getSource(), "Source is null by default");
-
-        $this->object->setSource("config.sample.inc.php");
-
-        $this->assertEquals(
-            "config.sample.inc.php",
-            $this->object->getSource(),
-            "Cant set new source"
-        );
-    }
-
-    /**
-     * test for CheckCollationConnection
-     *
-     * @return void
-     */
-    public function testCheckCollationConnection()
-    {
-        $_REQUEST['collation_connection'] = 'utf-8';
-        $this->object->checkCollationConnection();
-
-        $this->assertEquals(
-            $_REQUEST['collation_connection'],
-            $this->object->get('collation_connection')
-        );
-    }
-
-    /**
-     * test for IsHttp
-     *
-     * @return void
-     *
-     * @dataProvider httpsParams
-     */
-    public function testIsHttps($scheme, $https, $uri, $lb, $front, $proto, $port, $expected)
-    {
-        $_SERVER['HTTP_SCHEME'] = $scheme;
-        $_SERVER['HTTPS'] = $https;
-        $_SERVER['REQUEST_URI'] = $uri;
-        $_SERVER['HTTP_HTTPS_FROM_LB'] = $lb;
-        $_SERVER['HTTP_FRONT_END_HTTPS'] = $front;
-        $_SERVER['HTTP_X_FORWARDED_PROTO'] = $proto;
-        $_SERVER['SERVER_PORT'] = $port;
-
-        $this->object->set('is_https', null);
-        $this->assertEquals($expected, $this->object->isHttps());
-    }
-
-    /**
-     * Data provider for https detection
-     *
-     * @return array
-     */
-    public function httpsParams()
-    {
-        return array(
-            array('http', '', '', '', '', 'http', 80, false),
-            array('http', '', 'http://', '', '', 'http', 80, false),
-            array('http', '', '', '', '', 'http', 443, true),
-            array('http', '', '', '', '', 'https', 80, true),
-            array('http', '', '', '', 'on', 'http', 80, true),
-            array('http', '', '', 'on', '', 'http', 80, true),
-            array('http', '', 'https://', '', '', 'http', 80, true),
-            array('http', 'on', '', '', '', 'http', 80, true),
-            array('https', '', '', '', '', 'http', 80, true),
-        );
-    }
-
-    /**
-     * Test for backward compatibility globals
-     *
-     * @return void
-     *
-     * @depends testCheckSystem
-     * @depends testCheckWebServer
-     * @depends testLoadDefaults
-     *
-     * @group large
-     */
-    public function testEnableBc()
-    {
-        $this->object->enableBc();
-
-        $defines = array(
-            'PMA_VERSION',
-            'PMA_THEME_VERSION',
-            'PMA_THEME_GENERATION',
-            'PMA_IS_WINDOWS',
-            'PMA_IS_IIS',
-            'PMA_IS_GD2',
-            'PMA_USR_OS',
-            'PMA_USR_BROWSER_VER',
-            'PMA_USR_BROWSER_AGENT'
-            );
-
-        foreach ($defines as $define) {
-            $this->assertTrue(defined($define));
-            $this->assertEquals(constant($define), $this->object->get($define));
-        }
-    }
-
-    /**
-     * Test for getting root path
-     *
-     * @param string $request  The request URL used for phpMyAdmin
-     * @param string $absolute The absolute URL used for phpMyAdmin
-     * @param string $expected Expected root path
-     *
-     * @return void
-     *
-     * @dataProvider rootUris
-     */
-    public function testGetRootPath($request, $absolute, $expected)
-    {
-        $GLOBALS['PMA_PHP_SELF'] = $request;
-        $this->object->set('PmaAbsoluteUri', $absolute);
-        $this->assertEquals($expected, $this->object->getRootPath());
-    }
-
-    /**
-     * Data provider for testGetRootPath
-     *
-     * @return array data for testGetRootPath
-     */
-    public function rootUris()
-    {
-        return array(
-            array(
-                '',
-                '',
-                '/',
-            ),
-            array(
-                '/',
-                '',
-                '/',
-            ),
-            array(
-                '/index.php',
-                '',
-                '/',
-            ),
-            array(
-                '\\index.php',
-                '',
-                '/',
-            ),
-            array(
-                '\\',
-                '',
-                '/',
-            ),
-            array(
-                '\\path\\to\\index.php',
-                '',
-                '/path/to/',
-            ),
-            array(
-                '/foo/bar/phpmyadmin/index.php',
-                '',
-                '/foo/bar/phpmyadmin/',
-            ),
-            array(
-                '/foo/bar/phpmyadmin/',
-                '',
-                '/foo/bar/phpmyadmin/',
-            ),
-            array(
-                'https://example.net/baz/phpmyadmin/',
-                '',
-                '/baz/phpmyadmin/',
-            ),
-            array(
-                'http://example.net/baz/phpmyadmin/',
-                '',
-                '/baz/phpmyadmin/',
-            ),
-            array(
-                'http://example.net/phpmyadmin/',
-                '',
-                '/phpmyadmin/',
-            ),
-            array(
-                'http://example.net/',
-                '',
-                '/',
-            ),
-            array(
-                'http://example.net/',
-                'http://example.net/phpmyadmin/',
-                '/phpmyadmin/',
-            ),
-            array(
-                'http://example.net/',
-                'http://example.net/phpmyadmin',
-                '/phpmyadmin/',
-            ),
-            array(
-                'http://example.net/',
-                '/phpmyadmin2',
-                '/phpmyadmin2/',
-            ),
-            array(
-                'http://example.net/',
-                '/phpmyadmin3/',
-                '/phpmyadmin3/',
-            ),
-        );
-    }
-
-    /**
-     * Tests loading of config file
-     *
-     * @param string  $source File name of config to load
-     * @param boolean $result Expected result of loading
-     *
-     * @return void
-     *
-     * @dataProvider configPaths
-     */
-    public function testLoad($source, $result)
-    {
-        if ($result) {
-            $this->assertTrue($this->object->load($source));
-        } else {
-            $this->assertFalse($this->object->load($source));
-        }
-    }
-
-    /**
-     * return of config Paths
-     *
-     * @return array
-     */
-    public function configPaths()
-    {
-        return array(
-            array(
-                './test/test_data/config.inc.php',
-                true,
-            ),
-            array(
-                './test/test_data/config-nonexisting.inc.php',
-                false,
-            ),
-            array(
-                './libraries/config.default.php',
-                true,
-            ),
-        );
-    }
-
-    /**
-     * Test for loading user preferences
-     *
-     * @return void
-     * @todo Test actually preferences loading
-     */
-    public function testLoadUserPreferences()
-    {
-        $this->assertNull($this->object->loadUserPreferences());
-    }
-
-    /**
-     * Test for setting user config value
-     *
-     * @return void
-     */
-    public function testSetUserValue()
-    {
-        $this->object->setUserValue(null, 'lang', 'cs', 'en');
-        $this->object->setUserValue("TEST_COOKIE_USER_VAL", '', 'cfg_val_1');
-        $this->assertEquals(
-            $this->object->getUserValue("TEST_COOKIE_USER_VAL", 'fail'),
-            'cfg_val_1'
-        );
-    }
-
-    /**
-     * Test for getting user config value
-     *
-     * @return void
-     */
-    public function testGetUserValue()
-    {
-        $this->assertEquals($this->object->getUserValue('test_val', 'val'), 'val');
-    }
-
-    /**
-     * Should test getting unique value for theme
-     *
-     * @return void
-     */
-    public function testGetThemeUniqueValue()
-    {
-
-        $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
-
-        $partial_sum = (
-            PHPUnit_Framework_Assert::readAttribute($this->object, 'source_mtime') +
-            PHPUnit_Framework_Assert::readAttribute(
-                $this->object,
-                'default_source_mtime'
-            ) +
-            $this->object->get('user_preferences_mtime') +
-            $_SESSION['PMA_Theme']->mtime_info +
-            $_SESSION['PMA_Theme']->filesize_info
-        );
-
-        $this->object->set('fontsize', 10);
-        $this->assertEquals(10 + $partial_sum, $this->object->getThemeUniqueValue());
-        $this->object->set('fontsize', null);
-
-        $_COOKIE['pma_fontsize'] = 20;
-        $this->assertEquals(20 + $partial_sum, $this->object->getThemeUniqueValue());
-        unset($_COOKIE['pma_fontsize']);
-
-        $this->assertEquals($partial_sum, $this->object->getThemeUniqueValue());
-
-    }
-
-    /**
-     * Should test checking of config permissions
-     *
-     * @return void
-     */
-    public function testCheckPermissions()
-    {
-        //load file permissions for the current permissions file
-        $perms = @fileperms($this->object->getSource());
-        //testing for permissions for no configuration file
-        $this->assertFalse(!($perms === false) && ($perms & 2));
-
-        //load file permissions for the current permissions file
-        $perms = @fileperms($this->permTestObj->getSource());
-        //testing for permissions
-        $this->assertFalse(!($perms === false) && ($perms & 2));
-
-        //if the above assertion is false then applying further assertions
-        if (!($perms === false) && ($perms & 2)) {
-            $this->assertFalse($this->permTestObj->get('PMA_IS_WINDOWS') == 0);
-        }
-    }
-
-
-    /**
-     * Test for setting cookies
-     *
-     * @return void
-     */
-    public function testSetCookie()
-    {
-        $this->assertFalse(
-            $this->object->setCookie(
-                'TEST_DEF_COOKIE',
-                'test_def_123',
-                'test_def_123'
-            )
-        );
-
-        $this->assertTrue(
-            $this->object->setCookie(
-                'TEST_CONFIG_COOKIE',
-                'test_val_123',
-                null,
-                3600
-            )
-        );
-
-        $this->assertTrue(
-            $this->object->setCookie(
-                'TEST_CONFIG_COOKIE',
-                '',
-                'default_val'
-            )
-        );
-
-        $_COOKIE['TEST_MANUAL_COOKIE'] = 'some_test_val';
-        $this->assertTrue(
-            $this->object->setCookie(
-                'TEST_MANUAL_COOKIE',
-                'other',
-                'other'
-            )
-        );
-
-    }
-
-    /**
-     * Test for isGitRevision
-     *
-     * @return void
-     */
-    public function testIsGitRevision()
-    {
-        $this->assertTrue(
-            $this->object->isGitRevision()
-        );
-    }
-
-    /**
-     * Test for Check HTTP
-     *
-     * @group medium
-     *
-     * @return void
-     */
-    public function testCheckHTTP()
-    {
-        if (! function_exists('curl_init')) {
-            $this->markTestSkipped('Missing curl extension!');
-        }
-        $this->assertTrue(
-            $this->object->checkHTTP("https://www.phpmyadmin.net/test/data")
-        );
-        $this->assertContains(
-            "TEST DATA",
-            $this->object->checkHTTP("https://www.phpmyadmin.net/test/data", true)
-        );
-        $this->assertFalse(
-            $this->object->checkHTTP("https://www.phpmyadmin.net/test/nothing")
-        );
-        // Use rate limit API as it's not subject to rate limiting
-        $this->assertContains(
-            '"resources"',
-            $this->object->checkHTTP("https://api.github.com/rate_limit", true)
-        );
-    }
-}
diff --git a/#pma/test/classes/DatabaseInterfaceTest.php b/#pma/test/classes/DatabaseInterfaceTest.php
deleted file mode 100644
index 413c5bbb..00000000
--- a/#pma/test/classes/DatabaseInterfaceTest.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Test for faked database access
- *
- * @package PhpMyAdmin-test
- */
-
-require_once 'test/PMATestCase.php';
-
-/**
- * Tests basic functionality of dummy dbi driver
- *
- * @package PhpMyAdmin-test
- */
-class DatabaseInterfaceTest extends PMATestCase
-{
-
-    private $_dbi;
-
-    /**
-     * Configures test parameters.
-     *
-     * @return void
-     */
-    function setup()
-    {
-        //$extension = new PMA\libraries\dbi\DBIDummy();
-        $extension = $this->getMockBuilder('PMA\libraries\dbi\DBIDummy')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $extension->expects($this->any())
-            ->method('realQuery')
-            ->will($this->returnValue(true));
-
-        $meta1 = new FieldMeta();
-        $meta1->table = "meta1_table";
-        $meta1->name = "meta1_name";
-
-        $meta2 = new FieldMeta();
-        $meta2->table = "meta2_table";
-        $meta2->name = "meta2_name";
-
-        $extension->expects($this->any())
-            ->method('getFieldsMeta')
-            ->will(
-                $this->returnValue(
-                    array(
-                        $meta1, $meta2
-                    )
-                )
-            );
-
-        $this->_dbi = new PMA\libraries\DatabaseInterface($extension);
-    }
-
-    /**
-     * Tests for DBI::getColumnMapFromSql() method.
-     *
-     * @return void
-     * @test
-     */
-    public function testPMAGetColumnMap()
-    {
-        $sql_query = "PMA_sql_query";
-        $view_columns = array(
-            "view_columns1", "view_columns2"
-        );
-
-        $column_map = $this->_dbi->getColumnMapFromSql(
-            $sql_query, $view_columns
-        );
-
-        $this->assertEquals(
-            array(
-                'table_name' => 'meta1_table',
-                'refering_column' => 'meta1_name',
-                'real_column' => 'view_columns1'
-            ),
-            $column_map[0]
-        );
-        $this->assertEquals(
-            array(
-                'table_name' => 'meta2_table',
-                'refering_column' => 'meta2_name',
-                'real_column' => 'view_columns2'
-            ),
-            $column_map[1]
-        );
-    }
-
-    /**
-     * Tests for DBI::getSystemDatabase() method.
-     *
-     * @return void
-     * @test
-     */
-    public function testGetSystemDatabase()
-    {
-        $sd = $this->_dbi->getSystemDatabase();
-        $this->assertInstanceOf('PMA\libraries\SystemDatabase', $sd);
-    }
-}
-
-/**
- * class for Table Field Meta
- *
- * @package PhpMyAdmin-test
- */
-class FieldMeta
-{
-    public $table;
-    public $name;
-}
diff --git a/#pma/test/classes/DbQbeTest.php b/#pma/test/classes/DbQbeTest.php
deleted file mode 100644
index e223e531..00000000
--- a/#pma/test/classes/DbQbeTest.php
+++ /dev/null
@@ -1,543 +0,0 @@
-<?php
-/**
- * Tests for DbQbe.php
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-
-require_once 'libraries/database_interface.inc.php';
-require_once 'libraries/relation.lib.php';
-require_once 'test/PMATestCase.php';
-
-use PMA\libraries\DbQbe;
-
-/**
- * Tests for PMA\libraries\DbQbe class
- *
- *  @package PhpMyAdmin-test
- */
-class DbQbeTest extends PMATestCase
-{
-    /**
-     * @access protected
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function setUp()
-    {
-        $this->object = new DbQbe('pma_test');
-        $GLOBALS['server'] = 0;
-        $GLOBALS['db'] = 'pma_test';
-        //mock DBI
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $create_table = 'CREATE TABLE `table1` ('
-            . '`id` int(11) NOT NULL,'
-            . '`value` int(11) NOT NULL,'
-            . 'PRIMARY KEY (`id`,`value`),'
-            . 'KEY `value` (`value`)'
-            . ') ENGINE=InnoDB DEFAULT CHARSET=latin1';
-
-        $dbi->expects($this->any())
-            ->method('fetchValue')
-            ->with('SHOW CREATE TABLE `pma_test`.`table1`', 0, 1)
-            ->will($this->returnValue($create_table));
-
-        $dbi->expects($this->any())
-            ->method('getTableIndexes')
-            ->will($this->returnValue(array()));
-
-        $GLOBALS['dbi'] = $dbi;
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Call protected functions by setting visibility to public.
-     *
-     * @param string $name   method name
-     * @param array  $params parameters for the invocation
-     *
-     * @return the output from the protected method.
-     */
-    private function _callProtectedFunction($name, $params)
-    {
-        $class = new ReflectionClass('PMA\libraries\DbQbe');
-        $method = $class->getMethod($name);
-        $method->setAccessible(true);
-        return $method->invokeArgs($this->object, $params);
-    }
-
-    /**
-     * Test for _getSortSelectCell
-     *
-     * @return void
-     */
-    public function testGetSortSelectCell()
-    {
-        $this->assertEquals(
-            '<td class="center"><select style="width: 12ex" name="criteriaSort[1]" '
-            . 'size="1"><option value="">&nbsp;</option><option value="ASC">'
-            . 'Ascending</option><option value="DESC">Descending</option>'
-            . '</select></td>',
-            $this->_callProtectedFunction(
-                '_getSortSelectCell',
-                array(1)
-            )
-        );
-    }
-
-    /**
-     * Test for _getSortRow
-     *
-     * @return void
-     */
-    public function testGetSortRow()
-    {
-        $this->assertEquals(
-            '<tr class="even noclick"><th>Sort:</th><td class="center">'
-            . '<select style="width: 12ex" name="criteriaSort[0]" size="1">'
-            . '<option value="">&nbsp;</option><option value="ASC">Ascending'
-            . '</option><option value="DESC">Descending</option></select></td>'
-            . '<td class="center"><select style="width: 12ex" '
-            . 'name="criteriaSort[1]" size="1"><option value="">&nbsp;</option>'
-            . '<option value="ASC">Ascending</option><option value="DESC">'
-            . 'Descending</option></select></td><td class="center">'
-            . '<select style="width: 12ex" name="criteriaSort[2]" size="1">'
-            . '<option value="">&nbsp;</option><option value="ASC">Ascending'
-            . '</option><option value="DESC">Descending</option></select></td></tr>',
-            $this->_callProtectedFunction(
-                '_getSortRow',
-                array()
-            )
-        );
-    }
-
-    /**
-     * Test for _getShowRow
-     *
-     * @return void
-     */
-    public function testGetShowRow()
-    {
-        $this->assertEquals(
-            '<tr class="odd noclick"><th>Show:</th><td class="center"><input type'
-            . '="checkbox" name="criteriaShow[0]" /></td><td class="center">'
-            . '<input type="checkbox" name="criteriaShow[1]" /></td><td '
-            . 'class="center"><input type="checkbox" name="criteriaShow[2]" />'
-            . '</td></tr>',
-            $this->_callProtectedFunction(
-                '_getShowRow',
-                array()
-            )
-        );
-    }
-
-    /**
-     * Test for _getCriteriaInputboxRow
-     *
-     * @return void
-     */
-    public function testGetCriteriaInputboxRow()
-    {
-        $this->assertEquals(
-            '<tr class="even noclick"><th>Criteria:</th><td class="center">'
-            . '<input type="hidden" name="prev_criteria[0]" value="" />'
-            . '<input type="text" name="criteria[0]" value="" class="textfield" '
-            . 'style="width: 12ex" size="20" /></td><td class="center">'
-            . '<input type="hidden" name="prev_criteria[1]" value="" />'
-            . '<input type="text" name="criteria[1]" value="" class="textfield" '
-            . 'style="width: 12ex" size="20" /></td><td class="center">'
-            . '<input type="hidden" name="prev_criteria[2]" value="" />'
-            . '<input type="text" name="criteria[2]" value="" class="textfield" '
-            . 'style="width: 12ex" size="20" /></td></tr>',
-            $this->_callProtectedFunction(
-                '_getCriteriaInputboxRow',
-                array()
-            )
-        );
-    }
-
-    /**
-     * Test for _getFootersOptions
-     *
-     * @return void
-     */
-    public function testGetFootersOptions()
-    {
-        $this->assertEquals(
-            '<div class="floatleft">Add/Delete criteria rows:<select size="1" '
-            . 'name="criteriaRowAdd"><option value="-3">-3</option><option '
-            . 'value="-2">-2</option><option value="-1">-1</option><option '
-            . 'value="0" selected="selected">0</option><option value="1">1'
-            . '</option><option value="2">2</option><option value="3">3</option>'
-            . '</select></div>',
-            $this->_callProtectedFunction(
-                '_getFootersOptions',
-                array('row')
-            )
-        );
-    }
-
-    /**
-     * Test for _getTableFooters
-     *
-     * @return void
-     */
-    public function testGetTableFooters()
-    {
-        $this->assertEquals(
-            '<fieldset class="tblFooters"><div class="floatleft">Add/Delete criteria'
-            . ' rows:<select size="1" name="criteriaRowAdd"><option value="-3">-3'
-            . '</option><option value="-2">-2</option><option value="-1">-1</option>'
-            . '<option value="0" selected="selected">0</option><option value="1">1'
-            . '</option><option value="2">2</option><option value="3">3</option>'
-            . '</select></div><div class="floatleft">Add/Delete columns:<select '
-            . 'size="1" name="criteriaColumnAdd"><option value="-3">-3</option>'
-            . '<option value="-2">-2</option><option value="-1">-1</option>'
-            . '<option value="0" selected="selected">0</option><option value="1">1'
-            . '</option><option value="2">2</option><option value="3">3</option>'
-            . '</select></div><div class="floatleft"><input type="submit" '
-            . 'name="modify"value="Update Query" /></div></fieldset>',
-            $this->_callProtectedFunction(
-                '_getTableFooters',
-                array()
-            )
-        );
-    }
-
-    /**
-     * Test for _getAndOrColCell
-     *
-     * @return void
-     */
-    public function testGetAndOrColCell()
-    {
-        $this->assertEquals(
-            '<td class="center"><strong>Or:</strong><input type="radio" '
-            . 'name="criteriaAndOrColumn[1]" value="or" />&nbsp;&nbsp;<strong>And:'
-            . '</strong><input type="radio" name="criteriaAndOrColumn[1]" value='
-            . '"and" /><br />Ins<input type="checkbox" name="criteriaColumnInsert'
-            . '[1]" />&nbsp;&nbsp;Del<input type="checkbox" '
-            . 'name="criteriaColumnDelete[1]" /></td>',
-            $this->_callProtectedFunction(
-                '_getAndOrColCell',
-                array(1)
-            )
-        );
-    }
-
-    /**
-     * Test for _getModifyColumnsRow
-     *
-     * @return void
-     */
-    public function testGetModifyColumnsRow()
-    {
-        $this->assertEquals(
-            '<tr class="even noclick"><th>Modify:</th><td class="center"><strong>'
-            . 'Or:</strong><input type="radio" name="criteriaAndOrColumn[0]" value'
-            . '="or" />&nbsp;&nbsp;<strong>And:</strong><input type="radio" name='
-            . '"criteriaAndOrColumn[0]" value="and" checked="checked" /><br />Ins'
-            . '<input type="checkbox" name="criteriaColumnInsert[0]" />&nbsp;&nbsp;'
-            . 'Del<input type="checkbox" name="criteriaColumnDelete[0]" /></td><td '
-            . 'class="center"><strong>Or:</strong><input type="radio" name="'
-            . 'criteriaAndOrColumn[1]" value="or" />&nbsp;&nbsp;<strong>And:'
-            . '</strong><input type="radio" name="criteriaAndOrColumn[1]" value='
-            . '"and" checked="checked" /><br />Ins<input type="checkbox" name='
-            . '"criteriaColumnInsert[1]" />&nbsp;&nbsp;Del<input type="checkbox" '
-            . 'name="criteriaColumnDelete[1]" /></td><td class="center"><br />Ins'
-            . '<input type="checkbox" name="criteriaColumnInsert[2]" />&nbsp;&nbsp;'
-            . 'Del<input type="checkbox" name="criteriaColumnDelete[2]" /></td>'
-            . '</tr>',
-            $this->_callProtectedFunction(
-                '_getModifyColumnsRow',
-                array()
-            )
-        );
-    }
-
-    /**
-     * Test for _getInsDelAndOrCell
-     *
-     * @return void
-     */
-    public function testGetInsDelAndOrCell()
-    {
-        $GLOBALS['cell_align_right'] = 'cellAlign';
-        $this->assertEquals(
-            '<td class="cellAlign nowrap"><!-- Row controls --><table class="nospac'
-            . 'ing nopadding"><tr><td class="cellAlign nowrap"><small>Ins:</small>'
-            . '<input type="checkbox" name="criteriaRowInsert[3]" /></td><td '
-            . 'class="cellAlign"><strong>And:</strong></td><td><input type="radio" '
-            . 'name="criteriaAndOrRow[3]" value="and" /></td></tr><tr><td class="'
-            . 'cellAlign nowrap"><small>Del:</small><input type="checkbox" '
-            . 'name="criteriaRowDelete[3]" /></td><td class="cellAlign"><strong>'
-            . 'Or:</strong></td><td><input type="radio" name="criteriaAndOrRow[3]" '
-            . 'value="or" checked="checked" /></td></tr></table></td>',
-            $this->_callProtectedFunction(
-                '_getInsDelAndOrCell',
-                array(3, array('and' => '', 'or' => ' checked="checked"'))
-            )
-        );
-    }
-
-    /**
-     * Test for _getInputboxRow
-     *
-     * @return void
-     */
-    public function testGetInputboxRow()
-    {
-        $this->assertEquals(
-            '<td class="center"><input type="text" name="Or2[0]" value="" class='
-            . '"textfield" style="width: 12ex" size="20" /></td><td class="center">'
-            . '<input type="text" name="Or2[1]" value="" class="textfield" '
-            . 'style="width: 12ex" size="20" /></td><td class="center"><input '
-            . 'type="text" name="Or2[2]" value="" class="textfield" style="width: '
-            . '12ex" size="20" /></td>',
-            $this->_callProtectedFunction(
-                '_getInputboxRow',
-                array(2)
-            )
-        );
-    }
-
-    /**
-     * Test for _getInsDelAndOrCriteriaRows
-     *
-     * @return void
-     */
-    public function testGetInsDelAndOrCriteriaRows()
-    {
-        $GLOBALS['cell_align_right'] = 'cellAlign';
-        $this->assertEquals(
-            '<tr class="odd noclick"><td class="cellAlign nowrap"><!-- Row controls'
-            . ' --><table class="nospacing nopadding"><tr><td class="cellAlign '
-            . 'nowrap"><small>Ins:</small><input type="checkbox" name="'
-            . 'criteriaRowInsert[0]" /></td><td class="cellAlign"><strong>And:'
-            . '</strong></td><td><input type="radio" name="criteriaAndOrRow[0]" '
-            . 'value="and" /></td></tr><tr><td class="cellAlign nowrap"><small>Del:'
-            . '</small><input type="checkbox" name="criteriaRowDelete[0]" /></td>'
-            . '<td class="cellAlign"><strong>Or:</strong></td><td><input type='
-            . '"radio" name="criteriaAndOrRow[0]" value="or" checked="checked" />'
-            . '</td></tr></table></td><td class="center"><input type="text" '
-            . 'name="Or0[0]" value="" class="textfield" style="width: 12ex" '
-            . 'size="20" /></td><td class="center"><input type="text" name="Or0[1]" '
-            . 'value="" class="textfield" style="width: 12ex" size="20" /></td><td '
-            . 'class="center"><input type="text" name="Or0[2]" value="" class='
-            . '"textfield" style="width: 12ex" size="20" /></td></tr>',
-            $this->_callProtectedFunction(
-                '_getInsDelAndOrCriteriaRows',
-                array(2,3)
-            )
-        );
-    }
-
-    /**
-     * Test for _getSelectClause
-     *
-     * @return void
-     */
-    public function testGetSelectClause()
-    {
-        $this->assertEquals(
-            '',
-            $this->_callProtectedFunction(
-                '_getSelectClause',
-                array()
-            )
-        );
-    }
-
-    /**
-     * Test for _getWhereClause
-     *
-     * @return void
-     */
-    public function testGetWhereClause()
-    {
-        $this->assertEquals(
-            '',
-            $this->_callProtectedFunction(
-                '_getWhereClause',
-                array()
-            )
-        );
-    }
-
-    /**
-     * Test for _getOrderByClause
-     *
-     * @return void
-     */
-    public function testGetOrderByClause()
-    {
-        $this->assertEquals(
-            '',
-            $this->_callProtectedFunction(
-                '_getOrderByClause',
-                array()
-            )
-        );
-    }
-
-    /**
-     * Test for _getIndexes
-     *
-     * @return void
-     */
-    public function testGetIndexes()
-    {
-        $this->assertEquals(
-            array(
-                'unique' => array(),
-                'index' => array()
-            ),
-            $this->_callProtectedFunction(
-                '_getIndexes',
-                array(
-                    array('`table1`','table2'),
-                    array('column1', 'column2', 'column3'),
-                    array('column2')
-                )
-            )
-        );
-    }
-
-    /**
-     * Test for _getLeftJoinColumnCandidates
-     *
-     * @return void
-     */
-    public function testGetLeftJoinColumnCandidates()
-    {
-        $this->assertEquals(
-            array(
-                0 => 'column2'
-            ),
-            $this->_callProtectedFunction(
-                '_getLeftJoinColumnCandidates',
-                array(
-                    array('`table1`','table2'),
-                    array('column1', 'column2', 'column3'),
-                    array('column2')
-                )
-            )
-        );
-    }
-
-    /**
-     * Test for _getMasterTable
-     *
-     * @return void
-     */
-    public function testGetMasterTable()
-    {
-        $this->assertEquals(
-            0,
-            $this->_callProtectedFunction(
-                '_getMasterTable',
-                array(
-                    array('table1','table2'),
-                    array('column1', 'column2', 'column3'),
-                    array('column2'),
-                    array('qbe_test')
-                )
-            )
-        );
-    }
-
-    /**
-     * Test for _getWhereClauseTablesAndColumns
-     *
-     * @return void
-     */
-    public function testGetWhereClauseTablesAndColumns()
-    {
-        $_POST['criteriaColumn'] = array(
-            'table1.id',
-            'table1.value',
-            'table1.name',
-            'table1.deleted'
-        );
-        $this->assertEquals(
-            array(
-                'where_clause_tables' => array(),
-                'where_clause_columns' => array()
-            ),
-            $this->_callProtectedFunction(
-                '_getWhereClauseTablesAndColumns',
-                array()
-            )
-        );
-    }
-
-    /**
-     * Test for _getFromClause
-     *
-     * @return void
-     */
-    public function testGetFromClause()
-    {
-        $_POST['criteriaColumn'] = array(
-            'table1.id',
-            'table1.value',
-            'table1.name',
-            'table1.deleted'
-        );
-        $this->assertEquals(
-            '`table1`',
-            $this->_callProtectedFunction(
-                '_getFromClause',
-                array(array('`table1`.`id`'))
-            )
-        );
-    }
-
-    /**
-     * Test for _getSQLQuery
-     *
-     * @return void
-     */
-    public function testGetSQLQuery()
-    {
-        $_POST['criteriaColumn'] = array(
-            'table1.id',
-            'table1.value',
-            'table1.name',
-            'table1.deleted'
-        );
-        $this->assertEquals(
-            'FROM `table1`
-',
-            $this->_callProtectedFunction(
-                '_getSQLQuery',
-                array(array('`table1`.`id`'))
-            )
-        );
-    }
-}
diff --git a/#pma/test/classes/DbSearchTest.php b/#pma/test/classes/DbSearchTest.php
deleted file mode 100644
index 5492d032..00000000
--- a/#pma/test/classes/DbSearchTest.php
+++ /dev/null
@@ -1,271 +0,0 @@
-<?php
-/**
- * Tests for DbSearch.php
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-
-require_once 'libraries/url_generating.lib.php';
-require_once 'libraries/js_escape.lib.php';
-require_once 'libraries/database_interface.inc.php';
-require_once 'test/PMATestCase.php';
-
-use PMA\libraries\DbSearch;
-use PMA\libraries\Theme;
-
-/**
- * Tests for database search.
- *
- * @package PhpMyAdmin-test
- */
-class DbSearchTest extends PMATestCase
-{
-    /**
-     * @access protected
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function setUp()
-    {
-        $this->object = new DbSearch('pma_test');
-        $GLOBALS['server'] = 0;
-        $GLOBALS['db'] = 'pma';
-        $GLOBALS['collation_connection'] = 'utf-8';
-
-        //mock DBI
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->any())
-            ->method('getColumns')
-            ->with('pma', 'table1')
-            ->will($this->returnValue(array()));
-
-        $dbi->expects($this->any())
-            ->method('escapeString')
-            ->will($this->returnArgument(0));
-
-        $GLOBALS['dbi'] = $dbi;
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Call protected functions by setting visibility to public.
-     *
-     * @param string $name   method name
-     * @param array  $params parameters for the invocation
-     *
-     * @return the output from the protected method.
-     */
-    private function _callProtectedFunction($name, $params)
-    {
-        $class = new ReflectionClass('PMA\libraries\DbSearch');
-        $method = $class->getMethod($name);
-        $method->setAccessible(true);
-        return $method->invokeArgs($this->object, $params);
-    }
-
-    /**
-     * Test for _getSearchSqls
-     *
-     * @return void
-     */
-    public function testGetSearchSqls()
-    {
-        $this->assertEquals(
-            array (
-                'select_columns' => 'SELECT *  FROM `pma`.`table1` WHERE FALSE',
-                'select_count' => 'SELECT COUNT(*) AS `count` FROM `pma`.`table1` ' .
-                    'WHERE FALSE',
-                'delete' => 'DELETE FROM `pma`.`table1` WHERE FALSE'
-            ),
-            $this->_callProtectedFunction(
-                '_getSearchSqls',
-                array('table1')
-            )
-        );
-    }
-
-    /**
-     * Test for getSearchResults
-     *
-     * @return void
-     */
-    public function testGetSearchResults()
-    {
-        $this->assertEquals(
-            '<br /><table class="data"><caption class="tblHeaders">Search results '
-            . 'for "<i></i>" :</caption></table>',
-            $this->object->getSearchResults()
-        );
-    }
-
-    /**
-     * Test for _getResultsRow
-     *
-     * @param string $each_table    Tables on which search is to be performed
-     * @param array  $newsearchsqls Contains SQL queries
-     * @param bool   $odd_row       For displaying contrasting table rows
-     * @param string $output        Expected HTML output
-     *
-     * @return void
-     *
-     * @dataProvider providerForTestGetResultsRow
-     */
-    public function testGetResultsRow(
-        $each_table, $newsearchsqls, $odd_row, $output
-    ) {
-
-        $this->assertEquals(
-            $output,
-            $this->_callProtectedFunction(
-                '_getResultsRow',
-                array($each_table, $newsearchsqls, $odd_row, 2)
-            )
-        );
-    }
-
-    /**
-     * Data provider for testGetResultRow
-     *
-     * @return array provider for testGetResultsRow
-     */
-    public function providerForTestGetResultsRow()
-    {
-        return array(
-            array(
-                'table1',
-                array(
-                    'SELECT *  FROM `pma`.`table1` WHERE FALSE',
-                    'SELECT COUNT(*) AS `count` FROM `pma`.`table1` WHERE FALSE',
-                    'select_count' => 2,
-                    'select_columns' => 'column1',
-                    'delete' => 'column2'
-                ),
-                true,
-                '<tr class="noclick odd"><td>2 matches in <strong>table1</strong>'
-                . '</td><td><a name="browse_search"  class="ajax browse_results" '
-                . 'href="sql.php?db=pma&amp;table'
-                . '=table1&amp;goto=db_sql.php&amp;pos=0&amp;is_js_confirmed=0&amp;'
-                . 'server=0&amp;lang=en&amp;'
-                . 'collation_connection=utf-8&amp;token=token" '
-                . 'data-browse-sql="column1" data-table-name="table1" '
-                . '>Browse</a></td><td>'
-                . '<a name="delete_search" class="ajax delete_results" href'
-                . '="sql.php?db=pma&amp;table=table1&amp;goto=db_sql.php&amp;pos=0'
-                . '&amp;is_js_confirmed=0&amp;server=0&amp;'
-                . 'lang=en&amp;collation_connection=utf-8&amp;token=token" '
-                . 'data-delete-sql="column2" '
-                . 'data-table-name="table1" '
-                . '>Delete</a></td></tr>'
-            )
-        );
-    }
-
-    /**
-     * Test for getSelectionForm
-     *
-     * @return void
-     */
-    public function testGetSelectionForm()
-    {
-        $_SESSION['PMA_Theme'] = new Theme();
-        $GLOBALS['pmaThemeImage'] = 'themes/dot.gif';
-        $this->assertEquals(
-            '<a id="db_search"></a><form id="db_search_form" class="ajax lock-page" '
-            . 'method="post" action="db_search.php" name="db_search">'
-            . '<input type="hidden" name="db" value="pma" />'
-            . '<input type="hidden" name="lang" value="en" />'
-            . '<input type="hidden" name="collation_connection" value="utf-8" />'
-            . '<input type="hidden" name="token" value="token" />'
-            . '<fieldset><legend>Search in database</legend><table class='
-            . '"formlayout"><tr><td>Words or values to search for (wildcard: "%"):'
-            . '</td><td><input type="text" name="criteriaSearchString" size="60" '
-            . 'value="" /></td></tr><tr><td class="right vtop">Find:</td><td><input '
-            . 'type="radio" name="criteriaSearchType" id="criteriaSearchType_1" '
-            . 'value="1" checked="checked" />' . "\n"
-            . '<label for="criteriaSearchType_1">at least one of the words<span '
-            . 'class="pma_hint"><img src="themes/dot.gifb_help.png" title="" alt="" '
-            . '/><span class="hide">Words are separated by a space character (" ").'
-            . '</span></span></label><br />' . "\n"
-            . '<input type="radio" name="criteriaSearchType" id="criteriaSearchType'
-            . '_2" value="2" />' . "\n"
-            . '<label for="criteriaSearchType_2">all words<span class="pma_hint">'
-            . '<img src="themes/dot.gifb_help.png" title="" alt="" /><span class'
-            . '="hide">Words are separated by a space character (" ").</span></span>'
-            . '</label><br />' . "\n"
-            . '<input type="radio" name="criteriaSearchType" id="criteriaSearchType'
-            . '_3" value="3" />' . "\n"
-            . '<label for="criteriaSearchType_3">the exact phrase</label><br />'
-            . "\n" . '<input type="radio" name="criteriaSearchType" id="criteria'
-            . 'SearchType_4" value="4" />' . "\n"
-            . '<label for="criteriaSearchType_4">as regular expression <a href='
-            . '"./url.php?url=https%3A%2F%2Fdev.mysql.com%2Fdoc%2Frefman%2F5.7%2Fen'
-            . '%2Fregexp.html" target='
-            . '"mysql_doc"><img src="themes/dot.gifb_help.png" title="Documentation"'
-            . ' alt="Documentation" /></a></label><br />' . "\n"
-            . '</td></tr><tr><td class="right vtop">Inside tables:</td>'
-            . '<td rowspan="2"><select name="criteriaTables[]" size="6" '
-            . 'multiple="multiple"><option value="table1">table1</option>'
-            . '<option value="table2">table2</option></select></td></tr><tr>'
-            . '<td class="right vbottom"><a href="#" onclick="setSelectOptions'
-            . '(\'db_search\', \'criteriaTables[]\', true); return false;">Select '
-            . 'all</a> &nbsp;/&nbsp;<a href="#" onclick="setSelectOptions'
-            . '(\'db_search\', \'criteriaTables[]\', false); return false;">Unselect'
-            . ' all</a></td></tr><tr><td class="right">Inside column:</td><td>'
-            . '<input type="text" name="criteriaColumnName" size="60"value="" />'
-            . '</td></tr></table></fieldset><fieldset class="tblFooters"><input '
-            . 'type="submit" name="submit_search" value="Go" id="buttonGo" />'
-            . '</fieldset></form><div id="togglesearchformdiv">'
-            . '<a id="togglesearchformlink"></a></div>',
-            $this->object->getSelectionForm()
-        );
-    }
-
-    /**
-     * Test for getResultDivs
-     *
-     * @return void
-     */
-    public function testGetResultDivs()
-    {
-        $this->assertEquals(
-            '<!-- These two table-image and table-link elements display the '
-            . 'table name in browse search results  --><div id="table-info">'
-            . '<a class="item" id="table-link" ></a></div><div id="browse-results">'
-            . '<!-- this browse-results div is used to load the browse and delete '
-            . 'results in the db search --></div><br class="clearfloat" />'
-            . '<div id="sqlqueryform"><!-- this sqlqueryform div is used to load the'
-            . ' delete form in the db search --></div><!--  toggle query box link-->'
-            . '<a id="togglequerybox"></a>',
-            $this->_callProtectedFunction(
-                'getResultDivs',
-                array()
-            )
-        );
-    }
-
-}
diff --git a/#pma/test/classes/DisplayResultsTest.php b/#pma/test/classes/DisplayResultsTest.php
deleted file mode 100644
index 26a01840..00000000
--- a/#pma/test/classes/DisplayResultsTest.php
+++ /dev/null
@@ -1,1608 +0,0 @@
-<?php
-/**
- * Tests for displaying results
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-use PMA\libraries\plugins\transformations\Text_Plain_Link;
-
-require_once 'libraries/url_generating.lib.php';
-require_once 'libraries/js_escape.lib.php';
-require_once 'libraries/relation.lib.php';
-require_once 'libraries/string.lib.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * Test cases for displaying results.
- *
- * @package PhpMyAdmin-test
- */
-class DisplayResultsTest extends PMATestCase
-{
-    /**
-     * @access protected
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function setUp()
-    {
-        $GLOBALS['server'] = 0;
-        $this->object = new PMA\libraries\DisplayResults('as', '', '', '');
-        $GLOBALS['PMA_Config'] = new PMA\libraries\Config();
-        $GLOBALS['PMA_Config']->enableBc();
-        $GLOBALS['text_dir'] = 'ltr';
-        $GLOBALS['collation_connection'] = 'utf-8';
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->any())->method('fieldFlags')
-            ->will($this->returnArgument(1));
-
-        $GLOBALS['dbi'] = $dbi;
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Call private functions by setting visibility to public.
-     *
-     * @param string $name   method name
-     * @param array  $params parameters for the invocation
-     *
-     * @return the output from the private method.
-     */
-    private function _callPrivateFunction($name, $params)
-    {
-        $class = new ReflectionClass('PMA\libraries\DisplayResults');
-        $method = $class->getMethod($name);
-        $method->setAccessible(true);
-        return $method->invokeArgs($this->object, $params);
-    }
-
-    /**
-     * Test for _isSelect function
-     *
-     * @return void
-     */
-    public function testisSelect()
-    {
-        $parser = new \SqlParser\Parser('SELECT * FROM pma');
-        $this->assertTrue(
-            $this->_callPrivateFunction(
-                '_isSelect',
-                array(
-                    array(
-                        'statement' => $parser->statements[0],
-                        'select_from' => true,
-                    ),
-                )
-            )
-        );
-    }
-
-    /**
-     * Test for navigation buttons
-     *
-     * @param string  $caption        iconic caption for button
-     * @param string  $title          text for button
-     * @param integer $pos            position for next query
-     * @param string  $html_sql_query query ready for display
-     * @param string  $output         output from the _getTableNavigationButton
-     *                                method
-     *
-     * @return void
-     *
-     * @dataProvider providerForTestGetTableNavigationButton
-     */
-    public function testGetTableNavigationButton(
-        $caption, $title, $pos, $html_sql_query, $output
-    ) {
-        $GLOBALS['cfg']['TableNavigationLinksMode'] = 'icons';
-        $_SESSION[' PMA_token '] = 'token';
-
-        $this->assertEquals(
-            $output,
-            $this->_callPrivateFunction(
-                '_getTableNavigationButton',
-                array(&$caption, $title, $pos, $html_sql_query, true)
-            )
-        );
-    }
-
-    /**
-     * Provider for testGetTableNavigationButton
-     *
-     * @return array array data for testGetTableNavigationButton
-     */
-    public function providerForTestGetTableNavigationButton()
-    {
-        return array(
-            array(
-                'btn',
-                'Submit',
-                1,
-                'SELECT * FROM `pma_bookmark` WHERE 1',
-                '<td><form action="sql.php" method="post" >'
-                . '<input type="hidden" name="db" value="as" />'
-                . '<input type="hidden" name="lang" value="en" />'
-                . '<input type="hidden" name="collation_connection" value="utf-8" />'
-                . '<input type="hidden" name="token" value="token" />'
-                . '<input type="hidden" name="sql_query" value="SELECT * '
-                . 'FROM `pma_bookmark` WHERE 1" />'
-                . '<input type="hidden" name="pos" value="1" />'
-                . '<input type="hidden" name="is_browse_distinct" value="" />'
-                . '<input type="hidden" name="goto" value="" />'
-                . '<input type="submit" name="navig" class="ajax" '
-                . 'value="btn"  title="Submit" /></form></td>'
-            )
-        );
-    }
-
-    /**
-     * Test for table navigation
-     *
-     * @return void
-     *
-     * @dataProvider providerForTestGetTableNavigation
-     */
-    public function testGetTableNavigation(
-        // $pos_next, $pos_prev, $is_innodb, $output
-    ) {
-        $_SESSION['tmpval']['max_rows'] = '20';
-        $_SESSION['tmpval']['pos'] = true;
-        $GLOBALS['num_rows'] = '20';
-        $GLOBALS['unlim_num_rows'] = '50';
-        $GLOBALS['cfg']['ShowAll'] = true;
-        $_SESSION['tmpval']['repeat_cells'] = '1';
-
-        /**
-         * FIXME Counting words of a generated large HTML is not a good way
-         * of testing IMO. Introduce more granular assertions that assert for
-         * existence of important content inside the generated HTML.
-         */
-        /*
-        $this->assertEquals(
-            $output,
-            str_word_count(
-                $this->_callPrivateFunction(
-                    '_getTableNavigation',
-                    array(
-                        $pos_next, $pos_prev, $is_innodb
-                    )
-                )
-            )
-        );
-        */
-        $this->markTestIncomplete('Not yet implemented!');
-    }
-
-    /**
-     * Provider for testing table navigation
-     *
-     * @return array data for testGetTableNavigation
-     */
-    public function providerForTestGetTableNavigation()
-    {
-        return array(
-            array(
-                21,
-                41,
-                false,
-                '310'
-            )
-        );
-    }
-
-    /**
-     * Data provider for testGetClassesForColumn
-     *
-     * @return array parameters and output
-     */
-    public function dataProviderForTestGetClassesForColumn()
-    {
-        return array(
-            array(
-                'grid_edit',
-                'not_null',
-                '',
-                '',
-                '',
-                'data grid_edit not_null   '
-            )
-        );
-    }
-
-    /**
-     * Test for _getClassesForColumn
-     *
-     * @param string $grid_edit_class  the class for all editable columns
-     * @param string $not_null_class   the class for not null columns
-     * @param string $relation_class   the class for relations in a column
-     * @param string $hide_class       the class for visibility of a column
-     * @param string $field_type_class the class related to type of the field
-     * @param string $output           output of__getResettedClassForInlineEdit
-     *
-     * @return void
-     *
-     * @dataProvider dataProviderForTestGetClassesForColumn
-     */
-    public function testGetClassesForColumn(
-        $grid_edit_class, $not_null_class, $relation_class,
-        $hide_class, $field_type_class, $output
-    ) {
-        $GLOBALS['cfg']['BrowsePointerEnable'] = true;
-        $GLOBALS['cfg']['BrowseMarkerEnable'] = true;
-
-        $this->assertEquals(
-            $output,
-            $this->_callPrivateFunction(
-                '_getClassesForColumn',
-                array(
-                    $grid_edit_class, $not_null_class, $relation_class,
-                    $hide_class, $field_type_class
-                )
-            )
-        );
-    }
-
-    /**
-     * Test for _getClassForDateTimeRelatedFields - case 1
-     *
-     * @return void
-     */
-    public function testGetClassForDateTimeRelatedFieldsCase1()
-    {
-        $this->assertEquals(
-            'datetimefield',
-            $this->_callPrivateFunction(
-                '_getClassForDateTimeRelatedFields',
-                array(PMA\libraries\DisplayResults::DATETIME_FIELD)
-            )
-        );
-    }
-
-    /**
-     * Test for _getClassForDateTimeRelatedFields - case 2
-     *
-     * @return void
-     */
-    public function testGetClassForDateTimeRelatedFieldsCase2()
-    {
-        $this->assertEquals(
-            'datefield',
-            $this->_callPrivateFunction(
-                '_getClassForDateTimeRelatedFields',
-                array(PMA\libraries\DisplayResults::DATE_FIELD)
-            )
-        );
-    }
-
-    /**
-     * Test for _getClassForDateTimeRelatedFields - case 3
-     *
-     * @return void
-     */
-    public function testGetClassForDateTimeRelatedFieldsCase3()
-    {
-        $this->assertEquals(
-            'text',
-            $this->_callPrivateFunction(
-                '_getClassForDateTimeRelatedFields',
-                array(PMA\libraries\DisplayResults::STRING_FIELD)
-            )
-        );
-    }
-
-    /**
-     * Test for _getOffsets - case 1
-     *
-     * @return void
-     */
-    public function testGetOffsetsCase1()
-    {
-        $_SESSION['tmpval']['max_rows'] = PMA\libraries\DisplayResults::ALL_ROWS;
-        $this->assertEquals(
-            array(0, 0),
-            $this->_callPrivateFunction('_getOffsets', array())
-        );
-    }
-
-    /**
-     * Test for _getOffsets - case 2
-     *
-     * @return void
-     */
-    public function testGetOffsetsCase2()
-    {
-        $_SESSION['tmpval']['max_rows'] = 5;
-        $_SESSION['tmpval']['pos'] = 4;
-        $this->assertEquals(
-            array(9, 0),
-            $this->_callPrivateFunction('_getOffsets', array())
-        );
-    }
-
-    /**
-     * Data provider for testGetCheckboxForMultiRowSubmissions
-     *
-     * @return array parameters and output
-     */
-    public function dataProviderForGetCheckboxForMultiRowSubmissions()
-    {
-        return array(
-            array(
-                'sql.php?db=data&amp;table=new&amp;sql_query=DELETE+FROM+%60data%60'
-                . '.%60new%60+WHERE+%60new%60.%60id%60+%3D+1&amp;message_to_show='
-                . 'The+row+has+been+deleted&amp;goto=sql.php%3Fdb%3Ddata%26table%3D'
-                . 'new%26sql_query%3DSELECT%2B%252A%2BFROM%2B%2560new%2560%26message'
-                . '_to_show%3DThe%2Brow%2Bhas%2Bbeen%2Bdeleted%26goto%3Dtbl_'
-                . 'structure.php%26token%3Dd1aecb47ef7c081e068e7008b38a5d76&amp;'
-                . 'token=d1aecb47ef7c081e068e7008b38a5d76',
-                array(
-                    'edit_lnk' => 'ur',
-                    'del_lnk' => 'dr',
-                    'sort_lnk' => '0',
-                    'nav_bar' => '1',
-                    'bkm_form' => '1',
-                    'text_btn' => '1',
-                    'pview_lnk' => '1'
-                ),
-                0,
-                '%60new%60.%60id%60+%3D+1',
-                array('`new`.`id`' => '= 1'),
-                '[%_PMA_CHECKBOX_DIR_%]',
-                'odd',
-                '<td class="odd" class="center print_ignore"><input type'
-                . '="checkbox" id="id_rows_to_delete0[%_PMA_CHECKBOX_DIR_%]" name='
-                . '"rows_to_delete[0]" class="multi_checkbox checkall" value="%60'
-                . 'new%60.%60id%60+%3D+1"  /><input type="hidden" class="condition_'
-                . 'array" value="{&quot;`new`.`id`&quot;:&quot;= 1&quot;}" />    '
-                . '</td>'
-            )
-        );
-    }
-
-    /**
-     * Test for _getCheckboxForMultiRowSubmissions
-     *
-     * @param string $del_url           delete url
-     * @param array  $displayParts      array with explicit indexes for all
-     *                                  the display elements
-     * @param string $row_no            the row number
-     * @param string $where_clause_html url encoded where clause
-     * @param array  $condition_array   array of conditions in the where clause
-     * @param string $id_suffix         suffix for the id
-     * @param string $class             css classes for the td element
-     * @param string $output            output of _getCheckboxForMultiRowSubmissions
-     *
-     * @return void
-     *
-     * @dataProvider dataProviderForGetCheckboxForMultiRowSubmissions
-     */
-    public function testGetCheckboxForMultiRowSubmissions(
-        $del_url, $displayParts, $row_no, $where_clause_html, $condition_array,
-        $id_suffix, $class, $output
-    ) {
-        $this->assertEquals(
-            $output,
-            $this->_callPrivateFunction(
-                '_getCheckboxForMultiRowSubmissions',
-                array(
-                    $del_url, $displayParts, $row_no, $where_clause_html,
-                    $condition_array, $id_suffix, $class
-                )
-            )
-        );
-    }
-
-    /**
-     * Data provider for testGetEditLink
-     *
-     * @return array parameters and output
-     */
-    public function dataProviderForGetEditLink()
-    {
-        return array(
-            array(
-                'tbl_change.php?db=Data&amp;table=customer&amp;where_clause=%60'
-                . 'customer%60.%60id%60+%3D+1&amp;clause_is_unique=1&amp;sql_query='
-                . 'SELECT+%2A+FROM+%60customer%60&amp;goto=sql.php&amp;default_'
-                . 'action=update&amp;token=bbd5003198a3bd856b21d9607d6c6a1e',
-                'odd edit_row_anchor',
-                '<span class="nowrap"><img src="themes/dot.gif" title="Edit" alt='
-                . '"Edit" class="icon ic_b_edit" /> Edit</span>',
-                '`customer`.`id` = 1',
-                '%60customer%60.%60id%60+%3D+1',
-                '<td class="odd edit_row_anchor center print_ignore"  >'
-                . '<span class="nowrap">' . "\n"
-                . '<a href="tbl_change.php?db=Data&amp;table=customer&amp;where_'
-                . 'clause=%60customer%60.%60id%60+%3D+1&amp;clause_is_unique=1&amp;'
-                . 'sql_query=SELECT+%2A+FROM+%60customer%60&amp;goto=sql.php&amp;'
-                . 'default_action=update&amp;token=bbd5003198a3bd856b21d9607d6c6a1e"'
-                . ' ><span class="nowrap"><img src="themes/dot.gif" title="Edit" '
-                . 'alt="Edit" class="icon ic_b_edit" /> Edit</span></a>' . "\n"
-                . '<input type="hidden" class="where_clause" value ="%60customer'
-                . '%60.%60id%60+%3D+1" /></span></td>'
-            )
-        );
-    }
-
-    /**
-     * Test for _getEditLink
-     *
-     * @param string $edit_url          edit url
-     * @param string $class             css classes for td element
-     * @param string $edit_str          text for the edit link
-     * @param string $where_clause      where clause
-     * @param string $where_clause_html url encoded where clause
-     * @param string $output            output of _getEditLink
-     *
-     * @return void
-     *
-     * @dataProvider dataProviderForGetEditLink
-     */
-    public function testGetEditLink(
-        $edit_url, $class, $edit_str, $where_clause, $where_clause_html, $output
-    ) {
-        $GLOBALS['cfg']['ActionLinksMode'] = 'both';
-        $GLOBALS['cfg']['LinkLengthLimit'] = 1000;
-
-        $this->assertEquals(
-            $output,
-            $this->_callPrivateFunction(
-                '_getEditLink',
-                array(
-                    $edit_url, $class, $edit_str, $where_clause, $where_clause_html
-                )
-            )
-        );
-    }
-
-    /**
-     * Data provider for testGetCopyLink
-     *
-     * @return array parameters and output
-     */
-    public function dataProviderForGetCopyLink()
-    {
-        return array(
-            array(
-                'tbl_change.php?db=Data&amp;table=customer&amp;where_clause=%60cust'
-                . 'omer%60.%60id%60+%3D+1&amp;clause_is_unique=1&amp;sql_query='
-                . 'SELECT+%2A+FROM+%60customer%60&amp;goto=sql.php&amp;default_'
-                . 'action=insert&amp;token=f597309d3a066c3c81a6cb015a79636d',
-                '<span class="nowrap"><img src="themes/dot.gif" title="Copy" alt'
-                . '="Copy" class="icon ic_b_insrow" /> Copy</span>',
-                '`customer`.`id` = 1',
-                '%60customer%60.%60id%60+%3D+1',
-                'odd',
-                '<td class="odd center print_ignore"  ><span class='
-                . '"nowrap">' . "\n"
-                . '<a href="tbl_change.php?db=Data&amp;table=customer&amp;where_'
-                . 'clause=%60customer%60.%60id%60+%3D+1&amp;clause_is_unique=1&amp;'
-                . 'sql_query=SELECT+%2A+FROM+%60customer%60&amp;goto=sql.php&amp;'
-                . 'default_action=insert&amp;token=f597309d3a066c3c81a6cb015a79636d"'
-                . ' ><span class="nowrap"><img src="themes/dot.gif" title="Copy" '
-                . 'alt="Copy" class="icon ic_b_insrow" /> Copy</span></a>' . "\n"
-                . '<input type="hidden" class="where_clause" value="%60customer%60'
-                . '.%60id%60+%3D+1" /></span></td>'
-            )
-        );
-    }
-
-    /**
-     * Test for _getCopyLink
-     *
-     * @param string $copy_url          copy url
-     * @param string $copy_str          text for the copy link
-     * @param string $where_clause      where clause
-     * @param string $where_clause_html url encoded where clause
-     * @param string $class             css classes for the td element
-     * @param string $output            output of _getCopyLink
-     *
-     * @return void
-     *
-     * @dataProvider dataProviderForGetCopyLink
-     */
-    public function testGetCopyLink(
-        $copy_url, $copy_str, $where_clause, $where_clause_html, $class, $output
-    ) {
-        $GLOBALS['cfg']['ActionLinksMode'] = 'both';
-        $GLOBALS['cfg']['LinkLengthLimit'] = 1000;
-
-        $this->assertEquals(
-            $output,
-            $this->_callPrivateFunction(
-                '_getCopyLink',
-                array(
-                    $copy_url, $copy_str, $where_clause, $where_clause_html, $class
-                )
-            )
-        );
-    }
-
-    /**
-     * Data provider for testGetDeleteLink
-     *
-     * @return array parameters and output
-     */
-    public function dataProviderForGetDeleteLink()
-    {
-        return array(
-            array(
-                'sql.php?db=Data&amp;table=customer&amp;sql_query=DELETE+FROM+%60'
-                . 'Data%60.%60customer%60+WHERE+%60customer%60.%60id%60+%3D+1&amp;'
-                . 'message_to_show=The+row+has+been+deleted&amp;goto=sql.php%3Fdb'
-                . '%3DData%26table%3Dcustomer%26sql_query%3DSELECT%2B%252A%2BFROM'
-                . '%2B%2560customer%2560%26message_to_show%3DThe%2Brow%2Bhas%2Bbeen'
-                . '%2Bdeleted%26goto%3Dtbl_structure.php%26token%3Df597309d3a066c3'
-                . 'c81a6cb015a79636d&amp;token=f597309d3a066c3c81a6cb015a79636d',
-                '<span class="nowrap"><img src="themes/dot.gif" title="Delete" '
-                . 'alt="Delete" class="icon ic_b_drop" /> Delete</span>',
-                'DELETE FROM `Data`.`customer` WHERE `customer`.`id` = 1',
-                'odd',
-                '<td class="odd center print_ignore"  >' . "\n"
-                . '<a href="sql.php?db=Data&amp;table=customer&amp;sql_query=DELETE'
-                . '+FROM+%60Data%60.%60customer%60+WHERE+%60customer%60.%60id%60+%3D'
-                . '+1&amp;message_to_show=The+row+has+been+deleted&amp;goto=sql.php'
-                . '%3Fdb%3DData%26table%3Dcustomer%26sql_query%3DSELECT%2B%252A%2B'
-                . 'FROM%2B%2560customer%2560%26message_to_show%3DThe%2Brow%2Bhas%2B'
-                . 'been%2Bdeleted%26goto%3Dtbl_structure.php%26token%3Df597309d3a06'
-                . '6c3c81a6cb015a79636d&amp;token=f597309d3a066c3c81a6cb015a79636d" '
-                . 'class="delete_row requireConfirm"><span class="nowrap"><img src="themes/dot.'
-                . 'gif" title="Delete" alt="Delete" class="icon ic_b_drop" /> '
-                . 'Delete</span></a>' . "\n"
-                . '<div class="hide">DELETE FROM `Data`.`customer` WHERE '
-                . '`customer`.`id` = 1</div></td>'
-            )
-        );
-    }
-
-    /**
-     * Test for _getDeleteLink
-     *
-     * @param string $del_url delete url
-     * @param string $del_str text for the delete link
-     * @param string $js_conf text for the JS confirmation
-     * @param string $class   css classes for the td element
-     * @param string $output  output of _getDeleteLink
-     *
-     * @return void
-     *
-     * @dataProvider dataProviderForGetDeleteLink
-     */
-    public function testGetDeleteLink(
-        $del_url, $del_str, $js_conf, $class, $output
-    ) {
-        $GLOBALS['cfg']['ActionLinksMode'] = 'both';
-        $GLOBALS['cfg']['LinkLengthLimit'] = 1000;
-
-        $this->assertEquals(
-            $output,
-            $this->_callPrivateFunction(
-                '_getDeleteLink',
-                array(
-                    $del_url, $del_str, $js_conf, $class
-                )
-            )
-        );
-    }
-
-    /**
-     * Data provider for testGetCheckboxAndLinks
-     *
-     * @return array parameters and output
-     */
-    public function dataProviderForGetCheckboxAndLinks()
-    {
-        return array(
-            array(
-                PMA\libraries\DisplayResults::POSITION_LEFT,
-                'sql.php?db=data&amp;table=new&amp;sql_query=DELETE+FROM+%60data'
-                . '%60.%60new%60+WHERE+%60new%60.%60id%60+%3D+1&amp;message_to_show='
-                . 'The+row+has+been+deleted&amp;goto=sql.php%3Fdb%3Ddata%26table%3D'
-                . 'new%26sql_query%3DSELECT%2B%252A%2BFROM%2B%2560new%2560%26'
-                . 'message_to_show%3DThe%2Brow%2Bhas%2Bbeen%2Bdeleted%26goto%3D'
-                . 'tbl_structure.php%26token%3Dae4c6d18375f446dfa068420c1f6a4e8'
-                . '&amp;token=ae4c6d18375f446dfa068420c1f6a4e8',
-                array(
-                    'edit_lnk' => 'ur',
-                    'del_lnk' => 'dr',
-                    'sort_lnk' => '0',
-                    'nav_bar' => '1',
-                    'bkm_form' => '1',
-                    'text_btn' => '1',
-                    'pview_lnk' => '1'
-                ),
-                0,
-                '`new`.`id` = 1',
-                '%60new%60.%60id%60+%3D+1',
-                array(
-                    '`new`.`id`' => '= 1',
-                ),
-                'tbl_change.php?db=data&amp;table=new&amp;where_clause=%60new%60.'
-                . '%60id%60+%3D+1&amp;clause_is_unique=1&amp;sql_query=SELECT+%2A+'
-                . 'FROM+%60new%60&amp;goto=sql.php&amp;default_action=update&amp;'
-                . 'token=ae4c6d18375f446dfa068420c1f6a4e8',
-                'tbl_change.php?db=data&amp;table=new&amp;where_clause=%60new%60.'
-                . '%60id%60+%3D+1&amp;clause_is_unique=1&amp;sql_query=SELECT+%2A+'
-                . 'FROM+%60new%60&amp;goto=sql.php&amp;default_action=insert&amp;'
-                . 'token=ae4c6d18375f446dfa068420c1f6a4e8',
-                'edit_row_anchor',
-                '<span class="nowrap"><img src="themes/dot.gif" title="Edit" '
-                . 'alt="Edit" class="icon ic_b_edit" /> Edit</span>',
-                '<span class="nowrap"><img src="themes/dot.gif" title="Copy" '
-                . 'alt="Copy" class="icon ic_b_insrow" /> Copy</span>',
-                '<span class="nowrap"><img src="themes/dot.gif" title="Delete" '
-                . 'alt="Delete" class="icon ic_b_drop" /> Delete</span>',
-                'DELETE FROM `data`.`new` WHERE `new`.`id` = 1',
-                '<td  class="center print_ignore"><input type="checkbox" id="id_rows_to_delete0_'
-                . 'left" name="rows_to_delete[0]" class="multi_checkbox checkall" '
-                . 'value="%60new%60.%60id%60+%3D+1"  /><input type="hidden" class='
-                . '"condition_array" value="{&quot;`new`.`id`&quot;:&quot;= 1&quot;'
-                . '}" />    </td><td class="edit_row_anchor center print_ignore"  ><span class='
-                . '"nowrap">' . "\n"
-                . '<a href="tbl_change.php?db=data&amp;table=new&amp;where_'
-                . 'clause=%60new%60.%60id%60+%3D+1&amp;clause_is_unique=1&amp;'
-                . 'sql_query=SELECT+%2A+FROM+%60new%60&amp;goto=sql.php&amp;default'
-                . '_action=update&amp;token=ae4c6d18375f446dfa068420c1f6a4e8" >'
-                . '<span class="nowrap"><img src="themes/dot.gif" title="Edit" '
-                . 'alt="Edit" class="icon ic_b_edit" /> Edit</span></a>' . "\n"
-                . '<input type="hidden" class="where_clause" value ="%60new%60.%60'
-                . 'id%60+%3D+1" /></span></td><td class="center print_ignore"  ><span class'
-                . '="nowrap">' . "\n"
-                . '<a href="tbl_change.php?db=data&amp;table=new&amp;where_clause'
-                . '=%60new%60.%60id%60+%3D+1&amp;clause_is_unique=1&amp;sql_query='
-                . 'SELECT+%2A+FROM+%60new%60&amp;goto=sql.php&amp;default_action='
-                . 'insert&amp;token=ae4c6d18375f446dfa068420c1f6a4e8" ><span class'
-                . '="nowrap"><img src="themes/dot.gif" title="Copy" alt="Copy" '
-                . 'class="icon ic_b_insrow" /> Copy</span></a>' . "\n"
-                . '<input type="hidden" class="where_clause" value="%60new%60.%60id'
-                . '%60+%3D+1" /></span></td><td class="center print_ignore"  >' . "\n"
-                . '<a href="sql.php?db=data&amp;table=new&amp;sql_query=DELETE+'
-                . 'FROM+%60data%60.%60new%60+WHERE+%60new%60.%60id%60+%3D+1&amp;'
-                . 'message_to_show=The+row+has+been+deleted&amp;goto=sql.php%3F'
-                . 'db%3Ddata%26table%3Dnew%26sql_query%3DSELECT%2B%252A%2BFROM%2B'
-                . '%2560new%2560%26message_to_show%3DThe%2Brow%2Bhas%2Bbeen%2B'
-                . 'deleted%26goto%3Dtbl_structure.php%26token%3Dae4c6d18375f446d'
-                . 'fa068420c1f6a4e8&amp;token=ae4c6d18375f446dfa068420c1f6a4e8" '
-                . 'class="delete_row requireConfirm"><span class="nowrap"><img src="themes/dot.'
-                . 'gif" title="Delete" alt="Delete" class="icon ic_b_drop" /> '
-                . 'Delete</span></a>' . "\n"
-                . '<div class="hide">DELETE FROM `data`.`new` WHERE `new`.`id` = 1'
-                . '</div></td>'
-            ),
-            array(
-                PMA\libraries\DisplayResults::POSITION_RIGHT,
-                'sql.php?db=data&amp;table=new&amp;sql_query=DELETE+FROM+%60data%60'
-                . '.%60new%60+WHERE+%60new%60.%60id%60+%3D+1&amp;message_to_show='
-                . 'The+row+has+been+deleted&amp;goto=sql.php%3Fdb%3Ddata%26table%3D'
-                . 'new%26sql_query%3DSELECT%2B%252A%2BFROM%2B%2560new%2560%26message'
-                . '_to_show%3DThe%2Brow%2Bhas%2Bbeen%2Bdeleted%26goto%3Dtbl_'
-                . 'structure.php%26token%3Dae4c6d18375f446dfa068420c1f6a4e8&amp;'
-                . 'token=ae4c6d18375f446dfa068420c1f6a4e8',
-                array(
-                    'edit_lnk' => 'ur',
-                    'del_lnk' => 'dr',
-                    'sort_lnk' => '0',
-                    'nav_bar' => '1',
-                    'bkm_form' => '1',
-                    'text_btn' => '1',
-                    'pview_lnk' => '1'
-                ),
-                0,
-                '`new`.`id` = 1',
-                '%60new%60.%60id%60+%3D+1',
-                array(
-                    '`new`.`id`' => '= 1',
-                ),
-                'tbl_change.php?db=data&amp;table=new&amp;where_clause=%60new%60.'
-                . '%60id%60+%3D+1&amp;clause_is_unique=1&amp;sql_query=SELECT+%2A+'
-                . 'FROM+%60new%60&amp;goto=sql.php&amp;default_action=update&amp;'
-                . 'token=ae4c6d18375f446dfa068420c1f6a4e8',
-                'tbl_change.php?db=data&amp;table=new&amp;where_clause=%60new%60.'
-                . '%60id%60+%3D+1&amp;clause_is_unique=1&amp;sql_query=SELECT+%2A+'
-                . 'FROM+%60new%60&amp;goto=sql.php&amp;default_action=insert&amp;'
-                . 'token=ae4c6d18375f446dfa068420c1f6a4e8',
-                'edit_row_anchor',
-                '<span class="nowrap"><img src="themes/dot.gif" title="Edit" '
-                . 'alt="Edit" class="icon ic_b_edit" /> Edit</span>',
-                '<span class="nowrap"><img src="themes/dot.gif" title="Copy" '
-                . 'alt="Copy" class="icon ic_b_insrow" /> Copy</span>',
-                '<span class="nowrap"><img src="themes/dot.gif" title="Delete" '
-                . 'alt="Delete" class="icon ic_b_drop" /> Delete</span>',
-                'DELETE FROM `data`.`new` WHERE `new`.`id` = 1',
-                '<td class="center print_ignore"  >' . "\n"
-                . '<a href="sql.php?db=data&amp;table=new&amp;sql_query=DELETE+'
-                . 'FROM+%60data%60.%60new%60+WHERE+%60new%60.%60id%60+%3D+1&amp;'
-                . 'message_to_show=The+row+has+been+deleted&amp;goto=sql.php%3Fdb'
-                . '%3Ddata%26table%3Dnew%26sql_query%3DSELECT%2B%252A%2BFROM%2B%25'
-                . '60new%2560%26message_to_show%3DThe%2Brow%2Bhas%2Bbeen%2Bdeleted'
-                . '%26goto%3Dtbl_structure.php%26token%3Dae4c6d18375f446dfa068420c'
-                . '1f6a4e8&amp;token=ae4c6d18375f446dfa068420c1f6a4e8" class="delete'
-                . '_row requireConfirm"><span class="nowrap"><img src="themes/dot.gif" title='
-                . '"Delete" alt="Delete" class="icon ic_b_drop" /> Delete</span></a>'
-                . "\n" . '<div class="hide">DELETE FROM `data`.`new` WHERE `new`.'
-                . '`id` = 1</div></td><td class="center print_ignore"  ><span class="nowrap">'
-                . "\n" . '<a href="tbl_change.php?db=data&amp;table=new&amp;where_'
-                . 'clause=%60new%60.%60id%60+%3D+1&amp;clause_is_unique=1&amp;sql_'
-                . 'query=SELECT+%2A+FROM+%60new%60&amp;goto=sql.php&amp;default_'
-                . 'action=insert&amp;token=ae4c6d18375f446dfa068420c1f6a4e8" ><span '
-                . 'class="nowrap"><img src="themes/dot.gif" title="Copy" alt="Copy" '
-                . 'class="icon ic_b_insrow" /> Copy</span></a>' . "\n"
-                . '<input type="hidden" class="where_clause" value="%60new%60.%60id'
-                . '%60+%3D+1" /></span></td><td class="edit_row_anchor center print_ignore"  >'
-                . '<span class="nowrap">' . "\n"
-                . '<a href="tbl_change.php?db=data&amp;table=new&amp;where_clause'
-                . '=%60new%60.%60id%60+%3D+1&amp;clause_is_unique=1&amp;sql_query='
-                . 'SELECT+%2A+FROM+%60new%60&amp;goto=sql.php&amp;default_action='
-                . 'update&amp;token=ae4c6d18375f446dfa068420c1f6a4e8" ><span class='
-                . '"nowrap"><img src="themes/dot.gif" title="Edit" alt="Edit" class'
-                . '="icon ic_b_edit" /> Edit</span></a>' . "\n"
-                . '<input type="hidden" class="where_clause" value ="%60new%60.%60'
-                . 'id%60+%3D+1" /></span></td><td  class="center print_ignore"><input type='
-                . '"checkbox" id="id_rows_to_delete0_right" name="rows_to_delete'
-                . '[0]" class="multi_checkbox checkall" value="%60new%60.%60id%60'
-                . '+%3D+1"  /><input type="hidden" class="condition_array" value="'
-                . '{&quot;`new`.`id`&quot;:&quot;= 1&quot;}" />    </td>'
-            ),
-            array(
-                PMA\libraries\DisplayResults::POSITION_NONE,
-                'sql.php?db=data&amp;table=new&amp;sql_query=DELETE+FROM+%60data%60.'
-                . '%60new%60+WHERE+%60new%60.%60id%60+%3D+1&amp;message_to_show=The+'
-                . 'row+has+been+deleted&amp;goto=sql.php%3Fdb%3Ddata%26table%3Dnew'
-                . '%26sql_query%3DSELECT%2B%252A%2BFROM%2B%2560new%2560%26message_'
-                . 'to_show%3DThe%2Brow%2Bhas%2Bbeen%2Bdeleted%26goto%3Dtbl_structure'
-                . '.php%26token%3Dae4c6d18375f446dfa068420c1f6a4e8&amp;token='
-                . 'ae4c6d18375f446dfa068420c1f6a4e8',
-                array(
-                    'edit_lnk' => 'ur',
-                    'del_lnk' => 'dr',
-                    'sort_lnk' => '0',
-                    'nav_bar' => '1',
-                    'bkm_form' => '1',
-                    'text_btn' => '1',
-                    'pview_lnk' => '1'
-                ),
-                0,
-                '`new`.`id` = 1',
-                '%60new%60.%60id%60+%3D+1',
-                array(
-                    '`new`.`id`' => '= 1',
-                ),
-                'tbl_change.php?db=data&amp;table=new&amp;where_clause=%60new%60.%60'
-                . 'id%60+%3D+1&amp;clause_is_unique=1&amp;sql_query=SELECT+%2A+FROM+'
-                . '%60new%60&amp;goto=sql.php&amp;default_action=update&amp;token='
-                . 'ae4c6d18375f446dfa068420c1f6a4e8',
-                'tbl_change.php?db=data&amp;table=new&amp;where_clause=%60new%60.%60'
-                . 'id%60+%3D+1&amp;clause_is_unique=1&amp;sql_query=SELECT+%2A+FROM+'
-                . '%60new%60&amp;goto=sql.php&amp;default_action=insert&amp;token='
-                . 'ae4c6d18375f446dfa068420c1f6a4e8',
-                'edit_row_anchor',
-                '<span class="nowrap"><img src="themes/dot.gif" title="Edit" '
-                . 'alt="Edit" class="icon ic_b_edit" /> Edit</span>',
-                '<span class="nowrap"><img src="themes/dot.gif" title="Copy" '
-                . 'alt="Copy" class="icon ic_b_insrow" /> Copy</span>',
-                '<span class="nowrap"><img src="themes/dot.gif" title="Delete" '
-                . 'alt="Delete" class="icon ic_b_drop" /> Delete</span>',
-                'DELETE FROM `data`.`new` WHERE `new`.`id` = 1',
-                '<td  class="center print_ignore"><input type="checkbox" id="id_rows_to_'
-                . 'delete0_left" name="rows_to_delete[0]" class="multi_checkbox '
-                . 'checkall" value="%60new%60.%60id%60+%3D+1"  /><input type='
-                . '"hidden" class="condition_array" value="{&quot;`new`.`id`&quot;:'
-                . '&quot;= 1&quot;}" />    </td>'
-            ),
-        );
-    }
-
-    /**
-     * Test for _getCheckboxAndLinks
-     *
-     * @param string $position          the position of the checkbox and links
-     * @param string $del_url           delete url
-     * @param array  $displayParts      array with explicit indexes for all the
-     *                                  display elements
-     * @param string $row_no            row number
-     * @param string $where_clause      where clause
-     * @param string $where_clause_html url encoded where clause
-     * @param array  $condition_array   array of conditions in the where clause
-     * @param string $edit_url          edit url
-     * @param string $copy_url          copy url
-     * @param string $class             css classes for the td elements
-     * @param string $edit_str          text for the edit link
-     * @param string $copy_str          text for the copy link
-     * @param string $del_str           text for the delete link
-     * @param string $js_conf           text for the JS confirmation
-     * @param string $output            output of _getCheckboxAndLinks
-     *
-     * @return void
-     *
-     * @dataProvider dataProviderForGetCheckboxAndLinks
-     */
-    public function testGetCheckboxAndLinks(
-        $position, $del_url, $displayParts, $row_no, $where_clause,
-        $where_clause_html, $condition_array, $edit_url,
-        $copy_url, $class, $edit_str, $copy_str, $del_str, $js_conf, $output
-    ) {
-        $this->assertEquals(
-            $output,
-            $this->_callPrivateFunction(
-                '_getCheckboxAndLinks',
-                array(
-                    $position, $del_url, $displayParts, $row_no, $where_clause,
-                    $where_clause_html, $condition_array,
-                    $edit_url, $copy_url, $class, $edit_str,
-                    $copy_str, $del_str, $js_conf
-                )
-            )
-        );
-    }
-
-    /**
-     * Data provider for testGetPlacedLinks
-     *
-     * @return array parameters and output
-     */
-    public function dataProviderForGetPlacedLinks()
-    {
-        return array(
-            array(
-                PMA\libraries\DisplayResults::POSITION_NONE,
-                'sql.php?db=data&amp;table=new&amp;sql_query=DELETE+FROM+%60data%60.'
-                . '%60new%60+WHERE+%60new%60.%60id%60+%3D+1&amp;message_to_show=The+'
-                . 'row+has+been+deleted&amp;goto=sql.php%3Fdb%3Ddata%26table%3Dnew'
-                . '%26sql_query%3DSELECT%2B%252A%2BFROM%2B%2560new%2560%26message_'
-                . 'to_show%3DThe%2Brow%2Bhas%2Bbeen%2Bdeleted%26goto%3Dtbl_structure'
-                . '.php%26token%3Dae4c6d18375f446dfa068420c1f6a4e8&amp;token='
-                . 'ae4c6d18375f446dfa068420c1f6a4e8',
-                array(
-                    'edit_lnk' => 'ur',
-                    'del_lnk' => 'dr',
-                    'sort_lnk' => '0',
-                    'nav_bar' => '1',
-                    'bkm_form' => '1',
-                    'text_btn' => '1',
-                    'pview_lnk' => '1'
-                ),
-                0,
-                '`new`.`id` = 1',
-                '%60new%60.%60id%60+%3D+1',
-                array(
-                    '`new`.`id`' => '= 1',
-                ),
-                'tbl_change.php?db=data&amp;table=new&amp;where_clause=%60new%60.%60'
-                . 'id%60+%3D+1&amp;clause_is_unique=1&amp;sql_query=SELECT+%2A+FROM+'
-                . '%60new%60&amp;goto=sql.php&amp;default_action=update&amp;token='
-                . 'ae4c6d18375f446dfa068420c1f6a4e8',
-                'tbl_change.php?db=data&amp;table=new&amp;where_clause=%60new%60.%60'
-                . 'id%60+%3D+1&amp;clause_is_unique=1&amp;sql_query=SELECT+%2A+FROM+'
-                . '%60new%60&amp;goto=sql.php&amp;default_action=insert&amp;token='
-                . 'ae4c6d18375f446dfa068420c1f6a4e8',
-                'edit_row_anchor',
-                '<span class="nowrap"><img src="themes/dot.gif" title="Edit" '
-                . 'alt="Edit" class="icon ic_b_edit" /> Edit</span>',
-                '<span class="nowrap"><img src="themes/dot.gif" title="Copy" '
-                . 'alt="Copy" class="icon ic_b_insrow" /> Copy</span>',
-                '<span class="nowrap"><img src="themes/dot.gif" title="Delete" '
-                . 'alt="Delete" class="icon ic_b_drop" /> Delete</span>',
-                null,
-                '<td  class="center print_ignore"><input type="checkbox" id="id_rows_to_'
-                . 'delete0_left" name="rows_to_delete[0]" class="multi_checkbox '
-                . 'checkall" value="%60new%60.%60id%60+%3D+1"  /><input type='
-                . '"hidden" class="condition_array" value="{&quot;`new`.`id`&quot;:'
-                . '&quot;= 1&quot;}" />    </td>'
-            )
-        );
-    }
-
-    /**
-     * Test for _getPlacedLinks
-     *
-     * @param string  $dir               the direction of links should place
-     * @param string  $del_url           the url for delete row
-     * @param array   $displayParts      which elements to display
-     * @param integer $row_no            the index of current row
-     * @param string  $where_clause      the where clause of the sql
-     * @param string  $where_clause_html the html encoded where clause
-     * @param array   $condition_array   array of keys (primary, unique, condition)
-     * @param string  $edit_url          the url for edit row
-     * @param string  $copy_url          the url for copy row
-     * @param string  $edit_anchor_class the class for html element for edit
-     * @param string  $edit_str          the label for edit row
-     * @param string  $copy_str          the label for copy row
-     * @param string  $del_str           the label for delete row
-     * @param string  $js_conf           text for the JS confirmation
-     * @param string  $output            output of _getPlacedLinks
-     *
-     * @return void
-     *
-     * @dataProvider dataProviderForGetPlacedLinks
-     */
-    public function testGetPlacedLinks(
-        $dir, $del_url, $displayParts, $row_no, $where_clause, $where_clause_html,
-        $condition_array, $edit_url, $copy_url,
-        $edit_anchor_class, $edit_str, $copy_str, $del_str, $js_conf, $output
-    ) {
-        $this->assertEquals(
-            $output,
-            $this->_callPrivateFunction(
-                '_getPlacedLinks',
-                array(
-                    $dir, $del_url, $displayParts, $row_no, $where_clause,
-                    $where_clause_html, $condition_array,
-                    $edit_url, $copy_url, $edit_anchor_class,
-                    $edit_str, $copy_str, $del_str, $js_conf
-                )
-            )
-        );
-    }
-
-
-    /**
-     * Data provider for testGetSpecialLinkUrl
-     *
-     * @return array parameters and output
-     */
-    public function dataProviderForTestGetSpecialLinkUrl()
-    {
-        return array(
-            array(
-                'information_schema',
-                'routines',
-                'circumference',
-                array(
-                    'routine_name' => 'circumference',
-                    'routine_schema' => 'data',
-                    'routine_type' => 'FUNCTION'
-                ),
-                'routine_name',
-                'db_routines.php?item_name=circumference&db=data'
-                . '&item_type=FUNCTION&server=0&lang=en'
-                . '&collation_connection=utf-8'
-                . '&token=token'
-            ),
-            array(
-                'information_schema',
-                'routines',
-                'area',
-                array(
-                    'routine_name' => 'area',
-                    'routine_schema' => 'data',
-                    'routine_type' => 'PROCEDURE'
-                ),
-                'routine_name',
-                'db_routines.php?item_name=area&db=data'
-                . '&item_type=PROCEDURE&server=0&lang=en'
-                . '&collation_connection=utf-8'
-                . '&token=token'
-            ),
-            array(
-                'information_schema',
-                'columns',
-                'CHARACTER_SET_NAME',
-                array(
-                    'table_schema' => 'information_schema',
-                    'table_name' => 'CHARACTER_SETS'
-                ),
-                'column_name',
-                'index.php?sql_query=SELECT+%60CHARACTER_SET_NAME%60+FROM+%60info'
-                . 'rmation_schema%60.%60CHARACTER_SETS%60&db=information_schema'
-                . '&test_name=value&server=0&lang=en'
-                . '&collation_connection=utf-8'
-                . '&token=token'
-            )
-        );
-    }
-
-
-    /**
-     * Test _getSpecialLinkUrl
-     *
-     * @param string  $db           the database name
-     * @param string  $table        the table name
-     * @param string  $column_value column value
-     * @param array   $row_info     information about row
-     * @param string  $field_name   column name
-     * @param boolean $output       output of _getSpecialLinkUrl
-     *
-     * @return void
-     *
-     * @dataProvider dataProviderForTestGetSpecialLinkUrl
-     */
-    public function testGetSpecialLinkUrl(
-        $db, $table, $column_value, $row_info, $field_name,  $output
-    ) {
-        $GLOBALS['special_schema_links'] = array(
-            'information_schema' => array(
-                'routines' => array(
-                    'routine_name' => array(
-                        'link_param' => 'item_name',
-                        'link_dependancy_params' => array(
-                            0 => array(
-                                'param_info' => 'db',
-                                'column_name' => 'routine_schema'
-                            ),
-                            1 => array(
-                                'param_info' => 'item_type',
-                                'column_name' => 'routine_type'
-                            )
-                        ),
-                        'default_page' => 'db_routines.php'
-                    )
-                ),
-                'columns' => array(
-                    'column_name' => array(
-                        'link_param' => array(
-                            'sql_query',
-                            'table_schema',
-                            'table_name'
-                        ),
-                        'link_dependancy_params' => array(
-                            0 => array(
-                                'param_info' => 'db',
-                                'column_name' => 'table_schema'
-                            ),
-                            1 => array(
-                                'param_info' => array('test_name', 'value')
-                            )
-                        ),
-                        'default_page' => 'index.php'
-                    )
-                )
-            )
-        );
-
-        $this->object->__set('db', $db);
-        $this->object->__set('table', $table);
-
-        $this->assertEquals(
-            $output,
-            $this->_callPrivateFunction(
-                '_getSpecialLinkUrl',
-                array($column_value, $row_info, $field_name)
-            )
-        );
-    }
-
-
-    /**
-     * Data provider for testGetRowInfoForSpecialLinks
-     *
-     * @return array parameters and output
-     */
-    public function dataProviderForTestGetRowInfoForSpecialLinks()
-    {
-        $column_names = array('host', 'db', 'user', 'select_privilages');
-        $fields_mata = array();
-
-        foreach ($column_names as $column_name) {
-            $field_meta = new stdClass();
-            $field_meta->name = $column_name;
-            $fields_mata[] = $field_meta;
-        }
-
-        return array(
-            array(
-                $fields_mata,
-                count($fields_mata),
-                array(
-                    0 => 'localhost',
-                    1 => 'phpmyadmin',
-                    2 => 'pmauser',
-                    3 => 'Y'
-                ),
-                array(
-                    0 => '0',
-                    1 => '3',
-                    2 => '1',
-                    3 => '2'
-                ),
-                array(
-                    'host' => 'localhost',
-                    'select_privilages' => 'Y',
-                    'db' => 'phpmyadmin',
-                    'user' => 'pmauser'
-                )
-            )
-        );
-    }
-
-
-    /**
-     * Test _getRowInfoForSpecialLinks
-     *
-     * @param array   $fields_meta  meta information about fields
-     * @param integer $fields_count number of fields
-     * @param array   $row          current row data
-     * @param array   $col_order    the column order
-     * @param boolean $output       output of _getRowInfoForSpecialLinks
-     *
-     * @return void
-     *
-     * @dataProvider dataProviderForTestGetRowInfoForSpecialLinks
-     */
-    public function testGetRowInfoForSpecialLinks(
-        $fields_meta, $fields_count, $row, $col_order,  $output
-    ) {
-        $this->object->__set('fields_meta', $fields_meta);
-        $this->object->__set('fields_cnt', $fields_count);
-
-        $this->assertEquals(
-            $output,
-            $this->_callPrivateFunction(
-                '_getRowInfoForSpecialLinks',
-                array($row, $col_order)
-            )
-        );
-    }
-
-
-    /**
-     * Data provider for testGetShowAllButtonForTableNavigation
-     *
-     * @return array parameters and output
-     */
-    public function dataProviderForTestGetShowAllCheckboxForTableNavigation()
-    {
-        return array(
-            array(
-                'mysql',
-                'user',
-                'tbl_structure.php',
-                0,
-                'SELECT * FROM `user`',
-                "\n"
-                . '<td><form action="sql.php" method="post">'
-                . '<input type="hidden" name="db" value="mysql" />'
-                . '<input type="hidden" name="table" value="user" />'
-                . '<input type="hidden" name="lang" value="en" />'
-                . '<input type="hidden" name="collation_connection" value="utf-8" />'
-                . '<input type="hidden" name="token" value="token" />'
-                . '<input type="hidden" name="sql_query" value="SELECT * FROM `user`" />'
-                . '<input type="hidden" name="pos" value="0" />'
-                . '<input type="hidden" name="is_browse_distinct" value="" />'
-                . '<input type="hidden" name="session_max_rows" value="all" />'
-                . '<input type="hidden" name="goto" value="tbl_structure.php" />'
-                . '<input type="checkbox" name="navig" id="showAll_0"'
-                . ' class="showAllRows" value="all" />'
-                . '<label for="showAll_0">Show all</label></form></td>'
-            )
-        );
-    }
-
-
-    /**
-     * Test _getShowAllButtonForTableNavigation
-     *
-     * @param string $db             the database name
-     * @param string $table          the table name
-     * @param string $goto           the URL to go back in case of errors
-     * @param int    $unique_id      the unique id for the results set
-     * @param string $html_sql_query the sql encoded by html special characters
-     * @param string $output         output of _getRowInfoForSpecialLinks
-     *
-     * @return void
-     *
-     * @dataProvider dataProviderForTestGetShowAllCheckboxForTableNavigation
-     */
-    public function testGetShowAllCheckboxForTableNavigation(
-        $db, $table, $goto, $unique_id , $html_sql_query, $output
-    ) {
-        $this->object->__set('db', $db);
-        $this->object->__set('table', $table);
-        $this->object->__set('goto', $goto);
-        $this->object->__set('unique_id', $unique_id);
-
-        $this->assertEquals(
-            $output,
-            $this->_callPrivateFunction(
-                '_getShowAllCheckboxForTableNavigation',
-                array(false, $html_sql_query)
-            )
-        );
-    }
-
-
-    /**
-     * Data provider for testSetHighlightedColumnGlobalField
-     *
-     * @return array parameters and output
-     */
-    public function dataProviderForTestSetHighlightedColumnGlobalField()
-    {
-        $parser = new SqlParser\Parser(
-            'SELECT * FROM db_name WHERE `db_name`.`tbl`.id > 0 AND `id` < 10'
-        );
-        return array(
-            array(
-                array('statement' => $parser->statements[0]),
-                array(
-                    'db_name' => 'true',
-                    'tbl' => 'true',
-                    'id' => 'true',
-                ),
-            ),
-        );
-    }
-
-
-    /**
-     * Test _setHighlightedColumnGlobalField
-     *
-     * @param array $analyzed_sql the analyzed query
-     * @param array $output       setting value of _setHighlightedColumnGlobalField
-     *
-     * @return void
-     *
-     * @dataProvider dataProviderForTestSetHighlightedColumnGlobalField
-     */
-    public function testSetHighlightedColumnGlobalField($analyzed_sql, $output)
-    {
-        $this->_callPrivateFunction(
-            '_setHighlightedColumnGlobalField',
-            array($analyzed_sql)
-        );
-
-        $this->assertEquals(
-            $output,
-            $this->object->__get('highlight_columns')
-        );
-    }
-
-
-    /**
-     * Data provider for testGetPartialText
-     *
-     * @return array parameters and output
-     */
-    public function dataProviderForTestGetPartialText()
-    {
-        return array(
-            array('P', 10, 'foo', array(false, 'foo', 3)),
-            array('P', 1, 'foo', array(true, 'f...', 3)),
-            array('F', 10, 'foo', array(false, 'foo', 3)),
-            array('F', 1, 'foo', array(false, 'foo', 3))
-        );
-    }
-
-
-    /**
-     * Test _getPartialText
-     *
-     * @param string  $pftext     Partial or Full text
-     * @param integer $limitChars Partial or Full text
-     * @param string  $str        the string to be tested
-     * @param boolean $output     return value of _getPartialText
-     *
-     * @return void
-     *
-     * @dataProvider dataProviderForTestGetPartialText
-     */
-    public function testGetPartialText($pftext, $limitChars, $str, $output)
-    {
-        $_SESSION['tmpval']['pftext'] = $pftext;
-        $GLOBALS['cfg']['LimitChars'] = $limitChars;
-        $this->assertEquals(
-            $output,
-            $this->_callPrivateFunction(
-                '_getPartialText',
-                array($str)
-            )
-        );
-    }
-
-
-    /**
-     * Data provider for testHandleNonPrintableContents
-     *
-     * @return array parameters and output
-     */
-    public function dataProviderForTestHandleNonPrintableContents()
-    {
-        $transformation_plugin = new Text_Plain_Link();
-        $meta = new StdClass();
-        $meta->type = 'BLOB';
-        $meta->orgtable = 'bar';
-        $url_params = array('db' => 'foo', 'table' => 'bar');
-
-        return array(
-            array(
-                true,
-                true,
-                'BLOB',
-                '1001',
-                'PMA_mimeDefaultFunction',
-                '',
-                'PMA_mimeDefaultFunction',
-                $meta,
-                $url_params,
-                null,
-                '<a href="tbl_get_field.php?db=foo&amp;table=bar&amp;server=0'
-                . '&amp;lang=en&amp;collation_connection=utf-8'
-                . '&amp;token=token" class="disableAjax">1001</a>'
-            ),
-            array(
-                true,
-                true,
-                'BLOB',
-                hex2bin('123456'),
-                'PMA_mimeDefaultFunction',
-                '',
-                'PMA_mimeDefaultFunction',
-                $meta,
-                $url_params,
-                null,
-                '<a href="tbl_get_field.php?db=foo&amp;table=bar&amp;server=0'
-                . '&amp;lang=en&amp;collation_connection=utf-8'
-                . '&amp;token=token" class="disableAjax">0x123456</a>'
-            ),
-            array(
-                true,
-                false,
-                'BLOB',
-                '1001',
-                'PMA_mimeDefaultFunction',
-                '',
-                'PMA_mimeDefaultFunction',
-                $meta,
-                $url_params,
-                null,
-                '<a href="tbl_get_field.php?db=foo&amp;table=bar&amp;server=0'
-                . '&amp;lang=en&amp;collation_connection=utf-8'
-                . '&amp;token=token" class="disableAjax">[BLOB - 4 B]</a>'
-            ),
-            array(
-                false,
-                false,
-                'BINARY',
-                '1001',
-                $transformation_plugin,
-                '',
-                'PMA_mimeDefaultFunction',
-                $meta,
-                $url_params,
-                null,
-                '1001'
-            ),
-            array(
-                false,
-                true,
-                'GEOMETRY',
-                null,
-                '',
-                '',
-                'PMA_mimeDefaultFunction',
-                $meta,
-                $url_params,
-                null,
-                '[GEOMETRY - NULL]'
-            )
-        );
-    }
-
-
-    /**
-     * Test _handleNonPrintableContents
-     *
-     * @param boolean $display_binary        show binary contents?
-     * @param boolean $display_blob          show blob contents?
-     * @param string  $category              BLOB|BINARY|GEOMETRY
-     * @param string  $content               the binary content
-     * @param string  $transformation_plugin transformation plugin.
-     *                                       Can also be the default function:
-     *                                       PMA_mimeDefaultFunction
-     * @param string  $transform_options     transformation parameters
-     * @param string  $default_function      default transformation function
-     * @param object  $meta                  the meta-information about the field
-     * @param array   $url_params            parameters that should go to the
-     *                                       download link
-     * @param boolean $is_truncated          the result is truncated or not
-     * @param string  $output                the output of this function
-     *
-     * @return void
-     *
-     * @dataProvider dataProviderForTestHandleNonPrintableContents
-     */
-    public function testHandleNonPrintableContents(
-        $display_binary, $display_blob, $category, $content,
-        $transformation_plugin, $transform_options, $default_function,
-        $meta, $url_params, $is_truncated, $output
-    ) {
-        $_SESSION['tmpval']['display_binary'] = $display_binary;
-        $_SESSION['tmpval']['display_blob'] = $display_blob;
-        $GLOBALS['cfg']['LimitChars'] = 50;
-        $this->assertEquals(
-            $output,
-            $this->_callPrivateFunction(
-                '_handleNonPrintableContents',
-                array(
-                    $category, $content, $transformation_plugin,
-                    $transform_options, $default_function,
-                    $meta, $url_params, &$is_truncated
-                )
-            )
-        );
-    }
-
-
-    /**
-     * Data provider for testGetDataCellForNonNumericColumns
-     *
-     * @return array parameters and output
-     */
-    public function dataProviderForTestGetDataCellForNonNumericColumns()
-    {
-        $transformation_plugin = new Text_Plain_Link();
-        $meta = new StdClass();
-        $meta->db = 'foo';
-        $meta->table = 'tbl';
-        $meta->orgtable = 'tbl';
-        $meta->type = 'BLOB';
-        $meta->flags = 'blob binary';
-        $meta->name = 'tblob';
-        $meta->orgname = 'tblob';
-
-        $meta2 = new StdClass();
-        $meta2->db = 'foo';
-        $meta2->table = 'tbl';
-        $meta2->orgtable = 'tbl';
-        $meta2->type = 'string';
-        $meta2->flags = '';
-        $meta2->decimals = 0;
-        $meta2->name = 'varchar';
-        $meta2->orgname = 'varchar';
-        $url_params = array('db' => 'foo', 'table' => 'tbl');
-
-        return array(
-            array(
-                'all',
-                '1001',
-                'grid_edit',
-                $meta,
-                array(),
-                $url_params,
-                false,
-                'PMA_mimeDefaultFunction',
-                'PMA_mimeDefaultFunction',
-                array('https://www.example.com/'),
-                false,
-                array(),
-                0,
-                'binary',
-                '<td class="left   hex"><a href="tbl_get_field.php?'
-                . 'db=foo&amp;table=tbl&amp;server=0&amp;lang=en'
-                . '&amp;collation_connection=utf-8'
-                . '&amp;token=token" '
-                . 'class="disableAjax">[BLOB - 4 B]</a></td>'
-            ),
-            array(
-                'noblob',
-                '1001',
-                'grid_edit',
-                $meta,
-                array(),
-                $url_params,
-                false,
-                $transformation_plugin,
-                'PMA_mimeDefaultFunction',
-                '',
-                false,
-                array(),
-                0,
-                'binary',
-                '<td class="left grid_edit  transformed hex">'
-                . '1001</td>'
-            ),
-            array(
-                'noblob',
-                null,
-                'grid_edit',
-                $meta2,
-                array(),
-                $url_params,
-                false,
-                $transformation_plugin,
-                'PMA_mimeDefaultFunction',
-                '',
-                false,
-                array(),
-                0,
-                0,
-                '<td  data-decimals="0" data-type="string"  '
-                . 'class="grid_edit  null"><i>NULL</i></td>'
-            ),
-            array(
-                'all',
-                'foo bar baz',
-                'grid_edit',
-                $meta2,
-                array(),
-                $url_params,
-                false,
-                'PMA_mimeDefaultFunction',
-                'PMA_mimeDefaultFunction',
-                '',
-                false,
-                array(),
-                0,
-                0,
-                '<td data-decimals="0" data-type="string" '
-                . 'data-originallength="11" '
-                . 'class="grid_edit ">foo bar baz</td>' . "\n"
-            )
-        );
-    }
-
-
-    /**
-     * Test _getDataCellForNonNumericColumns
-     *
-     * @param boolean $protectBinary         all|blob|noblob|no
-     * @param string  $column                the relevant column in data row
-     * @param string  $class                 the html class for column
-     * @param object  $meta                  the meta-information about the field
-     * @param array   $map                   the list of relations
-     * @param array   $_url_params           the parameters for generate url
-     * @param boolean $condition_field       the column should highlighted
-     *                                       or not
-     * @param string  $transformation_plugin the name of transformation function
-     * @param string  $default_function      the default transformation function
-     * @param string  $transform_options     the transformation parameters
-     * @param boolean $is_field_truncated    is data truncated due to LimitChars
-     * @param array   $analyzed_sql_results  the analyzed query
-     * @param integer $dt_result             the link id associated to the query
-     *                                       which results have to be displayed
-     * @param integer $col_index             the column index
-     * @param string  $output                the output of this function
-     *
-     * @return void
-     *
-     * @dataProvider dataProviderForTestGetDataCellForNonNumericColumns
-     */
-    public function testGetDataCellForNonNumericColumns(
-        $protectBinary, $column, $class, $meta, $map,
-        $_url_params, $condition_field, $transformation_plugin,
-        $default_function, $transform_options, $is_field_truncated,
-        $analyzed_sql_results, $dt_result, $col_index, $output
-    ) {
-        $_SESSION['tmpval']['display_binary'] = true;
-        $_SESSION['tmpval']['display_blob'] = false;
-        $_SESSION['tmpval']['relational_display'] = false;
-        $GLOBALS['cfg']['LimitChars'] = 50;
-        $GLOBALS['cfg']['ProtectBinary'] = $protectBinary;
-        $this->assertEquals(
-            $output,
-            $this->_callPrivateFunction(
-                '_getDataCellForNonNumericColumns',
-                array(
-                    $column, $class, $meta, $map, $_url_params, $condition_field,
-                    $transformation_plugin, $default_function, $transform_options,
-                    $is_field_truncated, $analyzed_sql_results, &$dt_result, $col_index
-                )
-            )
-        );
-    }
-}
diff --git a/#pma/test/classes/ErrorHandlerTest.php b/#pma/test/classes/ErrorHandlerTest.php
deleted file mode 100644
index 53b3e85d..00000000
--- a/#pma/test/classes/ErrorHandlerTest.php
+++ /dev/null
@@ -1,308 +0,0 @@
-<?php
-/**
- * Tests for ErrorHandler
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-
-use PMA\libraries\Theme;
-
-require_once 'libraries/sanitizing.lib.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * Test for PMA\libraries\ErrorHandler class.
- *
- * @package PhpMyAdmin-test
- */
-class ErrorHandlerTest extends PMATestCase
-{
-    /**
-     * @access protected
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function setUp()
-    {
-        $this->object = new PMA\libraries\ErrorHandler();
-
-        $GLOBALS['pmaThemeImage'] = 'image';
-        $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
-        $_SESSION['PMA_Theme'] = new Theme();
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Call protected functions by setting visibility to public.
-     *
-     * @param string $name   method name
-     * @param array  $params parameters for the invocation
-     *
-     * @return the output from the protected method.
-     */
-    private function _callProtectedFunction($name, $params)
-    {
-        $class = new ReflectionClass('PMA\libraries\ErrorHandler');
-        $method = $class->getMethod($name);
-        $method->setAccessible(true);
-        return $method->invokeArgs($this->object, $params);
-    }
-
-    /**
-     * Data provider for testHandleError
-     *
-     * @return array data for testHandleError
-     */
-    public function providerForTestHandleError()
-    {
-        return array(
-            array(
-                E_RECOVERABLE_ERROR,
-                'Compile Error',
-                'error.txt',
-                12,
-                'Compile Error',
-                '',
-            ),
-            array(
-                E_USER_NOTICE,
-                'User notice',
-                'error.txt',
-                12,
-                'User notice',
-                'User notice',
-            )
-        );
-    }
-
-    /**
-     * Test for getDispErrors when PHP errors are not shown
-     *
-     * @param integer $errno       error number
-     * @param string  $errstr      error string
-     * @param string  $errfile     error file
-     * @param integer $errline     error line
-     * @param string  $output_show expected output if showing of errors is
-     *                             enabled
-     * @param string  $output_hide expected output if showing of errors is
-     *                             disabled and 'sendErrorReports' is set to 'never'
-     *
-     * @return void
-     *
-     * @dataProvider providerForTestHandleError
-     */
-    public function testGetDispErrorsForDisplayFalse(
-        $errno, $errstr, $errfile, $errline, $output_show, $output_hide
-    ) {
-        // TODO: Add other test cases for all combination of 'sendErrorReports'
-        $GLOBALS['cfg']['SendErrorReports'] = 'never';
-
-        $this->object->handleError($errno, $errstr, $errfile, $errline);
-
-        $output = $this->object->getDispErrors();
-
-        if ($output_hide == '') {
-            $this->assertEquals('', $output);
-        } else {
-            $this->assertContains($output_hide, $output);
-        }
-    }
-
-    /**
-     * Test for getDispErrors when PHP errors are shown
-     *
-     * @param integer $errno       error number
-     * @param string  $errstr      error string
-     * @param string  $errfile     error file
-     * @param integer $errline     error line
-     * @param string  $output_show expected output if showing of errors is
-     *                             enabled
-     * @param string  $output_hide expected output if showing of errors is
-     *                             disabled
-     *
-     * @return void
-     *
-     * @dataProvider providerForTestHandleError
-     */
-    public function testGetDispErrorsForDisplayTrue(
-        $errno, $errstr, $errfile, $errline, $output_show, $output_hide
-    ) {
-        $this->object->handleError($errno, $errstr, $errfile, $errline);
-
-        $this->assertContains(
-            $output_show,
-            $this->object->getDispErrors()
-        );
-
-    }
-
-    /**
-     * Test for checkSavedErrors
-     *
-     * @return void
-     */
-    public function testCheckSavedErrors()
-    {
-
-        $_SESSION['errors'] = array();
-
-        $this->_callProtectedFunction(
-            'checkSavedErrors',
-            array()
-        );
-        $this->assertTrue(!isset($_SESSION['errors']));
-    }
-
-    /**
-     * Test for countErrors
-     *
-     * @return void
-     *
-     * @group medium
-     */
-    public function testCountErrors()
-    {
-        $this->object->addError(
-            'Compile Error', E_WARNING, 'error.txt', 15
-        );
-        $this->assertEquals(
-            1,
-            $this->object->countErrors()
-        );
-    }
-
-    /**
-     * Test for sliceErrors
-     *
-     * @return void
-     *
-     * @group medium
-     */
-    public function testSliceErrors()
-    {
-        $this->object->addError(
-            'Compile Error', E_WARNING, 'error.txt', 15
-        );
-        $this->assertEquals(
-            1,
-            $this->object->countErrors()
-        );
-        $this->assertEquals(
-            array(),
-            $this->object->sliceErrors(1)
-        );
-        $this->assertEquals(
-            1,
-            $this->object->countErrors()
-        );
-        $this->assertEquals(
-            1,
-            count($this->object->sliceErrors(0))
-        );
-        $this->assertEquals(
-            0,
-            $this->object->countErrors()
-        );
-    }
-
-    /**
-     * Test for countUserErrors
-     *
-     * @return void
-     */
-    public function testCountUserErrors()
-    {
-        $this->object->addError(
-            'Compile Error', E_WARNING, 'error.txt', 15
-        );
-        $this->assertEquals(
-            0,
-            $this->object->countUserErrors()
-        );
-        $this->object->addError(
-            'Compile Error', E_USER_WARNING, 'error.txt', 15
-        );
-        $this->assertEquals(
-            1,
-            $this->object->countUserErrors()
-        );
-    }
-
-    /**
-     * Test for hasUserErrors
-     *
-     * @return void
-     */
-    public function testHasUserErrors()
-    {
-        $this->assertFalse($this->object->hasUserErrors());
-    }
-
-    /**
-     * Test for hasErrors
-     *
-     * @return void
-     */
-    public function testHasErrors()
-    {
-        $this->assertFalse($this->object->hasErrors());
-    }
-
-    /**
-     * Test for countDisplayErrors
-     *
-     * @return void
-     */
-    public function testCountDisplayErrorsForDisplayTrue()
-    {
-        $this->assertEquals(
-            0,
-            $this->object->countDisplayErrors()
-        );
-    }
-
-    /**
-     * Test for countDisplayErrors
-     *
-     * @return void
-     */
-    public function testCountDisplayErrorsForDisplayFalse()
-    {
-        $this->assertEquals(
-            0,
-            $this->object->countDisplayErrors()
-        );
-    }
-
-    /**
-     * Test for hasDisplayErrors
-     *
-     * @return void
-     */
-    public function testHasDisplayErrors()
-    {
-        $this->assertFalse($this->object->hasDisplayErrors());
-    }
-}
diff --git a/#pma/test/classes/ErrorTest.php b/#pma/test/classes/ErrorTest.php
deleted file mode 100644
index fa5c6e9d..00000000
--- a/#pma/test/classes/ErrorTest.php
+++ /dev/null
@@ -1,190 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Tests for Error.php
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-
-use PMA\libraries\Theme;
-
-require_once 'libraries/sanitizing.lib.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * Error class testing.
- *
- * @package PhpMyAdmin-test
- */
-class ErrorTest extends PMATestCase
-{
-    /**
-     * @access protected
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function setUp()
-    {
-        $this->object = new PMA\libraries\Error('2', 'Compile Error', 'error.txt', 15);
-
-        $GLOBALS['pmaThemeImage'] = 'image';
-        $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
-        $_SESSION['PMA_Theme'] = new Theme();
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Test for setBacktrace
-     *
-     * @return void
-     */
-    public function testSetBacktrace()
-    {
-        $bt = array(array('file'=>'bt1','line'=>2, 'function'=>'bar', 'args'=>array('foo'=>$this)));
-        $this->object->setBacktrace($bt);
-        $bt[0]['args']['foo'] = '<Class:ErrorTest>';
-        $this->assertEquals($bt, $this->object->getBacktrace());
-    }
-
-    /**
-     * Test for setLine
-     *
-     * @return void
-     */
-    public function testSetLine()
-    {
-        $this->object->setLine(15);
-        $this->assertEquals(15, $this->object->getLine());
-    }
-
-    /**
-     * Test for setFile
-     *
-     * @return void
-     *
-     * @dataProvider filePathProvider
-     */
-    public function testSetFile($file, $expected)
-    {
-        $this->object->setFile($file);
-        $this->assertEquals($expected, $this->object->getFile());
-    }
-
-    /**
-     * Data provider for setFile
-     *
-     * @return array
-     */
-    public function filePathProvider()
-    {
-        return array(
-            array('./ChangeLog', './ChangeLog'),
-            array(__FILE__, './test/classes/ErrorTest.php'),
-            array('./NONEXISTING', 'NONEXISTING'),
-        );
-    }
-
-    /**
-     * Test for getHash
-     *
-     * @return void
-     */
-    public function testGetHash()
-    {
-        $this->assertEquals(
-            1,
-            preg_match('/^([a-z0-9]*)$/', $this->object->getHash())
-        );
-    }
-
-    /**
-     * Test for getBacktraceDisplay
-     *
-     * @return void
-     */
-    public function testGetBacktraceDisplay()
-    {
-        $this->assertContains(
-            'PHPUnit_Framework_TestResult->run(<Class:ErrorTest>)<br />',
-            $this->object->getBacktraceDisplay()
-        );
-    }
-
-    /**
-     * Test for getDisplay
-     *
-     * @return void
-     */
-    public function testGetDisplay()
-    {
-        $this->assertContains(
-            '<div class="error"><strong>Warning</strong>',
-            $this->object->getDisplay()
-        );
-    }
-
-    /**
-     * Test for getHtmlTitle
-     *
-     * @return void
-     */
-    public function testGetHtmlTitle()
-    {
-        $this->assertEquals('Warning: Compile Error', $this->object->getHtmlTitle());
-    }
-
-    /**
-     * Test for getTitle
-     *
-     * @return void
-     */
-    public function testGetTitle()
-    {
-        $this->assertEquals('Warning: Compile Error', $this->object->getTitle());
-    }
-
-    /**
-     * Test for getBacktrace
-     *
-     * @return void
-     */
-    public function testGetBacktrace()
-    {
-        $bt = array(
-            array('file'=>'bt1','line'=>2, 'function'=>'bar', 'args'=>array('foo'=>1)),
-            array('file'=>'bt2','line'=>2, 'function'=>'bar', 'args'=>array('foo'=>2)),
-            array('file'=>'bt3','line'=>2, 'function'=>'bar', 'args'=>array('foo'=>3)),
-            array('file'=>'bt4','line'=>2, 'function'=>'bar', 'args'=>array('foo'=>4)),
-        );
-
-        $this->object->setBacktrace($bt);
-
-        // case: full backtrace
-        $this->assertEquals(4, count($this->object->getBacktrace()));
-
-        // case: first 2 frames
-        $this->assertEquals(2, count($this->object->getBacktrace(2)));
-    }
-}
diff --git a/#pma/test/classes/FileTest.php b/#pma/test/classes/FileTest.php
deleted file mode 100644
index 0e8779a2..00000000
--- a/#pma/test/classes/FileTest.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for PMA\libraries\File class
- *
- * @package PhpMyAdmin-test
- */
-
-require_once 'test/PMATestCase.php';
-
-/**
- * tests for PMA\libraries\File class
- *
- * @package PhpMyAdmin-test
- */
-class FileTest extends PMATestCase
-{
-    /**
-     * Setup function for test cases
-     *
-     * @return void
-     */
-    public function setup()
-    {
-        $GLOBALS['charset_conversion'] = false;
-    }
-
-    /**
-     * Test for PMA\libraries\File::getCompression
-     *
-     * @param string $file file string
-     * @param string $mime expected mime
-     *
-     * @return void
-     * @dataProvider compressedFiles
-     */
-    public function testMIME($file, $mime)
-    {
-        $arr = new PMA\libraries\File($file);
-        $this->assertEquals($mime, $arr->getCompression());
-    }
-
-    /**
-     * Test for PMA\libraries\File::getContent
-     *
-     * @param string $file file string
-     *
-     * @return void
-     * @dataProvider compressedFiles
-     */
-    public function testBinaryContent($file)
-    {
-        $data = '0x' . bin2hex(file_get_contents($file));
-        $file = new PMA\libraries\File($file);
-        $this->assertEquals($data, $file->getContent());
-    }
-
-    /**
-     * Data provider for tests
-     *
-     * @return array Test data
-     */
-    public function compressedFiles()
-    {
-        return array(
-            array('./test/test_data/test.gz', 'application/gzip'),
-            array('./test/test_data/test.bz2', 'application/bzip2'),
-            array('./test/test_data/test.zip', 'application/zip'),
-            );
-    }
-}
diff --git a/#pma/test/classes/FontTest.php b/#pma/test/classes/FontTest.php
deleted file mode 100644
index 5efb7d06..00000000
--- a/#pma/test/classes/FontTest.php
+++ /dev/null
@@ -1,262 +0,0 @@
-<?php
-/**
- * Tests for PMA\libraries\Font class
- *
- * @package PhpMyAdmin-test
- */
-
-require_once 'test/PMATestCase.php';
-
-/**
- * Tests for PMA\libraries\Font class
- *
- * @package PhpMyAdmin-test
- */
-class FontTest extends PMATestCase
-{
-    /**
-     * Test getStringWidth with different characters.
-     *
-     * @return void
-     */
-    function testGetStringWidth()
-    {
-        // empty string
-        $this->assertEquals(
-            0,
-            PMA\libraries\Font::getStringWidth("", "arial", "10")
-        );
-
-        // empty string
-        $this->assertEquals(
-            3,
-            PMA\libraries\Font::getStringWidth(" ", "arial", "10")
-        );
-
-        // string "a"
-        $this->assertEquals(
-            6,
-            PMA\libraries\Font::getStringWidth("a", "arial", "10")
-        );
-
-        // string "aa"
-        $this->assertEquals(
-            12,
-            PMA\libraries\Font::getStringWidth("aa", "arial", "10")
-        );
-
-        // string "i"
-        $this->assertEquals(
-            3,
-            PMA\libraries\Font::getStringWidth("i", "arial", "10")
-        );
-
-        // string "f"
-        $this->assertEquals(
-            3,
-            PMA\libraries\Font::getStringWidth("f", "arial", "10")
-        );
-
-        // string "t"
-        $this->assertEquals(
-            3,
-            PMA\libraries\Font::getStringWidth("t", "arial", "10")
-        );
-
-        // string "if"
-        $this->assertEquals(
-            5,
-            PMA\libraries\Font::getStringWidth("if", "arial", "10")
-        );
-
-        // string "it"
-        $this->assertEquals(
-            6,
-            PMA\libraries\Font::getStringWidth("it", "arial", "10")
-        );
-
-        // string "r"
-        $this->assertEquals(
-            4,
-            PMA\libraries\Font::getStringWidth("r", "arial", "10")
-        );
-
-        // string "1"
-        $this->assertEquals(
-            5,
-            PMA\libraries\Font::getStringWidth("1", "arial", "10")
-        );
-
-        // string "c"
-        $this->assertEquals(
-            5,
-            PMA\libraries\Font::getStringWidth("c", "arial", "10")
-        );
-
-        // string "F"
-        $this->assertEquals(
-            7,
-            PMA\libraries\Font::getStringWidth("F", "arial", "10")
-        );
-
-        // string "A"
-        $this->assertEquals(
-            7,
-            PMA\libraries\Font::getStringWidth("A", "arial", "10")
-        );
-
-        // string "w"
-        $this->assertEquals(
-            8,
-            PMA\libraries\Font::getStringWidth("w", "arial", "10")
-        );
-
-        // string "G"
-        $this->assertEquals(
-            8,
-            PMA\libraries\Font::getStringWidth("G", "arial", "10")
-        );
-
-        // string "m"
-        $this->assertEquals(
-            9,
-            PMA\libraries\Font::getStringWidth("m", "arial", "10")
-        );
-
-        // string "W"
-        $this->assertEquals(
-            10,
-            PMA\libraries\Font::getStringWidth("W", "arial", "10")
-        );
-
-        // string "$"
-        $this->assertEquals(
-            3,
-            PMA\libraries\Font::getStringWidth("$", "arial", "10")
-        );
-    }
-
-    /**
-     * Test getStringWidth with different fonts.
-     *
-     * @return void
-     */
-    function testGetStringWidthFont()
-    {
-        // string "phpMyAdmin", with Arial 10
-        $this->assertEquals(
-            59,
-            PMA\libraries\Font::getStringWidth("phpMyAdmin", "arial", "10")
-        );
-
-        // string "phpMyAdmin", with No font
-        $this->assertEquals(
-            59,
-            PMA\libraries\Font::getStringWidth("phpMyAdmin", "", "10")
-        );
-
-        // string "phpMyAdmin", with Times 10
-        $this->assertEquals(
-            55,
-            PMA\libraries\Font::getStringWidth("phpMyAdmin", "times", "10")
-        );
-
-        // string "phpMyAdmin", with Broadway 10
-        $this->assertEquals(
-            73,
-            PMA\libraries\Font::getStringWidth("phpMyAdmin", "broadway", "10")
-        );
-
-    }
-
-    /**
-     * Test getStringWidth with different font sizes.
-     *
-     * @return void
-     */
-    function testGetStringWidthSize()
-    {
-        // string "phpMyAdmin", with font size 0
-        $this->assertEquals(
-            0,
-            PMA\libraries\Font::getStringWidth("phpMyAdmin", "arial", "0")
-        );
-
-        // string "phpMyAdmin", with Arial 10
-        $this->assertEquals(
-            59,
-            PMA\libraries\Font::getStringWidth("phpMyAdmin", "arial", "10")
-        );
-
-        // string "phpMyAdmin", with Arial 11
-        $this->assertEquals(
-            65,
-            PMA\libraries\Font::getStringWidth("phpMyAdmin", "arial", "11")
-        );
-
-        // string "phpMyAdmin", with Arial 20
-        $this->assertEquals(
-            118,
-            PMA\libraries\Font::getStringWidth("phpMyAdmin", "arial", "20")
-        );
-    }
-
-    /**
-     * Test getStringWidth with a custom charList.
-     *
-     * @return void
-     */
-    function testGetStringWidthCharLists()
-    {
-        // string "a", with invalid charlist (= string)
-        $this->assertEquals(
-            6,
-            PMA\libraries\Font::getStringWidth("a", "arial", "10", "list")
-        );
-
-        // string "a", with invalid charlist (= array without proper structure)
-        $this->assertEquals(
-            6,
-            PMA\libraries\Font::getStringWidth("a", "arial", "10", array("list"))
-        );
-
-        // string "a", with invalid charlist (= array without proper structure :
-        // modifier is missing
-        $this->assertEquals(
-            6,
-            PMA\libraries\Font::getStringWidth(
-                "a", "arial", "10",
-                array(array("chars" => "a"))
-            )
-        );
-
-        // string "a", with invalid charlist (= array without proper structure :
-        // chars is missing
-        $this->assertEquals(
-            6,
-            PMA\libraries\Font::getStringWidth(
-                "a", "arial", "10",
-                array(array("modifier" => 0.61))
-            )
-        );
-
-        // string "a", with invalid charlist (= array without proper structure :
-        // chars is not an array
-        $this->assertEquals(
-            6,
-            PMA\libraries\Font::getStringWidth(
-                "a", "arial", "10",
-                array(array("chars" => "a", "modifier" => 0.61))
-            )
-        );
-
-        // string "a", with valid charlist
-        $this->assertEquals(
-            7,
-            PMA\libraries\Font::getStringWidth(
-                "a", "arial", "10",
-                array(array("chars" => array("a"), "modifier" => 0.61))
-            )
-        );
-    }
-}
diff --git a/#pma/test/classes/FooterTest.php b/#pma/test/classes/FooterTest.php
deleted file mode 100644
index f2647787..00000000
--- a/#pma/test/classes/FooterTest.php
+++ /dev/null
@@ -1,277 +0,0 @@
-<?php
-/**
- * Tests for Footer class
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-
-use PMA\libraries\Theme;
-
-require_once 'libraries/js_escape.lib.php';
-require_once 'libraries/url_generating.lib.php';
-require_once 'libraries/relation.lib.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * Tests for Footer class
- *
- * @package PhpMyAdmin-test
- */
-class FooterTest extends PMATestCase
-{
-
-    /**
-     * @var array store private attributes of PMA\libraries\Footer
-     */
-    public $privates = array();
-
-    /**
-     * @access protected
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function setUp()
-    {
-        $_SERVER['SCRIPT_NAME'] = 'index.php';
-        $GLOBALS['PMA_PHP_SELF'] = 'index.php';
-        $GLOBALS['db'] = '';
-        $GLOBALS['table'] = '';
-        $GLOBALS['text_dir'] = 'ltr';
-        $GLOBALS['pmaThemeImage'] = 'image';
-        $GLOBALS['PMA_Config'] = new PMA\libraries\Config();
-        $GLOBALS['PMA_Config']->enableBc();
-        $GLOBALS['collation_connection'] = 'utf8_general_ci';
-        $GLOBALS['cfg']['Server']['verbose'] = 'verbose host';
-        $GLOBALS['server'] = '1';
-        $_GET['reload_left_frame'] = '1';
-        $GLOBALS['focus_querywindow'] = 'main_pane_left';
-        $this->object = new PMA\libraries\Footer();
-        unset($GLOBALS['error_message']);
-        unset($GLOBALS['sql_query']);
-        $GLOBALS['error_handler'] = new PMA\libraries\ErrorHandler();
-        unset($_POST);
-
-        $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
-        $_SESSION['PMA_Theme'] = new Theme();
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Call private functions by setting visibility to public.
-     *
-     * @param string $name   method name
-     * @param array  $params parameters for the invocation
-     *
-     * @return the output from the private method.
-     */
-    private function _callPrivateFunction($name, $params)
-    {
-        $class = new ReflectionClass('PMA\libraries\Footer');
-        $method = $class->getMethod($name);
-        $method->setAccessible(true);
-        return $method->invokeArgs($this->object, $params);
-    }
-
-    /**
-     * Test for getDebugMessage
-     *
-     * @return void
-     *
-     * @group medium
-     */
-    public function testGetDebugMessage()
-    {
-        $GLOBALS['cfg']['DBG']['sql'] = true;
-        $_SESSION['debug']['queries'] = array(
-            array(
-                'count' => 1,
-                'time' => 0.2,
-                'query' => 'SELECT * FROM `pma_bookmark` WHERE 1',
-            ),
-            array(
-                'count' => 1,
-                'time' => 2.5,
-                'query' => 'SELECT * FROM `db` WHERE 1',
-            ),
-        );
-
-        $this->assertEquals(
-            '{"queries":[{"count":1,"time":0.2,"query":"SELECT * FROM `pma_bookmark` WHERE 1"},'
-            . '{"count":1,"time":2.5,"query":"SELECT * FROM `db` WHERE 1"}]}',
-            $this->object->getDebugMessage()
-        );
-    }
-
-    /**
-     * Test for _removeRecursion
-     *
-     * @return void
-     */
-    public function testRemoveRecursion()
-    {
-        $object = (object) array();
-        $object->child = (object) array();
-        $object->child->parent = $object;
-
-        $this->_callPrivateFunction(
-            '_removeRecursion',
-            array(
-                &$object
-            )
-        );
-
-        $this->assertEquals(
-            '{"child":{"parent":"***RECURSION***"}}',
-            json_encode($object)
-        );
-    }
-
-    /**
-     * Test for _getSelfLink
-     *
-     * @return void
-     */
-    public function testGetSelfLink()
-    {
-
-        $GLOBALS['cfg']['TabsMode'] = 'text';
-        $GLOBALS['cfg']['ServerDefault'] = 1;
-
-        $this->assertEquals(
-            '<div id="selflink" class="print_ignore"><a href="index.php?db=&amp;'
-            . 'table=&amp;server=1&amp;target=&amp;lang=en&amp;collation_connection='
-            . 'utf8_general_ci&amp;token=token" title="Open new phpMyAdmin window" '
-            . 'target="_blank" rel="noopener noreferrer">Open new phpMyAdmin window</a></div>',
-            $this->_callPrivateFunction(
-                '_getSelfLink',
-                array(
-                    $this->object->getSelfUrl()
-                )
-            )
-        );
-    }
-
-    /**
-     * Test for _getSelfLink
-     *
-     * @return void
-     */
-    public function testGetSelfLinkWithImage()
-    {
-
-        $GLOBALS['cfg']['TabsMode'] = 'icons';
-        $GLOBALS['cfg']['ServerDefault'] = 1;
-        $_SESSION['PMA_Theme'] = new Theme();
-        $GLOBALS['pmaThemeImage'] = 'image';
-
-        $this->assertEquals(
-            '<div id="selflink" class="print_ignore"><a href="index.php?db=&amp;'
-            . 'table=&amp;server=1&amp;target=&amp;lang=en&amp;collation_connection='
-            . 'utf8_general_ci&amp;token=token" title="Open new phpMyAdmin window" '
-            . 'target="_blank" rel="noopener noreferrer"><img src="imagewindow-new.png" title="Open new '
-            . 'phpMyAdmin window" alt="Open new phpMyAdmin window" /></a></div>',
-            $this->_callPrivateFunction(
-                '_getSelfLink',
-                array(
-                    $this->object->getSelfUrl()
-                )
-            )
-        );
-    }
-
-    /**
-     * Test for disable
-     *
-     * @return void
-     */
-    public function testDisable()
-    {
-        $footer = new PMA\libraries\Footer();
-        $footer->disable();
-        $this->assertEquals(
-            '',
-            $footer->getDisplay()
-        );
-    }
-
-    /**
-     * Test for footer when ajax enabled
-     *
-     * @return void
-     */
-    public function testAjax()
-    {
-        $footer = new PMA\libraries\Footer();
-        $footer->setAjax(true);
-        $this->assertEquals(
-            '',
-            $footer->getDisplay()
-        );
-    }
-
-    /**
-     * Test for footer get Scripts
-     *
-     * @return void
-     */
-    public function testGetScripts()
-    {
-        $footer = new PMA\libraries\Footer();
-        $this->assertContains(
-            '<script data-cfasync="false" type="text/javascript">',
-            $footer->getScripts()->getDisplay()
-        );
-    }
-
-    /**
-     * Test for displaying footer
-     *
-     * @return void
-     * @group medium
-     */
-    public function testDisplay()
-    {
-        $footer = new PMA\libraries\Footer();
-        $this->assertContains(
-            'Open new phpMyAdmin window',
-            $footer->getDisplay()
-        );
-    }
-
-    /**
-     * Test for minimal footer
-     *
-     * @return void
-     */
-    public function testMinimal()
-    {
-        $footer = new PMA\libraries\Footer();
-        $footer->setMinimal();
-        $this->assertEquals(
-            '</div></body></html>',
-            $footer->getDisplay()
-        );
-    }
-}
diff --git a/#pma/test/classes/HeaderTest.php b/#pma/test/classes/HeaderTest.php
deleted file mode 100644
index a60f7295..00000000
--- a/#pma/test/classes/HeaderTest.php
+++ /dev/null
@@ -1,178 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Test for PMA\libraries\Header class
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-use PMA\libraries\Theme;
-
-require_once 'libraries/sanitizing.lib.php';
-require_once 'libraries/database_interface.inc.php';
-require_once 'libraries/url_generating.lib.php';
-require_once 'libraries/relation.lib.php';
-require_once 'libraries/js_escape.lib.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * Test for PMA\libraries\Header class
- *
- * @package PhpMyAdmin-test
- * @group medium
- */
-class HeaderTest extends PMATestCase
-{
-    /**
-     * Configures global environment.
-     *
-     * @return void
-     */
-    function setup()
-    {
-        if (!defined('PMA_IS_WINDOWS')) {
-            define('PMA_IS_WINDOWS', false);
-        }
-        $GLOBALS['server'] = 0;
-        $GLOBALS['message'] = 'phpmyadminmessage';
-        $GLOBALS['is_ajax_request'] = false;
-        $_SESSION['PMA_Theme'] = new Theme();
-        $GLOBALS['pmaThemePath'] = $_SESSION['PMA_Theme']->getPath();
-        $GLOBALS['pmaThemeImage'] = 'theme/';
-        $GLOBALS['PMA_PHP_SELF'] = PMA_getenv('PHP_SELF');
-        $GLOBALS['server'] = 'server';
-        $GLOBALS['db'] = 'pma_test';
-        $GLOBALS['table'] = 'table1';
-        $GLOBALS['PMA_Config'] = new PMA\libraries\Config();
-        $GLOBALS['PMA_Config']->enableBc();
-        $GLOBALS['cfg']['Server']['DisableIS'] = false;
-        $GLOBALS['cfg']['Server']['verbose'] = 'verbose host';
-        $GLOBALS['cfg']['Server']['pmadb'] = '';
-        $GLOBALS['cfg']['Server']['user'] = '';
-    }
-
-    /**
-     * Test for disable
-     *
-     * @return void
-     */
-    public function testDisable()
-    {
-        $header = new PMA\libraries\Header();
-        $header->disable();
-        $this->assertEquals(
-            '',
-            $header->getDisplay()
-        );
-    }
-
-    /**
-     * Test for Set BodyId
-     *
-     * @return void
-     */
-    public function testSetBodyId()
-    {
-        $header = new PMA\libraries\Header();
-        $header->setBodyId('PMA_header_id');
-        $this->assertContains(
-            'PMA_header_id',
-            $header->getDisplay()
-        );
-    }
-
-    /**
-     * Test for print view
-     *
-     * @return void
-     */
-    public function testPrintView()
-    {
-        $header = new PMA\libraries\Header();
-        $header->enablePrintView();
-        $this->assertContains(
-            'Print view',
-            $header->getDisplay()
-        );
-    }
-
-    /**
-     * Test for Get JsParams
-     *
-     * @return void
-     */
-    public function testGetJsParams()
-    {
-        $header = new PMA\libraries\Header();
-        $this->assertArrayHasKey(
-            'common_query',
-            $header->getJsParams()
-        );
-    }
-
-    /**
-     * Test for Get JsParamsCode
-     *
-     * @return void
-     */
-    public function testGetJsParamsCode()
-    {
-        $header = new PMA\libraries\Header();
-        $this->assertContains(
-            'PMA_commonParams.setAll',
-            $header->getJsParamsCode()
-        );
-    }
-
-    /**
-     * Test for Get Message
-     *
-     * @return void
-     */
-    public function testGetMessage()
-    {
-        $header = new PMA\libraries\Header();
-        $this->assertContains(
-            'phpmyadminmessage',
-            $header->getMessage()
-        );
-    }
-
-    /**
-     * Test for Disable Warnings
-     *
-     * @return void
-     * @test
-     */
-    public function testDisableWarnings()
-    {
-        $header = new PMA\libraries\Header();
-        $header->disableWarnings();
-        $this->assertAttributeEquals(
-            false,
-            '_warningsEnabled',
-            $header
-        );
-    }
-
-    /**
-     * Tests private method _getWarnings when warnings are disabled
-     *
-     * @return void
-     * @test
-     */
-    public function testGetWarningsWithWarningsDisabled()
-    {
-        $method = new ReflectionMethod(
-            'PMA\libraries\Header', '_getWarnings'
-        );
-        $method->setAccessible(true);
-
-        $header = new PMA\libraries\Header();
-        $header->disableWarnings();
-        $this->assertEmpty($method->invoke($header));
-    }
-}
diff --git a/#pma/test/classes/IndexTest.php b/#pma/test/classes/IndexTest.php
deleted file mode 100644
index 8ea66cce..00000000
--- a/#pma/test/classes/IndexTest.php
+++ /dev/null
@@ -1,198 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Test for Index class
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-require_once 'test/PMATestCase.php';
-
-/**
- * Test for Index class
- *
- * @package PhpMyAdmin-test
- */
-class IndexTest extends PMATestCase
-{
-    private $_params = array();
-
-    /**
-     * Configures parameters.
-     *
-     * @return void
-     */
-    public function setup()
-    {
-        $this->_params['Schema'] = "PMA_Schema";
-        $this->_params['Table'] = "PMA_Table";
-        $this->_params['Key_name'] = "PMA_Key_name";
-        $this->_params['Index_choice'] = "PMA_Index_choice";
-        $this->_params['Comment'] = "PMA_Comment";
-        $this->_params['Index_comment'] = "PMA_Index_comment";
-        $this->_params['Non_unique'] = "PMA_Non_unique";
-        $this->_params['Packed'] = "PMA_Packed";
-
-        //test add columns
-        $column1 = array("Column_name"=>"column1","Seq_in_index"=>"index1",
-                         "Collation"=>"Collation1","Cardinality"=>"Cardinality1",
-                         "Null"=>"null1"
-                        );
-        $column2 = array("Column_name"=>"column2","Seq_in_index"=>"index2",
-                         "Collation"=>"Collation2","Cardinality"=>"Cardinality2",
-                         "Null"=>"null2"
-                        );
-        $column3 = array("Column_name"=>"column3","Seq_in_index"=>"index3",
-                         "Collation"=>"Collation3","Cardinality"=>"Cardinality3",
-                         "Null"=>"null3"
-                        );
-        $this->_params['columns'][] = $column1;
-        $this->_params['columns'][] = $column2;
-        $this->_params['columns'][] = $column3;
-    }
-
-    /**
-     * Test for Constructor
-     *
-     * @return void
-     */
-    public function testConstructor()
-    {
-        $index = new PMA\libraries\Index($this->_params);
-        $this->assertEquals(
-            'PMA_Index_comment',
-            $index->getComment()
-        );
-        $this->assertEquals(
-            'PMA_Comment',
-            $index->getRemarks()
-        );
-        $this->assertEquals(
-            'PMA_Index_choice',
-            $index->getChoice()
-        );
-        $this->assertEquals(
-            'PMA_Packed',
-            $index->getPacked()
-        );
-        $this->assertEquals(
-            'PMA_Non_unique',
-            $index->getNonUnique()
-        );
-        $this->assertContains(
-            'PMA_Comment',
-            $index->getComments()
-        );
-        $this->assertContains(
-            'PMA_Index_comment',
-            $index->getComments()
-        );
-        $this->assertEquals(
-            'PMA_Index_choice',
-            $index->getChoice()
-        );
-
-    }
-
-    /**
-     * Test for getIndexChoices
-     *
-     * @return void
-     */
-    public function testGetIndexChoices()
-    {
-        $index_choices = PMA\libraries\Index::getIndexChoices();
-        $this->assertEquals(
-            5,
-            count($index_choices)
-        );
-        $this->assertEquals(
-            'PRIMARY,INDEX,UNIQUE,SPATIAL,FULLTEXT',
-            implode(",", $index_choices)
-        );
-    }
-
-    /**
-     * Test for isUnique
-     *
-     * @return void
-     */
-    public function testIsUniquer()
-    {
-        $this->_params['Non_unique'] = "0";
-        $index = new PMA\libraries\Index($this->_params);
-        $this->assertTrue(
-            $index->isUnique()
-        );
-        $this->assertEquals(
-            'Yes',
-            $index->isUnique(true)
-        );
-    }
-
-    /**
-     * Test for add Columns
-     *
-     * @return void
-     */
-    public function testAddColumns()
-    {
-        $index = new PMA\libraries\Index();
-        $index->addColumns($this->_params['columns']);
-        $this->assertTrue($index->hasColumn("column1"));
-        $this->assertTrue($index->hasColumn("column2"));
-        $this->assertTrue($index->hasColumn("column3"));
-        $this->assertEquals(
-            3,
-            $index->getColumnCount()
-        );
-    }
-
-    /**
-     * Test for get Name & set Name
-     *
-     * @return void
-     */
-    public function testName()
-    {
-        $index = new PMA\libraries\Index();
-        $index->setName('PMA_name');
-        $this->assertEquals(
-            'PMA_name',
-            $index->getName()
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\Index_Column
-     *
-     * @return void
-     */
-    public function testColumns()
-    {
-        $index = new PMA\libraries\Index();
-        $index->addColumns($this->_params['columns']);
-
-        $index_columns = $index->getColumns();
-        $index_column = $index_columns['column1'];
-        $this->assertEquals(
-            'column1',
-            $index_column->getName()
-        );
-        $this->assertEquals(
-            'index1',
-            $index_column->getSeqInIndex()
-        );
-        $this->assertEquals(
-            'Collation1',
-            $index_column->getCollation()
-        );
-        $this->assertEquals(
-            'Cardinality1',
-            $index_column->getCardinality()
-        );
-    }
-}
diff --git a/#pma/test/classes/LanguageTest.php b/#pma/test/classes/LanguageTest.php
deleted file mode 100644
index b367dc14..00000000
--- a/#pma/test/classes/LanguageTest.php
+++ /dev/null
@@ -1,235 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for Advisor class
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-
-use PMA\libraries\LanguageManager;
-
-/**
- * Tests behaviour of PMA_Advisor class
- *
- * @package PhpMyAdmin-test
- */
-class LanguageTest extends PMATestCase
-{
-    private $manager;
-
-    /**
-     * Setup for Language tests.
-     *
-     * @return void
-     */
-    public function setup()
-    {
-        $loc = LOCALE_PATH . '/cs/LC_MESSAGES/phpmyadmin.mo';
-        if (! is_readable($loc)) {
-            $this->markTestSkipped('Missing compiled locales.');
-        }
-        $this->manager = new LanguageManager();
-    }
-
-    /**
-     * Test language filtering
-     *
-     * @return void
-     */
-    public function testAvailable()
-    {
-        $GLOBALS['cfg']['FilterLanguages'] = 'cs';
-
-        $langs = $this->manager->availableLocales();
-
-        $this->assertEquals(1, count($langs));
-        $this->assertContains('cs', $langs);
-        $GLOBALS['cfg']['FilterLanguages'] = '';
-    }
-
-    /**
-     * Test no language filtering
-     *
-     * @return void
-     */
-    public function testAllAvailable()
-    {
-        $GLOBALS['cfg']['FilterLanguages'] = '';
-
-        $langs = $this->manager->availableLocales();
-
-        $this->assertContains('cs', $langs);
-        $this->assertContains('en', $langs);
-    }
-
-    /**
-     * Test whether listing locales works
-     *
-     * @return void
-     */
-    public function testList()
-    {
-        $langs = $this->manager->listLocaleDir();
-        $this->assertContains('cs', $langs);
-        $this->assertContains('en', $langs);
-    }
-
-    /**
-     * Test for getting available languages
-     *
-     * @return void
-     */
-    public function testLanguages()
-    {
-        $langs = $this->manager->availableLanguages();
-        $this->assertGreaterThan(1, count($langs));
-
-        /* Ensure we have name for every language */
-        foreach($langs as $lang) {
-            $this->assertNotEquals($lang->getCode(), strtolower($lang->getEnglishName()));
-        }
-    }
-
-    /**
-     * Test for MySQL locales
-     *
-     * @return void
-     */
-    public function testMySQLLocale()
-    {
-        $czech = $this->manager->getLanguage('cs');
-        $this->assertEquals('cs_CZ', $czech->getMySQLLocale());
-
-        $korani = $this->manager->getLanguage('ckb');
-        $this->assertEquals('', $korani->getMySQLLocale());
-    }
-
-    /**
-     * Test for getting available sorted languages
-     *
-     * @return void
-     */
-    public function testSortedLanguages()
-    {
-        $langs = $this->manager->sortedLanguages();
-        $this->assertGreaterThan(1, count($langs));
-    }
-
-    /**
-     * Test getting language by code
-     *
-     * @return void
-     */
-    public function testGet()
-    {
-        $lang = $this->manager->getLanguage('cs');
-        $this->assertNotEquals(false, $lang);
-        $this->assertEquals('Czech', $lang->getEnglishName());
-        $this->assertEquals('Čeština', $lang->getNativeName());
-    }
-
-    /**
-     * Test language selection
-     *
-     * @param string $lang    Value for forced language
-     * @param string $post    Value for language in POST
-     * @param string $get     Value for language in GET
-     * @param string $cookie  Value for language in COOKIE
-     * @param string $accept  Value for HTTP Accept-Language header
-     * @param string $agent   Value for HTTP User-Agent header
-     * @param string $default Value for default language
-     * @param string $expect  Expected language name
-     *
-     * @return void
-     *
-     * @dataProvider selectDataProvider
-     */
-    public function testSelect($lang, $post, $get, $cookie, $accept, $agent, $default, $expect)
-    {
-        $GLOBALS['cfg']['Lang'] = $lang;
-        $_POST['lang'] = $post;
-        $_GET['lang'] = $get;
-        $_COOKIE['pma_lang'] = $cookie;
-        $_SERVER['HTTP_ACCEPT_LANGUAGE'] = $accept;
-        $_SERVER['HTTP_USER_AGENT'] = $agent;
-        $GLOBALS['cfg']['DefaultLang'] = $default;
-
-        $lang = $this->manager->selectLanguage();
-
-        $this->assertEquals($expect, $lang->getEnglishName());
-
-        $GLOBALS['cfg']['Lang'] = '';
-        $_POST['lang'] = '';
-        $_GET['lang'] = '';
-        $_COOKIE['pma_lang'] = '';
-        $_SERVER['HTTP_ACCEPT_LANGUAGE'] = '';
-        $_SERVER['HTTP_USER_AGENT'] = '';
-        $GLOBALS['cfg']['DefaultLang'] = 'en';
-    }
-
-    /**
-     * Data provider for language selection test.
-     *
-     * @return array Test parameters.
-     */
-    public function selectDataProvider()
-    {
-        return array(
-            array('cs', 'en', '', '' ,'' ,'', '', 'Czech'),
-            array('', 'cs', '', '' ,'' ,'', '', 'Czech'),
-            array('', 'cs', 'en', '' ,'' ,'', '', 'Czech'),
-            array('', '', 'cs', '' ,'' ,'', '', 'Czech'),
-            array('', '', '', '' ,'cs,en-US;q=0.7,en;q=0.3' ,'', '', 'Czech'),
-            array(
-                '', '', '', '', '',
-                'Mozilla/5.0 (Linux; U; Android 2.2.2; tr-tr; GM FOX)',
-                '', 'Turkish'
-            ),
-            array('', '', '', '' ,'' ,'', 'cs', 'Czech'),
-            array('', '', '', '' ,'' ,'', '', 'English'),
-        );
-    }
-
-    /**
-     * Test for setting and parsing locales
-     *
-     * @param string $locale locale name
-     *
-     * @return void
-     *
-     * @group large
-     * @dataProvider listLocales
-     */
-    public function testGettext($locale)
-    {
-        /* We should be able to set the language */
-        $this->manager->getLanguage($locale)->activate();
-
-        /* Grab some texts */
-        $this->assertContains('%s', _ngettext('%s table', '%s tables', 10));
-        $this->assertContains('%s', _ngettext('%s table', '%s tables', 1));
-
-        $this->assertEquals(
-            $locale,
-            $this->manager->getCurrentLanguage()->getCode()
-        );
-    }
-
-    /**
-     * Data provider to generate list of available locales.
-     *
-     * @return array with arrays of available locales
-     */
-    public function listLocales()
-    {
-        $ret = array();
-        foreach (LanguageManager::getInstance()->availableLanguages() as $language) {
-            $ret[] = array($language->getCode());
-        }
-        return $ret;
-    }
-}
diff --git a/#pma/test/classes/LinterTest.php b/#pma/test/classes/LinterTest.php
deleted file mode 100644
index f208a9e2..00000000
--- a/#pma/test/classes/LinterTest.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Tests for Linter.php.
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-use PMA\libraries\Linter;
-
-require_once 'test/PMATestCase.php';
-
-/**
- * Tests for PMA\libraries\Linter
- *
- * @package PhpMyAdmin-test
- */
-class LinterTest extends PMATestCase
-{
-
-    /**
-     * Test for Linter::getLines
-     *
-     * @return void
-     */
-    public function testGetLines()
-    {
-        $this->assertEquals(array(0), Linter::getLines(''));
-        $this->assertEquals(array(0, 2), Linter::getLines("a\nb"));
-        $this->assertEquals(array(0, 4, 7), Linter::getLines("abc\nde\n"));
-    }
-
-    /**
-     * Test for Linter::findLineNumberAndColumn
-     *
-     * @return void
-     */
-    public function testFindLineNumberAndColumn()
-    {
-        // Let the analyzed string be:
-        //      ^abc$
-        //      ^de$
-        //      ^$
-        //
-        // Where `^` is the beginning of the line and `$` the end of the line.
-        //
-        // Positions of each character (by line):
-        //      ( a, 0), ( b, 1), ( c, 2), (\n, 3),
-        //      ( d, 4), ( e, 5), (\n, 6),
-        //      (\n, 7).
-        $this->assertEquals(
-            array(1, 0),
-            Linter::findLineNumberAndColumn(array(0, 4, 7), 4)
-        );
-        $this->assertEquals(
-            array(1, 1),
-            Linter::findLineNumberAndColumn(array(0, 4, 7), 5)
-        );
-        $this->assertEquals(
-            array(1, 2),
-            Linter::findLineNumberAndColumn(array(0, 4, 7), 6)
-        );
-        $this->assertEquals(
-            array(2, 0),
-            Linter::findLineNumberAndColumn(array(0, 4, 7), 7)
-        );
-    }
-
-    /**
-     * Test for Linter::lint
-     *
-     * @dataProvider testLintProvider
-     *
-     * @param array  $expected The expected result.
-     * @param string $query    The query to be analyzed.
-     *
-     * @return void
-     */
-    public function testLint($expected, $query)
-    {
-        $this->assertEquals($expected, Linter::lint($query));
-    }
-
-    /**
-     * Provides data for `testLint`.
-     *
-     * @return array
-     */
-    public static function testLintProvider()
-    {
-        return array(
-            array(
-                array(),
-                '',
-            ),
-            array(
-                array(),
-                'SELECT * FROM tbl'
-            ),
-            array(
-                array(
-                    array(
-                        'message' => 'Unrecognized data type. (near ' .
-                            '<code>IN</code>)',
-                        'fromLine' => 0,
-                        'fromColumn' => 22,
-                        'toLine' => 0,
-                        'toColumn' => 24,
-                        'severity' => 'error',
-                    ),
-                    array(
-                        'message' => 'A closing bracket was expected. (near ' .
-                            '<code>IN</code>)',
-                        'fromLine' => 0,
-                        'fromColumn' => 22,
-                        'toLine' => 0,
-                        'toColumn' => 24,
-                        'severity' => 'error',
-                    )
-                ),
-                'CREATE TABLE tbl ( id IN'
-            ),
-            array(
-                array(
-                    array(
-                        'message' => 'Linting is disabled for this query because ' .
-                            'it exceeds the maximum length.',
-                        'fromLine' => 0,
-                        'fromColumn' => 0,
-                        'toLine' => 0,
-                        'toColumn' => 0,
-                        'severity' => 'warning',
-                    )
-                ),
-                str_repeat(";", 10001)
-            )
-        );
-    }
-}
diff --git a/#pma/test/classes/ListDatabaseTest.php b/#pma/test/classes/ListDatabaseTest.php
deleted file mode 100644
index d10d897d..00000000
--- a/#pma/test/classes/ListDatabaseTest.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for ListDatabase class
- *
- * @package PhpMyAdmin-test
- */
-
-use PMA\libraries\ListDatabase;
-
-$GLOBALS['server'] = 1;
-$GLOBALS['cfg']['Server']['DisableIS'] = false;
-/*
- * Include to test.
- */
-require_once 'libraries/relation.lib.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * tests for ListDatabase class
- *
- * @package PhpMyAdmin-test
- */
-class ListDatabaseTest extends PMATestCase
-{
-    /**
-     * SetUp for test cases
-     *
-     * @return void
-     */
-    public function setup()
-    {
-        $GLOBALS['cfg']['Server']['only_db'] = array('single\\_db');
-        $this->object = new ListDatabase();
-    }
-
-    /**
-     * Call protected functions by setting visibility to public.
-     *
-     * @param string $name   method name
-     * @param array  $params parameters for the invocation
-     *
-     * @return the output from the protected method.
-     */
-    private function _callProtectedFunction($name, $params)
-    {
-        $class = new ReflectionClass('PMA\libraries\ListDatabase');
-        $method = $class->getMethod($name);
-        $method->setAccessible(true);
-        return $method->invokeArgs($this->object, $params);
-    }
-
-    /**
-     * Test for ListDatabase::getEmpty
-     *
-     * @return void
-     */
-    public function testEmpty()
-    {
-        $arr = new ListDatabase;
-        $this->assertEquals('', $arr->getEmpty());
-    }
-
-    /**
-     * Test for ListDatabase::exists
-     *
-     * @return void
-     */
-    public function testExists()
-    {
-        $arr = new ListDatabase;
-        $this->assertEquals(true, $arr->exists('single_db'));
-    }
-
-    /**
-     * Test for ListDatabase::getHtmlOptions
-     *
-     * @return void
-     */
-    public function testHtmlOptions()
-    {
-        $arr = new ListDatabase;
-        $this->assertEquals(
-            '<option value="single_db">single_db</option>' . "\n",
-            $arr->getHtmlOptions()
-        );
-    }
-
-    /**
-     * Test for checkHideDatabase
-     *
-     * @return void
-     */
-    public function testCheckHideDatabase()
-    {
-        $GLOBALS['cfg']['Server']['hide_db'] = 'single\\_db';
-        $this->assertEquals(
-            $this->_callProtectedFunction(
-                'checkHideDatabase',
-                array()
-            ),
-            ''
-        );
-    }
-
-    /**
-     * Test for getDefault
-     *
-     * @return void
-     */
-    public function testGetDefault()
-    {
-        $GLOBALS['db'] = '';
-        $this->assertEquals(
-            $this->object->getDefault(),
-            ''
-        );
-
-        $GLOBALS['db'] = 'mysql';
-        $this->assertEquals(
-            $this->object->getDefault(),
-            'mysql'
-        );
-    }
-
-}
diff --git a/#pma/test/classes/MenuTest.php b/#pma/test/classes/MenuTest.php
deleted file mode 100644
index 64410a2c..00000000
--- a/#pma/test/classes/MenuTest.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Test for Menu class
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-use PMA\libraries\Menu;
-use PMA\libraries\Theme;
-
-require_once 'libraries/sanitizing.lib.php';
-require_once 'libraries/database_interface.inc.php';
-require_once 'libraries/url_generating.lib.php';
-require_once 'libraries/relation.lib.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * Test for Menu class
- *
- * @package PhpMyAdmin-test
- */
-class MenuTest extends PMATestCase
-{
-    /**
-     * Configures global environment.
-     *
-     * @return void
-     */
-    function setup()
-    {
-        if (!defined('PMA_IS_WINDOWS')) {
-            define('PMA_IS_WINDOWS', false);
-        }
-        $GLOBALS['cfg']['Server']['DisableIS'] = false;
-        $GLOBALS['server'] = 0;
-        $GLOBALS['cfg']['Server']['verbose'] = 'verbose host';
-        $_SESSION['PMA_Theme'] = new Theme();
-        $GLOBALS['pmaThemePath'] = $_SESSION['PMA_Theme']->getPath();
-        $GLOBALS['pmaThemeImage'] = 'theme/';
-        $GLOBALS['PMA_PHP_SELF'] = PMA_getenv('PHP_SELF');
-        $GLOBALS['server'] = 'server';
-        $GLOBALS['db'] = 'pma_test';
-        $GLOBALS['table'] = 'table1';
-    }
-
-    /**
-     * Server menu test
-     *
-     * @return void
-     */
-    function testServer()
-    {
-        $menu = new Menu('server', '', '');
-        $this->assertContains(
-            'floating_menubar',
-            $menu->getDisplay()
-        );
-    }
-
-    /**
-     * Database menu test
-     *
-     * @return void
-     */
-    function testDatabase()
-    {
-        $menu = new Menu('server', 'pma_test', '');
-        $this->assertContains(
-            'floating_menubar',
-            $menu->getDisplay()
-        );
-    }
-
-    /**
-     * Table menu test
-     *
-     * @return void
-     */
-    function testTable()
-    {
-        $menu = new Menu('server', 'pma_test', 'table1');
-        $this->assertContains(
-            'floating_menubar',
-            $menu->getDisplay()
-        );
-    }
-
-    /**
-     * Table menu display test
-     *
-     * @return void
-     */
-    function testTableDisplay()
-    {
-        $menu = new Menu('server', 'pma_test', '');
-        $this->expectOutputString(
-            $menu->getDisplay()
-        );
-        $menu->display();
-    }
-
-
-    /**
-     * Table menu setTable test
-     *
-     * @return void
-     */
-    function testSetTable()
-    {
-        $menu = new Menu('server', 'pma_test', '');
-        $menu->setTable('table1');
-        $this->assertContains(
-            'table1',
-            $menu->getDisplay()
-        );
-    }
-}
diff --git a/#pma/test/classes/MessageTest.php b/#pma/test/classes/MessageTest.php
deleted file mode 100644
index 203178f0..00000000
--- a/#pma/test/classes/MessageTest.php
+++ /dev/null
@@ -1,693 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Test for Message class
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-use PMA\libraries\Theme;
-
-require_once 'libraries/sanitizing.lib.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * Test for Message class
- *
- * @package PhpMyAdmin-test
- */
-class MessageTest extends PMATestCase
-{
-    /**
-     * @var    PMA\libraries\Message
-     * @access protected
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function setUp()
-    {
-        $this->object = new PMA\libraries\Message;
-        $_SESSION['PMA_Theme'] = new Theme();
-        $GLOBALS['pmaThemeImage'] = 'theme/';
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function tearDown()
-    {
-    }
-
-    /**
-     * to String casting test
-     *
-     * @return void
-     */
-    public function testToString()
-    {
-        $this->object->setMessage('test<&>', true);
-        $this->assertEquals('test&lt;&amp;&gt;', (string)$this->object);
-    }
-
-    /**
-     * test success method
-     *
-     * @return void
-     */
-    public function testSuccess()
-    {
-        $this->object = new PMA\libraries\Message('test<&>', PMA\libraries\Message::SUCCESS);
-        $this->assertEquals($this->object, PMA\libraries\Message::success('test<&>'));
-        $this->assertEquals(
-            'Your SQL query has been executed successfully.',
-            PMA\libraries\Message::success()->getString()
-        );
-    }
-
-    /**
-     * test error method
-     *
-     * @return void
-     */
-    public function testError()
-    {
-        $this->object = new PMA\libraries\Message('test<&>', PMA\libraries\Message::ERROR);
-        $this->assertEquals($this->object, PMA\libraries\Message::error('test<&>'));
-        $this->assertEquals('Error', PMA\libraries\Message::error()->getString());
-    }
-
-    /**
-     * test notice method
-     *
-     * @return void
-     */
-    public function testNotice()
-    {
-        $this->object = new PMA\libraries\Message('test<&>', PMA\libraries\Message::NOTICE);
-        $this->assertEquals($this->object, PMA\libraries\Message::notice('test<&>'));
-    }
-
-    /**
-     * test rawError method
-     *
-     * @return void
-     */
-    public function testRawError()
-    {
-        $this->object = new PMA\libraries\Message('', PMA\libraries\Message::ERROR);
-        $this->object->setMessage('test<&>');
-        $this->object->setBBCode(false);
-
-        $this->assertEquals($this->object, PMA\libraries\Message::rawError('test<&>'));
-    }
-
-    /**
-     * test rawNotice method
-     *
-     * @return void
-     */
-    public function testRawNotice()
-    {
-        $this->object = new PMA\libraries\Message('', PMA\libraries\Message::NOTICE);
-        $this->object->setMessage('test<&>');
-        $this->object->setBBCode(false);
-
-        $this->assertEquals($this->object, PMA\libraries\Message::rawNotice('test<&>'));
-    }
-
-    /**
-     * test rawSuccess method
-     *
-     * @return void
-     */
-    public function testRawSuccess()
-    {
-        $this->object = new PMA\libraries\Message('', PMA\libraries\Message::SUCCESS);
-        $this->object->setMessage('test<&>');
-        $this->object->setBBCode(false);
-
-        $this->assertEquals($this->object, PMA\libraries\Message::rawSuccess('test<&>'));
-    }
-
-    /**
-     * testing isSuccess method
-     *
-     * @return void
-     */
-    public function testIsSuccess()
-    {
-        $this->assertFalse($this->object->isSuccess());
-        $this->assertTrue($this->object->isSuccess(true));
-    }
-
-    /**
-     * testing isNotice method
-     *
-     * @return void
-     */
-    public function testIsNotice()
-    {
-        $this->assertTrue($this->object->isNotice());
-        $this->object->isError(true);
-        $this->assertFalse($this->object->isNotice());
-        $this->assertTrue($this->object->isNotice(true));
-    }
-
-    /**
-     * testing isError method
-     *
-     * @return void
-     */
-    public function testIsError()
-    {
-        $this->assertFalse($this->object->isError());
-        $this->assertTrue($this->object->isError(true));
-    }
-
-    /**
-     * testing setter of message
-     *
-     * @return void
-     */
-    public function testSetMessage()
-    {
-        $this->object->setMessage('test&<>', false);
-        $this->assertEquals('test&<>', $this->object->getMessage());
-        $this->object->setMessage('test&<>', true);
-        $this->assertEquals('test&amp;&lt;&gt;', $this->object->getMessage());
-    }
-
-    /**
-     * testing setter of string
-     *
-     * @return void
-     */
-    public function testSetString()
-    {
-        $this->object->setString('test&<>', false);
-        $this->assertEquals('test&<>', $this->object->getString());
-        $this->object->setString('test&<>', true);
-        $this->assertEquals('test&amp;&lt;&gt;', $this->object->getString());
-    }
-
-    /**
-     * testing add param method
-     *
-     * @return void
-     */
-    public function testAddParam()
-    {
-        $this->object->addParam(PMA\libraries\Message::notice('test'));
-        $this->assertEquals(
-            array(PMA\libraries\Message::notice('test')),
-            $this->object->getParams()
-        );
-        $this->object->addParam('test', true);
-        $this->assertEquals(
-            array(PMA\libraries\Message::notice('test'), 'test'),
-            $this->object->getParams()
-        );
-        $this->object->addParam('test', false);
-        $this->assertEquals(
-            array(PMA\libraries\Message::notice('test'), 'test', PMA\libraries\Message::notice('test')),
-            $this->object->getParams()
-        );
-    }
-
-    /**
-     * testing add string method
-     *
-     * @return void
-     */
-    public function testAddString()
-    {
-        $this->object->addString('test', '*');
-        $this->assertEquals(
-            array('*', PMA\libraries\Message::notice('test')),
-            $this->object->getAddedMessages()
-        );
-        $this->object->addString('test', '');
-        $this->assertEquals(
-            array(
-                '*',
-                PMA\libraries\Message::notice('test'),
-                '',
-                PMA\libraries\Message::notice('test')
-            ),
-            $this->object->getAddedMessages()
-        );
-    }
-
-    /**
-     * testing add message method
-     *
-     * @return void
-     */
-    public function testAddMessage()
-    {
-        $this->object->addMessage('test', '');
-        $this->assertEquals(
-            array(PMA\libraries\Message::rawNotice('test')),
-            $this->object->getAddedMessages()
-        );
-        $this->object->addMessage('test');
-        $this->assertEquals(
-            array(
-                PMA\libraries\Message::rawNotice('test'),
-                ' ',
-                PMA\libraries\Message::rawNotice('test')
-            ),
-            $this->object->getAddedMessages()
-        );
-    }
-
-    /**
-     * testing add messages method
-     *
-     * @return void
-     */
-    public function testAddMessages()
-    {
-        $messages = array();
-        $messages[] = "Test1";
-        $messages[] = new PMA\libraries\Message("PMA_Test2", PMA\libraries\Message::ERROR);
-        $messages[] = "Test3";
-        $this->object->addMessages($messages, '');
-
-        $this->assertEquals(
-            array(
-                PMA\libraries\Message::rawNotice('Test1'),
-                PMA\libraries\Message::error("PMA_Test2"),
-                PMA\libraries\Message::rawNotice('Test3')
-            ),
-            $this->object->getAddedMessages()
-        );
-    }
-
-    /**
-     * testing setter of params
-     *
-     * @return void
-     */
-    public function testSetParams()
-    {
-        $this->object->setParams('test&<>');
-        $this->assertEquals('test&<>', $this->object->getParams());
-        $this->object->setParams('test&<>', true);
-        $this->assertEquals('test&amp;&lt;&gt;', $this->object->getParams());
-    }
-
-    /**
-     * testing sanitize method
-     *
-     * @return void
-     */
-    public function testSanitize()
-    {
-        $this->object->setString('test&string<>', false);
-        $this->assertEquals(
-            'test&amp;string&lt;&gt;',
-            PMA\libraries\Message::sanitize($this->object)
-        );
-        $this->assertEquals(
-            array('test&amp;string&lt;&gt;', 'test&amp;string&lt;&gt;'),
-            PMA\libraries\Message::sanitize(array($this->object, $this->object))
-        );
-    }
-
-    /**
-     * Data provider for testDecodeBB
-     *
-     * @return array Test data
-     */
-    public function decodeBBDataProvider()
-    {
-        return array(
-            array(
-                '[em]test[/em][em]aa[em/][em]test[/em]',
-                '<em>test</em><em>aa[em/]<em>test</em>'
-            ),
-            array(
-                '[strong]test[/strong][strong]test[/strong]',
-                '<strong>test</strong><strong>test</strong>'
-            ),
-            array(
-                '[code]test[/code][code]test[/code]',
-                '<code>test</code><code>test</code>'
-            ),
-            array(
-                '[kbd]test[/kbd][br][sup]test[/sup]',
-                '<kbd>test</kbd><br /><sup>test</sup>'
-            ),
-            array(
-                '[a@https://example.com/@Documentation]link[/a]',
-                '<a href="./url.php?url=https%3A%2F%2Fexample.com%2F"'
-                . ' target="Documentation">link</a>'
-            ),
-            array(
-                '[a@./non-existing@Documentation]link[/a]',
-                '[a@./non-existing@Documentation]link</a>'
-            ),
-            array(
-                '[doc@foo]link[/doc]',
-                '<a href="./url.php?url=https%3A%2F%2Fdocs.phpmyadmin.net%2Fen%2F'
-                . 'latest%2Fsetup.html%23foo" '
-                . 'target="documentation">link</a>'
-            ),
-        );
-    }
-
-    /**
-     * testing decodeBB method
-     *
-     * @param string $actual   BB code string
-     * @param string $expected Expected decoded string
-     *
-     * @return void
-     *
-     * @dataProvider decodeBBDataProvider
-     */
-    public function testDecodeBB($actual, $expected)
-    {
-        unset($GLOBALS['server']);
-        unset($GLOBALS['collation_connection']);
-        $this->assertEquals($expected, PMA\libraries\Message::decodeBB($actual));
-    }
-
-    /**
-     * testing format method
-     *
-     * @return void
-     */
-    public function testFormat()
-    {
-        $this->assertEquals(
-            'test string',
-            PMA\libraries\Message::format('test string')
-        );
-        $this->assertEquals(
-            'test string',
-            PMA\libraries\Message::format('test string', 'a')
-        );
-        $this->assertEquals(
-            'test string',
-            PMA\libraries\Message::format('test string', array())
-        );
-        $this->assertEquals(
-            'test string',
-            PMA\libraries\Message::format('%s string', array('test'))
-        );
-
-    }
-
-    /**
-     * testing getHash method
-     *
-     * @return void
-     */
-    public function testGetHash()
-    {
-        $this->object->setString('<&>test', false);
-        $this->object->setMessage('<&>test', false);
-        $this->assertEquals(
-            md5(PMA\libraries\Message::NOTICE . '<&>test<&>test'),
-            $this->object->getHash()
-        );
-    }
-
-    /**
-     * getMessage test - with empty message and with non-empty string -
-     * not key in globals additional params are defined
-     *
-     * @return void
-     */
-    public function testGetMessageWithoutMessageWithStringWithParams()
-    {
-        $this->object->setMessage('');
-        $this->object->setString('test string %s %s');
-        $this->object->addParam('test param 1');
-        $this->object->addParam('test param 2');
-        $this->assertEquals(
-            'test string test param 1 test param 2',
-            $this->object->getMessage()
-        );
-    }
-
-    /**
-     * getMessage test - with empty message and with empty string
-     *
-     * @return void
-     */
-    public function testGetMessageWithoutMessageWithEmptyString()
-    {
-        $this->object->setMessage('');
-        $this->object->setString('');
-        $this->assertEquals('', $this->object->getMessage());
-    }
-
-    /**
-     * getMessage test - with empty message and with string, which is key to GLOBALS
-     * additional messages are defined
-     *
-     * @return void
-     */
-    public function testGetMessageWithoutMessageWithGlobalStringWithAddMessages()
-    {
-        $GLOBALS['key'] = 'test message';
-        $this->object->setMessage('');
-        $this->object->setString('key');
-        $this->object->addMessage('test message 2', ' - ');
-        $this->object->addMessage('test message 3', '&');
-        $this->assertEquals(
-            'test message - test message 2&test message 3',
-            $this->object->getMessage()
-        );
-        unset($GLOBALS['key']);
-    }
-
-    /**
-     * getMessage test - message is defined
-     * message with BBCode defined
-     *
-     * @return void
-     */
-    public function testGetMessageWithMessageWithBBCode()
-    {
-        $this->object->setMessage('[kbd]test[/kbd] [doc@cfg_Example]test[/doc]');
-        $this->assertEquals(
-            '<kbd>test</kbd> <a href="./url.php?url=https%3A%2F%2Fdocs.phpmyadmin.'
-            . 'net%2Fen%2Flatest%2Fconfig.html%23cfg_Example"'
-            . ' target="documentation">test</a>',
-            $this->object->getMessage()
-        );
-    }
-
-    /**
-     * getLevel test
-     *
-     * @return void
-     */
-    public function testGetLevel()
-    {
-        $this->assertEquals('notice', $this->object->getLevel());
-        $this->object->setNumber(PMA\libraries\Message::SUCCESS);
-        $this->assertEquals('success', $this->object->getLevel());
-        $this->object->setNumber(PMA\libraries\Message::ERROR);
-        $this->assertEquals('error', $this->object->getLevel());
-    }
-
-    /**
-     * testing display method (output string and _is_displayed variable)
-     *
-     * @return void
-     */
-    public function testDisplay()
-    {
-        $this->assertFalse($this->object->isDisplayed());
-        $this->object->setMessage('Test Message');
-
-        $this->expectOutputString(
-            '<div class="notice"><img src="theme/s_notice.png" title="" alt="" /> '
-            . 'Test Message</div>'
-        );
-        $this->object->display();
-
-        $this->assertTrue($this->object->isDisplayed());
-    }
-
-    /**
-     * getDisplay test
-     *
-     * @return void
-     */
-    public function testGetDisplay()
-    {
-        $this->object->setMessage('Test Message');
-        $this->assertEquals(
-            '<div class="notice"><img src="theme/s_notice.png" title="" alt="" /> '
-            . 'Test Message</div>',
-            $this->object->getDisplay()
-        );
-    }
-
-    /**
-     * isDisplayed test
-     *
-     * @return void
-     */
-    public function testIsDisplayed()
-    {
-        $this->assertFalse($this->object->isDisplayed(false));
-        $this->assertTrue($this->object->isDisplayed(true));
-        $this->assertTrue($this->object->isDisplayed(false));
-    }
-
-    /**
-     * Data provider for testAffectedRows
-     *
-     * @return array Test-data
-     */
-    public function providerAffectedRows()
-    {
-        return array(
-            array(
-                1,
-                '<div class="notice"><img src="theme/s_notice.png" title="" alt="" '
-                . '/>  1 row affected.</div>'
-            ),
-            array(
-                2,
-                '<div class="notice"><img src="theme/s_notice.png" title="" alt="" '
-                . '/>  2 rows affected.</div>'
-            ),
-            array(
-                10000,
-                '<div class="notice"><img src="theme/s_notice.png" title="" alt="" '
-                . '/>  10000 rows affected.</div>'
-            )
-        );
-    }
-
-    /**
-     * Test for getMessageForAffectedRows() method
-     *
-     * @param int    $rows   Number of rows
-     * @param string $output Expected string
-     *
-     * @return void
-     *
-     * @dataProvider providerAffectedRows
-     */
-    public function testAffectedRows($rows, $output)
-    {
-        $this->object = new PMA\libraries\Message();
-        $msg = $this->object->getMessageForAffectedRows($rows);
-        echo $this->object->addMessage($msg);
-        $this->expectOutputString($output);
-        $this->object->display();
-    }
-
-    /**
-     * Data provider for testInsertedRows
-     *
-     * @return array Test-data
-     */
-    public function providerInsertedRows()
-    {
-        return array(
-            array(
-                1,
-                '<div class="notice"><img src="theme/s_notice.png" title="" alt="" '
-                . '/>  1 row inserted.</div>'
-            ),
-            array(
-                2,
-                '<div class="notice"><img src="theme/s_notice.png" title="" alt="" '
-                . '/>  2 rows inserted.</div>'
-            ),
-            array(
-                100000,
-                '<div class="notice"><img src="theme/s_notice.png" title="" alt="" '
-                . '/>  100000 rows inserted.</div>'
-            )
-        );
-    }
-
-    /**
-     * Test for getMessageForInsertedRows() method
-     *
-     * @param int    $rows   Number of rows
-     * @param string $output Expected string
-     *
-     * @return void
-     *
-     * @dataProvider providerInsertedRows
-     */
-    public function testInsertedRows($rows, $output)
-    {
-        $this->object = new PMA\libraries\Message();
-        $msg = $this->object->getMessageForInsertedRows($rows);
-        echo $this->object->addMessage($msg);
-        $this->expectOutputString($output);
-        $this->object->display();
-    }
-
-    /**
-     * Data provider for testDeletedRows
-     *
-     * @return array Test-data
-     */
-    public function providerDeletedRows()
-    {
-        return array(
-            array(
-                1,
-                '<div class="notice"><img src="theme/s_notice.png" title="" alt="" '
-                . '/>  1 row deleted.</div>'
-            ),
-            array(
-                2,
-                '<div class="notice"><img src="theme/s_notice.png" title="" alt="" '
-                . '/>  2 rows deleted.</div>'
-            ),
-            array(
-                500000,
-                '<div class="notice"><img src="theme/s_notice.png" title="" alt="" '
-                . '/>  500000 rows deleted.</div>'
-            )
-        );
-    }
-
-    /**
-     * Test for getMessageForDeletedRows() method
-     *
-     * @param int    $rows   Number of rows
-     * @param string $output Expected string
-     *
-     * @return void
-     *
-     * @dataProvider providerDeletedRows
-     */
-    public function testDeletedRows($rows, $output)
-    {
-        $this->object = new PMA\libraries\Message();
-        $msg = $this->object->getMessageForDeletedRows($rows);
-        echo $this->object->addMessage($msg);
-        $this->expectOutputString($output);
-        $this->object->display();
-    }
-}
diff --git a/#pma/test/classes/PDFTest.php b/#pma/test/classes/PDFTest.php
deleted file mode 100644
index cf328b0f..00000000
--- a/#pma/test/classes/PDFTest.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for PDF class
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-use PMA\libraries\PDF;
-
-require_once 'test/PMATestCase.php';
-
-/**
- * tests for PDF class
- *
- * @package PhpMyAdmin-test
- */
-class PDFTest extends PMATestCase
-{
-    /**
-     * SetUp for test cases
-     *
-     * @return void
-     */
-    public function setup()
-    {
-        $GLOBALS['PMA_Config'] = new PMA\libraries\Config();
-        $GLOBALS['PMA_Config']->enableBc();
-    }
-
-    /**
-     * Test for PDF::getPDFData
-     *
-     * @group large
-     * @return void
-     */
-    public function testBasic()
-    {
-        $arr = new PDF();
-        $this->assertContains('PDF', $arr->getPDFData());
-    }
-
-    /**
-     * Test for PDF::getPDFData
-     *
-     * @group large
-     * @return void
-     */
-    public function testAlias()
-    {
-        $arr = new PDF();
-        $arr->SetAlias('{00}', '32');
-        $this->assertContains('PDF', $arr->getPDFData());
-    }
-
-    /**
-     * Test for PDF::getPDFData
-     *
-     * @group large
-     * @return void
-     */
-    public function testDocument()
-    {
-        $pdf = new PDF();
-        $pdf->SetTitle('Title');
-        $pdf->Open();
-        $pdf->SetAutoPageBreak('auto');
-        $pdf->Addpage();
-        $pdf->SetFont(PDF::PMA_PDF_FONT, 'B', 14);
-        $pdf->Cell(0, 6, 'Cell', 'B', 1, 'C');
-        $pdf->Ln();
-        $pdf->Addpage();
-        $pdf->Bookmark('Bookmark');
-        $pdf->SetMargins(0, 0);
-        $pdf->SetDrawColor(200, 200, 200);
-        $pdf->line(0, 0, 100, 100);
-        $this->assertContains('PDF', $pdf->getPDFData());
-    }
-}
diff --git a/#pma/test/classes/ScriptsTest.php b/#pma/test/classes/ScriptsTest.php
deleted file mode 100644
index d0023cf7..00000000
--- a/#pma/test/classes/ScriptsTest.php
+++ /dev/null
@@ -1,244 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Tests for Script.php
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-
-use PMA\libraries\Scripts;
-
-require_once 'libraries/js_escape.lib.php';
-require_once 'libraries/url_generating.lib.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * Tests for Script.php
- *
- * @package PhpMyAdmin-test
- */
-class ScriptsTest extends PMATestCase
-{
-    /**
-     * @access protected
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function setUp()
-    {
-        $this->object = new Scripts();
-        if (! defined('PMA_USR_BROWSER_AGENT')) {
-            define('PMA_USR_BROWSER_AGENT', 'MOZILLA');
-        }
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Call private functions by setting visibility to public.
-     *
-     * @param string $name   method name
-     * @param array  $params parameters for the invocation
-     *
-     * @return the output from the private method.
-     */
-    private function _callPrivateFunction($name, $params)
-    {
-        $class = new ReflectionClass('PMA\libraries\Scripts');
-        $method = $class->getMethod($name);
-        $method->setAccessible(true);
-        return $method->invokeArgs($this->object, $params);
-    }
-
-    /**
-     * Test for _includeFile
-     *
-     * @return void
-     *
-     * @group medium
-     */
-    public function testIncludeFile()
-    {
-        $this->assertEquals(
-            '<script data-cfasync="false" type="text/javascript" '
-            . 'src="js/get_scripts.js.php?'
-            . 'scripts%5B%5D=common.js&amp;v=' . PMA_VERSION . '"></script>',
-            $this->_callPrivateFunction(
-                '_includeFiles',
-                array(
-                    array(
-                        array(
-                            'has_onload' => false,
-                            'filename' => 'common.js',
-                            'conditional_ie' => false
-                        )
-                    )
-                )
-            )
-        );
-    }
-
-    /**
-     * Test for getDisplay
-     *
-     * @return void
-     */
-    public function testGetDisplay()
-    {
-
-        $this->object->addFile('common.js');
-
-        $this->assertRegExp(
-            '@<script data-cfasync="false" type="text/javascript" '
-            . 'src="js/get_scripts.js.php\\?'
-            . 'scripts%5B%5D=common.js&amp;v=' . PMA_VERSION . '"></script>'
-            . '<script data-cfasync="false" type="text/'
-            . 'javascript">// <!\\[CDATA\\[' . "\n"
-            . 'AJAX.scriptHandler.add\\("common.js",1\\);' . "\n"
-            . '\\$\\(function\\(\\) \\{AJAX.fireOnload\\("common.js"\\);\\}\\);'
-            . "\n"
-            . '// ]]></script>@',
-            $this->object->getDisplay()
-        );
-
-    }
-
-    /**
-     * test for addCode
-     *
-     * @return void
-     */
-    public function testAddCode()
-    {
-
-        $this->object->addCode('alert(\'CodeAdded\');');
-
-        $this->assertEquals(
-            '<script data-cfasync="false" type="text/javascript">// <![CDATA[
-alert(\'CodeAdded\');
-AJAX.scriptHandler;
-$(function() {});
-// ]]></script>',
-            $this->object->getDisplay()
-        );
-    }
-
-     /**
-     * test for getFiles
-     *
-     * @return void
-     */
-    public function testGetFiles()
-    {
-        // codemirror's onload event is blacklisted
-        $this->object->addFile('codemirror/lib/codemirror.js');
-
-        $this->object->addFile('common.js');
-        $this->assertEquals(
-            array(
-                array('name' => 'codemirror/lib/codemirror.js', 'fire' => 0),
-                array('name' => 'common.js', 'fire' => 1)
-            ),
-            $this->object->getFiles()
-        );
-    }
-
-    /**
-     * test for addFile
-     *
-     * @return void
-     */
-    public function testAddFile()
-    {
-        // Assert empty _files property of
-        // Scripts
-        $this->assertAttributeEquals(
-            array(),
-            '_files',
-            $this->object
-        );
-
-        // Add one script file
-        $file = 'common.js';
-        $hash = 'd7716810d825f4b55d18727c3ccb24e6';
-        $_files = array(
-            $hash => array(
-                'has_onload' => 1,
-                'filename' => 'common.js',
-                'conditional_ie' => false,
-                'before_statics' => false
-            )
-        );
-        $this->object->addFile($file);
-        $this->assertAttributeEquals(
-            $_files,
-            '_files',
-            $this->object
-        );
-
-        // Add same script file again w/
-        // conditional_ie true
-        $this->object->addFile($file, true);
-        // No change in _files as file was already added
-        $this->assertAttributeEquals(
-            $_files,
-            '_files',
-            $this->object
-        );
-    }
-
-    /**
-     * test for addFiles
-     *
-     * @return void
-     */
-    public function testAddFiles()
-    {
-        $filenames = array(
-            'common.js',
-            'sql.js',
-            'common.js',
-        );
-        $_files = array(
-            'd7716810d825f4b55d18727c3ccb24e6' => array(
-                'has_onload' => 1,
-                'filename' => 'common.js',
-                'conditional_ie' => true,
-                'before_statics' => false
-            ),
-            '347a57484fcd6ea6d8a125e6e1d31f78' => array(
-                'has_onload' => 1,
-                'filename' => 'sql.js',
-                'conditional_ie' => true,
-                'before_statics' => false
-            ),
-        );
-        $this->object->addFiles($filenames, true);
-        $this->assertAttributeEquals(
-            $_files,
-            '_files',
-            $this->object
-        );
-    }
-}
diff --git a/#pma/test/classes/ServerStatusDataTest.php b/#pma/test/classes/ServerStatusDataTest.php
deleted file mode 100644
index a2db8b58..00000000
--- a/#pma/test/classes/ServerStatusDataTest.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Test for ServerStatusData class
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-use PMA\libraries\ServerStatusData;
-
-require_once 'libraries/url_generating.lib.php';
-require_once 'libraries/database_interface.inc.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * Test for ServerStatusData class
- *
- * @package PhpMyAdmin-test
- */
-class ServerStatusDataTest extends PMATestCase
-{
-    /**
-     * @access protected
-     */
-    protected $object;
-
-    /**
-     * Configures global environment.
-     *
-     * @return void
-     */
-    function setup()
-    {
-        $GLOBALS['PMA_PHP_SELF'] = PMA_getenv('PHP_SELF');
-        $GLOBALS['cfg']['Server']['host'] = "::1";
-        $GLOBALS['replication_info']['master']['status'] = true;
-        $GLOBALS['replication_info']['slave']['status'] = true;
-        $GLOBALS['replication_types'] = array();
-
-        //Mock DBI
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        //this data is needed when ServerStatusData constructs
-        $server_status = array(
-            "Aborted_clients" => "0",
-            "Aborted_connects" => "0",
-            "Com_delete_multi" => "0",
-            "Com_create_function" => "0",
-            "Com_empty_query" => 3,
-            "Key_blocks_used" => 2,
-            "Key_writes" => true,
-            "Key_reads" => true,
-            "Key_write_requests" => 5,
-            "Key_read_requests" => 1,
-            "Threads_created" => true,
-            "Connections" => 2,
-        );
-
-        $server_variables= array(
-            "auto_increment_increment" => "1",
-            "auto_increment_offset" => "1",
-            "automatic_sp_privileges" => "ON",
-            "back_log" => "50",
-            "big_tables" => "OFF",
-            "key_buffer_size" => 10,
-        );
-
-        $fetchResult = array(
-            array(
-                "SHOW GLOBAL STATUS",
-                0,
-                1,
-                null,
-                0,
-                $server_status
-            ),
-            array(
-                "SHOW GLOBAL VARIABLES",
-                0,
-                1,
-                null,
-                0,
-                $server_variables
-            ),
-            array(
-                "SELECT concat('Com_', variable_name), variable_value "
-                    . "FROM data_dictionary.GLOBAL_STATEMENTS",
-                0,
-                1,
-                null,
-                0,
-                $server_status
-            ),
-        );
-
-        $dbi->expects($this->any())->method('fetchResult')
-            ->will($this->returnValueMap($fetchResult));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $this->object = new ServerStatusData();
-    }
-
-    /**
-     * tests getMenuHtml()
-     *
-     * @return void
-     */
-    function testGetMenuHtml()
-    {
-        $html = $this->object->getMenuHtml();
-
-        $this->assertContains('Server', $html);
-        $this->assertContains('server_status.php', $html);
-
-        $this->assertContains('Processes', $html);
-        $this->assertContains('server_status_processes.php', $html);
-
-        $this->assertContains('Query statistics', $html);
-        $this->assertContains('server_status_queries.php', $html);
-
-        $this->assertContains('All status variables', $html);
-        $this->assertContains('server_status_variables.php', $html);
-
-        $this->assertContains('Monitor', $html);
-        $this->assertContains('server_status_monitor.php', $html);
-
-        $this->assertContains('Advisor', $html);
-        $this->assertContains('server_status_advisor.php', $html);
-    }
-}
diff --git a/#pma/test/classes/StorageEngineTest.php b/#pma/test/classes/StorageEngineTest.php
deleted file mode 100644
index 15cddaca..00000000
--- a/#pma/test/classes/StorageEngineTest.php
+++ /dev/null
@@ -1,311 +0,0 @@
-<?php
-/**
- * Tests for StorageEngine.php
- *
- * @package PhpMyAdmin-test
- */
-
-use PMA\libraries\StorageEngine;
-
-require_once 'test/PMATestCase.php';
-/*
- * Include to test.
- */
-require_once 'libraries/config.default.php';
-require_once 'libraries/database_interface.inc.php';
-
-/**
- * Tests for StorageEngine.php
- *
- * @package PhpMyAdmin-test
- */
-class StorageEngineTest extends PMATestCase
-{
-    /**
-     * @access protected
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function setUp()
-    {
-        $GLOBALS['server'] = 1;
-        $this->object = $this->getMockForAbstractClass(
-            'PMA\libraries\StorageEngine', array('dummy')
-        );
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Test for getStorageEngines
-     *
-     * @return void
-     */
-    public function testGetStorageEngines()
-    {
-
-        $this->assertEquals(
-            array(
-                'dummy' => array(
-                    'Engine' => 'dummy',
-                    'Support' => 'YES',
-                    'Comment' => 'dummy comment',
-                ),
-                'dummy2' => array(
-                    'Engine' => 'dummy2',
-                    'Support' => 'NO',
-                    'Comment' => 'dummy2 comment',
-                ),
-                'FEDERATED' => array(
-                    'Engine' => 'FEDERATED',
-                    'Support' => 'NO',
-                    'Comment' => 'Federated MySQL storage engine'
-                ),
-            ),
-            $this->object->getStorageEngines()
-        );
-    }
-
-    /**
-     * Test for getHtmlSelect
-     *
-     * @return void
-     *
-     * @group medium
-     */
-    public function testGetHtmlSelect()
-    {
-        $html = $this->object->getHtmlSelect();
-
-        $this->assertContains(
-            '<option value="dummy" title="dummy comment">',
-            $html
-        );
-    }
-
-    /**
-     * Test for StorageEngine::getEngine
-     *
-     * @param string $expectedClass Class that should be selected
-     * @param string $engineName    Engine name
-     *
-     * @return void
-     *
-     * @dataProvider providerGetEngine
-     */
-    public function testGetEngine($expectedClass, $engineName)
-    {
-        $this->assertInstanceOf(
-            $expectedClass, StorageEngine::getEngine($engineName)
-        );
-    }
-
-    /**
-     * Provider for testGetEngine
-     *
-     * @return array
-     */
-    public function providerGetEngine()
-    {
-        return array(
-            array('PMA\libraries\StorageEngine', 'unknown engine'),
-            array('PMA\libraries\engines\Bdb', 'Bdb'),
-            array('PMA\libraries\engines\Berkeleydb', 'Berkeleydb'),
-            array('PMA\libraries\engines\Binlog', 'Binlog'),
-            array('PMA\libraries\engines\Innobase', 'Innobase'),
-            array('PMA\libraries\engines\Innodb', 'Innodb'),
-            array('PMA\libraries\engines\Memory', 'Memory'),
-            array('PMA\libraries\engines\Merge', 'Merge'),
-            array('PMA\libraries\engines\Mrg_Myisam', 'Mrg_Myisam'),
-            array('PMA\libraries\engines\Myisam', 'Myisam'),
-            array('PMA\libraries\engines\Ndbcluster', 'Ndbcluster'),
-            array('PMA\libraries\engines\Pbxt', 'Pbxt'),
-            array('PMA\libraries\engines\Performance_Schema', 'Performance_Schema'),
-        );
-    }
-
-    /**
-     * Test for isValid
-     *
-     * @return void
-     */
-    public function testIsValid()
-    {
-
-        $this->assertTrue(
-            $this->object->isValid('PBMS')
-        );
-        $this->assertTrue(
-            $this->object->isValid('dummy')
-        );
-        $this->assertTrue(
-            $this->object->isValid('dummy2')
-        );
-        $this->assertFalse(
-            $this->object->isValid('invalid')
-        );
-    }
-
-    /**
-     * Test for getPage
-     *
-     * @return void
-     */
-    public function testGetPage()
-    {
-
-        $this->assertEquals(
-            '',
-            $this->object->getPage('Foo')
-        );
-    }
-
-    /**
-     * Test for getInfoPages
-     *
-     * @return void
-     */
-    public function testGetInfoPages()
-    {
-
-        $this->assertEquals(
-            array(),
-            $this->object->getInfoPages()
-        );
-    }
-
-    /**
-     * Test for getVariablesLikePattern
-     *
-     * @return void
-     */
-    public function testGetVariablesLikePattern()
-    {
-
-        $this->assertEquals(
-            '',
-            $this->object->getVariablesLikePattern()
-        );
-    }
-
-    /**
-     * Test for getMysqlHelpPage
-     *
-     * @return void
-     */
-    public function testGetMysqlHelpPage()
-    {
-
-        $this->assertEquals(
-            'dummy-storage-engine',
-            $this->object->getMysqlHelpPage()
-        );
-    }
-
-    /**
-     * Test for getVariables
-     *
-     * @return void
-     */
-    public function testGetVariables()
-    {
-
-        $this->assertEquals(
-            array(),
-            $this->object->getVariables()
-        );
-    }
-
-    /**
-     * Test for getSupportInformationMessage
-     *
-     * @return void
-     */
-    public function testGetSupportInformationMessage()
-    {
-        $this->assertEquals(
-            'dummy is available on this MySQL server.',
-            $this->object->getSupportInformationMessage()
-        );
-
-        $this->object->support = 1;
-        $this->assertEquals(
-            'dummy has been disabled for this MySQL server.',
-            $this->object->getSupportInformationMessage()
-        );
-
-        $this->object->support = 2;
-        $this->assertEquals(
-            'dummy is available on this MySQL server.',
-            $this->object->getSupportInformationMessage()
-        );
-
-        $this->object->support = 3;
-        $this->assertEquals(
-            'dummy is the default storage engine on this MySQL server.',
-            $this->object->getSupportInformationMessage()
-        );
-    }
-
-    /**
-     * Test for getComment
-     *
-     * @return void
-     */
-    public function testGetComment()
-    {
-
-        $this->assertEquals(
-            'dummy comment',
-            $this->object->getComment()
-        );
-    }
-
-    /**
-     * Test for getTitle
-     *
-     * @return void
-     */
-    public function testGetTitle()
-    {
-
-        $this->assertEquals(
-            'dummy',
-            $this->object->getTitle()
-        );
-    }
-
-    /**
-     * Test for resolveTypeSize
-     *
-     * @return void
-     */
-    public function testResolveTypeSize()
-    {
-
-        $this->assertEquals(
-            array(
-                0 => 12,
-                1 => 'B'
-            ),
-            $this->object->resolveTypeSize(12)
-        );
-    }
-}
diff --git a/#pma/test/classes/SystemDatabaseTest.php b/#pma/test/classes/SystemDatabaseTest.php
deleted file mode 100644
index f079e640..00000000
--- a/#pma/test/classes/SystemDatabaseTest.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Tests for libraries/SystemDatabase.php
- *
- * @package PhpMyAdmin-test
- */
-
-require_once 'test/PMATestCase.php';
-
-/**
- * Tests for libraries/SystemDatabase.php
- *
- * @package PhpMyAdmin-test
- */
-class SystemDatabaseTest extends PMATestCase
-{
-    /**
-     * Setup function for test cases
-     *
-     * @access protected
-     * @return void
-     */
-    protected function setUp()
-    {
-        /**
-         * SET these to avoid undefine d index error
-         */
-        $GLOBALS['server'] = 1;
-        $GLOBALS['cfg']['Server']['pmadb'] = '';
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->any())
-            ->method('tryQuery')
-            ->will($this->returnValue('executeResult2'));
-
-        //_SESSION
-        $_SESSION['relation'][$GLOBALS['server']] = array(
-            'PMA_VERSION' => PMA_VERSION,
-            'table_coords' => "table_name",
-            'displaywork' => 'displaywork',
-            'db' => "information_schema",
-            'table_info' => 'table_info',
-            'relwork' => 'relwork',
-            'commwork' => 'commwork',
-            'pdfwork' => 'pdfwork',
-            'column_info' => 'column_info',
-            'relation' => 'relation',
-        );
-
-        $dbi->expects($this->any())
-            ->method('fetchAssoc')
-            ->will(
-                $this->returnValue(
-                    array(
-                        'table_name' => "table_name",
-                        'column_name' => "column_name",
-                        'comment' => "comment",
-                        'mimetype' => "mimetype",
-                        'transformation' => "transformation",
-                        'transformation_options' => "transformation_options",
-                    )
-                )
-            );
-
-        $this->sysDb = new PMA\libraries\SystemDatabase($dbi);
-    }
-
-    /**
-     * Tests for PMA_getExistingTransformationData() method.
-     *
-     * @return void
-     * @test
-     */
-    public function testPMAGetExistingTransformationData()
-    {
-        $db = "PMA_db";
-        $ret = $this->sysDb->getExistingTransformationData($db);
-
-        //validate that is the same as $GLOBALS['dbi']->tryQuery
-        $this->assertEquals(
-            'executeResult2',
-            $ret
-        );
-    }
-
-    /**
-     * Tests for PMA_getNewTransformationDataSql() method.
-     *
-     * @return void
-     * @test
-     */
-    public function testPMAGetNewTransformationDataSql()
-    {
-        $db = "PMA_db";
-        $pma_transformation_data = array();
-        $column_map = array(
-            array(
-                "table_name" => "table_name",
-                "refering_column" => "column_name"
-            )
-        );
-        $view_name = "view_name";
-
-        $ret = $this->sysDb->getNewTransformationDataSql(
-            $pma_transformation_data, $column_map, $view_name, $db
-        );
-
-        $sql = "INSERT INTO `information_schema`.`column_info` "
-            . "(`db_name`, `table_name`, `column_name`, `comment`, `mimetype`, "
-            . "`transformation`, `transformation_options`) VALUES "
-            . "('PMA_db', 'view_name', 'column_name', 'comment', 'mimetype', "
-            . "'transformation', 'transformation_options')";
-
-        $this->assertEquals(
-            $sql,
-            $ret
-        );
-    }
-}
diff --git a/#pma/test/classes/TableTest.php b/#pma/test/classes/TableTest.php
deleted file mode 100644
index 760cdefe..00000000
--- a/#pma/test/classes/TableTest.php
+++ /dev/null
@@ -1,1240 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Tests for Table.php
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-use PMA\libraries\Table;
-use PMA\libraries\Theme;
-use PMA\libraries\Util;
-
-require_once 'libraries/mysql_charsets.lib.php';
-require_once 'libraries/database_interface.inc.php';
-require_once 'libraries/url_generating.lib.php';
-require_once 'libraries/relation.lib.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * Tests behaviour of Table class
- *
- * @package PhpMyAdmin-test
- */
-class TableTest extends PMATestCase
-{
-    /**
-     * Configures environment
-     *
-     * @return void
-     */
-    protected function setUp()
-    {
-        /**
-         * SET these to avoid undefined index error
-         */
-        $GLOBALS['server'] = 0;
-        $GLOBALS['cfg']['Server']['DisableIS'] = false;
-        $GLOBALS['cfg']['MaxExactCount'] = 100;
-        $GLOBALS['cfg']['MaxExactCountViews'] = 100;
-        $GLOBALS['cfg']['Server']['pmadb'] = "pmadb";
-        $GLOBALS['sql_auto_increment'] = true;
-        $GLOBALS['sql_if_not_exists'] = true;
-        $GLOBALS['sql_drop_table'] = true;
-        $GLOBALS['cfg']['Server']['table_uiprefs'] = "pma__table_uiprefs";
-
-        $_SESSION['PMA_Theme'] = new Theme();
-        $GLOBALS['pmaThemeImage'] = 'themes/dot.gif';
-        $GLOBALS['is_ajax_request'] = false;
-        $GLOBALS['cfgRelation'] = PMA_getRelationsParam();
-        $GLOBALS['dblist'] = new DataBasePMAMock();
-        $GLOBALS['dblist']->databases = new DataBaseMock();
-
-        $sql_isView_true =  "SELECT TABLE_NAME
-            FROM information_schema.VIEWS
-            WHERE TABLE_SCHEMA = 'PMA'
-                AND TABLE_NAME = 'PMA_BookMark'";
-
-        $sql_isView_false =  "SELECT TABLE_NAME
-            FROM information_schema.VIEWS
-            WHERE TABLE_SCHEMA = 'PMA'
-                AND TABLE_NAME = 'PMA_BookMark_2'";
-
-        $sql_isUpdatableView_true = "SELECT TABLE_NAME
-            FROM information_schema.VIEWS
-            WHERE TABLE_SCHEMA = 'PMA'
-                AND TABLE_NAME = 'PMA_BookMark'
-                AND IS_UPDATABLE = 'YES'";
-
-        $sql_isUpdatableView_false = "SELECT TABLE_NAME
-            FROM information_schema.VIEWS
-            WHERE TABLE_SCHEMA = 'PMA'
-                AND TABLE_NAME = 'PMA_BookMark_2'
-                AND IS_UPDATABLE = 'YES'";
-
-        $sql_analyzeStructure_true = "SELECT COLUMN_NAME, DATA_TYPE
-                FROM information_schema.COLUMNS
-                WHERE TABLE_SCHEMA = 'PMA'
-                AND TABLE_NAME = 'PMA_BookMark'";
-
-        $sql_copy_data = "SELECT TABLE_NAME
-            FROM information_schema.VIEWS
-            WHERE TABLE_SCHEMA = 'db_data'
-                AND TABLE_NAME = 'table_data'";
-
-        $getUniqueColumns_sql = "select unique column";
-
-        $fetchResult = array(
-            array(
-                $sql_isView_true,
-                null,
-                null,
-                null,
-                0,
-                true
-            ),
-            array(
-                $sql_copy_data,
-                null,
-                null,
-                null,
-                0,
-                false
-            ),
-            array(
-                $sql_isView_false,
-                null,
-                null,
-                null,
-                0,
-                false
-            ),
-            array(
-                $sql_isUpdatableView_true,
-                null,
-                null,
-                null,
-                0,
-                true
-            ),
-            array(
-                $sql_isUpdatableView_false,
-                null,
-                null,
-                null,
-                0,
-                false
-            ),
-            array(
-                $sql_analyzeStructure_true,
-                null,
-                null,
-                null,
-                0,
-                array(
-                    array('COLUMN_NAME'=>'COLUMN_NAME', 'DATA_TYPE'=>'DATA_TYPE')
-                )
-            ),
-            array(
-                $getUniqueColumns_sql,
-                array('Key_name', null),
-                'Column_name',
-                null,
-                0,
-                array(
-                    array('index1'),
-                    array('index3'),
-                    array('index5'),
-                )
-            ),
-            array(
-                $getUniqueColumns_sql,
-                'Column_name',
-                'Column_name',
-                null,
-                0,
-                array(
-                    'column1',
-                    'column3',
-                    'column5',
-                    'ACCESSIBLE',
-                    'ADD',
-                    'ALL'
-                )
-            ),
-            array(
-                'SHOW COLUMNS FROM `PMA`.`PMA_BookMark`',
-                'Field',
-                'Field',
-                null,
-                0,
-                array(
-                    'column1',
-                    'column3',
-                    'column5',
-                    'ACCESSIBLE',
-                    'ADD',
-                    'ALL'
-                )
-            ),
-            array(
-                'SHOW COLUMNS FROM `PMA`.`PMA_BookMark`',
-                null,
-                null,
-                null,
-                0,
-                array(
-                    array(
-                        'Field'=>'COLUMN_NAME1',
-                        'Type'=> 'INT(10)',
-                        'Null'=> 'NO',
-                        'Key'=> '',
-                        'Default'=> NULL,
-                        'Extra'=>''
-                    ),
-                    array(
-                        'Field'=>'COLUMN_NAME2',
-                        'Type'=> 'INT(10)',
-                        'Null'=> 'YES',
-                        'Key'=> '',
-                        'Default'=> NULL,
-                        'Extra'=>'STORED GENERATED'
-                    )
-                )
-            ),
-        );
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->any())->method('fetchResult')
-            ->will($this->returnValueMap($fetchResult));
-
-        $dbi->expects($this->any())->method('fetchValue')
-            ->will(
-                $this->returnValue(
-                    "CREATE TABLE `PMA`.`PMA_BookMark_2` (
-                    `id` int(11) NOT NULL AUTO_INCREMENT,
-                    `username` text NOT NULL
-                    )"
-                )
-            );
-
-        $dbi->_table_cache["PMA"]["PMA_BookMark"] = array(
-            'ENGINE' => true,
-            'Create_time' => true,
-            'TABLE_TYPE' => true,
-            'Comment' => true,
-        );
-
-        $databases = array();
-        $database_name = 'PMA';
-        $databases[$database_name]['SCHEMA_TABLES'] = 1;
-        $databases[$database_name]['SCHEMA_TABLE_ROWS'] = 3;
-        $databases[$database_name]['SCHEMA_DATA_LENGTH'] = 5;
-        $databases[$database_name]['SCHEMA_MAX_DATA_LENGTH'] = 10;
-        $databases[$database_name]['SCHEMA_INDEX_LENGTH'] = 10;
-        $databases[$database_name]['SCHEMA_LENGTH'] = 10;
-
-        $dbi->expects($this->any())->method('getTablesFull')
-            ->will($this->returnValue($databases));
-
-        $dbi->expects($this->any())->method('isSystemSchema')
-            ->will($this->returnValue(false));
-
-        $dbi->expects($this->any())->method('numRows')
-            ->will($this->returnValue(20));
-
-        $dbi->expects($this->any())->method('tryQuery')
-            ->will($this->returnValue(10));
-
-        $triggers = array(
-            array("name" => "name1", "create"=>"crate1"),
-            array("name" => "name2", "create"=>"crate2"),
-            array("name" => "name3", "create"=>"crate3"),
-        );
-
-        $dbi->expects($this->any())->method('getTriggers')
-            ->will($this->returnValue($triggers));
-
-        $create_sql = "CREATE TABLE `PMA`.`PMA_BookMark_2` (
-                    `id` int(11) NOT NULL AUTO_INCREMENT,
-                    `username` text NOT NULL";
-        $dbi->expects($this->any())->method('query')
-            ->will($this->returnValue($create_sql));
-
-        $dbi->expects($this->any())->method('getTableIndexesSql')
-            ->will($this->returnValue($getUniqueColumns_sql));
-
-        $dbi->expects($this->any())->method('insertId')
-            ->will($this->returnValue(10));
-
-        $dbi->expects($this->any())->method('fetchAssoc')
-            ->will($this->returnValue(false));
-
-        $value = array("Auto_increment" => "Auto_increment");
-        $dbi->expects($this->any())->method('fetchSingleRow')
-            ->will($this->returnValue($value));
-
-        $dbi->expects($this->any())->method('fetchRow')
-            ->will($this->returnValue(false));
-
-        $dbi->expects($this->any())->method('escapeString')
-            ->will($this->returnArgument(0));
-
-        $GLOBALS['dbi'] = $dbi;
-    }
-
-    /**
-     * Test object creating
-     *
-     * @return void
-     */
-    public function testCreate()
-    {
-        $table = new Table('table1', 'pma_test');
-        $this->assertInstanceOf('PMA\libraries\Table', $table);
-    }
-
-    /**
-     * Test for constructor
-     *
-     * @return void
-     */
-    public function testConstruct()
-    {
-        $table = new Table("PMA_BookMark", "PMA");
-        $this->assertEquals(
-            'PMA_BookMark',
-            $table->__toString()
-        );
-        $this->assertEquals(
-            'PMA_BookMark',
-            $table->getName()
-        );
-        $this->assertEquals(
-            'PMA',
-            $table->getDbName()
-        );
-        $this->assertEquals(
-            'PMA.PMA_BookMark',
-            $table->getFullName()
-        );
-    }
-
-    /**
-     * Test getName & getDbName
-     *
-     * @return void
-     */
-    public function testGetName()
-    {
-        $table = new Table('table1', 'pma_test');
-        $this->assertEquals(
-            "table1",
-            $table->getName()
-        );
-        $this->assertEquals(
-            "`table1`",
-            $table->getName(true)
-        );
-        $this->assertEquals(
-            "pma_test",
-            $table->getDbName()
-        );
-        $this->assertEquals(
-            "`pma_test`",
-            $table->getDbName(true)
-        );
-    }
-
-    /**
-     * Test getLastError & getLastMessage
-     *
-     * @return void
-     */
-    public function testGetLastErrorAndMessage()
-    {
-        $table = new Table('table1', 'pma_test');
-        $table->errors[] = "error1";
-        $table->errors[] = "error2";
-        $table->errors[] = "error3";
-
-        $table->messages[] = "messages1";
-        $table->messages[] = "messages2";
-        $table->messages[] = "messages3";
-
-        $this->assertEquals(
-            "error3",
-            $table->getLastError()
-        );
-        $this->assertEquals(
-            "messages3",
-            $table->getLastMessage()
-        );
-    }
-
-    /**
-     * Test name validation
-     *
-     * @param string  $name   name to test
-     * @param boolean $result expected result
-     *
-     * @return void
-     *
-     * @dataProvider dataValidateName
-     */
-    public function testValidateName($name, $result, $is_backquoted=false)
-    {
-        $this->assertEquals(
-            $result,
-            Table::isValidName($name, $is_backquoted)
-        );
-    }
-
-    /**
-     * Data provider for name validation
-     *
-     * @return array with test data
-     */
-    public function dataValidateName()
-    {
-        return array(
-            array('test', true),
-            array('te/st', false),
-            array('te.st', false),
-            array('te\\st', false),
-            array('te st', false),
-            array('  te st', true, true),
-            array('test ', false),
-            array('te.st', false),
-            array('test ', false, true),
-            array('te.st ', false, true),
-        );
-    }
-
-    /**
-     * Test for isView
-     *
-     * @return void
-     */
-    public function testIsView()
-    {
-        $table = new Table(null, null);
-        $this->assertEquals(
-            false,
-            $table->isView()
-        );
-
-        //validate that it is the same as DBI fetchResult
-        $table = new Table('PMA_BookMark', 'PMA');
-        $this->assertEquals(
-            true,
-            $table->isView()
-        );
-
-        $table = new Table('PMA_BookMark_2', 'PMA');
-        $this->assertEquals(
-            false,
-            $table->isView()
-        );
-    }
-
-    /**
-     * Test for generateFieldSpec
-     *
-     * @return void
-     */
-    public function testGenerateFieldSpec()
-    {
-        //type is BIT
-        $name = "PMA_name";
-        $type = "BIT";
-        $length = '12';
-        $attribute = 'PMA_attribute';
-        $collation = 'PMA_collation';
-        $null = 'NULL';
-        $default_type = 'USER_DEFINED';
-        $default_value = 12;
-        $extra = 'AUTO_INCREMENT';
-        $comment = 'PMA_comment';
-        $virtuality = '';
-        $expression = '';
-        $move_to = '-first';
-
-        $query = Table::generateFieldSpec(
-            $name, $type, $length, $attribute, $collation,
-            $null, $default_type,  $default_value, $extra, $comment,
-            $virtuality, $expression, $move_to
-        );
-        $this->assertEquals(
-            "`PMA_name` BIT(12) PMA_attribute NULL DEFAULT b'10' "
-            . "AUTO_INCREMENT COMMENT 'PMA_comment' FIRST",
-            $query
-        );
-
-        //type is DOUBLE
-        $type = "DOUBLE";
-        $query = Table::generateFieldSpec(
-            $name, $type, $length, $attribute, $collation,
-            $null, $default_type,  $default_value, $extra, $comment,
-            $virtuality, $expression, $move_to
-        );
-        $this->assertEquals(
-            "`PMA_name` DOUBLE(12) PMA_attribute NULL DEFAULT '12' "
-            . "AUTO_INCREMENT COMMENT 'PMA_comment' FIRST",
-            $query
-        );
-
-        //type is BOOLEAN
-        $type = "BOOLEAN";
-        $query = Table::generateFieldSpec(
-            $name, $type, $length, $attribute, $collation,
-            $null, $default_type,  $default_value, $extra, $comment,
-            $virtuality, $expression, $move_to
-        );
-        $this->assertEquals(
-            "`PMA_name` BOOLEAN PMA_attribute NULL DEFAULT TRUE "
-            . "AUTO_INCREMENT COMMENT 'PMA_comment' FIRST",
-            $query
-        );
-
-        //$default_type is NULL
-        $default_type = 'NULL';
-        $query = Table::generateFieldSpec(
-            $name, $type, $length, $attribute, $collation,
-            $null, $default_type,  $default_value, $extra, $comment,
-            $virtuality, $expression, $move_to
-        );
-        $this->assertEquals(
-            "`PMA_name` BOOLEAN PMA_attribute NULL DEFAULT NULL "
-            . "AUTO_INCREMENT COMMENT 'PMA_comment' FIRST",
-            $query
-        );
-
-        //$default_type is CURRENT_TIMESTAMP
-        $default_type = 'CURRENT_TIMESTAMP';
-        $query = Table::generateFieldSpec(
-            $name, $type, $length, $attribute, $collation,
-            $null, $default_type,  $default_value, $extra, $comment,
-            $virtuality, $expression, $move_to
-        );
-        $this->assertEquals(
-            "`PMA_name` BOOLEAN PMA_attribute NULL DEFAULT CURRENT_TIMESTAMP "
-            . "AUTO_INCREMENT COMMENT 'PMA_comment' FIRST",
-            $query
-        );
-
-        // $type is 'TIMESTAMP(3), $default_type is CURRENT_TIMESTAMP(3)
-        $type = 'TIMESTAMP';
-        $length = '3';
-        $extra = '';
-        $default_type = 'CURRENT_TIMESTAMP';
-        $query = Table::generateFieldSpec(
-            $name, $type, $length, $attribute, $collation,
-            $null, $default_type,  $default_value, $extra, $comment,
-            $virtuality, $expression, $move_to
-        );
-        $this->assertEquals(
-            "`PMA_name` TIMESTAMP(3) PMA_attribute NULL DEFAULT CURRENT_TIMESTAMP(3) "
-            . "COMMENT 'PMA_comment' FIRST",
-            $query
-        );
-
-        //$default_type is NONE
-        $type = 'BOOLEAN';
-        $default_type = 'NONE';
-        $extra = 'INCREMENT';
-        $move_to = '-first';
-        $query = Table::generateFieldSpec(
-            $name, $type, $length, $attribute, $collation,
-            $null, $default_type,  $default_value, $extra, $comment,
-            $virtuality, $expression, $move_to
-        );
-        $this->assertEquals(
-            "`PMA_name` BOOLEAN PMA_attribute NULL INCREMENT "
-            . "COMMENT 'PMA_comment' FIRST",
-            $query
-        );
-    }
-
-
-    /**
-     * Test for duplicateInfo
-     *
-     * @return void
-     */
-    public function testDuplicateInfo()
-    {
-        $work = "PMA_work";
-        $pma_table = "pma_table";
-        $get_fields =  array("filed0", "field6");
-        $where_fields = array("field2", "filed5");
-        $new_fields = array("field3", "filed4");
-        $GLOBALS['cfgRelation'][$work] = true;
-        $GLOBALS['cfgRelation']['db'] = "PMA_db";
-        $GLOBALS['cfgRelation'][$pma_table] = "pma_table";
-
-        $ret = Table::duplicateInfo(
-            $work, $pma_table, $get_fields, $where_fields, $new_fields
-        );
-        $this->assertEquals(
-            true,
-            $ret
-        );
-    }
-    /**
-     * Test for isUpdatableView
-     *
-     * @return void
-     */
-    public function testIsUpdatableView()
-    {
-        $table = new Table(null, null);
-        $this->assertEquals(
-            false,
-            $table->isUpdatableView()
-        );
-
-        //validate that it is the same as DBI fetchResult
-        $table = new Table('PMA_BookMark', 'PMA');
-        $this->assertEquals(
-            true,
-            $table->isUpdatableView()
-        );
-
-        $table = new Table('PMA_BookMark_2', 'PMA');
-        $this->assertEquals(
-            false,
-            $table->isUpdatableView()
-        );
-    }
-
-    /**
-     * Test for isMerge -- when there's no ENGINE info cached
-     *
-     * @return void
-     */
-    public function testIsMergeCase1()
-    {
-        $tableObj = new Table('PMA_BookMark', 'PMA');
-        $this->assertEquals(
-            '',
-            $tableObj->isMerge()
-        );
-
-        $GLOBALS['dbi']->expects($this->any())
-            ->method('getCachedTableContent')
-            ->will($this->returnValue(array('table_name' => "PMA_BookMark")));
-        $tableObj = new Table('PMA_BookMark', 'PMA');
-        $this->assertEquals(
-            false,
-            $tableObj->isMerge()
-        );
-    }
-
-    /**
-     * Test for isMerge -- when ENGINE info is MERGE
-     *
-     * @return void
-     */
-    public function testIsMergeCase2()
-    {
-        $map = array(
-            array(array('PMA', 'PMA_BookMark'), null, array('ENGINE' => "MERGE")),
-            array(array('PMA', 'PMA_BookMark', 'ENGINE'), null, "MERGE")
-        );
-        $GLOBALS['dbi']->expects($this->any())
-            ->method('getCachedTableContent')
-            ->will($this->returnValueMap($map));
-
-        $tableObj = new Table('PMA_BookMark', 'PMA');
-        $this->assertEquals(
-            true,
-            $tableObj->isMerge()
-        );
-    }
-
-    /**
-     * Test for isMerge -- when ENGINE info is MRG_MYISAM
-     *
-     * @return void
-     */
-    public function testIsMergeCase3()
-    {
-        $map = array(
-            array(array('PMA', 'PMA_BookMark'), null, array('ENGINE' => "MRG_MYISAM")),
-            array(array('PMA', 'PMA_BookMark', 'ENGINE'), null, "MRG_MYISAM")
-        );
-        $GLOBALS['dbi']->expects($this->any())
-            ->method('getCachedTableContent')
-            ->will($this->returnValueMap($map));
-
-        $tableObj = new Table('PMA_BookMark', 'PMA');
-        $this->assertEquals(
-            true,
-            $tableObj->isMerge()
-        );
-    }
-
-    /**
-     * Test for isMerge -- when ENGINE info is ISDB
-     *
-     * @return void
-     */
-    public function testIsMergeCase4()
-    {
-        $map = array(
-            array(array('PMA', 'PMA_BookMark'), null, array('ENGINE' => "ISDB")),
-            array(array('PMA', 'PMA_BookMark', 'ENGINE'), null, "ISDB")
-        );
-        $GLOBALS['dbi']->expects($this->any())
-            ->method('getCachedTableContent')
-            ->will($this->returnValueMap($map));
-
-        $tableObj = new Table('PMA_BookMark', 'PMA');
-        $this->assertEquals(
-            false,
-            $tableObj->isMerge()
-        );
-    }
-
-    /**
-     * Test for generateAlter
-     *
-     * @return void
-     */
-    public function testGenerateAlter()
-    {
-        //parameter
-        $oldcol = 'name';
-        $newcol = 'new_name';
-        $type = 'VARCHAR';
-        $length = '2';
-        $attribute = 'new_name';
-        $collation = 'charset1';
-        $null = 'NULL';
-        $default_type = 'USER_DEFINED';
-        $default_value = 'VARCHAR';
-        $extra = 'AUTO_INCREMENT';
-        $comment = 'PMA comment';
-        $virtuality = '';
-        $expression = '';
-        $move_to = 'new_name';
-
-        $result = Table::generateAlter(
-            $oldcol, $newcol, $type, $length,
-            $attribute, $collation, $null, $default_type, $default_value,
-            $extra, $comment, $virtuality, $expression, $move_to
-        );
-
-        $expect = "`name` `new_name` VARCHAR(2) new_name CHARACTER SET "
-            . "charset1 NULL DEFAULT 'VARCHAR' "
-            . "AUTO_INCREMENT COMMENT 'PMA comment' AFTER `new_name`";
-
-        $this->assertEquals(
-            $expect,
-            $result
-        );
-    }
-
-    /**
-     * Test for rename
-     *
-     * @return void
-     */
-    public function testRename()
-    {
-        $table = 'PMA_BookMark';
-        $db = 'PMA';
-        Util::cacheSet('lower_case_table_names', false);
-
-        $table = new Table($table, $db);
-
-        //rename to same name
-        $table_new = 'PMA_BookMark';
-        $result = $table->rename($table_new);
-        $this->assertEquals(
-            true,
-            $result
-        );
-
-        //isValidName
-        //space in table name
-        $table_new = 'PMA_BookMark ';
-        $result = $table->rename($table_new);
-        $this->assertEquals(
-            false,
-            $result
-        );
-        //empty name
-        $table_new = '';
-        $result = $table->rename($table_new);
-        $this->assertEquals(
-            false,
-            $result
-        );
-        //dot in table name
-        $table_new = 'PMA_.BookMark';
-        $result = $table->rename($table_new);
-        $this->assertEquals(
-            true,
-            $result
-        );
-
-        //message
-        $this->assertEquals(
-            "Table PMA_BookMark has been renamed to PMA_.BookMark.",
-            $table->getLastMessage()
-        );
-
-        $table_new = 'PMA_BookMark_new';
-        $db_new = 'PMA_new';
-        $result = $table->rename($table_new, $db_new);
-        $this->assertEquals(
-            true,
-            $result
-        );
-        //message
-        $this->assertEquals(
-            "Table PMA_.BookMark has been renamed to PMA_BookMark_new.",
-            $table->getLastMessage()
-        );
-    }
-
-
-    /**
-     * Test for getUniqueColumns
-     *
-     * @return void
-     */
-    public function testGetUniqueColumns()
-    {
-        $table = 'PMA_BookMark';
-        $db = 'PMA';
-
-        $table = new Table($table, $db);
-        $return = $table->getUniqueColumns();
-        $expect = array(
-            '`PMA`.`PMA_BookMark`.`index1`',
-            '`PMA`.`PMA_BookMark`.`index3`',
-            '`PMA`.`PMA_BookMark`.`index5`'
-        );
-        $this->assertEquals(
-            $expect,
-            $return
-        );
-    }
-
-    /**
-     * Test for getIndexedColumns
-     *
-     * @return void
-     */
-    public function testGetIndexedColumns()
-    {
-        $table = 'PMA_BookMark';
-        $db = 'PMA';
-
-        $table = new Table($table, $db);
-        $return = $table->getIndexedColumns();
-        $expect = array(
-            '`PMA`.`PMA_BookMark`.`column1`',
-            '`PMA`.`PMA_BookMark`.`column3`',
-            '`PMA`.`PMA_BookMark`.`column5`',
-            '`PMA`.`PMA_BookMark`.`ACCESSIBLE`',
-            '`PMA`.`PMA_BookMark`.`ADD`',
-            '`PMA`.`PMA_BookMark`.`ALL`',
-        );
-        $this->assertEquals(
-            $expect,
-            $return
-        );
-    }
-
-    /**
-     * Test for getColumnsMeta
-     *
-     * @return void
-     */
-    public function testGetColumnsMeta()
-    {
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->once())
-            ->method('tryQuery')
-            ->with("SELECT * FROM `db`.`table` LIMIT 1")
-            ->will($this->returnValue('v1'));
-
-        $dbi->expects($this->once())
-            ->method('getFieldsMeta')
-            ->with("v1")
-            ->will($this->returnValue('movecols'));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $tableObj = new Table('table', 'db');
-
-        $this->assertEquals(
-            $tableObj->getColumnsMeta(),
-            'movecols'
-        );
-    }
-
-    /**
-     * Tests for _getSQLToCreateForeignKey() method.
-     *
-     * @return void
-     * @test
-     */
-    public function testGetSQLToCreateForeignKey()
-    {
-        $table = "PMA_table";
-        $field = array("PMA_field1", "PMA_field2");
-        $foreignDb = "foreignDb";
-        $foreignTable = "foreignTable";
-        $foreignField = array("foreignField1", "foreignField2");
-
-        $class = new ReflectionClass('PMA\libraries\Table');
-        $method = $class->getMethod('_getSQLToCreateForeignKey');
-        $method->setAccessible(true);
-        $tableObj = new Table('PMA_table', 'db');
-
-        $sql = $method->invokeArgs(
-            $tableObj, array(
-                $table,
-                $field,
-                $foreignDb,
-                $foreignTable,
-                $foreignField
-            )
-        );
-        $sql_excepted = 'ALTER TABLE `PMA_table` ADD  '
-            . 'FOREIGN KEY (`PMA_field1`, `PMA_field2`) REFERENCES '
-            . '`foreignDb`.`foreignTable`(`foreignField1`, `foreignField2`);';
-        $this->assertEquals(
-            $sql_excepted,
-            $sql
-        );
-
-        // Exclude db name when relations are made between table in the same db
-        $sql = $method->invokeArgs(
-            $tableObj, array(
-                $table,
-                $field,
-                'db',
-                $foreignTable,
-                $foreignField
-            )
-        );
-        $sql_excepted = 'ALTER TABLE `PMA_table` ADD  '
-            . 'FOREIGN KEY (`PMA_field1`, `PMA_field2`) REFERENCES '
-            . '`foreignTable`(`foreignField1`, `foreignField2`);';
-        $this->assertEquals(
-            $sql_excepted,
-            $sql
-        );
-    }
-
-    /**
-     * Tests for getSqlQueryForIndexCreateOrEdit() method.
-     *
-     * @return void
-     * @test
-     */
-    public function testGetSqlQueryForIndexCreateOrEdit()
-    {
-        $db = "pma_db";
-        $table = "pma_table";
-        $index = new PMA\libraries\Index();
-        $error = false;
-
-        $_REQUEST['old_index'] = "PRIMARY";
-
-        $table = new Table($table, $db);
-        $sql = $table->getSqlQueryForIndexCreateOrEdit($index, $error);
-
-        $this->assertEquals(
-            "ALTER TABLE `pma_db`.`pma_table` DROP PRIMARY KEY, ADD UNIQUE ;",
-            $sql
-        );
-    }
-
-    /**
-     * Test for getColumns
-     *
-     * @return void
-     */
-    public function testGetColumns()
-    {
-        $table = 'PMA_BookMark';
-        $db = 'PMA';
-
-        $table = new Table($table, $db);
-        $return = $table->getColumns();
-        $expect = array(
-            '`PMA`.`PMA_BookMark`.`column1`',
-            '`PMA`.`PMA_BookMark`.`column3`',
-            '`PMA`.`PMA_BookMark`.`column5`',
-            '`PMA`.`PMA_BookMark`.`ACCESSIBLE`',
-            '`PMA`.`PMA_BookMark`.`ADD`',
-            '`PMA`.`PMA_BookMark`.`ALL`',
-        );
-        $this->assertEquals(
-            $expect,
-            $return
-        );
-
-        $return = $table->getReservedColumnNames();
-        $expect = array(
-            'ACCESSIBLE',
-            'ADD',
-            'ALL',
-        );
-        $this->assertEquals(
-            $expect,
-            $return
-        );
-    }
-
-    /**
-     * Test for checkIfMinRecordsExist
-     *
-     * @return void
-     */
-    public function testCheckIfMinRecordsExist()
-    {
-        $old_dbi = $GLOBALS['dbi'];
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $dbi->expects($this->any())
-            ->method('tryQuery')
-            ->will($this->returnValue('res'));
-        $dbi->expects($this->any())
-            ->method('numRows')
-            ->willReturnOnConsecutiveCalls(
-                0,
-                10,
-                200
-            );
-        $dbi->expects($this->any())
-            ->method('fetchResult')
-            ->willReturnOnConsecutiveCalls(
-                array('`one_pk`'),
-
-                array(), // No Uniques found
-                array('`one_ind`', '`sec_ind`'),
-
-                array(), // No Uniques found
-                array()  // No Indexed found
-            );
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $table = 'PMA_BookMark';
-        $db = 'PMA';
-        $tableObj = new Table($table, $db);
-
-        // Case 1 : Check if table is non-empty
-        $return = $tableObj->checkIfMinRecordsExist();
-        $expect = true;
-        $this->assertEquals(
-            $expect,
-            $return
-        );
-
-        // Case 2 : Check if table contains at least 100
-        $return = $tableObj->checkIfMinRecordsExist(100);
-        $expect = false;
-        $this->assertEquals(
-            $expect,
-            $return
-        );
-
-        // Case 3 : Check if table contains at least 100
-        $return = $tableObj->checkIfMinRecordsExist(100);
-        $expect = true;
-        $this->assertEquals(
-            $expect,
-            $return
-        );
-
-        $GLOBALS['dbi'] = $old_dbi;
-    }
-
-    /**
-     * Test for countRecords
-     *
-     * @return void
-     */
-    public function testCountRecords()
-    {
-        $map = array(
-            array(
-                array('PMA', 'PMA_BookMark'),
-                null,
-                array('Comment' => "Comment222", 'TABLE_TYPE' => "VIEW"),
-            ),
-            array(array('PMA', 'PMA_BookMark', 'TABLE_TYPE'), null, 'VIEW'),
-        );
-        $GLOBALS['dbi']->expects($this->any())
-            ->method('getCachedTableContent')
-            ->will($this->returnValueMap($map));
-
-        $table = 'PMA_BookMark';
-        $db = 'PMA';
-        $tableObj = new Table($table, $db);
-
-        $return = $tableObj->countRecords(true);
-        $expect = 20;
-        $this->assertEquals(
-            $expect,
-            $return
-        );
-    }
-
-    /**
-     * Test for setUiProp
-     *
-     * @return void
-     */
-    public function testSetUiProp()
-    {
-        $table_name = 'PMA_BookMark';
-        $db = 'PMA';
-
-        $table = new Table($table_name, $db);
-
-        $property = Table::PROP_COLUMN_ORDER;
-        $value = "UiProp_value";
-        $table_create_time = null;
-        $table->setUiProp($property, $value, $table_create_time);
-
-        //set UI prop successfully
-        $this->assertEquals(
-            $value,
-            $table->uiprefs[$property]
-        );
-
-        //removeUiProp
-        $table->removeUiProp($property);
-        $is_define_property = isset($table->uiprefs[$property]) ? true : false;
-        $this->assertEquals(
-            false,
-            $is_define_property
-        );
-
-        //getUiProp after removeUiProp
-        $is_define_property = $table->getUiProp($property);
-        $this->assertEquals(
-            false,
-            $is_define_property
-        );
-    }
-
-    /**
-     * Test for moveCopy
-     *
-     * @return void
-     */
-    public function testMoveCopy()
-    {
-        $source_table = 'PMA_BookMark';
-        $source_db = 'PMA';
-        $target_table = 'PMA_BookMark_new';
-        $target_db = 'PMA_new';
-        $what = "dataonly";
-        $move = true;
-        $mode = "one_table";
-
-        $GLOBALS['dbi']->expects($this->any())->method('getTable')
-            ->will($this->returnValue(new Table($target_table, $target_db)));
-
-        $_REQUEST['drop_if_exists'] = true;
-
-        $return = Table::moveCopy(
-            $source_db, $source_table, $target_db,
-            $target_table, $what, $move, $mode
-        );
-
-        //successfully
-        $expect = true;
-        $this->assertEquals(
-            $expect,
-            $return
-        );
-        $sql_query = "INSERT INTO `PMA_new`.`PMA_BookMark_new`(`COLUMN_NAME1`)"
-            . " SELECT `COLUMN_NAME1` FROM "
-            . "`PMA`.`PMA_BookMark`";
-        $this->assertContains(
-            $sql_query,
-            $GLOBALS['sql_query']
-        );
-        $sql_query = "DROP VIEW `PMA`.`PMA_BookMark`";
-        $this->assertContains(
-            $sql_query,
-            $GLOBALS['sql_query']
-        );
-
-        $return = Table::moveCopy(
-            $source_db, $source_table, $target_db,
-            $target_table, $what, false, $mode
-        );
-
-        //successfully
-        $expect = true;
-        $this->assertEquals(
-            $expect,
-            $return
-        );
-        $sql_query = "INSERT INTO `PMA_new`.`PMA_BookMark_new`(`COLUMN_NAME1`)"
-            . " SELECT `COLUMN_NAME1` FROM "
-            . "`PMA`.`PMA_BookMark`";
-        $this->assertContains(
-            $sql_query,
-            $GLOBALS['sql_query']
-        );
-        $sql_query = "DROP VIEW `PMA`.`PMA_BookMark`";
-        $this->assertNotContains(
-            $sql_query,
-            $GLOBALS['sql_query']
-        );
-    }
-}
-
-/**
- * Mock class for DataBasePMAMock
- *
- * @package PhpMyAdmin-test
- */
-Class DataBasePMAMock
-{
-    var $databases;
-}
-
-/**
- * Mock class for DataBaseMock
- *
- * @package PhpMyAdmin-test
- */
-Class DataBaseMock
-{
-    /**
-     * mock function to return table is existed
-     *
-     * @param string $name table name
-     *
-     * @return bool
-     */
-    function exists($name)
-    {
-        return true;
-    }
-}
diff --git a/#pma/test/classes/TemplateTest.php b/#pma/test/classes/TemplateTest.php
deleted file mode 100644
index a0482959..00000000
--- a/#pma/test/classes/TemplateTest.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Test for PMA\libraries\Template class
- *
- * @package PhpMyAdmin-test
- */
-
-require_once 'test/PMATestCase.php';
-
-/**
- * Test for PMA\libraries\Template class
- *
- * @package PhpMyAdmin-test
- */
-class TemplateTest extends PMATestCase
-{
-    /**
-     * Test for set function
-     *
-     * @return void
-     */
-    public function testSet()
-    {
-        $template = PMA\libraries\Template::get('test/add_data');
-        $template->set('variable1', 'value1');
-        $template->set(
-            array(
-                'variable2' => 'value2'
-            )
-        );
-        $result = $template->render();
-        $this->assertContains('value1', $result);
-        $this->assertContains('value2', $result);
-    }
-
-    /**
-     * Test for setHelper
-     *
-     * @return void
-     */
-    public function testSetHelper()
-    {
-        $template = PMA\libraries\Template::get('test/set_helper');
-        $template->setHelper('hello', function ($string) {
-            return 'hello ' . $string;
-        });
-        $template->set(
-            array(
-                'variable' => 'world'
-            )
-        );
-        $this->assertEquals('hello world', $template->render());
-    }
-
-    /**
-     * Test for render
-     *
-     * @return void
-     */
-    public function testStaticRender()
-    {
-        $this->assertEquals(
-            'static content',
-            PMA\libraries\Template::get('test/static')->render()
-        );
-    }
-
-    /**
-     * Test for render
-     *
-     * @return void
-     */
-    public function testDynamicRender()
-    {
-        $this->assertEquals(
-            'value',
-            PMA\libraries\Template::get('test/echo')->render(
-                array(
-                    'variable' => 'value'
-                )
-            )
-        );
-    }
-}
diff --git a/#pma/test/classes/ThemeManagerTest.php b/#pma/test/classes/ThemeManagerTest.php
deleted file mode 100644
index d966c33e..00000000
--- a/#pma/test/classes/ThemeManagerTest.php
+++ /dev/null
@@ -1,165 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for ThemeManager class
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-use PMA\libraries\ThemeManager;
-
-require_once 'libraries/url_generating.lib.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * tests for ThemeManager class
- *
- * @package PhpMyAdmin-test
- */
-class ThemeManagerTest extends PMATestCase
-{
-    /**
-     * SetUp for test cases
-     *
-     * @return void
-     */
-    public function setup()
-    {
-        $GLOBALS['cfg']['ThemePath'] = './themes';
-        $GLOBALS['cfg']['ThemePerServer'] = false;
-        $GLOBALS['cfg']['ThemeDefault'] = 'pmahomme';
-        $GLOBALS['cfg']['ServerDefault'] = 0;
-        $GLOBALS['server'] = 99;
-        $GLOBALS['PMA_Config'] = new PMA\libraries\Config();
-        $GLOBALS['collation_connection'] = 'utf8_general_ci';
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $dbi->expects($this->any())->method('escapeString')
-            ->will($this->returnArgument(0));
-
-        $cfg['dbi'] = $dbi;
-    }
-
-    /**
-     * Test for ThemeManager::getThemeCookieName
-     *
-     * @return void
-     */
-    public function testCookieName()
-    {
-        $tm = new ThemeManager();
-        $this->assertEquals('pma_theme', $tm->getThemeCookieName());
-    }
-
-    /**
-     * Test for ThemeManager::getThemeCookieName
-     *
-     * @return void
-     */
-    public function testPerServerCookieName()
-    {
-        $tm = new ThemeManager();
-        $tm->setThemePerServer(true);
-        $this->assertEquals('pma_theme-99', $tm->getThemeCookieName());
-    }
-
-    /**
-     * Test for ThemeManager::getHtmlSelectBox
-     *
-     * @return void
-     */
-    public function testHtmlSelectBox()
-    {
-        $tm = new ThemeManager();
-        $this->assertContains(
-            '<option value="pmahomme" selected="selected">',
-            $tm->getHtmlSelectBox()
-        );
-    }
-
-    /**
-     * Test for setThemeCookie
-     *
-     * @return void
-     */
-    public function testSetThemeCookie()
-    {
-        $tm = new ThemeManager();
-        $this->assertTrue(
-            $tm->setThemeCookie()
-        );
-    }
-
-    /**
-     * Test for checkConfig
-     *
-     * @return void
-     */
-    public function testCheckConfig()
-    {
-        $tm = new ThemeManager();
-        $this->assertNull(
-            $tm->checkConfig()
-        );
-    }
-
-    /**
-     * Test for makeBc
-     *
-     * @return void
-     */
-    public function testMakeBc()
-    {
-        $tm = new ThemeManager();
-        $this->assertNull(
-            $tm->makeBc()
-        );
-        $this->assertEquals($GLOBALS['theme'], 'pmahomme');
-        $this->assertEquals($GLOBALS['pmaThemePath'], './themes/pmahomme');
-        $this->assertEquals($GLOBALS['pmaThemeImage'], './themes/pmahomme/img/');
-
-    }
-
-    /**
-     * Test for getPrintPreviews
-     *
-     * @return void
-     */
-    public function testGetPrintPreviews()
-    {
-        $tm = new ThemeManager();
-        $this->assertEquals(
-            '<div class="theme_preview"><h2>Original (2.9) </h2><p><a class='
-            . '"take_theme" name="original" href="index.php?set_theme=original'
-            . '&amp;server=99&amp;lang=en&amp;collation_connection=utf8_general_ci'
-            . '&amp;token=token"><img src="./themes/original/screen.png" border="1" '
-            . 'alt="Original" title="Original" /><br />[ <strong>take it</strong> ]'
-            . '</a></p></div><div class="theme_preview"><h2>pmahomme (1.1) </h2><p>'
-            . '<a class="take_theme" name="pmahomme" href="index.php?set_theme='
-            . 'pmahomme&amp;server=99&amp;lang=en&amp;collation_connection=utf8_'
-            . 'general_ci&amp;token=token"><img src="./themes/pmahomme/screen.png" '
-            . 'border="1" alt="pmahomme" title="pmahomme" /><br />[ <strong>take it'
-            . '</strong> ]</a></p></div>',
-            $tm->getPrintPreviews()
-        );
-    }
-
-    /**
-     * Test for getFallBackTheme
-     *
-     * @return void
-     */
-    public function testGetFallBackTheme()
-    {
-        $tm = new ThemeManager();
-        $this->assertInstanceOf(
-            'PMA\libraries\Theme',
-            $tm->getFallBackTheme()
-        );
-    }
-}
diff --git a/#pma/test/classes/ThemeTest.php b/#pma/test/classes/ThemeTest.php
deleted file mode 100644
index bf7353d5..00000000
--- a/#pma/test/classes/ThemeTest.php
+++ /dev/null
@@ -1,420 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Test class for Theme.
- *
- * @package PhpMyAdmin-test
- */
-use PMA\libraries\Theme;
-
-require_once 'libraries/url_generating.lib.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * Test class for Theme.
- *
- * @package PhpMyAdmin-test
- */
-class ThemeTest extends PMATestCase
-{
-    /**
-     * @var Theme
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     *
-     * @return void
-     */
-    protected function setUp()
-    {
-        $this->object = new Theme();
-        $_SESSION['PMA_Theme'] = $this->object;
-        $GLOBALS['PMA_Config'] = new PMA\libraries\Config();
-        $GLOBALS['PMA_Config']->enableBc();
-        $GLOBALS['text_dir'] = 'ltr';
-        include 'themes/pmahomme/layout.inc.php';
-        $GLOBALS['server'] = '99';
-        $GLOBALS['collation_connection'] = 'utf-8';
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     *
-     * @return void
-     */
-    protected function tearDown()
-    {
-    }
-
-    /**
-     * Test for Theme::loadInfo
-     *
-     * @return void
-     * @group medium
-     */
-    public function testCheckImgPathNotExisted()
-    {
-        $this->object->setPath('path/to/nowhere');
-        $this->assertFalse($this->object->loadInfo());
-    }
-
-    /**
-     * Test for Theme::loadInfo
-     *
-     * @return void
-     */
-    public function testCheckImgPathIncorrect()
-    {
-        $this->object->setPath('./test/classes/_data/incorrect_theme');
-        $this->assertFalse(
-            $this->object->loadInfo(),
-            'Theme name is not properly set'
-        );
-    }
-
-    /**
-     * Test for Theme::getName, getVersion
-     *
-     * @return void
-     */
-    public function testCheckImgPathFull()
-    {
-        $this->object->setPath('./test/classes/_data/gen_version_info');
-        $this->assertTrue($this->object->loadInfo());
-        $this->assertEquals('Test Theme', $this->object->getName());
-        $this->assertEquals('2.0.3', $this->object->getVersion());
-    }
-
-    /**
-     * Test for Theme::loadInfo
-     *
-     * @return void
-     */
-    public function testLoadInfo()
-    {
-        $this->object->setPath('./themes/original');
-        $infofile = $this->object->getPath() . '/info.inc.php';
-        $this->assertTrue($this->object->loadInfo());
-
-        $this->assertEquals(
-            filemtime($infofile),
-            $this->object->mtime_info
-        );
-
-        $this->object->setPath('./themes/original');
-        $this->object->mtime_info = filemtime($infofile);
-        $this->assertTrue($this->object->loadInfo());
-        $this->assertEquals('Original', $this->object->getName());
-    }
-
-    /**
-     * Test for Theme::load
-     *
-     * @return void
-     */
-    public function testLoad()
-    {
-        $newTheme = Theme::load('./themes/original');
-        $this->assertNotNull($newTheme);
-    }
-
-    /**
-     * Test for Theme::loadCss
-     *
-     * @param string $theme Path to theme files
-     *
-     * @return void
-     *
-     * @dataProvider listThemes
-     */
-    public function testLoadCss($theme)
-    {
-        $newTheme = Theme::load($theme);
-        ob_start();
-        $ret = $newTheme->loadCss();
-        $out = ob_get_contents();
-        ob_end_clean();
-        $this->assertTrue($ret);
-        $this->assertContains('FILE: navigation.css.php', $out);
-    }
-
-    /**
-     * Data provider for Theme::loadCss test
-     *
-     * @return array with theme paths
-     */
-    public function listThemes()
-    {
-        return array(
-            array('./themes/original'),
-            array('./themes/pmahomme/'),
-        );
-    }
-
-    /**
-     * Test for Theme::load
-     *
-     * @return void
-     */
-    public function testLoadNotExisted()
-    {
-        $this->assertFalse(Theme::load('/path/to/nowhere'));
-    }
-
-    /**
-     * Test fir Theme::checkImgPath
-     *
-     * @return void
-     * @expectedException PHPUnit_Framework_Error
-     */
-    public function testCheckImgPathBad()
-    {
-        $GLOBALS['cfg']['ThemePath'] = 'nowhere';
-        $this->object->setPath('path/to/nowhere');
-
-        $this->assertFalse($this->object->checkImgPath());
-    }
-
-    /**
-     * Test for Theme::checkImgPath
-     *
-     * @return void
-     */
-    public function testCheckImgPath()
-    {
-        $this->object->setPath('./themes/original');
-        $this->assertTrue($this->object->checkImgPath());
-    }
-
-    /**
-     * Test for Theme::checkImgPath
-     *
-     * @return void
-     */
-    public function testCheckImgPathGlobals()
-    {
-        $this->object->setPath('/this/is/wrong/path');
-        $GLOBALS['cfg']['ThemePath'] = 'themes';
-        $this->assertTrue($this->object->checkImgPath());
-    }
-
-    /**
-     * Test for Theme::checkImgPath
-     *
-     * @return void
-     * @expectedException PHPUnit_Framework_Error
-     */
-    public function testCheckImgPathGlobalsWrongPath()
-    {
-        $prevThemePath = $GLOBALS['cfg']['ThemePath'];
-        $GLOBALS['cfg']['ThemePath'] = 'no_themes';
-
-        $this->object->setPath('/this/is/wrong/path');
-        $this->object->checkImgPath();
-
-        $GLOBALS['cfg']['ThemePath'] = $prevThemePath;
-    }
-
-    /**
-     * Test for Theme::getPath
-     *
-     * @return void
-     */
-    public function testGetSetPath()
-    {
-        $this->assertEmpty($this->object->getPath());
-        $this->object->setPath('./themes/original');
-
-        $this->assertEquals('./themes/original', $this->object->getPath());
-    }
-
-    /**
-     * Test for Theme::loadInfo
-     *
-     * @return void
-     */
-    public function testGetLayoutFile()
-    {
-        $this->assertContains('layout.inc.php', $this->object->getLayoutFile());
-    }
-
-    /**
-     * Test for Theme::checkVersion
-     *
-     * @return void
-     *
-     * @depends testLoadInfo
-     */
-    public function testGetSetCheckVersion()
-    {
-        $this->assertEquals(
-            '0.0.0.0',
-            $this->object->getVersion(),
-            'Version 0.0.0.0 by default'
-        );
-
-        $this->object->setVersion("1.2.3.4");
-        $this->assertEquals('1.2.3.4', $this->object->getVersion());
-
-        $this->assertFalse($this->object->checkVersion("0.0.1.1"));
-        $this->assertTrue($this->object->checkVersion("2.0.1.1"));
-    }
-
-    /**
-     * Test for Theme::getName
-     *
-     * @return void
-     */
-    public function testGetSetName()
-    {
-        $this->assertEmpty($this->object->getName(), 'Name is empty by default');
-        $this->object->setName('New Theme Name');
-
-        $this->assertEquals('New Theme Name', $this->object->getName());
-    }
-
-    /**
-     * Test for Theme::getId
-     *
-     * @return void
-     */
-    public function testGetSetId()
-    {
-        $this->assertEmpty($this->object->getId(), 'ID is empty by default');
-        $this->object->setId('NewID');
-
-        $this->assertEquals('NewID', $this->object->getId());
-    }
-
-    /**
-     * Test for Theme::getImgPath
-     *
-     * @return void
-     */
-    public function testGetSetImgPath()
-    {
-        $this->assertEmpty(
-            $this->object->getImgPath(),
-            'ImgPath is empty by default'
-        );
-        $this->object->setImgPath('/new/path');
-
-        $this->assertEquals('/new/path', $this->object->getImgPath());
-    }
-
-    /**
-     * Test for getPrintPreview().
-     *
-     * @return void
-     */
-    public function testPrintPreview()
-    {
-        $this->assertEquals(
-            $this->object->getPrintPreview(),
-            '<div class="theme_preview"><h2> (0.0.0.0) </h2><p><a class="take_'
-            . 'theme" name="" href="index.php?set_theme=&amp;server=99&amp;lang=en'
-            . '&amp;collation_connection=utf-8'
-            . '&amp;token=token">No preview available.[ <strong>take it</strong> ]'
-            . '</a></p></div>'
-        );
-    }
-
-    /**
-     * Test for getCssIEClearFilter
-     *
-     * @return void
-     */
-    public function testGetCssIEClearFilter()
-    {
-        $this->assertEquals(
-            $this->object->getCssIEClearFilter(),
-            ''
-        );
-    }
-
-    /**
-     * Test for getFontSize
-     *
-     * @return void
-     */
-    public function testGetFontSize()
-    {
-        $this->assertEquals(
-            $this->object->getFontSize(),
-            '82%'
-        );
-
-        $GLOBALS['PMA_Config']->set('fontsize', '12px');
-        $this->assertEquals(
-            $this->object->getFontSize(),
-            '12px'
-        );
-
-    }
-
-    /**
-     * Test for getCssGradient
-     *
-     * @return void
-     */
-    public function testgetCssGradient()
-    {
-        $this->assertEquals(
-            $this->object->getCssGradient('12345', '54321'),
-            'background-image: url(./themes/svg_gradient.php?from=12345&to=54321);'
-            . "\n" . 'background-size: 100% 100%;'
-            . "\n" . 'background: -webkit-gradient(linear, left top, left bottom, '
-            . 'from(#12345), to(#54321));'
-            . "\n" . 'background: -webkit-linear-gradient(top, #12345, #54321);'
-            . "\n" . 'background: -moz-linear-gradient(top, #12345, #54321);'
-            . "\n" . 'background: -ms-linear-gradient(top, #12345, #54321);'
-            . "\n" . 'background: -o-linear-gradient(top, #12345, #54321);'
-        );
-    }
-
-    /**
-     * Test for getImgPath
-     *
-     * @param string $file   file name for image
-     * @param string $output expected output
-     *
-     * @return void
-     *
-     * @dataProvider providerForGetImgPath
-     */
-    public function testGetImgPath($file, $output)
-    {
-        $this->assertEquals(
-            $this->object->getImgPath($file),
-            $output
-        );
-    }
-
-    /**
-     * Provider for testGetImgPath
-     *
-     * @return array
-     */
-    public function providerForGetImgPath()
-    {
-        return array(
-            array(
-                null,
-                ''
-            ),
-            array(
-                'screen.png',
-                './themes/pmahomme/img/screen.png'
-            ),
-            array(
-                'arrow_ltr.png',
-                './themes/pmahomme/img/arrow_ltr.png'
-            )
-
-        );
-    }
-}
diff --git a/#pma/test/classes/TrackerTest.php b/#pma/test/classes/TrackerTest.php
deleted file mode 100644
index 8bae0f61..00000000
--- a/#pma/test/classes/TrackerTest.php
+++ /dev/null
@@ -1,926 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Tests for PMA\libraries\Tracker
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-use PMA\libraries\Tracker;
-
-require_once 'libraries/database_interface.inc.php';
-require_once 'libraries/relation.lib.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * Tests for PMA\libraries\Tracker
- *
- * @package PhpMyAdmin-test
- */
-class TrackerTest extends PMATestCase
-{
-
-    /**
-     * Setup function for test cases
-     *
-     * @access protected
-     * @return void
-     */
-    protected function setUp()
-    {
-        /**
-         * SET these to avoid undefined index error
-         */
-        $GLOBALS['server'] = 1;
-        $GLOBALS['cfg']['Server']['tracking_add_drop_table'] = '';
-        $GLOBALS['cfg']['Server']['tracking_add_drop_view'] = '';
-        $GLOBALS['cfg']['Server']['tracking_add_drop_database'] = '';
-        $GLOBALS['cfg']['Server']['tracking_default_statements'] = '';
-        $GLOBALS['cfg']['Server']['tracking_version_auto_create'] = '';
-        $GLOBALS['cfg']['Server']['DisableIS'] = false;
-
-        $_SESSION['relation'][$GLOBALS['server']] = array(
-            'PMA_VERSION' => PMA_VERSION,
-            'db' => 'pmadb',
-            'tracking' => 'tracking'
-        );
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $dbi->expects($this->any())->method('escapeString')
-            ->will($this->returnArgument(0));
-
-        $cfg['dbi'] = $dbi;
-    }
-    /**
-     * Test for Tracker::enable
-     *
-     * @return void
-     * @test
-     */
-    public function testEnabled()
-    {
-        Tracker::enable();
-        $this->assertTrue(
-            PHPUnit_Framework_Assert::readAttribute('PMA\libraries\Tracker', 'enabled')
-        );
-    }
-
-    /**
-     * Test for Tracker::isActive()
-     *
-     * @return void
-     * @test
-     */
-    public function testIsActive()
-    {
-        $attr = new \ReflectionProperty('PMA\libraries\Tracker', 'enabled');
-        $attr->setAccessible(true);
-        $attr->setValue(false);
-
-        $this->assertFalse(
-            Tracker::isActive()
-        );
-
-        Tracker::enable();
-
-        $_SESSION['relation'][$GLOBALS['server']] = array(
-            'PMA_VERSION' => PMA_VERSION,
-            'trackingwork' => false
-        );
-
-        $this->assertFalse(
-            Tracker::isActive()
-        );
-
-        $_SESSION['relation'][$GLOBALS['server']] = array(
-            'PMA_VERSION' => PMA_VERSION,
-            'trackingwork' => true,
-            'db' => 'pmadb',
-            'tracking' => 'tracking'
-        );
-
-        $this->assertTrue(
-            Tracker::isActive()
-        );
-    }
-
-    /**
-     * Test for Tracker::getTableName()
-     *
-     * @param string $string   String to test against
-     * @param string $expected Expected Table Name
-     *
-     * @return void
-     * @test
-     * @dataProvider getTableNameData
-     */
-    public function testGetTableName($string, $expected)
-    {
-        $reflection = new \ReflectionClass('PMA\libraries\Tracker');
-        $method = $reflection->getMethod("getTableName");
-        $method->setAccessible(true);
-
-        $this->assertEquals(
-            $expected,
-            $method->invokeArgs(null, array($string))
-        );
-    }
-
-    /**
-     * Data Provider for testGetTableName
-     *
-     * @return array Test data
-     *
-     */
-    public function getTableNameData()
-    {
-        return array(
-            array("`tbl`;", "tbl"),
-            array(" `pma.table` ", "table"),
-            array(" `pma.table\nfoobar` ", "table")
-        );
-    }
-
-    /**
-     * Test for Tracker::isTracked()
-     *
-     * @return void
-     * @test
-     */
-    public function testIsTracked()
-    {
-        $attr = new \ReflectionProperty('PMA\libraries\Tracker', 'enabled');
-        $attr->setAccessible(true);
-        $attr->setValue(false);
-
-        $this->assertFalse(
-            Tracker::isTracked("", "")
-        );
-
-        Tracker::enable();
-
-        $_SESSION['relation'][$GLOBALS['server']]['PMA_VERSION'] = PMA_VERSION;
-        $_SESSION['relation'][$GLOBALS['server']]['trackingwork'] = false;
-
-        $this->assertFalse(
-            Tracker::isTracked("", "")
-        );
-
-        $_SESSION['relation'][$GLOBALS['server']]['trackingwork'] = true;
-
-        $this->assertTrue(
-            Tracker::isTracked("pma_test_db", "pma_test_table")
-        );
-
-        $this->assertFalse(
-            Tracker::isTracked("pma_test_db", "pma_test_table2")
-        );
-    }
-
-    /**
-     * Test for Tracker::getLogComment()
-     *
-     * @return void
-     * @test
-     */
-    public function testGetLogComment()
-    {
-        if (!setupForTestsUsingDate()) {
-            $this->markTestSkipped("Cannot override internal function date()");
-        }
-
-        $date = date('Y-m-d H:i:s');
-        $GLOBALS['cfg']['Server']['user'] = "pma_test_user";
-
-        $this->assertEquals(
-            "# log $date pma_test_user\n",
-            Tracker::getLogComment()
-        );
-
-        tearDownForTestsUsingDate();
-    }
-
-    /**
-     * Test for Tracker::createVersion()
-     *
-     * @return void
-     * @test
-     */
-    public function testCreateVersion()
-    {
-        if (!setupForTestsUsingDate()) {
-            $this->markTestSkipped("Cannot override internal function date()");
-        }
-
-        $GLOBALS['cfg']['Server']['tracking_add_drop_table'] = true;
-        $GLOBALS['cfg']['Server']['tracking_add_drop_view'] = true;
-        $GLOBALS['cfg']['Server']['user'] = "pma_test_user";
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        /**
-         * set up mock objects
-         * passing null to with() for an argument is equivalent
-         * to passing $this->anything()
-         */
-
-        $getColumnsResult = array(
-            array(
-                'Field' => 'field1',
-                'Type' => 'int(11)',
-                'Key' => 'PRI'
-            ),
-            array(
-                'Field' => 'field2',
-                'Type' => 'text',
-                'Key' => ''
-            )
-        );
-        $dbi->expects($this->once())->method('getColumns')
-            ->with('pma_test', 'pma_tbl')
-            ->will($this->returnValue($getColumnsResult));
-
-        $getIndexesResult = array(
-            array(
-                'Table' => 'pma_tbl',
-                'Field' => 'field1',
-                'Key' => 'PRIMARY'
-            )
-        );
-        $dbi->expects($this->once())->method('getTableIndexes')
-            ->with('pma_test', 'pma_tbl')
-            ->will($this->returnValue($getIndexesResult));
-
-        $tableStatusArray = array(
-            array(
-                'Name' => 'pma_tbl',
-                'Rows' => '1',
-                'Create_time' => '2013-02-22 02:04:04',
-                'Update_time' => '2013-02-22 21:46:48'
-            )
-        );
-        $dbi->expects($this->any())->method('tryQuery')
-            ->with($this->equalTo("SHOW CREATE TABLE `pma_test`.`pma_tbl`"))
-            ->will(
-                $this->returnValue(
-                    "CREATE TABLE `pma_test`.`pma_tbl` (
-                    `id` int(11) NOT NULL AUTO_INCREMENT,
-                    `username` text NOT NULL
-                    )"
-                )
-            );
-
-        $date = date('Y-m-d H:i:s');
-
-        $expectedMainQuery = "/*NOTRACK*/" .
-        "\nINSERT INTO `pmadb`.`tracking` (db_name, table_name, version, date_created, date_updated," .
-        " schema_snapshot, schema_sql, data_sql, tracking ) values (
-        'pma_test',
-        'pma_tbl',
-        '1',
-        '" . $date . "',
-        '" . $date . "',
-        'a:2:{s:7:\"COLUMNS\";a:2:{" .
-        "i:0;a:3:{s:5:\"Field\";s:6:\"field1\";s:4:\"Type\";s:7:\"int(11)\";" .
-        "s:3:\"Key\";s:3:\"PRI\";}" .
-        "i:1;a:3:{s:5:\"Field\";s:6:\"field2\";s:4:\"Type\";s:4:\"text\";" .
-        "s:3:\"Key\";s:0:\"\";}}" .
-        "s:7:\"INDEXES\";a:1:{" .
-        "i:0;a:3:{s:5:\"Table\";s:7:\"pma_tbl\";s:5:\"Field\";s:6:\"field1\";" .
-        "s:3:\"Key\";s:7:\"PRIMARY\";}}}',
-        '# log " . $date . " pma_test_user" .
-        "\nDROP VIEW IF EXISTS `pma_tbl`;" .
-        "\n# log " . $date . " pma_test_user" .
-        "\n\n;" .
-        "\n',
-        '" .
-        "\n',
-        '11' )";
-
-        $GLOBALS['controllink'] = null;
-
-        $queryResults = array(
-            array(
-                "SHOW TABLE STATUS FROM `pma_test` LIKE 'pma_tbl'",
-                null,
-                1,
-                true,
-                $tableStatusArray
-            ),
-            array(
-                $expectedMainQuery,
-                null,
-                0,
-                false,
-                'executed'
-            )
-        );
-
-        $dbi->expects($this->any())->method('query')
-            ->will($this->returnValueMap($queryResults));
-
-        $dbi->expects($this->any())->method('escapeString')
-            ->will($this->returnArgument(0));
-
-        $GLOBALS['dbi'] = $dbi;
-        $this->assertEquals(
-            'executed',
-            Tracker::createVersion('pma_test', 'pma_tbl', '1', '11', true)
-        );
-
-        tearDownForTestsUsingDate();
-    }
-
-    /**
-     * Test for Tracker::deleteTracking()
-     *
-     * @return void
-     * @test
-     */
-    public function testDeleteTracking()
-    {
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $sql_query = "/*NOTRACK*/\n"
-            . "DELETE FROM `pmadb`.`tracking`"
-            . " WHERE `db_name` = 'testdb'"
-            . " AND `table_name` = 'testtable'";
-
-        $dbi->expects($this->exactly(1))
-            ->method('query')
-            ->with($sql_query)
-            ->will($this->returnValue('executed'));
-        $dbi->expects($this->any())->method('escapeString')
-            ->will($this->returnArgument(0));
-
-        $GLOBALS['dbi'] = $dbi;
-        $this->assertEquals(
-            Tracker::deleteTracking("testdb", "testtable"),
-            'executed'
-        );
-    }
-
-    /**
-     * Test for Tracker::createDatabaseVersion()
-     *
-     * @return void
-     * @test
-     */
-    public function testCreateDatabaseVersion()
-    {
-        if (!setupForTestsUsingDate()) {
-            $this->markTestSkipped("Cannot override internal function date()");
-        }
-
-        $GLOBALS['cfg']['Server']['tracking_add_drop_table'] = true;
-        $GLOBALS['cfg']['Server']['tracking_add_drop_view'] = true;
-        $GLOBALS['cfg']['Server']['user'] = "pma_test_user";
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $date = date('Y-m-d H:i:s');
-
-        $expectedMainQuery = "/*NOTRACK*/" .
-        "\nINSERT INTO `pmadb`.`tracking` (db_name, table_name, version, date_created, date_updated," .
-        " schema_snapshot, schema_sql, data_sql, tracking ) values (
-        'pma_test',
-        '',
-        '1',
-        '" . $date . "',
-        '" . $date . "',
-        '',
-        '# log " . $date . " pma_test_user" .
-        "\nSHOW DATABASES',
-        '" .
-        "\n',
-        'CREATE DATABASE,ALTER DATABASE,DROP DATABASE' )";
-
-        $GLOBALS['controllink'] = null;
-
-        $dbi->expects($this->exactly(1))
-            ->method('query')
-            ->with($expectedMainQuery, null, 0, false)
-            ->will($this->returnValue("executed"));
-
-        $dbi->expects($this->any())->method('escapeString')
-            ->will($this->returnArgument(0));
-
-        $GLOBALS['dbi'] = $dbi;
-        $this->assertEquals(
-            'executed',
-            Tracker::createDatabaseVersion('pma_test', '1', 'SHOW DATABASES')
-        );
-
-        tearDownForTestsUsingDate();
-    }
-
-    /**
-     * Test for Tracker::changeTracking(). This test is also invoked by two
-     * other tests: testActivateTracking() and testDeactivateTracking()
-     *
-     * @param string $dbname    Database name
-     * @param string $tablename Table name
-     * @param string $version   Version
-     * @param string $new_state State to change to
-     * @param string $type      Type of test
-     *
-     * @return void
-     *
-     * @test
-     *
-     */
-    public function testChangeTracking($dbname = 'pma_db', $tablename = 'pma_tbl',
-        $version = '0.1', $new_state = '1', $type = null
-    ) {
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $sql_query = " UPDATE `pmadb`.`tracking` SET `tracking_active` = " .
-        "'" . $new_state . "' " .
-        " WHERE `db_name` = '" . $dbname . "' " .
-        " AND `table_name` = '" . $tablename . "' " .
-        " AND `version` = '" . $version . "' ";
-
-        $GLOBALS['controllink'] = null;
-
-        $dbi->expects($this->exactly(1))
-            ->method('query')
-            ->with($sql_query, null, 0, false)
-            ->will($this->returnValue("executed"));
-
-        $dbi->expects($this->any())->method('escapeString')
-            ->will($this->returnArgument(0));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        if ($type == null) {
-            $method = new \ReflectionMethod('PMA\libraries\Tracker', '_changeTracking');
-            $method->setAccessible(true);
-            $result = $method->invoke(
-                null,
-                $dbname,
-                $tablename,
-                $version,
-                $new_state
-            );
-        } elseif ($type == "activate") {
-            $result = Tracker::activateTracking($dbname, $tablename, $version);
-        } elseif ($type == "deactivate") {
-            $result = Tracker::deactivateTracking($dbname, $tablename, $version);
-        }
-
-        $this->assertEquals(
-            'executed',
-            $result
-        );
-    }
-
-    /**
-     * Test for Tracker::testChangeTrackingData()
-     *
-     * @return void
-     * @test
-     */
-    public function testChangeTrackingData()
-    {
-        if (!setupForTestsUsingDate()) {
-            $this->markTestSkipped("Cannot override internal function date()");
-        }
-
-        $this->assertFalse(
-            Tracker::changeTrackingData("", "", "", "", "")
-        );
-
-        $GLOBALS['controllink'] = null;
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $sql_query_1 = " UPDATE `pmadb`.`tracking`" .
-        " SET `schema_sql` = '# new_data_processed' " .
-        " WHERE `db_name` = 'pma_db' " .
-        " AND `table_name` = 'pma_table' " .
-        " AND `version` = '1.0' ";
-
-        $date  = date('Y-m-d H:i:s');
-
-        $new_data = array(
-            array(
-                'username' => 'user1',
-                'statement' => 'test_statement1'
-            ),
-            array(
-                'username' => 'user2',
-                'statement' => 'test_statement2'
-            )
-        );
-
-        $sql_query_2 = " UPDATE `pmadb`.`tracking`" .
-        " SET `data_sql` = '# log $date user1test_statement1\n" .
-        "# log $date user2test_statement2\n' " .
-        " WHERE `db_name` = 'pma_db' " .
-        " AND `table_name` = 'pma_table' " .
-        " AND `version` = '1.0' ";
-
-        $dbi->method('query')
-            ->will(
-                $this->returnValueMap(
-                    array(
-                        array($sql_query_1, null, 0, false, "executed_1"),
-                        array($sql_query_2, null, 0, false, "executed_2")
-                    )
-                )
-            );
-
-        $dbi->expects($this->any())->method('escapeString')
-            ->will($this->returnArgument(0));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $this->assertEquals(
-            true,
-            Tracker::changeTrackingData(
-                'pma_db',
-                'pma_table',
-                '1.0',
-                'DDL',
-                "# new_data_processed"
-            )
-        );
-
-        $this->assertEquals(
-            true,
-            Tracker::changeTrackingData(
-                'pma_db',
-                'pma_table',
-                '1.0',
-                'DML',
-                $new_data
-            )
-        );
-
-        tearDownForTestsUsingDate();
-    }
-
-    /**
-     * Test for Tracker::activateTracking()
-     *
-     * @return void
-     * @test
-     */
-    public function testActivateTracking()
-    {
-        $this->testChangeTracking('pma_db', 'pma_tbl', '0.1', 1, 'activate');
-    }
-
-    /**
-     * Test for Tracker::deactivateTracking()
-     *
-     * @return void
-     * @test
-     */
-    public function testDeactivateTracking()
-    {
-        $this->testChangeTracking('pma_db', 'pma_tbl', '0.1', '0', 'deactivate');
-    }
-
-    /**
-     * Test for PMA_Tracker::getTrackedData()
-     *
-     * @param array $fetchArrayReturn Value to be returned by mocked fetchArray
-     * @param array $expectedArray    Expected array
-     *
-     * @return void
-     * @test
-     * @dataProvider getTrackedDataProvider
-     */
-    public function testGetTrackedData($fetchArrayReturn, $expectedArray)
-    {
-        $GLOBALS['controllink'] = null;
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->once())
-            ->method('query')
-            ->will($this->returnValue("executed_1"));
-
-        $dbi->expects($this->once())
-            ->method('fetchAssoc')
-            ->with("executed_1")
-            ->will($this->returnValue($fetchArrayReturn));
-
-        $dbi->expects($this->any())
-            ->method('escapeString')
-            ->will(
-                $this->returnValueMap(
-                    array(
-                        array("pma'db", "pma\'db"),
-                        array("pma'table", "pma\'table"),
-                        array("1.0", "1.0"),
-                    )
-                )
-            );
-
-        $GLOBALS['dbi'] = $dbi;
-        $result = Tracker::getTrackedData("pma'db", "pma'table", "1.0");
-
-        $this->assertEquals(
-            $expectedArray,
-            $result
-        );
-    }
-
-    /**
-     * Data provider for testGetTrackedData
-     *
-     * @return array Test data
-     */
-    public function getTrackedDataProvider()
-    {
-        $fetchArrayReturn = array(
-            array(
-                "schema_sql" => "# log 20-03-2013 23:33:58 user1\nstat1" .
-                "# log 20-03-2013 23:39:58 user2\n",
-                "data_sql" => "# log ",
-                "schema_snapshot" => "dataschema",
-                "tracking" => "SELECT, DELETE"
-            )
-        );
-
-        $data = array(
-            array(
-                'date_from' => '20-03-2013 23:33:58',
-                'date_to' => '20-03-2013 23:39:58',
-                'ddlog' => array(
-                                array(
-                                    'date' => '20-03-2013 23:33:58',
-                                    'username' => 'user1',
-                                    'statement' => "\nstat1"
-                                ),
-                                array(
-                                    'date' => '20-03-2013 23:39:58',
-                                    'username' => 'user2',
-                                    'statement' => ""
-                                )
-                            ),
-                'dmlog' => array(),
-                "schema_snapshot" => "dataschema",
-                "tracking" => "SELECT, DELETE"
-            )
-        );
-
-        $fetchArrayReturn[1] = array(
-            "schema_sql" => "# log 20-03-2012 23:33:58 user1\n" .
-            "# log 20-03-2012 23:39:58 user2\n",
-            "data_sql" => "# log 20-03-2013 23:33:58 user3\n" .
-            "# log 20-03-2013 23:39:58 user4\n",
-            "schema_snapshot" => "dataschema",
-            "tracking" => "SELECT, DELETE"
-        );
-
-        $data[1] = array(
-            'date_from' => '20-03-2012 23:33:58',
-            'date_to' => '20-03-2013 23:39:58',
-            'ddlog' => array(
-                            array(
-                                'date' => '20-03-2012 23:33:58',
-                                'username' => 'user1',
-                                'statement' => ""
-                            ),
-                            array(
-                                'date' => '20-03-2012 23:39:58',
-                                'username' => 'user2',
-                                'statement' => ""
-                            )
-                        ),
-            'dmlog' => array(
-                            array(
-                                'date' => '20-03-2013 23:33:58',
-                                'username' => 'user3',
-                                'statement' => ""
-                            ),
-                            array(
-                                'date' => '20-03-2013 23:39:58',
-                                'username' => 'user4',
-                                'statement' => ""
-                            )
-                        ),
-            "schema_snapshot" => "dataschema",
-            "tracking" => "SELECT, DELETE"
-        );
-        return array(
-            array($fetchArrayReturn[0], $data[0]),
-            array($fetchArrayReturn[1], $data[1])
-        );
-    }
-
-    /**
-     * Test for Tracker::parseQuery
-     *
-     * @param string $query                  Query to parse
-     * @param string $type                   Expected type
-     * @param string $identifier             Expected identifier
-     * @param string $tablename              Expected tablename
-     * @param string $db                     Expected dbname
-     * @param string $tablename_after_rename Expected name after rename
-     *
-     * @return void
-     *
-     * @test
-     * @dataProvider parseQueryData
-     */
-    public function testParseQuery($query, $type, $identifier, $tablename,
-        $db = null, $tablename_after_rename = null
-    ) {
-        $result = Tracker::parseQuery($query);
-
-        $this->assertEquals(
-            $type,
-            $result['type']
-        );
-
-        $this->assertEquals(
-            $identifier,
-            $result['identifier']
-        );
-
-        $this->assertEquals(
-            $tablename,
-            $result['tablename']
-        );
-
-        if ($db) {
-            $this->assertEquals(
-                $db,
-                $GLOBALS['db']
-            );
-        }
-
-        if ($tablename_after_rename) {
-            $this->assertEquals(
-                $result['tablename_after_rename'],
-                $tablename_after_rename
-            );
-        }
-    }
-
-    /**
-     * Data provider for testParseQuery
-     *
-     * @return array Test data
-     */
-    public function parseQueryData()
-    {
-        $query = array();
-        /** TODO: Should test fail when USE is in conjunction with * identifiers?
-        $query[] = array(
-            " - USE db1;\n- CREATE VIEW db1.v AS SELECT * FROM t;",
-            "DDL",
-            "CREATE VIEW",
-            "v",
-            "db1"
-        );
-        */
-        $query[] = array(
-            "- CREATE VIEW v AS SELECT * FROM t;",
-            "DDL",
-            "CREATE VIEW",
-            "v",
-        );
-        $query[] = array(
-            "- ALTER VIEW db1.v AS SELECT col1, col2, col3, col4 FROM t",
-            "DDL",
-            "ALTER VIEW",
-            "v"
-        );
-        $query[] = array(
-            "- DROP VIEW db1.v;",
-            "DDL",
-            "DROP VIEW",
-            "v"
-        );
-        $query[] = array(
-            "- DROP VIEW IF EXISTS db1.v;",
-            "DDL",
-            "DROP VIEW",
-            "v"
-        );
-        $query[] = array(
-            "- CREATE DATABASE db1; -",
-            "DDL",
-            "CREATE DATABASE",
-            "",
-            "db1"
-        );
-        $query[] = array(
-            "- ALTER DATABASE db1; -",
-            "DDL",
-            "ALTER DATABASE",
-            ""
-        );
-        $query[] = array(
-            "- DROP DATABASE db1; -",
-            "DDL",
-            "DROP DATABASE",
-            "",
-            "db1"
-        );
-        $query[] = array(
-            "- CREATE TABLE db1.t1 (c1 INT);",
-            "DDL",
-            "CREATE TABLE",
-            "t1"
-        );
-        $query[] =  array(
-            "- ALTER TABLE db1.t1 ADD c2 TEXT;",
-            "DDL",
-            "ALTER TABLE",
-            "t1"
-        );
-        $query[] =  array(
-            "- DROP TABLE db1.t1",
-            "DDL",
-            "DROP TABLE",
-            "t1"
-        );
-        $query[] =  array(
-            "- DROP TABLE IF EXISTS db1.t1",
-            "DDL",
-            "DROP TABLE",
-            "t1"
-        );
-        $query[] =  array(
-            "- CREATE INDEX ind ON db1.t1 (c2(10));",
-            "DDL",
-            "CREATE INDEX",
-            "t1"
-        );
-        $query[] =  array(
-            "- CREATE UNIQUE INDEX ind ON db1.t1 (c2(10));",
-            "DDL",
-            "CREATE INDEX",
-            "t1"
-        );
-        $query[] =  array(
-            "- CREATE SPATIAL INDEX ind ON db1.t1 (c2(10));",
-            "DDL",
-            "CREATE INDEX",
-            "t1"
-        );
-        $query[] =  array(
-            "- DROP INDEX ind ON db1.t1;",
-            "DDL",
-            "DROP INDEX",
-            "t1"
-        );
-        $query[] =  array(
-            "- RENAME TABLE db1.t1 TO db1.t2",
-            "DDL",
-            "RENAME TABLE",
-            "t1",
-            "",
-            "t2"
-        );
-        $query[] =  array(
-            "- UPDATE db1.t1 SET a = 2",
-            "DML",
-            "UPDATE",
-            "t1"
-        );
-        $query[] =  array(
-            "- INSERT INTO db1.t1 (a, b, c) VALUES(1, 2, 3)",
-            "DML",
-            "INSERT",
-            "t1"
-        );
-        $query[] =  array(
-            "- DELETE FROM db1.t1",
-            "DML",
-            "DELETE",
-            "t1"
-        );
-        $query[] =  array(
-            "- TRUNCATE db1.t1",
-            "DML",
-            "TRUNCATE",
-            "t1"
-        );
-
-        return $query;
-    }
-}
diff --git a/#pma/test/classes/TypesMySQLTest.php b/#pma/test/classes/TypesMySQLTest.php
deleted file mode 100644
index 7a327509..00000000
--- a/#pma/test/classes/TypesMySQLTest.php
+++ /dev/null
@@ -1,432 +0,0 @@
-<?php
-/**
- * Tests for Types.php
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-
-use PMA\libraries\TypesMySQL;
-
-require_once 'test/PMATestCase.php';
-
-/**
- * Testcase for MySQL types handling.
- *
- * @package PhpMyAdmin-test
- */
-class TypesMySQLTest extends PMATestCase
-{
-    /**
-     * @var PMA\libraries\Types
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     *
-     * @return void
-     */
-    protected function setUp()
-    {
-        $this->object = new TypesMySQL();
-    }
-
-    /**
-     * Test for getTypeDescription
-     *
-     * @param string $type The data type to get a description.
-     *
-     * @return void
-     *
-     * @dataProvider providerForTestGetTypeDescription
-     */
-    public function testGetTypeDescription($type)
-    {
-        $this->assertNotEquals(
-            '',
-            $this->object->getTypeDescription($type)
-        );
-    }
-
-    /**
-     * Test for getTypeDescription with unknown value
-     *
-     * @return void
-     */
-    public function testGetUnknownTypeDescription()
-    {
-        $this->assertEquals(
-            '',
-            $this->object->getTypeDescription('UNKNOWN')
-        );
-    }
-
-    /**
-     * Provider for testGetTypeDescription
-     *
-     * @return array
-     */
-    public function providerForTestGetTypeDescription()
-    {
-        return array(
-            array('TINYINT'),
-            array('SMALLINT'),
-            array('MEDIUMINT'),
-            array('INT'),
-            array('BIGINT'),
-            array('DECIMAL'),
-            array('FLOAT'),
-            array('DOUBLE'),
-            array('REAL'),
-            array('BIT'),
-            array('BOOLEAN'),
-            array('SERIAL'),
-            array('DATE'),
-            array('DATETIME'),
-            array('TIMESTAMP'),
-            array('TIME'),
-            array('YEAR'),
-            array('CHAR'),
-            array('VARCHAR'),
-            array('TINYTEXT'),
-            array('TEXT'),
-            array('MEDIUMTEXT'),
-            array('LONGTEXT'),
-            array('BINARY'),
-            array('VARBINARY'),
-            array('TINYBLOB'),
-            array('MEDIUMBLOB'),
-            array('BLOB'),
-            array('LONGBLOB'),
-            array('ENUM'),
-            array('SET'),
-            array('GEOMETRY'),
-            array('POINT'),
-            array('LINESTRING'),
-            array('POLYGON'),
-            array('MULTIPOINT'),
-            array('MULTILINESTRING'),
-            array('MULTIPOLYGON'),
-            array('GEOMETRYCOLLECTION'),
-        );
-    }
-
-    /**
-     * Test for getTypeClass
-     *
-     * @param string $type   Type to check
-     * @param string $output Expected result
-     *
-     * @return void
-     *
-     * @dataProvider providerFortTestGetTypeClass
-     */
-    public function testGetTypeClass($type, $output)
-    {
-        $this->assertEquals(
-            $output,
-            $this->object->getTypeClass($type)
-        );
-    }
-
-    /**
-     * Data provider for type testing
-     *
-     * @return array for testing type detection
-     */
-    public function providerFortTestGetTypeClass()
-    {
-        return array(
-            array(
-                'SERIAL',
-                'NUMBER'
-            ),
-            array(
-                'YEAR',
-                'DATE'
-            ),
-            array(
-                'GEOMETRYCOLLECTION',
-                'SPATIAL'
-            ),
-            array(
-                'SET',
-                'CHAR'
-            ),
-            array(
-                'UNKNOWN',
-                ''
-            )
-        );
-    }
-
-    /**
-     * Test for getFunctionsClass
-     *
-     * @param string $class  The class to get function list.
-     * @param array  $output Expected function list
-     *
-     * @return void
-     *
-     * @dataProvider providerFortTestGetFunctionsClass
-     */
-    public function testGetFunctionsClass($class, $output)
-    {
-        $this->assertEquals(
-            $output,
-            $this->object->getFunctionsClass($class)
-        );
-    }
-
-    /**
-     * Data provider for testing function lists
-     *
-     * @return array with test data
-     */
-    public function providerFortTestGetFunctionsClass()
-    {
-        return array(
-            array(
-                'CHAR',
-                array(
-                    'AES_DECRYPT',
-                    'AES_ENCRYPT',
-                    'BIN',
-                    'CHAR',
-                    'COMPRESS',
-                    'CURRENT_USER',
-                    'DATABASE',
-                    'DAYNAME',
-                    'DES_DECRYPT',
-                    'DES_ENCRYPT',
-                    'ENCRYPT',
-                    'HEX',
-                    'INET6_NTOA',
-                    'INET_NTOA',
-                    'LOAD_FILE',
-                    'LOWER',
-                    'LTRIM',
-                    'MD5',
-                    'MONTHNAME',
-                    'OLD_PASSWORD',
-                    'PASSWORD',
-                    'QUOTE',
-                    'REVERSE',
-                    'RTRIM',
-                    'SHA1',
-                    'SOUNDEX',
-                    'SPACE',
-                    'TRIM',
-                    'UNCOMPRESS',
-                    'UNHEX',
-                    'UPPER',
-                    'USER',
-                    'UUID',
-                    'VERSION',
-                )
-            ),
-            array(
-                'DATE',
-                array(
-                    'CURRENT_DATE',
-                    'CURRENT_TIME',
-                    'DATE',
-                    'FROM_DAYS',
-                    'FROM_UNIXTIME',
-                    'LAST_DAY',
-                    'NOW',
-                    'SEC_TO_TIME',
-                    'SYSDATE',
-                    'TIME',
-                    'TIMESTAMP',
-                    'UTC_DATE',
-                    'UTC_TIME',
-                    'UTC_TIMESTAMP',
-                    'YEAR',
-                )
-            ),
-            array(
-                'SPATIAL',
-                array(
-                    'GeomFromText',
-                    'GeomFromWKB',
-
-                    'GeomCollFromText',
-                    'LineFromText',
-                    'MLineFromText',
-                    'PointFromText',
-                    'MPointFromText',
-                    'PolyFromText',
-                    'MPolyFromText',
-
-                    'GeomCollFromWKB',
-                    'LineFromWKB',
-                    'MLineFromWKB',
-                    'PointFromWKB',
-                    'MPointFromWKB',
-                    'PolyFromWKB',
-                    'MPolyFromWKB',
-                )
-            ),
-            array(
-                'NUMBER',
-                array(
-                    '0' => 'ABS',
-                    '1' => 'ACOS',
-                    '2' => 'ASCII',
-                    '3' => 'ASIN',
-                    '4' => 'ATAN',
-                    '5' => 'BIT_LENGTH',
-                    '6' => 'BIT_COUNT',
-                    '7' => 'CEILING',
-                    '8' => 'CHAR_LENGTH',
-                    '9' => 'CONNECTION_ID',
-                    '10' => 'COS',
-                    '11' => 'COT',
-                    '12' => 'CRC32',
-                    '13' => 'DAYOFMONTH',
-                    '14' => 'DAYOFWEEK',
-                    '15' => 'DAYOFYEAR',
-                    '16' => 'DEGREES',
-                    '17' => 'EXP',
-                    '18' => 'FLOOR',
-                    '19' => 'HOUR',
-                    '20' => 'INET6_ATON',
-                    '21' => 'INET_ATON',
-                    '22' => 'LENGTH',
-                    '23' => 'LN',
-                    '24' => 'LOG',
-                    '25' => 'LOG2',
-                    '26' => 'LOG10',
-                    '27' => 'MICROSECOND',
-                    '28' => 'MINUTE',
-                    '29' => 'MONTH',
-                    '30' => 'OCT',
-                    '31' => 'ORD',
-                    '32' => 'PI',
-                    '33' => 'QUARTER',
-                    '34' => 'RADIANS',
-                    '35' => 'RAND',
-                    '36' => 'ROUND',
-                    '37' => 'SECOND',
-                    '38' => 'SIGN',
-                    '39' => 'SIN',
-                    '40' => 'SQRT',
-                    '41' => 'TAN',
-                    '42' => 'TO_DAYS',
-                    '43' => 'TO_SECONDS',
-                    '44' => 'TIME_TO_SEC',
-                    '45' => 'UNCOMPRESSED_LENGTH',
-                    '46' => 'UNIX_TIMESTAMP',
-                    '47' => 'UUID_SHORT',
-                    '48' => 'WEEK',
-                    '49' => 'WEEKDAY',
-                    '50' => 'WEEKOFYEAR',
-                    '51' => 'YEARWEEK'
-                )
-            ),
-            array(
-                'UNKNOWN',
-                array()
-            )
-        );
-    }
-
-    /**
-     * Test for getAttributes
-     *
-     * @return void
-     */
-    public function testGetAttributes()
-    {
-        $this->assertEquals(
-            array(
-                '',
-                'BINARY',
-                'UNSIGNED',
-                'UNSIGNED ZEROFILL',
-                'on update CURRENT_TIMESTAMP',
-            ),
-            $this->object->getAttributes()
-        );
-    }
-
-    /**
-     * Test for getColumns
-     *
-     * @return void
-     */
-    public function testGetColumns()
-    {
-        $this->assertEquals(
-            array(
-                0 => 'INT',
-                1 => 'VARCHAR',
-                2 => 'TEXT',
-                3 => 'DATE',
-                'Numeric' => array (
-                    'TINYINT',
-                    'SMALLINT',
-                    'MEDIUMINT',
-                    'INT',
-                    'BIGINT',
-                    '-',
-                    'DECIMAL',
-                    'FLOAT',
-                    'DOUBLE',
-                    'REAL',
-                    '-',
-                    'BIT',
-                    'BOOLEAN',
-                    'SERIAL',
-                ),
-                'Date and time' => array (
-                    'DATE',
-                    'DATETIME',
-                    'TIMESTAMP',
-                    'TIME',
-                    'YEAR',
-                ),
-                'String' => array (
-                    'CHAR',
-                    'VARCHAR',
-                    '-',
-                    'TINYTEXT',
-                    'TEXT',
-                    'MEDIUMTEXT',
-                    'LONGTEXT',
-                    '-',
-                    'BINARY',
-                    'VARBINARY',
-                    '-',
-                    'TINYBLOB',
-                    'MEDIUMBLOB',
-                    'BLOB',
-                    'LONGBLOB',
-                    '-',
-                    'ENUM',
-                    'SET',
-                ),
-                'Spatial' => array (
-                    'GEOMETRY',
-                    'POINT',
-                    'LINESTRING',
-                    'POLYGON',
-                    'MULTIPOINT',
-                    'MULTILINESTRING',
-                    'MULTIPOLYGON',
-                    'GEOMETRYCOLLECTION',
-                ),
-                'JSON' => array(
-                    'JSON'
-                )
-            ),
-            $this->object->getColumns()
-        );
-    }
-}
diff --git a/#pma/test/classes/TypesTest.php b/#pma/test/classes/TypesTest.php
deleted file mode 100644
index f59388e9..00000000
--- a/#pma/test/classes/TypesTest.php
+++ /dev/null
@@ -1,338 +0,0 @@
-<?php
-/**
- * Tests for Types.php
- *
- * @package PhpMyAdmin-test
- */
-use PMA\libraries\Types;
-
-require_once 'test/PMATestCase.php';
-
-/**
- * Test class for Types.
- *
- * @package PhpMyAdmin-test
- */
-class TypesTest extends PMATestCase
-{
-    /**
-     * @var Types
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     *
-     * @return void
-     */
-    protected function setUp()
-    {
-        $this->object = new Types();
-    }
-
-    /**
-     * Test for isUnaryOperator
-     *
-     * @return void
-     */
-    public function testUnary()
-    {
-        $this->assertTrue($this->object->isUnaryOperator('IS NULL'));
-        $this->assertFalse($this->object->isUnaryOperator('='));
-    }
-
-    /**
-     * Test for getUnaryOperators
-     *
-     * @return void
-     */
-    public function testGetUnaryOperators()
-    {
-        $this->assertEquals(
-            array(
-                'IS NULL',
-                'IS NOT NULL',
-                "= ''",
-                "!= ''",
-            ),
-            $this->object->getUnaryOperators()
-        );
-    }
-
-    /**
-     * Test for getNullOperators
-     *
-     * @return void
-     */
-    public function testGetNullOperators()
-    {
-        $this->assertEquals(
-            array(
-                'IS NULL',
-                'IS NOT NULL',
-            ),
-            $this->object->getNullOperators()
-        );
-    }
-
-    /**
-     * Test for getEnumOperators
-     *
-     * @return void
-     */
-    public function testGetEnumOperators()
-    {
-        $this->assertEquals(
-            array(
-                '=',
-                '!=',
-            ),
-            $this->object->getEnumOperators()
-        );
-    }
-
-    /**
-     * Test for getTextOperators
-     *
-     * @return void
-     */
-    public function testgetTextOperators()
-    {
-        $this->assertEquals(
-            array(
-                'LIKE',
-                'LIKE %...%',
-                'NOT LIKE',
-                '=',
-                '!=',
-                'REGEXP',
-                'REGEXP ^...$',
-                'NOT REGEXP',
-                "= ''",
-                "!= ''",
-                'IN (...)',
-                'NOT IN (...)',
-                'BETWEEN',
-                'NOT BETWEEN',
-            ),
-            $this->object->getTextOperators()
-        );
-    }
-
-    /**
-     * Test for getNumberOperators
-     *
-     * @return void
-     */
-    public function testGetNumberOperators()
-    {
-        $this->assertEquals(
-            array(
-                '=',
-                '>',
-                '>=',
-                '<',
-                '<=',
-                '!=',
-                'LIKE',
-                'LIKE %...%',
-                'NOT LIKE',
-                'IN (...)',
-                'NOT IN (...)',
-                'BETWEEN',
-                'NOT BETWEEN',
-            ),
-            $this->object->getNumberOperators()
-        );
-    }
-
-    /**
-     * Test for getting type operators
-     *
-     * @param string  $type   Type of field
-     * @param boolean $null   Whether field can be NULL
-     * @param string  $output Expected output
-     *
-     * @return void
-     *
-     * @dataProvider providerForGetTypeOperators
-     */
-    public function testGetTypeOperators($type, $null, $output)
-    {
-        $this->assertEquals(
-            $output,
-            $this->object->getTypeOperators($type, $null)
-        );
-    }
-
-    /**
-     * data provider for testGetTypeOperators
-     *
-     * @return data for testGetTypeOperators
-     */
-    public function providerForGetTypeOperators()
-    {
-        return array(
-            array(
-                'enum',
-                false,
-                array(
-                    '=',
-                    '!=',
-                )
-            ),
-            array(
-                'CHAR',
-                true,
-                array(
-                    '=',
-                    '>',
-                    '>=',
-                    '<',
-                    '<=',
-                    '!=',
-                    'LIKE',
-                    'LIKE %...%',
-                    'NOT LIKE',
-                    'IN (...)',
-                    'NOT IN (...)',
-                    'BETWEEN',
-                    'NOT BETWEEN',
-                    'IS NULL',
-                    'IS NOT NULL',
-                ),
-                array(
-                    'int',
-                    false,
-                    array(
-                        '=',
-                        '!=',
-                    )
-                ),
-            )
-        );
-    }
-
-    /**
-     * Test for getTypeOperatorsHtml
-     *
-     * @param string  $type             Type of field
-     * @param boolean $null             Whether field can be NULL
-     * @param string  $selectedOperator Option to be selected
-     * @param string  $output           Expected output
-     *
-     * @return void
-     *
-     * @dataProvider providerForTestGetTypeOperatorsHtml
-     */
-    public function testGetTypeOperatorsHtml(
-        $type, $null, $selectedOperator, $output
-    ) {
-        $this->assertEquals(
-            $output,
-            $this->object->getTypeOperatorsHtml($type, $null, $selectedOperator)
-        );
-    }
-
-    /**
-     * Provider for testGetTypeOperatorsHtml
-     *
-     * @return test data for getTypeOperatorsHtml
-     */
-    public function providerForTestGetTypeOperatorsHtml()
-    {
-        return array(
-            array(
-                'enum',
-                false,
-                '=',
-                '<option value="=" selected="selected">=</option>'
-                . '<option value="!=">!=</option>'
-            )
-        );
-    }
-
-    /**
-     * Test for getTypeDescription
-     *
-     * @return void
-     */
-    public function testGetTypeDescription()
-    {
-        $this->assertEquals(
-            '',
-            $this->object->getTypeDescription('enum')
-        );
-    }
-
-    /**
-     * Test for getFunctionsClass
-     *
-     * @return void
-     */
-    public function testGetFunctionsClass()
-    {
-        $this->assertEquals(
-            array(),
-            $this->object->getFunctionsClass('enum')
-        );
-    }
-
-    /**
-     * Test for getFunctions
-     *
-     * @return void
-     */
-    public function testGetFunctions()
-    {
-        $this->assertEquals(
-            array(),
-            $this->object->getFunctions('enum')
-        );
-    }
-
-    /**
-     * Test for getAllFunctions
-     *
-     * @return void
-     */
-    public function testGetAllFunctions()
-    {
-        $this->assertEquals(
-            array(),
-            $this->object->getAllFunctions()
-        );
-    }
-
-    /**
-     * Test for getAttributes
-     *
-     * @return void
-     */
-    public function testGetAttributes()
-    {
-        $this->assertEquals(
-            array(),
-            $this->object->getAttributes()
-        );
-    }
-
-    /**
-     * Test for getColumns
-     *
-     * @return void
-     */
-    public function testGetColumns()
-    {
-        $this->assertEquals(
-            array(
-                'INT',
-                'VARCHAR',
-                'TEXT',
-                'DATE',
-            ),
-            $this->object->getColumns()
-        );
-    }
-}
diff --git a/#pma/test/classes/UtilTest.php b/#pma/test/classes/UtilTest.php
deleted file mode 100644
index fdda1d6d..00000000
--- a/#pma/test/classes/UtilTest.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Test for PMA\libraries\Util class
- *
- * @package PhpMyAdmin-test
- */
-
-require_once 'test/PMATestCase.php';
-
-/**
- * Test for PMA\libraries\Util class
- *
- * @package PhpMyAdmin-test
- */
-class UtilTest extends PMATestCase
-{
-
-    /**
-     * Test for createGISData
-     *
-     * @return void
-     */
-    public function testCreateGISData()
-    {
-        $this->assertEquals(
-            "abc",
-            PMA\libraries\Util::createGISData("abc")
-        );
-        $this->assertEquals(
-            "GeomFromText('POINT()',10)",
-            PMA\libraries\Util::createGISData("'POINT()',10")
-        );
-    }
-
-    /**
-     * Test for getGISFunctions
-     *
-     * @return void
-     */
-    public function testGetGISFunctions()
-    {
-        $funcs = PMA\libraries\Util::getGISFunctions();
-        $this->assertArrayHasKey(
-            'Dimension',
-            $funcs
-        );
-        $this->assertArrayHasKey(
-            'GeometryType',
-            $funcs
-        );
-        $this->assertArrayHasKey(
-            'MBRDisjoint',
-            $funcs
-        );
-    }
-
-    /**
-     * Test for Page Selector
-     *
-     * @return void
-     */
-    public function testPageSelector()
-    {
-        $this->assertContains(
-            '<select class="pageselector ajax" name="pma" >',
-            PMA\libraries\Util::pageselector("pma", 3)
-        );
-    }
-
-    /**
-     * Test for isForeignKeyCheck
-     *
-     * @return void
-     */
-    public function testIsForeignKeyCheck()
-    {
-        $GLOBALS['server'] = 1;
-
-        $GLOBALS['cfg']['DefaultForeignKeyChecks'] = 'enable';
-        $this->assertEquals(
-            true,
-            PMA\libraries\Util::isForeignKeyCheck()
-        );
-
-        $GLOBALS['cfg']['DefaultForeignKeyChecks'] = 'disable';
-        $this->assertEquals(
-            false,
-            PMA\libraries\Util::isForeignKeyCheck()
-        );
-
-        $GLOBALS['cfg']['DefaultForeignKeyChecks'] = 'default';
-        $this->assertEquals(
-            true,
-            PMA\libraries\Util::isForeignKeyCheck()
-        );
-    }
-
-    /**
-     * Test for isForeignKeySupported
-     *
-     * @return void
-     */
-    public function testIsForeignKeySupported()
-    {
-        $GLOBALS['server'] = 1;
-
-        $this->assertTrue(
-            PMA\libraries\Util::isForeignKeySupported('innodb')
-        );
-        $this->assertFalse(
-            PMA\libraries\Util::isForeignKeySupported('myisam')
-        );
-        $this->assertTrue(
-            PMA\libraries\Util::isForeignKeySupported('ndb')
-        );
-    }
-
-}
diff --git a/#pma/test/classes/VersionInformationTest.php b/#pma/test/classes/VersionInformationTest.php
deleted file mode 100644
index 02a97468..00000000
--- a/#pma/test/classes/VersionInformationTest.php
+++ /dev/null
@@ -1,261 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Tests for methods in PMA\libraries\VersionInformation class
-*
-* @package PhpMyAdmin-test
-*/
-
-/*
- * Include to test.
- */
-use PMA\libraries\VersionInformation;
-
-require_once 'test/PMATestCase.php';
-
-/**
- * Tests for methods in PMA\libraries\VersionInformation class
- *
- * @package PhpMyAdmin-test
- */
-class VersionInformationTest extends PMATestCase
-{
-    private $_releases;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     *
-     * @return void
-     */
-    protected function setUp()
-    {
-        $this->_releases = array();
-
-        $release = new stdClass();
-        $release->date = "2015-09-08";
-        $release->php_versions = ">=5.3,<7.1";
-        $release->version = "4.4.14.1";
-        $release->mysql_versions = ">=5.5";
-        $this->_releases[] = $release;
-
-        $release = new stdClass();
-        $release->date = "2015-09-09";
-        $release->php_versions = ">=5.3,<7.0";
-        $release->version = "4.4.13.3";
-        $release->mysql_versions = ">=5.5";
-        $this->_releases[] = $release;
-
-        $release = new stdClass();
-        $release->date = "2015-05-13";
-        $release->php_versions = ">=5.2,<5.3";
-        $release->version = "4.0.10.10";
-        $release->mysql_versions = ">=5.0";
-        $this->_releases[] = $release;
-    }
-
-    /**
-     * Test version checking
-     *
-     * @return void
-     *
-     * @group large
-     */
-    public function testGetLatestVersion()
-    {
-        $GLOBALS['cfg']['ProxyUrl'] = PROXY_URL;
-        $GLOBALS['cfg']['ProxyUser'] = PROXY_USER;
-        $GLOBALS['cfg']['ProxyPass'] = PROXY_PASS;
-        $GLOBALS['cfg']['VersionCheck'] = true;
-        $versionInformation = new VersionInformation();
-        $version = $versionInformation->getLatestVersion();
-        $this->assertNotEmpty($version->version);
-        $this->assertNotEmpty($version->date);
-    }
-
-    /**
-     * Test version to int conversion.
-     *
-     * @param string $version Version string
-     * @param int    $numeric Integer matching version
-     *
-     * @return void
-     *
-     * @dataProvider dataVersions
-     */
-    public function testVersionToInt($version, $numeric)
-    {
-        $versionInformation = new VersionInformation();
-        $this->assertEquals(
-            $numeric,
-            $versionInformation->versionToInt($version)
-        );
-    }
-
-
-    /**
-     * Data provider for version parsing
-     *
-     * @return array with test data
-     */
-    public function dataVersions()
-    {
-        return array(
-            array('1.0.0', 1000050),
-            array('2.0.0.2-dev', 2000002),
-            array('3.4.2.1', 3040251),
-            array('3.4.2-dev3', 3040203),
-            array('3.4.2-dev', 3040200),
-            array('3.4.2-pl', 3040260),
-            array('3.4.2-pl3', 3040263),
-            array('4.4.2-rc22', 4040252),
-            array('4.4.2-rc', 4040230),
-            array('4.4.22-beta22', 4042242),
-            array('4.4.22-beta', 4042220),
-            array('4.4.21-alpha22', 4042132),
-            array('4.4.20-alpha', 4042010),
-            array('4.40.20-alpha-dev', 4402010),
-            array('4.4a', 4000050),
-            array('4.4.4-test', 4040400),
-            array('4.1.0', 4010050),
-            array('4.0.1.3', 4000153),
-            array('4.1-dev', 4010000),
-        );
-    }
-
-    /**
-     * Tests getLatestCompatibleVersion() when there is only one server confgiured
-     *
-     * @return void
-     */
-    public function testGetLatestCompatibleVersionWithSingleServer()
-    {
-        $GLOBALS['cfg']['Servers'] = array(
-            array()
-        );
-
-        $mockVersionInfo = $this->getMockBuilder('PMA\libraries\VersionInformation')
-            ->setMethods(array('evaluateVersionCondition'))
-            ->getMock();
-
-        $mockVersionInfo->expects($this->at(0))
-            ->method('evaluateVersionCondition')
-            ->with('PHP', '>=5.3')
-            ->will($this->returnValue(true));
-
-        $mockVersionInfo->expects($this->at(1))
-            ->method('evaluateVersionCondition')
-            ->with('PHP', '<7.1')
-            ->will($this->returnValue(true));
-
-        $mockVersionInfo->expects($this->at(2))
-            ->method('evaluateVersionCondition')
-            ->with('MySQL', '>=5.5')
-            ->will($this->returnValue(true));
-
-        $compatible = $mockVersionInfo
-            ->getLatestCompatibleVersion($this->_releases);
-        $this->assertEquals('4.4.14.1', $compatible['version']);
-
-    }
-
-    /**
-     * Tests getLatestCompatibleVersion() when there are multiple servers configured
-     *
-     * @return void
-     */
-    public function testGetLaestCompatibleVersionWithMultipleServers()
-    {
-        $GLOBALS['cfg']['Servers'] = array(
-            array(),
-            array()
-        );
-
-        $mockVersionInfo = $this->getMockBuilder('PMA\libraries\VersionInformation')
-            ->setMethods(array('evaluateVersionCondition'))
-            ->getMock();
-
-        $mockVersionInfo->expects($this->at(0))
-            ->method('evaluateVersionCondition')
-            ->with('PHP', '>=5.3')
-            ->will($this->returnValue(true));
-
-        $mockVersionInfo->expects($this->at(1))
-            ->method('evaluateVersionCondition')
-            ->with('PHP', '<7.1')
-            ->will($this->returnValue(true));
-
-        $compatible = $mockVersionInfo
-            ->getLatestCompatibleVersion($this->_releases);
-        $this->assertEquals('4.4.14.1', $compatible['version']);
-    }
-
-    /**
-     * Tests getLatestCompatibleVersion() with an old PHP version
-     *
-     * @return void
-     */
-    public function testGetLaestCompatibleVersionWithOldPHPVersion()
-    {
-        $GLOBALS['cfg']['Servers'] = array(
-            array(),
-            array()
-        );
-
-        $mockVersionInfo = $this->getMockBuilder('PMA\libraries\VersionInformation')
-            ->setMethods(array('evaluateVersionCondition'))
-            ->getMock();
-
-        $mockVersionInfo->expects($this->at(0))
-            ->method('evaluateVersionCondition')
-            ->with('PHP', '>=5.3')
-            ->will($this->returnValue(false));
-
-        $mockVersionInfo->expects($this->at(1))
-            ->method('evaluateVersionCondition')
-            ->with('PHP', '>=5.3')
-            ->will($this->returnValue(false));
-
-        $mockVersionInfo->expects($this->at(2))
-            ->method('evaluateVersionCondition')
-            ->with('PHP', '>=5.2')
-            ->will($this->returnValue(true));
-
-        $mockVersionInfo->expects($this->at(3))
-            ->method('evaluateVersionCondition')
-            ->with('PHP', '<5.3')
-            ->will($this->returnValue(true));
-
-        $compatible = $mockVersionInfo
-            ->getLatestCompatibleVersion($this->_releases);
-        $this->assertEquals('4.0.10.10', $compatible['version']);
-    }
-
-    /**
-     * Tests evaluateVersionCondition() method
-     *
-     * @return void
-     */
-    public function testEvaluateVersionCondition()
-    {
-        $mockVersionInfo = $this->getMockBuilder('PMA\libraries\VersionInformation')
-            ->setMethods(array('getPHPVersion'))
-            ->getMock();
-
-        $mockVersionInfo->expects($this->any())
-            ->method('getPHPVersion')
-            ->will($this->returnValue('5.2.4'));
-
-        $this->assertTrue($mockVersionInfo->evaluateVersionCondition('PHP', '<=5.3'));
-        $this->assertTrue($mockVersionInfo->evaluateVersionCondition('PHP', '<5.3'));
-        $this->assertTrue($mockVersionInfo->evaluateVersionCondition('PHP', '>=5.2'));
-        $this->assertTrue($mockVersionInfo->evaluateVersionCondition('PHP', '>5.2'));
-        $this->assertTrue($mockVersionInfo->evaluateVersionCondition('PHP', '!=5.3'));
-
-        $this->assertFalse($mockVersionInfo->evaluateVersionCondition('PHP', '<=5.2'));
-        $this->assertFalse($mockVersionInfo->evaluateVersionCondition('PHP', '<5.2'));
-        $this->assertFalse($mockVersionInfo->evaluateVersionCondition('PHP', '>=7.0'));
-        $this->assertFalse($mockVersionInfo->evaluateVersionCondition('PHP', '>7.0'));
-        $this->assertTrue($mockVersionInfo->evaluateVersionCondition('PHP', '!=5.2'));
-    }
-}
\ No newline at end of file
diff --git a/#pma/test/classes/ZipFileTest.php b/#pma/test/classes/ZipFileTest.php
deleted file mode 100644
index 027b9508..00000000
--- a/#pma/test/classes/ZipFileTest.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-/**
- * Tests PMA\libraries\ZipFile
- *
- * @package PhpMyAdmin-test
- */
-
-use PMA\libraries\ZipFile;
-
-require_once 'test/PMATestCase.php';
-
-/**
- * Tests for PMA\libraries\ZipFile
- *
- * @package PhpMyAdmin-test
- */
-class ZipFileTest extends PMATestCase
-{
-    /**
-     * @access protected
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function setUp()
-    {
-        $this->object = new ZipFile();
-
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Test for setDoWrite
-     *
-     * @return void
-     */
-    public function testSetDoWrite()
-    {
-        $this->object->setDoWrite();
-        $this->assertTrue($this->object->doWrite);
-    }
-
-    /**
-     * Test for unix2DosTime
-     *
-     * @param int $unixTime UNIX timestamp
-     * @param int $output   DOS timestamp
-     *
-     * @dataProvider providerForTestUnix2DosTime
-     *
-     * @return void
-     */
-    public function testUnix2DosTime($unixTime, $output)
-    {
-        $this->assertEquals(
-            $this->object->unix2DosTime($unixTime),
-            $output
-        );
-    }
-
-    /**
-     * Provider for testUnix2DosTime
-     *
-     * @return array
-     */
-    public function providerForTestUnix2DosTime()
-    {
-        return array(
-            array(
-                123456,
-                2162688
-            ),
-            array(
-                234232,
-                2162688
-            ),
-        );
-    }
-
-    /**
-     * Test for addFile
-     *
-     * @return void
-     */
-    public function testAddFile()
-    {
-        $this->assertEquals(
-            $this->object->addFile('This is test content for the file', 'Test file'),
-            ''
-        );
-        $this->assertTrue(!empty($this->object->ctrl_dir));
-    }
-
-    /**
-     * Test for file
-     *
-     * @return void
-     */
-    public function testFile()
-    {
-        $file = $this->object->file();
-        $this->assertTrue(
-            !empty($file)
-        );
-    }
-}
diff --git a/#pma/test/classes/_data/gen_version_info/info.inc.php b/#pma/test/classes/_data/gen_version_info/info.inc.php
deleted file mode 100644
index 339c99ad..00000000
--- a/#pma/test/classes/_data/gen_version_info/info.inc.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Full information about theme, including $theme_generation and $theme_version
- *
- * @package PhpMyAdmin-test
- */
-$theme_name = 'Test Theme';
-$theme_generation = "2";
-$theme_version = "0.3";
diff --git a/#pma/test/classes/_data/incorrect_theme/info.inc.php b/#pma/test/classes/_data/incorrect_theme/info.inc.php
deleted file mode 100644
index db9adf85..00000000
--- a/#pma/test/classes/_data/incorrect_theme/info.inc.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Incorrect theme information file.
- * Full name is not specified
- *
- * @package PhpMyAdmin-test
- */
-
-$theme_full_version = '1.0';
diff --git a/#pma/test/classes/config/ConfigFileTest.php b/#pma/test/classes/config/ConfigFileTest.php
deleted file mode 100644
index df779433..00000000
--- a/#pma/test/classes/config/ConfigFileTest.php
+++ /dev/null
@@ -1,613 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Tests for Config File Management
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-use PMA\libraries\config\ConfigFile;
-
-require_once 'test/PMATestCase.php';
-
-/**
- * Tests for Config File Management
- *
- * @package PhpMyAdmin-test
- */
-class ConfigFileTest extends PMATestCase
-{
-    /**
-     * Any valid key that exists in config.default.php and isn't empty
-     * @var string
-     */
-    const SIMPLE_KEY_WITH_DEFAULT_VALUE = 'DefaultQueryTable';
-
-    /**
-     * Object under test
-     * @var ConfigFile
-     */
-    protected $object;
-
-    /**
-     * Setup function for test cases
-     *
-     * @access protected
-     * @return void
-     */
-    protected function setUp()
-    {
-        $GLOBALS['server'] = 1;
-        $this->object = new ConfigFile();
-    }
-
-    /**
-     * TearDown function for test cases
-     *
-     * @return void
-     */
-    protected function tearDown()
-    {
-        unset($_SESSION[$this->readAttribute($this->object, "_id")]);
-        unset($this->object);
-    }
-
-    /**
-     * Test for new ConfigFile()
-     *
-     * @return void
-     * @test
-     */
-    public function testNewObjectState()
-    {
-        // Check default dynamic values
-        $this->assertEquals(
-            "82%",
-            $this->object->getDefault('fontsize')
-        );
-
-        $this->assertEquals(
-            array(),
-            $this->object->getConfig()
-        );
-
-        // Check environment state
-        $this->assertEquals(
-            array(),
-            $_SESSION["ConfigFile1"]
-        );
-
-        // Validate default value used in tests
-        $default_value = $this->object->getDefault(
-            self::SIMPLE_KEY_WITH_DEFAULT_VALUE
-        );
-        $this->assertNotNull($default_value);
-    }
-
-    /**
-     * Test for ConfigFile::setPersistKeys()
-     *
-     * @return void
-     * @test
-     */
-    public function testPersistentKeys()
-    {
-        $default_simple_value = $this->object->getDefault(
-            self::SIMPLE_KEY_WITH_DEFAULT_VALUE
-        );
-        $default_host = $this->object->getDefault('Servers/1/host');
-        $default_config = array(
-            self::SIMPLE_KEY_WITH_DEFAULT_VALUE => $default_simple_value,
-            'Servers/1/host' => $default_host,
-            'Servers/2/host' => $default_host);
-
-        /**
-         * Case 1: set default value, key should not be persisted
-         */
-        $this->object->set(
-            self::SIMPLE_KEY_WITH_DEFAULT_VALUE, $default_simple_value
-        );
-        $this->object->set('Servers/1/host', $default_host);
-        $this->object->set('Servers/2/host', $default_host);
-        $this->assertEmpty($this->object->getConfig());
-
-        /**
-         * Case 2: persistent keys should be always present in flat array,
-         * even if not explicitly set (unless they are Server entries)
-         */
-        $this->object->setPersistKeys(array_keys($default_config));
-        $this->object->resetConfigData();
-        $this->assertEmpty($this->object->getConfig());
-        $this->assertEquals(
-            $default_config,
-            $this->object->getConfigArray()
-        );
-
-        /**
-         * Case 3: persistent keys should be always saved,
-         * even if set to default values
-         */
-        $this->object->set('Servers/2/host', $default_host);
-        $this->assertEquals(
-            array('Servers' => array(2 => array('host' => $default_host))),
-            $this->object->getConfig()
-        );
-    }
-
-    /**
-     * Test for ConfigFile::setAllowedKeys
-     *
-     * @return void
-     * @test
-     */
-    public function testAllowedKeys()
-    {
-        /**
-         * Case 1: filter should not allow to set b
-         */
-        $this->object->setAllowedKeys(array('a', 'c'));
-        $this->object->set('a', 1);
-        $this->object->set('b', 2);
-        $this->object->set('c', 3);
-
-        $this->assertEquals(
-            array('a' => 1, 'c' => 3),
-            $this->object->getConfig()
-        );
-
-        /**
-         * Case 2: disabling filter should allow to set b
-         */
-        $this->object->setAllowedKeys(null);
-        $this->object->set('b', 2);
-
-        $this->assertEquals(
-            array('a' => 1, 'b' => 2, 'c' => 3),
-            $this->object->getConfig()
-        );
-    }
-
-    /**
-     * Test for ConfigFile::setCfgUpdateReadMapping
-     *
-     * @return void
-     * @test
-     */
-    public function testConfigReadMapping()
-    {
-        $this->object->setCfgUpdateReadMapping(
-            array(
-                'Servers/value1' => 'Servers/1/value1',
-                'Servers/value2' => 'Servers/1/value2'
-            )
-        );
-        $this->object->set('Servers/1/passthrough1', 1);
-        $this->object->set('Servers/1/passthrough2', 2);
-        $this->object->updateWithGlobalConfig(array('Servers/value1' => 3));
-
-        $this->assertEquals(
-            array('Servers' => array(
-                1 => array(
-                    'passthrough1' => 1,
-                    'passthrough2' => 2,
-                    'value1' => 3))),
-            $this->object->getConfig()
-        );
-        $this->assertEquals(
-            3,
-            $this->object->get('Servers/1/value1')
-        );
-    }
-
-    /**
-     * Test for ConfigFile::resetConfigData
-     *
-     * @return void
-     * @test
-     */
-    public function testResetConfigData()
-    {
-        $this->object->set('key', 'value');
-
-        $this->object->resetConfigData();
-
-        $this->assertEmpty($this->object->getConfig());
-        $this->assertEmpty($this->object->getConfigArray());
-    }
-
-    /**
-     * Test for ConfigFile::setConfigData
-     *
-     * @return void
-     * @test
-     */
-    public function testSetConfigData()
-    {
-        $this->object->set('abc', 'should be deleted by setConfigData');
-        $this->object->setConfigData(array('a' => 'b'));
-
-        $this->assertEquals(
-            array('a' => 'b'),
-            $this->object->getConfig()
-        );
-        $this->assertEquals(
-            array('a' => 'b'),
-            $this->object->getConfigArray()
-        );
-    }
-
-    /**
-     * Test for ConfigFile::set and ConfigFile::get
-     *
-     * @return void
-     * @test
-     */
-    public function testBasicSetUsage()
-    {
-        $default_host = $this->object->getDefault('Servers/1/host');
-        $nondefault_host = $default_host . '.abc';
-
-        $this->object->set('Servers/4/host', $nondefault_host);
-        $this->object->set('Servers/5/host', $default_host);
-        $this->object->set('Servers/6/host', $default_host, 'Servers/6/host');
-        $this->assertEquals(
-            $nondefault_host,
-            $this->object->get('Servers/4/host')
-        );
-        $this->assertEquals(
-            null,
-            $this->object->get('Servers/5/host')
-        );
-        $this->assertEquals(
-            $default_host,
-            $this->object->get('Servers/6/host')
-        );
-
-        // return default value for nonexistent keys
-        $this->assertNull(
-            $this->object->get('key not excist')
-        );
-        $this->assertEquals(
-            array(1),
-            $this->object->get('key not excist', array(1))
-        );
-        $default = new stdClass();
-        $this->assertInstanceOf(
-            'stdClass',
-            $this->object->get('key not excist', $default)
-        );
-    }
-
-    /**
-     * Test for ConfigFile::set - in PMA Setup
-     *
-     * @return void
-     * @test
-     */
-    public function testConfigFileSetInSetup()
-    {
-        $default_value = $this->object->getDefault(
-            self::SIMPLE_KEY_WITH_DEFAULT_VALUE
-        );
-
-        // default values are not written
-        $this->object->set(self::SIMPLE_KEY_WITH_DEFAULT_VALUE, $default_value);
-        $this->assertEmpty($this->object->getConfig());
-    }
-
-    /**
-     * Test for ConfigFile::set - in user preferences
-     *
-     * @return void
-     * @test
-     */
-    public function testConfigFileSetInUserPreferences()
-    {
-        $default_value = $this->object->getDefault(
-            self::SIMPLE_KEY_WITH_DEFAULT_VALUE
-        );
-
-        // values are not written when they are the same as in config.inc.php
-        $this->object = new ConfigFile(
-            array(self::SIMPLE_KEY_WITH_DEFAULT_VALUE => $default_value)
-        );
-        $this->object->set(self::SIMPLE_KEY_WITH_DEFAULT_VALUE, $default_value);
-        $this->assertEmpty($this->object->getConfig());
-
-        // but if config.inc.php differs from config.default.php,
-        // allow to overwrite with value from config.default.php
-        $config_inc_php_value = $default_value . 'suffix';
-        $this->object = new ConfigFile(
-            array(self::SIMPLE_KEY_WITH_DEFAULT_VALUE => $config_inc_php_value)
-        );
-        $this->object->set(self::SIMPLE_KEY_WITH_DEFAULT_VALUE, $default_value);
-        $this->assertEquals(
-            array(self::SIMPLE_KEY_WITH_DEFAULT_VALUE => $default_value),
-            $this->object->getConfig()
-        );
-    }
-
-    /**
-     * Test for ConfigFile::getFlatDefaultConfig
-     *
-     * @return void
-     * @test
-     * @group medium
-     */
-    public function testGetFlatDefaultConfig()
-    {
-        $flat_default_config = $this->object->getFlatDefaultConfig();
-
-        $default_value = $this->object->getDefault(
-            self::SIMPLE_KEY_WITH_DEFAULT_VALUE
-        );
-        $this->assertEquals(
-            $default_value, $flat_default_config[self::SIMPLE_KEY_WITH_DEFAULT_VALUE]
-        );
-
-        $localhost_value = $this->object->getDefault('Servers/1/host');
-        $this->assertEquals(
-            $localhost_value, $flat_default_config['Servers/1/host']
-        );
-
-        $cfg = array();
-        include './libraries/config.default.php';
-        // verify that $cfg read from config.default.php is valid
-        $this->assertGreaterThanOrEqual(100, count($cfg));
-        $this->assertGreaterThanOrEqual(count($cfg), count($flat_default_config));
-    }
-
-    /**
-     * Test for ConfigFile::updateWithGlobalConfig
-     *
-     * @return void
-     * @test
-     */
-    public function testUpdateWithGlobalConfig()
-    {
-        $this->object->set('key', 'value');
-        $this->object->set('key2', 'value');
-        $this->object->updateWithGlobalConfig(array('key' => 'ABC'));
-
-        $this->assertEquals(
-            array('key' => 'ABC', 'key2' => 'value'),
-            $this->object->getConfig()
-        );
-    }
-
-    /**
-     * Test for ConfigFile::getCanonicalPath
-     *
-     * @return void
-     * @test
-     */
-    public function testGetCanonicalPath()
-    {
-        $this->assertEquals(
-            "Servers/1/abcd",
-            $this->object->getCanonicalPath("Servers/2/abcd")
-        );
-
-        $this->assertEquals(
-            "Servers/foo/bar",
-            $this->object->getCanonicalPath("Servers/foo/bar")
-        );
-    }
-
-    /**
-     * Test for ConfigFile::getDbEntry
-     *
-     * @return void
-     * @test
-     */
-    public function testGetDbEntry()
-    {
-        $cfg_db = array();
-        include './libraries/config.values.php';
-        // verify that $cfg_db read from config.values.php is valid
-        $this->assertGreaterThanOrEqual(20, count($cfg_db));
-
-        $this->assertEquals(
-            $cfg_db['Servers'][1]['port'],
-            $this->object->getDbEntry('Servers/1/port')
-        );
-        $this->assertNull($this->object->getDbEntry('no such key'));
-        $this->assertEquals(
-            array(1),
-            $this->object->getDbEntry('no such key', array(1))
-        );
-    }
-
-    /**
-     * Test for ConfigFile::getServerCount
-     *
-     * @return void
-     * @test
-     */
-    public function testGetServerCount()
-    {
-        $this->object->set('Servers/1/x', 1);
-        $this->object->set('Servers/2/x', 2);
-        $this->object->set('Servers/3/x', 3);
-        $this->object->set('Servers/4/x', 4);
-        $this->object->set('ServerDefault', 3);
-
-        $this->assertEquals(
-            4,
-            $this->object->getServerCount()
-        );
-
-        $this->object->removeServer(2);
-        $this->object->removeServer(2);
-
-        $this->assertEquals(
-            2,
-            $this->object->getServerCount()
-        );
-
-        $this->assertLessThanOrEqual(
-            2,
-            $this->object->get('ServerDefault')
-        );
-        $this->assertEquals(
-            array('Servers' => array(1 => array('x' => 1), 2 => array('x' => 4))),
-            $this->object->getConfig()
-        );
-        $this->assertEquals(
-            array('Servers/1/x' => 1, 'Servers/2/x' => 4),
-            $this->object->getConfigArray()
-        );
-    }
-
-    /**
-     * Test for ConfigFile::getServers
-     *
-     * @return void
-     * @test
-     */
-    public function testGetServers()
-    {
-        $this->object->set('Servers/1/x', 'a');
-        $this->object->set('Servers/2/x', 'b');
-
-        $this->assertEquals(
-            array(1 => array('x' => 'a'), 2 => array('x' => 'b')),
-            $this->object->getServers()
-        );
-    }
-
-    /**
-     * Test for ConfigFile::getServerDSN
-     *
-     * @return void
-     * @test
-     */
-    public function testGetServerDSN()
-    {
-        $this->assertEquals(
-            '',
-            $this->object->getServerDSN(1)
-        );
-
-        $this->object->updateWithGlobalConfig(
-            array(
-                'Servers' => array(
-                    1 => array(
-                        "auth_type" => "config",
-                        "user" => "testUser",
-                        "connect_type" => "tcp",
-                        "host" => "example.com",
-                        "port" => "21"
-                    )
-                )
-            )
-        );
-        $this->assertEquals(
-            "mysqli://testUser:***@example.com:21",
-            $this->object->getServerDSN(1)
-        );
-
-        $this->object->updateWithGlobalConfig(
-            array(
-                'Servers' => array(
-                    1 => array(
-                        "auth_type" => "config",
-                        "user" => "testUser",
-                        "connect_type" => "socket",
-                        "host" => "example.com",
-                        "port" => "21",
-                        "nopassword" => "yes",
-                        "socket" => "123"
-                    )
-                )
-            )
-        );
-        $this->assertEquals(
-            "mysqli://testUser@123",
-            $this->object->getServerDSN(1)
-        );
-
-        $this->object->updateWithGlobalConfig(
-            array(
-                'Servers' => array(
-                    1 => array(
-                        "auth_type" => "config",
-                        "user" => "testUser",
-                        "connect_type" => "tcp",
-                        "host" => "example.com",
-                        "port" => "21",
-                        "nopassword" => "yes",
-                        "password" => "testPass"
-                    )
-                )
-            )
-        );
-        $this->assertEquals(
-            "mysqli://testUser:***@example.com:21",
-            $this->object->getServerDSN(1)
-        );
-    }
-
-    /**
-     * Test for ConfigFile::getServerName
-     *
-     * @return void
-     * @test
-     */
-    public function testGetServerName()
-    {
-        $this->assertEquals(
-            '',
-            $this->object->getServerName(1)
-        );
-
-        $this->object->set('Servers/1/host', 'example.com');
-        $this->assertEquals(
-            'example.com',
-            $this->object->getServerName(1)
-        );
-
-        $this->object->set('Servers/1/verbose', 'testData');
-        $this->assertEquals(
-            'testData',
-            $this->object->getServerName(1)
-        );
-    }
-
-    /**
-     * Test for ConfigFile::getFilePath
-     *
-     * @return void
-     * @test
-     */
-    public function testGetFilePath()
-    {
-        $this->assertNotEmpty($this->object->getFilePath());
-    }
-
-    /**
-     * Test for ConfigFile::getConfigArray
-     *
-     * @return void
-     * @test
-     */
-    public function testGetConfigArray()
-    {
-        $this->object->setPersistKeys(array(self::SIMPLE_KEY_WITH_DEFAULT_VALUE));
-        $this->object->set('Array/test', array('x', 'y'));
-        $default_value = $this->object->getDefault(
-            self::SIMPLE_KEY_WITH_DEFAULT_VALUE
-        );
-
-        $this->assertEquals(
-            array(
-                self::SIMPLE_KEY_WITH_DEFAULT_VALUE => $default_value,
-                'Array/test' => array('x', 'y')
-            ),
-            $this->object->getConfigArray()
-        );
-    }
-}
diff --git a/#pma/test/classes/config/FormDisplayTest.php b/#pma/test/classes/config/FormDisplayTest.php
deleted file mode 100644
index 5d5ab9ed..00000000
--- a/#pma/test/classes/config/FormDisplayTest.php
+++ /dev/null
@@ -1,555 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for FormDisplay class in config folder
- *
- * @package PhpMyAdmin-test
- */
-
-use PMA\libraries\Config;
-use PMA\libraries\config\ConfigFile;
-use PMA\libraries\config\FormDisplay;
-use PMA\libraries\Theme;
-
-require_once 'test/PMATestCase.php';
-require_once 'libraries/config/config_functions.lib.php';
-require_once 'libraries/user_preferences.lib.php';
-
-/**
- * Tests for PMA_FormDisplay class
- *
- * @package PhpMyAdmin-test
- */
-class FormDisplayTest extends PMATestCase
-{
-    /**
-     * @var FormDisplay
-     */
-    protected $object;
-
-    /**
-     * Configures global environment.
-     *
-     * @return void
-     */
-    function setup()
-    {
-        $_SESSION['PMA_Theme'] = new Theme();
-        $GLOBALS['pmaThemePath'] = $_SESSION['PMA_Theme']->getPath();
-        $GLOBALS['pmaThemeImage'] = 'theme/';
-        $GLOBALS['PMA_Config'] = new Config();
-        $GLOBALS['PMA_Config']->enableBc();
-        $GLOBALS['server'] = 0;
-        $this->object = new FormDisplay(new ConfigFile());
-    }
-
-    /**
-     * tearDown for test cases
-     *
-     * @return void
-     */
-    protected function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Test for FormDisplay::__constructor
-     *
-     * @return void
-     * @group medium
-     */
-    public function testFormDisplayContructor()
-    {
-        $this->assertCount(
-            5,
-            $this->readAttribute($this->object, '_jsLangStrings')
-        );
-    }
-
-    /**
-     * Test for FormDisplay::registerForm
-     *
-     * @return void
-     * @group medium
-     */
-    public function testRegisterForm()
-    {
-        $reflection = new \ReflectionClass('PMA\libraries\config\FormDisplay');
-
-        $attrForms = $reflection->getProperty('_forms');
-        $attrForms->setAccessible(true);
-
-        $array = array(
-            "Servers" => array(
-                "1" => array(
-                    'test' => 1,
-                    1 => ':group:end'
-                )
-            )
-        );
-
-        $this->object->registerForm('pma_testform', $array, 2);
-        $_forms = $attrForms->getValue($this->object);
-        $this->assertInstanceOf(
-            'PMA\libraries\config\Form',
-            $_forms['pma_testform']
-        );
-
-        $this->assertEquals(
-            array(
-                "Servers/2/test" => "Servers/1/test",
-                "Servers/2/:group:end:0" => "Servers/1/:group:end:0"
-            ),
-            $this->readAttribute($this->object, '_systemPaths')
-        );
-
-        $this->assertEquals(
-            array(
-                "Servers/2/test" => "Servers-2-test",
-                "Servers/2/:group:end:0" => "Servers-2-:group:end:0"
-            ),
-            $this->readAttribute($this->object, '_translatedPaths')
-        );
-    }
-
-    /**
-     * Test for FormDisplay::process
-     *
-     * @return void
-     * @group medium
-     */
-    public function testProcess()
-    {
-        $this->assertFalse(
-            $this->object->process(true, true)
-        );
-
-        $this->object = $this->getMockBuilder('PMA\libraries\config\FormDisplay')
-            ->disableOriginalConstructor()
-            ->setMethods(array('save'))
-            ->getMock();
-
-        $attrForms = new \ReflectionProperty('PMA\libraries\config\FormDisplay', '_forms');
-        $attrForms->setAccessible(true);
-        $attrForms->setValue($this->object, array(1, 2, 3));
-
-        $this->object->expects($this->once())
-            ->method('save')
-            ->with(array(0, 1, 2), false)
-            ->will($this->returnValue(true));
-
-        $this->assertTrue(
-            $this->object->process(false, false)
-        );
-
-        $attrForms->setValue($this->object, array());
-
-        $this->assertFalse(
-            $this->object->process(false, false)
-        );
-    }
-
-    /**
-     * Test for FormDisplay::displayErrors
-     *
-     * @return void
-     */
-    public function testDisplayErrors()
-    {
-        $reflection = new \ReflectionClass('PMA\libraries\config\FormDisplay');
-
-        $attrIsValidated = $reflection->getProperty('_isValidated');
-        $attrIsValidated->setAccessible(true);
-        $attrIsValidated->setValue($this->object, true);
-
-        $attrIsValidated = $reflection->getProperty('_errors');
-        $attrIsValidated->setAccessible(true);
-        $attrIsValidated->setValue($this->object, array());
-
-        $this->assertNull(
-            $this->object->displayErrors()
-        );
-
-        $arr = array(
-            "Servers/1/test" => array('e1'),
-            "foobar" => array('e2', 'e3')
-        );
-
-        $sysArr = array(
-            "Servers/1/test" => "Servers/1/test2"
-        );
-
-        $attrSystemPaths = $reflection->getProperty('_systemPaths');
-        $attrSystemPaths->setAccessible(true);
-        $attrSystemPaths->setValue($this->object, $sysArr);
-
-        $attrIsValidated->setValue($this->object, $arr);
-
-        $GLOBALS['strConfigForm_foobar'] = 'foobar123';
-
-        $result = $this->object->displayErrors();
-
-        $this->assertEquals(
-            '<dl><dt>Servers_test2_name</dt>' .
-            '<dd>e1</dd></dl><dl><dt>foobar123</dt><dd>' .
-            'e2</dd><dd>e3</dd></dl>',
-            $result
-        );
-    }
-
-    /**
-     * Test for FormDisplay::fixErrors
-     *
-     * @return void
-     */
-    public function testFixErrors()
-    {
-        $reflection = new \ReflectionClass('PMA\libraries\config\FormDisplay');
-
-        $attrIsValidated = $reflection->getProperty('_isValidated');
-        $attrIsValidated->setAccessible(true);
-        $attrIsValidated->setValue($this->object, true);
-
-        $attrIsValidated = $reflection->getProperty('_errors');
-        $attrIsValidated->setAccessible(true);
-        $attrIsValidated->setValue($this->object, array());
-
-        $this->assertNull(
-            $this->object->fixErrors()
-        );
-
-        $arr = array(
-            "Servers/1/test" => array('e1'),
-            "Servers/2/test" => array('e2', 'e3'),
-            "Servers/3/test" => array()
-        );
-
-        $sysArr = array(
-            "Servers/1/test" => "Servers/1/connect_type"
-        );
-
-        $attrSystemPaths = $reflection->getProperty('_systemPaths');
-        $attrSystemPaths->setAccessible(true);
-        $attrSystemPaths->setValue($this->object, $sysArr);
-
-        $attrIsValidated->setValue($this->object, $arr);
-
-        $this->object->fixErrors();
-
-        $this->assertEquals(
-            array(
-                'Servers' => array(
-                    '1' => array(
-                        'test' => 'tcp'
-                    )
-                )
-            ),
-            $_SESSION['ConfigFile0']
-        );
-    }
-
-    /**
-     * Test for FormDisplay::_validateSelect
-     *
-     * @return void
-     */
-    public function testValidateSelect()
-    {
-        $attrValidateSelect = new \ReflectionMethod(
-            'PMA\libraries\config\FormDisplay',
-            '_validateSelect'
-        );
-        $attrValidateSelect->setAccessible(true);
-
-        $arr = array('foo' => 'var');
-        $value = 'foo';
-        $this->assertTrue(
-            $attrValidateSelect->invokeArgs(
-                $this->object,
-                array(&$value, $arr)
-            )
-        );
-
-        $arr = array('' => 'foobar');
-        $value = null;
-        $this->assertTrue(
-            $attrValidateSelect->invokeArgs(
-                $this->object,
-                array(&$value, $arr)
-            )
-        );
-        $this->assertEquals(
-            "string",
-            gettype($value)
-        );
-
-        $arr = array(0 => 'foobar');
-        $value = 0;
-        $this->assertTrue(
-            $attrValidateSelect->invokeArgs(
-                $this->object,
-                array(&$value, $arr)
-            )
-        );
-
-        $arr = array('1' => 'foobar');
-        $value = 0;
-        $this->assertFalse(
-            $attrValidateSelect->invokeArgs(
-                $this->object,
-                array(&$value, $arr)
-            )
-        );
-    }
-
-    /**
-     * Test for FormDisplay::hasErrors
-     *
-     * @return void
-     */
-    public function testHasErrors()
-    {
-        $attrErrors = new \ReflectionProperty('PMA\libraries\config\FormDisplay', '_errors');
-        $attrErrors->setAccessible(true);
-
-        $this->assertFalse(
-            $this->object->hasErrors()
-        );
-
-        $attrErrors->setValue(
-            $this->object,
-            array(1, 2)
-        );
-
-        $this->assertTrue(
-            $this->object->hasErrors()
-        );
-    }
-
-    /**
-     * Test for FormDisplay::getDocLink
-     *
-     * @return void
-     */
-    public function testGetDocLink()
-    {
-        $this->assertEquals(
-            "./url.php?url=https%3A%2F%2Fdocs.phpmyadmin.net%2Fen%2Flatest%2F" .
-            "config.html%23cfg_Servers_3_test_2_",
-            $this->object->getDocLink("Servers/3/test/2/")
-        );
-
-        $this->assertEquals(
-            '',
-            $this->object->getDocLink("Import")
-        );
-
-        $this->assertEquals(
-            '',
-            $this->object->getDocLink("Export")
-        );
-    }
-
-    /**
-     * Test for FormDisplay::_getOptName
-     *
-     * @return void
-     */
-    public function testGetOptName()
-    {
-        $method = new \ReflectionMethod('PMA\libraries\config\FormDisplay', '_getOptName');
-        $method->setAccessible(true);
-
-        $this->assertEquals(
-            "Servers_",
-            $method->invoke($this->object, "Servers/1/")
-        );
-
-        $this->assertEquals(
-            "Servers_23_",
-            $method->invoke($this->object, "Servers/1/23/")
-        );
-    }
-
-    /**
-     * Test for FormDisplay::_loadUserprefsInfo
-     *
-     * @return void
-     */
-    public function testLoadUserprefsInfo()
-    {
-        $method = new \ReflectionMethod('PMA\libraries\config\FormDisplay', '_loadUserprefsInfo');
-        $method->setAccessible(true);
-
-        $attrUserprefs = new \ReflectionProperty(
-            'PMA\libraries\config\FormDisplay',
-            '_userprefsDisallow'
-        );
-
-        $attrUserprefs->setAccessible(true);
-        $method->invoke($this->object, null);
-        $this->assertEquals(
-            array(),
-            $attrUserprefs->getValue($this->object)
-        );
-    }
-
-    /**
-     * Test for FormDisplay::_setComments
-     *
-     * @return void
-     */
-    public function testSetComments()
-    {
-        if (! PMA_HAS_RUNKIT) {
-            $this->markTestSkipped('Cannot redefine constant');
-        }
-
-        $method = new \ReflectionMethod('PMA\libraries\config\FormDisplay', '_setComments');
-        $method->setAccessible(true);
-
-        // recoding
-        $opts = array('values' => array());
-        $opts['values']['iconv'] = 'testIconv';
-        $opts['values']['recode'] = 'testRecode';
-
-        $expect = $opts;
-
-        $method->invokeArgs(
-            $this->object,
-            array('RecodingEngine', &$opts)
-        );
-
-        $expect['comment'] = '';
-        if (!function_exists('iconv')) {
-            $expect['values']['iconv'] .= " (unavailable)";
-            $expect['comment'] = '"iconv" requires iconv extension';
-        }
-        if (!function_exists('recode_string')) {
-            $expect['values']['recode'] .= " (unavailable)";
-            $expect['comment'] .= ($expect['comment'] ? ", " : '') .
-                '"recode" requires recode extension';
-        }
-        $expect['comment_warning'] = 1;
-
-        $this->assertEquals(
-            $expect,
-            $opts
-        );
-
-        // ZipDump, GZipDump, BZipDump
-        $method->invokeArgs(
-            $this->object,
-            array('ZipDump', &$opts)
-        );
-
-        $comment = '';
-        if (!function_exists("zip_open")) {
-            $comment = 'Compressed import will not work due to missing function ' .
-                'zip_open.';
-        }
-        if (!function_exists("gzcompress")) {
-            $comment .= ($comment ? '; ' : '') . 'Compressed export will not work ' .
-            'due to missing function gzcompress.';
-        }
-
-        $this->assertEquals(
-            $comment,
-            $opts['comment']
-        );
-
-        $this->assertTrue(
-            $opts['comment_warning']
-        );
-
-        $method->invokeArgs(
-            $this->object,
-            array('GZipDump', &$opts)
-        );
-
-        $comment = '';
-        if (!function_exists("gzopen")) {
-            $comment = 'Compressed import will not work due to missing function ' .
-                'gzopen.';
-        }
-        if (!function_exists("gzencode")) {
-            $comment .= ($comment ? '; ' : '') . 'Compressed export will not work ' .
-            'due to missing function gzencode.';
-        }
-
-        $this->assertEquals(
-            $comment,
-            $opts['comment']
-        );
-
-        $this->assertTrue(
-            $opts['comment_warning']
-        );
-
-        $method->invokeArgs(
-            $this->object,
-            array('BZipDump', &$opts)
-        );
-
-        $comment = '';
-        if (!function_exists("bzopen")) {
-            $comment = 'Compressed import will not work due to missing function ' .
-                'bzopen.';
-        }
-        if (!function_exists("bzcompress")) {
-            $comment .= ($comment ? '; ' : '') . 'Compressed export will not work ' .
-            'due to missing function bzcompress.';
-        }
-
-        $this->assertEquals(
-            $comment,
-            $opts['comment']
-        );
-
-        $this->assertTrue(
-            $opts['comment_warning']
-        );
-
-        if (defined('PMA_SETUP')) {
-            runkit_constant_remove('PMA_SETUP');
-        }
-
-        $GLOBALS['cfg']['MaxDbList'] = 10;
-        $GLOBALS['cfg']['MaxTableList'] = 10;
-        $GLOBALS['cfg']['QueryHistoryMax'] = 10;
-
-        $method->invokeArgs(
-            $this->object,
-            array('MaxDbList', &$opts)
-        );
-
-        $this->assertEquals(
-            "maximum 10",
-            $opts['comment']
-        );
-
-        $method->invokeArgs(
-            $this->object,
-            array('MaxTableList', &$opts)
-        );
-
-        $this->assertEquals(
-            "maximum 10",
-            $opts['comment']
-        );
-
-        $method->invokeArgs(
-            $this->object,
-            array('QueryHistoryMax', &$opts)
-        );
-
-        $this->assertEquals(
-            "maximum 10",
-            $opts['comment']
-        );
-
-    }
-
-
-}
diff --git a/#pma/test/classes/config/FormTest.php b/#pma/test/classes/config/FormTest.php
deleted file mode 100644
index 22b45bee..00000000
--- a/#pma/test/classes/config/FormTest.php
+++ /dev/null
@@ -1,301 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for Form class in config folder
- *
- * @package PhpMyAdmin-test
- */
-
-use PMA\libraries\Config;
-use PMA\libraries\config\ConfigFile;
-use PMA\libraries\config\Form;
-use PMA\libraries\Theme;
-
-require_once 'test/PMATestCase.php';
-
-/**
- * Tests for PMA_Form class
- *
- * @package PhpMyAdmin-test
- */
-class FormTest extends PMATestCase
-{
-    /**
-     * @var Form
-     */
-    protected $object;
-
-    /**
-     * Configures global environment.
-     *
-     * @return void
-     */
-    function setup()
-    {
-        $_SESSION['PMA_Theme'] = new Theme();
-        $GLOBALS['pmaThemePath'] = $_SESSION['PMA_Theme']->getPath();
-        $GLOBALS['pmaThemeImage'] = 'theme/';
-        $GLOBALS['PMA_Config'] = new Config();
-        $GLOBALS['PMA_Config']->enableBc();
-        $GLOBALS['server'] = 0;
-        $this->object = new Form(
-            'pma_form_name', array('pma_form1','pma_form2'), new ConfigFile(), 1
-        );
-    }
-
-    /**
-     * tearDown for test cases
-     *
-     * @return void
-     */
-    protected function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Test for Form::__constructor
-     *
-     * @return void
-     * @group medium
-     */
-    public function testContructor()
-    {
-        $this->assertEquals(
-            1,
-            $this->object->index
-        );
-        $this->assertEquals(
-            'pma_form_name',
-            $this->object->name
-        );
-        $this->assertArrayHasKey(
-            'pma_form1',
-            $this->object->fields
-        );
-    }
-
-    /**
-     * Test for Form::getOptionType
-     *
-     * @return void
-     */
-    public function testGetOptionType()
-    {
-        $attrFieldsTypes = new \ReflectionProperty('PMA\libraries\config\Form', '_fieldsTypes');
-        $attrFieldsTypes->setAccessible(true);
-        $attrFieldsTypes->setValue(
-            $this->object,
-            array("7" => "Seven")
-        );
-
-        $this->assertNull(
-            $this->object->getOptionType("123/4/5/6")
-        );
-
-        $this->assertEquals(
-            "Seven",
-            $this->object->getOptionType("123/4/5/7")
-        );
-    }
-
-    /**
-     * Test for Form::getOptionValueList
-     *
-     * @return void
-     */
-    public function testGetOptionValueList()
-    {
-        $this->assertEquals(
-            array('NHibernate C# DO', 'NHibernate XML'),
-            $this->object->getOptionValueList("Export/codegen_format")
-        );
-
-        $this->assertEquals(
-            array(
-                'auto' => 'auto',
-                '1' => 1,
-                '0' => 0
-            ),
-            $this->object->getOptionValueList("OBGzip")
-        );
-
-        $this->assertEquals(
-            array(
-                'none' => 'Nowhere',
-                'left' => 'Left',
-                'right' => 'Right',
-                'both' =>   "Both"
-            ),
-            $this->object->getOptionValueList("RowActionLinks")
-        );
-    }
-
-    /**
-     * Test for Form::_readFormPathsCallback
-     *
-     * @return void
-     */
-    public function testReadFormPathsCallBack()
-    {
-        $reflection = new \ReflectionClass('PMA\libraries\config\Form');
-        $method = $reflection->getMethod('_readFormPathsCallback');
-        $method->setAccessible(true);
-
-        $array = array(
-            "foo" => array(
-                "bar" => array(
-                    'test' => 1,
-                    1 => ':group:end'
-                )
-            )
-        );
-
-        $method->invoke($this->object, $array, 'foo', 'pref');
-
-        $result = $this->object->fields;
-
-        $this->assertCount(
-            4,
-            $result
-        );
-
-        $this->assertEquals(
-            "pma_form1",
-            $result['pma_form1']
-        );
-
-        $this->assertEquals(
-            "pma_form2",
-            $result['pma_form2']
-        );
-
-        $this->assertEquals(
-            "preffoo/foo/bar/test",
-            $result[0]
-        );
-
-        // needs regexp because the counter is static
-
-        $this->assertRegExp(
-            '/^preffoo\/foo\/bar\/\:group\:end\:\d+$/',
-            $result[1]
-        );
-    }
-
-    /**
-     * Test for Form::readFormPaths
-     *
-     * @return void
-     */
-    public function testReadFormPaths()
-    {
-        $reflection = new \ReflectionClass('PMA\libraries\config\Form');
-        $method = $reflection->getMethod('readFormPaths');
-        $method->setAccessible(true);
-
-        $array = array(
-            "foo" => array(
-                "bar" => array(
-                    'test' => 1,
-                    1 => ':group:end'
-                )
-            )
-        );
-
-        $method->invoke($this->object, $array);
-
-        $result = $this->object->fields;
-
-        $this->assertCount(
-            2,
-            $result
-        );
-
-        $this->assertEquals(
-            "foo/bar/test",
-            $result['test']
-        );
-
-        unset($result['test']);
-
-        // needs regexp because the counter is static
-
-        $keys = array_keys($result);
-        $key = $keys[0];
-
-        $this->assertRegexp(
-            "/^\:group\:end\:(\d+)$/",
-            $key
-        );
-
-        preg_match("/^\:group\:end\:(\d+)$/", $key, $matches);
-        $digit = $matches[1];
-
-        $this->assertEquals(
-            "foo/bar/:group:end:" . $digit,
-            $result[':group:end:' . $digit]
-        );
-    }
-
-    /**
-     * Test for Form::readTypes
-     *
-     * @return void
-     */
-    public function testReadTypes()
-    {
-        $reflection = new \ReflectionClass('PMA\libraries\config\Form');
-        $method = $reflection->getMethod('readTypes');
-        $method->setAccessible(true);
-
-        $this->object->fields = array(
-            "pma_form1" => "Servers/1/port",
-            "pma_form2" => "Servers/1/connect_type",
-            ":group:end:0" => "preffoo/foo/bar/test",
-            "1" => "preffoo/foo/bar/:group:end:0"
-        );
-
-        $attrFieldsTypes = $reflection->getProperty('_fieldsTypes');
-        $attrFieldsTypes->setAccessible(true);
-
-        $method->invoke($this->object, null);
-
-        $this->assertEquals(
-            array(
-                "pma_form1" => "integer",
-                "pma_form2" => "select",
-                ":group:end:0" => "group",
-                "1" => "NULL"
-            ),
-            $attrFieldsTypes->getValue($this->object)
-        );
-    }
-
-    /**
-     * Test for Form::loadForm
-     *
-     * @return void
-     */
-    public function testLoadForm()
-    {
-        $this->object = $this->getMockBuilder('PMA\libraries\config\Form')
-            ->disableOriginalConstructor()
-            ->setMethods(array('readFormPaths', 'readTypes'))
-            ->getMock();
-
-        $this->object->expects($this->exactly(1))
-            ->method('readFormPaths')
-            ->with('testForm');
-
-        $this->object->expects($this->exactly(1))
-            ->method('readTypes');
-
-        $this->object->loadForm('pmaform', 'testForm');
-
-        $this->assertEquals(
-            'pmaform',
-            $this->object->name
-        );
-    }
-}
diff --git a/#pma/test/classes/config/PageSettingsTest.php b/#pma/test/classes/config/PageSettingsTest.php
deleted file mode 100644
index 28f1ba51..00000000
--- a/#pma/test/classes/config/PageSettingsTest.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Tests for Page-related settings
- *
- * @package PhpMyAdmin-test
- */
-use PMA\libraries\config\PageSettings;
-
-require_once 'test/PMATestCase.php';
-require_once 'libraries/config/user_preferences.forms.php';
-require_once 'libraries/config/page_settings.forms.php';
-
-/**
- * Tests for PMA\libraries\config\PageSettings
- *
- * @package PhpMyAdmin-test
- */
-class PageSettingsTest extends PMATestCase
-{
-    /**
-     * Setup tests
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        $GLOBALS['server'] = 1;
-        $GLOBALS['db'] = 'db';
-    }
-
-    /**
-     * Test showGroup when group passed does not exist
-     *
-     * @return void
-     */
-    public function testShowGroupNonExistent()
-    {
-        $object = PageSettings::showGroup('NonExistent');
-
-        $this->assertEquals('', $object->getHTML());
-    }
-
-    /**
-     * Test showGroup with a known group name
-     *
-     * @return void
-     */
-    public function testShowGroupBrowse()
-    {
-        $object = PageSettings::showGroup('Browse');
-
-        $html = $object->getHTML();
-
-        // Test some sample parts
-        $this->assertContains(
-            '<div id="page_settings_modal">'
-            . '<div class="page_settings">'
-            . '<form method="post" '
-            . 'action="phpunit?db=db&amp;table=&amp;server=1&amp;target=&amp;lang=en&amp;token=token" '
-            . 'class="config-form disableAjax">',
-            $html
-        );
-
-        $this->assertContains(
-            '<input type="hidden" name="submit_save" value="Browse" />',
-            $html
-        );
-
-        $this->assertContains(
-            "validateField('MaxRows', 'PMA_validatePositiveNumber', true);\n"
-            . "validateField('RepeatCells', 'PMA_validateNonNegativeNumber', true);\n"
-            . "validateField('LimitChars', 'PMA_validatePositiveNumber', true);\n",
-            $html
-        );
-    }
-
-    /**
-     * Test getNaviSettings
-     *
-     * @return void
-     */
-    function testGetNaviSettings()
-    {
-        $html = PageSettings::getNaviSettings();
-
-        // Test some sample parts
-        $this->assertContains(
-            '<div id="pma_navigation_settings">',
-            $html
-        );
-
-        $this->assertContains(
-            '<input type="hidden" name="submit_save" value="Navi_panel" />',
-            $html
-        );
-    }
-}
diff --git a/#pma/test/classes/controllers/DatabaseStructureControllerTest.php b/#pma/test/classes/controllers/DatabaseStructureControllerTest.php
deleted file mode 100644
index b0aa80b1..00000000
--- a/#pma/test/classes/controllers/DatabaseStructureControllerTest.php
+++ /dev/null
@@ -1,416 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * DatabaseStructureController_Test class
- *
- * this class is for testing DatabaseStructureController class
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-use PMA\libraries\controllers\database\DatabaseStructureController;
-use PMA\libraries\di\Container;
-use PMA\libraries\Table;
-use PMA\libraries\Theme;
-
-require_once 'test/PMATestCase.php';
-require_once 'libraries/database_interface.inc.php';
-require_once 'test/libraries/stubs/ResponseStub.php';
-
-/**
- * DatabaseStructureController_Test class
- *
- * this class is for testing DatabaseStructureController class
- *
- * @package PhpMyAdmin-test
- */
-class DatabaseStructureControllerTest extends PMATestCase
-{
-    /**
-     * @var \PMA\Test\Stubs\Response
-     */
-    private $_response;
-
-    /**
-     * Prepares environment for the test.
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        //$_REQUEST
-        $_REQUEST['log'] = "index1";
-        $_REQUEST['pos'] = 3;
-
-        //$GLOBALS
-        $GLOBALS['server'] = 1;
-        $GLOBALS['cfg']['Server']['DisableIS'] = false;
-
-        $GLOBALS['table'] = "table";
-        $GLOBALS['pmaThemeImage'] = 'image';
-
-        //$_SESSION
-        $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
-        $_SESSION['PMA_Theme'] = new Theme();
-
-        if (!defined('PMA_USR_BROWSER_AGENT')) {
-            define('PMA_USR_BROWSER_AGENT', 'Other');
-        }
-
-        $table = $this->getMockBuilder('PMA\libraries\Table')
-            ->disableOriginalConstructor()
-            ->getMock();
-        // Expect the table will have 6 rows
-        $table->expects($this->any())->method('getRealRowCountTable')
-            ->will($this->returnValue(6));
-        $table->expects($this->any())->method('countRecords')
-            ->will($this->returnValue(6));
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $dbi->expects($this->any())->method('getTable')
-            ->will($this->returnValue($table));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $container = Container::getDefaultContainer();
-        $container->set('db', 'db');
-        $container->set('table', 'table');
-        $container->set('dbi', $GLOBALS['dbi']);
-        $this->_response = new \PMA\Test\Stubs\Response();
-        $container->set('PMA\libraries\Response', $this->_response);
-        $container->alias('response', 'PMA\libraries\Response');
-    }
-
-    /**
-     * Tests for getValuesForInnodbTable()
-     *
-     * @return void
-     * @test
-     */
-    public function testGetValuesForInnodbTable()
-    {
-        $container = Container::getDefaultContainer();
-        $container->set('db', 'db');
-        $container->set('table', 'table');
-        $container->set('dbi', $GLOBALS['dbi']);
-        $response = new \PMA\Test\Stubs\Response();
-        $container->set('PMA\libraries\Response', $response);
-        $container->alias('response', 'PMA\libraries\Response');
-
-        $class = new ReflectionClass('PMA\libraries\controllers\database\DatabaseStructureController');
-        $method = $class->getMethod('getValuesForInnodbTable');
-        $method->setAccessible(true);
-        $ctrl = new DatabaseStructureController(
-            $GLOBALS['db'], null
-        );
-        // Showing statistics
-        $property = $class->getProperty('_is_show_stats');
-        $property->setAccessible(true);
-        $property->setValue($ctrl, true);
-
-        $GLOBALS['cfg']['MaxExactCount'] = 10;
-        $current_table = array(
-            'ENGINE' => 'InnoDB',
-            'TABLE_ROWS' => 5,
-            'Data_length' => 16384,
-            'Index_length' => 0,
-            'TABLE_NAME' => 'table'
-        );
-        list($current_table,,, $sum_size)
-            = $method->invokeArgs($ctrl, array($current_table, 10));
-
-        $this->assertEquals(
-            true,
-            $current_table['COUNTED']
-        );
-        $this->assertEquals(
-            6,
-            $current_table['TABLE_ROWS']
-        );
-        $this->assertEquals(
-            16394,
-            $sum_size
-        );
-
-        $current_table['ENGINE'] = 'MYISAM';
-        list($current_table,,, $sum_size)
-            = $method->invokeArgs($ctrl, array($current_table, 10));
-
-        $this->assertEquals(
-            false,
-            $current_table['COUNTED']
-        );
-        $this->assertEquals(
-            16394,
-            $sum_size
-        );
-        // Not showing statistics
-        $is_show_stats = false;
-        $ctrl = new DatabaseStructureController(
-            $GLOBALS['db'], null
-        );
-
-        $current_table['ENGINE'] = 'InnoDB';
-        list($current_table,,, $sum_size)
-            = $method->invokeArgs($ctrl, array($current_table, 10));
-        $this->assertEquals(
-            true,
-            $current_table['COUNTED']
-        );
-        $this->assertEquals(
-            10,
-            $sum_size
-        );
-
-        $current_table['ENGINE'] = 'MYISAM';
-        list($current_table,,, $sum_size)
-            = $method->invokeArgs($ctrl, array($current_table, 10));
-        $this->assertEquals(
-            false,
-            $current_table['COUNTED']
-        );
-        $this->assertEquals(
-            10,
-            $sum_size
-        );
-    }
-
-    /**
-     * Tests for the getValuesForAriaTable()
-     *
-     * @return void
-     * @test
-     */
-    public function testGetValuesForAriaTable()
-    {
-        $class = new ReflectionClass('PMA\libraries\controllers\database\DatabaseStructureController');
-        $method = $class->getMethod('getValuesForAriaTable');
-        $method->setAccessible(true);
-
-        $ctrl = new DatabaseStructureController(
-            $GLOBALS['db'], null
-        );
-        // Showing statistics
-        $property = $class->getProperty('_is_show_stats');
-        $property->setAccessible(true);
-        $property->setValue($ctrl, true);
-        $property = $class->getProperty('_db_is_system_schema');
-        $property->setAccessible(true);
-        $property->setValue($ctrl, true);
-
-        $current_table = array(
-            'Data_length'  => 16384,
-            'Index_length' => 0,
-            'Name'         => 'table',
-            'Data_free'    => 300,
-        );
-        list($current_table,,,,, $overhead_size, $sum_size)
-            = $method->invokeArgs($ctrl, array($current_table, 0, 0, 0, 0, 0, 0,));
-        $this->assertEquals(
-            6,
-            $current_table['Rows']
-        );
-        $this->assertEquals(
-            16384,
-            $sum_size
-        );
-        $this->assertEquals(
-            300,
-            $overhead_size
-        );
-
-        unset($current_table['Data_free']);
-        list($current_table,,,,, $overhead_size,)
-            = $method->invokeArgs($ctrl, array($current_table, 0, 0, 0, 0, 0, 0,));
-        $this->assertEquals(0, $overhead_size);
-
-        $is_show_stats = false;
-        $ctrl = new DatabaseStructureController(
-            $GLOBALS['db'], null
-        );
-        list($current_table,,,,,, $sum_size)
-            = $method->invokeArgs($ctrl, array($current_table, 0, 0, 0, 0, 0, 0));
-        $this->assertEquals(0, $sum_size);
-
-        $db_is_system_schema = false;
-        $ctrl = new DatabaseStructureController(
-            $GLOBALS['db'], null
-        );
-        list($current_table,,,,,,)
-            = $method->invokeArgs($ctrl, array($current_table, 0, 0, 0, 0, 0, 0,));
-        $this->assertArrayNotHasKey('Row', $current_table);
-    }
-
-    /**
-     * Tests for hasTable()
-     *
-     * @return void
-     * @test
-     */
-    public function testHasTable()
-    {
-        $class = new ReflectionClass('PMA\libraries\controllers\database\DatabaseStructureController');
-        $method = $class->getMethod('hasTable');
-        $method->setAccessible(true);
-
-        $ctrl = new DatabaseStructureController(
-            $GLOBALS['db'], null
-        );
-
-        // When parameter $db is empty
-        $this->assertEquals(
-            false,
-            $method->invokeArgs($ctrl, array(array(), 'table'))
-        );
-
-        // Correct parameter
-        $tables = array(
-            'db.table'
-        );
-        $this->assertEquals(
-            true,
-            $method->invokeArgs($ctrl, array($tables, 'table'))
-        );
-
-        // Table not in database
-        $tables = array(
-            'db.tab1e'
-        );
-        $this->assertEquals(
-            false,
-            $method->invokeArgs($ctrl, array($tables, 'table'))
-        );
-    }
-
-    /**
-     * Tests for checkFavoriteTable()
-     *
-     * @return void
-     * @test
-     */
-    public function testCheckFavoriteTable()
-    {
-        $class = new ReflectionClass('PMA\libraries\controllers\database\DatabaseStructureController');
-        $method = $class->getMethod('checkFavoriteTable');
-        $method->setAccessible(true);
-
-        $ctrl = new DatabaseStructureController(
-            $GLOBALS['db'], null
-        );
-
-        $_SESSION['tmpval']['favorite_tables'][$GLOBALS['server']] = array(
-            array('db' => 'db', 'table' => 'table')
-        );
-
-        $this->assertEquals(
-            false,
-            $method->invokeArgs($ctrl, array(''))
-        );
-
-        $this->assertEquals(
-            true,
-            $method->invokeArgs($ctrl, array('table'))
-        );
-    }
-
-    /**
-     * Tests for synchronizeFavoriteTables()
-     *
-     * @return void
-     * @test
-     */
-    public function testSynchronizeFavoriteTables()
-    {
-        $fav_instance = $this->getMockBuilder('PMA\libraries\RecentFavoriteTable')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $fav_instance->expects($this->at(1))->method('getTables')
-            ->will($this->returnValue(array()));
-        $fav_instance->expects($this->at(2))
-            ->method('getTables')
-            ->will(
-                $this->returnValue(
-                    array(
-                        array('db' => 'db', 'table' => 'table'),
-                    )
-                )
-            );
-
-        $class = new ReflectionClass('PMA\libraries\controllers\database\DatabaseStructureController');
-        $method = $class->getMethod('synchronizeFavoriteTables');
-        $method->setAccessible(true);
-
-        $ctrl = new DatabaseStructureController(
-            $GLOBALS['db'], null
-        );
-
-        // The user hash for test
-        $user = 'abcdefg';
-        $favorite_table = array(
-            $user => array(
-                array('db' => 'db', 'table' => 'table')
-            ),
-        );
-
-        $method->invokeArgs($ctrl, array($fav_instance, $user, $favorite_table));
-        $json = $this->_response->getJSONResult();
-
-        $this->assertEquals(json_encode($favorite_table), $json['favorite_tables']);
-        $this->assertArrayHasKey('list', $json);
-    }
-
-    /**
-     * Tests for handleRealRowCountRequestAction()
-     *
-     * @return void
-     * @test
-     */
-    public function testHandleRealRowCountRequestAction()
-    {
-        $_REQUEST['table'] = 'table';
-
-        $ctrl = new DatabaseStructureController(
-            $GLOBALS['db'], null
-        );
-        // Showing statistics
-        $class = new ReflectionClass('PMA\libraries\controllers\database\DatabaseStructureController');
-        $property = $class->getProperty('_tables');
-        $property->setAccessible(true);
-
-        $ctrl->handleRealRowCountRequestAction();
-        $json = $this->_response->getJSONResult();
-        $this->assertEquals(
-            6,
-            $json['real_row_count']
-        );
-
-        // Fall into another branch
-        $_REQUEST['real_row_count_all'] = 'abc';
-        $property->setValue(
-            $ctrl,
-            array(
-                array(
-                    'TABLE_NAME' => 'table'
-                )
-            )
-        );
-        $ctrl->handleRealRowCountRequestAction();
-        $json = $this->_response->getJSONResult();
-
-        $expected_result = array(
-            array(
-                'table' => 'table',
-                'row_count' => 6
-            )
-        );
-        $this->assertEquals(
-            json_encode($expected_result),
-            $json['real_row_count_all']
-        );
-    }
-}
diff --git a/#pma/test/classes/controllers/ServerBinlogControllerTest.php b/#pma/test/classes/controllers/ServerBinlogControllerTest.php
deleted file mode 100644
index 58b2b8f3..00000000
--- a/#pma/test/classes/controllers/ServerBinlogControllerTest.php
+++ /dev/null
@@ -1,284 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Holds ServerBinlogControllerTest
- *
- * @package PhpMyAdmin-test
- */
-
-use PMA\libraries\Theme;
-use PMA\libraries\controllers\server\ServerBinlogController;
-use PMA\libraries\di\Container;
-use PMA\libraries\Util;
-
-require_once 'test/PMATestCase.php';
-require_once 'libraries/url_generating.lib.php';
-require_once 'libraries/database_interface.inc.php';
-require_once 'libraries/sanitizing.lib.php';
-require_once 'libraries/js_escape.lib.php';
-
-/**
- * Tests for ServerCollationsController class
- *
- * @package PhpMyAdmin-test
- */
-class ServerBinlogControllerTest extends PMATestCase
-{
-    /**
-     * Prepares environment for the test.
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        //$_REQUEST
-        $_REQUEST['log'] = "index1";
-        $_REQUEST['pos'] = 3;
-
-        //$GLOBALS
-        $GLOBALS['cfg']['MaxRows'] = 10;
-        $GLOBALS['server'] = 1;
-        $GLOBALS['cfg']['ServerDefault'] = "server";
-        $GLOBALS['cfg']['RememberSorting'] = true;
-        $GLOBALS['cfg']['SQP'] = array();
-        $GLOBALS['cfg']['MaxCharactersInDisplayedSQL'] = 1000;
-        $GLOBALS['cfg']['ShowSQL'] = true;
-        $GLOBALS['cfg']['TableNavigationLinksMode'] = 'icons';
-        $GLOBALS['cfg']['LimitChars'] = 100;
-
-        $GLOBALS['table'] = "table";
-        $GLOBALS['pmaThemeImage'] = 'image';
-
-        //$_SESSION
-        $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
-        $_SESSION['PMA_Theme'] = new Theme();
-
-        Util::cacheSet('profiling_supported', true);
-
-        $binary_log_file_names = array();
-        $binary_log_file_names[] = array("Log_name"=>"index1", "File_size"=>100);
-        $binary_log_file_names[] = array("Log_name"=>"index2", "File_size"=>200);
-
-        //Mock DBI
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $dbi->expects($this->once())->method('fetchResult')
-            ->will($this->returnValue($binary_log_file_names));
-        $container = Container::getDefaultContainer();
-        $container->set('dbi', $dbi);
-    }
-
-    /**
-     * Tests for _getLogSelector
-     *
-     * @return void
-     */
-    public function testGetLogSelector()
-    {
-        $url_params = array();
-        $url_params['log'] = "log";
-        $url_params['dontlimitchars'] = 1;
-
-        $class = new ReflectionClass('\PMA\libraries\controllers\server\ServerBinlogController');
-        $method = $class->getMethod('_getLogSelector');
-        $method->setAccessible(true);
-
-        $ctrl = new ServerBinlogController();
-        $html = $method->invoke(
-            $ctrl,
-            $url_params
-        );
-
-        $this->assertContains(
-            'Select binary log to view',
-            $html
-        );
-        $this->assertContains(
-            '<option value="index1" selected="selected">',
-            $html
-        );
-        $this->assertContains(
-            '<option value="index2">',
-            $html
-        );
-    }
-
-    /**
-     * Tests for _getLogInfo
-     *
-     * @return void
-     * @group medium
-     */
-    public function testGetLogInfo()
-    {
-    	$class = new ReflectionClass('\PMA\libraries\controllers\server\ServerBinlogController');
-    	$method = $class->getMethod('_getLogInfo');
-    	$method->setAccessible(true);
-    	$ctrl = new ServerBinlogController();
-
-        //Mock DBI
-    	$container = Container::getDefaultContainer();
-        $dbi = $container->get('dbi');
-
-        //expects return value
-        $result = array(
-            array(
-                "SHOW BINLOG EVENTS IN 'index1' LIMIT 3, 10",
-                null,
-                1,
-                true,
-                array("log1"=>"logd")
-            ),
-            array(
-                array("log2"=>"logb"),
-                null,
-                0,
-                false,
-                'executed'
-            )
-        );
-        $value = array(
-                'Info' => "index1_Info",
-                'Log_name' => "index1_Log_name",
-                'Pos' => "index1_Pos",
-                'Event_type' => "index1_Event_type",
-                'End_log_pos' => "index1_End_log_pos",
-                'Server_id' => "index1_Server_id",
-        );
-        $count = 3;
-
-        //expects functions
-        $dbi->expects($this->once())->method('query')
-            ->will($this->returnValue($result));
-
-        $dbi->expects($this->once())->method('numRows')
-            ->will($this->returnValue($count));
-
-        $dbi->expects($this->at(0))->method('fetchAssoc')
-            ->will($this->returnValue($value));
-
-        $dbi->expects($this->at(1))->method('fetchAssoc')
-            ->will($this->returnValue(false));
-
-        $container->set('dbi', $dbi);
-
-        //Call the test function
-        $url_params = array();
-        $url_params['log'] = "log";
-        $url_params['dontlimitchars'] = 1;
-        $html = $method->invoke($ctrl, $url_params);
-
-        //validate 1: the sql has been executed
-        $this->assertContains(
-            'Your SQL query has been executed successfully',
-            $html
-        );
-        //validate 2: SQL
-        $this->assertContains(
-            "SHOW BINLOG EVENTS IN 'index1' LIMIT 3, 10",
-            $html
-        );
-        //validate 3: BINLOG HTML
-        $this->assertContains(
-            '<table id="binlogTable">',
-            $html
-        );
-        //validate 4: PMA_getNavigationRow is right
-        $urlNavigation = 'server_binlog.php?log=log&amp;dontlimitchars=1&amp;'
-            . 'pos=3&amp;server=1&amp';
-        $this->assertContains(
-            $urlNavigation,
-            $html
-        );
-        $this->assertContains(
-            'title="Previous"',
-            $html
-        );
-        //validate 5: Log Item
-        $this->assertContains(
-            'Log name',
-            $html
-        );
-        $this->assertContains(
-            'Position',
-            $html
-        );
-        $this->assertContains(
-            'Event type',
-            $html
-        );
-        $this->assertContains(
-            'Server ID',
-            $html
-        );
-        $this->assertContains(
-            'Original position',
-            $html
-        );
-    }
-
-    /**
-     * Tests for _getAllLogItemInfo
-     *
-     * @return void
-     */
-    public function testGetAllLogItemInfo()
-    {
-    	$class = new ReflectionClass('\PMA\libraries\controllers\server\ServerBinlogController');
-    	$method = $class->getMethod('_getAllLogItemInfo');
-    	$method->setAccessible(true);
-    	$ctrl = new ServerBinlogController();
-
-        //Mock DBI
-    	$container = Container::getDefaultContainer();
-        $dbi = $container->get('dbi');
-
-        $fetchAssoc = array(
-            'Info' => 'Info',
-            'Log_name' => 'Log_name',
-            'Pos' => 'Pos',
-            'Event_type' => 'Event_type',
-            'Server_id' => 'Server_id',
-            'Orig_log_pos' => 'Orig_log_pos',
-            'End_log_pos' => 'End_log_pos',
-        );
-        $dbi->expects($this->at(0))->method('fetchAssoc')
-            ->will($this->returnValue($fetchAssoc));
-        $dbi->expects($this->at(1))->method('fetchAssoc')
-            ->will($this->returnValue(false));
-        $container->set('dbi', $dbi);
-
-        $GLOBALS['cfg']['LimitChars'] = 2;
-
-        $result = array();
-        $dontlimitchars = ";";
-        $html = $method->invoke($ctrl, $result, $dontlimitchars);
-
-        $value = $fetchAssoc;
-        $this->assertContains(
-            $value['Log_name'],
-            $html
-        );
-        $this->assertContains(
-            $value['Pos'],
-            $html
-        );
-        $this->assertContains(
-            $value['Event_type'],
-            $html
-        );
-        $this->assertContains(
-            $value['Server_id'],
-            $html
-        );
-        $this->assertContains(
-            $value['Orig_log_pos'],
-            $html
-        );
-        $this->assertContains(
-            htmlspecialchars($value['Info']),
-            $html
-        );
-    }
-}
diff --git a/#pma/test/classes/controllers/ServerCollationsControllerTest.php b/#pma/test/classes/controllers/ServerCollationsControllerTest.php
deleted file mode 100644
index fbad04e6..00000000
--- a/#pma/test/classes/controllers/ServerCollationsControllerTest.php
+++ /dev/null
@@ -1,151 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Holds ServerCollationsControllerTest class
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-//$GLOBALS
-use PMA\libraries\Theme;
-use PMA\libraries\controllers\server\ServerCollationsController;
-
-$GLOBALS['server'] = 1;
-$GLOBALS['is_superuser'] = false;
-$GLOBALS['cfg']['ServerDefault'] = 1;
-$GLOBALS['url_query'] = "url_query";
-$GLOBALS['PMA_PHP_SELF'] = PMA_getenv('PHP_SELF');
-$GLOBALS['lang'] = "en";
-$GLOBALS['text_dir'] = "text_dir";
-$GLOBALS['cfg']['Server'] = array(
-    'DisableIS' => false
-);
-//$_SESSION
-
-$_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
-
-
-require_once 'libraries/url_generating.lib.php';
-
-
-require_once 'libraries/sanitizing.lib.php';
-require_once 'libraries/js_escape.lib.php';
-require_once 'libraries/database_interface.inc.php';
-require_once 'libraries/server_common.inc.php';
-require_once 'libraries/mysql_charsets.inc.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * Tests for ServerCollationsController class
- *
- * @package PhpMyAdmin-test
- */
-class ServerCollationsControllerTest extends PMATestCase
-{
-    /**
-     * Prepares environment for the test.
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        //$_REQUEST
-        $_REQUEST['log'] = "index1";
-        $_REQUEST['pos'] = 3;
-
-        //$GLOBALS
-        $GLOBALS['is_ajax_request'] = true;
-        $GLOBALS['table'] = "table";
-        $GLOBALS['pmaThemeImage'] = 'image';
-    }
-
-    /**
-     * Test for PMA_getHtmlForCharsets
-     *
-     * @return void
-     */
-    public function testPMAGetHtmlForCharsets()
-    {
-        $mysql_charsets = array("armscii8", "ascii", "big5", "binary");
-        $mysql_collations = array(
-            "armscii8" => array("armscii8"),
-            "ascii" => array("ascii"),
-            "big5" => array("big5"),
-            "binary" => array("binary"),
-        );
-        $mysql_charsets_descriptions = array(
-            "armscii8" => "PMA_armscii8_general_ci",
-            "ascii" => "PMA_ascii_general_ci",
-            "big5" => "PMA_big5_general_ci",
-            "binary" => "PMA_binary_general_ci",
-        );
-        $mysql_default_collations = array(
-            "armscii8" => "armscii8",
-            "ascii" => "ascii",
-            "big5" => "big5",
-            "binary" => "binary",
-        );
-        $mysql_collations_available = array(
-            "armscii8" => true,
-            "ascii" => true,
-            "big5" => true,
-            "binary" => true,
-        );
-
-        $class = new ReflectionClass('\PMA\libraries\controllers\server\ServerCollationsController');
-        $method = $class->getMethod('_getHtmlForCharsets');
-        $method->setAccessible(true);
-
-        $ctrl = new ServerCollationsController();
-        $html = $method->invoke(
-            $ctrl,
-            $mysql_charsets,
-            $mysql_collations,
-            $mysql_charsets_descriptions,
-            $mysql_default_collations,
-            $mysql_collations_available
-        );
-
-        //validate 1: Charset HTML
-        $this->assertContains(
-            '<div id="div_mysql_charset_collations">',
-            $html
-        );
-        $this->assertContains(
-            __('Collation'),
-            $html
-        );
-        $this->assertContains(
-            __('Description'),
-            $html
-        );
-        //validate 2: Charset Item
-        $this->assertContains(
-            '<i>PMA_armscii8_general_ci</i>',
-            $html
-        );
-        $this->assertContains(
-            '<td>armscii8</td>',
-            $html
-        );
-        $this->assertContains(
-            '<i>PMA_ascii_general_ci</i>',
-            $html
-        );
-        $this->assertContains(
-            '<td>ascii</td>',
-            $html
-        );
-        $this->assertContains(
-            '<i>PMA_big5_general_ci</i>',
-            $html
-        );
-        $this->assertContains(
-            '<td>big5</td>',
-            $html
-        );
-    }
-}
diff --git a/#pma/test/classes/controllers/ServerDatabasesControllerTest.php b/#pma/test/classes/controllers/ServerDatabasesControllerTest.php
deleted file mode 100644
index 3c7984a3..00000000
--- a/#pma/test/classes/controllers/ServerDatabasesControllerTest.php
+++ /dev/null
@@ -1,324 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Holds ServerDatabasesControllerTest class
- *
- * @package PhpMyAdmin-test
- */
-
-use PMA\libraries\di\Container;
-use PMA\libraries\Theme;
-
-require_once 'libraries/url_generating.lib.php';
-require_once 'libraries/mysql_charsets.lib.php';
-
-require_once 'libraries/database_interface.inc.php';
-
-require_once 'libraries/sanitizing.lib.php';
-require_once 'libraries/js_escape.lib.php';
-
-require_once 'test/libraries/stubs/ResponseStub.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * Tests for ServerDatabasesController class
- *
- * @package PhpMyAdmin-test
- */
-
-class ServerDatabasesControllerTest extends PMATestCase
-{
-    /**
-     * Prepares environment for the test.
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        //$_REQUEST
-        $_REQUEST['log'] = "index1";
-        $_REQUEST['pos'] = 3;
-
-        //$GLOBALS
-        $GLOBALS['PMA_Config'] = new PMA\libraries\Config();
-        $GLOBALS['PMA_Config']->enableBc();
-        $GLOBALS['is_superuser'] = true;
-
-        $GLOBALS['table'] = "table";
-        $GLOBALS['replication_info']['master']['status'] = false;
-        $GLOBALS['replication_info']['slave']['status'] = false;
-        $GLOBALS['pmaThemeImage'] = 'image';
-        $GLOBALS['text_dir'] = "text_dir";
-
-        //$_SESSION
-        $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
-        $_SESSION['PMA_Theme'] = new Theme();
-        $GLOBALS['server'] = 1;
-
-        $container = Container::getDefaultContainer();
-        $container->set('dbi', $GLOBALS['dbi']);
-        $this->response = new \PMA\Test\Stubs\Response();
-        $container->set('PMA\libraries\Response', $this->response);
-        $container->alias('response', 'PMA\libraries\Response');
-    }
-
-    /**
-     * Tests for _getHtmlForDatabases
-     *
-     * @return void
-     * @group medium
-     */
-    public function testGetHtmlForDatabase()
-    {
-        $class = new ReflectionClass('\PMA\libraries\controllers\server\ServerDatabasesController');
-        $method = $class->getMethod('_getHtmlForDatabases');
-        $method->setAccessible(true);
-
-        $container = Container::getDefaultContainer();
-        $container->factory('PMA\libraries\controllers\server\ServerDatabasesController');
-        $container->alias(
-            'ServerDatabasesController', 'PMA\libraries\controllers\server\ServerDatabasesController'
-        );
-        $ctrl = $container->get('ServerDatabasesController');
-
-        //Call the test function
-        $databases = array(
-            array("SCHEMA_NAME" => "pma_bookmark"),
-            array("SCHEMA_NAME" => "information_schema"),
-            array("SCHEMA_NAME" => "mysql"),
-            array("SCHEMA_NAME" => "performance_schema"),
-            array("SCHEMA_NAME" => "phpmyadmin")
-        );
-        $property = $class->getProperty('_databases');
-        $property->setAccessible(true);
-        $property->setValue($ctrl, $databases);
-
-        $property = $class->getProperty('_database_count');
-        $property->setAccessible(true);
-        $property->setValue($ctrl, 5);
-
-        $property = $class->getProperty('_pos');
-        $property->setAccessible(true);
-        $property->setValue($ctrl, 0);
-
-        $property = $class->getProperty('_dbstats');
-        $property->setAccessible(true);
-        $property->setValue($ctrl, 0);
-
-        $property = $class->getProperty('_sort_by');
-        $property->setAccessible(true);
-        $property->setValue($ctrl, 'SCHEMA_NAME');
-
-        $property = $class->getProperty('_sort_order');
-        $property->setAccessible(true);
-        $property->setValue($ctrl, 'asc');
-
-        $replication_types = array("master", "slave");
-
-        $html = $method->invoke($ctrl, $replication_types);
-
-        //validate 1: General info
-        $this->assertContains(
-            '<div id="tableslistcontainer">',
-            $html
-        );
-
-        //validate 2:ajax Form
-        $this->assertContains(
-            '<form class="ajax" action="server_databases.php" ',
-            $html
-        );
-
-        $this->assertContains(
-            '<table id="tabledatabases" class="data">',
-            $html
-        );
-
-        //validate 3: PMA_getHtmlForColumnOrderWithSort
-        $this->assertContains(
-            '<a href="server_databases.php',
-            $html
-        );
-        $this->assertContains(
-            'sort_by=SCHEMA_NAME',
-            $html
-        );
-
-        //validate 4: PMA_getHtmlAndColumnOrderForDatabaseList
-        $this->assertRegExp(
-            '/title="pma_bookmark"[[:space:]]*value="pma_bookmark"/',
-            $html
-        );
-        $this->assertRegExp(
-            '/title="information_schema"[[:space:]]*value="information_schema"/',
-            $html
-        );
-        $this->assertRegExp(
-            '/title="performance_schema"[[:space:]]*value="performance_schema"/',
-            $html
-        );
-        $this->assertRegExp(
-            '/title="phpmyadmin"[[:space:]]*value="phpmyadmin"/',
-            $html
-        );
-
-        //validate 5: PMA_getHtmlForTableFooter
-        $this->assertContains(
-            'Total: <span id="databases_count">5</span>',
-            $html
-        );
-
-        //validate 6: PMA_getHtmlForTableFooterButtons
-        $this->assertContains(
-            'Check all',
-            $html
-        );
-
-        //validate 7: PMA_getHtmlForNoticeEnableStatistics
-        $this->assertContains(
-            'Note: Enabling the database statistics here might cause heavy traffic',
-            $html
-        );
-        $this->assertContains(
-            'Enable statistics',
-            $html
-        );
-    }
-
-    /**
-     * Tests for _setSortDetails()
-     *
-     * @return void
-     */
-    public function testSetSortDetails()
-    {
-        $class = new ReflectionClass('\PMA\libraries\controllers\server\ServerDatabasesController');
-        $method = $class->getMethod('_setSortDetails');
-        $method->setAccessible(true);
-        $propertySortBy = $class->getProperty('_sort_by');
-        $propertySortBy->setAccessible(true);
-        $propertySortOrder = $class->getProperty('_sort_order');
-        $propertySortOrder->setAccessible(true);
-
-        $container = Container::getDefaultContainer();
-        $container->factory('PMA\libraries\controllers\server\ServerDatabasesController');
-        $container->alias(
-            'ServerDatabasesController', 'PMA\libraries\controllers\server\ServerDatabasesController'
-        );
-        $ctrl = $container->get('ServerDatabasesController');
-
-        //$_REQUEST['sort_by'] and $_REQUEST['sort_order'] are empty
-        $method->invoke($ctrl, array("master", "slave"));
-        $this->assertEquals(
-            'SCHEMA_NAME',
-            $propertySortBy->getValue($ctrl)
-        );
-        $this->assertEquals(
-            'asc',
-            $propertySortOrder->getValue($ctrl)
-        );
-
-        $container = Container::getDefaultContainer();
-        $container->factory('PMA\libraries\controllers\server\ServerDatabasesController');
-        $container->alias(
-            'ServerDatabasesController', 'PMA\libraries\controllers\server\ServerDatabasesController'
-        );
-        $ctrl = $container->get('ServerDatabasesController');
-
-        // $_REQUEST['sort_by'] = 'DEFAULT_COLLATION_NAME'
-        // and $_REQUEST['sort_order'] is not 'desc'
-        $_REQUEST['sort_by'] = 'DEFAULT_COLLATION_NAME';
-        $_REQUEST['sort_order'] = 'abc';
-        $method->invoke($ctrl);
-        $this->assertEquals(
-            'DEFAULT_COLLATION_NAME',
-            $propertySortBy->getValue($ctrl)
-        );
-        $this->assertEquals(
-            'asc',
-            $propertySortOrder->getValue($ctrl)
-        );
-
-        $container = Container::getDefaultContainer();
-        $container->factory('PMA\libraries\controllers\server\ServerDatabasesController');
-        $container->alias(
-            'ServerDatabasesController', 'PMA\libraries\controllers\server\ServerDatabasesController'
-        );
-        $ctrl = $container->get('ServerDatabasesController');
-
-        // $_REQUEST['sort_by'] = 'DEFAULT_COLLATION_NAME'
-        // and $_REQUEST['sort_order'] is 'desc'
-        $_REQUEST['sort_by'] = 'DEFAULT_COLLATION_NAME';
-        $_REQUEST['sort_order'] = 'desc';
-        $method->invoke($ctrl);
-        $this->assertEquals(
-            'DEFAULT_COLLATION_NAME',
-            $propertySortBy->getValue($ctrl)
-        );
-        $this->assertEquals(
-            'desc',
-            $propertySortOrder->getValue($ctrl)
-        );
-    }
-
-    /**
-     * Tests for _getColumnOrder()
-     *
-     * @return void
-     */
-    public function testGetColumnOrder()
-    {
-        $class = new ReflectionClass('\PMA\libraries\controllers\server\ServerDatabasesController');
-        $method = $class->getMethod('_getColumnOrder');
-        $method->setAccessible(true);
-
-        $container = Container::getDefaultContainer();
-        $container->factory('PMA\libraries\controllers\server\ServerDatabasesController');
-        $container->alias(
-            'ServerDatabasesController', 'PMA\libraries\controllers\server\ServerDatabasesController'
-        );
-        $ctrl = $container->get('ServerDatabasesController');
-
-        $this->assertEquals(
-            array(
-                'DEFAULT_COLLATION_NAME' => array(
-                    'disp_name' => __('Collation'),
-                    'description_function' => 'PMA_getCollationDescr',
-                    'format'    => 'string',
-                    'footer'    => 'utf8_general_ci'
-                ),
-                'SCHEMA_TABLES' => array(
-                    'disp_name' => __('Tables'),
-                    'format'    => 'number',
-                    'footer'    => 0
-                ),
-                'SCHEMA_TABLE_ROWS' => array(
-                    'disp_name' => __('Rows'),
-                    'format'    => 'number',
-                    'footer'    => 0
-                ),
-                'SCHEMA_DATA_LENGTH' => array(
-                    'disp_name' => __('Data'),
-                    'format'    => 'byte',
-                    'footer'    => 0
-                ),
-                'SCHEMA_INDEX_LENGTH' => array(
-                    'disp_name' => __('Indexes'),
-                    'format'    => 'byte',
-                    'footer'    => 0
-                ),
-                'SCHEMA_LENGTH' => array(
-                    'disp_name' => __('Total'),
-                    'format'    => 'byte',
-                    'footer'    => 0
-                ),
-                'SCHEMA_DATA_FREE' => array(
-                    'disp_name' => __('Overhead'),
-                    'format'    => 'byte',
-                    'footer'    => 0
-                )
-            ),
-            $method->invoke($ctrl)
-        );
-    }
-}
diff --git a/#pma/test/classes/controllers/ServerEnginesControllerTest.php b/#pma/test/classes/controllers/ServerEnginesControllerTest.php
deleted file mode 100644
index 6b186aac..00000000
--- a/#pma/test/classes/controllers/ServerEnginesControllerTest.php
+++ /dev/null
@@ -1,170 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Holds ServerEnginesControllerTest class
- *
- * @package PhpMyAdmin-test
- */
-
-use PMA\libraries\StorageEngine;
-use PMA\libraries\Theme;
-use PMA\libraries\controllers\server\ServerEnginesController;
-
-require_once 'libraries/url_generating.lib.php';
-
-require_once 'libraries/database_interface.inc.php';
-
-require_once 'libraries/sanitizing.lib.php';
-require_once 'libraries/js_escape.lib.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * Tests for ServerEnginesController class
- *
- * @package PhpMyAdmin-test
- */
-class ServerEnginesControllerTest extends PMATestCase
-{
-    /**
-     * Prepares environment for the test.
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        //$_REQUEST
-        $_REQUEST['log'] = "index1";
-        $_REQUEST['pos'] = 3;
-
-        //$GLOBALS
-        $GLOBALS['server'] = 0;
-        $GLOBALS['table'] = "table";
-        $GLOBALS['pmaThemeImage'] = 'image';
-
-        //$_SESSION
-        $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
-        $_SESSION['PMA_Theme'] = new Theme();
-    }
-
-    /**
-     * Tests for _getHtmlForAllServerEngines() method
-     *
-     * @return void
-     */
-    public function testGetHtmlForAllServerEngines()
-    {
-        $class = new ReflectionClass('\PMA\libraries\controllers\server\ServerEnginesController');
-        $method = $class->getMethod('_getHtmlForAllServerEngines');
-        $method->setAccessible(true);
-
-        $ctrl = new ServerEnginesController();
-        $html = $method->invoke($ctrl);
-
-        //validate 1: Item header
-        $this->assertContains(
-            '<th>Storage Engine</th>',
-            $html
-        );
-        $this->assertContains(
-            '<th>Description</th>',
-            $html
-        );
-
-        //validate 2: FEDERATED
-        $this->assertContains(
-            '<td>Federated MySQL storage engine</td>',
-            $html
-        );
-        $this->assertContains(
-            'FEDERATED',
-            $html
-        );
-        $this->assertContains(
-            'server_engines.php?engine=FEDERATED',
-            $html
-        );
-
-        //validate 3: dummy
-        $this->assertContains(
-            '<td>dummy comment</td>',
-            $html
-        );
-        $this->assertContains(
-            'dummy',
-            $html
-        );
-        $this->assertContains(
-            'server_engines.php?engine=dummy',
-            $html
-        );
-    }
-
-    /**
-     * Tests for _getHtmlForServerEngine() method
-     *
-     * @return void
-     */
-    public function testGetHtmlForServerEngine()
-    {
-        $_REQUEST['engine'] = "Pbxt";
-        $_REQUEST['page'] = "page";
-        //Mock DBI
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $GLOBALS['dbi'] = $dbi;
-
-        $class = new ReflectionClass('\PMA\libraries\controllers\server\ServerEnginesController');
-        $method = $class->getMethod('_getHtmlForServerEngine');
-        $method->setAccessible(true);
-
-        $engine_plugin = StorageEngine::getEngine("Pbxt");
-        $ctrl = new ServerEnginesController();
-        $html = $method->invoke($ctrl, $engine_plugin);
-
-        //validate 1: Engine title
-        $this->assertContains(
-            htmlspecialchars($engine_plugin->getTitle()),
-            $html
-        );
-
-        //validate 2: Engine Mysql Help Page
-        $this->assertContains(
-            PMA\libraries\Util::showMySQLDocu($engine_plugin->getMysqlHelpPage()),
-            $html
-        );
-
-        //validate 3: Engine Comment
-        $this->assertContains(
-            htmlspecialchars($engine_plugin->getComment()),
-            $html
-        );
-
-        //validate 4: Engine Info Pages
-        $this->assertContains(
-            __('Variables'),
-            $html
-        );
-        $this->assertContains(
-            PMA_URL_getCommon(
-                array('engine' => $_REQUEST['engine'], 'page' => "Documentation")
-            ),
-            $html
-        );
-
-        //validate 5: other items
-        $this->assertContains(
-            PMA_URL_getCommon(array('engine' => $_REQUEST['engine'])),
-            $html
-        );
-        $this->assertContains(
-            $engine_plugin->getSupportInformationMessage(),
-            $html
-        );
-        $this->assertContains(
-            'There is no detailed status information available for this '
-            . 'storage engine.',
-            $html
-        );
-    }
-}
diff --git a/#pma/test/classes/controllers/ServerPluginsControllerTest.php b/#pma/test/classes/controllers/ServerPluginsControllerTest.php
deleted file mode 100644
index da0ffafd..00000000
--- a/#pma/test/classes/controllers/ServerPluginsControllerTest.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Holds ServerPluginsControllerTest class
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-use PMA\libraries\Theme;
-use PMA\libraries\controllers\server\ServerPluginsController;
-use PMA\libraries\di\Container;
-
-require_once 'libraries/database_interface.inc.php';
-require_once 'libraries/sanitizing.lib.php';
-require_once 'libraries/js_escape.lib.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * Tests for ServerPluginsController class
- *
- * @package PhpMyAdmin-test
- */
-class ServerPluginsControllerTest extends PMATestCase
-{
-    /**
-     * Prepares environment for the test.
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        //$_REQUEST
-        $_REQUEST['log'] = "index1";
-        $_REQUEST['pos'] = 3;
-
-        //$GLOBALS
-        $GLOBALS['table'] = "table";
-        $GLOBALS['pmaThemeImage'] = 'image';
-
-        //$_SESSION
-        $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
-        $_SESSION['PMA_Theme'] = new Theme();
-    }
-
-    /**
-     * Test for _getPluginsHtml() method
-     *
-     * @return void
-     */
-    public function testPMAGetPluginAndModuleInfo()
-    {
-        /**
-         * Prepare plugin list
-         */
-        $row = array();
-        $row["plugin_name"] = "plugin_name1";
-        $row["plugin_type"] = "plugin_type1";
-        $row["plugin_type_version"] = "plugin_version1";
-        $row["plugin_author"] = "plugin_author1";
-        $row["plugin_license"] = "plugin_license1";
-        $row["plugin_description"] = "plugin_description1";
-        $row["is_active"] = true;
-
-        //Mock DBI
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->once())
-            ->method('query')
-            ->will($this->returnValue(true));
-        $dbi->expects($this->at(1))
-            ->method('fetchAssoc')
-            ->will($this->returnValue($row));
-        $dbi->expects($this->at(2))
-            ->method('fetchAssoc')
-            ->will($this->returnValue(false));
-        $dbi->expects($this->once())
-            ->method('freeResult')
-            ->will($this->returnValue(true));
-
-        $container = Container::getDefaultContainer();
-        $container->set('dbi', $dbi);
-
-        $class = new ReflectionClass('\PMA\libraries\controllers\server\ServerPluginsController');
-        $method = $class->getMethod('_getPluginsHtml');
-        $method->setAccessible(true);
-
-        $ctrl = new ServerPluginsController();
-        $html = $method->invoke($ctrl);
-
-        //validate 1:Items
-        $this->assertContains(
-            '<th>Plugin</th>',
-            $html
-        );
-        $this->assertContains(
-            '<th>Description</th>',
-            $html
-        );
-        $this->assertContains(
-            '<th>Version</th>',
-            $html
-        );
-        $this->assertContains(
-            '<th>Author</th>',
-            $html
-        );
-        $this->assertContains(
-            '<th>License</th>',
-            $html
-        );
-
-        //validate 2: one Item HTML
-        $this->assertContains(
-            'plugin_name1',
-            $html
-        );
-        $this->assertContains(
-            '<td>plugin_description1</td>',
-            $html
-        );
-        $this->assertContains(
-            '<td>plugin_version1</td>',
-            $html
-        );
-        $this->assertContains(
-            '<td>plugin_author1</td>',
-            $html
-        );
-        $this->assertContains(
-            '<td>plugin_license1</td>',
-            $html
-        );
-    }
-}
diff --git a/#pma/test/classes/controllers/ServerVariablesControllerTest.php b/#pma/test/classes/controllers/ServerVariablesControllerTest.php
deleted file mode 100644
index a9c680d1..00000000
--- a/#pma/test/classes/controllers/ServerVariablesControllerTest.php
+++ /dev/null
@@ -1,320 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Holds ServerVariablesControllerTest class
- *
- * @package PhpMyAdmin-test
- */
-
-use PMA\libraries\di\Container;
-use PMA\libraries\Theme;
-
-require_once 'libraries/url_generating.lib.php';
-
-require_once 'libraries/database_interface.inc.php';
-require_once 'test/libraries/stubs/ResponseStub.php';
-require_once 'test/PMATestCase.php';
-
-require_once 'libraries/sanitizing.lib.php';
-require_once 'libraries/js_escape.lib.php';
-
-/**
- * Tests for ServerVariablesController class
- *
- * @package PhpMyAdmin-test
- */
-class ServerVariablesControllerTest extends PMATestCase
-{
-    /**
-     * @var \PMA\Test\Stubs\Response
-     */
-    private $_response;
-
-    /**
-     * Test for setUp
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        //$_REQUEST
-        $_REQUEST['log'] = "index1";
-        $_REQUEST['pos'] = 3;
-
-        //$GLOBALS
-        $GLOBALS['PMA_PHP_SELF'] = PMA_getenv('PHP_SELF');
-        $GLOBALS['server'] = 1;
-        $GLOBALS['table'] = "table";
-        $GLOBALS['pmaThemeImage'] = 'image';
-
-        //$_SESSION
-        $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
-        $_SESSION['PMA_Theme'] = new Theme();
-
-        //Mock DBI
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        //this data is needed when ServerStatusData constructs
-        $server_session_variable = array(
-            "auto_increment_increment" => "1",
-            "auto_increment_offset" => "13",
-            "automatic_sp_privileges" => "ON",
-            "back_log" => "50",
-            "big_tables" => "OFF",
-        );
-
-        $server_global_variables = array(
-            "auto_increment_increment" => "0",
-            "auto_increment_offset" => "12"
-        );
-
-        $fetchResult = array(
-            array(
-                "SHOW SESSION VARIABLES;",
-                0,
-                1,
-                null,
-                0,
-                $server_session_variable
-            ),
-            array(
-                "SHOW GLOBAL VARIABLES;",
-                0,
-                1,
-                null,
-                0,
-                $server_global_variables
-            )
-        );
-
-        $dbi->expects($this->any())->method('fetchResult')
-            ->will($this->returnValueMap($fetchResult));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $container = Container::getDefaultContainer();
-        $container->set('dbi', $GLOBALS['dbi']);
-        $this->_response = new \PMA\Test\Stubs\Response();
-        $container->set('PMA\libraries\Response', $this->_response);
-        $container->alias('response', 'PMA\libraries\Response');
-    }
-
-    /**
-     * Test for _formatVariable()
-     *
-     * @return void
-     */
-    public function testFormatVariable()
-    {
-        $class = new ReflectionClass(
-            '\PMA\libraries\controllers\server\ServerVariablesController'
-        );
-        $method = $class->getMethod('_formatVariable');
-        $method->setAccessible(true);
-
-        $container = Container::getDefaultContainer();
-        $container->factory(
-            'PMA\libraries\controllers\server\ServerVariablesController'
-        );
-        $container->alias(
-            'ServerVariablesController',
-            'PMA\libraries\controllers\server\ServerVariablesController'
-        );
-        $ctrl = $container->get('ServerVariablesController');
-
-        //Call the test function
-        $name_for_value_byte = "binlog_cache_size";
-        $name_for_value_not_byte = "auto_increment_increment";
-        $name_for_value_not_num = "PMA_key";
-
-        //name is_numeric and the value type is byte
-        $this->assertEquals(
-            '<abbr title="3">3 B</abbr>',
-            $method->invoke($ctrl, $name_for_value_byte, "3")
-        );
-
-        //name is_numeric and the value type is not byte
-        $this->assertEquals(
-            '3',
-            $method->invoke($ctrl, $name_for_value_not_byte, "3")
-        );
-
-        //value is not a number
-        $this->assertEquals(
-            'value',
-            $method->invoke($ctrl, $name_for_value_not_num, "value")
-        );
-    }
-
-    /**
-     * Test for _getHtmlForLinkTemplates()
-     *
-     * @return void
-     */
-    public function testGetHtmlForLinkTemplates()
-    {
-        $class = new ReflectionClass(
-            '\PMA\libraries\controllers\server\ServerVariablesController'
-        );
-        $method = $class->getMethod('_getHtmlForLinkTemplates');
-        $method->setAccessible(true);
-
-        $container = Container::getDefaultContainer();
-        $container->factory(
-            'PMA\libraries\controllers\server\ServerVariablesController'
-        );
-        $container->alias(
-            'ServerVariablesController',
-            'PMA\libraries\controllers\server\ServerVariablesController'
-        );
-        $ctrl = $container->get('ServerVariablesController');
-
-        //Call the test function
-        $html = $method->invoke($ctrl);
-        $url = 'server_variables.php' . PMA_URL_getCommon(array());
-
-        //validate 1: URL
-        $this->assertContains(
-            $url,
-            $html
-        );
-        //validate 2: images
-        $this->assertContains(
-            PMA\libraries\Util::getIcon('b_save.png', __('Save')),
-            $html
-        );
-        $this->assertContains(
-            PMA\libraries\Util::getIcon('b_close.png', __('Cancel')),
-            $html
-        );
-    }
-
-    /**
-     * Test for PMA_getHtmlForServerVariables()
-     *
-     * @return void
-     */
-    public function testPMAGetHtmlForServerVariables()
-    {
-
-        $class = new ReflectionClass(
-            '\PMA\libraries\controllers\server\ServerVariablesController'
-        );
-        $method = $class->getMethod('_getHtmlForServerVariables');
-        $method->setAccessible(true);
-
-        $container = Container::getDefaultContainer();
-        $container->factory(
-            'PMA\libraries\controllers\server\ServerVariablesController'
-        );
-        $container->alias(
-            'ServerVariablesController',
-            'PMA\libraries\controllers\server\ServerVariablesController'
-        );
-        $ctrl = $container->get('ServerVariablesController');
-
-        $_REQUEST['filter'] = "auto-commit";
-        $serverVarsSession
-            = $GLOBALS['dbi']->fetchResult('SHOW SESSION VARIABLES;', 0, 1);
-        $serverVars = $GLOBALS['dbi']->fetchResult('SHOW GLOBAL VARIABLES;', 0, 1);
-
-        $html = $method->invoke($ctrl, $serverVars, $serverVarsSession);
-
-        //validate 1: Filters
-        $this->assertContains(
-            '<legend>' . __('Filters') . '</legend>',
-            $html
-        );
-        $this->assertContains(
-            __('Containing the word:'),
-            $html
-        );
-        $this->assertContains(
-            $_REQUEST['filter'],
-            $html
-        );
-
-        //validate 2: Server Variables
-        $this->assertContains(
-            '<table id="serverVariables" class="data filteredData noclick">',
-            $html
-        );
-        $this->assertContains(
-            __('Variable'),
-            $html
-        );
-        $this->assertContains(
-            __('Global value'),
-            $html
-        );
-    }
-
-    /**
-     * Test for _getHtmlForServerVariablesItems()
-     *
-     * @return void
-     */
-    public function testGetHtmlForServerVariablesItems()
-    {
-        $class = new ReflectionClass(
-            '\PMA\libraries\controllers\server\ServerVariablesController'
-        );
-        $method = $class->getMethod('_getHtmlForServerVariablesItems');
-        $method->setAccessible(true);
-
-        $container = Container::getDefaultContainer();
-        $container->factory(
-            'PMA\libraries\controllers\server\ServerVariablesController'
-        );
-        $container->alias(
-            'ServerVariablesController',
-            'PMA\libraries\controllers\server\ServerVariablesController'
-        );
-        $ctrl = $container->get('ServerVariablesController');
-
-        $serverVarsSession
-            = $GLOBALS['dbi']->fetchResult('SHOW SESSION VARIABLES;', 0, 1);
-        $serverVars = $GLOBALS['dbi']->fetchResult('SHOW GLOBAL VARIABLES;', 0, 1);
-
-        $html = $method->invoke($ctrl, $serverVars, $serverVarsSession);
-
-        //validate 1: variable: auto_increment_increment
-        $name = "auto_increment_increment";
-        $value = htmlspecialchars(str_replace('_', ' ', $name));
-        $this->assertContains(
-            $value,
-            $html
-        );
-
-        //validate 2: variable: auto_increment_offset
-        $name = "auto_increment_offset";
-        $value = htmlspecialchars(str_replace('_', ' ', $name));
-        $this->assertContains(
-            $value,
-            $html
-        );
-
-        $formatVariable = $class->getMethod('_formatVariable');
-        $formatVariable->setAccessible(true);
-
-        $value = $formatVariable->invoke($ctrl, $name, "12");
-        $this->assertContains(
-            $value,
-            $html
-        );
-
-        //validate 3: variables
-        $this->assertContains(
-            __('Session value'),
-            $html
-        );
-
-        $value = $formatVariable->invoke($ctrl, $name, "13");
-        $this->assertContains(
-            $value,
-            $html
-        );
-    }
-}
diff --git a/#pma/test/classes/controllers/TableIndexesControllerTest.php b/#pma/test/classes/controllers/TableIndexesControllerTest.php
deleted file mode 100644
index 64cabb57..00000000
--- a/#pma/test/classes/controllers/TableIndexesControllerTest.php
+++ /dev/null
@@ -1,224 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Tests for libraries/controllers/TableIndexesController.php
- *
- * @package PhpMyAdmin-test
- */
-
-use PMA\libraries\controllers\table\TableIndexesController;
-use PMA\libraries\di\Container;
-use PMA\libraries\Theme;
-
-/*
- * Include to test.
- */
-
-
-
-
-
-require_once 'libraries/database_interface.inc.php';
-require_once 'libraries/relation.lib.php';
-require_once 'libraries/url_generating.lib.php';
-
-require_once 'libraries/sanitizing.lib.php';
-require_once 'test/libraries/stubs/ResponseStub.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * Tests for libraries/controllers/TableIndexesController.php
- *
- * @package PhpMyAdmin-test
- */
-class TableIndexesControllerTest extends PMATestCase
-{
-    /**
-     * Setup function for test cases
-     *
-     * @access protected
-     * @return void
-     */
-    protected function setUp()
-    {
-        /**
-         * SET these to avoid undefined index error
-         */
-        $GLOBALS['server'] = 1;
-        $GLOBALS['cfg']['Server']['pmadb'] = '';
-        $GLOBALS['pmaThemeImage'] = 'theme/';
-        $GLOBALS['url_params'] = array(
-            'db' => 'db',
-            'server' => 1
-        );
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $indexs = array(
-            array(
-                "Schema" => "Schema1",
-                "Key_name"=>"Key_name1",
-                "Column_name"=>"Column_name1"
-            ),
-            array(
-                "Schema" => "Schema2",
-                "Key_name"=>"Key_name2",
-                "Column_name"=>"Column_name2"
-            ),
-            array(
-                "Schema" => "Schema3",
-                "Key_name"=>"Key_name3",
-                "Column_name"=>"Column_name3"
-            ),
-        );
-
-        $dbi->expects($this->any())->method('getTableIndexes')
-            ->will($this->returnValue($indexs));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        //$_SESSION
-        $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
-        $_SESSION['PMA_Theme'] = new Theme();
-    }
-
-    /**
-     * Tests for doSaveDataAction() method
-     *
-     * @return void
-     * @test
-     */
-    public function testDoSaveDataAction()
-    {
-        $sql_query = 'ALTER TABLE `db`.`table` DROP PRIMARY KEY, ADD UNIQUE ;';
-
-        $table = $this->getMockBuilder('PMA\libraries\Table')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $table->expects($this->any())->method('getSqlQueryForIndexCreateOrEdit')
-            ->will($this->returnValue($sql_query));
-
-        $GLOBALS['dbi']->expects($this->any())->method('getTable')
-            ->will($this->returnValue($table));
-
-        $container = Container::getDefaultContainer();
-        $container->set('db', 'db');
-        $container->set('table', 'table');
-        $container->set('dbi', $GLOBALS['dbi']);
-        $response = new \PMA\Test\Stubs\Response();
-        $container->set('PMA\libraries\Response', $response);
-        $container->alias('response', 'PMA\libraries\Response');
-
-        $ctrl = new TableIndexesController(null);
-
-        // Preview SQL
-        $_REQUEST['preview_sql'] = true;
-        $ctrl->doSaveDataAction();
-        $jsonArray = $response->getJSONResult();
-        $this->assertArrayHasKey('sql_data', $jsonArray);
-        $this->assertContains(
-            $sql_query,
-            $jsonArray['sql_data']
-        );
-
-        // Alter success
-        $response->clear();
-        unset($_REQUEST['preview_sql']);
-        $GLOBALS['is_ajax_request'] = true;
-        $ctrl->doSaveDataAction();
-        $jsonArray = $response->getJSONResult();
-        $this->assertArrayHasKey('index_table', $jsonArray);
-        $this->assertArrayHasKey('message', $jsonArray);
-    }
-
-    /**
-     * Tests for displayFormAction()
-     *
-     * @return void
-     * @test
-     */
-    public function testDisplayFormAction()
-    {
-        $table = $this->getMockBuilder('PMA\libraries\Table')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $table->expects($this->any())->method('getStatusInfo')
-            ->will($this->returnValue(""));
-        $table->expects($this->any())->method('isView')
-            ->will($this->returnValue(false));
-        $table->expects($this->any())->method('getNameAndTypeOfTheColumns')
-            ->will($this->returnValue(array("field_name" => "field_type")));
-
-        $GLOBALS['dbi']->expects($this->any())->method('getTable')
-            ->will($this->returnValue($table));
-
-        $container = Container::getDefaultContainer();
-        $container->set('db', 'db');
-        $container->set('table', 'table');
-        $container->set('dbi', $GLOBALS['dbi']);
-        $response = new \PMA\Test\Stubs\Response();
-        $container->set('PMA\libraries\Response', $response);
-        $container->alias('response', 'PMA\libraries\Response');
-        $index = new PMA\libraries\Index();
-
-        $ctrl = new TableIndexesController($index);
-
-        $_REQUEST['create_index'] = true;
-        $_REQUEST['added_fields'] = 3;
-        $ctrl->displayFormAction();
-        $html = $response->getHTMLResult();
-
-        //PMA_URL_getHiddenInputs
-        $this->assertContains(
-            PMA_URL_getHiddenInputs(
-                array(
-                    'db' => 'db',
-                    'table' => 'table',
-                    'create_index' => 1,
-                )
-            ),
-            $html
-        );
-
-        $doc_html = PMA\libraries\Util::showHint(
-            PMA\libraries\Message::notice(
-                __(
-                    '"PRIMARY" <b>must</b> be the name of'
-                    . ' and <b>only of</b> a primary key!'
-                )
-            )
-        );
-        $this->assertContains(
-            $doc_html,
-            $html
-        );
-
-        $this->assertContains(
-            PMA\libraries\Util::showMySQLDocu('ALTER_TABLE'),
-            $html
-        );
-
-        // generateIndexSelector
-        $this->assertContains(
-            $index->generateIndexChoiceSelector(false),
-            $html
-        );
-
-        $this->assertContains(
-            sprintf(__('Add %s column(s) to index'), 1),
-            $html
-        );
-
-        //$field_name & $field_type
-        $this->assertContains(
-            "field_name",
-            $html
-        );
-        $this->assertContains(
-            "field_type",
-            $html
-        );
-    }
-}
diff --git a/#pma/test/classes/controllers/TableRelationControllerTest.php b/#pma/test/classes/controllers/TableRelationControllerTest.php
deleted file mode 100644
index bc8b830f..00000000
--- a/#pma/test/classes/controllers/TableRelationControllerTest.php
+++ /dev/null
@@ -1,277 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Tests for libraries/controllers/TableRelationController.php
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-use PMA\libraries\di\Container;
-use PMA\libraries\Theme;
-
-require_once 'libraries/url_generating.lib.php';
-require_once 'libraries/database_interface.inc.php';
-require_once 'libraries/relation.lib.php';
-require_once 'test/libraries/stubs/ResponseStub.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * Tests for libraries/controllers/TableRelationController.php
- *
- * @package PhpMyAdmin-test
- */
-class TableRelationControllerTest extends PMATestCase
-{
-    /**
-     * @var \PMA\Test\Stubs\Response
-     */
-    private $_response;
-
-    /**
-     * Configures environment
-     *
-     * @return void
-     */
-    protected function setUp()
-    {
-        $GLOBALS['server'] = 0;
-        $GLOBALS['pmaThemeImage'] = 'theme/';
-        //$_SESSION
-        $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
-        $_SESSION['PMA_Theme'] = new Theme();
-
-        $_REQUEST['foreignDb'] = 'db';
-        $_REQUEST['foreignTable'] = 'table';
-
-        $GLOBALS['dblist'] = new DataBasePMAMockForTblRelation();
-        $GLOBALS['dblist']->databases = new DataBaseMockForTblRelation();
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $container = Container::getDefaultContainer();
-        $container->set('db', 'db');
-        $container->set('table', 'table');
-        $container->set('dbi', $GLOBALS['dbi']);
-        $this->_response = new \PMA\Test\Stubs\Response();
-        $container->set('PMA\libraries\Response', $this->_response);
-        $container->alias('response', 'PMA\libraries\Response');
-    }
-
-    /**
-     * Tests for getDropdownValueForTableAction()
-     *
-     * Case one: this case is for the situation when the target
-     *           table is a view.
-     *
-     * @return void
-     * @test
-     */
-    public function testGetDropdownValueForTableActionIsView()
-    {
-        $viewColumns = array(
-            'viewCol', 'viewCol2', 'viewCol3'
-        );
-        $tableMock = $this->getMockBuilder('PMA\libraries\Table')
-            ->disableOriginalConstructor()
-            ->getMock();
-        // Test the situation when the table is a view
-        $tableMock->expects($this->any())->method('isView')
-            ->will($this->returnValue(true));
-        $tableMock->expects($this->any())->method('getColumns')
-            ->will($this->returnValue($viewColumns));
-
-        $GLOBALS['dbi']->expects($this->any())->method('getTable')
-            ->will($this->returnValue($tableMock));
-
-        $container = Container::getDefaultContainer();
-        $container->set('dbi', $GLOBALS['dbi']);
-        $container->factory('PMA\libraries\controllers\table\TableRelationController');
-        $container->alias(
-            'TableRelationController',
-            'PMA\libraries\controllers\table\TableRelationController'
-        );
-        /**
-         * @var PMA\libraries\controllers\table\TableRelationController
-         */
-        $ctrl = $container->get('TableRelationController');
-
-        $ctrl->getDropdownValueForTableAction();
-        $json = $this->_response->getJSONResult();
-        $this->assertEquals(
-            $viewColumns,
-            $json['columns']
-        );
-    }
-
-    /**
-     * Tests for getDropdownValueForTableAction()
-     *
-     * Case one: this case is for the situation when the target
-     *           table is not a view (real tabletable).
-     *
-     * @return void
-     * @test
-     */
-    public function testGetDropdownValueForTableActionNotView()
-    {
-        $indexedColumns = array(
-            'primaryTableCol'
-        );
-        $tableMock = $this->getMockBuilder('PMA\libraries\Table')
-            ->disableOriginalConstructor()
-            ->getMock();
-        // Test the situation when the table is a view
-        $tableMock->expects($this->any())->method('isView')
-            ->will($this->returnValue(false));
-        $tableMock->expects($this->any())->method('getIndexedColumns')
-            ->will($this->returnValue($indexedColumns));
-
-        $GLOBALS['dbi']->expects($this->any())->method('getTable')
-            ->will($this->returnValue($tableMock));
-
-        $container = Container::getDefaultContainer();
-        $container->set('dbi', $GLOBALS['dbi']);
-        $container->factory('PMA\libraries\controllers\table\TableRelationController');
-        $container->alias(
-            'TableRelationController',
-            'PMA\libraries\controllers\table\TableRelationController'
-        );
-        $ctrl = $container->get('TableRelationController');
-
-        $ctrl->getDropdownValueForTableAction();
-        $json = $this->_response->getJSONResult();
-        $this->assertEquals(
-            $indexedColumns,
-            $json['columns']
-        );
-    }
-
-    /**
-     * Tests for getDropdownValueForDbAction()
-     *
-     * Case one: foreign
-     *
-     * @return void
-     * @test
-     */
-    public function testGetDropdownValueForDbActionOne()
-    {
-        $GLOBALS['dbi']->expects($this->any())
-            ->method('fetchArray')
-            ->will(
-                $this->returnCallback(
-                    function () {
-                        static $count = 0;
-                        if ($count == 0) {
-                            $count++;
-                            return array('Engine' => 'InnoDB', 'Name'   => 'table',);
-                        }
-                        return null;
-                    }
-                )
-            );
-
-        $container = Container::getDefaultContainer();
-        $container->set('dbi', $GLOBALS['dbi']);
-        $container->factory('PMA\libraries\controllers\table\TableRelationController');
-        $container->alias(
-            'TableRelationController',
-            'PMA\libraries\controllers\table\TableRelationController'
-        );
-        $ctrl = $container->get(
-            'TableRelationController',
-            array('tbl_storage_engine' => 'INNODB')
-        );
-
-        $_REQUEST['foreign'] = 'true';
-        $ctrl->getDropdownValueForDbAction();
-        $json = $this->_response->getJSONResult();
-        $this->assertEquals(
-            array('table'),
-            $json['tables']
-        );
-    }
-
-    /**
-     * Tests for getDropdownValueForDbAction()
-     *
-     * Case two: not foreign
-     *
-     * @return void
-     * @test
-     */
-    public function testGetDropdownValueForDbActionTwo()
-    {
-        $GLOBALS['dbi']->expects($this->any())
-            ->method('fetchArray')
-            ->will(
-                $this->returnCallback(
-                    function () {
-                        static $count = 0;
-                        if ($count == 0) {
-                            $count++;
-                            return array('table');
-                        }
-                        return null;
-                    }
-                )
-            );
-
-        $container = Container::getDefaultContainer();
-        $container->set('dbi', $GLOBALS['dbi']);
-        $container->factory('PMA\libraries\controllers\table\TableRelationController');
-        $container->alias(
-            'TableRelationController',
-            'PMA\libraries\controllers\table\TableRelationController'
-        );
-        $ctrl = $container->get(
-            'TableRelationController',
-            array('tbl_storage_engine' => 'INNODB',)
-        );
-
-        $_REQUEST['foreign'] = 'false';
-        $ctrl->getDropdownValueForDbAction();
-        $json = $this->_response->getJSONResult();
-        $this->assertEquals(
-            array('table'),
-            $json['tables']
-        );
-    }
-}
-
-/**
- * Mock class for DataBasePMAMock
- *
- * @package PhpMyAdmin-test
- */
-Class DataBasePMAMockForTblRelation
-{
-    var $databases;
-}
-
-/**
- * Mock class for DataBaseMock
- *
- * @package PhpMyAdmin-test
- */
-Class DataBaseMockForTblRelation
-{
-    /**
-     * mock function to return table is existed
-     *
-     * @param string $name table name
-     *
-     * @return bool
-     */
-    function exists($name)
-    {
-        return true;
-    }
-}
diff --git a/#pma/test/classes/controllers/TableSearchControllerTest.php b/#pma/test/classes/controllers/TableSearchControllerTest.php
deleted file mode 100644
index 390b93e4..00000000
--- a/#pma/test/classes/controllers/TableSearchControllerTest.php
+++ /dev/null
@@ -1,383 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Tests for PMA_TableSearch
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-use PMA\libraries\controllers\table\TableSearchController;
-use PMA\libraries\di\Container;
-use PMA\libraries\Theme;
-use PMA\libraries\TypesMySQL;
-
-require_once 'test/libraries/stubs/ResponseStub.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * Tests for PMA_TableSearch
- *
- * @package PhpMyAdmin-test
- */
-class TableSearchControllerTest extends PMATestCase
-{
-    /**
-     * @var PMA\Test\Stubs\Response
-     */
-    private $_response;
-
-    /**
-     * Setup function for test cases
-     *
-     * @access protected
-     * @return void
-     */
-    protected function setUp()
-    {
-        /**
-         * SET these to avoid undefined index error
-         */
-        $_SESSION['PMA_Theme'] = new Theme();
-        $_POST['zoom_submit'] = 'zoom';
-
-        $GLOBALS['server'] = 1;
-        $GLOBALS['PMA_PHP_SELF'] = 'index.php';
-        $GLOBALS['pmaThemeImage'] = 'themes/dot.gif';
-        $GLOBALS['is_ajax_request'] = false;
-        $GLOBALS['cfgRelation'] = PMA_getRelationsParam();
-        $GLOBALS['PMA_Types'] = new TypesMySQL();
-        $GLOBALS['cfg']['Server']['DisableIS'] = false;
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $columns =array(
-            array(
-                'Field' => 'Field1',
-                'Type' => 'Type1',
-                'Null' => 'Null1',
-                'Collation' => 'Collation1',
-            ),
-            array(
-                'Field' => 'Field2',
-                'Type' => 'Type2',
-                'Null' => 'Null2',
-                'Collation' => 'Collation2',
-            )
-        );
-        $dbi->expects($this->any())->method('getColumns')
-            ->will($this->returnValue($columns));
-
-        $show_create_table = "CREATE TABLE `pma_bookmark` (
-        `id` int(11) NOT NULL AUTO_INCREMENT,
-        `dbase` varchar(255) COLLATE utf8_bin NOT NULL DEFAULT '',
-        `user` varchar(255) COLLATE utf8_bin NOT NULL DEFAULT '',
-        `label` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT '',
-        `query` text COLLATE utf8_bin NOT NULL,
-        PRIMARY KEY (`id`),
-        KEY `foreign_field` (`foreign_db`,`foreign_table`)
-        ) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE=utf8_bin "
-        . "COMMENT='Bookmarks'";
-
-        $dbi->expects($this->any())->method('fetchValue')
-            ->will($this->returnValue($show_create_table));
-        $dbi->expects($this->any())->method('escapeString')
-            ->will($this->returnArgument(0));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $this->_response = new PMA\Test\Stubs\Response();
-
-        $container = Container::getDefaultContainer();
-        $container->set('db', 'PMA');
-        $container->set('table', 'PMA_BookMark');
-        $container->set('dbi', $GLOBALS['dbi']);
-        $container->set('response', $this->_response);
-        $container->set('searchType', 'replace');
-    }
-
-    /**
-     * tearDown function for test cases
-     *
-     * @access protected
-     * @return void
-     */
-    protected function tearDown()
-    {
-
-    }
-
-    /**
-     * Test for replace
-     *
-     * @return void
-     */
-    public function testReplace()
-    {
-        $tableSearch = new TableSearchController("zoom", null);
-        $columnIndex = 0;
-        $find = "Field";
-        $replaceWith = "Column";
-        $useRegex = false;
-        $charSet = "UTF-8";
-        $tableSearch->replace(
-            $columnIndex, $find, $replaceWith, $useRegex, $charSet
-        );
-
-        $sql_query = $GLOBALS['sql_query'];
-        $result = "UPDATE `PMA_BookMark` SET `Field1` = "
-            . "REPLACE(`Field1`, 'Field', 'Column') "
-            . "WHERE `Field1` LIKE '%Field%' COLLATE UTF-8_bin";
-        $this->assertEquals(
-            $result,
-            $sql_query
-        );
-    }
-
-    /**
-     * Test for buildSqlQuery
-     *
-     * @return void
-     */
-    public function testBuildSqlQuery()
-    {
-        $_POST['distinct'] = true;
-        $_POST['zoom_submit'] = true;
-        $_POST['table'] = "PMA";
-        $_POST['orderByColumn'] = "name";
-        $_POST['order'] = "asc";
-        $_POST['customWhereClause'] = "name='pma'";
-
-        $class = new ReflectionClass('PMA\libraries\controllers\table\TableSearchController');
-        $method = $class->getMethod('_buildSqlQuery');
-        $method->setAccessible(true);
-        $tableSearch = new TableSearchController("zoom", null);
-
-        $sql = $method->invoke($tableSearch);
-        $result = "SELECT DISTINCT *  FROM `PMA` WHERE name='pma' "
-            . "ORDER BY `name` asc";
-
-        $this->assertEquals(
-            $result,
-            $sql
-        );
-
-        unset($_POST['customWhereClause']);
-        $sql = $method->invoke($tableSearch);
-        $result = "SELECT DISTINCT *  FROM `PMA` ORDER BY `name` asc";
-        $this->assertEquals(
-            $result,
-            $sql
-        );
-
-        $_POST['criteriaValues'] = array(
-            'value1',
-            'value2',
-            'value3',
-            'value4',
-            'value5',
-            'value6',
-            'value7,value8'
-        );
-        $_POST['criteriaColumnNames'] = array(
-            'name',
-            'id',
-            'index',
-            'index2',
-            'index3',
-            'index4',
-            'index5',
-        );
-        $_POST['criteriaColumnTypes'] = array(
-            'varchar',
-            'int',
-            'enum',
-            'type1',
-            'type2',
-            'type3',
-            'type4'
-        );
-        $_POST['criteriaColumnCollations'] = array(
-            "char1",
-            "char2",
-            "char3",
-            "char4",
-            "char5",
-            "char6",
-            "char7",
-        );
-        $_POST['criteriaColumnOperators'] = array(
-            "!=",
-            ">",
-            "IS NULL",
-            "LIKE %...%",
-            "REGEXP ^...$",
-            "IN (...)",
-            "BETWEEN"
-        );
-
-        $sql = $method->invoke($tableSearch);
-        $result = "SELECT DISTINCT *  FROM `PMA` WHERE `name` != 'value1'"
-            . " AND `id` > value2 AND `index` IS NULL AND `index2` LIKE '%value4%'"
-            . " AND `index3` REGEXP ^value5$ AND `index4` IN (value6) AND `index5`"
-            . " BETWEEN value7 AND value8 ORDER BY `name` asc";
-        $this->assertEquals(
-            $result,
-            $sql
-        );
-    }
-
-    /**
-     * Tests for getColumnMinMax()
-     *
-     * @return void
-     * @test
-     */
-    public function testGetColumnMinMax()
-    {
-        $GLOBALS['dbi']->expects($this->any())->method('fetchSingleRow')
-            ->will($this->returnArgument(0));
-
-        $container = Container::getDefaultContainer();
-        $container->set('dbi', $GLOBALS['dbi']);
-        $container->factory('PMA\libraries\controllers\table\TableSearchController');
-        $container->alias(
-            'TableSearchController', 'PMA\libraries\controllers\table\TableSearchController'
-        );
-        $ctrl = $container->get('TableSearchController');
-
-        $result = $ctrl->getColumnMinMax('column');
-        $expected = 'SELECT MIN(`column`) AS `min`, '
-            . 'MAX(`column`) AS `max` '
-            . 'FROM `PMA`.`PMA_BookMark`';
-        $this->assertEquals(
-            $expected,
-            $result
-        );
-    }
-
-    /**
-     * Tests for _generateWhereClause()
-     *
-     * @return void
-     * @test
-     */
-    public function testGenerateWhereClause()
-    {
-        $types = $this->getMockBuilder('PMA\libraries\Types')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $types->expects($this->any())->method('isUnaryOperator')
-            ->will($this->returnValue(false));
-        $GLOBALS['PMA_Types'] = $types;
-
-        $class = new ReflectionClass('\PMA\libraries\controllers\Table\TableSearchController');
-        $method = $class->getMethod('_generateWhereClause');
-        $method->setAccessible(true);
-
-        $container = Container::getDefaultContainer();
-        $container->factory('\PMA\libraries\controllers\Table\TableSearchController');
-        $container->alias(
-            'TableSearchController', 'PMA\libraries\controllers\table\TableSearchController'
-        );
-        $ctrl = $container->get('TableSearchController');
-
-        $_POST['customWhereClause'] = '`table` = \'PMA_BookMark\'';
-        $result = $method->invoke($ctrl);
-        $this->assertEquals(
-            ' WHERE `table` = \'PMA_BookMark\'',
-            $result
-        );
-
-        unset($_POST['customWhereClause']);
-        $this->assertEquals(
-            '',
-            $method->invoke($ctrl)
-        );
-
-        $_POST['criteriaColumnNames'] = array(
-            'b', 'a'
-        );
-        $_POST['criteriaColumnOperators'] = array(
-            '<=', '='
-        );
-        $_POST['criteriaValues'] = array(
-            '10', '2'
-        );
-        $_POST['criteriaColumnTypes'] = array(
-            'int(11)', 'int(11)'
-        );
-        $result = $method->invoke($ctrl);
-        $this->assertEquals(
-            ' WHERE `b` <= 10 AND `a` = 2',
-            $result
-        );
-    }
-
-    /**
-     * Tests for getDataRowAction()
-     *
-     * @return void
-     * @test
-     */
-    public function testGetDataRowAction()
-    {
-        $meta_one = new stdClass();
-        $meta_one->type = 'int';
-        $meta_one->length = 11;
-        $meta_two = new stdClass();
-        $meta_two->length = 11;
-        $meta_two->type = 'int';
-        $fields_meta = array(
-            $meta_one, $meta_two
-        );
-        $GLOBALS['dbi']->expects($this->any())->method('getFieldsMeta')
-            ->will($this->returnValue($fields_meta));
-
-        $GLOBALS['dbi']->expects($this->any())->method('fetchAssoc')
-            ->will(
-                $this->returnCallback(
-                    function () {
-                        static $count = 0;
-                        if ($count == 0) {
-                            $count++;
-
-                            return array(
-                                'col1' => 1,
-                                'col2' => 2,
-                            );
-                        } else {
-                            return null;
-                        }
-                    }
-                )
-            );
-
-        $container = Container::getDefaultContainer();
-        $container->set('dbi', $GLOBALS['dbi']);
-        $container->factory('\PMA\libraries\controllers\Table\TableSearchController');
-        $container->alias(
-            'TableSearchController', 'PMA\libraries\controllers\table\TableSearchController'
-        );
-        $ctrl = $container->get('TableSearchController');
-
-        $_REQUEST['db'] = 'PMA';
-        $_REQUEST['table'] = 'PMA_BookMark';
-        $_REQUEST['where_clause'] = '`col1` = 1';
-        $expected = array(
-            'col1' => 1,
-            'col2' => 2
-        );
-        $ctrl->getDataRowAction();
-
-        $json = $this->_response->getJSONResult();
-        $this->assertEquals(
-            $expected,
-            $json['row_info']
-        );
-    }
-}
diff --git a/#pma/test/classes/controllers/TableStructureControllerTest.php b/#pma/test/classes/controllers/TableStructureControllerTest.php
deleted file mode 100644
index 38f9cc57..00000000
--- a/#pma/test/classes/controllers/TableStructureControllerTest.php
+++ /dev/null
@@ -1,345 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * TableStructureController_Test class
- *
- * this class is for testing TableStructureController class
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-use PMA\libraries\di\Container;
-use PMA\libraries\Theme;
-
-require_once 'libraries/database_interface.inc.php';
-require_once 'test/libraries/stubs/ResponseStub.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * TableStructureController_Test class
- *
- * this class is for testing TableStructureController class
- *
- * @package PhpMyAdmin-test
- */
-class TableStructureControllerTest extends PMATestCase
-{
-    /**
-     * @var \PMA\Test\Stubs\Response
-     */
-    private $_response;
-
-    /**
-     * Prepares environment for the test.
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        //$_REQUEST
-        $_REQUEST['log'] = "index1";
-        $_REQUEST['pos'] = 3;
-
-        //$GLOBALS
-        $GLOBALS['server'] = 1;
-        $GLOBALS['cfg']['Server']['DisableIS'] = false;
-
-        $GLOBALS['table'] = "table";
-        $GLOBALS['pmaThemeImage'] = 'image';
-
-        //$_SESSION
-        $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
-        $_SESSION['PMA_Theme'] = new Theme();
-
-        $table = $this->getMockBuilder('PMA\libraries\Table')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $dbi->expects($this->any())->method('getTable')
-            ->will($this->returnValue($table));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $container = Container::getDefaultContainer();
-        $container->set('db', 'db');
-        $container->set('table', 'table');
-        $container->set('dbi', $GLOBALS['dbi']);
-        $this->_response = new \PMA\Test\Stubs\Response();
-        $container->set('PMA\libraries\Response', $this->_response);
-        $container->alias('response', 'PMA\libraries\Response');
-    }
-
-    /**
-     * Tests for getKeyForTablePrimary()
-     *
-     * Case one: there are no primary key in the table
-     *
-     * @return void
-     * @test
-     */
-    public function testGetKeyForTablePrimaryOne()
-    {
-        $GLOBALS['dbi']->expects($this->any())->method('fetchAssoc')
-            ->will($this->returnValue(null));
-
-        $class = new ReflectionClass('\PMA\libraries\controllers\table\TableStructureController');
-        $method = $class->getMethod('getKeyForTablePrimary');
-        $method->setAccessible(true);
-
-        $container = Container::getDefaultContainer();
-        $container->set('dbi', $GLOBALS['dbi']);
-        $container->factory('PMA\libraries\controllers\table\TableStructureController');
-        $container->alias(
-            'TableStructureController', 'PMA\libraries\controllers\table\TableStructureController'
-        );
-        $ctrl = $container->get('TableStructureController');
-        // No primary key in db.table2
-        $this->assertEquals(
-            '',
-            $method->invoke($ctrl)
-        );
-    }
-
-    /**
-     * Tests for getKeyForTablePrimary()
-     *
-     * Case two: there are a primary key in the table
-     *
-     * @return void
-     * @test
-     */
-    public function testGetKeyForTablePrimaryTwo()
-    {
-        $GLOBALS['dbi']->expects($this->any())
-            ->method('fetchAssoc')
-            ->will(
-                $this->returnCallback(
-                    function () {
-                        static $callCount = 0;
-                        if ($callCount == 0) {
-                            $callCount++;
-
-                            return array(
-                                'Key_name'    => 'PRIMARY',
-                                'Column_name' => 'column',
-                            );
-                        } else {
-                            return null;
-                        }
-                    }
-                )
-            );
-
-        $class = new ReflectionClass('\PMA\libraries\controllers\table\TableStructureController');
-        $method = $class->getMethod('getKeyForTablePrimary');
-        $method->setAccessible(true);
-
-        $container = Container::getDefaultContainer();
-        $container->set('dbi', $GLOBALS['dbi']);
-        $container->factory('PMA\libraries\controllers\table\TableStructureController');
-        $container->alias(
-            'TableStructureController', 'PMA\libraries\controllers\table\TableStructureController'
-        );
-        $ctrl = $container->get('TableStructureController');
-        // With db.table, it has a primary key `column`
-        $this->assertEquals(
-            'column, ',
-            $method->invoke($ctrl)
-        );
-    }
-
-    /**
-     * Tests for adjustColumnPrivileges()
-     *
-     * @return void
-     * @test
-     */
-    public function testAdjustColumnPrivileges()
-    {
-        $class = new ReflectionClass('\PMA\libraries\controllers\table\TableStructureController');
-        $method = $class->getMethod('adjustColumnPrivileges');
-        $method->setAccessible(true);
-
-        $container = Container::getDefaultContainer();
-        $container->set('dbi', $GLOBALS['dbi']);
-        $container->factory('PMA\libraries\controllers\table\TableStructureController');
-        $container->alias(
-            'TableStructureController', 'PMA\libraries\controllers\table\TableStructureController'
-        );
-        $ctrl = $container->get('TableStructureController');
-
-        $this->assertEquals(
-            false,
-            $method->invokeArgs($ctrl, array(null))
-        );
-    }
-
-    /**
-     * Tests for getMultipleFieldCommandType()
-     *
-     * @return void
-     * @test
-     */
-    public function testGetMultipleFieldCommandType()
-    {
-        $class = new ReflectionClass('\PMA\libraries\controllers\table\TableStructureController');
-        $method = $class->getMethod('getMultipleFieldCommandType');
-        $method->setAccessible(true);
-
-        $container = Container::getDefaultContainer();
-        $container->set('dbi', $GLOBALS['dbi']);
-        $container->factory('PMA\libraries\controllers\table\TableStructureController');
-        $container->alias(
-            'TableStructureController', 'PMA\libraries\controllers\table\TableStructureController'
-        );
-        $ctrl = $container->get('TableStructureController');
-
-        $this->assertEquals(
-            null,
-            $method->invoke($ctrl)
-        );
-
-        $_REQUEST['submit_mult_drop_x'] = true;
-        $this->assertEquals(
-            'drop',
-            $method->invoke($ctrl)
-        );
-        unset($_REQUEST['submit_mult_drop_x']);
-
-        $_REQUEST['submit_mult'] = 'create';
-        $this->assertEquals(
-            'create',
-            $method->invoke($ctrl)
-        );
-        unset($_REQUEST['submit_mult']);
-
-        $_REQUEST['mult_btn'] = __('Yes');
-        $this->assertEquals(
-            'row_delete',
-            $method->invoke($ctrl)
-        );
-
-        $_REQUEST['selected'] = array('a', 'b');
-        $method->invoke($ctrl);
-        $this->assertEquals(
-            $_REQUEST['selected'],
-            $_REQUEST['selected_fld']
-        );
-    }
-
-    /**
-     * Test for getDataForSubmitMult()
-     *
-     * @return void
-     * @test
-     */
-    public function testPMAGetDataForSubmitMult()
-    {
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $dbi->expects($this->any())
-            ->method('query')
-            ->will($this->returnValue(true));
-
-        $class = new ReflectionClass('PMA\libraries\controllers\table\TableStructureController');
-        $method = $class->getMethod('getDataForSubmitMult');
-        $method->setAccessible(true);
-
-        $container = Container::getDefaultContainer();
-        $container->set('dbi', $dbi);
-        $container->factory('PMA\libraries\controllers\table\TableStructureController');
-        $container->alias(
-            'TableStructureController', 'PMA\libraries\controllers\table\TableStructureController'
-        );
-        $ctrl = $container->get('TableStructureController');
-
-        $submit_mult = "index";
-        $db = "PMA_db";
-        $table = "PMA_table";
-        $selected = array(
-            "table1", "table2"
-        );
-        $action = 'db_delete_row';
-
-        list($what, $query_type, $is_unset_submit_mult, $mult_btn, $centralColsError)
-            = $method->invokeArgs(
-                $ctrl,
-                array($submit_mult, $db, $table, $selected, $action)
-            );
-
-        //validate 1: $what
-        $this->assertEquals(
-            null,
-            $what
-        );
-
-        //validate 2: $query_type
-        $this->assertEquals(
-            'index_fld',
-            $query_type
-        );
-
-        //validate 3: $is_unset_submit_mult
-        $this->assertEquals(
-            true,
-            $is_unset_submit_mult
-        );
-
-        //validate 4:
-        $this->assertEquals(
-            __('Yes'),
-            $mult_btn
-        );
-
-        //validate 5: $centralColsError
-        $this->assertEquals(
-            null,
-            $centralColsError
-        );
-
-        $submit_mult = "unique";
-
-        list($what, $query_type, $is_unset_submit_mult, $mult_btn, $centralColsError)
-            = $method->invokeArgs(
-                $ctrl,
-                array($submit_mult, $db, $table, $selected, $action)
-            );
-
-        //validate 1: $what
-        $this->assertEquals(
-            null,
-            $what
-        );
-
-        //validate 2: $query_type
-        $this->assertEquals(
-            'unique_fld',
-            $query_type
-        );
-
-        //validate 3: $is_unset_submit_mult
-        $this->assertEquals(
-            true,
-            $is_unset_submit_mult
-        );
-
-        //validate 4: $mult_btn
-        $this->assertEquals(
-            __('Yes'),
-            $mult_btn
-        );
-
-        //validate 5: $centralColsError
-        $this->assertEquals(
-            null,
-            $centralColsError
-        );
-    }
-}
diff --git a/#pma/test/classes/dbi/DBIMysqlTest.php b/#pma/test/classes/dbi/DBIMysqlTest.php
deleted file mode 100644
index 8c493036..00000000
--- a/#pma/test/classes/dbi/DBIMysqlTest.php
+++ /dev/null
@@ -1,331 +0,0 @@
-<?php
-/**
- * Tests for PMA\libraries\dbi\DBIMysql class
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-
-use PMA\libraries\dbi\DBIMysql;
-
-require_once 'libraries/relation.lib.php';
-require_once 'libraries/url_generating.lib.php';
-require_once 'test/PMATestCase.php';
-
-require_once 'libraries/database_interface.inc.php';
-
-/**
- * Tests for PMA\libraries\dbi\DBIMysql class
- *
- * @package PhpMyAdmin-test
- */
-class DBIMysqlTest extends PMATestCase
-{
-    /**
-     * @access protected
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function setUp()
-    {
-        if (! extension_loaded('mysql')) {
-            $this->markTestSkipped('The MySQL extension is not available.');
-        }
-        $GLOBALS['cfg']['Server']['ssl'] = true;
-        $GLOBALS['cfg']['Server']['compress'] = true;
-        $this->object = new DBIMysql();
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Test for realMultiQuery
-     *
-     * @return void
-     *
-     * @group medium
-     */
-    public function testRealMultiQuery()
-    {
-        //PHP's 'mysql' extension does not support multi_queries
-        $this->assertEquals(
-            false,
-            $this->object->realMultiQuery(null, "select * from PMA")
-        );
-    }
-
-    /**
-     * Test for mysql related functions, using runkit_function_redefine
-     *
-     * @return void
-     *
-     * @group medium
-     */
-    public function testMysqlDBI()
-    {
-        if (! PMA_HAS_RUNKIT || ! $GLOBALS['runkit_internal_override']) {
-            $this->markTestSkipped("Cannot redefine function");
-        }
-        //FOR UT, we just test the right mysql client API is called
-        runkit_function_redefine('mysql_pconnect', '', 'return "mysql_pconnect";');
-        runkit_function_redefine('mysql_connect', '', 'return "mysql_connect";');
-        runkit_function_redefine('mysql_query', '', 'return "mysql_query";');
-        runkit_function_redefine(
-            'mysql_fetch_array', '', 'return "mysql_fetch_array";'
-        );
-        runkit_function_redefine(
-            'mysql_data_seek', '', 'return "mysql_data_seek";'
-        );
-        runkit_function_redefine(
-            'mysql_get_host_info', '', 'return "mysql_get_host_info";'
-        );
-        runkit_function_redefine(
-            'mysql_get_proto_info', '', 'return "mysql_get_proto_info";'
-        );
-        runkit_function_redefine(
-            'mysql_field_flags', '', 'return "mysql_field_flags";'
-        );
-        runkit_function_redefine(
-            'mysql_field_name', '', 'return "mysql_field_name";'
-        );
-        runkit_function_redefine(
-            'mysql_field_len', '', 'return "mysql_field_len";'
-        );
-        runkit_function_redefine(
-            'mysql_num_fields', '', 'return "mysql_num_fields";'
-        );
-        runkit_function_redefine(
-            'mysql_affected_rows', '', 'return "mysql_affected_rows";'
-        );
-
-        //test for fieldFlags
-        $result = array("table1", "table2");
-        $ret = $this->object->numFields($result);
-        $this->assertEquals(
-            'mysql_num_fields',
-            $ret
-        );
-
-        //test for fetchRow
-        $result = array("table1", "table2");
-        $ret = $this->object->fetchRow($result);
-        $this->assertEquals(
-            'mysql_fetch_array',
-            $ret
-        );
-
-        //test for fetchRow
-        $result = array("table1", "table2");
-        $ret = $this->object->fetchAssoc($result);
-        $this->assertEquals(
-            'mysql_fetch_array',
-            $ret
-        );
-
-        //test for affectedRows
-        $link = "PMA_link";
-        $get_from_cache = false;
-        $ret = $this->object->affectedRows($link, $get_from_cache);
-        $this->assertEquals(
-            "mysql_affected_rows",
-            $ret
-        );
-
-        //test for connect
-        $user = 'PMA_user';
-        $password = 'PMA_password';
-        $is_controluser = false;
-        $server = array(
-            'port' => 8080,
-            'socket' => 123,
-            'host' => 'locahost',
-        );
-        $auxiliary_connection = true;
-
-        //test for connect
-        $ret = $this->object->connect(
-            $user, $password, $is_controluser,
-            $server, $auxiliary_connection
-        );
-        $this->assertEquals(
-            'mysql_connect',
-            $ret
-        );
-
-        $GLOBALS['cfg']['PersistentConnections'] = true;
-        $ret = $this->object->connect(
-            $user, $password, $is_controluser,
-            $server, $auxiliary_connection
-        );
-        $this->assertEquals(
-            'mysql_pconnect',
-            $ret
-        );
-
-        //test for realQuery
-        $query = 'select * from DBI';
-        $link = $ret;
-        $options = 0;
-        $ret = $this->object->realQuery($query, $link, $options);
-        $this->assertEquals(
-            'mysql_query',
-            $ret
-        );
-
-        //test for fetchArray
-        $result = $ret;
-        $ret = $this->object->fetchArray($result);
-        $this->assertEquals(
-            'mysql_fetch_array',
-            $ret
-        );
-
-        //test for dataSeek
-        $result = $ret;
-        $offset = 12;
-        $ret = $this->object->dataSeek($result, $offset);
-        $this->assertEquals(
-            'mysql_data_seek',
-            $ret
-        );
-
-        //test for getHostInfo
-        $ret = $this->object->getHostInfo($ret);
-        $this->assertEquals(
-            'mysql_get_host_info',
-            $ret
-        );
-
-        //test for getProtoInfo
-        $ret = $this->object->getProtoInfo($ret);
-        $this->assertEquals(
-            'mysql_get_proto_info',
-            $ret
-        );
-
-        //test for fieldLen
-        $ret = $this->object->fieldLen($ret, $offset);
-        $this->assertEquals(
-            'mysql_field_len',
-            $ret
-        );
-
-        //test for fieldName
-        $ret = $this->object->fieldName($ret, $offset);
-        $this->assertEquals(
-            'mysql_field_name',
-            $ret
-        );
-
-        //test for fieldFlags
-        $ret = $this->object->fieldFlags($ret, $offset);
-        $this->assertEquals(
-            'mysql_field_flags',
-            $ret
-        );
-    }
-
-    /**
-     * Test for selectDb
-     *
-     * @return void
-     *
-     * @group medium
-     */
-    public function testSelectDb()
-    {
-        $this->markTestIncomplete('Not testing anything');
-        //$link is empty
-        $GLOBALS['userlink'] = null;
-        $this->assertEquals(
-            false,
-            $this->object->selectDb("PMA", null)
-        );
-    }
-
-    /**
-     * Test for moreResults
-     *
-     * @return void
-     *
-     * @group medium
-     */
-    public function testMoreResults()
-    {
-        //PHP's 'mysql' extension does not support multi_queries
-        $this->assertEquals(
-            false,
-            $this->object->moreResults(null)
-        );
-        //PHP's 'mysql' extension does not support multi_queries
-        $this->assertEquals(
-            false,
-            $this->object->nextResult(null)
-        );
-    }
-
-    /**
-     * Test for getClientInfo
-     *
-     * @return void
-     *
-     * @group medium
-     */
-    public function testGetClientInfo()
-    {
-        $this->assertEquals(
-            mysql_get_client_info(),
-            $this->object->getClientInfo()
-        );
-    }
-
-    /**
-     * Test for numRows
-     *
-     * @return void
-     *
-     * @group medium
-     */
-    public function testNumRows()
-    {
-        $this->assertEquals(
-            false,
-            $this->object->numRows(true)
-        );
-    }
-
-    /**
-     * Test for storeResult
-     *
-     * @return void
-     *
-     * @group medium
-     */
-    public function testStoreResult()
-    {
-        $this->assertEquals(
-            false,
-            $this->object->storeResult(null)
-        );
-    }
-}
diff --git a/#pma/test/classes/dbi/DBIMysqliTest.php b/#pma/test/classes/dbi/DBIMysqliTest.php
deleted file mode 100644
index 57a3a061..00000000
--- a/#pma/test/classes/dbi/DBIMysqliTest.php
+++ /dev/null
@@ -1,249 +0,0 @@
-<?php
-/**
- * Tests for PMA\libraries\dbi\DBIMysqli class
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-use PMA\libraries\dbi\DBIMysqli;
-use PMA\libraries\Theme;
-
-require_once 'libraries/relation.lib.php';
-require_once 'libraries/url_generating.lib.php';
-require_once 'libraries/database_interface.inc.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * Tests for PMA\libraries\dbi\DBIMysqli class
- *
- * @package PhpMyAdmin-test
- */
-class DBIMysqliTest extends PMATestCase
-{
-    /**
-     * @access protected
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function setUp()
-    {
-        $GLOBALS['cfg']['Server']['ssl'] = false;
-        $GLOBALS['cfg']['Server']['compress'] = true;
-        $GLOBALS['pmaThemeImage'] = 'image';
-
-        //$_SESSION
-        $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
-        $_SESSION['PMA_Theme'] = new Theme();
-        $this->object = new DBIMysqli();
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Test for mysqli related functions, using runkit_function_redefine
-     *
-     * @return void
-     *
-     * @group medium
-     */
-    public function testMysqliDBI()
-    {
-        if (! PMA_HAS_RUNKIT) {
-            $this->markTestSkipped("Cannot redefine function");
-        }
-
-        //FOR UT, we just test the right mysql client API is called
-        runkit_function_redefine(
-            'mysqli_real_connect', '', 'return "mysqli_real_connect";'
-        );
-        runkit_function_redefine('mysqli_init', '', 'return "mysqli_init";');
-        runkit_function_redefine('mysqli_options', '', 'return "mysqli_options";');
-        runkit_function_redefine('mysqli_query', '', 'return "mysqli_query";');
-        runkit_function_redefine(
-            'mysqli_multi_query', '', 'return "mysqli_multi_query";'
-        );
-        runkit_function_redefine(
-            'mysqli_fetch_array', '', 'return "mysqli_fetch_array";'
-        );
-        runkit_function_redefine(
-            'mysqli_data_seek', '', 'return "mysqli_data_seek";'
-        );
-        runkit_function_redefine(
-            'mysqli_more_results', '', 'return "mysqli_more_results";'
-        );
-        runkit_function_redefine(
-            'mysqli_next_result', '', 'return "mysqli_next_result";'
-        );
-        runkit_function_redefine(
-            'mysqli_get_host_info', '', 'return "mysqli_get_host_info";'
-        );
-        runkit_function_redefine(
-            'mysqli_get_proto_info', '', 'return "mysqli_get_proto_info";'
-        );
-        runkit_function_redefine(
-            'mysqli_get_client_info', '', 'return "mysqli_get_client_info";'
-        );
-
-        $user = 'PMA_user';
-        $password = 'PMA_password';
-        $is_controluser = false;
-        $server = array(
-            'port' => 8080,
-            'socket' => 123,
-            'host' => 'locahost',
-        );
-        $auxiliary_connection = true;
-
-        //test for connect
-        $ret = $this->object->connect(
-            $user, $password, $is_controluser,
-            $server, $auxiliary_connection
-        );
-        $this->assertEquals(
-            'mysqli_init',
-            $ret
-        );
-
-        //test for realQuery
-        $query = 'select * from DBI';
-        $link = $ret;
-        $options = 0;
-        $ret = $this->object->realQuery($query, $link, $options);
-        $this->assertEquals(
-            'mysqli_query',
-            $ret
-        );
-
-        //test for realMultiQuery
-        $ret = $this->object->realMultiQuery($link, $query);
-        $this->assertEquals(
-            'mysqli_multi_query',
-            $ret
-        );
-
-        //test for fetchArray
-        $result = $ret;
-        $ret = $this->object->fetchArray($result);
-        $this->assertEquals(
-            'mysqli_fetch_array',
-            $ret
-        );
-
-        //test for fetchAssoc
-        $result = $ret;
-        $ret = $this->object->fetchAssoc($result);
-        $this->assertEquals(
-            'mysqli_fetch_array',
-            $ret
-        );
-
-        //test for fetchRow
-        $result = $ret;
-        $ret = $this->object->fetchRow($result);
-        $this->assertEquals(
-            'mysqli_fetch_array',
-            $ret
-        );
-
-        //test for dataSeek
-        $result = $ret;
-        $offset = 10;
-        $ret = $this->object->dataSeek($result, $offset);
-        $this->assertEquals(
-            'mysqli_data_seek',
-            $ret
-        );
-
-        //test for moreResults
-        $link = $ret;
-        $ret = $this->object->moreResults($link);
-        $this->assertEquals(
-            'mysqli_more_results',
-            $ret
-        );
-
-        //test for nextResult
-        $link = $ret;
-        $ret = $this->object->nextResult($link);
-        $this->assertEquals(
-            'mysqli_next_result',
-            $ret
-        );
-
-        //test for getHostInfo
-        $link = $ret;
-        $ret = $this->object->getHostInfo($link);
-        $this->assertEquals(
-            'mysqli_get_host_info',
-            $ret
-        );
-
-        //test for getProtoInfo
-        $link = $ret;
-        $ret = $this->object->getProtoInfo($link);
-        $this->assertEquals(
-            'mysqli_get_proto_info',
-            $ret
-        );
-
-        //test for getClientInfo
-        $ret = $this->object->getClientInfo();
-        $this->assertEquals(
-            'mysqli_get_client_info',
-            $ret
-        );
-    }
-
-    /**
-     * Test for selectDb
-     *
-     * @return void
-     *
-     * @group medium
-     */
-    public function testSelectDb()
-    {
-        $this->markTestIncomplete('Not testing anything');
-        //$link is empty
-        $GLOBALS['userlink'] = null;
-        $this->assertEquals(
-            false,
-            $this->object->selectDb("PMA", null)
-        );
-    }
-
-    /**
-     * Test for numRows
-     *
-     * @return void
-     *
-     * @group medium
-     */
-    public function testNumRows()
-    {
-        $this->assertEquals(
-            0,
-            $this->object->numRows(true)
-        );
-    }
-}
diff --git a/#pma/test/classes/engines/BdbTest.php b/#pma/test/classes/engines/BdbTest.php
deleted file mode 100644
index bd3df76e..00000000
--- a/#pma/test/classes/engines/BdbTest.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php
-/**
- * Tests for PMA\libraries\engines\Bdb
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-
-use PMA\libraries\engines\Bdb;
-
-require_once 'libraries/database_interface.inc.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * Tests for PMA\libraries\engines\Bdb
- *
- * @package PhpMyAdmin-test
- */
-class BdbTest extends PMATestCase
-{
-    /**
-     * @access protected
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function setUp()
-    {
-        $GLOBALS['server'] = 0;
-        $this->object = new Bdb('bdb');
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Test for getVariables
-     *
-     * @return void
-     */
-    public function testGetVariables()
-    {
-        $this->assertEquals(
-            $this->object->getVariables(),
-            array(
-                'version_bdb' => array(
-                    'title' => __('Version information'),
-                ),
-                'bdb_cache_size' => array(
-                    'type'  => 1,
-                ),
-                'bdb_home' => array(
-                ),
-                'bdb_log_buffer_size' => array(
-                    'type'  => 1,
-                ),
-                'bdb_logdir' => array(
-                ),
-                'bdb_max_lock' => array(
-                    'type'  => 2,
-                ),
-                'bdb_shared_data' => array(
-                ),
-                'bdb_tmpdir' => array(
-                ),
-                'bdb_data_direct' => array(
-                ),
-                'bdb_lock_detect' => array(
-                ),
-                'bdb_log_direct' => array(
-                ),
-                'bdb_no_recover' => array(
-                ),
-                'bdb_no_sync' => array(
-                ),
-                'skip_sync_bdb_logs' => array(
-                ),
-                'sync_bdb_logs' => array(
-                ),
-            )
-        );
-    }
-
-    /**
-     * Test for getVariablesLikePattern
-     *
-     * @return void
-     */
-    public function testGetVariablesLikePattern()
-    {
-        $this->assertEquals(
-            $this->object->getVariablesLikePattern(),
-            '%bdb%'
-        );
-    }
-
-    /**
-     * Test for getMysqlHelpPage
-     *
-     * @return void
-     */
-    public function testGetMysqlHelpPage()
-    {
-        $this->assertEquals(
-            $this->object->getMysqlHelpPage(),
-            'bdb'
-        );
-
-    }
-}
diff --git a/#pma/test/classes/engines/BinlogTest.php b/#pma/test/classes/engines/BinlogTest.php
deleted file mode 100644
index c1457b05..00000000
--- a/#pma/test/classes/engines/BinlogTest.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-/**
- * Tests for PMA_StorageEngine_binlog
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-
-use PMA\libraries\engines\Binlog;
-
-require_once 'libraries/database_interface.inc.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * Tests for PMA\libraries\engines\Binlog
- *
- * @package PhpMyAdmin-test
- */
-class BinlogTest extends PMATestCase
-{
-    /**
-     * @access protected
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function setUp()
-    {
-        $GLOBALS['server'] = 0;
-        $this->object = new Binlog('binlog');
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function tearDown()
-    {
-        unset($this->object);
-    }
-
-
-    /**
-     * Test for getMysqlHelpPage
-     *
-     * @return void
-     */
-    public function testGetMysqlHelpPage()
-    {
-        $this->assertEquals(
-            $this->object->getMysqlHelpPage(),
-            'binary-log'
-        );
-    }
-}
diff --git a/#pma/test/classes/engines/InnodbTest.php b/#pma/test/classes/engines/InnodbTest.php
deleted file mode 100644
index 577ec633..00000000
--- a/#pma/test/classes/engines/InnodbTest.php
+++ /dev/null
@@ -1,367 +0,0 @@
-<?php
-/**
- * Tests for PMA_StorageEngine_innodb
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-
-use PMA\libraries\engines\Innodb;
-
-require_once 'libraries/database_interface.inc.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * Tests for PMA\libraries\engines\Innodb
- *
- * @package PhpMyAdmin-test
- */
-class InnodbTest extends PMATestCase
-{
-    /**
-     * @access protected
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function setUp()
-    {
-        $GLOBALS['server'] = 0;
-        $this->object = new Innodb('innodb');
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Test for getVariables
-     *
-     * @return void
-     */
-    public function testGetVariables()
-    {
-        $this->assertEquals(
-            array(
-                'innodb_data_home_dir' => array(
-                    'title' => __('Data home directory'),
-                    'desc'  => __('The common part of the directory path for all InnoDB data files.'),
-                ),
-                'innodb_data_file_path' => array(
-                    'title' => __('Data files'),
-                ),
-                'innodb_autoextend_increment' => array(
-                    'title' => __('Autoextend increment'),
-                    'desc'  => __('The increment size for extending the size of an autoextending tablespace when it becomes full.'),
-                    'type'  => 2,
-                ),
-                'innodb_buffer_pool_size' => array(
-                    'title' => __('Buffer pool size'),
-                    'desc'  => __('The size of the memory buffer InnoDB uses to cache data and indexes of its tables.'),
-                    'type'  => 1,
-                ),
-                'innodb_additional_mem_pool_size' => array(
-                    'title' => 'innodb_additional_mem_pool_size',
-                    'type'  => 1,
-                ),
-                'innodb_buffer_pool_awe_mem_mb' => array(
-                    'type'  => 1,
-                ),
-                'innodb_checksums' => array(
-                ),
-                'innodb_commit_concurrency' => array(
-                ),
-                'innodb_concurrency_tickets' => array(
-                    'type'  => 2,
-                ),
-                'innodb_doublewrite' => array(
-                ),
-                'innodb_fast_shutdown' => array(
-                ),
-                'innodb_file_io_threads' => array(
-                    'type'  => 2,
-                ),
-                'innodb_file_per_table' => array(
-                ),
-                'innodb_flush_log_at_trx_commit' => array(
-                ),
-                'innodb_flush_method' => array(
-                ),
-                'innodb_force_recovery' => array(
-                ),
-                'innodb_lock_wait_timeout' => array(
-                    'type'  => 2,
-                ),
-                'innodb_locks_unsafe_for_binlog' => array(
-                ),
-                'innodb_log_arch_dir' => array(
-                ),
-                'innodb_log_archive' => array(
-                ),
-                'innodb_log_buffer_size' => array(
-                    'type'  => 1,
-                ),
-                'innodb_log_file_size' => array(
-                    'type'  => 1,
-                ),
-                'innodb_log_files_in_group' => array(
-                    'type'  => 2,
-                ),
-                'innodb_log_group_home_dir' => array(
-                ),
-                'innodb_max_dirty_pages_pct' => array(
-                    'type'  => 2,
-                ),
-                'innodb_max_purge_lag' => array(
-                ),
-                'innodb_mirrored_log_groups' => array(
-                    'type'  => 2,
-                ),
-                'innodb_open_files' => array(
-                    'type'  => 2,
-                ),
-                'innodb_support_xa' => array(
-                ),
-                'innodb_sync_spin_loops' => array(
-                    'type'  => 2,
-                ),
-                'innodb_table_locks' => array(
-                    'type'  => 3,
-                ),
-                'innodb_thread_concurrency' => array(
-                    'type'  => 2,
-                ),
-                'innodb_thread_sleep_delay' => array(
-                    'type'  => 2,
-                ),
-            ),
-            $this->object->getVariables()
-        );
-    }
-
-    /**
-     * Test for getVariablesLikePattern
-     *
-     * @return void
-     */
-    public function testGetVariablesLikePattern()
-    {
-        $this->assertEquals(
-            'innodb\\_%',
-            $this->object->getVariablesLikePattern()
-        );
-    }
-
-    /**
-     * Test for getInfoPages
-     *
-     * @return void
-     */
-    public function testGetInfoPages()
-    {
-        $this->assertEquals(
-            array(),
-            $this->object->getInfoPages()
-        );
-        $this->object->support = 2;
-        $this->assertEquals(
-            array (
-                'Bufferpool' => 'Buffer Pool',
-                'Status' => 'InnoDB Status'
-            ),
-            $this->object->getInfoPages()
-        );
-    }
-
-    /**
-     * Test for getPageBufferpool
-     *
-     * @return void
-     */
-    public function testGetPageBufferpool()
-    {
-        $this->assertEquals(
-            '<table class="data" id="table_innodb_bufferpool_usage">
-    <caption class="tblHeaders">
-        Buffer Pool Usage
-    </caption>
-    <tfoot>
-        <tr>
-            <th colspan="2">
-                Total
-                : 4,096&nbsp;pages / 65,536&nbsp;KiB
-            </th>
-        </tr>
-    </tfoot>
-    <tbody>
-        <tr class="odd">
-            <th>Free pages</th>
-            <td class="value">0</td>
-        </tr>
-        <tr class="even">
-            <th>Dirty pages</th>
-            <td class="value">0</td>
-        </tr>
-        <tr class="odd">
-            <th>Pages containing data</th>
-            <td class="value">0
-</td>
-        </tr>
-        <tr class="even">
-            <th>Pages to be flushed</th>
-            <td class="value">0
-</td>
-        </tr>
-        <tr class="odd">
-            <th>Busy pages</th>
-            <td class="value">0
-</td>
-        </tr>    </tbody>
-</table>
-
-<table class="data" id="table_innodb_bufferpool_activity">
-    <caption class="tblHeaders">
-        Buffer Pool Activity
-    </caption>
-    <tbody>
-        <tr class="odd">
-            <th>Read requests</th>
-            <td class="value">64
-</td>
-        </tr>
-        <tr class="even">
-            <th>Write requests</th>
-            <td class="value">64
-</td>
-        </tr>
-        <tr class="odd">
-            <th>Read misses</th>
-            <td class="value">32
-</td>
-        </tr>
-        <tr class="even">
-            <th>Write waits</th>
-            <td class="value">0
-</td>
-        </tr>
-        <tr class="odd">
-            <th>Read misses in %</th>
-            <td class="value">50   %
-</td>
-        </tr>
-        <tr class="even">
-            <th>Write waits in %</th>
-            <td class="value">0 %
-</td>
-        </tr>
-    </tbody>
-</table>
-',
-            $this->object->getPageBufferpool()
-        );
-    }
-
-    /**
-     * Test for getPageStatus
-     *
-     * @return void
-     */
-    public function testGetPageStatus()
-    {
-        $this->assertEquals(
-            '<pre id="pre_innodb_status">' . "\n" . "\n" . '</pre>' . "\n",
-            $this->object->getPageStatus()
-        );
-
-    }
-
-    /**
-     * Test for getPage
-     *
-     * @return void
-     */
-    public function testGetPage()
-    {
-        $this->assertEquals(
-            '',
-            $this->object->getPage('Status')
-        );
-        $this->object->support = 2;
-        $this->assertEquals(
-            '<pre id="pre_innodb_status">' . "\n" . "\n" . '</pre>' . "\n",
-            $this->object->getPage('Status')
-        );
-    }
-
-    /**
-     * Test for getMysqlHelpPage
-     *
-     * @return void
-     */
-    public function testGetMysqlHelpPage()
-    {
-        $this->assertEquals(
-            'innodb-storage-engine',
-            $this->object->getMysqlHelpPage()
-        );
-
-    }
-
-    /**
-     * Test for getInnodbPluginVersion
-     *
-     * @return void
-     */
-    public function testGetInnodbPluginVersion()
-    {
-        $this->assertEquals(
-            '1.1.8',
-            $this->object->getInnodbPluginVersion()
-        );
-
-    }
-
-    /**
-     * Test for supportsFilePerTable
-     *
-     * @return void
-     */
-    public function testSupportsFilePerTable()
-    {
-        $this->assertFalse(
-            $this->object->supportsFilePerTable()
-        );
-
-    }
-
-    /**
-     * Test for getInnodbFileFormat
-     *
-     * @return void
-     */
-    public function testGetInnodbFileFormat()
-    {
-        $this->assertEquals(
-            'Antelope',
-            $this->object->getInnodbFileFormat()
-        );
-
-    }
-}
diff --git a/#pma/test/classes/engines/MemoryTest.php b/#pma/test/classes/engines/MemoryTest.php
deleted file mode 100644
index 22fc58f0..00000000
--- a/#pma/test/classes/engines/MemoryTest.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-/**
- * Tests for PMA_StorageEngine_memory
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-
-use PMA\libraries\engines\Memory;
-
-require_once 'libraries/database_interface.inc.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * Tests for PMA\libraries\engines\Memory
- *
- * @package PhpMyAdmin-test
- */
-class MemoryTest extends PMATestCase
-{
-    /**
-     * @access protected
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function setUp()
-    {
-        $GLOBALS['server'] = 0;
-        $this->object = new Memory('memory');
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Test for getVariables
-     *
-     * @return void
-     */
-    public function testGetVariables()
-    {
-        $this->assertEquals(
-            $this->object->getVariables(),
-            array(
-                'max_heap_table_size' => array(
-                                            'type'  => 1,
-                                         )
-                )
-        );
-    }
-}
diff --git a/#pma/test/classes/engines/Mrg_MyisamTest.php b/#pma/test/classes/engines/Mrg_MyisamTest.php
deleted file mode 100644
index c48981bd..00000000
--- a/#pma/test/classes/engines/Mrg_MyisamTest.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-/**
- * Tests for PMA\libraries\engines\Mrg_Myisam
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-
-use PMA\libraries\engines\Mrg_Myisam;
-
-require_once 'libraries/database_interface.inc.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * Tests for PMA\libraries\engines\Mrg_Myisam
- *
- * @package PhpMyAdmin-test
- */
-class Mrg_MyisamTest extends PMATestCase
-{
-    /**
-     * @access protected
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function setUp()
-    {
-        $GLOBALS['server'] = 0;
-        $this->object = new Mrg_Myisam('mrg_myisam');
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Test for getMysqlHelpPage
-     *
-     * @return void
-     */
-    public function testGetMysqlHelpPage()
-    {
-        $this->assertEquals(
-            $this->object->getMysqlHelpPage(),
-            'merge-storage-engine'
-        );
-
-    }
-}
diff --git a/#pma/test/classes/engines/MyisamTest.php b/#pma/test/classes/engines/MyisamTest.php
deleted file mode 100644
index 93f95568..00000000
--- a/#pma/test/classes/engines/MyisamTest.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-/**
- * Tests for PMA_StorageEngine_myisam
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-
-use PMA\libraries\engines\Myisam;
-
-require_once 'libraries/database_interface.inc.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * Tests for PMA\libraries\engines\Myisam
- *
- * @package PhpMyAdmin-test
- */
-class MyisamTest extends PMATestCase
-{
-    /**
-     * @access protected
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function setUp()
-    {
-        $GLOBALS['server'] = 0;
-        $this->object = new Myisam('myisam');
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Test for getVariables
-     *
-     * @return void
-     */
-    public function testGetVariables()
-    {
-        $this->assertEquals(
-            $this->object->getVariables(),
-            array(
-                'myisam_data_pointer_size' => array(
-                    'title' => __('Data pointer size'),
-                    'desc'  => __('The default pointer size in bytes, to be used by CREATE TABLE for MyISAM tables when no MAX_ROWS option is specified.'),
-                    'type'  => 1,
-                ),
-                'myisam_recover_options' => array(
-                    'title' => __('Automatic recovery mode'),
-                    'desc'  => __('The mode for automatic recovery of crashed MyISAM tables, as set via the --myisam-recover server startup option.'),
-                ),
-                'myisam_max_sort_file_size' => array(
-                    'title' => __('Maximum size for temporary sort files'),
-                    'desc'  => __('The maximum size of the temporary file MySQL is allowed to use while re-creating a MyISAM index (during REPAIR TABLE, ALTER TABLE, or LOAD DATA INFILE).'),
-                    'type'  => 1,
-                ),
-                'myisam_max_extra_sort_file_size' => array(
-                    'title' => __('Maximum size for temporary files on index creation'),
-                    'desc'  => __('If the temporary file used for fast MyISAM index creation would be larger than using the key cache by the amount specified here, prefer the key cache method.'),
-                    'type'  => 1,
-                ),
-                'myisam_repair_threads' => array(
-                    'title' => __('Repair threads'),
-                    'desc'  => __('If this value is greater than 1, MyISAM table indexes are created in parallel (each index in its own thread) during the repair by sorting process.'),
-                    'type'  => 2,
-                ),
-                'myisam_sort_buffer_size' => array(
-                    'title' => __('Sort buffer size'),
-                    'desc'  => __('The buffer that is allocated when sorting MyISAM indexes during a REPAIR TABLE or when creating indexes with CREATE INDEX or ALTER TABLE.'),
-                    'type'  => 1,
-                ),
-                'myisam_stats_method' => array(
-                ),
-                'delay_key_write' => array(
-                ),
-                'bulk_insert_buffer_size' => array(
-                    'type'  => 1,
-                ),
-                'skip_external_locking' => array(
-                ),
-            )
-        );
-    }
-
-
-}
diff --git a/#pma/test/classes/engines/NdbclusterTest.php b/#pma/test/classes/engines/NdbclusterTest.php
deleted file mode 100644
index 30da5c78..00000000
--- a/#pma/test/classes/engines/NdbclusterTest.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-/**
- * Tests for PMA_StorageEngine_ndbcluster
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-
-use PMA\libraries\engines\Ndbcluster;
-
-require_once 'libraries/database_interface.inc.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * Tests for PMA\libraries\engines\Ndbcluster
- *
- * @package PhpMyAdmin-test
- */
-class NdbclusterTest extends PMATestCase
-{
-    /**
-     * @access protected
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function setUp()
-    {
-        $GLOBALS['server'] = 0;
-        $this->object = new Ndbcluster('nbdcluster');
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Test for getVariables
-     *
-     * @return void
-     */
-    public function testGetVariables()
-    {
-        $this->assertEquals(
-            $this->object->getVariables(),
-            array(
-                'ndb_connectstring' => array(
-                ),
-            )
-        );
-    }
-
-    /**
-     * Test for getVariablesLikePattern
-     *
-     * @return void
-     */
-    public function testGetVariablesLikePattern()
-    {
-        $this->assertEquals(
-            $this->object->getVariablesLikePattern(),
-            'ndb\\_%'
-        );
-    }
-
-    /**
-     * Test for getMysqlHelpPage
-     *
-     * @return void
-     */
-    public function testGetMysqlHelpPage()
-    {
-        $this->assertEquals(
-            $this->object->getMysqlHelpPage(),
-            'ndbcluster'
-        );
-
-    }
-}
diff --git a/#pma/test/classes/engines/PbxtTest.php b/#pma/test/classes/engines/PbxtTest.php
deleted file mode 100644
index 110a6320..00000000
--- a/#pma/test/classes/engines/PbxtTest.php
+++ /dev/null
@@ -1,266 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Tests for PMA_StorageEngine_pbxt
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-
-use PMA\libraries\engines\Pbxt;
-
-require_once 'libraries/database_interface.inc.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * Tests for PMA\libraries\engines\Pbxt;
- *
- * @package PhpMyAdmin-test
- */
-class PbxtTest extends PMATestCase
-{
-    /**
-     * @access protected
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function setUp()
-    {
-        $GLOBALS['server'] = 0;
-        $this->object = new Pbxt('pbxt');
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Test for getVariables
-     *
-     * @return void
-     */
-    public function testGetVariables()
-    {
-        $this->assertEquals(
-            $this->object->getVariables(),
-            array(
-                'pbxt_index_cache_size' => array(
-                    'title' => __('Index cache size'),
-                    'desc'  => __(
-                        'This is the amount of memory allocated to the'
-                        . ' index cache. Default value is 32MB. The memory'
-                        . ' allocated here is used only for caching index pages.'
-                    ),
-                    'type'  => 1
-                ),
-                'pbxt_record_cache_size' => array(
-                    'title' => __('Record cache size'),
-                    'desc'  => __(
-                        'This is the amount of memory allocated to the'
-                        . ' record cache used to cache table data. The default'
-                        . ' value is 32MB. This memory is used to cache changes to'
-                        . ' the handle data (.xtd) and row pointer (.xtr) files.'
-                    ),
-                    'type'  => 1
-                ),
-                'pbxt_log_cache_size' => array(
-                    'title' => __('Log cache size'),
-                    'desc'  => __(
-                        'The amount of memory allocated to the'
-                        . ' transaction log cache used to cache on transaction log'
-                        . ' data. The default is 16MB.'
-                    ),
-                    'type'  => 1
-                ),
-                'pbxt_log_file_threshold' => array(
-                    'title' => __('Log file threshold'),
-                    'desc'  => __(
-                        'The size of a transaction log before rollover,'
-                        . ' and a new log is created. The default value is 16MB.'
-                    ),
-                    'type'  => 1
-                ),
-                'pbxt_transaction_buffer_size' => array(
-                    'title' => __('Transaction buffer size'),
-                    'desc'  => __(
-                        'The size of the global transaction log buffer'
-                        . ' (the engine allocates 2 buffers of this size).'
-                        . ' The default is 1MB.'
-                    ),
-                    'type'  => 1
-                ),
-                'pbxt_checkpoint_frequency' => array(
-                    'title' => __('Checkpoint frequency'),
-                    'desc'  => __(
-                        'The amount of data written to the transaction'
-                        . ' log before a checkpoint is performed.'
-                        . ' The default value is 24MB.'
-                    ),
-                    'type'  => 1
-                ),
-                'pbxt_data_log_threshold' => array(
-                    'title' => __('Data log threshold'),
-                    'desc'  => __(
-                        'The maximum size of a data log file. The default'
-                        . ' value is 64MB. PBXT can create a maximum of 32000 data'
-                        . ' logs, which are used by all tables. So the value of'
-                        . ' this variable can be increased to increase the total'
-                        . ' amount of data that can be stored in the database.'
-                    ),
-                    'type'  => 1
-                ),
-                'pbxt_garbage_threshold' => array(
-                    'title' => __('Garbage threshold'),
-                    'desc'  => __(
-                        'The percentage of garbage in a data log file'
-                        . ' before it is compacted. This is a value between 1 and'
-                        . ' 99. The default is 50.'
-                    ),
-                    'type'  => 2
-                ),
-                'pbxt_log_buffer_size' => array(
-                    'title' => __('Log buffer size'),
-                    'desc'  => __(
-                        'The size of the buffer used when writing a data'
-                        . ' log. The default is 256MB. The engine allocates one'
-                        . ' buffer per thread, but only if the thread is required'
-                        . ' to write a data log.'
-                    ),
-                    'type'  => 1
-                ),
-                'pbxt_data_file_grow_size' => array(
-                    'title' => __('Data file grow size'),
-                    'desc'  => __('The grow size of the handle data (.xtd) files.'),
-                    'type'  => 1
-                ),
-                'pbxt_row_file_grow_size' => array(
-                    'title' => __('Row file grow size'),
-                    'desc'  => __('The grow size of the row pointer (.xtr) files.'),
-                    'type'  => 1
-                ),
-                'pbxt_log_file_count' => array(
-                    'title' => __('Log file count'),
-                    'desc'  => __(
-                        'This is the number of transaction log files'
-                        . ' (pbxt/system/xlog*.xt) the system will maintain. If the'
-                        . ' number of logs exceeds this value then old logs will be'
-                        . ' deleted, otherwise they are renamed and given the next'
-                        . ' highest number.'
-                    ),
-                    'type'  => 2
-                ),
-            )
-        );
-    }
-
-    /**
-     * Test for resolveTypeSize
-     *
-     * @param string $formatted_size the size expression (for example 8MB)
-     * @param string $output         Expected output
-     *
-     * @dataProvider providerFortTestResolveTypeSize
-     *
-     * @return void
-     */
-    public function testResolveTypeSize($formatted_size, $output)
-    {
-        $this->assertEquals(
-            $this->object->resolveTypeSize($formatted_size),
-            $output
-        );
-    }
-
-    /**
-     * Provider for testResolveTypeSize
-     *
-     * @return array
-     */
-    public function providerFortTestResolveTypeSize()
-    {
-        return array(
-            array(
-                '8MB',
-                array (
-                    0 => '8,192',
-                    1 => 'KiB'
-                )
-            ),
-            array(
-                '10mb',
-                array (
-                    0 => '-1',
-                    1 => 'B'
-                )
-            ),
-            array(
-                'A4',
-                array (
-                    0 => '0',
-                    1 => 'B'
-                )
-            )
-        );
-    }
-
-    /**
-     * Test for getInfoPages
-     *
-     * @return void
-     */
-    public function testGetInfoPages()
-    {
-        $this->assertEquals(
-            $this->object->getInfoPages(),
-            array(
-                'Documentation' => 'Documentation'
-            )
-        );
-    }
-
-    /**
-     * Test for getPage
-     *
-     * @return void
-     */
-    public function testGetPage()
-    {
-        $this->assertEquals(
-            $this->object->getPage('Documentation'),
-            '<p>'
-            . sprintf(
-                __(
-                    'Documentation and further information about PBXT'
-                    . ' can be found on the %sPrimeBase XT Home Page%s.'
-                ),
-                '<a href="' . PMA_linkURL('https://mariadb.com/kb/en/mariadb/about-pbxt/')
-                . '" rel="noopener noreferrer" target="_blank">',
-                '</a>'
-            )
-            . '</p>' . "\n"
-        );
-
-        $this->assertEquals(
-            $this->object->getPage('NonExistMethod'),
-            false
-        );
-    }
-}
diff --git a/#pma/test/classes/gis/GISFactoryTest.php b/#pma/test/classes/gis/GISFactoryTest.php
deleted file mode 100644
index 5a1a924d..00000000
--- a/#pma/test/classes/gis/GISFactoryTest.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Test for PMA\libraries\gis\GISFactory
- *
- * @package PhpMyAdmin-test
- */
-use PMA\libraries\gis\GISFactory;
-
-/**
- * Test class for PMA\libraries\gis\GISFactory
- *
- * @package PhpMyAdmin-test
- */
-class GISFactoryTest extends PHPUnit_Framework_TestCase
-{
-
-    /**
-     * Test factory method
-     *
-     * @param string $type geometry type
-     * @param object $geom geometry object
-     *
-     * @dataProvider providerForTestFactory
-     * @return void
-     */
-    public function testFactory($type, $geom)
-    {
-        $this->assertInstanceOf($geom, GISFactory::factory($type));
-    }
-
-    /**
-     * data provider for testFactory
-     *
-     * @return data for testFactory
-     */
-    public function providerForTestFactory()
-    {
-        return array(
-            array(
-                'MULTIPOLYGON',
-                'PMA\libraries\gis\GISMultipolygon'
-            ),
-            array(
-                'POLYGON',
-                'PMA\libraries\gis\GISPolygon'
-            ),
-            array(
-                'MULTILINESTRING',
-                'PMA\libraries\gis\GISMultilinestring'
-            ),
-            array(
-                'LINESTRING',
-                'PMA\libraries\gis\GISLinestring'
-            ),
-            array(
-                'MULTIPOINT',
-                'PMA\libraries\gis\GISMultipoint'
-            ),
-            array(
-                'POINT',
-                'PMA\libraries\gis\GISPoint'
-            ),
-            array(
-                'GEOMETRYCOLLECTION',
-                'PMA\libraries\gis\GISGeometrycollection'
-            ),
-        );
-    }
-}
diff --git a/#pma/test/classes/gis/GISGeomTest.php b/#pma/test/classes/gis/GISGeomTest.php
deleted file mode 100644
index e303bd81..00000000
--- a/#pma/test/classes/gis/GISGeomTest.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Abstract parent class for all PMA_GIS_<Geom_type> test classes
- *
- * @package PhpMyAdmin-test
- */
-
-/**
- * Abstract parent class for all GIS<Geom_type> test classes
- *
- * @package PhpMyAdmin-test
- */
-abstract class GISGeomTest extends PHPUnit_Framework_TestCase
-{
-
-    /**
-     * test generateParams method
-     *
-     * @param string $wkt    point in WKT form
-     * @param int    $index  index
-     * @param array  $params expected output array
-     *
-     * @dataProvider providerForTestGenerateParams
-     * @return void
-     */
-    public function testGenerateParams($wkt, $index, $params)
-    {
-        if ($index == null) {
-            $this->assertEquals(
-                $params,
-                $this->object->generateParams($wkt)
-            );
-        } else {
-            $this->assertEquals(
-                $params,
-                $this->object->generateParams($wkt, $index)
-            );
-        }
-    }
-
-    /**
-     * test scaleRow method
-     *
-     * @param string $spatial spatial data of a row
-     * @param array  $min_max expected results
-     *
-     * @dataProvider providerForTestScaleRow
-     * @return void
-     */
-    public function testScaleRow($spatial, $min_max)
-    {
-        $this->assertEquals(
-            $min_max,
-            $this->object->scaleRow($spatial)
-        );
-    }
-
-    /**
-     * Tests whether content is a valid image.
-     *
-     * @param object $object Image
-     *
-     * @return void
-     */
-    public function assertImage($object)
-    {
-        $this->assertGreaterThan(0, imagesx($object));
-    }
-}
diff --git a/#pma/test/classes/gis/GISGeometryTest.php b/#pma/test/classes/gis/GISGeometryTest.php
deleted file mode 100644
index d21b5596..00000000
--- a/#pma/test/classes/gis/GISGeometryTest.php
+++ /dev/null
@@ -1,340 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Test for PMA\libraries\gis\GISGeometry
- *
- * @package PhpMyAdmin-test
- */
-
-/**
- * Tests for PMA\libraries\gis\GISGeometry class
- *
- * @package PhpMyAdmin-test
- */
-class GISGeometryTest extends PHPUnit_Framework_TestCase
-{
-    /**
-     * @access protected
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function setUp()
-    {
-        $this->object = $this->getMockForAbstractClass('PMA\libraries\gis\GISGeometry');
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Call protected functions by making the visibility to public.
-     *
-     * @param string $name   method name
-     * @param array  $params parameters for the invocation
-     *
-     * @return the output from the protected method.
-     */
-    private function _callProtectedFunction($name, $params)
-    {
-        $class = new ReflectionClass('PMA\libraries\gis\GISGeometry');
-        $method = $class->getMethod($name);
-        $method->setAccessible(true);
-        return $method->invokeArgs($this->object, $params);
-    }
-
-    /**
-     * tests setMinMax method
-     *
-     * @param string $point_set Point set
-     * @param array  $min_max   Existing min, max values
-     * @param array  $output    Expected output array
-     *
-     * @dataProvider providerForTestSetMinMax
-     * @return void
-     */
-    public function testSetMinMax($point_set, $min_max, $output)
-    {
-        $this->assertEquals(
-            $this->_callProtectedFunction(
-                'setMinMax',
-                array($point_set, $min_max)
-            ),
-            $output
-        );
-    }
-
-    /**
-     * data provider for testSetMinMax
-     *
-     * @return data for testSetMinMax
-     */
-    public function providerForTestSetMinMax()
-    {
-        return array(
-            array(
-                '12 35,48 75,69 23,25 45,14 53,35 78',
-                array(),
-                array(
-                    'minX' => 12,
-                    'maxX' => 69,
-                    'minY' => 23,
-                    'maxY' => 78
-                )
-            ),
-            array(
-                '12 35,48 75,69 23,25 45,14 53,35 78',
-                array(
-                    'minX' => 2,
-                    'maxX' => 29,
-                    'minY' => 23,
-                    'maxY' => 128
-                ),
-                array(
-                    'minX' => 2,
-                    'maxX' => 69,
-                    'minY' => 23,
-                    'maxY' => 128
-                )
-            )
-        );
-    }
-
-    /**
-     * tests generateParams method
-     *
-     * @param string $value  Geometry data
-     * @param string $output Expected output
-     *
-     * @dataProvider providerForTestGenerateParams
-     * @return void
-     */
-    public function testGenerateParams($value, $output)
-    {
-        $this->assertEquals(
-            $this->_callProtectedFunction(
-                'generateParams',
-                array($value)
-            ),
-            $output
-        );
-    }
-
-    /**
-     * data provider for testGenerateParams
-     *
-     * @return data for testGenerateParams
-     */
-    public function providerForTestGenerateParams()
-    {
-        return array(
-            array(
-                "'MULTIPOINT(125 50,156 25,178 43,175 80)',125",
-                array(
-                    'srid' => '125',
-                    'wkt'  => 'MULTIPOINT(125 50,156 25,178 43,175 80)',
-                ),
-            ),
-            array(
-                'MULTIPOINT(125 50,156 25,178 43,175 80)',
-                array(
-                    'srid' => '0',
-                    'wkt'  => 'MULTIPOINT(125 50,156 25,178 43,175 80)',
-                ),
-            ),
-            array(
-                "foo",
-                array(
-                    'srid' => '0',
-                    'wkt'  => '',
-                ),
-            ),
-        );
-    }
-
-    /**
-     * tests extractPoints method
-     *
-     * @param string  $point_set  String of comma separated points
-     * @param array   $scale_data Data related to scaling
-     * @param boolean $linear     If true, as a 1D array, else as a 2D array
-     * @param array   $output     Expected output
-     *
-     * @dataProvider providerForTestExtractPoints
-     * @return void
-     */
-    public function testExtractPoints($point_set, $scale_data, $linear, $output)
-    {
-        $this->assertEquals(
-            $this->_callProtectedFunction(
-                'extractPoints',
-                array($point_set, $scale_data, $linear)
-            ),
-            $output
-        );
-    }
-
-    /**
-     * data provider for testExtractPoints
-     *
-     * @return data for testExtractPoints
-     */
-    public function providerForTestExtractPoints()
-    {
-        return array(
-            // with no scale data
-            array(
-                '12 35,48 75,69 23',
-                null,
-                false,
-                array(
-                    0 => array(12, 35),
-                    1 => array(48, 75),
-                    2 => array(69, 23),
-                ),
-            ),
-            // with scale data
-            array(
-                '12 35,48 75,69 23',
-                array(
-                    'x'      => 5,
-                    'y'      => 5,
-                    'scale'  => 2,
-                    'height' => 200,
-                ),
-                false,
-                array(
-                    0 => array(14, 140),
-                    1 => array(86, 60),
-                    2 => array(128, 164),
-                ),
-            ),
-            // linear output
-            array(
-                '12 35,48 75,69 23',
-                null,
-                true,
-                array(12, 35, 48, 75, 69, 23),
-            ),
-            // if a single part of a coordinate is empty
-            array(
-                '12 35,48 75,69 ',
-                null,
-                false,
-                array(
-                    0 => array(12, 35),
-                    1 => array(48, 75),
-                    2 => array('', ''),
-                ),
-            ),
-        );
-    }
-
-    /**
-     * test case for getBoundsForOl() method
-     *
-     * @param string $srid       spatial reference ID
-     * @param array  $scale_data data related to scaling
-     * @param string $output     expected output
-     *
-     * @return void
-     * @dataProvider providerForTestGetBoundsForOl
-     */
-    public function testGetBoundsForOl($srid, $scale_data, $output)
-    {
-        $this->assertEquals(
-            $this->_callProtectedFunction(
-                'getBoundsForOl',
-                array($srid, $scale_data)
-            ),
-            $output
-        );
-    }
-
-    /**
-     * data provider for testGetBoundsForOl() test case
-     *
-     * @return array test data for the testGetBoundsForOl() test case
-     */
-    public function providerForTestGetBoundsForOl()
-    {
-        return array(
-            array(
-                4326,
-                array(
-                    'minX' => '0',
-                    'minY' => '0',
-                    'maxX' => '1',
-                    'maxY' => '1',
-                ),
-                'bound = new OpenLayers.Bounds(); '
-                    . 'bound.extend(new OpenLayers.LonLat(0, 0).transform('
-                    . 'new OpenLayers.Projection("EPSG:4326"), '
-                    . 'map.getProjectionObject())); '
-                    . 'bound.extend(new OpenLayers.LonLat(1, 1).transform('
-                    . 'new OpenLayers.Projection("EPSG:4326"), '
-                    . 'map.getProjectionObject()));'
-            )
-
-        );
-    }
-
-    /**
-     * test case for getPolygonArrayForOpenLayers() method
-     *
-     * @param array  $polygons x and y coordinate pairs for each polygon
-     * @param string $srid     spatial reference id
-     * @param string $output   expected output
-     *
-     * @return void
-     * @dataProvider providerForTestGetPolygonArrayForOpenLayers
-     */
-    public function testGetPolygonArrayForOpenLayers($polygons, $srid, $output)
-    {
-        $this->assertEquals(
-            $this->_callProtectedFunction(
-                'getPolygonArrayForOpenLayers',
-                array($polygons, $srid)
-            ),
-            $output
-        );
-    }
-
-    /**
-     * data provider for testGetPolygonArrayForOpenLayers() test case
-     *
-     * @return array test data for testGetPolygonArrayForOpenLayers() test case
-     */
-    public function providerForTestGetPolygonArrayForOpenLayers()
-    {
-        return array(
-            array(
-                array('Triangle'),
-                4326,
-                'new Array('
-                    . 'new OpenLayers.Geometry.Polygon('
-                    . 'new Array('
-                    . 'new OpenLayers.Geometry.LinearRing('
-                    . 'new Array('
-                    . '(new OpenLayers.Geometry.Point(,)).transform('
-                    . 'new OpenLayers.Projection("EPSG:4326"), '
-                    . 'map.getProjectionObject()))))))'
-            )
-        );
-    }
-}
diff --git a/#pma/test/classes/gis/GISGeometrycollectionTest.php b/#pma/test/classes/gis/GISGeometrycollectionTest.php
deleted file mode 100644
index 9a49cd20..00000000
--- a/#pma/test/classes/gis/GISGeometrycollectionTest.php
+++ /dev/null
@@ -1,405 +0,0 @@
-<?php
-
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Test for PMA\libraries\gis\GISGeometry
- *
- * @package PhpMyAdmin-test
- */
-use PMA\libraries\gis\GISGeometrycollection;
-
-require_once 'libraries/tcpdf/tcpdf.php';
-
-/**
- * Tests for PMA\libraries\gis\GISGeometrycollection class
- *
- * @package PhpMyAdmin-test
- */
-class GISGeometryCollectionTest extends PHPUnit_Framework_TestCase
-{
-
-    /**
-     * @access protected
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function setUp()
-    {
-        $this->object = GISGeometrycollection::singleton();
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Test for scaleRow
-     *
-     * @param string $spatial string to parse
-     * @param array  $output  expected parsed output
-     *
-     * @return void
-     *
-     * @dataProvider providerForScaleRow
-     */
-    public function testScaleRow($spatial, $output)
-    {
-        $this->assertEquals($output, $this->object->scaleRow($spatial));
-    }
-
-    /**
-     * Data provider for testScaleRow() test case
-     *
-     * @return array test data for testScaleRow() test case
-     */
-    public function providerForScaleRow()
-    {
-        return array(
-            array(
-                'GEOMETRYCOLLECTION(POLYGON((35 10,10 20,15 40,45 45,35 10),'
-                    . '(20 30,35 32,30 20,20 30)))',
-                array(
-                    'maxX' => 45.0,
-                    'minX' => 10.0,
-                    'maxY' => 45.0,
-                    'minY' => 10.0
-                )
-            )
-        );
-    }
-
-    /**
-     * Test for generateWkt
-     *
-     * @param array   $gis_data array of GIS data
-     * @param integer $index    index in $gis_data
-     * @param string  $empty    empty parameter
-     * @param string  $output   expected output
-     *
-     * @return void
-     *
-     * @dataProvider providerForGenerateWkt
-     */
-    public function testGenerateWkt($gis_data, $index, $empty, $output)
-    {
-        $this->assertEquals(
-            $output,
-            $this->object->generateWkt($gis_data, $index, $empty)
-        );
-    }
-
-    /**
-     * Data provider for testGenerateWkt() test case
-     *
-     * @return array test data for testGenerateWkt() test case
-     */
-    public function providerForGenerateWkt()
-    {
-        $temp1 = array(
-            0 => array(
-                'gis_type' => 'LINESTRING',
-                'LINESTRING' => array(
-                    'no_of_points' => 2,
-                    0 => array('x' => 5.02, 'y' => 8.45),
-                    1 => array('x' => 6.14, 'y' => 0.15)
-                )
-            )
-        );
-
-        return array(
-            array(
-                $temp1,
-                0,
-                null,
-                'GEOMETRYCOLLECTION(LINESTRING(5.02 8.45,6.14 0.15))'
-            )
-        );
-    }
-
-    /**
-     * Test for generateParams
-     *
-     * @param string $value  string to parse
-     * @param array  $output expected parsed output
-     *
-     * @return void
-     *
-     * @dataProvider providerForGenerateParams
-     */
-    public function testGenerateParams($value, $output)
-    {
-        $this->assertEquals($output, $this->object->generateParams($value));
-    }
-
-    /**
-     * Data provider for testGenerateParams() test case
-     *
-     * @return array test data for testGenerateParams() test case
-     */
-    public function providerForGenerateParams()
-    {
-        return array(
-            array(
-                'GEOMETRYCOLLECTION(LINESTRING(5.02 8.45,6.14 0.15))',
-                array(
-                    'srid' => 0,
-                    'GEOMETRYCOLLECTION' => array('geom_count' => 1),
-                    '0' => array(
-                        'gis_type' => 'LINESTRING',
-                        'LINESTRING' => array(
-                            'no_of_points' => 2,
-                            '0' => array(
-                                'x' => 5.02,
-                                'y' => 8.45
-                            ),
-                            '1' => array(
-                                'x' => 6.14,
-                                'y' => 0.15
-                            )
-                        )
-                    )
-                ),
-            ),
-        );
-    }
-
-    /**
-     * Test for prepareRowAsPng
-     *
-     * @param string   $spatial    string to parse
-     * @param string   $label      field label
-     * @param string   $line_color line color
-     * @param array    $scale_data scaling parameters
-     * @param resource $image      initial image
-     *
-     * @return void
-     *
-     * @dataProvider providerForPrepareRowAsPng
-     */
-    public function testPrepareRowAsPng(
-        $spatial, $label, $line_color, $scale_data, $image
-    ) {
-        $return = $this->object->prepareRowAsPng(
-            $spatial, $label, $line_color, $scale_data, $image
-        );
-        $this->assertEquals(120, imagesx($return));
-        $this->assertEquals(150, imagesy($return));
-    }
-
-    /**
-     * Data provider for testPrepareRowAsPng() test case
-     *
-     * @return array test data for testPrepareRowAsPng() test case
-     */
-    public function providerForPrepareRowAsPng()
-    {
-        return array(
-            array(
-                'GEOMETRYCOLLECTION(POLYGON((35 10,10 20,15 40,45 45,35 10),'
-                    . '(20 30,35 32,30 20,20 30)))',
-                'image',
-                '#B02EE0',
-                array(
-                    'x' => 12,
-                    'y' => 69,
-                    'scale' => 2,
-                    'height' => 150
-                ),
-                imagecreatetruecolor('120', '150')
-            )
-        );
-    }
-
-    /**
-     * Test for prepareRowAsPdf
-     *
-     * @param string $spatial    string to parse
-     * @param string $label      field label
-     * @param string $line_color line color
-     * @param array  $scale_data scaling parameters
-     * @param string $pdf        expected output
-     *
-     * @return void
-     *
-     * @dataProvider providerForPrepareRowAsPdf
-     */
-    public function testPrepareRowAsPdf(
-        $spatial, $label, $line_color, $scale_data, $pdf
-    ) {
-        $return = $this->object->prepareRowAsPdf(
-            $spatial, $label, $line_color, $scale_data, $pdf
-        );
-        $this->assertInstanceOf('TCPDF', $return);
-    }
-
-    /**
-     * Data provider for testPrepareRowAsPdf() test case
-     *
-     * @return array test data for testPrepareRowAsPdf() test case
-     */
-    public function providerForPrepareRowAsPdf()
-    {
-        return array(
-            array(
-                'GEOMETRYCOLLECTION(POLYGON((35 10,10 20,15 40,45 45,35 10),'
-                    . '(20 30,35 32,30 20,20 30)))',
-                'pdf',
-                '#B02EE0',
-                array(
-                    'x' => 12,
-                    'y' => 69,
-                    'scale' => 2,
-                    'height' => 150
-                ),
-                new \TCPDF(),
-            )
-        );
-    }
-
-    /**
-     * Test for prepareRowAsSvg
-     *
-     * @param string $spatial    string to parse
-     * @param string $label      field label
-     * @param string $line_color line color
-     * @param array  $scale_data scaling parameters
-     * @param string $output     expected output
-     *
-     * @return void
-     *
-     * @dataProvider providerForPrepareRowAsSvg
-     */
-    public function testPrepareRowAsSvg(
-        $spatial, $label, $line_color, $scale_data, $output
-    ) {
-        $string = $this->object->prepareRowAsSvg(
-            $spatial, $label, $line_color, $scale_data
-        );
-        $this->assertEquals(1, preg_match($output, $string));
-        $this->assertRegExp(
-            $output,
-            $this->object->prepareRowAsSvg(
-                $spatial, $label, $line_color, $scale_data
-            )
-        );
-    }
-
-    /**
-     * Data provider for testPrepareRowAsSvg() test case
-     *
-     * @return array test data for testPrepareRowAsSvg() test case
-     */
-    public function providerForPrepareRowAsSvg()
-    {
-        return array(
-            array(
-                'GEOMETRYCOLLECTION(POLYGON((35 10,10 20,15 40,45 45,35 10),'
-                    . '(20 30,35 32,30 20,20 30)))',
-                'svg',
-                '#B02EE0',
-                array(
-                    'x' => 12,
-                    'y' => 69,
-                    'scale' => 2,
-                    'height' => 150
-                ),
-                '/^(<path d=" M 46, 268 L -4, 248 L 6, 208 L 66, 198 Z  M 16,'
-                    . ' 228 L 46, 224 L 36, 248 Z " name="svg" id="svg)(\d+)'
-                    . '(" class="polygon vector" stroke="black" stroke-width="0.5"'
-                    . ' fill="#B02EE0" fill-rule="evenodd" fill-opacity="0.8"\/>)$/'
-            )
-        );
-    }
-
-    /**
-     * Test for prepareRowAsOl
-     *
-     * @param string  $spatial    string to parse
-     * @param integer $srid       SRID
-     * @param string  $label      field label
-     * @param string  $line_color line color
-     * @param array   $scale_data scaling parameters
-     * @param string  $output     expected output
-     *
-     * @return void
-     *
-     * @dataProvider providerForPrepareRowAsOl
-     */
-    public function testPrepareRowAsOl(
-        $spatial, $srid, $label, $line_color, $scale_data, $output
-    ) {
-        $this->assertEquals(
-            $output,
-            $this->object->prepareRowAsOl(
-                $spatial, $srid, $label, $line_color, $scale_data
-            )
-        );
-    }
-
-    /**
-     * Data provider for testPrepareRowAsOl() test case
-     *
-     * @return array test data for testPrepareRowAsOl() test case
-     */
-    public function providerForPrepareRowAsOl()
-    {
-        return array(
-            array(
-                'GEOMETRYCOLLECTION(POLYGON((35 10,10 20,15 40,45 45,35 10),'
-                    . '(20 30,35 32,30 20,20 30)))',
-                4326,
-                'Ol',
-                '#B02EE0',
-                array(
-                    'minX' => '0',
-                    'minY' => '0',
-                    'maxX' => '1',
-                    'maxY' => '1',
-                ),
-                'bound = new OpenLayers.Bounds(); bound.extend(new OpenLayers.'
-                . 'LonLat(0, 0).transform(new OpenLayers.Projection("EPSG:4326'
-                . '"), map.getProjectionObject())); bound.extend(new OpenLayer'
-                . 's.LonLat(1, 1).transform(new OpenLayers.Projection("EPSG:43'
-                . '26"), map.getProjectionObject()));vectorLayer.addFeatures(n'
-                . 'ew OpenLayers.Feature.Vector(new OpenLayers.Geometry.Polygo'
-                . 'n(new Array(new OpenLayers.Geometry.LinearRing(new Array((n'
-                . 'ew OpenLayers.Geometry.Point(35,10)).transform(new OpenLaye'
-                . 'rs.Projection("EPSG:4326"), map.getProjectionObject()), (ne'
-                . 'w OpenLayers.Geometry.Point(10,20)).transform(new OpenLayer'
-                . 's.Projection("EPSG:4326"), map.getProjectionObject()), (new'
-                . ' OpenLayers.Geometry.Point(15,40)).transform(new OpenLayers.'
-                . 'Projection("EPSG:4326"), map.getProjectionObject()), (new O'
-                . 'penLayers.Geometry.Point(45,45)).transform(new OpenLayers.P'
-                . 'rojection("EPSG:4326"), map.getProjectionObject()), (new Op'
-                . 'enLayers.Geometry.Point(35,10)).transform(new OpenLayers.Pr'
-                . 'ojection("EPSG:4326"), map.getProjectionObject()))), new Op'
-                . 'enLayers.Geometry.LinearRing(new Array((new OpenLayers.Geom'
-                . 'etry.Point(20,30)).transform(new OpenLayers.Projection("EPS'
-                . 'G:4326"), map.getProjectionObject()), (new OpenLayers.Geome'
-                . 'try.Point(35,32)).transform(new OpenLayers.Projection("EPSG'
-                . ':4326"), map.getProjectionObject()), (new OpenLayers.Geomet'
-                . 'ry.Point(30,20)).transform(new OpenLayers.Projection("EPSG:'
-                . '4326"), map.getProjectionObject()), (new OpenLayers.Geometry'
-                . '.Point(20,30)).transform(new OpenLayers.Projection("EPSG:43'
-                . '26"), map.getProjectionObject()))))), null, {"strokeColor":'
-                . '"#000000","strokeWidth":0.5,"fillColor":"#B02EE0","fillOpac'
-                . 'ity":0.8,"label":"Ol","fontSize":10}));'
-            )
-        );
-    }
-}
diff --git a/#pma/test/classes/gis/GISLinestringTest.php b/#pma/test/classes/gis/GISLinestringTest.php
deleted file mode 100644
index a5322adc..00000000
--- a/#pma/test/classes/gis/GISLinestringTest.php
+++ /dev/null
@@ -1,366 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Test for PMA\libraries\gis\GISLinestring
- *
- * @package PhpMyAdmin-test
- */
-
-use PMA\libraries\gis\GISLinestring;
-
-require_once 'GISGeomTest.php';
-require_once 'libraries/tcpdf/tcpdf.php';
-
-/**
- * Tests for PMA\libraries\gis\GISLinestring class
- *
- * @package PhpMyAdmin-test
- */
-class GISLinestringTest extends GISGeomTest
-{
-    /**
-     * @var    GISLinestring
-     * @access protected
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function setUp()
-    {
-        $this->object = GISLinestring::singleton();
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * data provider for testGenerateWkt
-     *
-     * @return data for testGenerateWkt
-     */
-    public function providerForTestGenerateWkt()
-    {
-        $temp1 = array(
-            0 => array(
-                'LINESTRING' => array(
-                    'no_of_points' => 2,
-                    0 => array('x' => 5.02, 'y' => 8.45),
-                    1 => array('x' => 6.14, 'y' => 0.15)
-                )
-            )
-        );
-
-        $temp2 = $temp1;
-        $temp2[0]['LINESTRING']['no_of_points'] = 3;
-        $temp2[0]['LINESTRING'][2] = array('x' => 1.56);
-
-        $temp3 = $temp2;
-        $temp3[0]['LINESTRING']['no_of_points'] = -1;
-
-        $temp4 = $temp3;
-        $temp4[0]['LINESTRING']['no_of_points'] = 3;
-        unset($temp4[0]['LINESTRING'][2]['x']);
-
-        return array(
-            array(
-                $temp1,
-                0,
-                null,
-                'LINESTRING(5.02 8.45,6.14 0.15)'
-            ),
-            // if a coordinate is missing, default is empty string
-            array(
-                $temp2,
-                0,
-                null,
-                'LINESTRING(5.02 8.45,6.14 0.15,1.56 )'
-            ),
-            // if no_of_points is not valid, it is considered as 2
-            array(
-                $temp3,
-                0,
-                null,
-                'LINESTRING(5.02 8.45,6.14 0.15)'
-            ),
-            // missing coordinates are replaced with provided values (3rd parameter)
-            array(
-                $temp4,
-                0,
-                '0',
-                'LINESTRING(5.02 8.45,6.14 0.15,0 0)'
-            )
-        );
-    }
-
-    /**
-     * data provider for testGenerateParams
-     *
-     * @return data for testGenerateParams
-     */
-    public function providerForTestGenerateParams()
-    {
-        $temp = array(
-            'LINESTRING' => array(
-                'no_of_points' => 2,
-                0 => array('x' => '5.02', 'y' => '8.45'),
-                1 => array('x' => '6.14', 'y' => '0.15')
-            )
-        );
-        $temp1 = $temp;
-        $temp1['gis_type'] = 'LINESTRING';
-
-        return array(
-            array(
-                "'LINESTRING(5.02 8.45,6.14 0.15)',124",
-                null,
-                array(
-                    'srid' => '124',
-                    0 => $temp
-                )
-            ),
-            array(
-                'LINESTRING(5.02 8.45,6.14 0.15)',
-                2,
-                array(
-                    2 => $temp1
-                )
-            )
-        );
-    }
-
-    /**
-     * data provider for testScaleRow
-     *
-     * @return data for testScaleRow
-     */
-    public function providerForTestScaleRow()
-    {
-        return array(
-            array(
-                'LINESTRING(12 35,48 75,69 23,25 45,14 53,35 78)',
-                array(
-                    'minX' => 12,
-                    'maxX' => 69,
-                    'minY' => 23,
-                    'maxY' => 78
-                )
-            )
-        );
-    }
-
-    /**
-     * test case for prepareRowAsPng() method
-     *
-     * @param string $spatial    GIS LINESTRING object
-     * @param string $label      label for the GIS LINESTRING object
-     * @param string $line_color color for the GIS LINESTRING object
-     * @param array  $scale_data array containing data related to scaling
-     * @param object $image      image object
-     *
-     * @dataProvider providerForPrepareRowAsPng
-     * @return void
-     */
-    public function testPrepareRowAsPng($spatial, $label, $line_color,
-        $scale_data, $image
-    ) {
-        $this->object->prepareRowAsPng(
-            $spatial, $label, $line_color, $scale_data, $image
-        );
-        /* TODO: this never fails */
-        $this->assertTrue(true);
-    }
-
-    /**
-     * data provider for testPrepareRowAsPng() test case
-     *
-     * @return array test data for testPrepareRowAsPng() test case
-     */
-    public function providerForPrepareRowAsPng()
-    {
-        return array(
-            array(
-                'LINESTRING(12 35,48 75,69 23,25 45,14 53,35 78)',
-                'image',
-                '#B02EE0',
-                array(
-                    'x' => 12,
-                    'y' => 69,
-                    'scale' => 2,
-                    'height' => 150
-                ),
-                imagecreatetruecolor('120', '150')
-            )
-        );
-    }
-
-    /**
-     * test case for prepareRowAsPdf() method
-     *
-     * @param string $spatial    GIS LINESTRING object
-     * @param string $label      label for the GIS LINESTRING object
-     * @param string $line_color color for the GIS LINESTRING object
-     * @param array  $scale_data array containing data related to scaling
-     * @param object $pdf        TCPDF instance
-     *
-     * @dataProvider providerForPrepareRowAsPdf
-     * @return void
-     */
-    public function testPrepareRowAsPdf($spatial, $label, $line_color,
-        $scale_data, $pdf
-    ) {
-        $return = $this->object->prepareRowAsPdf(
-            $spatial, $label, $line_color, $scale_data, $pdf
-        );
-        $this->assertInstanceOf('TCPDF', $return);
-    }
-
-    /**
-     * data provider for testPrepareRowAsPdf() test case
-     *
-     * @return array test data for testPrepareRowAsPdf() test case
-     */
-    public function providerForPrepareRowAsPdf()
-    {
-        return array(
-            array(
-                'LINESTRING(12 35,48 75,69 23,25 45,14 53,35 78)',
-                'pdf',
-                '#B02EE0',
-                array(
-                    'x' => 12,
-                    'y' => 69,
-                    'scale' => 2,
-                    'height' => 150
-                ),
-                new TCPDF(),
-            )
-        );
-    }
-
-    /**
-     * test case for prepareRowAsSvg() method
-     *
-     * @param string $spatial    GIS LINESTRING object
-     * @param string $label      label for the GIS LINESTRING object
-     * @param string $line_color color for the GIS LINESTRING object
-     * @param array  $scale_data array containing data related to scaling
-     * @param string $output     expected output
-     *
-     * @dataProvider providerForPrepareRowAsSvg
-     * @return void
-     */
-    public function testPrepareRowAsSvg($spatial, $label, $line_color,
-        $scale_data, $output
-    ) {
-        $string = $this->object->prepareRowAsSvg(
-            $spatial, $label, $line_color, $scale_data
-        );
-        $this->assertEquals(1, preg_match($output, $string));
-    }
-
-    /**
-     * data provider for testPrepareRowAsSvg() test case
-     *
-     * @return array test data for testPrepareRowAsSvg() test case
-     */
-    public function providerForPrepareRowAsSvg()
-    {
-        return array(
-            array(
-                'LINESTRING(12 35,48 75,69 23,25 45,14 53,35 78)',
-                'svg',
-                '#B02EE0',
-                array(
-                    'x' => 12,
-                    'y' => 69,
-                    'scale' => 2,
-                    'height' => 150
-                ),
-                '/^(<polyline points="0,218 72,138 114,242 26,198 4,182 46,132 " '
-                . 'name="svg" id="svg)(\d+)(" class="linestring vector" fill="none" '
-                . 'stroke="#B02EE0" stroke-width="2"\/>)$/'
-            )
-        );
-    }
-
-    /**
-     * test case for prepareRowAsOl() method
-     *
-     * @param string $spatial    GIS LINESTRING object
-     * @param int    $srid       spatial reference ID
-     * @param string $label      label for the GIS LINESTRING object
-     * @param string $line_color color for the GIS LINESTRING object
-     * @param array  $scale_data array containing data related to scaling
-     * @param string $output     expected output
-     *
-     * @dataProvider providerForPrepareRowAsOl
-     * @return void
-     */
-    public function testPrepareRowAsOl($spatial, $srid, $label,
-        $line_color, $scale_data, $output
-    ) {
-        $this->assertEquals(
-            $this->object->prepareRowAsOl(
-                $spatial, $srid, $label, $line_color, $scale_data
-            ),
-            $output
-        );
-    }
-
-    /**
-     * data provider for testPrepareRowAsOl() test case
-     *
-     * @return array test data for testPrepareRowAsOl() test case
-     */
-    public function providerForPrepareRowAsOl()
-    {
-        return array(
-            array(
-                'LINESTRING(12 35,48 75,69 23,25 45,14 53,35 78)',
-                4326,
-                'Ol',
-                '#B02EE0',
-                array(
-                    'minX' => '0',
-                    'minY' => '0',
-                    'maxX' => '1',
-                    'maxY' => '1',
-                ),
-                'bound = new OpenLayers.Bounds(); bound.extend(new OpenLayers.'
-                . 'LonLat(0, 0).transform(new OpenLayers.Projection("EPSG:4326"), '
-                . 'map.getProjectionObject())); bound.extend(new OpenLayers.LonLat'
-                . '(1, 1).transform(new OpenLayers.Projection("EPSG:4326"), map.get'
-                . 'ProjectionObject()));vectorLayer.addFeatures(new OpenLayers.Feat'
-                . 'ure.Vector(new OpenLayers.Geometry.LineString(new Array((new Open'
-                . 'Layers.Geometry.Point(12,35)).transform(new OpenLayers.Projection'
-                . '("EPSG:4326"), map.getProjectionObject()), (new OpenLayers.Geome'
-                . 'try.Point(48,75)).transform(new OpenLayers.Projection("EPSG:4326"'
-                . '), map.getProjectionObject()), (new OpenLayers.Geometry.Point(69'
-                . ',23)).transform(new OpenLayers.Projection("EPSG:4326"), map.'
-                . 'getProjectionObject()), (new OpenLayers.Geometry.Point(25,45)).'
-                . 'transform(new OpenLayers.Projection("EPSG:4326"), map.'
-                . 'getProjectionObject()), (new OpenLayers.Geometry.Point(14,53)).'
-                . 'transform(new OpenLayers.Projection("EPSG:4326"), map.get'
-                . 'ProjectionObject()), (new OpenLayers.Geometry.Point(35,78)).'
-                . 'transform(new OpenLayers.Projection("EPSG:4326"), map.'
-                . 'getProjectionObject()))), null, {"strokeColor":"#B02EE0",'
-                . '"strokeWidth":2,"label":"Ol","fontSize":10}));'
-            )
-        );
-    }
-}
diff --git a/#pma/test/classes/gis/GISMultilinestringTest.php b/#pma/test/classes/gis/GISMultilinestringTest.php
deleted file mode 100644
index bd9171ea..00000000
--- a/#pma/test/classes/gis/GISMultilinestringTest.php
+++ /dev/null
@@ -1,430 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Test for PMA\libraries\gis\GISMultilinestring
- *
- * @package PhpMyAdmin-test
- */
-
-use PMA\libraries\gis\GISMultilinestring;
-
-require_once 'GISGeomTest.php';
-require_once 'libraries/tcpdf/tcpdf.php';
-
-/**
- * Tests for PMA\libraries\gis\GISMultilinestring class
- *
- * @package PhpMyAdmin-test
- */
-class GISMultilinestringTest extends GISGeomTest
-{
-    /**
-     * @var    GISMultilinestring
-     * @access protected
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function setUp()
-    {
-        $this->object = GISMultilinestring::singleton();
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * data provider for testGenerateWkt
-     *
-     * @return data for testGenerateWkt
-     */
-    public function providerForTestGenerateWkt()
-    {
-        $temp = array(
-            0 => array(
-                'MULTILINESTRING' => array(
-                    'no_of_lines' => 2,
-                    0 => array(
-                        'no_of_points' => 2,
-                        0 => array('x' => 5.02, 'y' => 8.45),
-                        1 => array('x' => 6.14, 'y' => 0.15)
-                    ),
-                    1 => array(
-                        'no_of_points' => 2,
-                        0 => array('x' => 1.23, 'y' => 4.25),
-                        1 => array('x' => 9.15, 'y' => 0.47)
-                    )
-                )
-            )
-        );
-
-        $temp1 = $temp;
-        unset($temp1[0]['MULTILINESTRING'][1][1]['y']);
-
-        $temp2 = $temp;
-        $temp2[0]['MULTILINESTRING']['no_of_lines'] = 0;
-
-        $temp3 = $temp;
-        $temp3[0]['MULTILINESTRING'][1]['no_of_points'] = 1;
-
-        return array(
-            array(
-                $temp,
-                0,
-                null,
-                'MULTILINESTRING((5.02 8.45,6.14 0.15),(1.23 4.25,9.15 0.47))'
-            ),
-            // values at undefined index
-            array(
-                $temp,
-                1,
-                null,
-                'MULTILINESTRING(( , ))'
-            ),
-            // if a coordinate is missing, default is empty string
-            array(
-                $temp1,
-                0,
-                null,
-                'MULTILINESTRING((5.02 8.45,6.14 0.15),(1.23 4.25,9.15 ))'
-            ),
-            // missing coordinates are replaced with provided values (3rd parameter)
-            array(
-                $temp1,
-                0,
-                '0',
-                'MULTILINESTRING((5.02 8.45,6.14 0.15),(1.23 4.25,9.15 0))'
-            ),
-            // at least one line should be there
-            array(
-                $temp2,
-                0,
-                null,
-                'MULTILINESTRING((5.02 8.45,6.14 0.15))'
-            ),
-            // a line should have at least two points
-            array(
-                $temp3,
-                0,
-                '0',
-                'MULTILINESTRING((5.02 8.45,6.14 0.15),(1.23 4.25,9.15 0.47))'
-            ),
-        );
-    }
-
-    /**
-     * test getShape method
-     *
-     * @return void
-     */
-    public function testGetShape()
-    {
-        $row_data = array(
-            'numparts' => 2,
-            'parts'    => array(
-                0 => array(
-                    'points' => array(
-                        0 => array('x' => 5.02, 'y' => 8.45),
-                        1 => array('x' => 6.14, 'y' => 0.15),
-                    ),
-                ),
-                1 => array(
-                    'points' => array(
-                        0 => array('x' => 1.23, 'y' => 4.25),
-                        1 => array('x' => 9.15, 'y' => 0.47),
-                    ),
-                ),
-            ),
-        );
-
-        $this->assertEquals(
-            $this->object->getShape($row_data),
-            'MULTILINESTRING((5.02 8.45,6.14 0.15),(1.23 4.25,9.15 0.47))'
-        );
-    }
-
-    /**
-     * data provider for testGenerateParams
-     *
-     * @return data for testGenerateParams
-     */
-    public function providerForTestGenerateParams()
-    {
-        $temp = array(
-            'MULTILINESTRING' => array(
-                'no_of_lines' => 2,
-                0 => array(
-                    'no_of_points' => 2,
-                    0 => array('x' => 5.02, 'y' => 8.45),
-                    1 => array('x' => 6.14, 'y' => 0.15),
-                ),
-                1 => array(
-                    'no_of_points' => 2,
-                    0 => array('x' => 1.23, 'y' => 4.25),
-                    1 => array('x' => 9.15, 'y' => 0.47),
-                )
-            )
-        );
-
-        $temp1 = $temp;
-        $temp1['gis_type'] = 'MULTILINESTRING';
-
-        return array(
-            array(
-                "'MULTILINESTRING((5.02 8.45,6.14 0.15),(1.23 4.25,9.15 0.47))',124",
-                null,
-                array(
-                    'srid' => '124',
-                    0 => $temp
-                )
-            ),
-            array(
-                'MULTILINESTRING((5.02 8.45,6.14 0.15),(1.23 4.25,9.15 0.47))',
-                2,
-                array(
-                    2 => $temp1
-                )
-            )
-        );
-    }
-
-    /**
-     * data provider for testScaleRow
-     *
-     * @return data for testScaleRow
-     */
-    public function providerForTestScaleRow()
-    {
-        return array(
-            array(
-                'MULTILINESTRING((36 14,47 23,62 75),(36 10,17 23,178 53))',
-                array(
-                    'minX' => 17,
-                    'maxX' => 178,
-                    'minY' => 10,
-                    'maxY' => 75
-                )
-            )
-        );
-    }
-
-
-    /**
-     * test case for prepareRowAsPng() method
-     *
-     * @param string $spatial    GIS MULTILINESTRING object
-     * @param string $label      label for the GIS MULTILINESTRING object
-     * @param string $line_color color for the GIS MULTILINESTRING object
-     * @param array  $scale_data array containing data related to scaling
-     * @param object $image      image object
-     *
-     * @return void
-     * @dataProvider providerForPrepareRowAsPng
-     */
-    public function testPrepareRowAsPng(
-        $spatial, $label, $line_color, $scale_data, $image
-    ) {
-        $this->object->prepareRowAsPng(
-            $spatial, $label, $line_color, $scale_data, $image
-        );
-        /* TODO: this never fails */
-        $this->assertTrue(true);
-    }
-
-    /**
-     * data provider for testPrepareRowAsPng() test case
-     *
-     * @return array test data for testPrepareRowAsPng() test case
-     */
-    public function providerForPrepareRowAsPng()
-    {
-        return array(
-            array(
-                'MULTILINESTRING((36 14,47 23,62 75),(36 10,17 23,178 53))',
-                'image',
-                '#B02EE0',
-                array(
-                    'x' => 12,
-                    'y' => 69,
-                    'scale' => 2,
-                    'height' => 150
-                ),
-                imagecreatetruecolor('120', '150')
-            )
-        );
-    }
-
-    /**
-     * test case for prepareRowAsPdf() method
-     *
-     * @param string $spatial    GIS MULTILINESTRING object
-     * @param string $label      label for the GIS MULTILINESTRING object
-     * @param string $line_color color for the GIS MULTILINESTRING object
-     * @param array  $scale_data array containing data related to scaling
-     * @param object $pdf        TCPDF instance
-     *
-     * @return void
-     * @dataProvider providerForPrepareRowAsPdf
-     */
-    public function testPrepareRowAsPdf(
-        $spatial, $label, $line_color, $scale_data, $pdf
-    ) {
-        $return = $this->object->prepareRowAsPdf(
-            $spatial, $label, $line_color, $scale_data, $pdf
-        );
-        $this->assertInstanceOf('TCPDF', $return);
-    }
-
-    /**
-     * data provider for testPrepareRowAsPdf() test case
-     *
-     * @return array test data for testPrepareRowAsPdf() test case
-     */
-    public function providerForPrepareRowAsPdf()
-    {
-        return array(
-            array(
-                'MULTILINESTRING((36 14,47 23,62 75),(36 10,17 23,178 53))',
-                'pdf',
-                '#B02EE0',
-                array(
-                    'x' => 12,
-                    'y' => 69,
-                    'scale' => 2,
-                    'height' => 150
-                ),
-                new TCPDF(),
-            )
-        );
-    }
-
-    /**
-     * test case for prepareRowAsSvg() method
-     *
-     * @param string $spatial    GIS MULTILINESTRING object
-     * @param string $label      label for the GIS MULTILINESTRING object
-     * @param string $line_color color for the GIS MULTILINESTRING object
-     * @param array  $scale_data array containing data related to scaling
-     * @param string $output     expected output
-     *
-     * @return void
-     * @dataProvider providerForPrepareRowAsSvg
-     */
-    public function testPrepareRowAsSvg(
-        $spatial, $label, $line_color, $scale_data, $output
-    ) {
-        $string = $this->object->prepareRowAsSvg(
-            $spatial, $label, $line_color, $scale_data
-        );
-        $this->assertEquals(1, preg_match($output, $string));
-    }
-
-    /**
-     * data provider for testPrepareRowAsSvg() test case
-     *
-     * @return array test data for testPrepareRowAsSvg() test case
-     */
-    public function providerForPrepareRowAsSvg()
-    {
-        return array(
-            array(
-                'MULTILINESTRING((36 14,47 23,62 75),(36 10,17 23,178 53))',
-                'svg',
-                '#B02EE0',
-                array(
-                    'x' => 12,
-                    'y' => 69,
-                    'scale' => 2,
-                    'height' => 150
-                ),
-                '/^(<polyline points="48,260 70,242 100,138 " name="svg" '
-                . 'class="linestring vector" fill="none" stroke="#B02EE0" '
-                . 'stroke-width="2" id="svg)(\d+)("\/><polyline points="48,268 10,'
-                . '242 332,182 " name="svg" class="linestring vector" fill="none" '
-                . 'stroke="#B02EE0" stroke-width="2" id="svg)(\d+)("\/>)$/'
-            )
-        );
-    }
-
-    /**
-     * test case for prepareRowAsOl() method
-     *
-     * @param string $spatial    GIS MULTILINESTRING object
-     * @param int    $srid       spatial reference ID
-     * @param string $label      label for the GIS MULTILINESTRING object
-     * @param string $line_color color for the GIS MULTILINESTRING object
-     * @param array  $scale_data array containing data related to scaling
-     * @param string $output     expected output
-     *
-     * @return void
-     * @dataProvider providerForPrepareRowAsOl
-     */
-    public function testPrepareRowAsOl(
-        $spatial, $srid, $label, $line_color, $scale_data, $output
-    ) {
-        $this->assertEquals(
-            $output,
-            $this->object->prepareRowAsOl(
-                $spatial, $srid, $label, $line_color, $scale_data
-            )
-        );
-    }
-
-    /**
-     * data provider for testPrepareRowAsOl() test case
-     *
-     * @return array test data for testPrepareRowAsOl() test case
-     */
-    public function providerForPrepareRowAsOl()
-    {
-        return array(
-            array(
-                'MULTILINESTRING((36 14,47 23,62 75),(36 10,17 23,178 53))',
-                4326,
-                'Ol',
-                '#B02EE0',
-                array(
-                    'minX' => '0',
-                    'minY' => '0',
-                    'maxX' => '1',
-                    'maxY' => '1',
-                ),
-                'bound = new OpenLayers.Bounds(); bound.extend(new OpenLayers.'
-                . 'LonLat(0, 0).transform(new OpenLayers.Projection("EPSG:4326"), '
-                . 'map.getProjectionObject())); bound.extend(new OpenLayers.LonLat'
-                . '(1, 1).transform(new OpenLayers.Projection("EPSG:4326"), map.'
-                . 'getProjectionObject()));vectorLayer.addFeatures(new OpenLayers.'
-                . 'Feature.Vector(new OpenLayers.Geometry.MultiLineString(new Arr'
-                . 'ay(new OpenLayers.Geometry.LineString(new Array((new OpenLayers.'
-                . 'Geometry.Point(36,14)).transform(new OpenLayers.Projection("EPSG:'
-                . '4326"), map.getProjectionObject()), (new OpenLayers.Geometry.Po'
-                . 'int(47,23)).transform(new OpenLayers.Projection("EPSG:4326"), '
-                . 'map.getProjectionObject()), (new OpenLayers.Geometry.Point(62,75)'
-                . ').transform(new OpenLayers.Projection("EPSG:4326"), map.getProjec'
-                . 'tionObject()))), new OpenLayers.Geometry.LineString(new Array(('
-                . 'new OpenLayers.Geometry.Point(36,10)).transform(new OpenLayers.'
-                . 'Projection("EPSG:4326"), map.getProjectionObject()), (new Open'
-                . 'Layers.Geometry.Point(17,23)).transform(new OpenLayers.Projection'
-                . '("EPSG:4326"), map.getProjectionObject()), (new OpenLayers.Geo'
-                . 'metry.Point(178,53)).transform(new OpenLayers.Projection("EPSG:'
-                . '4326"), map.getProjectionObject()))))), null, {"strokeColor":"'
-                . '#B02EE0","strokeWidth":2,"label":"Ol","fontSize":10}));'
-            )
-        );
-    }
-}
diff --git a/#pma/test/classes/gis/GISMultipointTest.php b/#pma/test/classes/gis/GISMultipointTest.php
deleted file mode 100644
index 69afe4c2..00000000
--- a/#pma/test/classes/gis/GISMultipointTest.php
+++ /dev/null
@@ -1,379 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Test for PMA\libraries\gis\GISMultipoint
- *
- * @package PhpMyAdmin-test
- */
-
-use PMA\libraries\gis\GISMultipoint;
-
-require_once 'GISGeomTest.php';
-require_once 'libraries/tcpdf/tcpdf.php';
-
-/**
- * Tests for PMA\libraries\gis\GISMultipoint class
- *
- * @package PhpMyAdmin-test
- */
-class GISMultipointTest extends GISGeomTest
-{
-    /**
-     * @var    GISMultipoint
-     * @access protected
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function setUp()
-    {
-        $this->object = GISMultipoint::singleton();
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * data provider for testGenerateWkt
-     *
-     * @return data for testGenerateWkt
-     */
-    public function providerForTestGenerateWkt()
-    {
-        $gis_data1 = array(
-            0 => array(
-                'MULTIPOINT' => array(
-                    'no_of_points' => 2,
-                    0 => array(
-                        'x' => 5.02,
-                        'y' => 8.45
-                    ),
-                    1 => array(
-                        'x' => 1.56,
-                        'y' => 4.36
-                    )
-                )
-            )
-        );
-
-        $gis_data2 = $gis_data1;
-        $gis_data2[0]['MULTIPOINT']['no_of_points'] = -1;
-
-        return array(
-            array(
-                $gis_data1,
-                0,
-                null,
-                'MULTIPOINT(5.02 8.45,1.56 4.36)'
-            ),
-            array(
-                $gis_data2,
-                0,
-                null,
-                'MULTIPOINT(5.02 8.45)'
-            )
-        );
-    }
-
-    /**
-     * test getShape method
-     *
-     * @return void
-     */
-    public function testGetShape()
-    {
-        $gis_data = array(
-            'numpoints' => 2,
-            'points' => array(
-                0 => array('x' => 5.02, 'y' => 8.45),
-                1 => array('x' => 6.14, 'y' => 0.15)
-            )
-        );
-
-        $this->assertEquals(
-            $this->object->getShape($gis_data),
-            'MULTIPOINT(5.02 8.45,6.14 0.15)'
-        );
-    }
-
-    /**
-     * data provider for testGenerateParams
-     *
-     * @return data for testGenerateParams
-     */
-    public function providerForTestGenerateParams()
-    {
-        $temp1 = array(
-            'MULTIPOINT' => array(
-                'no_of_points' => 2,
-                0 => array('x' => '5.02', 'y' => '8.45'),
-                1 => array('x' => '6.14', 'y' => '0.15')
-            )
-        );
-        $temp2 = $temp1;
-        $temp2['gis_type'] = 'MULTIPOINT';
-
-        return array(
-            array(
-                "'MULTIPOINT(5.02 8.45,6.14 0.15)',124",
-                null,
-                array(
-                    'srid' => '124',
-                    0 => $temp1
-                )
-            ),
-            array(
-                'MULTIPOINT(5.02 8.45,6.14 0.15)',
-                2,
-                array(
-                    2 => $temp2
-                )
-            )
-        );
-    }
-
-    /**
-     * data provider for testScaleRow
-     *
-     * @return data for testScaleRow
-     */
-    public function providerForTestScaleRow()
-    {
-        return array(
-            array(
-                'MULTIPOINT(12 35,48 75,69 23,25 45,14 53,35 78)',
-                array(
-                    'minX' => 12,
-                    'maxX' => 69,
-                    'minY' => 23,
-                    'maxY' => 78
-                )
-            )
-        );
-    }
-
-
-    /**
-     * test case for prepareRowAsPng() method
-     *
-     * @param string $spatial     GIS MULTIPOINT object
-     * @param string $label       label for the GIS MULTIPOINT object
-     * @param string $point_color color for the GIS MULTIPOINT object
-     * @param array  $scale_data  array containing data related to scaling
-     * @param object $image       image object
-     *
-     * @return void
-     * @dataProvider providerForPrepareRowAsPng
-     */
-    public function testPrepareRowAsPng(
-        $spatial, $label, $point_color, $scale_data, $image
-    ) {
-        $return = $this->object->prepareRowAsPng(
-            $spatial, $label, $point_color, $scale_data, $image
-        );
-        $this->assertImage($return);
-    }
-
-    /**
-     * data provider for testPrepareRowAsPng() test case
-     *
-     * @return array test data for testPrepareRowAsPng() test case
-     */
-    public function providerForPrepareRowAsPng()
-    {
-        return array(
-            array(
-                'MULTIPOINT(12 35,48 75,69 23,25 45,14 53,35 78)',
-                'image',
-                '#B02EE0',
-                array(
-                    'x' => 12,
-                    'y' => 69,
-                    'scale' => 2,
-                    'height' => 150
-                ),
-                imagecreatetruecolor('120', '150'),
-            )
-        );
-    }
-
-    /**
-     * test case for prepareRowAsPdf() method
-     *
-     * @param string $spatial     GIS MULTIPOINT object
-     * @param string $label       label for the GIS MULTIPOINT object
-     * @param string $point_color color for the GIS MULTIPOINT object
-     * @param array  $scale_data  array containing data related to scaling
-     * @param object $pdf         TCPDF instance
-     *
-     * @return void
-     * @dataProvider providerForPrepareRowAsPdf
-     */
-    public function testPrepareRowAsPdf(
-        $spatial, $label, $point_color, $scale_data, $pdf
-    ) {
-        $return = $this->object->prepareRowAsPdf(
-            $spatial, $label, $point_color, $scale_data, $pdf
-        );
-        $this->assertInstanceOf('TCPDF', $return);
-    }
-
-    /**
-     * data provider for testPrepareRowAsPdf() test case
-     *
-     * @return array test data for testPrepareRowAsPdf() test case
-     */
-    public function providerForPrepareRowAsPdf()
-    {
-        return array(
-            array(
-                'MULTIPOINT(12 35,48 75,69 23,25 45,14 53,35 78)',
-                'pdf',
-                '#B02EE0',
-                array(
-                    'x' => 12,
-                    'y' => 69,
-                    'scale' => 2,
-                    'height' => 150
-                ),
-                new TCPDF(),
-            )
-        );
-    }
-
-    /**
-     * test case for prepareRowAsSvg() method
-     *
-     * @param string $spatial     GIS MULTIPOINT object
-     * @param string $label       label for the GIS MULTIPOINT object
-     * @param string $point_color color for the GIS MULTIPOINT object
-     * @param array  $scale_data  array containing data related to scaling
-     * @param string $output      expected output
-     *
-     * @return void
-     * @dataProvider providerForPrepareRowAsSvg
-     */
-    public function testPrepareRowAsSvg(
-        $spatial, $label, $point_color, $scale_data, $output
-    ) {
-        $string = $this->object->prepareRowAsSvg(
-            $spatial, $label, $point_color, $scale_data
-        );
-        $this->assertEquals(1, preg_match($output, $string));
-    }
-
-    /**
-     * data provider for testPrepareRowAsSvg() test case
-     *
-     * @return array test data for testPrepareRowAsSvg() test case
-     */
-    public function providerForPrepareRowAsSvg()
-    {
-        return array(
-            array(
-                'MULTIPOINT(12 35,48 75,69 23,25 45,14 53,35 78)',
-                'svg',
-                '#B02EE0',
-                array(
-                    'x' => 12,
-                    'y' => 69,
-                    'scale' => 2,
-                    'height' => 150
-                ),
-                '/^(<circle cx="72" cy="138" r="3" name="svg" class="multipoint '
-                . 'vector" fill="white" stroke="#B02EE0" stroke-width="2" id="svg)'
-                . '(\d+)("\/><circle cx="114" cy="242" r="3" name="svg" class="mult'
-                . 'ipoint vector" fill="white" stroke="#B02EE0" stroke-width="2" id'
-                . '="svg)(\d+)("\/><circle cx="26" cy="198" r="3" name="svg" class='
-                . '"multipoint vector" fill="white" stroke="#B02EE0" stroke-width='
-                . '"2" id="svg)(\d+)("\/><circle cx="4" cy="182" r="3" name="svg" '
-                . 'class="multipoint vector" fill="white" stroke="#B02EE0" stroke-'
-                . 'width="2" id="svg)(\d+)("\/><circle cx="46" cy="132" r="3" name='
-                . '"svg" class="multipoint vector" fill="white" stroke="#B02EE0" '
-                . 'stroke-width="2" id="svg)(\d+)("\/>)$/'
-            )
-        );
-    }
-
-    /**
-     * test case for prepareRowAsOl() method
-     *
-     * @param string $spatial     GIS MULTIPOINT object
-     * @param int    $srid        spatial reference ID
-     * @param string $label       label for the GIS MULTIPOINT object
-     * @param string $point_color color for the GIS MULTIPOINT object
-     * @param array  $scale_data  array containing data related to scaling
-     * @param string $output      expected output
-     *
-     * @return void
-     * @dataProvider providerForPrepareRowAsOl
-     */
-    public function testPrepareRowAsOl(
-        $spatial, $srid, $label, $point_color, $scale_data, $output
-    ) {
-        $this->assertEquals(
-            $output,
-            $this->object->prepareRowAsOl(
-                $spatial, $srid, $label, $point_color, $scale_data
-            )
-        );
-    }
-
-    /**
-     * data provider for testPrepareRowAsOl() test case
-     *
-     * @return array test data for testPrepareRowAsOl() test case
-     */
-    public function providerForPrepareRowAsOl()
-    {
-        return array(
-            array(
-                'MULTIPOINT(12 35,48 75,69 23,25 45,14 53,35 78)',
-                4326,
-                'Ol',
-                '#B02EE0',
-                array(
-                    'minX' => '0',
-                    'minY' => '0',
-                    'maxX' => '1',
-                    'maxY' => '1',
-                ),
-                'bound = new OpenLayers.Bounds(); bound.extend(new OpenLayers.Lon'
-                . 'Lat(0, 0).transform(new OpenLayers.Projection("EPSG:4326"), '
-                . 'map.getProjectionObject())); bound.extend(new OpenLayers.LonLat'
-                . '(1, 1).transform(new OpenLayers.Projection("EPSG:4326"), map.'
-                . 'getProjectionObject()));vectorLayer.addFeatures(new OpenLayers.'
-                . 'Feature.Vector(new OpenLayers.Geometry.MultiPoint(new Array(('
-                . 'new OpenLayers.Geometry.Point(12,35)).transform(new OpenLayers.'
-                . 'Projection("EPSG:4326"), map.getProjectionObject()), (new Open'
-                . 'Layers.Geometry.Point(48,75)).transform(new OpenLayers.Projec'
-                . 'tion("EPSG:4326"), map.getProjectionObject()), (new OpenLayers.'
-                . 'Geometry.Point(69,23)).transform(new OpenLayers.Projection("'
-                . 'EPSG:4326"), map.getProjectionObject()), (new OpenLayers.Geometry'
-                . '.Point(25,45)).transform(new OpenLayers.Projection("EPSG:4326"), '
-                . 'map.getProjectionObject()), (new OpenLayers.Geometry.Point(14,53)'
-                . ').transform(new OpenLayers.Projection("EPSG:4326"), map.getProjec'
-                . 'tionObject()), (new OpenLayers.Geometry.Point(35,78)).transform'
-                . '(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject('
-                . ')))), null, {"pointRadius":3,"fillColor":"#ffffff","strokeColor"'
-                . ':"#B02EE0","strokeWidth":2,"label":"Ol","labelYOffset":-8,'
-                . '"fontSize":10}));'
-            )
-        );
-    }
-}
diff --git a/#pma/test/classes/gis/GISMultipolygonTest.php b/#pma/test/classes/gis/GISMultipolygonTest.php
deleted file mode 100644
index 4ad7861d..00000000
--- a/#pma/test/classes/gis/GISMultipolygonTest.php
+++ /dev/null
@@ -1,487 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Test for PMA\libraries\gis\GISMultipolygon
- *
- * @package PhpMyAdmin-test
- */
-
-use PMA\libraries\gis\GISMultipolygon;
-
-require_once 'GISGeomTest.php';
-require_once 'libraries/tcpdf/tcpdf.php';
-
-
-/**
- * Tests for PMA\libraries\gis\GISMultipolygon class
- *
- * @package PhpMyAdmin-test
- */
-class GISMultipolygonTest extends GISGeomTest
-{
-    /**
-     * @var    GISMultipolygon
-     * @access protected
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function setUp()
-    {
-        $this->object = GISMultipolygon::singleton();
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Provide some common data to data providers
-     *
-     * @return array common data for data providers
-     */
-    private function _getData()
-    {
-        return array(
-            'MULTIPOLYGON' => array(
-                'no_of_polygons' => 2,
-                0 => array(
-                    'no_of_lines' => 2,
-                    0 => array(
-                        'no_of_points' => 5,
-                        0 => array('x' => 35, 'y' => 10),
-                        1 => array('x' => 10, 'y' => 20),
-                        2 => array('x' => 15, 'y' => 40),
-                        3 => array('x' => 45, 'y' => 45),
-                        4 => array('x' => 35, 'y' => 10),
-                    ),
-                    1 => array(
-                        'no_of_points' => 4,
-                        0 => array('x' => 20, 'y' => 30),
-                        1 => array('x' => 35, 'y' => 32),
-                        2 => array('x' => 30, 'y' => 20),
-                        3 => array('x' => 20, 'y' => 30),
-                    )
-                ),
-                1 => array(
-                    'no_of_lines' => 1,
-                    0 => array(
-                        'no_of_points' => 4,
-                        0 => array('x' => 123, 'y' => 0),
-                        1 => array('x' => 23, 'y' => 30),
-                        2 => array('x' => 17, 'y' => 63),
-                        3 => array('x' => 123, 'y' => 0),
-                    )
-                )
-            )
-        );
-    }
-
-    /**
-     * data provider for testGenerateWkt
-     *
-     * @return data for testGenerateWkt
-     */
-    public function providerForTestGenerateWkt()
-    {
-        $temp = array(
-            0 => $this->_getData()
-        );
-
-        $temp1 = $temp;
-        $temp1[0]['MULTIPOLYGON']['no_of_polygons'] = 0;
-
-        $temp2 = $temp;
-        $temp2[0]['MULTIPOLYGON'][1]['no_of_lines'] = 0;
-
-        $temp3 = $temp;
-        $temp3[0]['MULTIPOLYGON'][1][0]['no_of_points'] = 3;
-
-        return array(
-            array(
-                $temp,
-                0,
-                null,
-                'MULTIPOLYGON(((35 10,10 20,15 40,45 45,35 10)'
-                    . ',(20 30,35 32,30 20,20 30)),((123 0,23 30,17 63,123 0)))'
-            ),
-            // at lease one polygon should be there
-            array(
-                $temp1,
-                0,
-                null,
-                'MULTIPOLYGON(((35 10,10 20,15 40,45 45,35 10)'
-                    . ',(20 30,35 32,30 20,20 30)))'
-            ),
-            // a polygon should have at least one ring
-            array(
-                $temp2,
-                0,
-                null,
-                'MULTIPOLYGON(((35 10,10 20,15 40,45 45,35 10)'
-                    . ',(20 30,35 32,30 20,20 30)),((123 0,23 30,17 63,123 0)))'
-            ),
-            // a ring should have at least four points
-            array(
-                $temp3,
-                0,
-                '0',
-                'MULTIPOLYGON(((35 10,10 20,15 40,45 45,35 10)'
-                    . ',(20 30,35 32,30 20,20 30)),((123 0,23 30,17 63,123 0)))'
-            ),
-        );
-    }
-
-    /**
-     * data provider for testGenerateParams
-     *
-     * @return data for testGenerateParams
-     */
-    public function providerForTestGenerateParams()
-    {
-        $temp = $this->_getData();
-
-        $temp1 = $this->_getData();
-        $temp1['gis_type'] = 'MULTIPOLYGON';
-
-        return array(
-            array(
-                "'MULTIPOLYGON(((35 10,10 20,15 40,45 45,35 10),"
-                . "(20 30,35 32,30 20,20 30)),((123 0,23 30,17 63,123 0)))',124",
-                null,
-                array(
-                    'srid' => '124',
-                    0 => $temp
-                )
-            ),
-            array(
-                'MULTIPOLYGON(((35 10,10 20,15 40,45 45,35 10)'
-                    . ',(20 30,35 32,30 20,20 30)),((123 0,23 30,17 63,123 0)))',
-                2,
-                array(
-                    2 => $temp1
-                )
-            )
-        );
-    }
-
-    /**
-     * test getShape method
-     *
-     * @param array  $row_data array of GIS data
-     * @param string $shape    expected shape in WKT
-     *
-     * @dataProvider providerForTestGetShape
-     * @return void
-     */
-    public function testGetShape($row_data, $shape)
-    {
-        $this->assertEquals($this->object->getShape($row_data), $shape);
-    }
-
-    /**
-     * data provider for testGetShape
-     *
-     * @return data for testGetShape
-     */
-    public function providerForTestGetShape()
-    {
-        return array(
-            array(
-                array(
-                    'parts' => array(
-                        0 => array(
-                            'points' => array(
-                                0 => array('x' => 10, 'y' => 10),
-                                1 => array('x' => 10, 'y' => 40),
-                                2 => array('x' => 50, 'y' => 40),
-                                3 => array('x' => 50, 'y' => 10),
-                                4 => array('x' => 10, 'y' => 10),
-                            ),
-                        ),
-                        1 => array(
-                            'points' => array(
-                                0 => array('x' => 60, 'y' => 40),
-                                1 => array('x' => 75, 'y' => 65),
-                                2 => array('x' => 90, 'y' => 40),
-                                3 => array('x' => 60, 'y' => 40),
-                            ),
-                        ),
-                        2 => array(
-                            'points' => array(
-                                0 => array('x' => 20, 'y' => 20),
-                                1 => array('x' => 40, 'y' => 20),
-                                2 => array('x' => 25, 'y' => 30),
-                                3 => array('x' => 20, 'y' => 20),
-                            ),
-                        ),
-                    ),
-                ),
-                'MULTIPOLYGON(((10 10,10 40,50 40,50 10,10 10),(20 20,40 20,25 30'
-                    . ',20 20)),((60 40,75 65,90 40,60 40)))'
-            )
-        );
-    }
-
-    /**
-     * data provider for testScaleRow
-     *
-     * @return data for testScaleRow
-     */
-    public function providerForTestScaleRow()
-    {
-        return array(
-            array(
-                'MULTIPOLYGON(((136 40,147 83,16 75,136 40)),'
-                    . '((105 0,56 20,78 73,105 0)))',
-                array(
-                    'minX' => 16,
-                    'maxX' => 147,
-                    'minY' => 0,
-                    'maxY' => 83
-                )
-            ),
-            array(
-                'MULTIPOLYGON(((35 10,10 20,15 40,45 45,35 10),(20 30,35 32,30 20'
-                    . ',20 30)),((105 0,56 20,78 73,105 0)))',
-                array(
-                    'minX' => 10,
-                    'maxX' => 105,
-                    'minY' => 0,
-                    'maxY' => 73
-                )
-            )
-        );
-    }
-
-
-    /**
-     * test case for prepareRowAsPng() method
-     *
-     * @param string $spatial    GIS MULTIPOLYGON object
-     * @param string $label      label for the GIS MULTIPOLYGON object
-     * @param string $fill_color color for the GIS MULTIPOLYGON object
-     * @param array  $scale_data array containing data related to scaling
-     * @param object $image      image object
-     *
-     * @return void
-     * @dataProvider providerForPrepareRowAsPng
-     */
-    public function testPrepareRowAsPng(
-        $spatial, $label, $fill_color, $scale_data, $image
-    ) {
-        $return = $this->object->prepareRowAsPng(
-            $spatial, $label, $fill_color, $scale_data, $image
-        );
-        $this->assertImage($return);
-    }
-
-    /**
-     * data provider for testPrepareRowAsPng() test case
-     *
-     * @return array test data for testPrepareRowAsPng() test case
-     */
-    public function providerForPrepareRowAsPng()
-    {
-        return array(
-            array(
-                'MULTIPOLYGON(((136 40,147 83,16 75,136 40)),'
-                    . '((105 0,56 20,78 73,105 0)))',
-                'image',
-                '#B02EE0',
-                array(
-                    'x' => 12,
-                    'y' => 69,
-                    'scale' => 2,
-                    'height' => 150
-                ),
-                imagecreatetruecolor('120', '150'),
-            )
-
-        );
-    }
-
-    /**
-     * test case for prepareRowAsPdf() method
-     *
-     * @param string $spatial    GIS MULTIPOLYGON object
-     * @param string $label      label for the GIS MULTIPOLYGON object
-     * @param string $fill_color color for the GIS MULTIPOLYGON object
-     * @param array  $scale_data array containing data related to scaling
-     * @param object $pdf        TCPDF instance
-     *
-     * @return void
-     * @dataProvider providerForPrepareRowAsPdf
-     */
-    public function testPrepareRowAsPdf(
-        $spatial, $label, $fill_color, $scale_data, $pdf
-    ) {
-        $return = $this->object->prepareRowAsPdf(
-            $spatial, $label, $fill_color, $scale_data, $pdf
-        );
-        $this->assertInstanceOf('TCPDF', $return);
-    }
-
-    /**
-     * data provider for testPrepareRowAsPdf() test case
-     *
-     * @return array test data for testPrepareRowAsPdf() test case
-     */
-    public function providerForPrepareRowAsPdf()
-    {
-        return array(
-            array(
-                'MULTIPOLYGON(((136 40,147 83,16 75,136 40)),'
-                    . '((105 0,56 20,78 73,105 0)))',
-                'pdf',
-                '#B02EE0',
-                array(
-                    'x' => 12,
-                    'y' => 69,
-                    'scale' => 2,
-                    'height' => 150
-                ),
-                new TCPDF(),
-            )
-        );
-    }
-
-    /**
-     * test case for prepareRowAsSvg() method
-     *
-     * @param string $spatial    GIS MULTIPOLYGON object
-     * @param string $label      label for the GIS MULTIPOLYGON object
-     * @param string $fill_color color for the GIS MULTIPOLYGON object
-     * @param array  $scale_data array containing data related to scaling
-     * @param string $output     expected output
-     *
-     * @return void
-     * @dataProvider providerForPrepareRowAsSvg
-     */
-    public function testPrepareRowAsSvg(
-        $spatial, $label, $fill_color, $scale_data, $output
-    ) {
-        $string = $this->object->prepareRowAsSvg(
-            $spatial, $label, $fill_color, $scale_data
-        );
-        $this->assertEquals(1, preg_match($output, $string));
-    }
-
-    /**
-     * data provider for testPrepareRowAsSvg() test case
-     *
-     * @return array test data for testPrepareRowAsSvg() test case
-     */
-    public function providerForPrepareRowAsSvg()
-    {
-        return array(
-            array(
-                'MULTIPOLYGON(((136 40,147 83,16 75,136 40)),'
-                    . '((105 0,56 20,78 73,105 0)))',
-                'svg',
-                '#B02EE0',
-                array(
-                    'x' => 12,
-                    'y' => 69,
-                    'scale' => 2,
-                    'height' => 150
-                ),
-                '/^(<path d=" M 248, 208 L 270, 122 L 8, 138 Z " name="svg" class="'
-                . 'multipolygon vector" stroke="black" stroke-width="0.5" fill="'
-                . '#B02EE0" fill-rule="evenodd" fill-opacity="0.8" id="svg)(\d+)'
-                . '("\/><path d=" M 186, 288 L 88, 248 L 132, 142 Z " name="svg" '
-                . 'class="multipolygon vector" stroke="black" stroke-width="0.5" '
-                . 'fill="#B02EE0" fill-rule="evenodd" fill-opacity="0.8" id="svg)'
-                . '(\d+)("\/>)$/'
-            )
-        );
-    }
-
-    /**
-     * test case for prepareRowAsOl() method
-     *
-     * @param string $spatial    GIS MULTIPOLYGON object
-     * @param int    $srid       spatial reference ID
-     * @param string $label      label for the GIS MULTIPOLYGON object
-     * @param string $fill_color color for the GIS MULTIPOLYGON object
-     * @param array  $scale_data array containing data related to scaling
-     * @param string $output     expected output
-     *
-     * @return void
-     * @dataProvider providerForPrepareRowAsOl
-     */
-    public function testPrepareRowAsOl(
-        $spatial, $srid, $label, $fill_color, $scale_data, $output
-    ) {
-        $this->assertEquals(
-            $output,
-            $this->object->prepareRowAsOl(
-                $spatial, $srid, $label, $fill_color, $scale_data
-            )
-        );
-    }
-
-    /**
-     * data provider for testPrepareRowAsOl() test case
-     *
-     * @return array test data for testPrepareRowAsOl() test case
-     */
-    public function providerForPrepareRowAsOl()
-    {
-        return array(
-            array(
-                'MULTIPOLYGON(((136 40,147 83,16 75,136 40)),'
-                    . '((105 0,56 20,78 73,105 0)))',
-                4326,
-                'Ol',
-                '#B02EE0',
-                array(
-                    'minX' => '0',
-                    'minY' => '0',
-                    'maxX' => '1',
-                    'maxY' => '1',
-                ),
-                'bound = new OpenLayers.Bounds(); bound.extend(new OpenLayers.'
-                . 'LonLat(0, 0).transform(new OpenLayers.Projection("EPSG:4326"), '
-                . 'map.getProjectionObject())); bound.extend(new OpenLayers.LonLat'
-                . '(1, 1).transform(new OpenLayers.Projection("EPSG:4326"), map.ge'
-                . 'tProjectionObject()));vectorLayer.addFeatures(new OpenLayers.'
-                . 'Feature.Vector(new OpenLayers.Geometry.MultiPolygon(new Array'
-                . '(new OpenLayers.Geometry.Polygon(new Array(new OpenLayers.Geo'
-                . 'metry.LinearRing(new Array((new OpenLayers.Geometry.Point'
-                . '(136,40)).transform(new OpenLayers.Projection("EPSG:4326"), '
-                . 'map.getProjectionObject()), (new OpenLayers.Geometry.Point(147,'
-                . '83)).transform(new OpenLayers.Projection("EPSG:4326"), map.get'
-                . 'ProjectionObject()), (new OpenLayers.Geometry.Point(16,75)).'
-                . 'transform(new OpenLayers.Projection("EPSG:4326"), map.getPro'
-                . 'jectionObject()), (new OpenLayers.Geometry.Point(136,40)).trans'
-                . 'form(new OpenLayers.Projection("EPSG:4326"), map.getProjection'
-                . 'Object()))))), new OpenLayers.Geometry.Polygon(new Array(new '
-                . 'OpenLayers.Geometry.LinearRing(new Array((new OpenLayers.Geometry'
-                . '.Point(105,0)).transform(new OpenLayers.Projection("EPSG:4326"), '
-                . 'map.getProjectionObject()), (new OpenLayers.Geometry.Point(56,20)'
-                . ').transform(new OpenLayers.Projection("EPSG:4326"), map.getProjec'
-                . 'tionObject()), (new OpenLayers.Geometry.Point(78,73)).transform'
-                . '(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject'
-                . '()), (new OpenLayers.Geometry.Point(105,0)).transform(new Open'
-                . 'Layers.Projection("EPSG:4326"), map.getProjectionObject()))))))'
-                . '), null, {"strokeColor":"#000000","strokeWidth":0.5,"fillColor":'
-                . '"#B02EE0","fillOpacity":0.8,"label":"Ol","fontSize":10}));'
-            )
-        );
-    }
-}
diff --git a/#pma/test/classes/gis/GISPointTest.php b/#pma/test/classes/gis/GISPointTest.php
deleted file mode 100644
index 907016ee..00000000
--- a/#pma/test/classes/gis/GISPointTest.php
+++ /dev/null
@@ -1,362 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Test for PMA\libraries\gis\GISPoint
- *
- * @package PhpMyAdmin-test
- */
-
-use PMA\libraries\gis\GISPoint;
-
-require_once 'GISGeomTest.php';
-require_once 'libraries/tcpdf/tcpdf.php';
-
-/**
- * Tests for PMA\libraries\gis\GISPoint class.
- *
- * @package PhpMyAdmin-test
- */
-class GISPointTest extends GISGeomTest
-{
-    /**
-     * @var    GISPoint
-     * @access protected
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function setUp()
-    {
-        $this->object = GISPoint::singleton();
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * data provider for testGenerateWkt
-     *
-     * @return data for testGenerateWkt
-     */
-    public function providerForTestGenerateWkt()
-    {
-        return array(
-            array(
-                array(0 => array('POINT' => array('x' => 5.02, 'y' => 8.45))),
-                0,
-                null,
-                'POINT(5.02 8.45)'
-            ),
-            array(
-                array(0 => array('POINT' => array('x' => 5.02, 'y' => 8.45))),
-                1,
-                null,
-                'POINT( )'
-            ),
-            array(
-                array(0 => array('POINT' => array('x' => 5.02))),
-                0,
-                null,
-                'POINT(5.02 )'
-            ),
-            array(
-                array(0 => array('POINT' => array('y' => 8.45))),
-                0,
-                null,
-                'POINT( 8.45)'
-            ),
-            array(
-                array(0 => array('POINT' => array())),
-                0,
-                null,
-                'POINT( )'
-            ),
-        );
-    }
-
-    /**
-     * test getShape method
-     *
-     * @param array  $row_data array of GIS data
-     * @param string $shape    expected shape in WKT
-     *
-     * @dataProvider providerForTestGetShape
-     * @return void
-     */
-    public function testGetShape($row_data, $shape)
-    {
-        $this->assertEquals($this->object->getShape($row_data), $shape);
-    }
-
-    /**
-     * data provider for testGetShape
-     *
-     * @return data for testGetShape
-     */
-    public function providerForTestGetShape()
-    {
-        return array(
-            array(
-                array('x' => 5.02, 'y' => 8.45),
-                'POINT(5.02 8.45)'
-            )
-        );
-    }
-
-    /**
-     * data provider for testGenerateParams
-     *
-     * @return data for testGenerateParams
-     */
-    public function providerForTestGenerateParams()
-    {
-        return array(
-            array(
-                "'POINT(5.02 8.45)',124",
-                null,
-                array(
-                    'srid' => '124',
-                    0      => array(
-                        'POINT'    => array('x' => '5.02', 'y' => '8.45')
-                    ),
-                )
-            ),
-            array(
-                'POINT(5.02 8.45)',
-                2,
-                array(
-                    2 => array(
-                        'gis_type' => 'POINT',
-                        'POINT'    => array('x' => '5.02', 'y' => '8.45')
-                    ),
-                )
-            )
-        );
-    }
-
-    /**
-     * data provider for testScaleRow
-     *
-     * @return data for testScaleRow
-     */
-    public function providerForTestScaleRow()
-    {
-        return array(
-            array(
-                'POINT(12 35)',
-                array(
-                    'minX' => 12,
-                    'maxX' => 12,
-                    'minY' => 35,
-                    'maxY' => 35,
-                )
-            )
-        );
-    }
-
-    /**
-     * test case for prepareRowAsPng() method
-     *
-     * @param string $spatial     GIS POINT object
-     * @param string $label       label for the GIS POINT object
-     * @param string $point_color color for the GIS POINT object
-     * @param array  $scale_data  array containing data related to scaling
-     * @param object $image       image object
-     *
-     * @return void
-     * @dataProvider providerForPrepareRowAsPng
-     */
-    public function testPrepareRowAsPng(
-        $spatial, $label, $point_color, $scale_data, $image
-    ) {
-        $return = $this->object->prepareRowAsPng(
-            $spatial, $label, $point_color, $scale_data, $image
-        );
-        $this->assertImage($return);
-    }
-
-    /**
-     * data provider for testPrepareRowAsPng() test case
-     *
-     * @return array test data for testPrepareRowAsPng() test case
-     */
-    public function providerForPrepareRowAsPng()
-    {
-        return array(
-            array(
-                'POINT(12 35)',
-                'image',
-                '#B02EE0',
-                array(
-                    'x' => 12,
-                    'y' => 69,
-                    'scale' => 2,
-                    'height' => 150
-                ),
-                imagecreatetruecolor('120', '150')
-            )
-        );
-    }
-
-    /**
-     * test case for prepareRowAsPdf() method
-     *
-     * @param string $spatial     GIS POINT object
-     * @param string $label       label for the GIS POINT object
-     * @param string $point_color color for the GIS POINT object
-     * @param array  $scale_data  array containing data related to scaling
-     * @param object $pdf         TCPDF instance
-     *
-     * @return void
-     * @dataProvider providerForPrepareRowAsPdf
-     */
-    public function testPrepareRowAsPdf(
-        $spatial, $label, $point_color, $scale_data, $pdf
-    ) {
-        $return = $this->object->prepareRowAsPdf(
-            $spatial, $label, $point_color, $scale_data, $pdf
-        );
-        $this->assertInstanceOf('TCPDF', $return);
-    }
-
-    /**
-     * data provider for prepareRowAsPdf() test case
-     *
-     * @return array test data for prepareRowAsPdf() test case
-     */
-    public function providerForPrepareRowAsPdf()
-    {
-        return array(
-            array(
-                'POINT(12 35)',
-                'pdf',
-                '#B02EE0',
-                array(
-                    'x' => 12,
-                    'y' => 69,
-                    'scale' => 2,
-                    'height' => 150
-                ),
-                new TCPDF(),
-            )
-        );
-    }
-
-    /**
-     * test case for prepareRowAsSvg() method
-     *
-     * @param string $spatial     GIS POINT object
-     * @param string $label       label for the GIS POINT object
-     * @param string $point_color color for the GIS POINT object
-     * @param array  $scale_data  array containing data related to scaling
-     * @param string $output      expected output
-     *
-     * @return void
-     * @dataProvider providerForPrepareRowAsSvg
-     */
-    public function testPrepareRowAsSvg(
-        $spatial, $label, $point_color, $scale_data, $output
-    ) {
-        $this->assertEquals(
-            $output,
-            $this->object->prepareRowAsSvg(
-                $spatial, $label, $point_color, $scale_data
-            )
-        );
-    }
-
-    /**
-     * data provider for prepareRowAsSvg() test case
-     *
-     * @return array test data for prepareRowAsSvg() test case
-     */
-    public function providerForPrepareRowAsSvg()
-    {
-        return array(
-            array(
-                'POINT(12 35)',
-                'svg',
-                '#B02EE0',
-                array(
-                    'x' => 12,
-                    'y' => 69,
-                    'scale' => 2,
-                    'height' => 150
-                ),
-                ''
-            )
-        );
-    }
-
-    /**
-     * test case for prepareRowAsOl() method
-     *
-     * @param string $spatial     GIS POINT object
-     * @param int    $srid        spatial reference ID
-     * @param string $label       label for the GIS POINT object
-     * @param string $point_color color for the GIS POINT object
-     * @param array  $scale_data  array containing data related to scaling
-     * @param string $output      expected output
-     *
-     * @return void
-     * @dataProvider providerForPrepareRowAsOl
-     */
-    public function testPrepareRowAsOl(
-        $spatial, $srid, $label, $point_color, $scale_data, $output
-    ) {
-        $this->assertEquals(
-            $output,
-            $this->object->prepareRowAsOl(
-                $spatial, $srid, $label, $point_color, $scale_data
-            )
-        );
-    }
-
-    /**
-     * data provider for testPrepareRowAsOl() test case
-     *
-     * @return array test data for testPrepareRowAsOl() test case
-     */
-    public function providerForPrepareRowAsOl()
-    {
-        return array(
-            array(
-                'POINT(12 35)',
-                4326,
-                'Ol',
-                '#B02EE0',
-                array(
-                    'minX' => '0',
-                    'minY' => '0',
-                    'maxX' => '1',
-                    'maxY' => '1',
-                ),
-                'bound = new OpenLayers.Bounds(); bound.extend(new OpenLayers.'
-                . 'LonLat(0, 0).transform(new OpenLayers.Projection("EPSG:4326"), '
-                . 'map.getProjectionObject())); bound.extend(new OpenLayers.LonLat'
-                . '(1, 1).transform(new OpenLayers.Projection("EPSG:4326"), '
-                . 'map.getProjectionObject()));vectorLayer.addFeatures(new Open'
-                . 'Layers.Feature.Vector((new OpenLayers.Geometry.Point(12,35)).'
-                . 'transform(new OpenLayers.Projection("EPSG:4326"), map.get'
-                . 'ProjectionObject()), null, {"pointRadius":3,"fillColor":"#ffffff"'
-                . ',"strokeColor":"#B02EE0","strokeWidth":2,"label":"Ol","labelY'
-                . 'Offset":-8,"fontSize":10}));'
-            )
-        );
-    }
-}
diff --git a/#pma/test/classes/gis/GISPolygonTest.php b/#pma/test/classes/gis/GISPolygonTest.php
deleted file mode 100644
index 0105d23c..00000000
--- a/#pma/test/classes/gis/GISPolygonTest.php
+++ /dev/null
@@ -1,589 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Test for PMA\libraries\gis\GISPolygon
- *
- * @package PhpMyAdmin-test
- */
-
-use PMA\libraries\gis\GISPolygon;
-
-require_once 'GISGeomTest.php';
-require_once 'libraries/tcpdf/tcpdf.php';
-
-/**
- * Tests for PMA\libraries\gis\GISPolygon class
- *
- * @package PhpMyAdmin-test
- */
-class GISPolygonTest extends GISGeomTest
-{
-    /**
-     * @var    GISPolygon
-     * @access protected
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function setUp()
-    {
-        $this->object = GISPolygon::singleton();
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Provide some common data to data providers
-     *
-     * @return array common data for data providers
-     */
-    private function _getData()
-    {
-        return array(
-            'POLYGON' => array(
-                'no_of_lines' => 2,
-                0 => array(
-                    'no_of_points' => 5,
-                    0 => array('x' => 35, 'y' => 10),
-                    1 => array('x' => 10, 'y' => 20),
-                    2 => array('x' => 15, 'y' => 40),
-                    3 => array('x' => 45, 'y' => 45),
-                    4 => array('x' => 35, 'y' => 10),
-                ),
-                1 => array(
-                    'no_of_points' => 4,
-                    0 => array('x' => 20, 'y' => 30),
-                    1 => array('x' => 35, 'y' => 32),
-                    2 => array('x' => 30, 'y' => 20),
-                    3 => array('x' => 20, 'y' => 30),
-                )
-            )
-        );
-    }
-
-    /**
-     * data provider for testGenerateWkt
-     *
-     * @return data for testGenerateWkt
-     */
-    public function providerForTestGenerateWkt()
-    {
-        $temp = array(
-            0 => $this->_getData()
-        );
-
-        $temp1 = $temp;
-        unset($temp1[0]['POLYGON'][1][3]['y']);
-
-        $temp2 = $temp;
-        $temp2[0]['POLYGON']['no_of_lines'] = 0;
-
-        $temp3 = $temp;
-        $temp3[0]['POLYGON'][1]['no_of_points'] = 3;
-
-        return array(
-            array(
-                $temp,
-                0,
-                null,
-                'POLYGON((35 10,10 20,15 40,45 45,35 10),(20 30,35 32,30 20,20 30))'
-            ),
-            // values at undefined index
-            array(
-                $temp,
-                1,
-                null,
-                'POLYGON(( , , , ))'
-            ),
-            // if a coordinate is missing, default is empty string
-            array(
-                $temp1,
-                0,
-                null,
-                'POLYGON((35 10,10 20,15 40,45 45,35 10),(20 30,35 32,30 20,20 ))'
-            ),
-            // missing coordinates are replaced with provided values (3rd parameter)
-            array(
-                $temp1,
-                0,
-                '0',
-                'POLYGON((35 10,10 20,15 40,45 45,35 10),(20 30,35 32,30 20,20 0))'
-            ),
-            // should have at least one ring
-            array(
-                $temp2,
-                0,
-                '0',
-                'POLYGON((35 10,10 20,15 40,45 45,35 10))'
-            ),
-            // a ring should have at least four points
-            array(
-                $temp3,
-                0,
-                '0',
-                'POLYGON((35 10,10 20,15 40,45 45,35 10),(20 30,35 32,30 20,20 30))'
-            ),
-        );
-    }
-
-    /**
-     * data provider for testGenerateParams
-     *
-     * @return data for testGenerateParams
-     */
-    public function providerForTestGenerateParams()
-    {
-        $temp = $this->_getData();
-
-        $temp1 = $temp;
-        $temp1['gis_type'] = 'POLYGON';
-
-        return array(
-            array(
-                "'POLYGON((35 10,10 20,15 40,45 45,35 10),"
-                    . "(20 30,35 32,30 20,20 30))',124",
-                null,
-                array(
-                    'srid' => '124',
-                    0 => $temp
-                )
-            ),
-            array(
-                'POLYGON((35 10,10 20,15 40,45 45,35 10),(20 30,35 32,30 20,20 30))',
-                2,
-                array(
-                    2 => $temp1
-                )
-            )
-        );
-    }
-
-    /**
-     * test for Area
-     *
-     * @param array $ring array of points forming the ring
-     * @param float $area area of the ring
-     *
-     * @dataProvider providerForTestArea
-     * @return void
-     */
-    public function testArea($ring, $area)
-    {
-        $this->assertEquals($this->object->area($ring), $area);
-    }
-
-    /**
-     * data provider for testArea
-     *
-     * @return data for testArea
-     */
-    public function providerForTestArea()
-    {
-        return array(
-            array(
-                array(
-                    0 => array('x' => 35, 'y' => 10),
-                    1 => array('x' => 10, 'y' => 10),
-                    2 => array('x' => 15, 'y' => 40)
-                ),
-                -375.00
-            ),
-            // first point of the ring repeated as the last point
-            array(
-                array(
-                    0 => array('x' => 35, 'y' => 10),
-                    1 => array('x' => 10, 'y' => 10),
-                    2 => array('x' => 15, 'y' => 40),
-                    3 => array('x' => 35, 'y' => 10)
-                ),
-                -375.00
-            ),
-            // anticlockwise gives positive area
-            array(
-                array(
-                    0 => array('x' => 15, 'y' => 40),
-                    1 => array('x' => 10, 'y' => 10),
-                    2 => array('x' => 35, 'y' => 10)
-                ),
-                375.00
-            )
-        );
-    }
-
-    /**
-     * test for isPointInsidePolygon
-     *
-     * @param array $point    x, y coordinates of the point
-     * @param array $polygon  array of points forming the ring
-     * @param bool  $isInside output
-     *
-     * @dataProvider providerForTestIsPointInsidePolygon
-     * @return void
-     */
-    public function testIsPointInsidePolygon($point, $polygon, $isInside)
-    {
-        $this->assertEquals(
-            $this->object->isPointInsidePolygon($point, $polygon),
-            $isInside
-        );
-    }
-
-    /**
-     * data provider for testIsPointInsidePolygon
-     *
-     * @return data for testIsPointInsidePolygon
-     */
-    public function providerForTestIsPointInsidePolygon()
-    {
-        $ring = array(
-            0 => array('x' => 35, 'y' => 10),
-            1 => array('x' => 10, 'y' => 10),
-            2 => array('x' => 15, 'y' => 40),
-            3 => array('x' => 35, 'y' => 10)
-        );
-
-        return array(
-            // point inside the ring
-            array(
-                array('x' => 20, 'y' => 15),
-                $ring,
-                true
-            ),
-            // point on an edge of the ring
-            array(
-                array('x' => 20, 'y' => 10),
-                $ring,
-                false
-            ),
-            // point on a vertex of the ring
-            array(
-                array('x' => 10, 'y' => 10),
-                $ring,
-                false
-            ),
-            // point outside the ring
-            array(
-                array('x' => 5, 'y' => 10),
-                $ring,
-                false
-            ),
-        );
-    }
-
-    /**
-     * test for getPointOnSurface
-     *
-     * @param array $ring array of points forming the ring
-     *
-     * @dataProvider providerForTestGetPointOnSurface
-     * @return void
-     */
-    public function testGetPointOnSurface($ring)
-    {
-        $this->assertEquals(
-            $this->object->isPointInsidePolygon(
-                $this->object->getPointOnSurface($ring),
-                $ring
-            ),
-            true
-        );
-    }
-
-    /**
-     * data provider for testGetPointOnSurface
-     *
-     * @return data for testGetPointOnSurface
-     */
-    public function providerForTestGetPointOnSurface()
-    {
-        $temp = $this->_getData();
-        unset($temp['POLYGON'][0]['no_of_points']);
-        unset($temp['POLYGON'][1]['no_of_points']);
-
-        return array(
-            array(
-                $temp['POLYGON'][0]
-            ),
-            array(
-                $temp['POLYGON'][1]
-            )
-        );
-    }
-
-    /**
-     * data provider for testScaleRow
-     *
-     * @return data for testScaleRow
-     */
-    public function providerForTestScaleRow()
-    {
-        return array(
-            array(
-                'POLYGON((123 0,23 30,17 63,123 0))',
-                array(
-                    'minX' => 17,
-                    'maxX' => 123,
-                    'minY' => 0,
-                    'maxY' => 63,
-                )
-            ),
-            array(
-                'POLYGON((35 10,10 20,15 40,45 45,35 10),'
-                    . '(20 30,35 32,30 20,20 30)))',
-                array(
-                    'minX' => 10,
-                    'maxX' => 45,
-                    'minY' => 10,
-                    'maxY' => 45
-                )
-            ),
-        );
-    }
-
-    /**
-     * test case for prepareRowAsPng()
-     *
-     * @param string $spatial    GIS POLYGON object
-     * @param string $label      label for the GIS POLYGON object
-     * @param string $fill_color color for the GIS POLYGON object
-     * @param array  $scale_data array containing data related to scaling
-     * @param object $image      image object
-     *
-     * @return void
-     * @dataProvider providerForPrepareRowAsPng
-     */
-    public function testPrepareRowAsPng(
-        $spatial, $label, $fill_color, $scale_data, $image
-    ) {
-        $return = $this->object->prepareRowAsPng(
-            $spatial, $label, $fill_color, $scale_data, $image
-        );
-        $this->assertImage($return);
-    }
-
-    /**
-     * data provider for testPrepareRowAsPng() test case
-     *
-     * @return array test data for testPrepareRowAsPng() test case
-     */
-    public function providerForPrepareRowAsPng()
-    {
-        return array(
-            array(
-                'POLYGON((123 0,23 30,17 63,123 0))',
-                'image',
-                '#B02EE0',
-                array(
-                    'x' => 12,
-                    'y' => 69,
-                    'scale' => 2,
-                    'height' => 150
-                ),
-                imagecreatetruecolor('120', '150')
-            )
-        );
-    }
-
-    /**
-     * test case for prepareRowAsPdf() method
-     *
-     * @param string $spatial    GIS POLYGON object
-     * @param string $label      label for the GIS POLYGON object
-     * @param string $fill_color color for the GIS POLYGON object
-     * @param array  $scale_data array containing data related to scaling
-     * @param object $pdf        TCPDF instance
-     *
-     * @return void
-     * @dataProvider providerForPrepareRowAsPdf
-     */
-    public function testPrepareRowAsPdf(
-        $spatial, $label, $fill_color, $scale_data, $pdf
-    ) {
-        $return = $this->object->prepareRowAsPdf(
-            $spatial, $label, $fill_color, $scale_data, $pdf
-        );
-        $this->assertInstanceOf('TCPDF', $return);
-    }
-
-    /**
-     * data provider for testPrepareRowAsPdf() test case
-     *
-     * @return array test data for testPrepareRowAsPdf() test case
-     */
-    public function providerForPrepareRowAsPdf()
-    {
-        return array(
-            array(
-                'POLYGON((123 0,23 30,17 63,123 0))',
-                'pdf',
-                '#B02EE0',
-                array(
-                    'x' => 12,
-                    'y' => 69,
-                    'scale' => 2,
-                    'height' => 150
-                ),
-                new TCPDF(),
-            )
-        );
-    }
-
-    /**
-     * test case for prepareRowAsSvg() method
-     *
-     * @param string $spatial    GIS POLYGON object
-     * @param string $label      label for the GIS POLYGON object
-     * @param string $fill_color color for the GIS POLYGON object
-     * @param array  $scale_data array containing data related to scaling
-     * @param string $output     expected output
-     *
-     * @return void
-     * @dataProvider providerForPrepareRowAsSvg
-     */
-    public function testPrepareRowAsSvg(
-        $spatial, $label, $fill_color, $scale_data, $output
-    ) {
-        $string = $this->object->prepareRowAsSvg(
-            $spatial, $label, $fill_color, $scale_data
-        );
-        $this->assertEquals(1, preg_match($output, $string));
-    }
-
-    /**
-     * data provider for testPrepareRowAsSvg() test case
-     *
-     * @return array test data for testPrepareRowAsSvg() test case
-     */
-    public function providerForPrepareRowAsSvg()
-    {
-        return array(
-            array(
-                'POLYGON((123 0,23 30,17 63,123 0))',
-                'svg',
-                '#B02EE0',
-                array(
-                    'x' => 12,
-                    'y' => 69,
-                    'scale' => 2,
-                    'height' => 150
-                ),
-                '/^(<path d=" M 222, 288 L 22, 228 L 10, 162 Z " name="svg" '
-                . 'id="svg)(\d+)(" class="polygon vector" stroke="black" '
-                . 'stroke-width="0.5" fill="#B02EE0" fill-rule="evenodd" '
-                . 'fill-opacity="0.8"\/>)$/'
-            )
-        );
-    }
-
-    /**
-     * test case for prepareRowAsOl() method
-     *
-     * @param string $spatial    GIS POLYGON object
-     * @param int    $srid       spatial reference ID
-     * @param string $label      label for the GIS POLYGON object
-     * @param string $fill_color color for the GIS POLYGON object
-     * @param array  $scale_data array containing data related to scaling
-     * @param string $output     expected output
-     *
-     * @return void
-     * @dataProvider providerForPrepareRowAsOl
-     */
-    public function testPrepareRowAsOl(
-        $spatial, $srid, $label, $fill_color, $scale_data, $output
-    ) {
-        $this->assertEquals(
-            $output,
-            $this->object->prepareRowAsOl(
-                $spatial, $srid, $label, $fill_color, $scale_data
-            )
-        );
-    }
-
-    /**
-     * data provider for testPrepareRowAsOl() test case
-     *
-     * @return array test data for testPrepareRowAsOl() test case
-     */
-    public function providerForPrepareRowAsOl()
-    {
-        return array(
-            array(
-                'POLYGON((123 0,23 30,17 63,123 0))',
-                4326,
-                'Ol',
-                '#B02EE0',
-                array(
-                    'minX' => '0',
-                    'minY' => '0',
-                    'maxX' => '1',
-                    'maxY' => '1',
-                ),
-                'bound = new OpenLayers.Bounds(); bound.extend(new OpenLayers.Lon'
-                . 'Lat(0, 0).transform(new OpenLayers.Projection("EPSG:4326"), '
-                . 'map.getProjectionObject())); bound.extend(new OpenLayers.'
-                . 'LonLat(1, 1).transform(new OpenLayers.Projection("EPSG:4326"), '
-                . 'map.getProjectionObject()));vectorLayer.addFeatures(new Open'
-                . 'Layers.Feature.Vector(new OpenLayers.Geometry.Polygon(new Array'
-                . '(new OpenLayers.Geometry.LinearRing(new Array((new OpenLayers.'
-                . 'Geometry.Point(123,0)).transform(new OpenLayers.Projection'
-                . '("EPSG:4326"), map.getProjectionObject()), (new OpenLayers.'
-                . 'Geometry.Point(23,30)).transform(new OpenLayers.Projection'
-                . '("EPSG:4326"), map.getProjectionObject()), (new OpenLayers.'
-                . 'Geometry.Point(17,63)).transform(new OpenLayers.Projection'
-                . '("EPSG:4326"), map.getProjectionObject()), (new OpenLayers.'
-                . 'Geometry.Point(123,0)).transform(new OpenLayers.Projection'
-                . '("EPSG:4326"), map.getProjectionObject()))))), null, {"stroke'
-                . 'Color":"#000000","strokeWidth":0.5,"fillColor":"#B02EE0",'
-                . '"fillOpacity":0.8,"label":"Ol","fontSize":10}));'
-            )
-        );
-    }
-
-    /**
-     * test case for isOuterRing() method
-     *
-     * @param array $ring coordinates of the points in a ring
-     *
-     * @return void
-     * @dataProvider providerForIsOuterRing
-     */
-    public function testIsOuterRing($ring)
-    {
-        $this->assertTrue($this->object->isOuterRing($ring));
-    }
-
-    /**
-     * data provider for testIsOuterRing() test case
-     *
-     * @return array test data for testIsOuterRing() test case
-     */
-    public function providerForIsOuterRing()
-    {
-        return array(
-            array(
-                array(
-                    array('x' => 0, 'y' => 0),
-                    array('x' => 0, 'y' => 1),
-                    array('x' => 1, 'y' => 1),
-                    array('x' => 1, 'y' => 0)
-                ),
-            )
-        );
-    }
-}
diff --git a/#pma/test/classes/navigation/NavigationTest.php b/#pma/test/classes/navigation/NavigationTest.php
deleted file mode 100644
index c6c0d6a6..00000000
--- a/#pma/test/classes/navigation/NavigationTest.php
+++ /dev/null
@@ -1,166 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Test for PMA\libraries\navigation\Navigation class
- *
- * @package PhpMyAdmin-test
- */
-
-use PMA\libraries\Theme;
-
-require_once 'libraries/database_interface.inc.php';
-require_once 'libraries/relation.lib.php';
-require_once 'libraries/url_generating.lib.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * Tests for PMA\libraries\navigation\Navigation class
- *
- * @package PhpMyAdmin-test
- */
-class NavigationTest extends PMATestCase
-{
-    /**
-     * @var PMA\libraries\navigation\Navigation
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function setUp()
-    {
-        $this->object = new PMA\libraries\navigation\Navigation();
-        $GLOBALS['cfgRelation']['db'] = 'pmadb';
-        $GLOBALS['cfgRelation']['navigationhiding'] = 'navigationhiding';
-        $GLOBALS['cfg']['Server']['user'] = 'user';
-        $GLOBALS['cfg']['ActionLinksMode'] = 'both';
-
-        $GLOBALS['pmaThemeImage'] = 'image';
-        $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
-        $_SESSION['PMA_Theme'] = new Theme();
-    }
-
-    /**
-     * Tears down the fixture.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Tests hideNavigationItem() method.
-     *
-     * @return void
-     * @test
-     */
-    public function testHideNavigationItem()
-    {
-        $expectedQuery = "INSERT INTO `pmadb`.`navigationhiding`"
-            . "(`username`, `item_name`, `item_type`, `db_name`, `table_name`)"
-            . " VALUES ('user','itemName','itemType','db','')";
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $dbi->expects($this->once())
-            ->method('tryQuery')
-            ->with($expectedQuery);
-        $dbi->expects($this->any())->method('escapeString')
-            ->will($this->returnArgument(0));
-
-        $GLOBALS['dbi'] = $dbi;
-        $this->object->hideNavigationItem('itemName', 'itemType', 'db');
-    }
-
-    /**
-     * Tests unhideNavigationItem() method.
-     *
-     * @return void
-     * @test
-     */
-    public function testUnhideNavigationItem()
-    {
-        $expectedQuery = "DELETE FROM `pmadb`.`navigationhiding`"
-            . " WHERE `username`='user' AND `item_name`='itemName'"
-            . " AND `item_type`='itemType' AND `db_name`='db'";
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $dbi->expects($this->once())
-            ->method('tryQuery')
-            ->with($expectedQuery);
-
-        $dbi->expects($this->any())->method('escapeString')
-            ->will($this->returnArgument(0));
-        $GLOBALS['dbi'] = $dbi;
-        $this->object->unhideNavigationItem('itemName', 'itemType', 'db');
-    }
-
-    /**
-     * Tests getItemUnhideDialog() method.
-     *
-     * @return void
-     * @test
-     */
-    public function testGetItemUnhideDialog()
-    {
-        $expectedQuery = "SELECT `item_name`, `item_type`"
-            . " FROM `pmadb`.`navigationhiding`"
-            . " WHERE `username`='user' AND `db_name`='db' AND `table_name`=''";
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $dbi->expects($this->once())
-            ->method('tryQuery')
-            ->with($expectedQuery)
-            ->will($this->returnValue(true));
-        $dbi->expects($this->at(3))
-            ->method('fetchArray')
-            ->will(
-                $this->returnValue(
-                    array(
-                        'item_name' => 'tableName',
-                        'item_type' => 'table'
-                    )
-                )
-            );
-        $dbi->expects($this->at(4))
-            ->method('fetchArray')
-            ->will(
-                $this->returnValue(
-                    array(
-                        'item_name' => 'viewName',
-                        'item_type' => 'view'
-                    )
-                )
-            );
-        $dbi->expects($this->at(5))
-            ->method('fetchArray')
-            ->will($this->returnValue(false));
-        $dbi->expects($this->once())
-            ->method('freeResult');
-        $dbi->expects($this->any())->method('escapeString')
-            ->will($this->returnArgument(0));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $html = $this->object->getItemUnhideDialog('db');
-        $this->assertContains(
-            '<td>tableName</td>',
-            $html
-        );
-        $this->assertContains(
-            '<a href="navigation.php' . PMA_URL_getCommon()
-            . '&unhideNavItem=true&itemType=table&itemName=tableName&dbName=db"'
-            . ' class="unhideNavItem ajax">',
-            $html
-        );
-    }
-}
diff --git a/#pma/test/classes/navigation/NavigationTreeTest.php b/#pma/test/classes/navigation/NavigationTreeTest.php
deleted file mode 100644
index 1432edab..00000000
--- a/#pma/test/classes/navigation/NavigationTreeTest.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Test for PMA\libraries\navigation\NavigationTree class
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * we must set $GLOBALS['server'] here
- * since 'check_user_privileges.lib.php' will use it globally
- */
-use PMA\libraries\navigation\NavigationTree;
-use PMA\libraries\Theme;
-
-$GLOBALS['server'] = 0;
-$GLOBALS['cfg']['Server']['DisableIS'] = false;
-
-require_once 'libraries/database_interface.inc.php';
-require_once 'libraries/relation.lib.php';
-require_once 'libraries/url_generating.lib.php';
-require_once 'libraries/check_user_privileges.lib.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * Tests for PMA\libraries\navigation\NavigationTree class
- *
- * @package PhpMyAdmin-test
- */
-class NavigationTreeTest extends PMATestCase
-{
-    /**
-     * @var NavigationTree
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function setUp()
-    {
-        $GLOBALS['server'] = 1;
-        $GLOBALS['PMA_Config'] = new PMA\libraries\Config();
-        $GLOBALS['PMA_Config']->enableBc();
-        $GLOBALS['cfg']['Server']['host'] = 'localhost';
-        $GLOBALS['cfg']['Server']['user'] = 'root';
-        $GLOBALS['cfg']['Server']['pmadb'] = '';
-        $GLOBALS['cfg']['Server']['DisableIS'] = false;
-        $GLOBALS['cfg']['NavigationTreeEnableGrouping'] = true;
-        $GLOBALS['cfg']['ShowDatabasesNavigationAsTree']  = true;
-
-        $GLOBALS['pmaThemeImage'] = 'image';
-        $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
-        $_SESSION['PMA_Theme'] = new Theme();
-        $this->object = new PMA\libraries\navigation\NavigationTree();
-    }
-
-    /**
-     * Tears down the fixture.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Very basic rendering test.
-     *
-     * @return void
-     */
-    public function testRenderState()
-    {
-        $result = $this->object->renderState();
-        $this->assertContains('pma_quick_warp', $result);
-    }
-
-    /**
-     * Very basic path rendering test.
-     *
-     * @return void
-     */
-    public function testRenderPath()
-    {
-        $result = $this->object->renderPath();
-        $this->assertContains('list_container', $result);
-    }
-
-    /**
-     * Very basic select rendering test.
-     *
-     * @return void
-     */
-    public function testRenderDbSelect()
-    {
-        $result = $this->object->renderDbSelect();
-        $this->assertContains('pma_navigation_select_database', $result);
-    }
-}
diff --git a/#pma/test/classes/navigation/NodeColumnContainerTest.php b/#pma/test/classes/navigation/NodeColumnContainerTest.php
deleted file mode 100644
index 2fadfa9f..00000000
--- a/#pma/test/classes/navigation/NodeColumnContainerTest.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Tests for PMA\libraries\navigation\nodes\NodeColumnContainer class
- *
- * @package PhpMyAdmin-test
- */
-
-use PMA\libraries\navigation\NodeFactory;
-use PMA\libraries\Theme;
-
-require_once 'libraries/navigation/NodeFactory.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * Tests for PMA\libraries\navigation\nodes\NodeColumnContainer class
- *
- * @package PhpMyAdmin-test
- */
-class NodeColumnContainerTest extends PMATestCase
-{
-    /**
-     * SetUp for test cases
-     *
-     * @return void
-     */
-    public function setup()
-    {
-        $GLOBALS['server'] = 0;
-        $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
-    }
-
-    /**
-     * Test for PMA\libraries\navigation\NodeFactory::__construct
-     *
-     * @return void
-     */
-    public function testConstructor()
-    {
-        $parent = NodeFactory::getInstance('NodeColumnContainer');
-        $this->assertArrayHasKey(
-            'text',
-            $parent->links
-        );
-        $this->assertContains(
-            'tbl_structure.php',
-            $parent->links['text']
-        );
-        $this->assertEquals('columns', $parent->real_name);
-    }
-}
diff --git a/#pma/test/classes/navigation/NodeColumnTest.php b/#pma/test/classes/navigation/NodeColumnTest.php
deleted file mode 100644
index c9a0435a..00000000
--- a/#pma/test/classes/navigation/NodeColumnTest.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Tests for PMA\libraries\navigation\nodes\NodeColumn class
- *
- * @package PhpMyAdmin-test
- */
-
-use PMA\libraries\navigation\NodeFactory;
-use PMA\libraries\Theme;
-
-require_once 'libraries/navigation/NodeFactory.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * Tests for PMA\libraries\navigation\nodes\NodeColumn class
- *
- * @package PhpMyAdmin-test
- */
-class NodeColumnTest extends PMATestCase
-{
-    /**
-     * SetUp for test cases
-     *
-     * @return void
-     */
-    public function setup()
-    {
-        $GLOBALS['server'] = 0;
-        $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
-    }
-
-    /**
-     * Test for PMA\libraries\navigation\NodeFactory::getInstance
-     *
-     * @return void
-     */
-    public function testConstructor()
-    {
-        $parent = NodeFactory::getInstance('NodeColumn');
-        $this->assertArrayHasKey(
-            'text',
-            $parent->links
-        );
-        $this->assertContains(
-            'tbl_structure.php',
-            $parent->links['text']
-        );
-    }
-}
diff --git a/#pma/test/classes/navigation/NodeDatabaseChildTest.php b/#pma/test/classes/navigation/NodeDatabaseChildTest.php
deleted file mode 100644
index 9fd02ac1..00000000
--- a/#pma/test/classes/navigation/NodeDatabaseChildTest.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Test for PMA\libraries\navigation\nodes\NodeDatabaseChild
- *
- * @package PhpMyAdmin-test
- */
-
-use PMA\libraries\navigation\NodeFactory;
-use PMA\libraries\navigation\nodes\NodeDatabaseChild;
-use PMA\libraries\Theme;
-
-require_once 'libraries/url_generating.lib.php';
-require_once 'libraries/relation.lib.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * Tests for PMA\libraries\navigation\nodes\NodeDatabaseChild class
- *
- * @package PhpMyAdmin-test
- */
-class NodeDatabaseChildTest extends PMATestCase
-{
-    /**
-     * @var NodeDatabaseChild
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function setUp()
-    {
-        $_SESSION['PMA_Theme'] = new Theme();
-        $GLOBALS['pmaThemePath'] = $_SESSION['PMA_Theme']->getPath();
-        $GLOBALS['pmaThemeImage'] = 'theme/';
-        $GLOBALS['cfg']['DefaultTabDatabase'] = 'structure';
-        $GLOBALS['server'] = 1;
-        $GLOBALS['cfg']['ServerDefault'] = 1;
-        $_SESSION['relation'][1]['PMA_VERSION'] = PMA_VERSION;
-        $_SESSION['relation'][1]['navwork'] = true;
-        $this->object = $this->getMockForAbstractClass(
-            'PMA\libraries\navigation\nodes\NodeDatabaseChild', array('child')
-        );
-    }
-
-    /**
-     * Tears down the fixture.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Tests getHtmlForControlButtons() method
-     *
-     * @return void
-     * @test
-     */
-    public function testGetHtmlForControlButtons()
-    {
-        $parent = NodeFactory::getInstance('NodeDatabase', 'parent');
-        $parent->addChild($this->object);
-        $this->object->expects($this->once())
-            ->method('getItemType')
-            ->will($this->returnValue('itemType'));
-        $html = $this->object->getHtmlForControlButtons();
-
-        $this->assertStringStartsWith(
-            '<span class="navItemControls">',
-            $html
-        );
-        $this->assertStringEndsWith(
-            '</span>',
-            $html
-        );
-        $this->assertContains(
-            '<a href="navigation.php' . PMA_URL_getCommon()
-            . '&hideNavItem=true&itemType=itemType&itemName=child'
-            . '&dbName=parent" class="hideNavItem ajax">',
-            $html
-        );
-    }
-}
diff --git a/#pma/test/classes/navigation/NodeDatabaseTest.php b/#pma/test/classes/navigation/NodeDatabaseTest.php
deleted file mode 100644
index 18ddef70..00000000
--- a/#pma/test/classes/navigation/NodeDatabaseTest.php
+++ /dev/null
@@ -1,137 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Tests for PMA\libraries\navigation\nodes\NodeDatabase class
- *
- * @package PhpMyAdmin-test
- */
-
-use PMA\libraries\navigation\NodeFactory;
-use PMA\libraries\Theme;
-
-require_once 'libraries/navigation/NodeFactory.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * Tests for PMA\libraries\navigation\nodes\NodeDatabase class
- *
- * @package PhpMyAdmin-test
- */
-class NodeDatabaseTest extends PMATestCase
-{
-    /**
-     * SetUp for test cases
-     *
-     * @return void
-     */
-    public function setup()
-    {
-        $GLOBALS['server'] = 0;
-        $GLOBALS['cfg']['DefaultTabDatabase'] = 'structure';
-        $GLOBALS['cfg']['MaxNavigationItems'] = 250;
-        $GLOBALS['cfg']['Server'] = array();
-        $GLOBALS['cfg']['Server']['DisableIS'] = true;
-        $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
-    }
-
-    /**
-     * Test for __construct
-     *
-     * @return void
-     */
-    public function testConstructor()
-    {
-        $parent = NodeFactory::getInstance('NodeDatabase');
-        $this->assertArrayHasKey(
-            'text',
-            $parent->links
-        );
-        $this->assertContains(
-            'db_structure.php',
-            $parent->links['text']
-        );
-        $this->assertContains('database', $parent->classes);
-    }
-
-    /**
-     * Test for getPresence
-     *
-     * @return void
-     */
-    public function testGetPresence()
-    {
-        $parent = NodeFactory::getInstance('NodeDatabase');
-        $this->assertEquals(
-            2,
-            $parent->getPresence('tables')
-        );
-        $this->assertEquals(
-            0,
-            $parent->getPresence('views')
-        );
-        $this->assertEquals(
-            1,
-            $parent->getPresence('functions')
-        );
-        $this->assertEquals(
-            0,
-            $parent->getPresence('procedures')
-        );
-        $this->assertEquals(
-            0,
-            $parent->getPresence('events')
-        );
-    }
-
-    /**
-     * Test for getData
-     *
-     * @return void
-     */
-    public function testGetData()
-    {
-        $parent = NodeFactory::getInstance('NodeDatabase');
-
-        $tables = $parent->getData('tables', 0);
-        $this->assertContains(
-            'test1',
-            $tables
-        );
-        $this->assertContains(
-            'test2',
-            $tables
-        );
-
-        $views = $parent->getData('views', 0);
-        $this->assertEmpty($views);
-
-        $functions = $parent->getData('functions', 0);
-        $this->assertContains(
-            'testFunction',
-            $functions
-        );
-        $this->assertEquals(
-            1,
-            count($functions)
-        );
-
-        $this->assertEmpty($parent->getData('procedures', 0));
-        $this->assertEmpty($parent->getData('events', 0));
-    }
-
-    /**
-     * Test for setHiddenCount and getHiddenCount
-     *
-     * @return void
-     */
-    public function testHiddenCount()
-    {
-        $parent = NodeFactory::getInstance('NodeDatabase');
-
-        $parent->setHiddenCount(3);
-        $this->assertEquals(
-            3,
-            $parent->getHiddenCount()
-        );
-    }
-}
diff --git a/#pma/test/classes/navigation/NodeEventContainerTest.php b/#pma/test/classes/navigation/NodeEventContainerTest.php
deleted file mode 100644
index 88a2e132..00000000
--- a/#pma/test/classes/navigation/NodeEventContainerTest.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Tests for PMA\libraries\navigation\nodes\NodeEventContainer class
- *
- * @package PhpMyAdmin-test
- */
-
-use PMA\libraries\navigation\NodeFactory;
-use PMA\libraries\Theme;
-
-require_once 'libraries/navigation/NodeFactory.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * Tests for PMA\libraries\navigation\nodes\NodeEventContainer class
- *
- * @package PhpMyAdmin-test
- */
-class NodeEventContainerTest extends PMATestCase
-{
-    /**
-     * SetUp for test cases
-     *
-     * @return void
-     */
-    public function setup()
-    {
-        $GLOBALS['server'] = 0;
-        $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
-    }
-
-    /**
-     * Test for __construct
-     *
-     * @return void
-     */
-    public function testConstructor()
-    {
-        $parent = NodeFactory::getInstance('NodeEventContainer');
-        $this->assertArrayHasKey(
-            'text',
-            $parent->links
-        );
-        $this->assertContains(
-            'db_events.php',
-            $parent->links['text']
-        );
-        $this->assertEquals('events', $parent->real_name);
-    }
-}
diff --git a/#pma/test/classes/navigation/NodeEventTest.php b/#pma/test/classes/navigation/NodeEventTest.php
deleted file mode 100644
index 971657ca..00000000
--- a/#pma/test/classes/navigation/NodeEventTest.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Tests for PMA\libraries\navigation\nodes\NodeEvent class
- *
- * @package PhpMyAdmin-test
- */
-
-use PMA\libraries\navigation\NodeFactory;
-use PMA\libraries\Theme;
-
-require_once 'libraries/navigation/NodeFactory.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * Tests for PMA\libraries\navigation\nodes\NodeEvent class
- *
- * @package PhpMyAdmin-test
- */
-class NodeEventTest extends PMATestCase
-{
-    /**
-     * SetUp for test cases
-     *
-     * @return void
-     */
-    public function setup()
-    {
-        $GLOBALS['server'] = 0;
-        $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
-    }
-
-    /**
-     * Test for __construct
-     *
-     * @return void
-     */
-    public function testConstructor()
-    {
-        $parent = NodeFactory::getInstance('NodeEvent');
-        $this->assertArrayHasKey(
-            'text',
-            $parent->links
-        );
-        $this->assertContains(
-            'db_events.php',
-            $parent->links['text']
-        );
-    }
-}
diff --git a/#pma/test/classes/navigation/NodeFactoryTest.php b/#pma/test/classes/navigation/NodeFactoryTest.php
deleted file mode 100644
index eccf4403..00000000
--- a/#pma/test/classes/navigation/NodeFactoryTest.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Tests for NodeFactory class
- *
- * @package PhpMyAdmin-test
- */
-
-use PMA\libraries\navigation\NodeFactory;
-use PMA\libraries\navigation\nodes\Node;
-use PMA\libraries\Theme;
-
-require_once 'libraries/navigation/NodeFactory.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * Tests for NodeFactory class
- *
- * @package PhpMyAdmin-test
- */
-class NodeFactoryTest extends PMATestCase
-{
-    /**
-     * SetUp for test cases
-     *
-     * @return void
-     */
-    public function setup()
-    {
-        $GLOBALS['server'] = 0;
-        $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
-    }
-
-    /**
-     * Test for PMA\libraries\navigation\NodeFactory::getInstance
-     *
-     * @return void
-     */
-    public function testDefaultNode()
-    {
-        $node = NodeFactory::getInstance();
-        $this->assertEquals('default', $node->name);
-        $this->assertEquals(Node::OBJECT, $node->type);
-        $this->assertEquals(false, $node->is_group);
-    }
-
-    /**
-     * Test for PMA\libraries\navigation\NodeFactory::getInstance
-     *
-     * @return void
-     */
-    public function testDefaultContainer()
-    {
-        $node = NodeFactory::getInstance(
-            'Node',
-            'default',
-            Node::CONTAINER
-        );
-        $this->assertEquals('default', $node->name);
-        $this->assertEquals(Node::CONTAINER, $node->type);
-        $this->assertEquals(false, $node->is_group);
-    }
-
-    /**
-     * Test for PMA\libraries\navigation\NodeFactory::getInstance
-     *
-     * @return void
-     */
-    public function testGroupContainer()
-    {
-        $node = NodeFactory::getInstance(
-            'Node',
-            'default',
-            Node::CONTAINER,
-            true
-        );
-        $this->assertEquals('default', $node->name);
-        $this->assertEquals(Node::CONTAINER, $node->type);
-        $this->assertEquals(true, $node->is_group);
-    }
-
-    /**
-     * Test for PMA\libraries\navigation\NodeFactory::getInstance
-     *
-     * @return void
-     */
-    public function testFileError()
-    {
-        $this->setExpectedException('PHPUnit_Framework_Error');
-        NodeFactory::getInstance('NodeDoesNotExist');
-    }
-
-    /**
-     * Test for PMA\libraries\navigation\NodeFactory::getInstance
-     *
-     * @return void
-     */
-    public function testClassNameError()
-    {
-        $this->setExpectedException('PHPUnit_Framework_Error');
-        NodeFactory::getInstance('Invalid');
-    }
-}
diff --git a/#pma/test/classes/navigation/NodeFunctionContainerTest.php b/#pma/test/classes/navigation/NodeFunctionContainerTest.php
deleted file mode 100644
index 85c0391a..00000000
--- a/#pma/test/classes/navigation/NodeFunctionContainerTest.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Tests for PMA\libraries\navigation\nodes\NodeFunctionContainer class
- *
- * @package PhpMyAdmin-test
- */
-
-use PMA\libraries\navigation\NodeFactory;
-use PMA\libraries\Theme;
-
-require_once 'libraries/navigation/NodeFactory.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * Tests for PMA\libraries\navigation\nodes\NodeFunctionContainer class
- *
- * @package PhpMyAdmin-test
- */
-class NodeFunctionContainerTest extends PMATestCase
-{
-    /**
-     * SetUp for test cases
-     *
-     * @return void
-     */
-    public function setup()
-    {
-        $GLOBALS['server'] = 0;
-        $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
-    }
-
-    /**
-     * Test for __construct
-     *
-     * @return void
-     */
-    public function testConstructor()
-    {
-        $parent = NodeFactory::getInstance('NodeFunctionContainer');
-        $this->assertArrayHasKey(
-            'text',
-            $parent->links
-        );
-        $this->assertContains(
-            'db_routines.php',
-            $parent->links['text']
-        );
-        $this->assertEquals('functions', $parent->real_name);
-    }
-}
diff --git a/#pma/test/classes/navigation/NodeFunctionTest.php b/#pma/test/classes/navigation/NodeFunctionTest.php
deleted file mode 100644
index d47efe8b..00000000
--- a/#pma/test/classes/navigation/NodeFunctionTest.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Tests for PMA\libraries\navigation\nodes\NodeFunction class
- *
- * @package PhpMyAdmin-test
- */
-
-use PMA\libraries\navigation\NodeFactory;
-use PMA\libraries\Theme;
-
-require_once 'libraries/navigation/NodeFactory.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * Tests for PMA\libraries\navigation\nodes\NodeFunction class
- *
- * @package PhpMyAdmin-test
- */
-class NodeFunctionTest extends PMATestCase
-{
-    /**
-     * SetUp for test cases
-     *
-     * @return void
-     */
-    public function setup()
-    {
-        $GLOBALS['server'] = 0;
-        $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
-    }
-
-    /**
-     * Test for __construct
-     *
-     * @return void
-     */
-    public function testConstructor()
-    {
-        $parent = NodeFactory::getInstance('NodeFunction');
-        $this->assertArrayHasKey(
-            'text',
-            $parent->links
-        );
-        $this->assertContains(
-            'db_routines.php',
-            $parent->links['text']
-        );
-    }
-}
diff --git a/#pma/test/classes/navigation/NodeIndexContainerTest.php b/#pma/test/classes/navigation/NodeIndexContainerTest.php
deleted file mode 100644
index 8726e04d..00000000
--- a/#pma/test/classes/navigation/NodeIndexContainerTest.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Tests for PMA\libraries\navigation\nodes\NodeIndexContainer class
- *
- * @package PhpMyAdmin-test
- */
-
-use PMA\libraries\navigation\NodeFactory;
-use PMA\libraries\Theme;
-
-require_once 'libraries/navigation/NodeFactory.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * Tests for PMA\libraries\navigation\nodes\NodeIndexContainer class
- *
- * @package PhpMyAdmin-test
- */
-class NodeIndexContainerTest extends PMATestCase
-{
-    /**
-     * SetUp for test cases
-     *
-     * @return void
-     */
-    public function setup()
-    {
-        $GLOBALS['server'] = 0;
-        $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
-    }
-
-    /**
-     * Test for __construct
-     *
-     * @return void
-     */
-    public function testConstructor()
-    {
-        $parent = NodeFactory::getInstance('NodeIndexContainer');
-        $this->assertArrayHasKey(
-            'text',
-            $parent->links
-        );
-        $this->assertContains(
-            'tbl_structure.php',
-            $parent->links['text']
-        );
-        $this->assertEquals('indexes', $parent->real_name);
-    }
-}
diff --git a/#pma/test/classes/navigation/NodeIndexTest.php b/#pma/test/classes/navigation/NodeIndexTest.php
deleted file mode 100644
index 9cebcaa8..00000000
--- a/#pma/test/classes/navigation/NodeIndexTest.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Tests for PMA\libraries\navigation\nodes\NodeIndex class
- *
- * @package PhpMyAdmin-test
- */
-
-use PMA\libraries\navigation\NodeFactory;
-use PMA\libraries\Theme;
-
-require_once 'libraries/navigation/NodeFactory.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * Tests for PMA\libraries\navigation\nodes\NodeIndex class
- *
- * @package PhpMyAdmin-test
- */
-class NodeIndexTest extends PMATestCase
-{
-    /**
-     * SetUp for test cases
-     *
-     * @return void
-     */
-    public function setup()
-    {
-        $GLOBALS['server'] = 0;
-        $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
-    }
-
-    /**
-     * Test for __construct
-     *
-     * @return void
-     */
-    public function testConstructor()
-    {
-        $parent = NodeFactory::getInstance('NodeIndex');
-        $this->assertArrayHasKey(
-            'text',
-            $parent->links
-        );
-        $this->assertContains(
-            'tbl_indexes.php',
-            $parent->links['text']
-        );
-    }
-}
diff --git a/#pma/test/classes/navigation/NodeProcedureContainerTest.php b/#pma/test/classes/navigation/NodeProcedureContainerTest.php
deleted file mode 100644
index 4eb3ea2d..00000000
--- a/#pma/test/classes/navigation/NodeProcedureContainerTest.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Tests for PMA\libraries\navigation\nodes\NodeProcedureContainer class
- *
- * @package PhpMyAdmin-test
- */
-
-use PMA\libraries\navigation\NodeFactory;
-use PMA\libraries\Theme;
-
-require_once 'libraries/navigation/NodeFactory.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * Tests for PMA\libraries\navigation\nodes\NodeProcedureContainer class
- *
- * @package PhpMyAdmin-test
- */
-class NodeProcedureContainerTest extends PMATestCase
-{
-    /**
-     * SetUp for test cases
-     *
-     * @return void
-     */
-    public function setup()
-    {
-        $GLOBALS['server'] = 0;
-        $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
-    }
-
-    /**
-     * Test for __construct
-     *
-     * @return void
-     */
-    public function testConstructor()
-    {
-        $parent = NodeFactory::getInstance('NodeProcedureContainer');
-        $this->assertArrayHasKey(
-            'text',
-            $parent->links
-        );
-        $this->assertContains(
-            'db_routines.php',
-            $parent->links['text']
-        );
-        $this->assertEquals('procedures', $parent->real_name);
-    }
-}
diff --git a/#pma/test/classes/navigation/NodeProcedureTest.php b/#pma/test/classes/navigation/NodeProcedureTest.php
deleted file mode 100644
index ba117edd..00000000
--- a/#pma/test/classes/navigation/NodeProcedureTest.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Tests for PMA\libraries\navigation\nodes\NodeProcedure class
- *
- * @package PhpMyAdmin-test
- */
-
-use PMA\libraries\navigation\NodeFactory;
-use PMA\libraries\Theme;
-
-require_once 'libraries/navigation/NodeFactory.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * Tests for PMA\libraries\navigation\nodes\NodeProcedure class
- *
- * @package PhpMyAdmin-test
- */
-class NodeProcedureTest extends PMATestCase
-{
-    /**
-     * SetUp for test cases
-     *
-     * @return void
-     */
-    public function setup()
-    {
-        $GLOBALS['server'] = 0;
-        $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
-    }
-
-    /**
-     * Test for __construct
-     *
-     * @return void
-     */
-    public function testConstructor()
-    {
-        $parent = NodeFactory::getInstance('NodeProcedure');
-        $this->assertArrayHasKey(
-            'text',
-            $parent->links
-        );
-        $this->assertContains(
-            'db_routines.php',
-            $parent->links['text']
-        );
-    }
-}
diff --git a/#pma/test/classes/navigation/NodeTableContainerTest.php b/#pma/test/classes/navigation/NodeTableContainerTest.php
deleted file mode 100644
index 08fce793..00000000
--- a/#pma/test/classes/navigation/NodeTableContainerTest.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Tests for PMA\libraries\navigation\nodes\NodeTableContainer class
- *
- * @package PhpMyAdmin-test
- */
-
-use PMA\libraries\navigation\NodeFactory;
-use PMA\libraries\Theme;
-
-require_once 'libraries/navigation/NodeFactory.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * Tests for PMA\libraries\navigation\nodes\NodeTableContainer class
- *
- * @package PhpMyAdmin-test
- */
-class NodeTableContainerTest extends PMATestCase
-{
-    /**
-     * SetUp for test cases
-     *
-     * @return void
-     */
-    public function setup()
-    {
-        $GLOBALS['server'] = 0;
-        $GLOBALS['cfg']['NavigationTreeEnableGrouping'] = true;
-        $GLOBALS['cfg']['NavigationTreeDbSeparator'] = '_';
-        $GLOBALS['cfg']['NavigationTreeTableSeparator'] = '__';
-        $GLOBALS['cfg']['NavigationTreeTableLevel'] = 1;
-        $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
-    }
-
-
-    /**
-     * Test for __construct
-     *
-     * @return void
-     */
-    public function testConstructor()
-    {
-        $parent = NodeFactory::getInstance('NodeTableContainer');
-        $this->assertArrayHasKey(
-            'text',
-            $parent->links
-        );
-        $this->assertContains(
-            'db_structure.php',
-            $parent->links['text']
-        );
-        $this->assertEquals('tables', $parent->real_name);
-        $this->assertContains('tableContainer', $parent->classes);
-    }
-}
diff --git a/#pma/test/classes/navigation/NodeTableTest.php b/#pma/test/classes/navigation/NodeTableTest.php
deleted file mode 100644
index c09fdc74..00000000
--- a/#pma/test/classes/navigation/NodeTableTest.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Tests for PMA\libraries\navigation\nodes\NodeTable class
- *
- * @package PhpMyAdmin-test
- */
-
-use PMA\libraries\navigation\NodeFactory;
-use PMA\libraries\Theme;
-
-require_once 'libraries/navigation/NodeFactory.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * Tests for PMA\libraries\navigation\nodes\NodeTable class
- *
- * @package PhpMyAdmin-test
- */
-class NodeTableTest extends PMATestCase
-{
-    /**
-     * SetUp for test cases
-     *
-     * @return void
-     */
-    public function setup()
-    {
-        $GLOBALS['server'] = 0;
-        $GLOBALS['cfg']['NavigationTreeDefaultTabTable'] = 'b_browse';
-        $GLOBALS['cfg']['NavigationTreeDefaultTabTable2'] = '';
-        $GLOBALS['cfg']['DefaultTabTable'] = 'browse';
-        $GLOBALS['cfg']['MaxNavigationItems'] = 250;
-        $GLOBALS['cfg']['NavigationTreeEnableGrouping'] = true;
-        $GLOBALS['cfg']['NavigationTreeDbSeparator'] = '_';
-        $GLOBALS['cfg']['NavigationTreeTableSeparator'] = '__';
-        $GLOBALS['cfg']['NavigationTreeTableLevel'] = 1;
-        $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
-    }
-
-
-    /**
-     * Test for __construct
-     *
-     * @return void
-     */
-    public function testConstructor()
-    {
-        $parent = NodeFactory::getInstance('NodeTable');
-        $this->assertArrayHasKey(
-            'text',
-            $parent->links
-        );
-        $this->assertContains(
-            'sql.php',
-            $parent->links['text']
-        );
-        $this->assertContains('table', $parent->classes);
-    }
-
-    /**
-     * Tests whether the node icon is properly set based on the icon target.
-     *
-     * @param string $target    target of the icon
-     * @param string $imageName name of the image that should be set
-     *
-     * @return void
-     * @dataProvider providerForTestIcon
-     */
-    public function testIcon($target, $imageName)
-    {
-        $GLOBALS['cfg']['NavigationTreeDefaultTabTable'] = $target;
-        $node = NodeFactory::getInstance('NodeTable');
-        $this->assertContains($imageName, $node->icon[0]);
-    }
-
-    /**
-     * Data provider for testIcon().
-     *
-     * @return array data for testIcon()
-     */
-    public function providerForTestIcon()
-    {
-        return array(
-            array('structure', 'b_props'),
-            array('search', 'b_search'),
-            array('insert', 'b_insrow'),
-            array('sql', 'b_sql'),
-            array('browse', 'b_browse'),
-        );
-    }
-}
diff --git a/#pma/test/classes/navigation/NodeTest.php b/#pma/test/classes/navigation/NodeTest.php
deleted file mode 100644
index 32a25b6d..00000000
--- a/#pma/test/classes/navigation/NodeTest.php
+++ /dev/null
@@ -1,574 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Tests for Node class
- *
- * @package PhpMyAdmin-test
- */
-
-use PMA\libraries\navigation\NodeFactory;
-use PMA\libraries\navigation\nodes\Node;
-use PMA\libraries\Theme;
-
-require_once 'libraries/navigation/NodeFactory.php';
-require_once 'libraries/database_interface.inc.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * Tests for Node class
- *
- * @package PhpMyAdmin-test
- */
-class NodeTest extends PMATestCase
-{
-    /**
-     * SetUp for test cases
-     *
-     * @return void
-     */
-    public function setup()
-    {
-        $GLOBALS['server'] = 0;
-        $GLOBALS['cfg']['Server']['DisableIS'] = false;
-        $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
-    }
-
-    /**
-     * SetUp for AddNode
-     *
-     * @return void
-     */
-    public function testAddNode()
-    {
-        $parent = NodeFactory::getInstance('Node', 'parent');
-        $child = NodeFactory::getInstance('Node', 'child');
-        $parent->addChild($child);
-        $this->assertEquals(
-            $parent->getChild($child->name),
-            $child
-        );
-        $this->assertEquals(
-            $parent->getChild($child->real_name, true),
-            $child
-        );
-    }
-
-    /**
-     * SetUp for getChild
-     *
-     * @return void
-     */
-    public function testGetChildError()
-    {
-        $parent = NodeFactory::getInstance('Node', 'parent');
-        $this->assertEquals(
-            $parent->getChild("foo"),
-            false
-        );
-        $this->assertEquals(
-            $parent->getChild("foo", true),
-            false
-        );
-    }
-
-    /**
-     * SetUp for getChild
-     *
-     * @return void
-     */
-    public function testRemoveNode()
-    {
-        $parent = NodeFactory::getInstance('Node', 'parent');
-        $child = NodeFactory::getInstance('Node', 'child');
-        $parent->addChild($child);
-        $this->assertEquals(
-            $parent->getChild($child->name),
-            $child
-        );
-        $parent->removeChild($child->name);
-        $this->assertEquals(
-            $parent->getChild($child->name),
-            false
-        );
-    }
-
-    /**
-     * SetUp for hasChildren
-     *
-     * @return void
-     */
-    public function testNodeHasChildren()
-    {
-        $parent = NodeFactory::getInstance();
-        $empty_container = NodeFactory::getInstance(
-            'Node', 'empty', Node::CONTAINER
-        );
-        $child = NodeFactory::getInstance();
-        // test with no children
-        $this->assertEquals(
-            $parent->hasChildren(true),
-            false
-        );
-        $this->assertEquals(
-            $parent->hasChildren(false),
-            false
-        );
-        // test with an empty container
-        $parent->addChild($empty_container);
-        $this->assertEquals(
-            $parent->hasChildren(true),
-            true
-        );
-        $this->assertEquals(
-            $parent->hasChildren(false),
-            false
-        );
-        // test with a real child
-        $parent->addChild($child);
-        $this->assertEquals(
-            $parent->hasChildren(true),
-            true
-        );
-        $this->assertEquals(
-            $parent->hasChildren(false),
-            true
-        );
-    }
-
-    /**
-     * SetUp for numChildren
-     *
-     * @return void
-     */
-    public function testNumChildren()
-    {
-        // start with root node only
-        $parent = NodeFactory::getInstance();
-        $this->assertEquals($parent->numChildren(), 0);
-        // add a child
-        $child = NodeFactory::getInstance();
-        $parent->addChild($child);
-        $this->assertEquals($parent->numChildren(), 1);
-        // add a direct grandchild, this one doesn't count as
-        // it's not enclosed in a CONTAINER
-        $child->addChild(NodeFactory::getInstance());
-        $this->assertEquals($parent->numChildren(), 1);
-        // add a container, this one doesn't count wither
-        $container = NodeFactory::getInstance(
-            'Node', 'default', Node::CONTAINER
-        );
-        $parent->addChild($container);
-        $this->assertEquals($parent->numChildren(), 1);
-        // add a grandchild to container, this one counts
-        $container->addChild(NodeFactory::getInstance());
-        $this->assertEquals($parent->numChildren(), 2);
-        // add another grandchild to container, this one counts
-        $container->addChild(NodeFactory::getInstance());
-        $this->assertEquals($parent->numChildren(), 3);
-    }
-
-    /**
-     * SetUp for parents
-     *
-     * @return void
-     */
-    public function testParents()
-    {
-        $parent = NodeFactory::getInstance();
-        $this->assertEquals($parent->parents(), array()); // exclude self
-        $this->assertEquals($parent->parents(true), array($parent)); // include self
-
-        $child = NodeFactory::getInstance();
-        $parent->addChild($child);
-
-        $this->assertEquals($child->parents(), array($parent)); // exclude self
-        $this->assertEquals(
-            $child->parents(true),
-            array($child, $parent)
-        ); // include self
-    }
-
-    /**
-     * SetUp for realParent
-     *
-     * @return void
-     */
-    public function testRealParent()
-    {
-        $parent = NodeFactory::getInstance();
-        $this->assertEquals($parent->realParent(), false);
-
-        $child = NodeFactory::getInstance();
-        $parent->addChild($child);
-        $this->assertEquals($child->realParent(), $parent);
-    }
-
-    /**
-     * Tests whether Node->hasSiblings() method returns false
-     * when the node does not have any siblings.
-     *
-     * @return void
-     * @test
-     */
-    public function testHasSiblingsWithNoSiblings()
-    {
-        $parent = NodeFactory::getInstance();
-        $child = NodeFactory::getInstance();
-        $parent->addChild($child);
-        $this->assertEquals(false, $child->hasSiblings());
-    }
-
-    /**
-     * Tests whether Node->hasSiblings() method returns true
-     * when it actually has siblings.
-     *
-     * @return void
-     * @test
-     */
-    public function testHasSiblingsWithSiblings()
-    {
-        $parent = NodeFactory::getInstance();
-        $firstChild = NodeFactory::getInstance();
-        $parent->addChild($firstChild);
-        $secondChild = NodeFactory::getInstance();
-        $parent->addChild($secondChild);
-        // Normal case; two Node:NODE type siblings
-        $this->assertEquals(true, $firstChild->hasSiblings());
-
-        $parent = NodeFactory::getInstance();
-        $firstChild = NodeFactory::getInstance();
-        $parent->addChild($firstChild);
-        $secondChild = NodeFactory::getInstance(
-            'Node', 'default', Node::CONTAINER
-        );
-        $parent->addChild($secondChild);
-        // Empty Node::CONTAINER type node should not be considered in hasSiblings()
-        $this->assertEquals(false, $firstChild->hasSiblings());
-
-        $grandChild = NodeFactory::getInstance();
-        $secondChild->addChild($grandChild);
-        // Node::CONTAINER type nodes with children are counted for hasSiblings()
-        $this->assertEquals(true, $firstChild->hasSiblings());
-    }
-
-    /**
-     * It is expected that Node->hasSiblings() method always return true
-     * for Nodes that are 3 levels deep (columns and indexes).
-     *
-     * @return void
-     * @test
-     */
-    public function testHasSiblingsForNodesAtLevelThree()
-    {
-        $parent = NodeFactory::getInstance();
-        $child = NodeFactory::getInstance();
-        $parent->addChild($child);
-        $grandChild = NodeFactory::getInstance();
-        $child->addChild($grandChild);
-        $greatGrandChild = NodeFactory::getInstance();
-        $grandChild->addChild($greatGrandChild);
-
-        // Should return false for node that are two levels deeps
-        $this->assertEquals(false, $grandChild->hasSiblings());
-        // Should return true for node that are three levels deeps
-        $this->assertEquals(true, $greatGrandChild->hasSiblings());
-    }
-
-    /**
-     * Tests private method _getWhereClause()
-     *
-     * @return void
-     * @test
-     */
-    public function testGetWhereClause()
-    {
-        $method = new ReflectionMethod(
-            'PMA\libraries\navigation\nodes\Node', '_getWhereClause'
-        );
-        $method->setAccessible(true);
-
-        // Vanilla case
-        $node = NodeFactory::getInstance();
-        $this->assertEquals(
-            "WHERE TRUE ", $method->invoke($node, 'SCHEMA_NAME')
-        );
-
-        // When a schema names is passed as search clause
-        $this->assertEquals(
-            "WHERE TRUE AND `SCHEMA_NAME` LIKE '%schemaName%' ",
-            $method->invoke($node, 'SCHEMA_NAME', 'schemaName')
-        );
-
-        if (! isset($GLOBALS['cfg']['Server'])) {
-            $GLOBALS['cfg']['Server'] = array();
-        }
-
-        // When hide_db regular expression is present
-        $GLOBALS['cfg']['Server']['hide_db'] = 'regexpHideDb';
-        $this->assertEquals(
-            "WHERE TRUE AND `SCHEMA_NAME` NOT REGEXP 'regexpHideDb' ",
-            $method->invoke($node, 'SCHEMA_NAME')
-        );
-        unset($GLOBALS['cfg']['Server']['hide_db']);
-
-        // When only_db directive is present and it's a single db
-        $GLOBALS['cfg']['Server']['only_db'] = 'stringOnlyDb';
-        $this->assertEquals(
-            "WHERE TRUE AND ( `SCHEMA_NAME` LIKE 'stringOnlyDb' ) ",
-            $method->invoke($node, 'SCHEMA_NAME')
-        );
-        unset($GLOBALS['cfg']['Server']['only_db']);
-
-        // When only_db directive is present and it's an array of dbs
-        $GLOBALS['cfg']['Server']['only_db'] = array('onlyDbOne', 'onlyDbTwo');
-        $this->assertEquals(
-            "WHERE TRUE AND ( `SCHEMA_NAME` LIKE 'onlyDbOne' "
-            . "OR `SCHEMA_NAME` LIKE 'onlyDbTwo' ) ",
-            $method->invoke($node, 'SCHEMA_NAME')
-        );
-        unset($GLOBALS['cfg']['Server']['only_db']);
-    }
-
-    /**
-     * Tests getData() method when DisableIS is false and navigation tree
-     * grouping enabled.
-     *
-     * @return void
-     * @test
-     */
-    public function testGetDataWithEnabledISAndGroupingEnabled()
-    {
-        $pos = 10;
-        $limit = 20;
-        $GLOBALS['cfg']['Server']['DisableIS'] = false;
-        $GLOBALS['cfg']['NavigationTreeEnableGrouping'] = true;
-        $GLOBALS['cfg']['FirstLevelNavigationItems'] = $limit;
-        $GLOBALS['cfg']['NavigationTreeDbSeparator'] = '_';
-
-        $expectedSql  = "SELECT `SCHEMA_NAME` ";
-        $expectedSql .= "FROM `INFORMATION_SCHEMA`.`SCHEMATA`, ";
-        $expectedSql .= "(";
-        $expectedSql .= "SELECT DB_first_level ";
-        $expectedSql .= "FROM ( ";
-        $expectedSql .= "SELECT DISTINCT SUBSTRING_INDEX(SCHEMA_NAME, ";
-        $expectedSql .= "'_', 1) ";
-        $expectedSql .= "DB_first_level ";
-        $expectedSql .= "FROM INFORMATION_SCHEMA.SCHEMATA ";
-        $expectedSql .= "WHERE TRUE ";
-        $expectedSql .= ") t ";
-        $expectedSql .= "ORDER BY DB_first_level ASC ";
-        $expectedSql .= "LIMIT $pos, $limit";
-        $expectedSql .= ") t2 ";
-        $expectedSql .= "WHERE TRUE AND 1 = LOCATE(CONCAT(DB_first_level, '_'), ";
-        $expectedSql .= "CONCAT(SCHEMA_NAME, '_')) ";
-        $expectedSql .= "ORDER BY SCHEMA_NAME ASC";
-
-        // It would have been better to mock _getWhereClause method
-        // but strangely, mocking private methods is not supported in PHPUnit
-        $node = NodeFactory::getInstance();
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $dbi->expects($this->once())
-            ->method('fetchResult')
-            ->with($expectedSql);
-        $dbi->expects($this->any())->method('escapeString')
-            ->will($this->returnArgument(0));
-        $GLOBALS['dbi'] = $dbi;
-        $node->getData('', $pos);
-    }
-
-    /**
-     * Tests getData() method when DisableIS is false and navigation tree
-     * grouping disabled.
-     *
-     * @return void
-     * @test
-     */
-    public function testGetDataWithEnabledISAndGroupingDisabled()
-    {
-        $pos = 10;
-        $limit = 20;
-        $GLOBALS['cfg']['Server']['DisableIS'] = false;
-        $GLOBALS['cfg']['NavigationTreeEnableGrouping'] = false;
-        $GLOBALS['cfg']['FirstLevelNavigationItems'] = $limit;
-
-        $expectedSql  = "SELECT `SCHEMA_NAME` ";
-        $expectedSql .= "FROM `INFORMATION_SCHEMA`.`SCHEMATA` ";
-        $expectedSql .= "WHERE TRUE ";
-        $expectedSql .= "ORDER BY `SCHEMA_NAME` ";
-        $expectedSql .= "LIMIT $pos, $limit";
-
-        // It would have been better to mock _getWhereClause method
-        // but strangely, mocking private methods is not supported in PHPUnit
-        $node = NodeFactory::getInstance();
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $dbi->expects($this->once())
-            ->method('fetchResult')
-            ->with($expectedSql);
-        $dbi->expects($this->any())->method('escapeString')
-            ->will($this->returnArgument(0));
-
-        $GLOBALS['dbi'] = $dbi;
-        $node->getData('', $pos);
-    }
-
-    /**
-     * Tests getData() method when DisableIS is true and navigation tree
-     * grouping enabled.
-     *
-     * @return void
-     * @test
-     */
-    public function testGetDataWithDisabledISAndGroupingEnabled()
-    {
-        $pos = 0;
-        $limit = 10;
-        $GLOBALS['cfg']['Server']['DisableIS'] = true;
-        $GLOBALS['dbs_to_test'] = false;
-        $GLOBALS['cfg']['NavigationTreeEnableGrouping'] = true;
-        $GLOBALS['cfg']['FirstLevelNavigationItems'] = $limit;
-        $GLOBALS['cfg']['NavigationTreeDbSeparator'] = '_';
-
-        $node = NodeFactory::getInstance();
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $dbi->expects($this->once())
-            ->method('tryQuery')
-            ->with("SHOW DATABASES WHERE TRUE AND `Database` LIKE '%db%' ")
-            ->will($this->returnValue(true));
-        $dbi->expects($this->exactly(3))
-            ->method('fetchArray')
-            ->willReturnOnConsecutiveCalls(
-                array(
-                    '0' => 'db'
-                ),
-                array(
-                    '0' => 'aa_db'
-                ),
-                false
-            );
-
-        $dbi->expects($this->once())
-            ->method('fetchResult')
-            ->with(
-                "SHOW DATABASES WHERE TRUE AND `Database` LIKE '%db%' AND ("
-                . " LOCATE('db_', CONCAT(`Database`, '_')) = 1"
-                . " OR LOCATE('aa_', CONCAT(`Database`, '_')) = 1 )"
-            );
-        $dbi->expects($this->any())->method('escapeString')
-            ->will($this->returnArgument(0));
-
-        $GLOBALS['dbi'] = $dbi;
-        $node->getData('', $pos, 'db');
-    }
-
-    /**
-     * Tests the getPresence method when DisableIS is false and navigation tree
-     * grouping enabled.
-     *
-     * @return void
-     * @test
-     */
-    public function testGetPresenceWithEnabledISAndGroupingEnabled()
-    {
-        $GLOBALS['cfg']['Server']['DisableIS'] = false;
-        $GLOBALS['cfg']['NavigationTreeEnableGrouping'] = true;
-        $GLOBALS['cfg']['NavigationTreeDbSeparator'] = '_';
-
-        $query = "SELECT COUNT(*) ";
-        $query .= "FROM ( ";
-        $query .= "SELECT DISTINCT SUBSTRING_INDEX(SCHEMA_NAME, '_', 1) ";
-        $query .= "DB_first_level ";
-        $query .= "FROM INFORMATION_SCHEMA.SCHEMATA ";
-        $query .= "WHERE TRUE ";
-        $query .= ") t ";
-
-        // It would have been better to mock _getWhereClause method
-        // but strangely, mocking private methods is not supported in PHPUnit
-        $node = NodeFactory::getInstance();
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $dbi->expects($this->once())
-            ->method('fetchValue')
-            ->with($query);
-        $GLOBALS['dbi'] = $dbi;
-        $node->getPresence();
-    }
-
-    /**
-     * Tests the getPresence method when DisableIS is false and navigation tree
-     * grouping disabled.
-     *
-     * @return void
-     * @test
-     */
-    public function testGetPresenceWithEnabledISAndGroupingDisabled()
-    {
-        $GLOBALS['cfg']['Server']['DisableIS'] = false;
-        $GLOBALS['cfg']['NavigationTreeEnableGrouping'] = false;
-
-        $query = "SELECT COUNT(*) ";
-        $query .= "FROM INFORMATION_SCHEMA.SCHEMATA ";
-        $query .= "WHERE TRUE ";
-
-        $node = NodeFactory::getInstance();
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $dbi->expects($this->once())
-            ->method('fetchValue')
-            ->with($query);
-        $GLOBALS['dbi'] = $dbi;
-        $node->getPresence();
-    }
-
-    /**
-     * Tests the getPresence method when DisableIS is true
-     *
-     * @return void
-     * @test
-     */
-    public function testGetPresenceWithDisabledIS()
-    {
-        $GLOBALS['cfg']['Server']['DisableIS'] = true;
-        $GLOBALS['dbs_to_test'] = false;
-        $GLOBALS['cfg']['NavigationTreeEnableGrouping'] = true;
-
-        $node = NodeFactory::getInstance();
-
-        // test with no search clause
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $dbi->expects($this->once())
-            ->method('tryQuery')
-            ->with("SHOW DATABASES WHERE TRUE ");
-        $dbi->expects($this->any())->method('escapeString')
-            ->will($this->returnArgument(0));
-
-        $GLOBALS['dbi'] = $dbi;
-        $node->getPresence();
-
-        // test with a search clause
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $dbi->expects($this->once())
-            ->method('tryQuery')
-            ->with("SHOW DATABASES WHERE TRUE AND `Database` LIKE '%dbname%' ");
-        $dbi->expects($this->any())->method('escapeString')
-            ->will($this->returnArgument(0));
-
-        $GLOBALS['dbi'] = $dbi;
-        $node->getPresence('', 'dbname');
-    }
-}
diff --git a/#pma/test/classes/navigation/NodeTriggerContainerTest.php b/#pma/test/classes/navigation/NodeTriggerContainerTest.php
deleted file mode 100644
index eb2fa944..00000000
--- a/#pma/test/classes/navigation/NodeTriggerContainerTest.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Tests for PMA\libraries\navigation\nodes\NodeTrigger class
- *
- * @package PhpMyAdmin-test
- */
-
-use PMA\libraries\navigation\NodeFactory;
-use PMA\libraries\Theme;
-
-require_once 'libraries/navigation/NodeFactory.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * Tests for PMA\libraries\navigation\nodes\NodeTrigger class
- *
- * @package PhpMyAdmin-test
- */
-class NodeTriggerContainerTest extends PMATestCase
-{
-    /**
-     * SetUp for test cases
-     *
-     * @return void
-     */
-    public function setup()
-    {
-        $GLOBALS['server'] = 0;
-        $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
-    }
-
-
-    /**
-     * Test for __construct
-     *
-     * @return void
-     */
-    public function testConstructor()
-    {
-        $parent = NodeFactory::getInstance('NodeTriggerContainer');
-        $this->assertArrayHasKey(
-            'text',
-            $parent->links
-        );
-        $this->assertContains(
-            'db_triggers.php',
-            $parent->links['text']
-        );
-        $this->assertEquals('triggers', $parent->real_name);
-    }
-}
diff --git a/#pma/test/classes/navigation/NodeTriggerTest.php b/#pma/test/classes/navigation/NodeTriggerTest.php
deleted file mode 100644
index c2f20d0b..00000000
--- a/#pma/test/classes/navigation/NodeTriggerTest.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Tests for PMA\libraries\navigation\nodes\NodeTrigger class
- *
- * @package PhpMyAdmin-test
- */
-
-use PMA\libraries\navigation\NodeFactory;
-use PMA\libraries\Theme;
-
-require_once 'libraries/navigation/NodeFactory.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * Tests for PMA\libraries\navigation\nodes\NodeTrigger class
- *
- * @package PhpMyAdmin-test
- */
-class NodeTriggerTest extends PMATestCase
-{
-    /**
-     * SetUp for test cases
-     *
-     * @return void
-     */
-    public function setup()
-    {
-        $GLOBALS['server'] = 0;
-        $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
-    }
-
-
-    /**
-     * Test for __construct
-     *
-     * @return void
-     */
-    public function testConstructor()
-    {
-        $parent = NodeFactory::getInstance('NodeTrigger');
-        $this->assertArrayHasKey(
-            'text',
-            $parent->links
-        );
-        $this->assertContains(
-            'db_triggers.php',
-            $parent->links['text']
-        );
-    }
-}
diff --git a/#pma/test/classes/navigation/NodeViewContainerTest.php b/#pma/test/classes/navigation/NodeViewContainerTest.php
deleted file mode 100644
index dcf2a8a0..00000000
--- a/#pma/test/classes/navigation/NodeViewContainerTest.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Tests for PMA\libraries\navigation\nodes\NodeViewContainer class
- *
- * @package PhpMyAdmin-test
- */
-
-use PMA\libraries\navigation\NodeFactory;
-use PMA\libraries\Theme;
-
-require_once 'libraries/navigation/NodeFactory.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * Tests for PMA\libraries\navigation\nodes\NodeViewContainer class
- *
- * @package PhpMyAdmin-test
- */
-class NodeViewContainerTest extends PMATestCase
-{
-    /**
-     * SetUp for test cases
-     *
-     * @return void
-     */
-    public function setup()
-    {
-        $GLOBALS['server'] = 0;
-        $GLOBALS['cfg']['NavigationTreeEnableGrouping'] = true;
-        $GLOBALS['cfg']['NavigationTreeDbSeparator'] = '_';
-        $GLOBALS['cfg']['NavigationTreeTableSeparator'] = '__';
-        $GLOBALS['cfg']['NavigationTreeTableLevel'] = 1;
-        $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
-    }
-
-
-    /**
-     * Test for __construct
-     *
-     * @return void
-     */
-    public function testConstructor()
-    {
-        $parent = NodeFactory::getInstance('NodeViewContainer');
-        $this->assertArrayHasKey(
-            'text',
-            $parent->links
-        );
-        $this->assertContains(
-            'db_structure.php',
-            $parent->links['text']
-        );
-        $this->assertEquals('views', $parent->real_name);
-        $this->assertContains('viewContainer', $parent->classes);
-    }
-}
diff --git a/#pma/test/classes/navigation/NodeViewTest.php b/#pma/test/classes/navigation/NodeViewTest.php
deleted file mode 100644
index bd4c8163..00000000
--- a/#pma/test/classes/navigation/NodeViewTest.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Tests for PMA\libraries\navigation\nodes\NodeView class
- *
- * @package PhpMyAdmin-test
- */
-
-use PMA\libraries\navigation\NodeFactory;
-use PMA\libraries\Theme;
-
-require_once 'libraries/navigation/NodeFactory.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * Tests for PMA\libraries\navigation\nodes\NodeView class
- *
- * @package PhpMyAdmin-test
- */
-class NodeViewTest extends PMATestCase
-{
-    /**
-     * SetUp for test cases
-     *
-     * @return void
-     */
-    public function setup()
-    {
-        $GLOBALS['server'] = 0;
-        $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
-    }
-
-
-    /**
-     * Test for __construct
-     *
-     * @return void
-     */
-    public function testConstructor()
-    {
-        $parent = NodeFactory::getInstance('NodeView');
-        $this->assertArrayHasKey(
-            'text',
-            $parent->links
-        );
-        $this->assertContains(
-            'sql.php',
-            $parent->links['text']
-        );
-        $this->assertContains('b_props', $parent->icon);
-        $this->assertContains('view', $parent->classes);
-    }
-}
diff --git a/#pma/test/classes/plugin/auth/AuthenticationConfigTest.php b/#pma/test/classes/plugin/auth/AuthenticationConfigTest.php
deleted file mode 100644
index 89102623..00000000
--- a/#pma/test/classes/plugin/auth/AuthenticationConfigTest.php
+++ /dev/null
@@ -1,150 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for PMA\libraries\plugins\auth\AuthenticationConfig class
- *
- * @package PhpMyAdmin-test
- */
-
-use PMA\libraries\plugins\auth\AuthenticationConfig;
-
-require_once 'libraries/config.default.php';
-require_once 'libraries/js_escape.lib.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * tests for PMA\libraries\plugins\auth\AuthenticationConfig class
- *
- * @package PhpMyAdmin-test
- */
-class AuthenticationConfigTest extends PMATestCase
-{
-    protected $object;
-
-    /**
-     * Configures global environment.
-     *
-     * @return void
-     */
-    function setup()
-    {
-        $GLOBALS['PMA_Config'] = new PMA\libraries\Config();
-        $GLOBALS['PMA_Config']->enableBc();
-        $GLOBALS['server'] = 0;
-        $GLOBALS['token_provided'] = true;
-        $GLOBALS['token_mismatch'] = false;
-        $this->object = new AuthenticationConfig();
-    }
-
-    /**
-     * tearDown for test cases
-     *
-     * @return void
-     */
-    public function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationConfig::auth
-     *
-     * @return void
-     */
-    public function testAuth()
-    {
-        $this->assertTrue(
-            $this->object->auth()
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationConfig::authCheck
-     *
-     * @return void
-     */
-    public function testAuthCheck()
-    {
-        $this->assertTrue(
-            $this->object->authCheck()
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationConfig::authSetUser
-     *
-     * @return void
-     */
-    public function testAuthSetUser()
-    {
-        $this->assertTrue(
-            $this->object->authSetUser()
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationConfig::authFails
-     *
-     * @return void
-     */
-    public function testAuthFails()
-    {
-        $removeConstant = false;
-        $GLOBALS['error_handler'] = new PMA\libraries\ErrorHandler;
-        $GLOBALS['cfg']['Servers'] = array(1);
-        $GLOBALS['allowDeny_forbidden'] = false;
-        $GLOBALS['collation_connection'] = 'utf-8';
-        if (!defined('PMA_USR_BROWSER_AGENT')) {
-            define('PMA_USR_BROWSER_AGENT', 'chrome');
-
-            $removeConstant = true;
-
-            if (! PMA_HAS_RUNKIT) {
-                $this->markTestSkipped('Cannot remove constant');
-            }
-        }
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $GLOBALS['dbi'] = $dbi;
-
-        ob_start();
-        $result = $this->object->authFails();
-        $html = ob_get_clean();
-
-        $this->assertTrue(
-            $result
-        );
-
-        $this->assertContains(
-            'You probably did not create a configuration file. You might want ' .
-            'to use the <a href="setup/">setup script</a> to create one.',
-            $html
-        );
-
-        $this->assertContains(
-            '<strong>MySQL said: </strong><a href="./url.php?url=https%3A%2F%2F' .
-            'dev.mysql.com%2Fdoc%2Frefman%2F5.7%2Fen%2Ferror-messages-server.html"' .
-            ' target="mysql_doc">' .
-            '<img src="themes/dot.gif" title="Documentation" alt="Documentation" ' .
-            'class="icon ic_b_help" /></a>',
-            $html
-        );
-
-        $this->assertContains(
-            'Cannot connect: invalid settings.',
-            $html
-        );
-
-        $this->assertContains(
-            '<a href="index.php?server=0&amp;lang=en'
-            . '&amp;collation_connection=utf-8&amp;token=token" '
-            . 'class="button disableAjax">Retry to connect</a>',
-            $html
-        );
-        if ($removeConstant) {
-            runkit_constant_remove('PMA_USR_BROWSER_AGENT');
-        }
-    }
-}
diff --git a/#pma/test/classes/plugin/auth/AuthenticationCookieTest.php b/#pma/test/classes/plugin/auth/AuthenticationCookieTest.php
deleted file mode 100644
index dbee3ccf..00000000
--- a/#pma/test/classes/plugin/auth/AuthenticationCookieTest.php
+++ /dev/null
@@ -1,1182 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for PMA\libraries\plugins\auth\AuthenticationCookie class
- *
- * @package PhpMyAdmin-test
- */
-
-use PMA\libraries\plugins\auth\AuthenticationCookie;
-use PMA\libraries\Theme;
-
-$GLOBALS['PMA_Config'] = new PMA\libraries\Config();
-
-require_once 'libraries/config.default.php';
-require_once 'libraries/js_escape.lib.php';
-require_once 'libraries/sanitizing.lib.php';
-require_once 'libraries/database_interface.inc.php';
-require_once 'libraries/plugins/auth/AuthenticationCookie.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * tests for PMA\libraries\plugins\auth\AuthenticationCookie class
- *
- * @package PhpMyAdmin-test
- */
-class AuthenticationCookieTest extends PMATestCase
-{
-    /**
-     * @var AuthenticationCookie
-     */
-    protected $object;
-
-    /**
-     * Configures global environment.
-     *
-     * @return void
-     */
-    function setup()
-    {
-        $GLOBALS['PMA_Config']->enableBc();
-        $GLOBALS['server'] = 0;
-        $GLOBALS['text_dir'] = 'ltr';
-        $GLOBALS['db'] = 'db';
-        $GLOBALS['table'] = 'table';
-        $this->object = new AuthenticationCookie();
-
-        $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
-        $_SESSION['PMA_Theme'] = new Theme();
-        $GLOBALS['PMA_PHP_SELF'] = '/phpmyadmin/';
-    }
-
-    /**
-     * tearDown for test cases
-     *
-     * @return void
-     */
-    public function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationConfig::auth
-     *
-     * @return void
-     * @group medium
-     */
-    public function testAuthErrorAJAX()
-    {
-        $restoreInstance = PMA\libraries\Response::getInstance();
-
-        $mockResponse = $this->getMockBuilder('PMA\libraries\Response')
-            ->disableOriginalConstructor()
-            ->setMethods(array('isAjax', 'setRequestStatus', 'addJSON'))
-            ->getMock();
-
-        $mockResponse->expects($this->once())
-            ->method('isAjax')
-            ->with()
-            ->will($this->returnValue(true));
-
-        $mockResponse->expects($this->once())
-            ->method('setRequestStatus')
-            ->with(false);
-
-        $mockResponse->expects($this->once())
-            ->method('addJSON')
-            ->with(
-                'redirect_flag',
-                '1'
-            );
-
-        $attrInstance = new ReflectionProperty('PMA\libraries\Response', '_instance');
-        $attrInstance->setAccessible(true);
-        $attrInstance->setValue($mockResponse);
-        $GLOBALS['conn_error'] = true;
-        $this->assertTrue(
-            $this->object->auth()
-        );
-
-        $attrInstance->setValue($restoreInstance);
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationConfig::auth
-     *
-     * @return void
-     * @group medium
-     */
-    public function testAuthError()
-    {
-        $restoreInstance = PMA\libraries\Response::getInstance();
-        $mockResponse = $this->getMockBuilder('PMA\libraries\Response')
-            ->disableOriginalConstructor()
-            ->setMethods(array('isAjax', 'getFooter', 'getHeader'))
-            ->getMock();
-
-        $mockResponse->expects($this->once())
-            ->method('isAjax')
-            ->with()
-            ->will($this->returnValue(false));
-
-        $_REQUEST['old_usr'] = '';
-        $GLOBALS['cfg']['LoginCookieRecall'] = true;
-        $GLOBALS['cfg']['blowfish_secret'] = 'secret';
-        $GLOBALS['PHP_AUTH_USER'] = 'pmauser';
-        $GLOBALS['pma_auth_server'] = 'localhost';
-
-        // mock footer
-        $mockFooter = $this->getMockBuilder('PMA\libraries\Footer')
-            ->disableOriginalConstructor()
-            ->setMethods(array('setMinimal'))
-            ->getMock();
-
-        $mockFooter->expects($this->once())
-            ->method('setMinimal')
-            ->with();
-
-        // mock header
-
-        $mockHeader = $this->getMockBuilder('PMA\libraries\Header')
-            ->disableOriginalConstructor()
-            ->setMethods(
-                array(
-                    'setBodyId',
-                    'setTitle',
-                    'disableMenuAndConsole',
-                    'disableWarnings'
-                )
-            )
-            ->getMock();
-
-        $mockHeader->expects($this->once())
-            ->method('setBodyId')
-            ->with('loginform');
-
-        $mockHeader->expects($this->once())
-            ->method('setTitle')
-            ->with('phpMyAdmin');
-
-        $mockHeader->expects($this->once())
-            ->method('disableMenuAndConsole')
-            ->with();
-
-        $mockHeader->expects($this->once())
-            ->method('disableWarnings')
-            ->with();
-
-        // set mocked headers and footers
-
-        $mockResponse->expects($this->once())
-            ->method('getFooter')
-            ->with()
-            ->will($this->returnValue($mockFooter));
-
-        $mockResponse->expects($this->once())
-            ->method('getHeader')
-            ->with()
-            ->will($this->returnValue($mockHeader));
-
-        $attrInstance = new ReflectionProperty('PMA\libraries\Response', '_instance');
-        $attrInstance->setAccessible(true);
-        $attrInstance->setValue($mockResponse);
-
-        $GLOBALS['pmaThemeImage'] = 'test';
-        $GLOBALS['conn_error'] = true;
-        $GLOBALS['cfg']['Lang'] = 'en';
-        $GLOBALS['cfg']['AllowArbitraryServer'] = true;
-        $GLOBALS['cfg']['Servers'] = array(1, 2);
-        $GLOBALS['cfg']['CaptchaLoginPrivateKey'] = '';
-        $GLOBALS['cfg']['CaptchaLoginPublicKey'] = '';
-        $GLOBALS['target'] = 'testTarget';
-        $GLOBALS['db'] = 'testDb';
-        $GLOBALS['table'] = 'testTable';
-
-        file_put_contents('testlogo_right.png', '');
-
-        // mock error handler
-
-        $mockErrorHandler = $this->getMockBuilder('PMA\libraries\ErrorHandler')
-            ->disableOriginalConstructor()
-            ->setMethods(array('hasDisplayErrors', 'dispErrors'))
-            ->getMock();
-
-        $mockErrorHandler->expects($this->once())
-            ->method('hasDisplayErrors')
-            ->with()
-            ->will($this->returnValue(true));
-
-        $mockErrorHandler->expects($this->once())
-            ->method('dispErrors')
-            ->with();
-
-        $GLOBALS['error_handler'] = $mockErrorHandler;
-
-        ob_start();
-        $this->object->auth();
-        $result = ob_get_clean();
-
-        // assertions
-
-        $this->assertContains(
-            '<img src="testlogo_right.png" id="imLogo"',
-            $result
-        );
-
-        $this->assertContains(
-            '<div class="error">',
-            $result
-        );
-
-        $this->assertContains(
-            '<form method="post" action="index.php" name="login_form" ' .
-            'class="disableAjax login hide js-show">',
-            $result
-        );
-
-        $this->assertContains(
-            '<input type="text" name="pma_servername" id="input_servername" ' .
-            'value="localhost"',
-            $result
-        );
-
-        $this->assertContains(
-            '<input type="text" name="pma_username" id="input_username" ' .
-            'value="pmauser" size="24" class="textfield"/>',
-            $result
-        );
-
-        $this->assertContains(
-            '<input type="password" name="pma_password" id="input_password" ' .
-            'value="" size="24" class="textfield" />',
-            $result
-        );
-
-        $this->assertContains(
-            '<select name="server" id="select_server" ' .
-            'onchange="document.forms[\'login_form\'].' .
-            'elements[\'pma_servername\'].value = \'\'" >',
-            $result
-        );
-
-        $this->assertContains(
-            '<input type="hidden" name="target" value="testTarget" />',
-            $result
-        );
-
-        $this->assertContains(
-            '<input type="hidden" name="db" value="testDb" />',
-            $result
-        );
-
-        $this->assertContains(
-            '<input type="hidden" name="table" value="testTable" />',
-            $result
-        );
-
-        @unlink('testlogo_right.png');
-        $attrInstance->setValue($restoreInstance);
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationConfig::auth
-     *
-     * @return void
-     * @group medium
-     */
-    public function testAuthCaptcha()
-    {
-        $restoreInstance = PMA\libraries\Response::getInstance();
-        $mockResponse = $this->getMockBuilder('PMA\libraries\Response')
-            ->disableOriginalConstructor()
-            ->setMethods(array('isAjax', 'getFooter', 'getHeader'))
-            ->getMock();
-
-        $mockResponse->expects($this->once())
-            ->method('isAjax')
-            ->with()
-            ->will($this->returnValue(false));
-
-        $mockResponse->expects($this->once())
-            ->method('getFooter')
-            ->with()
-            ->will($this->returnValue(new PMA\libraries\Footer()));
-
-        $mockResponse->expects($this->once())
-            ->method('getHeader')
-            ->with()
-            ->will($this->returnValue(new PMA\libraries\Header()));
-
-        $_REQUEST['old_usr'] = '';
-        $GLOBALS['cfg']['LoginCookieRecall'] = false;
-
-        $attrInstance = new ReflectionProperty('PMA\libraries\Response', '_instance');
-        $attrInstance->setAccessible(true);
-        $attrInstance->setValue($mockResponse);
-
-        $GLOBALS['pmaThemeImage'] = 'test';
-        $GLOBALS['cfg']['Lang'] = '';
-        $GLOBALS['cfg']['AllowArbitraryServer'] = false;
-        $GLOBALS['cfg']['Servers'] = array(1);
-        $GLOBALS['cfg']['CaptchaLoginPrivateKey'] = 'testprivkey';
-        $GLOBALS['cfg']['CaptchaLoginPublicKey'] = 'testpubkey';
-        $GLOBALS['server'] = 0;
-
-        $GLOBALS['error_handler'] = new PMA\libraries\ErrorHandler;
-
-        ob_start();
-        $this->object->auth();
-        $result = ob_get_clean();
-
-        // assertions
-
-        $this->assertContains(
-            '<img name="imLogo" id="imLogo" src="testpma_logo.png"',
-            $result
-        );
-
-        $this->assertContains(
-            '<select name="lang" class="autosubmit" lang="en" dir="ltr" ' .
-            'id="sel-lang">',
-            $result
-        );
-
-        $this->assertContains(
-            '<form method="post" action="index.php" name="login_form" ' .
-            'autocomplete="off" class="disableAjax login hide js-show">',
-            $result
-        );
-
-        $this->assertContains(
-            '<input type="hidden" name="server" value="0" />',
-            $result
-        );
-
-        $this->assertContains(
-            '<script src="https://www.google.com/recaptcha/api.js?hl=en"'
-            . ' async defer></script>',
-            $result
-        );
-
-        $this->assertContains(
-            '<div class="g-recaptcha" data-sitekey="testpubkey">',
-            $result
-        );
-
-        $attrInstance->setValue($restoreInstance);
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationConfig::auth with headers
-     *
-     * @return void
-     */
-    public function testAuthHeader()
-    {
-        $GLOBALS['cfg']['LoginCookieDeleteAll'] = false;
-        $GLOBALS['cfg']['Servers'] = array(1);
-
-        $restoreInstance = PMA\libraries\Response::getInstance();
-
-        $mockResponse = $this->getMockBuilder('PMA\libraries\Response')
-            ->disableOriginalConstructor()
-            ->setMethods(array('isAjax', 'headersSent', 'header'))
-            ->getMock();
-
-        $mockResponse->expects($this->any())
-            ->method('headersSent')
-            ->with()
-            ->will($this->returnValue(false));
-
-        $mockResponse->expects($this->once())
-            ->method('header')
-            ->with('Location: https://example.com/logout');
-
-        $attrInstance = new ReflectionProperty('PMA\libraries\Response', '_instance');
-        $attrInstance->setAccessible(true);
-        $attrInstance->setValue($mockResponse);
-
-        $GLOBALS['cfg']['Server']['LogoutURL'] = 'https://example.com/logout';
-
-        $this->object->logOut();
-
-        $attrInstance->setValue($restoreInstance);
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationConfig::authCheck
-     *
-     * @return void
-     */
-    public function testAuthCheckCaptcha()
-    {
-        $GLOBALS['cfg']['CaptchaLoginPrivateKey'] = 'testprivkey';
-        $GLOBALS['cfg']['CaptchaLoginPublicKey'] = 'testpubkey';
-        $_POST["g-recaptcha-response"] = '';
-        $_REQUEST['pma_username'] = 'testPMAUser';
-
-        $this->assertFalse(
-            $this->object->authCheck()
-        );
-
-        $this->assertEquals(
-            'Please enter correct captcha!',
-            $GLOBALS['conn_error']
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationConfig::authCheck
-     *
-     * @return void
-     */
-    public function testLogoutDelete()
-    {
-        $restoreInstance = PMA\libraries\Response::getInstance();
-
-        $mockResponse = $this->getMockBuilder('PMA\libraries\Response')
-            ->disableOriginalConstructor()
-            ->setMethods(array('isAjax', 'headersSent', 'header'))
-            ->getMock();
-
-        $mockResponse->expects($this->any())
-            ->method('headersSent')
-            ->with()
-            ->will($this->returnValue(false));
-
-        $mockResponse->expects($this->once())
-            ->method('header')
-            ->with('Location: /phpmyadmin/index.php');
-
-        $attrInstance = new ReflectionProperty('PMA\libraries\Response', '_instance');
-        $attrInstance->setAccessible(true);
-        $attrInstance->setValue($mockResponse);
-
-        $GLOBALS['cfg']['CaptchaLoginPrivateKey'] = '';
-        $GLOBALS['cfg']['CaptchaLoginPublicKey'] = '';
-        $GLOBALS['cfg']['LoginCookieDeleteAll'] = true;
-        $GLOBALS['PMA_Config']->set('PmaAbsoluteUri', '');
-        $GLOBALS['cfg']['Servers'] = array(1);
-
-        $_COOKIE['pmaAuth-0'] = 'test';
-
-        $this->object->logOut();
-
-        $this->assertFalse(
-            isset($_COOKIE['pmaAuth-0'])
-        );
-        $attrInstance->setValue($restoreInstance);
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationConfig::authCheck
-     *
-     * @return void
-     */
-    public function testLogout()
-    {
-        $restoreInstance = PMA\libraries\Response::getInstance();
-
-        $mockResponse = $this->getMockBuilder('PMA\libraries\Response')
-            ->disableOriginalConstructor()
-            ->setMethods(array('isAjax', 'headersSent', 'header'))
-            ->getMock();
-
-        $mockResponse->expects($this->any())
-            ->method('headersSent')
-            ->with()
-            ->will($this->returnValue(false));
-
-        $mockResponse->expects($this->once())
-            ->method('header')
-            ->with('Location: /phpmyadmin/index.php');
-
-        $attrInstance = new ReflectionProperty('PMA\libraries\Response', '_instance');
-        $attrInstance->setAccessible(true);
-        $attrInstance->setValue($mockResponse);
-        $GLOBALS['cfg']['CaptchaLoginPrivateKey'] = '';
-        $GLOBALS['cfg']['CaptchaLoginPublicKey'] = '';
-        $GLOBALS['cfg']['LoginCookieDeleteAll'] = false;
-        $GLOBALS['PMA_Config']->set('PmaAbsoluteUri', '');
-        $GLOBALS['cfg']['Servers'] = array(1);
-        $GLOBALS['server'] = 1;
-
-        $_COOKIE['pmaAuth-1'] = 'test';
-
-        $this->object->logOut();
-
-        $this->assertFalse(
-            isset($_COOKIE['pmaAuth-1'])
-        );
-        $attrInstance->setValue($restoreInstance);
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationConfig::authCheck
-     *
-     * @return void
-     */
-    public function testAuthCheckArbitrary()
-    {
-        $GLOBALS['cfg']['CaptchaLoginPrivateKey'] = '';
-        $GLOBALS['cfg']['CaptchaLoginPublicKey'] = '';
-        $_REQUEST['old_usr'] = '';
-        $_REQUEST['pma_username'] = 'testPMAUser';
-        $_REQUEST['pma_servername'] = 'testPMAServer';
-        $_REQUEST['pma_password'] = 'testPMAPSWD';
-        $GLOBALS['cfg']['AllowArbitraryServer'] = true;
-
-        $this->assertTrue(
-            $this->object->authCheck()
-        );
-
-        $this->assertEquals(
-            'testPMAUser',
-            $GLOBALS['PHP_AUTH_USER']
-        );
-
-        $this->assertEquals(
-            'testPMAPSWD',
-            $GLOBALS['PHP_AUTH_PW']
-        );
-
-        $this->assertEquals(
-            'testPMAServer',
-            $GLOBALS['pma_auth_server']
-        );
-
-        $this->assertFalse(
-            isset($_COOKIE['pmaAuth-1'])
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationConfig::authCheck
-     *
-     * @return void
-     */
-    public function testAuthCheckInvalidCookie()
-    {
-        $GLOBALS['cfg']['AllowArbitraryServer'] = true;
-        $_REQUEST['pma_servername'] = 'testPMAServer';
-        $_REQUEST['pma_password'] = 'testPMAPSWD';
-        $_REQUEST['pma_username'] = '';
-        $GLOBALS['server'] = 1;
-        $_COOKIE['pmaUser-1'] = '';
-        $_COOKIE['pma_iv-1'] = base64_encode('testiv09testiv09');
-
-        $this->assertFalse(
-            $this->object->authCheck()
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationConfig::authCheck
-     *
-     * @return void
-     */
-    public function testAuthCheckExpires()
-    {
-        $GLOBALS['server'] = 1;
-        $_COOKIE['pmaServer-1'] = 'pmaServ1';
-        $_COOKIE['pmaUser-1'] = 'pmaUser1';
-        $_COOKIE['pma_iv-1'] = base64_encode('testiv09testiv09');
-        $_COOKIE['pmaAuth-1'] = '';
-        $GLOBALS['cfg']['blowfish_secret'] = 'secret';
-        $_SESSION['last_access_time'] = time() - 1000;
-        $GLOBALS['cfg']['LoginCookieValidity'] = 1440;
-
-        $this->assertFalse(
-            $this->object->authCheck()
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationConfig::authCheck (mock blowfish functions reqd)
-     *
-     * @return void
-     */
-    public function testAuthCheckDecryptUser()
-    {
-        $GLOBALS['server'] = 1;
-        $_REQUEST['old_usr'] = '';
-        $_REQUEST['pma_username'] = '';
-        $_COOKIE['pmaServer-1'] = 'pmaServ1';
-        $_COOKIE['pmaUser-1'] = 'pmaUser1';
-        $_COOKIE['pma_iv-1'] = base64_encode('testiv09testiv09');
-        $GLOBALS['cfg']['blowfish_secret'] = 'secret';
-        $_SESSION['last_access_time'] = '';
-        $GLOBALS['cfg']['CaptchaLoginPrivateKey'] = '';
-        $GLOBALS['cfg']['CaptchaLoginPublicKey'] = '';
-
-        // mock for blowfish function
-        $this->object = $this->getMockBuilder('PMA\libraries\plugins\auth\AuthenticationCookie')
-            ->disableOriginalConstructor()
-            ->setMethods(array('cookieDecrypt'))
-            ->getMock();
-
-        $this->object->expects($this->once())
-            ->method('cookieDecrypt')
-            ->will($this->returnValue('testBF'));
-
-        $this->assertFalse(
-            $this->object->authCheck()
-        );
-
-        $this->assertEquals(
-            'testBF',
-            $GLOBALS['PHP_AUTH_USER']
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationConfig::authCheck (mocking blowfish functions)
-     *
-     * @return void
-     */
-    public function testAuthCheckDecryptPassword()
-    {
-        $GLOBALS['server'] = 1;
-        $_REQUEST['old_usr'] = '';
-        $_REQUEST['pma_username'] = '';
-        $_COOKIE['pmaServer-1'] = 'pmaServ1';
-        $_COOKIE['pmaUser-1'] = 'pmaUser1';
-        $_COOKIE['pmaAuth-1'] = 'pmaAuth1';
-        $_COOKIE['pma_iv-1'] = base64_encode('testiv09testiv09');
-        $GLOBALS['cfg']['blowfish_secret'] = 'secret';
-        $GLOBALS['cfg']['CaptchaLoginPrivateKey'] = '';
-        $GLOBALS['cfg']['CaptchaLoginPublicKey'] = '';
-        $_SESSION['last_access_time'] = time() - 1000;
-        $GLOBALS['cfg']['LoginCookieValidity'] = 1440;
-
-        // mock for blowfish function
-        $this->object = $this->getMockBuilder('PMA\libraries\plugins\auth\AuthenticationCookie')
-            ->disableOriginalConstructor()
-            ->setMethods(array('cookieDecrypt'))
-            ->getMock();
-
-        $this->object->expects($this->at(1))
-            ->method('cookieDecrypt')
-            ->will($this->returnValue('{"password":""}'));
-
-        $this->assertTrue(
-            $this->object->authCheck()
-        );
-
-        $this->assertTrue(
-            $GLOBALS['from_cookie']
-        );
-
-        $this->assertEquals(
-            '',
-            $GLOBALS['PHP_AUTH_PW']
-        );
-
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationConfig::authCheck (mocking the object itself)
-     *
-     * @return void
-     */
-    public function testAuthCheckAuthFails()
-    {
-        $GLOBALS['server'] = 1;
-        $_REQUEST['old_usr'] = '';
-        $_REQUEST['pma_username'] = '';
-        $_COOKIE['pmaServer-1'] = 'pmaServ1';
-        $_COOKIE['pmaUser-1'] = 'pmaUser1';
-        $_COOKIE['pma_iv-1'] = base64_encode('testiv09testiv09');
-        $GLOBALS['cfg']['blowfish_secret'] = 'secret';
-        $_SESSION['last_access_time'] = 1;
-        $GLOBALS['cfg']['CaptchaLoginPrivateKey'] = '';
-        $GLOBALS['cfg']['CaptchaLoginPublicKey'] = '';
-        $GLOBALS['cfg']['LoginCookieValidity'] = 0;
-        $_SESSION['last_access_time'] = -1;
-        // mock for blowfish function
-        $this->object = $this->getMockBuilder('PMA\libraries\plugins\auth\AuthenticationCookie')
-            ->disableOriginalConstructor()
-            ->setMethods(array('authFails'))
-            ->getMock();
-
-        $this->object->expects($this->once())
-            ->method('authFails');
-
-        $this->assertFalse(
-            $this->object->authCheck()
-        );
-
-        $this->assertTrue(
-            $GLOBALS['no_activity']
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationConfig::authSetUser
-     *
-     * @return void
-     */
-    public function testAuthSetUser()
-    {
-        $GLOBALS['PHP_AUTH_USER'] = 'pmaUser2';
-        $arr = array(
-            'host' => 'a',
-            'port' => 1,
-            'socket' => true,
-            'ssl' => true,
-            'connect_type' => 'port',
-            'user' => 'pmaUser2'
-        );
-
-        $GLOBALS['cfg']['Server'] = $arr;
-        $GLOBALS['cfg']['Server']['user'] = 'pmaUser';
-        $GLOBALS['cfg']['Servers'][1] = $arr;
-        $GLOBALS['cfg']['AllowArbitraryServer'] = true;
-        $GLOBALS['pma_auth_server'] = 'b 2';
-        $GLOBALS['PHP_AUTH_PW'] = $_SERVER['PHP_AUTH_PW'] = 'testPW';
-        $GLOBALS['server'] = 2;
-        $GLOBALS['cfg']['LoginCookieStore'] = true;
-        $GLOBALS['from_cookie'] = true;
-
-        $this->object->authSetUser();
-
-        $this->assertFalse(
-            isset($GLOBALS['PHP_AUTH_PW'])
-        );
-
-        $this->assertFalse(
-            isset($_SERVER['PHP_AUTH_PW'])
-        );
-
-        $this->object->storeUserCredentials();
-
-        $this->assertTrue(
-            isset($_COOKIE['pmaUser-1'])
-        );
-
-        $this->assertTrue(
-            isset($_COOKIE['pmaAuth-1'])
-        );
-
-        $arr['password'] = 'testPW';
-        $arr['host'] = 'b';
-        $arr['port'] = '2';
-        $this->assertEquals(
-            $arr,
-            $GLOBALS['cfg']['Server']
-        );
-
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationConfig::authSetUser (check for headers redirect)
-     *
-     * @return void
-     */
-    public function testAuthSetUserWithHeaders()
-    {
-        $GLOBALS['PHP_AUTH_USER'] = 'pmaUser2';
-        $arr = array(
-            'host' => 'a',
-            'port' => 1,
-            'socket' => true,
-            'ssl' => true,
-            'connect_type' => 'port',
-            'user' => 'pmaUser2'
-        );
-
-        $GLOBALS['cfg']['Server'] = $arr;
-        $GLOBALS['cfg']['Server']['host'] = 'b';
-        $GLOBALS['cfg']['Server']['user'] = 'pmaUser';
-        $GLOBALS['cfg']['Servers'][1] = $arr;
-        $GLOBALS['cfg']['AllowArbitraryServer'] = true;
-        $GLOBALS['pma_auth_server'] = 'b 2';
-        $GLOBALS['PHP_AUTH_PW'] = $_SERVER['PHP_AUTH_PW'] = 'testPW';
-        $GLOBALS['server'] = 2;
-        $GLOBALS['cfg']['LoginCookieStore'] = true;
-        $GLOBALS['from_cookie'] = false;
-        $GLOBALS['collation_connection'] = 'utf-8';
-
-        $restoreInstance = PMA\libraries\Response::getInstance();
-
-        $mockResponse = $this->getMockBuilder('PMA\libraries\Response')
-            ->disableOriginalConstructor()
-            ->setMethods(array('disable', 'header', 'headersSent'))
-            ->getMock();
-
-        $mockResponse->expects($this->at(0))
-            ->method('disable');
-
-        // target can be "phpunit" or "ide-phpunit.php",
-        // depending on testing environment
-        $mockResponse->expects($this->once())
-            ->method('header')
-            ->with(
-                $this->stringContains('&server=2&lang=en&collation_connection=utf-8&token=token')
-            );
-
-        $mockResponse->expects($this->any())
-            ->method('headersSent')
-            ->with()
-            ->will($this->returnValue(false));
-
-        $attrInstance = new ReflectionProperty('PMA\libraries\Response', '_instance');
-        $attrInstance->setAccessible(true);
-        $attrInstance->setValue($mockResponse);
-
-        $this->object->authSetUser();
-        $this->object->storeUserCredentials();
-
-        $attrInstance->setValue($restoreInstance);
-    }
-
-    public function doMockResponse()
-    {
-        $restoreInstance = PMA\libraries\Response::getInstance();
-
-        // set mocked headers and footers
-        $mockResponse = $this->getMockBuilder('PMA\libraries\Response')
-            ->disableOriginalConstructor()
-            ->setMethods(array('header', 'headersSent'))
-            ->getMock();
-
-        $mockResponse->expects($this->any())
-            ->method('headersSent')
-            ->with()
-            ->will($this->returnValue(false));
-
-        $attrInstance = new ReflectionProperty('PMA\libraries\Response', '_instance');
-        $attrInstance->setAccessible(true);
-        $attrInstance->setValue($mockResponse);
-
-        $headers = func_get_args();
-
-        $header_method = $mockResponse->expects($this->exactly(count($headers)))
-            ->method('header');
-
-        call_user_func_array(array($header_method, 'withConsecutive'), $headers);
-
-        $this->object->authFails();
-
-        $attrInstance->setValue($restoreInstance);
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationConfig::authFails
-     *
-     * @return void
-     */
-    public function testAuthFailsNoPass()
-    {
-        $this->object = $this->getMockBuilder('PMA\libraries\plugins\auth\AuthenticationCookie')
-            ->disableOriginalConstructor()
-            ->setMethods(array('auth'))
-            ->getMock();
-
-        $GLOBALS['server'] = 2;
-        $_COOKIE['pmaAuth-2'] = 'pass';
-
-        $GLOBALS['login_without_password_is_forbidden'] = '1';
-
-        $this->doMockResponse(
-            array('Cache-Control: no-store, no-cache, must-revalidate'),
-            array('Pragma: no-cache')
-        );
-
-        $this->assertEquals(
-            $GLOBALS['conn_error'],
-            'Login without a password is forbidden by configuration'
-            . ' (see AllowNoPassword)'
-        );
-
-    }
-
-    public function testAuthFailsDeny()
-    {
-        $this->object = $this->getMockBuilder('PMA\libraries\plugins\auth\AuthenticationCookie')
-            ->disableOriginalConstructor()
-            ->setMethods(array('auth'))
-            ->getMock();
-
-        $GLOBALS['server'] = 2;
-        $_COOKIE['pmaAuth-2'] = 'pass';
-
-        $GLOBALS['login_without_password_is_forbidden'] = '';
-        $GLOBALS['allowDeny_forbidden'] = '1';
-
-        $this->doMockResponse(
-            array('Cache-Control: no-store, no-cache, must-revalidate'),
-            array('Pragma: no-cache')
-        );
-
-        $this->assertEquals(
-            $GLOBALS['conn_error'],
-            'Access denied!'
-        );
-    }
-
-    public function testAuthFailsActivity()
-    {
-        $this->object = $this->getMockBuilder('PMA\libraries\plugins\auth\AuthenticationCookie')
-            ->disableOriginalConstructor()
-            ->setMethods(array('auth'))
-            ->getMock();
-
-        $GLOBALS['server'] = 2;
-        $_COOKIE['pmaAuth-2'] = 'pass';
-
-
-        $GLOBALS['allowDeny_forbidden'] = '';
-        $GLOBALS['no_activity'] = '1';
-        $GLOBALS['cfg']['LoginCookieValidity'] = 10;
-
-        $this->doMockResponse(
-            array('Cache-Control: no-store, no-cache, must-revalidate'),
-            array('Pragma: no-cache')
-        );
-
-        $this->assertEquals(
-            $GLOBALS['conn_error'],
-            'No activity within 10 seconds; please log in again.'
-        );
-    }
-
-    public function testAuthFailsDBI()
-    {
-        $this->object = $this->getMockBuilder('PMA\libraries\plugins\auth\AuthenticationCookie')
-            ->disableOriginalConstructor()
-            ->setMethods(array('auth'))
-            ->getMock();
-
-        $GLOBALS['server'] = 2;
-        $_COOKIE['pmaAuth-2'] = 'pass';
-
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->at(0))
-            ->method('getError')
-            ->will($this->returnValue(false));
-
-        $GLOBALS['dbi'] = $dbi;
-        $GLOBALS['no_activity'] = '';
-        $GLOBALS['errno'] = 42;
-
-        $this->doMockResponse(
-            array('Cache-Control: no-store, no-cache, must-revalidate'),
-            array('Pragma: no-cache')
-        );
-
-        $this->assertEquals(
-            $GLOBALS['conn_error'],
-            '#42 Cannot log in to the MySQL server'
-        );
-    }
-
-    public function testAuthFailsErrno()
-    {
-        $this->object = $this->getMockBuilder('PMA\libraries\plugins\auth\AuthenticationCookie')
-            ->disableOriginalConstructor()
-            ->setMethods(array('auth'))
-            ->getMock();
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->at(0))
-            ->method('getError')
-            ->will($this->returnValue(false));
-
-        $GLOBALS['dbi'] = $dbi;
-        $GLOBALS['server'] = 2;
-        $_COOKIE['pmaAuth-2'] = 'pass';
-
-        unset($GLOBALS['errno']);
-
-        $this->doMockResponse(
-            array('Cache-Control: no-store, no-cache, must-revalidate'),
-            array('Pragma: no-cache')
-        );
-
-        $this->assertEquals(
-            $GLOBALS['conn_error'],
-            'Cannot log in to the MySQL server'
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationConfig::_getEncryptionSecret
-     *
-     * @return void
-     */
-    public function testGetEncryptionSecretEmpty()
-    {
-        $method = new \ReflectionMethod(
-            'PMA\libraries\plugins\auth\AuthenticationCookie',
-            '_getEncryptionSecret'
-        );
-        $method->setAccessible(true);
-
-        $GLOBALS['cfg']['blowfish_secret'] = '';
-        $_SESSION['encryption_key'] = '';
-
-        $result = $method->invoke($this->object, null);
-
-        $this->assertEquals(
-            $result,
-            $_SESSION['encryption_key']
-        );
-
-        $this->assertEquals(
-            32,
-            strlen($result)
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationConfig::_getEncryptionSecret
-     *
-     * @return void
-     */
-    public function testGetEncryptionSecretConfigured()
-    {
-        $method = new \ReflectionMethod(
-            'PMA\libraries\plugins\auth\AuthenticationCookie',
-            '_getEncryptionSecret'
-        );
-        $method->setAccessible(true);
-
-        $GLOBALS['cfg']['blowfish_secret'] = 'notEmpty';
-
-        $result = $method->invoke($this->object, null);
-
-        $this->assertEquals(
-            'notEmpty',
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationConfig::cookieEncrypt
-     *
-     * @return void
-     */
-    public function testCookieEncrypt()
-    {
-        $this->object->setIV('testiv09testiv09');
-        // works with the openssl extension active or inactive
-        $this->assertEquals(
-            '{"iv":"dGVzdGl2MDl0ZXN0aXYwOQ==","mac":"34367a80e4276906637b5eaecf8c3931547aae68","payload":"+coP\/up\/ZBTBwbiEpCUVXQ=="}',
-            $this->object->cookieEncrypt('data123', 'sec321')
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationConfig::cookieDecrypt
-     *
-     * @return void
-     */
-    public function testCookieDecrypt()
-    {
-        // works with the openssl extension active or inactive
-        $this->assertEquals(
-            'data123',
-            $this->object->cookieDecrypt(
-                '{"iv":"dGVzdGl2MDl0ZXN0aXYwOQ==","mac":"34367a80e4276906637b5eaecf8c3931547aae68","payload":"+coP\/up\/ZBTBwbiEpCUVXQ=="}',
-                'sec321'
-            )
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationConfig::cookieDecrypt
-     *
-     * @return void
-     */
-    public function testCookieDecryptInvalid()
-    {
-        // works with the openssl extension active or inactive
-        $this->assertEquals(
-            false,
-            $this->object->cookieDecrypt(
-                '{"iv":0,"mac":0,"payload":0}',
-                'sec321'
-            )
-        );
-    }
-
-    /**
-     * Test for secret splitting using getAESSecret
-     *
-     * @return void
-     *
-     * @dataProvider secretsProvider
-     */
-    public function testMACSecretSplit($secret, $mac, $aes)
-    {
-        $this->assertEquals(
-            $mac,
-            $this->object->getMACSecret($secret)
-        );
-    }
-
-    /**
-     * Test for secret splitting using getMACSecret and getAESSecret
-     *
-     * @return void
-     *
-     * @dataProvider secretsProvider
-     */
-    public function testAESSecretSplit($secret, $mac, $aes)
-    {
-        $this->assertEquals(
-            $aes,
-            $this->object->getAESSecret($secret)
-        );
-    }
-
-    /**
-     * Data provider for secrets splitting.
-     *
-     * @return array
-     */
-    public function secretsProvider()
-    {
-        return array(
-            // Optimal case
-            array(
-                '1234567890123456abcdefghijklmnop',
-                '1234567890123456',
-                'abcdefghijklmnop',
-            ),
-            // Overlapping secret
-            array(
-                '12345678901234567',
-                '1234567890123456',
-                '2345678901234567',
-            ),
-            // Short secret
-            array(
-                '1234567890123456',
-                '1234567890123451',
-                '2345678901234562',
-            ),
-            // Really short secret
-            array(
-                '12',
-                '1111111111111111',
-                '2222222222222222',
-            ),
-            // Too short secret
-            array(
-                '1',
-                '1111111111111111',
-                '1111111111111111',
-            ),
-        );
-    }
-}
diff --git a/#pma/test/classes/plugin/auth/AuthenticationHttpTest.php b/#pma/test/classes/plugin/auth/AuthenticationHttpTest.php
deleted file mode 100644
index b598e12b..00000000
--- a/#pma/test/classes/plugin/auth/AuthenticationHttpTest.php
+++ /dev/null
@@ -1,463 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for PMA\libraries\plugins\auth\AuthenticationHttp class
- *
- * @package PhpMyAdmin-test
- */
-
-use PMA\libraries\plugins\auth\AuthenticationHttp;
-
-require_once 'libraries/config.default.php';
-require_once 'libraries/sanitizing.lib.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * tests for PMA\libraries\plugins\auth\AuthenticationHttp class
- *
- * @package PhpMyAdmin-test
- */
-class AuthenticationHttpTest extends PMATestCase
-{
-    /**
-     * @var AuthenticationHttp
-     */
-    protected $object;
-
-    /**
-     * Configures global environment.
-     *
-     * @return void
-     */
-    function setup()
-    {
-        $GLOBALS['PMA_Config'] = new PMA\libraries\Config;
-        $GLOBALS['PMA_Config']->enableBc();
-        $GLOBALS['server'] = 0;
-        $GLOBALS['lang'] = "en";
-        $GLOBALS['text_dir'] = "ltr";
-        $GLOBALS['token_provided'] = true;
-        $GLOBALS['token_mismatch'] = false;
-        $this->object = new AuthenticationHttp();
-    }
-
-    /**
-     * tearDown for test cases
-     *
-     * @return void
-     */
-    public function tearDown()
-    {
-        unset($this->object);
-    }
-
-    public function doMockResponse($set_minimal, $body_id, $set_title)
-    {
-        $restoreInstance = PMA\libraries\Response::getInstance();
-
-        // mock footer
-        $mockFooter = $this->getMockBuilder('PMA\libraries\Footer')
-            ->disableOriginalConstructor()
-            ->setMethods(array('setMinimal'))
-            ->getMock();
-
-        $mockFooter->expects($this->exactly($set_minimal))
-            ->method('setMinimal')
-            ->with();
-
-        // mock header
-
-        $mockHeader = $this->getMockBuilder('PMA\libraries\Header')
-            ->disableOriginalConstructor()
-            ->setMethods(
-                array('setBodyId', 'setTitle', 'disableMenuAndConsole', 'addHTML')
-            )
-            ->getMock();
-
-        $mockHeader->expects($this->exactly($body_id))
-            ->method('setBodyId')
-            ->with('loginform');
-
-        $mockHeader->expects($this->exactly($set_title))
-            ->method('setTitle')
-            ->with('Access denied!');
-
-        $mockHeader->expects($this->exactly($set_title))
-            ->method('disableMenuAndConsole')
-            ->with();
-
-        // set mocked headers and footers
-        $mockResponse = $this->getMockBuilder('PMA\libraries\Response')
-            ->disableOriginalConstructor()
-            ->setMethods(array('getHeader', 'getFooter', 'addHTML', 'header', 'headersSent'))
-            ->getMock();
-
-        $mockResponse->expects($this->exactly($set_title))
-            ->method('getFooter')
-            ->with()
-            ->will($this->returnValue($mockFooter));
-
-        $mockResponse->expects($this->exactly($set_title))
-            ->method('getHeader')
-            ->with()
-            ->will($this->returnValue($mockHeader));
-
-        $mockResponse->expects($this->any())
-            ->method('headersSent')
-            ->with()
-            ->will($this->returnValue(false));
-
-        $mockResponse->expects($this->exactly($set_title * 6))
-            ->method('addHTML')
-            ->with();
-
-        $attrInstance = new ReflectionProperty('PMA\libraries\Response', '_instance');
-        $attrInstance->setAccessible(true);
-        $attrInstance->setValue($mockResponse);
-
-        $headers = array_slice(func_get_args(), 3);
-
-        $header_method = $mockResponse->expects($this->exactly(count($headers)))
-            ->method('header');
-
-        call_user_func_array(array($header_method, 'withConsecutive'), $headers);
-
-        try {
-            if (!empty($_REQUEST['old_usr'])) {
-                $this->object->logOut();
-            } else {
-                $this->assertFalse(
-                    $this->object->auth()
-                );
-            }
-        } finally {
-            $attrInstance->setValue($restoreInstance);
-        }
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationHttp::auth
-     *
-     * @return void
-     */
-    public function testAuthLogoutUrl()
-    {
-
-        $_REQUEST['old_usr'] = '1';
-        $GLOBALS['cfg']['Server']['LogoutURL'] = 'https://example.com/logout';
-
-        $this->doMockResponse(
-            0, 0, 0,
-            array('Location: https://example.com/logout')
-        );
-    }
-
-    public function testAuthVerbose()
-    {
-        $_REQUEST['old_usr'] = '';
-        $GLOBALS['cfg']['Server']['verbose'] = 'verboseMessagê';
-
-        $this->doMockResponse(
-            1, 1, 1,
-            array('WWW-Authenticate: Basic realm="phpMyAdmin verboseMessag"'),
-            array('HTTP/1.0 401 Unauthorized'),
-            array('status: 401 Unauthorized')
-        );
-    }
-
-    public function testAuthHost()
-    {
-        $GLOBALS['cfg']['Server']['verbose'] = '';
-        $GLOBALS['cfg']['Server']['host'] = 'hòst';
-
-        $this->doMockResponse(
-            1, 1, 1,
-            array('WWW-Authenticate: Basic realm="phpMyAdmin hst"'),
-            array('HTTP/1.0 401 Unauthorized'),
-            array('status: 401 Unauthorized')
-        );
-    }
-
-    public function testAuthRealm()
-    {
-        $GLOBALS['cfg']['Server']['host'] = '';
-        $GLOBALS['cfg']['Server']['auth_http_realm'] = 'rêäealmmessage';
-
-        $this->doMockResponse(
-            1, 1, 1,
-            array('WWW-Authenticate: Basic realm="realmmessage"'),
-            array('HTTP/1.0 401 Unauthorized'),
-            array('status: 401 Unauthorized')
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationHttp::authCheck
-     *
-     * @param string $user           test username
-     * @param string $pass           test password
-     * @param string $userIndex      index to test username against
-     * @param string $passIndex      index to test username against
-     * @param string $expectedReturn expected return value from test
-     * @param string $expectedUser   expected username to be set
-     * @param string $expectedPass   expected password to be set
-     * @param string $old_usr        value for $_REQUEST['old_usr']
-     *
-     * @return void
-     * @dataProvider authCheckProvider
-     */
-    public function testAuthCheck($user, $pass, $userIndex, $passIndex,
-        $expectedReturn, $expectedUser, $expectedPass, $old_usr = ''
-    ) {
-        $GLOBALS['PHP_AUTH_USER'] = '';
-        $GLOBALS['PHP_AUTH_PW'] = '';
-
-        $_SERVER[$userIndex] = $user;
-        $_SERVER[$passIndex] = $pass;
-
-        $_REQUEST['old_usr'] = $old_usr;
-
-        $this->assertEquals(
-            $expectedReturn,
-            $this->object->authCheck()
-        );
-
-        $this->assertEquals(
-            $expectedUser,
-            $GLOBALS['PHP_AUTH_USER']
-        );
-
-        $this->assertEquals(
-            $expectedPass,
-            $GLOBALS['PHP_AUTH_PW']
-        );
-
-        $_SERVER[$userIndex] = null;
-        $_SERVER[$passIndex] = null;
-    }
-
-    /**
-     * Data provider for testAuthCheck
-     *
-     * @return array Test data
-     */
-    public function authCheckProvider()
-    {
-        return array(
-            array(
-                'Basic ' . base64_encode('foo:bar'),
-                'pswd',
-                'PHP_AUTH_USER',
-                'PHP_AUTH_PW',
-                false,
-                '',
-                'bar',
-                'foo'
-            ),
-            array(
-                'Basic ' . base64_encode('foobar'),
-                'pswd',
-                'REMOTE_USER',
-                'REMOTE_PASSWORD',
-                true,
-                'Basic Zm9vYmFy',
-                'pswd'
-            ),
-            array(
-                'Basic ' . base64_encode('foobar:'),
-                'pswd',
-                'AUTH_USER',
-                'AUTH_PASSWORD',
-                true,
-                'foobar',
-                false
-            ),
-            array(
-                'Basic ' . base64_encode(':foobar'),
-                'pswd',
-                'HTTP_AUTHORIZATION',
-                'AUTH_PASSWORD',
-                true,
-                'Basic OmZvb2Jhcg==',
-                'pswd'
-            ),
-            array(
-                'BasicTest',
-                'pswd',
-                'Authorization',
-                'AUTH_PASSWORD',
-                true,
-                'BasicTest',
-                'pswd'
-            ),
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationHttp::authSetUser
-     *
-     * @return void
-     */
-    public function testAuthSetUser()
-    {
-        // case 1
-
-        $GLOBALS['PHP_AUTH_USER'] = 'testUser';
-        $GLOBALS['PHP_AUTH_PW'] = 'testPass';
-        $GLOBALS['server'] = 2;
-        $GLOBALS['cfg']['Server']['user'] = 'testUser';
-
-        $this->assertTrue(
-            $this->object->authSetUser()
-        );
-
-        $this->assertEquals(
-            'testUser',
-            $GLOBALS['cfg']['Server']['user']
-        );
-
-        $this->assertEquals(
-            'testPass',
-            $GLOBALS['cfg']['Server']['password']
-        );
-
-        $this->assertFalse(
-            isset($GLOBALS['PHP_AUTH_PW'])
-        );
-
-        $this->assertFalse(
-            isset($_SERVER['PHP_AUTH_PW'])
-        );
-
-        $this->assertEquals(
-            2,
-            $GLOBALS['server']
-        );
-
-        // case 2
-        $GLOBALS['PHP_AUTH_USER'] = 'testUser';
-        $GLOBALS['PHP_AUTH_PW'] = 'testPass';
-        $GLOBALS['cfg']['Servers'][1] = array(
-            'host' => 'a',
-            'user' => 'testUser',
-            'foo' => 'bar'
-        );
-
-        $GLOBALS['cfg']['Server']= array(
-            'host' => 'a',
-            'user' => 'user2'
-        );
-
-        $this->assertTrue(
-            $this->object->authSetUser()
-        );
-
-        $this->assertEquals(
-            array(
-                'user' => 'testUser',
-                'password' => 'testPass',
-                'host' => 'a',
-                'foo' => 'bar'
-            ),
-            $GLOBALS['cfg']['Server']
-        );
-
-        $this->assertEquals(
-            1,
-            $GLOBALS['server']
-        );
-
-        // case 3
-        $GLOBALS['server'] = 3;
-        $GLOBALS['PHP_AUTH_USER'] = 'testUser';
-        $GLOBALS['PHP_AUTH_PW'] = 'testPass';
-        $GLOBALS['cfg']['Servers'][1] = array(
-            'host' => 'a',
-            'user' => 'testUsers',
-            'foo' => 'bar'
-        );
-
-        $GLOBALS['cfg']['Server']= array(
-            'host' => 'a',
-            'user' => 'user2'
-        );
-
-        $this->assertTrue(
-            $this->object->authSetUser()
-        );
-
-        $this->assertEquals(
-            array(
-                'user' => 'testUser',
-                'password' => 'testPass',
-                'host' => 'a'
-            ),
-            $GLOBALS['cfg']['Server']
-        );
-
-        $this->assertEquals(
-            3,
-            $GLOBALS['server']
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationHttp::authSetFails
-     *
-     * @return void
-     *
-     * @group medium
-     */
-    public function testAuthFails()
-    {
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->at(0))
-            ->method('getError')
-            ->will($this->returnValue('error 123'));
-
-        $dbi->expects($this->at(1))
-            ->method('getError')
-            ->will($this->returnValue('error 321'));
-
-        $dbi->expects($this->at(2))
-            ->method('getError')
-            ->will($this->returnValue(null));
-
-        $GLOBALS['dbi'] = $dbi;
-        $GLOBALS['errno'] = 31;
-
-        ob_start();
-        $this->object->authFails();
-        $result = ob_get_clean();
-
-        $this->assertContains(
-            '<p>error 123</p>',
-            $result
-        );
-
-        $this->object = $this->getMockBuilder('PMA\libraries\plugins\auth\AuthenticationHttp')
-            ->disableOriginalConstructor()
-            ->setMethods(array('authForm'))
-            ->getMock();
-
-        $this->object->expects($this->exactly(2))
-            ->method('authForm');
-        // case 2
-        $GLOBALS['cfg']['Server']['host'] = 'host';
-        $GLOBALS['errno'] = 1045;
-
-        $this->assertTrue(
-            $this->object->authFails()
-        );
-
-        // case 3
-        $GLOBALS['errno'] = 1043;
-        $this->assertTrue(
-            $this->object->authFails()
-        );
-    }
-}
diff --git a/#pma/test/classes/plugin/auth/AuthenticationSignonTest.php b/#pma/test/classes/plugin/auth/AuthenticationSignonTest.php
deleted file mode 100644
index 3ab13bfd..00000000
--- a/#pma/test/classes/plugin/auth/AuthenticationSignonTest.php
+++ /dev/null
@@ -1,480 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for PMA\libraries\plugins\auth\AuthenticationSignon class
- *
- * @package PhpMyAdmin-test
- */
-
-use PMA\libraries\plugins\auth\AuthenticationSignon;
-
-require_once 'libraries/config.default.php';
-require_once 'libraries/sanitizing.lib.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * tests for PMA\libraries\plugins\auth\AuthenticationSignon class
- *
- * @package PhpMyAdmin-test
- */
-class AuthenticationSignonTest extends PMATestCase
-{
-    protected $object;
-
-    /**
-     * Configures global environment.
-     *
-     * @return void
-     */
-    function setup()
-    {
-        $GLOBALS['PMA_Config'] = new PMA\libraries\Config;
-        $GLOBALS['PMA_Config']->enableBc();
-        $GLOBALS['server'] = 0;
-        $this->object = new AuthenticationSignon();
-    }
-
-    /**
-     * tearDown for test cases
-     *
-     * @return void
-     */
-    public function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationSignon::auth
-     *
-     * @return void
-     */
-    public function testAuth()
-    {
-        $GLOBALS['cfg']['Server']['SignonURL'] = '';
-
-        ob_start();
-        $this->object->auth();
-        $result = ob_get_clean();
-
-        $this->assertContains(
-            'You must set SignonURL!',
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationSignon::auth
-     *
-     * @return void
-     */
-    public function testAuthLogoutURL()
-    {
-        $restoreInstance = PMA\libraries\Response::getInstance();
-
-        $mockResponse = $this->getMockBuilder('PMA\libraries\Response')
-            ->disableOriginalConstructor()
-            ->setMethods(array('isAjax', 'headersSent', 'header'))
-            ->getMock();
-
-        $mockResponse->expects($this->any())
-            ->method('headersSent')
-            ->with()
-            ->will($this->returnValue(false));
-
-        $mockResponse->expects($this->once())
-            ->method('header')
-            ->with('Location: https://example.com/logoutURL');
-
-        $attrInstance = new ReflectionProperty('PMA\libraries\Response', '_instance');
-        $attrInstance->setAccessible(true);
-        $attrInstance->setValue($mockResponse);
-        $GLOBALS['cfg']['Server']['SignonURL'] = 'https://example.com/SignonURL';
-        $GLOBALS['cfg']['Server']['LogoutURL'] = 'https://example.com/logoutURL';
-
-        $this->object->logOut();
-
-        $attrInstance->setValue($restoreInstance);
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationSignon::auth
-     *
-     * @return void
-     */
-    public function testAuthLogout()
-    {
-        $restoreInstance = PMA\libraries\Response::getInstance();
-
-        $mockResponse = $this->getMockBuilder('PMA\libraries\Response')
-            ->disableOriginalConstructor()
-            ->setMethods(array('isAjax', 'headersSent', 'header'))
-            ->getMock();
-
-        $mockResponse->expects($this->any())
-            ->method('headersSent')
-            ->with()
-            ->will($this->returnValue(false));
-
-        $mockResponse->expects($this->once())
-            ->method('header')
-            ->with('Location: https://example.com/SignonURL');
-
-        $attrInstance = new ReflectionProperty('PMA\libraries\Response', '_instance');
-        $attrInstance->setAccessible(true);
-        $attrInstance->setValue($mockResponse);
-        $GLOBALS['header'] = array();
-        $GLOBALS['cfg']['Server']['SignonURL'] = 'https://example.com/SignonURL';
-        $GLOBALS['cfg']['Server']['LogoutURL'] = '';
-
-        $this->object->logOut();
-
-        $attrInstance->setValue($restoreInstance);
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationSignon::authCheck
-     *
-     * @return void
-     */
-    public function testAuthCheckEmpty()
-    {
-        $GLOBALS['cfg']['Server']['SignonURL'] = 'https://example.com/SignonURL';
-        $_SESSION['LAST_SIGNON_URL'] = 'https://example.com/SignonDiffURL';
-
-        $this->assertFalse(
-            $this->object->authCheck()
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationSignon::authCheck
-     *
-     * @return void
-     */
-    public function testAuthCheckSession()
-    {
-        $GLOBALS['cfg']['Server']['SignonURL'] = 'https://example.com/SignonURL';
-        $_SESSION['LAST_SIGNON_URL'] = 'https://example.com/SignonURL';
-        $GLOBALS['cfg']['Server']['SignonScript'] = './examples/signon-script.php';
-        $GLOBALS['cfg']['Server']['SignonSession'] = 'session123';
-        $GLOBALS['cfg']['Server']['host'] = 'localhost';
-        $GLOBALS['cfg']['Server']['port'] = '80';
-        $GLOBALS['cfg']['Server']['user'] = 'user';
-
-        $this->assertTrue(
-            $this->object->authCheck()
-        );
-
-        $this->assertEquals(
-            'user',
-            $GLOBALS['PHP_AUTH_USER']
-        );
-
-        $this->assertEquals(
-            'password',
-            $GLOBALS['PHP_AUTH_PW']
-        );
-
-        $this->assertEquals(
-            'https://example.com/SignonURL',
-            $_SESSION['LAST_SIGNON_URL']
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationSignon::authCheck
-     *
-     * @return void
-     */
-    public function testAuthCheckToken()
-    {
-        $restoreInstance = PMA\libraries\Response::getInstance();
-
-        $mockResponse = $this->getMockBuilder('PMA\libraries\Response')
-            ->disableOriginalConstructor()
-            ->setMethods(array('isAjax', 'headersSent', 'header'))
-            ->getMock();
-
-        $mockResponse->expects($this->any())
-            ->method('headersSent')
-            ->with()
-            ->will($this->returnValue(false));
-
-        $mockResponse->expects($this->once())
-            ->method('header')
-            ->with('Location: https://example.com/SignonURL');
-
-        $attrInstance = new ReflectionProperty('PMA\libraries\Response', '_instance');
-        $attrInstance->setAccessible(true);
-        $attrInstance->setValue($mockResponse);
-
-        $GLOBALS['cfg']['Server']['SignonURL'] = 'https://example.com/SignonURL';
-        $GLOBALS['cfg']['Server']['SignonSession'] = 'session123';
-        $GLOBALS['cfg']['Server']['host'] = 'localhost';
-        $GLOBALS['cfg']['Server']['port'] = '80';
-        $GLOBALS['cfg']['Server']['user'] = 'user';
-        $GLOBALS['cfg']['Server']['SignonScript'] = '';
-        $_COOKIE['session123'] = true;
-        $_SESSION['PMA_single_signon_user'] = 'user123';
-        $_SESSION['PMA_single_signon_password'] = 'pass123';
-        $_SESSION['PMA_single_signon_host'] = 'local';
-        $_SESSION['PMA_single_signon_port'] = '12';
-        $_SESSION['PMA_single_signon_cfgupdate'] = array('foo' => 'bar');
-        $_SESSION['PMA_single_signon_token'] = 'pmaToken';
-        $sessionName = session_name();
-        $sessionID = session_id();
-
-        $this->object->logOut();
-
-        $this->assertEquals(
-            array(
-                'SignonURL' => 'https://example.com/SignonURL',
-                'SignonScript' => '',
-                'SignonSession' => 'session123',
-                'host' => 'localhost',
-                'port' => '80',
-                'user' => 'user',
-            ),
-            $GLOBALS['cfg']['Server']
-        );
-
-        $this->assertEquals(
-            $sessionName,
-            session_name()
-        );
-
-        $this->assertEquals(
-            $sessionID,
-            session_id()
-        );
-
-        $this->assertFalse(
-            isset($_SESSION['LAST_SIGNON_URL'])
-        );
-        $attrInstance->setValue($restoreInstance);
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationSignon::authCheck
-     *
-     * @return void
-     */
-    public function testAuthCheckKeep()
-    {
-        $GLOBALS['cfg']['Server']['SignonURL'] = 'https://example.com/SignonURL';
-        $GLOBALS['cfg']['Server']['SignonSession'] = 'session123';
-        $GLOBALS['cfg']['Server']['host'] = 'localhost';
-        $GLOBALS['cfg']['Server']['port'] = '80';
-        $GLOBALS['cfg']['Server']['user'] = 'user';
-        $GLOBALS['cfg']['Server']['SignonScript'] = '';
-        $_COOKIE['session123'] = true;
-        $_REQUEST['old_usr'] = '';
-        $_SESSION['PMA_single_signon_user'] = 'user123';
-        $_SESSION['PMA_single_signon_password'] = 'pass123';
-        $_SESSION['PMA_single_signon_host'] = 'local';
-        $_SESSION['PMA_single_signon_port'] = '12';
-        $_SESSION['PMA_single_signon_cfgupdate'] = array('foo' => 'bar');
-        $_SESSION['PMA_single_signon_token'] = 'pmaToken';
-
-        $this->assertTrue(
-            $this->object->authCheck()
-        );
-
-        $this->assertEquals(
-            'user123',
-            $GLOBALS['PHP_AUTH_USER']
-        );
-
-        $this->assertEquals(
-            'pass123',
-            $GLOBALS['PHP_AUTH_PW']
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationSignon::authSetUser
-     *
-     * @return void
-     */
-    public function testAuthSetUser()
-    {
-        $GLOBALS['PHP_AUTH_USER'] = 'testUser123';
-        $GLOBALS['PHP_AUTH_PW'] = 'testPass123';
-
-        $this->assertTrue(
-            $this->object->authSetUser()
-        );
-
-        $this->assertEquals(
-            'testUser123',
-            $GLOBALS['cfg']['Server']['user']
-        );
-
-        $this->assertEquals(
-            'testPass123',
-            $GLOBALS['cfg']['Server']['password']
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationSignon::authFails
-     *
-     * @return void
-     */
-    public function testAuthFailsForbidden()
-    {
-        $GLOBALS['cfg']['Server']['SignonSession'] = 'newSession';
-        $_COOKIE['newSession'] = '42';
-
-        $this->object = $this->getMockBuilder('PMA\libraries\plugins\auth\AuthenticationSignon')
-            ->disableOriginalConstructor()
-            ->setMethods(array('auth'))
-            ->getMock();
-
-        $this->object->expects($this->exactly(1))
-            ->method('auth');
-
-        $GLOBALS['login_without_password_is_forbidden'] = true;
-
-        $this->object->authFails();
-
-        $this->assertEquals(
-            'Login without a password is forbidden by configuration '
-            . '(see AllowNoPassword)',
-            $_SESSION['PMA_single_signon_error_message']
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationSignon::authFails
-     *
-     * @return void
-     */
-    public function testAuthFailsDeny()
-    {
-        $GLOBALS['cfg']['Server']['SignonSession'] = 'newSession';
-        $_COOKIE['newSession'] = '42';
-
-        $this->object = $this->getMockBuilder('PMA\libraries\plugins\auth\AuthenticationSignon')
-            ->disableOriginalConstructor()
-            ->setMethods(array('auth'))
-            ->getMock();
-
-        $this->object->expects($this->exactly(1))
-            ->method('auth');
-
-        $GLOBALS['login_without_password_is_forbidden'] = null;
-        $GLOBALS['allowDeny_forbidden'] = true;
-
-        $this->object->authFails();
-
-        $this->assertEquals(
-            'Access denied!',
-            $_SESSION['PMA_single_signon_error_message']
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationSignon::authFails
-     *
-     * @return void
-     */
-    public function testAuthFailsTimeout()
-    {
-        $GLOBALS['cfg']['Server']['SignonSession'] = 'newSession';
-        $_COOKIE['newSession'] = '42';
-
-        $this->object = $this->getMockBuilder('PMA\libraries\plugins\auth\AuthenticationSignon')
-            ->disableOriginalConstructor()
-            ->setMethods(array('auth'))
-            ->getMock();
-
-        $this->object->expects($this->exactly(1))
-            ->method('auth');
-
-        $GLOBALS['allowDeny_forbidden'] = null;
-        $GLOBALS['no_activity'] = true;
-        $GLOBALS['cfg']['LoginCookieValidity'] = '1440';
-
-        $this->object->authFails();
-
-        $this->assertEquals(
-            'No activity within 1440 seconds; please log in again.',
-            $_SESSION['PMA_single_signon_error_message']
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationSignon::authFails
-     *
-     * @return void
-     */
-    public function testAuthFailsMySQLError()
-    {
-        $GLOBALS['cfg']['Server']['SignonSession'] = 'newSession';
-        $_COOKIE['newSession'] = '42';
-
-        $this->object = $this->getMockBuilder('PMA\libraries\plugins\auth\AuthenticationSignon')
-            ->disableOriginalConstructor()
-            ->setMethods(array('auth'))
-            ->getMock();
-
-        $this->object->expects($this->exactly(1))
-            ->method('auth');
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->at(0))
-            ->method('getError')
-            ->will($this->returnValue('error<123>'));
-
-        $GLOBALS['dbi'] = $dbi;
-        $GLOBALS['no_activity'] = null;
-
-        $this->object->authFails();
-
-        $this->assertEquals(
-            'error&lt;123&gt;',
-            $_SESSION['PMA_single_signon_error_message']
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\auth\AuthenticationSignon::authFails
-     *
-     * @return void
-     */
-    public function testAuthFailsConnect()
-    {
-        $GLOBALS['cfg']['Server']['SignonSession'] = 'newSession';
-        $_COOKIE['newSession'] = '42';
-
-        $this->object = $this->getMockBuilder('PMA\libraries\plugins\auth\AuthenticationSignon')
-            ->disableOriginalConstructor()
-            ->setMethods(array('auth'))
-            ->getMock();
-
-        $this->object->expects($this->exactly(1))
-            ->method('auth');
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->at(0))
-            ->method('getError')
-            ->will($this->returnValue(null));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $this->object->authFails();
-
-        $this->assertEquals(
-            'Cannot log in to the MySQL server',
-            $_SESSION['PMA_single_signon_error_message']
-        );
-    }
-}
diff --git a/#pma/test/classes/plugin/export/ExportCodegenTest.php b/#pma/test/classes/plugin/export/ExportCodegenTest.php
deleted file mode 100644
index a843f9df..00000000
--- a/#pma/test/classes/plugin/export/ExportCodegenTest.php
+++ /dev/null
@@ -1,482 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for PMA\libraries\plugins\export\ExportCodegen class
- *
- * @package PhpMyAdmin-test
- */
-use PMA\libraries\plugins\export\ExportCodegen;
-
-require_once 'libraries/export.lib.php';
-require_once 'libraries/config.default.php';
-require_once 'export.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * tests for PMA\libraries\plugins\export\ExportCodegen class
- *
- * @package PhpMyAdmin-test
- * @group medium
- */
-class ExportCodegenTest extends PMATestCase
-{
-    protected $object;
-
-    /**
-     * Configures global environment.
-     *
-     * @return void
-     */
-    function setup()
-    {
-        $GLOBALS['server'] = 0;
-        $this->object = new ExportCodegen(null);
-    }
-
-    /**
-     * tearDown for test cases
-     *
-     * @return void
-     */
-    public function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportCodegen::initSpecificVariables
-     *
-     * @return void
-     */
-    public function testInitSpecificVariables()
-    {
-
-        $method = new ReflectionMethod('PMA\libraries\plugins\export\ExportCodegen', 'initSpecificVariables');
-        $method->setAccessible(true);
-        $method->invoke($this->object, null);
-
-        $attrCgFormats = new ReflectionProperty('PMA\libraries\plugins\export\ExportCodegen', '_cgFormats');
-        $attrCgFormats->setAccessible(true);
-
-        $attrCgHandlers = new ReflectionProperty('PMA\libraries\plugins\export\ExportCodegen', '_cgHandlers');
-        $attrCgHandlers->setAccessible(true);
-
-        $this->assertEquals(
-            array(
-                "NHibernate C# DO",
-                "NHibernate XML"
-            ),
-            $attrCgFormats->getValue($this->object)
-        );
-
-        $this->assertEquals(
-            array(
-                "_handleNHibernateCSBody",
-                "_handleNHibernateXMLBody"
-            ),
-            $attrCgHandlers->getValue($this->object)
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportCodegen::setProperties
-     *
-     * @return void
-     */
-    public function testSetProperties()
-    {
-        $method = new ReflectionMethod('PMA\libraries\plugins\export\ExportCodegen', 'setProperties');
-        $method->setAccessible(true);
-        $method->invoke($this->object, null);
-
-        $attrProperties = new ReflectionProperty('PMA\libraries\plugins\export\ExportCodegen', 'properties');
-        $attrProperties->setAccessible(true);
-        $properties = $attrProperties->getValue($this->object);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\plugins\ExportPluginProperties',
-            $properties
-        );
-
-        $this->assertEquals(
-            'CodeGen',
-            $properties->getText()
-        );
-
-        $this->assertEquals(
-            'cs',
-            $properties->getExtension()
-        );
-
-        $this->assertEquals(
-            'text/cs',
-            $properties->getMimeType()
-        );
-
-        $this->assertEquals(
-            'Options',
-            $properties->getOptionsText()
-        );
-
-        $options = $properties->getOptions();
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyRootGroup',
-            $options
-        );
-
-        $this->assertEquals(
-            'Format Specific Options',
-            $options->getName()
-        );
-
-        $generalOptionsArray = $options->getProperties();
-        $generalOptions = $generalOptionsArray[0];
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyMainGroup',
-            $generalOptions
-        );
-
-        $this->assertEquals(
-            'general_opts',
-            $generalOptions->getName()
-        );
-
-        $generalProperties = $generalOptions->getProperties();
-
-        $hidden = $generalProperties[0];
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\HiddenPropertyItem',
-            $hidden
-        );
-
-        $this->assertEquals(
-            'structure_or_data',
-            $hidden->getName()
-        );
-
-        $select = $generalProperties[1];
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\SelectPropertyItem',
-            $select
-        );
-
-        $this->assertEquals(
-            'format',
-            $select->getName()
-        );
-
-        $this->assertEquals(
-            'Format:',
-            $select->getText()
-        );
-
-        $this->assertEquals(
-            array(
-                "NHibernate C# DO",
-                "NHibernate XML"
-            ),
-            $select->getValues()
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportCodegen::exportHeader
-     *
-     * @return void
-     */
-    public function testExportHeader()
-    {
-        $this->assertTrue(
-            $this->object->exportHeader()
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportCodegen::exportFooter
-     *
-     * @return void
-     */
-    public function testExportFooter()
-    {
-        $this->assertTrue(
-            $this->object->exportFooter()
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportCodegen::exportDBHeader
-     *
-     * @return void
-     */
-    public function testExportDBHeader()
-    {
-        $this->assertTrue(
-            $this->object->exportDBHeader('testDB')
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportCodegen::exportDBFooter
-     *
-     * @return void
-     */
-    public function testExportDBFooter()
-    {
-        $this->assertTrue(
-            $this->object->exportDBFooter('testDB')
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportCodegen::exportData
-     *
-     * @return void
-     */
-    public function testExportData()
-    {
-        $GLOBALS['codegen_format'] = 1;
-        $GLOBALS['output_kanji_conversion'] = false;
-        $GLOBALS['output_charset_conversion'] = false;
-        $GLOBALS['buffer_needed'] = false;
-        $GLOBALS['asfile'] = true;
-        $GLOBALS['save_on_server'] = false;
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $GLOBALS['dbi'] = $dbi;
-
-        ob_start();
-        $this->object->exportData(
-            'testDB', 'testTable', "\n", 'example.com', 'test'
-        );
-        $result = ob_get_clean();
-
-        $this->assertContains(
-            '<?xml version="1.0" encoding="utf-8" ?>',
-            $result
-        );
-
-        $this->assertContains(
-            '<class name="TestTable" table="TestTable">',
-            $result
-        );
-
-        $this->assertContains(
-            '</class>',
-            $result
-        );
-
-        $this->assertContains(
-            '</hibernate-mapping>',
-            $result
-        );
-
-        $GLOBALS['codegen_format'] = 4;
-
-        $this->object->exportData(
-            'testDB', 'testTable', "\n", 'example.com', 'test'
-        );
-
-        $this->expectOutputString(
-            '4 is not supported.'
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportCodegen::cgMakeIdentifier
-     *
-     * @return void
-     */
-    public function testCgMakeIdentifier()
-    {
-        $this->assertEquals(
-            '_Ⅲfoo',
-            ExportCodegen::cgMakeIdentifier('Ⅲ{}96`{}foo', true)
-        );
-
-        $this->assertEquals(
-            'TestⅢ',
-            ExportCodegen::cgMakeIdentifier('`98testⅢ{}96`{}', true)
-        );
-
-        $this->assertEquals(
-            'testⅢ',
-            ExportCodegen::cgMakeIdentifier('`98testⅢ{}96`{}', false)
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportCodegen::_handleNHibernateCSBody
-     *
-     * @return void
-     */
-    public function testHandleNHibernateCSBody()
-    {
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->once())
-            ->method('query')
-            ->with('DESC `db`.`table`')
-            ->will($this->returnValue(true));
-
-        $dbi->expects($this->at(1))
-            ->method('fetchRow')
-            ->with(true)
-            ->will($this->returnValue(array('a', 'b', 'c', false, 'e', 'f')));
-
-        $dbi->expects($this->at(2))
-            ->method('fetchRow')
-            ->with(true)
-            ->will($this->returnValue(null));
-
-        $GLOBALS['dbi'] = $dbi;
-        $method = new ReflectionMethod('PMA\libraries\plugins\export\ExportCodegen', '_handleNHibernateCSBody');
-        $method->setAccessible(true);
-        $result = $method->invoke($this->object, 'db', 'table', "\n");
-
-        $this->assertEquals(
-            "using System;\n" .
-            "using System.Collections;\n" .
-            "using System.Collections.Generic;\n" .
-            "using System.Text;\n" .
-            "namespace Db\n" .
-            "{\n" .
-            "    #region Table\n" .
-            "    public class Table\n" .
-            "    {\n" .
-            "        #region Member Variables\n" .
-            "        protected unknown _a;\n" .
-            "        #endregion\n" .
-            "        #region Constructors\n" .
-            "        public Table() { }\n" .
-            "        public Table(unknown a)\n" .
-            "        {\n" .
-            "            this._a=a;\n" .
-            "        }\n" .
-            "        #endregion\n" .
-            "        #region Public Properties\n" .
-            "        public virtual unknown A\n" .
-            "        {\n" .
-            "            get {return _a;}\n" .
-            "            set {_a=value;}\n" .
-            "        }\n" .
-            "        #endregion\n" .
-            "    }\n" .
-            "    #endregion\n" .
-            "}",
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportCodegen::_handleNHibernateXMLBody
-     *
-     * @return void
-     */
-    public function testHandleNHibernateXMLBody()
-    {
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->once())
-            ->method('query')
-            ->with('DESC `db`.`table`')
-            ->will($this->returnValue(true));
-
-        $dbi->expects($this->at(1))
-            ->method('fetchRow')
-            ->with(true)
-            ->will($this->returnValue(array('a', 'b', 'c', false, 'e', 'f')));
-
-        $dbi->expects($this->at(2))
-            ->method('fetchRow')
-            ->with(true)
-            ->will($this->returnValue(array('g', 'h', 'i', 'PRI', 'j', 'k')));
-
-        $dbi->expects($this->at(3))
-            ->method('fetchRow')
-            ->with(true)
-            ->will($this->returnValue(null));
-
-        $GLOBALS['dbi'] = $dbi;
-        $method = new ReflectionMethod('PMA\libraries\plugins\export\ExportCodegen', '_handleNHibernateXMLBody');
-        $method->setAccessible(true);
-        $result = $method->invoke($this->object, 'db', 'table', "\n");
-
-        $this->assertEquals(
-            '<?xml version="1.0" encoding="utf-8" ?>' . "\n" .
-            '<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" namespace="Db" ' .
-            'assembly="Db">' . "\n" .
-            '    <class name="Table" table="Table">' . "\n" .
-            '        <property name="A" type="Unknown">' . "\n" .
-            '            <column name="a" sql-type="b" not-null="false" />' . "\n" .
-            '        </property>' . "\n" .
-            '        <id name="G" type="Unknown" unsaved-value="0">' . "\n" .
-            '            <column name="g" sql-type="h" not-null="false" ' .
-            'unique="true" index="PRIMARY"/>' . "\n" .
-            '            <generator class="native" />' . "\n" .
-            '        </id>' . "\n" .
-            '    </class>' . "\n" .
-            '</hibernate-mapping>',
-            $result
-        );
-    }
-
-    /**
-     * Test for
-     *     - PMA\libraries\plugins\export\ExportCodegen::_getCgFormats
-     *     - PMA\libraries\plugins\export\ExportCodegen::_setCgFormats
-     *
-     * @return void
-     */
-    public function testSetGetCgFormats()
-    {
-        $reflection = new ReflectionClass('PMA\libraries\plugins\export\ExportCodegen');
-
-        $getter = $reflection->getMethod('_getCgFormats');
-        $setter = $reflection->getMethod('_setCgFormats');
-
-        $getter->setAccessible(true);
-        $setter->setAccessible(true);
-
-        $setter->invoke($this->object, array(1, 2));
-
-        $this->assertEquals(
-            array(1, 2),
-            $getter->invoke($this->object)
-        );
-    }
-
-    /**
-     * Test for
-     *     - PMA\libraries\plugins\export\ExportCodegen::_getCgHandlers
-     *     - PMA\libraries\plugins\export\ExportCodegen::_setCgHandlers
-     *
-     * @return void
-     */
-    public function testSetGetCgHandlers()
-    {
-        $reflection = new ReflectionClass('PMA\libraries\plugins\export\ExportCodegen');
-
-        $getter = $reflection->getMethod('_getCgHandlers');
-        $setter = $reflection->getMethod('_setCgHandlers');
-
-        $getter->setAccessible(true);
-        $setter->setAccessible(true);
-
-        $setter->invoke($this->object, array(1, 2));
-
-        $this->assertEquals(
-            array(1, 2),
-            $getter->invoke($this->object)
-        );
-    }
-}
diff --git a/#pma/test/classes/plugin/export/ExportCsvTest.php b/#pma/test/classes/plugin/export/ExportCsvTest.php
deleted file mode 100644
index 054c1f61..00000000
--- a/#pma/test/classes/plugin/export/ExportCsvTest.php
+++ /dev/null
@@ -1,750 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for PMA\libraries\plugins\export\ExportCsv class
- *
- * @package PhpMyAdmin-test
- */
-use PMA\libraries\plugins\export\ExportCsv;
-
-require_once 'libraries/export.lib.php';
-require_once 'libraries/config.default.php';
-require_once 'export.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * tests for PMA\libraries\plugins\export\ExportCsv class
- *
- * @package PhpMyAdmin-test
- * @group medium
- */
-class ExportCsvTest extends PMATestCase
-{
-    protected $object;
-
-    /**
-     * Configures global environment.
-     *
-     * @return void
-     */
-    function setup()
-    {
-        $GLOBALS['server'] = 0;
-        $this->object = new ExportCsv();
-    }
-
-    /**
-     * tearDown for test cases
-     *
-     * @return void
-     */
-    public function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportCsv::setProperties
-     *
-     * @return void
-     */
-    public function testSetProperties()
-    {
-        $method = new ReflectionMethod('PMA\libraries\plugins\export\ExportCsv', 'setProperties');
-        $method->setAccessible(true);
-        $method->invoke($this->object, null);
-
-        $attrProperties = new ReflectionProperty('PMA\libraries\plugins\export\ExportCsv', 'properties');
-        $attrProperties->setAccessible(true);
-        $properties = $attrProperties->getValue($this->object);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\plugins\ExportPluginProperties',
-            $properties
-        );
-
-        $this->assertEquals(
-            'CSV',
-            $properties->getText()
-        );
-
-        $this->assertEquals(
-            'csv',
-            $properties->getExtension()
-        );
-
-        $this->assertEquals(
-            'text/comma-separated-values',
-            $properties->getMimeType()
-        );
-
-        $this->assertEquals(
-            'Options',
-            $properties->getOptionsText()
-        );
-
-        $options = $properties->getOptions();
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyRootGroup',
-            $options
-        );
-
-        $this->assertEquals(
-            'Format Specific Options',
-            $options->getName()
-        );
-
-        $generalOptionsArray = $options->getProperties();
-        $generalOptions = $generalOptionsArray[0];
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyMainGroup',
-            $generalOptions
-        );
-
-        $this->assertEquals(
-            'general_opts',
-            $generalOptions->getName()
-        );
-
-        $generalProperties = $generalOptions->getProperties();
-
-        $property = array_shift($generalProperties);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\TextPropertyItem',
-            $property
-        );
-
-        $this->assertEquals(
-            'separator',
-            $property->getName()
-        );
-
-        $this->assertEquals(
-            'Columns separated with:',
-            $property->getText()
-        );
-
-        $property = array_shift($generalProperties);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\TextPropertyItem',
-            $property
-        );
-
-        $this->assertEquals(
-            'enclosed',
-            $property->getName()
-        );
-
-        $this->assertEquals(
-            'Columns enclosed with:',
-            $property->getText()
-        );
-
-        $property = array_shift($generalProperties);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\TextPropertyItem',
-            $property
-        );
-
-        $this->assertEquals(
-            'escaped',
-            $property->getName()
-        );
-
-        $this->assertEquals(
-            'Columns escaped with:',
-            $property->getText()
-        );
-
-        $property = array_shift($generalProperties);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\TextPropertyItem',
-            $property
-        );
-
-        $this->assertEquals(
-            'terminated',
-            $property->getName()
-        );
-
-        $this->assertEquals(
-            'Lines terminated with:',
-            $property->getText()
-        );
-
-        $property = array_shift($generalProperties);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\TextPropertyItem',
-            $property
-        );
-
-        $this->assertEquals(
-            'null',
-            $property->getName()
-        );
-
-        $this->assertEquals(
-            'Replace NULL with:',
-            $property->getText()
-        );
-
-        $property = array_shift($generalProperties);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
-            $property
-        );
-
-        $this->assertEquals(
-            'removeCRLF',
-            $property->getName()
-        );
-
-        $this->assertEquals(
-            'Remove carriage return/line feed characters within columns',
-            $property->getText()
-        );
-
-        $property = array_shift($generalProperties);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
-            $property
-        );
-
-        $this->assertEquals(
-            'columns',
-            $property->getName()
-        );
-
-        $this->assertEquals(
-            'Put columns names in the first row',
-            $property->getText()
-        );
-
-        $property = array_shift($generalProperties);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\HiddenPropertyItem',
-            $property
-        );
-
-        $this->assertEquals(
-            'structure_or_data',
-            $property->getName()
-        );
-
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportCsv::exportHeader
-     *
-     * @return void
-     */
-    public function testExportHeader()
-    {
-        // case 1
-
-        $GLOBALS['what'] = 'excel';
-        $GLOBALS['excel_edition'] = 'win';
-        $GLOBALS['excel_columns'] = true;
-
-        $this->assertTrue(
-            $this->object->exportHeader()
-        );
-
-        $this->assertEquals(
-            "\015\012",
-            $GLOBALS['csv_terminated']
-        );
-
-        $this->assertEquals(
-            ";",
-            $GLOBALS['csv_separator']
-        );
-
-        $this->assertEquals(
-            '"',
-            $GLOBALS['csv_enclosed']
-        );
-
-        $this->assertEquals(
-            '"',
-            $GLOBALS['csv_escaped']
-        );
-
-        $this->assertEquals(
-            'yes',
-            $GLOBALS['csv_columns']
-        );
-
-        // case 2
-
-        $GLOBALS['excel_edition'] = 'mac_excel2003';
-        unset($GLOBALS['excel_columns']);
-        $GLOBALS['csv_columns'] = 'no';
-
-        $this->assertTrue(
-            $this->object->exportHeader()
-        );
-
-        $this->assertEquals(
-            "\015\012",
-            $GLOBALS['csv_terminated']
-        );
-
-        $this->assertEquals(
-            ";",
-            $GLOBALS['csv_separator']
-        );
-
-        $this->assertEquals(
-            '"',
-            $GLOBALS['csv_enclosed']
-        );
-
-        $this->assertEquals(
-            '"',
-            $GLOBALS['csv_escaped']
-        );
-
-        $this->assertEquals(
-            'no',
-            $GLOBALS['csv_columns']
-        );
-
-        // case 3
-
-        $GLOBALS['excel_edition'] = 'mac_excel2008';
-
-        $this->assertTrue(
-            $this->object->exportHeader()
-        );
-
-        $this->assertEquals(
-            "\015\012",
-            $GLOBALS['csv_terminated']
-        );
-
-        $this->assertEquals(
-            ",",
-            $GLOBALS['csv_separator']
-        );
-
-        $this->assertEquals(
-            '"',
-            $GLOBALS['csv_enclosed']
-        );
-
-        $this->assertEquals(
-            '"',
-            $GLOBALS['csv_escaped']
-        );
-
-        $this->assertEquals(
-            'no',
-            $GLOBALS['csv_columns']
-        );
-
-        // case 4
-
-        $GLOBALS['excel_edition'] = 'testBlank';
-        $GLOBALS['csv_separator'] = '#';
-
-        $this->assertTrue(
-            $this->object->exportHeader()
-        );
-
-        $this->assertEquals(
-            '#',
-            $GLOBALS['csv_separator']
-        );
-
-        // case 5
-
-        $GLOBALS['what'] = 'notExcel';
-        $GLOBALS['crlf'] = "\n";
-        $GLOBALS['csv_terminated'] = '';
-        $GLOBALS['csv_separator'] = 'a\\t';
-
-        $this->assertTrue(
-            $this->object->exportHeader()
-        );
-
-        $this->assertEquals(
-            $GLOBALS['csv_terminated'],
-            "\n"
-        );
-
-        $this->assertEquals(
-            $GLOBALS['csv_separator'],
-            "a\011"
-        );
-        // case 6
-
-        $GLOBALS['csv_terminated'] = 'AUTO';
-
-        $this->assertTrue(
-            $this->object->exportHeader()
-        );
-
-        $this->assertEquals(
-            $GLOBALS['csv_terminated'],
-            "\n"
-        );
-
-        // case 7
-
-        $GLOBALS['csv_terminated'] = 'a\\rb\\nc\\t';
-        $GLOBALS['csv_separator'] = 'a\\t';
-
-        $this->assertTrue(
-            $this->object->exportHeader()
-        );
-
-        $this->assertEquals(
-            $GLOBALS['csv_terminated'],
-            "a\015b\012c\011"
-        );
-
-        $this->assertEquals(
-            $GLOBALS['csv_separator'],
-            "a\011"
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportCsv::exportFooter
-     *
-     * @return void
-     */
-    public function testExportFooter()
-    {
-        $this->assertTrue(
-            $this->object->exportFooter()
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportCsv::exportDBHeader
-     *
-     * @return void
-     */
-    public function testExportDBHeader()
-    {
-        $this->assertTrue(
-            $this->object->exportDBHeader('testDB')
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportCsv::exportDBFooter
-     *
-     * @return void
-     */
-    public function testExportDBFooter()
-    {
-        $this->assertTrue(
-            $this->object->exportDBFooter('testDB')
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportCsv::exportDBCreate
-     *
-     * @return void
-     */
-    public function testExportDBCreate()
-    {
-        $this->assertTrue(
-            $this->object->exportDBCreate('testDB', 'database')
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportCsv::exportData
-     *
-     * @return void
-     */
-    public function testExportData()
-    {
-        // case 1
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $GLOBALS['dbi'] = $dbi;
-
-        $GLOBALS['csv_columns'] = 'yes';
-        $GLOBALS['csv_terminated'] = ';';
-
-        $GLOBALS['output_kanji_conversion'] = false;
-        $GLOBALS['output_charset_conversion'] = false;
-        $GLOBALS['buffer_needed'] = false;
-        $GLOBALS['asfile'] = true;
-        $GLOBALS['save_on_server'] = true;
-        $GLOBALS['file_handle'] = null;
-
-        ob_start();
-        $this->assertFalse(
-            $this->object->exportData(
-                'testDB', 'testTable', "\n", 'example.com', 'test'
-            )
-        );
-        $result = ob_get_clean();
-
-        // case 2
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->once())
-            ->method('query')
-            ->with('test', null, PMA\libraries\DatabaseInterface::QUERY_UNBUFFERED)
-            ->will($this->returnValue(true));
-
-        $dbi->expects($this->once())
-            ->method('numFields')
-            ->with(true)
-            ->will($this->returnValue(1));
-
-        $dbi->expects($this->once())
-            ->method('fieldName')
-            ->with(true, 0)
-            ->will($this->returnValue("foo'\\bar"));
-
-        $dbi->expects($this->at(3))
-            ->method('fetchRow')
-            ->with(true)
-            ->will($this->returnValue(array(null, 'b', 'c', false, 'e', 'f')));
-
-        $dbi->expects($this->at(4))
-            ->method('fetchRow')
-            ->with(true)
-            ->will($this->returnValue(null));
-        $GLOBALS['dbi'] = $dbi;
-
-        $GLOBALS['what'] = 'UT';
-        $GLOBALS['UT_null'] = 'customNull';
-        $GLOBALS['output_kanji_conversion'] = false;
-        $GLOBALS['output_charset_conversion'] = false;
-        $GLOBALS['buffer_needed'] = false;
-        $GLOBALS['asfile'] = true;
-        $GLOBALS['save_on_server'] = false;
-
-        ob_start();
-        $this->assertTrue(
-            $this->object->exportData(
-                'testDB', 'testTable', "\n", 'example.com', 'test'
-            )
-        );
-        $result = ob_get_clean();
-
-        $this->assertEquals(
-            "foo'ba;customNull;",
-            $result
-        );
-
-        // case 3
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->once())
-            ->method('query')
-            ->with('test', null, PMA\libraries\DatabaseInterface::QUERY_UNBUFFERED)
-            ->will($this->returnValue(true));
-
-        $dbi->expects($this->once())
-            ->method('numFields')
-            ->with(true)
-            ->will($this->returnValue(1));
-
-        $dbi->expects($this->once())
-            ->method('fieldName')
-            ->with(true, 0)
-            ->will($this->returnValue("foo\"\\bar"));
-
-        $dbi->expects($this->at(3))
-            ->method('fetchRow')
-            ->with(true)
-            ->will($this->returnValue(array(1 => 'a')));
-
-        $dbi->expects($this->at(4))
-            ->method('fetchRow')
-            ->with(true)
-            ->will($this->returnValue(null));
-        $GLOBALS['dbi'] = $dbi;
-
-        $GLOBALS['csv_enclosed'] = '"';
-
-        ob_start();
-        $this->assertTrue(
-            $this->object->exportData(
-                'testDB', 'testTable', "\n", 'example.com', 'test'
-            )
-        );
-        $result = ob_get_clean();
-
-        $this->assertEquals(
-            "\"foo\"bar;customNull;",
-            $result
-        );
-
-        // case 4
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->once())
-            ->method('query')
-            ->with('test', null, PMA\libraries\DatabaseInterface::QUERY_UNBUFFERED)
-            ->will($this->returnValue(true));
-
-        $dbi->expects($this->once())
-            ->method('numFields')
-            ->with(true)
-            ->will($this->returnValue(1));
-
-        $dbi->expects($this->once())
-            ->method('fieldName')
-            ->with(true, 0)
-            ->will($this->returnValue("foo\"\\bar"));
-
-        $dbi->expects($this->at(3))
-            ->method('fetchRow')
-            ->with(true)
-            ->will($this->returnValue(array("test\015\012\n")));
-
-        $dbi->expects($this->at(4))
-            ->method('fetchRow')
-            ->with(true)
-            ->will($this->returnValue(null));
-        $GLOBALS['dbi'] = $dbi;
-
-        $GLOBALS['csv_enclosed'] = '"';
-        $GLOBALS['what'] = 'excel';
-        $GLOBALS['excel_removeCRLF'] = true;
-        $GLOBALS['csv_escaped'] = '"';
-
-        ob_start();
-        $this->assertTrue(
-            $this->object->exportData(
-                'testDB', 'testTable', "\n", 'example.com', 'test'
-            )
-        );
-        $result = ob_get_clean();
-
-        $this->assertEquals(
-            "\"foo\"\"bar;\"test\";",
-            $result
-        );
-
-        // case 5
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->once())
-            ->method('query')
-            ->with('test', null, PMA\libraries\DatabaseInterface::QUERY_UNBUFFERED)
-            ->will($this->returnValue(true));
-
-        $dbi->expects($this->once())
-            ->method('numFields')
-            ->with(true)
-            ->will($this->returnValue(1));
-
-        $dbi->expects($this->once())
-            ->method('fieldName')
-            ->with(true, 0)
-            ->will($this->returnValue("foo\"\\bar"));
-
-        $dbi->expects($this->at(3))
-            ->method('fetchRow')
-            ->with(true)
-            ->will($this->returnValue(array("test\015\n")));
-
-        $dbi->expects($this->at(4))
-            ->method('fetchRow')
-            ->with(true)
-            ->will($this->returnValue(null));
-        $GLOBALS['dbi'] = $dbi;
-
-        $GLOBALS['csv_enclosed'] = '"';
-        unset($GLOBALS['excel_removeCRLF']);
-        $GLOBALS['csv_escaped'] = ';';
-
-        ob_start();
-        $this->assertTrue(
-            $this->object->exportData(
-                'testDB', 'testTable', "\n", 'example.com', 'test'
-            )
-        );
-        $result = ob_get_clean();
-
-        $this->assertEquals(
-            "\"foo;\"bar;\"test\n\";",
-            $result
-        );
-
-        // case 6
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->once())
-            ->method('query')
-            ->with('test', null, PMA\libraries\DatabaseInterface::QUERY_UNBUFFERED)
-            ->will($this->returnValue(true));
-
-        $dbi->expects($this->once())
-            ->method('numFields')
-            ->with(true)
-            ->will($this->returnValue(2));
-
-        $dbi->expects($this->any())
-            ->method('fieldName')
-            ->will($this->returnValue("foo\"\\bar"));
-
-        $dbi->expects($this->at(4))
-            ->method('fetchRow')
-            ->with(true)
-            ->will($this->returnValue(array("test\015\n", "test\n")));
-
-        $dbi->expects($this->at(5))
-            ->method('fetchRow')
-            ->with(true)
-            ->will($this->returnValue(null));
-        $GLOBALS['dbi'] = $dbi;
-
-        $GLOBALS['csv_enclosed'] = '"';
-        $GLOBALS['csv_escaped'] = ';';
-        $GLOBALS['csv_escaped'] = '#';
-
-        ob_start();
-        $this->assertTrue(
-            $this->object->exportData(
-                'testDB', 'testTable', "\n", 'example.com', 'test'
-            )
-        );
-        $result = ob_get_clean();
-
-        $this->assertEquals(
-            "\"foo#\"bar\"\"foo#\"bar;\"test\n" .
-            "\"\"test\n" .
-            "\";",
-            $result
-        );
-    }
-}
diff --git a/#pma/test/classes/plugin/export/ExportExcelTest.php b/#pma/test/classes/plugin/export/ExportExcelTest.php
deleted file mode 100644
index 3d987ed4..00000000
--- a/#pma/test/classes/plugin/export/ExportExcelTest.php
+++ /dev/null
@@ -1,203 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for PMA\libraries\plugins\export\ExportExcel class
- *
- * @package PhpMyAdmin-test
- */
-use PMA\libraries\plugins\export\ExportExcel;
-
-require_once 'libraries/export.lib.php';
-require_once 'libraries/config.default.php';
-require_once 'export.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * tests for PMA\libraries\plugins\export\ExportExcel class
- *
- * @package PhpMyAdmin-test
- * @group medium
- */
-class ExportExcelTest extends PMATestCase
-{
-    protected $object;
-
-    /**
-     * Configures global environment.
-     *
-     * @return void
-     */
-    function setup()
-    {
-        $GLOBALS['server'] = 0;
-        $this->object = new ExportExcel();
-    }
-
-    /**
-     * tearDown for test cases
-     *
-     * @return void
-     */
-    public function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportExcel::setProperties
-     *
-     * @return void
-     */
-    public function testSetProperties()
-    {
-        $method = new ReflectionMethod('PMA\libraries\plugins\export\ExportExcel', 'setProperties');
-        $method->setAccessible(true);
-        $method->invoke($this->object, null);
-
-        $attrProperties = new ReflectionProperty('PMA\libraries\plugins\export\ExportExcel', 'properties');
-        $attrProperties->setAccessible(true);
-        $properties = $attrProperties->getValue($this->object);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\plugins\ExportPluginProperties',
-            $properties
-        );
-
-        $this->assertEquals(
-            'CSV for MS Excel',
-            $properties->getText()
-        );
-
-        $this->assertEquals(
-            'csv',
-            $properties->getExtension()
-        );
-
-        $this->assertEquals(
-            'text/comma-separated-values',
-            $properties->getMimeType()
-        );
-
-        $this->assertEquals(
-            'Options',
-            $properties->getOptionsText()
-        );
-
-        $options = $properties->getOptions();
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyRootGroup',
-            $options
-        );
-
-        $this->assertEquals(
-            'Format Specific Options',
-            $options->getName()
-        );
-
-        $generalOptionsArray = $options->getProperties();
-        $generalOptions = $generalOptionsArray[0];
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyMainGroup',
-            $generalOptions
-        );
-
-        $this->assertEquals(
-            'general_opts',
-            $generalOptions->getName()
-        );
-
-        $generalProperties = $generalOptions->getProperties();
-
-        $property = array_shift($generalProperties);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\TextPropertyItem',
-            $property
-        );
-
-        $this->assertEquals(
-            'null',
-            $property->getName()
-        );
-
-        $this->assertEquals(
-            'Replace NULL with:',
-            $property->getText()
-        );
-
-        $property = array_shift($generalProperties);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
-            $property
-        );
-
-        $this->assertEquals(
-            'removeCRLF',
-            $property->getName()
-        );
-
-        $this->assertEquals(
-            'Remove carriage return/line feed characters within columns',
-            $property->getText()
-        );
-
-        $property = array_shift($generalProperties);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
-            $property
-        );
-
-        $this->assertEquals(
-            'columns',
-            $property->getName()
-        );
-
-        $this->assertEquals(
-            'Put columns names in the first row',
-            $property->getText()
-        );
-
-        $property = array_shift($generalProperties);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\SelectPropertyItem',
-            $property
-        );
-
-        $this->assertEquals(
-            'edition',
-            $property->getName()
-        );
-
-        $this->assertEquals(
-            array(
-                'win' => 'Windows',
-                'mac_excel2003' => 'Excel 2003 / Macintosh',
-                'mac_excel2008' => 'Excel 2008 / Macintosh'
-            ),
-            $property->getValues()
-        );
-
-        $this->assertEquals(
-            "Excel edition:",
-            $property->getText()
-        );
-
-        $property = array_shift($generalProperties);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\HiddenPropertyItem',
-            $property
-        );
-
-        $this->assertEquals(
-            'structure_or_data',
-            $property->getName()
-        );
-    }
-
-}
diff --git a/#pma/test/classes/plugin/export/ExportHtmlwordTest.php b/#pma/test/classes/plugin/export/ExportHtmlwordTest.php
deleted file mode 100644
index 06aef14a..00000000
--- a/#pma/test/classes/plugin/export/ExportHtmlwordTest.php
+++ /dev/null
@@ -1,912 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for PMA\libraries\plugins\export\ExportHtmlword class
- *
- * @package PhpMyAdmin-test
- */
-use PMA\libraries\plugins\export\ExportHtmlword;
-
-require_once 'libraries/export.lib.php';
-require_once 'libraries/config.default.php';
-require_once 'libraries/relation.lib.php';
-require_once 'libraries/transformations.lib.php';
-require_once 'export.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * tests for PMA\libraries\plugins\export\ExportHtmlword class
- *
- * @package PhpMyAdmin-test
- * @group medium
- */
-class ExportHtmlwordTest extends PMATestCase
-{
-    protected $object;
-
-    /**
-     * Configures global environment.
-     *
-     * @return void
-     */
-    function setup()
-    {
-        $GLOBALS['server'] = 0;
-        $this->object = new ExportHtmlword();
-        $GLOBALS['output_kanji_conversion'] = false;
-        $GLOBALS['output_charset_conversion'] = false;
-        $GLOBALS['buffer_needed'] = false;
-        $GLOBALS['asfile'] = true;
-        $GLOBALS['save_on_server'] = false;
-    }
-
-    /**
-     * tearDown for test cases
-     *
-     * @return void
-     */
-    public function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportHtmlword::setProperties
-     *
-     * @return void
-     */
-    public function testSetProperties()
-    {
-        $method = new ReflectionMethod('PMA\libraries\plugins\export\ExportHtmlword', 'setProperties');
-        $method->setAccessible(true);
-        $method->invoke($this->object, null);
-
-        $attrProperties = new ReflectionProperty('PMA\libraries\plugins\export\ExportHtmlword', 'properties');
-        $attrProperties->setAccessible(true);
-        $properties = $attrProperties->getValue($this->object);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\plugins\ExportPluginProperties',
-            $properties
-        );
-
-        $this->assertEquals(
-            'Microsoft Word 2000',
-            $properties->getText()
-        );
-
-        $this->assertEquals(
-            'doc',
-            $properties->getExtension()
-        );
-
-        $this->assertEquals(
-            'application/vnd.ms-word',
-            $properties->getMimeType()
-        );
-
-        $this->assertEquals(
-            'Options',
-            $properties->getOptionsText()
-        );
-
-        $this->assertTrue(
-            $properties->getForceFile()
-        );
-
-        $options = $properties->getOptions();
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyRootGroup',
-            $options
-        );
-
-        $this->assertEquals(
-            'Format Specific Options',
-            $options->getName()
-        );
-
-        $generalOptionsArray = $options->getProperties();
-        $generalOptions = $generalOptionsArray[0];
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyMainGroup',
-            $generalOptions
-        );
-
-        $this->assertEquals(
-            'dump_what',
-            $generalOptions->getName()
-        );
-
-        $this->assertEquals(
-            'Dump table',
-            $generalOptions->getText()
-        );
-
-        $generalProperties = $generalOptions->getProperties();
-
-        $property = array_shift($generalProperties);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\RadioPropertyItem',
-            $property
-        );
-
-        $this->assertEquals(
-            'structure_or_data',
-            $property->getName()
-        );
-
-        $this->assertEquals(
-            array(
-                'structure' => __('structure'),
-                'data' => __('data'),
-                'structure_and_data' => __('structure and data')
-            ),
-            $property->getValues()
-        );
-
-        $generalOptions = $generalOptionsArray[1];
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyMainGroup',
-            $generalOptions
-        );
-
-        $this->assertEquals(
-            'dump_what',
-            $generalOptions->getName()
-        );
-
-        $this->assertEquals(
-            'Data dump options',
-            $generalOptions->getText()
-        );
-
-        $this->assertEquals(
-            'structure',
-            $generalOptions->getForce()
-        );
-
-        $generalProperties = $generalOptions->getProperties();
-
-        $property = array_shift($generalProperties);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\TextPropertyItem',
-            $property
-        );
-
-        $this->assertEquals(
-            'null',
-            $property->getName()
-        );
-
-        $this->assertEquals(
-            'Replace NULL with:',
-            $property->getText()
-        );
-
-        $property = array_shift($generalProperties);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
-            $property
-        );
-
-        $this->assertEquals(
-            'columns',
-            $property->getName()
-        );
-
-        $this->assertEquals(
-            'Put columns names in the first row',
-            $property->getText()
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportHtmlword::exportHeader
-     *
-     * @return void
-     */
-    public function testExportHeader()
-    {
-        ob_start();
-        $this->object->exportHeader();
-        $result = ob_get_clean();
-
-        $expected
-            = '<html xmlns:o="urn:schemas-microsoft-com:office:office"
-            xmlns:x="urn:schemas-microsoft-com:office:word"
-            xmlns="http://www.w3.org/TR/REC-html40">
-
-            <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"'
-            . ' "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-            <html>
-            <head>
-                <meta http-equiv="Content-type" content="text/html;charset='
-            . 'utf-8' . '" />
-            </head>
-            <body>';
-
-        $this->assertEquals(
-            $expected,
-            $result
-        );
-
-        // case 2
-
-        $GLOBALS['charset'] = 'ISO-8859-1';
-        ob_start();
-        $this->object->exportHeader();
-        $result = ob_get_clean();
-
-        $expected
-            = '<html xmlns:o="urn:schemas-microsoft-com:office:office"
-            xmlns:x="urn:schemas-microsoft-com:office:word"
-            xmlns="http://www.w3.org/TR/REC-html40">
-
-            <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"'
-            . ' "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-            <html>
-            <head>
-                <meta http-equiv="Content-type" content="text/html;charset='
-            . 'ISO-8859-1' . '" />
-            </head>
-            <body>';
-
-        $this->assertEquals(
-            $expected,
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportHtmlword::exportFooter
-     *
-     * @return void
-     */
-    public function testExportFooter()
-    {
-        ob_start();
-        $this->assertTrue(
-            $this->object->exportFooter()
-        );
-        $result = ob_get_clean();
-
-        $this->assertEquals(
-            '</body></html>',
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportHtmlword::exportDBHeader
-     *
-     * @return void
-     */
-    public function testExportDBHeader()
-    {
-        ob_start();
-        $this->assertTrue(
-            $this->object->exportDBHeader('d"b')
-        );
-        $result = ob_get_clean();
-
-        $this->assertEquals(
-            '<h1>Database d&quot;b</h1>',
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportHtmlword::exportDBFooter
-     *
-     * @return void
-     */
-    public function testExportDBFooter()
-    {
-        $this->assertTrue(
-            $this->object->exportDBFooter('testDB')
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportHtmlword::exportDBCreate
-     *
-     * @return void
-     */
-    public function testExportDBCreate()
-    {
-        $this->assertTrue(
-            $this->object->exportDBCreate('testDB', 'database')
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportHtmlword::exportData
-     *
-     * @return void
-     */
-    public function testExportData()
-    {
-        // case 1
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->once())
-            ->method('query')
-            ->with('test', null, PMA\libraries\DatabaseInterface::QUERY_UNBUFFERED)
-            ->will($this->returnValue(true));
-
-        $dbi->expects($this->once())
-            ->method('numFields')
-            ->with(true)
-            ->will($this->returnValue(5));
-
-        $dbi->expects($this->any())
-            ->method('fieldName')
-            ->will($this->returnValue("foo\\bar"));
-
-        $dbi->expects($this->at(7))
-            ->method('fetchRow')
-            ->with(true)
-            ->will($this->returnValue(array(null, '0', 'test', false)));
-
-        $dbi->expects($this->at(8))
-            ->method('fetchRow')
-            ->with(true)
-            ->will($this->returnValue(null));
-        $GLOBALS['dbi'] = $dbi;
-
-        $GLOBALS['htmlword_columns'] = true;
-        $GLOBALS['what'] = 'UT';
-        $GLOBALS['UT_null'] = 'customNull';
-        $GLOBALS['output_kanji_conversion'] = false;
-        $GLOBALS['output_charset_conversion'] = false;
-        $GLOBALS['buffer_needed'] = false;
-        $GLOBALS['asfile'] = true;
-        $GLOBALS['save_on_server'] = false;
-
-        ob_start();
-        $this->assertTrue(
-            $this->object->exportData(
-                'testDB', 'testTable', "\n", 'example.com', 'test'
-            )
-        );
-        $result = htmlspecialchars_decode(ob_get_clean());
-
-        $this->assertEquals(
-            '<h2>Dumping data for table testTable</h2>' .
-            '<table class="width100" cellspacing="1"><tr class="print-category">' .
-            '<td class="print"><strong>foobar</strong></td>' .
-            '<td class="print"><strong>foobar</strong></td>' .
-            '<td class="print"><strong>foobar</strong></td>' .
-            '<td class="print"><strong>foobar</strong></td>' .
-            '<td class="print"><strong>foobar</strong></td>' .
-            '</tr><tr class="print-category"><td class="print">' .
-            'customNull</td><td class="print">0</td><td class="print">test</td>' .
-            '<td class="print"></td><td class="print">customNull</td></tr></table>',
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportHtmlword::getTableDefStandIn
-     *
-     * @return void
-     */
-    public function testGetTableDefStandIn()
-    {
-        $this->object = $this->getMockBuilder('PMA\libraries\plugins\export\ExportHtmlword')
-            ->setMethods(array('formatOneColumnDefinition'))
-            ->getMock();
-
-        // case 1
-
-        $keys = array(
-            array(
-                'Non_unique' => 0,
-                'Column_name' => 'name1'
-            ),
-            array(
-                'Non_unique' => 1,
-                'Column_name' => 'name2'
-            )
-        );
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->once())
-            ->method('getTableIndexes')
-            ->with('database', 'view')
-            ->will($this->returnValue($keys));
-
-        $dbi->expects($this->once())
-            ->method('getColumns')
-            ->with('database', 'view')
-            ->will($this->returnValue(array(array('Field' => 'column'))));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $this->object->expects($this->once())
-            ->method('formatOneColumnDefinition')
-            ->with(array('Field' => 'column'), array('name1'), 'column')
-            ->will($this->returnValue(1));
-
-        $this->assertEquals(
-            '<table class="width100" cellspacing="1">' .
-            '<tr class="print-category"><th class="print">Column</th>' .
-            '<td class="print"><strong>Type</strong></td>' .
-            '<td class="print"><strong>Null</strong></td>' .
-            '<td class="print"><strong>Default</strong></td></tr>' .
-            '1</tr></table>',
-            $this->object->getTableDefStandIn('database', 'view', "\n")
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportHtmlword::getTableDef
-     *
-     * @return void
-     */
-    public function testGetTableDef()
-    {
-        $this->object = $this->getMockBuilder('PMA\libraries\plugins\export\ExportHtmlword')
-            ->setMethods(array('formatOneColumnDefinition'))
-            ->getMock();
-
-        $keys = array(
-            array(
-                'Non_unique' => 0,
-                'Column_name' => 'name1'
-            ),
-            array(
-                'Non_unique' => 1,
-                'Column_name' => 'name2'
-            )
-        );
-
-        // case 1
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->exactly(2))
-            ->method('fetchResult')
-            ->willReturnOnConsecutiveCalls(
-                array(),
-                array(
-                    'fieldname' => array(
-                        'values' => 'test-',
-                        'transformation' => 'testfoo',
-                        'mimetype' => 'test<'
-                    )
-                )
-            );
-
-        $dbi->expects($this->once())
-            ->method('getTableIndexes')
-            ->with('database', '')
-            ->will($this->returnValue($keys));
-
-        $columns = array(
-            'Field' => 'fieldname'
-        );
-        $dbi->expects($this->once())
-            ->method('getColumns')
-            ->with('database', '')
-            ->will($this->returnValue(array($columns)));
-
-        $dbi->expects($this->any())
-            ->method('query')
-            ->will($this->returnValue(true));
-
-        $dbi->expects($this->any())
-            ->method('numRows')
-            ->will($this->returnValue(1));
-
-        $dbi->expects($this->any())
-            ->method('fetchAssoc')
-            ->will(
-                $this->returnValue(
-                    array(
-                        'comment' => array('fieldname' => 'testComment')
-                    )
-                )
-            );
-        $dbi->expects($this->any())->method('escapeString')
-            ->will($this->returnArgument(0));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $this->object->expects($this->exactly(3))
-            ->method('formatOneColumnDefinition')
-            ->with($columns, array('name1'))
-            ->will($this->returnValue(1));
-
-        $GLOBALS['cfgRelation']['relation'] = true;
-        $GLOBALS['controllink'] = null;
-        $_SESSION['relation'][0] = array(
-            'PMA_VERSION' => PMA_VERSION,
-            'relwork' => true,
-            'commwork' => true,
-            'mimework' => true,
-            'db' => 'database',
-            'relation' => 'rel',
-            'column_info' => 'col'
-        );
-
-        $result = $this->object->getTableDef(
-            'database',
-            '',
-            true,
-            true,
-            true
-        );
-
-        $this->assertEquals(
-            '<table class="width100" cellspacing="1">' .
-            '<tr class="print-category"><th class="print">Column</th>' .
-            '<td class="print"><strong>Type</strong></td>' .
-            '<td class="print"><strong>Null</strong></td>' .
-            '<td class="print"><strong>Default</strong></td>' .
-            '<td class="print"><strong>Comments</strong></td>' .
-            '<td class="print"><strong>MIME</strong></td></tr>' .
-            '1<td class="print"></td><td class="print">Test&lt;</td></tr></table>',
-            $result
-        );
-
-        // case 2
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->exactly(2))
-            ->method('fetchResult')
-            ->willReturnOnConsecutiveCalls(
-                array(
-                    'fieldname' => array(
-                        'foreign_table' => 'ftable',
-                        'foreign_field' => 'ffield'
-                    )
-                ),
-                array(
-                    'field' => array(
-                        'values' => 'test-',
-                        'transformation' => 'testfoo',
-                        'mimetype' => 'test<'
-                    )
-                )
-            );
-
-        $dbi->expects($this->once())
-            ->method('getTableIndexes')
-            ->with('database', '')
-            ->will($this->returnValue($keys));
-
-        $columns = array(
-            'Field' => 'fieldname'
-        );
-
-        $dbi->expects($this->once())
-            ->method('getColumns')
-            ->with('database', '')
-            ->will($this->returnValue(array($columns)));
-
-        $dbi->expects($this->any())
-            ->method('query')
-            ->will($this->returnValue(true));
-
-        $dbi->expects($this->any())
-            ->method('numRows')
-            ->will($this->returnValue(1));
-
-        $dbi->expects($this->any())
-            ->method('fetchAssoc')
-            ->will(
-                $this->returnValue(
-                    array(
-                        'comment' => array('field' => 'testComment')
-                    )
-                )
-            );
-        $dbi->expects($this->any())->method('escapeString')
-            ->will($this->returnArgument(0));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $GLOBALS['cfgRelation']['relation'] = true;
-        $_SESSION['relation'][0] = array(
-            'PMA_VERSION' => PMA_VERSION,
-            'relwork' => true,
-            'commwork' => true,
-            'mimework' => true,
-            'db' => 'database',
-            'relation' => 'rel',
-            'column_info' => 'col'
-        );
-
-        $result = $this->object->getTableDef(
-            'database',
-            '',
-            true,
-            true,
-            true
-        );
-
-        $this->assertContains(
-            '<td class="print">ftable (ffield)</td>',
-            $result
-        );
-
-        $this->assertContains(
-            '<td class="print"></td><td class="print"></td>',
-            $result
-        );
-
-         // case 3
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->once())
-            ->method('getTableIndexes')
-            ->with('database', '')
-            ->will($this->returnValue($keys));
-
-        $columns = array(
-            'Field' => 'fieldname'
-        );
-
-        $dbi->expects($this->once())
-            ->method('getColumns')
-            ->with('database', '')
-            ->will($this->returnValue(array($columns)));
-
-        $dbi->expects($this->any())
-            ->method('query')
-            ->will($this->returnValue(true));
-
-        $dbi->expects($this->any())
-            ->method('numRows')
-            ->will($this->returnValue(1));
-
-        $dbi->expects($this->any())
-            ->method('fetchAssoc')
-            ->will(
-                $this->returnValue(
-                    array(
-                        'comment' => array('field' => 'testComment')
-                    )
-                )
-            );
-        $dbi->expects($this->any())->method('escapeString')
-            ->will($this->returnArgument(0));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $GLOBALS['cfgRelation']['relation'] = true;
-        $_SESSION['relation'][0] = array(
-            'PMA_VERSION' => PMA_VERSION,
-            'relwork' => false,
-            'commwork' => false,
-            'mimework' => false,
-            'db' => 'database',
-            'relation' => 'rel',
-            'column_info' => 'col'
-        );
-
-        $result = $this->object->getTableDef(
-            'database',
-            '',
-            false,
-            false,
-            false
-        );
-
-        $this->assertEquals(
-            '<table class="width100" cellspacing="1">' .
-            '<tr class="print-category"><th class="print">Column</th>' .
-            '<td class="print"><strong>Type</strong></td>' .
-            '<td class="print"><strong>Null</strong></td>' .
-            '<td class="print"><strong>Default</strong></td></tr>1</tr></table>',
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportHtmlword::getTriggers
-     *
-     * @return void
-     */
-    public function testGetTriggers()
-    {
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $triggers = array(
-            array(
-                'name' => 'tna"me',
-                'action_timing' => 'ac>t',
-                'event_manipulation' => 'manip&',
-                'definition' => 'def'
-            )
-        );
-
-        $dbi->expects($this->once())
-            ->method('getTriggers')
-            ->with('database', 'table')
-            ->will($this->returnValue($triggers));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $method = new ReflectionMethod('PMA\libraries\plugins\export\ExportHtmlword', 'getTriggers');
-        $method->setAccessible(true);
-        $result = $method->invoke($this->object, 'database', 'table');
-
-        $this->assertContains(
-            '<td class="print">tna&quot;me</td>' .
-            '<td class="print">ac&gt;t</td>' .
-            '<td class="print">manip&amp;</td>' .
-            '<td class="print">def</td>',
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportHtmlword::exportStructure
-     *
-     * @return void
-     */
-    public function testExportStructure()
-    {
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->once())
-            ->method('getTriggers')
-            ->with('db', 'tbl')
-            ->will($this->returnValue(1));
-
-        $this->object = $this->getMockBuilder('PMA\libraries\plugins\export\ExportHtmlword')
-            ->setMethods(array('getTableDef', 'getTriggers', 'getTableDefStandIn'))
-            ->getMock();
-
-        $this->object->expects($this->at(0))
-            ->method('getTableDef')
-            ->with('db', 'tbl', false, false, false, false)
-            ->will($this->returnValue('dumpText1'));
-
-        $this->object->expects($this->once())
-            ->method('getTriggers')
-            ->with('db', 'tbl')
-            ->will($this->returnValue('dumpText2'));
-
-        $this->object->expects($this->at(2))
-            ->method('getTableDef')
-            ->with('db', 'tbl', false, false, false, true, array())
-            ->will($this->returnValue('dumpText3'));
-
-        $this->object->expects($this->once())
-            ->method('getTableDefStandIn')
-            ->with('db', 'tbl', "\n")
-            ->will($this->returnValue('dumpText4'));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        ob_start();
-        $this->assertTrue(
-            $this->object->exportStructure(
-                'db', 'tbl', "\n", "example.com", "create_table", "test"
-            )
-        );
-        $result = ob_get_clean();
-
-        $this->assertEquals(
-            '<h2>Table structure for table tbl</h2>dumpText1',
-            $result
-        );
-
-        ob_start();
-        $this->assertTrue(
-            $this->object->exportStructure(
-                'db', 'tbl', "\n", "example.com", "triggers", "test"
-            )
-        );
-        $result = ob_get_clean();
-
-        $this->assertEquals(
-            '<h2>Triggers tbl</h2>dumpText2',
-            $result
-        );
-
-        ob_start();
-        $this->assertTrue(
-            $this->object->exportStructure(
-                'db', 'tbl', "\n", "example.com", "create_view", "test"
-            )
-        );
-        $result = ob_get_clean();
-
-        $this->assertEquals(
-            '<h2>Structure for view tbl</h2>dumpText3',
-            $result
-        );
-
-        ob_start();
-        $this->assertTrue(
-            $this->object->exportStructure(
-                'db', 'tbl', "\n", "example.com", "stand_in", "test"
-            )
-        );
-        $result = ob_get_clean();
-
-        $this->assertEquals(
-            '<h2>Stand-in structure for view tbl</h2>dumpText4',
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportHtmlword::formatOneColumnDefinition
-     *
-     * @return void
-     */
-    public function testFormatOneColumnDefinition()
-    {
-        $method = new ReflectionMethod(
-            'PMA\libraries\plugins\export\ExportHtmlword', 'formatOneColumnDefinition'
-        );
-        $method->setAccessible(true);
-
-        $cols = array(
-            'Null' => 'Yes',
-            'Field' => 'field',
-            'Key' => 'PRI',
-            'Type' => 'set(abc)enum123'
-        );
-
-        $unique_keys = array(
-            'field'
-        );
-
-        $this->assertEquals(
-            '<tr class="print-category"><td class="print"><em>' .
-            '<strong>field</strong></em></td><td class="print">set(abc)</td>' .
-            '<td class="print">Yes</td><td class="print">NULL</td>',
-            $method->invoke($this->object, $cols, $unique_keys)
-        );
-
-        $cols = array(
-            'Null' => 'NO',
-            'Field' => 'fields',
-            'Key' => 'COMP',
-            'Type' => '',
-            'Default' => 'def'
-        );
-
-        $unique_keys = array(
-            'field'
-        );
-
-        $this->assertEquals(
-            '<tr class="print-category"><td class="print">fields</td>' .
-            '<td class="print">&amp;nbsp;</td><td class="print">No</td>' .
-            '<td class="print">def</td>',
-            $method->invoke($this->object, $cols, $unique_keys)
-        );
-    }
-}
diff --git a/#pma/test/classes/plugin/export/ExportJsonTest.php b/#pma/test/classes/plugin/export/ExportJsonTest.php
deleted file mode 100644
index eccb4786..00000000
--- a/#pma/test/classes/plugin/export/ExportJsonTest.php
+++ /dev/null
@@ -1,254 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for PMA\libraries\plugins\export\ExportJson class
- *
- * @package PhpMyAdmin-test
- */
-use PMA\libraries\plugins\export\ExportJson;
-
-require_once 'libraries/export.lib.php';
-require_once 'libraries/config.default.php';
-require_once 'export.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * tests for PMA\libraries\plugins\export\ExportJson class
- *
- * @package PhpMyAdmin-test
- * @group medium
- */
-class ExportJsonTest extends PMATestCase
-{
-    protected $object;
-
-    /**
-     * Configures global environment.
-     *
-     * @return void
-     */
-    function setup()
-    {
-        $GLOBALS['server'] = 0;
-        $GLOBALS['output_kanji_conversion'] = false;
-        $GLOBALS['output_charset_conversion'] = false;
-        $GLOBALS['buffer_needed'] = false;
-        $GLOBALS['asfile'] = true;
-        $GLOBALS['save_on_server'] = false;
-        $this->object = new ExportJson();
-    }
-
-    /**
-     * tearDown for test cases
-     *
-     * @return void
-     */
-    public function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportJson::setProperties
-     *
-     * @return void
-     */
-    public function testSetProperties()
-    {
-        $method = new ReflectionMethod('PMA\libraries\plugins\export\ExportJson', 'setProperties');
-        $method->setAccessible(true);
-        $method->invoke($this->object, null);
-
-        $attrProperties = new ReflectionProperty('PMA\libraries\plugins\export\ExportJson', 'properties');
-        $attrProperties->setAccessible(true);
-        $properties = $attrProperties->getValue($this->object);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\plugins\ExportPluginProperties',
-            $properties
-        );
-
-        $this->assertEquals(
-            'JSON',
-            $properties->getText()
-        );
-
-        $this->assertEquals(
-            'json',
-            $properties->getExtension()
-        );
-
-        $this->assertEquals(
-            'text/plain',
-            $properties->getMimeType()
-        );
-
-        $this->assertEquals(
-            'Options',
-            $properties->getOptionsText()
-        );
-
-        $options = $properties->getOptions();
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyRootGroup',
-            $options
-        );
-
-        $this->assertEquals(
-            'Format Specific Options',
-            $options->getName()
-        );
-
-        $generalOptionsArray = $options->getProperties();
-        $generalOptions = $generalOptionsArray[0];
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyMainGroup',
-            $generalOptions
-        );
-
-        $this->assertEquals(
-            'general_opts',
-            $generalOptions->getName()
-        );
-
-        $generalProperties = $generalOptions->getProperties();
-
-        $property = array_shift($generalProperties);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\HiddenPropertyItem',
-            $property
-        );
-
-        $this->assertEquals(
-            'structure_or_data',
-            $property->getName()
-        );
-
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportJson::exportHeader
-     *
-     * @return void
-     */
-    public function testExportHeader()
-    {
-        $GLOBALS['crlf'] = "\n";
-
-        $this->expectOutputString(
-            '/**' . "\n"
-            . ' Export to JSON plugin for PHPMyAdmin' . "\n"
-            . ' @version ' . PMA_VERSION . "\n"
-            . ' */' . "\n" . "\n"
-        );
-
-        $this->assertTrue(
-            $this->object->exportHeader()
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportJson::exportFooter
-     *
-     * @return void
-     */
-    public function testExportFooter()
-    {
-        $this->assertTrue(
-            $this->object->exportFooter()
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportJson::exportDBHeader
-     *
-     * @return void
-     */
-    public function testExportDBHeader()
-    {
-        $GLOBALS['crlf'] = "\n";
-
-        $this->expectOutputString(
-            "// Database 'testDB'\n"
-        );
-
-        $this->assertTrue(
-            $this->object->exportDBHeader('testDB')
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportJson::exportDBFooter
-     *
-     * @return void
-     */
-    public function testExportDBFooter()
-    {
-        $this->assertTrue(
-            $this->object->exportDBFooter('testDB')
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportJson::exportDBCreate
-     *
-     * @return void
-     */
-    public function testExportDBCreate()
-    {
-        $this->assertTrue(
-            $this->object->exportDBCreate('testDB', 'database')
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportJson::exportData
-     *
-     * @return void
-     */
-    public function testExportData()
-    {
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->once())
-            ->method('numFields')
-            ->with(null)
-            ->will($this->returnValue(1));
-
-        $dbi->expects($this->at(2))
-            ->method('fieldName')
-            ->with(null, 0)
-            ->will($this->returnValue('f1'));
-
-        $dbi->expects($this->at(3))
-            ->method('fetchRow')
-            ->with(null)
-            ->will($this->returnValue(array('foo')));
-
-        $dbi->expects($this->at(4))
-            ->method('fetchRow')
-            ->with(null)
-            ->will($this->returnValue(array('bar')));
-
-        $dbi->expects($this->at(5))
-            ->method('fetchRow')
-            ->with(null)
-            ->will($this->returnValue(null));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $this->expectOutputString(
-            "\n// db.tbl\n\n" .
-            "[{\"f1\":\"foo\"}, {\"f1\":\"bar\"}]\n"
-        );
-
-        $this->assertTrue(
-            $this->object->exportData('db', 'tbl', "\n", "example.com", "SELECT")
-        );
-    }
-}
diff --git a/#pma/test/classes/plugin/export/ExportLatexTest.php b/#pma/test/classes/plugin/export/ExportLatexTest.php
deleted file mode 100644
index 9eefe825..00000000
--- a/#pma/test/classes/plugin/export/ExportLatexTest.php
+++ /dev/null
@@ -1,993 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for PMA\libraries\plugins\export\ExportLatex class
- *
- * @package PhpMyAdmin-test
- */
-use PMA\libraries\plugins\export\ExportLatex;
-
-require_once 'libraries/export.lib.php';
-require_once 'libraries/config.default.php';
-require_once 'libraries/relation.lib.php';
-require_once 'libraries/transformations.lib.php';
-require_once 'export.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * tests for PMA\libraries\plugins\export\ExportLatex class
- *
- * @package PhpMyAdmin-test
- * @group medium
- */
-class ExportLatexTest extends PMATestCase
-{
-    protected $object;
-
-    /**
-     * Configures global environment.
-     *
-     * @return void
-     */
-    function setup()
-    {
-        $GLOBALS['server'] = 0;
-        $GLOBALS['output_kanji_conversion'] = false;
-        $GLOBALS['output_charset_conversion'] = false;
-        $GLOBALS['buffer_needed'] = false;
-        $GLOBALS['asfile'] = true;
-        $GLOBALS['save_on_server'] = false;
-        $GLOBALS['plugin_param'] = array();
-        $GLOBALS['plugin_param']['export_type'] = 'table';
-        $GLOBALS['plugin_param']['single_table'] = false;
-        $GLOBALS['cfgRelation']['relation'] = true;
-        $this->object = new ExportLatex();
-    }
-
-    /**
-     * tearDown for test cases
-     *
-     * @return void
-     */
-    public function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportLatex::setProperties
-     *
-     * @return void
-     */
-    public function testSetProperties()
-    {
-        $GLOBALS['plugin_param']['export_type'] = '';
-        $GLOBALS['plugin_param']['single_table'] = false;
-        $GLOBALS['cfgRelation']['mimework'] = true;
-
-        $method = new ReflectionMethod('PMA\libraries\plugins\export\ExportLatex', 'setProperties');
-        $method->setAccessible(true);
-        $method->invoke($this->object, null);
-
-        $attrProperties = new ReflectionProperty('PMA\libraries\plugins\export\ExportLatex', 'properties');
-        $attrProperties->setAccessible(true);
-        $properties = $attrProperties->getValue($this->object);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\plugins\ExportPluginProperties',
-            $properties
-        );
-
-        $this->assertEquals(
-            'LaTeX',
-            $properties->getText()
-        );
-
-        $this->assertEquals(
-            'tex',
-            $properties->getExtension()
-        );
-
-        $this->assertEquals(
-            'application/x-tex',
-            $properties->getMimeType()
-        );
-
-        $this->assertEquals(
-            'Options',
-            $properties->getOptionsText()
-        );
-
-        $options = $properties->getOptions();
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyRootGroup',
-            $options
-        );
-
-        $this->assertEquals(
-            'Format Specific Options',
-            $options->getName()
-        );
-
-        $generalOptionsArray = $options->getProperties();
-
-        $generalOptions = array_shift($generalOptionsArray);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyMainGroup',
-            $generalOptions
-        );
-
-        $this->assertEquals(
-            'general_opts',
-            $generalOptions->getName()
-        );
-
-        $generalProperties = $generalOptions->getProperties();
-
-        $property = array_shift($generalProperties);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
-            $property
-        );
-
-        $this->assertEquals(
-            'caption',
-            $property->getName()
-        );
-
-        $this->assertEquals(
-            'Include table caption',
-            $property->getText()
-        );
-
-        $generalOptions = array_shift($generalOptionsArray);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyMainGroup',
-            $generalOptions
-        );
-
-        $this->assertEquals(
-            'dump_what',
-            $generalOptions->getName()
-        );
-
-        $this->assertEquals(
-            'Dump table',
-            $generalOptions->getText()
-        );
-
-        $generalProperties = $generalOptions->getProperties();
-
-        $property = array_shift($generalProperties);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\RadioPropertyItem',
-            $property
-        );
-
-        $this->assertEquals(
-            'structure_or_data',
-            $property->getName()
-        );
-
-        $this->assertEquals(
-            array(
-                'structure' => __('structure'),
-                'data' => __('data'),
-                'structure_and_data' => __('structure and data')
-            ),
-            $property->getValues()
-        );
-
-        // hide structure
-        $generalOptions = array_shift($generalOptionsArray);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyMainGroup',
-            $generalOptions
-        );
-
-        $this->assertEquals(
-            'structure',
-            $generalOptions->getName()
-        );
-
-        $this->assertEquals(
-            'Object creation options',
-            $generalOptions->getText()
-        );
-
-        $this->assertEquals(
-            'data',
-            $generalOptions->getForce()
-        );
-
-        $generalProperties = $generalOptions->getProperties();
-
-        $property = array_shift($generalProperties);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\TextPropertyItem',
-            $property
-        );
-
-        $this->assertEquals(
-            'structure_caption',
-            $property->getName()
-        );
-
-        $this->assertEquals(
-            'Table caption:',
-            $property->getText()
-        );
-
-        $this->assertEquals(
-            'faq6-27',
-            $property->getDoc()
-        );
-
-        $property = array_shift($generalProperties);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\TextPropertyItem',
-            $property
-        );
-
-        $this->assertEquals(
-            'structure_continued_caption',
-            $property->getName()
-        );
-
-        $this->assertEquals(
-            'Table caption (continued):',
-            $property->getText()
-        );
-
-        $this->assertEquals(
-            'faq6-27',
-            $property->getDoc()
-        );
-
-        $property = array_shift($generalProperties);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\TextPropertyItem',
-            $property
-        );
-
-        $this->assertEquals(
-            'structure_label',
-            $property->getName()
-        );
-
-        $this->assertEquals(
-            'Label key:',
-            $property->getText()
-        );
-
-        $this->assertEquals(
-            'faq6-27',
-            $property->getDoc()
-        );
-
-        $property = array_shift($generalProperties);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
-            $property
-        );
-
-        $this->assertEquals(
-            'relation',
-            $property->getName()
-        );
-
-        $this->assertEquals(
-            'Display foreign key relationships',
-            $property->getText()
-        );
-
-        $property = array_shift($generalProperties);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
-            $property
-        );
-
-        $this->assertEquals(
-            'comments',
-            $property->getName()
-        );
-
-        $this->assertEquals(
-            'Display comments',
-            $property->getText()
-        );
-
-        $property = array_shift($generalProperties);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
-            $property
-        );
-
-        $this->assertEquals(
-            'mime',
-            $property->getName()
-        );
-
-        $this->assertEquals(
-            'Display MIME types',
-            $property->getText()
-        );
-
-        // data options
-        $generalOptions = array_shift($generalOptionsArray);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyMainGroup',
-            $generalOptions
-        );
-
-        $this->assertEquals(
-            'data',
-            $generalOptions->getName()
-        );
-
-        $this->assertEquals(
-            'Data dump options',
-            $generalOptions->getText()
-        );
-
-        $this->assertEquals(
-            'structure',
-            $generalOptions->getForce()
-        );
-
-        $generalProperties = $generalOptions->getProperties();
-
-        $property = array_shift($generalProperties);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
-            $property
-        );
-
-        $this->assertEquals(
-            'columns',
-            $property->getName()
-        );
-
-        $this->assertEquals(
-            'Put columns names in the first row:',
-            $property->getText()
-        );
-
-        $property = array_shift($generalProperties);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\TextPropertyItem',
-            $property
-        );
-
-        $this->assertEquals(
-            'data_caption',
-            $property->getName()
-        );
-
-        $this->assertEquals(
-            'Table caption:',
-            $property->getText()
-        );
-
-        $this->assertEquals(
-            'faq6-27',
-            $property->getDoc()
-        );
-
-        $property = array_shift($generalProperties);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\TextPropertyItem',
-            $property
-        );
-
-        $this->assertEquals(
-            'data_continued_caption',
-            $property->getName()
-        );
-
-        $this->assertEquals(
-            'Table caption (continued):',
-            $property->getText()
-        );
-
-        $this->assertEquals(
-            'faq6-27',
-            $property->getDoc()
-        );
-
-        $property = array_shift($generalProperties);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\TextPropertyItem',
-            $property
-        );
-
-        $this->assertEquals(
-            'data_label',
-            $property->getName()
-        );
-
-        $this->assertEquals(
-            'Label key:',
-            $property->getText()
-        );
-
-        $this->assertEquals(
-            'faq6-27',
-            $property->getDoc()
-        );
-
-        $property = array_shift($generalProperties);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\TextPropertyItem',
-            $property
-        );
-
-        $this->assertEquals(
-            'null',
-            $property->getName()
-        );
-
-        $this->assertEquals(
-            'Replace NULL with:',
-            $property->getText()
-        );
-
-        // case 2
-        $GLOBALS['plugin_param']['export_type'] = 'table';
-        $GLOBALS['plugin_param']['single_table'] = false;
-
-        $method->invoke($this->object, null);
-        $properties = $attrProperties->getValue($this->object);
-
-        $generalOptionsArray = $options->getProperties();
-
-        $this->assertCount(
-            4,
-            $generalOptionsArray
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportLatex::exportHeader
-     *
-     * @return void
-     */
-    public function testExportHeader()
-    {
-        if (!defined("PMA_MYSQL_STR_VERSION")) {
-            define("PMA_MYSQL_STR_VERSION", "5.0.0");
-        }
-
-        $GLOBALS['crlf'] = "\n";
-        $GLOBALS['cfg']['Server']['port'] = 80;
-        $GLOBALS['cfg']['Server']['host'] = 'localhost';
-
-        ob_start();
-        $this->assertTrue(
-            $this->object->exportHeader()
-        );
-        $result = ob_get_clean();
-
-        $this->assertContains(
-            "\n% Host: localhost:80",
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportLatex::exportFooter
-     *
-     * @return void
-     */
-    public function testExportFooter()
-    {
-        $this->assertTrue(
-            $this->object->exportFooter()
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportLatex::exportDBHeader
-     *
-     * @return void
-     */
-    public function testExportDBHeader()
-    {
-        $GLOBALS['crlf'] = "\n";
-
-        $this->expectOutputString(
-            "% \n% Database: 'testDB'\n% \n"
-        );
-
-        $this->assertTrue(
-            $this->object->exportDBHeader('testDB')
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportLatex::exportDBFooter
-     *
-     * @return void
-     */
-    public function testExportDBFooter()
-    {
-        $this->assertTrue(
-            $this->object->exportDBFooter('testDB')
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportLatex::exportDBCreate
-     *
-     * @return void
-     */
-    public function testExportDBCreate()
-    {
-        $this->assertTrue(
-            $this->object->exportDBCreate('testDB', 'database')
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportLatex::exportData
-     *
-     * @return void
-     */
-    public function testExportData()
-    {
-        $GLOBALS['latex_caption'] = true;
-        $GLOBALS['latex_data_caption'] = 'latex data caption';
-        $GLOBALS['latex_data_continued_caption'] = 'continued caption';
-        $GLOBALS['latex_columns'] = true;
-        $GLOBALS['latex_data_label'] = 'datalabel';
-        $GLOBALS['latex_null'] = 'null';
-        $GLOBALS['cfg']['Server']['host'] = 'localhost';
-        $GLOBALS['cfg']['Server']['verbose'] = 'verb';
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->once())
-            ->method('numFields')
-            ->with(null)
-            ->will($this->returnValue(1));
-
-        $dbi->expects($this->at(2))
-            ->method('fieldName')
-            ->with(null, 0)
-            ->will($this->returnValue('f1'));
-
-        $dbi->expects($this->at(3))
-            ->method('fetchAssoc')
-            ->with(null)
-            ->will($this->returnValue(array('f1' => 'foo$%')));
-
-        $dbi->expects($this->at(4))
-            ->method('fetchAssoc')
-            ->with(null)
-            ->will($this->returnValue(array('f1' => null)));
-
-        $dbi->expects($this->at(5))
-            ->method('fetchAssoc')
-            ->with(null)
-            ->will($this->returnValue(null));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        ob_start();
-        $this->assertTrue(
-            $this->object->exportData('db', 'tbl', "\n", "example.com", "SELECT")
-        );
-        $result = ob_get_clean();
-
-        $this->assertEquals(
-            "\n" . '%' . "\n" .
-            '% Data: tbl' . "\n" .
-            '%' . "\n" .
-            ' \\begin{longtable}{|l|} ' . "\n" .
-            ' \\hline \\endhead \\hline \\endfoot \\hline ' . "\n" .
-            ' \\caption{latex data caption} \\label{datalabel} ' .
-            '\\\\\\hline \\multicolumn{1}{|c|}{\\textbf{f1}} ' .
-            '\\\\ \\hline \hline  \\endfirsthead ' . "\n" .
-            '\caption{continued caption} \\\\ \hline \multicolumn{1}' .
-            '{|c|}{\textbf{f1}} \\\\ \hline \hline \endhead \endfoot' . "\n" .
-            'foo\$\% \\\\ \hline ' . "\n" .
-            'null \\\\ \hline ' . "\n" .
-            ' \end{longtable}' . "\n",
-            $result
-        );
-
-        // case 2
-        unset($GLOBALS['latex_columns']);
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->once())
-            ->method('numFields')
-            ->with(null)
-            ->will($this->returnValue(1));
-
-        $dbi->expects($this->at(2))
-            ->method('fieldName')
-            ->with(null, 0)
-            ->will($this->returnValue('f1'));
-
-        $dbi->expects($this->at(3))
-            ->method('fetchAssoc')
-            ->with(null)
-            ->will($this->returnValue(array('f1' => 'foo$%')));
-
-        $dbi->expects($this->at(4))
-            ->method('fetchAssoc')
-            ->with(null)
-            ->will($this->returnValue(array('f1' => null)));
-
-        $dbi->expects($this->at(5))
-            ->method('fetchAssoc')
-            ->with(null)
-            ->will($this->returnValue(null));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        ob_start();
-        $this->assertTrue(
-            $this->object->exportData('db', 'tbl', "\n", "example.com", "SELECT")
-        );
-        $result = ob_get_clean();
-
-        $this->assertContains(
-            '{datalabel} \\\\\\\\ \hlinefoo',
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportLatex::exportStructure
-     *
-     * @return void
-     */
-    public function testExportStructure()
-    {
-        // $this->object = $this->getMockBuilder('PMA\libraries\plugins\export\ExportHtmlword')
-        //     ->setMethods(array('formatOneColumnDefinition'))
-        //     ->getMock();
-
-        $keys = array(
-            array(
-                'Non_unique' => 0,
-                'Column_name' => 'name1'
-            ),
-            array(
-                'Non_unique' => 1,
-                'Column_name' => 'name2'
-            )
-        );
-
-        // case 1
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->once())
-            ->method('getTableIndexes')
-            ->with('database', '')
-            ->will($this->returnValue($keys));
-
-        $dbi->expects($this->exactly(2))
-            ->method('fetchResult')
-            ->willReturnOnConsecutiveCalls(
-                array(),
-                array(
-                    'name1' => array(
-                        'values' => 'test-',
-                        'transformation' => 'testfoo',
-                        'mimetype' => 'testmimetype_'
-                    )
-                )
-            );
-
-        $columns = array(
-            array(
-                'Null' => 'Yes',
-                'Field' => 'name1',
-                'Key' => 'PRI',
-                'Type' => 'set(abc)enum123'
-            ),
-            array(
-                'Null' => 'NO',
-                'Field' => 'fields',
-                'Key' => 'COMP',
-                'Type' => '',
-                'Default' => 'def'
-            )
-        );
-        $dbi->expects($this->once())
-            ->method('getColumns')
-            ->with('database', '')
-            ->will($this->returnValue($columns));
-
-        $dbi->expects($this->any())
-            ->method('query')
-            ->will($this->returnValue(true));
-
-        $dbi->expects($this->any())
-            ->method('numRows')
-            ->will($this->returnValue(1));
-
-        $dbi->expects($this->any())
-            ->method('fetchAssoc')
-            ->will(
-                $this->returnValue(
-                    array(
-                        'comment' => array('name1' => 'testComment')
-                    )
-                )
-            );
-
-        $GLOBALS['dbi'] = $dbi;
-        if (isset($GLOBALS['latex_caption'])) {
-            unset($GLOBALS['latex_caption']);
-        }
-
-        $GLOBALS['cfgRelation']['relation'] = true;
-        $_SESSION['relation'][0] = array(
-            'PMA_VERSION' => PMA_VERSION,
-            'relwork' => true,
-            'commwork' => true,
-            'mimework' => true,
-            'db' => 'database',
-            'relation' => 'rel',
-            'column_info' => 'col'
-        );
-
-        ob_start();
-        $this->assertTrue(
-            $this->object->exportStructure(
-                'database',
-                '',
-                "\n",
-                "example.com",
-                'test',
-                'test',
-                true,
-                true,
-                true
-            )
-        );
-        $result = ob_get_clean();
-
-        //echo $result; die;
-        $this->assertEquals(
-            "\n" . '%' . "\n" .
-            '% Structure: ' . "\n" .
-            '%' . "\n" .
-            ' \\begin{longtable}{|l|c|c|c|l|l|} ' . "\n" .
-            ' \\hline \\multicolumn{1}{|c|}{\\textbf{Column}} & ' .
-            '\\multicolumn{1}{|c|}{\\textbf{Type}} & \\multicolumn{1}{|c|}' .
-            '{\\textbf{Null}} & \\multicolumn{1}{|c|}{\\textbf{Default}} &' .
-            ' \\multicolumn{1}{|c|}{\\textbf{Comments}} & \\multicolumn{1}' .
-            '{|c|}{\\textbf{MIME}} \\\\ \\hline \\hline' . "\n" .
-            '\\endfirsthead' . "\n" . ' \\hline \\multicolumn{1}{|c|}' .
-            '{\\textbf{Column}} & \\multicolumn{1}' . '{|c|}{\\textbf{Type}}' .
-            ' & \\multicolumn{1}{|c|}{\\textbf{Null}} & \\multicolumn' .
-            '{1}{|c|}{\\textbf{Default}} & \\multicolumn{1}{|c|}{\\textbf' .
-            '{Comments}} & \\multicolumn{1}{|c|}{\\textbf{MIME}} \\\\ ' .
-            '\\hline \\hline \\endhead \\endfoot ' . "\n" . '\\textbf{\\textit' .
-            '{name1}} & set(abc) & Yes & NULL &  ' .
-            '& Testmimetype/ \\\\ \\hline ' . "\n" .
-            'fields &   & No & def &  &  \\\\ \\hline ' . "\n" .
-            ' \\end{longtable}' . "\n",
-            $result
-        );
-
-        // case 2
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->exactly(2))
-            ->method('fetchResult')
-            ->willReturnOnConsecutiveCalls(
-                array(
-                    'name1' => array(
-                        'foreign_table' => 'ftable',
-                        'foreign_field' => 'ffield'
-                    ),
-                    'foreign_keys_data' => array()
-                ),
-                array(
-                    'field' => array(
-                        'values' => 'test-',
-                        'transformation' => 'testfoo',
-                        'mimetype' => 'test<'
-                    )
-                )
-            );
-
-        $dbi->expects($this->once())
-            ->method('getTableIndexes')
-            ->with('database', '')
-            ->will($this->returnValue($keys));
-
-        $dbi->expects($this->once())
-            ->method('getColumns')
-            ->with('database', '')
-            ->will($this->returnValue($columns));
-
-        $dbi->expects($this->any())
-            ->method('query')
-            ->will($this->returnValue(true));
-
-        $dbi->expects($this->any())
-            ->method('numRows')
-            ->will($this->returnValue(1));
-
-        $dbi->expects($this->any())
-            ->method('fetchAssoc')
-            ->will(
-                $this->returnValue(
-                    array(
-                        'comment' => array('field' => 'testComment')
-                    )
-                )
-            );
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $GLOBALS['cfgRelation']['relation'] = true;
-        $_SESSION['relation'][0] = array(
-            'PMA_VERSION' => PMA_VERSION,
-            'relwork' => true,
-            'commwork' => true,
-            'mimework' => true,
-            'db' => 'database',
-            'relation' => 'rel',
-            'column_info' => 'col'
-        );
-
-        ob_start();
-        $this->assertTrue(
-            $this->object->exportStructure(
-                'database',
-                '',
-                "\n",
-                "example.com",
-                'test',
-                'test',
-                true,
-                true,
-                true
-            )
-        );
-        $result = ob_get_clean();
-
-        $this->assertContains(
-            '\\textbf{\\textit{name1}} & set(abc) & Yes & NULL & ' .
-            'ftable (ffield) &  &  \\\\ \\hline',
-            $result
-        );
-
-        // case 3
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->once())
-            ->method('getTableIndexes')
-            ->with('database', '')
-            ->will($this->returnValue($keys));
-
-        $dbi->expects($this->once())
-            ->method('getColumns')
-            ->with('database', '')
-            ->will($this->returnValue($columns));
-
-        $dbi->expects($this->any())
-            ->method('query')
-            ->will($this->returnValue(true));
-
-        $dbi->expects($this->any())
-            ->method('numRows')
-            ->will($this->returnValue(1));
-
-        $dbi->expects($this->any())
-            ->method('fetchAssoc')
-            ->will(
-                $this->returnValue(
-                    array(
-                        'comment' => array('field' => 'testComment')
-                    )
-                )
-            );
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $GLOBALS['cfgRelation']['relation'] = true;
-        $GLOBALS['latex_caption'] = true;
-        $GLOBALS['latex_structure_caption'] = 'latexstructure';
-        $GLOBALS['latex_structure_label'] = 'latexlabel';
-        $GLOBALS['latex_structure_continued_caption'] = 'latexcontinued';
-        $GLOBALS['cfg']['Server']['host'] = 'localhost';
-        $GLOBALS['cfg']['Server']['verbose'] = 'verb';
-
-        $_SESSION['relation'][0] = array(
-            'PMA_VERSION' => PMA_VERSION,
-            'relwork' => false,
-            'commwork' => false,
-            'mimework' => false,
-            'db' => 'database',
-            'relation' => 'rel',
-            'column_info' => 'col'
-        );
-
-        ob_start();
-        $this->assertTrue(
-            $this->object->exportStructure(
-                'database',
-                '',
-                "\n",
-                "example.com",
-                'test',
-                'test'
-            )
-        );
-        $result = ob_get_clean();
-
-        $this->assertContains(
-            '\\caption{latexstructure} \\label{latexlabel}',
-            $result
-        );
-
-        $this->assertContains(
-            'caption{latexcontinued}',
-            $result
-        );
-
-        // case 4
-        $this->assertTrue(
-            $this->object->exportStructure(
-                'database',
-                '',
-                "\n",
-                "example.com",
-                'triggers',
-                'test'
-            )
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportLatex::texEscape
-     *
-     * @return void
-     */
-    public function testTexEscape()
-    {
-        $this->assertEquals(
-            '\\$\\%\\{foo\\&bar\\}\\#\\_\\^',
-            ExportLatex::texEscape('$%{foo&bar}#_^')
-        );
-    }
-}
diff --git a/#pma/test/classes/plugin/export/ExportMediawikiTest.php b/#pma/test/classes/plugin/export/ExportMediawikiTest.php
deleted file mode 100644
index 7fee7041..00000000
--- a/#pma/test/classes/plugin/export/ExportMediawikiTest.php
+++ /dev/null
@@ -1,420 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for PMA\libraries\plugins\export\ExportMediawiki class
- *
- * @package PhpMyAdmin-test
- */
-use PMA\libraries\plugins\export\ExportMediawiki;
-
-require_once 'libraries/export.lib.php';
-require_once 'libraries/config.default.php';
-require_once 'export.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * tests for PMA\libraries\plugins\export\ExportMediawiki class
- *
- * @package PhpMyAdmin-test
- * @group medium
- */
-class ExportMediawikiTest extends PMATestCase
-{
-    protected $object;
-
-    /**
-     * Configures global environment.
-     *
-     * @return void
-     */
-    function setup()
-    {
-        $GLOBALS['server'] = 0;
-        $GLOBALS['output_kanji_conversion'] = false;
-        $GLOBALS['output_charset_conversion'] = false;
-        $GLOBALS['buffer_needed'] = false;
-        $GLOBALS['asfile'] = true;
-        $GLOBALS['save_on_server'] = false;
-        $this->object = new ExportMediawiki();
-    }
-
-    /**
-     * tearDown for test cases
-     *
-     * @return void
-     */
-    public function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportMediawiki::setProperties
-     *
-     * @return void
-     */
-    public function testSetProperties()
-    {
-        $method = new ReflectionMethod('PMA\libraries\plugins\export\ExportMediawiki', 'setProperties');
-        $method->setAccessible(true);
-        $method->invoke($this->object, null);
-
-        $attrProperties = new ReflectionProperty('PMA\libraries\plugins\export\ExportMediawiki', 'properties');
-        $attrProperties->setAccessible(true);
-        $properties = $attrProperties->getValue($this->object);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\plugins\ExportPluginProperties',
-            $properties
-        );
-
-        $this->assertEquals(
-            'MediaWiki Table',
-            $properties->getText()
-        );
-
-        $this->assertEquals(
-            'mediawiki',
-            $properties->getExtension()
-        );
-
-        $this->assertEquals(
-            'text/plain',
-            $properties->getMimeType()
-        );
-
-        $this->assertEquals(
-            'Options',
-            $properties->getOptionsText()
-        );
-
-        $options = $properties->getOptions();
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyRootGroup',
-            $options
-        );
-
-        $this->assertEquals(
-            'Format Specific Options',
-            $options->getName()
-        );
-
-        $generalOptionsArray = $options->getProperties();
-        $generalOptions = $generalOptionsArray[0];
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyMainGroup',
-            $generalOptions
-        );
-
-        $this->assertEquals(
-            'general_opts',
-            $generalOptions->getName()
-        );
-
-        $this->assertEquals(
-            'Dump table',
-            $generalOptions->getText()
-        );
-
-        $generalProperties = $generalOptions->getProperties();
-
-        $property = array_shift($generalProperties);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertySubgroup',
-            $property
-        );
-
-        $this->assertEquals(
-            'dump_table',
-            $property->getName()
-        );
-
-        $this->assertEquals(
-            'Dump table',
-            $property->getText()
-        );
-
-        $sgHeader = $property->getSubGroupHeader();
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\RadioPropertyItem',
-            $sgHeader
-        );
-
-        $this->assertEquals(
-            'structure_or_data',
-            $sgHeader->getName()
-        );
-
-        $this->assertEquals(
-            array(
-                'structure' => __('structure'),
-                'data' => __('data'),
-                'structure_and_data' => __('structure and data')
-            ),
-            $sgHeader->getValues()
-        );
-
-        $property = array_shift($generalProperties);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
-            $property
-        );
-
-        $this->assertEquals(
-            'caption',
-            $property->getName()
-        );
-
-        $this->assertEquals(
-            'Export table names',
-            $property->getText()
-        );
-
-        $property = array_shift($generalProperties);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
-            $property
-        );
-
-        $this->assertEquals(
-            'headers',
-            $property->getName()
-        );
-
-        $this->assertEquals(
-            'Export table headers',
-            $property->getText()
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportMediawiki::exportHeader
-     *
-     * @return void
-     */
-    public function testExportHeader()
-    {
-        $this->assertTrue(
-            $this->object->exportHeader()
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportMediawiki::exportFooter
-     *
-     * @return void
-     */
-    public function testExportFooter()
-    {
-        $this->assertTrue(
-            $this->object->exportFooter()
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportMediawiki::exportDBHeader
-     *
-     * @return void
-     */
-    public function testExportDBHeader()
-    {
-        $this->assertTrue(
-            $this->object->exportDBHeader('testDB')
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportMediawiki::exportDBFooter
-     *
-     * @return void
-     */
-    public function testExportDBFooter()
-    {
-        $this->assertTrue(
-            $this->object->exportDBFooter('testDB')
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportMediawiki::exportDBCreate
-     *
-     * @return void
-     */
-    public function testExportDBCreate()
-    {
-        $this->assertTrue(
-            $this->object->exportDBCreate('testDB', 'database')
-        );
-    }
-
-    /**
-     * Test for ExportMediaWiki::exportStructure
-     *
-     * @return void
-     */
-    public function testExportStructure()
-    {
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $columns = array(
-            array(
-                'Null' => 'Yes',
-                'Field' => 'name1',
-                'Key' => 'PRI',
-                'Type' => 'set(abc)enum123',
-                'Default' => '',
-                'Extra' => ''
-            ),
-            array(
-                'Null' => 'NO',
-                'Field' => 'fields',
-                'Key' => 'COMP',
-                'Type' => '',
-                'Default' => 'def',
-                'Extra' => 'ext'
-            )
-        );
-
-        $dbi->expects($this->at(0))
-            ->method('getColumns')
-            ->with('db', 'table')
-            ->will($this->returnValue($columns));
-
-        $GLOBALS['dbi'] = $dbi;
-        $GLOBALS['mediawiki_caption'] = true;
-        $GLOBALS['mediawiki_headers'] = true;
-
-        ob_start();
-        $this->assertTrue(
-            $this->object->exportStructure(
-                'db', 'table', "\n", "example.com", "create_table", "test"
-            )
-        );
-        $result = ob_get_clean();
-
-        $this->assertEquals(
-            "\n<!--\n" .
-            "Table structure for `table`\n" .
-            "-->\n" .
-            "\n" .
-            "{| class=\"wikitable\" style=\"text-align:center;\"\n" .
-            "|+'''table'''\n" .
-            "|- style=\"background:#ffdead;\"\n" .
-            "! style=\"background:#ffffff\" | \n" .
-            " | name1\n" .
-            " | fields\n" .
-            "|-\n" .
-            "! Type\n" .
-            " | set(abc)enum123\n" .
-            " | \n" .
-            "|-\n" .
-            "! Null\n" .
-            " | Yes\n" .
-            " | NO\n" .
-            "|-\n" .
-            "! Default\n" .
-            " | \n" .
-            " | def\n" .
-            "|-\n" .
-            "! Extra\n" .
-            " | \n" .
-            " | ext\n" .
-            "|}\n\n",
-            $result
-        );
-
-        /**
-         * This case produces an error, should it be tested?
-
-        ob_start();
-        $this->assertTrue(
-            $this->object->exportStructure(
-                'db', 'table', "\n", "example.com", "defaultTest", "test"
-            )
-        );
-        $result = ob_get_clean();
-        */
-    }
-    /**
-     * Test for PMA\libraries\plugins\export\ExportMediawiki::exportData
-     *
-     * @return void
-     */
-    public function testExportData()
-    {
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->once())
-            ->method('getColumnNames')
-            ->with('db', 'table')
-            ->will($this->returnValue(array('name1', 'fields')));
-
-        $dbi->expects($this->once())
-            ->method('query')
-            ->with('SELECT', null, PMA\libraries\DatabaseInterface::QUERY_UNBUFFERED)
-            ->will($this->returnValue(true));
-
-        $dbi->expects($this->once())
-            ->method('numFields')
-            ->with(true)
-            ->will($this->returnValue(2));
-
-        $dbi->expects($this->at(3))
-            ->method('fetchRow')
-            ->with(true)
-            ->will($this->returnValue(array('r1', 'r2')));
-
-        $dbi->expects($this->at(4))
-            ->method('fetchRow')
-            ->with(true)
-            ->will($this->returnValue(array('r3', '')));
-
-        $dbi->expects($this->at(4))
-            ->method('fetchRow')
-            ->with(true)
-            ->will($this->returnValue(null));
-
-        $GLOBALS['dbi'] = $dbi;
-        $GLOBALS['mediawiki_caption'] = true;
-        $GLOBALS['mediawiki_headers'] = true;
-
-        ob_start();
-        $this->assertTrue(
-            $this->object->exportData(
-                'db', 'table', "\n", "example.com", "SELECT"
-            )
-        );
-        $result = ob_get_clean();
-
-        $this->assertEquals(
-            "\n<!--\n" .
-            "Table data for `table`\n" .
-            "-->\n" .
-            "\n" .
-            "{| class=\"wikitable sortable\" style=\"text-align:" .
-            "center;\"\n" .
-            "|+'''table'''\n" .
-            "|-\n" .
-            " ! name1\n" .
-            " ! fields\n" .
-            "|-\n" .
-            " | r1\n" .
-            " | r2\n" .
-            "|-\n" .
-            " | r3\n" .
-            " | \n" .
-            "|}\n\n",
-            $result
-        );
-    }
-}
diff --git a/#pma/test/classes/plugin/export/ExportOdsTest.php b/#pma/test/classes/plugin/export/ExportOdsTest.php
deleted file mode 100644
index 2876ec79..00000000
--- a/#pma/test/classes/plugin/export/ExportOdsTest.php
+++ /dev/null
@@ -1,508 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for PMA\libraries\plugins\export\ExportOds class
- *
- * @package PhpMyAdmin-test
- */
-use PMA\libraries\plugins\export\ExportOds;
-
-//ExportOds required because of initialisation inside
-require_once 'libraries/plugins/export/ExportOds.php';
-require_once 'libraries/export.lib.php';
-require_once 'libraries/config.default.php';
-require_once 'export.php';
-require_once 'libraries/opendocument.lib.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * tests for PMA\libraries\plugins\export\ExportOds class
- *
- * @package PhpMyAdmin-test
- * @group medium
- */
-class ExportOdsTest extends PMATestCase
-{
-    protected $object;
-
-    /**
-     * Configures global environment.
-     *
-     * @return void
-     */
-    function setup()
-    {
-        $GLOBALS['server'] = 0;
-        $GLOBALS['output_kanji_conversion'] = false;
-        $GLOBALS['output_charset_conversion'] = false;
-        $GLOBALS['buffer_needed'] = false;
-        $GLOBALS['asfile'] = true;
-        $GLOBALS['save_on_server'] = false;
-        $this->object = new ExportOds();
-    }
-
-    /**
-     * tearDown for test cases
-     *
-     * @return void
-     */
-    public function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportOds::setProperties
-     *
-     * @return void
-     */
-    public function testSetProperties()
-    {
-        $method = new ReflectionMethod('PMA\libraries\plugins\export\ExportOds', 'setProperties');
-        $method->setAccessible(true);
-        $method->invoke($this->object, null);
-
-        $attrProperties = new ReflectionProperty('PMA\libraries\plugins\export\ExportOds', 'properties');
-        $attrProperties->setAccessible(true);
-        $properties = $attrProperties->getValue($this->object);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\plugins\ExportPluginProperties',
-            $properties
-        );
-
-        $this->assertEquals(
-            'OpenDocument Spreadsheet',
-            $properties->getText()
-        );
-
-        $this->assertEquals(
-            'ods',
-            $properties->getExtension()
-        );
-
-        $this->assertEquals(
-            'application/vnd.oasis.opendocument.spreadsheet',
-            $properties->getMimeType()
-        );
-
-        $this->assertEquals(
-            'Options',
-            $properties->getOptionsText()
-        );
-
-        $this->assertTrue(
-            $properties->getForceFile()
-        );
-
-        $options = $properties->getOptions();
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyRootGroup',
-            $options
-        );
-
-        $this->assertEquals(
-            'Format Specific Options',
-            $options->getName()
-        );
-
-        $generalOptionsArray = $options->getProperties();
-        $generalOptions = $generalOptionsArray[0];
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyMainGroup',
-            $generalOptions
-        );
-
-        $this->assertEquals(
-            'general_opts',
-            $generalOptions->getName()
-        );
-
-        $generalProperties = $generalOptions->getProperties();
-
-        $property = array_shift($generalProperties);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\TextPropertyItem',
-            $property
-        );
-
-        $this->assertEquals(
-            'null',
-            $property->getName()
-        );
-
-        $this->assertEquals(
-            'Replace NULL with:',
-            $property->getText()
-        );
-
-        $property = array_shift($generalProperties);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
-            $property
-        );
-
-        $this->assertEquals(
-            'columns',
-            $property->getName()
-        );
-
-        $this->assertEquals(
-            'Put columns names in the first row',
-            $property->getText()
-        );
-
-        $property = array_shift($generalProperties);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\HiddenPropertyItem',
-            $property
-        );
-
-        $this->assertEquals(
-            'structure_or_data',
-            $property->getName()
-        );
-
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportOds::exportHeader
-     *
-     * @return void
-     */
-    public function testExportHeader()
-    {
-        $this->assertTrue(
-            isset($GLOBALS['ods_buffer'])
-        );
-
-        $this->assertTrue(
-            $this->object->exportHeader()
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportOds::exportFooter
-     *
-     * @return void
-     */
-    public function testExportFooter()
-    {
-        $GLOBALS['ods_buffer'] = 'header';
-
-        $this->expectOutputRegex('/^504b.*636f6e74656e742e786d6c/');
-        $this->setOutputCallback('bin2hex');
-
-        $this->assertTrue(
-            $this->object->exportFooter()
-        );
-
-        $this->assertContains(
-            'header',
-            $GLOBALS['ods_buffer']
-        );
-
-        $this->assertContains(
-            '</office:spreadsheet>',
-            $GLOBALS['ods_buffer']
-        );
-
-        $this->assertContains(
-            '</office:body>',
-            $GLOBALS['ods_buffer']
-        );
-
-        $this->assertContains(
-            '</office:document-content>',
-            $GLOBALS['ods_buffer']
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportOds::exportDBHeader
-     *
-     * @return void
-     */
-    public function testExportDBHeader()
-    {
-        $this->assertTrue(
-            $this->object->exportDBHeader('testDB')
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportOds::exportDBFooter
-     *
-     * @return void
-     */
-    public function testExportDBFooter()
-    {
-        $this->assertTrue(
-            $this->object->exportDBFooter('testDB')
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportOds::exportDBCreate
-     *
-     * @return void
-     */
-    public function testExportDBCreate()
-    {
-        $this->assertTrue(
-            $this->object->exportDBCreate('testDB', 'database')
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportOds::exportData
-     *
-     * @return void
-     */
-    public function testExportData()
-    {
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $flags = array();
-        $a = new StdClass;
-        $flags[] = $a;
-
-        $a = new StdClass;
-        $a->blob = true;
-        $flags[] = $a;
-
-        $a = new StdClass;
-        $a->blob = false;
-        $a->type = 'date';
-        $flags[] = $a;
-
-        $a = new StdClass;
-        $a->blob = false;
-        $a->type = 'time';
-        $flags[] = $a;
-
-        $a = new StdClass;
-        $a->blob = false;
-        $a->type = 'datetime';
-        $flags[] = $a;
-
-        $a = new StdClass;
-        $a->numeric = true;
-        $a->type = 'none';
-        $a->blob = false;
-        $flags[] = $a;
-
-        $a = new StdClass;
-        $a->numeric = true;
-        $a->type = 'real';
-        $a->blob = true;
-        $flags[] = $a;
-
-        $a = new StdClass;
-        $a->type = "dummy";
-        $a->blob = false;
-        $a->numeric = false;
-        $flags[] = $a;
-
-        $dbi->expects($this->once())
-            ->method('getFieldsMeta')
-            ->with(true)
-            ->will($this->returnValue($flags));
-
-        $dbi->expects($this->exactly(8))
-            ->method('fieldFlags')
-            ->willReturnOnConsecutiveCalls(
-                'BINARYTEST',
-                'binary',
-                '',
-                '',
-                '',
-                '',
-                '',
-                ''
-            );
-
-        $dbi->expects($this->once())
-            ->method('query')
-            ->with('SELECT', null, PMA\libraries\DatabaseInterface::QUERY_UNBUFFERED)
-            ->will($this->returnValue(true));
-
-        $dbi->expects($this->once())
-            ->method('numFields')
-            ->with(true)
-            ->will($this->returnValue(8));
-
-        $dbi->expects($this->at(11))
-            ->method('fetchRow')
-            ->with(true)
-            ->will(
-                $this->returnValue(
-                    array(
-                        null, '01-01-2000', '01-01-2000', '01-01-2000 10:00:00',
-                        "01-01-2014 10:02:00", "t>s", "a&b", "<"
-                    )
-                )
-            );
-
-        $GLOBALS['dbi'] = $dbi;
-        $GLOBALS['mediawiki_caption'] = true;
-        $GLOBALS['mediawiki_headers'] = true;
-        $GLOBALS['what'] = 'foo';
-        $GLOBALS['foo_null'] = "&";
-
-        $this->assertTrue(
-            $this->object->exportData(
-                'db', 'table', "\n", "example.com", "SELECT"
-            )
-        );
-
-        $this->assertEquals(
-            '<table:table table:name="table"><table:table-row><table:table-cell ' .
-            'office:value-type="string"><text:p>&amp;</text:p></table:table-cell>' .
-            '<table:table-cell office:value-type="string"><text:p></text:p>' .
-            '</table:table-cell><table:table-cell office:value-type="date" office:' .
-            'date-value="2000-01-01" table:style-name="DateCell"><text:p>01-01' .
-            '-2000</text:p></table:table-cell><table:table-cell office:value-type=' .
-            '"time" office:time-value="PT10H00M00S" table:style-name="TimeCell">' .
-            '<text:p>01-01-2000 10:00:00</text:p></table:table-cell><table:table-' .
-            'cell office:value-type="date" office:date-value="2014-01-01T10:02:00"' .
-            ' table:style-name="DateTimeCell"><text:p>01-01-2014 10:02:00' .
-            '</text:p></table:table-cell><table:table-cell office:value-type=' .
-            '"float" office:value="t>s" ><text:p>t&gt;s</text:p>' .
-            '</table:table-cell><table:table-cell office:value-type="float" ' .
-            'office:value="a&b" ><text:p>a&amp;b</text:p></table:table-cell>' .
-            '<table:table-cell office:value-type="string"><text:p>&lt;</text:p>' .
-            '</table:table-cell></table:table-row></table:table>',
-            $GLOBALS['ods_buffer']
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportOds::exportData
-     *
-     * @return void
-     */
-    public function testExportDataWithFieldNames()
-    {
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $flags = array();
-
-        $dbi->expects($this->once())
-            ->method('getFieldsMeta')
-            ->with(true)
-            ->will($this->returnValue($flags));
-
-        $dbi->expects($this->any())
-            ->method('fieldFlags')
-            ->will($this->returnValue('BINARYTEST'));
-
-        $dbi->expects($this->once())
-            ->method('query')
-            ->with('SELECT', null, PMA\libraries\DatabaseInterface::QUERY_UNBUFFERED)
-            ->will($this->returnValue(true));
-
-        $dbi->expects($this->once())
-            ->method('numFields')
-            ->with(true)
-            ->will($this->returnValue(2));
-
-        $dbi->expects($this->at(5))
-            ->method('fieldName')
-            ->will($this->returnValue('fna\"me'));
-
-        $dbi->expects($this->at(6))
-            ->method('fieldName')
-            ->will($this->returnValue('fnam/<e2'));
-
-        $dbi->expects($this->at(7))
-            ->method('fetchRow')
-            ->with(true)
-            ->will(
-                $this->returnValue(
-                    null
-                )
-            );
-
-        $GLOBALS['dbi'] = $dbi;
-        $GLOBALS['mediawiki_caption'] = true;
-        $GLOBALS['mediawiki_headers'] = true;
-        $GLOBALS['what'] = 'foo';
-        $GLOBALS['foo_null'] = "&";
-        $GLOBALS['foo_columns'] = true;
-
-        $this->assertTrue(
-            $this->object->exportData(
-                'db', 'table', "\n", "example.com", "SELECT"
-            )
-        );
-
-        $this->assertEquals(
-            '<table:table table:name="table"><table:table-row><table:table-cell ' .
-            'office:value-type="string"><text:p>fna&quot;me</text:p></table:table' .
-            '-cell><table:table-cell office:value-type="string"><text:p>' .
-            'fnam/&lt;e2</text:p></table:table-cell></table:table-row>' .
-            '</table:table>',
-            $GLOBALS['ods_buffer']
-        );
-
-        // with no row count
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $flags = array();
-
-        $dbi->expects($this->once())
-            ->method('getFieldsMeta')
-            ->with(true)
-            ->will($this->returnValue($flags));
-
-        $dbi->expects($this->once())
-            ->method('query')
-            ->with('SELECT', null, PMA\libraries\DatabaseInterface::QUERY_UNBUFFERED)
-            ->will($this->returnValue(true));
-
-        $dbi->expects($this->once())
-            ->method('numFields')
-            ->with(true)
-            ->will($this->returnValue(0));
-
-        $dbi->expects($this->once())
-            ->method('fetchRow')
-            ->with(true)
-            ->will(
-                $this->returnValue(
-                    null
-                )
-            );
-
-        $GLOBALS['dbi'] = $dbi;
-        $GLOBALS['mediawiki_caption'] = true;
-        $GLOBALS['mediawiki_headers'] = true;
-        $GLOBALS['what'] = 'foo';
-        $GLOBALS['foo_null'] = "&";
-        $GLOBALS['ods_buffer'] = '';
-
-        $this->assertTrue(
-            $this->object->exportData(
-                'db', 'table', "\n", "example.com", "SELECT"
-            )
-        );
-
-        $this->assertEquals(
-            '<table:table table:name="table"><table:table-row></table:table-row>' .
-            '</table:table>',
-            $GLOBALS['ods_buffer']
-        );
-    }
-}
diff --git a/#pma/test/classes/plugin/export/ExportOdtTest.php b/#pma/test/classes/plugin/export/ExportOdtTest.php
deleted file mode 100644
index 8a9a7f2c..00000000
--- a/#pma/test/classes/plugin/export/ExportOdtTest.php
+++ /dev/null
@@ -1,1082 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for PMA\libraries\plugins\export\ExportOdt class
- *
- * @package PhpMyAdmin-test
- */
-use PMA\libraries\plugins\export\ExportOdt;
-
-//ExportOdt required because of initialisation inside
-require_once 'libraries/plugins/export/ExportOdt.php';
-require_once 'libraries/export.lib.php';
-require_once 'libraries/config.default.php';
-require_once 'libraries/relation.lib.php';
-require_once 'libraries/transformations.lib.php';
-require_once 'export.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * tests for PMA\libraries\plugins\export\ExportOdt class
- *
- * @package PhpMyAdmin-test
- * @group medium
- */
-class ExportOdtTest extends PMATestCase
-{
-    protected $object;
-
-    /**
-     * Configures global environment.
-     *
-     * @return void
-     */
-    function setup()
-    {
-        $GLOBALS['server'] = 0;
-        $GLOBALS['output_kanji_conversion'] = false;
-        $GLOBALS['output_charset_conversion'] = false;
-        $GLOBALS['buffer_needed'] = false;
-        $GLOBALS['asfile'] = true;
-        $GLOBALS['save_on_server'] = false;
-        $GLOBALS['plugin_param'] = array();
-        $GLOBALS['plugin_param']['export_type'] = 'table';
-        $GLOBALS['plugin_param']['single_table'] = false;
-        $GLOBALS['cfgRelation']['relation'] = true;
-        $this->object = new ExportOdt();
-    }
-
-    /**
-     * tearDown for test cases
-     *
-     * @return void
-     */
-    public function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportOdt::setProperties
-     *
-     * @return void
-     */
-    public function testSetProperties()
-    {
-        $GLOBALS['plugin_param']['export_type'] = '';
-        $GLOBALS['plugin_param']['single_table'] = false;
-        $GLOBALS['cfgRelation']['mimework'] = true;
-
-        $method = new ReflectionMethod('PMA\libraries\plugins\export\ExportOdt', 'setProperties');
-        $method->setAccessible(true);
-        $method->invoke($this->object, null);
-
-        $attrProperties = new ReflectionProperty('PMA\libraries\plugins\export\ExportOdt', 'properties');
-        $attrProperties->setAccessible(true);
-        $properties = $attrProperties->getValue($this->object);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\plugins\ExportPluginProperties',
-            $properties
-        );
-
-        $this->assertEquals(
-            'OpenDocument Text',
-            $properties->getText()
-        );
-
-        $this->assertEquals(
-            'odt',
-            $properties->getExtension()
-        );
-
-        $this->assertEquals(
-            'application/vnd.oasis.opendocument.text',
-            $properties->getMimeType()
-        );
-
-        $this->assertEquals(
-            'Options',
-            $properties->getOptionsText()
-        );
-
-        $this->assertTrue(
-            $properties->getForceFile()
-        );
-
-        $options = $properties->getOptions();
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyRootGroup',
-            $options
-        );
-
-        $this->assertEquals(
-            'Format Specific Options',
-            $options->getName()
-        );
-
-        $generalOptionsArray = $options->getProperties();
-
-        $generalOptions = array_shift($generalOptionsArray);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyMainGroup',
-            $generalOptions
-        );
-
-        $this->assertEquals(
-            'general_opts',
-            $generalOptions->getName()
-        );
-
-        $this->assertEquals(
-            "Dump table",
-            $generalOptions->getText()
-        );
-
-        $generalProperties = $generalOptions->getProperties();
-
-        $property = array_shift($generalProperties);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\RadioPropertyItem',
-            $property
-        );
-
-        $this->assertEquals(
-            'structure_or_data',
-            $property->getName()
-        );
-
-        $this->assertEquals(
-            array(
-                'structure' => __('structure'),
-                'data' => __('data'),
-                'structure_and_data' => __('structure and data')
-            ),
-            $property->getValues()
-        );
-
-        $generalOptions = array_shift($generalOptionsArray);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyMainGroup',
-            $generalOptions
-        );
-
-        $this->assertEquals(
-            'structure',
-            $generalOptions->getName()
-        );
-
-        $this->assertEquals(
-            'Object creation options',
-            $generalOptions->getText()
-        );
-
-        $this->assertEquals(
-            'data',
-            $generalOptions->getForce()
-        );
-
-        $generalProperties = $generalOptions->getProperties();
-
-        $property = array_shift($generalProperties);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
-            $property
-        );
-
-        $this->assertEquals(
-            'relation',
-            $property->getName()
-        );
-
-        $this->assertEquals(
-            'Display foreign key relationships',
-            $property->getText()
-        );
-
-        $property = array_shift($generalProperties);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
-            $property
-        );
-
-        $this->assertEquals(
-            'comments',
-            $property->getName()
-        );
-
-        $this->assertEquals(
-            'Display comments',
-            $property->getText()
-        );
-
-        $property = array_shift($generalProperties);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
-            $property
-        );
-
-        $this->assertEquals(
-            'mime',
-            $property->getName()
-        );
-
-        $this->assertEquals(
-            'Display MIME types',
-            $property->getText()
-        );
-
-        // hide structure
-        $generalOptions = array_shift($generalOptionsArray);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyMainGroup',
-            $generalOptions
-        );
-
-        $this->assertEquals(
-            'data',
-            $generalOptions->getName()
-        );
-
-        $this->assertEquals(
-            'Data dump options',
-            $generalOptions->getText()
-        );
-
-        $this->assertEquals(
-            'structure',
-            $generalOptions->getForce()
-        );
-
-        $generalProperties = $generalOptions->getProperties();
-
-        $property = array_shift($generalProperties);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
-            $property
-        );
-
-        $this->assertEquals(
-            'columns',
-            $property->getName()
-        );
-
-        $this->assertEquals(
-            'Put columns names in the first row',
-            $property->getText()
-        );
-
-        $property = array_shift($generalProperties);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\TextPropertyItem',
-            $property
-        );
-
-        $this->assertEquals(
-            'null',
-            $property->getName()
-        );
-
-        $this->assertEquals(
-            'Replace NULL with:',
-            $property->getText()
-        );
-
-        // case 2
-        $GLOBALS['plugin_param']['export_type'] = 'table';
-        $GLOBALS['plugin_param']['single_table'] = false;
-
-        $method->invoke($this->object, null);
-        $properties = $attrProperties->getValue($this->object);
-
-        $generalOptionsArray = $options->getProperties();
-
-        $this->assertCount(
-            3,
-            $generalOptionsArray
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportOdt::exportHeader
-     *
-     * @return void
-     */
-    public function testExportHeader()
-    {
-        $GLOBALS['OpenDocumentNS'] = "ODNS";
-
-        $this->assertTrue(
-            $this->object->exportHeader()
-        );
-
-        $this->assertContains(
-            "<office:document-content ODNSoffice:version",
-            $GLOBALS['odt_buffer']
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportOdt::exportFooter
-     *
-     * @return void
-     */
-    public function testExportFooter()
-    {
-        $GLOBALS['odt_buffer'] = 'header';
-
-        $this->expectOutputRegex('/^504b.*636f6e74656e742e786d6c/');
-        $this->setOutputCallback('bin2hex');
-
-        $this->assertTrue(
-            $this->object->exportFooter()
-        );
-
-        $this->assertContains(
-            "header",
-            $GLOBALS['odt_buffer']
-        );
-
-        $this->assertContains(
-            "</office:text></office:body></office:document-content>",
-            $GLOBALS['odt_buffer']
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportOdt::exportDBHeader
-     *
-     * @return void
-     */
-    public function testExportDBHeader()
-    {
-        $GLOBALS['odt_buffer'] = 'header';
-
-        $this->assertTrue(
-            $this->object->exportDBHeader('d&b')
-        );
-
-        $this->assertContains(
-            "header",
-            $GLOBALS['odt_buffer']
-        );
-
-        $this->assertContains(
-            "Database d&amp;b</text:h>",
-            $GLOBALS['odt_buffer']
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportOdt::exportDBFooter
-     *
-     * @return void
-     */
-    public function testExportDBFooter()
-    {
-        $this->assertTrue(
-            $this->object->exportDBFooter('testDB')
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportOdt::exportDBCreate
-     *
-     * @return void
-     */
-    public function testExportDBCreate()
-    {
-        $this->assertTrue(
-            $this->object->exportDBCreate('testDB', 'database')
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportOdt::exportData
-     *
-     * @return void
-     */
-    public function testExportData()
-    {
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $flags = array();
-        $a = new StdClass;
-        $flags[] = $a;
-
-        $a = new StdClass;
-        $a->blob = true;
-        $flags[] = $a;
-
-        $a = new StdClass;
-        $a->numeric = true;
-        $a->type = 'real';
-        $a->blob = false;
-        $flags[] = $a;
-
-        $a = new StdClass;
-        $a->type = "timestamp";
-        $a->blob = false;
-        $a->numeric = false;
-        $flags[] = $a;
-
-        $dbi->expects($this->once())
-            ->method('getFieldsMeta')
-            ->with(true)
-            ->will($this->returnValue($flags));
-
-        $dbi->expects($this->at(4))
-            ->method('fieldFlags')
-            ->will($this->returnValue('BINARYTEST'));
-
-        $dbi->expects($this->at(5))
-            ->method('fieldFlags')
-            ->will($this->returnValue('binary'));
-
-        $dbi->expects($this->once())
-            ->method('query')
-            ->with('SELECT', null, PMA\libraries\DatabaseInterface::QUERY_UNBUFFERED)
-            ->will($this->returnValue(true));
-
-        $dbi->expects($this->once())
-            ->method('numFields')
-            ->with(true)
-            ->will($this->returnValue(4));
-
-        $dbi->expects($this->at(7))
-            ->method('fetchRow')
-            ->with(true)
-            ->will(
-                $this->returnValue(
-                    array(
-                        null, 'a<b', 'a>b', 'a&b'
-                    )
-                )
-            );
-
-        $dbi->expects($this->at(8))
-            ->method('fetchRow')
-            ->with(true)
-            ->will($this->returnValue(null));
-
-        $GLOBALS['dbi'] = $dbi;
-        $GLOBALS['what'] = 'foo';
-        $GLOBALS['foo_null'] = "&";
-
-        $this->assertTrue(
-            $this->object->exportData(
-                'db', 'ta<ble', "\n", "example.com", "SELECT"
-            )
-        );
-
-        $this->assertEquals(
-            '<text:h text:outline-level="2" text:style-name="Heading_2" ' .
-            'text:is-list-header="true">Dumping data for table ta&lt;ble</text:h>' .
-            '<table:table table:name="ta&lt;ble_structure"><table:table-column ' .
-            'table:number-columns-repeated="4"/><table:table-row>' .
-            '<table:table-cell office:value-type="string"><text:p>&amp;</text:p>' .
-            '</table:table-cell><table:table-cell office:value-type="string">' .
-            '<text:p></text:p></table:table-cell><table:table-cell ' .
-            'office:value-type="float" office:value="a>b" ><text:p>a&gt;b</text:p>' .
-            '</table:table-cell><table:table-cell office:value-type="string">' .
-            '<text:p>a&amp;b</text:p></table:table-cell></table:table-row>' .
-            '</table:table>',
-            $GLOBALS['odt_buffer']
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportOdt::exportData
-     *
-     * @return void
-     */
-    public function testExportDataWithFieldNames()
-    {
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $flags = array();
-
-        $dbi->expects($this->once())
-            ->method('getFieldsMeta')
-            ->with(true)
-            ->will($this->returnValue($flags));
-
-        $dbi->expects($this->any())
-            ->method('fieldFlags')
-            ->will($this->returnValue('BINARYTEST'));
-
-        $dbi->expects($this->once())
-            ->method('query')
-            ->with('SELECT', null, PMA\libraries\DatabaseInterface::QUERY_UNBUFFERED)
-            ->will($this->returnValue(true));
-
-        $dbi->expects($this->once())
-            ->method('numFields')
-            ->with(true)
-            ->will($this->returnValue(2));
-
-        $dbi->expects($this->at(5))
-            ->method('fieldName')
-            ->will($this->returnValue('fna\"me'));
-
-        $dbi->expects($this->at(6))
-            ->method('fieldName')
-            ->will($this->returnValue('fnam/<e2'));
-
-        $dbi->expects($this->at(7))
-            ->method('fetchRow')
-            ->with(true)
-            ->will(
-                $this->returnValue(
-                    null
-                )
-            );
-
-        $GLOBALS['dbi'] = $dbi;
-        $GLOBALS['what'] = 'foo';
-        $GLOBALS['foo_null'] = "&";
-        $GLOBALS['foo_columns'] = true;
-
-        $this->assertTrue(
-            $this->object->exportData(
-                'db', 'table', "\n", "example.com", "SELECT"
-            )
-        );
-
-        $this->assertEquals(
-            '<text:h text:outline-level="2" text:style-name="Heading_2" text:' .
-            'is-list-header="true">Dumping data for table table</text:h><table:' .
-            'table table:name="table_structure"><table:table-column table:number-' .
-            'columns-repeated="2"/><table:table-row><table:table-cell office:' .
-            'value-type="string"><text:p>fna&quot;me</text:p></table:table-cell>' .
-            '<table:table-cell office:value-type="string"><text:p>fnam/&lt;e2' .
-            '</text:p></table:table-cell></table:table-row></table:table>',
-            $GLOBALS['odt_buffer']
-        );
-
-        // with no row count
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $flags = array();
-
-        $dbi->expects($this->once())
-            ->method('getFieldsMeta')
-            ->with(true)
-            ->will($this->returnValue($flags));
-
-        $dbi->expects($this->once())
-            ->method('query')
-            ->with('SELECT', null, PMA\libraries\DatabaseInterface::QUERY_UNBUFFERED)
-            ->will($this->returnValue(true));
-
-        $dbi->expects($this->once())
-            ->method('numFields')
-            ->with(true)
-            ->will($this->returnValue(0));
-
-        $dbi->expects($this->once())
-            ->method('fetchRow')
-            ->with(true)
-            ->will(
-                $this->returnValue(
-                    null
-                )
-            );
-
-        $GLOBALS['dbi'] = $dbi;
-        $GLOBALS['mediawiki_caption'] = true;
-        $GLOBALS['mediawiki_headers'] = true;
-        $GLOBALS['what'] = 'foo';
-        $GLOBALS['foo_null'] = "&";
-        $GLOBALS['odt_buffer'] = '';
-
-        $this->assertTrue(
-            $this->object->exportData(
-                'db', 'table', "\n", "example.com", "SELECT"
-            )
-        );
-
-        $this->assertEquals(
-            '<text:h text:outline-level="2" text:style-name="Heading_2" ' .
-            'text:is-list-header="true">Dumping data for table table</text:h>' .
-            '<table:table table:name="table_structure"><table:table-column ' .
-            'table:number-columns-repeated="0"/><table:table-row>' .
-            '</table:table-row></table:table>',
-            $GLOBALS['odt_buffer']
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportOdt::getTableDefStandIn
-     *
-     * @return void
-     */
-    public function testGetTableDefStandIn()
-    {
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->once())
-            ->method('getColumns')
-            ->with('db', 'v&w')
-            ->will($this->returnValue(array(1, 2)));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $this->object = $this->getMockBuilder('PMA\libraries\plugins\export\ExportOdt')
-            ->disableOriginalConstructor()
-            ->setMethods(array('formatOneColumnDefinition'))
-            ->getMock();
-
-        $this->object->expects($this->at(0))
-            ->method('formatOneColumnDefinition')
-            ->with(1)
-            ->will($this->returnValue('c1'));
-
-        $this->object->expects($this->at(1))
-            ->method('formatOneColumnDefinition')
-            ->with(2)
-            ->will($this->returnValue('c2'));
-
-        $this->assertTrue(
-            $this->object->getTableDefStandIn('db', 'v&w', '#')
-        );
-
-        $this->assertContains(
-            '<table:table table:name="v&amp;w_data">',
-            $GLOBALS['odt_buffer']
-        );
-
-        $this->assertContains(
-            '</table:table-row>c1</table:table-row>c2</table:table-row>' .
-            '</table:table>',
-            $GLOBALS['odt_buffer']
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportOdt::getTableDef
-     *
-     * @return void
-     */
-    public function testGetTableDef()
-    {
-        $this->object = $this->getMockBuilder('PMA\libraries\plugins\export\ExportOdt')
-            ->setMethods(array('formatOneColumnDefinition'))
-            ->getMock();
-
-        // case 1
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->exactly(2))
-            ->method('fetchResult')
-            ->willReturnOnConsecutiveCalls(
-                array(),
-                array(
-                    'fieldname' => array(
-                        'values' => 'test-',
-                        'transformation' => 'testfoo',
-                        'mimetype' => 'test<'
-                    )
-                )
-            );
-
-        $columns = array(
-            'Field' => 'fieldname'
-        );
-        $dbi->expects($this->once())
-            ->method('getColumns')
-            ->with('database', '')
-            ->will($this->returnValue(array($columns)));
-
-        $dbi->expects($this->any())
-            ->method('query')
-            ->will($this->returnValue(true));
-
-        $dbi->expects($this->any())
-            ->method('numRows')
-            ->will($this->returnValue(1));
-
-        $dbi->expects($this->any())
-            ->method('fetchAssoc')
-            ->will(
-                $this->returnValue(
-                    array(
-                        'comment' => array('fieldname' => 'testComment')
-                    )
-                )
-            );
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $this->object->expects($this->exactly(2))
-            ->method('formatOneColumnDefinition')
-            ->with(array('Field' => 'fieldname'))
-            ->will($this->returnValue(1));
-
-        $GLOBALS['cfgRelation']['relation'] = true;
-        $_SESSION['relation'][0] = array(
-            'PMA_VERSION' => PMA_VERSION,
-            'relwork' => true,
-            'commwork' => true,
-            'mimework' => true,
-            'db' => 'database',
-            'relation' => 'rel',
-            'column_info' => 'col'
-        );
-        $GLOBALS['controllink'] = null;
-        $this->assertTrue(
-            $this->object->getTableDef(
-                'database',
-                '',
-                "\n",
-                "example.com",
-                true,
-                true,
-                true
-            )
-        );
-
-        $this->assertContains(
-            '<table:table table:name="_structure"><table:table-column ' .
-            'table:number-columns-repeated="6"/>',
-            $GLOBALS['odt_buffer']
-        );
-
-        $this->assertContains(
-            '<table:table-cell office:value-type="string"><text:p>Comments' .
-            '</text:p></table:table-cell>',
-            $GLOBALS['odt_buffer']
-        );
-
-        $this->assertContains(
-            '<table:table-cell office:value-type="string"><text:p>MIME type' .
-            '</text:p></table:table-cell>',
-            $GLOBALS['odt_buffer']
-        );
-
-        $this->assertContains(
-            '</table:table-row>1<table:table-cell office:value-type="string">' .
-            '<text:p></text:p></table:table-cell><table:table-cell office:value-' .
-            'type="string"><text:p>Test&lt;</text:p></table:table-cell>' .
-            '</table:table-row></table:table>',
-            $GLOBALS['odt_buffer']
-        );
-
-        // case 2
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->exactly(2))
-            ->method('fetchResult')
-            ->willReturnOnConsecutiveCalls(
-                array(
-                    'fieldname' => array(
-                        'foreign_table' => 'ftable',
-                        'foreign_field' => 'ffield'
-                    )
-                ),
-                array(
-                    'field' => array(
-                        'values' => 'test-',
-                        'transformation' => 'testfoo',
-                        'mimetype' => 'test<'
-                    )
-                )
-            );
-
-        $columns = array(
-            'Field' => 'fieldname'
-        );
-
-        $dbi->expects($this->once())
-            ->method('getColumns')
-            ->with('database', '')
-            ->will($this->returnValue(array($columns)));
-
-        $dbi->expects($this->any())
-            ->method('query')
-            ->will($this->returnValue(true));
-
-        $dbi->expects($this->any())
-            ->method('numRows')
-            ->will($this->returnValue(1));
-
-        $dbi->expects($this->any())
-            ->method('fetchAssoc')
-            ->will(
-                $this->returnValue(
-                    array(
-                        'comment' => array('field' => 'testComment')
-                    )
-                )
-            );
-
-        $GLOBALS['dbi'] = $dbi;
-        $GLOBALS['odt_buffer'] = '';
-        $GLOBALS['cfgRelation']['relation'] = true;
-        $_SESSION['relation'][0] = array(
-            'PMA_VERSION' => PMA_VERSION,
-            'relwork' => true,
-            'commwork' => true,
-            'mimework' => true,
-            'db' => 'database',
-            'relation' => 'rel',
-            'column_info' => 'col'
-        );
-
-        $this->assertTrue(
-            $this->object->getTableDef(
-                'database',
-                '',
-                "\n",
-                "example.com",
-                true,
-                true,
-                true
-            )
-        );
-
-        $this->assertContains(
-            '<text:p>ftable (ffield)</text:p>',
-            $GLOBALS['odt_buffer']
-        );
-    }
-
-     /**
-     * Test for PMA\libraries\plugins\export\ExportOdt::getTriggers
-     *
-     * @return void
-     */
-    public function testGetTriggers()
-    {
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $triggers = array(
-            array(
-                'name' => 'tna"me',
-                'action_timing' => 'ac>t',
-                'event_manipulation' => 'manip&',
-                'definition' => 'def'
-            )
-        );
-
-        $dbi->expects($this->once())
-            ->method('getTriggers')
-            ->with('database', 'ta<ble')
-            ->will($this->returnValue($triggers));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $method = new ReflectionMethod('PMA\libraries\plugins\export\ExportOdt', 'getTriggers');
-        $method->setAccessible(true);
-        $result = $method->invoke($this->object, 'database', 'ta<ble');
-
-        $this->assertTrue(
-            $result
-        );
-
-        $this->assertContains(
-            '<table:table table:name="ta&lt;ble_triggers">',
-            $GLOBALS['odt_buffer']
-        );
-
-        $this->assertContains(
-            '<text:p>tna&quot;me</text:p>',
-            $GLOBALS['odt_buffer']
-        );
-
-        $this->assertContains(
-            '<text:p>ac&gt;t</text:p>',
-            $GLOBALS['odt_buffer']
-        );
-
-        $this->assertContains(
-            '<text:p>manip&amp;</text:p>',
-            $GLOBALS['odt_buffer']
-        );
-
-        $this->assertContains(
-            '<text:p>def</text:p>',
-            $GLOBALS['odt_buffer']
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportOdt::exportStructure
-     *
-     * @return void
-     */
-    public function testExportStructure()
-    {
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->once())
-            ->method('getTriggers')
-            ->with('db', 't&bl')
-            ->will($this->returnValue(1));
-
-        $this->object = $this->getMockBuilder('PMA\libraries\plugins\export\ExportOdt')
-            ->setMethods(array('getTableDef', 'getTriggers', 'getTableDefStandIn'))
-            ->getMock();
-
-        $this->object->expects($this->at(0))
-            ->method('getTableDef')
-            ->with('db', 't&bl', "\n", "example.com", false, false, false, false)
-            ->will($this->returnValue('dumpText1'));
-
-        $this->object->expects($this->once())
-            ->method('getTriggers')
-            ->with('db', 't&bl')
-            ->will($this->returnValue('dumpText2'));
-
-        $this->object->expects($this->at(2))
-            ->method('getTableDef')
-            ->with(
-                'db', 't&bl', "\n", "example.com",
-                false, false, false, false, true, true
-            )
-            ->will($this->returnValue('dumpText3'));
-
-        $this->object->expects($this->once())
-            ->method('getTableDefStandIn')
-            ->with('db', 't&bl', "\n")
-            ->will($this->returnValue('dumpText4'));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        // case 1
-        $this->assertTrue(
-            $this->object->exportStructure(
-                'db', 't&bl', "\n", "example.com", "create_table", "test"
-            )
-        );
-
-        $this->assertContains(
-            '<text:h text:outline-level="2" text:style-name="Heading_2" ' .
-            'text:is-list-header="true">Table structure for table t&amp;bl</text:h>',
-            $GLOBALS['odt_buffer']
-        );
-
-        // case 2
-        $GLOBALS['odt_buffer'] = '';
-
-        $this->assertTrue(
-            $this->object->exportStructure(
-                'db', 't&bl', "\n", "example.com", "triggers", "test"
-            )
-        );
-
-        $this->assertEquals(
-            '<text:h text:outline-level="2" text:style-name="Heading_2" ' .
-            'text:is-list-header="true">Triggers t&amp;bl</text:h>',
-            $GLOBALS['odt_buffer']
-        );
-
-        // case 3
-        $GLOBALS['odt_buffer'] = '';
-
-        $this->assertTrue(
-            $this->object->exportStructure(
-                'db', 't&bl', "\n", "example.com", "create_view", "test"
-            )
-        );
-
-        $this->assertEquals(
-            '<text:h text:outline-level="2" text:style-name="Heading_2" ' .
-            'text:is-list-header="true">Structure for view t&amp;bl</text:h>',
-            $GLOBALS['odt_buffer']
-        );
-
-        // case 4
-        $GLOBALS['odt_buffer'] = '';
-        $this->assertTrue(
-            $this->object->exportStructure(
-                'db', 't&bl', "\n", "example.com", "stand_in", "test"
-            )
-        );
-
-        $this->assertEquals(
-            '<text:h text:outline-level="2" text:style-name="Heading_2" text:is' .
-            '-list-header="true">Stand-in structure for view t&amp;bl</text:h>',
-            $GLOBALS['odt_buffer']
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportOdt::formatOneColumnDefinition
-     *
-     * @return void
-     */
-    public function testFormatOneColumnDefinition()
-    {
-        $method = new ReflectionMethod(
-            'PMA\libraries\plugins\export\ExportOdt', 'formatOneColumnDefinition'
-        );
-        $method->setAccessible(true);
-
-        $cols = array(
-            'Null' => 'Yes',
-            'Field' => 'field',
-            'Key' => 'PRI',
-            'Type' => 'set(abc)enum123'
-        );
-
-        $col_alias = 'alias';
-
-        $this->assertEquals(
-            '<table:table-row><table:table-cell office:value-type="string">' .
-            '<text:p>alias</text:p></table:table-cell><table:table-cell off' .
-            'ice:value-type="string"><text:p>set(abc)</text:p></table:table' .
-            '-cell><table:table-cell office:value-type="string"><text:p>Yes' .
-            '</text:p></table:table-cell><table:table-cell office:value-typ' .
-            'e="string"><text:p>NULL</text:p></table:table-cell>',
-            $method->invoke($this->object, $cols, $col_alias)
-        );
-
-        $cols = array(
-            'Null' => 'NO',
-            'Field' => 'fields',
-            'Key' => 'COMP',
-            'Type' => '',
-            'Default' => 'def'
-        );
-
-        $this->assertEquals(
-            '<table:table-row><table:table-cell office:value-type="string">' .
-            '<text:p>fields</text:p></table:table-cell><table:table-cell off' .
-            'ice:value-type="string"><text:p>&amp;nbsp;</text:p></table:table' .
-            '-cell><table:table-cell office:value-type="string"><text:p>No' .
-            '</text:p></table:table-cell><table:table-cell office:value-type=' .
-            '"string"><text:p>def</text:p></table:table-cell>',
-            $method->invoke($this->object, $cols, '')
-        );
-    }
-}
diff --git a/#pma/test/classes/plugin/export/ExportPdfTest.php b/#pma/test/classes/plugin/export/ExportPdfTest.php
deleted file mode 100644
index aa9a2815..00000000
--- a/#pma/test/classes/plugin/export/ExportPdfTest.php
+++ /dev/null
@@ -1,343 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for PMA\libraries\plugins\export\ExportPdf class
- *
- * @package PhpMyAdmin-test
- */
-use PMA\libraries\plugins\export\ExportPdf;
-use PMA\libraries\plugins\export\PMA_ExportPdf;
-
-require_once 'libraries/export.lib.php';
-require_once 'libraries/config.default.php';
-require_once 'export.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * tests for PMA\libraries\plugins\export\ExportPdf class
- *
- * @package PhpMyAdmin-test
- * @group medium
- */
-class ExportPdfTest extends PMATestCase
-{
-    protected $object;
-
-    /**
-     * Configures global environment.
-     *
-     * @return void
-     */
-    function setup()
-    {
-        $GLOBALS['server'] = 0;
-        $GLOBALS['output_kanji_conversion'] = false;
-        $GLOBALS['output_charset_conversion'] = false;
-        $GLOBALS['buffer_needed'] = false;
-        $GLOBALS['asfile'] = true;
-        $GLOBALS['save_on_server'] = false;
-        $this->object = new ExportPdf();
-    }
-
-    /**
-     * tearDown for test cases
-     *
-     * @return void
-     */
-    public function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportPdf::setProperties
-     *
-     * @return void
-     */
-    public function testSetProperties()
-    {
-        $method = new ReflectionMethod('PMA\libraries\plugins\export\ExportPdf', 'setProperties');
-        $method->setAccessible(true);
-        $method->invoke($this->object, null);
-
-        $attrProperties = new ReflectionProperty('PMA\libraries\plugins\export\ExportPdf', 'properties');
-        $attrProperties->setAccessible(true);
-        $properties = $attrProperties->getValue($this->object);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\plugins\ExportPluginProperties',
-            $properties
-        );
-
-        $this->assertEquals(
-            'PDF',
-            $properties->getText()
-        );
-
-        $this->assertEquals(
-            'pdf',
-            $properties->getExtension()
-        );
-
-        $this->assertEquals(
-            'application/pdf',
-            $properties->getMimeType()
-        );
-
-        $this->assertEquals(
-            'Options',
-            $properties->getOptionsText()
-        );
-
-        $this->assertTrue(
-            $properties->getForceFile()
-        );
-
-        $options = $properties->getOptions();
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyRootGroup',
-            $options
-        );
-
-        $this->assertEquals(
-            'Format Specific Options',
-            $options->getName()
-        );
-
-        $generalOptionsArray = $options->getProperties();
-
-        $generalOptions = array_shift($generalOptionsArray);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyMainGroup',
-            $generalOptions
-        );
-
-        $this->assertEquals(
-            'general_opts',
-            $generalOptions->getName()
-        );
-
-        $generalProperties = $generalOptions->getProperties();
-
-        $property = array_shift($generalProperties);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\TextPropertyItem',
-            $property
-        );
-
-        $this->assertEquals(
-            'report_title',
-            $property->getName()
-        );
-
-        $generalOptions = array_shift($generalOptionsArray);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyMainGroup',
-            $generalOptions
-        );
-
-        $this->assertEquals(
-            'dump_what',
-            $generalOptions->getName()
-        );
-
-        $this->assertEquals(
-            'Dump table',
-            $generalOptions->getText()
-        );
-
-        $generalProperties = $generalOptions->getProperties();
-
-        $property = array_shift($generalProperties);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\RadioPropertyItem',
-            $property
-        );
-
-        $this->assertEquals(
-            'structure_or_data',
-            $property->getName()
-        );
-
-        $this->assertEquals(
-            array(
-                'structure' => __('structure'),
-                'data' => __('data'),
-                'structure_and_data' => __('structure and data')
-            ),
-            $property->getValues()
-        );
-
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportPdf::exportHeader
-     *
-     * @return void
-     */
-    public function testExportHeader()
-    {
-        $pdf = $this->getMockBuilder('PMA\libraries\plugins\export\PMA_ExportPdf')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $pdf->expects($this->once())
-            ->method('Open');
-
-        $pdf->expects($this->once())
-            ->method('setAttributes');
-
-        $pdf->expects($this->once())
-            ->method('setTopMargin');
-
-        $attrPdf = new ReflectionProperty('PMA\libraries\plugins\export\ExportPdf', '_pdf');
-        $attrPdf->setAccessible(true);
-        $attrPdf->setValue($this->object, $pdf);
-
-        $this->assertTrue(
-            $this->object->exportHeader()
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportPdf::exportFooter
-     *
-     * @return void
-     */
-    public function testExportFooter()
-    {
-        $pdf = $this->getMockBuilder('PMA\libraries\plugins\export\PMA_ExportPdf')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $pdf->expects($this->once())
-            ->method('getPDFData');
-
-        $attrPdf = new ReflectionProperty('PMA\libraries\plugins\export\ExportPdf', '_pdf');
-        $attrPdf->setAccessible(true);
-        $attrPdf->setValue($this->object, $pdf);
-
-        $this->assertTrue(
-            $this->object->exportFooter()
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportPdf::exportDBHeader
-     *
-     * @return void
-     */
-    public function testExportDBHeader()
-    {
-        $this->assertTrue(
-            $this->object->exportDBHeader('testDB')
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportPdf::exportDBFooter
-     *
-     * @return void
-     */
-    public function testExportDBFooter()
-    {
-        $this->assertTrue(
-            $this->object->exportDBFooter('testDB')
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportPdf::exportDBCreate
-     *
-     * @return void
-     */
-    public function testExportDBCreate()
-    {
-        $this->assertTrue(
-            $this->object->exportDBCreate('testDB', 'database')
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportPdf::exportData
-     *
-     * @return void
-     */
-    public function testExportData()
-    {
-        $pdf = $this->getMockBuilder('PMA\libraries\plugins\export\PMA_ExportPdf')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $pdf->expects($this->once())
-            ->method('setAttributes')
-            ->with(
-                array(
-                    'currentDb' => 'db', 'currentTable' => 'table',
-                    'dbAlias' => 'db', 'tableAlias' => 'table',
-                    'aliases' => array()
-                )
-            );
-
-        $pdf->expects($this->once())
-            ->method('mysqlReport')
-            ->with('SELECT');
-
-        $attrPdf = new ReflectionProperty('PMA\libraries\plugins\export\ExportPdf', '_pdf');
-        $attrPdf->setAccessible(true);
-        $attrPdf->setValue($this->object, $pdf);
-
-        $this->assertTrue(
-            $this->object->exportData(
-                'db', 'table', "\n", "phpmyadmin.net/err", 'SELECT'
-            )
-        );
-    }
-
-    /**
-     * Test for
-     *     - PMA\libraries\plugins\export\ExportPdf::_setPdf
-     *     - PMA\libraries\plugins\export\ExportPdf::_getPdf
-     *
-     * @return void
-     */
-    public function testSetGetPdf()
-    {
-        $setter = new ReflectionMethod('PMA\libraries\plugins\export\ExportPdf', '_setPdf');
-        $setter->setAccessible(true);
-        $setter->invoke($this->object, new PMA_ExportPdf);
-
-        $getter = new ReflectionMethod('PMA\libraries\plugins\export\ExportPdf', '_getPdf');
-        $getter->setAccessible(true);
-        $this->assertInstanceOf(
-            'PMA\libraries\plugins\export\PMA_ExportPdf',
-            $getter->invoke($this->object)
-        );
-    }
-
-    /**
-     * Test for
-     *     - PMA\libraries\plugins\export\ExportPdf::_setPdfReportTitle
-     *     - PMA\libraries\plugins\export\ExportPdf::_getPdfReportTitle
-     *
-     * @return void
-     */
-    public function testSetGetPdfTitle()
-    {
-        $setter = new ReflectionMethod('PMA\libraries\plugins\export\ExportPdf', '_setPdfReportTitle');
-        $setter->setAccessible(true);
-        $setter->invoke($this->object, "title");
-
-        $getter = new ReflectionMethod('PMA\libraries\plugins\export\ExportPdf', '_getPdfReportTitle');
-        $getter->setAccessible(true);
-        $this->assertEquals(
-            'title',
-            $getter->invoke($this->object)
-        );
-    }
-}
diff --git a/#pma/test/classes/plugin/export/ExportPhparrayTest.php b/#pma/test/classes/plugin/export/ExportPhparrayTest.php
deleted file mode 100644
index 94d6c0bf..00000000
--- a/#pma/test/classes/plugin/export/ExportPhparrayTest.php
+++ /dev/null
@@ -1,298 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for PMA\libraries\plugins\export\ExportPhparray class
- *
- * @package PhpMyAdmin-test
- */
-use PMA\libraries\plugins\export\ExportPhparray;
-
-require_once 'libraries/export.lib.php';
-require_once 'libraries/config.default.php';
-require_once 'export.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * tests for PMA\libraries\plugins\export\ExportPhparray class
- *
- * @package PhpMyAdmin-test
- * @group medium
- */
-class ExportPhparrayTest extends PMATestCase
-{
-    protected $object;
-
-    /**
-     * Configures global environment.
-     *
-     * @return void
-     */
-    function setup()
-    {
-        $GLOBALS['server'] = 0;
-        $GLOBALS['output_kanji_conversion'] = false;
-        $GLOBALS['output_charset_conversion'] = false;
-        $GLOBALS['buffer_needed'] = false;
-        $GLOBALS['asfile'] = true;
-        $GLOBALS['save_on_server'] = false;
-        $this->object = new ExportPhparray();
-    }
-
-    /**
-     * tearDown for test cases
-     *
-     * @return void
-     */
-    public function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportPhparray::setProperties
-     *
-     * @return void
-     */
-    public function testSetProperties()
-    {
-        $method = new ReflectionMethod('PMA\libraries\plugins\export\ExportPhparray', 'setProperties');
-        $method->setAccessible(true);
-        $method->invoke($this->object, null);
-
-        $attrProperties = new ReflectionProperty('PMA\libraries\plugins\export\ExportPhparray', 'properties');
-        $attrProperties->setAccessible(true);
-        $properties = $attrProperties->getValue($this->object);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\plugins\ExportPluginProperties',
-            $properties
-        );
-
-        $this->assertEquals(
-            'PHP array',
-            $properties->getText()
-        );
-
-        $this->assertEquals(
-            'php',
-            $properties->getExtension()
-        );
-
-        $this->assertEquals(
-            'text/plain',
-            $properties->getMimeType()
-        );
-
-        $this->assertEquals(
-            'Options',
-            $properties->getOptionsText()
-        );
-
-        $options = $properties->getOptions();
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyRootGroup',
-            $options
-        );
-
-        $this->assertEquals(
-            'Format Specific Options',
-            $options->getName()
-        );
-
-        $generalOptionsArray = $options->getProperties();
-        $generalOptions = $generalOptionsArray[0];
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyMainGroup',
-            $generalOptions
-        );
-
-        $this->assertEquals(
-            'general_opts',
-            $generalOptions->getName()
-        );
-
-        $generalProperties = $generalOptions->getProperties();
-
-        $property = array_shift($generalProperties);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\HiddenPropertyItem',
-            $property
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportPhparray::exportHeader
-     *
-     * @return void
-     */
-    public function testExportHeader()
-    {
-        $GLOBALS['crlf'] = ' ';
-
-        ob_start();
-        $this->assertTrue(
-            $this->object->exportHeader()
-        );
-        $result = ob_get_clean();
-
-        $this->assertContains(
-            '<?php ',
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportPhparray::exportFooter
-     *
-     * @return void
-     */
-    public function testExportFooter()
-    {
-        $this->assertTrue(
-            $this->object->exportFooter()
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportPhparray::exportDBHeader
-     *
-     * @return void
-     */
-    public function testExportDBHeader()
-    {
-        $GLOBALS['crlf'] = "\n";
-
-        ob_start();
-        $this->assertTrue(
-            $this->object->exportDBHeader("db")
-        );
-        $result = ob_get_clean();
-
-        $this->assertContains(
-            "/**\n * Database `db`\n */",
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportPhparray::exportDBFooter
-     *
-     * @return void
-     */
-    public function testExportDBFooter()
-    {
-        $this->assertTrue(
-            $this->object->exportDBFooter('testDB')
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportPhparray::exportDBCreate
-     *
-     * @return void
-     */
-    public function testExportDBCreate()
-    {
-        $this->assertTrue(
-            $this->object->exportDBCreate('testDB', 'database')
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportPhparray::exportData
-     *
-     * @return void
-     */
-    public function testExportData()
-    {
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->once())
-            ->method('query')
-            ->with('SELECT', null, PMA\libraries\DatabaseInterface::QUERY_UNBUFFERED)
-            ->will($this->returnValue(true));
-
-        $dbi->expects($this->once())
-            ->method('numFields')
-            ->with(true)
-            ->will($this->returnValue(2));
-
-        $dbi->expects($this->at(2))
-            ->method('fieldName')
-            ->with(true, 0)
-            ->will($this->returnValue('c1'));
-
-        $dbi->expects($this->at(3))
-            ->method('fieldName')
-            ->with(true, 1)
-            ->will($this->returnValue(''));
-
-        $dbi->expects($this->at(4))
-            ->method('fetchRow')
-            ->with(true)
-            ->will($this->returnValue(array(1, 'a')));
-
-        $dbi->expects($this->at(5))
-            ->method('fetchRow')
-            ->with(true)
-            ->will($this->returnValue(null));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        ob_start();
-        $this->assertTrue(
-            $this->object->exportData(
-                'db', 'table', "\n", 'phpmyadmin.net/err', 'SELECT'
-            )
-        );
-        $result = ob_get_clean();
-
-        $this->assertEquals(
-            "\n" . '/* `db`.`table` */' . "\n" .
-            '$table = array('  . "\n" .
-            '  array(\'c1\' => 1,\'\' => \'a\')' . "\n" .
-            ');' . "\n",
-            $result
-        );
-
-        // case 2: test invalid variable name fix
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->once())
-            ->method('query')
-            ->with('SELECT', null, PMA\libraries\DatabaseInterface::QUERY_UNBUFFERED)
-            ->will($this->returnValue(true));
-
-        $dbi->expects($this->once())
-            ->method('numFields')
-            ->with(true)
-            ->will($this->returnValue(0));
-
-        $dbi->expects($this->at(2))
-            ->method('fetchRow')
-            ->with(true)
-            ->will($this->returnValue(null));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        ob_start();
-        $this->assertTrue(
-            $this->object->exportData(
-                'db', '0`932table', "\n", 'phpmyadmin.net/err', 'SELECT'
-            )
-        );
-        $result = ob_get_clean();
-
-        $this->assertContains(
-            '$_0_932table',
-            $result
-        );
-    }
-}
diff --git a/#pma/test/classes/plugin/export/ExportSqlTest.php b/#pma/test/classes/plugin/export/ExportSqlTest.php
deleted file mode 100644
index d3c0fe27..00000000
--- a/#pma/test/classes/plugin/export/ExportSqlTest.php
+++ /dev/null
@@ -1,2010 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for PMA\libraries\plugins\export\ExportSql class
- *
- * @package PhpMyAdmin-test
- */
-use PMA\libraries\plugins\export\ExportSql;
-use PMA\libraries\Table;
-
-require_once 'libraries/export.lib.php';
-require_once 'libraries/config.default.php';
-require_once 'libraries/mysql_charsets.lib.php';
-require_once 'libraries/relation.lib.php';
-require_once 'libraries/transformations.lib.php';
-require_once 'libraries/charset_conversion.lib.php';
-require_once 'export.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * tests for PMA\libraries\plugins\export\ExportSql class
- *
- * @package PhpMyAdmin-test
- * @group medium
- */
-class ExportSqlTest extends PMATestCase
-{
-    protected $object;
-
-    /**
-     * Configures global environment.
-     *
-     * @return void
-     */
-    function setup()
-    {
-        $GLOBALS['server'] = 0;
-        $GLOBALS['db'] = 'db';
-        $GLOBALS['output_kanji_conversion'] = false;
-        $GLOBALS['buffer_needed'] = false;
-        $GLOBALS['asfile'] = false;
-        $GLOBALS['save_on_server'] = false;
-        $GLOBALS['plugin_param'] = array();
-        $GLOBALS['plugin_param']['export_type'] = 'table';
-        $GLOBALS['plugin_param']['single_table'] = false;
-        $GLOBALS['cfgRelation']['relation'] = true;
-        $GLOBALS['controllink'] = null;
-        $this->object = new ExportSql();
-    }
-
-    /**
-     * tearDown for test cases
-     *
-     * @return void
-     */
-    public function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportSql::setProperties
-     *
-     * @return void
-     * @group medium
-     */
-    public function testSetProperties()
-    {
-        // test with hide structure and hide sql as true
-        $GLOBALS['plugin_param']['export_type'] = 'table';
-        $GLOBALS['plugin_param']['single_table'] = false;
-        $GLOBALS['cfgRelation']['mimework'] = true;
-
-        $method = new ReflectionMethod('PMA\libraries\plugins\export\ExportSql', 'setProperties');
-        $method->setAccessible(true);
-        $method->invoke($this->object, null);
-
-        $attrProperties = new ReflectionProperty('PMA\libraries\plugins\export\ExportSql', 'properties');
-        $attrProperties->setAccessible(true);
-        $properties = $attrProperties->getValue($this->object);
-
-        $this->assertNull(
-            $properties
-        );
-
-        // test with hide structure and hide sql as false
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->once())
-            ->method('getCompatibilities')
-            ->will($this->returnValue(array('v1', 'v2')));
-
-        $dbi->expects($this->any())->method('escapeString')
-            ->will($this->returnArgument(0));
-
-        $GLOBALS['dbi'] = $dbi;
-        $GLOBALS['plugin_param']['export_type'] = 'server';
-        $GLOBALS['plugin_param']['single_table'] = false;
-        $GLOBALS['cfgRelation']['mimework'] = true;
-        $GLOBALS['cfgRelation']['relation'] = true;
-
-        $method->invoke($this->object, null);
-        $properties = $attrProperties->getValue($this->object);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\plugins\ExportPluginProperties',
-            $properties
-        );
-
-        $this->assertEquals(
-            'SQL',
-            $properties->getText()
-        );
-
-        $options = $properties->getOptions();
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyRootGroup',
-            $options
-        );
-
-        $generalOptionsArray = $options->getProperties();
-
-        $generalOptions = array_shift($generalOptionsArray);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyMainGroup',
-            $generalOptions
-        );
-
-        $properties = $generalOptions->getProperties();
-
-        $property = array_shift($properties);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertySubgroup',
-            $property
-        );
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
-            $property->getSubgroupHeader()
-        );
-
-        $leaves = $property->getProperties();
-
-        $leaf = array_shift($leaves);
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\TextPropertyItem',
-            $leaf
-        );
-
-        $leaf = array_shift($leaves);
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
-            $leaf
-        );
-
-        $leaf = array_shift($leaves);
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
-            $leaf
-        );
-
-        $leaf = array_shift($leaves);
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
-            $leaf
-        );
-
-        $property = array_shift($properties);
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
-            $property
-        );
-
-        $property = array_shift($properties);
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
-            $property
-        );
-
-        $property = array_shift($properties);
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
-            $property
-        );
-
-        $property = array_shift($properties);
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
-            $property
-        );
-
-        $property = array_shift($properties);
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\SelectPropertyItem',
-            $property
-        );
-
-        $this->assertEquals(
-            array(
-                'v1' => 'v1',
-                'v2' => 'v2'
-            ),
-            $property->getValues()
-        );
-
-        $property = array_shift($properties);
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertySubgroup',
-            $property
-        );
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\RadioPropertyItem',
-            $property->getSubgroupHeader()
-        );
-
-        $structureOptions = array_shift($generalOptionsArray);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyMainGroup',
-            $structureOptions
-        );
-
-        $properties = $structureOptions->getProperties();
-
-        $property = array_shift($properties);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertySubgroup',
-            $property
-        );
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\MessageOnlyPropertyItem',
-            $property->getSubgroupHeader()
-        );
-
-        $leaves = $property->getProperties();
-
-        $leaf = array_shift($leaves);
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
-            $leaf
-        );
-
-        $leaf = array_shift($leaves);
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
-            $leaf
-        );
-
-        $this->assertEquals(
-            'Add <code>DROP TABLE / VIEW / PROCEDURE / FUNCTION' .
-            ' / EVENT</code><code> / TRIGGER</code> statement',
-            $leaf->getText()
-        );
-
-        $leaf = array_shift($leaves);
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertySubgroup',
-            $leaf
-        );
-
-        $this->assertCount(
-            2,
-            $leaf->getProperties()
-        );
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
-            $leaf->getSubgroupHeader()
-        );
-
-        $leaf = array_shift($leaves);
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
-            $leaf
-        );
-
-        $leaf = array_shift($leaves);
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
-            $leaf
-        );
-
-        $leaf = array_shift($leaves);
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
-            $leaf
-        );
-
-        $property = array_shift($properties);
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
-            $property
-        );
-
-        $dataOptions = array_shift($generalOptionsArray);
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyMainGroup',
-            $dataOptions
-        );
-
-        $properties = $dataOptions->getProperties();
-
-        $this->assertCount(
-            7,
-            $properties
-        );
-
-        $this->assertCount(
-            2,
-            $properties[1]->getProperties()
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportSql::exportRoutines
-     *
-     * @return void
-     */
-    public function testExportRoutines()
-    {
-        $GLOBALS['crlf'] = '##';
-        $GLOBALS['sql_drop_table'] = true;
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->at(0))
-            ->method('getProceduresOrFunctions')
-            ->with('db', 'PROCEDURE')
-            ->will($this->returnValue(array('p1', 'p2')));
-
-        $dbi->expects($this->at(1))
-            ->method('getProceduresOrFunctions')
-            ->with('db', 'FUNCTION')
-            ->will($this->returnValue(array('f1')));
-
-        $dbi->expects($this->at(2))
-            ->method('getDefinition')
-            ->with('db', 'PROCEDURE', 'p1')
-            ->will($this->returnValue('testp1'));
-
-        $dbi->expects($this->at(3))
-            ->method('getDefinition')
-            ->with('db', 'PROCEDURE', 'p2')
-            ->will($this->returnValue('testp2'));
-
-        $dbi->expects($this->at(4))
-            ->method('getDefinition')
-            ->with('db', 'FUNCTION', 'f1')
-            ->will($this->returnValue('testf1'));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $this->expectOutputString(
-            '##DELIMITER $$##DROP PROCEDURE IF EXISTS `p1`$$##testp1$$####' .
-            'DROP PROCEDURE IF EXISTS `p2`$$##testp2$$####DROP FUNCTION IF' .
-            ' EXISTS `f1`$$##testf1$$####DELIMITER ;##'
-        );
-
-        $this->object->exportRoutines('db');
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportSql::_exportComment
-     *
-     * @return void
-     */
-    public function testExportComment()
-    {
-        $method = new ReflectionMethod('PMA\libraries\plugins\export\ExportSql', '_exportComment');
-        $method->setAccessible(true);
-
-        $GLOBALS['crlf'] = '##';
-        $GLOBALS['sql_include_comments'] = true;
-
-        $this->assertEquals(
-            '--##',
-            $method->invoke($this->object, '')
-        );
-
-        $this->assertEquals(
-            '-- Comment##',
-            $method->invoke($this->object, 'Comment')
-        );
-
-        $GLOBALS['sql_include_comments'] = false;
-
-        $this->assertEquals(
-            '',
-            $method->invoke($this->object, 'Comment')
-        );
-
-        unset($GLOBALS['sql_include_comments']);
-
-        $this->assertEquals(
-            '',
-            $method->invoke($this->object, 'Comment')
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportSql::_possibleCRLF
-     *
-     * @return void
-     */
-    public function testPossibleCRLF()
-    {
-        $method = new ReflectionMethod('PMA\libraries\plugins\export\ExportSql', '_possibleCRLF');
-        $method->setAccessible(true);
-
-        $GLOBALS['crlf'] = '##';
-        $GLOBALS['sql_include_comments'] = true;
-
-        $this->assertEquals(
-            '##',
-            $method->invoke($this->object, '')
-        );
-
-        $this->assertEquals(
-            '##',
-            $method->invoke($this->object, 'Comment')
-        );
-
-        $GLOBALS['sql_include_comments'] = false;
-
-        $this->assertEquals(
-            '',
-            $method->invoke($this->object, 'Comment')
-        );
-
-        unset($GLOBALS['sql_include_comments']);
-
-        $this->assertEquals(
-            '',
-            $method->invoke($this->object, 'Comment')
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportSql::exportFooter
-     *
-     * @return void
-     */
-    public function testExportFooter()
-    {
-        $GLOBALS['sql_disable_fk'] = true;
-        $GLOBALS['sql_use_transaction'] = true;
-        $GLOBALS['charset'] = 'utf-8';
-        $GLOBALS['mysql_charset_map']['utf-8'] = true;
-        $GLOBALS['sql_utc_time'] = true;
-        $GLOBALS['old_tz'] = 'GMT';
-        $GLOBALS['asfile'] = 'yes';
-        $GLOBALS['output_charset_conversion'] = 'utf-8';
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->once())
-            ->method('query')
-            ->with('SET time_zone = "GMT"');
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $this->expectOutputString(
-            'SET FOREIGN_KEY_CHECKS=1;COMMIT;'
-        );
-
-        $this->assertTrue(
-            $this->object->exportFooter()
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportSql::exportHeader
-     *
-     * @return void
-     */
-    public function testExportHeader()
-    {
-        if (!defined("PMA_MYSQL_STR_VERSION")) {
-            define("PMA_MYSQL_STR_VERSION", "5.0.0");
-        }
-
-        $GLOBALS['crlf'] = "\n";
-        $GLOBALS['sql_compatibility'] = 'NONE';
-        $GLOBALS['cfg']['Server']['host'] = 'localhost';
-        $GLOBALS['cfg']['Server']['port'] = 80;
-        $GLOBALS['sql_disable_fk'] = true;
-        $GLOBALS['sql_use_transaction'] = true;
-        $GLOBALS['sql_utc_time'] = true;
-        $GLOBALS['old_tz'] = 'GMT';
-        $GLOBALS['asfile'] = 'yes';
-        $GLOBALS['output_charset_conversion'] = 'utf-8';
-        $GLOBALS['sql_header_comment'] = "h1C\nh2C";
-        $GLOBALS['sql_use_transaction'] = true;
-        $GLOBALS['sql_include_comments'] = true;
-        $GLOBALS['charset'] = 'utf-8';
-        $GLOBALS['mysql_charset_map']['utf-8'] = true;
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->once())
-            ->method('tryQuery')
-            ->with('SET SQL_MODE=""');
-
-        $dbi->expects($this->once())
-            ->method('fetchValue')
-            ->with('SELECT @@session.time_zone')
-            ->will($this->returnValue('old_tz'));
-
-        $dbi->expects($this->once())
-            ->method('query')
-            ->with('SET time_zone = "+00:00"');
-
-        $GLOBALS['dbi'] = $dbi;
-
-        ob_start();
-        $this->assertTrue(
-            $this->object->exportHeader()
-        );
-        $result = ob_get_clean();
-
-        $this->assertContains(
-            'h1C',
-            $result
-        );
-
-        $this->assertContains(
-            'h2C',
-            $result
-        );
-
-        $this->assertContains(
-            "SET FOREIGN_KEY_CHECKS=0;\n",
-            $result
-        );
-
-        $this->assertContains(
-            "40101 SET",
-            $result
-        );
-
-        $this->assertContains(
-            "SET FOREIGN_KEY_CHECKS=0;\n" .
-            "SET SQL_MODE = \"NO_AUTO_VALUE_ON_ZERO\";\n" .
-            "SET AUTOCOMMIT = 0;\n" .
-            "START TRANSACTION;\n" .
-            "SET time_zone = \"+00:00\";\n",
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportSql::exportDBCreate
-     *
-     * @return void
-     */
-    public function testExportDBCreate()
-    {
-        $GLOBALS['sql_compatibility'] = 'NONE';
-        $GLOBALS['sql_drop_database'] = true;
-        $GLOBALS['sql_backquotes'] = true;
-        $GLOBALS['sql_create_database'] = true;
-        $GLOBALS['sql_create_table'] = true;
-        $GLOBALS['sql_create_view'] = true;
-        $GLOBALS['crlf'] = "\n";
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $dbi->expects($this->any())->method('escapeString')
-            ->will($this->returnArgument(0));
-
-        $dbi->expects($this->once())
-            ->method('isSystemSchema')
-            ->with('db')
-            ->will($this->returnValue(true));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        ob_start();
-        $this->assertTrue(
-            $this->object->exportDBCreate('db', 'database')
-        );
-        $result = ob_get_clean();
-
-        $this->assertContains(
-            "DROP DATABASE IF EXISTS `db`;\n",
-            $result
-        );
-
-        $this->assertContains(
-            'CREATE DATABASE IF NOT EXISTS `db` DEFAULT CHARACTER ' .
-            'SET utf8 COLLATE utf8_general_ci;',
-            $result
-        );
-
-        $this->assertContains(
-            'USE `db`;',
-            $result
-        );
-
-        // case2: no backquotes
-        unset($GLOBALS['sql_compatibility']);
-        $GLOBALS['cfg']['Server']['DisableIS'] = true;
-        unset($GLOBALS['sql_backquotes']);
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $dbi->expects($this->any())->method('escapeString')
-            ->will($this->returnArgument(0));
-
-        $dbi->expects($this->once())
-            ->method('fetchValue')
-            ->with('SELECT @@collation_database')
-            ->will($this->returnValue('testcollation'));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        ob_start();
-        $this->assertTrue(
-            $this->object->exportDBCreate('db', 'database')
-        );
-        $result = ob_get_clean();
-
-        $this->assertContains(
-            "DROP DATABASE IF EXISTS db;\n",
-            $result
-        );
-
-        $this->assertContains(
-            'CREATE DATABASE IF NOT EXISTS db DEFAULT CHARACTER SET testcollation;',
-            $result
-        );
-
-        $this->assertContains(
-            'USE db;',
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportSql::exportDBHeader
-     *
-     * @return void
-     */
-    public function testExportDBHeader()
-    {
-        $GLOBALS['sql_compatibility'] = 'MSSQL';
-        $GLOBALS['sql_backquotes'] = true;
-        $GLOBALS['sql_include_comments'] = true;
-        $GLOBALS['crlf'] = "\n";
-
-        ob_start();
-        $this->assertTrue(
-            $this->object->exportDBHeader('testDB')
-        );
-        $result = ob_get_clean();
-
-        $this->assertContains(
-            "&quot;testDB&quot;",
-            $result
-        );
-
-        // case 2
-        unset($GLOBALS['sql_compatibility']);
-        unset($GLOBALS['sql_backquotes']);
-
-        ob_start();
-        $this->assertTrue(
-            $this->object->exportDBHeader('testDB')
-        );
-        $result = ob_get_clean();
-
-        $this->assertContains(
-            "testDB",
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportSql::exportEvents
-     *
-     * @return void
-     */
-    public function testExportEvents()
-    {
-
-        $GLOBALS['crlf'] = "\n";
-        $GLOBALS['sql_structure_or_data'] = 'structure';
-        $GLOBALS['sql_procedure_function'] = true;
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->once())
-            ->method('fetchResult')
-            ->with(
-                'SELECT EVENT_NAME FROM information_schema.EVENTS WHERE'
-                . ' EVENT_SCHEMA= \'db\';'
-            )
-            ->will($this->returnValue(array('f1', 'f2')));
-
-        $dbi->expects($this->exactly(2))
-            ->method('getDefinition')
-            ->will(
-                $this->returnValueMap(
-                    array(
-                        array('db', 'EVENT', 'f1', null, 'f1event'),
-                        array('db', 'EVENT', 'f2', null, 'f2event')
-                    )
-                )
-            );
-        $dbi->expects($this->any())->method('escapeString')
-            ->will($this->returnArgument(0));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        ob_start();
-        $this->assertTrue(
-            $this->object->exportEvents('db')
-        );
-        $result = ob_get_clean();
-
-        $this->assertContains(
-            "DELIMITER $$\n",
-            $result
-        );
-
-        $this->assertContains(
-            "DELIMITER ;\n",
-            $result
-        );
-
-        $this->assertContains(
-            "f1event$$\n",
-            $result
-        );
-
-        $this->assertContains(
-            "f2event$$\n",
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportSql::exportDBFooter
-     *
-     * @return void
-     */
-    public function testExportDBFooter()
-    {
-        $GLOBALS['crlf'] = "\n";
-        $GLOBALS['sql_constraints'] = "SqlConstraints";
-        $GLOBALS['sql_structure_or_data'] = 'structure';
-        $GLOBALS['sql_procedure_function'] = true;
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $dbi->expects($this->any())->method('escapeString')
-            ->will($this->returnArgument(0));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        ob_start();
-        $this->assertTrue(
-            $this->object->exportDBFooter('db')
-        );
-        $result = ob_get_clean();
-
-        $this->assertEquals(
-            'SqlConstraints',
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportSql::getTableDefStandIn
-     *
-     * @return void
-     */
-    public function testGetTableDefStandIn()
-    {
-        $GLOBALS['sql_drop_table'] = true;
-        $GLOBALS['sql_if_not_exists'] = true;
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $dbi->expects($this->any())->method('escapeString')
-            ->will($this->returnArgument(0));
-
-        $dbi->expects($this->once())
-            ->method('getColumnsFull')
-            ->with('db', 'view')
-            ->will(
-                $this->returnValue(
-                    array('cname' => array('Type' => 'int'))
-                )
-            );
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $result = $this->object->getTableDefStandIn('db', 'view', "");
-
-        $this->assertContains(
-            "DROP VIEW IF EXISTS `view`;",
-            $result
-        );
-
-        $this->assertContains(
-            "CREATE TABLE IF NOT EXISTS `view` (`cname` int);",
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportSql::_getTableDefForView
-     *
-     * @return void
-     */
-    public function testGetTableDefForView()
-    {
-        $GLOBALS['sql_drop_table'] = true;
-        $GLOBALS['sql_if_not_exists'] = true;
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $dbi->expects($this->any())->method('escapeString')
-            ->will($this->returnArgument(0));
-
-        $dbi->expects($this->any(0))
-            ->method('getColumns')
-            ->with('db', 'view')
-            ->will(
-                $this->returnValue(
-                    array(
-                        'cname' => array(
-                            'Type' => 'char',
-                            'Collation' => 'utf-8',
-                            'Null' => 'NO',
-                            'Default' => 'a',
-                            'Comment' => 'cmt',
-                            'Field' => 'fname'
-                        )
-                    )
-                )
-            );
-
-        $GLOBALS['dbi'] = $dbi;
-        $GLOBALS['sql_compatibility'] = 'MSSQL';
-
-        $method = new ReflectionMethod('PMA\libraries\plugins\export\ExportSql', '_getTableDefForView');
-        $method->setAccessible(true);
-        $result = $method->invoke(
-            $this->object, 'db', 'view', "\n"
-        );
-
-        $this->assertEquals(
-            "CREATE TABLE `view`(\n" .
-            "    `fname` char COLLATE utf-8 NOT NULL DEFAULT 'a' COMMENT 'cmt'\n" .
-            ");\n",
-            $result
-        );
-
-        // case 2
-        unset($GLOBALS['sql_compatibility']);
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $dbi->expects($this->any())->method('escapeString')
-            ->will($this->returnArgument(0));
-
-        $dbi->expects($this->any())
-            ->method('getColumns')
-            ->with('db', 'view')
-            ->will(
-                $this->returnValue(
-                    array(
-                        'cname' => array(
-                            'Type' => 'char',
-                            'Collation' => 'utf-8',
-                            'Null' => 'YES',
-                            'Comment' => 'cmt',
-                            'Field' => 'fname'
-                        )
-                    )
-                )
-            );
-        $GLOBALS['dbi'] = $dbi;
-
-        $result = $method->invoke(
-            $this->object, 'db', 'view', "\n", false
-        );
-
-        $this->assertEquals(
-            "CREATE TABLE IF NOT EXISTS `view`(\n" .
-            "    `fname` char COLLATE utf-8 DEFAULT NULL COMMENT 'cmt'\n" .
-            ")\n",
-            $result
-        );
-    }
-
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportSql::getTableDef
-     *
-     * @return void
-     * @group medium
-     */
-    public function testGetTableDef()
-    {
-        $GLOBALS['sql_compatibility'] = 'MSSQL';
-        $GLOBALS['sql_auto_increment'] = true;
-        $GLOBALS['sql_drop_table'] = true;
-        $GLOBALS['sql_backquotes'] = true;
-        $GLOBALS['sql_if_not_exists']  = true;
-        $GLOBALS['sql_include_comments']  = true;
-        $GLOBALS['crlf'] = "\n";
-        if (isset($GLOBALS['sql_constraints'])) {
-            unset($GLOBALS['sql_constraints']);
-        }
-
-        if (isset($GLOBALS['no_constraints_comments'])) {
-            unset($GLOBALS['no_constraints_comments']);
-        }
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->any())
-            ->method('query')
-            ->will($this->returnValue('res'));
-
-        $dbi->expects($this->never())
-            ->method('fetchSingleRow');
-
-        $dbi->expects($this->once())
-            ->method('numRows')
-            ->with('res')
-            ->will($this->returnValue(1));
-
-        $dbi->expects($this->any())
-            ->method('fetchValue')
-            ->will($this->returnValue(false));
-
-        $tmpres = array(
-            'Auto_increment' => 1,
-            'Create_time' => '2000-01-01 10:00:00',
-            'Update_time' => '2000-01-02 12:00:00',
-            'Check_time' => '2000-01-02 13:00:00',
-        );
-
-        $dbi->expects($this->once())
-            ->method('fetchAssoc')
-            ->with('res')
-            ->will($this->returnValue($tmpres));
-
-        $dbi->expects($this->once())
-            ->method('tryQuery')
-            ->with('SHOW CREATE TABLE `db`.`table`')
-            ->will($this->returnValue('res'));
-
-        $row = array(
-            '',
-            "CREATE TABLE `table` (\n" .
-            "`payment_id` smallint(5) unsigned NOT NULL AUTO_INCREMENT,\n" .
-            "`customer_id` smallint(5) unsigned NOT NULL,\n" .
-            "`staff_id` tinyint(3) unsigned NOT NULL,\n" .
-            "`rental_id` int(11) DEFAULT NULL,\n" .
-            "`amount` decimal(5,2) NOT NULL,\n" .
-            "`payment_date` datetime NOT NULL,\n" .
-            "`last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,\n" .
-            "PRIMARY KEY (`payment_id`),\n" .
-            "KEY `idx_fk_staff_id` (`staff_id`),\n" .
-            "KEY `idx_fk_customer_id` (`customer_id`),\n" .
-            "KEY `fk_payment_rental` (`rental_id`),\n" .
-            "CONSTRAINT `fk_payment_customer` FOREIGN KEY (`customer_id`) REFERENCES `customer` (`customer_id`) ON UPDATE CASCADE,\n" .
-            "CONSTRAINT `fk_payment_rental` FOREIGN KEY (`rental_id`) REFERENCES `rental` (`rental_id`) ON DELETE SET NULL ON UPDATE CASCADE,\n" .
-            "CONSTRAINT `fk_payment_staff` FOREIGN KEY (`staff_id`) REFERENCES `staff` (`staff_id`) ON UPDATE CASCADE\n" .
-            ") ENGINE=InnoDB AUTO_INCREMENT=16050 DEFAULT CHARSET=utf8\n"
-        );
-
-        $dbi->expects($this->exactly(1))
-            ->method('fetchRow')
-            ->will(
-                $this->returnValueMap(
-                    array(
-                        array('res', $row)
-                    )
-                )
-            );
-        $dbi->expects($this->once())
-            ->method('getTable')
-            ->will($this->returnValue(new Table('table', 'db', $dbi)));
-        $dbi->expects($this->any())->method('escapeString')
-            ->will($this->returnArgument(0));
-
-        $GLOBALS['dbi'] = $dbi;
-        $GLOBALS['cfg']['Server']['DisableIS'] = false;
-
-        $result = $this->object->getTableDef(
-            'db', 'table', "\n", "example.com/err", true, true, false
-        );
-
-        $this->assertContains(
-            '-- Creation: Jan 01, 2000 at 10:00 AM',
-            $result
-        );
-
-        $this->assertContains(
-            '-- Last update: Jan 02, 2000 at 12:00 PM',
-            $result
-        );
-
-        $this->assertContains(
-            '-- Last check: Jan 02, 2000 at 01:00 PM',
-            $result
-        );
-
-        $this->assertContains(
-            'DROP TABLE IF EXISTS `table`;',
-            $result
-        );
-
-        $this->assertContains(
-            "CREATE TABLE `table`",
-            $result
-        );
-
-        $this->assertContains(
-            '-- Constraints for dumped tables',
-            $GLOBALS['sql_constraints']
-        );
-
-        $this->assertContains(
-            '-- Constraints for table "table"',
-            $GLOBALS['sql_constraints']
-        );
-
-        $this->assertContains(
-            'ALTER TABLE "table"',
-            $GLOBALS['sql_constraints']
-        );
-
-        $this->assertContains(
-            'ADD CONSTRAINT',
-            $GLOBALS['sql_constraints']
-        );
-
-        $this->assertContains(
-            'ALTER TABLE "table"',
-            $GLOBALS['sql_constraints_query']
-        );
-
-        $this->assertContains(
-            'ADD CONSTRAINT',
-            $GLOBALS['sql_constraints_query']
-        );
-
-        $this->assertContains(
-            'ALTER TABLE "table"',
-            $GLOBALS['sql_drop_foreign_keys']
-        );
-
-        $this->assertContains(
-            'DROP FOREIGN KEY',
-            $GLOBALS['sql_drop_foreign_keys']
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportSql::getTableDef
-     *
-     * @return void
-     */
-    public function testGetTableDefWithError()
-    {
-        $GLOBALS['sql_compatibility'] = '';
-        $GLOBALS['sql_auto_increment'] = true;
-        $GLOBALS['sql_drop_table'] = true;
-        $GLOBALS['sql_backquotes'] = false;
-        $GLOBALS['sql_if_not_exists']  = true;
-        $GLOBALS['sql_include_comments']  = true;
-        $GLOBALS['crlf'] = "\n";
-
-        if (isset($GLOBALS['sql_constraints'])) {
-            unset($GLOBALS['sql_constraints']);
-        }
-
-        if (isset($GLOBALS['no_constraints_comments'])) {
-            unset($GLOBALS['no_constraints_comments']);
-        }
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->any())
-            ->method('query')
-            ->will($this->returnValue('res'));
-
-        $dbi->expects($this->never())
-            ->method('fetchSingleRow');
-
-        $dbi->expects($this->once())
-            ->method('numRows')
-            ->with('res')
-            ->will($this->returnValue(2));
-
-        $dbi->expects($this->any())
-            ->method('fetchValue')
-            ->will($this->returnValue(false));
-
-        $tmpres = array(
-            'Auto_increment' => 1,
-            'Create_time' => '2000-01-01 10:00:00',
-            'Update_time' => '2000-01-02 12:00:00',
-            'Check_time' => '2000-01-02 13:00:00',
-        );
-
-        $dbi->expects($this->once())
-            ->method('fetchAssoc')
-            ->with('res')
-            ->will($this->returnValue($tmpres));
-
-        $dbi->expects($this->once())
-            ->method('tryQuery')
-            ->with('SHOW CREATE TABLE `db`.`table`')
-            ->will($this->returnValue('res'));
-
-        $dbi->expects($this->once())
-            ->method('getError')
-            ->will($this->returnValue('error occurred'));
-
-        $dbi->expects($this->once())
-            ->method('getTable')
-            ->will($this->returnValue(new Table('table', 'db', $dbi)));
-        $dbi->expects($this->any())
-            ->method('escapeString')
-            ->will($this->returnArgument(0));
-
-        $GLOBALS['dbi'] = $dbi;
-        $GLOBALS['cfg']['Server']['DisableIS'] = false;
-
-        $result = $this->object->getTableDef(
-            'db', 'table', "\n", "example.com/err", true, true, false
-        );
-
-        $this->assertContains(
-            '-- in use(error occurred)',
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportSql::_getTableComments
-     *
-     * @return void
-     */
-    public function testGetTableComments()
-    {
-        $_SESSION['relation'][0] = array(
-            'PMA_VERSION' => PMA_VERSION,
-            'relwork' => true,
-            'commwork' => true,
-            'mimework' => true,
-            'db' => 'database',
-            'relation' => 'rel',
-            'column_info' => 'col'
-        );
-        $GLOBALS['sql_include_comments'] = true;
-        $GLOBALS['crlf'] = "\n";
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->any())->method('escapeString')
-            ->will($this->returnArgument(0));
-
-        $dbi->expects($this->exactly(2))
-            ->method('fetchResult')
-            ->willReturnOnConsecutiveCalls(
-                array(
-                    'foo' => array(
-                        'foreign_table' => 'ftable',
-                        'foreign_field' => 'ffield'
-                    )
-                ),
-                array(
-                    'fieldname' => array(
-                        'values' => 'test-',
-                        'transformation' => 'testfoo',
-                        'mimetype' => 'test<'
-                    )
-                )
-            );
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $method = new ReflectionMethod('PMA\libraries\plugins\export\ExportSql', '_getTableComments');
-        $method->setAccessible(true);
-        $result = $method->invoke(
-            $this->object, 'db', '', "\n", true, true
-        );
-
-        $this->assertContains(
-            "-- MIME TYPES FOR TABLE :\n" .
-            "--   fieldname\n" .
-            "--       Test<",
-            $result
-        );
-
-        $this->assertContains(
-            "-- RELATIONS FOR TABLE :\n" .
-            "--   foo\n" .
-            "--       ftable -> ffield",
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportSql::exportStructure
-     *
-     * @return void
-     * @group medium
-     */
-    public function testExportStructure()
-    {
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $dbi->expects($this->any())->method('escapeString')
-            ->will($this->returnArgument(0));
-
-        $dbi->expects($this->once())
-            ->method('getTriggers')
-            ->with('db', 't&bl')
-            ->will(
-                $this->returnValue(
-                    array(
-                        array('create' => 'bar', 'drop' => 'foo')
-                    )
-                )
-            );
-
-        $this->object = $this->getMockBuilder('PMA\libraries\plugins\export\ExportSql')
-            ->setMethods(array('getTableDef', 'getTriggers', 'getTableDefStandIn'))
-            ->getMock();
-
-        $this->object->expects($this->at(0))
-            ->method('getTableDef')
-            ->with('db', 't&bl', "\n", "example.com", false)
-            ->will($this->returnValue('dumpText1'));
-
-        $this->object->expects($this->at(1))
-            ->method('getTableDef')
-            ->with(
-                'db', 't&bl', "\n", "example.com", false
-            )
-            ->will($this->returnValue('dumpText3'));
-
-        $this->object->expects($this->once())
-            ->method('getTableDefStandIn')
-            ->with('db', 't&bl', "\n")
-            ->will($this->returnValue('dumpText4'));
-
-        $GLOBALS['dbi'] = $dbi;
-        $GLOBALS['sql_compatibility'] = 'MSSQL';
-        $GLOBALS['sql_backquotes'] = true;
-        $GLOBALS['sql_include_comments'] = true;
-        $GLOBALS['crlf'] = "\n";
-
-        // case 1
-        ob_start();
-        $this->assertTrue(
-            $this->object->exportStructure(
-                'db', 't&bl', "\n", "example.com", "create_table", "test"
-            )
-        );
-        $result = ob_get_clean();
-
-        $this->assertContains(
-            '-- Table structure for table &quot;t&amp;bl&quot;',
-            $result
-        );
-
-        $this->assertContains(
-            'dumpText1',
-            $result
-        );
-
-        // case 2
-        unset($GLOBALS['sql_compatibility']);
-        unset($GLOBALS['sql_backquotes']);
-
-        $GLOBALS['sql_create_trigger'] = true;
-        $GLOBALS['sql_drop_table'] = true;
-
-        ob_start();
-        $this->assertTrue(
-            $this->object->exportStructure(
-                'db', 't&bl', "\n", "example.com", "triggers", "test"
-            )
-        );
-        $result = ob_get_clean();
-
-        $this->assertContains(
-            "-- Triggers t&amp;bl\n",
-            $result
-        );
-
-        $this->assertContains(
-            "foo;\nDELIMITER $$\nbarDELIMITER ;\n",
-            $result
-        );
-
-        unset($GLOBALS['sql_create_trigger']);
-        unset($GLOBALS['sql_drop_table']);
-
-        // case 3
-        $GLOBALS['sql_views_as_tables'] = false;
-
-        ob_start();
-        $this->assertTrue(
-            $this->object->exportStructure(
-                'db', 't&bl', "\n", "example.com", "create_view", "test"
-            )
-        );
-        $result = ob_get_clean();
-
-        $this->assertContains(
-            "-- Structure for view t&amp;bl\n",
-            $result
-        );
-
-        $this->assertContains(
-            "DROP TABLE IF EXISTS `t&amp;bl`;\n" .
-            "dumpText3",
-            $result
-        );
-
-        // case 4
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $dbi->expects($this->any())->method('escapeString')
-            ->will($this->returnArgument(0));
-
-        $dbi->expects($this->once())
-            ->method('getColumns')
-            ->will(
-                $this->returnValue(
-                    array()
-                )
-            );
-        $GLOBALS['dbi'] = $dbi;
-        $GLOBALS['sql_views_as_tables'] = true;
-
-        ob_start();
-        $this->assertTrue(
-            $this->object->exportStructure(
-                'db', 't&bl', "\n", "example.com", "create_view", "test"
-            )
-        );
-        $result = ob_get_clean();
-
-        $this->assertContains(
-            "CREATE TABLE`t&amp;bl`(\n\n);",
-            $result
-        );
-
-        $this->assertContains(
-            "DROP TABLE IF EXISTS `t&amp;bl`;\n",
-            $result
-        );
-
-        // case 5
-
-        ob_start();
-        $this->assertTrue(
-            $this->object->exportStructure(
-                'db', 't&bl', "\n", "example.com", "stand_in", "test"
-            )
-        );
-        $result = ob_get_clean();
-
-        $this->assertContains(
-            "dumpText4",
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportSql::exportData
-     *
-     * @return void
-     * @group medium
-     */
-    public function testExportData()
-    {
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $flags = array();
-        $a = new StdClass;
-        $a->blob = false;
-        $a->numeric = true;
-        $a->type = 'ts';
-        $a->name = 'name';
-        $a->length = 2;
-        $flags[] = $a;
-
-        $a = new StdClass;
-        $a->blob = false;
-        $a->numeric = true;
-        $a->type = 'ts';
-        $a->name = 'name';
-        $a->length = 2;
-        $flags[] = $a;
-
-        $a = new StdClass;
-        $a->blob = true;
-        $a->numeric = false;
-        $a->type = 'ts';
-        $a->name = 'name';
-        $a->length = 2;
-        $flags[] = $a;
-
-        $a = new StdClass;
-        $a->type = "bit";
-        $a->blob = false;
-        $a->numeric = false;
-        $a->name = 'name';
-        $a->length = 2;
-        $flags[] = $a;
-
-        $a = new StdClass;
-        $a->blob = false;
-        $a->numeric = true;
-        $a->type = 'timestamp';
-        $a->name = 'name';
-        $a->length = 2;
-        $flags[] = $a;
-
-        $dbi->expects($this->once())
-            ->method('getFieldsMeta')
-            ->with('res')
-            ->will($this->returnValue($flags));
-
-        $dbi->expects($this->any())
-            ->method('fieldFlags')
-            ->will($this->returnValue('biNAry'));
-
-        $dbi->expects($this->once())
-            ->method('tryQuery')
-            ->with(
-                "SELECT a FROM b WHERE 1",
-                null,
-                PMA\libraries\DatabaseInterface::QUERY_UNBUFFERED
-            )
-            ->will($this->returnValue('res'));
-
-        $dbi->expects($this->once())
-            ->method('numFields')
-            ->with('res')
-            ->will($this->returnValue(5));
-
-        $dbi->expects($this->exactly(2))
-            ->method('fetchRow')
-            ->willReturnOnConsecutiveCalls(
-                array(null, 'test', '10', '6', "\x00\x0a\x0d\x1a"),
-                null
-            );
-        $dbi->expects($this->any())->method('escapeString')
-            ->will($this->returnArgument(0));
-
-        $_table = $this->getMockBuilder('PMA\libraries\Table')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $_table->expects($this->once())
-            ->method('isMerge')
-            ->will($this->returnValue(false));
-        $_table->expects($this->once())
-            ->method('isView')
-            ->will($this->returnValue(false));
-
-        $dbi->expects($this->any())
-            ->method('getTable')
-            ->will($this->returnValue($_table));
-
-        $GLOBALS['dbi'] = $dbi;
-        $GLOBALS['sql_compatibility'] = 'MSSQL';
-        $GLOBALS['sql_backquotes'] = true;
-        $GLOBALS['sql_max_query_size'] = 50000;
-        $GLOBALS['sql_views_as_tables'] = true;
-        $GLOBALS['sql_type'] = 'INSERT';
-        $GLOBALS['sql_delayed'] = ' DELAYED';
-        $GLOBALS['sql_ignore'] = true;
-        $GLOBALS['sql_truncate'] = true;
-        $GLOBALS['sql_insert_syntax'] = 'both';
-        $GLOBALS['sql_hex_for_binary'] = true;
-        $GLOBALS['cfg']['Server']['DisableIS'] = false;
-
-        ob_start();
-        $this->object->exportData(
-            'db', 'table', "\n", "example.com/err",
-            "SELECT a FROM b WHERE 1"
-        );
-        $result = ob_get_clean();
-
-        $this->assertContains(
-            'TRUNCATE TABLE &quot;table&quot;;',
-            $result
-        );
-
-        $this->assertContains(
-            'SET IDENTITY_INSERT &quot;table&quot; ON ;',
-            $result
-        );
-
-        $this->assertContains(
-            'INSERT DELAYED IGNORE INTO &quot;table&quot; (&quot;name&quot;, ' .
-            '&quot;name&quot;, &quot;name&quot;, &quot;name&quot;, ' .
-            '&quot;name&quot;) VALUES',
-            $result
-        );
-
-        $this->assertContains(
-            '(NULL, test, 0x3130, 0x36, 0x000a0d1a);',
-            $result
-        );
-
-        $this->assertContains(
-            "SET IDENTITY_INSERT &quot;table&quot; OFF;",
-            $result
-        );
-
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportSql::exportData
-     *
-     * @return void
-     * @group medium
-     */
-    public function testExportDataWithUpdate()
-    {
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $flags = array();
-        $a = new StdClass;
-        $a->blob = false;
-        $a->numeric = true;
-        $a->type = 'real';
-        $a->name = 'name';
-        $a->length = 2;
-        $a->table = 'tbl';
-        $a->orgname = 'pma';
-        $a->primary_key = 1;
-        $flags[] = $a;
-
-        $a = new StdClass;
-        $a->blob = false;
-        $a->numeric = true;
-        $a->type = '';
-        $a->name = 'name';
-        $a->table = 'tbl';
-        $a->orgname = 'pma';
-        $a->length = 2;
-        $a->primary_key = 0;
-        $a->unique_key = 1;
-        $flags[] = $a;
-
-        $dbi->expects($this->once())
-            ->method('getFieldsMeta')
-            ->with('res')
-            ->will($this->returnValue($flags));
-
-        $dbi->expects($this->any())
-            ->method('fieldFlags')
-            ->will($this->returnValue('biNAry'));
-
-        $dbi->expects($this->once())
-            ->method('tryQuery')
-            ->with(
-                "SELECT a FROM b WHERE 1",
-                null,
-                PMA\libraries\DatabaseInterface::QUERY_UNBUFFERED
-            )
-            ->will($this->returnValue('res'));
-
-        $dbi->expects($this->once())
-            ->method('numFields')
-            ->with('res')
-            ->will($this->returnValue(2));
-
-        $dbi->expects($this->exactly(2))
-            ->method('fetchRow')
-            ->willReturnOnConsecutiveCalls(
-                array(null, null),
-                null
-            );
-
-        $_table = $this->getMockBuilder('PMA\libraries\Table')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $_table->expects($this->once())
-            ->method('isMerge')
-            ->will($this->returnValue(false));
-        $_table->expects($this->once())
-            ->method('isView')
-            ->will($this->returnValue(false));
-
-        $dbi->expects($this->any())
-            ->method('getTable')
-            ->will($this->returnValue($_table));
-        $dbi->expects($this->any())->method('escapeString')
-            ->will($this->returnArgument(0));
-
-        $GLOBALS['dbi'] = $dbi;
-        $GLOBALS['sql_compatibility'] = 'MSSQL';
-        $GLOBALS['sql_backquotes'] = true;
-        $GLOBALS['sql_views_as_tables'] = true;
-        $GLOBALS['sql_type'] = 'UPDATE';
-        $GLOBALS['sql_delayed'] = ' DELAYED';
-        $GLOBALS['sql_ignore'] = true;
-        $GLOBALS['sql_truncate'] = true;
-        $GLOBALS['sql_insert_syntax'] = 'both';
-        $GLOBALS['sql_hex_for_binary'] = true;
-        $GLOBALS['cfg']['Server']['DisableIS'] = false;
-
-        ob_start();
-        $this->object->exportData(
-            'db', 'table', "\n", "example.com/err",
-            "SELECT a FROM b WHERE 1"
-        );
-        $result = ob_get_clean();
-
-        $this->assertContains(
-            'UPDATE IGNORE &quot;table&quot; SET &quot;name&quot; = NULL,' .
-            '&quot;name&quot; = NULL WHERE CONCAT(`tbl`.`pma`) IS NULL;',
-            $result
-        );
-
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportSql::exportData
-     *
-     * @return void
-    */
-    public function testExportDataWithIsView()
-    {
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $_table = $this->getMockBuilder('PMA\libraries\Table')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $_table->expects($this->once())
-            ->method('isMerge')
-            ->will($this->returnValue(false));
-        $_table->expects($this->once())
-            ->method('isView')
-            ->will($this->returnValue(true));
-
-        $dbi->expects($this->any())
-            ->method('getTable')
-            ->will($this->returnValue($_table));
-        $dbi->expects($this->any())->method('escapeString')
-            ->will($this->returnArgument(0));
-
-        $GLOBALS['dbi'] = $dbi;
-        $GLOBALS['cfg']['Server']['DisableIS'] = false;
-        $GLOBALS['sql_views_as_tables'] = false;
-        $GLOBALS['sql_include_comments'] = true;
-        $GLOBALS['crlf'] = "\n";
-        $oldVal = isset($GLOBALS['sql_compatibility']) ? $GLOBALS['sql_compatibility'] : '';
-        $GLOBALS['sql_compatibility'] = 'NONE';
-        $GLOBALS['sql_backquotes'] = true;
-
-        ob_start();
-        $this->assertTrue(
-            $this->object->exportData('db', 'tbl', "\n", "err.com", "SELECT")
-        );
-        $result = ob_get_clean();
-
-        $this->assertContains(
-            "-- VIEW  `tbl`\n",
-            $result
-        );
-
-        $this->assertContains(
-            "-- Data: None\n",
-            $result
-        );
-
-        // reset
-        $GLOBALS['sql_compatibility'] = $oldVal;
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportSql::exportData
-     *
-     * @return void
-    */
-    public function testExportDataWithError()
-    {
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->once())
-            ->method('getError')
-            ->will($this->returnValue('err'));
-
-        $_table = $this->getMockBuilder('PMA\libraries\Table')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $_table->expects($this->once())
-            ->method('isMerge')
-            ->will($this->returnValue(false));
-        $_table->expects($this->once())
-            ->method('isView')
-            ->will($this->returnValue(false));
-
-        $dbi->expects($this->any())
-            ->method('getTable')
-            ->will($this->returnValue($_table));
-        $dbi->expects($this->any())->method('escapeString')
-            ->will($this->returnArgument(0));
-
-        $GLOBALS['dbi'] = $dbi;
-        $GLOBALS['cfg']['Server']['DisableIS'] = false;
-        $GLOBALS['sql_views_as_tables'] = true;
-        $GLOBALS['sql_include_comments'] = true;
-        $GLOBALS['crlf'] = "\n";
-
-        ob_start();
-        $this->assertTrue(
-            $this->object->exportData('db', 'table', "\n", "err.com", "SELECT")
-        );
-        $result = ob_get_clean();
-
-        $this->assertContains(
-            "-- Error reading data: (err)\n",
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportSql::_makeCreateTableMSSQLCompatible
-     *
-     * @return void
-     */
-    public function testMakeCreateTableMSSQLCompatible()
-    {
-
-        $query = "CREATE TABLE IF NOT EXISTS (\" date DEFAULT NULL,\n" .
-            "\" date DEFAULT NULL\n\" date NOT NULL,\n\" date NOT NULL\n," .
-            " \" date NOT NULL DEFAULT 'asd'," .
-            " ) unsigned NOT NULL\n, ) unsigned NOT NULL,\n" .
-            " ) unsigned DEFAULT NULL\n, ) unsigned DEFAULT NULL,\n" .
-            " ) unsigned NOT NULL DEFAULT 'dsa',\n" .
-            " \" int(10) DEFAULT NULL,\n" .
-            " \" tinyint(0) DEFAULT NULL\n" .
-            " \" smallint(10) NOT NULL,\n" .
-            " \" bigint(0) NOT NULL\n" .
-            " \" bigint(0) NOT NULL DEFAULT '12'\n" .
-            " \" float(22,2,) DEFAULT NULL,\n" .
-            " \" double DEFAULT NULL\n" .
-            " \" float(22,2,) NOT NULL,\n" .
-            " \" double NOT NULL\n" .
-            " \" double NOT NULL DEFAULT '213'\n";
-
-        $method = new ReflectionMethod(
-            'PMA\libraries\plugins\export\ExportSql', '_makeCreateTableMSSQLCompatible'
-        );
-        $method->setAccessible(true);
-        $result = $method->invoke(
-            $this->object, $query
-        );
-
-        $this->assertEquals(
-            "CREATE TABLE (\" datetime DEFAULT NULL,\n" .
-            "\" datetime DEFAULT NULL\n" .
-            "\" datetime NOT NULL,\n" .
-            "\" datetime NOT NULL\n" .
-            ", \" datetime NOT NULL DEFAULT 'asd', ) NOT NULL\n" .
-            ", ) NOT NULL,\n" .
-            " ) DEFAULT NULL\n" .
-            ", ) DEFAULT NULL,\n" .
-            " ) NOT NULL DEFAULT 'dsa',\n" .
-            " \" int DEFAULT NULL,\n" .
-            " \" tinyint DEFAULT NULL\n" .
-            " \" smallint NOT NULL,\n" .
-            " \" bigint NOT NULL\n" .
-            " \" bigint NOT NULL DEFAULT '12'\n" .
-            " \" float DEFAULT NULL,\n" .
-            " \" float DEFAULT NULL\n" .
-            " \" float NOT NULL,\n" .
-            " \" float NOT NULL\n" .
-            " \" float NOT NULL DEFAULT '213'\n",
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportSql::initAlias
-     *
-     * @return void
-    */
-    public function testInitAlias()
-    {
-        $aliases = array(
-            'a' => array(
-                'alias' => 'aliastest',
-                'tables' => array(
-                    'foo' => array(
-                        'alias' => 'qwerty'
-                    ),
-                    'bar' => array(
-                        'alias' => 'f'
-                    )
-                )
-            )
-        );
-        $db = 'a';
-        $table = null;
-
-        $this->object->initAlias($aliases, $db, $table);
-        $this->assertEquals('aliastest', $db);
-        $this->assertNull($table);
-
-        $db = 'foo';
-        $table = 'qwerty';
-
-        $this->object->initAlias($aliases, $db, $table);
-        $this->assertEquals('foo', $db);
-        $this->assertEquals('qwerty', $table);
-
-        $db = 'a';
-        $table = 'foo';
-
-        $this->object->initAlias($aliases, $db, $table);
-        $this->assertEquals('aliastest', $db);
-        $this->assertEquals('qwerty', $table);
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportSql::getAlias
-     *
-     * @return void
-    */
-    public function testGetAlias()
-    {
-        $aliases = array(
-            'a' => array(
-                'alias' => 'aliastest',
-                'tables' => array(
-                    'foo' => array(
-                        'alias' => 'qwerty',
-                        'columns' => array(
-                            'baz' => 'p',
-                            'pqr' => 'pphymdain'
-                        )
-                    ),
-                    'bar' => array(
-                        'alias' => 'f',
-                        'columns' => array(
-                            'xy' => 'n'
-                        )
-                    )
-                )
-            )
-        );
-
-        $this->assertEquals(
-            'f', $this->object->getAlias($aliases, 'bar')
-        );
-
-        $this->assertEquals(
-            'aliastest', $this->object->getAlias($aliases, 'a')
-        );
-
-        $this->assertEquals(
-            'pphymdain', $this->object->getAlias($aliases, 'pqr')
-        );
-
-        $this->assertEquals(
-            '', $this->object->getAlias($aliases, 'abc')
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportSql::replaceWithAlias
-     *
-     * @return void
-    */
-    public function testReplaceWithAlias()
-    {
-        $aliases = array(
-            'a' => array(
-                'alias' => 'aliastest',
-                'tables' => array(
-                    'foo' => array(
-                        'alias' => 'bartest',
-                        'columns' => array(
-                            'baz' => 'p',
-                            'pqr' => 'pphymdain'
-                        )
-                    ),
-                    'bar' => array(
-                        'alias' => 'f',
-                        'columns' => array(
-                            'xy' => 'n'
-                        )
-                    )
-                )
-            )
-        );
-
-        $db = 'a';
-        $table = 'foo';
-        $sql_query = "CREATE TABLE IF NOT EXISTS foo (\n"
-            . "baz tinyint(3) unsigned NOT NULL COMMENT 'Primary Key',\n"
-            . "xyz varchar(255) COLLATE latin1_general_ci NOT NULL "
-            . "COMMENT 'xyz',\n"
-            . "pqr varchar(10) COLLATE latin1_general_ci NOT NULL "
-            . "COMMENT 'pqr',\n"
-            . "CONSTRAINT fk_om_dept FOREIGN KEY (baz) "
-            . "REFERENCES dept_master (baz)\n"
-            . ") ENGINE=InnoDB  DEFAULT CHARSET=latin1 COLLATE="
-            . "latin1_general_ci COMMENT='List' AUTO_INCREMENT=5";
-        $result = $this->object->replaceWithAliases(
-            $sql_query, $aliases, $db, $table
-        );
-
-        $this->assertEquals(
-            "CREATE TABLE IF NOT EXISTS `bartest` (\n" .
-            "  `p` tinyint(3) UNSIGNED NOT NULL COMMENT 'Primary Key',\n" .
-            "  `xyz` varchar(255) COLLATE latin1_general_ci NOT NULL COMMENT 'xyz',\n" .
-            "  `pphymdain` varchar(10) COLLATE latin1_general_ci NOT NULL COMMENT 'pqr',\n" .
-            "  CONSTRAINT `fk_om_dept` FOREIGN KEY (`p`) REFERENCES dept_master (`baz`)\n" .
-            ") ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci COMMENT='List'",
-            $result
-        );
-
-        $result = $this->object->replaceWithAliases($sql_query, array(), '', '');
-
-        $this->assertEquals(
-            "CREATE TABLE IF NOT EXISTS foo (\n" .
-            "  `baz` tinyint(3) UNSIGNED NOT NULL COMMENT 'Primary Key',\n" .
-            "  `xyz` varchar(255) COLLATE latin1_general_ci NOT NULL COMMENT 'xyz',\n" .
-            "  `pqr` varchar(10) COLLATE latin1_general_ci NOT NULL COMMENT 'pqr',\n" .
-            "  CONSTRAINT `fk_om_dept` FOREIGN KEY (`baz`) REFERENCES dept_master (`baz`)\n" .
-            ") ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci COMMENT='List'",
-            $result
-        );
-
-        $table = 'bar';
-        $sql_query = "CREATE TRIGGER `BEFORE_bar_INSERT` "
-            . "BEFORE INSERT ON `bar` "
-            . "FOR EACH ROW BEGIN "
-            . "SET @cnt=(SELECT count(*) FROM bar WHERE "
-            . "xy=NEW.xy AND id=NEW.id AND "
-            . "abc=NEW.xy LIMIT 1); "
-            . "IF @cnt<>0 THEN "
-            . "SET NEW.xy=1; "
-            . "END IF; END";
-        $result = $this->object->replaceWithAliases(
-            $sql_query, $aliases, $db, $table
-        );
-
-        $this->assertEquals(
-            "CREATE TRIGGER `BEFORE_bar_INSERT` BEFORE INSERT ON `f` FOR EACH ROW BEGIN " .
-            "SET @cnt=(SELECT count(*) FROM `f` WHERE `n`=NEW.`n` AND id=NEW.id AND abc=NEW.`n` LIMIT 1); " .
-            "IF @cnt<>0 THEN " .
-            "SET NEW.`n`=1; " .
-            "END IF; " .
-            "END",
-            $result
-        );
-    }
-}
diff --git a/#pma/test/classes/plugin/export/ExportTexytextTest.php b/#pma/test/classes/plugin/export/ExportTexytextTest.php
deleted file mode 100644
index 56399e07..00000000
--- a/#pma/test/classes/plugin/export/ExportTexytextTest.php
+++ /dev/null
@@ -1,645 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for PMA\libraries\plugins\export\ExportTexytext class
- *
- * @package PhpMyAdmin-test
- */
-use PMA\libraries\plugins\export\ExportTexytext;
-
-require_once 'libraries/export.lib.php';
-require_once 'libraries/config.default.php';
-require_once 'libraries/relation.lib.php';
-require_once 'libraries/transformations.lib.php';
-require_once 'export.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * tests for PMA\libraries\plugins\export\ExportTexytext class
- *
- * @package PhpMyAdmin-test
- * @group medium
- */
-class ExportTexytextTest extends PMATestCase
-{
-    protected $object;
-
-    /**
-     * Configures global environment.
-     *
-     * @return void
-     */
-    function setup()
-    {
-        $GLOBALS['server'] = 0;
-        $GLOBALS['output_kanji_conversion'] = false;
-        $GLOBALS['buffer_needed'] = false;
-        $GLOBALS['asfile'] = false;
-        $GLOBALS['save_on_server'] = false;
-        $GLOBALS['plugin_param'] = array();
-        $GLOBALS['plugin_param']['export_type'] = 'table';
-        $GLOBALS['plugin_param']['single_table'] = false;
-        $GLOBALS['cfgRelation']['relation'] = true;
-        $this->object = new ExportTexytext();
-    }
-
-    /**
-     * tearDown for test cases
-     *
-     * @return void
-     */
-    public function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportTexytext::setProperties
-     *
-     * @return void
-     */
-    public function testSetProperties()
-    {
-        $method = new ReflectionMethod('PMA\libraries\plugins\export\ExportTexytext', 'setProperties');
-        $method->setAccessible(true);
-        $method->invoke($this->object, null);
-
-        $attrProperties = new ReflectionProperty('PMA\libraries\plugins\export\ExportTexytext', 'properties');
-        $attrProperties->setAccessible(true);
-        $properties = $attrProperties->getValue($this->object);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\plugins\ExportPluginProperties',
-            $properties
-        );
-
-        $this->assertEquals(
-            'Texy! text',
-            $properties->getText()
-        );
-
-        $this->assertEquals(
-            'txt',
-            $properties->getExtension()
-        );
-
-        $this->assertEquals(
-            'text/plain',
-            $properties->getMimeType()
-        );
-
-        $options = $properties->getOptions();
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyRootGroup',
-            $options
-        );
-
-        $this->assertEquals(
-            'Format Specific Options',
-            $options->getName()
-        );
-
-        $generalOptionsArray = $options->getProperties();
-
-        $generalOptions = array_shift($generalOptionsArray);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyMainGroup',
-            $generalOptions
-        );
-
-        $this->assertEquals(
-            'general_opts',
-            $generalOptions->getName()
-        );
-
-        $this->assertEquals(
-            "Dump table",
-            $generalOptions->getText()
-        );
-
-        $generalProperties = $generalOptions->getProperties();
-
-        $property = array_shift($generalProperties);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\RadioPropertyItem',
-            $property
-        );
-
-        $generalOptions = array_shift($generalOptionsArray);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyMainGroup',
-            $generalOptions
-        );
-
-        $this->assertEquals(
-            'data',
-            $generalOptions->getName()
-        );
-
-        $generalProperties = $generalOptions->getProperties();
-
-        $property = array_shift($generalProperties);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
-            $property
-        );
-
-        $this->assertEquals(
-            'columns',
-            $property->getName()
-        );
-
-        $property = array_shift($generalProperties);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\TextPropertyItem',
-            $property
-        );
-
-        $this->assertEquals(
-            'null',
-            $property->getName()
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportTexytext::exportHeader
-     *
-     * @return void
-     */
-    public function testExportHeader()
-    {
-        $this->assertTrue(
-            $this->object->exportHeader()
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportTexytext::exportFooter
-     *
-     * @return void
-     */
-    public function testExportFooter()
-    {
-        $this->assertTrue(
-            $this->object->exportFooter()
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportTexytext::exportDBHeader
-     *
-     * @return void
-     */
-    public function testExportDBHeader()
-    {
-        $this->expectOutputString(
-            "===Database testDb\n\n"
-        );
-        $this->assertTrue(
-            $this->object->exportDBHeader('testDb')
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportTexytext::exportDBFooter
-     *
-     * @return void
-     */
-    public function testExportDBFooter()
-    {
-        $this->assertTrue(
-            $this->object->exportDBFooter('testDB')
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportTexytext::exportDBCreate
-     *
-     * @return void
-     */
-    public function testExportDBCreate()
-    {
-        $this->assertTrue(
-            $this->object->exportDBCreate('testDB', 'database')
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportTexytext::exportData
-     *
-     * @return void
-     */
-    public function testExportData()
-    {
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->once())
-            ->method('query')
-            ->with('SELECT', null, PMA\libraries\DatabaseInterface::QUERY_UNBUFFERED)
-            ->will($this->returnValue(true));
-
-        $dbi->expects($this->once())
-            ->method('numFields')
-            ->with(true)
-            ->will($this->returnValue(3));
-
-        $dbi->expects($this->at(2))
-            ->method('fieldName')
-            ->will($this->returnValue('fName1'));
-
-        $dbi->expects($this->at(3))
-            ->method('fieldName')
-            ->will($this->returnValue('fNa"me2'));
-
-        $dbi->expects($this->at(4))
-            ->method('fieldName')
-            ->will($this->returnValue('fName3'));
-
-        $dbi->expects($this->at(5))
-            ->method('fetchRow')
-            ->with(true)
-            ->will($this->returnValue(array(null, '0', 'test')));
-
-        $GLOBALS['dbi'] = $dbi;
-        $GLOBALS['what'] = 'foo';
-        $GLOBALS['foo_columns'] = "&";
-        $GLOBALS['foo_null'] = ">";
-
-        ob_start();
-        $this->assertTrue(
-            $this->object->exportData(
-                'db', 'ta<ble', "\n", "example.com", "SELECT"
-            )
-        );
-        $result = ob_get_clean();
-
-        $this->assertContains(
-            "|fName1|fNa&amp;quot;me2|fName3",
-            $result
-        );
-
-        $this->assertContains(
-            "|&amp;gt;|0|test",
-            $result
-        );
-
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportTexytext::getTableDefStandIn
-     *
-     * @return void
-     */
-    public function testGetTableDefStandIn()
-    {
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->once())
-            ->method('getColumns')
-            ->with('db', 'view')
-            ->will($this->returnValue(array(1, 2)));
-
-        $keys = array(
-            array(
-                'Non_unique' => 0,
-                'Column_name' => 'cname'
-            ),
-            array(
-                'Non_unique' => 1,
-                'Column_name' => 'cname2'
-            )
-        );
-
-        $dbi->expects($this->once())
-            ->method('getTableIndexes')
-            ->with('db', 'view')
-            ->will($this->returnValue($keys));
-
-        $dbi->expects($this->once())
-            ->method('selectDb')
-            ->with('db');
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $this->object = $this->getMockBuilder('PMA\libraries\plugins\export\ExportTexytext')
-            ->disableOriginalConstructor()
-            ->setMethods(array('formatOneColumnDefinition'))
-            ->getMock();
-
-        $this->object->expects($this->at(0))
-            ->method('formatOneColumnDefinition')
-            ->with(1, array('cname'))
-            ->will($this->returnValue('c1'));
-
-        $this->object->expects($this->at(1))
-            ->method('formatOneColumnDefinition')
-            ->with(2, array('cname'))
-            ->will($this->returnValue('c2'));
-
-        $result = $this->object->getTableDefStandIn('db', 'view', '#');
-
-        $this->assertContains(
-            "c1\nc2",
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportTexytext::getTableDef
-     *
-     * @return void
-     */
-    public function testGetTableDef()
-    {
-        $this->object = $this->getMockBuilder('PMA\libraries\plugins\export\ExportTexytext')
-            ->setMethods(array('formatOneColumnDefinition'))
-            ->getMock();
-        $GLOBALS['controllink'] = null;
-
-        // case 1
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $keys = array(
-            array(
-                'Non_unique' => 0,
-                'Column_name' => 'cname'
-            ),
-            array(
-                'Non_unique' => 1,
-                'Column_name' => 'cname2'
-            )
-        );
-
-        $dbi->expects($this->once())
-            ->method('getTableIndexes')
-            ->with('db', 'table')
-            ->will($this->returnValue($keys));
-
-        $dbi->expects($this->exactly(2))
-            ->method('fetchResult')
-            ->willReturnOnConsecutiveCalls(
-                array(
-                    'fname' => array(
-                        'foreign_table' => '<ftable',
-                        'foreign_field' => 'ffield>'
-                    )
-                ),
-                array(
-                    'fname' => array(
-                        'values' => 'test-',
-                        'transformation' => 'testfoo',
-                        'mimetype' => 'test<'
-                    )
-                )
-            );
-
-        $dbi->expects($this->once())
-            ->method('fetchValue')
-            ->will(
-                $this->returnValue(
-                    'SELECT a FROM b'
-                )
-            );
-
-        $columns = array(
-            'Field' => 'fname',
-            'Comment' => 'comm'
-        );
-
-        $dbi->expects($this->exactly(2))
-            ->method('getColumns')
-            ->with('db', 'table')
-            ->will($this->returnValue(array($columns)));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $this->object->expects($this->exactly(1))
-            ->method('formatOneColumnDefinition')
-            ->with(array('Field' => 'fname', 'Comment' => 'comm'), array('cname'))
-            ->will($this->returnValue(1));
-
-        $GLOBALS['cfgRelation']['relation'] = true;
-        $_SESSION['relation'][0] = array(
-            'PMA_VERSION' => PMA_VERSION,
-            'relwork' => true,
-            'commwork' => true,
-            'mimework' => true,
-            'db' => 'db',
-            'relation' => 'rel',
-            'column_info' => 'col'
-        );
-
-        $result = $this->object->getTableDef(
-            'db',
-            'table',
-            "\n",
-            "example.com",
-            true,
-            true,
-            true
-        );
-
-        $this->assertContains(
-            '1|&lt;ftable (ffield&gt;)|comm|Test&lt;',
-            $result
-        );
-    }
-
-     /**
-     * Test for PMA\libraries\plugins\export\ExportTexytext::getTriggers
-     *
-     * @return void
-     */
-    public function testGetTriggers()
-    {
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $triggers = array(
-            array(
-                'name' => 'tna"me',
-                'action_timing' => 'ac>t',
-                'event_manipulation' => 'manip&',
-                'definition' => 'def'
-            )
-        );
-
-        $dbi->expects($this->once())
-            ->method('getTriggers')
-            ->with('database', 'ta<ble')
-            ->will($this->returnValue($triggers));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $result = $this->object->getTriggers('database', 'ta<ble');
-
-        $this->assertContains(
-            '|tna"me|ac>t|manip&|def',
-            $result
-        );
-
-        $this->assertContains(
-            '|Name|Time|Event|Definition',
-            $result
-        );
-
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportTexytext::exportStructure
-     *
-     * @return void
-     */
-    public function testExportStructure()
-    {
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->once())
-            ->method('getTriggers')
-            ->with('db', 't&bl')
-            ->will($this->returnValue(1));
-
-        $this->object = $this->getMockBuilder('PMA\libraries\plugins\export\ExportTexytext')
-            ->setMethods(array('getTableDef', 'getTriggers', 'getTableDefStandIn'))
-            ->getMock();
-
-        $this->object->expects($this->at(0))
-            ->method('getTableDef')
-            ->with('db', 't&bl', "\n", "example.com", false, false, false, false)
-            ->will($this->returnValue('dumpText1'));
-
-        $this->object->expects($this->once())
-            ->method('getTriggers')
-            ->with('db', 't&bl')
-            ->will($this->returnValue('dumpText2'));
-
-        $this->object->expects($this->at(2))
-            ->method('getTableDef')
-            ->with(
-                'db', 't&bl', "\n", "example.com",
-                false, false, false, false, true, true
-            )
-            ->will($this->returnValue('dumpText3'));
-
-        $this->object->expects($this->once())
-            ->method('getTableDefStandIn')
-            ->with('db', 't&bl', "\n")
-            ->will($this->returnValue('dumpText4'));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        // case 1
-        ob_start();
-        $this->assertTrue(
-            $this->object->exportStructure(
-                'db', 't&bl', "\n", "example.com", "create_table", "test"
-            )
-        );
-        $result = ob_get_clean();
-
-        $this->assertContains(
-            '== Table structure for table t&amp;bl' . "\n\ndumpText1",
-            $result
-        );
-
-        // case 2
-        ob_start();
-        $this->assertTrue(
-            $this->object->exportStructure(
-                'db', 't&bl', "\n", "example.com", "triggers", "test"
-            )
-        );
-        $result = ob_get_clean();
-
-        $this->assertEquals(
-            '== Triggers t&amp;bl' . "\n\ndumpText2",
-            $result
-        );
-
-        // case 3
-        ob_start();
-        $this->assertTrue(
-            $this->object->exportStructure(
-                'db', 't&bl', "\n", "example.com", "create_view", "test"
-            )
-        );
-        $result = ob_get_clean();
-
-        $this->assertEquals(
-            '== Structure for view t&amp;bl' . "\n\ndumpText3",
-            $result
-        );
-
-        // case 4
-        ob_start();
-        $this->assertTrue(
-            $this->object->exportStructure(
-                'db', 't&bl', "\n", "example.com", "stand_in", "test"
-            )
-        );
-        $result = ob_get_clean();
-
-        $this->assertEquals(
-            '== Stand-in structure for view t&amp;bl' . "\n\ndumpText4",
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportTexytext::formatOneColumnDefinition
-     *
-     * @return void
-     */
-    public function testFormatOneColumnDefinition()
-    {
-        $cols = array(
-            'Null' => 'Yes',
-            'Field' => 'field',
-            'Key' => 'PRI',
-            'Type' => 'set(abc)enum123'
-        );
-
-        $unique_keys = array(
-            'field'
-        );
-
-        $this->assertEquals(
-            '|//**field**//|set(abc)|Yes|NULL',
-            $this->object->formatOneColumnDefinition($cols, $unique_keys)
-        );
-
-        $cols = array(
-            'Null' => 'NO',
-            'Field' => 'fields',
-            'Key' => 'COMP',
-            'Type' => '',
-            'Default' => 'def'
-        );
-
-        $unique_keys = array(
-            'field'
-        );
-
-        $this->assertEquals(
-            '|fields|&amp;nbsp;|No|def',
-            $this->object->formatOneColumnDefinition($cols, $unique_keys)
-        );
-    }
-}
diff --git a/#pma/test/classes/plugin/export/ExportXmlTest.php b/#pma/test/classes/plugin/export/ExportXmlTest.php
deleted file mode 100644
index 1d1bc147..00000000
--- a/#pma/test/classes/plugin/export/ExportXmlTest.php
+++ /dev/null
@@ -1,564 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for PMA\libraries\plugins\export\ExportXml class
- *
- * @package PhpMyAdmin-test
- */
-use PMA\libraries\plugins\export\ExportXml;
-use PMA\libraries\Table;
-
-$GLOBALS['db'] = 'db';
-
-require_once 'libraries/export.lib.php';
-require_once 'libraries/config.default.php';
-require_once 'export.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * tests for PMA\libraries\plugins\export\ExportXml class
- *
- * @package PhpMyAdmin-test
- * @group medium
- */
-class ExportXmlTest extends PMATestCase
-{
-    protected $object;
-
-    /**
-     * Configures global environment.
-     *
-     * @return void
-     */
-    function setup()
-    {
-        $GLOBALS['server'] = 0;
-        $GLOBALS['output_kanji_conversion'] = false;
-        $GLOBALS['buffer_needed'] = false;
-        $GLOBALS['asfile'] = false;
-        $GLOBALS['save_on_server'] = false;
-        $GLOBALS['plugin_param'] = array();
-        $GLOBALS['plugin_param']['export_type'] = 'table';
-        $GLOBALS['plugin_param']['single_table'] = false;
-        $GLOBALS['cfgRelation']['relation'] = true;
-        $this->object = new ExportXml();
-    }
-
-    /**
-     * tearDown for test cases
-     *
-     * @return void
-     */
-    public function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportXml::setProperties
-     *
-     * @return void
-     * @group medium
-     */
-    public function testSetProperties()
-    {
-        $method = new ReflectionMethod('PMA\libraries\plugins\export\ExportXml', 'setProperties');
-        $method->setAccessible(true);
-        $method->invoke($this->object, null);
-
-        $attrProperties = new ReflectionProperty('PMA\libraries\plugins\export\ExportXml', 'properties');
-        $attrProperties->setAccessible(true);
-        $properties = $attrProperties->getValue($this->object);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\plugins\ExportPluginProperties',
-            $properties
-        );
-
-        $this->assertEquals(
-            'XML',
-            $properties->getText()
-        );
-
-        $this->assertEquals(
-            'xml',
-            $properties->getExtension()
-        );
-
-        $this->assertEquals(
-            'text/xml',
-            $properties->getMimeType()
-        );
-
-        $options = $properties->getOptions();
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyRootGroup',
-            $options
-        );
-
-        $this->assertEquals(
-            'Format Specific Options',
-            $options->getName()
-        );
-
-        $generalOptionsArray = $options->getProperties();
-
-        $generalOptions = array_shift($generalOptionsArray);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyMainGroup',
-            $generalOptions
-        );
-
-        $this->assertEquals(
-            'general_opts',
-            $generalOptions->getName()
-        );
-
-        $generalProperties = $generalOptions->getProperties();
-
-        $property = array_shift($generalProperties);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\HiddenPropertyItem',
-            $property
-        );
-
-        $generalOptions = array_shift($generalOptionsArray);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyMainGroup',
-            $generalOptions
-        );
-
-        $this->assertEquals(
-            'structure',
-            $generalOptions->getName()
-        );
-
-        $generalProperties = $generalOptions->getProperties();
-
-        $property = array_shift($generalProperties);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
-            $property
-        );
-
-        $property = array_shift($generalProperties);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
-            $property
-        );
-
-        $property = array_shift($generalProperties);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
-            $property
-        );
-
-        $property = array_shift($generalProperties);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
-            $property
-        );
-
-        $property = array_shift($generalProperties);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
-            $property
-        );
-
-        $generalOptions = array_shift($generalOptionsArray);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyMainGroup',
-            $generalOptions
-        );
-
-        $this->assertEquals(
-            'data',
-            $generalOptions->getName()
-        );
-
-        $generalProperties = $generalOptions->getProperties();
-
-        $property = array_shift($generalProperties);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\BoolPropertyItem',
-            $property
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportXml::exportHeader
-     *
-     * @return void
-     * @group medium
-     */
-    public function testExportHeader()
-    {
-        if (!defined("PMA_MYSQL_STR_VERSION")) {
-            define("PMA_MYSQL_STR_VERSION", "5.0.0");
-        }
-
-        $GLOBALS['xml_export_functions'] = 1;
-        $GLOBALS['xml_export_contents'] = 1;
-        $GLOBALS['output_charset_conversion'] = 1;
-        $GLOBALS['charset'] = 'iso-8859-1';
-        $GLOBALS['cfg']['Server']['port'] = 80;
-        $GLOBALS['cfg']['Server']['host'] = 'localhost';
-        $GLOBALS['cfg']['Server']['DisableIS'] = false;
-        $GLOBALS['xml_export_tables'] = 1;
-        $GLOBALS['xml_export_triggers'] = 1;
-        $GLOBALS['xml_export_procedures'] = 1;
-        $GLOBALS['xml_export_functions'] = 1;
-        $GLOBALS['crlf'] = "\n";
-        $GLOBALS['db'] = 'd<"b';
-
-        $result = array(
-            0 => array(
-                'DEFAULT_COLLATION_NAME' => 'utf8_general_ci',
-                'DEFAULT_CHARACTER_SET_NAME' => 'utf-8',
-
-            ),
-            'table' => array(null, '"tbl"')
-        );
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->exactly(3))
-            ->method('fetchResult')
-            ->willReturnOnConsecutiveCalls(
-                $result,
-                $result,
-                false
-            );
-
-        $dbi->expects($this->once())
-            ->method('getTriggers')
-            ->with('d<"b', 'table')
-            ->will(
-                $this->returnValue(
-                    array(
-                        array(
-                            'create' => 'crt',
-                            'name' => 'trname'
-                        )
-                    )
-                )
-            );
-
-        $dbi->expects($this->exactly(2))
-            ->method('getProceduresOrFunctions')
-            ->willReturnOnConsecutiveCalls(
-                array(
-                    'fn'
-                ),
-                array(
-                    'pr'
-                )
-            );
-
-        $dbi->expects($this->exactly(2))
-            ->method('getDefinition')
-            ->willReturnOnConsecutiveCalls(
-                'fndef',
-                'prdef'
-            );
-
-        $dbi->expects($this->once())
-            ->method('getTable')
-            ->will($this->returnValue(new Table('table', 'd<"b', $dbi)));
-        $dbi->expects($this->any())->method('escapeString')
-            ->will($this->returnArgument(0));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $GLOBALS['tables'] = array();
-        $GLOBALS['table'] = 'table';
-
-        ob_start();
-        $this->assertTrue(
-            $this->object->exportHeader()
-        );
-        $result = ob_get_clean();
-
-        $this->assertContains(
-            '&lt;pma_xml_export version=&quot;1.0&quot; xmlns:pma=&quot;' .
-            'https://www.phpmyadmin.net/some_doc_url/&quot;&gt;',
-            $result
-        );
-
-        $this->assertContains(
-            '&lt;pma:structure_schemas&gt;' . "\n" .
-            '        &lt;pma:database name=&quot;d&amp;lt;&amp;quot;b&quot; collat' .
-            'ion=&quot;utf8_general_ci&quot; charset=&quot;utf-8&quot;&gt;' . "\n" .
-            '            &lt;pma:table name=&quot;table&quot;&gt;' . "\n" .
-            '                &amp;quot;tbl&amp;quot;;' . "\n" .
-            '            &lt;/pma:table&gt;' . "\n" .
-            '            &lt;pma:trigger name=&quot;trname&quot;&gt;' . "\n" .
-            '                ' . "\n" .
-            '            &lt;/pma:trigger&gt;' . "\n" .
-            '            &lt;pma:function name=&quot;fn&quot;&gt;' . "\n" .
-            '                fndef' . "\n" .
-            '            &lt;/pma:function&gt;' . "\n" .
-            '            &lt;pma:procedure name=&quot;pr&quot;&gt;' . "\n" .
-            '                prdef' . "\n" .
-            '            &lt;/pma:procedure&gt;' . "\n" .
-            '        &lt;/pma:database&gt;' . "\n" .
-            '    &lt;/pma:structure_schemas&gt;',
-            $result
-        );
-
-        // case 2 with isView as true and false
-
-        unset($GLOBALS['xml_export_contents']);
-        unset($GLOBALS['xml_export_views']);
-        unset($GLOBALS['xml_export_tables']);
-        unset($GLOBALS['xml_export_functions']);
-        unset($GLOBALS['xml_export_procedures']);
-        $GLOBALS['output_charset_conversion'] = 0;
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $result_1 = array(
-            array(
-                'DEFAULT_COLLATION_NAME' => 'utf8_general_ci',
-                'DEFAULT_CHARACTER_SET_NAME' => 'utf-8',
-
-            )
-        );
-        $result_2 = array(
-            't1' => array(null, '"tbl"')
-        );
-
-        $result_3 = array(
-            't2' => array(null, '"tbl"')
-        );
-
-
-        $dbi->expects($this->exactly(5))
-            ->method('fetchResult')
-            ->willReturnOnConsecutiveCalls(
-                $result_1,
-                $result_2,
-                true,
-                $result_3,
-                false
-            );
-
-        $dbi->expects($this->any())
-            ->method('getTable')
-            ->will($this->returnValue(new Table('table', 'd<"b', $dbi)));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $GLOBALS['tables'] = array('t1', 't2');
-
-        ob_start();
-        $this->assertTrue(
-            $this->object->exportHeader()
-        );
-        $result = ob_get_clean();
-
-        //echo $result; die;
-        $this->assertContains(
-            '&lt;pma:structure_schemas&gt;' . "\n" .
-            '        &lt;pma:database name=&quot;d&amp;lt;&amp;quot;b&quot; collat' .
-            'ion=&quot;utf8_general_ci&quot; charset=&quot;utf-8&quot;&gt;' . "\n" .
-            '        &lt;/pma:database&gt;' . "\n" .
-            '    &lt;/pma:structure_schemas&gt;',
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportXml::exportFooter
-     *
-     * @return void
-     */
-    public function testExportFooter()
-    {
-        $this->expectOutputString(
-            '&lt;/pma_xml_export&gt;'
-        );
-        $this->assertTrue(
-            $this->object->exportFooter()
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportXml::exportDBHeader
-     *
-     * @return void
-     */
-    public function testExportDBHeader()
-    {
-        $GLOBALS['xml_export_contents'] = true;
-
-        ob_start();
-        $this->assertTrue(
-            $this->object->exportDBHeader('&db')
-        );
-        $result = ob_get_clean();
-
-        $this->assertContains(
-            '&lt;database name=&quot;&amp;amp;db&quot;&gt;',
-            $result
-        );
-
-        $GLOBALS['xml_export_contents'] = false;
-
-        $this->assertTrue(
-            $this->object->exportDBHeader('&db')
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportXml::exportDBFooter
-     *
-     * @return void
-     */
-    public function testExportDBFooter()
-    {
-        $GLOBALS['xml_export_contents'] = true;
-
-        ob_start();
-        $this->assertTrue(
-            $this->object->exportDBFooter('&db')
-        );
-        $result = ob_get_clean();
-
-        $this->assertContains(
-            '&lt;/database&gt;',
-            $result
-        );
-
-        $GLOBALS['xml_export_contents'] = false;
-
-        $this->assertTrue(
-            $this->object->exportDBFooter('&db')
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportXml::exportDBCreate
-     *
-     * @return void
-     */
-    public function testExportDBCreate()
-    {
-        $this->assertTrue(
-            $this->object->exportDBCreate('testDB', 'database')
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportXml::exportData
-     *
-     * @return void
-     */
-    public function testExportData()
-    {
-        $GLOBALS['xml_export_contents'] = true;
-        $GLOBALS['asfile'] = true;
-        $GLOBALS['output_charset_conversion'] = false;
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $_table = $this->getMockBuilder('PMA\libraries\Table')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $_table->expects($this->once())
-            ->method('isMerge')
-            ->will($this->returnValue(false));
-
-        $dbi->expects($this->any())
-            ->method('getTable')
-            ->will($this->returnValue($_table));
-
-        $dbi->expects($this->once())
-            ->method('getTable')
-            ->will($this->returnValue($_table));
-
-        $dbi->expects($this->once())
-            ->method('query')
-            ->with('SELECT', null, PMA\libraries\DatabaseInterface::QUERY_UNBUFFERED)
-            ->will($this->returnValue(true));
-
-        $dbi->expects($this->once())
-            ->method('numFields')
-            ->with(true)
-            ->will($this->returnValue(3));
-
-        $dbi->expects($this->at(3))
-            ->method('fieldName')
-            ->will($this->returnValue('fName1'));
-
-        $dbi->expects($this->at(4))
-            ->method('fieldName')
-            ->will($this->returnValue('fNa"me2'));
-
-        $dbi->expects($this->at(5))
-            ->method('fieldName')
-            ->will($this->returnValue('fNa\\me3'));
-
-        $dbi->expects($this->at(6))
-            ->method('fetchRow')
-            ->with(true)
-            ->will($this->returnValue(array(null, '<a>')));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        ob_start();
-        $this->assertTrue(
-            $this->object->exportData(
-                'db', 'ta<ble', "\n", "example.com", "SELECT"
-            )
-        );
-        $result = ob_get_clean();
-
-        $this->assertContains(
-            "<!-- Table ta&lt;ble -->",
-            $result
-        );
-
-        $this->assertContains(
-            "<table name=\"ta&lt;ble\">",
-            $result
-        );
-
-        $this->assertContains(
-            "<column name=\"fName1\">NULL</column>",
-            $result
-        );
-
-        $this->assertContains(
-            "<column name=\"fNa&quot;me2\">&lt;a&gt;" .
-            "</column>",
-            $result
-        );
-
-        $this->assertContains(
-            "<column name=\"fName3\">NULL</column>",
-            $result
-        );
-
-        $this->assertContains(
-            "</table>",
-            $result
-        );
-    }
-}
diff --git a/#pma/test/classes/plugin/export/ExportYamlTest.php b/#pma/test/classes/plugin/export/ExportYamlTest.php
deleted file mode 100644
index cc747d58..00000000
--- a/#pma/test/classes/plugin/export/ExportYamlTest.php
+++ /dev/null
@@ -1,268 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for PMA\libraries\plugins\export\ExportYaml class
- *
- * @package PhpMyAdmin-test
- */
-use PMA\libraries\plugins\export\ExportYaml;
-
-require_once 'libraries/export.lib.php';
-require_once 'libraries/config.default.php';
-require_once 'libraries/database_interface.inc.php';
-require_once 'export.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * tests for PMA\libraries\plugins\export\ExportYaml class
- *
- * @package PhpMyAdmin-test
- * @group medium
- */
-class ExportYamlTest extends PMATestCase
-{
-    protected $object;
-
-    /**
-     * Configures global environment.
-     *
-     * @return void
-     */
-    function setup()
-    {
-        $GLOBALS['server'] = 0;
-        $GLOBALS['output_kanji_conversion'] = false;
-        $GLOBALS['buffer_needed'] = false;
-        $GLOBALS['asfile'] = false;
-        $GLOBALS['save_on_server'] = false;
-        $GLOBALS['crlf'] = "\n";
-        $GLOBALS['cfgRelation']['relation'] = true;
-        $this->object = new ExportYaml();
-    }
-
-    /**
-     * tearDown for test cases
-     *
-     * @return void
-     */
-    public function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportYaml::setProperties
-     *
-     * @return void
-     */
-    public function testSetProperties()
-    {
-        $method = new ReflectionMethod('PMA\libraries\plugins\export\ExportYaml', 'setProperties');
-        $method->setAccessible(true);
-        $method->invoke($this->object, null);
-
-        $attrProperties = new ReflectionProperty('PMA\libraries\plugins\export\ExportYaml', 'properties');
-        $attrProperties->setAccessible(true);
-        $properties = $attrProperties->getValue($this->object);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\plugins\ExportPluginProperties',
-            $properties
-        );
-
-        $this->assertEquals(
-            'YAML',
-            $properties->getText()
-        );
-
-        $this->assertEquals(
-            'yml',
-            $properties->getExtension()
-        );
-
-        $this->assertEquals(
-            'text/yaml',
-            $properties->getMimeType()
-        );
-
-        $options = $properties->getOptions();
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyRootGroup',
-            $options
-        );
-
-        $this->assertEquals(
-            'Format Specific Options',
-            $options->getName()
-        );
-
-        $generalOptionsArray = $options->getProperties();
-
-        $generalOptions = array_shift($generalOptionsArray);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\groups\OptionsPropertyMainGroup',
-            $generalOptions
-        );
-
-        $this->assertEquals(
-            'general_opts',
-            $generalOptions->getName()
-        );
-
-        $generalProperties = $generalOptions->getProperties();
-
-        $property = array_shift($generalProperties);
-
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\items\HiddenPropertyItem',
-            $property
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportYaml::exportHeader
-     *
-     * @return void
-     */
-    public function testExportHeader()
-    {
-        ob_start();
-        $this->assertTrue(
-            $this->object->exportHeader()
-        );
-        $result = ob_get_clean();
-
-        $this->assertContains(
-            "%YAML 1.1\n---\n",
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportYaml::exportFooter
-     *
-     * @return void
-     */
-    public function testExportFooter()
-    {
-        $this->expectOutputString(
-            "...\n"
-        );
-        $this->assertTrue(
-            $this->object->exportFooter()
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportYaml::exportDBHeader
-     *
-     * @return void
-     */
-    public function testExportDBHeader()
-    {
-        $this->assertTrue(
-            $this->object->exportDBHeader('&db')
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportYaml::exportDBFooter
-     *
-     * @return void
-     */
-    public function testExportDBFooter()
-    {
-        $this->assertTrue(
-            $this->object->exportDBFooter('&db')
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportYaml::exportDBCreate
-     *
-     * @return void
-     */
-    public function testExportDBCreate()
-    {
-        $this->assertTrue(
-            $this->object->exportDBCreate('testDB', 'database')
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\ExportYaml::exportData
-     *
-     * @return void
-     */
-    public function testExportData()
-    {
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->once())
-            ->method('query')
-            ->with('SELECT', null, PMA\libraries\DatabaseInterface::QUERY_UNBUFFERED)
-            ->will($this->returnValue(true));
-
-        $dbi->expects($this->once())
-            ->method('numFields')
-            ->with(true)
-            ->will($this->returnValue(4));
-
-        $dbi->expects($this->at(2))
-            ->method('fieldName')
-            ->will($this->returnValue('fName1'));
-
-        $dbi->expects($this->at(3))
-            ->method('fieldName')
-            ->will($this->returnValue('fNa"me2'));
-
-        $dbi->expects($this->at(4))
-            ->method('fieldName')
-            ->will($this->returnValue('fNa\\me3'));
-
-        $dbi->expects($this->at(5))
-            ->method('fieldName')
-            ->will($this->returnValue('fName4'));
-
-        $dbi->expects($this->at(6))
-            ->method('fetchRow')
-            ->with(true)
-            ->will(
-                $this->returnValue(
-                    array(null, '123', "\"c\\a\nb\r")
-                )
-            );
-
-        $dbi->expects($this->at(7))
-            ->method('fetchRow')
-            ->with(true)
-            ->will(
-                $this->returnValue(
-                    array(null)
-                )
-            );
-
-        $GLOBALS['dbi'] = $dbi;
-
-        ob_start();
-        $this->assertTrue(
-            $this->object->exportData(
-                'db', 'ta<ble', "\n", "example.com", "SELECT"
-            )
-        );
-        $result = ob_get_clean();
-
-        $this->assertEquals(
-            '# db.ta&lt;ble' . "\n" .
-            '-' . "\n" .
-            '  fNa&quot;me2: 123' . "\n" .
-            '  fName3: &quot;\&quot;c\\\\a\nb\r&quot;' . "\n" .
-            '-' . "\n",
-            $result
-        );
-    }
-}
diff --git a/#pma/test/classes/plugin/export/TablePropertyTest.php b/#pma/test/classes/plugin/export/TablePropertyTest.php
deleted file mode 100644
index f23540c0..00000000
--- a/#pma/test/classes/plugin/export/TablePropertyTest.php
+++ /dev/null
@@ -1,343 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for PMA\libraries\plugins\export\TableProperty class
- *
- * @package PhpMyAdmin-test
- */
-use PMA\libraries\plugins\export\TableProperty;
-
-require_once 'libraries/config.default.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * tests for PMA\libraries\plugins\export\TableProperty class
- *
- * @package PhpMyAdmin-test
- */
-class TablePropertyTest extends PMATestCase
-{
-    protected $object;
-
-    /**
-     * Configures global environment.
-     *
-     * @return void
-     */
-    function setup()
-    {
-        $GLOBALS['server'] = 0;
-        $row = array(' name ', 'int ', true, ' PRI', '0', 'mysql');
-        $this->object = new TableProperty($row);
-    }
-
-    /**
-     * tearDown for test cases
-     *
-     * @return void
-     */
-    public function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\TableProperty::__construct
-     *
-     * @return void
-    */
-    public function testConstructor()
-    {
-        $this->assertEquals(
-            'name',
-            $this->object->name
-        );
-
-        $this->assertEquals(
-            'int',
-            $this->object->type
-        );
-
-        $this->assertEquals(
-            1,
-            $this->object->nullable
-        );
-
-        $this->assertEquals(
-            'PRI',
-            $this->object->key
-        );
-
-        $this->assertEquals(
-            '0',
-            $this->object->defaultValue
-        );
-
-        $this->assertEquals(
-            'mysql',
-            $this->object->ext
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\TableProperty::getPureType
-     *
-     * @return void
-    */
-    public function testGetPureType()
-    {
-        $this->object->type = "int(10)";
-
-        $this->assertEquals(
-            "int",
-            $this->object->getPureType()
-        );
-
-        $this->object->type = "char";
-
-        $this->assertEquals(
-            "char",
-            $this->object->getPureType()
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\TableProperty::isNotNull
-     *
-     * @param string $nullable nullable value
-     * @param string $expected expected output
-     *
-     * @return void
-     * @dataProvider isNotNullProvider
-     */
-    public function testIsNotNull($nullable, $expected)
-    {
-        $this->object->nullable = $nullable;
-
-        $this->assertEquals(
-            $expected,
-            $this->object->isNotNull()
-        );
-    }
-
-    /**
-     * Data provider for testIsNotNull
-     *
-     * @return array Test Data
-     */
-    public function isNotNullProvider()
-    {
-        return array(
-            array("NO", "true"),
-            array("", "false"),
-            array("no", "false")
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\TableProperty::isUnique
-     *
-     * @param string $key      key value
-     * @param string $expected expected output
-     *
-     * @return void
-     * @dataProvider isUniqueProvider
-     */
-    public function testIsUnique($key, $expected)
-    {
-        $this->object->key = $key;
-
-        $this->assertEquals(
-            $expected,
-            $this->object->isUnique()
-        );
-    }
-
-    /**
-     * Data provider for testIsUnique
-     *
-     * @return array Test Data
-     */
-    public function isUniqueProvider()
-    {
-        return array(
-            array("PRI", "true"),
-            array("UNI", "true"),
-            array("", "false"),
-            array("pri", "false"),
-            array("uni", "false"),
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\TableProperty::getDotNetPrimitiveType
-     *
-     * @param string $type     type value
-     * @param string $expected expected output
-     *
-     * @return void
-     * @dataProvider getDotNetPrimitiveTypeProvider
-     */
-    public function testGetDotNetPrimitiveType($type, $expected)
-    {
-        $this->object->type = $type;
-
-        $this->assertEquals(
-            $expected,
-            $this->object->getDotNetPrimitiveType()
-        );
-    }
-
-    /**
-     * Data provider for testGetDotNetPrimitiveType
-     *
-     * @return array Test Data
-     */
-    public function getDotNetPrimitiveTypeProvider()
-    {
-        return array(
-            array("int", "int"),
-            array("long", "long"),
-            array("char", "string"),
-            array("varchar", "string"),
-            array("text", "string"),
-            array("longtext", "string"),
-            array("tinyint", "bool"),
-            array("datetime", "DateTime"),
-            array("", "unknown"),
-            array("dummy", "unknown"),
-            array("INT", "unknown")
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\TableProperty::getDotNetObjectType
-     *
-     * @param string $type     type value
-     * @param string $expected expected output
-     *
-     * @return void
-     * @dataProvider getDotNetObjectTypeProvider
-     */
-    public function testGetDotNetObjectType($type, $expected)
-    {
-        $this->object->type = $type;
-
-        $this->assertEquals(
-            $expected,
-            $this->object->getDotNetObjectType()
-        );
-    }
-
-    /**
-     * Data provider for testGetDotNetObjectType
-     *
-     * @return array Test Data
-     */
-    public function getDotNetObjectTypeProvider()
-    {
-        return array(
-            array("int", "Int32"),
-            array("long", "Long"),
-            array("char", "String"),
-            array("varchar", "String"),
-            array("text", "String"),
-            array("longtext", "String"),
-            array("tinyint", "Boolean"),
-            array("datetime", "DateTime"),
-            array("", "Unknown"),
-            array("dummy", "Unknown"),
-            array("INT", "Unknown")
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\TableProperty::getIndexName
-     *
-     * @return void
-     */
-    public function testGetIndexName()
-    {
-        $this->object->name = "ä'7<ab>";
-        $this->object->key = "PRI";
-
-        $this->assertEquals(
-            "index=\"ä'7&lt;ab&gt;\"",
-            $this->object->getIndexName()
-        );
-
-        $this->object->key = "";
-
-        $this->assertEquals(
-            "",
-            $this->object->getIndexName()
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\TableProperty::isPK
-     *
-     * @return void
-     */
-    public function testIsPK()
-    {
-        $this->object->key = "PRI";
-
-        $this->assertTrue(
-            $this->object->isPK()
-        );
-
-        $this->object->key = "";
-
-        $this->assertFalse(
-            $this->object->isPK()
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\TableProperty::formatCs
-     *
-     * @return void
-    */
-    public function testFormatCs()
-    {
-        $this->object->name = 'Name#name#123';
-
-        $this->assertEquals(
-            'text123Namename',
-            $this->object->formatCs("text123#name#")
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\TableProperty::formatXml
-     *
-     * @return void
-    */
-    public function testFormatXml()
-    {
-        $this->object->name = '"a\'';
-
-        $this->assertEquals(
-            '&quot;a\'index="&quot;a\'"',
-            $this->object->formatXml("#name##indexName#")
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\plugins\export\TableProperty::format
-     *
-     * @return void
-    */
-    public function testFormat()
-    {
-        $this->assertEquals(
-            'NameintInt32intfalsetrue',
-            $this->object->format(
-                "#ucfirstName##dotNetPrimitiveType##dotNetObjectType##type#" .
-                "#notNull##unique#"
-            )
-        );
-    }
-
-}
diff --git a/#pma/test/classes/plugin/import/ImportCsvTest.php b/#pma/test/classes/plugin/import/ImportCsvTest.php
deleted file mode 100644
index cc6c5fe9..00000000
--- a/#pma/test/classes/plugin/import/ImportCsvTest.php
+++ /dev/null
@@ -1,202 +0,0 @@
-<?php
-/**
- * Tests for PMA\libraries\plugins\import\ImportCsv class
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * we must set $GLOBALS['server'] here
- * since 'check_user_privileges.lib.php' will use it globally
- */
-use PMA\libraries\plugins\import\ImportCsv;
-use PMA\libraries\Theme;
-
-$GLOBALS['server'] = 0;
-
-/*
- * Include to test.
- */
-require_once 'libraries/url_generating.lib.php';
-require_once 'libraries/database_interface.inc.php';
-require_once 'libraries/import.lib.php';
-require_once 'libraries/sanitizing.lib.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * Tests for PMA\libraries\plugins\import\ImportCsv class
- *
- * @package PhpMyAdmin-test
- */
-class ImportCsvTest extends PMATestCase
-{
-    /**
-     * @var ImportCsv
-     * @access protected
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function setUp()
-    {
-        $GLOBALS['plugin_param'] = "csv";
-        $this->object = new ImportCsv();
-
-        unset($GLOBALS['db']);
-
-        //setting
-        $GLOBALS['finished'] = false;
-        $GLOBALS['read_limit'] = 100000000;
-        $GLOBALS['offset'] = 0;
-        $GLOBALS['cfg']['Server']['DisableIS'] = false;
-
-        $GLOBALS['import_file'] = 'test/test_data/db_test.csv';
-        $GLOBALS['import_text'] = 'ImportCsv_Test';
-        $GLOBALS['compression'] = 'none';
-        $GLOBALS['read_multiply'] = 10;
-        $GLOBALS['import_type'] = 'Xml';
-        $GLOBALS['pmaThemeImage'] = 'image';
-        $GLOBALS['import_handle'] = @fopen($GLOBALS['import_file'], 'r');
-
-        //separator for csv
-        $GLOBALS['csv_terminated'] = "\015";
-        $GLOBALS['csv_enclosed'] = '"';
-        $GLOBALS['csv_escaped'] = '"';
-        $GLOBALS['csv_new_line'] = 'auto';
-
-        //$_SESSION
-        $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
-        $_SESSION['PMA_Theme'] = new Theme();
-
-        //Mock DBI
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $GLOBALS['dbi'] = $dbi;
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Test for getProperties
-     *
-     * @return void
-     *
-     * @group medium
-     */
-    public function testGetProperties()
-    {
-        $properties = $this->object->getProperties();
-        $this->assertEquals(
-            __('CSV'),
-            $properties->getText()
-        );
-        $this->assertEquals(
-            'csv',
-            $properties->getExtension()
-        );
-    }
-
-    /**
-     * Test for doImport
-     *
-     * @return void
-     *
-     * @group medium
-     */
-    public function testDoImport()
-    {
-        //$sql_query_disabled will show the import SQL detail
-        global $sql_query, $sql_query_disabled;
-        $sql_query_disabled = false;
-
-        //Test function called
-        $this->object->doImport();
-
-        //asset that all sql are executed
-        $this->assertContains(
-            'CREATE DATABASE IF NOT EXISTS `CSV_DB` DEFAULT CHARACTER',
-            $sql_query
-        );
-        $this->assertContains(
-            'CREATE TABLE IF NOT EXISTS `CSV_DB`.`TBL_NAME`',
-            $sql_query
-        );
-
-        $this->assertEquals(
-            true,
-            $GLOBALS['finished']
-        );
-    }
-
-    /**
-     * Test for getProperties for Table param
-     *
-     * @return void
-     *
-     * @group medium
-     */
-    public function testGetPropertiesForTable()
-    {
-        $GLOBALS['plugin_param'] = 'table';
-        $this->object = new ImportCsv();
-        $properties = $this->object->getProperties();
-        $this->assertEquals(
-            __('CSV'),
-            $properties->getText()
-        );
-        $this->assertEquals(
-            'csv',
-            $properties->getExtension()
-        );
-    }
-
-    /**
-     * Test for doImport for _getAnalyze = false, should be OK as well
-     *
-     * @return void
-     *
-     * @group medium
-     */
-    public function testDoImportNotAnalysis()
-    {
-        //$sql_query_disabled will show the import SQL detail
-        global $sql_query, $sql_query_disabled;
-        $sql_query_disabled = false;
-
-        //Test function called
-        $this->object->doImport();
-
-        //asset that all sql are executed
-        $this->assertContains(
-            'CREATE DATABASE IF NOT EXISTS `CSV_DB` DEFAULT CHARACTER',
-            $sql_query
-        );
-
-        $this->assertContains(
-            'CREATE TABLE IF NOT EXISTS `CSV_DB`.`TBL_NAME`',
-            $sql_query
-        );
-
-        $this->assertEquals(
-            true,
-            $GLOBALS['finished']
-        );
-    }
-}
diff --git a/#pma/test/classes/plugin/import/ImportLdiTest.php b/#pma/test/classes/plugin/import/ImportLdiTest.php
deleted file mode 100644
index 5186ad18..00000000
--- a/#pma/test/classes/plugin/import/ImportLdiTest.php
+++ /dev/null
@@ -1,266 +0,0 @@
-<?php
-/**
- * Tests for PMA\libraries\plugins\import\ImportLdi class
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * we must set $GLOBALS['server'] here
- * since 'check_user_privileges.lib.php' will use it globally
- */
-use PMA\libraries\plugins\import\ImportLdi;
-
-$GLOBALS['server'] = 0;
-$GLOBALS['plugin_param'] = "table";
-
-/*
- * Include to test.
- */
-require_once 'libraries/sanitizing.lib.php';
-require_once 'libraries/url_generating.lib.php';
-require_once 'libraries/database_interface.inc.php';
-require_once 'libraries/import.lib.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * Tests for PMA\libraries\plugins\import\ImportLdi class
- *
- * @package PhpMyAdmin-test
- */
-class ImportLdiTest extends PMATestCase
-{
-    /**
-     * @access protected
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function setUp()
-    {
-        //setting
-        $GLOBALS['finished'] = false;
-        $GLOBALS['read_limit'] = 100000000;
-        $GLOBALS['offset'] = 0;
-        $GLOBALS['cfg']['Server']['DisableIS'] = false;
-
-        $GLOBALS['import_file'] = 'test/test_data/db_test_ldi.csv';
-        $GLOBALS['import_text'] = 'ImportLdi_Test';
-        $GLOBALS['compression'] = 'none';
-        $GLOBALS['read_multiply'] = 10;
-        $GLOBALS['import_type'] = 'csv';
-        $GLOBALS['import_handle'] = @fopen($GLOBALS['import_file'], 'r');
-
-        //setting for Ldi
-        $GLOBALS['cfg']['Import']['ldi_replace'] = false;
-        $GLOBALS['cfg']['Import']['ldi_ignore'] = false;
-        $GLOBALS['cfg']['Import']['ldi_terminated'] = ';';
-        $GLOBALS['cfg']['Import']['ldi_enclosed'] = '"';
-        $GLOBALS['cfg']['Import']['ldi_escaped'] = '\\';
-        $GLOBALS['cfg']['Import']['ldi_new_line'] = 'auto';
-        $GLOBALS['cfg']['Import']['ldi_columns'] = '';
-        $GLOBALS['cfg']['Import']['ldi_local_option'] = false;
-        $GLOBALS['table'] = "phpmyadmintest";
-
-        //Mock DBI
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->any())->method('tryQuery')
-            ->will($this->returnValue(true));
-
-        $dbi->expects($this->any())->method('numRows')
-            ->will($this->returnValue(10));
-
-        $fetchRowResult = array("ON");
-        $dbi->expects($this->any())->method('fetchRow')
-            ->will($this->returnValue($fetchRowResult));
-
-        $dbi->expects($this->any())->method('escapeString')
-            ->will($this->returnArgument(0));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $this->object = new ImportLdi();
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Test for getProperties
-     *
-     * @return void
-     *
-     * @group medium
-     */
-    public function testGetProperties()
-    {
-        $properties = $this->object->getProperties();
-        $this->assertEquals(
-            __('CSV using LOAD DATA'),
-            $properties->getText()
-        );
-        $this->assertEquals(
-            'ldi',
-            $properties->getExtension()
-        );
-    }
-
-    /**
-     * Test for getProperties for ldi_local_option = auto
-     *
-     * @return void
-     *
-     * @group medium
-     */
-    public function testGetPropertiesAutoLdi()
-    {
-        $GLOBALS['cfg']['Import']['ldi_local_option'] = 'auto';
-        $this->object = new ImportLdi();
-        $properties = $this->object->getProperties();
-        $this->assertEquals(
-            true,
-            $GLOBALS['cfg']['Import']['ldi_local_option']
-        );
-        $this->assertEquals(
-            __('CSV using LOAD DATA'),
-            $properties->getText()
-        );
-        $this->assertEquals(
-            'ldi',
-            $properties->getExtension()
-        );
-    }
-
-    /**
-     * Test for doImport
-     *
-     * @return void
-     *
-     * @group medium
-     */
-    public function testDoImport()
-    {
-        //$sql_query_disabled will show the import SQL detail
-        global $sql_query, $sql_query_disabled;
-        $sql_query_disabled = false;
-
-        //Test function called
-        $this->object->doImport();
-
-        //asset that all sql are executed
-        $this->assertContains(
-            "LOAD DATA INFILE 'test/test_data/db_test_ldi.csv' INTO TABLE "
-            . "`phpmyadmintest`",
-            $sql_query
-        );
-
-        $this->assertEquals(
-            true,
-            $GLOBALS['finished']
-        );
-    }
-
-    /**
-     * Test for doImport : invalid import file
-     *
-     * @return void
-     *
-     * @group medium
-     */
-    public function testDoImportInvalidFile()
-    {
-        global $import_file;
-        $import_file = 'none';
-
-        //Test function called
-        $this->object->doImport();
-
-        // We handle only some kind of data!
-        $this->assertContains(
-            __('This plugin does not support compressed imports!'),
-            $GLOBALS['message']->__toString()
-        );
-
-        $this->assertEquals(
-            true,
-            $GLOBALS['error']
-        );
-    }
-
-    /**
-     * Test for doImport with LDI setting
-     *
-     * @return void
-     *
-     * @group medium
-     */
-    public function testDoImportLDISetting()
-    {
-        global $ldi_local_option, $ldi_replace, $ldi_ignore, $ldi_terminated,
-        $ldi_enclosed, $ldi_new_line, $skip_queries;
-
-        //$sql_query_disabled will show the import SQL detail
-        global $sql_query, $sql_query_disabled;
-        $sql_query_disabled = false;
-
-        $ldi_local_option = true;
-        $ldi_replace = true;
-        $ldi_ignore = true;
-        $ldi_terminated = ',';
-        $ldi_enclosed = ')';
-        $ldi_new_line = 'newline_mark';
-        $skip_queries = true;
-
-        //Test function called
-        $this->object->doImport();
-
-        //asset that all sql are executed
-        //replace
-        $this->assertContains(
-            "LOAD DATA LOCAL INFILE 'test/test_data/db_test_ldi.csv' REPLACE INTO "
-            . "TABLE `phpmyadmintest`",
-            $sql_query
-        );
-
-        //FIELDS TERMINATED
-        $this->assertContains(
-            "FIELDS TERMINATED BY ','",
-            $sql_query
-        );
-
-        //LINES TERMINATED
-        $this->assertContains(
-            "LINES TERMINATED BY 'newline_mark'",
-            $sql_query
-        );
-
-        //IGNORE
-        $this->assertContains(
-            "IGNORE 1 LINES",
-            $sql_query
-        );
-
-        $this->assertEquals(
-            true,
-            $GLOBALS['finished']
-        );
-    }
-}
diff --git a/#pma/test/classes/plugin/import/ImportMediawikiTest.php b/#pma/test/classes/plugin/import/ImportMediawikiTest.php
deleted file mode 100644
index 066cd520..00000000
--- a/#pma/test/classes/plugin/import/ImportMediawikiTest.php
+++ /dev/null
@@ -1,167 +0,0 @@
-<?php
-/**
- * Tests for PMA\libraries\plugins\import\ImportMediawiki class
- *
- * @package PhpMyAdmin-test
- */
-/*
- * we must set $GLOBALS['server'] here
- * since 'check_user_privileges.lib.php' will use it globally
- */
-use PMA\libraries\plugins\import\ImportMediawiki;
-
-$GLOBALS['server'] = 0;
-
-/*
- * Include to test.
- */
-require_once 'libraries/url_generating.lib.php';
-require_once 'libraries/database_interface.inc.php';
-require_once 'libraries/import.lib.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * Tests for PMA\libraries\plugins\import\ImportMediawiki class
- *
- * @package PhpMyAdmin-test
- */
-class ImportMediawikiTest extends PMATestCase
-{
-    /**
-     * @access protected
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function setUp()
-    {
-        $GLOBALS['plugin_param'] = 'database';
-        $this->object = new ImportMediawiki();
-
-        //setting
-        $GLOBALS['finished'] = false;
-        $GLOBALS['read_limit'] = 100000000;
-        $GLOBALS['offset'] = 0;
-        $GLOBALS['cfg']['Server']['DisableIS'] = false;
-
-        $GLOBALS['import_file'] = 'test/test_data/phpmyadmin.mediawiki';
-        $GLOBALS['import_text'] = 'ImportMediawiki_Test';
-        $GLOBALS['compression'] = 'none';
-        $GLOBALS['read_multiply'] = 10;
-        $GLOBALS['import_type'] = 'Mediawiki';
-        $GLOBALS['import_handle'] = @fopen($GLOBALS['import_file'], 'r');
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Test for getProperties
-     *
-     * @return void
-     *
-     * @group medium
-     */
-    public function testGetProperties()
-    {
-        $properties = $this->object->getProperties();
-        $this->assertEquals(
-            __('MediaWiki Table'),
-            $properties->getText()
-        );
-        $this->assertEquals(
-            'txt',
-            $properties->getExtension()
-        );
-        $this->assertEquals(
-            'text/plain',
-            $properties->getMimeType()
-        );
-        $this->assertEquals(
-            array(),
-            $properties->getOptions()
-        );
-        $this->assertEquals(
-            __('Options'),
-            $properties->getOptionsText()
-        );
-
-    }
-
-    /**
-     * Test for doImport
-     *
-     * @return void
-     *
-     * @group medium
-     */
-    public function testDoImport()
-    {
-        //$import_notice will show the import detail result
-        global $import_notice;
-
-        //Mock DBI
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $GLOBALS['dbi'] = $dbi;
-
-        //Test function called
-        $this->object->doImport();
-
-        // If import successfully, PMA will show all databases and
-        // tables imported as following HTML Page
-        /*
-           The following structures have either been created or altered. Here you
-           can:
-           View a structure's contents by clicking on its name
-           Change any of its settings by clicking the corresponding "Options" link
-           Edit structure by following the "Structure" link
-
-           mediawiki_DB (Options)
-           pma_bookmarktest (Structure) (Options)
-        */
-
-        //asset that all databases and tables are imported
-        $this->assertContains(
-            'The following structures have either been created or altered.',
-            $import_notice
-        );
-        $this->assertContains(
-            'Go to database: `mediawiki_DB`',
-            $import_notice
-        );
-        $this->assertContains(
-            'Edit settings for `mediawiki_DB`',
-            $import_notice
-        );
-        $this->assertContains(
-            'Go to table: `pma_bookmarktest`',
-            $import_notice
-        );
-        $this->assertContains(
-            'Edit settings for `pma_bookmarktest`',
-            $import_notice
-        );
-        $this->assertEquals(
-            true,
-            $GLOBALS['finished']
-        );
-
-    }
-}
diff --git a/#pma/test/classes/plugin/import/ImportOdsTest.php b/#pma/test/classes/plugin/import/ImportOdsTest.php
deleted file mode 100644
index b890101e..00000000
--- a/#pma/test/classes/plugin/import/ImportOdsTest.php
+++ /dev/null
@@ -1,179 +0,0 @@
-<?php
-/**
- * Tests for PMA\libraries\plugins\import\ImportOds class
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * we must set $GLOBALS['server'] here
- * since 'check_user_privileges.lib.php' will use it globally
- */
-use PMA\libraries\plugins\import\ImportOds;
-
-$GLOBALS['server'] = 0;
-
-/*
- * Include to test.
- */
-require_once 'libraries/url_generating.lib.php';
-require_once 'libraries/database_interface.inc.php';
-require_once 'libraries/import.lib.php';
-require_once 'libraries/sanitizing.lib.php';
-require_once 'libraries/plugins/import/ImportOds.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * Tests for PMA\libraries\plugins\import\ImportOds class
- *
- * @package PhpMyAdmin-test
- */
-class ImportOdsTest extends PMATestCase
-{
-    /**
-     * @access protected
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function setUp()
-    {
-        $GLOBALS['plugin_param'] = "csv";
-        $this->object = new ImportOds();
-
-        //setting
-        $GLOBALS['finished'] = false;
-        $GLOBALS['read_limit'] = 100000000;
-        $GLOBALS['offset'] = 0;
-        $GLOBALS['cfg']['Server']['DisableIS'] = false;
-
-        $GLOBALS['import_file'] = 'test/test_data/db_test.ods';
-
-        /**
-         * Load interface for zip extension.
-        */
-        include_once 'libraries/zip_extension.lib.php';
-        $result = PMA_getZipContents($GLOBALS['import_file']);
-        $GLOBALS['import_text'] = $result["data"];
-        $GLOBALS['compression'] = 'application/zip';
-        $GLOBALS['read_multiply'] = 10;
-        $GLOBALS['import_type'] = 'ods';
-        $GLOBALS['import_handle'] = @fopen($GLOBALS['import_file'], 'r');
-
-        //variable for Ods
-        $_REQUEST['ods_recognize_percentages'] = true;
-        $_REQUEST['ods_recognize_currency'] = true;
-        $_REQUEST['ods_empty_rows'] = true;
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Test for getProperties
-     *
-     * @return void
-     *
-     * @group medium
-     */
-    public function testGetProperties()
-    {
-        $properties = $this->object->getProperties();
-        $this->assertEquals(
-            __('OpenDocument Spreadsheet'),
-            $properties->getText()
-        );
-        $this->assertEquals(
-            'ods',
-            $properties->getExtension()
-        );
-        $this->assertEquals(
-            __('Options'),
-            $properties->getOptionsText()
-        );
-    }
-
-    /**
-     * Test for doImport
-     *
-     * @return void
-     *
-     * @group medium
-     */
-    public function testDoImport()
-    {
-        //$sql_query_disabled will show the import SQL detail
-        //$import_notice will show the import detail result
-        global $import_notice, $sql_query, $sql_query_disabled;
-        $sql_query_disabled = false;
-
-        //Mock DBI
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $dbi->expects($this->any())->method('escapeString')
-            ->will($this->returnArgument(0));
-        $GLOBALS['dbi'] = $dbi;
-
-        //Test function called
-        $this->object->doImport();
-
-        $this->assertContains(
-            'CREATE DATABASE IF NOT EXISTS `ODS_DB` DEFAULT CHARACTER SET '
-            . 'utf8 COLLATE utf8_general_ci',
-            $sql_query
-        );
-        $this->assertContains(
-            'CREATE TABLE IF NOT EXISTS `ODS_DB`.`pma_bookmark`',
-            $sql_query
-        );
-        $this->assertContains(
-            "INSERT INTO `ODS_DB`.`pma_bookmark` (`A`, `B`, `C`, `D`) VALUES "
-            . "(1, 'dbbase', NULL, 'ddd');",
-            $sql_query
-        );
-
-        //asset that all databases and tables are imported
-        $this->assertContains(
-            'The following structures have either been created or altered.',
-            $import_notice
-        );
-        $this->assertContains(
-            'Go to database: `ODS_DB`',
-            $import_notice
-        );
-        $this->assertContains(
-            'Edit settings for `ODS_DB`',
-            $import_notice
-        );
-        $this->assertContains(
-            'Go to table: `pma_bookmark`',
-            $import_notice
-        );
-        $this->assertContains(
-            'Edit settings for `pma_bookmark`',
-            $import_notice
-        );
-
-        //asset that the import process is finished
-        $this->assertEquals(
-            true,
-            $GLOBALS['finished']
-        );
-    }
-}
diff --git a/#pma/test/classes/plugin/import/ImportShpTest.php b/#pma/test/classes/plugin/import/ImportShpTest.php
deleted file mode 100644
index 26cfcebf..00000000
--- a/#pma/test/classes/plugin/import/ImportShpTest.php
+++ /dev/null
@@ -1,227 +0,0 @@
-<?php
-/**
- * Tests for PMA\libraries\plugins\import\ImportShp class
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * we must set $GLOBALS['server'] here
- * since 'check_user_privileges.lib.php' will use it globally
- */
-use PMA\libraries\plugins\import\ImportShp;
-
-$GLOBALS['server'] = 0;
-
-require_once 'libraries/url_generating.lib.php';
-require_once 'libraries/database_interface.inc.php';
-require_once 'libraries/import.lib.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * Tests for PMA\libraries\plugins\import\ImportShp class
- *
- * @package PhpMyAdmin-test
- */
-class ImportShpTest extends PMATestCase
-{
-    /**
-     * @var ImportShp
-     * @access protected
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function setUp()
-    {
-        //setting
-        $GLOBALS['plugin_param'] = 'table';
-        $GLOBALS['finished'] = false;
-        $GLOBALS['read_limit'] = 100000000;
-        $GLOBALS['offset'] = 0;
-        $GLOBALS['cfg']['Server']['DisableIS'] = false;
-
-        //Mock DBI
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $GLOBALS['dbi'] = $dbi;
-
-        $this->object = new ImportShp();
-
-        $GLOBALS['compression'] = 'application/zip';
-        $GLOBALS['read_multiply'] = 10;
-        $GLOBALS['import_type'] = 'ods';
-        unset($GLOBALS['db'], $GLOBALS['table']);
-    }
-
-    /**
-     * Executes import of given file
-     *
-     * @param string $filename Name of test file
-     *
-     * @return void
-     */
-    protected function runImport($filename)
-    {
-        $GLOBALS['import_file'] = $filename;
-        $GLOBALS['import_handle'] = @fopen($filename, 'r');
-
-        $this->object->doImport();
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Test for getProperties
-     *
-     * @return void
-     *
-     * @group medium
-     */
-    public function testGetProperties()
-    {
-        $properties = $this->object->getProperties();
-        $this->assertEquals(
-            __('ESRI Shape File'),
-            $properties->getText()
-        );
-        $this->assertEquals(
-            'shp',
-            $properties->getExtension()
-        );
-        $this->assertEquals(
-            array(),
-            $properties->getOptions()
-        );
-        $this->assertEquals(
-            __('Options'),
-            $properties->getOptionsText()
-        );
-
-    }
-
-    /**
-     * Test for doImport with complex data
-     *
-     * @return void
-     *
-     * @group medium
-     */
-    public function testImportOsm()
-    {
-        //$sql_query_disabled will show the import SQL detail
-        //$import_notice will show the import detail result
-        global $import_notice, $sql_query, $sql_query_disabled;
-        $sql_query_disabled = false;
-
-        //Test function called
-        $this->runImport('test/test_data/dresden_osm.shp.zip');
-
-        $this->assertMessages($import_notice);
-        $this->assertContains(
-            "(GeomFromText('MULTIPOLYGON((("
-            . "13.737122 51.0542065,"
-            . "13.7373039 51.0541298,"
-            . "13.7372661 51.0540944,"
-            . "13.7370842 51.0541711,"
-            . "13.737122 51.0542065)))'))",
-            $sql_query
-        );
-    }
-
-    /**
-     * Test for doImport
-     *
-     * @return void
-     *
-     * @group medium
-     */
-    public function testDoImport()
-    {
-        //$sql_query_disabled will show the import SQL detail
-        //$import_notice will show the import detail result
-        global $import_notice, $sql_query, $sql_query_disabled;
-        $sql_query_disabled = false;
-
-        //Test function called
-        $this->runImport('test/test_data/timezone.shp.zip');
-
-        //asset that all sql are executed
-        $this->assertContains(
-            'CREATE DATABASE IF NOT EXISTS `SHP_DB` DEFAULT CHARACTER '
-            . 'SET utf8 COLLATE utf8_general_ci',
-            $sql_query
-        );
-        $this->assertContains(
-            'CREATE TABLE IF NOT EXISTS `SHP_DB`.`TBL_NAME` '
-            . '(`SPATIAL` geometry) DEFAULT CHARACTER '
-            . 'SET utf8 COLLATE utf8_general_ci;',
-            $sql_query
-        );
-        $this->assertContains(
-            "INSERT INTO `SHP_DB`.`TBL_NAME` (`SPATIAL`) VALUES",
-            $sql_query
-        );
-        $this->assertContains(
-            "GeomFromText('POINT(1294523.1759236",
-            $sql_query
-        );
-
-        //asset that all databases and tables are imported
-        $this->assertMessages($import_notice);
-    }
-
-    /**
-     * Validates import messages
-     *
-     * @param string $import_notice Messages to check
-     *
-     * @return void
-     */
-    protected function assertMessages($import_notice)
-    {
-        $this->assertContains(
-            'The following structures have either been created or altered.',
-            $import_notice
-        );
-        $this->assertContains(
-            'Go to database: `SHP_DB`',
-            $import_notice
-        );
-        $this->assertContains(
-            'Edit settings for `SHP_DB`',
-            $import_notice
-        );
-        $this->assertContains(
-            'Go to table: `TBL_NAME`',
-            $import_notice
-        );
-        $this->assertContains(
-            'Edit settings for `TBL_NAME`',
-            $import_notice
-        );
-
-        //asset that the import process is finished
-        $this->assertEquals(
-            true,
-            $GLOBALS['finished']
-        );
-    }
-}
diff --git a/#pma/test/classes/plugin/import/ImportSqlTest.php b/#pma/test/classes/plugin/import/ImportSqlTest.php
deleted file mode 100644
index 2fa02388..00000000
--- a/#pma/test/classes/plugin/import/ImportSqlTest.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-/**
- * Tests for PMA\libraries\plugins\import\ImportSql class
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * we must set $GLOBALS['server'] here
- * since 'check_user_privileges.lib.php' will use it globally
- */
-use PMA\libraries\plugins\import\ImportSql;
-
-$GLOBALS['server'] = 0;
-
-/*
- * Include to test.
- */
-require_once 'libraries/url_generating.lib.php';
-require_once 'libraries/database_interface.inc.php';
-require_once 'libraries/import.lib.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * Tests for PMA\libraries\plugins\import\ImportSql class
- *
- * @package PhpMyAdmin-test
- */
-class ImportSqlTest extends PMATestCase
-{
-    /**
-     * @access protected
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function setUp()
-    {
-        $this->object = new ImportSql();
-
-        //setting
-        $GLOBALS['finished'] = false;
-        $GLOBALS['read_limit'] = 100000000;
-        $GLOBALS['offset'] = 0;
-        $GLOBALS['cfg']['Server']['DisableIS'] = false;
-
-        $GLOBALS['import_file'] = 'test/test_data/pma_bookmark.sql';
-        $GLOBALS['import_text'] = 'ImportSql_Test';
-        $GLOBALS['compression'] = 'none';
-        $GLOBALS['read_multiply'] = 10;
-        $GLOBALS['import_type'] = 'Xml';
-        $GLOBALS['import_handle'] = @fopen($GLOBALS['import_file'], 'r');
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Test for doImport
-     *
-     * @return void
-     *
-     * @group medium
-     */
-    public function testDoImport()
-    {
-        //$sql_query_disabled will show the import SQL detail
-        global $sql_query, $sql_query_disabled;
-        $sql_query_disabled = false;
-
-        //Mock DBI
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $GLOBALS['dbi'] = $dbi;
-
-        //Test function called
-        $this->object->doImport();
-
-        //asset that all sql are executed
-        $this->assertContains(
-            'SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO"',
-            $sql_query
-        );
-        $this->assertContains(
-            'CREATE TABLE IF NOT EXISTS `pma_bookmark`',
-            $sql_query
-        );
-        $this->assertContains(
-            'INSERT INTO `pma_bookmark` (`id`, `dbase`, `user`, `label`, `query`) '
-            . 'VALUES',
-            $sql_query
-        );
-
-        $this->assertEquals(
-            true,
-            $GLOBALS['finished']
-        );
-
-    }
-}
diff --git a/#pma/test/classes/plugin/import/ImportXmlTest.php b/#pma/test/classes/plugin/import/ImportXmlTest.php
deleted file mode 100644
index 70411cdc..00000000
--- a/#pma/test/classes/plugin/import/ImportXmlTest.php
+++ /dev/null
@@ -1,168 +0,0 @@
-<?php
-/**
- * Tests for PMA\libraries\plugins\import\ImportXml class
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * we must set $GLOBALS['server'] here
- * since 'check_user_privileges.lib.php' will use it globally
- */
-use PMA\libraries\plugins\import\ImportXml;
-
-$GLOBALS['server'] = 0;
-
-/*
- * Include to test.
- */
-require_once 'libraries/url_generating.lib.php';
-require_once 'libraries/database_interface.inc.php';
-require_once 'libraries/import.lib.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * Tests for PMA\libraries\plugins\import\ImportXml class
- *
- * @package PhpMyAdmin-test
- */
-class ImportXmlTest extends PMATestCase
-{
-    /**
-     * @access protected
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function setUp()
-    {
-        $this->object = new ImportXml();
-
-        //setting
-        $GLOBALS['finished'] = false;
-        $GLOBALS['read_limit'] = 100000000;
-        $GLOBALS['offset'] = 0;
-        $GLOBALS['cfg']['Server']['DisableIS'] = false;
-
-        $GLOBALS['import_file'] = 'test/test_data/phpmyadmin_importXML_'
-            . 'For_Testing.xml';
-        $GLOBALS['import_text'] = 'ImportXml_Test';
-        $GLOBALS['compression'] = 'none';
-        $GLOBALS['read_multiply'] = 10;
-        $GLOBALS['import_type'] = 'Xml';
-        $GLOBALS['import_handle'] = @fopen($GLOBALS['import_file'], 'r');
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Test for getProperties
-     *
-     * @return void
-     *
-     * @group medium
-     */
-    public function testGetProperties()
-    {
-        $properties = $this->object->getProperties();
-        $this->assertEquals(
-            __('XML'),
-            $properties->getText()
-        );
-        $this->assertEquals(
-            'xml',
-            $properties->getExtension()
-        );
-        $this->assertEquals(
-            'text/xml',
-            $properties->getMimeType()
-        );
-        $this->assertEquals(
-            array(),
-            $properties->getOptions()
-        );
-        $this->assertEquals(
-            __('Options'),
-            $properties->getOptionsText()
-        );
-
-    }
-
-    /**
-     * Test for doImport
-     *
-     * @return void
-     *
-     * @group medium
-     */
-    public function testDoImport()
-    {
-        //$import_notice will show the import detail result
-        global $import_notice;
-
-        //Mock DBI
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $GLOBALS['dbi'] = $dbi;
-
-        //Test function called
-        $this->object->doImport();
-
-        // If import successfully, PMA will show all databases and tables
-        // imported as following HTML Page
-        /*
-           The following structures have either been created or altered. Here you
-           can:
-           View a structure's contents by clicking on its name
-           Change any of its settings by clicking the corresponding "Options" link
-           Edit structure by following the "Structure" link
-
-           phpmyadmintest (Options)
-           pma_bookmarktest (Structure) (Options)
-        */
-
-        //asset that all databases and tables are imported
-        $this->assertContains(
-            'The following structures have either been created or altered.',
-            $import_notice
-        );
-        $this->assertContains(
-            'Go to database: `phpmyadmintest`',
-            $import_notice
-        );
-        $this->assertContains(
-            'Edit settings for `phpmyadmintest`',
-            $import_notice
-        );
-        $this->assertContains(
-            'Go to table: `pma_bookmarktest`',
-            $import_notice
-        );
-        $this->assertContains(
-            'Edit settings for `pma_bookmarktest`',
-            $import_notice
-        );
-        $this->assertEquals(
-            true,
-            $GLOBALS['finished']
-        );
-
-    }
-}
diff --git a/#pma/test/classes/plugin/transformations/TransformationPluginsTest.php b/#pma/test/classes/plugin/transformations/TransformationPluginsTest.php
deleted file mode 100644
index bceacfd9..00000000
--- a/#pma/test/classes/plugin/transformations/TransformationPluginsTest.php
+++ /dev/null
@@ -1,1014 +0,0 @@
-<?php
-/**
- * Tests for all input/output transformation plugins
- *
- * @package PhpMyAdmin-test
- */
-
-use PMA\libraries\plugins\transformations\input\Image_JPEG_Upload;
-use PMA\libraries\plugins\transformations\input\Text_Plain_RegexValidation;
-use PMA\libraries\plugins\transformations\input\Text_Plain_FileUpload;
-use PMA\libraries\plugins\transformations\output\Application_Octetstream_Download;
-use PMA\libraries\plugins\transformations\output\Application_Octetstream_Hex;
-use PMA\libraries\plugins\transformations\output\Image_JPEG_Inline;
-use PMA\libraries\plugins\transformations\output\Image_JPEG_Link;
-use PMA\libraries\plugins\transformations\output\Image_PNG_Inline;
-use PMA\libraries\plugins\transformations\output\Text_Plain_Dateformat;
-use PMA\libraries\plugins\transformations\output\Text_Plain_External;
-use PMA\libraries\plugins\transformations\output\Text_Plain_Formatted;
-use PMA\libraries\plugins\transformations\output\Text_Plain_Imagelink;
-use PMA\libraries\plugins\transformations\output\Text_Plain_Sql;
-use PMA\libraries\plugins\transformations\Text_Plain_Link;
-use PMA\libraries\plugins\transformations\Text_Plain_Longtoipv4;
-use PMA\libraries\plugins\transformations\Text_Plain_PreApPend;
-use PMA\libraries\plugins\transformations\Text_Plain_Substring;
-
-/*
- * Include to test.
- */
-require_once 'libraries/config.default.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * Tests for different input/output transformation plugins
- *
- * @package PhpMyAdmin-test
- */
-class TransformationPluginsTest extends PMATestCase
-{
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function setUp()
-    {
-        // For Application Octetstream Download plugin
-        global $row, $fields_meta;
-        $fields_meta = array();
-        $row = array("pma"=>"aaa", "pca"=>"bbb");
-
-        // For Image_*_Inline plugin
-        $GLOBALS['PMA_Config'] = new PMA\libraries\Config();
-        $GLOBALS['PMA_Config']->enableBc();
-
-        // For Date Format plugin
-        date_default_timezone_set('UTC');
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function tearDown()
-    {
-    }
-
-    /**
-     * Data provider for testGetMulti
-     *
-     * @return array with test data
-     */
-    public function multiDataProvider()
-    {
-        return array(
-            // Test data for PMA\libraries\plugins\transformations\input\Image_JPEG_Upload plugin
-            array(
-                new Image_JPEG_Upload(),
-                'getName',
-                'Image upload'
-            ),
-            array(
-                new Image_JPEG_Upload(),
-                'getInfo',
-                'Image upload functionality which also displays a thumbnail.'
-                . ' The options are the width and height of the thumbnail'
-                . ' in pixels. Defaults to 100 X 100.'
-            ),
-            array(
-                new Image_JPEG_Upload(),
-                'getMIMEType',
-                'Image'
-            ),
-            array(
-                new Image_JPEG_Upload(),
-                'getMIMESubtype',
-                'JPEG'
-            ),
-            array(
-                new Image_JPEG_Upload(),
-                'getScripts',
-                array('transformations/image_upload.js')
-            ),
-            array(
-                new Image_JPEG_Upload(),
-                'getInputHtml',
-                '<img src="" width="150" height="100" '
-                . 'alt="Image preview here"/><br/><input type="file" '
-                . 'name="fields_uploadtest" accept="image/*" class="image-upload"/>',
-                array(
-                    array(),
-                    0,
-                    'test',
-                    array('150'),
-                    '',
-                    'ltr',
-                    0,
-                    0,
-                    0
-                )
-            ),
-            array(
-                new Image_JPEG_Upload(),
-                'getInputHtml',
-                '<input type="hidden" name="fields_prev2ndtest" '
-                . 'value="736f6d657468696e67"/><input type="hidden" '
-                . 'name="fields2ndtest" value="736f6d657468696e67"/>'
-                . '<img src="transformation_wrapper.php?table=a" width="100" '
-                . 'height="100" alt="Image preview here"/><br/><input type="file" '
-                . 'name="fields_upload2ndtest" accept="image/*" '
-                . 'class="image-upload"/>',
-                array(
-                    array(),
-                    0,
-                    '2ndtest',
-                    array(
-                        'wrapper_link' => '?table=a'
-                    ),
-                    'something',
-                    'ltr',
-                    0,
-                    0,
-                    0
-                )
-            ),
-            // Test data for TextPlainFileupload plugin
-            array(
-                new Text_Plain_FileUpload(),
-                'getName',
-                'Text file upload'
-            ),
-            array(
-                new Text_Plain_FileUpload(),
-                'getInfo',
-                'File upload functionality for TEXT columns. '
-                . 'It does not have a textarea for input.'
-            ),
-            array(
-                new Text_Plain_FileUpload(),
-                'getMIMEType',
-                'Text'
-            ),
-            array(
-                new Text_Plain_FileUpload(),
-                'getMIMESubtype',
-                'Plain'
-            ),
-            array(
-                new Text_Plain_FileUpload(),
-                'getScripts',
-                array()
-            ),
-            array(
-                new Text_Plain_FileUpload(),
-                'getInputHtml',
-                '<input type="file" name="fields_uploadtest"/>',
-                array(
-                    array(),
-                    0,
-                    'test',
-                    array(),
-                    '',
-                    'ltr',
-                    0,
-                    0,
-                    0
-                )
-            ),
-            array(
-                new Text_Plain_FileUpload(),
-                'getInputHtml',
-                '<input type="hidden" name="fields_prev2ndtest" '
-                . 'value="something"/><input type="hidden" name="fields2ndtest" '
-                . 'value="something"/><input type="file" '
-                . 'name="fields_upload2ndtest"/>',
-                array(
-                    array(),
-                    0,
-                    '2ndtest',
-                    array(),
-                    'something',
-                    'ltr',
-                    0,
-                    0,
-                    0
-                )
-            ),
-            // Test data for Text_Plain_Regexvalidation plugin
-            array(
-                new Text_Plain_RegexValidation(),
-                'getName',
-                'Regex Validation'
-            ),
-            array(
-                new Text_Plain_RegexValidation(),
-                'getInfo',
-                'Validates the string using regular expression '
-                . 'and performs insert only if string matches it. '
-                . 'The first option is the Regular Expression.'
-            ),
-            array(
-                new Text_Plain_RegexValidation(),
-                'getMIMEType',
-                'Text'
-            ),
-            array(
-                new Text_Plain_RegexValidation(),
-                'getMIMESubtype',
-                'Plain'
-            ),
-            array(
-                new Text_Plain_RegexValidation(),
-                'getInputHtml',
-                '',
-                array(
-                    array(), 0, '', array(), '', 'ltr', 0, 0, 0
-                )
-            ),
-            // Test data for PMA\libraries\plugins\transformations\output\Application_Octetstream_Download plugin
-            array(
-                new Application_Octetstream_Download(),
-                'getName',
-                'Download'
-            ),
-            array(
-                new Application_Octetstream_Download(),
-                'getInfo',
-                'Displays a link to download the binary data of the column. You can'
-                . ' use the first option to specify the filename, or use the second'
-                . ' option as the name of a column which contains the filename. If'
-                . ' you use the second option, you need to set the first option to'
-                . ' the empty string.'
-            ),
-            array(
-                new Application_Octetstream_Download(),
-                'getMIMEType',
-                'Application'
-            ),
-            array(
-                new Application_Octetstream_Download(),
-                'getMIMESubtype',
-                'OctetStream'
-            ),
-            // Test data for PMA\libraries\plugins\transformations\output\Application_Octetstream_Hex plugin
-            array(
-                new Application_Octetstream_Hex(),
-                'getName',
-                'Hex'
-            ),
-            array(
-                new Application_Octetstream_Hex(),
-                'getInfo',
-                'Displays hexadecimal representation of data. Optional first'
-                . ' parameter specifies how often space will be added (defaults'
-                . ' to 2 nibbles).'
-            ),
-            array(
-                new Application_Octetstream_Hex(),
-                'getMIMEType',
-                'Application'
-            ),
-            array(
-                new Application_Octetstream_Hex(),
-                'getMIMESubtype',
-                'OctetStream'
-            ),
-            // Test data for PMA\libraries\plugins\transformations\output\Image_JPEG_Inline plugin
-            array(
-                new Image_JPEG_Inline(),
-                'getName',
-                'Inline'
-            ),
-            array(
-                new Image_JPEG_Inline(),
-                'getInfo',
-                'Displays a clickable thumbnail. The options are the maximum width'
-                . ' and height in pixels. The original aspect ratio is preserved.'
-            ),
-            array(
-                new Image_JPEG_Inline(),
-                'getMIMEType',
-                'Image'
-            ),
-            array(
-                new Image_JPEG_Inline(),
-                'getMIMESubtype',
-                'JPEG'
-            ),
-            // Test data for PMA\libraries\plugins\transformations\output\Image_JPEG_Link plugin
-            array(
-                new Image_JPEG_Link(),
-                'getName',
-                'ImageLink'
-            ),
-            array(
-                new Image_JPEG_Link(),
-                'getInfo',
-                'Displays a link to download this image.'
-            ),
-            array(
-                new Image_JPEG_Link(),
-                'getMIMEType',
-                'Image'
-            ),
-            array(
-                new Image_JPEG_Link(),
-                'getMIMESubtype',
-                'JPEG'
-            ),
-            array(
-                new Image_JPEG_Link(),
-                'applyTransformationNoWrap',
-                null
-            ),
-            // Test data for PMA\libraries\plugins\transformations\output\Image_PNG_Inline plugin
-            array(
-                new Image_PNG_Inline(),
-                'getName',
-                'Inline'
-            ),
-            array(
-                new Image_PNG_Inline(),
-                'getInfo',
-                'Displays a clickable thumbnail. The options are the maximum width'
-                . ' and height in pixels. The original aspect ratio is preserved.'
-            ),
-            array(
-                new Image_PNG_Inline(),
-                'getMIMEType',
-                'Image'
-            ),
-            array(
-                new Image_PNG_Inline(),
-                'getMIMESubtype',
-                'PNG'
-            ),
-            // Test data for PMA\libraries\plugins\transformations\output\Text_Plain_Dateformat plugin
-            array(
-                new Text_Plain_Dateformat(),
-                'getName',
-                'Date Format'
-            ),
-            array(
-                new Text_Plain_Dateformat(),
-                'getInfo',
-                'Displays a TIME, TIMESTAMP, DATETIME or numeric unix timestamp'
-                . ' column as formatted date. The first option is the offset (in'
-                . ' hours) which will be added to the timestamp (Default: 0). Use'
-                . ' second option to specify a different date/time format string.'
-                . ' Third option determines whether you want to see local date or'
-                . ' UTC one (use "local" or "utc" strings) for that. According to'
-                . ' that, date format has different value - for "local" see the'
-                . ' documentation for PHP\'s strftime() function and for "utc" it'
-                . ' is done using gmdate() function.'
-            ),
-            array(
-                new Text_Plain_Dateformat(),
-                'getMIMEType',
-                'Text'
-            ),
-            array(
-                new Text_Plain_Dateformat(),
-                'getMIMESubtype',
-                'Plain'
-            ),
-            // Test data for PMA\libraries\plugins\transformations\output\Text_Plain_External plugin
-            array(
-                new Text_Plain_External(),
-                'getName',
-                'External'
-            ),
-            array(
-                new Text_Plain_External(),
-                'getInfo',
-                'LINUX ONLY:'
-                . ' Launches an external application and feeds it the column'
-                . ' data via standard input. Returns the standard output of the'
-                . ' application. The default is Tidy, to pretty-print HTML code.'
-                . ' For security reasons, you have to manually edit the file'
-                . ' libraries/plugins/transformations/output/Text_Plain_External'
-                . '.php and list the tools you want to make available.'
-                . ' The first option is then the number of the program you want to'
-                . ' use and the second option is the parameters for the program.'
-                . ' The third option, if set to 1, will convert the output using'
-                . ' htmlspecialchars() (Default 1). The fourth option, if set to 1,'
-                . ' will prevent wrapping and ensure that the output appears all on'
-                . ' one line (Default 1).'
-            ),
-            array(
-                new Text_Plain_External(),
-                'getMIMEType',
-                'Text'
-            ),
-            array(
-                new Text_Plain_External(),
-                'getMIMESubtype',
-                'Plain'
-            ),
-            array(
-                new Text_Plain_External(),
-                'applyTransformationNoWrap',
-                true,
-                array(
-                    array("/dev/null -i -wrap -q", "/dev/null -i -wrap -q")
-                )
-            ),
-            array(
-                new Text_Plain_External(),
-                'applyTransformationNoWrap',
-                true,
-                array(
-                    array(
-                        "/dev/null -i -wrap -q",
-                        "/dev/null -i -wrap -q",
-                        "/dev/null -i -wrap -q", 1
-                    )
-                )
-            ),
-            array(
-                new Text_Plain_External(),
-                'applyTransformationNoWrap',
-                true,
-                array(
-                    array(
-                        "/dev/null -i -wrap -q",
-                        "/dev/null -i -wrap -q",
-                        "/dev/null -i -wrap -q", "1"
-                    )
-                )
-            ),
-            array(
-                new Text_Plain_External(),
-                'applyTransformationNoWrap',
-                false,
-                array(
-                    array(
-                        "/dev/null -i -wrap -q",
-                        "/dev/null -i -wrap -q",
-                        "/dev/null -i -wrap -q",
-                        2
-                    )
-                )
-            ),
-            // Test data for PMA\libraries\plugins\transformations\output\Text_Plain_Formatted plugin
-            array(
-                new Text_Plain_Formatted(),
-                'getName',
-                'Formatted'
-            ),
-            array(
-                new Text_Plain_Formatted(),
-                'getInfo',
-                'Displays the contents of the column as-is, without running it'
-                . ' through htmlspecialchars(). That is, the column is assumed'
-                . ' to contain valid HTML.'
-            ),
-            array(
-                new Text_Plain_Formatted(),
-                'getMIMEType',
-                'Text'
-            ),
-            array(
-                new Text_Plain_Formatted(),
-                'getMIMESubtype',
-                'Plain'
-            ),
-            // Test data for PMA\libraries\plugins\transformations\output\Text_Plain_Imagelink plugin
-            array(
-                new Text_Plain_Imagelink(),
-                'getName',
-                'Image Link'
-            ),
-            array(
-                new Text_Plain_Imagelink(),
-                'getInfo',
-                'Displays an image and a link; '
-                . 'the column contains the filename. The first option'
-                . ' is a URL prefix like "https://www.example.com/". '
-                . 'The second and third options'
-                . ' are the width and the height in pixels.'
-            ),
-            array(
-                new Text_Plain_Imagelink(),
-                'getMIMEType',
-                'Text'
-            ),
-            array(
-                new Text_Plain_Imagelink(),
-                'getMIMESubtype',
-                'Plain'
-            ),
-            // Test data for PMA\libraries\plugins\transformations\output\Text_Plain_Sql plugin
-            array(
-                new Text_Plain_Sql(),
-                'getName',
-                'SQL'
-            ),
-            array(
-                new Text_Plain_Sql(),
-                'getInfo',
-                'Formats text as SQL query with syntax highlighting.'
-            ),
-            array(
-                new Text_Plain_Sql(),
-                'getMIMEType',
-                'Text'
-            ),
-            array(
-                new Text_Plain_Sql(),
-                'getMIMESubtype',
-                'Plain'
-            ),
-            // Test data for PMA\libraries\plugins\transformations\Text_Plain_Link plugin
-            array(
-                new Text_Plain_Link(),
-                'getName',
-                'TextLink'
-            ),
-            array(
-                new Text_Plain_Link(),
-                'getInfo',
-                'Displays a link; the column contains the filename. The first option'
-                . ' is a URL prefix like "https://www.example.com/".'
-                . ' The second option is a title for the link.'
-            ),
-            array(
-                new Text_Plain_Link(),
-                'getMIMEType',
-                'Text'
-            ),
-            array(
-                new Text_Plain_Link(),
-                'getMIMESubtype',
-                'Plain'
-            ),
-            // Test data for PMA\libraries\plugins\transformations\Text_Plain_Longtoipv4 plugin
-            array(
-                new Text_Plain_Longtoipv4(),
-                'getName',
-                'Long To IPv4'
-            ),
-            array(
-                new Text_Plain_Longtoipv4(),
-                'getInfo',
-                'Converts an (IPv4) Internet network address stored as a BIGINT'
-                . ' into a string in Internet standard dotted format.'
-            ),
-            array(
-                new Text_Plain_Longtoipv4(),
-                'getMIMEType',
-                'Text'
-            ),
-            array(
-                new Text_Plain_Longtoipv4(),
-                'getMIMESubtype',
-                'Plain'
-            ),
-            // Test data for Text_Plain_PreApPend plugin
-            array(
-                new Text_Plain_PreApPend(),
-                'getName',
-                'PreApPend'
-            ),
-            array(
-                new Text_Plain_PreApPend(),
-                'getInfo',
-                'Prepends and/or Appends text to a string. First option is text'
-                . ' to be prepended, second is appended (enclosed in single'
-                . ' quotes, default empty string).'
-            ),
-            array(
-                new Text_Plain_PreApPend(),
-                'getMIMEType',
-                'Text'
-            ),
-            array(
-                new Text_Plain_PreApPend(),
-                'getMIMESubtype',
-                'Plain'
-            ),
-            // Test data for PMA\libraries\plugins\transformations\Text_Plain_Substring plugin
-            array(
-                new Text_Plain_Substring(),
-                'getName',
-                'Substring'
-            ),
-            array(
-                new Text_Plain_Substring(),
-                'getInfo',
-                'Displays a part of a string. The first option is the number '
-                . 'of characters to skip from the beginning of the string '
-                . '(Default 0). The second option is the number of characters '
-                . 'to return (Default: until end of string). The third option is '
-                . 'the string to append and/or prepend when truncation occurs '
-                . '(Default: "…").'
-            ),
-            array(
-                new Text_Plain_Substring(),
-                'getMIMEType',
-                'Text'
-            ),
-            array(
-                new Text_Plain_Substring(),
-                'getMIMESubtype',
-                'Plain'
-            ),
-            array(
-                new Text_Plain_Substring(),
-                'getOptions',
-                array('foo', 'bar', 'baz'),
-                array(
-                    array(),
-                    array('foo', 'bar', 'baz')
-                )
-            ),
-            array(
-                new Text_Plain_Substring(),
-                'getOptions',
-                array('foo', 'bar', 'baz'),
-                array(
-                    array('foo', 'bar', 'baz'),
-                    array('foo', 'bar', 'baz')
-                )
-            ),
-            array(
-                new Text_Plain_Substring(),
-                'getOptions',
-                array('foo', 'bar', 'baz'),
-                array(
-                    array('foo', 'bar', 'baz'),
-                    array(1, 2, 3)
-                )
-            ),
-        );
-    }
-
-    /**
-     * Tests for getInfo, getName, getMIMEType, getMIMESubtype
-     * getScripts, applyTransformationNoWrap, getOptions
-     *
-     * @param object $object   instance of the plugin
-     * @param string $method   the method name
-     * @param mixed  $expected the expected output
-     * @param array  $args     the array of arguments
-     *
-     * @return void
-     *
-     * @dataProvider multiDataProvider
-     * @group medium
-     */
-    public function testGetMulti($object, $method, $expected, $args = array())
-    {
-        if (method_exists($object, $method)) {
-            $reflectionMethod = new ReflectionMethod($object, $method);
-            $this->assertEquals(
-                $expected,
-                $reflectionMethod->invokeArgs($object, $args)
-            );
-        }
-    }
-
-    /**
-     * Data provider for testTransformation
-     *
-     * @return array with test data
-     */
-    public function transformationDataProvider()
-    {
-        return array(
-            array(
-                new Image_JPEG_Upload(),
-                array(
-                    'test',
-                    array(150, 100)
-                ),
-                'test'
-            ),
-            array(
-                new Text_Plain_FileUpload(),
-                array(
-                    'test',
-                    array()
-                ),
-                'test'
-            ),
-            array(
-                new Text_Plain_RegexValidation(),
-                array(
-                    'phpMyAdmin',
-                    array('/php/i')
-                ),
-                'phpMyAdmin',
-                true,
-                ''
-            ),
-            array(
-                new Text_Plain_RegexValidation(),
-                array(
-                    'qwerty',
-                    array('/^a/')
-                ),
-                'qwerty',
-                false,
-                'Validation failed for the input string qwerty.'
-            ),
-            array(
-                new Application_Octetstream_Download(),
-                array(
-                    'PMA_BUFFER',
-                    array("filename", 'wrapper_link'=>'PMA_wrapper_link')
-                ),
-                '<a href="transformation_wrapper.phpPMA_wrapper_link'
-                . '&amp;ct=application/octet-stream&amp;cn=filename" '
-                . 'title="filename" class="disableAjax">filename</a>'
-            ),
-            array(
-                new Application_Octetstream_Download(),
-                array(
-                    'PMA_BUFFER',
-                    array("", 'cloumn', 'wrapper_link'=>'PMA_wrapper_link')
-                ),
-                '<a href="transformation_wrapper.phpPMA_wrapper_link&amp;'
-                . 'ct=application/octet-stream&amp;cn=binary_file.dat" '
-                . 'title="binary_file.dat" class="disableAjax">binary_file.dat</a>'
-            ),
-            array(
-                new Application_Octetstream_Hex(),
-                array(
-                    '11111001',
-                    array(3)
-                ),
-                '313 131 313 130 303 1 '
-            ),
-            array(
-                new Application_Octetstream_Hex(),
-                array(
-                    '11111001',
-                    array(0)
-                ),
-                '3131313131303031'
-            ),
-            array(
-                new Application_Octetstream_Hex(),
-                array(
-                    '11111001',
-                    array()
-                ),
-                '31 31 31 31 31 30 30 31 '
-            ),
-            array(
-                new Image_JPEG_Inline(),
-                array(
-                    'PMA_JPEG_Inline',
-                    array("./image/", "200", "wrapper_link"=>"PMA_wrapper_link")
-                ),
-                '<a href="transformation_wrapper.phpPMA_wrapper_link" '
-                . 'rel="noopener noreferrer" target="_blank"><img src="transformation_wrapper.php'
-                . 'PMA_wrapper_link&amp;resize=jpeg&amp;newWidth=0&amp;'
-                . 'newHeight=200" alt="[PMA_JPEG_Inline]" border="0" /></a>'
-            ),
-            array(
-                new Image_JPEG_Link(),
-                array(
-                    'PMA_IMAGE_LINK',
-                    array("./image/", "200", "wrapper_link"=>"PMA_wrapper_link")
-                ),
-                '<a class="disableAjax" target="_blank" rel="noopener noreferrer"'
-                . ' href="transformation_wrapper.phpPMA_wrapper_link"'
-                . ' alt="[PMA_IMAGE_LINK]">[BLOB]</a>'
-            ),
-            array(
-                new Image_PNG_Inline(),
-                array(
-                    'PMA_PNG_Inline',
-                    array("./image/", "200", "wrapper_link"=>"PMA_wrapper_link")
-                ),
-                '<a href="transformation_wrapper.phpPMA_wrapper_link"'
-                . ' rel="noopener noreferrer" target="_blank"><img src="transformation_wrapper.php'
-                . 'PMA_wrapper_link&amp;'
-                . 'resize=jpeg&amp;newWidth=0&amp;newHeight=200" '
-                . 'alt="[PMA_PNG_Inline]" border="0" /></a>'
-            ),
-            array(
-                new Text_Plain_Dateformat(),
-                array(
-                    12345,
-                    array(0),
-                    (object) array(
-                        'type' => 'int'
-                    )
-                ),
-                '<dfn onclick="alert(\'12345\');" title="12345">'
-                . 'Jan 01, 1970 at 03:25 AM</dfn>'
-            ),
-            array(
-                new Text_Plain_Dateformat(),
-                array(
-                    12345678,
-                    array(0),
-                    (object) array(
-                        'type' => 'string'
-                    )
-                ),
-                '<dfn onclick="alert(\'12345678\');" title="12345678">'
-                . 'May 23, 1970 at 09:21 PM</dfn>'
-            ),
-            array(
-                new Text_Plain_Dateformat(),
-                array(
-                    123456789,
-                    array(0),
-                    (object) array(
-                        'type' => null
-                    )
-                ),
-                '<dfn onclick="alert(\'123456789\');" title="123456789">'
-                . 'Nov 29, 1973 at 09:33 PM</dfn>'
-            ),
-            array(
-                new Text_Plain_Dateformat(),
-                array(
-                    '20100201',
-                    array(0),
-                    (object) array(
-                        'type' => null
-                    )
-                ),
-                '<dfn onclick="alert(\'20100201\');" title="20100201">'
-                . 'Feb 01, 2010 at 12:00 AM</dfn>'
-            ),
-            array(
-                new Text_Plain_External(),
-                array(
-                    'PMA_BUFFER',
-                    array("/dev/null -i -wrap -q", "/dev/null -i -wrap -q")
-                ),
-                'PMA_BUFFER'
-            ),
-            array(
-                new Text_Plain_Formatted(),
-                array(
-                    "<a ref='https://www.example.com/'>PMA_BUFFER</a>",
-                    array("option1", "option2")
-                ),
-                "<iframe srcdoc=\"<a ref='https://www.example.com/'>PMA_BUFFER</a>\" sandbox=\"\"></iframe>"
-            ),
-            array(
-                new Text_Plain_Formatted(),
-                array(
-                    "<a ref=\"https://www.example.com/\">PMA_BUFFER</a>",
-                    array("option1", "option2")
-                ),
-                "<iframe srcdoc=\"<a ref='https://www.example.com/'>PMA_BUFFER</a>\" sandbox=\"\"></iframe>"
-            ),
-            array(
-                new Text_Plain_Imagelink(),
-                array(
-                    'PMA_IMAGE',
-                    array("http://image/", "200")
-                ),
-                '<a href="http://image/PMA_IMAGE" rel="noopener noreferrer" target="_blank">'
-                . '<img src="http://image/PMA_IMAGE" border="0" width="200" '
-                . 'height="50" />PMA_IMAGE</a>'
-            ),
-            array(
-                new Text_Plain_Imagelink(),
-                array(
-                    'PMA_IMAGE',
-                    array("./image/", "200")
-                ),
-                './image/PMA_IMAGE'
-            ),
-            array(
-                new Text_Plain_Sql(),
-                array(
-                    'select *',
-                    array("option1", "option2")
-                ),
-                '<code class="sql"><pre>' . "\n"
-                . 'select *' . "\n"
-                . '</pre></code>'
-            ),
-            array(
-                new Text_Plain_Link(),
-                array(
-                    'PMA_TXT_LINK',
-                    array("./php/", "text_name")
-                ),
-                './php/PMA_TXT_LINK'
-            ),
-            array(
-                new Text_Plain_Link(),
-                array(
-                    'PMA_TXT_LINK',
-                    array(),
-                ),
-                'PMA_TXT_LINK'
-            ),
-            array(
-                new Text_Plain_Link(),
-                array(
-                    'https://example.com/PMA_TXT_LINK',
-                    array(),
-                ),
-                '<a href="https://example.com/PMA_TXT_LINK" title=""'
-                . ' target="_blank" rel="noopener noreferrer">https://example.com/PMA_TXT_LINK</a>'
-            ),
-            array(
-                new Text_Plain_Link(),
-                array(
-                    'PMA_TXT_LINK',
-                    array("./php/", "text_name")
-                ),
-                './php/PMA_TXT_LINK'
-            ),
-            array(
-                new Text_Plain_Longtoipv4(),
-                array(
-                    42949672,
-                    array("option1", "option2")
-                ),
-                '2.143.92.40'
-            ),
-            array(
-                new Text_Plain_Longtoipv4(),
-                array(
-                    4294967295,
-                    array("option1", "option2")
-                ),
-                '255.255.255.255'
-            ),
-            array(
-                new Text_Plain_PreApPend(),
-                array(
-                    'My',
-                    array('php', 'Admin')
-                ),
-                'phpMyAdmin'
-            ),
-            array(
-                new Text_Plain_Substring(),
-                array(
-                    'PMA_BUFFER',
-                    array(1, 3, 'suffix')
-                ),
-                'suffixMA_suffix'
-            ),
-        );
-    }
-
-    /**
-     * Tests for applyTransformation, isSuccess, getError
-     *
-     * @param object $object      instance of the plugin
-     * @param array  $applyArgs   arguments for applyTransformation
-     * @param string $transformed the expected output of applyTransformation
-     * @param bool   $success     the expected output of isSuccess
-     * @param string $error       the expected output of getError
-     *
-     * @return void
-     *
-     * @dataProvider transformationDataProvider
-     * @group medium
-     */
-    public function testTransformation(
-        $object, $applyArgs, $transformed, $success = true, $error = ''
-    ) {
-        $reflectionMethod = new ReflectionMethod($object, 'applyTransformation');
-        $this->assertEquals(
-            $transformed,
-            $reflectionMethod->invokeArgs($object, $applyArgs)
-        );
-
-        // For output transformation plugins, this method may not exist
-        if (method_exists($object, 'isSuccess')) {
-            $this->assertEquals(
-                $success,
-                $object->isSuccess()
-            );
-        }
-
-        // For output transformation plugins, this method may not exist
-        if (method_exists($object, 'getError')) {
-            $this->assertEquals(
-                $error,
-                $object->getError()
-            );
-        }
-    }
-}
diff --git a/#pma/test/classes/properties/PropertyItemTest.php b/#pma/test/classes/properties/PropertyItemTest.php
deleted file mode 100644
index 08e5606b..00000000
--- a/#pma/test/classes/properties/PropertyItemTest.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for PMA\libraries\properties\PropertyItem class
- *
- * @package PhpMyAdmin-test
- */
-
-/**
- * Tests for PMA\libraries\properties\PropertyItem class
- *
- * @package PhpMyAdmin-test
- */
-class PropertyItemTest extends PHPUnit_Framework_TestCase
-{
-    protected $stub;
-
-    /**
-     * Configures global environment.
-     *
-     * @return void
-     */
-    protected function setup()
-    {
-        $this->stub = $this->getMockForAbstractClass('PMA\libraries\properties\PropertyItem');
-    }
-
-    /**
-     * tearDown for test cases
-     *
-     * @return void
-     */
-    public function tearDown()
-    {
-        unset($this->stub);
-    }
-
-    /**
-     * Test for PMA\libraries\properties\PropertyItem::getGroup
-     *
-     * @return void
-     */
-    public function testGetGroup()
-    {
-        $this->assertEquals(
-            null,
-            $this->stub->getGroup()
-        );
-    }
-}
diff --git a/#pma/test/classes/properties/options/OptionsPropertyGroupTest.php b/#pma/test/classes/properties/options/OptionsPropertyGroupTest.php
deleted file mode 100644
index 5bfcc361..00000000
--- a/#pma/test/classes/properties/options/OptionsPropertyGroupTest.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for PMA\libraries\properties\options\OptionsPropertyGroup class
- *
- * @package PhpMyAdmin-test
- */
-
-/**
- * Tests for PMA\libraries\properties\options\OptionsPropertyGroup class
- *
- * @package PhpMyAdmin-test
- */
-class OptionsPropertyGroupTest extends PHPUnit_Framework_TestCase
-{
-    protected $stub;
-
-    /**
-     * Configures global environment.
-     *
-     * @return void
-     */
-    protected function setup()
-    {
-        $this->stub = $this->getMockForAbstractClass('PMA\libraries\properties\options\OptionsPropertyGroup');
-    }
-
-    /**
-     * tearDown for test cases
-     *
-     * @return void
-     */
-    public function tearDown()
-    {
-        unset($this->stub);
-    }
-
-    /**
-     * Test for PMA\libraries\properties\options\OptionsPropertyGroup::addProperty
-     *
-     * @return void
-     */
-    public function testAddProperty()
-    {
-        $properties = new \ReflectionProperty('PMA\libraries\properties\options\OptionsPropertyGroup', '_properties');
-        $properties->setAccessible(true);
-
-        $properties->setValue($this->stub, array(1, 2, 3));
-
-        $this->assertNull(
-            $this->stub->addProperty(2)
-        );
-
-        $this->stub->addProperty('2');
-
-        $this->assertEquals(
-            array(1, 2, 3, '2'),
-            $properties->getValue($this->stub)
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\properties\options\OptionsPropertyGroup::removeProperty
-     *
-     * @return void
-     */
-    public function testRemoveProperty()
-    {
-        $properties = new \ReflectionProperty('PMA\libraries\properties\options\OptionsPropertyGroup', '_properties');
-        $properties->setAccessible(true);
-
-        $properties->setValue($this->stub, array(1, 2, 'test', 3));
-        $this->stub->removeProperty('test');
-
-        $this->assertEquals(
-            array(
-                0 => 1,
-                1 => 2,
-                3 => 3
-            ),
-            $properties->getValue($this->stub)
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\properties\options\OptionsPropertyGroup::getGroup
-     *
-     * @return void
-     */
-    public function testGetGroup()
-    {
-        $this->assertInstanceOf(
-            'PMA\libraries\properties\options\OptionsPropertyGroup',
-            $this->stub->getGroup()
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\properties\options\OptionsPropertyGroup::getProperties
-     *
-     * @return void
-     */
-    public function testGetProperties()
-    {
-        $properties = new \ReflectionProperty('PMA\libraries\properties\options\OptionsPropertyGroup', '_properties');
-        $properties->setAccessible(true);
-        $properties->setValue($this->stub, array(1, 2, 3));
-
-        $this->assertEquals(
-            array(1, 2, 3),
-            $this->stub->getProperties()
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\properties\options\OptionsPropertyGroup::getProperties
-     *
-     * @return void
-     */
-    public function testGetNrOfProperties()
-    {
-        $properties = new \ReflectionProperty('PMA\libraries\properties\options\OptionsPropertyGroup', '_properties');
-        $properties->setAccessible(true);
-        $properties->setValue($this->stub, array(1, 2, 3));
-
-        $this->assertEquals(
-            3,
-            $this->stub->getNrOfProperties()
-        );
-    }
-}
diff --git a/#pma/test/classes/properties/options/OptionsPropertyItemTest.php b/#pma/test/classes/properties/options/OptionsPropertyItemTest.php
deleted file mode 100644
index 9811d8d6..00000000
--- a/#pma/test/classes/properties/options/OptionsPropertyItemTest.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for PMA\libraries\properties\options\OptionsPropertyItem class
- *
- * @package PhpMyAdmin-test
- */
-
-/**
- * Tests for PMA\libraries\properties\options\OptionsPropertyItem class
- *
- * @package PhpMyAdmin-test
- */
-class OptionsPropertyItemTest extends PHPUnit_Framework_TestCase
-{
-    protected $stub;
-
-    /**
-     * Configures global environment.
-     *
-     * @return void
-     */
-    protected function setup()
-    {
-        $this->stub = $this->getMockForAbstractClass('PMA\libraries\properties\options\OptionsPropertyItem');
-    }
-
-    /**
-     * tearDown for test cases
-     *
-     * @return void
-     */
-    public function tearDown()
-    {
-        unset($this->stub);
-    }
-
-    /**
-     * Test for
-     *     - PMA\libraries\properties\options\OptionsPropertyItem::getName
-     *     - PMA\libraries\properties\options\OptionsPropertyItem::setName
-     *
-     * @return void
-     */
-    public function testGetSetName()
-    {
-        $this->stub->setName('name123');
-
-        $this->assertEquals(
-            'name123',
-            $this->stub->getName()
-        );
-    }
-
-    /**
-     * Test for
-     *     - PMA\libraries\properties\options\OptionsPropertyItem::getText
-     *     - PMA\libraries\properties\options\OptionsPropertyItem::setText
-     *
-     * @return void
-     */
-    public function testGetSetText()
-    {
-        $this->stub->setText('text123');
-
-        $this->assertEquals(
-            'text123',
-            $this->stub->getText()
-        );
-    }
-
-    /**
-     * Test for
-     *     - PMA\libraries\properties\options\OptionsPropertyItem::getForce
-     *     - PMA\libraries\properties\options\OptionsPropertyItem::setForce
-     *
-     * @return void
-     */
-    public function testGetSetForce()
-    {
-        $this->stub->setForce('force123');
-
-        $this->assertEquals(
-            'force123',
-            $this->stub->getForce()
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\properties\options\OptionsPropertyItem::getPropertyType
-     *
-     * @return void
-     */
-    public function testGetPropertyType()
-    {
-        if ((defined('HHVM_VERSION')
-            && (version_compare(constant('HHVM_VERSION'), '3.8', 'lt')))
-        ) {
-            $this->markTestSkipped('Due to a bug in early versions of HHVM, this test cannot be completed.');
-        }
-
-        $this->assertEquals(
-            'options',
-            $this->stub->getPropertyType()
-        );
-    }
-}
diff --git a/#pma/test/classes/properties/options/OptionsPropertyOneItemTest.php b/#pma/test/classes/properties/options/OptionsPropertyOneItemTest.php
deleted file mode 100644
index e3124421..00000000
--- a/#pma/test/classes/properties/options/OptionsPropertyOneItemTest.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for PMA\libraries\properties\options\OptionsPropertyOneItem class
- *
- * @package PhpMyAdmin-test
- */
-
-/**
- * Tests for PMA\libraries\properties\options\OptionsPropertyOneItem class
- *
- * @package PhpMyAdmin-test
- */
-class OptionsPropertyOneItemTest extends PHPUnit_Framework_TestCase
-{
-    protected $stub;
-
-    /**
-     * Configures global environment.
-     *
-     * @return void
-     */
-    protected function setup()
-    {
-        $this->stub = $this->getMockForAbstractClass('PMA\libraries\properties\options\OptionsPropertyOneItem');
-    }
-
-    /**
-     * tearDown for test cases
-     *
-     * @return void
-     */
-    public function tearDown()
-    {
-        unset($this->stub);
-    }
-
-    /**
-     * Test for
-     *     - PMA\libraries\properties\options\OptionsPropertyOneItem::getValues
-     *     - PMA\libraries\properties\options\OptionsPropertyOneItem::setValues
-     *
-     * @return void
-     */
-    public function testGetSetValues()
-    {
-        $this->stub->setValues(array(1, 2));
-
-        $this->assertEquals(
-            array(1, 2),
-            $this->stub->getValues()
-        );
-    }
-
-    /**
-     * Test for
-     *     - PMA\libraries\properties\options\OptionsPropertyOneItem::getLen
-     *     - PMA\libraries\properties\options\OptionsPropertyOneItem::setLen
-     *
-     * @return void
-     */
-    public function testGetSetLen()
-    {
-        $this->stub->setLen(12);
-
-        $this->assertEquals(
-            12,
-            $this->stub->getLen()
-        );
-    }
-
-    /**
-     * Test for
-     *     - PMA\libraries\properties\options\OptionsPropertyOneItem::getForce
-     *     - PMA\libraries\properties\options\OptionsPropertyOneItem::setForce
-     *
-     * @return void
-     */
-    public function testGetSetForce()
-    {
-        $this->stub->setForce('force123');
-
-        $this->assertEquals(
-            'force123',
-            $this->stub->getForce()
-        );
-    }
-
-    /**
-     * Test for
-     *     - PMA\libraries\properties\options\OptionsPropertyOneItem::getDoc
-     *     - PMA\libraries\properties\options\OptionsPropertyOneItem::setDoc
-     *
-     * @return void
-     */
-    public function testGetSetDoc()
-    {
-        $this->stub->setDoc('doc123');
-
-        $this->assertEquals(
-            'doc123',
-            $this->stub->getDoc()
-        );
-    }
-
-    /**
-     * Test for
-     *     - PMA\libraries\properties\options\OptionsPropertyOneItem::getSize
-     *     - PMA\libraries\properties\options\OptionsPropertyOneItem::setSize
-     *
-     * @return void
-     */
-    public function testGetSetSize()
-    {
-        $this->stub->setSize(22);
-
-        $this->assertEquals(
-            22,
-            $this->stub->getSize()
-        );
-    }
-}
diff --git a/#pma/test/classes/properties/options/groups/OptionsPropertyMainGroupTest.php b/#pma/test/classes/properties/options/groups/OptionsPropertyMainGroupTest.php
deleted file mode 100644
index 5474c4d7..00000000
--- a/#pma/test/classes/properties/options/groups/OptionsPropertyMainGroupTest.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for PMA\libraries\properties\options\groups\OptionsPropertyMainGroup class
- *
- * @package PhpMyAdmin-test
- */
-
-use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
-
-/**
- * tests for PMA\libraries\properties\options\groups\OptionsPropertyMainGroup class
- *
- * @package PhpMyAdmin-test
- */
-class OptionsPropertyMainGroupTest extends PHPUnit_Framework_TestCase
-{
-    protected $object;
-
-    /**
-     * Configures global environment.
-     *
-     * @return void
-     */
-    protected function setup()
-    {
-        $this->object = new OptionsPropertyMainGroup();
-    }
-
-    /**
-     * tearDown for test cases
-     *
-     * @return void
-     */
-    protected function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Test for PMA\libraries\properties\options\groups\OptionsPropertyMainGroup::getItemType
-     *
-     * @return void
-     */
-    public function testGetItemType()
-    {
-        $this->assertEquals(
-            'main',
-            $this->object->getItemType()
-        );
-    }
-
-}
diff --git a/#pma/test/classes/properties/options/groups/OptionsPropertyRootGroupTest.php b/#pma/test/classes/properties/options/groups/OptionsPropertyRootGroupTest.php
deleted file mode 100644
index b52eb4e1..00000000
--- a/#pma/test/classes/properties/options/groups/OptionsPropertyRootGroupTest.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for PMA\libraries\properties\options\groups\OptionsPropertyRootGroup class
- *
- * @package PhpMyAdmin-test
- */
-
-use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
-
-/**
- * tests for PMA\libraries\properties\options\groups\OptionsPropertyRootGroup class
- *
- * @package PhpMyAdmin-test
- */
-class OptionsPropertyRootGroupTest extends PHPUnit_Framework_TestCase
-{
-    protected $object;
-
-    /**
-     * Configures global environment.
-     *
-     * @return void
-     */
-    protected function setup()
-    {
-        $this->object = new OptionsPropertyRootGroup();
-    }
-
-    /**
-     * tearDown for test cases
-     *
-     * @return void
-     */
-    protected function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Test for PMA\libraries\properties\options\groups\OptionsPropertyRootGroup::getItemType
-     *
-     * @return void
-     */
-    public function testGetItemType()
-    {
-        $this->assertEquals(
-            'root',
-            $this->object->getItemType()
-        );
-    }
-
-}
diff --git a/#pma/test/classes/properties/options/groups/OptionsPropertySubgroupTest.php b/#pma/test/classes/properties/options/groups/OptionsPropertySubgroupTest.php
deleted file mode 100644
index b12f6257..00000000
--- a/#pma/test/classes/properties/options/groups/OptionsPropertySubgroupTest.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for PMA\libraries\properties\options\groups\OptionsPropertySubgroup class
- *
- * @package PhpMyAdmin-test
- */
-
-use PMA\libraries\properties\options\groups\OptionsPropertySubgroup;
-
-/**
- * tests for PMA\libraries\properties\options\groups\OptionsPropertySubgroup class
- *
- * @package PhpMyAdmin-test
- */
-class OptionsPropertySubgroupTest extends PHPUnit_Framework_TestCase
-{
-    protected $object;
-
-    /**
-     * Configures global environment.
-     *
-     * @return void
-     */
-    protected function setup()
-    {
-        $this->object = new OptionsPropertySubgroup();
-    }
-
-    /**
-     * tearDown for test cases
-     *
-     * @return void
-     */
-    protected function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Test for PMA\libraries\properties\options\groups\OptionsPropertySubgroup::getItemType
-     *
-     * @return void
-     */
-    public function testGetItemType()
-    {
-        $this->assertEquals(
-            'subgroup',
-            $this->object->getItemType()
-        );
-    }
-
-    /**
-     * Test for
-     *     - PMA\libraries\properties\options\groups\OptionsPropertySubgroup::getSubgroupHeader
-     *     - PMA\libraries\properties\options\groups\OptionsPropertySubgroup::setSubgroupHeader
-     *
-     * @return void
-     */
-    public function testGetSetSubgroupHeader()
-    {
-        $this->object->setSubgroupHeader('subGroupHeader123');
-
-        $this->assertEquals(
-            'subGroupHeader123',
-            $this->object->getSubgroupHeader()
-        );
-    }
-}
diff --git a/#pma/test/classes/properties/options/items/PropertyItemsTest.php b/#pma/test/classes/properties/options/items/PropertyItemsTest.php
deleted file mode 100644
index 04317210..00000000
--- a/#pma/test/classes/properties/options/items/PropertyItemsTest.php
+++ /dev/null
@@ -1,174 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for *PMA\libraries\properties\PropertyItem class
- *
- * @package PhpMyAdmin-test
- */
-
-use PMA\libraries\properties\options\items\BoolPropertyItem;
-use PMA\libraries\properties\options\items\DocPropertyItem;
-use PMA\libraries\properties\options\items\HiddenPropertyItem;
-use PMA\libraries\properties\options\items\MessageOnlyPropertyItem;
-use PMA\libraries\properties\options\items\RadioPropertyItem;
-use PMA\libraries\properties\options\items\SelectPropertyItem;
-use PMA\libraries\properties\options\items\TextPropertyItem;
-
-/**
- * tests for *PMA\libraries\properties\PropertyItem class
- *
- * @package PhpMyAdmin-test
- */
-class PropertyItemsTest extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Test for PMA\libraries\properties\options\items\BoolPropertyItem::getText
-     *
-     * @return void
-     */
-    public function testBoolText()
-    {
-        $object = new BoolPropertyItem(null, 'Text');
-
-        $this->assertEquals(
-            "Text",
-            $object->getText()
-        );
-
-        $object->setText('xtext2');
-
-        $this->assertEquals(
-            "xtext2",
-            $object->getText()
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\properties\options\items\BoolPropertyItem::getName
-     *
-     * @return void
-     */
-    public function testBoolName()
-    {
-        $object = new BoolPropertyItem('xname');
-
-        $this->assertEquals(
-            "xname",
-            $object->getName()
-        );
-
-        $object->setName('xname2');
-
-        $this->assertEquals(
-            "xname2",
-            $object->getName()
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\properties\options\items\BoolPropertyItem::getItemType
-     *
-     * @return void
-     */
-    public function testBoolGetItemType()
-    {
-        $object = new BoolPropertyItem();
-
-        $this->assertEquals(
-            "bool",
-            $object->getItemType()
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\properties\options\items\DocPropertyItem::getItemType
-     *
-     * @return void
-     */
-    public function testGetItemTypeDoc()
-    {
-        $object = new DocPropertyItem();
-
-        $this->assertEquals(
-            "doc",
-            $object->getItemType()
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\properties\options\items\HiddenPropertyItem::getItemType
-     *
-     * @return void
-     */
-    public function testGetItemTypeHidden()
-    {
-        $object = new HiddenPropertyItem();
-
-        $this->assertEquals(
-            "hidden",
-            $object->getItemType()
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\properties\options\items\MessageOnlyPropertyItem::getItemType
-     *
-     * @return void
-     */
-    public function testGetItemTypeMessageOnly()
-    {
-        $object = new MessageOnlyPropertyItem();
-
-        $this->assertEquals(
-            "messageOnly",
-            $object->getItemType()
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\properties\options\items\RadioPropertyItem::getItemType
-     *
-     * @return void
-     */
-    public function testGetItemTypeRadio()
-    {
-        $object = new RadioPropertyItem();
-
-        $this->assertEquals(
-            "radio",
-            $object->getItemType()
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\properties\options\items\SelectPropertyItem::getItemType
-     *
-     * @return void
-     */
-    public function testGetItemTypeSelect()
-    {
-        $object = new SelectPropertyItem();
-
-        $this->assertEquals(
-            "select",
-            $object->getItemType()
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\properties\options\items\TextPropertyItem::getItemType
-     *
-     * @return void
-     */
-    public function testGetItemTypeText()
-    {
-        $object = new TextPropertyItem();
-
-        $this->assertEquals(
-            "text",
-            $object->getItemType()
-        );
-    }
-
-
-}
diff --git a/#pma/test/classes/properties/plugins/ExportPluginPropertiesTest.php b/#pma/test/classes/properties/plugins/ExportPluginPropertiesTest.php
deleted file mode 100644
index e89a3f4e..00000000
--- a/#pma/test/classes/properties/plugins/ExportPluginPropertiesTest.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for PMA\libraries\properties\plugins\ExportPluginProperties class
- *
- * @package PhpMyAdmin-test
- */
-
-use PMA\libraries\properties\plugins\ExportPluginProperties;
-
-require_once 'test/classes/properties/plugins/ImportPluginPropertiesTest.php';
-
-/**
- * Tests for PMA\libraries\properties\plugins\ExportPluginProperties class. Extends PMA_ImportPluginProperties_Tests
- * and adds tests for methods that are not common to both
- *
- * @package PhpMyAdmin-test
- */
-class ExportPluginPropertiesTest extends ImportPluginPropertiesTest
-{
-    protected $object;
-
-    /**
-     * Configures global environment.
-     *
-     * @return void
-     */
-    protected function setup()
-    {
-        $this->object = new ExportPluginProperties();
-    }
-
-    /**
-     * tearDown for test cases
-     *
-     * @return void
-     */
-    public function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Test for PMA\libraries\properties\plugins\ExportPluginProperties::getItemType
-     *
-     * @return void
-     */
-    public function testGetItemType()
-    {
-        $this->assertEquals(
-            'export',
-            $this->object->getItemType()
-        );
-    }
-
-    /**
-     * Test for
-     *     - PMA\libraries\properties\plugins\ExportPluginProperties::getForceFile
-     *     - PMA\libraries\properties\plugins\ExportPluginProperties::setForceFile
-     *
-     * @return void
-     */
-    public function testSetGetForceFile()
-    {
-        $this->object->setForceFile(true);
-
-        $this->assertTrue(
-            $this->object->getForceFile()
-        );
-    }
-
-}
diff --git a/#pma/test/classes/properties/plugins/ImportPluginPropertiesTest.php b/#pma/test/classes/properties/plugins/ImportPluginPropertiesTest.php
deleted file mode 100644
index 53eb0455..00000000
--- a/#pma/test/classes/properties/plugins/ImportPluginPropertiesTest.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for PMA\libraries\properties\plugins\ImportPluginProperties class
- *
- * @package PhpMyAdmin-test
- */
-
-use PMA\libraries\properties\plugins\ImportPluginProperties;
-
-/**
- * tests for PMA\libraries\properties\plugins\ImportPluginProperties class
- *
- * @package PhpMyAdmin-test
- */
-class ImportPluginPropertiesTest extends PHPUnit_Framework_TestCase
-{
-    protected $object;
-
-    /**
-     * Configures global environment.
-     *
-     * @return void
-     */
-    protected function setup()
-    {
-        $this->object = new ImportPluginProperties();
-    }
-
-    /**
-     * tearDown for test cases
-     *
-     * @return void
-     */
-    protected function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Test for PMA\libraries\properties\plugins\ImportPluginProperties::getItemType
-     *
-     * @return void
-     */
-    public function testGetItemType()
-    {
-        $this->assertEquals(
-            'import',
-            $this->object->getItemType()
-        );
-    }
-
-    /**
-     * Test for
-     *     - PMA\libraries\properties\plugins\ImportPluginProperties::getOptionsText
-     *     - PMA\libraries\properties\plugins\ImportPluginProperties::setOptionsText
-     *
-     * @return void
-     */
-    public function testSetGetOptionsText()
-    {
-        $this->object->setOptionsText('options123');
-
-        $this->assertEquals(
-            'options123',
-            $this->object->getOptionsText()
-        );
-    }
-
-    /**
-     * Test for
-     *     - PMA\libraries\properties\plugins\ImportPluginProperties::setMimeType
-     *     - PMA\libraries\properties\plugins\ImportPluginProperties::getMimeType
-     *
-     * @return void
-     */
-    public function testSetGetMimeType()
-    {
-        $this->object->setMimeType('mime123');
-
-        $this->assertEquals(
-            'mime123',
-            $this->object->getMimeType()
-        );
-    }
-
-}
diff --git a/#pma/test/classes/properties/plugins/PluginPropertyItemTest.php b/#pma/test/classes/properties/plugins/PluginPropertyItemTest.php
deleted file mode 100644
index 4e578b64..00000000
--- a/#pma/test/classes/properties/plugins/PluginPropertyItemTest.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for PMA\libraries\properties\plugins\PluginPropertyItem class
- *
- * @package PhpMyAdmin-test
- */
-
-/**
- * Tests for PMA\libraries\properties\plugins\PluginPropertyItem class
- *
- * @package PhpMyAdmin-test
- */
-class PluginPropertyItemTest extends PHPUnit_Framework_TestCase
-{
-    protected $stub;
-
-    /**
-     * Configures global environment.
-     *
-     * @return void
-     */
-    protected function setup()
-    {
-        $this->stub = $this->getMockForAbstractClass('PMA\libraries\properties\plugins\PluginPropertyItem');
-    }
-
-    /**
-     * tearDown for test cases
-     *
-     * @return void
-     */
-    public function tearDown()
-    {
-        unset($this->stub);
-    }
-
-    /**
-     * Test for PMA\libraries\properties\plugins\PluginPropertyItem::getPropertyType
-     *
-     * @return void
-     */
-    public function testGetPropertyType()
-    {
-        if ((defined('HHVM_VERSION')
-            && (version_compare(constant('HHVM_VERSION'), '3.8', 'lt')))
-        ) {
-            $this->markTestSkipped('Due to a bug in early versions of HHVM, this test cannot be completed.');
-        }
-
-        $this->assertEquals(
-            "plugin",
-            $this->stub->getPropertyType()
-        );
-    }
-}
diff --git a/#pma/test/classes/schema/DiaRelationSchemaTest.php b/#pma/test/classes/schema/DiaRelationSchemaTest.php
deleted file mode 100644
index 7fc96a38..00000000
--- a/#pma/test/classes/schema/DiaRelationSchemaTest.php
+++ /dev/null
@@ -1,174 +0,0 @@
-<?php
-/**
- * Tests for PMA\libraries\plugins\schema\dia\DiaRelationSchema class
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-use PMA\libraries\plugins\schema\dia\DiaRelationSchema;
-
-require_once 'libraries/relation.lib.php';
-require_once 'libraries/url_generating.lib.php';
-require_once 'libraries/database_interface.inc.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * Tests for PMA\libraries\plugins\schema\dia\DiaRelationSchema class
- *
- * @package PhpMyAdmin-test
- */
-class DiaRelationSchemaTest extends PMATestCase
-{
-    /**
-     * @access protected
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function setUp()
-    {
-        $_REQUEST['page_number'] = 33;
-        $_REQUEST['dia_show_color'] = true;
-        $_REQUEST['dia_show_keys'] = true;
-        $_REQUEST['dia_orientation'] = 'orientation';
-        $_REQUEST['dia_paper'] = 'paper';
-        $_REQUEST['t_h'] = array('information_schema.files' => 1);
-        $_REQUEST['t_x'] = array('information_schema.files' => 0);
-        $_REQUEST['t_y'] = array('information_schema.files' => 0);
-
-        $GLOBALS['server'] = 1;
-        $GLOBALS['controllink'] = null;
-        $GLOBALS['db'] = 'information_schema';
-        $GLOBALS['cfg']['Server']['table_coords'] = "table_name";
-
-        //_SESSION
-        $_SESSION['relation'][$GLOBALS['server']] = array(
-            'PMA_VERSION' => PMA_VERSION,
-            'table_coords' => "table_name",
-            'displaywork' => 'displaywork',
-            'db' => "information_schema",
-            'table_info' => 'table_info',
-            'relwork' => 'relwork',
-            'relation' => 'relation'
-        );
-        PMA_getRelationsParam();
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->any())
-            ->method('numRows')
-            ->will($this->returnValue(1));
-
-        $dbi->expects($this->any())
-            ->method('query')
-            ->will($this->returnValue("executed_1"));
-
-        $dbi->expects($this->any())
-            ->method('tryQuery')
-            ->will($this->returnValue("executed_1"));
-
-        $fetchArrayReturn = array(
-            //table name in information_schema_relations
-            'table_name' => 'CHARACTER_SETS'
-        );
-
-        $fetchArrayReturn2 = array(
-            //table name in information_schema_relations
-            'table_name' => 'COLLATIONS'
-        );
-
-        $dbi->expects($this->at(2))
-            ->method('fetchAssoc')
-            ->will($this->returnValue($fetchArrayReturn));
-        $dbi->expects($this->at(3))
-            ->method('fetchAssoc')
-            ->will($this->returnValue($fetchArrayReturn2));
-        $dbi->expects($this->at(4))
-            ->method('fetchAssoc')
-            ->will($this->returnValue(false));
-
-        $getIndexesResult = array(
-            array(
-                'Table' => 'pma_tbl',
-                'Field' => 'field1',
-                'Key' => 'PRIMARY',
-                'Key_name' => "Key_name",
-                'Column_name' => "Column_name"
-            )
-        );
-        $dbi->expects($this->any())->method('getTableIndexes')
-            ->will($this->returnValue($getIndexesResult));
-
-        $fetchValue = "CREATE TABLE `pma_bookmark` (
-             `id` int(11) NOT NULL AUTO_INCREMENT,
-              `dbase` varchar(255) COLLATE utf8_bin NOT NULL DEFAULT '',
-              `user` varchar(255) COLLATE utf8_bin NOT NULL DEFAULT '',
-              `label` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT '',
-              `query` text COLLATE utf8_bin NOT NULL,
-              PRIMARY KEY (`id`)
-             ) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 "
-            . "COLLATE=utf8_bin COMMENT='Bookmarks'";
-
-        $dbi->expects($this->any())
-            ->method('fetchValue')
-            ->will($this->returnValue($fetchValue));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $this->object = new DiaRelationSchema('information_schema');
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Test for construct, the Property is set correctly
-     *
-     * @return void
-     *
-     * @group medium
-     */
-    public function testSetProperty()
-    {
-        $this->assertEquals(
-            33,
-            $this->object->getPageNumber()
-        );
-        $this->assertEquals(
-            true,
-            $this->object->isShowColor()
-        );
-        $this->assertEquals(
-            true,
-            $this->object->isShowKeys()
-        );
-        $this->assertEquals(
-            'L',
-            $this->object->getOrientation()
-        );
-        $this->assertEquals(
-            'paper',
-            $this->object->getPaper()
-        );
-    }
-}
diff --git a/#pma/test/classes/schema/EpsRelationSchemaTest.php b/#pma/test/classes/schema/EpsRelationSchemaTest.php
deleted file mode 100644
index eb269efb..00000000
--- a/#pma/test/classes/schema/EpsRelationSchemaTest.php
+++ /dev/null
@@ -1,195 +0,0 @@
-<?php
-/**
- * Tests for EpsRelationSchema class
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-use PMA\libraries\plugins\schema\eps\EpsRelationSchema;
-
-require_once 'libraries/relation.lib.php';
-require_once 'libraries/url_generating.lib.php';
-require_once 'libraries/database_interface.inc.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * Tests for EpsRelationSchema class
- *
- * @package PhpMyAdmin-test
- */
-class EpsRelationSchemaTest extends PMATestCase
-{
-    /**
-     * @access protected
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function setUp()
-    {
-        $_REQUEST['page_number'] = 33;
-        $_REQUEST['eps_show_color'] = true;
-        $_REQUEST['eps_show_keys'] = true;
-        $_REQUEST['eps_orientation'] = 'orientation';
-        $_REQUEST['eps_show_table_dimension'] = true;
-        $_REQUEST['eps_all_tables_same_width'] = true;
-        $_REQUEST['t_h'] = array('information_schema.files' => 1);
-        $_REQUEST['t_x'] = array('information_schema.files' => 0);
-        $_REQUEST['t_y'] = array('information_schema.files' => 0);
-
-        $GLOBALS['server'] = 1;
-        $GLOBALS['controllink'] = null;
-        $GLOBALS['db'] = 'information_schema';
-        $GLOBALS['cfg']['Server']['table_coords'] = "table_name";
-
-        //_SESSION
-        $_SESSION['relation'][$GLOBALS['server']] = array(
-            'PMA_VERSION' => PMA_VERSION,
-            'table_coords' => "table_name",
-            'displaywork' => 'displaywork',
-            'db' => "information_schema",
-            'table_info' => 'table_info',
-            'relwork' => 'relwork',
-            'relation' => 'relation'
-        );
-        PMA_getRelationsParam();
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->any())
-            ->method('numRows')
-            ->will($this->returnValue(1));
-
-        $dbi->expects($this->any())
-            ->method('query')
-            ->will($this->returnValue("executed_1"));
-
-        $dbi->expects($this->any())
-            ->method('tryQuery')
-            ->will($this->returnValue("executed_1"));
-
-        $fetchArrayReturn = array(
-            //table name in information_schema_relations
-            'table_name' => 'CHARACTER_SETS'
-        );
-
-        $fetchArrayReturn2 = array(
-            //table name in information_schema_relations
-            'table_name' => 'COLLATIONS'
-        );
-
-        $dbi->expects($this->at(2))
-            ->method('fetchAssoc')
-            ->will($this->returnValue($fetchArrayReturn));
-        $dbi->expects($this->at(3))
-            ->method('fetchAssoc')
-            ->will($this->returnValue($fetchArrayReturn2));
-        $dbi->expects($this->at(4))
-            ->method('fetchAssoc')
-            ->will($this->returnValue(false));
-
-        $getIndexesResult = array(
-            array(
-                'Table' => 'pma_tbl',
-                'Field' => 'field1',
-                'Key' => 'PRIMARY',
-                'Key_name' => "Key_name",
-                'Column_name' => "Column_name"
-            )
-        );
-        $dbi->expects($this->any())->method('getTableIndexes')
-            ->will($this->returnValue($getIndexesResult));
-
-        $fetchValue = "CREATE TABLE `pma_bookmark` (
-             `id` int(11) NOT NULL AUTO_INCREMENT,
-              `dbase` varchar(255) COLLATE utf8_bin NOT NULL DEFAULT '',
-              `user` varchar(255) COLLATE utf8_bin NOT NULL DEFAULT '',
-              `label` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT '',
-              `query` text COLLATE utf8_bin NOT NULL,
-              PRIMARY KEY (`id`)
-             ) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 "
-            . "COLLATE=utf8_bin COMMENT='Bookmarks'";
-
-        $dbi->expects($this->any())
-            ->method('fetchValue')
-            ->will($this->returnValue($fetchValue));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $this->object = new EpsRelationSchema('information_schema');
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Test for construct
-     *
-     * @return void
-     *
-     * @group medium
-     */
-    public function testConstructor()
-    {
-        $this->assertEquals(
-            33,
-            $this->object->getPageNumber()
-        );
-        $this->assertEquals(
-            true,
-            $this->object->isShowColor()
-        );
-        $this->assertEquals(
-            true,
-            $this->object->isShowKeys()
-        );
-        $this->assertEquals(
-            true,
-            $this->object->isTableDimension()
-        );
-        $this->assertEquals(
-            true,
-            $this->object->isAllTableSameWidth()
-        );
-        $this->assertEquals(
-            'L',
-            $this->object->getOrientation()
-        );
-    }
-
-    /**
-     * Test for setPageNumber
-     *
-     * @return void
-     *
-     * @group medium
-     */
-    public function testSetPageNumber()
-    {
-        $this->object->setPageNumber(33);
-        $this->assertEquals(
-            33,
-            $this->object->getPageNumber()
-        );
-    }
-}
diff --git a/#pma/test/classes/schema/ExportRelationSchemaTest.php b/#pma/test/classes/schema/ExportRelationSchemaTest.php
deleted file mode 100644
index f20c0e94..00000000
--- a/#pma/test/classes/schema/ExportRelationSchemaTest.php
+++ /dev/null
@@ -1,197 +0,0 @@
-<?php
-/**
- * Tests for PMA\libraries\plugins\schema\ExportRelationSchema class
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-
-use PMA\libraries\plugins\schema\ExportRelationSchema;
-
-require_once 'libraries/relation.lib.php';
-require_once 'libraries/url_generating.lib.php';
-require_once 'libraries/database_interface.inc.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * Tests for PMA\libraries\plugins\schema\ExportRelationSchema class
- *
- * @package PhpMyAdmin-test
- */
-class ExportRelationSchemaTest extends PMATestCase
-{
-    /**
-     * @access protected
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function setUp()
-    {
-        $_REQUEST['page_number'] = 33;
-        $this->object = new ExportRelationSchema('information_schema', null);
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Test for setPageNumber
-     *
-     * @return void
-     *
-     * @group medium
-     */
-    public function testSetPageNumber()
-    {
-        $this->object->setPageNumber(33);
-        $this->assertEquals(
-            33,
-            $this->object->getPageNumber()
-        );
-    }
-
-    /**
-     * Test for setShowColor
-     *
-     * @return void
-     *
-     * @group medium
-     */
-    public function testSetShowColor()
-    {
-        $this->object->setShowColor(true);
-        $this->assertEquals(
-            true,
-            $this->object->isShowColor()
-        );
-        $this->object->setShowColor(false);
-        $this->assertEquals(
-            false,
-            $this->object->isShowColor()
-        );
-    }
-
-    /**
-     * Test for setOrientation
-     *
-     * @return void
-     *
-     * @group medium
-     */
-    public function testSetOrientation()
-    {
-        $this->object->setOrientation('P');
-        $this->assertEquals(
-            'P',
-            $this->object->getOrientation()
-        );
-        $this->object->setOrientation('A');
-        $this->assertEquals(
-            'L',
-            $this->object->getOrientation()
-        );
-    }
-
-    /**
-     * Test for setTableDimension
-     *
-     * @return void
-     *
-     * @group medium
-     */
-    public function testSetTableDimension()
-    {
-        $this->object->setTableDimension(true);
-        $this->assertEquals(
-            true,
-            $this->object->isTableDimension()
-        );
-        $this->object->setTableDimension(false);
-        $this->assertEquals(
-            false,
-            $this->object->isTableDimension()
-        );
-    }
-
-    /**
-     * Test for setPaper
-     *
-     * @return void
-     *
-     * @group medium
-     */
-    public function testSetPaper()
-    {
-        $this->object->setPaper('A5');
-        $this->assertEquals(
-            'A5',
-            $this->object->getPaper()
-        );
-        $this->object->setPaper('A4');
-        $this->assertEquals(
-            'A4',
-            $this->object->getPaper()
-        );
-    }
-
-    /**
-     * Test for setAllTablesSameWidth
-     *
-     * @return void
-     *
-     * @group medium
-     */
-    public function testSetAllTablesSameWidth()
-    {
-        $this->object->setAllTablesSameWidth(true);
-        $this->assertEquals(
-            true,
-            $this->object->isAllTableSameWidth()
-        );
-        $this->object->setAllTablesSameWidth(false);
-        $this->assertEquals(
-            false,
-            $this->object->isAllTableSameWidth()
-        );
-    }
-
-    /**
-     * Test for setShowKeys
-     *
-     * @return void
-     *
-     * @group medium
-     */
-    public function testSetShowKeys()
-    {
-        $this->object->setShowKeys(true);
-        $this->assertEquals(
-            true,
-            $this->object->isShowKeys()
-        );
-        $this->object->setShowKeys(false);
-        $this->assertEquals(
-            false,
-            $this->object->isShowKeys()
-        );
-    }
-}
diff --git a/#pma/test/classes/schema/PdfRelationSchemaTest.php b/#pma/test/classes/schema/PdfRelationSchemaTest.php
deleted file mode 100644
index 8ce0df9a..00000000
--- a/#pma/test/classes/schema/PdfRelationSchemaTest.php
+++ /dev/null
@@ -1,234 +0,0 @@
-<?php
-/**
- * Tests for PdfRelationSchema class
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-use PMA\libraries\plugins\schema\pdf\PdfRelationSchema;
-
-require_once 'libraries/relation.lib.php';
-require_once 'libraries/url_generating.lib.php';
-require_once 'libraries/database_interface.inc.php';
-require_once 'libraries/transformations.lib.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * Tests for PdfRelationSchema class
- *
- * @package PhpMyAdmin-test
- */
-class PdfRelationSchemaTest extends PMATestCase
-{
-    /**
-     * @access protected
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function setUp()
-    {
-        $_REQUEST['page_number'] = 33;
-        $_REQUEST['pdf_show_grid'] = true;
-        $_REQUEST['pdf_show_color'] = true;
-        $_REQUEST['pdf_show_keys'] = true;
-        $_REQUEST['pdf_orientation'] = 'orientation';
-        $_REQUEST['pdf_show_table_dimension'] = true;
-        $_REQUEST['pdf_all_tables_same_width'] = true;
-        $_REQUEST['pdf_paper'] = 'paper';
-        $_REQUEST['pdf_table_order'] = '';
-        $_REQUEST['t_h'] = array('information_schema.files' => 1);
-        $_REQUEST['t_x'] = array('information_schema.files' => 0);
-        $_REQUEST['t_y'] = array('information_schema.files' => 0);
-
-        $GLOBALS['server'] = 1;
-        $GLOBALS['controllink'] = null;
-        $GLOBALS['db'] = 'information_schema';
-        $GLOBALS['cfg']['Server']['pmadb'] = "pmadb";
-        $GLOBALS['cfg']['Server']['user'] = "user";
-        $GLOBALS['cfg']['Server']['table_coords'] = "table_name";
-        $GLOBALS['cfg']['Server']['bookmarktable'] = "bookmarktable";
-        $GLOBALS['cfg']['Server']['relation'] = "relation";
-        $GLOBALS['cfg']['Server']['table_info'] = "table_info";
-
-        //_SESSION
-        $_SESSION['relation'][$GLOBALS['server']] = array(
-            'PMA_VERSION' => PMA_VERSION,
-            'table_coords' => "table_name",
-            'displaywork' => 'displaywork',
-            'db' => "information_schema",
-            'table_info' => 'table_info',
-            'relwork' => false,
-            'relation' => 'relation',
-            'mimework' => 'mimework',
-            'commwork' => 'commwork',
-            'column_info' => 'column_info',
-            'pdf_pages' => 'pdf_pages'
-        );
-        PMA_getRelationsParam();
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->any())
-            ->method('numRows')
-            ->will($this->returnValue(1));
-
-        $dbi->expects($this->any())
-            ->method('query')
-            ->will($this->returnValue("executed_1"));
-
-        $dbi->expects($this->any())
-            ->method('tryQuery')
-            ->will($this->returnValue("executed_1"));
-
-        $fetchArrayReturn = array(
-            //table name in information_schema_relations
-            'table_name' => 'CHARACTER_SETS'
-        );
-
-        $fetchArrayReturn2 = array(
-            //table name in information_schema_relations
-            'table_name' => 'COLLATIONS'
-        );
-
-        $dbi->expects($this->at(2))
-            ->method('fetchAssoc')
-            ->will($this->returnValue($fetchArrayReturn));
-        $dbi->expects($this->at(3))
-            ->method('fetchAssoc')
-            ->will($this->returnValue($fetchArrayReturn2));
-        $dbi->expects($this->at(4))
-            ->method('fetchAssoc')
-            ->will($this->returnValue(false));
-
-        $fetchRowReturn = array(
-            'table_name',
-            'table_name'
-        );
-
-        //let fetchRow have more results
-        for ($index=0; $index<4; ++$index) {
-            $dbi->expects($this->at($index))
-                ->method('fetchRow')
-                ->will($this->returnValue($fetchRowReturn));
-        }
-
-        $fields_info = array(
-            "Host" => array(
-                "Field" => "host",
-                "Type" => "char(60)",
-                "Null" => "NO",
-                'Extra' => "Extra",
-            )
-        );
-        $dbi->expects($this->any())->method('getColumns')
-            ->will($this->returnValue($fields_info));
-
-        $dbi->expects($this->any())->method('selectDb')
-            ->will($this->returnValue(true));
-
-        $getIndexesResult = array(
-            array(
-                'Table' => 'pma_tbl',
-                'Field' => 'field1',
-                'Key' => 'PRIMARY',
-                'Key_name' => "Key_name",
-                'Column_name' => "Column_name"
-            )
-        );
-        $dbi->expects($this->any())->method('getTableIndexes')
-            ->will($this->returnValue($getIndexesResult));
-
-        $fetchValue = "CREATE TABLE `pma_bookmark` (
-             `id` int(11) NOT NULL AUTO_INCREMENT,
-              `dbase` varchar(255) COLLATE utf8_bin NOT NULL DEFAULT '',
-              `user` varchar(255) COLLATE utf8_bin NOT NULL DEFAULT '',
-              `label` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT '',
-              `query` text COLLATE utf8_bin NOT NULL,
-              PRIMARY KEY (`id`)
-             ) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 "
-            . "COLLATE=utf8_bin COMMENT='Bookmarks'";
-
-        $dbi->expects($this->any())
-            ->method('fetchValue')
-            ->will($this->returnValue($fetchValue));
-
-        $fetchResult = array(
-            'column1' => array('mimetype' => 'value1', 'transformation'=> 'pdf'),
-            'column2' => array('mimetype' => 'value2', 'transformation'=> 'xml'),
-        );
-
-        $dbi->expects($this->any())->method('fetchResult')
-            ->will($this->returnValue($fetchResult));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $this->object = new PdfRelationSchema('information_schema');
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Test for construct
-     *
-     * @return void
-     *
-     * @group large
-     */
-    public function testConstructor()
-    {
-        $this->assertEquals(
-            33,
-            $this->object->getPageNumber()
-        );
-        $this->assertEquals(
-            true,
-            $this->object->isShowGrid()
-        );
-        $this->assertEquals(
-            true,
-            $this->object->isShowColor()
-        );
-        $this->assertEquals(
-            true,
-            $this->object->isShowKeys()
-        );
-        $this->assertEquals(
-            true,
-            $this->object->isTableDimension()
-        );
-        $this->assertEquals(
-            true,
-            $this->object->isAllTableSameWidth()
-        );
-        $this->assertEquals(
-            'L',
-            $this->object->getOrientation()
-        );
-        $this->assertEquals(
-            'paper',
-            $this->object->getPaper()
-        );
-    }
-}
diff --git a/#pma/test/classes/schema/SvgRelationSchemaTest.php b/#pma/test/classes/schema/SvgRelationSchemaTest.php
deleted file mode 100644
index ebcabb75..00000000
--- a/#pma/test/classes/schema/SvgRelationSchemaTest.php
+++ /dev/null
@@ -1,174 +0,0 @@
-<?php
-/**
- * Tests for PMA\libraries\plugins\schema\svg\SvgRelationSchema class
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-use PMA\libraries\plugins\schema\svg\SvgRelationSchema;
-
-require_once 'libraries/relation.lib.php';
-require_once 'libraries/url_generating.lib.php';
-require_once 'libraries/database_interface.inc.php';
-require_once 'test/PMATestCase.php';
-
-/**
- * Tests for PMA\libraries\plugins\schema\svg\SvgRelationSchema class
- *
- * @package PhpMyAdmin-test
- */
-class SvgRelationSchemaTest extends PMATestCase
-{
-    /**
-     * @access protected
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function setUp()
-    {
-        $_REQUEST['page_number'] = 33;
-        $_REQUEST['svg_show_color'] = true;
-        $_REQUEST['svg_show_keys'] = true;
-        $_REQUEST['svg_show_table_dimension'] = true;
-        $_REQUEST['svg_all_tables_same_width'] = true;
-        $_REQUEST['t_h'] = array('information_schema.files' => 1);
-        $_REQUEST['t_x'] = array('information_schema.files' => 0);
-        $_REQUEST['t_y'] = array('information_schema.files' => 0);
-
-        $GLOBALS['server'] = 1;
-        $GLOBALS['controllink'] = null;
-        $GLOBALS['db'] = 'information_schema';
-        $GLOBALS['cfg']['Server']['table_coords'] = "table_name";
-
-        //_SESSION
-        $_SESSION['relation'][$GLOBALS['server']] = array(
-            'PMA_VERSION' => PMA_VERSION,
-            'table_coords' => "table_name",
-            'displaywork' => 'displaywork',
-            'db' => "information_schema",
-            'table_info' => 'table_info',
-            'relwork' => 'relwork',
-            'relation' => 'relation'
-        );
-        PMA_getRelationsParam();
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->any())
-            ->method('numRows')
-            ->will($this->returnValue(1));
-
-        $dbi->expects($this->any())
-            ->method('query')
-            ->will($this->returnValue("executed_1"));
-
-        $dbi->expects($this->any())
-            ->method('tryQuery')
-            ->will($this->returnValue("executed_1"));
-
-        $fetchArrayReturn = array(
-            //table name in information_schema_relations
-            'table_name' => 'CHARACTER_SETS'
-        );
-
-        $fetchArrayReturn2 = array(
-            //table name in information_schema_relations
-            'table_name' => 'COLLATIONS'
-        );
-
-        $dbi->expects($this->at(2))
-            ->method('fetchAssoc')
-            ->will($this->returnValue($fetchArrayReturn));
-        $dbi->expects($this->at(3))
-            ->method('fetchAssoc')
-            ->will($this->returnValue($fetchArrayReturn2));
-        $dbi->expects($this->at(4))
-            ->method('fetchAssoc')
-            ->will($this->returnValue(false));
-
-        $getIndexesResult = array(
-            array(
-                'Table' => 'pma_tbl',
-                'Field' => 'field1',
-                'Key' => 'PRIMARY',
-                'Key_name' => "Key_name",
-                'Column_name' => "Column_name"
-            )
-        );
-        $dbi->expects($this->any())->method('getTableIndexes')
-            ->will($this->returnValue($getIndexesResult));
-
-        $fetchValue = "CREATE TABLE `pma_bookmark` (
-             `id` int(11) NOT NULL AUTO_INCREMENT,
-              `dbase` varchar(255) COLLATE utf8_bin NOT NULL DEFAULT '',
-              `user` varchar(255) COLLATE utf8_bin NOT NULL DEFAULT '',
-              `label` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT '',
-              `query` text COLLATE utf8_bin NOT NULL,
-              PRIMARY KEY (`id`)
-             ) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 "
-            . "COLLATE=utf8_bin COMMENT='Bookmarks'";
-
-        $dbi->expects($this->any())
-            ->method('fetchValue')
-            ->will($this->returnValue($fetchValue));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $this->object = new SvgRelationSchema('information_schema');
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Test for construct
-     *
-     * @return void
-     *
-     * @group medium
-     */
-    public function testConstructor()
-    {
-        $this->assertEquals(
-            33,
-            $this->object->getPageNumber()
-        );
-        $this->assertEquals(
-            true,
-            $this->object->isShowColor()
-        );
-        $this->assertEquals(
-            true,
-            $this->object->isShowKeys()
-        );
-        $this->assertEquals(
-            true,
-            $this->object->isTableDimension()
-        );
-        $this->assertEquals(
-            true,
-            $this->object->isAllTableSameWidth()
-        );
-    }
-}
diff --git a/#pma/test/install-browserstack b/#pma/test/install-browserstack
deleted file mode 100644
index 7320dadb..00000000
--- a/#pma/test/install-browserstack
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-set -e
-set -x
-
-if [ -z  "$SELENIUM" ] ; then
-    exit 0
-fi
-
-mkdir -p ~/browserstack
-cd ~/browserstack
-if [ ! -f BrowserStackLocal ] ; then
-    wget https://www.browserstack.com/browserstack-local/BrowserStackLocal-linux-x64.zip
-    unzip BrowserStackLocal-linux-x64.zip
-fi
-
diff --git a/#pma/test/install-runkit b/#pma/test/install-runkit
deleted file mode 100644
index 469440e8..00000000
--- a/#pma/test/install-runkit
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-if [ "$TRAVIS_PHP_VERSION" = "nightly" -o "$TRAVIS_PHP_VERSION" = "hhvm" -o "$TRAVIS_PHP_VERSION" = "7.0" ] ; then
-    exit 0
-fi
-
-set -e
-set -x
-
-pecl install runkit
-
-phpenv config-add test/php-runkit.ini
diff --git a/#pma/test/libraries/Files_test.php b/#pma/test/libraries/Files_test.php
deleted file mode 100644
index 6129171d..00000000
--- a/#pma/test/libraries/Files_test.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for bookmark.lib.php
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-
-
-/**
- * tests for bookmark.lib.php
- *
- * @package PhpMyAdmin-test
- */
-class FilesTest extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    public function setUp()
-    {
-    }
-
-    public function testJsMessages()
-    {
-        ob_start();
-        $GLOBALS['pmaThemeImage'] = '';
-        $cfg = array(
-            'AllowUserDropDatabase' => true,
-            'GridEditing' => 'click',
-        );
-        require 'js/messages.php';
-        $out = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('var PMA_messages = new Array();', $out);
-    }
-
-}
diff --git a/#pma/test/libraries/PMA_FormDisplay_tpl_test.php b/#pma/test/libraries/PMA_FormDisplay_tpl_test.php
deleted file mode 100644
index 736f00e6..00000000
--- a/#pma/test/libraries/PMA_FormDisplay_tpl_test.php
+++ /dev/null
@@ -1,582 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for FromDisplay.tpl.php
- *
- * @package PhpMyAdmin-test
- */
-
-use PMA\libraries\Theme;
-
-require_once 'libraries/config/FormDisplay.tpl.php';
-require_once 'libraries/user_preferences.lib.php';
-require_once 'libraries/url_generating.lib.php';
-require_once 'libraries/js_escape.lib.php';
-
-/**
- * Tests for FromDisplay.tpl.php
- *
- * @package PhpMyAdmin-test
- */
-class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Test for PMA_displayFormTop()
-     *
-     * @return void
-     */
-    public function testDisplayFormTop()
-    {
-        $_SERVER['REQUEST_URI'] = 'https://www.phpmyadmin.net';
-        $GLOBALS['cfg']['ServerDefault'] = '';
-        $result = PMA_displayFormTop(null, 'posted', array(1));
-
-        $this->assertContains(
-            '<form method="get" action="https://www.phpmyadmin.net" ' .
-            'class="config-form disableAjax">',
-            $result
-        );
-
-        $this->assertContains(
-            '<input type="hidden" name="tab_hash" value="" />',
-            $result
-        );
-
-        $this->assertContains(
-            '<input type="hidden" name="lang" value="en" />',
-            $result
-        );
-
-        $this->assertContains(
-            '<input type="hidden" name="token" value="token" />',
-            $result
-        );
-
-        $this->assertContains(
-            '<input type="hidden" name="0" value="1" />',
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA_displayTabsTop()
-     *
-     * @return void
-     */
-    public function testDisplayTabsTop()
-    {
-        $result = PMA_displayTabsTop(array('one', 'two'));
-
-        $this->assertContains(
-            '<ul class="tabs"',
-            $result
-        );
-
-        $this->assertContains(
-            '<a href="#0"',
-            $result
-        );
-
-        $this->assertContains(
-            '<a href="#1"',
-            $result
-        );
-
-        $this->assertContains(
-            '<div class="tabs_contents"',
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA_displayFieldsetTop()
-     *
-     * @return void
-     */
-    public function testDisplayFieldsetTop()
-    {
-        $attributes = array('name' => 'attrname');
-        $errors = array('e1', 'e2');
-
-        $result = PMA_displayFieldsetTop("TitleTest", "DescTest", $errors, $attributes);
-
-        $this->assertContains(
-            '<fieldset class="optbox" name="attrname">',
-            $result
-        );
-
-        $this->assertContains(
-            '<legend>',
-            $result
-        );
-
-        $this->assertContains(
-            '<p>',
-            $result
-        );
-
-        $this->assertContains(
-            '<dl class="errors">',
-            $result
-        );
-
-        $this->assertContains(
-            '<dd>',
-            $result
-        );
-
-        $this->assertContains(
-            '<table width="100%" cellspacing="0">',
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA_displayInput()
-     *
-     * @return void
-     */
-    public function testDisplayInput()
-    {
-        if (! PMA_HAS_RUNKIT) {
-            $this->markTestSkipped('Cannot modify constant');
-        }
-
-        $_SESSION['PMA_Theme'] = new Theme();
-        $GLOBALS['pmaThemeImage'] = 'testImage';
-        $GLOBALS['_FormDislayGroup'] = 1;
-        $opts = array();
-        $opts['errors'] = array('e1');
-        $opts['userprefs_allow'] = false;
-        $opts['setvalue'] = ':group';
-        $opts['doc'] = "https://example.com/";
-        $opts['comment'] = "testComment";
-        $opts['comment_warning'] = true;
-        $opts['show_restore_default'] = true;
-        $result = PMA_displayInput(
-            'test/path', 'testName', 'text', 'val',
-            'desc', false, $opts
-        );
-
-        $this->assertContains(
-            '<tr class="group-header-field group-header-1 disabled-field">',
-            $result
-        );
-
-        $this->assertContains(
-            '<label for="test/path">',
-            $result
-        );
-
-        $this->assertContains(
-            '<a href="https://example.com/" target="documentation"',
-            $result
-        );
-
-        $this->assertContains(
-            '<img src="testImageb_help.png" title="Documentation" ' .
-            'alt="Documentation" /',
-            $result
-        );
-
-        $this->assertContains(
-            '<span class="disabled-notice"',
-            $result
-        );
-
-        $this->assertContains(
-            '<small>',
-            $result
-        );
-
-        $this->assertContains(
-            '<input type="text" size="40" name="test/path" id="test/path" ' .
-            'class="custom field-error" value="val" />',
-            $result
-        );
-
-        $this->assertContains(
-            '<span class="field-comment-mark field-comment-warning" '
-            . 'title="testComment">',
-            $result
-        );
-
-        $this->assertContains(
-            '<a class="restore-default" href="#test/path"',
-            $result
-        );
-
-        $this->assertContains(
-            '<dl class="inline_errors"><dd>e1</dd></dl>',
-            $result
-        );
-
-        // second case
-
-        define('PMA_SETUP', true);
-        $GLOBALS['_FormDislayGroup'] = 0;
-        $GLOBALS['cfg']['ThemePath'] = 'themePath';
-        $opts = array();
-        $opts['errors'] = array();
-        $opts['setvalue'] = 'setVal';
-        $opts['comment'] = "testComment";
-        $opts['show_restore_default'] = true;
-        $opts['userprefs_comment'] = 'userprefsComment';
-        $opts['userprefs_allow'] = true;
-
-        $result = PMA_displayInput(
-            'test/path', 'testName', 'checkbox', 'val',
-            '', false, $opts
-        );
-
-        $this->assertContains(
-            '<tr class="group-field group-field-1">',
-            $result
-        );
-
-        $this->assertContains(
-            '<input type="checkbox" name="test/path" id="test/path" ' .
-            'checked="checked" />',
-            $result
-        );
-
-        $this->assertContains(
-            '<a class="userprefs-comment" title="userprefsComment">',
-            $result
-        );
-
-        $this->assertContains(
-            '<td class="userprefs-allow" title="Allow users to customize ' .
-            'this value">',
-            $result
-        );
-
-        $this->assertContains(
-            '<a class="set-value" href="#test/path=setVal" ' .
-            'title="Set value: setVal" style="display:none">',
-            $result
-        );
-
-        // short_text
-        $GLOBALS['_FormDislayGroup'] = 0;
-        $GLOBALS['cfg']['ThemePath'] = 'themePath';
-        $opts = array();
-        $opts['errors'] = array();
-
-        $result = PMA_displayInput(
-            'test/path', 'testName', 'short_text', 'val',
-            '', true, $opts
-        );
-
-        $this->assertContains(
-            '<input type="text" size="25" name="test/path" id="test/path" ' .
-            'value="val" />',
-            $result
-        );
-
-        // number_text
-        $result = PMA_displayInput(
-            'test/path', 'testName', 'number_text', 'val',
-            '', true, $opts
-        );
-
-        $this->assertContains(
-            '<input type="number" name="test/path" ' .
-            'id="test/path" value="val" />',
-            $result
-        );
-
-        // select case 1
-        $opts['values_escaped'] = true;
-        $opts['values_disabled'] = array(1, 2);
-        $opts['values'] = array(
-            1 => 'test',
-            'key1' => true,
-            'key2' => false,
-        );
-        $result = PMA_displayInput(
-            'test/path', 'testName', 'select', true,
-            '', true, $opts
-        );
-        $this->assertContains(
-            '<select name="test/path" id="test/path">',
-            $result
-        );
-
-        $this->assertContains(
-            '<option value="1" selected="selected" disabled="disabled">',
-            $result
-        );
-
-        $this->assertContains(
-            '<option value="key1">',
-            $result
-        );
-
-        $this->assertContains(
-            '<option value="key2">',
-            $result
-        );
-
-        // select case 2
-        $opts['values_escaped'] = false;
-        $opts['values_disabled'] = array(1, 2);
-        $opts['values'] = array(
-            'a<b' => 'c&d',
-            'key1' => true,
-            'key2' => false,
-        );
-        $result = PMA_displayInput(
-            'test/path', 'testName', 'select', false,
-            '', true, $opts
-        );
-
-        $this->assertContains(
-            '<select name="test/path" id="test/path">',
-            $result
-        );
-
-        // assertContains doesn't seem to work with htmlentities
-        $this->assertContains(
-            '<option value="a&lt;b">c&amp;d</option>',
-            $result
-        );
-
-        // list
-        $result = PMA_displayInput(
-            'test/path', 'testName', 'list', array('foo', 'bar'),
-            '', true, $opts
-        );
-
-        $this->assertContains(
-            '<textarea cols="40" rows="5" name="test/path" id="test/path">',
-            $result
-        );
-        runkit_constant_remove('PMA_SETUP');
-    }
-
-    /**
-     * Test for PMA_displayGroupHeader()
-     *
-     * @return void
-     */
-    public function testDisplayGroupHeader()
-    {
-        if (! PMA_HAS_RUNKIT) {
-            $this->markTestSkipped('Cannot modify constant');
-        }
-
-        $this->assertNull(
-            PMA_displayGroupHeader('')
-        );
-
-        $GLOBALS['_FormDisplayGroup'] = 3;
-
-        if (!defined('PMA_SETUP')) {
-            define('PMA_SETUP', true);
-        }
-
-        $result = PMA_displayGroupHeader('headerText');
-
-        $this->assertContains(
-            '<tr class="group-header group-header-4">',
-            $result
-        );
-
-        // without PMA_SETUP
-
-        runkit_constant_remove('PMA_SETUP');
-        $GLOBALS['_FormDisplayGroup'] = 3;
-
-        $result = PMA_displayGroupHeader('headerText');
-
-        $this->assertContains(
-            '<tr class="group-header group-header-4">',
-            $result
-        );
-
-    }
-
-    /**
-     * Test for PMA_displayGroupFooter()
-     *
-     * @return void
-     */
-    public function testDisplayGroupFooter()
-    {
-        $GLOBALS['_FormDisplayGroup'] = 3;
-        PMA_displayGroupFooter();
-        $this->assertEquals(
-            2,
-            $GLOBALS['_FormDisplayGroup']
-        );
-    }
-
-    /**
-     * Test for PMA_displayFieldsetBottom()
-     *
-     * @return void
-     */
-    public function testDisplayFieldsetBottom()
-    {
-        if (! PMA_HAS_RUNKIT) {
-            $this->markTestSkipped('Cannot modify constant');
-        }
-
-        // with PMA_SETUP
-
-        if (!defined('PMA_SETUP')) {
-            define('PMA_SETUP', true);
-        }
-
-        $result = PMA_displayFieldsetBottom();
-
-        $this->assertContains(
-            '<td colspan="3" class="lastrow">',
-            $result
-        );
-
-        $this->assertContains(
-            '<input type="submit" name="submit_save" value="Apply"',
-            $result
-        );
-
-        $this->assertContains(
-            '<input type="button" name="submit_reset" value="Reset" />',
-            $result
-        );
-
-        $this->assertContains(
-            '</fieldset>',
-            $result
-        );
-
-        // without PMA_SETUP
-
-        runkit_constant_remove('PMA_SETUP');
-
-        $result = PMA_displayFieldsetBottom();
-
-        $this->assertContains(
-            '<td colspan="2" class="lastrow">',
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA_displayFieldsetBottomSimple()
-     *
-     * @return void
-     */
-    public function testDisplayFieldsetBottomSimple()
-    {
-        $result = PMA_displayFieldsetBottomSimple();
-        $this->assertEquals(
-            '</table></fieldset>',
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA_displayTabsBottom()
-     *
-     * @return void
-     */
-    public function testDisplayTabsBottom()
-    {
-        $result = PMA_displayTabsBottom();
-        $this->assertEquals(
-            "</div>\n",
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA_displayFormBottom()
-     *
-     * @return void
-     */
-    public function testDisplayFormBottom()
-    {
-        $result = PMA_displayFormBottom();
-        $this->assertEquals(
-            "</form>\n",
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA_addJsValidate()
-     *
-     * @return void
-     */
-    public function testAddJsValidate()
-    {
-        $validators = array(
-            'one' => array('\\\';', '\r\n\\\'<scrIpt></\' + \'script>'),
-            'two' => array()
-        );
-
-        $js = array();
-
-        PMA_addJsValidate('testID', $validators, $js);
-
-        $this->assertEquals(
-            array(
-                'validateField(\'testID\', \'PMA_\\\';\', true, '
-                    . '[\'\\\\r\\\\n\\\\\\\''
-                    . '<scrIpt></\\\' + \\\'script>\'])',
-                'validateField(\'testID\', \'PMA_\', true)'
-            ),
-            $js
-        );
-    }
-
-    /**
-     * Test for PMA_displayJavascript()
-     *
-     * @return void
-     */
-    public function testDisplayJavascript()
-    {
-        $this->assertNull(
-            PMA_displayJavascript(array())
-        );
-
-        $result = PMA_displayJavascript(array('var i = 1', 'i++'));
-
-        $this->assertEquals(
-            '<script type="text/javascript">' . "\n"
-            . 'if (typeof configInlineParams === "undefined"'
-            . ' || !Array.isArray(configInlineParams)) '
-            . 'configInlineParams = [];' . "\n"
-            . 'configInlineParams.push(function() {' . "\n"
-            . 'var i = 1;' . "\n"
-            . 'i++;' . "\n"
-            . '});' . "\n"
-            . 'if (typeof configScriptLoaded !== "undefined"'
-            . ' && configInlineParams) loadInlineConfig();'
-            . "\n" . '</script>',
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA_displayErrors()
-     *
-     * @return void
-     */
-    public function testDisplayErrors()
-    {
-        $errors = array('<err1>', '&err2');
-
-        $result = PMA_displayErrors('err"Name1"', $errors);
-
-        $this->assertEquals(
-            '<dl><dt>err&quot;Name1&quot;</dt>' .
-            '<dd>&lt;err1&gt;</dd><dd>&amp;err2</dd></dl>',
-            $result
-        );
-
-    }
-}
diff --git a/#pma/test/libraries/PMA_Form_Processing_test.php b/#pma/test/libraries/PMA_Form_Processing_test.php
deleted file mode 100644
index fa95ece6..00000000
--- a/#pma/test/libraries/PMA_Form_Processing_test.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for methods under Formset processing library
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test
- */
-require_once 'setup/lib/form_processing.lib.php';
-
-
-/**
- * tests for methods under Formset processing library
- *
- * @package PhpMyAdmin-test
- */
-class PMA_Form_Processing_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Prepares environment for the test.
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        $GLOBALS['server'] = 1;
-        $GLOBALS['cfg']['ServerDefault'] = 1;
-    }
-
-    /**
-     * Test for process_formset()
-     *
-     * @return void
-     */
-    public function testProcessFormSet()
-    {
-        if (!defined('PMA_TEST_HEADERS')) {
-            $this->markTestSkipped(
-                'Cannot redefine constant/function - missing runkit extension'
-            );
-        }
-
-        // case 1
-        $formDisplay = $this->getMockBuilder('PMA\libraries\config\FormDisplay')
-            ->disableOriginalConstructor()
-            ->setMethods(array('process', 'getDisplay'))
-            ->getMock();
-
-        $formDisplay->expects($this->once())
-            ->method('process')
-            ->with(false)
-            ->will($this->returnValue(false));
-
-        $formDisplay->expects($this->once())
-            ->method('getDisplay')
-            ->with(true, true);
-
-        PMA_Process_formset($formDisplay);
-
-        // case 2
-        $formDisplay = $this->getMockBuilder('PMA\libraries\config\FormDisplay')
-            ->disableOriginalConstructor()
-            ->setMethods(array('process', 'hasErrors', 'displayErrors'))
-            ->getMock();
-
-        $formDisplay->expects($this->once())
-            ->method('process')
-            ->with(false)
-            ->will($this->returnValue(true));
-
-        $formDisplay->expects($this->once())
-            ->method('hasErrors')
-            ->with()
-            ->will($this->returnValue(true));
-
-        ob_start();
-        PMA_Process_formset($formDisplay);
-        $result = ob_get_clean();
-
-        $this->assertContains(
-            '<div class="error">',
-            $result
-        );
-
-        $this->assertContains(
-            '<a href="?lang=en&amp;token=token&amp;page=&amp;mode=revert">',
-            $result
-        );
-
-        $this->assertContains(
-            '<a class="btn" href="index.php?lang=en&amp;token=token">',
-            $result
-        );
-
-        $this->assertContains(
-            '<a class="btn" href="?lang=en&amp;token=token&amp;page=&amp;mode=edit">',
-            $result
-        );
-
-        // case 3
-        $formDisplay = $this->getMockBuilder('PMA\libraries\config\FormDisplay')
-            ->disableOriginalConstructor()
-            ->setMethods(array('process', 'hasErrors'))
-            ->getMock();
-
-        $formDisplay->expects($this->once())
-            ->method('process')
-            ->with(false)
-            ->will($this->returnValue(true));
-
-        $formDisplay->expects($this->once())
-            ->method('hasErrors')
-            ->with()
-            ->will($this->returnValue(false));
-
-        PMA_Process_formset($formDisplay);
-
-        $this->assertEquals(
-            array('HTTP/1.1 303 See Other', 'Location: index.php?lang=en&amp;token=token'),
-            $GLOBALS['header']
-        );
-
-    }
-
-
-}
diff --git a/#pma/test/libraries/PMA_GIS_modifyQuery_test.php b/#pma/test/libraries/PMA_GIS_modifyQuery_test.php
deleted file mode 100644
index c4d3fdbb..00000000
--- a/#pma/test/libraries/PMA_GIS_modifyQuery_test.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Tests for PMA_GIS_modifyQuery method
- *
- * @package PhpMyAdmin-test
- */
-
-
-/*
- * Include to test
- */
-//require_once 'libraries/tbl_gis_visualization.lib.php';
-
-/**
- * Tests for PMA_GIS_modifyQuery method
- *
- * @package PhpMyAdmin-test
- */
-class PMA_GIS_ModifyQueryTest extends PHPUnit_Framework_TestCase
-{
-     //@todo: Move this test to GIS_Visualization's
-    /**
-     * Test PMA_GIS_modifyQuery method
-     *
-     * @internal     param string $sql_query query to modify
-     * @internal     param array  $settings visualization settings
-     * @internal     param string $modified_query modified query
-     *
-     * @return void
-     *
-     * @dataProvider provider
-     */
-    public function testModifyQuery(/*$sql_query, $settings, $modified_query*/)
-    {
-        // $this->assertEquals(
-        //     PMA_GIS_modifyQuery($sql_query, $settings),
-        //     $modified_query
-        // );
-        $this->markTestIncomplete('Not yet implemented!');
-    }
-
-    /**
-     * data provider for testModifyQuery
-     *
-     * @return array data for testModifyQuery
-     */
-    public function provider()
-    {
-        return array(
-            // with label column
-            array(
-                "SELECT * FROM `foo` WHERE `bar` = `zoo`",
-                array('spatialColumn' => 'moo', 'labelColumn' => 'noo'),
-                "SELECT `noo`, ASTEXT(`moo`) AS `moo`, SRID(`moo`) AS `srid` "
-                    . "FROM (SELECT * FROM `foo` WHERE `bar` = `zoo`) AS `temp_gis`"
-            ),
-            // with no label column
-            array(
-                "SELECT * FROM `foo` WHERE `bar` = `zoo`",
-                array('spatialColumn' => 'moo'),
-                "SELECT ASTEXT(`moo`) AS `moo`, SRID(`moo`) AS `srid` "
-                    . "FROM (SELECT * FROM `foo` WHERE `bar` = `zoo`) AS `temp_gis`"
-            ),
-            // with spatial column generated on the fly
-            array(
-                "SELECT name, PointFromText( Concat( 'POINT (', geo_lat, ' ', geo_lon, ')' ) ) AS coordinates FROM users",
-                array('spatialColumn' => 'coordinates', 'labelColumn' => 'name'),
-                "SELECT `name`, ASTEXT(`coordinates`) AS `coordinates`, SRID(`coordinates`) AS `srid` "
-                    . "FROM (SELECT name, PointFromText( Concat( 'POINT (', geo_lat, ' ', geo_lon, ')' ) ) AS coordinates FROM users) AS `temp_gis`"
-            ),
-        );
-    }
-}
diff --git a/#pma/test/libraries/PMA_PMD_common_test.php b/#pma/test/libraries/PMA_PMD_common_test.php
deleted file mode 100644
index da99ac7f..00000000
--- a/#pma/test/libraries/PMA_PMD_common_test.php
+++ /dev/null
@@ -1,276 +0,0 @@
-<?php
-/**
- * Tests for libraries/pmd_common.php
- *
- * @package PhpMyAdmin-test
- */
-
-require_once 'libraries/database_interface.inc.php';
-
-
-/**
- * Tests for libraries/pmd_common.php
- *
- * @package PhpMyAdmin-test
- */
-class PMA_PMD_CommonTest extends PHPUnit_Framework_TestCase
-{
-
-    /**
-     * Setup for test cases
-     *
-     * @return void
-     */
-    public function setup()
-    {
-        $GLOBALS['server'] = 1;
-        $GLOBALS['controllink'] = 2;
-        $_SESSION = array(
-            'relation' => array(
-                '1' => array(
-                    'PMA_VERSION' => PMA_VERSION,
-                    'db' => 'pmadb',
-                    'pdf_pages' => 'pdf_pages',
-                    'pdfwork' => true,
-                    'table_coords' => 'table_coords'
-                )
-            )
-        );
-
-        include_once 'libraries/relation.lib.php';
-        include_once 'libraries/pmd_common.php';
-    }
-
-
-    /**
-     * Test for PMA_getTablePositions()
-     *
-     * @return void
-     */
-    public function testGetTablePositions()
-    {
-        $pg = 1;
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $dbi->expects($this->any())->method('escapeString')
-            ->will($this->returnArgument(0));
-
-        $dbi->expects($this->once())
-            ->method('fetchResult')
-            ->with(
-                "
-        SELECT CONCAT_WS('.', `db_name`, `table_name`) AS `name`,
-            `x` AS `X`,
-            `y` AS `Y`,
-            1 AS `V`,
-            1 AS `H`
-        FROM `pmadb`.`table_coords`
-        WHERE pdf_page_number = " . $pg,
-                'name',
-                null,
-                2,
-                PMA\libraries\DatabaseInterface::QUERY_STORE
-            );
-        $GLOBALS['dbi'] = $dbi;
-
-        PMA_getTablePositions($pg);
-    }
-
-    /**
-     * Test for PMA_getPageName()
-     *
-     * @return void
-     */
-    public function testGetPageName()
-    {
-        $pg = 1;
-        $pageName = 'pageName';
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $dbi->expects($this->any())->method('escapeString')
-            ->will($this->returnArgument(0));
-
-        $dbi->expects($this->once())
-            ->method('fetchResult')
-            ->with(
-                "SELECT `page_descr` FROM `pmadb`.`pdf_pages`"
-                . " WHERE `page_nr` = " . $pg,
-                null,
-                null,
-                2,
-                PMA\libraries\DatabaseInterface::QUERY_STORE
-            )
-            ->will($this->returnValue(array($pageName)));
-        $GLOBALS['dbi'] = $dbi;
-
-        $result = PMA_getPageName($pg);
-
-        $this->assertEquals($pageName, $result);
-    }
-
-    /**
-     * Test for PMA_deletePage()
-     *
-     * @return void
-     */
-    public function testDeletePage()
-    {
-        $pg = 1;
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->exactly(2))
-            ->method('query')
-            ->willReturnOnConsecutiveCalls(
-                true,
-                true
-            );
-        $dbi->expects($this->any())->method('escapeString')
-            ->will($this->returnArgument(0));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $result = PMA_deletePage($pg);
-        $this->assertEquals(true, $result);
-    }
-
-    /**
-     * Test for testGetDefaultPage() when there is a default page
-     * (a page having the same name as database)
-     *
-     * @return void
-     */
-    public function testGetDefaultPage()
-    {
-        $db = 'db';
-        $default_pg = '2';
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->once())
-            ->method('fetchResult')
-            ->with(
-                "SELECT `page_nr` FROM `pmadb`.`pdf_pages`"
-                . " WHERE `db_name` = '" . $db . "'"
-                . " AND `page_descr` = '" . $db . "'",
-                null,
-                null,
-                2,
-                PMA\libraries\DatabaseInterface::QUERY_STORE
-            )
-            ->will($this->returnValue(array($default_pg)));
-        $dbi->expects($this->any())->method('escapeString')
-            ->will($this->returnArgument(0));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $result = PMA_getDefaultPage($db);
-        $this->assertEquals($default_pg, $result);
-    }
-
-    /**
-     * Test for testGetDefaultPage() when there is no default page
-     *
-     * @return void
-     */
-    public function testGetDefaultPageWithNoDefaultPage()
-    {
-        $db = 'db';
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->once())
-            ->method('fetchResult')
-            ->with(
-                "SELECT `page_nr` FROM `pmadb`.`pdf_pages`"
-                . " WHERE `db_name` = '" . $db . "'"
-                . " AND `page_descr` = '" . $db . "'",
-                null,
-                null,
-                2,
-                PMA\libraries\DatabaseInterface::QUERY_STORE
-            )
-            ->will($this->returnValue(array()));
-        $dbi->expects($this->any())->method('escapeString')
-            ->will($this->returnArgument(0));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $result = PMA_getDefaultPage($db);
-        $this->assertEquals(-1, $result);
-    }
-
-    /**
-     * Test for testGetLoadingPage() when there is a default page
-     *
-     * @return void
-     */
-    public function testGetLoadingPageWithDefaultPage()
-    {
-        $db = 'db';
-        $default_pg = '2';
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->once())
-            ->method('fetchResult')
-            ->with(
-                "SELECT `page_nr` FROM `pmadb`.`pdf_pages`"
-                . " WHERE `db_name` = '" . $db . "'"
-                . " AND `page_descr` = '" . $db . "'",
-                null,
-                null,
-                2,
-                PMA\libraries\DatabaseInterface::QUERY_STORE
-            )
-            ->will($this->returnValue(array($default_pg)));
-        $dbi->expects($this->any())->method('escapeString')
-            ->will($this->returnArgument(0));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $result = PMA_getLoadingPage($db);
-        $this->assertEquals($default_pg, $result);
-    }
-
-    /**
-     * Test for testGetLoadingPage() when there is no default page
-     *
-     * @return void
-     */
-    public function testGetLoadingPageWithNoDefaultPage()
-    {
-        $db = 'db';
-        $first_pg = '1';
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->exactly(2))
-            ->method('fetchResult')
-            ->willReturnOnConsecutiveCalls(
-                array(),
-                array($first_pg)
-            );
-        $dbi->expects($this->any())->method('escapeString')
-            ->will($this->returnArgument(0));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $result = PMA_getLoadingPage($db);
-        $this->assertEquals($first_pg, $result);
-    }
-}
diff --git a/#pma/test/libraries/PMA_SetupIndex_test.php b/#pma/test/libraries/PMA_SetupIndex_test.php
deleted file mode 100644
index 3021bc12..00000000
--- a/#pma/test/libraries/PMA_SetupIndex_test.php
+++ /dev/null
@@ -1,397 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for methods under setup/lib/index.lib.php
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test
- */
-use PMA\libraries\config\ConfigFile;
-use PMA\libraries\config\ServerConfigChecks;
-
-require_once 'libraries/sanitizing.lib.php';
-require_once 'libraries/config/config_functions.lib.php';
-require_once 'setup/lib/index.lib.php';
-require_once 'libraries/sanitizing.lib.php';
-
-/**
- * tests for methods under setup/lib/index.lib.php
- *
- * @package PhpMyAdmin-test
- */
-class PMA_SetupIndex_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * SetUp for test cases
-     *
-     * @return void
-     */
-    public function setup()
-    {
-        $GLOBALS['cfg']['ProxyUrl'] = '';
-    }
-
-    /**
-     * Test for PMA_messagesBegin()
-     *
-     * @return void
-     */
-    public function testPMAmessagesBegin()
-    {
-        $_SESSION['messages'] = array(
-            array(
-                array('foo'),
-                array('bar')
-            )
-        );
-
-        PMA_messagesBegin();
-
-        $this->assertEquals(
-            array(
-                array(
-                    array(
-                        0 => 'foo',
-                        'fresh' => false,
-                        'active' => false
-                    ),
-                    array(
-                        0 => 'bar',
-                        'fresh' => false,
-                        'active' => false
-                    )
-                )
-            ),
-            $_SESSION['messages']
-        );
-
-        // case 2
-
-        unset($_SESSION['messages']);
-        PMA_messagesBegin();
-        $this->assertEquals(
-            array(
-                'error' => array(),
-                'notice' => array()
-            ),
-            $_SESSION['messages']
-        );
-    }
-
-    /**
-     * Test for PMA_messagesSet
-     *
-     * @return void
-     */
-    public function testPMAmessagesSet()
-    {
-        PMA_messagesSet('type', '123', 'testTitle', 'msg');
-
-        $this->assertEquals(
-            array(
-                'fresh' => true,
-                'active' => true,
-                'title' => 'testTitle',
-                'message' => 'msg'
-            ),
-            $_SESSION['messages']['type']['123']
-        );
-    }
-
-    /**
-     * Test for PMA_messagesEnd
-     *
-     * @return void
-     */
-    public function testPMAmessagesEnd()
-    {
-        $_SESSION['messages'] = array(
-            array(
-                array('msg' => 'foo', 'active' => false),
-                array('msg' => 'bar', 'active' => true),
-            )
-        );
-
-        PMA_messagesEnd();
-
-        $this->assertEquals(
-            array(
-                array(
-                    '1' => array(
-                        'msg' => 'bar',
-                        'active' => 1
-                    )
-                )
-            ),
-            $_SESSION['messages']
-        );
-    }
-
-    /**
-     * Test for PMA_messagesShowHtml
-     *
-     * @return void
-     */
-    public function testPMAMessagesShowHTML()
-    {
-        $_SESSION['messages'] = array(
-            'type' => array(
-                array('title' => 'foo', 'message' => '123', 'fresh' => false),
-                array('title' => 'bar', 'message' => '321', 'fresh' => true),
-            )
-        );
-
-        ob_start();
-        PMA_messagesShowHtml();
-        $result = ob_get_clean();
-
-        $this->assertContains(
-            '<div class="type" id="0"><h4>foo</h4>123</div>',
-            $result
-        );
-
-        $this->assertContains(
-            '<div class="type" id="1"><h4>bar</h4>321</div>',
-            $result
-        );
-
-        $this->assertContains(
-            '<script type="text/javascript">',
-            $result
-        );
-
-        $this->assertContains(
-            "hiddenMessages.push('0');",
-            $result
-        );
-
-        $this->assertContains(
-            "</script>",
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA_checkConfigRw
-     *
-     * @return void
-     */
-    public function testPMACheckConfigRw()
-    {
-        if (! PMA_HAS_RUNKIT) {
-            $this->markTestSkipped('Cannot redefine constant');
-        }
-
-        $redefine = null;
-        $GLOBALS['cfg']['AvailableCharsets'] = array();
-        $GLOBALS['server'] = 0;
-        $GLOBALS['ConfigFile'] = new ConfigFile();
-        if (!defined('SETUP_CONFIG_FILE')) {
-            define('SETUP_CONFIG_FILE', 'test/test_data/configfile');
-        } else {
-            $redefine = 'SETUP_CONFIG_FILE';
-            runkit_constant_redefine(
-                'SETUP_CONFIG_FILE',
-                'test/test_data/configfile'
-            );
-        }
-        $is_readable = false;
-        $is_writable = false;
-        $file_exists = false;
-
-        PMA_checkConfigRw($is_readable, $is_writable, $file_exists);
-
-        $this->assertTrue(
-            $is_readable
-        );
-
-        $this->assertTrue(
-            $is_writable
-        );
-
-        $this->assertFalse(
-            $file_exists
-        );
-
-        runkit_constant_redefine(
-            'SETUP_CONFIG_FILE',
-            'test/test_data/test.file'
-        );
-
-        PMA_checkConfigRw($is_readable, $is_writable, $file_exists);
-
-        $this->assertTrue(
-            $is_readable
-        );
-
-        $this->assertTrue(
-            $is_writable
-        );
-
-        $this->assertTrue(
-            $file_exists
-        );
-
-        if ($redefine !== null) {
-            runkit_constant_redefine('SETUP_CONFIG_FILE', $redefine);
-        } else {
-            runkit_constant_remove('SETUP_CONFIG_FILE');
-        }
-    }
-
-    /**
-     * Test for ServerConfigChecks::performConfigChecks
-     *
-     * @return void
-     * @group medium
-     */
-    public function testServerConfigChecksPerformConfigChecks()
-    {
-
-        $GLOBALS['cfg']['AvailableCharsets'] = array();
-        $GLOBALS['cfg']['ServerDefault'] = 0;
-        $GLOBALS['server'] = 0;
-
-        $cf = new ConfigFile();
-        $GLOBALS['ConfigFile'] = $cf;
-
-        $reflection = new \ReflectionProperty('PMA\libraries\config\ConfigFile', '_id');
-        $reflection->setAccessible(true);
-        $sessionID = $reflection->getValue($cf);
-
-        $_SESSION[$sessionID]['Servers'] = array(
-            '1' => array(
-                'host' => 'localhost',
-                'ssl' => false,
-                'extension' => 'mysql',
-                'auth_type' => 'config',
-                'user' => 'username',
-                'password' => 'password',
-                'AllowRoot' => true,
-                'AllowNoPassword' => true,
-            )
-        );
-
-        $_SESSION[$sessionID]['AllowArbitraryServer'] = true;
-        $_SESSION[$sessionID]['LoginCookieValidity'] = 5000;
-        $_SESSION[$sessionID]['LoginCookieStore'] = 4000;
-        $_SESSION[$sessionID]['SaveDir'] = true;
-        $_SESSION[$sessionID]['TempDir'] = true;
-        $_SESSION[$sessionID]['GZipDump'] = true;
-        $_SESSION[$sessionID]['BZipDump'] = true;
-        $_SESSION[$sessionID]['ZipDump'] = true;
-
-        $noticeArrayKeys = array(
-            'TempDir',
-            'SaveDir',
-            'LoginCookieValidity',
-            'AllowArbitraryServer',
-            'Servers/1/AllowNoPassword',
-            'Servers/1/auth_type',
-            'Servers/1/ssl'
-        );
-
-        $errorArrayKeys = array(
-            'LoginCookieValidity'
-        );
-
-        if (@!function_exists('gzopen') || @!function_exists('gzencode')) {
-            $errorArrayKeys[] = 'GZipDump';
-        }
-
-        if (@!function_exists('bzopen') || @!function_exists('bzcompress')) {
-            $errorArrayKeys[] = 'BZipDump';
-        }
-
-        if (!@function_exists('zip_open')) {
-            $errorArrayKeys[] = 'ZipDump_import';
-        }
-
-        if (!@function_exists('gzcompress')) {
-            $errorArrayKeys[] = 'ZipDump_export';
-        }
-
-        $configChecker = new ServerConfigChecks($GLOBALS['ConfigFile']);
-        $configChecker->performConfigChecks();
-
-        foreach ($noticeArrayKeys as $noticeKey) {
-            $this->assertArrayHasKey(
-                $noticeKey,
-                $_SESSION['messages']['notice']
-            );
-        }
-
-        foreach ($errorArrayKeys as $errorKey) {
-            $this->assertArrayHasKey(
-                $errorKey,
-                $_SESSION['messages']['error']
-            );
-        }
-
-        // Case 2
-
-        unset($_SESSION['messages']);
-        unset($_SESSION[$sessionID]);
-
-        $_SESSION[$sessionID]['Servers'] = array(
-            '1' => array(
-                'host' => 'localhost',
-                'ssl' => true,
-                'extension' => 'mysqli',
-                'auth_type' => 'cookie',
-                'AllowRoot' => false
-            )
-        );
-
-        $_SESSION[$sessionID]['AllowArbitraryServer'] = false;
-        $_SESSION[$sessionID]['LoginCookieValidity'] = -1;
-        $_SESSION[$sessionID]['LoginCookieStore'] = 0;
-        $_SESSION[$sessionID]['SaveDir'] = '';
-        $_SESSION[$sessionID]['TempDir'] = '';
-        $_SESSION[$sessionID]['GZipDump'] = false;
-        $_SESSION[$sessionID]['BZipDump'] = false;
-        $_SESSION[$sessionID]['ZipDump'] = false;
-
-        $configChecker = new ServerConfigChecks($GLOBALS['ConfigFile']);
-        $configChecker->performConfigChecks();
-
-        $this->assertArrayHasKey(
-            'blowfish_secret_created',
-            $_SESSION['messages']['notice']
-        );
-
-        foreach ($noticeArrayKeys as $noticeKey) {
-            $this->assertArrayNotHasKey(
-                $noticeKey,
-                $_SESSION['messages']['notice']
-            );
-        }
-
-        $this->assertArrayNotHasKey(
-            'error',
-            $_SESSION['messages']
-        );
-
-        // Case 3
-
-        $_SESSION[$sessionID]['blowfish_secret'] = 'sec';
-
-        $_SESSION[$sessionID]['Servers'] = array(
-            '1' => array(
-                'host' => 'localhost',
-                'auth_type' => 'cookie'
-            )
-        );
-
-        $configChecker = new ServerConfigChecks($GLOBALS['ConfigFile']);
-        $configChecker->performConfigChecks();
-
-        $this->assertArrayHasKey(
-            'blowfish_warnings2',
-            $_SESSION['messages']['error']
-        );
-    }
-}
diff --git a/#pma/test/libraries/PMA_bookmark_test.php b/#pma/test/libraries/PMA_bookmark_test.php
deleted file mode 100644
index 0401d231..00000000
--- a/#pma/test/libraries/PMA_bookmark_test.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for bookmark.lib.php
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-
-require_once 'libraries/database_interface.inc.php';
-
-require_once 'libraries/relation.lib.php';
-
-/**
- * tests for bookmark.lib.php
- *
- * @package PhpMyAdmin-test
- */
-class PMA_Bookmark_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    public function setUp()
-    {
-        $GLOBALS['cfg']['Server']['user'] = 'root';
-        $GLOBALS['cfg']['Server']['pmadb'] = 'phpmyadmin';
-        $GLOBALS['cfg']['Server']['bookmarktable'] = 'pma_bookmark';
-        $GLOBALS['server'] = 1;
-
-        include_once 'libraries/bookmark.lib.php';
-    }
-
-    /**
-     * Test for PMA_Bookmark_getParams
-     *
-     * @return void
-     */
-    public function testGetParams()
-    {
-        $this->assertEquals(
-            false,
-            PMA_Bookmark_getParams()
-        );
-    }
-
-    /**
-     * Test for PMA_Bookmark_getList
-     *
-     * @return void
-     */
-    public function testGetList()
-    {
-        $this->assertEquals(
-            array(),
-            PMA_Bookmark_getList('phpmyadmin')
-        );
-    }
-
-    /**
-     * Test for PMA_Bookmark_get
-     *
-     * @return void
-     */
-    public function testGet()
-    {
-        $this->assertEquals(
-            '',
-            PMA_Bookmark_get('phpmyadmin', '1')
-        );
-    }
-
-    /**
-     * Test for PMA_Bookmark_save
-     *
-     * @return void
-     */
-    public function testSave()
-    {
-        $bookmark = array(
-            'dbase' => 'phpmyadmin',
-            'user' => 'phpmyadmin',
-            'query' => 'SELECT "phpmyadmin"',
-            'label' => 'phpmyadmin',
-        );
-
-        $this->assertfalse(PMA_Bookmark_save($bookmark));
-    }
-
-    /**
-     * Test for PMA_Bookmark_delete
-     *
-     * @return void
-     */
-    public function testDelete()
-    {
-        $this->assertFalse(
-            PMA_Bookmark_delete('1')
-        );
-    }
-}
diff --git a/#pma/test/libraries/PMA_browse_foreigners_test.php b/#pma/test/libraries/PMA_browse_foreigners_test.php
deleted file mode 100644
index a2eaa835..00000000
--- a/#pma/test/libraries/PMA_browse_foreigners_test.php
+++ /dev/null
@@ -1,335 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Tests for libraries/browse_foreigners.lib.php
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-require_once 'libraries/browse_foreigners.lib.php';
-
-require_once 'libraries/url_generating.lib.php';
-
-/**
- * Tests for libraries/browse_foreigners.lib.php
- *
- * @package PhpMyAdmin-test
- */
-class PMA_BrowseForeignersTest extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Setup for test cases
-     *
-     * @return void
-     */
-    public function setup()
-    {
-        $GLOBALS['cfg']['MaxRows'] = 25;
-    }
-
-    /**
-     * Test for PMA_getForeignLimit
-     *
-     * @return void
-     */
-    function testGetForeignLimit()
-    {
-        $this->assertNull(
-            PMA_getForeignLimit('Show all')
-        );
-
-        $this->assertEquals(
-            'LIMIT 0, 25 ',
-            PMA_getForeignLimit(null)
-        );
-
-        $_REQUEST['pos'] = 10;
-
-        $this->assertEquals(
-            'LIMIT 10, 25 ',
-            PMA_getForeignLimit(null)
-        );
-
-        $GLOBALS['cfg']['MaxRows'] = 50;
-
-        $this->assertEquals(
-            'LIMIT 10, 50 ',
-            PMA_getForeignLimit(null)
-        );
-
-        $this->assertEquals(
-            'LIMIT 10, 50 ',
-            PMA_getForeignLimit('xyz')
-        );
-    }
-
-    /**
-     * Test for PMA_getHtmlForShowAll
-     *
-     * @return void
-     */
-    function testGetHtmlForShowAll()
-    {
-        $this->assertEquals(
-            '',
-            PMA_getHtmlForShowAll(null)
-        );
-
-        $foreignData = array();
-        $foreignData['disp_row'] = array();
-        $GLOBALS['cfg']['ShowAll'] = false;
-
-        $this->assertEquals(
-            '',
-            PMA_getHtmlForShowAll($foreignData)
-        );
-
-        $GLOBALS['cfg']['ShowAll'] = true;
-        $foreignData['the_total'] = 0;
-
-        $this->assertEquals(
-            '',
-            PMA_getHtmlForShowAll($foreignData)
-        );
-
-        $foreignData['the_total'] = 30;
-
-        $this->assertEquals(
-            '<input type="submit" id="foreign_showAll" '
-            . 'name="foreign_showAll" '
-            . 'value="' . 'Show all' . '" />',
-            PMA_getHtmlForShowAll($foreignData)
-        );
-    }
-
-    /**
-     * Test for PMA_getHtmlForGotoPage
-     *
-     * @return void
-     */
-    function testGetHtmlForGotoPage()
-    {
-        $this->assertEquals(
-            '',
-            PMA_getHtmlForGotoPage(null)
-        );
-
-        $_REQUEST['pos'] = 15;
-        $foreignData = array();
-        $foreignData['disp_row'] = array();
-        $foreignData['the_total'] = 5;
-
-        $this->assertEquals(
-            '',
-            PMA_getHtmlForGotoPage($foreignData)
-        );
-
-        $foreignData['the_total'] = 30;
-        $result = PMA_getHtmlForGotoPage($foreignData);
-
-        $this->assertStringStartsWith(
-            'Page number:',
-            $result
-        );
-
-        $this->assertStringEndsWith(
-            '</select>',
-            $result
-        );
-
-        $this->assertContains(
-            '<select class="pageselector ajax" name="pos"',
-            $result
-        );
-
-        $this->assertContains(
-            '<option selected="selected" '
-            . 'style="font-weight: bold" value="0">',
-            $result
-        );
-
-        $this->assertContains(
-            '<option  value="25"',
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA_getHtmlForColumnElement
-     *
-     * @return void
-     */
-    function testGetHtmlForColumnElement()
-    {
-        $cssClass = '';
-        $isSelected = false;
-        $keyname = '';
-        $description = 'foo';
-        $title = '';
-        $result = PMA_getHtmlForColumnElement(
-            $cssClass, $isSelected, $keyname,
-            $description, $title
-        );
-
-        $this->assertContains(
-            '<td>',
-            $result
-        );
-
-        $this->assertContains(
-            '<a class="foreign_value" data-key="" href="#" '
-            . 'title="Use this value">',
-            $result
-        );
-
-        $cssClass = 'class="baz"';
-        $isSelected = true;
-        $keyname = 'bar';
-        $title = 'foo';
-        $result = PMA_getHtmlForColumnElement(
-            $cssClass, $isSelected, $keyname,
-            $description, $title
-        );
-
-        $this->assertContains(
-            '<td class="baz">',
-            $result
-        );
-
-        $this->assertContains(
-            '<strong>',
-            $result
-        );
-
-        $this->assertContains(
-            '<a class="foreign_value" data-key="bar" href="#" '
-            . 'title="Use this value: foo">',
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA_getDescriptionAndTitle
-     *
-     * @return void
-     */
-    function testGetDescriptionAndTitle()
-    {
-        $GLOBALS['cfg']['LimitChars'] = 30;
-        $desc = 'foobar<baz';
-
-        $this->assertEquals(
-            array('foobar&lt;baz', ''),
-            PMA_getDescriptionAndTitle($desc)
-        );
-
-        $GLOBALS['cfg']['LimitChars'] = 5;
-
-        $this->assertEquals(
-            array('fooba...', 'foobar&lt;baz'),
-            PMA_getDescriptionAndTitle($desc)
-        );
-    }
-
-    /**
-     * Test for PMA_getHtmlForRelationalFieldSelection
-     *
-     * @return void
-     */
-    function testGetHtmlForRelationalFieldSelection()
-    {
-        $db = '';
-        $table = '';
-        $field = 'foo';
-        $foreignData = array();
-        $foreignData['disp_row'] = '';
-        $fieldkey = 'bar';
-        $current_value = '';
-        $_REQUEST['rownumber'] = 1;
-        $_REQUEST['foreign_filter'] = '5';
-        $result = PMA_getHtmlForRelationalFieldSelection(
-            $db, $table, $field, $foreignData, $fieldkey, $current_value
-        );
-
-        $this->assertContains(
-            '<form class="ajax" '
-            . 'id="browse_foreign_form" name="browse_foreign_from" '
-            . 'action="browse_foreigners.php" method="post">',
-            $result
-        );
-
-        $this->assertContains(
-            '<fieldset>',
-            $result
-        );
-
-        $this->assertContains(
-            '<input type="hidden" name="field" value="foo" />',
-            $result
-        );
-
-        $this->assertContains(
-            '<input type="hidden" name="fieldkey" value="bar" />',
-            $result
-        );
-
-        $this->assertContains(
-            '<input type="hidden" name="rownumber" value="1" />',
-            $result
-        );
-
-        $this->assertContains(
-            '<span class="formelement">',
-            $result
-        );
-
-        $this->assertContains(
-            '<label for="input_foreign_filter">',
-            $result
-        );
-
-        $this->assertContains(
-            '<input type="text" name="foreign_filter" '
-            . 'id="input_foreign_filter" '
-            . 'value="5" data-old="5" '
-            . '/>',
-            $result
-        );
-
-        $this->assertContains(
-            '<input type="submit" name="submit_foreign_filter" value="Go" />',
-            $result
-        );
-
-        $this->assertContains(
-            '<span class="formelement">',
-            $result
-        );
-
-        $this->assertContains(
-            '<table width="100%" id="browse_foreign_table">',
-            $result
-        );
-
-        $foreignData['disp_row'] = array();
-        $foreignData['the_total'] = 5;
-        $GLOBALS['cfg']['ShowAll'] = false;
-        $result = PMA_getHtmlForRelationalFieldSelection(
-            $db, $table, $field, $foreignData, $fieldkey, $current_value
-        );
-
-        $this->assertContains(
-            '<table width="100%" id="browse_foreign_table">',
-            $result
-        );
-
-        $this->assertContains(
-            '<th>',
-            $result
-        );
-
-    }
-}
diff --git a/#pma/test/libraries/PMA_central_columns_test.php b/#pma/test/libraries/PMA_central_columns_test.php
deleted file mode 100644
index a0e4b94d..00000000
--- a/#pma/test/libraries/PMA_central_columns_test.php
+++ /dev/null
@@ -1,680 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for central_columns.lib.php
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-use PMA\libraries\Theme;
-use PMA\libraries\TypesMySQL;
-
-$GLOBALS['server'] = 1;
-
-require_once 'libraries/database_interface.inc.php';
-
-require_once 'libraries/relation.lib.php';
-
-require_once 'libraries/url_generating.lib.php';
-
-
-require_once 'libraries/mysql_charsets.inc.php';
-require_once 'libraries/central_columns.lib.php';
-
-/**
- * tests for central_columns.lib.php
- *
- * @package PhpMyAdmin-test
- */
-class PMA_Central_Columns_Test extends PHPUnit_Framework_TestCase
-{
-    private $_columnData = array(
-        array(
-            'col_name' => "id", "col_type" => 'integer',
-            'col_length' => 0, 'col_isNull' => 0,
-            'col_extra' => 'UNSIGNED,auto_increment',
-            'col_default' => 1, 'col_collation' => ''
-        ),
-        array('col_name' => "col1", 'col_type' => 'varchar',
-            'col_length' => 100, 'col_isNull' => 1, 'col_extra' => 'BINARY',
-            'col_default' => 1, 'col_collation' => ''
-        ),
-        array(
-            'col_name' => "col2", 'col_type' => 'DATETIME',
-            'col_length' => 0, 'col_isNull' => 1,
-            'col_extra' => 'on update CURRENT_TIMESTAMP',
-            'col_default' => 'CURRENT_TIMESTAMP', 'col_collation' => ''
-        )
-    );
-
-    private $_modifiedColumnData = array(
-        array(
-            'col_name' => "id", "col_type" => 'integer',
-            'col_length' => 0, 'col_isNull' => 0, 'col_extra' => 'auto_increment',
-            'col_default' => 1, 'col_collation' => '', 'col_attribute' => 'UNSIGNED'
-        ),
-        array('col_name' => "col1", 'col_type' => 'varchar',
-            'col_length' => 100, 'col_isNull' => 1, 'col_extra' => '',
-            'col_default' => 1, 'col_collation' => '', 'col_attribute' => 'BINARY'
-        ),
-        array(
-            'col_name' => "col2", 'col_type' => 'DATETIME',
-            'col_length' => 0, 'col_isNull' => 1, 'col_extra' => '',
-            'col_default' => 'CURRENT_TIMESTAMP', 'col_collation' => '',
-            'col_attribute' => 'on update CURRENT_TIMESTAMP'
-        )
-    );
-
-    /**
-     * prepares environment for tests
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        $GLOBALS['PMA_Types'] = new TypesMySQL();
-        $GLOBALS['cfg']['Server']['user'] = 'pma_user';
-        $GLOBALS['cfg']['Server']['DisableIS'] = true;
-        $GLOBALS['cfg']['MaxRows'] = 10;
-        $GLOBALS['cfg']['ServerDefault'] = "PMA_server";
-        $GLOBALS['cfg']['ActionLinksMode'] = 'icons';
-        $GLOBALS['pmaThemeImage'] = 'image';
-        $GLOBALS['cfg']['CharEditing'] = '';
-        $GLOBALS['cfg']['LimitChars'] = 50;
-        $GLOBALS['db'] = 'PMA_db';
-        $GLOBALS['table'] = 'PMA_table';
-
-        //$_SESSION
-        $GLOBALS['server'] = 1;
-        $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
-        $_SESSION['PMA_Theme'] = new Theme();
-        $_SESSION['relation'][1] = array(
-            'PMA_VERSION' => PMA_VERSION,
-            'centralcolumnswork' => true,
-            'relwork' => 1,
-            'db' => 'phpmyadmin',
-            'relation' => 'relation',
-            'central_columns' => 'pma_central_columns'
-        );
-
-        // mock DBI
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $GLOBALS['dbi'] = $dbi;
-
-        // set some common expectations
-        $dbi->expects($this->any())
-            ->method('selectDb')
-            ->will($this->returnValue(true));
-        $dbi->expects($this->any())
-            ->method('getColumns')
-            ->will(
-                $this->returnValue(
-                    array(
-                        "id"=>array("Type"=>"integer", "Null"=>"NO"),
-                        "col1"=>array("Type"=>'varchar(100)', "Null"=>"YES"),
-                        "col2"=>array("Type"=>'DATETIME', "Null"=>"NO")
-                    )
-                )
-            );
-        $dbi->expects($this->any())
-            ->method('getColumnNames')
-            ->will($this->returnValue(array("id", "col1", "col2")));
-        $dbi->expects($this->any())
-            ->method('tryQuery')
-            ->will($this->returnValue(true));
-        $dbi->expects($this->any())
-            ->method('getTables')
-            ->will(
-                $this->returnValue(array("PMA_table", "PMA_table1", "PMA_table2"))
-            );
-        $dbi->expects($this->any())->method('escapeString')
-            ->will($this->returnArgument(0));
-
-    }
-
-    /**
-     * Test for PMA_centralColumnsGetParams
-     *
-     * @return void
-     */
-    public function testPMACentralColumnsGetParams()
-    {
-        $this->assertSame(
-            array(
-                'user' => 'pma_user',
-                'db' => 'phpmyadmin',
-                'table' => 'pma_central_columns'
-            ),
-            PMA_centralColumnsGetParams()
-        );
-    }
-
-    /**
-     * Test for PMA_getColumnsList
-     *
-     * @return void
-     */
-    public function testPMAGetColumnsList()
-    {
-        $GLOBALS['dbi']->expects($this->exactly(2))
-            ->method('fetchResult')
-            ->willReturnOnConsecutiveCalls(
-                $this->_columnData,
-                array_slice($this->_columnData, 1, 2)
-            );
-
-        $this->assertEquals(
-            $this->_modifiedColumnData,
-            PMA_getColumnsList('phpmyadmin')
-        );
-        $this->assertEquals(
-            array_slice($this->_modifiedColumnData, 1, 2),
-            PMA_getColumnsList('phpmyadmin', 1, 2)
-        );
-    }
-
-    /**
-     * Test for PMA_getCentralColumnsCount
-     *
-     * @return void
-     */
-    function testPMAGetCentralColumnsCount()
-    {
-        $GLOBALS['dbi']->expects($this->once())
-            ->method('fetchResult')
-            ->with(
-                "SELECT count(db_name) FROM `pma_central_columns` "
-                . "WHERE db_name = 'phpmyadmin';",
-                null, null, $GLOBALS['controllink']
-            )
-            ->will(
-                $this->returnValue(array(3))
-            );
-
-        $this->assertEquals(
-            3,
-            PMA_getCentralColumnsCount('phpmyadmin')
-        );
-    }
-
-    /**
-     * Test for PMA_syncUniqueColumns
-     *
-     * @return void
-     */
-    public function testPMASyncUniqueColumns()
-    {
-        $_REQUEST['db'] = 'PMA_db';
-        $_REQUEST['table'] = 'PMA_table';
-
-        $this->assertTrue(
-            PMA_syncUniqueColumns(array('PMA_table'))
-        );
-    }
-
-    /**
-     * Test for PMA_deleteColumnsFromList
-     *
-     * @return void
-     */
-    public function testPMADeleteColumnsFromList()
-    {
-        $_REQUEST['db'] = 'PMA_db';
-        $_REQUEST['table'] = 'PMA_table';
-
-        // when column exists in the central column list
-        $GLOBALS['dbi']->expects($this->at(4))
-            ->method('fetchResult')
-            ->with(
-                "SELECT col_name FROM `pma_central_columns` "
-                . "WHERE db_name = 'PMA_db' AND col_name IN ('col1');",
-                null, null, $GLOBALS['controllink']
-            )
-            ->will(
-                $this->returnValue(array('col1'))
-            );
-
-        $GLOBALS['dbi']->expects($this->at(7))
-            ->method('tryQuery')
-            ->with(
-                "DELETE FROM `pma_central_columns` "
-                . "WHERE db_name = 'PMA_db' AND col_name IN ('col1');",
-                $GLOBALS['controllink']
-            )
-            ->will(
-                $this->returnValue(array('col1'))
-            );
-
-        $this->assertTrue(
-            PMA_deleteColumnsFromList(array("col1"), false)
-        );
-
-        // when column does not exist in the central column list
-        $this->assertInstanceOf(
-            'PMA\libraries\Message', PMA_deleteColumnsFromList(array('column1'), false)
-        );
-
-        $this->assertInstanceOf(
-            'PMA\libraries\Message', PMA_deleteColumnsFromList(array('PMA_table'))
-        );
-    }
-
-    /**
-     * Test for PMA_makeConsistentWithList
-     *
-     * @return void
-     */
-    public function testPMAMakeConsistentWithList()
-    {
-        $GLOBALS['dbi']->expects($this->any())
-            ->method('fetchResult')
-            ->will(
-                $this->returnValue($this->_columnData)
-            );
-        $GLOBALS['dbi']->expects($this->any())
-            ->method('fetchValue')
-            ->will(
-                $this->returnValue('PMA_table=CREATE table `PMA_table` (id integer)')
-            );
-        $this->assertTrue(
-            PMA_makeConsistentWithList("phpmyadmin", array('PMA_table'))
-        );
-    }
-
-    /**
-     * Test for PMA_getCentralColumnsFromTable
-     *
-     * @return void
-     */
-    public function testPMAGetCentralColumnsFromTable()
-    {
-        $db = 'PMA_db';
-        $table = 'PMA_table';
-
-        $GLOBALS['dbi']->expects($this->once())
-            ->method('fetchResult')
-            ->with(
-                "SELECT col_name FROM `pma_central_columns` "
-                . "WHERE db_name = 'PMA_db' AND col_name IN ('id','col1','col2');",
-                null, null, $GLOBALS['controllink']
-            )
-            ->will(
-                $this->returnValue(array('id','col1'))
-            );
-        $this->assertEquals(
-            array("id", "col1"),
-            PMA_getCentralColumnsFromTable($db, $table)
-        );
-    }
-
-    /**
-     * Test for PMA_getCentralColumnsFromTable with $allFields = true
-     *
-     * @return void
-     */
-    public function testPMAGetCentralColumnsFromTableWithAllFields()
-    {
-        $db = 'PMA_db';
-        $table = 'PMA_table';
-
-        $GLOBALS['dbi']->expects($this->once())
-            ->method('fetchResult')
-            ->with(
-                "SELECT * FROM `pma_central_columns` "
-                . "WHERE db_name = 'PMA_db' AND col_name IN ('id','col1','col2');",
-                null, null, $GLOBALS['controllink']
-            )
-            ->will(
-                $this->returnValue(array_slice($this->_columnData, 0, 2))
-            );
-        $this->assertEquals(
-            array_slice($this->_modifiedColumnData, 0, 2),
-            PMA_getCentralColumnsFromTable($db, $table, true)
-        );
-    }
-
-    /**
-     * Test for PMA_updateOneColumn
-     *
-     * @return void
-     */
-    public function testPMAUpdateOneColumn()
-    {
-        $this->assertTrue(
-            PMA_updateOneColumn(
-                "phpmyadmin", "", "", "", "", "", "", "", "", ""
-            )
-        );
-        $this->assertTrue(
-            PMA_updateOneColumn(
-                "phpmyadmin", "col1", "", "", "", "", "", "", "", ""
-            )
-        );
-    }
-
-    /**
-     * Test for PMA_updateMultipleColumn
-     *
-     * @return void
-     */
-    public function testPMAUpdateMultipleColumn()
-    {
-        $_POST['db'] = 'phpmyadmin';
-        $_POST['orig_col_name'] = array("col1","col2");
-        $_POST['field_name'] = array("col1","col2");
-        $_POST['field_default_type'] = array("","");
-        $_POST['col_extra'] = array("","");
-        $_POST['field_length'] = array("","");
-        $_POST['field_attribute'] = array("","");
-        $_POST['field_type'] = array("","");
-        $_POST['field_collation'] = array("","");
-        $this->assertTrue(
-            PMA_updateMultipleColumn()
-        );
-
-    }
-
-    /**
-     * Test for PMA_getHTMLforEditingPage
-     *
-     * @return void
-     */
-    public function testPMAGetHTMLforEditingPage()
-    {
-        $GLOBALS['dbi']->expects($this->any())
-            ->method('fetchResult')
-            ->with(
-                "SELECT * FROM `pma_central_columns` "
-                . "WHERE db_name = 'phpmyadmin' AND col_name IN ('col1','col2');",
-                null, null, $GLOBALS['controllink']
-            )
-            ->will(
-                $this->returnValue($this->_columnData)
-            );
-        $result = PMA_getHTMLforEditingPage(
-            array("col1", "col2"), 'phpmyadmin'
-        );
-        $this->assertContains(
-            '<form',
-            $result
-        );
-        $header_cells = array(
-        __('Name'), __('Type'), __('Length/Values'), __('Default'),
-        __('Collation'), __('Attributes'), __('Null'), __('A_I')
-        );
-        $this->assertContains(
-            PMA_getCentralColumnsEditTableHeader($header_cells), $result
-        );
-        $list_detail_cols = PMA_findExistingColNames(
-            'phpmyadmin', "'col1','col2'", true
-        );
-        $this->assertContains(
-            PMA_getHTMLforCentralColumnsEditTableRow(
-                $list_detail_cols[0], false, 0
-            ), $result
-        );
-        $this->assertContains(
-            PMA_getCentralColumnsEditTableFooter(), $result
-        );
-
-    }
-
-    /**
-     * Test for PMA_getHTMLforTableNavigation
-     *
-     * @return void
-     */
-    public function testPMAGetHTMLforTableNavigation()
-    {
-        $result = PMA_getHTMLforTableNavigation(0, 0, 'phpmyadmin');
-        $this->assertContains(
-            '<table',
-            $result
-        );
-        $this->assertContains(
-            __('Search this table'),
-            $result
-        );
-        $result_1 = PMA_getHTMLforTableNavigation(25, 10, 'phpmyadmin');
-        $this->assertContains(
-            '<form action="db_central_columns.php" method="post">'
-            . PMA_URL_getHiddenInputs(
-                'phpmyadmin'
-            ),
-            $result_1
-        );
-        $this->assertContains(
-            '<input type="submit" name="navig"'
-            . ' class="ajax" '
-            . 'value="&lt" />',
-            $result_1
-        );
-        $this->assertContains(
-            PMA\libraries\Util::pageselector(
-                'pos', 10, 2, 3
-            ),
-            $result_1
-        );
-        $this->assertContains(
-            '<input type="submit" name="navig"'
-            . ' class="ajax" '
-            . 'value="&gt" />',
-            $result_1
-        );
-    }
-
-    /**
-     * Test for PMA_getCentralColumnsTableHeader
-     *
-     * @return void
-     */
-    public function testPMAGetCentralColumnsTableHeader()
-    {
-        $this->assertContains(
-            '<thead',
-            PMA_getCentralColumnsTableHeader(
-                'column_heading', __('Click to sort'), 2
-            )
-        );
-    }
-
-    /**
-     * Test for PMA_getCentralColumnsListRaw
-     *
-     * @return void
-     */
-    public function testPMAGetCentralColumnsListRaw()
-    {
-        $GLOBALS['dbi']->expects($this->once())
-            ->method('fetchResult')
-            ->with(
-                "SELECT * FROM `pma_central_columns` "
-                . "WHERE db_name = 'phpmyadmin';",
-                null, null, $GLOBALS['controllink']
-            )
-            ->will(
-                $this->returnValue($this->_columnData)
-            );
-        $this->assertEquals(
-            json_encode($this->_modifiedColumnData),
-            PMA_getCentralColumnsListRaw('phpmyadmin', '')
-        );
-    }
-
-    /**
-     * Test for PMA_getCentralColumnsListRaw with a table name
-     *
-     * @return void
-     */
-    public function testPMAGetCentralColumnsListRawWithTable()
-    {
-        $GLOBALS['dbi']->expects($this->once())
-            ->method('fetchResult')
-            ->with(
-                "SELECT * FROM `pma_central_columns` "
-                . "WHERE db_name = 'phpmyadmin' AND col_name "
-                . "NOT IN ('id','col1','col2');",
-                null, null, $GLOBALS['controllink']
-            )
-            ->will(
-                $this->returnValue($this->_columnData)
-            );
-        $this->assertEquals(
-            json_encode($this->_modifiedColumnData),
-            PMA_getCentralColumnsListRaw('phpmyadmin', 'table1')
-        );
-
-    }
-
-    /**
-     * Test for PMA_getHTMLforAddNewColumn
-     *
-     * @return void
-     */
-    public function testPMAGetHTMLforAddNewColumn()
-    {
-        $result = PMA_getHTMLforAddNewColumn('phpmyadmin');
-        $this->assertContains(
-            '<form',
-            $result
-        );
-        $this->assertContains(
-            '<table',
-            $result
-        );
-        $this->assertContains(
-            __('Add new column'),
-            $result
-        );
-        $this->assertContains(
-            PMA_URL_getHiddenInputs('phpmyadmin'),
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA_configErrorMessage
-     *
-     * @return void
-     */
-    public function testPMAConfigErrorMessage()
-    {
-        $this->assertInstanceOf(
-            'PMA\libraries\Message',
-            PMA_configErrorMessage()
-        );
-    }
-
-    /**
-     * Test for PMA_findExistingColNames
-     *
-     * @return void
-     */
-    public function testPMAFindExistingColNames()
-    {
-        $GLOBALS['dbi']->expects($this->once())
-            ->method('fetchResult')
-            ->with(
-                "SELECT * FROM `pma_central_columns` WHERE db_name = 'phpmyadmin'"
-                . " AND col_name IN ('col1');",
-                null, null, $GLOBALS['controllink']
-            )
-            ->will(
-                $this->returnValue(array_slice($this->_columnData, 1, 1))
-            );
-        $this->assertEquals(
-            array_slice($this->_modifiedColumnData, 1, 1),
-            PMA_findExistingColNames('phpmyadmin', "'col1'", true)
-        );
-    }
-
-    /**
-     * Test for PMA_getHTMLforTableDropdown
-     *
-     * @return void
-     */
-    public function testPMAGetHTMLforTableDropdown()
-    {
-        $db = 'PMA_db';
-        $result = PMA_getHTMLforTableDropdown($db);
-        $this->assertContains(
-            '<select name="table-select" id="table-select"',
-            $result
-        );
-        $this->assertContains(
-            '<option value="PMA_table"',
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA_getHTMLforColumnDropdown
-     *
-     * @return void
-     */
-    public function testPMAGetHTMLforColumnDropdown()
-    {
-        $db = 'PMA_db';
-        $selected_tbl = 'PMA_table';
-        $result = PMA_getHTMLforColumnDropdown($db, $selected_tbl);
-        $this->assertEquals(
-            '<option value="id">id</option><option value="col1">col1</option>'
-            . '<option value="col2">col2</option>',
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA_getHTMLforAddCentralColumn
-     *
-     * @return void
-     */
-    public function testPMAGetHTMLforAddCentralColumn()
-    {
-        $result = PMA_getHTMLforAddCentralColumn(20, 0, 'phpmyadmin');
-        $this->assertContains(
-            '<table',
-            $result
-        );
-        $this->assertContains(
-            '<form',
-            $result
-        );
-        $this->assertContains(
-            PMA_URL_getHiddenInputs('phpmyadmin')
-            . '<input type="hidden" name="add_column" value="add">'
-            . '<input type="hidden" name="pos" value="0" />'
-            . '<input type="hidden" name="total_rows" value="20"/>',
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA_getCentralColumnsTableFooter
-     *
-     * @return void
-     */
-    public function testPMAGetCentralColumnsTableFooter()
-    {
-        $pmaThemeImage = "pmaThemeImage";
-        $text_dir = "text_dir";
-        if (!defined("PMA_USR_BROWSER_AGENT")) {
-            define("PMA_USR_BROWSER_AGENT", "other");
-        }
-        $result = PMA_getCentralColumnsTableFooter($pmaThemeImage, $text_dir);
-        $this->assertContains(
-            '<input type="checkbox" id="tableslistcontainer_checkall" class="checkall_box"',
-            $result
-        );
-        $this->assertContains("With selected:", $result);
-        $this->assertContains(
-            '<button class="mult_submit change_central_columns"',
-            $result
-        );
-    }
-}
diff --git a/#pma/test/libraries/PMA_charset_conversion_test.php b/#pma/test/libraries/PMA_charset_conversion_test.php
deleted file mode 100644
index b8850122..00000000
--- a/#pma/test/libraries/PMA_charset_conversion_test.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Tests for Charset Conversions
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-$cfg['RecodingEngine'] = null;
-require_once 'libraries/charset_conversion.lib.php';
-require_once 'libraries/iconv_wrapper.lib.php';
-
-/**
- * Tests for Charset Conversions
- *
- * @package PhpMyAdmin-test
- */
-class PMA_Charset_Conversion_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Test for PMA_convertString
-     *
-     * @return void
-     * @test
-     *
-     * @group medium
-     */
-    public function testCharsetConversion()
-    {
-        $this->assertEquals(
-            'test',
-            PMA_convertString('UTF-8', 'UTF-8', 'test')
-        );
-
-        // 6 represents an arbitrary value for testing the default case
-        $GLOBALS['PMA_recoding_engine'] = 6;
-        $this->assertEquals(
-            'test',
-            PMA_convertString('UTF-8', 'flat', 'test')
-        );
-
-        // TODO: remove function_exists if recode_string exists on server
-        if (@function_exists('recode_string')) {
-            $GLOBALS['PMA_recoding_engine'] = PMA_CHARSET_RECODE;
-            $this->assertEquals(
-                'Only That ecole & Can Be My Blame',
-                PMA_convertString(
-                    'UTF-8', 'flat', 'Only That école & Can Be My Blame'
-                )
-            );
-        }
-
-        $GLOBALS['PMA_recoding_engine'] = PMA_CHARSET_ICONV;
-        $GLOBALS['cfg']['IconvExtraParams'] = '//TRANSLIT';
-        $this->assertEquals(
-            "This is the Euro symbol 'EUR'.",
-            PMA_convertString(
-                'UTF-8', 'ISO-8859-1', "This is the Euro symbol '€'."
-            )
-        );
-    }
-}
diff --git a/#pma/test/libraries/PMA_check_user_privileges_test.php b/#pma/test/libraries/PMA_check_user_privileges_test.php
deleted file mode 100644
index f631179c..00000000
--- a/#pma/test/libraries/PMA_check_user_privileges_test.php
+++ /dev/null
@@ -1,301 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for check_user_privileges.lib.php
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-
-$GLOBALS['server'] = 1;
-$GLOBALS['cfg']['Server']['DisableIS'] = false;
-require_once 'libraries/Util.php';
-require_once 'libraries/Tracker.php';
-require_once 'libraries/database_interface.inc.php';
-require_once 'libraries/check_user_privileges.lib.php';
-
-/**
- * tests for check_user_privileges.lib.php
- *
- * @package PhpMyAdmin-test
- */
-class PMA_CheckUserPrivileges_Test extends PHPUnit_Framework_TestCase
-{
-
-    /**
-     * prepares environment for tests
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-
-        $GLOBALS['col_priv'] = false;
-        $GLOBALS['db_priv'] = false;
-        $GLOBALS['proc_priv'] = false;
-        $GLOBALS['table_priv'] = false;
-        $GLOBALS['is_reload_priv'] = false;
-    }
-
-
-    public function testPMA_getItemsFromShowGrantsRow()
-    {
-        // TEST CASE 1
-        $show_grants_full_row = "GRANT ALL PRIVILEGES ON *.* "
-            . "TO 'root'@'localhost' WITH GRANT OPTION";
-
-        list(
-            $show_grants_str,
-            $show_grants_dbname,
-            $show_grants_tblname
-        ) = PMA_getItemsFromShowGrantsRow(
-            $show_grants_full_row
-        );
-
-        $this->assertEquals(
-            "ALL PRIVILEGES",
-            $show_grants_str
-        );
-
-        $this->assertEquals(
-            "*",
-            $show_grants_dbname
-        );
-
-        $this->assertEquals(
-            "*",
-            $show_grants_tblname
-        );
-
-        // TEST CASE 2
-        $show_grants_full_row = "GRANT ALL PRIVILEGES ON `mysql`.* TO "
-            . "'root'@'localhost' WITH GRANT OPTION";
-
-        list(
-            $show_grants_str,
-            $show_grants_dbname,
-            $show_grants_tblname
-        ) = PMA_getItemsFromShowGrantsRow(
-            $show_grants_full_row
-        );
-
-        $this->assertEquals(
-            "ALL PRIVILEGES",
-            $show_grants_str
-        );
-
-        $this->assertEquals(
-            "mysql",
-            $show_grants_dbname
-        );
-
-        $this->assertEquals(
-            "*",
-            $show_grants_tblname
-        );
-
-        // TEST CASE 3
-        $show_grants_full_row = "GRANT SELECT, INSERT, UPDATE, DELETE "
-            . "ON `mysql`.`columns_priv` TO 'root'@'localhost'";
-
-        list(
-            $show_grants_str,
-            $show_grants_dbname,
-            $show_grants_tblname
-        ) = PMA_getItemsFromShowGrantsRow(
-            $show_grants_full_row
-        );
-
-        $this->assertEquals(
-            "SELECT, INSERT, UPDATE, DELETE",
-            $show_grants_str
-        );
-
-        $this->assertEquals(
-            "mysql",
-            $show_grants_dbname
-        );
-
-        $this->assertEquals(
-            "columns_priv",
-            $show_grants_tblname
-        );
-
-    }
-
-
-    /**
-     * Test for PMA_checkRequiredPrivilegesForAdjust
-     *
-     * @return void
-     */
-    public function testPMA_checkRequiredPrivilegesForAdjust()
-    {
-        // TEST CASE 1
-        $show_grants_full_row = "GRANT ALL PRIVILEGES ON *.* "
-            . "TO 'root'@'localhost' WITH GRANT OPTION";
-        list(
-            $show_grants_str,
-            $show_grants_dbname,
-            $show_grants_tblname
-        ) = PMA_getItemsFromShowGrantsRow(
-            $show_grants_full_row
-        );
-
-        // call the to-be-tested function
-        PMA_checkRequiredPrivilegesForAdjust(
-            $show_grants_str,
-            $show_grants_dbname,
-            $show_grants_tblname
-        );
-
-        $this->assertEquals(
-            true,
-            $GLOBALS['col_priv']
-        );
-
-        $this->assertEquals(
-            true,
-            $GLOBALS['db_priv']
-        );
-
-        $this->assertEquals(
-            true,
-            $GLOBALS['proc_priv']
-        );
-
-        $this->assertEquals(
-            true,
-            $GLOBALS['table_priv']
-        );
-
-        // re-initialise the privileges
-        $this->setUp();
-
-        // TEST CASE 2
-        $show_grants_full_row = "GRANT ALL PRIVILEGES ON `mysql`.* TO "
-            . "'root'@'localhost' WITH GRANT OPTION";
-        list(
-            $show_grants_str,
-            $show_grants_dbname,
-            $show_grants_tblname
-        ) = PMA_getItemsFromShowGrantsRow(
-            $show_grants_full_row
-        );
-
-        // call the to-be-tested function
-        PMA_checkRequiredPrivilegesForAdjust(
-            $show_grants_str,
-            $show_grants_dbname,
-            $show_grants_tblname
-        );
-
-        $this->assertEquals(
-            true,
-            $GLOBALS['col_priv']
-        );
-
-        $this->assertEquals(
-            true,
-            $GLOBALS['db_priv']
-        );
-
-        $this->assertEquals(
-            true,
-            $GLOBALS['proc_priv']
-        );
-
-        $this->assertEquals(
-            true,
-            $GLOBALS['table_priv']
-        );
-
-
-        // re-initialise the privileges
-        $this->setUp();
-
-        // TEST CASE 3
-        $show_grants_full_row = "GRANT SELECT, INSERT, UPDATE, DELETE ON "
-            . "`mysql`.* TO 'root'@'localhost'";
-        list(
-            $show_grants_str,
-            $show_grants_dbname,
-            $show_grants_tblname
-        ) = PMA_getItemsFromShowGrantsRow(
-            $show_grants_full_row
-        );
-
-        // call the to-be-tested function
-        PMA_checkRequiredPrivilegesForAdjust(
-            $show_grants_str,
-            $show_grants_dbname,
-            $show_grants_tblname
-        );
-
-        $this->assertEquals(
-            true,
-            $GLOBALS['col_priv']
-        );
-
-        $this->assertEquals(
-            true,
-            $GLOBALS['db_priv']
-        );
-
-        $this->assertEquals(
-            true,
-            $GLOBALS['proc_priv']
-        );
-
-        $this->assertEquals(
-            true,
-            $GLOBALS['table_priv']
-        );
-
-
-        // re-initialise the privileges
-        $this->setUp();
-
-        // TEST CASE 4
-        $show_grants_full_row = "GRANT SELECT, INSERT, UPDATE, DELETE ON "
-            . "`mysql`.`db` TO 'root'@'localhost'";
-        list(
-            $show_grants_str,
-            $show_grants_dbname,
-            $show_grants_tblname
-        ) = PMA_getItemsFromShowGrantsRow(
-            $show_grants_full_row
-        );
-
-        // call the to-be-tested function
-        PMA_checkRequiredPrivilegesForAdjust(
-            $show_grants_str,
-            $show_grants_dbname,
-            $show_grants_tblname
-        );
-
-        $this->assertEquals(
-            false,
-            $GLOBALS['col_priv']
-        );
-
-        $this->assertEquals(
-            true,
-            $GLOBALS['db_priv']
-        );
-
-        $this->assertEquals(
-            false,
-            $GLOBALS['proc_priv']
-        );
-
-        $this->assertEquals(
-            false,
-            $GLOBALS['table_priv']
-        );
-    }
-
-}
diff --git a/#pma/test/libraries/PMA_config_functions_test.php b/#pma/test/libraries/PMA_config_functions_test.php
deleted file mode 100644
index 07d83087..00000000
--- a/#pma/test/libraries/PMA_config_functions_test.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Tests for Config Functions
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-require_once 'libraries/config/config_functions.lib.php';
-require_once 'libraries/sanitizing.lib.php';
-
-/**
- * Tests for Config Functions
- *
- * @package PhpMyAdmin-test
- */
-class PMA_Config_Functions_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Test for PMA_lang
-     *
-     * @return void
-     * @test
-     */
-    public function testPMALang()
-    {
-        $this->assertEquals(
-            "&lt;a attr='value'&gt;test&lt;/a&gt;",
-            PMA_lang("<a attr='value'>test</a>")
-        );
-
-        $GLOBALS["strConfiglangKeyFooBar"] = "<a attr='value'>[em]test[/em]</a>";
-
-        $this->assertEquals(
-            "&lt;a attr='value'&gt;<em>test</em>&lt;/a&gt;",
-            PMA_lang("langKeyFooBar")
-        );
-
-        $this->assertEquals(
-            "1988-08-01",
-            PMA_lang("%04d-%02d-%02d", "1988", "8", "1")
-        );
-    }
-
-    /**
-     * Test for PMA_langName
-     *
-     * @return void
-     * @test
-     */
-    public function testLangName()
-    {
-        $canonicalPath = "Servers/1/2test";
-
-        $this->assertEquals(
-            "Servers_2test_name",
-            PMA_langName($canonicalPath)
-        );
-
-        $this->assertEquals(
-            "returnsDefault",
-            PMA_langName($canonicalPath, "name", "returnsDefault")
-        );
-
-        $GLOBALS["strConfigServers_2test_name"] = "<a>msg</a>";
-
-        $this->assertEquals(
-            "<a>msg</a>",
-            PMA_langName($canonicalPath)
-        );
-
-        $GLOBALS["strConfigServers_2test_desc"] = "<a>msg</a>";
-
-        $this->assertEquals(
-            "&lt;a&gt;msg&lt;/a&gt;",
-            PMA_langName($canonicalPath, "desc")
-        );
-
-    }
-
-}
diff --git a/#pma/test/libraries/PMA_designer_test.php b/#pma/test/libraries/PMA_designer_test.php
deleted file mode 100644
index 64fa3b89..00000000
--- a/#pma/test/libraries/PMA_designer_test.php
+++ /dev/null
@@ -1,223 +0,0 @@
-<?php
-/**
- * Tests for libraries/db_designer.lib.php
- *
- * @package PhpMyAdmin-test
- */
-/*
- * Include to test.
- */
-require_once 'libraries/db_designer.lib.php';
-require_once 'libraries/database_interface.inc.php';
-require_once 'libraries/url_generating.lib.php';
-require_once 'libraries/relation.lib.php';
-require_once 'libraries/plugin_interface.lib.php';
-
-/**
- * Tests for libraries/db_designer.lib.php
- *
- * @package PhpMyAdmin-test
- */
-class PMA_DesignerTest extends PHPUnit_Framework_TestCase
-{
-
-    /**
-     * Setup for test cases
-     *
-     * @return void
-     */
-    public function setup()
-    {
-        $GLOBALS['server'] = 1;
-        $GLOBALS['cfg']['ServerDefault'] = 1;
-        $GLOBALS['cfg']['PDFPageSizes'] = array('A3', 'A4');
-        $GLOBALS['cfg']['PDFDefaultPageSize'] = 'A4';
-        $GLOBALS['cfg']['Schema']['pdf_orientation'] = 'L';
-        $GLOBALS['cfg']['Schema']['pdf_paper'] = 'A4';
-
-        $_SESSION = array(
-            'relation' => array(
-                '1' => array(
-                    'PMA_VERSION' => PMA_VERSION,
-                    'db' => 'pmadb',
-                    'pdf_pages' => 'pdf_pages',
-                    'pdfwork' => true
-                )
-            ),
-            ' PMA_token ' => 'token'
-        );
-    }
-
-    /**
-     * Mocks database interaction for tests.
-     *
-     * @param string $db database name
-     *
-     * @return void
-     */
-    private function _mockDatabaseInteraction($db)
-    {
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->once())
-            ->method('tryQuery')
-            ->with(
-                "SELECT `page_nr`, `page_descr` FROM `pmadb`.`pdf_pages`"
-                . " WHERE db_name = '" . $db . "' ORDER BY `page_descr`",
-                2,
-                PMA\libraries\DatabaseInterface::QUERY_STORE,
-                false
-            )
-            ->will($this->returnValue('dummyRS'));
-
-        $dbi->expects($this->exactly(3))
-            ->method('fetchAssoc')
-            ->willReturnOnConsecutiveCalls(
-                array('page_nr' => '1', 'page_descr' => 'page1'),
-                array('page_nr' => '2', 'page_descr' => 'page2'),
-                false
-            );
-
-        $dbi->expects($this->any())
-            ->method('escapeString')
-            ->will($this->returnArgument(0));
-
-        $GLOBALS['dbi'] = $dbi;
-    }
-
-    /**
-     * Test for PMA_getPageIdsAndNames()
-     *
-     * @return void
-     */
-    public function testGetPageIdsAndNames()
-    {
-        $db = 'db';
-        $this->_mockDatabaseInteraction($db);
-
-        $result = PMA_getPageIdsAndNames($db);
-
-        $this->assertEquals(
-            array(
-                '1' => 'page1',
-                '2' => 'page2'
-            ),
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA_getHtmlForEditOrDeletePages()
-     *
-     * @return void
-     */
-    public function testGetHtmlForEditOrDeletePages()
-    {
-        $db = 'db';
-        $operation = 'edit';
-        $this->_mockDatabaseInteraction($db);
-
-        $result = PMA_getHtmlForEditOrDeletePages($db, $operation);
-        $this->assertContains(
-            '<input type="hidden" name="operation" value="' . $operation . '" />',
-            $result
-        );
-        $this->assertContains(
-            '<select name="selected_page" id="selected_page">',
-            $result
-        );
-        $this->assertContains('<option value="0">', $result);
-        $this->assertContains('<option value="1">', $result);
-        $this->assertContains('page1', $result);
-        $this->assertContains('<option value="2">', $result);
-        $this->assertContains('page2', $result);
-    }
-
-    /**
-     * Test for PMA_getHtmlForPageSaveAs()
-     *
-     * @return void
-     */
-    public function testGetHtmlForPageSaveAs()
-    {
-        $db = 'db';
-        $this->_mockDatabaseInteraction($db);
-
-        $result = PMA_getHtmlForPageSaveAs($db);
-        $this->assertContains(
-            '<input type="hidden" name="operation" value="savePage" />',
-            $result
-        );
-        $this->assertContains(
-            '<select name="selected_page" id="selected_page">',
-            $result
-        );
-        $this->assertContains('<option value="0">', $result);
-        $this->assertContains('<option value="1">', $result);
-        $this->assertContains('page1', $result);
-        $this->assertContains('<option value="2">', $result);
-        $this->assertContains('page2', $result);
-
-        $this->assertContains(
-            '<input type="radio" name="save_page" id="save_page_same" value="same"'
-            . ' checked="checked" />',
-            $result
-        );
-        $this->assertContains(
-            '<input type="radio" name="save_page" id="save_page_new" value="new" />',
-            $result
-        );
-        $this->assertContains(
-            '<input type="text" name="selected_value" id="selected_value" />',
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA_getHtmlForSchemaExport()
-     *
-     * @return void
-     */
-    public function testGetHtmlForSchemaExport()
-    {
-        $db = 'db';
-        $page = 2;
-
-        $result = PMA_getHtmlForSchemaExport($db, $page);
-        // export type
-        $this->assertContains(
-            '<select id="plugins" name="export_type">',
-            $result
-        );
-
-        // hidden field
-        $this->assertContains(
-            '<input type="hidden" name="page_number" value="' . $page . '" />',
-            $result
-        );
-
-        // orientation
-        $this->assertContains(
-            '<select name="pdf_orientation" id="select_pdf_orientation">',
-            $result
-        );
-        $this->assertContains(
-            '<option value="L" selected="selected">Landscape</option>',
-            $result
-        );
-        $this->assertContains('<option value="P">Portrait</option>', $result);
-
-        // paper size
-        $this->assertContains(
-            '<select name="pdf_paper" id="select_pdf_paper">',
-            $result
-        );
-        $this->assertContains('<option value="A3">A3</option>', $result);
-        $this->assertContains(
-            '<option value="A4" selected="selected">A4</option>',
-            $result
-        );
-    }
-}
diff --git a/#pma/test/libraries/PMA_display_change_password_test.php b/#pma/test/libraries/PMA_display_change_password_test.php
deleted file mode 100644
index ed7f881b..00000000
--- a/#pma/test/libraries/PMA_display_change_password_test.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for display_change_password.lib.php
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-use PMA\libraries\Theme;
-
-
-require_once 'libraries/url_generating.lib.php';
-require_once 'libraries/display_change_password.lib.php';
-
-require_once 'libraries/database_interface.inc.php';
-require_once 'libraries/sanitizing.lib.php';
-require_once 'libraries/js_escape.lib.php';
-
-require_once 'libraries/config.default.php';
-
-/**
- * class PMA_DisplayChangePassword_Test
- *
- * this class is for testing display_change_password.lib.php functions
- *
- * @package PhpMyAdmin-test
- */
-class PMA_DisplayChangePassword_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Test for setUp
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        //$GLOBALS
-        $GLOBALS['PMA_Config'] = new PMA\libraries\Config();
-        $GLOBALS['PMA_Config']->enableBc();
-        $GLOBALS['cfg']['MaxRows'] = 10;
-        $GLOBALS['cfg']['ServerDefault'] = "PMA_server";
-        $GLOBALS['cfg']['TableNavigationLinksMode'] = 'icons';
-        $GLOBALS['cfg']['LimitChars'] = 100;
-        $GLOBALS['cfg']['ActionLinksMode'] = 'icons';
-        $GLOBALS['cfg']['Server']['host'] = "localhost";
-        $GLOBALS['cfg']['Server']['user'] = "pma_user";
-        $GLOBALS['cfg']['ShowHint'] = true;
-        $GLOBALS['cfg']['ActionLinksMode'] = 'icons';
-        $GLOBALS['cfg']['Server']['DisableIS'] = false;
-        $GLOBALS['PMA_PHP_SELF'] = "server_privileges.php";
-        $GLOBALS['server'] = 0;
-        $GLOBALS['pmaThemeImage'] = 'image';
-
-        //$_SESSION
-        $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
-        $_SESSION['PMA_Theme'] = new Theme();
-        $_SESSION['relation'][$GLOBALS['server']] = "relation";
-    }
-
-    /**
-     * Test for PMA_getHtmlForChangePassword
-     *
-     * @return void
-     */
-    public function testPMAGetHtmlForChangePassword()
-    {
-        $username = "pma_username";
-        $hostname = "pma_hostname";
-
-        //Call the test function
-        $html = PMA_getHtmlForChangePassword('change_pw', $username, $hostname);
-
-        //PMA_PHP_SELF
-        $this->assertContains(
-            $GLOBALS['PMA_PHP_SELF'],
-            $html
-        );
-
-        //PMA_URL_getHiddenInputs
-        $this->assertContains(
-            PMA_URL_getHiddenInputs(),
-            $html
-        );
-
-        //$username & $hostname
-        $this->assertContains(
-            htmlspecialchars($username),
-            $html
-        );
-        $this->assertContains(
-            htmlspecialchars($hostname),
-            $html
-        );
-
-        //labels
-        $this->assertContains(
-            __('Change password'),
-            $html
-        );
-        $this->assertContains(
-            __('No Password'),
-            $html
-        );
-        $this->assertContains(
-            __('Password:'),
-            $html
-        );
-        $this->assertContains(
-            __('Password:'),
-            $html
-        );
-    }
-}
diff --git a/#pma/test/libraries/PMA_display_create_table_test.php b/#pma/test/libraries/PMA_display_create_table_test.php
deleted file mode 100644
index 5fbed853..00000000
--- a/#pma/test/libraries/PMA_display_create_table_test.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for display_create_table.lib.php
- *
- * @package PhpMyAdmin-test
- */
-
-use PMA\libraries\Theme;
-
-$GLOBALS['server'] = 0;
-$GLOBALS['cfg']['Server']['DisableIS'] = false;
-$GLOBALS['cfg']['DBG']['sql'] = false;
-/*
- * Include to test.
- */
-
-require_once 'libraries/url_generating.lib.php';
-
-require_once 'libraries/database_interface.inc.php';
-require_once 'libraries/display_create_table.lib.php';
-
-require_once 'libraries/sanitizing.lib.php';
-require_once 'libraries/js_escape.lib.php';
-
-/**
- * class PMA_DisplayCreateTable_Test
- *
- * this class is for testing display_create_table.lib.php functions
- *
- * @package PhpMyAdmin-test
- */
-class PMA_DisplayCreateTable_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Test for setUp
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        //$GLOBALS
-        $GLOBALS['server'] = 0;
-        $GLOBALS['cfg']['MaxRows'] = 10;
-        $GLOBALS['cfg']['ServerDefault'] = "PMA_server";
-        $GLOBALS['cfg']['TableNavigationLinksMode'] = 'icons';
-        $GLOBALS['cfg']['LimitChars'] = 100;
-        $GLOBALS['cfg']['ActionLinksMode'] = 'icons';
-        $GLOBALS['cfg']['Server']['host'] = "localhost";
-        $GLOBALS['cfg']['Server']['user'] = "pma_user";
-        $GLOBALS['cfg']['ShowHint'] = true;
-        $GLOBALS['cfg']['ActionLinksMode'] = 'icons';
-        $GLOBALS['PMA_PHP_SELF'] = "server_privileges.php";
-        $GLOBALS['pmaThemeImage'] = 'image';
-
-        //$_SESSION
-        $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
-        $_SESSION['PMA_Theme'] = new Theme();
-        $_SESSION['relation'][$GLOBALS['server']] = "relation";
-    }
-
-    /**
-     * Test for PMA_getHtmlForCreateTable
-     *
-     * @return void
-     */
-    public function testPMAGetHtmlForCreateTable()
-    {
-        $db = "pma_db";
-
-        //Call the test function
-        $html = PMA_getHtmlForCreateTable($db);
-
-        //getImage
-        $this->assertContains(
-            PMA\libraries\Util::getImage('b_table_add.png'),
-            $html
-        );
-
-        //__('Create table')
-        $this->assertContains(
-            __('Create table'),
-            $html
-        );
-
-        //PMA_URL_getHiddenInputs
-        $this->assertContains(
-            PMA_URL_getHiddenInputs($db),
-            $html
-        );
-        //label
-        $this->assertContains(
-            __('Name'),
-            $html
-        );
-        $this->assertContains(
-            __('Number of columns'),
-            $html
-        );
-
-        //button
-        $this->assertContains(
-            __('Go'),
-            $html
-        );
-    }
-}
diff --git a/#pma/test/libraries/PMA_display_export_test.php b/#pma/test/libraries/PMA_display_export_test.php
deleted file mode 100644
index 81e7cfe7..00000000
--- a/#pma/test/libraries/PMA_display_export_test.php
+++ /dev/null
@@ -1,338 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for display_export.lib.php
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-use PMA\libraries\Theme;
-
-
-require_once 'libraries/url_generating.lib.php';
-
-require_once 'libraries/display_export.lib.php';
-
-require_once 'libraries/database_interface.inc.php';
-require_once 'libraries/charset_conversion.lib.php';
-require_once 'libraries/plugin_interface.lib.php';
-require_once 'libraries/sanitizing.lib.php';
-require_once 'libraries/js_escape.lib.php';
-require_once 'libraries/relation.lib.php';
-
-/**
- * class PMA_DisplayExport_Test
- *
- * this class is for testing display_export.lib.php functions
- *
- * @package PhpMyAdmin-test
- * @group large
- */
-class PMA_DisplayExport_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Test for setUp
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        //$GLOBALS
-        $GLOBALS['cfg']['MaxRows'] = 10;
-        $GLOBALS['cfg']['ExecTimeLimit'] = 300;
-        $GLOBALS['cfg']['ServerDefault'] = "PMA_server";
-        $GLOBALS['cfg']['TableNavigationLinksMode'] = 'icons';
-        $GLOBALS['cfg']['LimitChars'] = 100;
-        $GLOBALS['cfg']['ActionLinksMode'] = 'icons';
-        $GLOBALS['cfg']['Server']['host'] = "localhost";
-        $GLOBALS['cfg']['Server']['user'] = "pma_user";
-        $GLOBALS['cfg']['ShowHint'] = true;
-        $GLOBALS['cfg']['ActionLinksMode'] = 'icons';
-        $GLOBALS['cfg']['ZipDump'] = true;
-        $GLOBALS['cfg']['GZipDump'] = false;
-        $GLOBALS['cfg']['BZipDump'] = false;
-        $GLOBALS['cfg']['Export']['asfile'] = true;
-        $GLOBALS['cfg']['Export']['file_template_server'] = "file_template_server";
-        $GLOBALS['PMA_PHP_SELF'] = PMA_getenv('PHP_SELF');
-        $GLOBALS['PMA_recoding_engine'] = "InnerDB";
-        $GLOBALS['server'] = 0;
-
-        $GLOBALS['table'] = "table";
-        $GLOBALS['pmaThemeImage'] = 'image';
-        $GLOBALS['db'] = "PMA";
-
-        //$_SESSION
-        $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
-        $_SESSION['PMA_Theme'] = new Theme();
-        $_SESSION['relation'][$GLOBALS['server']] = "";
-
-        $pmaconfig = $this->getMockBuilder('PMA\libraries\Config')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $pmaconfig->expects($this->any())
-            ->method('getUserValue')
-            ->will($this->returnValue('user value for test'));
-
-        $GLOBALS['PMA_Config'] = $pmaconfig;
-    }
-
-    /**
-     * Test for PMA_getHtmlForHiddenInput
-     *
-     * @return void
-     */
-    public function testPMAGetHtmlForHiddenInput()
-    {
-        $export_type = "server";
-        $db = "PMA";
-        $table = "PMA_test";
-        $single_table_str = "PMA_single_str";
-        $sql_query_str = "sql_query_str";
-
-        //Call the test function
-        $html = PMA_getHtmlForHiddenInput(
-            $export_type,
-            $db,
-            $table,
-            $single_table_str,
-            $sql_query_str
-        );
-
-        //validate 1: PMA_URL_getHiddenInputs
-        //$single_table
-        $this->assertContains(
-            '<input type="hidden" name="single_table" value="TRUE"',
-            $html
-        );
-        //$export_type
-        $this->assertContains(
-            '<input type="hidden" name="export_type" value="server"',
-            $html
-        );
-        $this->assertContains(
-            '<input type="hidden" name="export_method" value="quick"',
-            $html
-        );
-    }
-
-    /**
-     * Test for PMA_getHtmlForExportOptions
-     *
-     * @return void
-     */
-    public function testPMAGetHtmlForExportOptions()
-    {
-        global $cfg;
-        $cfg['Export']['method'] = "XML";
-        $cfg['SaveDir'] = "/tmp";
-
-        $export_type = "server";
-        $db = "PMA";
-        $table = "PMA_test";
-        $multi_values_str = "multi_values_str";
-        $num_tables_str = "10";
-        $unlim_num_rows_str = "unlim_num_rows_str";
-        $single_table = "single_table";
-        $GLOBALS['dbi']->cacheTableContent(array($db, $table, 'ENGINE'), 'MERGE');
-
-        $columns_info = array(
-            'test_column1' => array(
-                'COLUMN_NAME' => 'test_column1'
-            ),
-            'test_column2' => array(
-                'COLUMN_NAME' => 'test_column2'
-            )
-        );
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->any())->method('getColumnsFull')
-            ->will($this->returnValue($columns_info));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        /* Scan for plugins */
-        $export_list = PMA_getPlugins(
-            "export",
-            'libraries/plugins/export/',
-            array(
-                'export_type' => $export_type,
-                'single_table' => isset($single_table)
-            )
-        );
-
-        //Call the test function
-        $html = PMA_getHtmlForExportOptions(
-            $export_type,
-            $db,
-            $table,
-            $multi_values_str,
-            $num_tables_str,
-            $export_list,
-            $unlim_num_rows_str
-        );
-
-        //validate 2: PMA_getHtmlForExportOptionsMethod
-        $this->assertContains(
-            $cfg['Export']['method'],
-            $html
-        );
-        $this->assertContains(
-            '<div class="exportoptions" id="quick_or_custom">',
-            $html
-        );
-        $this->assertContains(
-            __('Export method:'),
-            $html
-        );
-        $this->assertContains(
-            __('Custom - display all possible options'),
-            $html
-        );
-
-        //validate 3: PMA_getHtmlForExportOptionsSelection
-        $this->assertContains(
-            '<div class="exportoptions" id="databases_and_tables">',
-            $html
-        );
-        $this->assertContains(
-            '<h3>' . __('Databases:') . '</h3>',
-            $html
-        );
-        $this->assertContains(
-            $multi_values_str,
-            $html
-        );
-
-        //validate 4: PMA_getHtmlForExportOptionsQuickExport
-        $this->assertContains(
-            '<input type="checkbox" name="onserver" value="saveit" ',
-            $html
-        );
-        $dir = htmlspecialchars(PMA\libraries\Util::userDir($cfg['SaveDir']));
-        $this->assertContains(
-            'Save on server in the directory <b>' . $dir . '</b>',
-            $html
-        );
-
-        //validate 5: PMA_getHtmlForAliasModalDialog
-        $this->assertContains(
-            '<div id="alias_modal" class="hide" title="'
-            . 'Rename exported databases/tables/columns">',
-            $html
-        );
-        $this->assertContains(
-            'Select database',
-            $html
-        );
-        $this->assertContains(
-            'Select table',
-            $html
-        );
-        $this->assertContains(
-            'New database name',
-            $html
-        );
-        $this->assertContains(
-            'New table name',
-            $html
-        );
-        $this->assertContains(
-            'test_column',
-            $html
-        );
-
-        //validate 6: PMA_getHtmlForExportOptionsOutput
-        $this->assertContains(
-            '<div class="exportoptions" id="output">',
-            $html
-        );
-        $this->assertContains(
-            'user value for test',
-            $html
-        );
-
-        //validate 7: PMA_getHtmlForExportOptionsFormat
-        $this->assertContains(
-            '<div class="exportoptions" id="format">',
-            $html
-        );
-        $this->assertContains(
-            '<h3>' . __('Format:') . '</h3>',
-            $html
-        );
-    }
-
-    /**
-     * Test for PMA_getHtmlForAliasModalDialog
-     *
-     * @return void
-     */
-    public function testPMAGetHtmlForAliasModalDialog()
-    {
-        $columns_info = array(
-            'test\'_db' => array(
-                'test_<b>table' => array(
-                    'co"l1' => array(
-                        'COLUMN_NAME' => 'co"l1'
-                    ),
-                    'col<2' => array(
-                        'COLUMN_NAME' => 'col<2'
-                    )
-                )
-            )
-        );
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->any())->method('getColumnsFull')
-            ->will($this->returnValue($columns_info));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $html = PMA_getHtmlForAliasModalDialog();
-
-        $this->assertContains(
-            '<div id="alias_modal" class="hide" title="'
-            . 'Rename exported databases/tables/columns">',
-            $html
-        );
-        $this->assertContains(
-            'test\'_db',
-            $html
-        );
-        $this->assertContains(
-            'test_&lt;b&gt;table',
-            $html
-        );
-        $this->assertContains(
-            'col&lt;2',
-            $html
-        );
-        $this->assertContains(
-            'co&quot;l1',
-            $html
-        );
-        $this->assertContains(
-            '<hr/>',
-            $html
-        );
-
-        $name_attr =  'aliases[test\'_db][tables][test_&lt;b&gt;table][alias]';
-        $id_attr = mb_substr(md5($name_attr), 0, 12);
-
-        $this->assertContains(
-            '<input type="text" value="" name="' . $name_attr . '" '
-            . 'id="' . $id_attr . '" placeholder="'
-            . 'test_&lt;b&gt;table alias" class="" disabled="disabled"/>',
-            $html
-        );
-    }
-}
diff --git a/#pma/test/libraries/PMA_escapeJsString_test.php b/#pma/test/libraries/PMA_escapeJsString_test.php
deleted file mode 100644
index 45c18868..00000000
--- a/#pma/test/libraries/PMA_escapeJsString_test.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Test for javascript escaping.
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-require_once 'libraries/js_escape.lib.php';
-
-/**
- * Test for javascript escaping.
- *
- * @package PhpMyAdmin-test
- */
-class PMA_EscapeJsString_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * PMA_escapeJsString tests
-     *
-     * @param string $target expected output
-     * @param string $source string to be escaped
-     *
-     * @return void
-     * @dataProvider escapeDataProvider
-     */
-    public function testEscape($target, $source)
-    {
-        $this->assertEquals($target, PMA_escapeJsString($source));
-    }
-
-    /**
-     * Data provider for testEscape
-     *
-     * @return array data for testEscape test case
-     */
-    public function escapeDataProvider()
-    {
-        return array(
-            array('\\\';', '\';'),
-            array('\r\n\\\'<scrIpt></\' + \'script>', "\r\n'<scrIpt></sCRIPT>"),
-            array('\\\';[XSS]', '\';[XSS]'),
-            array(
-                '</\' + \'script></head><body>[HTML]',
-                '</SCRIPT></head><body>[HTML]'
-            ),
-            array('\"\\\'\\\\\\\'\"', '"\'\\\'"'),
-            array("\\\\\'\'\'\'\'\'\'\'\'\'\'\'\\\\", "\\''''''''''''\\")
-        );
-    }
-}
diff --git a/#pma/test/libraries/PMA_export_test.php b/#pma/test/libraries/PMA_export_test.php
deleted file mode 100644
index 3accde57..00000000
--- a/#pma/test/libraries/PMA_export_test.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for export.lib.php
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-
-
-require_once 'libraries/export.lib.php';
-
-/**
- * class PMA_Export_Test
- *
- * this class is for testing export.lib.php functions
- *
- * @package PhpMyAdmin-test
- * @group large
- */
-class PMA_Export_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Test for setUp
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-
-    }
-
-    /**
-     * Test for PMA_mergeAliases
-     *
-     * @return void
-     */
-    public function testPMAMergeAliases()
-    {
-        $aliases1 = array(
-            'test_db' => array(
-                'alias' => 'aliastest',
-                'tables' => array(
-                    'foo' => array(
-                        'alias' => 'foobar',
-                        'columns' => array(
-                            'bar' => 'foo',
-                            'baz' => 'barbaz'
-                        )
-                    ),
-                    'bar' => array(
-                        'alias' => 'foobaz',
-                        'columns' => array(
-                            'a' => 'a_alias',
-                            'b' => 'b'
-                        )
-                    )
-                )
-            )
-        );
-        $aliases2 = array(
-            'test_db' => array(
-                'alias' => 'test',
-                'tables' => array(
-                    'foo' => array(
-                        'columns' => array(
-                            'bar' => 'foobar'
-                        )
-                    ),
-                    'baz' => array(
-                        'columns' => array(
-                            'a' => 'x'
-                        )
-                    )
-                )
-            )
-        );
-        $expected = array(
-            'test_db' => array(
-                'alias' => 'test',
-                'tables' => array(
-                    'foo' => array(
-                        'alias' => 'foobar',
-                        'columns' => array(
-                            'bar' => 'foobar',
-                            'baz' => 'barbaz'
-                        )
-                    ),
-                    'bar' => array(
-                        'alias' => 'foobaz',
-                        'columns' => array(
-                            'a' => 'a_alias',
-                            'b' => 'b'
-                        )
-                    ),
-                    'baz' => array(
-                        'columns' => array(
-                            'a' => 'x'
-                        )
-                    )
-                )
-            )
-        );
-        $actual = PMA_mergeAliases($aliases1, $aliases2);
-        $this->assertEquals($expected, $actual);
-    }
-}
diff --git a/#pma/test/libraries/PMA_generateCommonUrl_test.php b/#pma/test/libraries/PMA_generateCommonUrl_test.php
deleted file mode 100644
index a602d9f2..00000000
--- a/#pma/test/libraries/PMA_generateCommonUrl_test.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for PMA_URL_getCommon()
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-require_once 'libraries/url_generating.lib.php';
-
-/**
- * tests for PMA_URL_getCommon()
- *
- * @package PhpMyAdmin-test
- */
-class PMA_GenerateCommonURL_Test extends PHPUnit_Framework_TestCase
-{
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    public function setUp()
-    {
-        unset($_COOKIE['pma_lang'], $_COOKIE['pma_collation_connection']);
-    }
-
-    /**
-     * Test for PMA_URL_getCommon for DB only
-     *
-     * @return void
-     */
-    public function testDbOnly()
-    {
-        $GLOBALS['server'] = 'x';
-        $GLOBALS['collation_connection'] = 'x';
-        $GLOBALS['cfg']['ServerDefault'] = 'y';
-
-        $separator = PMA_URL_getArgSeparator();
-        $expected = 'server=x' . htmlentities($separator)
-            . 'lang=en' . htmlentities($separator)
-            . 'collation_connection=x' . htmlentities($separator)
-            . 'token=token'
-            ;
-
-        $expected = '?db=db'
-            . htmlentities($separator) . $expected;
-
-        $this->assertEquals($expected, PMA_URL_getCommon(array('db' => 'db')));
-    }
-
-    /**
-     * Test for PMA_URL_getCommon with new style
-     *
-     * @return void
-     */
-    public function testNewStyle()
-    {
-        $GLOBALS['server'] = 'x';
-        $GLOBALS['collation_connection'] = 'x';
-        $GLOBALS['cfg']['ServerDefault'] = 'y';
-
-        $separator = PMA_URL_getArgSeparator();
-        $expected = 'server=x' . htmlentities($separator)
-            . 'lang=en' . htmlentities($separator)
-            . 'collation_connection=x' . htmlentities($separator)
-            . 'token=token'
-            ;
-
-        $expected = '?db=db'
-            . htmlentities($separator) . 'table=table'
-            . htmlentities($separator) . $expected;
-        $params = array('db' => 'db', 'table' => 'table');
-        $this->assertEquals($expected, PMA_URL_getCommon($params));
-    }
-
-    /**
-     * Test for PMA_URL_getCommon with alternate divider
-     *
-     * @return void
-     */
-    public function testWithAlternateDivider()
-    {
-        $GLOBALS['server'] = 'x';
-        $GLOBALS['collation_connection'] = 'x';
-        $GLOBALS['cfg']['ServerDefault'] = 'y';
-
-        $separator = PMA_URL_getArgSeparator();
-        $expected = 'server=x' . $separator
-            . 'lang=en' . $separator
-            . 'collation_connection=x' . $separator
-            . 'token=token'
-            ;
-
-        $expected = '#ABC#db=db' . $separator . 'table=table' . $separator
-            . $expected;
-        $this->assertEquals(
-            $expected,
-            PMA_URL_getCommon(
-                array('db' => 'db', 'table' => 'table'), 'text', '#ABC#'
-            )
-        );
-    }
-
-    /**
-     * Test for PMA_URL_getCommon
-     *
-     * @return void
-     */
-    public function testDefault()
-    {
-        $GLOBALS['server'] = 'x';
-        $GLOBALS['collation_connection'] = 'x';
-        $GLOBALS['cfg']['ServerDefault'] = 'y';
-
-        $separator = PMA_URL_getArgSeparator();
-        $expected = '?server=x' . htmlentities($separator)
-            . 'lang=en' . htmlentities($separator)
-            . 'collation_connection=x' . htmlentities($separator)
-            . 'token=token'
-            ;
-        $this->assertEquals($expected, PMA_URL_getCommon());
-    }
-}
diff --git a/#pma/test/libraries/PMA_iconv_wrapper_test.php b/#pma/test/libraries/PMA_iconv_wrapper_test.php
deleted file mode 100644
index 831faa33..00000000
--- a/#pma/test/libraries/PMA_iconv_wrapper_test.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Tests for Charset Conversions for IBM AIX compliant codes
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-require_once 'libraries/iconv_wrapper.lib.php';
-
-/**
- * Tests for Charset Conversions for IBM AIX compliant codes
- *
- * @package PhpMyAdmin-test
- */
-class PMA_Iconv_Wrapper_Test extends PHPUnit_Framework_TestCase
-{
-
-    /**
-     * Test for PMA_convertAIXMapCharsets
-     *
-     * @param string $in_charset         Non IBM-AIX-Compliant in-charset
-     * @param string $out_charset        Non IBM-AIX-Compliant out-charset
-     * @param string $in_charset_mapped  IBM-AIX-Compliant in-charset
-     * @param string $out_charset_mapped IBM-AIX-Compliant out-charset
-     *
-     * @return void
-     * @test
-     * @dataProvider iconvDataProvider
-     */
-    public function testIconvMapCharsets($in_charset, $out_charset,
-        $in_charset_mapped, $out_charset_mapped
-    ) {
-        $this->assertEquals(
-            array($in_charset_mapped, $out_charset_mapped),
-            PMA_convertAIXMapCharsets($in_charset, $out_charset)
-        );
-    }
-
-
-    /**
-     * Data provider for testIconvMapCharsets
-     *
-     * @return array data for testIconvMapCharsets test case
-     */
-    public function iconvDataProvider()
-    {
-        return array(
-            array(
-                'UTF-8',
-                'ISO-8859-1//IGNORE',
-                'UTF-8',
-                'ISO-8859-1//IGNORE'
-            ),
-            array(
-                'UTF-8',
-                'ISO-8859-1//TRANSLIT',
-                'UTF-8',
-                'ISO8859-1'
-            ),
-            array('UTF-8',
-                'ISO-8859-9',
-                'UTF-8',
-                'ISO8859-9'
-            )
-        );
-    }
-}
diff --git a/#pma/test/libraries/PMA_import_test.php b/#pma/test/libraries/PMA_import_test.php
deleted file mode 100644
index 5f255630..00000000
--- a/#pma/test/libraries/PMA_import_test.php
+++ /dev/null
@@ -1,487 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Test for PMA_checkTimeout()
- * from libraries/import.lib.php
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-
-/*
- * we must set $GLOBALS['server'] here
- * since 'check_user_privileges.lib.php' will use it globally
- */
-$GLOBALS['server'] = 0;
-
-/*
- * Include to test.
- */
-
-
-require_once 'libraries/database_interface.inc.php';
-require_once 'libraries/import.lib.php';
-require_once 'libraries/url_generating.lib.php';
-
-/**
- * Tests for import functions
- *
- * @package PhpMyAdmin-test
- */
-class PMA_Import_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Prepares environment for the test.
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        $GLOBALS['cfg']['ServerDefault'] = '';
-    }
-
-    /**
-     * Test for PMA_checkTimeout
-     *
-     * @return void
-     */
-    function testCheckTimeout()
-    {
-        global $timestamp, $maximum_time, $timeout_passed;
-
-        //Reinit values.
-        $timestamp = time();
-        $maximum_time = 0;
-        $timeout_passed = false;
-
-        $this->assertFalse(PMA_checkTimeout());
-
-        //Reinit values.
-        $timestamp = time();
-        $maximum_time = 0;
-        $timeout_passed = true;
-
-        $this->assertFalse(PMA_checkTimeout());
-
-        //Reinit values.
-        $timestamp = time();
-        $maximum_time = 30;
-        $timeout_passed = true;
-
-        $this->assertTrue(PMA_checkTimeout());
-
-        //Reinit values.
-        $timestamp = time()-15;
-        $maximum_time = 30;
-        $timeout_passed = false;
-
-        $this->assertFalse(PMA_checkTimeout());
-
-        //Reinit values.
-        $timestamp = time()-60;
-        $maximum_time = 30;
-        $timeout_passed = false;
-
-        $this->assertTrue(PMA_checkTimeout());
-    }
-
-    /**
-     * Test for PMA_lookForUse
-     *
-     * @return void
-     */
-    function testLookForUse()
-    {
-        $this->assertEquals(
-            array(null, null),
-            PMA_lookForUse(null, null, null)
-        );
-
-        $this->assertEquals(
-            array('myDb', null),
-            PMA_lookForUse(null, 'myDb', null)
-        );
-
-        $this->assertEquals(
-            array('myDb', true),
-            PMA_lookForUse(null, 'myDb', true)
-        );
-
-        $this->assertEquals(
-            array('myDb', true),
-            PMA_lookForUse('select 1 from myTable', 'myDb', true)
-        );
-
-        $this->assertEquals(
-            array('anotherDb', true),
-            PMA_lookForUse('use anotherDb', 'myDb', false)
-        );
-
-        $this->assertEquals(
-            array('anotherDb', true),
-            PMA_lookForUse('use anotherDb', 'myDb', true)
-        );
-
-        $this->assertEquals(
-            array('anotherDb', true),
-            PMA_lookForUse('use `anotherDb`;', 'myDb', true)
-        );
-    }
-
-    /**
-     * Test for PMA_getColumnAlphaName
-     *
-     * @param string $expected Expected result of the function
-     * @param int    $num      The column number
-     *
-     * @return void
-     *
-     * @dataProvider provGetColumnAlphaName
-     */
-    function testGetColumnAlphaName($expected, $num)
-    {
-        $this->assertEquals($expected, PMA_getColumnAlphaName($num));
-    }
-
-    /**
-     * Data provider for testGetColumnAlphaName
-     *
-     * @return array
-     */
-    function provGetColumnAlphaName()
-    {
-        return array(
-            array('A', 1),
-            array('Z', 0),
-            array('AA', 27),
-            array('AZ', 52),
-            array('BA', 53),
-            array('BB', 54),
-        );
-    }
-
-    /**
-     * Test for PMA_getColumnNumberFromName
-     *
-     * @param int         $expected Expected result of the function
-     * @param string|null $name     column name(i.e. "A", or "BC", etc.)
-     *
-     * @return void
-     *
-     * @dataProvider provGetColumnNumberFromName
-     */
-    function testGetColumnNumberFromName($expected, $name)
-    {
-        $this->assertEquals($expected, PMA_getColumnNumberFromName($name));
-    }
-
-    /**
-     * Data provider for testGetColumnNumberFromName
-     *
-     * @return array
-     */
-    function provGetColumnNumberFromName()
-    {
-        return array(
-            array(1, 'A'),
-            array(26, 'Z'),
-            array(27, 'AA'),
-            array(52, 'AZ'),
-            array(53, 'BA'),
-            array(54, 'BB'),
-        );
-    }
-
-    /**
-     * Test for PMA_getDecimalPrecision
-     *
-     * @param int         $expected Expected result of the function
-     * @param string|null $size     Size of field
-     *
-     * @return void
-     *
-     * @dataProvider provGetDecimalPrecision
-     */
-    function testGetDecimalPrecision($expected, $size)
-    {
-        $this->assertEquals($expected, PMA_getDecimalPrecision($size));
-    }
-
-    /**
-     * Data provider for testGetDecimalPrecision
-     *
-     * @return array
-     */
-    function provGetDecimalPrecision()
-    {
-        return array(
-            array(2, '2,1'),
-            array(6, '6,2'),
-            array(6, '6,0'),
-            array(16, '16,2'),
-        );
-    }
-
-    /**
-     * Test for PMA_getDecimalScale
-     *
-     * @param int         $expected Expected result of the function
-     * @param string|null $size     Size of field
-     *
-     * @return void
-     *
-     * @dataProvider provGetDecimalScale
-     */
-    function testGetDecimalScale($expected, $size)
-    {
-        $this->assertEquals($expected, PMA_getDecimalScale($size));
-    }
-
-    /**
-     * Data provider for testGetDecimalScale
-     *
-     * @return array
-     */
-    function provGetDecimalScale()
-    {
-        return array(
-            array(1, '2,1'),
-            array(2, '6,2'),
-            array(0, '6,0'),
-            array(20, '30,20'),
-        );
-    }
-
-    /**
-     * Test for PMA_getDecimalSize
-     *
-     * @param array       $expected Expected result of the function
-     * @param string|null $cell     Cell content
-     *
-     * @return void
-     *
-     * @dataProvider provGetDecimalSize
-     */
-    function testGetDecimalSize($expected, $cell)
-    {
-        $this->assertEquals($expected, PMA_getDecimalSize($cell));
-    }
-
-    /**
-     * Data provider for testGetDecimalSize
-     *
-     * @return array
-     */
-    function provGetDecimalSize()
-    {
-        return array(
-            array(array(2, 1, '2,1'), '2.1'),
-            array(array(2, 1, '2,1'), '6.2'),
-            array(array(3, 1, '3,1'), '10.0'),
-            array(array(4, 2, '4,2'), '30.20'),
-        );
-    }
-
-    /**
-     * Test for PMA_detectType
-     *
-     * @param int         $expected Expected result of the function
-     * @param int|null    $type     Last cumulative column type (VARCHAR or INT or
-     *                              BIGINT or DECIMAL or NONE)
-     * @param string|null $cell     String representation of the cell for which a
-     *                              best-fit type is to be determined
-     *
-     * @return void
-     *
-     * @dataProvider provDetectType
-     */
-    function testDetectType($expected, $type, $cell)
-    {
-        $this->assertEquals($expected, PMA_detectType($type, $cell));
-    }
-
-    /**
-     * Data provider for testDetectType
-     *
-     * @return array
-     */
-    function provDetectType()
-    {
-        return array(
-            array(NONE, null, 'NULL'),
-            array(NONE, NONE, 'NULL'),
-            array(INT, INT, 'NULL'),
-            array(VARCHAR, VARCHAR, 'NULL'),
-            array(VARCHAR, null, null),
-            array(VARCHAR, INT, null),
-            array(INT, INT, '10'),
-            array(DECIMAL, DECIMAL, '10.2'),
-            array(DECIMAL, INT, '10.2'),
-            array(BIGINT, BIGINT, '2147483648'),
-            array(BIGINT, INT, '2147483648'),
-            array(VARCHAR, VARCHAR, 'test'),
-            array(VARCHAR, INT, 'test'),
-        );
-    }
-
-    /**
-     * Test for PMA_getMatchedRows.
-     *
-     * @return void
-     */
-    function testPMAGetMatchedRows()
-    {
-        $GLOBALS['db'] = 'PMA';
-        //mock DBI
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $update_query = 'UPDATE `table_1` '
-            . 'SET `id` = 20 '
-            . 'WHERE `id` > 10';
-        $simulated_update_query = 'SELECT `id` FROM `table_1` WHERE `id` > 10 AND (`id` <> 20)';
-
-        $delete_query = 'DELETE FROM `table_1` '
-            . 'WHERE `id` > 10';
-        $simulated_delete_query = 'SELECT * FROM `table_1` WHERE `id` > 10';
-
-        $dbi->expects($this->any())
-            ->method('numRows')
-            ->with(array())
-            ->will($this->returnValue(2));
-
-        $dbi->expects($this->any())
-            ->method('selectDb')
-            ->with('PMA')
-            ->will($this->returnValue(true));
-
-        $dbi->expects($this->at(1))
-            ->method('tryQuery')
-            ->with($simulated_update_query)
-            ->will($this->returnValue(array()));
-
-        $dbi->expects($this->at(4))
-            ->method('tryQuery')
-            ->with($simulated_delete_query)
-            ->will($this->returnValue(array()));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $this->simulatedQueryTest($update_query, $simulated_update_query);
-        $this->simulatedQueryTest($delete_query, $simulated_delete_query);
-    }
-
-    /**
-     * Tests simulated UPDATE/DELETE query.
-     *
-     * @param string $sql_query       SQL query
-     * @param string $simulated_query Simulated query
-     *
-     * @return void
-     */
-    function simulatedQueryTest($sql_query, $simulated_query)
-    {
-        $parser = new SqlParser\Parser($sql_query);
-        $analyzed_sql_results = array(
-            'query' => $sql_query,
-            'parser' => $parser,
-            'statement' => $parser->statements[0],
-        );
-
-        $simulated_data = PMA_getMatchedRows($analyzed_sql_results);
-
-        // URL to matched rows.
-        $_url_params = array(
-            'db'        => 'PMA',
-            'sql_query' => $simulated_query
-        );
-        $matched_rows_url  = 'sql.php' . PMA_URL_getCommon($_url_params);
-
-        $this->assertEquals(
-            array(
-                'sql_query' => PMA\libraries\Util::formatSql(
-                    $analyzed_sql_results['query']
-                ),
-                'matched_rows' => 2,
-                'matched_rows_url' => $matched_rows_url
-            ),
-            $simulated_data
-        );
-    }
-
-    /**
-     * Test for PMA_checkIfRollbackPossible
-     *
-     * @return void
-     */
-    function testPMACheckIfRollbackPossible()
-    {
-        $GLOBALS['db'] = 'PMA';
-        //mock DBI
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        // List of Transactional Engines.
-        $transactional_engines = array(
-            'INNODB',
-            'FALCON',
-            'NDB',
-            'INFINIDB',
-            'TOKUDB',
-            'XTRADB',
-            'SEQUENCE',
-            'BDB'
-        );
-
-        $check_query = 'SELECT `ENGINE` FROM `information_schema`.`tables` '
-            . 'WHERE `table_name` = "%s" '
-            . 'AND `table_schema` = "%s" '
-            . 'AND UPPER(`engine`) IN ("'
-            . implode('", "', $transactional_engines)
-            . '")';
-
-        $check_table_query = 'SELECT * FROM `%s`.`%s` '
-            . 'LIMIT 1';
-
-        $dbi->expects($this->at(0))
-            ->method('tryQuery')
-            ->with(sprintf($check_table_query, 'PMA', 'table_1'))
-            ->will($this->returnValue(array('table')));
-
-        $dbi->expects($this->at(1))
-            ->method('tryQuery')
-            ->with(sprintf($check_query, 'table_1', 'PMA'))
-            ->will($this->returnValue(true));
-
-        $dbi->expects($this->at(2))
-            ->method('numRows')
-            ->will($this->returnValue(1));
-
-        $dbi->expects($this->at(3))
-            ->method('tryQuery')
-            ->with(sprintf($check_table_query, 'PMA', 'table_2'))
-            ->will($this->returnValue(array('table')));
-
-        $dbi->expects($this->at(4))
-            ->method('tryQuery')
-            ->with(sprintf($check_query, 'table_2', 'PMA'))
-            ->will($this->returnValue(true));
-
-        $dbi->expects($this->at(5))
-            ->method('numRows')
-            ->will($this->returnValue(1));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $sql_query = 'UPDATE `table_1` AS t1, `table_2` t2 '
-            . 'SET `table_1`.`id` = `table_2`.`id` '
-            . 'WHERE 1';
-
-        $this->assertEquals(true, PMA_checkIfRollbackPossible($sql_query));
-    }
-}
diff --git a/#pma/test/libraries/PMA_insert_edit_test.php b/#pma/test/libraries/PMA_insert_edit_test.php
deleted file mode 100644
index 7a0bc31a..00000000
--- a/#pma/test/libraries/PMA_insert_edit_test.php
+++ /dev/null
@@ -1,3106 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Tests for libraries/insert_edit.lib.php
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-use PMA\libraries\Table;
-use PMA\libraries\Theme;
-use PMA\libraries\Tracker;
-use PMA\libraries\Types;
-use PMA\libraries\TypesMySQL;
-
-require_once 'libraries/insert_edit.lib.php';
-require_once 'libraries/database_interface.inc.php';
-require_once 'libraries/url_generating.lib.php';
-require_once 'libraries/js_escape.lib.php';
-require_once 'libraries/relation.lib.php';
-require_once 'libraries/transformations.lib.php';
-require_once 'libraries/sanitizing.lib.php';
-
-/**
- * Tests for libraries/insert_edit.lib.php
- *
- * @package PhpMyAdmin-test
- * @group medium
- */
-class PMA_InsertEditTest extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Setup for test cases
-     *
-     * @return void
-     */
-    public function setup()
-    {
-        $GLOBALS['server'] = 1;
-        $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
-        $GLOBALS['pmaThemeImage'] = 'theme/';
-        $GLOBALS['PMA_PHP_SELF'] = 'index.php';
-        $GLOBALS['cfg']['ServerDefault'] = 1;
-        $GLOBALS['text_dir'] = 'ltr';
-        $GLOBALS['db'] = 'db';
-        $GLOBALS['table'] = 'table';
-        $GLOBALS['PMA_Types'] = new TypesMySQL();
-        $GLOBALS['cfg']['LimitChars'] = 50;
-        $GLOBALS['cfg']['LongtextDoubleTextarea'] = false;
-        $GLOBALS['cfg']['ShowFieldTypesInDataEditView'] = true;
-        $GLOBALS['cfg']['ShowFunctionFields'] = true;
-        $GLOBALS['cfg']['ProtectBinary'] = 'blob';
-        $GLOBALS['cfg']['MaxSizeForInputField'] = 10;
-        $GLOBALS['cfg']['MinSizeForInputField'] = 2;
-        $GLOBALS['cfg']['TextareaRows'] = 5;
-        $GLOBALS['cfg']['TextareaCols'] = 4;
-        $GLOBALS['cfg']['CharTextareaRows'] = 5;
-        $GLOBALS['cfg']['CharTextareaCols'] = 6;
-        $GLOBALS['cfg']['AllowThirdPartyFraming'] = false;
-        $GLOBALS['cfg']['SendErrorReports'] = 'ask';
-        $GLOBALS['cfg']['DefaultTabDatabase'] = 'structure';
-        $GLOBALS['cfg']['ShowDatabasesNavigationAsTree'] = true;
-        $GLOBALS['cfg']['DefaultTabTable'] = 'browse';
-        $GLOBALS['cfg']['NavigationTreeDefaultTabTable'] = 'structure';
-        $GLOBALS['cfg']['NavigationTreeDefaultTabTable2'] = '';
-        $GLOBALS['cfg']['Confirm'] = true;
-        $GLOBALS['cfg']['LoginCookieValidity'] = 1440;
-        $GLOBALS['PMA_Config'] = new PMA\libraries\Config();
-    }
-
-    /**
-     * Test for PMA_getFormParametersForInsertForm
-     *
-     * @return void
-     */
-    public function testGetFormParametersForInsertForm()
-    {
-        $where_clause = array('foo' => 'bar ', '1' => ' test');
-        $_REQUEST['clause_is_unique'] = false;
-        $_REQUEST['sql_query'] = 'SELECT a';
-        $GLOBALS['goto'] = 'index.php';
-
-        $result = PMA_getFormParametersForInsertForm(
-            'dbname', 'tablename', array(), $where_clause, 'localhost'
-        );
-
-        $this->assertEquals(
-            array(
-                'db'        => 'dbname',
-                'table'     => 'tablename',
-                'goto'      => 'index.php',
-                'err_url'   => 'localhost',
-                'sql_query' => 'SELECT a',
-                'where_clause[foo]' => 'bar',
-                'where_clause[1]' => 'test',
-                'clause_is_unique' => false
-            ),
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA_getWhereClauseArray
-     *
-     * @return void
-     */
-    public function testGetWhereClauseArray()
-    {
-        $this->assertEquals(
-            array(),
-            PMA_getWhereClauseArray(null)
-        );
-
-        $this->assertEquals(
-            array(1, 2, 3),
-            PMA_getWhereClauseArray(array(1, 2, 3))
-        );
-
-        $this->assertEquals(
-            array('clause'),
-            PMA_getWhereClauseArray('clause')
-        );
-    }
-
-    /**
-     * Test for PMA_analyzeWhereClauses
-     *
-     * @return void
-     */
-    public function testAnalyzeWhereClause()
-    {
-        $clauses = array('a=1', 'b="fo\o"');
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->exactly(2))
-            ->method('query')
-            ->willReturnOnConsecutiveCalls(
-                'result1',
-                'result2'
-            );
-
-        $dbi->expects($this->exactly(2))
-            ->method('fetchAssoc')
-            ->willReturnOnConsecutiveCalls(
-                array('assoc1'),
-                array('assoc2')
-            );
-
-        $GLOBALS['dbi'] = $dbi;
-        $result = PMA_analyzeWhereClauses($clauses, 'table', 'db');
-
-        $this->assertEquals(
-            array(
-                array('a=1', 'b="fo\\\\o"'),
-                array('result1', 'result2'),
-                array(
-                    array('assoc1'),
-                    array('assoc2')
-                ),
-                ''
-            ),
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA_showEmptyResultMessageOrSetUniqueCondition
-     *
-     * @return void
-     */
-    public function testShowEmptyResultMessageOrSetUniqueCondition()
-    {
-        $temp = new stdClass;
-        $temp->orgname = 'orgname';
-        $temp->table = 'table';
-        $temp->type = 'real';
-        $temp->primary_key = 1;
-        $meta_arr = array($temp);
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->at(0))
-            ->method('getFieldsMeta')
-            ->with('result1')
-            ->will($this->returnValue($meta_arr));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $result = PMA_showEmptyResultMessageOrSetUniqueCondition(
-            array('1' => array('1' => 1)), 1, array(),
-            'SELECT', array('1' => 'result1')
-        );
-
-        $this->assertTrue($result);
-
-        // case 2
-        $GLOBALS['cfg']['ShowSQL'] = false;
-
-        $responseMock = $this->getMockBuilder('PMA\libraries\Response')
-            ->disableOriginalConstructor()
-            ->setMethods(array('addHtml'))
-            ->getMock();
-
-        $restoreInstance = PMA\libraries\Response::getInstance();
-        $response = new ReflectionProperty('PMA\libraries\Response', '_instance');
-        $response->setAccessible(true);
-        $response->setValue($responseMock);
-
-        $result = PMA_showEmptyResultMessageOrSetUniqueCondition(
-            array(false), 0, array('1'), 'SELECT', array('1' => 'result1')
-        );
-
-        $response->setValue($restoreInstance);
-
-        $this->assertFalse($result);
-    }
-
-    /**
-     * Test for PMA_loadFirstRow
-     *
-     * @return void
-     */
-    public function testLoadFirstRow()
-    {
-        $GLOBALS['cfg']['InsertRows'] = 2;
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->at(0))
-            ->method('query')
-            ->with(
-                'SELECT * FROM `db`.`table` LIMIT 1;',
-                null,
-                PMA\libraries\DatabaseInterface::QUERY_STORE
-            )
-            ->will($this->returnValue('result1'));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $result = PMA_loadFirstRow('table', 'db');
-
-        $this->assertEquals(
-            array('result1', array(false, false)),
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA_urlParamsInEditMode
-     *
-     * @return void
-     */
-    public function testUrlParamsInEditMode()
-    {
-        $where_clause_array = array('foo=1', 'bar=2');
-        $_REQUEST['sql_query'] = 'SELECT 1';
-
-        $result = PMA_urlParamsInEditMode(array(1), $where_clause_array, '');
-
-        $this->assertEquals(
-            array(
-                '0' => 1,
-                'where_clause' => 'bar=2',
-                'sql_query' => 'SELECT 1'
-            ),
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA_showTypeOrFunction
-     *
-     * @return void
-     */
-    public function testShowTypeOrFunction()
-    {
-        $GLOBALS['cfg']['ShowFieldTypesInDataEditView'] = true;
-        $GLOBALS['cfg']['ServerDefault'] = 1;
-        $url_params = array('ShowFunctionFields' => 2);
-
-        $result = PMA_showTypeOrFunction('function', $url_params, false);
-
-        $this->assertEquals(
-            ' : <a href="tbl_change.php?ShowFunctionFields=1&amp;ShowFieldTypesIn'
-            . 'DataEditView=1&amp;goto=sql.php&amp;lang=en&amp;token=token">'
-            . 'Function</a>',
-            $result
-        );
-
-        // case 2
-        $result = PMA_showTypeOrFunction('function', $url_params, true);
-
-        $this->assertEquals(
-            '<th><a href="tbl_change.php?ShowFunctionFields=0&amp;ShowFieldTypesIn'
-            . 'DataEditView=1&amp;goto=sql.php&amp;lang=en&amp;token=token" title='
-            . '"Hide">Function</a></th>',
-            $result
-        );
-
-        // case 3
-        $result = PMA_showTypeOrFunction('type', $url_params, false);
-
-        $this->assertEquals(
-            ' : <a href="tbl_change.php?ShowFunctionFields=1&amp;ShowFieldTypesIn'
-            . 'DataEditView=1&amp;goto=sql.php&amp;lang=en&amp;token=token">'
-            . 'Type</a>',
-            $result
-        );
-
-        // case 4
-        $result = PMA_showTypeOrFunction('type', $url_params, true);
-
-        $this->assertEquals(
-            '<th><a href="tbl_change.php?ShowFunctionFields=1&amp;ShowFieldTypesIn'
-            . 'DataEditView=0&amp;goto=sql.php&amp;lang=en&amp;token=token" title='
-            . '"Hide">Type</a></th>',
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA_analyzeTableColumnsArray
-     *
-     * @return void
-     */
-    public function testAnalyzeTableColumnsArray()
-    {
-        $column = array(
-            'Field' => '1<2',
-            'Field_md5' => 'pswd',
-            'Type' => 'float(10, 1)'
-        );
-
-        $result = PMA_analyzeTableColumnsArray(
-            $column, array(), false
-        );
-
-        $this->assertEquals(
-            $result['Field_html'],
-            '1&lt;2'
-        );
-
-        $this->assertEquals(
-            $result['Field_md5'],
-            '4342210df36bf2ff2c4e2a997a6d4089'
-        );
-
-        $this->assertEquals(
-            $result['True_Type'],
-            'float'
-        );
-
-        $this->assertEquals(
-            $result['len'],
-            100
-        );
-
-        $this->assertEquals(
-            $result['Field_title'],
-            '1&lt;2'
-        );
-
-        $this->assertEquals(
-            $result['is_binary'],
-            false
-        );
-
-        $this->assertEquals(
-            $result['is_blob'],
-            false
-        );
-
-        $this->assertEquals(
-            $result['is_char'],
-            false
-        );
-
-        $this->assertEquals(
-            $result['pma_type'],
-            'float(10, 1)'
-        );
-
-        $this->assertEquals(
-            $result['wrap'],
-            ' nowrap'
-        );
-
-        $this->assertEquals(
-            $result['Field'],
-            '1<2'
-        );
-    }
-
-    /**
-     * Test for PMA_getColumnTitle
-     *
-     * @return void
-     */
-    public function testGetColumnTitle()
-    {
-        $column = array();
-        $column['Field'] = 'f1<';
-        $column['Field_html'] = 'f1&lt;';
-
-        $this->assertEquals(
-            PMA_getColumnTitle($column, array()),
-            'f1&lt;'
-        );
-
-        $comments = array();
-        $comments['f1<'] = 'comment>';
-
-        $result = PMA_getColumnTitle($column, $comments);
-
-        $this->assertContains(
-            'title="comment&gt;"',
-            $result
-        );
-
-        $this->assertContains(
-            'f1&lt;',
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA_isColumn
-     *
-     * @return void
-     */
-    public function testIsColumn()
-    {
-        $column = array();
-        $types = array('binary', 'varbinary');
-
-        $column['Type'] = 'binaryfoo';
-        $this->assertTrue(PMA_isColumn($column, $types));
-
-        $column['Type'] = 'Binaryfoo';
-        $this->assertTrue(PMA_isColumn($column, $types));
-
-        $column['Type'] = 'varbinaryfoo';
-        $this->assertTrue(PMA_isColumn($column, $types));
-
-        $column['Type'] = 'barbinaryfoo';
-        $this->assertFalse(PMA_isColumn($column, $types));
-
-        $types = array('char', 'varchar');
-
-        $column['Type'] = 'char(10)';
-        $this->assertTrue(PMA_isColumn($column, $types));
-
-        $column['Type'] = 'VarChar(20)';
-        $this->assertTrue(PMA_isColumn($column, $types));
-
-        $column['Type'] = 'foochar';
-        $this->assertFalse(PMA_isColumn($column, $types));
-
-        $types = array('blob', 'tinyblob', 'mediumblob', 'longblob');
-
-        $column['Type'] = 'blob';
-        $this->assertTrue(PMA_isColumn($column, $types));
-
-        $column['Type'] = 'bloB';
-        $this->assertTrue(PMA_isColumn($column, $types));
-
-        $column['Type'] = 'mediumBloB';
-        $this->assertTrue(PMA_isColumn($column, $types));
-
-        $column['Type'] = 'tinyblobabc';
-        $this->assertTrue(PMA_isColumn($column, $types));
-
-        $column['Type'] = 'longblob';
-        $this->assertTrue(PMA_isColumn($column, $types));
-
-        $column['Type'] = 'foolongblobbar';
-        $this->assertFalse(PMA_isColumn($column, $types));
-    }
-
-    /**
-     * Test for PMA_getEnumSetAndTimestampColumns
-     *
-     * @return void
-     */
-    public function testGetEnumAndTimestampColumns()
-    {
-        $column = array();
-        $column['True_Type'] = 'set';
-        $this->assertEquals(
-            array('set', '', false),
-            PMA_getEnumSetAndTimestampColumns($column, false)
-        );
-
-        $column['True_Type'] = 'enum';
-        $this->assertEquals(
-            array('enum', '', false),
-            PMA_getEnumSetAndTimestampColumns($column, false)
-        );
-
-        $column['True_Type'] = 'timestamp';
-        $column['Type'] = 'date';
-        $this->assertEquals(
-            array('date', ' nowrap', true),
-            PMA_getEnumSetAndTimestampColumns($column, false)
-        );
-
-        $column['True_Type'] = 'timestamp';
-        $column['Type'] = 'date';
-        $this->assertEquals(
-            array('date', ' nowrap', false),
-            PMA_getEnumSetAndTimestampColumns($column, true)
-        );
-
-        $column['True_Type'] = 'SET';
-        $column['Type'] = 'num';
-        $this->assertEquals(
-            array('num', ' nowrap', false),
-            PMA_getEnumSetAndTimestampColumns($column, false)
-        );
-
-        $column['True_Type'] = '';
-        $column['Type'] = 'num';
-        $this->assertEquals(
-            array('num', ' nowrap', false),
-            PMA_getEnumSetAndTimestampColumns($column, false)
-        );
-    }
-
-    /**
-     * Test for PMA_getFunctionColumn
-     *
-     * @return void
-     */
-    public function testGetFunctionColumn()
-    {
-        $GLOBALS['cfg']['ProtectBinary'] = 'blob';
-        $column = array();
-        $column['is_blob'] = true;
-        $this->assertContains(
-            '<td class="center">Binary</td>',
-            PMA_getFunctionColumn(
-                $column, false, '', '', array(), 0, 0, 0, false, false, array()
-            )
-        );
-
-        $GLOBALS['cfg']['ProtectBinary'] = 'all';
-        $column['is_binary'] = true;
-        $this->assertContains(
-            '<td class="center">Binary</td>',
-            PMA_getFunctionColumn(
-                $column, true, '', '', array(), 0, 0, 0, false, false, array()
-            )
-        );
-
-        $GLOBALS['cfg']['ProtectBinary'] = 'noblob';
-        $column['is_blob'] = false;
-        $this->assertContains(
-            '<td class="center">Binary</td>',
-            PMA_getFunctionColumn(
-                $column, true, '', '', array(), 0, 0, 0, false, false, array()
-            )
-        );
-
-        $GLOBALS['cfg']['ProtectBinary'] = false;
-        $column['True_Type'] = 'enum';
-        $this->assertContains(
-            '<td class="center">--</td>',
-            PMA_getFunctionColumn(
-                $column, true, '', '', array(), 0, 0, 0, false, false, array()
-            )
-        );
-
-        $column['True_Type'] = 'set';
-        $this->assertContains(
-            '<td class="center">--</td>',
-            PMA_getFunctionColumn(
-                $column, true, '', '', array(), 0, 0, 0, false, false, array()
-            )
-        );
-
-        $column['True_Type'] = '';
-        $column['pma_type'] = 'int';
-        $this->assertContains(
-            '<td class="center">--</td>',
-            PMA_getFunctionColumn(
-                $column, true, '', '', array('int'), 0, 0, 0, false, false, array()
-            )
-        );
-
-        $GLOBALS['PMA_Types'] = new Types;
-        $column['Field'] = 'num';
-        $this->assertContains(
-            '<select name="funcsa" b tabindex="5" id="field_3_1"',
-            PMA_getFunctionColumn(
-                $column, true, 'a', 'b', array(), 2, 3, 3, false, false, array()
-            )
-        );
-    }
-
-    /**
-     * Test for PMA_getNullColumn
-     *
-     * @return void
-     */
-    public function testGetNullColumn()
-    {
-        $column = array('Field' => '');
-        $column['Null'] = 'YES';
-        $column['first_timestamp'] = false;
-        $column['True_Type'] = 'enum';
-        $column['Type'] = 0;
-        $column['Field_md5'] = 'foobar';
-        $foreigners = array(
-            'foreign_keys_data' => array()
-        );
-
-        $result = PMA_getNullColumn(
-            $column, 'a', true, 2, 0, 1, "<script>", $foreigners, array(), false
-        );
-
-        $this->assertContains(
-            '<input type="hidden" name="fields_null_preva" value="on" />',
-            $result
-        );
-
-        $this->assertContains(
-            '<input type="checkbox" class="checkbox_null" tabindex="2" '
-            . 'name="fields_nulla" checked="checked" id="field_1_2" ',
-            $result
-        );
-
-        $this->assertContains(
-            '<input type="hidden" class="nullify_code" name="nullify_codea" '
-            . 'value="2" ',
-            $result
-        );
-
-        $this->assertContains(
-            '<input type="hidden" class="hashed_field" name="hashed_fielda" '
-            . 'value="foobar" />',
-            $result
-        );
-
-        $this->assertContains(
-            '<input type="hidden" class="multi_edit" name="multi_edita" '
-            . 'value="<script>"',
-            $result
-        );
-
-        // case 2
-        $column['Null'] = 'NO';
-        $result = PMA_getNullColumn(
-            $column, 'a', true, 2, 0, 1, "<script>", array(), array(), false
-        );
-
-        $this->assertEquals(
-            "<td></td>\n",
-            $result
-        );
-
-        // case 3
-        $column['Null'] = 'YES';
-        $result = PMA_getNullColumn(
-            $column, 'a', true, 2, 0, 1, "<script>", array(), array(), true
-        );
-
-        $this->assertEquals(
-            "<td></td>\n",
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA_getNullifyCodeForNullColumn
-     *
-     * @return void
-     */
-    public function testGetNullifyCodeForNullColumn()
-    {
-        $column = $foreignData = array();
-        $foreigners = array(
-            'foreign_keys_data' => array()
-        );
-        $column['Field'] = 'f';
-        $column['True_Type'] = 'enum';
-        $column['Type'] = 'ababababababababababa';
-        $this->assertEquals(
-            '1',
-            PMA_getNullifyCodeForNullColumn($column, $foreigners, array())
-        );
-
-        $column['True_Type'] = 'enum';
-        $column['Type'] = 'abababababababababab';
-        $this->assertEquals(
-            '2',
-            PMA_getNullifyCodeForNullColumn($column, $foreigners, array())
-        );
-
-        $column['True_Type'] = 'set';
-        $this->assertEquals(
-            '3',
-            PMA_getNullifyCodeForNullColumn($column, $foreigners, array())
-        );
-
-        $column['True_Type'] = '';
-        $foreigners['f'] = true;
-        $foreignData['foreign_link'] = '';
-        $this->assertEquals(
-            '4',
-            PMA_getNullifyCodeForNullColumn($column, $foreigners, $foreignData)
-        );
-    }
-
-    /**
-     * Test for PMA_getForeignLink
-     *
-     * @return void
-     */
-    public function testGetForeignLink()
-    {
-        $column = $titles = array();
-        $column['Field'] = 'f';
-        $titles['Browse'] = "'";
-        $GLOBALS['cfg']['ServerDefault'] = 2;
-        $result = PMA_getForeignLink(
-            $column, 'a', 'b', 'd', 2, 0, 1, "abc", array('tbl', 'db'), 8,
-            $titles, false
-        );
-
-        $this->assertContains(
-            '<input type="hidden" name="fields_typeb" value="foreign"',
-            $result
-        );
-
-        $this->assertContains(
-            '<a class="ajax browse_foreign" href="browse_'
-            . 'foreigners.php?db=db&amp;table=tbl&amp;field=f&amp;rownumber=8'
-            . '&amp;data=abc&amp;server=1&amp;lang=en&amp;token=token">',
-            $result
-        );
-
-        $this->assertContains(
-            '<input type="text" name="fieldsb" class="textfield" d tabindex="2" '
-            . 'id="field_1_3" value="abc"',
-            $result
-        );
-
-    }
-
-    /**
-     * Test for PMA_dispRowForeignData
-     *
-     * @return void
-     */
-    public function testDispRowForeignData()
-    {
-        $foreignData = array();
-        $foreignData['disp_row'] = array();
-        $foreignData['foreign_field'] = null;
-        $foreignData['foreign_display'] = null;
-        $GLOBALS['cfg']['ForeignKeyMaxLimit'] = 1;
-        $GLOBALS['cfg']['NaturalOrder'] = false;
-        $result = PMA_dispRowForeignData(
-            'a', 'b', 'd', 2, 0, 1, "<s>", $foreignData, false
-        );
-
-        $this->assertContains(
-            "a\n",
-            $result
-        );
-
-        $this->assertContains(
-            '<select name="fieldsb" d class="textfield" tabindex="2" '
-            . 'id="field_1_3">',
-            $result
-        );
-
-        $this->assertContains(
-            '<input type="hidden" name="fields_typeb" value="foreign"',
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA_getTextarea
-     *
-     * @return void
-     */
-    public function testGetTextarea()
-    {
-        $GLOBALS['cfg']['TextareaRows'] = 20;
-        $GLOBALS['cfg']['TextareaCols'] = 10;
-        $GLOBALS['cfg']['CharTextareaRows'] = 5;
-        $GLOBALS['cfg']['CharTextareaCols'] = 1;
-        $GLOBALS['cfg']['LimitChars'] = 20;
-
-        $column = array();
-        $column['is_char'] = true;
-        $column['Type'] = 'char(10)';
-        $column['True_Type'] = 'char';
-        $result = PMA_getTextarea(
-            $column, 'a', 'b', '', 2, 0, 1, "abc/", 'foobar', 'CHAR', false
-        );
-
-        $this->assertContains(
-            '<textarea name="fieldsb" class="char" '
-            . 'data-maxlength="10" rows="5" cols="1" dir="abc/" '
-            . 'id="field_1_3" tabindex="2" data-type="CHAR">',
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA_getPmaTypeEnum
-     *
-     * @return void
-     */
-    public function testGetPmaTypeEnum()
-    {
-        $extracted_columnspec = $column = array();
-        $extracted_columnspec['enum_set_values'] = array();
-        $column['Type'] = 'abababababababababab';
-        $column['values'] = array(
-            array(
-                'html' => 'foo',
-                'plain' => 'data'
-            )
-        );
-        $result = PMA_getPmaTypeEnum(
-            $column, 'a', 'b', $extracted_columnspec, 'd', 2, 0, 1,
-            'foobar', false
-        );
-
-        $this->assertContains(
-            '<input type="hidden" name="fields_typeb" value="enum" />',
-            $result
-        );
-
-        $this->assertContains(
-            '<input type="radio" name="fieldsb"',
-            $result
-        );
-
-        $column['Type'] = 'ababababababababababa';
-        $result = PMA_getPmaTypeEnum(
-            $column, 'a', 'b', $extracted_columnspec, 'd', 2, 0, 1,
-            'foobar', false
-        );
-
-        $this->assertContains(
-            '<input type="hidden" name="fields_typeb" value="enum"',
-            $result
-        );
-
-        $this->assertContains(
-            '<select name="fieldsb" d class="textfield" tabindex="2" '
-            . 'id="field_1_3">',
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA_getColumnEnumValues
-     *
-     * @return void
-     */
-    public function testGetColumnEnumValues()
-    {
-        $extracted_columnspec = $column = array();
-        $extracted_columnspec['enum_set_values'] = array(
-            '<abc>', '"foo"'
-        );
-
-        $column['values'] = 'abc';
-
-        $result = PMA_getColumnEnumValues($column, $extracted_columnspec);
-        $this->assertEquals(
-            array(
-                array('plain' => '<abc>', 'html' => '&lt;abc&gt;'),
-                array('plain' => '"foo"', 'html' => '&quot;foo&quot;'),
-            ),
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA_getDropDownDependingOnLength
-     *
-     * @return void
-     */
-    public function testGetDropDownDependingOnLength()
-    {
-        $column_enum_values = array(
-            array(
-                'html' => 'foo',
-                'plain' => 'data'
-            ),
-            array(
-                'html' => 'bar',
-                'plain' => ''
-            )
-        );
-
-        $result = PMA_getDropDownDependingOnLength(
-            array(), 'a', 'b', 2, 0, 1, 'data', $column_enum_values, false
-        );
-
-        $this->assertContains(
-            '<select name="fieldsa" b class="textfield" tabindex="2" '
-            . 'id="field_1_3">',
-            $result
-        );
-
-        $this->assertContains(
-            '<option value="foo" selected="selected">',
-            $result
-        );
-
-        $this->assertContains(
-            '<option value="bar">',
-            $result
-        );
-
-        // case 2
-        $column_enum_values = array(
-            array(
-                'html' => 'foo',
-                'plain' => 'data'
-            )
-        );
-
-        $column = array();
-        $column['Default'] = 'data';
-        $column['Null'] = 'YES';
-        $result = PMA_getDropDownDependingOnLength(
-            $column, 'a', 'b', 2, 0, 1, '', $column_enum_values, false
-        );
-
-        $this->assertContains(
-            '<option value="foo" selected="selected">',
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA_getRadioButtonDependingOnLength
-     *
-     * @return void
-     */
-    public function testGetRadioButtonDependingOnLength()
-    {
-        $column_enum_values = array(
-            array(
-                'html' => 'foo',
-                'plain' => 'data'
-            ),
-            array(
-                'html' => 'bar',
-                'plain' => ''
-            )
-        );
-
-        $result = PMA_getRadioButtonDependingOnLength(
-            'a', 'b', 2, array(), 0, 1, 'data', $column_enum_values, false
-        );
-
-        $this->assertContains(
-            '<input type="radio" name="fieldsa" class="textfield" value="foo" '
-            . 'id="field_1_3_0" b checked="checked" tabindex="2" />',
-            $result
-        );
-
-        $this->assertContains(
-            '<label for="field_1_3_0">foo</label>',
-            $result
-        );
-
-        $this->assertContains(
-            '<input type="radio" name="fieldsa" class="textfield" value="bar" '
-            . 'id="field_1_3_1" b tabindex="2" />',
-            $result
-        );
-
-        $this->assertContains(
-            '<label for="field_1_3_1">bar</label>',
-            $result
-        );
-
-        // case 2
-        $column_enum_values = array(
-            array(
-                'html' => 'foo',
-                'plain' => 'data'
-            )
-        );
-
-        $column = array();
-        $column['Default'] = 'data';
-        $column['Null'] = 'YES';
-        $result = PMA_getRadioButtonDependingOnLength(
-            'a', 'b', 2, $column, 0, 1, '', $column_enum_values, false
-        );
-
-        $this->assertContains(
-            '<input type="radio" name="fieldsa" class="textfield" value="foo" '
-            . 'id="field_1_3_0" b checked="checked" tabindex="2" />',
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA_getPmaTypeSet
-     *
-     * @return void
-     */
-    public function testGetPmaTypeSet()
-    {
-        $column = array();
-        $column['values']  = array(
-            array(
-                'html' => '&lt;',
-                'plain' => '<'
-            )
-        );
-
-        $column['select_size'] = 1;
-
-        $result = PMA_getPmaTypeSet(
-            $column, array(), 'a', 'b', 'c', 2, 0, 1, 'data,<', false
-        );
-
-        $this->assertContains("a\n", $result);
-
-        $this->assertContains(
-            '<input type="hidden" name="fields_typeb" value="set" />',
-            $result
-        );
-
-        $this->assertContains(
-            '<option value="&lt;" selected="selected">&lt;</option>',
-            $result
-        );
-
-        $this->assertContains(
-            '<select name="fieldsb[]" class="textfield" size="1" '
-            . 'multiple="multiple" c tabindex="2" id="field_1_3">',
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA_getColumnSetValueAndSelectSize
-     *
-     * @return void
-     */
-    public function testGetColumnSetValueAndSelectSize()
-    {
-        $extracted_columnspec = $column = array();
-        $extracted_columnspec['enum_set_values'] = array('a', '<');
-        $result = PMA_getColumnSetValueAndSelectSize(array(), $extracted_columnspec);
-
-        $this->assertEquals(
-            array(
-                array(
-                    array('plain' => 'a', 'html' => 'a'),
-                    array('plain' => '<', 'html' => '&lt;')
-                ),
-                2
-            ),
-            $result
-        );
-
-        $column['values'] = array(1, 2);
-        $column['select_size'] = 3;
-        $result = PMA_getColumnSetValueAndSelectSize($column, $extracted_columnspec);
-
-        $this->assertEquals(
-            array(
-                array(1, 2),
-                3
-            ),
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA_getBinaryAndBlobColumn
-     *
-     * @return void
-     */
-    public function testGetBinaryAndBlobColumn()
-    {
-        $GLOBALS['cfg']['ProtectBinary'] = 'blob';
-        $GLOBALS['cfg']['ShowFunctionFields'] = true;
-        $column = array();
-        $column['is_blob'] = true;
-        $column['Field_md5'] = '123';
-        $column['pma_type'] = 'blob';
-        $column['True_Type'] = 'blob';
-        $GLOBALS['max_upload_size'] = 65536;
-
-        $result = PMA_getBinaryAndBlobColumn(
-            $column, '12\\"23', null, 20, 'a', 'b', 'c', 2, 1, 1, '/', null,
-            'foo', true, false
-        );
-
-        $this->assertEquals(
-            'Binary - do not edit (5 B)<input type="hidden" '
-            . 'name="fieldsb" value="" /><input type="hidden" '
-            . 'name="fields_typeb" value="protected" />'
-            . '<br /><input type="file" name="fields_uploadfoo[123]" class="text'
-            . 'field noDragDrop" id="field_1_3" size="10" c/>&nbsp;(Max: 64KiB)' . "\n",
-            $result
-        );
-
-        // case 2
-        $GLOBALS['cfg']['ProtectBinary'] = "all";
-        $column['is_binary'] = true;
-
-        $result = PMA_getBinaryAndBlobColumn(
-            $column, '1223', null, 20, 'a', 'b', 'c', 2, 1, 1, '/', null,
-            'foo', false, false
-        );
-
-        $this->assertEquals(
-            'Binary - do not edit (4 B)<input type="hidden" '
-            . 'name="fieldsb" value="" /><input type="hidden" '
-            . 'name="fields_typeb" value="protected" />',
-            $result
-        );
-
-        // case 3
-        $GLOBALS['cfg']['ProtectBinary'] = "noblob";
-        $column['is_blob'] = false;
-
-        $result = PMA_getBinaryAndBlobColumn(
-            $column, '1223', null, 20, 'a', 'b', 'c', 2, 1, 1, '/', null,
-            'foo', true, false
-        );
-
-        $this->assertEquals(
-            'Binary - do not edit (4 B)<input type="hidden" '
-            . 'name="fieldsb" value="" /><input type="hidden" '
-            . 'name="fields_typeb" value="protected" />',
-            $result
-        );
-
-        // case 4
-        $GLOBALS['cfg']['ProtectBinary'] = false;
-        $column['is_blob'] = true;
-        $column['is_char'] = true;
-        $column['Type'] = 'char(255)';
-        $GLOBALS['cfg']['TextareaRows'] = 20;
-        $GLOBALS['cfg']['TextareaCols'] = 10;
-        $GLOBALS['cfg']['CharTextareaRows'] = 5;
-        $GLOBALS['cfg']['CharTextareaCols'] = 1;
-        $GLOBALS['cfg']['LimitChars'] = 100;
-
-        $result = PMA_getBinaryAndBlobColumn(
-            $column, '1223', null, 20, 'a', 'b', 'c', 2, 1, 1, '/', null,
-            'foo', true, false
-        );
-
-        $this->assertEquals(
-            "\na\n"
-            . '<textarea name="fieldsb" class="char" data-maxlength="255" rows="5" '
-            . 'cols="1" dir="/" id="field_1_3" c tabindex="3" data-type="HEX">'
-            . '</textarea><input type="hidden" name="fields_typeb" value="hex" />'
-            . '<br /><input type="file" name="fields_uploadfoo[123]" class="text'
-            . 'field noDragDrop" id="field_1_3" size="10" c/>&nbsp;(Max: 64KiB)' . "\n",
-            $result
-        );
-
-        // case 5
-        $GLOBALS['cfg']['ProtectBinary'] = false;
-        $GLOBALS['cfg']['LongtextDoubleTextarea'] = true;
-        $GLOBALS['cfg']['LimitChars'] = 100;
-        $column['is_blob'] = false;
-        $column['len'] = 255;
-        $column['is_char'] = false;
-        $GLOBALS['cfg']['TextareaRows'] = 20;
-        $GLOBALS['cfg']['TextareaCols'] = 10;
-
-        $result = PMA_getBinaryAndBlobColumn(
-            $column, '1223', null, 20, 'a', 'b', 'c', 2, 1, 1, '/', null,
-            'foo', true, false
-        );
-
-        $this->assertEquals(
-            "\na\n"
-            . '<textarea name="fieldsb" class="" rows="20" cols="10" dir="/" '
-            . 'id="field_1_3" c tabindex="3" data-type="HEX">'
-            . '</textarea><input type="hidden" '
-            . 'name="fields_typeb" value="hex" />',
-            $result
-        );
-
-        // case 6
-        $column['is_blob'] = false;
-        $column['len'] = 10;
-        $GLOBALS['cfg']['LimitChars'] = 40;
-
-        /**
-         * This condition should be tested, however, it gives an undefined function
-         * PMA_getFileSelectOptions error:
-         * $GLOBALS['cfg']['UploadDir'] = true;
-         *
-         */
-
-        $result = PMA_getBinaryAndBlobColumn(
-            $column, '1223', null, 20, 'a', 'b', 'c', 2, 1, 1, '/', null,
-            'foo', true, false
-        );
-
-        $this->assertEquals(
-            "\na\n"
-            . '<input type="text" name="fieldsb" value="" size="10" data-type='
-            . '"HEX" class="textfield" c tabindex="3" id="field_1_3" />'
-            . '<input type="hidden" name="fields_typeb" value="hex" />',
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA_getHTMLinput
-     *
-     * @return void
-     */
-    public function testGetHTMLinput()
-    {
-        $GLOBALS['cfg']['ShowFunctionFields'] = true;
-        $column = array();
-        $column['pma_type'] = 'date';
-        $column['True_Type'] = 'date';
-        $result = PMA_getHTMLinput(
-            $column, 'a', 'b', 30, 'c', 23, 2, 0, 'DATE', false
-        );
-
-        $this->assertEquals(
-            '<input type="text" name="fieldsa" value="b" size="30" data-type="DATE"'
-            . ' class="textfield datefield" c tabindex="25" id="field_0_3" />',
-            $result
-        );
-
-        // case 2 datetime
-        $column['pma_type'] = 'datetime';
-        $column['True_Type'] = 'datetime';
-        $result = PMA_getHTMLinput(
-            $column, 'a', 'b', 30, 'c', 23, 2, 0, 'DATE', false
-        );
-        $this->assertEquals(
-            '<input type="text" name="fieldsa" value="b" size="30" data-type="DATE"'
-            . ' class="textfield datetimefield" c tabindex="25" id="field_0_3" />',
-            $result
-        );
-
-        // case 3 timestamp
-        $column['pma_type'] = 'timestamp';
-        $column['True_Type'] = 'timestamp';
-        $result = PMA_getHTMLinput(
-            $column, 'a', 'b', 30, 'c', 23, 2, 0, 'DATE', false
-        );
-        $this->assertEquals(
-            '<input type="text" name="fieldsa" value="b" size="30" data-type="DATE"'
-            . ' class="textfield datetimefield" c tabindex="25" id="field_0_3" />',
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA_getMaxUploadSize
-     *
-     * @return void
-     */
-    public function testGetMaxUploadSize()
-    {
-        $GLOBALS['max_upload_size'] = 257;
-        $column = array();
-        $column['pma_type'] = 'tinyblob';
-        $result = PMA_getMaxUploadSize($column, 256);
-
-        $this->assertEquals(
-            array("(Max: 256B)\n", 256),
-            $result
-        );
-
-        // case 2
-        $GLOBALS['max_upload_size'] = 250;
-        $column['pma_type'] = 'tinyblob';
-        $result = PMA_getMaxUploadSize($column, 20);
-
-        $this->assertEquals(
-            array("(Max: 250B)\n", 250),
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA_getValueColumnForOtherDatatypes
-     *
-     * @return void
-     */
-    public function testGetValueColumnForOtherDatatypes()
-    {
-        $column = array();
-        $column['len'] = 20;
-        $column['is_char'] = true;
-        $column['Type'] = 'char(25)';
-        $column['True_Type'] = 'char';
-        $GLOBALS['cfg']['CharEditing'] = '';
-        $GLOBALS['cfg']['MaxSizeForInputField'] = 30;
-        $GLOBALS['cfg']['MinSizeForInputField'] = 10;
-        $GLOBALS['cfg']['TextareaRows'] = 20;
-        $GLOBALS['cfg']['TextareaCols'] = 10;
-        $GLOBALS['cfg']['CharTextareaRows'] = 5;
-        $GLOBALS['cfg']['CharTextareaCols'] = 1;
-        $GLOBALS['cfg']['LimitChars'] = 50;
-        $GLOBALS['cfg']['ShowFunctionFields'] = true;
-
-        $extracted_columnspec = array();
-        $extracted_columnspec['spec_in_brackets'] = 25;
-        $result = PMA_getValueColumnForOtherDatatypes(
-            $column, 'defchar', 'a', 'b', 'c', 22, '&lt;', 12, 1, "/", "&lt;",
-            "foo\nbar", $extracted_columnspec, false
-        );
-
-        $this->assertEquals(
-            "a\n\na\n"
-            . '<textarea name="fieldsb" class="char" '
-            . 'data-maxlength="25" rows="5" cols="1" dir="/" '
-            . 'id="field_1_3" c tabindex="34" data-type="CHAR">'
-            . '&lt;</textarea>',
-            $result
-        );
-
-        // case 2: (else)
-        $column['is_char'] = false;
-        $column['Extra'] = 'auto_increment';
-        $column['pma_type'] = 'timestamp';
-        $column['True_Type'] = 'timestamp';
-        $result = PMA_getValueColumnForOtherDatatypes(
-            $column, 'defchar', 'a', 'b', 'c', 22, '&lt;', 12, 1, "/", "&lt;",
-            "foo\nbar", $extracted_columnspec, false
-        );
-
-        $this->assertEquals(
-            "a\n"
-            . '<input type="text" name="fieldsb" value="&lt;" size="20" data-type="'
-            . 'DATE" class="textfield datetimefield" c tabindex="34" id="field_1_3"'
-            . ' /><input type="hidden" name="auto_incrementb" value="1" />'
-            . '<input type="hidden" name="fields_typeb" value="timestamp" />',
-            $result
-        );
-
-        // case 3: (else -> datetime)
-        $column['pma_type'] = 'datetime';
-        $result = PMA_getValueColumnForOtherDatatypes(
-            $column, 'defchar', 'a', 'b', 'c', 22, '&lt;', 12, 1, "/", "&lt;",
-            "foo\nbar", $extracted_columnspec, false
-        );
-
-        $this->assertContains(
-            '<input type="hidden" name="fields_typeb" value="datetime" />',
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA_getColumnSize
-     *
-     * @return void
-     */
-    public function testGetColumnSize()
-    {
-        $column = $extracted_columnspec = array();
-        $column['is_char'] = true;
-        $extracted_columnspec['spec_in_brackets'] = 45;
-        $GLOBALS['cfg']['MinSizeForInputField'] = 30;
-        $GLOBALS['cfg']['MaxSizeForInputField'] = 40;
-
-        $this->assertEquals(
-            40,
-            PMA_getColumnSize($column, $extracted_columnspec)
-        );
-
-        $this->assertEquals(
-            'textarea',
-            $GLOBALS['cfg']['CharEditing']
-        );
-
-        // case 2
-        $column['is_char'] = false;
-        $column['len'] = 20;
-        $this->assertEquals(
-            30,
-            PMA_getColumnSize($column, $extracted_columnspec)
-        );
-    }
-
-    /**
-     * Test for PMA_getHTMLforGisDataTypes
-     *
-     * @return void
-     */
-    public function testGetHTMLforGisDataTypes()
-    {
-        $GLOBALS['cfg']['ActionLinksMode'] = 'icons';
-        $GLOBALS['cfg']['LinkLengthLimit'] = 2;
-        $this->assertContains(
-            '<a href="#" target="_blank"><span class="nowrap"><img src="themes/dot.'
-            . 'gif" title="Edit/Insert" alt="Edit/Insert" class="icon ic_b_edit" />'
-            . '</span></a>',
-            PMA_getHTMLforGisDataTypes()
-        );
-    }
-
-    /**
-     * Test for PMA_getContinueInsertionForm
-     *
-     * @return void
-     */
-    public function testGetContinueInsertionForm()
-    {
-        $where_clause_array = array("a<b");
-        $GLOBALS['cfg']['InsertRows'] = 1;
-        $GLOBALS['cfg']['ServerDefault'] = 1;
-        $GLOBALS['goto'] = "index.php";
-        $_REQUEST['where_clause'] = true;
-        $_REQUEST['sql_query'] = "SELECT 1";
-
-        $result = PMA_getContinueInsertionForm(
-            "tbl", "db", $where_clause_array, "localhost"
-        );
-
-        $this->assertContains(
-            '<form id="continueForm" method="post" action="tbl_replace.php" '
-            . 'name="continueForm">',
-            $result
-        );
-
-        $this->assertContains(
-            '<input type="hidden" name="db" value="db" />',
-            $result
-        );
-
-        $this->assertContains(
-            '<input type="hidden" name="table" value="tbl" />',
-            $result
-        );
-
-        $this->assertContains(
-            '<input type="hidden" name="goto" value="index.php" />',
-            $result
-        );
-
-        $this->assertContains(
-            '<input type="hidden" name="err_url" value="localhost" />',
-            $result
-        );
-
-        $this->assertContains(
-            '<input type="hidden" name="sql_query" value="SELECT 1" />',
-            $result
-        );
-
-        $this->assertContains(
-            '<input type="hidden" name="where_clause[0]" value="a&lt;b" />',
-            $result
-        );
-
-        $this->assertContains(
-            '<option value="1" selected="selected">',
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA_getActionsPanel
-     *
-     * @return void
-     */
-    public function testGetActionsPanel()
-    {
-        $GLOBALS['cfg']['ShowHint'] = false;
-        $result = PMA_getActionsPanel(null, 'back', 2, 1, false);
-
-        $this->assertContains(
-            '<select name="submit_type" class="control_at_footer" tabindex="4">',
-            $result
-        );
-
-        $this->assertContains(
-            '<select name="after_insert"',
-            $result
-        );
-
-        $this->assertContains(
-            '<input type="submit" class="control_at_footer" value="Go" '
-            . 'tabindex="9" id="buttonYes" ',
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA_getSubmitTypeDropDown
-     *
-     * @return void
-     */
-    public function testGetSubmitTypeDropDown()
-    {
-        $result = PMA_getSubmitTypeDropDown(array(), 2, 2);
-
-        $this->assertContains(
-            '<select name="submit_type" class="control_at_footer" tabindex="5">',
-            $result
-        );
-
-        $this->assertContains(
-            '<option value="save">',
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA_getAfterInsertDropDown
-     *
-     * @return void
-     */
-    public function testGetAfterInsertDropDown()
-    {
-        $result = PMA_getAfterInsertDropDown("`t`.`f` = 2", 'new_insert', true);
-
-        $this->assertContains(
-            '<option value="new_insert" selected="selected">',
-            $result
-        );
-
-        $this->assertContains(
-            '<option value="same_insert"',
-            $result
-        );
-
-        $this->assertContains(
-            '<option value="edit_next" >',
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA_getSubmitAndResetButtonForActionsPanel
-     *
-     * @return void
-     */
-    public function testGetSubmitAndResetButtonForActionsPanel()
-    {
-        $GLOBALS['cfg']['ShowHint'] = false;
-        $result = PMA_getSubmitAndResetButtonForActionsPanel(1, 0);
-
-        $this->assertContains(
-            '<input type="submit" class="control_at_footer" value="Go" '
-            . 'tabindex="7" id="buttonYes" />',
-            $result
-        );
-
-        $this->assertContains(
-            '<input type="button" class="preview_sql" value="Preview SQL" '
-            . 'tabindex="8" />',
-            $result
-        );
-
-        $this->assertContains(
-            '<input type="reset" class="control_at_footer" value="Reset" '
-            . 'tabindex="9" />',
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA_getHeadAndFootOfInsertRowTable
-     *
-     * @return void
-     */
-    public function testGetHeadAndFootOfInsertRowTable()
-    {
-        $GLOBALS['cfg']['ShowFieldTypesInDataEditView'] = true;
-        $GLOBALS['cfg']['ShowFunctionFields'] = true;
-        $GLOBALS['cfg']['ServerDefault'] = 1;
-        $url_params = array('ShowFunctionFields' => 2);
-
-        $result = PMA_getHeadAndFootOfInsertRowTable($url_params);
-
-        $this->assertContains(
-            'tbl_change.php?ShowFunctionFields=1&amp;ShowFieldTypesInDataEditView=0',
-            $result
-        );
-
-        $this->assertContains(
-            'tbl_change.php?ShowFunctionFields=0&amp;ShowFieldTypesInDataEditView=1',
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA_getSpecialCharsAndBackupFieldForExistingRow
-     *
-     * @return void
-     */
-    public function testGetSpecialCharsAndBackupFieldForExistingRow()
-    {
-        $column = $current_row = $extracted_columnspec = array();
-        $column['Field'] = 'f';
-        $current_row['f'] = null;
-        $_REQUEST['default_action'] = 'insert';
-        $column['Key'] = 'PRI';
-        $column['Extra'] = 'fooauto_increment';
-
-        $result = PMA_getSpecialCharsAndBackupFieldForExistingRow(
-            $current_row, $column, array(), false, array(), 'a', false
-        );
-
-        $this->assertEquals(
-            array(
-                true,
-                null,
-                null,
-                null,
-                '<input type="hidden" name="fields_preva" value="" />'
-            ),
-            $result
-        );
-
-        // Case 2 (bit)
-        unset($_REQUEST['default_action']);
-
-        $current_row['f'] = "123";
-        $extracted_columnspec['spec_in_brackets'] = 20;
-        $column['True_Type'] = 'bit';
-
-        $result = PMA_getSpecialCharsAndBackupFieldForExistingRow(
-            $current_row, $column, $extracted_columnspec, false, array(), 'a', false
-        );
-
-        $this->assertEquals(
-            array(
-                false,
-                "",
-                "00000000000001111011",
-                null,
-                '<input type="hidden" name="fields_preva" value="123" />'
-            ),
-            $result
-        );
-
-        $current_row['f'] = "abcd";
-        $result = PMA_getSpecialCharsAndBackupFieldForExistingRow(
-            $current_row, $column, $extracted_columnspec, false, array(), 'a', true
-        );
-
-        $this->assertEquals(
-            array(
-                false,
-                "",
-                "abcd",
-                null,
-                '<input type="hidden" name="fields_preva" value="abcd" />'
-            ),
-            $result
-        );
-
-        // Case 3 (bit)
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $current_row['f'] = "123";
-        $extracted_columnspec['spec_in_brackets'] = 20;
-        $column['True_Type'] = 'int';
-
-        $result = PMA_getSpecialCharsAndBackupFieldForExistingRow(
-            $current_row, $column, $extracted_columnspec,
-            false, array('int'), 'a', false
-        );
-
-        $this->assertEquals(
-            array(
-                false,
-                "",
-                "'',",
-                null,
-                '<input type="hidden" name="fields_preva" value="\'\'," />'
-            ),
-            $result
-        );
-
-        // Case 4 (else)
-        $column['is_binary'] = false;
-        $column['is_blob'] = true;
-        $GLOBALS['cfg']['ProtectBinary'] = false;
-        $current_row['f'] = "11001";
-        $extracted_columnspec['spec_in_brackets'] = 20;
-        $column['True_Type'] = 'char';
-        $GLOBALS['cfg']['ShowFunctionFields'] = true;
-
-        $result = PMA_getSpecialCharsAndBackupFieldForExistingRow(
-            $current_row, $column, $extracted_columnspec,
-            false, array('int'), 'a', false
-        );
-
-        $this->assertEquals(
-            array(
-                false,
-                "3131303031",
-                "3131303031",
-                "3131303031",
-                '<input type="hidden" name="fields_preva" value="3131303031" />'
-            ),
-            $result
-        );
-
-        // Case 5
-        $current_row['f'] = "11001\x00";
-
-        $result = PMA_getSpecialCharsAndBackupFieldForExistingRow(
-            $current_row, $column, $extracted_columnspec,
-            false, array('int'), 'a', false
-        );
-
-        $this->assertEquals(
-            array(
-                false,
-                "313130303100",
-                "313130303100",
-                "313130303100",
-                '<input type="hidden" name="fields_preva" value="313130303100" />'
-            ),
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA_getSpecialCharsAndBackupFieldForInsertingMode
-     *
-     * @return void
-     */
-    public function testGetSpecialCharsAndBackupFieldForInsertingMode()
-    {
-        $column = array();
-        $column['True_Type'] = 'bit';
-        $column['Default'] = b'101';
-        $column['is_binary'] = true;
-        $GLOBALS['cfg']['ProtectBinary'] = false;
-        $GLOBALS['cfg']['ShowFunctionFields'] = true;
-
-        $result = PMA_getSpecialCharsAndBackupFieldForInsertingMode($column, false);
-
-        $this->assertEquals(
-            array(
-                false,
-                '101',
-                '101',
-                '',
-                '101'
-            ),
-            $result
-        );
-
-        // case 2
-        unset($column['Default']);
-        $column['True_Type'] = 'char';
-
-        $result = PMA_getSpecialCharsAndBackupFieldForInsertingMode($column, false);
-
-        $this->assertEquals(
-            array(
-                true,
-                '',
-                '',
-                '',
-                ''
-            ),
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA_getParamsForUpdateOrInsert
-     *
-     * @return void
-     */
-    public function testGetParamsForUpdateOrInsert()
-    {
-        $_REQUEST['where_clause'] = 'LIMIT 1';
-        $_REQUEST['submit_type'] = 'showinsert';
-
-        $result = PMA_getParamsForUpdateOrInsert();
-
-        $this->assertEquals(
-            array(
-                array('LIMIT 1'),
-                true,
-                true,
-                false
-            ),
-            $result
-        );
-
-        // case 2 (else)
-        unset($_REQUEST['where_clause']);
-        $_REQUEST['fields']['multi_edit'] = array('a' => 'b', 'c' => 'd');
-        $result = PMA_getParamsForUpdateOrInsert();
-
-        $this->assertEquals(
-            array(
-                array('a', 'c'),
-                false,
-                true,
-                false
-            ),
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA_isInsertRow
-     *
-     * @return void
-     */
-    public function testIsInsertRow()
-    {
-        $_REQUEST['insert_rows'] = 5;
-        $GLOBALS['cfg']['InsertRows'] = 2;
-
-        $scriptsMock = $this->getMockBuilder('PMA\libraries\Scripts')
-            ->disableOriginalConstructor()
-            ->setMethods(array('addFile'))
-            ->getMock();
-
-        $scriptsMock->expects($this->once())
-            ->method('addFile');
-
-        $headerMock = $this->getMockBuilder('PMA\libraries\Header')
-            ->disableOriginalConstructor()
-            ->setMethods(array('getScripts'))
-            ->getMock();
-
-        $headerMock->expects($this->once())
-            ->method('getScripts')
-            ->will($this->returnValue($scriptsMock));
-
-        $responseMock = $this->getMockBuilder('PMA\libraries\Response')
-            ->disableOriginalConstructor()
-            ->setMethods(array('getHeader'))
-            ->getMock();
-
-        $responseMock->expects($this->once())
-            ->method('getHeader')
-            ->will($this->returnValue($headerMock));
-
-        $restoreInstance = PMA\libraries\Response::getInstance();
-        $response = new ReflectionProperty('PMA\libraries\Response', '_instance');
-        $response->setAccessible(true);
-        $response->setValue($responseMock);
-
-        PMA_isInsertRow();
-
-        $response->setValue($restoreInstance);
-
-        $this->assertEquals(5, $GLOBALS['cfg']['InsertRows']);
-    }
-
-    /**
-     * Test for PMA_setSessionForEditNext
-     *
-     * @return void
-     */
-    public function testSetSessionForEditNext()
-    {
-        $temp = new stdClass;
-        $temp->orgname = 'orgname';
-        $temp->table = 'table';
-        $temp->type = 'real';
-        $temp->primary_key = 1;
-        $meta_arr = array($temp);
-
-        $row = array('1' => 1);
-        $res = 'foobar';
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->at(0))
-            ->method('query')
-            ->with('SELECT * FROM `db`.`table` WHERE `a` > 2 LIMIT 1;')
-            ->will($this->returnValue($res));
-
-        $dbi->expects($this->at(1))
-            ->method('fetchRow')
-            ->with($res)
-            ->will($this->returnValue($row));
-
-        $dbi->expects($this->at(2))
-            ->method('getFieldsMeta')
-            ->with($res)
-            ->will($this->returnValue($meta_arr));
-
-        $GLOBALS['dbi'] = $dbi;
-        $GLOBALS['db'] = 'db';
-        $GLOBALS['table'] = 'table';
-        PMA_setSessionForEditNext('`a` = 2');
-
-        $this->assertEquals(
-            'CONCAT(`table`.`orgname`) IS NULL',
-            $_SESSION['edit_next']
-        );
-    }
-
-    /**
-     * Test for PMA_getGotoInclude
-     *
-     * @return void
-     */
-    public function testGetGotoInclude()
-    {
-        $GLOBALS['goto'] = '123.php';
-        $GLOBALS['table'] = '';
-
-        $this->assertEquals(
-            'db_sql.php',
-            PMA_getGotoInclude('index')
-        );
-
-        $GLOBALS['table'] = 'tbl';
-        $this->assertEquals(
-            'tbl_sql.php',
-            PMA_getGotoInclude('index')
-        );
-
-        $GLOBALS['goto'] = 'db_sql.php';
-
-        $this->assertEquals(
-            'db_sql.php',
-            PMA_getGotoInclude('index')
-        );
-
-        $this->assertEquals(
-            '',
-            $GLOBALS['table']
-        );
-
-        $_REQUEST['after_insert'] = 'new_insert';
-        $this->assertEquals(
-            'tbl_change.php',
-            PMA_getGotoInclude('index')
-        );
-    }
-
-    /**
-     * Test for PMA_getErrorUrl
-     *
-     * @return void
-     */
-    public function testGetErrorUrl()
-    {
-        $GLOBALS['cfg']['ServerDefault'] = 1;
-        $this->assertEquals(
-            'tbl_change.php?lang=en&amp;token=token',
-            PMA_getErrorUrl(array())
-        );
-
-        $_REQUEST['err_url'] = 'localhost';
-        $this->assertEquals(
-            'localhost',
-            PMA_getErrorUrl(array())
-        );
-    }
-
-    /**
-     * Test for PMA_buildSqlQuery
-     *
-     * @return void
-     */
-    public function testBuildSqlQuery()
-    {
-        $GLOBALS['db'] = 'db';
-        $GLOBALS['table'] = 'table';
-        $query_fields = array('a', 'b');
-        $value_sets = array(1, 2);
-
-        $this->assertEquals(
-            array('INSERT IGNORE INTO `table` (a, b) VALUES (1), (2)'),
-            PMA_buildSqlQuery(true, $query_fields, $value_sets)
-        );
-
-        $this->assertEquals(
-            array('INSERT INTO `table` (a, b) VALUES (1), (2)'),
-            PMA_buildSqlQuery(false, $query_fields, $value_sets)
-        );
-    }
-
-    /**
-     * Test for PMA_executeSqlQuery
-     *
-     * @return void
-     */
-    public function testExecuteSqlQuery()
-    {
-        $query = array('SELECT 1', 'SELECT 2');
-        $GLOBALS['sql_query'] = 'SELECT';
-        $GLOBALS['cfg']['IgnoreMultiSubmitErrors'] = false;
-        $_REQUEST['submit_type'] = '';
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->at(0))
-            ->method('query')
-            ->with('SELECT 1')
-            ->will($this->returnValue(true));
-
-        $dbi->expects($this->at(1))
-            ->method('affectedRows')
-            ->will($this->returnValue(2));
-
-        $dbi->expects($this->at(2))
-            ->method('insertId')
-            ->will($this->returnValue(1));
-
-        $dbi->expects($this->at(5))
-            ->method('query')
-            ->with('SELECT 2')
-            ->will($this->returnValue(false));
-
-        $dbi->expects($this->once())
-            ->method('getError')
-            ->will($this->returnValue('err'));
-
-        $dbi->expects($this->exactly(2))
-            ->method('getWarnings')
-            ->will($this->returnValue(array()));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $result = PMA_executeSqlQuery(array(), $query);
-
-        $this->assertEquals(
-            array('sql_query' => 'SELECT'),
-            $result[0]
-        );
-
-        $this->assertEquals(
-            2,
-            $result[1]
-        );
-
-        $this->assertInstanceOf(
-            'PMA\libraries\Message',
-            $result[2][0]
-        );
-
-        $msg = $result[2][0];
-        $reflectionMsg = new ReflectionProperty('PMA\libraries\Message', 'params');
-        $reflectionMsg->setAccessible(true);
-
-        $this->assertEquals(
-            array(2),
-            $reflectionMsg->getValue($msg)
-        );
-
-        $this->assertEquals(
-            array(),
-            $result[3]
-        );
-
-        $this->assertEquals(
-            array('err'),
-            $result[4]
-        );
-
-        $this->assertEquals(
-            'SELECT',
-            $result[5]
-        );
-    }
-
-    /**
-     * Test for PMA_executeSqlQuery
-     *
-     * @return void
-     */
-    public function testExecuteSqlQueryWithTryQuery()
-    {
-        $query = array('SELECT 1', 'SELECT 2');
-        $GLOBALS['sql_query'] = 'SELECT';
-        $GLOBALS['cfg']['IgnoreMultiSubmitErrors'] = true;
-        $_REQUEST['submit_type'] = '';
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->at(0))
-            ->method('tryQuery')
-            ->with('SELECT 1')
-            ->will($this->returnValue(true));
-
-        $dbi->expects($this->at(1))
-            ->method('affectedRows')
-            ->will($this->returnValue(2));
-
-        $dbi->expects($this->at(2))
-            ->method('insertId')
-            ->will($this->returnValue(1));
-
-        $dbi->expects($this->at(5))
-            ->method('tryQuery')
-            ->with('SELECT 2')
-            ->will($this->returnValue(false));
-
-        $dbi->expects($this->once())
-            ->method('getError')
-            ->will($this->returnValue('err'));
-
-        $dbi->expects($this->exactly(2))
-            ->method('getWarnings')
-            ->will($this->returnValue(array()));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $result = PMA_executeSqlQuery(array(), $query);
-
-        $this->assertEquals(
-            array('sql_query' => 'SELECT'),
-            $result[0]
-        );
-
-        $this->assertEquals(
-            2,
-            $result[1]
-        );
-
-        $this->assertInstanceOf(
-            'PMA\libraries\Message',
-            $result[2][0]
-        );
-
-        $msg = $result[2][0];
-        $reflectionMsg = new ReflectionProperty('PMA\libraries\Message', 'params');
-        $reflectionMsg->setAccessible(true);
-
-        $this->assertEquals(
-            array(2),
-            $reflectionMsg->getValue($msg)
-        );
-
-        $this->assertEquals(
-            array(),
-            $result[3]
-        );
-
-        $this->assertEquals(
-            array('err'),
-            $result[4]
-        );
-
-        $this->assertEquals(
-            'SELECT',
-            $result[5]
-        );
-    }
-
-    /**
-     * Test for PMA_getWarningMessages
-     *
-     * @return void
-     */
-    public function testGetWarningMessages()
-    {
-        $warnings = array(
-            array('Level' => 1, 'Code' => 42, 'Message' => 'msg1'),
-            array('Level' => 2, 'Code' => 43, 'Message' => 'msg2'),
-        );
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->once())
-            ->method('getWarnings')
-            ->will($this->returnValue($warnings));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $result = PMA_getWarningMessages();
-
-        $this->assertEquals(
-            array(
-                "1: #42 msg1",
-                "2: #43 msg2"
-            ),
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA_getDisplayValueForForeignTableColumn
-     *
-     * @return void
-     */
-    public function testGetDisplayValueForForeignTableColumn()
-    {
-        $map = array();
-        $map['f']['foreign_db'] = 'information_schema';
-        $map['f']['foreign_table'] = 'TABLES';
-        $map['f']['foreign_field'] = 'f';
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->once())
-            ->method('tryQuery')
-            ->with(
-                'SELECT `TABLE_COMMENT` FROM `information_schema`.`TABLES` WHERE '
-                . '`f`=1',
-                null,
-                PMA\libraries\DatabaseInterface::QUERY_STORE
-            )
-            ->will($this->returnValue('r1'));
-
-        $dbi->expects($this->once())
-            ->method('numRows')
-            ->with('r1')
-            ->will($this->returnValue('2'));
-
-        $dbi->expects($this->once())
-            ->method('fetchRow')
-            ->with('r1', 0)
-            ->will($this->returnValue(array('2')));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $result = PMA_getDisplayValueForForeignTableColumn("=1", $map, 'f');
-
-        $this->assertEquals(2, $result);
-    }
-
-    /**
-     * Test for PMA_getLinkForRelationalDisplayField
-     *
-     * @return void
-     */
-    public function testGetLinkForRelationalDisplayField()
-    {
-        $GLOBALS['cfg']['ServerDefault'] = 1;
-        $_SESSION['tmpval']['relational_display'] = 'K';
-        $map = array();
-        $map['f']['foreign_db'] = 'information_schema';
-        $map['f']['foreign_table'] = 'TABLES';
-        $map['f']['foreign_field'] = 'f';
-
-        $result = PMA_getLinkForRelationalDisplayField($map, 'f', "=1", "a>", "b<");
-
-        $this->assertEquals(
-            '<a href="sql.php?db=information_schema&amp;table=TABLES&amp;pos=0&amp;'
-            . 'sql_query=SELECT+%2A+FROM+%60information_schema%60.%60TABLES%60+WHERE'
-            . '+%60f%60%3D1&amp;lang=en&amp;token=token" title="a&gt;">b&lt;</a>',
-            $result
-        );
-
-        $_SESSION['tmpval']['relational_display'] = 'D';
-        $result = PMA_getLinkForRelationalDisplayField($map, 'f', "=1", "a>", "b<");
-
-        $this->assertEquals(
-            '<a href="sql.php?db=information_schema&amp;table=TABLES&amp;pos=0&amp;'
-            . 'sql_query=SELECT+%2A+FROM+%60information_schema%60.%60TABLES%60+WHERE'
-            . '+%60f%60%3D1&amp;lang=en&amp;token=token" title="b&lt;">a&gt;</a>',
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA_transformEditedValues
-     *
-     * @return void
-     */
-    public function testTransformEditedValues()
-    {
-        $edited_values = array(
-            array('c' => 'cname')
-        );
-        $GLOBALS['cfg']['ServerDefault'] = 1;
-        $_REQUEST['where_clause'] = 1;
-        $transformation = array(
-            'transformation_options' => "'','option ,, quoted',abd"
-        );
-        $result = PMA_transformEditedValues(
-            'db', 'table', $transformation, $edited_values,
-            'Text_Plain_PreApPend.php', 'c', array('a' => 'b'),
-            'transformation'
-        );
-
-        $this->assertEquals(
-            array('a' => 'b', 'transformations' => array("cnameoption ,, quoted")),
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA_getQueryValuesForInsertAndUpdateInMultipleEdit
-     *
-     * @return void
-     */
-    public function testGetQueryValuesForInsertAndUpdateInMultipleEdit()
-    {
-        $multi_edit_columns_name = array('0' => 'fld');
-
-        $result = PMA_getQueryValuesForInsertAndUpdateInMultipleEdit(
-            $multi_edit_columns_name, array(), '', array(), array(), true, array(1),
-            array(2), 'foo', array(), '0', array()
-        );
-
-        $this->assertEquals(
-            array(
-                array(1, 'foo'),
-                array(2, '`fld`')
-            ),
-            $result
-        );
-
-        $result = PMA_getQueryValuesForInsertAndUpdateInMultipleEdit(
-            $multi_edit_columns_name, array(), '', array(), array(), false, array(1),
-            array(2), 'foo', array(), '0', array('a')
-        );
-
-        $this->assertEquals(
-            array(
-                array(1, '`fld` = foo'),
-                array(2)
-            ),
-            $result
-        );
-
-        $result = PMA_getQueryValuesForInsertAndUpdateInMultipleEdit(
-            $multi_edit_columns_name, array('b'), "'`c`'", array('c'), array(),
-            false, array(1), array(2), 'foo', array(), '0', array('a')
-        );
-
-        $this->assertEquals(
-            array(
-                array(1),
-                array(2)
-            ),
-            $result
-        );
-
-        $result = PMA_getQueryValuesForInsertAndUpdateInMultipleEdit(
-            $multi_edit_columns_name, array('b'), "'`c`'", array('c'), array(3),
-            false, array(1), array(2), 'foo', array(), 0, array()
-        );
-
-        $this->assertEquals(
-            array(
-                array(1, '`fld` = foo'),
-                array(2)
-            ),
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA_getCurrentValueAsAnArrayForMultipleEdit
-     *
-     * @return void
-     */
-    public function testGetCurrentValueAsAnArrayForMultipleEdit()
-    {
-        $result = PMA_getCurrentValueAsAnArrayForMultipleEdit(
-            array(), array(), array(), 'currVal', array(),
-            array(), array(), '0'
-        );
-
-        $this->assertEquals('currVal', $result);
-
-        // case 2
-        $multi_edit_funcs = array('UUID');
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->once())
-            ->method('fetchValue')
-            ->with('SELECT UUID()')
-            ->will($this->returnValue('uuid1234'));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $result = PMA_getCurrentValueAsAnArrayForMultipleEdit(
-            $multi_edit_funcs, array(), array(), 'currVal', array(),
-            array(), array(), '0'
-        );
-
-        $this->assertEquals("'uuid1234'", $result);
-
-        // case 3
-        $multi_edit_funcs = array('AES_ENCRYPT');
-        $multi_edit_salt = array("");
-        $result = PMA_getCurrentValueAsAnArrayForMultipleEdit(
-            $multi_edit_funcs, $multi_edit_salt, array(), "'''", array(),
-            array('func'), array('func'), '0'
-        );
-        $this->assertEquals("AES_ENCRYPT(''','')", $result);
-
-        // case 4
-        $multi_edit_funcs = array('func');
-        $multi_edit_salt = array();
-        $result = PMA_getCurrentValueAsAnArrayForMultipleEdit(
-            $multi_edit_funcs, $multi_edit_salt, array(), "'''", array(),
-            array('func'), array('func'), '0'
-        );
-        $this->assertEquals("func(''')", $result);
-
-        // case 5
-        $result = PMA_getCurrentValueAsAnArrayForMultipleEdit(
-            $multi_edit_funcs, $multi_edit_salt, array(), "''", array(),
-            array('func'), array('func'), '0'
-        );
-        $this->assertEquals("func()", $result);
-    }
-
-    /**
-     * Test for PMA_getCurrentValueForDifferentTypes
-     *
-     * @return void
-     */
-    public function testGetCurrentValueForDifferentTypes()
-    {
-        $prow = array();
-        $prow['a'] = b'101';
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->at(4))
-            ->method('fetchSingleRow')
-            ->with('SELECT * FROM `table` WHERE 1;')
-            ->will($this->returnValue($prow));
-        $dbi->expects($this->exactly(2))
-            ->method('escapeString')
-            ->willReturnOnConsecutiveCalls(
-                $this->returnArgument(0),
-                "20\'12"
-            );
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $result = PMA_getCurrentValueForDifferentTypes(
-            '123', '0', array(), '', array(), 0, array(), array(),
-            array(), true, true, '1', 'table', array()
-        );
-
-        $this->assertEquals(
-            '123',
-            $result
-        );
-
-        // case 2
-        $result = PMA_getCurrentValueForDifferentTypes(
-            false, '0', array('test'), '', array(1), 0, array(), array(),
-            array(), true, true, '1', 'table', array()
-        );
-
-        $this->assertEquals(
-            'NULL',
-            $result
-        );
-
-        // case 3
-        $result = PMA_getCurrentValueForDifferentTypes(
-            false, '0', array('test'), '', array(), 0, array(), array(),
-            array(), true, true, '1', 'table', array()
-        );
-
-        $this->assertEquals(
-            "''",
-            $result
-        );
-
-        // case 4
-        $_REQUEST['fields']['multi_edit'][0][0] = array();
-        $result = PMA_getCurrentValueForDifferentTypes(
-            false, '0', array('set'), '', array(), 0, array(), array(),
-            array(), true, true, '1', 'table', array()
-        );
-
-        $this->assertEquals(
-            "''",
-            $result
-        );
-
-        // case 5
-        $result = PMA_getCurrentValueForDifferentTypes(
-            false, '0', array('protected'), '', array(), 0, array('a'), array(),
-            array(), true, true, '1', 'table', array()
-        );
-
-        $this->assertEquals(
-            "0x313031",
-            $result
-        );
-
-        // case 6
-        $result = PMA_getCurrentValueForDifferentTypes(
-            false, '0', array('protected'), '', array(), 0, array('a'), array(),
-            array(), true, true, '1', 'table', array()
-        );
-
-        $this->assertEquals(
-            "",
-            $result
-        );
-
-        // case 7
-        $result = PMA_getCurrentValueForDifferentTypes(
-            false, '0', array('bit'), '20\'12', array(), 0, array('a'), array(),
-            array(), true, true, '1', 'table', array()
-        );
-
-        $this->assertEquals(
-            "b'00010'",
-            $result
-        );
-
-        // case 7
-        $result = PMA_getCurrentValueForDifferentTypes(
-            false, '0', array('date'), '20\'12', array(), 0, array('a'), array(),
-            array(), true, true, '1', 'table', array()
-        );
-
-        $this->assertEquals(
-            "'20\\'12'",
-            $result
-        );
-
-        // case 8
-        $_REQUEST['fields']['multi_edit'][0][0] = array();
-        $result = PMA_getCurrentValueForDifferentTypes(
-            false, '0', array('set'), '', array(), 0, array(), array(1),
-            array(), true, true, '1', 'table', array()
-        );
-
-        $this->assertEquals(
-            "NULL",
-            $result
-        );
-
-        // case 9
-        $result = PMA_getCurrentValueForDifferentTypes(
-            false, '0', array('protected'), '', array(), 0, array('a'), array(),
-            array(1), true, true, '1', 'table', array()
-        );
-
-        $this->assertEquals(
-            "''",
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA_verifyWhetherValueCanBeTruncatedAndAppendExtraData
-     *
-     * @return void
-     */
-    public function testVerifyWhetherValueCanBeTruncatedAndAppendExtraData()
-    {
-        $extra_data = array('isNeedToRecheck' => true);
-        $meta = new stdClass();
-        $_REQUEST['where_clause'][0] = 1;
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->at(0))
-            ->method('tryQuery')
-            ->with('SELECT `table`.`a` FROM `db`.`table` WHERE 1');
-
-        $meta->type = 'int';
-        $dbi->expects($this->at(1))
-            ->method('getFieldsMeta')
-            ->will($this->returnValue(array($meta)));
-
-        $dbi->expects($this->at(2))
-            ->method('fetchRow')
-            ->will($this->returnValue(false));
-
-        $dbi->expects($this->at(3))
-            ->method('freeResult');
-
-        $dbi->expects($this->at(4))
-            ->method('tryQuery')
-            ->with('SELECT `table`.`a` FROM `db`.`table` WHERE 1');
-
-        $meta->type = 'int';
-        $dbi->expects($this->at(5))
-            ->method('getFieldsMeta')
-            ->will($this->returnValue(array($meta)));
-
-        $dbi->expects($this->at(6))
-            ->method('fetchRow')
-            ->will($this->returnValue(array(0 => '123')));
-
-        $dbi->expects($this->at(7))
-            ->method('freeResult');
-
-        $dbi->expects($this->at(8))
-            ->method('tryQuery')
-            ->with('SELECT `table`.`a` FROM `db`.`table` WHERE 1');
-
-        $meta->type = 'timestamp';
-        $dbi->expects($this->at(9))
-            ->method('getFieldsMeta')
-            ->will($this->returnValue(array($meta)));
-
-        $dbi->expects($this->at(10))
-            ->method('fetchRow')
-            ->will($this->returnValue(array(0 => '2013-08-28 06:34:14')));
-
-        $dbi->expects($this->at(11))
-            ->method('freeResult');
-
-        $GLOBALS['dbi'] = $dbi;
-
-        PMA_verifyWhetherValueCanBeTruncatedAndAppendExtraData(
-            'db', 'table', 'a', $extra_data
-        );
-
-        $this->assertFalse($extra_data['isNeedToRecheck']);
-
-        PMA_verifyWhetherValueCanBeTruncatedAndAppendExtraData(
-            'db', 'table', 'a', $extra_data
-        );
-
-        $this->assertEquals('123', $extra_data['truncatableFieldValue']);
-        $this->assertTrue($extra_data['isNeedToRecheck']);
-
-        PMA_verifyWhetherValueCanBeTruncatedAndAppendExtraData(
-            'db', 'table', 'a', $extra_data
-        );
-
-        $this->assertEquals(
-            '2013-08-28 06:34:14.000000', $extra_data['truncatableFieldValue']
-        );
-        $this->assertTrue($extra_data['isNeedToRecheck']);
-    }
-
-    /**
-     * Test for PMA_getTableColumns
-     *
-     * @return void
-     */
-    public function testGetTableColumns()
-    {
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->at(0))
-            ->method('selectDb')
-            ->with('db');
-
-        $dbi->expects($this->at(1))
-            ->method('getColumns')
-            ->with('db', 'table')
-            ->will($this->returnValue(array('a' => 'b', 'c' => 'd')));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $result = PMA_getTableColumns('db', 'table');
-
-        $this->assertEquals(
-            array('b', 'd'),
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA_determineInsertOrEdit
-     *
-     * @return void
-     */
-    public function testDetermineInsertOrEdit()
-    {
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $GLOBALS['dbi'] = $dbi;
-        $_REQUEST['where_clause'] = '1';
-        $_SESSION['edit_next'] = '1';
-        $_REQUEST['ShowFunctionFields'] = true;
-        $_REQUEST['ShowFieldTypesInDataEditView'] = true;
-        $_REQUEST['after_insert'] = 'edit_next';
-        $GLOBALS['cfg']['InsertRows'] = 2;
-        $GLOBALS['cfg']['ShowSQL'] = false;
-        $_REQUEST['default_action'] = 'insert';
-
-        $responseMock = $this->getMockBuilder('PMA\libraries\Response')
-            ->disableOriginalConstructor()
-            ->setMethods(array('addHtml'))
-            ->getMock();
-
-        $restoreInstance = PMA\libraries\Response::getInstance();
-        $response = new ReflectionProperty('PMA\libraries\Response', '_instance');
-        $response->setAccessible(true);
-        $response->setValue($responseMock);
-
-        $result = PMA_determineInsertOrEdit('1', 'db', 'table');
-
-        $this->assertEquals(
-            array(
-                false,
-                null,
-                array(1),
-                null,
-                array(null),
-                array(null),
-                false,
-                "edit_next"
-            ),
-            $result
-        );
-
-        // case 2
-        unset($_REQUEST['where_clause']);
-        unset($_SESSION['edit_next']);
-        $_REQUEST['default_action'] = '';
-
-        $result = PMA_determineInsertOrEdit(null, 'db', 'table');
-
-        $response->setValue($restoreInstance);
-
-        $this->assertEquals(
-            array(
-                true,
-                null,
-                array(),
-                null,
-                null,
-                array(false, false),
-                false,
-                "edit_next"
-            ),
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA_getCommentsMap
-     *
-     * @return void
-     */
-    public function testGetCommentsMap()
-    {
-        $GLOBALS['cfg']['ShowPropertyComments'] = false;
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->once())
-            ->method('getColumns')
-            ->with('db', 'table', null, true)
-            ->will(
-                $this->returnValue(
-                    array(array('Comment' => 'b', 'Field' => 'd'))
-                )
-            );
-
-        $dbi->expects($this->any())
-            ->method('getTable')
-            ->will(
-                $this->returnValue(
-                    new Table('table', 'db')
-                )
-            );
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $this->assertEquals(
-            array(),
-            PMA_getCommentsMap('db', 'table')
-        );
-
-        $GLOBALS['cfg']['ShowPropertyComments'] = true;
-
-        $this->assertEquals(
-            array('d' => 'b'),
-            PMA_getCommentsMap('db', 'table')
-        );
-    }
-
-    /**
-     * Test for PMA_getUrlParameters
-     *
-     * @return void
-     */
-    public function testGetUrlParameters()
-    {
-        $_REQUEST['sql_query'] = 'SELECT';
-        $GLOBALS['goto'] = 'tbl_change.php';
-
-        $this->assertEquals(
-            array(
-                'db' => 'foo',
-                'sql_query' => 'SELECT',
-                'table' => 'bar'
-            ),
-            PMA_getUrlParameters('foo', 'bar')
-        );
-    }
-
-    /**
-     * Test for PMA_getHtmlForIgnoreOption
-     *
-     * @return void
-     */
-    public function testGetHtmlForIgnoreOption()
-    {
-        $expected = '<input type="checkbox" %sname="insert_ignore_1"'
-            . ' id="insert_ignore_1" /><label for="insert_ignore_1">'
-            . 'Ignore</label><br />' . "\n";
-        $checked = 'checked="checked" ';
-        $this->assertEquals(
-            sprintf($expected, $checked),
-            PMA_getHtmlForIgnoreOption(1)
-        );
-
-        $this->assertEquals(
-            sprintf($expected, ''),
-            PMA_getHtmlForIgnoreOption(1, false)
-        );
-    }
-
-    /**
-     * Test for PMA_getHtmlForInsertEditFormColumn
-     *
-     * @return void
-     */
-    public function testGetHtmlForInsertEditFormColumn()
-    {
-        $o_rows = 0;
-        $tabindex = 0;
-        $GLOBALS['plugin_scripts'] = array();
-        $table_columns = array(
-            array(
-                'Field' => 'col',
-                'Type' => 'varchar(20)',
-                'Null' => 'Yes',
-                'Privileges' => 'insert,update,select'
-            )
-        );
-        $repopulate = array(
-            md5('col') => 'val'
-        );
-        $column_mime = array(
-            'input_transformation' => 'input/Image_JPEG_Upload.php',
-            'input_transformation_options' => '150'
-        );
-
-        // Test w/ input transformation
-        $actual = PMA_getHtmlForInsertEditFormColumn(
-            $table_columns, 0, array(), false, array(), '', '',
-            '', false, array(), false, $o_rows, $tabindex, 0, false, 0,
-            array(), 0, 0, 'table', 'db', 0, array(), 0, '', '',
-            $repopulate, $column_mime, ''
-        );
-
-        $this->assertContains(
-            'col',
-            $actual
-        );
-        $this->assertContains(
-            '<option>AES_ENCRYPT</option>',
-            $actual
-        );
-        $this->assertContains(
-            '<span class="column_type" dir="ltr">varchar(20)</span>',
-            $actual
-        );
-        $this->assertContains(
-            '<tr class="noclick even">',
-            $actual
-        );
-        $this->assertContains(
-            '<span class="default_value hide">',
-            $actual
-        );
-        $this->assertContains(
-            '<img src="" width="150" height="100" '
-            . 'alt="Image preview here"/>',
-            $actual
-        );
-        $this->assertContains(
-            '<input type="file" '
-            . 'name="fields_upload[d89e2ddb530bb8953b290ab0793aecb0]" '
-            . 'accept="image/*" '
-            . 'class="image-upload"'
-            . '/>',
-            $actual
-        );
-
-        // Test w/o input_transformation
-        $table_columns = array(
-            array(
-                'Field' => 'qwerty',
-                'Type' => 'datetime',
-                'Null' => 'Yes',
-                'Key' => '',
-                'Extra' => '',
-                'Default' => null,
-                'Privileges' => 'insert,update,select'
-            )
-        );
-        $repopulate = array(
-            md5('qwerty') => '12-10-14'
-        );
-        $actual = PMA_getHtmlForInsertEditFormColumn(
-            $table_columns, 0, array(), false, array(), '', '',
-            '', true, array(), false, $o_rows, $tabindex, 0, false, 0,
-            array(), 0, 0, 'table', 'db', 0, array(), 0, '', '',
-            $repopulate, array(), ''
-        );
-        $this->assertContains(
-            'qwerty',
-            $actual
-        );
-        $this->assertContains(
-            '<option>UUID</option>',
-            $actual
-        );
-        $this->assertContains(
-            '<span class="column_type" dir="ltr">datetime</span>',
-            $actual
-        );
-        $this->assertContains(
-            '<input type="text" '
-            . 'name="fields[d8578edf8458ce06fbc5bb76a58c5ca4]" '
-            . 'value="12-10-14.000000"',
-            $actual
-        );
-    }
-
-    /**
-     * Test for PMA_getHtmlForInsertEditRow
-     *
-     * @return void
-     */
-    public function testGetHtmlForInsertEditRow()
-    {
-        $o_rows = 0;
-        $tabindex = 0;
-        $GLOBALS['plugin_scripts'] = array();
-        $GLOBALS['cfg']['LongtextDoubleTextarea'] = true;
-        $GLOBALS['cfg']['CharEditing'] = true;
-        $table_columns = array(
-            array(
-                'Field' => 'test',
-                'Type' => 'longtext',
-                'Null' => 'Yes',
-                'pma_type' => 'longtext',
-                'True_Type' => 'longtext',
-                'Privileges' => 'select,insert,update,references',
-            )
-        );
-        $actual = PMA_getHtmlForInsertEditRow(
-            array(), $table_columns, array(), false, array(), '', '',
-            '', false, array(), $o_rows, $tabindex, 1, false, 0,
-            array(), 0, 0, 'table', 'db', 0, array(), 0, '',
-            array(), array('wc')
-        );
-        $this->assertContains(
-            'test',
-            $actual
-        );
-        $this->assertContains(
-            '<th>Column</th>',
-            $actual
-        );
-        $this->assertContains(
-            '<a',
-            $actual
-        );
-        $this->assertContains(
-            '<th>Value</th>',
-            $actual
-        );
-        $this->assertContains(
-            '<span class="column_type" dir="ltr">longtext</span>',
-            $actual
-        );
-        $this->assertContains(
-            '<textarea name="fields[098f6bcd4621d373cade4e832627b4f6]"',
-            $actual
-        );
-    }
-
-    /**
-     * Test for PMA_getHtmlForInsertEditRow based on the column privilges
-     *
-     * @return void
-     */
-    public function testGetHtmlForInsertEditRowBasedOnColumnPrivileges()
-    {
-        $o_rows = 0;
-        $tabindex = 0;
-        $GLOBALS['plugin_scripts'] = array();
-        $GLOBALS['cfg']['LongtextDoubleTextarea'] = true;
-        $GLOBALS['cfg']['CharEditing'] = true;
-
-        // edit
-        $table_columns = array(
-            array(
-                'Field' => 'foo',
-                'Type' => 'longtext',
-                'Null' => 'Yes',
-                'pma_type' => 'longtext',
-                'True_Type' => 'longtext',
-                'Privileges' => 'select,insert,update,references',
-            ),
-            array(
-                'Field' => 'bar',
-                'Type' => 'longtext',
-                'Null' => 'Yes',
-                'pma_type' => 'longtext',
-                'True_Type' => 'longtext',
-                'Privileges' => 'select,insert,references',
-            )
-        );
-        $actual = PMA_getHtmlForInsertEditRow(
-            array(), $table_columns, array(), false, array(), '', '',
-            '', false, array(), $o_rows, $tabindex, 1, false, 0,
-            array(), 0, 0, 'table', 'db', 0, array(), 0, '',
-            array(), array('wc')
-        );
-        $this->assertContains(
-            'foo',
-            $actual
-        );
-        $this->assertNotContains(
-            'bar',
-            $actual
-        );
-
-        // insert
-        $table_columns = array(
-            array(
-                'Field' => 'foo',
-                'Type' => 'longtext',
-                'Null' => 'Yes',
-                'Key' => '',
-                'pma_type' => 'longtext',
-                'True_Type' => 'longtext',
-                'Privileges' => 'select,insert,update,references',
-            ),
-            array(
-                'Field' => 'bar',
-                'Type' => 'longtext',
-                'Null' => 'Yes',
-                'Key' => '',
-                'pma_type' => 'longtext',
-                'True_Type' => 'longtext',
-                'Privileges' => 'select,update,references',
-            )
-        );
-        $actual = PMA_getHtmlForInsertEditRow(
-            array(), $table_columns, array(), false, array(), '', '',
-            '', true, array(), $o_rows, $tabindex, 2, false, 0,
-            array(), 0, 0, 'table', 'db', 0, array(), 0, '',
-            array(), array('wc')
-        );
-        $this->assertContains(
-            'foo',
-            $actual
-        );
-        $this->assertContains(
-            '<textarea name="fields[37b51d194a7513e45b56f6524f2d51f2]" '
-            .'class="" readonly="readonly"',
-            $actual
-        );
-    }
-}
diff --git a/#pma/test/libraries/PMA_ip_allow_deny_test.php b/#pma/test/libraries/PMA_ip_allow_deny_test.php
deleted file mode 100644
index f2d0a7c0..00000000
--- a/#pma/test/libraries/PMA_ip_allow_deny_test.php
+++ /dev/null
@@ -1,243 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for ip_allow_deny.lib.php
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-
-require_once 'libraries/database_interface.inc.php';
-
-require_once 'libraries/ip_allow_deny.lib.php';
-
-/**
- * PMA_Ip_Allow_Deny_Test class
- *
- * this class is for testing ip_allow_deny.lib.php
- *
- * @package PhpMyAdmin-test
- */
-class PMA_Ip_Allow_Deny_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Prepares environment for the test.
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        $GLOBALS['cfg']['Server']['user'] = "pma_username";
-        $GLOBALS['cfg']['Server']['AllowDeny']['rules'][]
-            = "allow % 255.255.255.0/4";
-        $GLOBALS['cfg']['Server']['AllowDeny']['rules'][]
-            = "allow % from 255.255.2.0/4";
-        $GLOBALS['cfg']['Server']['AllowDeny']['rules'][]
-            = "allow % from 2001:4998:c:a0d:0000:0000:4998:1020";
-        $GLOBALS['cfg']['Server']['AllowDeny']['rules'][]
-            = "allow % from 2001:4998:c:a0d:0000:0000:4998:[1001-2010]";
-        $GLOBALS['cfg']['Server']['AllowDeny']['rules'][]
-            = "allow % from 2001:4998:c:a0d:0000:0000:4998:3020/24";
-        $GLOBALS['cfg']['Server']['AllowDeny']['rules'][] = "deny % 255.255.0.0/8";
-        $GLOBALS['cfg']['Server']['AllowDeny']['rules'][]
-            = "deny % from 255.255.0.0/8";
-        include_once 'libraries/ip_allow_deny.lib.php';
-    }
-
-    /**
-     * Test for PMA_getIp
-     *
-     * @return void
-     *
-     * @dataProvider proxyIPs
-     */
-    public function testGetIp($remote, $header, $expected, $proxyip = null)
-    {
-        unset($_SERVER['REMOTE_ADDR']);
-        unset($_SERVER['TEST_FORWARDED_HEADER']);
-        $GLOBALS['cfg']['TrustedProxies'] = array();
-
-        if (!is_null($remote)) {
-            $_SERVER['REMOTE_ADDR'] = $remote;
-        }
-
-        if (!is_null($header)) {
-            if (is_null($proxyip)) {
-                $proxyip = $remote;
-            }
-            $GLOBALS['cfg']['TrustedProxies'][$proxyip] = 'TEST_FORWARDED_HEADER';
-            $_SERVER['TEST_FORWARDED_HEADER'] = $header;
-        }
-
-        $this->assertEquals(
-            $expected,
-            PMA_getIp()
-        );
-
-        unset($_SERVER['REMOTE_ADDR']);
-        unset($_SERVER['TEST_FORWARDED_HEADER']);
-        $GLOBALS['cfg']['TrustedProxies'] = array();
-    }
-
-    /**
-     * Data provider for PMA_getIp tests
-     *
-     * @return array
-     */
-    public function proxyIPs()
-    {
-        return array(
-            // Nothing set
-            array(null, null, false),
-            // Remote IP set
-            array('101.0.0.25', null, '101.0.0.25'),
-            // Proxy
-            array('101.0.0.25', '192.168.10.10', '192.168.10.10'),
-            // Several proxies
-            array('101.0.0.25', '192.168.10.1, 192.168.100.100', '192.168.10.1'),
-            // Invalid proxy
-            array('101.0.0.25', 'invalid', false),
-            // Direct IP with proxy enabled
-            array('101.0.0.25', '192.168.10.10', '101.0.0.25', '10.10.10.10'),
-        );
-    }
-
-    /**
-     * Test for PMA_ipMaskTest
-     *
-     * @return void
-     */
-    public function testIpMaskTest()
-    {
-        //IPV4 testing
-        $testRange = "255.255.0.0/8";
-        $ipToTest = "10.0.0.0";
-        $this->assertEquals(
-            false,
-            PMA_ipMaskTest($testRange, $ipToTest)
-        );
-
-        $testRange = "255.255.0.0/4";
-        $ipToTest = "255.3.0.0";
-        $this->assertEquals(
-            true,
-            PMA_ipMaskTest($testRange, $ipToTest)
-        );
-
-        $testRange = "255.255.0.[0-10]";
-        $ipToTest = "255.3.0.3";
-        $this->assertEquals(
-            false,
-            PMA_ipMaskTest($testRange, $ipToTest)
-        );
-        $ipToTest = "255.3.0.12";
-        $this->assertEquals(
-            false,
-            PMA_ipMaskTest($testRange, $ipToTest)
-        );
-
-        //IPV6 testing
-        //not range
-        $ipToTest = "2001:4998:c:a0d:0000:0000:4998:1020";
-        $testRange = "2001:4998:c:a0d:0000:0000:4998:1020";
-        $this->assertEquals(
-            true,
-            PMA_ipMaskTest($testRange, $ipToTest)
-        );
-        $ipToTest = "2001:4998:c:a0d:0000:0000:4998:1020";
-        $testRange = "2001:4998:c:a0d:0000:0000:4998:2020";
-        $this->assertEquals(
-            false,
-            PMA_ipMaskTest($testRange, $ipToTest)
-        );
-
-        //range
-        $ipToTest = "2001:4998:c:a0d:0000:0000:4998:1020";
-        $testRange = "2001:4998:c:a0d:0000:0000:4998:[1001-2010]";
-        $this->assertEquals(
-            true,
-            PMA_ipMaskTest($testRange, $ipToTest)
-        );
-        $ipToTest = "2001:4998:c:a0d:0000:0000:4998:3020";
-        $testRange = "2001:4998:c:a0d:0000:0000:4998:[1001-2010]";
-        $this->assertEquals(
-            false,
-            PMA_ipMaskTest($testRange, $ipToTest)
-        );
-
-        //CDIR
-        $ipToTest = "2001:4998:c:a0d:0000:0000:4998:1020";
-        $testRange = "2001:4998:c:a0d:0000:0000:4998:[1001-2010]";
-        $this->assertEquals(
-            true,
-            PMA_ipMaskTest($testRange, $ipToTest)
-        );
-        $ipToTest = "2001:4998:c:a0d:0000:0000:4998:1000";
-        $testRange = "2001:4998:c:a0d:0000:0000:4998:3020/24";
-        $this->assertEquals(
-            false,
-            PMA_ipMaskTest($testRange, $ipToTest)
-        );
-    }
-
-    /**
-     * Test for PMA_allowDeny
-     *
-     * @return void
-     */
-    public function testAllowDeny()
-    {
-        $_SERVER['REMOTE_ADDR'] = "";
-        $this->assertEquals(
-            false,
-            PMA_allowDeny("allow")
-        );
-
-        $_SERVER['REMOTE_ADDR'] = "255.0.1.0";
-        $this->assertEquals(
-            true,
-            PMA_allowDeny("allow")
-        );
-        $_SERVER['REMOTE_ADDR'] = "10.0.0.0";
-        $this->assertEquals(
-            false,
-            PMA_allowDeny("allow")
-        );
-
-        $_SERVER['REMOTE_ADDR'] = "255.255.0.1";
-        $this->assertEquals(
-            true,
-            PMA_allowDeny("deny")
-        );
-        $_SERVER['REMOTE_ADDR'] = "255.124.0.5";
-        $this->assertEquals(
-            true,
-            PMA_allowDeny("deny")
-        );
-        $_SERVER['REMOTE_ADDR'] = "122.124.0.5";
-        $this->assertEquals(
-            false,
-            PMA_allowDeny("deny")
-        );
-
-        //IPV6
-        $_SERVER['REMOTE_ADDR'] = "2001:4998:c:a0d:0000:0000:4998:1020";
-        $this->assertEquals(
-            true,
-            PMA_allowDeny("allow")
-        );
-        $_SERVER['REMOTE_ADDR'] = "2001:4998:c:a0d:0000:0000:4998:1000";
-        $this->assertEquals(
-            false,
-            PMA_allowDeny("allow")
-        );
-        $_SERVER['REMOTE_ADDR'] = "2001:4998:c:a0d:0000:0000:4998:1020";
-        $this->assertEquals(
-            true,
-            PMA_allowDeny("allow")
-        );
-    }
-}
diff --git a/#pma/test/libraries/PMA_js_escape_test.php b/#pma/test/libraries/PMA_js_escape_test.php
deleted file mode 100644
index 3e251330..00000000
--- a/#pma/test/libraries/PMA_js_escape_test.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for JS variable formatting
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-require_once 'libraries/js_escape.lib.php';
-
-
-/**
- * tests for JS variable formatting
- *
- * @package PhpMyAdmin-test
- */
-class PMA_JS_Escape_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Test for PMA_getJsValue
-     *
-     * @param string $key      Key
-     * @param string $value    Value
-     * @param string $expected Expected output
-     *
-     * @dataProvider variables
-     *
-     * @return void
-     */
-    public function testFormat($key, $value, $expected)
-    {
-        $this->assertEquals($expected, PMA_getJsValue($key, $value));
-        $this->assertEquals('foo = 100', PMA_getJsValue('foo', '100', false));
-        $array = array('1','2','3');
-        $this->assertEquals(
-            "foo = [\"1\",\"2\",\"3\",];\n",
-            PMA_getJsValue('foo', $array)
-        );
-        $this->assertEquals(
-            "foo = \"bar\\\"baz\";\n",
-            PMA_getJsValue('foo', 'bar"baz')
-        );
-    }
-
-    /**
-     * Test for PMA_jsFormat
-     *
-     * @return void
-     */
-    public function testJsFormat()
-    {
-        $this->assertEquals("`foo`", PMA_jsFormat('foo'));
-    }
-
-    /**
-     * Provider for testFormat
-     *
-     * @return array
-     */
-    public function variables()
-    {
-        return array(
-            array('foo', true, "foo = true;\n"),
-            array('foo', false, "foo = false;\n"),
-            array('foo', 100, "foo = 100;\n"),
-            array('foo', 0, "foo = 0;\n"),
-            array('foo', 'text', "foo = \"text\";\n"),
-            array('foo', 'quote"', "foo = \"quote\\\"\";\n"),
-            array('foo', 'apostroph\'', "foo = \"apostroph\\'\";\n"),
-        );
-    }
-}
diff --git a/#pma/test/libraries/PMA_kanji-encoding_test.php b/#pma/test/libraries/PMA_kanji-encoding_test.php
deleted file mode 100644
index ab4a7dac..00000000
--- a/#pma/test/libraries/PMA_kanji-encoding_test.php
+++ /dev/null
@@ -1,169 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Tests for Kanji Encoding Library
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-require_once 'libraries/kanji-encoding.lib.php';
-
-/**
- * Tests for Kanji Encoding Library
- *
- * @package PhpMyAdmin-test
- */
-class PMA_Kanji_Encoding_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Test for PMA_Kanji_checkEncoding
-     *
-     * @param string $encoding Encoding to set
-     * @param string $expected Expected encoding list
-     *
-     * @return void
-     * @test
-     * @dataProvider checkEncodingData
-     */
-    public function testCheckEncoding($encoding, $expected)
-    {
-        mb_internal_encoding($encoding);
-        $this->assertTrue(PMA_Kanji_checkEncoding());
-        $this->assertEquals($expected, $GLOBALS['kanji_encoding_list']);
-    }
-
-    /**
-     * Data provider for testPMA_Kanji_checkEncoding
-     *
-     * @return array Test data
-     */
-    public function checkEncodingData()
-    {
-        return array(
-            array('UTF-8', 'ASCII,SJIS,EUC-JP,JIS'),
-            array('EUC-JP', 'ASCII,EUC-JP,SJIS,JIS')
-        );
-    }
-
-    /**
-     * Test for PMA_Kanji_changeOrder
-     *
-     * @param string $kanji_test_list current list
-     * @param string $expected        expected list
-     *
-     * @return void
-     * @test
-     * @dataProvider changeOrderData
-     */
-    public function testChangeOrder($kanji_test_list, $expected)
-    {
-        $GLOBALS['kanji_encoding_list'] = $kanji_test_list;
-        $this->assertTrue(PMA_Kanji_changeOrder());
-        $this->assertEquals($expected, $GLOBALS['kanji_encoding_list']);
-    }
-
-    /**
-     * Data Provider for testPMA_Kanji_changeOrder
-     *
-     * @return array Test data
-     */
-    public function changeOrderData()
-    {
-        return array(
-            array('ASCII,SJIS,EUC-JP,JIS', 'ASCII,EUC-JP,SJIS,JIS'),
-            array('ASCII,EUC-JP,SJIS,JIS', 'ASCII,SJIS,EUC-JP,JIS')
-        );
-    }
-
-    /**
-     * Test for PMA_Kanji_strConv
-     *
-     * @return void
-     * @test
-     */
-    public function testStrConv()
-    {
-        $this->assertEquals(
-            'test',
-            PMA_Kanji_strConv('test', '', '')
-        );
-
-        $GLOBALS['kanji_encoding_list'] = 'ASCII,SJIS,EUC-JP,JIS';
-
-        $this->assertEquals(
-            'test è',
-            PMA_Kanji_strConv('test è', '', '')
-        );
-
-        $this->assertEquals(
-            mb_convert_encoding('test è', 'ASCII', 'SJIS'),
-            PMA_Kanji_strConv('test è', 'ASCII', '')
-        );
-
-        $this->assertEquals(
-            mb_convert_kana('全角', 'KV', 'SJIS'),
-            PMA_Kanji_strConv('全角', '', 'kana')
-        );
-    }
-
-
-    /**
-     * Test for PMA_Kanji_fileConv
-     *
-     * @return void
-     * @test
-     */
-    public function testFileConv()
-    {
-        $file_str = "教育漢字常用漢字";
-        $filename = 'test.kanji';
-        $file = fopen($filename, 'w');
-        fputs($file, $file_str);
-        fclose($file);
-        $GLOBALS['kanji_encoding_list'] = 'ASCII,EUC-JP,SJIS,JIS';
-
-        $result = PMA_Kanji_fileConv($filename, 'JIS', 'kana');
-
-        $string = file_get_contents($result);
-        PMA_Kanji_changeOrder();
-        $expected = PMA_Kanji_strConv($file_str, 'JIS', 'kana');
-        PMA_Kanji_changeOrder();
-        $this->assertEquals($string, $expected);
-        unlink($result);
-    }
-
-
-    /**
-     * Test for PMA_Kanji_encodingForm
-     *
-     * @return void
-     * @test
-     */
-    public function testEncodingForm()
-    {
-        $actual = PMA_Kanji_encodingForm();
-        $this->assertContains(
-            '<input type="radio" name="knjenc"',
-            $actual
-        );
-        $this->assertContains(
-            'type="radio" name="knjenc"',
-            $actual
-        );
-        $this->assertContains(
-            '<input type="radio" name="knjenc" value="EUC-JP" id="kj-euc" />',
-            $actual
-        );
-        $this->assertContains(
-            '<input type="radio" name="knjenc" value="SJIS" id="kj-sjis" />',
-            $actual
-        );
-        $this->assertContains(
-            '<input type="checkbox" name="xkana" value="kana" id="kj-kana" />',
-            $actual
-        );
-    }
-}
diff --git a/#pma/test/libraries/PMA_mime_test.php b/#pma/test/libraries/PMA_mime_test.php
deleted file mode 100644
index b49bac52..00000000
--- a/#pma/test/libraries/PMA_mime_test.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for mime.lib.php
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-
-require_once 'libraries/mime.lib.php';
-
-/**
- * Test for mime detection.
- *
- * @package PhpMyAdmin-test
- */
-class PMA_MIME_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Test for PMA_detectMIME
-     *
-     * @param string $test   MIME to test
-     * @param string $output Expected output
-     *
-     * @return void
-     * @dataProvider providerForTestDetectMIME
-     */
-    public function testDetectMIME($test, $output)
-    {
-
-        $this->assertEquals(
-            PMA_detectMIME($test),
-            $output
-        );
-    }
-
-    /**
-     * Provider for testPMA_detectMIME
-     *
-     * @return array data for testPMA_detectMIME
-     */
-    public function providerForTestDetectMIME()
-    {
-        return array(
-            array(
-                'pma',
-                'application/octet-stream'
-            ),
-            array(
-                'GIF',
-                'image/gif'
-            ),
-            array(
-                "\x89PNG",
-                'image/png'
-            ),
-            array(
-                chr(0xff) . chr(0xd8),
-                'image/jpeg'
-            ),
-        );
-    }
-}
diff --git a/#pma/test/libraries/PMA_mult_submits_test.php b/#pma/test/libraries/PMA_mult_submits_test.php
deleted file mode 100644
index 5cb17665..00000000
--- a/#pma/test/libraries/PMA_mult_submits_test.php
+++ /dev/null
@@ -1,368 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for mult_submits.lib.php
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-use PMA\libraries\Theme;
-
-
-require_once 'libraries/url_generating.lib.php';
-
-require_once 'libraries/mult_submits.lib.php';
-
-require_once 'libraries/database_interface.inc.php';
-
-require_once 'libraries/sanitizing.lib.php';
-require_once 'libraries/js_escape.lib.php';
-require_once 'libraries/relation_cleanup.lib.php';
-require_once 'libraries/relation.lib.php';
-require_once 'libraries/sql.lib.php';
-
-
-/**
- * class PMA_MultSubmits_Test
- *
- * this class is for testing mult_submits.lib.php functions
- *
- * @package PhpMyAdmin-test
- */
-class PMA_MultSubmits_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Test for setUp
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        //$GLOBALS
-        $GLOBALS['cfg']['MaxRows'] = 10;
-        $GLOBALS['cfg']['ServerDefault'] = "server";
-        $GLOBALS['cfg']['RememberSorting'] = true;
-        $GLOBALS['cfg']['SQP'] = array();
-        $GLOBALS['cfg']['MaxCharactersInDisplayedSQL'] = 1000;
-        $GLOBALS['cfg']['ShowSQL'] = true;
-        $GLOBALS['cfg']['TableNavigationLinksMode'] = 'icons';
-        $GLOBALS['cfg']['LimitChars'] = 100;
-        $GLOBALS['cfg']['Server']['DisableIS'] = false;
-        $GLOBALS['server'] = 0;
-        $GLOBALS['cfg']['ActionLinksMode'] = "both";
-        $GLOBALS['pmaThemeImage'] = 'image';
-
-        //_SESSION
-        $_SESSION['relation'][$GLOBALS['server']] = array(
-            'PMA_VERSION' => PMA_VERSION,
-            'table_coords' => "table_name",
-            'displaywork' => 'displaywork',
-            'db' => "information_schema",
-            'table_info' => 'table_info',
-            'relwork' => 'relwork',
-            'commwork' => 'commwork',
-            'pdfwork' => 'pdfwork',
-            'column_info' => 'column_info',
-            'relation' => 'relation',
-        );
-
-        //$_SESSION
-        $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
-        $_SESSION['PMA_Theme'] = new Theme();
-
-        //Mock DBI
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->any())
-            ->method('query')
-            ->will($this->returnValue(true));
-
-        $GLOBALS['dbi'] = $dbi;
-    }
-
-    /**
-     * Test for PMA_getHtmlForReplacePrefixTable
-     *
-     * @return void
-     */
-    public function testPMAGetHtmlForReplacePrefixTable()
-    {
-        $action = 'delete_row';
-        $_url_params = array('url_query'=>'PMA_original_url_query');
-
-        //Call the test function
-        $html = PMA_getHtmlForReplacePrefixTable($action, $_url_params);
-
-        //form action
-        $this->assertContains(
-            '<form id="ajax_form" action="delete_row" method="post">',
-            $html
-        );
-        //$PMA_URL_getHiddenInputs
-        $this->assertContains(
-            PMA_URL_getHiddenInputs($_url_params),
-            $html
-        );
-        //from_prefix
-        $this->assertContains(
-            '<input type="text" name="from_prefix" id="initialPrefix" />',
-            $html
-        );
-    }
-
-    /**
-     * Test for PMA_getHtmlForAddPrefixTable
-     *
-     * @return void
-     */
-    public function testPMAGetHtmlForAddPrefixTable()
-    {
-        $action = 'delete_row';
-        $_url_params = array('url_query'=>'PMA_original_url_query');
-
-        //Call the test function
-        $html = PMA_getHtmlForAddPrefixTable($action, $_url_params);
-
-        //form action
-        $this->assertContains(
-            '<form id="ajax_form" action="' . $action . '" method="post">',
-            $html
-        );
-        //$_url_params
-        $this->assertContains(
-            PMA_URL_getHiddenInputs($_url_params),
-            $html
-        );
-        //from_prefix
-        $this->assertContains(
-            __('Add prefix'),
-            $html
-        );
-    }
-
-    /**
-     * Test for PMA_getHtmlForOtherActions
-     *
-     * @return void
-     */
-    public function testPMAGetHtmlForOtherActions()
-    {
-        $what = 'replace_prefix_tbl';
-        $action = 'delete_row';
-        $_url_params = array('url_query'=>'PMA_original_url_query');
-        $full_query = 'select column from PMA_table';
-
-        //Call the test function
-        $html = PMA_getHtmlForOtherActions(
-            $what, $action, $_url_params, $full_query
-        );
-
-        //validate 1: form action
-        $this->assertContains(
-            '<form action="' . $action . '" method="post">',
-            $html
-        );
-        //validate 2: $_url_params
-        $this->assertContains(
-            PMA_URL_getHiddenInputs($_url_params),
-            $html
-        );
-        //validate 3: conform
-        $this->assertContains(
-            __('Do you really want to execute the following query?'),
-            $html
-        );
-        //validate 4: query
-        $this->assertContains(
-            '<code>' . $full_query . '</code>',
-            $html
-        );
-        //validate 5: button : yes or no
-        $this->assertContains(
-            __('Yes'),
-            $html
-        );
-        $this->assertContains(
-            __('No'),
-            $html
-        );
-    }
-
-    /**
-     * Test for PMA_getUrlParams
-     *
-     * @return void
-     */
-    public function testPMAGetUrlParams()
-    {
-        $what = 'row_delete';
-        $reload = true;
-        $action = 'db_delete_row';
-        $db = "PMA_db";
-        $table = "PMA_table";
-        $selected = array(
-            "index1" => "table1"
-        );
-        $views = null;
-        $original_sql_query = "original_sql_query";
-        $original_url_query = "original_url_query";
-
-        $_url_params = PMA_getUrlParams(
-            $what, $reload, $action, $db, $table, $selected, $views,
-            $original_sql_query, $original_url_query
-        );
-        $this->assertEquals(
-            $what,
-            $_url_params['query_type']
-        );
-        $this->assertEquals(
-            $db,
-            $_url_params['db']
-        );
-        $this->assertEquals(
-            array('DELETE FROM `PMA_table` WHERE table1 LIMIT 1;'),
-            $_url_params['selected']
-        );
-        $this->assertEquals(
-            $original_sql_query,
-            $_url_params['original_sql_query']
-        );
-        $this->assertEquals(
-            $original_url_query,
-            $_url_params['original_url_query']
-        );
-    }
-
-    /**
-     * Test for PMA_buildOrExecuteQueryForMulti
-     *
-     * @return void
-     */
-    public function testPMABuildOrExecuteQueryForMulti()
-    {
-        $query_type = 'row_delete';
-        $db = "PMA_db";
-        $table = "PMA_table";
-        $selected = array(
-            "table1", "table2"
-        );
-        $views = null;
-        $primary = null;
-        $from_prefix = "from_prefix";
-        $to_prefix = "to_prefix";
-
-        $_REQUEST['pos'] = 1000;
-        $_SESSION['tmpval']['pos'] = 1000;
-        $_SESSION['tmpval']['max_rows'] = 25;
-
-        list(
-            $result, $rebuild_database_list, $reload_ret,
-            $run_parts, $execute_query_later,,
-        ) = PMA_buildOrExecuteQueryForMulti(
-            $query_type, $selected, $db, $table, $views,
-            $primary, $from_prefix, $to_prefix
-        );
-
-        //validate 1: $run_parts
-        $this->assertEquals(
-            true,
-            $run_parts
-        );
-
-        //validate 2: $result
-        $this->assertEquals(
-            true,
-            $result
-        );
-
-        //validate 3: $rebuild_database_list
-        $this->assertEquals(
-            false,
-            $rebuild_database_list
-        );
-
-        //validate 4: $reload_ret
-        $this->assertEquals(
-            null,
-            $reload_ret
-        );
-
-        $query_type = 'analyze_tbl';
-        list(
-            ,,,, $execute_query_later,,
-        ) = PMA_buildOrExecuteQueryForMulti(
-            $query_type, $selected, $db, $table, $views,
-            $primary, $from_prefix, $to_prefix
-        );
-
-        //validate 5: $execute_query_later
-        $this->assertEquals(
-            true,
-            $execute_query_later
-        );
-    }
-
-    /**
-     * Test for PMA_getQueryFromSelected
-     *
-     * @return void
-     */
-    public function testPMAGetQueryFromSelected()
-    {
-        $what = "drop_tbl";
-        $table = "PMA_table";
-        $selected = array(
-            "table1", "table2"
-        );
-        $views = array(
-            "table1", "table2"
-        );
-
-        list($full_query, $reload, $full_query_views)
-            = PMA_getQueryFromSelected(
-                $what, $table, $selected, $views
-            );
-
-        //validate 1: $full_query
-        $this->assertContains(
-            "DROP VIEW `table1`, `table2`",
-            $full_query
-        );
-
-        //validate 2: $reload
-        $this->assertEquals(
-            false,
-            $reload
-        );
-
-        //validate 3: $full_query_views
-        $this->assertEquals(
-            null,
-            $full_query_views
-        );
-
-        $what = "drop_db";
-
-        list($full_query, $reload, $full_query_views)
-            = PMA_getQueryFromSelected(
-                $what, $table, $selected, $views
-            );
-
-        //validate 1: $full_query
-        $this->assertContains(
-            "DROP DATABASE `table1`;<br />DROP DATABASE `table2`;",
-            $full_query
-        );
-
-        //validate 2: $reload
-        $this->assertEquals(
-            true,
-            $reload
-        );
-    }
-}
diff --git a/#pma/test/libraries/PMA_mysql_charsets_test.php b/#pma/test/libraries/PMA_mysql_charsets_test.php
deleted file mode 100644
index abbb344a..00000000
--- a/#pma/test/libraries/PMA_mysql_charsets_test.php
+++ /dev/null
@@ -1,248 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Tests for MySQL Charsets
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-require_once 'libraries/mysql_charsets.inc.php';
-
-/**
- * Tests for MySQL Charsets
- *
- * @package PhpMyAdmin-test
- */
-class PMA_MySQL_Charsets_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Test for PMA_generateCharsetQueryPart
-     *
-     * @param string $collation Collation
-     * @param string $expected  Expected Charset Query
-     *
-     * @return void
-     * @test
-     * @dataProvider charsetQueryData
-     */
-    public function testGenerateCharsetQueryPart($collation, $expected)
-    {
-        $this->assertEquals(
-            $expected,
-            PMA_generateCharsetQueryPart($collation)
-        );
-    }
-
-    /**
-     * Data Provider for testPMA_generateCharsetQueryPart
-     *
-     * @return array test data
-     */
-    public function charsetQueryData()
-    {
-        return array(
-            array("a_b_c_d", " CHARSET=a COLLATE a_b_c_d"),
-            array("a_", " CHARSET=a COLLATE a_"),
-            array("a", " CHARSET=a"),
-        );
-    }
-
-
-    /**
-     * Test for PMA_getDbCollation
-     *
-     * @return void
-     * @test
-     */
-    public function testGetDbCollation()
-    {
-        $GLOBALS['server'] = 1;
-        // test case for system schema
-        $this->assertEquals(
-            'utf8_general_ci',
-            PMA_getDbCollation("information_schema")
-        );
-
-        $GLOBALS['cfg']['Server']['DisableIS'] = false;
-        $GLOBALS['cfg']['DBG']['sql'] = false;
-
-        $this->assertEquals(
-            'utf8_general_ci',
-            PMA_getDbCollation('pma_test')
-        );
-    }
-
-    /**
-     * Test case for PMA_getCollationDescr()
-     *
-     * @param string $collation Collation for which description is reqd
-     * @param string $desc      Expected Description
-     *
-     * @return void
-     * @test
-     * @dataProvider collationDescr
-     */
-    public function testGetCollationDescr($collation, $desc)
-    {
-        $this->assertEquals(
-            $desc,
-            PMA_getCollationDescr($collation)
-        );
-    }
-
-    /**
-     * Data Provider for testPMA_getCollationDescr()
-     *
-     * @return array Test data for testPMA_getCollationDescr()
-     */
-    public function collationDescr()
-    {
-        return array(
-            array('binary', 'Binary'),
-            array('foo_bulgarian_bar', 'Bulgarian'),
-            array('gb2312_chinese', 'Simplified Chinese'),
-            array('gbk_chinese', 'Simplified Chinese'),
-            array('big5_chinese', 'Traditional Chinese'),
-            array('foo_ci_bar', 'unknown, case-insensitive'),
-            array('foo_cs_bar', 'unknown, case-sensitive'),
-            array('foo_croatian_bar', 'Croatian'),
-            array('foo_czech_bar', 'Czech'),
-            array('foo_danish_bar', 'Danish'),
-            array('foo_english_bar', 'English'),
-            array('foo_esperanto_bar', 'Esperanto'),
-            array('foo_estonian_bar', 'Estonian'),
-            array('foo_german1_bar', 'German (dictionary)'),
-            array('foo_german2_bar', 'German (phone book)'),
-            array('foo_hungarian_bar', 'Hungarian'),
-            array('foo_icelandic_bar', 'Icelandic'),
-            array('foo_japanese_bar', 'Japanese'),
-            array('foo_latvian_bar', 'Latvian'),
-            array('foo_lithuanian_bar', 'Lithuanian'),
-            array('foo_korean_bar', 'Korean'),
-            array('foo_persian_bar', 'Persian'),
-            array('foo_polish_bar', 'Polish'),
-            array('foo_roman_bar', 'West European'),
-            array('foo_romanian_bar', 'Romanian'),
-            array('foo_slovak_bar', 'Slovak'),
-            array('foo_slovenian_bar', 'Slovenian'),
-            array('foo_spanish_bar', 'Spanish'),
-            array('foo_spanish2_bar', 'Traditional Spanish'),
-            array('foo_swedish_bar', 'Swedish'),
-            array('foo_thai_bar', 'Thai'),
-            array('foo_turkish_bar', 'Turkish'),
-            array('foo_ukrainian_bar', 'Ukrainian'),
-            array('foo_unicode_bar', 'Unicode (multilingual)'),
-            array('ucs2', 'Unicode (multilingual)'),
-            array('utf8', 'Unicode (multilingual)'),
-            array('ascii', 'West European (multilingual)'),
-            array('cp850', 'West European (multilingual)'),
-            array('dec8', 'West European (multilingual)'),
-            array('hp8', 'West European (multilingual)'),
-            array('latin1', 'West European (multilingual)'),
-            array('cp1250', 'Central European (multilingual)'),
-            array('cp852', 'Central European (multilingual)'),
-            array('latin2', 'Central European (multilingual)'),
-            array('macce', 'Central European (multilingual)'),
-            array('cp866', 'Russian'),
-            array('koi8r', 'Russian'),
-            array('gb2312', 'Simplified Chinese'),
-            array('gbk', 'Simplified Chinese'),
-            array('sjis', 'Japanese'),
-            array('ujis', 'Japanese'),
-            array('cp932', 'Japanese'),
-            array('eucjpms', 'Japanese'),
-            array('cp1257', 'Baltic (multilingual)'),
-            array('latin7', 'Baltic (multilingual)'),
-            array('armscii8', 'Armenian'),
-            array('armscii', 'Armenian'),
-            array('big5', 'Traditional Chinese'),
-            array('cp1251', 'Cyrillic (multilingual)'),
-            array('cp1256', 'Arabic'),
-            array('euckr', 'Korean'),
-            array('hebrew', 'Hebrew'),
-            array('geostd8', 'Georgian'),
-            array('greek', 'Greek'),
-            array('keybcs2', 'Czech-Slovak'),
-            array('koi8u', 'Ukrainian'),
-            array('latin5', 'Turkish'),
-            array('swe7', 'Swedish'),
-            array('tis620', 'Thai'),
-            array('foobar', 'unknown'),
-            array('foo_test_bar', 'unknown'),
-            array('foo_bin_bar', 'unknown, Binary')
-        );
-    }
-
-    /**
-     * Test for PMA_generateCharsetDropdownBox
-     *
-     * @return void
-     * @test
-     */
-    public function testGenerateCharsetDropdownBox()
-    {
-        $GLOBALS['mysql_charsets'] = array('latin1', 'latin2', 'latin3');
-        $GLOBALS['mysql_charsets_available'] = array(
-            'latin1' => true,
-            'latin2' => false,
-            'latin3' => true
-        );
-        $GLOBALS['mysql_charsets_descriptions'] = array(
-            'latin1' => 'abc',
-            'latin2' => 'def'
-        );
-        $GLOBALS['mysql_collations'] = array(
-            'latin1' => array(
-                'latin1_german1_ci',
-                'latin1_swedish1_ci'
-            ),
-            'latin2' => array('latin1_general_ci'),
-            'latin3' => array()
-        );
-        $GLOBALS['mysql_collations_available'] = array(
-             'latin1_german1_ci' => true,
-             'latin1_swedish1_ci' => false,
-             'latin2_general_ci' => true
-        );
-        $result = PMA_generateCharsetDropdownBox();
-
-        $this->assertContains('name="collation"', $result);
-        $this->assertNotContains('id="', $result);
-        $this->assertNotContains('class="autosubmit"', $result);
-        $this->assertContains('<option value="">Collation', $result);
-        $this->assertContains('<option value=""></option>', $result);
-        $this->assertContains('<optgroup label="latin1', $result);
-        $this->assertNotContains('<optgroup label="latin2', $result);
-        $this->assertContains('title="latin3', $result);
-        $this->assertContains('title="abc', $result);
-        $this->assertNotContains('value="latin1_swedish1_ci"', $result);
-        $this->assertContains('value="latin1_german1_ci"', $result);
-        $this->assertNotContains('value="latin2_general1_ci"', $result);
-        $this->assertContains('title="German', $result);
-
-        $result = PMA_generateCharsetDropdownBox(
-            2, null, "test_id", "latin1", false, true
-        );
-        $this->assertContains('name="character_set"', $result);
-        $this->assertNotContains('Charset</option>', $result);
-        $this->assertContains('class="autosubmit"', $result);
-        $this->assertContains('id="test_id"', $result);
-        $this->assertContains('selected="selected">latin1', $result);
-    }
-
-    /**
-     * Test for PMA_getServerCollation
-     *
-     * @return void
-     * @test
-     */
-    public function testGetServerCollation()
-    {
-        $GLOBALS['server'] = 1;
-        $GLOBALS['cfg']['DBG']['sql'] = false;
-        $this->assertEquals('utf8_general_ci', PMA_getServerCollation());
-    }
-}
diff --git a/#pma/test/libraries/PMA_normalization_test.php b/#pma/test/libraries/PMA_normalization_test.php
deleted file mode 100644
index c280e35b..00000000
--- a/#pma/test/libraries/PMA_normalization_test.php
+++ /dev/null
@@ -1,531 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for normalization.lib.php
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-use PMA\libraries\Theme;
-use PMA\libraries\TypesMySQL;
-
-$GLOBALS['server'] = 1;
-
-require_once 'libraries/database_interface.inc.php';
-
-require_once 'libraries/relation.lib.php';
-
-require_once 'libraries/url_generating.lib.php';
-
-
-require_once 'libraries/mysql_charsets.inc.php';
-require_once 'libraries/normalization.lib.php';
-
-
-/**
- * tests for normalization.lib.php
- *
- * @package PhpMyAdmin-test
- */
-class PMA_Normalization_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * prepares environment for tests
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        $GLOBALS['cfg']['LimitChars'] = 50;
-        $GLOBALS['PMA_Types'] = new TypesMySQL();
-        $GLOBALS['cfg']['ServerDefault'] = "PMA_server";
-        $GLOBALS['pmaThemeImage'] = 'image';
-        $GLOBALS['cfg']['ShowHint'] = true;
-        $GLOBALS['cfg']['CharEditing'] = '';
-        $GLOBALS['cfg']['ActionLinksMode'] = 'icons';
-        $GLOBALS['db'] = 'PMA_db';
-        $GLOBALS['table'] = 'PMA_table';
-        $GLOBALS['server'] = 1;
-
-        //$_SESSION
-        $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
-        $_SESSION['PMA_Theme'] = new Theme();
-
-        //mock DBI
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $GLOBALS['dbi'] = $dbi;
-        // set expectations
-        $dbi->expects($this->any())
-            ->method('selectDb')
-            ->will($this->returnValue(true));
-        $dbi->expects($this->any())
-            ->method('getColumns')
-            ->will(
-                $this->returnValue(
-                    array(
-                        "id"=>array("Type"=>"integer"),
-                        "col1"=>array("Type"=>'varchar(100)'),
-                        "col2"=>array("Type"=>'DATETIME')
-                    )
-                )
-            );
-        $dbi->expects($this->any())
-            ->method('getColumnNames')
-            ->will($this->returnValue(array("id", "col1", "col2")));
-        $map = array(
-          array('PMA_db', 'PMA_table1', null, array()),
-          array(
-            'PMA_db', 'PMA_table', null,
-            array(array('Key_name'=>'PRIMARY', 'Column_name'=>'id'))
-          ),
-          array(
-              'PMA_db', 'PMA_table2', null,
-              array(
-                array('Key_name'=>'PRIMARY', 'Column_name'=>'id'),
-                array('Key_name'=>'PRIMARY', 'Column_name'=>'col1')
-              )
-          ),
-        );
-        $dbi->expects($this->any())
-            ->method('getTableIndexes')
-            ->will($this->returnValueMap($map));
-        $dbi->expects($this->any())
-            ->method('tryQuery')
-            ->will($this->returnValue(true));
-        $dbi->expects($this->any())
-            ->method('fetchResult')
-            ->will($this->returnValue(array(0)));
-
-    }
-
-    /**
-     * Test for PMA_getHtmlForColumnsList
-     *
-     * @return void
-     */
-    public function testPMAGetHtmlForColumnsList()
-    {
-        $db = "PMA_db";
-        $table= "PMA_table";
-        $this->assertContains(
-            '<option value="id">id [ integer ]</option>',
-            PMA_getHtmlForColumnsList($table, $db)
-        );
-        $this->assertEquals(
-            '<input type="checkbox" value="col1"/>col1 [ varchar(100) ]</br>',
-            PMA_getHtmlForColumnsList($table, $db, 'String', 'checkbox')
-        );
-    }
-
-    /**
-     * Test for PMA_getHtmlForCreateNewColumn
-     *
-     * @return void
-     */
-    public function testPMAGetHtmlForCreateNewColumn()
-    {
-        $db = "PMA_db";
-        $table= "PMA_table";
-        $num_fields = 1;
-        $result = PMA_getHtmlForCreateNewColumn($num_fields, $db, $table);
-        $this->assertContains(
-            '<table id="table_columns"',
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA_getHtmlFor1NFStep1
-     *
-     * @return void
-     */
-    public function testPMAGetHtmlFor1NFStep1()
-    {
-        $db = "PMA_db";
-        $table= "PMA_table";
-        $normalizedTo = '1nf';
-        $result = PMA_getHtmlFor1NFStep1($db, $table, $normalizedTo);
-        $this->assertContains(
-            "<h3 class='center'>"
-            . __('First step of normalization (1NF)') . "</h3>",
-            $result
-        );
-        $this->assertContains(
-            "<div id='mainContent'",
-            $result
-        );
-        $this->assertContains("<legend>" . __('Step 1.'), $result);
-
-        $this->assertContains(
-            '<h4',
-            $result
-        );
-
-        $this->assertContains(
-            '<p',
-            $result
-        );
-
-        $this->assertContains(
-            "<select id='selectNonAtomicCol'",
-            $result
-        );
-
-        $this->assertContains(
-            PMA_getHtmlForColumnsList(
-                $db, $table, _pgettext('string types', 'String')
-            ), $result
-        );
-
-    }
-
-    /**
-     * Test for PMA_getHtmlContentsFor1NFStep2
-     *
-     * @return void
-     */
-    public function testPMAGetHtmlContentsFor1NFStep2()
-    {
-        $db = "PMA_db";
-        $table= "PMA_table1";
-        $result = PMA_getHtmlContentsFor1NFStep2($db, $table);
-        $this->assertInternalType('array', $result);
-        $this->assertArrayHasKey('legendText', $result);
-        $this->assertArrayHasKey('headText', $result);
-        $this->assertArrayHasKey('subText', $result);
-        $this->assertArrayHasKey('hasPrimaryKey', $result);
-        $this->assertArrayHasKey('extra', $result);
-        $this->assertContains(
-            '<a href="#" id="createPrimaryKey">',
-            $result['subText']
-        );
-        $this->assertContains(
-            '<a href="#" id="addNewPrimary">',
-            $result['extra']
-        );
-        $this->assertEquals('0', $result['hasPrimaryKey']);
-        $this->assertContains(__('Step 1.') . 2, $result['legendText']);
-        $result1 = PMA_getHtmlContentsFor1NFStep2($db, 'PMA_table');
-        $this->assertEquals('1', $result1['hasPrimaryKey']);
-    }
-
-    /**
-     * Test for PMA_getHtmlContentsFor1NFStep4
-     *
-     * @return void
-     */
-    public function testPMAGetHtmlContentsFor1NFStep4()
-    {
-        $db = "PMA_db";
-        $table= "PMA_table";
-        $result = PMA_getHtmlContentsFor1NFStep4($db, $table);
-        $this->assertInternalType('array', $result);
-        $this->assertArrayHasKey('legendText', $result);
-        $this->assertArrayHasKey('headText', $result);
-        $this->assertArrayHasKey('subText', $result);
-        $this->assertArrayHasKey('extra', $result);
-        $this->assertContains(__('Step 1.') . 4, $result['legendText']);
-        $this->assertContains(
-            PMA_getHtmlForColumnsList($db, $table, 'all', "checkbox"),
-            $result['extra']
-        );
-        $this->assertContains(
-            '<input type="submit" id="removeRedundant"',
-            $result['extra']
-        );
-    }
-
-    /**
-     * Test for PMA_getHtmlContentsFor1NFStep3
-     *
-     * @return void
-     */
-    public function testPMAGetHtmlContentsFor1NFStep3()
-    {
-        $db = "PMA_db";
-        $table= "PMA_table";
-        $result = PMA_getHtmlContentsFor1NFStep3($db, $table);
-        $this->assertInternalType('array', $result);
-        $this->assertArrayHasKey('legendText', $result);
-        $this->assertArrayHasKey('headText', $result);
-        $this->assertArrayHasKey('subText', $result);
-        $this->assertArrayHasKey('extra', $result);
-        $this->assertArrayHasKey('primary_key', $result);
-        $this->assertContains(__('Step 1.') . 3, $result['legendText']);
-        $this->assertContains(
-            PMA_getHtmlForColumnsList($db, $table, 'all', "checkbox"),
-            $result['extra']
-        );
-        $this->assertContains(
-            '<input type="submit" id="moveRepeatingGroup"',
-            $result['extra']
-        );
-        $this->assertEquals(json_encode(array('id')), $result['primary_key']);
-    }
-
-    /**
-     * Test for PMA_getHtmlFor2NFstep1
-     *
-     * @return void
-     */
-    public function testPMAGetHtmlFor2NFstep1()
-    {
-        $db = "PMA_db";
-        $table= "PMA_table";
-        $result = PMA_getHtmlFor2NFstep1($db, $table);
-        $this->assertInternalType('array', $result);
-        $this->assertArrayHasKey('legendText', $result);
-        $this->assertArrayHasKey('headText', $result);
-        $this->assertArrayHasKey('subText', $result);
-        $this->assertArrayHasKey('extra', $result);
-        $this->assertArrayHasKey('primary_key', $result);
-        $this->assertContains(__('Step 2.') . 1, $result['legendText']);
-        $this->assertEquals('id', $result['primary_key']);
-        $result1 = PMA_getHtmlFor2NFstep1($db, "PMA_table2");
-        $this->assertEquals('id, col1', $result1['primary_key']);
-        $this->assertContains(
-            '<a href="#" id="showPossiblePd"',
-            $result1['headText']
-        );
-        $this->assertContains(
-            '<input type="checkbox" name="pd" value="id"',
-            $result1['extra']
-        );
-    }
-
-    /**
-     * Test for PMA_getHtmlForNewTables2NF
-     *
-     * @return void
-     */
-    public function testPMAGetHtmlForNewTables2NF()
-    {
-        $table= "PMA_table";
-        $partialDependencies = array('col1'=>array('col2'));
-        $result = PMA_getHtmlForNewTables2NF($partialDependencies, $table);
-        $this->assertContains(
-            '<input type="text" name="col1"',
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA_createNewTablesFor2NF
-     *
-     * @return void
-     */
-    public function testPMACreateNewTablesFor2NF()
-    {
-        $table= "PMA_table";
-        $db = 'PMA_db';
-        $tablesName = new stdClass();
-        $tablesName->id = 'PMA_table';
-        $tablesName->col1 = 'PMA_table1';
-        $partialDependencies = array('id'=>array('col2'));
-        $result = PMA_createNewTablesFor2NF(
-            $partialDependencies, $tablesName, $table, $db
-        );
-        $this->assertInternalType('array', $result);
-        $this->assertArrayHasKey('legendText', $result);
-        $this->assertArrayHasKey('headText', $result);
-        $this->assertArrayHasKey('queryError', $result);
-        $partialDependencies = array('id'=>array('col2'), 'col1'=>array('col2'));
-        $result1 = PMA_createNewTablesFor2NF(
-            $partialDependencies, $tablesName, $table, $db
-        );
-        $this->assertArrayHasKey('extra', $result1);
-        $this->assertEquals(__('End of step'), $result1['legendText']);
-        $this->assertEquals('', $result1['extra']);
-    }
-
-    /**
-     * Test for PMA_getHtmlForNewTables3NF
-     *
-     * @return void
-     */
-    public function testPMAGetHtmlForNewTables3NF()
-    {
-        $tables= array("PMA_table"=>array('col1'));
-        $db = 'PMA_db';
-        $dependencies = new stdClass();
-        $dependencies->col1 = array('col2');
-        $result = PMA_getHtmlForNewTables3NF($dependencies, $tables, $db);
-        $this->assertEquals(
-            array(
-                'html' => '',
-                'newTables' => array()
-                ), $result
-        );
-        $tables= array("PMA_table"=>array('col1', 'PMA_table'));
-        $dependencies->PMA_table = array('col4', 'col5');
-        $result1 = PMA_getHtmlForNewTables3NF($dependencies, $tables, $db);
-        $this->assertInternalType('array', $result1);
-        $this->assertContains(
-            '<input type="text" name="PMA_table"',
-            $result1['html']
-        );
-        $this->assertEquals(
-            array(
-                'PMA_table' => array (
-                    'PMA_table' => array (
-                        'pk' => 'col1',
-                        'nonpk' => 'col2'
-                    ),
-                    'table2' => array (
-                        'pk' => 'id',
-                        'nonpk' => 'col4, col5'
-                    )
-                )
-            ), $result1['newTables']
-        );
-    }
-
-    /**
-     * Test for PMA_createNewTablesFor3NF
-     *
-     * @return void
-     */
-    public function testPMACreateNewTablesFor3NF()
-    {
-        $db = 'PMA_db';
-        $cols = new stdClass();
-        $cols->pk = 'id';
-        $cols->nonpk = 'col1, col2';
-        $cols1 = new stdClass();
-        $cols1->pk = 'col2';
-        $cols1->nonpk = 'col3, col4';
-        $newTables = array('PMA_table'=>array('PMA_table'=>$cols, 'table1'=>$cols1));
-        $result = PMA_createNewTablesFor3NF(
-            $newTables, $db
-        );
-        $this->assertInternalType('array', $result);
-        $this->assertArrayHasKey('legendText', $result);
-        $this->assertArrayHasKey('headText', $result);
-        $this->assertArrayHasKey('queryError', $result);
-        $newTables1 = array();
-        $result1 = PMA_createNewTablesFor3NF(
-            $newTables1, $db
-        );
-        $this->assertArrayHasKey('queryError', $result1);
-        $this->assertEquals(__('End of step'), $result1['legendText']);
-        $this->assertEquals(false, $result1['queryError']);
-    }
-
-    /**
-     * Test for PMA_moveRepeatingGroup
-     *
-     * @return void
-     */
-    public function testPMAMoveRepeatingGroup()
-    {
-        $repeatingColumns = 'col1, col2';
-        $primary_columns = 'id,col1';
-        $newTable = 'PMA_newTable';
-        $newColumn = 'PMA_newCol';
-        $table= "PMA_table";
-        $db = 'PMA_db';
-        $result = PMA_moveRepeatingGroup(
-            $repeatingColumns, $primary_columns, $newTable, $newColumn, $table, $db
-        );
-        $this->assertInternalType('array', $result);
-        $this->assertArrayHasKey('queryError', $result);
-        $this->assertArrayHasKey('message', $result);
-        $this->assertInstanceOf(
-            'PMA\libraries\Message', $result['message']
-        );
-    }
-
-    /**
-     * Test for PMA_getHtmlFor3NFstep1
-     *
-     * @return void
-     */
-    public function testPMAGetHtmlFor3NFstep1()
-    {
-        $db = "PMA_db";
-        $tables= array("PMA_table");
-        $result = PMA_getHtmlFor3NFstep1($db, $tables);
-        $this->assertInternalType('array', $result);
-        $this->assertArrayHasKey('legendText', $result);
-        $this->assertArrayHasKey('headText', $result);
-        $this->assertArrayHasKey('subText', $result);
-        $this->assertArrayHasKey('extra', $result);
-        $this->assertContains(__('Step 3.') . 1, $result['legendText']);
-        $this->assertContains(
-            '<form',
-            $result['extra']
-        );
-        $this->assertContains(
-            '<input type="checkbox" name="pd" value="col1"',
-            $result['extra']
-        );
-        $result1 = PMA_getHtmlFor3NFstep1($db, array("PMA_table2"));
-        $this->assertEquals(
-            '', $result1['subText']
-        );
-    }
-
-    /**
-     * Test for PMA_getHtmlForNormalizetable
-     *
-     * @return void
-     */
-    public function testPMAGetHtmlForNormalizetable()
-    {
-        $result = PMA_getHtmlForNormalizetable();
-        $this->assertContains(
-            '<form method="post" action="normalization.php"'
-            . ' name="normalize" id="normalizeTable"',
-            $result
-        );
-        $this->assertContains(
-            '<input type="hidden" name="step1" value="1">', $result
-        );
-        $choices = array(
-            '1nf' => __('First step of normalization (1NF)'),
-            '2nf'      => __('Second step of normalization (1NF+2NF)'),
-            '3nf'  => __('Third step of normalization (1NF+2NF+3NF)'));
-
-        $html_tmp = PMA\libraries\Util::getRadioFields(
-            'normalizeTo', $choices, '1nf', true
-        );
-        $this->assertContains($html_tmp, $result);
-    }
-
-    /**
-     * Test for PMA_findPartialDependencies
-     *
-     * @return void
-     */
-    public function testPMAFindPartialDependencies()
-    {
-        $table= "PMA_table2";
-        $db = 'PMA_db';
-        $result = PMA_findPartialDependencies($table, $db);
-        $this->assertContains(
-            '<div class="dependencies_box"',
-            $result
-        );
-        $this->assertContains(__('No partial dependencies found!'), $result);
-    }
-
-    /**
-     * Test for PMA_getAllCombinationPartialKeys
-     *
-     * @return void
-     */
-    public function testPMAGetAllCombinationPartialKeys()
-    {
-        $primaryKey = array('id', 'col1', 'col2');
-        $result = PMA_getAllCombinationPartialKeys($primaryKey);
-        $this->assertEquals(
-            array('', 'id', 'col1', 'col1,id', 'col2', 'col2,id', 'col2,col1'),
-            $result
-        );
-    }
-}
diff --git a/#pma/test/libraries/PMA_operations_test.php b/#pma/test/libraries/PMA_operations_test.php
deleted file mode 100644
index e81643d5..00000000
--- a/#pma/test/libraries/PMA_operations_test.php
+++ /dev/null
@@ -1,254 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for operations
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-
-use PMA\libraries\Theme;
-
-$GLOBALS['server'] = 1;
-require_once 'libraries/operations.lib.php';
-require_once 'libraries/url_generating.lib.php';
-require_once 'libraries/relation.lib.php';
-
-
-require_once 'libraries/database_interface.inc.php';
-
-require_once 'libraries/mysql_charsets.inc.php';
-
-/**
- * tests for operations
- *
- * @package PhpMyAdmin-test
- */
-class PMA_Operations_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Set up global environment.
-     *
-     * @return void
-     */
-    public function setup()
-    {
-        $GLOBALS['table'] = 'table';
-        $GLOBALS['db'] = 'db';
-        $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
-        $GLOBALS['cfg'] = array(
-            'ServerDefault' => 1,
-            'ActionLinksMode' => 'icons',
-        );
-        $GLOBALS['cfg']['DBG']['sql'] = false;
-        $GLOBALS['server'] = 1;
-
-        $GLOBALS['db_priv'] = true;
-        $GLOBALS['table_priv'] = true;
-        $GLOBALS['col_priv'] = true;
-        $GLOBALS['proc_priv'] = true;
-        $GLOBALS['flush_priv'] = true;
-    }
-
-    /**
-     * Test for PMA_getHtmlForDatabaseComment
-     *
-     * @return void
-     */
-    public function testGetHtmlForDatabaseComment()
-    {
-
-        $this->assertRegExp(
-            '/.*db_operations.php(.|[\n])*Database comment.*name="comment"([\n]|.)*/m',
-            PMA_getHtmlForDatabaseComment("pma")
-        );
-    }
-
-    /**
-     * Test for PMA_getHtmlForRenameDatabase
-     *
-     * @return void
-     */
-    public function testGetHtmlForRenameDatabase()
-    {
-
-        $_REQUEST['db_collation'] = 'db1';
-        $html = PMA_getHtmlForRenameDatabase("pma");
-        $this->assertContains('db_operations.php', $html);
-        $this->assertRegExp(
-            '/.*db_rename.*Rename database to.*/',
-            $html
-        );
-    }
-
-    /**
-     * Test for PMA_getHtmlForDropDatabaseLink
-     *
-     * @return void
-     */
-    public function testGetHtmlForDropDatabaseLink()
-    {
-
-        $this->assertRegExp(
-            '/.*DROP.DATABASE.*db_operations.php.*Drop the database.*/',
-            PMA_getHtmlForDropDatabaseLink("pma")
-        );
-    }
-
-    /**
-     * Test for PMA_getHtmlForCopyDatabase
-     *
-     * @return void
-     */
-    public function testGetHtmlForCopyDatabase()
-    {
-        $_REQUEST['db_collation'] = 'db1';
-        $html = PMA_getHtmlForCopyDatabase("pma");
-        $this->assertRegExp('/.*db_operations.php.*/', $html);
-        $this->assertRegExp('/.*db_copy.*/', $html);
-        $this->assertRegExp('/.*Copy database to.*/', $html);
-    }
-
-    /**
-     * Test for PMA_getHtmlForChangeDatabaseCharset
-     *
-     * @return void
-     */
-    public function testGetHtmlForChangeDatabaseCharset()
-    {
-
-        $_REQUEST['db_collation'] = 'db1';
-        $this->assertRegExp(
-            '/.*db_operations.php(.|[\n])*select_db_collation([\n]|.)*Collation.*/m',
-            PMA_getHtmlForChangeDatabaseCharset("pma", "bookmark")
-        );
-    }
-
-    /**
-     * Test for PMA_getHtmlForOrderTheTable
-     *
-     * @return void
-     */
-    public function testGetHtmlForOrderTheTable()
-    {
-
-        $this->assertRegExp(
-            '/.*tbl_operations.php(.|[\n])*Alter table order by([\n]|.)*order_order.*/m',
-            PMA_getHtmlForOrderTheTable(
-                array(array('Field' => "column1"), array('Field' => "column2"))
-            )
-        );
-    }
-
-    /**
-     * Test for PMA_getHtmlForTableRow
-     *
-     * @return void
-     */
-    public function testGetHtmlForTableRow()
-    {
-
-        $this->assertEquals(
-            '<tr><td class="vmiddle"><label for="name">lable</label></td><td><input type="checkbox" name="name" id="name" value="1"/></td></tr>',
-            PMA_getHtmlForTableRow("name", "lable", "value")
-        );
-    }
-
-    /**
-     * Test for PMA_getMaintainActionlink
-     *
-     * @return void
-     */
-    public function testGetMaintainActionlink()
-    {
-
-        $this->assertRegExp(
-            '/.*href="sql.php.*post.*/',
-            PMA_getMaintainActionlink(
-                "post",
-                array("name" => 'foo', "value" => 'bar'),
-                array(),
-                'doclink'
-            )
-        );
-    }
-
-    /**
-     * Test for PMA_getHtmlForDeleteDataOrTable
-     *
-     * @return void
-     */
-    public function testGetHtmlForDeleteDataOrTable()
-    {
-
-        $this->assertRegExp(
-            '/.*Delete data or table.*Empty the table.*Delete the table.*/m',
-            PMA_getHtmlForDeleteDataOrTable(
-                array("truncate" => 'foo'), array("drop" => 'bar')
-            )
-        );
-    }
-
-    /**
-     * Test for PMA_getDeleteDataOrTablelink
-     *
-     * @return void
-     */
-    public function testGetDeleteDataOrTablelink()
-    {
-
-        $this->assertRegExp(
-            '/.*TRUNCATE.TABLE.foo.*id_truncate.*Truncate table.*/m',
-            PMA_getDeleteDataOrTablelink(
-                array("sql" => 'TRUNCATE TABLE foo'),
-                "TRUNCATE_TABLE",
-                "Truncate table",
-                "id_truncate"
-            )
-        );
-    }
-
-    /**
-     * Test for PMA_getHtmlForPartitionMaintenance
-     *
-     * @return void
-     */
-    public function testGetHtmlForPartitionMaintenance()
-    {
-        $html = PMA_getHtmlForPartitionMaintenance(
-            array("partition1", "partion2"),
-            array("param1" => 'foo', "param2" => 'bar')
-        );
-        $this->assertRegExp('/.*action="tbl_operations.php".*/', $html);
-        $this->assertRegExp('/.*ANALYZE.*/', $html);
-        $this->assertRegExp('/.*REBUILD.*/', $html);
-    }
-
-    /**
-     * Test for PMA_getHtmlForReferentialIntegrityCheck
-     *
-     * @return void
-     */
-    public function testGetHtmlForReferentialIntegrityCheck()
-    {
-
-        $this->assertRegExp(
-            '/.*Check referential integrity.*href="sql.php(.|[\n])*/m',
-            PMA_getHtmlForReferentialIntegrityCheck(
-                array(
-                    array(
-                        'foreign_db'    => 'db1',
-                        'foreign_table' => "foreign1",
-                        'foreign_field' => "foreign2"
-                    )
-                ),
-                array("param1" => 'a', "param2" => 'b')
-            )
-        );
-    }
-
-
-}
diff --git a/#pma/test/libraries/PMA_relation_cleanup_test.php b/#pma/test/libraries/PMA_relation_cleanup_test.php
deleted file mode 100644
index 73cc3fa5..00000000
--- a/#pma/test/libraries/PMA_relation_cleanup_test.php
+++ /dev/null
@@ -1,511 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for relation_cleanup.lib.php
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-
-
-require_once 'libraries/database_interface.inc.php';
-
-require_once 'libraries/relation.lib.php';
-require_once 'libraries/relation_cleanup.lib.php';
-
-use PMA\libraries\DatabaseInterface;
-
-/**
- * PMA_Relation_Cleanup_Test class
- *
- * this class is for testing relation_cleanup.lib.php functions
- *
- * @package PhpMyAdmin-test
- */
-class PMA_Relation_Cleanup_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Prepares environment for the test.
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        $_SESSION['relation'] = array();
-        $GLOBALS['server'] = 1;
-        $GLOBALS['cfg']['Server']['user'] = "user";
-        $GLOBALS['cfg']['Server']['pmadb'] = "pmadb";
-        $GLOBALS['cfg']['Server']['bookmarktable'] = 'bookmark';
-        $GLOBALS['cfg']['Server']['relation'] = 'relation';
-        $GLOBALS['cfg']['Server']['table_info'] = 'table_info';
-        $GLOBALS['cfg']['Server']['table_coords'] = 'table_coords';
-        $GLOBALS['cfg']['Server']['column_info'] = 'column_info';
-        $GLOBALS['cfg']['Server']['pdf_pages'] = 'pdf_pages';
-        $GLOBALS['cfg']['Server']['history'] = 'history';
-        $GLOBALS['cfg']['Server']['recent'] = 'recent';
-        $GLOBALS['cfg']['Server']['favorite'] = 'favorite';
-        $GLOBALS['cfg']['Server']['table_uiprefs'] = 'table_uiprefs';
-        $GLOBALS['cfg']['Server']['tracking'] = 'tracking';
-        $GLOBALS['cfg']['Server']['userconfig'] = 'userconfig';
-        $GLOBALS['cfg']['Server']['users'] = 'users';
-        $GLOBALS['cfg']['Server']['usergroups'] = 'usergroups';
-        $GLOBALS['cfg']['Server']['navigationhiding'] = 'navigationhiding';
-        $GLOBALS['cfg']['Server']['savedsearches'] = 'savedsearches';
-        $GLOBALS['cfg']['Server']['central_columns'] = 'central_columns';
-        $GLOBALS['cfg']['Server']['designer_settings'] = 'designer_settings';
-        $GLOBALS['cfg']['Server']['export_templates'] = 'pma__export_templates';
-
-        $this->redefineRelation();
-    }
-
-
-    /**
-     * functions for redefine DBI_PMA_Relation_Cleanup
-     *
-     * @return void
-     */
-    public function redefineRelation()
-    {
-        $GLOBALS['dbi'] = new DBI_PMA_Relation_Cleanup();
-        unset($_SESSION['relation'][$GLOBALS['server']]);
-    }
-
-    /**
-     * Test for PMA_relationsCleanupColumn
-     *
-     * @return void
-     * @group medium
-     */
-    public function testPMARelationsCleanupColumn()
-    {
-        $db = "PMA";
-        $table = "PMA_bookmark";
-        $column = "name";
-        $this->redefineRelation();
-
-        //the $cfgRelation value before cleanup column
-        $cfgRelation = PMA_checkRelationsParam();
-        $this->assertEquals(
-            true,
-            $cfgRelation['commwork']
-        );
-        //validate PMA_getDbComments when commwork = true
-        $db_comments = PMA_getDbComments();
-        $this->assertEquals(
-            array('db_name0' => 'comment0','db_name1' => 'comment1'),
-            $db_comments
-        );
-
-        $this->assertEquals(
-            true,
-            $cfgRelation['displaywork']
-        );
-        //validate PMA_getDisplayField when displaywork = true
-        $display_field = PMA_getDisplayField($db, $table);
-        $this->assertEquals(
-            'PMA_display_field',
-            $display_field
-        );
-        $this->assertEquals(
-            true,
-            $cfgRelation['relwork']
-        );
-        $this->assertEquals(
-            'column_info',
-            $cfgRelation['column_info']
-        );
-        $this->assertEquals(
-            'table_info',
-            $cfgRelation['table_info']
-        );
-        $this->assertEquals(
-            'relation',
-            $cfgRelation['relation']
-        );
-
-        //cleanup
-        PMA_relationsCleanupColumn($db, $table, $column);
-
-        //the $cfgRelation value after cleanup column
-        $cfgRelation = PMA_checkRelationsParam();
-
-        $is_defined_column_info
-            = isset($cfgRelation['column_info'])? $cfgRelation['column_info'] : null;
-        $is_defined_table_info
-            = isset($cfgRelation['table_info'])? $cfgRelation['table_info'] : null;
-        $is_defined_relation
-            = isset($cfgRelation['relation'])? $cfgRelation['relation'] : null;
-
-        $this->assertEquals(
-            null,
-            $is_defined_column_info
-        );
-        $this->assertEquals(
-            null,
-            $is_defined_table_info
-        );
-        $this->assertEquals(
-            null,
-            $is_defined_relation
-        );
-
-    }
-
-    /**
-     * Test for PMA_relationsCleanupTable
-     *
-     * @return void
-     */
-    public function testPMARelationsCleanupTable()
-    {
-        $db = "PMA";
-        $table = "PMA_bookmark";
-        $this->redefineRelation();
-
-        //the $cfgRelation value before cleanup column
-        $cfgRelation = PMA_checkRelationsParam();
-        $this->assertEquals(
-            'column_info',
-            $cfgRelation['column_info']
-        );
-        $this->assertEquals(
-            'table_info',
-            $cfgRelation['table_info']
-        );
-        $this->assertEquals(
-            'table_coords',
-            $cfgRelation['table_coords']
-        );
-        $this->assertEquals(
-            'relation',
-            $cfgRelation['relation']
-        );
-
-        //PMA_relationsCleanupTable
-        PMA_relationsCleanupTable($db, $table);
-
-        //the $cfgRelation value after cleanup column
-        $cfgRelation = PMA_checkRelationsParam();
-
-        $is_defined_column_info
-            = isset($cfgRelation['column_info'])? $cfgRelation['column_info'] : null;
-        $is_defined_table_info
-            = isset($cfgRelation['table_info'])? $cfgRelation['table_info'] : null;
-        $is_defined_relation
-            = isset($cfgRelation['relation'])? $cfgRelation['relation'] : null;
-        $is_defined_table_coords
-            = isset($cfgRelation['table_coords'])
-            ? $cfgRelation['table_coords']
-            : null;
-
-        $this->assertEquals(
-            null,
-            $is_defined_column_info
-        );
-        $this->assertEquals(
-            null,
-            $is_defined_table_info
-        );
-        $this->assertEquals(
-            null,
-            $is_defined_relation
-        );
-        $this->assertEquals(
-            null,
-            $is_defined_table_coords
-        );
-    }
-
-    /**
-     * Test for PMA_relationsCleanupDatabase
-     *
-     * @return void
-     */
-    public function testPMARelationsCleanupDatabase()
-    {
-        $db = "PMA";
-        $this->redefineRelation();
-
-        //the $cfgRelation value before cleanup column
-        $cfgRelation = PMA_checkRelationsParam();
-        $this->assertEquals(
-            'column_info',
-            $cfgRelation['column_info']
-        );
-        $this->assertEquals(
-            'bookmark',
-            $cfgRelation['bookmark']
-        );
-        $this->assertEquals(
-            'table_info',
-            $cfgRelation['table_info']
-        );
-        $this->assertEquals(
-            'pdf_pages',
-            $cfgRelation['pdf_pages']
-        );
-        $this->assertEquals(
-            'table_coords',
-            $cfgRelation['table_coords']
-        );
-        $this->assertEquals(
-            'relation',
-            $cfgRelation['relation']
-        );
-
-        //cleanup
-        PMA_relationsCleanupDatabase($db);
-
-        //the value after cleanup column
-        $cfgRelation = PMA_checkRelationsParam();
-
-        $is_defined_column_info
-            = isset($cfgRelation['column_info'])? $cfgRelation['column_info'] : null;
-        $is_defined_table_info
-            = isset($cfgRelation['table_info'])? $cfgRelation['table_info'] : null;
-        $is_defined_relation
-            = isset($cfgRelation['relation'])? $cfgRelation['relation'] : null;
-        $is_defined_table_coords
-            = isset($cfgRelation['table_coords'])
-            ? $cfgRelation['table_coords']
-            : null;
-
-        $this->assertEquals(
-            null,
-            $is_defined_column_info
-        );
-        $this->assertEquals(
-            null,
-            $is_defined_table_info
-        );
-        $this->assertEquals(
-            null,
-            $is_defined_relation
-        );
-        $this->assertEquals(
-            null,
-            $is_defined_table_coords
-        );
-    }
-}
-
-/**
- * DBI_PMA_Relation_Cleanup for Mock DBI class
- *
- * this class is for Mock DBI
- *
- * @package PhpMyAdmin-test
- */
-class DBI_PMA_Relation_Cleanup extends DatabaseInterface
-{
-    var $index;
-    var $assocIndex;
-    var $totalNum;
-    var $values = array();
-    var $indexs = array();
-
-    /**
-     * Constructor
-     *
-     */
-    public function __construct()
-    {
-         $this->index = 0;
-         $this->assocIndex = 0;
-         $this->totalNum = 2;
-         $this->values = array(
-             'bookmark',
-             'relation',
-             'table_info',
-             'table_coords',
-             'column_info',
-             'pdf_pages',
-             'history',
-             'recent',
-             'table_uiprefs',
-             'tracking',
-             'userconfig',
-             'users',
-             'usergroups',
-             'navigationhiding',
-         );
-         $this->indexs = array(
-             'bookmark' => 0,
-             'relation' => 1,
-             'table_info' => 2,
-             'table_coords' => 3,
-             'column_info' => 4,
-             'pdf_pages' => 5,
-             'history' => 6,
-             'recent' => 7,
-             'table_uiprefs' => 8,
-             'tracking' => 9,
-             'userconfig' => 10,
-             'users' => 11,
-             'usergroups' => 12,
-             'navigationhiding' => 13,
-         );
-    }
-
-    /**
-     * returns array of rows with numeric keys from $result
-     *
-     * @param object $result result set identifier
-     *
-     * @return array
-     */
-    function fetchRow($result)
-    {
-        $curr_table = array();
-        if ($this->index < count($this->values)) {
-            $curr_table[0] = $this->values[$this->index];
-            $this->index++;
-            return $curr_table;
-        }
-
-        $this->index = 0;
-        return false;
-    }
-
-
-    /**
-     * runs a query
-     *
-     * @param string $sql                 SQL query to execute
-     * @param mixed  $link                optional database link to use
-     * @param int    $options             optional query options
-     * @param bool   $cache_affected_rows whether to cache affected rows
-     *
-     * @return mixed
-     */
-    function query($sql, $link = null, $options = 0, $cache_affected_rows = true)
-    {
-        if (mb_stripos($sql, "column_info") !== false) {
-            unset($this->values[$this->indexs['column_info']]);
-        }
-
-        if (mb_stripos($sql, "table_info") !== false) {
-            unset($this->values[$this->indexs['table_info']]);
-        }
-
-        if (mb_stripos($sql, "table_coords") !== false) {
-            unset($this->values[$this->indexs['table_coords']]);
-        }
-
-        if (mb_stripos($sql, "relation") !== false) {
-            unset($this->values[$this->indexs['relation']]);
-        }
-
-        if (mb_stripos($sql, "pdf_pages") !== false) {
-            unset($GLOBALS [$this->indexs['pdf_pages']]);
-        }
-
-        if (mb_stripos($sql, "bookmark") !== false) {
-            unset($GLOBALS [$this->indexs['bookmark']]);
-        }
-        return true;
-    }
-
-    /**
-     * runs a query and returns the result
-     *
-     * @param string   $query               query to run
-     * @param resource $link                mysql link resource
-     * @param integer  $options             query options
-     * @param bool     $cache_affected_rows whether to cache affected row
-     *
-     * @return mixed
-     */
-    public function tryQuery(
-        $query, $link = null, $options = 0, $cache_affected_rows = true
-    ) {
-        return true;
-    }
-
-    /**
-     * selects given database
-     *
-     * @param string $dbname database name to select
-     * @param object $link   connection object
-     *
-     * @return boolean
-     */
-    public function selectDb($dbname, $link = null)
-    {
-        return true;
-    }
-
-    /**
-     * Frees memory associated with the result
-     *
-     * @param object $result database result
-     *
-     * @return bool
-     */
-    public function freeResult($result)
-    {
-        return true;
-    }
-
-    /**
-     * returns only the first row from the result
-     *
-     * <code>
-     * $sql = 'SELECT * FROM `user` WHERE `id` = 123';
-     * $user = $GLOBALS['dbi']->fetchSingleRow($sql);
-     * // produces
-     * // $user = array('id' => 123, 'name' => 'John Doe')
-     * </code>
-     *
-     * @param string|mysql_result $result query or mysql result
-     * @param string              $type   NUM|ASSOC|BOTH
-     *                                    returned array should either numeric
-     *                                    associative or booth
-     * @param resource            $link   mysql link
-     *
-     * @return array|boolean first row from result
-     *                       or false if result is empty
-     */
-    public function fetchSingleRow($result, $type = 'ASSOC', $link = null)
-    {
-        return array(
-            'display_field' => "PMA_display_field"
-        );
-    }
-
-    /**
-     * returns array of rows with associative keys from $result
-     *
-     * @param object $result result set identifier
-     *
-     * @return array
-     */
-    public function fetchAssoc($result)
-    {
-        $assocResult = array();
-        if ($this->assocIndex < $this->totalNum) {
-            $assocResult['db_name'] = "db_name" . $this->assocIndex;
-            $assocResult['comment'] = "comment" . $this->assocIndex;
-            $this->assocIndex++;
-            return $assocResult;
-        }
-
-        $this->assocIndex = 0;
-        return false;
-    }
-
-    /**
-     * returns the number of rows returned by last query
-     *
-     * @param object $result result set identifier
-     *
-     * @return string|int
-     */
-    public function numRows($result)
-    {
-        return $this->totalNum;
-    }
-}
diff --git a/#pma/test/libraries/PMA_relation_test.php b/#pma/test/libraries/PMA_relation_test.php
deleted file mode 100644
index 33e3f96a..00000000
--- a/#pma/test/libraries/PMA_relation_test.php
+++ /dev/null
@@ -1,334 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for relation.lib.php
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-use PMA\libraries\Theme;
-
-
-
-require_once 'libraries/database_interface.inc.php';
-
-require_once 'libraries/relation.lib.php';
-
-/**
- * Tests for libraries/relation.lib.php
- *
- * @package PhpMyAdmin-test
- * @group medium
- */
-class PMA_Relation_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    public function setUp()
-    {
-        $GLOBALS['server'] = 1;
-        $GLOBALS['db'] = 'db';
-        $GLOBALS['cfg']['Server']['user'] = 'root';
-        $GLOBALS['cfg']['Server']['pmadb'] = 'phpmyadmin';
-        $GLOBALS['cfg']['ZeroConf'] = true;
-        $_SESSION['relation'][$GLOBALS['server']] = "PMA_relation";
-        $_SESSION['PMA_Theme'] = new Theme();
-        $_SESSION['relation'] = array();
-
-        $GLOBALS['pmaThemePath'] = $_SESSION['PMA_Theme']->getPath();
-        $GLOBALS['pmaThemeImage'] = 'theme/';
-        $GLOBALS['cfg']['ServerDefault'] = 0;
-
-        include_once 'libraries/relation.lib.php';
-    }
-
-    /**
-     * Test for PMA_queryAsControlUser
-     *
-     * @return void
-     */
-    public function testPMAQueryAsControlUser()
-    {
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->once())
-            ->method('query')
-            ->will($this->returnValue('executeResult1'));
-
-        $dbi->expects($this->once())
-            ->method('tryQuery')
-            ->will($this->returnValue('executeResult2'));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $sql = "insert into PMA_bookmark A,B values(1, 2)";
-        $this->assertEquals(
-            'executeResult1',
-            PMA_queryAsControlUser($sql)
-        );
-        $this->assertEquals(
-            'executeResult2',
-            PMA_queryAsControlUser($sql, false)
-        );
-    }
-
-    /**
-     * Test for PMA_getRelationsParam & PMA_getRelationsParamDiagnostic
-     *
-     * @return void
-     */
-    public function testPMAGetRelationsParam()
-    {
-        $relationsPara = PMA_getRelationsParam();
-        $this->assertEquals(
-            false,
-            $relationsPara['relwork']
-        );
-        $this->assertEquals(
-            false,
-            $relationsPara['bookmarkwork']
-        );
-        $this->assertEquals(
-            'root',
-            $relationsPara['user']
-        );
-        $this->assertEquals(
-            'phpmyadmin',
-            $relationsPara['db']
-        );
-
-        $retval = PMA_getRelationsParamDiagnostic($relationsPara);
-        //check $cfg['Servers'][$i]['pmadb']
-        $this->assertContains(
-            "\$cfg['Servers'][\$i]['pmadb']",
-            $retval
-        );
-        $this->assertContains(
-            '<strong>OK</strong>',
-            $retval
-        );
-
-        //$cfg['Servers'][$i]['relation']
-        $result = "\$cfg['Servers'][\$i]['pmadb']  ... </th><td class=\"right\">"
-            . "<span style=\"color:green\"><strong>OK</strong></span>";
-        $this->assertContains(
-            $result,
-            $retval
-        );
-        // $cfg['Servers'][$i]['relation']
-        $result = "\$cfg['Servers'][\$i]['relation']  ... </th><td class=\"right\">"
-            . "<span style=\"color:red\"><strong>not OK</strong></span>";
-        $this->assertContains(
-            $result,
-            $retval
-        );
-        // General relation features
-        $result = 'General relation features: <span style="color:red">Disabled</span>';
-        $this->assertContains(
-            $result,
-            $retval
-        );
-        // $cfg['Servers'][$i]['table_info']
-        $result = "\$cfg['Servers'][\$i]['table_info']  ... </th>"
-            . "<td class=\"right\">"
-            . "<span style=\"color:red\"><strong>not OK</strong></span>";
-        $this->assertContains(
-            $result,
-            $retval
-        );
-        // Display Features:
-        $result = 'Display Features: <span style="color:red">Disabled</span>';
-        $this->assertContains(
-            $result,
-            $retval
-        );
-
-        $relationsPara['db'] = false;
-        $retval = PMA_getRelationsParamDiagnostic($relationsPara);
-
-        $result = __('General relation features');
-        $this->assertContains(
-            $result,
-            $retval
-        );
-        $result = 'Configuration of pmadb… ';
-        $this->assertContains(
-            $result,
-            $retval
-        );
-        $result = "<strong>not OK</strong>";
-        $this->assertContains(
-            $result,
-            $retval
-        );
-    }
-
-    /**
-     * Test for PMA_getDisplayField
-     *
-     * @return void
-     */
-    public function testPMAGetDisplayField()
-    {
-        $db = 'information_schema';
-        $table = 'CHARACTER_SETS';
-        $this->assertEquals(
-            'DESCRIPTION',
-            PMA_getDisplayField($db, $table)
-        );
-
-        $db = 'information_schema';
-        $table = 'TABLES';
-        $this->assertEquals(
-            'TABLE_COMMENT',
-            PMA_getDisplayField($db, $table)
-        );
-
-        $db = 'information_schema';
-        $table = 'PMA';
-        $this->assertEquals(
-            false,
-            PMA_getDisplayField($db, $table)
-        );
-
-    }
-
-    /**
-     * Test for PMA_getComments
-     *
-     * @return void
-     */
-    public function testPMAGetComments()
-    {
-        $GLOBALS['cfg']['ServerDefault'] = 0;
-        $_SESSION['relation'] = array();
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $getColumnsResult = array(
-                array(
-                        'Field' => 'field1',
-                        'Type' => 'int(11)',
-                        'Comment' => 'Comment1'
-                ),
-                array(
-                        'Field' => 'field2',
-                        'Type' => 'text',
-                        'Comment' => 'Comment1'
-                )
-        );
-        $dbi->expects($this->any())->method('getColumns')
-            ->will($this->returnValue($getColumnsResult));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $db = 'information_schema';
-        $this->assertEquals(
-            array(''),
-            PMA_getComments($db)
-        );
-
-        $db = 'information_schema';
-        $table = 'TABLES';
-        $this->assertEquals(
-            array(
-                'field1' => 'Comment1',
-                'field2' => 'Comment1'
-            ),
-            PMA_getComments($db, $table)
-        );
-    }
-
-    /**
-     * Test for PMA_tryUpgradeTransformations
-     *
-     * @return void
-     */
-    public function testPMATryUpgradeTransformations()
-    {
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $dbi->expects($this->any())
-            ->method('tryQuery')
-            ->will($this->returnValue(true));
-        $dbi->expects($this->any())
-            ->method('numRows')
-            ->will($this->returnValue(0));
-        $dbi->expects($this->any())
-            ->method('getError')
-            ->will($this->onConsecutiveCalls(true, false));
-        $GLOBALS['dbi'] = $dbi;
-
-        $GLOBALS['cfg']['Server']['pmadb'] = 'pmadb';
-        $GLOBALS['cfg']['Server']['column_info'] = 'column_info';
-
-        // Case 1
-        $actual = PMA_tryUpgradeTransformations();
-        $this->assertEquals(
-            false,
-            $actual
-        );
-
-        // Case 2
-        $actual = PMA_tryUpgradeTransformations();
-        $this->assertEquals(
-            true,
-            $actual
-        );
-    }
-
-    /**
-     * Test for PMA_searchColumnInForeigners
-     *
-     * @return void
-     */
-    public function testPMASearchColumnInForeigners()
-    {
-        $foreigners = array(
-            'value' => array(
-                  'master_field' => 'value',
-                  'foreign_db' => 'GSoC14',
-                  'foreign_table' => 'test',
-                  'foreign_field' => 'value'
-            ),
-            'foreign_keys_data' => array(
-                0 => array(
-                    'constraint' => 'ad',
-                    'index_list' => array('id', 'value'),
-                    'ref_db_name' => 'GSoC14',
-                    'ref_table_name' => 'table_1',
-                    'ref_index_list' => array('id', 'value'),
-                    'on_delete' => 'CASCADE',
-                    'on_update' => 'CASCADE'
-                )
-            )
-        );
-
-        $foreigner = PMA_searchColumnInForeigners($foreigners, 'id');
-        $expected = array();
-        $expected['foreign_field'] = 'id';
-        $expected['foreign_db'] = 'GSoC14';
-        $expected['foreign_table'] = 'table_1';
-        $expected['constraint'] = 'ad';
-        $expected['on_delete'] = 'CASCADE';
-        $expected['on_update'] = 'CASCADE';
-
-        $this->assertEquals(
-            $expected,
-            $foreigner
-        );
-    }
-}
diff --git a/#pma/test/libraries/PMA_resultSetHasJustOneTable_test.php b/#pma/test/libraries/PMA_resultSetHasJustOneTable_test.php
deleted file mode 100644
index 41397d18..00000000
--- a/#pma/test/libraries/PMA_resultSetHasJustOneTable_test.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Tests for PMA_resultSetHasJustOneTable method
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-require_once 'libraries/sql.lib.php';
-
-/**
- * Tests for PMA_resultSetHasJustOneTable method
- *
- * @package PhpMyAdmin-test
- */
-class PMA_ResultSetHasJustOneTableTest extends PHPUnit_Framework_TestCase
-{
-
-    /**
-     * Should return false if all columns are not from the same table
-     *
-     * @return void
-     */
-    public function testWithMultipleTables()
-    {
-        $col1 = new stdClass;
-        $col1->table = 'table1';
-        $col2 = new stdClass;
-        $col2->table = 'table1';
-        $col3 = new stdClass;
-        $col3->table = 'table3';
-
-        $fields_meta = array($col1, $col2, $col3);
-        $this->assertFalse(PMA_resultSetHasJustOneTable($fields_meta));
-
-        // should not matter on where the odd column occurs
-        $fields_meta = array($col2, $col3, $col1);
-        $this->assertFalse(PMA_resultSetHasJustOneTable($fields_meta));
-
-        $fields_meta = array($col3, $col1, $col2);
-        $this->assertFalse(PMA_resultSetHasJustOneTable($fields_meta));
-    }
-
-    /**
-     * Should return true if all the columns are from the same table
-     *
-     * @return void
-     */
-    public function testWithSameTable()
-    {
-        $col1 = new stdClass;
-        $col1->table = 'table1';
-        $col2 = new stdClass;
-        $col2->table = 'table1';
-        $col3 = new stdClass;
-        $col3->table = 'table1';
-        $fields_meta = array($col1, $col2, $col3);
-
-        $this->assertTrue(PMA_resultSetHasJustOneTable($fields_meta));
-    }
-
-    /**
-     * Should return true even if function columns (table is '') occur when others
-     * are from the same table.
-     *
-     * @return void
-     */
-    public function testWithFunctionColumns()
-    {
-        $col1 = new stdClass;
-        $col1->table = 'table1';
-        $col2 = new stdClass;
-        $col2->table = '';
-        $col3 = new stdClass;
-        $col3->table = 'table1';
-
-        $fields_meta = array($col1, $col2, $col3);
-        $this->assertTrue(PMA_resultSetHasJustOneTable($fields_meta));
-
-        // should not matter on where the function column occurs
-        $fields_meta = array($col2, $col3, $col1);
-        $this->assertTrue(PMA_resultSetHasJustOneTable($fields_meta));
-
-        $fields_meta = array($col3, $col1, $col2);
-        $this->assertTrue(PMA_resultSetHasJustOneTable($fields_meta));
-    }
-
-    /**
-     * We can not say all the columns are from the same table if all the columns
-     * are funtion columns (table is '')
-     *
-     * @return void
-     */
-    public function testWithOnlyFunctionColumns()
-    {
-        $col1 = new stdClass;
-        $col1->table = '';
-        $col2 = new stdClass;
-        $col2->table = '';
-        $col3 = new stdClass;
-        $col3->table = '';
-        $fields_meta = array($col1, $col2, $col3);
-
-        $this->assertFalse(PMA_resultSetHasJustOneTable($fields_meta));
-    }
-}
diff --git a/#pma/test/libraries/PMA_sanitize_test.php b/#pma/test/libraries/PMA_sanitize_test.php
deleted file mode 100644
index c5a5375b..00000000
--- a/#pma/test/libraries/PMA_sanitize_test.php
+++ /dev/null
@@ -1,181 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for PMA_sanitize()
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test
- */
-require_once 'libraries/sanitizing.lib.php';
-require_once 'libraries/url_generating.lib.php';
-
-
-/**
- * tests for PMA_sanitize()
- *
- * @package PhpMyAdmin-test
- */
-class PMA_Sanitize_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Setup various pre conditions
-     *
-     * @return void
-     */
-    function setUp()
-    {
-    }
-
-    /**
-     * Tests for proper escaping of XSS.
-     *
-     * @return void
-     */
-    public function testXssInHref()
-    {
-        $this->assertEquals(
-            '[a@javascript:alert(\'XSS\');@target]link</a>',
-            PMA_sanitize('[a@javascript:alert(\'XSS\');@target]link[/a]')
-        );
-    }
-
-    /**
-     * Tests correct generating of link redirector.
-     *
-     * @return void
-     */
-    public function testLink()
-    {
-        unset($GLOBALS['server']);
-        unset($GLOBALS['lang']);
-        unset($GLOBALS['collation_connection']);
-        $this->assertEquals(
-            '<a href="./url.php?url=https%3A%2F%2Fwww.phpmyadmin.net%2F" target="target">link</a>',
-            PMA_sanitize('[a@https://www.phpmyadmin.net/@target]link[/a]')
-        );
-    }
-
-    /**
-     * Tests links to documentation.
-     *
-     * @return void
-     *
-     * @dataProvider docLinks
-     */
-    public function testDoc($link, $expected)
-    {
-        $this->assertEquals(
-            '<a href="./url.php?url=https%3A%2F%2Fdocs.phpmyadmin.net%2Fen%2Flatest%2F' . $expected . '" target="documentation">doclink</a>',
-            PMA_sanitize('[doc@' . $link . ']doclink[/doc]')
-        );
-    }
-
-    /**
-     * Data provider for sanitize [doc@foo] markup
-     *
-     * @return array
-     */
-    public function docLinks()
-    {
-        return array(
-            array('foo', 'setup.html%23foo'),
-            array('cfg_TitleTable', 'config.html%23cfg_TitleTable'),
-            array('faq3-11', 'faq.html%23faq3-11'),
-            array('bookmarks@', 'bookmarks.html'),
-        );
-    }
-
-    /**
-     * Tests link target validation.
-     *
-     * @return void
-     */
-    public function testInvalidTarget()
-    {
-        $this->assertEquals(
-            '[a@./Documentation.html@INVALID9]doc</a>',
-            PMA_sanitize('[a@./Documentation.html@INVALID9]doc[/a]')
-        );
-    }
-
-    /**
-     * Tests XSS escaping after valid link.
-     *
-     * @return void
-     */
-    public function testLinkDocXss()
-    {
-        $this->assertEquals(
-            '[a@./Documentation.html" onmouseover="alert(foo)"]doc</a>',
-            PMA_sanitize('[a@./Documentation.html" onmouseover="alert(foo)"]doc[/a]')
-        );
-    }
-
-    /**
-     * Tests proper handling of multi link code.
-     *
-     * @return void
-     */
-    public function testLinkAndXssInHref()
-    {
-        $this->assertEquals(
-            '<a href="./url.php?url=https%3A%2F%2Fdocs.phpmyadmin.net%2F">doc</a>[a@javascript:alert(\'XSS\');@target]link</a>',
-            PMA_sanitize('[a@https://docs.phpmyadmin.net/]doc[/a][a@javascript:alert(\'XSS\');@target]link[/a]')
-        );
-    }
-
-    /**
-     * Test escaping of HTML tags
-     *
-     * @return void
-     */
-    public function testHtmlTags()
-    {
-        $this->assertEquals(
-            '&lt;div onclick=""&gt;',
-            PMA_sanitize('<div onclick="">')
-        );
-    }
-
-    /**
-     * Tests basic BB code.
-     *
-     * @return void
-     */
-    public function testBBCode()
-    {
-        $this->assertEquals(
-            '<strong>strong</strong>',
-            PMA_sanitize('[strong]strong[/strong]')
-        );
-    }
-
-    /**
-     * Tests output escaping.
-     *
-     * @return void
-     */
-    public function testEscape()
-    {
-        $this->assertEquals(
-            '&lt;strong&gt;strong&lt;/strong&gt;',
-            PMA_sanitize('[strong]strong[/strong]', true)
-        );
-    }
-
-    /**
-     * Test for PMA_sanitizeFilename
-     *
-     * @return void
-     */
-    public function testSanitizeFilename()
-    {
-        $this->assertEquals(
-            'File_name_123',
-            PMA_sanitizeFilename('File_name 123')
-        );
-    }
-}
diff --git a/#pma/test/libraries/PMA_select_server_test.php b/#pma/test/libraries/PMA_select_server_test.php
deleted file mode 100644
index f1806470..00000000
--- a/#pma/test/libraries/PMA_select_server_test.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for select_server.lib.php
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-use PMA\libraries\Theme;
-
-
-require_once 'libraries/url_generating.lib.php';
-require_once 'libraries/select_server.lib.php';
-
-require_once 'libraries/database_interface.inc.php';
-
-require_once 'libraries/sanitizing.lib.php';
-require_once 'libraries/js_escape.lib.php';
-
-/**
- * PMA_SelectServer_Test class
- *
- * this class is for testing select_server.lib.php functions
- *
- * @package PhpMyAdmin-test
- */
-class PMA_SelectServer_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Prepares environment for the test.
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        //$_REQUEST
-        $_REQUEST['log'] = "index1";
-        $_REQUEST['pos'] = 3;
-
-        //$GLOBALS
-        $GLOBALS['cfg']['MaxRows'] = 10;
-        $GLOBALS['server'] = 1;
-        $GLOBALS['cfg']['ServerDefault'] = "server";
-        $GLOBALS['cfg']['RememberSorting'] = true;
-        $GLOBALS['cfg']['SQP'] = array();
-        $GLOBALS['cfg']['MaxCharactersInDisplayedSQL'] = 1000;
-        $GLOBALS['cfg']['ShowSQL'] = true;
-        $GLOBALS['cfg']['TableNavigationLinksMode'] = 'icons';
-        $GLOBALS['cfg']['LimitChars'] = 100;
-
-        $GLOBALS['table'] = "table";
-        $GLOBALS['pmaThemeImage'] = 'image';
-
-        //$_SESSION
-        $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
-        $_SESSION['PMA_Theme'] = new Theme();
-    }
-
-    /**
-     * Test for PMA_selectServer
-     *
-     * @return void
-     */
-    public function testPMASelectServer()
-    {
-        $not_only_options = false;
-        $omit_fieldset = false;
-
-        $GLOBALS['cfg']['DefaultTabServer'] = "welcome";
-
-        $GLOBALS['cfg']['Servers'] = array(
-            '0' => array(
-                'host'=>'host0',
-                'port'=>'port0',
-                'only_db'=>'only_db0',
-                'user'=>'user0',
-                'auth_type'=>'config',
-            ),
-            '1' => array(
-                'host'=>'host1',
-                'port'=>'port1',
-                'only_db'=>'only_db1',
-                'user'=>'user1',
-                'auth_type'=>'config',
-            ),
-        );
-
-        //$not_only_options=false & $omit_fieldset=false
-        $html = PMA_selectServer($not_only_options, $omit_fieldset);
-        $server = $GLOBALS['cfg']['Servers']['0'];
-
-        //server items
-        $this->assertContains(
-            $server['host'],
-            $html
-        );
-        $this->assertContains(
-            $server['port'],
-            $html
-        );
-        $this->assertContains(
-            $server['only_db'],
-            $html
-        );
-        $this->assertContains(
-            $server['user'],
-            $html
-        );
-
-        $not_only_options = true;
-        $omit_fieldset = true;
-        $GLOBALS['cfg']['DisplayServersList'] = null;
-
-        //$not_only_options=true & $omit_fieldset=true
-        $html = PMA_selectServer($not_only_options, $omit_fieldset);
-
-        //$GLOBALS['cfg']['DefaultTabServer']
-        $this->assertContains(
-            PMA\libraries\Util::getScriptNameForOption(
-                $GLOBALS['cfg']['DefaultTabServer'], 'server'
-            ),
-            $html
-        );
-
-        //labels
-        $this->assertContains(
-            __('Current server:'),
-            $html
-        );
-        $this->assertContains(
-            '(' . __('Servers') . ')',
-            $html
-        );
-
-        //server items
-        $server = $GLOBALS['cfg']['Servers']['0'];
-        $this->assertContains(
-            $server['host'],
-            $html
-        );
-        $this->assertContains(
-            $server['port'],
-            $html
-        );
-        $this->assertContains(
-            $server['only_db'],
-            $html
-        );
-        $this->assertContains(
-            $server['user'],
-            $html
-        );
-    }
-}
diff --git a/#pma/test/libraries/PMA_server_common_test.php b/#pma/test/libraries/PMA_server_common_test.php
deleted file mode 100644
index 6a6dede2..00000000
--- a/#pma/test/libraries/PMA_server_common_test.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for server_common.lib.php
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-use PMA\libraries\Theme;
-
-
-require_once 'libraries/url_generating.lib.php';
-require_once 'libraries/server_common.lib.php';
-
-
-/**
- * PMA_ServerCommon_Test class
- *
- * this class is for testing server_common.lib.php functions
- *
- * @package PhpMyAdmin-test
- */
-class PMA_ServerCommon_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Prepares environment for the test.
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
-    }
-
-    /**
-     * Test for PMA_getHtmlForSubPageHeader
-     *
-     * @return void
-     */
-    public function testPMAGetSubPageHeader()
-    {
-        //server_engines
-        $html = PMA_getHtmlForSubPageHeader("engines");
-        $this->assertContains(
-            '<img src="themes/dot.gif" title="" alt="" class="icon ic_b_engine" />',
-            $html
-        );
-        $this->assertContains(
-            'Storage Engines',
-            $html
-        );
-
-        //server_databases
-        $html = PMA_getHtmlForSubPageHeader("databases");
-        $this->assertContains(
-            '<img src="themes/dot.gif" title="" alt="" class="icon ic_s_db" />',
-            $html
-        );
-        $this->assertContains(
-            'Databases',
-            $html
-        );
-
-        //server_replication
-        $html = PMA_getHtmlForSubPageHeader("replication");
-        $replication_img = '<img src="themes/dot.gif" title="" '
-            . 'alt="" class="icon ic_s_replication" />';
-        $this->assertContains(
-            $replication_img,
-            $html
-        );
-        $this->assertContains(
-            'Replication',
-            $html
-        );
-    }
-
-}
diff --git a/#pma/test/libraries/PMA_server_privileges_test.php b/#pma/test/libraries/PMA_server_privileges_test.php
deleted file mode 100644
index d7cb9af3..00000000
--- a/#pma/test/libraries/PMA_server_privileges_test.php
+++ /dev/null
@@ -1,2365 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for server_privileges.lib.php
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-use PMA\libraries\Theme;
-
-
-require_once 'libraries/url_generating.lib.php';
-
-require_once 'libraries/database_interface.inc.php';
-
-require_once 'libraries/sanitizing.lib.php';
-require_once 'libraries/js_escape.lib.php';
-
-
-require_once 'libraries/relation.lib.php';
-require_once 'libraries/relation_cleanup.lib.php';
-require_once 'libraries/server_privileges.lib.php';
-
-/**
- * PMA_ServerPrivileges_Test class
- *
- * this class is for testing server_privileges.lib.php functions
- *
- * @package PhpMyAdmin-test
- */
-class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Prepares environment for the test.
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        //Constants
-        if (!defined("PMA_USR_BROWSER_AGENT")) {
-            define("PMA_USR_BROWSER_AGENT", "other");
-        }
-        if (!defined("PMA_MYSQL_VERSION_COMMENT")) {
-            define("PMA_MYSQL_VERSION_COMMENT", "MySQL");
-        }
-
-        //$_REQUEST
-        $_REQUEST['log'] = "index1";
-        $_REQUEST['pos'] = 3;
-
-        //$GLOBALS
-        $GLOBALS['lang'] = 'en';
-        $GLOBALS['cfg']['MaxRows'] = 10;
-        $GLOBALS['cfg']['SendErrorReports'] = "never";
-        $GLOBALS['cfg']['ServerDefault'] = "server";
-        $GLOBALS['cfg']['RememberSorting'] = true;
-        $GLOBALS['cfg']['SQP'] = array();
-        $GLOBALS['cfg']['MaxCharactersInDisplayedSQL'] = 1000;
-        $GLOBALS['cfg']['ShowSQL'] = true;
-        $GLOBALS['cfg']['TableNavigationLinksMode'] = 'icons';
-        $GLOBALS['cfg']['LimitChars'] = 100;
-        $GLOBALS['cfg']['AllowThirdPartyFraming'] = false;
-        $GLOBALS['cfg']['ActionLinksMode'] = "both";
-        $GLOBALS['cfg']['DefaultTabDatabase'] = 'structure';
-        $GLOBALS['cfg']['DefaultTabTable'] = "structure";
-        $GLOBALS['cfg']['NavigationTreeDefaultTabTable'] = "structure";
-        $GLOBALS['cfg']['NavigationTreeDefaultTabTable2'] = "";
-        $GLOBALS['cfg']['Confirm'] = "Confirm";
-        $GLOBALS['cfg']['ShowHint'] = true;
-        $GLOBALS['cfg']['ShowDatabasesNavigationAsTree'] = true;
-        $GLOBALS['cfg']['LoginCookieValidity'] = 1440;
-
-        $GLOBALS['cfgRelation'] = array();
-        $GLOBALS['cfgRelation']['menuswork'] = false;
-        $GLOBALS['table'] = "table";
-        $GLOBALS['PMA_PHP_SELF'] = PMA_getenv('PHP_SELF');
-        $GLOBALS['pmaThemeImage'] = 'image';
-        $GLOBALS['server'] = 1;
-        $GLOBALS['hostname'] = "hostname";
-        $GLOBALS['username'] = "username";
-        $GLOBALS['collation_connection'] = "collation_connection";
-        $GLOBALS['text_dir'] = "text_dir";
-        $GLOBALS['is_reload_priv'] = true;
-
-        //$_POST
-        $_POST['pred_password'] = 'none';
-        //$_SESSION
-        $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
-        $_SESSION['PMA_Theme'] = new Theme();
-        $_SESSION['relation'][$GLOBALS['server']] = array(
-            'PMA_VERSION' => PMA_VERSION,
-            'db' => 'pmadb',
-            'users' => 'users',
-            'usergroups' => 'usergroups',
-            'menuswork' => true
-        );
-
-        $pmaconfig = $this->getMockBuilder('PMA\libraries\Config')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $GLOBALS['PMA_Config'] = $pmaconfig;
-
-        //Mock DBI
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->any())
-            ->method('fetchResult')
-            ->will(
-                $this->returnValue(
-                    array(
-                        'grant user1 select',
-                        'grant user2 delete'
-                    )
-                )
-            );
-
-        $fetchSingleRow = array(
-            'password' => 'pma_password',
-            'Table_priv' => 'pri1, pri2',
-            'Type' => 'Type',
-            '@@old_passwords' => 0,
-        );
-        $dbi->expects($this->any())->method('fetchSingleRow')
-            ->will($this->returnValue($fetchSingleRow));
-
-        $fetchValue = array('key1' => 'value1');
-        $dbi->expects($this->any())->method('fetchValue')
-            ->will($this->returnValue($fetchValue));
-
-        $dbi->expects($this->any())->method('tryQuery')
-            ->will($this->returnValue(true));
-
-        $dbi->expects($this->any())->method('escapeString')
-            ->will($this->returnArgument(0));
-
-        $GLOBALS['dbi'] = $dbi;
-        $GLOBALS['is_superuser'] = true;
-        $GLOBALS['is_grantuser'] = true;
-        $GLOBALS['is_createuser'] = true;
-        $GLOBALS['is_reload_priv'] = true;
-    }
-
-    /**
-     * Test for PMA_getDataForDBInfo
-     *
-     * @return void
-     */
-    public function testPMAGetDataForDBInfo()
-    {
-        $_REQUEST['username'] = "PMA_username";
-        $_REQUEST['hostname'] = "PMA_hostname";
-        $_REQUEST['tablename'] = "PMA_tablename";
-        $_REQUEST['dbname'] = "PMA_dbname";
-        list(
-            $username, $hostname, $dbname, $tablename, $routinename,
-            $db_and_table, $dbname_is_wildcard
-        ) = PMA_getDataForDBInfo();
-        $this->assertEquals(
-            "PMA_username",
-            $username
-        );
-        $this->assertEquals(
-            "PMA_hostname",
-            $hostname
-        );
-        $this->assertEquals(
-            "PMA_dbname",
-            $dbname
-        );
-        $this->assertEquals(
-            "PMA_tablename",
-            $tablename
-        );
-        $this->assertEquals(
-            "`PMA_dbname`.`PMA_tablename`",
-            $db_and_table
-        );
-        $this->assertEquals(
-            true,
-            $dbname_is_wildcard
-        );
-
-        //pre variable have been defined
-        $_REQUEST['pred_tablename'] = "PMA_pred__tablename";
-        $_REQUEST['pred_dbname'] = array("PMA_pred_dbname");
-        list(
-            ,, $dbname, $tablename, $routinename,
-            $db_and_table, $dbname_is_wildcard
-        ) = PMA_getDataForDBInfo();
-        $this->assertEquals(
-            "PMA_pred_dbname",
-            $dbname
-        );
-        $this->assertEquals(
-            "PMA_pred__tablename",
-            $tablename
-        );
-        $this->assertEquals(
-            "`PMA_pred_dbname`.`PMA_pred__tablename`",
-            $db_and_table
-        );
-        $this->assertEquals(
-            true,
-            $dbname_is_wildcard
-        );
-
-    }
-
-    /**
-     * Test for PMA_wildcardEscapeForGrant
-     *
-     * @return void
-     */
-    public function testPMAWildcardEscapeForGrant()
-    {
-        $dbname = '';
-        $tablename = '';
-        $db_and_table = PMA_wildcardEscapeForGrant($dbname, $tablename);
-        $this->assertEquals(
-            '*.*',
-            $db_and_table
-        );
-
-        $dbname = 'dbname';
-        $tablename = '';
-        $db_and_table = PMA_wildcardEscapeForGrant($dbname, $tablename);
-        $this->assertEquals(
-            '`dbname`.*',
-            $db_and_table
-        );
-
-        $dbname = 'dbname';
-        $tablename = 'tablename';
-        $db_and_table = PMA_wildcardEscapeForGrant($dbname, $tablename);
-        $this->assertEquals(
-            '`dbname`.`tablename`',
-            $db_and_table
-        );
-    }
-
-    /**
-     * Test for PMA_rangeOfUsers
-     *
-     * @return void
-     */
-    public function testPMARangeOfUsers()
-    {
-        $ret = PMA_rangeOfUsers("INIT");
-        $this->assertEquals(
-            " WHERE `User` LIKE 'INIT%' OR `User` LIKE 'init%'",
-            $ret
-        );
-
-        $ret = PMA_rangeOfUsers();
-        $this->assertEquals(
-            '',
-            $ret
-        );
-    }
-
-    /**
-     * Test for PMA_getTableGrantsArray
-     *
-     * @return void
-     */
-    public function testPMAGetTableGrantsArray()
-    {
-        $GLOBALS['strPrivDescDelete'] = "strPrivDescDelete";
-        $GLOBALS['strPrivDescCreateTbl'] = "strPrivDescCreateTbl";
-        $GLOBALS['strPrivDescDropTbl'] = "strPrivDescDropTbl";
-        $GLOBALS['strPrivDescIndex'] = "strPrivDescIndex";
-        $GLOBALS['strPrivDescAlter'] = "strPrivDescAlter";
-        $GLOBALS['strPrivDescCreateView'] = "strPrivDescCreateView";
-        $GLOBALS['strPrivDescShowView'] = "strPrivDescShowView";
-        $GLOBALS['strPrivDescTrigger'] = "strPrivDescTrigger";
-
-        $ret = PMA_getTableGrantsArray();
-        $this->assertEquals(
-            array(
-                'Delete',
-                'DELETE',
-                $GLOBALS['strPrivDescDelete']
-            ),
-            $ret[0]
-        );
-        $this->assertEquals(
-            array(
-                'Create',
-                'CREATE',
-                $GLOBALS['strPrivDescCreateTbl']
-            ),
-            $ret[1]
-        );
-    }
-
-    /**
-     * Test for PMA_getGrantsArray
-     *
-     * @return void
-     */
-    public function testPMAGetGrantsArray()
-    {
-        $ret = PMA_getGrantsArray();
-        $this->assertEquals(
-            array(
-                'Select_priv',
-                'SELECT',
-                __('Allows reading data.')
-            ),
-            $ret[0]
-        );
-        $this->assertEquals(
-            array(
-                'Insert_priv',
-                'INSERT',
-                __('Allows inserting and replacing data.')
-            ),
-            $ret[1]
-        );
-    }
-
-    /**
-     * Test for PMA_getHtmlForColumnPrivileges
-     *
-     * @return void
-     */
-    public function testPMAGetHtmlForColumnPrivileges()
-    {
-        $columns = array(
-            'row1' => 'name1'
-        );
-        $row = array(
-            'name_for_select' => 'Y'
-        );
-        $name_for_select = 'name_for_select';
-        $priv_for_header = 'priv_for_header';
-        $name = 'name';
-        $name_for_dfn = 'name_for_dfn';
-        $name_for_current = 'name_for_current';
-
-        $html = PMA_getHtmlForColumnPrivileges(
-            $columns, $row, $name_for_select,
-            $priv_for_header, $name, $name_for_dfn, $name_for_current
-        );
-        //$name
-        $this->assertContains(
-            $name,
-            $html
-        );
-        //$name_for_dfn
-        $this->assertContains(
-            $name_for_dfn,
-            $html
-        );
-        //$priv_for_header
-        $this->assertContains(
-            $priv_for_header,
-            $html
-        );
-        //$name_for_select
-        $this->assertContains(
-            $name_for_select,
-            $html
-        );
-        //$columns and $row
-        $this->assertContains(
-            htmlspecialchars('row1'),
-            $html
-        );
-        //$columns and $row
-        $this->assertContains(
-            _pgettext('None privileges', 'None'),
-            $html
-        );
-
-    }
-
-    /**
-     * Test for PMA_getHtmlForUserGroupDialog
-     *
-     * @return void
-     */
-    public function testPMAGetHtmlForUserGroupDialog()
-    {
-        $username = "pma_username";
-        $is_menuswork = true;
-        $_REQUEST['edit_user_group_dialog'] = "edit_user_group_dialog";
-        $GLOBALS['is_ajax_request'] = false;
-
-        //PMA_getHtmlForUserGroupDialog
-        $html = PMA_getHtmlForUserGroupDialog($username, $is_menuswork);
-        $this->assertContains(
-            '<form class="ajax" id="changeUserGroupForm"',
-            $html
-        );
-        //PMA_URL_getHiddenInputs
-        $params = array('username' => $username);
-        $html_output = PMA_URL_getHiddenInputs($params);
-        $this->assertContains(
-            $html_output,
-            $html
-        );
-        //__('User group')
-        $this->assertContains(
-            __('User group'),
-            $html
-        );
-    }
-
-    /**
-     * Test for PMA_getHtmlToChooseUserGroup
-     *
-     * @return void
-     */
-    public function testPMAGetHtmlToChooseUserGroup()
-    {
-        $username = "pma_username";
-
-        //PMA_getHtmlToChooseUserGroup
-        $html = PMA_getHtmlToChooseUserGroup($username);
-        $this->assertContains(
-            '<form class="ajax" id="changeUserGroupForm"',
-            $html
-        );
-        //PMA_URL_getHiddenInputs
-        $params = array('username' => $username);
-        $html_output = PMA_URL_getHiddenInputs($params);
-        $this->assertContains(
-            $html_output,
-            $html
-        );
-        //__('User group')
-        $this->assertContains(
-            __('User group'),
-            $html
-        );
-    }
-
-    /**
-     * Test for PMA_getHtmlForResourceLimits
-     *
-     * @return void
-     */
-    public function testPMAGetHtmlForResourceLimits()
-    {
-        $row = array(
-            'max_questions' => 'max_questions',
-            'max_updates' => 'max_updates',
-            'max_connections' => 'max_connections',
-            'max_user_connections' => 'max_user_connections',
-        );
-
-        //PMA_getHtmlForResourceLimits
-        $html = PMA_getHtmlForResourceLimits($row);
-        $this->assertContains(
-            '<legend>' . __('Resource limits') . '</legend>',
-            $html
-        );
-        $this->assertContains(
-            __('Note: Setting these options to 0 (zero) removes the limit.'),
-            $html
-        );
-        $this->assertContains(
-            'MAX QUERIES PER HOUR',
-            $html
-        );
-        $this->assertContains(
-            $row['max_connections'],
-            $html
-        );
-        $this->assertContains(
-            $row['max_updates'],
-            $html
-        );
-        $this->assertContains(
-            $row['max_connections'],
-            $html
-        );
-        $this->assertContains(
-            $row['max_user_connections'],
-            $html
-        );
-        $this->assertContains(
-            __('Limits the number of simultaneous connections the user may have.'),
-            $html
-        );
-        $this->assertContains(
-            __('Limits the number of simultaneous connections the user may have.'),
-            $html
-        );
-    }
-
-    /**
-     * Test for PMA_getSqlQueryForDisplayPrivTable
-     *
-     * @return void
-     */
-    public function testPMAGetSqlQueryForDisplayPrivTable()
-    {
-        $username = "pma_username";
-        $db = '*';
-        $table = "pma_table";
-        $hostname = "pma_hostname";
-
-        //$db == '*'
-        $ret = PMA_getSqlQueryForDisplayPrivTable(
-            $db, $table, $username, $hostname
-        );
-        $sql = "SELECT * FROM `mysql`.`user`"
-            . " WHERE `User` = '" . $GLOBALS['dbi']->escapeString($username) . "'"
-            . " AND `Host` = '" . $GLOBALS['dbi']->escapeString($hostname) . "';";
-        $this->assertEquals(
-            $sql,
-            $ret
-        );
-
-        //$table == '*'
-        $db = "pma_db";
-        $table = "*";
-        $ret = PMA_getSqlQueryForDisplayPrivTable(
-            $db, $table, $username, $hostname
-        );
-        $sql = "SELECT * FROM `mysql`.`db`"
-            . " WHERE `User` = '" . $GLOBALS['dbi']->escapeString($username) . "'"
-            . " AND `Host` = '" . $GLOBALS['dbi']->escapeString($hostname) . "'"
-            . " AND '" . PMA\libraries\Util::unescapeMysqlWildcards($db) . "'"
-            . " LIKE `Db`;";
-        $this->assertEquals(
-            $sql,
-            $ret
-        );
-
-        //$table == 'pma_table'
-        $db = "pma_db";
-        $table = "pma_table";
-        $ret = PMA_getSqlQueryForDisplayPrivTable(
-            $db, $table, $username, $hostname
-        );
-        $sql = "SELECT `Table_priv`"
-            . " FROM `mysql`.`tables_priv`"
-            . " WHERE `User` = '" . $GLOBALS['dbi']->escapeString($username) . "'"
-            . " AND `Host` = '" . $GLOBALS['dbi']->escapeString($hostname) . "'"
-            . " AND `Db` = '" . PMA\libraries\Util::unescapeMysqlWildcards($db) . "'"
-            . " AND `Table_name` = '" . $GLOBALS['dbi']->escapeString($table) . "';";
-        $this->assertEquals(
-            $sql,
-            $ret
-        );
-
-        // SQL escaping
-        $db = "db' AND";
-        $table = "pma_table";
-        $ret = PMA_getSqlQueryForDisplayPrivTable(
-            $db, $table, $username, $hostname
-        );
-        $this->assertEquals(
-            "SELECT `Table_priv` FROM `mysql`.`tables_priv` "
-            . "WHERE `User` = 'pma_username' AND "
-            . "`Host` = 'pma_hostname' AND `Db` = 'db' AND' AND "
-            . "`Table_name` = 'pma_table';",
-            $ret
-        );
-    }
-
-    /**
-     * Test for PMA_getDataForChangeOrCopyUser
-     *
-     * @return void
-     */
-    public function testPMAGetDataForChangeOrCopyUser()
-    {
-        //$_REQUEST['change_copy'] not set
-        list($queries, $password) = PMA_getDataForChangeOrCopyUser();
-        $this->assertEquals(
-            null,
-            $queries
-        );
-        $this->assertEquals(
-            null,
-            $queries
-        );
-
-        //$_REQUEST['change_copy'] is set
-        $_REQUEST['change_copy'] = true;
-        $_REQUEST['old_username'] = 'PMA_old_username';
-        $_REQUEST['old_hostname'] = 'PMA_old_hostname';
-        list($queries, $password) = PMA_getDataForChangeOrCopyUser();
-        $this->assertEquals(
-            'pma_password',
-            $password
-        );
-        $this->assertEquals(
-            array(),
-            $queries
-        );
-        unset($_REQUEST['change_copy']);
-    }
-
-
-    /**
-     * Test for PMA_getListForExportUserDefinition
-     *
-     * @return void
-     */
-    public function testPMAGetHtmlForExportUserDefinition()
-    {
-        $username = "PMA_username";
-        $hostname = "PMA_hostname";
-
-        list($title, $export)
-            = PMA_getListForExportUserDefinition($username, $hostname);
-
-        //validate 1: $export
-        $this->assertContains(
-            'grant user2 delete',
-            $export
-        );
-        $this->assertContains(
-            'grant user1 select',
-            $export
-        );
-        $this->assertContains(
-            '<textarea class="export"',
-            $export
-        );
-
-        //validate 2: $title
-        $title_user = __('User') . ' `' . htmlspecialchars($username)
-            . '`@`' . htmlspecialchars($hostname) . '`';
-        $this->assertContains(
-            $title_user,
-            $title
-        );
-    }
-
-    /**
-     * Test for PMA_addUser
-     *
-     * @return void
-     */
-    public function testPMAAddUser()
-    {
-        // Case 1 : Test with Newer version
-        $restoreMySQLVersion = "PMANORESTORE";
-        if (! PMA_HAS_RUNKIT) {
-            $this->markTestSkipped(
-                'Cannot redefine constant. Missing runkit extension'
-            );
-        } else {
-            $restoreMySQLVersion = PMA_MYSQL_INT_VERSION;
-            runkit_constant_redefine('PMA_MYSQL_INT_VERSION', 50706);
-        }
-
-        $dbname = 'pma_dbname';
-        $username = 'pma_username';
-        $hostname = 'pma_hostname';
-        $_REQUEST['adduser_submit'] = true;
-        $_POST['pred_username'] = 'any';
-        $_POST['pred_hostname'] = 'localhost';
-        $_POST['pred_password'] = 'keep';
-        $_REQUEST['createdb-3'] = true;
-        $_REQUEST['userGroup'] = "username";
-        $_REQUEST['authentication_plugin'] = 'mysql_native_password';
-
-        list(
-            $ret_message,,, $sql_query,
-            $_add_user_error
-        ) = PMA_addUser(
-            $dbname,
-            $username,
-            $hostname,
-            $dbname,
-            true
-        );
-        $this->assertEquals(
-            'You have added a new user.',
-            $ret_message->getMessage()
-        );
-        $this->assertEquals(
-            "CREATE USER ''@'localhost' IDENTIFIED WITH mysql_native_password AS '***';"
-            . "GRANT USAGE ON *.* TO ''@'localhost' REQUIRE NONE;"
-            . "GRANT ALL PRIVILEGES ON `pma_dbname`.* TO ''@'localhost';",
-            $sql_query
-        );
-        $this->assertEquals(
-            false,
-            $_add_user_error
-        );
-
-        if ($restoreMySQLVersion !== "PMANORESTORE") {
-            runkit_constant_redefine('PMA_MYSQL_INT_VERSION', $restoreMySQLVersion);
-        }
-
-
-        // Case 2 : Test with older versions
-        $restoreMySQLVersion = "PMANORESTORE";
-        if (! PMA_HAS_RUNKIT) {
-            $this->markTestSkipped(
-                'Cannot redefine constant. Missing runkit extension'
-            );
-        } else {
-            $restoreMySQLVersion = PMA_MYSQL_INT_VERSION;
-            runkit_constant_redefine('PMA_MYSQL_INT_VERSION', 50506);
-        }
-
-        list(
-            $ret_message,,, $sql_query,
-            $_add_user_error
-        ) = PMA_addUser(
-            $dbname,
-            $username,
-            $hostname,
-            $dbname,
-            true
-        );
-
-        $this->assertEquals(
-            'You have added a new user.',
-            $ret_message->getMessage()
-        );
-        $this->assertEquals(
-            "CREATE USER ''@'localhost';"
-            . "GRANT USAGE ON *.* TO ''@'localhost' REQUIRE NONE;"
-            . "SET PASSWORD FOR ''@'localhost' = '***';"
-            . "GRANT ALL PRIVILEGES ON `pma_dbname`.* TO ''@'localhost';",
-            $sql_query
-        );
-        $this->assertEquals(
-            false,
-            $_add_user_error
-        );
-
-        if ($restoreMySQLVersion !== "PMANORESTORE") {
-            runkit_constant_redefine('PMA_MYSQL_INT_VERSION', $restoreMySQLVersion);
-        }
-    }
-
-    /**
-     * Test for PMA_updatePassword
-     *
-     * @return void
-     */
-    public function testPMAUpdatePassword()
-    {
-        $username = 'pma_username';
-        $hostname = 'pma_hostname';
-        $err_url = "error.php";
-        $_POST['pma_pw'] = 'pma_pw';
-        $_REQUEST['authentication_plugin'] = 'mysql_native_password';
-
-        $message = PMA_updatePassword(
-            $err_url, $username, $hostname
-        );
-
-        $this->assertEquals(
-            "The password for 'pma_username'@'pma_hostname' "
-            . "was changed successfully.",
-            $message->getMessage()
-        );
-    }
-
-    /**
-     * Test for PMA_getMessageAndSqlQueryForPrivilegesRevoke
-     *
-     * @return void
-     */
-    public function testPMAGetMessageAndSqlQueryForPrivilegesRevoke()
-    {
-        $dbname = 'pma_dbname';
-        $username = 'pma_username';
-        $hostname = 'pma_hostname';
-        $tablename = 'pma_tablename';
-        $_REQUEST['adduser_submit'] = true;
-        $_POST['pred_username'] = 'any';
-        $_POST['pred_hostname'] = 'localhost';
-        $_REQUEST['createdb-3'] = true;
-        $_POST['Grant_priv'] = 'Y';
-        $_POST['max_questions'] = 1000;
-        list ($message, $sql_query)
-            = PMA_getMessageAndSqlQueryForPrivilegesRevoke(
-                $dbname, $tablename, $username, $hostname, ''
-            );
-
-        $this->assertEquals(
-            "You have revoked the privileges for 'pma_username'@'pma_hostname'.",
-            $message->getMessage()
-        );
-        $this->assertEquals(
-            "REVOKE ALL PRIVILEGES ON  `pma_dbname`.`pma_tablename` "
-            . "FROM 'pma_username'@'pma_hostname'; "
-            . "REVOKE GRANT OPTION ON  `pma_dbname`.`pma_tablename` "
-            . "FROM 'pma_username'@'pma_hostname';",
-            $sql_query
-        );
-    }
-
-    /**
-     * Test for PMA_updatePrivileges
-     *
-     * @return void
-     */
-    public function testPMAUpdatePrivileges()
-    {
-        $dbname = 'pma_dbname';
-        $username = 'pma_username';
-        $hostname = 'pma_hostname';
-        $tablename = 'pma_tablename';
-        $_REQUEST['adduser_submit'] = true;
-        $_POST['pred_username'] = 'any';
-        $_POST['pred_hostname'] = 'localhost';
-        $_REQUEST['createdb-3'] = true;
-        $_POST['Grant_priv'] = 'Y';
-        $_POST['max_questions'] = 1000;
-        list($sql_query, $message) = PMA_updatePrivileges(
-            $username, $hostname, $tablename, $dbname, ''
-        );
-
-        $this->assertEquals(
-            "You have updated the privileges for 'pma_username'@'pma_hostname'.",
-            $message->getMessage()
-        );
-        $this->assertEquals(
-            "REVOKE ALL PRIVILEGES ON  `pma_dbname`.`pma_tablename` "
-            . "FROM 'pma_username'@'pma_hostname';  ",
-            $sql_query
-        );
-    }
-
-    /**
-     * Test for PMA_getHtmlToDisplayPrivilegesTable
-     *
-     * @return void
-     * @group medium
-     */
-    public function testPMAGetHtmlToDisplayPrivilegesTable()
-    {
-        $dbi_old = $GLOBALS['dbi'];
-        $GLOBALS['hostname'] = "hostname";
-        $GLOBALS['username'] = "username";
-
-        //Mock DBI
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $fetchSingleRow = array(
-            'password' => 'pma_password',
-            'max_questions' => 'max_questions',
-            'max_updates' => 'max_updates',
-            'max_connections' => 'max_connections',
-            'max_user_connections' => 'max_user_connections',
-            'Table_priv' => 'Select,Insert,Update,Delete,File,Create,Alter,Index,'
-                . 'Drop,Super,Process,Reload,Shutdown,Create_routine,Alter_routine,'
-                . 'Show_db,Repl_slave,Create_tmp_table,Show_view,Execute,'
-                . 'Repl_client,Lock_tables,References,Grant,dd'
-                . 'Create_user,Repl_slave,Repl_client',
-            'Type' => "'Super1','Select','Insert','Update','Create','Alter','Index',"
-                . "'Drop','Delete','File','Super','Process','Reload','Shutdown','"
-                . "Show_db','Repl_slave','Create_tmp_table',"
-                . "'Show_view','Create_routine','"
-                . "Repl_client','Lock_tables','References','Alter_routine','"
-                . "Create_user','Repl_slave','Repl_client','Execute','Grant','ddd",
-        );
-        $dbi->expects($this->any())->method('fetchSingleRow')
-            ->will($this->returnValue($fetchSingleRow));
-
-        $dbi->expects($this->any())->method('tryQuery')
-            ->will($this->returnValue(true));
-
-        $columns = array('val1', 'replace1', 5);
-        $dbi->expects($this->at(0))
-            ->method('fetchRow')
-            ->will($this->returnValue($columns));
-        $dbi->expects($this->at(1))
-            ->method('fetchRow')
-            ->will($this->returnValue(false));
-        $dbi->expects($this->any())
-            ->method('escapeString')
-            ->will($this->returnArgument(0));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $html = PMA_getHtmlToDisplayPrivilegesTable();
-        $GLOBALS['username'] = "username";
-
-        //validate 1: fieldset
-        $this->assertContains(
-            '<fieldset id="fieldset_user_privtable_footer" ',
-            $html
-        );
-
-        //validate 2: button
-        $this->assertContains(
-            __('Go'),
-            $html
-        );
-
-        //validate 3: PMA_getHtmlForGlobalOrDbSpecificPrivs
-        $this->assertContains(
-            '<fieldset id="fieldset_user_global_rights"><legend '
-            . 'data-submenu-label="' . __('Global') . '">',
-            $html
-        );
-        $this->assertContains(
-            __('Global privileges'),
-            $html
-        );
-        $this->assertContains(
-            __('Check all'),
-            $html
-        );
-        $this->assertContains(
-            __('Note: MySQL privilege names are expressed in English'),
-            $html
-        );
-
-        //validate 4: PMA_getHtmlForGlobalPrivTableWithCheckboxes items
-        //Select_priv
-        $this->assertContains(
-            '<input type="checkbox" class="checkall" name="Select_priv"',
-            $html
-        );
-        //Create_user_priv
-        $this->assertContains(
-            '<input type="checkbox" class="checkall" name="Create_user_priv"',
-            $html
-        );
-        //Insert_priv
-        $this->assertContains(
-            '<input type="checkbox" class="checkall" name="Insert_priv"',
-            $html
-        );
-        //Update_priv
-        $this->assertContains(
-            '<input type="checkbox" class="checkall" name="Update_priv"',
-            $html
-        );
-        //Create_priv
-        $this->assertContains(
-            '<input type="checkbox" class="checkall" name="Create_priv"',
-            $html
-        );
-        //Create_routine_priv
-        $this->assertContains(
-            '<input type="checkbox" class="checkall" name="Create_routine_priv"',
-            $html
-        );
-        //Execute_priv
-        $this->assertContains(
-            '<input type="checkbox" class="checkall" name="Execute_priv"',
-            $html
-        );
-
-        //validate 5: PMA_getHtmlForResourceLimits
-        $this->assertContains(
-            '<legend>' . __('Resource limits') . '</legend>',
-            $html
-        );
-        $this->assertContains(
-            __('Note: Setting these options to 0 (zero) removes the limit.'),
-            $html
-        );
-
-        $GLOBALS['dbi'] = $dbi_old;
-    }
-
-    /**
-     * Test for PMA_getSqlQueriesForDisplayAndAddUser
-     *
-     * @return void
-     */
-    public function testPMAGetSqlQueriesForDisplayAndAddUser()
-    {
-        $restoreMySQLVersion = "PMANORESTORE";
-
-        if (! PMA_HAS_RUNKIT) {
-            $this->markTestSkipped(
-                'Cannot redefine constant. Missing runkit extension'
-            );
-        } else {
-            $restoreMySQLVersion = PMA_MYSQL_INT_VERSION;
-            runkit_constant_redefine('PMA_MYSQL_INT_VERSION', 50706);
-        }
-
-        $username = "PMA_username";
-        $hostname = "PMA_hostname";
-        $password = "pma_password";
-        $_POST['pred_password'] = 'keep';
-        $_REQUEST['authentication_plugin'] = 'mysql_native_password';
-        $dbname = "PMA_db";
-
-        list($create_user_real, $create_user_show, $real_sql_query, $sql_query)
-            = PMA_getSqlQueriesForDisplayAndAddUser($username, $hostname, $password);
-
-        //validate 1: $create_user_real
-        $this->assertEquals(
-            "CREATE USER 'PMA_username'@'PMA_hostname' IDENTIFIED "
-            . "WITH mysql_native_password AS 'pma_password';",
-            $create_user_real
-        );
-
-        //validate 2: $create_user_show
-        $this->assertEquals(
-            "CREATE USER 'PMA_username'@'PMA_hostname' IDENTIFIED "
-            . "WITH mysql_native_password AS '***';",
-            $create_user_show
-        );
-
-        //validate 3:$real_sql_query
-        $this->assertEquals(
-            "GRANT USAGE ON *.* TO 'PMA_username'@'PMA_hostname' REQUIRE NONE;",
-            $real_sql_query
-        );
-
-        //validate 4:$sql_query
-        $this->assertEquals(
-            "GRANT USAGE ON *.* TO 'PMA_username'@'PMA_hostname' REQUIRE NONE;",
-            $sql_query
-        );
-
-        //test for PMA_addUserAndCreateDatabase
-        list($sql_query, $message) = PMA_addUserAndCreateDatabase(
-            false, $real_sql_query, $sql_query, $username, $hostname, $dbname
-        );
-
-        //validate 5: $sql_query
-        $this->assertEquals(
-            "GRANT USAGE ON *.* TO 'PMA_username'@'PMA_hostname' REQUIRE NONE;",
-            $sql_query
-        );
-
-        //validate 6: $message
-        $this->assertEquals(
-            "You have added a new user.",
-            $message->getMessage()
-        );
-
-        if ($restoreMySQLVersion !== "PMANORESTORE") {
-            runkit_constant_redefine('PMA_MYSQL_INT_VERSION', $restoreMySQLVersion);
-        }
-    }
-
-    /**
-     * Test for PMA_getHtmlForTableSpecificPrivileges
-     *
-     * @return void
-     */
-    public function testPMAGetHtmlForTableSpecificPrivileges()
-    {
-        $GLOBALS['strPrivDescCreate_viewTbl'] = "strPrivDescCreate_viewTbl";
-        $GLOBALS['strPrivDescShowViewTbl'] = "strPrivDescShowViewTbl";
-        $username = "PMA_username";
-        $hostname = "PMA_hostname";
-        $db = "PMA_db";
-        $table = "PMA_table";
-        $columns = array(
-            'row1' => 'name1'
-        );
-        $row = array(
-            'Select_priv' => 'Y',
-            'Insert_priv' => 'Y',
-            'Update_priv' => 'Y',
-            'References_priv' => 'Y',
-            'Create_view_priv' => 'Y',
-            'ShowView_priv' => 'Y',
-        );
-
-        $html = PMA_getHtmlForTableSpecificPrivileges(
-            $username, $hostname, $db, $table, $columns, $row
-        );
-
-        //validate 1: PMA_getHtmlForAttachedPrivilegesToTableSpecificColumn
-        $item = PMA_getHtmlForAttachedPrivilegesToTableSpecificColumn(
-            $columns, $row
-        );
-        $this->assertContains(
-            $item,
-            $html
-        );
-        $this->assertContains(
-            __('Allows reading data.'),
-            $html
-        );
-        $this->assertContains(
-            __('Allows inserting and replacing data'),
-            $html
-        );
-        $this->assertContains(
-            __('Allows changing data.'),
-            $html
-        );
-        $this->assertContains(
-            __('Has no effect in this MySQL version.'),
-            $html
-        );
-
-        //validate 2: PMA_getHtmlForNotAttachedPrivilegesToTableSpecificColumn
-        $item = PMA_getHtmlForNotAttachedPrivilegesToTableSpecificColumn(
-            $row
-        );
-        $this->assertContains(
-            $item,
-            $html
-        );
-        $this->assertContains(
-            'Create_view_priv',
-            $html
-        );
-        $this->assertContains(
-            'ShowView_priv',
-            $html
-        );
-    }
-
-    /**
-     * Test for PMA_getHtmlForLoginInformationFields
-     *
-     * @return void
-     */
-    public function testPMAGetHtmlForLoginInformationFields()
-    {
-        $GLOBALS['username'] = 'pma_username';
-
-        $dbi_old = $GLOBALS['dbi'];
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $fields_info = array(
-            array('COLUMN_NAME' => 'Host', 'CHARACTER_MAXIMUM_LENGTH' => 80),
-            array('COLUMN_NAME' => 'User', 'CHARACTER_MAXIMUM_LENGTH' => 40),
-        );
-        $dbi->expects($this->any())->method('fetchResult')
-            ->will($this->returnValue($fields_info));
-        $dbi->expects($this->any())
-            ->method('escapeString')
-            ->will($this->returnArgument(0));
-
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $html = PMA_getHtmlForLoginInformationFields();
-
-        //validate 1: __('Login Information')
-        $this->assertContains(
-            __('Login Information'),
-            $html
-        );
-        $this->assertContains(
-            __('User name:'),
-            $html
-        );
-        $this->assertContains(
-            __('Any user'),
-            $html
-        );
-        $this->assertContains(
-            __('Use text field'),
-            $html
-        );
-
-        $output = PMA\libraries\Util::showHint(
-            __(
-                'When Host table is used, this field is ignored '
-                . 'and values stored in Host table are used instead.'
-            )
-        );
-        $this->assertContains(
-            $output,
-            $html
-        );
-
-        $GLOBALS['dbi'] = $dbi_old;
-    }
-
-    /**
-     * Test for PMA_getWithClauseForAddUserAndUpdatePrivs
-     *
-     * @return void
-     */
-    public function testPMAGetWithClauseForAddUserAndUpdatePrivs()
-    {
-        $_POST['Grant_priv'] = 'Y';
-        $_POST['max_questions'] = 10;
-        $_POST['max_connections'] = 20;
-        $_POST['max_updates'] = 30;
-        $_POST['max_user_connections'] = 40;
-
-        $sql_query = PMA_getWithClauseForAddUserAndUpdatePrivs();
-        $expect = "WITH GRANT OPTION MAX_QUERIES_PER_HOUR 10 "
-            . "MAX_CONNECTIONS_PER_HOUR 20"
-            . " MAX_UPDATES_PER_HOUR 30 MAX_USER_CONNECTIONS 40";
-        $this->assertContains(
-            $expect,
-            $sql_query
-        );
-
-    }
-
-    /**
-     * Test for PMA_getListOfPrivilegesAndComparedPrivileges
-     *
-     * @return void
-     */
-    public function testPMAGetListOfPrivilegesAndComparedPrivileges()
-    {
-        list($list_of_privileges, $list_of_compared_privileges)
-            = PMA_getListOfPrivilegesAndComparedPrivileges();
-        $expect = "`User`, `Host`, `Select_priv`, `Insert_priv`";
-        $this->assertContains(
-            $expect,
-            $list_of_privileges
-        );
-        $expect = "`Select_priv` = 'N' AND `Insert_priv` = 'N'";
-        $this->assertContains(
-            $expect,
-            $list_of_compared_privileges
-        );
-        $expect = "`Create_routine_priv` = 'N' AND `Alter_routine_priv` = 'N'";
-        $this->assertContains(
-            $expect,
-            $list_of_compared_privileges
-        );
-    }
-
-    /**
-     * Test for PMA_getHtmlForAddUser
-     *
-     * @return void
-     * @group medium
-     */
-    public function testPMAGetHtmlForAddUser()
-    {
-        $dbi_old = $GLOBALS['dbi'];
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $fields_info = array(
-            array('COLUMN_NAME' => 'Host', 'CHARACTER_MAXIMUM_LENGTH' => 80),
-            array('COLUMN_NAME' => 'User', 'CHARACTER_MAXIMUM_LENGTH' => 40),
-        );
-        $dbi->expects($this->any())->method('fetchResult')
-            ->will($this->returnValue($fields_info));
-        $dbi->expects($this->any())
-            ->method('escapeString')
-            ->will($this->returnArgument(0));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $dbname = "pma_dbname";
-
-        $html = PMA_getHtmlForAddUser($dbname);
-
-        //validate 1: PMA_URL_getHiddenInputs
-        $this->assertContains(
-            PMA_URL_getHiddenInputs('', ''),
-            $html
-        );
-
-        //validate 2: PMA_getHtmlForLoginInformationFields
-        $this->assertContains(
-            PMA_getHtmlForLoginInformationFields('new'),
-            $html
-        );
-
-        //validate 3: Database for user
-        $this->assertContains(
-            __('Database for user'),
-            $html
-        );
-
-        $item = PMA\libraries\Util::getCheckbox(
-            'createdb-2',
-            __('Grant all privileges on wildcard name (username\\_%).'),
-            false, false, 'createdb-2'
-        );
-        $this->assertContains(
-            $item,
-            $html
-        );
-
-        //validate 4: PMA_getHtmlToDisplayPrivilegesTable
-        $this->assertContains(
-            PMA_getHtmlToDisplayPrivilegesTable('*', '*', false),
-            $html
-        );
-
-        //validate 5: button
-        $this->assertContains(
-            __('Go'),
-            $html
-        );
-
-        $GLOBALS['dbi'] = $dbi_old;
-    }
-
-    /**
-     * Test for PMA_getHtmlForSpecificDbPrivileges
-     *
-     * @return void
-     */
-    public function testPMAGetHtmlForSpecificDbPrivileges()
-    {
-        $dbi_old = $GLOBALS['dbi'];
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $fields_info = array(
-            array('COLUMN_NAME' => 'Host', 'CHARACTER_MAXIMUM_LENGTH' => 80),
-            array('COLUMN_NAME' => 'User', 'CHARACTER_MAXIMUM_LENGTH' => 40),
-        );
-        $dbi->expects($this->any())->method('fetchResult')
-            ->will($this->returnValue($fields_info));
-        $dbi->expects($this->any())
-            ->method('escapeString')
-            ->will($this->returnArgument(0));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $db = "pma_dbname";
-
-        $html = PMA_getHtmlForSpecificDbPrivileges($db);
-
-        //validate 1: PMA_URL_getCommon
-        $this->assertContains(
-            PMA_URL_getCommon(array('db' => $db)),
-            $html
-        );
-
-        //validate 2: htmlspecialchars
-        $this->assertContains(
-            htmlspecialchars($db),
-            $html
-        );
-
-        //validate 3: items
-        $this->assertContains(
-            __('User'),
-            $html
-        );
-        $this->assertContains(
-            __('Host'),
-            $html
-        );
-        $this->assertContains(
-            __('Type'),
-            $html
-        );
-        $this->assertContains(
-            __('Privileges'),
-            $html
-        );
-        $this->assertContains(
-            __('Grant'),
-            $html
-        );
-        $this->assertContains(
-            __('Action'),
-            $html
-        );
-
-        //_pgettext('Create new user', 'New')
-        $this->assertContains(
-            _pgettext('Create new user', 'New'),
-            $html
-        );
-        $this->assertContains(
-            PMA_URL_getCommon(array('checkprivsdb' => $db)),
-            $html
-        );
-
-        $GLOBALS['dbi'] = $dbi_old;
-    }
-
-    /**
-     * Test for PMA_getHtmlForSpecificTablePrivileges
-     *
-     * @return void
-     */
-    public function testPMAGetHtmlForSpecificTablePrivileges()
-    {
-        $dbi_old = $GLOBALS['dbi'];
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $fields_info = array(
-            array('COLUMN_NAME' => 'Host', 'CHARACTER_MAXIMUM_LENGTH' => 80),
-            array('COLUMN_NAME' => 'User', 'CHARACTER_MAXIMUM_LENGTH' => 40),
-        );
-        $dbi->expects($this->any())->method('fetchResult')
-            ->will($this->returnValue($fields_info));
-        $dbi->expects($this->any())
-            ->method('escapeString')
-            ->will($this->returnArgument(0));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $db = "pma_dbname";
-        $table = "pma_table";
-
-        $html = PMA_getHtmlForSpecificTablePrivileges($db, $table);
-
-        //validate 1: $db, $table
-        $this->assertContains(
-            htmlspecialchars($db) . '.' . htmlspecialchars($table),
-            $html
-        );
-
-        //validate 2: PMA_URL_getCommon
-        $item = PMA_URL_getCommon(
-            array(
-                'db' => $db,
-                'table' => $table,
-            )
-        );
-        $this->assertContains(
-            $item,
-            $html
-        );
-
-        //validate 3: items
-        $this->assertContains(
-            __('User'),
-            $html
-        );
-        $this->assertContains(
-            __('Host'),
-            $html
-        );
-        $this->assertContains(
-            __('Type'),
-            $html
-        );
-        $this->assertContains(
-            __('Privileges'),
-            $html
-        );
-        $this->assertContains(
-            __('Grant'),
-            $html
-        );
-        $this->assertContains(
-            __('Action'),
-            $html
-        );
-
-        //_pgettext('Create new user', 'New')
-        $this->assertContains(
-            _pgettext('Create new user', 'New'),
-            $html
-        );
-        $this->assertContains(
-            PMA_URL_getCommon(
-                array('checkprivsdb' => $db, 'checkprivstable' => $table)
-            ),
-            $html
-        );
-
-        $GLOBALS['dbi'] = $dbi_old;
-    }
-
-    /**
-     * Test for PMA_getHtmlTableBodyForSpecificDbOrTablePrivs
-     *
-     * @return void
-     */
-    public function testPMAGetHtmlTableBodyForSpecificDbOrTablePrivss()
-    {
-        $privMap = null;
-        $db = "pma_dbname";
-
-        //$privMap = null
-        $html = PMA_getHtmlTableBodyForSpecificDbOrTablePrivs($privMap, $db);
-        $this->assertContains(
-            __('No user found.'),
-            $html
-        );
-
-        //$privMap != null
-        $privMap = array(
-            "user1" => array(
-                "hostname1" => array(
-                    array('Type'=>'g', 'Grant_priv'=>'Y'),
-                    array('Type'=>'d', 'Db'=>"dbname", 'Grant_priv'=>'Y'),
-                    array('Type'=>'t', 'Grant_priv'=>'N'),
-                )
-            )
-        );
-
-        $html = PMA_getHtmlTableBodyForSpecificDbOrTablePrivs($privMap, $db);
-
-        //validate 1: $current_privileges
-        $current_privileges = $privMap["user1"]["hostname1"];
-        $current_user = "user1";
-        $current_host = "hostname1";
-        $this->assertContains(
-            count($current_privileges) . "",
-            $html
-        );
-        $this->assertContains(
-            htmlspecialchars($current_user),
-            $html
-        );
-        $this->assertContains(
-            htmlspecialchars($current_host),
-            $html
-        );
-
-        //validate 2: privileges[0]
-        $this->assertContains(
-            __('global'),
-            $html
-        );
-
-        //validate 3: privileges[1]
-        $current = $current_privileges[1];
-        $this->assertContains(
-            __('wildcard'),
-            $html
-        );
-        $this->assertContains(
-            htmlspecialchars($current['Db']),
-            $html
-        );
-
-        //validate 4: privileges[2]
-        $this->assertContains(
-            __('table-specific'),
-            $html
-        );
-    }
-
-    /**
-     * Test for PMA_getUserLink
-     *
-     * @return void
-     */
-    public function testPMAGetUserLink()
-    {
-        $username = "pma_username";
-        $hostname = "pma_hostname";
-        $dbname = "pma_dbname";
-        $tablename = "pma_tablename";
-
-        $html = PMA_getUserLink(
-            'edit', $username, $hostname, $dbname, $tablename, ''
-        );
-
-        $url_html = PMA_URL_getCommon(
-            array(
-                'username' => $username,
-                'hostname' => $hostname,
-                'dbname' => $dbname,
-                'tablename' => $tablename,
-                'routinename' => '',
-            )
-        );
-        $this->assertContains(
-            $url_html,
-            $html
-        );
-        $this->assertContains(
-            __('Edit privileges'),
-            $html
-        );
-
-        $html = PMA_getUserLink(
-            'revoke', $username, $hostname, $dbname, $tablename, ''
-        );
-
-        $url_html = PMA_URL_getCommon(
-            array(
-                'username' => $username,
-                'hostname' => $hostname,
-                'dbname' => $dbname,
-                'tablename' => $tablename,
-                'routinename' => '',
-                'revokeall' => 1,
-            )
-        );
-        $this->assertContains(
-            $url_html,
-            $html
-        );
-        $this->assertContains(
-            __('Revoke'),
-            $html
-        );
-
-        $html = PMA_getUserLink('export', $username, $hostname);
-
-        $url_html = PMA_URL_getCommon(
-            array(
-                'username' => $username,
-                'hostname' => $hostname,
-                'initial' => "",
-                'export' => 1,
-            )
-        );
-        $this->assertContains(
-            $url_html,
-            $html
-        );
-        $this->assertContains(
-            __('Export'),
-            $html
-        );
-    }
-
-    /**
-     * Test for PMA_getExtraDataForAjaxBehavior
-     *
-     * @return void
-     */
-    public function testPMAGetExtraDataForAjaxBehavior()
-    {
-        $password = "pma_password";
-        $sql_query = "pma_sql_query";
-        $username = "pma_username";
-        $hostname = "pma_hostname";
-        $GLOBALS['dbname'] = "pma_dbname";
-        $_REQUEST['adduser_submit'] = "adduser_submit";
-        $_REQUEST['change_copy'] = "change_copy";
-        $_REQUEST['validate_username'] = "validate_username";
-        $_REQUEST['username'] = "username";
-        $_POST['update_privs'] = "update_privs";
-
-        //PMA_getExtraDataForAjaxBehavior
-        $extra_data = PMA_getExtraDataForAjaxBehavior(
-            $password, $sql_query, $hostname, $username
-        );
-
-        //user_exists
-        $this->assertEquals(
-            false,
-            $extra_data['user_exists']
-        );
-
-        //db_wildcard_privs
-        $this->assertEquals(
-            true,
-            $extra_data['db_wildcard_privs']
-        );
-
-        //user_exists
-        $this->assertEquals(
-            false,
-            $extra_data['db_specific_privs']
-        );
-
-        //new_user_initial
-        $this->assertEquals(
-            'P',
-            $extra_data['new_user_initial']
-        );
-
-        //sql_query
-        $this->assertEquals(
-            PMA\libraries\Util::getMessage(null, $sql_query),
-            $extra_data['sql_query']
-        );
-
-        //new_user_string
-        $this->assertContains(
-            htmlspecialchars($hostname),
-            $extra_data['new_user_string']
-        );
-        $this->assertContains(
-            htmlspecialchars($username),
-            $extra_data['new_user_string']
-        );
-
-        //new_privileges
-        $this->assertContains(
-            join(', ', PMA_extractPrivInfo(null, true)),
-            $extra_data['new_privileges']
-        );
-    }
-
-    /**
-     * Test for PMA_getChangeLoginInformationHtmlForm
-     *
-     * @return void
-     */
-    public function testPMAGetChangeLoginInformationHtmlForm()
-    {
-        $username = "pma_username";
-        $hostname = "pma_hostname";
-        $GLOBALS['cfgRelation']['menuswork'] = true;
-
-        $dbi_old = $GLOBALS['dbi'];
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $fields_info = array(
-            array('COLUMN_NAME' => 'Host', 'CHARACTER_MAXIMUM_LENGTH' => 80),
-            array('COLUMN_NAME' => 'User', 'CHARACTER_MAXIMUM_LENGTH' => 40),
-        );
-        $dbi->expects($this->any())->method('fetchResult')
-            ->will($this->returnValue($fields_info));
-
-        $expected_userGroup = "pma_usergroup";
-
-        $dbi->expects($this->any())->method('fetchValue')
-            ->will($this->returnValue($expected_userGroup));
-        $dbi->expects($this->any())
-            ->method('escapeString')
-            ->will($this->returnArgument(0));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        //PMA_getChangeLoginInformationHtmlForm
-        $html = PMA_getChangeLoginInformationHtmlForm($username, $hostname);
-
-        //PMA_URL_getHiddenInputs
-        $this->assertContains(
-            PMA_URL_getHiddenInputs('', ''),
-            $html
-        );
-
-        //$username & $hostname
-        $this->assertContains(
-            htmlspecialchars($username),
-            $html
-        );
-        $this->assertContains(
-            htmlspecialchars($hostname),
-            $html
-        );
-
-        //PMA_getHtmlForLoginInformationFields
-        $this->assertContains(
-            PMA_getHtmlForLoginInformationFields('change', $username, $hostname),
-            $html
-        );
-
-        $this->assertContains(
-            '<input type="hidden" name="old_usergroup" value="'
-                . $expected_userGroup . '" />',
-            $html
-        );
-
-        //Create a new user with the same privileges
-        $this->assertContains(
-            "Create a new user account with the same privileges",
-            $html
-        );
-
-        $GLOBALS['dbi'] = $dbi_old;
-    }
-
-    /**
-     * Test for PMA_getUserGroupForUser
-     *
-     * @return void
-     */
-    public function testPMAGetUserGroupForUser()
-    {
-        $username = "pma_username";
-        $hostname = "pma_hostname";
-        $GLOBALS['cfgRelation']['menuswork'] = true;
-
-        $dbi_old = $GLOBALS['dbi'];
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $expected_userGroup = "pma_usergroup";
-
-        $dbi->expects($this->any())->method('fetchValue')
-            ->will($this->returnValue($expected_userGroup));
-        $dbi->expects($this->any())
-            ->method('escapeString')
-            ->will($this->returnArgument(0));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $returned_userGroup = PMA_getUserGroupForUser($username);
-
-        $this->assertEquals(
-            $expected_userGroup,
-            $returned_userGroup
-        );
-
-        $GLOBALS['dbi'] = $dbi_old;
-    }
-
-    /**
-     * Test for PMA_getLinkToDbAndTable
-     *
-     * @return void
-     */
-    public function testPMAGetLinkToDbAndTable()
-    {
-        $url_dbname = "url_dbname";
-        $dbname = "dbname";
-        $tablename = "tablename";
-
-        $html = PMA_getLinkToDbAndTable($url_dbname, $dbname, $tablename);
-
-        //$dbname
-        $this->assertContains(
-            __('Database'),
-            $html
-        );
-        $this->assertContains(
-            PMA\libraries\Util::getScriptNameForOption(
-                $GLOBALS['cfg']['DefaultTabDatabase'], 'database'
-            ),
-            $html
-        );
-        $item = PMA_URL_getCommon(
-            array(
-                'db' => $url_dbname,
-                'reload' => 1
-            )
-        );
-        $this->assertContains(
-            $item,
-            $html
-        );
-        $this->assertContains(
-            htmlspecialchars($dbname),
-            $html
-        );
-
-        //$tablename
-        $this->assertContains(
-            __('Table'),
-            $html
-        );
-        $this->assertContains(
-            PMA\libraries\Util::getScriptNameForOption(
-                $GLOBALS['cfg']['DefaultTabTable'], 'table'
-            ),
-            $html
-        );
-        $item = PMA_URL_getCommon(
-            array(
-                'db' => $url_dbname,
-                'table' => $tablename,
-                'reload' => 1,
-            )
-        );
-        $this->assertContains(
-            $item,
-            $html
-        );
-        $this->assertContains(
-            htmlspecialchars($tablename),
-            $html
-        );
-        $item = PMA\libraries\Util::getTitleForTarget(
-            $GLOBALS['cfg']['DefaultTabTable']
-        );
-        $this->assertContains(
-            $item,
-            $html
-        );
-    }
-
-    /**
-     * Test for PMA_getUsersOverview
-     *
-     * @return void
-     */
-    public function testPMAGetUsersOverview()
-    {
-        $result = array();
-        $db_rights = array();
-        $pmaThemeImage = "pmaThemeImage";
-        $text_dir = "text_dir";
-        $GLOBALS['cfgRelation']['menuswork'] = true;
-
-        $html = PMA_getUsersOverview(
-            $result, $db_rights, $pmaThemeImage, $text_dir
-        );
-
-        //PMA_URL_getHiddenInputs
-        $this->assertContains(
-            PMA_URL_getHiddenInputs('', ''),
-            $html
-        );
-
-        //items
-        $this->assertContains(
-            __('User'),
-            $html
-        );
-        $this->assertContains(
-            __('Host'),
-            $html
-        );
-        $this->assertContains(
-            __('Password'),
-            $html
-        );
-        $this->assertContains(
-            __('Global privileges'),
-            $html
-        );
-
-        //PMA\libraries\Util::showHint
-        $this->assertContains(
-            PMA\libraries\Util::showHint(
-                __('Note: MySQL privilege names are expressed in English.')
-            ),
-            $html
-        );
-
-        //__('User group')
-        $this->assertContains(
-            __('User group'),
-            $html
-        );
-        $this->assertContains(
-            __('Grant'),
-            $html
-        );
-        $this->assertContains(
-            __('Action'),
-            $html
-        );
-
-        //$pmaThemeImage
-        $this->assertContains(
-            $pmaThemeImage,
-            $html
-        );
-
-        //$text_dir
-        $this->assertContains(
-            $text_dir,
-            $html
-        );
-
-        //PMA_getFieldsetForAddDeleteUser
-        $this->assertContains(
-            PMA_getFieldsetForAddDeleteUser(),
-            $html
-        );
-    }
-
-    /**
-     * Test for PMA_getFieldsetForAddDeleteUser
-     *
-     * @return void
-     */
-    public function testPMAGetFieldsetForAddDeleteUser()
-    {
-        $result = array();
-        $db_rights = array();
-        $pmaThemeImage = "pmaThemeImage";
-        $text_dir = "text_dir";
-        $GLOBALS['cfgRelation']['menuswork'] = true;
-
-        $html = PMA_getUsersOverview(
-            $result, $db_rights, $pmaThemeImage, $text_dir
-        );
-
-        //PMA_URL_getCommon
-        $this->assertContains(
-            PMA_URL_getCommon(array('adduser' => 1)),
-            $html
-        );
-
-        //labels
-        $this->assertContains(
-            __('Add user account'),
-            $html
-        );
-        $this->assertContains(
-            __('Remove selected user accounts'),
-            $html
-        );
-        $this->assertContains(
-            __('Drop the databases that have the same names as the users.'),
-            $html
-        );
-        $this->assertContains(
-            __('Drop the databases that have the same names as the users.'),
-            $html
-        );
-    }
-
-    /**
-     * Test for PMA_getDataForDeleteUsers
-     *
-     * @return void
-     */
-    public function testPMAGetDataForDeleteUsers()
-    {
-        $_REQUEST['change_copy'] = "change_copy";
-        $_REQUEST['old_hostname'] = "old_hostname";
-        $_REQUEST['old_username'] = "old_username";
-        $_SESSION['relation'][1] = array(
-            'PMA_VERSION' => PMA_VERSION,
-            'bookmarkwork' => false,
-            'historywork' => false,
-            'recentwork' => false,
-            'favoritework' => false,
-            'uiprefswork' => false,
-            'userconfigwork' => false,
-            'menuswork' => false,
-            'navwork' => false,
-            'savedsearcheswork' => false,
-            'designersettingswork' => false,
-        );
-
-        $queries = array();
-
-        $ret = PMA_getDataForDeleteUsers($queries);
-
-        $item = array(
-            "# Deleting 'old_username'@'old_hostname' ...",
-            "DROP USER 'old_username'@'old_hostname';",
-        );
-        $this->assertEquals(
-            $item,
-            $ret
-        );
-    }
-
-    /**
-     * Test for PMA_getAddUserHtmlFieldset
-     *
-     * @return void
-     */
-    public function testPMAGetAddUserHtmlFieldset()
-    {
-        $html = PMA_getAddUserHtmlFieldset();
-
-        $this->assertContains(
-            PMA_URL_getCommon(array('adduser' => 1)),
-            $html
-        );
-        $this->assertContains(
-            PMA\libraries\Util::getIcon('b_usradd.png'),
-            $html
-        );
-        $this->assertContains(
-            __('Add user'),
-            $html
-        );
-    }
-
-    /**
-     * Test for PMA_getHtmlHeaderForUserProperties
-     *
-     * @return void
-     */
-    public function testPMAGetHtmlHeaderForUserProperties()
-    {
-        $dbname_is_wildcard = true;
-        $url_dbname = "url_dbname";
-        $dbname = "dbname";
-        $username = "username";
-        $hostname = "hostname";
-        $tablename = "tablename";
-        $_REQUEST['tablename'] = "tablename";
-
-        $html = PMA_getHtmlHeaderForUserProperties(
-            $dbname_is_wildcard, $url_dbname, $dbname,
-            $username, $hostname, $tablename, 'table'
-        );
-
-        //title
-        $this->assertContains(
-            __('Edit privileges:'),
-            $html
-        );
-        $this->assertContains(
-            __('User account'),
-            $html
-        );
-
-        //PMA_URL_getCommon
-        $item = PMA_URL_getCommon(
-            array(
-                'username' => $username,
-                'hostname' => $hostname,
-                'dbname' => '',
-                'tablename' => '',
-            )
-        );
-        $this->assertContains(
-            $item,
-            $html
-        );
-
-        //$username & $hostname
-        $this->assertContains(
-            htmlspecialchars($username),
-            $html
-        );
-        $this->assertContains(
-            htmlspecialchars($hostname),
-            $html
-        );
-
-        //$dbname_is_wildcard = true
-        $this->assertContains(
-            __('Databases'),
-            $html
-        );
-
-        //$dbname_is_wildcard = true
-        $this->assertContains(
-            __('Databases'),
-            $html
-        );
-
-        //PMA_URL_getCommon
-        $item = PMA_URL_getCommon(
-            array(
-                'username' => $username,
-                'hostname' => $hostname,
-                'dbname' => $url_dbname,
-                'tablename' => '',
-            )
-        );
-        $this->assertContains(
-            $item,
-            $html
-        );
-        $this->assertContains(
-            $dbname,
-            $html
-        );
-    }
-
-    /**
-     * Tests for PMA_getHtmlForViewUsersError
-     *
-     * @return void
-     */
-    function testPMAGetHtmlForViewUsersError()
-    {
-        $this->assertContains(
-            'Not enough privilege to view users.',
-            PMA_getHtmlForViewUsersError()
-        );
-    }
-
-    /**
-     * Tests for PMA_getHtmlForUserProperties
-     *
-     * @return void
-     */
-    function testPMAGetHtmlForUserProperties()
-    {
-        $actual = PMA_getHtmlForUserProperties(
-            false, 'db', 'user', 'host', 'db', 'table'
-        );
-        $this->assertContains('addUsersForm', $actual);
-        $this->assertContains('SELECT', $actual);
-        $this->assertContains('Allows reading data.', $actual);
-        $this->assertContains('INSERT', $actual);
-        $this->assertContains('Allows inserting and replacing data.', $actual);
-        $this->assertContains('UPDATE', $actual);
-        $this->assertContains('Allows changing data.', $actual);
-        $this->assertContains('DELETE', $actual);
-        $this->assertContains('Allows deleting data.', $actual);
-        $this->assertContains('CREATE', $actual);
-        $this->assertContains('Allows creating new tables.', $actual);
-    }
-
-    /**
-     * Tests for PMA_getHtmlForUserOverview
-     *
-     * @return void
-     */
-    function testPMAGetHtmlForUserOverview()
-    {
-        $actual = PMA_getHtmlForUserOverview('theme', '');
-        $this->assertContains(
-            'Note: MySQL privilege names are expressed in English.', $actual
-        );
-        $this->assertContains(
-            'Note: phpMyAdmin gets the users\' privileges directly '
-            . 'from MySQL\'s privilege tables.',
-            $actual
-        );
-    }
-
-    /**
-     * Tests for PMA_getHtmlForAllTableSpecificRights
-     *
-     * @return void
-     */
-    function testPMAGetHtmlForAllTableSpecificRights()
-    {
-        // Test case 1
-        $actual = PMA_getHtmlForAllTableSpecificRights('pma', 'host', 'table', 'pmadb');
-        $this->assertContains(
-            '<input type="hidden" name="username" value="pma" />',
-            $actual
-        );
-        $this->assertContains(
-            '<input type="hidden" name="hostname" value="host" />',
-            $actual
-        );
-        $this->assertContains(
-            '<legend data-submenu-label="Table">',
-            $actual
-        );
-        $this->assertContains(
-            'Table-specific privileges',
-            $actual
-        );
-
-        // Test case 2
-        $GLOBALS['dblist'] = new stdClass();
-        $GLOBALS['dblist']->databases = array('x', 'y', 'z');
-        $actual = PMA_getHtmlForAllTableSpecificRights('pma2', 'host2', 'database', '');
-        $this->assertContains(
-            '<legend data-submenu-label="Database">',
-            $actual
-        );
-        $this->assertContains(
-            'Database-specific privileges',
-            $actual
-        );
-    }
-
-    /**
-     * Tests for PMA_getHtmlForInitials
-     *
-     * @return void
-     */
-    function testPMAGetHtmlForInitials()
-    {
-        // Setup for the test
-        $GLOBALS['dbi']->expects($this->any())->method('fetchRow')
-            ->will($this->onConsecutiveCalls(array('-')));
-        $actual = PMA_getHtmlForInitials(array('"' => true));
-        $this->assertContains('<td>A</td>', $actual);
-        $this->assertContains('<td>Z</td>', $actual);
-        $this->assertContains(
-            '<td><a class="ajax" href="server_privileges.php?initial=-&amp;'
-            . 'server=1&amp;lang=en&amp;collation_connection='
-            . 'collation_connection&amp;token=token">-</a></td>',
-            $actual
-        );
-        $this->assertContains(
-            '<td><a class="ajax" href="server_privileges.php?initial=%22&amp;'
-            . 'server=1&amp;lang=en&amp;collation_connection='
-            . 'collation_connection&amp;token=token">"</a>',
-            $actual
-        );
-        $this->assertContains('Show all', $actual);
-    }
-
-    /**
-     * Tests for PMA_getDbRightsForUserOverview
-     *
-     * @return void
-     */
-    function testPMAGetDbRightsForUserOverview()
-    {
-        //Mock DBI
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $dbi->expects($this->any())
-            ->method('fetchResult')
-            ->will($this->returnValue(array('db', 'columns_priv')));
-        $dbi->expects($this->any())
-            ->method('fetchAssoc')
-            ->will(
-                $this->onConsecutiveCalls(
-                    array(
-                        'User' => 'pmauser',
-                        'Host' => 'local'
-                    )
-                )
-            );
-        $dbi->expects($this->any())
-            ->method('escapeString')
-            ->will($this->returnArgument(0));
-
-        $_GET['initial'] = 'A';
-        $GLOBALS['dbi'] = $dbi;
-
-        $expected = array(
-            'pmauser' => array(
-                'local' => array(
-                    'User' => 'pmauser',
-                    'Host' => 'local',
-                    'Password' => '?',
-                    'Grant_priv' => 'N',
-                    'privs' => array('USAGE')
-                )
-            )
-        );
-        $actual = PMA_getDbRightsForUserOverview();
-        $this->assertEquals($expected, $actual);
-    }
-
-    /**
-     * Tests for PMA_deleteUser
-     *
-     * @return void
-     */
-    function testPMADeleteUser()
-    {
-        //Mock DBI
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $dbi->expects($this->any())
-            ->method('tryQuery')
-            ->will($this->onConsecutiveCalls(true, true, false));
-        $dbi->expects($this->any())
-            ->method('getError')
-            ->will($this->returnValue('Some error occurred!'));
-        $dbi->expects($this->any())
-            ->method('escapeString')
-            ->will($this->returnArgument(0));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        // Test case 1 : empty queries
-        $queries = array();
-        $actual = PMA_deleteUser($queries);
-        $this->assertArrayHasKey(0, $actual);
-        $this->assertArrayHasKey(1, $actual);
-        $this->assertEquals('', $actual[0]);
-        $this->assertEquals(
-            'No users selected for deleting!', $actual[1]->getMessage()
-        );
-
-        // Test case 2 : all successful queries
-        $_REQUEST['mode'] = 3;
-        $queries = array('foo');
-        $actual = PMA_deleteUser($queries);
-        $this->assertArrayHasKey(0, $actual);
-        $this->assertArrayHasKey(1, $actual);
-        $this->assertEquals(
-            "foo\n# Reloading the privileges …\nFLUSH PRIVILEGES;",
-            $actual[0]
-        );
-        $this->assertEquals(
-            'The selected users have been deleted successfully.',
-            $actual[1]->getMessage()
-        );
-
-        // Test case 3 : failing queries
-        $_REQUEST['mode'] = 1;
-        $queries = array('bar');
-        $actual = PMA_deleteUser($queries);
-        $this->assertArrayHasKey(0, $actual);
-        $this->assertArrayHasKey(1, $actual);
-        $this->assertEquals("bar", $actual[0]);
-        $this->assertEquals(
-            'Some error occurred!' . "\n",
-            $actual[1]->getMessage()
-        );
-    }
-}
diff --git a/#pma/test/libraries/PMA_server_replication_test.php b/#pma/test/libraries/PMA_server_replication_test.php
deleted file mode 100644
index 70d86e14..00000000
--- a/#pma/test/libraries/PMA_server_replication_test.php
+++ /dev/null
@@ -1,308 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for replication_gui.lib.php
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-use PMA\libraries\Theme;
-
-
-require_once 'libraries/url_generating.lib.php';
-
-require_once 'libraries/database_interface.inc.php';
-require_once 'libraries/replication.inc.php';
-require_once 'libraries/replication_gui.lib.php';
-
-
-require_once 'libraries/sanitizing.lib.php';
-require_once 'libraries/js_escape.lib.php';
-
-/**
- * PMA_Serverreplication_Test class
- *
- * this class is for testing replication_gui.lib.php functions
- *
- * @package PhpMyAdmin-test
- */
-class PMA_ServerReplication_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Prepares environment for the test.
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        //$_REQUEST
-        $_REQUEST['log'] = "index1";
-        $_REQUEST['pos'] = 3;
-        $_REQUEST['mr_adduser'] = "mr_adduser";
-
-        //$GLOBALS
-        $GLOBALS['cfg']['MaxRows'] = 10;
-        $GLOBALS['cfg']['ServerDefault'] = "server";
-        $GLOBALS['cfg']['RememberSorting'] = true;
-        $GLOBALS['cfg']['SQP'] = array();
-        $GLOBALS['cfg']['MaxCharactersInDisplayedSQL'] = 1000;
-        $GLOBALS['cfg']['ShowSQL'] = true;
-        $GLOBALS['cfg']['TableNavigationLinksMode'] = 'icons';
-        $GLOBALS['cfg']['LimitChars'] = 100;
-        $GLOBALS['cfg']['DBG']['sql'] = false;
-        $GLOBALS['cfg']['ShowHint'] = true;
-
-        $GLOBALS['table'] = "table";
-        $GLOBALS['url_params'] = array();
-        $GLOBALS['pmaThemeImage'] = 'image';
-
-        //$_SESSION
-        $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
-        $_SESSION['PMA_Theme'] = new Theme();
-
-        //Mock DBI
-
-        $slave_host = array(
-            array('Server_id'=>'Server_id1', 'Host'=>'Host1'),
-            array('Server_id'=>'Server_id2', 'Host'=>'Host2'),
-        );
-
-        $fetchResult = array(
-            array(
-                "SHOW SLAVE HOSTS",
-                null,
-                null,
-                null,
-                0,
-                $slave_host
-            ),
-        );
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->any())->method('fetchResult')
-            ->will($this->returnValueMap($fetchResult));
-
-        $fields_info = array(
-            "Host" => array(
-                "Field" => "host",
-                "Type" => "char(60)",
-                "Null" => "NO",
-            )
-        );
-        $dbi->expects($this->any())->method('getColumns')
-            ->will($this->returnValue($fields_info));
-
-        $GLOBALS['dbi'] = $dbi;
-    }
-
-    /**
-     * Test for PMA_getHtmlForMasterReplication
-     *
-     * @return void
-     * @group medium
-     */
-    public function testPMAGetHtmlForMasterReplication()
-    {
-        global $master_variables_alerts;
-        global $master_variables_oks;
-        global $strReplicationStatus_master;
-
-        $master_variables_alerts = null;
-        $master_variables_oks = null;
-        $strReplicationStatus_master = null;
-
-        //Call the test function
-        $html = PMA_getHtmlForMasterReplication();
-
-        //validate 1: Master replication
-        $this->assertContains(
-            '<legend>Master replication</legend>',
-            $html
-        );
-        $this->assertContains(
-            'This server is configured as master in a replication process.',
-            $html
-        );
-
-        //validate 2: PMA_getHtmlForReplicationStatusTable
-        $this->assertContains(
-            '<div id="replication_master_section"',
-            $html
-        );
-        //$master_variables
-        $this->assertContains(
-            "Binlog_Do_DB",
-            $html
-        );
-        $this->assertContains(
-            "Binlog_Ignore_DB",
-            $html
-        );
-        //$server_master_replication
-        $this->assertContains(
-            "master-bin.000030",
-            $html
-        );
-
-        //validate 3: PMA_getHtmlForReplicationSlavesTable
-        $this->assertContains(
-            'replication_slaves_section',
-            $html
-        );
-        $this->assertContains(
-            '<th>Server ID</th>',
-            $html
-        );
-        $this->assertContains(
-            '<th>Host</th>',
-            $html
-        );
-        //slave host
-        $this->assertContains(
-            '<td class="value">Server_id1</td>',
-            $html
-        );
-        $this->assertContains(
-            '<td class="value">Server_id2</td>',
-            $html
-        );
-        $this->assertContains(
-            '<td class="value">Host1</td>',
-            $html
-        );
-        $this->assertContains(
-            '<td class="value">Host2</td>',
-            $html
-        );
-        //Notice
-        $this->assertContains(
-            'Only slaves started with the',
-            $html
-        );
-
-        //validate 4: navigation URL
-        $this->assertContains(
-            '<a href="server_replication.php',
-            $html
-        );
-        $this->assertContains(
-            'Add slave replication user',
-            $html
-        );
-
-        //validate 5: 'Add replication slave user' form
-        $this->assertContains(
-            '<div id="master_addslaveuser_gui">',
-            $html
-        );
-    }
-
-    /**
-     * Test for PMA_getHtmlForNotServerReplication
-     *
-     * @return void
-     */
-    public function testPMAGetHtmlForNotServerReplication()
-    {
-        //Call the test function
-        $html = PMA_getHtmlForNotServerReplication();
-
-        $this->assertContains(
-            '<legend>Master replication</legend>',
-            $html
-        );
-        $this->assertContains(
-            'This server is not configured as master in a replication process.',
-            $html
-        );
-    }
-
-    /**
-     * Test for PMA_getHtmlForSlaveConfiguration
-     *
-     * @return void
-     */
-    public function testPMAGetHtmlForSlaveConfiguration()
-    {
-        global $server_slave_replication;
-
-        //Call the test function
-        $html = PMA_getHtmlForSlaveConfiguration(
-            true,
-            $server_slave_replication
-        );
-
-        //legend
-        $this->assertContains(
-            '<legend>Slave replication</legend>',
-            $html
-        );
-        $this->assertContains(
-            '<div id="slave_configuration_gui">',
-            $html
-        );
-        //notice
-        $this->assertContains(
-            'Server is configured as slave in a replication process.',
-            $html
-        );
-        //slave session
-        $this->assertContains(
-            '<div id="replication_slave_section"',
-            $html
-        );
-        //variable
-        $this->assertContains(
-            'Master_SSL_CA_Path',
-            $html
-        );
-        $this->assertContains(
-            'Master_SSL_Cert',
-            $html
-        );
-        $this->assertContains(
-            'Master_SSL_Cipher',
-            $html
-        );
-        $this->assertContains(
-            'Seconds_Behind_Master',
-            $html
-        );
-    }
-
-    /**
-     * Test for PMA_getHtmlForReplicationChangeMaster
-     *
-     * @return void
-     */
-    public function testPMAGetHtmlForReplicationChangeMaster()
-    {
-        //Call the test function
-        $html = PMA_getHtmlForReplicationChangeMaster("slave_changemaster");
-
-        $this->assertContains(
-            '<form method="post" action="server_replication.php">',
-            $html
-        );
-        $this->assertContains(
-            'Slave configuration',
-            $html
-        );
-        $this->assertContains(
-            'Change or reconfigure master server',
-            $html
-        );
-        $notice = 'Make sure, you have unique server-id '
-            . 'in your configuration file (my.cnf)';
-        $this->assertContains(
-            $notice,
-            $html
-        );
-    }
-}
diff --git a/#pma/test/libraries/PMA_server_status_advisor_test.php b/#pma/test/libraries/PMA_server_status_advisor_test.php
deleted file mode 100644
index 9490411f..00000000
--- a/#pma/test/libraries/PMA_server_status_advisor_test.php
+++ /dev/null
@@ -1,186 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for server_status_advisor.lib.php
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-use PMA\libraries\ServerStatusData;
-use PMA\libraries\Theme;
-
-
-
-require_once 'libraries/url_generating.lib.php';
-
-require_once 'libraries/server_status_advisor.lib.php';
-
-require_once 'libraries/database_interface.inc.php';
-
-require_once 'libraries/sanitizing.lib.php';
-require_once 'libraries/js_escape.lib.php';
-
-/**
- * class PMA_ServerStatusAdvisor_Test
- *
- * this class is for testing server_status_advisor.lib.php functions
- *
- * @package PhpMyAdmin-test
- */
-class PMA_ServerStatusAdvisor_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Prepares environment for the test.
-     *
-     * @return void
-     */
-    public $ServerStatusData;
-
-    /**
-     * Test for setUp
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        //$_REQUEST
-        $_REQUEST['log'] = "index1";
-        $_REQUEST['pos'] = 3;
-
-        //$GLOBALS
-        $GLOBALS['cfg']['MaxRows'] = 10;
-        $GLOBALS['cfg']['ServerDefault'] = "server";
-        $GLOBALS['cfg']['RememberSorting'] = true;
-        $GLOBALS['cfg']['SQP'] = array();
-        $GLOBALS['cfg']['MaxCharactersInDisplayedSQL'] = 1000;
-        $GLOBALS['cfg']['ShowSQL'] = true;
-        $GLOBALS['cfg']['TableNavigationLinksMode'] = 'icons';
-        $GLOBALS['cfg']['LimitChars'] = 100;
-        $GLOBALS['cfg']['DBG']['sql'] = false;
-        $GLOBALS['cfg']['Server']['host'] = "localhost";
-        $GLOBALS['cfg']['ShowHint'] = true;
-        $GLOBALS['cfg']['ActionLinksMode'] = 'icons';
-        $GLOBALS['PMA_PHP_SELF'] = PMA_getenv('PHP_SELF');
-        $GLOBALS['replication_info']['master']['status'] = false;
-        $GLOBALS['replication_info']['slave']['status'] = false;
-
-        $GLOBALS['table'] = "table";
-        $GLOBALS['pmaThemeImage'] = 'image';
-
-        //$_SESSION
-        $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
-        $_SESSION['PMA_Theme'] = new Theme();
-
-        //Mock DBI
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        //this data is needed when ServerStatusData constructs
-        $server_status = array(
-            "Aborted_clients" => "0",
-            "Aborted_connects" => "0",
-            "Com_delete_multi" => "0",
-            "Com_create_function" => "0",
-            "Com_empty_query" => "0",
-        );
-
-        $server_variables= array(
-            "auto_increment_increment" => "1",
-            "auto_increment_offset" => "1",
-            "automatic_sp_privileges" => "ON",
-            "back_log" => "50",
-            "big_tables" => "OFF",
-        );
-
-        $fetchResult = array(
-            array(
-                "SHOW GLOBAL STATUS",
-                0,
-                1,
-                null,
-                0,
-                $server_status
-            ),
-            array(
-                "SHOW GLOBAL VARIABLES",
-                0,
-                1,
-                null,
-                0,
-                $server_variables
-            ),
-            array(
-                "SELECT concat('Com_', variable_name), variable_value "
-                    . "FROM data_dictionary.GLOBAL_STATEMENTS",
-                0,
-                1,
-                null,
-                0,
-                $server_status
-            ),
-        );
-
-        $dbi->expects($this->any())->method('fetchResult')
-            ->will($this->returnValueMap($fetchResult));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $this->ServerStatusData = new ServerStatusData();
-    }
-
-    /**
-     * Test for PMA_getHTMLForAdvisor
-     *
-     * @return void
-     * @group medium
-     */
-    public function testPMAGetHTMLForAdvisor()
-    {
-        //Call the test function
-        $html = PMA_getHTMLForAdvisor();
-
-        //validate 1: Advisor Instructions
-        $this->assertContains(
-            '<a href="#openAdvisorInstructions">',
-            $html
-        );
-        $this->assertContains(
-            '<div id="advisorInstructionsDialog"',
-            $html
-        );
-        //notice
-        $this->assertContains(
-            'The Advisor system can provide recommendations',
-            $html
-        );
-        $this->assertContains(
-            'Do note however that this system provides recommendations',
-            $html
-        );
-
-        //Advisor datas, we just validate that the Advisor Array is right
-        //Advisor logic related with OS should be validate on class Advisor
-        $this->assertContains(
-            '<div id="advisorData" style="display:none;">',
-            $html
-        );
-
-        //Advisor data Json encode Items
-        $this->assertContains(
-            htmlspecialchars(json_encode("parse")),
-            $html
-        );
-        $this->assertContains(
-            htmlspecialchars(json_encode("errors")),
-            $html
-        );
-        $this->assertContains(
-            htmlspecialchars(json_encode("run")),
-            $html
-        );
-    }
-}
diff --git a/#pma/test/libraries/PMA_server_status_monitor_test.php b/#pma/test/libraries/PMA_server_status_monitor_test.php
deleted file mode 100644
index 3bce886c..00000000
--- a/#pma/test/libraries/PMA_server_status_monitor_test.php
+++ /dev/null
@@ -1,432 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for PMA_server_status_monitor.lib.php
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-use PMA\libraries\ServerStatusData;
-use PMA\libraries\Theme;
-
-
-require_once 'libraries/url_generating.lib.php';
-
-require_once 'libraries/server_status_monitor.lib.php';
-
-require_once 'libraries/database_interface.inc.php';
-
-require_once 'libraries/sanitizing.lib.php';
-require_once 'libraries/js_escape.lib.php';
-
-/**
- * class PMA_ServerStatusMonitor_Test
- *
- * this class is for testing PMA_server_status_monitor.lib.php functions
- *
- * @package PhpMyAdmin-test
- */
-class PMA_ServerStatusMonitor_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Prepares environment for the test.
-     *
-     * @return void
-     */
-    public $ServerStatusData;
-
-    /**
-     * Test for setUp
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        //$_REQUEST
-        $_REQUEST['log'] = "index1";
-        $_REQUEST['pos'] = 3;
-
-        //$GLOBALS
-        $GLOBALS['cfg']['MaxRows'] = 10;
-        $GLOBALS['cfg']['ServerDefault'] = "server";
-        $GLOBALS['cfg']['RememberSorting'] = true;
-        $GLOBALS['cfg']['SQP'] = array();
-        $GLOBALS['cfg']['MaxCharactersInDisplayedSQL'] = 1000;
-        $GLOBALS['cfg']['ShowSQL'] = true;
-        $GLOBALS['cfg']['Server']['host'] = "localhost";
-        $GLOBALS['cfg']['ShowHint'] = true;
-        $GLOBALS['PMA_PHP_SELF'] = PMA_getenv('PHP_SELF');
-        $GLOBALS['replication_info']['master']['status'] = false;
-        $GLOBALS['replication_info']['slave']['status'] = false;
-
-        $GLOBALS['table'] = "table";
-        $GLOBALS['pmaThemeImage'] = 'image';
-
-        //$_SESSION
-        $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
-        $_SESSION['PMA_Theme'] = new Theme();
-
-        //Mock DBI
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        //this data is needed when ServerStatusData constructs
-        $server_status = array(
-            "Aborted_clients" => "0",
-            "Aborted_connects" => "0",
-            "Com_delete_multi" => "0",
-            "Com_create_function" => "0",
-            "Com_empty_query" => "0",
-        );
-
-        $server_variables= array(
-            "auto_increment_increment" => "1",
-            "auto_increment_offset" => "1",
-            "automatic_sp_privileges" => "ON",
-            "back_log" => "50",
-            "big_tables" => "OFF",
-        );
-
-        $fetchResult = array(
-            array(
-                "SHOW GLOBAL STATUS",
-                0,
-                1,
-                null,
-                0,
-                $server_status
-            ),
-            array(
-                "SHOW GLOBAL VARIABLES",
-                0,
-                1,
-                null,
-                0,
-                $server_variables
-            ),
-            array(
-                "SELECT concat('Com_', variable_name), variable_value "
-                    . "FROM data_dictionary.GLOBAL_STATEMENTS",
-                0,
-                1,
-                null,
-                0,
-                $server_status
-            ),
-        );
-
-        $dbi->expects($this->any())->method('fetchResult')
-            ->will($this->returnValueMap($fetchResult));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $this->ServerStatusData = new ServerStatusData();
-    }
-
-    /**
-     * Test for PMA_getHtmlForMonitor
-     *
-     * @return void
-     * @group medium
-     */
-    public function testPMAGetHtmlForMonitor()
-    {
-        //Call the test function
-        $html = PMA_getHtmlForMonitor($this->ServerStatusData);
-
-        //validate 1: PMA_getHtmlForTabLinks
-        $this->assertContains(
-            '<div class="tabLinks">',
-            $html
-        );
-        $this->assertContains(
-            __('Start Monitor'),
-            $html
-        );
-        $this->assertContains(
-            __('Settings'),
-            $html
-        );
-        $this->assertContains(
-            __('Done dragging (rearranging) charts'),
-            $html
-        );
-        //validate 2: PMA_getHtmlForSettingsDialog
-        $this->assertContains(
-            '<div class="popupContent settingsPopup">',
-            $html
-        );
-        $this->assertContains(
-            '<a href="#settingsPopup" class="popupLink">',
-            $html
-        );
-        $this->assertContains(
-            __('Enable charts dragging'),
-            $html
-        );
-        $this->assertContains(
-            '<option>3</option>',
-            $html
-        );
-        //validate 3: PMA_getHtmlForInstructionsDialog
-        $this->assertContains(
-            __('Monitor Instructions'),
-            $html
-        );
-        $this->assertContains(
-            'monitorInstructionsDialog',
-            $html
-        );
-        //validate 4: PMA_getHtmlForAddChartDialog
-        $this->assertContains(
-            '<div id="addChartDialog"',
-            $html
-        );
-        $this->assertContains(
-            '<div id="chartVariableSettings">',
-            $html
-        );
-        $this->assertContains(
-            '<option>Processes</option>',
-            $html
-        );
-        $this->assertContains(
-            '<option>Connections</option>',
-            $html
-        );
-    }
-
-    /**
-     * Test for PMA_getHtmlForClientSideDataAndLinks
-     *
-     * @return void
-     */
-    public function testPMAGetHtmlForClientSideDataAndLinks()
-    {
-        //Call the test function
-        $html = PMA_getHtmlForClientSideDataAndLinks($this->ServerStatusData);
-
-        //validate 1: PMA_getHtmlForClientSideDataAndLinks
-        $from = '<form id="js_data" class="hide">'
-            . '<input type="hidden" name="server_time"';
-        $this->assertContains(
-            $from,
-            $html
-        );
-        //validate 2: inputs
-        $this->assertContains(
-            '<input type="hidden" name="is_superuser"',
-            $html
-        );
-        $this->assertContains(
-            '<input type="hidden" name="server_db_isLocal"',
-            $html
-        );
-        $this->assertContains(
-            '<div id="explain_docu" class="hide">',
-            $html
-        );
-    }
-
-    /**
-     * Test for PMA_getJsonForLogDataTypeSlow
-     *
-     * @return void
-     */
-    public function testPMAGetJsonForLogDataTypeSlow()
-    {
-        //Mock DBI
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $value = array(
-            'sql_text' => 'insert sql_text',
-            '#' => 'types',
-        );
-
-        $value2 = array(
-            'sql_text' => 'update sql_text',
-            '#' => 'types2',
-        );
-
-        $dbi->expects($this->at(1))->method('fetchAssoc')
-            ->will($this->returnValue($value));
-        $dbi->expects($this->at(2))->method('fetchAssoc')
-            ->will($this->returnValue($value2));
-        $dbi->expects($this->at(3))->method('fetchAssoc')
-            ->will($this->returnValue(false));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        //Call the test function
-        $start = 0;
-        $end = 10;
-        $ret = PMA_getJsonForLogDataTypeSlow($start, $end);
-
-        $result_rows = array(
-            array('sql_text' => 'insert sql_text', '#' => 'types'),
-            array('sql_text' => 'update sql_text', '#' => 'types2')
-        );
-        $result_sum = array('insert' =>0, 'TOTAL' =>0, 'update' => 0);
-        $this->assertEquals(
-            2,
-            $ret['numRows']
-        );
-        $this->assertEquals(
-            $result_rows,
-            $ret['rows']
-        );
-        $this->assertEquals(
-            $result_sum,
-            $ret['sum']
-        );
-    }
-
-    /**
-     * Test for PMA_getJsonForLogDataTypeGeneral
-     *
-     * @return void
-     */
-    public function testPMAGetJsonForLogDataTypeGeneral()
-    {
-        $_REQUEST['limitTypes'] = true;
-
-        //Mock DBI
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $value = array(
-            'sql_text' => 'insert sql_text',
-            '#' => 'types',
-            'argument' => 'argument argument2',
-        );
-
-        $value2 = array(
-            'sql_text' => 'update sql_text',
-            '#' => 'types2',
-            'argument' => 'argument3 argument4',
-        );
-
-        $dbi->expects($this->at(1))->method('fetchAssoc')
-            ->will($this->returnValue($value));
-        $dbi->expects($this->at(2))->method('fetchAssoc')
-            ->will($this->returnValue($value2));
-        $dbi->expects($this->at(3))->method('fetchAssoc')
-            ->will($this->returnValue(false));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        //Call the test function
-        $start = 0;
-        $end = 10;
-        $ret = PMA_getJsonForLogDataTypeGeneral($start, $end);
-
-        $result_rows = array(
-            $value,
-            $value2,
-        );
-        $result_sum = array('argument' =>0, 'TOTAL' =>0, 'argument3' => 0);
-
-        $this->assertEquals(
-            2,
-            $ret['numRows']
-        );
-        $this->assertEquals(
-            $result_rows,
-            $ret['rows']
-        );
-        $this->assertEquals(
-            $result_sum,
-            $ret['sum']
-        );
-    }
-
-    /**
-     * Test for PMA_getJsonForLoggingVars
-     *
-     * @return void
-     */
-    public function testPMAGetJsonForLoggingVars()
-    {
-        $_REQUEST['varName'] = "varName";
-
-        //Mock DBI
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $value = array(
-            'sql_text' => 'insert sql_text',
-            '#' => 'types',
-            'argument' => 'argument argument2',
-        );
-
-        $dbi->expects($this->any())->method('fetchResult')
-            ->will($this->returnValue($value));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        //Call the test function
-        $ret = PMA_getJsonForLoggingVars();
-
-        //validate that, the result is the same as fetchResult
-        $this->assertEquals(
-            $value,
-            $ret
-        );
-    }
-
-    /**
-     * Test for PMA_getJsonForQueryAnalyzer
-     *
-     * @return void
-     */
-    public function testPMAGetJsonForQueryAnalyzer()
-    {
-        $_REQUEST['database'] = "database";
-        $_REQUEST['query'] = 'query';
-        $GLOBALS['server'] = 'server';
-        $GLOBALS['cached_affected_rows'] = 'cached_affected_rows';
-        $_SESSION['cache']['server_server']['profiling_supported'] = true;
-
-        //Mock DBI
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $value = array(
-            'sql_text' => 'insert sql_text',
-            '#' => 'types',
-            'argument' => 'argument argument2',
-        );
-
-        $dbi->expects($this->at(4))->method('fetchAssoc')
-            ->will($this->returnValue($value));
-        $dbi->expects($this->at(5))->method('fetchAssoc')
-            ->will($this->returnValue(false));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        //Call the test function
-        $ret = PMA_getJsonForQueryAnalyzer();
-
-        $this->assertEquals(
-            'cached_affected_rows',
-            $ret['affectedRows']
-        );
-        $this->assertEquals(
-            array(),
-            $ret['profiling']
-        );
-        $this->assertEquals(
-            array($value),
-            $ret['explain']
-        );
-    }
-}
diff --git a/#pma/test/libraries/PMA_server_status_processes_test.php b/#pma/test/libraries/PMA_server_status_processes_test.php
deleted file mode 100644
index f1824a48..00000000
--- a/#pma/test/libraries/PMA_server_status_processes_test.php
+++ /dev/null
@@ -1,277 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for server_status_processes.lib.php
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-use PMA\libraries\Theme;
-
-
-require_once 'libraries/url_generating.lib.php';
-require_once 'libraries/server_status_processes.lib.php';
-require_once 'libraries/database_interface.inc.php';
-
-
-
-require_once 'libraries/sanitizing.lib.php';
-
-/**
- * class PMA_ServerStatusProcesses_Test
- *
- * this class is for testing server_status_processes.lib.php functions
- *
- * @package PhpMyAdmin-test
- */
-class PMA_ServerStatusProcesses_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Test for setUp
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        $GLOBALS['cfg']['Server']['host'] = "localhost";
-        $GLOBALS['PMA_PHP_SELF'] = PMA_getenv('PHP_SELF');
-        $GLOBALS['replication_info']['master']['status'] = true;
-        $GLOBALS['replication_info']['slave']['status'] = false;
-        $GLOBALS['replication_types'] = array();
-
-        $GLOBALS['pmaThemeImage'] = 'image';
-
-        //$_SESSION
-        $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
-        $_SESSION['PMA_Theme'] = new Theme();
-
-        //Mock DBI
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $GLOBALS['dbi'] = $dbi;
-    }
-
-    /**
-     * Test for PMA_getHtmlForProcessListAutoRefresh
-     *
-     * @return void
-     * @group medium
-     */
-    public function testPMAGetHtmlForProcessListAutoRefresh()
-    {
-        $html = PMA_getHtmlForProcessListAutoRefresh();
-
-        // Test Notice
-        $this->assertContains(
-            'Note: Enabling the auto refresh here might cause '
-            . 'heavy traffic between the web server and the MySQL server.',
-            $html
-        );
-        // Test tab links
-        $this->assertContains(
-            '<div class="tabLinks">',
-            $html
-        );
-        $this->assertContains(
-            '<a id="toggleRefresh" href="#">',
-            $html
-        );
-        $this->assertContains(
-            'play',
-            $html
-        );
-        $this->assertContains(
-            'Start auto refresh</a>',
-            $html
-        );
-        $this->assertContains(
-            '<label>Refresh rate: <select',
-            $html
-        );
-        $this->assertContains(
-            '<option value="5" selected="selected">5 seconds</option>',
-            $html
-        );
-    }
-
-    /**
-     * Test for PMA_getHtmlForServerProcesslist
-     *
-     * @return void
-     * @group medium
-     */
-    public function testPMAGetHtmlForServerProcessList()
-    {
-        $process = array(
-            "User" => "User1",
-            "Host" => "Host1",
-            "Id" => "Id1",
-            "db" => "db1",
-            "Command" => "Command1",
-            "Info" => "Info1",
-            "State" => "State1",
-            "Time" => "Time1"
-        );
-        $GLOBALS['cfg']['MaxCharactersInDisplayedSQL'] = 12;
-        $GLOBALS['dbi']->expects($this->any())->method('fetchAssoc')
-            ->will($this->onConsecutiveCalls($process));
-
-        $html = PMA_getHtmlForServerProcesslist();
-
-        // Test process table
-        $this->assertContains(
-            '<table id="tableprocesslist" '
-            . 'class="data clearfloat noclick sortable">',
-            $html
-        );
-        $this->assertContains(
-            '<th>Processes</th>',
-            $html
-        );
-        $this->assertContains(
-            'Show Full Queries',
-            $html
-        );
-        $this->assertContains(
-            'server_status_processes.php',
-            $html
-        );
-
-        $_REQUEST['full'] = true;
-        $_REQUEST['sort_order'] = 'ASC';
-        $_REQUEST['order_by_field'] = 'db';
-        $_REQUEST['column_name'] = 'Database';
-        $html = PMA_getHtmlForServerProcesslist();
-
-        $this->assertContains(
-            'Truncate Shown Queries',
-            $html
-        );
-        $this->assertContains(
-            'Database',
-            $html
-        );
-        $this->assertContains(
-            'DESC',
-            $html
-        );
-
-        $_REQUEST['sort_order'] = 'DESC';
-        $_REQUEST['order_by_field'] = 'Host';
-        $_REQUEST['column_name'] = 'Host';
-        $html = PMA_getHtmlForServerProcesslist();
-
-        $this->assertContains(
-            'Host',
-            $html
-        );
-        $this->assertContains(
-            'ASC',
-            $html
-        );
-    }
-
-    /**
-     * Test for PMA_getHtmlForServerProcessItem
-     *
-     * @return void
-     */
-    public function testPMAGetHtmlForServerProcessItem()
-    {
-        //parameters
-        $process = array(
-            "user" => "User1",
-            "host" => "Host1",
-            "id" => "Id1",
-            "db" => "db1",
-            "command" => "Command1",
-            "info" => "Info1",
-            "state" => "State1",
-            "time" => "Time1",
-        );
-        $odd_row = true;
-        $show_full_sql = true;
-
-        $_REQUEST['sort_order'] = "desc";
-        $_REQUEST['order_by_field'] = "process";
-        $GLOBALS['cfg']['MaxCharactersInDisplayedSQL'] = 12;
-
-        //Call the test function
-        $html = PMA_getHtmlForServerProcessItem($process, $odd_row, $show_full_sql);
-
-        //validate 1: $kill_process
-        $url_params = array(
-            'kill' => $process['id'],
-            'ajax_request' => true
-        );
-        $kill_process = 'server_status_processes.php'
-            . PMA_URL_getCommon($url_params);
-        $this->assertContains(
-            $kill_process,
-            $html
-        );
-        $this->assertContains(
-            'ajax kill_process',
-            $html
-        );
-        $this->assertContains(
-            __('Kill'),
-            $html
-        );
-
-        //validate 2: $process['User']
-        $this->assertContains(
-            htmlspecialchars($process['user']),
-            $html
-        );
-
-        //validate 3: $process['Host']
-        $this->assertContains(
-            htmlspecialchars($process['host']),
-            $html
-        );
-
-        //validate 4: $process['db']
-        $this->assertContains(
-            __('None'),
-            $html
-        );
-
-        //validate 5: $process['Command']
-        $this->assertContains(
-            htmlspecialchars($process['command']),
-            $html
-        );
-
-        //validate 6: $process['Time']
-        $this->assertContains(
-            $process['time'],
-            $html
-        );
-
-        //validate 7: $process['state']
-        $this->assertContains(
-            $process['state'],
-            $html
-        );
-
-        //validate 8: $process['info']
-        $this->assertContains(
-            $process['info'],
-            $html
-        );
-
-        unset($process['info']);
-        $html = PMA_getHtmlForServerProcessItem($process, $odd_row, $show_full_sql);
-
-        $this->assertContains(
-            '---',
-            $html
-        );
-    }
-}
diff --git a/#pma/test/libraries/PMA_server_status_queries_test.php b/#pma/test/libraries/PMA_server_status_queries_test.php
deleted file mode 100644
index c18e9004..00000000
--- a/#pma/test/libraries/PMA_server_status_queries_test.php
+++ /dev/null
@@ -1,239 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for server_status_queries.lib.php
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-
-use PMA\libraries\ServerStatusData;
-use PMA\libraries\Theme;
-
-
-require_once 'libraries/url_generating.lib.php';
-
-require_once 'libraries/server_status_queries.lib.php';
-
-require_once 'libraries/database_interface.inc.php';
-
-require_once 'libraries/sanitizing.lib.php';
-require_once 'libraries/js_escape.lib.php';
-
-/**
- * class PMA_ServerStatusVariables_Test
- *
- * this class is for testing server_status_queries.lib.php functions
- *
- * @package PhpMyAdmin-test
- */
-class PMA_ServerStatusQueries_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Prepares environment for the test.
-     *
-     * @return void
-     */
-    public $ServerStatusData;
-
-    /**
-     * Test for setUp
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        //$GLOBALS
-        $GLOBALS['cfg']['MaxRows'] = 10;
-        $GLOBALS['cfg']['ServerDefault'] = "server";
-        $GLOBALS['cfg']['RememberSorting'] = true;
-        $GLOBALS['cfg']['SQP'] = array();
-        $GLOBALS['cfg']['MaxCharactersInDisplayedSQL'] = 1000;
-        $GLOBALS['cfg']['ShowSQL'] = true;
-        $GLOBALS['cfg']['TableNavigationLinksMode'] = 'icons';
-        $GLOBALS['cfg']['LimitChars'] = 100;
-        $GLOBALS['cfg']['DBG']['sql'] = false;
-        $GLOBALS['cfg']['Server']['host'] = "localhost";
-        $GLOBALS['PMA_PHP_SELF'] = PMA_getenv('PHP_SELF');
-        $GLOBALS['replication_info']['master']['status'] = false;
-        $GLOBALS['replication_info']['slave']['status'] = false;
-
-        $GLOBALS['table'] = "table";
-        $GLOBALS['pmaThemeImage'] = 'image';
-
-        //$_SESSION
-        $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
-        $_SESSION['PMA_Theme'] = new Theme();
-
-        //Mock DBI
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        //this data is needed when ServerStatusData constructs
-        $server_status = array(
-            "Aborted_clients" => "0",
-            "Aborted_connects" => "0",
-            "Com_delete_multi" => "0",
-            "Com_create_function" => "0",
-            "Com_empty_query" => "0",
-        );
-
-        $server_variables= array(
-            "auto_increment_increment" => "1",
-            "auto_increment_offset" => "1",
-            "automatic_sp_privileges" => "ON",
-            "back_log" => "50",
-            "big_tables" => "OFF",
-        );
-
-        $fetchResult = array(
-            array(
-                "SHOW GLOBAL STATUS",
-                0,
-                1,
-                null,
-                0,
-                $server_status
-            ),
-            array(
-                "SHOW GLOBAL VARIABLES",
-                0,
-                1,
-                null,
-                0,
-                $server_variables
-            )
-        );
-
-        $dbi->expects($this->any())->method('fetchResult')
-            ->will($this->returnValueMap($fetchResult));
-
-        $GLOBALS['dbi'] = $dbi;
-        $this->ServerStatusData = new ServerStatusData();
-        $upTime = "10h";
-        $this->ServerStatusData->status['Uptime'] = $upTime;
-        $this->ServerStatusData->used_queries = array(
-            "Com_change_db" => "15",
-            "Com_select" => "12",
-            "Com_set_option" => "54",
-            "Com_show_databases" => "16",
-            "Com_show_status" => "14",
-            "Com_show_tables" => "13",
-        );
-    }
-
-    /**
-     * Test for PMA_getHtmlForQueryStatistics
-     *
-     * @return void
-     */
-    public function testPMAGetHtmlForQueryStatistics()
-    {
-        //Call the test function
-        $html = PMA_getHtmlForQueryStatistics($this->ServerStatusData);
-
-        $hour_factor   = 3600 / $this->ServerStatusData->status['Uptime'];
-        $used_queries = $this->ServerStatusData->used_queries;
-        $total_queries = array_sum($used_queries);
-
-        $questions_from_start = sprintf(
-            __('Questions since startup: %s'),
-            PMA\libraries\Util::formatNumber($total_queries, 0)
-        );
-
-        //validate 1: PMA_getHtmlForQueryStatistics
-        $this->assertContains(
-            '<h3 id="serverstatusqueries">',
-            $html
-        );
-        $this->assertContains(
-            $questions_from_start,
-            $html
-        );
-
-        //validate 2: per hour
-        $this->assertContains(
-            __('per hour:'),
-            $html
-        );
-        $this->assertContains(
-            PMA\libraries\Util::formatNumber($total_queries * $hour_factor, 0),
-            $html
-        );
-
-        //validate 3:per minute
-        $value_per_minute = PMA\libraries\Util::formatNumber(
-            $total_queries * 60 / $this->ServerStatusData->status['Uptime'],
-            0
-        );
-        $this->assertContains(
-            __('per minute:'),
-            $html
-        );
-        $this->assertContains(
-            $value_per_minute,
-            $html
-        );
-    }
-
-    /**
-     * Test for PMA_getHtmlForServerStatusQueriesDetails
-     *
-     * @return void
-     */
-    public function testPMAGetHtmlForServerStatusQueriesDetails()
-    {
-        //Call the test function
-        $html = PMA_getHtmlForServerStatusQueriesDetails($this->ServerStatusData);
-
-        //validate 1: PMA_getHtmlForServerStatusQueriesDetails
-        $this->assertContains(
-            __('Statements'),
-            $html
-        );
-
-        //validate 2: used queries
-        $this->assertContains(
-            htmlspecialchars("change db"),
-            $html
-        );
-        $this->assertContains(
-            '54',
-            $html
-        );
-        $this->assertContains(
-            htmlspecialchars("select"),
-            $html
-        );
-        $this->assertContains(
-            htmlspecialchars("set option"),
-            $html
-        );
-        $this->assertContains(
-            htmlspecialchars("show databases"),
-            $html
-        );
-        $this->assertContains(
-            htmlspecialchars("show status"),
-            $html
-        );
-        $this->assertContains(
-            htmlspecialchars("show tables"),
-            $html
-        );
-
-        //validate 3:serverstatusquerieschart
-        $this->assertContains(
-            '<div id="serverstatusquerieschart"></div>',
-            $html
-        );
-        $this->assertContains(
-            '<div id="serverstatusquerieschart_data"',
-            $html
-        );
-    }
-}
diff --git a/#pma/test/libraries/PMA_server_status_test.php b/#pma/test/libraries/PMA_server_status_test.php
deleted file mode 100644
index 8c28e426..00000000
--- a/#pma/test/libraries/PMA_server_status_test.php
+++ /dev/null
@@ -1,271 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for server_status.lib.php
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-use PMA\libraries\ServerStatusData;
-use PMA\libraries\Theme;
-
-
-require_once 'libraries/url_generating.lib.php';
-
-require_once 'libraries/server_status.lib.php';
-
-require_once 'libraries/database_interface.inc.php';
-
-/**
- * class PMA_ServerStatus_Test
- *
- * this class is for testing server_status.lib.php functions
- *
- * @package PhpMyAdmin-test
- */
-class PMA_ServerStatus_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Prepares environment for the test.
-     *
-     * @return void
-     */
-    public $ServerStatusData;
-
-    /**
-     * Test for setUp
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        $GLOBALS['cfg']['Server']['host'] = "localhost";
-        $GLOBALS['cfg']['ShowHint'] = true;
-        $GLOBALS['cfg']['ActionLinksMode'] = 'icons';
-        $GLOBALS['PMA_PHP_SELF'] = PMA_getenv('PHP_SELF');
-        $GLOBALS['replication_info']['master']['status'] = true;
-        $GLOBALS['replication_info']['slave']['status'] = false;
-        $GLOBALS['replication_types'] = array();
-
-        $GLOBALS['table'] = "table";
-        $GLOBALS['pmaThemeImage'] = 'image';
-
-        //$_SESSION
-        $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
-        $_SESSION['PMA_Theme'] = new Theme();
-
-        //Mock DBI
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        //this data is needed when ServerStatusData constructs
-        $server_status = array(
-            "Aborted_clients" => "0",
-            "Aborted_connects" => "0",
-            "Com_delete_multi" => "0",
-            "Com_create_function" => "0",
-            "Com_empty_query" => "0",
-            "Com_execute_sql" => 2,
-            "Com_stmt_execute" => 2,
-        );
-
-        $server_variables= array(
-            "auto_increment_increment" => "1",
-            "auto_increment_offset" => "1",
-            "automatic_sp_privileges" => "ON",
-            "back_log" => "50",
-            "big_tables" => "OFF",
-        );
-
-        $fetchResult = array(
-            array(
-                "SHOW GLOBAL STATUS",
-                0,
-                1,
-                null,
-                0,
-                $server_status
-            ),
-            array(
-                "SHOW GLOBAL VARIABLES",
-                0,
-                1,
-                null,
-                0,
-                $server_variables
-            ),
-            array(
-                "SELECT concat('Com_', variable_name), variable_value "
-                    . "FROM data_dictionary.GLOBAL_STATEMENTS",
-                0,
-                1,
-                null,
-                0,
-                $server_status
-            ),
-        );
-
-        $dbi->expects($this->at(0))
-            ->method('tryQuery')
-            ->with('SHOW GLOBAL STATUS')
-            ->will($this->returnValue(true));
-
-        $dbi->expects($this->at(1))
-            ->method('fetchRow')
-            ->will($this->returnValue(array("Aborted_clients", "0")));
-        $dbi->expects($this->at(2))
-            ->method('fetchRow')
-            ->will($this->returnValue(array("Aborted_connects", "0")));
-        $dbi->expects($this->at(3))
-            ->method('fetchRow')
-            ->will($this->returnValue(array("Com_delete_multi", "0")));
-        $dbi->expects($this->at(4))
-            ->method('fetchRow')
-            ->will($this->returnValue(array("Com_create_function", "0")));
-        $dbi->expects($this->at(5))
-            ->method('fetchRow')
-            ->will($this->returnValue(array("Com_empty_query", "0")));
-        $dbi->expects($this->at(6))
-            ->method('fetchRow')
-            ->will($this->returnValue(false));
-
-        $dbi->expects($this->at(7))->method('freeResult');
-
-        $dbi->expects($this->any())->method('fetchResult')
-            ->will($this->returnValueMap($fetchResult));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $this->ServerStatusData = new ServerStatusData();
-    }
-
-    /**
-     * Test for PMA_getHtmlForServerStatus
-     *
-     * @return void
-     * @group medium
-     */
-    public function testPMAGetHtmlForServerStatus()
-    {
-        //parameters
-        $upTime = "10h";
-        $bytes_received = 100;
-        $bytes_sent = 200;
-        $max_used_conn = 500;
-        $aborted_conn = 200;
-        $conn = 1000;
-        $this->ServerStatusData->status['Uptime'] = $upTime;
-        $this->ServerStatusData->status['Bytes_received'] = $bytes_received;
-        $this->ServerStatusData->status['Bytes_sent'] = $bytes_sent;
-        $this->ServerStatusData->status['Max_used_connections'] = $max_used_conn;
-        $this->ServerStatusData->status['Aborted_connects'] = $aborted_conn;
-        $this->ServerStatusData->status['Connections'] = $conn;
-
-        //Call the test function
-        $html = PMA_getHtmlForServerStatus($this->ServerStatusData);
-
-        //validate 1: PMA_getHtmlForServerStateGeneralInfo
-        //traffic: $bytes_received + $bytes_sent
-        $traffic = $bytes_received + $bytes_sent;
-        $traffic_html = 'Network traffic since startup: ' . $traffic . ' B';
-        $this->assertContains(
-            $traffic_html,
-            $html
-        );
-        //updatetime
-        $upTime_html = 'This MySQL server has been running for '
-            . '0 days, 0 hours, 0 minutes and 10h seconds';
-        $this->assertContains(
-            $upTime_html,
-            $html
-        );
-        //master state
-        $master_html = 'This MySQL server works as <b>master</b>';
-        $this->assertContains(
-            $master_html,
-            $html
-        );
-
-        //validate 2: PMA_getHtmlForServerStateTraffic
-        $traffic_html = '<table id="serverstatustraffic" class="data noclick">';
-        $this->assertContains(
-            $traffic_html,
-            $html
-        );
-        //traffic hint
-        $traffic_html = 'On a busy server, the byte counters may overrun';
-        $this->assertContains(
-            $traffic_html,
-            $html
-        );
-        //$bytes_received
-        $this->assertContains(
-            '<td class="value">' . $bytes_received . ' B',
-            $html
-        );
-        //$bytes_sent
-        $this->assertContains(
-            '<td class="value">' . $bytes_sent . ' B',
-            $html
-        );
-
-        //validate 3: PMA_getHtmlForServerStateConnections
-        $this->assertContains(
-            '<th>Connections</th>',
-            $html
-        );
-        $this->assertContains(
-            '<th>&oslash; per hour</th>',
-            $html
-        );
-        $this->assertContains(
-            '<table id="serverstatusconnections" class="data noclick">',
-            $html
-        );
-        $this->assertContains(
-            '<th class="name">Max. concurrent connections</th>',
-            $html
-        );
-        //Max_used_connections
-        $this->assertContains(
-            '<td class="value">' . $max_used_conn,
-            $html
-        );
-        $this->assertContains(
-            '<th class="name">Failed attempts</th>',
-            $html
-        );
-        //Aborted_connects
-        $this->assertContains(
-            '<td class="value">' . $aborted_conn,
-            $html
-        );
-        $this->assertContains(
-            '<th class="name">Aborted</th>',
-            $html
-        );
-
-        $GLOBALS['replication_info']['master']['status'] = true;
-        $GLOBALS['replication_info']['slave']['status'] = true;
-        $this->ServerStatusData->status['Connections'] = 0;
-        $html = PMA_getHtmlForServerStatus($this->ServerStatusData);
-
-        $this->assertContains(
-            'This MySQL server works as <b>master</b> and <b>slave</b>',
-            $html
-        );
-
-        $GLOBALS['replication_info']['master']['status'] = false;
-        $GLOBALS['replication_info']['slave']['status'] = true;
-        $html = PMA_getHtmlForServerStatus($this->ServerStatusData);
-
-        $this->assertContains(
-            'This MySQL server works as <b>slave</b>',
-            $html
-        );
-    }
-}
diff --git a/#pma/test/libraries/PMA_server_status_variables_test.php b/#pma/test/libraries/PMA_server_status_variables_test.php
deleted file mode 100644
index 6820f502..00000000
--- a/#pma/test/libraries/PMA_server_status_variables_test.php
+++ /dev/null
@@ -1,282 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for server_status_variables.lib.php
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-use PMA\libraries\ServerStatusData;
-use PMA\libraries\Theme;
-
-
-require_once 'libraries/url_generating.lib.php';
-
-require_once 'libraries/server_status_variables.lib.php';
-
-require_once 'libraries/database_interface.inc.php';
-
-require_once 'libraries/sanitizing.lib.php';
-require_once 'libraries/js_escape.lib.php';
-
-/**
- * class PMA_ServerStatusVariables_Test
- *
- * this class is for testing server_status_variables.lib.php functions
- *
- * @package PhpMyAdmin-test
- */
-class PMA_ServerStatusVariables_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Prepares environment for the test.
-     *
-     * @return void
-     */
-    public $ServerStatusData;
-
-    /**
-     * Test for setUp
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        //$_REQUEST
-        $_REQUEST['log'] = "index1";
-        $_REQUEST['pos'] = 3;
-
-        //$GLOBALS
-        $GLOBALS['cfg']['MaxRows'] = 10;
-        $GLOBALS['cfg']['ServerDefault'] = "server";
-        $GLOBALS['cfg']['RememberSorting'] = true;
-        $GLOBALS['cfg']['SQP'] = array();
-        $GLOBALS['cfg']['MaxCharactersInDisplayedSQL'] = 1000;
-        $GLOBALS['cfg']['ShowSQL'] = true;
-        $GLOBALS['cfg']['TableNavigationLinksMode'] = 'icons';
-        $GLOBALS['cfg']['LimitChars'] = 100;
-        $GLOBALS['cfg']['DBG']['sql'] = false;
-        $GLOBALS['cfg']['Server']['host'] = "localhost";
-        $GLOBALS['PMA_PHP_SELF'] = PMA_getenv('PHP_SELF');
-        $GLOBALS['replication_info']['master']['status'] = false;
-        $GLOBALS['replication_info']['slave']['status'] = false;
-
-        $GLOBALS['table'] = "table";
-        $GLOBALS['pmaThemeImage'] = 'image';
-
-        //$_SESSION
-        $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
-        $_SESSION['PMA_Theme'] = new Theme();
-
-        //Mock DBI
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        //this data is needed when ServerStatusData constructs
-        $server_status = array(
-            "Aborted_clients" => "0",
-            "Aborted_connects" => "0",
-            "Com_delete_multi" => "0",
-            "Com_create_function" => "0",
-            "Com_empty_query" => "0",
-        );
-
-        $server_variables= array(
-            "auto_increment_increment" => "1",
-            "auto_increment_offset" => "1",
-            "automatic_sp_privileges" => "ON",
-            "back_log" => "50",
-            "big_tables" => "OFF",
-        );
-
-        $fetchResult = array(
-            array(
-                "SHOW GLOBAL STATUS",
-                0,
-                1,
-                null,
-                0,
-                $server_status
-            ),
-            array(
-                "SHOW GLOBAL VARIABLES",
-                0,
-                1,
-                null,
-                0,
-                $server_variables
-            ),
-            array(
-                "SELECT concat('Com_', variable_name), variable_value "
-                    . "FROM data_dictionary.GLOBAL_STATEMENTS",
-                0,
-                1,
-                null,
-                0,
-                $server_status
-            ),
-        );
-
-        $dbi->expects($this->at(0))
-            ->method('tryQuery')
-            ->with('SHOW GLOBAL STATUS')
-            ->will($this->returnValue(true));
-
-        $dbi->expects($this->at(1))
-            ->method('fetchRow')
-            ->will($this->returnValue(array("Aborted_clients", "0")));
-        $dbi->expects($this->at(2))
-            ->method('fetchRow')
-            ->will($this->returnValue(array("Aborted_connects", "0")));
-        $dbi->expects($this->at(3))
-            ->method('fetchRow')
-            ->will($this->returnValue(array("Com_delete_multi", "0")));
-        $dbi->expects($this->at(4))
-            ->method('fetchRow')
-            ->will($this->returnValue(array("Com_create_function", "0")));
-        $dbi->expects($this->at(5))
-            ->method('fetchRow')
-            ->will($this->returnValue(array("Com_empty_query", "0")));
-        $dbi->expects($this->at(6))
-            ->method('fetchRow')
-            ->will($this->returnValue(false));
-
-        $dbi->expects($this->at(7))->method('freeResult');
-
-        $dbi->expects($this->any())->method('fetchResult')
-            ->will($this->returnValueMap($fetchResult));
-
-        $GLOBALS['dbi'] = $dbi;
-        $this->ServerStatusData = new ServerStatusData();
-    }
-
-    /**
-     * Test for PMA_getHtmlForFilter
-     *
-     * @return void
-     */
-    public function testPMAGetHtmlForFilter()
-    {
-        //Call the test function
-        $html = PMA_getHtmlForFilter($this->ServerStatusData);
-
-        //validate 1: PMA_getHtmlForFilter
-        $this->assertContains(
-            '<fieldset id="tableFilter">',
-            $html
-        );
-        $this->assertContains(
-            'server_status_variables.php',
-            $html
-        );
-        //validate 2: filter
-        $this->assertContains(
-            '<label for="filterText">Containing the word:</label>',
-            $html
-        );
-        //validate 3:Items
-        $this->assertContains(
-            '<label for="filterAlert">Show only alert values</label>',
-            $html
-        );
-        $this->assertContains(
-            'Filter by category',
-            $html
-        );
-        $this->assertContains(
-            'Show unformatted values',
-            $html
-        );
-    }
-
-    /**
-     * Test for PMA_getHtmlForLinkSuggestions
-     *
-     * @return void
-     */
-    public function testPMAGetHtmlForLinkSuggestions()
-    {
-        //Call the test function
-        $html = PMA_getHtmlForLinkSuggestions($this->ServerStatusData);
-
-        //validate 1: PMA_getHtmlForLinkSuggestions
-        $this->assertContains(
-            '<div id="linkSuggestions" class="defaultLinks"',
-            $html
-        );
-        //validate 2: linkSuggestions
-        $this->assertContains(
-            '<p class="notice">Related links:',
-            $html
-        );
-        $this->assertContains(
-            'Flush (close) all tables',
-            $html
-        );
-        $this->assertContains(
-            '<span class="status_binlog_cache">',
-            $html
-        );
-    }
-
-    /**
-     * Test for PMA_getHtmlForVariablesList
-     *
-     * @return void
-     * @group medium
-     */
-    public function testPMAGetHtmlForVariablesList()
-    {
-        //Call the test function
-        $html = PMA_getHtmlForVariablesList($this->ServerStatusData);
-
-        //validate 1: PMA_getHtmlForVariablesList
-        $table = '<table class="data noclick" '
-            . 'id="serverstatusvariables">';
-        $this->assertContains(
-            $table,
-            $html
-        );
-        $this->assertContains(
-            '<th>Variable</th>',
-            $html
-        );
-        $this->assertContains(
-            '<th>Value</th>',
-            $html
-        );
-        $this->assertContains(
-            '<th>Description</th>',
-            $html
-        );
-        //validate 3:Items
-        $this->assertContains(
-            '<th class="name">Aborted clients',
-            $html
-        );
-        $this->assertContains(
-            '<span class="allfine">0</span>',
-            $html
-        );
-        $this->assertContains(
-            '<th class="name">Aborted connects',
-            $html
-        );
-        $this->assertContains(
-            '<th class="name">Com delete multi',
-            $html
-        );
-        $this->assertContains(
-            '<th class="name">Com create function',
-            $html
-        );
-        $this->assertContains(
-            '<th class="name">Com empty query',
-            $html
-        );
-    }
-}
diff --git a/#pma/test/libraries/PMA_server_user_groups_test.php b/#pma/test/libraries/PMA_server_user_groups_test.php
deleted file mode 100644
index d352f1c6..00000000
--- a/#pma/test/libraries/PMA_server_user_groups_test.php
+++ /dev/null
@@ -1,270 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Tests for server_user_groups.lib.php
- *
- * @package PhpMyAdmin-test
- */
-
-use PMA\libraries\Theme;
-
-
-
-require_once 'libraries/relation.lib.php';
-require_once 'libraries/database_interface.inc.php';
-require_once 'libraries/url_generating.lib.php';
-/*
- * Include to test.
- */
-require_once 'libraries/server_user_groups.lib.php';
-
-/**
- * Tests for server_user_groups.lib.php
- *
- * @package PhpMyAdmin-test
- */
-class PMA_ServerUserGroupsTest extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Prepares environment for the test.
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        $GLOBALS['cfg']['ServerDefault'] = 1;
-        $GLOBALS['cfg']['ActionLinksMode'] = 'both';
-
-        $GLOBALS['server'] = 1;
-        $_SESSION['relation'][$GLOBALS['server']] = array(
-            'PMA_VERSION' => PMA_VERSION,
-            'db' => 'pmadb',
-            'users' => 'users',
-            'usergroups' => 'usergroups'
-        );
-
-        $GLOBALS['pmaThemeImage'] = 'image';
-        $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
-        $_SESSION['PMA_Theme'] = new Theme();
-    }
-
-    /**
-     * Tests PMA_getHtmlForUserGroupsTable() function when there are no user groups
-     *
-     * @return void
-     * @group medium
-     */
-    public function testGetHtmlForUserGroupsTableWithNoUserGroups()
-    {
-        $expectedQuery = "SELECT * FROM `pmadb`.`usergroups`"
-            . " ORDER BY `usergroup` ASC";
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $dbi->expects($this->once())
-            ->method('tryQuery')
-            ->with($expectedQuery)
-            ->will($this->returnValue(true));
-        $dbi->expects($this->once())
-            ->method('numRows')
-            ->withAnyParameters()
-            ->will($this->returnValue(0));
-        $dbi->expects($this->once())
-            ->method('freeResult');
-        $GLOBALS['dbi'] = $dbi;
-
-        $html = PMA_getHtmlForUserGroupsTable();
-        $this->assertNotContains(
-            '<table id="userGroupsTable">',
-            $html
-        );
-        $url_tag = '<a href="server_user_groups.php'
-            . PMA_URL_getCommon(array('addUserGroup' => 1));
-        $this->assertContains(
-            $url_tag,
-            $html
-        );
-    }
-
-    /**
-     * Tests PMA_getHtmlForUserGroupsTable() function when there are user groups
-     *
-     * @return void
-     */
-    public function testGetHtmlForUserGroupsTableWithUserGroups()
-    {
-        $expectedQuery = "SELECT * FROM `pmadb`.`usergroups`"
-            . " ORDER BY `usergroup` ASC";
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $dbi->expects($this->once())
-            ->method('tryQuery')
-            ->with($expectedQuery)
-            ->will($this->returnValue(true));
-        $dbi->expects($this->once())
-            ->method('numRows')
-            ->withAnyParameters()
-            ->will($this->returnValue(1));
-        $dbi->expects($this->at(2))
-            ->method('fetchAssoc')
-            ->withAnyParameters()
-            ->will(
-                $this->returnValue(
-                    array(
-                        'usergroup' => 'usergroup',
-                        'tab' => 'server_sql',
-                        'allowed' => 'Y'
-                    )
-                )
-            );
-        $dbi->expects($this->at(3))
-            ->method('fetchAssoc')
-            ->withAnyParameters()
-            ->will($this->returnValue(false));
-        $dbi->expects($this->once())
-            ->method('freeResult');
-        $GLOBALS['dbi'] = $dbi;
-
-        $html = PMA_getHtmlForUserGroupsTable();
-        $this->assertContains(
-            '<td>usergroup</td>',
-            $html
-        );
-        $url_tag = '<a class="" href="server_user_groups.php'
-            . PMA_URL_getCommon(
-                array(
-                    'viewUsers'=>1, 'userGroup'=>htmlspecialchars('usergroup')
-                )
-            );
-        $this->assertContains(
-            $url_tag,
-            $html
-        );
-        $url_tag = '<a class="" href="server_user_groups.php'
-            . PMA_URL_getCommon(
-                array(
-                    'editUserGroup'=>1,
-                    'userGroup'=>htmlspecialchars('usergroup')
-                )
-            );
-        $this->assertContains(
-            $url_tag,
-            $html
-        );
-        $url_tag = '<a class="deleteUserGroup ajax" href="server_user_groups.php'
-            . PMA_URL_getCommon(
-                array(
-                    'deleteUserGroup'=> 1,
-                    'userGroup'=>htmlspecialchars('usergroup')
-                )
-            );
-        $this->assertContains(
-            $url_tag,
-            $html
-        );
-    }
-
-    /**
-     * Tests PMA_deleteUserGroup() function
-     *
-     * @return void
-     */
-    public function testDeleteUserGroup()
-    {
-        $userDelQuery = "DELETE FROM `pmadb`.`users`"
-            . " WHERE `usergroup`='ug'";
-        $userGrpDelQuery = "DELETE FROM `pmadb`.`usergroups`"
-            . " WHERE `usergroup`='ug'";
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $dbi->expects($this->at(1))
-            ->method('query')
-            ->with($userDelQuery);
-        $dbi->expects($this->at(3))
-            ->method('query')
-            ->with($userGrpDelQuery);
-        $dbi->expects($this->any())
-            ->method('escapeString')
-            ->will($this->returnArgument(0));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        PMA_deleteUserGroup('ug');
-    }
-
-    /**
-     * Tests PMA_getHtmlToEditUserGroup() function
-     *
-     * @return void
-     */
-    public function testGetHtmlToEditUserGroup()
-    {
-        // adding a user group
-        $html = PMA_getHtmlToEditUserGroup();
-        $this->assertContains(
-            '<input type="hidden" name="addUserGroupSubmit" value="1"',
-            $html
-        );
-        $this->assertContains(
-            '<input type="text" name="userGroup"',
-            $html
-        );
-
-        $expectedQuery = "SELECT * FROM `pmadb`.`usergroups`"
-            . " WHERE `usergroup`='ug'";
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $dbi->expects($this->once())
-            ->method('tryQuery')
-            ->with($expectedQuery)
-            ->will($this->returnValue(true));
-        $dbi->expects($this->exactly(2))
-            ->method('fetchAssoc')
-            ->willReturnOnConsecutiveCalls(
-                array(
-                    'usergroup' => 'ug',
-                    'tab' => 'server_sql',
-                    'allowed' => 'Y'
-                ),
-                false
-            );
-        $dbi->expects($this->once())
-            ->method('freeResult');
-        $dbi->expects($this->any())
-            ->method('escapeString')
-            ->will($this->returnArgument(0));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        // editing a user group
-        $html = PMA_getHtmlToEditUserGroup('ug');
-        $this->assertContains(
-            '<input type="hidden" name="userGroup" value="ug"',
-            $html
-        );
-        $this->assertContains(
-            '<input type="hidden" name="editUserGroupSubmit" value="1"',
-            $html
-        );
-        $this->assertContains(
-            '<input type="hidden" name="editUserGroupSubmit" value="1"',
-            $html
-        );
-        $this->assertContains(
-            '<input type="checkbox" class="checkall" checked="checked"'
-            . ' name="server_sql" value="Y" />',
-            $html
-        );
-        $this->assertContains(
-            '<input type="checkbox" class="checkall"'
-            . ' name="server_databases" value="Y" />',
-            $html
-        );
-    }
-}
diff --git a/#pma/test/libraries/PMA_server_users_test.php b/#pma/test/libraries/PMA_server_users_test.php
deleted file mode 100644
index b2c1aec8..00000000
--- a/#pma/test/libraries/PMA_server_users_test.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Tests for server_users.lib.php
- *
- * @package PhpMyAdmin-test
- */
-
-require_once 'libraries/url_generating.lib.php';
-
-/*
- * Include to test.
- */
-require_once 'libraries/server_users.lib.php';
-
-/**
- * PMA_ServerUsers_Test class
- *
- * This class is for testing server_users.lib.php functions
- *
- * @package PhpMyAdmin-test
- */
-class PMA_ServerUsers_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Test for PMA_getHtmlForSubMenusOnUsersPage
-     *
-     * @return void
-     */
-    public function testPMAGetHtmlForSubMenusOnUsersPage()
-    {
-        $html = PMA_getHtmlForSubMenusOnUsersPage('server_privileges.php');
-
-        //validate 1: topmenu2
-        $this->assertContains(
-            '<ul id="topmenu2">',
-            $html
-        );
-
-        //validate 2: tabactive for server_privileges.php
-        $this->assertContains(
-            '<a class="tabactive" href="server_privileges.php',
-            $html
-        );
-        $this->assertContains(
-            __('User accounts overview'),
-            $html
-        );
-
-        //validate 3: not-active for server_user_groups.php
-        $this->assertContains(
-            '<a href="server_user_groups.php',
-            $html
-        );
-        $this->assertContains(
-            __('User groups'),
-            $html
-        );
-    }
-}
diff --git a/#pma/test/libraries/PMA_sql_query_form_test.php b/#pma/test/libraries/PMA_sql_query_form_test.php
deleted file mode 100644
index 3ec9b1d2..00000000
--- a/#pma/test/libraries/PMA_sql_query_form_test.php
+++ /dev/null
@@ -1,225 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for sql_query_form.lib.php
- *
- * @package PhpMyAdmin-test
- */
-
-//the following definition should be used globally
-use PMA\libraries\Theme;
-
-$GLOBALS['server'] = 0;
-
-/*
- * Include to test.
-*/
-
-require_once 'libraries/url_generating.lib.php';
-require_once 'libraries/relation.lib.php';
-
-
-require_once 'libraries/sanitizing.lib.php';
-require_once 'libraries/js_escape.lib.php';
-require_once 'libraries/database_interface.inc.php';
-require_once 'libraries/sql_query_form.lib.php';
-require_once 'libraries/kanji-encoding.lib.php';
-require_once 'libraries/mysql_charsets.inc.php';
-
-/**
- * class PMA_SqlQueryForm_Test
- *
- * this class is for testing sql_query_form.lib.php functions
- *
- * @package PhpMyAdmin-test
- */
-class PMA_SqlQueryForm_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Test for setUp
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        //$GLOBALS
-        $GLOBALS['max_upload_size'] = 100;
-        $GLOBALS['PMA_PHP_SELF'] = PMA_getenv('PHP_SELF');
-        $GLOBALS['db'] = "PMA_db";
-        $GLOBALS['table'] = "PMA_table";
-        $GLOBALS['pmaThemeImage'] = 'image';
-        $GLOBALS['text_dir'] = "text_dir";
-
-        $GLOBALS['cfg']['GZipDump'] = false;
-        $GLOBALS['cfg']['BZipDump'] = false;
-        $GLOBALS['cfg']['ZipDump'] = false;
-        $GLOBALS['cfg']['ServerDefault'] = "default";
-        $GLOBALS['cfg']['TextareaAutoSelect'] = true;
-        $GLOBALS['cfg']['TextareaRows'] = 100;
-        $GLOBALS['cfg']['TextareaCols'] = 11;
-        $GLOBALS['cfg']['DefaultTabDatabase'] = "structure";
-        $GLOBALS['cfg']['RetainQueryBox'] = true;
-        $GLOBALS['cfg']['ActionLinksMode'] = 'both';
-        $GLOBALS['cfg']['DefaultTabTable'] = 'browse';
-        $GLOBALS['cfg']['CodemirrorEnable'] = true;
-        $GLOBALS['cfg']['DefaultForeignKeyChecks'] = 'default';
-
-        //_SESSION
-        $_SESSION['relation'][0] = array(
-            'PMA_VERSION' => PMA_VERSION,
-            'table_coords' => "table_name",
-            'displaywork' => 'displaywork',
-            'db' => "information_schema",
-            'table_info' => 'table_info',
-            'relwork' => 'relwork',
-            'relation' => 'relation',
-            'bookmarkwork' => 'bookmarkwork',
-        );
-        //$GLOBALS
-        $GLOBALS['cfg']['Server']['user'] = "user";
-        $GLOBALS['cfg']['Server']['pmadb'] = "pmadb";
-        $GLOBALS['cfg']['Server']['bookmarktable'] = "bookmarktable";
-
-        //$_SESSION
-        $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
-        $_SESSION['PMA_Theme'] = new Theme();
-
-        //Mock DBI
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $fetchResult = array("index1"=>"table1", "index2"=>"table2");
-        $dbi->expects($this->any())
-            ->method('fetchResult')
-            ->will($this->returnValue($fetchResult));
-
-        $getColumns = array(
-            array(
-                "Field" => "field1",
-                "Comment" => "Comment1"
-            )
-        );
-        $dbi->expects($this->any())
-            ->method('getColumns')
-            ->will($this->returnValue($getColumns));
-
-        $GLOBALS['dbi'] = $dbi;
-    }
-
-    /**
-     * Test for PMA_getHtmlForSqlQueryFormInsert
-     *
-     * @return void
-     */
-    public function testPMAGetHtmlForSqlQueryFormInsert()
-    {
-        //Call the test function
-        $query = "select * from PMA";
-        $html = PMA_getHtmlForSqlQueryFormInsert($query);
-
-        //validate 1: query
-        $this->assertContains(
-            htmlspecialchars($query),
-            $html
-        );
-
-        //validate 2: enable auto select text in textarea
-        $auto_sel = ' onclick="selectContent(this, sql_box_locked, true);"';
-        $this->assertContains(
-            $auto_sel,
-            $html
-        );
-
-        //validate 3: showMySQLDocu
-        $this->assertContains(
-            PMA\libraries\Util::showMySQLDocu('SELECT'),
-            $html
-        );
-
-        //validate 4: $fields_list
-        $this->assertContains(
-            '<input type="button" value="DELETE" id="delete"',
-            $html
-        );
-        $this->assertContains(
-            '<input type="button" value="UPDATE" id="update"',
-            $html
-        );
-        $this->assertContains(
-            '<input type="button" value="INSERT" id="insert"',
-            $html
-        );
-        $this->assertContains(
-            '<input type="button" value="SELECT" id="select"',
-            $html
-        );
-        $this->assertContains(
-            '<input type="button" value="SELECT *" id="selectall"',
-            $html
-        );
-
-        //validate 5: Clear button
-        $this->assertContains(
-            '<input type="button" value="DELETE" id="delete"',
-            $html
-        );
-        $this->assertContains(
-            __('Clear'),
-            $html
-        );
-    }
-
-    /**
-     * Test for PMA_getHtmlForSqlQueryForm
-     *
-     * @return void
-     */
-    public function testPMAGetHtmlForSqlQueryForm()
-    {
-        //Call the test function
-        $GLOBALS['is_upload'] = true;
-        $query = "select * from PMA";
-        $html = PMA_getHtmlForSqlQueryForm($query);
-
-        //validate 1: query
-        $this->assertContains(
-            htmlspecialchars($query),
-            $html
-        );
-
-        //validate 2: $enctype
-        $enctype = ' enctype="multipart/form-data"';
-        $this->assertContains(
-            $enctype,
-            $html
-        );
-
-        //validate 3: sqlqueryform
-        $this->assertContains(
-            'id="sqlqueryform" name="sqlform">',
-            $html
-        );
-
-        //validate 4: $db, $table
-        $table  = $GLOBALS['table'];
-        $db     = $GLOBALS['db'];
-        $this->assertContains(
-            PMA_URL_getHiddenInputs($db, $table),
-            $html
-        );
-
-        //validate 5: $goto
-        $goto = empty($GLOBALS['goto']) ? 'tbl_sql.php' : $GLOBALS['goto'];
-        $this->assertContains(
-            htmlspecialchars($goto),
-            $html
-        );
-
-        //validate 6: PMA_Kanji_encodingForm
-        $this->assertContains(
-            PMA_Kanji_encodingForm(),
-            $html
-        );
-    }
-}
diff --git a/#pma/test/libraries/PMA_sql_test.php b/#pma/test/libraries/PMA_sql_test.php
deleted file mode 100644
index 3efd0884..00000000
--- a/#pma/test/libraries/PMA_sql_test.php
+++ /dev/null
@@ -1,202 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Tests for libraries/sql.lib.php
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-require_once 'libraries/sql.lib.php';
-
-/**
- * Tests for libraries/sql.lib.php
- *
- * @package PhpMyAdmin-test
- */
-class PMA_SqlTest extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Test PMA_getSqlWithLimitClause
-     *
-     * @return void
-     */
-    public function testGetSqlWithLimitClause()
-    {
-        // Test environment.
-        $GLOBALS['_SESSION']['tmpval']['pos'] = 1;
-        $GLOBALS['_SESSION']['tmpval']['max_rows'] = 2;
-        $GLOBALS['db'] = 'db';
-
-        $analyzed_sql_results = PMA_parseAndAnalyze(
-            'SELECT * FROM test LIMIT 0, 10'
-        );
-        $this->assertEquals(
-            'SELECT * FROM test LIMIT 1, 2 ',
-            PMA_getSqlWithLimitClause($analyzed_sql_results)
-        );
-    }
-
-    /**
-     * Test PMA_isRememberSortingOrder
-     *
-     * @return void
-     */
-    public function testIsRememberSortingOrder()
-    {
-        // Test environment.
-        $GLOBALS['cfg']['RememberSorting'] = true;
-        $GLOBALS['db'] = 'db';
-
-        $this->assertTrue(
-            PMA_isRememberSortingOrder(
-                PMA_parseAndAnalyze('SELECT * FROM tbl')
-            )
-        );
-
-        $this->assertFalse(
-            PMA_isRememberSortingOrder(
-                PMA_parseAndAnalyze('SELECT col FROM tbl')
-            )
-        );
-
-        $this->assertFalse(
-            PMA_isRememberSortingOrder(
-                PMA_parseAndAnalyze('SELECT 1')
-            )
-        );
-
-        $this->assertFalse(
-            PMA_isRememberSortingOrder(
-                PMA_parseAndAnalyze('SELECT col1, col2 FROM tbl')
-            )
-        );
-
-        $this->assertFalse(
-            PMA_isRememberSortingOrder(
-                PMA_parseAndAnalyze('SELECT COUNT(*) from tbl')
-            )
-        );
-    }
-
-    /**
-     * Test PMA_isAppendLimitClause
-     *
-     * @return void
-     */
-    public function testIsAppendLimitClause()
-    {
-        // Test environment.
-        $GLOBALS['_SESSION']['tmpval']['max_rows'] = 10;
-        $GLOBALS['db'] = 'db';
-
-        $this->assertTrue(
-            PMA_isAppendLimitClause(
-                PMA_parseAndAnalyze('SELECT * FROM tbl')
-            )
-        );
-
-        $this->assertFalse(
-            PMA_isAppendLimitClause(
-                PMA_parseAndAnalyze('SELECT * from tbl LIMIT 0, 10')
-            )
-        );
-    }
-
-    /**
-     * Test PMA_isJustBrowsing
-     *
-     * @return void
-     */
-    public function testIsJustBrowsing()
-    {
-        // Test environment.
-        $GLOBALS['_SESSION']['tmpval']['max_rows'] = 10;
-        $GLOBALS['db'] = 'db';
-
-        $this->assertTrue(
-            PMA_isJustBrowsing(
-                PMA_parseAndAnalyze('SELECT * FROM db.tbl'),
-                null
-            )
-        );
-
-        $this->assertTrue(
-            PMA_isJustBrowsing(
-                PMA_parseAndAnalyze('SELECT * FROM tbl WHERE 1'),
-                null
-            )
-        );
-
-        $this->assertFalse(
-            PMA_isJustBrowsing(
-                PMA_parseAndAnalyze('SELECT * from tbl1, tbl2 LIMIT 0, 10'),
-                null
-            )
-        );
-    }
-
-    /**
-     * Test PMA_isDeleteTransformationInfo
-     *
-     * @return void
-     */
-    public function testIsDeleteTransformationInfo()
-    {
-        $this->assertTrue(
-            PMA_isDeleteTransformationInfo(
-                PMA_parseAndAnalyze('ALTER TABLE tbl DROP COLUMN col')
-            )
-        );
-
-        $this->assertTrue(
-            PMA_isDeleteTransformationInfo(
-                PMA_parseAndAnalyze('DROP TABLE tbl')
-            )
-        );
-
-        $this->assertFalse(
-            PMA_isDeleteTransformationInfo(
-                PMA_parseAndAnalyze('SELECT * from tbl')
-            )
-        );
-    }
-
-    /**
-     * Test PMA_hasNoRightsToDropDatabase
-     *
-     * @return void
-     */
-    public function testHasNoRightsToDropDatabase()
-    {
-        $this->assertEquals(
-            true,
-            PMA_hasNoRightsToDropDatabase(
-                PMA_parseAndAnalyze('DROP DATABASE db'),
-                false,
-                false
-            )
-        );
-
-        $this->assertEquals(
-            false,
-            PMA_hasNoRightsToDropDatabase(
-                PMA_parseAndAnalyze('DROP TABLE tbl'),
-                false,
-                false
-            )
-        );
-
-        $this->assertEquals(
-            false,
-            PMA_hasNoRightsToDropDatabase(
-                PMA_parseAndAnalyze('SELECT * from tbl'),
-                false,
-                false
-            )
-        );
-    }
-
-}
\ No newline at end of file
diff --git a/#pma/test/libraries/PMA_tbl_tracking_test.php b/#pma/test/libraries/PMA_tbl_tracking_test.php
deleted file mode 100644
index fe0ce854..00000000
--- a/#pma/test/libraries/PMA_tbl_tracking_test.php
+++ /dev/null
@@ -1,930 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Tests for libraries/tracking.lib.php
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-use PMA\libraries\Theme;
-
-require_once 'libraries/tracking.lib.php';
-
-require_once 'libraries/database_interface.inc.php';
-require_once 'libraries/relation.lib.php';
-require_once 'libraries/url_generating.lib.php';
-
-
-require_once 'libraries/js_escape.lib.php';
-
-/**
- * Tests for libraries/tracking.lib.php
- *
- * @package PhpMyAdmin-test
- */
-class PMA_TblTrackingTest extends PHPUnit_Framework_TestCase
-{
-
-    /**
-     * Setup function for test cases
-     *
-     * @access protected
-     * @return void
-     */
-    protected function setUp()
-    {
-        /**
-         * SET these to avoid undefined index error
-         */
-        $_REQUEST['db'] = "db";
-        $_REQUEST['table'] = "table";
-
-        $GLOBALS['server'] = 1;
-        $GLOBALS['db'] = "PMA_db";
-        $GLOBALS['table'] = "PMA_table";
-        $GLOBALS['pmaThemeImage'] = "image";
-        $GLOBALS['cfg']['ServerDefault'] = "server";
-        $GLOBALS['cfg']['ActionLinksMode'] = 'both';
-        $GLOBALS['cfg']['MaxCharactersInDisplayedSQL'] = 1000;
-
-        $_SESSION['relation'][$GLOBALS['server']] = array(
-            'PMA_VERSION' => PMA_VERSION,
-            'db' => 'pmadb',
-            'tracking' => 'tracking',
-            'trackingwork' => true
-        );
-        $_SESSION['PMA_Theme'] = new Theme();
-
-        $GLOBALS['cfg']['Server']['tracking_default_statements'] = 'DELETE';
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $fetchArray = array('version' => "10");
-        $dbi->expects($this->any())
-            ->method('fetchArray')
-            ->will($this->returnValue($fetchArray));
-        $dbi->expects($this->any())
-            ->method('query')
-            ->will($this->returnValue(true));
-        $dbi->expects($this->any())
-            ->method('tryQuery')
-            ->will($this->returnValue(true));
-
-        $GLOBALS['dbi'] = $dbi;
-    }
-
-    /**
-     * Tests for PMA_filterTracking() method.
-     *
-     * @return void
-     * @test
-     */
-    public function testPMAFilterTracking()
-    {
-        $data = array(
-            array(
-                "date" => "20120102",
-                "username"=> "username1",
-                "statement"=>"statement1"
-            ),
-            array(
-                "date" => "20130102",
-                "username"=> "username2",
-                "statement"=>"statement2"
-            ),
-        );
-        $filter_ts_from = 0;
-        $filter_ts_to = 999999999999;
-        $filter_users = array("username1");
-
-        $ret = PMA_filterTracking(
-            $data, $filter_ts_from, $filter_ts_to, $filter_users
-        );
-
-        $this->assertEquals(
-            'username1',
-            $ret[0]['username']
-        );
-        $this->assertEquals(
-            'statement1',
-            $ret[0]['statement']
-        );
-    }
-
-    /**
-     * Tests for PMA_getHtmlForDataDefinitionAndManipulationStatements() method.
-     *
-     * @return void
-     * @test
-     */
-    public function testPMAGetHtmlForDataDefinitionAndManipulationStatements()
-    {
-        $url_query = "url_query";
-        $last_version = 10;
-        $html = PMA_getHtmlForDataDefinitionAndManipulationStatements(
-            $url_query, $last_version, $GLOBALS['db'], array($GLOBALS['table'])
-        );
-
-        $this->assertContains(
-            '<div id="div_create_version">',
-            $html
-        );
-
-        $this->assertContains(
-            $url_query,
-            $html
-        );
-
-        $this->assertContains(
-            PMA_URL_getHiddenInputs($GLOBALS['db']),
-            $html
-        );
-
-        $item = sprintf(
-            __('Create version %1$s of %2$s'),
-            ($last_version + 1),
-            htmlspecialchars($GLOBALS['db'] . '.' . $GLOBALS['table'])
-        );
-        $this->assertContains(
-            $item,
-            $html
-        );
-
-        $item = '<input type="checkbox" name="delete" value="true"'
-        . ' checked="checked" /> DELETE<br/>';
-        $this->assertContains(
-            $item,
-            $html
-        );
-
-        $this->assertContains(
-            __('Create version'),
-            $html
-        );
-    }
-
-    /**
-     * Tests for PMA_getHtmlForActivateDeactivateTracking() method.
-     *
-     * @return void
-     * @test
-     */
-    public function testPMAGetHtmlForActivateDeactivateTracking()
-    {
-        $url_query = "url_query";
-        $last_version = "10";
-        $html = PMA_getHtmlForActivateDeactivateTracking(
-            'activate', $url_query, $last_version
-        );
-
-        $this->assertContains(
-            $url_query,
-            $html
-        );
-
-        $item = sprintf(
-            __('Activate tracking for %s'),
-            htmlspecialchars($GLOBALS['db'] . '.' . $GLOBALS['table'])
-        );
-        $this->assertContains(
-            $item,
-            $html
-        );
-
-        $this->assertContains(
-            $last_version,
-            $html
-        );
-
-        $this->assertContains(
-            __('Activate now'),
-            $html
-        );
-
-        $html = PMA_getHtmlForActivateDeactivateTracking(
-            'deactivate', $url_query, $last_version
-        );
-
-        $this->assertContains(
-            $url_query,
-            $html
-        );
-
-        $item = sprintf(
-            __('Deactivate tracking for %s'),
-            htmlspecialchars($GLOBALS['db'] . '.' . $GLOBALS['table'])
-        );
-        $this->assertContains(
-            $item,
-            $html
-        );
-
-        $this->assertContains(
-            $last_version,
-            $html
-        );
-
-        $this->assertContains(
-            __('Deactivate now'),
-            $html
-        );
-    }
-
-    /**
-     * Tests for PMA_getTableLastVersionNumber() method.
-     *
-     * @return void
-     * @test
-     */
-    public function testPMAGetTableLastVersionNumber()
-    {
-        $sql_result = "sql_result";
-        $last_version = PMA_getTableLastVersionNumber($sql_result);
-
-        $this->assertEquals(
-            "10",
-            $last_version
-        );
-    }
-
-    /**
-     * Tests for PMA_getSQLResultForSelectableTables() method.
-     *
-     * @return void
-     * @test
-     */
-    public function testPMAGetSQLResultForSelectableTables()
-    {
-        $ret = PMA_getSQLResultForSelectableTables();
-
-        $this->assertEquals(
-            true,
-            $ret
-        );
-    }
-
-    /**
-     * Tests for PMA_getHtmlForColumns() method.
-     *
-     * @return void
-     * @test
-     */
-    public function testPMAGetHtmlForColumns()
-    {
-        $columns = array(
-            array(
-                'Field'=>'Field1',
-                'Type'=>'Type1',
-                'Collation'=>'Collation1',
-                "Null"=>'YES',
-                'Extra'=>'Extra1',
-                'Key'=>'PRI',
-                'Comment'=>'Comment1'
-            ),
-            array(
-                'Field'=>'Field2',
-                'Type'=>'Type2',
-                'Collation'=>'Collation2',
-                "Null"=>'No',
-                'Extra'=>'Extra2',
-                'Key'=>'Key2',
-                'Comment'=>'Comment2'
-            ),
-        );
-
-        $html = PMA_getHtmlForColumns($columns);
-
-        $this->assertContains(
-            __('Column'),
-            $html
-        );
-        $this->assertContains(
-            __('Type'),
-            $html
-        );
-        $this->assertContains(
-            __('Collation'),
-            $html
-        );
-        $this->assertContains(
-            __('Default'),
-            $html
-        );
-        $this->assertContains(
-            __('Comment'),
-            $html
-        );
-
-        //column1
-        $item1= $columns[0];
-        $this->assertContains(
-            htmlspecialchars($item1['Field']),
-            $html
-        );
-        $this->assertContains(
-            htmlspecialchars($item1['Type']),
-            $html
-        );
-        $this->assertContains(
-            htmlspecialchars($item1['Collation']),
-            $html
-        );
-        $this->assertContains(
-            '<i>NULL</i>',
-            $html
-        );
-        $this->assertContains(
-            htmlspecialchars($item1['Comment']),
-            $html
-        );
-
-        //column2
-        $item1= $columns[1];
-        $this->assertContains(
-            htmlspecialchars($item1['Field']),
-            $html
-        );
-        $this->assertContains(
-            htmlspecialchars($item1['Type']),
-            $html
-        );
-        $this->assertContains(
-            htmlspecialchars($item1['Collation']),
-            $html
-        );
-        $this->assertContains(
-            _pgettext('None for default', 'None'),
-            $html
-        );
-        $this->assertContains(
-            htmlspecialchars($item1['Comment']),
-            $html
-        );
-    }
-
-    /**
-     * Tests for PMA_getListOfVersionsOfTable() method.
-     *
-     * @return void
-     * @test
-     */
-    public function testPMAGetListOfVersionsOfTable()
-    {
-        $ret = PMA_getListOfVersionsOfTable();
-
-        $this->assertEquals(
-            true,
-            $ret
-        );
-    }
-
-    /**
-     * Tests for PMA_getHtmlForTableVersionDetails() method.
-     *
-     * @return void
-     * @test
-     */
-    public function testPMAGetHtmlForTableVersionDetails()
-    {
-        $sql_result = true;
-        $last_version = "10";
-        $url_params = array();
-        $url_query = "select * from PMA";
-        $pmaThemeImage = "themePath/img";
-        $text_dir = "ltr";
-
-        $dbi_old = $GLOBALS['dbi'];
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $fetchArray = array(
-                'tracking_active' => 1,
-                'version' => "10",
-                'db_name' => 'db_name',
-                'table_name' => 'table_name',
-                'date_created' => 'date_created',
-                'date_updated' => 'date_updated'
-        );
-        $dbi->expects($this->at(0))
-            ->method('fetchArray')
-            ->will($this->returnValue($fetchArray));
-        $dbi->expects($this->at(1))
-            ->method('fetchArray')
-            ->will($this->returnValue($fetchArray));
-        $dbi->expects($this->at(2))
-            ->method('fetchArray')
-            ->will($this->returnValue(false));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $ret = PMA_getHtmlForTableVersionDetails(
-            $sql_result, $last_version, $url_params, $url_query,
-            $pmaThemeImage, $text_dir
-        );
-
-        $this->assertContains(
-            __('Version'),
-            $ret
-        );
-        $this->assertContains(
-            __('Created'),
-            $ret
-        );
-        $this->assertContains(
-            __('Updated'),
-            $ret
-        );
-        $this->assertContains(
-            __('Status'),
-            $ret
-        );
-        $this->assertContains(
-            __('Action'),
-            $ret
-        );
-        $this->assertContains(
-            __('Show'),
-            $ret
-        );
-        $this->assertContains(
-            $fetchArray['version'],
-            $ret
-        );
-        $this->assertContains(
-            $fetchArray['date_created'],
-            $ret
-        );
-        $this->assertContains(
-            $fetchArray['date_updated'],
-            $ret
-        );
-        $this->assertContains(
-            __('Tracking report'),
-            $ret
-        );
-        $this->assertContains(
-            __('Structure snapshot'),
-            $ret
-        );
-        $html = sprintf(
-            __('Deactivate tracking for %s'),
-            htmlspecialchars($GLOBALS['db'] . '.' . $GLOBALS['table'])
-        );
-        $this->assertContains(
-            $html,
-            $ret
-        );
-
-        //restore DBI
-        $GLOBALS['dbi'] = $dbi_old;
-    }
-
-    /**
-     * Tests for PMA_getHtmlForSelectableTables() method.
-     *
-     * @return void
-     * @test
-     */
-    public function testPMAGetHtmlForSelectableTables()
-    {
-        $selectable_tables_sql_result = true;
-        $url_query = "select * from PMA";
-
-        $dbi_old = $GLOBALS['dbi'];
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $fetchArray = array(
-                'tracking_active' => 1,
-                'version' => "10",
-                'db_name' => 'db_name',
-                'table_name' => 'table_name',
-                'date_created' => 'date_created',
-                'date_updated' => 'date_updated'
-        );
-        $dbi->expects($this->at(0))
-            ->method('fetchArray')
-            ->will($this->returnValue($fetchArray));
-        $dbi->expects($this->at(1))
-            ->method('fetchArray')
-            ->will($this->returnValue($fetchArray));
-        $dbi->expects($this->at(2))
-            ->method('fetchArray')
-            ->will($this->returnValue(false));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $ret = PMA_getHtmlForSelectableTables(
-            $selectable_tables_sql_result, $url_query
-        );
-
-        $this->assertContains(
-            htmlspecialchars($fetchArray['table_name']),
-            $ret
-        );
-        $this->assertContains(
-            htmlspecialchars($fetchArray['db_name']),
-            $ret
-        );
-
-        //restore DBI
-        $GLOBALS['dbi'] = $dbi_old;
-    }
-
-    /**
-     * Tests for PMA_getHtmlForTrackingReport() method.
-     *
-     * @return void
-     * @test
-     */
-    public function testPMAGetHtmlForTrackingReportr()
-    {
-        $_REQUEST['version'] = 10;
-        $_REQUEST['date_from'] = "date_from";
-        $_REQUEST['date_to'] = "date_to";
-        $_REQUEST['users'] = "users";
-        $_REQUEST['logtype'] = 'logtype';
-        $url_query = "select * from PMA";
-        $data = array(
-            'tracking'=>'tracking',
-            'ddlog' => array('ddlog'),
-            'dmlog' => array('dmlog')
-        );
-        $url_params = array();
-        $selection_schema = array();
-        $selection_data = array();
-        $selection_both = array();
-        $filter_ts_to = array();
-        $filter_ts_from = array();
-        $filter_users = array();
-
-        $html = PMA_getHtmlForTrackingReport(
-            $url_query, $data, $url_params,
-            $selection_schema, $selection_data,
-            $selection_both, $filter_ts_to,
-            $filter_ts_from, $filter_users
-        );
-
-        $this->assertContains(
-            __('Tracking report'),
-            $html
-        );
-
-        $this->assertContains(
-            $url_query,
-            $html
-        );
-
-        $this->assertContains(
-            __('Tracking statements'),
-            $html
-        );
-
-        $this->assertContains(
-            $data['tracking'],
-            $html
-        );
-
-        $version = '<form method="post" action="tbl_tracking.php'
-            . PMA_URL_getCommon(
-                $url_params + array(
-                    'report' => 'true', 'version' => $_REQUEST['version']
-                )
-            );
-
-        $this->assertContains(
-            $version,
-            $html
-        );
-
-        $this->assertContains(
-            $version,
-            $html
-        );
-
-        $this->assertContains(
-            __('Structure only'),
-            $html
-        );
-
-        $this->assertContains(
-            __('Data only'),
-            $html
-        );
-
-        $this->assertContains(
-            __('Structure and data'),
-            $html
-        );
-
-        $this->assertContains(
-            htmlspecialchars($_REQUEST['date_from']),
-            $html
-        );
-
-        $this->assertContains(
-            htmlspecialchars($_REQUEST['date_to']),
-            $html
-        );
-
-        $this->assertContains(
-            htmlspecialchars($_REQUEST['users']),
-            $html
-        );
-    }
-
-    /**
-     * Tests for PMA_getHtmlForDataManipulationStatements() method.
-     *
-     * @return void
-     * @test
-     */
-    public function testPMAGetHtmlForDataManipulationStatements()
-    {
-        $_REQUEST['version'] = "10";
-        $data = array(
-            'tracking'=>'tracking',
-            'dmlog' => array(
-                array(
-                    'statement' => 'statement',
-                    'date' => 'date',
-                    'username' => 'username',
-                )
-            ),
-            'ddlog' => array('ddlog')
-        );
-        $url_params = array();
-        $ddlog_count = 10;
-        $drop_image_or_text = "text";
-        $filter_ts_to = 9999999999;
-        $filter_ts_from = 0;
-        $filter_users = array("*");
-
-        $html = PMA_getHtmlForDataManipulationStatements(
-            $data, $filter_users,
-            $filter_ts_from, $filter_ts_to, $url_params,
-            $ddlog_count, $drop_image_or_text
-        );
-
-        $this->assertContains(
-            __('Date'),
-            $html
-        );
-
-        $this->assertContains(
-            __('Username'),
-            $html
-        );
-
-        $this->assertContains(
-            __('Data manipulation statement'),
-            $html
-        );
-
-        $this->assertContains(
-            $data['dmlog'][0]['date'],
-            $html
-        );
-
-        $this->assertContains(
-            $data['dmlog'][0]['username'],
-            $html
-        );
-    }
-
-    /**
-     * Tests for PMA_getHtmlForDataDefinitionStatements() method.
-     *
-     * @return void
-     * @test
-     */
-    public function testPMAGetHtmlForDataDefinitionStatements()
-    {
-        $_REQUEST['version'] = "10";
-
-        $data = array(
-            'tracking'=>'tracking',
-            'ddlog' => array(
-                array(
-                    'statement' => 'statement',
-                    'date' => 'date',
-                    'username' => 'username',
-                )
-            ),
-            'dmlog' => array('dmlog')
-        );
-        $filter_users = array("*");
-        $filter_ts_to = 9999999999;
-        $filter_ts_from = 0;
-        $url_params = array();
-        $drop_image_or_text = "text";
-
-        list($html, $count) = PMA_getHtmlForDataDefinitionStatements(
-            $data, $filter_users,
-            $filter_ts_from, $filter_ts_to, $url_params, $drop_image_or_text
-        );
-
-        $this->assertContains(
-            __('Date'),
-            $html
-        );
-
-        $this->assertContains(
-            __('Username'),
-            $html
-        );
-
-        $this->assertContains(
-            __('Data definition statement'),
-            $html
-        );
-
-        $this->assertContains(
-            __('Action'),
-            $html
-        );
-
-        //PMA_getHtmlForDataDefinitionStatement
-        $this->assertContains(
-            htmlspecialchars($data['ddlog'][0]['username']),
-            $html
-        );
-
-        $this->assertEquals(
-            2,
-            $count
-        );
-
-    }
-
-    /**
-     * Tests for PMA_getHtmlForIndexes() method.
-     *
-     * @return void
-     * @test
-     */
-    public function testPMAGetHtmlForIndexes()
-    {
-        $indexs = array(
-            array(
-                'Non_unique' => 0,
-                'Packed' => '',
-                'Key_name' => 'Key_name1',
-                'Index_type' => 'BTREE',
-                'Column_name' => 'Column_name',
-                'Cardinality' => 'Cardinality',
-                'Collation' => 'Collation',
-                'Null' => 'Null',
-                'Comment' => 'Comment',
-            ),
-        );
-
-        $html = PMA_getHtmlForIndexes($indexs);
-
-        $this->assertContains(
-            __('Indexes'),
-            $html
-        );
-        $this->assertContains(
-            __('Keyname'),
-            $html
-        );
-        $this->assertContains(
-            __('Type'),
-            $html
-        );
-        $this->assertContains(
-            __('Unique'),
-            $html
-        );
-        $this->assertContains(
-            __('Packed'),
-            $html
-        );
-        $this->assertContains(
-            __('Column'),
-            $html
-        );
-        $this->assertContains(
-            __('Cardinality'),
-            $html
-        );
-        // items
-        $this->assertContains(
-            htmlspecialchars($indexs[0]['Key_name']),
-            $html
-        );
-        $this->assertContains(
-            htmlspecialchars($indexs[0]['Index_type']),
-            $html
-        );
-        $this->assertContains(
-            htmlspecialchars($indexs[0]['Column_name']),
-            $html
-        );
-        $this->assertContains(
-            htmlspecialchars($indexs[0]['Cardinality']),
-            $html
-        );
-        $this->assertContains(
-            htmlspecialchars($indexs[0]['Collation']),
-            $html
-        );
-    }
-
-    /**
-     * Tests for PMA_getTrackingSet() method.
-     *
-     * @return void
-     * @test
-     */
-    public function testPMAGetTrackingSet()
-    {
-        $_REQUEST['alter_table'] = false;
-        $_REQUEST['rename_table'] = true;
-        $_REQUEST['create_table'] = true;
-        $_REQUEST['drop_table'] = true;
-        $_REQUEST['create_index'] = false;
-        $_REQUEST['drop_index'] = true;
-        $_REQUEST['insert'] = true;
-        $_REQUEST['update'] = false;
-        $_REQUEST['delete'] = true;
-        $_REQUEST['truncate'] = true;
-
-        $tracking_set = PMA_getTrackingSet();
-        $this->assertEquals(
-            'RENAME TABLE,CREATE TABLE,DROP TABLE,DROP INDEX,INSERT,DELETE,TRUNCATE',
-            $tracking_set
-        );
-
-        //other set to true
-        $_REQUEST['alter_table'] = true;
-        $_REQUEST['rename_table'] = false;
-        $_REQUEST['create_table'] = false;
-        $_REQUEST['drop_table'] = false;
-        $_REQUEST['create_index'] = true;
-        $_REQUEST['drop_index'] = false;
-        $_REQUEST['insert'] = false;
-        $_REQUEST['update'] = true;
-        $_REQUEST['delete'] = false;
-        $_REQUEST['truncate'] = false;
-
-        $tracking_set = PMA_getTrackingSet();
-        $this->assertEquals(
-            'ALTER TABLE,CREATE INDEX,UPDATE',
-            $tracking_set
-        );
-    }
-
-
-    /**
-     * Tests for PMA_getEntries() method.
-     *
-     * @return void
-     * @test
-     */
-    public function testPMAGetEntries()
-    {
-        $_REQUEST['logtype'] = 'schema';
-        $data = array(
-            'tracking'=>'tracking',
-            'ddlog' => array(
-                array(
-                    'statement' => 'statement1',
-                    'date' => 'date2',
-                    'username' => 'username3',
-                )
-            ),
-            'dmlog' =>  array(
-                array(
-                    'statement' => 'statement1',
-                    'date' => 'date2',
-                    'username' => 'username3',
-                )
-            ),
-        );
-        $filter_users = array("*");
-        $filter_ts_to = 9999999999;
-        $filter_ts_from = 0;
-
-        $entries = PMA_getEntries(
-            $data, $filter_ts_from, $filter_ts_to, $filter_users
-        );
-        $this->assertEquals(
-            'username3',
-            $entries[0]['username']
-        );
-        $this->assertEquals(
-            'statement1',
-            $entries[0]['statement']
-        );
-    }
-}
-
diff --git a/#pma/test/libraries/PMA_transformation_test.php b/#pma/test/libraries/PMA_transformation_test.php
deleted file mode 100644
index f573c5e4..00000000
--- a/#pma/test/libraries/PMA_transformation_test.php
+++ /dev/null
@@ -1,259 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for transformation wrappers
- *
- * @package PhpMyAdmin-test
- */
-
-use PMA\libraries\Theme;
-
-/*
- * Include to test.
- */
-require_once 'libraries/transformations.lib.php';
-require_once 'libraries/database_interface.inc.php';
-require_once 'libraries/relation.lib.php';
-
-/**
- * tests for transformation wrappers
- *
- * @package PhpMyAdmin-test
- */
-class PMA_Transformation_Test extends PHPUnit_Framework_TestCase
-{
-
-    /**
-     * Set up global environment.
-     *
-     * @return void
-     */
-    public function setup()
-    {
-        $GLOBALS['table'] = 'table';
-        $GLOBALS['db'] = 'db';
-        $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
-        $GLOBALS['cfg'] = array(
-            'ServerDefault' => 1,
-            'ActionLinksMode' => 'icons',
-        );
-        $GLOBALS['server'] = 1;
-        $GLOBALS['cfg']['Server']['pmadb'] = 'pmadb';
-        $GLOBALS['cfg']['Server']['user'] = 'user';
-        $GLOBALS['cfg']['Server']['bookmarktable'] = '';
-        $GLOBALS['cfg']['Server']['relation'] = '';
-        $GLOBALS['cfg']['Server']['table_info'] = '';
-        $GLOBALS['cfg']['Server']['table_coords'] = '';
-        $GLOBALS['cfg']['Server']['column_info'] = 'column_info';
-        $GLOBALS['cfg']['DBG']['sql'] = false;
-        // need to clear relation test cache
-        unset($_SESSION['relation']);
-    }
-
-    /**
-     * Test for parsing options.
-     *
-     * @param string $input    String to parse
-     * @param array  $expected Expected result
-     *
-     * @return void
-     *
-     * @dataProvider getOptionsData
-     */
-    public function testGetOptions($input, $expected)
-    {
-        $this->assertEquals(
-            $expected,
-            PMA_Transformation_getOptions($input)
-        );
-    }
-
-    /**
-     * Data provided for parsing options
-     *
-     * @return array with test data
-     */
-    public function getOptionsData()
-    {
-        return array(
-            array("option1 , option2 ", array('option1 ', ' option2 ')),
-            array("'option1' ,' option2' ", array('option1', ' option2')),
-            array("'2,3' ,' ,, option ,,' ", array('2,3', ' ,, option ,,')),
-            array("'',,", array('', '', '')),
-            array('', array()),
-        );
-    }
-
-    /**
-     * Test for getting available types.
-     *
-     * @return void
-     */
-    public function testGetTypes()
-    {
-        $this->assertEquals(
-            array (
-                'mimetype' => array (
-                    'Application/Octetstream' => 'Application/Octetstream',
-                    'Image/JPEG' => 'Image/JPEG',
-                    'Image/PNG' => 'Image/PNG',
-                    'Text/Plain' => 'Text/Plain',
-                    'Text/Octetstream' => 'Text/Octetstream'
-                ),
-                'transformation' => array (
-                    0 => 'Application/Octetstream: Download',
-                    1 => 'Application/Octetstream: Hex',
-                    2 => 'Image/JPEG: Inline',
-                    3 => 'Image/JPEG: Link',
-                    4 => 'Image/PNG: Inline',
-                    5 => 'Text/Octetstream: Sql',
-                    6 => 'Text/Plain: Binarytoip',
-                    7 => 'Text/Plain: Bool2Text',
-                    8 => 'Text/Plain: Dateformat',
-                    9 => 'Text/Plain: External',
-                    10 => 'Text/Plain: Formatted',
-                    11 => 'Text/Plain: Imagelink',
-                    12 => 'Text/Plain: Json',
-                    13 => 'Text/Plain: Sql',
-                    14 => 'Text/Plain: Xml',
-                    15 => 'Text/Plain: Link',
-                    16 => 'Text/Plain: Longtoipv4',
-                    17 => 'Text/Plain: PreApPend',
-                    18 => 'Text/Plain: Substring',
-                    ),
-                'transformation_file' => array (
-                    0 => 'output/Application_Octetstream_Download.php',
-                    1 => 'output/Application_Octetstream_Hex.php',
-                    2 => 'output/Image_JPEG_Inline.php',
-                    3 => 'output/Image_JPEG_Link.php',
-                    4 => 'output/Image_PNG_Inline.php',
-                    5 => 'output/Text_Octetstream_Sql.php',
-                    6 => 'output/Text_Plain_Binarytoip.php',
-                    7 => 'output/Text_Plain_Bool2Text.php',
-                    8 => 'output/Text_Plain_Dateformat.php',
-                    9 => 'output/Text_Plain_External.php',
-                    10 => 'output/Text_Plain_Formatted.php',
-                    11 => 'output/Text_Plain_Imagelink.php',
-                    12 => 'output/Text_Plain_Json.php',
-                    13 => 'output/Text_Plain_Sql.php',
-                    14 => 'output/Text_Plain_Xml.php',
-                    15 => 'Text_Plain_Link.php',
-                    16 => 'Text_Plain_Longtoipv4.php',
-                    17 => 'Text_Plain_PreApPend.php',
-                    18 => 'Text_Plain_Substring.php',
-                ),
-                'input_transformation' => array(
-                    'Image/JPEG: Upload',
-                    'Text/Plain: FileUpload',
-                    'Text/Plain: Iptobinary',
-                    'Text/Plain: JsonEditor',
-                    'Text/Plain: RegexValidation',
-                    'Text/Plain: SqlEditor',
-                    'Text/Plain: XmlEditor',
-                    'Text/Plain: Link',
-                    'Text/Plain: Longtoipv4',
-                    'Text/Plain: PreApPend',
-                    'Text/Plain: Substring',
-                ),
-                'input_transformation_file' => array(
-                    'input/Image_JPEG_Upload.php',
-                    'input/Text_Plain_FileUpload.php',
-                    'input/Text_Plain_Iptobinary.php',
-                    'input/Text_Plain_JsonEditor.php',
-                    'input/Text_Plain_RegexValidation.php',
-                    'input/Text_Plain_SqlEditor.php',
-                    'input/Text_Plain_XmlEditor.php',
-                    'Text_Plain_Link.php',
-                    'Text_Plain_Longtoipv4.php',
-                    'Text_Plain_PreApPend.php',
-                    'Text_Plain_Substring.php',
-                ),
-            ),
-            PMA_getAvailableMIMEtypes()
-        );
-    }
-
-    /**
-     * Tests getting mime types for table
-     *
-     * @return void
-     */
-    public function testGetMime()
-    {
-        $_SESSION['relation'][$GLOBALS['server']]['PMA_VERSION'] = PMA_VERSION;
-        $_SESSION['relation'][$GLOBALS['server']]['commwork'] = true;
-        $_SESSION['relation'][$GLOBALS['server']]['db'] = "pmadb";
-        $_SESSION['relation'][$GLOBALS['server']]['column_info'] = "column_info";
-        $_SESSION['relation'][$GLOBALS['server']]['trackingwork'] = false;
-        $this->assertEquals(
-            array(
-                'o' => array(
-                    'column_name' => 'o',
-                    'mimetype' => 'Text/plain',
-                    'transformation' => 'Sql',
-                    'transformation_options' => '',
-                    'input_transformation' => 'regex',
-                    'input_transformation_options' => '/pma/i',
-                ),
-                'col' => array(
-                    'column_name' => 'col',
-                    'mimetype' => 'T',
-                    'transformation' => 'o/P',
-                    'transformation_options' => '',
-                    'input_transformation' => 'i/p',
-                    'input_transformation_options' => '',
-                ),
-            ),
-            PMA_getMIME('pma_test', 'table1')
-        );
-    }
-
-    /**
-     * Test for PMA_clearTransformations
-     *
-     * @return void
-     */
-    public function testClearTransformations()
-    {
-        // Mock dbi
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $dbi->expects($this->any())
-            ->method('tryQuery')
-            ->will($this->returnValue(true));
-        $GLOBALS['dbi'] = $dbi;
-
-        // Case 1 : no configuration storage
-        $actual = PMA_clearTransformations('db');
-        $this->assertEquals(
-            false,
-            $actual
-        );
-
-        $_SESSION['relation'][$GLOBALS['server']]['PMA_VERSION'] = PMA_VERSION;
-        $_SESSION['relation'][$GLOBALS['server']]['column_info'] = "column_info";
-        $_SESSION['relation'][$GLOBALS['server']]['db'] = "pmadb";
-
-        // Case 2 : database delete
-        $actual = PMA_clearTransformations('db');
-        $this->assertEquals(
-            true,
-            $actual
-        );
-
-        // Case 3 : table delete
-        $actual = PMA_clearTransformations('db', 'table');
-        $this->assertEquals(
-            true,
-            $actual
-        );
-
-        // Case 4 : column delete
-        $actual = PMA_clearTransformations('db', 'table', 'col');
-        $this->assertEquals(
-            true,
-            $actual
-        );
-    }
-}
diff --git a/#pma/test/libraries/PMA_user_preferences_test.php b/#pma/test/libraries/PMA_user_preferences_test.php
deleted file mode 100644
index bbb056e4..00000000
--- a/#pma/test/libraries/PMA_user_preferences_test.php
+++ /dev/null
@@ -1,455 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for methods under user_preferences library
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test
- */
-use PMA\libraries\config\ConfigFile;
-
-require_once 'libraries/user_preferences.lib.php';
-require_once 'libraries/relation.lib.php';
-require_once 'libraries/url_generating.lib.php';
-require_once 'libraries/sanitizing.lib.php';
-
-
-/**
- * tests for methods under user_preferences library
- *
- * @package PhpMyAdmin-test
- */
-class PMA_User_Preferences_Test extends PHPUnit_Framework_TestCase
-{
-
-    /**
-     * Setup various pre conditions
-     *
-     * @return void
-     */
-    function setUp()
-    {
-        $GLOBALS['server'] = 0;
-        $GLOBALS['PMA_PHP_SELF'] = '/phpmyadmin/';
-    }
-
-    /**
-     * Test for PMA_userprefsPageInit
-     *
-     * @return void
-     */
-    public function testUserPrefPageInit()
-    {
-        $GLOBALS['cfg'] = array(
-            'Server/hide_db' => 'testval123',
-            'Server/only_db' => 'test213'
-        );
-        $GLOBALS['cfg']['AvailableCharsets'] = array();
-        $GLOBALS['forms'] = array(
-            'form1' => array(
-                array('Servers/1/hide_db', 'bar'),
-                array('test' => 'val')
-            )
-        );
-
-        PMA_userprefsPageInit(new ConfigFile());
-
-        $this->assertEquals(
-            array(
-                'Servers' => array(
-                    1 => array(
-                        'hide_db' => 'testval123'
-                    )
-                )
-            ),
-            $_SESSION['ConfigFile' . $GLOBALS['server']]
-        );
-    }
-
-    /**
-     * Test for PMA_loadUserprefs
-     *
-     * @return void
-     */
-    public function testLoadUserprefs()
-    {
-        $_SESSION['relation'][$GLOBALS['server']]['PMA_VERSION'] = PMA_VERSION;
-
-        $_SESSION['relation'][$GLOBALS['server']]['userconfigwork'] = null;
-        unset($_SESSION['userconfig']);
-
-        $result = PMA_loadUserprefs();
-
-        $this->assertCount(
-            3,
-            $result
-        );
-
-        $this->assertEquals(
-            array(),
-            $result['config_data']
-        );
-
-        $this->assertEquals(
-            time(),
-            $result['mtime'],
-            '',
-            2
-        );
-
-        $this->assertEquals(
-            'session',
-            $result['type']
-        );
-
-        // case 2
-        $_SESSION['relation'][$GLOBALS['server']]['userconfigwork'] = 1;
-        $_SESSION['relation'][$GLOBALS['server']]['db'] = "pma'db";
-        $_SESSION['relation'][$GLOBALS['server']]['userconfig'] = "testconf";
-        $_SESSION['relation'][$GLOBALS['server']]['user'] = "user";
-        $GLOBALS['controllink'] = null;
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $query = 'SELECT `config_data`, UNIX_TIMESTAMP(`timevalue`) ts '
-            . 'FROM `pma\'db`.`testconf` WHERE `username` = \'user\'';
-
-        $dbi->expects($this->once())
-            ->method('fetchSingleRow')
-            ->with($query, 'ASSOC', null)
-            ->will(
-                $this->returnValue(
-                    array(
-                        'ts' => '123',
-                        'config_data' => json_encode(array(1, 2))
-                    )
-                )
-            );
-        $dbi->expects($this->any())
-            ->method('escapeString')
-            ->will($this->returnArgument(0));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $result = PMA_loadUserprefs();
-
-        $this->assertEquals(
-            array(
-                'config_data' => array(1, 2),
-                'mtime' => 123,
-                'type' => 'db'
-            ),
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA_saveUserprefs
-     *
-     *  @return void
-     */
-    public function testSaveUserprefs()
-    {
-        $GLOBALS['server'] = 2;
-        $_SESSION['relation'][2]['PMA_VERSION'] = PMA_VERSION;
-        $_SESSION['relation'][2]['userconfigwork'] = null;
-        unset($_SESSION['userconfig']);
-
-        $result = PMA_saveUserprefs(array(1));
-
-        $this->assertTrue(
-            $result
-        );
-
-        $this->assertCount(
-            2,
-            $_SESSION['userconfig']
-        );
-
-        $this->assertEquals(
-            array(1),
-            $_SESSION['userconfig']['db']
-        );
-
-        /* TODO: This breaks sometimes as there might be time difference! */
-        $this->assertEquals(
-            time(),
-            $_SESSION['userconfig']['ts'],
-            '',
-            2
-        );
-
-        $assert = true;
-
-        if (isset($_SESSION['cache']['server_2']['userprefs'])) {
-            $assert = false;
-        }
-
-        $this->assertTrue(
-            $assert
-        );
-
-        // case 2
-        $_SESSION['relation'][$GLOBALS['server']]['userconfigwork'] = 1;
-        $_SESSION['relation'][$GLOBALS['server']]['db'] = "pmadb";
-        $_SESSION['relation'][$GLOBALS['server']]['userconfig'] = "testconf";
-        $_SESSION['relation'][$GLOBALS['server']]['user'] = "user";
-        $GLOBALS['controllink'] = null;
-
-        $query1 = 'SELECT `username` FROM `pmadb`.`testconf` '
-            . 'WHERE `username` = \'user\'';
-
-        $query2 = 'UPDATE `pmadb`.`testconf` SET `timevalue` = NOW(), `config_data` = \''
-            . json_encode(array(1)) . '\' WHERE `username` = \'user\'';
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->once())
-            ->method('fetchValue')
-            ->with($query1, 0, 0, null)
-            ->will($this->returnValue(true));
-
-        $dbi->expects($this->once())
-            ->method('tryQuery')
-            ->with($query2, null)
-            ->will($this->returnValue(true));
-
-        $dbi->expects($this->any())
-            ->method('escapeString')
-            ->will($this->returnArgument(0));
-
-        $GLOBALS['dbi'] = $dbi;
-        $this->assertTrue(
-            PMA_saveUserprefs(array(1))
-        );
-
-        // case 3
-
-        $query1 = 'SELECT `username` FROM `pmadb`.`testconf` '
-            . 'WHERE `username` = \'user\'';
-
-        $query2 = 'INSERT INTO `pmadb`.`testconf` (`username`, `timevalue`,`config_data`) '
-            . 'VALUES (\'user\', NOW(), \'' . json_encode(array(1)) . '\')';
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $dbi->expects($this->once())
-            ->method('fetchValue')
-            ->with($query1, 0, 0, null)
-            ->will($this->returnValue(false));
-
-        $dbi->expects($this->once())
-            ->method('tryQuery')
-            ->with($query2, null)
-            ->will($this->returnValue(false));
-
-        $dbi->expects($this->once())
-            ->method('getError')
-            ->with(null)
-            ->will($this->returnValue("err1"));
-        $dbi->expects($this->any())
-            ->method('escapeString')
-            ->will($this->returnArgument(0));
-
-        $GLOBALS['dbi'] = $dbi;
-
-        $result = PMA_saveUserprefs(array(1));
-
-        $this->assertEquals(
-            'Could not save configuration <br /><br /> err1',
-            $result->getMessage()
-        );
-    }
-
-    /**
-     * Test for PMA_applyUserprefs
-     *
-     * @return void
-     */
-    public function testApplyUserprefs()
-    {
-        $GLOBALS['cfg']['UserprefsDisallow'] = array(
-            'test' => 'val',
-            'foo' => 'bar'
-        );
-        $GLOBALS['cfg']['UserprefsDeveloperTab'] = null;
-        $result = PMA_applyUserprefs(
-            array(
-                'DBG/sql' => true,
-                'ErrorHandler/display' => true,
-                'ErrorHandler/gather' => false,
-                'Servers/foobar' => '123',
-                'Server/hide_db' => true
-            )
-        );
-
-        $this->assertEquals(
-            array(
-                'Server' => array(
-                    'hide_db' => 1
-                )
-            ),
-            $result
-        );
-    }
-
-    /**
-     * Test for PMA_readUserprefsFieldNames
-     *
-     * @return void
-     */
-    public function testReadUserprefsFieldNames()
-    {
-        $this->assertGreaterThan(
-            0,
-            count(PMA_readUserprefsFieldNames())
-        );
-
-        $forms = array(
-            'form1' => array(
-                array('Servers/1/hide_db', 'bar'),
-                array('test' => 'val')
-            )
-        );
-
-        $this->assertEquals(
-            array('Servers/1/hide_db', 'bar', 'test'),
-            PMA_readUserprefsFieldNames($forms)
-        );
-    }
-
-    /**
-     * Test for PMA_persistOption
-     *
-     * @return void
-     */
-    public function testPersistOption()
-    {
-        $_SESSION['relation'][$GLOBALS['server']]['PMA_VERSION'] = PMA_VERSION;
-        $_SESSION['relation'][$GLOBALS['server']]['userconfigwork'] = null;
-        $_SESSION['userconfig'] = array();
-        $_SESSION['userconfig']['ts'] = "123";
-        $_SESSION['userconfig']['db'] = array(
-            'Server/hide_db' => true,
-            'Server/only_db' => true,
-        );
-
-        $GLOBALS['server'] = 2;
-        $_SESSION['relation'][2]['userconfigwork'] = null;
-
-        $this->assertNull(
-            PMA_persistOption('Server/hide_db', 'val', 'val')
-        );
-
-        $this->assertNull(
-            PMA_persistOption('Server/hide_db', 'val2', 'val')
-        );
-
-        $this->assertNull(
-            PMA_persistOption('Server/hide_db2', 'val', 'val')
-        );
-    }
-
-    /**
-     * Test for PMA_userprefsRedirect
-     *
-     * @return void
-     */
-    public function testUserprefsRedirect()
-    {
-        if (!defined('PMA_TEST_HEADERS')) {
-            $this->markTestSkipped(
-                'Cannot redefine constant/function - missing runkit extension'
-            );
-        }
-        $GLOBALS['PMA_Config']->set('PmaAbsoluteUri', '');
-
-        $GLOBALS['cfg']['ServerDefault'] = 1;
-        $GLOBALS['lang'] = '';
-
-        $redefine = null;
-        if (!defined('PMA_IS_IIS')) {
-            define('PMA_IS_IIS', false);
-        } else {
-            $redefine = PMA_IS_IIS;
-            runkit_constant_redefine('PMA_IS_IIS', false);
-        }
-
-        PMA_userprefsRedirect(
-            'file.html',
-            array('a' => 'b'),
-            'h ash'
-        );
-
-        $this->assertContains(
-            'Location: /phpmyadmin/file.html?a=b&saved=1&server=0&' .
-            'token=token#h+ash',
-            $GLOBALS['header'][0]
-        );
-
-        if ($redefine !== null) {
-            runkit_constant_redefine('PMA_IS_IIS', $redefine);
-        } else {
-            runkit_constant_remove('PMA_IS_IIS');
-        }
-    }
-
-    /**
-     * Test for PMA_userprefsAutoloadGetHeader
-     *
-     * @return void
-     */
-    public function testUserprefsAutoloadGetHeader()
-    {
-        $_SESSION['userprefs_autoload'] = false;
-        $_REQUEST['prefs_autoload'] = 'hide';
-
-        $this->assertEquals(
-            '',
-            PMA_userprefsAutoloadGetHeader()
-        );
-
-        $this->assertTrue(
-            $_SESSION['userprefs_autoload']
-        );
-
-        $_REQUEST['prefs_autoload'] = 'nohide';
-        $GLOBALS['cfg']['ServerDefault'] = 1;
-        $GLOBALS['PMA_PHP_SELF'] = 'phpunit';
-        $result = PMA_userprefsAutoloadGetHeader();
-
-        $this->assertContains(
-            '<form action="prefs_manage.php" method="post" class="disableAjax">',
-            $result
-        );
-
-        $this->assertContains(
-            '<input type="hidden" name="token" value="token"',
-            $result
-        );
-
-        $this->assertContains(
-            '<input type="hidden" name="json" value="" />',
-            $result
-        );
-
-        $this->assertContains(
-            '<input type="hidden" name="submit_import" value="1" />',
-            $result
-        );
-
-        $this->assertContains(
-            '<input type="hidden" name="return_url" value="phpunit?" />',
-            $result
-        );
-    }
-}
diff --git a/#pma/test/libraries/PMA_zip_extension_test.php b/#pma/test/libraries/PMA_zip_extension_test.php
deleted file mode 100644
index 003cf323..00000000
--- a/#pma/test/libraries/PMA_zip_extension_test.php
+++ /dev/null
@@ -1,186 +0,0 @@
-<?php
-/**
- * Tests zip extension usage.
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-
-require_once 'libraries/zip_extension.lib.php';
-
-/**
- * Tests zip extension usage.
- *
- * @package PhpMyAdmin-test
- */
-class PMA_ZipExtension_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Test zip file content
-     *
-     * @param string $file           zip file
-     * @param string $specific_entry regular expression to match a file
-     * @param mixed  $output         expected output
-     *
-     * @dataProvider providerForTestGetZipContents
-     * @return void
-     */
-    public function testGetZipContents($file, $specific_entry, $output)
-    {
-        $this->assertEquals(
-            PMA_getZipContents($file, $specific_entry),
-            $output
-        );
-    }
-
-    /**
-     * Provider for testGetZipContents
-     *
-     * @return array
-     */
-    public function providerForTestGetZipContents()
-    {
-        return array(
-            array(
-                './test/test_data/test.zip',
-                null,
-                array(
-                    'error' => '',
-                    'data' => 'TEST FILE' . "\n"
-                )
-            ),
-            array(
-                './test/test_data/test.zip',
-                'test',
-                array(
-                    'error' => 'Error in ZIP archive: Could not find "test"',
-                    'data' => ''
-                )
-            )
-        );
-    }
-
-    /**
-     * Test Find file in Zip Archive
-     *
-     * @param string $file_regexp regular expression for the file name to match
-     * @param string $file        zip archive
-     * @param mixed  $output      expected output
-     *
-     * @dataProvider providerForTestFindFileFromZipArchive
-     * @return void
-     */
-    public function testFindFileFromZipArchive($file_regexp, $file, $output)
-    {
-        $this->assertEquals(
-            PMA_findFileFromZipArchive($file_regexp, $file),
-            $output
-        );
-    }
-
-    /**
-     * Provider for testFindFileFromZipArchive
-     *
-     * @return array Test data
-     */
-    public function providerForTestFindFileFromZipArchive()
-    {
-        return array(
-            array(
-                '/test/',
-                './test/test_data/test.zip',
-                'test.file'
-            )
-        );
-    }
-
-    /**
-     * Test for PMA_getNoOfFilesInZip
-     *
-     * @return void
-     */
-    public function testGetNoOfFilesInZip()
-    {
-        $this->assertEquals(
-            PMA_getNoOfFilesInZip('./test/test_data/test.zip'),
-            1
-        );
-    }
-
-    /**
-     * Test for PMA_zipExtract
-     *
-     * @return void
-     */
-    public function testZipExtract()
-    {
-        $this->assertEquals(
-            false,
-            PMA_zipExtract(
-                './test/test_data/test.zip', 'wrongName'
-            )
-        );
-        $this->assertEquals(
-            "TEST FILE\n",
-            PMA_zipExtract(
-                './test/test_data/test.zip', 'test.file'
-            )
-        );
-    }
-
-    /**
-     * Test for PMA_getZipError
-     *
-     * @param int   $code   error code
-     * @param mixed $output expected output
-     *
-     * @dataProvider providerForTestGetZipError
-     * @return void
-     */
-    public function testGetZipError($code, $output)
-    {
-        $this->assertEquals(
-            PMA_getZipError($code),
-            $output
-        );
-    }
-
-    /**
-     * Provider for testGetZipError
-     *
-     * @return array
-     */
-    public function providerForTestGetZipError()
-    {
-        return array(
-            array(
-                1,
-                'Multi-disk zip archives not supported'
-            ),
-            array(
-                5,
-                'Read error'
-            ),
-            array(
-                7,
-                'CRC error'
-            ),
-            array(
-                19,
-                'Not a zip archive'
-            ),
-            array(
-                21,
-                'Zip archive inconsistent'
-            ),
-            array(
-                404,
-                404
-            )
-        );
-    }
-}
-
diff --git a/#pma/test/libraries/common/PMA_browseUploadFile_test.php b/#pma/test/libraries/common/PMA_browseUploadFile_test.php
deleted file mode 100644
index 4c3b430b..00000000
--- a/#pma/test/libraries/common/PMA_browseUploadFile_test.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Test for PMA\libraries\Util::getBrowseUploadFileBlock from common.lib
- *
- * @package PhpMyAdmin-test
- * @group common.lib-tests
- */
-
-/*
- * Include to test.
- */
-
-
-/**
- * Test for PMA\libraries\Util::getBrowseUploadFileBlock from common.lib
- *
- * @package PhpMyAdmin-test
- * @group common.lib-tests
- */
-class PMA_GetBrowseUploadFileBlock_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Set up
-     *
-     * @return void
-     */
-    protected function setUp()
-    {
-        $GLOBALS['is_upload'] = false;
-    }
-
-    /**
-     * Data provider for test
-     *
-     * @return array
-     */
-    public function dataProvider()
-    {
-        return array(
-            array(10, __('B'), "10"),
-            array(100, __('B'), "100"),
-            array(1024, __('B'), "1,024"),
-            array(102400, __('KiB'), "100"),
-            array(10240000, __('MiB'), "10"),
-            array(2147483648, __('MiB'), "2,048"),
-            array(21474836480, __('GiB'), "20")
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\Util::getBrowseUploadFileBlock
-     *
-     * @param int    $size Size
-     * @param string $unit Unit
-     * @param string $res  Result
-     *
-     * @return void
-     *
-     * @dataProvider dataProvider
-     */
-    function testBrowseUploadFile($size, $unit, $res)
-    {
-        $this->assertEquals(
-            PMA\libraries\Util::getBrowseUploadFileBlock($size),
-            '<label for="input_import_file">' . __("Browse your computer:")
-            . '</label>'
-            . '<div id="upload_form_status" style="display: none;"></div>'
-            . '<div id="upload_form_status_info" style="display: none;"></div>'
-            . '<input type="file" name="import_file" id="input_import_file" />'
-            . "(" . __('Max: ') . $res . $unit . ")" . "\n"
-            . '<input type="hidden" name="MAX_FILE_SIZE" value="'
-            . $size . '" />' . "\n"
-        );
-    }
-}
diff --git a/#pma/test/libraries/common/PMA_buildActionTitles_test.php b/#pma/test/libraries/common/PMA_buildActionTitles_test.php
deleted file mode 100644
index 194d9711..00000000
--- a/#pma/test/libraries/common/PMA_buildActionTitles_test.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Test for PMA\libraries\Util::buildActionTitles from common.lib
- *
- * @package PhpMyAdmin-test
- * @group common.lib-tests
- */
-
-/*
- * Include to test.
- */
-use PMA\libraries\Theme;
-
-
-
-
-/**
- * Test for PMA\libraries\Util::buildActionTitles from common.lib
- *
- * @package PhpMyAdmin-test
- * @group common.lib-tests
- */
-class PMA_BuildActionTitles_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Set up
-     *
-     * @return void
-     */
-    function setup()
-    {
-        $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
-        $GLOBALS['cfg'] = array('ActionLinksMode' => 'both');
-        $GLOBALS['pmaThemeImage'] = 'theme/';
-    }
-
-    /**
-     * Test for buildActionTitles
-     *
-     * @return void
-     */
-    function testBuildActionTitles()
-    {
-        $titles = array();
-        $titles['Browse']     = PMA\libraries\Util::getIcon('b_browse.png', __('Browse'));
-        $titles['NoBrowse']   = PMA\libraries\Util::getIcon('bd_browse.png', __('Browse'));
-        $titles['Search']     = PMA\libraries\Util::getIcon('b_select.png', __('Search'));
-        $titles['NoSearch']   = PMA\libraries\Util::getIcon('bd_select.png', __('Search'));
-        $titles['Insert']     = PMA\libraries\Util::getIcon('b_insrow.png', __('Insert'));
-        $titles['NoInsert']   = PMA\libraries\Util::getIcon('bd_insrow.png', __('Insert'));
-        $titles['Structure']  = PMA\libraries\Util::getIcon('b_props.png', __('Structure'));
-        $titles['Drop']       = PMA\libraries\Util::getIcon('b_drop.png', __('Drop'));
-        $titles['NoDrop']     = PMA\libraries\Util::getIcon('bd_drop.png', __('Drop'));
-        $titles['Empty']      = PMA\libraries\Util::getIcon('b_empty.png', __('Empty'));
-        $titles['NoEmpty']    = PMA\libraries\Util::getIcon('bd_empty.png', __('Empty'));
-        $titles['Edit']       = PMA\libraries\Util::getIcon('b_edit.png', __('Edit'));
-        $titles['NoEdit']     = PMA\libraries\Util::getIcon('bd_edit.png', __('Edit'));
-        $titles['Export']     = PMA\libraries\Util::getIcon('b_export.png', __('Export'));
-        $titles['NoExport']   = PMA\libraries\Util::getIcon('bd_export.png', __('Export'));
-        $titles['Execute']    = PMA\libraries\Util::getIcon('b_nextpage.png', __('Execute'));
-        $titles['NoExecute']  = PMA\libraries\Util::getIcon('bd_nextpage.png', __('Execute'));
-        $titles['Favorite']   = PMA\libraries\Util::getIcon('b_favorite.png', '');
-        $titles['NoFavorite'] = PMA\libraries\Util::getIcon('b_no_favorite.png', '');
-
-        $this->assertEquals($titles, PMA\libraries\Util::buildActionTitles());
-
-    }
-}
diff --git a/#pma/test/libraries/common/PMA_cache_test.php b/#pma/test/libraries/common/PMA_cache_test.php
deleted file mode 100644
index ef18a294..00000000
--- a/#pma/test/libraries/common/PMA_cache_test.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Test for caching data in session
- *
- * @package PhpMyAdmin-test
- * @group common.lib-tests
- */
-
-/*
- * Include to test.
- */
-
-
-/**
- * Test for caching data in session
- *
- * @package PhpMyAdmin-test
- * @group common.lib-tests
- */
-class PMA_Cache_Test extends PHPUnit_Framework_TestCase
-{
-
-    /**
-     * @var array temporary variable for globals array
-     */
-    protected $tmpGlobals;
-
-    /**
-     * @var array temporary variable for session array
-     */
-    protected $tmpSession;
-
-    /**
-     * storing globals and session
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        $this->tmpGlobals = $GLOBALS;
-        $this->tmpSession = $_SESSION;
-    }
-
-    /**
-     * Test if cached data is available after set
-     *
-     * @return void
-     */
-    public function testCacheExists()
-    {
-        $GLOBALS['server'] = 'server';
-        PMA\libraries\Util::cacheSet('test_data', 5);
-        PMA\libraries\Util::cacheSet('test_data_2', 5);
-
-        $this->assertTrue(PMA\libraries\Util::cacheExists('test_data'));
-        $this->assertTrue(PMA\libraries\Util::cacheExists('test_data_2'));
-        $this->assertFalse(PMA\libraries\Util::cacheExists('fake_data_2'));
-    }
-
-    /**
-     * Test if PMA\libraries\Util::cacheGet does not return data for non existing cache entries
-     *
-     * @return void
-     */
-    public function testCacheGet()
-    {
-        $GLOBALS['server'] = 'server';
-        PMA\libraries\Util::cacheSet('test_data', 5);
-        PMA\libraries\Util::cacheSet('test_data_2', 5);
-
-        $this->assertNotNull(PMA\libraries\Util::cacheGet('test_data'));
-        $this->assertNotNull(PMA\libraries\Util::cacheGet('test_data_2'));
-        $this->assertNull(PMA\libraries\Util::cacheGet('fake_data_2'));
-    }
-
-    /**
-     * Test retrieval of cached data
-     *
-     * @return void
-     */
-    public function testCacheSetGet()
-    {
-        $GLOBALS['server'] = 'server';
-        PMA\libraries\Util::cacheSet('test_data', 25);
-
-        PMA\libraries\Util::cacheSet('test_data', 5);
-        $this->assertEquals(5, $_SESSION['cache']['server_server']['test_data']);
-        PMA\libraries\Util::cacheSet('test_data_3', 3);
-        $this->assertEquals(3, $_SESSION['cache']['server_server']['test_data_3']);
-    }
-
-    /**
-     * Test clearing cached values
-     *
-     * @return void
-     */
-    public function testCacheUnSet()
-    {
-        $GLOBALS['server'] = 'server';
-        PMA\libraries\Util::cacheSet('test_data', 25);
-        PMA\libraries\Util::cacheSet('test_data_2', 25);
-
-        PMA\libraries\Util::cacheUnset('test_data');
-        $this->assertArrayNotHasKey(
-            'test_data',
-            $_SESSION['cache']['server_server']
-        );
-        PMA\libraries\Util::cacheUnset('test_data_2');
-        $this->assertArrayNotHasKey(
-            'test_data_2',
-            $_SESSION['cache']['server_server']
-        );
-    }
-
-    /**
-     * Test clearing user cache
-     *
-     * @return void
-     */
-    public function testClearUserCache()
-    {
-        $GLOBALS['server'] = 'server';
-        PMA\libraries\Util::cacheSet('is_superuser', 'yes');
-        $this->assertEquals(
-            'yes',
-            $_SESSION['cache']['server_server']['is_superuser']
-        );
-
-        PMA\libraries\Util::clearUserCache();
-        $this->assertArrayNotHasKey(
-            'is_superuser',
-            $_SESSION['cache']['server_server']
-        );
-    }
-}
diff --git a/#pma/test/libraries/common/PMA_checkParameters_test.php b/#pma/test/libraries/common/PMA_checkParameters_test.php
deleted file mode 100644
index 8784514a..00000000
--- a/#pma/test/libraries/common/PMA_checkParameters_test.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- ** Test for PMA\libraries\Util::checkParameters from Util.php
- *
- * @package PhpMyAdmin-test
- * @group common.lib-tests
- */
-
-/*
- * Include to test.
- */
-use PMA\libraries\Theme;
-
-
-require_once 'libraries/sanitizing.lib.php';
-
-/**
- ** Test for PMA\libraries\Util::checkParameters from Util.php
- *
- * @package PhpMyAdmin-test
- * @group common.lib-tests
- */
-class PMA_CheckParameters_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Set up
-     *
-     * @return void
-     */
-    function setup()
-    {
-        $GLOBALS['PMA_Config'] = new PMA\libraries\Config();
-        $_SESSION['PMA_Theme'] = new Theme();
-        $GLOBALS['cfg'] = array('ServerDefault' => 1);
-        $GLOBALS['pmaThemeImage'] = 'theme/';
-        $GLOBALS['text_dir'] = 'ltr';
-    }
-
-    /**
-     * Test for checkParameters
-     *
-     * @return void
-     */
-    function testCheckParameterMissing()
-    {
-        $GLOBALS['PMA_PHP_SELF'] = PMA_getenv('PHP_SELF');
-        $GLOBALS['pmaThemePath'] = $_SESSION['PMA_Theme']->getPath();
-
-        $this->expectOutputRegex("/Missing parameter: field/");
-
-        PMA\libraries\Util::checkParameters(
-            array('db', 'table', 'field')
-        );
-    }
-
-    /**
-     * Test for checkParameters
-     *
-     * @return void
-     */
-    function testCheckParameter()
-    {
-        $GLOBALS['PMA_PHP_SELF'] = PMA_getenv('PHP_SELF');
-        $GLOBALS['pmaThemePath'] = $_SESSION['PMA_Theme']->getPath();
-        $GLOBALS['db'] = "dbDatabase";
-        $GLOBALS['table'] = "tblTable";
-        $GLOBALS['field'] = "test_field";
-        $GLOBALS['sql_query'] = "SELECT * FROM tblTable;";
-
-        $this->expectOutputString("");
-        PMA\libraries\Util::checkParameters(
-            array('db', 'table', 'field', 'sql_query')
-        );
-    }
-}
diff --git a/#pma/test/libraries/common/PMA_contains_nonprintable_ascii_test.php b/#pma/test/libraries/common/PMA_contains_nonprintable_ascii_test.php
deleted file mode 100644
index fee6f32d..00000000
--- a/#pma/test/libraries/common/PMA_contains_nonprintable_ascii_test.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- ** Test for PMA\libraries\Util::containsNonPrintableAscii from common.lib
- *
- * @package PhpMyAdmin-test
- * @group common.lib-tests
- */
-
-/*
- * Include to test.
- */
-
-
-/**
- ** Test for PMA\libraries\Util::containsNonPrintableAscii from common.lib
- *
- * @package PhpMyAdmin-test
- * @group common.lib-tests
- */
-class PMA_ContainsNonPrintableAsciiTest extends PHPUnit_Framework_TestCase
-{
-    /**
-     * data provider for testContainsNonPrintableAscii
-     *
-     * @return array
-     */
-    public function dataProvider()
-    {
-        return array(
-            array("normal string", 0),
-            array("new\nline", 1),
-            array("tab\tspace", 1),
-            array("escape" . chr(27) . "char", 1),
-            array("chars%$\r\n", 1),
-        );
-    }
-
-    /**
-     * Test for containsNonPrintableAscii
-     *
-     * @param string $str Value
-     * @param bool   $res Expected value
-     *
-     * @return void
-     *
-     * @dataProvider dataProvider
-     */
-    public function testContainsNonPrintableAscii($str, $res)
-    {
-        $this->assertEquals(
-            $res, PMA\libraries\Util::containsNonPrintableAscii($str)
-        );
-    }
-
-}
\ No newline at end of file
diff --git a/#pma/test/libraries/common/PMA_convert_bit_default_value_test.php b/#pma/test/libraries/common/PMA_convert_bit_default_value_test.php
deleted file mode 100644
index 3949a203..00000000
--- a/#pma/test/libraries/common/PMA_convert_bit_default_value_test.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- ** Test for PMA\libraries\Util::convertBitDefaultValue from common.lib
- *
- * @package PhpMyAdmin-test
- * @group common.lib-tests
- */
-
-/*
- * Include to test.
- */
-
-
-/**
- ** Test for PMA\libraries\Util::convertBitDefaultValue from common.lib
- *
- * @package PhpMyAdmin-test
- * @group common.lib-tests
- */
-class PMA_ConvertBitDefaultValueTest extends PHPUnit_Framework_TestCase
-{
-
-    /**
-     * Provider for testConvertBitDefaultValueTest
-     *
-     * @return array
-     *
-     * @dataProvider dataProvider
-     */
-    public function dataProvider()
-    {
-        return array(
-            array("b'",""),
-            array("b'01'","01"),
-            array("b'010111010'","010111010")
-        );
-    }
-
-    /**
-     * Test for convertBitDefaultValue
-     *
-     * @param string $bit Value
-     * @param string $val Expected value
-     *
-     * @return void
-     *
-     * @dataProvider dataProvider
-     */
-    public function testConvertBitDefaultValueTest($bit, $val)
-    {
-        $this->assertEquals(
-            $val, PMA\libraries\Util::convertBitDefaultValue($bit)
-        );
-
-    }
-}
diff --git a/#pma/test/libraries/common/PMA_escapeMySqlWildcards_test.php b/#pma/test/libraries/common/PMA_escapeMySqlWildcards_test.php
deleted file mode 100644
index 66a35020..00000000
--- a/#pma/test/libraries/common/PMA_escapeMySqlWildcards_test.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Test for MySQL Wildcards escaping/unescaping
- *
- * @package PhpMyAdmin-test
- * @group common.lib-tests
- */
-
-/*
- * Include to test.
- */
-
-
-/**
- * Test for MySQL Wildcards escaping/unescaping
- *
- * @package PhpMyAdmin-test
- * @group common.lib-tests
- */
-class PMA_EscapeMySqlWildcardsTest extends PHPUnit_Framework_TestCase
-{
-    /**
-     * data provider for testEscape and testUnEscape
-     *
-     * @return array
-     */
-    public function escapeDataProvider()
-    {
-        return array(
-            array('\_test', '_test'),
-            array('\_\\', '_\\'),
-            array('\\_\%', '_%'),
-            array('\\\_', '\_'),
-            array('\\\_\\\%', '\_\%'),
-            array('\_\\%\_\_\%', '_%__%'),
-            array('\%\_', '%_'),
-            array('\\\%\\\_', '\%\_')
-        );
-    }
-
-    /**
-     * PMA\libraries\Util::escapeMysqlWildcards tests
-     *
-     * @param string $a String to escape
-     * @param string $b Expected value
-     *
-     * @return void
-     *
-     * @dataProvider escapeDataProvider
-     */
-    public function testEscape($a, $b)
-    {
-        $this->assertEquals(
-            $a, PMA\libraries\Util::escapeMysqlWildcards($b)
-        );
-    }
-
-    /**
-     * PMA\libraries\Util::unescapeMysqlWildcards tests
-     *
-     * @param string $a String to escape
-     * @param string $b Expected value
-     *
-     * @return void
-     *
-     * @dataProvider escapeDataProvider
-     */
-    public function testUnEscape($a, $b)
-    {
-        $this->assertEquals(
-            $b, PMA\libraries\Util::unescapeMysqlWildcards($a)
-        );
-    }
-}
diff --git a/#pma/test/libraries/common/PMA_expandUserString_test.php b/#pma/test/libraries/common/PMA_expandUserString_test.php
deleted file mode 100644
index 4039b839..00000000
--- a/#pma/test/libraries/common/PMA_expandUserString_test.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- ** Test for PMA\libraries\Util::expandUserString from Util.php
- *
- * @package PhpMyAdmin-test
- * @group common.lib-tests
- */
-
-/*
- * Include to test.
- */
-
-
-
-/**
- ** Test for PMA\libraries\Util::expandUserString function.
- *
- * @package PhpMyAdmin-test
- */
-class PMA_ExpandUserString_Test extends PHPUnit_Framework_TestCase
-{
-
-    /**
-     * Setup variables needed by test.
-     *
-     * @return void
-     */
-    public function setup()
-    {
-        $GLOBALS['PMA_Config'] = new PMA\libraries\Config();
-        $GLOBALS['PMA_Config']->enableBc();
-        $GLOBALS['cfg'] = array(
-            'Server' => array(
-                'host' => 'host&',
-                'verbose' => 'verbose',
-            )
-        );
-        $GLOBALS['db'] = 'database';
-        $GLOBALS['table'] = 'table';
-    }
-
-    /**
-     * Test case for expanding strings
-     *
-     * @param string $in  string to evaluate
-     * @param string $out expected output
-     *
-     * @return void
-     *
-     * @dataProvider provider
-     */
-    public function testExpand($in, $out)
-    {
-        $out = str_replace('PMA_VERSION', PMA_VERSION, $out);
-        $this->assertEquals(
-            $out, PMA\libraries\Util::expandUserString($in)
-        );
-    }
-
-    /**
-     * Test case for expanding strings with escaping
-     *
-     * @param string $in  string to evaluate
-     * @param string $out expected output
-     *
-     * @return void
-     *
-     * @dataProvider provider
-     */
-    public function testExpandEscape($in, $out)
-    {
-        $out = str_replace('PMA_VERSION', PMA_VERSION, $out);
-        $this->assertEquals(
-            htmlspecialchars($out),
-            PMA\libraries\Util::expandUserString(
-                $in, 'htmlspecialchars'
-            )
-        );
-    }
-
-    /**
-     * Data provider
-     *
-     * @return array
-     */
-    public function provider()
-    {
-        return array(
-            array('@SERVER@', 'host&'),
-            array('@VSERVER@', 'verbose'),
-            array('@DATABASE@', 'database'),
-            array('@TABLE@', 'table'),
-            array('@IGNORE@', '@IGNORE@'),
-            array('@PHPMYADMIN@', 'phpMyAdmin PMA_VERSION'),
-            );
-    }
-}
diff --git a/#pma/test/libraries/common/PMA_extractColumnSpec_test.php b/#pma/test/libraries/common/PMA_extractColumnSpec_test.php
deleted file mode 100644
index c625aa78..00000000
--- a/#pma/test/libraries/common/PMA_extractColumnSpec_test.php
+++ /dev/null
@@ -1,164 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- ** Test for PMA\libraries\Util::extractColumnSpec from Util.php
- *
- * @package PhpMyAdmin-test
- * @group common.lib-tests
- */
-
-/*
- * Include to test.
- */
-
-
-/**
- ** Test for PMA\libraries\Util::extractColumnSpec function.
- *
- * @package PhpMyAdmin-test
- */
-class PMA_ExtractColumnSpec_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Set up
-     *
-     * @return void
-     */
-    protected function setUp()
-    {
-        $GLOBALS['cfg']['LimitChars'] = 1000;
-    }
-
-    /**
-     * Test case for parsing SHOW COLUMNS output
-     *
-     * @param string $in  Column specification
-     * @param array  $out Expected value
-     *
-     * @return void
-     *
-     * @dataProvider provider
-     */
-    public function testParsing($in, $out)
-    {
-        $this->assertEquals(
-            $out, PMA\libraries\Util::extractColumnSpec($in)
-        );
-    }
-
-    /**
-     * Data provider
-     *
-     * @return array
-     */
-    public function provider()
-    {
-        return array(
-            array(
-                "SET('a','b')",
-                array(
-                    'type' => 'set',
-                    'print_type' => "set('a', 'b')",
-                    'binary' => false,
-                    'unsigned' => false,
-                    'zerofill' => false,
-                    'spec_in_brackets' => "'a','b'",
-                    'enum_set_values' => array('a', 'b'),
-                    'attribute' => ' ',
-                    'can_contain_collation' => true,
-                    'displayed_type' => "set('a', 'b')"
-                ),
-            ),
-            array(
-                "SET('\'a','b')",
-                array(
-                    'type' => 'set',
-                    'print_type' => "set('\'a', 'b')",
-                    'binary' => false,
-                    'unsigned' => false,
-                    'zerofill' => false,
-                    'spec_in_brackets' => "'\'a','b'",
-                    'enum_set_values' => array("'a", 'b'),
-                    'attribute' => ' ',
-                    'can_contain_collation' => true,
-                    'displayed_type' => "set('\'a', 'b')"
-                ),
-            ),
-            array(
-                "SET('''a','b')",
-                array(
-                    'type' => 'set',
-                    'print_type' => "set('''a', 'b')",
-                    'binary' => false,
-                    'unsigned' => false,
-                    'zerofill' => false,
-                    'spec_in_brackets' => "'''a','b'",
-                    'enum_set_values' => array("'a", 'b'),
-                    'attribute' => ' ',
-                    'can_contain_collation' => true,
-                    'displayed_type' => "set('''a', 'b')"
-                ),
-            ),
-            array(
-                "ENUM('a&b', 'b''c\\'d', 'e\\\\f')",
-                array(
-                    'type' => 'enum',
-                    'print_type' => "enum('a&b', 'b''c\\'d', 'e\\\\f')",
-                    'binary' => false,
-                    'unsigned' => false,
-                    'zerofill' => false,
-                    'spec_in_brackets' => "'a&b', 'b''c\\'d', 'e\\\\f'",
-                    'enum_set_values' => array('a&b', 'b\'c\'d', 'e\\f'),
-                    'attribute' => ' ',
-                    'can_contain_collation' => true,
-                    'displayed_type' => "enum('a&amp;b', 'b''c\\'d', 'e\\\\f')"
-                ),
-            ),
-            array(
-                "INT UNSIGNED zerofill",
-                array(
-                    'type' => 'int',
-                    'print_type' => 'int',
-                    'binary' => false,
-                    'unsigned' => true,
-                    'zerofill' => true,
-                    'spec_in_brackets' => '',
-                    'enum_set_values' => array(),
-                    'attribute' => 'UNSIGNED ZEROFILL',
-                    'can_contain_collation' => false,
-                    'displayed_type' => "int"
-                ),
-            ),
-            array(
-                "VARCHAR(255)",
-                array(
-                    'type' => 'varchar',
-                    'print_type' => 'varchar(255)',
-                    'binary' => false,
-                    'unsigned' => false,
-                    'zerofill' => false,
-                    'spec_in_brackets' => '255',
-                    'enum_set_values' => array(),
-                    'attribute' => ' ',
-                    'can_contain_collation' => true,
-                    'displayed_type' => "varchar(255)"
-                ),
-            ),
-            array(
-                "VARBINARY(255)",
-                array(
-                    'type' => 'varbinary',
-                    'print_type' => 'varbinary(255)',
-                    'binary' => false,
-                    'unsigned' => false,
-                    'zerofill' => false,
-                    'spec_in_brackets' => '255',
-                    'enum_set_values' => array(),
-                    'attribute' => ' ',
-                    'can_contain_collation' => false,
-                    'displayed_type' => "varbinary(255)"
-                ),
-            ),
-        );
-    }
-}
diff --git a/#pma/test/libraries/common/PMA_extractValueFromFormattedSize_test.php b/#pma/test/libraries/common/PMA_extractValueFromFormattedSize_test.php
deleted file mode 100644
index 45413e7f..00000000
--- a/#pma/test/libraries/common/PMA_extractValueFromFormattedSize_test.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- ** Test for PMA\libraries\Util::extractValueFromFormattedSize from common.lib
- *
- * @package PhpMyAdmin-test
- * @group common.lib-tests
- */
-
-/*
- * Include to test.
- */
-
-
-/**
- ** Test for PMA\libraries\Util::extractValueFromFormattedSize from common.lib
- *
- * @package PhpMyAdmin-test
- * @group common.lib-tests
- */
-class PMA_ExtractValueFromFormattedSize_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Test for extractValueFromFormattedSize
-     *
-     * @param int|string $size     Size
-     * @param int        $expected Expected value
-     *
-     * @return void
-     *
-     * @dataProvider provider
-     */
-    function testExtractValueFromFormattedSize($size, $expected)
-    {
-        $this->assertEquals(
-            $expected,
-            PMA\libraries\Util::extractValueFromFormattedSize($size)
-        );
-    }
-
-    /**
-     * Data provider for testExtractValueFromFormattedSize
-     *
-     * @return array
-     */
-    public function provider()
-    {
-        return array(
-            array(100, -1),
-            array("10GB", 10737418240),
-            array("15MB", 15728640),
-            array("256K", 262144)
-        );
-    }
-}
diff --git a/#pma/test/libraries/common/PMA_foreignKeySupported_test.php b/#pma/test/libraries/common/PMA_foreignKeySupported_test.php
deleted file mode 100644
index d4cf0eea..00000000
--- a/#pma/test/libraries/common/PMA_foreignKeySupported_test.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Test for supporting foreign key
- *
- * @package PhpMyAdmin-test
- * @group common.lib-tests
- */
-
-/*
- * Include to test.
- */
-
-
-/**
- * Test for supporting foreign key
- *
- * @package PhpMyAdmin-test
- * @group common.lib-tests
- */
-class PMA_IsForeignKeySupportedTest extends PHPUnit_Framework_TestCase
-{
-    /**
-     * data provider for foreign key supported test
-     *
-     * @return array
-     */
-    public function foreignkeySupportedDataProvider()
-    {
-        return array(
-            array('MyISAM', false),
-            array('innodb', true),
-            array('pBxT', true)
-        );
-    }
-
-    /**
-     * foreign key supported test
-     *
-     * @param string $a Engine
-     * @param bool   $e Expected Value
-     *
-     * @return void
-     *
-     * @dataProvider foreignkeySupportedDataProvider
-     */
-    public function testForeignkeySupported($a, $e)
-    {
-        $this->assertEquals(
-            $e, PMA\libraries\Util::isForeignKeySupported($a)
-        );
-    }
-}
diff --git a/#pma/test/libraries/common/PMA_formatNumberByteDown_test.php b/#pma/test/libraries/common/PMA_formatNumberByteDown_test.php
deleted file mode 100644
index 604e59b3..00000000
--- a/#pma/test/libraries/common/PMA_formatNumberByteDown_test.php
+++ /dev/null
@@ -1,169 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Test for format number and byte
- *
- * @package PhpMyAdmin-test
- * @group common.lib-tests
- */
-
-/*
- * Include to test.
- */
-
-
-/**
- * Test for format number and byte
- *
- * @package PhpMyAdmin-test
- * @group common.lib-tests
- */
-class PMA_FormatNumberByteDown_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * temporary variable for globals array
-     */
-    protected $tmpGlobals;
-
-    /**
-     * temporary variable for session array
-     */
-    protected $tmpSession;
-
-    /**
-     * storing globals and session
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        $this->tmpGlobals = $GLOBALS;
-        $this->tmpSession = $_SESSION;
-
-    }
-
-    /**
-     * recovering globals and session
-     *
-     * @return void
-     */
-    public function tearDown()
-    {
-        $GLOBALS = $this->tmpGlobals;
-        $_SESSION = $this->tmpSession;
-
-    }
-
-    /**
-     * format number data provider
-     *
-     * @return array
-     */
-    public function formatNumberDataProvider()
-    {
-        return array(
-            array(10, 2, 2, '10  '),
-            array(100, 2, 0, '100  '),
-            array(100, 2, 2, '100  '),
-            array(-1000.454, 4, 2, '-1,000.45  '),
-            array(0.00003, 3, 2, '30 &micro;'),
-            array(0.003, 3, 3, '3 m'),
-            array(-0.003, 6, 0, '-3,000 &micro;'),
-            array(100.98, 0, 2, '100.98'),
-            array(21010101, 0, 2, '21,010,101.00'),
-            array(20000, 2, 2, '20 k'),
-            array(20011, 2, 2, '20.01 k'),
-        );
-    }
-
-    /**
-     * Core test for formatNumber
-     *
-     *
-     * @param float $a Value to format
-     * @param int   $b Sensitiveness
-     * @param int   $c Number of decimals to retain
-     * @param array $d Expected value
-     *
-     * @return void
-     */
-    private function assertFormatNumber($a, $b, $c, $d)
-    {
-        $this->assertEquals(
-            $d,
-            (string) PMA\libraries\Util::formatNumber(
-                $a, $b, $c, false
-            )
-        );
-    }
-
-    /**
-     * format number test, globals are defined
-     *
-     * @param float $a Value to format
-     * @param int   $b Sensitiveness
-     * @param int   $c Number of decimals to retain
-     * @param array $d Expected value
-     *
-     * @return void
-     *
-     * @dataProvider formatNumberDataProvider
-     */
-    public function testFormatNumber($a, $b, $c, $d)
-    {
-        $this->assertFormatNumber($a, $b, $c, $d);
-
-        // Test with various precisions
-        $old_precision = ini_get('precision');
-        ini_set('precision', 20);
-        $this->assertFormatNumber($a, $b, $c, $d);
-        ini_set('precision', 14);
-        $this->assertFormatNumber($a, $b, $c, $d);
-        ini_set('precision', 10);
-        $this->assertFormatNumber($a, $b, $c, $d);
-        ini_set('precision', 5);
-        $this->assertFormatNumber($a, $b, $c, $d);
-        ini_set('precision', -1);
-        $this->assertFormatNumber($a, $b, $c, $d);
-        ini_set('precision', $old_precision);
-    }
-
-    /**
-     * format byte down data provider
-     *
-     * @return array
-     */
-    public function formatByteDownDataProvider()
-    {
-        return array(
-            array(10, 2, 2, array('10', __('B'))),
-            array(100, 2, 0, array('0', __('KiB'))),
-            array(100, 3, 0, array('100', __('B'))),
-            array(100, 2, 2, array('0.10', __('KiB'))),
-            array(1034, 3, 2, array('1.01', __('KiB'))),
-            array(100233, 3, 3, array('97.884', __('KiB'))),
-            array(2206451, 1, 2, array('2.10', __('MiB'))),
-            array(21474836480, 4, 0, array('20', __('GiB'))),
-            array(doubleval(52) + doubleval(2048), 3, 1, array('2.1', 'KiB')),
-        );
-    }
-
-    /**
-     * format byte test, globals are defined
-     *
-     * @param float $a Value to format
-     * @param int   $b Sensitiveness
-     * @param int   $c Number of decimals to retain
-     * @param array $e Expected value
-     *
-     * @return void
-     *
-     * @dataProvider formatByteDownDataProvider
-     */
-    public function testFormatByteDown($a, $b, $c, $e)
-    {
-        $result = PMA\libraries\Util::formatByteDown($a, $b, $c);
-        $result[0] = trim($result[0]);
-        $this->assertEquals($e, $result);
-    }
-}
diff --git a/#pma/test/libraries/common/PMA_formatSql_test.php b/#pma/test/libraries/common/PMA_formatSql_test.php
deleted file mode 100644
index 1e8607d8..00000000
--- a/#pma/test/libraries/common/PMA_formatSql_test.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- ** Test for PMA\libraries\Util::formatSql from Util.php
- *
- * @package PhpMyAdmin-test
- * @group common.lib-tests
- */
-
-/*
- * Include to test.
- */
-
-
-/**
- ** Test for PMA\libraries\Util::formatSql from Util.php
- *
- * @package PhpMyAdmin-test
- * @group common.lib-tests
- */
-class PMA_FormatSql_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Test for formatSql
-     *
-     * @return void
-     */
-    function testFormatSQL()
-    {
-
-        $this->assertEquals(
-            '<code class="sql"><pre>' . "\n"
-            . 'SELECT 1 &lt; 2' . "\n"
-            . '</pre></code>',
-            PMA\libraries\Util::formatSql('SELECT 1 < 2')
-        );
-    }
-
-    /**
-     * Test for formatSql
-     *
-     * @return void
-     */
-    function testFormatSQLTruncate()
-    {
-        $GLOBALS['cfg']['MaxCharactersInDisplayedSQL'] = 6;
-
-        $this->assertEquals(
-            '<code class="sql"><pre>' . "\n"
-            . 'SELECT[...]' . "\n"
-            . '</pre></code>',
-            PMA\libraries\Util::formatSql('SELECT 1 < 2', true)
-        );
-    }
-}
diff --git a/#pma/test/libraries/common/PMA_generateHiddenMaxFileSize_test.php b/#pma/test/libraries/common/PMA_generateHiddenMaxFileSize_test.php
deleted file mode 100644
index d8c9c65b..00000000
--- a/#pma/test/libraries/common/PMA_generateHiddenMaxFileSize_test.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- ** Test for PMA\libraries\Util::generateHiddenMaxFileSize from Util.php
- *
- * @package PhpMyAdmin-test
- * @group common.lib-tests
- */
-
-/*
- * Include to test.
- */
-
-
-/**
- ** Test for PMA\libraries\Util::generateHiddenMaxFileSize from Util.php
- *
- * @package PhpMyAdmin-test
- * @group common.lib-tests
- */
-class PMA_GenerateHiddenMaxFileSize_Test extends PHPUnit_Framework_TestCase
-{
-
-    /**
-     * Data provider for test
-     *
-     * @return array
-     */
-    public function dataProvider()
-    {
-        return array(
-            array(10),
-            array("100"),
-            array(1024),
-            array("1024Mb"),
-            array(2147483648),
-            array("some_string")
-        );
-    }
-
-    /**
-     * Test for generateHiddenMaxFileSize
-     *
-     * @param int $size Size
-     *
-     * @return void
-     *
-     * @dataProvider dataProvider
-     */
-    function testGenerateHiddenMaxFileSize($size)
-    {
-        $this->assertEquals(
-            PMA\libraries\Util::generateHiddenMaxFileSize($size),
-            '<input type="hidden" name="MAX_FILE_SIZE" value="' . $size . '" />'
-        );
-    }
-}
diff --git a/#pma/test/libraries/common/PMA_getCheckbox_test.php b/#pma/test/libraries/common/PMA_getCheckbox_test.php
deleted file mode 100644
index 8448118f..00000000
--- a/#pma/test/libraries/common/PMA_getCheckbox_test.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- ** Test for PMA\libraries\Util::getCheckbox from Util.php
- *
- * @package PhpMyAdmin-test
- * @group common.lib-tests
- */
-
-/*
- * Include to test.
- */
-
-
-/**
- ** Test for PMA\libraries\Util::getCheckbox from Util.php
- *
- * @package PhpMyAdmin-test
- * @group common.lib-tests
- */
-class PMA_GetCheckboxTest extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Test for getCheckbox
-     *
-     * @return void
-     */
-    function testGetCheckbox()
-    {
-        $name = "test_display_html_checkbox";
-        $label = "text_label_for_checkbox";
-
-        $this->assertEquals(
-            PMA\libraries\Util::getCheckbox($name, $label, false, false, $name),
-            '<input type="checkbox" name="' . $name . '" id="' . $name
-            . '" /><label for="' . $name . '">' . $label
-            . '</label>'
-        );
-    }
-
-    /**
-     * Test for getCheckbox
-     *
-     * @return void
-     */
-    function testGetCheckboxChecked()
-    {
-        $name = "test_display_html_checkbox";
-        $label = "text_label_for_checkbox";
-
-        $this->assertEquals(
-            PMA\libraries\Util::getCheckbox($name, $label, true, false, $name),
-            '<input type="checkbox" name="' . $name . '" id="' . $name
-            . '" checked="checked" /><label for="' . $name . '">' . $label
-            . '</label>'
-        );
-    }
-
-    /**
-     * Test for getCheckbox
-     *
-     * @return void
-     */
-    function testGetCheckboxOnclick()
-    {
-        $name = "test_display_html_checkbox";
-        $label = "text_label_for_checkbox";
-
-        $this->assertEquals(
-            PMA\libraries\Util::getCheckbox($name, $label, false, true, $name),
-            '<input type="checkbox" name="' . $name . '" id="' . $name
-            . '" class="autosubmit" /><label for="' . $name . '">' . $label
-            . '</label>'
-        );
-    }
-
-    /**
-     * Test for getCheckbox
-     *
-     * @return void
-     */
-    function testGetCheckboxCheckedOnclick()
-    {
-        $name = "test_display_html_checkbox";
-        $label = "text_label_for_checkbox";
-
-        $this->assertEquals(
-            PMA\libraries\Util::getCheckbox($name, $label, true, true, $name),
-            '<input type="checkbox" name="' . $name . '" id="' . $name
-            . '" checked="checked" class="autosubmit" /><label for="' . $name
-            . '">' . $label . '</label>'
-        );
-    }
-}
diff --git a/#pma/test/libraries/common/PMA_getDbLink_test.php b/#pma/test/libraries/common/PMA_getDbLink_test.php
deleted file mode 100644
index c7f44141..00000000
--- a/#pma/test/libraries/common/PMA_getDbLink_test.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Test for PMA_getDbLink_test from Util.php
- *
- * @package PhpMyAdmin-test
- * @group common.lib-tests
- */
-
-/*
- * Include to test.
- */
-
-require_once 'libraries/url_generating.lib.php';
-
-/**
- * Test for PMA_getDbLink_test from Util.php
- *
- * @package PhpMyAdmin-test
- * @group common.lib-tests
- */
-class PMA_GetDbLink_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Set up
-     *
-     * @return void
-     */
-    function setUp()
-    {
-        global $cfg;
-        include 'libraries/config.default.php';
-        $GLOBALS['server'] = 99;
-    }
-
-    /**
-     * Test for getDbLink
-     *
-     * @return void
-     *
-     * @group medium
-     */
-    function testGetDbLinkEmpty()
-    {
-        $GLOBALS['db'] = null;
-        $this->assertEmpty(PMA\libraries\Util::getDbLink());
-    }
-
-    /**
-     * Test for getDbLink
-     *
-     * @return void
-     *
-     * @group medium
-     */
-    function testGetDbLinkNull()
-    {
-        global $cfg;
-        $GLOBALS['db'] = 'test_db';
-        $database = $GLOBALS['db'];
-        $this->assertEquals(
-            '<a href="'
-            . PMA\libraries\Util::getScriptNameForOption(
-                $GLOBALS['cfg']['DefaultTabDatabase'], 'database'
-            )
-            . '?db=' . $database
-            . '&amp;server=99&amp;lang=en&amp;token=token" '
-            . 'title="Jump to database &quot;'
-            . htmlspecialchars($database) . '&quot;.">'
-            . htmlspecialchars($database) . '</a>',
-            PMA\libraries\Util::getDbLink()
-        );
-    }
-
-    /**
-     * Test for getDbLink
-     *
-     * @return void
-     */
-    function testGetDbLink()
-    {
-        global $cfg;
-        $database = 'test_database';
-        $this->assertEquals(
-            '<a href="' . PMA\libraries\Util::getScriptNameForOption(
-                $GLOBALS['cfg']['DefaultTabDatabase'], 'database'
-            )
-            . '?db=' . $database
-            . '&amp;server=99&amp;lang=en&amp;token=token" title="Jump to database &quot;'
-            . htmlspecialchars($database) . '&quot;.">'
-            . htmlspecialchars($database) . '</a>',
-            PMA\libraries\Util::getDbLink($database)
-        );
-    }
-
-    /**
-     * Test for getDbLink
-     *
-     * @return void
-     */
-    function testGetDbLinkWithSpecialChars()
-    {
-        global $cfg;
-        $database = 'test&data\'base';
-        $this->assertEquals(
-            '<a href="'
-            . PMA\libraries\Util::getScriptNameForOption(
-                $GLOBALS['cfg']['DefaultTabDatabase'], 'database'
-            )
-            . '?db='
-            . htmlspecialchars(urlencode($database))
-            . '&amp;server=99&amp;lang=en&amp;token=token" title="Jump to database &quot;'
-            . htmlspecialchars($database) . '&quot;.">'
-            . htmlspecialchars($database) . '</a>',
-            PMA\libraries\Util::getDbLink($database)
-        );
-    }
-}
diff --git a/#pma/test/libraries/common/PMA_getDivForSliderEffect_test.php b/#pma/test/libraries/common/PMA_getDivForSliderEffect_test.php
deleted file mode 100644
index 1054d957..00000000
--- a/#pma/test/libraries/common/PMA_getDivForSliderEffect_test.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- ** Test for PMA\libraries\Util::getDivForSliderEffect from Util.php
- *
- * @package PhpMyAdmin-test
- * @group common.lib-tests
- */
-
-/*
- * Include to test.
- */
-
-
-/**
- ** Test for PMA\libraries\Util::getDivForSliderEffect from Util.php
- *
- * @package PhpMyAdmin-test
- * @group common.lib-tests
- */
-class PMA_GetDivForSliderEffectTest extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Test for getDivForSliderEffect
-     *
-     * @return void
-     */
-    function testGetDivForSliderEffectTest()
-    {
-        global $cfg;
-        $cfg['InitialSlidersState'] = 'undefined';
-
-        $id = "test_id";
-        $message = "test_message";
-
-        $this->assertEquals(
-            PMA\libraries\Util::getDivForSliderEffect($id, $message),
-            '<div id="' . $id . '" class="pma_auto_slider" title="'
-            . htmlspecialchars($message) . '">'
-        );
-    }
-
-    /**
-     * Test for getDivForSliderEffect
-     *
-     * @return void
-     */
-    function testGetDivForSliderEffectTestClosed()
-    {
-        global $cfg;
-        $cfg['InitialSlidersState'] = 'closed';
-
-        $id = "test_id";
-        $message = "test_message";
-
-        $this->assertEquals(
-            PMA\libraries\Util::getDivForSliderEffect($id, $message),
-            '<div id="' . $id . '" style="display: none; overflow:auto;" '
-            . 'class="pma_auto_slider" title="' . htmlspecialchars($message) . '">'
-        );
-
-    }
-
-    /**
-     * Test for getDivForSliderEffect
-     *
-     * @return void
-     */
-    function testGetDivForSliderEffectTestDisabled()
-    {
-        global $cfg;
-        $cfg['InitialSlidersState'] = 'disabled';
-
-        $id = "test_id";
-        $message = "test_message";
-
-        $this->assertEquals(
-            PMA\libraries\Util::getDivForSliderEffect($id, $message),
-            '<div id="' . $id . '">'
-        );
-    }
-}
\ No newline at end of file
diff --git a/#pma/test/libraries/common/PMA_getDropdown_test.php b/#pma/test/libraries/common/PMA_getDropdown_test.php
deleted file mode 100644
index 40974f18..00000000
--- a/#pma/test/libraries/common/PMA_getDropdown_test.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- ** Test for PMA\libraries\Util::getDropdown from Util.php
- *
- * @package PhpMyAdmin-test
- * @group common.lib-tests
- */
-
-/*
- * Include to test.
- */
-
-
-/**
- ** Test for PMA\libraries\Util::getDropdown from Util.php
- *
- * @package PhpMyAdmin-test
- * @group common.lib-tests
- */
-class PMA_GetDropdownTest extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Test for getDropdown
-     *
-     * @return void
-     */
-    function testGetDropdownEmpty()
-    {
-        $name = "test_dropdown_name";
-        $choices = array();
-        $active_choice = null;
-        $id = "test_&lt;dropdown&gt;_name";
-
-        $result = '<select name="' . htmlspecialchars($name) . '" id="'
-            . htmlspecialchars($id) . '"></select>';
-
-        $this->assertEquals(
-            $result,
-            PMA\libraries\Util::getDropdown(
-                $name, $choices, $active_choice, $id
-            )
-        );
-    }
-
-    /**
-     * Test for getDropdown
-     *
-     * @return void
-     */
-    function testGetDropdown()
-    {
-        $name = "&test_dropdown_name";
-        $choices = array("value_1" => "label_1", "value&_2\"" => "label_2");
-        $active_choice = null;
-        $id = "test_&lt;dropdown&gt;_name";
-
-        $result = '<select name="' . htmlspecialchars($name) . '" id="'
-            . htmlspecialchars($id) . '">';
-        foreach ($choices as $one_choice_value => $one_choice_label) {
-            $result .= '<option value="' . htmlspecialchars($one_choice_value) . '"';
-            if ($one_choice_value == $active_choice) {
-                $result .= ' selected="selected"';
-            }
-            $result .= '>' . htmlspecialchars($one_choice_label) . '</option>';
-        }
-        $result .= '</select>';
-
-        $this->assertEquals(
-            $result,
-            PMA\libraries\Util::getDropdown(
-                $name, $choices, $active_choice, $id
-            )
-        );
-    }
-
-    /**
-     * Test for getDropdown
-     *
-     * @return void
-     */
-    function testGetDropdownWithActive()
-    {
-        $name = "&test_dropdown_name";
-        $choices = array("value_1" => "label_1", "value&_2\"" => "label_2");
-        $active_choice = "value&_2\"";
-        $id = "test_&lt;dropdown&gt;_name";
-
-        $result = '<select name="' . htmlspecialchars($name) . '" id="'
-            . htmlspecialchars($id) . '">';
-        foreach ($choices as $one_choice_value => $one_choice_label) {
-            $result .= '<option value="' . htmlspecialchars($one_choice_value) . '"';
-            if ($one_choice_value == $active_choice) {
-                $result .= ' selected="selected"';
-            }
-            $result .= '>' . htmlspecialchars($one_choice_label) . '</option>';
-        }
-        $result .= '</select>';
-
-        $this->assertEquals(
-            $result,
-            PMA\libraries\Util::getDropdown(
-                $name, $choices, $active_choice, $id
-            )
-        );
-    }
-}
\ No newline at end of file
diff --git a/#pma/test/libraries/common/PMA_getFormattedMaximumUploadSize_test.php b/#pma/test/libraries/common/PMA_getFormattedMaximumUploadSize_test.php
deleted file mode 100644
index cfb338d4..00000000
--- a/#pma/test/libraries/common/PMA_getFormattedMaximumUploadSize_test.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- ** Test for PMA\libraries\Util::getFormattedMaximumUploadSize from Util.php
- *
- * @package PhpMyAdmin-test
- * @group common.lib-tests
- */
-
-/*
- * Include to test.
- */
-
-
-/**
- ** Test for PMA\libraries\Util::getFormattedMaximumUploadSize from Util.php
- *
- * @package PhpMyAdmin-test
- * @group common.lib-tests
- */
-class PMA_GetFormattedMaximumUploadSize_Test extends PHPUnit_Framework_TestCase
-{
-
-    /**
-     * Data provider for test
-     *
-     * @return array
-     */
-    public function dataProvider()
-    {
-        return array(
-            array(10, __('B'), "10"),
-            array(100, __('B'), "100"),
-            array(1024, __('B'), "1,024"),
-            array(102400, __('KiB'), "100"),
-            array(10240000, __('MiB'), "10"),
-            array(2147483648, __('MiB'), "2,048"),
-            array(21474836480, __('GiB'), "20")
-        );
-    }
-
-    /**
-     * Test for PMA\libraries\Util::getFormattedMaximumUploadSize
-     *
-     * @param int    $size Size
-     * @param string $unit Unit
-     * @param string $res  Result
-     *
-     * @return void
-     *
-     * @dataProvider dataProvider
-     */
-    function testMaximumUploadSize($size, $unit, $res)
-    {
-        $this->assertEquals(
-            "(" . __('Max: ') . $res . $unit . ")",
-            PMA\libraries\Util::getFormattedMaximumUploadSize($size)
-        );
-
-    }
-}
diff --git a/#pma/test/libraries/common/PMA_getIcon_test.php b/#pma/test/libraries/common/PMA_getIcon_test.php
deleted file mode 100644
index 3372ea57..00000000
--- a/#pma/test/libraries/common/PMA_getIcon_test.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- ** Test for PMA\libraries\Util::getIcon() from Util.php
- *
- * @package PhpMyAdmin-test
- * @group common.lib-tests
- */
-
-/*
- * Include to test.
- */
-use PMA\libraries\Theme;
-
-
-
-
-/**
- ** Test for PMA\libraries\Util::getIcon() from Util.php
- *
- * @package PhpMyAdmin-test
- * @group common.lib-tests
- */
-class PMA_GetIcon_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Set up
-     *
-     * @return void
-     */
-    function setup()
-    {
-        $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
-    }
-
-    /**
-     * Test for getIcon
-     *
-     * @return void
-     */
-    function testGetIconWithoutActionLinksMode()
-    {
-        $GLOBALS['cfg']['ActionLinksMode'] = 'text';
-
-        $this->assertEquals(
-            '<span class="nowrap"></span>',
-            PMA\libraries\Util::getIcon('b_comment.png')
-        );
-    }
-
-    /**
-     * Test for getIcon
-     *
-     * @return void
-     */
-    function testGetIconWithActionLinksMode()
-    {
-        $GLOBALS['cfg']['ActionLinksMode'] = 'icons';
-
-        $this->assertEquals(
-            '<span class="nowrap"><img src="themes/dot.gif" title="" alt="" class="icon ic_b_comment" /></span>',
-            PMA\libraries\Util::getIcon('b_comment.png')
-        );
-    }
-
-    /**
-     * Test for getIcon
-     *
-     * @return void
-     */
-    function testGetIconAlternate()
-    {
-        $GLOBALS['cfg']['ActionLinksMode'] = 'icons';
-        $alternate_text = 'alt_str';
-
-        $this->assertEquals(
-            '<span class="nowrap"><img src="themes/dot.gif" title="'
-            . $alternate_text . '" alt="' . $alternate_text
-            . '" class="icon ic_b_comment" /></span>',
-            PMA\libraries\Util::getIcon('b_comment.png', $alternate_text)
-        );
-    }
-
-    /**
-     * Test for getIcon
-     *
-     * @return void
-     */
-    function testGetIconWithForceText()
-    {
-        $GLOBALS['cfg']['ActionLinksMode'] = 'icons';
-        $alternate_text = 'alt_str';
-
-        // Here we are checking for an icon embedded inside a span (i.e not a menu
-        // bar icon
-        $this->assertEquals(
-            '<span class="nowrap"><img src="themes/dot.gif" title="'
-            . $alternate_text . '" alt="' . $alternate_text
-            . '" class="icon ic_b_comment" />&nbsp;' . $alternate_text . '</span>',
-            PMA\libraries\Util::getIcon('b_comment.png', $alternate_text, true, false)
-        );
-
-    }
-}
diff --git a/#pma/test/libraries/common/PMA_getRadioFields_test.php b/#pma/test/libraries/common/PMA_getRadioFields_test.php
deleted file mode 100644
index 734cce49..00000000
--- a/#pma/test/libraries/common/PMA_getRadioFields_test.php
+++ /dev/null
@@ -1,275 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- ** Test for PMA\libraries\Util::getRadioFields from Util.php
- *
- * @package PhpMyAdmin-test
- * @group common.lib-tests
- */
-
-/*
- * Include to test.
- */
-
-
-/**
- ** Test for PMA\libraries\Util::getRadioFields from Util.php
- *
- * @package PhpMyAdmin-test
- * @group common.lib-tests
- */
-class PMA_GetRadioFieldsTest extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Test for getRadioFields
-     *
-     * @return void
-     */
-    function testGetRadioFieldsEmpty()
-    {
-        $name = "test_display_radio";
-        $choices = array();
-
-        $this->assertEquals(
-            PMA\libraries\Util::getRadioFields($name, $choices),
-            ""
-        );
-    }
-
-    /**
-     * Test for getRadioFields
-     *
-     * @return void
-     */
-    function testGetRadioFields()
-    {
-        $name = "test_display_radio";
-        $choices = array('value_1'=>'choice_1', 'value_2'=>'choice_2');
-
-        $out = "";
-        foreach ($choices as $choice_value => $choice_label) {
-            $html_field_id = $name . '_' . $choice_value;
-            $out .= '<input type="radio" name="' . $name . '" id="' . $html_field_id
-                . '" value="' . htmlspecialchars($choice_value) . '"';
-            $out .= ' />' . "\n";
-            $out .= '<label for="' . $html_field_id . '">' . $choice_label
-                . '</label>';
-            $out .= '<br />';
-            $out .= "\n";
-        }
-
-        $this->assertEquals(
-            PMA\libraries\Util::getRadioFields($name, $choices),
-            $out
-        );
-    }
-
-    /**
-     * Test for getRadioFields
-     *
-     * @return void
-     */
-    function testGetRadioFieldsWithChecked()
-    {
-        $name = "test_display_radio";
-        $choices = array('value_1'=>'choice_1', 'value_2'=>'choice_2');
-        $checked_choice = "value_2";
-
-        $out = "";
-        foreach ($choices as $choice_value => $choice_label) {
-            $html_field_id = $name . '_' . $choice_value;
-            $out .= '<input type="radio" name="' . $name . '" id="' . $html_field_id
-                . '" value="' . htmlspecialchars($choice_value) . '"';
-            if ($choice_value == $checked_choice) {
-                $out .= ' checked="checked"';
-            }
-            $out .= ' />' . "\n";
-            $out .= '<label for="' . $html_field_id . '">' . $choice_label
-                . '</label>';
-            $out .= '<br />';
-            $out .= "\n";
-        }
-
-        $this->assertEquals(
-            PMA\libraries\Util::getRadioFields(
-                $name, $choices, $checked_choice
-            ),
-            $out
-        );
-    }
-
-    /**
-     * Test for getRadioFields
-     *
-     * @return void
-     */
-    function testGetRadioFieldsWithCheckedWithClass()
-    {
-        $name = "test_display_radio";
-        $choices = array('value_1'=>'choice_1', 'value_2'=>'choice_2');
-        $checked_choice = "value_2";
-        $class = "test_class";
-
-        $out = "";
-        foreach ($choices as $choice_value => $choice_label) {
-            $html_field_id = $name . '_' . $choice_value;
-            $out .= '<div class="' . $class . '">';
-            $out .= '<input type="radio" name="' . $name . '" id="' . $html_field_id
-                . '" value="' . htmlspecialchars($choice_value) . '"';
-            if ($choice_value == $checked_choice) {
-                $out .= ' checked="checked"';
-            }
-            $out .= ' />' . "\n";
-            $out .= '<label for="' . $html_field_id . '">' . $choice_label
-                . '</label>';
-            $out .= '<br />';
-            $out .= '</div>';
-            $out .= "\n";
-        }
-
-        $this->assertEquals(
-            PMA\libraries\Util::getRadioFields(
-                $name, $choices, $checked_choice, true, false, $class
-            ),
-            $out
-        );
-    }
-
-    /**
-     * Test for getRadioFields
-     *
-     * @return void
-     */
-    function testGetRadioFieldsWithoutBR()
-    {
-        $name = "test_display_radio";
-        $choices = array('value_1'=>'choice_1', 'value&_&lt;2&gt;'=>'choice_2');
-        $checked_choice = "choice_2";
-
-        $out = "";
-        foreach ($choices as $choice_value => $choice_label) {
-            $html_field_id = $name . '_' . $choice_value;
-            $out .= '<input type="radio" name="' . $name . '" id="' . $html_field_id
-                . '" value="' . htmlspecialchars($choice_value) . '"';
-            if ($choice_value == $checked_choice) {
-                $out .= ' checked="checked"';
-            }
-            $out .= ' />' . "\n";
-            $out .= '<label for="' . $html_field_id . '">' . $choice_label
-                . '</label>';
-            $out .= "\n";
-        }
-
-        $this->assertEquals(
-            PMA\libraries\Util::getRadioFields(
-                $name, $choices, $checked_choice, false
-            ),
-            $out
-        );
-    }
-
-    /**
-     * Test for getRadioFields
-     *
-     * @return void
-     */
-    function testGetRadioFieldsEscapeLabelEscapeLabel()
-    {
-        $name = "test_display_radio";
-        $choices = array('value_1'=>'choice_1', 'value_&2'=>'choice&_&lt;2&gt;');
-        $checked_choice = "value_2";
-
-        $out = "";
-        foreach ($choices as $choice_value => $choice_label) {
-            $html_field_id = $name . '_' . $choice_value;
-            $out .= '<input type="radio" name="' . $name . '" id="' . $html_field_id
-                . '" value="' . htmlspecialchars($choice_value) . '"';
-            if ($choice_value == $checked_choice) {
-                $out .= ' checked="checked"';
-            }
-            $out .= ' />' . "\n";
-            $out .= '<label for="' . $html_field_id . '">'
-                . htmlspecialchars($choice_label) . '</label>';
-            $out .= '<br />';
-            $out .= "\n";
-        }
-
-        $this->assertEquals(
-            PMA\libraries\Util::getRadioFields(
-                $name, $choices, $checked_choice, true, true
-            ),
-            $out
-        );
-    }
-
-    /**
-     * Test for getRadioFields
-     *
-     * @return void
-     */
-    function testGetRadioFieldsEscapeLabelNotEscapeLabel()
-    {
-        $name = "test_display_radio";
-        $choices = array('value_1'=>'choice_1', 'value_&2'=>'choice&_&lt;2&gt;');
-        $checked_choice = "value_2";
-
-        $out = "";
-        foreach ($choices as $choice_value => $choice_label) {
-            $html_field_id = $name . '_' . $choice_value;
-            $out .= '<input type="radio" name="' . $name . '" id="' . $html_field_id
-                . '" value="' . htmlspecialchars($choice_value) . '"';
-            if ($choice_value == $checked_choice) {
-                $out .= ' checked="checked"';
-            }
-            $out .= ' />' . "\n";
-            $out .= '<label for="' . $html_field_id . '">' . $choice_label
-                . '</label>';
-            $out .= '<br />';
-            $out .= "\n";
-        }
-
-        $this->assertEquals(
-            PMA\libraries\Util::getRadioFields(
-                $name, $choices, $checked_choice, true, false
-            ),
-            $out
-        );
-    }
-
-    /**
-     * Test for getRadioFields
-     *
-     * @return void
-     */
-    function testGetRadioFieldsEscapeLabelEscapeLabelWithClass()
-    {
-        $name = "test_display_radio";
-        $choices = array('value_1'=>'choice_1', 'value_&2'=>'choice&_&lt;2&gt;');
-        $checked_choice = "value_2";
-        $class = "test_class";
-
-        $out = "";
-        foreach ($choices as $choice_value => $choice_label) {
-            $html_field_id = $name . '_' . $choice_value;
-            $out .= '<div class="' . $class . '">';
-            $out .= '<input type="radio" name="' . $name . '" id="' . $html_field_id
-                . '" value="' . htmlspecialchars($choice_value) . '"';
-            if ($choice_value == $checked_choice) {
-                $out .= ' checked="checked"';
-            }
-            $out .= ' />' . "\n";
-            $out .= '<label for="' . $html_field_id . '">'
-                . htmlspecialchars($choice_label) . '</label>';
-            $out .= '<br />';
-            $out .= '</div>';
-            $out .= "\n";
-        }
-
-        $this->assertEquals(
-            PMA\libraries\Util::getRadioFields(
-                $name, $choices, $checked_choice, true, true, $class
-            ),
-            $out
-        );
-    }
-}
\ No newline at end of file
diff --git a/#pma/test/libraries/common/PMA_getTitleForTarget_test.php b/#pma/test/libraries/common/PMA_getTitleForTarget_test.php
deleted file mode 100644
index 28c81bca..00000000
--- a/#pma/test/libraries/common/PMA_getTitleForTarget_test.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- ** Test for PMA\libraries\Util::getTitleForTarget from common.lib
- *
- * @package PhpMyAdmin-test
- * @group common.lib-tests
- */
-
-/*
- * Include to test.
- */
-
-
-/**
- ** Test for PMA\libraries\Util::getTitleForTarget from common.lib
- *
- * @package PhpMyAdmin-test
- * @group common.lib-tests
- */
-class PMA_GetTitleForTarget_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Data provider for testGetTitleForTarget
-     *
-     * @return array
-     */
-    function dataProvider()
-    {
-        return array(
-            array('tbl_structure.php', __('Structure')),
-            array('tbl_sql.php', __('SQL'),),
-            array('tbl_select.php', __('Search'),),
-            array('tbl_change.php', __('Insert')),
-            array('sql.php', __('Browse')),
-            array('db_structure.php', __('Structure')),
-            array('db_sql.php', __('SQL')),
-            array('db_search.php', __('Search')),
-            array('db_operations.php', __('Operations')),
-        );
-    }
-
-    /**
-     * Test for
-     *
-     * @param string $target Target
-     * @param array  $result Expected value
-     *
-     * @return void
-     *
-     * @dataProvider dataProvider
-     */
-    function testGetTitleForTarget($target, $result)
-    {
-        $this->assertEquals(
-            $result, PMA\libraries\Util::getTitleForTarget($target)
-        );
-    }
-
-}
diff --git a/#pma/test/libraries/common/PMA_localisedDateTimespan_test.php b/#pma/test/libraries/common/PMA_localisedDateTimespan_test.php
deleted file mode 100644
index 28ce68ab..00000000
--- a/#pma/test/libraries/common/PMA_localisedDateTimespan_test.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Test for generating localised date or timespan expression
- *
- * @package PhpMyAdmin-test
- * @group common.lib-tests
- */
-
-/*
- * Include to test.
- */
-
-
-/**
- * Test for generating localised date or timespan expression
- *
- * @package PhpMyAdmin-test
- * @group common.lib-tests
- */
-class PMA_LocalisedDateTimespan_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * temporary variable for globals array
-     */
-    protected $tmpGlobals;
-
-    /**
-     * temporary variable for session array
-     */
-    protected $tmpSession;
-
-    /**
-     * temporary variable for timezone info
-     */
-    protected $tmpTimezone;
-
-    /**
-     * storing globals and session
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        $this->tmpGlobals = $GLOBALS;
-        $this->tmpSession = $_SESSION;
-        $this->tmpTimezone = date_default_timezone_get();
-        date_default_timezone_set('Europe/London');
-    }
-
-    /**
-     * recovering globals and session
-     *
-     * @return void
-     */
-    public function tearDown()
-    {
-        $GLOBALS = $this->tmpGlobals;
-        $_SESSION = $this->tmpSession;
-        date_default_timezone_set($this->tmpTimezone);
-
-    }
-
-    /**
-     * data provider for localised date test
-     *
-     * @return array
-     */
-    public function localisedDateDataProvider()
-    {
-        return array(
-            array(1227455558, '', 'Nov 23, 2008 at 03:52 PM'),
-            array(1227455558, '%Y-%m-%d %H:%M:%S %a', '2008-11-23 15:52:38 Sun')
-        );
-    }
-
-    /**
-     * localised date test, globals are defined
-     *
-     * @param string $a Current timestamp
-     * @param string $b Format
-     * @param string $e Expected output
-     *
-     * @return void
-     *
-     * @dataProvider localisedDateDataProvider
-     */
-    public function testLocalisedDate($a, $b, $e)
-    {
-        $this->assertEquals(
-            $e, PMA\libraries\Util::localisedDate($a, $b)
-        );
-    }
-
-    /**
-     * data provider for localised timestamp test
-     *
-     * @return array
-     */
-    public function timespanFormatDataProvider()
-    {
-        return array(
-            array(1258, '0 days, 0 hours, 20 minutes and 58 seconds'),
-            array(821958, '9 days, 12 hours, 19 minutes and 18 seconds')
-        );
-    }
-
-    /**
-     * localised timestamp test, globals are defined
-     *
-     * @param int    $a Timespan in seconds
-     * @param string $e Expected output
-     *
-     * @return void
-     *
-     * @dataProvider timespanFormatDataProvider
-     */
-    public function testTimespanFormat($a, $e)
-    {
-        $GLOBALS['timespanfmt'] = '%s days, %s hours, %s minutes and %s seconds';
-
-        $this->assertEquals(
-            $e, PMA\libraries\Util::timespanFormat($a)
-        );
-    }
-}
diff --git a/#pma/test/libraries/common/PMA_pow_test.php b/#pma/test/libraries/common/PMA_pow_test.php
deleted file mode 100644
index 2cfe27d4..00000000
--- a/#pma/test/libraries/common/PMA_pow_test.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Tests for PMA\libraries\Util::pow() function from Util.php
- *
- * @package PhpMyAdmin-test
- * @group common.lib-tests
- */
-
-/*
- * Include to test.
- */
-
-
-/**
- * Tests for PMA\libraries\Util::pow() function from Util.php
- *
- * @package PhpMyAdmin-test
- * @group common.lib-tests
- */
-class PMA_Pow_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Test forpow
-     *
-     * @return void
-     */
-    public function testIntOverflow()
-    {
-        $this->assertEquals(
-            '1267650600228229401496703205376',
-            PMA\libraries\Util::pow(2, 100)
-        );
-    }
-
-    /**
-     * Test forpow
-     *
-     * @return void
-     */
-    public function testBcpow()
-    {
-        if (function_exists('bcpow')) {
-            $this->assertEquals(
-                '1267650600228229401496703205376',
-                PMA\libraries\Util::pow(2, 100, 'bcpow')
-            );
-        } else {
-            $this->markTestSkipped('function bcpow() does not exist');
-        }
-    }
-
-    /**
-     * Test forpow
-     *
-     * @return void
-     */
-    public function testGmppow()
-    {
-        if (function_exists('gmp_pow')) {
-            $this->assertEquals(
-                '1267650600228229401496703205376',
-                PMA\libraries\Util::pow(2, 100, 'gmp_pow')
-            );
-        } else {
-            $this->markTestSkipped('function gmp_pow() does not exist');
-        }
-    }
-
-    /**
-     * Test forpow
-     *
-     * @return void
-     */
-    public function testNegativeExp()
-    {
-        $this->assertEquals(
-            0.25,
-            PMA\libraries\Util::pow(2, -2)
-        );
-    }
-
-    /**
-     * Test forpow
-     *
-     * @return void
-     */
-    public function testNegativeExpPow()
-    {
-        if (function_exists('pow')) {
-            $this->assertEquals(
-                0.25,
-                PMA\libraries\Util::pow(2, -2, 'pow')
-            );
-        } else {
-            $this->markTestSkipped('function pow() does not exist');
-        }
-    }
-
-    /**
-     * Test forpow
-     *
-     * @return void
-     */
-    public function testNegativeExpBcpow()
-    {
-        if (function_exists('bcpow')) {
-            $this->assertEquals(
-                false,
-                PMA\libraries\Util::pow(2, -2, 'bcpow')
-            );
-        } else {
-            $this->markTestSkipped('function bcpow() does not exist');
-        }
-    }
-
-    /**
-     * Test forpow
-     *
-     * @return void
-     */
-    public function testNegativeExpGmppow()
-    {
-        if (function_exists('gmp_pow')) {
-            $this->assertEquals(
-                false,
-                PMA\libraries\Util::pow(2, -2, 'gmp_pow')
-            );
-        } else {
-            $this->markTestSkipped('function gmp_pow() does not exist');
-        }
-    }
-}
diff --git a/#pma/test/libraries/common/PMA_printableBitValue_test.php b/#pma/test/libraries/common/PMA_printableBitValue_test.php
deleted file mode 100644
index 01520c77..00000000
--- a/#pma/test/libraries/common/PMA_printableBitValue_test.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Test PMA\libraries\Util::printableBitValue function
- *
- * @package PhpMyAdmin-test
- * @group common.lib-tests
- */
-
-/*
- * Include to test.
- */
-
-
-/**
- * Test PMA\libraries\Util::printableBitValue function
- *
- * @package PhpMyAdmin-test
- * @group common.lib-tests
- */
-class PMA_PrintableBitValueTest extends PHPUnit_Framework_TestCase
-{
-
-    /**
-     * data provider for printable bit value test
-     *
-     * @return array
-     */
-    public function printableBitValueDataProvider()
-    {
-        return array(
-            array(
-                '20131009',
-                64,
-                '0000000000000000000000000000000000000001001100110010110011000001'
-            ),
-            array('5', 32, '00000000000000000000000000000101')
-        );
-    }
-
-    /**
-     * test for generating string contains printable bit value of selected data
-     *
-     * @param integer $a Value
-     * @param int     $b Length
-     * @param string  $e Expected output
-     *
-     * @return void
-     *
-     * @dataProvider printableBitValueDataProvider
-     */
-    public function testPrintableBitValue($a, $b, $e)
-    {
-        $this->assertEquals(
-            $e, PMA\libraries\Util::printableBitValue($a, $b)
-        );
-    }
-}
diff --git a/#pma/test/libraries/common/PMA_quoting_slashing_test.php b/#pma/test/libraries/common/PMA_quoting_slashing_test.php
deleted file mode 100644
index 1cf9e30f..00000000
--- a/#pma/test/libraries/common/PMA_quoting_slashing_test.php
+++ /dev/null
@@ -1,186 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Test for quoting, slashing/backslashing
- *
- * @package PhpMyAdmin-test
- * @group common.lib-tests
- */
-
-/*
- * Include to test.
- */
-
-
-/**
- * Test for quoting, slashing/backslashing
- *
- * @package PhpMyAdmin-test
- * @group common.lib-tests
- */
-class PMA_QuotingSlashing_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * data provider for PMA\libraries\Util::unQuote test
-     *
-     * @return array
-     */
-    public function unQuoteProvider()
-    {
-        return array(
-            array('"test\'"', "test'"),
-            array("'test''", "test'"),
-            array("`test'`", "test'"),
-            array("'test'test", "'test'test")
-        );
-    }
-
-    /**
-     * PMA\libraries\Util::unQuote test
-     *
-     * @param string $param    String
-     * @param string $expected Expected output
-     *
-     * @return void
-     *
-     * @dataProvider unQuoteProvider
-     */
-    public function testUnQuote($param, $expected)
-    {
-        $this->assertEquals(
-            $expected, PMA\libraries\Util::unQuote($param)
-        );
-    }
-
-    /**
-     * data provider for PMA\libraries\Util::unQuote test with chosen quote
-     *
-     * @return array
-     */
-    public function unQuoteSelectedProvider()
-    {
-        return array(
-            array('"test\'"', "test'"),
-            array("'test''", "'test''"),
-            array("`test'`", "`test'`"),
-            array("'test'test", "'test'test")
-        );
-    }
-
-    /**
-     * PMA\libraries\Util::unQuote test with chosen quote
-     *
-     * @param string $param    String
-     * @param string $expected Expected output
-     *
-     * @return void
-     *
-     * @dataProvider unQuoteSelectedProvider
-     */
-    public function testUnQuoteSelectedChar($param, $expected)
-    {
-        $this->assertEquals(
-            $expected, PMA\libraries\Util::unQuote($param, '"')
-        );
-    }
-
-    /**
-     * data provider for backquote test
-     *
-     * @return array
-     */
-    public function backquoteDataProvider()
-    {
-        return array(
-            array('0', '`0`'),
-            array('test', '`test`'),
-            array('te`st', '`te``st`'),
-            array(
-                array('test', 'te`st', '', '*'),
-                array('`test`', '`te``st`', '', '*')
-            )
-        );
-    }
-
-    /**
-     * backquote test with different param $do_it (true, false)
-     *
-     * @param string $a String
-     * @param string $b Expected output
-     *
-     * @return void
-     *
-     * @dataProvider backquoteDataProvider
-     */
-    public function testBackquote($a, $b)
-    {
-        // Test bypass quoting (used by dump functions)
-        $this->assertEquals($a, PMA\libraries\Util::backquote($a, false));
-
-        // Test backquote
-        $this->assertEquals($b, PMA\libraries\Util::backquote($a));
-    }
-
-    /**
-     * data provider for backquoteCompat test
-     *
-     * @return array
-     */
-    public function backquoteCompatDataProvider()
-    {
-        return array(
-            array('0', '"0"'),
-            array('test', '"test"'),
-            array('te`st', '"te`st"'),
-            array(
-                array('test', 'te`st', '', '*'),
-                array('"test"', '"te`st"', '', '*')
-            )
-        );
-    }
-
-    /**
-     * backquoteCompat test with different param $compatibility (NONE, MSSQL)
-     *
-     * @param string $a String
-     * @param string $b Expected output
-     *
-     * @return void
-     *
-     * @dataProvider backquoteCompatDataProvider
-     */
-    public function testbackquoteCompat($a, $b)
-    {
-        // Test bypass quoting (used by dump functions)
-        $this->assertEquals($a, PMA\libraries\Util::backquoteCompat($a, 'NONE', false));
-
-        // Run tests in MSSQL compatibility mode
-        // Test bypass quoting (used by dump functions)
-        $this->assertEquals($a, PMA\libraries\Util::backquoteCompat($a, 'MSSQL', false));
-
-        // Test backquote
-        $this->assertEquals($b, PMA\libraries\Util::backquoteCompat($a, 'MSSQL'));
-    }
-
-    /**
-     * backquoteCompat test with forbidden words
-     *
-     * @return void
-     */
-    public function testBackquoteForbidenWords()
-    {
-        foreach (SqlParser\Context::$KEYWORDS as $keyword => $type) {
-            if ($type & SqlParser\Token::FLAG_KEYWORD_RESERVED) {
-                $this->assertEquals(
-                    "`" . $keyword . "`",
-                    PMA\libraries\Util::backquote($keyword, false)
-                );
-            } else {
-                $this->assertEquals(
-                    $keyword,
-                    PMA\libraries\Util::backquote($keyword, false)
-                );
-            }
-        }
-    }
-}
diff --git a/#pma/test/libraries/common/PMA_showDocu_test.php b/#pma/test/libraries/common/PMA_showDocu_test.php
deleted file mode 100644
index 72e162df..00000000
--- a/#pma/test/libraries/common/PMA_showDocu_test.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- ** Test for PMA\libraries\Util::showDocu from Util.php
- *
- * @package PhpMyAdmin-test
- * @group common.lib-tests
- */
-
-/*
- * Include to test.
- */
-use PMA\libraries\Theme;
-
-
-
-
-/**
- ** Test for PMA\libraries\Util::showDocu from Util.php
- *
- * @package PhpMyAdmin-test
- * @group common.lib-tests
- */
-class PMA_ShowDocu_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Set up
-     *
-     * @return void
-     */
-    function setup()
-    {
-        $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
-        $GLOBALS['server'] = '99';
-        $GLOBALS['cfg']['ServerDefault'] = 1;
-    }
-
-    /**
-     * Test for showDocu
-     *
-     * @return void
-     */
-    function testShowDocu()
-    {
-        $this->assertEquals(
-            '<a href="./url.php?url=https%3A%2F%2Fdocs.phpmyadmin.net%2Fen%2Flatest%2Fpage.html%23anchor" target="documentation"><img src="themes/dot.gif" title="Documentation" alt="Documentation" class="icon ic_b_help" /></a>',
-            PMA\libraries\Util::showDocu('page', 'anchor')
-        );
-
-    }
-}
diff --git a/#pma/test/libraries/common/PMA_showMessage_test_disabled.php b/#pma/test/libraries/common/PMA_showMessage_test_disabled.php
deleted file mode 100644
index 11d1a161..00000000
--- a/#pma/test/libraries/common/PMA_showMessage_test_disabled.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- ** Test for PMA\libraries\Util::getMessage from common.lib
- *
- * @package PhpMyAdmin-test
- * @group common.lib-tests
- */
-
-const PMA_IS_WINDOWS = false;
-
-/*
- * Include to test.
- */
-
-
-require_once 'libraries/js_escape.lib.php';
-
-/**
- ** Test for PMA\libraries\Util::getMessage from common.lib
- *
- * @package PhpMyAdmin-test
- * @group common.lib-tests
- */
-class PMA_ShowMessage_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Set up
-     *
-     * @return void
-     */
-    function setUp()
-    {
-        global $cfg;
-        if (! defined('VERSION_CHECK_DEFAULT')) {
-            define('VERSION_CHECK_DEFAULT', 1);
-        }
-
-        include 'libraries/config.default.php';
-    }
-
-    /**
-     * Test for getMessage
-     *
-     * @return void
-     */
-    function testShowMessageNotAjax()
-    {
-        global $cfg;
-
-        $GLOBALS['is_ajax_request'] = true;
-        $cfg['Server']['DisableIS'] = false;
-        $GLOBALS['table'] = 'tbl';
-        $GLOBALS['db'] = 'db';
-
-        $GLOBALS['sql_query'] = "SELECT * FROM tblPatient ";
-
-        $this->expectOutputString(
-            "<div class=\"result_query\" align=\"\">
-            <div class=\"notice\">msg</div><code class=\"sql\"><span class=\"syntax\"><span class=\"inner_sql\"><a href=\"./url.php?url=http%3A%2F%2Fdev.mysql.com%2Fdoc%2Frefman%2F5.0%2Fen%2Fselect.html&amp;server=server&amp;lang=en&amp;token=647a62ad301bf9025e3b13bc7caa02cb\" target=\"mysql_doc\"><span class=\"syntax_alpha syntax_alpha_reservedWord\">SELECT</span></a>  <span class=\"syntax_punct\">*</span> <br /><span class=\"syntax_alpha syntax_alpha_reservedWord\">FROM</span> <span class=\"syntax_alpha syntax_alpha_identifier\">tblPatient</span></span></span></code><div class=\"tools\"><form action=\"sql.php\" method=\"post\"><input type=\"hidden\" name=\"db\" value=\"db\" /><input type=\"hidden\" name=\"table\" value=\"tbl\" /><input type=\"hidden\" name=\"server\" value=\"server\" /><input type=\"hidden\" name=\"lang\" value=\"en\" /><input type=\"hidden\" name=\"token\" value=\"647a62ad301bf9025e3b13bc7caa02cb\" /><input type=\"hidden\" name=\"sql_query\" value=\"SELECT * FROM tblPatient \" /></form><script type=\"text/javascript\">
-            //<![CDATA[
-            $('.tools form').last().after('[<a href=\"#\" title=\"Inline edit of this query\" class=\"inline_edit_sql\">Inline</a>]');
-            //]]>
-            </script> [
-            <a href=\"tbl_sql.php?db=db&amp;table=tbl&amp;sql_query=SELECT+%2A+FROM+tblPatient+&amp;show_query=1&amp;server=server&amp;lang=en&amp;token=647a62ad301bf9025e3b13bc7caa02cb#querybox\" >Edit</a>
-            ] [
-            <a href=\"import.php?db=db&amp;table=tbl&amp;sql_query=EXPLAIN+SELECT+%2A+FROM+tblPatient+&amp;server=server&amp;lang=en&amp;token=647a62ad301bf9025e3b13bc7caa02cb\" >Explain SQL</a>
-            ] [
-            <a href=\"import.php?db=db&amp;table=tbl&amp;sql_query=SELECT+%2A+FROM+tblPatient+&amp;show_query=1&amp;show_as_php=1&amp;server=server&amp;lang=en&amp;token=647a62ad301bf9025e3b13bc7caa02cb\" >Create PHP code</a>
-            ] [
-            <a href=\"import.php?db=db&amp;table=tbl&amp;sql_query=SELECT+%2A+FROM+tblPatient+&amp;show_query=1&amp;server=server&amp;lang=en&amp;token=647a62ad301bf9025e3b13bc7caa02cb\" >Refresh</a>
-            ]</div></div>"
-        );
-
-        echo PMA\libraries\Util::getMessage("msg");
-
-        //$this->assertEquals("", PMA\libraries\Util::getMessage("msg"));
-        $this->assertTrue(true);
-    }
-}
diff --git a/#pma/test/libraries/common/PMA_showPHPDocu_test.php b/#pma/test/libraries/common/PMA_showPHPDocu_test.php
deleted file mode 100644
index 92bf985b..00000000
--- a/#pma/test/libraries/common/PMA_showPHPDocu_test.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- ** Test for PMA\libraries\Util::showPHPDocu from Util.php
- *
- * @package PhpMyAdmin-test
- * @group common.lib-tests
- */
-
-/*
- * Include to test.
- */
-use PMA\libraries\Theme;
-
-
-
-
-/**
- ** Test for PMA\libraries\Util::showPHPDocu from Util.php
- *
- * @package PhpMyAdmin-test
- * @group common.lib-tests
- */
-class PMA_ShowPHPDocu_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Set up
-     *
-     * @return void
-     */
-    function setup()
-    {
-        $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
-        $GLOBALS['server'] = 99;
-        $GLOBALS['cfg']['ServerDefault'] = 0;
-    }
-
-    /**
-     * Test for showPHPDocu
-     *
-     * @return void
-     */
-    function testShowPHPDocu()
-    {
-        $target = "docu";
-        $lang = _pgettext('PHP documentation language', 'en');
-        $expected = '<a href="./url.php?url=https%3A%2F%2Fphp.net%2Fmanual%2F' . $lang
-            . '%2F' . $target . '" target="documentation">'
-            . '<img src="themes/dot.gif" title="' . __('Documentation') . '" alt="'
-            . __('Documentation') . '" class="icon ic_b_help" /></a>';
-
-        $this->assertEquals(
-            $expected, PMA\libraries\Util::showPHPDocu($target)
-        );
-    }
-}
diff --git a/#pma/test/libraries/common/PMA_stringOperations_test.php b/#pma/test/libraries/common/PMA_stringOperations_test.php
deleted file mode 100644
index da63a106..00000000
--- a/#pma/test/libraries/common/PMA_stringOperations_test.php
+++ /dev/null
@@ -1,171 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Test for several string operations
- *
- * @package PhpMyAdmin-test
- * @group common.lib-tests
- */
-
-/*
- * Include to test.
- */
-
-
-/**
- * Test for several string operations
- *
- * @package PhpMyAdmin-test
- * @group common.lib-tests
- */
-class PMA_StringOperations_Test extends PHPUnit_Framework_TestCase
-{
-
-    /**
-     * temporary variable for globals array
-     */
-    protected $tmpGlobals;
-
-    /**
-     * temporary variable for session array
-     */
-    protected $tmpSession;
-
-    /**
-     * storing globals and session
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        global $GLOBALS, $_SESSION;
-        $this->tmpGlobals = $GLOBALS;
-        $this->tmpSession = $_SESSION;
-
-    }
-
-    /**
-     * data provider for PMA\libraries\Util::flipstring test
-     *
-     * @return array
-     */
-    public function flipStringDataProvider()
-    {
-        return array(
-            array('test', "t<br />\ne<br />\ns<br />\nt"),
-            array(
-                'te&nbsp;;st',
-                "t<br />\ne<br />\n&nbsp;<br />\n;<br />\ns<br />\nt"
-            )
-        );
-    }
-
-    /**
-     * test of changing string from horizontal to vertical orientation
-     *
-     * @param string $a String
-     * @param string $e Expected output
-     *
-     * @return void
-     *
-     * @dataProvider flipStringDataProvider
-     */
-    public function testFlipString($a, $e)
-    {
-        $this->assertEquals($e, PMA\libraries\Util::flipstring($a));
-    }
-
-    /**
-     * data provider for PMA\libraries\Util::userDir test
-     *
-     * @return array
-     */
-    public function userDirDataProvider()
-    {
-        return array(
-            array('/var/pma_tmp/%u/', "/var/pma_tmp/root/"),
-            array('/home/%u/pma', "/home/root/pma/")
-        );
-    }
-
-    /**
-     * test of generating user dir, globals are defined
-     *
-     * @param string $a String
-     * @param string $e Expected output
-     *
-     * @return void
-     *
-     * @dataProvider userDirDataProvider
-     */
-    public function testUserDirString($a, $e)
-    {
-        $GLOBALS['cfg']['Server']['user'] = 'root';
-
-        $this->assertEquals($e, PMA\libraries\Util::userDir($a));
-    }
-
-    /**
-     * data provider for replace binary content test
-     *
-     * @return array
-     */
-    public function replaceBinaryContentsDataProvider()
-    {
-        return array(
-            array("\x000", '\00'),
-            array("\x08\x0a\x0d\x1atest", '\b\n\r\Ztest'),
-            array("\ntest", '\ntest')
-        );
-    }
-
-    /**
-     * replace binary contents test
-     *
-     * @param string $a String
-     * @param string $e Expected output
-     *
-     * @return void
-     *
-     * @dataProvider replaceBinaryContentsDataProvider
-     */
-    public function testReplaceBinaryContents($a, $e)
-    {
-        $this->assertEquals(
-            $e, PMA\libraries\Util::replaceBinaryContents($a)
-        );
-    }
-
-    /**
-     * data provider for duplicate first newline test
-     *
-     * @return array
-     */
-    public function duplicateFirstNewlineDataProvider()
-    {
-        return array(
-            array('test', 'test'),
-            array("\r\ntest", "\n\r\ntest"),
-            array("\ntest", "\ntest"),
-            array("\n\r\ntest", "\n\r\ntest")
-        );
-    }
-
-    /**
-     * duplicate first newline test
-     *
-     * @param string $a String
-     * @param string $e Expected output
-     *
-     * @return void
-     *
-     * @dataProvider duplicateFirstNewlineDataProvider
-     */
-    public function testDuplicateFirstNewline($a, $e)
-    {
-        $this->assertEquals(
-            $e, PMA\libraries\Util::duplicateFirstNewline($a)
-        );
-    }
-
-}
diff --git a/#pma/test/libraries/common/PMA_unsupportedDatatypes_test.php b/#pma/test/libraries/common/PMA_unsupportedDatatypes_test.php
deleted file mode 100644
index af92a041..00000000
--- a/#pma/test/libraries/common/PMA_unsupportedDatatypes_test.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- ** Test for PMA\libraries\Util::unsupportedDatatypes from common.lib
- *
- * @package PhpMyAdmin-test
- * @group common.lib-tests
- */
-
-/*
- * Include to test.
- */
-
-
-/**
- ** Test for PMA\libraries\Util::unsupportedDatatypes from common.lib
- *
- * @package PhpMyAdmin-test
- * @group common.lib-tests
- */
-class PMA_UnsupportedDatatypes_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Test for unsupportedDatatypes
-     *
-     * @return void
-     */
-    function testNotSupportedDataTypes()
-    {
-        $no_support_types = array();
-        $this->assertEquals(
-            $no_support_types, PMA\libraries\Util::unsupportedDatatypes()
-        );
-    }
-}
diff --git a/#pma/test/libraries/common/PMA_whichCrlf_test.php b/#pma/test/libraries/common/PMA_whichCrlf_test.php
deleted file mode 100644
index f7eb768a..00000000
--- a/#pma/test/libraries/common/PMA_whichCrlf_test.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Test PMA\libraries\Util::whichCrlf function
- *
- * @package PhpMyAdmin-test
- * @group common.lib-tests
- */
-
-/*
- * Include to test.
- */
-
-
-/**
- * Test PMA\libraries\Util::whichCrlf function
- *
- * @package PhpMyAdmin-test
- * @group common.lib-tests
- */
-class PMA_WhichCrlf_Test extends PHPUnit_Framework_TestCase
-{
-
-    /**
-     * Test for whichCrlf
-     *
-     * @return void
-     *
-     * @using runkit pecl extension
-     * if not define PMA_USR_OS, then define it as Win
-     * if installed runkit, then constant will not change
-     */
-    public function testWhichCrlf()
-    {
-        if (PMA_HAS_RUNKIT && defined('PMA_USR_OS')) {
-            $pma_usr_os = PMA_USR_OS;
-        }
-
-        if (defined('PMA_USR_OS') && !PMA_HAS_RUNKIT) {
-
-            if (PMA_USR_OS == 'Win') {
-                $this->assertEquals(
-                    "\r\n", PMA\libraries\Util::whichCrlf()
-                );
-            } else {
-                $this->assertEquals(
-                    "\n", PMA\libraries\Util::whichCrlf()
-                );
-            }
-
-            $this->markTestIncomplete('Cannot redefine constant');
-
-        } else {
-
-            if (PMA_HAS_RUNKIT) {
-                if (!defined('PMA_USR_OS')) {
-                    define('PMA_USR_OS', 'Linux');
-                } else {
-                    runkit_constant_redefine('PMA_USR_OS', 'Linux');
-                }
-
-                $this->assertEquals(
-                    "\n", PMA\libraries\Util::whichCrlf()
-                );
-            }
-
-            if (PMA_HAS_RUNKIT) {
-                runkit_constant_redefine('PMA_USR_OS', 'Win');
-            } else {
-                define('PMA_USR_OS', 'Win');
-            }
-            $this->assertEquals(
-                "\r\n", PMA\libraries\Util::whichCrlf()
-            );
-
-        }
-
-        if (PMA_HAS_RUNKIT) {
-            if (isset($pma_usr_os)) {
-                runkit_constant_redefine('PMA_USR_OS', 'Win');
-            } else {
-                runkit_constant_remove('PMA_USR_OS');
-            }
-        }
-    }
-
-}
diff --git a/#pma/test/libraries/config/PMA_messages_inc_test.php b/#pma/test/libraries/config/PMA_messages_inc_test.php
deleted file mode 100644
index 2df85bcf..00000000
--- a/#pma/test/libraries/config/PMA_messages_inc_test.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Tests for libraries/config/messages.inc.php
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-
-/**
- * Tests for libraries/config/messages.inc.php
- *
- * @package PhpMyAdmin-test
- */
-class PMA_MessagesIncTest extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Setup for test cases
-     *
-     * @return void
-     */
-    public function setup()
-    {
-    }
-
-    /**
-     * Tests messages variables
-     *
-     * @return void
-     * @group medium
-     */
-    function testMessages()
-    {
-        $strConfigAllowArbitraryServer_name = '';
-        $strConfigAllowThirdPartyFraming_name = '';
-        $strConfigblowfish_secret_name = '';
-        $strConfigExport_htmlword_structure_or_data_name = '';
-        $strConfigForm_TableStructure = '';
-        $strConfigSQLQuery_Explain_name = '';
-        $strConfigSendErrorReports_name = '';
-
-        include 'libraries/config/messages.inc.php';
-
-        $this->assertEquals(
-            'Allow login to any MySQL server',
-            $strConfigAllowArbitraryServer_name
-        );
-        $this->assertEquals(
-            'Allow third party framing',
-            $strConfigAllowThirdPartyFraming_name
-        );
-        $this->assertEquals(
-            'Blowfish secret',
-            $strConfigblowfish_secret_name
-        );
-        $this->assertEquals(
-            'Dump table',
-            $strConfigExport_htmlword_structure_or_data_name
-        );
-        $this->assertEquals(
-            'Table structure',
-            $strConfigForm_TableStructure
-        );
-        $this->assertEquals(
-            'Explain SQL',
-            $strConfigSQLQuery_Explain_name
-        );
-        $this->assertEquals(
-            'Send error reports',
-            $strConfigSendErrorReports_name
-        );
-    }
-}
diff --git a/#pma/test/libraries/core/PMA_array_test.php b/#pma/test/libraries/core/PMA_array_test.php
deleted file mode 100644
index 654a3e15..00000000
--- a/#pma/test/libraries/core/PMA_array_test.php
+++ /dev/null
@@ -1,223 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Test for PMA_arrayRead(), PMA_arrayWrite(), PMA_arrayRemove()
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-
-/**
- * Test for PMA_arrayRead(), PMA_arrayWrite(), PMA_arrayRemove()
- *
- * @package PhpMyAdmin-test
- */
-class PMA_Array_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Test for PMA_arrayRead
-     *
-     * @return void
-     */
-    function testRead()
-    {
-        $arr = array(
-            "int" => 1,
-            "str" => "str_val",
-            "arr" => array('val1', 'val2', 'val3'),
-            "sarr" => array(
-                'arr1' => array(1, 2, 3),
-                array(3, array('a', 'b', 'c'), 4)
-            )
-        );
-
-        $this->assertEquals(
-            PMA_arrayRead('int', $arr),
-            $arr['int']
-        );
-
-        $this->assertEquals(
-            PMA_arrayRead('str', $arr),
-            $arr['str']
-        );
-
-        $this->assertEquals(
-            PMA_arrayRead('arr/0', $arr),
-            $arr['arr'][0]
-        );
-
-        $this->assertEquals(
-            PMA_arrayRead('arr/1', $arr),
-            $arr['arr'][1]
-        );
-
-        $this->assertEquals(
-            PMA_arrayRead('arr/2', $arr),
-            $arr['arr'][2]
-        );
-
-        $this->assertEquals(
-            PMA_arrayRead('sarr/arr1/0', $arr),
-            $arr['sarr']['arr1'][0]
-        );
-
-        $this->assertEquals(
-            PMA_arrayRead('sarr/arr1/1', $arr),
-            $arr['sarr']['arr1'][1]
-        );
-
-        $this->assertEquals(
-            PMA_arrayRead('sarr/arr1/2', $arr),
-            $arr['sarr']['arr1'][2]
-        );
-
-        $this->assertEquals(
-            PMA_arrayRead('sarr/0/0', $arr),
-            $arr['sarr'][0][0]
-        );
-
-        $this->assertEquals(
-            PMA_arrayRead('sarr/0/1', $arr),
-            $arr['sarr'][0][1]
-        );
-
-        $this->assertEquals(
-            PMA_arrayRead('sarr/0/1/2', $arr),
-            $arr['sarr'][0][1][2]
-        );
-
-        $this->assertEquals(
-            PMA_arrayRead('sarr/not_exiting/1', $arr),
-            null
-        );
-
-        $this->assertEquals(
-            PMA_arrayRead('sarr/not_exiting/1', $arr, 0),
-            0
-        );
-
-        $this->assertEquals(
-            PMA_arrayRead('sarr/not_exiting/1', $arr, 'default_val'),
-            'default_val'
-        );
-    }
-
-    /**
-     * Test for PMA_arrayWrite
-     *
-     * @return void
-     */
-    function testWrite()
-    {
-        $arr = array(
-            "int" => 1,
-            "str" => "str_val",
-            "arr" => array('val1', 'val2', 'val3'),
-            "sarr" => array(
-                'arr1' => array(1, 2, 3),
-                array(3, array('a', 'b', 'c'), 4)
-            )
-        );
-
-        PMA_arrayWrite('int', $arr, 5);
-        $this->assertEquals($arr['int'], 5);
-
-        PMA_arrayWrite('str', $arr, '_str');
-        $this->assertEquals($arr['str'], '_str');
-
-        PMA_arrayWrite('arr/0', $arr, 'val_arr_0');
-        $this->assertEquals($arr['arr'][0], 'val_arr_0');
-
-        PMA_arrayWrite('arr/1', $arr, 'val_arr_1');
-        $this->assertEquals($arr['arr'][1], 'val_arr_1');
-
-        PMA_arrayWrite('arr/2', $arr, 'val_arr_2');
-        $this->assertEquals($arr['arr'][2], 'val_arr_2');
-
-        PMA_arrayWrite('sarr/arr1/0', $arr, 'val_sarr_arr_0');
-        $this->assertEquals($arr['sarr']['arr1'][0], 'val_sarr_arr_0');
-
-        PMA_arrayWrite('sarr/arr1/1', $arr, 'val_sarr_arr_1');
-        $this->assertEquals($arr['sarr']['arr1'][1], 'val_sarr_arr_1');
-
-        PMA_arrayWrite('sarr/arr1/2', $arr, 'val_sarr_arr_2');
-        $this->assertEquals($arr['sarr']['arr1'][2], 'val_sarr_arr_2');
-
-        PMA_arrayWrite('sarr/0/0', $arr, 5);
-        $this->assertEquals($arr['sarr'][0][0], 5);
-
-        PMA_arrayWrite('sarr/0/1/0', $arr, 'e');
-        $this->assertEquals($arr['sarr'][0][1][0], 'e');
-
-        PMA_arrayWrite('sarr/not_existing/1', $arr, 'some_val');
-        $this->assertEquals($arr['sarr']['not_existing'][1], 'some_val');
-
-        PMA_arrayWrite('sarr/0/2', $arr, null);
-        $this->assertNull($arr['sarr'][0][2]);
-    }
-
-    /**
-     * Test for PMA_arrayRemove
-     *
-     * @return void
-     */
-    function testRemove()
-    {
-        $arr = array(
-            "int" => 1,
-            "str" => "str_val",
-            "arr" => array('val1', 'val2', 'val3'),
-            "sarr" => array(
-                'arr1' => array(1, 2, 3),
-                array(3, array('a', 'b', 'c'), 4)
-            )
-        );
-
-        PMA_arrayRemove('int', $arr);
-        $this->assertArrayNotHasKey('int', $arr);
-
-        PMA_arrayRemove('str', $arr);
-        $this->assertArrayNotHasKey('str', $arr);
-
-        PMA_arrayRemove('arr/0', $arr);
-        $this->assertArrayNotHasKey(0, $arr['arr']);
-
-        PMA_arrayRemove('arr/1', $arr);
-        $this->assertArrayNotHasKey(1, $arr['arr']);
-
-        PMA_arrayRemove('arr/2', $arr);
-        $this->assertArrayNotHasKey('arr', $arr);
-
-        $tmp_arr = $arr;
-        PMA_arrayRemove('sarr/not_existing/1', $arr);
-        $this->assertEquals($tmp_arr, $arr);
-
-        PMA_arrayRemove('sarr/arr1/0', $arr);
-        $this->assertArrayNotHasKey(0, $arr['sarr']['arr1']);
-
-        PMA_arrayRemove('sarr/arr1/1', $arr);
-        $this->assertArrayNotHasKey(1, $arr['sarr']['arr1']);
-
-        PMA_arrayRemove('sarr/arr1/2', $arr);
-        $this->assertArrayNotHasKey('arr1', $arr['sarr']);
-
-        PMA_arrayRemove('sarr/0/0', $arr);
-        $this->assertArrayNotHasKey(0, $arr['sarr'][0]);
-
-        PMA_arrayRemove('sarr/0/1/0', $arr);
-        $this->assertArrayNotHasKey(0, $arr['sarr'][0][1]);
-
-        PMA_arrayRemove('sarr/0/1/1', $arr);
-        $this->assertArrayNotHasKey(1, $arr['sarr'][0][1]);
-
-        PMA_arrayRemove('sarr/0/1/2', $arr);
-        $this->assertArrayNotHasKey(1, $arr['sarr'][0]);
-
-        PMA_arrayRemove('sarr/0/2', $arr);
-
-        $this->assertEmpty($arr);
-    }
-}
diff --git a/#pma/test/libraries/core/PMA_checkPageValidity_test.php b/#pma/test/libraries/core/PMA_checkPageValidity_test.php
deleted file mode 100644
index 8d4a090f..00000000
--- a/#pma/test/libraries/core/PMA_checkPageValidity_test.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-
-/**
- *
- * @package PhpMyAdmin-test
- */
-class PMA_CheckPageValidity_Test extends PHPUnit_Framework_TestCase
-{
-    protected $goto_whitelist = array(
-        'db_datadict.php',
-        'db_sql.php',
-        'db_export.php',
-        'db_search.php',
-        'export.php',
-        'import.php',
-        'index.php',
-        'pdf_pages.php',
-        'pdf_schema.php',
-        'server_binlog.php',
-        'server_variables.php',
-        'sql.php',
-        'tbl_select.php',
-        'transformation_overview.php',
-        'transformation_wrapper.php',
-        'user_password.php',
-    );
-
-    /**
-     * Test for PMA_checkPageValidity
-     *
-     * @param string     $page      Page
-     * @param array|null $whiteList White list
-     * @param int        $expected  Expected value
-     *
-     * @return void
-     *
-     * @dataProvider provider
-     */
-    function testGotoNowhere($page, $whiteList, $expected)
-    {
-        $this->assertTrue($expected === PMA_checkPageValidity($page, $whiteList));
-    }
-
-    /**
-     * Data provider for testGotoNowhere
-     *
-     * @return array
-     */
-    public function provider()
-    {
-        return array(
-            array(null, null, false),
-            array('export.php', $this->goto_whitelist, true),
-            array('shell.php', $this->goto_whitelist, false),
-            array('index.php?sql.php&test=true', $this->goto_whitelist, true),
-            array('index.php%3Fsql.php%26test%3Dtrue', $this->goto_whitelist, true),
-        );
-    }
-}
diff --git a/#pma/test/libraries/core/PMA_cleanupPathInfo_test.php b/#pma/test/libraries/core/PMA_cleanupPathInfo_test.php
deleted file mode 100644
index 7ca9f3f9..00000000
--- a/#pma/test/libraries/core/PMA_cleanupPathInfo_test.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- *
- * PMA_fatalError() displays the given error message on phpMyAdmin error page in
- * foreign language
- * and ends script execution and closes session
- *
- * @package PhpMyAdmin-test
- */
-
-
-
-
-/**
- *
- * PMA_fatalError() displays the given error message on phpMyAdmin error page in
- * foreign language
- * and ends script execution and closes session
- *
- * @package PhpMyAdmin-test
- */
-class PMA_CleanupPathInfo_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Test for PMA_cleanupPathInfo
-     *
-     * @param string $php_self  The PHP_SELF value
-     * @param string $request   The REQUEST_URI value
-     * @param string $path_info The PATH_INFO value
-     * @param string $expected  Expected result
-     *
-     * @return void
-     *
-     * @dataProvider pathsProvider
-     */
-    public function testPahtInfo($php_self, $request, $path_info, $expected)
-    {
-        $_SERVER['PHP_SELF'] = $php_self;
-        $_SERVER['REQUEST_URI'] = $request;
-        $_SERVER['PATH_INFO'] = $path_info;
-        PMA_cleanupPathInfo();
-        $this->assertEquals(
-            $expected,
-            $GLOBALS['PMA_PHP_SELF']
-        );
-    }
-
-    /**
-     * Data provider for PMA_cleanupPathInfo tests
-     *
-     * @return array
-     */
-    public function pathsProvider()
-    {
-        return array(
-            array(
-                '/phpmyadmin/index.php/; cookieinj=value/',
-                '/phpmyadmin/index.php/;%20cookieinj=value///',
-                '/; cookieinj=value/',
-                '/phpmyadmin/index.php'
-            ),
-            array(
-                '',
-                '/phpmyadmin/index.php/;%20cookieinj=value///',
-                '/; cookieinj=value/',
-                '/phpmyadmin/index.php'
-            ),
-            array(
-                '/phpmyadmin/index.php',
-                '/phpmyadmin/index.php',
-                '',
-                '/phpmyadmin/index.php'
-            ),
-            array(
-                '',
-                '/phpmyadmin/index.php',
-                '',
-                '/phpmyadmin/index.php'
-            ),
-        );
-    }
-}
-
diff --git a/#pma/test/libraries/core/PMA_fatalError_test.php b/#pma/test/libraries/core/PMA_fatalError_test.php
deleted file mode 100644
index ae8a4d67..00000000
--- a/#pma/test/libraries/core/PMA_fatalError_test.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- *
- * PMA_fatalError() displays the given error message on phpMyAdmin error page in
- * foreign language
- * and ends script execution and closes session
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-use PMA\libraries\Theme;
-
-
-require_once 'libraries/js_escape.lib.php';
-require_once 'libraries/sanitizing.lib.php';
-
-require_once 'libraries/url_generating.lib.php';
-
-
-
-/**
- *
- * PMA_fatalError() displays the given error message on phpMyAdmin error page in
- * foreign language
- * and ends script execution and closes session
- *
- * @package PhpMyAdmin-test
- */
-class PMA_FatalError_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Set up
-     *
-     * @return void
-     */
-    public function setup()
-    {
-        $GLOBALS['PMA_Config'] = new PMA\libraries\Config();
-        $GLOBALS['PMA_Config']->enableBc();
-        $GLOBALS['cfg']['Server'] = array(
-            'host' => 'host',
-            'verbose' => 'verbose',
-        );
-        $GLOBALS['cfg']['OBGzip'] = false;
-        $_SESSION['PMA_Theme'] = new Theme();
-        $GLOBALS['pmaThemeImage'] = 'theme/';
-        $GLOBALS['pmaThemePath'] = $_SESSION['PMA_Theme']->getPath();
-        $GLOBALS['server'] = 1;
-        $GLOBALS['db'] = '';
-        $GLOBALS['table'] = '';
-    }
-
-    /**
-     * Test for PMA_fatalError
-     *
-     * @return void
-     */
-    public function testFatalErrorMessage()
-    {
-        $this->expectOutputRegex("/FatalError!/");
-        PMA_fatalError("FatalError!");
-    }
-
-    /**
-     * Test for PMA_fatalError
-     *
-     * @return void
-     */
-    public function testFatalErrorMessageWithArgs()
-    {
-        $message = "Fatal error #%d in file %s.";
-        $params = array(1, 'error_file.php');
-
-        $this->expectOutputRegex("/Fatal error #1 in file error_file.php./");
-        PMA_fatalError($message, $params);
-
-        $message = "Fatal error in file %s.";
-        $params = 'error_file.php';
-
-        $this->expectOutputRegex("/Fatal error in file error_file.php./");
-        PMA_fatalError($message, $params);
-    }
-
-}
diff --git a/#pma/test/libraries/core/PMA_getLinks_test.php b/#pma/test/libraries/core/PMA_getLinks_test.php
deleted file mode 100644
index 87e6184f..00000000
--- a/#pma/test/libraries/core/PMA_getLinks_test.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-require_once 'libraries/url_generating.lib.php';
-
-/**
- *
- * @package PhpMyAdmin-test
- */
-class PMA_GetLinks_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Set up
-     *
-     * @return void
-     */
-    function setUp()
-    {
-        $GLOBALS['server'] = 99;
-        $GLOBALS['cfg']['ServerDefault'] = 0;
-    }
-
-    /**
-     * Test for PMA_getPHPDocLink
-     *
-     * @return void
-     */
-    public function testGetPHPDocLink()
-    {
-        $lang = _pgettext('PHP documentation language', 'en');
-        $this->assertEquals(
-            PMA_getPHPDocLink('function'),
-            './url.php?url=https%3A%2F%2Fphp.net%2Fmanual%2F'
-            . $lang . '%2Ffunction'
-        );
-    }
-
-    /**
-     * Data provider for testLinkURL
-     *
-     * @return array
-     */
-    public function providerLinkURL()
-    {
-        return array(
-            array('https://wiki.phpmyadmin.net',
-             './url.php?url=https%3A%2F%2Fwiki.phpmyadmin.net'),
-            array('https://wiki.phpmyadmin.net',
-             './url.php?url=https%3A%2F%2Fwiki.phpmyadmin.net'),
-            array('wiki.phpmyadmin.net', 'wiki.phpmyadmin.net'),
-            array('index.php?db=phpmyadmin', 'index.php?db=phpmyadmin')
-        );
-    }
-
-    /**
-     * Test for PMA_linkURL
-     *
-     * @param string $link URL where to go
-     * @param string $url  Expected value
-     *
-     * @return void
-     *
-     * @dataProvider providerLinkURL
-     */
-    public function testLinkURL($link, $url)
-    {
-        $this->assertEquals(PMA_linkURL($link), $url);
-    }
-}
diff --git a/#pma/test/libraries/core/PMA_getTableCount_test_dis.php b/#pma/test/libraries/core/PMA_getTableCount_test_dis.php
deleted file mode 100644
index a646c55f..00000000
--- a/#pma/test/libraries/core/PMA_getTableCount_test_dis.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * PMA_getTableCount_test returns count of tables in given db
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-
-use PMA\libraries\Theme;
-
-require_once 'libraries/js_escape.lib.php';
-require_once 'libraries/select_lang.inc.php';
-require_once 'libraries/sanitizing.lib.php';
-require_once 'libraries/config.default.php';
-
-
-require_once 'libraries/url_generating.lib.php';
-
-
-require_once 'libraries/database_interface.inc.php';
-
-require_once 'config.sample.inc.php';
-
-/**
- * PMA_getTableCount_test returns count of tables in given db
- *
- * @package PhpMyAdmin-test
- */
-class PMA_GetTableCount_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Set up
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        $GLOBALS['PMA_Config'] = new PMA\libraries\Config();
-        $GLOBALS['PMA_Config']->enableBc();
-        $GLOBALS['cfg']['OBGzip'] = false;
-        $_SESSION['PMA_Theme'] = new Theme();
-        $GLOBALS['pmaThemeImage'] = 'theme/';
-        $GLOBALS['pmaThemePath'] = $_SESSION['PMA_Theme']->getPath();
-        $GLOBALS['server'] = 1;
-        $GLOBALS['db'] = '';
-        $GLOBALS['table'] = '';
-    }
-
-    /**
-     * Test for PMA_getTableCount
-     *
-     * @return void
-     */
-    function testTableCount()
-    {
-        $GLOBALS['cfg']['Server']['host'] = 'localhost';
-        $GLOBALS['cfg']['Server']['user'] = 'root';
-
-        $this->assertEquals(5, PMA_getTableCount('meddb'));
-    }
-}
diff --git a/#pma/test/libraries/core/PMA_get_real_size_test.php b/#pma/test/libraries/core/PMA_get_real_size_test.php
deleted file mode 100644
index 78c2a103..00000000
--- a/#pma/test/libraries/core/PMA_get_real_size_test.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-
-/**
- *
- * @package PhpMyAdmin-test
- */
-class PMA_GetRealSize_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Test for
-     *
-     * @param string $size     Size
-     * @param int    $expected Expected value
-     *
-     * @return void
-     *
-     * @dataProvider provider
-     */
-    public function testNull($size, $expected)
-    {
-        $this->assertEquals($expected, PMA_getRealSize($size));
-    }
-
-    /**
-     * Data provider for testExtractValueFromFormattedSize
-     *
-     * @return array
-     */
-    public function provider()
-    {
-        return array(
-            array('0', 0),
-            array('1kb', 1024),
-            array('1024k', 1024 * 1024),
-            array('8m', 8 * 1024 * 1024),
-            array('12gb', 12 * 1024 * 1024 * 1024),
-            array('1024', 1024),
-        );
-    }
-
-}
diff --git a/#pma/test/libraries/core/PMA_headerLocation_test.php b/#pma/test/libraries/core/PMA_headerLocation_test.php
deleted file mode 100644
index 94f5fb53..00000000
--- a/#pma/test/libraries/core/PMA_headerLocation_test.php
+++ /dev/null
@@ -1,224 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Test for PMA_sendHeaderLocation
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-use PMA\libraries\Theme;
-
-
-require_once 'libraries/js_escape.lib.php';
-require_once 'libraries/sanitizing.lib.php';
-
-require_once 'libraries/url_generating.lib.php';
-
-
-
-
-/**
- * Test function sending headers.
- * Warning - these tests set constants, so it can interfere with other tests
- * If you have runkit extension, then it is possible to back changes made on
- * constants rest of options can be tested only with apd, when functions header
- * and headers_sent are redefined rename_function() of header and headers_sent
- * may cause CLI error report in Windows XP (but tests are done correctly)
- * additional functions which were created during tests must be stored to
- * coverage test e.g.
- *
- * <code>
- * rename_function(
- *     'headers_sent',
- *     'headers_sent'.str_replace(array('.', ' '),array('', ''),microtime())
- * );
- * </code>
- *
- * @package PhpMyAdmin-test
- */
-
-class PMA_HeaderLocation_Test extends PHPUnit_Framework_TestCase
-{
-
-    protected $oldIISvalue;
-    protected $runkitExt;
-    protected $apdExt;
-
-    /**
-     * Set up
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        //session_start();
-
-        // cleaning constants
-        if (PMA_HAS_RUNKIT) {
-
-            $this->oldIISvalue = 'non-defined';
-
-            $defined_constants = get_defined_constants(true);
-            $user_defined_constants = $defined_constants['user'];
-            if (array_key_exists('PMA_IS_IIS', $user_defined_constants)) {
-                $this->oldIISvalue = PMA_IS_IIS;
-                runkit_constant_redefine('PMA_IS_IIS', null);
-            } else {
-                runkit_constant_add('PMA_IS_IIS', null);
-            }
-        }
-        $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme');
-        $GLOBALS['server'] = 0;
-        $GLOBALS['PMA_Config'] = new PMA\libraries\Config();
-        $GLOBALS['PMA_Config']->enableBc();
-    }
-
-    /**
-     * Tear down
-     *
-     * @return void
-     */
-    public function tearDown()
-    {
-        //session_destroy();
-
-        // cleaning constants
-        if (PMA_HAS_RUNKIT) {
-
-            if ($this->oldIISvalue != 'non-defined') {
-                runkit_constant_redefine('PMA_IS_IIS', $this->oldIISvalue);
-            } elseif (defined('PMA_IS_IIS')) {
-                runkit_constant_remove('PMA_IS_IIS');
-            }
-        }
-    }
-
-    /**
-     * Test for PMA_sendHeaderLocation
-     *
-     * @return void
-     */
-    public function testSendHeaderLocationWithoutSidWithIis()
-    {
-        if (defined('PMA_TEST_HEADERS')) {
-
-            runkit_constant_redefine('PMA_IS_IIS', true);
-
-            $testUri = 'https://example.com/test.php';
-
-            $header = array('Location: ' . $testUri);
-            PMA_sendHeaderLocation($testUri); // sets $GLOBALS['header']
-            $this->assertEquals($header, $GLOBALS['header']);
-
-            //reset $GLOBALS['header'] for the next assertion
-            unset($GLOBALS['header']);
-
-            $header = array('Refresh: 0; ' . $testUri);
-            PMA_sendHeaderLocation($testUri, true); // sets $GLOBALS['header']
-            $this->assertEquals($header, $GLOBALS['header']);
-
-        } else {
-            $this->markTestSkipped(
-                'Cannot redefine constant/function - missing runkit extension'
-            );
-        }
-
-    }
-
-    /**
-     * Test for PMA_sendHeaderLocation
-     *
-     * @return void
-     */
-    public function testSendHeaderLocationWithoutSidWithoutIis()
-    {
-        if (defined('PMA_TEST_HEADERS')) {
-
-            $testUri = 'https://example.com/test.php';
-            $header = array('Location: ' . $testUri);
-
-            PMA_sendHeaderLocation($testUri);            // sets $GLOBALS['header']
-            $this->assertEquals($header, $GLOBALS['header']);
-
-        } else {
-            $this->markTestSkipped(
-                'Cannot redefine constant/function - missing runkit extension'
-            );
-        }
-
-    }
-
-    /**
-     * Test for PMA_sendHeaderLocation
-     *
-     * @return void
-     */
-    public function testSendHeaderLocationIisLongUri()
-    {
-        if (defined('PMA_IS_IIS') && PMA_HAS_RUNKIT) {
-            runkit_constant_redefine('PMA_IS_IIS', true);
-        } elseif (!defined('PMA_IS_IIS')) {
-            define('PMA_IS_IIS', true);
-        } elseif (! PMA_IS_IIS) {
-            $this->markTestSkipped(
-                'Cannot redefine constant/function - missing runkit extension'
-            );
-        }
-
-        // over 600 chars
-        $testUri = 'https://example.com/test.php?testlonguri=over600chars&test=test'
-            . '&test=test&test=test&test=test&test=test&test=test&test=test'
-            . '&test=test&test=test&test=test&test=test&test=test&test=test'
-            . '&test=test&test=test&test=test&test=test&test=test&test=test'
-            . '&test=test&test=test&test=test&test=test&test=test&test=test'
-            . '&test=test&test=test&test=test&test=test&test=test&test=test'
-            . '&test=test&test=test&test=test&test=test&test=test&test=test'
-            . '&test=test&test=test&test=test&test=test&test=test&test=test'
-            . '&test=test&test=test&test=test&test=test&test=test&test=test'
-            . '&test=test&test=test&test=test&test=test&test=test&test=test'
-            . '&test=test&test=test';
-        $testUri_html = htmlspecialchars($testUri);
-        $testUri_js = PMA_escapeJsString($testUri);
-
-        $header = "<html>\n<head>\n    <title>- - -</title>
-    <meta http-equiv=\"expires\" content=\"0\">"
-            . "\n    <meta http-equiv=\"Pragma\" content=\"no-cache\">"
-            . "\n    <meta http-equiv=\"Cache-Control\" content=\"no-cache\">"
-            . "\n    <meta http-equiv=\"Refresh\" content=\"0;url=" . $testUri_html . "\">"
-            . "\n    <script type=\"text/javascript\">\n        //<![CDATA[
-        setTimeout(\"window.location = decodeURI('" . $testUri_js . "')\", 2000);
-        //]]>\n    </script>\n</head>
-<body>\n<script type=\"text/javascript\">\n    //<![CDATA[
-    document.write('<p><a href=\"" . $testUri_html . "\">" . __('Go') . "</a></p>');
-    //]]>\n</script>\n</body>\n</html>
-";
-
-        $this->expectOutputString($header);
-
-        $restoreInstance = PMA\libraries\Response::getInstance();
-
-        $mockResponse = $this->getMockBuilder('PMA\libraries\Response')
-            ->disableOriginalConstructor()
-            ->setMethods(array('disable', 'header', 'headersSent'))
-            ->getMock();
-
-        $mockResponse->expects($this->once())
-            ->method('disable');
-
-        $mockResponse->expects($this->any())
-            ->method('headersSent')
-            ->with()
-            ->will($this->returnValue(false));
-
-        $attrInstance = new ReflectionProperty('PMA\libraries\Response', '_instance');
-        $attrInstance->setAccessible(true);
-        $attrInstance->setValue($mockResponse);
-
-        PMA_sendHeaderLocation($testUri);
-
-        $attrInstance->setValue($restoreInstance);
-    }
-}
diff --git a/#pma/test/libraries/core/PMA_ifSetOr_test.php b/#pma/test/libraries/core/PMA_ifSetOr_test.php
deleted file mode 100644
index 62cff936..00000000
--- a/#pma/test/libraries/core/PMA_ifSetOr_test.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-
-/**
- *
- * @package PhpMyAdmin-test
- */
-class PMA_IfSetOr_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Test for PMA_ifSetOr
-     *
-     * @return void
-     */
-    public function testVarSet()
-    {
-        $default = 'foo';
-        $in = 'bar';
-        $out = PMA_ifSetOr($in, $default);
-        $this->assertEquals($in, $out);
-    }
-
-    /**
-     * Test for PMA_ifSetOr
-     *
-     * @return void
-     */
-    public function testVarSetWrongType()
-    {
-        $default = 'foo';
-        $in = 'bar';
-        $out = PMA_ifSetOr($in, $default, 'boolean');
-        $this->assertEquals($out, $default);
-    }
-
-    /**
-     * Test for PMA_ifSetOr
-     *
-     * @return void
-     */
-    public function testVarNotSet()
-    {
-        $default = 'foo';
-        // $in is not set!
-        $out = PMA_ifSetOr($in, $default);
-        $this->assertEquals($out, $default);
-    }
-
-    /**
-     * Test for PMA_ifSetOr
-     *
-     * @return void
-     */
-    public function testVarNotSetNoDefault()
-    {
-        // $in is not set!
-        $out = PMA_ifSetOr($in);
-        $this->assertEquals($out, null);
-    }
-
-}
diff --git a/#pma/test/libraries/core/PMA_isAllowedDomain_test.php b/#pma/test/libraries/core/PMA_isAllowedDomain_test.php
deleted file mode 100644
index 9f544c0d..00000000
--- a/#pma/test/libraries/core/PMA_isAllowedDomain_test.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Test for PMA_isAllowedDomain
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-require_once 'libraries/core.lib.php';
-
-class PMA_isAllowedDomain_test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Test for unserializing
-     *
-     * @param string $url      URL to test
-     * @param mixed  $expected Expected result
-     *
-     * @return void
-     *
-     * @dataProvider provideURLs
-     */
-    function testIsAllowedDomain($url, $expected)
-    {
-        $_SERVER['SERVER_NAME'] = 'server.local';
-        $this->assertEquals(
-            $expected,
-            PMA_isAllowedDomain($url)
-        );
-    }
-
-    /**
-     * Test data provider
-     *
-     * @return array
-     */
-    function provideURLs()
-    {
-        return array(
-            array('https://www.phpmyadmin.net/', true),
-            array('http://duckduckgo.com\\@github.com', false),
-            array('https://github.com/', true),
-            array('https://github.com:123/', false),
-            array('https://user:pass@github.com:123/', false),
-            array('https://user:pass@github.com/', false),
-            array('https://server.local/', true),
-            array('./relative/', false),
-        );
-    }
-
-}
-
-
diff --git a/#pma/test/libraries/core/PMA_isValid_test.php b/#pma/test/libraries/core/PMA_isValid_test.php
deleted file mode 100644
index 297391cd..00000000
--- a/#pma/test/libraries/core/PMA_isValid_test.php
+++ /dev/null
@@ -1,343 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-
-/**
- *
- * @package PhpMyAdmin-test
- */
-class PMA_IsValid_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Data provider for testNoVarType
-     *
-     * @return array
-     */
-    public static function providerNoVarTypeProvider()
-    {
-        return array(
-            array(0, false, 0),
-            array(0, false, 1),
-            array(1, false, null),
-            array(1.1, false, null),
-            array('', false, null),
-            array(' ', false, null),
-            array('0', false, null),
-            array('string', false, null),
-            array(array(), false, null),
-            array(array(1, 2, 3), false, null),
-            array(true, false, null),
-            array(false, false, null));
-    }
-
-    /**
-     * Test for PMA_isValid
-     *
-     * @param mixed $var     Variable to check
-     * @param mixed $type    Type
-     * @param mixed $compare Compared value
-     *
-     * @return void
-     *
-     * @dataProvider providerNoVarTypeProvider
-     */
-    public function testNoVarType($var, $type, $compare)
-    {
-        $this->assertTrue(PMA_isValid($var, $type, $compare));
-    }
-
-    /**
-     * Test for PMA_isValid
-     *
-     * @return void
-     */
-    public function testVarNotSetAfterTest()
-    {
-        PMA_isValid($var);
-        $this->assertFalse(isset($var));
-    }
-
-    /**
-     * Test for PMA_isValid
-     *
-     * @return void
-     */
-    public function testNotSet()
-    {
-        $this->assertFalse(PMA_isValid($var));
-    }
-
-    /**
-     * Test for PMA_isValid
-     *
-     * @return void
-     */
-    public function testEmptyString()
-    {
-        $var = '';
-        $this->assertFalse(PMA_isValid($var));
-    }
-
-    /**
-     * Test for PMA_isValid
-     *
-     * @return void
-     */
-    public function testNotEmptyString()
-    {
-        $var = '0';
-        $this->assertTrue(PMA_isValid($var));
-    }
-
-    /**
-     * Test for PMA_isValid
-     *
-     * @return void
-     */
-    public function testZero()
-    {
-        $var = 0;
-        $this->assertTrue(PMA_isValid($var));
-        $this->assertTrue(PMA_isValid($var, 'int'));
-    }
-
-    /**
-     * Test for PMA_isValid
-     *
-     * @return void
-     */
-    public function testNullFail()
-    {
-        $var = null;
-        $this->assertFalse(PMA_isValid($var));
-
-        $var = 'null_text';
-        $this->assertFalse(PMA_isValid($var, 'null'));
-    }
-
-    /**
-     * Test for PMA_isValid
-     *
-     * @return void
-     */
-    public function testNotSetArray()
-    {
-        /** @var $array undefined array */
-        $this->assertFalse(PMA_isValid($array['x']));
-    }
-
-    /**
-     * Test for PMA_isValid
-     *
-     * @return void
-     */
-    public function testScalarString()
-    {
-        $var = 'string';
-        $this->assertTrue(PMA_isValid($var, 'len'));
-        $this->assertTrue(PMA_isValid($var, 'scalar'));
-        $this->assertTrue(PMA_isValid($var));
-    }
-
-    /**
-     * Test for PMA_isValid
-     *
-     * @return void
-     */
-    public function testScalarInt()
-    {
-        $var = 1;
-        $this->assertTrue(PMA_isValid($var, 'int'));
-        $this->assertTrue(PMA_isValid($var, 'scalar'));
-    }
-
-    /**
-     * Test for PMA_isValid
-     *
-     * @return void
-     */
-    public function testScalarFloat()
-    {
-        $var = 1.1;
-        $this->assertTrue(PMA_isValid($var, 'float'));
-        $this->assertTrue(PMA_isValid($var, 'double'));
-        $this->assertTrue(PMA_isValid($var, 'scalar'));
-    }
-
-    /**
-     * Test for PMA_isValid
-     *
-     * @return void
-     */
-    public function testScalarBool()
-    {
-        $var = true;
-        $this->assertTrue(PMA_isValid($var, 'scalar'));
-        $this->assertTrue(PMA_isValid($var, 'bool'));
-        $this->assertTrue(PMA_isValid($var, 'boolean'));
-    }
-
-    /**
-     * Test for PMA_isValid
-     *
-     * @return void
-     */
-    public function testNotScalarArray()
-    {
-        $var = array('test');
-        $this->assertFalse(PMA_isValid($var, 'scalar'));
-    }
-
-    /**
-     * Test for PMA_isValid
-     *
-     * @return void
-     */
-    public function testNotScalarNull()
-    {
-        $var = null;
-        $this->assertFalse(PMA_isValid($var, 'scalar'));
-    }
-
-    /**
-     * Test for PMA_isValid
-     *
-     * @return void
-     */
-    public function testNumericInt()
-    {
-        $var = 1;
-        $this->assertTrue(PMA_isValid($var, 'numeric'));
-    }
-
-    /**
-     * Test for PMA_isValid
-     *
-     * @return void
-     */
-    public function testNumericFloat()
-    {
-        $var = 1.1;
-        $this->assertTrue(PMA_isValid($var, 'numeric'));
-    }
-
-    /**
-     * Test for PMA_isValid
-     *
-     * @return void
-     */
-    public function testNumericZero()
-    {
-        $var = 0;
-        $this->assertTrue(PMA_isValid($var, 'numeric'));
-    }
-
-    /**
-     * Test for PMA_isValid
-     *
-     * @return void
-     */
-    public function testNumericString()
-    {
-        $var = '+0.1';
-        $this->assertTrue(PMA_isValid($var, 'numeric'));
-    }
-
-    /**
-     * Test for PMA_isValid
-     *
-     * @return void
-     */
-    public function testValueInArray()
-    {
-        $var = 'a';
-        $this->assertTrue(PMA_isValid($var, array('a', 'b',)));
-    }
-
-    /**
-     * Test for PMA_isValid
-     *
-     * @return void
-     */
-    public function testValueNotInArray()
-    {
-        $var = 'c';
-        $this->assertFalse(PMA_isValid($var, array('a', 'b',)));
-    }
-
-    /**
-     * Test for PMA_isValid
-     *
-     * @return void
-     */
-    public function testNumericIdentical()
-    {
-        $var = 1;
-        $compare = 1;
-        $this->assertTrue(PMA_isValid($var, 'identic', $compare));
-
-        $var = 1;
-        $compare += 2;
-        $this->assertFalse(PMA_isValid($var, 'identic', $compare));
-
-        $var = 1;
-        $compare = '1';
-        $this->assertFalse(PMA_isValid($var, 'identic', $compare));
-    }
-
-    /**
-     * Data provider for testSimilarType
-     *
-     * @return array
-     */
-    public function providerSimilarType()
-    {
-        return array(
-            array(1, 1),
-            array(1.5, 1.5),
-            array(true, true),
-            array('string', "string"),
-            array(array(1, 2, 3.4), array(1, 2, 3.4)),
-            array(array(1, '2', '3.4', 5, 'text'), array('1', '2', 3.4,'5'))
-        );
-    }
-
-    /**
-     * Test for PMA_isValid
-     *
-     * @param mixed $var     Variable
-     * @param mixed $compare Compare
-     *
-     * @return void
-     *
-     * @dataProvider providerSimilarType
-     */
-    public function testSimilarType($var, $compare)
-    {
-        $this->assertTrue(PMA_isValid($var, 'similar', $compare));
-        $this->assertTrue(PMA_isValid($var, 'equal', $compare));
-        $this->assertTrue(PMA_isValid($compare, 'similar', $var));
-        $this->assertTrue(PMA_isValid($compare, 'equal', $var));
-
-    }
-
-    /**
-     * Test for PMA_isValid
-     *
-     * @return void
-     */
-    public function testOtherTypes()
-    {
-        $var = new PMA_isValid_test();
-        $this->assertFalse(PMA_isValid($var, 'class'));
-    }
-
-}
-
diff --git a/#pma/test/libraries/core/PMA_safeUnserialize_test.php b/#pma/test/libraries/core/PMA_safeUnserialize_test.php
deleted file mode 100644
index f589361b..00000000
--- a/#pma/test/libraries/core/PMA_safeUnserialize_test.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Test for PMA_safeUnserialize
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-require_once 'libraries/core.lib.php';
-
-class PMA_safeUnserialize_test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Test for unserializing
-     *
-     * @param string $data     Serialized data
-     * @param mixed  $expected Expected result
-     *
-     * @return void
-     *
-     * @dataProvider provideMySQLHosts
-     */
-    function testSanitizeMySQLHost($data, $expected)
-    {
-        $this->assertEquals(
-            $expected,
-            PMA_safeUnserialize($data)
-        );
-    }
-
-    /**
-     * Test data provider
-     *
-     * @return array
-     */
-    function provideMySQLHosts()
-    {
-        return array(
-            array('s:6:"foobar";', 'foobar'),
-            array('foobar', null),
-            array('b:0;', false),
-            array('O:1:"a":1:{s:5:"value";s:3:"100";}', null),
-            array('O:8:"stdClass":1:{s:5:"field";O:8:"stdClass":0:{}}', null),
-            array('a:2:{i:0;s:90:"1234567890;a345678901234567890123456789012345678901234567890123456789012345678901234567890";i:1;O:8:"stdClass":0:{}}', null),
-            array(serialize(array(1, 2, 3)), array(1, 2, 3)),
-            array(serialize('string""'), 'string""'),
-            array(serialize(array('foo' => 'bar')), array('foo' => 'bar')),
-            array(serialize(array('1', new stdClass(), '2')), null),
-        );
-    }
-
-}
-
diff --git a/#pma/test/libraries/core/PMA_sanitizeMySQLHost_test.php b/#pma/test/libraries/core/PMA_sanitizeMySQLHost_test.php
deleted file mode 100644
index d17ca530..00000000
--- a/#pma/test/libraries/core/PMA_sanitizeMySQLHost_test.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Test for PMA_sanitizeMySQLHost
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-require_once 'libraries/core.lib.php';
-
-class PMA_sanitizeMySQLHost_test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Test for MySQL host sanitizing
-     *
-     * @param string $host     Test host name
-     * @param string $expected Expected result
-     *
-     * @return void
-     *
-     * @dataProvider provideMySQLHosts
-     */
-    function testSanitizeMySQLHost($host, $expected)
-    {
-        $this->assertEquals(
-            $expected,
-            PMA_sanitizeMySQLHost($host)
-        );
-    }
-
-    /**
-     * Test data provider
-     *
-     * @return array
-     */
-    function provideMySQLHosts()
-    {
-        return array(
-            array('p:foo.bar', 'foo.bar'),
-            array('p:p:foo.bar', 'foo.bar'),
-            array('bar.baz', 'bar.baz'),
-            array('P:example.com', 'example.com'),
-        );
-    }
-
-}
diff --git a/#pma/test/libraries/core/PMA_securePath_test.php b/#pma/test/libraries/core/PMA_securePath_test.php
deleted file mode 100644
index c3663b8e..00000000
--- a/#pma/test/libraries/core/PMA_securePath_test.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * PMA_securePath changes .. to .
- *
- * @package PhpMyAdmin-test
- */
-
-
-/**
- * Test for securing path.
- *
- * @package PhpMyAdmin-test
- */
-class PMA_SecurePath extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Test for replacing dots.
-     *
-     * @return void
-     */
-    public function testReplaceDots()
-    {
-        $this->assertEquals(
-            PMA_securePath('../../../etc/passwd'),
-            './././etc/passwd'
-        );
-        $this->assertEquals(
-            PMA_securePath('/var/www/../phpmyadmin'),
-            '/var/www/./phpmyadmin'
-        );
-        $this->assertEquals(
-            PMA_securePath('./path/with..dots/../../file..php'),
-            './path/with.dots/././file.php'
-        );
-    }
-
-}
diff --git a/#pma/test/libraries/core/PMA_warnMissingExtension_test.php b/#pma/test/libraries/core/PMA_warnMissingExtension_test.php
deleted file mode 100644
index 1c6a2129..00000000
--- a/#pma/test/libraries/core/PMA_warnMissingExtension_test.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * PMA_warnMissingExtension warns or fails on missing extension.
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-use PMA\libraries\Theme;
-
-
-require_once 'libraries/js_escape.lib.php';
-require_once 'libraries/sanitizing.lib.php';
-
-/**
- * PMA_warnMissingExtension warns or fails on missing extension.
- *
- * @package PhpMyAdmin-test
- */
-class PMA_WarnMissingExtension_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Set up
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        $GLOBALS['PMA_Config'] = new PMA\libraries\Config();
-        $GLOBALS['PMA_Config']->enableBc();
-        $GLOBALS['cfg']['Server'] = array(
-            'host' => 'host',
-            'verbose' => 'verbose',
-        );
-        $GLOBALS['cfg']['OBGzip'] = false;
-        $_SESSION['PMA_Theme'] = new Theme();
-        $GLOBALS['pmaThemeImage'] = 'theme/';
-        $GLOBALS['pmaThemePath'] = $_SESSION['PMA_Theme']->getPath();
-        $GLOBALS['server'] = 1;
-        $GLOBALS['db'] = '';
-        $GLOBALS['table'] = '';
-
-        include_once './libraries/ErrorHandler.php';
-        $GLOBALS['error_handler'] = new PMA\libraries\ErrorHandler();
-    }
-
-    /**
-     * Test for PMA_warnMissingExtension
-     *
-     * @return void
-     */
-    function testMissingExtensionFatal()
-    {
-        $ext = 'php_ext';
-        $warn = 'The <a href="' . PMA_getPHPDocLink('book.' . $ext . '.php')
-            . '" target="Documentation"><em>' . $ext
-            . '</em></a> extension is missing. Please check your PHP configuration.';
-
-        $this->expectOutputRegex('@' . preg_quote($warn, '@') . '@');
-
-        PMA_warnMissingExtension($ext, true);
-    }
-
-    /**
-     * Test for PMA_warnMissingExtension
-     *
-     * @return void
-     */
-    function testMissingExtensionFatalWithExtra()
-    {
-        $ext = 'php_ext';
-        $extra = 'Appended Extra String';
-
-        $warn = 'The <a href="' . PMA_getPHPDocLink('book.' . $ext . '.php')
-            . '" target="Documentation"><em>' . $ext
-            . '</em></a> extension is missing. Please check your PHP configuration.'
-            . ' ' . $extra;
-
-        ob_start();
-        PMA_warnMissingExtension($ext, true, $extra);
-        $printed = ob_get_contents();
-        ob_end_clean();
-
-        $this->assertGreaterThan(0, mb_strpos($printed, $warn));
-    }
-}
diff --git a/#pma/test/libraries/database_interface_test.php b/#pma/test/libraries/database_interface_test.php
deleted file mode 100644
index 2678d092..00000000
--- a/#pma/test/libraries/database_interface_test.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Test for faked database access
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-require_once 'libraries/database_interface.inc.php';
-
-require_once 'libraries/charset_conversion.lib.php';
-
-/**
- * Tests basic functionality of dummy dbi driver
- *
- * @package PhpMyAdmin-test
- */
-class PMA_DBI_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Configures test parameters.
-     *
-     * @return void
-     */
-    function setup()
-    {
-        $GLOBALS['cfg']['DBG']['sql'] = false;
-        $GLOBALS['cfg']['IconvExtraParams'] = '';
-    }
-
-    /**
-     * Simple test for basic query
-     *
-     * This relies on dummy driver internals
-     *
-     * @return void
-     */
-    function testQuery()
-    {
-        $this->assertEquals(0, $GLOBALS['dbi']->tryQuery('SELECT 1'));
-    }
-
-    /**
-     * Simple test for fetching results of query
-     *
-     * This relies on dummy driver internals
-     *
-     * @return void
-     */
-    function testFetch()
-    {
-        $result = $GLOBALS['dbi']->tryQuery('SELECT 1');
-        $this->assertEquals(array('1'), $GLOBALS['dbi']->fetchArray($result));
-    }
-
-    /**
-     * Test for system schema detection
-     *
-     * @param string $schema   schema name
-     * @param bool   $expected expected result
-     *
-     * @return void
-     *
-     * @dataProvider schemaData
-     */
-    function testSystemSchema($schema, $expected)
-    {
-        $this->assertEquals($expected, $GLOBALS['dbi']->isSystemSchema($schema));
-    }
-
-    /**
-     * Data provider for schema test
-     *
-     * @return array with test data
-     */
-    function schemaData()
-    {
-        return array(
-            array('information_schema', true),
-            array('pma_test', false),
-        );
-    }
-
-    /**
-     * Test for error formatting
-     *
-     * @param integer $number   error number
-     * @param string  $message  error message
-     * @param string  $expected expected result
-     *
-     * @return void
-     *
-     * @dataProvider errorData
-     */
-    function testFormatError($number, $message, $expected)
-    {
-        $GLOBALS['server'] = 1;
-        $this->assertEquals(
-            $expected,
-            $GLOBALS['dbi']->formatError($number, $message)
-        );
-    }
-
-    /**
-     * Data provider for error formatting test
-     *
-     * @return array with test data
-     */
-    function errorData()
-    {
-        return array(
-            array(1234, '', '#1234 - '),
-            array(1234, 'foobar', '#1234 - foobar'),
-            array(
-                2002, 'foobar',
-                '#2002 - foobar &mdash; The server is not responding (or the local '
-                . 'server\'s socket is not correctly configured).'
-            ),
-        );
-    }
-}
diff --git a/#pma/test/libraries/php-gettext/Locales_test.php b/#pma/test/libraries/php-gettext/Locales_test.php
deleted file mode 100644
index 1817f83f..00000000
--- a/#pma/test/libraries/php-gettext/Locales_test.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Test for gettext locales.
- *
- * @package PhpMyAdmin-test
- */
-
-class LocaleTest extends PHPUnit_Framework_TestCase
-{
-
-    public function test_setlocale_system()
-    {
-        putenv("LC_ALL=");
-        // For an existing locale, it never needs emulation.
-        putenv("LANG=C");
-        _setlocale(LC_MESSAGES, "");
-        $this->assertEquals(0, locale_emulation());
-    }
-
-    public function test_setlocale_emulation()
-    {
-        putenv("LC_ALL=");
-        // If we set it to a non-existent locale, it still works, but uses
-        // emulation.
-        _setlocale(LC_MESSAGES, "xxx_XXX");
-        $this->assertEquals('xxx_XXX', _setlocale(LC_MESSAGES, 0));
-        $this->assertEquals(1, locale_emulation());
-    }
-
-    public function test_get_list_of_locales()
-    {
-        // For a locale containing country code, we prefer
-        // full locale name, but if that's not found, fall back
-        // to the language only locale name.
-        $this->assertEquals(
-            array("sr_RS", "sr"),
-            get_list_of_locales("sr_RS")
-        );
-
-        // If language code is used, it's the only thing returned.
-        $this->assertEquals(
-            array("sr"),
-            get_list_of_locales("sr")
-        );
-
-        // There is support for language and charset only.
-        $this->assertEquals(
-            array("sr.UTF-8", "sr"),
-            get_list_of_locales("sr.UTF-8")
-        );
-
-        // It can also split out character set from the full locale name.
-        $this->assertEquals(
-            array("sr_RS.UTF-8", "sr_RS", "sr"),
-            get_list_of_locales("sr_RS.UTF-8")
-        );
-
-        // There is support for @modifier in locale names as well.
-        $this->assertEquals(
-            array("sr_RS.UTF-8@latin", "sr_RS@latin", "sr@latin",
-                "sr_RS.UTF-8", "sr_RS", "sr"),
-            get_list_of_locales("sr_RS.UTF-8@latin")
-        );
-
-        // We can pass in only language and modifier.
-        $this->assertEquals(
-            array("sr@latin", "sr"),
-            get_list_of_locales("sr@latin")
-        );
-
-        // If locale name is not following the regular POSIX pattern,
-        // it's used verbatim.
-        $this->assertEquals(
-            array("something"),
-            get_list_of_locales("something")
-        );
-
-        // Passing in an empty string returns an empty array.
-        $this->assertEquals(
-            array(),
-            get_list_of_locales("")
-        );
-    }
-}
-
diff --git a/#pma/test/libraries/php-gettext/PMA_FileReader_test.php b/#pma/test/libraries/php-gettext/PMA_FileReader_test.php
deleted file mode 100644
index c083d3ab..00000000
--- a/#pma/test/libraries/php-gettext/PMA_FileReader_test.php
+++ /dev/null
@@ -1,143 +0,0 @@
-<?php
-/**
- * Tests for FileReader
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-
-require_once 'libraries/php-gettext/streams.php';
-
-class PMA_FileReader_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * @access protected
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function setUp()
-    {
-        $this->object = new FileReader('./test/test_data/test.file');
-
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Test for read
-     *
-     * @return void
-     */
-    public function testRead()
-    {
-        $this->assertEquals(
-            $this->object->read(4),
-            'TEST'
-        );
-
-        $this->assertEquals(
-            $this->object->read(false),
-            ''
-        );
-    }
-
-    /**
-     * Test for seekto
-     *
-     * @return void
-     */
-    public function testSeekto()
-    {
-        $this->assertEquals(
-            $this->object->seekto(1),
-            1
-        );
-    }
-
-    /**
-     * Test for currentpos
-     *
-     * @return void
-     */
-    public function testCurrentpos()
-    {
-        $this->assertEquals(
-            $this->object->currentpos(),
-            0
-        );
-    }
-
-    /**
-     * Test for length
-     *
-     * @return void
-     */
-    public function testLength()
-    {
-        $this->assertEquals(
-            $this->object->length(),
-            10
-        );
-    }
-
-    /**
-     * Test for close
-     *
-     * @return void
-     */
-    public function testClose()
-    {
-        $this->assertEquals(
-            $this->object->close(),
-            null
-        );
-    }
-
-    /**
-     * Test for non existing file
-     *
-     * @return void
-     */
-    public function testForNonExistingFile()
-    {
-        $file = new FileReader('./path/for/no/file.txt');
-        // looking at the return value of a constructor is curious
-        // but the constructor returns a value
-        $this->assertFalse(
-            $file->__construct('./path/for/no/file.txt')
-        );
-    }
-
-    public function testForCachedFileReader()
-    {
-        $reader = new CachedFileReader('./test/test_data/test.file');
-        $this->assertEquals(
-            $reader->__construct('./test/test_data/test.file'),
-            null
-        );
-        $this->assertFalse(
-            $reader->__construct('./path/for/no/file.txt')
-        );
-
-    }
-}
diff --git a/#pma/test/libraries/php-gettext/PMA_StreamReader_test.php b/#pma/test/libraries/php-gettext/PMA_StreamReader_test.php
deleted file mode 100644
index db47ea47..00000000
--- a/#pma/test/libraries/php-gettext/PMA_StreamReader_test.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-/**
- * Tests for StreamReader
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-
-require_once 'libraries/php-gettext/streams.php';
-
-class PMA_StreamReader_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * @access protected
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function setUp()
-    {
-        $this->object = new StreamReader();
-
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Test for read
-     *
-     * @return void
-     */
-    public function testRead()
-    {
-        $this->assertFalse($this->object->read(4));
-    }
-
-    /**
-     * Test for seekto
-     *
-     * @return void
-     */
-    public function testSeekto()
-    {
-        $this->assertFalse($this->object->seekto(1));
-    }
-
-    /**
-     * Test for currentpos
-     *
-     * @return void
-     */
-    public function testCurrentpos()
-    {
-        $this->assertFalse($this->object->currentpos());
-    }
-
-    /**
-     * Test for length
-     *
-     * @return void
-     */
-    public function testLength()
-    {
-        $this->assertFalse($this->object->length());
-    }
-
-}
diff --git a/#pma/test/libraries/php-gettext/PMA_StringReader_test.php b/#pma/test/libraries/php-gettext/PMA_StringReader_test.php
deleted file mode 100644
index f3c173c9..00000000
--- a/#pma/test/libraries/php-gettext/PMA_StringReader_test.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-/**
- * Tests for StringReader
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-
-require_once 'libraries/php-gettext/streams.php';
-
-class PMA_StringReader_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * @access protected
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function setUp()
-    {
-        $this->object = new StringReader('sample string');
-
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Test for read
-     *
-     * @param int    $bytes  Number of bytes to read
-     * @param string $output Expected output
-     *
-     * @return void
-     *
-     * @dataProvider providerForTestRead
-     */
-    public function testRead($bytes, $output)
-    {
-        $this->assertEquals(
-            $this->object->read($bytes),
-            $output
-        );
-    }
-
-    /**
-     * Provider for testRead
-     *
-     * @return array
-     */
-    public function providerForTestRead()
-    {
-        return array(
-            array(
-                4,
-                'samp'
-            ),
-            array(
-                6,
-                'sample'
-            ),
-            array(
-                9,
-                'sample st'
-            )
-        );
-    }
-
-    /**
-     * Test for seekto
-     *
-     * @return void
-     */
-    public function testSeekto()
-    {
-        $this->assertEquals(
-            $this->object->seekto(3),
-            3
-        );
-    }
-
-    /**
-     * Test for currentpos
-     *
-     * @return void
-     */
-    public function testCurrentpos()
-    {
-        $this->assertEquals(
-            $this->object->currentpos(),
-            0
-        );
-    }
-
-    /**
-     * Test for length
-     *
-     * @return void
-     */
-    public function testLength()
-    {
-        $this->assertEquals(
-            $this->object->length(),
-            13
-        );
-    }
-}
diff --git a/#pma/test/libraries/php-gettext/PMA_gettext_test.php b/#pma/test/libraries/php-gettext/PMA_gettext_test.php
deleted file mode 100644
index 71029658..00000000
--- a/#pma/test/libraries/php-gettext/PMA_gettext_test.php
+++ /dev/null
@@ -1,223 +0,0 @@
-<?php
-/**
- * Tests for gettext_reader
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-
-require_once 'libraries/php-gettext/gettext.php';
-require_once 'libraries/php-gettext/streams.php';
-
-class PMA_Gettext_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * @access protected
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function setUp()
-    {
-        $reader = new StringReader("cchars/nint");
-        $this->object = new gettext_reader($reader);
-
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function tearDown()
-    {
-        unset($this->object);
-    }
-
-    /**
-     * Test for readint
-     *
-     * @return void
-     */
-    public function testReadint()
-    {
-        $this->assertEquals(
-            $this->object->readint(),
-            1848603506
-        );
-    }
-
-    /**
-     * Test for readintarray
-     *
-     * @return void
-     */
-    public function testReadintarray()
-    {
-        $this->assertEquals(
-            $this->object->readintarray(1),
-            array(
-                1 => 1848603506
-            )
-        );
-    }
-
-    /**
-     * Test for get_original_string
-     *
-     * @return void
-     */
-    public function testGet_original_string()
-    {
-        $this->assertEquals(
-            $this->object->get_original_string(1),
-            ''
-        );
-    }
-
-    /**
-     * Test for get_translation_string
-     *
-     * @return void
-     */
-    public function testGet_translation_string()
-    {
-        $this->assertEquals(
-            $this->object->get_translation_string(1),
-            ''
-        );
-    }
-
-    /**
-     * Test for find_string
-     *
-     * @param string $string string
-     * @param int    $start  start (internally used in recursive function)
-     * @param int    $end    end (internally used in recursive function)
-     * @param string $output Expected output
-     *
-     * @return void
-     *
-     * @dataProvider providerForTestFind_string
-     */
-    public function testFind_string($string, $start, $end, $output)
-    {
-        $this->assertEquals(
-            $this->object->find_string($string, $start, $end),
-            $output
-        );
-    }
-
-    /**
-     * Data provider for testFind_string
-     *
-     * @return array
-     */
-    public function providerForTestFind_string()
-    {
-        return array(
-            array(
-                'sample_string/string',
-                2,
-                5,
-                -1
-            ),
-            array(
-                'sample_string/string',
-                -1,
-                -1,
-                -1
-            )
-        );
-    }
-
-    /**
-     * Test for translate
-     *
-     * @return void
-     */
-    public function testTranslate()
-    {
-        $this->assertEquals(
-            $this->object->translate('transferable_string'),
-            'transferable_string'
-        );
-    }
-
-    /**
-     * Test for sanitize_plural_expression
-     *
-     * @param string $expr   Expression to sanitize
-     * @param string $output Expected output
-     *
-     * @return void
-     *
-     * @dataProvider providerForTestSanitize_plural_expression
-     */
-    public function testSanitize_plural_expression($expr, $output)
-    {
-        $this->assertEquals(
-            $this->object->sanitize_plural_expression($expr),
-            $output
-        );
-    }
-
-    /**
-     * Data provider for testSanitize_plural_expression
-     *
-     * @return array
-     */
-    public function providerForTestSanitize_plural_expression()
-    {
-        return array(
-            array(
-                'employeeId = 1',
-                'employeeId=1;'
-            ),
-            array(
-                'id = 1 ? true : false',
-                'id=1 ? (true) : (false);'
-            )
-        );
-    }
-
-    /**
-     * Test for extract_plural_forms_header_from_po_header
-     *
-     * @return void
-     */
-    public function testExtract_plural_forms_header_from_po_header()
-    {
-        $this->assertEquals(
-            $this->object->extract_plural_forms_header_from_po_header(
-                'id = 1 ? true : false'
-            ),
-            'nplurals=2; plural=n == 1 ? 0 : 1;'
-        );
-    }
-
-    /**
-     * Test for pgettext
-     *
-     * @return void
-     */
-    public function testPgettext()
-    {
-        $this->assertEquals(
-            $this->object->pgettext('context', 'msgId'),
-            'msgId'
-        );
-    }
-
-}
diff --git a/#pma/test/libraries/php-gettext/Parsing_test.php b/#pma/test/libraries/php-gettext/Parsing_test.php
deleted file mode 100644
index 1e67174f..00000000
--- a/#pma/test/libraries/php-gettext/Parsing_test.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Test for gettext parsing.
- *
- * @package PhpMyAdmin-test
- */
-require_once 'libraries/php-gettext/gettext.php';
-
-class ParsingTest extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Test for extract_plural_forms_header_from_po_header
-     *
-     * @return void
-     */
-    public function test_extract_plural_forms_header_from_po_header()
-    {
-        $parser = new gettext_reader(null);
-        // It defaults to a "Western-style" plural header.
-        $this->assertEquals(
-            'nplurals=2; plural=n == 1 ? 0 : 1;',
-            $parser->extract_plural_forms_header_from_po_header("")
-        );
-
-        // Extracting it from the middle of the header works.
-        $this->assertEquals(
-            'nplurals=1; plural=0;',
-            $parser->extract_plural_forms_header_from_po_header(
-                "Content-type: text/html; charset=UTF-8\n"
-                . "Plural-Forms: nplurals=1; plural=0;\n"
-                . "Last-Translator: nobody\n"
-            )
-        );
-
-        // It's also case-insensitive.
-        $this->assertEquals(
-            'nplurals=1; plural=0;',
-            $parser->extract_plural_forms_header_from_po_header(
-                "PLURAL-forms: nplurals=1; plural=0;\n"
-            )
-        );
-
-        // It falls back to default if it's not on a separate line.
-        $this->assertEquals(
-            'nplurals=2; plural=n == 1 ? 0 : 1;',
-            $parser->extract_plural_forms_header_from_po_header(
-                "Content-type: text/html; charset=UTF-8" // note the missing \n here
-                . "Plural-Forms: nplurals=1; plural=0;\n"
-                . "Last-Translator: nobody\n"
-            )
-        );
-    }
-
-    /**
-     * Test for npgettext
-     *
-     * @param int    $number   Number
-     * @param string $expected Expected output
-     *
-     * @return void
-     *
-     * @dataProvider data_provider_test_npgettext
-     */
-    public function test_npgettext($number, $expected)
-    {
-        $parser = new gettext_reader(null);
-        $result = $parser->npgettext(
-            "context",
-            "%d pig went to the market\n",
-            "%d pigs went to the market\n",
-            $number
-        );
-        $this->assertSame($expected, $result);
-    }
-
-    /**
-     * Data provider for test_npgettext
-     *
-     * @return array
-     */
-    public static function data_provider_test_npgettext()
-    {
-        return array(
-            array(1, "%d pig went to the market\n"),
-            array(2, "%d pigs went to the market\n"),
-        );
-    }
-
-}
-
diff --git a/#pma/test/libraries/rte/PMA_EVN_getDataFromRequest_test.php b/#pma/test/libraries/rte/PMA_EVN_getDataFromRequest_test.php
deleted file mode 100644
index 04ebfc9f..00000000
--- a/#pma/test/libraries/rte/PMA_EVN_getDataFromRequest_test.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Test for fetching event data from HTTP request
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-require_once 'libraries/rte/rte_events.lib.php';
-
-/**
- * Test for fetching event data from HTTP request
- *
- * @package PhpMyAdmin-test
- */
-class PMA_EVN_GetDataFromRequest_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Test for PMA_EVN_getDataFromRequest
-     *
-     * @param array $in  Input
-     * @param array $out Expected output
-     *
-     * @return void
-     *
-     * @dataProvider provider
-     */
-    public function testgetDataFromRequestEmpty($in, $out)
-    {
-        global $_REQUEST;
-
-        unset($_REQUEST);
-        foreach ($in as $key => $value) {
-            if ($value !== '') {
-                $_REQUEST[$key] = $value;
-            }
-        }
-        $this->assertEquals($out, PMA_EVN_getDataFromRequest());
-    }
-
-    /**
-     * Data provider for testgetDataFromRequest_empty
-     *
-     * @return array
-     */
-    public function provider()
-    {
-        return array(
-            array(
-                array(
-                    'item_name'           => '',
-                    'item_type'           => '',
-                    'item_original_name'  => '',
-                    'item_status'         => '',
-                    'item_execute_at'     => '',
-                    'item_interval_value' => '',
-                    'item_interval_field' => '',
-                    'item_starts'         => '',
-                    'item_ends'           => '',
-                    'item_definition'     => '',
-                    'item_preserve'       => '',
-                    'item_comment'        => '',
-                    'item_definer'        => ''
-                ),
-                array(
-                    'item_name'           => '',
-                    'item_type'           => 'ONE TIME',
-                    'item_type_toggle'    => 'RECURRING',
-                    'item_original_name'  => '',
-                    'item_status'         => '',
-                    'item_execute_at'     => '',
-                    'item_interval_value' => '',
-                    'item_interval_field' => '',
-                    'item_starts'         => '',
-                    'item_ends'           => '',
-                    'item_definition'     => '',
-                    'item_preserve'       => '',
-                    'item_comment'        => '',
-                    'item_definer'        => ''
-                )
-            ),
-            array(
-                array(
-                    'item_name'           => 'foo',
-                    'item_type'           => 'RECURRING',
-                    'item_original_name'  => 'foo',
-                    'item_status'         => 'foo',
-                    'item_execute_at'     => 'foo',
-                    'item_interval_value' => 'foo',
-                    'item_interval_field' => 'foo',
-                    'item_starts'         => 'foo',
-                    'item_ends'           => 'foo',
-                    'item_definition'     => 'foo',
-                    'item_preserve'       => 'foo',
-                    'item_comment'        => 'foo',
-                    'item_definer'        => 'foo'
-                ),
-                array(
-                    'item_name'           => 'foo',
-                    'item_type'           => 'RECURRING',
-                    'item_type_toggle'    => 'ONE TIME',
-                    'item_original_name'  => 'foo',
-                    'item_status'         => 'foo',
-                    'item_execute_at'     => 'foo',
-                    'item_interval_value' => 'foo',
-                    'item_interval_field' => 'foo',
-                    'item_starts'         => 'foo',
-                    'item_ends'           => 'foo',
-                    'item_definition'     => 'foo',
-                    'item_preserve'       => 'foo',
-                    'item_comment'        => 'foo',
-                    'item_definer'        => 'foo'
-                )
-            ),
-        );
-    }
-}
diff --git a/#pma/test/libraries/rte/PMA_EVN_getEditorForm_test.php b/#pma/test/libraries/rte/PMA_EVN_getEditorForm_test.php
deleted file mode 100644
index ef0ea3e3..00000000
--- a/#pma/test/libraries/rte/PMA_EVN_getEditorForm_test.php
+++ /dev/null
@@ -1,285 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Test for generating event editor
- *
- * @package PhpMyAdmin-test
- */
-
-require_once 'libraries/url_generating.lib.php';
-
-/*
- * Include to test.
- */
-require_once 'libraries/rte/rte_events.lib.php';
-
-/**
- * Test for generating event editor
- *
- * @package PhpMyAdmin-test
- */
-class PMA_EVN_GetEditorForm_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Set up
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        $GLOBALS['tear_down']['server'] = false;
-        if (! isset($GLOBALS['cfg']['ServerDefault'])) {
-            $GLOBALS['cfg']['ServerDefault'] = '';
-            $GLOBALS['tear_down']['server'] = true;
-        }
-    }
-
-    /**
-     * Tear down
-     *
-     * @return void
-     */
-    public function tearDown()
-    {
-        if ($GLOBALS['tear_down']['server']) {
-            unset($GLOBALS['cfg']['ServerDefault']);
-        }
-        unset($GLOBALS['tear_down']);
-    }
-
-    /**
-     * Test for PMA_EVN_getEditorForm
-     *
-     * @param array $data    Data for routine
-     * @param array $matcher Matcher
-     *
-     * @return void
-     *
-     * @dataProvider providerAdd
-     */
-    public function testgetEditorFormAdd($data, $matcher)
-    {
-        $GLOBALS['is_ajax_request'] = false;
-        PMA_EVN_setGlobals();
-        $this->assertContains(
-            $matcher,
-            PMA_EVN_getEditorForm('add', 'change', $data)
-        );
-    }
-
-    /**
-     * Data provider for testgetEditorFormAdd
-     *
-     * @return array
-     */
-    public function providerAdd()
-    {
-        $data = array(
-            'item_name'           => '',
-            'item_type'           => 'ONE TIME',
-            'item_type_toggle'    => 'RECURRING',
-            'item_original_name'  => '',
-            'item_status'         => '',
-            'item_execute_at'     => '',
-            'item_interval_value' => '',
-            'item_interval_field' => '',
-            'item_starts'         => '',
-            'item_ends'           => '',
-            'item_definition'     => '',
-            'item_preserve'       => '',
-            'item_comment'        => '',
-            'item_definer'        => ''
-        );
-
-        return array(
-            array(
-                $data,
-                "<input name='add_item'"
-            ),
-            array(
-                $data,
-                "<input type='text' name='item_name'"
-            ),
-            array(
-                $data,
-                "<select name='item_status'"
-            ),
-            array(
-                $data,
-                "<input name='item_type'"
-            ),
-            array(
-                $data,
-                "<input type='text' name='item_execute_at'"
-            ),
-            array(
-                $data,
-                "<input type='text' name='item_ends'"
-            ),
-            array(
-                $data,
-                "<textarea name='item_definition'"
-            ),
-            array(
-                $data,
-                "<input type='text' name='item_definer'"
-            ),
-            array(
-                $data,
-                "<input type='text' name='item_comment'"
-            ),
-            array(
-                $data,
-                "<input type='submit' name='editor_process_add'"
-            )
-        );
-    }
-
-    /**
-     * Test for PMA_EVN_getEditorForm
-     *
-     * @param array $data    Data for routine
-     * @param array $matcher Matcher
-     *
-     * @return void
-     *
-     * @dataProvider providerEdit
-     */
-    public function testgetEditorFormEdit($data, $matcher)
-    {
-        $GLOBALS['is_ajax_request'] = false;
-        PMA_EVN_setGlobals();
-        $this->assertContains(
-            $matcher,
-            PMA_EVN_getEditorForm('edit', 'change', $data)
-        );
-    }
-
-    /**
-     * Data provider for testgetEditorForm_edit
-     *
-     * @return array
-     */
-    public function providerEdit()
-    {
-        $data = array(
-            'item_name'           => 'foo',
-            'item_type'           => 'RECURRING',
-            'item_type_toggle'    => 'ONE TIME',
-            'item_original_name'  => 'bar',
-            'item_status'         => 'ENABLED',
-            'item_execute_at'     => '',
-            'item_interval_value' => '1',
-            'item_interval_field' => 'DAY',
-            'item_starts'         => '',
-            'item_ends'           => '',
-            'item_definition'     => 'SET @A=1;',
-            'item_preserve'       => '',
-            'item_comment'        => '',
-            'item_definer'        => ''
-        );
-
-        return array(
-            array(
-                $data,
-                "<input name='edit_item'"
-            ),
-            array(
-                $data,
-                "<input type='text' name='item_name'"
-            ),
-            array(
-                $data,
-                "<select name='item_status'"
-            ),
-            array(
-                $data,
-                "<input name='item_type'"
-            ),
-            array(
-                $data,
-                "<input type='text' name='item_execute_at'"
-            ),
-            array(
-                $data,
-                "<input type='text' name='item_ends'"
-            ),
-            array(
-                $data,
-                "<textarea name='item_definition'"
-            ),
-            array(
-                $data,
-                "<input type='text' name='item_definer'"
-            ),
-            array(
-                $data,
-                "<input type='text' name='item_comment'"
-            ),
-            array(
-                $data,
-                "<input type='submit' name='editor_process_edit'"
-            )
-        );
-    }
-
-    /**
-     * Test for PMA_EVN_getEditorForm
-     *
-     * @param array $data    Data for routine
-     * @param array $matcher Matcher
-     *
-     * @return void
-     *
-     * @dataProvider providerAjax
-     */
-    public function testgetEditorFormAjax($data, $matcher)
-    {
-        $GLOBALS['is_ajax_request'] = true;
-        PMA_EVN_setGlobals();
-        $this->assertContains(
-            $matcher,
-            PMA_EVN_getEditorForm('edit', 'change', $data)
-        );
-    }
-
-    /**
-     * Data provider for testgetEditorForm_ajax
-     *
-     * @return array
-     */
-    public function providerAjax()
-    {
-        $data = array(
-            'item_name'           => '',
-            'item_type'           => 'RECURRING',
-            'item_type_toggle'    => 'ONE TIME',
-            'item_original_name'  => '',
-            'item_status'         => 'ENABLED',
-            'item_execute_at'     => '',
-            'item_interval_value' => '',
-            'item_interval_field' => 'DAY',
-            'item_starts'         => '',
-            'item_ends'           => '',
-            'item_definition'     => '',
-            'item_preserve'       => '',
-            'item_comment'        => '',
-            'item_definer'        => ''
-        );
-
-        return array(
-            array(
-                $data,
-                "<select name='item_type'"
-            ),
-            array(
-                $data,
-                "<input type='hidden' name='editor_process_edit'"
-            ),
-            array(
-                $data,
-                "<input type='hidden' name='ajax_request'"
-            )
-        );
-    }
-}
diff --git a/#pma/test/libraries/rte/PMA_EVN_getQueryFromRequest_test.php b/#pma/test/libraries/rte/PMA_EVN_getQueryFromRequest_test.php
deleted file mode 100644
index af1fe762..00000000
--- a/#pma/test/libraries/rte/PMA_EVN_getQueryFromRequest_test.php
+++ /dev/null
@@ -1,175 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Test for generating CREATE EVENT query from HTTP request
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Needed for backquote()
- */
-
-
-/*
- * Needed by PMA_EVN_getQueryFromRequest()
- */
-
-/*
- * Include to test.
- */
-require_once 'libraries/rte/rte_events.lib.php';
-
-/**
- * Test for generating CREATE EVENT query from HTTP request
- *
- * @package PhpMyAdmin-test
- */
-class PMA_EVN_GetQueryFromRequest_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Test for PMA_EVN_getQueryFromRequest
-     *
-     * @param array  $request Request
-     * @param string $query   Query
-     * @param array  $num_err Error number
-     *
-     * @return void
-     *
-     * @dataProvider provider
-     */
-    public function testgetQueryFromRequest($request, $query, $num_err)
-    {
-        global $_REQUEST, $errors;
-
-        $errors = array();
-        PMA_EVN_setGlobals();
-
-        unset($_REQUEST);
-        $_REQUEST = $request;
-
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $dbi->expects($this->any())
-            ->method('escapeString')
-            ->will($this->returnArgument(0));
-        $GLOBALS['dbi'] = $dbi;
-
-        $this->assertEquals($query, PMA_EVN_getQueryFromRequest());
-        $this->assertEquals($num_err, count($errors));
-    }
-
-    /**
-     * Data provider for testgetQueryFromRequest
-     *
-     * @return array
-     */
-    public function provider()
-    {
-        return array(
-            // Testing success
-            array(
-                array( // simple once-off event
-                    'item_name'       => 's o m e e v e n t\\',
-                    'item_type'       => 'ONE TIME',
-                    'item_execute_at' => '2050-01-01 00:00:00',
-                    'item_definition' => 'SET @A=0;'
-                ),
-                'CREATE EVENT `s o m e e v e n t\` ON SCHEDULE AT \'2050-01-01 ' .
-                '00:00:00\' ON COMPLETION NOT PRESERVE DO SET @A=0;',
-                0
-            ),
-            array(
-                array( // full once-off event
-                    'item_name'       => 'evn',
-                    'item_definer'    => 'me@home',
-                    'item_type'       => 'ONE TIME',
-                    'item_execute_at' => '2050-01-01 00:00:00',
-                    'item_preserve'   => 'ON',
-                    'item_status'     => 'ENABLED',
-                    'item_definition' => 'SET @A=0;'
-                ),
-                'CREATE DEFINER=`me`@`home` EVENT `evn` ON SCHEDULE AT ' .
-                '\'2050-01-01 00:00:00\' ON COMPLETION PRESERVE ENABLE DO SET @A=0;',
-                0
-            ),
-            array(
-                array( // simple recurring event
-                    'item_name'           => 'rec_``evn',
-                    'item_type'           => 'RECURRING',
-                    'item_interval_value' => '365',
-                    'item_interval_field' => 'DAY',
-                    'item_status'         => 'DISABLED',
-                    'item_definition'     => 'SET @A=0;'
-                ),
-                'CREATE EVENT `rec_````evn` ON SCHEDULE EVERY 365 DAY ON ' .
-                'COMPLETION NOT PRESERVE DISABLE DO SET @A=0;',
-                0
-            ),
-            array(
-                array( // full recurring event
-                    'item_name'           => 'rec_evn2',
-                    'item_definer'        => 'evil``user><\\@work\\',
-                    'item_type'           => 'RECURRING',
-                    'item_interval_value' => '365',
-                    'item_interval_field' => 'DAY',
-                    'item_starts'         => '1900-01-01',
-                    'item_ends'           => '2050-01-01',
-                    'item_preserve'       => 'ON',
-                    'item_status'         => 'SLAVESIDE_DISABLED',
-                    'item_definition'     => 'SET @A=0;'
-                ),
-                'CREATE DEFINER=`evil````user><\`@`work\` EVENT `rec_evn2` ON ' .
-                'SCHEDULE EVERY 365 DAY STARTS \'1900-01-01\' ENDS \'2050-01-01\' ' .
-                'ON COMPLETION PRESERVE DISABLE ON SLAVE DO SET @A=0;',
-                0
-            ),
-            // Testing failures
-            array(
-                array( // empty request
-                ),
-                'CREATE EVENT ON SCHEDULE ON COMPLETION NOT PRESERVE DO ',
-                3
-            ),
-            array(
-                array(
-                    'item_name'       => 's o m e e v e n t\\',
-                    'item_definer'    => 'someuser', // invalid definer format
-                    'item_type'       => 'ONE TIME',
-                    'item_execute_at' => '', // no execution time
-                    'item_definition' => 'SET @A=0;'
-                ),
-                'CREATE EVENT `s o m e e v e n t\` ON SCHEDULE ON COMPLETION NOT ' .
-                'PRESERVE DO SET @A=0;',
-                2
-            ),
-            array(
-                array(
-                    'item_name'           => 'rec_``evn',
-                    'item_type'           => 'RECURRING',
-                    'item_interval_value' => '', // no interval value
-                    'item_interval_field' => 'DAY',
-                    'item_status'         => 'DISABLED',
-                    'item_definition'     => 'SET @A=0;'
-                ),
-                'CREATE EVENT `rec_````evn` ON SCHEDULE ON COMPLETION NOT ' .
-                'PRESERVE DISABLE DO SET @A=0;',
-                1
-            ),
-            array(
-                array( // simple recurring event
-                    'item_name'           => 'rec_``evn',
-                    'item_type'           => 'RECURRING',
-                    'item_interval_value' => '365',
-                    'item_interval_field' => 'CENTURIES', // invalid interval field
-                    'item_status'         => 'DISABLED',
-                    'item_definition'     => 'SET @A=0;'
-                ),
-                'CREATE EVENT `rec_````evn` ON SCHEDULE ON COMPLETION NOT ' .
-                'PRESERVE DISABLE DO SET @A=0;',
-                1
-            ),
-        );
-    }
-}
diff --git a/#pma/test/libraries/rte/PMA_RTN_getDataFromRequest_test.php b/#pma/test/libraries/rte/PMA_RTN_getDataFromRequest_test.php
deleted file mode 100644
index e9849238..00000000
--- a/#pma/test/libraries/rte/PMA_RTN_getDataFromRequest_test.php
+++ /dev/null
@@ -1,226 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Test for fetching routine data from HTTP request
- *
- * @package PhpMyAdmin-test
- */
-
-use PMA\libraries\TypesMySQL;
-
-
-
-/*
- * Include to test.
- */
-require_once 'libraries/rte/rte_routines.lib.php';
-
-/**
- * Test for fetching routine data from HTTP request
- *
- * @package PhpMyAdmin-test
- */
-class PMA_RTN_GetDataFromRequest_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Set up
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        global $cfg;
-
-        $cfg['ShowFunctionFields'] = false;
-
-        $GLOBALS['PMA_Types'] = new TypesMySQL();
-    }
-
-    /**
-     * Test for PMA_RTN_getDataFromRequest
-     *
-     * @param array $in  Input
-     * @param array $out Expected output
-     *
-     * @return void
-     *
-     * @dataProvider provider
-     */
-    public function testgetDataFromRequest($in, $out)
-    {
-        global $_REQUEST;
-
-        unset($_REQUEST);
-        foreach ($in as $key => $value) {
-            if ($value !== '') {
-                $_REQUEST[$key] = $value;
-            }
-        }
-        PMA_RTN_setGlobals();
-        $this->assertEquals($out, PMA_RTN_getDataFromRequest());
-    }
-
-    /**
-     * Data provider for testgetDataFromRequest
-     *
-     * @return array
-     */
-    public function provider()
-    {
-        return array(
-            array(
-                array(
-                    'item_name'                 => '',
-                    'item_original_name'        => '',
-                    'item_returnlength'         => '',
-                    'item_returnopts_num'       => '',
-                    'item_returnopts_text'      => '',
-                    'item_definition'           => '',
-                    'item_comment'              => '',
-                    'item_definer'              => '',
-                    'item_type'                 => '',
-                    'item_type_toggle'          => '',
-                    'item_original_type'        => '',
-                    'item_param_dir'            => '',
-                    'item_param_name'           => '',
-                    'item_param_type'           => '',
-                    'item_param_length'         => '',
-                    'item_param_opts_num'       => '',
-                    'item_param_opts_text'      => '',
-                    'item_returntype'           => '',
-                    'item_isdeterministic'      => '',
-                    'item_securitytype'         => '',
-                    'item_sqldataaccess'        => ''
-                ),
-                array(
-                    'item_name'                 => '',
-                    'item_original_name'        => '',
-                    'item_returnlength'         => '',
-                    'item_returnopts_num'       => '',
-                    'item_returnopts_text'      => '',
-                    'item_definition'           => '',
-                    'item_comment'              => '',
-                    'item_definer'              => '',
-                    'item_type'                 => 'PROCEDURE',
-                    'item_type_toggle'          => 'FUNCTION',
-                    'item_original_type'        => 'PROCEDURE',
-                    'item_num_params'           => 0,
-                    'item_param_dir'            => array(),
-                    'item_param_name'           => array(),
-                    'item_param_type'           => array(),
-                    'item_param_length'         => array(),
-                    'item_param_opts_num'       => array(),
-                    'item_param_opts_text'      => array(),
-                    'item_returntype'           => '',
-                    'item_isdeterministic'      => '',
-                    'item_securitytype_definer' => '',
-                    'item_securitytype_invoker' => '',
-                    'item_sqldataaccess'        => ''
-                )
-            ),
-            array(
-                array(
-                    'item_name'                 => 'proc2',
-                    'item_original_name'        => 'proc',
-                    'item_returnlength'         => '',
-                    'item_returnopts_num'       => '',
-                    'item_returnopts_text'      => '',
-                    'item_definition'           => 'SELECT NULL',
-                    'item_comment'              => 'some text',
-                    'item_definer'              => 'root@localhost',
-                    'item_type'                 => 'PROCEDURE',
-                    'item_type_toggle'          => 'FUNCTION',
-                    'item_original_type'        => 'PROCEDURE',
-                    'item_param_dir'            => array(0 => 'IN', 1 => 'FAIL'),
-                    'item_param_name'           => array(0 => 'bar', 1 => 'baz'),
-                    'item_param_type'           => array(0 => 'INT', 1 => 'FAIL'),
-                    'item_param_length'         => array(0 => '20', 1 => ''),
-                    'item_param_opts_num'       => array(0 => 'UNSIGNED', 1 => ''),
-                    'item_param_opts_text'      => array(0 => '', 1 => 'latin1'),
-                    'item_returntype'           => '',
-                    'item_isdeterministic'      => 'ON',
-                    'item_securitytype'         => 'INVOKER',
-                    'item_sqldataaccess'        => 'NO SQL'
-                ),
-                array(
-                    'item_name'                 => 'proc2',
-                    'item_original_name'        => 'proc',
-                    'item_returnlength'         => '',
-                    'item_returnopts_num'       => '',
-                    'item_returnopts_text'      => '',
-                    'item_definition'           => 'SELECT NULL',
-                    'item_comment'              => 'some text',
-                    'item_definer'              => 'root@localhost',
-                    'item_type'                 => 'PROCEDURE',
-                    'item_type_toggle'          => 'FUNCTION',
-                    'item_original_type'        => 'PROCEDURE',
-                    'item_num_params'           => 2,
-                    'item_param_dir'            => array(0 => 'IN', 1 => ''),
-                    'item_param_name'           => array(0 => 'bar', 1 => 'baz'),
-                    'item_param_type'           => array(0 => 'INT', 1 => ''),
-                    'item_param_length'         => array(0 => '20', 1 => ''),
-                    'item_param_opts_num'       => array(0 => 'UNSIGNED', 1 => ''),
-                    'item_param_opts_text'      => array(0 => '', 1 => 'latin1'),
-                    'item_returntype'           => '',
-                    'item_isdeterministic'      => ' checked=\'checked\'',
-                    'item_securitytype_definer' => '',
-                    'item_securitytype_invoker' => ' selected=\'selected\'',
-                    'item_sqldataaccess'        => 'NO SQL'
-                )
-            ),
-            array(
-                array(
-                    'item_name'                 => 'func2',
-                    'item_original_name'        => 'func',
-                    'item_returnlength'         => '20',
-                    'item_returnopts_num'       => '',
-                    'item_returnopts_text'      => 'CHARSET utf8',
-                    'item_definition'           => 'SELECT NULL',
-                    'item_comment'              => 'some text',
-                    'item_definer'              => 'root@localhost',
-                    'item_type'                 => 'FUNCTION',
-                    'item_type_toggle'          => 'PROCEDURE',
-                    'item_original_type'        => 'FUNCTION',
-                    'item_param_dir'            => array(0 => '', 1 => ''),
-                    'item_param_name'           => array(0 => 'bar', 1 => 'baz'),
-                    'item_param_type'           => array(
-                        0 => '<s>XSS</s>',
-                        1 => 'TEXT'
-                    ),
-                    'item_param_length'         => array(0 => '10,10', 1 => ''),
-                    'item_param_opts_num'       => array(0 => 'UNSIGNED', 1 => ''),
-                    'item_param_opts_text'      => array(0 => '', 1 => 'utf8'),
-                    'item_returntype'           => 'VARCHAR',
-                    'item_isdeterministic'      => '',
-                    'item_securitytype'         => 'DEFINER',
-                    'item_sqldataaccess'        => ''
-                ),
-                array(
-                    'item_name'                 => 'func2',
-                    'item_original_name'        => 'func',
-                    'item_returnlength'         => '20',
-                    'item_returnopts_num'       => '',
-                    'item_returnopts_text'      => 'CHARSET utf8',
-                    'item_definition'           => 'SELECT NULL',
-                    'item_comment'              => 'some text',
-                    'item_definer'              => 'root@localhost',
-                    'item_type'                 => 'FUNCTION',
-                    'item_type_toggle'          => 'PROCEDURE',
-                    'item_original_type'        => 'FUNCTION',
-                    'item_num_params'           => '2',
-                    'item_param_dir'            => array(),
-                    'item_param_name'           => array(0 => 'bar', 1 => 'baz'),
-                    'item_param_type'           => array(0 => '', 1 => 'TEXT'),
-                    'item_param_length'         => array(0 => '10,10', 1 => ''),
-                    'item_param_opts_num'       => array(0 => 'UNSIGNED', 1 => ''),
-                    'item_param_opts_text'      => array(0 => '', 1 => 'utf8'),
-                    'item_returntype'           => 'VARCHAR',
-                    'item_isdeterministic'      => '',
-                    'item_securitytype_definer' => ' selected=\'selected\'',
-                    'item_securitytype_invoker' => '',
-                    'item_sqldataaccess'        => ''
-                )
-            ),
-        );
-    }
-}
diff --git a/#pma/test/libraries/rte/PMA_RTN_getEditorForm_test.php b/#pma/test/libraries/rte/PMA_RTN_getEditorForm_test.php
deleted file mode 100644
index 0f5cbd21..00000000
--- a/#pma/test/libraries/rte/PMA_RTN_getEditorForm_test.php
+++ /dev/null
@@ -1,653 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Test for generating routine editor
- *
- * @package PhpMyAdmin-test
- */
-
-use PMA\libraries\Theme;
-use PMA\libraries\TypesMySQL;
-
-$GLOBALS['server'] = 0;
-
-require_once 'libraries/url_generating.lib.php';
-
-
-require_once 'libraries/database_interface.inc.php';
-
-require_once 'libraries/mysql_charsets.inc.php';
-/*
- * Include to test.
- */
-require_once 'libraries/rte/rte_routines.lib.php';
-
-/**
- * Test for generating routine editor
- *
- * @package PhpMyAdmin-test
- */
-class PMA_RTN_GetEditorForm_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Set up
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        global $cfg;
-
-        $cfg['ShowFunctionFields'] = false;
-        $GLOBALS['server'] = 0;
-        $cfg['ServerDefault'] = 1;
-
-        $GLOBALS['PMA_Types'] = new TypesMySQL();
-        $_SESSION['PMA_Theme'] = new Theme();
-        $GLOBALS['pmaThemePath'] = $_SESSION['PMA_Theme']->getPath();
-        $GLOBALS['pmaThemeImage'] = 'theme/';
-
-    }
-
-    /**
-     * Test for PMA_RTN_getParameterRow
-     *
-     * @return void
-     */
-    public function testgetParameterRowEmpty()
-    {
-        $GLOBALS['is_ajax_request'] = false;
-        PMA_RTN_setGlobals();
-        $this->assertEquals('', PMA_RTN_getParameterRow(array(), 0));
-    }
-
-    /**
-     * Test for PMA_RTN_getParameterRow
-     *
-     * @param array $data    Data for routine
-     * @param mixed $index   Index
-     * @param array $matcher Matcher
-     *
-     * @return void
-     *
-     * @depends testgetParameterRowEmpty
-     * @dataProvider providerRow
-     */
-    public function testgetParameterRow($data, $index, $matcher)
-    {
-        $GLOBALS['is_ajax_request'] = false;
-        PMA_RTN_setGlobals();
-        $this->assertContains(
-            $matcher,
-            PMA_RTN_getParameterRow($data, $index)
-        );
-    }
-
-    /**
-     * Data provider for testgetParameterRow
-     *
-     * @return array
-     */
-    public function providerRow()
-    {
-        $data = array(
-            'item_name'                 => '',
-            'item_original_name'        => '',
-            'item_returnlength'         => '',
-            'item_returnopts_num'       => '',
-            'item_returnopts_text'      => '',
-            'item_definition'           => '',
-            'item_comment'              => '',
-            'item_definer'              => '',
-            'item_type'                 => 'PROCEDURE',
-            'item_type_toggle'          => 'FUNCTION',
-            'item_original_type'        => 'PROCEDURE',
-            'item_num_params'           => 1,
-            'item_param_dir'            => array(0 => 'IN'),
-            'item_param_name'           => array(0 => 'foo'),
-            'item_param_type'           => array(0 => 'INT'),
-            'item_param_length'         => array(0 => ''),
-            'item_param_opts_num'       => array(0 => 'UNSIGNED'),
-            'item_param_opts_text'      => array(0 => ''),
-            'item_returntype'           => '',
-            'item_isdeterministic'      => '',
-            'item_securitytype_definer' => '',
-            'item_securitytype_invoker' => '',
-            'item_sqldataaccess'        => ''
-        );
-
-        return array(
-            array(
-                $data,
-                0,
-                "<select name='item_param_dir[0]'"
-            ),
-            array(
-                $data,
-                0,
-                "<input name='item_param_name[0]'"
-            ),
-            array(
-                $data,
-                0,
-                "<select name='item_param_type[0]'"
-            ),
-            array(
-                $data,
-                0,
-                "<select name='item_param_opts_num[0]'"
-            ),
-            array(
-                $data,
-                0,
-                "<a href='#' class='routine_param_remove_anchor'"
-            ),
-        );
-    }
-
-    /**
-     * Test for PMA_RTN_getParameterRow
-     *
-     * @param array $data    Data for routine
-     * @param array $matcher Matcher
-     *
-     * @return void
-     *
-     * @depends testgetParameterRow
-     * @dataProvider providerRowAjax
-     */
-    public function testgetParameterRowAjax($data, $matcher)
-    {
-        $GLOBALS['is_ajax_request'] = false;
-        PMA_RTN_setGlobals();
-        $this->assertContains(
-            $matcher,
-            PMA_RTN_getParameterRow($data)
-        );
-    }
-
-    /**
-     * Data provider for testgetParameterRowAjax
-     *
-     * @return array
-     */
-    public function providerRowAjax()
-    {
-        $data = array(
-            'item_name'                 => '',
-            'item_original_name'        => '',
-            'item_returnlength'         => '',
-            'item_returnopts_num'       => '',
-            'item_returnopts_text'      => '',
-            'item_definition'           => '',
-            'item_comment'              => '',
-            'item_definer'              => '',
-            'item_type'                 => 'PROCEDURE',
-            'item_type_toggle'          => 'FUNCTION',
-            'item_original_type'        => 'PROCEDURE',
-            'item_num_params'           => 1,
-            'item_param_dir'            => array(0 => 'IN'),
-            'item_param_name'           => array(0 => 'foo'),
-            'item_param_type'           => array(0 => 'INT'),
-            'item_param_length'         => array(0 => ''),
-            'item_param_opts_num'       => array(0 => 'UNSIGNED'),
-            'item_param_opts_text'      => array(0 => ''),
-            'item_returntype'           => '',
-            'item_isdeterministic'      => '',
-            'item_securitytype_definer' => '',
-            'item_securitytype_invoker' => '',
-            'item_sqldataaccess'        => ''
-        );
-
-        return array(
-            array(
-                $data,
-                "<select name='item_param_dir[%s]'"
-            ),
-            array(
-                $data,
-                "<input name='item_param_name[%s]'"
-            ),
-            array(
-                $data,
-                "<select name='item_param_dir[%s]'"
-            ),
-            array(
-                $data,
-                "<select name='item_param_opts_num[%s]'"
-            ),
-            array(
-                $data,
-                "<a href='#' class='routine_param_remove_anchor'"
-            )
-        );
-    }
-
-    /**
-     * Test for PMA_RTN_getEditorForm
-     *
-     * @param array $data    Data for routine
-     * @param array $matcher Matcher
-     *
-     * @return void
-     *
-     * @depends testgetParameterRowAjax
-     * @dataProvider providerEditor1
-     */
-    public function testgetEditorForm1($data, $matcher)
-    {
-        $GLOBALS['is_ajax_request'] = false;
-        PMA_RTN_setGlobals();
-        $this->assertContains(
-            $matcher,
-            PMA_RTN_getEditorForm('add', '', $data)
-        );
-    }
-
-    /**
-     * Data provider for testgetEditorForm1
-     *
-     * @return array
-     */
-    public function providerEditor1()
-    {
-        $data = array(
-            'item_name'                 => '',
-            'item_original_name'        => '',
-            'item_returnlength'         => '',
-            'item_returnopts_num'       => '',
-            'item_returnopts_text'      => '',
-            'item_definition'           => '',
-            'item_comment'              => '',
-            'item_definer'              => '',
-            'item_type'                 => 'PROCEDURE',
-            'item_type_toggle'          => 'FUNCTION',
-            'item_original_type'        => 'PROCEDURE',
-            'item_num_params'           => 0,
-            'item_param_dir'            => array(),
-            'item_param_name'           => array(),
-            'item_param_type'           => array(),
-            'item_param_length'         => array(),
-            'item_param_opts_num'       => array(),
-            'item_param_opts_text'      => array(),
-            'item_returntype'           => '',
-            'item_isdeterministic'      => '',
-            'item_securitytype_definer' => '',
-            'item_securitytype_invoker' => '',
-            'item_sqldataaccess'        => ''
-        );
-
-        return array(
-            array(
-                $data,
-                "<input name='add_item'"
-            ),
-            array(
-                $data,
-                "<input type='text' name='item_name'"
-            ),
-            array(
-                $data,
-                "<input name='item_type'"
-            ),
-            array(
-                $data,
-                "name='routine_changetype'"
-            ),
-            array(
-                $data,
-                "name='routine_addparameter'"
-            ),
-            array(
-                $data,
-                "name='routine_removeparameter'"
-            ),
-            array(
-                $data,
-                "select name='item_returntype'"
-            ),
-            array(
-                $data,
-                "name='item_returnlength'"
-            ),
-            array(
-                $data,
-                "select name='item_returnopts_num'"
-            ),
-            array(
-                $data,
-                "<textarea name='item_definition'"
-            ),
-            array(
-                $data,
-                "name='item_isdeterministic'"
-            ),
-            array(
-                $data,
-                "name='item_definer'"
-            ),
-            array(
-                $data,
-                "select name='item_securitytype'"
-            ),
-            array(
-                $data,
-                "select name='item_sqldataaccess'"
-            ),
-            array(
-                $data,
-                "name='item_comment'"
-            ),
-            array(
-                $data,
-                "name='editor_process_add'"
-            )
-        );
-    }
-
-    /**
-     * Test for PMA_RTN_getEditorForm
-     *
-     * @param array $data    Data for routine
-     * @param array $matcher Matcher
-     *
-     * @return void
-     *
-     * @depends testgetParameterRowAjax
-     * @dataProvider providerEditor2
-     */
-    public function testgetEditorForm2($data, $matcher)
-    {
-        $GLOBALS['is_ajax_request'] = false;
-        PMA_RTN_setGlobals();
-        $this->assertContains(
-            $matcher,
-            PMA_RTN_getEditorForm('edit', 'change', $data)
-        );
-    }
-
-    /**
-     * Data provider for testgetEditorForm2
-     *
-     * @return array
-     */
-    public function providerEditor2()
-    {
-        $data = array(
-            'item_name'                 => 'foo',
-            'item_original_name'        => 'bar',
-            'item_returnlength'         => '',
-            'item_returnopts_num'       => '',
-            'item_returnopts_text'      => '',
-            'item_definition'           => 'SELECT 1',
-            'item_comment'              => '',
-            'item_definer'              => '',
-            'item_type'                 => 'PROCEDURE',
-            'item_type_toggle'          => 'FUNCTION',
-            'item_original_type'        => 'PROCEDURE',
-            'item_num_params'           => 1,
-            'item_param_dir'            => array(0 => 'IN'),
-            'item_param_name'           => array(0 => 'baz'),
-            'item_param_type'           => array(0 => 'INT'),
-            'item_param_length'         => array(0 => '20'),
-            'item_param_opts_num'       => array(0 => 'UNSIGNED'),
-            'item_param_opts_text'      => array(0 => ''),
-            'item_returntype'           => '',
-            'item_isdeterministic'      => '',
-            'item_securitytype_definer' => '',
-            'item_securitytype_invoker' => '',
-            'item_sqldataaccess'        => 'NO SQL'
-        );
-
-        return array(
-            array(
-                $data,
-                "name='edit_item'"
-            ),
-            array(
-                $data,
-                "name='item_name'"
-            ),
-            array(
-                $data,
-                "<input name='item_type' type='hidden' value='FUNCTION'"
-            ),
-            array(
-                $data,
-                "name='routine_changetype'"
-            ),
-            array(
-                $data,
-                "name='routine_addparameter'"
-            ),
-            array(
-                $data,
-                "name='routine_removeparameter'"
-            ),
-            array(
-                $data,
-                "name='item_returntype'"
-            ),
-            array(
-                $data,
-                "name='item_returnlength'"
-            ),
-            array(
-                $data,
-                "name='item_returnopts_num'"
-            ),
-            array(
-                $data,
-                "<textarea name='item_definition'"
-            ),
-            array(
-                $data,
-                "name='item_isdeterministic'"
-            ),
-            array(
-                $data,
-                "name='item_definer'"
-            ),
-            array(
-                $data,
-                "<select name='item_securitytype'"
-            ),
-            array(
-                $data,
-                "<select name='item_sqldataaccess'"
-            ),
-            array(
-                $data,
-                "name='item_comment'"
-            ),
-            array(
-                $data,
-                "name='editor_process_edit'"
-            )
-        );
-    }
-
-    /**
-     * Test for PMA_RTN_getEditorForm
-     *
-     * @param array $data    Data for routine
-     * @param array $matcher Matcher
-     *
-     * @return void
-     *
-     * @depends testgetParameterRowAjax
-     * @dataProvider providerEditor3
-     */
-    public function testgetEditorForm3($data, $matcher)
-    {
-        $GLOBALS['is_ajax_request'] = true;
-        PMA_RTN_setGlobals();
-        $this->assertContains(
-            $matcher,
-            PMA_RTN_getEditorForm('edit', 'remove', $data)
-        );
-    }
-
-    /**
-     * Data provider for testgetEditorForm3
-     *
-     * @return array
-     */
-    public function providerEditor3()
-    {
-        $data = array(
-            'item_name'                 => 'foo',
-            'item_original_name'        => 'bar',
-            'item_returnlength'         => '',
-            'item_returnopts_num'       => 'UNSIGNED',
-            'item_returnopts_text'      => '',
-            'item_definition'           => 'SELECT 1',
-            'item_comment'              => '',
-            'item_definer'              => '',
-            'item_type'                 => 'FUNCTION',
-            'item_type_toggle'          => 'PROCEDURE',
-            'item_original_type'        => 'FUNCTION',
-            'item_num_params'           => 1,
-            'item_param_dir'            => array(0 => ''),
-            'item_param_name'           => array(0 => 'baz'),
-            'item_param_type'           => array(0 => 'INT'),
-            'item_param_length'         => array(0 => '20'),
-            'item_param_opts_num'       => array(0 => 'UNSIGNED'),
-            'item_param_opts_text'      => array(0 => ''),
-            'item_returntype'           => 'INT',
-            'item_isdeterministic'      => '',
-            'item_securitytype_definer' => '',
-            'item_securitytype_invoker' => '',
-            'item_sqldataaccess'        => 'NO SQL'
-        );
-
-        return array(
-            array(
-                $data,
-                "name='edit_item'"
-            ),
-            array(
-                $data,
-                "name='item_name'"
-            ),
-            array(
-                $data,
-                "<select name='item_type'"
-            ),
-            array(
-                $data,
-                "name='routine_addparameter'"
-            ),
-            array(
-                $data,
-                "name='routine_removeparameter'"
-            ),
-            array(
-                $data,
-                "<select name='item_returntype'"
-            ),
-            array(
-                $data,
-                "name='item_returnlength'"
-            ),
-            array(
-                $data,
-                "<select name='item_returnopts_num'"
-            ),
-            array(
-                $data,
-                "<textarea name='item_definition'"
-            ),
-            array(
-                $data,
-                "name='item_isdeterministic'"
-            ),
-            array(
-                $data,
-                "name='item_definer'"
-            ),
-            array(
-                $data,
-                "<select name='item_securitytype'"
-            ),
-            array(
-                $data,
-                "<select name='item_sqldataaccess'"
-            ),
-            array(
-                $data,
-                "name='item_comment'"
-            ),
-            array(
-                $data,
-                "name='ajax_request'"
-            ),
-            array(
-                $data,
-                "name='editor_process_edit'"
-            ),
-        );
-    }
-
-    /**
-     * Test for PMA_RTN_getEditorForm
-     *
-     * @param array $data    Data for routine
-     * @param array $matcher Matcher
-     *
-     * @return void
-     *
-     * @depends testgetParameterRowAjax
-     * @dataProvider providerEditor4
-     */
-    public function testgetEditorForm4($data, $matcher)
-    {
-        $GLOBALS['is_ajax_request'] = false;
-        PMA_RTN_setGlobals();
-        $this->assertContains(
-            $matcher,
-            PMA_RTN_getEditorForm('edit', 'change', $data)
-        );
-    }
-
-    /**
-     * Data provider for testgetEditorForm4
-     *
-     * @return array
-     */
-    public function providerEditor4()
-    {
-        $data = array(
-            'item_name'                 => 'foo',
-            'item_original_name'        => 'bar',
-            'item_returnlength'         => '',
-            'item_returnopts_num'       => '',
-            'item_returnopts_text'      => '',
-            'item_definition'           => 'SELECT 1',
-            'item_comment'              => '',
-            'item_definer'              => '',
-            'item_type'                 => 'FUNCTION',
-            'item_type_toggle'          => 'PROCEDURE',
-            'item_original_type'        => 'PROCEDURE',
-            'item_num_params'           => 1,
-            'item_param_dir'            => array(0 => 'IN'),
-            'item_param_name'           => array(0 => 'baz'),
-            'item_param_type'           => array(0 => 'INT'),
-            'item_param_length'         => array(0 => '20'),
-            'item_param_opts_num'       => array(0 => 'UNSIGNED'),
-            'item_param_opts_text'      => array(0 => ''),
-            'item_returntype'           => '',
-            'item_isdeterministic'      => '',
-            'item_securitytype_definer' => '',
-            'item_securitytype_invoker' => '',
-            'item_sqldataaccess'        => 'NO SQL'
-        );
-
-        return array(
-            array(
-                $data,
-                "<input name='item_type' type='hidden' value='PROCEDURE'"
-            ),
-        );
-    }
-}
diff --git a/#pma/test/libraries/rte/PMA_RTN_getExecuteForm_test.php b/#pma/test/libraries/rte/PMA_RTN_getExecuteForm_test.php
deleted file mode 100644
index 9817baa3..00000000
--- a/#pma/test/libraries/rte/PMA_RTN_getExecuteForm_test.php
+++ /dev/null
@@ -1,294 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Test for generating routine execution dialog
- *
- * @package PhpMyAdmin-test
- */
-
-use PMA\libraries\TypesMySQL;
-
-$GLOBALS['server'] = 0;
-
-require_once 'libraries/url_generating.lib.php';
-
-require_once 'libraries/database_interface.inc.php';
-
-/*
- * Include to test.
- */
-require_once 'libraries/rte/rte_routines.lib.php';
-
-/**
- * Test for generating routine execution dialog
- *
- * @package PhpMyAdmin-test
- */
-class PMA_RTN_GetExecuteForm_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Set up
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        global $cfg;
-        $GLOBALS['PMA_Types'] = new TypesMySQL();
-        $GLOBALS['server'] = 0;
-        $cfg['ServerDefault'] = 1;
-        $GLOBALS['cfg']['ServerDefault'] = '';
-        $cfg['ShowFunctionFields'] = true;
-        $cfg['DefaultFunctions']['FUNC_NUMBER'] = '';
-        $cfg['DefaultFunctions']['FUNC_DATE'] = '';
-        $cfg['DefaultFunctions']['FUNC_SPATIAL'] = 'GeomFromText';
-    }
-
-    /**
-     * Test for PMA_RTN_getExecuteForm
-     *
-     * @param array $data    Data for routine
-     * @param array $matcher Matcher
-     *
-     * @return void
-     *
-     * @dataProvider provider1
-     */
-    public function testgetExecuteForm1($data, $matcher)
-    {
-        $GLOBALS['is_ajax_request'] = false;
-        PMA_RTN_setGlobals();
-        $this->assertContains(
-            $matcher,
-            PMA_RTN_getExecuteForm($data)
-        );
-    }
-
-    /**
-     * Data provider for testgetExecuteForm1
-     *
-     * @return array
-     */
-    public function provider1()
-    {
-        $data = array(
-            'item_name'                 => 'foo',
-            'item_returnlength'         => '',
-            'item_returnopts_num'       => '',
-            'item_returnopts_text'      => '',
-            'item_definition'           => 'SELECT 1;',
-            'item_comment'              => '',
-            'item_definer'              => '',
-            'item_type'                 => 'PROCEDURE',
-            'item_num_params'           => 6,
-            'item_param_dir'            => array(
-                0 => 'IN',
-                1 => 'OUT',
-                2 => 'IN',
-                3 => 'IN',
-                4 => 'IN',
-                5 => 'IN'
-            ),
-            'item_param_name'           => array(
-                0 => 'foo',
-                1 => 'foa',
-                2 => 'fob',
-                3 => 'foc',
-                4 => 'fod',
-                5 => 'foe'
-            ),
-            'item_param_type'           => array(
-                0 => 'DATE',
-                1 => 'VARCHAR',
-                2 => 'DATETIME',
-                3 => 'GEOMETRY',
-                4 => 'ENUM',
-                5 => 'SET'
-            ),
-            'item_param_length'         => array(
-                0 => '',
-                1 => '22',
-                2 => '',
-                3 => '',
-                4 => "'a','b'",
-                5 => "'a','b'"
-            ),
-            'item_param_length_arr'     => array(
-                0 => array(),
-                1 => array('22'),
-                2 => array(),
-                3 => array(),
-                4 => array("'a'", "'b'"),
-                5 => array("'a'", "'b'")
-            ),
-            'item_param_opts_num'       => array(
-                0 => '',
-                1 => '',
-                2 => '',
-                3 => '',
-                4 => '',
-                5 => ''
-            ),
-            'item_param_opts_text'      => array(
-                0 => '',
-                1 => 'utf8',
-                2 => '',
-                3 => '',
-                4 => '',
-                5 => ''
-            ),
-            'item_returntype'           => '',
-            'item_isdeterministic'      => '',
-            'item_securitytype_definer' => '',
-            'item_securitytype_invoker' => '',
-            'item_sqldataaccess'        => ''
-        );
-
-        return array(
-            array(
-                $data,
-                "name='item_name'"
-            ),
-            array(
-                $data,
-                "name='funcs[foo]'"
-            ),
-            array(
-                $data,
-                "<input class='datefield' type='text' name='params[foo]' />"
-            ),
-            array(
-                $data,
-                "name='funcs[fob]'"
-            ),
-            array(
-                $data,
-                "<input class='datetimefield' type='text' name='params[fob]'"
-            ),
-            array(
-                $data,
-                "name='params[fod][]'"
-            ),
-            array(
-                $data,
-                "name='params[foe][]'"
-            ),
-            array(
-                $data,
-                "name='execute_routine'"
-            ),
-        );
-    }
-
-    /**
-     * Test for PMA_RTN_getExecuteForm
-     *
-     * @param array $data    Data for routine
-     * @param array $matcher Matcher
-     *
-     * @return void
-     *
-     * @dataProvider provider2
-     */
-    public function testgetExecuteForm2($data, $matcher)
-    {
-        $GLOBALS['is_ajax_request'] = true;
-        PMA_RTN_setGlobals();
-        $this->assertContains(
-            $matcher,
-            PMA_RTN_getExecuteForm($data)
-        );
-    }
-
-    /**
-     * Data provider for testgetExecuteForm2
-     *
-     * @return array
-     */
-    public function provider2()
-    {
-        $data = array(
-            'item_name'                 => 'foo',
-            'item_returnlength'         => '',
-            'item_returnopts_num'       => '',
-            'item_returnopts_text'      => '',
-            'item_definition'           => 'SELECT 1;',
-            'item_comment'              => '',
-            'item_definer'              => '',
-            'item_type'                 => 'PROCEDURE',
-            'item_num_params'           => 6,
-            'item_param_dir'            => array(
-                0 => 'IN',
-                1 => 'OUT',
-                2 => 'IN',
-                3 => 'IN',
-                4 => 'IN',
-                5 => 'IN'
-            ),
-            'item_param_name'           => array(
-                0 => 'foo',
-                1 => 'foa',
-                2 => 'fob',
-                3 => 'foc',
-                4 => 'fod',
-                5 => 'foe'
-            ),
-            'item_param_type'           => array(
-                0 => 'DATE',
-                1 => 'VARCHAR',
-                2 => 'DATETIME',
-                3 => 'GEOMETRY',
-                4 => 'ENUM',
-                5 => 'SET'
-            ),
-            'item_param_length'         => array(
-                0 => '',
-                1 => '22',
-                2 => '',
-                3 => '',
-                4 => "'a','b'",
-                5 => "'a','b'"
-            ),
-            'item_param_length_arr'     => array(
-                0 => array(),
-                1 => array('22'),
-                2 => array(),
-                3 => array(),
-                4 => array("'a'", "'b'"),
-                5 => array("'a'", "'b'")
-            ),
-            'item_param_opts_num'       => array(
-                0 => '',
-                1 => '',
-                2 => '',
-                3 => '',
-                4 => '',
-                5 => ''
-            ),
-            'item_param_opts_text'      => array(
-                0 => '',
-                1 => 'utf8',
-                2 => '',
-                3 => '',
-                4 => '',
-                5 => ''
-            ),
-            'item_returntype'           => '',
-            'item_isdeterministic'      => '',
-            'item_securitytype_definer' => '',
-            'item_securitytype_invoker' => '',
-            'item_sqldataaccess'        => ''
-        );
-
-        return array(
-            array(
-                $data,
-                "name='execute_routine'"
-            ),
-            array(
-                $data,
-                "name='ajax_request'"
-            ),
-        );
-    }
-}
diff --git a/#pma/test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php b/#pma/test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php
deleted file mode 100644
index a1239444..00000000
--- a/#pma/test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php
+++ /dev/null
@@ -1,290 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Test for generating CREATE [PROCEDURE|FUNCTION] query from HTTP request
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Needed for backquote() and PMA_RTN_getQueryFromRequest()
- */
-
-use PMA\libraries\TypesMySQL;
-
-
-
-/*
- * Include to test.
- */
-require_once 'libraries/rte/rte_routines.lib.php';
-
-/**
- * Test for generating CREATE [PROCEDURE|FUNCTION] query from HTTP request
- *
- * @package PhpMyAdmin-test
- */
-class PMA_RTN_GetQueryFromRequest_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Test for PMA_RTN_getQueryFromRequest
-     *
-     * @param array  $request Request
-     * @param string $query   Query
-     * @param int    $num_err Error number
-     *
-     * @return void
-     *
-     * @dataProvider provider
-     */
-    public function testgetQueryFromRequest($request, $query, $num_err)
-    {
-        global $_REQUEST, $errors, $cfg;
-
-        $cfg['ShowFunctionFields'] = false;
-
-        $GLOBALS['PMA_Types'] = new TypesMySQL();
-
-        $errors = array();
-        PMA_RTN_setGlobals();
-
-        $old_dbi = isset($GLOBALS['dbi']) ? $GLOBALS['dbi'] : null;
-        $dbi = $this->getMockBuilder('PMA\libraries\DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $dbi->expects($this->any())
-            ->method('escapeString')
-            ->will(
-                $this->returnValueMap(
-                    array(
-                        array('foo', null, 'foo'),
-                        array("foo's bar", null, "foo\'s bar"),
-                        array('', null, '')
-                    )
-                )
-            );
-        $GLOBALS['dbi'] = $dbi;
-
-        unset($_REQUEST);
-        $_REQUEST = $request;
-        $this->assertEquals($query, PMA_RTN_getQueryFromRequest());
-        $this->assertEquals($num_err, count($errors));
-
-        // reset
-        $GLOBALS['dbi'] = $old_dbi;
-    }
-
-    /**
-     * Data provider for testgetQueryFromRequest
-     *
-     * @return array
-     */
-    public function provider()
-    {
-        return array(
-            // Testing success
-            array(
-                array(
-                    'item_name'                 => 'p r o c',
-                    'item_returnlength'         => '',
-                    'item_returnopts_num'       => '',
-                    'item_returnopts_text'      => '',
-                    'item_definition'           => 'SELECT 0;',
-                    'item_comment'              => 'foo',
-                    'item_definer'              => 'me@home',
-                    'item_type'                 => 'PROCEDURE',
-                    'item_num_params'           => '0',
-                    'item_param_dir'            => '',
-                    'item_param_name'           => '',
-                    'item_param_type'           => '',
-                    'item_param_length'         => '',
-                    'item_param_opts_num'       => '',
-                    'item_param_opts_text'      => '',
-                    'item_returntype'           => '',
-                    'item_isdeterministic'      => '',
-                    'item_securitytype'         => 'INVOKER',
-                    'item_sqldataaccess'        => 'NO SQL'
-                ),
-                'CREATE DEFINER=`me`@`home` PROCEDURE `p r o c`() COMMENT \'foo\' '
-                . 'DETERMINISTIC NO SQL SQL SECURITY INVOKER SELECT 0;',
-                0
-            ),
-            array(
-                array(
-                    'item_name'                 => 'pr``oc',
-                    'item_returnlength'         => '',
-                    'item_returnopts_num'       => '',
-                    'item_returnopts_text'      => '',
-                    'item_definition'           => 'SELECT \'foobar\';',
-                    'item_comment'              => '',
-                    'item_definer'              => 'someuser@somehost',
-                    'item_type'                 => 'PROCEDURE',
-                    'item_num_params'           => '2',
-                    'item_param_dir'            => array('IN', 'INOUT'),
-                    'item_param_name'           => array('pa`ram', 'par 2'),
-                    'item_param_type'           => array('INT', 'ENUM'),
-                    'item_param_length'         => array('10', '\'a\', \'b\''),
-                    'item_param_opts_num'       => array('ZEROFILL', ''),
-                    'item_param_opts_text'      => array('utf8', 'latin1'),
-                    'item_returntype'           => '',
-                    'item_securitytype'         => 'DEFINER',
-                    'item_sqldataaccess'        => 'foobar'
-                ),
-                'CREATE DEFINER=`someuser`@`somehost` PROCEDURE `pr````oc`'
-                . '(IN `pa``ram` INT(10) ZEROFILL, INOUT `par 2` ENUM(\'a\', \'b\')'
-                . ' CHARSET latin1) NOT DETERMINISTIC SQL SECURITY DEFINER SELECT '
-                . '\'foobar\';',
-                0
-            ),
-            array(
-                array(
-                    'item_name'                 => 'func\\',
-                    'item_returnlength'         => '5,5',
-                    'item_returnopts_num'       => 'UNSIGNED ZEROFILL',
-                    'item_returnopts_text'      => '',
-                    'item_definition'           => 'SELECT \'foobar\';',
-                    'item_comment'              => 'foo\'s bar',
-                    'item_definer'              => '',
-                    'item_type'                 => 'FUNCTION',
-                    'item_num_params'           => '1',
-                    'item_param_dir'            => '',
-                    'item_param_name'           => array('pa`ram'),
-                    'item_param_type'           => array('VARCHAR'),
-                    'item_param_length'         => array('45'),
-                    'item_param_opts_num'       => array(''),
-                    'item_param_opts_text'      => array('latin1'),
-                    'item_returntype'           => 'DECIMAL',
-                    'item_isdeterministic'      => 'ON',
-                    'item_securitytype'         => 'DEFINER',
-                    'item_sqldataaccess'        => 'READ SQL DATA'
-                ),
-                'CREATE FUNCTION `func\\`(`pa``ram` VARCHAR(45) CHARSET latin1) '
-                . 'RETURNS DECIMAL(5,5) UNSIGNED ZEROFILL COMMENT \'foo\\\'s bar\' '
-                . 'DETERMINISTIC SQL SECURITY DEFINER SELECT \'foobar\';',
-                0
-            ),
-            array(
-                array(
-                    'item_name'                 => 'func',
-                    'item_returnlength'         => '20',
-                    'item_returnopts_num'       => '',
-                    'item_returnopts_text'      => 'utf8',
-                    'item_definition'           => 'SELECT 0;',
-                    'item_comment'              => '',
-                    'item_definer'              => '',
-                    'item_type'                 => 'FUNCTION',
-                    'item_num_params'           => '1',
-                    'item_returntype'           => 'VARCHAR',
-                    'item_securitytype'         => 'DEFINER',
-                    'item_sqldataaccess'        => 'READ SQL DATA'
-                ),
-                'CREATE FUNCTION `func`() RETURNS VARCHAR(20) CHARSET utf8 NOT '
-                . 'DETERMINISTIC SQL SECURITY DEFINER SELECT 0;',
-                0
-            ),
-            // Testing failures
-            array(
-                array(
-                ),
-                'CREATE () NOT DETERMINISTIC ', // invalid query
-                3
-            ),
-            array(
-                array(
-                    'item_name'                 => 'proc',
-                    'item_returnlength'         => '',
-                    'item_returnopts_num'       => '',
-                    'item_returnopts_text'      => '',
-                    'item_definition'           => 'SELECT 0;',
-                    'item_comment'              => 'foo',
-                    'item_definer'              => 'mehome', // invalid definer format
-                    'item_type'                 => 'PROCEDURE',
-                    'item_num_params'           => '0',
-                    'item_param_dir'            => '',
-                    'item_param_name'           => '',
-                    'item_param_type'           => '',
-                    'item_param_length'         => '',
-                    'item_param_opts_num'       => '',
-                    'item_param_opts_text'      => '',
-                    'item_returntype'           => '',
-                    'item_isdeterministic'      => '',
-                    'item_securitytype'         => 'INVOKER',
-                    'item_sqldataaccess'        => 'NO SQL'
-                ),
-                'CREATE PROCEDURE `proc`() COMMENT \'foo\' DETERMINISTIC '
-                . 'NO SQL SQL SECURITY INVOKER SELECT 0;', // valid query
-                1
-            ),
-            array(
-                array(
-                    'item_name'                 => 'proc',
-                    'item_returnlength'         => '',
-                    'item_returnopts_num'       => '',
-                    'item_returnopts_text'      => '',
-                    'item_definition'           => 'SELECT 0;',
-                    'item_comment'              => '',
-                    'item_definer'              => '',
-                    'item_type'                 => 'PROCEDURE',
-                    'item_num_params'           => '2',
-                    'item_param_dir'            => array('FAIL', 'INOUT'), // invalid direction
-                    'item_param_name'           => array('pa`ram', 'goo'),
-                    'item_param_type'           => array('INT', 'ENUM'),
-                    'item_param_length'         => array('10', ''), // missing ENUM values
-                    'item_param_opts_num'       => array('ZEROFILL', ''),
-                    'item_param_opts_text'      => array('utf8', 'latin1'),
-                    'item_returntype'           => '',
-                    'item_securitytype'         => 'DEFINER',
-                    'item_sqldataaccess'        => 'foobar' // invalid, will just be ignored without throwing errors
-                ),
-                'CREATE PROCEDURE `proc`((10) ZEROFILL, '
-                . 'INOUT `goo` ENUM CHARSET latin1) NOT DETERMINISTIC '
-                . 'SQL SECURITY DEFINER SELECT 0;', // invalid query
-                2
-            ),
-            array(
-                array(
-                    'item_name'                 => 'func',
-                    'item_returnlength'         => '', // missing length for VARCHAR
-                    'item_returnopts_num'       => '',
-                    'item_returnopts_text'      => 'utf8',
-                    'item_definition'           => 'SELECT 0;',
-                    'item_comment'              => '',
-                    'item_definer'              => '',
-                    'item_type'                 => 'FUNCTION',
-                    'item_num_params'           => '2',
-                    'item_param_dir'            => array('IN'),
-                    'item_param_name'           => array(''), // missing name
-                    'item_param_type'           => array('INT'),
-                    'item_param_length'         => array('10'),
-                    'item_param_opts_num'       => array('ZEROFILL'),
-                    'item_param_opts_text'      => array('latin1'),
-                    'item_returntype'           => 'VARCHAR',
-                    'item_securitytype'         => 'DEFINER',
-                    'item_sqldataaccess'        => ''
-                ),
-                'CREATE FUNCTION `func`() RETURNS VARCHAR CHARSET utf8 NOT '
-                . 'DETERMINISTIC SQL SECURITY DEFINER SELECT 0;', // invalid query
-                2
-            ),
-            array(
-                array(
-                    'item_name'                 => 'func',
-                    'item_returnlength'         => '',
-                    'item_returnopts_num'       => '',
-                    'item_returnopts_text'      => '',
-                    'item_definition'           => 'SELECT 0;',
-                    'item_comment'              => '',
-                    'item_definer'              => '',
-                    'item_type'                 => 'FUNCTION',
-                    'item_num_params'           => '0',
-                    'item_returntype'           => 'FAIL', // invalid return type
-                    'item_securitytype'         => 'DEFINER',
-                    'item_sqldataaccess'        => ''
-                ),
-                'CREATE FUNCTION `func`()  NOT DETERMINISTIC SQL '
-                . 'SECURITY DEFINER SELECT 0;', // invalid query
-                1
-            ),
-        );
-    }
-}
diff --git a/#pma/test/libraries/rte/PMA_TRI_getDataFromRequest_test.php b/#pma/test/libraries/rte/PMA_TRI_getDataFromRequest_test.php
deleted file mode 100644
index d0c320e3..00000000
--- a/#pma/test/libraries/rte/PMA_TRI_getDataFromRequest_test.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Test for fetching trigger data from HTTP request
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-require_once 'libraries/rte/rte_triggers.lib.php';
-
-/**
- * Test for fetching trigger data from HTTP request
- *
- * @package PhpMyAdmin-test
- */
-class PMA_TRI_GetDataFromRequest_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Test for PMA_TRI_getDataFromRequest
-     *
-     * @param array $in  Input
-     * @param array $out Expected output
-     *
-     * @return void
-     *
-     * @dataProvider provider
-     */
-    public function testgetDataFromRequestEmpty($in, $out)
-    {
-        global $_REQUEST;
-
-        unset($_REQUEST);
-        foreach ($in as $key => $value) {
-            if ($value !== '') {
-                $_REQUEST[$key] = $value;
-            }
-        }
-        $this->assertEquals($out, PMA_TRI_getDataFromRequest());
-    }
-
-    /**
-     * Data provider for testgetDataFromRequestEmpty
-     *
-     * @return array
-     */
-    public function provider()
-    {
-        return array(
-            array(
-                array(
-                    'item_name'               => '',
-                    'item_table'              => '',
-                    'item_original_name'      => '',
-                    'item_action_timing'      => '',
-                    'item_event_manipulation' => '',
-                    'item_definition'         => '',
-                    'item_definer'            => ''
-                ),
-                array(
-                    'item_name'               => '',
-                    'item_table'              => '',
-                    'item_original_name'      => '',
-                    'item_action_timing'      => '',
-                    'item_event_manipulation' => '',
-                    'item_definition'         => '',
-                    'item_definer'            => ''
-                )
-            ),
-            array(
-                array(
-                    'item_name'               => 'foo',
-                    'item_table'              => 'foo',
-                    'item_original_name'      => 'foo',
-                    'item_action_timing'      => 'foo',
-                    'item_event_manipulation' => 'foo',
-                    'item_definition'         => 'foo',
-                    'item_definer'            => 'foo'
-                ),
-                array(
-                    'item_name'               => 'foo',
-                    'item_table'              => 'foo',
-                    'item_original_name'      => 'foo',
-                    'item_action_timing'      => 'foo',
-                    'item_event_manipulation' => 'foo',
-                    'item_definition'         => 'foo',
-                    'item_definer'            => 'foo'
-                )
-            )
-        );
-    }
-}
diff --git a/#pma/test/libraries/rte/PMA_TRI_getEditorForm_test.php b/#pma/test/libraries/rte/PMA_TRI_getEditorForm_test.php
deleted file mode 100644
index 6a068eda..00000000
--- a/#pma/test/libraries/rte/PMA_TRI_getEditorForm_test.php
+++ /dev/null
@@ -1,237 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Test for generating trigger editor
- *
- * @package PhpMyAdmin-test
- */
-
-require_once 'libraries/url_generating.lib.php';
-
-require_once 'libraries/database_interface.inc.php';
-
-/*
- * Include to test.
- */
-require_once 'libraries/rte/rte_triggers.lib.php';
-
-/**
- * Test for generating trigger editor
- *
- * @package PhpMyAdmin-test
- */
-class PMA_TRI_GetEditorForm_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Set up
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        $GLOBALS['cfg']['ServerDefault'] = '';
-        $GLOBALS['cfg']['DBG']['sql'] = false;
-        $GLOBALS['db'] = 'pma_test';
-    }
-
-
-    /**
-     * Test for PMA_TRI_getEditorForm
-     *
-     * @param array $data    Data for trigger
-     * @param array $matcher Matcher
-     *
-     * @return void
-     *
-     * @dataProvider providerAdd
-     * @group medium
-     */
-    public function testGetEditorFormAdd($data, $matcher)
-    {
-        $GLOBALS['is_ajax_request'] = false;
-        $GLOBALS['server'] = 1;
-        PMA_TRI_setGlobals();
-        $this->assertContains(
-            $matcher,
-            PMA_TRI_getEditorForm('add', $data)
-        );
-    }
-
-    /**
-     * Provider for testGetEditorFormAdd
-     *
-     * @return array
-     */
-    public function providerAdd()
-    {
-        $data = array(
-            'item_name'               => '',
-            'item_table'              => 'table1',
-            'item_original_name'      => '',
-            'item_action_timing'      => '',
-            'item_event_manipulation' => '',
-            'item_definition'         => '',
-            'item_definer'            => ''
-        );
-
-        return array(
-            array(
-                $data,
-                "name='add_item'"
-            ),
-            array(
-                $data,
-                "name='item_name'"
-            ),
-            array(
-                $data,
-                "name='item_table'"
-            ),
-            array(
-                $data,
-                "name='item_timing'"
-            ),
-            array(
-                $data,
-                "name='item_event'"
-            ),
-            array(
-                $data,
-                "name='item_definition'"
-            ),
-            array(
-                $data,
-                "name='item_definer'"
-            ),
-            array(
-                $data,
-                "name='editor_process_add'"
-            )
-        );
-    }
-
-    /**
-     * Test for PMA_TRI_getEditorForm
-     *
-     * @param array $data    Data for trigger
-     * @param array $matcher Matcher
-     *
-     * @return void
-     *
-     * @dataProvider providerEdit
-     * @group medium
-     */
-    public function testGetEditorFormEdit($data, $matcher)
-    {
-        $GLOBALS['is_ajax_request'] = false;
-        $GLOBALS['server'] = 1;
-        PMA_TRI_setGlobals();
-        $this->assertContains(
-            $matcher,
-            PMA_TRI_getEditorForm('edit', $data)
-        );
-    }
-
-    /**
-     * Provider for testGetEditorFormEdit
-     *
-     * @return array
-     */
-    public function providerEdit()
-    {
-        $data = array(
-            'item_name'               => 'foo',
-            'item_table'              => 'table1',
-            'item_original_name'      => 'bar',
-            'item_action_timing'      => 'BEFORE',
-            'item_event_manipulation' => 'INSERT',
-            'item_definition'         => 'SET @A=1;',
-            'item_definer'            => ''
-        );
-
-        return array(
-            array(
-                $data,
-                "name='edit_item'"
-            ),
-            array(
-                $data,
-                "name='item_name'"
-            ),
-            array(
-                $data,
-                "name='item_table'"
-            ),
-            array(
-                $data,
-                "name='item_timing'"
-            ),
-            array(
-                $data,
-                "name='item_event'"
-            ),
-            array(
-                $data,
-                "name='item_definition'"
-            ),
-            array(
-                $data,
-                "name='item_definer'"
-            ),
-            array(
-                $data,
-                "name='editor_process_edit'"
-            )
-        );
-    }
-
-    /**
-     * Test for PMA_TRI_getEditorForm
-     *
-     * @param array $data    Data for trigger
-     * @param array $matcher Matcher
-     *
-     * @return void
-     *
-     * @dataProvider providerAjax
-     */
-    public function testGetEditorFormAjax($data, $matcher)
-    {
-        $GLOBALS['is_ajax_request'] = true;
-        $GLOBALS['server'] = 1;
-        PMA_TRI_setGlobals();
-        $this->assertContains(
-            $matcher,
-            PMA_TRI_getEditorForm('edit', $data)
-        );
-    }
-
-    /**
-     * Provider for testGetEditorFormAjax
-     *
-     * @return array
-     */
-    public function providerAjax()
-    {
-        $data = array(
-            'item_name'               => 'foo',
-            'item_table'              => 'table1',
-            'item_original_name'      => 'bar',
-            'item_action_timing'      => 'BEFORE',
-            'item_event_manipulation' => 'INSERT',
-            'item_definition'         => 'SET @A=1;',
-            'item_definer'            => ''
-        );
-
-        return array(
-            array(
-                $data,
-                "name='editor_process_edit'"
-            ),
-            array(
-                $data,
-                "name='ajax_request'"
-            )
-        );
-    }
-}
diff --git a/#pma/test/libraries/rte/PMA_TRI_getQueryFromRequest_test.php b/#pma/test/libraries/rte/PMA_TRI_getQueryFromRequest_test.php
deleted file mode 100644
index 873fe4aa..00000000
--- a/#pma/test/libraries/rte/PMA_TRI_getQueryFromRequest_test.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Test for generating CREATE TRIGGER query from HTTP request
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Needed for backquote()
- */
-
-
-/*
- * Needed by PMA_TRI_getQueryFromRequest()
- */
-
-/*
- * Include to test.
- */
-require_once 'libraries/rte/rte_triggers.lib.php';
-require_once 'libraries/database_interface.inc.php';
-
-
-/**
- * Test for generating CREATE TRIGGER query from HTTP request
- *
- * @package PhpMyAdmin-test
- */
-class PMA_TRI_GetQueryFromRequest_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Set up
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        $GLOBALS['db'] = 'pma_test';
-        $GLOBALS['cfg']['DBG']['sql'] = false;
-    }
-
-    /**
-     * Test for PMA_TRI_getQueryFromRequest
-     *
-     * @param string $definer    Definer
-     * @param string $name       Name
-     * @param string $timing     Timing
-     * @param string $event      Event
-     * @param string $table      Table
-     * @param string $definition Definition
-     * @param string $query      Query
-     * @param string $num_err    Error number
-     *
-     * @return void
-     *
-     * @dataProvider provider
-     */
-    public function testgetQueryFromRequest(
-        $definer, $name, $timing, $event, $table, $definition, $query, $num_err
-    ) {
-        global $_REQUEST, $errors;
-
-        $errors = array();
-        PMA_TRI_setGlobals();
-
-        $_REQUEST['item_definer']    = $definer;
-        $_REQUEST['item_name']       = $name;
-        $_REQUEST['item_timing']     = $timing;
-        $_REQUEST['item_event']      = $event;
-        $_REQUEST['item_table']      = $table;
-        $_REQUEST['item_definition'] = $definition;
-        $GLOBALS['server'] = 1;
-
-        $this->assertEquals($query, PMA_TRI_getQueryFromRequest());
-        $this->assertEquals($num_err, count($errors));
-    }
-
-    /**
-     * Data provider for testgetQueryFromRequest
-     *
-     * @return array
-     */
-    public function provider()
-    {
-        return array(
-            array('',
-                '',
-                '',
-                '',
-                '',
-                '',
-                'CREATE TRIGGER ON  FOR EACH ROW ',
-                5
-            ),
-            array(
-                'root',
-                'trigger',
-                'BEFORE',
-                'INSERT',
-                'table`2',
-                'SET @A=NULL',
-                'CREATE TRIGGER `trigger` BEFORE INSERT ON  FOR EACH ROW SET @A=NULL',
-                2
-            ),
-            array(
-                'foo`s@host',
-                'trigger`s test',
-                'AFTER',
-                'foo',
-                'table3',
-                'BEGIN SET @A=1; SET @B=2; END',
-                'CREATE DEFINER=`foo``s`@`host` TRIGGER `trigger``s test` AFTER ON  FOR EACH ROW BEGIN SET @A=1; SET @B=2; END',
-                2
-            ),
-            array(
-                'root@localhost',
-                'trigger',
-                'BEFORE',
-                'INSERT',
-                'table1',
-                'SET @A=NULL',
-                'CREATE DEFINER=`root`@`localhost` TRIGGER `trigger` BEFORE INSERT ON `table1` FOR EACH ROW SET @A=NULL',
-                0
-            ),
-        );
-    }
-}
diff --git a/#pma/test/libraries/stubs/ResponseStub.php b/#pma/test/libraries/stubs/ResponseStub.php
deleted file mode 100644
index afa5752e..00000000
--- a/#pma/test/libraries/stubs/ResponseStub.php
+++ /dev/null
@@ -1,187 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Fake response stub for testing purposes
- *
- * It will concatenate HTML and JSON for given calls to addHTML and addJSON
- * respectively, what make it easy to determine whether the output is correct in test
- * suite. Feel free to modify for any future test needs.
- *
- * @package    PhpMyAdmin
- * @subpackage Stubs
- */
-namespace PMA\Test\Stubs;
-
-use PMA\libraries\Header;
-use PMA\libraries\Message;
-
-
-
-
-/**
- * Class Response
- *
- * @package PMA\Test\Stubs
- */
-class Response
-{
-    /**
-     * PMA\libraries\Header instance
-     *
-     * @access private
-     * @var Header
-     */
-    protected $header;
-
-    /**
-     * HTML data to be used in the response
-     *
-     * @access private
-     * @var string
-     */
-    protected $htmlString;
-
-    /**
-     * An array of JSON key-value pairs
-     * to be sent back for ajax requests
-     *
-     * @access private
-     * @var array
-     */
-    protected $json;
-
-    /**
-     * Whether there were any errors during the processing of the request
-     * Only used for ajax responses
-     *
-     * @access private
-     * @var bool
-     */
-    protected $_isSuccess;
-
-    /**
-     * Creates a new class instance
-     */
-    public function __construct()
-    {
-        $this->_isSuccess = true;
-        $this->htmlString = '';
-        $this->json = array();
-
-        $GLOBALS['lang'] = 'en';
-        $this->header = new Header();
-    }
-
-    /**
-     * Add HTML code to the response stub
-     *
-     * @param string $content A string to be appended to
-     *                        the current output buffer
-     *
-     * @return void
-     */
-    public function addHTML($content)
-    {
-        if (is_array($content)) {
-            foreach ($content as $msg) {
-                $this->addHTML($msg);
-            }
-        } elseif ($content instanceof Message) {
-            $this->htmlString .= $content->getDisplay();
-        } else {
-            $this->htmlString .= $content;
-        }
-    }
-
-    /**
-     * Add JSON code to the response stub
-     *
-     * @param mixed $json  Either a key (string) or an
-     *                     array or key-value pairs
-     * @param mixed $value Null, if passing an array in $json otherwise
-     *                     it's a string value to the key
-     *
-     * @return void
-     */
-    public function addJSON($json, $value = null)
-    {
-        if (is_array($json)) {
-            foreach ($json as $key => $value) {
-                $this->addJSON($key, $value);
-            }
-        } else {
-            if ($value instanceof Message) {
-                $this->json[$json] = $value->getDisplay();
-            } else {
-                $this->json[$json] = $value;
-            }
-        }
-    }
-
-    /**
-     * Return the final concatenated HTML string
-     *
-     * @return string
-     */
-    public function getHTMLResult()
-    {
-        return $this->htmlString;
-    }
-
-    /**
-     * Return the final JSON array
-     *
-     * @return array
-     */
-    public function getJSONResult()
-    {
-        return $this->json;
-    }
-
-    /**
-     * Current I choose to return PMA\libraries\Header object directly because
-     * our test has nothing about the Scripts and PMA\libraries\Header class.
-     *
-     * @return Header
-     */
-    public function getHeader()
-    {
-        return $this->header;
-    }
-
-    /**
-     * Set the status of an ajax response,
-     * whether it is a success or an error
-     *
-     * @param bool $state Whether the request was successfully processed
-     *
-     * @return void
-     */
-    public function setRequestStatus($state)
-    {
-        $this->_isSuccess = $state;
-    }
-
-    /**
-     * Get the status of an ajax response.
-     *
-     * @return bool
-     */
-    public function getSuccessSate()
-    {
-        return $this->_isSuccess;
-    }
-
-    /**
-     * This function is used to clear all data to this
-     * stub after any operations.
-     *
-     * @return void
-     */
-    public function clear()
-    {
-        $this->_isSuccess = true;
-        $this->json = array();
-        $this->htmlString = '';
-    }
-}
diff --git a/#pma/test/libraries/sysinfo_test.php b/#pma/test/libraries/sysinfo_test.php
deleted file mode 100644
index 2d3f6677..00000000
--- a/#pma/test/libraries/sysinfo_test.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for sysinfo library
- *
- * @package PhpMyAdmin-test
- */
-
-require_once 'libraries/sysinfo.lib.php';
-
-/**
- * tests for sysinfo library
- *
- * @package PhpMyAdmin-test
- */
-class PMA_SysInfoTest extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Test for OS detection
-     *
-     * @param string $os       OS name as returned by PHP_OS
-     * @param string $expected Expected detected OS name
-     *
-     * @return void
-     *
-     * @dataProvider sysInfoOsProvider
-     */
-    public function testGetSysInfoOs($os, $expected)
-    {
-        $this->assertEquals(
-            $expected,
-            PMA_getSysInfoOs($os)
-        );
-    }
-
-    /**
-     * Data provider for OS detection tests.
-     *
-     * @return array with test data
-     */
-    public function sysInfoOsProvider()
-    {
-        return array(
-            array('FreeBSD', 'Linux'),
-            array('Linux', 'Linux'),
-            array('Winnt', 'Winnt'),
-            array('SunOS', 'SunOS'),
-        );
-    }
-
-    /**
-     * Test for getting sysinfo object.
-     *
-     * @return void
-     */
-    public function testGetSysInfo()
-    {
-        $this->assertInstanceOf('PMA\libraries\SysInfo', PMA_getSysInfo());
-    }
-
-    /**
-     * Test for getting supported sysinfo object.
-     *
-     * @return void
-     */
-    public function testGetSysInfoSupported()
-    {
-        $this->assertTrue(PMA_getSysInfo()->supported());
-    }
-}
diff --git a/#pma/test/php-noprofile.ini b/#pma/test/php-noprofile.ini
deleted file mode 100644
index 2ab76d36..00000000
--- a/#pma/test/php-noprofile.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-; PHP configuration tweaks for tests on Travis
-
-xdebug.profiler_enable=0
diff --git a/#pma/test/php-runkit.ini b/#pma/test/php-runkit.ini
deleted file mode 100644
index ee765603..00000000
--- a/#pma/test/php-runkit.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-; PHP configuration tweaks for tests on Travis
-
-; Extension is automaticlaly enabled by PECL
-; extension=runkit.so
-
-; Enable override of internal functions
-runkit.internal_override=1
diff --git a/#pma/test/selenium/PmaSeleniumCreateDropDatabaseTest.php b/#pma/test/selenium/PmaSeleniumCreateDropDatabaseTest.php
deleted file mode 100644
index 4f4a3178..00000000
--- a/#pma/test/selenium/PmaSeleniumCreateDropDatabaseTest.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Selenium TestCase for creating and deleting databases
- *
- * @package    PhpMyAdmin-test
- * @subpackage Selenium
- */
-
-require_once 'TestBase.php';
-
-/**
- * PmaSeleniumCreateDropDatabaseTest class
- *
- * @package    PhpMyAdmin-test
- * @subpackage Selenium
- * @group      selenium
- */
-class PMA_SeleniumCreateDropDatabaseTest extends PMA_SeleniumBase
-{
-    /**
-     * Setup the browser environment to run the selenium test case
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        parent::setUp();
-        /* TODO: For now this tests needs superuser for deleting database */
-        $this->skipIfNotSuperUser();
-    }
-
-    /**
-     * Creates a database and drops it
-     *
-     * @return void
-     *
-     * @group large
-     */
-    public function testCreateDropDatabase()
-    {
-        $this->login();
-
-        $this->_dropDatabase();
-
-        $this->waitForElement('byLinkText', "Databases")->click();
-        $this->waitForElementNotPresent('byCssSelector', 'div#loading_parent');
-
-        $element = $this->waitForElement('byId', 'text_create_db');
-        $element->clear();
-        $element->value($this->database_name);
-
-        $this->byId("buttonGo")->click();
-
-        $element = $this->waitForElement(
-            "byCssSelector", "span.ajax_notification div.success"
-        );
-
-        $this->_dropDatabase();
-    }
-
-    /**
-     * Drops a database, called after testCreateDropDatabase
-     *
-     * @return void
-     */
-    private function _dropDatabase()
-    {
-        $this->gotoHomepage();
-
-        $this->byLinkText("Databases")->click();
-        $this->waitForElementNotPresent('byCssSelector', 'div#loading_parent');
-
-        $this->byCssSelector(
-            "input[name='selected_dbs[]'][value='" . $this->database_name . "']"
-        )->click();
-
-        $this->byCssSelector("button.mult_submit")->click();
-        $this->byCssSelector("span.ui-button-text:nth-child(1)")->click();
-
-        $this->waitForElementNotPresent(
-            "byCssSelector",
-            "input[name='selected_dbs[]'][value='" . $this->database_name . "']"
-        );
-
-        $this->waitForElement(
-            "byCssSelector", "span.ajax_notification div.success"
-        );
-    }
-}
diff --git a/#pma/test/selenium/PmaSeleniumCreateRemoveUserTest.php b/#pma/test/selenium/PmaSeleniumCreateRemoveUserTest.php
deleted file mode 100644
index 629606e8..00000000
--- a/#pma/test/selenium/PmaSeleniumCreateRemoveUserTest.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Selenium TestCase for user related tests
- *
- * @package    PhpMyAdmin-test
- * @subpackage Selenium
- */
-
-require_once 'TestBase.php';
-
-/**
- * PmaSeleniumCreateRemoveUserTest class
- *
- * @package    PhpMyAdmin-test
- * @subpackage Selenium
- * @group      selenium
- */
-class PMA_SeleniumCreateRemoveUserTest extends PMA_SeleniumBase
-{
-    /**
-     * Username for the user
-     *
-     * @access private
-     * @var string
-     */
-    private $_txtUsername;
-
-    /**
-     * Password for the user
-     *
-     * @access private
-     * @var string
-     */
-    private $_txtPassword;
-
-    /**
-     * Setup the browser environment to run the selenium test case
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        parent::setUp();
-        $this->skipIfNotSuperUser();
-        $this->_txtUsername = 'pma_user';
-        $this->_txtPassword = 'abc_123';
-    }
-
-    /**
-     * Creates and removes a user
-     *
-     * @return void
-     *
-     * @group large
-     */
-    public function testCreateRemoveUser()
-    {
-        $this->login();
-        $this->waitForElement('byLinkText', "Users")->click();
-
-        $link = $this->waitForElement("byId", "add_user_anchor");
-        $link->click();
-
-        $userField = $this->waitForElement("byName", "username");
-        $userField->value($this->_txtUsername);
-
-        $select = $this->select($this->byId("select_pred_hostname"));
-        $select->selectOptionByLabel("Local");
-
-        $this->byId("button_generate_password")->click();
-        $this->assertNotEquals("", $this->byId("text_pma_pw")->value());
-        $this->assertNotEquals("", $this->byId("text_pma_pw2")->value());
-        $this->assertNotEquals("", $this->byId("generated_pw")->value());
-
-        $this->byId("text_pma_pw")->value($this->_txtPassword);
-        $this->byId("text_pma_pw2")->value($this->_txtPassword);
-        $this->byId("createdb-1")->click();
-        $this->byId("createdb-2")->click();
-        $this->byId("addUsersForm_checkall")->click();
-        $this->byName("adduser_submit")->click();
-
-        $success = $this->waitForElement("byCssSelector", "div.success");
-        $this->assertContains('You have added a new user', $success->text());
-
-        $this->waitForElement('byLinkText', "Users")->click();
-        $el = $this->waitForElement("byId", "usersForm");
-        $temp = $this->_txtUsername . "&amp;#27;localhost";
-
-        $this->byXPath(
-            "(//input[@name='selected_usr[]'])[@value='" . $temp . "']"
-        )->click();
-
-        $this->byId("checkbox_drop_users_db")->click();
-        $this->byId("buttonGo")->click();
-        $this->waitForElement("byCssSelector", "button.confirmOK")->click();
-        $this->acceptAlert();
-
-        $success = $this->waitForElement("byCssSelector", "div.success");
-        $this->assertContains(
-            'The selected users have been deleted',
-            $success->text()
-        );
-    }
-}
diff --git a/#pma/test/selenium/PmaSeleniumDbEventsTest.php b/#pma/test/selenium/PmaSeleniumDbEventsTest.php
deleted file mode 100644
index 16fcf220..00000000
--- a/#pma/test/selenium/PmaSeleniumDbEventsTest.php
+++ /dev/null
@@ -1,212 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Selenium TestCase for table related tests
- *
- * @package    PhpMyAdmin-test
- * @subpackage Selenium
- */
-
-require_once 'TestBase.php';
-
-/**
- * PmaSeleniumDbEventsTest class
- *
- * @package    PhpMyAdmin-test
- * @subpackage Selenium
- * @group      selenium
- */
-class PMA_SeleniumDbEventsTest extends PMA_SeleniumBase
-{
-    /**
-     * Setup the browser environment to run the selenium test case
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        parent::setUp();
-        $this->dbQuery(
-            "CREATE TABLE `test_table` ("
-            . " `id` int(11) NOT NULL AUTO_INCREMENT,"
-            . " `val` int(11) NOT NULL,"
-            . " PRIMARY KEY (`id`)"
-            . ")"
-        );
-        $this->dbQuery(
-            "INSERT INTO `test_table` (val) VALUES (2);"
-        );
-
-    }
-
-    /**
-     * setUp function that can use the selenium session (called before each test)
-     *
-     * @return void
-     */
-    public function setUpPage()
-    {
-        $this->login();
-        $this->waitForElement('byLinkText', $this->database_name)->click();
-        $this->waitForElement(
-            "byXPath", "//a[contains(., 'test_table')]"
-        );
-        $this->expandMore();
-    }
-
-    /**
-     * Creates procedure for tests
-     *
-     * @return void
-     */
-    private function _eventSQL()
-    {
-        $start = date('Y-m-d H:i:s', strtotime('-1 day'));
-        $end = date('Y-m-d H:i:s', strtotime('+1 day'));
-
-        $this->dbQuery(
-            "CREATE EVENT `test_event` ON SCHEDULE EVERY 2 MINUTE_SECOND STARTS "
-            . "'$start' ENDS '$end' ON COMPLETION NOT PRESERVE ENABLE "
-            . "DO UPDATE `" . $this->database_name
-            . "`.`test_table` SET val = val + 1"
-        );
-    }
-
-    /**
-     * Create an event
-     *
-     * @return void
-     *
-     * @group large
-     */
-    public function testAddEvent()
-    {
-        $ele = $this->waitForElement("byPartialLinkText", "Events");
-        $ele->click();
-
-        $ele = $this->waitForElement("byLinkText", "Add event");
-        $ele->click();
-
-        $this->waitForElement("byClassName", "rte_form");
-
-        $this->byName("item_name")->value("test_event");
-
-        $this->select($this->byName("item_type"))
-            ->selectOptionByLabel("RECURRING");
-
-        $this->byName("item_interval_value")->value("1");
-
-        $this->select($this->byName("item_interval_field"))
-            ->selectOptionByLabel("MINUTE_SECOND");
-
-        $this->byName("item_starts")
-            ->value(date('Y-m-d H:i:s', strtotime('-1 day')));
-
-        $this->byName("item_ends")
-            ->value(date('Y-m-d H:i:s', strtotime('+1 day')));
-
-        $proc = "UPDATE " . $this->database_name . ".`test_table` SET val=val+1";
-        $this->typeInTextArea($proc);
-
-        $this->byXPath("//button[contains(., 'Go')]")->click();
-
-        $ele = $this->waitForElement(
-            "byXPath",
-            "//div[@class='success' and contains(., "
-            . "'Event `test_event` has been created')]"
-        );
-
-        $this->assertTrue(
-            $this->isElementPresent(
-                'byXPath',
-                "//td[contains(., 'test_event')]"
-            )
-        );
-
-        $result = $this->dbQuery(
-            "SHOW EVENTS WHERE Db='" . $this->database_name
-            . "' AND Name='test_event'"
-        );
-        $this->assertEquals(1, $result->num_rows);
-
-        usleep(2200000);
-        $result = $this->dbQuery(
-            "SELECT val FROM `" . $this->database_name . "`.`test_table`"
-        );
-        $row = $result->fetch_assoc();
-        $this->assertGreaterThan(2, $row['val']);
-    }
-
-    /**
-     * Test for editing events
-     *
-     * @return void
-     *
-     * @group large
-     */
-    public function testEditEvents()
-    {
-        $this->_eventSQL();
-        $ele = $this->waitForElement("byPartialLinkText", "Events");
-        $ele->click();
-
-        $this->waitForElement(
-            "byXPath",
-            "//legend[contains(., 'Events')]"
-        );
-
-        $this->byLinkText("Edit")->click();
-
-        $this->waitForElement("byClassName", "rte_form");
-        $this->byName("item_interval_value")->clear();
-        $this->byName("item_interval_value")->value("1");
-        $this->typeInTextArea("00");
-
-        $this->byXPath("//button[contains(., 'Go')]")->click();
-
-        $ele = $this->waitForElement(
-            "byXPath",
-            "//div[@class='success' and contains(., "
-            . "'Event `test_event` has been modified')]"
-        );
-
-        usleep(2000000);
-        $result = $this->dbQuery(
-            "SELECT val FROM `" . $this->database_name . "`.`test_table`"
-        );
-        $row = $result->fetch_assoc();
-        $this->assertGreaterThan(100, $row['val']);
-    }
-
-    /**
-     * Test for dropping event
-     *
-     * @return void
-     *
-     * @group large
-     */
-    public function testDropEvent()
-    {
-        $this->_eventSQL();
-        $this->waitForElement("byPartialLinkText", "Events")->click();
-
-        $this->waitForElement(
-            "byXPath",
-            "//legend[contains(., 'Events')]"
-        );
-
-        $this->byLinkText("Drop")->click();
-        $this->waitForElement(
-            "byXPath", "//button[contains(., 'OK')]"
-        )->click();
-
-        $this->waitForElement("byId", "nothing2display");
-
-        usleep(1000000);
-        $result = $this->dbQuery(
-            "SHOW EVENTS WHERE Db='" . $this->database_name
-            . "' AND Name='test_event'"
-        );
-        $this->assertEquals(0, $result->num_rows);
-    }
-}
diff --git a/#pma/test/selenium/PmaSeleniumDbOperationsTest.php b/#pma/test/selenium/PmaSeleniumDbOperationsTest.php
deleted file mode 100644
index 7feff0ad..00000000
--- a/#pma/test/selenium/PmaSeleniumDbOperationsTest.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Selenium TestCase for table related tests
- *
- * @package    PhpMyAdmin-test
- * @subpackage Selenium
- */
-
-require_once 'TestBase.php';
-
-
-/**
- * PmaSeleniumDbOperationsTest class
- *
- * @package    PhpMyAdmin-test
- * @subpackage Selenium
- * @group      selenium
- */
-class PMA_SeleniumDbOperationsTest extends PMA_SeleniumBase
-{
-    /**
-     * setUp function that can use the selenium session (called before each test)
-     *
-     * @return void
-     */
-    public function setUpPage()
-    {
-        $this->login();
-        $this->waitForElement('byLinkText', $this->database_name)->click();
-        $this->waitForElement("byLinkText", "Structure");
-        $this->expandMore();
-        $this->waitForElement("byLinkText", "Operations")->click();
-        $this->waitForElement(
-            "byXPath", "//legend[contains(., 'Rename database to')]"
-        );
-    }
-
-    /**
-     * Test for adding database comment
-     *
-     * @return void
-     *
-     * @group large
-     */
-    public function testDbComment()
-    {
-        $this->skipIfNotPMADB();
-        $this->byName("comment")->value("comment_foobar");
-        $this->byCssSelector(
-            "form#formDatabaseComment input[type='submit']"
-        )->click();
-
-        $this->assertNotNull(
-            $this->waitForElement(
-                "byXPath",
-                "//span[@id='span_table_comment' and contains(., 'comment_foobar')]"
-            )
-        );
-    }
-
-    /**
-     * Test for renaming database
-     *
-     * @return void
-     *
-     * @group large
-     */
-    public function testRenameDB()
-    {
-        $new_db_name = $this->database_name . 'rename';
-        $this->byCssSelector("form#rename_db_form input[name=newname]")
-            ->value($new_db_name);
-
-        $this->byCssSelector("form#rename_db_form input[type='submit']")->click();
-
-        $this->waitForElement(
-            "byXPath", "//button[contains(., 'OK')]"
-        )->click();
-
-        $this->waitForElement(
-            "byXPath",
-            "//a[@class='item' and contains(., 'Database: $new_db_name')]"
-        );
-
-        $result = $this->dbQuery(
-            "SHOW DATABASES LIKE '$new_db_name';"
-        );
-        $this->assertEquals(1, $result->num_rows);
-
-        $result = $this->dbQuery(
-            "SHOW DATABASES LIKE '" . $this->database_name . "';"
-        );
-        $this->assertEquals(0, $result->num_rows);
-
-        $this->database_name = $new_db_name;
-    }
-
-    /**
-     * Test for copying database
-     *
-     * @return void
-     *
-     * @group large
-     */
-    public function testCopyDb()
-    {
-        $new_db_name = $this->database_name . 'copy';
-        $this->byCssSelector("form#copy_db_form input[name=newname]")
-            ->value($new_db_name);
-
-        $this->byCssSelector("form#copy_db_form input[type='submit']")->click();
-
-        $this->waitForElement(
-            "byXPath",
-            "//div[@class='success' and contains(., 'Database "
-            . $this->database_name
-            . " has been copied to $new_db_name')]"
-        );
-
-        $result = $this->dbQuery(
-            "SHOW DATABASES LIKE '$new_db_name';"
-        );
-        $this->assertEquals(1, $result->num_rows);
-
-        $this->dbQuery("DROP DATABASE $new_db_name");
-    }
-}
diff --git a/#pma/test/selenium/PmaSeleniumDbProceduresTest.php b/#pma/test/selenium/PmaSeleniumDbProceduresTest.php
deleted file mode 100644
index f5b17d83..00000000
--- a/#pma/test/selenium/PmaSeleniumDbProceduresTest.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Selenium TestCase for table related tests
- *
- * @package    PhpMyAdmin-test
- * @subpackage Selenium
- */
-
-require_once 'TestBase.php';
-
-/**
- * PmaSeleniumDbProceduresTest class
- *
- * @package    PhpMyAdmin-test
- * @subpackage Selenium
- * @group      selenium
- */
-class PMA_SeleniumDbProceduresTest extends PMA_SeleniumBase
-{
-    /**
-     * Setup the browser environment to run the selenium test case
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        parent::setUp();
-        $this->dbQuery(
-            "CREATE TABLE `test_table` ("
-            . " `id` int(11) NOT NULL AUTO_INCREMENT,"
-            . " `name` varchar(20) NOT NULL,"
-            . " `datetimefield` datetime NOT NULL,"
-            . " PRIMARY KEY (`id`)"
-            . ")"
-        );
-
-    }
-
-    /**
-     * setUp function that can use the selenium session (called before each test)
-     *
-     * @return void
-     */
-    public function setUpPage()
-    {
-        $this->login();
-        $this->waitForElement('byLinkText', $this->database_name)->click();
-        $this->waitForElement(
-            "byXPath", "//a[contains(., 'test_table')]"
-        );
-        $this->expandMore();
-    }
-
-    /**
-     * Creates procedure for tests
-     *
-     * @return void
-     */
-    private function _procedureSQL()
-    {
-        $this->dbQuery(
-            "CREATE PROCEDURE `test_procedure`(IN `inp` VARCHAR(10), OUT `outp` INT)"
-            . " NOT DETERMINISTIC READS SQL DATA SQL SECURITY DEFINER SELECT char_"
-            . "length(inp) + count(*) FROM test_table INTO outp"
-        );
-    }
-
-    /**
-     * Create a procedure
-     *
-     * @return void
-     *
-     * @group large
-     */
-    public function testAddProcedure()
-    {
-        $ele = $this->waitForElement("byPartialLinkText", "Routines");
-        $ele->click();
-
-        $ele = $this->waitForElement("byLinkText", "Add routine");
-        $ele->click();
-
-        $this->waitForElement("byClassName", "rte_form");
-
-        $this->byName("item_name")->value("test_procedure");
-
-        $this->byName("item_param_name[0]")->value("inp");
-        $this->select(
-            $this->byName("item_param_type[0]")
-        )->selectOptionByLabel("VARCHAR");
-        $this->byName("item_param_length[0]")->value("10");
-
-        $this->byCssSelector("input[value='Add parameter']")->click();
-
-        $this->select(
-            $this->byName("item_param_dir[1]")
-        )->selectOptionByLabel("OUT");
-        $ele = $this->waitForElement("byName", "item_param_name[1]");
-        $ele->value("outp");
-
-        $proc = "SELECT char_length(inp) + count(*) FROM test_table INTO outp";
-        $this->typeInTextArea($proc);
-
-        $this->select(
-            $this->byName("item_sqldataaccess")
-        )->selectOptionByLabel("READS SQL DATA");
-
-        $this->byXPath("//button[contains(., 'Go')]")->click();
-
-        $ele = $this->waitForElement(
-            "byXPath",
-            "//div[@class='success' and contains(., "
-            . "'Routine `test_procedure` has been created')]"
-        );
-
-        $result = $this->dbQuery(
-            "SHOW PROCEDURE STATUS WHERE Db='" . $this->database_name . "'"
-        );
-
-        $this->assertEquals(1, $result->num_rows);
-        $this->_executeProcedure("abcabcabcabcabcabcabc", 10);
-    }
-
-    /**
-     * Test for editing procedure
-     *
-     * @return void
-     *
-     * @group large
-     */
-    public function testEditProcedure()
-    {
-        $this->_procedureSQL();
-        $ele = $this->waitForElement("byPartialLinkText", "Routines");
-        $ele->click();
-
-        $this->waitForElement(
-            "byXPath",
-            "//legend[contains(., 'Routines')]"
-        );
-
-        $this->byLinkText("Edit")->click();
-        $this->waitForElement("byClassName", "rte_form");
-        $this->byName("item_param_length[0]")->clear();
-        $this->byName("item_param_length[0]")->value("12");
-
-        $this->byXPath("//button[contains(., 'Go')]")->click();
-
-        $ele = $this->waitForElement(
-            "byXPath",
-            "//div[@class='success' and contains(., "
-            . "'Routine `test_procedure` has been modified')]"
-        );
-
-        $this->_executeProcedure("abcabcabcabcabcabcabc", 12);
-    }
-
-    /**
-     * Test for dropping procedure
-     *
-     * @return void
-     *
-     * @group large
-     */
-    public function testDropProcedure()
-    {
-        $this->_procedureSQL();
-        $ele = $this->waitForElement("byPartialLinkText", "Routines");
-        $ele->click();
-
-        $this->waitForElement(
-            "byXPath",
-            "//legend[contains(., 'Routines')]"
-        );
-
-        $this->byLinkText("Drop")->click();
-        $this->waitForElement(
-            "byXPath", "//button[contains(., 'OK')]"
-        )->click();
-
-        $this->waitForElement("byId", "nothing2display");
-
-        usleep(1000000);
-        $result = $this->dbQuery(
-            "SHOW PROCEDURE STATUS WHERE Db='" . $this->database_name . "'"
-        );
-        $this->assertEquals(0, $result->num_rows);
-    }
-
-    /**
-     * Execute procedure
-     *
-     * @param string $text   String to pass as inp param
-     * @param int    $length Expected output length
-     *
-     * @return void
-     */
-    private function _executeProcedure($text, $length)
-    {
-        $this->waitForElement("byLinkText", "Execute")->click();
-        $this->waitForElement("byName", "params[inp]")->value($text);
-        $this->byCssSelector("div.ui-dialog-buttonset button:nth-child(1)")->click();
-        $this->waitForElement(
-            "byCssSelector",
-            "span#PMA_slidingMessage table tbody"
-        );
-        $head = $this->byCssSelector("span#PMA_slidingMessage table tbody")->text();
-        $this->assertEquals("outp\n$length", $head);
-    }
-}
diff --git a/#pma/test/selenium/PmaSeleniumDbStructureTest.php b/#pma/test/selenium/PmaSeleniumDbStructureTest.php
deleted file mode 100644
index 531d2bec..00000000
--- a/#pma/test/selenium/PmaSeleniumDbStructureTest.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Selenium TestCase for table related tests
- *
- * @package    PhpMyAdmin-test
- * @subpackage Selenium
- */
-
-require_once 'TestBase.php';
-
-/**
- * PmaSeleniumDbStructureTest class
- *
- * @package    PhpMyAdmin-test
- * @subpackage Selenium
- * @group      selenium
- */
-class PMA_SeleniumDbStructureTest extends PMA_SeleniumBase
-{
-    /**
-     * Setup the browser environment to run the selenium test case
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        parent::setUp();
-        $this->dbQuery(
-            "CREATE TABLE `test_table` ("
-            . " `id` int(11) NOT NULL AUTO_INCREMENT,"
-            . " `val` int(11) NOT NULL,"
-            . " PRIMARY KEY (`id`)"
-            . ")"
-        );
-        $this->dbQuery(
-            "CREATE TABLE `test_table2` ("
-            . " `id` int(11) NOT NULL AUTO_INCREMENT,"
-            . " `val` int(11) NOT NULL,"
-            . " PRIMARY KEY (`id`)"
-            . ")"
-        );
-        $this->dbQuery(
-            "INSERT INTO `test_table` (val) VALUES (2);"
-        );
-    }
-
-    /**
-     * setUp function that can use the selenium session (called before each test)
-     *
-     * @return void
-     */
-    public function setUpPage()
-    {
-        $this->login();
-        $this->waitForElement('byLinkText', $this->database_name)->click();
-        $this->waitForElement(
-            'byCssSelector',
-            'li.last.table'
-        );
-        $this->waitForElement(
-            "byXPath", "//a[contains(., 'test_table')]"
-        );
-    }
-
-    /**
-     * Test for truncating a table
-     *
-     * @return void
-     *
-     * @group large
-     */
-    public function testTruncateTable()
-    {
-        $this->byXPath("(//a[contains(., 'Empty')])[1]")->click();
-
-        $this->waitForElement(
-            "byXPath",
-            "//button[contains(., 'OK')]"
-        )->click();
-
-        $this->assertNotNull(
-            $this->waitForElement(
-                "byXPath",
-                "//div[@class='success' and contains(., "
-                . "'MySQL returned an empty result')]"
-            )
-        );
-
-        $result = $this->dbQuery("SELECT count(*) as c FROM test_table");
-        $row = $result->fetch_assoc();
-        $this->assertEquals(0, $row['c']);
-    }
-
-    /**
-     * Tests for dropping multiple tables
-     *
-     * @return void
-     *
-     * @group large
-     */
-    public function testDropMultipleTables()
-    {
-        $this->byCssSelector("label[for='tablesForm_checkall']")->click();
-        $this->select($this->byName("submit_mult"))
-            ->selectOptionByLabel("Drop");
-        $this->waitForElement("byId", "buttonYes")
-            ->click();
-
-        $this->waitForElement(
-            "byXPath",
-            "//p[contains(., 'No tables found in database')]"
-        );
-
-        $result = $this->dbQuery("SHOW TABLES;");
-        $this->assertEquals(0, $result->num_rows);
-
-    }
-}
diff --git a/#pma/test/selenium/PmaSeleniumDbTriggersTest.php b/#pma/test/selenium/PmaSeleniumDbTriggersTest.php
deleted file mode 100644
index e8d9fccb..00000000
--- a/#pma/test/selenium/PmaSeleniumDbTriggersTest.php
+++ /dev/null
@@ -1,205 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Selenium TestCase for table related tests
- *
- * @package    PhpMyAdmin-test
- * @subpackage Selenium
- */
-
-require_once 'TestBase.php';
-
-/**
- * PmaSeleniumDbTriggersTest class
- *
- * @package    PhpMyAdmin-test
- * @subpackage Selenium
- * @group      selenium
- */
-class PMA_SeleniumDbTriggersTest extends PMA_SeleniumBase
-{
-    /**
-     * Setup the browser environment to run the selenium test case
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        parent::setUp();
-        $this->dbQuery(
-            "CREATE TABLE `test_table` ("
-            . " `id` int(11) NOT NULL AUTO_INCREMENT,"
-            . " `val` int(11) NOT NULL,"
-            . " PRIMARY KEY (`id`)"
-            . ")"
-        );
-
-        $this->dbQuery(
-            "CREATE TABLE `test_table2` ("
-            . " `id` int(11) NOT NULL AUTO_INCREMENT,"
-            . " `val` int(11) NOT NULL,"
-            . " PRIMARY KEY (`id`)"
-            . ")"
-        );
-        $this->dbQuery(
-            "INSERT INTO `test_table2` (val) VALUES (2);"
-        );
-    }
-
-    /**
-     * setUp function that can use the selenium session (called before each test)
-     *
-     * @return void
-     */
-    public function setUpPage()
-    {
-        $this->login();
-        $this->waitForElement('byLinkText', $this->database_name)->click();
-        $this->waitForElement(
-            "byXPath", "//a[contains(., 'test_table')]"
-        );
-        $this->expandMore();
-    }
-
-    /**
-     * Creates procedure for tests
-     *
-     * @return void
-     */
-    private function _triggerSQL()
-    {
-        $this->dbQuery(
-            "CREATE TRIGGER `test_trigger` "
-            . "AFTER INSERT ON `test_table` FOR EACH ROW"
-            . " UPDATE `" . $this->database_name
-            . "`.`test_table2` SET val = val + 1"
-        );
-    }
-
-    /**
-     * Create a Trigger
-     *
-     * @return void
-     *
-     * @group large
-     */
-    public function testAddTrigger()
-    {
-        $ele = $this->waitForElement("byPartialLinkText", "Triggers");
-        $ele->click();
-
-        $ele = $this->waitForElement("byLinkText", "Add trigger");
-        $ele->click();
-
-        $this->waitForElement("byClassName", "rte_form");
-
-        $this->byName("item_name")->value("test_trigger");
-
-        $this->select($this->byName("item_table"))
-            ->selectOptionByLabel("test_table");
-
-        $this->select($this->byName("item_timing"))
-            ->selectOptionByLabel("AFTER");
-
-        $this->select($this->byName("item_event"))
-            ->selectOptionByLabel("INSERT");
-
-        $proc = "UPDATE " . $this->database_name . ".`test_table2` SET val=val+1";
-        $this->typeInTextArea($proc);
-
-        $this->byXPath("//button[contains(., 'Go')]")->click();
-
-        $ele = $this->waitForElement(
-            "byXPath",
-            "//div[@class='success' and contains(., "
-            . "'Trigger `test_trigger` has been created')]"
-        );
-
-        $this->assertTrue(
-            $this->isElementPresent(
-                'byXPath',
-                "//td[contains(., 'test_trigger')]"
-            )
-        );
-
-        $result = $this->dbQuery(
-            "SHOW TRIGGERS FROM `" . $this->database_name . "`;"
-        );
-        $this->assertEquals(1, $result->num_rows);
-
-        // test trigger
-        $this->dbQuery("INSERT INTO `test_table` (val) VALUES (1);");
-        $result = $this->dbQuery("SELECT val FROM `test_table2`;");
-        $row = $result->fetch_assoc();
-        $this->assertEquals(3, $row['val']);
-    }
-
-    /**
-     * Test for editing Triggers
-     *
-     * @return void
-     *
-     * @group large
-     */
-    public function testEditTriggers()
-    {
-        $this->_triggerSQL();
-        $ele = $this->waitForElement("byPartialLinkText", "Triggers");
-        $ele->click();
-
-        $this->waitForElement(
-            "byXPath",
-            "//legend[contains(., 'Triggers')]"
-        );
-
-        $this->byLinkText("Edit")->click();
-
-        $this->waitForElement("byClassName", "rte_form");
-        $this->typeInTextArea("0");
-
-        $this->byXPath("//button[contains(., 'Go')]")->click();
-
-        $ele = $this->waitForElement(
-            "byXPath",
-            "//div[@class='success' and contains(., "
-            . "'Trigger `test_trigger` has been modified')]"
-        );
-
-        // test trigger
-        $this->dbQuery("INSERT INTO `test_table` (val) VALUES (1);");
-        $result = $this->dbQuery("SELECT val FROM `test_table2`;");
-        $row = $result->fetch_assoc();
-        $this->assertEquals(12, $row['val']);
-    }
-
-    /**
-     * Test for dropping Trigger
-     *
-     * @return void
-     *
-     * @group large
-     */
-    public function testDropTrigger()
-    {
-        $this->_triggerSQL();
-        $ele = $this->waitForElement("byPartialLinkText", "Triggers");
-        $ele->click();
-
-        $this->waitForElement(
-            "byXPath",
-            "//legend[contains(., 'Triggers')]"
-        );
-
-        $this->byLinkText("Drop")->click();
-        $this->waitForElement(
-            "byXPath", "//button[contains(., 'OK')]"
-        )->click();
-
-        $this->waitForElement("byId", "nothing2display");
-
-        $result = $this->dbQuery(
-            "SHOW TRIGGERS FROM `" . $this->database_name . "`;"
-        );
-        $this->assertEquals(0, $result->num_rows);
-    }
-}
diff --git a/#pma/test/selenium/PmaSeleniumExportTest.php b/#pma/test/selenium/PmaSeleniumExportTest.php
deleted file mode 100644
index cd61e571..00000000
--- a/#pma/test/selenium/PmaSeleniumExportTest.php
+++ /dev/null
@@ -1,208 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Selenium TestCase for export related tests
- *
- * @package    PhpMyAdmin-test
- * @subpackage Selenium
- */
-
-require_once 'TestBase.php';
-
-/**
- * PmaSeleniumExportTest class
- *
- * @package    PhpMyAdmin-test
- * @subpackage Selenium
- * @group      selenium
- */
-class PMA_SeleniumExportTest extends PMA_SeleniumBase
-{
-    /**
-     * Setup the browser environment to run the selenium test case
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        parent::setUp();
-        $this->dbQuery(
-            "CREATE TABLE `test_table` ("
-            . " `id` int(11) NOT NULL AUTO_INCREMENT,"
-            . " `val` int(11) NOT NULL,"
-            . " PRIMARY KEY (`id`)"
-            . ")"
-        );
-        $this->dbQuery(
-            "INSERT INTO `test_table` (val) VALUES (2);"
-        );
-    }
-
-    /**
-     * setUp function that can use the selenium session (called before each test)
-     *
-     * @return void
-     */
-    public function setUpPage()
-    {
-        $this->login();
-    }
-
-    /**
-     * Test for server level export
-     *
-     * @param string $plugin   Export format
-     * @param array  $expected Array of expected strings
-     *
-     * @return void
-     * @dataProvider exportDataProvider
-     *
-     * @group large
-     */
-    public function testServerImport($plugin, $expected)
-    {
-        $text = $this->_doExport('server', $plugin);
-
-        foreach ($expected as $str) {
-            $this->assertContains($str, $text);
-        }
-
-    }
-
-    /**
-     * Test for db level export
-     *
-     * @param string $plugin   Export format
-     * @param array  $expected Array of expected strings
-     *
-     * @return void
-     * @dataProvider exportDataProvider
-     *
-     * @group large
-     */
-    public function testDbExport($plugin, $expected)
-    {
-        $this->waitForElement("byLinkText", $this->database_name)->click();
-        $this->waitForElement(
-            "byXPath",
-            "//a[@class='item' and contains(., 'Database: "
-            . $this->database_name . "')]"
-        );
-
-        $text = $this->_doExport('db', $plugin);
-
-        foreach ($expected as $str) {
-            $this->assertContains($str, $text);
-        }
-    }
-
-    /**
-     * Test for table level export
-     *
-     * @param string $plugin   Export format
-     * @param array  $expected Array of expected strings
-     *
-     * @return void
-     * @dataProvider exportDataProvider
-     *
-     * @group large
-     */
-    public function testTableExport($plugin, $expected)
-    {
-        $this->dbQuery("INSERT INTO `test_table` (val) VALUES (3);");
-
-        $this->navigateTable('test_table');
-
-        $text = $this->_doExport('table', $plugin);
-
-        foreach ($expected as $str) {
-            $this->assertContains($str, $text);
-        }
-    }
-
-
-    /**
-     * Data provider for testServerExport
-     *
-     * @return array Test cases data
-     */
-    public function exportDataProvider()
-    {
-        return array(
-            array(
-                'CSV',
-                array('"1","2"')
-            ),
-            array(
-                'SQL',
-                array(
-                    "CREATE TABLE IF NOT EXISTS `test_table`",
-                    "INSERT INTO `test_table` (`id`, `val`) VALUES",
-                    "(1, 2);"
-                )
-            ),
-            array(
-                'JSON',
-                array('[{"id":"1","val":"2"}]')
-            )
-        );
-    }
-
-    /**
-     * Function that goes to the import page, uploads a file and submit form
-     *
-     * @param string $type   level: server, db or import
-     * @param string $plugin format: csv, json, etc
-     *
-     * @return string export string
-     */
-    private function _doExport($type, $plugin)
-    {
-        $this->expandMore();
-
-        $this->waitForElement('byLinkText', "Export")->click();
-        $this->sleep();
-
-        $this->waitForElement("byId", "quick_or_custom");
-        /*
-         * FIXME: There should be better way to wait for javascript to be executed
-         */
-        $this->sleep();
-        $this->byCssSelector("label[for=radio_custom_export]")->click();
-
-        if ($type == 'server') {
-            $this->byLinkText('Unselect all')->click();
-            $this->byCssSelector(
-                "option[value=" . $this->database_name . "]"
-            )->click();
-        }
-
-        if ($type == 'table') {
-            $this->byCssSelector("label[for=radio_allrows_0]")->click();
-            $this->sleep();
-            $this->byName("limit_to")->clear();
-            $this->byName("limit_to")->value("1");
-        }
-
-        $this->select($this->byId("plugins"))->selectOptionByLabel($plugin);
-        $this->byCssSelector("label[for=radio_view_as_text]")->click();
-
-        if ($plugin == "SQL") {
-            $this->byCssSelector(
-                "label[for=radio_sql_structure_or_data_structure_and_data]"
-            )->click();
-
-            if ($type != "table") {
-                $this->byCssSelector(
-                    "label[for=checkbox_sql_create_database]"
-                )->click();
-            }
-        }
-
-        $this->byId("buttonGo")->click();
-
-        $text = $this->waitForElement("byId", "textSQLDUMP")->text();
-
-        return $text;
-    }
-}
diff --git a/#pma/test/selenium/PmaSeleniumImportTest.php b/#pma/test/selenium/PmaSeleniumImportTest.php
deleted file mode 100644
index 1bb93d4a..00000000
--- a/#pma/test/selenium/PmaSeleniumImportTest.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Selenium TestCase for import related tests
- *
- * @package    PhpMyAdmin-test
- * @subpackage Selenium
- */
-
-require_once 'TestBase.php';
-
-/**
- * PmaSeleniumImportTest class
- *
- * @package    PhpMyAdmin-test
- * @subpackage Selenium
- * @group      selenium
- */
-class PMA_SeleniumImportTest extends PMA_SeleniumBase
-{
-    /**
-     * setUp function that can use the selenium session (called before each test)
-     *
-     * @return void
-     */
-    public function setUpPage()
-    {
-        $this->login();
-    }
-
-    /**
-     * Test for server level import
-     *
-     * @return void
-     *
-     * @group large
-     */
-    public function testServerImport()
-    {
-        $this->_doImport('server');
-        $result = $this->dbQuery("SHOW DATABASES LIKE 'test_import%'");
-        $this->assertGreaterThanOrEqual(2, $result->num_rows);
-
-        // clear db
-        $this->dbQuery("DROP DATABASE test_import1");
-        $this->dbQuery("DROP DATABASE test_import2");
-    }
-
-    /**
-     * Test for db level import
-     *
-     * @return void
-     *
-     * @group large
-     */
-    public function testDbImport()
-    {
-        $this->dbQuery("CREATE DATABASE " . $this->database_name);
-        $this->waitForElement("byLinkText", $this->database_name)->click();
-        $this->waitForElement(
-            "byXPath",
-            "//a[@class='item' and contains(., 'Database: "
-            . $this->database_name . "')]"
-        );
-
-        $this->_doImport("db");
-
-        $this->dbQuery("USE " . $this->database_name);
-        $result = $this->dbQuery("SHOW TABLES");
-        $this->assertEquals(1, $result->num_rows);
-    }
-
-    /**
-     * Test for table level import
-     *
-     * @return void
-     *
-     * @group large
-     */
-    public function testTableImport()
-    {
-        // setup the db
-        $this->dbQuery("CREATE DATABASE " . $this->database_name);
-        $this->dbQuery("USE " . $this->database_name);
-        $this->dbQuery(
-            "CREATE TABLE IF NOT EXISTS `test_table` (`val` int(11) NOT NULL)"
-        );
-
-        $this->navigateTable('test_table');
-
-        $this->_doImport("table");
-
-        $result = $this->dbQuery("SELECT * FROM test_table");
-        $this->assertEquals(2, $result->num_rows);
-    }
-
-    /**
-     * Function that goes to the import page, uploads a file and submit form
-     *
-     * @param string $type level: server, db or import
-     *
-     * @return void
-     */
-    private function _doImport($type)
-    {
-        /* FIXME: Need to implement file upload compatible with remote Selenium */
-        $this->markTestIncomplete(
-            'File uploading not yet implemented in Selenium test'
-        );
-        $this->waitForElement('byLinkText', "Import")->click();
-        $ele = $this->waitForElement("byId", "input_import_file");
-        $ele->value(
-            dirname(__FILE__) . "/../test_data/" . $type . "_import.sql"
-        );
-        $this->byId("buttonGo")->click();
-        $this->waitForElement(
-            "byXPath",
-            "//div[@class='success' and contains(., 'Import has been successfully')]"
-        );
-    }
-}
diff --git a/#pma/test/selenium/PmaSeleniumLoginTest.php b/#pma/test/selenium/PmaSeleniumLoginTest.php
deleted file mode 100644
index 268cde40..00000000
--- a/#pma/test/selenium/PmaSeleniumLoginTest.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Selenium TestCase for login related tests
- *
- * @package    PhpMyAdmin-test
- * @subpackage Selenium
- */
-
-require_once 'TestBase.php';
-
-/**
- * PmaSeleniumLoginTest class
- *
- * @package    PhpMyAdmin-test
- * @subpackage Selenium
- * @group      selenium
- */
-class PMA_SeleniumLoginTest extends PMA_SeleniumBase
-{
-    /**
-     * Test for successful login
-     *
-     * @return void
-     *
-     * @group large
-     */
-    public function testSuccessfulLogin()
-    {
-        $this->logOutIfLoggedIn();
-        $this->login();
-        $this->waitForElement("byXPath", "//*[@id=\"serverinfo\"]");
-        $this->assertTrue($this->isSuccessLogin());
-        $this->logOutIfLoggedIn();
-    }
-
-    /**
-     * Test for unsuccessful login
-     *
-     * @return void
-     *
-     * @group large
-     */
-    public function testLoginWithWrongPassword()
-    {
-        $this->logOutIfLoggedIn();
-        $this->login("Admin", "Admin");
-        $this->waitForElement("byCssSelector", "div.error");
-        $this->assertTrue($this->isUnsuccessLogin());
-    }
-}
diff --git a/#pma/test/selenium/PmaSeleniumNormalizationTest.php b/#pma/test/selenium/PmaSeleniumNormalizationTest.php
deleted file mode 100644
index 3b7582dc..00000000
--- a/#pma/test/selenium/PmaSeleniumNormalizationTest.php
+++ /dev/null
@@ -1,168 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Selenium TestCase for normalization
- *
- * @package    PhpMyAdmin-test
- * @subpackage Selenium
- */
-
-require_once 'TestBase.php';
-
-/**
- * PMA_SeleniumNormalizationTest class
- *
- * @package    PhpMyAdmin-test
- * @subpackage Selenium
- * @group      selenium
- */
-class PMA_SeleniumNormalizationTest extends PMA_SeleniumBase
-{
-    /**
-     * Setup the browser environment to run the selenium test case
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        parent::setUp();
-        $this->dbQuery(
-            "CREATE TABLE `test_table` ("
-            . " `id` int(11) NOT NULL AUTO_INCREMENT,"
-            . " `val` int(11) NOT NULL,"
-            . " `val2` varchar(64) NOT NULL,"
-            . "PRIMARY KEY(id)"
-            . ")"
-        );
-    }
-
-    /**
-     * setUp function that can use the selenium session
-     *
-     * @return void
-     */
-    public function setUpPage()
-    {
-        $this->login();
-        $this->navigateTable('test_table');
-        $this->waitForElement(
-            "byXPath",
-            "(//a[contains(., 'Structure')])"
-        )->click();
-        $this->waitForElement("byId", "tablestructure");
-        $this->byLinkText('Improve table structure')->click();
-        $this->waitForElement("byId", "normalizeTable");
-    }
-
-    /**
-     * Test for normalization to 1NF
-     *
-     * @return void
-     *
-     * @group large
-     */
-    public function testNormalizationTo1NF()
-    {
-        $this->assertTrue(
-            $this->isElementPresent('byCssSelector', 'fieldset')
-        );
-        $this->assertEquals(
-            "First step of normalization (1NF)",
-            $this->byCssSelector('label[for=normalizeTo_1nf]')->text()
-        );
-        $this->assertTrue(
-            $this->isElementPresent(
-                'byCssSelector', 'input[id=normalizeTo_1nf][type=radio]:checked'
-            )
-        );
-        $this->byCssSelector('input[name=submit_normalize]')->click();
-        $this->waitForElement('byId', 'mainContent');
-        $this->_test1NFSteps();
-    }
-
-    /**
-     * assertions in 1NF steps 1.1, 1.2, 1.3
-     *
-     * @return void
-     */
-    private function _test1NFSteps()
-    {
-        $this->assertEquals(
-            "First step of normalization (1NF)",
-            $this->byCssSelector('#page_content h3')->text()
-        );
-        $this->assertTrue(
-            $this->isElementPresent(
-                'byCssSelector', '#mainContent h4'
-            )
-        );
-        $this->assertTrue(
-            $this->isElementPresent(
-                'byCssSelector', '#mainContent #newCols'
-            )
-        );
-        $this->assertTrue(
-            $this->isElementPresent(
-                'byCssSelector', '.tblFooters'
-            )
-        );
-        $this->assertTrue(
-            $this->isElementPresent(
-                'byCssSelector', '#selectNonAtomicCol option[value=val2]'
-            )
-        );
-        $this->assertFalse(
-            $this->isElementPresent(
-                'byCssSelector', '#selectNonAtomicCol option[value=val]'
-            )
-        );
-        $this->assertTrue(
-            $this->isElementPresent(
-                'byCssSelector', '#selectNonAtomicCol option[value=no_such_col]'
-            )
-        );
-        $this->select(
-            $this->byId('selectNonAtomicCol')
-        )->selectOptionByValue('no_such_col');
-        $this->waitForElement(
-            "byXPath",
-            "//legend[contains(., 'Step 1.2 Have a primary key')]"
-        );
-        $text = $this->byCssSelector("#mainContent h4")->text();
-        $this->assertContains("Primary key already exists.", $text);
-        $this->waitForElement(
-            "byXPath",
-            "//legend[contains(., 'Step 1.3 Move repeating groups')]"
-        );
-        $this->byCssSelector('input[value="No repeating group"]')->click();
-        $this->waitForElement(
-            "byXPath",
-            "//legend[contains(., 'Step 1.4 Remove redundant columns')]"
-        );
-        $this->assertTrue(
-            $this->isElementPresent(
-                'byCssSelector', '#mainContent #extra'
-            )
-        );
-        $this->assertTrue(
-            $this->isElementPresent(
-                'byCssSelector', '#extra input[value=val2][type=checkbox]'
-            )
-        );
-        $this->assertTrue(
-            $this->isElementPresent(
-                'byCssSelector', '#extra input[value=id][type=checkbox]'
-            )
-        );
-        $this->byCssSelector('#extra input[value=val][type=checkbox]')->click();
-        $this->byCssSelector("#removeRedundant")->click();
-        $this->waitForElement(
-            "byXPath",
-            "//legend[contains(., 'End of step')]"
-        );
-        $this->assertContains(
-            "The first step of normalization is complete for table 'test_table'.",
-            $this->byCssSelector("#mainContent h4")->text()
-        );
-    }
-}
\ No newline at end of file
diff --git a/#pma/test/selenium/PmaSeleniumPrivilegesTest.php b/#pma/test/selenium/PmaSeleniumPrivilegesTest.php
deleted file mode 100644
index b4360e2f..00000000
--- a/#pma/test/selenium/PmaSeleniumPrivilegesTest.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Selenium TestCase for privilege related tests
- *
- * @package    PhpMyAdmin-test
- * @subpackage Selenium
- */
-
-require_once 'TestBase.php';
-
-/**
- * PmaSeleniumPrivilegesTest class
- *
- * @package    PhpMyAdmin-test
- * @subpackage Selenium
- * @group      selenium
- */
-class PMA_SeleniumPrivilegesTest extends PMA_SeleniumBase
-{
-    /**
-     * Tests the changing of the password
-     *
-     * @return void
-     *
-     * @group large
-     */
-    public function testChangePassword()
-    {
-        $this->login();
-        $this->waitForElement('byLinkText', "Change password")->click();
-
-        $e = $this->waitForElement("byId", "change_password_anchor");
-        try {
-            $ele = $this->waitForElement("byId", "text_pma_pw");
-            $this->assertEquals("", $ele->value());
-        } catch (PHPUnit_Framework_AssertionFailedError $e) {
-            array_push($this->verificationErrors, $e->toString());
-        }
-        try {
-            $ele = $this->waitForElement("byId", "text_pma_pw2");
-            $this->assertEquals("", $ele->value());
-        } catch (PHPUnit_Framework_AssertionFailedError $e) {
-            array_push($this->verificationErrors, $e->toString());
-        }
-        try {
-            $ele = $this->waitForElement("byId", "generated_pw");
-            $this->assertEquals("", $ele->value());
-        } catch (PHPUnit_Framework_AssertionFailedError $e) {
-            array_push($this->verificationErrors, $e->toString());
-        }
-        $this->byId("button_generate_password")->click();
-        $this->assertNotEquals("", $this->byId("text_pma_pw")->value());
-        $this->assertNotEquals("", $this->byId("text_pma_pw2")->value());
-        $this->assertNotEquals("", $this->byId("generated_pw")->value());
-
-        if ($GLOBALS['TESTSUITE_PASSWORD'] != "") {
-            $this->byId("text_pma_pw")->clear();
-            $this->byId("text_pma_pw2")->clear();
-            $this->byId("text_pma_pw")->value($GLOBALS['TESTSUITE_PASSWORD']);
-            $this->byId("text_pma_pw2")->value($GLOBALS['TESTSUITE_PASSWORD']);
-        } else {
-            $this->byId("nopass_1")->click();
-        }
-
-        $this->byCssSelector("span.ui-button-text:nth-child(1)")->click();
-        $ele = $this->waitForElement("byCssSelector", "div.success");
-        $this->assertEquals(
-            "The profile has been updated.",
-            $ele->text()
-        );
-    }
-}
diff --git a/#pma/test/selenium/PmaSeleniumServerSettingsTest.php b/#pma/test/selenium/PmaSeleniumServerSettingsTest.php
deleted file mode 100644
index 016e292d..00000000
--- a/#pma/test/selenium/PmaSeleniumServerSettingsTest.php
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Selenium TestCase for settings related tests
- *
- * @package    PhpMyAdmin-test
- * @subpackage Selenium
- */
-
-require_once 'TestBase.php';
-
-/**
- * PmaSeleniumServerSettingsTest class
- *
- * @package    PhpMyAdmin-test
- * @subpackage Selenium
- * @group      selenium
- */
-class PMA_SeleniumSettingsTest extends PMA_SeleniumBase
-{
-    /**
-     * setUp function that can use the selenium session (called before each test)
-     *
-     * @return void
-     */
-    public function setUpPage()
-    {
-        $this->login();
-        $this->expandMore();
-        $this->waitForElement("byLinkText", "Settings")->click();
-        $this->waitForElement(
-            "byXPath", "//a[@class='tabactive' and contains(., 'Settings')]"
-        );
-        $this->sleep();
-    }
-
-    /**
-     * Saves config and asserts correct message.
-     *
-     * @return void
-     */
-    private function _saveConfig()
-    {
-        $this->byName("submit_save")->click();
-        $this->sleep();
-        $this->waitForElement(
-            "byXPath",
-            "//div[@class='success' and contains(., 'Configuration has been saved')]"
-        );
-    }
-
-    /**
-     * Tests whether hiding a database works or not
-     *
-     * @return void
-     *
-     * @group large
-     */
-    public function testHideDatabase()
-    {
-        /* FIXME: This test fails even though it is same as testHideLogo */
-        $this->markTestIncomplete('Currently broken');
-
-        $this->byLinkText("Features")->click();
-
-        $this->waitForElement("byName", "Servers-1-hide_db")
-            ->value($this->database_name);
-        $this->_saveConfig();
-        $this->assertFalse(
-            $this->isElementPresent("byLinkText", $this->database_name)
-        );
-
-        $this->waitForElement("byName", "Servers-1-hide_db")->clear();
-        $this->_saveConfig();
-        $this->assertTrue(
-            $this->isElementPresent("byLinkText", $this->database_name)
-        );
-    }
-
-    /**
-     * Tests whether the various settings tabs are displayed when clicked
-     *
-     * @return void
-     *
-     * @group large
-     */
-    public function testSettingsTabsAreDisplayed()
-    {
-        $this->byLinkText("SQL queries")->click();
-        $this->waitForElement('byClassName', 'tabs');
-
-        $this->byLinkText("SQL Query box")->click();
-        $this->assertTrue(
-            $this->byId("Sql_box")->displayed()
-        );
-        $this->assertFalse(
-            $this->byId("Sql_queries")->displayed()
-        );
-
-        $this->byCssSelector("a[href='#Sql_queries']")->click();
-        $this->assertFalse(
-            $this->byId("Sql_box")->displayed()
-        );
-        $this->assertTrue(
-            $this->byId("Sql_queries")->displayed()
-        );
-    }
-
-    /**
-     * Tests if hiding the logo works or not
-     *
-     * @return void
-     *
-     * @group large
-     */
-    public function testHideLogo()
-    {
-        $this->byLinkText("Navigation panel")->click();
-
-        $this->waitForElement("byName", "NavigationDisplayLogo")
-            ->click();
-        $this->_saveConfig();
-        $this->assertFalse(
-            $this->isElementPresent("byId", "imgpmalogo")
-        );
-
-        $this->byCssSelector("a[href='#NavigationDisplayLogo']")->click();
-        $this->_saveConfig();
-        $this->assertTrue(
-            $this->isElementPresent("byId", "imgpmalogo")
-        );
-    }
-
-}
diff --git a/#pma/test/selenium/PmaSeleniumTableBrowseTest.php b/#pma/test/selenium/PmaSeleniumTableBrowseTest.php
deleted file mode 100644
index 798b5374..00000000
--- a/#pma/test/selenium/PmaSeleniumTableBrowseTest.php
+++ /dev/null
@@ -1,344 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Selenium TestCase for table related tests
- *
- * @package    PhpMyAdmin-test
- * @subpackage Selenium
- */
-
-require_once 'TestBase.php';
-
-/**
- * PmaSeleniumTableBrowseTest class
- *
- * @package    PhpMyAdmin-test
- * @subpackage Selenium
- * @group      selenium
- */
-class PMA_SeleniumTableBrowseTest extends PMA_SeleniumBase
-{
-    /**
-     * Setup the browser environment to run the selenium test case
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        parent::setUp();
-        $this->dbQuery(
-            "CREATE TABLE `test_table` ("
-            . " `id` int(11) NOT NULL AUTO_INCREMENT,"
-            . " `name` varchar(20) NOT NULL,"
-            . " `datetimefield` datetime NOT NULL,"
-            . " PRIMARY KEY (`id`)"
-            . ")"
-        );
-        $this->dbQuery(
-            "INSERT INTO `test_table` (`id`, `name`, `datetimefield`) VALUES"
-            . " (1, 'abcd', '2011-01-20 02:00:02'),"
-            . " (2, 'foo', '2010-01-20 02:00:02'),"
-            . " (3, 'Abcd', '2012-01-20 02:00:02')"
-        );
-    }
-
-    /**
-     * setUp function that can use the selenium session (called before each test)
-     *
-     * @return void
-     */
-    public function setUpPage()
-    {
-        $this->login();
-        $this->navigateTable('test_table');
-    }
-
-    /**
-     * Test sorting of records in browse table
-     *
-     * @return void
-     *
-     * @group large
-     */
-    public function testSortRecords()
-    {
-        /* TODO: needs to be fixed */
-        $this->markTestIncomplete(
-            'Does not work with multi column sorting.'
-        );
-        // case 1
-        $this->byLinkText("name")->click();
-        $this->waitForElementNotPresent("byId", "loading_parent");
-        $this->sleep();
-
-        $this->assertEquals(
-            "1",
-            $this->getCellByTableClass('table_results', 1, 5)
-        );
-
-        $this->assertEquals(
-            "3",
-            $this->getCellByTableClass('table_results', 2, 5)
-        );
-
-        $this->assertEquals(
-            "2",
-            $this->getCellByTableClass('table_results', 3, 5)
-        );
-
-        // case 2
-        $this->byLinkText("name")->click();
-        $this->waitForElementNotPresent("byId", "loading_parent");
-        $this->sleep();
-
-        $this->assertEquals(
-            "2",
-            $this->getCellByTableClass('table_results', 1, 5)
-        );
-
-        $this->assertEquals(
-            "1",
-            $this->getCellByTableClass('table_results', 2, 5)
-        );
-
-        $this->assertEquals(
-            "3",
-            $this->getCellByTableClass('table_results', 3, 5)
-        );
-
-        // case 2
-        $this->byLinkText("datetimefield")->click();
-        $this->waitForElementNotPresent("byId", "loading_parent");
-        $this->sleep();
-
-        $this->assertEquals(
-            "3",
-            $this->getCellByTableClass('table_results', 1, 5)
-        );
-
-        $this->assertEquals(
-            "1",
-            $this->getCellByTableClass('table_results', 2, 5)
-        );
-
-        $this->assertEquals(
-            "2",
-            $this->getCellByTableClass('table_results', 3, 5)
-        );
-
-        // case 4
-        $this->byLinkText("datetimefield")->click();
-        $this->waitForElementNotPresent("byId", "loading_parent");
-        $this->sleep();
-
-        $this->assertEquals(
-            "2",
-            $this->getCellByTableClass('table_results', 1, 5)
-        );
-
-        $this->assertEquals(
-            "1",
-            $this->getCellByTableClass('table_results', 2, 5)
-        );
-
-        $this->assertEquals(
-            "3",
-            $this->getCellByTableClass('table_results', 3, 5)
-        );
-    }
-
-    /**
-     * Test Edit Record
-     *
-     * @return void
-     *
-     * @group large
-     */
-    public function testChangeRecords()
-    {
-        $this->sleep();
-        $this->byCssSelector(
-            "table.table_results tbody tr:nth-child(2) td:nth-child(2) a"
-        )->click();
-        $this->sleep();
-        /* TODO: this occasionally fails, so there is probably something wrong */
-        $this->waitForElement("byId", "insertForm");
-
-        $this->assertEquals(
-            "2",
-            $this->byId("field_1_3")->value()
-        );
-
-        $this->assertEquals(
-            "foo",
-            $this->byId("field_2_3")->value()
-        );
-
-        $this->assertEquals(
-            "2010-01-20 02:00:02",
-            $this->byId("field_3_3")->value()
-        );
-
-        $this->byId("field_2_3")->clear();
-        $this->byId("field_2_3")->value("foobar");
-        $this->byId("field_3_3")->clear();
-        $this->byId("field_3_3")->value("2009-01-20 02:00:02");
-
-        $this->byId("buttonYes")->click();
-
-        $success = $this->waitForElement("byClassName", "success");
-        $this->assertContains("1 row affected", $success->text());
-
-        $this->assertEquals(
-            "foobar",
-            $this->getCellByTableClass('table_results', 2, 6)
-        );
-
-        $this->assertEquals(
-            "2009-01-20 02:00:02",
-            $this->getCellByTableClass('table_results', 2, 7)
-        );
-    }
-
-    /**
-     * Test edit record by double click
-     *
-     * @return void
-     *
-     * @group large
-     */
-    public function testChangeRecordsByDoubleClick()
-    {
-        $element = $this->byCssSelector(
-            "table.table_results tbody tr:nth-child(1) td:nth-child(6)"
-        );
-
-        $this->moveto($element);
-        $this->doubleclick();
-
-        $this->assertEquals(
-            $this->byCssSelector("textarea.edit_box")->value(),
-            "abcd"
-        );
-
-        $this->byCssSelector("textarea.edit_box")->clear();
-        $this->byCssSelector("textarea.edit_box")->value("abcde");
-        $this->keys(PHPUnit_Extensions_Selenium2TestCase_Keys::RETURN_);
-
-        $success = $this->waitForElement(
-            "byCssSelector", "span.ajax_notification div.success"
-        );
-        $this->assertContains("1 row affected", $success->text());
-
-        $this->assertEquals(
-            "abcde",
-            $this->getCellByTableClass('table_results', 1, 6)
-        );
-    }
-
-    /**
-     * Test copy and insert record
-     *
-     * @return void
-     *
-     * @group large
-     */
-    public function testCopyRecords()
-    {
-        $this->byCssSelector(
-            "table.table_results tbody tr:nth-child(3) td:nth-child(3) a"
-        )->click();
-
-        /* TODO: this occasionally fails, so there is probably something wrong */
-        $this->waitForElement("byId", "insertForm");
-
-        $this->assertEquals(
-            "Abcd",
-            $this->byId("field_2_3")->value()
-        );
-
-        $this->assertEquals(
-            "2012-01-20 02:00:02",
-            $this->byId("field_3_3")->value()
-        );
-
-        $this->byId("field_2_3")->clear();
-        $this->byId("field_2_3")->value("ABCDEFG");
-        $this->byId("field_3_3")->clear();
-        $this->byId("field_3_3")->value("2012-01-20 02:05:02");
-
-        $this->byId("buttonYes")->click();
-        $success = $this->waitForElement("byClassName", "success");
-        $this->assertContains("1 row inserted", $success->text());
-
-        $this->assertEquals(
-            "ABCDEFG",
-            $this->getCellByTableClass('table_results', 4, 6)
-        );
-
-        $this->assertEquals(
-            "2012-01-20 02:05:02",
-            $this->getCellByTableClass('table_results', 4, 7)
-        );
-    }
-
-    /**
-     * Test search table
-     *
-     * @return void
-     *
-     * @group large
-     */
-    public function testSearchRecords()
-    {
-        $this->expandMore();
-
-        $this->byLinkText("Search")->click();
-        $this->waitForElement("byId", "tbl_search_form");
-
-        $this->byId("fieldID_1")->value("abcd");
-        $select = $this->select($this->byName("criteriaColumnOperators[1]"));
-        $select->selectOptionByLabel("LIKE %...%");
-
-        $this->byName("submit")->click();
-        $success = $this->waitForElement("byClassName", "success");
-        $this->assertContains("Showing rows", $success->text());
-
-        $this->assertEquals(
-            "1",
-            $this->getCellByTableClass('table_results', 1, 5)
-        );
-
-        $this->assertEquals(
-            "3",
-            $this->getCellByTableClass('table_results', 2, 5)
-        );
-    }
-
-    /**
-     * Test delete multiple records
-     *
-     * @return void
-     *
-     * @group large
-     */
-    public function testDeleteRecords()
-    {
-        $this->byId("id_rows_to_delete1_left")->click();
-        $this->byId("id_rows_to_delete2_left")->click();
-
-        $this->byCssSelector("button[value=delete]")->click();
-        $this->waitForElement("byCssSelector", "fieldset.confirmation");
-
-        $this->byId("buttonYes")->click();
-        $success = $this->waitForElement("byClassName", "success");
-        $this->assertContains("Showing rows", $success->text());
-
-        $this->assertFalse(
-            $this->isElementPresent(
-                "byCssSelector", "table.table_results tbody tr:nth-child(2)"
-            )
-        );
-
-    }
-}
diff --git a/#pma/test/selenium/PmaSeleniumTableCreateTest.php b/#pma/test/selenium/PmaSeleniumTableCreateTest.php
deleted file mode 100644
index 9d8981bc..00000000
--- a/#pma/test/selenium/PmaSeleniumTableCreateTest.php
+++ /dev/null
@@ -1,162 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Selenium TestCase for table related tests
- *
- * @package    PhpMyAdmin-test
- * @subpackage Selenium
- */
-
-require_once 'TestBase.php';
-
-/**
- * PmaSeleniumTableCreateTest class
- *
- * @package    PhpMyAdmin-test
- * @subpackage Selenium
- * @group      selenium
- */
-class PMA_SeleniumTableCreateTest extends PMA_SeleniumBase
-{
-    /**
-     * Creates a table
-     *
-     * @return void
-     *
-     * @group large
-     */
-    public function testCreateTable()
-    {
-        $this->login();
-        $this->waitForElement('byLinkText', $this->database_name)->click();
-
-        $this->waitForElement('byId', 'create_table_form_minimal');
-        $this->byCssSelector(
-            "form#create_table_form_minimal input[name=table]"
-        )->value("test_table");
-        $this->byName("num_fields")->value("4");
-        $this->byCssSelector('input[value=Go]')->click();
-        $this->waitForElement('byName', 'do_save_data');
-
-        // column details
-        $column_text_details = array(
-            "field_0_1" => "test_id",
-            "field_0_3" => "14",
-            "field_0_10" => "comm1",
-            "field_1_1" => "test_column",
-            "field_1_3" => "10",
-            "field_1_10" => "comm2",
-        );
-
-        foreach ($column_text_details as $field => $val) {
-            $this->byId($field)->value($val);
-        }
-
-        $column_dropdown_details = array(
-            "field_0_6" => "UNSIGNED",
-            "field_0_8" => "PRIMARY",
-            "field_1_2" => "VARCHAR",
-            "field_1_5" => "utf8_general_ci",
-            "field_1_4" => "As defined:"
-        );
-
-        foreach ($column_dropdown_details as $selector => $value) {
-            $sel = $this->select($this->byId($selector));
-            $sel->selectOptionByLabel($value);
-        }
-
-        $this->byName("field_default_value[1]")->value("def");
-        $this->byId("field_0_9")->click(); // auto increment
-        $this->byId("field_1_7")->click(); // null
-
-        // post
-        $this->byName("do_save_data")->click();
-        $this->waitForElement("byLinkText", "test_table");
-
-        $this->_tableStructureAssertions();
-    }
-
-    /**
-     * Make assertions for table structure
-     *
-     * @return void
-     */
-    private function _tableStructureAssertions()
-    {
-        // go to structure page
-        $this->byLinkText("Structure")->click();
-        $this->waitForElement("byId", "tablestructure");
-
-        // make assertions for first row
-        $this->assertContains(
-            "test_id",
-            $this->byCssSelector('label[for=checkbox_row_1]')->text()
-        );
-
-        $this->assertEquals(
-            "int(14)",
-            $this->getCellByTableId('tablestructure', 1, 4)
-        );
-
-        $this->assertEquals(
-            "UNSIGNED",
-            $this->getCellByTableId('tablestructure', 1, 6)
-        );
-
-        $this->assertEquals(
-            "No",
-            $this->getCellByTableId('tablestructure', 1, 7)
-        );
-
-        $this->assertEquals(
-            "None",
-            $this->getCellByTableId('tablestructure', 1, 8)
-        );
-
-        $this->assertEquals(
-            "AUTO_INCREMENT",
-            $this->getCellByTableId('tablestructure', 1, 9)
-        );
-
-        $this->assertFalse(
-            $this->isElementPresent(
-                'byCssSelector',
-                'table#tablestructure tbody tr:nth-child(1) "
-                . "ul.table-structure-actions li.primary a'
-            )
-        );
-
-        // make assertions for second row
-        $this->assertContains(
-            "test_column",
-            $this->byCssSelector('label[for=checkbox_row_2]')->text()
-        );
-
-        $this->assertEquals(
-            "varchar(10)",
-            $this->getCellByTableId('tablestructure', 2, 4)
-        );
-
-        $this->assertEquals(
-            "utf8_general_ci",
-            $this->getCellByTableId('tablestructure', 2, 5)
-        );
-
-        $this->assertEquals(
-            "Yes",
-            $this->getCellByTableId('tablestructure', 2, 7)
-        );
-
-        $this->assertEquals(
-            "def",
-            $this->getCellByTableId('tablestructure', 2, 8)
-        );
-
-        $this->assertFalse(
-            $this->isElementPresent(
-                'byCssSelector',
-                'css=ul.table-structure-actions:nth-child(2) li.primary a'
-            )
-        );
-    }
-}
diff --git a/#pma/test/selenium/PmaSeleniumTableInsertTest.php b/#pma/test/selenium/PmaSeleniumTableInsertTest.php
deleted file mode 100644
index 81915635..00000000
--- a/#pma/test/selenium/PmaSeleniumTableInsertTest.php
+++ /dev/null
@@ -1,153 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Selenium TestCase for table related tests
- *
- * @package    PhpMyAdmin-test
- * @subpackage Selenium
- */
-
-require_once 'TestBase.php';
-
-/**
- * PmaSeleniumTableInsertTest class
- *
- * @package    PhpMyAdmin-test
- * @subpackage Selenium
- * @group      selenium
- */
-class PMA_SeleniumTableInsertTest extends PMA_SeleniumBase
-{
-    /**
-     * Setup the browser environment to run the selenium t
-     * est case
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        parent::setUp();
-        $this->dbQuery(
-            "CREATE TABLE `test_table` ("
-            . " `id` int(11) NOT NULL AUTO_INCREMENT,"
-            . " `name` varchar(20) NOT NULL,"
-            . " `datetimefield` datetime NOT NULL,"
-            . " PRIMARY KEY (`id`)"
-            . ")"
-        );
-
-    }
-
-    /**
-     * setUp function that can use the selenium session (called before each test)
-     *
-     * @return void
-     */
-    public function setUpPage()
-    {
-        $this->login();
-        $this->navigateTable('test_table');
-    }
-
-    /**
-     * Insert data into table
-     *
-     * @return void
-     *
-     * @group large
-     */
-    public function testAddData()
-    {
-        if (mb_strtolower($this->getBrowser()) == 'safari') {
-            /* TODO: this should be fixed, but the cause is unclear to me */
-            $this->markTestIncomplete('Fails with Safari');
-        }
-        $this->expandMore();
-
-        $this->byLinkText("Insert")->click();
-        $this->waitForElement("byId", "insertForm");
-
-        $this->byId("field_1_3")->value("1");
-        $this->byId("field_2_3")->value("abcd");
-        $this->byId("field_3_3")->value("2011-01-20 02:00:02");
-        $this->byId("field_5_3")->value("foo");
-        $this->byId("field_6_3")->value("2010-01-20 02:00:02");
-
-        $select = $this->select($this->byName("after_insert"));
-        $select->selectOptionByLabel("Insert another new row");
-
-        // post
-        $this->byId("buttonYes")->click();
-        $ele = $this->waitForElement("byClassName", "success");
-        $this->assertContains("2 rows inserted", $ele->text());
-
-        $this->byId("field_2_3")->value("Abcd");
-        $this->byId("field_3_3")->value("2012-01-20 02:00:02");
-
-        // post
-        $this->byCssSelector(
-            "input[value=Go]"
-        )->click();
-
-        $this->waitForElementNotPresent("byId", "loading_parent");
-        $ele = $this->waitForElement("byClassName", "success");
-        $this->assertContains("1 row inserted", $ele->text());
-        $this->_assertDataPresent();
-    }
-
-    /**
-     * Assert various data present in results table
-     *
-     * @return void
-     */
-    private function _assertDataPresent()
-    {
-        $this->byLinkText("Browse")->click();
-        $this->waitForElement("byId", "table_results");
-
-        $this->assertEquals(
-            "1",
-            $this->getCellByTableClass('table_results', 1, 5)
-        );
-
-        $this->assertEquals(
-            "abcd",
-            $this->getCellByTableClass('table_results', 1, 6)
-        );
-
-        $this->assertEquals(
-            "2011-01-20 02:00:02",
-            $this->getCellByTableClass('table_results', 1, 7)
-        );
-
-        $this->assertEquals(
-            "2",
-            $this->getCellByTableClass('table_results', 2, 5)
-        );
-
-        $this->assertEquals(
-            "foo",
-            $this->getCellByTableClass('table_results', 2, 6)
-        );
-
-        $this->assertEquals(
-            "2010-01-20 02:00:02",
-            $this->getCellByTableClass('table_results', 2, 7)
-        );
-
-        $this->assertEquals(
-            "4",
-            $this->getCellByTableClass('table_results', 3, 5)
-        );
-
-        $this->assertEquals(
-            "Abcd",
-            $this->getCellByTableClass('table_results', 3, 6)
-        );
-
-        $this->assertEquals(
-            "2012-01-20 02:00:02",
-            $this->getCellByTableClass('table_results', 3, 7)
-        );
-    }
-}
diff --git a/#pma/test/selenium/PmaSeleniumTableOperationsTest.php b/#pma/test/selenium/PmaSeleniumTableOperationsTest.php
deleted file mode 100644
index 1d066889..00000000
--- a/#pma/test/selenium/PmaSeleniumTableOperationsTest.php
+++ /dev/null
@@ -1,247 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Selenium TestCase for table related tests
- *
- * @package    PhpMyAdmin-test
- * @subpackage Selenium
- */
-
-require_once 'TestBase.php';
-
-/**
- * PmaSeleniumTableOperationsTest class
- *
- * @package    PhpMyAdmin-test
- * @subpackage Selenium
- * @group      selenium
- */
-class PMA_SeleniumTableOperationsTest extends PMA_SeleniumBase
-{
-    /**
-     * Setup the browser environment to run the selenium test case
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        parent::setUp();
-        $this->dbQuery(
-            "CREATE TABLE `test_table` ("
-            . " `id` int(11) NOT NULL AUTO_INCREMENT,"
-            . " `val` int(11) NOT NULL,"
-            . " `val2` int(11) NOT NULL,"
-            . " PRIMARY KEY (`id`)"
-            . ")"
-        );
-        $this->dbQuery("INSERT INTO test_table (val) VALUES (22)");
-        $this->dbQuery("INSERT INTO test_table (val) VALUES (33)");
-    }
-
-    /**
-     * setUp function that can use the selenium session (called before each test)
-     *
-     * @return void
-     */
-    public function setUpPage()
-    {
-        $this->login();
-        $this->navigateTable('test_table');
-
-        $this->expandMore();
-        $this->byXPath("//a[contains(., 'Operations')]")->click();
-        $this->sleep();
-        $this->waitForElement(
-            "byXPath",
-            "//legend[contains(., 'Table maintenance')]"
-        );
-    }
-
-    /**
-     * Test for changing a table order
-     *
-     * @return void
-     *
-     * @group large
-     */
-    public function testChangeTableOrder()
-    {
-        /* FIXME: Need to create table which will allow this */
-        $this->markTestIncomplete(
-            'Changing order is not supported for some tables.'
-        );
-        $this->select($this->byName("order_field"))
-            ->selectOptionByLabel("val");
-
-        $this->byId("order_order_desc")->click();
-        $this->byCssSelector(
-            "form#alterTableOrderby input[type='submit']"
-        )->click();
-
-        $this->waitForElement(
-            "byXPath",
-            "//div[@class='success' and "
-            . "contains(., 'Your SQL query has been executed successfully')]"
-        );
-
-        $this->byLinkText("Browse")->click();
-        $this->waitForElement("byId", "table_results");
-
-        $this->assertEquals(
-            "2",
-            $this->getCellByTableClass('table_results', 1, 5)
-        );
-    }
-
-    /**
-     * Test for moving a table
-     *
-     * @return void
-     *
-     * @group large
-     */
-    public function testMoveTable()
-    {
-        $this->byCssSelector("form#moveTableForm input[name='new_name']")
-            ->value("2");
-
-        $this->byCssSelector("form#moveTableForm input[type='submit']")->click();
-
-        $this->waitForElement(
-            "byXPath",
-            "//div[@class='success' and "
-            . "contains(., 'Table `" . $this->database_name
-            . "`.`test_table` has been "
-            . "moved to `" . $this->database_name . "`.`test_table2`.')]"
-        );
-
-        $result = $this->dbQuery("SHOW TABLES");
-        $row = $result->fetch_assoc();
-        $this->assertEquals(
-            "test_table2",
-            $row["Tables_in_" . $this->database_name]
-        );
-    }
-
-    /**
-     * Test for renaming a table
-     *
-     * @return void
-     *
-     * @group large
-     */
-    public function testRenameTable()
-    {
-        $this->byCssSelector("form#tableOptionsForm input[name='new_name']")
-            ->value("2");
-
-        $this->byName("comment")->value("foobar");
-
-        $this->byCssSelector("form#tableOptionsForm input[type='submit']")->click();
-
-        $this->waitForElement(
-            "byXPath",
-            "//div[@class='success' and "
-            . "contains(., 'Table test_table has been renamed to test_table2')]"
-        );
-
-        $this->assertNotNull(
-            $this->waitForElement(
-                "byXPath",
-                "//span[@id='span_table_comment' and contains(., 'foobar')]"
-            )
-        );
-
-        $result = $this->dbQuery("SHOW TABLES");
-        $row = $result->fetch_assoc();
-        $this->assertEquals(
-            "test_table2",
-            $row["Tables_in_" . $this->database_name]
-        );
-    }
-
-    /**
-     * Test for copying a table
-     *
-     * @return void
-     *
-     * @group large
-     */
-    public function testCopyTable()
-    {
-        $this->byCssSelector("form#copyTable input[name='new_name']")->value("2");
-        $this->byCssSelector("label[for='what_data']")->click();
-        $this->byCssSelector("form#copyTable input[type='submit']")->click();
-
-        $this->waitForElement(
-            "byXPath",
-            "//div[@class='success' and "
-            . "contains(., 'Table `" . $this->database_name
-            . "`.`test_table` has been "
-            . "copied to `" . $this->database_name . "`.`test_table2`.')]"
-        );
-
-        $result = $this->dbQuery("SELECT COUNT(*) as c FROM test_table2");
-        $row = $result->fetch_assoc();
-        $this->assertEquals(
-            2,
-            $row["c"]
-        );
-    }
-
-    /**
-     * Test for truncating a table
-     *
-     * @return void
-     *
-     * @group large
-     */
-    public function testTruncateTable()
-    {
-        $this->byId("truncate_tbl_anchor")->click();
-        $this->byXPath("//button[contains(., 'OK')]")->click();
-
-        $this->waitForElement(
-            "byXPath",
-            "//div[@class='success' and "
-            . "contains(., 'MySQL returned an empty result set')]"
-        );
-
-        $result = $this->dbQuery("SELECT COUNT(*) as c FROM test_table");
-        $row = $result->fetch_assoc();
-        $this->assertEquals(
-            0,
-            $row["c"]
-        );
-    }
-
-    /**
-     * Test for dropping a table
-     *
-     * @return void
-     *
-     * @group large
-     */
-    public function testDropTable()
-    {
-        $this->byId("drop_tbl_anchor")->click();
-        $this->byXPath("//button[contains(., 'OK')]")->click();
-
-        $this->waitForElement(
-            "byXPath",
-            "//div[@class='success' and "
-            . "contains(., 'MySQL returned an empty result set')]"
-        );
-
-        $this->waitForElement(
-            "byXPath",
-            "//a[@class='tabactive' and contains(., 'Structure')]"
-        );
-
-        $result = $this->dbQuery("SHOW TABLES");
-        $this->assertEquals(
-            0,
-            $result->num_rows
-        );
-    }
-}
diff --git a/#pma/test/selenium/PmaSeleniumTableStructureTest.php b/#pma/test/selenium/PmaSeleniumTableStructureTest.php
deleted file mode 100644
index 08cdd829..00000000
--- a/#pma/test/selenium/PmaSeleniumTableStructureTest.php
+++ /dev/null
@@ -1,160 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Selenium TestCase for table related tests
- *
- * @package    PhpMyAdmin-test
- * @subpackage Selenium
- */
-
-require_once 'TestBase.php';
-
-/**
- * PmaSeleniumTableStructureTest class
- *
- * @package    PhpMyAdmin-test
- * @subpackage Selenium
- * @group      selenium
- */
-class PMA_SeleniumTableStructureTest extends PMA_SeleniumBase
-{
-    /**
-     * Setup the browser environment to run the selenium test case
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        parent::setUp();
-        $this->dbQuery(
-            "CREATE TABLE `test_table` ("
-            . " `id` int(11) NOT NULL AUTO_INCREMENT,"
-            . " `val` int(11) NOT NULL,"
-            . " `val2` int(11) NOT NULL,"
-            . " PRIMARY KEY (`id`)"
-            . ")"
-        );
-    }
-
-    /**
-     * setUp function that can use the selenium session (called before each test)
-     *
-     * @return void
-     */
-    public function setUpPage()
-    {
-        $this->login();
-        $this->waitForElement('byLinkText', $this->database_name)->click();
-
-        $this->navigateTable('test_table');
-
-        $this->waitForElement(
-            "byXPath",
-            "(//a[contains(., 'Structure')])"
-        )->click();
-
-        $this->waitForElement("byId", "tablestructure");
-    }
-
-    /**
-     * Test for adding a new column
-     *
-     * @return void
-     *
-     * @group large
-     */
-    public function testAddColumn()
-    {
-        $this->byCssSelector("label[for='field_where_after']")->click();
-        $this->byCssSelector("input[value='Go']")->click();
-
-        $this->waitForElement("byClassName", "append_fields_form");
-
-        $this->byId("field_0_1")->value('val3');
-        $this->byCssSelector("input[name='do_save_data']")->click();
-
-        $this->waitForElement(
-            "byXPath",
-            "//div[@class='success' and contains(., "
-            . "'Table test_table has been altered successfully')]"
-        );
-
-        $this->byLinkText("Structure")->click();
-        $this->waitForElement("byId", "tablestructure");
-
-        $this->assertEquals(
-            "val3",
-            $this->byCssSelector('label[for=checkbox_row_2]')->text()
-        );
-
-        $this->assertEquals(
-            "int(11)",
-            $this->getCellByTableId('tablestructure', 2, 4)
-        );
-    }
-
-    /**
-     * Test for changing a column
-     *
-     * @return void
-     *
-     * @group large
-     */
-    public function testChangeColumn()
-    {
-        $this->byXPath("(//a[contains(., 'Change')])[2]")->click();
-
-        $this->waitForElement("byClassName", "append_fields_form");
-
-        $this->assertEquals("val", $this->byId("field_0_1")->value());
-        $this->byId("field_0_1")->clear();
-        $this->byId("field_0_1")->value('val3');
-        $this->byCssSelector("input[name='do_save_data']")->click();
-
-        $this->waitForElement(
-            "byXPath",
-            "//div[@class='success' and contains(., "
-            . "'Table test_table has been altered successfully')]"
-        );
-
-        $this->byLinkText("Structure")->click();
-        $this->waitForElement("byId", "tablestructure");
-
-        $this->assertEquals(
-            "val3",
-            $this->byCssSelector('label[for=checkbox_row_2]')->text()
-        );
-    }
-
-    /**
-     * Test for dropping columns
-     *
-     * @return void
-     *
-     * @group large
-     */
-    public function testDropColumns()
-    {
-        $this->byCssSelector('label[for=checkbox_row_2]')->click();
-        $this->byCssSelector('label[for=checkbox_row_3]')->click();
-        $this->byXPath(
-            "//button[@class='mult_submit' and contains(., 'Drop')]"
-        )->click();
-
-        $this->waitForElement(
-            "byCssSelector", "input[id='buttonYes']"
-        )->click();
-
-        $this->waitForElement(
-            "byXPath",
-            "//div[@class='success' and contains(., "
-            . "'Your SQL query has been executed successfully')]"
-        );
-
-        $this->assertFalse(
-            $this->isElementPresent(
-                'byCssSelector', 'label[for=checkbox_row_2]'
-            )
-        );
-    }
-}
diff --git a/#pma/test/selenium/PmaSeleniumTrackingTest.php b/#pma/test/selenium/PmaSeleniumTrackingTest.php
deleted file mode 100644
index f1d1156d..00000000
--- a/#pma/test/selenium/PmaSeleniumTrackingTest.php
+++ /dev/null
@@ -1,266 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Selenium TestCase for tracking related tests
- *
- * @package    PhpMyAdmin-test
- * @subpackage Selenium
- */
-
-require_once 'TestBase.php';
-
-/**
- * PmaSeleniumTrackingTest class
- *
- * @package    PhpMyAdmin-test
- * @subpackage Selenium
- * @group      selenium
- */
-class PMA_SeleniumTrackingTest extends PMA_SeleniumBase
-{
-    /**
-     * Setup the browser environment to run the selenium test case
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        parent::setUp();
-        $this->dbQuery(
-            "CREATE TABLE `test_table` ("
-            . " `id` int(11) NOT NULL AUTO_INCREMENT,"
-            . " `val` int(11) NOT NULL,"
-            . " PRIMARY KEY (`id`)"
-            . ")"
-        );
-        $this->dbQuery(
-            "CREATE TABLE `test_table_2` ("
-            . " `id` int(11) NOT NULL AUTO_INCREMENT,"
-            . " `val` int(11) NOT NULL,"
-            . " PRIMARY KEY (`id`)"
-            . ")"
-        );
-        $this->dbQuery(
-            "INSERT INTO `test_table` (val) VALUES (2), (3);"
-        );
-    }
-
-    /**
-     * setUp function that can use the selenium session (called before each test)
-     *
-     * @return void
-     */
-    public function setUpPage()
-    {
-        $this->login();
-
-        $this->skipIfNotPMADB();
-
-        $this->waitForElement('byLinkText', $this->database_name)->click();
-        $this->waitForElement(
-            "byXPath",
-            "//a[@class='item' and contains(., 'Database: "
-            . $this->database_name . "')]"
-        );
-        $this->expandMore();
-        $this->byLinkText("Tracking")->click();
-        $this->waitForElement("byLinkText", "Track table");
-        $this->byXPath("(//a[contains(., 'Track table')])[1]")->click();
-
-        $this->waitForElement("byName", "delete")->click();
-        $this->byCssSelector("input[value='Create version']")->click();
-        $this->waitForElement("byId", "versions");
-    }
-
-    /**
-     * Tests basic tracking functionality
-     *
-     * @return void
-     *
-     * @group large
-     */
-    public function testTrackingData()
-    {
-        $this->_executeSqlAndReturnToTableTracking();
-
-        $this->byLinkText("Tracking report")->click();
-        $this->waitForElement(
-            "byXPath",
-            "//h3[contains(., 'Tracking report')]"
-        );
-
-        $this->assertContains(
-            "DROP TABLE IF EXISTS `test_table`",
-            $this->getCellByTableId('ddl_versions', 1, 4)
-        );
-
-        $this->assertContains(
-            "CREATE TABLE `test_table` (",
-            $this->getCellByTableId('ddl_versions', 2, 4)
-        );
-
-        $this->assertContains(
-            "UPDATE test_table SET val = val + 1",
-            $this->getCellByTableId('dml_versions', 1, 4)
-        );
-
-        $this->assertNotContains(
-            "DELETE FROM test_table WHERE val = 3",
-            $this->byId("dml_versions")->text()
-        );
-
-        // only structure
-        $this->select($this->byName("logtype"))
-            ->selectOptionByLabel("Structure only");
-        $this->byCssSelector("input[value='Go']")->click();
-
-        $this->waitForElementNotPresent("byId", "loading_parent");
-
-        $this->assertFalse(
-            $this->isElementPresent("byId", "dml_versions")
-        );
-
-        $this->assertContains(
-            "DROP TABLE IF EXISTS `test_table`",
-            $this->getCellByTableId('ddl_versions', 1, 4)
-        );
-
-        $this->assertContains(
-            "CREATE TABLE `test_table` (",
-            $this->getCellByTableId('ddl_versions', 2, 4)
-        );
-
-        // only data
-        $this->select($this->byName("logtype"))
-            ->selectOptionByLabel("Data only");
-        $this->byCssSelector("input[value='Go']")->click();
-
-        $this->waitForElementNotPresent("byId", "loading_parent");
-
-        $this->assertFalse(
-            $this->isElementPresent("byId", "ddl_versions")
-        );
-
-        $this->assertContains(
-            "UPDATE test_table SET val = val + 1",
-            $this->getCellByTableId('dml_versions', 1, 4)
-        );
-
-        $this->assertNotContains(
-            "DELETE FROM test_table WHERE val = 3",
-            $this->byId("dml_versions")->text()
-        );
-    }
-
-    /**
-     * Tests deactivation of tracking
-     *
-     * @return void
-     *
-     * @group large
-     */
-    public function testDeactivateTracking()
-    {
-        $this->byCssSelector("input[value='Deactivate now']")->click();
-        $this->waitForElement(
-            "byCssSelector", "input[value='Activate now']"
-        );
-        $this->_executeSqlAndReturnToTableTracking();
-        $this->assertFalse(
-            $this->isElementPresent("byId", "dml_versions")
-        );
-    }
-
-    /**
-     * Tests dropping a tracking
-     *
-     * @return void
-     *
-     * @group large
-     */
-    public function testDropTracking()
-    {
-        $this->byLinkText("Database: " . $this->database_name)->click();
-        $this->waitForElement("byCssSelector", "table.data");
-        usleep(1000000);
-        $this->expandMore();
-        $this->byLinkText("Tracking")->click();
-        $this->waitForElement("byId", "versions");
-        $this->byLinkText("Drop")->click();
-
-        $this->waitForElement(
-            "byXPath",
-            "//button[contains(., 'OK')]"
-        )->click();
-
-        $this->waitForElement(
-            "byXPath",
-            "//div[@class='success' and contains(., "
-            . "'Your SQL query has been executed')]"
-        );
-
-        $this->assertContains(
-            "test_table",
-            $this->getCellByTableId('noversions', 1, 1)
-        );
-
-        $this->assertContains(
-            "test_table_2",
-            $this->getCellByTableId('noversions', 2, 1)
-        );
-    }
-
-    /**
-     * Tests structure snapshot of a tracking
-     *
-     * @return void
-     *
-     * @group large
-     */
-    public function testStructureSnapshot()
-    {
-        $this->byLinkText("Structure snapshot")->click();
-        $this->waitForElement("byId", "tablestructure");
-
-        $this->assertContains(
-            "id",
-            $this->getCellByTableId('tablestructure', 1, 1)
-        );
-
-        $this->assertContains(
-            "val",
-            $this->getCellByTableId('tablestructure', 2, 1)
-        );
-
-        $this->assertContains(
-            "PRIMARY",
-            $this->getCellByTableId('tablestructure_indexes', 1, 1)
-        );
-
-        $this->assertContains(
-            "id",
-            $this->getCellByTableId('tablestructure_indexes', 1, 5)
-        );
-    }
-
-    /**
-     * Goes to SQL tab, executes queries, returns to tracking page
-     *
-     * @return void
-     */
-    private function _executeSqlAndReturnToTableTracking()
-    {
-        $this->byLinkText("SQL")->click();
-        $this->waitForElement("byId", "queryfieldscontainer");
-        $this->typeInTextArea(
-            ";UPDATE test_table SET val = val + 1; "
-            . "DELETE FROM test_table WHERE val = 3"
-        );
-        $this->byCssSelector("input[value='Go']")->click();
-        $this->waitForElement("byClassName", "success");
-
-        $this->expandMore();
-        $this->byLinkText("Tracking")->click();
-        $this->waitForElement("byId", "versions");
-    }
-}
diff --git a/#pma/test/selenium/PmaSeleniumXssTest.php b/#pma/test/selenium/PmaSeleniumXssTest.php
deleted file mode 100644
index 95e99f4c..00000000
--- a/#pma/test/selenium/PmaSeleniumXssTest.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Selenium TestCase for SQL query window related tests
- *
- * @package    PhpMyAdmin-test
- * @subpackage Selenium
- */
-
-require_once 'TestBase.php';
-
-/**
- * PmaSeleniumXSSTest class
- *
- * @package    PhpMyAdmin-test
- * @subpackage Selenium
- * @group      selenium
- */
-class PMA_SeleniumXSSTest extends PMA_SeleniumBase
-{
-    /**
-     * Tests the SQL query tab with a null query
-     *
-     * @return void
-     *
-     * @group large
-     */
-    public function testQueryTabWithNullValue()
-    {
-        if (mb_strtolower($this->getBrowser()) == 'safari') {
-            $this->markTestSkipped('Alerts not supported on Safari browser.');
-        }
-        $this->login();
-        $this->waitForElement('byLinkText', "SQL")->click();
-        $this->waitForElement("byId", "queryboxf");
-        $this->byId("button_submit_query")->click();
-        $this->assertEquals("Missing value in the form!", $this->alertText());
-    }
-}
diff --git a/#pma/test/selenium/TestBase.php b/#pma/test/selenium/TestBase.php
deleted file mode 100644
index e62eeea7..00000000
--- a/#pma/test/selenium/TestBase.php
+++ /dev/null
@@ -1,615 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Base class for Selenium tests
- *
- * @package    PhpMyAdmin-test
- * @subpackage Selenium
- */
-
-/**
- * Base class for Selenium tests.
- *
- * @package    PhpMyAdmin-test
- * @subpackage Selenium
- * @group      selenium
- */
-abstract class PMA_SeleniumBase extends PHPUnit_Extensions_Selenium2TestCase
-{
-    /**
-     * mysqli object
-     *
-     * @access private
-     * @var mysqli
-     */
-    private $_mysqli;
-
-    /**
-     * Name of database for the test
-     *
-     * @access public
-     * @var string
-     */
-    public $database_name;
-
-    /**
-     * Whether Selenium testing should be enabled.
-     *
-     * @access private
-     * @var boolean
-     */
-    private static $_selenium_enabled = false;
-
-    /**
-     * Lists browsers to test
-     *
-     * @return Array of browsers to test
-     */
-    public static function browsers()
-    {
-        if (! empty($GLOBALS['TESTSUITE_BROWSERSTACK_USER'])
-            && ! empty($GLOBALS['TESTSUITE_BROWSERSTACK_KEY'])
-        ) {
-            /* BrowserStack integration */
-            self::$_selenium_enabled = true;
-
-            $strategy = 'shared';
-            $build_local = false;
-            $build_id = 'Manual';
-            $project_name = 'phpMyAdmin';
-            if (getenv('BUILD_TAG')) {
-                $build_id = getenv('BUILD_TAG');
-                $strategy = 'isolated';
-                $project_name = 'phpMyAdmin (Jenkins)';
-            } elseif (getenv('TRAVIS_JOB_NUMBER')) {
-                $build_id = 'travis-' . getenv('TRAVIS_JOB_NUMBER');
-                $build_local = true;
-                $strategy = 'isolated';
-                $project_name = 'phpMyAdmin (Travis)';
-            }
-
-            $capabilities = array(
-                'browserstack.user' => $GLOBALS['TESTSUITE_BROWSERSTACK_USER'],
-                'browserstack.key' => $GLOBALS['TESTSUITE_BROWSERSTACK_KEY'],
-                'browserstack.debug' => false,
-                'project' => $project_name,
-                'build' => $build_id,
-            );
-
-            if ($build_local) {
-                $capabilities['browserstack.local'] = $build_local;
-                $capabilities['browserstack.localIdentifier'] = $build_id;
-                $capabilities['browserstack.debug'] = true;
-            }
-
-            $result = array();
-            $result[] = array(
-                'browserName' => 'chrome',
-                'host' => 'hub.browserstack.com',
-                'port' => 80,
-                'timeout' => 30000,
-                'sessionStrategy' => $strategy,
-                'desiredCapabilities' => $capabilities,
-            );
-
-            /* Only one browser for continuous integration for speed */
-            if (empty($GLOBALS['TESTSUITE_FULL'])) {
-                return $result;
-            }
-
-            /*
-            $result[] = array(
-                'browserName' => 'Safari',
-                'host' => 'hub.browserstack.com',
-                'port' => 80,
-                'timeout' => 30000,
-                'sessionStrategy' => $strategy,
-                'desiredCapabilities' => array_merge(
-                    $capabilities,
-                    array(
-                        'os' => 'OS X',
-                        'os_version' => 'Mavericks',
-                    )
-                )
-            );
-            */
-            $result[] = array(
-                'browserName' => 'firefox',
-                'host' => 'hub.browserstack.com',
-                'port' => 80,
-                'timeout' => 30000,
-                'sessionStrategy' => $strategy,
-                'desiredCapabilities' => $capabilities,
-            );
-            /* TODO: testing is MSIE is currently broken, so disabled
-            $result[] = array(
-                'browserName' => 'internet explorer',
-                'host' => 'hub.browserstack.com',
-                'port' => 80,
-                'timeout' => 30000,
-                'sessionStrategy' => $strategy,
-                'desiredCapabilities' => array_merge(
-                    $capabilities,
-                    array(
-                        'os' => 'windows',
-                        'os_version' => '7',
-                    )
-                )
-            );
-            */
-            return $result;
-        } elseif (! empty($GLOBALS['TESTSUITE_SELENIUM_HOST'])) {
-            self::$_selenium_enabled = true;
-            return array(
-                array(
-                    'browserName' => $GLOBALS['TESTSUITE_SELENIUM_BROWSER'],
-                    'host' => $GLOBALS['TESTSUITE_SELENIUM_HOST'],
-                    'port' => intval($GLOBALS['TESTSUITE_SELENIUM_PORT']),
-                )
-            );
-        } else {
-            return array();
-        }
-    }
-
-    /**
-     * Configures the selenium and database link.
-     *
-     * @return void
-     *
-     * @throws Exception
-     */
-    protected function setUp()
-    {
-        if (! self::$_selenium_enabled) {
-            $this->markTestSkipped('Selenium testing not configured.');
-        }
-
-        $caps = $this->getDesiredCapabilities();
-        $this->setDesiredCapabilities(
-            array_merge(
-                $caps,
-                array('name' => get_class($this) . '__' . $this->getName())
-            )
-        );
-
-        parent::setUp();
-        $this->setBrowserUrl($GLOBALS['TESTSUITE_URL']);
-        $this->_mysqli = new mysqli(
-            $GLOBALS['TESTSUITE_SERVER'],
-            $GLOBALS['TESTSUITE_USER'],
-            $GLOBALS['TESTSUITE_PASSWORD']
-        );
-        if ($this->_mysqli->connect_errno) {
-            throw new Exception(
-                'Failed to connect to MySQL (' . $this->_mysqli->error . ')'
-            );
-        }
-        $this->database_name = $GLOBALS['TESTSUITE_DATABASE']
-            . mb_substr(md5(rand()), 0, 7);
-        $this->dbQuery(
-            'CREATE DATABASE IF NOT EXISTS ' . $this->database_name
-        );
-        $this->dbQuery(
-            'USE ' . $this->database_name
-        );
-    }
-
-    /**
-     * Checks whether user is a superuser.
-     *
-     * @return boolean
-     */
-    protected function isSuperUser()
-    {
-        $result = $this->dbQuery('SELECT COUNT(*) FROM mysql.user');
-        if ($result !== false) {
-            $result->free();
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Skips test if test user is not a superuser.
-     *
-     * @return void
-     */
-    protected function skipIfNotSuperUser()
-    {
-        if (! $this->isSuperUser()) {
-            $this->markTestSkipped('Test user is not a superuser.');
-        }
-    }
-
-    /**
-     * Skips test if pmadb is not configured.
-     *
-     * @return void
-     */
-    protected function skipIfNotPMADB()
-    {
-        $this->url('chk_rel.php');
-        if ($this->isElementPresent("byXPath", "//*[@color=\"red\"]")) {
-            $this->markTestSkipped(
-                'The phpMyAdmin configuration storage is not working.'
-            );
-        }
-    }
-
-    /**
-     * Tear Down function for test cases
-     *
-     * @return void
-     */
-    public function tearDown()
-    {
-        if ($this->_mysqli != null) {
-            $this->dbQuery('DROP DATABASE IF EXISTS ' . $this->database_name);
-            $this->_mysqli->close();
-            $this->_mysqli = null;
-        }
-    }
-
-    /**
-     * perform a login
-     *
-     * @param string $username Username
-     * @param string $password Password
-     *
-     * @return void
-     */
-    public function login($username = '', $password = '')
-    {
-        if ($username == '') {
-            $username = $GLOBALS['TESTSUITE_USER'];
-        }
-        if ($password == '') {
-            $password = $GLOBALS['TESTSUITE_PASSWORD'];
-        }
-        $this->url('');
-        $this->waitForElementNotPresent('byId', 'cfs-style');
-
-        /* Return if already logged in */
-        if ($this->isSuccessLogin()) {
-            return;
-        }
-        $usernameField = $this->waitForElement('byId', 'input_username');
-        $usernameField->value($username);
-        $passwordField = $this->byId('input_password');
-        $passwordField->value($password);
-        $this->byId('input_go')->click();
-    }
-
-    /**
-     * Checks whether the login is successful
-     *
-     * @return boolean
-     */
-    public function isSuccessLogin()
-    {
-        if ($this->isElementPresent("byXPath", "//*[@id=\"serverinfo\"]")) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-    * Checks whether the login is unsuccessful
-    *
-    * @return boolean
-    */
-    public function isUnsuccessLogin()
-    {
-        if ($this->isElementPresent("byCssSelector", "div.error")) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-    * Used to go to the homepage
-    *
-    * @return void
-    */
-    public function gotoHomepage()
-    {
-        $e = $this->byPartialLinkText("Server: ");
-        $e->click();
-        $this->waitForElementNotPresent('byCssSelector', 'div#loading_parent');
-    }
-
-    /**
-     * Executes a database query
-     *
-     * @param string $query SQL Query to be executed
-     *
-     * @return void|boolean|mysqli_result
-     *
-     * @throws Exception
-     */
-    public function dbQuery($query)
-    {
-        return $this->_mysqli->query($query);
-    }
-
-    /**
-     * Check if user is logged in to phpmyadmin
-     *
-     * @return boolean Where or not user is logged in
-     */
-    public function isLoggedIn()
-    {
-        return $this->isElementPresent(
-            'byXPath', '//*[@id="serverinfo"]/a[1]'
-        );
-    }
-
-    /**
-     * Perform a logout, if logged in
-     *
-     * @return void
-     */
-    public function logOutIfLoggedIn()
-    {
-        if ($this->isLoggedIn()) {
-            $this->byCssSelector("img.icon.ic_s_loggoff")->click();
-        }
-    }
-
-    /**
-     * Wait for an element to be present on the page
-     *
-     * @param string $func Locate using - byCss, byXPath, etc
-     * @param string $arg  Selector
-     *
-     * @return PHPUnit_Extensions_Selenium2TestCase_Element  Element waited for
-     */
-    public function waitForElement($func, $arg)
-    {
-        $this->timeouts()->implicitWait(10000);
-        $element = call_user_func_array(
-            array($this, $func), array($arg)
-        );
-        $this->timeouts()->implicitWait(0);
-        return $element;
-    }
-
-    /**
-     * Wait for an element to disappear
-     *
-     * @param string $func Locate using - byCss, byXPath, etc
-     * @param string $arg  Selector
-     *
-     * @return bool Whether or not the element disappeared
-     */
-    public function waitForElementNotPresent($func, $arg)
-    {
-        while (true) {
-            if (!$this->isElementPresent($func, $arg)) {
-                return true;
-            }
-            usleep(5000);
-        }
-    }
-
-    /**
-     * Sleeps while waiting for browser to perform an action.
-     *
-     * @todo This method should not be used, but rather there would be
-     *       explicit waiting for some elements.
-     *
-     * @return void
-     */
-    public function sleep()
-    {
-        usleep(5000);
-    }
-
-    /**
-     * Check if element is present or not
-     *
-     * @param string $func Locate using - byCss, byXPath, etc
-     * @param string $arg  Selector
-     *
-     * @return bool Whether or not the element is present
-     */
-    public function isElementPresent($func, $arg)
-    {
-        try {
-            $element = call_user_func_array(
-                array($this, $func), array($arg)
-            );
-        } catch (PHPUnit_Extensions_Selenium2TestCase_WebDriverException $e) {
-            // Element not present
-            return false;
-        } catch (InvalidArgumentException $e) {
-            // Element not present
-            return false;
-        }
-        // Element Present
-        return true;
-    }
-
-    /**
-     * Get table cell data by the ID of the table
-     *
-     * @param string $tableID Table identifier
-     * @param int    $row     Table row
-     * @param int    $column  Table column
-     *
-     * @return text Data from the particular table cell
-     */
-    public function getCellByTableId($tableID, $row, $column)
-    {
-        $sel = "table#{$tableID} tbody tr:nth-child({$row}) "
-            . "td:nth-child({$column})";
-        $element = $this->byCssSelector(
-            $sel
-        );
-        return $element->text();
-    }
-
-    /**
-     * Get table cell data by the class attribute of the table
-     *
-     * @param string $tableClass Class of the table
-     * @param int    $row        Table row
-     * @param int    $column     Table column
-     *
-     * @return text Data from the particular table cell
-     */
-    public function getCellByTableClass($tableClass, $row, $column)
-    {
-        $sel = "table.{$tableClass} tbody tr:nth-child({$row}) "
-            . "td:nth-child({$column})";
-        $element = $this->byCssSelector(
-            $sel
-        );
-        return $element->text();
-    }
-
-    /**
-     * Wrapper around keys method to not use it on not supported
-     * browsers.
-     *
-     * @param string $text Keys to send
-     *
-     * @return void
-     */
-    public function keys($text)
-    {
-        /**
-         * Not supported in Safari Webdriver, see
-         * https://github.com/seleniumhq/selenium-google-code-issue-archive/issues/4136
-         */
-        if (mb_strtolower($this->getBrowser()) == 'safari') {
-            $this->markTestSkipped('Can not send keys to Safari browser.');
-        }
-        parent::keys($text);
-    }
-
-    /**
-     * Wrapper around moveto method to not use it on not supported
-     * browsers.
-     *
-     * @param object $element element
-     *
-     * @return void
-     */
-    public function moveto($element)
-    {
-        /**
-         * Not supported in Safari Webdriver, see
-         * https://github.com/seleniumhq/selenium-google-code-issue-archive/issues/4136
-         */
-        if (mb_strtolower($this->getBrowser()) == 'safari') {
-            $this->markTestSkipped('MoveTo not supported on Safari browser.');
-        }
-        parent::moveto($element);
-    }
-
-    /**
-     * Wrapper around alertText method to not use it on not supported
-     * browsers.
-     *
-     * @return mixed
-     */
-    public function alertText()
-    {
-        /**
-         * Not supported in Safari Webdriver, see
-         * https://github.com/seleniumhq/selenium-google-code-issue-archive/issues/4136
-         */
-        if (mb_strtolower($this->getBrowser()) == 'safari') {
-            $this->markTestSkipped('Alerts not supported on Safari browser.');
-        }
-        return parent::alertText();
-    }
-
-    /**
-     * Type text in textarea (CodeMirror enabled)
-     *
-     * @param string $text Text to type
-     *
-     * @return void
-     */
-    public function typeInTextArea($text)
-    {
-        /**
-         * Firefox needs some escaping of a text, see
-         * https://github.com/seleniumhq/selenium-google-code-issue-archive/issues/1723
-         */
-        if (mb_strtolower($this->getBrowser()) == 'firefox') {
-            $text = str_replace(
-                "(",
-                PHPUnit_Extensions_Selenium2TestCase_Keys::SHIFT
-                . PHPUnit_Extensions_Selenium2TestCase_Keys::NUMPAD9
-                . PHPUnit_Extensions_Selenium2TestCase_Keys::NULL,
-                $text
-            );
-        }
-
-        $this->byClassName("CodeMirror-scroll")->click();
-        $this->keys($text);
-    }
-
-    /**
-     * Kills the More link in the menu
-     *
-     * @return void
-     */
-    public function expandMore()
-    {
-        try {
-            $this->waitForElement('byCssSelector', 'li.submenu > a');
-        } catch (PHPUnit_Extensions_Selenium2TestCase_WebDriverException $e) {
-            return;
-        }
-        /* We need to resize to ensure it fits into accessible area */
-        $this->execute(
-            array(
-                'script' => "$('#topmenu').css('font-size', '50%');"
-                    . "$(window).resize()",
-                'args' => array()
-            )
-        );
-        $this->sleep();
-    }
-
-    /**
-     * Navigates browser to a table page.
-     *
-     * @param string $table Name of table
-     *
-     * @return void
-     */
-    public function navigateTable($table)
-    {
-        // go to database page
-        $this->waitForElement("byLinkText", $this->database_name)->click();
-
-        /* Wait for loading and expanding tree */
-        $this->waitForElement(
-            'byCssSelector',
-            'li.last.table'
-        );
-
-        /* TODO: Timing issue of expanding navigation tree */
-        $this->sleep();
-
-        // go to table page
-        $this->waitForElement(
-            "byXPath",
-            "//*[@id='pma_navigation_tree_content']//a[contains(., '$table')]"
-        )->click();
-
-        // Wait for it to load
-        $this->waitForElement(
-            "byXPath",
-            "//a[@class='tabactive' and contains(., 'Browse')]"
-        );
-    }
-}
diff --git a/#pma/test/start-local-server b/#pma/test/start-local-server
deleted file mode 100644
index c76d3740..00000000
--- a/#pma/test/start-local-server
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-set -e
-set -x
-
-if [ -z  "$SELENIUM" ] ; then
-    exit 0
-fi
-
-php --server 127.0.0.1:8000 > php.log &
-~/browserstack/BrowserStackLocal -localIdentifier "travis-$TRAVIS_JOB_NUMBER" -onlyAutomate "$TESTSUITE_BROWSERSTACK_KEY" 127.0.0.1,8000,0 & 
diff --git a/#pma/test/test_data/config.inc.php b/#pma/test/test_data/config.inc.php
deleted file mode 100644
index e8576ba4..00000000
--- a/#pma/test/test_data/config.inc.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/**
- * Minimal config file for test
- *
- * @package PhpMyAdmin-test
- */
-$i = 0;
-
-/* Server: localhost [1] */
-$i++;
-$cfg['Servers'][$i]['verbose'] = '';
-$cfg['Servers'][$i]['host'] = 'localhost';
-$cfg['Servers'][$i]['port'] = '';
-$cfg['Servers'][$i]['socket'] = '';
-$cfg['Servers'][$i]['connect_type'] = 'tcp';
-$cfg['Servers'][$i]['auth_type'] = 'cookie';
diff --git a/#pma/test/test_data/db_import.sql b/#pma/test/test_data/db_import.sql
deleted file mode 100644
index 105817a6..00000000
--- a/#pma/test/test_data/db_import.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-
---
--- Table structure for table `test_table`
---
-
-CREATE TABLE IF NOT EXISTS `test_table` (
-  `val` int(11) NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
diff --git a/#pma/test/test_data/db_test.csv b/#pma/test/test_data/db_test.csv
deleted file mode 100644
index 569b95c5..00000000
--- a/#pma/test/test_data/db_test.csv
+++ /dev/null
@@ -1 +0,0 @@
-"1","dbbase",,"ddd","SELECT * FROM `db_content` WHERE 1"
diff --git a/#pma/test/test_data/db_test.ods b/#pma/test/test_data/db_test.ods
deleted file mode 100644
index 8b348260..00000000
Binary files a/#pma/test/test_data/db_test.ods and /dev/null differ
diff --git a/#pma/test/test_data/db_test_ldi.csv b/#pma/test/test_data/db_test_ldi.csv
deleted file mode 100644
index 569b95c5..00000000
--- a/#pma/test/test_data/db_test_ldi.csv
+++ /dev/null
@@ -1 +0,0 @@
-"1","dbbase",,"ddd","SELECT * FROM `db_content` WHERE 1"
diff --git a/#pma/test/test_data/dresden_osm.shp.zip b/#pma/test/test_data/dresden_osm.shp.zip
deleted file mode 100644
index cd8d7885..00000000
Binary files a/#pma/test/test_data/dresden_osm.shp.zip and /dev/null differ
diff --git a/#pma/test/test_data/exploit_test.sql b/#pma/test/test_data/exploit_test.sql
deleted file mode 100644
index c6264c05..00000000
--- a/#pma/test/test_data/exploit_test.sql
+++ /dev/null
@@ -1,150 +0,0 @@
--- phpMyAdmin SQL Dump
--- version 3.5.0-dev
--- https://www.phpmyadmin.net
---
--- Host: barclay
--- Generation Time: Aug 06, 2011 at 04:53 PM
--- Server version: 5.1.49-3-log
--- PHP Version: 5.3.3-7+squeeze1
-
-SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
-SET time_zone = "+00:00";
-
-
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!40101 SET NAMES utf8 */;
-
-DROP DATABASE IF EXISTS `"><script>alert(200);</script>`;
-DROP DATABASE IF EXISTS `'><script>alert(201);</script>`;
-DROP DATABASE IF EXISTS `exploit_test`;
-
---
--- Database: `"><script>alert(200);</script>`
---
-CREATE DATABASE `"><script>alert(200);</script>` DEFAULT CHARACTER SET latin1 COLLATE latin1_swedish_ci;
-
---
--- Database: `'><script>alert(201);</script>`
---
-CREATE DATABASE `'><script>alert(201);</script>` DEFAULT CHARACTER SET latin1 COLLATE latin1_swedish_ci;
-
---
--- Database: `exploit_test`
---
-CREATE DATABASE `exploit_test` DEFAULT CHARACTER SET latin1 COLLATE latin1_swedish_ci;
-USE `exploit_test`;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `"><script>alert(109);</script>`
---
-
-CREATE TABLE IF NOT EXISTS `"><script>alert(109);</script>` (
-  `id` int(2) NOT NULL,
-  `foo` varchar(255) NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `"><script>alert(109);</script>`
---
-
-INSERT INTO `"><script>alert(109);</script>` (`id`, `foo`) VALUES
-(1, ''),
-(2, '');
-
--- --------------------------------------------------------
-
---
--- Table structure for table `';  eval('alert(107)')`
---
-
-CREATE TABLE IF NOT EXISTS `';  eval('alert(107)')` (
-  `id` int(11) NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `'><script>alert(106);</script>`
---
-
-CREATE TABLE IF NOT EXISTS `'><script>alert(106);</script>` (
-  `id` int(2) NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `<script>alert(105);</script>`
---
-
-CREATE TABLE IF NOT EXISTS `<script>alert(105);</script>` (
-  `dsaf` int(4) NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `<script>alert(105);</script>`
---
-
-INSERT INTO `<script>alert(105);</script>` (`dsaf`) VALUES
-(1);
-
--- --------------------------------------------------------
-
---
--- Table structure for table `evil_column_names`
---
-
-CREATE TABLE IF NOT EXISTS `evil_column_names` (
-  `<script>alert(100);</script>` int(1) NOT NULL,
-  `"><script>alert(101);</script>` int(2) NOT NULL,
-  `'><script>alert(102);</script>` int(2) NOT NULL,
-  `evil_comment` int(3) NOT NULL COMMENT '<script>alert(104);</script>'
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `evil_column_names`
---
-
-INSERT INTO `evil_column_names` (`<script>alert(100);</script>`, `"><script>alert(101);</script>`, `'><script>alert(102);</script>`, `evil_comment`) VALUES
-(1, 23, 45, 5),
-(2, 3, 77, 3);
-
--- --------------------------------------------------------
-
---
--- Table structure for table `evil_content`
---
-
-CREATE TABLE IF NOT EXISTS `evil_content` (
-	  `text` varchar(255) NOT NULL
-	) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
-
---
--- Dumping data for table `evil_content`
---
-
-INSERT INTO `evil_content` (`text`) VALUES
-('"><script>alert(301);</script>'),
-('''><script>alert(302);</script>'),
-('<script>alert(303);</script>'),
-(''';  eval(''alert(304)'');');
-
--- --------------------------------------------------------
-
---
--- Table structure for table `evil_table_comment`
---
-
-CREATE TABLE IF NOT EXISTS `evil_table_comment` (
-  `id` int(1) NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='"><script>alert(400);</script>';
-
-
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
diff --git a/#pma/test/test_data/phpmyadmin.mediawiki b/#pma/test/test_data/phpmyadmin.mediawiki
deleted file mode 100644
index 8abf9947..00000000
--- a/#pma/test/test_data/phpmyadmin.mediawiki
+++ /dev/null
@@ -1,16 +0,0 @@
-
-<!--
-Table data for `pma_bookmarktest`
--->
-
-{| class="wikitable sortable" style="text-align:center;"
-! table header
-|+'''pma_bookmarktest'''
-|-
- | 1
- | dbbase
- | 
- | ddd
- | SELECT * FROM `db_content` WHERE 1
-|}
-
diff --git a/#pma/test/test_data/phpmyadmin_importXML_For_Testing.xml b/#pma/test/test_data/phpmyadmin_importXML_For_Testing.xml
deleted file mode 100644
index b8988e3a..00000000
--- a/#pma/test/test_data/phpmyadmin_importXML_For_Testing.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-- phpMyAdmin XML Dump FOR testing
-- version 4.1-dev
-- https://www.phpmyadmin.net
--
-- Host: 127.0.0.1
-- Generation Time: Jun 15, 2013 at 02:59 PM
-- Server version: 5.5.27-log
-- PHP Version: 5.4.7
--->
-
-<pma_xml_export version="1.0" xmlns:pma="https://www.phpmyadmin.net/some_doc_url/">
-    <!--
-    - Structure schemas
-    -->
-    <pma:structure_schemas>
-        <pma:database name="phpmyadmintest" collation="utf8_bin" charset="utf8">
-            <pma:table name="pma_bookmarktest">
-                CREATE TABLE `pma_bookmarktest` (
-                  `id` int(11) NOT NULL AUTO_INCREMENT,
-                  `dbase` varchar(255) COLLATE utf8_bin NOT NULL DEFAULT '',
-                  `user` varchar(255) COLLATE utf8_bin NOT NULL DEFAULT '',
-                  `label` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT '',
-                  `query` text COLLATE utf8_bin NOT NULL,
-                  PRIMARY KEY (`id`)
-                ) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Bookmarks';
-            </pma:table>
-        </pma:database>
-    </pma:structure_schemas>
-
-    <!--
-    - Database: 'phpmyadmintest'
-    -->
-    <database name="phpmyadmintest">
-        <!-- Table pma_bookmarktest -->
-        <table name="pma_bookmarktest">
-            <column name="id">1</column>
-            <column name="dbase">pma_dbase</column>
-            <column name="user"></column>
-            <column name="label">pma_label</column>
-            <column name="query">SELECT * FROM `db_content` WHERE 1</column>
-        </table>
-    </database>
-</pma_xml_export>
diff --git a/#pma/test/test_data/pma_bookmark.sql b/#pma/test/test_data/pma_bookmark.sql
deleted file mode 100644
index a72a205f..00000000
--- a/#pma/test/test_data/pma_bookmark.sql
+++ /dev/null
@@ -1,49 +0,0 @@
--- phpMyAdmin SQL Dump
--- version 4.1-dev
--- https://www.phpmyadmin.net
---
--- Host: 127.0.0.1
--- Generation Time: Jun 25, 2013 at 05:44 PM
--- Server version: 5.5.27-log
--- PHP Version: 5.4.7
-
-SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO";
-SET time_zone = "+00:00";
-
-
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!40101 SET NAMES utf8 */;
-
---
--- Database: `db_test`
---
-CREATE DATABASE IF NOT EXISTS `db_test` DEFAULT CHARACTER SET latin1 COLLATE latin1_swedish_ci;
-USE `db_test`;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma_bookmark`
---
-
-CREATE TABLE IF NOT EXISTS `pma_bookmark` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `dbase` varchar(255) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `user` varchar(255) COLLATE utf8_bin NOT NULL DEFAULT '',
-  `label` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT '',
-  `query` text COLLATE utf8_bin NOT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Bookmarks' AUTO_INCREMENT=2 ;
-
---
--- Dumping data for table `pma_bookmark`
---
-
-INSERT INTO `pma_bookmark` (`id`, `dbase`, `user`, `label`, `query`) VALUES
-(1, 'dbbase', '', 'ddd', 0x53454c454354202a2046524f4d206064625f636f6e74656e74602057484552452031);
-
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
diff --git a/#pma/test/test_data/server_import.sql b/#pma/test/test_data/server_import.sql
deleted file mode 100644
index 86f84a92..00000000
--- a/#pma/test/test_data/server_import.sql
+++ /dev/null
@@ -1,9 +0,0 @@
---
--- Database: `test_import1`
---
-CREATE DATABASE IF NOT EXISTS `test_import1` DEFAULT CHARACTER SET latin1 COLLATE latin1_swedish_ci;
---
--- Database: `test_import1`
---
-CREATE DATABASE IF NOT EXISTS `test_import2` DEFAULT CHARACTER SET latin1 COLLATE latin1_swedish_ci;
-
diff --git a/#pma/test/test_data/table_import.sql b/#pma/test/test_data/table_import.sql
deleted file mode 100644
index 6891eb2e..00000000
--- a/#pma/test/test_data/table_import.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-
---
--- Dumping data for table `test_table`
---
-
-INSERT INTO `test_table` (`val`) VALUES
-(8),
-(9);
-
diff --git a/#pma/test/test_data/test.bz2 b/#pma/test/test_data/test.bz2
deleted file mode 100644
index 971a0787..00000000
Binary files a/#pma/test/test_data/test.bz2 and /dev/null differ
diff --git a/#pma/test/test_data/test.file b/#pma/test/test_data/test.file
deleted file mode 100644
index fafd7451..00000000
--- a/#pma/test/test_data/test.file
+++ /dev/null
@@ -1 +0,0 @@
-TEST FILE
diff --git a/#pma/test/test_data/test.gz b/#pma/test/test_data/test.gz
deleted file mode 100644
index 6d25ca8c..00000000
Binary files a/#pma/test/test_data/test.gz and /dev/null differ
diff --git a/#pma/test/test_data/test.zip b/#pma/test/test_data/test.zip
deleted file mode 100644
index bee8c355..00000000
Binary files a/#pma/test/test_data/test.zip and /dev/null differ
diff --git a/#pma/test/test_data/timezone.shp.zip b/#pma/test/test_data/timezone.shp.zip
deleted file mode 100644
index aa8a3598..00000000
Binary files a/#pma/test/test_data/timezone.shp.zip and /dev/null differ
diff --git a/#pma/test/theme.php b/#pma/test/theme.php
deleted file mode 100644
index 421f5668..00000000
--- a/#pma/test/theme.php
+++ /dev/null
@@ -1,360 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * theme test
- *
- * @package PhpMyAdmin-test
- */
-
-define('PMA_TEST_THEME', true);
-
-chdir('..');
-
-/**
- * Gets core libraries and defines some variables
- */
-require_once './libraries/common.inc.php';
-$GLOBALS['pmaThemeImage'] = '../' . $GLOBALS['pmaThemeImage'];
-
-$lang_iso_code = $GLOBALS['lang'];
-
-// start output
-header('Content-Type: text/html; charset=utf-8');
-?>
-<!DOCTYPE HTML>
-<html lang="<?php echo $lang_iso_code; ?>" dir="<?php echo $GLOBALS['text_dir']; ?>">
-<head>
-    <title>phpMyAdmin <?php echo PMA_VERSION; ?> -
-        <?php echo htmlspecialchars($_SERVER['HTTP_HOST']); ?> - Theme Test</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <link rel="stylesheet" type="text/css"
-        href="../phpmyadmin.css.php?<?php echo PMA_URL_getCommon(); ?>&amp;nocache=<?php echo $GLOBALS['PMA_Config']->getThemeUniqueValue(); ?>" />
-    <link rel="stylesheet" type="text/css" media="print"
-        href="../print.css" />
-    <script src="../js/jquery/jquery-2.1.4.min.js" type="text/javascript"></script>
-    <script src="../js/messages.php" type="text/javascript"></script>
-    <script type="text/javascript">
-        var PMA_TEST_THEME = true;
-    </script>
-    <script src="../js/get_image.js.php" type="text/javascript"></script>
-    <script src="../js/functions.js" type="text/javascript"></script>
-</head>
-<body>
-<?php
-
-
-$separator = '<span class=\'separator item\'>&nbsp;»</span>' . "\n";
-$item = '<a href="%1$s?%2$s" class="item">'
-    . ' <img class="icon %5$s" src="../themes/dot.gif"'
-    . ' width="16" height="16" alt="" /> ' . "\n"
-    . '%4$s: %3$s</a>' . "\n";
-
-echo '<div id="serverinfo">' . "\n";
-printf(
-    $item,
-    PMA\libraries\Util::getScriptNameForOption(
-        $GLOBALS['cfg']['DefaultTabserver'], 'server'
-    ),
-    PMA_URL_getCommon(),
-    'Server',
-    __('Server'),
-    'ic_s_host'
-);
-
-echo $separator;
-printf(
-    $item,
-    PMA\libraries\Util::getScriptNameForOption(
-        $GLOBALS['cfg']['DefaultTabDatabase'], 'database'
-    ),
-    '',
-    'Database',
-    __('Database'),
-    'ic_s_db'
-);
-
-echo $separator;
-printf(
-    $item,
-    PMA\libraries\Util::getScriptNameForOption(
-        $GLOBALS['cfg']['DefaultTabTable'], 'table'
-    ),
-    '',
-    'Table',
-    (isset($GLOBALS['tbl_is_view']) && $GLOBALS['tbl_is_view']
-        ? __('View')
-        : __('Table')),
-    (isset($GLOBALS['tbl_is_view']) && $GLOBALS['tbl_is_view']
-        ? 'ic_b_views'
-        : 'ic_s_tbl')
-);
-
-echo '<span class="table_comment" id="span_table_comment">'
-    . '&quot;Table comment&quot;</span>' . "\n";
-
-echo '</div>';
-
-
-/**
- * Displays tab links
- */
-$tabs = array();
-
-$tabs['databases']['icon'] = 's_db.png';
-$tabs['databases']['link'] = 'server_databases.php';
-$tabs['databases']['text'] = __('Databases');
-
-$tabs['sql']['icon'] = 'b_sql.png';
-$tabs['sql']['link'] = 'server_sql.php';
-$tabs['sql']['text'] = __('SQL');
-
-$tabs['status']['icon'] = 's_status.png';
-$tabs['status']['link'] = 'server_status.php';
-$tabs['status']['text'] = __('Status');
-
-$tabs['vars']['icon'] = 's_vars.png';
-$tabs['vars']['link'] = 'server_variables.php';
-$tabs['vars']['text'] = __('Variables');
-
-$tabs['charset']['icon'] = 's_asci.png';
-$tabs['charset']['link'] = 'server_collations.php';
-$tabs['charset']['text'] = __('Charsets');
-
-$tabs['engine']['icon'] = 'b_engine.png';
-$tabs['engine']['link'] = 'server_engines.php';
-$tabs['engine']['text'] = __('Engines');
-
-$tabs['rights']['icon'] = 's_rights.png';
-$tabs['rights']['link'] = 'server_privileges.php';
-$tabs['rights']['text'] = __('Privileges');
-
-$tabs['binlog']['icon'] = 's_tbl.png';
-$tabs['binlog']['link'] = 'server_binlog.php';
-$tabs['binlog']['text'] = __('Binary log');
-
-$tabs['export']['icon'] = 'b_export.png';
-$tabs['export']['text'] = 'disabled';
-
-$tabs['export2']['icon'] = 'b_export.png';
-$tabs['export2']['text'] = 'disabled caution';
-$tabs['export2']['class'] = 'caution';
-
-$tabs['import']['icon'] = 'b_import.png';
-$tabs['import']['link'] = 'server_import.php';
-$tabs['import']['text'] = 'active';
-$tabs['import']['class'] = 'active';
-
-echo PMA\libraries\Util::getHtmlTabs($tabs, array(), 'topmenu');
-unset($tabs);
-
-if (@file_exists($pmaThemeImage . 'logo_right.png')) {
-    ?>
-    <img id="pmalogoright" src="../<?php echo $pmaThemeImage; ?>logo_right.png"
-        alt="phpMyAdmin" />
-    <?php
-}
-?>
-<h1>
-<?php
-echo sprintf(
-    __('Welcome to %s'),
-    '<bdo dir="ltr" lang="en">phpMyAdmin ' . PMA_VERSION . '</bdo>'
-);
-?>
-</h1>
-
-<hr class="clearfloat" />
-
-<form method="post" action="theme.php">
-<fieldset>
-    <legend><?php echo __('Theme'); ?></legend>
-<?php
-    echo $_SESSION['PMA_Theme_Manager']->getHtmlSelectBox(false);
-?>
-</fieldset>
-</form>
-
-<hr />
-
-<h1>H1 Header</h1>
-<h2>H2 Header</h2>
-<h3>H3 Header</h3>
-<h4>H4 Header</h4>
-
-<div class="success">
-    success message box content!
-</div>
-<div class="success">
-    <h1>Success message box header!</h1>
-    success message box content!
-</div>
-
-<div class="notice">
-    notice message box content!
-</div>
-<div class="notice">
-    <h1>Notice message box header!</h1>
-    notice message box content!
-</div>
-<div class="error">
-    error message box content!
-</div>
-<div class="error">
-    <h1>Error message box header!</h1>
-    error message box content!
-</div>
-
-<fieldset class="confirmation">
-    <legend>Confirmation fieldset</legend>
-    <code>QUERY TO EXECUTE;</code>
-</fieldset>
-<fieldset class="tblFooters">
-    <input type="submit" name="yes" value="YES" />
-    <input type="submit" name="no" value="NO" />
-</fieldset>
-
-<hr />
-
-<div class="success">
-    success message box content!
-</div>
-<code class="sql">
-<span class="syntax">
-<span class="syntax_alpha syntax_alpha_reservedWord">SELECT</span>
-<span class="syntax_punct">*</span> <br />
-<span class="syntax_alpha syntax_alpha_reservedWord">FROM</span>
-<span class="syntax_quote syntax_quote_backtick">`test`</span>
-<span class="syntax_white syntax_white_newline"></span><br />
-<span class="syntax_alpha syntax_alpha_reservedWord">LIMIT</span>
-<span class="syntax_digit syntax_digit_integer">0</span>
-<span class="syntax_punct syntax_punct_listsep">,</span>
-<span class="syntax_digit syntax_digit_integer">30</span>;<br />
-<span class="syntax_alpha syntax_alpha_reservedWord">SELECT</span>
-<span class="syntax_punct">*</span> <br />
-<span class="syntax_alpha syntax_alpha_reservedWord">FROM</span>
-<span class="syntax_quote syntax_quote_backtick">`test`</span>
-<span class="syntax_white syntax_white_newline"></span><br />
-<span class="syntax_alpha syntax_alpha_reservedWord">LIMIT</span>
-<span class="syntax_digit syntax_digit_integer">0</span>
-<span class="syntax_punct syntax_punct_listsep">,</span>
-<span class="syntax_digit syntax_digit_integer">30</span>;<br />
-<span class="syntax_alpha syntax_alpha_reservedWord">SELECT</span>
-<span class="syntax_punct">*</span> <br />
-<span class="syntax_alpha syntax_alpha_reservedWord">FROM</span>
-<span class="syntax_quote syntax_quote_backtick">`test`</span>
-<span class="syntax_white syntax_white_newline"></span><br />
-<span class="syntax_alpha syntax_alpha_reservedWord">LIMIT</span>
-<span class="syntax_digit syntax_digit_integer">0</span>
-<span class="syntax_punct syntax_punct_listsep">,</span>
-<span class="syntax_digit syntax_digit_integer">30</span>;<br />
-<span class="syntax_alpha syntax_alpha_reservedWord">SELECT</span>
-<span class="syntax_punct">*</span> <br />
-<span class="syntax_alpha syntax_alpha_reservedWord">FROM</span>
-<span class="syntax_quote syntax_quote_backtick">`test`</span>
-<span class="syntax_white syntax_white_newline"></span><br />
-<span class="syntax_alpha syntax_alpha_reservedWord">LIMIT</span>
-<span class="syntax_digit syntax_digit_integer">0</span>
-<span class="syntax_punct syntax_punct_listsep">,</span>
-<span class="syntax_digit syntax_digit_integer">30</span>;<br />
-</span>
-</code>
-<div class="tools">
-[
-<a href="tbl_sql.php?db=test;table=test;sql_query=SELECT+%2A+FROM+%60test%60;show_query=1;token=266edabf70fa6368498d89b4054d01bf#querybox" >Bearbeiten</a>
-] [
-<a href="import.php?db=test;table=test;sql_query=EXPLAIN+SELECT+%2A+FROM+%60test%60;token=266edabf70fa6368498d89b4054d01bf" >SQL erklären</a>
-] [
-<a href="import.php?db=test;table=test;sql_query=SELECT+%2A+FROM+%60test%60;show_query=1;show_as_php=1;token=266edabf70fa6368498d89b4054d01bf" >PHP-Code erzeugen</a>
-] [
-<a href="import.php?db=test;table=test;sql_query=SELECT+%2A+FROM+%60test%60;show_query=1;token=266edabf70fa6368498d89b4054d01bf" >Aktualisieren</a>
-]</div>
-
-<hr />
-
-<table class="data">
-    <caption>table.data caption</caption>
-    <thead>
-        <tr><th></th>
-            <th>table.data thead tr th</th>
-            <th>table.data thead tr th</th>
-            <th colspan="3">action</th>
-            <th>table.data thead tr th</th>
-        </tr>
-    </thead>
-    <tfoot>
-        <tr><th></th>
-            <th>table.data tfoot tr th</th>
-            <th class="value">table.data tfoot tr th</th>
-            <th colspan="3">action</th>
-            <th>table.data tfoot tr th</th>
-        </tr>
-    </tfoot>
-    <tbody>
-        <tr class="odd">
-            <td><input type="checkbox" id="checkbox_1" name="checkbox_1"
-                    value="1" /></td>
-            <th><label for="checkbox_1">th label</label></th>
-            <td class="value">td.value</td>
-            <td>
-                <img class="icon ic_bd_drop" src="../themes/dot.gif" alt="drop"/>
-            </td>
-            <td>
-                <img class="icon ic_bd_drop" src="../themes/dot.gif" alt="drop"/>
-            </td>
-            <td>
-                <img class="icon ic_bd_drop" src="../themes/dot.gif" alt="drop" />
-            </td>
-            <td>table.data tbody tr.odd td</td>
-        </tr>
-        <tr class="even">
-            <td><input type="checkbox" id="checkbox_2" name="checkbox_2"
-                    value="1" /></td>
-            <th><label for="checkbox_2">th label</label></th>
-            <td class="value">td.value</td>
-            <td>
-                <img class="icon ic_bd_drop" src="../themes/dot.gif" alt="drop"/>
-            </td>
-            <td>
-                <img class="icon ic_bd_drop" src="../themes/dot.gif" alt="drop"/>
-            </td>
-            <td>
-                <img class="icon ic_bd_drop" src="../themes/dot.gif" alt="drop" />
-            </td>
-            <td>table.data tbody tr.even td</td>
-        </tr>
-        <tr class="odd">
-            <td><input type="checkbox" id="checkbox_3" name="checkbox_3"
-                    value="1" /></td>
-            <th><label for="checkbox_3">th label</label></th>
-            <td class="value">td.value</td>
-            <td>
-                <img class="icon ic_bd_drop" src="../themes/dot.gif" alt="drop"/>
-            </td>
-            <td>
-                <img class="icon ic_bd_drop" src="../themes/dot.gif" alt="drop"/>
-            </td>
-            <td>
-                <img class="icon ic_bd_drop" src="../themes/dot.gif" alt="drop"/>
-            </td>
-            <td>table.data tbody tr.odd td</td>
-        </tr>
-        <tr class="even">
-            <td><input type="checkbox" id="checkbox_4" name="checkbox_4"
-                    value="1" /></td>
-            <th><label for="checkbox_4">th label</label></th>
-            <td class="value">td.value</td>
-            <td>
-                <img class="icon ic_bd_drop" src="../themes/dot.gif" alt="drop"/>
-            </td>
-            <td>
-                <img class="icon ic_bd_drop" src="../themes/dot.gif" alt="drop"/>
-            </td>
-            <td>
-                <img class="icon ic_bd_drop" src="../themes/dot.gif" alt="drop"/>
-            </td>
-            <td>table.data tbody tr.even td</td>
-        </tr>
-    </tbody>
-</table>
-</body>
-</html>
diff --git a/#pma/test/wui.php b/#pma/test/wui.php
deleted file mode 100644
index b479634a..00000000
--- a/#pma/test/wui.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * runs all defined tests
- *
- * @package PhpMyAdmin-test
- */
-
-/**
- *
- */
-require_once 'AllTests.php';
-
-echo '<pre>';
-AllTests::main();
-echo '</pre>';
-
diff --git a/#pma/themes.php b/#pma/themes.php
deleted file mode 100644
index da38dda1..00000000
--- a/#pma/themes.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Displays list of themes.
- *
- * @package PhpMyAdmin
- */
-
-/**
- * get some globals
- */
-require './libraries/common.inc.php';
-$response = PMA\libraries\Response::getInstance();
-$response->getFooter()->setMinimal();
-$header = $response->getHeader();
-$header->setBodyId('bodythemes');
-$header->setTitle('phpMyAdmin - ' . __('Theme'));
-$header->disableMenuAndConsole();
-
-$hash    = '#pma_' . preg_replace('/([0-9]*)\.([0-9]*)\..*/', '\1_\2', PMA_VERSION);
-$url     = PMA_linkURL('https://www.phpmyadmin.net/themes/') . $hash;
-$output  = '<h1>phpMyAdmin - ' . __('Theme') . '</h1>';
-$output .= '<p>';
-$output .= '<a href="' . $url . '" rel="noopener noreferrer" target="_blank">';
-$output .= __('Get more themes!');
-$output .= '</a>';
-$output .= '</p>';
-$output .= $_SESSION['PMA_Theme_Manager']->getPrintPreviews();
-
-$response->addHTML($output);
diff --git a/#pma/themes/dot.gif b/#pma/themes/dot.gif
deleted file mode 100644
index 35d42e80..00000000
Binary files a/#pma/themes/dot.gif and /dev/null differ
diff --git a/#pma/themes/fallen-0.2.zip b/#pma/themes/fallen-0.2.zip
deleted file mode 100644
index 655efad1..00000000
Binary files a/#pma/themes/fallen-0.2.zip and /dev/null differ
diff --git a/#pma/themes/fallen/LICENSE b/#pma/themes/fallen/LICENSE
deleted file mode 100644
index b7e0d223..00000000
--- a/#pma/themes/fallen/LICENSE
+++ /dev/null
@@ -1,358 +0,0 @@
-Fallen (phpMyAdmin Theme)
-
-Copyright (c) 2016 Frans Allen (https://www.fransallen.com)
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-
----------------------------------------------------------------------
-
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-                            NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
diff --git a/#pma/themes/fallen/README.md b/#pma/themes/fallen/README.md
deleted file mode 100644
index 40917523..00000000
--- a/#pma/themes/fallen/README.md
+++ /dev/null
@@ -1,24 +0,0 @@
-# Fallen (phpMyAdmin Theme)
-
-The First amazing phpMyAdmin 4 theme in the world.
-
-## Usage
-
-* Download Fallen PMA Theme.
-* Unzip **fallen-pma-master**.
-* Rename **fallen-pma-master** to **fallen**.
-* Move to your phpMyAdmin themes directory.
-* Activate "Fallen" from phpMyAdmin dashboard.
-* Done.
-
-## Screenshot
-
-![Fallen login](https://storage.googleapis.com/fransallencom.appspot.com/images/fallen-pma-3.png)
-
-![Fallen home](https://storage.googleapis.com/fransallencom.appspot.com/images/fallen-pma.png)
-
-![Fallen DB](https://storage.googleapis.com/fransallencom.appspot.com/images/fallen-pma-2.png)
-
-## LICENSE
-
-Licensed under GPL license. Please see the license file: https://github.com/fransallen/fallen-pma/LICENSE
diff --git a/#pma/themes/fallen/css/codemirror.css.php b/#pma/themes/fallen/css/codemirror.css.php
deleted file mode 100644
index 5028d22e..00000000
--- a/#pma/themes/fallen/css/codemirror.css.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-# Unplanned execution path
-
-if ( !defined('PMA_MINIMUM_COMMON') && !defined('TESTSUITE') ) {
-  exit();
-} ?>
-/* ----------------------------------------------------- */
-
-.CodeMirror {
-  border: 1px solid #ccc;
-  font-family: <?php echo $GLOBALS['cfg']['FontFamilyFixed'] ?>!important;
-  direction: ltr;
-  height: <?php echo ceil($GLOBALS['cfg']['TextareaRows'] * 1.2); ?>em
-}
-
-.CodeMirror * {
-  font-family: <?php echo $GLOBALS['cfg']['FontFamilyFixed'] ?>
-}
-
-#inline_editor_outer .CodeMirror {
-  height: <?php echo ceil($GLOBALS['cfg']['TextareaRows'] * 0.4) ?>em;
-  margin-bottom: 10px
-}
-
-.insertRowTable .CodeMirror {
-  height: <?php echo ceil($GLOBALS['cfg']['TextareaRows'] * 0.6); ?>em;
-  width: <?php echo ceil($GLOBALS['cfg']['TextareaCols'] * 0.6); ?>em
-}
-
-#pma_console .CodeMirror {
-  border: none
-}
-
-#pma_console .CodeMirror-gutters {
-  background-color: initial;
-  border: none
-}
-
-span.cm-keyword, span.cm-statement-verb {
-  color: #909
-}
-
-span.cm-variable {
-  color: black
-}
-
-span.cm-comment {
-  color: #808000
-}
-
-span.cm-mysql-string {
-  color: #008000
-}
-
-span.cm-operator {
-  color: fuchsia
-}
-
-span.cm-mysql-word {
-  color: black
-}
-
-span.cm-builtin {
-  color: #f00
-}
-
-span.cm-variable-2 {
-  color: #f90
-}
-
-span.cm-variable-3 {
-  color: #00f
-}
-
-span.cm-separator {
-  color: fuchsia
-}
-
-span.cm-number {
-  color: teal
-}
-
-.autocomplete-column-name {
-  display: inline-block
-}
-
-.autocomplete-column-hint {
-  color: #666;
-  display: inline-block;
-  float: right;
-  margin-left: 1em
-}
-
-.CodeMirror-hints {
-  z-index: 200
-}
diff --git a/#pma/themes/fallen/css/common.css.php b/#pma/themes/fallen/css/common.css.php
deleted file mode 100644
index ca7f9666..00000000
--- a/#pma/themes/fallen/css/common.css.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-# Unplanned execution path
-
-if ( !defined('PMA_MINIMUM_COMMON') && !defined('TESTSUITE') ) {
-  exit();
-}
-
-# Set source folder for stylesheet
-
-define('CSS_PATH', 'fallen');
-
-# Set the Brand name, will be set for logo text. Display in menubar.
-
-$brand = 'phpMyAdmin';
-
-# Do not change!!!
-# Or the theme will be error!
-
-$name = 'Fallen';
-$version = '0.2';
-$slug = 'fallen';
-$font_family_icon = 'Fallen' ?>
-/* ----------------------------------------------------- */
-
-/**
- * <?php echo $name ?> v<?php echo $version ?> (phpMyAdmin Theme)
- * Copyright 2016 Frans Allen (https://www.fransallen.com)
- * Licensed under the GPLv2 or later
- */
-
-/* Fonts
----------------------------------------------- */
-
-<?php include CSS_PATH . '/bundle-fonts.min.css' ?>
-
-/* Reset
----------------------------------------------- */
-
-<?php include CSS_PATH . '/common/reset.css.php' ?>
-
-/* General
----------------------------------------------- */
-
-<?php include CSS_PATH . '/common/general.css.php' ?>
-
-/* Login
----------------------------------------------- */
-
-<?php include CSS_PATH . '/common/login.css.php' ?>
-
-/* Icons
----------------------------------------------- */
-
-<?php include CSS_PATH . '/common/icons.css.php' ?>
-
-/* Typography
----------------------------------------------- */
-
-<?php include CSS_PATH . '/common/typography.css.php' ?>
-
-/* Heading
----------------------------------------------- */
-
-<?php include CSS_PATH . '/common/heading.css.php' ?>
-
-/* Globals
----------------------------------------------- */
-
-<?php include CSS_PATH . '/common/globals.css.php' ?>
-
-/* Contents
----------------------------------------------- */
-
-<?php include CSS_PATH . '/common/content.css.php' ?>
-
-/* Data
----------------------------------------------- */
-
-<?php include CSS_PATH . '/common/data.css.php' ?>
-
-/* Tables &amp; Columns
----------------------------------------------- */
-
-<?php include CSS_PATH . '/common/tables.css.php' ?>
-
-/* Forms, Input &amp; Textarea
----------------------------------------------- */
-
-<?php include CSS_PATH . '/common/forms.css.php' ?>
-
-/* Buttons
----------------------------------------------- */
-
-<?php include CSS_PATH . '/common/buttons.css.php' ?>
-
-/* Select
----------------------------------------------- */
-
-<?php include CSS_PATH . '/common/select.css.php' ?>
-
-/* LTR
----------------------------------------------- */
-
-<?php if ( $GLOBALS['text_dir'] === 'ltr' ) {
-  include CSS_PATH . '/common/ltr.css.php';
-} ?>
-
-/* Alert
----------------------------------------------- */
-
-<?php include CSS_PATH . '/common/alert.css.php' ?>
-
-/* Images
----------------------------------------------- */
-
-<?php include CSS_PATH . '/common/images.css.php' ?>
-
-/* Layouts
----------------------------------------------- */
-
-<?php include CSS_PATH . '/common/layouts.css.php' ?>
-
-/* Elements
----------------------------------------------- */
-
-<?php include CSS_PATH . '/common/elements.css.php' ?>
-
-/* Navigations
----------------------------------------------- */
-
-<?php include CSS_PATH . '/common/nav.css.php' ?>
-
-/* Responsive
----------------------------------------------- */
-
-<?php include CSS_PATH . '/common/responsive.css.php' ?>
diff --git a/#pma/themes/fallen/css/enum_editor.css.php b/#pma/themes/fallen/css/enum_editor.css.php
deleted file mode 100644
index 180a59d7..00000000
--- a/#pma/themes/fallen/css/enum_editor.css.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-# Unplanned execution path
-
-if ( !defined('PMA_MINIMUM_COMMON') && !defined('TESTSUITE') ) {
-  exit();
-} ?>
-/* ----------------------------------------------------- */
-
-/**
- * ENUM/SET editor styles
- */
-
-p.enum_notice {
-  margin: 5px 2px;
-  font-size: 80%
-}
-
-#enum_editor p {
-  margin-top: 0;
-  font-style: italic
-}
-
-#enum_editor .values, #enum_editor .add {
-  width: 100%
-}
-
-#enum_editor .add td {
-  vertical-align: middle;
-  width: 50%;
-  padding: 0;
-  padding-left: 1em
-}
-
-#enum_editor .values td.drop {
-  width: 1.8em;
-  cursor: pointer;
-  vertical-align: middle
-}
-
-#enum_editor .values input {
-  margin: .1em 0;
-  padding-right: 2em;
-  width: 100%
-}
-
-#enum_editor .values img {
-  width: 1.8em;
-  vertical-align: middle
-}
-
-#enum_editor input.add_value {
-  margin: 0;
-  margin-right: 0.4em
-}
-
-#enum_editor_output textarea {
-  width: 100%;
-  float: right;
-  margin: 1em 0 0 0
-}
-
-
-/**
- * ENUM/SET editor integration for the routines editor
- */
-
-.enum_hint {
-  position: relative
-}
-
-.enum_hint a {
-  position: absolute;
-  left: 81%;
-  bottom: .35em
-}
diff --git a/#pma/themes/fallen/css/fallen/bundle-fonts.css b/#pma/themes/fallen/css/fallen/bundle-fonts.css
deleted file mode 100644
index aafe596b..00000000
--- a/#pma/themes/fallen/css/fallen/bundle-fonts.css
+++ /dev/null
@@ -1,43 +0,0 @@
-@font-face {
-  font-family: "Fallen";
-  src: local("☺");
-  src: url("./themes/fallen/fonts/fallen/fallen.eot");
-  src: url("./themes/fallen/fonts/fallen/fallen.eot?#iefix") format("embedded-opentype"), url("./themes/fallen/fonts/fallen/fallen.svg#fallen") format("svg"), url("./themes/fallen/fonts/fallen/fallen.woff") format("woff"), url("./themes/fallen/fonts/fallen/fallen.ttf") format("truetype");
-  font-weight: normal;
-  font-style: normal
-}
-
-@font-face {
-  font-family: "Roboto";
-  src: local(Roboto Thin), url("./themes/fallen/fonts/roboto/Roboto-Thin.eot");
-  src: url("./themes/fallen/fonts/roboto/Roboto-Thin.eot?#iefix") format("embedded-opentype"), url("./themes/fallen/fonts/roboto/Roboto-Thin.woff2") format("woff2"), url("./themes/fallen/fonts/roboto/Roboto-Thin.woff") format("woff"), url("./themes/fallen/fonts/roboto/Roboto-Thin.ttf") format("truetype");
-  font-weight: 200
-}
-
-@font-face {
-  font-family: "Roboto";
-  src: local(Roboto Light), url("./themes/fallen/fonts/roboto/Roboto-Light.eot");
-  src: url("./themes/fallen/fonts/roboto/Roboto-Light.eot?#iefix") format("embedded-opentype"), url("./themes/fallen/fonts/roboto/Roboto-Light.woff2") format("woff2"), url("./themes/fallen/fonts/roboto/Roboto-Light.woff") format("woff"), url("./themes/fallen/fonts/roboto/Roboto-Light.ttf") format("truetype");
-  font-weight: 300
-}
-
-@font-face {
-  font-family: "Roboto";
-  src: local(Roboto Regular), url("./themes/fallen/fonts/roboto/Roboto-Regular.eot");
-  src: url("./themes/fallen/fonts/roboto/Roboto-Regular.eot?#iefix") format("embedded-opentype"), url("./themes/fallen/fonts/roboto/Roboto-Regular.woff2") format("woff2"), url("./themes/fallen/fonts/roboto/Roboto-Regular.woff") format("woff"), url("./themes/fallen/fonts/roboto/Roboto-Regular.ttf") format("truetype");
-  font-weight: 400
-}
-
-@font-face {
-  font-family: "Roboto";
-  src: url("./themes/fallen/fonts/roboto/Roboto-Medium.eot");
-  src: url("./themes/fallen/fonts/roboto/Roboto-Medium.eot?#iefix") format("embedded-opentype"), url("./themes/fallen/fonts/roboto/Roboto-Medium.woff2") format("woff2"), url("./themes/fallen/fonts/roboto/Roboto-Medium.woff") format("woff"), url("./themes/fallen/fonts/roboto/Roboto-Medium.ttf") format("truetype");
-  font-weight: 500
-}
-
-@font-face {
-  font-family: "Roboto";
-  src: url("./themes/fallen/fonts/roboto/Roboto-Bold.eot");
-  src: url("./themes/fallen/fonts/roboto/Roboto-Bold.eot?#iefix") format("embedded-opentype"), url("./themes/fallen/fonts/roboto/Roboto-Bold.woff2") format("woff2"), url("./themes/fallen/fonts/roboto/Roboto-Bold.woff") format("woff"), url("./themes/fallen/fonts/roboto/Roboto-Bold.ttf") format("truetype");
-  font-weight: 700
-}
diff --git a/#pma/themes/fallen/css/fallen/bundle-fonts.min.css b/#pma/themes/fallen/css/fallen/bundle-fonts.min.css
deleted file mode 100644
index 21d58d99..00000000
--- a/#pma/themes/fallen/css/fallen/bundle-fonts.min.css
+++ /dev/null
@@ -1 +0,0 @@
-@font-face{font-family:"Fallen";src:local("☺");src:url("./themes/fallen/fonts/fallen/fallen.eot");src:url("./themes/fallen/fonts/fallen/fallen.eot?#iefix") format("embedded-opentype"),url("./themes/fallen/fonts/fallen/fallen.svg#fallen") format("svg"),url("./themes/fallen/fonts/fallen/fallen.woff") format("woff"),url("./themes/fallen/fonts/fallen/fallen.ttf") format("truetype");font-weight:normal;font-style:normal}@font-face{font-family:"Roboto";src:local(Roboto Thin),url("./themes/fallen/fonts/roboto/Roboto-Thin.eot");src:url("./themes/fallen/fonts/roboto/Roboto-Thin.eot?#iefix") format("embedded-opentype"),url("./themes/fallen/fonts/roboto/Roboto-Thin.woff2") format("woff2"),url("./themes/fallen/fonts/roboto/Roboto-Thin.woff") format("woff"),url("./themes/fallen/fonts/roboto/Roboto-Thin.ttf") format("truetype");font-weight:200}@font-face{font-family:"Roboto";src:local(Roboto Light),url("./themes/fallen/fonts/roboto/Roboto-Light.eot");src:url("./themes/fallen/fonts/roboto/Roboto-Light.eot?#iefix") format("embedded-opentype"),url("./themes/fallen/fonts/roboto/Roboto-Light.woff2") format("woff2"),url("./themes/fallen/fonts/roboto/Roboto-Light.woff") format("woff"),url("./themes/fallen/fonts/roboto/Roboto-Light.ttf") format("truetype");font-weight:300}@font-face{font-family:"Roboto";src:local(Roboto Regular),url("./themes/fallen/fonts/roboto/Roboto-Regular.eot");src:url("./themes/fallen/fonts/roboto/Roboto-Regular.eot?#iefix") format("embedded-opentype"),url("./themes/fallen/fonts/roboto/Roboto-Regular.woff2") format("woff2"),url("./themes/fallen/fonts/roboto/Roboto-Regular.woff") format("woff"),url("./themes/fallen/fonts/roboto/Roboto-Regular.ttf") format("truetype");font-weight:400}@font-face{font-family:"Roboto";src:url("./themes/fallen/fonts/roboto/Roboto-Medium.eot");src:url("./themes/fallen/fonts/roboto/Roboto-Medium.eot?#iefix") format("embedded-opentype"),url("./themes/fallen/fonts/roboto/Roboto-Medium.woff2") format("woff2"),url("./themes/fallen/fonts/roboto/Roboto-Medium.woff") format("woff"),url("./themes/fallen/fonts/roboto/Roboto-Medium.ttf") format("truetype");font-weight:500}@font-face{font-family:"Roboto";src:url("./themes/fallen/fonts/roboto/Roboto-Bold.eot");src:url("./themes/fallen/fonts/roboto/Roboto-Bold.eot?#iefix") format("embedded-opentype"),url("./themes/fallen/fonts/roboto/Roboto-Bold.woff2") format("woff2"),url("./themes/fallen/fonts/roboto/Roboto-Bold.woff") format("woff"),url("./themes/fallen/fonts/roboto/Roboto-Bold.ttf") format("truetype");font-weight:700}
\ No newline at end of file
diff --git a/#pma/themes/fallen/css/fallen/common/alert.css.php b/#pma/themes/fallen/css/fallen/common/alert.css.php
deleted file mode 100644
index 6ef0a11e..00000000
--- a/#pma/themes/fallen/css/fallen/common/alert.css.php
+++ /dev/null
@@ -1,161 +0,0 @@
-.attention {
-  color: red;
-  font-weight: bold
-}
-
-.allfine {
-  color: green
-}
-
-/* Message Boxes: Error, Confirmation */
-
-#pma_errors, #pma_demo, #pma_footer {
-  padding: 20px
-}
-
-#pma_errors #pma_errors {
-  padding: 0
-}
-
-.success h1, .notice h1, div.error h1 {
-  text-align: left;
-  margin: 0 0 0.2em 0;
-  color: <?php echo $GLOBALS['cfg']['NaviColor'] ?>
-}
-
-div.success, div.notice, div.error, div.footnotes {
-  box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  -webkit-box-sizing: border-box;
-  margin: 20px 0 20px;
-  border: 1px solid;
-  background-repeat: no-repeat;
-  <?php if ($GLOBALS['text_dir'] === 'ltr') { ?>
-  background-position: 10px 50%;
-  padding: 10px
-  <?php } else { ?>
-  background-position: 99% 50%;
-  padding: 10px 35px 10px 10px
-  <?php } ?>
-}
-
-.ajax_notification .error {
-  margin-top: 0;
-  padding: 3px
-}
-
-div.success {
-  margin: 0 0 1em 0;
-  border: none
-}
-
-.success a, .notice a, .error a {
-  text-decoration: underline;
-  color: <?php echo $GLOBALS['cfg']['ButtonColor'] ?>
-}
-
-.success {
-  color: <?php echo $GLOBALS['cfg']['ButtonColor'] ?>;
-  background-color: <?php echo $GLOBALS['cfg']['BrowseSuccessColor'] ?>
-}
-
-h1.success, div.success {
-  border-color: <?php echo $GLOBALS['cfg']['BrowseSuccessColor'] ?>
-}
-
-.notice, .footnotes {
-  color: <?php echo $GLOBALS['cfg']['ButtonColor'] ?>;
-  background-color: <?php echo $GLOBALS['cfg']['BlueHeader'] ?>
-}
-
-h1.notice, div.notice, div.footnotes {
-  border-color: <?php echo $GLOBALS['cfg']['BlueHeader'] ?>
-}
-
-.notice a {
-  color: <?php echo $GLOBALS['cfg']['ButtonColor'] ?>
-}
-
-.error {
-  border: 1px solid <?php echo $GLOBALS['cfg']['BrowseWarningColor'] ?>!important;
-  color: <?php echo $GLOBALS['cfg']['ButtonColor'] ?>;
-  background-color: <?php echo $GLOBALS['cfg']['BrowseWarningColor'] ?>
-}
-
-h1.error, div.error {
-  border-color: <?php echo $GLOBALS['cfg']['MainColor'] ?>
-}
-
-.confirmation {
-  color: <?php echo $GLOBALS['cfg']['ButtonColor'] ?>;
-  background-color: <?php echo $GLOBALS['cfg']['BrowseWarningColor'] ?>
-}
-
-fieldset.confirmation legend {
-  background-color: #d03912
-}
-
-/* End Message Boxes */
-
-/* Forbidden, No Privileges */
-
-.noPrivileges {
-  color: #ff0000;
-  font-weight: bold
-}
-
-/* End Forbidden */
-
-fieldset.caution {
-  background: <?php echo $GLOBALS['cfg']['BrowseWarningColor'] ?>;
-  border: 1px solid <?php echo $GLOBALS['cfg']['BrowseWarningColor'] ?>
-}
-
-fieldset.caution legend {
-  background-color: #fff
-}
-
-fieldset.caution a {
-  text-transform: uppercase;
-  color: <?php echo $GLOBALS['cfg']['ButtonColor'] ?>;
-  font-weight: normal
-}
-
-fieldset.caution ul, #tbl_maintenance {
-  padding: 0
-}
-
-fieldset.caution li, #tbl_maintenance li {
-  display: block
-}
-
-fieldset.caution li:before {
-  font-family: "<?php echo $font_family_icon ?>";
-  content: "";
-  color: <?php echo $GLOBALS['cfg']['ButtonColor'] ?>;
-  margin-right: 10px
-}
-
-fieldset.caution li a:nth-child(2) img {
-  background: url("./themes/<?php echo $slug ?>/img/s_info.png")!important
-}
-
-p.notice {
-  margin: 1.5em 0;
-  border: 1px solid #000;
-  background-repeat: no-repeat;
-  background: #555;
-  color: #d4fb6a
-  <?php if ( $GLOBALS['text_dir'] === 'ltr' ) { ?>
-  background-position: 10px 50%;
-  padding: 10px 10px 10px 25px
-  <?php } else { ?>
-  background-position: 99% 50%;
-  padding: 25px 10px 10px 10px
-  <?php } ?>
-}
-
-p.notice a {
-  color: #fff;
-  text-decoration: underline
-}
diff --git a/#pma/themes/fallen/css/fallen/common/buttons.css.php b/#pma/themes/fallen/css/fallen/common/buttons.css.php
deleted file mode 100644
index c07c8bc6..00000000
--- a/#pma/themes/fallen/css/fallen/common/buttons.css.php
+++ /dev/null
@@ -1,28 +0,0 @@
-button {
-  background-color: <?php echo $GLOBALS['cfg']['ButtonBackground'] ?>;
-  color: <?php echo $GLOBALS['cfg']['ButtonColor'] ?>;
-  margin-left: 14px;
-  padding: 4px;
-  text-decoration: none
-}
-
-.sqlbutton, #tablefieldinsertbuttoncontainer input[type=button] {
-  margin-top: 1em;
-  margin-left: 0!important;
-  margin-right: 14px!important
-}
-
-button {
-  display: inline
-}
-
-button, img {
-  vertical-align: middle
-}
-
-button.mult_submit {
-  border: none;
-  background-color: transparent;
-  color: <?php echo $GLOBALS['cfg']['BrowsePointerColor'] ?>;
-  margin: 0
-}
diff --git a/#pma/themes/fallen/css/fallen/common/content.css.php b/#pma/themes/fallen/css/fallen/common/content.css.php
deleted file mode 100644
index 032b6bed..00000000
--- a/#pma/themes/fallen/css/fallen/common/content.css.php
+++ /dev/null
@@ -1,10 +0,0 @@
-#page_content {
-  margin: 20px!important
-}
-
-.turnOffSelect {
-  user-select: none;
-  -khtml-user-select: none;
-  -moz-user-select: none;
-  -webkit-user-select: none
-}
diff --git a/#pma/themes/fallen/css/fallen/common/data.css.php b/#pma/themes/fallen/css/fallen/common/data.css.php
deleted file mode 100644
index 10babc61..00000000
--- a/#pma/themes/fallen/css/fallen/common/data.css.php
+++ /dev/null
@@ -1,24 +0,0 @@
-.data, .data_full_width {
-  margin: 10px 0
-}
-
-.data_full_width {
-  width: 100%
-}
-
-.data th {
-  border-bottom: 1px solid <?php echo $GLOBALS['cfg']['BorderColor'] ?>
-}
-
-.data th a:hover {
-  color: #999!important
-}
-
-div#dataDisplay input, div#dataDisplay select {
-  margin: 0;
-  margin-right: .5em
-}
-
-div#dataDisplay th {
-  line-height: 2em
-}
diff --git a/#pma/themes/fallen/css/fallen/common/elements.css.php b/#pma/themes/fallen/css/fallen/common/elements.css.php
deleted file mode 100644
index bbaeaa5a..00000000
--- a/#pma/themes/fallen/css/fallen/common/elements.css.php
+++ /dev/null
@@ -1,1410 +0,0 @@
-/* Topmenu */
-
-#topmenu .error {
-  background: #eee;
-  border: 0!important;
-  color: #aaa
-}
-
-ul#topmenu, ul#topmenu2 {
-  list-style-type: none;
-  margin: 0;
-  height: 48px
-}
-
-ul.tabs {
-  list-style-type: none;
-  margin: 0
-}
-
-ul#topmenu2 {
-  margin: -20px -10px -10px;
-  padding: 10px;
-  clear: both
-}
-
-ul#topmenu li, ul#topmenu2 li {
-  float: left;
-  margin: 0;
-  vertical-align: middle;
-  height: 38px
-}
-
-#topmenu img, #topmenu2 img {
-  margin-right: .5em;
-  vertical-align: -3px
-}
-
-.menucontainer {
-  background-color: <?php echo $GLOBALS['cfg']['ThBackground'] ?>;
-  height: 48px;
-  box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.2)
-}
-
-#topmenu .tabactive {
-  background: #fff!important
-}
-
-#topmenu2 .tabactive {
-  background: #ccc
-}
-
-ul#topmenu2 a {
-  display: block;
-  margin: 7px 0;
-  margin-left: 0;
-  padding: 5px 15px;
-  white-space: nowrap;
-  color: <?php echo $GLOBALS['cfg']['NaviPointerColor'] ?>;
-  text-transform: uppercase;
-  background-color: #f6f6f6;
-  box-shadow: 0 1px 1px rgb(221, 221, 221)
-}
-
-#topmenu {
-  padding-left: 20px;
-  padding-right: 20px
-}
-
-ul#topmenu ul.only {
-  left: 0
-}
-
-ul#topmenu a, ul#topmenu span {
-  padding: 12px 10px 8px;
-  height: 28px;
-  line-height: 28px;
-  text-transform: uppercase;
-  color: #666;
-  font-weight: normal
-}
-
-ul#topmenu ul a {
-  border-width: 1pt 0 0 0
-}
-
-ul#topmenu ul li:first-child a {
-  border-width: 0
-}
-
-ul#topmenu>li>a:hover, ul#topmenu>li>.tabactive {
-  text-decoration: none;
-  color: #333
-}
-
-ul#topmenu ul a:hover, ul#topmenu ul .tabactive {
-  text-decoration: none
-}
-
-ul#topmenu2 a, ul#topmenu2 a:hover {
-  text-decoration: none
-}
-
-ul#topmenu>li.active {
-  border-right: 0
-}
-
-#topmenucontainer {
-  width: 100%
-}
-
-/* End Topmenu */
-
-/* Calendar */
-
-table.calendar {
-  width: 100%
-}
-
-table.calendar td {
-  text-align: center
-}
-
-table.calendar td a {
-  display: block
-}
-
-table.calendar td a:hover {
-  background-color: #CCFFCC
-}
-
-table.calendar th {
-  background-color: #D3DCE3
-}
-
-table.calendar td.selected {
-  background-color: #FFCC99
-}
-
-img.calendar {
-  border: none
-}
-
-form.clock {
-  text-align: center
-}
-
-/* End Calendar */
-
-/* Server Info */
-
-#serverinfo {
-  padding: 12px 30px;
-  overflow: hidden;
-  margin: 0;
-  margin-left: -1em;
-  font-family: <?php echo $GLOBALS['cfg']['FontFamily'] ?>;
-  color: <?php echo $GLOBALS['cfg']['ButtonColor'] ?>;
-  background: <?php echo $GLOBALS['cfg']['NaviBackground'] ?>;
-  font-height: 1.1em;
-  height: 15px
-}
-
-#serverinfo .item {
-  font-family: <?php echo $GLOBALS['cfg']['FontFamily'] ?>;
-  white-space: nowrap;
-  color: <?php echo $GLOBALS['cfg']['ButtonColor'] ?>
-}
-
-#serverinfo .item:before {
-  padding-left: 5px;
-  padding-right: 5px;
-  font-family: "<?php echo $font_family_icon ?>";
-  font-size: 10px;
-  color: #eee;
-  content: ""
-}
-
-#serverinfo a:hover {
-  text-decoration: none
-}
-
-#serverinfo a:first-child {
-  display: none!important
-}
-
-#serverinfo .separator, #serverinfo .icon {
-  display: none
-}
-
-#serverinfo img {
-  margin: 0 .1em 0;
-  margin-left: .2em
-}
-
-/* End Server Info */
-
-/* User Privileges */
-
-#fieldset_add_user_login div.item {
-  border-bottom: 1px solid #ddd;
-  padding-bottom: .3em;
-  margin-bottom: .3em
-}
-
-#fieldset_add_user_login label {
-  float: left;
-  display: block;
-  width: 10em;
-  max-width: 100%;
-  text-align: right;
-  padding-right: .5em;
-  line-height: 35px
-}
-
-#fieldset_add_user_login span.options #select_pred_username, #fieldset_add_user_login span.options #select_pred_hostname, #fieldset_add_user_login span.options #select_pred_password {
-  width: 100%;
-  max-width: 100%
-}
-
-#fieldset_add_user_login span.options {
-  float: left;
-  display: block;
-  width: 12em;
-  max-width: 100%;
-  padding-right: .5em
-}
-
-#fieldset_add_user_login input {
-  width: 12em;
-  clear: right;
-  max-width: 100%
-}
-
-#fieldset_add_user_login span.options input {
-  width: auto
-}
-
-#fieldset_add_user_login span.options input[type=button] {
-  margin: 4px
-}
-
-#fieldset_user_priv div.item {
-  float: left;
-  width: 9em;
-  max-width: 100%
-}
-
-#fieldset_user_priv div.item div.item {
-  float: none
-}
-
-#fieldset_user_priv div.item label {
-  white-space: nowrap
-}
-
-#fieldset_user_priv div.item select {
-  width: 100%
-}
-
-#fieldset_user_global_rights fieldset {
-  float: left
-}
-
-#fieldset_user_group_rights fieldset {
-  float: left
-}
-
-/* End user privileges */
-
-/* Server Status */
-
-.linkElem:hover {
-  text-decoration: underline;
-  color: #235a81;
-  cursor: pointer
-}
-
-h3#serverstatusqueries span {
-  font-size: 60%;
-  display: inline
-}
-
-div#serverStatusTabs {
-  margin-top: 1em
-}
-
-.buttonlinks {
-  float: right;
-  white-space: nowrap
-}
-
-div#serverstatusquerieschart {
-  float: left;
-  width: 500px;
-  height: 350px;
-  padding-left: 30px
-}
-
-table#serverstatusqueriesdetails, table#serverstatustraffic {
-  float: left
-}
-
-table#serverstatusqueriesdetails th {
-  min-width: 35px
-}
-
-table#serverstatusvariables {
-  width: 100%;
-  margin-bottom: 1em
-}
-
-table#serverstatusvariables .name {
-  width: 18em;
-  white-space: nowrap
-}
-
-table#serverstatusvariables .value {
-  width: 6em
-}
-
-table#serverstatusconnections {
-  float: left;
-  margin-left: 30px
-}
-
-div#serverstatus table tbody td.descr a, div#serverstatus table .tblFooters a {
-  white-space: nowrap
-}
-
-div.tabLinks {
-  margin-left: 0.3em;
-  float: left;
-  padding: 5px 0
-}
-
-div.tabLinks a, div.tabLinks label {
-  margin-right: 7px
-}
-
-div.tabLinks .icon {
-  margin: -0.2em 0.3em 0 0
-}
-
-.popupContent {
-  display: none;
-  position: absolute;
-  border: 1px solid <?php echo $GLOBALS['cfg']['BrowseGrayColor'] ?>;
-  margin: 0;
-  padding: 3px;
-  background-color: #fff;
-  z-index: 2
-}
-
-div#logTable {
-  padding-top: 10px;
-  clear: both
-}
-
-div#logTable table {
-  width: 100%
-}
-
-div#queryAnalyzerDialog {
-  min-width: 700px
-}
-
-div#queryAnalyzerDialog div.CodeMirror-scroll {
-  height: auto
-}
-
-div#queryAnalyzerDialog div#queryProfiling {
-  height: 300px
-}
-
-div#queryAnalyzerDialog td.explain {
-  width: 250px
-}
-
-div#queryAnalyzerDialog table.queryNums {
-  display: none
-  border: 0;
-  text-align: left
-}
-
-.smallIndent {
-  padding-left: 7px
-}
-
-#serverstatus h3 {
-  margin: 15px 0;
-  font-weight: normal;
-  color: #999;
-  font-size: 1.7em
-}
-
-/* End Server Status */
-
-/* Chart */
-
-div.liveChart {
-  clear: both;
-  min-width: 500px;
-  height: 400px;
-  padding-bottom: 80px
-}
-
-#addChartDialog input[type="text"] {
-  margin: 0;
-  padding: 3px
-}
-
-div#chartVariableSettings {
-  margin-left: 10px
-}
-
-table#chartGrid td {
-  padding: 3px;
-  margin: 0
-}
-
-table#chartGrid div.monitorChart {
-  background: <?php echo $GLOBALS['cfg']['ThBackground'] ?>;
-  border: 1px solid <?php echo $GLOBALS['cfg']['BorderColor'] ?>;
-  box-shadow: 0 2px 2px <?php echo $GLOBALS['cfg']['NaviColor'] ?>;
-  overflow: hidden
-}
-
-div#profilingchart {
-  width: 850px;
-  height: 370px;
-  float: left
-}
-
-#resizer {
-  border: 1px solid silver
-}
-
-#inner-resizer {
-  padding: 10px
-}
-
-.chartOption {
-  float: left;
-  margin-right: 40px
-}
-
-/* End Chart */
-
-/* Server Variables */
-
-#serverVariables {
-  table-layout: fixed;
-  width: 100%
-}
-
-#serverVariables .var-row>td {
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  line-height: 2em
-}
-
-#serverVariables .var-header {
-  color: <?php echo $GLOBALS['cfg']['ThColor'] ?>;
-  background: #f3f3f3;
-  font-weight: bold
-}
-
-#serverVariables .var-header {
-  text-align: left
-}
-
-#serverVariables .var-row {
-  padding: 0.5em;
-  min-height: 18px
-}
-
-#serverVariables .var-action {
-  width: 120px
-}
-
-#serverVariables .var-name {
-  float: left
-}
-
-#serverVariables .var-name.session {
-  font-weight: normal;
-  font-style: italic
-}
-
-#serverVariables .var-value {
-  width: 50%;
-  float: right;
-  text-align: right
-}
-
-#serverVariables .var-doc {
-  overflow: visible;
-  float: right
-}
-
-#serverVariables .editLink {
-  padding-right: 1em;
-  float: left;
-  font-family: sans-serif
-}
-
-#serverVariables .serverVariableEditor {
-  width: 100%;
-  overflow: hidden
-}
-
-#serverVariables .serverVariableEditor input {
-  width: 100%;
-  margin: 0 0.5em;
-  box-sizing: border-box;
-  -ms-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  -webkit-box-sizing: border-box;
-  height: 2.2em
-}
-
-#serverVariables .serverVariableEditor div {
-  display: block;
-  overflow: hidden;
-  padding-right: 1em
-}
-
-#serverVariables .serverVariableEditor a {
-  float: right;
-  margin: 0 0.5em;
-  line-height: 2em
-}
-
-/* End Server Variables */
-
-/* Querybox */
-
-#togglequerybox {
-  margin: 0 10px
-}
-
-#sectionlinks {
-  padding: 16px;
-  background: #f3f3f3;
-  border: 1px solid #aaa
-}
-
-#sectionlinks a, .buttonlinks a, a.button {
-  font-size: .88em;
-  font-weight: bold;
-  line-height: 35px;
-  margin-left: 7px;
-  border: 1px solid #aaa;
-  padding: 5px 10px;
-  color: #111;
-  text-decoration: none;
-  background: #ddd;
-  white-space: nowrap
-}
-
-div#sqlquerycontainer {
-  float: left;
-  width: 69%
-}
-
-div#tablefieldscontainer {
-  float: right;
-  width: 29%;
-  margin-top: -20px
-}
-
-div#tablefieldscontainer select {
-  width: 100%;
-  background: #fff;
-  max-width: initial
-}
-
-textarea#sqlquery {
-  width: 100%;
-  border: 1px solid #aaa;
-  padding: 5px;
-  font-family: inherit
-}
-
-textarea#sql_query_edit {
-  height: 7em;
-  width: 95%;
-  display: block
-}
-
-div#queryboxcontainer div#bookmarkoptions {
-  margin-top: .5em
-}
-
-/* End Querybox */
-
-/* Main Page */
-
-#mysqlmaininformation, #pmamaininformation {
-  float: left;
-  width: 49%
-}
-
-#maincontainer ul {
-  list-style-type: square;
-  vertical-align: middle;
-  color: <?php echo $GLOBALS['cfg']['ThColor'] ?>;
-  margin-left: 20px
-}
-
-#maincontainer ul li {
-  line-height: 1.5
-}
-
-#full_name_layer {
-  position: absolute;
-  padding: 2px;
-  margin-top: -3px;
-  z-index: 801;
-  border: solid 1px #888;
-  background: #fff
-}
-
-/* End main page */
-
-/* Iconic view for ul items */
-
-li br {
-  display: none
-}
-
-li.no_bullets {
-  list-style-type: none!important
-}
-
-li#li_mysql_client_version {
-  overflow: hidden;
-  text-overflow: ellipsis
-}
-
-li#li_create_database {
-  background-color: #f6f6f6;
-  padding: 10px;
-  border: 1px solid <?php echo $GLOBALS['cfg']['BorderColor'] ?>;
-  display: block;
-  margin-top: 10px;
-  margin-bottom: 20px
-}
-
-li#li_select_lang select {
-  margin: 0!important;
-  height: 26px
-}
-
-li#li_select_lang {
-  display: block;
-  padding: 10px;
-  padding-left: 20px;
-  font-family: <?php echo $GLOBALS['cfg']['FontFamilyLight'] ?>
-}
-
-li#li_select_lang:hover {
-  background: #f6f6f6
-}
-
-li#li_select_mysql_collation select {
-  margin: 0!important
-}
-
-li#li_select_mysql_collation {
-  display: block;
-  padding: 10px;
-  padding-left: 20px;
-  font-family: <?php echo $GLOBALS['cfg']['FontFamilyLight'] ?>
-}
-
-li#li_select_mysql_collation:hover {
-  background: #f6f6f6
-}
-
-li#li_select_theme select {
-  margin: 0!important
-}
-
-li#li_select_theme {
-  display: block;
-  padding: 10px;
-  padding-left: 20px;
-  font-family: <?php echo $GLOBALS['cfg']['FontFamilyLight'] ?>
-}
-
-li#li_select_theme:hover {
-  background: #f6f6f6
-}
-
-li#li_change_password {
-  /* list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath() ?>s_passwd.png); */
-  display: block;
-  padding: 10px;
-  padding-left: 20px;
-  font-family: <?php echo $GLOBALS['cfg']['FontFamilyLight'] ?>
-}
-
-li#li_change_password:hover {
-  background: #f6f6f6
-}
-
-li#li_user_preferences {
-  /* list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath() ?>b_tblops.png); */
-  display: block;
-  padding: 10px;
-  padding-left: 20px;
-  font-family: <?php echo $GLOBALS['cfg']['FontFamilyLight'] ?>
-}
-
-li#li_user_preferences:hover {
-  background: #f6f6f6
-}
-
-li#li_switch_dbstats {
-  background-color: #f6f6f6;
-  padding: 10px;
-  border: 1px solid <?php echo $GLOBALS['cfg']['BorderColor'] ?>;
-  display: block
-}
-
-/* End iconic view for ul items */
-
-#body_browse_foreigners {
-  background: <?php echo $GLOBALS['cfg']['NaviBackground'] ?>;
-  margin: .5em .5em 0 .5em
-}
-
-#bodyquerywindow {
-  background: <?php echo $GLOBALS['cfg']['NaviBackground'] ?>
-}
-
-#bodythemes {
-  width: 500px;
-  margin: auto;
-  text-align: center
-}
-
-#bodythemes img {
-  border: .1em solid #000
-}
-
-#bodythemes a:hover img {
-  border: .1em solid red
-}
-
-#fieldset_select_fields {
-  float: left
-}
-
-#selflink {
-  clear: both;
-  display: block;
-  margin-top: 20px;
-  margin-bottom: 20px;
-  margin-left: 20px;
-  margin-right: 20px;
-  border-top: 1px solid silver;
-  text-align: right
-}
-
-#table_innodb_bufferpool_usage, #table_innodb_bufferpool_activity {
-  float: left
-}
-
-#div_mysql_charset_collations table {
-  float: left
-}
-
-#div_mysql_charset_collations table th, #div_mysql_charset_collations table td {
-  padding: 0.4em
-}
-
-#div_mysql_charset_collations table th#collationHeader {
-  width: 35%
-}
-
-.operations_half_width {
-  width: 100%;
-  float: left;
-  margin-bottom: 10px
-}
-
-.operations_full_width {
-  width: 100%;
-  clear: both
-}
-
-#qbe_div_table_list {
-  float: left
-}
-
-#qbe_div_sql_query {
-  float: left
-}
-
-label.desc {
-  width: 30em;
-  float: left
-}
-
-label.desc sup {
-  position: absolute
-}
-
-.sqlOuter code.sql, div.sqlvalidate, #inline_editor_outer {
-  display: block;
-  padding: 1em;
-  margin: 1em;
-  overflow: auto;
-  background-color: <?php echo $GLOBALS['cfg']['MainBackground'] ?>;
-  border: 1px solid <?php echo $GLOBALS['cfg']['BorderColor'] ?>;
-  direction: ltr
-}
-
-#main_pane_left {
-  width: 60%;
-  min-width: 260px;
-  float: left;
-  padding-top: 1em
-}
-
-#main_pane_right {
-  overflow: hidden;
-  min-width: 160px;
-  padding-top: 1em;
-  padding-left: 3em
-}
-
-.group {
-  margin-bottom: 1em;
-  padding-bottom: 1em
-}
-
-.group input[type=submit] {
-  margin-left: 0
-}
-
-.group h2 {
-  color: <?php echo $GLOBALS['cfg']['NaviBackground'] ?>;
-  font-size: 2.8em;
-  font-weight: normal;
-  font-family: <?php echo $GLOBALS['cfg']['FontFamilyLight'] ?>;
-  margin-top: 0;
-  margin-bottom: 0.6em
-}
-
-.group-cnt {
-  padding: 0 0 0 0.5em;
-  display: inline-block;
-  width: 98%
-}
-
-textarea#partitiondefinition {
-  height: 3em
-}
-
-/* For elements that should be revealed only via js */
-
-.hide {
-  display: none
-}
-
-#list_server {
-  list-style-image: none;
-  padding: 0
-}
-
-/* Progress Bar styles */
-
-div.upload_progress {
-  width: 400px;
-  margin: 3em auto;
-  text-align: center
-}
-
-div.upload_progress_bar_outer {
-  border: 1px solid #000;
-  width: 202px;
-  position: relative;
-  margin: 0 auto 1em;
-  color: <?php echo $GLOBALS['cfg']['MainColor'] ?>
-}
-
-div.upload_progress_bar_inner {
-  background-color: <?php echo $GLOBALS['cfg']['NaviBackground'] ?>;
-  width: 0;
-  height: 12px;
-  margin: 1px;
-  overflow: hidden;
-  position: relative;
-  <?php if ( $GLOBALS['cfg']['BrowseMarkerEnable'] ) { ?>
-  color: <?php echo $GLOBALS['cfg']['BrowseMarkerColor'] ?>
-  <?php } ?>
-}
-
-div.upload_progress_bar_outer div.percentage {
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 202px
-}
-
-div.upload_progress_bar_inner div.percentage {
-  top: -1px;
-  left: -1px
-}
-
-div#statustext {
-  margin-top: .5em
-}
-
-table#serverconnection_src_remote, table#serverconnection_trg_remote, table#serverconnection_src_local, table#serverconnection_trg_local {
-  float: left
-}
-
-/* End Progress Bar */
-
-/* Validation error message styles */
-
-input[type=text].invalid_value, input[type=password].invalid_value, input[type=number].invalid_value, input[type=date].invalid_value .invalid_value {
-  background: #ffcccc;
-}
-
-/* Ajax notification styling */
-
-.ajax_notification {
-  top: 0;
-  position: fixed;
-  width: 100%;
-  z-index: 1100;
-  text-align: center;
-  display: inline;
-  left: 0;
-  right: 0;
-  background-image: url("<?php echo $_SESSION['PMA_Theme']->getImgPath('loader-blue.svg') ?>");
-  background-repeat: no-repeat;
-  background-position: 46%;
-  margin: 0;
-  background-color: <?php echo $GLOBALS['cfg']['NaviColor'] ?>;
-  color: <?php echo $GLOBALS['cfg']['MainColor'] ?>;
-  padding: 10px!important;
-  border: none;
-  height: 19px
-}
-
-.dismissable {
-  margin-left: -10px;
-  margin-top: -10px
-}
-
-#loading_parent {
-  /* Need this parent to properly center the notification division */
-  position: relative;
-  width: 100%
-}
-
-/* Export and Import styles */
-
-.export_table_list_container {
-  display: inline-block;
-  max-height: 20em;
-  overflow-y: scroll
-}
-
-.export_table_select th {
-  text-align: center;
-  vertical-align: middle
-}
-
-.export_table_select .all {
-  font-weight: bold;
-  border-bottom: 1px solid black
-}
-
-.export_structure, .export_data {
-  text-align: center
-}
-
-.export_table_name {
-  vertical-align: middle
-}
-
-.exportoptions h3, .importoptions h3 {
-  border-bottom: 1px #ccc solid;
-  font-size: 110%
-}
-
-.exportoptions ul, .importoptions ul, .format_specific_options ul {
-  list-style-type: none;
-  margin-bottom: 15px
-}
-
-.exportoptions li, .importoptions li {
-  margin: 7px
-}
-
-.exportoptions label, .importoptions label, .exportoptions p, .importoptions p {
-  margin: 5px;
-  float: none
-}
-
-#csv_options label.desc, #ldi_options label.desc, #latex_options label.desc, #output label.desc {
-  float: left;
-  width: 15em
-}
-
-.exportoptions, .importoptions {
-  margin: 20px 30px 30px;
-  margin-left: 10px
-}
-
-.exportoptions #buttonGo, .importoptions #buttonGo {
-  padding: 5px 12px;
-  text-decoration: none;
-  cursor: pointer;
-  margin: 0
-}
-
-.format_specific_options h3 {
-  margin: 10px 0 0;
-  margin-left: 10px;
-  border: 0
-}
-
-.format_specific_options {
-  border: 1px solid #999;
-  margin: 7px 0;
-  padding: 3px
-}
-
-p.desc {
-  margin: 5px
-}
-
-/* Export styles only */
-
-select#db_select, select#table_select {
-  width: 400px
-}
-
-.export_sub_options {
-  margin: 20px 0 0;
-  margin-left: 30px
-}
-
-.export_sub_options h4 {
-  border-bottom: 1px solid #999
-}
-
-.export_sub_options li.subgroup {
-  display: inline-block;
-  margin-top: 0
-}
-
-.export_sub_options li {
-  margin-bottom: 0
-}
-
-#output_quick_export {
-  display: none
-}
-
-/* Import styles only */
-
-.importoptions #import_notification {
-  margin: 10px 0;
-  font-style: italic
-}
-
-input#input_import_file {
-  margin: 5px
-}
-
-.formelementrow {
-  margin: 20px 0 5px 0
-}
-
-#popup_background {
-  display: none;
-  position: fixed;
-  width: 100%;
-  height: 100%;
-  top: 0;
-  left: 0;
-  background: #000;
-  z-index: 1000;
-  overflow: hidden
-}
-
-/* Indexes */
-
-#index_frm .index_info input, #index_frm .index_info select {
-  width: 14em;
-  box-sizing: border-box;
-  -ms-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  -webkit-box-sizing: border-box
-}
-
-#index_frm .index_info div {
-  padding: .2em 0
-}
-
-#index_frm .index_info .label {
-  float: left;
-  min-width: 12em
-}
-
-#index_frm .slider {
-  width: 10em;
-  margin: .6em;
-  float: left
-}
-
-#index_frm .add_fields {
-  float: left
-}
-
-#index_frm .add_fields input {
-  margin-left: 1em
-}
-
-#index_frm input {
-  margin: 0
-}
-
-#index_frm td {
-  vertical-align: middle
-}
-
-table#index_columns {
-  width: 100%
-}
-
-table#index_columns select {
-  width: 85%;
-  float: right
-}
-
-#move_columns_dialog div {
-  padding: 1em
-}
-
-#move_columns_dialog ul {
-  list-style: none;
-  margin: 0;
-  padding: 0
-}
-
-#move_columns_dialog li {
-  background: <?php echo $GLOBALS['cfg']['ThBackground'] ?>;
-  border: 1px solid #aaa;
-  color: <?php echo $GLOBALS['cfg']['ThColor'] ?>;
-  font-weight: bold;
-  margin: .4em;
-  padding: .2em
-}
-
-/* Config Forms */
-
-.config-form ul.tabs {
-  margin: 1.1em .2em 0;
-  padding: 0 0 .3em 0;
-  list-style: none;
-  font-weight: bold
-}
-
-.config-form ul.tabs li {
-  float: left;
-  margin-bottom: -1px
-}
-
-.config-form ul.tabs li a {
-  display: block;
-  margin: .1em .2em 0;
-  white-space: nowrap;
-  text-decoration: none;
-  border: 1px solid <?php echo $GLOBALS['cfg']['BgTwo'] ?>;
-  border-bottom: 1px solid #ddd
-}
-
-.config-form ul.tabs li a {
-  padding: 7px 10px;
-  background: #f2f2f2;
-  color: #555
-}
-
-.config-form ul.tabs li a:hover, .config-form ul.tabs li a:active {
-  background: #e5e5e5
-}
-
-.config-form ul.tabs li.active a {
-  background-color: #fff;
-  margin-top: 1px;
-  color: #000;
-  border-color: #ddd;
-  border-bottom: 1px solid #fff
-}
-
-.config-form fieldset {
-  margin-top: 0;
-  padding: 0;
-  clear: both;
-  background: none
-}
-
-.config-form legend {
-  display: none
-}
-
-.config-form fieldset p {
-  margin: 0;
-  padding: 10px;
-  background: #fff;
-  font-family: <?php echo $GLOBALS['cfg']['FontFamilyLight'] ?>;
-  font-size: 16px
-}
-
-.config-form fieldset .errors {
-  /* form error list */
-  margin: 0 -2px 1em;
-  padding: .5em 1.5em;
-  background: #FBEAD9;
-  border: 0 #C83838 solid;
-  border-width: 1px 0;
-  list-style: none;
-  font-family: sans-serif;
-  font-size: small
-}
-
-.config-form fieldset .inline_errors {
-  /* field error list */
-  margin: .3em .3em .3em;
-  margin-left: 0;
-  padding: 0;
-  list-style: none;
-  color: #9a0000;
-  font-size: small
-}
-
-.config-form fieldset table {
-  background-color: #fff
-}
-
-.config-form fieldset label {
-  font-weight: normal
-}
-
-.config-form fieldset textarea, .insertRowTable textarea {
-  margin: 5px;
-  padding: 5px
-}
-
-.config-form fieldset th {
-  padding: 10px;
-  padding-left: .5em;
-  text-align: left;
-  vertical-align: top;
-  width: 40%
-}
-
-.config-form fieldset .doc, .config-form fieldset .disabled-notice {
-  margin-left: 1em
-}
-
-.config-form fieldset .disabled-notice {
-  font-size: 80%;
-  text-transform: uppercase;
-  color: #e00;
-  cursor: help
-}
-
-.config-form fieldset td {
-  padding-top: .3em;
-  padding-bottom: .3em;
-  vertical-align: top
-}
-
-.config-form fieldset th small {
-  display: block;
-  font-weight: normal;
-  font-family: sans-serif;
-  font-size: x-small;
-  color: #444
-}
-
-.config-form fieldset th, .config-form fieldset td {
-  border-bottom: 1px <?php echo $GLOBALS['cfg']['NaviColor'] ?> solid;
-  border-right: none
-}
-
-.config-form .lastrow {
-  padding: .5em;
-  text-align: center
-}
-
-.config-form span.checkbox {
-  padding: 2px;
-  display: inline-block
-}
-
-.config-form .custom {
-  /* customized field */
-  background: #ffc
-}
-
-.config-form span.checkbox.custom {
-  padding: 1px;
-  border: 1px #edec90 solid;
-  background: #ffc
-}
-
-.config-form img.ic_s_reload {
-  -webkit-filter: invert(70%);
-  filter: invert(70%)
-}
-
-.config-form .field-error {
-  border-color: #a11!important
-}
-
-.config-form input[type="text"], .config-form input[type="password"], .config-form input[type="number"], .config-form select, .config-form textarea {
-  border: 1px #a7a6aa solid;
-  height: auto
-}
-
-.config-form input[type="text"]:focus, .config-form input[type="password"]:focus, .config-form input[type="number"]:focus, .config-form select:focus, .config-form textarea:focus {
-  border: 1px #6676ff solid;
-  background: #f7fbff
-}
-
-.config-form .field-comment-mark {
-  font-family: serif;
-  color: #007;
-  cursor: help;
-  padding: 0 .2em;
-  font-weight: bold;
-  font-style: italic
-}
-
-.config-form .field-comment-warning {
-  color: #a00
-}
-
-.config-form dd {
-  margin-left: .5em
-}
-
-.config-form dd:before {
-  content: "\25B8"
-}
-
-/* Export &amp; Import */
-
-#export_templates .floatleft, .exportoptions li, .importoptions li, select#plugins, .exportoptions#databases_and_tables div {
-  margin-top: 20px
-}
-
-#export_templates .floatleft #templateName, #export_templates .floatleft label[for="template"], select#plugins, .exportoptions select#db_select {
-  margin-left: 0
-}
-
-/* Central Columns */
-
-table.navigation.nospacing.nopadding {
-  margin-top: 20px;
-  margin-left: 0!important;
-  padding: 10px 20px 10px 20px;
-  width: auto!important;
-  max-width: 100%!important
-}
-
-/* Table Search */
-
-fieldset#fieldset_table_qbe {
-  margin-bottom: 20px
-}
-
-fieldset#fieldset_table_search a.ajax {
-  margin-left: 20px
-}
-
-/* Others */
-
-h2 .nowrap {
-  display: none
-}
-
-div h2 {
-  margin-top: 0
-}
-
-.clearfloat.print_ignore {
-  padding-bottom: 4px
-}
-
-p.print_ignore {
-  padding-top: 11px
-}
-
-.prefsmanage_opts .localStorage-empty .notice {
-  margin-left: -18px
-}
diff --git a/#pma/themes/fallen/css/fallen/common/forms.css.php b/#pma/themes/fallen/css/fallen/common/forms.css.php
deleted file mode 100644
index 587e6ba8..00000000
--- a/#pma/themes/fallen/css/fallen/common/forms.css.php
+++ /dev/null
@@ -1,293 +0,0 @@
-form {
-  display: inline;
-  margin: 0;
-  padding: 0
-}
-
-input[type="checkbox" i] {
-  margin-top: .2px!important
-}
-
-input[type=text], input[type=password], input[type=number] {
-  background-color: <?php echo $GLOBALS['cfg']['MainBackground'] ?>;
-  border: 1px solid <?php echo $GLOBALS['cfg']['BrowseGrayColor'] ?>;
-  color: <?php echo $GLOBALS['cfg']['ThColor'] ?>;
-  font-family: <?php echo $GLOBALS['cfg']['FontFamily'] ?>;
-  margin: 6px;
-  padding: 5px
-}
-
-input[type=text]:focus, input[type=password]:focus, input[type=number]:focus {
-  border: 1px solid <?php echo $GLOBALS['cfg']['NaviHoverBackground'] ?>;
-  color: <?php echo $GLOBALS['cfg']['MainColor'] ?>
-}
-
-input[type=submit], input[type=reset], input[type=button] {
-  background-color: <?php echo $GLOBALS['cfg']['ButtonBackground'] ?>;
-  border: 1px solid <?php echo $GLOBALS['cfg']['ButtonBackground'] ?>;
-  border-radius: 2px;
-  box-shadow: 0 1px 1px <?php echo $GLOBALS['cfg']['BrowseGrayColor'] ?>;
-  color: <?php echo $GLOBALS['cfg']['ButtonColor'] ?>;
-  font-family: <?php echo $GLOBALS['cfg']['FontFamily'] ?>;
-  margin-left: 5px;
-  padding: 4px;
-  text-decoration: none
-}
-
-fieldset.confirmation input[type=submit], input[type=reset], input[type=button] {
-  box-shadow: 0 1px 1px <?php echo $GLOBALS['cfg']['ThColor'] ?>
-}
-
-input[type=submit]:hover, input[type=reset]:hover, input[type=button]:hover {
-  background-color: <?php echo $GLOBALS['cfg']['ButtonHover'] ?>;
-  border: 1px solid <?php echo $GLOBALS['cfg']['ButtonHover'] ?>;
-  cursor: pointer;
-  position: relative
-}
-
-input[type=submit]:active, input[type=reset]:active, input[type=button]:active {
-  background-color: #333;
-  border: 1px solid #333;
-  position: relative
-}
-
-textarea {
-  background-color: <?php echo $GLOBALS['cfg']['MainBackground'] ?>;
-  border: 1px solid <?php echo $GLOBALS['cfg']['BrowseGrayColor'] ?>;
-  color: <?php echo $GLOBALS['cfg']['ThColor'] ?>;
-  overflow: visible
-}
-
-fieldset {
-  background-color: <?php echo $GLOBALS['cfg']['ThBackground'] ?>;
-  border: 1px solid <?php echo $GLOBALS['cfg']['BorderColor'] ?>;
-  margin-top: 15px;
-  padding: 20px
-}
-
-#boxContainer fieldset {
-  margin: 5px
-}
-
-fieldset fieldset {
-  background-color: <?php echo $GLOBALS['cfg']['MainBackground'] ?>;
-  border: none;
-  margin: 20px;
-  margin-bottom: 0
-}
-
-tr.noclick td:first-child:before {
-  content: ""
-}
-
-fieldset.tblFooters {
-  border-top: 0;
-  clear: both;
-  float: none;
-  margin-top: -1px;
-  text-align: right
-}
-
-fieldset .formelement {
-  float: left;
-  margin-right: 0.5em
-}
-
-fieldset div[class=formelement] {
-  white-space: normal
-}
-
-.chrome input[type="checkbox"] {
-  left: -9999px;
-  position: relative
-}
-
-.chrome input[type="checkbox"]:before {
-  font-family: "<?php echo $font_family_icon ?>";
-  content: "";
-  color: <?php echo $GLOBALS['cfg']['ThColor'] ?>;
-  cursor: default;
-  position: absolute;
-  padding: 4px;
-  top: 0;
-  left: 9995px
-}
-
-.chrome input[type="checkbox"]:indeterminate:before {
-  content: ""
-}
-
-.chrome input[type="checkbox"]:checked:before {
-  content: ""
-}
-
-.chrome .navigation input[type="checkbox"]:before {
-  color: #fff
-}
-
-.chrome input[type="radio"] {
-  left: -9999px;
-  position: relative
-}
-
-.chrome input[type="radio"]:before {
-  font-family: "<?php echo $font_family_icon ?>";
-  content: "";
-  color: <?php echo $GLOBALS['cfg']['ThColor'] ?>;
-  cursor: default;
-  position: absolute;
-  padding: 4px;
-  top: 0;
-  left: 9995px
-}
-
-.chrome input[type="radio"]:checked:before {
-  content: ""
-}
-
-fieldset .group-header th {
-  background: <?php echo $GLOBALS['cfg']['BgTwo'] ?>;
-}
-
-fieldset .group-header+tr th {
-  padding-top: .6em
-}
-
-fieldset .group-field-1 th, fieldset .group-header-2 th {
-  padding-left: 1.5em
-}
-
-fieldset .group-field-2 th, fieldset .group-header-3 th {
-  padding-left: 3em
-}
-
-fieldset .group-field-3 th {
-  padding-left: 4.5em
-}
-
-fieldset .disabled-field th, fieldset .disabled-field th small, fieldset .disabled-field td {
-  color: #666;
-  background-color: #ddd
-}
-
-form.create_table_form fieldset.tblFooters, form#multi_edit_central_columns fieldset.tblFooters {
-  background: none;
-  border: none
-}
-
-form#tableOptionsForm input[name="comment"], form#tableOptionsForm select[name="tbl_collation"] {
-  width: 130px
-}
-
-form#formDatabaseComment .tblFooters, form#create_table_form_minimal .tblFooters, form#rename_db_form .tblFooters, form#copy_db_form .tblFooters, form#change_db_charset_form .tblFooters, form#alterTableOrderby .tblFooters, form#moveTableForm .tblFooters, form#copyTable .tblFooters, form#tableOptionsForm .tblFooters {
-  margin-top: -40px
-}
-
-fieldset#tableFilter {
-  margin-bottom: 1em
-}
-
-fieldset#tableFilter input[type=submit] {
-  margin-top: -1px
-}
-
-/* Table structure styles */
-
-#fieldsForm ul.table-structure-actions {
-  margin: 0;
-  padding: 0;
-  list-style: none
-}
-
-#fieldsForm ul.table-structure-actions li {
-  float: left;
-  margin-right: 0.3em
-  /* same as padding of "table td" */
-}
-
-#fieldsForm ul.table-structure-actions .submenu li {
-  padding: 0;
-  margin: 0
-}
-
-#fieldsForm ul.table-structure-actions .submenu li span {
-  padding: 0.3em;
-  margin: 0.1em
-}
-
-#fieldset_zoom_search table th, #fieldset_zoom_search table td {
-  line-height: 35px
-}
-
-#fieldset_table_qbe table th, #fieldset_table_qbe table td {
-  line-height: 35px
-}
-
-form.append_fields_form .tblFooters {
-  background: none;
-  border: none
-}
-
-#table_columns input[type="text"], #table_columns input[type="password"], #table_columns input[type="number"], #table_columns input[type="date"], #table_columns select {
-  width: 10em;
-  box-sizing: border-box;
-  -ms-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  -webkit-box-sizing: border-box
-}
-
-#table_columns select {
-  margin: 6px
-}
-
-#placeholder {
-  position: relative;
-  border: 1px solid #aaa;
-  float: right;
-  overflow: hidden
-}
-
-.placeholderDrag {
-  cursor: move
-}
-
-#placeholder .button {
-  position: absolute
-}
-
-.doubleFieldset fieldset {
-  width: 48%;
-  float: left;
-  padding: 0
-}
-
-.doubleFieldset fieldset.left {
-  margin-right: 1%
-}
-
-.doubleFieldset fieldset.right {
-  margin-left: 1%
-}
-
-.doubleFieldset legend {
-  margin-left: 1.5em
-}
-
-.doubleFieldset div.wrap {
-  padding: 1.5em
-}
-
-.modal-copy input {
-  display: block;
-  width: 100%;
-  margin-top: 1.5em;
-  padding: .3em 0
-}
-
-fieldset#fieldset_delete_user_footer {
-  margin-top: -30px
-}
-
-#parameterized {
-  margin: 20px 5px 20px 0!important
-}
diff --git a/#pma/themes/fallen/css/fallen/common/general.css.php b/#pma/themes/fallen/css/fallen/common/general.css.php
deleted file mode 100644
index 903b1e9d..00000000
--- a/#pma/themes/fallen/css/fallen/common/general.css.php
+++ /dev/null
@@ -1,45 +0,0 @@
-html {
-  font-size: 100%
-}
-
-input, select, textarea {
-  font-size: 1em
-}
-
-body {
-  background: <?php echo $GLOBALS['cfg']['MainBackground'] ?>;
-  color: <?php echo $GLOBALS['cfg']['MainColor'] ?>;
-<?php if ( !empty($GLOBALS['cfg']['FontFamily']) ) { ?>
-  font-family: <?php echo $GLOBALS['cfg']['FontFamily'] ?>;
-<?php } ?>
-  font-size: 11px;
-  line-height: 1;
-  margin-left: 250px;
-  padding: 0
-}
-
-a, a:link, a:visited, a:active, button.mult_submit, .checkall_box+label {
-  text-decoration: none;
-  color: <?php echo $GLOBALS['cfg']['ThColor'] ?>;
-  cursor: pointer;
-  outline: none
-}
-
-a:hover, button.mult_submit:hover, button.mult_submit:focus, .checkall_box+label:hover {
-  text-decoration: underline;
-  color: <?php echo $GLOBALS['cfg']['BrowsePointerColor'] ?>
-}
-
-font[color=red], span[style="color: #ff0000"] {
-  color: <?php echo $GLOBALS['cfg']['BrowseWarningColor'] ?>!important
-}
-
-strong {
-  font-weight: normal
-}
-
-<?php if ( !empty($GLOBALS['cfg']['FontFamilyFixed']) ) { ?>
-code, pre, textarea, tt {
-  font-family: <?php echo $GLOBALS['cfg']['FontFamilyFixed'] ?>!important
-}
-<?php } ?>
diff --git a/#pma/themes/fallen/css/fallen/common/globals.css.php b/#pma/themes/fallen/css/fallen/common/globals.css.php
deleted file mode 100644
index eed0c2e5..00000000
--- a/#pma/themes/fallen/css/fallen/common/globals.css.php
+++ /dev/null
@@ -1,1082 +0,0 @@
-a img {
-  border: 0
-}
-
-hr {
-  background-color: <?php echo $GLOBALS['cfg']['BorderColor'] ?>;
-  border: 0;
-  color: <?php echo $GLOBALS['cfg']['BorderColor'] ?>;
-  height: 1px
-}
-
-dfn:hover {
-  cursor: help
-}
-
-legend {
-  border-radius: 3px;
-  box-shadow: 0 0 2px rgba(0, 0, 0, .12), 0 2px 4px rgba(0, 0, 0, .24);
-  padding: 10px 12px 15px;
-}
-
-.some-margin {
-  margin: 20px
-}
-
-.clearfloat {
-  clear: both
-}
-
-.floatleft {
-  float: left;
-  margin-right: 1em
-}
-
-.floatright {
-  float: right
-}
-
-.center {
-  text-align: center
-}
-
-.displayblock {
-  display: block
-}
-
-.paddingtop {
-  padding-top: 1em
-}
-
-.separator {
-  color: #fff;
-}
-
-.result_query {
-  background: <?php echo $GLOBALS['cfg']['ThBackground'] ?>;
-  margin-bottom: 20px
-}
-
-div.tools {
-  padding: 10px;
-  text-align: right
-}
-
-div.tools span {
-  float: right;
-  margin: 6px 2px
-}
-
-div.tools a {
-  color: <?php echo $GLOBALS['cfg']['BlueHeader'] ?>!important
-}
-
-div.null_div {
-  height: 20px;
-  text-align: center;
-  font-style: normal;
-  min-width: 50px
-}
-
-.odd:not(.nopointer):hover, .even:not(.nopointer):hover, .hover:not(.nopointer), .structure_actions_dropdown {
-  background-color: <?php echo $GLOBALS['cfg']['BrowseMarkerBackground'] ?>;
-  color: <?php echo $GLOBALS['cfg']['MainColor'] ?>
-}
-
-.structure_actions_dropdown .icon {
-  vertical-align: middle!important
-}
-
-.condition {
-  border-color: <?php echo $GLOBALS['cfg']['BrowseWarningColor'] ?>!important
-}
-
-<?php if ( !empty($GLOBALS['cfg']['FontFamilyFixed']) ) { ?>
-.value {
-  font-family: <?php echo $GLOBALS['cfg']['FontFamilyFixed'] ?>
-}
-<?php } ?>
-
-/* Doc links in SQL */
-
-.cm-sql-doc {
-  border-bottom: 1px dotted #999;
-  color: inherit!important;
-  text-decoration: none
-}
-
-/* End Doc */
-
-div.tools, .tblFooters {
-  font-weight: normal;
-  color: <?php echo $GLOBALS['cfg']['ThColor'] ?>;
-  background: <?php echo $GLOBALS['cfg']['ThBackground'] ?>
-}
-
-/* Disabled text */
-
-.disabled, .disabled a:link, .disabled a:active, .disabled a:visited {
-  color: #666
-}
-
-.disabled a:hover {
-  color: #666;
-  text-decoration: none
-}
-
-tr.disabled td, td.disabled {
-  background-color: #f3f3f3;
-  color: #aaa
-}
-
-/* End Disabled */
-
-.nowrap {
-  white-space: nowrap
-}
-
-#page_settings_modal {
-  display: none
-}
-
-#pma_navigation_settings {
-  display: none
-}
-
-#span_table_comment {
-  font-weight: normal;
-  font-style: italic;
-  white-space: nowrap;
-  margin-left: 10px
-}
-
-#textSQLDUMP {
-  width: 95%;
-  height: 95%;
-  font-family: Consolas, "Courier New", Courier, mono;
-  font-size: 110%
-}
-
-#TooltipContainer {
-  position: absolute;
-  z-index: 99;
-  width: 20em;
-  height: auto;
-  overflow: visible;
-  visibility: hidden;
-  background-color: #ffffcc;
-  color: #006600;
-  border: .1em solid #000;
-  padding: .5em
-}
-
-caption a.top {
-  float: right
-}
-
-#edit_user_dialog, #add_user_dialog {
-  margin: 20px!important
-}
-
-.click-hide-message {
-  cursor: pointer
-}
-
-.prefsmanage_opts {
-  margin-left: 2em
-}
-
-#prefs_autoload {
-  margin-bottom: .5em;
-  margin-left: .5em
-}
-
-#placeholder .button {
-  position: absolute;
-  cursor: pointer
-}
-
-#placeholder div.button {
-  font-size: smaller;
-  color: #999;
-  background-color: #eee;
-  padding: 2px
-}
-
-.wrapper {
-  float: left;
-  margin-bottom: 1.5em
-}
-
-.toggleButton {
-  position: relative;
-  cursor: pointer;
-  font-size: .8em;
-  text-align: center;
-  line-height: 1.4em;
-  height: 1.55em;
-  overflow: hidden;
-  border-right: .1em solid #888;
-  border-left: .1em solid #888
-}
-
-.toggleButton table, .toggleButton td, .toggleButton img {
-  padding: 0;
-  position: relative
-}
-
-.toggleButton .container {
-  position: absolute
-}
-
-.toggleButton .container td {
-  background-image: none;
-  background: none
-}
-
-.toggleButton .toggleOn {
-  color: #fff;
-  padding: 0 1em
-}
-
-.toggleButton .toggleOff {
-  padding: 0 1em
-}
-
-#left_arrow {
-  left: 8px;
-  top: 26px
-}
-
-#right_arrow {
-  left: 26px;
-  top: 26px
-}
-
-#up_arrow {
-  left: 17px;
-  top: 8px
-}
-
-#down_arrow {
-  left: 17px;
-  top: 44px
-}
-
-#zoom_in {
-  left: 17px;
-  top: 67px
-}
-
-#zoom_world {
-  left: 17px;
-  top: 85px
-}
-
-#zoom_out {
-  left: 17px;
-  top: 103px
-}
-
-.colborder {
-  cursor: col-resize;
-  height: 100%;
-  margin-left: -6px;
-  position: absolute;
-  width: 5px
-}
-
-.colborder_active {
-  border-right: 2px solid #a44
-}
-
-.cRsz {
-  position: absolute
-}
-
-.cCpy {
-  background: #333;
-  color: #FFF;
-  font-weight: bold;
-  margin: .1em;
-  padding: .3em;
-  position: absolute
-}
-
-.cPointer {
-  background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('col_pointer.png');
-  ?>);
-  height: 20px;
-  margin-left: -5px;
-  /* must be minus half of its width */
-  margin-top: -10px;
-  position: absolute;
-  width: 10px
-}
-
-.tooltip {
-  background: #333!important;
-  opacity: .8!important;
-  border: 1px solid #000!important;
-  font-size: 10px!important;
-  font-weight: normal!important;
-  padding: 5px!important;
-  width: 260px;
-  line-height: 1.5
-}
-
-.tooltip * {
-  background: none!important;
-  color: #FFF!important
-}
-
-.cDrop {
-  left: 0;
-  position: absolute;
-  top: 0
-}
-
-.coldrop {
-  background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('col_drop.png');
-  ?>);
-  cursor: pointer;
-  height: 16px;
-  margin-left: .3em;
-  margin-top: .3em;
-  position: absolute;
-  width: 16px
-}
-
-.coldrop:hover, .coldrop-hover {
-  background-color: #999
-}
-
-.cList {
-  background: #fff;
-  border: solid 1px #ccc;
-  position: absolute
-}
-
-.cList .lDiv div {
-  padding: .2em .5em .2em;
-  padding-left: .2em
-}
-
-.cList .lDiv div:hover {
-  background: <?php echo $GLOBALS['cfg']['NaviBackground'] ?>;
-  cursor: pointer;
-  color: #fff
-}
-
-.cList .lDiv div input {
-  cursor: pointer
-}
-
-.showAllColBtn {
-  border-bottom: solid 1px #ccc;
-  border-top: solid 1px #ccc;
-  cursor: pointer;
-  font-size: .9em;
-  padding: .35em 1em;
-  text-align: center;
-  font-weight: normal
-}
-
-.showAllColBtn:hover {
-  background: <?php echo $GLOBALS['cfg']['NaviBackground'] ?>;
-  cursor: pointer;
-  color: #fff
-}
-
-#page_content {
-  line-height: 1.5
-}
-
-.cEdit {
-  margin: 0;
-  padding: 0;
-  position: absolute
-}
-
-.cEdit input[type=text], .cEdit input[type=password], .cEdit input[type=number] {
-  background: #FFF;
-  height: 100%;
-  margin: 0;
-  padding: 0
-}
-
-.cEdit .edit_area {
-  background: #FFF;
-  border: 1px solid #999;
-  min-width: 10em;
-  padding: .3em .5em
-}
-
-.cEdit .edit_area select, .cEdit .edit_area textarea {
-  width: 97%
-}
-
-.cEdit .cell_edit_hint {
-  color: #555;
-  font-size: .8em;
-  margin: .3em .2em
-}
-
-.cEdit .edit_box {
-  overflow: hidden;
-  padding: 0;
-  margin-top: 10px
-}
-
-.cEdit .edit_box_posting {
-  background: #FFF url("<?php echo $_SESSION['PMA_Theme']->getImgPath('loader-blue.svg') ?>") no-repeat right center;
-  padding-right: 1.5em
-}
-
-.cEdit .edit_area_loading {
-  background: #FFF url("<?php echo $_SESSION['PMA_Theme']->getImgPath('loader-blue.svg') ?>") no-repeat center;
-  height: 10em
-}
-
-.cEdit .goto_link {
-  background: #EEE;
-  color: #555;
-  padding: .2em .3em
-}
-
-.saving_edited_data {
-  background: url("<?php echo $_SESSION['PMA_Theme']->getImgPath('loader-blue.svg') ?>") no-repeat left;
-  padding-left: 20px
-}
-
-.relationalTable select {
-  width: 125px;
-  margin-right: 5px
-}
-
-/* css for timepicker */
-.ui-timepicker-div .ui-widget-header {
-  margin-bottom: 8px
-}
-
-.ui-timepicker-div dl {
-  text-align: left
-}
-
-.ui-timepicker-div dl dt {
-  height: 25px;
-  margin-bottom: -25px
-}
-
-.ui-timepicker-div dl dd {
-  margin: 0 10px 10px 85px
-}
-
-.ui-timepicker-div td {
-  font-size: 90%
-}
-
-.ui-tpicker-grid-label {
-  background: none;
-  border: none;
-  margin: 0;
-  padding: 0
-}
-
-.ui-timepicker-rtl {
-  direction: rtl
-}
-
-.ui-timepicker-rtl dl {
-  text-align: right
-}
-
-.ui-timepicker-rtl dl dd {
-  margin: 0 65px 10px 10px
-}
-
-input.btn {
-  color: #333;
-  background-color: #d0dce0
-}
-
-body .ui-widget {
-  font-size: 1em
-}
-
-.ui-dialog fieldset legend a {
-  color: #235a81
-}
-
-.report-data {
-  height: 13em;
-  overflow: scroll;
-  width: 570px;
-  border: solid 1px;
-  background: white;
-  padding: 2px
-}
-
-.report-description {
-  height: 10em;
-  width: 570px
-}
-
-div#page_content div#tableslistcontainer table.data {
-  border-top: 0.1px solid #eee
-}
-
-div#page_content form#db_search_form.ajax fieldset {
-  margin-top: -0.3em
-}
-
-.small_font {
-  font-size: smaller
-}
-
-/* Console styles */
-#pma_console_container {
-  width: 100%;
-  position: fixed;
-  bottom: 0;
-  left: 0;
-  z-index: 100
-}
-
-#pma_console {
-  position: relative;
-  margin-left: 250px
-}
-
-#pma_console .templates {
-  display: none
-}
-
-#pma_console .mid_text, #pma_console .toolbar span {
-  vertical-align: middle
-}
-
-#pma_console .toolbar {
-  position: relative;
-  background: <?php echo $GLOBALS['cfg']['ThBackground'] ?>;
-  border-top: solid 1px #ccc;
-  cursor: n-resize
-}
-
-#pma_console .toolbar.collapsed:not(:hover) {
-  display: inline-block;
-  border-right: solid 1px #ccc
-}
-
-#pma_console .toolbar.collapsed {
-  cursor: default
-}
-
-#pma_console .toolbar.collapsed>.button {
-  display: none
-}
-
-#pma_console .message span.text, #pma_console .message span.action, #pma_console .toolbar .button, #pma_console .toolbar .text, #pma_console .switch_button {
-  padding: 0 3px;
-  display: inline-block
-}
-
-#pma_console .message span.action, #pma_console .toolbar .button, #pma_console .switch_button {
-  cursor: pointer
-}
-
-#pma_console .toolbar .text {
-  font-weight: bold
-}
-
-#pma_console .toolbar .button, #pma_console .toolbar .text {
-  margin-right: .4em
-}
-
-#pma_console .toolbar .button, #pma_console .toolbar .text {
-  float: right
-}
-
-#pma_console .content {
-  overflow-x: hidden;
-  overflow-y: auto;
-  margin-bottom: -65px;
-  border-top: solid 1px #ccc;
-  background: #fff;
-  padding-top: .4em
-}
-
-#pma_console .content.console_dark_theme {
-  background: #000;
-  color: #fff
-}
-
-#pma_console .content.console_dark_theme .CodeMirror-wrap {
-  background: #000;
-  color: #fff
-}
-
-#pma_console .content.console_dark_theme .action_content {
-  color: #000
-}
-
-#pma_console .content.console_dark_theme .message {
-  border-color: #373b41
-}
-
-#pma_console .content.console_dark_theme .CodeMirror-cursor {
-  border-color: #fff
-}
-
-#pma_console .content.console_dark_theme .cm-keyword {
-  color: #de935f
-}
-
-#pma_console .message, #pma_console .query_input {
-  position: relative;
-  font-family: "Monaco", "Consolas", monospace;
-  cursor: text;
-  margin: 0 10px .2em 1.4em
-}
-
-#pma_console .message {
-  border-bottom: solid 1px #ccc;
-  padding-bottom: .2em
-}
-
-#pma_console .message.expanded>.action_content {
-  position: relative
-}
-
-#pma_console .message:before, #pma_console .query_input:before {
-  left: -0.7em;
-  position: absolute;
-  content: ">"
-}
-
-#pma_console .query_input:before {
-  top: -2px
-}
-
-#pma_console .query_input textarea {
-  width: 100%;
-  height: 4em;
-  resize: vertical
-}
-
-#pma_console .message:hover:before {
-  color: #7cf;
-  font-weight: bold
-}
-
-#pma_console .message.expanded:before {
-  content: "]"
-}
-
-#pma_console .message.welcome:before {
-  display: none
-}
-
-#pma_console .message.failed:before, #pma_console .message.failed.expanded:before, #pma_console .message.failed:hover:before {
-  content: "=";
-  color: #944
-}
-
-#pma_console .message.pending:before {
-  opacity: .3
-}
-
-#pma_console .message.collapsed>.query {
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  overflow: hidden
-}
-
-#pma_console .message.expanded>.query {
-  display: block;
-  white-space: pre;
-  word-wrap: break-word
-}
-
-#pma_console .message .text.targetdb, #pma_console .message.collapsed .action.collapse, #pma_console .message.expanded .action.expand, #pma_console .message .action.requery, #pma_console .message .action.profiling, #pma_console .message .action.explain, #pma_console .message .action.bookmark {
-  display: none
-}
-
-#pma_console .message.select .action.profiling, #pma_console .message.select .action.explain, #pma_console .message.history .text.targetdb, #pma_console .message.successed .text.targetdb, #pma_console .message.history .action.requery, #pma_console .message.history .action.bookmark, #pma_console .message.bookmark .action.requery, #pma_console .message.bookmark .action.bookmark, #pma_console .message.successed .action.requery, #pma_console .message.successed .action.bookmark {
-  display: inline-block
-}
-
-#pma_console .message .action_content {
-  position: absolute;
-  bottom: 100%;
-  background: #ccc;
-  border: solid 1px #aaa
-}
-
-html.ie8 #pma_console .message .action_content {
-  position: relative!important
-}
-
-#pma_console .message.bookmark .text.targetdb, #pma_console .message .text.query_time {
-  margin: 0;
-  display: inline-block
-}
-
-#pma_console .message.failed .text.query_time, #pma_console .message .text.failed {
-  display: none
-}
-
-#pma_console .message.failed .text.failed {
-  display: inline-block
-}
-
-#pma_console .message .text {
-  background: #fff
-}
-
-#pma_console .message.collapsed>.action_content {
-  display: none
-}
-
-#pma_console .message.collapsed:hover>.action_content {
-  display: block
-}
-
-#pma_console .message .bookmark_label {
-  padding: 0 4px;
-  top: 0;
-  background: #369;
-  color: #fff
-}
-
-#pma_console .message .bookmark_label.shared {
-  background: #396
-}
-
-#pma_console .query_input {
-  position: relative
-}
-
-#pma_console .mid_layer {
-  height: 100%;
-  width: 100%;
-  position: absolute;
-  top: 0;
-  /* For support IE8, this layer doesn't use filter:opacity or opacity,
-    js code will fade this layer opacity to 0.18(using animation) */
-  background: #ccc;
-  display: none;
-  cursor: pointer;
-  z-index: 200
-}
-
-#pma_console .card {
-  position: absolute;
-  width: 94%;
-  height: 100%;
-  min-height: 48px;
-  left: 100%;
-  top: 0;
-  border-left: solid 1px #999;
-  z-index: 300;
-  transition: left 0.2s;
-  -ms-transition: left 0.2s;
-  -webkit-transition: left 0.2s;
-  -moz-transition: left 0.2s;
-}
-
-#pma_console .card.show {
-  left: 6%
-}
-
-html.ie7 #pma_console .query_input {
-  display: none
-}
-
-#pma_bookmarks .content.add_bookmark, #pma_console_options .content {
-  padding: 4px 6px
-}
-
-#pma_bookmarks .content.add_bookmark .options {
-  margin-left: 1.4em;
-  padding-bottom: .4em;
-  margin-bottom: .4em;
-  border-bottom: solid 1px #ccc
-}
-
-#pma_bookmarks .content.add_bookmark .options button {
-  margin: 0 7px;
-  vertical-align: bottom
-}
-
-#pma_bookmarks .content.add_bookmark input[type=text] {
-  margin: 0;
-  padding: 2px 4px
-}
-
-#pma_console .button.hide, #pma_console .message span.text.hide {
-  display: none
-}
-
-#debug_console.grouped .ungroup_queries, #debug_console.ungrouped .group_queries {
-  display: inline-block
-}
-
-#debug_console.ungrouped .ungroup_queries, #debug_console.ungrouped .sort_count, #debug_console.grouped .group_queries {
-  display: none
-}
-
-#debug_console .count {
-  margin-right: 8px
-}
-
-#debug_console .show_trace .trace, #debug_console .show_args .args {
-  display: block
-}
-
-#debug_console .hide_trace .trace, #debug_console .hide_args .args, #debug_console .show_trace .action.dbg_show_trace, #debug_console .hide_trace .action.dbg_hide_trace, #debug_console .traceStep.hide_args .action.dbg_hide_args, #debug_console .traceStep.show_args .action.dbg_show_args {
-  display: none
-}
-
-#debug_console .traceStep:after, #debug_console .trace.welcome:after, #debug_console .debug>.welcome:after {
-  content: "";
-  display: table;
-  clear: both
-}
-
-#debug_console .debug_summary {
-  float: left
-}
-
-#debug_console .trace.welcome .time {
-  float: right
-}
-
-#debug_console .traceStep .file, #debug_console .script_name {
-  float: right
-}
-
-#debug_console .traceStep .args pre {
-  margin: 0
-}
-
-/* Code mirror console style*/
-.cm-s-pma .CodeMirror-code pre, .cm-s-pma .CodeMirror-code {
-  font-family: "Monaco", "Consolas", monospace;
-}
-
-.cm-s-pma .CodeMirror-measure>pre, .cm-s-pma .CodeMirror-code>pre, .cm-s-pma .CodeMirror-lines {
-  padding: 0
-}
-
-.cm-s-pma.CodeMirror {
-  resize: none;
-  height: auto;
-  width: 100%;
-  min-height: initial;
-  max-height: initial
-}
-
-.firefox .cm-s-pma.CodeMirror {
-  font-size: 120%
-}
-
-.cm-s-pma .CodeMirror-scroll {
-  cursor: text
-}
-
-/* PMA drop-improt style */
-.pma_drop_handler {
-  display: none;
-  position: fixed;
-  top: 0;
-  left: 0;
-  width: 100%;
-  background: rgba(0, 0, 0, 0.6);
-  height: 100%;
-  z-index: 999;
-  color: white;
-  font-size: 30pt;
-  text-align: center;
-  padding-top: 20%
-}
-
-.pma_sql_import_status {
-  display: none;
-  position: fixed;
-  bottom: 0;
-  right: 25px;
-  width: 400px;
-  border: 1px solid #999;
-  background: #f3f3f3
-}
-
-.pma_sql_import_status h2, .pma_drop_result h2 {
-  background-color: #bbb;
-  padding: .1em .3em;
-  margin-top: 0;
-  margin-bottom: 0;
-  color: #fff;
-  font-size: 1.6em;
-  font-weight: normal
-}
-
-.pma_sql_import_status div {
-  height: 270px;
-  overflow-y: auto;
-  overflow-x: hidden;
-  list-style-type: none
-}
-
-.pma_sql_import_status div li {
-  padding: 8px 10px;
-  border-bottom: 1px solid #bbb;
-  color: rgb(148, 14, 14);
-  background: white
-}
-
-.pma_sql_import_status div li .filesize {
-  float: right
-}
-
-.pma_sql_import_status h2 .minimize {
-  float: right;
-  margin-right: 5px;
-  padding: 0 10px
-}
-
-.pma_sql_import_status h2 .close {
-  float: right;
-  margin-right: 5px;
-  padding: 0 10px;
-  display: none
-}
-
-.pma_sql_import_status h2 .minimize:hover, .pma_sql_import_status h2 .close:hover, .pma_drop_result h2 .close:hover {
-  background: rgba(155, 149, 149, 0.78);
-  cursor: pointer
-}
-
-.pma_drop_file_status {
-  color: #235a81
-}
-
-.pma_drop_file_status span.underline:hover {
-  cursor: pointer;
-  text-decoration: underline
-}
-
-.pma_drop_result {
-  position: fixed;
-  top: 10%;
-  left: 20%;
-  width: 60%;
-  background: white;
-  min-height: 300px;
-  z-index: 800;
-  cursor: move
-}
-
-.pma_drop_result h2 .close {
-  float: right;
-  margin-right: 5px;
-  padding: 0 10px
-}
-
-.dependencies_box {
-  background-color: white;
-  border: 3px ridge black
-}
-
-#composite_index_list {
-  list-style-type: none;
-  list-style-position: inside
-}
-
-span.drag_icon {
-  display: inline-block;
-  background-image: url('<?php echo $_SESSION['PMA_Theme']->getImgPath('s_sortable.png');?>');
-  background-position: center center;
-  background-repeat: no-repeat;
-  width: 1em;
-  height: 3em;
-  cursor: move
-}
-
-.topmargin {
-  margin-top: 1em
-}
-
-/* styles for jQuery-ui to support rtl languages */
-body .ui-dialog .ui-dialog-titlebar-close {
-  right: .3em;
-  left: initial
-}
-
-body .ui-dialog .ui-dialog-title {
-  float: left
-}
-
-body .ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset {
-  float: right
-}
-/* end of styles for jQuery-ui to support rtl languages */
-
-/* Override some jQuery-ui styling to have square corners */
-body .ui-corner-all, body .ui-corner-top, body .ui-corner-left, body .ui-corner-tl {
-  border-top-left-radius: 0
-}
-
-body .ui-corner-all, body .ui-corner-top, body .ui-corner-right, body .ui-corner-tr {
-  border-top-right-radius: 0
-}
-
-body .ui-corner-all, body .ui-corner-bottom, body .ui-corner-left, body .ui-corner-bl {
-  border-bottom-left-radius: 0
-}
-
-body .ui-corner-all, body .ui-corner-bottom, body .ui-corner-right, body .ui-corner-br {
-  border-bottom-right-radius: 0
-}
-
-/* Override jQuery-ui styling for ui-dialog */
-body .ui-dialog {
-  padding: 0
-}
-
-body .ui-dialog .ui-widget-header {
-  color: <?php echo $GLOBALS['cfg']['ButtonColor'] ?>;
-  border: none;
-  background-color: <?php echo $GLOBALS['cfg']['NaviBackground'] ?>;
-  background-image: none
-}
-
-body .ui-dialog .ui-dialog-title {
-  padding: 5px;
-  font-weight: normal
-}
-
-body .ui-dialog .ui-dialog-buttonpane button {
-  font-family: <?php echo $GLOBALS['cfg']['FontFamily'] ?>;
-  color: <?php echo $GLOBALS['cfg']['ButtonColor'] ?>;
-  background-color: <?php echo $GLOBALS['cfg']['NaviBackground'] ?>;
-  background-image: none;
-  border: 1px solid <?php echo $GLOBALS['cfg']['ButtonBackground'] ?>
-}
-
-body .ui-dialog .ui-dialog-buttonpane button.ui-state-hover {
-  background-color: <?php echo $GLOBALS['cfg']['ButtonHover'] ?>;
-  border: 1px solid <?php echo $GLOBALS['cfg']['ButtonHover'] ?>
-}
-
-body .ui-dialog .ui-dialog-buttonpane button.ui-state-active {
-  background-color: #333;
-  border: 1px solid #333
-}
-
-/* Selection */
-
-::selection {
-  background: #b3d4fc;
-  text-shadow: none
-}
diff --git a/#pma/themes/fallen/css/fallen/common/heading.css.php b/#pma/themes/fallen/css/fallen/common/heading.css.php
deleted file mode 100644
index 51648be4..00000000
--- a/#pma/themes/fallen/css/fallen/common/heading.css.php
+++ /dev/null
@@ -1,7 +0,0 @@
-h2 img {
-  display: none
-}
-
-h2 a img {
-  display: inline
-}
diff --git a/#pma/themes/fallen/css/fallen/common/icons.css.php b/#pma/themes/fallen/css/fallen/common/icons.css.php
deleted file mode 100644
index 84bba6fd..00000000
--- a/#pma/themes/fallen/css/fallen/common/icons.css.php
+++ /dev/null
@@ -1,17 +0,0 @@
-#page_nav_icons {
-  position: fixed;
-  top: 8px;
-  right: 0;
-  z-index: 99;
-  padding: .25em 10px 0 0
-}
-
-#goto_pagetop, #lock_page_icon, #page_settings_icon {
-  padding: .25em
-}
-
-#page_settings_icon {
-  cursor: pointer;
-  display: none;
-  margin-right: 6px!important
-}
diff --git a/#pma/themes/fallen/css/fallen/common/images.css.php b/#pma/themes/fallen/css/fallen/common/images.css.php
deleted file mode 100644
index 8814c6c8..00000000
--- a/#pma/themes/fallen/css/fallen/common/images.css.php
+++ /dev/null
@@ -1,3 +0,0 @@
-img.lightbulb {
-  cursor: pointer
-}
diff --git a/#pma/themes/fallen/css/fallen/common/layouts.css.php b/#pma/themes/fallen/css/fallen/common/layouts.css.php
deleted file mode 100644
index 6a591633..00000000
--- a/#pma/themes/fallen/css/fallen/common/layouts.css.php
+++ /dev/null
@@ -1,22 +0,0 @@
-.pdflayout {
-  overflow: hidden;
-  clip: inherit;
-  background-color: #fff;
-  display: none;
-  border: 1px solid #000;
-  position: relative
-}
-
-.pdflayout_table {
-  background: #d3dce3;
-  color: #000;
-  overflow: hidden;
-  clip: inherit;
-  z-index: 2;
-  display: inline;
-  visibility: inherit;
-  cursor: move;
-  position: absolute;
-  font-size: 80%;
-  border: 1px dashed #000
-}
diff --git a/#pma/themes/fallen/css/fallen/common/login.css.php b/#pma/themes/fallen/css/fallen/common/login.css.php
deleted file mode 100644
index 963cc336..00000000
--- a/#pma/themes/fallen/css/fallen/common/login.css.php
+++ /dev/null
@@ -1,151 +0,0 @@
-body#loginform {
-  background-color: <?php echo $GLOBALS['cfg']['MainBackground'] ?>;
-  margin: 0
-}
-
-body#loginform #page_content {
-  background-color: <?php echo $GLOBALS['cfg']['NaviBackground'] ?>;
-  height: 220px;
-  margin: 0!important;
-  margin-top: 10%!important;
-  padding: 35px 20px 20px
-}
-
-body#loginform div.container {
-  margin-left: auto;
-  margin-right: auto;
-  text-align: left;
-  width: 48em
-}
-
-body#loginform div.container:before {
-  background-color: <?php echo $GLOBALS['cfg']['ThColor'] ?>;
-  border-radius: 50%;
-  box-shadow: 0 4px 2px rgba(14, 14, 14, 0.29);
-  color: <?php echo $GLOBALS['cfg']['MainBackground'] ?>;
-  content: "a";
-  float: left;
-  font-family: "<?php echo $font_family_icon ?>";
-  font-size: 235px;
-  height: 220px;
-  line-height: 1;
-  margin-right: 20px;
-  margin-top: -10px;
-  overflow: hidden;
-  width: 230px
-}
-
-/* IE Setting for 'body#loginform div.container:before' */
-
-.ie body#loginform div.container:before {
-  border-radius: 0;
-  box-shadow: 0 1px 1px rgba(14, 14, 14, 0.29);
-}
-
-body#loginform h1 {
-  color: <?php echo $GLOBALS['cfg']['MainBackground'] ?>;
-  display: inline-block;
-  font-size: 2.5em;
-  line-height: 2;
-  margin-right: -50%;
-  padding-top: 0;
-  text-align: left
-}
-
-body#loginform a.logo {
-  display: none
-}
-
-body#loginform fieldset legend {
-  display: none
-}
-
-body#loginform .item {
-  margin-bottom: 10px
-}
-
-body#loginform input.textfield {
-  background: <?php echo $GLOBALS['cfg']['NaviColor'] ?>;
-  border: 1px solid #fff;
-  box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  -webkit-box-sizing: border-box;
-  color: <?php echo $GLOBALS['cfg']['ThColor'] ?>;
-  margin: 0;
-  width: 100%
-}
-
-body#loginform input.textfield:hover, body#loginform input.textfield:focus {
-  background-color: #fff;
-  box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  -webkit-box-sizing: border-box;
-  color: #333;
-  margin: 0
-}
-
-body#loginform input[type=submit] {
-  background-color: #fff;
-  border: none;
-  box-shadow: 0 1px 1px <?php echo $GLOBALS['cfg']['MainColor'] ?>;
-  color: #444;
-  margin: 0;
-  padding: 7px
-}
-
-body#loginform input[type=submit]:hover {
-  background-color: #eee
-}
-
-body#loginform input[type=submit]:focus {
-  background-color: #ddd;
-  box-shadow: none
-}
-
-body#loginform select {
-  background: <?php echo $GLOBALS['cfg']['NaviBackground'] ?>;
-  border: 1px solid #fff;
-  color: <?php echo $GLOBALS['cfg']['NaviColor'] ?>;
-  margin: 0!important;
-  min-width: 100%;
-  padding-left: 0!important
-}
-
-body#loginform select:hover {
-  border: 1px solid <?php echo $GLOBALS['cfg']['NaviColor'] ?>;
-}
-
-body#loginform br {
-  display: none
-}
-
-body#loginform fieldset {
-  background: none;
-  border: none;
-  margin-top: 0;
-  margin-bottom: 10px;
-  padding: 0
-}
-
-body#loginform fieldset:first-child {
-  border-bottom: none;
-  margin: 0;
-  margin-bottom: 0
-}
-
-body#loginform fieldset.tblFooters {
-  border: none;
-  clear: none;
-  margin: 0
-}
-
-body#loginform .error {
-  box-shadow: 0 1px 1px #666;
-  float: left;
-  margin-top: -280px;
-  width: 48em
-}
-
-body#loginform form.login label {
-  display: none
-}
diff --git a/#pma/themes/fallen/css/fallen/common/ltr.css.php b/#pma/themes/fallen/css/fallen/common/ltr.css.php
deleted file mode 100644
index 3a721eb5..00000000
--- a/#pma/themes/fallen/css/fallen/common/ltr.css.php
+++ /dev/null
@@ -1 +0,0 @@
-/* LTR Mode */
diff --git a/#pma/themes/fallen/css/fallen/common/nav.css.php b/#pma/themes/fallen/css/fallen/common/nav.css.php
deleted file mode 100644
index 5a6bb9cb..00000000
--- a/#pma/themes/fallen/css/fallen/common/nav.css.php
+++ /dev/null
@@ -1,54 +0,0 @@
-.navigation {
-  width: 100%;
-  background-color: <?php echo $GLOBALS['cfg']['NaviBackground'] ?>;
-  color: <?php echo $GLOBALS['cfg']['NaviColor'] ?>
-}
-
-.navigation td {
-  margin: 0;
-  padding: 0;
-  padding-left: 2px!important;
-  vertical-align: middle;
-  white-space: nowrap
-}
-
-.navigation_separator {
-  color: #eee;
-  display: inline-block;
-  font-size: 1.5em;
-  text-align: center;
-  height: 1.4em
-}
-
-.navigation input[type=submit] {
-  background: #fff;
-  border: none;
-  box-shadow: 0 1px 1px <?php echo $GLOBALS['cfg']['ThColor'] ?>;
-  color: <?php echo $GLOBALS['cfg']['ThColor'] ?>;
-  filter: none;
-  margin: 5px;
-  padding: 0.4em
-}
-
-.navigation input[type=submit]:hover, .navigation input.edit_mode_active {
-  color: <?php echo $GLOBALS['cfg']['ThColor'] ?>;
-  cursor: pointer;
-  background-color: <?php echo $GLOBALS['cfg']['NaviColor'] ?>
-}
-
-.navigation input[type=submit]:focus {
-  box-shadow: none
-}
-
-.navigation select {
-  margin: 0 0.8em;
-  border: none
-}
-
-.navigation input[type=text] {
-  border: none
-}
-
-.navigation_goto {
-  width: 100%
-}
diff --git a/#pma/themes/fallen/css/fallen/common/reset.css.php b/#pma/themes/fallen/css/fallen/common/reset.css.php
deleted file mode 100644
index 73c47d1c..00000000
--- a/#pma/themes/fallen/css/fallen/common/reset.css.php
+++ /dev/null
@@ -1,35 +0,0 @@
-html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, canvas, details, embed, figure, figcaption, footer, header, hgroup, menu, nav, output, ruby, section, summary, time, mark, audio, video {
-  border: 0;
-  margin: 0;
-  padding: 0
-}
-
-article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section {
-  display: block
-}
-
-ol, ul {
-  list-style: none
-}
-
-blockquote, q {
-  quotes: none
-}
-
-blockquote:before, blockquote:after, q:before, q:after {
-  content: '';
-  content: none
-}
-
-table {
-  border-collapse: collapse;
-  border-spacing: 0
-}
-
-*:focus {
-  outline: none
-}
-
-#li_select_fontsize {
-  display: none
-}
diff --git a/#pma/themes/fallen/css/fallen/common/responsive.css.php b/#pma/themes/fallen/css/fallen/common/responsive.css.php
deleted file mode 100644
index d0207c95..00000000
--- a/#pma/themes/fallen/css/fallen/common/responsive.css.php
+++ /dev/null
@@ -1,14 +0,0 @@
-@media (min-width: 768px) {
-  #tbl_search_form fieldset, #zoom_search_form fieldset, #find_replace_form fieldset {
-    margin-top: 5px
-  }
-
-  fieldset#tableFilter {
-    margin-top: 0
-  }
-
-  .tabLinks {
-    margin-top: -5px;
-    margin-bottom: 5px
-  }
-}
diff --git a/#pma/themes/fallen/css/fallen/common/select.css.php b/#pma/themes/fallen/css/fallen/common/select.css.php
deleted file mode 100644
index ca901c27..00000000
--- a/#pma/themes/fallen/css/fallen/common/select.css.php
+++ /dev/null
@@ -1,19 +0,0 @@
-select {
-  background-color: <?php echo $GLOBALS['cfg']['MainBackground'] ?>;
-  border: 1px solid <?php echo $GLOBALS['cfg']['BrowseGrayColor'] ?>;
-  color: <?php echo $GLOBALS['cfg']['ThColor'] ?>;
-  font-family: <?php echo $GLOBALS['cfg']['FontFamily'] ?>;
-  margin: 5px;
-  max-width: 17em;
-  padding: 5px;
-}
-
-select:focus {
-  border: 1px solid <?php echo $GLOBALS['cfg']['NaviHoverBackground'] ?>;
-  color: <?php echo $GLOBALS['cfg']['MainColor'] ?>
-}
-
-.selectallarrow {
-  margin-left: .6em;
-  margin-right: .3em
-}
diff --git a/#pma/themes/fallen/css/fallen/common/tables.css.php b/#pma/themes/fallen/css/fallen/common/tables.css.php
deleted file mode 100644
index 0b8f043c..00000000
--- a/#pma/themes/fallen/css/fallen/common/tables.css.php
+++ /dev/null
@@ -1,288 +0,0 @@
-table {
-  border-collapse: collapse
-}
-
-table caption, table th, table td {
-  padding: 0.6em
-}
-
-th {
-  text-align: left
-}
-
-th, th a {
-  color: <?php echo $GLOBALS['cfg']['ThColor'] ?>!important;
-  font-weight: 500;
-  padding-top: 10px!important;
-  padding-bottom: 10px!important
-}
-
-table.nospacing {
-  border-spacing: 0
-}
-
-table.nopadding tr th, table.nopadding tr td {
-  padding: 0
-}
-
-th.left, td.left {
-  text-align: left
-}
-
-th.center, td.center {
-  text-align: center
-}
-
-th.right, td.right {
-  text-align: right;
-  padding-right: 1em
-}
-
-tr.vtop th, tr.vtop td, th.vtop, td.vtop {
-  vertical-align: top
-}
-
-tr.vmiddle th, tr.vmiddle td, th.vmiddle, td.vmiddle {
-  vertical-align: middle
-}
-
-tr.vbottom th, tr.vbottom td, th.vbottom, td.vbottom {
-  vertical-align: bottom
-}
-
-#initials_table {
-  background: <?php echo $GLOBALS['cfg']['ThBackground'] ?>;
-  border: 1px solid <?php echo $GLOBALS['cfg']['BorderColor'] ?>;
-  margin-bottom: 10px
-}
-
-#initials_table a {
-  background: <?php echo $GLOBALS['cfg']['MainBackground'] ?>;
-  border: 1px solid <?php echo $GLOBALS['cfg']['BorderColor'] ?>;
-  padding: 4px 8px
-}
-
-#initials_table td {
-  padding: 8px!important
-}
-
-.column_heading, .column_action {
-  background-color: #f6f6f6;
-  border: 1px solid <?php echo $GLOBALS['cfg']['BorderColor'] ?>
-}
-
-table tr.odd th, .odd {
-  background: <?php echo $GLOBALS['cfg']['BgTwo'] ?>;
-  border-bottom: none
-}
-
-table tr.even th, .even {
-  background: <?php echo $GLOBALS['cfg']['BgOne'] ?>;
-  border-bottom: none
-}
-
-table tr.odd th, table tr.odd, table tr.even th, table tr.even {
-  text-align: left;
-  border-bottom: 1px solid #eee
-}
-
-table tr.odd, table tr.even {
-  border-left: 3px solid transparent;
-  line-height: 1em
-}
-
-td.marked:not(.nomarker), table tr.marked:not(.nomarker) td, table tr.marked:not(.nomarker) th, table tr.marked:not(.nomarker) {
-  color: <?php echo $GLOBALS['cfg']['MainColor'] ?>
-}
-
-td.marked:not(.nomarker) {
-  background-color: <?php echo $GLOBALS['cfg']['BrowseMarkerBackground'] ?>
-}
-
-table tr.marked:not(.nomarker) {
-  border-left: 3px solid #4285f4
-}
-
-table tr.odd:not(.nopointer):hover th, table tr.even:not(.nopointer):hover th, table tr.hover:not(.nopointer) th {
-  background-color: <?php echo $GLOBALS['cfg']['BrowseMarkerBackground'] ?>;
-  color: <?php echo $GLOBALS['cfg']['ThPointerColor'] ?>
-}
-
-th.condition, th.condition a {
-  border: 1px solid <?php echo $GLOBALS['cfg']['BrowseWarningColor'] ?>;
-  background: <?php echo $GLOBALS['cfg']['BrowseWarningColor'] ?>;
-  color: <?php echo $GLOBALS['cfg']['MainBackground'] ?>!important
-}
-
-td.condition {
-  border: 1px solid
-}
-
-td.null {
-  font-style: italic;
-  text-align: right
-}
-
-table .valueHeader {
-  text-align: right;
-  white-space: normal
-}
-
-table .value {
-  text-align: left;
-  white-space: normal
-}
-
-/* IE doesnt handles 'pre' right */
-
-table [class=value] {
-  white-space: normal
-}
-
-/* End IE */
-
-td .icon {
-  margin: 0
-}
-
-.tblcomment {
-  font-size: 70%;
-  font-weight: normal;
-  color: #000099
-}
-
-.tblHeaders {
-  color: <?php echo $GLOBALS['cfg']['ThColor'] ?>;
-  background: <?php echo $GLOBALS['cfg']['ThBackground'] ?>;
-  font-weight: normal
-}
-
-.tblHeaders a:link, .tblHeaders a:active, .tblHeaders a:visited, div.tools a:link, div.tools a:visited, div.tools a:active, .tblFooters a:link, .tblFooters a:active, .tblFooters a:visited {
-  color: #0000ff
-}
-
-.tblHeaders a:hover, div.tools a:hover, .tblFooters a:hover {
-  color: #ff0000
-}
-
-#tbl_maintenance li a {
-  text-transform: uppercase;
-  font-weight: normal
-}
-
-#tbl_maintenance li:before {
-  font-family: "<?php echo $font_family_icon ?>";
-  content: "%";
-  margin-right: 10px
-}
-
-table#tableFieldsId {
-  width: 100%
-}
-
-/* Table stats */
-
-div#tablestatistics table {
-  float: left;
-  margin-bottom: .5em;
-  margin-right: 1.5em;
-  margin-top: .5em;
-  min-width: 16em
-}
-
-/* End table stats */
-
-/* Server Privileges */
-
-#tableuserrights td, #tablespecificuserrights td, #tabledatabases td {
-  vertical-align: middle
-}
-
-/* End server privileges */
-
-#structure-action-links a {
-  margin-right: 1em
-}
-
-#create_table_form_minimal {
-  display: block
-}
-
-#db_or_table_specific_priv .tblFooters {
-  margin-top: -68px
-}
-
-.pma_table td {
-  position: static
-}
-
-.pma_table th.draggable span, .pma_table tbody td span {
-  display: block;
-  overflow: hidden
-}
-
-.pma_table tbody td span code span {
-  display: inline
-}
-
-.insertRowTable td, .insertRowTable th {
-  vertical-align: middle
-}
-
-table.show_create {
-  margin-top: 1em
-}
-
-table.show_create td {
-  border-right: 1px solid #bbb
-}
-
-#alias_modal table th {
-  vertical-align: middle;
-  padding-left: 1em
-}
-
-#alias_modal label.col-2 {
-  min-width: 20%;
-  display: inline-block
-}
-
-#alias_modal select {
-  width: 25%;
-  margin-right: 2em
-}
-
-#alias_modal label {
-  font-weight: bold
-}
-
-/* styles for sortable tables created with tablesorter jquery plugin */
-th.header {
-  cursor: pointer;
-  color: #235a81
-}
-
-th.header:hover {
-  text-decoration: underline
-}
-
-th.header .sorticon {
-  width: 16px;
-  height: 16px;
-  background-repeat: no-repeat;
-  background-position: right center;
-  display: inline-table;
-  vertical-align: middle;
-  float: right
-}
-
-th.headerSortUp .sorticon, th.headerSortDown:hover .sorticon {
-  background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('s_desc.png');
-  ?>)
-}
-
-th.headerSortDown .sorticon, th.headerSortUp:hover .sorticon {
-  background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('s_asc.png');
-  ?>)
-}
-/* end of styles of sortable tables */
diff --git a/#pma/themes/fallen/css/fallen/common/typography.css.php b/#pma/themes/fallen/css/fallen/common/typography.css.php
deleted file mode 100644
index 95b467d9..00000000
--- a/#pma/themes/fallen/css/fallen/common/typography.css.php
+++ /dev/null
@@ -1,23 +0,0 @@
-h1, h2 {
-  color: <?php echo $GLOBALS['cfg']['NaviBackground'] ?>;
-  font-family: <?php echo $GLOBALS['cfg']['FontFamilyLight'] ?>
-}
-
-h1 {
-  font-size: 3em;
-  letter-spacing: -1px;
-  line-height: 1;
-  margin: 0
-}
-
-h2 {
-  font-size: 3.6em;
-  margin: 10px 0 15px;
-  line-height: 1;
-  letter-spacing: -1px
-}
-
-h3 {
-  text-transform: uppercase;
-  font-weight: normal
-}
diff --git a/#pma/themes/fallen/css/fallen/navigation/elements.css.php b/#pma/themes/fallen/css/fallen/navigation/elements.css.php
deleted file mode 100644
index 09ba4fc1..00000000
--- a/#pma/themes/fallen/css/fallen/navigation/elements.css.php
+++ /dev/null
@@ -1,6 +0,0 @@
-#pma_navigation div.pageselector {
-  text-align: center;
-  margin: 0;
-  margin-left: 0.75em;
-  border-left: 1px solid #666
-}
diff --git a/#pma/themes/fallen/css/fallen/navigation/globals.css.php b/#pma/themes/fallen/css/fallen/navigation/globals.css.php
deleted file mode 100644
index 2746ae43..00000000
--- a/#pma/themes/fallen/css/fallen/navigation/globals.css.php
+++ /dev/null
@@ -1,422 +0,0 @@
-#pma_navigation #recentTableList {
-  text-align: center;
-  padding: 10px
-}
-
-#pma_navigation #recentTableList select {
-  min-width: 100%
-}
-
-#pma_navigation #databaseList {
-  text-align: center;
-  margin: 10px
-}
-
-#pma_navigation #navipanellinks {
-  padding-top: 1em;
-  padding-bottom: 1em;
-  padding-left: 7px;
-  text-align: left;
-  background-color: <?php echo $GLOBALS['cfg']['BorderColor'] ?>
-}
-
-div#left_tableList li a:first-child:before {
-  color: <?php echo $GLOBALS['cfg']['NaviPointerColor'] ?>;
-  font-family: "<?php echo $font_family_icon ?>";
-  content: "";
-  margin: 10px
-}
-
-div#left_tableList li:hover a:first-child:before {
-  color: <?php echo $GLOBALS['cfg']['ButtonColor'] ?>
-}
-
-#navipanellinks a {
-  display: inline-block;
-  height: 16px;
-  width: 16px;
-  color: <?php echo $GLOBALS['cfg']['MainColor'] ?>;
-  margin-right: 10px;
-  padding: 5px;
-  font-size: 15px
-}
-
-#navipanellinks a:hover {
-  color: <?php echo $GLOBALS['cfg']['ThColor'] ?>
-}
-
-#pma_navigation #serverChoice, #pma_navigation #databaseList, #pma_navigation div.pageselector.dbselector {
-  text-align: center;
-  padding: 5px 10px 0;
-  border: 0
-}
-
-#pma_navigation_content>img.throbber {
-  display: none;
-  margin: .3em auto 0
-}
-
-/* Navigation tree*/
-#pma_navigation_tree {
-  margin: 0;
-  margin-left: 10px;
-  overflow: hidden;
-  height: 74%;
-  position: relative
-}
-
-#pma_navigation_select_database {
-  text-align: left;
-  padding: 0 0 0;
-  border: 0;
-  margin: 0
-}
-
-#pma_navigation_db_select {
-  margin-top: 0.5em;
-  margin-left: 0.75em
-}
-
-#pma_navigation_db_select select {
-  border: 1px solid #bbb;
-  border-top: 1px solid #bbb;
-  color: #333;
-  padding: 4px 6px;
-  margin: 0 0 0;
-  width: 92%
-}
-
-#pma_navigation_tree_content {
-  width: 100%;
-  overflow: hidden;
-  overflow-y: auto;
-  position: absolute;
-  height: 100%
-}
-
-#pma_navigation_tree li .dbItemControls {
-  padding-left: 4px
-}
-
-#pma_navigation_tree li .navItemControls {
-  display: none;
-  padding-left: 4px
-}
-
-#pma_navigation_tree li.activePointer .navItemControls {
-  display: inline;
-  opacity: 0.5
-}
-
-#pma_navigation_tree li.activePointer .navItemControls:hover {
-  display: inline;
-  opacity: 1.0
-}
-
-#pma_navigation_tree_content a.hover_show_full {
-  position: relative;
-  z-index: 100
-}
-
-#pma_navigation_tree a {
-  color: <?php echo $GLOBALS['cfg']['NaviColor'] ?>
-}
-
-#pma_navigation_tree a:hover {
-  text-decoration: none;
-  color: <?php echo $GLOBALS['cfg']['ThColor'] ?>
-}
-
-#pma_navigation_tree li.activePointer {
-  color: <?php echo $GLOBALS['cfg']['ThColor'] ?>
-}
-
-#pma_navigation_tree li.selected {
-  color: <?php echo $GLOBALS['cfg']['ThColor'] ?>
-}
-
-#pma_navigation_tree ul {
-  clear: both;
-  padding: 0;
-  list-style-type: none;
-  margin: 5px 0 0 0
-}
-
-#pma_navigation_tree ul ul {
-  position: relative
-}
-
-#pma_navigation_tree li {
-  white-space: nowrap;
-  clear: both;
-  min-height: 25px
-}
-
-#pma_navigation_tree img {
-  margin: 0
-}
-
-#pma_navigation_tree i {
-  display: block
-}
-
-#pma_navigation_tree div.block {
-  position: relative;
-  width: 1.5em;
-  height: 2em;
-  min-width: 16px;
-  min-height: 16px;
-  float: left
-}
-
-#pma_navigation_tree div.block.double {
-  width: 2.5em
-}
-
-#pma_navigation_tree div.block i, #pma_navigation_tree div.block b {
-  width: 1.5em;
-  height: 2em;
-  min-width: 16px;
-  min-height: 8px;
-  position: absolute;
-  bottom: 0.7em;
-  left: 0.75em;
-  z-index: 0;
-  margin-top: -4px
-}
-
-#pma_navigation_tree div.block i {
-  /* Top and right segments for the tree element connections */
-  display: block;
-  border-left: 1px solid #616161;
-  border-bottom: 1px solid #616161;
-  position: relative;
-  z-index: 0
-}
-
-#pma_navigation_tree div.block i.first {
-  /* Removes top segment */
-  border-left: 0
-}
-
-#pma_navigation_tree div.block b {
-  /* Bottom segment for the tree element connections */
-  display: block;
-  height: 0.75em;
-  bottom: 0;
-  left: 0.75em;
-  border-left: 1px solid #616161
-}
-
-#pma_navigation_tree div.block a, #pma_navigation_tree div.block u {
-  position: absolute;
-  left: 50%;
-  top: 50%;
-  z-index: 10
-}
-
-#pma_navigation_tree div.block a+a {
-  left: 100%
-}
-
-#pma_navigation_tree div.block.double a, #pma_navigation_tree div.block.double u {
-  left: 33%
-}
-
-#pma_navigation_tree div.block.double a+a {
-  left: 85%
-}
-
-#pma_navigation_tree div.block img {
-  position: relative;
-  top: -0.6em;
-  left: 0;
-  margin-left: -7px
-}
-
-#pma_navigation_tree div.throbber img {
-  top: 2px;
-  left: 2px
-}
-
-#pma_navigation_tree li.last>ul {
-  background: none
-}
-
-#pma_navigation_tree li>a, #pma_navigation_tree li>i {
-  line-height: 1.5em;
-  height: 1.5em;
-  padding-left: 0.3em
-}
-
-#pma_navigation_tree .list_container {
-  border-left: 1px solid #616161;
-  margin-left: 0.75em;
-  padding-left: 0.75em
-}
-
-#pma_navigation_tree .last>.list_container {
-  border-left: 0 solid #616161
-}
-
-/* Fast filter */
-li.fast_filter {
-  padding-left: 0.75em;
-  margin-left: 0.75em;
-  padding-right: 15px;
-  border-left: 1px solid #616161
-}
-
-li.fast_filter input {
-  width: 100%;
-  background-color: #FFFFFF;
-  border: 1px solid #CCCCCC;
-  color: #666666;
-  font-family: "Roboto", "Segoe UI";
-  padding: 2px
-}
-
-li.fast_filter span {
-  position: relative;
-  right: 1.5em;
-  padding: 0.2em;
-  top: 1px;
-  cursor: pointer;
-  font-weight: bold;
-  color: #800
-}
-
-li.fast_filter.db_fast_filter {
-  border: 0;
-  margin-left: 0;
-  margin-right: 10px
-}
-
-#navigation_controls_outer {
-  min-height: 21px !important;
-  margin-top: 18px!important
-}
-
-#pma_navigation_collapse {
-  padding-right: 2px
-}
-
-#navigation_controls_outer.activePointer {
-  background-color: transparent !important
-}
-
-#navigation_controls {
-  float: left;
-  padding-left: 7.1px
-}
-
-/* Resize handler */
-#pma_navigation_resizer {
-  width: 1px;
-  height: 100%;
-  background-color: #aaa;
-  cursor: col-resize;
-  position: fixed;
-  top: 0;
-  left: 250px;
-  z-index: 801
-}
-
-#pma_navigation_collapser {
-  width: 20px;
-  padding-top: 4px;
-  padding-bottom: 12px;
-  background: <?php echo $GLOBALS['cfg']['NaviBackground'] ?>;
-  border-bottom: 1px solid <?php echo $GLOBALS['cfg']['NaviBackground'] ?>;
-  line-height: 22px;
-  color: #fff;
-  position: fixed;
-  top: 0;
-  left: <?php echo $GLOBALS['cfg']['NaviWidth'] ?>px;
-  text-align: center;
-  cursor: pointer;
-  z-index: 801
-}
-
-/* Quick warp links */
-.pma_quick_warp {
-  margin-top: 20px;
-  margin-left: 4px;
-  position: relative
-}
-
-.pma_quick_warp .drop_list {
-  float: left;
-  margin-left: 3px;
-  padding: 2px 0
-}
-
-.pma_quick_warp .drop_button {
-  padding: .5em .9em;
-  border: 1px solid #4285f4;
-  background: #4285f4;
-  cursor: pointer;
-  color: #fff;
-  box-shadow: 0 1px 1px #bbb;
-  transition: box-shadow .2s cubic-bezier(.4, 0, .2, 1), background-color .2s cubic-bezier(.4, 0, .2, 1);
-  -webkit-transition: box-shadow .2s cubic-bezier(.4, 0, .2, 1), background-color .2s cubic-bezier(.4, 0, .2, 1);
-  border-radius: 2px
-}
-
-.pma_quick_warp .drop_list:hover .drop_button {
-  background: #2171f5
-}
-
-.pma_quick_warp .drop_list ul {
-  position: absolute;
-  margin: 0;
-  padding: 0;
-  overflow: hidden;
-  overflow-y: auto;
-  list-style: none;
-  background: #fff;
-  border: 1px solid #ddd;
-  top: 100%;
-  left: 3px;
-  right: 0;
-  display: none;
-  z-index: 802
-}
-
-.pma_quick_warp .drop_list:hover ul {
-  display: block
-}
-
-.pma_quick_warp .drop_list li {
-  white-space: nowrap;
-  padding: 0
-}
-
-.pma_quick_warp .drop_list li img {
-  vertical-align: sub
-}
-
-.pma_quick_warp .drop_list li:hover {
-  background: #f2f2f2
-}
-
-.pma_quick_warp .drop_list a {
-  display: block;
-  padding: .2em .3em
-}
-
-.pma_quick_warp .drop_list a.favorite_table_anchor {
-  clear: left;
-  float: left;
-  padding: .1em .3em 0
-}
-
-li.warp_link {
-  padding: 7px 0 0 0!important
-}
-
-/* Table Sticky */
-
-table.sticky_columns {
-  box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.2)
-}
diff --git a/#pma/themes/fallen/css/fallen/navigation/logos.css.php b/#pma/themes/fallen/css/fallen/navigation/logos.css.php
deleted file mode 100644
index 70f16387..00000000
--- a/#pma/themes/fallen/css/fallen/navigation/logos.css.php
+++ /dev/null
@@ -1,25 +0,0 @@
-#pmalogo a img {
-  margin-top: -8px
-}
-
-#pma_navigation #imgpmalogo {
-  display: none
-}
-
-#pma_navigation #pmalogo:after {
-  content: "<?php echo $brand ?>";
-  font-size: 30px;
-  font-weight: 300;
-  margin-left: 5px
-}
-
-#pma_navigation #pmalogo {
-  margin: 0;
-  padding: 12px;
-  background: <?php echo $GLOBALS['cfg']['NaviBackground'] ?>;
-  color: <?php echo $GLOBALS['cfg']['ButtonColor'] ?>;
-  font-size: 14px;
-  cursor: default;
-  height: 15px;
-  line-height: 100%
-}
diff --git a/#pma/themes/fallen/css/fallen/navigation/nav.css.php b/#pma/themes/fallen/css/fallen/navigation/nav.css.php
deleted file mode 100644
index adbfd804..00000000
--- a/#pma/themes/fallen/css/fallen/navigation/nav.css.php
+++ /dev/null
@@ -1,54 +0,0 @@
-#pma_navigation {
-  width: <?php echo $GLOBALS['cfg']['NaviWidth'] ?>px;
-  overflow: hidden;
-  position: fixed;
-  top: 0;
-  left: 0;
-  height: 100%;
-  background: <?php echo $GLOBALS['cfg']['NaviColor'] ?>;
-  color: <?php echo $GLOBALS['cfg']['MainColor'] ?>;
-  z-index: 800
-}
-
-#pma_navigation input[type=text] {
-  background-color: <?php echo $GLOBALS['cfg']['MainBackground'] ?>;
-  font-family: <?php echo $GLOBALS['cfg']['FontFamily'] ?>;
-  padding: 5px 1px
-}
-
-#pma_navigation a img {
-  border: 0
-}
-
-#pma_navigation a:link, #pma_navigation a:visited, #pma_navigation a:active {
-  text-decoration: none;
-  color: <?php echo $GLOBALS['cfg']['NaviPointerColor'] ?>
-}
-
-#pma_navigation select#select_server, #pma_navigation select#lightm_db {
-  width: 100%
-}
-
-/* buttons in some browsers (eg. Konqueror) are block elements,
-   this breaks design */
-#pma_navigation button {
-  display: inline
-}
-
-#pma_navigation_content {
-  width: 100%;
-  position: absolute;
-  top: 0;
-  left: 0;
-  z-index: 0
-}
-
-#pma_navigation ul {
-  margin: 0
-}
-
-#pma_navigation form {
-  margin: 0;
-  padding: 0;
-  display: inline
-}
diff --git a/#pma/themes/fallen/css/gis.css.php b/#pma/themes/fallen/css/gis.css.php
deleted file mode 100644
index 742a8ca2..00000000
--- a/#pma/themes/fallen/css/gis.css.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-# Unplanned execution path
-
-if ( !defined('PMA_MINIMUM_COMMON') && !defined('TESTSUITE') ) {
-  exit();
-} ?>
-/* ----------------------------------------------------- */
-
-/**
- * GIS data editor styles
- */
-
-a.close_gis_editor {
-  float: right
-}
-
-#gis_editor {
-  display: none;
-  position: fixed;
-  _position: absolute;
-  /* hack for IE */
-  z-index: 1001;
-  overflow-y: auto;
-  overflow-x: hidden
-}
-
-#gis_data {
-  min-height: 230px
-}
-
-#gis_data_textarea {
-  height: 6em
-}
-
-#gis_data_editor {
-  background: #D0DCE0;
-  padding: 15px;
-  min-height: 500px
-}
-
-#gis_data_editor .choice {
-  display: none
-}
-
-#gis_data_editor input[type="text"] {
-  width: 75px
-}
diff --git a/#pma/themes/fallen/css/jqplot.css.php b/#pma/themes/fallen/css/jqplot.css.php
deleted file mode 100644
index bf585c2b..00000000
--- a/#pma/themes/fallen/css/jqplot.css.php
+++ /dev/null
@@ -1,267 +0,0 @@
-<?php
-# Unplanned execution path
-
-if ( !defined('PMA_MINIMUM_COMMON') && !defined('TESTSUITE') ) {
-  exit();
-} ?>
-/* ----------------------------------------------------- */
-
-/* jqPlot */
-
-/* rules for the plot target div.  These will be cascaded down to all plot elements according to css rules */
-.jqplot-target {
-  position: relative;
-  color: #222222;
-  font-family: "Roboto", "Segoe UI";
-  font-size: 1em;
-  /* height: 300px;
-    width: 590px;*/
-}
-
-/* rules applied to all axes */
-.jqplot-axis {
-  font-size: 0.75em
-}
-
-.jqplot-xaxis {
-  margin-top: 10px
-}
-
-.jqplot-x2axis {
-  margin-bottom: 10px
-}
-
-.jqplot-yaxis {
-  margin-right: 10px
-}
-
-.jqplot-y2axis, .jqplot-y3axis, .jqplot-y4axis, .jqplot-y5axis, .jqplot-y6axis, .jqplot-y7axis, .jqplot-y8axis, .jqplot-y9axis, .jqplot-yMidAxis {
-  margin-left: 10px;
-  margin-right: 10px
-}
-
-/* rules applied to all axis tick divs */
-.jqplot-axis-tick, .jqplot-xaxis-tick, .jqplot-yaxis-tick, .jqplot-x2axis-tick, .jqplot-y2axis-tick, .jqplot-y3axis-tick, .jqplot-y4axis-tick, .jqplot-y5axis-tick, .jqplot-y6axis-tick, .jqplot-y7axis-tick, .jqplot-y8axis-tick, .jqplot-y9axis-tick, .jqplot-yMidAxis-tick {
-  position: absolute;
-  white-space: pre
-}
-
-.jqplot-xaxis-tick {
-  top: 0;
-  /* initial position untill tick is drawn in proper place */
-  left: 15px;
-  /* padding-top: 10px;*/
-  vertical-align: top
-}
-
-.jqplot-x2axis-tick {
-  bottom: 0;
-  /* initial position untill tick is drawn in proper place */
-  left: 15px;
-  /* padding-bottom: 10px; */
-  vertical-align: bottom
-}
-
-.jqplot-yaxis-tick {
-  right: 0;
-  /* initial position untill tick is drawn in proper place */
-  top: 15px;
-  /* padding-right: 10px; */
-  text-align: right
-}
-
-.jqplot-yaxis-tick.jqplot-breakTick {
-  right: -20px;
-  margin-right: 0;
-  padding: 1px 5px 1px;
-  /* background-color: white;*/
-  z-index: 2;
-  font-size: 1.5em
-}
-
-.jqplot-y2axis-tick, .jqplot-y3axis-tick, .jqplot-y4axis-tick, .jqplot-y5axis-tick, .jqplot-y6axis-tick, .jqplot-y7axis-tick, .jqplot-y8axis-tick, .jqplot-y9axis-tick {
-  left: 0;
-  /* initial position untill tick is drawn in proper place */
-  top: 15px;
-  /* padding-left: 10px; */
-  /* padding-right: 15px; */
-  text-align: left
-}
-
-.jqplot-yMidAxis-tick {
-  text-align: center;
-  white-space: nowrap
-}
-
-.jqplot-xaxis-label {
-  margin-top: 10px;
-  font-size: 11pt;
-  position: absolute
-}
-
-.jqplot-x2axis-label {
-  margin-bottom: 10px;
-  font-size: 11pt;
-  position: absolute
-}
-
-.jqplot-yaxis-label {
-  margin-right: 10px;
-  /* text-align: center;*/
-  font-size: 11pt;
-  position: absolute
-}
-
-.jqplot-yMidAxis-label {
-  font-size: 11pt;
-  position: absolute
-}
-
-.jqplot-y2axis-label, .jqplot-y3axis-label, .jqplot-y4axis-label, .jqplot-y5axis-label, .jqplot-y6axis-label, .jqplot-y7axis-label, .jqplot-y8axis-label, .jqplot-y9axis-label {
-  /* text-align: center; */
-  font-size: 11pt;
-  margin-left: 10px;
-  position: absolute
-}
-
-.jqplot-meterGauge-tick {
-  font-size: 0.75em;
-  color: #999
-}
-
-.jqplot-meterGauge-label {
-  font-size: 1em;
-  color: #999
-}
-
-table.jqplot-table-legend {
-  margin-top: 12px;
-  margin-bottom: 12px;
-  margin-left: 12px;
-  margin-right: 12px
-}
-
-table.jqplot-table-legend, table.jqplot-cursor-legend {
-  background-color: rgba(255, 255, 255, 0.6);
-  border: 1px solid #ccc;
-  position: absolute;
-  font-size: 0.75em
-}
-
-td.jqplot-table-legend {
-  vertical-align: middle
-}
-
-/*
-These rules could be used instead of assigning
-element styles and relying on js object properties.
-*/
-
-/*
-td.jqplot-table-legend-swatch {
-  padding-top: 0.5em;
-  text-align: center
-}
-
-tr.jqplot-table-legend:first td.jqplot-table-legend-swatch {
-  padding-top: 0
-}
-*/
-
-td.jqplot-seriesToggle:hover, td.jqplot-seriesToggle:active {
-  cursor: pointer
-}
-
-.jqplot-table-legend .jqplot-series-hidden {
-  text-decoration: line-through
-}
-
-div.jqplot-table-legend-swatch-outline {
-  border: 1px solid #ccc;
-  padding: 1px
-}
-
-div.jqplot-table-legend-swatch {
-  width: 0;
-  height: 0;
-  border-top-width: 5px;
-  border-bottom-width: 5px;
-  border-left-width: 6px;
-  border-right-width: 6px;
-  border-top-style: solid;
-  border-bottom-style: solid;
-  border-left-style: solid;
-  border-right-style: solid
-}
-
-.jqplot-title {
-  top: 0;
-  left: 0;
-  padding-bottom: 0.5em;
-  font-size: 1.2em
-}
-
-table.jqplot-cursor-tooltip {
-  border: 1px solid #ccc;
-  font-size: 0.75em
-}
-
-.jqplot-cursor-tooltip {
-  border: 1px solid #ccc;
-  font-size: 0.75em;
-  white-space: nowrap;
-  background: rgba(208, 208, 208, 0.5);
-  padding: 1px
-}
-
-.jqplot-highlighter-tooltip, .jqplot-canvasOverlay-tooltip {
-  border: 1px solid #ccc;
-  font-size: 0.75em;
-  white-space: nowrap;
-  background: rgba(208, 208, 208, 0.5);
-  padding: 1px
-}
-
-.jqplot-point-label {
-  font-size: 0.75em;
-  z-index: 2
-}
-
-td.jqplot-cursor-legend-swatch {
-  vertical-align: middle;
-  text-align: center
-}
-
-div.jqplot-cursor-legend-swatch {
-  width: 1.2em;
-  height: 0.7em
-}
-
-.jqplot-error {
-  /* Styles added to the plot target container when there is an error go here. */
-  text-align: center
-}
-
-.jqplot-error-message {
-  /* Styling of the custom error message div goes here. */
-  position: relative;
-  top: 46%;
-  display: inline-block
-}
-
-div.jqplot-bubble-label {
-  font-size: 0.8em;
-  /* background: rgba(90%, 90%, 90%, 0.15); */
-  padding-left: 2px;
-  padding-right: 2px;
-  color: rgb(20%, 20%, 20%)
-}
-
-div.jqplot-bubble-label.jqplot-bubble-label-highlight {
-  background: rgba(90%, 90%, 90%, 0.7)
-}
-
-div.jqplot-noData-container {
-  text-align: center;
-  background-color: rgba(96%, 96%, 96%, 0.3)
-}
diff --git a/#pma/themes/fallen/css/navigation.css.php b/#pma/themes/fallen/css/navigation.css.php
deleted file mode 100644
index 0fdb0ab8..00000000
--- a/#pma/themes/fallen/css/navigation.css.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-# Unplanned execution path
-
-if ( !defined('PMA_MINIMUM_COMMON') && !defined('TESTSUITE') ) {
-  exit();
-} ?>
-/* ----------------------------------------------------- */
-
-/* Navigation
----------------------------------------------- */
-
-<?php include CSS_PATH . '/navigation/nav.css.php' ?>
-
-/* Logos
----------------------------------------------- */
-
-<?php include CSS_PATH . '/navigation/logos.css.php' ?>
-
-/* Elements
----------------------------------------------- */
-
-<?php include CSS_PATH . '/navigation/elements.css.php' ?>
-
-/* Globals
----------------------------------------------- */
-
-<?php include CSS_PATH . '/navigation/globals.css.php' ?>
diff --git a/#pma/themes/fallen/css/pmd.css.php b/#pma/themes/fallen/css/pmd.css.php
deleted file mode 100644
index 221dd7a5..00000000
--- a/#pma/themes/fallen/css/pmd.css.php
+++ /dev/null
@@ -1,468 +0,0 @@
-<?php
-# Unplanned execution path
-
-if ( !defined('PMA_MINIMUM_COMMON') && !defined('TESTSUITE') ) {
-  exit();
-} ?>
-/* ----------------------------------------------------- */
-
-/* Designer */
-
-.input_tab {
-  background-color: #efefef;
-  color: #000;
-  border: 1px solid #ccc
-}
-
-.content_fullscreen {
-  position: relative;
-  overflow: auto
-}
-
-#canvas_outer {
-  position: relative;
-  width: 100%;
-  display: block
-}
-
-#canvas {
-  background-color: #fff;
-  color: #000
-}
-
-canvas.pmd {
-  display: inline-block;
-  overflow: hidden;
-  text-align: left
-}
-
-canvas.pmd * {
-  behavior: url(#default#VML)
-}
-
-.pmd_tab {
-  color: #333;
-  border-collapse: collapse;
-  border: 1px solid #ccc;
-  z-index: 1;
-  -moz-user-select: none
-}
-
-.pmd_tab .header {
-  background-color: #f6f6f6
-}
-
-.tab_zag {
-  text-align: center;
-  cursor: move;
-  padding: 1px;
-  font-weight: bold;
-  vertical-align: middle
-}
-
-.tab_zag_2 {
-  text-align: center;
-  cursor: move;
-  padding: 1px;
-  font-weight: bold;
-  background-color: #f6f6f6;
-  vertical-align: middle
-}
-
-.tab_field {
-  background: #fff;
-  color: #000;
-  cursor: default
-}
-
-.tab_field_2 {
-  background-color: #CCFFCC;
-  color: #000;
-  background-repeat: repeat-x;
-  cursor: default
-}
-
-.tab_field_3 {
-  background-color: #FFE6E6;
-  /*#DDEEFF*/
-  color: #000;
-  cursor: default
-}
-
-#pmd_hint {
-  white-space: nowrap;
-  position: absolute;
-  background-color: #99ff99;
-  color: #000;
-  z-index: 3;
-  border: #00CC66 solid 1px;
-  display: none
-}
-
-.scroll_tab {
-  overflow: auto;
-  width: 100%;
-  height: 500px
-}
-
-.pmd_Tabs {
-  cursor: default;
-  color: #333;
-  white-space: nowrap;
-  text-decoration: none;
-  text-indent: 3px;
-  margin-left: 2px;
-  text-align: left;
-  border: #ccc solid 0
-}
-
-.pmd_Tabs2 {
-  cursor: default;
-  color: #666;
-  background: #eee;
-  text-indent: 3px;
-  white-space: nowrap;
-  text-decoration: none;
-  border: #eee solid 0;
-  text-align: left
-}
-
-.owner {
-  font-weight: normal;
-  color: #888
-}
-
-.option_tab {
-  padding-left: 2px;
-  padding-right: 2px;
-  width: 5px
-}
-
-.select_all {
-  vertical-align: top;
-  padding-left: 2px;
-  padding-right: 2px;
-  cursor: default;
-  width: 1px;
-  color: #000;
-  background-repeat: repeat-x
-}
-
-.small_tab {
-  vertical-align: top;
-  background-color: #666;
-  color: #fff;
-  cursor: default;
-  text-align: center;
-  font-weight: bold;
-  padding-left: 2px;
-  padding-right: 2px;
-  width: 1px;
-  text-decoration: none
-}
-
-.small_tab2 {
-  vertical-align: top;
-  color: #fff;
-  background-color: #ff9966;
-  cursor: default;
-  padding-left: 2px;
-  padding-right: 2px;
-  text-align: center;
-  font-weight: bold;
-  width: 1px;
-  text-decoration: none
-}
-
-.small_tab_pref {
-  background-color: #f6f6f6;
-  text-align: center;
-  width: 1px
-}
-
-.small_tab_pref2 {
-  vertical-align: top;
-  color: #fff;
-  background-color: #ff9966;
-  cursor: default;
-  text-align: center;
-  font-weight: bold;
-  width: 1px;
-  text-decoration: none
-}
-
-.L_butt2_1 {
-  padding-left: 5px;
-  text-decoration: none;
-  vertical-align: middle;
-  cursor: default
-}
-
-.L_butt2_2 {
-  padding-left: 5px;
-  color: #000;
-  text-decoration: none;
-  vertical-align: middle;
-  cursor: default
-}
-/* ---------------------------------------------------------------------------*/
-
-.bor {
-  width: 10px;
-  height: 10px
-}
-
-#osn_tab {
-  position: absolute;
-  background-color: #fff;
-  color: #000;
-  width: 100% !important;
-}
-
-.pmd_header {
-  background-color: #f6f6f6;
-  border-top: 20px solid #fff;
-  color: #333;
-  display: block;
-  height: 28px;
-  margin-left: -20px;
-  margin-top: -60px;
-  padding: 5px 20px;
-  position: fixed;
-  text-align: center;
-  width: 100%;
-  z-index: 101
-}
-
-.pmd_header a {
-  display: block;
-  float: left;
-  margin: 3px 1px 4px;
-  height: 20px
-}
-
-.pmd_header .M_bord {
-  display: block;
-  float: left;
-  margin: 4px;
-  height: 20px;
-  width: 2px
-}
-
-.pmd_header a.first {
-  margin-right: 1em
-}
-
-.pmd_header a.last {
-  margin-left: 1em
-}
-
-a.M_butt_Selected_down_IE, a.M_butt_Selected_down {
-  background-color: #eee;
-  color: #000
-}
-
-a.M_butt_Selected_down_IE:hover, a.M_butt_Selected_down:hover, a.M_butt:hover {
-  background-color: #eee;
-  color: #000
-}
-
-#layer_menu {
-  z-index: 98;
-  position: relative;
-  float: right;
-  ;
-  background-color: #f6f6f6;
-  border: #ccc solid 1px;
-  border-top: 0;
-  margin-right: -20px
-}
-
-.content_fullscreen #layer_menu {
-  margin-right: 0
-}
-
-#layer_menu.left {
-  float: left;
-  margin-left: -20px
-}
-
-.content_fullscreen #layer_menu.left {
-  margin-left: 0
-}
-
-#layer_upd_relation {
-  position: absolute;
-  left: 637px;
-  top: 224px;
-  z-index: 100
-}
-
-#layer_new_relation {
-  position: absolute;
-  left: 636px;
-  top: 85px;
-  z-index: 100;
-  width: 153px
-}
-
-#pmd_optionse {
-  position: absolute;
-  left: 636px;
-  top: 85px;
-  z-index: 100;
-  width: 153px
-}
-
-#layer_menu_sizer {
-  background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/resize.png') ?>);
-  cursor: ew-resize
-}
-
-#layer_menu_sizer .icon {
-  margin: 0
-}
-
-.panel {
-  position: fixed;
-  top: 90px;
-  right: 0;
-  width: 350px;
-  max-height: 500px;
-  display: none;
-  overflow: auto;
-  padding-top: 34px;
-  z-index: 102
-}
-
-a.trigger {
-  position: fixed;
-  text-decoration: none;
-  top: 90px;
-  right: 0;
-  color: #fff;
-  padding: 10px 40px 10px 15px;
-  background: #333 url(<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/plus.png') ?>) 85% 55% no-repeat;
-  border: 1px solid #444;
-  display: block;
-  z-index: 102
-}
-
-a.trigger:hover {
-  color: #080808;
-  background: #fff696 url(<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/plus.png') ?>) 85% 55% no-repeat;
-  border: 1px solid #999
-}
-
-a.active.trigger {
-  background: #222 url(<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/minus.png') ?>) 85% 55% no-repeat;
-  z-index: 999
-}
-
-a.active.trigger:hover {
-  background: #fff696 url(<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/minus.png') ?>) 85% 55% no-repeat
-}
-
-.toggle_container .block {
-  background-color: <?php echo $GLOBALS['cfg']['BrowseMarkerBackground'] ?>;
-  border-top: 1px solid #999
-}
-
-.toggle_container .block img.ic_s_info {
-  -webkit-filter: invert(70%);
-  filter: invert(70%)
-}
-
-.history_table {
-  opacity: 1.0;
-  cursor: pointer
-}
-
-.history_table2 {
-  opacity: 0.7
-}
-
-#ab {
-  min-width: 300px
-}
-
-#ab .ui-accordion-content {
-  padding: 0
-}
-
-#box {
-  display: none
-}
-
-#foreignkeychk {
-  text-align: left;
-  position: absolute;
-  cursor: pointer
-}
-
-.side-menu {
-  float: left;
-  position: fixed;
-  width: auto;
-  height: auto;
-  background: #efefef;
-  border: 1px solid #ccc;
-  box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.2);
-  overflow: hidden;
-  z-index: 50;
-  padding: 2px;
-  margin-top: 0;
-  margin-left: -20px
-}
-
-.content_fullscreen .side-menu {
-  margin-left: 0
-}
-
-.side-menu.right {
-  float: right;
-  right: 0
-}
-
-.content_fullscreen .side-menu.right {
-  margin-right: 0
-}
-
-.side-menu .hide {
-  display: none
-}
-
-.side-menu a {
-  display: block;
-  float: none;
-  overflow: hidden
-}
-
-.side-menu img, .side-menu span, .side-menu .text {
-  float: left;
-  padding-left: 2px
-}
-
-#name-panel {
-  border-bottom: 1px solid #ccc;
-  text-align: center;
-  background: #efefef;
-  font-size: 1.2em;
-  padding: 10px;
-  font-weight: bold;
-  margin-top: -20px;
-  margin-left: -20px;
-  margin-right: -20px
-}
-
-.content_fullscreen #name-panel {
-  margin-top: 0;
-  margin-left: 0;
-  margin-right: 0
-}
-
-#container-form {
-  width: 100%;
-  position: absolute;
-  left: 0
-}
diff --git a/#pma/themes/fallen/css/printview.css b/#pma/themes/fallen/css/printview.css
deleted file mode 100644
index de1862d9..00000000
--- a/#pma/themes/fallen/css/printview.css
+++ /dev/null
@@ -1,215 +0,0 @@
-/* For removing element from Print View */
-
-.print_ignore {
-  display: none
-}
-
-.nowrap {
-  white-space: nowrap
-}
-
-.hide {
-  display: none
-}
-
-
-/* Standard CSS */
-
-body, table, th, td {
-  color: #000;
-  background-color: #fff;
-  font-size: 12px
-}
-
-
-/* To remove link text decoration */
-
-a:link {
-  color: #000;
-  text-decoration: none
-}
-
-
-/* To remove any image borders */
-
-img {
-  border: 0
-}
-
-
-/* Table specific */
-
-table, th, td {
-  border: .1em solid #000;
-  background-color: #fff
-}
-
-table {
-  border-collapse: collapse;
-  border-spacing: 0.2em
-}
-
-thead {
-  border-collapse: collapse;
-  border-spacing: 0.2em;
-  border: .1em solid #000;
-  font-weight: 900
-}
-
-th, td {
-  padding: 0.2em
-}
-
-thead th {
-  font-weight: bold;
-  background-color: #e5e5e5;
-  border: .1em solid #000
-}
-
-th.vtop, td.vtop {
-  vertical-align: top
-}
-
-th.vbottom, td.vbottom {
-  vertical-align: bottom
-}
-
-th.column_heading, th.column_action {
-  border: .1em solid #000
-}
-
-table tr.odd, table tr.even {
-  border-left: .1em solid #000
-}
-
-table tr.odd th, table tr.even th, table.data th {
-  border-bottom: .1em solid #000
-}
-
-
-/* Common Elements not to be included */
-
-
-/* Hide Navigation and Top Menu bar */
-
-#pma_navigation, #floating_menubar {
-  display: none
-}
-
-
-/* Hide console */
-
-#pma_console_container {
-  display: none
-}
-
-
-/* Hide Navigation items (like Goto Top) */
-
-#page_nav_icons {
-  display: none
-}
-
-
-/* Hide the Create Table form */
-
-#create_table_form_minimal {
-  display: none
-}
-
-
-/* Hide the Page Settings Modal box */
-
-#page_settings_modal {
-  display: none
-}
-
-
-/* Hide footer, Demo notice, errors div */
-
-#pma_footer, #pma_demo, #pma_errors {
-  display: none
-}
-
-
-/* Hide the #selflink div */
-
-#selflink {
-  display: none
-}
-
-
-/* Position the main content */
-
-#page_content {
-  position: absolute;
-  left: 0;
-  top: 0;
-  width: 95%;
-  float: none
-}
-
-
-/* Specific Class for overriding while Print */
-
-.print {
-  background-color: #000
-}
-
-
-/* For the Success message div */
-
-.sqlOuter {
-  color: black
-}
-
-
-/* For hiding 'Open a New phpMyAdmin Window' button */
-
-.ic_window-new, .ic_s_cog {
-  display: none
-}
-
-.sticky_columns tr {
-  display: none
-}
-
-#structure-action-links, #addColumns {
-  display: none
-}
-
-
-/* Hide extra menu on tbl_structure.php */
-
-#topmenu2 {
-  display: none
-}
-
-.cDrop, .cEdit, .cList, .cCpy, .cPointer {
-  display: none
-}
-
-
-/* For Odd-Even contrast */
-
-table tr.odd th, table tr.odd td, .odd {
-  background: #fff
-}
-
-table tr.even th, table tr.even td, .even {
-  background: #dfdfdf
-}
-
-.column_attribute {
-  font-size: 100%
-}
-
-@media print {
-  #back_button_print_view, #print_button_print_view {
-    display: none
-  }
-}
-
-tton_print_view, #print_button_print_view {
-  display: none
-}
diff --git a/#pma/themes/fallen/css/resizable-menu.css.php b/#pma/themes/fallen/css/resizable-menu.css.php
deleted file mode 100644
index 7a1cc9f0..00000000
--- a/#pma/themes/fallen/css/resizable-menu.css.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-# Unplanned execution path
-
-if ( !defined('PMA_MINIMUM_COMMON') && !defined('TESTSUITE') ) {
-  exit();
-} ?>
-/* ----------------------------------------------------- */
-
-ul.resizable-menu a, ul.resizable-menu span {
-  display: block;
-  margin: 0;
-  padding: 0;
-  white-space: nowrap
-}
-
-ul.resizable-menu .submenu {
-  display: none;
-  position: relative
-}
-
-ul.resizable-menu .shown {
-  display: inline-block
-}
-
-ul.resizable-menu ul {
-  margin: 0;
-  padding: 0;
-  position: absolute;
-  list-style-type: none;
-  display: none;
-  border: 1px #ddd solid;
-  z-index: 2;
-  right: 0;
-  padding-bottom: 15px
-}
-
-ul.resizable-menu li:hover {
-
-}
-
-ul.resizable-menu li:hover ul, ul.resizable-menu .submenuhover ul {
-  display: block;
-  background: #fff
-}
-
-ul.resizable-menu ul li {
-  width: 100%
-}
diff --git a/#pma/themes/fallen/css/rte.css.php b/#pma/themes/fallen/css/rte.css.php
deleted file mode 100644
index 2ddf7805..00000000
--- a/#pma/themes/fallen/css/rte.css.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-# Unplanned execution path
-
-if ( !defined('PMA_MINIMUM_COMMON') && !defined('TESTSUITE') ) {
-  exit();
-} ?>
-/* ----------------------------------------------------- */
-
-.rte_table {
-  table-layout: fixed
-}
-
-.rte_table td {
-  vertical-align: middle;
-  padding: 0.2em
-}
-
-.rte_table input, .rte_table select, .rte_table textarea {
-  width: 100%;
-  margin: 0;
-  box-sizing: border-box;
-  -ms-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  -webkit-box-sizing: border-box
-}
-
-.rte_table input[type=checkbox], .rte_table input[type=radio] {
-  width: auto;
-  margin-right: 6px
-}
-
-.rte_table .routine_params_table {
-  width: 100%
-}
diff --git a/#pma/themes/fallen/fonts/fallen/fallen.eot b/#pma/themes/fallen/fonts/fallen/fallen.eot
deleted file mode 100644
index f0e67670..00000000
Binary files a/#pma/themes/fallen/fonts/fallen/fallen.eot and /dev/null differ
diff --git a/#pma/themes/fallen/fonts/fallen/fallen.svg b/#pma/themes/fallen/fonts/fallen/fallen.svg
deleted file mode 100644
index 28c53df6..00000000
--- a/#pma/themes/fallen/fonts/fallen/fallen.svg
+++ /dev/null
@@ -1,2793 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata>
-This is a custom SVG font generated by IcoMoon for Marsblue PMA Theme.
-</metadata>
-<defs>
-<font id="IcoMoon" horiz-adv-x="512" >
-<font-face units-per-em="512" ascent="480" descent="-32" />
-<missing-glyph horiz-adv-x="512" />
-<glyph unicode="&#x0021;" d="M 512.00,192.00L 416.00,288.00L 416.00,384.00L 352.00,384.00L 352.00,352.00L 256.00,448.00L0.00,192.00L 64.00,192.00L 64.00,0.00L 224.00,0.00L 224.00,128.00L 288.00,128.00L 288.00,0.00L 448.00,0.00L 448.00,192.00 	z" />
-<glyph unicode="&#x0022;" d="M 256.00,448.00L0.00,192.00l 48.00-48.00l 48.00,48.00l 32.00-192.00l 128.00,0.00 l 128.00,0.00 l 32.00,192.00l 48.00-48.00l 48.00,48.00L 256.00,448.00z M 256.00,242.746c-24.994,0.00-45.256,20.26-45.256,45.254
-		s 20.262,45.255, 45.256,45.255c 24.992,0.00, 45.255-20.262, 45.255-45.255C 301.255,263.006, 280.992,242.746, 256.00,242.746z" />
-<glyph unicode="&#x0023;" d="M 256.00,448.00L0.00,192.00l 48.00-48.00l 48.00,48.00l 32.00-192.00l 96.00,0.00 l0.00,96.00 l 64.00,0.00 l0.00-96.00 l 96.00,0.00 l 32.00,192.00l 48.00-48.00l 48.00,48.00L 256.00,448.00z M 256.00,242.746
-		c-24.994,0.00-45.256,20.26-45.256,45.254s 20.262,45.255, 45.256,45.255c 24.992,0.00, 45.255-20.262, 45.255-45.255
-		C 301.255,263.006, 280.992,242.746, 256.00,242.746z" />
-<glyph unicode="&#x0024;" d="M 448.00,352.00L 448.00,416.00 L0.00,416.00 l0.00-352.00 c0.00-17.673, 14.327-32.00, 32.00-32.00l 432.00,0.00 c 26.511,0.00, 48.00,21.489, 48.00,48.00L 512.00,352.00 L 448.00,352.00 z M 416.00,64.00L 32.00,64.00 L 32.00,384.00 l 384.00,0.00 L 416.00,64.00 zM 64.00,320.00L 384.00,320.00L 384.00,288.00L 64.00,288.00zM 256.00,256.00L 384.00,256.00L 384.00,224.00L 256.00,224.00zM 256.00,192.00L 384.00,192.00L 384.00,160.00L 256.00,160.00zM 256.00,128.00L 352.00,128.00L 352.00,96.00L 256.00,96.00zM 64.00,256.00L 224.00,256.00L 224.00,96.00L 64.00,96.00z" />
-<glyph unicode="&#x0025;" d="M 488.00,456.00c-32.00,32.00-64.00,32.00-96.00,0.00l-8.00-8.00l 96.00-96.00l 8.00,8.00C 520.00,392.00, 520.00,424.00, 488.00,456.00zM 32.00,96.00L0.00-32.00l 128.00,32.00l 320.00,320.00l-96.00,96.00L 32.00,96.00z M 128.00,64.00l-32.00,32.00l 256.00,256.00l 32.00-32.00L 128.00,64.00z" />
-<glyph unicode="&#x0026;" d="M 192.00,160.00L 256.00,192.00L 480.00,416.00L 448.00,448.00L 224.00,224.00 	zM 144.65,36.451c-15.816,33.364-42.833,60.381-76.198,76.198l 38.99,129.968L 192.00,288.00L 384.00,480.00l-96.00,0.00 L 96.00,288.00L0.00-32.00l 320.00,96.00l 192.00,192.00
-		l0.00,96.00 L 320.00,160.00l-45.383-84.559" />
-<glyph unicode="&#x0027;" d="M 447.97,163.249c-0.006,0.353-0.015,0.701-0.021,1.053c-0.016,0.714-0.035,1.427-0.059,2.14C 442.875,324.266, 256.00,480.00, 256.00,480.00
-		S 69.123,324.266, 64.11,166.439c-0.022-0.715-0.044-1.426-0.06-2.141c-0.007-0.352-0.015-0.701-0.021-1.053
-		c-0.018-1.08-0.028-2.162-0.028-3.248c0.00-1.184, 0.014-2.361, 0.035-3.539c 0.002-0.098, 0.003-0.195, 0.007-0.293
-		C 66.082,51.899, 151.241-32.00, 256.00-32.00c 104.758,0.00, 189.916,83.899, 191.959,188.168c 0.002,0.098, 0.004,0.196, 0.005,0.293
-		c 0.021,1.178, 0.036,2.357, 0.036,3.539C 448.00,161.086, 447.988,162.168, 447.97,163.249z M 383.975,157.63l-0.004-0.203
-		c-0.659-33.643-14.266-65.167-38.313-88.774C 321.587,45.017, 289.743,32.00, 256.00,32.00c-6.231,0.00-12.397,0.447-18.462,1.319
-		c 69.528,41.423, 116.108,117.352, 116.108,204.161c0.00,9.728-0.59,19.317-1.726,28.74c 20.136-36.97, 31.032-71.40, 32.001-101.813
-		l 0.002-0.072c 0.016-0.474, 0.026-0.946, 0.039-1.422l 0.014-0.724C 383.99,161.461, 384.00,160.73, 384.00,160.00
-		C 384.00,159.208, 383.99,158.419, 383.975,157.63z" />
-<glyph unicode="&#x0028;" d="M0.00,416.00l0.00-384.00 l 512.00,0.00 L 512.00,416.00 L0.00,416.00 z M 480.00,64.00l-32.00,0.00 l-96.00,144.00l-64.00-48.00L 160.00,320.00L 64.00,64.00L 32.00,64.00 L 32.00,384.00 l 448.00,0.00 L 480.00,64.00 zM 352.00,304.00A48.00,48.00 4860.00 1,0 448.00,304A48.00,48.00 4860.00 1,0 352.00,304z" />
-<glyph unicode="&#x0029;" d="M 416.00,192.113c-32.00,0.00-64.00-32.113-96.00-32.113s-32.00,128.00-96.00,128.00S 96.00,224.00, 64.00,96.00c0.00,0.00, 352.00,0.00, 384.00,0.00
-		C 448.00,95.999, 448.00,192.113, 416.00,192.113zM0.00,384.00l0.00-352.00 l 512.00,0.00 L 512.00,384.00 L0.00,384.00 z M 480.00,64.00L 32.00,64.00 L 32.00,352.00 l 448.00,0.00 L 480.00,64.00 zM 352.00,272.00A48.00,48.00 4860.00 1,0 448.00,272A48.00,48.00 4860.00 1,0 352.00,272z" />
-<glyph unicode="&#x002a;" d="M 154.007,208.00A101.993,101.993 4860.00 1,0 357.993,208A101.993,101.993 4860.00 1,0 154.007,208zM 480.00,352.00L 368.00,352.00 c-8.00,32.00-16.00,64.00-48.00,64.00L 192.00,416.00 c-32.00,0.00-40.00-32.00-48.00-64.00L 32.00,352.00 c-17.60,0.00-32.00-14.40-32.00-32.00l0.00-256.00 c0.00-17.60, 14.40-32.00, 32.00-32.00l 448.00,0.00
-		c 17.60,0.00, 32.00,14.40, 32.00,32.00L 512.00,320.00 C 512.00,337.60, 497.60,352.00, 480.00,352.00z M 256.00,64.00c-79.529,0.00-144.00,64.471-144.00,144.00c0.00,79.529, 64.471,144.00, 144.00,144.00
-		c 79.529,0.00, 144.00-64.471, 144.00-144.00C 400.00,128.471, 335.53,64.00, 256.00,64.00z M 480.00,288.00l-64.00,0.00 l0.00,32.00 l 64.00,0.00 L 480.00,288.00 z" />
-<glyph unicode="&#x002b;" d="M 155.755,448.451l-13.09-340.294c-17.465,8.962-39.377,12.84-62.368,9.578c-49.574-7.021-85.271-44.418-79.729-83.517
-	c 5.543-39.102, 50.223-65.101, 99.795-58.078c 43.996,6.235, 77.021,36.395, 80.022,70.43l 0.01-0.019c 0.006,0.077, 0.011,0.193, 0.018,0.28
-	c 0.073,0.865, 0.115,1.741, 0.147,2.611c 1.846,35.143, 13.148,302.082, 13.148,302.082l 278.355,28.679l-12.572-240.41
-	c-17.863,9.942-40.822,14.371-64.964,10.95c-49.574-7.028-85.268-44.417-79.726-83.521c 5.541-39.098, 50.221-65.102, 99.795-58.071
-	c 44.933,6.36, 78.41,37.682, 80.166,72.604l 0.021,0.021C 495.742,97.752, 512.00,473.005, 512.00,473.005L 155.755,448.451z" />
-<glyph unicode="&#x002c;" d="M 490.594,399.946C 418.778,410.271, 339.428,416.00, 256.001,416.00c-83.43,0.00-162.778-5.729-234.597-16.054
-	C 7.639,346.083,0.00,286.571,0.00,224.00c0.00-62.57, 7.639-122.083, 21.404-175.945C 93.223,37.729, 172.572,32.00, 256.001,32.00
-	c 83.427,0.00, 162.776,5.729, 234.593,16.055C 504.36,101.917, 512.00,161.43, 512.00,224.00C 512.00,286.571, 504.36,346.083, 490.594,399.946z
-	 M 192.001,128.00L 192.001,320.00 l 160.00-96.00L 192.001,128.00z" />
-<glyph unicode="&#x002d;" d="M0.00,416.00l0.00-384.00 l 512.00,0.00 L 512.00,416.00 L0.00,416.00 z M 96.00,64.00L 32.00,64.00 l0.00,64.00 l 64.00,0.00 L 96.00,64.00 z M 96.00,192.00L 32.00,192.00 l0.00,64.00 l 64.00,0.00 L 96.00,192.00 z M 96.00,320.00L 32.00,320.00 L 32.00,384.00 l 64.00,0.00 L 96.00,320.00 z M 384.00,64.00L 128.00,64.00 L 128.00,384.00 l 256.00,0.00 L 384.00,64.00 z
-		 M 480.00,64.00l-64.00,0.00 l0.00,64.00 l 64.00,0.00 L 480.00,64.00 z M 480.00,192.00l-64.00,0.00 l0.00,64.00 l 64.00,0.00 L 480.00,192.00 z M 480.00,320.00l-64.00,0.00 L 416.00,384.00 l 64.00,0.00 L 480.00,320.00 zM 192.00,320.00L 192.00,128.00L 320.00,224.00 	z" />
-<glyph unicode="&#x002e;" d="M 288.00,352.00L 64.00,352.00 c-17.601,0.00-32.00-14.399-32.00-32.00l0.00-192.00 c0.00-17.60, 14.399-32.00, 32.00-32.00l 224.00,0.00 c 17.601,0.00, 32.00,14.40, 32.00,32.00L 320.00,320.00
-		C 320.00,337.601, 305.601,352.00, 288.00,352.00zM 352.00,242.286L 352.00,205.715L 480.00,96.00L 480.00,352.00 	z" />
-<glyph unicode="&#x002f;" d="M 408.785,305.925C 312.002,377.854, 278.652,435.434, 256.002,479.999l0.00,0.00C 256.00,479.999, 256.00,480.00, 256.00,480.00l0.00-0.001
-	c-22.648-44.565-56.00-102.146-152.783-174.074c-165.018-122.643-9.688-293.834, 126.879-199.612
-	c-8.898-58.465-39.265-101.086-70.104-119.441L 159.992-32.00 l 96.008,0.00 l 96.008,0.00 l0.00,18.87 c-30.841,18.354-61.205,60.977-70.106,119.442
-	C 418.47,12.089, 573.802,183.282, 408.785,305.925z" />
-<glyph unicode="&#x0030;" d="M 393.416,283.614c-29.516,0.00-56.043-12.298-74.926-32.347c-7.998-8.492-21.881-18.556-36.90-27.405
-	c 7.055,26.934, 29.338,60.85, 44.814,75.728c 19.82,19.085, 31.992,45.915, 31.992,75.75C 358.399,432.787, 312.658,479.388, 256.002,480.00
-	c-56.66-0.611-102.398-47.213-102.398-104.659c0.00-29.836, 12.172-56.665, 31.993-75.75c 15.477-14.878, 37.76-48.794, 44.814-75.728
-	c-15.021,8.85-28.903,18.913-36.90,27.405c-18.884,20.049-45.41,32.347-74.925,32.347c-57.193,0.00-103.54-46.832-103.54-104.664
-	c0.00-57.819, 46.346-104.669, 103.54-104.669c 29.521,0.00, 56.041,12.678, 74.925,32.726c 8.402,8.936, 23.222,20.069, 39.146,29.316
-	c-1.501-73.846-36.766-128.084-72.659-149.453L 159.998-32.00 l 96.005,0.00 l 96.002,0.00 l0.00,18.87 c-35.896,21.368-71.16,75.608-72.66,149.453
-	c 15.926-9.247, 30.744-20.384, 39.146-29.316c 18.883-20.047, 45.404-32.726, 74.926-32.726c 57.193,0.00, 103.539,46.85, 103.539,104.669
-	C 496.955,236.782, 450.61,283.614, 393.416,283.614z" />
-<glyph unicode="&#x0031;" d="M 256.00,480.00L 96.00,224.00L 256.00-32.00L 416.00,224.00 z" />
-<glyph unicode="&#x0032;" d="M 224.00,288.00L 96.00-32.00l 48.596,0.00 L 256.00,65.479L 367.406-32.00L 416.00-32.00 L 288.00,288.00L 224.00,288.00 z M 149.024,14.395l 42.871,107.179l 39.81-34.833
-			L 149.024,14.395z M 362.978,14.396l-82.68,72.344l 39.809,34.833L 362.978,14.396z M 256.00,108.00l-51.507,45.068L 245.665,256.00l 20.67,0.00
-			l 41.173-102.932L 256.00,108.00zM 366.871,415.999C 377.764,397.172, 384.00,375.314, 384.00,352.00s-6.236-45.172-17.129-63.999l 27.72-16.00
-			C 408.204,295.535, 416.00,322.856, 416.00,352.00s-7.796,56.465-21.409,79.999L 366.871,415.999zM 145.128,288.001C 134.238,306.828, 128.00,328.686, 128.00,352.00s 6.236,45.172, 17.128,63.999L 117.41,431.998
-			C 103.796,408.464, 96.00,381.144, 96.00,352.00s 7.796-56.464, 21.41-79.999L 145.128,288.001zM 34.252,480.00C 12.47,442.345,0.00,398.629,0.00,352.00s 12.47-90.345, 34.252-127.999l 27.719,16.00C 42.911,272.948, 32.00,311.199, 32.00,352.00
-			S 42.911,431.052, 61.971,464.00L 34.252,480.00zM 512.00,352.00c0.00,46.63-12.47,90.346-34.253,128.00l0.00,0.00L 450.03,464.00C 469.09,431.052, 480.00,392.801, 480.00,352.00s-10.91-79.053-29.971-112.00
-			l 27.718-16.00l0.00,0.00C 499.531,261.654, 512.00,305.37, 512.00,352.00zM 224.00,352.00A32.00,32.00 4860.00 1,0 288.00,352A32.00,32.00 4860.00 1,0 224.00,352z" />
-<glyph unicode="&#x0033;" d="M 240.00,128.00c 44.183,0.00, 80.00,35.817, 80.00,80.00L 320.00,400.00 c0.00,44.183-35.817,80.00-80.00,80.00s-80.00-35.817-80.00-80.00l0.00-192.00 C 160.00,163.817, 195.818,128.00, 240.00,128.00zM 352.00,256.00l0.00-48.00 c0.00-61.855-50.145-112.00-112.00-112.00c-61.856,0.00-112.00,50.145-112.00,112.00l0.00,48.00 L 96.00,256.00 l0.00-48.00 c0.00-74.119, 56.002-135.15, 128.00-143.11L 224.00,0.00
-		l-64.00,0.00 l0.00-32.00 l 64.00,0.00 l 32.00,0.00 l 64.00,0.00 l0.00,32.00 l-64.00,0.00 l0.00,64.89 c 71.997,7.96, 128.00,68.991, 128.00,143.11l0.00,48.00 L 352.00,256.00 z" />
-<glyph unicode="&#x0034;" d="M 384.00,416.00c-49.179,0.00-94.03-18.498-128.00-48.905C 222.031,397.502, 177.179,416.00, 128.00,416.00S 33.969,397.502,0.00,367.096l0.00-8.596 l0.00-38.49 l0.00-192.004
-	L0.00,87.50 l0.00-6.576 c 0.342-0.306, 0.676-0.62, 1.02-0.924c 8.209-7.244, 17.04-13.798, 26.406-19.569c 9.43,7.631, 19.739,14.216, 30.761,19.569
-	c 21.098,10.248, 44.783,16.00, 69.813,16.00s 48.716-5.752, 69.813-16.00c 11.021-5.354, 21.331-11.938, 30.761-19.569
-	c 1.842-1.491, 3.65-3.022, 5.424-4.592c 8.108-7.178, 15.488-15.159, 22.002-23.83c 6.515,8.671, 13.894,16.652, 22.002,23.83
-	c 1.773,1.569, 3.581,3.101, 5.424,4.592c 9.43,7.631, 19.739,14.216, 30.761,19.569c 21.098,10.248, 44.783,16.00, 69.813,16.00
-	s 48.716-5.752, 69.813-16.00c 11.021-5.354, 21.331-11.938, 30.761-19.569c 9.366,5.771, 18.196,12.325, 26.405,19.569
-	c 0.344,0.304, 0.679,0.618, 1.021,0.924L 512.00,87.50 l0.00,40.506 L 512.00,320.01 L 512.00,358.50 l0.00,8.596 C 478.031,397.502, 433.179,416.00, 384.00,416.00z M 128.00,128.00
-	c-34.976,0.00-67.758-9.365-96.00-25.705L 32.00,352.007 C 58.741,372.095, 91.98,384.00, 128.00,384.00c 36.025,0.00, 69.258-11.919, 96.00-32.013l0.00-249.692
-	C 195.758,118.635, 162.976,128.00, 128.00,128.00z M 384.00,128.00c-34.976,0.00-67.758-9.365-96.00-25.705L 288.00,351.987 C 314.742,372.081, 347.976,384.00, 384.00,384.00
-	c 36.021,0.00, 69.259-11.906, 96.00-31.994l0.00-249.712 C 451.758,118.635, 418.976,128.00, 384.00,128.00z" />
-<glyph unicode="&#x0035;" d="M 449.735,374.562l-75.173,87.703C 365.751,472.542, 349.534,480.00, 336.00,480.00L 80.00,480.00 C 62.355,480.00, 48.00,465.645, 48.00,448.00l0.00-448.00 c0.00-17.645, 14.355-32.00, 32.00-32.00
-	l 352.00,0.00 c 17.645,0.00, 32.00,14.355, 32.00,32.00L 464.00,336.00 C 464.00,348.702, 458.00,364.92, 449.735,374.562z M 352.00,459.633c 4.142-2.112, 7.88-4.826, 10.413-7.781
-	l 75.174-87.704c 2.65-3.092, 5.07-7.469, 6.913-12.148L 352.00,352.00 L 352.00,459.633 z M 448.00,0.00c0.00-8.80-7.20-16.00-16.00-16.00L 80.00-16.00 c-8.80,0.00-16.00,7.20-16.00,16.00L 64.00,448.00
-	c0.00,8.80, 7.20,16.00, 16.00,16.00l 256.00,0.00 l0.00-128.00 l 112.00,0.00 L 448.00,0.00 z" />
-<glyph unicode="&#x0036;" d="M 352.00,480.00L 32.00,480.00 l0.00-512.00 l 448.00,0.00 L 480.00,352.00 L 352.00,480.00z M 448.00,0.00L 64.00,0.00 L 64.00,448.00 l 288.00,0.00 l0.00-96.00 l 96.00,0.00 L 448.00,0.00 z" />
-<glyph unicode="&#x0037;" d="M 256.00-32.00L 256.00,192.00L 32.00,192.00 	zM 32.00,480.00L 32.00,224.00L 288.00,224.00L 288.00-32.00L 480.00-32.00L 480.00,480.00 	z" />
-<glyph unicode="&#x0038;" d="M 224.00,288.00L 416.00,288.00L 416.00,256.00L 224.00,256.00zM 224.00,224.00L 416.00,224.00L 416.00,192.00L 224.00,192.00zM 224.00,160.00L 416.00,160.00L 416.00,128.00L 224.00,128.00zM 224.00,96.00L 352.00,96.00L 352.00,64.00L 224.00,64.00zM 480.00,384.00l-96.00,0.00 L 384.00,448.00 c0.00,17.60-14.40,32.00-32.00,32.00L 32.00,480.00 C 14.40,480.00,0.00,465.60,0.00,448.00l0.00-352.00 c0.00-17.60, 14.40-32.00, 32.00-32.00l 96.00,0.00 l0.00-64.00 c0.00-17.60, 14.40-32.00, 32.00-32.00l 320.00,0.00
-		c 17.60,0.00, 32.00,14.40, 32.00,32.00L 512.00,352.00 C 512.00,369.60, 497.60,384.00, 480.00,384.00z M 128.00,352.00l0.00-240.00 L 48.00,112.00 L 48.00,432.00 l 288.00,0.00 l0.00-48.00 L 160.00,384.00 C 142.40,384.00, 128.00,369.60, 128.00,352.00z M 464.00,16.00L 176.00,16.00
-		L 176.00,336.00 l 288.00,0.00 L 464.00,16.00 z" />
-<glyph unicode="&#x0039;" d="M 492.25,352.00L 19.75,352.00 c-13.20,0.00-21.882-10.59-19.293-23.534l 58.836-272.932C 61.882,42.59, 74.80,32.00, 88.00,32.00l 336.00,0.00
-		c 13.20,0.00, 26.118,10.59, 28.707,23.534l 58.836,272.932C 514.132,341.41, 505.45,352.00, 492.25,352.00zM 448.00,392.00c0.00,13.255-10.745,24.00-24.00,24.00L 208.00,416.00 l-16.00,32.00L 88.00,448.00 c-13.255,0.00-24.00-10.745-24.00-24.00l0.00-56.00 l 384.00,0.00 L 448.00,392.00 z" />
-<glyph unicode="&#x003a;" d="M 492.25,352.00L 448.00,352.00 L 448.00,392.00 c0.00,13.255-10.745,24.00-24.00,24.00L 208.00,416.00 l-16.00,32.00L 88.00,448.00 c-13.255,0.00-24.00-10.745-24.00-24.00l0.00-72.00 L 19.75,352.00
-	c-13.20,0.00-21.882-10.59-19.293-23.534l 58.836-272.932C 61.882,42.59, 74.80,32.00, 88.00,32.00l 336.00,0.00 c 13.20,0.00, 26.118,10.59, 28.707,23.534
-	l 58.836,272.932C 514.132,341.41, 505.45,352.00, 492.25,352.00z M 96.00,416.00l 76.223,0.00 l 16.00-32.00L 416.00,384.00 l0.00-32.00 L 96.00,352.00 L 96.00,416.00 z M 421.797,64.00L 90.203,64.00 L 35.017,320.00l 441.966,0.00
-	L 421.797,64.00z" />
-<glyph unicode="&#x003b;" d="M 288.00,480.00L0.00,192.00l 224.00-224.00l 288.00,288.00L 512.00,480.00 L 288.00,480.00 z M 416.00,337.60c-25.626,0.00-46.399,20.773-46.399,46.40S 390.374,430.40, 416.00,430.40
-	s 46.40-20.773, 46.40-46.40S 441.626,337.60, 416.00,337.60z" />
-<glyph unicode="&#x003c;" d="M 64.00,16.00A48.00,48.00 3060.00 1,0 160.00,16A48.00,48.00 3060.00 1,0 64.00,16zM 384.00,16.00A48.00,48.00 3060.00 1,0 480.00,16A48.00,48.00 3060.00 1,0 384.00,16zM 480.00,224.00L 480.00,416.00 L 64.00,416.00 C 64.00,451.346, 35.347,480.00,0.00,480.00l0.00-32.00 c 17.645,0.00, 32.00-14.355, 32.00-32.00l 24.037-206.027C 41.39,198.244, 32.00,180.223, 32.00,160.00
-		c0.00-35.347, 28.654-64.00, 64.00-64.00l 384.00,0.00 l0.00,32.00 L 96.00,128.00 c-17.673,0.00-32.00,14.327-32.00,32.00c0.00,0.11, 0.007,0.218, 0.008,0.328L 480.00,224.00z" />
-<glyph unicode="&#x003d;" d="M 406.494,288.00L 317.573,403.765C 319.134,407.535, 320.00,411.666, 320.00,416.00c0.00,17.673-14.326,32.00-32.00,32.00c-17.673,0.00-32.00-14.327-32.00-32.00
-	s 14.327-32.00, 32.00-32.00c 1.421,0.00, 2.816,0.102, 4.188,0.282L 366.144,288.00L 145.857,288.00 l 73.956,96.282C 221.184,384.102, 222.58,384.00, 224.00,384.00
-	c 17.673,0.00, 32.00,14.327, 32.00,32.00s-14.327,32.00-32.00,32.00s-32.00-14.327-32.00-32.00c0.00-4.334, 0.866-8.465, 2.427-12.234L 105.506,288.00L0.00,288.00 l0.00-64.00 l 32.00,0.00 l 32.00-256.00l 384.00,0.00
-	l 32.00,256.00l 32.00,0.00 l0.00,64.00 L 406.494,288.00 z M 160.00,32.00L 96.00,32.00 l0.00,64.00 l 64.00,0.00 L 160.00,32.00 z M 160.00,160.00L 96.00,160.00 l0.00,64.00 l 64.00,0.00 L 160.00,160.00 z M 288.00,32.00l-64.00,0.00 l0.00,64.00 l 64.00,0.00 L 288.00,32.00 z M 288.00,160.00l-64.00,0.00 l0.00,64.00 l 64.00,0.00 L 288.00,160.00 z
-	 M 416.00,32.00l-64.00,0.00 l0.00,64.00 l 64.00,0.00 L 416.00,32.00 z M 416.00,160.00l-64.00,0.00 l0.00,64.00 l 64.00,0.00 L 416.00,160.00 z" />
-<glyph unicode="&#x003e;" d="M 192.00,480.00L 32.00,480.00 C 14.40,480.00,0.00,465.60,0.00,448.00l0.00-160.00 c0.00-17.60, 14.398-32.00, 32.00-32.00l 160.00,0.00 c 17.60,0.00, 32.00,14.40, 32.00,32.00L 224.00,448.00 C 224.00,465.60, 209.60,480.00, 192.00,480.00z M 192.00,352.00
-		L 32.00,352.00 L 32.00,384.00 l 160.00,0.00 L 192.00,352.00 zM 480.00,480.00L 320.00,480.00 c-17.602,0.00-32.00-14.40-32.00-32.00l0.00-448.00 c0.00-17.60, 14.398-32.00, 32.00-32.00l 160.00,0.00 c 17.60,0.00, 32.00,14.40, 32.00,32.00L 512.00,448.00 C 512.00,465.60, 497.60,480.00, 480.00,480.00z
-		 M 480.00,160.00L 320.00,160.00 l0.00,32.00 l 160.00,0.00 L 480.00,160.00 z M 480.00,256.00L 320.00,256.00 l0.00,32.00 l 160.00,0.00 L 480.00,256.00 zM 192.00,192.00L 32.00,192.00 C 14.40,192.00,0.00,177.60,0.00,160.00l0.00-160.00 c0.00-17.60, 14.398-32.00, 32.00-32.00l 160.00,0.00 c 17.60,0.00, 32.00,14.40, 32.00,32.00L 224.00,160.00 C 224.00,177.60, 209.60,192.00, 192.00,192.00
-		z M 192.00,64.00l-64.00,0.00 l0.00-64.00 L 96.00,0.00 l0.00,64.00 L 32.00,64.00 l0.00,32.00 l 64.00,0.00 l0.00,64.00 l 32.00,0.00 l0.00-64.00 l 64.00,0.00 L 192.00,64.00 z" />
-<glyph unicode="&#x003f;" d="M 256.00,480.00C 114.615,480.00,0.00,365.385,0.00,224.00s 114.615-256.00, 256.00-256.00s 256.00,114.615, 256.00,256.00S 397.385,480.00, 256.00,480.00z M 160.00,224.00
-	c0.00,53.02, 42.98,96.00, 96.00,96.00s 96.00-42.98, 96.00-96.00s-42.98-96.00-96.00-96.00S 160.00,170.98, 160.00,224.00z M 462.99,138.262L 462.99,138.262l-88.71,36.745
-	C 380.539,190.099, 384.00,206.645, 384.00,224.00s-3.461,33.901-9.72,48.993l 61.063,25.293l 27.647,11.452C 473.944,283.327, 480.00,254.373, 480.00,224.00
-	C 480.00,193.627, 473.943,164.673, 462.99,138.262L 462.99,138.262z M 341.739,430.99L 341.739,430.99L 341.739,430.99l-36.745-88.71
-	C 289.902,348.539, 273.356,352.00, 256.00,352.00s-33.901-3.461-48.993-9.72l-17.23,41.599l-19.515,47.112C 196.673,441.943, 225.628,448.00, 256.00,448.00
-	C 286.373,448.00, 315.327,441.943, 341.739,430.99z M 49.01,309.738l 47.112-19.515l 41.599-17.23C 131.462,257.901, 128.00,241.355, 128.00,224.00
-	s 3.461-33.901, 9.72-48.993l-88.71-36.745C 38.057,164.673, 32.00,193.627, 32.00,224.00C 32.00,254.373, 38.057,283.327, 49.01,309.738z
-	 M 170.262,17.01l 11.452,27.647l 25.293,61.063C 222.099,99.461, 238.645,96.00, 256.00,96.00s 33.901,3.461, 48.993,9.72l 36.745-88.71l0.00,0.00l0.00,0.00
-	C 315.327,6.058, 286.373,0.00, 256.00,0.00C 225.628,0.00, 196.673,6.057, 170.262,17.01z" />
-<glyph unicode="&#x0040;" d="M 321.788,108.854c-11.188-6.236-20.175-2.064-32.764,4.572c-11.46,8.748-45.402,35.438-81.226,71.188
-		c-26.156,33.084-46.162,64.288-55.375,79.293c-0.625,1.66-0.944,2.632-0.944,2.632c-5.397,13.476-8.771,22.92-1.324,33.521
-		c 6.854,9.727, 9.50,12.383, 18.24,20.108L 80.605,450.292c-10.604-7.728-27.018-25.106-40.509-44.378
-		c-12.538-18.317-23.154-38.587-26.049-53.055c 15.295-55.117, 52.258-157.896, 120.583-231.325l-0.021-0.308
-		C 200.339,40.198, 304.774-10.204, 360.18-32.00c 14.679,1.385, 35.938,9.844, 55.456,20.404c 20.598,11.415, 39.567,25.945, 48.329,35.685
-		L 343.677,124.918C 335.08,117.008, 332.179,114.664, 321.788,108.854zM 205.61,351.342c 7.241,5.302, 5.313,14.944, 1.926,20.245L 140.957,473.50c-4.344,5.291-13.396,8.064-21.252,5.579L 92.272,460.698
-		l 88.034-129.879L 205.61,351.342zM 492.949,82.154l-94.473,76.788c-4.93,3.918-14.313,6.838-20.325,0.188l-23.046-23.05l 120.047-101.015l 21.136,25.357
-		C 499.573,67.986, 497.755,77.279, 492.949,82.154z" />
-<glyph unicode="&#x0041;" d="M 325.608,214.818L 512.00,86.264L 512.00,382.211 	zM0.00,382.211L0.00,86.264L 186.388,214.836 	zM 256.00,152.309L 211.499,192.264L0.00,64.00L 512.00,64.00L 300.495,192.264 	zM 496.64,384.00L 15.36,384.00L 256.00,203.074 	z" />
-<glyph unicode="&#x0042;" d="M 256.00,480.00c-81.67,0.00-147.871-66.202-147.871-147.87c0.00-2.014, 0.061-4.101, 0.16-6.224c 0.05-1.234, 0.126-2.454, 0.209-3.682
-	c 0.051-0.779, 0.113-1.574, 0.18-2.371c 0.104-1.304, 0.21-2.61, 0.35-3.906C 121.292,196.493, 256.001-32.00, 256.001-32.00
-	s 134.705,228.492, 146.97,347.948c 0.143,1.295, 0.245,2.603, 0.351,3.905c 0.065,0.797, 0.131,1.592, 0.183,2.371
-	c 0.084,1.229, 0.158,2.447, 0.21,3.683c 0.097,2.124, 0.157,4.211, 0.157,6.224C 403.866,413.799, 337.666,480.00, 256.00,480.00z M 320.00,320.00
-	c0.00-35.347-28.654-64.00-64.00-64.00c-35.346,0.00-64.00,28.653-64.00,64.00s 28.654,64.00, 64.00,64.00C 291.346,384.00, 320.00,355.347, 320.00,320.00z" />
-<glyph unicode="&#x0043;" d="M 256.00,480.00C 114.615,480.00,0.00,365.385,0.00,224.00s 114.615-256.00, 256.00-256.00s 256.00,114.615, 256.00,256.00S 397.385,480.00, 256.00,480.00z M 256.00,0.00
-		C 132.288,0.00, 32.00,100.288, 32.00,224.00S 132.288,448.00, 256.00,448.00s 224.00-100.288, 224.00-224.00S 379.712,0.00, 256.00,0.00zM 128.00,96.00l 169.373,79.17L 384.00,352.00l-173.255-82.745L 128.00,96.00z M 256.00,256.00c 17.673,0.00, 32.00-14.327, 32.00-32.00c0.00-17.673-14.327-32.00-32.00-32.00
-		c-17.673,0.00-32.00,14.327-32.00,32.00C 224.00,241.673, 238.327,256.00, 256.00,256.00z" />
-<glyph unicode="&#x0044;" d="M 256.00,352.00L 256.00,192.00L 384.00,192.00L 384.00,224.00L 288.00,224.00L 288.00,352.00 	zM 288.00,448.00C 164.288,448.00, 64.00,347.712, 64.00,224.00L0.00,224.00 l 80.00-96.00l 80.00,96.00L 96.00,224.00 c0.00,106.039, 85.961,192.00, 192.00,192.00c 106.039,0.00, 192.00-85.961, 192.00-192.00
-		c0.00-106.039-85.961-192.00-192.00-192.00c-10.904,0.00-21.592,0.923-32.00,2.67l0.00-32.385 c 10.453-1.495, 21.134-2.285, 32.00-2.285
-		c 123.712,0.00, 224.00,100.288, 224.00,224.00S 411.712,448.00, 288.00,448.00z" />
-<glyph unicode="&#x0045;" d="M 240.00,448.00C 107.452,448.00,0.00,340.548,0.00,208.00c0.00-132.549, 107.452-240.00, 240.00-240.00c 132.549,0.00, 240.00,107.451, 240.00,240.00
-		C 480.00,340.548, 372.549,448.00, 240.00,448.00z M 240.00,0.00c-114.875,0.00-208.00,93.125-208.00,208.00S 125.125,416.00, 240.00,416.00s 208.00-93.125, 208.00-208.00
-		S 354.875,0.00, 240.00,0.00zM 256.00,253.258L 256.00,384.00 l-32.00,0.00 l0.00-130.742 c-18.641-6.59-32.00-24.36-32.00-45.258c0.00-26.51, 21.49-48.00, 48.00-48.00c 20.898,0.00, 38.667,13.359, 45.258,32.00
-		L 384.00,192.00 l0.00,32.00 l-98.742,0.00 C 280.438,237.635, 269.636,248.437, 256.00,253.258z" />
-<glyph unicode="&#x0046;" d="M 512.00,64.00c-53.021,0.00-96.00,42.98-96.00,96.00L 416.00,302.545 c0.00,70.369-54.971,129.064-128.00,142.542L 288.00,480.00 l-64.00,0.00 l0.00-34.912
-	C 150.968,431.609, 96.00,372.915, 96.00,302.546L 96.00,160.00 c0.00-53.02-42.981-96.00-96.00-96.00l0.00-32.00 l 214.799,0.00 c-2.604-5.712-4.055-12.059-4.055-18.745
-	C 210.744-11.738, 231.006-32.00, 256.00-32.00c 24.992,0.00, 45.255,20.262, 45.255,45.255c0.00,6.688-1.451,13.033-4.056,18.745L 512.00,32.00 L 512.00,64.00 z" />
-<glyph unicode="&#x0047;" d="M 512.00,64.00c-53.021,0.00-96.00,42.98-96.00,96.00L 416.00,302.545 c0.00,70.37-54.971,129.064-128.00,142.543L 288.00,480.00 l-64.00,0.00 l0.00-34.912
-	C 150.969,431.609, 96.00,372.915, 96.00,302.545L 96.00,160.00 c0.00-53.02-42.981-96.00-96.00-96.00l0.00-32.00 l 214.799,0.00 c-2.604-5.712-4.054-12.06-4.054-18.745
-	C 210.745-11.739, 231.006-32.00, 256.00-32.00c 24.993,0.00, 45.255,20.261, 45.255,45.255c0.00,6.687-1.452,13.033-4.055,18.745L 512.00,32.00 L 512.00,64.00 z M 352.00,160.00
-	l-32.00-32.00l-64.00,64.00l-64.00-64.00l-32.00,32.00l 64.00,64.00l-64.00,64.00l 32.00,32.00l 64.00-64.00l 64.00,64.00l 32.00-32.00l-64.00-64.00L 352.00,160.00z" />
-<glyph unicode="&#x0048;" d="M 512.00,64.00c-53.02,0.00-96.00,42.98-96.00,96.00L 416.00,302.546 c0.00,70.369-54.97,129.064-128.00,142.542L 288.00,480.00 l-64.00,0.00 l0.00-34.912
-	C 150.97,431.61, 96.00,372.915, 96.00,302.546L 96.00,160.00 c0.00-53.02-42.98-96.00-96.00-96.00l0.00-32.00 l 214.80,0.00 c-2.604-5.712-4.055-12.059-4.055-18.745
-	C 210.745-11.738, 231.007-32.00, 256.00-32.00c 24.994,0.00, 45.255,20.262, 45.255,45.255c0.00,6.688-1.451,13.033-4.054,18.745L 512.00,32.00 L 512.00,64.00 z M 224.00,128.00
-	l-96.00,96.00l 32.00,32.00l 64.00-64.00l 128.00,128.00l 32.00-32.00L 224.00,128.00z" />
-<glyph unicode="&#x0049;" d="M 160.00,288.00L 224.00,288.00L 224.00,224.00L 160.00,224.00zM 256.00,288.00L 320.00,288.00L 320.00,224.00L 256.00,224.00zM 352.00,288.00L 416.00,288.00L 416.00,224.00L 352.00,224.00zM 64.00,96.00L 128.00,96.00L 128.00,32.00L 64.00,32.00zM 160.00,96.00L 224.00,96.00L 224.00,32.00L 160.00,32.00zM 256.00,96.00L 320.00,96.00L 320.00,32.00L 256.00,32.00zM 160.00,192.00L 224.00,192.00L 224.00,128.00L 160.00,128.00zM 256.00,192.00L 320.00,192.00L 320.00,128.00L 256.00,128.00zM 352.00,192.00L 416.00,192.00L 416.00,128.00L 352.00,128.00zM 64.00,192.00L 128.00,192.00L 128.00,128.00L 64.00,128.00zM 416.00,480.00l0.00-32.00 l-64.00,0.00 L 352.00,480.00 L 128.00,480.00 l0.00-32.00 L 64.00,448.00 L 64.00,480.00 L0.00,480.00 l0.00-512.00 l 480.00,0.00 L 480.00,480.00 L 416.00,480.00 z M 448.00,0.00L 32.00,0.00 L 32.00,352.00 l 416.00,0.00 L 448.00,0.00 z" />
-<glyph unicode="&#x004a;" d="M 320.00,440.571L 320.00,288.00 L 192.00,288.00 L 192.00,440.571 C 144.201,429.454, 96.00,403.976, 96.00,352.00l0.00-212.00 c0.00-77.318, 71.634-140.00, 160.00-140.00c 88.363,0.00, 160.00,62.682, 160.00,140.00
-		L 416.00,352.00 C 416.00,403.976, 367.799,429.454, 320.00,440.571zM 288.00,446.067C 276.277,447.421, 265.321,448.00, 256.00,448.00c-9.32,0.00-20.276-0.579-32.00-1.933L 224.00,320.00 l 64.00,0.00 L 288.00,446.067 z" />
-<glyph unicode="&#x004b;" d="M 512.00,64.00L 512.00,448.00 L0.00,448.00 l0.00-384.00 l 224.00,0.00 l0.00-32.00 l-96.00,0.00 l0.00-32.00 l 256.00,0.00 l0.00,32.00 l-96.00,0.00 l0.00,32.00 L 512.00,64.00 z M 64.00,384.00l 384.00,0.00 l0.00-256.00 L 64.00,128.00 L 64.00,384.00 z" />
-<glyph unicode="&#x004c;" d="M 448.00,128.00L 448.00,384.00 c0.00,17.60-14.40,32.00-32.00,32.00L 96.00,416.00 c-17.60,0.00-32.00-14.40-32.00-32.00l0.00-256.00 L0.00,128.00 l0.00-96.00 l 512.00,0.00 l0.00,96.00 L 448.00,128.00 z M 320.00,64.00L 192.00,64.00 l0.00,32.00 l 128.00,0.00 L 320.00,64.00 z M 416.00,128.00L 96.00,128.00
-	L 96.00,383.943 c 0.017,0.02, 0.038,0.041, 0.057,0.057l 319.885,0.00 c 0.02-0.017, 0.041-0.038, 0.058-0.058L 416.00,128.00 z" />
-<glyph unicode="&#x004d;" d="M 384.00,480.00L 96.00,480.00 C 78.40,480.00, 64.00,465.601, 64.00,448.00l0.00-448.00 c0.00-17.60, 14.399-32.00, 32.00-32.00l 288.00,0.00 c 17.60,0.00, 32.00,14.40, 32.00,32.00L 416.00,448.00 C 416.00,465.601, 401.60,480.00, 384.00,480.00z
-	 M 240.00-8.891c-13.746,0.00-24.891,11.145-24.891,24.891s 11.145,24.891, 24.891,24.891s 24.891-11.145, 24.891-24.891
-	S 253.746-8.891, 240.00-8.891z M 384.00,64.00L 96.00,64.00 L 96.00,416.00 l 288.00,0.00 L 384.00,64.00 z" />
-<glyph unicode="&#x004e;" d="M 416.00,480.00L 96.00,480.00 C 78.40,480.00, 64.00,465.60, 64.00,448.00l0.00-448.00 c0.00-17.60, 14.40-32.00, 32.00-32.00l 320.00,0.00 c 17.60,0.00, 32.00,14.40, 32.00,32.00L 448.00,448.00 C 448.00,465.60, 433.60,480.00, 416.00,480.00z M 256.00-16.00
-	c-8.837,0.00-16.00,7.163-16.00,16.00s 7.163,16.00, 16.00,16.00s 16.00-7.163, 16.00-16.00S 264.837-16.00, 256.00-16.00z M 384.00,32.00L 128.00,32.00 L 128.00,416.00 l 256.00,0.00 L 384.00,32.00 z" />
-<glyph unicode="&#x004f;" d="M 336.00,480.00c-8.837,0.00-16.00-7.163-16.00-16.00l0.00-48.00 L 144.00,416.00 c-8.836,0.00-16.00-7.163-16.00-16.00l0.00-416.00 c0.00-8.836, 7.164-16.00, 16.00-16.00l 192.00,0.00 c 8.837,0.00, 16.00,7.164, 16.00,16.00L 352.00,464.00
-	C 352.00,472.837, 344.837,480.00, 336.00,480.00z M 192.00,0.00l-32.00,0.00 l0.00,32.00 l 32.00,0.00 L 192.00,0.00 z M 192.00,64.00l-32.00,0.00 l0.00,32.00 l 32.00,0.00 L 192.00,64.00 z M 192.00,128.00l-32.00,0.00 l0.00,32.00 l 32.00,0.00 L 192.00,128.00 z M 256.00,0.00l-32.00,0.00 l0.00,32.00 l 32.00,0.00 L 256.00,0.00 z
-	 M 256.00,64.00l-32.00,0.00 l0.00,32.00 l 32.00,0.00 L 256.00,64.00 z M 256.00,128.00l-32.00,0.00 l0.00,32.00 l 32.00,0.00 L 256.00,128.00 z M 320.00,0.00l-32.00,0.00 l0.00,32.00 l 32.00,0.00 L 320.00,0.00 z M 320.00,64.00l-32.00,0.00 l0.00,32.00 l 32.00,0.00 L 320.00,64.00 z M 320.00,128.00l-32.00,0.00 l0.00,32.00 l 32.00,0.00 L 320.00,128.00 z
-	 M 320.00,208.00c0.00-8.836-7.163-16.00-16.00-16.00L 176.00,192.00 c-8.836,0.00-16.00,7.164-16.00,16.00L 160.00,368.00 c0.00,8.837, 7.164,16.00, 16.00,16.00l 128.00,0.00 c 8.837,0.00, 16.00-7.163, 16.00-16.00L 320.00,208.00 z" />
-<glyph unicode="&#x0050;" d="M 352.00,384.00L 160.00,384.00 L0.00,192.00l0.00-80.00 l0.00-48.00 c0.00-17.673, 14.327-32.00, 32.00-32.00l 448.00,0.00 c 17.674,0.00, 32.00,14.327, 32.00,32.00l0.00,48.00 l0.00,80.00 L 352.00,384.00z M 384.00,192.00l-64.00-64.00L 192.00,128.00
-	l-64.00,64.00L 41.655,192.00 l 133.333,160.00l 162.024,0.00 l 133.333-160.00L 384.00,192.00 z" />
-<glyph unicode="&#x0051;" d="M 352.00,384.00L 160.00,384.00 L0.00,192.00l0.00-128.00 c0.00-17.673, 14.327-32.00, 32.00-32.00l 448.00,0.00 c 17.674,0.00, 32.00,14.327, 32.00,32.00L 512.00,192.00 L 352.00,384.00z M 320.00,128.00L 192.00,128.00 l-32.00,32.00l 192.00,0.00
-		L 320.00,128.00z M 41.655,192.00l 133.333,160.00l 162.024,0.00 l 133.333-160.00L 41.655,192.00 zM 142.482,288.00L 369.518,288.00L 342.851,320.00L 169.148,320.00 	zM 89.149,224.00L 422.852,224.00L 396.185,256.00L 115.815,256.00 	z" />
-<glyph unicode="&#x0052;" d="M 416.00,448.00L 96.00,448.00 L0.00,352.00l0.00-336.00 c0.00-8.837, 7.163-16.00, 16.00-16.00l 480.00,0.00 c 8.836,0.00, 16.00,7.163, 16.00,16.00L 512.00,352.00 L 416.00,448.00z M 256.00,64.00L 96.00,192.00l 96.00,0.00 l0.00,96.00 l 128.00,0.00 l0.00-96.00 l 96.00,0.00
-	L 256.00,64.00z M 77.255,384.00l 32.00,32.00l 293.489,0.00 l 32.00-32.00L 77.255,384.00 z" />
-<glyph unicode="&#x0053;" d="M 416.00,448.00L 96.00,448.00 L0.00,352.00l0.00-336.00 c0.00-8.837, 7.163-16.00, 16.00-16.00l 480.00,0.00 c 8.836,0.00, 16.00,7.163, 16.00,16.00L 512.00,352.00 L 416.00,448.00z M 320.00,160.00l0.00-96.00 L 192.00,64.00 l0.00,96.00 L 96.00,160.00 l 160.00,128.00
-	l 160.00-128.00L 320.00,160.00 z M 77.255,384.00l 32.00,32.00l 293.488,0.00 l 32.00-32.00L 77.255,384.00 z" />
-<glyph unicode="&#x0054;" d="M 256.00,480.00C 114.614,480.00,0.00,444.184,0.00,400.00l0.00-64.00 c0.00-44.183, 114.611-80.00, 256.00-80.00c 141.385,0.00, 256.00,35.817, 256.00,80.00L 512.00,400.00 C 512.00,444.184, 397.385,480.00, 256.00,480.00
-		zM 255.193,224.00C 140.566,224.00, 43.94,247.543, 11.32,280.00C 3.705,272.423,0.00,264.361,0.00,256.00l0.00-64.00 c0.00-44.184, 114.611-80.00, 256.00-80.00
-		c 141.385,0.00, 256.00,35.816, 256.00,80.00l0.00,64.00 c0.00,8.361-4.516,16.423-12.131,24.00C 467.25,247.543, 369.82,224.00, 255.193,224.00zM 255.193,80.00C 140.566,80.00, 43.94,103.544, 11.32,136.00C 3.705,128.424,0.00,120.361,0.00,112.00l0.00-64.00 c0.00-44.183, 114.611-80.00, 256.00-80.00
-		c 141.385,0.00, 256.00,35.817, 256.00,80.00l0.00,64.00 c0.00,8.361-4.516,16.424-12.131,24.00C 467.25,103.544, 369.82,80.00, 255.193,80.00z" />
-<glyph unicode="&#x0055;" d="M 380.931-32.00C 437.794,71.016, 447.375,228.153, 224.00,222.912L 224.00,96.00 L 32.00,288.00L 224.00,480.00l0.00-124.186
-	C 491.481,362.785, 521.285,119.707, 380.931-32.00z" />
-<glyph unicode="&#x0056;" d="M 288.00,355.814L 288.00,480.00 l 192.00-192.00L 288.00,96.00L 288.00,222.912 C 64.625,228.153, 74.206,71.016, 131.07-32.00
-	C-9.286,119.707, 20.52,362.785, 288.00,355.814z" />
-<glyph unicode="&#x0057;" d="M 131.07,480.00C 74.206,376.984, 64.625,219.848, 288.00,225.088L 288.00,352.00 l 192.00-192.00L 288.00-32.00L 288.00,92.186 C 20.52,85.215-9.286,328.293, 131.07,480.00z" />
-<glyph unicode="&#x0058;" d="M 224.00,92.186L 224.00-32.00 L 32.00,160.00l 192.00,192.00l0.00-126.912 C 447.375,219.848, 437.794,376.984, 380.931,480.00
-	C 521.286,328.293, 491.481,85.215, 224.00,92.186z" />
-<glyph unicode="&#x0059;" d="M 429.406,480.00C 486.27,376.984, 511.375,219.848, 288.00,225.088L 288.00,352.00 L 96.00,160.00l 192.00-192.00L 288.00,92.186 C 512.00,92.186, 569.762,328.293, 429.406,480.00
-		zM 192.00,306.745L 192.00,352.00L0.00,160.00L 192.00-32.00L 192.00,13.255L 45.255,160.00 	z" />
-<glyph unicode="&#x005a;" d="M 255.993,471.963C 114.606,471.963, 0.001,385.424, 0.001,278.684c0.00-83.391, 69.951-154.469, 167.963-181.565
-	c 1.438-8.104, 3.25-19.646, 3.25-26.787c0.00-33.625-12.867-65.518-35.788-94.295c 35.444,14.928, 85.475,62.898, 116.473,109.432
-	c 1.367-0.016, 2.729-0.084, 4.095-0.084c 141.40,0.00, 256.007,86.539, 256.007,193.299C 512.002,385.424, 397.395,471.963, 255.993,471.963z" />
-<glyph unicode="&#x005b;" d="M 512.00,176.00c0.00,31.984-26.282,59.581-64.259,72.383c-3.818-58.182-51.143-108.229-119.261-133.935
-		c 12.653-7.509, 27.651-13.072, 44.103-16.029c 11.884-27.769, 30.681-54.436, 53.733-71.93c-12.468,24.473-13.195,48.944-8.824,70.484
-		C 471.038,102.973, 512.00,136.068, 512.00,176.00zM 416.00,256.00c0.00,70.692-85.961,128.00-192.00,128.00C 117.962,384.00, 32.00,326.692, 32.00,256.00c0.00-52.637, 47.664-97.845, 115.781-117.509
-		c 10.66-26.364, 16.668-61.164-1.062-95.967c 26.945,20.448, 48.081,53.424, 59.146,86.048C 211.837,128.199, 217.883,128.00, 224.00,128.00
-		C 330.039,128.00, 416.00,185.308, 416.00,256.00z" />
-<glyph unicode="&#x005c;" d="M 464.00,480.00L 48.00,480.00 C 21.60,480.00,0.00,458.40,0.00,432.00l0.00-320.00 c0.00-26.40, 21.60-48.00, 48.00-48.00l 112.00,0.00 l 96.00-96.00l 96.00,96.00l 112.00,0.00 c 26.40,0.00, 48.00,21.60, 48.00,48.00L 512.00,432.00
-	C 512.00,458.40, 490.401,480.00, 464.00,480.00z" />
-<glyph unicode="&#x005d;" d="M 464.00,352.00L 176.00,352.00 c-26.40,0.00-48.00-21.60-48.00-48.00l0.00-224.00 c0.00-26.40, 21.60-48.00, 48.00-48.00l 80.00,0.00 l 64.00-64.00l 64.00,64.00l 80.00,0.00 c 26.40,0.00, 48.00,21.60, 48.00,48.00L 512.00,304.00
-		C 512.00,330.40, 490.401,352.00, 464.00,352.00zM 384.00,432.00c0.00,26.40-21.60,48.00-48.00,48.00L 48.00,480.00 C 21.60,480.00,0.00,458.40,0.00,432.00l0.00-224.00 c0.00-26.40, 21.60-48.00, 48.00-48.00l 16.00,0.00 L 64.00,368.00 c0.00,26.51, 21.49,48.00, 48.00,48.00l 272.00,0.00 L 384.00,432.00 z" />
-<glyph unicode="&#x005e;" d="M 480.00,416.00L 32.00,416.00 C 14.40,416.00,0.00,401.60,0.00,384.00l0.00-224.00 c0.00-17.60, 14.40-32.00, 32.00-32.00l 64.00,0.00 l0.00-96.00 l 72.00,96.00l 312.00,0.00 c 17.60,0.00, 32.00,14.40, 32.00,32.00L 512.00,384.00
-	C 512.00,401.60, 497.60,416.00, 480.00,416.00z" />
-<glyph unicode="&#x005f;" d="M 480.00,416.00L 32.00,416.00 C 14.40,416.00,0.00,401.60,0.00,384.00l0.00-224.00 c0.00-17.60, 14.40-32.00, 32.00-32.00l 64.00,0.00 l0.00-96.00 l 72.00,96.00l 312.00,0.00 c 17.60,0.00, 32.00,14.40, 32.00,32.00L 512.00,384.00
-	C 512.00,401.60, 497.60,416.00, 480.00,416.00z M 160.00,224.00L 96.00,224.00 l0.00,64.00 l 64.00,0.00 L 160.00,224.00 z M 288.00,224.00l-64.00,0.00 l0.00,64.00 l 64.00,0.00 L 288.00,224.00 z M 416.00,224.00l-64.00,0.00 l0.00,64.00 l 64.00,0.00 L 416.00,224.00 z" />
-<glyph unicode="&#x0060;" d="M 128.00,320.00A128.00,128.00 4860.00 1,0 384.00,320A128.00,128.00 4860.00 1,0 128.00,320zM 384.00,160.00L 128.00,160.00 C 57.308,160.00,0.00,102.691,0.00,32.00l0.00-32.00 l 4.033,0.00 l 503.934,0.00 L 512.00,0.00 l0.00,32.00 C 512.00,102.691, 454.692,160.00, 384.00,160.00z" />
-<glyph unicode="&#x0061;" d="M 311.413,128.632c-11.055,1.759-11.307,32.157-11.307,32.157s 32.484,32.158, 39.564,75.401
-	c 19.045,0.00, 30.809,45.973, 11.761,62.148C 352.226,315.365, 375.911,432.00, 256.00,432.00c-119.911,0.00-96.225-116.635-95.432-133.662
-	c-19.047-16.175-7.285-62.148, 11.761-62.148c 7.079-43.243, 39.564-75.401, 39.564-75.401s-0.252-30.398-11.307-32.157
-	C 164.976,122.966, 32.00,64.315, 32.00,0.00l 224.00,0.00 l 224.00,0.00 C 480.00,64.315, 347.024,122.966, 311.413,128.632z" />
-<glyph unicode="&#x0062;" d="M 160.00,384.00A96.00,96.00 3060.00 1,0 352.00,384A96.00,96.00 3060.00 1,0 160.00,384zM 384.039,256.00l-0.078,0.00 l-17.634,0.00 l-99.552-202.122L 304.00,240.00l-48.00,48.00l-48.00-48.00l 37.225-186.122L 145.674,256.00l-17.635,0.00 l-0.077,0.00
-		C 64.00,256.00, 64.00,213.007, 64.00,160.00l0.00-160.00 l 384.00,0.00 L 448.00,160.00 C 448.00,213.007, 448.00,256.00, 384.039,256.00z" />
-<glyph unicode="&#x0063;" d="M 364.496,224.00C 433.373,267.667, 480.00,351.604, 480.00,448.00c0.00,10.838-0.596,21.517-1.739,32.00L 33.74,480.00 C 32.595,469.516, 32.00,458.837, 32.00,448.00
-		c0.00-96.396, 46.627-180.333, 115.503-224.00C 78.627,180.333, 32.00,96.396, 32.00,0.00c0.00-10.838, 0.595-21.517, 1.739-32.00l 444.521,0.00
-		c 1.144,10.483, 1.739,21.162, 1.739,32.00C 480.00,96.396, 433.373,180.333, 364.496,224.00z M 80.00,0.00c0.00,93.456, 40.081,172.707, 112.00,198.854
-		l0.00,50.293 l0.00,0.00 C 120.081,275.292, 80.00,354.543, 80.00,448.00l0.00,0.00 l 352.00,0.00 l0.00,0.00 c0.00-93.457-40.081-172.708-112.00-198.853l0.00-50.293
-		C 391.919,172.707, 432.00,93.456, 432.00,0.00L 80.00,0.00 zM 309.813,145.203c-35.827,20.322-37.804,46.684-37.813,62.683L 272.00,240.00 c0.00,15.997, 1.902,42.457, 37.872,62.832
-		c 19.252,11.182, 35.904,28.174, 48.524,49.168L 153.605,352.00 c 12.633-21.016, 29.306-38.021, 48.583-49.203
-		c 35.827-20.322, 37.803-46.683, 37.813-62.683L 240.001,208.00 c0.00-15.996-1.902-42.457-37.872-62.832c-36.311-21.09-63.369-62.842-71.545-113.168
-		l 250.835,0.00 C 373.237,82.354, 346.154,124.124, 309.813,145.203z" />
-<glyph unicode="&#x0064;" d="M 192.00,416.00A64.00,64.00 4860.00 1,0 320.00,416A64.00,64.00 4860.00 1,0 192.00,416zM 327.765,359.765A64.00,64.00 4860.00 1,0 455.765,359.765A64.00,64.00 4860.00 1,0 327.765,359.765zM 416.00,224.00A32.00,32.00 4860.00 1,0 480.00,224A32.00,32.00 4860.00 1,0 416.00,224zM 359.765,88.235A32.00,32.00 4860.00 1,0 423.765,88.23500000000001A32.00,32.00 4860.00 1,0 359.765,88.23500000000001zM 224.001,32.00A32.00,32.00 4860.00 1,0 288.001,32A32.00,32.00 4860.00 1,0 224.001,32zM 88.236,88.235A32.00,32.00 4860.00 1,0 152.236,88.23500000000001A32.00,32.00 4860.00 1,0 88.236,88.23500000000001zM 72.236,359.765A48.00,48.00 4860.00 1,0 168.236,359.765A48.00,48.00 4860.00 1,0 72.236,359.765zM 28.00,224.00A36.00,36.00 4860.00 1,0 100.00,224A36.00,36.00 4860.00 1,0 28.00,224z" />
-<glyph unicode="&#x0065;" d="M 512.00,224.00c-0.639,33.431-7.892,66.758-21.288,97.231c-13.352,30.50-32.731,58.129-56.521,80.96
-	c-23.776,22.848-51.972,40.91-82.492,52.826C 321.197,466.979, 288.401,472.693, 256.00,472.00c-32.405-0.641-64.666-7.687-94.167-20.678
-	c-29.524-12.948-56.271-31.735-78.367-54.788c-22.112-23.041-39.58-50.354-51.093-79.899C 20.816,287.104, 15.309,255.375, 16.00,224.00
-	c 0.643-31.38, 7.482-62.574, 20.067-91.103c 12.544-28.55, 30.738-54.414, 53.055-75.774c 22.305-21.377, 48.736-38.252, 77.307-49.36
-	C 194.988-3.389, 225.652-8.688, 256.00-8.00c 30.354,0.645, 60.481,7.277, 88.038,19.457c 27.575,12.141, 52.558,29.74, 73.183,51.322
-	c 20.641,21.57, 36.922,47.118, 47.627,74.715c 6.517,16.729, 10.94,34.20, 13.271,51.899c 0.623-0.036, 1.249-0.06, 1.881-0.06
-	c 17.673,0.00, 32.00,14.326, 32.00,32.00c0.00,0.898-0.047,1.786-0.119,2.666L 512.00,223.999 z M 461.153,139.026c-11.736-26.601-28.742-50.70-49.589-70.59
-	c-20.835-19.905-45.50-35.593-72.122-45.895C 312.828,12.202, 284.297,7.315, 256.00,8.00c-28.302,0.649-56.298,6.868-81.91,18.237
-	c-25.625,11.333-48.842,27.745-67.997,47.856c-19.169,20.099-34.264,43.882-44.161,69.529C 51.997,169.264, 47.318,196.729, 48.00,224.00
-	c 0.651,27.276, 6.664,54.206, 17.627,78.845c 10.929,24.65, 26.749,46.985, 46.123,65.405c 19.365,18.434, 42.265,32.935, 66.937,42.428
-	C 203.356,420.208, 229.755,424.681, 256.00,424.00c 26.25-0.653, 52.114-6.459, 75.781-17.017c 23.676-10.525, 45.128-25.751, 62.812-44.391
-	c 17.698-18.629, 31.605-40.647, 40.695-64.344C 444.412,274.552, 448.679,249.219, 448.00,224.00l 0.119,0.00 c-0.072-0.88-0.119-1.768-0.119-2.666
-	c0.00-16.506, 12.496-30.087, 28.543-31.812C 473.431,172.111, 468.278,155.113, 461.153,139.026z" />
-<glyph unicode="&#x0066;" d="M 440.698,8.064L 313.486,194.95c-3.336,4.914-10.234,6.433-15.325,3.379l-16.069-9.668
-		c-5.087-3.05-6.992-9.845-4.229-15.111l 105.281-200.064c 2.763-5.252, 9.177-7.056, 14.271-3.99l 40.101,24.093
-		C 442.608-3.356, 444.033,3.149, 440.698,8.064zM 296.322,213.939c 48.104,30.646, 50.188,110.532, 4.747,181.875c-38.64,60.653-97.389,92.75-143.688,82.201
-		c-10.647-2.086-24.247-7.761-37.93-16.475c-13.683-8.721-24.604-18.643-30.979-27.432C 59.346,396.604, 63.617,329.806, 102.25,269.17
-		c 45.45-71.346, 118.727-103.23, 166.844-72.58l 27.22,17.346L 296.322,213.939z M 278.977,241.169
-		c-31.746-20.215-87.728,8.487-122.253,62.704c-34.536,54.196-36.891,117.063-5.14,137.293c 31.722,20.217, 87.719-8.50, 122.243-62.708
-		C 308.357,324.269, 310.704,261.392, 278.977,241.169z" />
-<glyph unicode="&#x0067;" d="M 449.077,10.754l-114.54,168.305c 65.459,51.835, 83.963,145.677, 39.835,219.126
-		C 326.445,477.959, 222.559,503.857, 142.793,455.94C 63.028,408.007, 37.131,304.124, 85.054,224.357
-		c 43.213-71.942, 131.962-100.047, 207.479-69.717l 95.143-180.783c 2.95-5.611, 9.802-7.523, 15.229-4.273l 42.784,25.72
-		C 451.126-1.433, 452.653,5.518, 449.077,10.754z M 288.781,212.968c-54.211-32.563-124.808-14.959-157.375,39.253
-		c-32.565,54.197-14.952,124.794, 39.253,157.36c 54.189,32.57, 124.787,14.961, 157.351-39.245
-		C 360.579,316.138, 342.978,245.525, 288.781,212.968z" />
-<glyph unicode="&#x0068;" d="M 192.00,384.00L 160.00,384.00L 160.00,320.00L 96.00,320.00L 96.00,288.00L 160.00,288.00L 160.00,224.00L 192.00,224.00L 192.00,288.00L 256.00,288.00L 256.00,320.00L 192.00,320.00 	zM 318.771,201.076C 339.674,230.021, 352.00,265.568, 352.00,304.00C 352.00,401.202, 273.202,480.00, 176.00,480.00S0.00,401.202,0.00,304.00s 78.798-176.00, 176.00-176.00
-		c 38.432,0.00, 73.979,12.326, 102.924,33.229L 448.00-32.00l 64.00,64.00L 318.771,201.076z M 176.00,176.00c-70.692,0.00-128.00,57.308-128.00,128.00S 105.308,432.00, 176.00,432.00
-		s 128.00-57.308, 128.00-128.00S 246.693,176.00, 176.00,176.00z" />
-<glyph unicode="&#x0069;" d="M 96.00,320.00L 256.00,320.00L 256.00,288.00L 96.00,288.00zM 318.771,201.076C 339.674,230.021, 352.00,265.568, 352.00,304.00C 352.00,401.202, 273.202,480.00, 176.00,480.00S0.00,401.202,0.00,304.00s 78.798-176.00, 176.00-176.00
-		c 38.432,0.00, 73.979,12.326, 102.924,33.229L 448.00-32.00l 64.00,64.00L 318.771,201.076z M 176.00,176.00c-70.692,0.00-128.00,57.308-128.00,128.00S 105.308,432.00, 176.00,432.00
-		s 128.00-57.308, 128.00-128.00S 246.693,176.00, 176.00,176.00z" />
-<glyph unicode="&#x006a;" d="M 352.00,480.00c-88.365,0.00-160.00-71.634-160.00-160.00c0.00-10.013, 0.929-19.808, 2.688-29.312L0.00,96.00l0.00-96.00 c0.00-17.673, 14.327-32.00, 32.00-32.00
-	l 32.00,0.00 l0.00,32.00 l 64.00,0.00 l0.00,64.00 l 64.00,0.00 l0.00,64.00 l 64.00,0.00 l 41.521,41.521C 314.526,163.363, 332.869,160.00, 352.00,160.00c 88.365,0.00, 160.00,71.634, 160.00,160.00S 440.365,480.00, 352.00,480.00z
-	 M 399.937,319.937c-26.51,0.00-48.00,21.49-48.00,48.00s 21.49,48.00, 48.00,48.00s 48.00-21.49, 48.00-48.00S 426.447,319.937, 399.937,319.937z" />
-<glyph unicode="&#x006b;" d="M 501.066,322.879l-50.553,50.552c-12.396,12.397-32.685,32.684-45.081,45.082l-50.553,50.552
-	c-12.396,12.397-34.477,14.583-49.065,4.858L 167.595,381.777c-14.588-9.726-20.109-30.514-12.268-46.195l 35.243-70.487
-	c 1.077-2.153, 2.323-4.448, 3.695-6.83L 16.00,80.00L0.00-32.00l 96.00,0.00 l0.00,32.00 l 64.00,0.00 l0.00,64.00 l 64.00,0.00 l0.00,64.00l 64.00,0.00 l0.00,35.593 c 3.198-1.906, 6.267-3.608, 9.096-5.022
-	l 70.485-35.244c 15.683-7.841, 36.47-2.319, 46.195,12.269l 92.147,138.22C 515.65,288.402, 513.462,310.481, 501.066,322.879z
-	 M 75.314,52.687l-22.627,22.627l 155.786,155.785l 22.627-22.627L 75.314,52.687z M 458.51,268.118l-22.628-22.628
-	c-6.223-6.222-16.404-6.222-22.627,0.00L 277.49,381.255c-6.223,6.222-6.223,16.405,0.00,22.627l 22.628,22.628
-	c 6.223,6.222, 16.404,6.222, 22.627,0.00L 458.51,290.745C 464.733,284.523, 464.733,274.34, 458.51,268.118z" />
-<glyph unicode="&#x006c;" d="M 304.00,256.00l-16.00,0.00 l0.00,64.00 c0.00,70.692-57.308,128.00-128.00,128.00S 32.00,390.692, 32.00,320.00l0.00-64.00 L 16.00,256.00 c-8.80,0.00-16.00-7.20-16.00-16.00l0.00-224.00 c0.00-8.80, 7.20-16.00, 16.00-16.00l 288.00,0.00
-	c 8.80,0.00, 16.00,7.20, 16.00,16.00L 320.00,240.00 C 320.00,248.80, 312.80,256.00, 304.00,256.00z M 186.465,135.959L 192.00,64.00l-64.00,0.00 l 5.535,71.959
-	C 120.561,144.551, 112.00,159.272, 112.00,176.00c0.00,26.51, 21.49,48.00, 48.00,48.00s 48.00-21.49, 48.00-48.00C 208.00,159.272, 199.439,144.551, 186.465,135.959z M 64.00,256.00
-	l0.00,64.00 c0.00,53.02, 42.98,96.00, 96.00,96.00s 96.00-42.98, 96.00-96.00l0.00-64.00 L 64.00,256.00 z" />
-<glyph unicode="&#x006d;" d="M 384.00,448.00c-70.692,0.00-128.00-57.308-128.00-128.00l0.00-64.00 L 16.00,256.00 c-8.80,0.00-16.00-7.20-16.00-16.00l0.00-224.00 c0.00-8.80, 7.20-16.00, 16.00-16.00l 288.00,0.00 c 8.80,0.00, 16.00,7.20, 16.00,16.00L 320.00,240.00
-	c0.00,8.80-7.20,16.00-16.00,16.00l-16.00,0.00 l0.00,64.00 c0.00,53.02, 42.98,96.00, 96.00,96.00s 96.00-42.98, 96.00-96.00l0.00-64.00 l 32.00,0.00 l0.00,64.00 C 512.00,390.692, 454.693,448.00, 384.00,448.00z M 186.465,135.959
-	L 192.00,64.00l-64.00,0.00 l 5.535,71.959C 120.561,144.551, 112.00,159.272, 112.00,176.00c0.00,26.51, 21.49,48.00, 48.00,48.00s 48.00-21.49, 48.00-48.00
-	C 208.00,159.272, 199.439,144.551, 186.465,135.959z" />
-<glyph unicode="&#x006e;" d="M 507.882,411.883L 448.00,352.00l-64.00,64.00l 59.882,59.883C 435.057,478.557, 425.698,480.00, 416.00,480.00c-53.021,0.00-96.00-42.98-96.00-96.00
-	c0.00-9.697, 1.442-19.057, 4.116-27.882L 123.882,155.883C 115.057,158.557, 105.698,160.00, 96.00,160.00c-53.021,0.00-96.00-42.98-96.00-96.00
-	c0.00-9.697, 1.442-19.058, 4.117-27.882L 64.00,96.00l 64.00-64.00l-59.883-59.882C 76.943-30.556, 86.302-32.00, 96.00-32.00c 53.02,0.00, 96.00,42.981, 96.00,96.00
-	c0.00,9.698-1.444,19.059-4.118,27.883l 200.234,200.235C 396.943,289.444, 406.302,288.00, 416.00,288.00c 53.02,0.00, 96.00,42.981, 96.00,96.00
-	C 512.00,393.698, 510.556,403.058, 507.882,411.883z" />
-<glyph unicode="&#x006f;" d="M 144.00,320.00L 80.00,320.00 c-8.80,0.00-16.00-7.20-16.00-16.00l0.00-32.00 c0.00-8.80, 7.20-16.00, 16.00-16.00l 64.00,0.00 c 8.80,0.00, 16.00,7.20, 16.00,16.00l0.00,32.00 C 160.00,312.80, 152.80,320.00, 144.00,320.00zM 96.00,416.00L 128.00,416.00L 128.00,336.00L 96.00,336.00zM 96.00,240.00L 128.00,240.00L 128.00,32.00L 96.00,32.00zM 272.00,192.00l-64.00,0.00 c-8.80,0.00-16.00-7.20-16.00-16.00l0.00-32.00 c0.00-8.80, 7.20-16.00, 16.00-16.00l 64.00,0.00 c 8.801,0.00, 16.00,7.20, 16.00,16.00l0.00,32.00 C 288.00,184.80, 280.801,192.00, 272.00,192.00zM 224.001,416.00L 256.001,416.00L 256.001,208.00L 224.001,208.00zM 224.001,112.00L 256.001,112.00L 256.001,32.00L 224.001,32.00zM 400.00,288.00l-64.00,0.00 c-8.799,0.00-16.00-7.20-16.00-16.00l0.00-32.00 c0.00-8.80, 7.201-16.00, 16.00-16.00l 64.00,0.00 c 8.801,0.00, 16.00,7.20, 16.00,16.00l0.00,32.00 C 416.00,280.80, 408.801,288.00, 400.00,288.00zM 352.00,416.00L 384.00,416.00L 384.00,304.00L 352.00,304.00zM 352.00,208.00L 384.00,208.00L 384.00,32.00L 352.00,32.00zM 440.00,480.00L 40.00,480.00 C 17.944,480.00,0.00,462.056,0.00,440.00l0.00-432.00 c0.00-22.056, 17.944-40.00, 40.00-40.00l 400.00,0.00 c 22.056,0.00, 40.00,17.944, 40.00,40.00L 480.00,440.00
-		C 480.00,462.056, 462.056,480.00, 440.00,480.00z M 448.00,8.00c0.00-4.40-3.60-8.00-8.00-8.00L 40.00,0.00 c-4.40,0.00-8.00,3.60-8.00,8.00L 32.00,440.00 c0.00,4.40, 3.60,8.00, 8.00,8.00l 400.00,0.00 c 4.40,0.00, 8.00-3.60, 8.00-8.00L 448.00,8.00 z" />
-<glyph unicode="&#x0070;" d="M 466.895,174.875c-26.863,46.527-10.708,106.152, 36.076,133.244l-50.313,87.146c-14.375-8.427-31.088-13.259-48.923-13.259
-	c-53.768,0.00-97.354,43.873-97.354,97.995L 205.752,480.001 c 0.133-16.705-4.037-33.641-12.979-49.126
-	c-26.862-46.528-86.578-62.351-133.431-35.379L 9.03,308.35c 14.485-8.236, 27.025-20.294, 35.943-35.739
-	c 26.819-46.454, 10.756-105.96-35.854-133.112l 50.313-87.146c 14.325,8.348, 30.958,13.127, 48.70,13.127
-	c 53.598,0.00, 97.072-43.596, 97.35-97.479l 100.627,0.00 c-0.043,16.537, 4.136,33.285, 12.983,48.609
-	c 26.818,46.453, 86.388,62.297, 133.207,35.506l 50.313,87.145C 488.222,147.494, 475.766,159.51, 466.895,174.875z M 256.00,120.334
-	c-57.254,0.00-103.668,46.412-103.668,103.667c0.00,57.254, 46.413,103.667, 103.668,103.667c 57.254,0.00, 103.666-46.413, 103.666-103.667
-	C 359.665,166.746, 313.254,120.334, 256.00,120.334z" />
-<glyph unicode="&#x0071;" d="M 224.00,192.00L 224.00,416.00 C 100.288,416.00,0.00,315.712,0.00,192.00s 100.288-224.00, 224.00-224.00s 224.00,100.288, 224.00,224.00c0.00,36.017-8.514,70.042-23.618,100.191
-		L 224.00,192.00zM 456.382,356.191C 419.606,429.599, 343.695,480.00, 256.00,480.00l0.00-224.00 L 456.382,356.191z" />
-<glyph unicode="&#x0072;" d="M0.00,64.00L 512.00,64.00L 512.00,0.00L0.00,0.00zM 64.00,192.00L 128.00,192.00L 128.00,96.00L 64.00,96.00zM 160.00,320.00L 224.00,320.00L 224.00,96.00L 160.00,96.00zM 256.00,224.00L 320.00,224.00L 320.00,96.00L 256.00,96.00zM 352.00,416.00L 416.00,416.00L 416.00,96.00L 352.00,96.00z" />
-<glyph unicode="&#x0073;" d="M 32.00,128.00L 96.00,128.00L 96.00-32.00L 32.00-32.00zM 160.00,192.00L 224.00,192.00L 224.00-32.00L 160.00-32.00zM 288.00,224.00L 352.00,224.00L 352.00-32.00L 288.00-32.00zM 416.00,320.00L 480.00,320.00L 480.00-32.00L 416.00-32.00zM 384.00,480.00L 416.00,448.00L 288.00,320.00L 224.00,384.00L 32.00,192.00L 64.00,160.00L 224.00,320.00L 288.00,256.00L 448.00,416.00L 480.00,384.00L 480.00,480.00 	z" />
-<glyph unicode="&#x0074;" d="M 320.00,320.00l 96.00,64.00L 320.00,480.00l-60.00-140.00L 224.00,448.00l-96.00-64.00l 80.00-64.00L 32.00,320.00 l0.00-128.00 l 32.00,0.00 l0.00-224.00 l 384.00,0.00 L 448.00,192.00 l 32.00,0.00 L 480.00,320.00 L 320.00,320.00 z M 328.096,437.963l 50.233-50.233
-	l-100.467-66.978L 328.096,437.963z M 211.168,410.601l 28.364-85.092l-70.91,56.728L 211.168,410.601z M 224.00,0.00L 96.00,0.00 L 96.00,208.00 l 128.00,0.00 L 224.00,0.00 z M 224.00,224.00
-	L 64.00,224.00 l0.00,64.00 l 160.00,0.00 L 224.00,224.00 z M 416.00,0.00L 288.00,0.00 L 288.00,208.00 l 128.00,0.00 L 416.00,0.00 z M 448.00,224.00L 288.00,224.00 l0.00,64.00 l 160.00,0.00 L 448.00,224.00 z" />
-<glyph unicode="&#x0075;" d="M 512.00,448.00c-32.00,0.00-160.00,0.00-160.00,0.00l0.00-64.00 L 160.00,384.00 L 160.00,448.00 c0.00,0.00-128.00,0.00-160.00,0.00c0.00-160.00, 128.00-347.188, 224.00-376.00l0.00-40.00 c-32.00,0.00-64.00-16.00-64.00-32.00l 192.00,0.00 c0.00,16.00-32.00,32.00-64.00,32.00
-	l0.00,40.00 C 384.00,100.812, 512.00,288.00, 512.00,448.00z M 383.85,366.773L 384.00,384.00L 384.00,416.00 l 94.227,0.00 c-2.787-25.839-8.855-53.128-18.14-81.495
-	c-12.272-37.499-30.058-75.91-51.433-111.082c-20.559-33.826-43.896-63.859-67.488-86.852c-2.266-2.208-4.521-4.336-6.765-6.391
-	C 376.819,215.238, 382.961,321.678, 383.85,366.773z M 170.834,136.572c-23.593,22.992-46.93,53.025-67.488,86.852
-	c-21.375,35.172-39.161,73.583-51.433,111.082C 42.629,362.872, 36.56,390.161, 33.773,416.00L 128.00,416.00 l0.00-32.00 l 0.15-17.227
-	c 0.889-45.096, 7.031-151.535, 49.448-236.592C 175.355,132.236, 173.099,134.364, 170.834,136.572z" />
-<glyph unicode="&#x0076;" d="M 64.00,416.00L0.00,352.00L 128.00,352.00 	zM 256.00,352.00L 192.00,416.00L 128.00,352.00 	zM 256.001,352.00L 384.00,352.00L 320.00,416.00 	zM 512.00,352.00L 448.00,416.00L 384.00,352.00 	zM 320.00,416.00L 448.00,416.00L 416.00,448.00L 96.00,448.00L 64.00,416.00L 192.00,416.00 	zM 256.00,0.00L 112.00,288.00L 198.40,288.00L 256.00,0.00L 313.60,288.00L 400.00,288.00L 256.00,0.00L 512.00,320.00L0.00,320.00 	z" />
-<glyph unicode="&#x0077;" d="M 423.555,258.812c 0.033,2.533, 0.049,5.076, 0.049,7.626c0.00,30.532-93.227,55.284-208.225,55.284
-		c-114.997,0.00-208.223-24.752-208.223-55.284C 7.156,101.615, 73.546-32.00, 215.379-32.00c 83.413,0.00, 140.723,46.225, 173.788,117.818
-		c 3.338-0.27, 6.699-0.457, 10.119-0.457c 58.297,0.00, 105.559,39.356, 105.559,87.904C 504.844,214.857, 470.153,249.679, 423.555,258.812z
-		 M 349.141,244.028c-36.689-8.652-84.195-13.417-133.762-13.417c-49.565,0.00-97.07,4.765-133.76,13.417
-		c-35.822,8.448-50.376,18.136-54.252,22.411c 3.876,4.275, 18.431,13.961, 54.252,22.409c 36.688,8.653, 84.193,13.419, 133.76,13.419
-		c 49.565,0.00, 97.071-4.767, 133.762-13.419c 35.822-8.448, 50.377-18.134, 54.254-22.409C 399.518,262.164, 384.963,252.477, 349.141,244.028
-		z M 398.268,107.787c 12.537,33.865, 20.355,72.30, 23.60,113.514c 30.50-6.246, 48.42-28.615, 48.42-51.395
-		C 470.285,140.523, 448.723,111.186, 398.268,107.787zM 255.689,353.922C 283.881,396.539, 206.377,442.352, 259.908,480.00c-44.528-2.943-52.161-30.188-40.935-51.461
-		C 229.63,408.348, 255.649,394.268, 255.689,353.922zM 233.163,325.499c 12.646,35.708-59.269,64.515-19.554,105.806c-37.209-10.992-36.253-41.592-20.227-58.701
-		C 204.951,360.25, 225.905,354.518, 233.163,325.499z" />
-<glyph unicode="&#x0078;" d="M 352.00,448.00L 192.00,288.00L 96.00,288.00 L0.00,160.00c0.00,0.00, 101.708,28.326, 161.033,15.042L0.00-32.00l 210.951,164.072C 240.37,64.745, 192.00-32.00, 192.00-32.00l 128.00,96.00
-	l0.00,96.00 l 160.00,160.00L 512.00,480.00L 352.00,448.00z" />
-<glyph unicode="&#x0079;" d="M 256.00,352.00C 114.615,352.00,0.00,237.386,0.00,96.00l 32.00,0.00 c0.00,58.209, 25.903,110.363, 66.811,145.574l 108.423-135.527
-	c-0.665-3.245-1.014-6.604-1.014-10.047c0.00-27.492, 22.287-49.779, 49.779-49.779c 27.493,0.00, 49.779,22.287, 49.779,49.779
-	s-22.286,49.781-49.779,49.781c-3.441,0.00-6.802-0.351-10.046-1.016L 111.979,251.947c 31.528,22.688, 70.213,36.054, 112.021,36.054
-	c 106.038,0.00, 192.00-85.96, 192.00-191.999l 96.00,0.00 C 512.00,237.386, 397.385,352.00, 256.00,352.00z" />
-<glyph unicode="&#x007a;" d="M 256.00,352.00C 114.615,352.00,0.00,237.386,0.00,96.00l 32.00,0.00 c0.00,106.039, 85.961,192.00, 192.00,192.00c 7.167,0.00, 14.241-0.396, 21.205-1.16l-16.586-149.264
-	c-13.494-8.904-22.399-24.199-22.399-41.576c0.00-27.492, 22.288-49.779, 49.78-49.779S 305.78,68.508, 305.78,96.00
-	c0.00,17.377-8.904,32.672-22.398,41.576l-16.172,145.542C 352.44,263.517, 416.00,187.182, 416.00,96.00l 96.00,0.00 C 512.00,237.386, 397.385,352.00, 256.00,352.00z" />
-<glyph unicode="&#x007b;" d="M 416.00,96.00l 96.00,0.00 c0.00,141.386-114.615,256.00-256.00,256.00S0.00,237.386,0.00,96.00l 32.00,0.00 c0.00,106.039, 85.961,192.00, 192.00,192.00
-	c 56.409,0.00, 107.136-24.326, 142.263-63.061l-100.217-80.174c-3.245,0.665-6.604,1.016-10.046,1.016
-	c-27.493,0.00-49.78-22.289-49.78-49.781s 22.287-49.779, 49.78-49.779c 27.492,0.00, 49.778,22.287, 49.778,49.779
-	c0.00,3.44-0.349,6.802-1.014,10.047l 78.166,97.707C 403.803,173.031, 416.00,135.941, 416.00,96.00z" />
-<glyph unicode="&#x007c;" d="M 256.00,480.00C 114.615,480.00,0.00,365.385,0.00,224.00s 114.615-256.00, 256.00-256.00s 256.00,114.615, 256.00,256.00S 397.385,480.00, 256.00,480.00z M 256.00,32.00
-		c-106.039,0.00-192.00,85.961-192.00,192.00c0.00,106.039, 85.961,192.00, 192.00,192.00c 106.039,0.00, 192.00-85.961, 192.00-192.00C 448.00,117.961, 362.039,32.00, 256.00,32.00zM 224.00,352.00A32.00,32.00 3060.00 1,0 288.00,352A32.00,32.00 3060.00 1,0 224.00,352zM 320.00,320.00A32.00,32.00 3060.00 1,0 384.00,320A32.00,32.00 3060.00 1,0 320.00,320zM 128.00,320.00A32.00,32.00 3060.00 1,0 192.00,320A32.00,32.00 3060.00 1,0 128.00,320zM 224.00,128.00L 224.00,96.00L 288.00,96.00L 288.00,128.00L 256.00,288.00 	z" />
-<glyph unicode="&#x007d;" d="M 160.504-32.00C 51.878,29.221, 23.279,87.168, 39.63,166.311c 12.071,58.44, 56.647,105.986, 60.437,164.314
-	c 16.884-30.726, 18.888-52.882, 20.775-84.99C 174.542,311.428, 230.231,399.478, 218.19,480.00c0.00,0.00, 133.808-64.00, 142.986-188.138
-	c 12.041,25.587, 12.041,66.225,0.00,92.563c 36.122-26.339, 253.609-260.16-22.577-416.425c 51.926,101.105, 13.396,237.527-76.761,300.533
-	c 6.021-27.092-1.505-97.832-41.391-142.232c 9.031,45.904-13.546,75.254-13.546,75.254s-7.402-41.555-36.122-83.533
-	C 144.553,79.689, 126.381,39.004, 160.504-32.00z" />
-<glyph unicode="&#xe000;" d="M 478.145,77.759L 320.00,341.271L 320.00,448.00 l 16.00,0.00 c 8.80,0.00, 16.00,7.20, 16.00,16.00s-7.20,16.00-16.00,16.00L 176.00,480.00 c-8.80,0.00-16.00-7.20-16.00-16.00s 7.20-16.00, 16.00-16.00l 16.00,0.00 l0.00-106.729
-	L 33.856,77.759C-2.365,17.392, 25.60-32.00, 96.00-32.00l 320.00,0.00 C 486.40-32.00, 514.365,17.392, 478.145,77.759z M 120.519,160.00L 224.00,332.469L 224.00,448.00 l 64.00,0.00
-	l0.00-115.531 L 391.482,160.00L 120.519,160.00 z" />
-<glyph unicode="&#xe001;" d="M 480.00,416.00L 320.00,416.00 L 320.00,464.00 c0.00,8.836-7.163,16.00-16.00,16.00l-96.00,0.00 c-8.836,0.00-16.00-7.164-16.00-16.00l0.00-48.00 L 32.00,416.00 L0.00,352.00l 64.00,0.00 l 32.00-384.00l 320.00,0.00 l 32.00,384.00l 64.00,0.00 L 480.00,416.00z M 224.00,32.00
-	l-64.00,0.00 L 160.00,320.00 l 64.00,0.00 L 224.00,32.00 z M 224.00,448.00l 64.00,0.00 l0.00-32.00 l-64.00,0.00 L 224.00,448.00 z M 352.00,32.00l-64.00,0.00 L 288.00,320.00 l 64.00,0.00 L 352.00,32.00 z" />
-<glyph unicode="&#xe002;" d="M 96.00-32.00L 416.00-32.00L 448.00,320.00L 64.00,320.00 	zM 320.00,416.00L 320.00,480.00 L 192.00,480.00 l0.00-64.00 L 32.00,416.00 l0.00-96.00 l 32.00,32.00l 384.00,0.00 l 32.00-32.00L 480.00,416.00 L 320.00,416.00 z M 288.00,416.00l-64.00,0.00 L 224.00,448.00 l 64.00,0.00 L 288.00,416.00 z" />
-<glyph unicode="&#xe003;" d="M 144.00,48.00c 8.837,0.00, 16.00,7.163, 16.00,16.00c0.00,0.003,0.00,0.007,0.00,0.01L 160.00,287.991 c0.00,0.003,0.00,0.006,0.00,0.01c0.00,8.836-7.164,16.00-16.00,16.00
-		c-8.836,0.00-16.00-7.164-16.00-16.00l0.00,0.00 l0.00-224.00 C 128.00,55.163, 135.164,48.00, 144.00,48.00zM 240.00,48.00c 8.837,0.00, 16.00,7.163, 16.00,16.00c0.00,0.003,0.00,0.007,0.00,0.01L 256.00,287.991 c0.00,0.003,0.00,0.006,0.00,0.01c0.00,8.836-7.164,16.00-16.00,16.00
-		c-8.836,0.00-16.00-7.164-16.00-16.00l0.00,0.00 l0.00-224.00 C 224.00,55.163, 231.164,48.00, 240.00,48.00zM 336.00,48.00c 8.837,0.00, 16.00,7.163, 16.00,16.00c0.00,0.003,0.00,0.007,0.00,0.01L 352.00,287.991 c0.00,0.003,0.00,0.006,0.00,0.01c0.00,8.836-7.163,16.00-16.00,16.00
-		c-8.836,0.00-16.00-7.164-16.00-16.00l0.00,0.00 l0.00-224.00 C 320.00,55.163, 327.164,48.00, 336.00,48.00zM 351.987,415.46C 351.99,415.64, 352.00,415.819, 352.00,416.00L 352.00,448.00 c0.00,17.60-14.40,32.00-32.00,32.00L 160.00,480.00 c-17.60,0.00-32.00-14.40-32.00-32.00l0.00-32.00
-		c0.00-0.181, 0.011-0.36, 0.014-0.54L0.00,415.46 L0.00,384.00 l 32.00,0.00 l0.00-352.00 c0.00-35.20, 28.80-64.00, 64.00-64.00l 288.00,0.00 c 35.20,0.00, 64.00,28.80, 64.00,64.00L 448.00,384.00 l 32.00,0.00 L 480.00,415.46 L 351.987,415.46 z M 160.00,447.943
-		c 0.017,0.02, 0.038,0.041, 0.057,0.057l 159.885,0.00 c 0.02-0.017, 0.041-0.038, 0.058-0.058l0.00-31.885 c-0.017-0.02-0.038-0.041-0.058-0.057
-		L 160.057,416.00 c-0.02,0.017-0.041,0.038-0.057,0.057L 160.00,447.943 z M 416.00,32.00c0.00-8.477-3.348-16.493-9.428-22.572
-		C 400.493,3.348, 392.477,0.00, 384.00,0.00L 96.00,0.00 c-8.477,0.00-16.493,3.348-22.573,9.428C 67.348,15.507, 64.00,23.523, 64.00,32.00L 64.00,384.00 l 352.00,0.00 L 416.00,32.00 z" />
-<glyph unicode="&#xe004;" d="M 464.00,320.00L 352.00,320.00 L 352.00,384.00 c0.00,17.60-14.40,32.00-32.00,32.00L 192.00,416.00 c-17.602,0.00-32.00-14.40-32.00-32.00l0.00-64.00 L 48.00,320.00 c-26.40,0.00-48.00-21.60-48.00-48.00l0.00-224.00 c0.00-26.40, 21.60-48.00, 48.00-48.00
-	l 416.00,0.00 c 26.398,0.00, 48.00,21.60, 48.00,48.00L 512.00,272.00 C 512.00,298.40, 490.401,320.00, 464.00,320.00z M 192.00,383.943c 0.016,0.02, 0.037,0.041, 0.058,0.057l 127.887,0.00
-	c 0.021-0.018, 0.04-0.038, 0.058-0.057L 320.003,320.00 L 192.00,320.00 L 192.00,383.943 z" />
-<glyph unicode="&#xe005;" d="M 480.00,352.00L 352.00,352.00 L 352.00,384.00 c0.00,17.60-14.40,32.00-32.00,32.00L 192.00,416.00 c-17.602,0.00-32.00-14.40-32.00-32.00l0.00-32.00 L 32.00,352.00 C 14.40,352.00,0.00,337.60,0.00,320.00l0.00-256.00
-	c0.00-17.601, 14.398-32.00, 32.00-32.00l 448.00,0.00 c 17.60,0.00, 32.00,14.399, 32.00,32.00L 512.00,320.00 C 512.00,337.60, 497.60,352.00, 480.00,352.00z M 192.00,383.942
-	c 0.017,0.02, 0.037,0.041, 0.057,0.058l 127.886,0.00 c 0.021-0.017, 0.041-0.038, 0.059-0.058L 320.002,352.00 L 192.00,352.00 L 192.00,383.942 z M 480.00,224.00l-64.00,0.00 l0.00-48.00
-	c0.00-8.801-7.20-16.00-16.00-16.00l-32.00,0.00 c-8.802,0.00-16.00,7.199-16.00,16.00l0.00,48.00 L 160.00,224.00 l0.00-48.00 c0.00-8.801-7.20-16.00-16.00-16.00l-32.00,0.00 c-8.801,0.00-16.00,7.199-16.00,16.00l0.00,48.00 L 32.00,224.00 l0.00,32.00 l 448.00,0.00
-	L 480.00,224.00 z" />
-<glyph unicode="&#xe006;" d="M 436.304,320.00L 352.00,448.00L 160.00,448.00 L 75.695,320.00L0.00,320.00 l0.00-224.00 l 64.00,0.00 l0.00-80.00 c0.00-8.80, 7.199-16.00, 16.00-16.00l 64.00,0.00 c 8.80,0.00, 16.00,7.20, 16.00,16.00l0.00,80.00 l 192.00,0.00 l0.00-80.00
-	c0.00-8.80, 7.198-16.00, 16.00-16.00l 64.00,0.00 c 8.80,0.00, 16.00,7.20, 16.00,16.00l0.00,80.00 l 64.00,0.00 L 512.00,320.00 L 436.304,320.00 z M 177.24,416.00l 157.519,0.00 l 63.228-96.00L 114.012,320.00 L 177.24,416.00z M 128.00,146.745
-	c-24.994,0.00-45.256,20.261-45.256,45.255s 20.263,45.254, 45.256,45.254c 24.992,0.00, 45.254-20.261, 45.254-45.254
-	C 173.255,167.006, 152.993,146.745, 128.00,146.745z M 384.00,146.745c-24.993,0.00-45.257,20.261-45.257,45.255s 20.263,45.254, 45.257,45.254
-	c 24.991,0.00, 45.255-20.261, 45.255-45.254C 429.255,167.006, 408.991,146.745, 384.00,146.745z" />
-<glyph unicode="&#xe007;" d="M 480.00,224.00c0.00,0.00-16.279,192.00-32.00,224.00S 320.00,480.00, 256.00,480.00S 79.72,480.00, 64.00,448.00S 32.00,224.00, 32.00,224.00l0.00-192.00 l 64.00,0.00 l0.00-32.00 c0.00-17.673, 14.327-32.00, 32.00-32.00
-	s 32.00,14.327, 32.00,32.00l0.00,32.00 l 192.00,0.00 l0.00-32.00 c0.00-17.673, 14.327-32.00, 32.00-32.00c 17.674,0.00, 32.00,14.327, 32.00,32.00l0.00,32.00 l 64.00,0.00 L 480.00,224.00 z M 160.00,448.00l 192.00,0.00 l0.00-32.00 L 160.00,416.00 L 160.00,448.00 z
-	 M 105.058,279.23c 6.083,53.329, 10.847,81.788, 13.844,96.464c 8.586,2.002, 23.196,4.479, 46.867,6.145C 196.495,384.00, 229.49,384.00, 256.00,384.00
-	s 59.505,0.00, 90.231-2.161c 23.671-1.665, 38.281-4.142, 46.867-6.145c 2.996-14.676, 7.761-43.136, 13.844-96.465
-	c 0.903-7.917, 1.759-15.718, 2.559-23.23L 102.499,255.999 C 103.299,263.512, 104.155,271.313, 105.058,279.23z M 128.00,113.60
-	c-25.626,0.00-46.40,20.773-46.40,46.40c0.00,25.626, 20.773,46.40, 46.40,46.40s 46.40-20.774, 46.40-46.40C 174.40,134.373, 153.627,113.60, 128.00,113.60z
-	 M 384.00,113.60c-25.627,0.00-46.399,20.773-46.399,46.40c0.00,25.626, 20.772,46.40, 46.399,46.40s 46.40-20.774, 46.40-46.40
-	C 430.401,134.373, 409.627,113.60, 384.00,113.60z" />
-<glyph unicode="&#xe008;" d="M 256.00,448.00L 32.00,352.00L 256.00,256.00L 480.00,352.00 	zM 32.00,64.00L 224.00-16.00L 224.00,208.00L 32.00,288.00 	zM 288.00-16.00L 480.00,64.00L 480.00,288.00L 288.00,208.00 	z" />
-<glyph unicode="&#xe009;" d="M 240.00,448.00L0.00,352.00l0.00-224.00 l 240.00-128.00l 240.00,128.00L 480.00,352.00 L 240.00,448.00z M 224.00,44.80L 32.00,147.20L 32.00,302.933 l 192.00-102.40L 224.00,44.80 z M 41.498,334.134L 240.00,413.535
-	l 198.502-79.401L 240.00,228.267L 41.498,334.134z M 448.00,147.20L 256.00,44.80L 256.00,200.533 l 192.00,102.40L 448.00,147.20 z" />
-<glyph unicode="&#xe00a;" d="M 472.037,344.543l-77.289,0.00 c-21.704,0.033-43.327,8.772-22.241,45.979C 393.634,427.804, 408.548,480.00, 323.729,480.00
-	c-84.816,0.00-69.901-52.195-48.774-89.478c 21.086-37.207-0.537-45.945-22.243-45.979l-77.29,0.00 c-18.051,0.00-32.819-14.771-32.819-32.818
-	l0.00-94.87 c0.00-21.746-8.701-43.492-45.98-22.367c-37.28,21.127-89.478,36.04-89.478-48.778c0.00-84.814, 52.196-69.90, 89.478-48.775
-	c 37.279,21.127, 45.98-0.619, 45.98-22.369l0.00-73.747 c0.00-18.053, 14.77-32.818, 32.819-32.818l 77.163,0.00 c 21.749,0.00, 43.495,8.701, 22.37,45.981
-	c-21.126,37.277-36.042,89.475, 48.774,89.475c 84.817,0.00, 69.903-52.195, 48.776-89.475C 351.38-23.299, 373.128-32.00, 394.875-32.00l 77.16,0.00
-	c 18.053,0.00, 32.821,14.77, 32.821,32.818L 504.856,311.726 C 504.858,329.774, 490.09,344.543, 472.037,344.543z" />
-<glyph unicode="&#xe00b;" d="M0.00,352.00l0.00-256.00 l 160.00,0.00 l 96.00,96.00l 96.00-96.00l 160.00,0.00 L 512.00,352.00 L0.00,352.00 z M 224.00,224.00l-64.00-64.00L 32.00,160.00 L 32.00,288.00 l 192.00,0.00 L 224.00,224.00 z M 480.00,160.00L 352.00,160.00 l-64.00,64.00l0.00,64.00 l 192.00,0.00 L 480.00,160.00 z" />
-<glyph unicode="&#xe00c;" d="M 352.00,448.00l0.00-48.00 l 80.00-144.00L 80.00,256.00 l 80.00,144.00L 160.00,448.00 L0.00,256.00l0.00-256.00 l 160.00,0.00 l 96.00,96.00l 96.00-96.00l 160.00,0.00 L 512.00,256.00 L 352.00,448.00z M 224.00,128.00l-64.00-64.00L 32.00,64.00 L 32.00,192.00 l 192.00,0.00 L 224.00,128.00 z M 480.00,64.00L 352.00,64.00
-	l-64.00,64.00l0.00,64.00 l 192.00,0.00 L 480.00,64.00 z" />
-<glyph unicode="&#xe00d;" d="M 480.00,384.00L 480.00,416.00L 256.00,352.00L 32.00,416.00L 32.00,384.00L 192.00,320.00L 192.00,192.00L 128.00-32.00L 160.00-32.00L 256.00,192.00L 352.00-32.00L 384.00-32.00L 320.00,192.00L 320.00,320.00 	zM 208.00,432.00A48.00,48.00 4860.00 1,0 304.00,432A48.00,48.00 4860.00 1,0 208.00,432z" />
-<glyph unicode="&#xe00e;" d="M 160.00,16.00c-61.856,0.00-112.00,50.145-112.00,112.00c0.00,43.848, 25.20,81.803, 61.903,100.19l-21.47,42.938C 36.001,244.86,0.00,190.639,0.00,128.00
-		c0.00-88.366, 71.634-160.00, 160.00-160.00s 160.00,71.634, 160.00,160.00l-48.00,0.00 C 272.00,66.145, 221.856,16.00, 160.00,16.00zM 480.00,128.00L 448.00,96.00L 338.743,205.255L 224.00,205.255L 224.00,256.00L 352.00,256.00L 352.00,288.00L 224.00,288.00L 224.00,352.00L 160.00,352.00L 160.00,160.00L 320.00,160.00L 448.00,32.00L 512.00,96.00 	zM 144.00,432.00A48.00,48.00 4860.00 1,0 240.00,432A48.00,48.00 4860.00 1,0 144.00,432z" />
-<glyph unicode="&#xe00f;" d="M 256.00,480.00C 114.844,480.00,0.00,365.162,0.00,223.999C0.00,82.838, 114.844-32.00, 256.00-32.00c 141.155,0.00, 256.00,114.838, 256.00,255.999
-		C 512.00,365.162, 397.156,480.00, 256.00,480.00z M 256.00,24.889c-109.789,0.00-199.11,89.323-199.11,199.11c0.00,109.79, 89.322,199.112, 199.11,199.112
-		s 199.11-89.322, 199.11-199.112C 455.113,114.212, 365.788,24.889, 256.00,24.889zM 256.00,366.223c-78.422,0.00-142.224-63.801-142.224-142.224c0.00-78.421, 63.801-142.224, 142.224-142.224
-		s 142.223,63.803, 142.223,142.224C 398.223,302.422, 334.423,366.223, 256.00,366.223z M 256.00,138.666
-		c-47.058,0.00-85.334,38.277-85.334,85.333c0.00,47.058, 38.276,85.335, 85.334,85.335c 47.056,0.00, 85.335-38.277, 85.335-85.335
-		C 341.335,176.943, 303.056,138.666, 256.00,138.666zM 224.00,224.00A32.00,32.00 4860.00 1,0 288.00,224A32.00,32.00 4860.00 1,0 224.00,224z" />
-<glyph unicode="&#xe010;" d="M 256.00,480.00C 114.615,480.00,0.00,365.385,0.00,224.00s 114.615-256.00, 256.00-256.00s 256.00,114.615, 256.00,256.00S 397.385,480.00, 256.00,480.00z M 391.765,88.235
-	C 363.16,59.631, 327.117,41.174, 288.00,34.648L 288.00,128.00 l-64.00,0.00 l0.00-93.352 c-39.117,6.525-75.16,24.982-103.765,53.587
-	C 91.632,116.84, 73.174,152.883, 66.649,192.00L 160.00,192.00 l0.00,64.00 L 66.649,256.00 c 6.525,39.117, 24.983,75.16, 53.587,103.765
-	C 148.84,388.369, 184.883,406.826, 224.00,413.352L 224.00,320.00 l 64.00,0.00 L 288.00,413.352 c 39.117-6.525, 75.16-24.983, 103.765-53.587
-	c 28.604-28.604, 47.062-64.647, 53.587-103.765L 352.00,256.00 l0.00-64.00 l 93.352,0.00 C 438.826,152.883, 420.369,116.84, 391.765,88.235z" />
-<glyph unicode="&#xe011;" d="M 192.00,480.00L0.00,224.00L 192.00,224.00L 64.00-32.00L 512.00,288.00L 256.00,288.00L 448.00,480.00 z" />
-<glyph unicode="&#xe012;" d="M 352.00,480.00L 64.00,192.00L 240.00,192.00L 160.00-32.00L 448.00,256.00L 272.00,256.00 z" />
-<glyph unicode="&#xe013;" d="M0.00,128.00L 160.00,384.00L 320.00,224.00L 512.00,352.00L 352.00,64.00L 192.00,224.00 z" />
-<glyph unicode="&#xe014;" d="M 384.00,416.00l-64.00,0.00 L 320.00,448.00 c0.00,17.60-14.40,32.00-32.00,32.00l-64.00,0.00 c-17.602,0.00-32.00-14.40-32.00-32.00l0.00-32.00 l-64.00,0.00 l0.00-64.00 l 256.00,0.00 L 384.00,416.00 z M 288.00,416.00l-64.00,0.00 L 224.00,447.943
-		c 0.017,0.019, 0.036,0.039, 0.057,0.057l 63.884,0.00 c 0.021-0.018, 0.041-0.038, 0.059-0.057L 288.00,416.00 L 288.00,416.00zM 432.00,416.00l-32.00,0.00 l0.00-32.00 l 16.00,0.00 l0.00-384.00 L 96.00,0.00 L 96.00,384.00 l 16.00,0.00 L 112.00,416.00 L 80.00,416.00 c-8.801,0.00-16.00-7.20-16.00-16.00l0.00-416.00 c0.00-8.80, 7.199-16.00, 16.00-16.00l 352.00,0.00 c 8.80,0.00, 16.00,7.20, 16.00,16.00L 448.00,400.00
-		C 448.00,408.80, 440.80,416.00, 432.00,416.00z" />
-<glyph unicode="&#xe015;" d="M 384.00,416.00l-64.00,0.00 L 320.00,448.00 c0.00,17.60-14.40,32.00-32.00,32.00l-64.00,0.00 c-17.602,0.00-32.00-14.40-32.00-32.00l0.00-32.00 l-64.00,0.00 l0.00-64.00 l 256.00,0.00 L 384.00,416.00 z M 288.00,416.00l-64.00,0.00 L 224.00,447.943
-		c 0.017,0.019, 0.036,0.039, 0.057,0.057l 63.884,0.00 c 0.021-0.018, 0.041-0.038, 0.059-0.057L 288.00,416.00 L 288.00,416.00zM 432.00,416.00l-32.00,0.00 l0.00-32.00 l 16.00,0.00 l0.00-384.00 L 96.00,0.00 L 96.00,384.00 l 16.00,0.00 L 112.00,416.00 L 80.00,416.00 c-8.801,0.00-16.00-7.20-16.00-16.00l0.00-416.00 c0.00-8.80, 7.199-16.00, 16.00-16.00l 352.00,0.00 c 8.80,0.00, 16.00,7.20, 16.00,16.00L 448.00,400.00
-		C 448.00,408.80, 440.80,416.00, 432.00,416.00zM 128.00,288.00L 384.00,288.00L 384.00,256.00L 128.00,256.00zM 128.00,192.00L 384.00,192.00L 384.00,160.00L 128.00,160.00zM 128.00,96.00L 384.00,96.00L 384.00,64.00L 128.00,64.00z" />
-<glyph unicode="&#xe016;" d="M0.00,448.00L 320.00,448.00L 320.00,384.00L0.00,384.00zM0.00,320.00L 288.00,320.00L 288.00,256.00L0.00,256.00zM0.00,192.00L 224.00,192.00L 224.00,128.00L0.00,128.00zM0.00,64.00L 160.00,64.00L 160.00,0.00L0.00,0.00zM 416.00,480.00l-64.00,0.00 l0.00-356.559 c-10.01,2.949-20.778,4.559-32.00,4.559c-53.02,0.00-96.00-35.817-96.00-80.00s 42.98-80.00, 96.00-80.00s 96.00,35.817, 96.00,80.00L 416.00,384.00 l 96.00-32.00
-		L 512.00,416.00 L 416.00,480.00z" />
-<glyph unicode="&#xe017;" d="M0.00,480.00L 224.00,480.00L 224.00,256.00L0.00,256.00zM 288.00,480.00L 512.00,480.00L 512.00,256.00L 288.00,256.00zM0.00,192.00L 224.00,192.00L 224.00-32.00L0.00-32.00zM 288.00,192.00L 512.00,192.00L 512.00-32.00L 288.00-32.00z" />
-<glyph unicode="&#xe018;" d="M 480.00,128.00l-51.741,0.00 L 308.546,327.522C 315.536,333.404, 320.00,342.205, 320.00,352.00L 320.00,416.00 c0.00,17.60-14.40,32.00-32.00,32.00l-64.00,0.00 c-17.60,0.00-32.00-14.40-32.00-32.00
-	l0.00-64.00 c0.00-9.795, 4.464-18.596, 11.455-24.478L 83.741,128.00L 32.00,128.00 c-17.60,0.00-32.00-14.40-32.00-32.00l0.00-64.00 c0.00-17.60, 14.40-32.00, 32.00-32.00l 64.00,0.00 c 17.60,0.00, 32.00,14.40, 32.00,32.00l0.00,64.00
-	c0.00,9.795-4.464,18.596-11.455,24.478L 236.26,320.00l 39.482,0.00 l 119.714-199.522C 388.465,114.596, 384.00,105.795, 384.00,96.00l0.00-64.00
-	c0.00-17.60, 14.40-32.00, 32.00-32.00l 64.00,0.00 c 17.60,0.00, 32.00,14.40, 32.00,32.00l0.00,64.00 C 512.00,113.60, 497.60,128.00, 480.00,128.00z" />
-<glyph unicode="&#xe019;" d="M 192.00,448.00L 320.00,448.00L 320.00,320.00L 192.00,320.00zM 192.00,288.00L 320.00,288.00L 320.00,160.00L 192.00,160.00zM 192.00,128.00L 320.00,128.00L 320.00,0.00L 192.00,0.00z" />
-<glyph unicode="&#xe01a;" d="M 192.00,384.00A64.00,64.00 1260.00 1,0 320.00,384A64.00,64.00 1260.00 1,0 192.00,384zM 192.00,224.00A64.00,64.00 1260.00 1,0 320.00,224A64.00,64.00 1260.00 1,0 192.00,224zM 192.00,64.00A64.00,64.00 1260.00 1,0 320.00,64A64.00,64.00 1260.00 1,0 192.00,64z" />
-<glyph unicode="&#xe01b;" d="M 512.00,151.229c0.00,41.045-28.339,75.45-66.498,84.74C 443.881,300.319, 391.273,352.00, 326.571,352.00
-	c-37.896,0.00-71.633-17.747-93.427-45.366c-12.221,15.799-31.345,25.98-52.854,25.98c-36.905,0.00-66.821-29.937-66.821-66.861
-	c0.00-3.218, 0.24-6.38, 0.682-9.477c-5.611,1.012-11.383,1.569-17.285,1.569C 43.367,257.846,0.00,214.452,0.00,160.924
-	C0.00,107.393, 43.367,64.00, 96.865,64.00l 328.131,0.00 l0.00,0.006 C 473.065,64.098, 512.00,103.112, 512.00,151.229z" />
-<glyph unicode="&#xe01c;" d="M 445.502,299.97C 443.881,364.319, 391.273,416.00, 326.571,416.00c-37.896,0.00-71.633-17.747-93.427-45.366
-	c-12.221,15.799-31.345,25.98-52.854,25.98c-36.905,0.00-66.821-29.937-66.821-66.861c0.00-3.218, 0.24-6.38, 0.682-9.477
-	c-5.611,1.012-11.383,1.569-17.285,1.569C 43.367,321.846,0.00,278.452,0.00,224.924C0.00,171.393, 43.367,128.00, 96.865,128.00l 49.88,0.00 L 256.00,18.745
-	L 365.255,128.00l 59.741,0.00 l0.00,0.006 C 473.065,128.098, 512.00,167.112, 512.00,215.229C 512.00,256.274, 483.661,290.679, 445.502,299.97z M 256.00,64.00l-96.00,96.00
-	l 64.00,0.00 l0.00,96.00 l 64.00,0.00 l0.00-96.00 l 64.00,0.00 L 256.00,64.00z" />
-<glyph unicode="&#xe01d;" d="M 448.00,128.00L 448.00,64.00L 64.00,64.00L 64.00,128.00L0.00,128.00L0.00,0.00L 512.00,0.00L 512.00,128.00 	zM 384.00,288.00L 288.00,288.00L 288.00,448.00L 224.00,448.00L 224.00,288.00L 128.00,288.00L 256.00,96.00 	z" />
-<glyph unicode="&#xe01e;" d="M 445.502,299.97C 443.881,364.319, 391.273,416.00, 326.571,416.00c-37.896,0.00-71.633-17.747-93.427-45.366
-	c-12.221,15.799-31.345,25.98-52.854,25.98c-36.905,0.00-66.821-29.937-66.821-66.861c0.00-3.218, 0.24-6.38, 0.682-9.477
-	c-5.611,1.012-11.383,1.569-17.285,1.569C 43.367,321.846,0.00,278.452,0.00,224.924C0.00,171.393, 43.367,128.00, 96.865,128.00L 192.00,128.00 l0.00-96.00 l 128.00,0.00 l0.00,96.00
-	l 104.996,0.00 l0.00,0.006 C 473.065,128.098, 512.00,167.112, 512.00,215.229C 512.00,256.274, 483.661,290.679, 445.502,299.97z M 288.00,160.00l0.00-96.00 l-64.00,0.00 l0.00,96.00 l-64.00,0.00
-	l 96.00,96.00l 96.00-96.00L 288.00,160.00 z" />
-<glyph unicode="&#xe01f;" d="M 448.00,128.00L 448.00,64.00L 64.00,64.00L 64.00,128.00L0.00,128.00L0.00,0.00L 512.00,0.00L 512.00,128.00 	zM 128.00,256.00L 224.00,256.00L 224.00,96.00L 288.00,96.00L 288.00,256.00L 384.00,256.00L 256.00,448.00 	z" />
-<glyph unicode="&#xe020;" d="M 160.00,128.00c 8.80-8.80, 23.637-8.363, 32.971,0.971L 351.03,287.029C 360.364,296.363, 360.80,311.20, 352.00,320.00
-		s-23.637,8.363-32.971-0.971L 160.971,160.971C 151.637,151.637, 151.20,136.80, 160.00,128.00zM 238.444,142.444c 2.28-4.525, 3.495-9.58, 3.495-14.848c0.00-8.808-3.372-17.03-9.496-23.154l-81.691-81.691
-		c-6.124-6.124-14.347-9.496-23.154-9.496s-17.03,3.372-23.154,9.496l-49.691,49.691c-6.124,6.124-9.496,14.347-9.496,23.154
-		s 3.372,17.03, 9.496,23.154l 81.691,81.691c 6.124,6.124, 14.347,9.497, 23.154,9.497c 5.268,0.00, 10.322-1.215, 14.848-3.495l 32.669,32.669
-		c-13.935,10.705-30.72,16.08-47.517,16.08c-19.993,0.00-39.986-7.583-55.154-22.751l-81.691-81.691
-		c-30.335-30.335-30.335-79.974,0.00-110.309l 49.691-49.691C 87.611-24.416, 107.604-32.00, 127.597-32.00
-		c 19.994,0.00, 39.987,7.584, 55.154,22.751l 81.691,81.691c 27.91,27.91, 30.119,72.149, 6.672,102.672L 238.444,142.444zM 489.249,407.558l-49.691,49.691C 424.391,472.417, 404.398,480.00, 384.404,480.00c-19.993,0.00-39.986-7.583-55.154-22.751l-81.691-81.691
-		c-27.91-27.91-30.119-72.149-6.671-102.671l 32.669,32.67c-2.279,4.525-3.494,9.58-3.494,14.847c0.00,8.808, 3.372,17.03, 9.496,23.154
-		l 81.691,81.691c 6.124,6.124, 14.347,9.497, 23.154,9.497s 17.03-3.373, 23.154-9.497l 49.691-49.691
-		c 6.124-6.124, 9.496-14.347, 9.496-23.154s-3.372-17.03-9.496-23.154l-81.691-81.691c-6.124-6.124-14.347-9.496-23.154-9.496
-		c-5.268,0.00-10.322,1.215-14.848,3.495l-32.669-32.669c 13.936-10.705, 30.72-16.08, 47.517-16.08c 19.994,0.00, 39.987,7.584, 55.154,22.751
-		l 81.691,81.691C 519.584,327.584, 519.584,377.223, 489.249,407.558z" />
-<glyph unicode="&#xe021;" d="M 238.444,142.443c 2.28-4.524, 3.495-9.579, 3.495-14.848c0.00-8.808-3.372-17.029-9.496-23.154l-81.69-81.69
-		c-6.124-6.124-14.348-9.496-23.154-9.496s-17.03,3.372-23.154,9.496l-49.69,49.69c-6.124,6.125-9.496,14.348-9.496,23.154
-		s 3.372,17.03, 9.496,23.154l 81.69,81.691c 6.124,6.123, 14.348,9.496, 23.154,9.496c 5.269,0.00, 10.322-1.215, 14.848-3.494l 32.669,32.668
-		c-13.935,10.705-30.72,16.08-47.517,16.08c-19.993,0.00-39.986-7.583-55.154-22.751l-81.69-81.691
-		c-30.335-30.335-30.335-79.975,0.00-110.309l 49.69-49.691c 15.167-15.166, 35.16-22.75, 55.153-22.75
-		c 19.994,0.00, 39.987,7.584, 55.154,22.751l 81.69,81.69c 27.91,27.91, 30.119,72.149, 6.672,102.673L 238.444,142.443zM 489.248,407.558l-49.69,49.691C 424.391,472.417, 404.398,480.00, 384.404,480.00c-19.993,0.00-39.985-7.583-55.153-22.751l-81.691-81.691
-		c-27.91-27.91-30.119-72.149-6.671-102.671l 32.669,32.67c-2.279,4.525-3.494,9.58-3.494,14.847c0.00,8.808, 3.372,17.03, 9.496,23.154
-		l 81.691,81.691c 6.123,6.124, 14.347,9.497, 23.153,9.497c 8.808,0.00, 17.03-3.373, 23.154-9.497l 49.69-49.691
-		c 6.124-6.124, 9.496-14.347, 9.496-23.154c0.00-8.807-3.372-17.03-9.496-23.154l-81.69-81.691c-6.124-6.124-14.347-9.496-23.154-9.496
-		c-5.268,0.00-10.322,1.215-14.848,3.495l-32.669-32.669c 13.936-10.705, 30.72-16.08, 47.517-16.08c 19.994,0.00, 39.987,7.584, 55.154,22.752
-		l 81.69,81.69C 519.584,327.584, 519.584,377.223, 489.248,407.558zM 116.684,340.688L 20.687,436.685L 43.315,459.313L 139.312,363.316zM 192.00,480.00L 224.00,480.00L 224.00,384.00L 192.00,384.00zM0.00,288.00L 96.00,288.00L 96.00,256.00L0.00,256.00zM 395.316,107.312L 491.314,11.314L 468.686-11.314L 372.688,84.684zM 288.00,64.00L 320.00,64.00L 320.00-32.00L 288.00-32.00zM 416.00,192.00L 512.00,192.00L 512.00,160.00L 416.00,160.00z" />
-<glyph unicode="&#xe022;" d="M 432.311,476.862L 303.69,451.138C 295.061,449.412, 288.00,455.20, 288.00,464.00S 280.94,478.588, 272.311,476.862L 128.00,448.00L 128.00,480.00 L 64.00,480.00 l0.00-512.00 l 64.00,0.00 L 128.00,224.00
-	l 144.311,28.862C 280.94,254.588, 288.00,248.80, 288.00,240.00s 7.061-14.588, 15.689-12.862l 128.621,25.725C 440.94,254.588, 448.00,263.20, 448.00,272.00L 448.00,464.00
-	C 448.00,472.80, 440.94,478.588, 432.311,476.862z" />
-<glyph unicode="&#xe023;" d="M 254.059,418.977C 205.881,476.227, 169.369,480.00, 96.00,480.00l0.00-256.00 c 128.267,64.00, 142.636-8.335, 223.506-1.023
-		C 399.234,230.197, 467.031,291.564, 512.00,352.00C 384.644,322.547, 320.54,339.977, 254.059,418.977zM0.00,480.00L 64.00,480.00L 64.00-32.00L0.00-32.00z" />
-<glyph unicode="&#xe024;" d="M 348.916,316.476l-32.476,32.461L 154.035,186.566c-26.907-26.896-26.907-70.524,0.00-97.422
-	c 26.902-26.896, 70.53-26.896, 97.437,0.00l 194.886,194.854c 44.857,44.831, 44.857,117.531,0.00,162.363
-	c-44.833,44.852-117.556,44.852-162.391,0.00L 79.335,241.788l 0.017-0.016c-0.145-0.152-0.306-0.288-0.438-0.423
-	c-62.551-62.548-62.551-163.928,0.00-226.453c 62.527-62.528, 163.934-62.528, 226.494,0.00c 0.137,0.137, 0.258,0.284, 0.41,0.438l 0.016-0.017
-	l 139.666,139.646l-32.493,32.46L 273.35,47.792l-0.008,0.00 c-0.148-0.134-0.282-0.285-0.423-0.422
-	c-44.537-44.529-116.99-44.529-161.538,0.00c-44.531,44.521-44.531,116.961,0.00,161.489c 0.152,0.152, 0.302,0.291, 0.444,0.423l-0.023,0.03
-	l 204.64,204.583c 26.856,26.869, 70.572,26.869, 97.443,0.00c 26.856-26.867, 26.856-70.574,0.00-97.42L 218.999,121.625
-	c-8.968-8.961-23.527-8.961-32.486,0.00c-8.947,8.943-8.947,23.516,0.00,32.46L 348.916,316.476z" />
-<glyph unicode="&#xe025;" d="M 256.00,368.00C 128.00,368.00, 0.001,256.001,0.00,224.00l0.00,0.00c 0.001-32.001, 128.00-144.00, 256.00-144.00s 255.997,111.999, 256.00,144.00l0.00,0.00
-		C 511.997,256.001, 384.00,368.00, 256.00,368.00z M 256.00,128.00c-53.021,0.00-96.00,42.98-96.00,96.00c0.00,53.02, 42.979,96.00, 96.00,96.00c 53.02,0.00, 96.00-42.98, 96.00-96.00
-		C 352.00,170.98, 309.02,128.00, 256.00,128.00zM 224.00,224.00A32.00,32.00 4860.00 1,0 288.00,224A32.00,32.00 4860.00 1,0 224.00,224z" />
-<glyph unicode="&#xe026;" d="M 256.00,384.00C 144.341,384.00, 47.559,318.979,0.00,224.00c 47.559-94.979, 144.341-160.00, 256.00-160.00c 111.657,0.00, 208.439,65.021, 256.00,160.00
-	C 464.442,318.979, 367.657,384.00, 256.00,384.00z M 256.00,177.811c-25.51,0.00-46.189,20.682-46.189,46.189s 20.681,46.189, 46.189,46.189
-	s 46.188-20.681, 46.188-46.189C 302.19,198.49, 281.509,177.811, 256.00,177.811z M 121.171,135.361
-	C 86.304,157.602, 57.231,188.037, 36.35,224.00c 20.88,35.963, 49.953,66.397, 84.821,88.639c 19.81,12.635, 41.182,22.406, 63.521,29.043
-	c 11.229,3.334, 22.684,5.862, 34.281,7.586C 164.881,333.302, 125.40,283.266, 125.40,224.00c0.00-59.266, 39.481-109.303, 93.575-125.268
-	c-11.60,1.723-23.052,4.25-34.282,7.586C 162.353,112.955, 140.981,122.727, 121.171,135.361z M 390.827,135.361
-	c-19.811-12.637-41.183-22.406-63.521-29.043c-11.229-3.336-22.685-5.862-34.28-7.586C 347.117,114.697, 386.60,164.734, 386.60,224.00
-	c0.00,59.266-39.481,109.303-93.574,125.268c 11.598-1.724, 23.051-4.252, 34.28-7.586c 22.341-6.637, 43.713-16.408, 63.521-29.043
-	c 34.868-22.24, 63.94-52.676, 84.822-88.639C 454.769,188.037, 425.697,157.604, 390.827,135.361z" />
-<glyph unicode="&#xe027;" d="M 96.00,480.00L 96.00-32.00L 256.00,128.00L 416.00-32.00L 416.00,480.00 z" />
-<glyph unicode="&#xe028;" d="M 96.00,480.00l0.00-512.00 l 160.00,160.00l 160.00-160.00L 416.00,480.00 L 96.00,480.00 z M 384.00,45.255l-128.00,128.00l-128.00-128.00L 128.00,448.00 l 256.00,0.00 L 384.00,45.255 z" />
-<glyph unicode="&#xe029;" d="M 512.00,281.476L 316.434,281.476 L 256.00,467.471l-60.434-185.995L0.00,281.476 l 158.217-114.953L 97.783-19.471L 256.00,95.48l 158.216-114.951
-	l-60.434,185.994L 512.00,281.476z M 368.565,43.362L 256.00,125.146l-112.566-81.784L 186.43,175.69L 73.864,257.476l 139.14,0.00 L 256.00,389.806
-	l 42.997-132.33l 139.139,0.00 L 325.569,175.69L 368.565,43.362z" />
-<glyph unicode="&#xe02a;" d="M 512.00,287.996L 316.434,287.996 L 256.00,473.991l-60.435-185.995L0.00,287.996 l 158.217-114.952L 97.783-12.951L 256.00,102.00l 158.216-114.95l-60.434,185.994
-	L 512.00,287.996z M 368.566,49.882L 256.00,131.666L 256.00,396.325 l 42.996-132.33l 139.14,0.00 L 325.57,182.211L 368.566,49.882z" />
-<glyph unicode="&#xe02b;" d="M 512.00,287.996L 316.434,287.996L 256.00,473.991L 195.567,287.996L0.00,287.996L 158.217,173.044L 97.783-12.951L 256.00,102.00L 414.216-12.95L 353.783,173.044 z" />
-<glyph unicode="&#xe02c;" d="M 377.594,448.00c-53.815,0.00-100.129-43.777-121.582-89.50C 234.543,404.222, 188.223,448.00, 134.404,448.00C 60.213,448.00,0.00,387.78,0.00,313.584
-	c0.00-150.923, 152.25-190.497, 256.011-339.709C 354.088,122.163, 512.00,167.478, 512.00,313.584C 512.00,387.78, 451.785,448.00, 377.594,448.00z" />
-<glyph unicode="&#xe02d;" d="M 377.594,416.00C 434.061,416.00, 480.00,370.056, 480.00,313.584c0.00-17.689-2.709-33.877-8.28-49.492
-	c-5.107-14.312-12.658-28.205-23.085-42.472c-20.959-28.684-51.409-55.677-83.647-84.255
-	c-35.333-31.323-74.42-65.975-109.504-109.938c-35.252,42.688-73.336,76.052-107.772,106.221
-	c-33.969,29.76-63.305,55.46-84.255,84.381c-10.427,14.395-17.981,28.573-23.096,43.348C 34.735,277.63, 32.00,294.707, 32.00,313.584
-	C 32.00,370.056, 77.938,416.00, 134.404,416.00c 40.713,0.00, 76.563-36.856, 92.643-71.101l 28.977-61.711l 28.959,61.72
-	C 301.047,379.148, 336.881,416.00, 377.594,416.00 M 377.594,448.00c-53.815,0.00-100.129-43.777-121.582-89.50C 234.543,404.222, 188.223,448.00, 134.404,448.00
-	C 60.213,448.00,0.00,387.78,0.00,313.584c0.00-150.923, 152.25-190.497, 256.011-339.709C 354.088,122.163, 512.00,167.478, 512.00,313.584
-	C 512.00,387.78, 451.785,448.00, 377.594,448.00L 377.594,448.00z" />
-<glyph unicode="&#xe02e;" d="M 446.141,117.407c 0.852,10.12, 21.951,23.983, 21.934,34.12c-0.049,10.643-18.482,28.455-17.086,39.007
-	c 1.104,8.37, 16.555,20.793, 17.059,29.245c 0.898,15.353-19.852,45.40-34.119,51.174c-22.643,9.168-137.705,4.883-137.705,4.883
-	c-11.246,19.653, 20.035,68.201, 28.639,89.162c 12.631,30.719, 10.504,71.466-5.471,92.399C 299.879,482.98, 264.063,484.68, 263.325,473.238
-	c-5.336-83.01-21.229-106.053-42.505-122.455c-12.786-9.863-23.954-18.497-29.854-33.528
-	c-36.261-92.354-65.52-122.037-79.528-125.254L 64.00,192.001 l0.00-198.885 l 145.721-19.501c0.00,0.00, 133.455-12.632, 175.482,0.00
-	c 13.223,3.966, 36.039,23.818, 41.432,36.556c 3.074,7.315-1.197,24.622, 2.443,31.677c 5.371,10.458, 28.051,23.559, 28.027,37.771
-	C 457.082,89.754, 445.276,107.298, 446.141,117.407z" />
-<glyph unicode="&#xe02f;" d="M 468.051,228.233c-0.50,8.447-15.959,20.854-17.063,29.237c-1.398,10.544, 17.047,28.369, 17.076,39.00
-	c 0.023,10.137-21.072,24.002-21.93,34.127c-0.861,10.104, 10.953,27.644, 10.969,37.781c 0.025,14.216-22.658,27.314-28.033,37.771
-	c-3.631,7.059, 0.643,24.368-2.443,31.681c-5.385,12.739-28.203,32.595-41.414,36.556c-42.035,12.629-175.483,0.00-175.483,0.00L 64.00,454.89
-	L 64.00,256.00 l 47.445,0.00 c 13.993-7.782, 43.261-32.282, 79.526-124.636c 5.90-15.034, 17.073-24.288, 29.854-34.143
-	c 21.282-16.406, 37.157-39.442, 42.493-122.459c 0.743-11.443, 36.557-9.74, 56.064,15.837c 15.975,20.931, 18.109,61.682, 5.484,92.402
-	c-8.604,20.962-39.895,69.511-28.643,89.171c0.00,0.00, 115.066-4.285, 137.701,4.871C 448.192,182.817, 468.942,212.873, 468.051,228.233z" />
-<glyph unicode="&#xe030;" d="M 256.001,480.00C 114.615,480.00,0.00,365.386,0.00,224.00c0.00-141.385, 114.614-256.00, 256.001-256.00C 397.386-32.00, 512.00,82.615, 512.00,224.00
-	C 512.00,365.386, 397.386,480.00, 256.001,480.00z M 336.001,365.256c 12.495,0.00, 22.627-20.262, 22.627-45.256c0.00-24.993-10.132-45.255-22.627-45.255
-	c-12.498,0.00-22.629,20.262-22.629,45.255C 313.372,344.994, 323.503,365.256, 336.001,365.256z M 176.001,365.256
-	c 12.496,0.00, 22.627-20.262, 22.627-45.256c0.00-24.993-10.131-45.255-22.627-45.255c-12.498,0.00-22.628,20.262-22.628,45.255
-	C 153.373,344.994, 163.503,365.256, 176.001,365.256z M 256.001,64.00C 172.566,64.00, 103.289,133.936, 96.00,223.152
-	c 46.885-27.057, 102.025-42.532, 160.001-42.532c 57.974,0.00, 113.114,15.403, 160.00,42.46C 408.712,133.861, 339.435,64.00, 256.001,64.00z" />
-<glyph unicode="&#xe031;" d="M 256.00,480.00C 114.615,480.00,0.00,365.385,0.00,224.00s 114.612-256.00, 256.00-256.00c 141.385,0.00, 256.00,114.615, 256.00,256.00S 397.385,480.00, 256.00,480.00z M 344.00,368.00
-	c 17.674,0.00, 32.00-14.327, 32.00-32.00s-14.326-32.00-32.00-32.00c-17.673,0.00-32.00,14.327-32.00,32.00S 326.327,368.00, 344.00,368.00z M 168.00,368.00c 17.673,0.00, 32.00-14.327, 32.00-32.00
-	s-14.327-32.00-32.00-32.00s-32.00,14.327-32.00,32.00S 150.327,368.00, 168.00,368.00z M 400.069,137.549c-14.676-24.406-35.46-44.84-60.104-59.089
-	C 314.551,63.768, 285.517,56.00, 256.00,56.00c-29.518,0.00-58.551,7.768-83.964,22.46c-24.646,14.249-45.431,34.683-60.105,59.09l-4.126,6.862
-	l 41.161,24.699l 4.119-6.852C 175.019,125.779, 213.492,104.00, 256.00,104.00c 42.507,0.00, 80.979,21.779, 102.913,58.261l 4.119,6.851l 41.162-24.698
-	L 400.069,137.549z" />
-<glyph unicode="&#xe032;" d="M 256.00,480.00C 114.615,480.00,0.00,365.385,0.00,224.00s 114.613-256.00, 256.00-256.00c 141.385,0.00, 256.00,114.615, 256.00,256.00S 397.385,480.00, 256.00,480.00z M 320.00,96.00L 192.00,96.00 l0.00,32.00
-	l 128.00,0.00 L 320.00,96.00 z M 344.00,368.00c 17.674,0.00, 32.00-14.327, 32.00-32.00s-14.326-32.00-32.00-32.00c-17.673,0.00-32.00,14.327-32.00,32.00S 326.327,368.00, 344.00,368.00z M 168.00,368.00
-	c 17.673,0.00, 32.00-14.327, 32.00-32.00s-14.327-32.00-32.00-32.00s-32.00,14.327-32.00,32.00S 150.327,368.00, 168.00,368.00z" />
-<glyph unicode="&#xe033;" d="M 256.00,480.00C 114.615,480.00,0.00,365.385,0.00,224.00s 114.615-256.00, 256.00-256.00s 256.00,114.615, 256.00,256.00S 397.385,480.00, 256.00,480.00z M 288.00,192.00l0.00-160.00 l-64.00,0.00 L 224.00,192.00 L 64.00,192.00 l0.00,64.00
-	l 160.00,0.00 L 224.00,416.00 l 64.00,0.00 l0.00-160.00 l 160.00,0.00 l0.00-64.00 L 288.00,192.00 z" />
-<glyph unicode="&#xe034;" d="M 256.00,480.00C 114.615,480.00,0.00,365.385,0.00,224.00s 114.615-256.00, 256.00-256.00s 256.00,114.615, 256.00,256.00S 397.385,480.00, 256.00,480.00z M 64.00,192.00l0.00,64.00 l 384.00,0.00 l0.00-64.00 L 64.00,192.00 z" />
-<glyph unicode="&#xe035;" d="M 256.00,480.00C 114.615,480.00,0.00,365.385,0.00,224.00s 114.615-256.00, 256.00-256.00s 256.00,114.615, 256.00,256.00S 397.385,480.00, 256.00,480.00z M 256.00,32.00
-	c-26.51,0.00-48.00,21.49-48.00,48.00s 21.49,48.00, 48.00,48.00s 48.00-21.49, 48.00-48.00S 282.51,32.00, 256.00,32.00z M 368.064,302.971
-	c-2.495-8.446-5.956-16.459-10.406-24.007c-4.445-7.567-9.79-14.732-16.019-21.476c-6.229-6.771-13.061-13.267-20.541-19.486
-	c-8.363-6.936-15.08-13.076-20.146-18.418c-5.057-5.328-8.488-9.967-10.269-13.867c-3.339-7.174-5.853-24.363-2.691-45.717l-63.959,0.00
-	c-0.525,37.938, 5.058,56.501, 11.688,70.258c 6.764,13.884, 19.377,28.554, 37.888,44.031c 8.011,6.567, 14.236,12.408, 18.675,17.479
-	c 4.449,5.067, 7.841,9.599, 10.143,13.604c 2.307,4.00, 3.729,7.734, 4.271,11.211c 0.53,3.461, 0.793,7.056, 0.793,10.799
-	c0.00,6.938-1.199,13.337-3.603,19.205c-2.396,5.883-5.824,10.938-10.264,15.197c-4.457,4.281-9.696,7.617-15.744,10.021
-	c-6.048,2.399-12.804,3.61-20.279,3.61c-29.164,0.00-46.955-20.371-53.365-61.104l-64.027,0.00 c 1.598,17.44, 5.56,33.211, 11.876,47.353
-	c 6.313,14.15, 14.576,26.151, 24.813,36.028c 10.231,9.876, 22.146,17.47, 35.754,22.796c 13.60,5.34, 28.409,8.012, 44.419,8.012
-	c 17.08,0.00, 32.642-2.441, 46.696-7.332c 14.057-4.899, 26.104-11.709, 36.146-20.42c 10.057-8.713, 17.872-19.119, 23.482-31.211
-	c 5.591-12.104, 8.411-25.261, 8.411-39.484C 371.804,320.454, 370.546,311.424, 368.064,302.971z" />
-<glyph unicode="&#xe036;" d="M 256.00,480.00C 114.615,480.00,0.00,365.385,0.00,224.00s 114.613-256.00, 256.00-256.00c 141.385,0.00, 256.00,114.615, 256.00,256.00S 397.385,480.00, 256.00,480.00z M 256.00,0.00
-			C 132.288,0.00, 32.00,100.288, 32.00,224.00S 132.288,448.00, 256.00,448.00s 224.00-100.288, 224.00-224.00S 379.712,0.00, 256.00,0.00zM 224.00,128.00L 288.00,128.00L 288.00,64.00L 224.00,64.00zM 352.00,352.00L 160.00,352.00 l0.00-64.00 l 160.00,0.00 l0.00-32.00 l-96.00-64.00l0.00-32.00 l 64.00,0.00 l 96.00,64.00l0.00,96.00 C 384.00,337.673, 369.673,352.00, 352.00,352.00z" />
-<glyph unicode="&#xe037;" d="M 256.00,480.00C 114.615,480.00,0.00,365.385,0.00,224.00s 114.614-256.00, 256.00-256.00c 141.385,0.00, 256.00,114.615, 256.00,256.00S 397.385,480.00, 256.00,480.00z M 256.00,416.00
-		c 35.347,0.00, 64.00-28.654, 64.00-64.00s-28.653-64.00-64.00-64.00s-64.00,28.654-64.00,64.00S 220.654,416.00, 256.00,416.00z M 352.00,32.00L 160.00,32.00 l0.00,32.00 l 32.00,0.00 L 192.00,224.00 l-32.00,0.00 l0.00,32.00 l 160.00,0.00 l0.00-192.00 l 32.00,0.00 L 352.00,32.00 z
-		" />
-<glyph unicode="&#xe038;" d="M0.00,224.00c0.00-141.385, 114.615-256.00, 256.00-256.00c 141.386,0.00, 256.00,114.615, 256.00,256.00S 397.386,480.00, 256.00,480.00C 114.615,480.00,0.00,365.385,0.00,224.00z M 448.00,224.00
-	c0.00-36.618-10.256-70.84-28.044-99.956L 156.045,387.956C 185.16,405.745, 219.382,416.00, 256.00,416.00C 362.038,416.00, 448.00,330.039, 448.00,224.00z M 64.00,224.00
-	c0.00,36.618, 10.256,70.839, 28.045,99.956l 263.911-263.912C 326.839,42.255, 292.618,32.00, 256.00,32.00C 149.962,32.00, 64.00,117.961, 64.00,224.00z" />
-<glyph unicode="&#xe039;" d="M 256.00,480.00C 114.615,480.00,0.00,365.385,0.00,224.00s 114.615-256.00, 256.00-256.00s 256.00,114.615, 256.00,256.00S 397.385,480.00, 256.00,480.00z M 416.00,128.00l-64.00-64.00l-96.00,96.00l-96.00-96.00
-	l-64.00,64.00l 96.00,96.00l-96.00,96.00l 64.00,64.00l 96.00-96.00l 96.00,96.00l 64.00-64.00l-96.00-96.00L 416.00,128.00z" />
-<glyph unicode="&#xe03a;" d="M 507.331,68.67c-0.002,0.002-0.004,0.004-0.006,0.005L 352.003,224.00l 155.322,155.325c 0.002,0.002, 0.004,0.003, 0.006,0.005
-		c 1.672,1.673, 2.881,3.627, 3.656,5.708c 2.123,5.688, 0.912,12.341-3.662,16.915L 433.952,475.326c-4.574,4.573-11.225,5.783-16.914,3.66
-		c-2.08-0.775-4.035-1.984-5.709-3.655c0.00-0.002-0.002-0.003-0.004-0.005L 256.001,320.00L 100.677,475.325
-		c-0.002,0.002-0.003,0.003-0.005,0.005c-1.673,1.671-3.627,2.88-5.707,3.655c-5.69,2.124-12.341,0.913-16.915-3.66L 4.676,401.951
-		c-4.574-4.574-5.784-11.226-3.661-16.914c 0.776-2.08, 1.985-4.036, 3.656-5.708c 0.002-0.001, 0.003-0.003, 0.005-0.005L 160.001,224.00
-		L 4.676,68.674c-0.001-0.002-0.003-0.003-0.004-0.005c-1.671-1.673-2.88-3.627-3.657-5.707c-2.124-5.688-0.913-12.341, 3.661-16.915
-		l 73.374-73.373c 4.575-4.574, 11.226-5.784, 16.915-3.661c 2.08,0.776, 4.035,1.985, 5.708,3.656c 0.001,0.002, 0.003,0.003, 0.005,0.005
-		l 155.324,155.325l 155.324-155.325c 0.002-0.001, 0.004-0.003, 0.006-0.004c 1.674-1.672, 3.627-2.881, 5.707-3.657
-		c 5.689-2.123, 12.342-0.913, 16.914,3.661l 73.373,73.374c 4.574,4.574, 5.785,11.227, 3.662,16.915
-		C 510.212,65.043, 509.003,66.997, 507.331,68.67z" />
-<glyph unicode="&#xe03b;" d="M 512.00,352.00L 384.00,480.00L 256.00,352.00L 128.00,480.00L0.00,352.00L 128.00,224.00L0.00,96.00L 128.00-32.00L 256.00,96.00L 384.00-32.00L 512.00,96.00L 384.00,224.00 z" />
-<glyph unicode="&#xe03c;" d="M 432.00,432.00L 192.00,192.00L 80.00,304.00L0.00,224.00L 192.00,32.00L 512.00,352.00 z" />
-<glyph unicode="&#xe03d;" d="M0.00,272.00l0.00-96.00 c0.00-8.836, 7.164-16.00, 16.00-16.00l 480.00,0.00 c 8.836,0.00, 16.00,7.164, 16.00,16.00l0.00,96.00 c0.00,8.836-7.164,16.00-16.00,16.00L 16.00,288.00 C 7.164,288.00,0.00,280.836,0.00,272.00z" />
-<glyph unicode="&#xe03e;" d="M 496.00,288.00L 320.00,288.00 L 320.00,464.00 c0.00,8.836-7.164,16.00-16.00,16.00l-96.00,0.00 c-8.836,0.00-16.00-7.164-16.00-16.00l0.00-176.00 L 16.00,288.00 c-8.836,0.00-16.00-7.164-16.00-16.00l0.00-96.00
-	c0.00-8.836, 7.164-16.00, 16.00-16.00l 176.00,0.00 l0.00-176.00 c0.00-8.836, 7.164-16.00, 16.00-16.00l 96.00,0.00 c 8.836,0.00, 16.00,7.164, 16.00,16.00L 320.00,160.00 l 176.00,0.00 c 8.836,0.00, 16.00,7.164, 16.00,16.00l0.00,96.00
-	C 512.00,280.836, 504.836,288.00, 496.00,288.00z" />
-<glyph unicode="&#xe03f;" d="M 448.00,448.00L 96.00,448.00 C 78.40,448.00, 64.00,433.60, 64.00,416.00l0.00-128.00 l 64.00,0.00 L 128.00,384.00 l 352.00,0.00 L 480.00,416.00 C 480.00,433.60, 465.60,448.00, 448.00,448.00zM 336.00,208.00L 192.00,352.00L 192.00,256.00L0.00,256.00L0.00,160.00L 192.00,160.00L 192.00,64.00 	zM 128.00,128.00L 64.00,128.00 l0.00-128.00 c0.00-17.60, 14.399-32.00, 32.00-32.00l 352.00,0.00 c 17.60,0.00, 32.00,14.40, 32.00,32.00l0.00,32.00 L 128.00,32.00 L 128.00,128.00 z" />
-<glyph unicode="&#xe040;" d="M 496.00,208.00L 352.00,352.00L 352.00,256.00L 160.00,256.00L 160.00,160.00L 352.00,160.00L 352.00,64.00 	zM 416.00,384.00L 416.00,416.00 c0.00,17.60-14.40,32.00-32.00,32.00L 32.00,448.00 C 14.40,448.00,0.00,433.60,0.00,416.00l0.00-416.00 c0.00-17.60, 14.399-32.00, 32.00-32.00l 352.00,0.00 c 17.60,0.00, 32.00,14.40, 32.00,32.00l0.00,32.00 L 64.00,32.00 L 64.00,384.00
-		L 416.00,384.00 z" />
-<glyph unicode="&#xe041;" d="M 160.00,160.00L 160.00,256.00L 256.00,256.00L 128.00,384.00L0.00,256.00L 96.00,256.00L 96.00,96.00L 288.00,96.00L 224.00,160.00 	zM 416.00,192.00L 416.00,352.00L 224.00,352.00L 288.00,288.00L 352.00,288.00L 352.00,192.00L 256.00,192.00L 384.00,64.00L 512.00,192.00 	z" />
-<glyph unicode="&#xe042;" d="M 384.00,160.00L 256.00,288.00L 128.00,160.00 z" />
-<glyph unicode="&#xe043;" d="M 192.001,96.00L 320.001,224.00L 192.001,352.00 z" />
-<glyph unicode="&#xe044;" d="M 128.00,288.00L 256.00,160.00L 384.00,288.00 z" />
-<glyph unicode="&#xe045;" d="M 320.001,352.00L 192.001,224.00L 320.001,95.999 z" />
-<glyph unicode="&#xe046;" d="M0.00,96.00L 128.00,224.00L 384.00-32.00L 512.00,96.00L 256.00,352.00L 383.999,480.00L0.00,480.00 z" />
-<glyph unicode="&#xe047;" d="M 256.001,480.00L0.00,224.00L 160.00,224.00L 160.00-31.999L 352.00-32.00L 352.00,224.00L 512.00,224.00 z" />
-<glyph unicode="&#xe048;" d="M 128.00,480.00L 256.001,352.00L0.00,96.00L 128.00-32.00L 384.00,224.00L 512.00,96.001L 512.00,480.00 z" />
-<glyph unicode="&#xe049;" d="M 512.00,224.00L 256.00,480.00L 256.00,320.00L 0.001,320.00L0.00,128.00L 256.00,128.00L 256.00-32.00 z" />
-<glyph unicode="&#xe04a;" d="M 512.00,352.00L 384.00,224.00L 128.00,480.00L0.00,352.00L 256.001,96.00L 128.001-32.00L 512.00-32.00 z" />
-<glyph unicode="&#xe04b;" d="M 256.00-32.00L 512.00,224.00L 352.00,224.00L 352.00,479.999L 160.00,480.00L 160.00,224.00L0.00,224.00 z" />
-<glyph unicode="&#xe04c;" d="M 384.00-32.00L 256.00,96.00L 512.00,352.00L 384.00,480.00L 128.00,223.999L0.00,351.999L0.00-32.00 z" />
-<glyph unicode="&#xe04d;" d="M0.00,224.00L 256.00-32.00L 256.00,128.00L 511.999,128.00L 512.00,320.00L 256.00,320.00L 256.00,480.00 z" />
-<glyph unicode="&#xe04e;" d="M0.00,480.00L0.00,192.00L 96.00,288.00L 512.00-32.00L 192.00,384.00L 285.309,480.00 z" />
-<glyph unicode="&#xe04f;" d="M 256.002-32.00L 200.00,352.00L 96.00,352.00L 255.999,480.00L 416.00,352.00L 311.999,352.00 z" />
-<glyph unicode="&#xe050;" d="M 512.00,480.00L 224.00,480.00L 320.00,384.00L0.00-32.00L 416.00,288.00L 512.00,194.691 z" />
-<glyph unicode="&#xe051;" d="M0.00,223.998L 384.00,280.00L 384.00,384.00L 512.00,224.001L 384.00,64.00L 384.00,168.001 z" />
-<glyph unicode="&#xe052;" d="M 512.00-32.00L 512.00,256.00L 416.001,160.00L0.00,480.00L 320.00,64.00L 226.692-32.00 z" />
-<glyph unicode="&#xe053;" d="M 255.998,480.00L 312.00,96.00L 416.00,96.00L 256.001-32.00L 96.00,96.00L 200.001,96.00 z" />
-<glyph unicode="&#xe054;" d="M0.00-32.00L 288.00-32.00L 192.00,64.00L 512.00,480.00L 96.00,160.00L0.00,253.308 z" />
-<glyph unicode="&#xe055;" d="M 512.00,224.002L 128.00,168.00L 128.00,64.00L0.00,223.999L 128.00,384.00L 128.00,279.999 z" />
-<glyph unicode="&#xe056;" d="M 32.00,448.00L 32.00,128.00L 128.00,32.00L 128.00,256.00L 384.00,0.00L 480.00,96.00L 224.00,352.00L 448.00,352.00L 352.00,448.00 z" />
-<glyph unicode="&#xe057;" d="M 32.00,256.00L 32.00,128.00L 192.00,288.00L 192.00-32.00L 320.00-32.00L 320.00,288.00L 480.00,128.00L 480.00,256.00L 256.00,480.00 z" />
-<glyph unicode="&#xe058;" d="M 480.00,448.00L 160.00,448.00L 64.00,352.00L 288.00,352.00L 32.00,96.00L 128.00,0.00L 384.00,256.00L 384.00,32.00L 480.00,128.00 z" />
-<glyph unicode="&#xe059;" d="M 288.00,448.00L 160.00,448.00L 320.00,288.00L0.00,288.00L0.00,160.00L 320.00,160.00L 160.00,0.00L 288.00,0.00L 512.00,224.00 z" />
-<glyph unicode="&#xe05a;" d="M 480.00,0.00L 480.00,320.00L 384.00,416.00L 384.00,192.00L 128.00,448.00L 32.00,352.00L 288.00,96.00L 64.001,96.00L 160.001,0.00 z" />
-<glyph unicode="&#xe05b;" d="M 480.00,192.00L 480.00,320.00L 320.00,160.00L 320.00,480.00L 192.00,480.00L 192.001,159.999L 32.00,320.00L 32.00,191.999L 256.001-32.00 z" />
-<glyph unicode="&#xe05c;" d="M 32.00,0.00L 352.00,0.00L 448.00,96.00L 224.00,96.00L 480.00,352.00L 384.00,448.00L 128.00,192.00L 128.00,416.00L 32.00,320.00 z" />
-<glyph unicode="&#xe05d;" d="M 224.00,0.00L 352.00,0.00L 192.00,160.00L 512.00,160.00L 512.00,288.00L 192.00,288.00L 352.00,448.00L 224.00,448.00L0.00,224.00 z" />
-<glyph unicode="&#xe05e;" d="M 512.00,256.00L 256.00,480.00L0.00,256.00l 186.225,0.00 L 128.00-32.00l 256.00,0.00 l-58.226,288.00L 512.00,256.00 z M 346.226,0.00L 165.775,0.00 L 224.00,288.00L 85.167,288.00 L 256.00,437.479L 426.834,288.00
-	L 288.00,288.00 L 346.226,0.00z" />
-<glyph unicode="&#xe05f;" d="M 288.00-32.00l 224.00,256.00L 288.00,480.00l0.00-186.225 L0.00,352.00l0.00-256.00 l 288.00,58.227L 288.00-32.00 z M 32.00,133.774L 32.00,314.226 L 320.00,256.00L 320.00,394.833 L 469.479,224.00L 320.00,53.166L 320.00,192.00
-	L 32.00,133.774z" />
-<glyph unicode="&#xe060;" d="M0.00,192.00l 256.00-224.00l 256.00,224.00L 325.776,192.00 L 384.00,480.00L 128.00,480.00 l 58.227-288.00L0.00,192.00 z M 165.775,448.00l 180.451,0.00 L 288.00,160.00l 138.833,0.00 L 256.00,10.521L 85.166,160.00L 224.00,160.00
-	L 165.775,448.00z" />
-<glyph unicode="&#xe061;" d="M 224.00,480.00L0.00,224.00l 224.00-256.00L 224.00,154.226 l 288.00-58.225L 512.00,352.00 l-288.00-58.227L 224.00,480.00 z M 480.00,314.226l0.00-180.45 l-288.00,58.226l0.00-138.833 L 42.522,224.00
-	L 192.00,394.834L 192.00,256.00 L 480.00,314.226z" />
-<glyph unicode="&#xe062;" d="M 256.00,480.00L 32.00-32.00L 256.00,64.00L 480.00-32.00 z" />
-<glyph unicode="&#xe063;" d="M 512.00,224.00L0.00,448.00L 96.00,224.00L0.00,0.00 z" />
-<glyph unicode="&#xe064;" d="M 256.00-32.00L 480.00,480.00L 256.00,384.00L 32.00,480.00 z" />
-<glyph unicode="&#xe065;" d="M0.00,224.00L 512.00,0.00L 416.00,224.00L 512.00,448.00 z" />
-<glyph unicode="&#xe066;" d="M 128.00,256.00L 128.00,192.001L 224.00,288.00L 224.00,96.001L 288.00,96.00L 288.001,288.00L 384.001,192.00L 384.001,256.00L 256.001,384.00 	zM0.00,224.00c0.00-141.384, 114.615-255.999, 256.00-256.00c 141.385,0.00, 256.00,114.615, 256.00,256.00c 0.001,141.385-114.614,256.00-256.00,256.00
-		S0.00,365.385,0.00,224.00z M 480.001,224.00C 480.00,100.288, 379.712,0.00, 256.00,0.00C 132.288,0.001, 32.00,100.289, 32.00,224.00c0.00,123.712, 100.288,224.00, 224.00,224.00
-		S 480.001,347.712, 480.001,224.00z" />
-<glyph unicode="&#xe067;" d="M 288.00,352.00L 224.00,352.00L 320.00,256.00L 128.00,256.00L 128.00,192.00L 320.00,192.00L 224.00,96.00L 288.00,96.00L 416.00,224.00 	zM 256.00,480.00C 114.615,480.00,0.00,365.385,0.00,224.00s 114.615-256.00, 256.00-256.00s 256.00,114.615, 256.00,256.00S 397.385,480.00, 256.00,480.00z M 256.00,0.00
-		C 132.288,0.00, 32.00,100.288, 32.00,224.00S 132.288,448.00, 256.00,448.00s 224.00-100.288, 224.00-224.00S 379.712,0.00, 256.00,0.00z" />
-<glyph unicode="&#xe068;" d="M 384.00,192.00L 384.00,256.00L 288.00,160.00L 288.00,352.00L 224.00,352.00L 224.00,160.00L 128.00,256.00L 128.00,192.00L 256.00,64.00 	zM 512.00,224.00C 512.00,365.385, 397.385,480.00, 256.00,480.00S0.00,365.385,0.00,224.00s 114.615-256.00, 256.00-256.00S 512.00,82.615, 512.00,224.00z M 32.00,224.00
-		C 32.00,347.712, 132.288,448.00, 256.00,448.00s 224.00-100.288, 224.00-224.00S 379.712,0.00, 256.00,0.00S 32.00,100.288, 32.00,224.00z" />
-<glyph unicode="&#xe069;" d="M 224.00,96.00L 288.00,96.00L 192.00,192.00L 384.00,192.00L 384.00,256.00L 192.00,256.00L 288.00,352.00L 224.00,352.00L 96.00,224.00 	zM 256.00-32.00c 141.385,0.00, 256.00,114.615, 256.00,256.00S 397.385,480.00, 256.00,480.00C 114.615,480.00,0.00,365.385,0.00,224.00C0.00,82.615, 114.615-32.00, 256.00-32.00z
-		 M 256.00,448.00c 123.712,0.00, 224.00-100.289, 224.00-224.00S 379.712,0.00, 256.00,0.00S 32.00,100.288, 32.00,224.00C 32.00,347.712, 132.288,448.00, 256.00,448.00z" />
-<glyph unicode="&#xe06a;" d="M 384.00,256.00L 256.00,384.00L 128.00,256.00 	zM 128.00,160.00L 256.00,32.00L 384.00,160.00 	z" />
-<glyph unicode="&#xe06b;" d="M 512.00,448.00L 416.00,448.00L 416.00,224.00L 176.00,224.00L 256.00,304.00L 192.00,368.00L0.00,176.00L 192.00-16.00L 256.00,48.00L 176.00,128.00L 512.00,128.00 z" />
-<glyph unicode="&#xe06c;" d="M 160.00,384.00L0.00,224.00l 160.00-160.00l 352.00,0.00 L 512.00,384.00 L 160.00,384.00 z M 480.00,96.00L 173.255,96.00 l-128.00,128.00l 128.00,128.00L 480.00,352.00 L 480.00,96.00 zM 288.00,128.00L 352.00,192.00L 416.00,128.00L 448.00,160.00L 384.00,224.00L 448.00,288.00L 416.00,320.00L 352.00,256.00L 288.00,320.00L 256.00,288.00L 320.00,224.00L 256.00,160.00 	z" />
-<glyph unicode="&#xe06d;" d="M 160.00,384.00L0.00,224.00l 160.00-160.00l 352.00,0.00 L 512.00,384.00 L 160.00,384.00 z M 469.12,145.92l-39.04-39.04L 352.00,184.96l-78.08-78.08l-39.04,39.04L 312.96,224.00
-	l-78.08,78.08l 39.04,39.04L 352.00,263.04l 78.08,78.08l 39.04-39.04L 391.04,224.00L 469.12,145.92z" />
-<glyph unicode="&#xe06e;" d="M 352.00,192.00L 480.00,320.00L 352.00,448.00L 352.00,352.00L0.00,352.00L0.00,288.00L 352.00,288.00 	zM 160.00,160.00L 160.00,256.00L 32.00,128.00L 160.00,0.00L 160.00,96.00L 512.00,96.00L 512.00,160.00 	z" />
-<glyph unicode="&#xe06f;" d="M 352.00,384.00L0.00,384.00L0.00,320.00L 352.00,320.00L 352.00,224.00L 480.00,352.00L 352.00,480.00 	zM 480.00,480.00L 480.00,352.00L 480.00,224.00L 512.00,224.00L 512.00,480.00 	zM 160.00,224.00L 32.00,96.00L 160.00-32.00L 160.00,64.00L 512.00,64.00L 512.00,128.00L 160.00,128.00 	zM0.00,224.00L0.00-32.00L 32.00-32.00L 32.00,96.00L 32.00,224.00 	z" />
-<glyph unicode="&#xe070;" d="M0.00,480.00l0.00-512.00 l 512.00,0.00 L 512.00,480.00 L0.00,480.00 z M 480.00,0.00L 32.00,0.00 L 32.00,448.00 l 448.00,0.00 L 480.00,0.00 zM 384.00,352.00L 224.00,192.00L 128.00,288.00L 64.00,224.00L 224.00,64.00L 448.00,288.00 	z" />
-<glyph unicode="&#xe071;" d="M0.00,480.00l0.00-512.00 l 512.00,0.00 L 512.00,480.00 L0.00,480.00 z M 480.00,0.00L 32.00,0.00 L 32.00,448.00 l 448.00,0.00 L 480.00,0.00 z" />
-<glyph unicode="&#xe072;" d="M0.00,480.00l0.00-512.00 l 512.00,0.00 L 512.00,480.00 L0.00,480.00 z M 480.00,0.00L 32.00,0.00 L 32.00,448.00 l 448.00,0.00 L 480.00,0.00 zM 128.00,352.00L 384.00,352.00L 384.00,96.00L 128.00,96.00z" />
-<glyph unicode="&#xe073;" d="M 256.00,480.00C 114.615,480.00,0.00,365.385,0.00,224.00s 114.615-256.00, 256.00-256.00s 256.00,114.615, 256.00,256.00S 397.385,480.00, 256.00,480.00z M 256.00,32.00
-		c-106.039,0.00-192.00,85.961-192.00,192.00c0.00,106.039, 85.961,192.00, 192.00,192.00c 106.039,0.00, 192.00-85.961, 192.00-192.00C 448.00,117.961, 362.039,32.00, 256.00,32.00zM 160.00,224.00A96.00,96.00 4860.00 1,0 352.00,224A96.00,96.00 4860.00 1,0 160.00,224z" />
-<glyph unicode="&#xe074;" d="M 256.00,480.00C 114.615,480.00,0.00,365.385,0.00,224.00s 114.615-256.00, 256.00-256.00s 256.00,114.615, 256.00,256.00S 397.385,480.00, 256.00,480.00z M 256.00,32.00
-	c-106.039,0.00-192.00,85.961-192.00,192.00c0.00,106.039, 85.961,192.00, 192.00,192.00c 106.039,0.00, 192.00-85.961, 192.00-192.00C 448.00,117.961, 362.039,32.00, 256.00,32.00z" />
-<glyph unicode="&#xe075;" d="M 399.798,471.896C 354.535,471.896, 325.488,480.00, 278.874,480.00C 128.232,480.00, 57.978,394.208, 57.978,307.064
-	c0.00-51.339, 24.32-68.229, 72.282-68.229c-3.379,7.432-9.457,15.54-9.457,52.017c0.00,102.005, 38.503,131.729, 87.818,133.755
-	c0.00,0.00-40.459-396.687-157.889-444.271L 50.732-32.00 l 84.359,0.00 l 73.938,0.00 l 54.013,256.00l 98.922,0.00 L 384.00,288.00L 276.546,288.00 l 25.972,123.095
-	c 29.723-6.078, 58.771-12.158, 83.766-12.158c 31.074,0.00, 59.447,9.457, 74.984,81.063C 442.355,473.92, 422.087,471.896, 399.798,471.896z" />
-<glyph unicode="&#xe076;" d="M0.00,384.00L 512.00,384.00L 512.00,352.00L0.00,352.00zM0.00,320.00L 352.00,320.00L 352.00,288.00L0.00,288.00zM0.00,256.00L 512.00,256.00L 512.00,224.00L0.00,224.00zM0.00,192.00L 352.00,192.00L 352.00,160.00L0.00,160.00zM0.00,128.00L 512.00,128.00L 512.00,96.00L0.00,96.00zM0.00,64.00L 352.00,64.00L 352.00,32.00L0.00,32.00z" />
-<glyph unicode="&#xe077;" d="M0.00,384.00L 512.00,384.00L 512.00,352.00L0.00,352.00zM 96.00,320.00L 416.00,320.00L 416.00,288.00L 96.00,288.00zM 96.00,192.00L 416.00,192.00L 416.00,160.00L 96.00,160.00zM 96.00,64.00L 416.00,64.00L 416.00,32.00L 96.00,32.00zM0.00,256.00L 512.00,256.00L 512.00,224.00L0.00,224.00zM0.00,128.00L 512.00,128.00L 512.00,96.00L0.00,96.00z" />
-<glyph unicode="&#xe078;" d="M0.00,384.00L 512.00,384.00L 512.00,352.00L0.00,352.00zM 160.00,320.00L 512.00,320.00L 512.00,288.00L 160.00,288.00zM0.00,256.00L 512.00,256.00L 512.00,224.00L0.00,224.00zM 160.00,192.00L 512.00,192.00L 512.00,160.00L 160.00,160.00zM0.00,128.00L 512.00,128.00L 512.00,96.00L0.00,96.00zM 160.00,64.00L 512.00,64.00L 512.00,32.00L 160.00,32.00z" />
-<glyph unicode="&#xe079;" d="M 256.00,480.00c-70.692,0.00-128.00-57.308-128.00-128.00s 57.308-128.00, 128.00-128.00l0.00-256.00 l 64.00,0.00 L 320.00,416.00 l 64.00,0.00 l0.00-448.00 l 64.00,0.00 L 448.00,416.00 l 64.00,0.00 L 512.00,480.00 L 256.00,480.00 zM0.00,128.00L 128.00,256.00L0.00,384.00 	z" />
-<glyph unicode="&#xe07a;" d="M 128.00,480.00C 57.308,480.00,0.00,422.692,0.00,352.00s 57.308-128.00, 128.00-128.00l0.00-256.00 l 64.00,0.00 L 192.00,416.00 l 64.00,0.00 l0.00-448.00 l 64.00,0.00 L 320.00,416.00 l 64.00,0.00 L 384.00,480.00 L 128.00,480.00 zM 512.00,384.00L 384.00,256.00L 512.00,128.00 	z" />
-<glyph unicode="&#xe07b;" d="M 128.00,160.00c0.00,0.00, 29.412,96.00, 192.00,96.00l0.00-96.00 l 192.00,128.00L 320.00,416.00l0.00-96.00 C 192.00,320.00, 128.00,240.164, 128.00,160.00zM 352.00,96.00L 64.00,96.00 L 64.00,288.00 l 62.938,0.00 c 5.047,5.959, 10.456,11.667, 16.244,17.09c 21.982,20.595, 48.281,36.326, 78.057,46.91L0.00,352.00 l0.00-320.00 l 416.00,0.00
-		L 416.00,166.312 l-64.00-42.667L 352.00,96.00 z" />
-<glyph unicode="&#xe07c;" d="M 320.00,448.00L 384.00,384.00L 160.00,160.00L 192.00,128.00L 416.00,352.00L 480.00,288.00L 480.00,448.00 	zM 352.00,64.00L 96.00,64.00L 96.00,320.00L 224.00,320.00L 288.00,384.00L 32.00,384.00L 32.00,0.00L 416.00,0.00L 416.00,256.00L 352.00,192.00 	z" />
-<glyph unicode="&#xe07d;" d="M 160.00,352.00L 32.00,224.00L 160.00,96.00L 224.00,96.00L 96.00,224.00L 224.00,352.00 	zM 352.00,352.00L 288.00,352.00L 416.00,224.00L 288.00,96.00L 352.00,96.00L 480.00,224.00 	z" />
-<glyph unicode="&#xe07e;" d="M 352.00,416.00L 384.00,448.00L 352.00,480.00L 160.00,480.00L 128.00,448.00L 160.00,416.00 	zM 384.00,432.00L 352.00,400.00L 352.00,272.00L 384.00,240.00L 416.00,272.00L 416.00,400.00 	zM 160.00,271.999L 160.00,400.00L 128.00,432.00L 96.00,400.00L 96.00,271.999L 128.00,239.999 	zM 352.00,176.00L 352.00,48.00L 384.00,16.00L 416.00,48.00L 416.00,176.00L 384.00,208.00 	zM 160.00,48.00L 160.00,176.00L 128.00,208.00L 96.00,176.00L 96.00,48.00L 128.00,16.00 	zM 160.00,32.00L 128.00,0.00L 160.00-32.00L 352.00-32.00L 384.00,0.00L 352.00,32.00 	z" />
-<glyph unicode="&#xe07f;" d="M 384.00,432.00L 352.00,400.00L 352.00,272.00L 384.00,240.00L 416.00,272.00L 416.00,400.00 	zM 352.00,176.00L 352.00,48.00L 384.00,16.00L 416.00,48.00L 416.00,176.00L 384.00,208.00 	z" />
-<glyph unicode="&#xe080;" d="M 128.00,448.00L 160.00,480.00L 352.00,480.00L 384.00,448.00L 352.00,416.00L 160.00,416.00 zM 384.00,240.00L 352.00,272.00L 352.00,400.00L 384.00,432.00L 416.00,400.00L 416.00,272.00 zM 128.00,16.00L 96.00,48.00L 96.00,176.00L 128.00,208.00L 160.00,176.00L 160.00,48.00 zM 128.00,224.00L 160.00,256.00L 352.00,256.00L 384.00,224.00L 352.00,192.00L 160.00,192.00 zM 128.00,0.00L 160.00,32.00L 352.00,32.00L 384.00,0.00L 352.00-32.00L 160.00-32.00 z" />
-<glyph unicode="&#xe081;" d="M 128.00,448.00L 160.00,480.00L 352.00,480.00L 384.00,448.00L 352.00,416.00L 160.00,416.00 zM 384.00,240.00L 352.00,272.00L 352.00,400.00L 384.00,432.00L 416.00,400.00L 416.00,272.00 zM 384.00,16.00L 352.00,48.00L 352.00,176.00L 384.00,208.00L 416.00,176.00L 416.00,48.00 zM 128.00,224.00L 160.00,256.00L 352.00,256.00L 384.00,224.00L 352.00,192.00L 160.00,192.00 zM 128.00,0.00L 160.00,32.00L 352.00,32.00L 384.00,0.00L 352.00-32.00L 160.00-32.00 z" />
-<glyph unicode="&#xe082;" d="M 384.00,240.00L 352.00,272.00L 352.00,400.00L 384.00,432.00L 416.00,400.00L 416.00,272.00 zM 128.00,239.999L 96.00,271.999L 96.00,400.00L 128.00,432.00L 160.00,400.00L 160.00,271.999 zM 384.00,16.00L 352.00,48.00L 352.00,176.00L 384.00,208.00L 416.00,176.00L 416.00,48.00 zM 128.00,224.00L 160.00,256.00L 352.00,256.00L 384.00,224.00L 352.00,192.00L 160.00,192.00 z" />
-<glyph unicode="&#xe083;" d="M 128.00,448.00L 160.00,480.00L 352.00,480.00L 384.00,448.00L 352.00,416.00L 160.00,416.00 zM 128.00,239.999L 96.00,271.999L 96.00,400.00L 128.00,432.00L 160.00,400.00L 160.00,271.999 zM 384.00,16.00L 352.00,48.00L 352.00,176.00L 384.00,208.00L 416.00,176.00L 416.00,48.00 zM 128.00,224.00L 160.00,256.00L 352.00,256.00L 384.00,224.00L 352.00,192.00L 160.00,192.00 zM 128.00,0.00L 160.00,32.00L 352.00,32.00L 384.00,0.00L 352.00-32.00L 160.00-32.00 z" />
-<glyph unicode="&#xe084;" d="M 128.00,448.00L 160.00,480.00L 352.00,480.00L 384.00,448.00L 352.00,416.00L 160.00,416.00 zM 128.00,239.999L 96.00,271.999L 96.00,400.00L 128.00,432.00L 160.00,400.00L 160.00,271.999 zM 384.00,16.00L 352.00,48.00L 352.00,176.00L 384.00,208.00L 416.00,176.00L 416.00,48.00 zM 128.00,16.00L 96.00,48.00L 96.00,176.00L 128.00,208.00L 160.00,176.00L 160.00,48.00 zM 128.00,224.00L 160.00,256.00L 352.00,256.00L 384.00,224.00L 352.00,192.00L 160.00,192.00 zM 128.00,0.00L 160.00,32.00L 352.00,32.00L 384.00,0.00L 352.00-32.00L 160.00-32.00 z" />
-<glyph unicode="&#xe085;" d="M 128.00,448.00L 160.00,480.00L 352.00,480.00L 384.00,448.00L 352.00,416.00L 160.00,416.00 zM 384.00,240.00L 352.00,272.00L 352.00,400.00L 384.00,432.00L 416.00,400.00L 416.00,272.00 zM 384.00,16.00L 352.00,48.00L 352.00,176.00L 384.00,208.00L 416.00,176.00L 416.00,48.00 z" />
-<glyph unicode="&#xe086;" d="M 352.00,416.00L 384.00,448.00L 352.00,480.00L 160.00,480.00L 128.00,448.00L 160.00,416.00 	zM 384.00,432.00L 352.00,400.00L 352.00,272.00L 384.00,240.00L 416.00,272.00L 416.00,400.00 	zM 160.00,271.999L 160.00,400.00L 128.00,432.00L 96.00,400.00L 96.00,271.999L 128.00,239.999 	zM 352.00,176.00L 352.00,48.00L 384.00,16.00L 416.00,48.00L 416.00,176.00L 384.00,208.00 	zM 160.00,48.00L 160.00,176.00L 128.00,208.00L 96.00,176.00L 96.00,48.00L 128.00,16.00 	zM 128.00,224.00L 160.00,192.00L 352.00,192.00L 384.00,224.00L 352.00,256.00L 160.00,256.00 	zM 160.00,32.00L 128.00,0.00L 160.00-32.00L 352.00-32.00L 384.00,0.00L 352.00,32.00 	z" />
-<glyph unicode="&#xe087;" d="M 128.00,448.00L 160.00,480.00L 352.00,480.00L 384.00,448.00L 352.00,416.00L 160.00,416.00 zM 384.00,240.00L 352.00,272.00L 352.00,400.00L 384.00,432.00L 416.00,400.00L 416.00,272.00 zM 128.00,239.999L 96.00,271.999L 96.00,400.00L 128.00,432.00L 160.00,400.00L 160.00,271.999 zM 384.00,16.00L 352.00,48.00L 352.00,176.00L 384.00,208.00L 416.00,176.00L 416.00,48.00 zM 128.00,224.00L 160.00,256.00L 352.00,256.00L 384.00,224.00L 352.00,192.00L 160.00,192.00 zM 128.00,0.00L 160.00,32.00L 352.00,32.00L 384.00,0.00L 352.00-32.00L 160.00-32.00 z" />
-<glyph unicode="&#xe088;" d="M 390.628,320.00L 256.00,455.553l0.00-192.925 L 155.314,363.314l-22.628-22.628L 249.372,224.00L 132.686,107.313l 22.628-22.627L 256.00,185.372
-	l0.00-192.924 L 390.628,128.00l-96.00,96.00L 390.628,320.00z M 288.00,377.819L 345.372,320.00L 288.00,262.628L 288.00,377.819 z M 345.372,128.00L 288.00,70.181L 288.00,185.372
-	L 345.372,128.00z" />
-<glyph unicode="&#xe089;" d="M 432.00,128.00c-22.58,0.00-42.96-9.369-57.506-24.415L 158.992,211.336C 159.649,215.462, 160.00,219.689, 160.00,224.00
-	s-0.351,8.538-1.008,12.663l 215.502,107.751C 389.04,329.369, 409.42,320.00, 432.00,320.00c 44.183,0.00, 80.00,35.817, 80.00,80.00S 476.183,480.00, 432.00,480.00
-	s-80.00-35.817-80.00-80.00c0.00-4.311, 0.352-8.538, 1.008-12.663L 137.506,279.585C 122.96,294.63, 102.58,304.00, 80.00,304.00c-44.183,0.00-80.00-35.818-80.00-80.00
-	c0.00-44.184, 35.817-80.00, 80.00-80.00c 22.58,0.00, 42.96,9.369, 57.506,24.414l 215.502-107.751C 352.352,56.538, 352.00,52.311, 352.00,48.00
-	c0.00-44.184, 35.817-80.00, 80.00-80.00s 80.00,35.816, 80.00,80.00C 512.00,92.182, 476.183,128.00, 432.00,128.00z" />
-<glyph unicode="&#xe08a;" d="M 192.00,224.00A64.00,64.00 4860.00 1,0 320.00,224A64.00,64.00 4860.00 1,0 192.00,224zM 256.00,352.00c 35.346,0.00, 67.346-14.327, 90.51-37.49l 45.255,45.255C 357.02,394.51, 309.02,416.00, 256.00,416.00
-		c-83.596,0.00-154.70-53.431-181.06-128.00L0.00,288.00 l0.00-64.00 l 128.00,0.00 C 128.00,294.692, 185.308,352.00, 256.00,352.00zM 384.00,224.00c0.00-70.692-57.308-128.00-128.00-128.00c-35.346,0.00-67.346,14.327-90.51,37.49l-45.255-45.255
-		C 154.981,53.49, 202.981,32.00, 256.00,32.00c 83.596,0.00, 154.70,53.431, 181.06,128.00L 512.00,160.00 l0.00,64.00 L 384.00,224.00 z" />
-<glyph unicode="&#xe08b;" d="M 426.655,480.00L 85.345,480.00 C 38.405,480.00,0.00,441.608,0.00,394.671l0.00-341.328 C0.00,6.405, 38.405-32.00, 85.345-32.00l 341.311,0.00
-	C 473.625-32.00, 512.00,6.405, 512.00,53.343L 512.00,394.671 C 512.00,441.608, 473.625,480.00, 426.655,480.00z M 128.00,352.00l 256.00,0.00 c 4.569,0.00, 9.002-0.981, 13.072-2.831
-	L 256.00,184.585L 114.928,349.17C 118.998,351.018, 123.431,352.00, 128.00,352.00z M 96.00,128.00L 96.00,320.00 c0.00,0.67, 0.028,1.336, 0.07,2.00l 93.832-109.47
-	L 97.103,119.73C 96.381,122.399, 96.00,125.173, 96.00,128.00z M 384.00,96.00L 128.00,96.00 c-2.827,0.00-5.601,0.381-8.27,1.103l 91.059,91.059L 256.00,135.414
-	l 45.212,52.747l 91.058-91.059C 389.60,96.381, 386.827,96.00, 384.00,96.00z M 416.00,128.00c0.00-2.827-0.381-5.60-1.103-8.27l-92.799,92.799L 415.93,322.00
-	c 0.042-0.664, 0.07-1.33, 0.07-2.00L 416.00,128.00 z" />
-<glyph unicode="&#xe08c;" d="M 279.533,448.00c0.00,0.00-100.478,0.00-133.97,0.00C 85.503,448.00, 28.978,402.497, 28.978,349.789c0.00-53.863, 40.941-97.333, 102.044-97.333
-		c 4.249,0.00, 8.378,0.085, 12.421,0.376c-3.965-7.593-6.801-16.144-6.801-25.021c0.00-14.969, 8.052-27.105, 18.234-37.012
-		c-7.693,0.00-15.121-0.224-23.226-0.224C 57.259,190.576,0.00,143.196,0.00,94.065c0.00-48.389, 62.771-78.657, 137.167-78.657
-		c 84.812,0.00, 131.653,48.122, 131.653,96.514c0.00,38.80-11.448,62.036-46.843,87.067c-12.108,8.572-35.265,29.418-35.265,41.672
-		c0.00,14.36, 4.098,21.434, 25.714,38.323c 22.156,17.312, 37.836,41.651, 37.836,69.958c0.00,33.703-15.01,66.549-43.186,77.386l 42.477,0.00
-		L 279.533,448.00z M 232.74,120.271c 1.063-4.486, 1.642-9.103, 1.642-13.814c0.00-39.10-25.196-69.655-97.487-69.655
-		c-51.421,0.00-88.558,32.552-88.558,71.65c0.00,38.321, 46.063,70.222, 97.482,69.666c 12.00-0.127, 23.184-2.058, 33.335-5.345
-		C 207.067,153.36, 227.092,142.392, 232.74,120.271z M 150.409,266.112c-34.519,1.032-67.318,38.613-73.276,83.93
-		c-5.958,45.333, 17.185,80.021, 51.694,78.995c 34.505-1.037, 67.319-37.407, 73.279-82.729
-		C 208.059,300.978, 184.911,265.079, 150.409,266.112zM 416.00,352.00L 416.00,448.00L 384.00,448.00L 384.00,352.00L 288.00,352.00L 288.00,320.00L 384.00,320.00L 384.00,224.00L 416.00,224.00L 416.00,320.00L 512.00,320.00L 512.00,352.00 	z" />
-<glyph unicode="&#xe08d;" d="M 426.756,480.00L 84.621,480.00 C 37.571,480.00,0.00,441.107,0.00,394.061l0.00-340.176 C0.00,5.674, 37.571-32.00, 84.621-32.00l 342.134,0.00
-	C 473.803-32.00, 512.00,5.674, 512.00,53.885L 512.00,394.061 C 512.00,441.107, 473.803,480.00, 426.756,480.00z M 352.00,464.00l0.00-80.00 l-80.00,0.00 L 272.00,464.00 L 352.00,464.00 z M 240.00,464.00l0.00-80.00 l-80.00,0.00 L 160.00,464.00 L 240.00,464.00 z
-	 M 16.00,384.00L 16.00,394.061 C 16.00,432.625, 46.783,464.00, 84.621,464.00L 128.00,464.00 l0.00-80.00 L 16.00,384.00 z M 384.00,160.00l-96.00,0.00 l0.00-96.00 l-64.00,0.00 l0.00,96.00 l-96.00,0.00 l0.00,64.00 l 96.00,0.00 l0.00,96.00 l 64.00,0.00 l0.00-96.00 l 96.00,0.00 L 384.00,160.00 z M 496.00,384.00L 384.00,384.00 L 384.00,464.00
-	l 42.756,0.00 C 464.938,464.00, 496.00,432.625, 496.00,394.061L 496.00,384.00 z" />
-<glyph unicode="&#xe08e;" d="M 156.281,73.361c-13.536,4.367-28.447,6.937-44.447,7.104c-45.917,0.494-88.626-18.364-111.831-46.178L 0.003,0.00
-		c0.00-17.60, 14.398-32.00, 32.00-32.00l 196.562,0.00 c 0.908,5.564, 1.348,11.316, 1.348,17.216c0.00,6.267-0.767,12.396-2.188,18.361
-		C 220.196,32.98, 193.498,47.56, 156.281,73.361zM 186.885,304.025c-7.947,60.24-51.698,108.584-97.704,109.961c-46.013,1.365-76.87-44.741-68.926-105.00
-		c 7.941-60.234, 51.676-110.187, 97.699-111.56C 163.959,196.057, 194.821,243.775, 186.885,304.025zM 0.003,76.721c 26.72,12.687, 58.444,20.311, 92.94,20.311c 10.807,0.00, 20.711,0.295, 30.968,0.295
-		c-13.573,13.167-24.313,29.30-24.313,49.191c0.00,11.803, 3.782,23.168, 9.067,33.26c-5.391-0.385-10.895-0.498-16.563-0.498
-		c-37.178,0.00-68.754,12.039-92.103,31.928L 0.003,76.721L 0.003,76.721zM 512.00,352.00L 512.00,448.00 c0.00,17.60-14.40,32.00-32.00,32.00L 32.002,480.00 c-17.602,0.00-32.00-14.40-32.00-32.00l0.00-51.014 c 29.184,25.722, 69.693,42.209, 111.495,42.209
-		c 44.652,0.00, 178.622,0.00, 178.622,0.00l-39.974-28.809l-56.634,0.00 c 37.565-14.402, 57.578-58.062, 57.578-102.861
-		c0.00-37.624-20.905-69.977-50.444-92.984c-28.822-22.451-34.286-31.854-34.286-50.939c0.00-16.289, 30.873-44.00, 47.016-55.394
-		c 47.192-33.269, 62.458-64.156, 62.458-115.728c0.00-8.213-1.021-16.415-3.033-24.48L 480.00-32.00 c 17.60,0.00, 32.00,14.399, 32.00,31.999l0.00,320.00 l-96.00,0.00 L 416.00,224.00 l-32.00,0.00
-		l0.00,96.00 l-95.999,0.00 l0.00,32.00 L 384.00,352.00 L 384.00,448.00 l 32.00,0.00 l0.00-96.00 L 512.00,352.00 z" />
-<glyph unicode="&#xe08f;" d="M 309.159,382.463l 78.766,0.00 L 387.925,480.00 l-78.766,0.00 C 244.006,480.00, 191.00,422.579, 191.00,352.00l0.00-49.229 l-78.768,0.00 l0.00-97.847 L 191.00,204.924 L 191.00-32.00 l 98.468,0.00 L 289.468,204.924 l 98.457,0.00
-	l0.00,97.847 l-98.457,0.00 l0.00,50.154 C 289.468,369.829, 299.865,382.463, 309.159,382.463z" />
-<glyph unicode="&#xe090;" d="M 426.672,480.00L 85.342,480.00 C 38.406,480.00,0.00,441.593,0.00,394.656l0.00-341.313 C0.00,6.374, 38.406-32.00, 85.342-32.00l 170.654,0.00 L 255.996,160.50 l-64.00,0.00 L 191.996,240.00 l 64.00,0.00 l0.00,40.00
-	c0.00,57.344, 43.063,104.001, 96.004,104.001l 64.00,0.00 l0.00-79.25 l-64.00,0.00 c-7.551,0.00-16.00-10.266-16.00-24.00L 336.00,240.00 l 80.00,0.00 l0.00-79.50 l-80.00,0.00 l0.00-192.499 l 90.672,0.00
-	c 46.937,0.00, 85.328,38.373, 85.328,85.344L 512.00,394.656 C 512.00,441.593, 473.609,480.00, 426.672,480.00z" />
-<glyph unicode="&#xe091;" d="M 512.00,237.684c-18.021-3.075-44.153,0.124-58.001,5.884c 28.776,2.382, 48.259,15.461, 55.762,33.213
-	c-10.366-6.385-42.581-13.336-60.343-6.712c-0.888,4.181-1.849,8.155-2.826,11.752c-13.529,49.793-59.93,89.916-108.513,85.066
-	c 3.914,1.589, 7.892,3.065, 11.906,4.413c 5.319,1.917, 36.72,7.038, 31.784,18.108c-4.186,9.766-42.543-7.341-49.761-9.59
-	c 9.534,3.573, 25.303,9.737, 26.982,20.714c-14.602-2.003-28.938-8.917-40.013-18.968c 4.005,4.304, 7.037,9.553, 7.678,15.209
-	c-38.962-24.923-61.724-75.125-80.128-123.863c-14.457,14.041-27.306,25.088-38.789,31.243
-	c-32.25,17.288-70.825,35.354-131.355,57.859c-1.86-20.048, 9.901-46.725, 43.77-64.437c-7.332,0.991-20.751-1.23-31.467-3.779
-	c 4.363-22.99, 18.642-41.913, 57.325-51.052c-17.674-1.163-26.824-5.213-35.092-13.867c 8.048-15.981, 27.715-34.778, 63.026-30.913
-	c-39.299-16.963-16.025-48.363, 15.959-43.675C 135.374,97.884, 49.38,102.064,0.00,149.206
-	c 128.911-175.847, 409.165-103.979, 450.908,65.389C 482.226,214.341, 500.595,225.436, 512.00,237.684z" />
-<glyph unicode="&#xe092;" d="M 426.671,480.00L 85.343,480.00 C 38.406,480.00,0.00,441.595,0.00,394.655l0.00-341.311 C0.00,6.375, 38.406-32.00, 85.343-32.00l 341.328,0.00
-	C 473.609-32.00, 512.00,6.375, 512.00,53.345L 512.00,394.655 C 512.00,441.595, 473.609,480.00, 426.671,480.00z M 402.181,216.946
-	C 370.874,89.92, 160.683,36.02, 64.00,167.904c 37.035-35.355, 101.53-38.491, 142.428,3.813c-23.988-3.517-41.443,20.033-11.97,32.756
-	c-26.482-2.899-41.233,11.199-47.269,23.185c 6.201,6.491, 13.063,9.528, 26.319,10.40c-29.012,6.854-39.722,21.046-42.994,38.289
-	c 8.036,1.911, 18.101,3.577, 23.60,2.834c-25.401,13.284-34.222,33.292-32.827,48.328c 45.398-16.879, 74.33-30.429, 98.517-43.395
-	c 8.612-4.616, 18.249-12.901, 29.091-23.432c 13.805,36.553, 30.875,74.205, 60.097,92.897c-0.48-4.243-2.754-8.179-5.759-11.407
-	c 8.308,7.538, 19.059,12.724, 30.01,14.226c-1.26-8.233-13.086-12.855-20.236-15.536c 5.413,1.687, 34.181,14.518, 37.32,7.193
-	c 3.701-8.303-19.849-12.144-23.838-13.582c-3.011-1.011-5.994-2.118-8.931-3.31c 36.438,3.637, 71.238-26.455, 81.385-63.80
-	c 0.734-2.697, 1.454-5.678, 2.12-8.814c 13.321-4.967, 37.482,0.246, 45.258,5.035c-5.628-13.314-20.24-23.124-41.822-24.91
-	c 10.386-4.321, 29.985-6.719, 43.501-4.413C 439.447,225.077, 425.669,216.756, 402.181,216.946z" />
-<glyph unicode="&#xe093;" d="M 412.149,95.625L 271.362,95.625 c-41.494,0.00-80.083,43.219-80.083,92.439l0.00,35.713 l 219.24,0.00 c 35.479,0.00, 64.232,28.671, 64.232,64.038
-	c0.00,35.382-28.756,64.061-64.232,64.061l-219.24,0.00 L 191.279,415.14 c0.00,35.81-26.826,64.86-62.312,64.86C 93.512,480.00, 64.756,450.95, 64.756,415.14
-	l0.00-227.078 C 64.756,66.447, 156.189-32.00, 269.225-32.00l 140.77,0.00 c 35.479,0.00, 64.758,28.553, 64.758,64.361
-	C 474.75,68.197, 447.625,95.625, 412.149,95.625z" />
-<glyph unicode="&#xe094;" d="M 426.671,480.00L 85.343,480.00 C 38.406,480.00,0.00,441.595,0.00,394.655l0.00-341.311 C0.00,6.375, 38.406-32.00, 85.343-32.00l 341.328,0.00
-	C 473.609-32.00, 512.00,6.375, 512.00,53.345L 512.00,394.655 C 512.00,441.595, 473.609,480.00, 426.671,480.00z M 257.00,144.00l 87.903,0.00
-	c 22.155,0.00, 39.094-17.124, 39.094-39.499c0.00-22.36-18.279-40.188-40.438-40.188l-87.89,0.00 c-70.577,0.00-127.67,61.47-127.67,137.403L 127.999,343.501
-	c0.00,22.359, 17.952,40.50, 40.094,40.50c 22.156,0.00, 38.907-18.141, 38.907-40.50L 207.00,304.00 L 343.89,304.00 c 22.156,0.00, 40.107-17.907, 40.107-39.999
-	c0.00-22.079-17.951-39.985-40.107-39.985L 207.001,224.016 l0.00-22.297 C 207.001,170.982, 231.094,144.00, 257.00,144.00z" />
-<glyph unicode="&#xe095;" d="M 68.147,104.535c-37.598,0.00-68.146-30.667-68.146-68.038c0.00-37.577, 30.55-67.901, 68.146-67.901
-		c 37.733,0.00, 68.247,30.324, 68.247,67.901C 136.393,73.868, 105.882,104.535, 68.147,104.535zM 0.078,306.035l0.00-98.129 c 63.892,0.00, 123.979-24.986, 169.229-70.256c 45.192-45.159, 70.141-105.518, 70.141-169.65l 98.561,0.00
-		C 338.008,154.41, 186.368,306.035, 0.078,306.035zM 0.194,480.00l0.00-98.178 c 227.891,0.00, 413.378-185.667, 413.378-413.822L 512.00-32.00 C 512.00,250.235, 282.373,480.00, 0.194,480.00z" />
-<glyph unicode="&#xe096;" d="M 426.67,480.00L 85.343,480.00 C 38.405,480.00,0.00,441.594,0.00,394.656l0.00-341.314 C0.00,6.375, 38.406-32.00, 85.344-32.00L 426.67-32.00
-	c 46.938,0.00, 85.33,38.374, 85.33,85.342L 512.00,394.656 C 512.00,441.594, 473.608,480.00, 426.67,480.00z M 139.472,64.376C 115.487,64.376, 96.00,83.722, 96.00,107.69
-	c0.00,23.842, 19.486,43.406, 43.472,43.406c 24.079,0.00, 43.53-19.564, 43.53-43.406C 183.001,83.722, 163.55,64.376, 139.472,64.376z
-	 M 248.734,64.002c0.00,40.905-15.904,79.409-44.73,108.222c-28.857,28.875-67.188,44.813-107.952,44.813L 96.052,279.63
-	c 118.826,0.00, 215.563-96.721, 215.563-215.627L 248.734,64.002L 248.734,64.002z M 359.814,64.002
-	c0.00,145.531-118.329,263.97-263.688,263.97L 96.126,390.596 c 180.001,0.00, 326.473-146.562, 326.473-326.596L 359.814,64.002L 359.814,64.002z" />
-<glyph unicode="&#xe097;" d="M 416.00,416.00L 96.00,416.00 c-52.80,0.00-96.00-43.20-96.00-96.00l0.00-192.00 c0.00-52.80, 43.20-96.00, 96.00-96.00l 320.00,0.00 c 52.80,0.00, 96.00,43.20, 96.00,96.00L 512.00,320.00 C 512.00,372.80, 468.80,416.00, 416.00,416.00z
-	 M 192.00,96.00L 192.00,352.00 l 160.00-128.00L 192.00,96.00z" />
-<glyph unicode="&#xe098;" d="M 416.00,416.00L 96.00,416.00 c-52.80,0.00-96.00-43.20-96.00-96.00l0.00-192.00 c0.00-52.80, 43.20-96.00, 96.00-96.00l 320.00,0.00 c 52.80,0.00, 96.00,43.20, 96.00,96.00L 512.00,320.00 C 512.00,372.80, 468.80,416.00, 416.00,416.00z
-		 M 480.00,128.00c0.00-16.989-6.687-33.031-18.827-45.173C 449.031,70.687, 432.99,64.00, 416.00,64.00L 96.00,64.00 c-16.989,0.00-33.031,6.687-45.172,18.827
-		C 38.687,94.969, 32.00,111.011, 32.00,128.00L 32.00,320.00 c0.00,16.989, 6.687,33.031, 18.828,45.172S 79.011,384.00, 96.00,384.00l 320.00,0.00
-		c 16.989,0.00, 33.031-6.687, 45.173-18.828C 473.314,353.031, 480.00,336.989, 480.00,320.00L 480.00,128.00 zM 192.00,96.00L 352.00,224.00L 192.00,352.00 	z" />
-<glyph unicode="&#xe099;" d="M0.00,325.815l 20.797-27.272c0.00,0.00, 42.885,33.804, 57.18,16.901c 14.294-16.901, 68.868-220.978, 87.085-258.623
-	c 15.90-33.015, 59.759-76.66, 107.857-45.491c 48.068,31.17, 207.92,167.643, 236.533,328.808
-	c 28.59,161.113-192.36,127.363-215.765-13.005c 58.495,35.118, 89.718-14.269, 59.785-70.186
-	c-29.879-55.862-57.18-92.296-71.476-92.296c-14.269,0.00-25.245,37.384-41.594,102.723c-16.899,67.551-16.796,189.23-87.058,175.435
-	C 87.085,429.803,0.00,325.815,0.00,325.815z" />
-<glyph unicode="&#xe09a;" d="M 426.655,480.00L 85.345,480.00 C 38.406,480.00,0.00,441.592,0.00,394.654l0.00-341.31 C0.00,6.375, 38.406-32.00, 85.345-32.00l 341.31,0.00
-	C 473.594-32.00, 512.00,6.375, 512.00,53.345L 512.00,394.654 C 512.00,441.592, 473.594,480.00, 426.655,480.00z M 406.434,292.937
-	c-16.979-95.648-111.854-176.648-140.39-195.155c-28.544-18.503-54.577,7.411-64.019,26.997
-	c-10.808,22.354-43.205,143.47-51.684,153.51c-8.482,10.019-33.938-10.04-33.938-10.04l-12.346,16.188
-	c0.00,0.00, 51.691,61.724, 91.02,69.439c 41.702,8.183, 41.64-64.033, 51.67-104.121c 9.70-38.782, 16.22-60.976, 24.688-60.976
-	c 8.486,0.00, 24.692,21.631, 42.426,54.786c 17.768,33.188-0.768,62.505-35.486,41.646C 292.267,368.536, 423.406,388.57, 406.434,292.937z" />
-<glyph unicode="&#xe09b;" d="M0.00,224.00A112.00,112.00 4860.00 1,0 224.00,224A112.00,112.00 4860.00 1,0 0.00,224zM 288.00,224.00A112.00,112.00 4860.00 1,0 512.00,224A112.00,112.00 4860.00 1,0 288.00,224z" />
-<glyph unicode="&#xe09c;" d="M 426.687,480.00L 85.344,480.00 C 38.406,480.00,0.00,441.594,0.00,394.659l0.00-341.313 C0.00,6.375, 38.406-32.00, 85.344-32.00l 341.342,0.00
-	C 473.622-32.00, 512.00,6.377, 512.00,53.348L 512.00,394.659 C 512.00,441.594, 473.622,480.00, 426.687,480.00z M 160.00,144.00c-44.183,0.00-80.00,35.816-80.00,80.00
-	c0.00,44.183, 35.817,80.00, 80.00,80.00s 80.00-35.817, 80.00-80.00C 240.00,179.816, 204.183,144.00, 160.00,144.00z M 352.00,144.00c-44.182,0.00-80.00,35.816-80.00,80.00
-	c0.00,44.183, 35.818,80.00, 80.00,80.00c 44.184,0.00, 80.00-35.817, 80.00-80.00C 432.00,179.816, 396.184,144.00, 352.00,144.00z" />
-<glyph unicode="&#xe09d;" d="M 361.51,457.045C 328.055,472.176, 292.647,480.00, 255.961,480.00c-30.521,0.00-60.527-5.865-89.381-16.779l 194.93-176.84L 361.51,457.045 zM 124.222,5.364L 124.222,225.441 L 18.468,129.299C 38.963,77.934, 76.409,34.285, 124.222,5.364zM 139.312,451.59C 53.362,407.432, 0.001,320.553, 0.001,224.00c0.00-22.029, 3.313-44.368, 9.294-66.499l 226.91,206.181L 139.312,451.59zM 151.109-9.355C 184.386-24.385, 219.612-32.00, 255.961-32.00c 97.624,0.00, 187.28,56.817, 229.895,144.727L 151.109,112.727 L 151.109-9.355 zM 388.479,442.325l0.00-302.63 l 108.904,0.00 c 9.57,27.277, 14.617,55.586, 14.617,84.304C 512.002,312.937, 464.651,396.004, 388.479,442.325z" />
-<glyph unicode="&#xe09e;" d="M 512.00,394.659C 512.00,441.791, 473.793,480.00, 426.66,480.00L 85.338,480.00 C 38.207,480.00,0.00,441.791,0.00,394.659l0.00-341.318 C0.00,6.208, 38.207-32.00, 85.338-32.00
-	l 341.323,0.00 C 473.793-32.00, 512.00,6.208, 512.00,53.341L 512.00,394.659 z M 255.877,400.865c 25.346,0.00, 49.785-5.406, 72.825-15.859l0.00-117.908 L 194.078,389.271
-	C 214.012,396.812, 234.79,400.865, 255.877,400.865z M 79.134,224.00c0.00,66.707, 36.867,126.73, 96.249,157.236l 66.939-60.732L 85.556,178.057
-	C 81.424,193.348, 79.134,208.779, 79.134,224.00z M 164.864,72.949c-32.768,19.979-58.905,50.138-73.063,85.623l 73.063,66.423L 164.864,72.949 z
-	 M 255.854,47.174c-25.11,0.00-49.518,5.226-72.558,15.605L 183.296,147.20 l 231.507,0.00 C 385.361,86.271, 323.30,47.174, 255.854,47.174z
-	 M 422.767,165.632l-75.118,0.00 L 347.649,374.836 c 52.735-32.002, 85.278-89.452, 85.278-150.898C 432.927,204.096, 429.382,184.576, 422.767,165.632z" />
-<glyph unicode="&#xe09f;" d="M 256.00-32.00C 114.614-32.00,0.00,82.609,0.00,223.99C0.00,365.37, 114.615,480.00, 256.00,480.00c 141.375,0.00, 256.00-114.631, 256.00-256.01S 397.375-32.00, 256.00-32.00z
-	 M 465.581,197.137c-50.24,6.594-94.794,7.071-134.495,0.938c 16.435-46.862, 30.188-97.346, 41.018-150.532
-	C 422.346,80.675, 457.642,134.609, 465.581,197.137z M 331.781,26.927c-10.141,59.365-24.095,112.72-42.061,161.953
-	c-67.229-20.177-119.50-63.339-163.374-131.501c 35.816-27.915, 80.724-44.679, 129.641-44.679
-	C 282.74,12.70, 308.221,17.858, 331.781,26.927z M 44.687,223.99c0.00-52.272, 19.091-100.029, 50.543-136.932
-	c 53.639,78.629, 114.009,119.584, 179.935,138.636c-5.431,12.771-11.058,25.377-17.11,37.648
-	c-58.881-17.743-128.601-27.041-212.938-30.931C 45.00,229.606, 44.687,226.839, 44.687,223.99z M 49.46,268.461
-	c 66.551,2.933, 131.525,10.337, 191.075,28.33c-22.678,40.52-49.305,78.583-79.691,115.691
-	C 104.744,384.111, 62.996,331.59, 49.46,268.461z M 255.99,435.30c-18.52,0.00-36.382-2.62-53.505-7.093
-	c 29.358-32.323, 56.089-71.637, 79.734-116.73c 41.102,16.973, 78.827,40.332, 111.747,72.344C 356.941,415.811, 308.782,435.30, 255.99,435.30z
-	 M 419.551,357.736c-34.483-34.944-73.847-60.965-120.584-80.061c 6.377-13.77, 12.399-28.102, 18.227-42.724
-	c 47.438,7.343, 97.428,5.721, 149.608,0.374C 464.343,281.648, 447.138,324.04, 419.551,357.736z" />
-<glyph unicode="&#xe0a0;" d="M 152.278,90.703c 28.653-22.332, 64.579-35.743, 103.712-35.743c 21.402,0.00, 41.787,4.127, 60.635,11.382
-		c-8.112,47.492-19.275,90.176-33.648,129.563C 229.194,179.763, 187.377,145.232, 152.278,90.703zM 271.331,225.356c-4.345,10.217-8.846,20.301-13.688,30.118c-47.104-14.194-102.88-21.633-170.351-24.745
-		c-0.092-2.245-0.343-4.458-0.343-6.737c0.00-41.818, 15.272-80.023, 40.435-109.545C 170.295,177.35, 218.591,210.114, 271.331,225.356zM 366.373,351.856c-29.621,25.592-68.147,41.184-110.381,41.184c-14.815,0.00-29.105-2.096-42.804-5.674
-		c 23.486-25.859, 44.871-57.31, 63.787-93.384C 309.858,307.56, 340.037,326.247, 366.373,351.856zM 179.875,374.786c-44.88-22.697-78.278-64.714-89.107-115.217c 53.241,2.346, 105.22,8.27, 152.86,22.664
-		C 225.486,314.649, 204.185,345.099, 179.875,374.786zM 316.069,203.26c 13.148-37.49, 24.151-77.877, 32.814-120.426c 40.193,26.506, 68.431,69.653, 74.782,119.676
-		C 383.473,207.784, 347.83,208.166, 316.069,203.26zM 426.672,480.00L 85.343,480.00 C 38.406,480.00,0.00,441.595,0.00,394.655l0.00-341.311 C0.00,6.375, 38.406-32.00, 85.343-32.00l 341.33,0.00
-		C 473.612-32.00, 512.00,6.374, 512.00,53.345L 512.00,394.655 C 512.002,441.595, 473.612,480.00, 426.672,480.00z M 256.00,19.20
-		c-113.109,0.00-204.80,91.688-204.80,204.792C 51.20,337.096, 142.892,428.80, 256.00,428.80c 113.10,0.00, 204.80-91.705, 204.80-204.808
-		C 460.80,110.889, 369.10,19.20, 256.00,19.20zM 290.373,266.94c 5.102-11.016, 9.92-22.481, 14.582-34.179c 37.95,5.875, 77.941,4.577, 119.687,0.299
-		c-1.968,37.058-15.731,70.972-37.801,97.929C 359.254,303.034, 327.764,282.217, 290.373,266.94z" />
-<glyph unicode="&#xe0a1;" d="M 217.984-32.00L 217.984,83.744L 142.464,126.432L 157.723,149.02L 217.984,116.917L 217.984,211.712L 262.528,211.712L 262.528,151.223L 315.485,175.775L 328.834,151.136L 262.528,119.426L 262.528,85.557L 359.153,130.71L 371.084,106.419L 262.528,55.155L 262.528-32.00L 463.434-32.00L 240.31,480.00L 16.567-32.00 z" />
-<glyph unicode="&#xe0a2;" d="M 512.00,394.658C 512.00,441.791, 473.804,480.00, 426.688,480.00L 85.313,480.00 C 38.196,480.00,0.00,441.791,0.00,394.658l0.00-341.316 C0.00,6.209, 38.196-32.00, 85.313-32.00
-	l 341.375,0.00 C 473.804-32.00, 512.00,6.209, 512.00,53.342L 512.00,394.658 z M 414.05,44.288L 272.384,44.288 l0.00,60.739 l 76.841,36.324l-8.453,17.234l-68.388-32.023
-	l0.00,24.023 l 46.889,22.48l-9.458,17.48l-37.431-17.42l0.00,42.678 L 240.64,215.803 l0.00-66.998 l-42.799,22.741l-10.763-15.996l 53.562-30.262l0.00-81.006
-	L 98.168,44.282 L 256.332,406.221L 414.05,44.288z" />
-<glyph unicode="&#xe0a3;" d="M 280.928,276.50c-19.521,1.141-42.041-0.024-68.125-4.475l 60.167-108.444L 512.00,229.214
-	c-2.577,6.13-6.343,12.113-11.331,17.899c-24.737,28.639-78.37,54.187-136.802,65.709l 0.001,0.013
-	c-57.322,13.437-119.401,12.872-182.98,3.274c-2.292-0.344-4.572-0.711-6.84-1.092l-21.136,39.146
-	c-20.571-2.746-39.904-7.025-57.803-12.737l 20.13-42.099c-32.88-12.738-59.861-30.88-79.329-52.716
-	C 3.804,210.079-8.885,164.157, 6.537,119.435c 3.102-9.021, 7.294-17.58, 12.468-25.598l 239.034,65.649l-66.375,122.924
-	c 2.279,0.44, 4.598,0.884, 6.964,1.312c 107.341,19.149, 166.051-10.432, 198.208-41.915l-81.779-19.824L 280.928,276.50z M 87.361,166.805
-	c-7.379,33.676-1.506,71.263, 45.202,96.297l 36.569-76.474L 87.361,166.805z" />
-<glyph unicode="&#xe0a4;" d="M 117.552,177.044l 67.131,16.274l-30.021,62.783C 116.316,235.549, 111.494,204.691, 117.552,177.044zM 426.678,480.00L 85.322,480.00 C 38.20,480.00,0.00,441.791,0.00,394.659l0.00-341.318 C0.00,6.208, 38.20-32.00, 85.322-32.00l 341.356,0.00
-		C 473.80-32.00, 512.00,6.208, 512.00,53.341L 512.00,394.659 C 512.00,441.791, 473.80,480.00, 426.678,480.00z M 269.932,174.398l-49.396,89.029
-		c 21.415,3.654, 39.902,4.611, 55.929,3.674l 28.02-44.756l 67.138,16.275c-26.40,25.846-74.60,50.131-162.723,34.41
-		c-1.943-0.351-3.846-0.715-5.717-1.077l 54.492-100.917L 61.434,117.14c-4.248,6.582-7.689,13.609-10.236,21.016
-		c-12.661,36.716-2.244,74.416, 24.115,104.408c 15.982,17.926, 38.133,32.82, 65.126,43.278l-16.526,34.563
-		c 14.695,4.689, 30.567,8.203, 47.455,10.457l 17.352-32.138c 1.861,0.313, 3.733,0.614, 5.615,0.896
-		c 52.196,7.88, 103.162,8.343, 150.221-2.688l-0.001-0.011c 47.971-9.46, 92.002-30.434, 112.311-53.945
-		c 4.095-4.75, 7.187-9.662, 9.303-14.695L 269.932,174.398z" />
-<glyph unicode="&#xe0a5;" d="M 424.598,402.047c 3.946,12.739, 9.222,41.029-5.26,77.244c0.00,0.00-25.548,8.113-83.339-30.565
-			c-22.645,5.656-46.731,8.453-70.859,8.453c-26.547,0.00-53.372-3.383-78.393-10.244c-59.63,40.683-85.956,32.348-85.956,32.348
-			C 83.604,436.31, 94.228,404.492, 97.46,396.589c-20.196-21.797-32.528-49.623-32.528-83.738c0.00-25.757, 2.933-48.86, 10.097-68.943
-			l 7.532-17.061c 20.129-37.527, 59.824-61.766, 130.437-69.377c-10.022-6.729-20.245-18.18-24.389-37.556
-			c-13.66-6.533-56.891-22.479-82.833,22.14c0.00,0.00-14.521,26.551-42.312,28.627c0.00,0.00-26.96,0.414-1.863-16.801
-			c0.00,0.00, 18.04-8.501, 30.488-40.443c0.00,0.00, 16.236-54.492, 94.59-37.008l0.00-56.28 c0.00,0.00-1.655-19.907-19.906-26.54
-			c0.00,0.00-10.781-7.473, 0.835-11.609c0.00,0.00, 50.589-4.149, 50.589,37.318l0.00,61.371 c0.00,0.00-2.007,24.338, 9.952,32.802l0.00-100.806
-			c0.00,0.00-0.827-24.056-13.267-33.176c0.00,0.00-8.301-14.923, 9.947-10.785c0.00,0.00, 34.833,4.979, 36.493,45.615l 0.789,102.014l 8.373,0.00
-			l 0.796-102.014c 1.658-40.636, 36.491-45.615, 36.491-45.615c 18.24-4.138, 9.949,10.785, 9.949,10.785
-			c-12.441,9.125-13.268,33.176-13.268,33.176L 304.452,112.62 c 11.948-9.312, 9.949-31.933, 9.949-31.933l0.00-61.369
-			c0.00-41.471, 50.592-37.316, 50.592-37.316c 11.605,4.139, 0.832,11.604, 0.832,11.604c-18.249,6.634-19.905,26.542-19.905,26.542
-			l0.00,80.442 c0.00,31.371-13.209,47.989-26.131,56.755c 75.307,7.469, 111.444,31.782, 128.094,69.564l 5.946,16.865
-			c 5.583,20.118, 7.262,43.271, 7.262,69.088C 461.092,349.886, 447.181,379.507, 424.598,402.047z M 264.535,171.357
-			c-82.092,0.00-148.627,12.355-148.627,91.684c0.00,18.991, 9.354,36.625, 25.371,51.259c 26.725,24.389, 71.947,11.475, 123.253,11.475
-			c 51.078,0.008, 96.148,13.053, 122.906-11.168l 0.01-0.008c 16.219-14.696, 25.706-32.441, 25.706-51.559
-			C 413.156,173.771, 346.615,171.357, 264.535,171.357zM 184.177,303.006c-17.079,0.00-30.924-19.924-30.924-44.506c0.00-24.589, 13.846-44.52, 30.924-44.52s 30.922,19.931, 30.922,44.52
-			C 215.099,283.082, 201.254,302.988, 184.177,303.006zM 350.095,303.006c-17.078,0.00-30.921-19.924-30.921-44.506c0.00-24.589, 13.843-44.52, 30.921-44.52
-			c 17.079,0.00, 30.922,19.931, 30.922,44.52C 381.018,283.082, 367.175,302.988, 350.095,303.006z" />
-<glyph unicode="&#xe0a6;" d="M 117.639,355.64c-25.396,0.00-47.242-8.403-65.542-25.208c-19.043-17.926-28.57-40.33-28.57-67.218
-		c0.00-17.926, 5.188-34.731, 15.647-50.416c 9.337-14.563, 19.09-23.903, 31.889-28.012l0.00-1.121 c-12.799-5.224-18.483-18.295-18.483-39.209
-		c0.00-16.062, 5.686-28.011, 18.483-35.854l0.00-1.121 c-35.327-11.573-51.496-33.047-51.496-64.415c0.00-27.267, 11.874-47.244, 35.033-59.939
-		C 72.895-26.959, 96.389-32.00, 124.773-32.00c 69.085,0.00, 103.703,28.941, 103.703,86.832c0.00,36.223-26.661,58.441-80.064,66.658
-		c-12.323,1.863-21.643,6.348-27.991,13.445c-4.854,4.854-7.271,9.709-7.271,14.563c0.00,13.816, 7.479,21.848, 22.41,24.088
-		c 22.779,3.357, 41.364,13.912, 55.743,31.648c 14.375,17.74, 21.565,38.559, 21.565,62.458c0.00,7.469-2.259,15.498-5.244,24.086
-		c 9.709,2.244, 16.525,4.297, 21.646,6.166L 229.27,355.64 c-22.527-8.964-43.495-13.442-61.421-13.442
-		C 152.162,351.159, 135.937,355.64, 117.639,355.64z M 123.801,76.115c 31.372,0.00, 47.052-9.521, 47.052-28.57
-		c0.00-20.168-14.377-30.246-43.132-30.246c-32.862,0.00-49.293,9.711-49.293,29.127C 78.427,66.221, 93.55,76.115, 123.801,76.115z
-		 M 119.88,224.00c-23.527,0.00-35.293,12.882-35.293,38.654c0.00,27.631, 11.766,41.453, 35.293,41.453c 11.201,0.00, 19.979-4.298, 26.326-12.884
-		c 5.229-7.845, 7.845-17.18, 7.845-28.011C 154.051,237.073, 142.658,224.00, 119.88,224.00zM 290.192,480.00c-10.828,0.00-20.07-4.107-27.727-12.324c-7.657-8.218-11.485-18.108-11.485-29.688
-		c0.00-11.205, 3.829-20.91, 11.485-29.129c 7.654-8.217, 16.896-12.32, 27.727-12.32c 10.455,0.00, 19.514,4.104, 27.17,12.32
-		c 7.656,8.219, 11.48,17.924, 11.48,29.129c0.00,11.58-3.824,21.472-11.48,29.688C 309.703,475.893, 300.647,480.00, 290.192,480.00zM 321.565,352.001l-63.303,0.00 c 0.748-7.168-0.32-18.021-0.32-35.57l0.00-174.216 c0.00-17.928, 1.068-32.387, 0.32-38.018l 63.303,0.00
-		c-0.75,8.188-2.697,22.334-2.697,41.379L 318.868,317.549 C 318.865,333.981, 320.815,344.833, 321.565,352.001zM 461.168,157.90c-16.436,0.00-24.541,12.514-24.541,37.533l0.00,103.32 l 24.932,0.00 c 4.48,0.00, 8.516,0.246, 13.559-0.123
-		c 5.043-0.374, 7.076-0.125, 9.639-0.125l0.00,53.495 l-48.129,0.00 l0.00,23.808 c0.00,8.961, 1.408,17.151, 2.527,22.271l-64.979,0.00
-		c 1.121-5.12, 1.014-12.938, 1.014-23.395L 375.19,352.00 l-28.16,0.00 l0.00-53.494 c 7.682,1.12, 14.545,1.678, 19.398,1.678l 8.762-0.559l0.00-0.292 l0.00,0.00l0.00-101.101
-		c0.00-31.371, 3.979-54.336, 11.818-68.90c 10.461-19.42, 28.811-29.129, 56.068-29.129c 19.424,0.00, 36.559,3.732, 49.357,11.205l0.00,56.016
-		C 482.196,161.074, 472.742,157.90, 461.168,157.90z" />
-<glyph unicode="&#xe0a7;" d="M 131.736,100.316c0.00-13.526, 11.447-20.291, 34.334-20.291c 20.032,0.00, 30.044,7.021, 30.044,21.067
-		c0.00,13.269-10.923,19.898-32.772,19.898C 142.269,120.992, 131.736,114.102, 131.736,100.316zM 426.674,480.00L 85.344,480.00 C 38.406,480.00,0.00,441.595,0.00,394.656l0.00-341.313 C0.00,6.375, 38.406-32.00, 85.344-32.00l 341.33,0.00
-		C 473.608-32.00, 512.00,6.375, 512.00,53.344L 512.00,394.656 C 512.00,441.595, 473.609,480.00, 426.674,480.00z M 237.864,275.506
-		c-3.642-1.302-8.844-2.729-15.606-4.293c 2.08-5.983, 3.123-11.576, 3.123-16.777c0.00-16.646-5.009-31.149-15.022-43.506
-		c-10.015-12.354-22.956-19.703-38.823-22.043c-10.402-1.563-15.604-7.156-15.604-16.779c0.00-3.381, 1.689-6.765, 5.072-10.145
-		c 4.422-4.943, 10.924-8.066, 19.509-9.367c 37.195-5.721, 55.793-21.197, 55.793-46.427c0.00-40.321-24.062-60.481-72.181-60.481
-		c-19.771,0.00-36.028,3.513-48.772,10.535c-16.129,8.844-24.188,22.76-24.188,41.75c0.00,21.852, 12.096,36.808, 36.282,44.869l0.00,0.78
-		c-8.842,5.462-13.263,13.785-13.263,24.972c0.00,14.566, 4.162,23.672, 12.484,27.311l0.00,0.781 c-8.323,2.862-15.737,9.366-22.24,19.512
-		c-7.282,10.926-10.925,22.63-10.925,35.115c0.00,18.729, 6.635,34.335, 19.896,46.82c 12.748,11.707, 27.964,17.558, 45.653,17.558
-		c 12.747,0.00, 24.579-3.119, 35.505-9.361c 12.485,0.00, 26.921,3.12, 43.313,9.361L 237.864,275.506L 237.864,275.506z M 301.089,140.503
-		l-44.093,0.00 c 0.521,5.201, 0.779,14.042, 0.779,26.532L 257.775,288.381 c0.00,12.227-0.261,20.682-0.779,25.359l 44.093,0.00
-		c-0.521-4.942-0.781-13.135-0.781-24.582l0.00-119.782 C 300.308,156.109, 300.569,146.484, 301.089,140.503z M 298.159,352.759
-		c-5.332-5.722-11.641-8.581-18.923-8.581c-7.543,0.00-13.979,2.859-19.313,8.581c-5.333,5.726-8.001,12.486-8.001,20.289
-		c0.00,8.067, 2.668,14.956, 8.001,20.683c 5.333,5.721, 11.77,8.584, 19.313,8.584c 7.282,0.00, 13.592-2.863, 18.923-8.584
-		c 5.333-5.728, 7.999-12.615, 7.999-20.683C 306.158,365.245, 303.492,358.484, 298.159,352.759z M 420.845,145.576
-		c-9.627-5.205-21.203-7.803-34.729-7.803c-18.985,0.00-32.124,6.76-39.405,20.287c-5.465,10.145-8.193,26.14-8.193,47.99l0.00,69.842
-		l 0.389,0.00 l0.00,0.781 l-5.853,0.391c-3.382,0.00-7.806-0.391-13.267-1.171L 319.787,313.74 l 19.117,0.00 l0.00,15.216 c0.00,7.285-0.389,13.14-1.17,17.56l 45.259,0.00
-		c-0.775-4.94-1.168-10.533-1.168-16.776l0.00-15.999 l 33.943,0.00 l0.00-37.846 c-1.299,0.00-3.705,0.129-7.218,0.389
-		c-3.512,0.261-6.828,0.393-9.949,0.393l-16.777,0.00 l0.00-72.572 c0.00-17.432, 5.725-26.145, 17.167-26.145c 8.063,0.00, 15.348,2.209, 21.854,6.632
-		L 420.845,145.576 L 420.845,145.576zM 160.608,279.797c-16.388,0.00-24.582-9.627-24.582-28.873c0.00-17.951, 8.194-26.924, 24.582-26.924
-		c 15.868,0.00, 23.801,9.104, 23.801,27.313c0.00,7.545-1.82,14.047-5.461,19.511C 174.525,276.805, 168.411,279.797, 160.608,279.797z" />
-<glyph unicode="&#xe0a8;" d="M 192.00,160.00c0.00,18.718, 1.099,19.844, 13.203,31.948L 352.00,338.746c 29.157,29.157, 31.843,44.204, 31.992,74.019L 384.00,412.765 L 384.00,480.00 l-64.00,0.00 l0.00-64.00
-		c0.00-18.718-1.099-19.843-13.202-31.948L 160.00,237.255c-29.156-29.157-31.842-44.204-31.991-74.019L 128.00,163.236 L 128.00,96.00 L 80.00,96.00 l 80.00-128.00l 79.282,128.00L 192.00,96.00
-		L 192.00,160.00 zM 384.00,96.00l0.00,67.236 l-0.008,0.00 c-0.149,29.813-2.835,44.861-31.992,74.019l-17.15,17.151l-45.255-45.253l 17.203-17.203
-		C 318.902,179.845, 320.00,178.719, 320.00,160.001l0.00-64.00 l-47.281,0.00 l 79.281-128.00l 80.00,128.00L 384.00,96.00L 384.00,96.00z" />
-<glyph unicode="&#xe0a9;" d="M 64.00,224.004c0.00-74.013, 44.161-137.984, 108.215-168.289L 80.626,300.107C 69.972,276.853, 64.00,251.116, 64.00,224.004zM 385.614,233.436c0.00,23.117-8.527,39.118-15.827,51.571c-9.729,15.41-18.86,28.447-18.86,43.858
-			c0.00,17.187, 13.383,33.188, 32.243,33.188c 0.852,0.00, 1.66-0.102, 2.488-0.151C 351.50,392.387, 305.988,411.00, 256.004,411.00
-			c-67.08,0.00-126.093-33.523-160.422-84.284c 4.505-0.141, 8.753-0.227, 12.356-0.227c 20.077,0.00, 51.17,2.376, 51.17,2.376
-			c 10.345,0.591, 11.566-14.217, 1.229-15.411c0.00,0.00-10.405-1.184-21.976-1.775l 69.917-202.553l 42.022,122.728l-29.911,79.825
-			c-10.344,0.592-20.139,1.775-20.139,1.775c-10.351,0.596-9.136,16.001, 1.219,15.411c0.00,0.00, 31.70-2.376, 50.567-2.376
-			c 20.073,0.00, 51.175,2.376, 51.175,2.376c 10.351,0.591, 11.57-14.217, 1.223-15.411c0.00,0.00-10.417-1.186-21.974-1.775L 351.85,110.67
-			l 19.156,62.316C 379.296,198.861, 385.614,217.436, 385.614,233.436zM 259.371,207.648l-57.613-163.029c 17.208-4.929, 35.397-7.619, 54.244-7.619c 22.358,0.00, 43.802,3.759, 63.759,10.60
-			c-0.509,0.801-0.987,1.652-1.375,2.577L 259.371,207.648zM 424.481,313.714c 0.826-5.955, 1.294-12.343, 1.294-19.229c0.00-18.965-3.646-40.298-14.601-66.975l-58.643-165.136
-			C 409.612,94.788, 448.00,155.018, 448.00,224.003C 448.00,256.518, 439.47,287.083, 424.481,313.714zM 256.00,480.00C 114.615,480.00,0.00,365.385,0.00,224.00s 114.615-256.00, 256.00-256.00s 256.00,114.615, 256.00,256.00S 397.385,480.00, 256.00,480.00z M 256.00,0.00
-		C 132.288,0.00, 32.00,100.288, 32.00,224.00S 132.288,448.00, 256.00,448.00s 224.00-100.288, 224.00-224.00S 379.712,0.00, 256.00,0.00z" />
-<glyph unicode="&#xe0aa;" d="M 259.555,206.271l-60.828-176.742c 18.164-5.343, 37.372-8.262, 57.269-8.262c 23.608,0.00, 46.251,4.077, 67.321,11.492
-		c-0.539,0.868-1.039,1.793-1.45,2.795L 259.555,206.271zM 392.852,234.232c0.00,25.062-9.006,42.405-16.718,55.905c-10.273,16.708-19.912,30.843-19.912,47.55
-		c0.00,18.631, 14.13,35.979, 34.045,35.979c 0.896,0.00, 1.753-0.108, 2.624-0.165c-36.064,33.048-84.119,53.225-136.896,53.225
-		c-70.82,0.00-133.129-36.34-169.376-91.371c 4.757-0.153, 9.242-0.244, 13.044-0.244c 21.197,0.00, 54.028,2.576, 54.028,2.576
-		c 10.928,0.639, 12.213-15.416, 1.299-16.707c0.00,0.00-10.985-1.282-23.198-1.928l 73.816-219.589l 44.371,133.05l-31.584,86.541
-		c-10.92,0.645-21.262,1.926-21.262,1.926c-10.927,0.646-9.645,17.347, 1.288,16.707c0.00,0.00, 33.47-2.576, 53.391-2.576
-		c 21.199,0.00, 54.03,2.576, 54.03,2.576c 10.931,0.64, 12.218-15.414, 1.297-16.707c0.00,0.00-10.999-1.281-23.202-1.926l 73.262-217.916
-		l 20.229,67.559C 386.179,196.748, 392.852,216.882, 392.852,234.232zM 357.915,48.781c 60.269,35.14, 100.803,100.438, 100.803,175.227c0.00,35.246-9.005,68.381-24.831,97.254
-		c 0.871-6.455, 1.366-13.382, 1.366-20.847c0.00-20.564-3.854-43.688-15.416-72.609L 357.915,48.781zM 53.277,224.008c0.00-80.24, 46.624-149.592, 114.258-182.448L 70.83,306.51C 59.577,281.299, 53.277,253.399, 53.277,224.008zM 426.688,480.00L 85.346,480.00 C 38.406,480.00,0.00,441.594,0.00,394.659l0.00-341.313 C0.00,6.376, 38.406-32.00, 85.346-32.00l 341.342,0.00
-		C 473.622-32.00, 512.00,6.376, 512.00,53.346L 512.00,394.659 C 512.00,441.594, 473.622,480.00, 426.688,480.00z M 255.993-1.48
-		c-124.327,0.00-225.476,101.156-225.476,225.488c0.00,124.324, 101.147,225.475, 225.476,225.475
-		c 124.327,0.00, 225.484-101.149, 225.484-225.475C 481.48,99.676, 380.322-1.48, 255.993-1.48z" />
-<glyph unicode="&#xe0ab;" d="M 478.898,288.00l-28.103,0.00 l-0.60,0.00 c-17.583,0.00-32.994,14.871-34.195,32.00l0.00,0.00C 416.002,411.334, 342.371,480.00, 250.405,480.00l-83.912,0.00
-	C 74.587,480.00, 0.065,406.00,0.00,314.667l0.00-181.399 C0.00,41.941, 74.587-32.00, 166.492-32.00l 179.21,0.00 C 437.676-32.00, 512.00,41.941, 512.00,133.268L 512.00,250.459
-	C 512.00,268.71, 497.28,288.00, 478.898,288.00z M 160.00,352.00l 96.00,0.00 c 17.60,0.00, 32.00-14.40, 32.00-32.00s-14.40-32.00-32.00-32.00l-96.00,0.00 c-17.60,0.00-32.00,14.40-32.00,32.00S 142.40,352.00, 160.00,352.00
-	z M 352.00,96.00L 160.00,96.00 c-17.60,0.00-32.00,14.40-32.00,32.00s 14.40,32.00, 32.00,32.00l 192.00,0.00 c 17.60,0.00, 32.00-14.40, 32.00-32.00S 369.60,96.00, 352.00,96.00z" />
-<glyph unicode="&#xe0ac;" d="M 184.00,272.00l 72.00,0.00 c 13.199,0.00, 24.00,10.80, 24.00,24.00s-10.801,24.00-24.00,24.00l-72.00,0.00 c-13.20,0.00-24.00-10.80-24.00-24.00S 170.801,272.00, 184.00,272.00zM 328.00,176.00L 184.00,176.00 c-13.20,0.00-24.00-10.80-24.00-24.00c0.00-13.199, 10.80-24.00, 24.00-24.00l 144.00,0.00 c 13.199,0.00, 24.00,10.801, 24.00,24.00C 352.00,165.20, 341.199,176.00, 328.00,176.00zM 426.674,480.00L 85.325,480.00 C 38.202,480.00,0.00,441.791,0.00,394.659l0.00-341.318 C0.00,6.208, 38.202-32.00, 85.325-32.00l 341.348,0.00
-		c 47.125,0.00, 85.324,38.208, 85.324,85.341L 512.00,394.659C 512.00,441.791, 473.798,480.00, 426.674,480.00z M 448.00,155.951
-		C 448.00,87.456, 392.257,32.00, 323.278,32.00L 188.869,32.00 C 119.941,32.00, 64.00,87.456, 64.00,155.951L 64.00,292.00 c 0.048,68.50, 55.94,124.00, 124.869,124.00l 62.934,0.00
-		C 320.779,416.00, 376.002,364.50, 376.00,296.00c 0.901-12.847, 12.461-24.00, 25.646-24.00l 0.449,0.00 l 21.078,0.00 C 436.959,272.00, 448.00,257.533, 448.00,243.844L 448.00,155.951 z" />
-<glyph unicode="&#xe0ad;" d="M 416.751-4.105c-21.85-10.277-41.685-17.525-59.414-21.689c-17.75-4.121-36.931-6.203-57.533-6.203
-	c-23.413,0.00-37.227,2.943-55.204,8.828c-17.979,5.934-33.33,14.402-46.01,25.27c-12.725,10.961-21.511,22.604-26.424,34.916
-	c-4.913,12.318-7.358,30.207-7.358,53.621L 164.808,270.189 L 95.249,270.189 l0.00,72.503 c 20.104,6.521, 43.428,15.894, 57.736,28.076
-	c 14.377,12.225, 25.883,26.853, 34.553,43.972c 8.696,17.073, 14.674,38.856, 17.936,65.258l 72.818,0.00 l0.00-118.423 L 396.67,361.575 l0.00-91.387 L 278.29,270.188 l0.00-131.28
-	c0.00-29.709-0.385-46.828, 2.765-55.25c 3.125-8.377, 10.959-17.072, 19.495-22.10c 11.343-6.795, 24.271-10.189, 38.854-10.189
-	c 25.927,0.00, 51.716,8.424, 77.348,25.27L 416.752-4.105 L 416.751-4.105z" />
-<glyph unicode="&#xe0ae;" d="M 426.69,480.00L 85.344,480.00 C 38.405,480.00, 0.001,441.593, 0.001,394.657l0.00-341.313 C 0.001,6.375, 38.405-32.00, 85.344-32.00L 426.69-32.00
-	C 473.625-32.00, 512.00,6.375, 512.00,53.344L 512.00,394.658 C 511.996,441.593, 473.621,480.00, 426.69,480.00z M 365.858,67.656
-	c-15.076-7.094-28.764-12.094-41.00-14.969c-12.248-2.845-25.48-4.279-39.701-4.279c-16.156,0.00-25.688,2.029-38.094,6.094
-	c-12.404,4.094-23.00,9.936-31.75,17.436c-8.779,7.564-14.843,15.599-18.233,24.097c-3.392,8.502-5.078,20.846-5.078,37.002L 192.002,256.938
-	l-47.998,0.00 l0.00,50.033 c 13.872,4.50, 29.968,10.967, 39.842,19.375c 9.92,8.436, 17.859,18.529, 23.842,30.342
-	c 6.002,11.783, 10.125,26.813, 12.376,45.033l 50.25,0.00 L 270.314,320.00 L 352.00,320.00 l0.00-63.063 l-81.689,0.00 l0.00-90.594 c0.00-20.50-0.264-32.313, 1.908-38.125
-	c 2.156-5.78, 7.563-11.78, 13.451-15.25c 7.828-4.688, 16.752-7.03, 26.813-7.03c 17.893,0.00, 35.689,5.813, 53.375,17.438L 365.858,67.656
-	L 365.858,67.656z" />
-<glyph unicode="&#xe0af;" d="M 482.459,335.562L 282.333,335.562 l 7.708-31.23l 54.623,0.00 l-91.913-83.016c-18.752,25.917-62.711,79.942-93.377,124.485l 68.461,0.00 l0.00,31.23 L0.00,377.031
-		l0.00-31.23 l 67.666,0.00 c 26.25-20.479, 126.708-146.104, 130.875-158.604c 1.667-11.709, 3.21-80.947-1.708-86.156
-		c-9.875-10.459-54.916-7.706-65.793-8.496l-3.748-21.435c 19.832-0.584, 84.415,1.613, 104.50,1.613
-		c 39.541,0.00, 108.833,0.164, 118.624-0.586l 1.21,22.498c-10.003,1.668-64.542,0.205-72.084,1.87
-		c-1.667,10.919-3.502,83.709-1.833,91.211c 7.541,21.749, 122.168,110.494, 134.71,113.868c 2.831,0.584, 7.04,1.719, 11.831,2.742
-		l 36.916,0.00 L 482.459,335.562zM 440.334,107.218L 440.501,73.552L 456.043,72.218L 472.79,70.968L 477.707,103.927L 460.04,104.802 	zM 445.625,129.342l 30.669-2.458L 512.00,264.844c-5.957,0.206-60.166,5.331-67.211,6.706L 445.625,129.342z" />
-<glyph unicode="&#xe0b0;" d="M 426.656,480.00L 85.343,480.00 C 38.406,480.00,0.00,441.594,0.00,394.657l0.00-341.314 C0.00,6.376, 38.406-32.00, 85.343-32.00l 341.313,0.00
-	C 473.594-32.00, 512.00,6.376, 512.00,53.343L 512.00,394.657 C 512.00,441.594, 473.594,480.00, 426.656,480.00z M 373.315,282.031
-	c-9.407-2.531-95.377-68.938-101.032-85.25c-1.252-5.627, 0.125-60.221, 1.375-68.408c 5.655-1.248, 46.563-0.154, 54.063-1.402
-	l-0.906-16.877c-7.344,0.563-59.313,0.438-88.969,0.438c-15.064,0.00-63.50-1.654-78.374-1.218l 2.81,16.062
-	c 8.159,0.594, 41.939-1.499, 49.346,6.345c 3.688,3.905, 2.531,55.781, 1.281,64.564c-3.125,9.374-78.47,103.436-98.156,118.842L 64.00,315.127
-	l0.00,23.626 l 171.125,0.00 l0.00-23.626 L 183.53,315.127 c 22.999-33.499, 55.971-73.97, 70.033-93.406l 68.938,62.218L 281.53,283.939 l-5.779,23.627l 150.095,0.00
-	l-15.97-23.627l-27.688,0.00 C 378.594,283.156, 375.437,282.469, 373.315,282.031z M 418.593,109.219l-12.563,0.938l-11.654,1.001
-	l-0.125,25.248l 14.778-1.813l 13.25-0.655L 418.593,109.219z M 421.22,151.156L 398.218,153.00l-0.625,106.655
-	c 5.279-1.031, 45.938-4.874, 50.404-5.028L 421.22,151.156z" />
-<glyph unicode="&#xe0b1;" d="M 454.655,127.238c-62.828-26.668-131.154-39.521-193.27-39.521c-92.10,0.00-181.261,25.24-253.37,67.197
-		c-6.297,3.692-11.00-2.772-5.753-7.521c 66.818-60.353, 155.136-96.638, 253.243-96.638c 69.969,0.00, 151.233,22.052, 207.298,63.375
-		C 472.084,121.023, 464.147,131.27, 454.655,127.238zM 510.049,159.031c-6.129,7.559-58.711,14.068-90.756-8.484c-4.956-3.443-4.113-8.23, 1.387-7.561
-		c 18.059,2.145, 58.291,6.973, 65.431-2.185c 7.187-9.196-7.978-47.034-14.738-63.918c-2.059-5.122, 2.352-7.182, 6.972-3.317
-		C 508.451,98.723, 516.182,151.428, 510.049,159.031zM 269.739,305.544c-24.436-2.787-56.404-4.565-79.298-14.646c-26.394-11.39-44.96-34.698-44.96-68.923
-		c0.00-43.832, 27.64-65.717, 63.109-65.717c 30.011,0.00, 46.381,7.061, 69.511,30.666c 7.71-11.094, 10.203-16.492, 24.197-28.115
-		c 3.146-1.658, 7.179-1.479, 9.965,1.01l 0.119-0.118c 8.423,7.475, 23.726,20.815, 32.321,27.996c 3.442,2.848, 2.85,7.409, 0.119,11.209
-		c-7.709,10.678-15.895,19.334-15.895,39.086l0.00,65.715 c0.00,27.818, 1.959,53.383-18.566,72.54
-		c-16.189,15.537-42.998,20.997-63.519,20.997c-40.095,0.00-84.874-14.948-94.307-64.533c-0.948-5.276, 2.847-8.063, 6.287-8.837
-		l 40.927-4.39c 3.795,0.18, 6.583,3.916, 7.296,7.711c 3.499,17.082, 17.853,25.326, 33.925,25.326c 8.66,0.00, 18.502-3.203, 23.667-10.975
-		c 5.869-8.658, 5.10-20.521, 5.10-30.546L 269.739,305.544L 269.739,305.544z M 261.851,217.883c-6.702-11.863-17.322-19.158-29.18-19.158
-		c-16.192,0.00-25.622,12.338-25.622,30.548c0.00,35.938, 32.204,42.464, 62.69,42.464l0.00-9.133
-		C 269.739,246.173, 270.156,232.473, 261.851,217.883z" />
-<glyph unicode="&#xe0b2;" d="M 291.765,274.281c-10.922,0.00-21.844-0.718-31.312-2.906c-17.469-5.094-31.313-16.031-31.313-39.313
-		c0.00-18.219, 9.485-30.594, 25.50-30.594c 2.188,0.00, 4.36,0.751, 5.813,0.751c 9.468,2.188, 18.201,8.749, 23.297,18.938
-		c 8.72,14.533, 8.016,27.626, 8.016,44.377L 291.765,274.281L 291.765,274.281zM 426.671,480.00L 85.344,480.00 C 38.406,480.00,0.00,441.596,0.00,394.656l0.00-341.313 C0.00,6.375, 38.407-32.00, 85.344-32.00l 341.328,0.00
-		C 473.61-32.00, 512.00,6.374, 512.00,53.344L 512.00,394.656 C 512.00,441.596, 473.61,480.00, 426.671,480.00z M 286.671,344.187
-		c-5.109,7.25-14.577,10.905-23.296,10.905c-1.452,0.00-2.188,0.00-2.922,0.00c-14.563-1.469-27.656-9.468-31.313-25.468
-		c-0.718-3.656-2.891-7.282-7.266-8.033l-40.766,5.096c-2.906,0.748-7.28,2.938-5.844,8.75
-		c 8.749,45.875, 48.062,61.875, 85.188,64.063c 2.922,0.00, 5.827,0.00, 8.748,0.00c 20.377,0.00, 46.597-5.813, 63.329-21.126
-		c 20.375-18.907, 18.204-44.375, 18.204-72.063l0.00-65.529 c0.00-19.626, 8.00-28.375, 16.016-38.563c 2.172-3.658, 2.906-8.00-0.72-10.938
-		c-8.031-7.282-23.313-20.375-32.047-27.656c-2.906-2.188-6.546-2.188-10.188-0.718c-13.845,11.625-16.017,16.718-24.032,27.655
-		c-13.826-14.563-25.468-22.563-39.312-26.938c-8.721-2.188-18.188-3.625-29.846-3.625c-34.937,0.00-62.606,21.813-62.606,64.782
-		c0.00,34.218, 18.204,57.50, 45.141,68.438c 13.827,6.53, 30.579,9.469, 47.313,11.625c 10.922,1.467, 21.844,2.188, 31.312,2.938l0.00,5.812
-		C 291.765,323.782, 292.469,335.437, 286.671,344.187z M 413.985,92.406c-5.14-3.938-10.656-7.499-16.203-10.688
-		c-41.531-24.904-95.313-37.968-141.983-37.968c-75.156,0.00-142.392,27.688-193.405,73.969c-4.357,3.563-0.797,8.688, 4.343,5.938
-		c 54.984-32.031, 123.00-51.438, 193.405-51.438c 44.313,0.00, 92.141,8.313, 137.641,26.124c 3.157,1.188, 6.721,2.782, 9.874,3.972
-		C 414.781,105.471, 421.11,97.532, 413.985,92.406z M 451.563,117.719c-0.39-14.25-7.906-41.529-25.703-56.562
-		c-3.562-2.781-7.109-1.188-5.547,2.78c 5.157,12.656, 17.00,41.938, 11.484,48.653c-3.953,5.126-20.172,4.72-34.018,3.563
-		c-6.327-0.813-11.875-1.188-16.219-2.00c-3.952-0.375-4.75,3.154-0.798,5.938c 5.141,3.563, 10.688,6.313, 17.017,8.313
-		c 22.53,6.722, 48.655,2.752, 52.221-1.592c 0.778-1.188, 1.562-3.531, 1.562-6.721L 451.563,117.719L 451.563,117.719z" />
-<glyph unicode="&#xe0b3;" d="M 395.749,207.954c-0.647,64.841, 52.879,95.938, 55.271,97.483c-30.076,44.01-76.925,50.039-93.621,50.736
-		c-39.871,4.037-77.798-23.474-98.033-23.474c-20.184,0.00-51.409,22.877-84.476,22.276c-43.458-0.646-83.529-25.269-105.906-64.19
-		c-45.152-78.349-11.563-194.42, 32.445-257.963c 21.504-31.102, 47.146-66.038, 80.813-64.79c 32.421,1.294, 44.681,20.979, 83.878,20.979
-		c 39.197,0.00, 50.214-20.979, 84.525-20.335c 34.887,0.648, 56.991,31.699, 78.346,62.898c 24.695,36.084, 34.863,71.019, 35.462,72.813
-		C 463.679,104.74, 396.423,130.505, 395.749,207.954zM 331.281,398.239C 349.15,419.918, 361.211,449.995, 357.921,480.00c-25.739-1.048-56.939-17.145-75.405-38.775
-		c-16.571-19.188-31.074-49.813-27.187-79.218C 284.062,359.765, 313.393,376.609, 331.281,398.239z" />
-<glyph unicode="&#xe0b4;" d="M 432.00,320.00c-17.60,0.00-32.00-14.40-32.00-32.00l0.00-128.00 c0.00-17.60, 14.40-32.00, 32.00-32.00s 32.00,14.40, 32.00,32.00L 464.00,288.00 C 464.00,305.60, 449.60,320.00, 432.00,320.00zM 48.00,320.00c-17.60,0.00-32.00-14.40-32.00-32.00l0.00-128.00 c0.00-17.60, 14.40-32.00, 32.00-32.00s 32.00,14.40, 32.00,32.00L 80.00,288.00 C 80.00,305.60, 65.599,320.00, 48.00,320.00zM 96.00,112.00c0.00-26.51, 21.49-48.00, 48.00-48.00l 16.00,0.00 l0.00-64.00 c0.00-17.60, 14.40-32.00, 32.00-32.00s 32.00,14.40, 32.00,32.00l0.00,64.00 l 32.00,0.00 l0.00-64.00 c0.00-17.60, 14.401-32.00, 32.00-32.00s 32.00,14.40, 32.00,32.00
-		l0.00,64.00 l 16.00,0.00 c 26.51,0.00, 48.00,21.49, 48.00,48.00L 384.00,288.00 L 96.00,288.00 L 96.00,112.00 zM 299.299,435.253l 20.252,38.903c 1.016,1.951, 0.25,4.379-1.701,5.395s-4.379,0.25-5.395-1.701l-20.559-39.493
-		C 275.797,444.581, 258.299,448.00, 240.00,448.00c-18.298,0.00-35.796-3.419-51.898-9.643L 167.544,477.849c-1.016,1.951-3.443,2.717-5.395,1.701
-		s-2.717-3.443-1.701-5.395l 20.25-38.904c-45.315-20.509-78.12-63.792-83.81-115.252l 286.22,0.00
-		C 377.42,371.461, 344.615,414.743, 299.299,435.253z M 176.00,344.80c-12.813,0.00-23.20,10.387-23.20,23.20c0.00,12.813, 10.387,23.20, 23.20,23.20
-		s 23.20-10.387, 23.20-23.20C 199.199,355.187, 188.813,344.80, 176.00,344.80z M 304.00,344.80c-12.813,0.00-23.201,10.387-23.201,23.20
-		c0.00,12.813, 10.389,23.20, 23.201,23.20s 23.199-10.387, 23.199-23.20C 327.199,355.187, 316.813,344.80, 304.00,344.80z" />
-<glyph unicode="&#xe0b5;" d="M 206.115,224.043c-23.854,12.259-47.043,18.479-68.94,18.479c-2.978,0.00-5.976-0.09-8.974-0.354
-		c-27.94-2.312-53.461-9.684-69.875-15.414c-4.354-1.599-8.817-3.288-13.415-5.153L0.00,65.904
-		c 30.851,11.416, 58.146,16.969, 83.135,16.969c 40.423,0.00, 69.764-15.104, 93.996-30.652c 11.481,38.959, 39.022,133.045, 47.241,161.162
-		C 218.397,217.025, 212.334,220.668, 206.115,224.043zM 264.174,184.465l-45.223-157.074c 13.416-7.686, 58.549-32.025, 93.106-32.025c 27.896,0.00, 59.126,7.148, 95.417,21.896
-		l 43.178,150.988c-29.316-9.461-57.438-14.26-83.732-14.26C 318.945,153.99, 285.363,169.539, 264.174,184.465zM 146.411,295.605c 38.559-0.399, 67.076-15.104, 90.708-30.251l 46.376,158.672c-9.773,5.598-35.403,19.547-53.929,24.30
-		c-12.193,2.842-25.01,4.308-38.602,4.308c-25.898-0.488-54.194-6.973-86.444-19.90l-44.22-155.298
-		c 32.404,12.218, 60.322,18.17, 86.043,18.17C 146.366,295.605, 146.411,295.605, 146.411,295.605zM 512.00,380.938c-29.407-11.416-58.104-17.233-85.514-17.233c-45.843,0.00-79.646,15.901-101.547,31.183L 278.964,235.77
-		c 30.873-19.854, 64.145-29.939, 99.061-29.939c 28.474,0.00, 57.97,6.84, 87.731,20.344l-0.091,1.111l 1.867,0.443L 512.00,380.938z" />
-<glyph unicode="&#xe0b6;" d="M 445.98,222.898c-9.043,0.00-17.674-1.76-25.532-4.928C 415.195,275.149, 365.303,320.00, 304.448,320.00
-		c-14.893,0.00-29.341-2.815-42.159-7.582c-4.98-1.851-6.289-3.76-6.289-7.458l0.00-201.357 c0.00-3.883, 3.12-7.117, 7.062-7.498
-		C 263.23,96.088, 444.83,96.00, 446.007,96.00C 482.459,96.00, 512.00,124.408, 512.00,159.447S 482.433,222.898, 445.98,222.898zM 200.00,96.00L 216.00,96.00L 224.00,208.11L 216.00,320.00L 200.00,320.00L 192.00,208.11 	zM 152.00,96.00L 136.00,96.00L 128.00,177.375L 136.00,256.00L 152.00,256.00L 160.00,176.00 	zM 72.00,96.00L 88.00,96.00L 96.00,160.00L 88.00,224.00L 72.00,224.00L 64.00,160.00 	zM 8.00,128.00L 24.00,128.00L 32.00,160.00L 24.00,192.00L 8.00,192.00L0.00,160.00 	z" />
-<glyph unicode="&#xe0b7;" d="M 426.686,480.00L 85.344,480.00 C 38.407,480.00, 0.001,441.597, 0.001,394.66l0.00-234.658 L 8.00,192.00l 16.00,0.00 l 8.00-32.00l-8.00-32.00L 8.00,128.00 l-8.00,31.998l0.00-106.652
-	C 0.001,6.377, 38.407-32.00, 85.344-32.00l 341.342,0.00 C 473.625-32.00, 512.00,6.377, 512.00,53.346L 512.00,159.447 C 512.00,124.408, 482.459,96.00, 446.007,96.00
-	c-1.177,0.00-182.777,0.088-182.945,0.105c-3.941,0.381-7.062,3.615-7.062,7.498L 256.00,304.96 c0.00,3.697, 1.309,5.606, 6.289,7.458
-	c 12.818,4.767, 27.267,7.582, 42.159,7.582c 60.854,0.00, 110.746-44.851, 115.999-102.029c 7.858,3.168, 16.489,4.928, 25.532,4.928
-	c 36.453,0.00, 66.021-28.412, 66.021-63.451L 512.00,394.659 C 512.00,441.597, 473.621,480.00, 426.686,480.00z M 88.00,96.00L 72.00,96.00 l-8.00,64.00l 8.00,64.00l 16.00,0.00 l 8.00-64.00L 88.00,96.00z M 152.00,96.00l-16.00,0.00
-	l-8.00,81.375L 136.00,256.00l 16.00,0.00 l 8.00-80.00L 152.00,96.00z M 216.00,96.00l-16.00,0.00 l-8.00,112.11L 200.00,320.00l 16.00,0.00 l 8.00-111.89L 216.00,96.00z" />
-<glyph unicode="&#xe0b8;" d="M 487.655,191.031c 1.406,10.40, 2.215,20.973, 2.215,31.736c0.00,129.155-105.271,233.872-235.103,233.872
-	c-12.904,0.00-25.555-1.06-37.866-3.08c-22.072,14.384-48.342,22.767-76.612,22.767C 62.766,476.326,0.00,413.518,0.00,336.02
-	c0.00-28.198, 8.299-54.394, 22.59-76.389c-1.925-12.017-2.909-24.323-2.909-36.859c0.00-129.176, 105.217-233.882, 235.085-233.882
-	c 14.657,0.00, 28.927,1.427, 42.796,3.933c 21.55-13.369, 46.934-21.148, 74.146-21.148C 449.21-28.326, 512.00,34.498, 512.00,111.988
-	C 511.997,141.281, 503.04,168.516, 487.655,191.031z M 276.74,50.404c-74.705-3.892-109.664,12.637-141.689,42.691
-	c-35.765,33.567-21.398,71.854, 7.74,73.801c 29.122,1.944, 46.607-33.013, 62.15-42.736c 15.524-9.688, 74.594-31.76, 105.794,3.908
-	c 33.976,38.828-22.594,58.92-64.059,65.002c-59.203,8.766-133.95,40.792-128.135,103.907c 5.816,63.074, 53.582,95.414, 103.85,99.976
-	c 64.077,5.817, 105.791-9.707, 138.785-37.86c 38.15-32.529, 17.508-68.894-6.799-71.82c-24.212-2.909-51.404,53.504-104.791,54.352
-	c-55.027,0.864-92.217-57.261-24.286-73.784c 67.966-16.505, 140.75-23.286, 166.961-85.417
-	C 418.49,120.287, 351.507,54.299, 276.74,50.404z" />
-<glyph unicode="&#xe0b9;" d="M 511.999,229.039c0.00,32.207-26.201,58.405-58.404,58.405c-14.562,0.00-27.883-5.368-38.123-14.217
-		c-39.656,25.738-90.988,40.764-145.924,42.896l 29.022,94.637l 84.437-18.901c-0.002-0.229-0.033-0.448-0.033-0.676
-		c0.00-26.613, 21.654-48.267, 48.266-48.267c 26.612,0.00, 48.267,21.652, 48.267,48.267c0.00,26.613-21.652,48.265-48.267,48.265
-		c-20.00,0.00-37.19-12.229-44.506-29.601l-92.44,20.693c-4.685,1.049-9.383-1.681-10.789-6.271l-33.106-107.944
-		c-57.917-0.929-112.308-16.122-153.872-43.10c-10.237,8.848-23.563,14.217-38.123,14.217c-32.202,0.00-58.401-26.199-58.401-58.405
-		c0.00-21.122, 11.271-39.659, 28.113-49.918c-0.86-5.484-1.313-11.031-1.313-16.633c0.00-41.855, 24.355-80.934, 68.577-110.023
-		c 43.037-28.313, 100.078-43.91, 160.621-43.91c 60.537,0.00, 117.582,15.601, 160.619,43.91c 44.224,29.092, 68.576,68.168, 68.576,110.023
-		c0.00,5.602-0.451,11.146-1.313,16.633C 500.726,189.379, 511.999,207.918, 511.999,229.039z M 431.238,421.079
-		c 16.484,0.00, 29.896-13.41, 29.896-29.896c0.00-16.482-13.412-29.896-29.896-29.896c-16.481,0.00-29.896,13.414-29.896,29.896
-		C 401.341,407.668, 414.753,421.079, 431.238,421.079z M 18.367,229.039c0.00,22.076, 17.959,40.036, 40.033,40.036
-		c 8.359,0.00, 16.122-2.583, 22.549-6.978c-23.513-18.578-39.833-40.381-48.038-63.904C 24.036,205.541, 18.367,216.639, 18.367,229.039z
-		 M 255.999,26.924c-116.252,0.00-210.829,60.813-210.829,135.564c0.00,3.213, 0.187,6.396, 0.53,9.555
-		c 0.667,6.111, 1.956,12.115, 3.846,17.982c 7.062,21.914, 22.373,41.909, 43.751,58.577c 4.741,3.701, 9.792,7.229, 15.105,10.583
-		c 38.062,24.02, 90.179,38.86, 147.597,38.86c 57.414,0.00, 109.533-14.843, 147.592-38.86c 5.313-3.354, 10.367-6.884, 15.106-10.583
-		c 21.379-16.667, 36.691-36.663, 43.752-58.577c 1.892-5.867, 3.181-11.871, 3.847-17.982c 0.346-3.156, 0.528-6.342, 0.528-9.555
-		C 466.824,87.736, 372.249,26.924, 255.999,26.924z M 479.087,198.191c-8.203,23.522-24.527,45.328-48.039,63.905
-		c 6.426,4.395, 14.188,6.978, 22.547,6.978c 22.076,0.00, 40.035-17.959, 40.035-40.036C 493.63,216.639, 487.964,205.541, 479.087,198.191zM 325.974,103.744c-17.406-14.27-38.988-20.633-69.975-20.633c-30.989,0.00-52.57,6.363-69.979,20.633
-		c-4.117,3.375-10.194,2.771-13.568-1.344c-3.377-4.119-2.775-10.195, 1.344-13.572c 20.81-17.061, 46.93-25.004, 82.204-25.004
-		c 35.273,0.00, 61.393,7.943, 82.203,25.004c 4.117,3.377, 4.722,9.453, 1.345,13.572C 336.164,106.523, 330.091,107.119, 325.974,103.744zM 214.117,189.99c0.00,19.184-15.552,34.734-34.735,34.734c-19.188,0.00-34.74-15.551-34.74-34.734
-		c0.00-19.189, 15.554-34.742, 34.74-34.742C 198.566,155.25, 214.117,170.801, 214.117,189.99zM 334.261,224.725c-19.189,0.00-34.742-15.551-34.742-34.734c0.00-19.189, 15.553-34.742, 34.742-34.742
-		c 19.184,0.00, 34.738,15.553, 34.738,34.742C 368.999,209.174, 353.445,224.725, 334.261,224.725z" />
-<glyph unicode="&#xe0ba;" d="M 426.656,480.00L 85.344,480.00 C 38.406,480.00,0.00,441.594,0.00,394.657l0.00-341.313 C0.00,6.376, 38.407-32.00, 85.344-32.00l 341.312,0.00
-	C 473.593-32.00, 512.00,6.376, 512.00,53.344L 512.00,394.656 C 511.997,441.594, 473.593,480.00, 426.656,480.00z M 157.395,51.365L 79.969,51.365 L 79.969,284.329 l 77.426,0.00 L 157.395,51.365 z
-	 M 118.684,316.121l-0.508,0.00 c-25.983,0.00-42.788,17.898-42.788,40.266c0.00,22.846, 17.313,40.248, 43.803,40.248
-	c 26.486,0.00, 42.791-17.396, 43.296-40.248C 162.487,334.027, 145.678,316.121, 118.684,316.121z M 436.611,51.365l-77.426,0.00 L 359.185,176.003
-	c0.00,31.308-11.205,52.669-39.219,52.669c-21.396,0.00-34.144-14.406-39.73-28.318c-2.041-4.979-2.548-11.924-2.548-18.883l0.00-130.104
-	l-77.443,0.00 c0.00,0.00, 1.018,211.103,0.00,232.963l 77.436,0.00 l0.00-33.00 c 10.283,15.864, 28.672,38.479, 69.785,38.479c 50.951,0.00, 89.146-33.309, 89.146-104.856
-	L 436.612,51.365 L 436.611,51.365z" />
-<glyph unicode="&#xe0bb;" d="M 409.79,73.186c-53.333,0.209-81.749,26.291-101.496,72.251l-5.649,12.541l-48.685,111.00
-	c-16.146,39.293-56.211,65.836-101.417,65.836c-61.167,0.00-110.792-49.626-110.792-110.836c0.00-61.209, 49.624-110.834, 110.792-110.834
-	c 42.669,0.00, 79.771,24.125, 98.291,59.50l 19.688-45.416c-27.956-34.085-70.438-55.792-117.977-55.792C 68.29,71.436,0.00,139.687,0.00,223.979
-	c0.00,84.252, 68.29,152.586, 152.542,152.586c 63.583,0.00, 114.918-33.959, 141.00-94.126c 1.978-4.668, 27.579-64.543, 49.913-115.50
-	c 13.834-31.541, 25.63-52.459, 63.878-53.752c 37.584-1.291, 63.378,21.584, 63.378,50.504c0.00,28.25-19.668,35.041-52.875,46.082
-	c-59.691,19.667-90.503,39.417-90.503,86.751c0.00,46.168, 31.416,76.959, 82.457,76.959c 33.248,0.00, 57.253-14.793, 73.88-44.293
-	l-32.628-16.666c-12.295,17.207-25.854,24.00-43.086,24.00c-23.956,0.00-41.063-16.668-41.063-38.833c0.00-31.461, 28.147-36.211, 67.503-49.127
-	C 487.375,231.314, 512.00,211.604, 512.00,162.396C 512.001,110.728, 467.664,73.102, 409.79,73.186z" />
-<glyph unicode="&#xe0bc;" d="M 426.671,480.00L 85.344,480.00 C 38.406,480.00,0.00,441.596,0.00,394.658l0.00-341.313 C0.00,6.375, 38.408-32.00, 85.344-32.00L 426.67-32.00
-	c 46.937,0.00, 85.33,38.375, 85.33,85.345L 512.00,394.657 C 512.00,441.596, 473.608,480.00, 426.671,480.00z M 371.342,108.469
-	c-39.999,0.157-61.313,19.721-76.124,54.189l-4.236,9.404l-36.513,83.25c-12.11,29.469-42.159,49.375-76.063,49.375
-	c-45.875,0.00-83.096-37.219-83.096-83.125s 37.222-83.125, 83.096-83.125c 32.00,0.00, 59.828,18.094, 73.717,44.625L 266.89,149.00
-	c-20.969-25.563-52.829-41.844-88.484-41.844C 115.218,107.156, 64.00,158.343, 64.00,221.561c0.00,63.188, 51.219,114.438, 114.405,114.438
-	c 47.688,0.00, 86.188-25.469, 105.75-70.594c 1.483-3.50, 20.688-48.406, 37.438-86.625c 10.375-23.656, 19.219-39.346, 47.906-40.313
-	c 28.188-0.969, 47.53,16.188, 47.53,37.876c0.00,21.188-14.751,26.281-39.657,34.563C 332.609,225.658, 309.50,240.47, 309.50,275.97
-	c0.00,34.626, 23.563,57.72, 61.842,57.72c 24.937,0.00, 42.938-11.094, 55.408-33.221L 402.28,287.97
-	c-9.221,12.906-19.393,18.001-32.313,18.001c-17.97,0.00-30.797-12.501-30.797-29.126c0.00-23.595, 21.107-27.157, 50.627-36.844
-	C 429.529,227.064, 448.00,212.283, 448.00,175.376C 447.997,136.626, 414.746,108.406, 371.342,108.469z" />
-<glyph unicode="&#xe0bd;" d="M 426.688,480.00L 85.343,480.00 C 38.405,480.00,0.00,441.592,0.00,394.654l0.00-341.312 C0.00,6.377, 38.405-32.00, 85.343-32.00l 341.345,0.00
-	C 473.625-32.00, 512.00,6.376, 512.00,53.342L 512.00,394.654 C 512.00,441.592, 473.625,480.00, 426.688,480.00z M 480.00,53.342c0.00-14.167-5.57-27.541-15.685-37.658
-	C 454.204,5.57, 440.841,0.00, 426.688,0.00L 256.00,0.00 L 256.00,224.00 L 32.00,224.00 L 32.00,394.654 c0.00,14.154, 5.575,27.525, 15.698,37.648C 57.82,442.425, 71.19,448.00, 85.343,448.00
-	L 256.00,448.00 l0.00-224.00 l 224.00,0.00 L 480.00,53.342 z" />
-<glyph unicode="&#xe0be;" d="M 256.00,480.00C 114.615,480.00,0.00,365.385,0.00,224.00s 114.614-256.00, 256.00-256.00c 141.385,0.00, 256.00,114.615, 256.00,256.00S 397.385,480.00, 256.00,480.00z M 256.00,286.294
-	c-8.484,0.00-15.359-6.876-15.359-15.36l0.00-93.868 c0.00-35.816-29.037-64.854-64.854-64.854c-35.818,0.00-64.854,29.036-64.854,64.854l0.00,42.668
-	l 49.493,0.00 l0.00-40.961 c0.00-8.483, 6.877-15.359, 15.36-15.359c 8.482,0.00, 15.358,6.876, 15.358,15.359l0.00,92.161
-	c0.00,35.817, 29.035,64.853, 64.854,64.853c 35.815,0.00, 64.854-29.036, 64.854-64.853l0.00-18.774 l-29.014-9.386l-20.479,9.386l0.00,18.774
-	C 271.361,279.417, 264.484,286.294, 256.00,286.294z M 401.067,177.066c0.00-35.816-29.036-64.854-64.853-64.854
-	c-35.818,0.00-64.854,29.036-64.854,64.854L 271.36,218.88 l 20.479-9.387l 29.014,9.387l0.00-41.813 c0.00-8.482, 6.875-15.359, 15.36-15.359
-	c 8.481,0.00, 15.358,6.877, 15.358,15.359l0.00,40.961 l 49.493,0.00 l0.00-40.961 L 401.067,177.067 z" />
-<glyph unicode="&#xe0bf;" d="M 426.675,480.00L 85.325,480.00 C 38.20,480.00,0.00,441.79,0.00,394.658l0.00-341.315 C0.00,6.21, 38.20-32.00, 85.325-32.00l 341.35,0.00 C 473.80-32.00, 512.00,6.21, 512.00,53.343
-	L 512.00,394.658 C 512.00,441.79, 473.80,480.00, 426.675,480.00z M 256.00,286.294c-8.484,0.00-15.359-6.876-15.359-15.36l0.00-93.868
-	c0.00-35.816-29.037-64.854-64.854-64.854c-35.818,0.00-64.854,29.036-64.854,64.854l0.00,42.668 l 49.493,0.00 l0.00-40.961
-	c0.00-8.483, 6.877-15.359, 15.36-15.359c 8.482,0.00, 15.359,6.876, 15.359,15.359l0.00,92.161 c0.00,35.817, 29.035,64.853, 64.854,64.853
-	c 35.815,0.00, 64.854-29.036, 64.854-64.853l0.00-18.774 l-29.014-9.386l-20.48,9.386l0.00,18.774 C 271.36,279.417, 264.484,286.294, 256.00,286.294z
-	 M 401.067,177.066c0.00-35.816-29.037-64.854-64.854-64.854c-35.818,0.00-64.854,29.036-64.854,64.854L 271.359,218.88 l 20.48-9.387l 29.014,9.387
-	l0.00-41.813 c0.00-8.482, 6.875-15.359, 15.359-15.359c 8.482,0.00, 15.36,6.877, 15.36,15.359l0.00,40.961 l 49.492,0.00 l0.00-40.961 L 401.067,177.067 z" />
-<glyph unicode="&#xe0c0;" d="M 256.00,480.00C 114.615,480.00,0.00,365.385,0.00,224.00s 114.613-256.00, 256.00-256.00c 141.385,0.00, 256.00,114.615, 256.00,256.00S 397.385,480.00, 256.00,480.00z M 280.822,137.941
-	c-23.26,1.807-33.021,13.328-51.252,24.404C 219.54,109.757, 207.288,59.337, 171.00,33.002
-	c-11.202,79.484, 16.447,139.182, 29.285,202.557c-21.892,36.853, 2.635,111.017, 48.81,92.737
-	c 56.813-22.474-49.20-137.004, 21.966-151.308c 74.31-14.934, 104.644,128.929, 58.571,175.712
-	c-66.579,67.553-193.799,1.54-178.155-95.178c 3.807-23.646, 28.236-30.819, 9.762-63.451c-42.61,9.446-55.325,43.051-53.688,87.856
-	c 2.634,73.337, 65.892,124.682, 129.343,131.783c 80.242,8.982, 155.553-29.454, 165.953-104.938
-	C 414.553,223.577, 366.623,131.307, 280.822,137.941z" />
-<glyph unicode="&#xe0c1;" d="M 426.675,480.00L 85.324,480.00 C 38.199,480.00,0.00,441.79,0.00,394.657l0.00-341.315 C0.00,6.209, 38.199-32.00, 85.324-32.00l 341.351,0.00
-	C 473.80-32.00, 512.00,6.209, 512.00,53.342L 512.00,394.657 C 512.00,441.79, 473.80,480.00, 426.675,480.00z M 280.822,137.941
-	c-23.26,1.807-33.021,13.328-51.252,24.404c-10.03-52.589-22.281-103.009-58.569-129.344
-	c-11.202,79.484, 16.447,139.182, 29.285,202.557c-21.893,36.853, 2.635,111.017, 48.81,92.737
-	c 56.813-22.474-49.20-137.004, 21.966-151.308c 74.31-14.934, 104.644,128.929, 58.571,175.712
-	c-66.579,67.553-193.799,1.54-178.155-95.178c 3.807-23.646, 28.236-30.819, 9.762-63.451c-42.61,9.446-55.325,43.051-53.688,87.856
-	c 2.634,73.337, 65.892,124.682, 129.343,131.783c 80.242,8.982, 155.553-29.454, 165.953-104.938
-	C 414.553,223.577, 366.623,131.307, 280.822,137.941z" />
-<glyph unicode="&#xe0c2;" d="M 426.671,480.00L 85.343,480.00 C 38.406,480.00,0.00,441.595,0.00,394.655l0.00-341.311 C0.00,6.375, 38.406-32.00, 85.343-32.00l 341.328,0.00
-	C 473.609-32.00, 512.00,6.375, 512.00,53.345L 512.00,394.655 C 512.00,441.595, 473.609,480.00, 426.671,480.00z M 155.889,146.606l-55.632,0.00
-	c-3.351,0.00-5.854,1.504-7.271,3.792c-1.467,2.379-1.542,5.464,0.00,8.534l 59.11,104.313c 0.063,0.114, 0.063,0.19,0.00,0.316l-37.615,65.116
-	c-1.556,3.098-1.783,6.157-0.316,8.534c 1.417,2.301, 4.235,3.477, 7.586,3.477l 55.632,0.00 c 8.535,0.00, 12.72-5.499, 15.489-10.431
-	c0.00,0.00, 38.02-66.33, 38.249-66.696c-2.252-3.97-60.059-106.21-60.059-106.21C 168.218,152.22, 164.21,146.606, 155.889,146.606z
-	 M 418.956,404.731L 295.78,186.941c-0.075-0.115-0.075-0.255,0.00-0.367l 78.431-143.295c 1.556-3.084, 1.593-6.221, 0.113-8.597
-	c-1.415-2.288-4.033-3.552-7.383-3.552l-55.57,0.00 c-8.522,0.00-12.783,5.663-15.54,10.596c0.00,0.00-78.848,144.646-79.05,145.023
-	c 3.944,6.98, 123.797,219.523, 123.797,219.523c 2.984,5.362, 6.587,10.596, 14.894,10.596l 56.203,0.00 c 3.351,0.00, 5.981-1.265, 7.396-3.553
-	C 420.537,410.939, 420.499,407.804, 418.956,404.731z" />
-<glyph unicode="&#xe0c3;" d="M 267.313,468.686C 261.091,474.908, 248.80,480.00, 240.00,480.00L 48.00,480.00 c-8.80,0.00-16.00-7.20-16.00-16.00l0.00-480.00 c0.00-8.80, 7.20-16.00, 16.00-16.00l 384.00,0.00 c 8.80,0.00, 16.00,7.20, 16.00,16.00L 448.00,272.00
-		c0.00,8.80-5.091,21.091-11.313,27.313L 267.313,468.686z M 416.00,0.00L 64.00,0.00 L 64.00,448.00 l 175.579,0.00 c 1.458-0.24, 4.204-1.377, 5.405-2.239l 168.778-168.777
-		c 0.861-1.201, 1.998-3.947, 2.238-5.405L 416.00,0.00 zM 432.00,480.00l-96.00,0.00 c-8.80,0.00-10.909-5.091-4.687-11.313l 105.373-105.373C 442.909,357.091, 448.00,359.20, 448.00,368.00L 448.00,464.00 C 448.00,472.80, 440.80,480.00, 432.00,480.00
-		z" />
-<glyph unicode="&#xe0c4;" d="M 449.735,374.562l-75.173,87.703C 365.751,472.542, 349.533,480.00, 336.00,480.00L 80.00,480.00 C 62.355,480.00, 48.00,465.645, 48.00,448.00l0.00-448.00 c0.00-17.645, 14.354-32.00, 32.00-32.00
-		l 352.00,0.00 c 17.645,0.00, 32.00,14.355, 32.00,32.00L 464.00,336.00 C 464.00,348.702, 458.00,364.92, 449.735,374.562z M 352.00,459.633c 4.142-2.112, 7.88-4.826, 10.412-7.781
-		l 75.175-87.704c 2.649-3.092, 5.069-7.469, 6.913-12.148L 352.00,352.00 L 352.00,459.633 z M 448.00,0.00c0.00-8.80-7.20-16.00-16.00-16.00L 80.00-16.00 c-8.80,0.00-16.00,7.20-16.00,16.00L 64.00,448.00
-		c0.00,8.80, 7.20,16.00, 16.00,16.00l 256.00,0.00 l0.00-128.00 l 112.00,0.00 L 448.00,0.00 zM 294.112,206.287c-19.817,18.503-36.43,44.212-46.739,73.019c 0.707,2.758, 1.386,5.453, 2.00,8.177
-		c 2.869,12.896, 4.924,55.508, 4.924,55.508s-8.151-32.012-9.435-36.842c-0.824-3.064-1.863-6.335-3.042-9.739
-		c-6.251,21.983-9.433,43.311-9.433,59.468c0.00,4.574, 0.39,13.445, 1.688,20.473c 0.627,5.014, 2.459,7.619, 4.341,8.877
-		c 3.731-0.906, 7.895-6.623, 12.252-16.191c 3.743-8.27, 3.511-17.853, 3.511-23.782c0.00,0.00, 4.014,14.584, 3.086,23.262
-		c-0.563,5.211-5.525,18.861-16.062,18.349l-0.86,0.00 l-4.689,0.172c-7.694,0.00-14.893-3.719-16.633-9.934
-		c-6.466-23.838, 0.771-60.678, 12.84-106.604l-3.653-8.879c-9.238-22.521-20.782-44.946-30.941-64.856
-		c-41.931-82.047-74.548-126.311-96.297-129.41l-0.093,0.895c-0.473,10.232, 18.426,36.631, 44.027,57.609
-		c 2.668,2.166, 14.055,13.186, 14.055,13.186s-15.38-8.131-18.833-10.221c-32.077-19.154-48.047-38.338-50.649-51.072
-		c-0.771-3.783-0.262-8.43, 3.074-10.338l 8.208-4.125c 22.328-11.182, 49.771,18.203, 86.276,82.178
-		c 37.147,12.186, 83.491,23.666, 125.69,29.881c 37.77-21.582, 81.094-31.857, 97.738-27.416c 3.166,0.838, 6.506,3.318, 8.207,5.611
-		c 1.334,2.109, 3.19,10.549, 3.19,10.549s-3.125-4.279-5.701-5.535c-10.541-4.975-43.797,3.322-77.932,20.023
-		c 29.514,3.141, 54.107,3.27, 67.25-0.93c 16.686-5.326, 16.686-10.797, 16.463-11.906c 0.223,0.918, 0.98,4.578, 0.891,6.137
-		c-0.38,4.00-1.605,7.572-4.632,10.529c-6.18,6.086-21.438,9.162-42.223,9.436c-15.668,0.174-34.447-1.203-54.844-4.117
-		C 311.79,193.094, 301.924,198.982, 294.112,206.287z M 190.386,153.314c 6.319,11.23, 13.166,23.459, 20.169,36.648
-		c 13.558,25.639, 21.776,45.43, 28.689,64.054c 10.899-21.924, 25.938-42.757, 45.665-59.456c 4.396-3.723, 9.069-7.242, 13.882-10.564
-		C 262.974,177.336, 225.346,167.961, 190.386,153.314z" />
-<glyph unicode="&#xe0c5;" d="M 345.11,244.159c-30.334,14.326-68.986,17.21-97.415-3.024c 34.569,3.302, 72.479-2.419, 97.553-28.563
-			c 24.00,27.54, 62.057,32.703, 96.479,29.866C 412.981,261.511, 375.115,258.951, 345.11,244.159zM 332.824,177.125c-34.189,0.789-67.217-11.586-95.55-30.052c-53.588,22.794-121.368,18.562-167.001-19.491
-			c 13.165,0.467, 26.003,3.723, 39.028,5.396c 47.591,4.745, 98.294-7.071, 134.256-39.912c 14.886,21.771, 35.822,39.121, 59.826,49.961
-			c 31.537,15.26, 67.08,16.842, 101.41,17.26C 383.949,174.611, 357.485,177.264, 332.824,177.125zM 449.735,374.562l-75.173,87.703C 365.751,472.542, 349.533,480.00, 336.00,480.00L 80.00,480.00 C 62.355,480.00, 48.00,465.645, 48.00,448.00l0.00-448.00 c0.00-17.645, 14.354-32.00, 32.00-32.00
-		l 352.00,0.00 c 17.645,0.00, 32.00,14.355, 32.00,32.00L 464.00,336.00 C 464.00,348.702, 458.00,364.92, 449.735,374.562z M 352.00,459.633c 4.142-2.112, 7.88-4.826, 10.412-7.781
-		l 75.175-87.704c 2.649-3.092, 5.069-7.469, 6.913-12.148L 352.00,352.00 L 352.00,459.633 z M 448.00,0.00c0.00-8.80-7.20-16.00-16.00-16.00L 80.00-16.00 c-8.80,0.00-16.00,7.20-16.00,16.00L 64.00,448.00
-		c0.00,8.80, 7.20,16.00, 16.00,16.00l 256.00,0.00 l0.00-128.00 l 112.00,0.00 L 448.00,0.00 z" />
-<glyph unicode="&#xe0c6;" d="M 449.735,374.562l-75.173,87.703C 365.751,472.542, 349.533,480.00, 336.00,480.00L 80.00,480.00 C 62.355,480.00, 48.00,465.645, 48.00,448.00l0.00-448.00 c0.00-17.645, 14.354-32.00, 32.00-32.00
-		l 352.00,0.00 c 17.645,0.00, 32.00,14.355, 32.00,32.00L 464.00,336.00 C 464.00,348.702, 458.00,364.92, 449.735,374.562z M 352.00,459.633c 4.142-2.112, 7.88-4.826, 10.412-7.781
-		l 75.175-87.704c 2.649-3.092, 5.069-7.469, 6.913-12.148L 352.00,352.00 L 352.00,459.633 z M 448.00,0.00c0.00-8.80-7.20-16.00-16.00-16.00L 80.00-16.00 c-8.80,0.00-16.00,7.20-16.00,16.00L 64.00,448.00
-		c0.00,8.80, 7.20,16.00, 16.00,16.00l 256.00,0.00 l0.00-128.00 l 112.00,0.00 L 448.00,0.00 zM 319.889,242.054L 341.995,242.054L 316.489,128.965L 283.326,287.97L 230.051,287.97L 191.494,128.965L 162.586,287.97L 106.889,287.97L 163.435,32.029L 217.854,32.029L 256.001,183.383L 290.129,32.029L 340.297,32.029L 405.112,287.97L 319.889,287.97
-		z" />
-<glyph unicode="&#xe0c7;" d="M 449.735,374.562l-75.173,87.703C 365.751,472.542, 349.533,480.00, 336.00,480.00L 80.00,480.00 C 62.355,480.00, 48.00,465.645, 48.00,448.00l0.00-448.00 c0.00-17.645, 14.354-32.00, 32.00-32.00
-		l 352.00,0.00 c 17.645,0.00, 32.00,14.355, 32.00,32.00L 464.00,336.00 C 464.00,348.702, 458.00,364.92, 449.735,374.562z M 352.00,459.633c 4.142-2.112, 7.88-4.826, 10.412-7.781
-		l 75.175-87.704c 2.649-3.092, 5.069-7.469, 6.913-12.148L 352.00,352.00 L 352.00,459.633 z M 448.00,0.00c0.00-8.80-7.20-16.00-16.00-16.00L 80.00-16.00 c-8.80,0.00-16.00,7.20-16.00,16.00L 64.00,448.00
-		c0.00,8.80, 7.20,16.00, 16.00,16.00l 256.00,0.00 l0.00-128.00 l 112.00,0.00 L 448.00,0.00 zM 371.514,288.00L 303.867,288.00L 256.001,217.484L 208.131,288.00L 140.487,288.00L 221.568,166.768L 130.081,32.00L 261.201,32.00L 261.201,77.788L 230.923,77.788L 256.001,115.285L 311.699,32.00L 381.92,32.00L 290.432,166.768 	z" />
-<glyph unicode="&#xe0c8;" d="M 449.735,374.562l-75.173,87.703C 365.751,472.542, 349.533,480.00, 336.00,480.00L 80.00,480.00 C 62.355,480.00, 48.00,465.645, 48.00,448.00l0.00-448.00 c0.00-17.645, 14.354-32.00, 32.00-32.00
-		l 352.00,0.00 c 17.645,0.00, 32.00,14.355, 32.00,32.00L 464.00,336.00 C 464.00,348.702, 458.00,364.92, 449.735,374.562z M 352.00,459.633c 4.142-2.112, 7.88-4.826, 10.412-7.781
-		l 75.175-87.704c 2.649-3.092, 5.069-7.469, 6.913-12.148L 352.00,352.00 L 352.00,459.633 z M 448.00,0.00c0.00-8.80-7.20-16.00-16.00-16.00L 80.00-16.00 c-8.80,0.00-16.00,7.20-16.00,16.00L 64.00,448.00
-		c0.00,8.80, 7.20,16.00, 16.00,16.00l 256.00,0.00 l0.00-128.00 l 112.00,0.00 L 448.00,0.00 zM 303.999,224.00c-44.186,0.00-80.00-35.816-80.00-80.00s 35.815-80.00, 80.00-80.00c 44.184,0.00, 80.00,35.816, 80.00,80.00S 348.183,224.00, 303.999,224.00z M 303.999,144.00
-		l0.00,64.00 c 35.287,0.00, 64.00-28.71, 64.00-64.00L 303.999,144.00 zM 96.00,224.00L 192.00,224.00L 192.00,192.00L 96.00,192.00zM 96.00,160.00L 192.00,160.00L 192.00,128.00L 96.00,128.00zM 96.00,96.00L 192.00,96.00L 192.00,64.00L 96.00,64.00z" />
-<glyph unicode="&#xe0c9;" d="M 449.735,374.562l-75.173,87.703C 365.751,472.542, 349.533,480.00, 336.00,480.00L 80.00,480.00 C 62.355,480.00, 48.00,465.645, 48.00,448.00l0.00-448.00 c0.00-17.645, 14.354-32.00, 32.00-32.00
-		l 352.00,0.00 c 17.645,0.00, 32.00,14.355, 32.00,32.00L 464.00,336.00 C 464.00,348.702, 458.00,364.92, 449.735,374.562z M 352.00,459.633c 4.142-2.112, 7.88-4.826, 10.412-7.781
-		l 75.175-87.704c 2.649-3.092, 5.069-7.469, 6.913-12.148L 352.00,352.00 L 352.00,459.633 z M 448.00,0.00c0.00-8.80-7.20-16.00-16.00-16.00L 80.00-16.00 c-8.80,0.00-16.00,7.20-16.00,16.00L 64.00,448.00
-		c0.00,8.80, 7.20,16.00, 16.00,16.00l 256.00,0.00 l0.00-128.00 l 112.00,0.00 L 448.00,0.00 zM 224.00,192.00L 192.00,224.00L 96.00,128.00L 192.00,32.00L 224.00,64.00L 160.00,128.00 	zM 288.00,64.00L 320.00,32.00L 416.00,128.00L 320.00,224.00L 288.00,192.00L 352.00,128.00 	z" />
-<glyph unicode="&#xe0ca;" d="M 449.735,374.562l-75.173,87.703C 365.751,472.542, 349.533,480.00, 336.00,480.00L 80.00,480.00 C 62.355,480.00, 48.00,465.645, 48.00,448.00l0.00-448.00 c0.00-17.645, 14.354-32.00, 32.00-32.00
-		l 352.00,0.00 c 17.645,0.00, 32.00,14.355, 32.00,32.00L 464.00,336.00 C 464.00,348.702, 458.00,364.92, 449.735,374.562z M 352.00,459.633c 4.142-2.112, 7.88-4.826, 10.412-7.781
-		l 75.175-87.704c 2.649-3.092, 5.069-7.469, 6.913-12.148L 352.00,352.00 L 352.00,459.633 z M 448.00,0.00c0.00-8.80-7.20-16.00-16.00-16.00L 80.00-16.00 c-8.80,0.00-16.00,7.20-16.00,16.00L 64.00,448.00
-		c0.00,8.80, 7.20,16.00, 16.00,16.00l 256.00,0.00 l0.00-128.00 l 112.00,0.00 L 448.00,0.00 zM 192.00,192.00l0.00,64.00 c0.00,8.477, 3.348,16.493, 9.427,22.573C 207.507,284.652, 215.523,288.00, 224.00,288.00l0.00,32.00 c-35.20,0.00-64.00-28.80-64.00-64.00l0.00-48.00
-		c0.00-8.837-7.164-16.00-16.00-16.00l-16.00,0.00 l0.00-32.00 l 16.00,0.00 c 8.837,0.00, 16.00-7.163, 16.00-16.00l0.00-48.00 c0.00-35.20, 28.80-64.00, 64.00-64.00l0.00,32.00 c-8.477,0.00-16.494,3.348-22.573,9.428
-		C 195.348,79.507, 192.00,87.523, 192.00,96.00l0.00,64.00 c0.00,8.837-7.164,16.00-16.00,16.00C 184.837,176.00, 192.00,183.163, 192.00,192.00zM 320.00,160.00l0.00-64.00 c0.00-8.477-3.348-16.493-9.427-22.572C 304.494,67.348, 296.478,64.00, 288.00,64.00l0.00-32.00 c 35.201,0.00, 64.00,28.80, 64.00,64.00l0.00,48.00
-		c0.00,8.837, 7.164,16.00, 16.00,16.00l 16.00,0.00 l0.00,32.00 l-16.00,0.00 c-8.836,0.00-16.00,7.163-16.00,16.00l0.00,48.00 c0.00,35.20-28.799,64.00-64.00,64.00l0.00-32.00 c 8.478,0.00, 16.494-3.348, 22.573-9.428
-		C 316.653,272.493, 320.00,264.477, 320.00,256.00l0.00-64.00 c0.00-8.837, 7.164-16.00, 16.00-16.00C 327.164,176.00, 320.00,168.837, 320.00,160.00z" />
-<glyph unicode="&#xe0cb;" d="M 30.269,480.00l 41.072-460.815L 255.719-32.00l 184.862,51.262L 481.731,480.00L 30.269,480.00 z M 392.315,329.286l-0.195,0.00 L 176.045,329.286 l 5.151-57.875
-	L 387.18,271.411 l-15.521-173.505L 255.99,65.818l-0.115-0.039l-0.077,0.00 l-0.061,0.00 l-115.786,32.127l-7.915,88.756l 56.747,0.00 l 4.024-45.116
-	l 62.931-16.958l 0.139,0.039l 62.967,16.996l 6.535,73.275L 129.509,214.898 L 114.262,385.798l 283.107,0.00 L 392.315,329.286z" />
-<glyph unicode="&#xe0cc;" d="M 30.269,480.00l 41.072-460.815L 255.719-32.00l 184.862,51.262L 481.731,480.00L 30.269,480.00 z M 405.381,48.588L 256.768,7.40l0.00-0.233
-		l-0.388,0.117l-0.391-0.117L 255.989,7.40 l-148.611,41.188L 72.257,442.331l 368.248,0.00 L 405.381,48.588zM 325.377,214.898L 318.842,141.622L 255.874,124.626L 255.737,124.587L 192.806,141.545L 188.781,186.662L 132.036,186.662L 139.951,97.906L 255.737,65.779L 255.797,65.779L 255.874,65.779L 255.989,65.818L 371.66,97.906L 387.18,271.412L 181.197,271.412L 176.046,329.286L 392.117,329.286L 392.313,329.286L 397.369,385.799L 114.26,385.799L 129.509,214.898 	z" />
-<glyph unicode="&#xe0cd;" d="M 76.194,455.739L 59.014,369.776L 408.888,369.776L 397.946,314.249L 47.852,314.249L 30.906,228.30L 380.748,228.30L 361.239,130.268L 220.233,83.557L 98.033,130.268L 106.397,172.789L 20.448,172.789L0.00,69.613L 202.113-7.739L 435.116,69.613L 512.00,455.739 z" />
-<glyph unicode="&#xe0ce;" d="M 129.772,224.001A59.223,59.223 4860.00 1,0 248.218,224.001A59.223,59.223 4860.00 1,0 129.772,224.001zM 256.002,480.00C 114.615,480.00,0.00,365.384,0.00,224.00s 114.613-256.00, 256.002-256.00C 397.384-32.00, 512.00,82.615, 512.00,224.00
-		C 512.00,365.384, 397.385,480.00, 256.002,480.00z M 189.698,0.359C 112.72,45.146, 60.964,128.521, 60.964,224.00
-		c0.00,95.479, 51.756,178.854, 128.731,223.641C 266.70,402.86, 318.49,319.497, 318.49,224.00C 318.49,128.506, 266.70,45.141, 189.698,0.359z" />
-<glyph unicode="&#xe0cf;" d="M 408.817,428.768L 203.501,428.768 c-28.16,0.00-50.684-22.532-50.684-50.692l0.00-205.308 c0.00-28.16, 23.04-51.20, 51.20-51.20l 204.80,0.00 c 28.16,0.00, 51.20,23.04, 51.20,51.20l0.00,204.80
-		C 460.017,405.728, 436.977,428.768, 408.817,428.768z M 408.817,172.768l-204.80,0.00 l0.00,204.80 l 204.80,0.00 L 408.817,172.768 z M 101.616,223.968l-51.20,0.00 l0.00-153.60
-		c0.00-28.16, 23.04-51.20, 51.20-51.20l 153.60,0.00 l0.00,51.20 l-153.60,0.00 L 101.616,223.968 z" />
-<glyph unicode="&#xe0d0;" d="M 198.904,165.848l-102.419,40.968l0.00-34.659 l 102.419-40.971L 198.904,165.848 z M 198.904,272.183l-102.419,40.968l0.00-34.659 l 102.419-40.964
-		L 198.904,272.183 z M 474.368,449.968c-7.032,4.761-15.968,5.724-23.856,2.568L 255.216,374.416L 59.92,452.536
-		c-7.888,3.156-16.824,2.191-23.86-2.568c-7.029-4.761-11.244-12.704-11.244-21.20l0.00-327.68 c0.00-10.471, 6.368-19.88, 16.084-23.772
-		l 204.364-81.74c0.00,0.00, 4.192-1.353, 4.981-1.511c 1.644-0.321, 3.309-0.496, 4.973-0.496s 3.324,0.176, 4.967,0.496
-		c 0.783,0.16, 4.996,1.52, 4.996,1.52l 204.343,81.733c 9.72,3.892, 16.092,13.301, 16.092,23.772l0.00,327.68
-		C 485.617,437.264, 481.40,445.208, 474.368,449.968z M 229.616,45.944l-163.84,65.532L 65.776,398.399 l 163.84-65.544L 229.616,45.944 z M 444.657,111.476
-		l-163.84-65.532L 280.817,332.855 l 163.84,65.544L 444.657,111.476 z M 413.944,206.816l-102.419-40.968l0.00-34.664 l 102.419,40.971L 413.944,206.816 z M 413.944,313.151
-		l-102.419-40.968l0.00-34.656 l 102.419,40.964L 413.944,313.151 z" />
-<glyph unicode="&#xe0d1;" d="M 321.777,454.368l-138.24,0.00 c-14.14,0.00-20.48-11.464-20.48-25.60l0.00-435.20 l 92.16,92.16l 92.16-92.16l0.00,435.20 C 347.377,442.904, 335.916,454.368, 321.777,454.368z" />
-<glyph unicode="&#xe0d2;" d="M 479.719,216.276l-205.408,205.604c-10.511,10.891-27.692,10.891-38.192,0.00L 30.712,216.276
-		c-10.507-10.891-6.588-19.804, 8.708-19.804l 42.817,0.00 l0.00-157.90 c0.00-11.428, 0.487-20.68, 21.105-20.68l 99.701,0.00 L 203.04,176.248 l 104.339,0.00 l0.00-158.355
-		l 104.668,0.00 c 15.719,0.00, 16.143,9.252, 16.143,20.68L 428.192,196.472 l 42.817,0.00 C 486.30,196.472, 490.221,205.384, 479.719,216.276z" />
-<glyph unicode="&#xe0d3;" d="M 475.377,377.571l-440.32,0.00 c-19.712,0.00-35.84-16.132-35.84-35.84l0.00-235.524 c0.00-19.712, 16.128-35.84, 35.84-35.84l 440.32,0.00 c 19.708,0.00, 35.84,16.128, 35.84,35.84L 511.217,341.731
-	C 511.217,361.44, 495.085,377.571, 475.377,377.571z M 280.817,326.371l 51.20,0.00 l0.00-51.204 l-51.20,0.00 L 280.817,326.371 z M 357.617,249.568l0.00-51.20 l-51.20,0.00 l0.00,51.20
-	L 357.617,249.568 z M 204.016,326.371l 51.20,0.00 l0.00-51.204 l-51.20,0.00 L 204.016,326.371 z M 280.817,249.568l0.00-51.20 l-51.20,0.00 l0.00,51.20 L 280.817,249.568 z M 127.216,326.371l 51.20,0.00 l0.00-51.204 l-51.20,0.00
-	L 127.216,326.371 z M 204.016,249.568l0.00-51.20 l-51.20,0.00 l0.00,51.20 L 204.016,249.568 z M 50.416,326.371l 51.20,0.00 l0.00-51.204 l-51.20,0.00 L 50.416,326.371 z M 127.216,249.568l0.00-51.20 l-51.20,0.00 l0.00,51.20
-	L 127.216,249.568 z M 101.616,121.568l-51.20,0.00 l0.00,51.20 l 51.20,0.00 L 101.616,121.568 z M 383.217,121.568l-256.00,0.00 l0.00,51.20 l 256.00,0.00 L 383.217,121.568 z M 460.017,121.568l-51.20,0.00 l0.00,51.20 l 51.20,0.00
-	L 460.017,121.568 z M 383.217,198.368l0.00,51.20 l 51.20,0.00 l0.00-51.20 L 383.217,198.368 z M 460.017,275.168l-102.40,0.00 L 357.617,326.371 l 102.40,0.00 L 460.017,275.168 z" />
-<glyph unicode="&#xe0d4;" d="M 438.924,463.601C 359.044,469.408, 296.123,456.708, 242.285,402.868C 146.048,306.633, 109.568,234.303, 65.353,139.784
-	c0.00,0.00-20.62-43.672-62.388-136.083c-8.672-19.18, 18.38-26.316, 24.708-15.631C 67.083,54.608, 104.244,114.048, 104.244,114.048
-	c 113.788-38.828, 177.86,23.772, 204.12,43.703c-71.732-4.973-121.30,46.76-121.30,46.76s 177.76-3.08, 225.108,67.00
-	C 331.564,278.184, 272.384,311.548, 272.384,311.548s 162.94,21.26, 174.14,34.52c 11.188,13.256, 21.608,40.675, 20.748,49.96
-	C 465.093,419.344, 565.563,454.40, 438.924,463.601z" />
-<glyph unicode="&#xe0d5;" d="M 134.209,302.98c 5.148,0.00, 10.108-0.779, 14.785-2.22c 17.652,19.781, 37.224,37.78, 58.428,53.76
-	c-0.892,3.74-1.416,7.62-1.416,11.64c0.00,5.556, 0.94,10.88, 2.612,15.872c-23.739,17.039-49.568,31.336-77.04,42.388
-	c-25.76-15.92-48.216-36.668-66.12-60.983c 13.287-23.537, 29.096-45.48, 47.049-65.456
-	C 119.08,301.152, 126.424,302.98, 134.209,302.98z M 84.10,252.873c0.00,7.032, 1.463,13.728, 4.085,19.804
-	c-16.084,17.656-30.648,36.707-43.416,57.015C 28.764,297.892, 19.697,262.00, 19.697,223.975c0.00-44.04, 12.112-85.237, 33.152-120.488
-	c 7.516,42.372, 21.784,82.413, 41.488,119.128C 87.936,231.024, 84.10,241.488, 84.10,252.873z M 256.116,416.272
-	c 13.236,0.00, 25.236-5.168, 34.187-13.553c 26.144,11.253, 53.68,19.876, 82.32,25.384C 338.048,448.032, 297.98,459.492, 255.207,459.492
-	c-29.152,0.00-57.056-5.34-82.832-15.032c 20.465-10.101, 39.947-21.90, 58.288-35.189
-	C 238.128,413.692, 246.816,416.272, 256.116,416.272z M 331.048,180.256c 3.12,6.488, 7.552,12.232, 13.024,16.80
-	c-14.792,45.52-38.224,87.152-68.396,122.96c-6.012-2.552-12.62-3.964-19.56-3.964c-10.872,0.00-20.90,3.50-29.112,9.38
-	c-18.161-13.813-34.964-29.288-50.252-46.172C 181.52,271.597, 184.32,262.568, 184.32,252.873c0.00-5.237-0.804-10.276-2.296-15.016
-	C 225.98,208.487, 276.56,188.357, 331.048,180.256z M 396.044,112.615c 0.692-9.483, 1.056-19.06, 1.056-28.72
-	c0.00-17.00-1.079-33.752-3.137-50.20c 39.936,29.176, 70.348,70.593, 85.68,118.752c-18.161-4.392-36.801-7.533-55.819-9.359
-	C 419.356,129.376, 409.16,118.28, 396.044,112.615z M 319.304,146.575C 261.175,156.208, 207.264,178.384, 160.352,210.176
-	c-7.617-4.673-16.552-7.42-26.144-7.42c-3.525,0.00-6.96,0.376-10.272,1.064c-22.459-42.584-36.816-90.076-40.936-140.435
-	c 22.42-24.04, 49.781-43.408, 80.512-56.412C 201.676,65.652, 255.024,114.195, 319.304,146.575z M 413.316,398.533
-	c-37.749-3.639-73.793-13.112-107.348-27.352c 0.172-1.648, 0.256-3.324, 0.256-5.02c0.00-7.908-1.884-15.364-5.145-22.02
-	c 33.525-39.364, 59.568-85.237, 76.008-135.449c 20.376-0.364, 37.796-12.844, 45.288-30.577c 22.671,2.30, 44.748,6.64, 66.016,12.892
-	c 1.507,10.772, 2.344,21.768, 2.344,32.969C 490.737,293.196, 460.865,355.44, 413.316,398.533z M 344.52,119.808
-	c-60.003-28.112-110.179-71.40-146.516-124.328c 18.316-4.568, 37.472-7.032, 57.205-7.032
-	c 35.532,0.00, 69.192,7.911, 99.40,22.001c 4.848,23.736, 7.416,48.292, 7.416,73.448c0.00,9.088-0.409,18.084-1.089,27.00
-	C 354.885,112.837, 349.327,115.876, 344.52,119.808z" />
-<glyph unicode="&#xe0d6;" d="M 494.296,248.488c-10.036,10.664-58.48,58.148-80.636,79.828c-6.784,6.628-16.516,10.852-26.68,10.852
-	s-131.764,0.00-131.764,0.00s-121.60,0.00-131.767,0.00c-10.164,0.00-19.892-4.224-26.68-10.852C 74.616,306.636, 26.168,259.152, 16.136,248.488
-	C 3.616,235.172-3.255,224.544, 0.015,211.384l 14.361-78.688c 3.259-13.159, 17.679-23.928, 32.04-23.928l 417.601,0.00
-	c 14.361,0.00, 28.78,10.767, 32.04,23.928l 14.361,78.688C 513.683,224.544, 506.817,235.172, 494.296,248.488z M 358.843,231.424
-	c-2.60,0.00-4.96-1.32-6.128-3.401l-20.92-52.096L 178.636,175.927 l-20.92,52.096c-1.172,2.08-3.532,3.401-6.133,3.401L 60.844,231.424
-	l 52.24,56.544l 284.26,0.00 L 449.584,231.424L 358.843,231.424 z" />
-<glyph unicode="&#xe0d7;" d="M 255.203,454.368c-187.82,0.00-230.388-42.592-230.388-230.40c0.00-187.812, 42.569-230.40, 230.388-230.40
-	c 187.841,0.00, 230.412,42.588, 230.412,230.40C 485.617,411.776, 443.044,454.368, 255.203,454.368z" />
-<glyph unicode="&#xe0d8;" d="M 255.216,469.732c-135.52,0.00-245.76-110.273-245.76-245.764c0.00-135.52, 110.24-245.76, 245.76-245.76s 245.76,110.24, 245.76,245.76
-	C 500.977,359.46, 390.736,469.732, 255.216,469.732z M 464.816,223.968c0.00-47.945-16.264-92.16-43.416-127.52
-	c-7.68,6.027-15.84,22.216-8.16,39.016c 7.735,16.904, 9.76,56.001, 8.001,71.224c-1.704,15.20-9.60,51.869-31.089,52.216
-	c-21.441,0.321-36.161,7.413-48.912,32.852c-26.448,52.937, 49.656,63.096, 23.20,92.424
-	c-7.408,8.22-45.648-33.888-51.248,22.24c-0.376,3.979, 3.464,9.98, 8.584,16.22
-	C 404.816,394.741, 464.816,316.259, 464.816,223.968z M 226.416,431.492c-5.017-9.76-18.241-13.732-26.296-21.072
-	c-17.488-15.84-25.008-13.648-34.448-28.848c-9.497-15.20-40.112-37.12-40.112-48.112c0.00-10.98, 15.473-23.968, 23.20-21.441
-	c 7.735,2.541, 28.112,2.40, 40.112-1.808c 12.00-4.24, 100.208-8.48, 72.104-83.043
-	c-8.904-23.704-47.945-19.704-58.344-58.984c-1.552-5.735-6.937-30.348-7.312-38.40c-0.64-12.427, 8.80-59.337-3.20-59.337
-	c-12.047,0.00-44.481,41.948-44.481,49.547s-8.423,34.268-8.423,57.092c0.00,22.828-38.824,22.456-38.824,52.801
-	c0.00,27.388, 21.064,40.989, 16.321,54.108c-4.64,13.045-41.655,13.524-57.072,15.096C 86.576,369.013, 149.991,420.932, 226.416,431.492
-	z M 189.296,25.063c 12.584,6.64, 13.864,15.224, 25.281,15.704c 13.064,0.588, 23.68,5.095, 38.40,8.32
-	c 13.064,2.856, 36.425,16.108, 57.015,17.816c 17.328,1.412, 51.568-0.907, 60.80-17.656
-	c-33.176-22.024-72.912-34.881-115.576-34.881C 232.176,14.368, 210.04,18.157, 189.296,25.063z" />
-<glyph unicode="&#xe0d9;" d="M 256.244,120.032c-27.984,0.00-50.684-22.924-50.684-51.20s 22.70-51.20, 50.684-51.20c 27.996,0.00, 50.684,22.924, 50.684,51.20
-		S 284.24,120.032, 256.244,120.032z M 148.724,177.44l 35.84-36.20c 39.584,39.991, 103.776,39.988, 143.364,0.00l 35.836,36.20
-		C 304.384,237.428, 208.103,237.428, 148.724,177.44z M 77.045,249.852l 35.836-36.208c 79.176,79.984, 207.543,79.984, 286.72,0.00
-		l 35.844,36.208C 336.48,349.82, 176.008,349.82, 77.045,249.852z M 5.36,322.26l 35.832-36.204
-		c 118.768,119.965, 311.328,119.965, 430.092,0.00l 35.836,36.20C 368.564,462.22, 143.924,462.22, 5.36,322.26z" />
-<glyph unicode="&#xe0da;" d="M 256.227,479.96L 138.48,293.095l 235.52-0.019L 256.227,479.96z M 256.26-32.028l 117.741,186.864l-235.52,0.019L 256.26-32.028z" />
-<glyph unicode="&#xe0db;" d="M 460.017,449.248l-409.60,0.00 c-28.16,0.00-51.20-23.04-51.20-51.20l0.00-281.60 c0.00-28.16, 22.587-55.72, 50.205-61.239l 111.924-22.388
-	c0.00,0.00-96.336-34.132-34.128-34.132l 256.00,0.00 c 62.204,0.00-34.132,34.132-34.132,34.132l 111.924,22.388
-	c 27.616,5.52, 50.208,33.079, 50.208,61.239l0.00,281.60 C 511.217,426.208, 488.177,449.248, 460.017,449.248z M 460.017,119.008l-409.60,0.00 l0.00,284.16 l 409.60,0.00
-	L 460.017,119.008 z" />
-<glyph unicode="&#xe0dc;" d="M 460.017,454.368l-409.60,0.00 c-28.16,0.00-51.20-23.04-51.20-51.20l0.00-307.20 c0.00-28.16, 23.04-50.692, 51.20-50.692l 101.888,0.00 l0.00,50.18 l-102.40,0.00 l0.00,236.032 l 410.62,0.00 l0.00-236.032 l-102.40,0.00 l0.00-50.18
-	l 101.892,0.00 c 28.16,0.00, 51.20,22.532, 51.20,50.692l0.00,307.20 C 511.217,431.328, 488.177,454.368, 460.017,454.368z M 65.776,369.123
-	c-10.613,0.00-19.20,8.36-19.20,18.684s 8.587,18.684, 19.20,18.684c 10.609,0.00, 19.20-8.36, 19.20-18.684S 76.384,369.123, 65.776,369.123z
-	 M 116.976,369.123c-10.613,0.00-19.20,8.36-19.20,18.684s 8.587,18.684, 19.20,18.684c 10.609,0.00, 19.20-8.36, 19.20-18.684
-	S 127.584,369.123, 116.976,369.123z M 460.525,371.932L 152.304,371.932 l0.00,31.744 l 308.22,0.00 L 460.525,371.932 z M 253.884,270.716L 129.675,147.276l 76.80,0.00 l0.00-153.709
-	l 94.819,0.00 L 301.296,147.276 l 76.80,0.00 L 253.884,270.716z" />
-<glyph unicode="&#xe0dd;" d="M 460.013,428.771L 50.421,428.771 c-28.16,0.00-51.20-23.04-51.20-51.20l0.00-307.204 c0.00-28.16, 23.04-51.20, 51.20-51.20l 409.592,0.00 c 28.16,0.00, 51.20,23.04, 51.20,51.20L 511.213,377.571
-	C 511.213,405.731, 488.173,428.771, 460.013,428.771z M 116.981,380.896c 10.609,0.00, 19.20-8.36, 19.20-18.684s-8.591-18.684-19.20-18.684
-	c-10.613,0.00-19.20,8.36-19.20,18.684S 106.368,380.896, 116.981,380.896z M 46.581,362.211c0.00,10.324, 8.587,18.684, 19.20,18.684
-	c 10.609,0.00, 19.20-8.36, 19.20-18.684s-8.591-18.684-19.20-18.684C 55.168,343.527, 46.581,351.888, 46.581,362.211z M 460.525,70.368
-	L 49.909,70.368 L 49.909,305.891 l 410.616,0.00 L 460.525,70.368 z M 460.525,346.851L 152.82,346.851 l0.00,30.72 l 307.704,0.00 L 460.525,346.851 z" />
-<glyph unicode="&#xe0de;" d="M 325.825,75.488c0.00,107.348, 101.08,151.128, 92.741,259.452
-	C 413.304,403.292, 373.424,479.971, 255.207,479.971c-118.228,0.00-158.096-76.68-163.364-145.032
-	c-8.356-108.324, 98.392-148.205, 98.392-259.452L 325.825,75.487 z M 187.408-10.777c 18.996-13.067, 41.00-21.908, 67.80-21.216
-	c 26.792-0.692, 48.788,8.148, 67.788,21.216l0.00,50.424 l-135.588,0.00 L 187.408-10.777 z" />
-<glyph unicode="&#xe0df;" d="M 255.216,305.888c-45.432,0.00-81.916-36.491-81.916-81.92c0.00-45.432, 36.484-81.92, 81.916-81.92c 45.429,0.00, 81.92,36.488, 81.92,81.92
-	C 337.137,269.396, 300.644,305.888, 255.216,305.888z M 255.216,171.488c-28.997,0.00-52.48,23.489-52.48,52.48
-	c0.00,28.987, 23.483,52.48, 52.48,52.48c 28.987,0.00, 52.48-23.493, 52.48-52.48C 307.697,194.976, 284.204,171.488, 255.216,171.488z
-	 M 101.616,244.448c-14.14,0.00-25.60-9.172-25.60-20.48c0.00-11.312, 11.46-20.48, 25.60-20.48s 25.088,9.168, 25.088,20.48
-	C 126.704,235.276, 115.756,244.448, 101.616,244.448z M 380.844,349.592c-8.001,8.001-22.587,6.368-32.588-3.62
-	c-9.992-9.999-11.612-24.588-3.612-32.581c 8.001-8.009, 22.58-6.384, 32.581,3.608
-	C 387.215,326.996, 388.845,341.592, 380.844,349.592z M 408.817,244.448c-14.14,0.00-25.092-9.172-25.092-20.48
-	c0.00-11.312, 10.952-20.48, 25.092-20.48s 25.60,9.168, 25.60,20.48C 434.417,235.276, 422.956,244.448, 408.817,244.448z M 255.216,95.968
-	c-11.312,0.00-20.48-11.464-20.48-25.60c0.00-14.145, 9.168-25.60, 20.48-25.60c 11.308,0.00, 20.48,11.457, 20.48,25.60C 275.697,84.505, 266.524,95.968, 255.216,95.968z
-	 M 133.216,128.369c-9.992-9.992-11.62-24.584-3.62-32.584s 22.587-6.368, 32.581,3.624c 9.999,9.999, 11.62,24.588, 3.628,32.588
-	C 157.805,139.984, 143.216,138.368, 133.216,128.369z M 128.315,348.313c-8.001-8.001-6.372-22.593, 3.62-32.592
-	c 9.999-9.988, 24.588-11.608, 32.584-3.608c 8.004,8.001, 6.384,22.58-3.616,32.581
-	C 150.916,354.68, 136.316,356.312, 128.315,348.313z M 349.543,100.688c 9.992-9.992, 24.58-11.623, 32.581-3.624
-	c 7.996,8.001, 6.372,22.593-3.62,32.584c-9.999,9.999-24.588,11.616-32.588,3.628C 337.92,125.276, 339.544,110.688, 349.543,100.688z
-	 M 255.216,351.971c 11.308,0.00, 20.48,11.46, 20.48,25.60s-9.172,25.60-20.48,25.60c-11.312,0.00-20.48-11.46-20.48-25.60S 243.905,351.971, 255.216,351.971z" />
-<glyph unicode="&#xe0e0;" d="M 485.617,244.448c-4.64,0.00-20.456,0.00-25.092,0.00c-14.14,0.00-25.60-9.172-25.60-20.48c0.00-11.312, 11.46-20.48, 25.60-20.48
-	c 4.636,0.00, 20.452,0.00, 25.092,0.00c 14.14,0.00, 25.60,9.168, 25.60,20.48C 511.217,235.276, 499.756,244.448, 485.617,244.448z M 255.216,364.76
-	c-78.091,0.00-140.80-62.709-140.80-140.792c0.00-78.091, 62.709-140.808, 140.80-140.808c 78.084,0.00, 140.80,62.716, 140.80,140.808
-	C 396.017,302.051, 333.30,364.76, 255.216,364.76z M 255.216,121.568c-56.58,0.00-102.40,45.824-102.40,102.40
-	c0.00,56.568, 45.82,102.404, 102.40,102.404c 56.568,0.00, 102.40-45.835, 102.40-102.404C 357.617,167.392, 311.783,121.568, 255.216,121.568z
-	 M 75.496,223.968c0.00,11.308-10.94,20.48-25.08,20.48c-4.72,0.00-20.892,0.00-25.60,0.00c-14.14,0.00-25.60-9.172-25.60-20.48c0.00-11.312, 11.46-20.48, 25.60-20.48
-	c 4.708,0.00, 20.879,0.00, 25.60,0.00C 64.556,203.488, 75.496,212.656, 75.496,223.968z M 255.216,403.171c 11.308,0.00, 20.48,11.46, 20.48,25.60
-	c0.00,4.684,0.00,20.908,0.00,25.60c0.00,14.14-9.172,25.60-20.48,25.60c-11.312,0.00-20.48-11.46-20.48-25.60c0.00-4.692,0.00-20.916,0.00-25.60
-	C 234.736,414.632, 243.905,403.171, 255.216,403.171z M 255.216,44.768c-11.312,0.00-20.48-11.464-20.48-25.60c0.00-4.688,0.00-20.912,0.00-25.60
-	c0.00-14.145, 9.168-25.60, 20.48-25.60c 11.308,0.00, 20.48,11.457, 20.48,25.60c0.00,4.688,0.00,20.912,0.00,25.60C 275.697,33.305, 266.524,44.768, 255.216,44.768z
-	 M 443.776,383.56c 9.999,9.995, 11.62,24.591, 3.62,32.592s-22.593,6.368-32.581-3.62c-2.761-2.761-15.169-15.16-17.92-17.92
-	c-9.999-9.999-11.62-24.588-3.62-32.581c 8.001-8.009, 22.587-6.384, 32.581,3.608
-	C 428.616,368.40, 441.019,380.80, 443.776,383.56z M 84.564,82.289c-2.761-2.761-15.16-15.172-17.92-17.92
-	c-9.988-9.992-11.608-24.584-3.62-32.584c 8.001-8.001, 22.593-6.368, 32.581,3.624c 2.761,2.747, 15.164,15.148, 17.92,17.908
-	c 9.999,9.995, 11.62,24.588, 3.62,32.588S 94.556,92.276, 84.564,82.289z M 95.624,412.533
-	c-9.999,9.995-24.588,11.62-32.588,3.62s-6.375-22.593, 3.62-32.584c 2.753-2.757, 15.16-15.169, 17.92-17.92
-	c 9.999-9.995, 24.58-11.616, 32.581-3.616s 6.381,22.584-3.612,32.581C 110.785,397.371, 98.38,409.772, 95.624,412.533z
-	 M 396.896,53.317c 2.761-2.761, 15.169-15.16, 17.924-17.916c 9.988-9.988, 24.58-11.616, 32.581-3.62
-	c 7.996,8.001, 6.368,22.593-3.62,32.581c-2.757,2.757-15.156,15.169-17.916,17.92c-9.988,9.995-24.588,11.62-32.588,3.62
-	S 386.904,63.312, 396.896,53.317z" />
-<glyph unicode="&#xe0e1;" d="M 140.784,224.00l 261.12,0.00 l0.00-122.88 l 71.68,0.00 L 473.585,244.48 c0.00,28.28-22.92,51.20-51.20,51.20l-281.60,0.00 L 140.785,346.88 l-102.40-87.04l 102.40-81.92L 140.785,224.00 z" />
-<glyph unicode="&#xe0e2;" d="M 287.628,433.888c-113.808,0.00-206.332-91.168-209.12-204.676L 15.601,229.212 l 94.164-104.96l 94.164,104.96L 130.824,229.212
-	c 2.764,84.52, 71.884,152.196, 156.804,152.196c 86.675,0.00, 156.94-70.488, 156.94-157.44c0.00-86.956-70.264-157.44-156.94-157.44
-	c-34.761,0.00-66.86,11.352-92.865,30.544l-35.984-38.504c 35.524-27.889, 80.248-44.52, 128.848-44.52
-	c 115.573,0.00, 209.251,93.976, 209.251,209.92C 496.881,339.903, 403.20,433.888, 287.628,433.888z M 269.028,336.608L 269.028,216.54 l 76.939-76.924
-	l 25.34,25.34L 304.881,231.392l0.00,105.216 L 269.028,336.608 z" />
-<glyph unicode="&#xe0e3;" d="M 393.659,223.968c0.00,70.80, 32.692,110.592, 58.292,110.592c 9.329,0.00, 33.664,0.00, 33.664,0.00c-17.104,27.112-31.252,43.012-93.637,43.012
-	L 135.776,377.572 c-95.60,0.00-136.56-88.10-136.56-153.604s 40.96-153.60, 136.56-153.60l 256.204,0.00 c 62.384,0.00, 76.533,15.897, 93.637,43.008
-	c0.00,0.00-8.064,0.00-33.664,0.00S 393.659,153.176, 393.659,223.968z M 275.475,210.376c-9.644-12.22-40.477-40.832-49.696-49.312
-	c-40.16-36.937-42.844-36.937-45.956-36.937l-1.88,0.00 l-4.604,2.377l-1.02,3.211c-1.288,4.243-1.448,4.788, 19.724,43.268
-	c 5.80,10.532, 13.228,24.032, 16.916,31.48c-3.48,1.264-8.089,2.801-11.86,4.056c-25.281,8.423-32.443,11.512-34.72,17.196
-	c-1.76,4.42, 0.892,8.331, 1.884,9.80c 6.985,10.32, 36.652,38.068, 49.076,49.525c 42.068,38.768, 45.18,38.768, 48.188,38.768
-	l 2.332,0.00 l 2.036-1.316c 6.58-4.392, 3.42-10.481-3.504-23.832c-4.148-7.996-9.80-18.332-15.264-28.332
-	c-5.04-9.216-10.948-20.033-14.321-26.632c 2.516-0.86, 5.464-1.832, 8.104-2.699c 28.76-9.457, 36.776-12.988, 38.416-19.852
-	C 280.324,216.972, 277.968,213.536, 275.475,210.376z M 482.396,277.024l-19.16,0.00 c-14.311,0.00-28.312-19.313-28.312-50.688
-	c0.00-31.368, 14.00-50.688, 28.312-50.688l 19.16,0.00 c 14.308,0.00, 28.82,19.32, 28.82,50.688C 511.217,257.712, 496.705,277.024, 482.396,277.024z" />
-<glyph unicode="&#xe0e4;" d="M 460.017,351.968l-409.60,0.00 c-28.16,0.00-51.20-23.04-51.20-51.20l0.00-153.60 c0.00-28.16, 23.04-51.20, 51.20-51.20l 409.60,0.00 c 28.16,0.00, 51.20,23.04, 51.20,51.20l0.00,153.60
-			C 511.217,328.928, 488.177,351.968, 460.017,351.968z M 460.017,147.168l-409.60,0.00 l0.00,153.60 l 409.60,0.00 L 460.017,147.168 z M 434.417,275.168l-102.40,0.00 l0.00-102.40 l 102.40,0.00
-			L 434.417,275.168 z M 178.416,275.168l-102.40,0.00 l0.00-102.40 l 102.40,0.00 L 178.416,275.168 z M 306.417,275.168l-102.40,0.00 l0.00-102.40 l 102.40,0.00 L 306.417,275.168 z" />
-<glyph unicode="&#xe0e5;" d="M 460.017,351.968l-409.60,0.00 c-28.16,0.00-51.20-23.04-51.20-51.20l0.00-153.60 c0.00-28.16, 23.04-51.20, 51.20-51.20l 409.60,0.00 c 28.16,0.00, 51.20,23.04, 51.20,51.20l0.00,153.60
-			C 511.217,328.928, 488.177,351.968, 460.017,351.968z M 460.017,147.168l-409.60,0.00 l0.00,153.60 l 409.60,0.00 L 460.017,147.168 z M 306.417,275.168l-102.40,0.00 l0.00-102.40 l 102.40,0.00
-			L 306.417,275.168 z M 178.416,275.168l-102.40,0.00 l0.00-102.40 l 102.40,0.00 L 178.416,275.168 z" />
-<glyph unicode="&#xe0e6;" d="M 460.017,351.968l-409.60,0.00 c-28.16,0.00-51.20-23.04-51.20-51.20l0.00-153.60 c0.00-28.16, 23.04-51.20, 51.20-51.20l 409.60,0.00 c 28.16,0.00, 51.20,23.04, 51.20,51.20l0.00,153.60
-			C 511.217,328.928, 488.177,351.968, 460.017,351.968z M 460.017,147.168l-409.60,0.00 l0.00,153.60 l 409.60,0.00 L 460.017,147.168 z M 178.416,275.168l-102.40,0.00 l0.00-102.40 l 102.40,0.00
-			L 178.416,275.168 z" />
-<glyph unicode="&#xe0e7;" d="M 460.017,351.968l-409.60,0.00 c-28.16,0.00-51.20-23.04-51.20-51.20l0.00-153.60 c0.00-28.16, 23.04-51.20, 51.20-51.20l 409.60,0.00 c 28.16,0.00, 51.20,23.04, 51.20,51.20l0.00,153.60
-			C 511.217,328.928, 488.177,351.968, 460.017,351.968z M 460.017,147.168l-409.60,0.00 l0.00,153.60 l 409.60,0.00 L 460.017,147.168 z" />
-<glyph unicode="&#xe0e8;" d="M 194.092,370.936c-9.404,8.843-22.10,8.843-31.508,0.00L-0.783,223.968l 163.368-146.96
-	c 9.409-8.852, 22.104-8.852, 31.508,0.00c 9.412,8.857, 9.412,23.212,0.00,32.065L 67.256,223.968l 126.837,114.896
-	C 203.504,347.716, 203.504,362.072, 194.092,370.936z M 347.864,370.936c-9.416,8.843-22.104,8.843-31.516,0.00
-	c-9.412-8.864-8.897-23.22, 0.516-32.072l 126.32-114.896L 316.865,109.071c-9.412-8.852-9.928-23.208-0.516-32.065
-	c 9.412-8.852, 22.10-8.852, 31.516,0.00l 163.353,146.96L 347.864,370.936z" />
-<glyph unicode="&#xe0e9;" d="M 153.86,341.731L 153.84,106.204L 358.641,223.984 z" />
-<glyph unicode="&#xe0ea;" d="M 138.48,121.585L 374.001,121.564L 256.224,326.371 z" />
-<glyph unicode="&#xe0eb;" d="M 372.977,326.348L 137.456,326.371L 255.232,121.564 z" />
-<glyph unicode="&#xe0ec;" d="M 357.596,341.731L 357.617,106.204L 152.816,223.984 z" />
-<glyph unicode="&#xe0ed;" d="M 384.68,95.968L 384.659,178.585L 5.36,178.568L 5.36,269.528L 384.68,269.528L 384.659,351.968L 507.121,223.956
-	z" />
-<glyph unicode="&#xe0ee;" d="M 384.241,352.408L 301.62,352.384L 301.64-26.912L 210.684-26.912L 210.684,352.408L 128.24,352.384L 256.256,474.848 z" />
-<glyph unicode="&#xe0ef;" d="M 384.244,95.528L 301.624,95.544L 301.644,474.848L 210.684,474.848L 210.684,95.528L 128.245,95.544L 256.256-26.912 z" />
-<glyph unicode="&#xe0f0;" d="M 127.80,95.968L 127.82,178.585L 507.121,178.568L 507.121,269.528L 127.80,269.528L 127.82,351.968L 5.36,223.956
-	z" />
-<glyph unicode="&#xe0f1;" d="M 219.465,364.351c 10.696-10.436, 115.256-120.216, 115.256-120.216c 5.705-5.569, 8.561-12.865, 8.561-20.168
-	c0.00-7.307-2.856-14.607-8.561-20.172c0.00,0.00-104.56-109.78-115.256-120.216s-29.94-11.144-41.364,0.00
-	c-11.412,11.132-12.32,26.676, 0.008,40.336l 95.92,100.052L 178.108,324.012c-12.328,13.664-11.42,29.204-0.008,40.34
-	C 189.524,375.496, 208.768,374.784, 219.465,364.351z" />
-<glyph unicode="&#xe0f2;" d="M 396.62,187.188c-10.433,10.696-120.211,115.252-120.211,115.252c-5.569,5.708-12.868,8.572-20.168,8.572
-	c-7.312,0.00-14.612-2.864-20.172-8.572c0.00,0.00-109.78-104.557-120.221-115.252c-10.428-10.696-11.14-29.937,0.00-41.36
-	c 11.132-11.412, 26.68-12.32, 40.34,0.00l 100.052,95.92L 356.28,145.828c 13.668-12.32, 29.208-11.412, 40.34,0.00
-	C 407.768,157.253, 407.059,176.493, 396.62,187.188z" />
-<glyph unicode="&#xe0f3;" d="M 396.624,260.744c-10.436-10.692-120.216-115.248-120.216-115.248c-5.569-5.712-12.865-8.568-20.168-8.568
-	s-14.607,2.856-20.172,8.568c0.00,0.00-109.78,104.557-120.211,115.248c-10.436,10.704-11.147,29.944,0.00,41.36
-	c 11.128,11.417, 26.672,12.32, 40.331,0.00l 100.052-95.92l 100.044,95.92c 13.664,12.32, 29.204,11.417, 40.34,0.00
-	C 407.768,290.688, 407.059,271.448, 396.624,260.744z" />
-<glyph unicode="&#xe0f4;" d="M 292.505,364.351c-10.696-10.436-115.256-120.216-115.256-120.216c-5.705-5.569-8.561-12.865-8.561-20.168
-	c0.00-7.307, 2.856-14.607, 8.561-20.172c0.00,0.00, 104.56-109.78, 115.256-120.216c 10.692-10.436, 29.937-11.144, 41.364,0.00
-	c 11.407,11.132, 12.32,26.676-0.011,40.336L 237.936,223.968l 95.92,100.044c 12.332,13.664, 11.42,29.204, 0.011,40.34
-	C 322.44,375.496, 303.196,374.784, 292.505,364.351z" />
-<glyph unicode="&#xe0f5;" d="M 19.697,223.956c0.00-130.067, 105.448-235.508, 235.52-235.508c 130.08,0.00, 235.52,105.44, 235.52,235.508
-		c0.00,130.08-105.44,235.532-235.52,235.532C 125.144,459.488, 19.697,354.037, 19.697,223.956z M 439.537,223.956
-		c0.00-101.789-82.52-184.308-184.32-184.308s-184.32,82.52-184.32,184.308c0.00,101.812, 82.52,184.332, 184.32,184.332
-		S 439.537,325.768, 439.537,223.956z M 156.656,270.048l0.00-92.16 l 104.708,0.00 l0.00-57.60 l 97.532,103.68l-97.532,103.68l0.00-57.60 L 156.656,270.048 z" />
-<glyph unicode="&#xe0f6;" d="M 255.224-11.552c 130.072,0.00, 235.512,105.448, 235.512,235.52c0.00,130.08-105.44,235.52-235.512,235.52
-		c-130.08,0.00-235.528-105.44-235.528-235.52C 19.697,93.896, 125.144-11.552, 255.224-11.552z M 255.224,408.288
-		c 101.792,0.00, 184.312-82.52, 184.312-184.32s-82.52-184.32-184.312-184.32c-101.808,0.00-184.328,82.52-184.328,184.32
-		S 153.417,408.288, 255.224,408.288z M 209.136,125.408l 92.16,0.00 L 301.297,230.115 l 57.60,0.00 l-103.68,97.532l-103.68-97.532l 57.60,0.00 L 209.137,125.408 z" />
-<glyph unicode="&#xe0f7;" d="M 255.203,459.488c-130.067,0.00-235.508-105.453-235.508-235.52c0.00-130.08, 105.44-235.52, 235.508-235.52
-		c 130.08,0.00, 235.532,105.44, 235.532,235.52C 490.737,354.037, 385.284,459.488, 255.203,459.488z M 255.203,39.648
-		c-101.789,0.00-184.308,82.52-184.308,184.32s 82.52,184.32, 184.308,184.32c 101.812,0.00, 184.332-82.52, 184.332-184.32
-		S 357.017,39.648, 255.203,39.648z M 301.297,322.528l-92.16,0.00 l0.00-104.712 l-57.60,0.00 l 103.68-97.528l 103.68,97.528l-57.60,0.00 L 301.297,322.528 z" />
-<glyph unicode="&#xe0f8;" d="M 490.737,223.975c0.00,130.072-105.453,235.512-235.52,235.512c-130.08,0.00-235.52-105.44-235.52-235.512
-		c0.00-130.08, 105.44-235.528, 235.52-235.528C 385.284-11.552, 490.737,93.896, 490.737,223.975z M 70.896,223.975
-		c0.00,101.792, 82.52,184.312, 184.32,184.312s 184.32-82.52, 184.32-184.312c0.00-101.808-82.52-184.328-184.32-184.328
-		S 70.896,122.168, 70.896,223.975z M 353.777,177.888l0.00,92.16 L 249.063,270.048 l0.00,57.60 l-97.528-103.68l 97.528-103.68l0.00,57.60 L 353.777,177.888 z" />
-<glyph unicode="&#xe0f9;" d="M 247.976,392.928L 247.955,294.944L 68.336,294.967L 68.336,152.817L 247.976,152.817L 247.955,55.008L 442.097,223.984 	z" />
-<glyph unicode="&#xe0fa;" d="M 424.177,216.729L 326.196,216.704L 326.216,37.088L 184.064,37.088L 184.064,216.729L 86.256,216.704L 255.236,410.848 	z" />
-<glyph unicode="&#xe0fb;" d="M 424.177,231.208L 326.196,231.223L 326.216,410.848L 184.06,410.848L 184.06,231.208L 86.256,231.223L 255.232,37.088
-			z" />
-<glyph unicode="&#xe0fc;" d="M 262.456,55.008L 262.476,152.985L 442.097,152.968L 442.097,295.128L 262.456,295.128L 262.476,392.928L 68.336,223.956 	z" />
-<glyph unicode="&#xe0fd;" d="M 247.976,418.528L 247.955,320.544L 68.336,320.567L 68.336,127.207L 247.976,127.207L 247.955,29.408L 442.097,223.975 	z" />
-<glyph unicode="&#xe0fe;" d="M 449.777,216.729L 351.796,216.704L 351.816,37.088L 158.464,37.088L 158.464,216.729L 60.656,216.704L 255.236,410.848 	z" />
-<glyph unicode="&#xe0ff;" d="M 449.777,231.208L 351.796,231.223L 351.816,410.848L 158.46,410.848L 158.46,231.208L 60.656,231.223L 255.232,37.088
-			z" />
-<glyph unicode="&#xe100;" d="M 262.456,29.408L 262.476,127.385L 442.097,127.368L 442.097,320.728L 262.456,320.728L 262.476,418.528L 68.336,223.956 	z" />
-<glyph unicode="&#xe101;" d="M 474.404,442.128c-9.988,9.999-26.212,9.999-36.20,0.00L 38.081,42.009c-9.999-9.999-9.999-26.212,0.00-36.20
-		c 5.00-5.00, 11.548-7.504, 18.10-7.504c 6.547,0.00, 13.108,2.505, 18.10,7.504L 474.404,405.928
-		C 484.404,415.927, 484.404,432.136, 474.404,442.128z M 363.784,244.616c 35.564-48.22, 46.556-90.088, 39.912-96.739
-		c-6.648-6.601-48.48,4.371-96.728,39.932L 165.479,46.317C 272.644-0.736, 411.944,97.928, 436.992,122.976
-		c 23.676,23.621, 2.476,84.74-47.528,147.328L 363.784,244.616z M 222.109,276.717c-28.12,42.441-36.604,77.388-30.572,83.42
-		c 5.972,6.032, 40.949-2.46, 83.372-30.62l 26.204,26.212c-57.948,42.856-112.493,59.747-134.56,37.628
-		c-23.768-23.708-113.884-150.452-82.732-254.921L 222.109,276.717z" />
-<glyph unicode="&#xe102;" d="M 115.912,348.368C 87.192,319.719-38.40,140.64, 70.12,32.187c 108.44-108.533, 287.50,17.068, 316.232,45.80
-		c 28.72,28.652-8.561,112.501-83.252,187.201C 228.412,339.895, 144.64,377.168, 115.912,348.368z M 353.052,102.887
-		c-8.48-8.408-74.101,11.70-137.319,74.92C 152.58,241.049, 132.412,306.68, 140.88,315.148
-		c 8.40,8.468, 74.101-11.70, 137.241-74.932C 341.351,177.056, 361.52,111.368, 353.052,102.887z M 356.879,304.656
-		c 6.553,0.00, 13.10,2.505, 18.10,7.504l 48.779,48.776c 9.999,9.999, 9.999,26.212,0.00,36.20c-9.988,9.999-26.208,9.999-36.20,0.00
-		l-48.779-48.776c-9.999-9.992-9.999-26.20,0.00-36.20C 343.772,307.16, 350.332,304.656, 356.879,304.656z M 264.719,367.976
-		c 3.96-2.216, 8.252-3.269, 12.492-3.269c 8.96,0.00, 17.66,4.708, 22.36,13.092l 27.668,49.40c 6.912,12.336, 2.512,27.936-9.82,34.848
-		c-12.328,6.901-27.928,2.512-34.848-9.831l-27.672-49.40C 247.991,390.488, 252.391,374.888, 264.719,367.976z M 488.66,290.80
-		c-6.908,12.336-22.508,16.728-34.84,9.828l-49.40-27.68c-12.34-6.908-16.74-22.508-9.828-34.84
-		c 4.70-8.38, 13.40-13.10, 22.36-13.10c 4.24,0.00, 8.528,1.06, 12.488,3.273l 49.40,27.68
-		C 491.172,262.868, 495.572,278.468, 488.66,290.80z" />
-<glyph unicode="&#xe103;" d="M 485.785,135.456c0.00-22.532-18.436-40.96-40.96-40.96l-399.36,0.00 c-22.528,0.00-25.157,9.48-5.836,21.068l 411.033,231.779
-		c 19.32,11.592, 35.124,2.64, 35.124-19.888L 485.785,135.456 z" />
-<glyph unicode="&#xe104;" d="M 466.161,381.236L 414.164,433.888L 339.88,358.675l-40.816,41.34l-11.14-146.659l 144.836,11.275l-40.88,41.396
-		L 466.161,381.236z M 120.60,141.893L 46.32,66.696l 51.997-52.648l 74.284,75.208l 40.816-41.34l 11.14,146.656l-144.836-11.272
-		L 120.60,141.893z" />
-<glyph unicode="&#xe105;" d="M 319.74,417.763L 359.624,377.373L 287.152,304.004L 337.884,252.643L 410.353,326.012L 450.176,285.684L 461.044,428.768 		zM 174.604,195.292L 102.136,121.915L 62.312,162.252L 51.445,19.168L 192.749,30.172L 152.868,70.553L 225.335,143.928
-					z" />
-<glyph unicode="&#xe106;" d="M 313.921,235.283L 127.66,352.264c-13.761,9.028-25.019,2.384-25.019-14.756l0.00-227.084 c0.00-17.14, 11.26-23.78, 25.019-14.76
-		L 313.921,212.644c0.00,0.00, 6.708,4.72, 6.708,11.32S 313.921,235.283, 313.921,235.283z M 371.441,372.549c-22.732,0.00-38.40-6.988-38.40-29.711
-		l0.00-237.736 c0.00-22.728, 15.668-29.716, 38.40-29.716c 22.728,0.00, 38.40,6.988, 38.40,29.716L 409.841,342.836 C 409.841,365.56, 394.168,372.549, 371.441,372.549
-		z" />
-<glyph unicode="&#xe107;" d="M 191.847,223.964c0.00-6.601, 6.711-11.32, 6.711-11.32l 186.259-116.984c 13.761-9.016, 25.019-2.377, 25.019,14.76L 409.84,337.511
-		c0.00,17.14-11.26,23.78-25.019,14.748L 198.56,235.283C 198.56,235.283, 191.847,230.564, 191.847,223.964z M 102.64,342.832l0.00-237.732
-		c0.00-22.728, 15.668-29.72, 38.40-29.72c 22.728,0.00, 38.40,6.992, 38.40,29.72l0.00,237.732 c0.00,22.732-15.672,29.72-38.40,29.72
-		C 118.308,372.552, 102.64,365.564, 102.64,342.832z" />
-<glyph unicode="&#xe108;" d="M 30.961,223.968c0.00-7.152, 7.149-12.273, 7.149-12.273l 191.041-126.72c 14.66-9.78, 26.68-2.588, 26.68,15.992L 255.828,346.968
-		c0.00,18.568-12.021,25.768-26.68,15.989L 38.108,236.228C 38.108,236.228, 30.961,231.116, 30.961,223.968z M 263.30,223.968
-		c0.00-7.152, 7.149-12.273, 7.149-12.273l 184.40-126.72c 14.66-9.78, 26.672-2.588, 26.672,15.992L 481.521,346.968
-		c0.00,18.568-12.012,25.768-26.672,15.989L 270.449,236.228C 270.449,236.228, 263.30,231.116, 263.30,223.968z" />
-<glyph unicode="&#xe109;" d="M 474.36,236.236L 283.329,362.968c-14.66,9.768-26.68,2.575-26.68-15.992l0.00-246.008
-		c0.00-18.572, 12.021-25.772, 26.68-15.992l 191.031,126.728c0.00,0.00, 7.16,5.112, 7.16,12.263
-		C 481.521,231.116, 474.36,236.236, 474.36,236.236z M 242.029,236.236L 57.629,362.968c-14.66,9.768-26.668,2.575-26.668-15.992
-		l0.00-246.008 c0.00-18.572, 12.007-25.772, 26.668-15.992l 184.40,126.728c0.00,0.00, 7.152,5.112, 7.152,12.263
-		C 249.18,231.116, 242.029,236.236, 242.029,236.236z" />
-<glyph unicode="&#xe10a;" d="M 371.441,377.568l-230.40,0.00 c-25.457,0.00-38.40-7.833-38.40-33.28l0.00-240.64 c0.00-25.452, 12.943-33.28, 38.40-33.28l 230.40,0.00 c 25.448,0.00, 38.40,7.827, 38.40,33.28l0.00,240.64
-		C 409.841,369.736, 396.888,377.568, 371.441,377.568z" />
-<glyph unicode="&#xe10b;" d="M 256.24,403.168c-98.968,0.00-179.20-80.237-179.20-179.20c0.00-98.973, 80.232-179.20, 179.20-179.20c 98.963,0.00, 179.20,80.227, 179.20,179.20
-		C 435.441,322.932, 355.204,403.168, 256.24,403.168z" />
-<glyph unicode="&#xe10c;" d="M 345.841,403.168c-25.457,0.00-46.08-7.833-46.08-33.28l0.00-291.84 c0.00-25.452, 20.623-33.28, 46.08-33.28c 25.448,0.00, 46.08,7.827, 46.08,33.28l0.00,291.84
-			C 391.921,395.336, 371.288,403.168, 345.841,403.168zM 166.64,403.168c-25.457,0.00-46.08-7.833-46.08-33.28l0.00-291.84 c0.00-25.452, 20.623-33.28, 46.08-33.28c 25.448,0.00, 46.08,7.827, 46.08,33.28l0.00,291.84
-			C 212.72,395.336, 192.088,403.168, 166.64,403.168z" />
-<glyph unicode="&#xe10d;" d="M 376.448,237.10L 157.28,372.883c-15.972,10.481-29.041,2.768-29.041-17.132l0.00-263.58 c0.00-19.888, 13.067-27.60, 29.041-17.128
-		L 376.448,210.82c0.00,0.00, 7.792,5.479, 7.792,13.144C 384.241,231.62, 376.448,237.10, 376.448,237.10z" />
-<glyph unicode="&#xe10e;" d="M 389.688,297.18c-7.059,0.00-13.967-0.612-20.70-1.74c-16.80,54.904-68.828,94.928-130.448,94.928
-		c-75.212,0.00-136.173-59.60-136.173-133.128c0.00-6.56, 0.512-13.008, 1.452-19.324c-3.612,0.416-7.26,0.695-10.98,0.695
-		c-51.14,0.00-92.60-40.532-92.60-90.515c0.00-50.00, 41.461-90.528, 92.60-90.528l 127.56,0.00 l0.00,97.28 l-53.76,0.00 l 89.60,117.76l 89.60-117.76l-53.76,0.00 l0.00-97.28
-		l 97.608,0.00 c 67.693,0.00, 122.552,53.64, 122.552,119.808C 512.241,243.54, 457.38,297.18, 389.688,297.18z" />
-<glyph unicode="&#xe10f;" d="M 389.688,297.176c-7.059,0.00-13.967-0.608-20.70-1.74c-16.80,54.912-68.828,94.932-130.448,94.932
-		c-75.212,0.00-136.173-59.60-136.173-133.132c0.00-6.56, 0.512-13.008, 1.452-19.32c-3.612,0.413-7.26,0.692-10.98,0.692
-		c-51.14,0.00-92.60-40.532-92.60-90.52c0.00-49.993, 41.461-90.52, 92.60-90.52l 296.847,0.00
-		c 67.693,0.00, 122.552,53.64, 122.552,119.808C 512.241,243.536, 457.38,297.176, 389.688,297.176z" />
-<glyph unicode="&#xe110;" d="M 478.544,200.908L 397.952,392.708c-6.384,12.789-23.284,23.26-37.559,23.26L 307.441,415.968 l 10.24-104.053l 69.12,0.00 l-130.56-108.269
-		l-130.56,108.269l 69.12,0.00 l 10.24,104.053l-52.956,0.00 c-14.276,0.00-31.176-10.471-37.559-23.26L 33.936,200.908c-6.389-12.80-9.688-34.82-7.344-48.932
-		l 17.416-94.347c 2.352-14.112, 15.944-25.659, 30.22-25.659l 364.02,0.00 c 14.276,0.00, 27.872,11.548, 30.22,25.659l 17.416,94.347
-		C 488.228,166.088, 484.929,188.108, 478.544,200.908z M 443.66,131.068l-6.631-36.919c-1.985-14.172-15.284-25.76-29.556-25.76
-		L 105.004,68.388 c-14.268,0.00-27.572,11.588-29.556,25.76l-6.628,36.919c-1.979,14.168, 8.075,25.76, 22.348,25.76l 330.14,0.00
-		C 435.584,156.828, 445.64,145.236, 443.66,131.068z" />
-<glyph unicode="&#xe111;" d="M 394.484,315.612l-76.80,0.00 L 317.684,441.568 l-122.88,0.00 L 194.804,315.612 l-76.80,0.00 l 138.24-130.044L 394.484,315.612z M 495.335,146.084L 413.832,200.928l-50.256,0.00
-		L 450.625,134.144L 359.884,134.144 c-2.60,0.00-4.96-1.316-6.133-3.397l-20.92-57.22L 179.632,73.527 l-20.92,57.22
-		c-1.16,2.08-3.529,3.397-6.128,3.397L 61.844,134.144 l 87.059,66.784l-50.272,0.00 L 17.144,146.084c-12.128-7.241-19.38-23.936-16.128-37.096
-		l 14.368-78.691c 3.259-13.159, 17.679-23.928, 32.04-23.928l 417.632,0.00 c 14.361,0.00, 28.776,10.767, 32.04,23.928l 14.361,78.691
-		C 514.724,122.148, 507.464,138.844, 495.335,146.084z" />
-<glyph unicode="&#xe112;" d="M 256.244,441.568l-138.24-130.04l 76.80,0.00 l0.00-125.96 l 122.88,0.00 L 317.684,311.527 l 76.80,0.00 L 256.244,441.568z M 495.335,146.088L 413.832,200.928l-50.256,0.00
-		l 87.048-66.78L 359.884,134.148 c-2.60,0.00-4.96-1.32-6.133-3.401l-20.92-57.22L 179.632,73.528 l-20.92,57.22
-		c-1.16,2.08-3.529,3.401-6.128,3.401L 61.844,134.148 l 87.059,66.78l-50.272,0.00 L 17.144,146.088C 5.017,138.844-2.235,122.148, 1.016,108.987
-		l 14.368-78.691c 3.259-13.159, 17.679-23.928, 32.04-23.928l 417.632,0.00 c 14.361,0.00, 28.776,10.767, 32.04,23.928l 14.361,78.691
-		C 514.724,122.148, 507.464,138.844, 495.335,146.088z" />
-<glyph unicode="&#xe113;" d="M 256.244,433.888c-109.56,0.00-177.628-36.10-173.94-65.379l 36.912-303.796c 1.481-11.82, 56.856-50.604, 137.028-50.664
-		c 80.16,0.06, 135.54,38.844, 137.02,50.664l 36.912,303.796C 433.864,397.788, 365.805,433.888, 256.244,433.888z M 256.244,324.048
-		c-80.172,0.06-137.028,28.62-137.028,39.288c-0.04,10.609, 56.868,39.212, 137.028,39.168
-		c 80.147,0.044, 137.069-28.559, 137.02-39.168C 393.264,352.669, 336.403,324.108, 256.244,324.048z" />
-<glyph unicode="&#xe114;" d="M 434.619,351.968c0.00,25.60-25.48,25.60-25.48,25.60L 103.34,377.568 c0.00,0.00-25.48,0.00-25.48-25.60l0.00-25.60 l 356.761,0.00 L 434.62,351.968 z M 358.176,428.768L 154.305,428.768
-		c0.00,0.00-25.48,0.00-25.48-25.60l 254.832,0.00 C 383.656,428.768, 358.176,428.768, 358.176,428.768z M 485.584,326.368
-		c-15.079,15.152-15.079,15.152-15.079,15.152l0.00-40.752 L 41.976,300.768 l0.00,40.752 c0.00,0.00,0.00,0.00-15.079-15.152S 1.009,307.148, 7.08,275.148
-		c 6.041-31.876, 35.284-206.72, 39.632-230.384c 4.772-25.936, 31.148-25.596, 31.148-25.596l 356.761,0.00 c0.00,0.00, 26.372-0.34, 31.144,25.596
-		c 4.348,23.665, 33.584,198.509, 39.636,230.384C 511.469,307.148, 500.664,311.216, 485.584,326.368z M 358.163,188.128
-		c0.00,0.00,0.00-25.60-25.48-25.60L 179.792,162.528 c-25.48,0.00-25.48,25.60-25.48,25.60l0.00,51.20 l 35.676,0.00 l0.00-40.96 l 132.432,0.00 l0.00,40.96 l 35.744,0.00 L 358.163,188.128 z" />
-<glyph unicode="&#xe115;" d="M 488.429,300.768L 24.049,300.768 c-23.567,0.00-24.744-11.476-23.464-25.496l 21.128-230.608c 1.28-14.02, 4.60-25.496, 28.136-25.496
-		L 462.628,19.168 c 24.001,0.00, 26.856,11.476, 28.136,25.496l 21.132,230.608C 513.177,289.292, 512.00,300.768, 488.429,300.768z M 471.388,357.088
-		c-2.84,11.264-16.768,20.48-30.961,20.48L 265.984,377.568 c-14.197,0.00-34.019,8.129-44.076,18.063l-15.243,15.072
-		c-10.049,9.936-29.88,18.063-44.072,18.063L 79.243,428.768 c-14.188,0.00-27.08-11.448-28.644-25.444L 43.125,336.608l 433.423,0.00
-		L 471.388,357.088z" />
-<glyph unicode="&#xe116;" d="M 384.241,454.368l-256.00,0.00 c-28.16,0.00-51.20-23.04-51.20-51.20l0.00-358.40 c0.00-28.16, 23.04-51.20, 51.20-51.20l 256.00,0.00 c 28.16,0.00, 51.20,23.04, 51.20,51.20l0.00,358.40
-		C 435.441,431.328, 412.401,454.368, 384.241,454.368z M 327.82,210.64c-6.084-9.472-9.312-5.424-7.479,0.00
-		c 4.828,14.28, 4.627,57.512-35.644,63.856l0.00-133.449 c0.00-24.876-14.321-40.50-44.784-50.272
-		c-29.60-9.492-62.728,0.368-70.469,21.632c-7.74,21.26, 9.665,47.112, 38.876,57.752
-		c 16.296,5.92, 32.823,5.848, 45.60,0.936L 253.92,359.328 l 30.776,0.00 C 284.697,327.008, 371.248,278.199, 327.82,210.64z" />
-<glyph unicode="&#xe117;" d="M 507.121,351.968l0.00,30.72 c0.00,11.312-9.176,20.48-20.48,20.48l-460.80,0.00 c-11.312,0.00-20.48-9.168-20.48-20.48l0.00-30.72 l 51.20,0.00 l0.00-51.20 l-51.20,0.00 l0.00-51.20 l 51.20,0.00 l0.00-51.20 l-51.20,0.00 l0.00-51.20 l 51.20,0.00
-		l0.00-51.20 l-51.20,0.00 l0.00-30.72 c0.00-11.312, 9.168-20.48, 20.48-20.48l 460.80,0.00 c 11.304,0.00, 20.48,9.168, 20.48,20.48l0.00,30.72 l-51.20,0.00 l0.00,51.20 l 51.20,0.00 l0.00,51.20 l-51.20,0.00 l0.00,51.20 l 51.20,0.00 l0.00,51.20 l-51.20,0.00 l0.00,51.20 L 507.121,351.968
-		z M 199.92,147.168l0.00,153.60 l 128.00-76.80L 199.92,147.168z" />
-<glyph unicode="&#xe118;" d="M 438.631,309.175L 386.268,453.439c-3.868,10.649-15.212,16.288-25.32,12.60L 12.856,339.007
-		C 2.74,335.32-2.332,323.687, 1.536,313.04l 55.212-152.112L 56.748,242.468 c0.00,36.78, 29.412,66.707, 65.555,66.707l 91.976,0.00 L 323.98,386.176
-		l 63.48-77.00L 438.631,309.176 z M 492.737,263.00l-370.432,0.00 c-10.763,0.00-19.496-9.196-19.496-20.532l0.00-241.177
-		c0.00-11.332, 8.732-20.524, 19.496-20.524l 370.432,0.00 c 10.772,0.00, 19.504,9.191, 19.504,20.524L 512.241,242.468
-		C 512.241,253.805, 503.508,263.00, 492.737,263.00z M 464.468,32.084L 157.404,32.084 L 157.404,76.068 l 47.24,109.956l 70.864-87.972
-		l 66.48,68.148l 85.475,30.844l 37.003-82.484L 464.468,32.084 z" />
-<glyph unicode="&#xe119;" d="M 0.24,351.968l0.00-256.00 c0.00-28.16, 23.04-51.20, 51.20-51.20l 409.60,0.00 c 28.16,0.00, 51.20,23.04, 51.20,51.20l0.00,256.00 c0.00,28.16-23.04,51.20-51.20,51.20l-409.60,0.00
-		C 23.281,403.168, 0.24,380.128, 0.24,351.968z M 461.041,351.968l0.00-256.00 l-409.60,0.00 l0.00,256.00 L 461.041,351.968 z" />
-<glyph unicode="&#xe11a;" d="M 409.841,351.968l-76.80,0.00 l0.00,76.80 c0.00,14.08-11.52,25.60-25.60,25.60l-204.80,0.00 c-14.08,0.00-25.60-11.52-25.60-25.60l0.00-307.20 c0.00-14.08, 11.52-25.60, 25.60-25.60l 76.80,0.00 l0.00-76.80
-		c0.00-14.08, 11.52-25.60, 25.60-25.60l 204.80,0.00 c 14.08,0.00, 25.60,11.52, 25.60,25.60l0.00,307.20 C 435.441,340.448, 423.921,351.968, 409.841,351.968z M 128.24,147.168l0.00,256.00 l 153.60,0.00
-		l0.00-51.20 L 204.525,351.968 c-14.08,0.00-25.084-11.008-25.084-25.088l0.00-179.712 L 128.24,147.168 z M 384.241,44.768l-153.60,0.00 l0.00,256.00 l 153.60,0.00 L 384.241,44.768 z" />
-<glyph unicode="&#xe11b;" d="M 384.241,454.368l-256.00,0.00 c-28.16,0.00-51.20-23.04-51.20-51.20l0.00-358.40 c0.00-28.16, 23.04-51.20, 51.20-51.20l 256.00,0.00 c 28.16,0.00, 51.20,23.04, 51.20,51.20l0.00,358.40
-		C 435.441,431.328, 412.401,454.368, 384.241,454.368z M 384.241,44.768l-256.00,0.00 l0.00,358.40 l 256.00,0.00 L 384.241,44.768 z" />
-<glyph unicode="&#xe11c;" d="M 185.14,201.709l 143.36,0.00 l0.00,46.08 l-143.36,0.00 L 185.14,201.709 z M 384.241,454.368l-256.00,0.00 c-28.16,0.00-51.20-23.04-51.20-51.20l0.00-358.40 c0.00-28.16, 23.04-51.20, 51.20-51.20l 256.00,0.00
-		c 28.16,0.00, 51.20,23.04, 51.20,51.20l0.00,358.40 C 435.441,431.328, 412.401,454.368, 384.241,454.368z M 384.241,44.768l-256.00,0.00 l0.00,358.40 l 256.00,0.00 L 384.241,44.768 z
-		 M 327.921,347.629l-143.36,0.00 l0.00-44.80 l 143.36,0.00 L 327.921,347.629 z M 327.921,146.669l-143.36,0.00 l0.00-44.80 l 143.36,0.00 L 327.921,146.669 z" />
-<glyph unicode="&#xe11d;" d="M 189.68,377.568l-46.08,0.00 c-28.16,0.00-40.96-12.80-40.96-40.96l0.00-46.08 c0.00-28.16, 12.80-40.96, 40.96-40.96l 46.08,0.00 c 28.16,0.00, 40.96,12.80, 40.96,40.96l0.00,46.08
-		C 230.64,364.768, 217.84,377.568, 189.68,377.568z M 368.881,377.568l-46.08,0.00 c-28.16,0.00-40.96-12.80-40.96-40.96l0.00-46.08 c0.00-28.16, 12.80-40.96, 40.96-40.96l 46.08,0.00
-		c 28.16,0.00, 40.96,12.80, 40.96,40.96l0.00,46.08 C 409.841,364.768, 397.041,377.568, 368.881,377.568z M 189.68,198.368l-46.08,0.00 c-28.16,0.00-40.96-12.80-40.96-40.96l0.00-46.08
-		c0.00-28.16, 12.80-40.96, 40.96-40.96l 46.08,0.00 c 28.16,0.00, 40.96,12.80, 40.96,40.96l0.00,46.08 C 230.64,185.568, 217.84,198.368, 189.68,198.368z M 368.881,198.368l-46.08,0.00
-		c-28.16,0.00-40.96-12.80-40.96-40.96l0.00-46.08 c0.00-28.16, 12.80-40.96, 40.96-40.96l 46.08,0.00 c 28.16,0.00, 40.96,12.80, 40.96,40.96l0.00,46.08 C 409.841,185.568, 397.041,198.368, 368.881,198.368z" />
-<glyph unicode="&#xe11e;" d="M 179.452,249.568l-153.60,0.00 c-14.145,0.00-25.60-11.46-25.60-25.60s 11.457-25.60, 25.60-25.60l 153.60,0.00 c 14.136,0.00, 25.60,11.46, 25.60,25.60
-		S 193.588,249.568, 179.452,249.568z M 179.452,147.168l-153.60,0.00 c-14.145,0.00-25.60-11.46-25.60-25.60s 11.457-25.60, 25.60-25.60l 153.60,0.00 c 14.136,0.00, 25.60,11.46, 25.60,25.60
-		S 193.588,147.168, 179.452,147.168z M 496.892,249.568l-87.04,0.00 l0.00,87.04 c0.00,14.14-11.464,15.36-25.60,15.36c-14.145,0.00-25.60-1.221-25.60-15.36l0.00-87.04 l-84.48,0.00
-		c-14.145,0.00-15.36-11.46-15.36-25.60s 1.217-25.60, 15.36-25.60l 84.48,0.00 l0.00-87.04 c0.00-14.14, 11.457-15.36, 25.60-15.36c 14.136,0.00, 25.60,1.221, 25.60,15.36l0.00,87.04 l 87.04,0.00
-		c 14.136,0.00, 15.36,11.46, 15.36,25.60S 511.028,249.568, 496.892,249.568z M 179.452,351.968l-153.60,0.00 c-14.145,0.00-25.60-11.46-25.60-25.60s 11.457-25.60, 25.60-25.60l 153.60,0.00
-		c 14.136,0.00, 25.60,11.46, 25.60,25.60S 193.588,351.968, 179.452,351.968z" />
-<glyph unicode="&#xe11f;" d="M 409.348,249.568l-307.20,0.00 c-14.14,0.00-25.60-11.46-25.60-25.60s 11.46-25.60, 25.60-25.60l 307.20,0.00 c 14.14,0.00, 25.60,11.46, 25.60,25.60
-		S 423.489,249.568, 409.348,249.568z M 102.148,300.768l 307.20,0.00 c 14.14,0.00, 25.60,11.46, 25.60,25.60s-11.46,25.60-25.60,25.60l-307.20,0.00
-		c-14.14,0.00-25.60-11.46-25.60-25.60S 88.008,300.768, 102.148,300.768z M 409.348,147.168l-307.20,0.00 c-14.14,0.00-25.60-11.46-25.60-25.60s 11.46-25.60, 25.60-25.60
-		l 307.20,0.00 c 14.14,0.00, 25.60,11.46, 25.60,25.60S 423.489,147.168, 409.348,147.168z" />
-<glyph unicode="&#xe120;" d="M 132.889,142.048l0.00,133.12 l 61.44,0.00 l-97.28,102.40l-97.28-102.40l 61.44,0.00 l0.00-153.60 c0.00-28.28, 22.92-51.20, 51.20-51.20l 199.68,0.00 l-65.56,71.68L 132.889,142.048 z
-		 M 450.329,172.768l0.00,153.60 c0.00,28.28-22.92,51.20-51.20,51.20l-199.68,0.00 l 65.56-71.68l 113.64,0.00 l0.00-133.12 l-61.44,0.00 l 97.28-102.40l 97.28,102.40L 450.329,172.768 z" />
-<glyph unicode="&#xe121;" d="M 116.256,147.168l 207.36,0.00 l0.00-76.80 l 122.88,112.64l-122.88,112.64l0.00-76.80 l-186.88,0.00 l0.00,158.72 l-71.68,0.00 l0.00-179.20 C 65.056,170.087, 87.976,147.168, 116.256,147.168z" />
-<glyph unicode="&#xe122;" d="M 422.176,321.248l-276.48,0.00 l0.00,56.32 l-107.52-92.16l 107.52-92.16l0.00,56.32 l 256.00,0.00 l0.00-107.52 l-332.80,0.00 l0.00-71.68 l 353.28,0.00 c 28.28,0.00, 51.20,22.92, 51.20,51.20l0.00,148.48
-			C 473.376,298.328, 450.457,321.248, 422.176,321.248z" />
-<glyph unicode="&#xe123;" d="M 386.588,308.883l 18.096,0.00 l0.00-51.524 l 107.52,92.16l-107.52,92.16l0.00-61.116 l-18.096,0.00 c-94.56,0.00-147.88-70.075-194.919-131.90
-	c-42.308-55.60-78.84-103.621-137.881-103.621L 0.204,145.043 l0.00-71.68 l 53.584,0.00 c 94.573,0.00, 147.88,70.072, 194.932,131.90
-	C 291.02,260.864, 327.56,308.883, 386.588,308.883z M 138.727,263.724c 4.027,5.216, 8.092,10.552, 12.196,15.944
-	c 9.999,13.144, 20.58,27.032, 32.032,40.852c-33.812,31.596-74.624,54.923-129.168,54.923L 0.204,375.444 l0.00-71.68 l 53.584,0.00
-	C 87.764,303.763, 114.275,287.812, 138.727,263.724z M 404.684,139.923l-18.096,0.00 c-36.023,0.00-63.664,17.935-89.36,44.515
-	c-2.575-3.364-5.16-6.756-7.76-10.177c-11.289-14.84-23.432-30.76-36.832-46.516
-	c 34.736-33.90, 76.808-59.504, 133.953-59.504l 18.096,0.00 l0.00-61.44 l 107.52,92.16l-107.52,92.16L 404.684,139.923 z" />
-<glyph unicode="&#xe124;" d="M 287.601,433.888c-113.811,0.00-206.332-91.165-209.12-204.676L 15.572,229.212 l 94.168-104.956L 203.90,229.212L 130.80,229.212
-			c 2.761,84.52, 71.884,152.196, 156.80,152.196c 86.68,0.00, 156.94-70.492, 156.94-157.44c0.00-86.952-70.261-157.44-156.94-157.44
-			c-34.761,0.00-66.86,11.36-92.859,30.544l-35.992-38.504c 35.532-27.884, 80.252-44.52, 128.852-44.52
-			c 115.568,0.00, 209.251,93.981, 209.251,209.92S 403.168,433.888, 287.601,433.888z" />
-<glyph unicode="&#xe125;" d="M 224.836,433.888c 113.808,0.00, 206.332-91.165, 209.12-204.676l 62.908,0.00 l-94.164-104.96l-94.164,104.96l 73.104,0.00
-			c-2.764,84.52-71.884,152.196-156.804,152.196c-86.675,0.00-156.94-70.484-156.94-157.44s 70.264-157.44, 156.94-157.44
-			c 34.761,0.00, 66.86,11.356, 92.865,30.544l 35.984-38.508c-35.524-27.88-80.248-44.515-128.848-44.515
-			c-115.573,0.00-209.251,93.981-209.251,209.92C 15.584,339.90, 109.264,433.888, 224.836,433.888z" />
-<glyph unicode="&#xe126;" d="M 499.724,32.456L 271.696,432.644c-3.145,5.512-9.052,8.924-15.463,8.924c-6.404,0.00-12.313-3.412-15.456-8.924
-		L 12.764,32.456c-3.096-5.42-3.044-12.047, 0.14-17.42c 3.181-5.368, 9.008-8.668, 15.312-8.668l 456.049,0.00
-		c 6.288,0.00, 12.124,3.30, 15.312,8.668C 502.752,20.408, 502.803,27.036, 499.724,32.456z M 287.28,57.568L 225.192,57.568 l0.00,51.20 l 62.088,0.00
-		L 287.28,57.568 z M 287.28,147.175L 225.192,147.175 l0.00,153.60 l 62.088,0.00 L 287.28,147.175 z" />
-<glyph unicode="&#xe127;" d="M 253.096,459.468C 123.032,457.728, 19.016,350.867, 20.74,220.796c 1.744-130.008, 108.588-234.06, 238.652-232.328
-		c 130.04,1.74, 234.08,108.603, 232.349,238.668C 490.003,357.156, 383.14,461.196, 253.096,459.468z M 252.40,80.608l-0.008,0.00
-		l-1.296,0.019c-20.027,0.592-34.147,15.349-33.576,35.08c 0.56,19.393, 15.02,33.473, 34.384,33.473l 1.164-0.015
-		c 20.588-0.612, 34.552-15.217, 33.972-35.516C 286.468,94.196, 272.228,80.608, 252.40,80.608z M 336.648,247.82
-		c-4.708-6.688-15.068-15.001-28.124-25.168l-14.372-9.921c-7.888-6.136-12.644-11.904-14.439-17.58
-		c-1.408-4.469-2.096-5.651-2.212-14.745l-0.029-2.312L 222.60,178.095 l 0.16,4.644c 0.664,19.087, 1.14,30.316, 9.044,39.596
-		c 12.416,14.572, 39.788,32.20, 40.949,32.948c 3.928,2.952, 7.236,6.32, 9.696,9.908c 5.756,7.94, 8.312,14.197, 8.312,20.337
-		c0.00,8.524-2.536,16.408-7.533,23.428c-4.809,6.776-13.944,10.208-27.148,10.208c-13.10,0.00-22.075-4.156-27.448-12.687
-		c-5.512-8.769-8.309-17.979-8.309-27.388l0.00-2.34 L 163.744,276.748 l 0.104,2.44c 1.46,34.656, 13.824,59.608, 36.752,74.177
-		c 14.408,9.264, 32.325,13.963, 53.232,13.963c 27.377,0.00, 50.48-6.652, 68.677-19.771c 18.432-13.287, 27.776-33.20, 27.776-59.165
-		C 350.284,273.868, 345.70,260.22, 336.648,247.82z" />
-<glyph unicode="&#xe128;" d="M 360.935,422.78c-29.192,21.057-65.851,31.588-109.971,31.588c-33.58,0.00-61.90-7.42-84.933-22.22
-		c-36.512-23.20-55.932-62.581-58.272-118.133l 84.632,0.00 c0.00,16.172, 4.728,31.759, 14.168,46.78
-		c 9.444,15.012, 25.468,22.513, 48.068,22.513c 22.981,0.00, 38.813-6.096, 47.468-18.272c 8.668-12.188, 13.004-25.688, 13.004-40.50
-		c0.00-12.865-6.46-24.66-14.24-35.38c-4.279-6.244-9.924-11.988-16.932-17.248c0.00,0.00-45.904-29.44-66.048-53.088
-		c-11.696-13.724-12.74-34.264-13.776-63.736c-0.072-2.096, 0.728-6.428, 8.072-6.428s 59.296,0.00, 65.828,0.00
-		s 7.896,4.872, 7.98,6.977c 0.46,10.741, 1.672,16.216, 3.62,22.412c 3.704,11.704, 13.764,21.928, 25.056,30.705l 23.30,16.08
-		c 21.028,16.38, 37.804,29.828, 45.208,40.36c 12.661,17.339, 21.552,38.688, 21.552,64.029
-		C 404.721,370.536, 390.119,401.727, 360.935,422.78z M 249.604,97.928c-29.172,0.868-53.24-19.313-54.155-50.952
-		c-0.907-31.628, 21.98-52.52, 51.152-53.38c 30.46-0.904, 53.872,18.619, 54.788,50.252
-		C 302.30,75.488, 280.064,97.028, 249.604,97.928z" />
-<glyph unicode="&#xe129;" d="M 253.096,459.468C 123.032,457.728, 19.016,350.867, 20.74,220.796c 1.744-130.008, 108.588-234.06, 238.652-232.328
-		c 130.04,1.748, 234.08,108.609, 232.349,238.668C 490.003,357.156, 383.14,461.204, 253.096,459.468z M 279.20,380.98
-		c 23.944,0.00, 31.016-13.892, 31.016-29.772c0.00-19.852-15.892-38.199-42.992-38.199c-22.68,0.00-33.473,11.412-32.841,30.26
-		C 234.384,359.152, 247.688,380.98, 279.20,380.98z M 217.82,76.768c-16.359,0.00-28.347,9.924-16.896,53.588l 18.764,77.44
-		c 3.265,12.412, 3.816,17.372,0.00,17.372c-4.904,0.00-26.144-8.572-38.688-17.012l-8.176,13.40
-		C 212.624,254.793, 258.392,274.288, 278.016,274.288c 16.352,0.00, 19.08-19.352, 10.905-49.12l-21.496-81.412
-		c-3.816-14.388-2.176-19.348, 1.632-19.348c 4.912,0.00, 20.992,5.968, 36.801,18.38l 9.264-12.412
-		C 276.417,91.676, 234.167,76.768, 217.82,76.768z" />
-<glyph unicode="&#xe12a;" d="M 318.508,479.968c 34.28,0.00, 51.42-23.388, 51.42-50.121c0.00-33.397-29.768-64.28-68.56-64.28
-		c-32.48,0.00-51.427,19.208-50.528,50.928C 250.84,443.228, 273.389,479.968, 318.508,479.968z M 212.94-32.032
-		c-27.073,0.00-46.921,16.699-27.973,90.188l 31.08,130.34c 5.412,20.876, 6.30,29.22,0.00,29.22c-8.129,0.00-43.268-14.42-64.048-28.62
-		l-13.52,22.552c 65.861,55.94, 141.628,88.748, 174.099,88.748c 27.06,0.00, 31.58-32.568, 18.048-82.68l-35.58-137.008
-		c-6.32-24.212-3.599-32.56, 2.699-32.56c 8.119,0.00, 34.753,10.049, 60.912,30.928l 15.34-20.879
-		C 309.94-6.944, 240.008-32.032, 212.94-32.032z" />
-<glyph unicode="&#xe12b;" d="M 256.227,459.488c-130.067,0.00-235.508-105.453-235.508-235.52c0.00-130.08, 105.44-235.52, 235.508-235.52
-		c 130.08,0.00, 235.532,105.44, 235.532,235.52C 491.761,354.037, 386.308,459.488, 256.227,459.488z M 382.98,350.651l-0.06,0.055
-		C 382.94,350.688, 382.961,350.672, 382.98,350.651z M 77.04,223.968c0.00,98.968, 80.227,179.20, 179.188,179.20
-		c 43.032,0.00, 82.512-15.18, 113.412-40.459L 117.50,110.567C 92.219,141.455, 77.04,180.936, 77.04,223.968z M 129.50,97.284
-		l 0.048-0.055C 129.528,97.248, 129.52,97.261, 129.50,97.284z M 256.227,44.768c-43.028,0.00-82.501,15.18-113.389,40.452
-		l 252.141,252.148c 25.281-30.892, 40.459-70.371, 40.459-113.40C 435.441,124.997, 355.208,44.768, 256.227,44.768z" />
-<glyph unicode="&#xe12c;" d="M 389.361,249.568l-107.52,0.00 l0.00,107.52 c0.00,14.14-11.46,15.36-25.60,15.36s-25.60-1.221-25.60-15.36l0.00-107.52 l-107.52,0.00 c-14.14,0.00-15.36-11.46-15.36-25.60s 1.221-25.60, 15.36-25.60
-		l 107.52,0.00 l0.00-107.52 c0.00-14.14, 11.46-15.36, 25.60-15.36s 25.60,1.221, 25.60,15.36l0.00,107.52 l 107.52,0.00 c 14.14,0.00, 15.36,11.46, 15.36,25.60S 403.50,249.568, 389.361,249.568z" />
-<glyph unicode="&#xe12d;" d="M 389.361,249.568l-266.24,0.00 c-14.14,0.00-15.36-11.46-15.36-25.60s 1.221-25.60, 15.36-25.60l 266.24,0.00 c 14.14,0.00, 15.36,11.46, 15.36,25.60
-		S 403.50,249.568, 389.361,249.568z" />
-<glyph unicode="&#xe12e;" d="M 256.24,439.008c-118.773,0.00-215.04-96.292-215.04-215.04c0.00-118.773, 96.267-215.04, 215.04-215.04c 118.748,0.00, 215.04,96.267, 215.04,215.04
-		C 471.281,342.716, 374.988,439.008, 256.24,439.008z M 300.488,223.968l 78.352-78.347l-44.252-44.244L 256.248,179.716L 177.901,101.372
-		l-44.24,44.244L 212.00,223.964L 133.661,302.292l 44.24,44.264l 78.34-78.34l 78.34,78.332l 44.248-44.24L 300.488,223.968z" />
-<glyph unicode="&#xe12f;" d="M 256.24,439.008c-118.768,0.00-215.04-96.292-215.04-215.04c0.00-118.773, 96.272-215.04, 215.04-215.04c 118.752,0.00, 215.04,96.267, 215.04,215.04
-		C 471.281,342.716, 374.992,439.008, 256.24,439.008z M 282.408,197.796L 282.408,94.684 L 230.071,94.684 L 230.071,197.796 L 126.96,197.796 L 126.96,250.128 l 103.112,0.00 l-0.004,103.105
-		l 52.341,0.011l0.00-103.112 l 103.099,0.004l 0.011-52.341L 282.408,197.795 z" />
-<glyph unicode="&#xe130;" d="M 256.24,439.008c-118.768,0.00-215.04-96.292-215.04-215.04c0.00-118.773, 96.272-215.04, 215.04-215.04c 118.76,0.00, 215.04,96.267, 215.04,215.04
-		C 471.281,342.716, 375.00,439.008, 256.24,439.008z M 385.508,250.137l 0.011-52.341l-258.56,0.00 L 126.96,250.128 L 385.508,250.137z" />
-<glyph unicode="&#xe131;" d="M 367.564,143.291l-70.597,80.676l 70.597,80.68c 11.996,11.996, 11.996,31.448,0.00,43.444
-		c-12.004,11.996-31.456,11.996-43.452-0.004L 256.24,270.512l-67.876,77.576c-11.996,12.00-31.444,12.00-43.452,0.004
-		c-11.992-11.996-11.992-31.448,0.00-43.444l 70.597-80.68l-70.597-80.676c-11.992-12.00-11.992-31.448-0.004-43.444
-		c 12.00-12.00, 31.452-12.00, 43.457,0.00l 67.876,77.572l 67.872-77.572c 12.007-12.00, 31.456-12.00, 43.457,0.00
-		C 379.56,111.844, 379.56,131.292, 367.564,143.291z" />
-<glyph unicode="&#xe132;" d="M 212.08,44.772c-11.136,0.00-21.68,5.208-28.448,14.152L 92.144,179.731c-11.904,15.719-8.80,38.089, 6.908,49.996
-			c 15.74,11.904, 38.10,8.788, 50.00-6.912l 60.171-79.452l 151.336,242.984c 10.424,16.716, 32.424,21.832, 49.172,11.432
-			c 16.732-10.416, 21.84-32.432, 11.42-49.16L 242.384,61.593c-6.212-9.98-16.932-16.252-28.672-16.783
-			C 213.16,44.781, 212.624,44.772, 212.08,44.772z" />
-<glyph unicode="&#xe133;" d="M 404.721,275.168l-46.08,0.00 l0.00,61.44 c0.00,74.168-34.16,117.76-102.40,117.76s-102.40-43.593-102.40-117.76l0.00-10.24 l 51.20,0.00 l0.00,20.48 c0.00,36.988, 20.408,56.32, 51.20,56.32
-		c 30.789,0.00, 51.20-19.332, 51.20-56.32l0.00-71.68 l-204.80,0.00 c-14.14,0.00-25.60-16.581-25.60-30.72l0.00-199.68 c0.00-14.08, 10.964-29.136, 24.364-33.46l 30.628-9.881
-		c 13.40-4.327, 35.888-7.86, 49.968-7.86l 148.48,0.00 c 14.08,0.00, 36.564,3.532, 49.964,7.86l 30.628,9.881
-		c 13.40,4.324, 24.368,19.38, 24.368,33.46l0.00,199.68 C 435.441,258.589, 418.86,275.168, 404.721,275.168z" />
-<glyph unicode="&#xe134;" d="M 404.721,287.968l-46.08,0.00 l0.00,35.84 c0.00,74.168-34.168,117.76-102.40,117.76c-68.235,0.00-102.40-43.593-102.40-117.76l0.00-35.84 l-51.20,0.00 c-14.14,0.00-25.60-16.581-25.60-30.72
-		l0.00-199.68 c0.00-14.08, 10.964-29.14, 24.364-33.46l 30.628-9.881c 13.40-4.327, 35.888-7.86, 49.968-7.86l 148.48,0.00
-		c 14.08,0.00, 36.564,3.532, 49.964,7.86l 30.628,9.881c 13.40,4.32, 24.368,19.38, 24.368,33.46l0.00,199.68
-		C 435.441,271.389, 418.86,287.968, 404.721,287.968z M 205.04,334.048c0.00,36.988, 20.408,56.32, 51.20,56.32c 30.789,0.00, 51.20-19.332, 51.20-56.32l0.00-46.08
-		l-102.40,0.00 L 205.041,334.048 z" />
-<glyph unicode="&#xe135;" d="M 61.68,418.528L 61.68,357.888 c 181.408,0.00, 328.473-147.072, 328.473-328.48l 60.648,0.00
-		C 450.801,244.312, 276.58,418.528, 61.68,418.528z M 61.68,297.245l0.00-60.64 c 114.424,0.00, 207.188-92.768, 207.188-207.196L 329.508,29.408
-		C 329.508,177.328, 209.601,297.245, 61.68,297.245z M 119.784,145.636c-32.084,0.00-58.104-26.024-58.104-58.112
-		c0.00-32.104, 26.02-58.116, 58.104-58.116c 32.104,0.00, 58.123,26.012, 58.123,58.116
-		C 177.908,119.611, 151.888,145.636, 119.784,145.636z" />
-<glyph unicode="&#xe136;" d="M 399.601,362.781c0.00,54.784,0.00,60.136,0.00,60.136c0.00,20.196-64.183,57.052-143.36,57.052c-79.18,0.00-143.36-36.856-143.36-57.052
-		c0.00,0.00,0.00-5.351,0.00-60.136c0.00-54.776, 99.244-100.027, 99.244-138.812c0.00-38.788-99.244-84.037-99.244-138.817s0.00-60.136,0.00-60.136
-		c0.00-20.196, 64.18-57.048, 143.36-57.048c 79.176,0.00, 143.36,36.853, 143.36,57.048c0.00,0.00,0.00,5.357,0.00,60.136S 300.353,185.18, 300.353,223.968
-		C 300.353,262.752, 399.601,308.004, 399.601,362.781z M 152.324,420.356c 17.812,11.236, 51.204,27.704, 105.315,27.704
-		s 102.56-27.704, 102.56-27.704c 3.62-2.204, 17.868-9.82, 8.119-15.591c-21.472-12.716-63.452-26.104-112.08-26.104
-		c-48.632,0.00-89.208,14.76-110.68,27.476C 135.808,411.912, 152.324,420.356, 152.324,420.356z M 269.071,223.968
-		c0.00-30.54, 25.504-50.212, 52.509-76.456c 19.727-19.176, 46.74-45.429, 46.74-62.36l0.00-34.00
-		c-24.812,12.364-99.112,24.468-99.112,64.096c0.00,20.064-25.94,20.064-25.94,0.00c0.00-39.628-74.299-51.732-99.108-64.096l0.00,34.00
-		c0.00,16.932, 27.008,43.184, 46.74,62.36c 27.00,26.244, 52.504,45.916, 52.504,76.456S 217.90,274.176, 190.90,300.42
-		c-19.732,19.176-46.74,45.432-46.74,62.36l-1.211,25.592c 26.272-14.14, 67.909-27.633, 113.291-27.633
-		s 87.216,13.492, 113.48,27.633l-1.40-25.592c0.00-16.928-27.012-43.184-46.74-62.36C 294.576,274.176, 269.071,254.508, 269.071,223.968
-		z" />
-<glyph unicode="&#xe137;" d="M 174.388-6.396c-4.96,3.228, 80.736,183.296, 77.78,191.20c-2.952,7.888-93.808,36.776-98.248,50.672
-		C 149.479,249.376, 333.308,458.34, 338.14,454.308c 4.82-4.027-80.109-185.30-77.78-191.188
-		c 2.319-5.892, 95.44-35.984, 98.248-50.677C 361.42,197.741, 179.347-9.628, 174.388-6.396z" />
-<glyph unicode="&#xe138;" d="M 435.441,403.168l-23.04,0.00 l0.00-51.20 l-81.92,0.00 l0.00,51.20 l-148.48,0.00 l0.00-51.20 l-81.92,0.00 l0.00,51.20 l-23.04,0.00 c-28.16,0.00-51.20-23.04-51.20-51.20l0.00-307.20 c0.00-28.16, 23.04-51.20, 51.20-51.20l 358.40,0.00
-		c 28.16,0.00, 51.20,23.04, 51.20,51.20l0.00,307.20 C 486.641,380.128, 463.601,403.168, 435.441,403.168z M 435.441,44.768l-358.40,0.00 l0.00,204.80 l 358.40,0.00 L 435.441,44.768 z
-		 M 158.96,454.368l-35.84,0.00 l0.00-87.04 l 35.84,0.00 L 158.96,454.368 z M 389.361,454.368l-35.84,0.00 l0.00-87.04 l 35.84,0.00 L 389.361,454.368 z" />
-<glyph unicode="&#xe139;" d="M 409.841,294.547l-15.36,0.00 c-5.632,0.00-10.24-4.612-10.24-10.24l0.00-70.58 c0.00-34.231-26.96-92.16-128.00-92.16c-101.048,0.00-128.00,57.929-128.00,92.16L 128.241,284.307
-			c0.00,5.628-4.616,10.24-10.24,10.24l-15.36,0.00 c-5.632,0.00-10.24-4.612-10.24-10.24l0.00-70.58 c0.00-57.26, 42.057-118.539, 138.24-126.98l0.00-67.58 l-66.56,0.00
-			c-5.632,0.00-10.24-4.60-10.24-10.24l0.00-30.72 c0.00-5.632, 4.608-10.24, 10.24-10.24l 184.32,0.00 c 5.624,0.00, 10.24,4.608, 10.24,10.24l0.00,30.72 c0.00,5.64-4.616,10.24-10.24,10.24l-66.56,0.00 L 281.841,86.748
-			c 96.18,8.44, 138.24,69.72, 138.24,126.98L 420.081,284.307 C 420.081,289.936, 415.463,294.547, 409.841,294.547zM 256.24,172.768c 60.068,0.00, 76.80,24.668, 76.80,40.96L 333.041,294.547 l-153.60,0.00 l0.00-80.82 C 179.44,197.435, 196.151,172.768, 256.24,172.768zM 333.041,439.008c0.00,16.30-16.732,40.96-76.80,40.96c-60.087,0.00-76.80-24.66-76.80-40.96l0.00-108.62 l 153.60,0.00 L 333.041,439.008 z" />
-<glyph unicode="&#xe13a;" d="M 256.227,459.488c-130.059,0.00-235.508-105.456-235.508-235.52c0.00-130.077, 105.448-235.52, 235.508-235.52
-			c 130.08,0.00, 235.532,105.443, 235.532,235.52C 491.761,354.032, 386.308,459.488, 256.227,459.488z M 256.227,39.648
-			c-101.779,0.00-184.308,82.524-184.308,184.32c0.00,101.80, 82.528,184.32, 184.308,184.32c 101.812,0.00, 184.332-82.52, 184.332-184.32
-			C 440.561,122.171, 358.041,39.648, 256.227,39.648zM 274.161,357.088L 238.307,357.088L 238.307,216.54L 325.489,129.376L 350.829,154.716L 274.161,231.392 		z" />
-<glyph unicode="&#xe13b;" d="M 256.24,367.328c-167.944,0.00-256.00-123.74-256.00-143.36s 88.056-143.36, 256.00-143.36s 256.00,123.74, 256.00,143.36S 424.184,367.328, 256.24,367.328z
-		 M 256.24,113.689c-62.84,0.00-113.781,49.368-113.781,110.28c0.00,60.908, 50.94,110.28, 113.781,110.28
-		s 113.781-49.372, 113.781-110.28C 370.02,163.057, 319.079,113.689, 256.24,113.689z M 256.24,223.968
-		c-10.42,11.44, 16.984,55.139,0.00,55.139c-31.416,0.00-56.892-24.692-56.892-55.139c0.00-30.452, 25.476-55.139, 56.892-55.139
-		s 56.887,24.689, 56.887,55.139C 313.128,237.956, 265.10,214.247, 256.24,223.968z" />
-<glyph unicode="&#xe13c;" d="M 305.48,459.488c-97.552,0.00-177.832-75.352-185.64-170.861C 61.889,266.02, 20.721,209.632, 20.721,143.816
-		c0.00-85.676, 69.741-155.367, 155.468-155.367c 65.976,0.00, 122.485,41.292, 145.012,99.38
-		C 416.588,95.836, 491.761,175.964, 491.761,273.324C 491.761,375.976, 408.20,459.488, 305.48,459.488z M 176.188,40.236
-		c-57.143,0.00-103.64,46.46-103.64,103.581c0.00,37.936, 20.532,71.172, 51.061,89.212
-		c 15.631-70.492, 71.361-126.091, 141.96-141.552C 247.544,60.848, 214.24,40.236, 176.188,40.236z M 177.828,247.356
-		c 55.76-0.868, 100.96-45.963, 101.953-101.661C 228.627,155.963, 188.22,196.272, 177.828,247.356z M 331.633,145.777
-		c-1.053,84.228-69.504,152.521-153.824,153.38c 12.032,59.452, 64.70,104.331, 127.672,104.331
-		c 71.819,0.00, 130.26-58.379, 130.26-130.165C 435.74,210.488, 390.977,157.908, 331.633,145.777z M 73.968,349.027
-		c 29.28,0.00, 53.10,23.80, 53.10,53.065c0.00,29.256-23.82,53.06-53.10,53.06S 20.868,431.349, 20.868,402.092
-		C 20.868,372.828, 44.688,349.027, 73.968,349.027z M 73.968,431.368c 16.16,0.00, 29.292-13.136, 29.292-29.276s-13.132-29.276-29.292-29.276
-		c-16.148,0.00-29.284,13.136-29.284,29.276S 57.82,431.368, 73.968,431.368z" />
-<glyph unicode="&#xe13d;" d="M 253.096,459.461C 123.027,457.732, 19.009,350.884, 20.74,220.819c 1.744-130.08, 108.588-234.087, 238.644-232.349
-		c 130.064,1.733, 234.083,108.58, 232.356,238.64C 489.992,357.192, 383.14,461.204, 253.096,459.461z M 253.50,428.752
-		c 35.08,0.468, 68.208-7.925, 97.28-23.08l-31.70-52.835c-18.98,9.276-40.30,14.492-62.84,14.492
-		c-22.543,0.00-43.872-5.22-62.848-14.492l-31.685,52.801C 189.216,419.976, 220.368,428.312, 253.50,428.752z M 127.368,161.124
-		l-52.791-31.672c-14.336,27.496-22.676,58.648-23.116,91.78c-0.472,35.076, 7.925,68.205, 23.08,97.276l 52.828-31.704
-		c-9.268-18.972-14.489-40.291-14.489-62.837C 112.88,201.42, 118.10,180.10, 127.368,161.124z M 258.98,19.188
-		c-35.08-0.472-68.213,7.925-97.28,23.084l 31.70,52.824c 18.976-9.268, 40.296-14.489, 62.84-14.489
-		c 22.54,0.00, 43.86,5.212, 62.832,14.484l 31.681-52.796C 323.259,27.963, 292.10,19.632, 258.98,19.188z M 256.24,111.328
-		c-62.212,0.00-112.64,50.428-112.64,112.64c0.00,62.208, 50.428,112.64, 112.64,112.64c 62.208,0.00, 112.64-50.432, 112.64-112.64
-		C 368.881,161.756, 318.449,111.328, 256.24,111.328z M 385.108,161.124c 9.272,18.976, 14.492,40.296, 14.492,62.844
-		c0.00,22.543-5.22,43.864-14.492,62.837l 52.801,31.685c 14.336-27.50, 22.671-58.653, 23.112-91.776
-		c 0.468-35.083-7.925-68.216-23.084-97.284L 385.108,161.124z" />
-<glyph unicode="&#xe13e;" d="M 137.187-16.672l 51.20,0.00 l 114.885,204.80l 132.169,0.00 c0.00,0.00, 76.80,0.00, 76.80,35.84s-76.80,35.84-76.80,35.84L 303.272,259.808 l-114.885,204.80l-51.20,0.00 l 63.684-204.80L 109.048,259.808
-		l-57.608,51.20l-51.20,0.00 l 40.96-87.04l-40.96-87.04l 51.20,0.00 l 57.608,51.20l 91.824,0.00 L 137.187-16.672z" />
-<glyph unicode="&#xe13f;" d="M 464.16,386.092c-7.571,6.539-48.80,37.744-56.492,44.396c-7.696,6.648-19.74,8.52-28.216,8.52L 133.04,439.008
-		c-8.473,0.00-20.52-1.872-28.212-8.52c-7.696-6.652-48.92-37.856-56.496-44.396c-7.577-6.544-13.884-16.416-11.864-30.496
-		c 2.028-14.08, 49.572-332.101, 49.572-332.101c 2.677-8.009, 11.796-14.567, 20.272-14.567l 299.872,0.00 c 8.473,0.00, 17.592,6.56, 20.268,14.567
-		c0.00,0.00, 47.543,318.021, 49.572,332.101C 478.048,369.675, 471.736,379.549, 464.16,386.092z M 256.248,163.332
-		c-83.141,0.00-100.952,117.684-104.632,141.936l 47.012,0.00 c 7.088-35.372, 23.183-95.856, 57.62-95.856
-		c 34.432,0.00, 50.528,60.484, 57.62,95.856l 47.008,0.00 C 357.196,281.015, 339.387,163.332, 256.248,163.332z M 76.104,351.968l 56.464,58.88
-		l 247.351,0.00 l 56.472-58.88L 76.104,351.968 z" />
-<glyph unicode="&#xe140;" d="M 299.724,465.116l-41.068,0.00 l0.00-334.628 c-22.708,8.732-52.092,8.864-81.076-1.68
-		c-51.924-18.896-82.868-64.867-69.112-102.656c 13.761-37.80, 67.013-53.112, 118.936-34.224
-		c 44.105,16.052, 72.956,51.624, 72.251,85.131l 0.069,273.664c 71.611-11.289, 76.508-101.808, 67.932-127.192
-		c-3.255-9.62, 2.48-16.82, 13.297,0.00C 458.164,343.644, 299.724,396.632, 299.724,465.116z" />
-<glyph unicode="&#xe141;" d="M 135.42,373.376C 37.577,316.599, 43.191,224.12, 46.56,189.912C 172.94,339.616, 361.984,332.356, 361.984,332.356
-		S 94.008,240.436, 15.304,56.112c-6.217-14.556, 29.169-33.476, 37.24-16.276c 24.10,51.265, 57.68,89.704, 57.68,89.704
-		c 49.544-18.436, 135.256-40.044, 196.008,2.703c 80.688,56.788, 72.444,182.668, 187.632,243.96
-		C 520.769,390.517, 268.076,450.356, 135.42,373.376z" />
-<glyph unicode="&#xe142;" d="M 443.407,362.588C 363.963,415.428, 274.724,433.693, 168.92,403.36C 86.328,379.68, 10.639,285.759, 4.78,205.293
-		C-2.14,110.212, 71.925,28.76, 202.376,28.896c 140.643,0.144, 193.296,67.68, 194.457,88.20
-		c 1.152,20.52-54.864,58.485-18.824,97.48c 45.176,48.885, 85.395,7.236, 109.772,13.092
-		C 512.16,233.532, 524.50,308.624, 443.407,362.588z M 280.232,124.06c-21.272,0.00-38.512,17.192-38.512,38.40s 17.24,38.40, 38.512,38.40
-		s 38.508-17.192, 38.508-38.40S 301.505,124.06, 280.232,124.06z" />
-<glyph unicode="&#xe143;" d="M 312.792,166.90C 240.183,94.28, 130.172,81.956, 44.784,129.792c 9.841-17.564, 22.164-34.113, 37.104-49.053
-		c 87.56-87.56, 229.512-87.56, 317.064,0.00c 87.556,87.556, 87.56,229.512,0.00,317.064c-14.94,14.944-31.484,27.268-49.048,37.109
-		C 397.744,349.52, 385.412,239.513, 312.792,166.90z" />
-<glyph unicode="&#xe144;" d="M 256.24,275.168c-42.42,0.00-76.80-34.396-76.80-76.80c0.00-42.42, 34.38-76.80, 76.80-76.80c 42.408,0.00, 76.80,34.38, 76.80,76.80
-		C 333.041,240.772, 298.649,275.168, 256.24,275.168z M 461.041,351.968l-61.44,0.00 c-8.452,0.00-17.551,6.556-20.22,14.567l-15.88,47.66
-		c-2.68,8.016-11.772,14.572-20.22,14.572l-174.08,0.00 c-8.452,0.00-17.551-6.556-20.22-14.572l-15.88-47.66
-		c-2.68-8.012-11.772-14.567-20.22-14.567l-61.44,0.00 c-28.16,0.00-51.20-23.04-51.20-51.20l0.00-230.40 c0.00-28.16, 23.04-51.20, 51.20-51.20l 409.60,0.00 c 28.16,0.00, 51.20,23.04, 51.20,51.20l0.00,230.40
-		C 512.241,328.928, 489.201,351.968, 461.041,351.968z M 256.24,70.368c-70.692,0.00-128.00,57.308-128.00,128.00c0.00,70.688, 57.308,128.00, 128.00,128.00
-		c 70.68,0.00, 128.00-57.312, 128.00-128.00C 384.241,127.675, 326.92,70.368, 256.24,70.368z M 443.121,264.964c-9.896,0.00-17.92,8.016-17.92,17.92
-		c0.00,9.892, 8.024,17.92, 17.92,17.92c 9.90,0.00, 17.92-8.028, 17.92-17.92C 461.041,272.98, 453.02,264.964, 443.121,264.964z" />
-<glyph unicode="&#xe145;" d="M 493.068,469.58c-2.784,8.075-11.509,12.328-19.471,9.52c-7.972-2.812-12.185-11.637-9.409-19.704
-		c 23.544-68.352-23.188-119.388-58.804-146.728l-14.424,20.849c-4.828,6.972-15.656,12.775-24.06,12.90l-80.776-0.368
-		c-8.40,0.132-20.916-3.76-27.804-8.644L 20.328,168.74c-11.528-8.167-14.336-24.248-6.264-35.924l 108.171-156.356
-		c 8.072-11.668, 21.044-10.272, 32.571-2.103l 237.996,168.66c 6.884,4.883, 14.768,15.456, 17.54,23.496l 25.296,80.544
-		c 2.757,8.039, 1.076,20.324-3.756,27.296l-8.792,12.704C 470.968,324.056, 520.645,389.523, 493.068,469.58z M 382.34,230.068
-		c-18.447-13.064-43.875-8.52-56.784,10.14c-12.92,18.68-8.44,44.40, 10.016,57.48
-		c 14.64,10.376, 33.656,9.62, 47.344-0.453c-6.893-4.199-11.616-6.616-12.519-7.048c-7.632-3.649-10.891-12.865-7.304-20.584
-		c 2.612-5.604, 8.112-8.888, 13.852-8.888c 2.18,0.00, 4.40,0.48, 6.503,1.481c 4.908,2.34, 10.188,5.168, 15.692,8.459
-		C 401.624,255.476, 395.64,239.492, 382.34,230.068z" />
-<glyph unicode="&#xe146;" d="M 286.456,112.508c0.00,37.149, 28.148,57.684, 74.083,88.112c 56.172,37.224, 126.099,83.544, 126.099,193.488
-		c0.00,9.896-8.116,17.92-18.128,17.92l-87.808,0.00 c-12.42,22.927-49.392,47.459-124.464,47.459c-75.077,0.00-112.048-24.532-124.468-47.459
-		L 43.959,412.028 c-10.009,0.00-18.12-8.024-18.12-17.92c0.00-109.944, 69.92-156.263, 126.099-193.488
-		c 45.932-30.428, 74.083-50.964, 74.083-88.112l0.00-33.552 C 177.788,73.596, 142.336,55.739, 142.336,34.528c0.00-25.452, 50.992-46.08, 113.904-46.08
-		c 62.908,0.00, 113.904,20.628, 113.904,46.08c0.00,21.212-35.448,39.069-83.688,44.427L 286.457,112.508 z M 357.536,241.891
-		c 14.529,30.728, 26.012,72.376, 27.872,134.297l 64.22,0.00 C 443.524,307.084, 401.985,272.176, 357.536,241.891z M 256.24,428.10
-		c 69.944,0.048, 97.264-28.559, 97.228-39.164c0.00-10.668-27.276-39.228-97.228-39.288
-		c-69.953,0.06-97.232,28.62-97.232,39.288C 158.976,399.54, 186.295,428.149, 256.24,428.10z M 62.848,376.188l 64.22,0.00
-		c 1.861-61.92, 13.344-103.568, 27.876-134.297C 110.496,272.176, 68.952,307.084, 62.848,376.188z" />
-<glyph unicode="&#xe147;" d="M 437.88,406.128C 394.993,449.012, 341.145,464.70, 323.993,447.544L 254.96,378.52
-		c-10.468-10.471-19.599-45.516-15.408-80.992L 30.632,88.608c-12.391-12.391-2.352-42.52, 22.432-67.296
-		c 24.776-24.784, 54.908-34.824, 67.296-22.44l 208.921,208.925c 35.48-4.188, 70.52,4.948, 80.992,15.412l 69.032,69.032
-		C 496.453,309.392, 480.772,363.24, 437.88,406.128z M 208.132,197.336c-9.54,9.54-6.428,28.084, 6.901,41.424
-		c 13.34,13.332, 31.887,16.44, 41.42,6.901c 9.52-9.524, 6.428-28.084-6.901-41.412
-		C 236.212,190.911, 217.652,187.816, 208.132,197.336z M 380.943,349.184c-33.232,33.225-41.571,77.064-38.624,80.024
-		c 2.959,2.959, 45.072-7.108, 78.312-40.336c 33.22-33.228, 43.191-75.44, 40.328-78.304
-		C 458.104,307.708, 414.16,315.952, 380.943,349.184z" />
-<glyph unicode="&#xe148;" d="M 429.912,223.968c0.00,26.817, 16.508,47.98, 41.368,62.532c-4.476,14.968-10.412,29.304-17.712,42.80
-		c-27.872-7.292-50.432,3.632-69.40,22.593c-18.964,18.968-24.769,41.532-17.473,69.408
-		c-13.496,7.30-27.832,13.232-42.807,17.708c-14.548-24.864-40.828-41.368-67.649-41.368
-		c-26.817,0.00-53.096,16.504-67.653,41.368c-14.968-4.469-29.304-10.408-42.80-17.708c 7.292-27.872, 1.492-50.436-17.477-69.408
-		c-18.964-18.964-41.532-29.883-69.405-22.593c-7.30-13.496-13.236-27.832-17.708-42.80
-		c 24.86-14.552, 41.364-35.716, 41.364-62.532c0.00-26.811-16.504-53.104-41.364-67.653c 4.472-14.972, 10.408-29.304, 17.708-42.80
-		c 27.876,7.292, 50.44,1.492, 69.405-17.48c 18.959-18.959, 24.769-41.532, 17.477-69.40
-		c 13.496-7.30, 27.832-13.24, 42.804-17.708c 14.556,24.856, 40.832,41.368, 67.649,41.364c 26.821,0.00, 53.10-16.508, 67.649-41.364
-		c 14.976,4.472, 29.312,10.408, 42.812,17.712c-7.292,27.864-1.496,50.436, 17.467,69.395c 18.968,18.972, 41.532,29.893, 69.40,22.60
-		c 7.30,13.496, 13.236,27.828, 17.712,42.80C 446.42,175.985, 429.912,197.156, 429.912,223.968z M 256.24,130.447
-		c-51.649,0.00-93.516,41.867-93.516,93.52s 41.867,93.52, 93.516,93.52s 93.512-41.867, 93.512-93.52
-		S 307.888,130.447, 256.24,130.447z" />
-<glyph unicode="&#xe149;" d="M 472.975,354.531c-292.064-116.916-173.764,197.748-400.288,32.104l-47.36-17.009l 93.828-368.892l 51.68,0.00 l-45.956,180.681
-		C 326.977,350.832, 245.156-3.185, 484.224,344.167C 489.772,352.227, 482.348,358.28, 472.975,354.531z" />
-<glyph unicode="&#xe14a;" d="M 201.443,103.284l-20.724-20.58c-17.968-17.807-47.184-17.82-65.141,0.00c-8.632,8.565-13.377,19.94-13.377,32.036
-		c0.00,12.092, 4.744,23.476, 13.372,32.04l 76.288,75.688c 15.809,15.681, 45.557,38.764, 67.232,17.268
-		c 9.948-9.881, 26.012-9.816, 35.888,0.128c 9.881,9.944, 9.82,26.016-0.128,35.884c-36.853,36.568-91.312,29.809-138.744-17.252
-		L 79.82,182.799c-18.308-18.172-28.38-42.339-28.38-68.06s 10.072-49.884, 28.384-68.056
-		c 18.836-18.692, 43.568-28.028, 68.316-28.028S 197.632,27.992, 216.48,46.695l 20.74,20.584c 9.944,9.867, 9.999,25.94, 0.12,35.884
-		C 227.472,113.104, 211.393,113.16, 201.443,103.284z M 432.644,397.308c-39.581,39.272-94.917,41.404-131.555,5.052l-25.832-25.648
-		c-9.952-9.871-10.012-25.936-0.132-35.884s 25.948-10.004, 35.895-0.128L 336.844,366.336c 18.98,18.844, 43.828,11.028, 60.04-5.052
-		c 8.641-8.565, 13.388-19.948, 13.388-32.044c0.00-12.092-4.747-23.476-13.377-32.04L 315.501,216.456
-		C 278.284,179.528, 260.824,196.864, 253.377,204.256c-9.952,9.871-26.012,9.808-35.892-0.132
-		c-9.881-9.944-9.82-26.012, 0.132-35.884c 17.083-16.961, 36.588-25.368, 57.028-25.368c 25.029,0.00, 51.467,12.612, 76.613,37.569
-		l 81.392,80.739c 18.304,18.176, 28.392,42.344, 28.392,68.064C 461.041,354.96, 450.952,379.128, 432.644,397.308z" />
-<glyph unicode="&#xe14b;" d="M 375.308,262.547C 316.928,388.168, 286.588,435.869, 191.196,433.90c-33.968-0.699-25.808,24.60-51.708,15.001
-		c-25.888-9.608-3.676-23.656-30.152-45.38C 35.028,342.532, 41.872,286.105, 76.336,151.624
-		c 14.529-56.636-34.999-59.421-15.40-114.333c 14.30-40.04, 119.772-56.788, 231.052-15.503
-		c 111.276,41.289, 181.52,123.248, 167.212,163.276C 439.596,239.971, 399.904,209.66, 375.308,262.547z M 279.908,55.621
-		c-99.38-36.875-181.068-15.18-184.516-5.544c-5.943,16.628, 32.084,72.093, 145.704,114.252
-		c 113.624,42.16, 177.032,26.524, 183.661,7.955C 428.672,161.316, 379.296,92.492, 279.908,55.621z M 247.968,145.083
-		c-51.96-19.28-88.072-41.336-111.432-61.192c 16.44-14.936, 47.261-18.584, 77.976-7.187
-		c 39.105,14.504, 63.112,47.804, 53.616,74.379c-0.113,0.321-0.281,0.604-0.40,0.92
-		C 261.313,149.888, 254.736,147.596, 247.968,145.083z" />
-<glyph unicode="&#xe14c;" d="M 38.64,313.568l 435.20,0.00 c 14.607,0.00, 12.208,15.564, 4.94,18.10c-7.271,2.541-88.14,33.10-102.22,33.10l-23.04,0.00 l0.00,76.80 l-194.56,0.00 l0.00-76.80
-		l-23.04,0.00 c-14.08,0.00-94.952-30.56-102.22-33.10C 26.427,329.132, 24.028,313.568, 38.64,313.568z M 478.961,285.408l-445.44,0.00
-		c-14.08,0.00-28.16-16.64-28.16-30.72l0.00-89.60 c0.00-14.08, 14.08-30.72, 28.16-30.72l 50.748,0.00 l-22.587-128.00l 389.12,0.00 l-22.593,128.00l 50.753,0.00 c 14.08,0.00, 28.16,16.64, 28.16,30.72l0.00,89.60
-		C 507.121,268.768, 493.041,285.408, 478.961,285.408z M 112.88,57.568l 35.84,166.40l 215.04,0.00 l 35.84-166.40L 112.88,57.568 z" />
-<glyph unicode="&#xe14d;" d="M 132.228,392.928c-41.224,0.00-74.643-34.384-74.643-76.80s 33.419-76.80, 74.643-76.80c 74.64,0.00, 24.88-148.48-74.643-148.48l0.00-35.84
-		C 235.201,55.008, 304.808,392.928, 132.228,392.928z M 347.268,392.928c-41.224,0.00-74.643-34.384-74.643-76.80s 33.419-76.80, 74.643-76.80
-		c 74.64,0.00, 24.88-148.48-74.643-148.48l0.00-35.84 C 450.241,55.008, 519.848,392.928, 347.268,392.928z" />
-<glyph unicode="&#xe14e;" d="M 409.841,403.168l-307.20,0.00 c-28.16,0.00-51.20-23.04-51.20-51.20l0.00-179.20 c0.00-28.16, 23.04-51.20, 51.20-51.20l 102.40,0.00 l 102.40-76.80l0.00,76.80 l 102.40,0.00 c 28.16,0.00, 51.20,23.04, 51.20,51.20l0.00,179.20
-		C 461.041,380.128, 438.001,403.168, 409.841,403.168z" />
-<glyph unicode="&#xe14f;" d="M 148.72,167.648l0.00,158.72 l-97.28,0.00 c-28.16,0.00-51.20-23.04-51.20-51.20l0.00-153.60 c0.00-28.16, 23.04-51.20, 51.20-51.20l 25.60,0.00 l0.00-76.80 l 76.80,76.80l 128.00,0.00 c 28.16,0.00, 51.20,23.04, 51.20,51.20l0.00,46.60
-		c-1.652-0.344-3.376-0.52-5.12-0.52L 148.72,167.648 z M 461.041,454.368l-230.40,0.00 c-28.16,0.00-51.20-23.04-51.20-51.20l0.00-204.80 l 179.20,0.00 l 76.80-76.80l0.00,76.80 l 25.60,0.00
-		c 28.16,0.00, 51.20,23.04, 51.20,51.20l0.00,153.60 C 512.241,431.328, 489.201,454.368, 461.041,454.368z" />
-<glyph unicode="&#xe150;" d="M 25.841,238.947l0.00-156.804 c0.00-15.129, 7.344-24.576, 22.82-24.576c0.00,0.00, 51.804,0.00, 79.58,0.00l0.00,204.80 L 47.964,262.368
-		C 31.432,262.368, 25.841,249.804, 25.841,238.947z M 427.232,293.088c-29.368,0.00-94.192-2.56-94.192-2.56l 5.12,79.941
-		c0.00,48.961-9.336,71.099-35.888,71.099c-32.932,0.00-19.643-40.024-30.292-74.70c-10.652-34.677-68.152-104.50-109.74-104.50
-		l-8.40,0.00 l0.00-204.80 c 58.748,0.00, 59.64-51.20, 112.744-51.20c 33.916,0.00, 108.088,0.00, 108.088,0.00c 53.40,0.00, 111.968,47.28, 111.968,88.228L 486.641,217.996
-		C 486.641,264.608, 467.964,293.088, 427.232,293.088z" />
-<glyph unicode="&#xe151;" d="M 256.24,449.248L 317.368,277.152L 481.521,277.152L 347.589,176.092L 395.468-1.312L 256.24,105.056L 117.021-1.312L 164.889,176.092L 30.961,277.152L 195.108,277.152 	z" />
-<glyph unicode="&#xe152;" d="M 480.497,277.156L 316.336,277.156 L 255.216,449.252L 194.084,277.156L 29.937,277.156 l 133.928-101.061l-47.88-177.408l 139.232,106.368l 139.22-106.368
-	l-47.872,177.408L 480.497,277.156z M 255.216,155.276L 178.084,91.236l 31.813,91.212L 136.924,241.316l 90.141-2.56l 28.152,103.416
-	L 283.356,238.756l 90.141,2.56l-72.96-58.869l 31.809-91.212L 255.216,155.276z" />
-<glyph unicode="&#xe153;" d="M 440.292,373.196c-42.80,39.28-112.184,39.28-154.989,0.00l-29.064-26.672l-29.068,26.672
-		c-42.796,39.28-112.18,39.28-154.979,0.00c-48.152-44.189-48.152-115.832,0.00-160.019l 184.048-168.92l 184.052,168.92
-		C 488.44,257.364, 488.44,329.008, 440.292,373.196z" />
-<glyph unicode="&#xe154;" d="M 437.128,373.20c-42.295,39.28-110.88,39.28-153.187,0.00l-28.72-26.676l-28.731,26.676
-	c-42.295,39.28-110.88,39.28-153.176,0.00c-47.592-44.192-47.592-115.836,0.00-160.025l 181.907-168.92l 181.907,168.92
-	C 484.721,257.364, 484.721,329.008, 437.128,373.20z M 410.184,239.433l-154.964-146.268L 100.26,239.433
-	c-15.636,14.52-21.684,33.609-21.684,53.752c 0.004,20.144, 3.488,36.676, 19.124,51.192c 13.804,12.815, 32.344,19.884, 52.20,19.884
-	s 38.396-12.188, 52.204-25.012l 53.12-46.752l 53.10,46.752c 13.816,12.825, 32.356,25.012, 52.216,25.012
-	c 19.855,0.00, 38.396-7.068, 52.204-19.884c 15.631-14.516, 19.116-31.048, 19.12-51.192C 431.864,273.04, 425.816,253.952, 410.184,239.433z
-	" />
-<glyph unicode="&#xe155;" d="M 384.241,147.168c-17.595,0.00-33.756-5.984-46.704-15.932L 203.923,211.397c 0.676,4.10, 1.116,8.284, 1.116,12.572
-		c0.00,4.297-0.439,8.473-1.116,12.572l 133.613,80.164c 12.948-9.956, 29.108-15.937, 46.704-15.937c 42.408,0.00, 76.80,34.392, 76.80,76.80
-		c0.00,42.412-34.392,76.80-76.80,76.80c-42.412,0.00-76.80-34.388-76.80-76.80c0.00-4.289, 0.439-8.468, 1.112-12.569L 174.944,284.832
-		c-12.953,9.956-29.112,15.937-46.704,15.937c-42.412,0.00-76.80-34.388-76.80-76.80s 34.388-76.80, 76.80-76.80
-		c 17.592,0.00, 33.752,5.976, 46.704,15.937l 133.607-80.168c-0.672-4.10-1.112-8.272-1.112-12.569c0.00-42.412, 34.388-76.80, 76.80-76.80
-		c 42.408,0.00, 76.80,34.388, 76.80,76.80C 461.041,112.776, 426.649,147.168, 384.241,147.168z" />
-<glyph unicode="&#xe156;" d="M 256.227,444.128c-121.584,0.00-220.148-98.576-220.148-220.16c0.00-121.592, 98.564-220.16, 220.148-220.16
-		c 121.596,0.00, 220.172,98.568, 220.172,220.16C 476.401,345.552, 377.824,444.128, 256.227,444.128z M 274.161,45.664l0.00,98.944 l-35.851,0.00 l0.00-98.944
-		c-84.648,8.40-151.965,75.72-160.372,160.384l 98.936,0.00 l0.00,35.851 L 77.936,241.901 c 8.408,84.648, 75.724,151.968, 160.372,160.372l0.00-98.944
-		l 35.851,0.00 l0.00,98.944 c 84.664-8.408, 151.976-75.724, 160.384-160.372L 335.591,241.901 l0.00-35.851 l 98.952,0.00
-		C 426.137,121.384, 358.824,54.075, 274.161,45.664z" />
-<glyph unicode="&#xe157;" d="M 469.708,437.439c-14.991,14.991-29.28,0.837-77.853-22.508C 261.976,352.496, 35.568,225.616, 35.568,225.616
-		l 194.52-27.791l 27.788-194.528c0.00,0.00, 126.892,226.413, 189.312,356.296C 470.547,408.16, 484.696,422.448, 469.708,437.439z
-		 M 423.036,387.40L 281.756,125.024L 267.417,244.26L 423.036,387.40z" />
-<glyph unicode="&#xe158;" d="M 252.953,469.704C 117.24,467.888, 8.689,356.40, 10.504,220.684c 1.808-135.716, 113.304-244.268, 249.02-242.461
-		c 135.716,1.824, 244.268,113.312, 242.457,249.028C 500.165,362.968, 388.664,471.52, 252.953,469.704z M 258.832,29.967
-		c-107.144-1.433-195.16,84.256-196.60,191.412c-1.428,107.14, 84.272,195.16, 191.415,196.589
-		c 107.144,1.437, 195.168-84.26, 196.596-191.404C 451.672,119.416, 365.98,31.396, 258.832,29.967z M 139.828,108.647
-		c0.00,0.00, 116.963,16.068, 166.868,65.968c 49.888,49.891, 65.96,166.852, 65.96,166.852s-116.96-16.068-166.852-65.96
-		C 155.904,225.612, 139.828,108.647, 139.828,108.647z M 231.024,250.284c 20.968,20.98, 61.08,35.864, 95.472,45.108
-		c-9.264-34.333-24.212-74.741-45.036-95.557c-13.92-13.932-36.509-13.941-50.436,0.00C 217.088,213.768, 217.088,236.351, 231.024,250.284z" />
-<glyph unicode="&#xe159;" d="M 504.108,351.356L 384.484,426.28c-5.303,3.317-11.932,3.317-17.236,0.00L 256.24,356.752l-111.012,69.528
-		c-5.30,3.317-11.929,3.317-17.228,0.00L 8.368,351.356c-5.04-3.164-8.129-8.852-8.129-14.996l0.00-299.704
-		c0.00-6.30, 3.248-12.112, 8.50-15.221c 5.248-3.096, 11.688-3.017, 16.868,0.224l 111.012,69.523l 111.005-69.523
-		c 5.303-3.317, 11.929-3.317, 17.236,0.00l 111.008,69.523l 111.012-69.523c 2.648-1.66, 5.628-2.491, 8.616-2.491
-		c 2.844,0.00, 5.687,0.76, 8.252,2.268c 5.252,3.108, 8.492,8.92, 8.492,15.221L 512.24,336.359
-		C 512.241,342.503, 509.152,348.192, 504.108,351.356z M 119.867,121.48L 33.74,67.532L 33.74,326.463 l 86.128,53.948L 119.867,121.48 z
-		 M 239.496,67.532L 153.363,121.48L 153.363,380.412 l 86.133-53.953L 239.496,67.532 z M 359.12,121.48L 272.988,67.532L 272.988,326.46 l 86.133,53.953
-		L 359.12,121.48 z M 478.748,67.532L 392.62,121.48L 392.62,380.412 l 86.128-53.948L 478.749,67.532 z" />
-<glyph unicode="&#xe15a;" d="M 256.24,428.768c-70.70,0.00-128.00-57.308-128.00-128.00c0.00-122.211, 128.00-281.60, 128.00-281.60s 128.00,159.389, 128.00,281.60
-		C 384.241,371.46, 326.927,428.768, 256.24,428.768z M 256.24,230.112c-38.18,0.00-69.12,30.948-69.12,69.12s 30.94,69.12, 69.12,69.12
-		c 38.168,0.00, 69.12-30.948, 69.12-69.12S 294.408,230.112, 256.24,230.112z" />
-<glyph unicode="&#xe15b;" d="M 384.241,75.488l-332.80,0.00 l0.00,230.40 l 66.428,0.00 c0.00,0.00, 17.652,22.96, 55.552,51.20L 25.841,357.088 c-14.14,0.00-25.60-11.46-25.60-25.60l0.00-281.60
-		c0.00-14.145, 11.46-25.60, 25.60-25.60l 384.00,0.00 c 14.14,0.00, 25.60,11.457, 25.60,25.60l0.00,95.908 l-51.20-42.108L 384.241,75.488 z M 342.308,253.411l0.00-90.884 l 169.932,133.139
-		L 342.308,423.648l0.00-80.139 c-206.388,0.00-206.388-204.02-206.388-204.02C 194.329,235.444, 230.28,253.411, 342.308,253.411z" />
-<glyph unicode="&#xe15c;" d="M 461.041,428.768l-409.60,0.00 c-28.16,0.00-51.20-23.04-51.20-51.20l0.00-307.20 c0.00-28.16, 23.04-51.20, 51.20-51.20l 409.60,0.00 c 28.16,0.00, 51.20,23.04, 51.20,51.20l0.00,307.20
-		C 512.241,405.728, 489.201,428.768, 461.041,428.768z M 461.041,70.368l-409.60,0.00 l0.00,307.20 l 409.60,0.00 L 461.041,70.368 z M 230.64,170.208l-128.00,0.00 l0.00-46.08 l 128.00,0.00
-		L 230.64,170.208 z M 230.64,247.008l-128.00,0.00 l0.00-46.08 l 128.00,0.00 L 230.64,247.008 z M 230.64,323.808l-128.00,0.00 l0.00-46.08 l 128.00,0.00 L 230.64,323.808 z M 407.281,159.968
-		c0.00,0.00-43.516,11.388-43.516,33.737c0.00,21.304, 28.156,30.264, 28.156,73.784c0.00,35.344-10.737,56.32-46.08,56.32s-46.08-20.977-46.08-56.32
-		c0.00-43.52, 28.152-52.48, 28.152-73.784c0.00-22.348-43.512-33.737-43.512-33.737c-2.56,0.00-2.56-35.84-2.56-35.84l 128.00,0.00
-		C 409.841,124.128, 409.841,159.968, 407.281,159.968z" />
-<glyph unicode="&#xe15d;" d="M 317.088,110.105C 253.312,133.101, 232.935,152.504, 232.935,194.048c0.00,24.936, 19.464,16.788, 28.017,62.46
-		c 3.548,18.94, 20.748,0.304, 24.036,43.556c0.00,17.232-9.388,21.519-9.388,21.519s 4.776,25.504, 6.64,45.136
-		c 2.319,24.46-14.28,87.648-102.80,87.648c-88.517,0.00-105.12-63.188-102.795-87.648
-		c 1.865-19.632, 6.637-45.136, 6.637-45.136s-9.392-4.289-9.392-21.519c 3.296-43.253, 20.492-24.616, 24.036-43.556
-		c 8.561-45.672, 28.024-37.524, 28.024-62.46c0.00-41.545-20.38-60.948-84.161-83.944c-7.676-2.768-25.984-7.072-41.548-13.788
-		l0.00-102.748 l 409.60,0.00 c0.00,0.00,0.00,37.868,0.00,53.896C 409.841,63.503, 381.068,87.025, 317.088,110.105z M 435.441,249.568l0.00,76.80 l-51.20,0.00 l0.00-76.80 l-76.80,0.00 l0.00-51.20
-		l 76.80,0.00 l0.00-76.80 l 51.20,0.00 l0.00,76.80 l 76.80,0.00 l0.00,51.20 L 435.441,249.568 z" />
-<glyph unicode="&#xe15e;" d="M 512.241,6.368c0.00,0.00-1.013,93.64-6.931,103.348c-8.807,14.456-29.327,24.389-67.427,39.764
-		c-37.972,15.335-50.113,28.264-50.113,55.968c0.00,16.625, 11.592,11.188, 16.692,41.632c 2.107,12.636, 12.348,0.208, 14.308,29.041
-		c0.00,11.495-5.588,14.351-5.588,14.351s 2.84,17.00, 3.949,30.088c 1.379,16.312-8.508,58.433-61.208,58.433
-		c-52.712,0.00-62.592-42.12-61.213-58.433c 1.112-13.088, 3.94-30.088, 3.94-30.088s-5.58-2.856-5.58-14.351
-		c 1.96-28.832, 12.192-16.404, 14.311-29.041c 5.088-30.444, 16.688-25.008, 16.688-41.632c0.00-18.836-5.64-30.84-21.179-41.424
-		c 82.96-40.108, 94.08-48.288, 94.08-84.144l0.00-73.512 L 512.241,6.368 z M 261.961,135.556c-50.64,20.452-66.82,37.692-66.82,74.616
-		c0.00,22.168, 15.46,14.928, 22.248,55.52c 2.812,16.84, 16.472,0.276, 19.08,38.721c0.00,15.32-7.449,19.128-7.449,19.128
-		s 3.788,22.671, 5.267,40.119c 1.84,21.745-11.34,77.908-81.62,77.908c-70.268,0.00-83.46-56.163-81.608-77.908
-		c 1.481-17.448, 5.259-40.119, 5.259-40.119s-7.452-3.808-7.452-19.128c 2.619-38.444, 16.271-21.88, 19.092-38.721
-		c 6.788-40.592, 22.248-33.353, 22.248-55.52c0.00-36.924-16.188-54.164-66.82-74.616c-15.428-6.228-43.147-15.88-43.147-39.095
-		l0.00-90.093 l 355.68,0.00 c0.00,0.00,0.00,53.296,0.00,67.552C 355.92,95.096, 312.748,115.047, 261.961,135.556z" />
-<glyph unicode="&#xe15f;" d="M 392.44,110.105C 329.329,133.105, 309.16,152.504, 309.16,194.048c0.00,24.936, 19.269,16.788, 27.728,62.46
-		c 3.511,18.94, 20.532,0.304, 23.793,43.556c0.00,17.236-9.292,21.519-9.292,21.519s 4.72,25.504, 6.572,45.136
-		c 2.289,24.46-14.132,87.648-101.72,87.648c-87.592,0.00-104.02-63.188-101.72-87.648
-		c 1.847-19.632, 6.568-45.136, 6.568-45.136s-9.288-4.284-9.288-21.519c 3.248-43.253, 20.268-24.616, 23.78-43.556
-		c 8.468-45.672, 27.728-37.524, 27.728-62.46c0.00-41.545-20.161-60.944-83.269-83.944
-		C 56.728,87.025, 15.601,63.503, 15.601,47.463c0.00-16.028,0.00-53.896,0.00-53.896l 240.64,0.00 l 240.64,0.00 c0.00,0.00,0.00,37.868,0.00,53.896
-		C 496.881,63.503, 455.749,87.025, 392.44,110.105z" />
-<glyph unicode="&#xe160;" d="M 301.681,173.075l0.00-111.56 l 184.96,171.283l-184.96,165.248l0.00-98.98 c-224.64,0.00-275.84-249.18-275.84-249.18
-		C 89.42,162.264, 179.748,173.075, 301.681,173.075z" />
-<glyph unicode="&#xe161;" d="M 185.20,329.428L 185.20,398.048 L 0.24,232.80l 184.96-171.296L 185.20,132.623 l-108.16,100.176L 185.20,329.428z M 313.201,299.068
-		l0.00,98.98 l-184.96-165.248l 184.96-171.296L 313.201,173.064 c 84.28,0.00, 135.46-10.80, 199.04-123.176
-		C 512.241,49.888, 502.828,299.068, 313.201,299.068z" />
-<glyph unicode="&#xe162;" d="M 486.641,49.888c0.00,0.00-51.20,249.18-275.84,249.18l0.00,98.98 l-184.96-165.248l 184.96-171.296L 210.801,173.075
-		C 332.728,173.075, 423.059,162.264, 486.641,49.888z" />
-<glyph unicode="&#xe163;" d="M 142.311-27.864c-33.66,0.00-65.16,14.28-87.912,37.032C 10.32,53.248-1.968,130.195, 59.831,191.996
-		c 36.208,36.208, 181.248,181.244, 253.648,253.652c 25.70,25.704, 58.42,35.624, 89.739,27.236
-		c 30.76-8.24, 55.972-33.44, 64.212-64.201c 8.388-31.336-1.532-64.044-27.232-89.744L 197.632,76.368
-		c-13.852-13.852-29.492-22.052-45.22-23.712c-15.572-1.639-30.44,3.38-40.84,13.78
-		c-18.872,18.86-21.56,54.371, 9.808,85.731l 170.38,170.384c 7.00,7.00, 18.34,7.00, 25.34,0.00
-		c 7.00-6.992, 7.00-18.344,0.00-25.34L 146.72,126.823c-14.728-14.72-16.08-28.776-9.808-35.048
-		c 2.747-2.753, 6.92-3.992, 11.728-3.48c 7.38,0.779, 15.78,5.552, 23.652,13.408l 242.568,242.576
-		c 16.64,16.644, 23.02,36.22, 17.952,55.124c-4.992,18.619-20.239,33.868-38.86,38.86c-18.90,5.068-38.48-1.312-55.132-17.956
-		C 266.42,347.90, 121.38,202.855, 85.172,166.656c-47.261-47.261-35.939-101.632-5.431-132.151
-		c 30.512-30.508, 84.88-41.827, 132.151,5.431l 253.648,253.652c 7.00,7.00, 18.34,7.00, 25.34,0.00
-		c 7.00-6.996, 7.00-18.344,0.00-25.34L 237.232,14.596C 207.331-15.304, 173.872-27.864, 142.311-27.864z" />
-<glyph unicode="&#xe164;" d="M 423.705,391.952c-36.948,36.948-64.669,31.40-64.669,31.40L 229.712,294.028l-147.808-147.804l-25.856-121.936
-		l 121.925,25.864l 147.811,147.804l 129.328,129.32C 455.112,327.277, 460.664,355.00, 423.705,391.952z M 170.708,64.808
-		l-41.556-8.949c-4.02,7.508-8.84,15.004-17.688,23.856c-8.847,8.843-16.352,13.66-23.852,17.692l 8.956,41.552
-		l 12.007,12.021c0.00,0.00, 22.624-0.449, 48.157-25.996c 25.541-25.537, 25.999-48.164, 25.999-48.164L 170.708,64.808z" />
-<glyph unicode="&#xe165;" d="M 41.044,344.66c 12.50-6.721, 185.556-99.68, 191.996-103.139c 6.444-3.46, 14.788-5.131, 23.20-5.131
-		c 8.408,0.00, 16.753,1.672, 23.20,5.131c 6.44,3.46, 179.496,96.42, 191.992,103.139c 12.508,6.708, 24.344,27.788, 1.368,27.788L 39.68,372.447
-		C 16.72,372.448, 28.54,351.368, 41.044,344.66z M 476.728,293.46c-14.20-7.413-188.592-98.604-197.288-103.144
-		c-8.70-4.54-14.792-5.131-23.20-5.131c-8.412,0.00-14.50,0.592-23.20,5.131C 224.344,194.856, 49.96,286.048, 35.748,293.46
-		c-9.995,5.208-9.908-0.907-9.908-5.621c0.00-4.72,0.00-187.805,0.00-187.805c0.00-10.732, 14.296-24.548, 25.388-24.548l 410.02,0.00
-		c 11.096,0.00, 25.392,13.816, 25.392,24.548c0.00,0.00,0.00,183.084,0.00,187.805C 486.641,292.553, 486.736,298.668, 476.728,293.46z" />
-<glyph unicode="&#xe166;" d="M 217.84,454.368l-23.04,0.00 c-5.632,0.00-10.24-4.604-10.24-10.24l0.00-97.28 L 94.04,346.848
-		c-4.224,0.00-9.472-0.965-14.516-2.52c-5.052-1.548-9.90-3.697-13.337-6.048l-60.80-41.736
-		c-3.437-2.356-5.148-5.464-5.148-8.576c0.00-3.104, 1.712-6.209, 5.148-8.568l 60.80-41.736
-		c 3.437-2.356, 8.284-4.499, 13.337-6.056c 5.044-1.556, 10.292-2.52, 14.516-2.52l 90.52,0.00 l0.00-225.28 c0.00-5.632, 4.608-10.24, 10.24-10.24l 23.04,0.00
-		c 5.628,0.00, 10.24,4.608, 10.24,10.24l0.00,440.32 C 228.08,449.764, 223.469,454.368, 217.84,454.368z M 507.084,347.74l-60.80,41.732
-		c-3.437,2.359-8.284,4.499-13.337,6.06c-5.044,1.552-10.288,2.516-14.516,2.516L 243.44,398.048 l 20.495-117.76l 154.496,0.00
-		c 4.228,0.00, 9.472,0.965, 14.516,2.52c 5.052,1.552, 9.90,3.697, 13.337,6.052l 60.80,41.739c 3.437,2.352, 5.156,5.46, 5.156,8.568
-		C 512.241,342.28, 510.52,345.384, 507.084,347.74z" />
-<glyph unicode="&#xe167;" d="M 394.028,111.759l-67.219,192.932C 308.312,357.768, 250.872,387.108, 196.451,372.616L 145.852,470.773
-		c-4.583,8.888-15.316,12.288-24.005,7.596c-8.679-4.692-12.00-15.716-7.416-24.60l 49.384-95.803
-		c-39.351-26.104-59.80-75.604-46.84-122.216l 54.776-197.021c 15.396-55.372, 78.84-83.584, 142.608-64.084
-		C 377.312-3.228, 412.928,57.531, 394.028,111.759z M 227.572,252.061c-18.692-6.14-38.696,4.404-44.683,23.556
-		c-5.997,19.156, 4.297,39.66, 22.984,45.795c 18.688,6.144, 38.70-4.40, 44.688-23.556C 256.556,278.704, 246.264,258.201, 227.572,252.061z
-		" />
-<glyph unicode="&#xe168;" d="M 353.521,474.848l-194.56,0.00 c-28.16,0.00-51.20-23.04-51.20-51.20l0.00-399.36 c0.00-28.16, 23.04-51.20, 51.20-51.20l 194.56,0.00 c 28.16,0.00, 51.20,23.04, 51.20,51.20l0.00,399.36
-		C 404.721,451.808, 381.681,474.848, 353.521,474.848z M 256.24-6.432c-19.784,0.00-35.84,11.457-35.84,25.60c0.00,14.136, 16.056,25.60, 35.84,25.60
-		s 35.84-11.464, 35.84-25.60C 292.081,5.024, 276.024-6.432, 256.24-6.432z M 363.761,70.368l-215.04,0.00 l0.00,337.92 l 215.04,0.00 L 363.761,70.368 z" />
-<glyph unicode="&#xe169;" d="M 286.236,193.976c-38.00-38.00-82.012-74.332-99.40-56.931c-24.908,24.904-40.26,46.596-95.16,2.468
-		c-54.901-44.136-12.74-73.544, 11.388-97.68c 27.841-27.845, 131.624-1.463, 234.20,101.109
-		c 102.572,102.584, 128.961,206.361, 101.104,234.208c-24.133,24.133-53.544,66.28-97.664,11.381
-		C 296.576,333.644, 318.256,318.284, 343.168,293.376C 360.557,275.984, 324.236,231.984, 286.236,193.976z" />
-<glyph unicode="&#xe16a;" d="M 276.688,235.328l-45.264,45.264l-64.00-64.00c-31.248-31.248-31.248-81.904,0.00-113.136c 31.248-31.248, 81.888-31.248, 113.136,0.00l 161.952,158.064
-	c 49.968,49.984, 49.968,131.008,0.00,181.008c-50.00,49.984-131.04,49.984-181.008,0.00L 83.568,268.448c-68.736-68.72-68.736-180.16,0.00-248.912
-	c 68.736-68.736, 180.176-68.736, 248.896,0.00l 96.00,96.00L 383.20,160.80l-0.16-0.16l-95.824-95.84c-43.728-43.712-114.656-43.712-158.40,0.00
-	c-43.728,43.712-43.728,114.656,0.00,158.384L 306.752,397.28c 24.992,24.992, 65.52,24.992, 90.496,0.00c 25.008-25.008, 25.008-65.552,0.00-90.512l-161.936-158.064
-	c-6.256-6.256-16.368-6.256-22.624,0.00s-6.256,16.368,0.00,22.624L 276.688,235.328z" />
-<glyph unicode="&#xe16b;" d="M 320.00,480.00l0.00-62.00 c0.00-25.632-10.00-49.744-28.064-67.808L 110.88,170.128C 82.256,141.568, 66.496,104.064, 64.752,64.00L0.00,64.00
-			l 96.00-96.00l 96.00,96.00L 128.688,64.00 c 1.68,23.008, 10.944,44.368, 27.376,60.88l 181.056,180.00C 367.376,335.12, 384.00,375.248, 384.00,418.00L 384.00,480.00 L 320.00,480.00 zM 383.248,64.00c-1.744,40.064-17.568,77.568-46.192,106.256l-35.68,35.44L 256.00,160.56l 35.872-35.68
-			c 16.496-16.432, 25.744-37.872, 27.44-60.88L 256.00,64.00 l 96.00-96.00l 96.00,96.00L 383.248,64.00 z" horiz-adv-x="448" />
-<glyph unicode="&#xe16c;" d="M 384.00,416.00c-6.00,0.00-11.808-0.992-17.632-1.744C 344.064,453.632, 302.816,480.00, 256.00,480.00c-47.808,0.00-89.088-26.624-111.056-65.632
-			C 139.312,415.12, 133.712,416.00, 128.00,416.00c-70.592,0.00-128.00-57.376-128.00-128.00s 57.408-128.00, 128.00-128.00l 256.00,0.00 c 70.624,0.00, 128.00,57.376, 128.00,128.00S 454.624,416.00, 384.00,416.00z M 384.00,224.00L 128.00,224.00 c-35.28,0.00-64.00,28.752-64.00,64.00
-			c0.00,35.12, 31.088,62.128, 64.064,63.12C 128.192,336.00, 130.816,321.248, 136.064,307.248l 59.936,22.368C 193.344,336.752, 192.00,344.256, 192.00,352.00c0.00,35.248, 28.72,64.00, 64.00,64.00
-			c 20.72,0.00, 39.408-10.256, 51.248-26.256C 276.32,366.368, 256.00,329.68, 256.00,288.00l 64.00,0.00 c0.00,35.248, 28.752,64.00, 64.00,64.00s 64.00-28.752, 64.00-64.00S 419.248,224.00, 384.00,224.00zM 256.00,160.00L 160.00,64.00L 224.00,64.00L 224.00-32.00L 288.00-32.00L 288.00,64.00L 352.00,64.00 		z" />
-<glyph unicode="&#xe16d;" d="M 384.00,416.00c-6.00,0.00-11.808-0.944-17.632-1.808C 344.064,453.68, 302.816,480.00, 256.00,480.00c-47.808,0.00-89.088-26.688-111.056-65.568
-			C 139.312,415.184, 133.712,416.00, 128.00,416.00c-70.592,0.00-128.00-57.44-128.00-128.00s 57.408-128.00, 128.00-128.00l 96.00,0.00 l0.00-96.00 l-64.00,0.00 l 96.00-96.00l 96.00,96.00l-64.00,0.00 l0.00,96.00 l 96.00,0.00 c 70.624,0.00, 128.00,57.44, 128.00,128.00S 454.624,416.00, 384.00,416.00z M 384.00,224.00L 128.00,224.00
-			c-35.28,0.00-64.00,28.688-64.00,64.00c0.00,35.056, 31.088,62.192, 64.064,63.12c 0.128-15.056, 2.752-29.936, 8.00-43.936l 59.936,22.496C 193.344,336.752, 192.00,344.32, 192.00,352.00
-			c0.00,35.312, 28.72,64.00, 64.00,64.00c 20.72,0.00, 39.408-10.256, 51.248-26.192C 276.32,366.432, 256.00,329.68, 256.00,288.00l 64.00,0.00 c0.00,35.312, 28.752,64.00, 64.00,64.00s 64.00-28.688, 64.00-64.00
-			S 419.248,224.00, 384.00,224.00z" />
-<glyph unicode="&#xe16e;" d="M0.00,480.00L 384.00,480.00L 384.00,416.00L0.00,416.00zM 128.00,256.00L 128.00-32.00L 256.00-32.00L 256.00,256.00L 320.00,256.00L 192.00,416.00L 64.00,256.00 		z" horiz-adv-x="384" />
-<glyph unicode="&#xe16f;" d="M0.00,32.00L 384.00,32.00L 384.00-32.00L0.00-32.00zM 256.00,192.00L 256.00,480.00L 128.00,480.00L 128.00,192.00L 64.00,192.00L 192.00,32.00L 320.00,192.00 		z" horiz-adv-x="384" />
-<glyph unicode="&#xe170;" d="M 288.368,256.40l 92.624,0.00 c-11.744,45.376-47.248,80.912-92.624,92.624L 288.368,256.40 zM 288.368,191.60l0.00-92.592 c 45.376,11.68, 80.88,47.248, 92.624,92.592L 288.368,191.60 zM 223.568,256.40L 223.568,349.024 c-45.376-11.712-80.944-47.248-92.624-92.624L 223.568,256.40 zM 223.568,191.60L 130.944,191.60 c 11.68-45.344, 47.248-80.912, 92.624-92.592L 223.568,191.60 zM 288.368,415.152c 81.184-13.744, 144.992-77.568, 158.752-158.752L 512.00,256.40 C 497.184,373.376, 405.376,465.216, 288.368,480.00L 288.368,415.152 z
-				M 64.816,256.40C 78.56,337.60, 142.368,401.408, 223.568,415.152L 223.568,480.00 C 106.624,465.216, 14.752,373.376,0.00,256.40L 64.816,256.40 zM 223.568,32.88c-81.184,13.744-144.992,77.504-158.752,158.72L0.00,191.60 C 14.752,74.624, 106.624-17.248, 223.568-32.00
-				L 223.568,32.88 zM 447.12,191.60c-13.744-81.216-77.568-144.976-158.752-158.72L 288.368-32.00 C 405.376-17.248, 497.184,74.624, 512.00,191.60
-				L 447.12,191.60 z" />
-<glyph unicode="&#xe171;" d="M 128.00,480.00C 57.312,480.00,0.00,422.688,0.00,352.00s 128.00-384.00, 128.00-384.00s 128.00,313.312, 128.00,384.00S 198.688,480.00, 128.00,480.00z M 128.00,288.00c-35.344,0.00-64.00,28.656-64.00,64.00
-		s 28.656,64.00, 64.00,64.00s 64.00-28.656, 64.00-64.00S 163.344,288.00, 128.00,288.00z" horiz-adv-x="256" />
-<glyph unicode="&#xe172;" d="M 273.12,433.12c-62.496,62.496-163.744,62.496-226.256,0.00c-62.496-62.464-62.496-163.808,0.00-226.24
-				C 46.88,206.88, 160.00,96.00, 160.00-32.00c0.00,128.00, 113.12,238.88, 113.12,238.88C 335.632,269.312, 335.632,370.656, 273.12,433.12z M 160.00,256.00c-35.376,0.00-64.00,28.624-64.00,64.00
-				s 28.624,64.00, 64.00,64.00s 64.00-28.624, 64.00-64.00S 195.376,256.00, 160.00,256.00z" horiz-adv-x="320" />
-<glyph unicode="&#xe173;" d="M 160.00,416.00c 25.632,0.00, 49.744-10.00, 67.872-28.16C 246.00,369.744, 256.00,345.632, 256.00,320.00s-10.00-49.744-27.68-67.408
-			c-2.688-2.656-35.808-35.60-68.32-87.056c-32.368,51.376-65.376,84.192-67.872,86.624C 74.00,270.256, 64.00,294.368, 64.00,320.00s 10.00,49.744, 28.128,67.872
-			S 134.368,416.00, 160.00,416.00 M 160.00,480.00C 119.056,480.00, 78.128,464.368, 46.88,433.12c-62.496-62.464-62.496-163.776,0.00-226.256C 46.88,206.88, 160.00,96.00, 160.00-32.00
-			c0.00,128.00, 113.12,238.88, 113.12,238.88c 62.496,62.464, 62.496,163.776,0.00,226.256C 241.872,464.368, 200.944,480.00, 160.00,480.00L 160.00,480.00zM 128.00,320.00A32.00,32.00 1620.00 1,0 192.00,320A32.00,32.00 1620.00 1,0 128.00,320z" horiz-adv-x="320" />
-<glyph unicode="&#xe174;" d="M 354.192,166.00L 512.00,288.00L 320.00,288.00L 256.00,480.00L 192.00,288.00L0.00,288.00L 158.00,166.496L 96.00-32.00L 256.256,90.88L 416.128-32.00
-			z" />
-<glyph unicode="&#xe175;" d="M 256.00,480.00C 114.88,480.00,0.00,365.152,0.00,224.00l 64.00,0.00 c0.00,13.216, 10.816,24.00, 24.00,24.00C 101.248,248.00, 112.00,237.216, 112.00,224.00l 64.00,0.00
-		c0.00,13.216, 10.816,24.00, 24.00,24.00c 13.248,0.00, 24.00-10.784, 24.00-24.00l0.00-160.00 c0.00-17.632-14.32-32.00-32.00-32.00c-17.632,0.00-32.00,14.368-32.00,32.00L 96.00,64.00 c0.00-52.944, 43.12-96.00, 96.00-96.00
-		c 52.992,0.00, 96.00,43.056, 96.00,96.00L 288.00,224.00 c0.00,13.216, 10.816,24.00, 24.00,24.00c 13.248,0.00, 23.968-10.784, 23.968-24.00l 64.00,0.00 c0.00,13.216, 10.88,24.00, 24.00,24.00
-		c 13.248,0.00, 24.00-10.784, 24.00-24.00l 64.00,0.00 C 511.968,365.152, 397.216,480.00, 256.00,480.00z" horiz-adv-x="511.9679870605469" />
-<glyph unicode="&#xe176;" d="M 383.968,384.00c-6.00,0.00-11.728-0.976-17.648-1.776C 344.096,421.664, 302.816,448.00, 256.00,448.00c-47.792,0.00-89.04-26.656-111.04-65.60
-			C 139.312,383.152, 133.68,384.00, 128.00,384.00c-70.56,0.00-128.00-57.408-128.00-128.00s 57.44-128.00, 128.00-128.00l 255.968,0.00 c 70.624,0.00, 128.00,57.408, 128.00,128.00S 454.592,384.00, 383.968,384.00z M 383.968,192.00L 128.00,192.00
-			c-35.312,0.00-64.00,28.72-64.00,64.00c0.00,35.088, 31.056,62.16, 64.064,63.12c 0.144-15.088, 2.752-29.904, 8.00-43.904l 59.936,22.432
-			C 193.312,304.752, 192.00,312.288, 192.00,320.00c0.00,35.28, 28.688,64.00, 64.00,64.00c 20.688,0.00, 39.44-10.256, 51.184-26.224C 276.336,334.40, 256.00,297.68, 256.00,256.00l 64.00,0.00
-			c0.00,35.28, 28.72,64.00, 63.968,64.00c 35.376,0.00, 64.00-28.72, 64.00-64.00S 419.344,192.00, 383.968,192.00zM 52.496,8.992c-12.00-12.00-31.504-12.00-43.504,0.00s-12.00,31.504,0.00,43.504S 96.00,96.00, 96.00,96.00S 64.496,20.992, 52.496,8.992zM 180.56,8.992c-12.00-12.00-31.44-12.00-43.504,0.00c-12.00,12.00-12.00,31.504,0.00,43.504
-			C 149.12,64.496, 224.064,96.00, 224.064,96.00S 192.624,20.992, 180.56,8.992zM 308.48,8.992c-12.00-12.00-31.504-12.00-43.504,0.00s-12.00,31.504,0.00,43.504S 351.968,96.00, 351.968,96.00
-			S 320.48,20.992, 308.48,8.992z" horiz-adv-x="511.9679870605469" />
-<glyph unicode="&#xe177;" d="M 384.00,320.00c-6.064,0.00-11.808-0.976-17.632-1.776C 344.064,357.664, 302.816,384.00, 256.00,384.00c-47.808,0.00-89.056-26.656-111.056-65.60
-		C 139.312,319.152, 133.68,320.00, 128.00,320.00c-70.56,0.00-128.00-57.408-128.00-128.00c0.00-70.624, 57.44-128.00, 128.00-128.00l 256.00,0.00 c 70.56,0.00, 128.00,57.376, 128.00,128.00C 512.00,262.592, 454.56,320.00, 384.00,320.00z M 384.00,128.00L 128.00,128.00
-		c-35.312,0.00-64.00,28.752-64.00,64.00c0.00,35.088, 31.056,62.16, 64.064,63.12c 0.128-15.088, 2.752-29.904, 8.00-43.904l 59.936,22.432
-		C 193.312,240.752, 192.00,248.288, 192.00,256.00c0.00,35.28, 28.688,64.00, 64.00,64.00c 20.688,0.00, 39.44-10.256, 51.184-26.224C 276.32,270.40, 256.00,233.68, 256.00,192.00l 64.00,0.00
-		c0.00,35.28, 28.688,64.00, 64.00,64.00s 64.00-28.72, 64.00-64.00C 448.00,156.752, 419.312,128.00, 384.00,128.00z" />
-<glyph unicode="&#xe178;" d="M 394.128,125.056c-131.008,0.00-237.12,106.192-237.12,237.12c0.00,43.12, 12.368,83.008, 32.496,117.808
-			C 80.32,448.496,0.00,348.992,0.00,229.68C0.00,85.184, 117.12-32.00, 261.632-32.00c 119.312,0.00, 218.88,80.368, 250.368,189.504
-			C 477.12,137.44, 437.248,125.056, 394.128,125.056z" />
-<glyph unicode="&#xe179;" d="M 94.32,333.632c 13.568-143.344, 128.00-257.744, 271.312-271.248c-30.56-19.376-66.432-30.368-104.00-30.368
-		C 152.624,32.00, 64.00,120.624, 64.00,229.664C 64.00,267.216, 75.008,303.056, 94.32,333.632 M 189.504,480.00C 80.32,448.496,0.00,348.976,0.00,229.664C0.00,85.12, 117.12-32.00, 261.632-32.00
-		c 119.312,0.00, 218.88,80.368, 250.368,189.504c-34.88-20.128-74.752-32.496-117.872-32.496c-131.008,0.00-237.12,106.224-237.12,237.152
-		C 156.992,405.28, 169.376,445.152, 189.504,480.00L 189.504,480.00z" />
-<glyph unicode="&#xe17a;" d="M 256.016,352.00c-70.688,0.00-128.00-57.312-128.00-128.00s 57.312-128.00, 128.00-128.00C 326.704,96.00, 384.00,153.312, 384.00,224.00S 326.704,352.00, 256.016,352.00L 256.016,352.00zM 224.00,448.00A32.00,32.00 1620.00 1,0 288.00,448A32.00,32.00 1620.00 1,0 224.00,448zM 64.00,384.00A32.00,32.00 1620.00 1,0 128.00,384A32.00,32.00 1620.00 1,0 64.00,384zM 32.00,256.00c 17.68,0.00, 32.00-14.32, 32.00-32.00c0.00-17.712-14.32-32.00-32.00-32.00s-32.00,14.288-32.00,32.00C0.00,241.68, 14.32,256.00, 32.00,256.00zM 64.00,64.00A32.00,32.00 1620.00 1,0 128.00,64A32.00,32.00 1620.00 1,0 64.00,64zM 224.00,0.00c0.00,17.744, 14.32,32.00, 32.00,32.00c 17.728,0.00, 32.00-14.256, 32.00-32.00c0.00-17.632-14.272-32.00-32.00-32.00C 238.32-32.00, 224.00-17.632, 224.00,0.00zM 384.00,64.00A32.00,32.00 1620.00 1,0 448.00,64A32.00,32.00 1620.00 1,0 384.00,64zM 480.00,192.00c-17.664,0.00-32.00,14.336-32.00,32.00c0.00,17.712, 14.336,32.00, 32.00,32.00s 32.00-14.288, 32.00-32.00C 512.00,206.336, 497.664,192.00, 480.00,192.00zM 384.00,384.00A32.00,32.00 1620.00 1,0 448.00,384A32.00,32.00 1620.00 1,0 384.00,384z" horiz-adv-x="511.9679870605469" />
-<glyph unicode="&#xe17b;" d="M 256.016,288.00c 35.248,0.00, 64.00-28.72, 64.00-64.00s-28.752-64.00-64.00-64.00s-64.00,28.72-64.00,64.00S 220.768,288.00, 256.016,288.00 M 256.016,352.00
-			c-70.688,0.00-128.00-57.312-128.00-128.00s 57.312-128.00, 128.00-128.00C 326.704,96.00, 384.00,153.312, 384.00,224.00S 326.704,352.00, 256.016,352.00L 256.016,352.00zM 224.00,448.00A32.00,32.00 1620.00 1,0 288.00,448A32.00,32.00 1620.00 1,0 224.00,448zM 64.00,384.00A32.00,32.00 1620.00 1,0 128.00,384A32.00,32.00 1620.00 1,0 64.00,384zM 32.00,256.00c 17.68,0.00, 32.00-14.32, 32.00-32.00c0.00-17.712-14.32-32.00-32.00-32.00s-32.00,14.288-32.00,32.00C0.00,241.68, 14.32,256.00, 32.00,256.00zM 64.00,64.00A32.00,32.00 1620.00 1,0 128.00,64A32.00,32.00 1620.00 1,0 64.00,64zM 224.00,0.00c0.00,17.744, 14.32,32.00, 32.00,32.00c 17.728,0.00, 32.00-14.256, 32.00-32.00c0.00-17.632-14.272-32.00-32.00-32.00C 238.32-32.00, 224.00-17.632, 224.00,0.00zM 384.00,64.00A32.00,32.00 1620.00 1,0 448.00,64A32.00,32.00 1620.00 1,0 384.00,64zM 480.00,192.00c-17.664,0.00-32.00,14.336-32.00,32.00c0.00,17.712, 14.336,32.00, 32.00,32.00s 32.00-14.288, 32.00-32.00C 512.00,206.336, 497.664,192.00, 480.00,192.00zM 384.00,384.00A32.00,32.00 1620.00 1,0 448.00,384A32.00,32.00 1620.00 1,0 384.00,384z" horiz-adv-x="511.9679870605469" />
-<glyph unicode="&#xe17c;" d="M 212.432,480.00L0.00,480.00 l0.00-212.432 L 299.504-32.00L 299.504,180.432 L 512.00,180.432 L 212.432,480.00z M 116.992,302.064c-33.632,0.00-60.88,27.248-60.88,60.88
-		S 83.36,423.824, 116.992,423.824s 60.88-27.248, 60.88-60.88S 150.624,302.064, 116.992,302.064z" />
-<glyph unicode="&#xe17d;" d="M0.00,480.00l0.00-212.368 L 299.632-32.00c0.00,0.00,0.00,172.688,0.00,212.32c 39.632,0.00, 212.368,0.00, 212.368,0.00L 212.368,480.00L0.00,480.00 z M 188.752,423.008
-				c 12.368-12.32, 126.064-126.128, 185.632-185.68c-49.632,0.00-131.744,0.00-131.744,0.00s0.00-82.128,0.00-131.632C 183.056,165.184, 69.376,278.944, 56.992,291.184
-				c0.00,16.88,0.00,95.376,0.00,131.808C 93.44,423.008, 171.872,423.008, 188.752,423.008zM 187.184,342.192c0.00-27.248-22.128-49.376-49.312-49.376c-27.248,0.00-49.376,22.128-49.376,49.376
-			c0.00,27.184, 22.128,49.248, 49.376,49.248C 165.056,391.44, 187.184,369.376, 187.184,342.192z" />
-<glyph unicode="&#xe17e;" d="M 224.064,480.00C 135.808,480.00, 64.128,408.256, 64.128,320.00l 63.936,0.00 c0.00,52.944, 43.008,96.00, 96.00,96.00C 276.944,416.00, 320.00,372.944, 320.00,320.00l0.00-32.00 L0.00,288.00 l0.00-224.00
-		c0.00-52.944, 43.12-96.00, 96.00-96.00l 192.00,0.00 c 52.88,0.00, 96.00,43.056, 96.00,96.00L 384.00,320.00 C 384.00,408.256, 312.192,480.00, 224.064,480.00z M 192.00,96.00c-17.632,0.00-32.00,14.32-32.00,32.00s 14.368,32.00, 32.00,32.00
-		c 17.744,0.00, 32.00-14.32, 32.00-32.00S 209.744,96.00, 192.00,96.00z" horiz-adv-x="384" />
-<glyph unicode="&#xe17f;" d="M 224.064,480.00C 135.84,480.00, 64.096,408.192, 64.096,320.00l 64.00,0.00 c0.00,52.88, 43.024,96.00, 95.968,96.00S 320.00,372.88, 320.00,320.00l0.00-32.00 L0.00,288.00 l0.00-224.00
-			c0.00-52.992, 43.056-96.00, 95.968-96.00L 288.00-32.00 c 52.944,0.00, 96.00,43.008, 96.00,96.00L 384.00,320.00 C 384.00,408.192, 312.256,480.00, 224.064,480.00z M 288.00,32.00L 95.968,32.00 c-17.632,0.00-32.00,14.32-32.00,32.00L 63.968,224.00 L 320.00,224.00 l0.00-160.00
-			C 320.00,46.32, 305.632,32.00, 288.00,32.00zM 224.00,128.00c0.00-17.744-14.32-32.00-32.00-32.00s-32.00,14.256-32.00,32.00c0.00,17.632, 14.32,32.00, 32.00,32.00S 224.00,145.632, 224.00,128.00z" horiz-adv-x="384" />
-<glyph unicode="&#xe180;" d="M 224.00,480.00C 135.872,480.00, 64.064,408.256, 64.064,320.00l0.00-32.00 L0.00,288.00 l0.00-224.00 c0.00-52.944, 43.056-96.00, 96.00-96.00l 192.00,0.00 c 52.944,0.00, 96.00,43.056, 96.00,96.00L 384.00,320.00
-		C 384.00,408.256, 312.192,480.00, 224.00,480.00z M 191.936,96.00C 174.32,96.00, 160.00,110.32, 160.00,128.00s 14.32,32.00, 31.936,32.00c 17.68,0.00, 32.00-14.32, 32.00-32.00S 209.632,96.00, 191.936,96.00z M 320.00,288.00
-		L 128.064,288.00 l0.00,32.00 c0.00,52.944, 43.056,96.00, 95.936,96.00c 52.944,0.00, 96.00-43.056, 96.00-96.00L 320.00,288.00 z" horiz-adv-x="384" />
-<glyph unicode="&#xe181;" d="M 224.064,480.00c-88.16,0.00-159.968-71.744-159.968-160.00l0.00-32.00 L0.00,288.00 l0.00-224.00 c0.00-52.88, 43.12-96.00, 95.968-96.00L 288.00-32.00 c 53.008,0.00, 96.00,43.12, 96.00,96.00L 384.00,320.00
-			C 384.00,408.256, 312.256,480.00, 224.064,480.00z M 128.096,320.00c0.00,52.992, 43.088,96.00, 95.968,96.00C 277.008,416.00, 320.00,372.992, 320.00,320.00l0.00-32.00 L 128.096,288.00 L 128.096,320.00 z M 288.00,32.00L 95.968,32.00
-			c-17.632,0.00-32.00,14.368-32.00,32.00L 63.968,224.00 L 320.00,224.00 l0.00-160.00 C 320.00,46.368, 305.744,32.00, 288.00,32.00zM 224.00,128.00c0.00-17.632-14.368-32.00-32.00-32.00c-17.744,0.00-32.00,14.368-32.00,32.00c0.00,17.744, 14.256,32.00, 32.00,32.00C 209.632,160.00, 224.00,145.744, 224.00,128.00z" horiz-adv-x="384" />
-<glyph unicode="&#xe182;" d="M 256.00,416.00c 105.872,0.00, 192.00-86.128, 192.00-192.00s-86.128-192.00-192.00-192.00S 64.00,118.128, 64.00,224.00S 150.128,416.00, 256.00,416.00 M 256.00,480.00
-			C 114.624,480.00,0.00,365.376,0.00,224.00s 114.624-256.00, 256.00-256.00s 256.00,114.624, 256.00,256.00S 397.376,480.00, 256.00,480.00L 256.00,480.00zM 342.752,182.752L 288.00,237.568L 288.00,352.00 l-64.368,0.00 l0.00-127.872 c0.00-9.632, 4.432-17.936, 11.12-23.872l 62.752-62.752
-			L 342.752,182.752z" />
-<glyph unicode="&#xe183;" d="M 256.00,480.00L0.00,224.00l 64.00,0.00 l0.00-256.00 l 384.00,0.00 L 448.00,224.00 l 64.00,0.00 L 256.00,480.00z M 384.00,32.00l-96.00,0.00 l0.00,96.00 l-64.00,0.00 l0.00-96.00 L 128.00,32.00 L 128.00,261.504 L 256.00,352.00l 128.00-90.496L 384.00,32.00 z" />
-<glyph unicode="&#xe184;" d="M 192.00,224.00C 86.00,224.00,0.00,138.00,0.00,32.00c0.00-35.376, 28.624-64.00, 64.00-64.00l 256.00,0.00 c 35.376,0.00, 64.00,28.624, 64.00,64.00
-			C 384.00,138.00, 298.00,224.00, 192.00,224.00zM 96.00,384.00A96.00,96.00 1620.00 1,0 288.00,384A96.00,96.00 1620.00 1,0 96.00,384z" horiz-adv-x="384" />
-<glyph unicode="&#xe185;" d="M 256.00,416.00C 114.624,416.00,0.00,226.496,0.00,226.496S 114.624,32.00, 256.00,32.00s 256.00,194.496, 256.00,194.496S 397.376,416.00, 256.00,416.00z M 256.00,96.00
-			c-70.688,0.00-128.00,57.312-128.00,128.00s 57.312,128.00, 128.00,128.00s 128.00-57.312, 128.00-128.00S 326.688,96.00, 256.00,96.00zM 192.00,224.00A64.00,64.00 1620.00 1,0 320.00,224A64.00,64.00 1620.00 1,0 192.00,224z" />
-<glyph unicode="&#xe186;" d="M 384.00,480.00L 448.00,480.00L 448.00-32.00L 384.00-32.00zM 256.00,352.00L 320.00,352.00L 320.00-32.00L 256.00-32.00zM 128.00,224.00L 192.00,224.00L 192.00-32.00L 128.00-32.00zM0.00,96.00L 64.00,96.00L 64.00-32.00L0.00-32.00z" horiz-adv-x="448" />
-<glyph unicode="&#xe187;" d="M 384.00,480.00L 512.00,480.00L 512.00-32.00L 384.00-32.00zM 192.00,352.00L 320.00,352.00L 320.00-32.00L 192.00-32.00zM0.00,224.00L 128.00,224.00L 128.00-32.00L0.00-32.00z" />
-<glyph unicode="&#xe188;" d="M 232.528,169.248L 63.28,338.496c-84.368-97.376-84.368-241.12,0.00-338.496L 232.528,169.248zM 256.00,192.00L 256.00,480.00 C 177.504,475.12, 106.752,445.12, 49.648,398.368L 256.00,192.00zM 288.032,415.744l0.00-236.992 L 121.904,12.624C 159.152-14.752, 204.032-32.00, 253.664-32.00C 378.752-32.00, 480.00,69.248, 480.00,194.128
-			C 480.00,307.376, 396.368,399.12, 288.032,415.744z" horiz-adv-x="480" />
-<glyph unicode="&#xe189;" d="M 219.856,169.632l-160.128,160.00c-79.632-92.064-79.632-227.952,0.00-320.00L 219.856,169.632zM 320.016,413.472l0.00-234.336 L 154.384,13.44C 191.632-14.368, 236.88-32.00, 286.88-32.00C 411.248-32.00, 512.00,68.624, 512.00,192.944
-			C 512.016,305.872, 428.288,397.376, 320.016,413.472zM 256.00,223.744L 256.00,480.00 C 186.256,475.68, 123.248,448.992, 72.368,407.408L 256.00,223.744z" horiz-adv-x="511.9679870605469" />
-<glyph unicode="&#xe18a;" d="M 484.944,336.432l-159.568-159.568l 181.872,0.00 C 510.128,192.256, 512.00,207.872, 512.00,224.00
-			C 512.00,264.528, 501.744,302.368, 484.944,336.432zM 336.88,236.16l 131.248,131.184c-31.248,46.064-77.504,80.336-131.248,98.336L 336.88,236.16 zM 267.968,143.12l 131.28-131.312c 46.128,31.184, 80.432,77.504, 98.432,131.312L 267.968,143.12 zM 303.088,292.096L 303.088,475.248 C 287.776,478.096, 272.128,480.00, 256.00,480.00c-40.88,0.00-79.008-10.464-113.28-27.536L 303.088,292.096zM 208.912,154.368l0.00-181.632 C 224.224-30.128, 239.872-32.00, 256.00-32.00c 40.496,0.00, 78.256,10.256, 112.32,27.008
-			L 208.912,154.368zM 175.088,211.632L 44.00,80.56c 31.184-46.00, 77.408-80.256, 131.088-98.256L 175.088,211.632 zM 4.752,271.088C 1.904,255.776,0.00,240.128,0.00,224.00c0.00-40.624, 10.32-78.496, 27.12-112.56l 159.664,159.664L 4.752,271.104 zM 111.936,435.504C 66.256,404.32, 32.224,358.336, 14.32,304.912l 228.224,0.00 L 111.936,435.504z" />
-<glyph unicode="&#xe18b;" d="M 338.752,256.32l 91.056,154.624C 384.128,453.472, 323.376,480.00, 256.00,480.00c-15.968,0.00-31.44-1.904-46.592-4.688
-			L 338.752,256.32zM 319.248,160.00l 183.68,0.00 C 508.256,180.56, 512.00,201.744, 512.00,224.00c0.00,61.968-22.88,118.032-59.568,162.32L 319.248,160.00zM 264.00,320.00l-86.528,146.432C 105.472,443.088, 47.248,389.664, 19.008,320.00L 264.00,320.00 zM 250.128,128.00l 86.256-145.872c 71.184,23.744, 128.624,76.816, 156.624,145.872L 250.128,128.00 zM 193.68,288.00L 9.056,288.00 C 3.712,267.44,0.00,246.256,0.00,224.00c0.00-62.256, 23.12-118.56, 60.096-163.008L 193.68,288.00zM 174.688,192.624l-91.904-156.128C 128.432-5.632, 188.944-32.00, 256.00-32.00c 16.656,0.00, 32.88,1.872, 48.624,4.88
-			L 174.688,192.624z" />
-<glyph unicode="&#xe18c;" d="M 256.00,160.00A64.00,64.00 1620.00 1,0 384.00,160A64.00,64.00 1620.00 1,0 256.00,160zM 448.00,352.00l-52.624,106.288C 391.056,470.912, 379.12,480.00, 364.992,480.00L 277.12,480.00 c-14.288,0.00-26.336-9.312-30.464-22.16
-			L 192.064,352.00L 64.00,352.00 c-35.344,0.00-64.00-28.656-64.00-64.00l0.00-320.00 l 512.00,0.00 L 512.00,288.00 C 512.00,323.344, 483.376,352.00, 448.00,352.00z M 96.00,224.00c-17.68,0.00-32.00,14.32-32.00,32.00s 14.32,32.00, 32.00,32.00s 32.00-14.32, 32.00-32.00
-			S 113.68,224.00, 96.00,224.00z M 320.00,32.00c-70.688,0.00-128.00,57.312-128.00,128.00s 57.312,128.00, 128.00,128.00s 128.00-57.312, 128.00-128.00S 390.688,32.00, 320.00,32.00z" />
-<glyph unicode="&#xe18d;" d="M 128.00,96.00L 128.00,224.00L 192.00,288.00L 256.00,224.00L 384.00,352.00L 512.00,224.00L 512.00,96.00 		zM 64.00,32.00L 64.00,480.00L0.00,416.00L0.00,32.00L0.00-32.00L 64.00-32.00L 448.00-32.00L 512.00,32.00 		z" />
-<glyph unicode="&#xe18e;" d="M0.00,128.00L 256.016,64.00L 512.00,128.00L 512.00,64.00L 256.016,0.00L0.00,64.00 		zM0.00,256.00L 256.016,192.00L 512.00,256.00L 512.00,192.00L 256.016,128.00L0.00,192.00 		zM0.00,384.00L 256.016,448.00L 512.00,384.00L 512.00,320.00L 256.016,256.00L0.00,320.00 		z" horiz-adv-x="511.9679870605469" />
-<glyph unicode="&#xe18f;" d="M0.00,96.00L 256.016,32.00L 512.00,96.00L 512.00,32.00L 256.016-32.00L0.00,32.00 		zM0.00,224.00L 256.016,160.00L 512.00,224.00L 512.00,160.00L 256.016,96.00L0.00,160.00 		zM0.00,352.00L 256.016,288.00L 512.00,352.00L 512.00,288.00L 256.016,224.00L0.00,288.00 		zM0.00,480.00L 256.016,416.00L 512.00,480.00L 512.00,416.00L 256.016,352.00L0.00,416.00 		z" horiz-adv-x="511.9679870605469" />
-<glyph unicode="&#xe190;" d="M 474.48,261.056c 49.936,49.904, 49.936,130.88,0.00,180.752c-24.944,24.944-57.68,37.44-90.368,37.44
-		c-32.656,0.00-65.408-12.496-90.336-37.44l-9.44-9.44L 236.752,480.00l-45.12-45.152l 47.632-47.60L0.00,147.84l0.00-115.968 L 62.88-32.00l 118.624,0.00 l 238.416,238.496
-		l 46.00-46.032l 45.184,45.12l-46.064,46.032L 474.48,261.056z M 165.12,42.128c 0.752,24.256-7.632,48.56-26.064,67.008
-		c-16.944,16.992-39.056,25.312-61.312,26.064L 284.448,341.968l 90.288-90.224L 165.12,42.128z" horiz-adv-x="511.9360046386719" />
-<glyph unicode="&#xe191;" d="M 192.00,96.00c0.00,35.376-28.688,64.00-64.00,64.00c-35.376,0.00-64.00-28.624-64.00-64.00l0.00-0.128 c0.00-47.312-25.744-88.56-64.00-110.688l 0.256-0.192
-			C 19.008-25.808, 40.752-32.00, 64.00-32.00C 134.688-32.00, 192.00,25.312, 192.00,96.00L 192.00,96.00zM 493.216,461.248c-24.992,24.992-65.504,24.992-90.496,0.00L 160.752,219.248c 44.128-11.808, 78.752-46.368, 90.496-90.56
-			L 493.216,370.752C 518.224,395.744, 518.224,436.256, 493.216,461.248z" horiz-adv-x="511.9679870605469" />
-<glyph unicode="&#xe192;" d="M 493.216,461.248c-24.992,24.992-65.504,24.992-90.496,0.00L 220.32,278.88c 42.256-15.056, 75.504-48.32, 90.496-90.56
-				l 182.40,182.432C 518.224,395.744, 518.224,436.256, 493.216,461.248zM 255.936,138.688c0.00,47.12-38.256,85.312-85.376,85.312s-85.312-38.192-85.312-85.312l 0.064-0.064
-			C 85.248,75.504, 50.944,20.432,0.00-9.056l 0.256-0.32C 25.312-23.744, 54.32-32.00, 85.312-32.00C 179.568-32.00, 256.00,44.432, 256.00,138.688L 255.936,138.688 z" horiz-adv-x="511.9679870605469" />
-<glyph unicode="&#xe193;" d="M 493.233,461.249c-24.991,24.991-65.502,24.991-90.493,0.00l-241.992-242.072
-			c 21.631-5.632, 41.631-16.495, 57.87-32.751c 16.495-16.495, 27.007-36.623, 32.623-57.742l 241.992,242.072C 518.24,395.747, 518.24,436.257, 493.233,461.249z
-			M 173.371,50.685c 24.991,24.991, 24.991,65.502,0.00,90.493s-65.502,24.991-90.493,0.00L0.00-32.00L 173.371,50.685z" horiz-adv-x="511.9840087890625" />
-<glyph unicode="&#xe194;" d="M 474.496,442.496c-49.936,50.00-131.056,50.00-180.992,0.00L 0.496,149.504L0.00-32.00l 180.992,0.00 l 293.504,293.504
-				C 524.496,311.504, 524.496,392.496, 474.496,442.496z M 153.808,32.00L 63.312,32.00 l0.00,91.008 c 24.992,24.992, 65.504,24.992, 90.496,0.00S 178.816,56.992, 153.808,32.00z
-				 M 428.064,306.752l-90.496,90.496c 24.992,24.992, 65.504,24.992, 90.496,0.00S 453.056,331.744, 428.064,306.752z" />
-<glyph unicode="&#xe195;" d="M 474.496,442.496C 449.504,467.504, 416.752,480.00, 384.00,480.00s-65.504-12.496-90.496-37.504L 0.496,149.504L0.00-32.00l 180.992,0.00
-		l 293.504,293.504C 524.496,311.504, 524.496,392.496, 474.496,442.496z M 154.496,32.00L 153.808,32.00 c 24.992,24.992, 24.992,66.00,0.00,91.008
-		c-23.936,23.936-61.744,24.256-86.88,2.368L 338.192,396.624l 90.496-90.496L 154.496,32.00z" />
-<glyph unicode="&#xe196;" d="M 474.496,442.496C 449.568,467.504, 416.816,480.00, 384.00,480.00c-32.752,0.00-65.504-12.496-90.496-37.504L 0.496,149.504L0.00-32.00
-		l 180.992,0.00 l 293.504,293.504C 524.496,311.504, 524.496,392.496, 474.496,442.496z M 154.496,32.00L 128.00,32.00 l0.00,64.00 L 64.368,96.00 l 0.064,26.88L 338.752,397.248l0.00,0.00l 90.496-90.496
-		l0.00,0.00L 154.496,32.00z" />
-<glyph unicode="&#xe197;" d="M 256.00,384.00c0.00,0.00-64.00,64.00-256.00,64.00l0.00-384.00 c 194.00,0.00, 256.00-64.00, 256.00-64.00s 62.00,64.00, 256.00,64.00L 512.00,448.00 C 320.00,448.00, 256.00,384.00, 256.00,384.00z M 64.00,384.00
-		c 81.344-6.816, 131.248-25.632, 160.00-40.88l0.00-257.744 c-28.752,15.184-78.656,34.00-160.00,40.88L 64.00,384.00 z M 448.00,126.256c-81.376-6.88-131.248-25.664-160.00-40.88
-		L 288.00,343.12 C 316.752,358.368, 366.624,377.184, 448.00,384.00L 448.00,126.256 z" />
-<glyph unicode="&#xe198;" d="M 512.00,416.00l-64.00,0.00 L 448.00,480.00 L 64.00,480.00 C 28.80,480.00,0.00,451.20,0.00,416.00l0.00-384.00 c0.00-35.20, 28.80-64.00, 64.00-64.00l 384.00,0.00 L 448.00,288.00 l 64.00,0.00 l-64.00,64.00L 512.00,416.00z M 384.00,32.00L 128.00,32.00 L 128.00,416.00 l 256.00,0.00 L 384.00,32.00 zM 192.00,352.00L 320.00,352.00L 320.00,288.00L 192.00,288.00z" />
-<glyph unicode="&#xe199;" d="M 64.00,480.00C 28.80,480.00,0.00,451.20,0.00,416.00l0.00-384.00 c0.00-35.20, 28.80-64.00, 64.00-64.00l 384.00,0.00 L 448.00,480.00 L 64.00,480.00 z M 384.00,32.00L 128.00,32.00 L 128.00,416.00 l 64.00,0.00 l0.00-128.00 l 64.00,64.00l 64.00-64.00L 320.00,416.00 l 64.00,0.00 L 384.00,32.00 z" horiz-adv-x="448" />
-<glyph unicode="&#xe19a;" d="M0.00,443.429A36.571,36.571 1620.00 1,0 73.143,443.429A36.571,36.571 1620.00 1,0 0.00,443.429zM 146.286,480.00L 585.143,480.00L 585.143,406.857L 146.286,406.857zM 146.286,297.143A36.571,36.571 1620.00 1,0 219.429,297.14300000000003A36.571,36.571 1620.00 1,0 146.286,297.14300000000003zM 292.571,333.714L 585.143,333.714L 585.143,260.571L 292.571,260.571zM 146.286,4.571A36.571,36.571 1620.00 1,0 219.429,4.571000000000026A36.571,36.571 1620.00 1,0 146.286,4.571000000000026zM 292.571,41.143L 585.143,41.143L 585.143-32.00L 292.571-32.00zM 292.571,150.857A36.571,36.571 1620.00 1,0 365.714,150.85700000000003A36.571,36.571 1620.00 1,0 292.571,150.85700000000003zM 438.857,187.429L 585.143,187.429L 585.143,114.286L 438.857,114.286z" horiz-adv-x="585.1428833007812" />
-<glyph unicode="&#xe19b;" d="M0.00,443.431A36.569,36.569 1620.00 1,0 73.138,443.431A36.569,36.569 1620.00 1,0 0.00,443.431zM0.00,297.136A36.569,36.569 1620.00 1,0 73.138,297.13599999999997A36.569,36.569 1620.00 1,0 0.00,297.13599999999997zM0.00,150.859A36.569,36.569 1620.00 1,0 73.138,150.85899999999998A36.569,36.569 1620.00 1,0 0.00,150.85899999999998zM0.00,4.565A36.569,36.569 1620.00 1,0 73.138,4.564999999999998A36.569,36.569 1620.00 1,0 0.00,4.564999999999998zM 146.295,480.00L 585.106,480.00L 585.106,406.862L 146.295,406.862zM 146.295,333.705L 585.106,333.705L 585.106,260.567L 146.295,260.567zM 146.295,187.429L 585.106,187.429L 585.106,114.29L 146.295,114.29zM 146.295,41.134L 585.106,41.134L 585.106-32.005L 146.295-32.005z" horiz-adv-x="585.1062622070312" />
-<glyph unicode="&#xe19c;" d="M 512.00,416.00L0.00,416.00L0.00,480.00L 512.00,480.00 		zM 320.00,288.00L0.00,288.00L0.00,352.00L 320.00,352.00 		zM 512.00,160.00L0.00,160.00L0.00,224.00L 512.00,224.00 		zM0.00,0.00A32.00,32.00 1620.00 1,0 64.00,0A32.00,32.00 1620.00 1,0 0.00,0zM 256.00,0.00A32.00,32.00 1620.00 1,0 320.00,0A32.00,32.00 1620.00 1,0 256.00,0zM 128.00,0.00A32.00,32.00 1620.00 1,0 192.00,0A32.00,32.00 1620.00 1,0 128.00,0z" />
-<glyph unicode="&#xe19d;" d="M 512.00,416.00L0.00,416.00L0.00,480.00L 512.00,480.00 		zM 320.00,288.00L0.00,288.00L0.00,352.00L 320.00,352.00 		zM 512.00,96.00L0.00,96.00L0.00,160.00L 512.00,160.00 		zM 384.00-32.00L0.00-32.00L0.00,32.00L 384.00,32.00 		zM 512.00,0.00c0.00-17.68-14.352-32.00-31.968-32.00C 462.304-32.00, 448.00-17.68, 448.00,0.00s 14.304,32.00, 32.032,32.00C 497.648,32.00, 512.00,17.68, 512.00,0.00z" />
-<glyph unicode="&#xe19e;" d="M0.00,416.00L0.00,32.00L 192.00,224.00L 192.00,416.00 		zM 320.00,416.00L 320.00,32.00L 512.00,224.00L 512.00,416.00 		z" />
-<glyph unicode="&#xe19f;" d="M 512.00,32.00L 512.00,416.00L 320.00,224.00L 320.00,32.00 		zM 192.00,32.00L 192.00,416.00L0.00,224.00L0.00,32.00 		z" />
-<glyph unicode="&#xe1a0;" d="M0.00,416.00l0.00-192.00 l 128.00,0.00 c0.00-70.56-57.376-128.00-128.00-128.00l0.00-64.00 c 105.872,0.00, 192.00,86.128, 192.00,192.00L 192.00,416.00 L0.00,416.00 zM 320.00,416.00l0.00-192.00 l 128.00,0.00 c0.00-70.56-57.376-128.00-128.00-128.00l0.00-64.00 c 105.872,0.00, 192.00,86.128, 192.00,192.00L 512.00,416.00 L 320.00,416.00 z" />
-<glyph unicode="&#xe1a1;" d="M 512.00,32.00L 512.00,224.00 l-128.00,0.00 c0.00,70.56, 57.376,128.00, 128.00,128.00L 512.00,416.00 c-105.872,0.00-192.00-86.128-192.00-192.00l0.00-192.00 L 512.00,32.00 zM 192.00,32.00L 192.00,224.00 L 64.00,224.00 c0.00,70.56, 57.376,128.00, 128.00,128.00L 192.00,416.00 C 86.128,416.00,0.00,329.872,0.00,224.00l0.00-192.00 L 192.00,32.00 z" />
-<glyph unicode="&#xe1a2;" d="M 448.00,288.00L 448.00,352.00 l-80.064,0.00 l 16.00,128.00l-64.00,0.00 l-16.00-128.00l-127.968,0.00 l 16.00,128.00l-64.00,0.00 l-16.00-128.00L0.00,352.00 l0.00-64.00 l 103.968,0.00 L 88.00,160.00L0.00,160.00 l0.00-64.00 l 80.00,0.00 l-16.00-128.00l 64.00,0.00 l 16.00,128.00l 127.968,0.00 l-16.00-128.00L 320.00-32.00
-		l 16.00,128.00l 112.00,0.00 l0.00,64.00 l-104.00,0.00 l 15.936,128.00L 448.00,288.00 z M 279.968,160.00L 152.00,160.00 l 15.968,128.00l 127.968,0.00 L 279.968,160.00z" horiz-adv-x="448" />
-<glyph unicode="&#xe1a3;" d="M 384.00,480.00l-64.00,0.00 l-64.00,0.00 l-64.00,0.00 L 128.00,480.00 C 57.312,480.00,0.00,422.688,0.00,352.00s 57.312-128.00, 128.00-128.00l0.00-256.00 l 64.00,0.00 L 192.00,416.00 l 64.00,0.00 l0.00-448.00 l 64.00,0.00 L 320.00,416.00 l 64.00,0.00 L 384.00,480.00 z" horiz-adv-x="384" />
-<glyph unicode="&#xe1a4;" d="M 89.60,0.00A32.00,32.00 1620.00 1,0 153.60,0A32.00,32.00 1620.00 1,0 89.60,0zM 122.816,64.368c-21.376,0.00-41.44,8.32-56.56,23.44s-23.44,35.184-23.44,56.56s 8.32,41.44, 23.44,56.56
-			l 107.008,107.008C 185.376,320.032, 192.00,336.096, 192.00,353.184s-6.624,33.152-18.752,45.248c-24.944,24.96-65.536,25.008-90.464,0.00
-			C 70.656,386.336, 64.00,370.288, 64.00,353.184L0.00,353.184 c0.00,34.192, 13.344,66.352, 37.568,90.544c 48.32,48.368, 132.56,48.336, 180.944-0.032
-			C 242.688,419.552, 256.00,387.408, 256.00,353.184c0.00-34.192-13.312-66.32-37.504-90.496L 111.504,155.68c-6.224-6.256-6.224-16.368,0.00-22.624
-			c 6.256-6.256, 16.368-6.256, 22.624,0.00c 4.064,4.064, 4.688,8.88, 4.688,11.312l 64.00,0.00 c0.00-21.376-8.32-41.44-23.44-56.56
-			S 144.192,64.368, 122.816,64.368L 122.816,64.368z" horiz-adv-x="256" />
-<glyph unicode="&#xe1a5;" d="M 32.00,224.00c 17.68,0.00, 32.00-14.32, 32.00-32.00l0.00-128.00 c0.00-17.68-14.32-32.00-32.00-32.00L0.00,32.00 l0.00-64.00 l 256.00,0.00 l0.00,64.00 l-31.872,0.00 C 206.496,32.00, 192.00,46.32, 192.00,64.00l-0.064,224.00L0.00,288.00
-			l0.00-64.00 L 32.00,224.00 zM 64.00,416.00A64.00,64.00 1620.00 1,0 192.00,416A64.00,64.00 1620.00 1,0 64.00,416z" horiz-adv-x="256" />
-<glyph unicode="&#xe1a6;" d="M 147.392-32.00c-37.744,0.00-75.504,14.368-104.32,43.056c-57.44,57.568-57.44,151.184,0.00,208.624l 129.808,127.008
-		c 7.376,7.44, 11.632,17.632, 11.632,28.56c0.00,10.88-4.256,21.12-11.872,28.88C 156.768,420.00, 130.896,419.936, 114.896,404.064
-		C 99.136,388.192, 99.136,362.32, 115.008,346.432L 69.696,301.12C 28.896,342.00, 28.896,408.432, 69.648,449.312c 40.992,40.944, 107.376,40.88, 148.224,0.064
-		c 19.872-19.808, 30.752-46.192, 30.752-74.192c0.00-28.00-10.88-54.32-30.752-74.064l-129.776-126.944c-32.32-32.256-32.32-85.248, 0.32-117.808
-		c 32.496-32.56, 85.504-32.496, 118.128,0.00c 32.464,32.56, 32.464,85.568,0.00,118.064l-22.752,22.624l 69.60,69.568l 45.248-45.248l-26.752-26.752
-		c 36.256-56.992, 29.632-133.744-20.128-183.504C 222.992-17.632, 185.136-32.00, 147.392-32.00L 147.392-32.00z" horiz-adv-x="298.6080017089844" />
-<glyph unicode="&#xe1a7;" d="M 477.504,96.00C 499.44,133.68, 512.00,177.248, 512.00,224.00c0.00,141.376-114.624,256.00-256.00,256.00S0.00,365.376,0.00,224.00s 114.624-256.00, 256.00-256.00
-		c 70.688,0.00, 134.688,28.624, 180.992,75.008L 391.68,88.32C 356.944,53.504, 308.944,32.00, 256.00,32.00C 150.128,32.00, 64.00,118.128, 64.00,224.00S 150.128,416.00, 256.00,416.00s 192.00-86.128, 192.00-192.00
-		c0.00-22.752-4.368-44.496-11.68-64.752L 435.808,160.00L 384.00,160.00 L 384.00,351.312 l-128.00,0.00 c-70.688,0.00-128.00-57.312-128.00-128.00s 57.312-128.00, 128.00-128.00c 29.376,0.00, 56.128,10.32, 77.744,26.944
-		C 345.376,106.752, 363.12,96.00, 384.00,96.00L 477.504,96.00 z M 320.00,255.872l0.00-32.56 c0.00-35.312-28.752-64.00-64.00-64.00s-64.00,28.688-64.00,64.00s 28.752,64.00, 64.00,64.00l 64.00,0.00 L 320.00,255.872 z" />
-<glyph unicode="&#xe1a8;" d="M 512.00,0.00c0.00-17.68-14.32-32.00-32.00-32.00L 32.00-32.00 c-17.68,0.00-32.00,14.32-32.00,32.00L0.00,288.00 l 512.00,0.00 L 512.00,0.00 zM 192.00,415.968L 192.00,480.00L0.00,480.00L0.00,352.00L 512.00,352.00L 512.00,415.968 		z" />
-<glyph unicode="&#xe1a9;" d="M 256.00,415.968L 256.00,480.00 L0.00,480.00 l0.00-448.00 c0.00-35.376, 28.624-64.00, 64.00-64.00l 384.00,0.00 c 35.312,0.00, 64.00,28.624, 64.00,64.00L 512.00,415.968 L 256.00,415.968 z M 448.00,223.936L 448.00,32.00 L 64.00,32.00 L 64.00,224.00 l 384.00,0.00 L 448.00,223.936 z
-	 M 448.00,288.00L 64.00,288.00 L 64.00,416.00 l 128.00,0.00 l0.00-0.032 L 192.00,352.00 l 256.00,0.00 L 448.00,288.00 z" />
-<glyph unicode="&#xe1aa;" d="M0.00,288.00L 512.00,288.00L 512.00-32.00L0.00-32.00zM 288.00,352.00L 512.00,352.00L 448.00,480.00L 288.00,480.00 		zM 224.00,480.00L 64.00,480.00L0.00,352.00L 224.00,352.00 		z" />
-<glyph unicode="&#xe1ab;" d="M 290.00,257.936c 12.752-12.784, 16.128-30.88, 11.504-47.088L 384.00,352.00l-139.248-82.224
-				C 260.496,273.664, 277.68,270.256, 290.00,257.936zM 222.128,190.064c-12.368,12.336-15.744,29.60-11.872,45.376L 128.00,96.00l 141.312,82.56
-				C 253.056,173.872, 234.944,177.248, 222.128,190.064zM 256.00,416.00c 105.872,0.00, 192.00-86.128, 192.00-192.00s-86.128-192.00-192.00-192.00S 64.00,118.128, 64.00,224.00S 150.128,416.00, 256.00,416.00 M 256.00,480.00
-			C 114.624,480.00,0.00,365.376,0.00,224.00s 114.624-256.00, 256.00-256.00s 256.00,114.624, 256.00,256.00S 397.376,480.00, 256.00,480.00L 256.00,480.00z" />
-<glyph unicode="&#xe1ac;" d="M 448.00,288.00l0.00,32.00 c0.00,17.60-14.40,32.00-32.00,32.00L 32.00,352.00 c-17.60,0.00-32.00-14.40-32.00-32.00l0.00-64.00 l 101.584,0.00 c 13.20,37.264, 48.64,64.00, 90.416,64.00l0.00-32.00 l 64.00,0.00 l0.00-32.00 l-64.00,0.00 l0.00-64.00 l 64.00,0.00 l0.00-32.00 l-64.00,0.00 l0.00-32.00
-	c-41.776,0.00-77.232,26.736-90.416,64.00L0.00,192.00 l0.00-64.00 c0.00-17.60, 14.40-32.00, 32.00-32.00l 384.00,0.00 c 17.60,0.00, 32.00,14.40, 32.00,32.00l0.00,32.00 l 64.00,0.00 l0.00,128.00 L 448.00,288.00 z" />
-<glyph unicode="&#xe1ad;" d="M 448.00,288.00l0.00,32.00 c0.00,17.60-14.40,32.00-32.00,32.00L 32.00,352.00 c-17.60,0.00-32.00-14.40-32.00-32.00l0.00-192.00 c0.00-17.60, 14.40-32.00, 32.00-32.00l 384.00,0.00 c 17.60,0.00, 32.00,14.40, 32.00,32.00l0.00,32.00 l 64.00,0.00 l0.00,128.00 L 448.00,288.00 z" />
-<glyph unicode="&#xe1ae;" d="M 512.00,288.00l-64.00,0.00 l0.00,32.00 c0.00,17.60-14.368,32.00-32.00,32.00L 32.00,352.00 c-17.632,0.00-32.00-14.40-32.00-32.00l0.00-192.00 c0.00-17.632, 14.368-32.00, 32.00-32.00l 384.00,0.00 c 17.632,0.00, 32.00,14.368, 32.00,32.00l0.00,32.00 l 64.00,0.00
-		L 512.00,288.00 z M 384.00,160.00l-128.00,0.00 l0.00,128.00 l 128.00,0.00 L 384.00,160.00 z" />
-<glyph unicode="&#xe1af;" d="M 512.00,288.00l-64.00,0.00 l0.00,32.00 c0.00,17.568-14.368,32.00-32.00,32.00L 32.00,352.00 c-17.632,0.00-32.00-14.432-32.00-32.00l0.00-192.00 c0.00-17.568, 14.368-32.00, 32.00-32.00l 384.00,0.00
-	c 17.632,0.00, 32.00,14.432, 32.00,32.00l0.00,32.00 l 64.00,0.00 L 512.00,288.00 z M 384.00,160.00L 64.00,160.00 L 64.00,288.00 l 320.00,0.00 L 384.00,160.00 z" />
-<glyph unicode="&#xe1b0;" d="M 256.00,480.00L 128.00,480.00 C 57.312,480.00,0.00,422.688,0.00,352.00l0.00-256.00 c0.00-70.688, 57.312-128.00, 128.00-128.00l 128.00,0.00 c 70.688,0.00, 128.00,57.312, 128.00,128.00L 384.00,352.00
-		C 384.00,422.688, 326.688,480.00, 256.00,480.00z M 192.00-0.992c-18.224,0.00-32.992,14.752-32.992,32.992s 14.784,32.992, 32.992,32.992s 32.992-14.752, 32.992-32.992
-		S 210.224-0.992, 192.00-0.992z M 320.00,96.00L 64.00,96.00 L 64.00,352.00 c0.00,35.248, 28.72,64.00, 64.00,64.00l 128.00,0.00 c 35.248,0.00, 64.00-28.752, 64.00-64.00L 320.00,96.00 z" horiz-adv-x="384" />
-<glyph unicode="&#xe1b1;" d="M 470.624,54.624L 365.248,160.00L 320.00,114.752L 425.376,9.376L 384.00-32.00L 512.00-32.00L 512.00,96.00 		zM 41.376,393.376L 146.752,288.00L 192.00,333.248L 86.624,438.624L 128.00,480.00L0.00,480.00L0.00,352.00 		zM 425.376,438.624L 320.00,333.248L 365.248,288.00L 470.624,393.376L 512.00,352.00L 512.00,480.00L 384.00,480.00 		zM 192.00,114.752L 146.752,160.00L 41.376,54.624L0.00,96.00L0.00-32.00L 128.00-32.00L 86.624,9.376 		z" />
-<glyph unicode="&#xe1b2;" d="M 438.624,86.624L 365.248,160.00L 320.00,114.752L 393.376,41.376L 320.00-32.00L 512.00-32.00L 512.00,160.00 		zM 192.00,480.00L0.00,480.00L0.00,288.00L 73.376,361.376L 146.064,288.752L 191.312,334.00L 118.624,406.624 		zM 192.00,114.752L 146.752,160.00L 73.376,86.624L0.00,160.00L0.00-32.00L 192.00-32.00L 118.624,41.376 		zM 512.00,480.00L 320.00,480.00L 393.376,406.624L 320.688,334.00L 365.936,288.752L 438.624,361.376L 512.00,288.00 		z" />
-<glyph unicode="&#xe1b3;" d="M 448.00,160.00L 320.00,160.00L 320.00,32.00L 361.376,73.376L 466.752-32.00L 512.00,13.248L 406.624,118.624 	zM 406.624,329.376L 512.00,434.752L 466.752,480.00L 361.376,374.624L 320.00,416.00L 320.00,288.00L 448.00,288.00 	zM 45.248,480.00L0.00,434.752L 105.376,329.376L 64.00,288.00L 192.00,288.00L 192.00,416.00L 150.624,374.624 	zM 105.376,118.624L0.00,13.248L 45.248-32.00L 150.624,73.376L 192.00,32.00L 192.00,160.00L 64.00,160.00 	z" />
-<glyph unicode="&#xe1b4;" d="M 393.376,41.376L 466.752-32.00L 512.00,13.248L 438.624,86.624L 512.00,160.00L 320.00,160.00L 320.00-32.00 		zM0.00,288.00L 192.00,288.00L 192.00,480.00L 118.624,406.624L 46.00,479.312L 0.752,434.064L 73.376,361.376 		zM0.00,13.248L 45.248-32.00L 118.624,41.376L 192.00-32.00L 192.00,160.00L0.00,160.00L 73.376,86.624 		zM 320.00,288.00L 512.00,288.00L 438.624,361.376L 511.376,434.064L 466.128,479.312L 393.376,406.624L 320.00,480.00 		z" />
-<glyph unicode="&#xe1b5;" d="M 256.00,480.00C 114.624,480.00,0.00,365.376,0.00,224.00s 114.624-256.00, 256.00-256.00s 256.00,114.624, 256.00,256.00S 397.376,480.00, 256.00,480.00z M 160.00,96.00L 160.00,352.00 l 256.128-128.00L 160.00,96.00z
-		" />
-<glyph unicode="&#xe1b6;" d="M0.00,480.00L 384.00,224.00L0.00-32.00 		zM 384.00,416.00L 512.00,416.00L 512.00,32.00L 384.00,32.00z" />
-<glyph unicode="&#xe1b7;" d="M 512.00-32.00L 128.00,224.00L 512.00,480.00 		zM0.00,416.00L 128.00,416.00L 128.00,32.00L0.00,32.00z" />
-<glyph unicode="&#xe1b8;" d="M0.00,160.00L 256.00,480.00L 512.00,160.00 		zM0.00,96.00L 511.312,96.00L 511.312-32.00L0.00-32.00z" />
-<glyph unicode="&#xe1b9;" d="M0.00,480.00L 512.00,480.00L 512.00-32.00L0.00-32.00z" />
-<glyph unicode="&#xe1ba;" d="M0.00,480.00L 128.00,480.00L 128.00-32.00L0.00-32.00zM 256.00,480.00L 384.00,480.00L 384.00-32.00L 256.00-32.00z" horiz-adv-x="384" />
-<glyph unicode="&#xe1bb;" d="M0.00,480.00L 384.00,224.00L0.00-32.00 	z" horiz-adv-x="384" />
-<glyph unicode="&#xe1bc;" d="M 128.00,96.00c-70.688,0.00-128.00,57.312-128.00,128.00s 57.312,128.00, 128.00,128.00L 128.00,96.00 zM 192.00,352.00L 320.00,416.00L 320.00,32.00L 192.00,96.00 			zM 512.00,192.00L 384.00,192.00L 384.00,256.00L 512.00,256.00 		z" />
-<glyph unicode="&#xe1bd;" d="M 128.00,96.00c-70.688,0.00-128.00,57.312-128.00,128.00s 57.312,128.00, 128.00,128.00L 128.00,96.00 zM 192.00,352.00L 320.00,416.00L 320.00,32.00L 192.00,96.00 			zM 384.064,96.064l0.00,64.00 c 5.312,0.00, 10.688,0.688, 16.064,2.00C 428.192,169.184, 448.00,194.688, 448.00,224.00
-			s-19.808,54.752-48.192,61.936c-5.056,1.248-10.432,1.936-15.744,1.936l0.00,64.00 c 10.496,0.00, 21.008-1.312, 31.312-3.808C 472.32,333.568, 512.00,282.624, 512.00,224.00
-			c0.00-58.688-39.68-109.68-96.432-124.064C 404.944,97.376, 394.432,96.064, 384.064,96.064L 384.064,96.064z" />
-<glyph unicode="&#xe1be;" d="M 480.00,192.00l-32.00,0.00 l0.00,64.00 c0.00,106.00-86.00,192.00-192.00,192.00S 64.00,362.00, 64.00,256.00l0.00-64.00 L 32.00,192.00 c-17.68,0.00-32.00-14.32-32.00-32.00l0.00-128.00 c0.00-17.68, 14.32-32.00, 32.00-32.00l 96.00,0.00 L 128.00,256.00
-	c0.00,70.624, 57.376,128.00, 128.00,128.00s 128.00-57.376, 128.00-128.00l0.00-256.00 l 96.00,0.00 c 17.68,0.00, 32.00,14.32, 32.00,32.00l0.00,128.00 C 512.00,177.68, 497.68,192.00, 480.00,192.00z" />
-<glyph unicode="&#xe1bf;" d="M 192.00,224.00c 35.376,0.00, 64.00,28.656, 64.00,64.00L 256.00,416.00 c0.00,35.344-28.624,64.00-64.00,64.00S 128.00,451.344, 128.00,416.00l0.00-128.00 C 128.00,252.656, 156.624,224.00, 192.00,224.00zM 256.00,32.00l-32.00,0.00 l0.00,67.248 C 314.624,114.56, 384.00,193.088, 384.00,288.00l0.00,31.008 c0.00,17.68-14.32,32.00-32.00,32.00s-32.00-14.32-32.00-32.00L 320.00,288.00
-			c0.00-70.592-57.376-128.00-128.00-128.00s-128.00,57.408-128.00,128.00l0.00,31.008 c0.00,17.68-14.32,32.00-32.00,32.00s-32.00-14.32-32.00-32.00L0.00,288.00 c0.00-94.912, 69.376-173.44, 160.00-188.752L 160.00,32.00 L 128.00,32.00
-			c-35.376,0.00-64.00-28.624-64.00-64.00l 256.00,0.00 C 320.00,3.376, 291.376,32.00, 256.00,32.00z" horiz-adv-x="384" />
-<glyph unicode="&#xe1c0;" d="M 256.00,480.00C 114.624,480.00,0.00,365.376,0.00,224.00s 114.624-256.00, 256.00-256.00s 256.00,114.624, 256.00,256.00S 397.376,480.00, 256.00,480.00z M 256.00,416.00
-		c 83.312,0.00, 153.68-53.664, 180.256-128.00L 75.744,288.00 C 102.32,362.336, 172.688,416.00, 256.00,416.00z M 256.00,192.00c-17.68,0.00-32.00,14.32-32.00,32.00s 14.32,32.00, 32.00,32.00s 32.00-14.32, 32.00-32.00
-		S 273.68,192.00, 256.00,192.00z M 64.00,224.00c 87.44,0.00, 158.256-84.256, 159.744-188.752C 133.248,50.752, 64.00,129.184, 64.00,224.00z M 288.256,35.248
-		C 289.744,139.744, 360.56,224.00, 448.00,224.00C 448.00,129.184, 378.752,50.752, 288.256,35.248z" />
-<glyph unicode="&#xe1c1;" d="M 256.00,480.00C 114.624,480.00,0.00,365.376,0.00,224.00s 114.624-256.00, 256.00-256.00s 256.00,114.624, 256.00,256.00S 397.376,480.00, 256.00,480.00z M 256.496,161.056
-				c-35.008,0.00-63.44,28.368-63.44,63.44c0.00,35.12, 28.432,63.504, 63.44,63.504C 291.632,288.00, 320.00,259.632, 320.00,224.496
-				C 320.00,189.44, 291.632,161.056, 256.496,161.056z" />
-<glyph unicode="&#xe1c2;" d="M 512.00,224.00c0.00,141.376-114.624,256.00-256.00,256.00S0.00,365.376,0.00,224.00s 114.624-256.00, 256.00-256.00S 512.00,82.624, 512.00,224.00z M 192.00,128.00l 32.00,0.00 L 224.00,384.00 l 64.00,0.00 l0.00-256.00 l 32.00,0.00
-		l-64.00-64.00L 192.00,128.00z" />
-<glyph unicode="&#xe1c3;" d="M 256.00,480.00C 114.624,480.00,0.00,365.376,0.00,224.00c0.00-141.392, 114.624-256.00, 256.00-256.00c 141.392,0.00, 256.00,114.608, 256.00,256.00C 512.00,365.376, 397.392,480.00, 256.00,480.00z M 256.00,96.00
-	l-128.00,128.00l 96.00,0.00 L 224.00,352.00 l 64.00,0.00 l0.00-128.00 l 96.00,0.00 L 256.00,96.00z" />
-<glyph unicode="&#xe1c4;" d="M 192.00,480.00L 192.00,224.00L 96.00,320.00L0.00,224.00L 256.00-32.00L 512.00,224.00L 416.00,320.00L 320.00,224.00L 320.00,480.00 z" />
-<glyph unicode="&#xe1c5;" d="M0.00,224.00c0.00-141.376, 114.624-256.00, 256.00-256.00s 256.00,114.624, 256.00,256.00S 397.376,480.00, 256.00,480.00S0.00,365.376,0.00,224.00z M 320.00,320.00l-32.00,0.00 l0.00-256.00 l-64.00,0.00 L 224.00,320.00 l-32.00,0.00
-		l 64.00,64.00L 320.00,320.00z" />
-<glyph unicode="&#xe1c6;" d="M 256.00-32.00c 141.376,0.00, 256.00,114.624, 256.00,256.00c0.00,141.392-114.624,256.00-256.00,256.00C 114.608,480.00,0.00,365.392,0.00,224.00C0.00,82.624, 114.608-32.00, 256.00-32.00z M 256.00,352.00
-	l 128.00-128.00l-96.00,0.00 l0.00-128.00 l-64.00,0.00 l0.00,128.00 L 128.00,224.00 L 256.00,352.00z" />
-<glyph unicode="&#xe1c7;" d="M 320.00-32.00L 320.00,224.00L 416.00,128.00L 512.00,224.00L 256.00,480.00L0.00,224.00L 96.00,128.00L 192.00,224.00L 192.00-32.00 z" />
-<glyph unicode="&#xe1c8;" d="M 256.00,480.00C 114.624,480.00,0.00,365.376,0.00,224.00s 114.624-256.00, 256.00-256.00s 256.00,114.624, 256.00,256.00S 397.376,480.00, 256.00,480.00z M 352.00,160.00l0.00,32.00 L 96.00,192.00 l0.00,64.00 l 256.00,0.00 l0.00,32.00 l 64.00-64.00
-		L 352.00,160.00z" />
-<glyph unicode="&#xe1c9;" d="M0.00,224.00c0.00-141.376, 114.624-256.00, 256.00-256.00c 141.392,0.00, 256.00,114.624, 256.00,256.00c0.00,141.392-114.608,256.00-256.00,256.00C 114.624,480.00,0.00,365.392,0.00,224.00z M 384.00,224.00
-	l-128.00-128.00l0.00,96.00 L 128.00,192.00 l0.00,64.00 l 128.00,0.00 L 256.00,352.00 L 384.00,224.00z" />
-<glyph unicode="&#xe1ca;" d="M0.00,160.00L 256.00,160.00L 160.00,64.00L 256.00-32.00L 512.00,224.00L 256.00,480.00L 160.00,384.00L 256.00,288.00L0.00,288.00 z" />
-<glyph unicode="&#xe1cb;" d="M 256.00-32.00c 141.376,0.00, 256.00,114.624, 256.00,256.00S 397.376,480.00, 256.00,480.00S0.00,365.376,0.00,224.00S 114.624-32.00, 256.00-32.00z M 160.00,288.00l0.00-32.00 l 256.00,0.00 l0.00-64.00 L 160.00,192.00 l0.00-32.00 l-64.00,64.00
-		L 160.00,288.00z" />
-<glyph unicode="&#xe1cc;" d="M 512.00,224.00c0.00,141.376-114.624,256.00-256.00,256.00C 114.608,480.00,0.00,365.376,0.00,224.00c0.00-141.392, 114.608-256.00, 256.00-256.00C 397.376-32.00, 512.00,82.608, 512.00,224.00z
-	 M 128.00,224.00l 128.00,128.00l0.00-96.00 l 128.00,0.00 l0.00-64.00 l-128.00,0.00 l0.00-96.00 L 128.00,224.00z" />
-<glyph unicode="&#xe1cd;" d="M 512.00,288.00L 256.00,288.00L 352.00,384.00L 256.00,480.00L0.00,224.00L 256.00-32.00L 352.00,64.00L 256.00,160.00L 512.00,160.00 z" />
-<glyph unicode="&#xe1ce;" d="M 512.00,224.00c0.00,141.376-114.624,256.00-256.00,256.00S0.00,365.376,0.00,224.00s 114.624-256.00, 256.00-256.00S 512.00,82.624, 512.00,224.00z M 160.00,192.00l0.00-32.00 l-64.00,64.00l 64.00,64.00l0.00-32.00
-		l 192.00,0.00 l0.00,32.00 l 64.00-64.00l-64.00-64.00l0.00,32.00 L 160.00,192.00 z" />
-<glyph unicode="&#xe1cf;" d="M 160.00,224.00L 192.00,192.00L 96.00,192.00L 96.00,128.00L0.00,224.00L 96.00,320.00L 96.00,256.00L 192.00,256.00 		zM 351.008,224.00L 320.00,256.00L 416.00,256.00L 416.00,320.00L 512.00,224.00L 416.00,128.00L 416.00,192.00L 320.00,192.00 		z" />
-<glyph unicode="&#xe1d0;" d="M 192.00,192.00L 96.00,192.00L 96.00,128.00L0.00,224.00L 96.00,320.00L 96.00,256.00L 192.00,256.00 		zM 320.00,256.00L 416.00,256.00L 416.00,320.00L 512.00,224.00L 416.00,128.00L 416.00,192.00L 320.00,192.00 		z" />
-<glyph unicode="&#xe1d1;" d="M 256.00,480.00C 114.624,480.00,0.00,365.376,0.00,224.00s 114.624-256.00, 256.00-256.00s 256.00,114.624, 256.00,256.00S 397.376,480.00, 256.00,480.00z M 288.00,128.00l 32.00,0.00 l-64.00-64.00l-64.00,64.00l 32.00,0.00 L 224.00,320.00
-		l-32.00,0.00 l 64.00,64.00l 64.00-64.00l-32.00,0.00 L 288.00,128.00 z" />
-<glyph unicode="&#xe1d2;" d="M 96.00,128.00L 128.00,160.00L 128.00,64.00L 192.00,64.00L 96.00-32.00L0.00,64.00L 64.00,64.00L 64.00,160.00 		zM 96.00,319.008L 64.00,288.00L 64.00,384.00L0.00,384.00L 96.00,480.00L 192.00,384.00L 128.00,384.00L 128.00,288.00 		z" horiz-adv-x="192" />
-<glyph unicode="&#xe1d3;" d="M 128.00,160.00L 128.00,64.00L 192.00,64.00L 96.00-32.00L0.00,64.00L 64.00,64.00L 64.00,160.00 		zM 64.00,288.00L 64.00,384.00L0.00,384.00L 96.00,480.00L 192.00,384.00L 128.00,384.00L 128.00,288.00 		z" horiz-adv-x="192" />
-<glyph unicode="&#xe1d4;" d="M 511.968,96.00L 127.872,96.00L 127.872,32.00L0.00,128.00L 127.872,224.00L 127.872,160.00L 511.968,160.00 		zM0.00,288.00L 383.968,288.00L 383.968,224.00L 511.968,320.00L 383.968,416.00L 383.968,352.00L0.00,352.00 		z" horiz-adv-x="511.9679870605469" />
-<glyph unicode="&#xe1d5;" d="M 448.00,192.00c0.00-17.632-14.368-32.00-32.00-32.00L 127.872,160.00 l0.00,64.00 L0.00,128.00l 127.872-96.00l0.00,64.00 L 416.00,96.00 c 52.944,0.00, 96.00,43.12, 96.00,96.00L 448.00,192.00 zM 96.00,288.00l 288.00,0.00 l0.00-64.00 l 128.00,96.00l-128.00,96.00l0.00-64.00 L 96.00,352.00 c-52.944,0.00-96.00-43.008-96.00-96.00l 64.00,0.00 C 64.00,273.632, 78.368,288.00, 96.00,288.00z" />
-<glyph unicode="&#xe1d6;" d="M 448.00,224.00l0.00-32.00 c0.00-17.632-14.368-32.00-32.00-32.00L 191.936,160.00 L 192.00,224.00l-128.00-96.00l 128.00-96.00l-0.064,64.00L 416.00,96.00 c 52.944,0.00, 96.00,43.12, 96.00,96.00l0.00,32.00 L 448.00,224.00 zM 64.00,256.00c0.00,17.68, 14.368,32.00, 32.00,32.00l 224.00,0.00 l0.00-64.00 l 127.872,96.00L 320.00,416.00l0.00-64.00 L 96.00,352.00 c-52.944,0.00-96.00-43.008-96.00-96.00l0.00-32.00 l 64.00,0.00 L 64.00,256.00 z" />
-<glyph unicode="&#xe1d7;" d="M 192.00,320.00L 128.00,320.00 L 128.00,352.00 c0.00,17.632, 14.368,32.00, 32.00,32.00l 192.00,0.00 c 17.632,0.00, 32.00-14.368, 32.00-32.00l0.00-32.00 l 64.00,0.00 L 448.00,352.00 c0.00,52.944-43.056,96.00-96.00,96.00L 160.00,448.00 C 107.056,448.00, 64.00,404.944, 64.00,352.00
-		l0.00-32.00 L0.00,320.00 l 96.00-128.00L 192.00,320.00zM 416.00,256.00l-96.00-128.00l 64.00,0.00 l0.00-32.00 c0.00-17.632-14.368-32.00-32.00-32.00L 160.00,64.00 c-17.632,0.00-32.00,14.368-32.00,32.00l0.00,32.00 L 64.00,128.00 l0.00-32.00 c0.00-52.944, 43.056-96.00, 96.00-96.00l 192.00,0.00
-		c 52.944,0.00, 96.00,43.056, 96.00,96.00l0.00,32.00 l 64.00,0.00 L 416.00,256.00z" />
-<glyph unicode="&#xe1d8;" d="M 192.00,320.00L 128.00,320.00 L 128.00,320.256 C 128.00,337.888, 142.368,352.00, 160.00,352.00l 192.00,0.00 c 17.632,0.00, 32.00-14.368, 32.00-32.00l0.00-32.00 l 64.00,0.00 l0.00,32.00 c0.00,52.944-43.056,96.00-96.00,96.00L 160.00,416.00
-		c-52.944,0.00-96.00-43.056-96.00-96.00L0.00,320.00 l 96.00-96.00L 192.00,320.00zM 416.00,224.00l-96.00-96.00l 64.00,0.00 l0.00-0.256 C 384.00,110.128, 369.632,96.00, 352.00,96.00L 160.00,96.00 c-17.632,0.00-32.00,14.368-32.00,32.00l0.00,32.00 L 64.00,160.00 l0.00-32.00 c0.00-52.944, 43.056-96.00, 96.00-96.00l 192.00,0.00
-		c 52.944,0.00, 96.00,43.056, 96.00,96.00l 64.00,0.00 L 416.00,224.00z" />
-<glyph unicode="&#xe1d9;" d="M 320.00,224.00l0.00-64.00 l 75.808,0.00 l-85.936-85.936c-54.224-54.336-148.944-54.336-203.216,0.00l-45.28-45.184
-		C 100.592-10.384, 152.816-32.00, 208.32-32.00c 55.536,0.00, 107.632,21.632, 146.80,60.88l 92.88,92.80L 448.00,32.00 l 64.00,0.00 L 512.00,224.00 L 320.00,224.00 zM 192.00,288.00L 116.192,288.00 l 85.936,85.936c 54.224,54.336, 148.944,54.336, 203.216,0.00l 45.28,45.184C 411.408,458.368, 359.184,480.00, 303.664,480.00
-		c-55.536,0.00-107.632-21.632-146.80-60.88L 64.00,326.32L 64.00,416.00 L0.00,416.00 l0.00-192.00 l 192.00,0.00 L 192.00,288.00 z" />
-<glyph unicode="&#xe1da;" d="M 384.00,192.00c0.00-70.624-57.376-128.00-128.00-128.00s-128.00,57.376-128.00,128.00s 57.376,128.00, 128.00,128.00l 64.00,0.00 l 0.368-64.32L 416.56,352.00l-96.192,96.00l0.00-64.00 L 256.00,384.00
-			C 150.00,384.00, 64.00,298.00, 64.00,192.00s 86.00-192.00, 192.00-192.00s 192.00,86.00, 192.00,192.00L 384.00,192.00 z" />
-<glyph unicode="&#xe1db;" d="M 384.00,192.00c0.00-70.56-57.376-128.00-128.00-128.00s-128.00,57.44-128.00,128.00s 57.376,128.00, 128.00,128.00l 37.744-0.432l-18.624-18.624l 45.248-45.248L 416.56,352.00
-			l-96.192,96.00l-45.248-45.248L 294.00,384.00L 256.00,384.00 C 150.00,384.00, 64.00,298.064, 64.00,192.00s 86.00-192.00, 192.00-192.00s 192.00,85.936, 192.00,192.00L 384.00,192.00 z" />
-<glyph unicode="&#xe1dc;" d="M 450.468,420.484c-79.307,79.291-217.666,79.355-296.925,0.00L 63.996,330.873L 63.996,415.988 L0.00,415.988 l0.00-191.988 l 191.988,0.00 l0.00,63.996 l-80.363-0.048l 87.243,87.243
-			c 55.117,55.181, 151.239,55.181, 206.355-0.064C 432.789,347.56, 447.972,310.939, 447.972,271.949c0.00-39.038-15.183-75.675-42.749-103.322l-48.253-48.237l 45.245-45.229
-			l 48.253,48.125C 490.097,163.044, 511.968,215.809, 511.968,271.949C 511.968,328.057, 490.097,380.806, 450.468,420.484zM 295.166-32.00L 249.92,13.309L 295.198,58.538L 340.443,13.229z" horiz-adv-x="511.968017578125" />
-<glyph unicode="&#xe1dd;" d="M 448.00,192.00c0.00,123.68-100.32,224.00-224.00,224.00C 100.32,416.00,0.00,315.68,0.00,192.00C0.00,280.368, 71.632,352.00, 160.00,352.00s 160.00-71.632, 160.00-160.00l0.00-32.00 l-64.00,0.00 l 128.00-128.00l 128.00,128.00l-64.00,0.00 L 448.00,192.00
-		z" />
-<glyph unicode="&#xe1de;" d="M 382.128,382.624l-45.12-45.312C 367.248,307.056, 384.00,266.816, 384.00,224.00c0.00-88.256-71.744-160.00-160.00-160.00l0.00,32.00 l-64.00-64.00l 64.00-64.00l0.00,32.00
-			c 123.504,0.00, 224.00,100.496, 224.00,224.00C 448.00,283.936, 424.624,340.256, 382.128,382.624zM 288.00,416.00l-64.00,64.00l0.00-32.00 C 100.496,448.00,0.00,347.504,0.00,224.00c0.00-59.936, 23.376-116.256, 65.872-158.624l 45.12,45.312
-			C 80.752,140.944, 64.00,181.184, 64.00,224.00C 64.00,312.256, 135.744,384.00, 224.00,384.00l0.00-32.00 L 288.00,416.00z" horiz-adv-x="448" />
-<glyph unicode="&#xe1df;" d="M 75.056,42.88C 26.624,91.248,0.00,155.504,0.00,224.00C0.00,365.12, 114.816,480.00, 256.00,480.00l 32.00-32.00l-32.00-32.00C 150.128,416.00, 64.00,329.872, 64.00,224.00
-			c0.00-51.376, 20.00-99.632, 56.32-135.872l-39.312-5.12L 75.056,42.88L 75.056,42.88zM 256.00-32.00l-32.00,31.872L 256.00,32.00c 105.872,0.00, 192.00,86.128, 192.00,192.00c0.00,51.248-20.00,99.504-56.368,135.808l 39.376,5.184
-			l 5.872,40.064C 485.312,356.688, 512.00,292.368, 512.00,224.00C 512.00,82.88, 397.12-32.00, 256.00-32.00L 256.00-32.00z" />
-<glyph unicode="&#xe1e0;" d="M 160.00,415.872c 52.976,0.00, 96.00-43.184, 96.00-96.256c0.00-30.32-13.808-58.192-37.968-76.368c-36.128-27.312-50.72-57.504-55.744-82.88
-			L 157.712,160.368 c-5.008,25.376-19.648,55.568-55.744,82.88c-24.128,18.192-38.00,46.064-38.00,76.368C 63.968,372.688, 107.024,415.872, 160.00,415.872 M 160.00,480.00
-			C 71.632,480.00,0.00,408.192,0.00,319.632C0.00,267.12, 24.72,221.248, 63.504,192.00c 17.84-13.504, 32.56-30.88, 32.56-54.88l0.00-40.88 l 127.904,0.00 L 223.968,137.12
-			c0.00,24.00, 14.72,41.376, 32.528,54.88C 295.312,221.248, 320.00,267.12, 320.00,319.632C 320.00,408.192, 248.368,480.00, 160.00,480.00L 160.00,480.00zM 96.00,32.00L 224.00,32.00L 224.00-32.00L 96.00-32.00z" horiz-adv-x="320" />
-<glyph unicode="&#xe1e1;" d="M 512.00,480.00L 128.00,480.00 l0.00-128.00 C 81.504,352.00,0.00,352.00,0.00,352.00l0.00-384.00 l 384.00,0.00 l0.00,128.00 l 128.00,0.00 L 512.00,480.00 z M 320.00,32.00L 64.00,32.00 L 64.00,224.00 l 64.00,0.00 l0.00-128.00 l 192.00,0.00 C 320.00,67.376, 320.00,32.00, 320.00,32.00z M 448.00,160.00L 192.00,160.00 L 192.00,352.00 l 256.00,0.00
-		L 448.00,160.00 z" />
-<glyph unicode="&#xe1e2;" d="M 352.00,480.00c-88.368,0.00-160.00-71.632-160.00-160.00c0.00-10.00, 1.184-19.632, 2.944-29.056L0.00,96.00l0.00-128.00 l 192.00,0.00 l0.00,64.00 l 64.00,0.00 l0.00,64.00 l 64.00,0.00 l0.00,64.00
-				l 2.944,2.944C 332.368,161.184, 342.00,160.00, 352.00,160.00c 88.368,0.00, 160.00,71.632, 160.00,160.00S 440.368,480.00, 352.00,480.00z M 352.128,288.00c-17.68,0.00-32.00,14.32-32.00,32.00s 14.32,32.00, 32.00,32.00
-				s 32.00-14.32, 32.00-32.00S 369.808,288.00, 352.128,288.00z" />
-<glyph unicode="&#xe1e3;" d="M 352.00,480.00c-88.368,0.00-160.00-71.632-160.00-160.00c0.00-10.00, 1.184-19.632, 2.944-29.056L0.00,96.00l0.00-128.00 l 192.00,0.00 l0.00,64.00 l 64.00,0.00 l0.00,64.00 l 64.00,0.00 l0.00,64.00 l 2.944,2.944
-		C 332.368,161.184, 342.00,160.00, 352.00,160.00c 88.368,0.00, 160.00,71.632, 160.00,160.00S 440.368,480.00, 352.00,480.00z M 352.00,224.00c-5.008,0.00-10.496,0.624-17.376,1.872l-33.12,6.128
-		L 256.00,186.496L 256.00,160.00 l-64.00,0.00 l0.00-64.00 L 128.00,96.00 l0.00-64.00 L 64.00,32.00 l0.00,37.504 l 200.00,200.00l-6.128,33.12C 256.592,309.504, 256.00,315.008, 256.00,320.00c0.00,52.944, 43.056,96.00, 96.00,96.00s 96.00-43.056, 96.00-96.00
-		S 404.944,224.00, 352.00,224.00zM 320.00,320.00A32.00,32.00 1620.00 1,0 384.00,320A32.00,32.00 1620.00 1,0 320.00,320z" />
-<glyph unicode="&#xe1e4;" d="M 224.00,480.00L 32.00,480.00 C 14.32,480.00,0.00,465.68,0.00,448.00l0.00-352.00 c0.00-70.688, 57.312-128.00, 128.00-128.00s 128.00,57.312, 128.00,128.00L 256.00,448.00 C 256.00,465.68, 241.68,480.00, 224.00,480.00z M 160.00,96.00
-	c-17.68,0.00-32.00,14.32-32.00,32.00s 14.32,32.00, 32.00,32.00s 32.00-14.32, 32.00-32.00S 177.68,96.00, 160.00,96.00z M 192.00,224.00l-32.00,0.00 c0.00,17.664-14.336,32.00-32.00,32.00s-32.00-14.336-32.00-32.00L 64.00,224.00 L 64.00,416.00 l 128.00,0.00 L 192.00,224.00 z" horiz-adv-x="256" />
-<glyph unicode="&#xe1e5;" d="M 128.00,336.00A16.00,16.00 1620.00 1,0 160.00,336A16.00,16.00 1620.00 1,0 128.00,336zM 224.00,480.00L 32.00,480.00 C 14.32,480.00,0.00,465.68,0.00,448.00l0.00-352.00 c0.00-70.688, 57.312-128.00, 128.00-128.00s 128.00,57.312, 128.00,128.00L 256.00,448.00 C 256.00,465.68, 241.68,480.00, 224.00,480.00z M 80.00,160.00
-		c-8.832,0.00-16.00,7.152-16.00,16.00s 7.168,16.00, 16.00,16.00c 8.848,0.00, 16.00-7.152, 16.00-16.00S 88.848,160.00, 80.00,160.00z M 160.00,96.00c-17.68,0.00-32.00,14.32-32.00,32.00s 14.32,32.00, 32.00,32.00s 32.00-14.32, 32.00-32.00
-		S 177.68,96.00, 160.00,96.00z M 192.00,224.00l-32.00,0.00 c0.00,17.664-14.336,32.00-32.00,32.00s-32.00-14.336-32.00-32.00L 64.00,224.00 L 64.00,416.00 l 128.00,0.00 L 192.00,224.00 z" horiz-adv-x="256" />
-<glyph unicode="&#xe1e6;" d="M 448.00,416.00l-64.00,0.00 c0.00,35.376-28.624,64.00-64.00,64.00l-128.00,0.00 C 156.624,480.00, 128.00,451.376, 128.00,416.00L 64.00,416.00 L0.00,416.00 l0.00-64.00 l 64.00,0.00 l0.00-288.00 c0.00-52.992, 43.008-96.00, 96.00-96.00l 192.00,0.00
-		c 52.992,0.00, 96.00,43.008, 96.00,96.00L 448.00,352.00 l 64.00,0.00 L 512.00,416.00 L 448.00,416.00 z M 192.00,96.00c-17.68,0.00-32.00,14.32-32.00,32.00s 14.32,32.00, 32.00,32.00s 32.00-14.32, 32.00-32.00S 209.68,96.00, 192.00,96.00z M 192.00,224.00
-		c-17.68,0.00-32.00,14.32-32.00,32.00s 14.32,32.00, 32.00,32.00s 32.00-14.32, 32.00-32.00S 209.68,224.00, 192.00,224.00z M 320.00,96.00c-17.68,0.00-32.00,14.32-32.00,32.00s 14.32,32.00, 32.00,32.00s 32.00-14.32, 32.00-32.00
-		S 337.68,96.00, 320.00,96.00z M 320.00,224.00c-17.68,0.00-32.00,14.32-32.00,32.00s 14.32,32.00, 32.00,32.00s 32.00-14.32, 32.00-32.00S 337.68,224.00, 320.00,224.00z" />
-<glyph unicode="&#xe1e7;" d="M 512.00,416.00l-64.00,0.00 l-64.00,0.00 c0.00,35.376-28.624,64.00-64.00,64.00l-128.00,0.00 C 156.624,480.00, 128.00,451.376, 128.00,416.00L 64.00,416.00 L0.00,416.00 l0.00-64.00 l 64.00,0.00 l0.00-288.00 c0.00-52.992, 43.008-96.00, 96.00-96.00l 192.00,0.00
-			c 52.992,0.00, 96.00,43.008, 96.00,96.00L 448.00,352.00 l 64.00,0.00 L 512.00,416.00 z M 384.00,64.00c0.00-17.632-14.368-32.00-32.00-32.00L 160.00,32.00 c-17.632,0.00-32.00,14.368-32.00,32.00L 128.00,352.00 l 256.00,0.00 L 384.00,64.00 zM 160.00,128.00A32.00,32.00 1620.00 1,0 224.00,128A32.00,32.00 1620.00 1,0 160.00,128zM 160.00,256.00A32.00,32.00 1620.00 1,0 224.00,256A32.00,32.00 1620.00 1,0 160.00,256zM 288.00,128.00A32.00,32.00 1620.00 1,0 352.00,128A32.00,32.00 1620.00 1,0 288.00,128zM 288.00,256.00A32.00,32.00 1620.00 1,0 352.00,256A32.00,32.00 1620.00 1,0 288.00,256z" />
-<glyph unicode="&#xe1e8;" d="M 322.128,480.00C 217.504,480.00, 132.368,394.88, 132.368,290.192c0.00-25.056, 5.12-48.816, 13.936-70.688L0.00,73.184L 105.12-32.00l 146.368,146.432
-	c 21.872-8.88, 45.632-14.00, 70.624-14.00c 104.688,0.00, 189.872,85.12, 189.872,189.728C 512.00,394.88, 426.816,480.00, 322.128,480.00z M 322.128,164.368
-	c-69.312,0.00-125.808,56.496-125.808,125.792c0.00,69.376, 56.496,125.872, 125.808,125.872c 69.44,0.00, 125.936-56.496, 125.936-125.872
-	C 448.064,220.88, 391.568,164.368, 322.128,164.368z" />
-<glyph unicode="&#xe1e9;" d="M 128.00,160.00c-22.56,0.00-43.872,4.624-64.00,11.744L 64.00-32.00 l 64.00,64.00l 64.00-64.00L 192.00,171.744 C 171.872,164.624, 150.56,160.00, 128.00,160.00zM 128.00,480.00C 57.312,480.00,0.00,422.688,0.00,352.00s 57.312-128.00, 128.00-128.00s 128.00,57.312, 128.00,128.00S 198.688,480.00, 128.00,480.00z M 128.00,288.00c-35.376,0.00-64.00,28.656-64.00,64.00
-			s 28.624,64.00, 64.00,64.00s 64.00-28.656, 64.00-64.00S 163.376,288.00, 128.00,288.00z" horiz-adv-x="256" />
-<glyph unicode="&#xe1ea;" d="M 128.00,160.00c-22.56,0.00-43.872,4.624-64.00,11.776L 64.00-32.00 l 64.00,64.00l 64.00-64.00L 192.00,171.776 C 171.872,164.624, 150.56,160.00, 128.00,160.00zM0.00,352.00A128.00,128.00 1620.00 1,0 256.00,352A128.00,128.00 1620.00 1,0 0.00,352z" horiz-adv-x="256" />
-<glyph unicode="&#xe1eb;" d="M 288.00,448.00c0.00,17.60-14.40,32.00-32.00,32.00s-32.00-14.40-32.00-32.00l0.00-288.00 l-32.00,0.00 l0.00-64.00 l 32.00,0.00 l0.00-96.00 c0.00-17.60, 14.40-32.00, 32.00-32.00s 32.00,14.40, 32.00,32.00l0.00,96.00 l 32.00,0.00 l0.00,64.00 l-32.00,0.00 L 288.00,448.00 zM 96.00,448.00c0.00,17.60-14.40,32.00-32.00,32.00S 32.00,465.60, 32.00,448.00l0.00-160.00 L0.00,288.00 l0.00-64.00 l 32.00,0.00 l0.00-224.00 c0.00-17.60, 14.40-32.00, 32.00-32.00s 32.00,14.40, 32.00,32.00L 96.00,224.00 l 32.00,0.00 l0.00,64.00 L 96.00,288.00 L 96.00,448.00 zM 512.00,352.00l-32.00,0.00 L 480.00,448.00 c0.00,17.60-14.40,32.00-32.00,32.00s-32.00-14.40-32.00-32.00l0.00-96.00 l-32.00,0.00 l0.00-64.00 l 32.00,0.00 l0.00-288.00 c0.00-17.60, 14.40-32.00, 32.00-32.00s 32.00,14.40, 32.00,32.00L 480.00,288.00 l 32.00,0.00 L 512.00,352.00 z" />
-<glyph unicode="&#xe1ec;" d="M 256.00,480.00C 114.624,480.00,0.00,365.376,0.00,224.00s 114.624-256.00, 256.00-256.00s 256.00,114.624, 256.00,256.00S 397.376,480.00, 256.00,480.00z M 352.00,160.00l0.00,32.00 l-64.00,0.00 l0.00-64.00 l 32.00,0.00 l-64.00-64.00
-		l-64.00,64.00l 32.00,0.00 l0.00,64.00 l-64.00,0.00 l0.00-32.00 l-64.00,64.00l 64.00,64.00l0.00-32.00 l 64.00,0.00 l0.00,64.00 l-32.00,0.00 l 64.00,64.00l 64.00-64.00l-32.00,0.00 l0.00-64.00 l 64.00,0.00 l0.00,32.00 l 64.00-64.00L 352.00,160.00z" />
-<glyph unicode="&#xe1ed;" d="M 256.00,128.00L 288.00,160.00L 288.00,64.00L 352.00,64.00L 256.00-32.00L 160.00,64.00L 224.00,64.00L 224.00,160.00 		zM 256.00,319.008L 224.00,288.00L 224.00,384.00L 160.00,384.00L 256.00,480.00L 352.00,384.00L 288.00,384.00L 288.00,288.00 		zM 160.00,224.00L 192.00,192.00L 96.00,192.00L 96.00,128.00L0.00,224.00L 96.00,320.00L 96.00,256.00L 192.00,256.00 		zM 351.008,224.00L 320.00,256.00L 416.00,256.00L 416.00,320.00L 512.00,224.00L 416.00,128.00L 416.00,192.00L 320.00,192.00 		z" />
-<glyph unicode="&#xe1ee;" d="M 288.00,160.00L 288.00,64.00L 352.00,64.00L 256.00-32.00L 160.00,64.00L 224.00,64.00L 224.00,160.00 		zM 224.00,288.00L 224.00,384.00L 160.00,384.00L 256.00,480.00L 352.00,384.00L 288.00,384.00L 288.00,288.00 		zM 192.00,192.00L 96.00,192.00L 96.00,128.00L0.00,224.00L 96.00,320.00L 96.00,256.00L 192.00,256.00 		zM 320.00,256.00L 416.00,256.00L 416.00,320.00L 512.00,224.00L 416.00,128.00L 416.00,192.00L 320.00,192.00 		z" />
-<glyph unicode="&#xe1ef;" d="M 512.00,480.00L 128.00,224.00L 224.00,160.00L0.00-32.00L 384.00,160.00L 288.00,224.00 	z" />
-<glyph unicode="&#xe1f0;" d="M 502.624,470.624c-12.496,12.496-32.944,12.496-45.44,0.00l-65.12-65.184C 365.376,423.184, 334.752,432.00, 304.00,432.00
-			c-40.944,0.00-81.872-15.632-113.12-46.88l-96.00-96.00c-54.752-54.688-61.504-139.248-20.368-201.312l-65.12-65.184c-12.496-12.496-12.496-32.752,0.00-45.248
-			C 15.632-28.88, 23.808-32.00, 32.00-32.00s 16.368,3.12, 22.624,9.376l 65.12,65.184C 146.432,24.816, 177.248,16.00, 208.00,16.00c 40.944,0.00, 81.872,15.632, 113.12,46.88
-			l 95.808,96.00c 54.752,54.688, 61.504,139.248, 20.368,201.312l 65.312,65.184C 515.12,437.872, 515.12,458.128, 502.624,470.624z M 399.808,272.00
-			c0.00-25.632-10.00-49.744-28.128-67.872l-95.808-96.00C 257.744,90.00, 233.632,80.00, 208.00,80.00c-14.496,0.00-28.368,3.568-41.12,9.632l 47.744,47.744
-			c 12.496,12.496, 12.496,32.752,0.00,45.248s-32.752,12.496-45.248,0.00L 121.632,134.88C 115.504,147.568, 112.00,161.44, 112.00,176.00c0.00,25.632, 10.00,49.744, 28.128,67.872
-			l 96.00,96.00C 254.256,358.00, 278.368,368.00, 304.00,368.00c 14.496,0.00, 28.32-3.568, 41.056-9.632l-48.688-48.752c-12.496-12.496-12.496-32.752,0.00-45.248
-			c 6.256-6.256, 14.432-9.376, 22.624-9.376c 8.128,0.00, 16.32,3.12, 22.56,9.376l 48.624,48.752C 396.32,300.432, 399.808,286.56, 399.808,272.00z" />
-<glyph unicode="&#xe1f1;" d="M 512.00,352.00c0.00,70.656-57.376,128.00-128.00,128.00c-47.744,0.00-88.992-26.528-111.008-65.376c0.00,0.032, 0.064,0.064, 0.064,0.096
-		c-5.872,0.56-11.568,1.776-17.568,1.776c-106.064,0.00-192.00-85.936-192.00-192.00c0.00-40.432, 12.624-77.872, 33.936-108.752L0.00-32.00l 148.624,96.992
-		c 30.56-20.496, 67.312-32.496, 106.88-32.496c 106.064,0.00, 192.00,85.936, 192.00,192.00c0.00,5.536-1.12,10.72-1.632,16.128C 485.12,262.496, 512.00,303.904, 512.00,352.00z
-		 M 255.504,96.496c-70.624,0.00-128.00,57.376-128.00,128.00c0.00,70.592, 57.376,128.00, 128.00,128.00c 0.192,0.00, 0.368-0.064, 0.496-0.064c0.00,0.128, 0.064,0.224, 0.064,0.32
-		C 256.064,352.496, 256.00,352.256, 256.00,352.00c0.00-11.12, 1.872-21.68, 4.496-31.968l-50.752-50.784c-24.992-24.992-24.992-65.504,0.00-90.496s 65.504-24.992, 90.496,0.00
-		l 50.256,50.256c 10.56-2.88, 21.504-4.88, 32.944-4.944C 383.184,153.632, 325.936,96.496, 255.504,96.496z M 384.00,288.00c-35.248,0.00-64.00,28.72-64.00,64.00
-		s 28.752,64.00, 64.00,64.00s 64.00-28.72, 64.00-64.00S 419.248,288.00, 384.00,288.00z" />
-<glyph unicode="&#xe1f2;" d="M 256.00,480.00C 114.624,480.00,0.00,365.376,0.00,224.00s 114.624-256.00, 256.00-256.00s 256.00,114.624, 256.00,256.00S 397.376,480.00, 256.00,480.00z M 384.00,192.00L 128.00,192.00 l0.00,64.00 l 256.00,0.00 L 384.00,192.00 z" />
-<glyph unicode="&#xe1f3;" d="M0.00,288.00L 512.00,288.00L 512.00,160.00L0.00,160.00z" />
-<glyph unicode="&#xe1f4;" d="M 256.00,480.00C 114.624,480.00,0.00,365.376,0.00,224.00s 114.624-256.00, 256.00-256.00s 256.00,114.624, 256.00,256.00S 397.376,480.00, 256.00,480.00z M 384.00,192.00l-96.00,0.00 l0.00-96.00 l-64.00,0.00 l0.00,96.00 L 128.00,192.00 l0.00,64.00 l 96.00,0.00
-		L 224.00,352.00 l 64.00,0.00 l0.00-96.00 l 96.00,0.00 L 384.00,192.00 z" />
-<glyph unicode="&#xe1f5;" d="M 512.00,288.00L 320.00,288.00L 320.00,480.00L 192.00,480.00L 192.00,288.00L0.00,288.00L0.00,160.00L 192.00,160.00L 192.00-32.00L 320.00-32.00L 320.00,160.00L 512.00,160.00 	z" />
-<glyph unicode="&#xe1f6;" d="M 345.744,480.00L0.00,480.00 l0.00-512.00 l 127.632,106.256L 255.872-32.00l 128.064,106.128L 512.00-32.00L 512.00,315.184 L 345.744,480.00z M 288.00,256.00L 288.00,416.00 l 160.00-160.00L 288.00,256.00 z" />
-<glyph unicode="&#xe1f7;" d="M 352.256,480.00L0.00,480.00 l0.00-511.008 l 128.816,105.248L 257.12-32.00l 128.192,106.128L 512.00-31.744L 512.00,320.00 L 352.256,480.00z M 448.32,96.992
-		l-63.248,51.632l-127.936-105.872l-127.68,105.744l-65.376-51.504c0.00,0.00,0.00,277.744,0.00,320.00c 33.632,0.00, 124.944,0.00, 192.128,0.00l0.00-192.00 L 448.32,224.992
-		C 448.32,181.312, 448.32,96.992, 448.32,96.992z M 320.256,288.992c0.00,24.688,0.00,94.624,0.00,128.00c 25.872-25.872, 102.432-102.368, 128.064-128.00
-		C 415.568,288.992, 345.12,288.992, 320.256,288.992z" />
-<glyph unicode="&#xe1f8;" d="M 224.00,480.00L0.00,480.00 l0.00-512.00 l 384.00,0.00 L 384.00,320.032 L 224.00,480.00z M 190.688,288.00L 190.688,416.00 l 128.00-128.00L 190.688,288.00 z" horiz-adv-x="384" />
-<glyph unicode="&#xe1f9;" d="M 224.00,480.00L0.00,480.00 l0.00-512.00 l 384.00,0.00 L 384.00,320.032 L 224.00,480.00z M 64.00,32.00L 64.00,416.00 l 128.00,0.00 l0.00-128.00 l 128.00,0.00 l0.00-256.00 L 64.00,32.00 z" horiz-adv-x="384" />
-<glyph unicode="&#xe1fa;" d="M 447.632,352.00l-63.184,0.00 L 448.00,415.744L 385.184,480.00l-89.056,0.00 l 63.808-63.744L 294.56,352.00l-75.568,0.00 l 64.944,63.744L 219.744,480.00L 129.248,480.00
-		l 63.744-63.744L 127.632,352.00L 63.504,352.00 l 64.992,63.744L 64.256,480.00L0.00,480.00 l0.00-512.00 l 512.00,0.00 L 512.00,480.00 l-62.752,0.00 L 512.00,416.00L 447.632,352.00z M 448.00,32.00L 64.00,32.00 l0.00,64.00 l 384.00,0.00 L 448.00,32.00 z M 448.00,160.00L 64.00,160.00 l0.00,64.00 l 384.00,0.00 L 448.00,160.00 z" />
-<glyph unicode="&#xe1fb;" d="M 256.00,386.496C 230.192,422.752, 189.936,448.00, 142.192,448.00C 63.744,448.00,0.00,384.128,0.00,305.744l0.00-11.744 L 256.128,0.00L 512.00,294.00l0.00,11.744
-				C 512.00,384.128, 448.256,448.00, 369.808,448.00C 322.064,448.00, 281.808,422.752, 256.00,386.496z" />
-<glyph unicode="&#xe1fc;" d="M 369.808,384.00c 39.312,0.00, 71.872-29.12, 77.376-67.008L 256.064,97.504L 64.816,316.992C 70.32,354.88, 102.88,384.00, 142.192,384.00
-			c 32.256,0.00, 61.68-34.624, 61.68-34.624L 256.00,294.00l 52.128,55.376C 308.128,349.376, 337.568,384.00, 369.808,384.00 M 369.808,448.00
-			c-47.744,0.00-88.00-25.248-113.808-61.504C 230.192,422.752, 189.936,448.00, 142.192,448.00C 63.744,448.00,0.00,384.128,0.00,305.744l0.00-11.744 L 256.128,0.00L 512.00,294.00l0.00,11.744
-			C 512.00,384.128, 448.256,448.00, 369.808,448.00L 369.808,448.00z" />
-<glyph unicode="&#xe1fd;" d="M 255.936,232.688L 512.00,353.312L 512.00,416.00L0.00,416.00L0.00,353.504 		zM 256.064,161.936L0.00,282.88L0.00,32.00L 512.00,32.00L 512.00,282.496 		z" />
-<glyph unicode="&#xe1fe;" d="M 447.968,96.00c-15.504,0.00-29.248-6.256-40.368-15.44l-97.536,69.632C 316.256,162.944, 320.00,176.944, 320.00,192.00
-		c0.00,20.688-6.752,39.808-17.872,55.44l 114.096,114.192C 425.712,356.064, 436.224,352.00, 447.968,352.00c 35.376,0.00, 64.00,28.624, 64.00,64.00s-28.624,64.00-64.00,64.00s-64.00-28.624-64.00-64.00
-		c0.00-11.808, 4.128-22.256, 9.632-31.744l-114.096-114.192C 263.744,281.312, 244.752,288.00, 224.00,288.00c-36.624,0.00-68.128-20.816-84.32-51.056l-77.056,25.744
-		C 59.504,277.056, 47.312,288.00, 32.00,288.00c-17.68,0.00-32.00-14.32-32.00-32.00s 14.32-32.00, 32.00-32.00c 8.064,0.00, 15.248,3.248, 20.88,8.192l 76.624-25.568
-		C 128.752,201.808, 128.00,196.992, 128.00,192.00c0.00-52.992, 43.008-96.00, 96.00-96.00c 26.368,0.00, 50.32,10.688, 67.68,27.936l 96.912-69.184
-		c-2.752-7.12-4.624-14.688-4.624-22.752c0.00-35.312, 28.624-64.00, 64.00-64.00s 64.00,28.688, 64.00,64.00S 483.344,96.00, 447.968,96.00z" horiz-adv-x="511.9679870605469" />
-<glyph unicode="&#xe1ff;" d="M 416.00,416.00l0.00-32.752 c0.00-35.376-28.624-64.00-64.00-64.00s-64.00,28.624-64.00,64.00L 288.00,416.00 l-64.00,0.00 l0.00-32.752 c0.00-35.376-28.624-64.00-64.00-64.00s-64.00,28.624-64.00,64.00L 96.00,416.00 L0.00,416.00 l0.00-448.00 l 512.00,0.00 L 512.00,416.00
-			L 416.00,416.00 z M 160.00,32.00L 96.00,32.00 l0.00,64.00 l 64.00,0.00 L 160.00,32.00 z M 160.00,160.00L 96.00,160.00 l0.00,64.00 l 64.00,0.00 L 160.00,160.00 z M 288.00,32.00l-64.00,0.00 l0.00,64.00 l 64.00,0.00 L 288.00,32.00 z M 288.00,160.00l-64.00,0.00 l0.00,64.00 l 64.00,0.00 L 288.00,160.00 z M 352.00,32.00l0.00,64.00 l 64.00,0.00 L 352.00,32.00z M 416.00,160.00l-64.00,0.00 l0.00,64.00 l 64.00,0.00 L 416.00,160.00 zM 128.00,384.00L 128.00,448.00 c0.00,17.68, 14.32,32.00, 32.00,32.00s 32.00-14.32, 32.00-32.00l0.00-64.00 c0.00-17.68-14.32-32.00-32.00-32.00S 128.00,366.32, 128.00,384.00zM 320.00,384.00L 320.00,448.00 c0.00,17.68, 14.32,32.00, 32.00,32.00s 32.00-14.32, 32.00-32.00l0.00-64.00 c0.00-17.68-14.32-32.00-32.00-32.00S 320.00,366.32, 320.00,384.00z" />
-<glyph unicode="&#xe200;" d="M 512.00-32.00L0.00-32.00L0.00,416.00L 64.00,416.00L 64.00,32.00L 448.00,32.00L 448.00,416.00L 512.00,416.00 		zM 96.00,288.00L 160.00,288.00L 160.00,224.00L 96.00,224.00zM 224.00,288.00L 288.00,288.00L 288.00,224.00L 224.00,224.00zM 352.00,288.00L 416.00,288.00L 416.00,224.00L 352.00,224.00zM 96.00,160.00L 160.00,160.00L 160.00,96.00L 96.00,96.00zM 224.00,160.00L 288.00,160.00L 288.00,96.00L 224.00,96.00zM 352.00,96.00L 352.00,160.00L 416.00,160.00 		zM 128.00,384.00L 128.00,448.00 c0.00,17.68, 14.32,32.00, 32.00,32.00s 32.00-14.32, 32.00-32.00l0.00-64.00 c0.00-17.68-14.32-32.00-32.00-32.00S 128.00,366.32, 128.00,384.00zM 320.00,384.00L 320.00,448.00 c0.00,17.68, 14.32,32.00, 32.00,32.00s 32.00-14.32, 32.00-32.00l0.00-64.00 c0.00-17.68-14.32-32.00-32.00-32.00S 320.00,366.32, 320.00,384.00z" />
-<glyph unicode="&#xe201;" d="M 384.00,416.00L 384.00,480.00L 320.00,480.00L 320.00,416.00L 192.00,416.00L 192.00,480.00L 128.00,480.00L 128.00,416.00L0.00,416.00L0.00,352.00L 512.00,352.00L 512.00,416.00 	zM 64.00,160.00L 448.00,160.00L 448.00,96.00L 64.00,96.00zM 64.00,288.00L 448.00,288.00L 448.00,224.00L 64.00,224.00zM 64.00-32.00L 384.00-32.00L 448.00,32.00L 64.00,32.00 	z" />
-<glyph unicode="&#xe202;" d="M 512.00,192.496l0.00,64.00 l-76.496,31.872c-2.128,6.00-4.368,11.808-7.12,17.504l 30.88,76.88L 414.00,428.00
-		l-76.192-31.376c-5.808,2.816-11.744,5.184-17.872,7.376L 287.504,480.00l-64.00,0.00 l-31.632-75.744c-6.368-2.256-12.496-4.624-18.56-7.504l-76.064,30.56
-		L 52.00,382.064l 31.008-75.376C 80.00,300.496, 77.568,294.192, 75.248,287.68L0.00,255.504l0.00-64.00 l 75.312-31.376c 2.32-6.496, 4.816-12.816, 7.808-19.008
-		l-30.432-75.872l 45.248-45.248l 75.568,31.12c 6.064-2.88, 12.256-5.184, 18.624-7.376L 224.496-32.00l 64.00,0.00 l 31.68,76.128
-		c 6.064,2.256, 12.064,4.624, 17.808,7.376l 76.752-30.752l 45.248,45.248l-31.504,76.368c 2.688,5.744, 4.88,11.568, 7.008,17.504L 512.00,192.496z
-		 M 255.504,128.00c-52.992,0.00-96.00,43.008-96.00,96.00s 43.008,96.00, 96.00,96.00s 96.00-43.008, 96.00-96.00S 308.496,128.00, 255.504,128.00z" />
-<glyph unicode="&#xe203;" d="M 193.038,224.00A64.346,64.346 1620.00 1,0 321.729,224A64.346,64.346 1620.00 1,0 193.038,224zM 459.349,383.578c-5.534-4.552-12.258-7.593-19.979-7.593c-17.727,0.00-32.173,14.413-32.173,32.35
-			c0.00,7.818, 3.137,14.783, 7.786,20.478c-35.696,27.669-78.92,46.297-126.054,52.201C 287.288,464.702, 274.097,451.817, 257.383,451.817
-			s-30.098,13.03-31.546,29.567C 178.077,475.19, 134.595,456.224, 98.594,427.558c 4.086-5.437, 6.982-11.872, 6.982-19.207c0.00-17.936-14.333-32.35-32.173-32.35
-			c-7.158,0.00-13.577,2.783-18.918,6.837C 20.864,339.115,0.00,284.919,0.00,225.383c0.00-142.896, 115.243-258.767, 257.383-258.767s 257.383,115.871, 257.383,258.767
-			C 514.767,285.482, 493.661,339.919, 459.349,383.578z M 257.383,96.692c-71.07,0.00-128.692,57.622-128.692,128.692c0.00,35.567, 14.397,67.676, 37.707,90.985L 257.383,407.354l 90.856-90.856
-			C 371.63,293.188, 386.075,260.951, 386.075,225.383C 386.075,154.249, 328.453,96.692, 257.383,96.692z" horiz-adv-x="514.7669067382812" />
-<glyph unicode="&#xe204;" d="M 505.712,389.712l-80.368-80.368l-84.00,0.00 L 341.344,394.656 l 79.376,79.344C 408.976,477.536, 396.848,480.00, 383.968,480.00
-		C 313.312,480.00, 256.00,422.656, 256.00,352.00c0.00-19.712, 4.816-38.16, 12.816-54.88L 12.496,40.88C 4.816,33.12,0.00,22.496,0.00,10.624C0.00-12.88, 19.056-32.00, 42.688-32.00
-		c 11.808,0.00, 22.496,4.752, 30.128,12.496l 256.368,256.288C 345.84,228.848, 364.336,224.00, 383.968,224.00c 70.752,0.00, 128.00,57.344, 128.00,128.00
-		C 511.968,365.216, 509.472,377.712, 505.712,389.712z" horiz-adv-x="511.9679870605469" />
-<glyph unicode="&#xe205;" d="M 512.00-32.00l-73.12,0.00 C 438.88,210.00, 242.00,406.848,0.00,406.848L0.00,480.00 C 282.256,480.00, 512.00,250.32, 512.00-32.00L 512.00-32.00zM 365.68-32.00l-73.12,0.00 c0.00,161.312-131.312,292.56-292.56,292.56L0.00,333.712 C 201.632,333.712, 365.68,169.632, 365.68-32.00
-			L 365.68-32.00zM 219.44-32.00L 146.256-32.00 c0.00,80.688-65.568,146.256-146.256,146.256l0.00,73.184 C 120.992,187.44, 219.44,88.992, 219.44-32.00
-			L 219.44-32.00zM 73.12-32.00c0.00,40.368-32.688,73.12-73.12,73.12L0.00-32.00 L 73.12-32.00 z" />
-<glyph unicode="&#xe206;" d="M0.00,32.00A64.00,64.00 1620.00 1,0 128.00,32A64.00,64.00 1620.00 1,0 0.00,32zM 96.00,480.00l0.00-64.00 c 194.368,0.00, 352.00-157.616, 352.00-352.00l 64.00,0.00 C 512.00,293.728, 325.712,480.00, 96.00,480.00zM 96.368,351.872C 96.24,351.872, 96.128,351.856, 96.00,351.856l0.00-64.00 c 0.128,0.00, 0.24,0.016, 0.368,0.016
-		c 123.664,0.00, 223.936-100.24, 224.00-223.872l 64.00,0.00 C 384.304,222.992, 255.376,351.872, 96.368,351.872zM 96.368,223.872c-0.128,0.00-0.24-0.016-0.368-0.016l0.00-64.00 c 0.128,0.00, 0.24,0.016, 0.368,0.016
-		c 52.976,0.00, 95.936-42.928, 96.00-95.872l 64.00,0.00 C 256.304,152.304, 184.688,223.872, 96.368,223.872z" />
-<glyph unicode="&#xe207;" d="M 512.00,32.00L 288.00,256.00L 384.00,352.00L0.00,480.00L 128.00,96.064L 224.00,192.064L 448.00-32.00 	z" />
-<glyph unicode="&#xe208;" d="M 256.00,480.00C 114.624,480.00,0.00,365.376,0.00,224.00s 114.624-256.00, 256.00-256.00s 256.00,114.624, 256.00,256.00S 397.376,480.00, 256.00,480.00z M 256.00,416.00
-		c 41.44,0.00, 79.568-13.504, 110.944-35.872L 99.808,113.12C 77.44,144.496, 64.00,182.624, 64.00,224.00C 64.00,329.872, 150.128,416.00, 256.00,416.00z M 256.00,32.00
-		c-41.44,0.00-79.568,13.504-110.944,35.872L 412.192,334.88C 434.56,303.504, 448.00,265.376, 448.00,224.00C 448.00,118.128, 361.872,32.00, 256.00,32.00z" />
-<glyph unicode="&#xe209;" d="M 256.00,480.00C 114.624,480.00,0.00,365.376,0.00,224.00s 114.624-256.00, 256.00-256.00s 256.00,114.624, 256.00,256.00S 397.376,480.00, 256.00,480.00z M 382.624,142.624
-		l-45.248-45.248L 256.00,178.752l-81.376-81.376l-45.248,45.248L 210.752,224.00l-81.376,81.376l 45.248,45.248L 256.00,269.248l 81.376,81.376l 45.248-45.248
-		L 301.248,224.00L 382.624,142.624z" />
-<glyph unicode="&#xe20a;" d="M 480.00,89.632L 345.504,224.00L 480.00,358.368L 390.368,448.00L 256.00,313.568L 121.568,448.00L 32.00,358.368L 166.368,224.00L 32.00,89.632L 121.568,0.00L 256.00,134.432L 390.368,0.00 		z" />
-<glyph unicode="&#xe20b;" d="M 256.00,480.00C 114.624,480.00,0.00,365.376,0.00,224.00s 114.624-256.00, 256.00-256.00s 256.00,114.624, 256.00,256.00S 397.376,480.00, 256.00,480.00z M 216.32,105.872
-		L 98.528,223.68l 45.248,45.248l 72.528-72.56l 153.872,153.872l 45.248-45.248L 216.32,105.872z" />
-<glyph unicode="&#xe20c;" d="M 96.00,288.00L0.00,192.00L 192.00,0.00L 512.00,320.00L 416.00,416.00L 192.00,192.00 z" />
-<glyph unicode="&#xe20d;" d="M 224.00,480.00C 100.32,480.00,0.00,379.68,0.00,256.00c0.00-61.312, 24.752-116.752, 64.688-157.248L 64.00-32.00l 107.248,70.944
-			C 188.256,34.752, 205.744,32.00, 224.00,32.00c 123.68,0.00, 224.00,100.32, 224.00,224.00S 347.68,480.00, 224.00,480.00z" horiz-adv-x="448" />
-<glyph unicode="&#xe20e;" d="M 224.00,480.00C 100.32,480.00,0.00,379.68,0.00,256.00c0.00-61.312, 24.752-116.752, 64.688-157.248L 65.056-32.00l 106.192,70.944
-	C 188.256,34.752, 205.744,32.00, 224.00,32.00c 123.68,0.00, 224.00,100.32, 224.00,224.00C 448.00,379.68, 347.68,480.00, 224.00,480.00z M 224.00,96.00c-11.312,0.00-23.568,1.68-37.44,5.056l-27.248,6.752
-	l-30.688-20.32l 0.192,37.376l-18.56,18.816C 80.432,173.936, 64.00,213.808, 64.00,256.00C 64.00,344.256, 135.744,416.00, 224.00,416.00c 88.256,0.00, 160.00-71.744, 160.00-160.00
-	C 384.00,167.744, 312.256,96.00, 224.00,96.00z" horiz-adv-x="448" />
-<glyph unicode="&#xe20f;" d="M0.00,128.00c0.00-70.688, 57.376-128.00, 128.00-128.00c0.00,35.376, 28.688,64.00, 64.00,64.00l 128.00,0.00 c 106.064,0.00, 192.00,86.00, 192.00,192.00S 426.064,448.00, 320.00,448.00L 160.00,448.00
-			C 71.632,448.00,0.00,376.368,0.00,288.00L0.00,128.00 z" />
-<glyph unicode="&#xe210;" d="M 320.00,384.00c 70.624,0.00, 128.00-57.376, 128.00-128.00s-57.376-128.00-128.00-128.00l-128.00,0.00 c-41.744,0.00-78.944-20.128-102.32-51.248C 74.128,88.496, 64.00,107.12, 64.00,128.00
-		L 64.00,288.00 c0.00,52.944, 43.12,96.00, 96.00,96.00L 320.00,384.00  M 320.00,448.00L 160.00,448.00 C 71.632,448.00,0.00,376.368,0.00,288.00l0.00-160.00 c0.00-70.688, 57.376-128.00, 128.00-128.00c0.00,35.376, 28.688,64.00, 64.00,64.00l 128.00,0.00 c 106.064,0.00, 192.00,86.00, 192.00,192.00
-		S 426.064,448.00, 320.00,448.00L 320.00,448.00z" />
-<glyph unicode="&#xe211;" d="M 479.008,96.00c0.00,0.00, 33.008,64.00, 33.008,128.00C 512.00,384.00, 384.048,416.00, 256.032,416.00C-101.904,416.00, 0.176,96.00, 64.096,32.00c 64.00,64.00, 64.00,64.00, 159.936,64.00
-				L 479.008,96.00 z" />
-<glyph unicode="&#xe212;" d="M 256.032,352.00C 433.184,352.00, 448.00,285.936, 448.00,224.00c0.00-21.504-5.68-44.88-11.936-64.00l-212.00,0.00 c-75.248,0.00-107.808-3.12-144.00-28.128
-			c-15.008,41.12-24.624,96.752-6.064,141.44C 95.616,325.504, 156.864,352.00, 256.032,352.00 M 256.032,416.00C-101.904,416.00, 0.176,96.00, 64.096,32.00c 64.00,64.00, 64.00,64.00, 159.936,64.00l 254.96,0.00
-			c0.00,0.00, 33.008,64.00, 33.008,128.00C 512.00,384.00, 384.048,416.00, 256.032,416.00L 256.032,416.00z" />
-<glyph unicode="&#xe213;" d="M 256.00,160.00c 70.688,0.00, 127.936,57.312, 127.936,128.00L 383.936,352.00 C 383.936,440.336, 320.00,480.00, 256.00,480.00L 127.936,480.00 C 64.00,480.00,0.00,446.00,0.00,352.00c0.00-92.00, 64.00-128.00, 127.936-128.00L 192.00,224.00
-		C 227.312,224.00, 256.00,195.312, 256.00,160.00zM 415.68,284.592C 413.808,198.00, 343.008,128.00, 256.00,128.00l-32.00,0.00 l0.00,32.00 c0.00,17.664-14.368,32.00-32.00,32.00L 131.184,192.00
-		C 129.264,182.448, 128.08,172.224, 128.00,161.184l0.00-66.416 C 128.672,24.656, 185.728-32.00, 256.00-32.00c0.00,35.376, 28.688,64.00, 64.00,64.00l 63.936,0.00 C 448.00,32.00, 512.00,68.00, 512.00,160.00
-		C 512.00,238.288, 467.44,274.56, 415.68,284.592z" />
-<glyph unicode="&#xe214;" d="M 415.632,284.592c-0.432-22.192-5.376-43.12-14.128-62.224C 447.632,214.688, 448.00,177.12, 448.00,160.00
-				c0.00-15.872,0.00-64.00-63.936-64.00L 320.00,96.00 c-41.68,0.00-79.008-20.128-102.368-51.248C 202.128,56.496, 192.00,75.12, 192.00,96.00l0.00,64.00 c0.00,12.624, 2.256,22.624, 5.744,30.848
-				C 195.872,191.184, 194.00,192.00, 192.00,192.00L 131.248,192.00 c-2.064-9.904-3.184-20.496-3.184-32.00l0.00-64.00 c0.00-70.688, 57.248-128.00, 127.936-128.00c0.00,35.376, 28.624,64.00, 64.00,64.00l 64.064,0.00
-				C 448.00,32.00, 512.00,68.00, 512.00,160.00C 512.00,238.288, 467.504,274.56, 415.632,284.592zM 256.00,416.00c 23.872,0.00, 64.00-8.32, 64.00-64.00l0.00-64.00 c0.00-20.944-10.128-39.536-25.632-51.216C 271.008,267.84, 233.744,288.00, 192.00,288.00L 128.064,288.00
-			C 64.00,288.00, 64.00,336.16, 64.00,352.00c0.00,19.12,0.00,64.00, 64.064,64.00L 256.00,416.00  M 256.00,480.00L 128.064,480.00 C 64.00,480.00,0.00,446.00,0.00,352.00c0.00-92.00, 64.00-128.00, 128.064-128.00L 192.00,224.00 c 35.376,0.00, 64.00-28.688, 64.00-64.00
-			c 70.688,0.00, 128.064,57.312, 128.064,128.00L 384.064,352.00 C 384.064,440.336, 320.00,480.00, 256.00,480.00L 256.00,480.00z" />
-<glyph unicode="&#xe215;" d="M 383.936,288.00L 383.936,352.00 C 383.936,440.368, 320.00,480.00, 256.00,480.00L 127.936,480.00 C 64.00,480.00,0.00,446.00,0.00,352.00c0.00-92.00, 64.00-128.00, 127.936-128.00l 14.88,0.00
-	C 133.888,206.672, 128.176,186.08, 128.00,161.088l0.00-66.336 C 128.672,24.656, 185.728-32.00, 256.00-32.00c0.00,35.376, 28.688,64.00, 64.00,64.00l 63.936,0.00 C 448.00,32.00, 512.00,68.00, 512.00,160.00
-	C 512.00,254.00, 448.00,288.00, 383.936,288.00z M 127.936,288.00C 64.00,288.00, 64.00,336.192, 64.00,352.00c0.00,19.184,0.00,64.00, 63.936,64.00L 256.00,416.00 c 23.936,0.00, 64.00-8.32, 64.00-64.00l0.00-64.00
-	c0.00-20.912-10.064-39.536-25.744-51.216C 270.88,267.872, 233.744,288.00, 192.00,288.00L 127.936,288.00 z M 383.936,96.00L 320.00,96.00 c-41.808,0.00-79.008-20.128-102.368-51.184
-	C 202.064,56.496, 192.00,75.12, 192.00,96.00l0.00,64.00 c0.00,29.28, 14.56,47.056, 29.056,56.192C 241.568,205.504, 256.00,184.688, 256.00,160.00c 47.296,0.00, 88.096,25.92, 110.304,64.032
-	L 383.936,224.00C 448.00,224.00, 448.00,179.152, 448.00,160.00C 448.00,144.16, 448.00,96.00, 383.936,96.00z" />
-<glyph unicode="&#xe216;" d="M 208.531,302.729c-3.604,3.396-7.791,6.084-12.541,8.062c-4.812,1.938-9.938,2.938-15.375,2.938
-			c-5.459,0.00-10.584-1.00-15.375-2.938c-4.75-1.979-8.938-4.667-12.542-8.062c-3.583-3.416-6.396-7.416-8.459-12.041
-			c-2.042-4.605-3.062-9.479-3.062-14.584c0.00-5.125, 1.02-10.00, 3.062-14.604c 2.063-4.604, 4.876-8.625, 8.459-12.021
-			c 3.604-3.416, 7.792-6.125, 12.542-8.062c 4.791-1.979, 9.916-2.958, 15.375-2.958c 5.438,0.00, 10.562,0.979, 15.375,2.958
-			c 4.75,1.938, 8.938,4.646, 12.541,8.062c 3.584,3.396, 6.396,7.417, 8.416,12.021c 2.042,4.604, 3.105,9.479, 3.105,14.604
-			c0.00,5.104-1.063,9.979-3.105,14.584C 214.927,295.313, 212.115,299.313, 208.531,302.729z M 193.177,264.063
-			c-3.438-3.417-7.625-5.126-12.562-5.126s-9.125,1.709-12.562,5.126c-3.396,3.416-5.125,7.416-5.125,12.041
-			c0.00,4.75, 1.729,8.833, 5.125,12.146c 3.438,3.333, 7.625,4.979, 12.562,4.979s 9.125-1.646, 12.562-4.979
-			c 3.374-3.312, 5.104-7.396, 5.104-12.146C 198.281,271.479, 196.551,267.479, 193.177,264.063z M 370.822,279.167l0.00,31.50 L 249.24,310.667 l0.00-176.396
-			l 35.063,0.00 l0.00,71.938 l 73.979,0.00 l0.00,31.479 l-73.979,0.00 l0.00,41.479 L 370.822,279.167 z" />
-<glyph unicode="&#xe217;" d="M 209.167,303.625c-3.604,3.396-7.792,6.083-12.542,8.062c-4.812,1.938-9.938,2.938-15.375,2.938
-			c-5.458,0.00-10.584-1.00-15.375-2.938c-4.75-1.979-8.938-4.667-12.541-8.062c-3.584-3.417-6.396-7.417-8.459-12.042
-			c-2.042-4.605-3.062-9.479-3.062-14.583c0.00-5.125, 1.021-10.00, 3.062-14.605c 2.062-4.604, 4.875-8.625, 8.459-12.02
-			c 3.604-3.417, 7.791-6.125, 12.541-8.063c 4.791-1.979, 9.917-2.958, 15.375-2.958c 5.438,0.00, 10.562,0.979, 15.375,2.958
-			c 4.75,1.938, 8.938,4.646, 12.542,8.063c 3.583,3.395, 6.396,7.417, 8.416,12.02c 2.042,4.605, 3.104,9.479, 3.104,14.605
-			c0.00,5.104-1.062,9.979-3.104,14.583C 215.562,296.209, 212.75,300.209, 209.167,303.625z M 193.812,264.959
-			c-3.438-3.417-7.625-5.125-12.562-5.125s-9.125,1.709-12.562,5.125c-3.396,3.417-5.125,7.417-5.125,12.042
-			c0.00,4.75, 1.729,8.833, 5.125,12.145c 3.438,3.333, 7.625,4.979, 12.562,4.979s 9.125-1.646, 12.562-4.979
-			c 3.375-3.312, 5.104-7.395, 5.104-12.145C 198.916,272.375, 197.188,268.375, 193.812,264.959z M 335.25,168.209
-			c-6.062-1.73-12.083-2.583-18.062-2.583c-3.938,0.00-7.812,0.604-11.646,1.79c-3.854,1.209-7.354,3.084-10.499,5.646
-			c-3.167,2.563-5.73,5.834-7.667,9.854c-1.959,4.00-2.958,8.917-2.958,14.709l0.00,51.458 c0.00,5.792, 0.999,10.75, 2.958,14.854
-			c 1.937,4.083, 4.459,7.417, 7.541,9.979c 3.084,2.562, 6.542,4.396, 10.50,5.50c 3.917,1.105, 7.834,1.667, 11.771,1.667
-			c 5.979,0.00, 12.124-0.875, 18.437-2.688c 6.313-1.791, 12.188-4.999, 17.668-9.604l 16.896,27.146
-			c-6.854,5.958-14.979,10.312-24.479,13.062c-9.459,2.708-19.292,4.083-29.543,4.083c-8.354,0.00-16.583-1.208-24.583-3.584
-			c-8.021-2.396-15.146-5.979-21.375-10.75c-6.208-4.792-11.271-10.708-15.083-17.791c-3.875-7.084-5.791-15.333-5.791-24.708
-			l0.00-66.042 c0.00-9.562, 1.979-17.875, 5.916-24.959c 3.917-7.084, 9.041-12.979, 15.334-17.666c 6.332-4.708, 13.479-8.229, 21.499-10.625
-			c 8.042-2.375, 16.229-3.584, 24.604-3.584c 10.396,0.00, 20.271,1.542, 29.688,4.604c 9.375,3.083, 17.312,7.354, 23.812,12.792
-			l-16.646,27.146C 347.416,173.125, 341.292,169.896, 335.25,168.209z" />
-<glyph unicode="&#xe218;" d="M 159.094,201.354l-1.042,0.00 l-33.521,51.188l-40.938,60.437l-31.75,0.00 l0.00-176.395 l 35.062,0.00 L 86.905,247.688 l 1.521,0.00
-			l 29.104-44.542l 44.688-66.562l 31.938,0.00 L 194.156,312.979 l-35.062,0.00 L 159.094,201.354 z M 206.469,125.834l 25.834,0.00 l 64.791,196.332l-26.125,0.00 L 206.469,125.834z
-			 M 398.719,312.979l-35.833,0.00 l-61.979-176.395l 37.375,0.00 l 11.521,36.375l 61.459,0.00 l 10.749-36.375l 38.146,0.00 L 398.719,312.979z M 359.281,202.375
-			l 7.146,23.292l 13.604,45.832l 1.00,0.00 l 13.854-46.604l 6.896-22.521L 359.281,202.374 z" />
-<glyph unicode="&#xe219;" d="M 256.00,480.00C 114.604,480.00,0.00,365.396,0.00,224.00c0.00-141.375, 114.604-256.00, 256.00-256.00c 141.375,0.00, 256.00,114.625, 256.00,256.00
-			C 512.00,365.396, 397.375,480.00, 256.00,480.00z M 256.00,32.00c-105.875,0.00-192.00,86.125-192.00,192.00S 150.125,416.00, 256.00,416.00s 192.00-86.125, 192.00-192.00S 361.875,32.00, 256.00,32.00
-			z M 160.00,128.00l 128.00,64.00l 64.00,128.00l-128.00-64.00L 160.00,128.00z" />
-<glyph unicode="&#xe21a;" d="M 288.00,119.125L 288.00,413.083 C 288.00,432.375, 273.666,448.00, 256.00,448.00
-	c-17.667,0.00-32.00-15.625-32.00-34.917l0.00-293.958 c-19.042-11.083-32.00-31.501-32.00-55.125c0.00-35.333, 28.666-64.00, 64.00-64.00c 35.333,0.00, 64.00,28.667, 64.00,64.00
-	C 320.00,87.624, 307.062,108.042, 288.00,119.125z" />
-<glyph unicode="&#xe21b;" d="M 512.00,345.167c0.00,49.146-40.00,89.124-89.167,89.124c-2.396,0.00-4.771-0.083-7.146-0.27
-	C 392.562,462.854, 357.709,480.00, 320.00,480.00c-37.688,0.00-72.562-17.146-95.688-45.979c-2.375,0.187-4.771,0.27-7.188,0.27
-	C 168.00,434.291, 128.00,394.312, 128.00,345.167c0.00-5.146, 0.688-10.125, 1.50-15.042c-0.542-0.708-1.188-1.354-1.708-2.083
-	c-5.229,0.75-10.479,1.125-15.792,1.125c-61.75,0.00-112.00-50.25-112.00-112.00c0.00-61.751, 50.25-112.00, 112.00-112.00c 13.688,0.00, 27.084,2.499, 39.709,7.333
-	c 18.354-16.00, 40.104-26.938, 63.207-33.208L 192.00,64.00l 32.00-32.00l-32.00-64.00l 96.00,64.00l-32.00,32.00l 4.812,9.583c 36.75,1.125, 71.75,14.729, 99.479,38.917
-	c 12.625-4.834, 26.021-7.333, 39.709-7.333c 61.75,0.00, 112.00,50.249, 112.00,112.00c0.00,25.666-9.042,49.083-23.666,68.00
-	C 502.916,301.042, 512.00,321.979, 512.00,345.167z" />
-<glyph unicode="&#xe21c;" d="M 488.334,232.583c 14.624-18.916, 23.666-42.312, 23.666-68.00c0.00-61.749-50.25-112.00-112.00-112.00
-	c-13.688,0.00-27.084,2.50-39.709,7.333c-28.958-25.249-65.749-39.333-104.291-39.333c-38.50,0.00-75.334,14.084-104.291,39.333
-	c-12.625-4.833-26.021-7.333-39.709-7.333c-61.75,0.00-112.00,50.251-112.00,112.00c0.00,61.75, 50.25,112.00, 112.00,112.00
-	c 5.312,0.00, 10.562-0.375, 15.792-1.125c 0.521,0.729, 1.166,1.375, 1.708,2.083c-0.812,4.938-1.50,9.896-1.50,15.041
-	c0.00,49.167, 40.00,89.146, 89.125,89.146c 2.416,0.00, 4.812-0.104, 7.188-0.292c 23.125,28.854, 58.00,45.979, 95.688,45.979
-	c 37.709,0.00, 72.562-17.125, 95.688-45.979c 2.375,0.188, 4.75,0.292, 7.146,0.292C 472.00,381.729, 512.00,341.75, 512.00,292.583
-	C 512.00,269.417, 502.916,248.479, 488.334,232.583z" />
-<glyph unicode="&#xe21d;" d="M 400.00,416.00c-5.312,0.00-10.562-0.375-15.792-1.125C 354.334,455.583, 307.188,480.00, 256.00,480.00
-			s-98.312-24.417-128.208-65.125C 122.562,415.625, 117.312,416.00, 112.00,416.00C 50.25,416.00,0.00,365.75,0.00,304.00s 50.25-112.00, 112.00-112.00
-			c 13.688,0.00, 27.084,2.50, 39.709,7.333C 180.666,174.083, 217.50,160.00, 256.00,160.00c 38.542,0.00, 75.333,14.083, 104.291,39.333
-			C 372.916,194.50, 386.312,192.00, 400.00,192.00c 61.75,0.00, 112.00,50.25, 112.00,112.00S 461.75,416.00, 400.00,416.00z M 96.00,160.00c-17.688,0.00-32.00-14.312-32.00-32.00
-			s 14.312-32.00, 32.00-32.00s 32.00,14.312, 32.00,32.00S 113.688,160.00, 96.00,160.00z M 256.00,128.00c-17.688,0.00-32.00-14.312-32.00-32.00s 14.312-32.00, 32.00-32.00s 32.00,14.312, 32.00,32.00
-			S 273.688,128.00, 256.00,128.00z M 416.00,160.00c-17.688,0.00-32.00-14.312-32.00-32.00s 14.312-32.00, 32.00-32.00s 32.00,14.312, 32.00,32.00S 433.688,160.00, 416.00,160.00z M 352.00,32.00
-			c-17.688,0.00-32.00-14.312-32.00-32.00s 14.312-32.00, 32.00-32.00s 32.00,14.312, 32.00,32.00S 369.688,32.00, 352.00,32.00z M 160.00,32.00c-17.688,0.00-32.00-14.312-32.00-32.00
-			s 14.312-32.00, 32.00-32.00s 32.00,14.312, 32.00,32.00S 177.688,32.00, 160.00,32.00z" />
-<glyph unicode="&#xe21e;" d="M 326.042,36.312l-18.00,10.376
-			c 0.542,3.124, 0.958,6.311, 0.958,9.624c0.00,3.312-0.416,6.50-1.00,9.625l 18.042,10.396c 8.417,4.917, 11.291,15.729, 6.458,24.104
-			c-4.876,8.479-15.667,11.375-24.125,6.50l-18.188-10.50c-4.876,4.146-10.375,7.396-16.50,9.604l0.00,20.896
-			c0.00,9.771-7.938,17.688-17.688,17.688s-17.666-7.917-17.666-17.688l0.00-20.875 c-6.126-2.188-11.646-5.479-16.521-9.625l-18.146,10.50
-			c-8.479,4.875-19.292,2.00-24.167-6.479c-4.875-8.417-1.938-19.25, 6.50-24.126l 17.959-10.375c-0.584-3.146-0.959-6.334-0.959-9.646
-			c0.00-3.313, 0.375-6.50, 0.959-9.624L 186.00,36.312c-8.459-4.875-11.375-15.75-6.50-24.188s 15.688-11.312, 24.125-6.438l 18.167,10.438
-			c 4.874-4.125, 10.396-7.375, 16.542-9.562l0.00-20.938 c0.00-9.749, 7.916-17.624, 17.666-17.624s 17.688,7.875, 17.688,17.624l0.00,20.938
-			c 6.125,2.188, 11.688,5.438, 16.521,9.625l 18.167-10.50c 8.458-4.875, 19.249-2.00, 24.125,6.438
-			C 337.375,20.562, 334.50,31.375, 326.042,36.312z M 256.00,38.625c-9.75,0.00-17.688,7.938-17.688,17.688s 7.938,17.646, 17.688,17.646
-			s 17.667-7.896, 17.667-17.646S 265.75,38.625, 256.00,38.625z M 474.166,83.75l-12.083,3.208c-0.291,3.833-1.208,7.479-2.896,10.979
-			l 8.771,8.771c 4.125,4.125, 4.104,10.792,0.00,14.854c-4.083,4.104-10.708,4.125-14.833,0.00l-8.791-8.75
-			c-3.459,1.625-7.146,2.562-10.959,2.875l-3.209,12.062c-1.499,5.583-7.25,8.938-12.874,7.438
-			c-5.604-1.521-8.875-7.271-7.417-12.875l 3.209-11.896c-1.584-1.084-3.084-2.292-4.50-3.667c-1.375-1.417-2.542-2.916-3.626-4.459
-			l-11.896,3.209c-5.604,1.499-11.396-1.876-12.896-7.438c-1.499-5.625, 1.876-11.354, 7.417-12.875l 12.00-3.229
-			c 0.334-3.771, 1.292-7.458, 2.979-10.959l-8.812-8.812c-4.083-4.104-4.062-10.729, 0.042-14.812
-			c 4.083-4.083, 10.708-4.125, 14.792-0.042l 8.832,8.833c 3.459-1.707, 7.168-2.666, 11.001-2.957l 3.166-12.021
-			c 1.542-5.604, 7.25-8.938, 12.876-7.438c 5.583,1.50, 8.957,7.249, 7.458,12.917l-3.209,11.896c 1.50,1.062, 3.042,2.25, 4.459,3.625
-			c 1.375,1.396, 2.542,2.938, 3.624,4.479l 11.917-3.209c 5.604-1.50, 11.375,1.854, 12.854,7.417
-			C 483.062,76.459, 479.75,82.208, 474.166,83.75z M 438.312,77.062c-4.125-4.125-10.771-4.104-14.875,0.00
-			c-4.062,4.062-4.104,10.729,0.00,14.854c 4.104,4.083, 10.771,4.083, 14.875,0.00C 442.375,87.812, 442.375,81.125, 438.312,77.062z
-			 M 118.938,137.50l-11.875-3.188c-1.104,1.50-2.25,3.021-3.646,4.438c-1.416,1.375-2.916,2.562-4.479,3.625l 3.188,11.938
-			c 1.50,5.604-1.834,11.375-7.375,12.854c-5.625,1.50-11.375-1.834-12.875-7.417l-3.25-12.062c-3.812-0.312-7.458-1.25-10.938-2.896
-			l-8.812,8.771c-4.125,4.125-10.75,4.104-14.834,0.00c-4.104-4.104-4.104-10.75,0.00-14.854l 8.771-8.771
-			c-1.646-3.50-2.604-7.188-2.896-10.979l-12.042-3.208c-5.625-1.542-8.959-7.25-7.458-12.875c 1.521-5.583, 7.271-8.875, 12.896-7.417
-			l 11.875,3.23c 1.062-1.604, 2.25-3.105, 3.688-4.501c 1.375-1.375, 2.875-2.604, 4.438-3.625l-3.188-11.896
-			c-1.50-5.625, 1.834-11.417, 7.416-12.917c 5.626-1.50, 11.334,1.833, 12.834,7.438l 3.25,12.00c 3.812,0.312, 7.50,1.271, 11.00,2.938l 8.791-8.792
-			c 4.084-4.124, 10.709-4.041, 14.834,0.042c 4.062,4.062, 4.125,10.708,0.00,14.812l-8.812,8.812c 1.688,3.46, 2.688,7.188, 2.938,11.001
-			l 12.062,3.188c 5.562,1.521, 8.896,7.25, 7.396,12.875C 130.334,135.624, 124.584,138.958, 118.938,137.50z M 88.562,109.042
-			c-4.104-4.104-10.75-4.104-14.875,0.00c-4.062,4.083-4.062,10.771,0.00,14.833c 4.125,4.083, 10.771,4.083, 14.875,0.00
-			S 92.625,113.125, 88.562,109.042z M 512.00,304.00c0.00,61.75-50.25,112.00-112.00,112.00c-5.312,0.00-10.562-0.375-15.792-1.125
-			C 354.334,455.583, 307.188,480.00, 256.00,480.00s-98.312-24.417-128.208-65.125C 122.562,415.625, 117.312,416.00, 112.00,416.00C 50.25,416.00,0.00,365.75,0.00,304.00
-			s 50.25-112.00, 112.00-112.00c 13.688,0.00, 27.084,2.50, 39.709,7.333C 180.666,174.083, 217.50,160.00, 256.00,160.00c 38.542,0.00, 75.333,14.083, 104.291,39.333
-			C 372.916,194.50, 386.312,192.00, 400.00,192.00C 461.75,192.00, 512.00,242.25, 512.00,304.00z" />
-<glyph unicode="&#xe21f;" d="M 326.042,36.312l-18.00,10.376
-			c 0.542,3.124, 0.957,6.311, 0.957,9.624c0.00,3.312-0.415,6.50-0.999,9.625l 18.042,10.396c 8.417,4.917, 11.291,15.729, 6.458,24.104
-			c-4.876,8.479-15.667,11.375-24.125,6.50l-18.188-10.50c-4.876,4.146-10.375,7.396-16.50,9.604l0.00,20.896
-			c0.00,9.771-7.938,17.688-17.688,17.688s-17.667-7.917-17.667-17.688l0.00-20.875 c-6.125-2.188-11.646-5.479-16.521-9.625l-18.146,10.50
-			c-8.479,4.875-19.291,2.00-24.166-6.479c-4.875-8.417-1.938-19.25, 6.50-24.126l 17.959-10.375c-0.584-3.146-0.959-6.334-0.959-9.646
-			c0.00-3.313, 0.375-6.50, 0.959-9.624L 186.00,36.312c-8.459-4.875-11.375-15.75-6.50-24.188s 15.688-11.312, 24.125-6.438l 18.167,10.438
-			c 4.874-4.125, 10.396-7.375, 16.541-9.562l0.00-20.938 c0.00-9.749, 7.917-17.624, 17.667-17.624s 17.688,7.875, 17.688,17.624l0.00,20.938
-			c 6.125,2.188, 11.688,5.438, 16.521,9.625l 18.167-10.50c 8.458-4.875, 19.249-2.00, 24.125,6.438
-			C 337.375,20.562, 334.50,31.375, 326.042,36.312z M 256.00,38.625c-9.75,0.00-17.688,7.938-17.688,17.688s 7.938,17.646, 17.688,17.646
-			s 17.666-7.896, 17.666-17.646S 265.75,38.625, 256.00,38.625z M 400.00,416.00c-5.312,0.00-10.562-0.375-15.792-1.125
-			C 354.333,455.583, 307.188,480.00, 256.00,480.00s-98.312-24.417-128.208-65.125C 122.562,415.625, 117.312,416.00, 112.00,416.00C 50.25,416.00,0.00,365.75,0.00,304.00
-			s 50.25-112.00, 112.00-112.00c 13.688,0.00, 27.084,2.50, 39.709,7.333C 180.666,174.083, 217.50,160.00, 256.00,160.00c 38.542,0.00, 75.333,14.083, 104.291,39.333
-			C 372.916,194.50, 386.312,192.00, 400.00,192.00c 61.75,0.00, 112.00,50.25, 112.00,112.00S 461.75,416.00, 400.00,416.00z" />
-<glyph unicode="&#xe220;" d="M 417.042,409.208C 393.062,433.771, 359.917,448.00, 325.312,448.00
-			c-34.562,0.00-67.688-14.229-91.665-38.792c-52.813-2.438-95.021-46.167-95.021-99.542c0.00-54.978, 44.709-99.708, 99.688-99.708
-			c 5.834,0.00, 11.604,0.501, 17.271,1.50c 20.729-13.521, 44.917-20.833, 69.729-20.833c 24.854,0.00, 49.063,7.312, 69.772,20.833
-			c 5.707-0.999, 11.458-1.50, 17.291-1.50c 54.937,0.00, 99.625,44.73, 99.625,99.708C 512.00,363.042, 469.812,406.792, 417.042,409.208z
-			 M 144.00,223.312L 16.00,223.312 c-8.833,0.00-16.00-7.146-16.00-16.00c0.00-8.853, 7.167-16.00, 16.00-16.00l 128.00,0.00 c 8.833,0.00, 16.00,7.147, 16.00,16.00
-			C 160.00,216.166, 152.833,223.312, 144.00,223.312z M 16.00,255.312l 64.00,0.00 c 8.833,0.00, 16.00,7.146, 16.00,16.00c0.00,8.854-7.167,16.00-16.00,16.00L 16.00,287.312
-			c-8.833,0.00-16.00-7.146-16.00-16.00C0.00,262.458, 7.167,255.312, 16.00,255.312z M 48.00,319.312l 64.00,0.00 c 8.833,0.00, 16.00,7.146, 16.00,16.00c0.00,8.854-7.167,16.00-16.00,16.00L 48.00,351.312
-			c-8.833,0.00-16.00-7.146-16.00-16.00C 32.00,326.458, 39.167,319.312, 48.00,319.312z M 224.00,96.00c0.00-17.688, 14.312-32.00, 32.00-32.00s 32.00,14.312, 32.00,32.00s-32.00,64.00-32.00,64.00
-			S 224.00,113.688, 224.00,96.00z M 352.00,32.00c0.00-17.688, 14.312-32.00, 32.00-32.00s 32.00,14.312, 32.00,32.00s-32.00,64.00-32.00,64.00S 352.00,49.688, 352.00,32.00z" />
-<glyph unicode="&#xe221;" d="M 417.042,313.917c-23.979,24.542-57.125,38.771-91.73,38.771
-			c-34.562,0.00-67.688-14.229-91.687-38.771c-52.812-2.459-95.00-46.188-95.00-99.584c0.00-54.958, 44.709-99.666, 99.688-99.666
-			c 5.812,0.00, 11.604,0.50, 17.25,1.499c 20.75-13.541, 44.938-20.854, 69.749-20.854c 24.854,0.00, 49.063,7.313, 69.772,20.854
-			c 5.707-0.999, 11.458-1.499, 17.291-1.499c 54.937,0.00, 99.625,44.708, 99.625,99.666C 512.00,267.729, 469.812,311.458, 417.042,313.917z
-			 M 144.00,128.00L 16.00,128.00 c-8.833,0.00-16.00-7.167-16.00-16.00s 7.167-16.00, 16.00-16.00l 128.00,0.00 c 8.833,0.00, 16.00,7.167, 16.00,16.00S 152.833,128.00, 144.00,128.00z M 16.00,160.00l 64.00,0.00
-			c 8.833,0.00, 16.00,7.167, 16.00,16.00s-7.167,16.00-16.00,16.00L 16.00,192.00 c-8.833,0.00-16.00-7.167-16.00-16.00S 7.167,160.00, 16.00,160.00z M 48.00,224.00l 64.00,0.00 c 8.833,0.00, 16.00,7.167, 16.00,16.00
-			s-7.167,16.00-16.00,16.00L 48.00,256.00 c-8.833,0.00-16.00-7.167-16.00-16.00S 39.167,224.00, 48.00,224.00z" />
-<glyph unicode="&#xe222;" d="M 400.00,416.00c-5.312,0.00-10.562-0.375-15.792-1.125
-			C 354.334,455.583, 307.188,480.00, 256.00,480.00s-98.312-24.417-128.208-65.125C 122.562,415.625, 117.312,416.00, 112.00,416.00C 50.25,416.00,0.00,365.75,0.00,304.00
-			s 50.25-112.00, 112.00-112.00c 13.688,0.00, 27.084,2.50, 39.709,7.333C 180.666,174.083, 217.50,160.00, 256.00,160.00c 38.542,0.00, 75.333,14.083, 104.291,39.333
-			C 372.916,194.50, 386.312,192.00, 400.00,192.00c 61.75,0.00, 112.00,50.25, 112.00,112.00S 461.75,416.00, 400.00,416.00z M 225.00,0.00c0.00-17.688, 14.312-32.00, 32.00-32.00
-			s 32.00,14.312, 32.00,32.00s-32.00,64.00-32.00,64.00S 225.00,17.688, 225.00,0.00z M 352.00,32.00c0.00-17.688, 14.312-32.00, 32.00-32.00s 32.00,14.312, 32.00,32.00s-32.00,64.00-32.00,64.00
-			S 352.00,49.688, 352.00,32.00z M 96.00,96.00c0.00-17.688, 14.312-32.00, 32.00-32.00s 32.00,14.312, 32.00,32.00s-32.00,64.00-32.00,64.00S 96.00,113.688, 96.00,96.00z" />
-<glyph unicode="&#xe223;" d="M 400.00,384.00c-5.312,0.00-10.562-0.375-15.792-1.125
-			C 354.334,423.583, 307.188,448.00, 256.00,448.00s-98.312-24.417-128.208-65.125C 122.562,383.625, 117.312,384.00, 112.00,384.00C 50.25,384.00,0.00,333.75,0.00,272.00
-			c0.00-61.75, 50.25-112.00, 112.00-112.00c 13.688,0.00, 27.084,2.50, 39.709,7.333C 180.666,142.083, 217.50,128.00, 256.00,128.00
-			c 38.542,0.00, 75.333,14.083, 104.291,39.333C 372.916,162.50, 386.312,160.00, 400.00,160.00c 61.75,0.00, 112.00,50.25, 112.00,112.00
-			C 512.00,333.75, 461.75,384.00, 400.00,384.00z M 224.00,32.00c0.00-17.688, 14.312-32.00, 32.00-32.00s 32.00,14.312, 32.00,32.00s-32.00,64.00-32.00,64.00S 224.00,49.688, 224.00,32.00z" />
-<glyph unicode="&#xe224;" d="M 400.00,416.00c-5.312,0.00-10.562-0.375-15.792-1.125C 354.334,455.583, 307.188,480.00, 256.00,480.00
-	c-51.188,0.00-98.312-24.417-128.208-65.125C 122.562,415.625, 117.312,416.00, 112.00,416.00C 50.25,416.00,0.00,365.75,0.00,304.00s 50.25-112.00, 112.00-112.00
-	c 13.688,0.00, 27.084,2.50, 39.709,7.333c 21.541-18.771, 47.416-31.291, 75.104-36.521L 192.00,128.00l 32.00-32.00l-32.00-96.00l 96.00,96.00l-32.00,32.00l 11.00,32.999
-	c 34.458,2.438, 67.125,15.543, 93.291,38.334C 372.916,194.50, 386.312,192.00, 400.00,192.00c 61.75,0.00, 112.00,50.25, 112.00,112.00S 461.75,416.00, 400.00,416.00z" />
-<glyph unicode="&#xe225;" d="M 400.00,320.00c-5.312,0.00-10.562-0.375-15.792-1.125
-	C 354.334,359.583, 307.188,384.00, 256.00,384.00s-98.312-24.417-128.208-65.125C 122.562,319.625, 117.312,320.00, 112.00,320.00C 50.25,320.00,0.00,269.75,0.00,208.00
-	c0.00-61.75, 50.25-112.00, 112.00-112.00c 13.688,0.00, 27.084,2.50, 39.709,7.333C 180.666,78.083, 217.50,64.00, 256.00,64.00
-	c 38.542,0.00, 75.333,14.083, 104.291,39.333C 372.916,98.50, 386.312,96.00, 400.00,96.00c 61.75,0.00, 112.00,50.25, 112.00,112.00
-	C 512.00,269.75, 461.75,320.00, 400.00,320.00z" />
-<glyph unicode="&#xe226;" d="M 435.062,217.834c 4.875,3.625, 9.812,7.187, 14.229,11.604c 13.208,13.229, 23.271,29.333, 29.792,47.854
-	c 2.083,5.792, 0.604,12.292-3.772,16.625c-4.354,4.375-10.812,5.854-16.623,3.792c-35.396-12.50-73.688-4.00-99.896,22.25
-	c-26.249,26.25-34.791,64.521-22.249,99.896c 2.042,5.812, 0.583,12.271-3.792,16.646c-4.333,4.333-10.812,5.833-16.625,3.791
-	c-18.542-6.583-34.625-16.625-47.834-29.833c-33.541-33.50-43.979-81.00-32.479-123.792c-43.25-5.521-82.125-28.50-108.021-63.792
-	c-5.229,0.75-10.479,1.125-15.792,1.125c-61.75,0.00-112.00-50.249-112.00-112.00c0.00-61.75, 50.25-112.00, 112.00-112.00c 13.688,0.00, 27.084,2.501, 39.709,7.334
-	C 180.665-17.916, 217.499-32.00, 255.999-32.00c 38.542,0.00, 75.333,14.084, 104.291,39.334c 12.625-4.833, 26.021-7.334, 39.709-7.334
-	c 61.75,0.00, 112.00,50.25, 112.00,112.00C 512.00,161.438, 479.583,203.021, 435.062,217.834z M 290.916,387.833c 2.542,2.583, 5.271,4.979, 8.146,7.229
-	c-2.25-35.979, 10.729-71.375, 37.104-97.729c 26.376-26.375, 61.771-39.333, 97.751-37.104c-13.792-17.584-32.792-28.521-53.126-33.188
-	c-27.375,34.75-67.604,56.624-111.958,60.187C 256.562,321.187, 263.75,360.667, 290.916,387.833z" />
-<glyph unicode="&#xe227;" d="M 208.00,416.00c 8.833,0.00, 16.00,7.167, 16.00,16.00L 224.00,464.00 c0.00,8.833-7.167,16.00-16.00,16.00s-16.00-7.167-16.00-16.00l0.00-32.00
-			C 192.00,423.167, 199.167,416.00, 208.00,416.00z M 332.438,373.833l 22.625,22.625c 6.249,6.25, 6.249,16.375,0.00,22.625
-			c-6.25,6.25-16.375,6.25-22.625,0.00l-22.625-22.625c-6.25-6.25-6.25-16.375,0.00-22.625
-			C 316.062,367.583, 326.188,367.583, 332.438,373.833z M 16.00,256.00l 32.00,0.00 c 8.833,0.00, 16.00,7.167, 16.00,16.00s-7.167,16.00-16.00,16.00L 16.00,288.00
-			c-8.833,0.00-16.00-7.167-16.00-16.00S 7.167,256.00, 16.00,256.00z M 352.00,272.00c0.00-8.833, 7.167-16.00, 16.00-16.00l 32.00,0.00 c 8.833,0.00, 16.00,7.167, 16.00,16.00s-7.167,16.00-16.00,16.00l-32.00,0.00
-			C 359.167,288.00, 352.00,280.833, 352.00,272.00z M 83.541,373.833c 6.251-6.25, 16.376-6.25, 22.625,0.00c 6.251,6.25, 6.251,16.375,0.00,22.625
-			L 83.541,419.083c-6.25,6.25-16.374,6.25-22.625,0.00c-6.25-6.25-6.25-16.375,0.00-22.625L 83.541,373.833z M 400.00,224.00
-			c-5.312,0.00-10.562-0.375-15.792-1.125c-16.771,22.875-39.124,40.333-64.458,51.50C 318.459,335.00, 268.938,384.00, 208.00,384.00
-			c-61.75,0.00-112.00-50.25-112.00-112.00c0.00-17.438, 4.334-33.75, 11.50-48.438C 47.875,221.125,0.00,172.188,0.00,112.00c0.00-61.75, 50.25-112.00, 112.00-112.00
-			c 13.688,0.00, 27.084,2.50, 39.709,7.333C 180.666-17.917, 217.50-32.00, 256.00-32.00c 38.542,0.00, 75.333,14.083, 104.291,39.333
-			C 372.916,2.50, 386.312,0.00, 400.00,0.00c 61.75,0.00, 112.00,50.25, 112.00,112.00S 461.75,224.00, 400.00,224.00z M 256.00,288.00c-45.938,0.00-88.50-19.812-118.375-53.25
-			C 131.688,245.917, 128.00,258.458, 128.00,272.00c0.00,44.188, 35.812,80.00, 80.00,80.00c 39.812,0.00, 72.562-29.167, 78.708-67.25
-			C 276.688,286.75, 266.459,288.00, 256.00,288.00z" />
-<glyph unicode="&#xe228;" d="M 248.082,216.068c-31.52,31.542-39.979,77.105-26.02,116.542
-	c-15.25-5.395-29.668-13.833-41.854-26.02c-43.751-43.75-43.751-114.667,0.00-158.395c 43.729-43.73, 114.625-43.752, 158.374,0.00
-	c 12.229,12.186, 20.646,26.604, 26.021,41.854C 325.188,176.09, 279.604,184.549, 248.082,216.068z" />
-<glyph unicode="&#xe229;" d="M 256.00,336.00c-61.75,0.00-112.00-50.25-112.00-112.00c0.00-61.749, 50.25-112.00, 112.00-112.00
-			s 112.00,50.251, 112.00,112.00C 368.00,285.75, 317.75,336.00, 256.00,336.00z M 256.00,368.00c 8.833,0.00, 16.00,7.146, 16.00,16.00L 272.00,416.00 c0.00,8.833-7.167,16.00-16.00,16.00
-			c-8.854,0.00-16.00-7.167-16.00-16.00l0.00-32.00 C 240.00,375.146, 247.146,368.00, 256.00,368.00z M 256.00,80.00c-8.854,0.00-16.00-7.167-16.00-16.00l0.00-32.00 c0.00-8.854, 7.146-16.00, 16.00-16.00
-			c 8.833,0.00, 16.00,7.146, 16.00,16.00l0.00,32.00 C 272.00,72.833, 264.833,80.00, 256.00,80.00z M 380.417,325.833l 22.625,22.625c 6.25,6.25, 6.25,16.375,0.00,22.625
-			c-6.251,6.25-16.375,6.25-22.625,0.00l-22.625-22.625c-6.251-6.25-6.251-16.375,0.00-22.625
-			C 364.042,319.584, 374.166,319.584, 380.417,325.833z M 131.541,122.146l-22.623-22.625c-6.252-6.25-6.252-16.376,0.00-22.625
-			c 6.249-6.25, 16.373-6.25, 22.623,0.00l 22.625,22.625c 6.251,6.291, 6.251,16.375,0.00,22.625
-			C 147.917,128.396, 137.792,128.438, 131.541,122.146z M 112.00,224.00c0.00,8.833-7.167,16.00-16.00,16.00L 64.00,240.00 c-8.854,0.00-16.00-7.167-16.00-16.00
-			c0.00-8.854, 7.146-16.00, 16.00-16.00l 32.00,0.00 C 104.833,208.00, 112.00,215.146, 112.00,224.00z M 448.00,240.00l-32.00,0.00 c-8.854,0.00-16.00-7.167-16.00-16.00c0.00-8.854, 7.146-16.00, 16.00-16.00l 32.00,0.00
-			c 8.833,0.00, 16.00,7.146, 16.00,16.00C 464.00,232.833, 456.833,240.00, 448.00,240.00z M 131.521,325.833c 6.249-6.25, 16.375-6.25, 22.625,0.00
-			c 6.249,6.25, 6.249,16.375,0.00,22.625l-22.625,22.625c-6.25,6.25-16.376,6.25-22.625,0.00c-6.25-6.25-6.25-16.375,0.00-22.625
-			L 131.521,325.833z M 380.459,122.188c-6.293,6.25-16.376,6.25-22.625,0.00c-6.25-6.249-6.293-16.375,0.00-22.625l 22.625-22.625
-			c 6.249-6.249, 16.374-6.249, 22.625,0.00c 6.249,6.25, 6.249,16.376,0.00,22.625L 380.459,122.188z" />
-<glyph unicode="&#xe22a;" d="M 192.00,96.00l 32.00-32.00l-32.00-96.00l 96.00,96.00l-32.00,32.00l 32.00,64.00L 192.00,96.00z M 512.00,345.167c0.00,49.146-40.00,89.124-89.167,89.124
-			c-2.396,0.00-4.771-0.083-7.146-0.27C 392.562,462.854, 357.709,480.00, 320.00,480.00c-37.688,0.00-72.562-17.146-95.688-45.979
-			c-2.375,0.187-4.771,0.27-7.188,0.27C 168.00,434.291, 128.00,394.312, 128.00,345.167c0.00-5.146, 0.688-10.125, 1.50-15.042
-			c-0.542-0.708-1.188-1.354-1.708-2.083c-5.229,0.75-10.479,1.125-15.792,1.125c-61.75,0.00-112.00-50.25-112.00-112.00
-			c0.00-61.751, 50.25-112.00, 112.00-112.00c 13.688,0.00, 27.084,2.499, 39.709,7.333c 1.104-0.959, 2.416-1.625, 3.541-2.562l 28.312,18.875
-			c-9.438,6.688-18.25,14.125-25.625,23.00c-13.00-9.146-28.812-14.646-45.938-14.646c-44.188,0.00-80.00,35.791-80.00,80.00c0.00,44.167, 35.812,80.00, 80.00,80.00
-			c 10.812,0.00, 21.062-2.209, 30.438-6.083c 0.562,1.083, 1.25,2.00, 1.812,3.042c 5.625,10.271, 12.562,19.667, 20.666,28.042
-			c 23.084,23.896, 55.167,39.00, 91.084,39.00c 49.709,0.00, 92.334-28.667, 113.541-70.083c 5.646,2.333, 11.668,3.833, 17.875,4.833l 12.584,1.25
-			c 12.334,0.00, 23.875-3.042, 34.312-8.00c 11.312-5.417, 21.021-13.375, 28.646-23.208c 10.50-13.521, 17.042-30.334, 17.042-48.792
-			c0.00-44.209-35.812-80.00-80.00-80.00c-17.125,0.00-32.916,5.50-45.938,14.646c-14.00-16.875-32.438-29.562-53.146-37.562l-5.979-11.938l 18.25-18.25
-			c 17.062,6.646, 33.021,16.188, 47.104,28.438c 12.625-4.834, 26.021-7.333, 39.709-7.333c 61.75,0.00, 112.00,50.249, 112.00,112.00
-			c0.00,25.666-9.042,49.083-23.666,68.00C 502.916,301.042, 512.00,321.979, 512.00,345.167z M 465.562,307.542
-			c-18.479,13.438-41.00,21.625-65.562,21.625c-5.312,0.00-10.562-0.375-15.792-1.125C 354.334,368.729, 307.188,393.167, 256.00,393.167
-			c-34.125,0.00-66.312-11.062-92.938-30.354c 7.479,22.853, 28.729,39.478, 54.062,39.478c 7.75,0.00, 15.062-1.562, 21.75-4.333
-			C 254.062,427.542, 284.50,448.00, 320.00,448.00s 65.958-20.458, 81.084-50.042c 6.729,2.771, 14.083,4.333, 21.749,4.333
-			c 31.584,0.00, 57.167-25.583, 57.167-57.124C 480.00,330.667, 474.438,317.604, 465.562,307.542z" />
-<glyph unicode="&#xe22b;" d="M 512.00,345.167c0.00,49.146-40.00,89.124-89.167,89.124c-2.396,0.00-4.771-0.083-7.146-0.27
-	C 392.562,462.854, 357.709,480.00, 320.00,480.00c-37.688,0.00-72.562-17.146-95.688-45.979c-2.375,0.187-4.771,0.27-7.188,0.27
-	C 168.00,434.291, 128.00,394.312, 128.00,345.167c0.00-5.146, 0.688-10.125, 1.50-15.042c-0.542-0.708-1.188-1.354-1.708-2.083
-	c-5.229,0.75-10.479,1.125-15.792,1.125c-61.75,0.00-112.00-50.25-112.00-112.00c0.00-61.751, 50.25-112.00, 112.00-112.00c 13.688,0.00, 27.084,2.499, 39.709,7.333
-	c 18.354-16.00, 40.104-26.938, 63.207-33.208L 192.00,64.00l 32.00-32.00l-32.00-64.00l 96.00,64.00l-32.00,32.00l 4.812,9.583c 36.75,1.125, 71.75,14.729, 99.479,38.917
-	c 12.625-4.834, 26.021-7.333, 39.709-7.333c 61.75,0.00, 112.00,50.249, 112.00,112.00c0.00,25.666-9.042,49.083-23.666,68.00
-	C 502.916,301.042, 512.00,321.979, 512.00,345.167z M 400.00,137.167c-17.125,0.00-32.916,5.50-45.938,14.646c-19.00-22.896-45.75-38.729-76.229-44.125
-	l-23.771-2.312C 215.25,106.00, 181.00,124.00, 157.938,151.812c-13.00-9.146-28.812-14.646-45.938-14.646c-44.188,0.00-80.00,35.791-80.00,80.00
-	c0.00,44.167, 35.812,80.00, 80.00,80.00c 10.812,0.00, 21.062-2.209, 30.438-6.083c 0.562,1.083, 1.25,2.00, 1.812,3.042
-	c 5.625,10.271, 12.562,19.667, 20.666,28.042c 23.084,23.896, 55.167,39.00, 91.084,39.00c 49.709,0.00, 92.334-28.667, 113.541-70.083
-	c 5.646,2.333, 11.668,3.833, 17.875,4.833l 12.584,1.25c 12.334,0.00, 23.875-3.042, 34.312-8.00c 11.312-5.417, 21.021-13.375, 28.646-23.208
-	c 10.50-13.521, 17.042-30.334, 17.042-48.792C 480.00,172.958, 444.188,137.167, 400.00,137.167z M 465.562,307.542
-	c-18.479,13.438-41.00,21.625-65.562,21.625c-5.312,0.00-10.562-0.375-15.792-1.125C 354.334,368.729, 307.188,393.167, 256.00,393.167
-	c-34.125,0.00-66.312-11.062-92.938-30.354c 7.479,22.853, 28.729,39.478, 54.062,39.478c 7.75,0.00, 15.062-1.562, 21.75-4.333
-	C 254.062,427.542, 284.50,448.00, 320.00,448.00s 65.958-20.458, 81.084-50.042c 6.729,2.771, 14.083,4.333, 21.749,4.333
-	c 31.584,0.00, 57.167-25.583, 57.167-57.124C 480.00,330.667, 474.438,317.604, 465.562,307.542z" />
-<glyph unicode="&#xe22c;" d="M 512.00,239.999c0.00,49.167-40.00,89.146-89.167,89.146c-2.396,0.00-4.771-0.104-7.146-0.291
-	c-23.125,28.854-57.979,45.978-95.688,45.978c-37.688,0.00-72.562-17.124-95.688-45.979c-2.375,0.188-4.771,0.291-7.188,0.291
-	C 168.00,329.145, 128.00,289.166, 128.00,239.999c0.00-5.146, 0.688-10.104, 1.50-15.042c-0.542-0.708-1.188-1.354-1.708-2.083
-	c-5.229,0.75-10.479,1.125-15.792,1.125C 50.25,223.999,0.00,173.75,0.00,112.00c0.00-61.751, 50.25-112.00, 112.00-112.00c 13.688,0.00, 27.084,2.50, 39.709,7.333
-	C 180.666-17.917, 217.50-32.00, 256.00-32.00c 38.542,0.00, 75.333,14.083, 104.291,39.333C 372.916,2.50, 386.312,0.00, 400.00,0.00
-	c 61.75,0.00, 112.00,50.249, 112.00,112.00c0.00,25.688-9.042,49.083-23.666,67.999C 502.916,195.895, 512.00,216.832, 512.00,239.999z M 400.00,32.00
-	c-17.125,0.00-32.916,5.499-45.938,14.666C 330.583,18.375, 295.624,0.00, 256.00,0.00c-39.625,0.00-74.584,18.375-98.062,46.666
-	C 144.938,37.499, 129.126,32.00, 112.00,32.00c-44.188,0.00-80.00,35.812-80.00,80.00s 35.812,79.999, 80.00,79.999c 10.812,0.00, 21.062-2.188, 30.438-6.062
-	c 0.562,1.062, 1.25,2.00, 1.812,3.021c 5.625,10.271, 12.562,19.688, 20.666,28.042C 188.00,240.916, 220.083,256.00, 256.00,256.00
-	c 49.709,0.00, 92.334-28.666, 113.541-70.062c 5.646,2.312, 11.668,3.813, 17.875,4.812L 400.00,192.00c 12.334,0.00, 23.875-3.042, 34.312-8.00
-	c 11.312-5.416, 21.021-13.374, 28.646-23.188c 10.50-13.521, 17.042-30.354, 17.042-48.812C 480.00,67.812, 444.188,32.00, 400.00,32.00z
-	 M 465.562,202.375c-18.479,13.458-41.00,21.624-65.562,21.624c-5.312,0.00-10.562-0.375-15.792-1.125
-	c-29.874,40.708-77.021,65.125-128.208,65.125c-34.125,0.00-66.312-11.042-92.938-30.334c 7.479,22.854, 28.729,39.479, 54.062,39.479
-	c 7.75,0.00, 15.062-1.562, 21.75-4.332c 15.188,29.562, 45.625,50.02, 81.125,50.02s 65.958-20.457, 81.084-50.02
-	c 6.729,2.77, 14.083,4.332, 21.749,4.332c 31.584,0.00, 57.167-25.583, 57.167-57.146C 480.00,225.52, 474.438,212.458, 465.562,202.375z" />
-<glyph unicode="&#xe22d;" d="M 400.00,416.00c-5.312,0.00-10.562-0.375-15.792-1.125C 354.334,455.583, 307.188,480.00, 256.00,480.00
-			s-98.312-24.417-128.208-65.125C 122.562,415.625, 117.312,416.00, 112.00,416.00C 50.25,416.00,0.00,365.75,0.00,304.00s 50.25-112.00, 112.00-112.00
-			c 13.688,0.00, 27.084,2.50, 39.709,7.333C 180.666,174.083, 217.50,160.00, 256.00,160.00c 38.542,0.00, 75.333,14.083, 104.291,39.333
-			C 372.916,194.50, 386.312,192.00, 400.00,192.00c 61.75,0.00, 112.00,50.25, 112.00,112.00S 461.75,416.00, 400.00,416.00z M 400.00,224.00c-9.709,0.00-19.209,1.75-28.25,5.208
-			l-18.00,6.917l-14.50-12.667C 316.00,203.167, 286.438,192.00, 256.00,192.00s-60.00,11.167-83.25,31.458l-14.50,12.667l-18.00-6.917
-			c-9.00-3.458-18.541-5.208-28.25-5.208c-44.125,0.00-80.00,35.896-80.00,80.00s 35.875,80.00, 80.00,80.00c 3.792,0.00, 7.50-0.271, 11.25-0.792l 18.958-2.75
-			l 11.354,15.458C 177.875,429.021, 215.209,448.00, 256.00,448.00c 40.812,0.00, 78.125-18.958, 102.417-52.063l 11.375-15.479l 18.999,2.75
-			C 392.50,383.729, 396.208,384.00, 400.00,384.00c 44.125,0.00, 80.00-35.896, 80.00-80.00S 444.125,224.00, 400.00,224.00z M 96.00,160.00c-17.688,0.00-32.00-14.312-32.00-32.00
-			s 14.312-32.00, 32.00-32.00s 32.00,14.312, 32.00,32.00S 113.688,160.00, 96.00,160.00z M 256.00,128.00c-17.688,0.00-32.00-14.312-32.00-32.00s 14.312-32.00, 32.00-32.00s 32.00,14.312, 32.00,32.00
-			S 273.688,128.00, 256.00,128.00z M 416.00,160.00c-17.688,0.00-32.00-14.312-32.00-32.00s 14.312-32.00, 32.00-32.00s 32.00,14.312, 32.00,32.00S 433.688,160.00, 416.00,160.00z M 352.00,32.00
-			c-17.688,0.00-32.00-14.312-32.00-32.00s 14.312-32.00, 32.00-32.00s 32.00,14.312, 32.00,32.00S 369.688,32.00, 352.00,32.00z M 160.00,32.00c-17.688,0.00-32.00-14.312-32.00-32.00
-			s 14.312-32.00, 32.00-32.00s 32.00,14.312, 32.00,32.00S 177.688,32.00, 160.00,32.00z" />
-<glyph unicode="&#xe22e;" d="M 326.042,36.312l-18.00,10.376
-			c 0.542,3.124, 0.958,6.311, 0.958,9.624c0.00,3.312-0.416,6.50-1.00,9.625l 18.042,10.396c 8.417,4.917, 11.291,15.729, 6.458,24.104
-			c-4.876,8.479-15.667,11.375-24.125,6.50l-18.188-10.50c-4.876,4.146-10.375,7.396-16.50,9.604l0.00,20.896
-			c0.00,9.771-7.938,17.688-17.688,17.688s-17.666-7.917-17.666-17.688l0.00-20.875 c-6.126-2.188-11.646-5.479-16.521-9.625l-18.146,10.50
-			c-8.479,4.875-19.292,2.00-24.167-6.479c-4.875-8.417-1.938-19.25, 6.50-24.126l 17.959-10.375c-0.584-3.146-0.959-6.334-0.959-9.646
-			c0.00-3.313, 0.375-6.50, 0.959-9.624L 186.00,36.312c-8.459-4.875-11.375-15.75-6.50-24.188s 15.688-11.312, 24.125-6.438l 18.167,10.438
-			c 4.874-4.125, 10.396-7.375, 16.542-9.562l0.00-20.938 c0.00-9.749, 7.916-17.624, 17.666-17.624s 17.688,7.875, 17.688,17.624l0.00,20.938
-			c 6.125,2.188, 11.688,5.438, 16.521,9.625l 18.167-10.50c 8.458-4.875, 19.249-2.00, 24.125,6.438
-			C 337.375,20.562, 334.50,31.375, 326.042,36.312z M 256.00,38.625c-9.75,0.00-17.688,7.938-17.688,17.688s 7.938,17.646, 17.688,17.646
-			s 17.667-7.896, 17.667-17.646S 265.75,38.625, 256.00,38.625z M 474.166,83.75l-12.083,3.208c-0.291,3.833-1.208,7.479-2.896,10.979
-			l 8.771,8.771c 4.125,4.125, 4.104,10.792,0.00,14.854c-4.083,4.104-10.708,4.125-14.833,0.00l-8.791-8.75
-			c-3.459,1.625-7.146,2.562-10.959,2.875l-3.209,12.062c-1.499,5.583-7.25,8.938-12.874,7.438
-			c-5.604-1.521-8.875-7.271-7.417-12.875l 3.209-11.896c-1.584-1.084-3.084-2.292-4.50-3.667c-1.375-1.417-2.542-2.916-3.626-4.459
-			l-11.896,3.209c-5.604,1.499-11.396-1.876-12.896-7.438c-1.499-5.625, 1.876-11.354, 7.417-12.875l 12.00-3.229
-			c 0.334-3.771, 1.292-7.458, 2.979-10.959l-8.812-8.812c-4.083-4.104-4.062-10.729, 0.042-14.812
-			c 4.083-4.083, 10.708-4.125, 14.792-0.042l 8.832,8.833c 3.459-1.707, 7.168-2.666, 11.001-2.957l 3.166-12.021
-			c 1.542-5.604, 7.25-8.938, 12.876-7.438c 5.583,1.50, 8.957,7.249, 7.458,12.917l-3.209,11.896c 1.50,1.062, 3.042,2.25, 4.459,3.625
-			c 1.375,1.396, 2.542,2.938, 3.624,4.479l 11.917-3.209c 5.604-1.50, 11.375,1.854, 12.854,7.417
-			C 483.062,76.459, 479.75,82.208, 474.166,83.75z M 438.312,77.062c-4.125-4.125-10.771-4.104-14.875,0.00
-			c-4.062,4.062-4.104,10.729,0.00,14.854c 4.104,4.083, 10.771,4.083, 14.875,0.00C 442.375,87.812, 442.375,81.125, 438.312,77.062z
-			 M 118.938,137.50l-11.875-3.188c-1.104,1.50-2.25,3.021-3.646,4.438c-1.416,1.375-2.916,2.562-4.479,3.625l 3.188,11.938
-			c 1.50,5.604-1.834,11.375-7.375,12.854c-5.625,1.50-11.375-1.834-12.875-7.417l-3.25-12.062c-3.812-0.312-7.458-1.25-10.938-2.896
-			l-8.812,8.771c-4.125,4.125-10.75,4.104-14.834,0.00c-4.104-4.104-4.104-10.75,0.00-14.854l 8.771-8.771
-			c-1.646-3.50-2.604-7.188-2.896-10.979l-12.042-3.208c-5.625-1.542-8.959-7.25-7.458-12.875c 1.521-5.583, 7.271-8.875, 12.896-7.417
-			l 11.875,3.23c 1.062-1.604, 2.25-3.105, 3.688-4.501c 1.375-1.375, 2.875-2.604, 4.438-3.625l-3.188-11.896
-			c-1.50-5.625, 1.834-11.417, 7.416-12.917c 5.626-1.50, 11.334,1.833, 12.834,7.438l 3.25,12.00c 3.812,0.312, 7.50,1.271, 11.00,2.938l 8.791-8.792
-			c 4.084-4.124, 10.709-4.041, 14.834,0.042c 4.062,4.062, 4.125,10.708,0.00,14.812l-8.812,8.812c 1.688,3.46, 2.688,7.188, 2.938,11.001
-			l 12.062,3.188c 5.562,1.521, 8.896,7.25, 7.396,12.875C 130.334,135.624, 124.584,138.958, 118.938,137.50z M 88.562,109.042
-			c-4.104-4.104-10.75-4.104-14.875,0.00c-4.062,4.083-4.062,10.771,0.00,14.833c 4.125,4.083, 10.771,4.083, 14.875,0.00
-			S 92.625,113.125, 88.562,109.042z M 512.00,304.00c0.00,61.75-50.25,112.00-112.00,112.00c-5.312,0.00-10.562-0.375-15.792-1.125
-			C 354.334,455.583, 307.188,480.00, 256.00,480.00s-98.312-24.417-128.208-65.125C 122.562,415.625, 117.312,416.00, 112.00,416.00C 50.25,416.00,0.00,365.75,0.00,304.00
-			s 50.25-112.00, 112.00-112.00c 13.688,0.00, 27.084,2.50, 39.709,7.333C 180.666,174.083, 217.50,160.00, 256.00,160.00c 38.542,0.00, 75.333,14.083, 104.291,39.333
-			C 372.916,194.50, 386.312,192.00, 400.00,192.00C 461.75,192.00, 512.00,242.25, 512.00,304.00z M 354.062,238.667C 330.584,210.375, 295.624,192.00, 256.00,192.00
-			c-39.625,0.00-74.584,18.375-98.062,46.667C 144.938,229.50, 129.125,224.00, 112.00,224.00c-44.188,0.00-80.00,35.812-80.00,80.00s 35.812,80.00, 80.00,80.00
-			c 10.812,0.00, 21.062-2.208, 30.438-6.083C 163.667,419.333, 206.291,448.00, 256.00,448.00s 92.334-28.667, 113.541-70.083
-			C 378.938,381.792, 389.209,384.00, 400.00,384.00c 44.188,0.00, 80.00-35.812, 80.00-80.00s-35.812-80.00-80.00-80.00C 382.875,224.00, 367.084,229.50, 354.062,238.667z" />
-<glyph unicode="&#xe22f;" d="M 326.042,132.312l-18.00,10.375c 0.542,3.125, 0.958,6.312, 0.958,9.625c0.00,3.312-0.416,6.50-1.00,9.625
-			l 18.042,10.396c 8.417,4.917, 11.291,15.729, 6.458,24.104c-4.876,8.479-15.667,11.375-24.125,6.50l-18.188-10.50
-			c-4.877,4.146-10.375,7.396-16.50,9.604l0.00,20.896 c0.00,9.771-7.938,17.688-17.688,17.688s-17.666-7.917-17.666-17.688l0.00-20.875
-			c-6.126-2.188-11.646-5.479-16.521-9.625l-18.146,10.50c-8.479,4.875-19.292,2.00-24.167-6.479c-4.875-8.417-1.938-19.25, 6.50-24.126
-			l 17.959-10.375c-0.584-3.146-0.959-6.334-0.959-9.646s 0.375-6.50, 0.959-9.623L 186.00,132.312c-8.459-4.875-11.375-15.75-6.50-24.188
-			s 15.688-11.312, 24.125-6.438l 18.167,10.438c 4.874-4.125, 10.396-7.375, 16.542-9.562l0.00-20.938 c0.00-9.749, 7.916-17.624, 17.666-17.624
-			s 17.688,7.875, 17.688,17.624l0.00,20.938 c 6.125,2.188, 11.688,5.438, 16.521,9.625l 18.167-10.50c 8.458-4.875, 19.249-2.00, 24.125,6.438
-			C 337.375,116.562, 334.50,127.375, 326.042,132.312z M 256.00,134.625c-9.75,0.00-17.688,7.938-17.688,17.688s 7.938,17.646, 17.688,17.646
-			s 17.667-7.896, 17.667-17.646S 265.75,134.625, 256.00,134.625z M 400.00,416.00c-5.312,0.00-10.562-0.375-15.792-1.125
-			C 354.334,455.583, 307.188,480.00, 256.00,480.00c-51.188,0.00-98.312-24.417-128.208-65.125C 122.562,415.625, 117.312,416.00, 112.00,416.00
-			C 50.25,416.00,0.00,365.75,0.00,304.00s 50.25-112.00, 112.00-112.00c 11.812,0.00, 23.334,2.208, 34.438,5.834c 1.062,5.082, 2.729,10.041, 5.375,14.645
-			c 3.938,6.854, 9.562,12.312, 16.00,16.502c-3.312,3.229-6.938,6.104-9.875,9.688C 144.938,229.50, 129.125,224.00, 112.00,224.00
-			c-44.188,0.00-80.00,35.812-80.00,80.00c0.00,44.188, 35.812,80.00, 80.00,80.00c 10.812,0.00, 21.062-2.208, 30.438-6.083C 163.667,419.333, 206.291,448.00, 256.00,448.00
-			s 92.334-28.667, 113.541-70.083C 378.938,381.792, 389.209,384.00, 400.00,384.00c 44.188,0.00, 80.00-35.812, 80.00-80.00c0.00-44.188-35.812-80.00-80.00-80.00
-			c-17.125,0.00-32.916,5.50-45.938,14.667c-2.938-3.583-6.604-6.459-9.896-9.688c 6.459-4.207, 12.125-9.688, 16.042-16.562
-			c 2.708-4.646, 4.354-9.584, 5.416-14.583C 376.688,194.208, 388.188,192.00, 400.00,192.00c 61.75,0.00, 112.00,50.25, 112.00,112.00S 461.75,416.00, 400.00,416.00z" />
-<glyph unicode="&#xe230;" d="M 326.042,36.312l-18.00,10.376
-			c 0.542,3.124, 0.958,6.311, 0.958,9.624c0.00,3.312-0.416,6.50-1.00,9.625l 18.042,10.396c 8.417,4.917, 11.291,15.729, 6.458,24.104
-			c-4.876,8.479-15.667,11.375-24.125,6.50l-18.188-10.50c-4.876,4.146-10.375,7.396-16.50,9.604l0.00,20.896
-			c0.00,9.771-7.938,17.688-17.688,17.688s-17.666-7.917-17.666-17.688l0.00-20.875 c-6.126-2.188-11.646-5.479-16.521-9.625l-18.146,10.50
-			c-8.479,4.875-19.292,2.00-24.167-6.479c-4.875-8.417-1.938-19.25, 6.50-24.126l 17.959-10.375c-0.584-3.146-0.959-6.334-0.959-9.646
-			c0.00-3.313, 0.375-6.50, 0.959-9.624L 186.00,36.312c-8.459-4.875-11.375-15.75-6.50-24.188s 15.688-11.312, 24.125-6.438l 18.167,10.438
-			c 4.874-4.125, 10.396-7.375, 16.542-9.562l0.00-20.938 c0.00-9.749, 7.916-17.624, 17.666-17.624s 17.688,7.875, 17.688,17.624l0.00,20.938
-			c 6.125,2.188, 11.688,5.438, 16.521,9.625l 18.167-10.50c 8.458-4.875, 19.249-2.00, 24.125,6.438
-			C 337.375,20.562, 334.50,31.375, 326.042,36.312z M 256.00,38.625c-9.75,0.00-17.688,7.938-17.688,17.688s 7.938,17.646, 17.688,17.646
-			s 17.667-7.896, 17.667-17.646S 265.75,38.625, 256.00,38.625z M 400.00,416.00c-5.312,0.00-10.562-0.375-15.792-1.125
-			C 354.334,455.583, 307.188,480.00, 256.00,480.00s-98.312-24.417-128.208-65.125C 122.562,415.625, 117.312,416.00, 112.00,416.00C 50.25,416.00,0.00,365.75,0.00,304.00
-			s 50.25-112.00, 112.00-112.00c 13.688,0.00, 27.084,2.50, 39.709,7.333C 180.666,174.083, 217.50,160.00, 256.00,160.00c 38.542,0.00, 75.333,14.083, 104.291,39.333
-			C 372.916,194.50, 386.312,192.00, 400.00,192.00c 61.75,0.00, 112.00,50.25, 112.00,112.00S 461.75,416.00, 400.00,416.00z M 400.00,224.00c-17.125,0.00-32.916,5.50-45.938,14.667
-			C 330.584,210.375, 295.624,192.00, 256.00,192.00c-39.625,0.00-74.584,18.375-98.062,46.667C 144.938,229.50, 129.125,224.00, 112.00,224.00
-			c-44.188,0.00-80.00,35.812-80.00,80.00s 35.812,80.00, 80.00,80.00c 10.812,0.00, 21.062-2.208, 30.438-6.083C 163.667,419.333, 206.291,448.00, 256.00,448.00
-			s 92.334-28.667, 113.541-70.083C 378.938,381.792, 389.209,384.00, 400.00,384.00c 44.188,0.00, 80.00-35.812, 80.00-80.00S 444.188,224.00, 400.00,224.00z" />
-<glyph unicode="&#xe231;" d="M 417.042,409.208C 393.062,433.771, 359.917,448.00, 325.312,448.00
-			c-34.562,0.00-67.688-14.229-91.665-38.792c-52.813-2.438-95.021-46.167-95.021-99.542c0.00-54.978, 44.709-99.708, 99.688-99.708
-			c 5.834,0.00, 11.604,0.501, 17.271,1.50c 20.729-13.521, 44.917-20.833, 69.729-20.833c 24.854,0.00, 49.063,7.312, 69.772,20.833
-			c 5.707-0.999, 11.458-1.50, 17.291-1.50c 54.938,0.00, 99.625,44.73, 99.625,99.708C 512.00,363.042, 469.812,406.792, 417.042,409.208z
-			 M 412.375,241.958c-8.312,0.00-16.375,1.50-24.00,4.458c-17.50-15.25-39.75-23.792-63.063-23.792c-23.249,0.00-45.499,8.542-62.999,23.792
-			c-7.625-2.959-15.75-4.458-24.00-4.458c-37.312,0.00-67.688,30.375-67.688,67.708c0.00,37.292, 30.375,67.667, 67.688,67.667
-			c 3.188,0.00, 6.375-0.25, 9.521-0.688C 265.938,401.229, 294.375,416.00, 325.312,416.00c 30.938,0.00, 59.438-14.771, 77.501-39.354
-			c 3.125,0.438, 6.312,0.688, 9.562,0.688c 37.312,0.00, 67.625-30.375, 67.625-67.667C 480.00,272.333, 449.688,241.958, 412.375,241.958z
-			 M 144.00,223.312L 16.00,223.312 c-8.833,0.00-16.00-7.146-16.00-16.00c0.00-8.853, 7.167-16.00, 16.00-16.00l 128.00,0.00 c 8.833,0.00, 16.00,7.147, 16.00,16.00
-			C 160.00,216.166, 152.833,223.312, 144.00,223.312z M 16.00,255.312l 64.00,0.00 c 8.833,0.00, 16.00,7.146, 16.00,16.00c0.00,8.854-7.167,16.00-16.00,16.00L 16.00,287.312
-			c-8.833,0.00-16.00-7.146-16.00-16.00C0.00,262.458, 7.167,255.312, 16.00,255.312z M 48.00,319.312l 64.00,0.00 c 8.833,0.00, 16.00,7.146, 16.00,16.00c0.00,8.854-7.167,16.00-16.00,16.00L 48.00,351.312
-			c-8.833,0.00-16.00-7.146-16.00-16.00C 32.00,326.458, 39.167,319.312, 48.00,319.312z M 224.00,96.00c0.00-17.688, 14.312-32.00, 32.00-32.00s 32.00,14.312, 32.00,32.00s-32.00,64.00-32.00,64.00
-			S 224.00,113.688, 224.00,96.00z M 352.00,32.00c0.00-17.688, 14.312-32.00, 32.00-32.00s 32.00,14.312, 32.00,32.00s-32.00,64.00-32.00,64.00S 352.00,49.688, 352.00,32.00z" />
-<glyph unicode="&#xe232;" d="M 417.042,313.917c-23.979,24.542-57.125,38.771-91.73,38.771
-			c-34.562,0.00-67.688-14.229-91.665-38.771c-52.813-2.459-95.021-46.188-95.021-99.584c0.00-54.958, 44.709-99.666, 99.688-99.666
-			c 5.834,0.00, 11.604,0.50, 17.271,1.499c 20.729-13.541, 44.917-20.854, 69.729-20.854c 24.854,0.00, 49.063,7.313, 69.772,20.854
-			c 5.707-0.999, 11.458-1.499, 17.291-1.499c 54.937,0.00, 99.625,44.708, 99.625,99.666C 512.00,267.729, 469.812,311.458, 417.042,313.917z
-			 M 412.375,146.667c-8.312,0.00-16.375,1.499-24.00,4.417c-17.50-15.25-39.75-23.772-63.063-23.772c-23.249,0.00-45.499,8.522-62.999,23.772
-			c-7.625-2.918-15.75-4.417-24.00-4.417c-37.312,0.00-67.688,30.375-67.688,67.666c0.00,37.313, 30.375,67.688, 67.688,67.688
-			c 3.188,0.00, 6.375-0.229, 9.521-0.688c 18.104,24.583, 46.541,39.354, 77.478,39.354c 30.938,0.00, 59.438-14.771, 77.501-39.354
-			c 3.125,0.458, 6.312,0.688, 9.562,0.688c 37.312,0.00, 67.625-30.375, 67.625-67.688C 480.00,177.042, 449.688,146.667, 412.375,146.667z
-			 M 144.00,128.00L 16.00,128.00 c-8.833,0.00-16.00-7.167-16.00-16.00s 7.167-16.00, 16.00-16.00l 128.00,0.00 c 8.833,0.00, 16.00,7.167, 16.00,16.00S 152.833,128.00, 144.00,128.00z M 16.00,160.00l 64.00,0.00
-			c 8.833,0.00, 16.00,7.167, 16.00,16.00s-7.167,16.00-16.00,16.00L 16.00,192.00 c-8.833,0.00-16.00-7.167-16.00-16.00S 7.167,160.00, 16.00,160.00z M 48.00,224.00l 64.00,0.00 c 8.833,0.00, 16.00,7.167, 16.00,16.00
-			s-7.167,16.00-16.00,16.00L 48.00,256.00 c-8.833,0.00-16.00-7.167-16.00-16.00S 39.167,224.00, 48.00,224.00z" />
-<glyph unicode="&#xe233;" d="M 400.00,416.00c-5.312,0.00-10.562-0.375-15.792-1.125
-			C 354.334,455.583, 307.188,480.00, 256.00,480.00s-98.312-24.417-128.208-65.125C 122.562,415.625, 117.312,416.00, 112.00,416.00C 50.25,416.00,0.00,365.75,0.00,304.00
-			s 50.25-112.00, 112.00-112.00c 13.688,0.00, 27.084,2.50, 39.709,7.333C 180.666,174.083, 217.50,160.00, 256.00,160.00c 38.542,0.00, 75.333,14.083, 104.291,39.333
-			C 372.916,194.50, 386.312,192.00, 400.00,192.00c 61.75,0.00, 112.00,50.25, 112.00,112.00S 461.75,416.00, 400.00,416.00z M 400.00,224.00c-17.125,0.00-32.916,5.50-45.938,14.667
-			C 330.584,210.375, 295.624,192.00, 256.00,192.00c-39.625,0.00-74.584,18.375-98.062,46.667C 144.938,229.50, 129.125,224.00, 112.00,224.00
-			c-44.188,0.00-80.00,35.812-80.00,80.00s 35.812,80.00, 80.00,80.00c 10.812,0.00, 21.062-2.208, 30.438-6.083C 163.667,419.333, 206.291,448.00, 256.00,448.00
-			s 92.334-28.667, 113.541-70.083C 378.938,381.792, 389.209,384.00, 400.00,384.00c 44.188,0.00, 80.00-35.812, 80.00-80.00S 444.188,224.00, 400.00,224.00z M 225.00,0.00
-			c0.00-17.688, 14.312-32.00, 32.00-32.00s 32.00,14.312, 32.00,32.00s-32.00,64.00-32.00,64.00S 225.00,17.688, 225.00,0.00z M 352.00,32.00c0.00-17.688, 14.312-32.00, 32.00-32.00s 32.00,14.312, 32.00,32.00
-			s-32.00,64.00-32.00,64.00S 352.00,49.688, 352.00,32.00z M 96.00,96.00c0.00-17.688, 14.312-32.00, 32.00-32.00s 32.00,14.312, 32.00,32.00s-32.00,64.00-32.00,64.00S 96.00,113.688, 96.00,96.00z" />
-<glyph unicode="&#xe234;" d="M 400.00,384.00c-5.312,0.00-10.562-0.375-15.792-1.125
-			C 354.334,423.583, 307.188,448.00, 256.00,448.00s-98.312-24.417-128.208-65.125C 122.562,383.625, 117.312,384.00, 112.00,384.00C 50.25,384.00,0.00,333.75,0.00,272.00
-			c0.00-61.75, 50.25-112.00, 112.00-112.00c 13.688,0.00, 27.084,2.50, 39.709,7.333C 180.666,142.083, 217.50,128.00, 256.00,128.00
-			c 38.542,0.00, 75.333,14.083, 104.291,39.333C 372.916,162.50, 386.312,160.00, 400.00,160.00c 61.75,0.00, 112.00,50.25, 112.00,112.00
-			C 512.00,333.75, 461.75,384.00, 400.00,384.00z M 400.00,192.00c-17.125,0.00-32.916,5.50-45.938,14.667C 330.584,178.375, 295.624,160.00, 256.00,160.00
-			c-39.625,0.00-74.584,18.375-98.062,46.667C 144.938,197.50, 129.125,192.00, 112.00,192.00c-44.188,0.00-80.00,35.812-80.00,80.00s 35.812,80.00, 80.00,80.00
-			c 10.812,0.00, 21.062-2.208, 30.438-6.083C 163.667,387.333, 206.291,416.00, 256.00,416.00s 92.334-28.667, 113.541-70.083
-			C 378.938,349.792, 389.209,352.00, 400.00,352.00c 44.188,0.00, 80.00-35.812, 80.00-80.00S 444.188,192.00, 400.00,192.00z M 224.00,32.00c0.00-17.688, 14.312-32.00, 32.00-32.00
-			s 32.00,14.312, 32.00,32.00s-32.00,64.00-32.00,64.00S 224.00,49.688, 224.00,32.00z" />
-<glyph unicode="&#xe235;" d="M 400.00,416.00c-5.312,0.00-10.562-0.375-15.792-1.125C 354.334,455.583, 307.188,480.00, 256.00,480.00
-			c-51.188,0.00-98.312-24.417-128.208-65.125C 122.562,415.625, 117.312,416.00, 112.00,416.00C 50.25,416.00,0.00,365.75,0.00,304.00s 50.25-112.00, 112.00-112.00
-			c 13.688,0.00, 27.084,2.50, 39.709,7.333c 12.291-10.708, 26.25-18.958, 40.916-25.416l 24.916,24.874
-			c-23.458,7.626-44.166,21.271-59.604,39.876C 144.938,229.50, 129.125,224.00, 112.00,224.00c-44.188,0.00-80.00,35.812-80.00,80.00s 35.812,80.00, 80.00,80.00
-			c 10.812,0.00, 21.062-2.208, 30.438-6.083C 163.667,419.333, 206.291,448.00, 256.00,448.00s 92.334-28.667, 113.541-70.083
-			C 378.938,381.792, 389.209,384.00, 400.00,384.00c 44.188,0.00, 80.00-35.812, 80.00-80.00s-35.812-80.00-80.00-80.00c-17.125,0.00-32.916,5.50-45.938,14.667
-			c-10.375-12.521-23.312-22.667-37.625-30.584L 303.00,167.75c 20.875,6.562, 40.50,16.938, 57.291,31.583
-			C 372.916,194.50, 386.312,192.00, 400.00,192.00c 61.75,0.00, 112.00,50.25, 112.00,112.00S 461.75,416.00, 400.00,416.00z M 192.00,128.00l 32.00-32.00l-32.00-96.00l 96.00,96.00l-32.00,32.00l 32.00,96.00
-			L 192.00,128.00z" />
-<glyph unicode="&#xe236;" d="M 400.00,416.00c-5.312,0.00-10.562-0.375-15.792-1.125C 354.334,455.583, 307.188,480.00, 256.00,480.00
-	c-51.188,0.00-98.312-24.417-128.208-65.125C 122.562,415.625, 117.312,416.00, 112.00,416.00C 50.25,416.00,0.00,365.75,0.00,304.00s 50.25-112.00, 112.00-112.00
-	c 13.688,0.00, 27.084,2.50, 39.709,7.333c 21.541-18.771, 47.416-31.291, 75.104-36.521L 192.00,128.00l 32.00-32.00l-32.00-96.00l 96.00,96.00l-32.00,32.00l 11.00,32.999
-	c 34.458,2.438, 67.125,15.543, 93.291,38.334C 372.916,194.50, 386.312,192.00, 400.00,192.00c 61.75,0.00, 112.00,50.25, 112.00,112.00S 461.75,416.00, 400.00,416.00z
-	 M 400.00,224.00c-17.125,0.00-32.916,5.50-45.938,14.667c-18.938-22.833-45.562-38.625-75.875-44.104L 256.00,192.00
-	c-39.625,0.00-74.584,18.375-98.062,46.667C 144.938,229.50, 129.125,224.00, 112.00,224.00c-44.188,0.00-80.00,35.812-80.00,80.00s 35.812,80.00, 80.00,80.00
-	c 10.812,0.00, 21.062-2.208, 30.438-6.083C 163.667,419.333, 206.291,448.00, 256.00,448.00s 92.334-28.667, 113.541-70.083
-	C 378.938,381.792, 389.209,384.00, 400.00,384.00c 44.188,0.00, 80.00-35.812, 80.00-80.00S 444.188,224.00, 400.00,224.00z" />
-<glyph unicode="&#xe237;" d="M 400.00,320.00c-5.312,0.00-10.562-0.375-15.792-1.125
-	C 354.334,359.583, 307.188,384.00, 256.00,384.00s-98.312-24.417-128.208-65.125C 122.562,319.625, 117.312,320.00, 112.00,320.00C 50.25,320.00,0.00,269.75,0.00,208.00
-	c0.00-61.75, 50.25-112.00, 112.00-112.00c 13.688,0.00, 27.084,2.50, 39.709,7.333C 180.666,78.083, 217.50,64.00, 256.00,64.00
-	c 38.542,0.00, 75.333,14.083, 104.291,39.333C 372.916,98.50, 386.312,96.00, 400.00,96.00c 61.75,0.00, 112.00,50.25, 112.00,112.00
-	C 512.00,269.75, 461.75,320.00, 400.00,320.00z M 400.00,128.00c-17.125,0.00-32.916,5.50-45.938,14.667C 330.584,114.376, 295.624,96.00, 256.00,96.00
-	c-39.625,0.00-74.584,18.376-98.062,46.667C 144.938,133.50, 129.125,128.00, 112.00,128.00c-44.188,0.00-80.00,35.812-80.00,80.00s 35.812,80.00, 80.00,80.00
-	c 10.812,0.00, 21.062-2.208, 30.438-6.083C 163.667,323.333, 206.291,352.00, 256.00,352.00s 92.334-28.667, 113.541-70.083
-	C 378.938,285.792, 389.209,288.00, 400.00,288.00c 44.188,0.00, 80.00-35.812, 80.00-80.00S 444.188,128.00, 400.00,128.00z" />
-<glyph unicode="&#xe238;" d="M 112.00,320.00l 288.00,0.00 c 8.833,0.00, 16.00,7.167, 16.00,16.00s-7.167,16.00-16.00,16.00L 112.00,352.00 c-8.833,0.00-16.00-7.167-16.00-16.00S 103.167,320.00, 112.00,320.00z
-			 M 400.00,288.00L 112.00,288.00 c-8.833,0.00-16.00-7.167-16.00-16.00s 7.167-16.00, 16.00-16.00l 288.00,0.00 c 8.833,0.00, 16.00,7.167, 16.00,16.00S 408.833,288.00, 400.00,288.00z M 400.00,224.00L 112.00,224.00
-			c-8.833,0.00-16.00-7.167-16.00-16.00s 7.167-16.00, 16.00-16.00l 288.00,0.00 c 8.833,0.00, 16.00,7.167, 16.00,16.00S 408.833,224.00, 400.00,224.00z M 400.00,160.00L 112.00,160.00 c-8.833,0.00-16.00-7.167-16.00-16.00
-			s 7.167-16.00, 16.00-16.00l 288.00,0.00 c 8.833,0.00, 16.00,7.167, 16.00,16.00S 408.833,160.00, 400.00,160.00z" />
-<glyph unicode="&#xe239;" d="M 33.604,224.00C 32.562,229.167, 32.00,234.521, 32.00,240.00
-			c0.00,44.188, 35.812,80.00, 80.00,80.00c 10.812,0.00, 21.062-2.208, 30.438-6.083C 163.667,355.333, 206.291,384.00, 256.00,384.00s 92.334-28.667, 113.541-70.083
-			C 378.938,317.792, 389.209,320.00, 400.00,320.00c 44.188,0.00, 80.00-35.812, 80.00-80.00c0.00-5.479-0.562-10.833-1.625-16.00l 32.00,0.00
-			c 0.792,5.271, 1.625,10.521, 1.625,16.00c0.00,61.75-50.25,112.00-112.00,112.00c-5.312,0.00-10.562-0.375-15.792-1.125
-			C 354.334,391.583, 307.188,416.00, 256.00,416.00s-98.312-24.417-128.208-65.125C 122.562,351.625, 117.312,352.00, 112.00,352.00C 50.25,352.00,0.00,301.75,0.00,240.00
-			c0.00-5.479, 0.854-10.729, 1.625-16.00L 33.604,224.00 z M 496.00,192.00L 16.00,192.00 c-8.833,0.00-16.00-7.167-16.00-16.00s 7.167-16.00, 16.00-16.00l 480.00,0.00 c 8.833,0.00, 16.00,7.167, 16.00,16.00
-			S 504.833,192.00, 496.00,192.00z M 496.00,128.00L 16.00,128.00 c-8.833,0.00-16.00-7.167-16.00-16.00s 7.167-16.00, 16.00-16.00l 480.00,0.00 c 8.833,0.00, 16.00,7.167, 16.00,16.00S 504.833,128.00, 496.00,128.00z
-			 M 496.00,64.00L 16.00,64.00 c-8.833,0.00-16.00-7.167-16.00-16.00s 7.167-16.00, 16.00-16.00l 480.00,0.00 c 8.833,0.00, 16.00,7.167, 16.00,16.00S 504.833,64.00, 496.00,64.00z" />
-<glyph unicode="&#xe23a;" d="M 64.00,160.999l 384.00,0.00 c 8.833,0.00, 16.00,7.167, 16.00,16.00s-7.167,16.00-16.00,16.00L 64.00,192.999 c-8.833,0.00-16.00-7.167-16.00-16.00
-			S 55.167,160.999, 64.00,160.999z M 448.00,128.999L 64.00,128.999 c-8.833,0.00-16.00-7.167-16.00-16.00s 7.167-16.00, 16.00-16.00l 384.00,0.00 c 8.833,0.00, 16.00,7.167, 16.00,16.00
-			S 456.833,128.999, 448.00,128.999z M 448.00,64.999L 64.00,64.999 c-8.833,0.00-16.00-7.167-16.00-16.00s 7.167-16.00, 16.00-16.00l 384.00,0.00 c 8.833,0.00, 16.00,7.167, 16.00,16.00
-			S 456.833,64.999, 448.00,64.999z M 205.042,225.00c-0.333,0.333-0.751,0.542-1.083,0.875c-37.438,37.438-37.438,98.334,0.00,135.792
-			c 2.562,2.542, 5.27,4.958, 8.146,7.208c-2.251-35.958, 10.729-71.375, 37.104-97.729c 26.374-26.396, 61.79-39.333, 97.749-37.083
-			c-2.667-3.396-5.874-6.125-8.896-9.062l 41.521,0.00 c 5.042,8.042, 9.25,16.75, 12.583,26.063c 2.021,5.854, 0.542,12.333-3.833,16.667
-			c-4.291,4.354-10.792,5.854-16.624,3.791c-35.376-12.499-73.646-3.979-99.875,22.25c-26.251,26.25-34.792,64.521-22.251,99.896
-			c 2.083,5.812, 0.583,12.271-3.791,16.646c-4.334,4.354-10.813,5.833-16.625,3.771c-18.521-6.542-34.625-16.604-47.833-29.792
-			C 138.125,341.083, 132.479,274.521, 164.062,225.00L 205.042,225.00 z" />
-<glyph unicode="&#xe23b;" d="M 256.00,385.00c 8.833,0.00, 16.00,7.167, 16.00,16.00L 272.00,433.00 c0.00,8.833-7.167,16.00-16.00,16.00s-16.00-7.167-16.00-16.00l0.00-32.00
-			C 240.00,392.167, 247.167,385.00, 256.00,385.00z M 380.438,342.833l 22.625,22.625c 6.249,6.25, 6.249,16.375,0.00,22.625
-			c-6.25,6.25-16.375,6.25-22.625,0.00l-22.625-22.625c-6.25-6.25-6.25-16.375,0.00-22.625S 374.188,336.583, 380.438,342.833z M 64.00,225.00l 32.00,0.00
-			c 8.833,0.00, 16.00,7.167, 16.00,16.00s-7.167,16.00-16.00,16.00L 64.00,257.00 c-8.833,0.00-16.00-7.167-16.00-16.00S 55.167,225.00, 64.00,225.00z M 400.00,241.00c0.00-8.833, 7.167-16.00, 16.00-16.00l 32.00,0.00
-			c 8.833,0.00, 16.00,7.167, 16.00,16.00s-7.167,16.00-16.00,16.00l-32.00,0.00 C 407.167,257.00, 400.00,249.833, 400.00,241.00z M 131.541,342.833c 6.251-6.25, 16.376-6.25, 22.625,0.00
-			c 6.251,6.25, 6.251,16.375,0.00,22.625l-22.625,22.625c-6.25,6.25-16.374,6.25-22.625,0.00c-6.25-6.25-6.25-16.375,0.00-22.625
-			L 131.541,342.833z M 145.625,225.00l 32.00,0.00 c-1.062,5.167-1.625,10.521-1.625,16.00c0.00,44.188, 35.812,80.00, 80.00,80.00c 44.188,0.00, 80.00-35.812, 80.00-80.00
-			c0.00-5.479-0.562-10.833-1.625-16.00l 32.00,0.00 c 0.792,5.271, 1.625,10.521, 1.625,16.00c0.00,61.75-50.25,112.00-112.00,112.00s-112.00-50.25-112.00-112.00
-			C 144.00,235.521, 144.875,230.271, 145.625,225.00z M 448.00,193.00L 64.00,193.00 c-8.833,0.00-16.00-7.167-16.00-16.00s 7.167-16.00, 16.00-16.00l 384.00,0.00 c 8.833,0.00, 16.00,7.167, 16.00,16.00
-			S 456.833,193.00, 448.00,193.00z M 448.00,129.00L 64.00,129.00 c-8.833,0.00-16.00-7.167-16.00-16.00s 7.167-16.00, 16.00-16.00l 384.00,0.00 c 8.833,0.00, 16.00,7.167, 16.00,16.00S 456.833,129.00, 448.00,129.00z
-			 M 448.00,65.00L 64.00,65.00 c-8.833,0.00-16.00-7.167-16.00-16.00s 7.167-16.00, 16.00-16.00l 384.00,0.00 c 8.833,0.00, 16.00,7.167, 16.00,16.00S 456.833,65.00, 448.00,65.00z" />
-<glyph unicode="&#xe23c;" d="M 435.062,217.834c 4.875,3.625, 9.812,7.188, 14.229,11.604c 13.208,13.229, 23.271,29.333, 29.792,47.854
-	c 2.083,5.792, 0.604,12.292-3.772,16.625c-4.354,4.375-10.812,5.854-16.623,3.792c-35.396-12.50-73.688-4.00-99.896,22.25
-	C 332.542,346.21, 324.00,384.48, 336.542,419.855c 2.042,5.813, 0.583,12.271-3.792,16.646c-4.333,4.333-10.812,5.834-16.625,3.791
-	C 297.583,433.71, 281.50,423.669, 268.291,410.46c-33.541-33.50-43.979-81.00-32.479-123.792c-43.25-5.521-82.125-28.50-108.021-63.793
-	c-5.229,0.75-10.479,1.125-15.792,1.125c-61.75,0.00-112.00-50.25-112.00-112.001c0.00-61.749, 50.25-111.999, 112.00-111.999
-	c 13.688,0.00, 27.084,2.50, 39.709,7.334C 180.665-17.916, 217.499-32.00, 255.999-32.00c 38.542,0.00, 75.333,14.084, 104.291,39.334
-	C 372.915,2.50, 386.311,0.00, 399.999,0.00c 61.75,0.00, 112.00,50.25, 112.00,111.999C 512.00,161.438, 479.583,203.021, 435.062,217.834z
-	 M 290.916,387.834c 2.542,2.583, 5.271,4.979, 8.146,7.229c-2.25-35.979, 10.729-71.375, 37.104-97.729
-	c 26.376-26.375, 61.771-39.333, 97.751-37.104c-13.792-17.584-32.792-28.521-53.126-33.188
-	c-27.375,34.75-67.604,56.625-111.958,60.187C 256.562,321.188, 263.75,360.667, 290.916,387.834z M 400.00,32.00
-	c-17.125,0.00-32.916,5.50-45.938,14.667C 330.583,18.375, 295.624,0.00, 256.00,0.00c-39.625,0.00-74.584,18.375-98.062,46.667
-	C 144.938,37.50, 129.126,32.00, 112.00,32.00c-44.188,0.00-80.00,35.812-80.00,79.999c0.00,44.188, 35.812,80.00, 80.00,80.00c 10.812,0.00, 21.062-2.188, 30.438-6.062
-	c 20.188,39.355, 59.75,66.896, 106.312,69.543c 2.438,0.145, 4.812,0.521, 7.25,0.521c 12.916,0.00, 25.312-2.021, 37.00-5.583
-	c 15.791-4.834, 30.188-12.708, 42.688-22.854c 11.938-9.688, 21.938-21.562, 29.812-34.896c 1.333-2.25, 2.834-4.375, 4.041-6.729
-	c 9.396,3.875, 19.668,6.062, 30.459,6.062c 44.188,0.00, 80.00-35.812, 80.00-80.00S 444.188,32.00, 400.00,32.00z" />
-<glyph unicode="&#xe23d;" d="M 208.00,416.00c 8.833,0.00, 16.00,7.167, 16.00,16.00L 224.00,464.00 c0.00,8.833-7.167,16.00-16.00,16.00s-16.00-7.167-16.00-16.00l0.00-32.00
-			C 192.00,423.167, 199.167,416.00, 208.00,416.00z M 332.438,373.833l 22.625,22.625c 6.249,6.25, 6.249,16.375,0.00,22.625
-			c-6.25,6.25-16.375,6.25-22.625,0.00l-22.625-22.625c-6.25-6.25-6.25-16.375,0.00-22.625
-			C 316.062,367.583, 326.188,367.583, 332.438,373.833z M 16.00,256.00l 32.00,0.00 c 8.833,0.00, 16.00,7.167, 16.00,16.00s-7.167,16.00-16.00,16.00L 16.00,288.00
-			c-8.833,0.00-16.00-7.167-16.00-16.00S 7.167,256.00, 16.00,256.00z M 352.00,272.00c0.00-8.833, 7.167-16.00, 16.00-16.00l 32.00,0.00 c 8.833,0.00, 16.00,7.167, 16.00,16.00s-7.167,16.00-16.00,16.00l-32.00,0.00
-			C 359.167,288.00, 352.00,280.833, 352.00,272.00z M 83.541,373.833c 6.251-6.25, 16.376-6.25, 22.625,0.00c 6.251,6.25, 6.251,16.375,0.00,22.625
-			L 83.541,419.083c-6.25,6.25-16.374,6.25-22.625,0.00c-6.25-6.25-6.25-16.375,0.00-22.625L 83.541,373.833z M 400.00,224.00
-			c-5.312,0.00-10.562-0.375-15.792-1.125c-16.771,22.875-39.124,40.333-64.458,51.50C 318.459,335.00, 268.938,384.00, 208.00,384.00
-			c-61.75,0.00-112.00-50.25-112.00-112.00c0.00-17.438, 4.334-33.75, 11.50-48.438C 47.875,221.125,0.00,172.188,0.00,112.00c0.00-61.75, 50.25-112.00, 112.00-112.00
-			c 13.688,0.00, 27.084,2.50, 39.709,7.333C 180.666-17.917, 217.50-32.00, 256.00-32.00c 38.542,0.00, 75.333,14.083, 104.291,39.333
-			C 372.916,2.50, 386.312,0.00, 400.00,0.00c 61.75,0.00, 112.00,50.25, 112.00,112.00S 461.75,224.00, 400.00,224.00z M 208.00,352.00c 39.812,0.00, 72.562-29.167, 78.708-67.25
-			c-10.021,2.00-20.249,3.25-30.708,3.25c-45.938,0.00-88.50-19.812-118.375-53.25C 131.688,245.917, 128.00,258.458, 128.00,272.00
-			C 128.00,316.188, 163.812,352.00, 208.00,352.00z M 400.00,32.00c-17.125,0.00-32.916,5.50-45.938,14.667C 330.584,18.375, 295.624,0.00, 256.00,0.00
-			c-39.625,0.00-74.584,18.375-98.062,46.667C 144.938,37.50, 129.125,32.00, 112.00,32.00c-44.188,0.00-80.00,35.812-80.00,80.00s 35.812,80.00, 80.00,80.00
-			c 7.75,0.00, 15.062-1.458, 22.125-3.541c 2.812-0.792, 5.667-1.417, 8.312-2.521c 4.375,8.562, 9.875,16.396, 15.979,23.75
-			C 181.792,237.812, 216.562,256.00, 256.00,256.00c 10.125,0.00, 19.834-1.458, 29.25-3.709c 10.562-2.499, 20.542-6.291, 29.834-11.291
-			c 23.291-12.375, 42.416-31.542, 54.457-55.063C 378.938,189.812, 389.209,192.00, 400.00,192.00c 44.188,0.00, 80.00-35.812, 80.00-80.00S 444.188,32.00, 400.00,32.00z" />
-<glyph unicode="&#xe23e;" d="M 382.872,187.75l-32.625,18.834c 1.042,5.666, 1.75,11.458, 1.75,17.416c0.00,5.979-0.708,11.792-1.792,17.458
-	l 32.625,18.854c 15.333,8.875, 20.542,28.438, 11.729,43.688c-8.854,15.312-28.375,20.562-43.688,11.75l-32.938-19.021
-	c-8.812,7.50-18.854,13.417-29.938,17.354L 287.995,352.00 c0.00,17.667-14.312,32.00-32.00,32.00c-17.666,0.00-32.00-14.333-32.00-32.00l0.00-37.896
-	c-11.083-3.938-21.125-9.855-29.937-17.354l-32.876,18.979c-15.312,8.833-34.896,3.604-43.749-11.708
-	c-8.813-15.292-3.562-34.854, 11.749-43.688l 32.563-18.813c-1.062-5.688-1.751-11.521-1.751-17.521
-	c0.00-5.958, 0.688-11.771, 1.751-17.438l-32.584-18.812c-15.334-8.834-20.584-28.438-11.729-43.75
-	c 8.811-15.25, 28.395-20.50, 43.729-11.688l 32.833,18.979c 8.813-7.50, 18.875-13.458, 30.00-17.417L 223.994,96.00 c0.00-17.688, 14.334-32.00, 32.00-32.00
-	c 17.688,0.00, 32.00,14.312, 32.00,32.00l0.00,37.917 c 11.125,3.958, 21.188,9.875, 29.958,17.395l 32.917-18.999c 15.312-8.812, 34.876-3.562, 43.688,11.688
-	C 403.414,159.312, 398.185,178.875, 382.872,187.75z M 223.997,224.00c0.00,17.667, 14.312,32.00, 32.00,32.00c 17.667,0.00, 32.00-14.333, 32.00-32.00
-	c0.00-17.666-14.333-32.00-32.00-32.00C 238.31,192.00, 223.997,206.334, 223.997,224.00z" />
-<glyph unicode="&#xe23f;" d="M 431.00,288.00c-26.50,0.00-48.00-21.50-48.00-48.00c0.00-5.646, 1.167-10.958, 2.938-16.00L 79.00,224.00 c-8.833,0.00-16.00-7.167-16.00-16.00s 7.167-16.00, 16.00-16.00
-			l 352.00,0.00 c 26.50,0.00, 48.00,21.50, 48.00,48.00S 457.50,288.00, 431.00,288.00z M 79.00,256.00l 192.00,0.00 c 26.50,0.00, 48.00,21.50, 48.00,48.00s-21.50,48.00-48.00,48.00s-48.00-21.50-48.00-48.00
-			c0.00-5.646, 1.167-10.958, 2.938-16.00L 79.00,288.00 c-8.833,0.00-16.00-7.167-16.00-16.00S 70.167,256.00, 79.00,256.00z M 335.00,160.00c-0.938,0.00-1.834-0.208-2.791-0.291
-			c-0.625,0.041-1.146,0.291-1.771,0.291L 83.584,160.00 C 72.209,160.00, 63.00,152.833, 63.00,144.00s 9.209-16.00, 20.584-16.00l 206.354,0.00
-			c-1.771-5.042-2.938-10.376-2.938-16.00c0.00-26.50, 21.50-48.00, 48.00-48.00s 48.00,21.50, 48.00,48.00S 361.50,160.00, 335.00,160.00z" />
-<glyph unicode="&#xe240;" d="M 495.00,257.00l-81.625,0.00 C 405.312,328.792, 344.938,385.00, 271.00,385.00c-49.812,0.00-93.75-25.458-119.625-64.00L 47.00,321.00
-	c-8.833,0.00-16.00-7.167-16.00-16.00s 7.167-16.00, 16.00-16.00l 88.833,0.00 c-3.624-10.208-5.979-20.896-7.208-32.00L 79.00,257.00 c-8.833,0.00-16.00-7.167-16.00-16.00s 7.167-16.00, 16.00-16.00
-	l 49.625,0.00 c 1.229-11.084, 3.584-21.812, 7.208-32.00L 49.916,193.00 C 39.459,193.00, 31.00,185.833, 31.00,177.00s 8.459-16.00, 18.916-16.00l 101.459,0.00
-	c 25.875-38.562, 69.812-64.00, 119.625-64.00c 49.812,0.00, 93.75,25.438, 119.624,64.00l 37.46,0.00 c 10.457,0.00, 18.916,7.167, 18.916,16.00s-8.459,16.00-18.916,16.00
-	l-21.917,0.00 c 3.624,10.188, 5.958,20.916, 7.208,32.00L 495.00,225.00 c 8.833,0.00, 16.00,7.167, 16.00,16.00S 503.833,257.00, 495.00,257.00z M 170.229,289.00L 271.00,289.00
-	c 8.833,0.00, 16.00,7.167, 16.00,16.00s-7.167,16.00-16.00,16.00l-78.146,0.00 c 20.209,19.729, 47.729,32.00, 78.146,32.00c 56.291,0.00, 102.542-41.875, 110.375-96.00l-220.75,0.00
-	C 162.25,268.312, 165.459,279.042, 170.229,289.00z M 271.00,129.00c-30.417,0.00-57.938,12.291-78.146,32.00l 156.271,0.00
-	C 328.938,141.291, 301.417,129.00, 271.00,129.00z M 371.75,193.00L 170.229,193.00 c-4.77,9.958-7.979,20.688-9.604,32.00l 220.75,0.00
-	C 379.75,213.688, 376.541,202.958, 371.75,193.00z" />
-<glyph unicode="&#xe241;" d="M 271.00,353.00c 8.833,0.00, 16.00,7.167, 16.00,16.00L 287.00,401.00 c0.00,8.833-7.167,16.00-16.00,16.00s-16.00-7.167-16.00-16.00l0.00-32.00
-			C 255.00,360.167, 262.167,353.00, 271.00,353.00z M 271.00,65.00c-8.833,0.00-16.00-7.167-16.00-16.00l0.00-32.00 c0.00-8.833, 7.167-16.00, 16.00-16.00s 16.00,7.167, 16.00,16.00l0.00,32.00
-			C 287.00,57.833, 279.833,65.00, 271.00,65.00z M 146.562,107.166l-22.625-22.625c-6.25-6.249-6.25-16.374,0.00-22.624s 16.375-6.25, 22.625,0.00
-			l 22.625,22.624c 6.25,6.271, 6.25,16.376,0.00,22.625C 162.938,113.417, 152.812,113.438, 146.562,107.166z M 127.00,209.00
-			c0.00,8.833-7.167,16.00-16.00,16.00L 79.00,225.00 c-8.833,0.00-16.00-7.167-16.00-16.00s 7.167-16.00, 16.00-16.00l 32.00,0.00 C 119.833,193.00, 127.00,200.167, 127.00,209.00z M 146.541,310.833
-			c 6.251-6.25, 16.376-6.25, 22.625,0.00c 6.251,6.25, 6.251,16.375,0.00,22.625l-22.625,22.625c-6.25,6.25-16.374,6.25-22.625,0.00
-			c-6.25-6.25-6.25-16.375,0.00-22.625L 146.541,310.833z M 335.00,321.00c-11.188,0.00-21.812-2.167-32.00-5.208
-			c-10.188,3.042-20.812,5.208-32.00,5.208c-61.75,0.00-112.00-50.25-112.00-112.00s 50.25-112.00, 112.00-112.00c 11.188,0.00, 21.812,2.166, 32.00,5.209
-			c 10.188-3.043, 20.812-5.209, 32.00-5.209c 61.75,0.00, 112.00,50.25, 112.00,112.00S 396.75,321.00, 335.00,321.00z M 255.229,130.583
-			C 218.583,137.916, 191.00,170.209, 191.00,209.00c0.00,38.792, 27.583,71.083, 64.229,78.417C 235.334,267.188, 223.00,239.542, 223.00,209.00
-			S 235.334,150.812, 255.229,130.583z" />
-<glyph unicode="&#xe242;" d="M 349.852,136.85c-49.876-49.916-131.083-49.916-181.00,0.00c-49.916,49.917-49.916,131.125,0.00,181.021
-	c 13.209,13.187, 29.312,23.25, 47.832,29.812c 5.834,2.042, 12.293,0.562, 16.625-3.792c 4.376-4.375, 5.855-10.833, 3.793-16.625
-	c-12.542-35.375-4.00-73.666, 22.249-99.917c 26.209-26.228, 64.501-34.75, 99.917-22.25c 5.792,2.062, 12.271,0.583, 16.625-3.792
-	c 4.376-4.333, 5.834-10.812, 3.771-16.625C 373.143,166.162, 363.06,150.059, 349.852,136.85z M 191.477,295.246
-	c-37.438-37.438-37.438-98.354,0.00-135.771c 40.00-40.021, 108.125-36.417, 143.00,8.167c-35.959-2.25-71.375,10.729-97.75,37.084
-	c-26.375,26.354-39.333,61.771-37.084,97.729C 196.769,300.204, 194.039,297.808, 191.477,295.246z" />
-<glyph unicode="&#xe243;" d="M 256.00,336.00c-61.75,0.00-112.00-50.25-112.00-112.00c0.00-61.75, 50.25-112.00, 112.00-112.00
-			s 112.00,50.25, 112.00,112.00C 368.00,285.75, 317.75,336.00, 256.00,336.00z M 256.00,144.00c-44.188,0.00-80.00,35.812-80.00,80.00s 35.812,80.00, 80.00,80.00s 80.00-35.812, 80.00-80.00
-			S 300.188,144.00, 256.00,144.00z M 256.00,368.00c 8.833,0.00, 16.00,7.167, 16.00,16.00L 272.00,416.00 c0.00,8.833-7.167,16.00-16.00,16.00s-16.00-7.167-16.00-16.00l0.00-32.00
-			C 240.00,375.167, 247.167,368.00, 256.00,368.00z M 256.00,80.00c-8.833,0.00-16.00-7.167-16.00-16.00l0.00-32.00 c0.00-8.833, 7.167-16.00, 16.00-16.00s 16.00,7.167, 16.00,16.00l0.00,32.00
-			C 272.00,72.833, 264.833,80.00, 256.00,80.00z M 380.438,325.833l 22.625,22.625c 6.25,6.25, 6.25,16.375,0.00,22.625
-			c-6.25,6.25-16.375,6.25-22.625,0.00l-22.625-22.625c-6.25-6.25-6.25-16.375,0.00-22.625
-			C 364.062,319.583, 374.188,319.583, 380.438,325.833z M 131.562,122.166l-22.625-22.625c-6.25-6.249-6.25-16.374,0.00-22.624
-			s 16.375-6.25, 22.625,0.00l 22.625,22.624c 6.25,6.271, 6.25,16.376,0.00,22.625C 147.938,128.417, 137.812,128.438, 131.562,122.166z M 112.00,224.00
-			c0.00,8.833-7.167,16.00-16.00,16.00L 64.00,240.00 c-8.833,0.00-16.00-7.167-16.00-16.00s 7.167-16.00, 16.00-16.00l 32.00,0.00 C 104.833,208.00, 112.00,215.167, 112.00,224.00z M 448.00,240.00l-32.00,0.00
-			c-8.833,0.00-16.00-7.167-16.00-16.00s 7.167-16.00, 16.00-16.00l 32.00,0.00 c 8.833,0.00, 16.00,7.167, 16.00,16.00S 456.833,240.00, 448.00,240.00z M 131.541,325.833
-			c 6.251-6.25, 16.376-6.25, 22.625,0.00c 6.251,6.25, 6.251,16.375,0.00,22.625l-22.625,22.625c-6.25,6.25-16.374,6.25-22.625,0.00
-			c-6.25-6.25-6.25-16.375,0.00-22.625L 131.541,325.833z M 380.459,122.188c-6.271,6.25-16.376,6.25-22.625,0.00
-			c-6.251-6.25-6.271-16.375,0.00-22.625l 22.625-22.625c 6.249-6.25, 16.374-6.25, 22.624,0.00s 6.25,16.374,0.00,22.625L 380.459,122.188z" />
-<glyph unicode="&#xe244;" d="M 177.615,192.00c 7.438,36.521, 39.688,64.00, 78.396,64.00
-			c 38.709,0.00, 70.958-27.479, 78.376-64.00l 32.00,0.00 c-7.834,54.125-54.084,96.00-110.376,96.00c-56.271,0.00-102.541-41.875-110.375-96.00L 177.615,192.00 z
-			 M 256.011,320.00c 8.833,0.00, 16.00,7.167, 16.00,16.00l0.00,32.00 c0.00,8.833-7.167,16.00-16.00,16.00c-8.832,0.00-16.00-7.167-16.00-16.00l0.00-32.00
-			C 240.011,327.167, 247.179,320.00, 256.011,320.00z M 403.073,323.083c-6.249,6.25-16.374,6.25-22.625,0.00l-22.625-22.625
-			c-6.249-6.25-6.249-16.375,0.00-22.625c 6.251-6.25, 16.376-6.25, 22.625,0.00l 22.625,22.625
-			C 409.323,306.708, 409.323,316.833, 403.073,323.083z M 154.177,300.458l-22.625,22.625c-6.249,6.25-16.373,6.25-22.625,0.00
-			c-6.249-6.25-6.249-16.375,0.00-22.625l 22.625-22.625c 6.252-6.25, 16.376-6.25, 22.625,0.00
-			C 160.429,284.083, 160.429,294.208, 154.177,300.458z M 352.011,160.00l-192.00,0.00 c-8.832,0.00-16.00-7.167-16.00-16.00s 7.168-16.00, 16.00-16.00l 192.00,0.00
-			c 8.833,0.00, 16.00,7.167, 16.00,16.00S 360.844,160.00, 352.011,160.00z M 320.011,96.00l-128.00,0.00 c-8.832,0.00-16.00-7.167-16.00-16.00s 7.168-16.00, 16.00-16.00l 128.00,0.00
-			c 8.833,0.00, 16.00,7.167, 16.00,16.00S 328.844,96.00, 320.011,96.00z" />
-</font></defs></svg>
diff --git a/#pma/themes/fallen/fonts/fallen/fallen.ttf b/#pma/themes/fallen/fonts/fallen/fallen.ttf
deleted file mode 100644
index 38ab8dc3..00000000
Binary files a/#pma/themes/fallen/fonts/fallen/fallen.ttf and /dev/null differ
diff --git a/#pma/themes/fallen/fonts/fallen/fallen.woff b/#pma/themes/fallen/fonts/fallen/fallen.woff
deleted file mode 100644
index a3b887f8..00000000
Binary files a/#pma/themes/fallen/fonts/fallen/fallen.woff and /dev/null differ
diff --git a/#pma/themes/fallen/fonts/roboto/Roboto-Bold.eot b/#pma/themes/fallen/fonts/roboto/Roboto-Bold.eot
deleted file mode 100644
index b73776ee..00000000
Binary files a/#pma/themes/fallen/fonts/roboto/Roboto-Bold.eot and /dev/null differ
diff --git a/#pma/themes/fallen/fonts/roboto/Roboto-Bold.ttf b/#pma/themes/fallen/fonts/roboto/Roboto-Bold.ttf
deleted file mode 100644
index 68822caf..00000000
Binary files a/#pma/themes/fallen/fonts/roboto/Roboto-Bold.ttf and /dev/null differ
diff --git a/#pma/themes/fallen/fonts/roboto/Roboto-Bold.woff b/#pma/themes/fallen/fonts/roboto/Roboto-Bold.woff
deleted file mode 100644
index 1f75afdc..00000000
Binary files a/#pma/themes/fallen/fonts/roboto/Roboto-Bold.woff and /dev/null differ
diff --git a/#pma/themes/fallen/fonts/roboto/Roboto-Bold.woff2 b/#pma/themes/fallen/fonts/roboto/Roboto-Bold.woff2
deleted file mode 100644
index 350d1c3a..00000000
Binary files a/#pma/themes/fallen/fonts/roboto/Roboto-Bold.woff2 and /dev/null differ
diff --git a/#pma/themes/fallen/fonts/roboto/Roboto-Light.eot b/#pma/themes/fallen/fonts/roboto/Roboto-Light.eot
deleted file mode 100644
index 072cdc48..00000000
Binary files a/#pma/themes/fallen/fonts/roboto/Roboto-Light.eot and /dev/null differ
diff --git a/#pma/themes/fallen/fonts/roboto/Roboto-Light.ttf b/#pma/themes/fallen/fonts/roboto/Roboto-Light.ttf
deleted file mode 100644
index aa453407..00000000
Binary files a/#pma/themes/fallen/fonts/roboto/Roboto-Light.ttf and /dev/null differ
diff --git a/#pma/themes/fallen/fonts/roboto/Roboto-Light.woff b/#pma/themes/fallen/fonts/roboto/Roboto-Light.woff
deleted file mode 100644
index 3480c6c8..00000000
Binary files a/#pma/themes/fallen/fonts/roboto/Roboto-Light.woff and /dev/null differ
diff --git a/#pma/themes/fallen/fonts/roboto/Roboto-Light.woff2 b/#pma/themes/fallen/fonts/roboto/Roboto-Light.woff2
deleted file mode 100644
index 9a4d98c4..00000000
Binary files a/#pma/themes/fallen/fonts/roboto/Roboto-Light.woff2 and /dev/null differ
diff --git a/#pma/themes/fallen/fonts/roboto/Roboto-Medium.eot b/#pma/themes/fallen/fonts/roboto/Roboto-Medium.eot
deleted file mode 100644
index f9ad9956..00000000
Binary files a/#pma/themes/fallen/fonts/roboto/Roboto-Medium.eot and /dev/null differ
diff --git a/#pma/themes/fallen/fonts/roboto/Roboto-Medium.ttf b/#pma/themes/fallen/fonts/roboto/Roboto-Medium.ttf
deleted file mode 100644
index a3c1a1f1..00000000
Binary files a/#pma/themes/fallen/fonts/roboto/Roboto-Medium.ttf and /dev/null differ
diff --git a/#pma/themes/fallen/fonts/roboto/Roboto-Medium.woff b/#pma/themes/fallen/fonts/roboto/Roboto-Medium.woff
deleted file mode 100644
index 1186773f..00000000
Binary files a/#pma/themes/fallen/fonts/roboto/Roboto-Medium.woff and /dev/null differ
diff --git a/#pma/themes/fallen/fonts/roboto/Roboto-Medium.woff2 b/#pma/themes/fallen/fonts/roboto/Roboto-Medium.woff2
deleted file mode 100644
index d10a5926..00000000
Binary files a/#pma/themes/fallen/fonts/roboto/Roboto-Medium.woff2 and /dev/null differ
diff --git a/#pma/themes/fallen/fonts/roboto/Roboto-Regular.eot b/#pma/themes/fallen/fonts/roboto/Roboto-Regular.eot
deleted file mode 100644
index 9b5e8e41..00000000
Binary files a/#pma/themes/fallen/fonts/roboto/Roboto-Regular.eot and /dev/null differ
diff --git a/#pma/themes/fallen/fonts/roboto/Roboto-Regular.ttf b/#pma/themes/fallen/fonts/roboto/Roboto-Regular.ttf
deleted file mode 100644
index 0e58508a..00000000
Binary files a/#pma/themes/fallen/fonts/roboto/Roboto-Regular.ttf and /dev/null differ
diff --git a/#pma/themes/fallen/fonts/roboto/Roboto-Regular.woff b/#pma/themes/fallen/fonts/roboto/Roboto-Regular.woff
deleted file mode 100644
index f823258a..00000000
Binary files a/#pma/themes/fallen/fonts/roboto/Roboto-Regular.woff and /dev/null differ
diff --git a/#pma/themes/fallen/fonts/roboto/Roboto-Regular.woff2 b/#pma/themes/fallen/fonts/roboto/Roboto-Regular.woff2
deleted file mode 100644
index b7082ef3..00000000
Binary files a/#pma/themes/fallen/fonts/roboto/Roboto-Regular.woff2 and /dev/null differ
diff --git a/#pma/themes/fallen/fonts/roboto/Roboto-Thin.eot b/#pma/themes/fallen/fonts/roboto/Roboto-Thin.eot
deleted file mode 100644
index 2284a3b3..00000000
Binary files a/#pma/themes/fallen/fonts/roboto/Roboto-Thin.eot and /dev/null differ
diff --git a/#pma/themes/fallen/fonts/roboto/Roboto-Thin.ttf b/#pma/themes/fallen/fonts/roboto/Roboto-Thin.ttf
deleted file mode 100644
index 8779333b..00000000
Binary files a/#pma/themes/fallen/fonts/roboto/Roboto-Thin.ttf and /dev/null differ
diff --git a/#pma/themes/fallen/fonts/roboto/Roboto-Thin.woff b/#pma/themes/fallen/fonts/roboto/Roboto-Thin.woff
deleted file mode 100644
index 2a98c1e4..00000000
Binary files a/#pma/themes/fallen/fonts/roboto/Roboto-Thin.woff and /dev/null differ
diff --git a/#pma/themes/fallen/fonts/roboto/Roboto-Thin.woff2 b/#pma/themes/fallen/fonts/roboto/Roboto-Thin.woff2
deleted file mode 100644
index a38025a1..00000000
Binary files a/#pma/themes/fallen/fonts/roboto/Roboto-Thin.woff2 and /dev/null differ
diff --git a/#pma/themes/fallen/img/ajax_clock_small.gif b/#pma/themes/fallen/img/ajax_clock_small.gif
deleted file mode 100644
index e40f19a2..00000000
Binary files a/#pma/themes/fallen/img/ajax_clock_small.gif and /dev/null differ
diff --git a/#pma/themes/fallen/img/arrow_ltr.png b/#pma/themes/fallen/img/arrow_ltr.png
deleted file mode 100644
index df66164f..00000000
Binary files a/#pma/themes/fallen/img/arrow_ltr.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/arrow_rtl.png b/#pma/themes/fallen/img/arrow_rtl.png
deleted file mode 100644
index 2aba1b04..00000000
Binary files a/#pma/themes/fallen/img/arrow_rtl.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/asc_order.png b/#pma/themes/fallen/img/asc_order.png
deleted file mode 100644
index fa1bb840..00000000
Binary files a/#pma/themes/fallen/img/asc_order.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_bookmark.png b/#pma/themes/fallen/img/b_bookmark.png
deleted file mode 100644
index ef20a169..00000000
Binary files a/#pma/themes/fallen/img/b_bookmark.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_browse.png b/#pma/themes/fallen/img/b_browse.png
deleted file mode 100644
index f4ac3ad6..00000000
Binary files a/#pma/themes/fallen/img/b_browse.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_calendar.png b/#pma/themes/fallen/img/b_calendar.png
deleted file mode 100644
index 62df31c9..00000000
Binary files a/#pma/themes/fallen/img/b_calendar.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_chart.png b/#pma/themes/fallen/img/b_chart.png
deleted file mode 100644
index 0b120a49..00000000
Binary files a/#pma/themes/fallen/img/b_chart.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_close.png b/#pma/themes/fallen/img/b_close.png
deleted file mode 100644
index 2c234b6f..00000000
Binary files a/#pma/themes/fallen/img/b_close.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_column_add.png b/#pma/themes/fallen/img/b_column_add.png
deleted file mode 100644
index dab5f0b0..00000000
Binary files a/#pma/themes/fallen/img/b_column_add.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_comment.png b/#pma/themes/fallen/img/b_comment.png
deleted file mode 100644
index c2e31d83..00000000
Binary files a/#pma/themes/fallen/img/b_comment.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_dbstatistics.png b/#pma/themes/fallen/img/b_dbstatistics.png
deleted file mode 100644
index 0b120a49..00000000
Binary files a/#pma/themes/fallen/img/b_dbstatistics.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_deltbl.png b/#pma/themes/fallen/img/b_deltbl.png
deleted file mode 100644
index 94caf9a3..00000000
Binary files a/#pma/themes/fallen/img/b_deltbl.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_docs.png b/#pma/themes/fallen/img/b_docs.png
deleted file mode 100644
index 730b7f9e..00000000
Binary files a/#pma/themes/fallen/img/b_docs.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_docsql.png b/#pma/themes/fallen/img/b_docsql.png
deleted file mode 100644
index e3ca77fe..00000000
Binary files a/#pma/themes/fallen/img/b_docsql.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_drop.png b/#pma/themes/fallen/img/b_drop.png
deleted file mode 100644
index a6df1bea..00000000
Binary files a/#pma/themes/fallen/img/b_drop.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_edit.png b/#pma/themes/fallen/img/b_edit.png
deleted file mode 100644
index 78142b61..00000000
Binary files a/#pma/themes/fallen/img/b_edit.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_empty.png b/#pma/themes/fallen/img/b_empty.png
deleted file mode 100644
index 25c377c8..00000000
Binary files a/#pma/themes/fallen/img/b_empty.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_engine.png b/#pma/themes/fallen/img/b_engine.png
deleted file mode 100644
index 76831f94..00000000
Binary files a/#pma/themes/fallen/img/b_engine.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_event_add.png b/#pma/themes/fallen/img/b_event_add.png
deleted file mode 100644
index ef594b10..00000000
Binary files a/#pma/themes/fallen/img/b_event_add.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_events.png b/#pma/themes/fallen/img/b_events.png
deleted file mode 100644
index 86bcc87f..00000000
Binary files a/#pma/themes/fallen/img/b_events.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_export.png b/#pma/themes/fallen/img/b_export.png
deleted file mode 100644
index aa2043af..00000000
Binary files a/#pma/themes/fallen/img/b_export.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_favorite.png b/#pma/themes/fallen/img/b_favorite.png
deleted file mode 100644
index 8d84d117..00000000
Binary files a/#pma/themes/fallen/img/b_favorite.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_find_replace.png b/#pma/themes/fallen/img/b_find_replace.png
deleted file mode 100644
index 18bf848f..00000000
Binary files a/#pma/themes/fallen/img/b_find_replace.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_firstpage.png b/#pma/themes/fallen/img/b_firstpage.png
deleted file mode 100644
index ec62b5fa..00000000
Binary files a/#pma/themes/fallen/img/b_firstpage.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_ftext.png b/#pma/themes/fallen/img/b_ftext.png
deleted file mode 100644
index f991a4dc..00000000
Binary files a/#pma/themes/fallen/img/b_ftext.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_globe.gif b/#pma/themes/fallen/img/b_globe.gif
deleted file mode 100644
index ef03dcf0..00000000
Binary files a/#pma/themes/fallen/img/b_globe.gif and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_group.png b/#pma/themes/fallen/img/b_group.png
deleted file mode 100644
index cf7570da..00000000
Binary files a/#pma/themes/fallen/img/b_group.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_help.png b/#pma/themes/fallen/img/b_help.png
deleted file mode 100644
index 730b7f9e..00000000
Binary files a/#pma/themes/fallen/img/b_help.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_home.png b/#pma/themes/fallen/img/b_home.png
deleted file mode 100644
index 2443f201..00000000
Binary files a/#pma/themes/fallen/img/b_home.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_import.png b/#pma/themes/fallen/img/b_import.png
deleted file mode 100644
index cbbf0767..00000000
Binary files a/#pma/themes/fallen/img/b_import.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_index.png b/#pma/themes/fallen/img/b_index.png
deleted file mode 100644
index 8778a352..00000000
Binary files a/#pma/themes/fallen/img/b_index.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_index_add.png b/#pma/themes/fallen/img/b_index_add.png
deleted file mode 100644
index 5f451314..00000000
Binary files a/#pma/themes/fallen/img/b_index_add.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_info.png b/#pma/themes/fallen/img/b_info.png
deleted file mode 100644
index 4b177927..00000000
Binary files a/#pma/themes/fallen/img/b_info.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_inline_edit.png b/#pma/themes/fallen/img/b_inline_edit.png
deleted file mode 100644
index 266b184a..00000000
Binary files a/#pma/themes/fallen/img/b_inline_edit.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_insrow.png b/#pma/themes/fallen/img/b_insrow.png
deleted file mode 100644
index 4f265498..00000000
Binary files a/#pma/themes/fallen/img/b_insrow.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_lastpage.png b/#pma/themes/fallen/img/b_lastpage.png
deleted file mode 100644
index e010dea0..00000000
Binary files a/#pma/themes/fallen/img/b_lastpage.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_minus.png b/#pma/themes/fallen/img/b_minus.png
deleted file mode 100644
index 4576e57e..00000000
Binary files a/#pma/themes/fallen/img/b_minus.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_more.png b/#pma/themes/fallen/img/b_more.png
deleted file mode 100644
index 681f862b..00000000
Binary files a/#pma/themes/fallen/img/b_more.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_move.png b/#pma/themes/fallen/img/b_move.png
deleted file mode 100644
index 697955bf..00000000
Binary files a/#pma/themes/fallen/img/b_move.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_newdb.png b/#pma/themes/fallen/img/b_newdb.png
deleted file mode 100644
index e8fd2d41..00000000
Binary files a/#pma/themes/fallen/img/b_newdb.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_newtbl.png b/#pma/themes/fallen/img/b_newtbl.png
deleted file mode 100644
index aafe73dd..00000000
Binary files a/#pma/themes/fallen/img/b_newtbl.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_nextpage.png b/#pma/themes/fallen/img/b_nextpage.png
deleted file mode 100644
index 37336a9a..00000000
Binary files a/#pma/themes/fallen/img/b_nextpage.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_no_favorite.png b/#pma/themes/fallen/img/b_no_favorite.png
deleted file mode 100644
index eeefc690..00000000
Binary files a/#pma/themes/fallen/img/b_no_favorite.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_pdfdoc.png b/#pma/themes/fallen/img/b_pdfdoc.png
deleted file mode 100644
index aa2e3f16..00000000
Binary files a/#pma/themes/fallen/img/b_pdfdoc.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_plugin.png b/#pma/themes/fallen/img/b_plugin.png
deleted file mode 100644
index 5a49f577..00000000
Binary files a/#pma/themes/fallen/img/b_plugin.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_plus.png b/#pma/themes/fallen/img/b_plus.png
deleted file mode 100644
index e0a81779..00000000
Binary files a/#pma/themes/fallen/img/b_plus.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_prevpage.png b/#pma/themes/fallen/img/b_prevpage.png
deleted file mode 100644
index de5dad4f..00000000
Binary files a/#pma/themes/fallen/img/b_prevpage.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_primary.png b/#pma/themes/fallen/img/b_primary.png
deleted file mode 100644
index 3bfd163f..00000000
Binary files a/#pma/themes/fallen/img/b_primary.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_print.png b/#pma/themes/fallen/img/b_print.png
deleted file mode 100644
index a82413ee..00000000
Binary files a/#pma/themes/fallen/img/b_print.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_props.png b/#pma/themes/fallen/img/b_props.png
deleted file mode 100644
index 53a39daf..00000000
Binary files a/#pma/themes/fallen/img/b_props.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_relations.png b/#pma/themes/fallen/img/b_relations.png
deleted file mode 100644
index 6e8656b7..00000000
Binary files a/#pma/themes/fallen/img/b_relations.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_report.png b/#pma/themes/fallen/img/b_report.png
deleted file mode 100644
index 3c2897f8..00000000
Binary files a/#pma/themes/fallen/img/b_report.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_routine_add.png b/#pma/themes/fallen/img/b_routine_add.png
deleted file mode 100644
index 2d144426..00000000
Binary files a/#pma/themes/fallen/img/b_routine_add.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_routines.png b/#pma/themes/fallen/img/b_routines.png
deleted file mode 100644
index 2cc102d3..00000000
Binary files a/#pma/themes/fallen/img/b_routines.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_save.png b/#pma/themes/fallen/img/b_save.png
deleted file mode 100644
index 7713c500..00000000
Binary files a/#pma/themes/fallen/img/b_save.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_saveimage.png b/#pma/themes/fallen/img/b_saveimage.png
deleted file mode 100644
index 2285589c..00000000
Binary files a/#pma/themes/fallen/img/b_saveimage.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_sbrowse.png b/#pma/themes/fallen/img/b_sbrowse.png
deleted file mode 100644
index f4ac3ad6..00000000
Binary files a/#pma/themes/fallen/img/b_sbrowse.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_sdb.png b/#pma/themes/fallen/img/b_sdb.png
deleted file mode 100644
index 06760326..00000000
Binary files a/#pma/themes/fallen/img/b_sdb.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_search.png b/#pma/themes/fallen/img/b_search.png
deleted file mode 100644
index f014a264..00000000
Binary files a/#pma/themes/fallen/img/b_search.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_select.png b/#pma/themes/fallen/img/b_select.png
deleted file mode 100644
index 9ae3a951..00000000
Binary files a/#pma/themes/fallen/img/b_select.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_snewtbl.png b/#pma/themes/fallen/img/b_snewtbl.png
deleted file mode 100644
index 927b1e7b..00000000
Binary files a/#pma/themes/fallen/img/b_snewtbl.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_spatial.png b/#pma/themes/fallen/img/b_spatial.png
deleted file mode 100644
index 5e6c8c72..00000000
Binary files a/#pma/themes/fallen/img/b_spatial.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_sql.png b/#pma/themes/fallen/img/b_sql.png
deleted file mode 100644
index 9cf3f4da..00000000
Binary files a/#pma/themes/fallen/img/b_sql.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_sqldoc.png b/#pma/themes/fallen/img/b_sqldoc.png
deleted file mode 100644
index 8ff0d9a5..00000000
Binary files a/#pma/themes/fallen/img/b_sqldoc.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_sqlhelp.png b/#pma/themes/fallen/img/b_sqlhelp.png
deleted file mode 100644
index be39ea61..00000000
Binary files a/#pma/themes/fallen/img/b_sqlhelp.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_table_add.png b/#pma/themes/fallen/img/b_table_add.png
deleted file mode 100644
index bfd4590c..00000000
Binary files a/#pma/themes/fallen/img/b_table_add.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_tblanalyse.png b/#pma/themes/fallen/img/b_tblanalyse.png
deleted file mode 100644
index 27079b20..00000000
Binary files a/#pma/themes/fallen/img/b_tblanalyse.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_tblexport.png b/#pma/themes/fallen/img/b_tblexport.png
deleted file mode 100644
index aa2043af..00000000
Binary files a/#pma/themes/fallen/img/b_tblexport.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_tblimport.png b/#pma/themes/fallen/img/b_tblimport.png
deleted file mode 100644
index cbbf0767..00000000
Binary files a/#pma/themes/fallen/img/b_tblimport.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_tblops.png b/#pma/themes/fallen/img/b_tblops.png
deleted file mode 100644
index 64dd36f7..00000000
Binary files a/#pma/themes/fallen/img/b_tblops.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_tbloptimize.png b/#pma/themes/fallen/img/b_tbloptimize.png
deleted file mode 100644
index 4dc75f62..00000000
Binary files a/#pma/themes/fallen/img/b_tbloptimize.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_tipp.png b/#pma/themes/fallen/img/b_tipp.png
deleted file mode 100644
index b603cc9f..00000000
Binary files a/#pma/themes/fallen/img/b_tipp.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_trigger_add.png b/#pma/themes/fallen/img/b_trigger_add.png
deleted file mode 100644
index 8a754dfe..00000000
Binary files a/#pma/themes/fallen/img/b_trigger_add.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_triggers.png b/#pma/themes/fallen/img/b_triggers.png
deleted file mode 100644
index 84a89ef4..00000000
Binary files a/#pma/themes/fallen/img/b_triggers.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_undo.png b/#pma/themes/fallen/img/b_undo.png
deleted file mode 100644
index b299525c..00000000
Binary files a/#pma/themes/fallen/img/b_undo.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_unique.png b/#pma/themes/fallen/img/b_unique.png
deleted file mode 100644
index 0ec7d576..00000000
Binary files a/#pma/themes/fallen/img/b_unique.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_usradd.png b/#pma/themes/fallen/img/b_usradd.png
deleted file mode 100644
index 77234616..00000000
Binary files a/#pma/themes/fallen/img/b_usradd.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_usrcheck.png b/#pma/themes/fallen/img/b_usrcheck.png
deleted file mode 100644
index 414a36cb..00000000
Binary files a/#pma/themes/fallen/img/b_usrcheck.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_usrdrop.png b/#pma/themes/fallen/img/b_usrdrop.png
deleted file mode 100644
index 1783952a..00000000
Binary files a/#pma/themes/fallen/img/b_usrdrop.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_usredit.png b/#pma/themes/fallen/img/b_usredit.png
deleted file mode 100644
index 4fe40975..00000000
Binary files a/#pma/themes/fallen/img/b_usredit.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_usrlist.png b/#pma/themes/fallen/img/b_usrlist.png
deleted file mode 100644
index cd0160c8..00000000
Binary files a/#pma/themes/fallen/img/b_usrlist.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_versions.png b/#pma/themes/fallen/img/b_versions.png
deleted file mode 100644
index 70f78a75..00000000
Binary files a/#pma/themes/fallen/img/b_versions.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_view.png b/#pma/themes/fallen/img/b_view.png
deleted file mode 100644
index 04049e6e..00000000
Binary files a/#pma/themes/fallen/img/b_view.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_view_add.png b/#pma/themes/fallen/img/b_view_add.png
deleted file mode 100644
index fe63228b..00000000
Binary files a/#pma/themes/fallen/img/b_view_add.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/b_views.png b/#pma/themes/fallen/img/b_views.png
deleted file mode 100644
index b1c78e32..00000000
Binary files a/#pma/themes/fallen/img/b_views.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/bd_browse.png b/#pma/themes/fallen/img/bd_browse.png
deleted file mode 100644
index 2cdaf431..00000000
Binary files a/#pma/themes/fallen/img/bd_browse.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/bd_deltbl.png b/#pma/themes/fallen/img/bd_deltbl.png
deleted file mode 100644
index 41e93dd7..00000000
Binary files a/#pma/themes/fallen/img/bd_deltbl.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/bd_drop.png b/#pma/themes/fallen/img/bd_drop.png
deleted file mode 100644
index 225fabba..00000000
Binary files a/#pma/themes/fallen/img/bd_drop.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/bd_edit.png b/#pma/themes/fallen/img/bd_edit.png
deleted file mode 100644
index 6478c24a..00000000
Binary files a/#pma/themes/fallen/img/bd_edit.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/bd_empty.png b/#pma/themes/fallen/img/bd_empty.png
deleted file mode 100644
index 1c2385d7..00000000
Binary files a/#pma/themes/fallen/img/bd_empty.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/bd_export.png b/#pma/themes/fallen/img/bd_export.png
deleted file mode 100644
index 45976b23..00000000
Binary files a/#pma/themes/fallen/img/bd_export.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/bd_firstpage.png b/#pma/themes/fallen/img/bd_firstpage.png
deleted file mode 100644
index 1e5c773e..00000000
Binary files a/#pma/themes/fallen/img/bd_firstpage.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/bd_ftext.png b/#pma/themes/fallen/img/bd_ftext.png
deleted file mode 100644
index 3c040a8e..00000000
Binary files a/#pma/themes/fallen/img/bd_ftext.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/bd_index.png b/#pma/themes/fallen/img/bd_index.png
deleted file mode 100644
index a4a43d04..00000000
Binary files a/#pma/themes/fallen/img/bd_index.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/bd_insrow.png b/#pma/themes/fallen/img/bd_insrow.png
deleted file mode 100644
index d0fc81c5..00000000
Binary files a/#pma/themes/fallen/img/bd_insrow.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/bd_lastpage.png b/#pma/themes/fallen/img/bd_lastpage.png
deleted file mode 100644
index 553960de..00000000
Binary files a/#pma/themes/fallen/img/bd_lastpage.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/bd_nextpage.png b/#pma/themes/fallen/img/bd_nextpage.png
deleted file mode 100644
index 6c8ddabf..00000000
Binary files a/#pma/themes/fallen/img/bd_nextpage.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/bd_prevpage.png b/#pma/themes/fallen/img/bd_prevpage.png
deleted file mode 100644
index de2f322a..00000000
Binary files a/#pma/themes/fallen/img/bd_prevpage.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/bd_primary.png b/#pma/themes/fallen/img/bd_primary.png
deleted file mode 100644
index a719a01d..00000000
Binary files a/#pma/themes/fallen/img/bd_primary.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/bd_routine_add.png b/#pma/themes/fallen/img/bd_routine_add.png
deleted file mode 100644
index 91ec8e1f..00000000
Binary files a/#pma/themes/fallen/img/bd_routine_add.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/bd_sbrowse.png b/#pma/themes/fallen/img/bd_sbrowse.png
deleted file mode 100644
index 2cdaf431..00000000
Binary files a/#pma/themes/fallen/img/bd_sbrowse.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/bd_select.png b/#pma/themes/fallen/img/bd_select.png
deleted file mode 100644
index d14a5c11..00000000
Binary files a/#pma/themes/fallen/img/bd_select.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/bd_spatial.png b/#pma/themes/fallen/img/bd_spatial.png
deleted file mode 100644
index e352b1de..00000000
Binary files a/#pma/themes/fallen/img/bd_spatial.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/bd_unique.png b/#pma/themes/fallen/img/bd_unique.png
deleted file mode 100644
index 824f97b2..00000000
Binary files a/#pma/themes/fallen/img/bd_unique.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/centralColumns.png b/#pma/themes/fallen/img/centralColumns.png
deleted file mode 100644
index f1953f94..00000000
Binary files a/#pma/themes/fallen/img/centralColumns.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/centralColumns_add.png b/#pma/themes/fallen/img/centralColumns_add.png
deleted file mode 100644
index 556e4b38..00000000
Binary files a/#pma/themes/fallen/img/centralColumns_add.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/centralColumns_delete.png b/#pma/themes/fallen/img/centralColumns_delete.png
deleted file mode 100644
index 35a292a1..00000000
Binary files a/#pma/themes/fallen/img/centralColumns_delete.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/col_drop.png b/#pma/themes/fallen/img/col_drop.png
deleted file mode 100644
index 681f862b..00000000
Binary files a/#pma/themes/fallen/img/col_drop.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/col_pointer.png b/#pma/themes/fallen/img/col_pointer.png
deleted file mode 100644
index 7147edb5..00000000
Binary files a/#pma/themes/fallen/img/col_pointer.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/col_pointer_ver.png b/#pma/themes/fallen/img/col_pointer_ver.png
deleted file mode 100644
index 1cbadec0..00000000
Binary files a/#pma/themes/fallen/img/col_pointer_ver.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/console.png b/#pma/themes/fallen/img/console.png
deleted file mode 100644
index e67405fb..00000000
Binary files a/#pma/themes/fallen/img/console.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/database.png b/#pma/themes/fallen/img/database.png
deleted file mode 100644
index 919cb77c..00000000
Binary files a/#pma/themes/fallen/img/database.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/east-mini.png b/#pma/themes/fallen/img/east-mini.png
deleted file mode 100644
index bee419d6..00000000
Binary files a/#pma/themes/fallen/img/east-mini.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/error.ico b/#pma/themes/fallen/img/error.ico
deleted file mode 100644
index 8f4d509d..00000000
Binary files a/#pma/themes/fallen/img/error.ico and /dev/null differ
diff --git a/#pma/themes/fallen/img/eye.png b/#pma/themes/fallen/img/eye.png
deleted file mode 100644
index 9cac6b19..00000000
Binary files a/#pma/themes/fallen/img/eye.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/eye_grey.png b/#pma/themes/fallen/img/eye_grey.png
deleted file mode 100644
index 6fcae474..00000000
Binary files a/#pma/themes/fallen/img/eye_grey.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/item.png b/#pma/themes/fallen/img/item.png
deleted file mode 100644
index 64adaa50..00000000
Binary files a/#pma/themes/fallen/img/item.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/left_nav_bg.png b/#pma/themes/fallen/img/left_nav_bg.png
deleted file mode 100644
index 65419f17..00000000
Binary files a/#pma/themes/fallen/img/left_nav_bg.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/lightbulb.png b/#pma/themes/fallen/img/lightbulb.png
deleted file mode 100644
index 30b528c4..00000000
Binary files a/#pma/themes/fallen/img/lightbulb.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/lightbulb_off.png b/#pma/themes/fallen/img/lightbulb_off.png
deleted file mode 100644
index 64df9814..00000000
Binary files a/#pma/themes/fallen/img/lightbulb_off.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/loader-blue.svg b/#pma/themes/fallen/img/loader-blue.svg
deleted file mode 100644
index 380290ed..00000000
--- a/#pma/themes/fallen/img/loader-blue.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg version="1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16px" height="16px" viewBox="0 0 16 16"><style type="text/css">.qp-circular-loader{width:16px;height:16px}.qp-circular-loader-path{stroke-dasharray:32.4;stroke-dashoffset:32.4}.qp-circular-loader,.qp-circular-loader *{-webkit-transform-origin:50% 50%}@-webkit-keyframes rotate{from{transform:rotate(0deg)}to{transform:rotate(360deg)}}.qp-circular-loader{-webkit-animation-name:rotate;-webkit-animation-duration:1568.63ms;-webkit-animation-iteration-count:infinite;-webkit-animation-timing-function:linear}@-webkit-keyframes fillunfill{from{stroke-dashoffset:32.3}50%{stroke-dashoffset:0}to{stroke-dashoffset:-31.9}}@-webkit-keyframes rot{from{transform:rotate(0deg)}to{transform:rotate(-360deg)}}@-webkit-keyframes colors{from{stroke:#4285f4}to{stroke:#4285f4}}.qp-circular-loader-path{-webkit-animation-name:fillunfill,rot,colors;-webkit-animation-duration:1333ms,5332ms,5332ms;-webkit-animation-iteration-count:infinite,infinite,infinite;-webkit-animation-timing-function:cubic-bezier(0.4,0.0,0.2,1),steps(4),linear;-webkit-animation-play-state:running,running,running;-webkit-animation-fill-mode:forwards}</style><g class="qp-circular-loader"><path class="qp-circular-loader-path" fill="none" d="M 8,1.125 A 6.875,6.875 0 1 1 1.125,8" stroke-width="2.25" stroke-linecap="round"></path></g></svg>
diff --git a/#pma/themes/fallen/img/logo_left.png b/#pma/themes/fallen/img/logo_left.png
deleted file mode 100644
index d02dcb23..00000000
Binary files a/#pma/themes/fallen/img/logo_left.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/logo_right.png b/#pma/themes/fallen/img/logo_right.png
deleted file mode 100644
index d02dcb23..00000000
Binary files a/#pma/themes/fallen/img/logo_right.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/more.png b/#pma/themes/fallen/img/more.png
deleted file mode 100644
index 62853595..00000000
Binary files a/#pma/themes/fallen/img/more.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/new_data.png b/#pma/themes/fallen/img/new_data.png
deleted file mode 100644
index 6f4e1863..00000000
Binary files a/#pma/themes/fallen/img/new_data.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/new_data_hovered.png b/#pma/themes/fallen/img/new_data_hovered.png
deleted file mode 100644
index a470dbbc..00000000
Binary files a/#pma/themes/fallen/img/new_data_hovered.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/new_data_selected.png b/#pma/themes/fallen/img/new_data_selected.png
deleted file mode 100644
index a75abe34..00000000
Binary files a/#pma/themes/fallen/img/new_data_selected.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/new_data_selected_hovered.png b/#pma/themes/fallen/img/new_data_selected_hovered.png
deleted file mode 100644
index 04a2ad84..00000000
Binary files a/#pma/themes/fallen/img/new_data_selected_hovered.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/new_struct.png b/#pma/themes/fallen/img/new_struct.png
deleted file mode 100644
index 0f7302f8..00000000
Binary files a/#pma/themes/fallen/img/new_struct.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/new_struct_hovered.png b/#pma/themes/fallen/img/new_struct_hovered.png
deleted file mode 100644
index 70e2ab87..00000000
Binary files a/#pma/themes/fallen/img/new_struct_hovered.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/new_struct_selected.png b/#pma/themes/fallen/img/new_struct_selected.png
deleted file mode 100644
index 142bf115..00000000
Binary files a/#pma/themes/fallen/img/new_struct_selected.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/new_struct_selected_hovered.png b/#pma/themes/fallen/img/new_struct_selected_hovered.png
deleted file mode 100644
index 9a82bc42..00000000
Binary files a/#pma/themes/fallen/img/new_struct_selected_hovered.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/normalize.png b/#pma/themes/fallen/img/normalize.png
deleted file mode 100644
index 587c4ef4..00000000
Binary files a/#pma/themes/fallen/img/normalize.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/north-mini.png b/#pma/themes/fallen/img/north-mini.png
deleted file mode 100644
index 8283839c..00000000
Binary files a/#pma/themes/fallen/img/north-mini.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/pause.png b/#pma/themes/fallen/img/pause.png
deleted file mode 100644
index 46a6318d..00000000
Binary files a/#pma/themes/fallen/img/pause.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/php_sym.png b/#pma/themes/fallen/img/php_sym.png
deleted file mode 100644
index 42ffbf04..00000000
Binary files a/#pma/themes/fallen/img/php_sym.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/play.png b/#pma/themes/fallen/img/play.png
deleted file mode 100644
index 37336a9a..00000000
Binary files a/#pma/themes/fallen/img/play.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/pma_logo.png b/#pma/themes/fallen/img/pma_logo.png
deleted file mode 100644
index b640f59e..00000000
Binary files a/#pma/themes/fallen/img/pma_logo.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/pma_logo2.png b/#pma/themes/fallen/img/pma_logo2.png
deleted file mode 100644
index b640f59e..00000000
Binary files a/#pma/themes/fallen/img/pma_logo2.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/pmd/1.png b/#pma/themes/fallen/img/pmd/1.png
deleted file mode 100644
index 48b9d3f9..00000000
Binary files a/#pma/themes/fallen/img/pmd/1.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/pmd/2.png b/#pma/themes/fallen/img/pmd/2.png
deleted file mode 100644
index 7545d86f..00000000
Binary files a/#pma/themes/fallen/img/pmd/2.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/pmd/2leftarrow.png b/#pma/themes/fallen/img/pmd/2leftarrow.png
deleted file mode 100644
index e33e21cf..00000000
Binary files a/#pma/themes/fallen/img/pmd/2leftarrow.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/pmd/2leftarrow_m.png b/#pma/themes/fallen/img/pmd/2leftarrow_m.png
deleted file mode 100644
index 6ec8d81c..00000000
Binary files a/#pma/themes/fallen/img/pmd/2leftarrow_m.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/pmd/2rightarrow.png b/#pma/themes/fallen/img/pmd/2rightarrow.png
deleted file mode 100644
index b6554ae7..00000000
Binary files a/#pma/themes/fallen/img/pmd/2rightarrow.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/pmd/2rightarrow_m.png b/#pma/themes/fallen/img/pmd/2rightarrow_m.png
deleted file mode 100644
index e5ff1f0b..00000000
Binary files a/#pma/themes/fallen/img/pmd/2rightarrow_m.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/pmd/3.png b/#pma/themes/fallen/img/pmd/3.png
deleted file mode 100644
index 46179111..00000000
Binary files a/#pma/themes/fallen/img/pmd/3.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/pmd/4.png b/#pma/themes/fallen/img/pmd/4.png
deleted file mode 100644
index 9b534594..00000000
Binary files a/#pma/themes/fallen/img/pmd/4.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/pmd/5.png b/#pma/themes/fallen/img/pmd/5.png
deleted file mode 100644
index 51f536dc..00000000
Binary files a/#pma/themes/fallen/img/pmd/5.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/pmd/6.png b/#pma/themes/fallen/img/pmd/6.png
deleted file mode 100644
index ed93cfee..00000000
Binary files a/#pma/themes/fallen/img/pmd/6.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/pmd/7.png b/#pma/themes/fallen/img/pmd/7.png
deleted file mode 100644
index 7c7530f1..00000000
Binary files a/#pma/themes/fallen/img/pmd/7.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/pmd/8.png b/#pma/themes/fallen/img/pmd/8.png
deleted file mode 100644
index 451998d1..00000000
Binary files a/#pma/themes/fallen/img/pmd/8.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/pmd/FieldKey_small.png b/#pma/themes/fallen/img/pmd/FieldKey_small.png
deleted file mode 100644
index 8a55b161..00000000
Binary files a/#pma/themes/fallen/img/pmd/FieldKey_small.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/pmd/Field_small.png b/#pma/themes/fallen/img/pmd/Field_small.png
deleted file mode 100644
index 4d80059a..00000000
Binary files a/#pma/themes/fallen/img/pmd/Field_small.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/pmd/Field_small_char.png b/#pma/themes/fallen/img/pmd/Field_small_char.png
deleted file mode 100644
index dcaa1c61..00000000
Binary files a/#pma/themes/fallen/img/pmd/Field_small_char.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/pmd/Field_small_date.png b/#pma/themes/fallen/img/pmd/Field_small_date.png
deleted file mode 100644
index 259a8d98..00000000
Binary files a/#pma/themes/fallen/img/pmd/Field_small_date.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/pmd/Field_small_int.png b/#pma/themes/fallen/img/pmd/Field_small_int.png
deleted file mode 100644
index 70f3f38d..00000000
Binary files a/#pma/themes/fallen/img/pmd/Field_small_int.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/pmd/Header.png b/#pma/themes/fallen/img/pmd/Header.png
deleted file mode 100644
index 1f33ef7c..00000000
Binary files a/#pma/themes/fallen/img/pmd/Header.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/pmd/Header_Linked.png b/#pma/themes/fallen/img/pmd/Header_Linked.png
deleted file mode 100644
index d185fe45..00000000
Binary files a/#pma/themes/fallen/img/pmd/Header_Linked.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/pmd/anchor.png b/#pma/themes/fallen/img/pmd/anchor.png
deleted file mode 100644
index 5f464ed9..00000000
Binary files a/#pma/themes/fallen/img/pmd/anchor.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/pmd/and_icon.png b/#pma/themes/fallen/img/pmd/and_icon.png
deleted file mode 100644
index 3767aba9..00000000
Binary files a/#pma/themes/fallen/img/pmd/and_icon.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/pmd/ang_direct.png b/#pma/themes/fallen/img/pmd/ang_direct.png
deleted file mode 100644
index 2be3f29a..00000000
Binary files a/#pma/themes/fallen/img/pmd/ang_direct.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/pmd/bord.png b/#pma/themes/fallen/img/pmd/bord.png
deleted file mode 100644
index 351b9591..00000000
Binary files a/#pma/themes/fallen/img/pmd/bord.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/pmd/bottom.png b/#pma/themes/fallen/img/pmd/bottom.png
deleted file mode 100644
index 97abfc93..00000000
Binary files a/#pma/themes/fallen/img/pmd/bottom.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/pmd/def.png b/#pma/themes/fallen/img/pmd/def.png
deleted file mode 100644
index 33d55930..00000000
Binary files a/#pma/themes/fallen/img/pmd/def.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/pmd/display_field.png b/#pma/themes/fallen/img/pmd/display_field.png
deleted file mode 100644
index a7d7cb4e..00000000
Binary files a/#pma/themes/fallen/img/pmd/display_field.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/pmd/downarrow1.png b/#pma/themes/fallen/img/pmd/downarrow1.png
deleted file mode 100644
index 80632dd5..00000000
Binary files a/#pma/themes/fallen/img/pmd/downarrow1.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/pmd/downarrow2.png b/#pma/themes/fallen/img/pmd/downarrow2.png
deleted file mode 100644
index 2c925e9d..00000000
Binary files a/#pma/themes/fallen/img/pmd/downarrow2.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/pmd/downarrow2_m.png b/#pma/themes/fallen/img/pmd/downarrow2_m.png
deleted file mode 100644
index 461eeefb..00000000
Binary files a/#pma/themes/fallen/img/pmd/downarrow2_m.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/pmd/exec.png b/#pma/themes/fallen/img/pmd/exec.png
deleted file mode 100644
index d5eaa767..00000000
Binary files a/#pma/themes/fallen/img/pmd/exec.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/pmd/exec_small.png b/#pma/themes/fallen/img/pmd/exec_small.png
deleted file mode 100644
index d5162ea1..00000000
Binary files a/#pma/themes/fallen/img/pmd/exec_small.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/pmd/exitFullscreen.png b/#pma/themes/fallen/img/pmd/exitFullscreen.png
deleted file mode 100644
index cff388ff..00000000
Binary files a/#pma/themes/fallen/img/pmd/exitFullscreen.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/pmd/export.png b/#pma/themes/fallen/img/pmd/export.png
deleted file mode 100644
index ea2fd9f3..00000000
Binary files a/#pma/themes/fallen/img/pmd/export.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/pmd/favicon.ico b/#pma/themes/fallen/img/pmd/favicon.ico
deleted file mode 100644
index 29c2595b..00000000
Binary files a/#pma/themes/fallen/img/pmd/favicon.ico and /dev/null differ
diff --git a/#pma/themes/fallen/img/pmd/grid.png b/#pma/themes/fallen/img/pmd/grid.png
deleted file mode 100644
index 6aee6e5b..00000000
Binary files a/#pma/themes/fallen/img/pmd/grid.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/pmd/help.png b/#pma/themes/fallen/img/pmd/help.png
deleted file mode 100644
index 65cfd09c..00000000
Binary files a/#pma/themes/fallen/img/pmd/help.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/pmd/help_relation.png b/#pma/themes/fallen/img/pmd/help_relation.png
deleted file mode 100644
index 3bcaac08..00000000
Binary files a/#pma/themes/fallen/img/pmd/help_relation.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/pmd/left_panel_butt.png b/#pma/themes/fallen/img/pmd/left_panel_butt.png
deleted file mode 100644
index 492f84cd..00000000
Binary files a/#pma/themes/fallen/img/pmd/left_panel_butt.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/pmd/left_panel_tab.png b/#pma/themes/fallen/img/pmd/left_panel_tab.png
deleted file mode 100644
index 733588e3..00000000
Binary files a/#pma/themes/fallen/img/pmd/left_panel_tab.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/pmd/minus.png b/#pma/themes/fallen/img/pmd/minus.png
deleted file mode 100644
index 664956f3..00000000
Binary files a/#pma/themes/fallen/img/pmd/minus.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/pmd/or_icon.png b/#pma/themes/fallen/img/pmd/or_icon.png
deleted file mode 100644
index 5a12061c..00000000
Binary files a/#pma/themes/fallen/img/pmd/or_icon.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/pmd/page_add.png b/#pma/themes/fallen/img/pmd/page_add.png
deleted file mode 100644
index 5681c129..00000000
Binary files a/#pma/themes/fallen/img/pmd/page_add.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/pmd/page_delete.png b/#pma/themes/fallen/img/pmd/page_delete.png
deleted file mode 100644
index 87951a45..00000000
Binary files a/#pma/themes/fallen/img/pmd/page_delete.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/pmd/page_edit.png b/#pma/themes/fallen/img/pmd/page_edit.png
deleted file mode 100644
index 8359a6ac..00000000
Binary files a/#pma/themes/fallen/img/pmd/page_edit.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/pmd/pdf.png b/#pma/themes/fallen/img/pmd/pdf.png
deleted file mode 100644
index 4844d436..00000000
Binary files a/#pma/themes/fallen/img/pmd/pdf.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/pmd/plus.png b/#pma/themes/fallen/img/pmd/plus.png
deleted file mode 100644
index 11ef0023..00000000
Binary files a/#pma/themes/fallen/img/pmd/plus.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/pmd/query_builder.png b/#pma/themes/fallen/img/pmd/query_builder.png
deleted file mode 100644
index 13262f92..00000000
Binary files a/#pma/themes/fallen/img/pmd/query_builder.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/pmd/relation.png b/#pma/themes/fallen/img/pmd/relation.png
deleted file mode 100644
index b7b541e6..00000000
Binary files a/#pma/themes/fallen/img/pmd/relation.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/pmd/reload.png b/#pma/themes/fallen/img/pmd/reload.png
deleted file mode 100644
index 63f0b6c9..00000000
Binary files a/#pma/themes/fallen/img/pmd/reload.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/pmd/resize.png b/#pma/themes/fallen/img/pmd/resize.png
deleted file mode 100644
index 872eb32d..00000000
Binary files a/#pma/themes/fallen/img/pmd/resize.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/pmd/resizeright.png b/#pma/themes/fallen/img/pmd/resizeright.png
deleted file mode 100644
index c4844cf9..00000000
Binary files a/#pma/themes/fallen/img/pmd/resizeright.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/pmd/rightarrow1.png b/#pma/themes/fallen/img/pmd/rightarrow1.png
deleted file mode 100644
index 6d4f63b0..00000000
Binary files a/#pma/themes/fallen/img/pmd/rightarrow1.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/pmd/rightarrow2.png b/#pma/themes/fallen/img/pmd/rightarrow2.png
deleted file mode 100644
index 5cecf9ee..00000000
Binary files a/#pma/themes/fallen/img/pmd/rightarrow2.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/pmd/save.png b/#pma/themes/fallen/img/pmd/save.png
deleted file mode 100644
index 3e65b6ab..00000000
Binary files a/#pma/themes/fallen/img/pmd/save.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/pmd/save_as.png b/#pma/themes/fallen/img/pmd/save_as.png
deleted file mode 100644
index d5689775..00000000
Binary files a/#pma/themes/fallen/img/pmd/save_as.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/pmd/small_tab.png b/#pma/themes/fallen/img/pmd/small_tab.png
deleted file mode 100644
index 839d74e2..00000000
Binary files a/#pma/themes/fallen/img/pmd/small_tab.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/pmd/table.png b/#pma/themes/fallen/img/pmd/table.png
deleted file mode 100644
index caf214d2..00000000
Binary files a/#pma/themes/fallen/img/pmd/table.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/pmd/toggle_lines.png b/#pma/themes/fallen/img/pmd/toggle_lines.png
deleted file mode 100644
index 31f187e5..00000000
Binary files a/#pma/themes/fallen/img/pmd/toggle_lines.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/pmd/top_panel.png b/#pma/themes/fallen/img/pmd/top_panel.png
deleted file mode 100644
index 6856d505..00000000
Binary files a/#pma/themes/fallen/img/pmd/top_panel.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/pmd/uparrow2_m.png b/#pma/themes/fallen/img/pmd/uparrow2_m.png
deleted file mode 100644
index 2c3b9352..00000000
Binary files a/#pma/themes/fallen/img/pmd/uparrow2_m.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/pmd/viewInFullscreen.png b/#pma/themes/fallen/img/pmd/viewInFullscreen.png
deleted file mode 100644
index 8692df67..00000000
Binary files a/#pma/themes/fallen/img/pmd/viewInFullscreen.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/s_asc.png b/#pma/themes/fallen/img/s_asc.png
deleted file mode 100644
index e8ae3378..00000000
Binary files a/#pma/themes/fallen/img/s_asc.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/s_asci.png b/#pma/themes/fallen/img/s_asci.png
deleted file mode 100644
index 2c7e116b..00000000
Binary files a/#pma/themes/fallen/img/s_asci.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/s_attention.png b/#pma/themes/fallen/img/s_attention.png
deleted file mode 100644
index c5e482f8..00000000
Binary files a/#pma/themes/fallen/img/s_attention.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/s_cancel.png b/#pma/themes/fallen/img/s_cancel.png
deleted file mode 100644
index 33798302..00000000
Binary files a/#pma/themes/fallen/img/s_cancel.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/s_cancel2.png b/#pma/themes/fallen/img/s_cancel2.png
deleted file mode 100644
index 79268418..00000000
Binary files a/#pma/themes/fallen/img/s_cancel2.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/s_cog.png b/#pma/themes/fallen/img/s_cog.png
deleted file mode 100644
index 8bf76fbb..00000000
Binary files a/#pma/themes/fallen/img/s_cog.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/s_collapseall.png b/#pma/themes/fallen/img/s_collapseall.png
deleted file mode 100644
index 8cb7c297..00000000
Binary files a/#pma/themes/fallen/img/s_collapseall.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/s_db.png b/#pma/themes/fallen/img/s_db.png
deleted file mode 100644
index 919cb77c..00000000
Binary files a/#pma/themes/fallen/img/s_db.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/s_desc.png b/#pma/themes/fallen/img/s_desc.png
deleted file mode 100644
index fa1bb840..00000000
Binary files a/#pma/themes/fallen/img/s_desc.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/s_error.png b/#pma/themes/fallen/img/s_error.png
deleted file mode 100644
index 220dbb4e..00000000
Binary files a/#pma/themes/fallen/img/s_error.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/s_error2.png b/#pma/themes/fallen/img/s_error2.png
deleted file mode 100644
index 70db85f2..00000000
Binary files a/#pma/themes/fallen/img/s_error2.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/s_fulltext.png b/#pma/themes/fallen/img/s_fulltext.png
deleted file mode 100644
index bcd02b29..00000000
Binary files a/#pma/themes/fallen/img/s_fulltext.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/s_host.png b/#pma/themes/fallen/img/s_host.png
deleted file mode 100644
index 6e2cdc5a..00000000
Binary files a/#pma/themes/fallen/img/s_host.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/s_info.png b/#pma/themes/fallen/img/s_info.png
deleted file mode 100644
index d2e8818b..00000000
Binary files a/#pma/themes/fallen/img/s_info.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/s_lang.png b/#pma/themes/fallen/img/s_lang.png
deleted file mode 100644
index 7a9886ce..00000000
Binary files a/#pma/themes/fallen/img/s_lang.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/s_link.png b/#pma/themes/fallen/img/s_link.png
deleted file mode 100644
index babbb64a..00000000
Binary files a/#pma/themes/fallen/img/s_link.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/s_lock.png b/#pma/themes/fallen/img/s_lock.png
deleted file mode 100644
index b21c12ea..00000000
Binary files a/#pma/themes/fallen/img/s_lock.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/s_loggoff.png b/#pma/themes/fallen/img/s_loggoff.png
deleted file mode 100644
index 72012edd..00000000
Binary files a/#pma/themes/fallen/img/s_loggoff.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/s_notice.png b/#pma/themes/fallen/img/s_notice.png
deleted file mode 100644
index c5e482f8..00000000
Binary files a/#pma/themes/fallen/img/s_notice.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/s_okay.png b/#pma/themes/fallen/img/s_okay.png
deleted file mode 100644
index 783e3ee9..00000000
Binary files a/#pma/themes/fallen/img/s_okay.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/s_partialtext.png b/#pma/themes/fallen/img/s_partialtext.png
deleted file mode 100644
index 2e291a99..00000000
Binary files a/#pma/themes/fallen/img/s_partialtext.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/s_passwd.png b/#pma/themes/fallen/img/s_passwd.png
deleted file mode 100644
index 61cd4b16..00000000
Binary files a/#pma/themes/fallen/img/s_passwd.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/s_process.png b/#pma/themes/fallen/img/s_process.png
deleted file mode 100644
index 8bf76fbb..00000000
Binary files a/#pma/themes/fallen/img/s_process.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/s_really.png b/#pma/themes/fallen/img/s_really.png
deleted file mode 100644
index 04d4b2ff..00000000
Binary files a/#pma/themes/fallen/img/s_really.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/s_reload.png b/#pma/themes/fallen/img/s_reload.png
deleted file mode 100644
index 75ea0a8b..00000000
Binary files a/#pma/themes/fallen/img/s_reload.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/s_replication.png b/#pma/themes/fallen/img/s_replication.png
deleted file mode 100644
index f51a1779..00000000
Binary files a/#pma/themes/fallen/img/s_replication.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/s_rights.png b/#pma/themes/fallen/img/s_rights.png
deleted file mode 100644
index 397191ea..00000000
Binary files a/#pma/themes/fallen/img/s_rights.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/s_sortable.png b/#pma/themes/fallen/img/s_sortable.png
deleted file mode 100644
index e318e67a..00000000
Binary files a/#pma/themes/fallen/img/s_sortable.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/s_status.png b/#pma/themes/fallen/img/s_status.png
deleted file mode 100644
index 7fa34907..00000000
Binary files a/#pma/themes/fallen/img/s_status.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/s_success.png b/#pma/themes/fallen/img/s_success.png
deleted file mode 100644
index ebba7889..00000000
Binary files a/#pma/themes/fallen/img/s_success.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/s_sync.png b/#pma/themes/fallen/img/s_sync.png
deleted file mode 100644
index 8545ba1b..00000000
Binary files a/#pma/themes/fallen/img/s_sync.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/s_tbl.png b/#pma/themes/fallen/img/s_tbl.png
deleted file mode 100644
index 6d74cf82..00000000
Binary files a/#pma/themes/fallen/img/s_tbl.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/s_theme.png b/#pma/themes/fallen/img/s_theme.png
deleted file mode 100644
index 9634c5b6..00000000
Binary files a/#pma/themes/fallen/img/s_theme.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/s_top.png b/#pma/themes/fallen/img/s_top.png
deleted file mode 100644
index 80090707..00000000
Binary files a/#pma/themes/fallen/img/s_top.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/s_unlink.png b/#pma/themes/fallen/img/s_unlink.png
deleted file mode 100644
index 0ddb18e9..00000000
Binary files a/#pma/themes/fallen/img/s_unlink.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/s_vars.png b/#pma/themes/fallen/img/s_vars.png
deleted file mode 100644
index b09d8d9e..00000000
Binary files a/#pma/themes/fallen/img/s_vars.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/s_views.png b/#pma/themes/fallen/img/s_views.png
deleted file mode 100644
index b1c78e32..00000000
Binary files a/#pma/themes/fallen/img/s_views.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/select_bg.png b/#pma/themes/fallen/img/select_bg.png
deleted file mode 100644
index 9a2cadf7..00000000
Binary files a/#pma/themes/fallen/img/select_bg.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/south-mini.png b/#pma/themes/fallen/img/south-mini.png
deleted file mode 100644
index 954c202b..00000000
Binary files a/#pma/themes/fallen/img/south-mini.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/spacer.png b/#pma/themes/fallen/img/spacer.png
deleted file mode 100644
index ced15068..00000000
Binary files a/#pma/themes/fallen/img/spacer.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/sprites.png b/#pma/themes/fallen/img/sprites.png
deleted file mode 100644
index 3fb09440..00000000
Binary files a/#pma/themes/fallen/img/sprites.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/toggle-ltr.png b/#pma/themes/fallen/img/toggle-ltr.png
deleted file mode 100644
index 37a9d4fb..00000000
Binary files a/#pma/themes/fallen/img/toggle-ltr.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/toggle-rtl.png b/#pma/themes/fallen/img/toggle-rtl.png
deleted file mode 100644
index 67f5c3e3..00000000
Binary files a/#pma/themes/fallen/img/toggle-rtl.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/vertical_line.png b/#pma/themes/fallen/img/vertical_line.png
deleted file mode 100644
index a88a7c7b..00000000
Binary files a/#pma/themes/fallen/img/vertical_line.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/west-mini.png b/#pma/themes/fallen/img/west-mini.png
deleted file mode 100644
index a13f0835..00000000
Binary files a/#pma/themes/fallen/img/west-mini.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/window-new.png b/#pma/themes/fallen/img/window-new.png
deleted file mode 100644
index 431fe851..00000000
Binary files a/#pma/themes/fallen/img/window-new.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/zoom-minus-mini.png b/#pma/themes/fallen/img/zoom-minus-mini.png
deleted file mode 100644
index 4262ad46..00000000
Binary files a/#pma/themes/fallen/img/zoom-minus-mini.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/zoom-plus-mini.png b/#pma/themes/fallen/img/zoom-plus-mini.png
deleted file mode 100644
index 4fabfd1e..00000000
Binary files a/#pma/themes/fallen/img/zoom-plus-mini.png and /dev/null differ
diff --git a/#pma/themes/fallen/img/zoom-world-mini.png b/#pma/themes/fallen/img/zoom-world-mini.png
deleted file mode 100644
index e4d72318..00000000
Binary files a/#pma/themes/fallen/img/zoom-world-mini.png and /dev/null differ
diff --git a/#pma/themes/fallen/info.inc.php b/#pma/themes/fallen/info.inc.php
deleted file mode 100644
index 50e19a81..00000000
--- a/#pma/themes/fallen/info.inc.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-/**
- * This file is information for Fallen theme
- *
- * @package Fallen
- * @author Frans Allen
- * @link https://www.fransallen.com
- */
-
-# Theme info
-
-$theme_name = 'Fallen';
-$theme_full_version = '0.2';
diff --git a/#pma/themes/fallen/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png b/#pma/themes/fallen/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png
deleted file mode 100644
index d269fe1f..00000000
Binary files a/#pma/themes/fallen/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png and /dev/null differ
diff --git a/#pma/themes/fallen/jquery/images/ui-bg_glass_65_ffffff_1x400.png b/#pma/themes/fallen/jquery/images/ui-bg_glass_65_ffffff_1x400.png
deleted file mode 100644
index a4380658..00000000
Binary files a/#pma/themes/fallen/jquery/images/ui-bg_glass_65_ffffff_1x400.png and /dev/null differ
diff --git a/#pma/themes/fallen/jquery/images/ui-bg_glass_75_dadada_1x400.png b/#pma/themes/fallen/jquery/images/ui-bg_glass_75_dadada_1x400.png
deleted file mode 100644
index 1cc3d0ad..00000000
Binary files a/#pma/themes/fallen/jquery/images/ui-bg_glass_75_dadada_1x400.png and /dev/null differ
diff --git a/#pma/themes/fallen/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png b/#pma/themes/fallen/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png
deleted file mode 100644
index e3d1f37e..00000000
Binary files a/#pma/themes/fallen/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png and /dev/null differ
diff --git a/#pma/themes/fallen/jquery/images/ui-bg_glass_95_fef1ec_1x400.png b/#pma/themes/fallen/jquery/images/ui-bg_glass_95_fef1ec_1x400.png
deleted file mode 100644
index af812162..00000000
Binary files a/#pma/themes/fallen/jquery/images/ui-bg_glass_95_fef1ec_1x400.png and /dev/null differ
diff --git a/#pma/themes/fallen/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/#pma/themes/fallen/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png
deleted file mode 100644
index 870b168f..00000000
Binary files a/#pma/themes/fallen/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png and /dev/null differ
diff --git a/#pma/themes/fallen/jquery/images/ui-icons_222222_256x240.png b/#pma/themes/fallen/jquery/images/ui-icons_222222_256x240.png
deleted file mode 100644
index 4d111092..00000000
Binary files a/#pma/themes/fallen/jquery/images/ui-icons_222222_256x240.png and /dev/null differ
diff --git a/#pma/themes/fallen/jquery/images/ui-icons_2e83ff_256x240.png b/#pma/themes/fallen/jquery/images/ui-icons_2e83ff_256x240.png
deleted file mode 100644
index 36c67ffc..00000000
Binary files a/#pma/themes/fallen/jquery/images/ui-icons_2e83ff_256x240.png and /dev/null differ
diff --git a/#pma/themes/fallen/jquery/images/ui-icons_454545_256x240.png b/#pma/themes/fallen/jquery/images/ui-icons_454545_256x240.png
deleted file mode 100644
index 69c23ff3..00000000
Binary files a/#pma/themes/fallen/jquery/images/ui-icons_454545_256x240.png and /dev/null differ
diff --git a/#pma/themes/fallen/jquery/images/ui-icons_888888_256x240.png b/#pma/themes/fallen/jquery/images/ui-icons_888888_256x240.png
deleted file mode 100644
index 504bc3e6..00000000
Binary files a/#pma/themes/fallen/jquery/images/ui-icons_888888_256x240.png and /dev/null differ
diff --git a/#pma/themes/fallen/jquery/images/ui-icons_cd0a0a_256x240.png b/#pma/themes/fallen/jquery/images/ui-icons_cd0a0a_256x240.png
deleted file mode 100644
index de975f9e..00000000
Binary files a/#pma/themes/fallen/jquery/images/ui-icons_cd0a0a_256x240.png and /dev/null differ
diff --git a/#pma/themes/fallen/jquery/jquery-ui-1.11.4.css b/#pma/themes/fallen/jquery/jquery-ui-1.11.4.css
deleted file mode 100644
index 1f55c602..00000000
--- a/#pma/themes/fallen/jquery/jquery-ui-1.11.4.css
+++ /dev/null
@@ -1,1897 +0,0 @@
-/*! jQuery UI - v1.11.4 - 2016-01-08
-* http://jqueryui.com
-* Includes: core.css, draggable.css, resizable.css, selectable.css, sortable.css, accordion.css, autocomplete.css, button.css, datepicker.css, dialog.css, menu.css, progressbar.css, selectmenu.css, slider.css, spinner.css, tabs.css, tooltip.css, theme.css
-* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana%2CArial%2Csans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=highlight_soft&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=flat&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=glass&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=glass&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=glass&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=glass&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=glass&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=flat&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=flat&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px
-* Copyright jQuery Foundation and other contributors; Licensed MIT */
-
-
-/* Layout helpers
-----------------------------------*/
-
-.ui-helper-hidden {
-  display: none;
-}
-
-.ui-helper-hidden-accessible {
-  border: 0;
-  clip: rect(0 0 0 0);
-  height: 1px;
-  margin: -1px;
-  overflow: hidden;
-  padding: 0;
-  position: absolute;
-  width: 1px;
-}
-
-.ui-helper-reset {
-  margin: 0;
-  padding: 0;
-  border: 0;
-  outline: 0;
-  line-height: 1.3;
-  text-decoration: none;
-  font-size: 100%;
-  list-style: none;
-}
-
-.ui-helper-clearfix:before, .ui-helper-clearfix:after {
-  content: "";
-  display: table;
-  border-collapse: collapse;
-}
-
-.ui-helper-clearfix:after {
-  clear: both;
-}
-
-.ui-helper-clearfix {
-  min-height: 0;
-  /* support: IE7 */
-}
-
-.ui-helper-zfix {
-  width: 100%;
-  height: 100%;
-  top: 0;
-  left: 0;
-  position: absolute;
-  opacity: 0;
-  filter: Alpha(Opacity=0);
-  /* support: IE8 */
-}
-
-.ui-front {
-  z-index: 100;
-}
-
-
-/* Interaction Cues
-----------------------------------*/
-
-.ui-state-disabled {
-  cursor: default !important;
-}
-
-
-/* Icons
-----------------------------------*/
-
-
-/* states and images */
-
-.ui-icon {
-  display: block;
-  text-indent: -99999px;
-  overflow: hidden;
-  background-repeat: no-repeat;
-}
-
-
-/* Misc visuals
-----------------------------------*/
-
-
-/* Overlays */
-
-.ui-widget-overlay {
-  position: fixed;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-}
-
-.ui-draggable-handle {
-  -ms-touch-action: none;
-  touch-action: none;
-}
-
-.ui-resizable {
-  position: relative;
-}
-
-.ui-resizable-handle {
-  position: absolute;
-  font-size: 0.1px;
-  display: block;
-  -ms-touch-action: none;
-  touch-action: none;
-}
-
-.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle {
-  display: none;
-}
-
-.ui-resizable-n {
-  cursor: n-resize;
-  height: 7px;
-  width: 100%;
-  top: -5px;
-  left: 0;
-}
-
-.ui-resizable-s {
-  cursor: s-resize;
-  height: 7px;
-  width: 100%;
-  bottom: -5px;
-  left: 0;
-}
-
-.ui-resizable-e {
-  cursor: e-resize;
-  width: 7px;
-  right: -5px;
-  top: 0;
-  height: 100%;
-}
-
-.ui-resizable-w {
-  cursor: w-resize;
-  width: 7px;
-  left: -5px;
-  top: 0;
-  height: 100%;
-}
-
-.ui-resizable-se {
-  cursor: se-resize;
-  width: 12px;
-  height: 12px;
-  right: 1px;
-  bottom: 1px;
-}
-
-.ui-resizable-sw {
-  cursor: sw-resize;
-  width: 9px;
-  height: 9px;
-  left: -5px;
-  bottom: -5px;
-}
-
-.ui-resizable-nw {
-  cursor: nw-resize;
-  width: 9px;
-  height: 9px;
-  left: -5px;
-  top: -5px;
-}
-
-.ui-resizable-ne {
-  cursor: ne-resize;
-  width: 9px;
-  height: 9px;
-  right: -5px;
-  top: -5px;
-}
-
-.ui-selectable {
-  -ms-touch-action: none;
-  touch-action: none;
-}
-
-.ui-selectable-helper {
-  position: absolute;
-  z-index: 100;
-  border: 1px dotted black;
-}
-
-.ui-sortable-handle {
-  -ms-touch-action: none;
-  touch-action: none;
-}
-
-.ui-accordion .ui-accordion-header {
-  display: block;
-  cursor: pointer;
-  position: relative;
-  margin: 2px 0 0 0;
-  padding: .5em .5em .5em .7em;
-  min-height: 0;
-  /* support: IE7 */
-  font-size: 100%;
-}
-
-.ui-accordion .ui-accordion-icons {
-  padding-left: 2.2em;
-}
-
-.ui-accordion .ui-accordion-icons .ui-accordion-icons {
-  padding-left: 2.2em;
-}
-
-.ui-accordion .ui-accordion-header .ui-accordion-header-icon {
-  position: absolute;
-  left: .5em;
-  top: 50%;
-  margin-top: -8px;
-}
-
-.ui-accordion .ui-accordion-content {
-  padding: 1em 2.2em;
-  border-top: 0;
-  overflow: auto;
-}
-
-.ui-autocomplete {
-  position: absolute;
-  top: 0;
-  left: 0;
-  cursor: default;
-}
-
-.ui-button {
-  display: inline-block;
-  position: relative;
-  padding: 0;
-  line-height: normal;
-  margin-right: .1em;
-  cursor: pointer;
-  vertical-align: middle;
-  text-align: center;
-  overflow: visible;
-  /* removes extra width in IE */
-}
-
-.ui-button, .ui-button:link, .ui-button:visited, .ui-button:hover, .ui-button:active {
-  text-decoration: none;
-}
-
-
-/* to make room for the icon, a width needs to be set here */
-
-.ui-button-icon-only {
-  width: 2.2em;
-}
-
-
-/* button elements seem to need a little more width */
-
-button.ui-button-icon-only {
-  width: 2.4em;
-}
-
-.ui-button-icons-only {
-  width: 3.4em;
-}
-
-button.ui-button-icons-only {
-  width: 3.7em;
-}
-
-
-/* button text element */
-
-.ui-button .ui-button-text {
-  display: block;
-  line-height: normal;
-}
-
-.ui-button-text-only .ui-button-text {
-  padding: .4em 1em;
-}
-
-.ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text {
-  padding: .4em;
-  text-indent: -9999999px;
-}
-
-.ui-button-text-icon-primary .ui-button-text, .ui-button-text-icons .ui-button-text {
-  padding: .4em 1em .4em 2.1em;
-}
-
-.ui-button-text-icon-secondary .ui-button-text, .ui-button-text-icons .ui-button-text {
-  padding: .4em 2.1em .4em 1em;
-}
-
-.ui-button-text-icons .ui-button-text {
-  padding-left: 2.1em;
-  padding-right: 2.1em;
-}
-
-
-/* no icon support for input elements, provide padding by default */
-
-input.ui-button {
-  padding: .4em 1em;
-}
-
-
-/* button icon element(s) */
-
-.ui-button-icon-only .ui-icon, .ui-button-text-icon-primary .ui-icon, .ui-button-text-icon-secondary .ui-icon, .ui-button-text-icons .ui-icon, .ui-button-icons-only .ui-icon {
-  position: absolute;
-  top: 50%;
-  margin-top: -8px;
-}
-
-.ui-button-icon-only .ui-icon {
-  left: 50%;
-  margin-left: -8px;
-}
-
-.ui-button-text-icon-primary .ui-button-icon-primary, .ui-button-text-icons .ui-button-icon-primary, .ui-button-icons-only .ui-button-icon-primary {
-  left: .5em;
-}
-
-.ui-button-text-icon-secondary .ui-button-icon-secondary, .ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary {
-  right: .5em;
-}
-
-
-/* button sets */
-
-.ui-buttonset {
-  margin-right: 7px;
-}
-
-.ui-buttonset .ui-button {
-  margin-left: 0;
-  margin-right: -.3em;
-}
-
-
-/* workarounds */
-
-
-/* reset extra padding in Firefox, see h5bp.com/l */
-
-input.ui-button::-moz-focus-inner, button.ui-button::-moz-focus-inner {
-  border: 0;
-  padding: 0;
-}
-
-.ui-datepicker {
-  width: 17em;
-  padding: .2em .2em 0;
-  display: none;
-}
-
-.ui-datepicker .ui-datepicker-header {
-  position: relative;
-  padding: .2em 0;
-}
-
-.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next {
-  position: absolute;
-  top: 2px;
-  width: 1.8em;
-  height: 1.8em;
-}
-
-.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover {
-  top: 1px;
-}
-
-.ui-datepicker .ui-datepicker-prev {
-  left: 2px;
-}
-
-.ui-datepicker .ui-datepicker-next {
-  right: 2px;
-}
-
-.ui-datepicker .ui-datepicker-prev-hover {
-  left: 1px;
-}
-
-.ui-datepicker .ui-datepicker-next-hover {
-  right: 1px;
-}
-
-.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span {
-  display: block;
-  position: absolute;
-  left: 50%;
-  margin-left: -8px;
-  top: 50%;
-  margin-top: -8px;
-}
-
-.ui-datepicker .ui-datepicker-title {
-  margin: 0 2.3em;
-  line-height: 1.8em;
-  text-align: center;
-}
-
-.ui-datepicker .ui-datepicker-title select {
-  font-size: 1em;
-  margin: 1px 0;
-}
-
-.ui-datepicker select.ui-datepicker-month, .ui-datepicker select.ui-datepicker-year {
-  width: 45%;
-}
-
-.ui-datepicker table {
-  width: 100%;
-  font-size: .9em;
-  border-collapse: collapse;
-  margin: 0 0 .4em;
-}
-
-.ui-datepicker th {
-  padding: .7em .3em;
-  text-align: center;
-  font-weight: bold;
-  border: 0;
-}
-
-.ui-datepicker td {
-  border: 0;
-  padding: 1px;
-}
-
-.ui-datepicker td span, .ui-datepicker td a {
-  display: block;
-  padding: .2em;
-  text-align: right;
-  text-decoration: none;
-}
-
-.ui-datepicker .ui-datepicker-buttonpane {
-  background-image: none;
-  margin: .7em 0 0 0;
-  padding: 0 .2em;
-  border-left: 0;
-  border-right: 0;
-  border-bottom: 0;
-}
-
-.ui-datepicker .ui-datepicker-buttonpane button {
-  float: right;
-  margin: .5em .2em .4em;
-  cursor: pointer;
-  padding: .2em .6em .3em .6em;
-  width: auto;
-  overflow: visible;
-}
-
-.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current {
-  float: left;
-}
-
-
-/* with multiple calendars */
-
-.ui-datepicker.ui-datepicker-multi {
-  width: auto;
-}
-
-.ui-datepicker-multi .ui-datepicker-group {
-  float: left;
-}
-
-.ui-datepicker-multi .ui-datepicker-group table {
-  width: 95%;
-  margin: 0 auto .4em;
-}
-
-.ui-datepicker-multi-2 .ui-datepicker-group {
-  width: 50%;
-}
-
-.ui-datepicker-multi-3 .ui-datepicker-group {
-  width: 33.3%;
-}
-
-.ui-datepicker-multi-4 .ui-datepicker-group {
-  width: 25%;
-}
-
-.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header, .ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header {
-  border-left-width: 0;
-}
-
-.ui-datepicker-multi .ui-datepicker-buttonpane {
-  clear: left;
-}
-
-.ui-datepicker-row-break {
-  clear: both;
-  width: 100%;
-  font-size: 0;
-}
-
-
-/* RTL support */
-
-.ui-datepicker-rtl {
-  direction: rtl;
-}
-
-.ui-datepicker-rtl .ui-datepicker-prev {
-  right: 2px;
-  left: auto;
-}
-
-.ui-datepicker-rtl .ui-datepicker-next {
-  left: 2px;
-  right: auto;
-}
-
-.ui-datepicker-rtl .ui-datepicker-prev:hover {
-  right: 1px;
-  left: auto;
-}
-
-.ui-datepicker-rtl .ui-datepicker-next:hover {
-  left: 1px;
-  right: auto;
-}
-
-.ui-datepicker-rtl .ui-datepicker-buttonpane {
-  clear: right;
-}
-
-.ui-datepicker-rtl .ui-datepicker-buttonpane button {
-  float: left;
-}
-
-.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current, .ui-datepicker-rtl .ui-datepicker-group {
-  float: right;
-}
-
-.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header, .ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header {
-  border-right-width: 0;
-  border-left-width: 1px;
-}
-
-.ui-dialog {
-  overflow: hidden;
-  position: absolute;
-  top: 0;
-  left: 0;
-  padding: .2em;
-  outline: 0;
-}
-
-.ui-dialog .ui-dialog-titlebar {
-  padding: .4em 1em;
-  position: relative;
-}
-
-.ui-dialog .ui-dialog-title {
-  float: left;
-  margin: .1em 0;
-  white-space: nowrap;
-  width: 90%;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-
-.ui-dialog .ui-dialog-titlebar-close {
-  position: absolute;
-  right: .3em;
-  top: 50%;
-  width: 20px;
-  margin: -10px 0 0 0;
-  padding: 1px;
-  height: 20px;
-}
-
-.ui-dialog .ui-dialog-content {
-  position: relative;
-  border: 0;
-  padding: .5em 1em;
-  background: none;
-  overflow: auto;
-}
-
-.ui-dialog .ui-dialog-buttonpane {
-  text-align: left;
-  border-width: 1px 0 0 0;
-  background-image: none;
-  margin-top: .5em;
-  padding: .3em 1em .5em .4em;
-}
-
-.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset {
-  float: right;
-}
-
-.ui-dialog .ui-dialog-buttonpane button {
-  margin: .5em .4em .5em 0;
-  cursor: pointer;
-}
-
-.ui-dialog .ui-resizable-se {
-  width: 12px;
-  height: 12px;
-  right: -5px;
-  bottom: -5px;
-  background-position: 16px 16px;
-}
-
-.ui-draggable .ui-dialog-titlebar {
-  cursor: move;
-}
-
-.ui-menu {
-  list-style: none;
-  padding: 0;
-  margin: 0;
-  display: block;
-  outline: none;
-}
-
-.ui-menu .ui-menu {
-  position: absolute;
-}
-
-.ui-menu .ui-menu-item {
-  position: relative;
-  margin: 0;
-  padding: 3px 1em 3px .4em;
-  cursor: pointer;
-  min-height: 0;
-  /* support: IE7 */
-  /* support: IE10, see #8844 */
-  list-style-image: url("data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7");
-}
-
-.ui-menu .ui-menu-divider {
-  margin: 5px 0;
-  height: 0;
-  font-size: 0;
-  line-height: 0;
-  border-width: 1px 0 0 0;
-}
-
-.ui-menu .ui-state-focus, .ui-menu .ui-state-active {
-  margin: -1px;
-}
-
-
-/* icon support */
-
-.ui-menu-icons {
-  position: relative;
-}
-
-.ui-menu-icons .ui-menu-item {
-  padding-left: 2em;
-}
-
-
-/* left-aligned */
-
-.ui-menu .ui-icon {
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  left: .2em;
-  margin: auto 0;
-}
-
-
-/* right-aligned */
-
-.ui-menu .ui-menu-icon {
-  left: auto;
-  right: 0;
-}
-
-.ui-progressbar {
-  height: 2em;
-  text-align: left;
-  overflow: hidden;
-}
-
-.ui-progressbar .ui-progressbar-value {
-  margin: -1px;
-  height: 100%;
-}
-
-.ui-progressbar .ui-progressbar-overlay {
-  background: url("data:image/gif;base64,R0lGODlhKAAoAIABAAAAAP///yH/C05FVFNDQVBFMi4wAwEAAAAh+QQJAQABACwAAAAAKAAoAAACkYwNqXrdC52DS06a7MFZI+4FHBCKoDeWKXqymPqGqxvJrXZbMx7Ttc+w9XgU2FB3lOyQRWET2IFGiU9m1frDVpxZZc6bfHwv4c1YXP6k1Vdy292Fb6UkuvFtXpvWSzA+HycXJHUXiGYIiMg2R6W459gnWGfHNdjIqDWVqemH2ekpObkpOlppWUqZiqr6edqqWQAAIfkECQEAAQAsAAAAACgAKAAAApSMgZnGfaqcg1E2uuzDmmHUBR8Qil95hiPKqWn3aqtLsS18y7G1SzNeowWBENtQd+T1JktP05nzPTdJZlR6vUxNWWjV+vUWhWNkWFwxl9VpZRedYcflIOLafaa28XdsH/ynlcc1uPVDZxQIR0K25+cICCmoqCe5mGhZOfeYSUh5yJcJyrkZWWpaR8doJ2o4NYq62lAAACH5BAkBAAEALAAAAAAoACgAAAKVDI4Yy22ZnINRNqosw0Bv7i1gyHUkFj7oSaWlu3ovC8GxNso5fluz3qLVhBVeT/Lz7ZTHyxL5dDalQWPVOsQWtRnuwXaFTj9jVVh8pma9JjZ4zYSj5ZOyma7uuolffh+IR5aW97cHuBUXKGKXlKjn+DiHWMcYJah4N0lYCMlJOXipGRr5qdgoSTrqWSq6WFl2ypoaUAAAIfkECQEAAQAsAAAAACgAKAAAApaEb6HLgd/iO7FNWtcFWe+ufODGjRfoiJ2akShbueb0wtI50zm02pbvwfWEMWBQ1zKGlLIhskiEPm9R6vRXxV4ZzWT2yHOGpWMyorblKlNp8HmHEb/lCXjcW7bmtXP8Xt229OVWR1fod2eWqNfHuMjXCPkIGNileOiImVmCOEmoSfn3yXlJWmoHGhqp6ilYuWYpmTqKUgAAIfkECQEAAQAsAAAAACgAKAAAApiEH6kb58biQ3FNWtMFWW3eNVcojuFGfqnZqSebuS06w5V80/X02pKe8zFwP6EFWOT1lDFk8rGERh1TTNOocQ61Hm4Xm2VexUHpzjymViHrFbiELsefVrn6XKfnt2Q9G/+Xdie499XHd2g4h7ioOGhXGJboGAnXSBnoBwKYyfioubZJ2Hn0RuRZaflZOil56Zp6iioKSXpUAAAh+QQJAQABACwAAAAAKAAoAAACkoQRqRvnxuI7kU1a1UU5bd5tnSeOZXhmn5lWK3qNTWvRdQxP8qvaC+/yaYQzXO7BMvaUEmJRd3TsiMAgswmNYrSgZdYrTX6tSHGZO73ezuAw2uxuQ+BbeZfMxsexY35+/Qe4J1inV0g4x3WHuMhIl2jXOKT2Q+VU5fgoSUI52VfZyfkJGkha6jmY+aaYdirq+lQAACH5BAkBAAEALAAAAAAoACgAAAKWBIKpYe0L3YNKToqswUlvznigd4wiR4KhZrKt9Upqip61i9E3vMvxRdHlbEFiEXfk9YARYxOZZD6VQ2pUunBmtRXo1Lf8hMVVcNl8JafV38aM2/Fu5V16Bn63r6xt97j09+MXSFi4BniGFae3hzbH9+hYBzkpuUh5aZmHuanZOZgIuvbGiNeomCnaxxap2upaCZsq+1kAACH5BAkBAAEALAAAAAAoACgAAAKXjI8By5zf4kOxTVrXNVlv1X0d8IGZGKLnNpYtm8Lr9cqVeuOSvfOW79D9aDHizNhDJidFZhNydEahOaDH6nomtJjp1tutKoNWkvA6JqfRVLHU/QUfau9l2x7G54d1fl995xcIGAdXqMfBNadoYrhH+Mg2KBlpVpbluCiXmMnZ2Sh4GBqJ+ckIOqqJ6LmKSllZmsoq6wpQAAAh+QQJAQABACwAAAAAKAAoAAAClYx/oLvoxuJDkU1a1YUZbJ59nSd2ZXhWqbRa2/gF8Gu2DY3iqs7yrq+xBYEkYvFSM8aSSObE+ZgRl1BHFZNr7pRCavZ5BW2142hY3AN/zWtsmf12p9XxxFl2lpLn1rseztfXZjdIWIf2s5dItwjYKBgo9yg5pHgzJXTEeGlZuenpyPmpGQoKOWkYmSpaSnqKileI2FAAACH5BAkBAAEALAAAAAAoACgAAAKVjB+gu+jG4kORTVrVhRlsnn2dJ3ZleFaptFrb+CXmO9OozeL5VfP99HvAWhpiUdcwkpBH3825AwYdU8xTqlLGhtCosArKMpvfa1mMRae9VvWZfeB2XfPkeLmm18lUcBj+p5dnN8jXZ3YIGEhYuOUn45aoCDkp16hl5IjYJvjWKcnoGQpqyPlpOhr3aElaqrq56Bq7VAAAOw==");
-  height: 100%;
-  filter: alpha(opacity=25);
-  /* support: IE8 */
-  opacity: 0.25;
-}
-
-.ui-progressbar-indeterminate .ui-progressbar-value {
-  background-image: none;
-}
-
-.ui-selectmenu-menu {
-  padding: 0;
-  margin: 0;
-  position: absolute;
-  top: 0;
-  left: 0;
-  display: none;
-}
-
-.ui-selectmenu-menu .ui-menu {
-  overflow: auto;
-  /* Support: IE7 */
-  overflow-x: hidden;
-  padding-bottom: 1px;
-}
-
-.ui-selectmenu-menu .ui-menu .ui-selectmenu-optgroup {
-  font-size: 1em;
-  font-weight: bold;
-  line-height: 1.5;
-  padding: 2px 0.4em;
-  margin: 0.5em 0 0 0;
-  height: auto;
-  border: 0;
-}
-
-.ui-selectmenu-open {
-  display: block;
-}
-
-.ui-selectmenu-button {
-  display: inline-block;
-  overflow: hidden;
-  position: relative;
-  text-decoration: none;
-  cursor: pointer;
-}
-
-.ui-selectmenu-button span.ui-icon {
-  right: 0.5em;
-  left: auto;
-  margin-top: -8px;
-  position: absolute;
-  top: 50%;
-}
-
-.ui-selectmenu-button span.ui-selectmenu-text {
-  text-align: left;
-  padding: 0.4em 2.1em 0.4em 1em;
-  display: block;
-  line-height: 1.4;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
-.ui-slider {
-  position: relative;
-  text-align: left;
-}
-
-.ui-slider .ui-slider-handle {
-  position: absolute;
-  z-index: 2;
-  width: 1.2em;
-  height: 1.2em;
-  cursor: default;
-  -ms-touch-action: none;
-  touch-action: none;
-}
-
-.ui-slider .ui-slider-range {
-  position: absolute;
-  z-index: 1;
-  font-size: .7em;
-  display: block;
-  border: 0;
-  background-position: 0 0;
-}
-
-
-/* support: IE8 - See #6727 */
-
-.ui-slider.ui-state-disabled .ui-slider-handle, .ui-slider.ui-state-disabled .ui-slider-range {
-  filter: inherit;
-}
-
-.ui-slider-horizontal {
-  height: .8em;
-}
-
-.ui-slider-horizontal .ui-slider-handle {
-  top: -.3em;
-  margin-left: -.6em;
-}
-
-.ui-slider-horizontal .ui-slider-range {
-  top: 0;
-  height: 100%;
-}
-
-.ui-slider-horizontal .ui-slider-range-min {
-  left: 0;
-}
-
-.ui-slider-horizontal .ui-slider-range-max {
-  right: 0;
-}
-
-.ui-slider-vertical {
-  width: .8em;
-  height: 100px;
-}
-
-.ui-slider-vertical .ui-slider-handle {
-  left: -.3em;
-  margin-left: 0;
-  margin-bottom: -.6em;
-}
-
-.ui-slider-vertical .ui-slider-range {
-  left: 0;
-  width: 100%;
-}
-
-.ui-slider-vertical .ui-slider-range-min {
-  bottom: 0;
-}
-
-.ui-slider-vertical .ui-slider-range-max {
-  top: 0;
-}
-
-.ui-spinner {
-  position: relative;
-  display: inline-block;
-  overflow: hidden;
-  padding: 0;
-  vertical-align: middle;
-}
-
-.ui-spinner-input {
-  border: none;
-  background: none;
-  color: inherit;
-  padding: 0;
-  margin: .2em 0;
-  vertical-align: middle;
-  margin-left: .4em;
-  margin-right: 22px;
-}
-
-.ui-spinner-button {
-  width: 16px;
-  height: 50%;
-  font-size: .5em;
-  padding: 0;
-  margin: 0;
-  text-align: center;
-  position: absolute;
-  cursor: default;
-  display: block;
-  overflow: hidden;
-  right: 0;
-}
-
-
-/* more specificity required here to override default borders */
-
-.ui-spinner a.ui-spinner-button {
-  border-top: none;
-  border-bottom: none;
-  border-right: none;
-}
-
-
-/* vertically center icon */
-
-.ui-spinner .ui-icon {
-  position: absolute;
-  margin-top: -8px;
-  top: 50%;
-  left: 0;
-}
-
-.ui-spinner-up {
-  top: 0;
-}
-
-.ui-spinner-down {
-  bottom: 0;
-}
-
-
-/* TR overrides */
-
-.ui-spinner .ui-icon-triangle-1-s {
-  /* need to fix icons sprite */
-  background-position: -65px -16px;
-}
-
-.ui-tabs {
-  position: relative;
-  /* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
-  padding: .2em;
-}
-
-.ui-tabs .ui-tabs-nav {
-  margin: 0;
-  padding: .2em .2em 0;
-}
-
-.ui-tabs .ui-tabs-nav li {
-  list-style: none;
-  float: left;
-  position: relative;
-  top: 0;
-  margin: 1px .2em 0 0;
-  border-bottom-width: 0;
-  padding: 0;
-  white-space: nowrap;
-}
-
-.ui-tabs .ui-tabs-nav .ui-tabs-anchor {
-  float: left;
-  padding: .5em 1em;
-  text-decoration: none;
-}
-
-.ui-tabs .ui-tabs-nav li.ui-tabs-active {
-  margin-bottom: -1px;
-  padding-bottom: 1px;
-}
-
-.ui-tabs .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor, .ui-tabs .ui-tabs-nav li.ui-state-disabled .ui-tabs-anchor, .ui-tabs .ui-tabs-nav li.ui-tabs-loading .ui-tabs-anchor {
-  cursor: text;
-}
-
-.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor {
-  cursor: pointer;
-}
-
-.ui-tabs .ui-tabs-panel {
-  display: block;
-  border-width: 0;
-  padding: 1em 1.4em;
-  background: none;
-}
-
-.ui-tooltip {
-  padding: 8px;
-  position: absolute;
-  z-index: 9999;
-  max-width: 300px;
-  -webkit-box-shadow: 0 0 5px #aaa;
-  box-shadow: 0 0 5px #aaa;
-}
-
-body .ui-tooltip {
-  border-width: 2px;
-}
-
-
-/* Component containers
-----------------------------------*/
-
-.ui-widget {
-  font-family: Verdana, Arial, sans-serif;
-  font-size: 1.1em;
-}
-
-.ui-widget .ui-widget {
-  font-size: 1em;
-}
-
-.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button {
-  font-family: Verdana, Arial, sans-serif;
-  font-size: 1em;
-}
-
-.ui-widget-content {
-  border: 1px solid #ddd;
-  background: #fff;
-  color: #222;
-}
-
-.ui-widget-content a {
-  color: #222;
-}
-
-.ui-widget-header {
-  border: 1px solid #aaa;
-  background: #ccc url("images/ui-bg_highlight-soft_75_cccccc_1x100.png") 50% 50% repeat-x;
-  color: #222;
-  font-weight: bold;
-}
-
-.ui-widget-header a {
-  color: #222;
-}
-
-
-/* Interaction states
-----------------------------------*/
-
-.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default {
-  border: 1px solid #fff;
-  background: #fff url("images/ui-bg_glass_75_e6e6e6_1x400.png") 50% 50% repeat-x;
-  font-weight: normal;
-  color: #555555;
-}
-
-.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited {
-  color: #555555;
-  text-decoration: none;
-}
-
-.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus {
-  background: #fff url("images/ui-bg_glass_75_dadada_1x400.png") 50% 50% repeat-x;
-  font-weight: normal;
-  color: #212121;
-}
-
-.ui-state-hover a, .ui-state-hover a:hover, .ui-state-hover a:link, .ui-state-hover a:visited, .ui-state-focus a, .ui-state-focus a:hover, .ui-state-focus a:link, .ui-state-focus a:visited {
-  color: #212121;
-  text-decoration: none;
-}
-
-.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active {
-  border: 1px solid #fff;
-  background: #fff url("images/ui-bg_glass_65_ffffff_1x400.png") 50% 50% repeat-x;
-  font-weight: normal;
-  color: #212121;
-}
-
-.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited {
-  color: #212121;
-  text-decoration: none;
-}
-
-
-/* Interaction Cues
-----------------------------------*/
-
-.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight {
-  border: 1px solid #fcefa1;
-  background: #fbf9ee url("images/ui-bg_glass_55_fbf9ee_1x400.png") 50% 50% repeat-x;
-  color: #363636;
-}
-
-.ui-state-highlight a, .ui-widget-content .ui-state-highlight a, .ui-widget-header .ui-state-highlight a {
-  color: #363636;
-}
-
-.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {
-  border: 1px solid #cd0a0a;
-  background: #fef1ec url("images/ui-bg_glass_95_fef1ec_1x400.png") 50% 50% repeat-x;
-  color: #cd0a0a;
-}
-
-.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a {
-  color: #cd0a0a;
-}
-
-.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text {
-  color: #cd0a0a;
-}
-
-.ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary {
-  font-weight: bold;
-}
-
-.ui-priority-secondary, .ui-widget-content .ui-priority-secondary, .ui-widget-header .ui-priority-secondary {
-  opacity: .7;
-  filter: Alpha(Opacity=70);
-  /* support: IE8 */
-  font-weight: normal;
-}
-
-.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled {
-  opacity: .35;
-  filter: Alpha(Opacity=35);
-  /* support: IE8 */
-  background-image: none;
-}
-
-.ui-state-disabled .ui-icon {
-  filter: Alpha(Opacity=35);
-  /* support: IE8 - See #6059 */
-}
-
-
-/* Icons
-----------------------------------*/
-
-
-/* states and images */
-
-.ui-icon {
-  width: 16px;
-  height: 16px;
-}
-
-.ui-icon, .ui-widget-content .ui-icon {
-  background-image: url("images/ui-icons_222222_256x240.png");
-}
-
-.ui-widget-header .ui-icon {
-  background-image: url("images/ui-icons_222222_256x240.png");
-}
-
-.ui-state-default .ui-icon {
-  background-image: url("images/ui-icons_888888_256x240.png");
-}
-
-.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {
-  background-image: url("images/ui-icons_454545_256x240.png");
-}
-
-.ui-state-active .ui-icon {
-  background-image: url("images/ui-icons_454545_256x240.png");
-}
-
-.ui-state-highlight .ui-icon {
-  background-image: url("images/ui-icons_2e83ff_256x240.png");
-}
-
-.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {
-  background-image: url("images/ui-icons_cd0a0a_256x240.png");
-}
-
-
-/* positioning */
-
-.ui-icon-blank {
-  background-position: 16px 16px;
-}
-
-.ui-icon-carat-1-n {
-  background-position: 0 0;
-}
-
-.ui-icon-carat-1-ne {
-  background-position: -16px 0;
-}
-
-.ui-icon-carat-1-e {
-  background-position: -32px 0;
-}
-
-.ui-icon-carat-1-se {
-  background-position: -48px 0;
-}
-
-.ui-icon-carat-1-s {
-  background-position: -64px 0;
-}
-
-.ui-icon-carat-1-sw {
-  background-position: -80px 0;
-}
-
-.ui-icon-carat-1-w {
-  background-position: -96px 0;
-}
-
-.ui-icon-carat-1-nw {
-  background-position: -112px 0;
-}
-
-.ui-icon-carat-2-n-s {
-  background-position: -128px 0;
-}
-
-.ui-icon-carat-2-e-w {
-  background-position: -144px 0;
-}
-
-.ui-icon-triangle-1-n {
-  background-position: 0 -16px;
-}
-
-.ui-icon-triangle-1-ne {
-  background-position: -16px -16px;
-}
-
-.ui-icon-triangle-1-e {
-  background-position: -32px -16px;
-}
-
-.ui-icon-triangle-1-se {
-  background-position: -48px -16px;
-}
-
-.ui-icon-triangle-1-s {
-  background-position: -64px -16px;
-}
-
-.ui-icon-triangle-1-sw {
-  background-position: -80px -16px;
-}
-
-.ui-icon-triangle-1-w {
-  background-position: -96px -16px;
-}
-
-.ui-icon-triangle-1-nw {
-  background-position: -112px -16px;
-}
-
-.ui-icon-triangle-2-n-s {
-  background-position: -128px -16px;
-}
-
-.ui-icon-triangle-2-e-w {
-  background-position: -144px -16px;
-}
-
-.ui-icon-arrow-1-n {
-  background-position: 0 -32px;
-}
-
-.ui-icon-arrow-1-ne {
-  background-position: -16px -32px;
-}
-
-.ui-icon-arrow-1-e {
-  background-position: -32px -32px;
-}
-
-.ui-icon-arrow-1-se {
-  background-position: -48px -32px;
-}
-
-.ui-icon-arrow-1-s {
-  background-position: -64px -32px;
-}
-
-.ui-icon-arrow-1-sw {
-  background-position: -80px -32px;
-}
-
-.ui-icon-arrow-1-w {
-  background-position: -96px -32px;
-}
-
-.ui-icon-arrow-1-nw {
-  background-position: -112px -32px;
-}
-
-.ui-icon-arrow-2-n-s {
-  background-position: -128px -32px;
-}
-
-.ui-icon-arrow-2-ne-sw {
-  background-position: -144px -32px;
-}
-
-.ui-icon-arrow-2-e-w {
-  background-position: -160px -32px;
-}
-
-.ui-icon-arrow-2-se-nw {
-  background-position: -176px -32px;
-}
-
-.ui-icon-arrowstop-1-n {
-  background-position: -192px -32px;
-}
-
-.ui-icon-arrowstop-1-e {
-  background-position: -208px -32px;
-}
-
-.ui-icon-arrowstop-1-s {
-  background-position: -224px -32px;
-}
-
-.ui-icon-arrowstop-1-w {
-  background-position: -240px -32px;
-}
-
-.ui-icon-arrowthick-1-n {
-  background-position: 0 -48px;
-}
-
-.ui-icon-arrowthick-1-ne {
-  background-position: -16px -48px;
-}
-
-.ui-icon-arrowthick-1-e {
-  background-position: -32px -48px;
-}
-
-.ui-icon-arrowthick-1-se {
-  background-position: -48px -48px;
-}
-
-.ui-icon-arrowthick-1-s {
-  background-position: -64px -48px;
-}
-
-.ui-icon-arrowthick-1-sw {
-  background-position: -80px -48px;
-}
-
-.ui-icon-arrowthick-1-w {
-  background-position: -96px -48px;
-}
-
-.ui-icon-arrowthick-1-nw {
-  background-position: -112px -48px;
-}
-
-.ui-icon-arrowthick-2-n-s {
-  background-position: -128px -48px;
-}
-
-.ui-icon-arrowthick-2-ne-sw {
-  background-position: -144px -48px;
-}
-
-.ui-icon-arrowthick-2-e-w {
-  background-position: -160px -48px;
-}
-
-.ui-icon-arrowthick-2-se-nw {
-  background-position: -176px -48px;
-}
-
-.ui-icon-arrowthickstop-1-n {
-  background-position: -192px -48px;
-}
-
-.ui-icon-arrowthickstop-1-e {
-  background-position: -208px -48px;
-}
-
-.ui-icon-arrowthickstop-1-s {
-  background-position: -224px -48px;
-}
-
-.ui-icon-arrowthickstop-1-w {
-  background-position: -240px -48px;
-}
-
-.ui-icon-arrowreturnthick-1-w {
-  background-position: 0 -64px;
-}
-
-.ui-icon-arrowreturnthick-1-n {
-  background-position: -16px -64px;
-}
-
-.ui-icon-arrowreturnthick-1-e {
-  background-position: -32px -64px;
-}
-
-.ui-icon-arrowreturnthick-1-s {
-  background-position: -48px -64px;
-}
-
-.ui-icon-arrowreturn-1-w {
-  background-position: -64px -64px;
-}
-
-.ui-icon-arrowreturn-1-n {
-  background-position: -80px -64px;
-}
-
-.ui-icon-arrowreturn-1-e {
-  background-position: -96px -64px;
-}
-
-.ui-icon-arrowreturn-1-s {
-  background-position: -112px -64px;
-}
-
-.ui-icon-arrowrefresh-1-w {
-  background-position: -128px -64px;
-}
-
-.ui-icon-arrowrefresh-1-n {
-  background-position: -144px -64px;
-}
-
-.ui-icon-arrowrefresh-1-e {
-  background-position: -160px -64px;
-}
-
-.ui-icon-arrowrefresh-1-s {
-  background-position: -176px -64px;
-}
-
-.ui-icon-arrow-4 {
-  background-position: 0 -80px;
-}
-
-.ui-icon-arrow-4-diag {
-  background-position: -16px -80px;
-}
-
-.ui-icon-extlink {
-  background-position: -32px -80px;
-}
-
-.ui-icon-newwin {
-  background-position: -48px -80px;
-}
-
-.ui-icon-refresh {
-  background-position: -64px -80px;
-}
-
-.ui-icon-shuffle {
-  background-position: -80px -80px;
-}
-
-.ui-icon-transfer-e-w {
-  background-position: -96px -80px;
-}
-
-.ui-icon-transferthick-e-w {
-  background-position: -112px -80px;
-}
-
-.ui-icon-folder-collapsed {
-  background-position: 0 -96px;
-}
-
-.ui-icon-folder-open {
-  background-position: -16px -96px;
-}
-
-.ui-icon-document {
-  background-position: -32px -96px;
-}
-
-.ui-icon-document-b {
-  background-position: -48px -96px;
-}
-
-.ui-icon-note {
-  background-position: -64px -96px;
-}
-
-.ui-icon-mail-closed {
-  background-position: -80px -96px;
-}
-
-.ui-icon-mail-open {
-  background-position: -96px -96px;
-}
-
-.ui-icon-suitcase {
-  background-position: -112px -96px;
-}
-
-.ui-icon-comment {
-  background-position: -128px -96px;
-}
-
-.ui-icon-person {
-  background-position: -144px -96px;
-}
-
-.ui-icon-print {
-  background-position: -160px -96px;
-}
-
-.ui-icon-trash {
-  background-position: -176px -96px;
-}
-
-.ui-icon-locked {
-  background-position: -192px -96px;
-}
-
-.ui-icon-unlocked {
-  background-position: -208px -96px;
-}
-
-.ui-icon-bookmark {
-  background-position: -224px -96px;
-}
-
-.ui-icon-tag {
-  background-position: -240px -96px;
-}
-
-.ui-icon-home {
-  background-position: 0 -112px;
-}
-
-.ui-icon-flag {
-  background-position: -16px -112px;
-}
-
-.ui-icon-calendar {
-  background-position: -32px -112px;
-}
-
-.ui-icon-cart {
-  background-position: -48px -112px;
-}
-
-.ui-icon-pencil {
-  background-position: -64px -112px;
-}
-
-.ui-icon-clock {
-  background-position: -80px -112px;
-}
-
-.ui-icon-disk {
-  background-position: -96px -112px;
-}
-
-.ui-icon-calculator {
-  background-position: -112px -112px;
-}
-
-.ui-icon-zoomin {
-  background-position: -128px -112px;
-}
-
-.ui-icon-zoomout {
-  background-position: -144px -112px;
-}
-
-.ui-icon-search {
-  background-position: -160px -112px;
-}
-
-.ui-icon-wrench {
-  background-position: -176px -112px;
-}
-
-.ui-icon-gear {
-  background-position: -192px -112px;
-}
-
-.ui-icon-heart {
-  background-position: -208px -112px;
-}
-
-.ui-icon-star {
-  background-position: -224px -112px;
-}
-
-.ui-icon-link {
-  background-position: -240px -112px;
-}
-
-.ui-icon-cancel {
-  background-position: 0 -128px;
-}
-
-.ui-icon-plus {
-  background-position: -16px -128px;
-}
-
-.ui-icon-plusthick {
-  background-position: -32px -128px;
-}
-
-.ui-icon-minus {
-  background-position: -48px -128px;
-}
-
-.ui-icon-minusthick {
-  background-position: -64px -128px;
-}
-
-.ui-icon-close {
-  background-position: -80px -128px;
-}
-
-.ui-icon-closethick {
-  background-position: -96px -128px;
-}
-
-.ui-icon-key {
-  background-position: -112px -128px;
-}
-
-.ui-icon-lightbulb {
-  background-position: -128px -128px;
-}
-
-.ui-icon-scissors {
-  background-position: -144px -128px;
-}
-
-.ui-icon-clipboard {
-  background-position: -160px -128px;
-}
-
-.ui-icon-copy {
-  background-position: -176px -128px;
-}
-
-.ui-icon-contact {
-  background-position: -192px -128px;
-}
-
-.ui-icon-image {
-  background-position: -208px -128px;
-}
-
-.ui-icon-video {
-  background-position: -224px -128px;
-}
-
-.ui-icon-script {
-  background-position: -240px -128px;
-}
-
-.ui-icon-alert {
-  background-position: 0 -144px;
-}
-
-.ui-icon-info {
-  background-position: -16px -144px;
-}
-
-.ui-icon-notice {
-  background-position: -32px -144px;
-}
-
-.ui-icon-help {
-  background-position: -48px -144px;
-}
-
-.ui-icon-check {
-  background-position: -64px -144px;
-}
-
-.ui-icon-bullet {
-  background-position: -80px -144px;
-}
-
-.ui-icon-radio-on {
-  background-position: -96px -144px;
-}
-
-.ui-icon-radio-off {
-  background-position: -112px -144px;
-}
-
-.ui-icon-pin-w {
-  background-position: -128px -144px;
-}
-
-.ui-icon-pin-s {
-  background-position: -144px -144px;
-}
-
-.ui-icon-play {
-  background-position: 0 -160px;
-}
-
-.ui-icon-pause {
-  background-position: -16px -160px;
-}
-
-.ui-icon-seek-next {
-  background-position: -32px -160px;
-}
-
-.ui-icon-seek-prev {
-  background-position: -48px -160px;
-}
-
-.ui-icon-seek-end {
-  background-position: -64px -160px;
-}
-
-.ui-icon-seek-start {
-  background-position: -80px -160px;
-}
-
-
-/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
-
-.ui-icon-seek-first {
-  background-position: -80px -160px;
-}
-
-.ui-icon-stop {
-  background-position: -96px -160px;
-}
-
-.ui-icon-eject {
-  background-position: -112px -160px;
-}
-
-.ui-icon-volume-off {
-  background-position: -128px -160px;
-}
-
-.ui-icon-volume-on {
-  background-position: -144px -160px;
-}
-
-.ui-icon-power {
-  background-position: 0 -176px;
-}
-
-.ui-icon-signal-diag {
-  background-position: -16px -176px;
-}
-
-.ui-icon-signal {
-  background-position: -32px -176px;
-}
-
-.ui-icon-battery-0 {
-  background-position: -48px -176px;
-}
-
-.ui-icon-battery-1 {
-  background-position: -64px -176px;
-}
-
-.ui-icon-battery-2 {
-  background-position: -80px -176px;
-}
-
-.ui-icon-battery-3 {
-  background-position: -96px -176px;
-}
-
-.ui-icon-circle-plus {
-  background-position: 0 -192px;
-}
-
-.ui-icon-circle-minus {
-  background-position: -16px -192px;
-}
-
-.ui-icon-circle-close {
-  background-position: -32px -192px;
-}
-
-.ui-icon-circle-triangle-e {
-  background-position: -48px -192px;
-}
-
-.ui-icon-circle-triangle-s {
-  background-position: -64px -192px;
-}
-
-.ui-icon-circle-triangle-w {
-  background-position: -80px -192px;
-}
-
-.ui-icon-circle-triangle-n {
-  background-position: -96px -192px;
-}
-
-.ui-icon-circle-arrow-e {
-  background-position: -112px -192px;
-}
-
-.ui-icon-circle-arrow-s {
-  background-position: -128px -192px;
-}
-
-.ui-icon-circle-arrow-w {
-  background-position: -144px -192px;
-}
-
-.ui-icon-circle-arrow-n {
-  background-position: -160px -192px;
-}
-
-.ui-icon-circle-zoomin {
-  background-position: -176px -192px;
-}
-
-.ui-icon-circle-zoomout {
-  background-position: -192px -192px;
-}
-
-.ui-icon-circle-check {
-  background-position: -208px -192px;
-}
-
-.ui-icon-circlesmall-plus {
-  background-position: 0 -208px;
-}
-
-.ui-icon-circlesmall-minus {
-  background-position: -16px -208px;
-}
-
-.ui-icon-circlesmall-close {
-  background-position: -32px -208px;
-}
-
-.ui-icon-squaresmall-plus {
-  background-position: -48px -208px;
-}
-
-.ui-icon-squaresmall-minus {
-  background-position: -64px -208px;
-}
-
-.ui-icon-squaresmall-close {
-  background-position: -80px -208px;
-}
-
-.ui-icon-grip-dotted-vertical {
-  background-position: 0 -224px;
-}
-
-.ui-icon-grip-dotted-horizontal {
-  background-position: -16px -224px;
-}
-
-.ui-icon-grip-solid-vertical {
-  background-position: -32px -224px;
-}
-
-.ui-icon-grip-solid-horizontal {
-  background-position: -48px -224px;
-}
-
-.ui-icon-gripsmall-diagonal-se {
-  background-position: -64px -224px;
-}
-
-.ui-icon-grip-diagonal-se {
-  background-position: -80px -224px;
-}
-
-
-/* Misc visuals
-----------------------------------*/
-
-
-/* Corner radius */
-
-.ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl {
-  border-top-left-radius: 4px;
-}
-
-.ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr {
-  border-top-right-radius: 4px;
-}
-
-.ui-corner-all, .ui-corner-bottom, .ui-corner-left, .ui-corner-bl {
-  border-bottom-left-radius: 4px;
-}
-
-.ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br {
-  border-bottom-right-radius: 4px;
-}
-
-
-/* Overlays */
-
-.ui-widget-overlay {
-  background: #aaa;
-  opacity: .3;
-  filter: Alpha(Opacity=30);
-  /* support: IE8 */
-}
-
-.ui-widget-shadow {
-  margin: -8px 0 0 -8px;
-  padding: 8px;
-  background: #aaa;
-  opacity: .3;
-  filter: Alpha(Opacity=30);
-  /* support: IE8 */
-  border-radius: 8px;
-}
diff --git a/#pma/themes/fallen/layout.inc.php b/#pma/themes/fallen/layout.inc.php
deleted file mode 100644
index de48c5c0..00000000
--- a/#pma/themes/fallen/layout.inc.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * Layout
- *
- * @package Fallen
- * @author Frans Allen
- * @link https://www.fransallen.com
- */
-
-/*
- * General
- */
-
-$GLOBALS['cfg']['NaviWidth']                = '250';
-$GLOBALS['cfg']['FontFamily']               = '"Roboto", Helvetica, Arial, sans-serif';
-$GLOBALS['cfg']['FontFamilyLight']          = '"Roboto", "Segoe UI Light", "Segoe UI"; font-weight: 300';
-$GLOBALS['cfg']['FontFamilyFixed']          = 'Consolas, Monospace, "Lucida Grande"';
-
-/*
- * Color Scheme
- * No color scheme for this version
- */
-
-$GLOBALS['cfg']['BrowsePointerColor']       = '#4285f4';
-$GLOBALS['cfg']['BrowseMarkerColor']        = '#000';
-$GLOBALS['cfg']['BrowseWarningColor']       = '#ea4335';
-$GLOBALS['cfg']['BrowseSuccessColor']       = '#01a31c';
-$GLOBALS['cfg']['BrowseGrayColor']          = '#ccc';
-$GLOBALS['cfg']['BrowseMarkerBackground']   = '#eee';
-$GLOBALS['cfg']['BorderColor']              = '#ddd';
-$GLOBALS['cfg']['ButtonColor']              = '#fff';
-$GLOBALS['cfg']['ButtonBackground']         = '#4285f4';
-$GLOBALS['cfg']['ButtonHover']              = '#2171f5';
-$GLOBALS['cfg']['BgOne']                    = '#f7f7f7';
-$GLOBALS['cfg']['BgTwo']                    = '#fff';
-$GLOBALS['cfg']['BlueHeader']               = '#4285f4';
-$GLOBALS['cfg']['NaviColor']                = '#eee';
-$GLOBALS['cfg']['NaviBackground']           = '#4285f4';
-$GLOBALS['cfg']['NaviBackgroundLight']      = '#2171f5';
-$GLOBALS['cfg']['NaviPointerColor']         = '#333';
-$GLOBALS['cfg']['NaviPointerBackground']    = '#4285f4';
-$GLOBALS['cfg']['NaviDatabaseNameColor']    = '#333';
-$GLOBALS['cfg']['NaviHoverBackground']      = '#2171f5';
-$GLOBALS['cfg']['MainColor']                = '#444';
-$GLOBALS['cfg']['MainBackground']           = '#fff';
-$GLOBALS['cfg']['ThBackground']             = '#f7f7f7';
-$GLOBALS['cfg']['ThDisabledBackground']     = '#f3f3f3';
-$GLOBALS['cfg']['ThColor']                  = '#666';
-$GLOBALS['cfg']['ThPointerColor']           = '#000';
diff --git a/#pma/themes/fallen/screen-2.png b/#pma/themes/fallen/screen-2.png
deleted file mode 100644
index a903523a..00000000
Binary files a/#pma/themes/fallen/screen-2.png and /dev/null differ
diff --git a/#pma/themes/fallen/screen-3.png b/#pma/themes/fallen/screen-3.png
deleted file mode 100644
index 7b7a5501..00000000
Binary files a/#pma/themes/fallen/screen-3.png and /dev/null differ
diff --git a/#pma/themes/fallen/screen.png b/#pma/themes/fallen/screen.png
deleted file mode 100644
index da862e83..00000000
Binary files a/#pma/themes/fallen/screen.png and /dev/null differ
diff --git a/#pma/themes/fallen/sprites.lib.php b/#pma/themes/fallen/sprites.lib.php
deleted file mode 100644
index 93c90da0..00000000
--- a/#pma/themes/fallen/sprites.lib.php
+++ /dev/null
@@ -1,819 +0,0 @@
-<?php
-/**
- * AUTOGENERATED CONTENT - DO NOT EDIT!
- * ALL CHANGES WILL BE UNDONE!
- * RUN `./scripts/generate-sprites` TO UPDATE THIS FILE
- *
- * @package Fallen
- */
-
-/**
- * Returns map of sprites inside sprite.png
- *
- * @return array Data of sprites
- */
-function PMA_sprites()
-{
-    return array(
-        'asc_order' => array(
-            'position' => '1',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_bookmark' => array(
-            'position' => '2',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_browse' => array(
-            'position' => '3',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_calendar' => array(
-            'position' => '4',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_chart' => array(
-            'position' => '5',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_close' => array(
-            'position' => '6',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_column_add' => array(
-            'position' => '7',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_comment' => array(
-            'position' => '8',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_dbstatistics' => array(
-            'position' => '9',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_deltbl' => array(
-            'position' => '10',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_docs' => array(
-            'position' => '11',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_docsql' => array(
-            'position' => '12',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_drop' => array(
-            'position' => '13',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_edit' => array(
-            'position' => '14',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_empty' => array(
-            'position' => '15',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_engine' => array(
-            'position' => '16',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_event_add' => array(
-            'position' => '17',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_events' => array(
-            'position' => '18',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_export' => array(
-            'position' => '19',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_favorite' => array(
-            'position' => '20',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_find_replace' => array(
-            'position' => '21',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_firstpage' => array(
-            'position' => '22',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_ftext' => array(
-            'position' => '23',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_group' => array(
-            'position' => '24',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_help' => array(
-            'position' => '25',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_home' => array(
-            'position' => '26',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_import' => array(
-            'position' => '27',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_index' => array(
-            'position' => '28',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_index_add' => array(
-            'position' => '29',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_info' => array(
-            'position' => '30',
-            'width'    => '11',
-            'height'   => '11'
-        ),
-        'b_inline_edit' => array(
-            'position' => '31',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_insrow' => array(
-            'position' => '32',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_lastpage' => array(
-            'position' => '33',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_minus' => array(
-            'position' => '34',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_more' => array(
-            'position' => '35',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_move' => array(
-            'position' => '36',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_newdb' => array(
-            'position' => '37',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_newtbl' => array(
-            'position' => '38',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_nextpage' => array(
-            'position' => '39',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_no_favorite' => array(
-            'position' => '40',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_pdfdoc' => array(
-            'position' => '41',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_plus' => array(
-            'position' => '42',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_prevpage' => array(
-            'position' => '43',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_primary' => array(
-            'position' => '44',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_print' => array(
-            'position' => '45',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_props' => array(
-            'position' => '46',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_relations' => array(
-            'position' => '47',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_report' => array(
-            'position' => '48',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_routine_add' => array(
-            'position' => '49',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_routines' => array(
-            'position' => '50',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_save' => array(
-            'position' => '51',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_saveimage' => array(
-            'position' => '52',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_sbrowse' => array(
-            'position' => '53',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_sdb' => array(
-            'position' => '54',
-            'width'    => '10',
-            'height'   => '10'
-        ),
-        'b_search' => array(
-            'position' => '55',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_selboard' => array(
-            'position' => '56',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_select' => array(
-            'position' => '57',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_snewtbl' => array(
-            'position' => '58',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_spatial' => array(
-            'position' => '59',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_sql' => array(
-            'position' => '60',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_sqldoc' => array(
-            'position' => '61',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_sqlhelp' => array(
-            'position' => '62',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_table_add' => array(
-            'position' => '63',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_tblanalyse' => array(
-            'position' => '64',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_tblexport' => array(
-            'position' => '65',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_tblimport' => array(
-            'position' => '66',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_tblops' => array(
-            'position' => '67',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_tbloptimize' => array(
-            'position' => '68',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_tipp' => array(
-            'position' => '69',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_trigger_add' => array(
-            'position' => '70',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_triggers' => array(
-            'position' => '71',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_undo' => array(
-            'position' => '72',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_unique' => array(
-            'position' => '73',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_usradd' => array(
-            'position' => '74',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_usrcheck' => array(
-            'position' => '75',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_usrdrop' => array(
-            'position' => '76',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_usredit' => array(
-            'position' => '77',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_usrlist' => array(
-            'position' => '78',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_versions' => array(
-            'position' => '79',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_view' => array(
-            'position' => '80',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_view_add' => array(
-            'position' => '81',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_views' => array(
-            'position' => '82',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_browse' => array(
-            'position' => '83',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_deltbl' => array(
-            'position' => '84',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_drop' => array(
-            'position' => '85',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_edit' => array(
-            'position' => '86',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_empty' => array(
-            'position' => '87',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_export' => array(
-            'position' => '88',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_firstpage' => array(
-            'position' => '89',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_ftext' => array(
-            'position' => '90',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_index' => array(
-            'position' => '91',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_insrow' => array(
-            'position' => '92',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_lastpage' => array(
-            'position' => '93',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_nextpage' => array(
-            'position' => '94',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_prevpage' => array(
-            'position' => '95',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_primary' => array(
-            'position' => '96',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_routine_add' => array(
-            'position' => '97',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_sbrowse' => array(
-            'position' => '98',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_select' => array(
-            'position' => '99',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_spatial' => array(
-            'position' => '100',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_unique' => array(
-            'position' => '101',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'centralColumns' => array(
-            'position' => '102',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'centralColumns_add' => array(
-            'position' => '103',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'centralColumns_delete' => array(
-            'position' => '104',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'col_drop' => array(
-            'position' => '105',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'console' => array(
-            'position' => '106',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'database' => array(
-            'position' => '107',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'eye' => array(
-            'position' => '108',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'eye_grey' => array(
-            'position' => '109',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'item' => array(
-            'position' => '110',
-            'width'    => '9',
-            'height'   => '9'
-        ),
-        'lightbulb' => array(
-            'position' => '111',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'lightbulb_off' => array(
-            'position' => '112',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'more' => array(
-            'position' => '113',
-            'width'    => '13',
-            'height'   => '16'
-        ),
-        'new_data' => array(
-            'position' => '114',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'new_data_hovered' => array(
-            'position' => '115',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'new_data_selected' => array(
-            'position' => '116',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'new_data_selected_hovered' => array(
-            'position' => '117',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'new_struct' => array(
-            'position' => '118',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'new_struct_hovered' => array(
-            'position' => '119',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'new_struct_selected' => array(
-            'position' => '120',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'new_struct_selected_hovered' => array(
-            'position' => '121',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'normalize' => array(
-            'position' => '122',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'pause' => array(
-            'position' => '123',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'php_sym' => array(
-            'position' => '124',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'play' => array(
-            'position' => '125',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_asc' => array(
-            'position' => '126',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_asci' => array(
-            'position' => '127',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_attention' => array(
-            'position' => '128',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_cancel' => array(
-            'position' => '129',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_cancel2' => array(
-            'position' => '130',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_cog' => array(
-            'position' => '131',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_db' => array(
-            'position' => '132',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_desc' => array(
-            'position' => '133',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_error' => array(
-            'position' => '134',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_error2' => array(
-            'position' => '135',
-            'width'    => '11',
-            'height'   => '11'
-        ),
-        's_host' => array(
-            'position' => '136',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_info' => array(
-            'position' => '137',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_lang' => array(
-            'position' => '138',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_link' => array(
-            'position' => '139',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_lock' => array(
-            'position' => '140',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_loggoff' => array(
-            'position' => '141',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_notice' => array(
-            'position' => '142',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_okay' => array(
-            'position' => '143',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_passwd' => array(
-            'position' => '144',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_process' => array(
-            'position' => '145',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_really' => array(
-            'position' => '146',
-            'width'    => '11',
-            'height'   => '11'
-        ),
-        's_reload' => array(
-            'position' => '147',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_replication' => array(
-            'position' => '148',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_rights' => array(
-            'position' => '149',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_sortable' => array(
-            'position' => '150',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_status' => array(
-            'position' => '151',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_success' => array(
-            'position' => '152',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_sync' => array(
-            'position' => '153',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_tbl' => array(
-            'position' => '154',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_theme' => array(
-            'position' => '155',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_top' => array(
-            'position' => '156',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_unlink' => array(
-            'position' => '157',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_vars' => array(
-            'position' => '158',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_views' => array(
-            'position' => '159',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'window-new' => array(
-            'position' => '160',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-    );
-}
diff --git a/#pma/themes/original/css/common.css.php b/#pma/themes/original/css/common.css.php
deleted file mode 100644
index 05b374e7..00000000
--- a/#pma/themes/original/css/common.css.php
+++ /dev/null
@@ -1,3292 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Common styles for the original theme
- *
- * @package    PhpMyAdmin-theme
- * @subpackage Original
- */
-
-// unplanned execution path
-if (! defined('PMA_MINIMUM_COMMON') && ! defined('TESTSUITE')) {
-    exit();
-}
-?>
-/******************************************************************************/
-
-/* general tags */
-html {
-    font-size: <?php echo $_SESSION['PMA_Theme']->getFontSize(); ?>
-}
-
-input,
-select,
-textarea {
-    font-size: 1em;
-}
-
-
-body {
-<?php if (! empty($GLOBALS['cfg']['FontFamily'])) { ?>
-    font-family:        <?php echo $GLOBALS['cfg']['FontFamily']; ?>;
-    <?php
-}
-?>
-    padding:            0;
-    margin: 0;
-    margin-<?php echo $left; ?>: 240px;
-    color:              <?php echo $GLOBALS['cfg']['MainColor']; ?>;
-    background:         <?php echo $GLOBALS['cfg']['MainBackground']; ?>;
-}
-
-body#loginform {
-    margin: 0;
-}
-
-#page_content {
-    margin: 0 .5em;
-}
-
-<?php if (! empty($GLOBALS['cfg']['FontFamilyFixed'])) { ?>
-    textarea, tt, pre, code {
-    font-family:        <?php echo $GLOBALS['cfg']['FontFamilyFixed']; ?>;
-    }
-    <?php
-}
-?>
-h1 {
-    font-size:          140%;
-    font-weight:        bold;
-}
-
-h2 {
-    font-size:          120%;
-    font-weight:        bold;
-}
-
-h3 {
-    font-weight:        bold;
-}
-
-a, a:link,
-a:visited,
-a:active,
-button.mult_submit,
-.checkall_box+label {
-    text-decoration:    none;
-    color:              #0000FF;
-    cursor:             pointer;
-}
-
-a:hover,
-button.mult_submit:hover,
-button.mult_submit:focus,
-.checkall_box+label:hover {
-    text-decoration:    underline;
-    color:              #FF0000;
-}
-
-dfn {
-    font-style:         normal;
-}
-
-dfn:hover {
-    font-style:         normal;
-    cursor:             help;
-}
-
-th {
-    font-weight:        bold;
-    color:              <?php echo $GLOBALS['cfg']['ThColor']; ?>;
-    background:         <?php echo $GLOBALS['cfg']['ThBackground']; ?>;
-}
-
-a img {
-    border:             0;
-}
-
-hr {
-    color:              <?php echo $GLOBALS['cfg']['MainColor']; ?>;
-    background-color:   <?php echo $GLOBALS['cfg']['MainColor']; ?>;
-    border:             0;
-    height:             1px;
-}
-
-form {
-    padding:            0;
-    margin:             0;
-    display:            inline;
-}
-
-textarea {
-    overflow:           visible;
-}
-
-fieldset {
-    margin-top:         1em;
-    border:             <?php echo $GLOBALS['cfg']['MainColor']; ?> solid 1px;
-    padding:            0.5em;
-    background:         <?php echo $GLOBALS['cfg']['BgOne']; ?>;
-}
-
-fieldset fieldset {
-    margin:             0.8em;
-}
-
-fieldset legend {
-    font-weight:        bold;
-    color:              #444444;
-    background-color:   <?php echo 'OPERA' != PMA_USR_BROWSER_AGENT ? 'transparent' : $GLOBALS['cfg']['BgOne']; ?>;
-}
-
-.some-margin {
-    margin: .5em;
-    margin-top: 1em;
-}
-
-/* buttons in some browsers (eg. Konqueror) are block elements,
-   this breaks design */
-button {
-    display:            inline;
-}
-
-table caption,
-table th,
-table td {
-    padding:            0.1em 0.5em 0.1em 0.5em;
-    margin:             0.1em;
-    vertical-align:     top;
-}
-
-img,
-input,
-select,
-button {
-    vertical-align:     middle;
-}
-
-/******************************************************************************/
-/* classes */
-.clearfloat {
-    clear: both;
-}
-
-.floatleft {
-    float: <?php echo $left; ?>;
-    margin-<?php echo $right; ?>: 1em;
-}
-
-.floatright {
-    float: <?php echo $right; ?>;
-}
-
-table.nospacing {
-    border-spacing: 0;
-}
-
-table.nopadding tr th, table.nopadding tr td {
-    padding: 0;
-}
-
-th.left, td.left {
-    text-align: left;
-}
-
-th.center, td.center {
-    text-align: center;
-}
-
-th.right, td.right {
-    text-align: right;
-    padding-right: 1em;
-}
-
-tr.vtop, th.vtop, td.vtop {
-    vertical-align: top;
-}
-
-tr.vmiddle, th.vmiddle, td.vmiddle {
-    vertical-align: middle;
-}
-
-tr.vbottom, th.vbottom, td.vbottom {
-    vertical-align: bottom;
-}
-
-.paddingtop {
-    padding-top: 1em;
-}
-
-div.tools {
-    border: 1px solid #000000;
-    padding: 0.2em;
-}
-
-div.tools,
-fieldset.tblFooters {
-    margin-top:         0;
-    margin-bottom:      0.5em;
-    /* avoid a thick line since this should be used under another fieldset */
-    border-top:         0;
-    text-align:         <?php echo $right; ?>;
-    float:              none;
-    clear:              both;
-}
-
-div.null_div {
-    height: 20px;
-    text-align: center;
-    font-style:normal;
-    min-width:50px;
-}
-
-fieldset .formelement {
-    float:              <?php echo $left; ?>;
-    margin-<?php echo $right; ?>:       0.5em;
-    /* IE */
-    white-space:        nowrap;
-}
-
-/* revert for Gecko */
-fieldset div[class=formelement] {
-    white-space:        normal;
-}
-
-button.mult_submit {
-    border:             none;
-    background-color:   transparent;
-}
-
-/* odd items 1,3,5,7,... */
-table tr.odd th,
-.odd {
-    background: <?php echo $GLOBALS['cfg']['BgOne']; ?>;
-}
-
-/* even items 2,4,6,8,... */
-table tr.even th,
-.even {
-    background: <?php echo $GLOBALS['cfg']['BgTwo']; ?>;
-}
-
-/* odd table rows 1,3,5,7,... */
-table tr.odd th,
-table tr.odd,
-table tr.even th,
-table tr.even {
-    text-align:         <?php echo $left; ?>;
-}
-
-/* marked table rows */
-td.marked:not(.nomarker),
-table tr.marked:not(.nomarker) td,
-table tr.marked:not(.nomarker) th,
-table tr.marked:not(.nomarker) {
-    background:   <?php echo $GLOBALS['cfg']['BrowseMarkerBackground']; ?>;
-    color:   <?php echo $GLOBALS['cfg']['BrowseMarkerColor']; ?>;
-}
-
-/* hovered items */
-.odd:not(.nopointer):hover,
-.even:not(.nopointer):hover,
-.hover:not(.nopointer) {
-    background: <?php echo $GLOBALS['cfg']['BrowsePointerBackground']; ?>;
-    color: <?php echo $GLOBALS['cfg']['BrowsePointerColor']; ?>;
-}
-
-/* hovered table rows */
-table tr.odd:not(.nopointer):hover th,
-table tr.even:not(.nopointer):hover th,
-table tr.hover:not(.nopointer) th {
-    background:   <?php echo $GLOBALS['cfg']['BrowsePointerBackground']; ?>;
-    color:   <?php echo $GLOBALS['cfg']['BrowsePointerColor']; ?>;
-}
-
-/**
- * marks table rows/cells if the db field is in a where condition
- */
-td.condition,
-th.condition {
-    border: 1px solid <?php echo $GLOBALS['cfg']['BrowseMarkerBackground']; ?>;
-}
-
-/**
- * cells with the value NULL
- */
-td.null {
-    font-style: italic;
-    text-align: <?php echo $right; ?>;
-}
-
-table .valueHeader {
-    text-align:         <?php echo $right; ?>;
-    white-space:        normal;
-}
-table .value {
-    text-align:         <?php echo $right; ?>;
-    white-space:        normal;
-}
-/* IE doesnt handles 'pre' right */
-table [class=value] {
-    white-space:        normal;
-}
-
-
-<?php if (! empty($GLOBALS['cfg']['FontFamilyFixed'])) { ?>
-    .value {
-        font-family:        <?php echo $GLOBALS['cfg']['FontFamilyFixed']; ?>;
-    }
-    <?php
-}
-?>
-.attention {
-    color:              red;
-    font-weight:        bold;
-}
-.allfine {
-    color:              green;
-}
-
-
-img.lightbulb {
-    cursor:             pointer;
-}
-
-.pdflayout {
-    overflow:           hidden;
-    clip:               inherit;
-    background-color:   #FFFFFF;
-    display:            none;
-    border:             1px solid #000000;
-    position:           relative;
-}
-
-.pdflayout_table {
-    background:         #D3DCE3;
-    color:              #000000;
-    overflow:           hidden;
-    clip:               inherit;
-    z-index:            2;
-    display:            inline;
-    visibility:         inherit;
-    cursor:             move;
-    position:           absolute;
-    font-size:          80%;
-    border:             1px dashed #000000;
-}
-
-/* Doc links in SQL */
-.cm-sql-doc {
-    text-decoration: none;
-    border-bottom: 1px dotted #000;
-    color: inherit !important;
-}
-
-/* leave some space between icons and text */
-.icon {
-    vertical-align:     middle;
-    margin-<?php echo $left; ?>:        0.3em;
-}
-
-/* no extra space in table cells */
-td .icon {
-    margin: 0;
-}
-
-.selectallarrow {
-    margin-<?php echo $right; ?>: 0.3em;
-    margin-<?php echo $left; ?>: 0.6em;
-}
-
-/* message boxes: error, confirmation */
-#pma_errors, #pma_demo, #pma_footer {
-    padding: 0 0.5em;
-}
-
-.success h1,
-.notice h1,
-div.error h1 {
-    border-bottom:      2px solid;
-    font-weight:        bold;
-    text-align:         <?php echo $left; ?>;
-    margin:             0 0 0.2em 0;
-}
-
-div.success,
-div.notice,
-div.error {
-    margin:             0.3em 0 0 0;
-    border:             2px solid;
-    background-repeat:  no-repeat;
-    clear:              both;
-    <?php
-    if ($GLOBALS['text_dir'] === 'ltr') { ?>
-        background-position: 10px 50%;
-        padding:            0.1em 0.1em 0.1em 42px;
-    <?php
-    } else { ?>
-        background-position: 99% 50%;
-        padding:            0.1em 40px 0.1em 0.1em;
-        <?php
-    }
-?>
-}
-div.success img.icon,
-div.notice img.icon,
-div.error img.icon {
-    display: block;
-    float:              <?php echo $left; ?>;
-    margin-<?php echo $left; ?>: -22px;
-}
-
-.success {
-    color:              #000000;
-    background-color:   #f0fff0;
-}
-h1.success,
-div.success {
-    border-color:       #00FF00;
-}
-.success h1 {
-    border-color:       #00FF00;
-}
-
-.notice {
-    color:              #000000;
-    background-color:   #FFFFDD;
-}
-h1.notice,
-div.notice {
-    border-color:       #FFD700;
-}
-.notice h1 {
-    border-color:       #FFD700;
-}
-
-.error {
-    background-color:   #FFFFCC;
-    color:              #ff0000;
-}
-
-h1.error,
-div.error {
-    border-color:       #ff0000;
-}
-div.error h1 {
-    border-color:       #ff0000;
-}
-
-.confirmation {
-    background-color:   #FFFFCC;
-}
-fieldset.confirmation {
-    border:             0.1em solid #FF0000;
-}
-fieldset.confirmation legend {
-    border-left:        0.1em solid #FF0000;
-    border-right:       0.1em solid #FF0000;
-    font-weight:        bold;
-    background-image:   url(<?php echo $_SESSION['PMA_Theme']->getImgPath('s_really.png');?>);
-    background-repeat:  no-repeat;
-    <?php
-    if ($GLOBALS['text_dir'] === 'ltr') { ?>
-        background-position: 5px 50%;
-        padding:            0.2em 0.2em 0.2em 25px;
-        <?php
-    } else { ?>
-        background-position: 97% 50%;
-        padding:            0.2em 25px 0.2em 0.2em;
-        <?php
-    }
-?>
-}
-/* end messageboxes */
-
-
-.tblcomment {
-    font-size:          70%;
-    font-weight:        normal;
-    color:              #000099;
-}
-
-.tblHeaders {
-    font-weight:        bold;
-    color:              <?php echo $GLOBALS['cfg']['ThColor']; ?>;
-    background:         <?php echo $GLOBALS['cfg']['ThBackground']; ?>;
-}
-
-div.tools,
-.tblFooters {
-    font-weight:        normal;
-    color:              <?php echo $GLOBALS['cfg']['ThColor']; ?>;
-    background:         <?php echo $GLOBALS['cfg']['ThBackground']; ?>;
-}
-
-.tblHeaders a:link,
-.tblHeaders a:active,
-.tblHeaders a:visited,
-div.tools a:link,
-div.tools a:visited,
-div.tools a:active,
-.tblFooters a:link,
-.tblFooters a:active,
-.tblFooters a:visited {
-    color:              #0000FF;
-}
-
-.tblHeaders a:hover,
-div.tools a:hover,
-.tblFooters a:hover {
-    color:              #FF0000;
-}
-
-/* forbidden, no privilegs */
-.noPrivileges {
-    color:              #FF0000;
-    font-weight:        bold;
-}
-
-/* disabled text */
-.disabled,
-.disabled a:link,
-.disabled a:active,
-.disabled a:visited {
-    color:              #666666;
-}
-
-.disabled a:hover {
-    color:              #666666;
-    text-decoration:    none;
-}
-
-tr.disabled td,
-td.disabled {
-    background-color:   #cccccc;
-}
-
-.nowrap {
-    white-space:        nowrap;
-}
-
-/**
- * zoom search
- */
-div#resizer {
-    width:              600px;
-    height:             400px;
-}
-div#querychart {
-    float:              left;
-    width:              600px;
-}
-
-/**
- * login form
- */
-body#loginform h1,
-body#loginform a.logo {
-    display: block;
-    text-align: center;
-}
-
-body#loginform {
-    margin-top: 1em;
-    text-align: center;
-}
-
-body#loginform div.container {
-    text-align: <?php echo $left; ?>;
-    width: 30em;
-    margin: 0 auto;
-}
-
-form.login label {
-    float: <?php echo $left; ?>;
-    width: 10em;
-    font-weight: bolder;
-}
-
-.commented_column {
-    border-bottom: 1px dashed black;
-}
-
-.column_attribute {
-    font-size: 70%;
-}
-
-/******************************************************************************/
-/* specific elements */
-
-/* topmenu */
-ul#topmenu, ul#topmenu2, ul.tabs {
-    font-weight:        bold;
-    list-style-type:    none;
-    margin:             0;
-    padding:            0;
-}
-
-ul#topmenu2 {
-    margin: 0.25em 0.5em 0;
-    height: 2em;
-    clear: both;
-}
-
-ul#topmenu li, ul#topmenu2 li {
-    float:              <?php echo $left; ?>;
-    margin:             0;
-    padding:            0;
-    vertical-align:     middle;
-}
-
-#topmenu img, #topmenu2 img {
-    vertical-align:     middle;
-    margin-<?php echo $right; ?>:       0.1em;
-}
-
-/* default tab styles */
-ul#topmenu a, ul#topmenu span {
-    display:            block;
-    margin:             2px 2px 0;
-    padding:            2px 2px 0;
-    white-space:        nowrap;
-}
-
-ul#topmenu2 a {
-    display:            block;
-    margin:             0.1em;
-    padding:            0.2em;
-    white-space:        nowrap;
-}
-
-fieldset.caution a {
-    color:              #FF0000;
-}
-fieldset.caution a:hover {
-    color:              #ffffff;
-    background-color:   #FF0000;
-}
-
-#topmenu {
-    margin-top:         0.5em;
-    padding:            0.1em 0.3em 0.1em 0.3em;
-}
-
-ul#topmenu ul {
-    -moz-box-shadow:    2px 2px 3px #666;
-    -webkit-box-shadow: 2px 2px 3px #666;
-    box-shadow:         2px 2px 3px #666;
-}
-
-ul#topmenu > li {
-    border-bottom:      1pt solid black;
-}
-
-/* default tab styles */
-ul#topmenu a, ul#topmenu span {
-    background-color:   <?php echo $GLOBALS['cfg']['BgOne']; ?>;
-    border:             0 solid <?php echo $GLOBALS['cfg']['BgTwo']; ?>;
-    border-width:       1pt 1pt 0 1pt;
-    -moz-border-radius: 0.4em 0.4em 0 0;
-    border-radius:      0.4em 0.4em 0 0;
-}
-
-ul#topmenu ul a {
-    border-width:       1pt 0 0 0;
-    -moz-border-radius: 0;
-    border-radius:      0;
-}
-
-ul#topmenu ul li:first-child a {
-    border-width:       0;
-}
-
-/* enabled hover/active tabs */
-ul#topmenu > li > a:hover,
-ul#topmenu > li > .tabactive {
-    margin:             0;
-    padding:            2px 4px;
-    text-decoration:    none;
-}
-
-ul#topmenu ul a:hover,
-ul#topmenu ul .tabactive {
-    text-decoration:    none;
-}
-
-ul#topmenu a.tab:hover,
-ul#topmenu .tabactive {
-    background-color:   <?php echo $GLOBALS['cfg']['MainBackground']; ?>;
-}
-
-ul#topmenu2 a.tab:hover,
-ul#topmenu2 a.tabactive {
-    background-color:   <?php echo $GLOBALS['cfg']['BgOne']; ?>;
-    -moz-border-radius: 0.3em;
-    border-radius:      0.3em;
-    text-decoration:    none;
-}
-
-/* to be able to cancel the bottom border, use <li class="active"> */
-ul#topmenu > li.active {
-     border-bottom:      1pt solid <?php echo $GLOBALS['cfg']['MainBackground']; ?>;
-}
-/* end topmenu */
-
-/* zoom search */
-div#dataDisplay input, div#dataDisplay select {
-    margin: 0;
-    margin-<?php echo $right; ?>: 0.5em;
-}
-div#dataDisplay th {
-    line-height: 2em;
-}
-table#tableFieldsId {
-    width: 100%;
-}
-
-/* Calendar */
-table.calendar {
-    width:              100%;
-}
-table.calendar td {
-    text-align:         center;
-}
-table.calendar td a {
-    display:            block;
-}
-
-table.calendar td a:hover {
-    background-color:   #CCFFCC;
-}
-
-table.calendar th {
-    background-color:   #D3DCE3;
-}
-
-table.calendar td.selected {
-    background-color:   #FFCC99;
-}
-
-img.calendar {
-    border:             none;
-}
-form.clock {
-    text-align:         center;
-}
-/* end Calendar */
-
-
-/* table stats */
-div#tablestatistics table {
-    float: <?php echo $left; ?>;
-    margin-top: 0.5em;
-    margin-bottom: 0.5em;
-    margin-<?php echo $right; ?>: 0.5em;
-    min-width: 16em;
-}
-/* end table stats */
-
-
-/* server privileges */
-#tableuserrights td,
-#tablespecificuserrights td,
-#tabledatabases td {
-    vertical-align: middle;
-}
-/* end server privileges */
-
-
-
-/* Heading */
-#topmenucontainer {
-    background: white;
-    padding-<?php echo $right; ?>: 1em;
-    width: 100%;
-}
-
-#serverinfo {
-    background: white;
-    font-weight:        bold;
-    padding-bottom: 0.5em;
-    width: 10000px;
-    overflow: hidden;
-}
-
-#serverinfo .item {
-    white-space:        nowrap;
-}
-
-#page_nav_icons {
-    position: fixed;
-    top: 0;
-    <?php echo $right; ?>: 0;
-    z-index: 99;
-    padding: .1em 0;
-}
-
-#goto_pagetop, #lock_page_icon, #page_settings_icon {
-    padding: .3em;
-    background: white;
-}
-
-#page_settings_icon {
-    cursor: pointer;
-    display: none;
-}
-
-#page_settings_modal {
-    display: none;
-}
-
-#pma_navigation_settings {
-    display: none;
-}
-
-#span_table_comment {
-    font-weight: bold;
-    font-style: italic;
-    white-space: nowrap;
-    margin-left: 10px;
-    color: #D6D6D6;
-    text-shadow: none;
-}
-
-#serverinfo img {
-    margin:             0 0.1em 0 0.2em;
-}
-
-
-#textSQLDUMP {
-    width:              95%;
-    height:             95%;
-    font-family:        "Courier New", Courier, mono;
-    font-size:          110%;
-}
-
-#TooltipContainer {
-    position:           absolute;
-    z-index:            99;
-    width:              20em;
-    height:             auto;
-    overflow:           visible;
-    visibility:         hidden;
-    background-color:   #ffffcc;
-    color:              #006600;
-    border:             0.1em solid #000000;
-    padding:            0.5em;
-}
-
-/* user privileges */
-#fieldset_add_user_login div.item {
-    border-bottom:      1px solid silver;
-    padding-bottom:     0.3em;
-    margin-bottom:      0.3em;
-}
-
-#fieldset_add_user_login label {
-    float:              <?php echo $left; ?>;
-    display:            block;
-    width:              15em;
-    max-width:          100%;
-    text-align:         <?php echo $right; ?>;
-    padding-<?php echo $right; ?>:      0.5em;
-}
-
-#fieldset_add_user_login span.options #select_pred_username,
-#fieldset_add_user_login span.options #select_pred_hostname,
-#fieldset_add_user_login span.options #select_pred_password {
-    width:              100%;
-    max-width:          100%;
-}
-
-#fieldset_add_user_login span.options {
-    float: <?php echo $left; ?>;
-    display: block;
-    width: 12em;
-    max-width: 100%;
-    padding-<?php echo $right; ?>: 0.5em;
-}
-
-#fieldset_add_user_login input {
-    width: 12em;
-    clear: <?php echo $right; ?>;
-    max-width: 100%;
-}
-
-#fieldset_add_user_login span.options input {
-    width: auto;
-}
-
-#fieldset_user_priv div.item {
-    float: <?php echo $left; ?>;
-    width: 9em;
-    max-width: 100%;
-}
-
-#fieldset_user_priv div.item div.item {
-    float: none;
-}
-
-#fieldset_user_priv div.item label {
-    white-space: nowrap;
-}
-
-#fieldset_user_priv div.item select {
-    width: 100%;
-}
-
-#fieldset_user_global_rights fieldset {
-    float: <?php echo $left; ?>;
-}
-
-#fieldset_user_group_rights fieldset {
-    float: <?php echo $left; ?>;
-}
-
-#fieldset_user_global_rights>legend input {
-    margin-<?php echo $left; ?>: 2em;
-}
-/* end user privileges */
-
-
-/* serverstatus */
-
-.linkElem:hover {
-    text-decoration:    underline;
-    color:              #235a81;
-    cursor: pointer;
-}
-
-h3#serverstatusqueries span {
-    font-size:60%;
-    display:inline;
-}
-
-.buttonlinks {
-    float: <?php echo $right; ?>;
-    white-space: nowrap;
-}
-
-/* Also used for the variables page */
-fieldset#tableFilter {
-    margin-bottom:1em;
-}
-
-div#serverStatusTabs {
-    margin-top:1em;
-}
-
-caption a.top {
-    float: <?php echo $right; ?>;
-}
-
-div#serverstatusquerieschart {
-    float:<?php echo $left; ?>;
-    width:500px;
-    height:350px;
-    padding-<?php echo $left; ?>: 30px;
-}
-
-div#serverstatus table#serverstatusqueriesdetails {
-    float: <?php echo $left; ?>;
-}
-
-table#serverstatustraffic {
-    float: <?php echo $left; ?>;
-}
-table#serverstatusconnections {
-    float: <?php echo $left; ?>;
-    margin-<?php echo $left; ?>: 30px;
-}
-
-table#serverstatusvariables {
-    width: 100%;
-    margin-bottom: 1em;
-}
-table#serverstatusvariables .name {
-    width: 18em;
-    white-space:nowrap;
-}
-table#serverstatusvariables .value {
-    width: 6em;
-}
-table#serverstatusconnections {
-    float: <?php echo $left; ?>;
-    margin-<?php echo $left; ?>: 30px;
-}
-
-div#serverstatus table tbody td.descr a,
-div#serverstatus table .tblFooters a {
-    white-space: nowrap;
-}
-
-div.liveChart {
-    clear:both;
-    min-width:500px;
-    height:400px;
-    padding-bottom:80px;
-}
-
-#addChartDialog input[type="text"] {
-    margin: 0;
-    padding:3px;
-}
-
-div#chartVariableSettings {
-    border:1px solid #ddd;
-    background-color:#E6E6E6;
-    margin-left:10px;
-}
-
-table#chartGrid td {
-    padding: 3px;
-    margin: 0;
-}
-
-table#chartGrid div.monitorChart {
-    background: #EBEBEB;
-    overflow: hidden;
-    border: none;
-}
-
-div.tabLinks {
-    margin-left: 0.3em;
-    float: <?php echo $left; ?>;
-    padding: 5px 0;
-}
-
-div.tabLinks a, div.tabLinks label {
-    margin-right: 7px;
-}
-
-div.tabLinks .icon {
-    margin: -0.2em 0.3em 0 0;
-}
-
-.popupContent {
-    display: none;
-    position: absolute;
-    border: 1px solid #CCC;
-    margin:0;
-    padding:3px;
-    -moz-box-shadow:    1px 1px 6px #ddd;
-    -webkit-box-shadow: 2px 2px 3px #666;
-    box-shadow:         2px 2px 3px #666;
-    background-color:white;
-    z-index: 2;
-}
-
-div#logTable {
-    padding-top: 10px;
-    clear: both;
-}
-
-div#logTable table {
-    width:100%;
-}
-
-.smallIndent {
-    padding-left: 7px;
-}
-
-/* end serverstatus */
-
-/* server variables */
-#serverVariables {
-    table-layout: fixed;
-    width: 100%;
-}
-#serverVariables .var-row > tr {
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    line-height: 2em;
-}
-
-#serverVariables .var-header {
-    font-weight:        bold;
-    color:              <?php echo $GLOBALS['cfg']['ThColor']; ?>;
-    background:         <?php echo $GLOBALS['cfg']['ThBackground']; ?>;
-}
-#serverVariables .var-header {
-    text-align: <?php echo $left; ?>;
-}
-#serverVariables .var-row {
-    padding: 0.5em;
-    min-height: 18px;
-}
-#serverVariables .var-action {
-    width: 120px;
-}
-#serverVariables .var-name {
-    float: <?php echo $left; ?>;
-    font-weight: bold;
-}
-#serverVariables .var-name.session {
-    font-weight: normal;
-    font-style: italic;
-}
-#serverVariables .var-value {
-    width: 50%;
-    float: <?php echo $right; ?>;
-    text-align: <?php echo $right; ?>;
-}
-
-/* server variables editor */
-#serverVariables .editLink {
-    padding-<?php echo $right; ?>: 1em;
-    float: <?php echo $left; ?>;
-    font-family: sans-serif;
-}
-#serverVariables .serverVariableEditor {
-    width: 100%;
-    overflow: hidden;
-}
-#serverVariables .serverVariableEditor input {
-    width: 100%;
-    margin: 0 0.5em;
-    box-sizing: border-box;
-    -ms-box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    -webkit-box-sizing: border-box;
-    height: 2.2em;
-}
-#serverVariables .serverVariableEditor div {
-    display: block;
-    overflow: hidden;
-    padding-<?php echo $right; ?>: 1em;
-}
-#serverVariables .serverVariableEditor a {
-    float: <?php echo $right; ?>;
-    margin: 0 0.5em;
-    line-height: 2em;
-}
-/* end server variables */
-
-/* profiling */
-
-div#profilingchart {
-    width: 850px;
-    height: 370px;
-    float: left;
-}
-
-#profilingchart .jqplot-highlighter-tooltip{
-    top: auto !important;
-    left: 11px;
-    bottom:24px;
-}
-/* end profiling */
-
-/* table charting */
-.chartOption {
-    float: <?php echo $left; ?>;
-    margin-<?php echo $right;?>: 40px;
-}
-/* end table charting */
-
-/* querybox */
-
-div#sqlquerycontainer {
-    float: <?php echo $left; ?>;
-    width: 69%;
-    /* height: 15em; */
-}
-
-div#tablefieldscontainer {
-    float: <?php echo $right; ?>;
-    width: 29%;
-    /* height: 15em; */
-}
-
-div#tablefieldscontainer select {
-    width: 100%;
-    /* height: 12em; */
-}
-
-textarea#sqlquery {
-    width: 100%;
-    /* height: 100%; */
-}
-textarea#sql_query_edit {
-    height: 7em;
-    width: 95%;
-    display: block;
-}
-div#queryboxcontainer div#bookmarkoptions {
-    margin-top: .5em;
-}
-/* end querybox */
-
-/* main page */
-#maincontainer {
-    background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('logo_right.png');?>);
-    background-position: <?php echo $right; ?> bottom;
-    background-repeat: no-repeat;
-}
-
-#mysqlmaininformation,
-#pmamaininformation {
-    float: <?php echo $left; ?>;
-    width: 49%;
-}
-
-#maincontainer ul {
-    list-style-type: disc;
-    vertical-align: middle;
-}
-
-#maincontainer li {
-    margin:  0.2em 0;
-}
-
-#full_name_layer {
-    position: absolute;
-    padding: 2px;
-    margin-top: -3px;
-    z-index: 801;
-
-    border: solid 1px #888;
-    background: #fff;
-
-}
-/* end main page */
-
-/* iconic view for ul items */
-
-li.no_bullets {
-    list-style-type:none !important;
-    margin-<?php echo $left; ?>: -25px !important;      //align with other list items which have bullets
-}
-
-/* end iconic view for ul items */
-
-#body_browse_foreigners {
-    background:         <?php echo $GLOBALS['cfg']['NaviBackground']; ?>;
-    margin: .5em .5em 0 .5em;
-}
-
-#bodythemes {
-    width: 500px;
-    margin: auto;
-    text-align: center;
-}
-
-#bodythemes img {
-    border: .1em solid #000;
-}
-
-#bodythemes a:hover img {
-    border: .1em solid red;
-}
-
-#fieldset_select_fields {
-    float: <?php echo $left; ?>;
-}
-
-#selflink {
-    clear: both;
-    display: block;
-    margin-top: 1em;
-    margin-bottom: 1em;
-    width: 98%;
-    margin-left: 1%;
-    border-top: .1em solid silver;
-    text-align: <?php echo $right; ?>;
-}
-
-#table_innodb_bufferpool_usage,
-#table_innodb_bufferpool_activity {
-    float: <?php echo $left; ?>;
-}
-
-#div_mysql_charset_collations table {
-    float: <?php echo $left; ?>;
-}
-
-#div_mysql_charset_collations table th,
-#div_mysql_charset_collations table td {
-    padding: 0.4em;
-}
-
-#div_mysql_charset_collations table th#collationHeader {
-    width: 35%;
-}
-
-.operations_half_width {
-    width: 48%;
-    float: <?php echo $left; ?>;
-}
-.operations_half_width input[type=text],
-.operations_half_width input[type=password],
-.operations_half_width input[type=number],
-.operations_half_width select {
-    width: 95%;
-}
-.operations_half_width input[type=text].halfWidth,
-.operations_half_width input[type=password].halfWidth,
-.operations_half_width input[type=number].halfWidth,
-.operations_half_width select.halfWidth {
-    width: 40%;
-}
-.operations_half_width ul {
-    list-style-type: none;
-    padding: 0;
-}
-.operations_full_width {
-    width: 100%;
-    clear: both;
-}
-
-#qbe_div_table_list {
-    float: <?php echo $left; ?>;
-}
-
-#qbe_div_sql_query {
-    float: <?php echo $left; ?>;
-}
-
-label.desc {
-    width: 30em;
-    float: <?php echo $left; ?>;
-}
-
-label.desc sup {
-    position: absolute;
-}
-
-code.php {
-    display: block;
-    padding-left: 0.3em;
-    margin-top: 0;
-    margin-bottom: 0;
-    max-height: 10em;
-    overflow: auto;
-    direction: ltr;
-}
-
-code.sql,
-div.sqlvalidate {
-    display:            block;
-    padding:            0.3em;
-    margin-top:         0;
-    margin-bottom:      0;
-    max-height:         10em;
-    overflow:           auto;
-    direction:          ltr;
-}
-
-.result_query div.sqlOuter,
-div.sqlvalidate  {
-    border:             <?php echo $GLOBALS['cfg']['MainColor']; ?> solid 1px;
-    border-top:         0;
-    border-bottom:      0;
-    background:         <?php echo $GLOBALS['cfg']['BgOne']; ?>;
-}
-
-#PMA_slidingMessage code.sql {
-    border:             <?php echo $GLOBALS['cfg']['MainColor']; ?> solid 1px;
-    border-top:         0;
-    background:         <?php echo $GLOBALS['cfg']['BgOne']; ?>;
-}
-
-#main_pane_left {
-    width:              60%;
-    min-width:          260px;
-    float:              <?php echo $left; ?>;
-    padding-top:        1em;
-}
-
-#main_pane_right {
-    overflow:           hidden;
-    min-width:          160px;
-    padding-top: 1em;
-    padding-<?php echo $left; ?>: 1em;
-}
-
-.group {
-    border-<?php echo $left; ?>: 0.3em solid <?php echo $GLOBALS['cfg']['ThBackground']; ?>;
-    margin-bottom:      1em;
-}
-
-.group h2 {
-    background:         <?php echo $GLOBALS['cfg']['ThBackground']; ?>;
-    padding:            0.1em 0.3em;
-    margin-top:         0;
-}
-
-.group-cnt {
-    padding: 0 0 0 0.5em;
-    display: inline-block;
-    width: 98%;
-}
-
-textarea#partitiondefinition {
-    height:3em;
-}
-
-
-/* for elements that should be revealed only via js */
-.hide {
-    display:            none;
-}
-
-#list_server {
-    list-style-type: none;
-    padding: 0;
-}
-
-/**
-  *  Progress bar styles
-  */
-div.upload_progress
-{
-    width: 400px;
-    margin: 3em auto;
-    text-align: center;
-}
-
-div.upload_progress_bar_outer
-{
-    border: 1px solid #000;
-    width: 202px;
-    position: relative;
-    margin: 0 auto 1em;
-    color: <?php echo $GLOBALS['cfg']['MainColor']; ?>;
-}
-
-div.upload_progress_bar_inner
-{
-    background-color: <?php echo $GLOBALS['cfg']['NaviPointerBackground']; ?>;
-    width: 0;
-    height: 12px;
-    margin: 1px;
-    overflow: hidden;
-    color: <?php echo $GLOBALS['cfg']['BrowseMarkerColor']; ?>;
-    position: relative;
-}
-
-div.upload_progress_bar_outer div.percentage
-{
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 202px;
-}
-
-div.upload_progress_bar_inner div.percentage
-{
-    top: -1px;
-    left: -1px;
-}
-
-div#statustext {
-    margin-top: .5em;
-}
-
-table#serverconnection_src_remote,
-table#serverconnection_trg_remote,
-table#serverconnection_src_local,
-table#serverconnection_trg_local  {
-  float: left;
-}
-/**
-  *  Validation error message styles
-  */
-input[type=text].invalid_value,
-input[type=password].invalid_value,
-input[type=number].invalid_value,
-input[type=date].invalid_value,
-select.invalid_value,
-.invalid_value {
-    background: #FFCCCC;
-}
-
-/**
-  *  Ajax notification styling
-  */
- .ajax_notification {
-    top: 0;           /** The notification needs to be shown on the top of the page */
-    position: fixed;
-    margin-top: 0;
-    margin-right: auto;
-    margin-bottom: 0;
-    margin-left: auto;
-    padding: 3px 5px;   /** Keep a little space on the sides of the text */
-    width: 350px;
-    background-color: #FFD700;
-    z-index: 1100;      /** If this is not kept at a high z-index, the jQueryUI modal dialogs (z-index:1000) might hide this */
-    text-align: center;
-    display: block;
-    left: 0;
-    right: 0;
-    background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('ajax_clock_small.gif');?>);
-    background-repeat: no-repeat;
-    background-position: 2%;
- }
-
- #loading_parent {
-    /** Need this parent to properly center the notification division */
-    position: relative;
-    width: 100%;
- }
-/**
-  * Export and Import styles
-  */
-
-.export_table_list_container {
-    display: inline-block;
-    max-height: 20em;
-    overflow-y: scroll;
-}
-
-.export_table_select th {
-    text-align: center;
-    vertical-align: middle;
-}
-
-.export_table_select .all {
-    font-weight: bold;
-    border-bottom: 1px solid black;
-}
-
-.export_structure, .export_data {
-    text-align: center;
-}
-
-.export_table_name {
-    vertical-align: middle;
-}
-
-.exportoptions h3, .importoptions h3 {
-    border-bottom: 1px #999999 solid;
-    font-size: 110%;
-}
-
-.exportoptions ul, .importoptions ul, .format_specific_options ul {
-    list-style-type: none;
-    margin-bottom: 15px;
-}
-
-.exportoptions li, .importoptions li {
-    margin: 7px;
-}
-.exportoptions label, .importoptions label, .exportoptions p, .importoptions p {
-    margin: 5px;
-    float: none;
-}
-
-#csv_options label.desc, #ldi_options label.desc, #latex_options label.desc, #output label.desc{
-    float: left;
-    width: 15em;
-}
-
-.exportoptions, .importoptions {
-    margin: 20px 30px 30px 10px
-}
-
-.format_specific_options h3 {
-    margin: 10px 0 0 10px;
-    border: 0;
-}
-
-.format_specific_options {
-    border: 1px solid #999;
-    margin: 7px 0;
-    padding: 3px;
-}
-
-p.desc {
-    margin: 5px;
-}
-
-/**
-  * Export styles only
-  */
-select#db_select,
-select#table_select {
-    width: 400px;
-}
-
-.export_sub_options {
-    margin: 20px 0 0 30px;
-}
-
-.export_sub_options h4 {
-    border-bottom: 1px #999 solid;
-}
-
-.export_sub_options li.subgroup {
-    display: inline-block;
-    margin-top: 0;
-}
-
-.export_sub_options li {
-    margin-bottom: 0;
-}
-
-#output_quick_export {
-    display: none;
-}
-/**
- * Import styles only
- */
-
-.importoptions #import_notification {
-    margin: 10px 0;
-    font-style: italic;
-}
-
-input#input_import_file {
-    margin: 5px;
-}
-
-.formelementrow {
-    margin: 5px 0 5px 0;
-}
-
-#popup_background {
-    display: none;
-    position: fixed;
-    _position: absolute; /* hack for IE6 */
-    width: 100%;
-    height: 100%;
-    top: 0;
-    left: 0;
-    background: #000;
-    z-index: 1000;
-    overflow: hidden;
-}
-
-/**
- * Create table styles
- */
-#create_table_form table.table-name td {
-    vertical-align: middle;
-}
-
-/**
- * Table structure styles
- */
-#fieldsForm ul.table-structure-actions {
-    margin: 0;
-    padding: 0;
-    list-style: none;
-}
-#fieldsForm ul.table-structure-actions li {
-    float: <?php echo $left; ?>;
-    margin-<?php echo $right; ?>: 0.5em; /* same as padding of "table td" */
-}
-#fieldsForm ul.table-structure-actions .submenu li {
-    padding: 0.3em;
-    margin: 0.1em;
-}
-#structure-action-links a {
-    margin-<?php echo $right; ?>: 1em;
-}
-#addColumns input[type="radio"] {
-    margin: 0;
-    margin-<?php echo $left; ?>: 1em;
-}
-#addColumns input[type="submit"] {
-    margin-<?php echo $left; ?>: 1em;
-}
-
-/**
- * Indexes
- */
-#index_frm .index_info input,
-#index_frm .index_info select {
-    width: 100%;
-    box-sizing:         border-box;
-    -ms-box-sizing:     border-box;
-    -moz-box-sizing:    border-box;
-    -webkit-box-sizing: border-box;
-}
-
-#index_frm .slider {
-    width: 10em;
-    margin: .6em;
-    float: <?php echo $left; ?>;
-}
-
-#index_frm .add_fields {
-    float: <?php echo $left; ?>;
-}
-
-#index_frm .add_fields input {
-    margin-<?php echo $left; ?>: 1em;
-}
-
-#index_frm input {
-    margin: 0;
-}
-
-#index_frm td {
-    vertical-align: middle;
-}
-
-table#index_columns {
-    width: 100%;
-}
-
-table#index_columns select {
-    width: 85%;
-    float: right;
-}
-
-#move_columns_dialog div {
-    padding: 1em;
-}
-
-#move_columns_dialog ul {
-    list-style: none;
-    margin: 0;
-    padding: 0;
-}
-
-#move_columns_dialog li {
-    background: <?php echo $GLOBALS['cfg']['ThBackground']; ?>;
-    border: 1px solid #aaa;
-    color: <?php echo $GLOBALS['cfg']['ThColor']; ?>;
-    font-weight: bold;
-    margin: .4em;
-    padding: .2em;
-    -webkit-border-radius: 2px;
-    -moz-border-radius: 2px;
-    border-radius: 2px;
-}
-
-/* config forms */
-.config-form ul.tabs {
-    margin:      1.1em 0.2em 0;
-    padding:     0 0 0.3em 0;
-    list-style:  none;
-    font-weight: bold;
-}
-
-.config-form ul.tabs li {
-    float: <?php echo $left; ?>;
-}
-
-.config-form ul.tabs li a {
-    display:          block;
-    margin:           0.1em 0.2em 0;
-    padding:          0.1em 0.4em;
-    white-space:      nowrap;
-    text-decoration:  none;
-    border:           1px solid <?php echo $GLOBALS['cfg']['BgTwo']; ?>;
-    border-bottom:    none;
-}
-
-.config-form ul.tabs li a:hover,
-.config-form ul.tabs li a:active,
-.config-form ul.tabs li a.active {
-    margin:           0;
-    padding:          0.1em 0.6em 0.2em;
-}
-
-.config-form ul.tabs li.active a {
-    background-color: <?php echo $GLOBALS['cfg']['BgOne']; ?>;
-}
-
-.config-form fieldset {
-    margin-top:   0;
-    padding:      0;
-    clear:        both;
-    /*border-color: <?php echo $GLOBALS['cfg']['BgTwo']; ?>;*/
-}
-
-.config-form legend {
-    display: none;
-}
-
-.config-form fieldset p {
-    margin:    0;
-    padding:   0.5em;
-    background: <?php echo $GLOBALS['cfg']['BgTwo']; ?>;
-}
-
-.config-form fieldset .errors { /* form error list */
-    margin:       0 -2px 1em -2px;
-    padding: .5em 1.5em;
-    background:   #FBEAD9;
-    border:       0 #C83838 solid;
-    border-width: 1px 0;
-    list-style:   none;
-    font-family:  sans-serif;
-    font-size:    small;
-}
-
-.config-form fieldset .inline_errors { /* field error list */
-    margin: .3em .3em .3em 0;
-    padding:    0;
-    list-style: none;
-    color:      #9A0000;
-    font-size:  small;
-}
-
-.config-form fieldset th {
-    padding: .3em .3em .3em .5em;
-    text-align:     left;
-    vertical-align: top;
-    width:          40%;
-    background:     transparent;
-}
-
-.config-form fieldset .doc,
-.config-form fieldset .disabled-notice {
-    margin-left: 1em;
-}
-
-.config-form fieldset .disabled-notice {
-    font-size: 80%;
-    text-transform: uppercase;
-    color: #E00;
-    cursor: help;
-}
-
-.config-form fieldset td {
-    padding-top: .3em;
-    padding-bottom: .3em;
-    vertical-align: top;
-}
-
-.config-form fieldset th small {
-    display:     block;
-    font-weight: normal;
-    font-family: sans-serif;
-    font-size:   x-small;
-    color:       #444;
-}
-
-.config-form fieldset th,
-.config-form fieldset td {
-    border-top: 1px <?php echo $GLOBALS['cfg']['BgTwo']; ?> solid;
-}
-
-fieldset .group-header th {
-    background: <?php echo $GLOBALS['cfg']['BgTwo']; ?>;
-}
-
-fieldset .group-header + tr th {
-    padding-top: .6em;
-}
-
-fieldset .group-field-1 th,
-fieldset .group-header-2 th {
-    padding-left: 1.5em;
-}
-
-fieldset .group-field-2 th,
-fieldset .group-header-3 th {
-    padding-left: 3em;
-}
-
-fieldset .group-field-3 th {
-    padding-left: 4.5em;
-}
-
-fieldset .disabled-field th,
-fieldset .disabled-field th small,
-fieldset .disabled-field td {
-    color: #666;
-    background-color: #ddd;
-}
-
-.config-form .lastrow {
-    border-top: 1px #000 solid;
-}
-
-.config-form .lastrow {
-    background: <?php echo $GLOBALS['cfg']['ThBackground']; ?>;
-    padding: .5em;
-    text-align: center;
-}
-
-.config-form .lastrow input {
-    font-weight: bold;
-}
-
-/* form elements */
-
-.config-form span.checkbox {
-    padding: 2px;
-    display: inline-block;
-}
-
-.config-form .custom { /* customized field */
-    background: #FFC;
-}
-
-.config-form span.checkbox.custom {
-    padding:    1px;
-    border:     1px #EDEC90 solid;
-    background: #FFC;
-}
-
-.config-form .field-error {
-    border-color: #A11 !important;
-}
-
-.config-form input[type="text"],
-.config-form input[type="password"],
-.config-form input[type="number"],
-.config-form select,
-.config-form textarea {
-    border: 1px #A7A6AA solid;
-    height: auto;
-}
-
-.config-form input[type="text"]:focus,
-.config-form input[type="password"]:focus,
-.config-form input[type="number"]:focus,
-.config-form select:focus,
-.config-form textarea:focus {
-    border:     1px #6676FF solid;
-    background: #F7FBFF;
-}
-
-.config-form .field-comment-mark {
-    font-family: serif;
-    color: #007;
-    cursor: help;
-    padding: 0 0.2em;
-    font-weight: bold;
-    font-style: italic;
-}
-
-.config-form .field-comment-warning {
-    color: #A00;
-}
-
-/* error list */
-.config-form dd {
-    margin-left: .5em;
-}
-
-.config-form dd:before {
-    content: "\25B8  ";
-}
-
-.click-hide-message {
-    cursor: pointer;
-}
-
-.prefsmanage_opts {
-    margin-<?php echo $left; ?>: 2em;
-}
-
-#prefs_autoload {
-    margin-bottom: .5em;
-    margin-left: .5em;
-}
-
-#placeholder .button {
-    position: absolute;
-    cursor: pointer;
-}
-
-#placeholder div.button {
-    font-size: smaller;
-    color: #999;
-    background-color: #eee;
-    padding: 2px;
-}
-
-.wrapper {
-    float: <?php echo $left; ?>;
-    margin-bottom: 0.5em;
-}
-.toggleButton {
-    position: relative;
-    cursor: pointer;
-    font-size: .8em;
-    text-align: center;
-    line-height: 1.4em;
-    height: 1.55em;
-    overflow: hidden;
-    border-right: .1em solid #888;
-    border-left: .1em solid #888;
-}
-.toggleButton table,
-.toggleButton td,
-.toggleButton img {
-    padding: 0;
-    position: relative;
-}
-.toggleButton .container {
-    position: absolute;
-}
-.toggleButton .container td {
-    background-image: none;
-    background: none;
-}
-.toggleButton .toggleOn {
-    color: #fff;
-    padding: 0 1em;
-}
-.toggleButton .toggleOff {
-    padding: 0 1em;
-}
-
-.doubleFieldset fieldset {
-    width: 48%;
-    float: <?php echo $left; ?>;
-    padding: 0;
-}
-.doubleFieldset fieldset.left {
-    margin-<?php echo $right; ?>: 1%;
-}
-.doubleFieldset fieldset.right {
-    margin-<?php echo $left; ?>: 1%;
-}
-.doubleFieldset legend {
-    margin-<?php echo $left; ?>: 0.5em;
-}
-.doubleFieldset div.wrap {
-    padding: 0.5em;
-}
-
-#table_name_col_no_outer {
-    margin-top: 30px;
-}
-
-#table_name_col_no {
-    position: fixed;
-    top: 44px;
-    width: 100%;
-    background: <?php echo $GLOBALS['cfg']['MainBackground']; ?>;
-}
-
-#table_columns input[type="text"],
-#table_columns input[type="password"],
-#table_columns input[type="number"],
-#table_columns input[type="date"],
-#table_columns select {
-    width:              10em;
-    box-sizing:         border-box;
-    -ms-box-sizing:     border-box;
-    -moz-box-sizing:    border-box;
-    -webkit-box-sizing: border-box;
-}
-
-#placeholder {
-    position: relative;
-    border: 1px solid #aaa;
-    float: <?php echo $right; ?>;
-    overflow: hidden;
-}
-
-.placeholderDrag {
-    cursor: move;
-}
-
-#placeholder .button {
-    position: absolute;
-}
-
-#left_arrow {
-    left: 8px;
-    top: 26px;
-}
-
-#right_arrow {
-    left: 26px;
-    top: 26px;
-}
-
-#up_arrow {
-    left: 17px;
-    top: 8px;
-}
-
-#down_arrow {
-    left: 17px;
-    top: 44px;
-}
-
-#zoom_in {
-    left: 17px;
-    top: 67px;
-}
-
-#zoom_world {
-    left: 17px;
-    top: 85px;
-}
-
-#zoom_out {
-    left: 17px;
-    top: 103px;
-}
-
-.colborder {
-    cursor: col-resize;
-    height: 100%;
-    margin-left: -5px;
-    position: absolute;
-    width: 5px;
-}
-
-.colborder_active {
-    border-right: 2px solid #a44;
-}
-
-.pma_table td {
-    position: static;
-}
-
-.pma_table th.draggable span,
-.pma_table tbody td span {
-    display: block;
-    overflow: hidden;
-}
-
-.pma_table tbody td span code span {
-    display: inline;
-}
-
-.modal-copy input {
-    display: block;
-    width: 100%;
-    margin-top: 1.5em;
-    padding: .3em 0;
-}
-
-.cRsz {
-    position: absolute;
-}
-
-.draggable {
-    cursor: move;
-}
-
-.cCpy {
-    background: #000;
-    color: #FFF;
-    font-weight: bold;
-    margin: 0.1em;
-    padding: 0.3em;
-    position: absolute;
-}
-
-.cPointer {
-    background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('col_pointer.png');?>);
-    height: 20px;
-    margin-left: -5px;  /* must be minus half of its width */
-    margin-top: -10px;
-    position: absolute;
-    width: 10px;
-}
-
-.tooltip {
-    background: #333 !important;
-    opacity: .8 !important;
-    border: 1px solid #000 !important;
-    -moz-border-radius: .3em !important;
-    -webkit-border-radius: .3em !important;
-    border-radius: .3em !important;
-    text-shadow: -1px -1px #000 !important;
-    font-size: .8em !important;
-    font-weight: bold !important;
-    padding: 1px 3px !important;
-}
-
-.tooltip * {
-    background: none !important;
-    color: #FFF !important;
-}
-
-
-.data_full_width {
-    width: 100%;
-}
-
-.cDrop {
-    left: 0;
-    position: absolute;
-    top: 0;
-}
-
-.coldrop {
-    background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('col_drop.png');?>);
-    cursor: pointer;
-    height: 16px;
-    margin-left: 0.5em;
-    margin-top: 0.3em;
-    position: absolute;
-    width: 16px;
-}
-
-.coldrop:hover,
-.coldrop-hover {
-    background-color: #999;
-}
-
-.cList {
-    background: #EEE;
-    border: solid 1px #999;
-    position: absolute;
-}
-
-.cList .lDiv div {
-    padding: .2em .5em .2em .2em;
-}
-
-.cList .lDiv div:hover {
-    background: #DDD;
-    cursor: pointer;
-}
-
-.cList .lDiv div input {
-    cursor: pointer;
-}
-
-.showAllColBtn {
-    border-bottom: solid 1px #999;
-    border-top: solid 1px #999;
-    cursor: pointer;
-    font-size: .9em;
-    font-weight: bold;
-    padding: .35em 1em;
-    text-align: center;
-}
-
-.showAllColBtn:hover {
-    background: #DDD;
-}
-
-.navigation {
-    background: #E5E5E5;
-    border: 1px solid black;
-    margin: 0.8em 0;
-}
-
-.navigation td {
-    margin: 0;
-    padding: 0;
-    vertical-align: middle;
-    white-space: nowrap;
-}
-
-.navigation_separator {
-    color: #555;
-    display: inline-block;
-    text-align: center;
-    width: 1.2em;
-    text-shadow: 1px 0 #FFF;
-}
-
-.navigation input[type=submit] {
-    background: none;
-    border: 0;
-    margin: 0;
-    padding: 0.3em 0.5em;
-    min-width: 1.5em;
-    font-weight: bold;
-}
-
-.navigation input[type=submit]:hover, .navigation input.edit_mode_active {
-    background: #333;
-    color: white;
-    cursor: pointer;
-}
-
-.navigation select {
-    margin: 0 .8em;
-}
-
-.cEdit {
-    margin: 0;
-    padding: 0;
-    position: absolute;
-}
-
-.cEdit input[type=text],
-.cEdit input[type=password],
-.cEdit input[type=number] {
-    background: #FFF;
-    height: 100%;
-    margin: 0;
-    padding: 0;
-}
-
-.cEdit .edit_area {
-    background: #FFF;
-    border: 1px solid #999;
-    min-width: 10em;
-    padding: .3em .5em;
-}
-
-.cEdit .edit_area select,
-.cEdit .edit_area textarea {
-    width: 97%;
-}
-
-.cEdit .cell_edit_hint {
-    color: #555;
-    font-size: .8em;
-    margin: .3em .2em;
-}
-
-.cEdit .edit_box {
-    overflow-x: hidden;
-    overflow-y: scroll;
-    padding: 0;
-}
-
-.cEdit .edit_box_posting {
-    background: #FFF url(<?php echo $_SESSION['PMA_Theme']->getImgPath('ajax_clock_small.gif');?>) no-repeat right center;
-    padding-right: 1.5em;
-}
-
-.cEdit .edit_area_loading {
-    background: #FFF url(<?php echo $_SESSION['PMA_Theme']->getImgPath('ajax_clock_small.gif');?>) no-repeat center;
-    height: 10em;
-}
-
-.cEdit .goto_link {
-    background: #EEE;
-    color: #555;
-    padding: .2em .3em;
-}
-
-.saving_edited_data {
-    background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('ajax_clock_small.gif');?>) no-repeat left;
-    padding-left: 20px;
-}
-
-/* css for timepicker */
-.ui-timepicker-div .ui-widget-header { margin-bottom: 8px; }
-.ui-timepicker-div dl { text-align: <?php echo $left; ?>; }
-.ui-timepicker-div dl dt { height: 25px; margin-bottom: -25px; }
-.ui-timepicker-div dl dd { margin: 0 10px 10px 85px; }
-.ui-timepicker-div td { font-size: 90%; }
-.ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; }
-.ui-timepicker-rtl { direction: rtl; }
-.ui-timepicker-rtl dl { text-align: right; }
-.ui-timepicker-rtl dl dd { margin: 0 65px 10px 10px; }
-
-input.btn {
-    color: #333;
-    background-color: #D0DCE0;
-}
-
-body .ui-widget {
-    font-size: 1em;
-}
-
-.ui-dialog fieldset legend a {
-    color: #0000FF;
-}
-
-/* jqPlot */
-
-/*rules for the plot target div.  These will be cascaded down to all plot elements
-according to css rules*/
-.jqplot-target {
-    position: relative;
-    color: #222222;
-    font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
-    font-size: 1em;
-/*    height: 300px;
-    width: 400px;*/
-}
-
-/*rules applied to all axes*/
-.jqplot-axis {
-    font-size: 0.75em;
-}
-
-.jqplot-xaxis {
-    margin-top: 10px;
-}
-
-.jqplot-x2axis {
-    margin-bottom: 10px;
-}
-
-.jqplot-yaxis {
-    margin-right: 10px;
-}
-
-.jqplot-y2axis, .jqplot-y3axis, .jqplot-y4axis, .jqplot-y5axis, .jqplot-y6axis,
-.jqplot-y7axis, .jqplot-y8axis, .jqplot-y9axis, .jqplot-yMidAxis {
-    margin-left: 10px;
-    margin-right: 10px;
-}
-
-/*rules applied to all axis tick divs*/
-.jqplot-axis-tick, .jqplot-xaxis-tick, .jqplot-yaxis-tick, .jqplot-x2axis-tick,
-.jqplot-y2axis-tick, .jqplot-y3axis-tick, .jqplot-y4axis-tick, .jqplot-y5axis-tick,
-.jqplot-y6axis-tick, .jqplot-y7axis-tick, .jqplot-y8axis-tick, .jqplot-y9axis-tick,
-.jqplot-yMidAxis-tick {
-    position: absolute;
-    white-space: pre;
-}
-
-
-.jqplot-xaxis-tick {
-    top: 0;
-    /* initial position untill tick is drawn in proper place */
-    left: 15px;
-    vertical-align: top;
-}
-
-.jqplot-x2axis-tick {
-    bottom: 0;
-    /* initial position untill tick is drawn in proper place */
-    left: 15px;
-    vertical-align: bottom;
-}
-
-.jqplot-yaxis-tick {
-    right: 0;
-    /* initial position untill tick is drawn in proper place */
-    top: 15px;
-    text-align: right;
-}
-
-.jqplot-yaxis-tick.jqplot-breakTick {
-    right: -20px;
-    margin-right: 0;
-    padding:1px 5px 1px 5px;
-    z-index: 2;
-    font-size: 1.5em;
-}
-
-.jqplot-y2axis-tick, .jqplot-y3axis-tick, .jqplot-y4axis-tick, .jqplot-y5axis-tick,
-.jqplot-y6axis-tick, .jqplot-y7axis-tick, .jqplot-y8axis-tick, .jqplot-y9axis-tick {
-    left: 0;
-    /* initial position until tick is drawn in proper place */
-    top: 15px;
-    text-align: left;
-}
-
-.jqplot-yMidAxis-tick {
-    text-align: center;
-    white-space: nowrap;
-}
-
-.jqplot-xaxis-label {
-    margin-top: 10px;
-    font-size: 11pt;
-    position: absolute;
-}
-
-.jqplot-x2axis-label {
-    margin-bottom: 10px;
-    font-size: 11pt;
-    position: absolute;
-}
-
-.jqplot-yaxis-label {
-    margin-right: 10px;
-/*    text-align: center;*/
-    font-size: 11pt;
-    position: absolute;
-}
-
-.jqplot-yMidAxis-label {
-    font-size: 11pt;
-    position: absolute;
-}
-
-.jqplot-y2axis-label, .jqplot-y3axis-label, .jqplot-y4axis-label,
-.jqplot-y5axis-label, .jqplot-y6axis-label, .jqplot-y7axis-label,
-.jqplot-y8axis-label, .jqplot-y9axis-label {
-/*    text-align: center;*/
-    font-size: 11pt;
-    margin-left: 10px;
-    position: absolute;
-}
-
-.jqplot-meterGauge-tick {
-    font-size: 0.75em;
-    color: #999999;
-}
-
-.jqplot-meterGauge-label {
-    font-size: 1em;
-    color: #999999;
-}
-
-table.jqplot-table-legend {
-    margin-top: 12px;
-    margin-bottom: 12px;
-    margin-left: 12px;
-    margin-right: 12px;
-}
-
-table.jqplot-table-legend, table.jqplot-cursor-legend {
-    background-color: rgba(255,255,255,0.6);
-    border: 1px solid #cccccc;
-    position: absolute;
-    font-size: 0.75em;
-}
-
-td.jqplot-table-legend {
-    vertical-align:middle;
-}
-
-/*
-These rules could be used instead of assigning
-element styles and relying on js object properties.
-*/
-
-/*
-td.jqplot-table-legend-swatch {
-    padding-top: 0.5em;
-    text-align: center;
-}
-
-tr.jqplot-table-legend:first td.jqplot-table-legend-swatch {
-    padding-top: 0px;
-}
-*/
-
-td.jqplot-seriesToggle:hover, td.jqplot-seriesToggle:active {
-    cursor: pointer;
-}
-
-.jqplot-table-legend .jqplot-series-hidden {
-    text-decoration: line-through;
-}
-
-div.jqplot-table-legend-swatch-outline {
-    border: 1px solid #cccccc;
-    padding:1px;
-}
-
-div.jqplot-table-legend-swatch {
-    width:0;
-    height:0;
-    border-top-width: 5px;
-    border-bottom-width: 5px;
-    border-left-width: 6px;
-    border-right-width: 6px;
-    border-top-style: solid;
-    border-bottom-style: solid;
-    border-left-style: solid;
-    border-right-style: solid;
-}
-
-.jqplot-title {
-    top: 0;
-    left: 0;
-    padding-bottom: 0.5em;
-    font-size: 1.2em;
-}
-
-table.jqplot-cursor-tooltip {
-    border: 1px solid #cccccc;
-    font-size: 0.75em;
-}
-
-
-.jqplot-cursor-tooltip {
-    border: 1px solid #cccccc;
-    font-size: 0.75em;
-    white-space: nowrap;
-    background: rgba(208,208,208,0.5);
-    padding: 1px;
-}
-
-.jqplot-highlighter-tooltip, .jqplot-canvasOverlay-tooltip {
-    border: 1px solid #cccccc;
-    font-size: 0.75em;
-    white-space: nowrap;
-    background: rgba(208,208,208,0.5);
-    padding: 1px;
-}
-
-.jqplot-point-label {
-    font-size: 0.75em;
-    z-index: 2;
-}
-
-td.jqplot-cursor-legend-swatch {
-    vertical-align: middle;
-    text-align: center;
-}
-
-div.jqplot-cursor-legend-swatch {
-    width: 1.2em;
-    height: 0.7em;
-}
-
-.jqplot-error {
-/*   Styles added to the plot target container when there is an error go here.*/
-    text-align: center;
-}
-
-.jqplot-error-message {
-/*    Styling of the custom error message div goes here.*/
-    position: relative;
-    top: 46%;
-    display: inline-block;
-}
-
-div.jqplot-bubble-label {
-    font-size: 0.8em;
-/*    background: rgba(90%, 90%, 90%, 0.15);*/
-    padding-left: 2px;
-    padding-right: 2px;
-    color: rgb(20%, 20%, 20%);
-}
-
-div.jqplot-bubble-label.jqplot-bubble-label-highlight {
-    background: rgba(90%, 90%, 90%, 0.7);
-}
-
-div.jqplot-noData-container {
-    text-align: center;
-    background-color: rgba(96%, 96%, 96%, 0.3);
-}
-
-.relationalTable select {
-    width: 125px;
-    margin-right: 5px;
-}
-
-.report-data {
-    height:13em;
-    overflow:scroll;
-    width:570px;
-    border: solid 1px;
-    background: white;
-    padding: 2px;
-}
-
-.report-description {
-    height:10em;
-    width:570px;
-}
-
-div#page_content div#tableslistcontainer table.data {
-    border-top: 0.1px solid #EEEEEE;
-}
-
-div#page_content form#db_search_form.ajax fieldset {
-    margin-top: -0.3em;
-}
-
-div#page_content div#tableslistcontainer, div#page_content div.notice, div#page_content div.result_query {
-    margin-top: 1em;
-}
-
-table.show_create {
-    margin-top: 1em;
-}
-
-table.show_create td {
-    border-right: 1px solid #bbb;
-}
-
-#alias_modal table th {
-    vertical-align: middle;
-    padding-left: 1em;
-}
-
-#alias_modal label.col-2 {
-    min-width: 20%;
-    display: inline-block;
-}
-
-#alias_modal select {
-    width: 25%;
-    margin-right: 2em;
-}
-
-#alias_modal label {
-    font-weight: bold;
-}
-
-.ui-dialog {
-    position: fixed;
-}
-
-.small_font {
-    font-size: smaller;
-}
-
-/* Console styles */
-#pma_console_container {
-    width: 100%;
-    position: fixed;
-    bottom: 0;
-    <?php echo $left; ?>: 0;
-    z-index: 100;
-}
-#pma_console {
-    position: relative;
-    margin-<?php echo $left; ?>: 240px;
-    z-index: 100;
-}
-#pma_console .templates {
-    display: none;
-}
-#pma_console .mid_text,
-#pma_console .toolbar span {
-    vertical-align: middle;
-}
-#pma_console .toolbar {
-    position: relative;
-    background: #ccc;
-    border-top: solid 1px #aaa;
-    cursor: n-resize;
-}
-#pma_console .toolbar.collapsed:not(:hover) {
-    display: inline-block;
-    border-top-<?php echo $right; ?>-radius: 3px;
-    border-<?php echo $right; ?>: solid 1px #aaa;
-}
-#pma_console .toolbar.collapsed {
-    cursor: default;
-}
-#pma_console .toolbar.collapsed>.button {
-    display: none;
-}
-#pma_console .message span.text,
-#pma_console .message span.action,
-#pma_console .toolbar .button,
-#pma_console .toolbar .text,
-#pma_console .switch_button {
-    padding: 0 3px;
-    display: inline-block;
-}
-#pma_console .message span.action,
-#pma_console .toolbar .button,
-#pma_console .switch_button {
-    cursor: pointer;
-}
-#pma_console .message span.action:hover,
-#pma_console .toolbar .button:hover,
-#pma_console .switch_button:hover,
-#pma_console .toolbar .button.active {
-    background: #ddd;
-}
-#pma_console .toolbar .text {
-    font-weight: bold;
-}
-#pma_console .toolbar .button,
-#pma_console .toolbar .text {
-    margin-<?php echo $right; ?>: .4em;
-}
-#pma_console .toolbar .button,
-#pma_console .toolbar .text {
-    float: <?php echo $right; ?>;
-}
-#pma_console .content {
-    overflow-x: hidden;
-    overflow-y: auto;
-    margin-bottom: -65px;
-    border-top: solid 1px #aaa;
-    background: #fff;
-    padding-top: .4em;
-}
-#pma_console .content.console_dark_theme {
-    background: #000;
-    color: #fff;
-}
-#pma_console .content.console_dark_theme .CodeMirror-wrap {
-    background: #000;
-    color: #fff;
-}
-#pma_console .content.console_dark_theme .action_content {
-    color: #000;
-}
-#pma_console .content.console_dark_theme .message {
-    border-color: #373B41;
-}
-#pma_console .content.console_dark_theme .CodeMirror-cursor {
-    border-color: #fff;
-}
-#pma_console .content.console_dark_theme .cm-keyword {
-    color: #de935f;
-}
-#pma_console .message,
-#pma_console .query_input {
-    position: relative;
-    font-family: Monaco, Consolas, monospace;
-    cursor: text;
-    margin: 0 10px .2em 1.4em;
-}
-#pma_console .message {
-    border-bottom: solid 1px #ccc;
-    padding-bottom: .2em;
-}
-#pma_console .message.expanded>.action_content {
-    position: relative;
-}
-#pma_console .message:before,
-#pma_console .query_input:before {
-    left: -0.7em;
-    position: absolute;
-    content: ">";
-}
-#pma_console .query_input:before {
-    top: -2px;
-}
-#pma_console .query_input textarea {
-    width: 100%;
-    height: 4em;
-    resize: vertical;
-}
-#pma_console .message:hover:before {
-    color: #7cf;
-    font-weight: bold;
-}
-#pma_console .message.expanded:before {
-    content: "]";
-}
-#pma_console .message.welcome:before {
-    display: none;
-}
-#pma_console .message.failed:before,
-#pma_console .message.failed.expanded:before,
-#pma_console .message.failed:hover:before {
-    content: "=";
-    color: #944;
-}
-#pma_console .message.pending:before {
-    opacity: .3;
-}
-#pma_console .message.collapsed>.query {
-    white-space: nowrap;
-    text-overflow: ellipsis;
-    overflow: hidden;
-}
-#pma_console .message.expanded>.query {
-    display: block;
-    white-space: pre;
-    word-wrap: break-word;
-}
-#pma_console .message .text.targetdb,
-#pma_console .message.collapsed .action.collapse,
-#pma_console .message.expanded .action.expand,
-#pma_console .message .action.requery,
-#pma_console .message .action.profiling,
-#pma_console .message .action.explain,
-#pma_console .message .action.bookmark {
-    display: none;
-}
-#pma_console .message.select .action.profiling,
-#pma_console .message.select .action.explain,
-#pma_console .message.history .text.targetdb,
-#pma_console .message.successed .text.targetdb,
-#pma_console .message.history .action.requery,
-#pma_console .message.history .action.bookmark,
-#pma_console .message.bookmark .action.requery,
-#pma_console .message.bookmark .action.bookmark,
-#pma_console .message.successed .action.requery,
-#pma_console .message.successed .action.bookmark {
-    display: inline-block;
-}
-#pma_console .message .action_content {
-    position: absolute;
-    bottom: 100%;
-    background: #ccc;
-    border: solid 1px #aaa;
-    border-top-<?php echo $left; ?>-radius: 3px;
-}
-html.ie8 #pma_console .message .action_content {
-    position: relative!important;
-}
-#pma_console .message.bookmark .text.targetdb,
-#pma_console .message .text.query_time {
-    margin: 0;
-    display: inline-block;
-}
-#pma_console .message.failed .text.query_time,
-#pma_console .message .text.failed {
-    display: none;
-}
-#pma_console .message.failed .text.failed {
-    display: inline-block;
-}
-#pma_console .message .text {
-    background: #fff;
-}
-#pma_console .message.collapsed>.action_content {
-    display: none;
-}
-#pma_console .message.collapsed:hover>.action_content {
-    display: block;
-}
-#pma_console .message .bookmark_label {
-    padding: 0 4px;
-    top: 0;
-    background: #369;
-    color: #fff;
-    border-radius: 3px;
-}
-#pma_console .message .bookmark_label.shared {
-    background: #396;
-}
-#pma_console .message.expanded .bookmark_label {
-    border-top-left-radius: 0;
-    border-top-right-radius: 0;
-}
-#pma_console .query_input {
-    position: relative;
-}
-#pma_console .mid_layer {
-    height: 100%;
-    width: 100%;
-    position: absolute;
-    top: 0;
-    /* For support IE8, this layer doesn't use filter:opacity or opacity,
-    js code will fade this layer opacity to 0.18(using animation) */
-    background: #666;
-    display: none;
-    cursor: pointer;
-    z-index: 200;
-}
-#pma_console .card {
-    position: absolute;
-    width: 94%;
-    height: 100%;
-    min-height: 48px;
-    <?php echo $left; ?>: 100%;
-    top: 0;
-    border-<?php echo $left; ?>: solid 1px #999;
-    z-index: 300;
-    transition: <?php echo $left; ?> 0.2s;
-    -ms-transition: <?php echo $left; ?> 0.2s;
-    -webkit-transition: <?php echo $left; ?> 0.2s;
-    -moz-transition: <?php echo $left; ?> 0.2s;
-}
-#pma_console .card.show {
-    <?php echo $left; ?>: 6%;
-    box-shadow: -2px 1px 4px -1px #999;
-}
-
-html.ie7 #pma_console .query_input {
-    display: none;
-}
-
-#pma_bookmarks .content.add_bookmark,
-#pma_console_options .content {
-    padding: 4px 6px;
-}
-#pma_bookmarks .content.add_bookmark .options {
-    margin-<?php echo $left; ?>: 1.4em;
-    padding-bottom: .4em;
-    margin-bottom: .4em;
-    border-bottom: solid 1px #ccc;
-}
-#pma_bookmarks .content.add_bookmark .options button {
-    margin: 0 7px;
-    vertical-align: bottom;
-}
-#pma_bookmarks .content.add_bookmark input[type=text] {
-    margin: 0;
-    padding: 2px 4px;
-}
-#pma_console .button.hide,
-#pma_console .message span.text.hide {
-    display: none;
-}
-#debug_console.grouped .ungroup_queries,
-#debug_console.ungrouped .group_queries {
-    display: inline-block;
-}
-#debug_console.ungrouped .ungroup_queries,
-#debug_console.ungrouped .sort_count,
-#debug_console.grouped .group_queries {
-    display: none;
-}
-#debug_console .count {
-    margin-right: 8px;
-}
-#debug_console .show_trace .trace,
-#debug_console .show_args .args {
-    display: block;
-}
-#debug_console .hide_trace .trace,
-#debug_console .hide_args .args,
-#debug_console .show_trace .action.dbg_show_trace,
-#debug_console .hide_trace .action.dbg_hide_trace,
-#debug_console .traceStep.hide_args .action.dbg_hide_args,
-#debug_console .traceStep.show_args .action.dbg_show_args {
-    display: none;
-}
-
-#debug_console .traceStep:after,
-#debug_console .trace.welcome:after,
-#debug_console .debug>.welcome:after {
-    content: "";
-    display: table;
-    clear: both;
-}
-#debug_console .debug_summary {
-    float: left;
-}
-#debug_console .trace.welcome .time {
-    float: right;
-}
-#debug_console .traceStep .file,
-#debug_console .script_name {
-    float: right;
-}
-#debug_console .traceStep .args pre {
-    margin: 0;
-}
-
-/* Code mirror console style*/
-
-.cm-s-pma .CodeMirror-code pre,
-.cm-s-pma .CodeMirror-code {
-    font-family: Monaco, Consolas, monospace;
-}
-.cm-s-pma .CodeMirror-measure>pre,
-.cm-s-pma .CodeMirror-code>pre,
-.cm-s-pma .CodeMirror-lines {
-    padding: 0;
-}
-.cm-s-pma.CodeMirror {
-    resize: none;
-    height: auto;
-    width: 100%;
-    min-height: initial;
-    max-height: initial;
-}
-.firefox .cm-s-pma.CodeMirror {
-    font-size: 120%;
-}
-.cm-s-pma .CodeMirror-scroll {
-    cursor: text;
-}
-
-/* PMA drop-improt style */
-
-.pma_drop_handler {
-    display: none;
-    position: fixed;
-    top: 0;
-    left: 0;
-    width: 100%;
-    background: rgba(0, 0, 0, 0.6);
-    height: 100%;
-    z-index: 999;
-    color: white;
-    font-size: 30pt;
-    text-align: center;
-    padding-top: 20%;
-}
-
-.pma_sql_import_status {
-    display: none;
-    position: fixed;
-    bottom: 0;
-    right: 25px;
-    width: 400px;
-    border: 1px solid #999;
-    background: #f3f3f3;
-    -moz-border-radius: 4px;
-    -webkit-border-radius: 4px;
-    border-radius: 4px;
-    -moz-box-shadow: <?php echo $GLOBALS['text_dir'] === 'rtl' ? '-' : ''; ?>2px 2px 5px #ccc;
-    -webkit-box-shadow: <?php echo $GLOBALS['text_dir'] === 'rtl' ? '-' : ''; ?>2px 2px 5px #ccc;
-    box-shadow: <?php echo $GLOBALS['text_dir'] === 'rtl' ? '-' : ''; ?>2px 2px 5px #ccc;
-}
-
-.pma_sql_import_status h2,
-.pma_drop_result h2 {
-    background-color: #bbb;
-    padding: .1em .3em;
-    margin-top: 0;
-    margin-bottom: 0;
-    color: #fff;
-    font-size: 1.6em;
-    font-weight: normal;
-    text-shadow: 0 1px 0 #777;
-    -moz-box-shadow: <?php echo $GLOBALS['text_dir'] === 'rtl' ? '-' : ''; ?>1px 1px 15px #999 inset;
-    -webkit-box-shadow: <?php echo $GLOBALS['text_dir'] === 'rtl' ? '-' : ''; ?>1px 1px 15px #999 inset;
-    box-shadow: <?php echo $GLOBALS['text_dir'] === 'rtl' ? '-' : ''; ?>1px 1px 15px #999 inset;
-}
-
-.pma_sql_import_status div {
-    height: 270px;
-    overflow-y:auto;
-    overflow-x:hidden;
-    list-style-type: none;
-}
-
-.pma_sql_import_status div li {
-    padding: 8px 10px;
-    border-bottom: 1px solid #bbb;
-    color: rgb(148, 14, 14);
-    background: white;
-}
-
-.pma_sql_import_status div li .filesize {
-    float: right;
-}
-
-.pma_sql_import_status h2 .minimize {
-    float: right;
-    margin-right: 5px;
-    padding: 0 10px;
-}
-
-.pma_sql_import_status h2 .close {
-    float: right;
-    margin-right: 5px;
-    padding: 0 10px;
-    display: none;
-}
-
-.pma_sql_import_status h2 .minimize:hover,
-.pma_sql_import_status h2 .close:hover,
-.pma_drop_result h2 .close:hover {
-    background: rgba(155, 149, 149, 0.78);
-    cursor: pointer;
-}
-
-.pma_drop_file_status {
-    color: #235a81;
-}
-
-.pma_drop_file_status span.underline:hover {
-    cursor: pointer;
-    text-decoration: underline;
-}
-
-.pma_drop_result {
-    position: fixed;
-    top: 10%;
-    left: 20%;
-    width: 60%;
-    background: white;
-    min-height: 300px;
-    z-index: 800;
-    -webkit-box-shadow: 0 0 15px #999;
-    border-radius: 10px;
-    cursor: move;
-}
-
-.pma_drop_result h2 .close {
-    float: right;
-    margin-right: 5px;
-    padding: 0 10px;
-}
-
-#composite_index_list {
-    list-style-type: none;
-    list-style-position: inside;
-}
-
-span.drag_icon {
-    display: inline-block;
-    background-image: url('<?php echo $_SESSION['PMA_Theme']->getImgPath('s_sortable.png');?>');
-    background-position: center center;
-    background-repeat: no-repeat;
-    width: 1em;
-    height: 3em;
-    cursor: move;
-}
-
-.topmargin {
-    margin-top: 1em;
-}
-
-/* styles for sortable tables created with tablesorter jquery plugin */
-th.header {
-    cursor: pointer;
-    color: #0000FF;
-}
-
-th.header:hover {
-    text-decoration: underline;
-}
-
-th.header .sorticon {
-    width: 16px;
-    height: 16px;
-    background-repeat: no-repeat;
-    background-position: right center;
-    display: inline-table;
-    vertical-align: middle;
-    float: right;
-}
-
-th.headerSortUp .sorticon, th.headerSortDown:hover .sorticon {
-    background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('s_desc.png');?>);
-}
-
-th.headerSortDown .sorticon, th.headerSortUp:hover .sorticon {
-    background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('s_asc.png');?>);
-}
-/* end of styles of sortable tables */
-
-/* styles for jQuery-ui to support rtl languages */
-body .ui-dialog .ui-dialog-titlebar-close {
-    <?php echo $right; ?>: .3em;
-    <?php echo $left; ?>: initial;
-}
-
-body .ui-dialog .ui-dialog-title {
-    float: <?php echo $left; ?>;
-}
-
-body .ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset {
-    float: <?php echo $right; ?>;
-}
-/* end of styles for jQuery-ui to support rtl languages */
-
-/* Override some jQuery-ui styling to have square corners */
-body .ui-corner-all,
-body .ui-corner-top,
-body .ui-corner-left,
-body .ui-corner-tl {
-    border-top-left-radius: 0;
-}
-body .ui-corner-all,
-body .ui-corner-top,
-body .ui-corner-right,
-body .ui-corner-tr {
-    border-top-right-radius: 0;
-}
-body .ui-corner-all,
-body .ui-corner-bottom,
-body .ui-corner-left,
-body .ui-corner-bl {
-    border-bottom-left-radius: 0;
-}
-body .ui-corner-all,
-body .ui-corner-bottom,
-body .ui-corner-right,
-body .ui-corner-br {
-    border-bottom-right-radius: 0;
-}
-/* Override  jQuery-ui styling for ui-dialog */
-body .ui-dialog {
-    padding: 0;
-    border-color: #000000;
-}
-body .ui-dialog .ui-dialog-titlebar {
-    padding: .3em .5em;
-    border: none;
-    border-bottom: 1px solid #000000;
-}
-body .ui-dialog .ui-dialog-titlebar button {
-    border: 1px solid #999999;
-}
-body .ui-dialog .ui-dialog-content {
-    padding: .2em .4em;
-}
-body .ui-dialog .ui-dialog-buttonpane {
-    background: #D3DCE3;
-    border-top: 1px solid #000000;
-}
-body .ui-dialog .ui-dialog-buttonpane button {
-    margin: .1em 0 .1em .4em;
-    border: 1px solid #999999;
-    color: #000000;
-}
-body .ui-dialog .ui-button-text-only .ui-button-text {
-    padding: .2em .6em;
-}
diff --git a/#pma/themes/original/css/navigation.css.php b/#pma/themes/original/css/navigation.css.php
deleted file mode 100644
index 97705dca..00000000
--- a/#pma/themes/original/css/navigation.css.php
+++ /dev/null
@@ -1,424 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Navigation styles for the original theme
- *
- * @package    PhpMyAdmin-theme
- * @subpackage Original
- */
-
-// unplanned execution path
-if (! defined('PMA_MINIMUM_COMMON') && ! defined('TESTSUITE')) {
-    exit();
-}
-?>
-
-/******************************************************************************/
-/* Navigation */
-
-#pma_navigation {
-    background: <?php echo $GLOBALS['cfg']['NaviBackground']; ?>;
-    color: <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
-    width: <?php echo $GLOBALS['cfg']['NaviWidth']; ?>px;
-    overflow: hidden;
-    position: fixed;
-    top: 0;
-    <?php echo $left; ?>: 0;
-    height: 100%;
-    border-<?php echo $right; ?>: 1px solid gray;
-    z-index: 800;
-}
-
-#pma_navigation_content {
-    width: 100%;
-    height: 100%;
-    position: absolute;
-    top: 0;
-    <?php echo $left; ?>: 0;
-    z-index: 0;
-    padding-bottom: 1em;
-}
-
-#pma_navigation ul {
-    margin: 0;
-}
-
-#pma_navigation form {
-    margin: 0;
-    padding: 0;
-    display: inline;
-}
-
-#pma_navigation select#select_server,
-#pma_navigation select#lightm_db {
-    width: 100%;
-}
-
-/******************************************************************************/
-/* specific elements */
-
-#pma_navigation div.pageselector {
-    text-align: center;
-    margin: 0 0 0;
-    margin-<?php echo $left; ?>: 0.75em;
-    border-<?php echo $left; ?>: 1px solid #666;
-}
-
-#pma_navigation div#pmalogo {
-    <?php //better echo $GLOBALS['cfg']['logoBGC']; ?>
-    background-color: <?php echo $GLOBALS['cfg']['NaviBackground']; ?>;
-    padding: .3em;
-}
-
-#pma_navigation div#recentTableList,
-#pma_navigation div#FavoriteTableList {
-    text-align: center;
-    margin-bottom: 0.5em;
-}
-
-#pma_navigation #recentTable,
-#pma_navigation #FavoriteTable {
-    width: 200px;
-}
-
-#pma_navigation #pmalogo,
-#pma_navigation #serverChoice,
-#pma_navigation #navipanellinks,
-#pma_navigation #recentTableList,
-#pma_navigation #FavoriteTableList,
-#pma_navigation #databaseList,
-#pma_navigation div.pageselector.dbselector {
-    text-align:         center;
-    margin-bottom:      0.3em;
-    padding-bottom:     0.3em;
-    border: 0;
-}
-
-#pma_navigation #recentTableList select,
-#pma_navigation #FavoriteTableList select,
-#pma_navigation #serverChoice select
- {
-    width: 80%;
-}
-
-#pma_navigation #recentTableList,
-#pma_navigation #FavoriteTableList {
-    margin-bottom: 0;
-    padding-bottom: 0;
-}
-
-#pma_navigation_content > img.throbber {
-    display: block;
-    margin: 0 auto;
-}
-
-/* Navigation tree*/
-#pma_navigation_tree {
-    margin: 0;
-    margin-<?php echo $left; ?>: 1em;
-    color: #444;
-    height: 74%;
-    position: relative;
-}
-
-#pma_navigation_select_database {
-    text-align: left;
-    padding: 0 0 0;
-    border: 0;
-    margin: 0;
-}
-
-#pma_navigation_db_select {
-    margin-top: 0.5em;
-    margin-<?php echo $left; ?>: 0.75em;
-}
-#pma_navigation_db_select select {
-    background: url("./themes/pmahomme/img/select_bg.png") repeat scroll 0 0;
-    -webkit-border-radius: 2px;
-    border-radius: 2px;
-    border: 1px solid #bbb;
-    border-top: 1px solid #bbb;
-    color: #333;
-    padding: 4px 6px;
-    margin: 0 0 0;
-    width: 92%;
-    font-size: 1.11em;
-}
-
-#pma_navigation_tree_content {
-    width: 100%;
-    overflow: hidden;
-    overflow-y: auto;
-    position: absolute;
-    height: 100%;
-}
-#pma_navigation_tree_content a.hover_show_full {
-    position: relative;
-    z-index: 100;
-}
-#pma_navigation_tree a {
-    color: <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
-}
-#pma_navigation_tree a:hover {
-    text-decoration: underline;
-}
-#pma_navigation_tree li.activePointer {
-    color: <?php echo $GLOBALS['cfg']['NaviPointerColor']; ?>;
-    background-color: <?php echo $GLOBALS['cfg']['NaviPointerBackground']; ?>;
-}
-#pma_navigation_tree li.selected {
-    color: <?php echo $GLOBALS['cfg']['NaviPointerColor']; ?>;
-    background-color: <?php echo $GLOBALS['cfg']['NaviPointerBackground']; ?>;
-}
-#pma_navigation_tree li .dbItemControls {
-    padding-left: 4px;
-}
-#pma_navigation_tree li .navItemControls {
-    display: none;
-    padding-left: 4px;
-}
-#pma_navigation_tree li.activePointer .navItemControls {
-    display: inline;
-    opacity: 0.5;
-}
-#pma_navigation_tree li.activePointer .navItemControls:hover {
-    display: inline;
-    opacity: 1.0;
-}
-#pma_navigation_tree ul {
-    clear: both;
-    padding: 0;
-    list-style-type: none;
-    margin: 0;
-}
-#pma_navigation_tree ul ul {
-    position: relative;
-}
-#pma_navigation_tree li {
-    white-space: nowrap;
-    padding-bottom: 4px;
-    clear: both;
-    min-height: 16px;
-}
-#pma_navigation_tree img {
-    margin: 0;
-}
-#pma_navigation_tree i {
-    display: block;
-}
-#pma_navigation_tree div.block {
-    position: relative;
-    width:1.5em;
-    height:1.5em;
-    min-width: 16px;
-    min-height: 16px;
-    float: <?php echo $left; ?>;
-}
-#pma_navigation_tree div.block.double {
-    width: 3em;
-}
-#pma_navigation_tree div.block i,
-#pma_navigation_tree div.block b {
-    width: 1.5em;
-    height: 1.7em;
-    min-width: 16px;
-    min-height: 8px;
-    position: absolute;
-    bottom: 0.7em;
-    <?php echo $left; ?>: 0.75em;
-    z-index: 0;
-}
-#pma_navigation_tree div.block i {
-    border-<?php echo $left; ?>: 1px solid #666;
-    border-bottom: 1px solid #666;
-    position: relative;
-    z-index: 0;
-}
-#pma_navigation_tree div.block i.first { /* Removes top segment */
-    border-<?php echo $left; ?>: 0;
-}
-/* Bottom segment for the tree element connections */
-#pma_navigation_tree div.block b {
-    display: block;
-    height: 0.75em;
-    bottom: 0;
-    <?php echo $left; ?>: 0.75em;
-    border-<?php echo $left; ?>: 1px solid #666;
-}
-#pma_navigation_tree div.block a,
-#pma_navigation_tree div.block u {
-    position: absolute;
-    <?php echo $left; ?>: 50%;
-    top: 50%;
-    z-index: 10;
-}#pma_navigation_tree div.block a + a {
-    <?php echo $left; ?>: 100%;
-}
-#pma_navigation_tree div.block.double a,
-#pma_navigation_tree div.block.double u {
-    <?php echo $left; ?>: 25%;
-}
-#pma_navigation_tree div.block.double a + a {
-    <?php echo $left; ?>: 70%;
-}
-#pma_navigation_tree div.block img {
-    position: relative;
-    top: -0.6em;
-    <?php echo $left; ?>: 0;
-    margin-<?php echo $left; ?>: -5px;
-}
-#pma_navigation_tree li.last > ul {
-    background: none;
-}
-#pma_navigation_tree li > a, #pma_navigation_tree li > i {
-    line-height: 1.5em;
-    height: 1.5em;
-    padding-<?php echo $left; ?>: 0.3em;
-}
-#pma_navigation_tree .list_container {
-    border-<?php echo $left; ?>: 1px solid #666;
-    margin-<?php echo $left; ?>: 0.75em;
-    padding-<?php echo $left; ?>: 0.75em;
-}
-#pma_navigation_tree .last > .list_container {
-    border-<?php echo $left; ?>: 0 solid #666;
-}
-
-/* Fast filter */
-li.fast_filter {
-    padding-<?php echo $left; ?>: 0.75em;
-    margin-<?php echo $left; ?>: 0.75em;
-    padding-<?php echo $right; ?>: 35px;
-    border-<?php echo $left; ?>: 1px solid #666;
-}
-li.fast_filter input {
-    padding-<?php echo $right; ?>: 1.7em;
-    width: 100%;
-}
-li.fast_filter span {
-    position: relative;
-    <?php echo $right; ?>: 1.5em;
-    padding: 0.2em;
-    cursor: pointer;
-    font-weight: bold;
-    color: #800;
-}
-/* IE10+ has its own reset X */
-html.ie li.fast_filter span {
-    display: none;
-}
-html.ie.ie9 li.fast_filter span,
-html.ie.ie8 li.fast_filter span {
-    display: auto;
-}
-html.ie li.fast_filter input {
-    padding-<?php echo $right; ?>: .2em;
-}
-html.ie.ie9 li.fast_filter input,
-html.ie.ie8 li.fast_filter input {
-    padding-<?php echo $right; ?>: 1.7em;
-}
-li.fast_filter.db_fast_filter {
-    border: 0;
-}
-
-/* Resize handler */
-#pma_navigation_resizer {
-    width: 3px;
-    height: 100%;
-    background-color: #aaa;
-    cursor: col-resize;
-    position: fixed;
-    top: 0;
-    <?php echo $left; ?>: 240px;
-    z-index: 801;
-}
-#pma_navigation_collapser {
-    width: 20px;
-    height: 22px;
-    line-height: 22px;
-    background: #eee;
-    color: #555;
-    font-weight: bold;
-    position: fixed;
-    top: 0;
-    <?php echo $left; ?>: <?php echo $GLOBALS['cfg']['NaviWidth']; ?>px;
-    text-align: center;
-    cursor: pointer;
-    z-index: 800;
-    text-shadow: 0 1px 0 #fff;
-    filter: dropshadow(color=#fff, offx=0, offy=1);
-    border: 1px solid #888;
-}
-
-#navigation_controls_outer {
-    min-height: 21px !important;
-}
-
-#navigation_controls_outer.activePointer {
-    background-color: transparent !important;
-}
-
-#navigation_controls {
-    float: right;
-    padding-right: 23px;
-}
-
-/* Quick warp links */
-.pma_quick_warp {
-    margin-top: 5px;
-    margin-<?php echo $left; ?>: 2px;
-    position: relative;
-}
-.pma_quick_warp .drop_list {
-    float: <?php echo $left; ?>;
-    margin-<?php echo $left; ?>: 3px;
-    padding: 2px 0;
-}
-.pma_quick_warp .drop_button{
-    padding: 0 .3em;
-    border: 1px solid #ddd;
-    background: #f2f2f2;
-    cursor: pointer;
-}
-.pma_quick_warp .drop_list:hover .drop_button {
-    background: #fff;
-}
-.pma_quick_warp .drop_list ul {
-    position: absolute;
-    margin: 0;
-    padding: 0;
-    overflow: hidden;
-    overflow-y: auto;
-    list-style: none;
-    background: #fff;
-    border: 1px solid #ddd;
-    border-top-<?php echo $right; ?>-radius: 0;
-    border-bottom-<?php echo $right; ?>-radius: 0;
-    top: 100%;
-    <?php echo $left; ?>: 3px;
-    <?php echo $right; ?>: 0;
-    display: none;
-    z-index: 802;
-}
-.pma_quick_warp .drop_list:hover ul {
-    display: block;
-}
-.pma_quick_warp .drop_list li {
-    white-space: nowrap;
-}
-.pma_quick_warp .drop_list li img {
-    vertical-align: sub;
-}
-.pma_quick_warp .drop_list li:hover {
-    background: #f2f2f2;
-}
-.pma_quick_warp .drop_list a {
-    display: block;
-    padding: .1em .3em;
-}
-.pma_quick_warp .drop_list a.favorite_table_anchor {
-    clear: left;
-    float: left;
-    padding: .1em .3em 0;
-}
diff --git a/#pma/themes/original/css/printview.css b/#pma/themes/original/css/printview.css
deleted file mode 100644
index 7f3680f1..00000000
--- a/#pma/themes/original/css/printview.css
+++ /dev/null
@@ -1,170 +0,0 @@
-@media print {
-    #back_button_print_view, #print_button_print_view {
-        display: none;
-    }
-}
-
-/* For removing element from Print View */
-.print_ignore {
-    display: none;
-}
-
-.nowrap {
-    white-space: nowrap;
-}
-
-.hide {
-    display: none;
-}
-
-/* Standard CSS */
-body, table, th, td {
-    color:             #000;
-    background-color:  #fff;
-    font-size: 12px;
-}
-
-/* To remove link text decoration */
-a:link {
-    color:#000;
-    text-decoration:none
-}
-
-/* To remove any image borders */
-img {
-    border: 0;
-}
-
-/* Table specific */
-table, th, td {
-    border: .1em solid #000;
-    background-color: #fff;
-}
-
-table {
-    border-collapse:   collapse;
-    border-spacing:    0.2em;
-}
-
-thead {
-    border-collapse:   collapse;
-    border-spacing:    0.2em;
-    border: .1em solid #000;
-    font-weight: 900;
-}
-
-th, td {
-    padding:           0.2em;
-}
-
-thead th {
-    font-weight:       bold;
-    background-color:  #e5e5e5;
-    border: .1em solid #000;
-}
-
-th.vtop, td.vtop {
-    vertical-align: top;
-}
-
-th.vbottom, td.vbottom {
-    vertical-align: bottom;
-}
-
-/* Common Elements not to be included */
-/* Hide Navigation and Top Menu bar */
-#pma_navigation, #floating_menubar {
-    display: none;
-}
-/* Hide console */
-#pma_console_container {
-    display: none;
-}
-
-/* Hide Navigation items (like Goto Top) */
-#page_nav_icons {
-    display: none;
-}
-
-/* Hide the Create Table form */
-#create_table_form_minimal {
-    display: none;
-}
-
-/* Hide the Page Settings Modal box */
-#page_settings_modal {
-    display: none;
-}
-
-/* Hide footer, Demo notice, errors div */
-#pma_footer, #pma_demo, #pma_errors {
-    display: none;
-}
-
-/* Hide the #selflink div */
-#selflink {
-    display: none;
-}
-
-/* Position the main content */
-#page_content {
-    position: absolute;
-    left: 0;
-    top: 0;
-    width: 95%;
-    float: none;
-}
-
-/* Specific Class for overriding while Print */
-.print {
-    background-color: #000;
-}
-
-/* For the Success message div */
-div.success {
-    background-color: #fff;
-}
-
-.sqlOuter {
-    color: black;
-    background-color: #000;
-}
-
-/* For hiding 'Open a New phpMyAdmin Window' button */
-.ic_window-new, .ic_s_cog {
-    display: none;
-}
-
-.sticky_columns tr {
-    display: none;
-}
-
-#structure-action-links, #addColumns {
-    display: none;
-}
-
-/* Hide extra menu on tbl_structure.php */
-#topmenu2 {
-    display: none;
-}
-
-.cDrop, .cEdit, .cList, .cCpy, .cPointer {
-    display: none;
-}
-
-/* For Odd-Even contrast */
-table tr.odd th,
-table tr.odd td,
-.odd {
-    background: #fff;
-}
-
-table tr.even th,
-table tr.even td,
-.even {
-    background: #dfdfdf;
-}
-
-.column_attribute {
-    font-size: 100%;
-}
diff --git a/#pma/themes/original/img/ajax_clock_small.gif b/#pma/themes/original/img/ajax_clock_small.gif
deleted file mode 100644
index bde4932c..00000000
Binary files a/#pma/themes/original/img/ajax_clock_small.gif and /dev/null differ
diff --git a/#pma/themes/original/img/arrow_ltr.png b/#pma/themes/original/img/arrow_ltr.png
deleted file mode 100644
index 7ff8ed9c..00000000
Binary files a/#pma/themes/original/img/arrow_ltr.png and /dev/null differ
diff --git a/#pma/themes/original/img/arrow_rtl.png b/#pma/themes/original/img/arrow_rtl.png
deleted file mode 100644
index 0192d103..00000000
Binary files a/#pma/themes/original/img/arrow_rtl.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_bookmark.png b/#pma/themes/original/img/b_bookmark.png
deleted file mode 100644
index e2afe3f8..00000000
Binary files a/#pma/themes/original/img/b_bookmark.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_browse.png b/#pma/themes/original/img/b_browse.png
deleted file mode 100644
index 1d88b2ae..00000000
Binary files a/#pma/themes/original/img/b_browse.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_calendar.png b/#pma/themes/original/img/b_calendar.png
deleted file mode 100644
index 34381b39..00000000
Binary files a/#pma/themes/original/img/b_calendar.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_chart.png b/#pma/themes/original/img/b_chart.png
deleted file mode 100644
index 0e2cc49d..00000000
Binary files a/#pma/themes/original/img/b_chart.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_close.png b/#pma/themes/original/img/b_close.png
deleted file mode 100644
index 2c234b6f..00000000
Binary files a/#pma/themes/original/img/b_close.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_column_add.png b/#pma/themes/original/img/b_column_add.png
deleted file mode 100644
index 8a0a9d69..00000000
Binary files a/#pma/themes/original/img/b_column_add.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_comment.png b/#pma/themes/original/img/b_comment.png
deleted file mode 100644
index 203c8805..00000000
Binary files a/#pma/themes/original/img/b_comment.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_dbstatistics.png b/#pma/themes/original/img/b_dbstatistics.png
deleted file mode 100644
index bfb2ad54..00000000
Binary files a/#pma/themes/original/img/b_dbstatistics.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_deltbl.png b/#pma/themes/original/img/b_deltbl.png
deleted file mode 100644
index 0e3fb299..00000000
Binary files a/#pma/themes/original/img/b_deltbl.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_docs.png b/#pma/themes/original/img/b_docs.png
deleted file mode 100644
index 46e2d2c2..00000000
Binary files a/#pma/themes/original/img/b_docs.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_drop.png b/#pma/themes/original/img/b_drop.png
deleted file mode 100644
index 510bb288..00000000
Binary files a/#pma/themes/original/img/b_drop.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_edit.png b/#pma/themes/original/img/b_edit.png
deleted file mode 100644
index b4932b8d..00000000
Binary files a/#pma/themes/original/img/b_edit.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_empty.png b/#pma/themes/original/img/b_empty.png
deleted file mode 100644
index 6fa18add..00000000
Binary files a/#pma/themes/original/img/b_empty.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_engine.png b/#pma/themes/original/img/b_engine.png
deleted file mode 100644
index c8019fdd..00000000
Binary files a/#pma/themes/original/img/b_engine.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_event_add.png b/#pma/themes/original/img/b_event_add.png
deleted file mode 100644
index ef594b10..00000000
Binary files a/#pma/themes/original/img/b_event_add.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_events.png b/#pma/themes/original/img/b_events.png
deleted file mode 100644
index 86bcc87f..00000000
Binary files a/#pma/themes/original/img/b_events.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_export.png b/#pma/themes/original/img/b_export.png
deleted file mode 100644
index 1a6d1598..00000000
Binary files a/#pma/themes/original/img/b_export.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_favorite.png b/#pma/themes/original/img/b_favorite.png
deleted file mode 100644
index 8478bc88..00000000
Binary files a/#pma/themes/original/img/b_favorite.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_find_replace.png b/#pma/themes/original/img/b_find_replace.png
deleted file mode 100644
index af64a917..00000000
Binary files a/#pma/themes/original/img/b_find_replace.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_ftext.png b/#pma/themes/original/img/b_ftext.png
deleted file mode 100644
index 6014ebc2..00000000
Binary files a/#pma/themes/original/img/b_ftext.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_globe.gif b/#pma/themes/original/img/b_globe.gif
deleted file mode 100644
index ef03dcf0..00000000
Binary files a/#pma/themes/original/img/b_globe.gif and /dev/null differ
diff --git a/#pma/themes/original/img/b_group.png b/#pma/themes/original/img/b_group.png
deleted file mode 100644
index 4530760b..00000000
Binary files a/#pma/themes/original/img/b_group.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_help.png b/#pma/themes/original/img/b_help.png
deleted file mode 100644
index 2fe513b5..00000000
Binary files a/#pma/themes/original/img/b_help.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_home.png b/#pma/themes/original/img/b_home.png
deleted file mode 100644
index ea03206c..00000000
Binary files a/#pma/themes/original/img/b_home.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_import.png b/#pma/themes/original/img/b_import.png
deleted file mode 100644
index 9356a3ae..00000000
Binary files a/#pma/themes/original/img/b_import.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_index.png b/#pma/themes/original/img/b_index.png
deleted file mode 100644
index 11064c1b..00000000
Binary files a/#pma/themes/original/img/b_index.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_index_add.png b/#pma/themes/original/img/b_index_add.png
deleted file mode 100644
index f4120e73..00000000
Binary files a/#pma/themes/original/img/b_index_add.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_info.png b/#pma/themes/original/img/b_info.png
deleted file mode 100644
index cfd49e52..00000000
Binary files a/#pma/themes/original/img/b_info.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_inline_edit.png b/#pma/themes/original/img/b_inline_edit.png
deleted file mode 100644
index dc806a36..00000000
Binary files a/#pma/themes/original/img/b_inline_edit.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_insrow.png b/#pma/themes/original/img/b_insrow.png
deleted file mode 100644
index 05328711..00000000
Binary files a/#pma/themes/original/img/b_insrow.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_minus.png b/#pma/themes/original/img/b_minus.png
deleted file mode 100644
index e28166fe..00000000
Binary files a/#pma/themes/original/img/b_minus.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_more.png b/#pma/themes/original/img/b_more.png
deleted file mode 100644
index 681f862b..00000000
Binary files a/#pma/themes/original/img/b_more.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_move.png b/#pma/themes/original/img/b_move.png
deleted file mode 100644
index 1ce3b1cb..00000000
Binary files a/#pma/themes/original/img/b_move.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_newdb.png b/#pma/themes/original/img/b_newdb.png
deleted file mode 100644
index fccc3949..00000000
Binary files a/#pma/themes/original/img/b_newdb.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_newtbl.png b/#pma/themes/original/img/b_newtbl.png
deleted file mode 100644
index 7402ad88..00000000
Binary files a/#pma/themes/original/img/b_newtbl.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_nextpage.png b/#pma/themes/original/img/b_nextpage.png
deleted file mode 100644
index 6169d538..00000000
Binary files a/#pma/themes/original/img/b_nextpage.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_no_favorite.png b/#pma/themes/original/img/b_no_favorite.png
deleted file mode 100644
index 088ab091..00000000
Binary files a/#pma/themes/original/img/b_no_favorite.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_plugin.png b/#pma/themes/original/img/b_plugin.png
deleted file mode 100644
index 6187b15a..00000000
Binary files a/#pma/themes/original/img/b_plugin.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_plus.png b/#pma/themes/original/img/b_plus.png
deleted file mode 100644
index 90c15d8c..00000000
Binary files a/#pma/themes/original/img/b_plus.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_primary.png b/#pma/themes/original/img/b_primary.png
deleted file mode 100644
index 94f24073..00000000
Binary files a/#pma/themes/original/img/b_primary.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_print.png b/#pma/themes/original/img/b_print.png
deleted file mode 100644
index 9e5df80e..00000000
Binary files a/#pma/themes/original/img/b_print.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_props.png b/#pma/themes/original/img/b_props.png
deleted file mode 100644
index 5ea2251b..00000000
Binary files a/#pma/themes/original/img/b_props.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_relations.png b/#pma/themes/original/img/b_relations.png
deleted file mode 100644
index 0ef2521d..00000000
Binary files a/#pma/themes/original/img/b_relations.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_report.png b/#pma/themes/original/img/b_report.png
deleted file mode 100644
index 779ad58e..00000000
Binary files a/#pma/themes/original/img/b_report.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_routine_add.png b/#pma/themes/original/img/b_routine_add.png
deleted file mode 100644
index 2d144426..00000000
Binary files a/#pma/themes/original/img/b_routine_add.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_routines.png b/#pma/themes/original/img/b_routines.png
deleted file mode 100644
index 2cc102d3..00000000
Binary files a/#pma/themes/original/img/b_routines.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_save.png b/#pma/themes/original/img/b_save.png
deleted file mode 100644
index 24a6bcb5..00000000
Binary files a/#pma/themes/original/img/b_save.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_saveimage.png b/#pma/themes/original/img/b_saveimage.png
deleted file mode 100644
index 777fb5d2..00000000
Binary files a/#pma/themes/original/img/b_saveimage.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_sbrowse.png b/#pma/themes/original/img/b_sbrowse.png
deleted file mode 100644
index 98e1254d..00000000
Binary files a/#pma/themes/original/img/b_sbrowse.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_search.png b/#pma/themes/original/img/b_search.png
deleted file mode 100644
index 13f6ee85..00000000
Binary files a/#pma/themes/original/img/b_search.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_select.png b/#pma/themes/original/img/b_select.png
deleted file mode 100644
index 7f95764e..00000000
Binary files a/#pma/themes/original/img/b_select.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_snewtbl.png b/#pma/themes/original/img/b_snewtbl.png
deleted file mode 100644
index f881dfd3..00000000
Binary files a/#pma/themes/original/img/b_snewtbl.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_spatial.png b/#pma/themes/original/img/b_spatial.png
deleted file mode 100644
index 5e6c8c72..00000000
Binary files a/#pma/themes/original/img/b_spatial.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_sql.png b/#pma/themes/original/img/b_sql.png
deleted file mode 100644
index c1c387e5..00000000
Binary files a/#pma/themes/original/img/b_sql.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_sqlhelp.png b/#pma/themes/original/img/b_sqlhelp.png
deleted file mode 100644
index c9447b68..00000000
Binary files a/#pma/themes/original/img/b_sqlhelp.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_table_add.png b/#pma/themes/original/img/b_table_add.png
deleted file mode 100644
index 89fa46aa..00000000
Binary files a/#pma/themes/original/img/b_table_add.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_tblanalyse.png b/#pma/themes/original/img/b_tblanalyse.png
deleted file mode 100644
index 604f1d5f..00000000
Binary files a/#pma/themes/original/img/b_tblanalyse.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_tblexport.png b/#pma/themes/original/img/b_tblexport.png
deleted file mode 100644
index 15ede205..00000000
Binary files a/#pma/themes/original/img/b_tblexport.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_tblimport.png b/#pma/themes/original/img/b_tblimport.png
deleted file mode 100644
index 4a998800..00000000
Binary files a/#pma/themes/original/img/b_tblimport.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_tblops.png b/#pma/themes/original/img/b_tblops.png
deleted file mode 100644
index da5dbc16..00000000
Binary files a/#pma/themes/original/img/b_tblops.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_tbloptimize.png b/#pma/themes/original/img/b_tbloptimize.png
deleted file mode 100644
index 04e7c3eb..00000000
Binary files a/#pma/themes/original/img/b_tbloptimize.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_tipp.png b/#pma/themes/original/img/b_tipp.png
deleted file mode 100644
index ef73a7af..00000000
Binary files a/#pma/themes/original/img/b_tipp.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_trigger_add.png b/#pma/themes/original/img/b_trigger_add.png
deleted file mode 100644
index 8a754dfe..00000000
Binary files a/#pma/themes/original/img/b_trigger_add.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_triggers.png b/#pma/themes/original/img/b_triggers.png
deleted file mode 100644
index 84a89ef4..00000000
Binary files a/#pma/themes/original/img/b_triggers.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_undo.png b/#pma/themes/original/img/b_undo.png
deleted file mode 100644
index 981c6b22..00000000
Binary files a/#pma/themes/original/img/b_undo.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_unique.png b/#pma/themes/original/img/b_unique.png
deleted file mode 100644
index 40c9b5db..00000000
Binary files a/#pma/themes/original/img/b_unique.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_usradd.png b/#pma/themes/original/img/b_usradd.png
deleted file mode 100644
index 9af3f792..00000000
Binary files a/#pma/themes/original/img/b_usradd.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_usrcheck.png b/#pma/themes/original/img/b_usrcheck.png
deleted file mode 100644
index 96c77f41..00000000
Binary files a/#pma/themes/original/img/b_usrcheck.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_usrdrop.png b/#pma/themes/original/img/b_usrdrop.png
deleted file mode 100644
index 74165476..00000000
Binary files a/#pma/themes/original/img/b_usrdrop.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_usredit.png b/#pma/themes/original/img/b_usredit.png
deleted file mode 100644
index 8be9e897..00000000
Binary files a/#pma/themes/original/img/b_usredit.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_usrlist.png b/#pma/themes/original/img/b_usrlist.png
deleted file mode 100644
index 42d02d51..00000000
Binary files a/#pma/themes/original/img/b_usrlist.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_versions.png b/#pma/themes/original/img/b_versions.png
deleted file mode 100644
index da5c622e..00000000
Binary files a/#pma/themes/original/img/b_versions.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_view.png b/#pma/themes/original/img/b_view.png
deleted file mode 100644
index 96f90eb2..00000000
Binary files a/#pma/themes/original/img/b_view.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_view_add.png b/#pma/themes/original/img/b_view_add.png
deleted file mode 100644
index 735da945..00000000
Binary files a/#pma/themes/original/img/b_view_add.png and /dev/null differ
diff --git a/#pma/themes/original/img/b_views.png b/#pma/themes/original/img/b_views.png
deleted file mode 100644
index 61d971bf..00000000
Binary files a/#pma/themes/original/img/b_views.png and /dev/null differ
diff --git a/#pma/themes/original/img/bd_browse.png b/#pma/themes/original/img/bd_browse.png
deleted file mode 100644
index 18a12111..00000000
Binary files a/#pma/themes/original/img/bd_browse.png and /dev/null differ
diff --git a/#pma/themes/original/img/bd_deltbl.png b/#pma/themes/original/img/bd_deltbl.png
deleted file mode 100644
index d92653c5..00000000
Binary files a/#pma/themes/original/img/bd_deltbl.png and /dev/null differ
diff --git a/#pma/themes/original/img/bd_drop.png b/#pma/themes/original/img/bd_drop.png
deleted file mode 100644
index 97a3da5f..00000000
Binary files a/#pma/themes/original/img/bd_drop.png and /dev/null differ
diff --git a/#pma/themes/original/img/bd_edit.png b/#pma/themes/original/img/bd_edit.png
deleted file mode 100644
index e81ccd85..00000000
Binary files a/#pma/themes/original/img/bd_edit.png and /dev/null differ
diff --git a/#pma/themes/original/img/bd_empty.png b/#pma/themes/original/img/bd_empty.png
deleted file mode 100644
index 7c4ae3e1..00000000
Binary files a/#pma/themes/original/img/bd_empty.png and /dev/null differ
diff --git a/#pma/themes/original/img/bd_export.png b/#pma/themes/original/img/bd_export.png
deleted file mode 100644
index bb697b07..00000000
Binary files a/#pma/themes/original/img/bd_export.png and /dev/null differ
diff --git a/#pma/themes/original/img/bd_ftext.png b/#pma/themes/original/img/bd_ftext.png
deleted file mode 100644
index fb0c3026..00000000
Binary files a/#pma/themes/original/img/bd_ftext.png and /dev/null differ
diff --git a/#pma/themes/original/img/bd_index.png b/#pma/themes/original/img/bd_index.png
deleted file mode 100644
index d6e417c0..00000000
Binary files a/#pma/themes/original/img/bd_index.png and /dev/null differ
diff --git a/#pma/themes/original/img/bd_insrow.png b/#pma/themes/original/img/bd_insrow.png
deleted file mode 100644
index 5162577e..00000000
Binary files a/#pma/themes/original/img/bd_insrow.png and /dev/null differ
diff --git a/#pma/themes/original/img/bd_nextpage.png b/#pma/themes/original/img/bd_nextpage.png
deleted file mode 100644
index f8e25f5e..00000000
Binary files a/#pma/themes/original/img/bd_nextpage.png and /dev/null differ
diff --git a/#pma/themes/original/img/bd_primary.png b/#pma/themes/original/img/bd_primary.png
deleted file mode 100644
index 58f9cfdb..00000000
Binary files a/#pma/themes/original/img/bd_primary.png and /dev/null differ
diff --git a/#pma/themes/original/img/bd_routine_add.png b/#pma/themes/original/img/bd_routine_add.png
deleted file mode 100644
index 91ec8e1f..00000000
Binary files a/#pma/themes/original/img/bd_routine_add.png and /dev/null differ
diff --git a/#pma/themes/original/img/bd_sbrowse.png b/#pma/themes/original/img/bd_sbrowse.png
deleted file mode 100644
index 85395990..00000000
Binary files a/#pma/themes/original/img/bd_sbrowse.png and /dev/null differ
diff --git a/#pma/themes/original/img/bd_select.png b/#pma/themes/original/img/bd_select.png
deleted file mode 100644
index 1659a653..00000000
Binary files a/#pma/themes/original/img/bd_select.png and /dev/null differ
diff --git a/#pma/themes/original/img/bd_spatial.png b/#pma/themes/original/img/bd_spatial.png
deleted file mode 100644
index d1ee4d62..00000000
Binary files a/#pma/themes/original/img/bd_spatial.png and /dev/null differ
diff --git a/#pma/themes/original/img/bd_unique.png b/#pma/themes/original/img/bd_unique.png
deleted file mode 100644
index ee0fde9a..00000000
Binary files a/#pma/themes/original/img/bd_unique.png and /dev/null differ
diff --git a/#pma/themes/original/img/centralColumns.png b/#pma/themes/original/img/centralColumns.png
deleted file mode 100644
index ae82638e..00000000
Binary files a/#pma/themes/original/img/centralColumns.png and /dev/null differ
diff --git a/#pma/themes/original/img/centralColumns_add.png b/#pma/themes/original/img/centralColumns_add.png
deleted file mode 100644
index 42c93b04..00000000
Binary files a/#pma/themes/original/img/centralColumns_add.png and /dev/null differ
diff --git a/#pma/themes/original/img/centralColumns_delete.png b/#pma/themes/original/img/centralColumns_delete.png
deleted file mode 100644
index c2214c8b..00000000
Binary files a/#pma/themes/original/img/centralColumns_delete.png and /dev/null differ
diff --git a/#pma/themes/original/img/cleardot.gif b/#pma/themes/original/img/cleardot.gif
deleted file mode 100644
index a9d7bea4..00000000
Binary files a/#pma/themes/original/img/cleardot.gif and /dev/null differ
diff --git a/#pma/themes/original/img/col_drop.png b/#pma/themes/original/img/col_drop.png
deleted file mode 100644
index 681f862b..00000000
Binary files a/#pma/themes/original/img/col_drop.png and /dev/null differ
diff --git a/#pma/themes/original/img/col_pointer.png b/#pma/themes/original/img/col_pointer.png
deleted file mode 100644
index 1fb353fe..00000000
Binary files a/#pma/themes/original/img/col_pointer.png and /dev/null differ
diff --git a/#pma/themes/original/img/col_pointer_ver.png b/#pma/themes/original/img/col_pointer_ver.png
deleted file mode 100644
index 02977f2e..00000000
Binary files a/#pma/themes/original/img/col_pointer_ver.png and /dev/null differ
diff --git a/#pma/themes/original/img/console.png b/#pma/themes/original/img/console.png
deleted file mode 100644
index baae1d99..00000000
Binary files a/#pma/themes/original/img/console.png and /dev/null differ
diff --git a/#pma/themes/original/img/east-mini.png b/#pma/themes/original/img/east-mini.png
deleted file mode 100644
index bee419d6..00000000
Binary files a/#pma/themes/original/img/east-mini.png and /dev/null differ
diff --git a/#pma/themes/original/img/error.ico b/#pma/themes/original/img/error.ico
deleted file mode 100644
index b5c06183..00000000
Binary files a/#pma/themes/original/img/error.ico and /dev/null differ
diff --git a/#pma/themes/original/img/eye.png b/#pma/themes/original/img/eye.png
deleted file mode 100644
index ed38db23..00000000
Binary files a/#pma/themes/original/img/eye.png and /dev/null differ
diff --git a/#pma/themes/original/img/eye_grey.png b/#pma/themes/original/img/eye_grey.png
deleted file mode 100644
index 6fcae474..00000000
Binary files a/#pma/themes/original/img/eye_grey.png and /dev/null differ
diff --git a/#pma/themes/original/img/lightbulb.png b/#pma/themes/original/img/lightbulb.png
deleted file mode 100644
index d22fde8b..00000000
Binary files a/#pma/themes/original/img/lightbulb.png and /dev/null differ
diff --git a/#pma/themes/original/img/lightbulb_off.png b/#pma/themes/original/img/lightbulb_off.png
deleted file mode 100644
index e95b8c5b..00000000
Binary files a/#pma/themes/original/img/lightbulb_off.png and /dev/null differ
diff --git a/#pma/themes/original/img/logo_left.png b/#pma/themes/original/img/logo_left.png
deleted file mode 100644
index f230963d..00000000
Binary files a/#pma/themes/original/img/logo_left.png and /dev/null differ
diff --git a/#pma/themes/original/img/logo_right.png b/#pma/themes/original/img/logo_right.png
deleted file mode 100644
index d61c6284..00000000
Binary files a/#pma/themes/original/img/logo_right.png and /dev/null differ
diff --git a/#pma/themes/original/img/more.png b/#pma/themes/original/img/more.png
deleted file mode 100644
index 32aaf61a..00000000
Binary files a/#pma/themes/original/img/more.png and /dev/null differ
diff --git a/#pma/themes/original/img/new_data.png b/#pma/themes/original/img/new_data.png
deleted file mode 100644
index 6f4e1863..00000000
Binary files a/#pma/themes/original/img/new_data.png and /dev/null differ
diff --git a/#pma/themes/original/img/new_data_hovered.png b/#pma/themes/original/img/new_data_hovered.png
deleted file mode 100644
index a470dbbc..00000000
Binary files a/#pma/themes/original/img/new_data_hovered.png and /dev/null differ
diff --git a/#pma/themes/original/img/new_data_selected.png b/#pma/themes/original/img/new_data_selected.png
deleted file mode 100644
index a75abe34..00000000
Binary files a/#pma/themes/original/img/new_data_selected.png and /dev/null differ
diff --git a/#pma/themes/original/img/new_data_selected_hovered.png b/#pma/themes/original/img/new_data_selected_hovered.png
deleted file mode 100644
index 04a2ad84..00000000
Binary files a/#pma/themes/original/img/new_data_selected_hovered.png and /dev/null differ
diff --git a/#pma/themes/original/img/new_struct.png b/#pma/themes/original/img/new_struct.png
deleted file mode 100644
index 0f7302f8..00000000
Binary files a/#pma/themes/original/img/new_struct.png and /dev/null differ
diff --git a/#pma/themes/original/img/new_struct_hovered.png b/#pma/themes/original/img/new_struct_hovered.png
deleted file mode 100644
index 70e2ab87..00000000
Binary files a/#pma/themes/original/img/new_struct_hovered.png and /dev/null differ
diff --git a/#pma/themes/original/img/new_struct_selected.png b/#pma/themes/original/img/new_struct_selected.png
deleted file mode 100644
index 142bf115..00000000
Binary files a/#pma/themes/original/img/new_struct_selected.png and /dev/null differ
diff --git a/#pma/themes/original/img/new_struct_selected_hovered.png b/#pma/themes/original/img/new_struct_selected_hovered.png
deleted file mode 100644
index 9a82bc42..00000000
Binary files a/#pma/themes/original/img/new_struct_selected_hovered.png and /dev/null differ
diff --git a/#pma/themes/original/img/normalize.png b/#pma/themes/original/img/normalize.png
deleted file mode 100644
index 76118b1b..00000000
Binary files a/#pma/themes/original/img/normalize.png and /dev/null differ
diff --git a/#pma/themes/original/img/north-mini.png b/#pma/themes/original/img/north-mini.png
deleted file mode 100644
index 8283839c..00000000
Binary files a/#pma/themes/original/img/north-mini.png and /dev/null differ
diff --git a/#pma/themes/original/img/pause.png b/#pma/themes/original/img/pause.png
deleted file mode 100644
index 46a6318d..00000000
Binary files a/#pma/themes/original/img/pause.png and /dev/null differ
diff --git a/#pma/themes/original/img/play.png b/#pma/themes/original/img/play.png
deleted file mode 100644
index 6169d538..00000000
Binary files a/#pma/themes/original/img/play.png and /dev/null differ
diff --git a/#pma/themes/original/img/s_asc.png b/#pma/themes/original/img/s_asc.png
deleted file mode 100644
index 3e5050f2..00000000
Binary files a/#pma/themes/original/img/s_asc.png and /dev/null differ
diff --git a/#pma/themes/original/img/s_asci.png b/#pma/themes/original/img/s_asci.png
deleted file mode 100644
index d160eb10..00000000
Binary files a/#pma/themes/original/img/s_asci.png and /dev/null differ
diff --git a/#pma/themes/original/img/s_attention.png b/#pma/themes/original/img/s_attention.png
deleted file mode 100644
index 7f257818..00000000
Binary files a/#pma/themes/original/img/s_attention.png and /dev/null differ
diff --git a/#pma/themes/original/img/s_cancel.png b/#pma/themes/original/img/s_cancel.png
deleted file mode 100644
index fd782ab3..00000000
Binary files a/#pma/themes/original/img/s_cancel.png and /dev/null differ
diff --git a/#pma/themes/original/img/s_cog.png b/#pma/themes/original/img/s_cog.png
deleted file mode 100644
index b8c9713c..00000000
Binary files a/#pma/themes/original/img/s_cog.png and /dev/null differ
diff --git a/#pma/themes/original/img/s_collapseall.png b/#pma/themes/original/img/s_collapseall.png
deleted file mode 100644
index 8cb7c297..00000000
Binary files a/#pma/themes/original/img/s_collapseall.png and /dev/null differ
diff --git a/#pma/themes/original/img/s_db.png b/#pma/themes/original/img/s_db.png
deleted file mode 100644
index 0f723a9a..00000000
Binary files a/#pma/themes/original/img/s_db.png and /dev/null differ
diff --git a/#pma/themes/original/img/s_desc.png b/#pma/themes/original/img/s_desc.png
deleted file mode 100644
index 7dcb98b9..00000000
Binary files a/#pma/themes/original/img/s_desc.png and /dev/null differ
diff --git a/#pma/themes/original/img/s_error.png b/#pma/themes/original/img/s_error.png
deleted file mode 100644
index 9db50e5b..00000000
Binary files a/#pma/themes/original/img/s_error.png and /dev/null differ
diff --git a/#pma/themes/original/img/s_error2.png b/#pma/themes/original/img/s_error2.png
deleted file mode 100644
index e4f02e9a..00000000
Binary files a/#pma/themes/original/img/s_error2.png and /dev/null differ
diff --git a/#pma/themes/original/img/s_fulltext.png b/#pma/themes/original/img/s_fulltext.png
deleted file mode 100644
index 9f8db13f..00000000
Binary files a/#pma/themes/original/img/s_fulltext.png and /dev/null differ
diff --git a/#pma/themes/original/img/s_host.png b/#pma/themes/original/img/s_host.png
deleted file mode 100644
index 3d30f1c5..00000000
Binary files a/#pma/themes/original/img/s_host.png and /dev/null differ
diff --git a/#pma/themes/original/img/s_info.png b/#pma/themes/original/img/s_info.png
deleted file mode 100644
index cfd49e52..00000000
Binary files a/#pma/themes/original/img/s_info.png and /dev/null differ
diff --git a/#pma/themes/original/img/s_lang.png b/#pma/themes/original/img/s_lang.png
deleted file mode 100644
index d137d6eb..00000000
Binary files a/#pma/themes/original/img/s_lang.png and /dev/null differ
diff --git a/#pma/themes/original/img/s_link.png b/#pma/themes/original/img/s_link.png
deleted file mode 100644
index babbb64a..00000000
Binary files a/#pma/themes/original/img/s_link.png and /dev/null differ
diff --git a/#pma/themes/original/img/s_lock.png b/#pma/themes/original/img/s_lock.png
deleted file mode 100644
index 2ebc4f6f..00000000
Binary files a/#pma/themes/original/img/s_lock.png and /dev/null differ
diff --git a/#pma/themes/original/img/s_loggoff.png b/#pma/themes/original/img/s_loggoff.png
deleted file mode 100644
index ec55b56e..00000000
Binary files a/#pma/themes/original/img/s_loggoff.png and /dev/null differ
diff --git a/#pma/themes/original/img/s_notice.png b/#pma/themes/original/img/s_notice.png
deleted file mode 100644
index aacc4307..00000000
Binary files a/#pma/themes/original/img/s_notice.png and /dev/null differ
diff --git a/#pma/themes/original/img/s_okay.png b/#pma/themes/original/img/s_okay.png
deleted file mode 100644
index 5587dc63..00000000
Binary files a/#pma/themes/original/img/s_okay.png and /dev/null differ
diff --git a/#pma/themes/original/img/s_partialtext.png b/#pma/themes/original/img/s_partialtext.png
deleted file mode 100644
index e6711401..00000000
Binary files a/#pma/themes/original/img/s_partialtext.png and /dev/null differ
diff --git a/#pma/themes/original/img/s_passwd.png b/#pma/themes/original/img/s_passwd.png
deleted file mode 100644
index 82d6f264..00000000
Binary files a/#pma/themes/original/img/s_passwd.png and /dev/null differ
diff --git a/#pma/themes/original/img/s_really.png b/#pma/themes/original/img/s_really.png
deleted file mode 100644
index f9902ef0..00000000
Binary files a/#pma/themes/original/img/s_really.png and /dev/null differ
diff --git a/#pma/themes/original/img/s_reload.png b/#pma/themes/original/img/s_reload.png
deleted file mode 100644
index 0be96c79..00000000
Binary files a/#pma/themes/original/img/s_reload.png and /dev/null differ
diff --git a/#pma/themes/original/img/s_replication.png b/#pma/themes/original/img/s_replication.png
deleted file mode 100644
index f51a1779..00000000
Binary files a/#pma/themes/original/img/s_replication.png and /dev/null differ
diff --git a/#pma/themes/original/img/s_rights.png b/#pma/themes/original/img/s_rights.png
deleted file mode 100644
index 945c0b2c..00000000
Binary files a/#pma/themes/original/img/s_rights.png and /dev/null differ
diff --git a/#pma/themes/original/img/s_sortable.png b/#pma/themes/original/img/s_sortable.png
deleted file mode 100644
index 361a14a9..00000000
Binary files a/#pma/themes/original/img/s_sortable.png and /dev/null differ
diff --git a/#pma/themes/original/img/s_status.png b/#pma/themes/original/img/s_status.png
deleted file mode 100644
index 0680c59f..00000000
Binary files a/#pma/themes/original/img/s_status.png and /dev/null differ
diff --git a/#pma/themes/original/img/s_success.png b/#pma/themes/original/img/s_success.png
deleted file mode 100644
index d2e61210..00000000
Binary files a/#pma/themes/original/img/s_success.png and /dev/null differ
diff --git a/#pma/themes/original/img/s_sync.png b/#pma/themes/original/img/s_sync.png
deleted file mode 100644
index 8545ba1b..00000000
Binary files a/#pma/themes/original/img/s_sync.png and /dev/null differ
diff --git a/#pma/themes/original/img/s_tbl.png b/#pma/themes/original/img/s_tbl.png
deleted file mode 100644
index 6ae8c4d9..00000000
Binary files a/#pma/themes/original/img/s_tbl.png and /dev/null differ
diff --git a/#pma/themes/original/img/s_theme.png b/#pma/themes/original/img/s_theme.png
deleted file mode 100644
index 6196810a..00000000
Binary files a/#pma/themes/original/img/s_theme.png and /dev/null differ
diff --git a/#pma/themes/original/img/s_top.png b/#pma/themes/original/img/s_top.png
deleted file mode 100644
index f86dad26..00000000
Binary files a/#pma/themes/original/img/s_top.png and /dev/null differ
diff --git a/#pma/themes/original/img/s_unlink.png b/#pma/themes/original/img/s_unlink.png
deleted file mode 100644
index 52357530..00000000
Binary files a/#pma/themes/original/img/s_unlink.png and /dev/null differ
diff --git a/#pma/themes/original/img/s_vars.png b/#pma/themes/original/img/s_vars.png
deleted file mode 100644
index 5bc92cdd..00000000
Binary files a/#pma/themes/original/img/s_vars.png and /dev/null differ
diff --git a/#pma/themes/original/img/s_views.png b/#pma/themes/original/img/s_views.png
deleted file mode 100644
index fc4e1515..00000000
Binary files a/#pma/themes/original/img/s_views.png and /dev/null differ
diff --git a/#pma/themes/original/img/south-mini.png b/#pma/themes/original/img/south-mini.png
deleted file mode 100644
index 954c202b..00000000
Binary files a/#pma/themes/original/img/south-mini.png and /dev/null differ
diff --git a/#pma/themes/original/img/spacer.png b/#pma/themes/original/img/spacer.png
deleted file mode 100644
index c6008d7c..00000000
Binary files a/#pma/themes/original/img/spacer.png and /dev/null differ
diff --git a/#pma/themes/original/img/sprites.png b/#pma/themes/original/img/sprites.png
deleted file mode 100644
index c9981156..00000000
Binary files a/#pma/themes/original/img/sprites.png and /dev/null differ
diff --git a/#pma/themes/original/img/toggle-ltr.png b/#pma/themes/original/img/toggle-ltr.png
deleted file mode 100644
index 9d08d615..00000000
Binary files a/#pma/themes/original/img/toggle-ltr.png and /dev/null differ
diff --git a/#pma/themes/original/img/toggle-rtl.png b/#pma/themes/original/img/toggle-rtl.png
deleted file mode 100644
index c2ef16f8..00000000
Binary files a/#pma/themes/original/img/toggle-rtl.png and /dev/null differ
diff --git a/#pma/themes/original/img/vertical_line.png b/#pma/themes/original/img/vertical_line.png
deleted file mode 100644
index a88a7c7b..00000000
Binary files a/#pma/themes/original/img/vertical_line.png and /dev/null differ
diff --git a/#pma/themes/original/img/west-mini.png b/#pma/themes/original/img/west-mini.png
deleted file mode 100644
index a13f0835..00000000
Binary files a/#pma/themes/original/img/west-mini.png and /dev/null differ
diff --git a/#pma/themes/original/img/window-new.png b/#pma/themes/original/img/window-new.png
deleted file mode 100644
index 431fe851..00000000
Binary files a/#pma/themes/original/img/window-new.png and /dev/null differ
diff --git a/#pma/themes/original/img/zoom-minus-mini.png b/#pma/themes/original/img/zoom-minus-mini.png
deleted file mode 100644
index 4262ad46..00000000
Binary files a/#pma/themes/original/img/zoom-minus-mini.png and /dev/null differ
diff --git a/#pma/themes/original/img/zoom-plus-mini.png b/#pma/themes/original/img/zoom-plus-mini.png
deleted file mode 100644
index 4fabfd1e..00000000
Binary files a/#pma/themes/original/img/zoom-plus-mini.png and /dev/null differ
diff --git a/#pma/themes/original/img/zoom-world-mini.png b/#pma/themes/original/img/zoom-world-mini.png
deleted file mode 100644
index e4d72318..00000000
Binary files a/#pma/themes/original/img/zoom-world-mini.png and /dev/null differ
diff --git a/#pma/themes/original/info.inc.php b/#pma/themes/original/info.inc.php
deleted file mode 100644
index ce2287a0..00000000
--- a/#pma/themes/original/info.inc.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Theme information
- *
- * @package    PhpMyAdmin-theme
- * @subpackage Original
- */
-
-/**
- *
- */
-$theme_name = 'Original';
-$theme_full_version = '2.9';
diff --git a/#pma/themes/original/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png b/#pma/themes/original/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png
deleted file mode 100644
index 2e11dd55..00000000
Binary files a/#pma/themes/original/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png and /dev/null differ
diff --git a/#pma/themes/original/jquery/images/ui-bg_glass_65_ffffff_1x400.png b/#pma/themes/original/jquery/images/ui-bg_glass_65_ffffff_1x400.png
deleted file mode 100644
index 2e2990fa..00000000
Binary files a/#pma/themes/original/jquery/images/ui-bg_glass_65_ffffff_1x400.png and /dev/null differ
diff --git a/#pma/themes/original/jquery/images/ui-bg_glass_75_dadada_1x400.png b/#pma/themes/original/jquery/images/ui-bg_glass_75_dadada_1x400.png
deleted file mode 100644
index f4dcd0af..00000000
Binary files a/#pma/themes/original/jquery/images/ui-bg_glass_75_dadada_1x400.png and /dev/null differ
diff --git a/#pma/themes/original/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png b/#pma/themes/original/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png
deleted file mode 100644
index 471fed08..00000000
Binary files a/#pma/themes/original/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png and /dev/null differ
diff --git a/#pma/themes/original/jquery/images/ui-bg_glass_95_fef1ec_1x400.png b/#pma/themes/original/jquery/images/ui-bg_glass_95_fef1ec_1x400.png
deleted file mode 100644
index c0d07d44..00000000
Binary files a/#pma/themes/original/jquery/images/ui-bg_glass_95_fef1ec_1x400.png and /dev/null differ
diff --git a/#pma/themes/original/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/#pma/themes/original/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png
deleted file mode 100644
index a8b36eed..00000000
Binary files a/#pma/themes/original/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png and /dev/null differ
diff --git a/#pma/themes/original/jquery/images/ui-icons_222222_256x240.png b/#pma/themes/original/jquery/images/ui-icons_222222_256x240.png
deleted file mode 100644
index 9fc74146..00000000
Binary files a/#pma/themes/original/jquery/images/ui-icons_222222_256x240.png and /dev/null differ
diff --git a/#pma/themes/original/jquery/images/ui-icons_2e83ff_256x240.png b/#pma/themes/original/jquery/images/ui-icons_2e83ff_256x240.png
deleted file mode 100644
index 3db66861..00000000
Binary files a/#pma/themes/original/jquery/images/ui-icons_2e83ff_256x240.png and /dev/null differ
diff --git a/#pma/themes/original/jquery/images/ui-icons_454545_256x240.png b/#pma/themes/original/jquery/images/ui-icons_454545_256x240.png
deleted file mode 100644
index b25ea80e..00000000
Binary files a/#pma/themes/original/jquery/images/ui-icons_454545_256x240.png and /dev/null differ
diff --git a/#pma/themes/original/jquery/images/ui-icons_888888_256x240.png b/#pma/themes/original/jquery/images/ui-icons_888888_256x240.png
deleted file mode 100644
index 62bbf842..00000000
Binary files a/#pma/themes/original/jquery/images/ui-icons_888888_256x240.png and /dev/null differ
diff --git a/#pma/themes/original/jquery/images/ui-icons_cd0a0a_256x240.png b/#pma/themes/original/jquery/images/ui-icons_cd0a0a_256x240.png
deleted file mode 100644
index fabba4d3..00000000
Binary files a/#pma/themes/original/jquery/images/ui-icons_cd0a0a_256x240.png and /dev/null differ
diff --git a/#pma/themes/original/jquery/jquery-ui-1.11.4.css b/#pma/themes/original/jquery/jquery-ui-1.11.4.css
deleted file mode 100644
index 41f6b445..00000000
--- a/#pma/themes/original/jquery/jquery-ui-1.11.4.css
+++ /dev/null
@@ -1,1225 +0,0 @@
-/*! jQuery UI - v1.11.4 - 2016-01-08
-* http://jqueryui.com
-* Includes: core.css, draggable.css, resizable.css, selectable.css, sortable.css, accordion.css, autocomplete.css, button.css, datepicker.css, dialog.css, menu.css, progressbar.css, selectmenu.css, slider.css, spinner.css, tabs.css, tooltip.css, theme.css
-* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana%2CArial%2Csans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=highlight_soft&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=flat&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=glass&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=glass&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=glass&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=glass&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=glass&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=flat&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=flat&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px
-* Copyright jQuery Foundation and other contributors; Licensed MIT */
-
-/* Layout helpers
-----------------------------------*/
-.ui-helper-hidden {
-	display: none;
-}
-.ui-helper-hidden-accessible {
-	border: 0;
-	clip: rect(0 0 0 0);
-	height: 1px;
-	margin: -1px;
-	overflow: hidden;
-	padding: 0;
-	position: absolute;
-	width: 1px;
-}
-.ui-helper-reset {
-	margin: 0;
-	padding: 0;
-	border: 0;
-	outline: 0;
-	line-height: 1.3;
-	text-decoration: none;
-	font-size: 100%;
-	list-style: none;
-}
-.ui-helper-clearfix:before,
-.ui-helper-clearfix:after {
-	content: "";
-	display: table;
-	border-collapse: collapse;
-}
-.ui-helper-clearfix:after {
-	clear: both;
-}
-.ui-helper-clearfix {
-	min-height: 0; /* support: IE7 */
-}
-.ui-helper-zfix {
-	width: 100%;
-	height: 100%;
-	top: 0;
-	left: 0;
-	position: absolute;
-	opacity: 0;
-	filter:Alpha(Opacity=0); /* support: IE8 */
-}
-
-.ui-front {
-	z-index: 100;
-}
-
-
-/* Interaction Cues
-----------------------------------*/
-.ui-state-disabled {
-	cursor: default !important;
-}
-
-
-/* Icons
-----------------------------------*/
-
-/* states and images */
-.ui-icon {
-	display: block;
-	text-indent: -99999px;
-	overflow: hidden;
-	background-repeat: no-repeat;
-}
-
-
-/* Misc visuals
-----------------------------------*/
-
-/* Overlays */
-.ui-widget-overlay {
-	position: fixed;
-	top: 0;
-	left: 0;
-	width: 100%;
-	height: 100%;
-}
-.ui-draggable-handle {
-	-ms-touch-action: none;
-	touch-action: none;
-}
-.ui-resizable {
-	position: relative;
-}
-.ui-resizable-handle {
-	position: absolute;
-	font-size: 0.1px;
-	display: block;
-	-ms-touch-action: none;
-	touch-action: none;
-}
-.ui-resizable-disabled .ui-resizable-handle,
-.ui-resizable-autohide .ui-resizable-handle {
-	display: none;
-}
-.ui-resizable-n {
-	cursor: n-resize;
-	height: 7px;
-	width: 100%;
-	top: -5px;
-	left: 0;
-}
-.ui-resizable-s {
-	cursor: s-resize;
-	height: 7px;
-	width: 100%;
-	bottom: -5px;
-	left: 0;
-}
-.ui-resizable-e {
-	cursor: e-resize;
-	width: 7px;
-	right: -5px;
-	top: 0;
-	height: 100%;
-}
-.ui-resizable-w {
-	cursor: w-resize;
-	width: 7px;
-	left: -5px;
-	top: 0;
-	height: 100%;
-}
-.ui-resizable-se {
-	cursor: se-resize;
-	width: 12px;
-	height: 12px;
-	right: 1px;
-	bottom: 1px;
-}
-.ui-resizable-sw {
-	cursor: sw-resize;
-	width: 9px;
-	height: 9px;
-	left: -5px;
-	bottom: -5px;
-}
-.ui-resizable-nw {
-	cursor: nw-resize;
-	width: 9px;
-	height: 9px;
-	left: -5px;
-	top: -5px;
-}
-.ui-resizable-ne {
-	cursor: ne-resize;
-	width: 9px;
-	height: 9px;
-	right: -5px;
-	top: -5px;
-}
-.ui-selectable {
-	-ms-touch-action: none;
-	touch-action: none;
-}
-.ui-selectable-helper {
-	position: absolute;
-	z-index: 100;
-	border: 1px dotted black;
-}
-.ui-sortable-handle {
-	-ms-touch-action: none;
-	touch-action: none;
-}
-.ui-accordion .ui-accordion-header {
-	display: block;
-	cursor: pointer;
-	position: relative;
-	margin: 2px 0 0 0;
-	padding: .5em .5em .5em .7em;
-	min-height: 0; /* support: IE7 */
-	font-size: 100%;
-}
-.ui-accordion .ui-accordion-icons {
-	padding-left: 2.2em;
-}
-.ui-accordion .ui-accordion-icons .ui-accordion-icons {
-	padding-left: 2.2em;
-}
-.ui-accordion .ui-accordion-header .ui-accordion-header-icon {
-	position: absolute;
-	left: .5em;
-	top: 50%;
-	margin-top: -8px;
-}
-.ui-accordion .ui-accordion-content {
-	padding: 1em 2.2em;
-	border-top: 0;
-	overflow: auto;
-}
-.ui-autocomplete {
-	position: absolute;
-	top: 0;
-	left: 0;
-	cursor: default;
-}
-.ui-button {
-	display: inline-block;
-	position: relative;
-	padding: 0;
-	line-height: normal;
-	margin-right: .1em;
-	cursor: pointer;
-	vertical-align: middle;
-	text-align: center;
-	overflow: visible; /* removes extra width in IE */
-}
-.ui-button,
-.ui-button:link,
-.ui-button:visited,
-.ui-button:hover,
-.ui-button:active {
-	text-decoration: none;
-}
-/* to make room for the icon, a width needs to be set here */
-.ui-button-icon-only {
-	width: 2.2em;
-}
-/* button elements seem to need a little more width */
-button.ui-button-icon-only {
-	width: 2.4em;
-}
-.ui-button-icons-only {
-	width: 3.4em;
-}
-button.ui-button-icons-only {
-	width: 3.7em;
-}
-
-/* button text element */
-.ui-button .ui-button-text {
-	display: block;
-	line-height: normal;
-}
-.ui-button-text-only .ui-button-text {
-	padding: .4em 1em;
-}
-.ui-button-icon-only .ui-button-text,
-.ui-button-icons-only .ui-button-text {
-	padding: .4em;
-	text-indent: -9999999px;
-}
-.ui-button-text-icon-primary .ui-button-text,
-.ui-button-text-icons .ui-button-text {
-	padding: .4em 1em .4em 2.1em;
-}
-.ui-button-text-icon-secondary .ui-button-text,
-.ui-button-text-icons .ui-button-text {
-	padding: .4em 2.1em .4em 1em;
-}
-.ui-button-text-icons .ui-button-text {
-	padding-left: 2.1em;
-	padding-right: 2.1em;
-}
-/* no icon support for input elements, provide padding by default */
-input.ui-button {
-	padding: .4em 1em;
-}
-
-/* button icon element(s) */
-.ui-button-icon-only .ui-icon,
-.ui-button-text-icon-primary .ui-icon,
-.ui-button-text-icon-secondary .ui-icon,
-.ui-button-text-icons .ui-icon,
-.ui-button-icons-only .ui-icon {
-	position: absolute;
-	top: 50%;
-	margin-top: -8px;
-}
-.ui-button-icon-only .ui-icon {
-	left: 50%;
-	margin-left: -8px;
-}
-.ui-button-text-icon-primary .ui-button-icon-primary,
-.ui-button-text-icons .ui-button-icon-primary,
-.ui-button-icons-only .ui-button-icon-primary {
-	left: .5em;
-}
-.ui-button-text-icon-secondary .ui-button-icon-secondary,
-.ui-button-text-icons .ui-button-icon-secondary,
-.ui-button-icons-only .ui-button-icon-secondary {
-	right: .5em;
-}
-
-/* button sets */
-.ui-buttonset {
-	margin-right: 7px;
-}
-.ui-buttonset .ui-button {
-	margin-left: 0;
-	margin-right: -.3em;
-}
-
-/* workarounds */
-/* reset extra padding in Firefox, see h5bp.com/l */
-input.ui-button::-moz-focus-inner,
-button.ui-button::-moz-focus-inner {
-	border: 0;
-	padding: 0;
-}
-.ui-datepicker {
-	width: 17em;
-	padding: .2em .2em 0;
-	display: none;
-}
-.ui-datepicker .ui-datepicker-header {
-	position: relative;
-	padding: .2em 0;
-}
-.ui-datepicker .ui-datepicker-prev,
-.ui-datepicker .ui-datepicker-next {
-	position: absolute;
-	top: 2px;
-	width: 1.8em;
-	height: 1.8em;
-}
-.ui-datepicker .ui-datepicker-prev-hover,
-.ui-datepicker .ui-datepicker-next-hover {
-	top: 1px;
-}
-.ui-datepicker .ui-datepicker-prev {
-	left: 2px;
-}
-.ui-datepicker .ui-datepicker-next {
-	right: 2px;
-}
-.ui-datepicker .ui-datepicker-prev-hover {
-	left: 1px;
-}
-.ui-datepicker .ui-datepicker-next-hover {
-	right: 1px;
-}
-.ui-datepicker .ui-datepicker-prev span,
-.ui-datepicker .ui-datepicker-next span {
-	display: block;
-	position: absolute;
-	left: 50%;
-	margin-left: -8px;
-	top: 50%;
-	margin-top: -8px;
-}
-.ui-datepicker .ui-datepicker-title {
-	margin: 0 2.3em;
-	line-height: 1.8em;
-	text-align: center;
-}
-.ui-datepicker .ui-datepicker-title select {
-	font-size: 1em;
-	margin: 1px 0;
-}
-.ui-datepicker select.ui-datepicker-month,
-.ui-datepicker select.ui-datepicker-year {
-	width: 45%;
-}
-.ui-datepicker table {
-	width: 100%;
-	font-size: .9em;
-	border-collapse: collapse;
-	margin: 0 0 .4em;
-}
-.ui-datepicker th {
-	padding: .7em .3em;
-	text-align: center;
-	font-weight: bold;
-	border: 0;
-}
-.ui-datepicker td {
-	border: 0;
-	padding: 1px;
-}
-.ui-datepicker td span,
-.ui-datepicker td a {
-	display: block;
-	padding: .2em;
-	text-align: right;
-	text-decoration: none;
-}
-.ui-datepicker .ui-datepicker-buttonpane {
-	background-image: none;
-	margin: .7em 0 0 0;
-	padding: 0 .2em;
-	border-left: 0;
-	border-right: 0;
-	border-bottom: 0;
-}
-.ui-datepicker .ui-datepicker-buttonpane button {
-	float: right;
-	margin: .5em .2em .4em;
-	cursor: pointer;
-	padding: .2em .6em .3em .6em;
-	width: auto;
-	overflow: visible;
-}
-.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current {
-	float: left;
-}
-
-/* with multiple calendars */
-.ui-datepicker.ui-datepicker-multi {
-	width: auto;
-}
-.ui-datepicker-multi .ui-datepicker-group {
-	float: left;
-}
-.ui-datepicker-multi .ui-datepicker-group table {
-	width: 95%;
-	margin: 0 auto .4em;
-}
-.ui-datepicker-multi-2 .ui-datepicker-group {
-	width: 50%;
-}
-.ui-datepicker-multi-3 .ui-datepicker-group {
-	width: 33.3%;
-}
-.ui-datepicker-multi-4 .ui-datepicker-group {
-	width: 25%;
-}
-.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header,
-.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header {
-	border-left-width: 0;
-}
-.ui-datepicker-multi .ui-datepicker-buttonpane {
-	clear: left;
-}
-.ui-datepicker-row-break {
-	clear: both;
-	width: 100%;
-	font-size: 0;
-}
-
-/* RTL support */
-.ui-datepicker-rtl {
-	direction: rtl;
-}
-.ui-datepicker-rtl .ui-datepicker-prev {
-	right: 2px;
-	left: auto;
-}
-.ui-datepicker-rtl .ui-datepicker-next {
-	left: 2px;
-	right: auto;
-}
-.ui-datepicker-rtl .ui-datepicker-prev:hover {
-	right: 1px;
-	left: auto;
-}
-.ui-datepicker-rtl .ui-datepicker-next:hover {
-	left: 1px;
-	right: auto;
-}
-.ui-datepicker-rtl .ui-datepicker-buttonpane {
-	clear: right;
-}
-.ui-datepicker-rtl .ui-datepicker-buttonpane button {
-	float: left;
-}
-.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current,
-.ui-datepicker-rtl .ui-datepicker-group {
-	float: right;
-}
-.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header,
-.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header {
-	border-right-width: 0;
-	border-left-width: 1px;
-}
-.ui-dialog {
-	overflow: hidden;
-	position: absolute;
-	top: 0;
-	left: 0;
-	padding: .2em;
-	outline: 0;
-}
-.ui-dialog .ui-dialog-titlebar {
-	padding: .4em 1em;
-	position: relative;
-}
-.ui-dialog .ui-dialog-title {
-	float: left;
-	margin: .1em 0;
-	white-space: nowrap;
-	width: 90%;
-	overflow: hidden;
-	text-overflow: ellipsis;
-}
-.ui-dialog .ui-dialog-titlebar-close {
-	position: absolute;
-	right: .3em;
-	top: 50%;
-	width: 20px;
-	margin: -10px 0 0 0;
-	padding: 1px;
-	height: 20px;
-}
-.ui-dialog .ui-dialog-content {
-	position: relative;
-	border: 0;
-	padding: .5em 1em;
-	background: none;
-	overflow: auto;
-}
-.ui-dialog .ui-dialog-buttonpane {
-	text-align: left;
-	border-width: 1px 0 0 0;
-	background-image: none;
-	margin-top: .5em;
-	padding: .3em 1em .5em .4em;
-}
-.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset {
-	float: right;
-}
-.ui-dialog .ui-dialog-buttonpane button {
-	margin: .5em .4em .5em 0;
-	cursor: pointer;
-}
-.ui-dialog .ui-resizable-se {
-	width: 12px;
-	height: 12px;
-	right: -5px;
-	bottom: -5px;
-	background-position: 16px 16px;
-}
-.ui-draggable .ui-dialog-titlebar {
-	cursor: move;
-}
-.ui-menu {
-	list-style: none;
-	padding: 0;
-	margin: 0;
-	display: block;
-	outline: none;
-}
-.ui-menu .ui-menu {
-	position: absolute;
-}
-.ui-menu .ui-menu-item {
-	position: relative;
-	margin: 0;
-	padding: 3px 1em 3px .4em;
-	cursor: pointer;
-	min-height: 0; /* support: IE7 */
-	/* support: IE10, see #8844 */
-	list-style-image: url("data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7");
-}
-.ui-menu .ui-menu-divider {
-	margin: 5px 0;
-	height: 0;
-	font-size: 0;
-	line-height: 0;
-	border-width: 1px 0 0 0;
-}
-.ui-menu .ui-state-focus,
-.ui-menu .ui-state-active {
-	margin: -1px;
-}
-
-/* icon support */
-.ui-menu-icons {
-	position: relative;
-}
-.ui-menu-icons .ui-menu-item {
-	padding-left: 2em;
-}
-
-/* left-aligned */
-.ui-menu .ui-icon {
-	position: absolute;
-	top: 0;
-	bottom: 0;
-	left: .2em;
-	margin: auto 0;
-}
-
-/* right-aligned */
-.ui-menu .ui-menu-icon {
-	left: auto;
-	right: 0;
-}
-.ui-progressbar {
-	height: 2em;
-	text-align: left;
-	overflow: hidden;
-}
-.ui-progressbar .ui-progressbar-value {
-	margin: -1px;
-	height: 100%;
-}
-.ui-progressbar .ui-progressbar-overlay {
-	background: url("data:image/gif;base64,R0lGODlhKAAoAIABAAAAAP///yH/C05FVFNDQVBFMi4wAwEAAAAh+QQJAQABACwAAAAAKAAoAAACkYwNqXrdC52DS06a7MFZI+4FHBCKoDeWKXqymPqGqxvJrXZbMx7Ttc+w9XgU2FB3lOyQRWET2IFGiU9m1frDVpxZZc6bfHwv4c1YXP6k1Vdy292Fb6UkuvFtXpvWSzA+HycXJHUXiGYIiMg2R6W459gnWGfHNdjIqDWVqemH2ekpObkpOlppWUqZiqr6edqqWQAAIfkECQEAAQAsAAAAACgAKAAAApSMgZnGfaqcg1E2uuzDmmHUBR8Qil95hiPKqWn3aqtLsS18y7G1SzNeowWBENtQd+T1JktP05nzPTdJZlR6vUxNWWjV+vUWhWNkWFwxl9VpZRedYcflIOLafaa28XdsH/ynlcc1uPVDZxQIR0K25+cICCmoqCe5mGhZOfeYSUh5yJcJyrkZWWpaR8doJ2o4NYq62lAAACH5BAkBAAEALAAAAAAoACgAAAKVDI4Yy22ZnINRNqosw0Bv7i1gyHUkFj7oSaWlu3ovC8GxNso5fluz3qLVhBVeT/Lz7ZTHyxL5dDalQWPVOsQWtRnuwXaFTj9jVVh8pma9JjZ4zYSj5ZOyma7uuolffh+IR5aW97cHuBUXKGKXlKjn+DiHWMcYJah4N0lYCMlJOXipGRr5qdgoSTrqWSq6WFl2ypoaUAAAIfkECQEAAQAsAAAAACgAKAAAApaEb6HLgd/iO7FNWtcFWe+ufODGjRfoiJ2akShbueb0wtI50zm02pbvwfWEMWBQ1zKGlLIhskiEPm9R6vRXxV4ZzWT2yHOGpWMyorblKlNp8HmHEb/lCXjcW7bmtXP8Xt229OVWR1fod2eWqNfHuMjXCPkIGNileOiImVmCOEmoSfn3yXlJWmoHGhqp6ilYuWYpmTqKUgAAIfkECQEAAQAsAAAAACgAKAAAApiEH6kb58biQ3FNWtMFWW3eNVcojuFGfqnZqSebuS06w5V80/X02pKe8zFwP6EFWOT1lDFk8rGERh1TTNOocQ61Hm4Xm2VexUHpzjymViHrFbiELsefVrn6XKfnt2Q9G/+Xdie499XHd2g4h7ioOGhXGJboGAnXSBnoBwKYyfioubZJ2Hn0RuRZaflZOil56Zp6iioKSXpUAAAh+QQJAQABACwAAAAAKAAoAAACkoQRqRvnxuI7kU1a1UU5bd5tnSeOZXhmn5lWK3qNTWvRdQxP8qvaC+/yaYQzXO7BMvaUEmJRd3TsiMAgswmNYrSgZdYrTX6tSHGZO73ezuAw2uxuQ+BbeZfMxsexY35+/Qe4J1inV0g4x3WHuMhIl2jXOKT2Q+VU5fgoSUI52VfZyfkJGkha6jmY+aaYdirq+lQAACH5BAkBAAEALAAAAAAoACgAAAKWBIKpYe0L3YNKToqswUlvznigd4wiR4KhZrKt9Upqip61i9E3vMvxRdHlbEFiEXfk9YARYxOZZD6VQ2pUunBmtRXo1Lf8hMVVcNl8JafV38aM2/Fu5V16Bn63r6xt97j09+MXSFi4BniGFae3hzbH9+hYBzkpuUh5aZmHuanZOZgIuvbGiNeomCnaxxap2upaCZsq+1kAACH5BAkBAAEALAAAAAAoACgAAAKXjI8By5zf4kOxTVrXNVlv1X0d8IGZGKLnNpYtm8Lr9cqVeuOSvfOW79D9aDHizNhDJidFZhNydEahOaDH6nomtJjp1tutKoNWkvA6JqfRVLHU/QUfau9l2x7G54d1fl995xcIGAdXqMfBNadoYrhH+Mg2KBlpVpbluCiXmMnZ2Sh4GBqJ+ckIOqqJ6LmKSllZmsoq6wpQAAAh+QQJAQABACwAAAAAKAAoAAAClYx/oLvoxuJDkU1a1YUZbJ59nSd2ZXhWqbRa2/gF8Gu2DY3iqs7yrq+xBYEkYvFSM8aSSObE+ZgRl1BHFZNr7pRCavZ5BW2142hY3AN/zWtsmf12p9XxxFl2lpLn1rseztfXZjdIWIf2s5dItwjYKBgo9yg5pHgzJXTEeGlZuenpyPmpGQoKOWkYmSpaSnqKileI2FAAACH5BAkBAAEALAAAAAAoACgAAAKVjB+gu+jG4kORTVrVhRlsnn2dJ3ZleFaptFrb+CXmO9OozeL5VfP99HvAWhpiUdcwkpBH3825AwYdU8xTqlLGhtCosArKMpvfa1mMRae9VvWZfeB2XfPkeLmm18lUcBj+p5dnN8jXZ3YIGEhYuOUn45aoCDkp16hl5IjYJvjWKcnoGQpqyPlpOhr3aElaqrq56Bq7VAAAOw==");
-	height: 100%;
-	filter: alpha(opacity=25); /* support: IE8 */
-	opacity: 0.25;
-}
-.ui-progressbar-indeterminate .ui-progressbar-value {
-	background-image: none;
-}
-.ui-selectmenu-menu {
-	padding: 0;
-	margin: 0;
-	position: absolute;
-	top: 0;
-	left: 0;
-	display: none;
-}
-.ui-selectmenu-menu .ui-menu {
-	overflow: auto;
-	/* Support: IE7 */
-	overflow-x: hidden;
-	padding-bottom: 1px;
-}
-.ui-selectmenu-menu .ui-menu .ui-selectmenu-optgroup {
-	font-size: 1em;
-	font-weight: bold;
-	line-height: 1.5;
-	padding: 2px 0.4em;
-	margin: 0.5em 0 0 0;
-	height: auto;
-	border: 0;
-}
-.ui-selectmenu-open {
-	display: block;
-}
-.ui-selectmenu-button {
-	display: inline-block;
-	overflow: hidden;
-	position: relative;
-	text-decoration: none;
-	cursor: pointer;
-}
-.ui-selectmenu-button span.ui-icon {
-	right: 0.5em;
-	left: auto;
-	margin-top: -8px;
-	position: absolute;
-	top: 50%;
-}
-.ui-selectmenu-button span.ui-selectmenu-text {
-	text-align: left;
-	padding: 0.4em 2.1em 0.4em 1em;
-	display: block;
-	line-height: 1.4;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	white-space: nowrap;
-}
-.ui-slider {
-	position: relative;
-	text-align: left;
-}
-.ui-slider .ui-slider-handle {
-	position: absolute;
-	z-index: 2;
-	width: 1.2em;
-	height: 1.2em;
-	cursor: default;
-	-ms-touch-action: none;
-	touch-action: none;
-}
-.ui-slider .ui-slider-range {
-	position: absolute;
-	z-index: 1;
-	font-size: .7em;
-	display: block;
-	border: 0;
-	background-position: 0 0;
-}
-
-/* support: IE8 - See #6727 */
-.ui-slider.ui-state-disabled .ui-slider-handle,
-.ui-slider.ui-state-disabled .ui-slider-range {
-	filter: inherit;
-}
-
-.ui-slider-horizontal {
-	height: .8em;
-}
-.ui-slider-horizontal .ui-slider-handle {
-	top: -.3em;
-	margin-left: -.6em;
-}
-.ui-slider-horizontal .ui-slider-range {
-	top: 0;
-	height: 100%;
-}
-.ui-slider-horizontal .ui-slider-range-min {
-	left: 0;
-}
-.ui-slider-horizontal .ui-slider-range-max {
-	right: 0;
-}
-
-.ui-slider-vertical {
-	width: .8em;
-	height: 100px;
-}
-.ui-slider-vertical .ui-slider-handle {
-	left: -.3em;
-	margin-left: 0;
-	margin-bottom: -.6em;
-}
-.ui-slider-vertical .ui-slider-range {
-	left: 0;
-	width: 100%;
-}
-.ui-slider-vertical .ui-slider-range-min {
-	bottom: 0;
-}
-.ui-slider-vertical .ui-slider-range-max {
-	top: 0;
-}
-.ui-spinner {
-	position: relative;
-	display: inline-block;
-	overflow: hidden;
-	padding: 0;
-	vertical-align: middle;
-}
-.ui-spinner-input {
-	border: none;
-	background: none;
-	color: inherit;
-	padding: 0;
-	margin: .2em 0;
-	vertical-align: middle;
-	margin-left: .4em;
-	margin-right: 22px;
-}
-.ui-spinner-button {
-	width: 16px;
-	height: 50%;
-	font-size: .5em;
-	padding: 0;
-	margin: 0;
-	text-align: center;
-	position: absolute;
-	cursor: default;
-	display: block;
-	overflow: hidden;
-	right: 0;
-}
-/* more specificity required here to override default borders */
-.ui-spinner a.ui-spinner-button {
-	border-top: none;
-	border-bottom: none;
-	border-right: none;
-}
-/* vertically center icon */
-.ui-spinner .ui-icon {
-	position: absolute;
-	margin-top: -8px;
-	top: 50%;
-	left: 0;
-}
-.ui-spinner-up {
-	top: 0;
-}
-.ui-spinner-down {
-	bottom: 0;
-}
-
-/* TR overrides */
-.ui-spinner .ui-icon-triangle-1-s {
-	/* need to fix icons sprite */
-	background-position: -65px -16px;
-}
-.ui-tabs {
-	position: relative;/* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
-	padding: .2em;
-}
-.ui-tabs .ui-tabs-nav {
-	margin: 0;
-	padding: .2em .2em 0;
-}
-.ui-tabs .ui-tabs-nav li {
-	list-style: none;
-	float: left;
-	position: relative;
-	top: 0;
-	margin: 1px .2em 0 0;
-	border-bottom-width: 0;
-	padding: 0;
-	white-space: nowrap;
-}
-.ui-tabs .ui-tabs-nav .ui-tabs-anchor {
-	float: left;
-	padding: .5em 1em;
-	text-decoration: none;
-}
-.ui-tabs .ui-tabs-nav li.ui-tabs-active {
-	margin-bottom: -1px;
-	padding-bottom: 1px;
-}
-.ui-tabs .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor,
-.ui-tabs .ui-tabs-nav li.ui-state-disabled .ui-tabs-anchor,
-.ui-tabs .ui-tabs-nav li.ui-tabs-loading .ui-tabs-anchor {
-	cursor: text;
-}
-.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor {
-	cursor: pointer;
-}
-.ui-tabs .ui-tabs-panel {
-	display: block;
-	border-width: 0;
-	padding: 1em 1.4em;
-	background: none;
-}
-.ui-tooltip {
-	padding: 8px;
-	position: absolute;
-	z-index: 9999;
-	max-width: 300px;
-	-webkit-box-shadow: 0 0 5px #aaa;
-	box-shadow: 0 0 5px #aaa;
-}
-body .ui-tooltip {
-	border-width: 2px;
-}
-
-/* Component containers
-----------------------------------*/
-.ui-widget {
-	font-family: Verdana,Arial,sans-serif;
-	font-size: 1.1em;
-}
-.ui-widget .ui-widget {
-	font-size: 1em;
-}
-.ui-widget input,
-.ui-widget select,
-.ui-widget textarea,
-.ui-widget button {
-	font-family: Verdana,Arial,sans-serif;
-	font-size: 1em;
-}
-.ui-widget-content {
-	border: 1px solid #aaaaaa;
-	background: #ffffff;
-	color: #222222;
-}
-.ui-widget-content a {
-	color: #222222;
-}
-.ui-widget-header {
-	border: 1px solid #aaaaaa;
-	background: #cccccc url("images/ui-bg_highlight-soft_75_cccccc_1x100.png") 50% 50% repeat-x;
-	color: #222222;
-	font-weight: bold;
-}
-.ui-widget-header a {
-	color: #222222;
-}
-
-/* Interaction states
-----------------------------------*/
-.ui-state-default,
-.ui-widget-content .ui-state-default,
-.ui-widget-header .ui-state-default {
-	border: 1px solid #d3d3d3;
-	background: #e6e6e6 url("images/ui-bg_glass_75_e6e6e6_1x400.png") 50% 50% repeat-x;
-	font-weight: normal;
-	color: #555555;
-}
-.ui-state-default a,
-.ui-state-default a:link,
-.ui-state-default a:visited {
-	color: #555555;
-	text-decoration: none;
-}
-.ui-state-hover,
-.ui-widget-content .ui-state-hover,
-.ui-widget-header .ui-state-hover,
-.ui-state-focus,
-.ui-widget-content .ui-state-focus,
-.ui-widget-header .ui-state-focus {
-	border: 1px solid #999999;
-	background: #dadada url("images/ui-bg_glass_75_dadada_1x400.png") 50% 50% repeat-x;
-	font-weight: normal;
-	color: #212121;
-}
-.ui-state-hover a,
-.ui-state-hover a:hover,
-.ui-state-hover a:link,
-.ui-state-hover a:visited,
-.ui-state-focus a,
-.ui-state-focus a:hover,
-.ui-state-focus a:link,
-.ui-state-focus a:visited {
-	color: #212121;
-	text-decoration: none;
-}
-.ui-state-active,
-.ui-widget-content .ui-state-active,
-.ui-widget-header .ui-state-active {
-	border: 1px solid #aaaaaa;
-	background: #ffffff url("images/ui-bg_glass_65_ffffff_1x400.png") 50% 50% repeat-x;
-	font-weight: normal;
-	color: #212121;
-}
-.ui-state-active a,
-.ui-state-active a:link,
-.ui-state-active a:visited {
-	color: #212121;
-	text-decoration: none;
-}
-
-/* Interaction Cues
-----------------------------------*/
-.ui-state-highlight,
-.ui-widget-content .ui-state-highlight,
-.ui-widget-header .ui-state-highlight {
-	border: 1px solid #fcefa1;
-	background: #fbf9ee url("images/ui-bg_glass_55_fbf9ee_1x400.png") 50% 50% repeat-x;
-	color: #363636;
-}
-.ui-state-highlight a,
-.ui-widget-content .ui-state-highlight a,
-.ui-widget-header .ui-state-highlight a {
-	color: #363636;
-}
-.ui-state-error,
-.ui-widget-content .ui-state-error,
-.ui-widget-header .ui-state-error {
-	border: 1px solid #cd0a0a;
-	background: #fef1ec url("images/ui-bg_glass_95_fef1ec_1x400.png") 50% 50% repeat-x;
-	color: #cd0a0a;
-}
-.ui-state-error a,
-.ui-widget-content .ui-state-error a,
-.ui-widget-header .ui-state-error a {
-	color: #cd0a0a;
-}
-.ui-state-error-text,
-.ui-widget-content .ui-state-error-text,
-.ui-widget-header .ui-state-error-text {
-	color: #cd0a0a;
-}
-.ui-priority-primary,
-.ui-widget-content .ui-priority-primary,
-.ui-widget-header .ui-priority-primary {
-	font-weight: bold;
-}
-.ui-priority-secondary,
-.ui-widget-content .ui-priority-secondary,
-.ui-widget-header .ui-priority-secondary {
-	opacity: .7;
-	filter:Alpha(Opacity=70); /* support: IE8 */
-	font-weight: normal;
-}
-.ui-state-disabled,
-.ui-widget-content .ui-state-disabled,
-.ui-widget-header .ui-state-disabled {
-	opacity: .35;
-	filter:Alpha(Opacity=35); /* support: IE8 */
-	background-image: none;
-}
-.ui-state-disabled .ui-icon {
-	filter:Alpha(Opacity=35); /* support: IE8 - See #6059 */
-}
-
-/* Icons
-----------------------------------*/
-
-/* states and images */
-.ui-icon {
-	width: 16px;
-	height: 16px;
-}
-.ui-icon,
-.ui-widget-content .ui-icon {
-	background-image: url("images/ui-icons_222222_256x240.png");
-}
-.ui-widget-header .ui-icon {
-	background-image: url("images/ui-icons_222222_256x240.png");
-}
-.ui-state-default .ui-icon {
-	background-image: url("images/ui-icons_888888_256x240.png");
-}
-.ui-state-hover .ui-icon,
-.ui-state-focus .ui-icon {
-	background-image: url("images/ui-icons_454545_256x240.png");
-}
-.ui-state-active .ui-icon {
-	background-image: url("images/ui-icons_454545_256x240.png");
-}
-.ui-state-highlight .ui-icon {
-	background-image: url("images/ui-icons_2e83ff_256x240.png");
-}
-.ui-state-error .ui-icon,
-.ui-state-error-text .ui-icon {
-	background-image: url("images/ui-icons_cd0a0a_256x240.png");
-}
-
-/* positioning */
-.ui-icon-blank { background-position: 16px 16px; }
-.ui-icon-carat-1-n { background-position: 0 0; }
-.ui-icon-carat-1-ne { background-position: -16px 0; }
-.ui-icon-carat-1-e { background-position: -32px 0; }
-.ui-icon-carat-1-se { background-position: -48px 0; }
-.ui-icon-carat-1-s { background-position: -64px 0; }
-.ui-icon-carat-1-sw { background-position: -80px 0; }
-.ui-icon-carat-1-w { background-position: -96px 0; }
-.ui-icon-carat-1-nw { background-position: -112px 0; }
-.ui-icon-carat-2-n-s { background-position: -128px 0; }
-.ui-icon-carat-2-e-w { background-position: -144px 0; }
-.ui-icon-triangle-1-n { background-position: 0 -16px; }
-.ui-icon-triangle-1-ne { background-position: -16px -16px; }
-.ui-icon-triangle-1-e { background-position: -32px -16px; }
-.ui-icon-triangle-1-se { background-position: -48px -16px; }
-.ui-icon-triangle-1-s { background-position: -64px -16px; }
-.ui-icon-triangle-1-sw { background-position: -80px -16px; }
-.ui-icon-triangle-1-w { background-position: -96px -16px; }
-.ui-icon-triangle-1-nw { background-position: -112px -16px; }
-.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
-.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
-.ui-icon-arrow-1-n { background-position: 0 -32px; }
-.ui-icon-arrow-1-ne { background-position: -16px -32px; }
-.ui-icon-arrow-1-e { background-position: -32px -32px; }
-.ui-icon-arrow-1-se { background-position: -48px -32px; }
-.ui-icon-arrow-1-s { background-position: -64px -32px; }
-.ui-icon-arrow-1-sw { background-position: -80px -32px; }
-.ui-icon-arrow-1-w { background-position: -96px -32px; }
-.ui-icon-arrow-1-nw { background-position: -112px -32px; }
-.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
-.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
-.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
-.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
-.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
-.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
-.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
-.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
-.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
-.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
-.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
-.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
-.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
-.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
-.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
-.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
-.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
-.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
-.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
-.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
-.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
-.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
-.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
-.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
-.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
-.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
-.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
-.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
-.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
-.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
-.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
-.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
-.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
-.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
-.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
-.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
-.ui-icon-arrow-4 { background-position: 0 -80px; }
-.ui-icon-arrow-4-diag { background-position: -16px -80px; }
-.ui-icon-extlink { background-position: -32px -80px; }
-.ui-icon-newwin { background-position: -48px -80px; }
-.ui-icon-refresh { background-position: -64px -80px; }
-.ui-icon-shuffle { background-position: -80px -80px; }
-.ui-icon-transfer-e-w { background-position: -96px -80px; }
-.ui-icon-transferthick-e-w { background-position: -112px -80px; }
-.ui-icon-folder-collapsed { background-position: 0 -96px; }
-.ui-icon-folder-open { background-position: -16px -96px; }
-.ui-icon-document { background-position: -32px -96px; }
-.ui-icon-document-b { background-position: -48px -96px; }
-.ui-icon-note { background-position: -64px -96px; }
-.ui-icon-mail-closed { background-position: -80px -96px; }
-.ui-icon-mail-open { background-position: -96px -96px; }
-.ui-icon-suitcase { background-position: -112px -96px; }
-.ui-icon-comment { background-position: -128px -96px; }
-.ui-icon-person { background-position: -144px -96px; }
-.ui-icon-print { background-position: -160px -96px; }
-.ui-icon-trash { background-position: -176px -96px; }
-.ui-icon-locked { background-position: -192px -96px; }
-.ui-icon-unlocked { background-position: -208px -96px; }
-.ui-icon-bookmark { background-position: -224px -96px; }
-.ui-icon-tag { background-position: -240px -96px; }
-.ui-icon-home { background-position: 0 -112px; }
-.ui-icon-flag { background-position: -16px -112px; }
-.ui-icon-calendar { background-position: -32px -112px; }
-.ui-icon-cart { background-position: -48px -112px; }
-.ui-icon-pencil { background-position: -64px -112px; }
-.ui-icon-clock { background-position: -80px -112px; }
-.ui-icon-disk { background-position: -96px -112px; }
-.ui-icon-calculator { background-position: -112px -112px; }
-.ui-icon-zoomin { background-position: -128px -112px; }
-.ui-icon-zoomout { background-position: -144px -112px; }
-.ui-icon-search { background-position: -160px -112px; }
-.ui-icon-wrench { background-position: -176px -112px; }
-.ui-icon-gear { background-position: -192px -112px; }
-.ui-icon-heart { background-position: -208px -112px; }
-.ui-icon-star { background-position: -224px -112px; }
-.ui-icon-link { background-position: -240px -112px; }
-.ui-icon-cancel { background-position: 0 -128px; }
-.ui-icon-plus { background-position: -16px -128px; }
-.ui-icon-plusthick { background-position: -32px -128px; }
-.ui-icon-minus { background-position: -48px -128px; }
-.ui-icon-minusthick { background-position: -64px -128px; }
-.ui-icon-close { background-position: -80px -128px; }
-.ui-icon-closethick { background-position: -96px -128px; }
-.ui-icon-key { background-position: -112px -128px; }
-.ui-icon-lightbulb { background-position: -128px -128px; }
-.ui-icon-scissors { background-position: -144px -128px; }
-.ui-icon-clipboard { background-position: -160px -128px; }
-.ui-icon-copy { background-position: -176px -128px; }
-.ui-icon-contact { background-position: -192px -128px; }
-.ui-icon-image { background-position: -208px -128px; }
-.ui-icon-video { background-position: -224px -128px; }
-.ui-icon-script { background-position: -240px -128px; }
-.ui-icon-alert { background-position: 0 -144px; }
-.ui-icon-info { background-position: -16px -144px; }
-.ui-icon-notice { background-position: -32px -144px; }
-.ui-icon-help { background-position: -48px -144px; }
-.ui-icon-check { background-position: -64px -144px; }
-.ui-icon-bullet { background-position: -80px -144px; }
-.ui-icon-radio-on { background-position: -96px -144px; }
-.ui-icon-radio-off { background-position: -112px -144px; }
-.ui-icon-pin-w { background-position: -128px -144px; }
-.ui-icon-pin-s { background-position: -144px -144px; }
-.ui-icon-play { background-position: 0 -160px; }
-.ui-icon-pause { background-position: -16px -160px; }
-.ui-icon-seek-next { background-position: -32px -160px; }
-.ui-icon-seek-prev { background-position: -48px -160px; }
-.ui-icon-seek-end { background-position: -64px -160px; }
-.ui-icon-seek-start { background-position: -80px -160px; }
-/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
-.ui-icon-seek-first { background-position: -80px -160px; }
-.ui-icon-stop { background-position: -96px -160px; }
-.ui-icon-eject { background-position: -112px -160px; }
-.ui-icon-volume-off { background-position: -128px -160px; }
-.ui-icon-volume-on { background-position: -144px -160px; }
-.ui-icon-power { background-position: 0 -176px; }
-.ui-icon-signal-diag { background-position: -16px -176px; }
-.ui-icon-signal { background-position: -32px -176px; }
-.ui-icon-battery-0 { background-position: -48px -176px; }
-.ui-icon-battery-1 { background-position: -64px -176px; }
-.ui-icon-battery-2 { background-position: -80px -176px; }
-.ui-icon-battery-3 { background-position: -96px -176px; }
-.ui-icon-circle-plus { background-position: 0 -192px; }
-.ui-icon-circle-minus { background-position: -16px -192px; }
-.ui-icon-circle-close { background-position: -32px -192px; }
-.ui-icon-circle-triangle-e { background-position: -48px -192px; }
-.ui-icon-circle-triangle-s { background-position: -64px -192px; }
-.ui-icon-circle-triangle-w { background-position: -80px -192px; }
-.ui-icon-circle-triangle-n { background-position: -96px -192px; }
-.ui-icon-circle-arrow-e { background-position: -112px -192px; }
-.ui-icon-circle-arrow-s { background-position: -128px -192px; }
-.ui-icon-circle-arrow-w { background-position: -144px -192px; }
-.ui-icon-circle-arrow-n { background-position: -160px -192px; }
-.ui-icon-circle-zoomin { background-position: -176px -192px; }
-.ui-icon-circle-zoomout { background-position: -192px -192px; }
-.ui-icon-circle-check { background-position: -208px -192px; }
-.ui-icon-circlesmall-plus { background-position: 0 -208px; }
-.ui-icon-circlesmall-minus { background-position: -16px -208px; }
-.ui-icon-circlesmall-close { background-position: -32px -208px; }
-.ui-icon-squaresmall-plus { background-position: -48px -208px; }
-.ui-icon-squaresmall-minus { background-position: -64px -208px; }
-.ui-icon-squaresmall-close { background-position: -80px -208px; }
-.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
-.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
-.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
-.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
-.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
-.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
-
-
-/* Misc visuals
-----------------------------------*/
-
-/* Corner radius */
-.ui-corner-all,
-.ui-corner-top,
-.ui-corner-left,
-.ui-corner-tl {
-	border-top-left-radius: 4px;
-}
-.ui-corner-all,
-.ui-corner-top,
-.ui-corner-right,
-.ui-corner-tr {
-	border-top-right-radius: 4px;
-}
-.ui-corner-all,
-.ui-corner-bottom,
-.ui-corner-left,
-.ui-corner-bl {
-	border-bottom-left-radius: 4px;
-}
-.ui-corner-all,
-.ui-corner-bottom,
-.ui-corner-right,
-.ui-corner-br {
-	border-bottom-right-radius: 4px;
-}
-
-/* Overlays */
-.ui-widget-overlay {
-	background: #aaaaaa;
-	opacity: .3;
-	filter: Alpha(Opacity=30); /* support: IE8 */
-}
-.ui-widget-shadow {
-	margin: -8px 0 0 -8px;
-	padding: 8px;
-	background: #aaaaaa;
-	opacity: .3;
-	filter: Alpha(Opacity=30); /* support: IE8 */
-	border-radius: 8px;
-}
diff --git a/#pma/themes/original/layout.inc.php b/#pma/themes/original/layout.inc.php
deleted file mode 100644
index cfa1dc0f..00000000
--- a/#pma/themes/original/layout.inc.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * configures general layout
- * for detailed layout configuration please refer to the css files
- *
- * @package    PhpMyAdmin-theme
- * @subpackage Original
- */
-
-/**
- * navi frame
- */
-// navi frame width
-$GLOBALS['cfg']['NaviWidth']                = 240;
-
-// foreground (text) color for the navi frame
-$GLOBALS['cfg']['NaviColor']                = '#000000';
-
-// background for the navi frame
-$GLOBALS['cfg']['NaviBackground']           = '#D0DCE0';
-
-// foreground (text) color of the pointer in navi frame
-$GLOBALS['cfg']['NaviPointerColor']         = '#000000';
-// background of the pointer in navi frame
-$GLOBALS['cfg']['NaviPointerBackground']    = '#9999CC';
-
-/**
- * main frame
- */
-// foreground (text) color for the main frame
-$GLOBALS['cfg']['MainColor']                = '#000000';
-
-// background for the main frame
-$GLOBALS['cfg']['MainBackground']           = '#F5F5F5';
-
-// foreground (text) color of the pointer in browse mode
-$GLOBALS['cfg']['BrowsePointerColor']       = '#000000';
-
-// background of the pointer in browse mode
-$GLOBALS['cfg']['BrowsePointerBackground']  = '#CCFFCC';
-
-// foreground (text) color of the marker (visually marks row by clicking on it)
-// in browse mode
-$GLOBALS['cfg']['BrowseMarkerColor']        = '#000000';
-
-// background of the marker (visually marks row by clicking on it) in browse mode
-$GLOBALS['cfg']['BrowseMarkerBackground']   = '#FFCC99';
-
-/**
- * fonts
- */
-/**
- * the font family as a valid css font family value,
- * if not set the browser default will be used
- * (depending on browser, DTD and system settings)
- */
-$GLOBALS['cfg']['FontFamily']           = 'sans-serif';
-/**
- * fixed width font family, used in textarea
- */
-$GLOBALS['cfg']['FontFamilyFixed']      = 'monospace';
-
-/**
- * tables
- */
-// border
-$GLOBALS['cfg']['Border']               = 0;
-// table header and footer color
-$GLOBALS['cfg']['ThBackground']         = '#D3DCE3';
-// table header and footer background
-$GLOBALS['cfg']['ThColor']              = '#000000';
-// table data row background
-$GLOBALS['cfg']['BgOne']                = '#E5E5E5';
-// table data row background, alternate
-$GLOBALS['cfg']['BgTwo']                = '#D5D5D5';
diff --git a/#pma/themes/original/screen.png b/#pma/themes/original/screen.png
deleted file mode 100644
index 0ae4d0ff..00000000
Binary files a/#pma/themes/original/screen.png and /dev/null differ
diff --git a/#pma/themes/original/sprites.lib.php b/#pma/themes/original/sprites.lib.php
deleted file mode 100644
index 3a090022..00000000
--- a/#pma/themes/original/sprites.lib.php
+++ /dev/null
@@ -1,734 +0,0 @@
-<?php
-/**
- * AUTOGENERATED CONTENT - DO NOT EDIT!
- * ALL CHANGES WILL BE UNDONE!
- * RUN `./scripts/generate-sprites` TO UPDATE THIS FILE
- *
- * @package PhpMyAdmin-theme
- */
-
-/**
- * Returns map of sprites inside sprite.png
- *
- * @return array Data of sprites
- */
-function PMA_sprites()
-{
-    return array(
-        'b_bookmark' => array(
-            'position' => '1',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_browse' => array(
-            'position' => '2',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_calendar' => array(
-            'position' => '3',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_chart' => array(
-            'position' => '4',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_close' => array(
-            'position' => '5',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_column_add' => array(
-            'position' => '6',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_comment' => array(
-            'position' => '7',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_dbstatistics' => array(
-            'position' => '8',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_deltbl' => array(
-            'position' => '9',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_docs' => array(
-            'position' => '10',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_drop' => array(
-            'position' => '11',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_edit' => array(
-            'position' => '12',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_empty' => array(
-            'position' => '13',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_engine' => array(
-            'position' => '14',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_event_add' => array(
-            'position' => '15',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_events' => array(
-            'position' => '16',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_export' => array(
-            'position' => '17',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_favorite' => array(
-            'position' => '18',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_find_replace' => array(
-            'position' => '19',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_ftext' => array(
-            'position' => '20',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_group' => array(
-            'position' => '21',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_help' => array(
-            'position' => '22',
-            'width'    => '11',
-            'height'   => '11'
-        ),
-        'b_home' => array(
-            'position' => '23',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_import' => array(
-            'position' => '24',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_index' => array(
-            'position' => '25',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_index_add' => array(
-            'position' => '26',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_info' => array(
-            'position' => '27',
-            'width'    => '11',
-            'height'   => '11'
-        ),
-        'b_inline_edit' => array(
-            'position' => '28',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_insrow' => array(
-            'position' => '29',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_minus' => array(
-            'position' => '30',
-            'width'    => '9',
-            'height'   => '9'
-        ),
-        'b_more' => array(
-            'position' => '31',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_move' => array(
-            'position' => '32',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_newdb' => array(
-            'position' => '33',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_newtbl' => array(
-            'position' => '34',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_nextpage' => array(
-            'position' => '35',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_no_favorite' => array(
-            'position' => '36',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_plus' => array(
-            'position' => '37',
-            'width'    => '9',
-            'height'   => '9'
-        ),
-        'b_primary' => array(
-            'position' => '38',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_print' => array(
-            'position' => '39',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_props' => array(
-            'position' => '40',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_relations' => array(
-            'position' => '41',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_report' => array(
-            'position' => '42',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_routine_add' => array(
-            'position' => '43',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_routines' => array(
-            'position' => '44',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_save' => array(
-            'position' => '45',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_saveimage' => array(
-            'position' => '46',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_sbrowse' => array(
-            'position' => '47',
-            'width'    => '10',
-            'height'   => '10'
-        ),
-        'b_search' => array(
-            'position' => '48',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_selboard' => array(
-            'position' => '49',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_select' => array(
-            'position' => '50',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_snewtbl' => array(
-            'position' => '51',
-            'width'    => '10',
-            'height'   => '10'
-        ),
-        'b_spatial' => array(
-            'position' => '52',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_sql' => array(
-            'position' => '53',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_sqlhelp' => array(
-            'position' => '54',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_table_add' => array(
-            'position' => '55',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_tblanalyse' => array(
-            'position' => '56',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_tblexport' => array(
-            'position' => '57',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_tblimport' => array(
-            'position' => '58',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_tblops' => array(
-            'position' => '59',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_tbloptimize' => array(
-            'position' => '60',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_tipp' => array(
-            'position' => '61',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_trigger_add' => array(
-            'position' => '62',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_triggers' => array(
-            'position' => '63',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_undo' => array(
-            'position' => '64',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_unique' => array(
-            'position' => '65',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_usradd' => array(
-            'position' => '66',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_usrcheck' => array(
-            'position' => '67',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_usrdrop' => array(
-            'position' => '68',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_usredit' => array(
-            'position' => '69',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_usrlist' => array(
-            'position' => '70',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_versions' => array(
-            'position' => '71',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_view' => array(
-            'position' => '72',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_view_add' => array(
-            'position' => '73',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_views' => array(
-            'position' => '74',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_browse' => array(
-            'position' => '75',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_deltbl' => array(
-            'position' => '76',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_drop' => array(
-            'position' => '77',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_edit' => array(
-            'position' => '78',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_empty' => array(
-            'position' => '79',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_export' => array(
-            'position' => '80',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_ftext' => array(
-            'position' => '81',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_index' => array(
-            'position' => '82',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_insrow' => array(
-            'position' => '83',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_nextpage' => array(
-            'position' => '84',
-            'width'    => '8',
-            'height'   => '13'
-        ),
-        'bd_primary' => array(
-            'position' => '85',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_routine_add' => array(
-            'position' => '86',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_sbrowse' => array(
-            'position' => '87',
-            'width'    => '10',
-            'height'   => '10'
-        ),
-        'bd_select' => array(
-            'position' => '88',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_spatial' => array(
-            'position' => '89',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_unique' => array(
-            'position' => '90',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'centralColumns' => array(
-            'position' => '91',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'centralColumns_add' => array(
-            'position' => '92',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'centralColumns_delete' => array(
-            'position' => '93',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'col_drop' => array(
-            'position' => '94',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'console' => array(
-            'position' => '95',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'eye' => array(
-            'position' => '96',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'eye_grey' => array(
-            'position' => '97',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'lightbulb' => array(
-            'position' => '98',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'lightbulb_off' => array(
-            'position' => '99',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'more' => array(
-            'position' => '100',
-            'width'    => '13',
-            'height'   => '16'
-        ),
-        'new_data' => array(
-            'position' => '101',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'new_data_hovered' => array(
-            'position' => '102',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'new_data_selected' => array(
-            'position' => '103',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'new_data_selected_hovered' => array(
-            'position' => '104',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'new_struct' => array(
-            'position' => '105',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'new_struct_hovered' => array(
-            'position' => '106',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'new_struct_selected' => array(
-            'position' => '107',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'new_struct_selected_hovered' => array(
-            'position' => '108',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'normalize' => array(
-            'position' => '109',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'pause' => array(
-            'position' => '110',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'play' => array(
-            'position' => '111',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_asc' => array(
-            'position' => '112',
-            'width'    => '11',
-            'height'   => '9'
-        ),
-        's_asci' => array(
-            'position' => '113',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_attention' => array(
-            'position' => '114',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_cancel' => array(
-            'position' => '115',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_cog' => array(
-            'position' => '116',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_db' => array(
-            'position' => '117',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_desc' => array(
-            'position' => '118',
-            'width'    => '11',
-            'height'   => '9'
-        ),
-        's_error' => array(
-            'position' => '119',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_error2' => array(
-            'position' => '120',
-            'width'    => '11',
-            'height'   => '11'
-        ),
-        's_host' => array(
-            'position' => '121',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_info' => array(
-            'position' => '122',
-            'width'    => '11',
-            'height'   => '11'
-        ),
-        's_lang' => array(
-            'position' => '123',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_link' => array(
-            'position' => '124',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_lock' => array(
-            'position' => '125',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_loggoff' => array(
-            'position' => '126',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_notice' => array(
-            'position' => '127',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_passwd' => array(
-            'position' => '128',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_really' => array(
-            'position' => '129',
-            'width'    => '11',
-            'height'   => '11'
-        ),
-        's_reload' => array(
-            'position' => '130',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_replication' => array(
-            'position' => '131',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_rights' => array(
-            'position' => '132',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_sortable' => array(
-            'position' => '133',
-            'width'    => '11',
-            'height'   => '15'
-        ),
-        's_status' => array(
-            'position' => '134',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_success' => array(
-            'position' => '135',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_sync' => array(
-            'position' => '136',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_tbl' => array(
-            'position' => '137',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_theme' => array(
-            'position' => '138',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_top' => array(
-            'position' => '139',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_unlink' => array(
-            'position' => '140',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_vars' => array(
-            'position' => '141',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_views' => array(
-            'position' => '142',
-            'width'    => '10',
-            'height'   => '10'
-        ),
-        'window-new' => array(
-            'position' => '143',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-    );
-}
diff --git a/#pma/themes/pmahomme/css/codemirror.css.php b/#pma/themes/pmahomme/css/codemirror.css.php
deleted file mode 100644
index a7c6cb38..00000000
--- a/#pma/themes/pmahomme/css/codemirror.css.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Styles for CodeMirror editor
- * for the pmahomme theme
- *
- * @package    PhpMyAdmin-theme
- * @subpackage PMAHomme
- */
-
-// unplanned execution path
-if (! defined('PMA_MINIMUM_COMMON') && ! defined('TESTSUITE')) {
-    exit();
-}
-?>
-
-.CodeMirror {
-    height: <?php echo ceil($GLOBALS['cfg']['TextareaRows'] * 1.2); ?>em;
-    direction: ltr;
-}
-#inline_editor_outer .CodeMirror {
-    height: <?php echo ceil($GLOBALS['cfg']['TextareaRows'] * 0.4); ?>em;
-}
-.insertRowTable .CodeMirror {
-    height: <?php echo ceil($GLOBALS['cfg']['TextareaRows'] * 0.6); ?>em;
-    width: <?php echo ceil($GLOBALS['cfg']['TextareaCols'] * 0.6); ?>em;
-    border: 1px solid #a9a9a9;
-}
-#pma_console .CodeMirror-gutters {
-    background-color: initial;
-    border: none;
-}
-span.cm-keyword, span.cm-statement-verb {
-    color: #909;
-}
-span.cm-variable {
-    color: black;
-}
-span.cm-comment {
-    color: #808000;
-}
-span.cm-mysql-string {
-    color: #008000;
-}
-span.cm-operator {
-    color: fuchsia;
-}
-span.cm-mysql-word {
-    color: black;
-}
-span.cm-builtin {
-    color: #f00;
-}
-span.cm-variable-2 {
-    color: #f90;
-}
-span.cm-variable-3 {
-    color: #00f;
-}
-span.cm-separator {
-    color: fuchsia;
-}
-span.cm-number {
-    color: teal;
-}
-.autocomplete-column-name {
-    display: inline-block;
-}
-.autocomplete-column-hint {
-    display: inline-block;
-    float: right;
-    color: #666;
-    margin-left: 1em;
-}
-.CodeMirror-hints {
-    z-index: 200;
-}
-.CodeMirror-lint-tooltip {
-    z-index: 200;
-}
diff --git a/#pma/themes/pmahomme/css/common.css.php b/#pma/themes/pmahomme/css/common.css.php
deleted file mode 100644
index e19395c0..00000000
--- a/#pma/themes/pmahomme/css/common.css.php
+++ /dev/null
@@ -1,3542 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Common styles for the pmahomme theme
- *
- * @package    PhpMyAdmin-theme
- * @subpackage PMAHomme
- */
-
-// unplanned execution path
-if (! defined('PMA_MINIMUM_COMMON') && ! defined('TESTSUITE')) {
-    exit();
-}
-?>
-/******************************************************************************/
-
-/* general tags */
-html {
-    font-size: <?php echo $_SESSION['PMA_Theme']->getFontSize(); ?>
-}
-
-input,
-select,
-textarea {
-    font-size: 1em;
-}
-
-
-body {
-<?php if (! empty($GLOBALS['cfg']['FontFamily'])) : ?>
-    font-family: <?php echo $GLOBALS['cfg']['FontFamily']; ?>;
-<?php endif; ?>
-    padding: 0;
-    margin: 0;
-    margin-<?php echo $left; ?>: 240px;
-    color: <?php echo $GLOBALS['cfg']['MainColor']; ?>;
-    background: <?php echo $GLOBALS['cfg']['MainBackground']; ?>;
-}
-
-body#loginform {
-    margin: 0;
-}
-
-#page_content {
-    margin: 0 .5em;
-}
-
-<?php if (! empty($GLOBALS['cfg']['FontFamilyFixed'])) : ?>
-    textarea,
-    tt,
-    pre,
-    code {
-    font-family: <?php echo $GLOBALS['cfg']['FontFamilyFixed']; ?>;
-    }
-<?php endif; ?>
-
-
-h1 {
-    font-size: 140%;
-    font-weight: bold;
-}
-
-h2 {
-    font-size: 2em;
-    font-weight: normal;
-    text-shadow: 0 1px 0 #fff;
-    padding: 10px 0 10px;
-    padding-<?php echo $left; ?>: 3px;
-    color: #777;
-}
-
-/* Hiding icons in the page titles */
-h2 img {
-    display: none;
-}
-
-h2 a img {
-    display: inline;
-}
-
-.data,
-.data_full_width {
-    margin: 0 0 12px;
-}
-
-.data_full_width {
-    width: 100%;
-}
-
-h3 {
-    font-weight: bold;
-}
-
-a,
-a:link,
-a:visited,
-a:active,
-button.mult_submit,
-.checkall_box+label {
-    text-decoration: none;
-    color: #235a81;
-    cursor: pointer;
-    outline: none;
-
-}
-
-a:hover,
-button.mult_submit:hover,
-button.mult_submit:focus,
-.checkall_box+label:hover {
-    text-decoration: underline;
-    color: #235a81;
-}
-
-#initials_table {
-    background: #f3f3f3;
-    border: 1px solid #aaa;
-    margin-bottom: 10px;
-    -moz-border-radius: 5px;
-    -webkit-border-radius: 5px;
-    border-radius: 5px;
-}
-
-#initials_table td {
-    padding: 8px !important;
-}
-
-#initials_table a {
-    border: 1px solid #aaa;
-    background: #fff;
-    padding: 4px 8px;
-    -moz-border-radius: 5px;
-    -webkit-border-radius: 5px;
-    border-radius: 5px;
-    <?php echo $_SESSION['PMA_Theme']->getCssGradient('ffffff', 'e0e0e0'); ?>
-}
-
-#initials_table a.active {
-    border: 1px solid #666;
-    box-shadow: 0 0 2px #999;
-    <?php echo $_SESSION['PMA_Theme']->getCssGradient('bbbbbb', 'ffffff'); ?>
-}
-
-dfn {
-    font-style: normal;
-}
-
-dfn:hover {
-    font-style: normal;
-    cursor: help;
-}
-
-th {
-    font-weight: bold;
-    color: <?php echo $GLOBALS['cfg']['ThColor']; ?>;
-    background: #f3f3f3;
-    <?php echo $_SESSION['PMA_Theme']->getCssGradient('ffffff', 'cccccc'); ?>
-}
-
-a img {
-    border: 0;
-}
-
-hr {
-    color: <?php echo $GLOBALS['cfg']['MainColor']; ?>;
-    background-color: <?php echo $GLOBALS['cfg']['MainColor']; ?>;
-    border: 0;
-    height: 1px;
-}
-
-form {
-    padding: 0;
-    margin: 0;
-    display: inline;
-}
-
-
-input,
-select {
-    /* Fix outline in Chrome: */
-    outline: none;
-}
-
-input[type=text],
-input[type=password],
-input[type=number],
-input[type=date] {
-    border-radius: 2px;
-    -moz-border-radius: 2px;
-    -webkit-border-radius: 2px;
-
-
-    background: white;
-    border: 1px solid #aaa;
-    color: #555;
-    padding: 4px;
-}
-
-input[type=text],
-input[type=password],
-input[type=number],
-input[type=date],
-input[type=checkbox],
-select {
-    margin: 6px;
-}
-
-input[type=number] {
-    width: 50px;
-}
-
-input[type=text],
-input[type=password],
-input[type=number],
-input[type=date],
-select {
-    transition: all 0.2s;
-    -ms-transition: all 0.2s;
-    -webkit-transition: all 0.2s;
-    -moz-transition: all 0.2s;
-}
-
-input[type=text][disabled],
-input[type=text][disabled]:hover,
-input[type=password][disabled],
-input[type=password][disabled]:hover,
-input[type=number][disabled],
-input[type=number][disabled]:hover,
-input[type=date][disabled],
-input[type=date][disabled]:hover,
-select[disabled],
-select[disabled]:hover {
-    background: #e8e8e8;
-    box-shadow: none;
-    -webkit-box-shadow: none;
-    -moz-box-shadow: none;
-}
-
-input[type=text]:hover,
-input[type=text]:focus,
-input[type=password]:hover,
-input[type=password]:focus,
-input[type=number]:hover,
-input[type=number]:focus,
-input[type=date]:hover,
-input[type=date]:focus,
-select:focus {
-    border: 1px solid #7c7c7c;
-    background: #fff;
-}
-
-input[type=text]:hover,
-input[type=password]:hover,
-input[type=number]:hover,
-input[type=date]:hover {
-    box-shadow: 0 1px 3px #aaa;
-    -webkit-box-shadow: 0 1px 3px #aaa;
-    -moz-box-shadow: 0 1px 3px #aaa;
-}
-
-input[type=submit],
-input[type=button],
-button[type=submit]:not(.mult_submit) {
-    font-weight: bold !important;
-}
-
-input[type=submit],
-input[type=button],
-button[type=submit]:not(.mult_submit),
-input[type=reset],
-input[name=submit_reset],
-input.button {
-    margin: 6px 14px;
-    border: 1px solid #aaa;
-    padding: 3px 7px;
-    color: #111;
-    text-decoration: none;
-    background: #ddd;
-
-    border-radius: 12px;
-    -webkit-border-radius: 12px;
-    -moz-border-radius: 12px;
-
-    text-shadow: 0 1px 0 #fff;
-
-    <?php echo $_SESSION['PMA_Theme']->getCssGradient('f8f8f8', 'd8d8d8'); ?>
-}
-
-input[type=submit]:hover,
-input[type=button]:hover,
-button[type=submit]:not(.mult_submit):hover,
-input[type=reset]:hover,
-input[name=submit_reset]:hover,
-input.button:hover {
-    position: relative;
-    <?php echo $_SESSION['PMA_Theme']->getCssGradient('fff', 'ddd'); ?>
-    cursor: pointer;
-}
-
-input[type=submit]:active,
-input[type=button]:active,
-button[type=submit]:not(.mult_submit):active,
-input[type=reset]:active,
-input[name=submit_reset]:active,
-input.button:active {
-    position: relative;
-    <?php echo $_SESSION['PMA_Theme']->getCssGradient('eee', 'ddd'); ?>
-    box-shadow: 0 1px 6px -2px #333 inset;
-    text-shadow: none;
-}
-
-input[type=submit]:disabled,
-input[type=button]:disabled,
-button[type=submit]:not(.mult_submit):disabled,
-input[type=reset]:disabled,
-input[name=submit_reset]:disabled,
-input.button:disabled {
-    background: #ccc;
-    color: #666;
-    text-shadow: none;
-}
-
-textarea {
-    overflow: visible;
-    margin: 6px;
-}
-
-textarea.char {
-    margin: 6px;
-}
-
-fieldset, .preview_sql {
-    margin-top: 1em;
-    border-radius: 4px 4px 0 0;
-    -moz-border-radius: 4px 4px 0 0;
-    -webkit-border-radius: 4px 4px 0 0;
-    border: #aaa solid 1px;
-    padding: 1.5em;
-    background: #eee;
-    text-shadow: <?php echo $GLOBALS['text_dir'] === 'rtl' ? '-' : ''; ?>1px 1px 2px #fff inset;
-    -moz-box-shadow: <?php echo $GLOBALS['text_dir'] === 'rtl' ? '-' : ''; ?>1px 1px 2px #fff inset;
-    -webkit-box-shadow: <?php echo $GLOBALS['text_dir'] === 'rtl' ? '-' : ''; ?>1px 1px 2px #fff inset;
-    box-shadow: <?php echo $GLOBALS['text_dir'] === 'rtl' ? '-' : ''; ?>1px 1px 2px #fff inset;
-}
-
-fieldset fieldset {
-    margin: .8em;
-    background: #fff;
-    border: 1px solid #aaa;
-    background: #E8E8E8;
-
-}
-
-fieldset legend {
-    font-weight: bold;
-    color: #444;
-    padding: 5px 10px;
-    border-radius: 2px;
-    -moz-border-radius: 2px;
-    -webkit-border-radius: 2px;
-    border: 1px solid #aaa;
-    background-color: #fff;
-    -moz-box-shadow: <?php echo $GLOBALS['text_dir'] === 'rtl' ? '-' : ''; ?>3px 3px 15px #bbb;
-    -webkit-box-shadow: <?php echo $GLOBALS['text_dir'] === 'rtl' ? '-' : ''; ?>3px 3px 15px #bbb;
-    box-shadow: <?php echo $GLOBALS['text_dir'] === 'rtl' ? '-' : ''; ?>3px 3px 15px #bbb;
-    max-width: 100%;
-}
-
-.some-margin {
-    margin: 1.5em;
-}
-
-/* buttons in some browsers (eg. Konqueror) are block elements,
-   this breaks design */
-button {
-    display: inline;
-}
-
-table caption,
-table th,
-table td {
-    padding: .3em;
-    margin: .1em;
-    vertical-align: top;
-    text-shadow: 0 1px 0 #fff;
-}
-
-/* 3.4 */
-table {
-    border-collapse: collapse;
-}
-
-thead th {
-    border-right: 1px solid #fff;
-}
-
-th {
-    text-align: left;
-}
-
-
-img,
-button {
-    vertical-align: middle;
-}
-
-input[type="checkbox"],
-input[type="radio"] {
-    vertical-align: -11%;
-}
-
-
-select {
-    -moz-border-radius: 2px;
-    -webkit-border-radius: 2px;
-    border-radius: 2px;
-
-    border: 1px solid #bbb;
-    color: #333;
-    padding: 3px;
-    background: white;
-    margin:6px;
-}
-
-select[multiple] {
-    <?php echo $_SESSION['PMA_Theme']->getCssGradient('ffffff', 'f2f2f2'); ?>
-}
-
-/******************************************************************************/
-/* classes */
-.clearfloat {
-    clear: both;
-}
-
-.floatleft {
-    float: <?php echo $left; ?>;
-    margin-<?php echo $right; ?>: 1em;
-}
-
-.floatright {
-    float: <?php echo $right; ?>;
-}
-
-.center {
-    text-align: center;
-}
-
-.displayblock {
-    display: block;
-}
-
-table.nospacing {
-    border-spacing: 0;
-}
-
-table.nopadding tr th, table.nopadding tr td {
-    padding: 0;
-}
-
-th.left, td.left {
-    text-align: left;
-}
-
-th.center, td.center {
-    text-align: center;
-}
-
-th.right, td.right {
-    text-align: right;
-    padding-right: 1em;
-}
-
-tr.vtop th, tr.vtop td, th.vtop, td.vtop {
-    vertical-align: top;
-}
-
-tr.vmiddle th, tr.vmiddle td, th.vmiddle, td.vmiddle {
-    vertical-align: middle;
-}
-
-tr.vbottom th, tr.vbottom td, th.vbottom, td.vbottom {
-    vertical-align: bottom;
-}
-
-.paddingtop {
-    padding-top: 1em;
-}
-
-.separator {
-    color: #fff;
-    text-shadow: 0 1px 0 #000;
-}
-
-div.tools {
-    /* border: 1px solid #000; */
-    padding: .2em;
-}
-
-div.tools a {
-    color: #3a7ead !important;
-}
-
-div.tools,
-fieldset.tblFooters {
-    margin-top: 0;
-    margin-bottom: .5em;
-    /* avoid a thick line since this should be used under another fieldset */
-    border-top: 0;
-    text-align: <?php echo $right; ?>;
-    float: none;
-    clear: both;
-    -webkit-border-radius: 0 0 4px 4px;
-    -moz-border-radius: 0 0 4px 4px;
-    border-radius: 0 0 4px 5px;
-}
-
-div.null_div {
-    height: 20px;
-    text-align: center;
-    font-style: normal;
-    min-width: 50px;
-}
-
-fieldset .formelement {
-    float: <?php echo $left; ?>;
-    margin-<?php echo $right; ?>: .5em;
-    /* IE */
-    white-space: nowrap;
-}
-
-/* revert for Gecko */
-fieldset div[class=formelement] {
-    white-space: normal;
-}
-
-button.mult_submit {
-    border: none;
-    background-color: transparent;
-}
-
-/* odd items 1,3,5,7,... */
-table tr.odd th,
-.odd {
-    background: #fff;
-    <?php echo $_SESSION['PMA_Theme']->getCssIEClearFilter(); ?>
-}
-
-/* even items 2,4,6,8,... */
-/* (tested on CRTs and ACLs) */
-table tr.even th,
-.even {
-    background: #DFDFDF;
-    <?php echo $_SESSION['PMA_Theme']->getCssIEClearFilter(); ?>
-}
-
-/* odd table rows 1,3,5,7,... */
-table tr.odd th,
-table tr.odd,
-table tr.even th,
-table tr.even {
-    text-align: <?php echo $left; ?>;
-}
-
-/* marked table rows */
-td.marked:not(.nomarker),
-table tr.marked:not(.nomarker) td,
-table tr.marked:not(.nomarker) th,
-table tr.marked:not(.nomarker) {
-    <?php echo $_SESSION['PMA_Theme']->getCssGradient('ced6df', 'b6c6d7'); ?>
-    color: <?php echo $GLOBALS['cfg']['BrowseMarkerColor']; ?>;
-}
-
-/* hovered items */
-.odd:not(.nopointer):hover,
-.even:not(.nopointer):hover,
-.hover:not(.nopointer) {
-    <?php echo $_SESSION['PMA_Theme']->getCssGradient('ced6df', 'b6c6d7'); ?>
-    color: <?php echo $GLOBALS['cfg']['BrowsePointerColor']; ?>;
-}
-
-/* hovered table rows */
-table tr.odd:not(.nopointer):hover th,
-table tr.even:not(.nopointer):hover th,
-table tr.hover:not(.nopointer) th {
-    <?php echo $_SESSION['PMA_Theme']->getCssGradient('ced6df', 'b6c6d7'); ?>
-    color: <?php echo $GLOBALS['cfg']['BrowsePointerColor']; ?>;
-}
-
-/**
- * marks table rows/cells if the db field is in a where condition
- */
-.condition {
-    border-color: <?php echo $GLOBALS['cfg']['BrowseMarkerBackground']; ?> !important;
-}
-
-th.condition {
-    border-width: 1px 1px 0 1px;
-    border-style: solid;
-}
-
-td.condition {
-    border-width: 0 1px 0 1px;
-    border-style: solid;
-}
-
-tr:last-child td.condition {
-    border-width: 0 1px 1px 1px;
-}
-
-<?php if ($GLOBALS['text_dir'] === 'ltr') : ?>
-    /* for first th which must have right border set (ltr only) */
-    .before-condition {
-    border-right: 1px solid <?php echo $GLOBALS['cfg']['BrowseMarkerBackground']; ?>;
-    }
-<?php endif; ?>
-
-/**
- * cells with the value NULL
- */
-td.null {
-    font-style: italic;
-    text-align: <?php echo $right; ?>;
-}
-
-table .valueHeader {
-    text-align: <?php echo $right; ?>;
-    white-space: normal;
-}
-table .value {
-    text-align: <?php echo $right; ?>;
-    white-space: normal;
-}
-/* IE doesnt handles 'pre' right */
-table [class=value] {
-    white-space: normal;
-}
-
-
-<?php if (! empty($GLOBALS['cfg']['FontFamilyFixed'])) : ?>
-    .value {
-    font-family: <?php echo $GLOBALS['cfg']['FontFamilyFixed']; ?>;
-    }
-<?php endif; ?>
-.attention {
-    color: red;
-    font-weight: bold;
-}
-.allfine {
-    color: green;
-}
-
-
-img.lightbulb {
-    cursor: pointer;
-}
-
-.pdflayout {
-    overflow: hidden;
-    clip: inherit;
-    background-color: #fff;
-    display: none;
-    border: 1px solid #000;
-    position: relative;
-}
-
-.pdflayout_table {
-    background: #D3DCE3;
-    color: #000;
-    overflow: hidden;
-    clip: inherit;
-    z-index: 2;
-    display: inline;
-    visibility: inherit;
-    cursor: move;
-    position: absolute;
-    font-size: 80%;
-    border: 1px dashed #000;
-}
-
-/* Doc links in SQL */
-.cm-sql-doc {
-    text-decoration: none;
-    border-bottom: 1px dotted #000;
-    color: inherit !important;
-}
-
-/* no extra space in table cells */
-td .icon {
-    margin: 0;
-}
-
-.selectallarrow {
-    margin-<?php echo $right; ?>: .3em;
-    margin-<?php echo $left; ?>: .6em;
-}
-
-/* message boxes: error, confirmation */
-#pma_errors, #pma_demo, #pma_footer {
-    padding: 0 0.5em;
-}
-
-.success h1,
-.notice h1,
-div.error h1 {
-    border-bottom: 2px solid;
-    font-weight: bold;
-    text-align: <?php echo $left; ?>;
-    margin: 0 0 .2em 0;
-}
-
-div.success,
-div.notice,
-div.error {
-    margin: .5em 0 0.5em;
-    border: 1px solid;
-    background-repeat: no-repeat;
-    <?php if ($GLOBALS['text_dir'] === 'ltr') : ?>
-        background-position: 10px 50%;
-        padding: 10px 10px 10px 10px;
-    <?php else : ?>
-        background-position: 99% 50%;
-        padding: 10px 35px 10px 10px;
-        <?php
-    endif; ?>
-
-    -moz-border-radius: 5px;
-    -webkit-border-radius: 5px;
-    border-radius: 5px;
-
-    -moz-box-shadow: 0 1px 1px #fff inset;
-    -webkit-box-shadow: 0 1px 1px #fff inset;
-    box-shadow: 0 1px 1px #fff inset;
-}
-
-.success a,
-.notice a,
-.error a {
-    text-decoration: underline;
-}
-
-.success {
-    color: #000;
-    background-color: #ebf8a4;
-}
-
-h1.success,
-div.success {
-    border-color: #a2d246;
-}
-.success h1 {
-    border-color: #00FF00;
-}
-
-.notice {
-    color: #000;
-    background-color: #e8eef1;
-}
-
-h1.notice,
-div.notice {
-    border-color: #3a6c7e;
-}
-
-.notice h1 {
-    border-color: #ffb10a;
-}
-
-.error {
-    border: 1px solid maroon !important;
-    color: #000;
-    background: pink;
-}
-
-h1.error,
-div.error {
-    border-color: #333;
-}
-
-div.error h1 {
-    border-color: #ff0000;
-}
-
-.confirmation {
-    color: #000;
-    background-color: pink;
-}
-
-fieldset.confirmation {
-}
-
-fieldset.confirmation legend {
-}
-
-/* end messageboxes */
-
-.tblcomment {
-    font-size: 70%;
-    font-weight: normal;
-    color: #000099;
-}
-
-.tblHeaders {
-    font-weight: bold;
-    color: <?php echo $GLOBALS['cfg']['ThColor']; ?>;
-    background: <?php echo $GLOBALS['cfg']['ThBackground']; ?>;
-}
-
-div.tools,
-.tblFooters {
-    font-weight: normal;
-    color: <?php echo $GLOBALS['cfg']['ThColor']; ?>;
-    background: <?php echo $GLOBALS['cfg']['ThBackground']; ?>;
-}
-
-.tblHeaders a:link,
-.tblHeaders a:active,
-.tblHeaders a:visited,
-div.tools a:link,
-div.tools a:visited,
-div.tools a:active,
-.tblFooters a:link,
-.tblFooters a:active,
-.tblFooters a:visited {
-    color: #0000FF;
-}
-
-.tblHeaders a:hover,
-div.tools a:hover,
-.tblFooters a:hover {
-    color: #FF0000;
-}
-
-/* forbidden, no privileges */
-.noPrivileges {
-    color: #FF0000;
-    font-weight: bold;
-}
-
-/* disabled text */
-.disabled,
-.disabled a:link,
-.disabled a:active,
-.disabled a:visited {
-    color: #666;
-}
-
-.disabled a:hover {
-    color: #666;
-    text-decoration: none;
-}
-
-tr.disabled td,
-td.disabled {
-    background-color: #f3f3f3;
-    color: #aaa;
-}
-
-.nowrap {
-    white-space: nowrap;
-}
-
-/**
- * login form
- */
-body#loginform h1,
-body#loginform a.logo {
-    display: block;
-    text-align: center;
-}
-
-body#loginform {
-    margin-top: 1em;
-    text-align: center;
-}
-
-body#loginform div.container {
-    text-align: <?php echo $left; ?>;
-    width: 30em;
-    margin: 0 auto;
-}
-
-form.login label {
-    float: <?php echo $left; ?>;
-    width: 10em;
-    font-weight: bolder;
-}
-
-form.login input[type=text],
-form.login input[type=password],
-form.login select {
-    box-sizing: border-box;
-    width: 14em;
-}
-
-.commented_column {
-    border-bottom: 1px dashed #000;
-}
-
-.column_attribute {
-    font-size: 70%;
-}
-
-/******************************************************************************/
-/* specific elements */
-
-/* topmenu */
-#topmenu a {
-    text-shadow: 0 1px 0 #fff;
-}
-
-#topmenu .error {
-    background: #eee;border: 0 !important;color: #aaa;
-}
-
-ul#topmenu,
-ul#topmenu2,
-ul.tabs {
-    font-weight: bold;
-    list-style-type: none;
-    margin: 0;
-    padding: 0;
-
-}
-
-ul#topmenu2 {
-    margin: .25em .5em 0;
-    height: 2em;
-    clear: both;
-}
-
-ul#topmenu li,
-ul#topmenu2 li {
-    float: <?php echo $left; ?>;
-    margin: 0;
-    vertical-align: middle;
-}
-
-#topmenu img,
-#topmenu2 img {
-    margin-right: .5em;
-    vertical-align: -3px;
-}
-
-.menucontainer {
-    <?php echo $_SESSION['PMA_Theme']->getCssGradient('ffffff', 'dcdcdc'); ?>
-    border-top: 1px solid #aaa;
-}
-
-/* default tab styles */
-.tabactive {
-    background: #fff !important;
-}
-
-ul#topmenu2 a {
-    display: block;
-    margin: 7px 6px 7px;
-    margin-<?php echo $left; ?>: 0;
-    padding: 4px 10px;
-    white-space: nowrap;
-    border: 1px solid #ddd;
-    border-radius: 20px;
-    -moz-border-radius: 20px;
-    -webkit-border-radius: 20px;
-    background: #f2f2f2;
-
-}
-
-fieldset.caution a {
-    color: #FF0000;
-}
-fieldset.caution a:hover {
-    color: #fff;
-    background-color: #FF0000;
-}
-
-#topmenu {
-    margin-top: .5em;
-    padding: .1em .3em;
-}
-
-ul#topmenu ul {
-    -moz-box-shadow: <?php echo $GLOBALS['text_dir'] === 'rtl' ? '-' : ''; ?>1px 1px 6px #ddd;
-    -webkit-box-shadow: <?php echo $GLOBALS['text_dir'] === 'rtl' ? '-' : ''; ?>2px 2px 3px #666;
-    box-shadow: <?php echo $GLOBALS['text_dir'] === 'rtl' ? '-' : ''; ?>2px 2px 3px #666;
-}
-
-ul#topmenu ul.only {
-    <?php echo $left; ?>: 0;
-}
-
-ul#topmenu > li {
-    border-right: 1px solid #fff;
-    border-left: 1px solid #ccc;
-    border-bottom: 1px solid #ccc;
-}
-
-ul#topmenu > li:first-child {
-    border-left: 0;
-}
-
-/* default tab styles */
-ul#topmenu a,
-ul#topmenu span {
-    padding: .6em;
-}
-
-ul#topmenu ul a {
-    border-width: 1pt 0 0 0;
-    -moz-border-radius: 0;
-    -webkit-border-radius: 0;
-    border-radius: 0;
-}
-
-ul#topmenu ul li:first-child a {
-    border-width: 0;
-}
-
-/* enabled hover/active tabs */
-ul#topmenu > li > a:hover,
-ul#topmenu > li > .tabactive {
-    text-decoration: none;
-}
-
-ul#topmenu ul a:hover,
-ul#topmenu ul .tabactive {
-    text-decoration: none;
-}
-
-ul#topmenu a.tab:hover,
-ul#topmenu .tabactive {
-    /* background-color: <?php echo $GLOBALS['cfg']['MainBackground']; ?>;  */
-}
-
-ul#topmenu2 a.tab:hover,
-ul#topmenu2 a.tabactive {
-    background-color: <?php echo $GLOBALS['cfg']['BgOne']; ?>;
-    border-radius: .3em;
-    -moz-border-radius: .3em;
-    -webkit-border-radius: .3em;
-    text-decoration: none;
-}
-
-/* to be able to cancel the bottom border, use <li class="active"> */
-ul#topmenu > li.active {
-    /* border-bottom: 0pt solid <?php echo $GLOBALS['cfg']['MainBackground']; ?>; */
-    border-right: 0;
-    border-bottom-color: #fff;
-}
-/* end topmenu */
-
-/* zoom search */
-div#dataDisplay input,
-div#dataDisplay select {
-    margin: 0;
-    margin-<?php echo $right; ?>: .5em;
-}
-div#dataDisplay th {
-    line-height: 2em;
-}
-table#tableFieldsId {
-    width: 100%;
-}
-
-/* Calendar */
-table.calendar {
-    width: 100%;
-}
-table.calendar td {
-    text-align: center;
-}
-table.calendar td a {
-    display: block;
-}
-
-table.calendar td a:hover {
-    background-color: #CCFFCC;
-}
-
-table.calendar th {
-    background-color: #D3DCE3;
-}
-
-table.calendar td.selected {
-    background-color: #FFCC99;
-}
-
-img.calendar {
-    border: none;
-}
-form.clock {
-    text-align: center;
-}
-/* end Calendar */
-
-
-/* table stats */
-div#tablestatistics table {
-    float: <?php echo $left; ?>;
-    margin-bottom: .5em;
-    margin-<?php echo $right; ?>: 1.5em;
-    margin-top: .5em;
-    min-width: 16em;
-}
-
-/* end table stats */
-
-
-/* server privileges */
-#tableuserrights td,
-#tablespecificuserrights td,
-#tabledatabases td {
-    vertical-align: middle;
-}
-/* end server privileges */
-
-
-/* Heading */
-#topmenucontainer {
-    padding-<?php echo $right; ?>: 1em;
-    width: 100%;
-}
-
-#serverinfo {
-    background: #888;
-    padding: .3em .9em;
-    padding-<?php echo $left; ?>: 2.2em;
-    text-shadow: 0 1px 0 #000;
-    width: 10000px;
-    overflow: hidden;
-}
-
-#serverinfo .item {
-    white-space: nowrap;
-    color: #fff;
-}
-
-#page_nav_icons {
-    position: fixed;
-    top: 0;
-    <?php echo $right; ?>: 0;
-    z-index: 99;
-    padding: .25em 0;
-}
-
-#goto_pagetop, #lock_page_icon, #page_settings_icon {
-    padding: .25em;
-    background: #888;
-}
-
-#page_settings_icon {
-    cursor: pointer;
-    display: none;
-}
-
-#page_settings_modal {
-    display: none;
-}
-
-#pma_navigation_settings {
-    display: none;
-}
-
-#span_table_comment {
-    font-weight: bold;
-    font-style: italic;
-    white-space: nowrap;
-    margin-left: 10px;
-    color: #D6D6D6;
-    text-shadow: none;
-}
-
-#serverinfo img {
-    margin: 0 .1em 0;
-    margin-<?php echo $left; ?>: .2em;
-}
-
-
-#textSQLDUMP {
-    width: 95%;
-    height: 95%;
-    font-family: Consolas, "Courier New", Courier, mono;
-    font-size: 110%;
-}
-
-#TooltipContainer {
-    position: absolute;
-    z-index: 99;
-    width: 20em;
-    height: auto;
-    overflow: visible;
-    visibility: hidden;
-    background-color: #ffffcc;
-    color: #006600;
-    border: .1em solid #000;
-    padding: .5em;
-}
-
-/* user privileges */
-#fieldset_add_user_login div.item {
-    border-bottom: 1px solid silver;
-    padding-bottom: .3em;
-    margin-bottom: .3em;
-}
-
-#fieldset_add_user_login label {
-    float: <?php echo $left; ?>;
-    display: block;
-    width: 10em;
-    max-width: 100%;
-    text-align: <?php echo $right; ?>;
-    padding-<?php echo $right; ?>: .5em;
-}
-
-#fieldset_add_user_login span.options #select_pred_username,
-#fieldset_add_user_login span.options #select_pred_hostname,
-#fieldset_add_user_login span.options #select_pred_password {
-    width: 100%;
-    max-width: 100%;
-}
-
-#fieldset_add_user_login span.options {
-    float: <?php echo $left; ?>;
-    display: block;
-    width: 12em;
-    max-width: 100%;
-    padding-<?php echo $right; ?>: .5em;
-}
-
-#fieldset_add_user_login input {
-    width: 12em;
-    clear: <?php echo $right; ?>;
-    max-width: 100%;
-}
-
-#fieldset_add_user_login span.options input {
-    width: auto;
-}
-
-#fieldset_user_priv div.item {
-    float: <?php echo $left; ?>;
-    width: 9em;
-    max-width: 100%;
-}
-
-#fieldset_user_priv div.item div.item {
-    float: none;
-}
-
-#fieldset_user_priv div.item label {
-    white-space: nowrap;
-}
-
-#fieldset_user_priv div.item select {
-    width: 100%;
-}
-
-#fieldset_user_global_rights fieldset {
-    float: <?php echo $left; ?>;
-}
-
-#fieldset_user_group_rights fieldset {
-    float: <?php echo $left; ?>;
-}
-
-#fieldset_user_global_rights>legend input {
-    margin-<?php echo $left; ?>: 2em;
-}
-/* end user privileges */
-
-
-/* serverstatus */
-
-.linkElem:hover {
-    text-decoration: underline;
-    color: #235a81;
-    cursor: pointer;
-}
-
-h3#serverstatusqueries span {
-    font-size: 60%;
-    display: inline;
-}
-
-.buttonlinks {
-    float: <?php echo $right; ?>;
-    white-space: nowrap;
-}
-
-/* Also used for the variables page */
-fieldset#tableFilter {
-    margin-bottom: 1em;
-}
-
-div#serverStatusTabs {
-    margin-top: 1em;
-}
-
-caption a.top {
-    float: <?php echo $right; ?>;
-}
-
-div#serverstatusquerieschart {
-    float: <?php echo $left; ?>;
-    width: 500px;
-    height: 350px;
-    padding-<?php echo $left; ?>: 30px;
-}
-
-table#serverstatusqueriesdetails,
-table#serverstatustraffic {
-    float: <?php echo $left; ?>;
-}
-
-table#serverstatusqueriesdetails th {
-    min-width: 35px;
-}
-
-table#serverstatusvariables {
-    width: 100%;
-    margin-bottom: 1em;
-}
-table#serverstatusvariables .name {
-    width: 18em;
-    white-space: nowrap;
-}
-table#serverstatusvariables .value {
-    width: 6em;
-}
-table#serverstatusconnections {
-    float: <?php echo $left; ?>;
-    margin-<?php echo $left; ?>: 30px;
-}
-
-div#serverstatus table tbody td.descr a,
-div#serverstatus table .tblFooters a {
-    white-space: nowrap;
-}
-
-div.liveChart {
-    clear: both;
-    min-width: 500px;
-    height: 400px;
-    padding-bottom: 80px;
-}
-
-#addChartDialog input[type="text"] {
-    margin: 0;
-    padding: 3px;
-}
-
-div#chartVariableSettings {
-    border: 1px solid #ddd;
-    background-color: #E6E6E6;
-    margin-left: 10px;
-}
-
-table#chartGrid td {
-    padding: 3px;
-    margin: 0;
-}
-
-table#chartGrid div.monitorChart {
-    background: #EBEBEB;
-    overflow: hidden;
-    border: none;
-}
-
-div.tabLinks {
-    margin-left: 0.3em;
-    float: <?php echo $left; ?>;
-    padding: 5px 0;
-}
-
-div.tabLinks a, div.tabLinks label {
-    margin-right: 7px;
-}
-
-div.tabLinks .icon {
-    margin: -0.2em 0.3em 0 0;
-}
-
-.popupContent {
-    display: none;
-    position: absolute;
-    border: 1px solid #CCC;
-    margin: 0;
-    padding: 3px;
-    -moz-box-shadow: <?php echo $GLOBALS['text_dir'] === 'rtl' ? '-' : ''; ?>2px 2px 3px #666;
-    -webkit-box-shadow: <?php echo $GLOBALS['text_dir'] === 'rtl' ? '-' : ''; ?>2px 2px 3px #666;
-    box-shadow: <?php echo $GLOBALS['text_dir'] === 'rtl' ? '-' : ''; ?>2px 2px 3px #666;
-    background-color: #fff;
-    z-index: 2;
-}
-
-div#logTable {
-    padding-top: 10px;
-    clear: both;
-}
-
-div#logTable table {
-    width: 100%;
-}
-
-div#queryAnalyzerDialog {
-    min-width: 700px;
-}
-
-div#queryAnalyzerDialog div.CodeMirror-scroll {
-    height: auto;
-}
-
-div#queryAnalyzerDialog div#queryProfiling {
-    height: 300px;
-}
-
-div#queryAnalyzerDialog td.explain {
-    width: 250px;
-}
-
-div#queryAnalyzerDialog table.queryNums {
-    display: none;
-    border: 0;
-    text-align: left;
-}
-
-.smallIndent {
-    padding-<?php echo $left; ?>: 7px;
-}
-
-/* end serverstatus */
-
-/* server variables */
-#serverVariables {
-    table-layout: fixed;
-    width: 100%;
-}
-#serverVariables .var-row > td {
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    line-height: 2em;
-}
-#serverVariables .var-header {
-    color: <?php echo $GLOBALS['cfg']['ThColor']; ?>;
-    background: #f3f3f3;
-    <?php echo $_SESSION['PMA_Theme']->getCssGradient('ffffff', 'cccccc'); ?>
-    font-weight: bold;
-}
-#serverVariables .var-header {
-    text-align: <?php echo $left; ?>;
-}
-#serverVariables .var-row {
-    padding: 0.5em;
-    min-height: 18px;
-}
-#serverVariables .var-action {
-    width: 120px;
-}
-#serverVariables .var-name {
-    float: <?php echo $left; ?>;
-    font-weight: bold;
-}
-#serverVariables .var-name.session {
-    font-weight: normal;
-    font-style: italic;
-}
-#serverVariables .var-value {
-    width: 50%;
-    float: <?php echo $right; ?>;
-    text-align: <?php echo $right; ?>;
-}
-#serverVariables .var-doc {
-    overflow:visible;
-    float: <?php echo $right; ?>;
-}
-
-/* server variables editor */
-#serverVariables .editLink {
-    padding-<?php echo $right; ?>: 1em;
-    float: <?php echo $left; ?>;
-    font-family: sans-serif;
-}
-#serverVariables .serverVariableEditor {
-    width: 100%;
-    overflow: hidden;
-}
-#serverVariables .serverVariableEditor input {
-    width: 100%;
-    margin: 0 0.5em;
-    box-sizing: border-box;
-    -ms-box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    -webkit-box-sizing: border-box;
-    height: 2.2em;
-}
-#serverVariables .serverVariableEditor div {
-    display: block;
-    overflow: hidden;
-    padding-<?php echo $right; ?>: 1em;
-}
-#serverVariables .serverVariableEditor a {
-    float: <?php echo $right; ?>;
-    margin: 0 0.5em;
-    line-height: 2em;
-}
-/* end server variables */
-
-
-p.notice {
-    margin: 1.5em 0;
-    border: 1px solid #000;
-    background-repeat: no-repeat;
-    <?php if ($GLOBALS['text_dir'] === 'ltr') : ?>
-        background-position: 10px 50%;
-        padding: 10px 10px 10px 25px;
-    <?php else : ?>
-        background-position: 99% 50%;
-        padding: 25px 10px 10px 10px
-    <?php endif; ?>
-    -moz-border-radius: 5px;
-    -webkit-border-radius: 5px;
-    border-radius: 5px;
-    -moz-box-shadow: 0 1px 2px #fff inset;
-    -webkit-box-shadow: 0 1px 2px #fff inset;
-    box-shadow: 0 1px 2px #fff inset;
-    background: #555;
-    color: #d4fb6a;
-}
-
-p.notice a {
-    color: #fff;
-    text-decoration: underline;
-}
-
-/* profiling */
-
-div#profilingchart {
-    width: 850px;
-    height: 370px;
-    float: <?php echo $left; ?>;
-}
-
-#profilingchart .jqplot-highlighter-tooltip{
-    top: auto !important;
-    left: 11px;
-    bottom:24px;
-}
-/* end profiling */
-
-/* table charting */
-#resizer {
-    border: 1px solid silver;
-}
-#inner-resizer { /* make room for the resize handle */
-    padding: 10px;
-}
-.chartOption {
-    float: <?php echo $left; ?>;
-    margin-<?php echo $right;?>: 40px;
-}
-/* end table charting */
-
-/* querybox */
-
-#togglequerybox {
-    margin: 0 10px;
-}
-
-#serverstatus h3
-{
-    margin: 15px 0;
-    font-weight: normal;
-    color: #999;
-    font-size: 1.7em;
-}
-#sectionlinks {
-    padding: 16px;
-    background: #f3f3f3;
-    border: 1px solid #aaa;
-    border-radius: 5px;
-    -webkit-border-radius: 5px;
-    -moz-border-radius: 5px;
-    box-shadow: 0 1px 1px #fff inset;
-    -webkit-box-shadow: 0 1px 1px #fff inset;
-    -moz-box-shadow: 0 1px 1px #fff inset;
-}
-#sectionlinks a,
-.buttonlinks a,
-a.button {
-    font-weight: bold;
-    text-shadow: 0 1px 0 #fff;
-    line-height: 35px;
-    margin-<?php echo $left; ?>: 7px;
-    border: 1px solid #aaa;
-    padding: 3px 7px;
-    color: #111 !important;
-    text-decoration: none;
-    background: #ddd;
-    white-space: nowrap;
-    border-radius: 20px;
-    -webkit-border-radius: 20px;
-    -moz-border-radius: 20px;
-    <?php echo $_SESSION['PMA_Theme']->getCssGradient('f8f8f8', 'd8d8d8'); ?>
-}
-#sectionlinks a:hover,
-.buttonlinks a:hover,
-a.button:hover {
-    <?php echo $_SESSION['PMA_Theme']->getCssGradient('ffffff', 'dddddd'); ?>
-}
-
-div#sqlquerycontainer {
-    float: <?php echo $left; ?>;
-    width: 69%;
-    /* height: 15em; */
-}
-
-div#tablefieldscontainer {
-    float: <?php echo $right; ?>;
-    width: 29%;
-    margin-top: -20px;
-    /* height: 15em; */
-}
-
-div#tablefieldscontainer select {
-    width: 100%;
-    background: #fff;
-    /* height: 12em; */
-}
-
-textarea#sqlquery {
-    width: 100%;
-    /* height: 100%; */
-    -moz-border-radius: 4px;
-    -webkit-border-radius: 4px;
-    border-radius: 4px;
-    border: 1px solid #aaa;
-    padding: 5px;
-    font-family: inherit;
-}
-textarea#sql_query_edit {
-    height: 7em;
-    width: 95%;
-    display: block;
-}
-div#queryboxcontainer div#bookmarkoptions {
-    margin-top: .5em;
-}
-/* end querybox */
-
-/* main page */
-#maincontainer {
-    /* background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('logo_right.png');?>); */
-    /* background-position: <?php echo $right; ?> bottom; */
-    /* background-repeat: no-repeat; */
-}
-
-#mysqlmaininformation,
-#pmamaininformation {
-    float: <?php echo $left; ?>;
-    width: 49%;
-}
-
-#maincontainer ul {
-    list-style-type: disc;
-    vertical-align: middle;
-}
-
-#maincontainer li {
-    margin-bottom: .3em;
-}
-
-#full_name_layer {
-    position: absolute;
-    padding: 2px;
-    margin-top: -3px;
-    z-index: 801;
-
-    border-radius: 3px;
-    border: solid 1px #888;
-    background: #fff;
-
-}
-/* end main page */
-
-
-/* iconic view for ul items */
-
-li.no_bullets {
-    list-style-type:none !important;
-    margin-left: -25px !important;      //align with other list items which have bullets
-}
-
-/* end iconic view for ul items */
-
-#body_browse_foreigners {
-    background: <?php echo $GLOBALS['cfg']['NaviBackground']; ?>;
-    margin: .5em .5em 0 .5em;
-}
-
-#bodythemes {
-    width: 500px;
-    margin: auto;
-    text-align: center;
-}
-
-#bodythemes img {
-    border: .1em solid #000;
-}
-
-#bodythemes a:hover img {
-    border: .1em solid red;
-}
-
-#fieldset_select_fields {
-    float: <?php echo $left; ?>;
-}
-
-#selflink {
-    clear: both;
-    display: block;
-    margin-top: 1em;
-    margin-bottom: 1em;
-    width: 98%;
-    margin-<?php echo $left; ?>: 1%;
-    border-top: .1em solid silver;
-    text-align: <?php echo $right; ?>;
-}
-
-#table_innodb_bufferpool_usage,
-#table_innodb_bufferpool_activity {
-    float: <?php echo $left; ?>;
-}
-
-#div_mysql_charset_collations table {
-    float: <?php echo $left; ?>;
-}
-
-#div_mysql_charset_collations table th,
-#div_mysql_charset_collations table td {
-    padding: 0.4em;
-}
-
-#div_mysql_charset_collations table th#collationHeader {
-    width: 35%;
-}
-
-.operations_half_width {
-    width: 48%;
-    float: <?php echo $left; ?>;
-}
-.operations_half_width input[type=text],
-.operations_half_width input[type=password],
-.operations_half_width input[type=number],
-.operations_half_width select {
-    width: 95%;
-}
-.operations_half_width input[type=text].halfWidth,
-.operations_half_width input[type=password].halfWidth,
-.operations_half_width input[type=number].halfWidth,
-.operations_half_width select.halfWidth {
-    width: 40%;
-}
-.operations_half_width ul {
-    list-style-type: none;
-    padding: 0;
-}
-.operations_full_width {
-    width: 100%;
-    clear: both;
-}
-
-#qbe_div_table_list {
-    float: <?php echo $left; ?>;
-}
-
-#qbe_div_sql_query {
-    float: <?php echo $left; ?>;
-}
-
-label.desc {
-    width: 30em;
-    float: <?php echo $left; ?>;
-}
-
-label.desc sup {
-    position: absolute;
-}
-
-code.php {
-    display: block;
-    padding-left: 1em;
-    margin-top: 0;
-    margin-bottom: 0;
-    max-height: 10em;
-    overflow: auto;
-    direction: ltr;
-}
-
-code.sql,
-div.sqlvalidate {
-    display: block;
-    padding: 1em;
-    margin-top: 0;
-    margin-bottom: 0;
-    max-height: 10em;
-    overflow: auto;
-    direction: ltr;
-}
-
-.result_query div.sqlOuter {
-    background: <?php echo $GLOBALS['cfg']['BgOne']; ?>;
-}
-
-.result_query .success, .result_query .error {
-    margin-bottom: 0;
-    border-bottom: none !important;
-    border-bottom-left-radius: 0;
-    border-bottom-right-radius: 0;
-    padding-bottom: 5px;
-}
-
-#PMA_slidingMessage code.sql,
-div.sqlvalidate {
-    background: <?php echo $GLOBALS['cfg']['BgOne']; ?>;
-}
-
-#main_pane_left {
-    width: 60%;
-    min-width: 260px;
-    float: <?php echo $left; ?>;
-    padding-top: 1em;
-}
-
-#main_pane_right {
-    overflow: hidden;
-    min-width: 160px;
-    padding-top: 1em;
-    padding-<?php echo $left; ?>: 1em;
-    padding-<?php echo $right; ?>: .5em;
-}
-
-.group {
-
-    border: 1px solid #999;
-    background: #f3f3f3;
-    -moz-border-radius: 4px;
-    -webkit-border-radius: 4px;
-    border-radius: 4px;
-    -moz-box-shadow: <?php echo $GLOBALS['text_dir'] === 'rtl' ? '-' : ''; ?>2px 2px 5px #ccc;
-    -webkit-box-shadow: <?php echo $GLOBALS['text_dir'] === 'rtl' ? '-' : ''; ?>2px 2px 5px #ccc;
-    box-shadow: <?php echo $GLOBALS['text_dir'] === 'rtl' ? '-' : ''; ?>2px 2px 5px #ccc;
-    margin-bottom: 1em;
-    padding-bottom: 1em;
-}
-
-.group h2 {
-    background-color: #bbb;
-    padding: .1em .3em;
-    margin-top: 0;
-    color: #fff;
-    font-size: 1.6em;
-    font-weight: normal;
-    text-shadow: 0 1px 0 #777;
-    -moz-box-shadow: <?php echo $GLOBALS['text_dir'] === 'rtl' ? '-' : ''; ?>1px 1px 15px #999 inset;
-    -webkit-box-shadow: <?php echo $GLOBALS['text_dir'] === 'rtl' ? '-' : ''; ?>1px 1px 15px #999 inset;
-    box-shadow: <?php echo $GLOBALS['text_dir'] === 'rtl' ? '-' : ''; ?>1px 1px 15px #999 inset;
-}
-
-.group-cnt {
-    padding: 0;
-    padding-<?php echo $left; ?>: .5em;
-    display: inline-block;
-    width: 98%;
-}
-
-textarea#partitiondefinition {
-    height: 3em;
-}
-
-
-/* for elements that should be revealed only via js */
-.hide {
-    display: none;
-}
-
-#list_server {
-    list-style-type: none;
-    padding: 0;
-}
-
-/**
-  *  Progress bar styles
-  */
-div.upload_progress
-{
-    width: 400px;
-    margin: 3em auto;
-    text-align: center;
-}
-
-div.upload_progress_bar_outer
-{
-    border: 1px solid #000;
-    width: 202px;
-    position: relative;
-    margin: 0 auto 1em;
-    color: <?php echo $GLOBALS['cfg']['MainColor']; ?>;
-}
-
-div.upload_progress_bar_inner
-{
-    background-color: <?php echo $GLOBALS['cfg']['NaviPointerBackground']; ?>;
-    width: 0;
-    height: 12px;
-    margin: 1px;
-    overflow: hidden;
-    color: <?php echo $GLOBALS['cfg']['BrowseMarkerColor']; ?>;
-    position: relative;
-}
-
-div.upload_progress_bar_outer div.percentage
-{
-    position: absolute;
-    top: 0;
-    <?php echo $left; ?>: 0;
-    width: 202px;
-}
-
-div.upload_progress_bar_inner div.percentage
-{
-    top: -1px;
-    <?php echo $left; ?>: -1px;
-}
-
-div#statustext {
-    margin-top: .5em;
-}
-
-table#serverconnection_src_remote,
-table#serverconnection_trg_remote,
-table#serverconnection_src_local,
-table#serverconnection_trg_local  {
-  float: <?php echo $left; ?>;
-}
-/**
-  *  Validation error message styles
-  */
-input[type=text].invalid_value,
-input[type=password].invalid_value,
-input[type=number].invalid_value,
-input[type=date].invalid_value,
-select.invalid_value,
-.invalid_value {
-    background: #FFCCCC;
-}
-
-/**
-  *  Ajax notification styling
-  */
- .ajax_notification {
-    top: 0;           /** The notification needs to be shown on the top of the page */
-    position: fixed;
-    margin-top: 0;
-    margin-right: auto;
-    margin-bottom: 0;
-    margin-<?php echo $left; ?>: auto;
-    padding: 5px;   /** Keep a little space on the sides of the text */
-    width: 350px;
-
-    z-index: 1100;      /** If this is not kept at a high z-index, the jQueryUI modal dialogs (z-index: 1000) might hide this */
-    text-align: center;
-    display: inline;
-    left: 0;
-    right: 0;
-    background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('ajax_clock_small.gif');?>);
-    background-repeat: no-repeat;
-    background-position: 2%;
-    border: 1px solid #e2b709;
- }
-
-/* additional styles */
-.ajax_notification {
-    margin-top: 200px;
-    background: #ffe57e;
-    border-radius: 5px;
-    -moz-border-radius: 5px;
-    -webkit-border-radius: 5px;
-    box-shadow: 0 5px 90px #888;
-    -moz-box-shadow: 0 5px 90px #888;
-    -webkit-box-shadow: 0 5px 90px #888;
-}
-
-#loading_parent {
-    /** Need this parent to properly center the notification division */
-    position: relative;
-    width: 100%;
- }
-/**
-  * Export and Import styles
-  */
-
-.export_table_list_container {
-    display: inline-block;
-    max-height: 20em;
-    overflow-y: scroll;
-}
-
-.export_table_select th {
-    text-align: center;
-    vertical-align: middle;
-}
-
-.export_table_select .all {
-    font-weight: bold;
-    border-bottom: 1px solid black;
-}
-
-.export_structure, .export_data {
-    text-align: center;
-}
-
-.export_table_name {
-    vertical-align: middle;
-}
-
-.exportoptions h3,
-.importoptions h3 {
-    border-bottom: 1px #999 solid;
-    font-size: 110%;
-}
-
-.exportoptions ul,
-.importoptions ul,
-.format_specific_options ul {
-    list-style-type: none;
-    margin-bottom: 15px;
-}
-
-.exportoptions li,
-.importoptions li {
-    margin: 7px;
-}
-.exportoptions label,
-.importoptions label,
-.exportoptions p,
-.importoptions p {
-    margin: 5px;
-    float: none;
-}
-
-#csv_options label.desc,
-#ldi_options label.desc,
-#latex_options label.desc,
-#output label.desc {
-    float: <?php echo $left; ?>;
-    width: 15em;
-}
-
-.exportoptions,
-.importoptions {
-    margin: 20px 30px 30px;
-    margin-<?php echo $left; ?>: 10px;
-}
-
-.exportoptions #buttonGo,
-.importoptions #buttonGo {
-    font-weight: bold;
-    margin-<?php echo $left; ?>: 14px;
-    border: 1px solid #aaa;
-    padding: 5px 12px;
-    color: #111;
-    text-decoration: none;
-
-    border-radius: 12px;
-    -webkit-border-radius: 12px;
-    -moz-border-radius: 12px;
-
-    text-shadow: 0 1px 0 #fff;
-
-    <?php echo $_SESSION['PMA_Theme']->getCssGradient('ffffff', 'cccccc'); ?>
-    cursor: pointer;
-}
-
-.format_specific_options h3 {
-    margin: 10px 0 0;
-    margin-<?php echo $left; ?>: 10px;
-    border: 0;
-}
-
-.format_specific_options {
-    border: 1px solid #999;
-    margin: 7px 0;
-    padding: 3px;
-}
-
-p.desc {
-    margin: 5px;
-}
-
-/**
-  * Export styles only
-  */
-select#db_select,
-select#table_select {
-    width: 400px;
-}
-
-.export_sub_options {
-    margin: 20px 0 0;
-    margin-<?php echo $left; ?>: 30px;
-}
-
-.export_sub_options h4 {
-    border-bottom: 1px #999 solid;
-}
-
-.export_sub_options li.subgroup {
-    display: inline-block;
-    margin-top: 0;
-}
-
-.export_sub_options li {
-    margin-bottom: 0;
-}
-
-#output_quick_export {
-    display: none;
-}
-/**
- * Import styles only
- */
-
-.importoptions #import_notification {
-    margin: 10px 0;
-    font-style: italic;
-}
-
-input#input_import_file {
-    margin: 5px;
-}
-
-.formelementrow {
-    margin: 5px 0 5px 0;
-}
-
-#popup_background {
-    display: none;
-    position: fixed;
-    _position: absolute; /* hack for IE6 */
-    width: 100%;
-    height: 100%;
-    top: 0;
-    <?php echo $left; ?>: 0;
-    background: #000;
-    z-index: 1000;
-    overflow: hidden;
-}
-
-/**
- * Table structure styles
- */
-#fieldsForm ul.table-structure-actions {
-    margin: 0;
-    padding: 0;
-    list-style: none;
-}
-#fieldsForm ul.table-structure-actions li {
-    float: <?php echo $left; ?>;
-    margin-<?php echo $right; ?>: 0.3em; /* same as padding of "table td" */
-}
-#fieldsForm ul.table-structure-actions .submenu li {
-    padding: 0;
-    margin: 0;
-}
-#fieldsForm ul.table-structure-actions .submenu li span {
-    padding: 0.3em;
-    margin: 0.1em;
-}
-#structure-action-links a {
-    margin-<?php echo $right; ?>: 1em;
-}
-#addColumns input[type="radio"] {
-    margin: 3px 0 0;
-    margin-<?php echo $left; ?>: 1em;
-}
-/**
- * Indexes
- */
-#index_frm .index_info input,
-#index_frm .index_info select {
-    width: 14em;
-    margin: 0;
-    box-sizing: border-box;
-    -ms-box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    -webkit-box-sizing: border-box;
-}
-
-#index_frm .index_info div {
-    padding: .2em 0;
-}
-
-#index_frm .index_info .label {
-    float: <?php echo $left; ?>;
-    min-width: 12em;
-}
-
-#index_frm .slider {
-    width: 10em;
-    margin: .6em;
-    float: <?php echo $left; ?>;
-}
-
-#index_frm .add_fields {
-    float: <?php echo $left; ?>;
-}
-
-#index_frm .add_fields input {
-    margin-<?php echo $left; ?>: 1em;
-}
-
-#index_frm input {
-    margin: 0;
-}
-
-#index_frm td {
-    vertical-align: middle;
-}
-
-table#index_columns {
-    width: 100%;
-}
-
-table#index_columns select {
-    width: 85%;
-    float: right;
-}
-
-#move_columns_dialog div {
-    padding: 1em;
-}
-
-#move_columns_dialog ul {
-    list-style: none;
-    margin: 0;
-    padding: 0;
-}
-
-#move_columns_dialog li {
-    background: <?php echo $GLOBALS['cfg']['ThBackground']; ?>;
-    border: 1px solid #aaa;
-    color: <?php echo $GLOBALS['cfg']['ThColor']; ?>;
-    font-weight: bold;
-    margin: .4em;
-    padding: .2em;
-    -webkit-border-radius: 2px;
-    -moz-border-radius: 2px;
-    border-radius: 2px;
-}
-
-/* config forms */
-.config-form ul.tabs {
-    margin: 1.1em .2em 0;
-    padding: 0 0 .3em 0;
-    list-style: none;
-    font-weight: bold;
-}
-
-.config-form ul.tabs li {
-    float: <?php echo $left; ?>;
-    margin-bottom: -1px;
-}
-
-.config-form ul.tabs li a {
-    display: block;
-    margin: .1em .2em 0;
-    white-space: nowrap;
-    text-decoration: none;
-    border: 1px solid <?php echo $GLOBALS['cfg']['BgTwo']; ?>;
-    border-bottom: 1px solid #aaa;
-}
-
-.config-form ul.tabs li a {
-    padding: 7px 10px;
-    -webkit-border-radius: 5px 5px 0 0;
-    -moz-border-radius: 5px 5px 0 0;
-    border-radius: 5px 5px 0 0;
-    background: #f2f2f2;
-    color: #555;
-    text-shadow: 0 1px 0 #fff;
-}
-
-.config-form ul.tabs li a:hover,
-.config-form ul.tabs li a:active {
-    background: #e5e5e5;
-}
-
-.config-form ul.tabs li.active a {
-    background-color: #fff;
-    margin-top: 1px;
-    color: #000;
-    text-shadow: none;
-    border-color: #aaa;
-    border-bottom: 1px solid #fff;
-}
-
-.config-form fieldset {
-    margin-top: 0;
-    padding: 0;
-    clear: both;
-    -webkit-border-radius: 0;
-    -moz-border-radius: 0;
-    border-radius: 0;
-}
-
-.config-form legend {
-    display: none;
-}
-
-.config-form fieldset p {
-    margin: 0;
-    padding: .5em;
-    background: #fff;
-    border-top: 0;
-}
-
-.config-form fieldset .errors { /* form error list */
-    margin: 0 -2px 1em;
-    padding: .5em 1.5em;
-    background: #FBEAD9;
-    border: 0 #C83838 solid;
-    border-width: 1px 0;
-    list-style: none;
-    font-family: sans-serif;
-    font-size: small;
-}
-
-.config-form fieldset .inline_errors { /* field error list */
-    margin: .3em .3em .3em;
-    margin-<?php echo $left; ?>: 0;
-    padding: 0;
-    list-style: none;
-    color: #9A0000;
-    font-size: small;
-}
-
-.config-form fieldset th {
-    padding: .3em .3em .3em;
-    padding-<?php echo $left; ?>: .5em;
-    text-align: <?php echo $left; ?>;
-    vertical-align: top;
-    width: 40%;
-    background: transparent;
-    filter: none;
-}
-
-.config-form fieldset .doc,
-.config-form fieldset .disabled-notice {
-    margin-<?php echo $left; ?>: 1em;
-}
-
-.config-form fieldset .disabled-notice {
-    font-size: 80%;
-    text-transform: uppercase;
-    color: #E00;
-    cursor: help;
-}
-
-.config-form fieldset td {
-    padding-top: .3em;
-    padding-bottom: .3em;
-    vertical-align: top;
-}
-
-.config-form fieldset th small {
-    display: block;
-    font-weight: normal;
-    font-family: sans-serif;
-    font-size: x-small;
-    color: #444;
-}
-
-.config-form fieldset th,
-.config-form fieldset td {
-    border-top: 1px <?php echo $GLOBALS['cfg']['BgTwo']; ?> solid;
-    border-<?php echo $right; ?>: none;
-}
-
-fieldset .group-header th {
-    background: <?php echo $GLOBALS['cfg']['BgTwo']; ?>;
-}
-
-fieldset .group-header + tr th {
-    padding-top: .6em;
-}
-
-fieldset .group-field-1 th,
-fieldset .group-header-2 th {
-    padding-<?php echo $left; ?>: 1.5em;
-}
-
-fieldset .group-field-2 th,
-fieldset .group-header-3 th {
-    padding-<?php echo $left; ?>: 3em;
-}
-
-fieldset .group-field-3 th {
-    padding-<?php echo $left; ?>: 4.5em;
-}
-
-fieldset .disabled-field th,
-fieldset .disabled-field th small,
-fieldset .disabled-field td {
-    color: #666;
-    background-color: #ddd;
-}
-
-.config-form .lastrow {
-    border-top: 1px #000 solid;
-}
-
-.config-form .lastrow {
-    background: <?php echo $GLOBALS['cfg']['ThBackground']; ?>;
-    padding: .5em;
-    text-align: center;
-}
-
-.config-form .lastrow input {
-    font-weight: bold;
-}
-
-/* form elements */
-
-.config-form span.checkbox {
-    padding: 2px;
-    display: inline-block;
-}
-
-.config-form .custom { /* customized field */
-    background: #FFC;
-}
-
-.config-form span.checkbox.custom {
-    padding: 1px;
-    border: 1px #EDEC90 solid;
-    background: #FFC;
-}
-
-.config-form .field-error {
-    border-color: #A11 !important;
-}
-
-.config-form input[type="text"],
-.config-form input[type="password"],
-.config-form input[type="number"],
-.config-form select,
-.config-form textarea {
-    border: 1px #A7A6AA solid;
-    height: auto;
-}
-
-.config-form input[type="text"]:focus,
-.config-form input[type="password"]:focus,
-.config-form input[type="number"]:focus,
-.config-form select:focus,
-.config-form textarea:focus {
-    border: 1px #6676FF solid;
-    background: #F7FBFF;
-}
-
-.config-form .field-comment-mark {
-    font-family: serif;
-    color: #007;
-    cursor: help;
-    padding: 0 .2em;
-    font-weight: bold;
-    font-style: italic;
-}
-
-.config-form .field-comment-warning {
-    color: #A00;
-}
-
-/* error list */
-.config-form dd {
-    margin-<?php echo $left; ?>: .5em;
-}
-
-.config-form dd:before {
-    content: "\25B8  ";
-}
-
-.click-hide-message {
-    cursor: pointer;
-}
-
-.prefsmanage_opts {
-    margin-<?php echo $left; ?>: 2em;
-}
-
-#prefs_autoload {
-    margin-bottom: .5em;
-    margin-left: .5em;
-}
-
-#placeholder .button {
-    position: absolute;
-    cursor: pointer;
-}
-
-#placeholder div.button {
-    font-size: smaller;
-    color: #999;
-    background-color: #eee;
-    padding: 2px;
-}
-
-.wrapper {
-    float: <?php echo $left; ?>;
-    margin-bottom: 1.5em;
-}
-.toggleButton {
-    position: relative;
-    cursor: pointer;
-    font-size: .8em;
-    text-align: center;
-    line-height: 1.4em;
-    height: 1.55em;
-    overflow: hidden;
-    border-right: .1em solid #888;
-    border-left: .1em solid #888;
-    -webkit-border-radius: .3em;
-    -moz-border-radius: .3em;
-    border-radius: .3em;
-}
-.toggleButton table,
-.toggleButton td,
-.toggleButton img {
-    padding: 0;
-    position: relative;
-}
-.toggleButton .container {
-    position: absolute;
-}
-.toggleButton .container td {
-    background-image: none;
-    background: none;
-}
-.toggleButton .toggleOn {
-    color: #fff;
-    padding: 0 1em;
-    text-shadow: 0 0 .2em #000;
-}
-.toggleButton .toggleOff {
-    padding: 0 1em;
-}
-
-.doubleFieldset fieldset {
-    width: 48%;
-    float: <?php echo $left; ?>;
-    padding: 0;
-}
-.doubleFieldset fieldset.left {
-    margin-<?php echo $right; ?>: 1%;
-}
-.doubleFieldset fieldset.right {
-    margin-<?php echo $left; ?>: 1%;
-}
-.doubleFieldset legend {
-    margin-<?php echo $left; ?>: 1.5em;
-}
-.doubleFieldset div.wrap {
-    padding: 1.5em;
-}
-
-#table_name_col_no_outer {
-    margin-top: 45px;
-}
-
-#table_name_col_no {
-    position: fixed;
-    top: 55px;
-    width: 100%;
-    background: #ffffff;
-}
-
-#table_columns input[type="text"],
-#table_columns input[type="password"],
-#table_columns input[type="number"],
-#table_columns select {
-    width: 10em;
-    box-sizing: border-box;
-    -ms-box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    -webkit-box-sizing: border-box;
-}
-
-#placeholder {
-    position: relative;
-    border: 1px solid #aaa;
-    float: <?php echo $right; ?>;
-    overflow: hidden;
-}
-
-.placeholderDrag {
-    cursor: move;
-}
-
-#placeholder .button {
-    position: absolute;
-}
-
-#left_arrow {
-    left: 8px;
-    top: 26px;
-}
-
-#right_arrow {
-    left: 26px;
-    top: 26px;
-}
-
-#up_arrow {
-    left: 17px;
-    top: 8px;
-}
-
-#down_arrow {
-    left: 17px;
-    top: 44px;
-}
-
-#zoom_in {
-    left: 17px;
-    top: 67px;
-}
-
-#zoom_world {
-    left: 17px;
-    top: 85px;
-}
-
-#zoom_out {
-    left: 17px;
-    top: 103px;
-}
-
-.colborder {
-    cursor: col-resize;
-    height: 100%;
-    margin-<?php echo $left; ?>: -6px;
-    position: absolute;
-    width: 5px;
-}
-
-.colborder_active {
-    border-<?php echo $right; ?>: 2px solid #a44;
-}
-
-.pma_table td {
-    position: static;
-}
-
-.pma_table th.draggable span,
-.pma_table tbody td span {
-    display: block;
-    overflow: hidden;
-}
-
-.pma_table tbody td span code span {
-    display: inline;
-}
-
-.pma_table th.draggable.right span {
-    margin-<?php echo $right; ?>: 0px;
-}
-
-.pma_table th.draggable span {
-    margin-<?php echo $right; ?>: 10px;
-}
-
-.modal-copy input {
-    display: block;
-    width: 100%;
-    margin-top: 1.5em;
-    padding: .3em 0;
-}
-
-.cRsz {
-    position: absolute;
-}
-
-.cCpy {
-    background: #333;
-    color: #FFF;
-    font-weight: bold;
-    margin: .1em;
-    padding: .3em;
-    position: absolute;
-    text-shadow: -1px -1px #000;
-
-    -moz-box-shadow: 0 0 .7em #000;
-    -webkit-box-shadow: 0 0 .7em #000;
-    box-shadow: 0 0 .7em #000;
-    -moz-border-radius: .3em;
-    -webkit-border-radius: .3em;
-    border-radius: .3em;
-}
-
-.cPointer {
-    background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('col_pointer.png');?>);
-    height: 20px;
-    margin-<?php echo $left; ?>: -5px;  /* must be minus half of its width */
-    margin-top: -10px;
-    position: absolute;
-    width: 10px;
-}
-
-.tooltip {
-    background: #333 !important;
-    opacity: .8 !important;
-    border: 1px solid #000 !important;
-    -moz-border-radius: .3em !important;
-    -webkit-border-radius: .3em !important;
-    border-radius: .3em !important;
-    text-shadow: -1px -1px #000 !important;
-    font-size: .8em !important;
-    font-weight: bold !important;
-    padding: 1px 3px !important;
-}
-
-.tooltip * {
-    background: none !important;
-    color: #FFF !important;
-}
-
-.cDrop {
-    left: 0;
-    position: absolute;
-    top: 0;
-}
-
-.coldrop {
-    background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('col_drop.png');?>);
-    cursor: pointer;
-    height: 16px;
-    margin-<?php echo $left; ?>: .3em;
-    margin-top: .3em;
-    position: absolute;
-    width: 16px;
-}
-
-.coldrop:hover,
-.coldrop-hover {
-    background-color: #999;
-}
-
-.cList {
-    background: #EEE;
-    border: solid 1px #999;
-    position: absolute;
-    -moz-box-shadow: 0 .2em .5em #333;
-    -webkit-box-shadow: 0 .2em .5em #333;
-    box-shadow: 0 .2em .5em #333;
-}
-
-.cList .lDiv div {
-    padding: .2em .5em .2em;
-    padding-<?php echo $left; ?>: .2em;
-}
-
-.cList .lDiv div:hover {
-    background: #DDD;
-    cursor: pointer;
-}
-
-.cList .lDiv div input {
-    cursor: pointer;
-}
-
-.showAllColBtn {
-    border-bottom: solid 1px #999;
-    border-top: solid 1px #999;
-    cursor: pointer;
-    font-size: .9em;
-    font-weight: bold;
-    padding: .35em 1em;
-    text-align: center;
-}
-
-.showAllColBtn:hover {
-    background: #DDD;
-}
-
-.turnOffSelect {
-  -moz-user-select: none;
-  -khtml-user-select: none;
-  -webkit-user-select: none;
-  user-select: none;
-}
-
-.navigation {
-    margin: .8em 0;
-
-    border-radius: 5px;
-    -webkit-border-radius: 5px;
-    -moz-border-radius: 5px;
-
-    <?php echo $_SESSION['PMA_Theme']->getCssGradient('eeeeee', 'cccccc'); ?>
-}
-
-.navigation td {
-    margin: 0;
-    padding: 0;
-    vertical-align: middle;
-    white-space: nowrap;
-}
-
-.navigation_separator {
-    color: #999;
-    display: inline-block;
-    font-size: 1.5em;
-    text-align: center;
-    height: 1.4em;
-    width: 1.2em;
-    text-shadow: 1px 0 #FFF;
-}
-
-.navigation input[type=submit] {
-    background: none;
-    border: 0;
-    filter: none;
-    margin: 0;
-    padding: .8em .5em;
-
-    border-radius: 0;
-    -webkit-border-radius: 0;
-    -moz-border-radius: 0;
-}
-
-.navigation input[type=submit]:hover,
-.navigation input.edit_mode_active {
-    color: #fff;
-    cursor: pointer;
-    text-shadow: none;
-
-    <?php echo $_SESSION['PMA_Theme']->getCssGradient('333333', '555555'); ?>
-}
-
-.navigation select {
-    margin: 0 .8em;
-}
-
-.cEdit {
-    margin: 0;
-    padding: 0;
-    position: absolute;
-}
-
-.cEdit input[type=text] {
-    background: #FFF;
-    height: 100%;
-    margin: 0;
-    padding: 0;
-}
-
-.cEdit .edit_area {
-    background: #FFF;
-    border: 1px solid #999;
-    min-width: 10em;
-    padding: .3em .5em;
-}
-
-.cEdit .edit_area select,
-.cEdit .edit_area textarea {
-    width: 97%;
-}
-
-.cEdit .cell_edit_hint {
-    color: #555;
-    font-size: .8em;
-    margin: .3em .2em;
-}
-
-.cEdit .edit_box {
-    overflow-x: hidden;
-    overflow-y: scroll;
-    padding: 0;
-    margin: 0;
-}
-
-.cEdit .edit_box_posting {
-    background: #FFF url(<?php echo $_SESSION['PMA_Theme']->getImgPath('ajax_clock_small.gif');?>) no-repeat right center;
-    padding-<?php echo $right; ?>: 1.5em;
-}
-
-.cEdit .edit_area_loading {
-    background: #FFF url(<?php echo $_SESSION['PMA_Theme']->getImgPath('ajax_clock_small.gif');?>) no-repeat center;
-    height: 10em;
-}
-
-.cEdit .goto_link {
-    background: #EEE;
-    color: #555;
-    padding: .2em .3em;
-}
-
-.saving_edited_data {
-    background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('ajax_clock_small.gif');?>) no-repeat left;
-    padding-<?php echo $left; ?>: 20px;
-}
-
-.relationalTable select {
-    width: 125px;
-    margin-right: 5px;
-}
-
-/* css for timepicker */
-.ui-timepicker-div .ui-widget-header { margin-bottom: 8px; }
-.ui-timepicker-div dl { text-align: <?php echo $left; ?>; }
-.ui-timepicker-div dl dt { height: 25px; margin-bottom: -25px; }
-.ui-timepicker-div dl dd { margin: 0 10px 10px 85px; }
-.ui-timepicker-div td { font-size: 90%; }
-.ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; }
-.ui-timepicker-rtl { direction: rtl; }
-.ui-timepicker-rtl dl { text-align: right; }
-.ui-timepicker-rtl dl dd { margin: 0 65px 10px 10px; }
-
-input.btn {
-    color: #333;
-    background-color: #D0DCE0;
-}
-
-body .ui-widget {
-    font-size: 1em;
-}
-
-.ui-dialog fieldset legend a {
-    color: #235A81;
-}
-
-/* over-riding jqplot-yaxis class */
-.jqplot-yaxis {
-    left:0 !important;
-    min-width:25px;
-    width:auto;
-}
-.jqplot-axis {
-    overflow:hidden;
-}
-
-.report-data {
-    height:13em;
-    overflow:scroll;
-    width:570px;
-    border: solid 1px;
-    background: white;
-    padding: 2px;
-}
-
-.report-description {
-    height:10em;
-    width:570px;
-}
-
-div#page_content div#tableslistcontainer table.data {
-    border-top: 0.1px solid #EEEEEE;
-}
-
-div#page_content form#db_search_form.ajax fieldset {
-    margin-top: -0.3em;
-}
-
-div#page_content div#tableslistcontainer, div#page_content div.notice, div#page_content div.result_query {
-    margin-top: 1em;
-}
-
-table.show_create {
-    margin-top: 1em;
-}
-
-table.show_create td {
-    border-right: 1px solid #bbb;
-}
-
-#alias_modal table th {
-    vertical-align: middle;
-    padding-left: 1em;
-}
-
-#alias_modal label.col-2 {
-    min-width: 20%;
-    display: inline-block;
-}
-
-#alias_modal select {
-    width: 25%;
-    margin-right: 2em;
-}
-
-#alias_modal label {
-    font-weight: bold;
-}
-
-.ui-dialog {
-    position: fixed;
-}
-
-
-.small_font {
-    font-size: smaller;
-}
-
-/* Console styles */
-#pma_console_container {
-    width: 100%;
-    position: fixed;
-    bottom: 0;
-    <?php echo $left; ?>: 0;
-    z-index: 100;
-}
-#pma_console {
-    position: relative;
-    margin-<?php echo $left; ?>: 240px;
-}
-#pma_console .templates {
-    display: none;
-}
-#pma_console .mid_text,
-#pma_console .toolbar span {
-    vertical-align: middle;
-}
-#pma_console .toolbar {
-    position: relative;
-    background: #ccc;
-    border-top: solid 1px #aaa;
-    cursor: n-resize;
-}
-#pma_console .toolbar.collapsed:not(:hover) {
-    display: inline-block;
-    border-top-<?php echo $right; ?>-radius: 3px;
-    border-<?php echo $right; ?>: solid 1px #aaa;
-}
-#pma_console .toolbar.collapsed {
-    cursor: default;
-}
-#pma_console .toolbar.collapsed>.button {
-    display: none;
-}
-#pma_console .message span.text,
-#pma_console .message span.action,
-#pma_console .toolbar .button,
-#pma_console .toolbar .text,
-#pma_console .switch_button {
-    padding: 0 3px;
-    display: inline-block;
-}
-#pma_console .message span.action,
-#pma_console .toolbar .button,
-#pma_console .switch_button {
-    cursor: pointer;
-}
-#pma_console .message span.action:hover,
-#pma_console .toolbar .button:hover,
-#pma_console .switch_button:hover,
-#pma_console .toolbar .button.active {
-    background: #ddd;
-}
-#pma_console .toolbar .text {
-    font-weight: bold;
-}
-#pma_console .toolbar .button,
-#pma_console .toolbar .text {
-    margin-<?php echo $right; ?>: .4em;
-}
-#pma_console .toolbar .button,
-#pma_console .toolbar .text {
-    float: <?php echo $right; ?>;
-}
-#pma_console .content {
-    overflow-x: hidden;
-    overflow-y: auto;
-    margin-bottom: -65px;
-    border-top: solid 1px #aaa;
-    background: #fff;
-    padding-top: .4em;
-}
-#pma_console .content.console_dark_theme {
-    background: #000;
-    color: #fff;
-}
-#pma_console .content.console_dark_theme .CodeMirror-wrap {
-    background: #000;
-    color: #fff;
-}
-#pma_console .content.console_dark_theme .action_content {
-    color: #000;
-}
-#pma_console .content.console_dark_theme .message {
-    border-color: #373B41;
-}
-#pma_console .content.console_dark_theme .CodeMirror-cursor {
-    border-color: #fff;
-}
-#pma_console .content.console_dark_theme .cm-keyword {
-    color: #de935f;
-}
-#pma_console .message,
-#pma_console .query_input {
-    position: relative;
-    font-family: Monaco, Consolas, monospace;
-    cursor: text;
-    margin: 0 10px .2em 1.4em;
-}
-#pma_console .message {
-    border-bottom: solid 1px #ccc;
-    padding-bottom: .2em;
-}
-#pma_console .message.expanded>.action_content {
-    position: relative;
-}
-#pma_console .message:before,
-#pma_console .query_input:before {
-    left: -0.7em;
-    position: absolute;
-    content: ">";
-}
-#pma_console .query_input:before {
-    top: -2px;
-}
-#pma_console .query_input textarea {
-    width: 100%;
-    height: 4em;
-    resize: vertical;
-}
-#pma_console .message:hover:before {
-    color: #7cf;
-    font-weight: bold;
-}
-#pma_console .message.expanded:before {
-    content: "]";
-}
-#pma_console .message.welcome:before {
-    display: none;
-}
-#pma_console .message.failed:before,
-#pma_console .message.failed.expanded:before,
-#pma_console .message.failed:hover:before {
-    content: "=";
-    color: #944;
-}
-#pma_console .message.pending:before {
-    opacity: .3;
-}
-#pma_console .message.collapsed>.query {
-    white-space: nowrap;
-    text-overflow: ellipsis;
-    overflow: hidden;
-}
-#pma_console .message.expanded>.query {
-    display: block;
-    white-space: pre;
-    word-wrap: break-word;
-}
-#pma_console .message .text.targetdb,
-#pma_console .message.collapsed .action.collapse,
-#pma_console .message.expanded .action.expand,
-#pma_console .message .action.requery,
-#pma_console .message .action.profiling,
-#pma_console .message .action.explain,
-#pma_console .message .action.bookmark {
-    display: none;
-}
-#pma_console .message.select .action.profiling,
-#pma_console .message.select .action.explain,
-#pma_console .message.history .text.targetdb,
-#pma_console .message.successed .text.targetdb,
-#pma_console .message.history .action.requery,
-#pma_console .message.history .action.bookmark,
-#pma_console .message.bookmark .action.requery,
-#pma_console .message.bookmark .action.bookmark,
-#pma_console .message.successed .action.requery,
-#pma_console .message.successed .action.bookmark {
-    display: inline-block;
-}
-#pma_console .message .action_content {
-    position: absolute;
-    bottom: 100%;
-    background: #ccc;
-    border: solid 1px #aaa;
-    border-top-<?php echo $left; ?>-radius: 3px;
-}
-html.ie8 #pma_console .message .action_content {
-    position: relative!important;
-}
-#pma_console .message.bookmark .text.targetdb,
-#pma_console .message .text.query_time {
-    margin: 0;
-    display: inline-block;
-}
-#pma_console .message.failed .text.query_time,
-#pma_console .message .text.failed {
-    display: none;
-}
-#pma_console .message.failed .text.failed {
-    display: inline-block;
-}
-#pma_console .message .text {
-    background: #fff;
-}
-#pma_console .message.collapsed>.action_content {
-    display: none;
-}
-#pma_console .message.collapsed:hover>.action_content {
-    display: block;
-}
-#pma_console .message .bookmark_label {
-    padding: 0 4px;
-    top: 0;
-    background: #369;
-    color: #fff;
-    border-radius: 3px;
-}
-#pma_console .message .bookmark_label.shared {
-    background: #396;
-}
-#pma_console .message.expanded .bookmark_label {
-    border-top-left-radius: 0;
-    border-top-right-radius: 0;
-}
-#pma_console .query_input {
-    position: relative;
-}
-#pma_console .mid_layer {
-    height: 100%;
-    width: 100%;
-    position: absolute;
-    top: 0;
-    /* For support IE8, this layer doesn't use filter:opacity or opacity,
-    js code will fade this layer opacity to 0.18(using animation) */
-    background: #666;
-    display: none;
-    cursor: pointer;
-    z-index: 200;
-}
-#pma_console .card {
-    position: absolute;
-    width: 94%;
-    height: 100%;
-    min-height: 48px;
-    <?php echo $left; ?>: 100%;
-    top: 0;
-    border-<?php echo $left; ?>: solid 1px #999;
-    z-index: 300;
-    transition: <?php echo $left; ?> 0.2s;
-    -ms-transition: <?php echo $left; ?> 0.2s;
-    -webkit-transition: <?php echo $left; ?> 0.2s;
-    -moz-transition: <?php echo $left; ?> 0.2s;
-}
-#pma_console .card.show {
-    <?php echo $left; ?>: 6%;
-    box-shadow: -2px 1px 4px -1px #999;
-}
-
-html.ie7 #pma_console .query_input {
-    display: none;
-}
-
-#pma_bookmarks .content.add_bookmark,
-#pma_console_options .content {
-    padding: 4px 6px;
-}
-#pma_bookmarks .content.add_bookmark .options {
-    margin-<?php echo $left; ?>: 1.4em;
-    padding-bottom: .4em;
-    margin-bottom: .4em;
-    border-bottom: solid 1px #ccc;
-}
-#pma_bookmarks .content.add_bookmark .options button {
-    margin: 0 7px;
-    vertical-align: bottom;
-}
-#pma_bookmarks .content.add_bookmark input[type=text] {
-    margin: 0;
-    padding: 2px 4px;
-}
-#pma_console .button.hide,
-#pma_console .message span.text.hide {
-    display: none;
-}
-#debug_console.grouped .ungroup_queries,
-#debug_console.ungrouped .group_queries {
-    display: inline-block;
-}
-#debug_console.ungrouped .ungroup_queries,
-#debug_console.ungrouped .sort_count,
-#debug_console.grouped .group_queries {
-    display: none;
-}
-#debug_console .count {
-    margin-right: 8px;
-}
-#debug_console .show_trace .trace,
-#debug_console .show_args .args {
-    display: block;
-}
-#debug_console .hide_trace .trace,
-#debug_console .hide_args .args,
-#debug_console .show_trace .action.dbg_show_trace,
-#debug_console .hide_trace .action.dbg_hide_trace,
-#debug_console .traceStep.hide_args .action.dbg_hide_args,
-#debug_console .traceStep.show_args .action.dbg_show_args {
-    display: none;
-}
-
-#debug_console .traceStep:after,
-#debug_console .trace.welcome:after,
-#debug_console .debug>.welcome:after {
-    content: "";
-    display: table;
-    clear: both;
-}
-#debug_console .debug_summary {
-    float: left;
-}
-#debug_console .trace.welcome .time {
-    float: right;
-}
-#debug_console .traceStep .file,
-#debug_console .script_name {
-    float: right;
-}
-#debug_console .traceStep .args pre {
-    margin: 0;
-}
-
-/* Code mirror console style*/
-
-.cm-s-pma .CodeMirror-code pre,
-.cm-s-pma .CodeMirror-code {
-    font-family: Monaco, Consolas, monospace;
-}
-.cm-s-pma .CodeMirror-measure>pre,
-.cm-s-pma .CodeMirror-code>pre,
-.cm-s-pma .CodeMirror-lines {
-    padding: 0;
-}
-.cm-s-pma.CodeMirror {
-    resize: none;
-    height: auto;
-    width: 100%;
-    min-height: initial;
-    max-height: initial;
-}
-.firefox .cm-s-pma.CodeMirror {
-    font-size: 120%;
-}
-.cm-s-pma .CodeMirror-scroll {
-    cursor: text;
-}
-
-/* PMA drop-improt style */
-
-.pma_drop_handler {
-    display: none;
-    position: fixed;
-    top: 0;
-    left: 0;
-    width: 100%;
-    background: rgba(0, 0, 0, 0.6);
-    height: 100%;
-    z-index: 999;
-    color: white;
-    font-size: 30pt;
-    text-align: center;
-    padding-top: 20%;
-}
-
-.pma_sql_import_status {
-    display: none;
-    position: fixed;
-    bottom: 0;
-    right: 25px;
-    width: 400px;
-    border: 1px solid #999;
-    background: #f3f3f3;
-    -moz-border-radius: 4px;
-    -webkit-border-radius: 4px;
-    border-radius: 4px;
-    -moz-box-shadow: <?php echo $GLOBALS['text_dir'] === 'rtl' ? '-' : ''; ?>2px 2px 5px #ccc;
-    -webkit-box-shadow: <?php echo $GLOBALS['text_dir'] === 'rtl' ? '-' : ''; ?>2px 2px 5px #ccc;
-    box-shadow: <?php echo $GLOBALS['text_dir'] === 'rtl' ? '-' : ''; ?>2px 2px 5px #ccc;
-}
-
-.pma_sql_import_status h2,
-.pma_drop_result h2 {
-    background-color: #bbb;
-    padding: .1em .3em;
-    margin-top: 0;
-    margin-bottom: 0;
-    color: #fff;
-    font-size: 1.6em;
-    font-weight: normal;
-    text-shadow: 0 1px 0 #777;
-    -moz-box-shadow: <?php echo $GLOBALS['text_dir'] === 'rtl' ? '-' : ''; ?>1px 1px 15px #999 inset;
-    -webkit-box-shadow: <?php echo $GLOBALS['text_dir'] === 'rtl' ? '-' : ''; ?>1px 1px 15px #999 inset;
-    box-shadow: <?php echo $GLOBALS['text_dir'] === 'rtl' ? '-' : ''; ?>1px 1px 15px #999 inset;
-}
-
-.pma_sql_import_status div {
-    height: 270px;
-    overflow-y:auto;
-    overflow-x:hidden;
-    list-style-type: none;
-}
-
-.pma_sql_import_status div li {
-    padding: 8px 10px;
-    border-bottom: 1px solid #bbb;
-    color: rgb(148, 14, 14);
-    background: white;
-}
-
-.pma_sql_import_status div li .filesize {
-    float: right;
-}
-
-.pma_sql_import_status h2 .minimize {
-    float: right;
-    margin-right: 5px;
-    padding: 0 10px;
-}
-
-.pma_sql_import_status h2 .close {
-    float: right;
-    margin-right: 5px;
-    padding: 0 10px;
-    display: none;
-}
-
-.pma_sql_import_status h2 .minimize:hover,
-.pma_sql_import_status h2 .close:hover,
-.pma_drop_result h2 .close:hover {
-    background: rgba(155, 149, 149, 0.78);
-    cursor: pointer;
-}
-
-.pma_drop_file_status {
-    color: #235a81;
-}
-
-.pma_drop_file_status span.underline:hover {
-    cursor: pointer;
-    text-decoration: underline;
-}
-
-.pma_drop_result {
-    position: fixed;
-    top: 10%;
-    left: 20%;
-    width: 60%;
-    background: white;
-    min-height: 300px;
-    z-index: 800;
-    -webkit-box-shadow: 0 0 15px #999;
-    border-radius: 10px;
-    cursor: move;
-}
-
-.pma_drop_result h2 .close {
-    float: right;
-    margin-right: 5px;
-    padding: 0 10px;
-}
-
-.dependencies_box {
-    background-color: white;
-    border: 3px ridge black;
-}
-
-#composite_index_list {
-    list-style-type: none;
-    list-style-position: inside;
-}
-
-span.drag_icon {
-    display: inline-block;
-    background-image: url('<?php echo $_SESSION['PMA_Theme']->getImgPath('s_sortable.png');?>');
-    background-position: center center;
-    background-repeat: no-repeat;
-    width: 1em;
-    height: 3em;
-    cursor: move;
-}
-
-.topmargin {
-    margin-top: 1em;
-}
-
-/* styles for sortable tables created with tablesorter jquery plugin */
-th.header {
-    cursor: pointer;
-    color: #235a81;
-}
-
-th.header:hover {
-    text-decoration: underline;
-}
-
-th.header .sorticon {
-    width: 16px;
-    height: 16px;
-    background-repeat: no-repeat;
-    background-position: right center;
-    display: inline-table;
-    vertical-align: middle;
-    float: right;
-}
-
-th.headerSortUp .sorticon, th.headerSortDown:hover .sorticon {
-    background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('s_desc.png');?>);
-}
-
-th.headerSortDown .sorticon, th.headerSortUp:hover .sorticon {
-    background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('s_asc.png');?>);
-}
-/* end of styles of sortable tables */
-
-/* styles for jQuery-ui to support rtl languages */
-body .ui-dialog .ui-dialog-titlebar-close {
-    <?php echo $right; ?>: .3em;
-    <?php echo $left; ?>: initial;
-}
-
-body .ui-dialog .ui-dialog-title {
-    float: <?php echo $left; ?>;
-}
-
-body .ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset {
-    float: <?php echo $right; ?>;
-}
-/* end of styles for jQuery-ui to support rtl languages */
diff --git a/#pma/themes/pmahomme/css/enum_editor.css.php b/#pma/themes/pmahomme/css/enum_editor.css.php
deleted file mode 100644
index da9bc071..00000000
--- a/#pma/themes/pmahomme/css/enum_editor.css.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * ENUM editor styles for the pmahomme theme
- *
- * @package    PhpMyAdmin-theme
- * @subpackage PMAHomme
- */
-
-// unplanned execution path
-if (! defined('PMA_MINIMUM_COMMON') && ! defined('TESTSUITE')) {
-    exit();
-}
-?>
-
-/**
- * ENUM/SET editor styles
- */
-p.enum_notice {
-    margin: 5px 2px;
-    font-size: 80%;
-}
-
-#enum_editor p {
-    margin-top: 0;
-    font-style: italic;
-}
-
-#enum_editor .values,
-#enum_editor .add {
-    width: 100%;
-}
-
-#enum_editor .add td {
-    vertical-align: middle;
-    width: 50%;
-    padding: 0 0 0;
-    padding-<?php echo $left; ?>: 1em;
-}
-
-#enum_editor .values td.drop {
-    width: 1.8em;
-    cursor: pointer;
-    vertical-align: middle;
-}
-
-#enum_editor .values input {
-    margin: .1em 0;
-    padding-<?php echo $right; ?>: 2em;
-    width: 100%;
-}
-
-#enum_editor .values img {
-    width: 1.8em;
-    vertical-align: middle;
-}
-
-#enum_editor input.add_value {
-    margin: 0;
-    margin-<?php echo $right; ?>: 0.4em;
-}
-
-#enum_editor_output textarea {
-    width: 100%;
-    float: <?php echo $right; ?>;
-    margin: 1em 0 0 0;
-}
-
-/**
- * ENUM/SET editor integration for the routines editor
- */
-.enum_hint {
-    position: relative;
-}
-
-.enum_hint a {
-    position: absolute;
-    <?php echo $left; ?>: 81%;
-    bottom: .35em;
-}
diff --git a/#pma/themes/pmahomme/css/gis.css.php b/#pma/themes/pmahomme/css/gis.css.php
deleted file mode 100644
index f0de2111..00000000
--- a/#pma/themes/pmahomme/css/gis.css.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * GIS styles for the pmahomme theme
- *
- * @package    PhpMyAdmin-theme
- * @subpackage PMAHomme
- */
-
-// unplanned execution path
-if (! defined('PMA_MINIMUM_COMMON') && ! defined('TESTSUITE')) {
-    exit();
-}
-?>
-
-/**
- * GIS data editor styles
- */
-a.close_gis_editor {
-    float: <?php echo $right; ?>;
-}
-
-#gis_editor {
-    display: none;
-    position: fixed;
-    _position: absolute; /* hack for IE */
-    z-index: 1001;
-    overflow-y: auto;
-    overflow-x: hidden;
-}
-
-#gis_data {
-    min-height: 230px;
-}
-
-#gis_data_textarea {
-    height: 6em;
-}
-
-#gis_data_editor {
-    background: #D0DCE0;
-    padding: 15px;
-    min-height: 500px;
-}
-
-#gis_data_editor .choice {
-    display: none;
-}
-
-#gis_data_editor input[type="text"] {
-    width: 75px;
-}
diff --git a/#pma/themes/pmahomme/css/jqplot.css.php b/#pma/themes/pmahomme/css/jqplot.css.php
deleted file mode 100644
index 1fc4329b..00000000
--- a/#pma/themes/pmahomme/css/jqplot.css.php
+++ /dev/null
@@ -1,273 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Styles for jqplot
- * for the pmahomme theme
- *
- * @package    PhpMyAdmin-theme
- * @subpackage PMAHomme
- */
-
-// unplanned execution path
-if (! defined('PMA_MINIMUM_COMMON') && ! defined('TESTSUITE')) {
-    exit();
-}
-?>
-
-/* jqPlot */
-
-/*rules for the plot target div.  These will be cascaded down to all plot elements according to css rules*/
-.jqplot-target {
-    position: relative;
-    color: #222222;
-    font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
-    font-size: 1em;
-/*    height: 300px;
-    width: 590px;*/
-}
-
-/*rules applied to all axes*/
-.jqplot-axis {
-    font-size: 0.75em;
-}
-
-.jqplot-xaxis {
-    margin-top: 10px;
-}
-
-.jqplot-x2axis {
-    margin-bottom: 10px;
-}
-
-.jqplot-yaxis {
-    margin-<?php echo $right; ?>: 10px;
-}
-
-.jqplot-y2axis, .jqplot-y3axis, .jqplot-y4axis, .jqplot-y5axis, .jqplot-y6axis, .jqplot-y7axis, .jqplot-y8axis, .jqplot-y9axis, .jqplot-yMidAxis {
-    margin-left: 10px;
-    margin-right: 10px;
-}
-
-/*rules applied to all axis tick divs*/
-.jqplot-axis-tick, .jqplot-xaxis-tick, .jqplot-yaxis-tick, .jqplot-x2axis-tick, .jqplot-y2axis-tick, .jqplot-y3axis-tick, .jqplot-y4axis-tick, .jqplot-y5axis-tick, .jqplot-y6axis-tick, .jqplot-y7axis-tick, .jqplot-y8axis-tick, .jqplot-y9axis-tick, .jqplot-yMidAxis-tick {
-    position: absolute;
-    white-space: pre;
-}
-
-
-.jqplot-xaxis-tick {
-    top: 0;
-    /* initial position untill tick is drawn in proper place */
-    <?php echo $left; ?>: 15px;
-    vertical-align: top;
-}
-
-.jqplot-x2axis-tick {
-    bottom: 0;
-    /* initial position untill tick is drawn in proper place */
-    <?php echo $left; ?>: 15px;
-    vertical-align: bottom;
-}
-
-.jqplot-yaxis-tick {
-    <?php echo $right; ?>: 0px;
-    /* initial position untill tick is drawn in proper place */
-    top: 15px;
-    text-align: <?php echo $right; ?>;
-}
-
-.jqplot-yaxis-tick.jqplot-breakTick {
-    <?php echo $right; ?>: -20px;
-    margin-<?php echo $right; ?>: 0;
-    padding:1px 5px 1px;
-    z-index: 2;
-    font-size: 1.5em;
-}
-
-.jqplot-y2axis-tick, .jqplot-y3axis-tick, .jqplot-y4axis-tick, .jqplot-y5axis-tick, .jqplot-y6axis-tick, .jqplot-y7axis-tick, .jqplot-y8axis-tick, .jqplot-y9axis-tick {
-    <?php echo $left; ?>: 0px;
-    /* initial position untill tick is drawn in proper place */
-    top: 15px;
-/*    padding-left: 10px;*/
-/*    padding-right: 15px;*/
-    text-align: <?php echo $left; ?>;
-}
-
-.jqplot-yMidAxis-tick {
-    text-align: center;
-    white-space: nowrap;
-}
-
-.jqplot-xaxis-label {
-    margin-top: 10px;
-    font-size: 11pt;
-    position: absolute;
-}
-
-.jqplot-x2axis-label {
-    margin-bottom: 10px;
-    font-size: 11pt;
-    position: absolute;
-}
-
-.jqplot-yaxis-label {
-    margin-right: 10px;
-/*    text-align: center;*/
-    font-size: 11pt;
-    position: absolute;
-}
-
-.jqplot-yMidAxis-label {
-    font-size: 11pt;
-    position: absolute;
-}
-
-.jqplot-y2axis-label, .jqplot-y3axis-label, .jqplot-y4axis-label, .jqplot-y5axis-label, .jqplot-y6axis-label, .jqplot-y7axis-label, .jqplot-y8axis-label, .jqplot-y9axis-label {
-/*    text-align: center;*/
-    font-size: 11pt;
-    margin-<?php echo $left; ?>: 10px;
-    position: absolute;
-}
-
-.jqplot-meterGauge-tick {
-    font-size: 0.75em;
-    color: #999999;
-}
-
-.jqplot-meterGauge-label {
-    font-size: 1em;
-    color: #999999;
-}
-
-table.jqplot-table-legend {
-    margin-top: 12px;
-    margin-bottom: 12px;
-    margin-left: 12px;
-    margin-right: 12px;
-}
-
-table.jqplot-table-legend, table.jqplot-cursor-legend {
-    background-color: rgba(255,255,255,0.6);
-    border: 1px solid #cccccc;
-    position: absolute;
-    font-size: 0.75em;
-}
-
-td.jqplot-table-legend {
-    vertical-align: middle;
-}
-
-/*
-These rules could be used instead of assigning
-element styles and relying on js object properties.
-*/
-
-/*
-td.jqplot-table-legend-swatch {
-    padding-top: 0.5em;
-    text-align: center;
-}
-
-tr.jqplot-table-legend:first td.jqplot-table-legend-swatch {
-    padding-top: 0px;
-}
-*/
-
-td.jqplot-seriesToggle:hover, td.jqplot-seriesToggle:active {
-    cursor: pointer;
-}
-
-.jqplot-table-legend .jqplot-series-hidden {
-    text-decoration: line-through;
-}
-
-div.jqplot-table-legend-swatch-outline {
-    border: 1px solid #cccccc;
-    padding: 1px;
-}
-
-div.jqplot-table-legend-swatch {
-    width: 0;
-    height: 0;
-    border-top-width: 5px;
-    border-bottom-width: 5px;
-    border-left-width: 6px;
-    border-right-width: 6px;
-    border-top-style: solid;
-    border-bottom-style: solid;
-    border-left-style: solid;
-    border-right-style: solid;
-}
-
-.jqplot-title {
-    top: 0;
-    <?php echo $left; ?>: 0px;
-    padding-bottom: 0.5em;
-    font-size: 1.2em;
-}
-
-table.jqplot-cursor-tooltip {
-    border: 1px solid #cccccc;
-    font-size: 0.75em;
-}
-
-
-.jqplot-cursor-tooltip {
-    border: 1px solid #cccccc;
-    font-size: 0.75em;
-    white-space: nowrap;
-    background: rgba(208,208,208,0.5);
-    padding: 1px;
-}
-
-.jqplot-highlighter-tooltip, .jqplot-canvasOverlay-tooltip {
-    border: 1px solid #cccccc;
-    font-size: 0.75em;
-    white-space: nowrap;
-    background: rgba(208,208,208,0.5);
-    padding: 1px;
-}
-
-.jqplot-point-label {
-    font-size: 0.75em;
-    z-index: 2;
-}
-
-td.jqplot-cursor-legend-swatch {
-    vertical-align: middle;
-    text-align: center;
-}
-
-div.jqplot-cursor-legend-swatch {
-    width: 1.2em;
-    height: 0.7em;
-}
-
-.jqplot-error {
-/*   Styles added to the plot target container when there is an error go here.*/
-    text-align: center;
-}
-
-.jqplot-error-message {
-/*    Styling of the custom error message div goes here.*/
-    position: relative;
-    top: 46%;
-    display: inline-block;
-}
-
-div.jqplot-bubble-label {
-    font-size: 0.8em;
-/*    background: rgba(90%, 90%, 90%, 0.15);*/
-    padding-left: 2px;
-    padding-right: 2px;
-    color: rgb(20%, 20%, 20%);
-}
-
-div.jqplot-bubble-label.jqplot-bubble-label-highlight {
-    background: rgba(90%, 90%, 90%, 0.7);
-}
-
-div.jqplot-noData-container {
-    text-align: center;
-    background-color: rgba(96%, 96%, 96%, 0.3);
-}
diff --git a/#pma/themes/pmahomme/css/navigation.css.php b/#pma/themes/pmahomme/css/navigation.css.php
deleted file mode 100644
index de0078d5..00000000
--- a/#pma/themes/pmahomme/css/navigation.css.php
+++ /dev/null
@@ -1,429 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Navigation styles for the pmahomme theme
- *
- * @package    PhpMyAdmin-theme
- * @subpackage PMAHomme
- */
-
-// unplanned execution path
-if (! defined('PMA_MINIMUM_COMMON') && ! defined('TESTSUITE')) {
-    exit();
-}
-?>
-
-/******************************************************************************/
-/* Navigation */
-
-#pma_navigation {
-    width: <?php echo $GLOBALS['cfg']['NaviWidth']; ?>px;
-    position: fixed;
-    top: 0;
-    <?php echo $left; ?>: 0;
-    height: 100%;
-    background: url(./themes/pmahomme/img/left_nav_bg.png) repeat-y right 0 <?php echo $GLOBALS['cfg']['NaviBackground']; ?>;
-    color: <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
-    z-index: 800;
-}
-
-#pma_navigation_header {
-    overflow: hidden;
-}
-
-#pma_navigation_content {
-    width: 100%;
-    height: 100%;
-    position: absolute;
-    top: 0;
-    <?php echo $left; ?>: 0;
-    z-index: 0;
-}
-
-#pma_navigation ul {
-    margin: 0;
-}
-
-#pma_navigation form {
-    margin: 0;
-    padding: 0;
-    display: inline;
-}
-
-#pma_navigation select#select_server,
-#pma_navigation select#lightm_db {
-    width: 100%;
-}
-
-/******************************************************************************/
-/* specific elements */
-
-#pma_navigation div.pageselector {
-    text-align: center;
-    margin: 0;
-    margin-<?php echo $left; ?>: 0.75em;
-    border-<?php echo $left; ?>: 1px solid #666;
-}
-
-#pma_navigation div#pmalogo {
-    <?php //better echo $GLOBALS['cfg']['logoBGC']; ?>
-}
-
-#pma_navigation #pmalogo,
-#pma_navigation #serverChoice,
-#pma_navigation #navipanellinks,
-#pma_navigation #recentTableList,
-#pma_navigation #favoriteTableList,
-#pma_navigation #databaseList,
-#pma_navigation div.pageselector.dbselector {
-    text-align: center;
-    padding: 5px 10px 0;
-    border: 0;
-}
-
-#pma_navigation #recentTable,
-#pma_navigation #favoriteTable {
-    width: 200px;
-}
-
-#pma_navigation #favoriteTableList select,
-#pma_navigation #serverChoice select
- {
-    width: 80%;
-}
-
-#pma_navigation_content > img.throbber {
-    display: none;
-    margin: .3em auto 0;
-}
-
-/* Navigation tree*/
-#pma_navigation_tree {
-    margin: 0;
-    margin-<?php echo $left; ?>: 5px;
-    overflow: hidden;
-    color: #444;
-    height: 74%;
-    position: relative;
-}
-#pma_navigation_select_database {
-    text-align: left;
-    padding: 0 0 0;
-    border: 0;
-    margin: 0;
-}
-
-#pma_navigation_db_select {
-    margin-top: 0.5em;
-    margin-<?php echo $left; ?>: 0.75em;
-}
-#pma_navigation_db_select select {
-    background: url("./themes/pmahomme/img/select_bg.png") repeat scroll 0 0;
-    -webkit-border-radius: 2px;
-    border-radius: 2px;
-    border: 1px solid #bbb;
-    border-top: 1px solid #bbb;
-    color: #333;
-    padding: 4px 6px;
-    margin: 0 0 0;
-    width: 92%;
-    font-size: 1.11em;
-}
-
-#pma_navigation_tree_content {
-    width: 100%;
-    overflow: hidden;
-    overflow-y: auto;
-    position: absolute;
-    height: 100%;
-}
-#pma_navigation_tree_content a.hover_show_full {
-    position: relative;
-    z-index: 100;
-}
-#pma_navigation_tree a {
-    color: <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
-}
-#pma_navigation_tree a:hover {
-    text-decoration: underline;
-}
-#pma_navigation_tree li.activePointer {
-    color: <?php echo $GLOBALS['cfg']['NaviPointerColor']; ?>;
-    background-color: <?php echo $GLOBALS['cfg']['NaviPointerBackground']; ?>;
-}
-#pma_navigation_tree li.selected {
-    color: <?php echo $GLOBALS['cfg']['NaviPointerColor']; ?>;
-    background-color: <?php echo $GLOBALS['cfg']['NaviPointerBackground']; ?>;
-}
-#pma_navigation_tree li .dbItemControls {
-    padding-left: 4px;
-}
-#pma_navigation_tree li .navItemControls {
-    display: none;
-    padding-left: 4px;
-}
-#pma_navigation_tree li.activePointer .navItemControls {
-    display: inline;
-    opacity: 0.5;
-}
-#pma_navigation_tree li.activePointer .navItemControls:hover {
-    display: inline;
-    opacity: 1.0;
-}
-#pma_navigation_tree ul {
-    clear: both;
-    padding: 0;
-    list-style-type: none;
-    margin: 0;
-}
-#pma_navigation_tree ul ul {
-    position: relative;
-}
-#pma_navigation_tree li,
-#pma_navigation_tree li.fast_filter {
-    white-space: nowrap;
-    padding-bottom: 4px;
-    clear: both;
-    min-height: 16px;
-}
-#pma_navigation_tree img {
-    margin: 0;
-}
-#pma_navigation_tree i {
-    display: block;
-}
-#pma_navigation_tree div.block {
-    position: relative;
-    width: 1.5em;
-    height: 1.5em;
-    min-width: 16px;
-    min-height: 16px;
-    float: <?php echo $left; ?>;
-}
-#pma_navigation_tree div.block.double {
-    width: 2.5em;
-}
-#pma_navigation_tree div.block i,
-#pma_navigation_tree div.block b {
-    width: 1.5em;
-    height: 1.7em;
-    min-width: 16px;
-    min-height: 8px;
-    position: absolute;
-    bottom: 0.7em;
-    <?php echo $left; ?>: 0.75em;
-    z-index: 0;
-}
-#pma_navigation_tree div.block i { /* Top and right segments for the tree element connections */
-    display: block;
-    border-<?php echo $left; ?>: 1px solid #666;
-    border-bottom: 1px solid #666;
-    position: relative;
-    z-index: 0;
-}
-#pma_navigation_tree div.block i.first { /* Removes top segment */
-    border-<?php echo $left; ?>: 0;
-}
-#pma_navigation_tree div.block b { /* Bottom segment for the tree element connections */
-    display: block;
-    height: 0.75em;
-    bottom: 0;
-    <?php echo $left; ?>: 0.75em;
-    border-<?php echo $left; ?>: 1px solid #666;
-}
-#pma_navigation_tree div.block a,
-#pma_navigation_tree div.block u {
-    position: absolute;
-    <?php echo $left; ?>: 50%;
-    top: 50%;
-    z-index: 10;
-}
-#pma_navigation_tree div.block a + a {
-    <?php echo $left; ?>: 100%;
-}
-#pma_navigation_tree div.block.double a,
-#pma_navigation_tree div.block.double u {
-    <?php echo $left; ?>: 33%;
-}
-#pma_navigation_tree div.block.double a + a {
-    <?php echo $left; ?>: 85%;
-}
-#pma_navigation_tree div.block img {
-    position: relative;
-    top: -0.6em;
-    <?php echo $left; ?>: 0;
-    margin-<?php echo $left; ?>: -7px;
-}
-#pma_navigation_tree div.throbber img {
-    top: 2px;
-    <?php echo $left; ?>: 2px;
-}
-#pma_navigation_tree li.last > ul {
-    background: none;
-}
-#pma_navigation_tree li > a, #pma_navigation_tree li > i {
-    line-height: 1.5em;
-    height: 1.5em;
-    padding-<?php echo $left; ?>: 0.3em;
-}
-#pma_navigation_tree .list_container {
-    border-<?php echo $left; ?>: 1px solid #666;
-    margin-<?php echo $left; ?>: 0.75em;
-    padding-<?php echo $left; ?>: 0.75em;
-}
-#pma_navigation_tree .last > .list_container {
-    border-<?php echo $left; ?>: 0 solid #666;
-}
-
-/* Fast filter */
-li.fast_filter {
-    padding-<?php echo $left; ?>: 0.75em;
-    margin-<?php echo $left; ?>: 0.75em;
-    padding-<?php echo $right; ?>: 35px;
-    border-<?php echo $left; ?>: 1px solid #666;
-    list-style: none;
-}
-li.fast_filter input {
-    margin: 3px 0 0 0;
-    font-size: 0.7em;
-    padding-top: 2px;
-    padding-bottom: 2px;
-    padding-<?php echo $left; ?>: 4px;
-    padding-<?php echo $right; ?>: 1.7em;
-    width: 100%;
-}
-li.fast_filter span {
-    position: relative;
-    <?php echo $right; ?>: 1.5em;
-    padding: 0.2em;
-    cursor: pointer;
-    font-weight: bold;
-    color: #800;
-    font-size: 0.7em;
-}
-/* IE10+ has its own reset X */
-html.ie li.fast_filter span {
-    display: none;
-}
-html.ie.ie9 li.fast_filter span,
-html.ie.ie8 li.fast_filter span {
-    display: auto;
-}
-html.ie li.fast_filter input {
-    padding-<?php echo $right; ?>: .2em;
-}
-html.ie.ie9 li.fast_filter input,
-html.ie.ie8 li.fast_filter input {
-    padding-<?php echo $right; ?>: 1.7em;
-}
-li.fast_filter.db_fast_filter {
-    border: 0;
-    margin-left: 0;
-    margin-right: 10px;
-}
-
-#navigation_controls_outer {
-    min-height: 21px !important;
-}
-
-#navigation_controls_outer.activePointer {
-    background-color: transparent !important;
-}
-
-#navigation_controls {
-    float: right;
-    padding-right: 23px;
-}
-
-/* Resize handler */
-#pma_navigation_resizer {
-    width: 3px;
-    height: 100%;
-    background-color: #aaa;
-    cursor: col-resize;
-    position: fixed;
-    top: 0;
-    <?php echo $left; ?>: 240px;
-    z-index: 801;
-}
-#pma_navigation_collapser {
-    width: 20px;
-    height: 22px;
-    line-height: 22px;
-    background: #eee;
-    color: #555;
-    font-weight: bold;
-    position: fixed;
-    top: 0;
-    <?php echo $left; ?>: <?php echo $GLOBALS['cfg']['NaviWidth']; ?>px;
-    text-align: center;
-    cursor: pointer;
-    z-index: 800;
-    text-shadow: 0 1px 0 #fff;
-    filter: dropshadow(color=#fff, offx=0, offy=1);
-    border: 1px solid #888;
-}
-
-/* Quick warp links */
-.pma_quick_warp {
-    margin-top: 5px;
-    margin-<?php echo $left; ?>: 2px;
-    position: relative;
-}
-.pma_quick_warp .drop_list {
-    float: <?php echo $left; ?>;
-    margin-<?php echo $left; ?>: 3px;
-    padding: 2px 0;
-}
-.pma_quick_warp .drop_button {
-    padding: 0 .3em;
-    border: 1px solid #ddd;
-    border-radius: .3em;
-    background: #f2f2f2;
-    cursor: pointer;
-}
-.pma_quick_warp .drop_list:hover .drop_button {
-    background: #fff;
-}
-.pma_quick_warp .drop_list ul {
-    position: absolute;
-    margin: 0;
-    padding: 0;
-    overflow: hidden;
-    overflow-y: auto;
-    list-style: none;
-    background: #fff;
-    border: 1px solid #ddd;
-    border-radius: .3em;
-    border-top-<?php echo $right; ?>-radius: 0;
-    border-bottom-<?php echo $right; ?>-radius: 0;
-    box-shadow: 0 0 5px #ccc;
-    top: 100%;
-    <?php echo $left; ?>: 3px;
-    <?php echo $right; ?>: 0;
-    display: none;
-    z-index: 802;
-}
-.pma_quick_warp .drop_list:hover ul {
-    display: block;
-}
-.pma_quick_warp .drop_list li {
-    white-space: nowrap;
-    padding: 0;
-    border-radius: 0;
-}
-.pma_quick_warp .drop_list li img {
-    vertical-align: sub;
-}
-.pma_quick_warp .drop_list li:hover {
-    background: #f2f2f2;
-}
-.pma_quick_warp .drop_list a {
-    display: block;
-    padding: .2em .3em;
-}
-.pma_quick_warp .drop_list a.favorite_table_anchor {
-    clear: left;
-    float: left;
-    padding: .1em .3em 0;
-}
diff --git a/#pma/themes/pmahomme/css/pmd.css.php b/#pma/themes/pmahomme/css/pmd.css.php
deleted file mode 100644
index 7d1c38b4..00000000
--- a/#pma/themes/pmahomme/css/pmd.css.php
+++ /dev/null
@@ -1,518 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Designer styles for the pmahomme theme
- *
- * @package    PhpMyAdmin-theme
- * @subpackage PMAHomme
- */
-use PMA\libraries\Theme;
-
-// unplanned execution path
-if (! defined('PMA_MINIMUM_COMMON') && ! defined('TESTSUITE')) {
-    exit();
-}
-
-/** @var Theme $pmaTheme */
-$pmaTheme = $_SESSION['PMA_Theme'];
-$headerImg = $pmaTheme->getImgPath('pmd/Header.png');
-$headerLinkedImg = $pmaTheme->getImgPath('pmd/Header_Linked.png');
-$minusImg = $pmaTheme->getImgPath('pmd/minus.png');
-$plusImg = $pmaTheme->getImgPath('pmd/plus.png');
-$leftPanelButtonImg = $pmaTheme->getImgPath('pmd/left_panel_butt.png');
-$topPanelImg = $pmaTheme->getImgPath('pmd/top_panel.png');
-$smallTabImg = $pmaTheme->getImgPath('pmd/small_tab.png');
-$frams1Img = $pmaTheme->getImgPath('pmd/1.png');
-$frams2Img = $pmaTheme->getImgPath('pmd/2.png');
-$frams3Img = $pmaTheme->getImgPath('pmd/3.png');
-$frams4Img = $pmaTheme->getImgPath('pmd/4.png');
-$frams5Img = $pmaTheme->getImgPath('pmd/5.png');
-$frams6Img = $pmaTheme->getImgPath('pmd/6.png');
-$frams7Img = $pmaTheme->getImgPath('pmd/7.png');
-$frams8Img = $pmaTheme->getImgPath('pmd/8.png');
-$resizeImg = $pmaTheme->getImgPath('pmd/resize.png');
-?>
-
-/* Designer */
-.input_tab {
-    background-color: #A6C7E1;
-    color: #000;
-}
-
-.content_fullscreen {
-    position: relative;
-    overflow: auto;
-}
-
-#canvas_outer {
-    position: relative;
-    width: 100%;
-    display: block;
-}
-
-#canvas {
-    background-color: #fff;
-    color: #000;
-}
-
-canvas.pmd {
-    display: inline-block;
-    overflow: hidden;
-    text-align: left;
-}
-
-canvas.pmd * {
-    behavior: url(#default#VML);
-}
-
-.pmd_tab {
-    background-color: #fff;
-    color: #000;
-    border-collapse: collapse;
-    border: 1px solid #aaa;
-    z-index: 1;
-    -moz-user-select: none;
-}
-
-.pmd_tab .header {
-    background-image: url(<?php echo $headerImg; ?>);
-    background-repeat: repeat-x;
-}
-
-.tab_zag {
-    text-align: center;
-    cursor: move;
-    padding: 1px;
-    font-weight: bold;
-}
-
-.tab_zag_2 {
-    background-image: url(<?php echo $headerLinkedImg; ?>);
-    background-repeat: repeat-x;
-    text-align: center;
-    cursor: move;
-    padding: 1px;
-    font-weight: bold;
-}
-
-.tab_field {
-    background: #fff;
-    color: #000;
-    cursor: default;
-}
-
-.tab_field_2 {
-    background-color: #CCFFCC;
-    color: #000;
-    background-repeat: repeat-x;
-    cursor: default;
-}
-
-.tab_field_3 {
-    background-color: #FFE6E6; /*#DDEEFF*/
-    color: #000;
-    cursor: default;
-}
-
-#pmd_hint {
-    white-space: nowrap;
-    position: absolute;
-    background-color: #99FF99;
-    color: #000;
-    z-index: 3;
-    border: #00CC66 solid 1px;
-    display: none;
-}
-
-.scroll_tab {
-    overflow: auto;
-    width: 100%;
-    height: 500px;
-}
-
-.pmd_Tabs {
-    cursor: default;
-    color: #0055bb;
-    white-space: nowrap;
-    text-decoration: none;
-    text-indent: 3px;
-    font-weight: bold;
-    margin-left: 2px;
-    text-align: <?php echo $left; ?>;
-    background-color: #fff;
-    background-image: url(<?php echo $leftPanelButtonImg; ?>);
-    border: #ccc solid 1px;
-}
-
-.pmd_Tabs2 {
-    cursor: default;
-    color: #0055bb;
-    background: #FFEE99;
-    text-indent: 3px;
-    font-weight: bold;
-    white-space: nowrap;
-    text-decoration: none;
-    border: #9999FF solid 1px;
-    text-align: <?php echo $left; ?>;
-}
-
-.owner {
-    font-weight: normal;
-    color: #888;
-}
-
-.option_tab {
-    padding-left: 2px;
-    padding-right: 2px;
-    width: 5px;
-}
-
-.select_all {
-    vertical-align: top;
-    padding-left: 2px;
-    padding-right: 2px;
-    cursor: default;
-    width: 1px;
-    color: #000;
-    background-image: url(<?php echo $headerImg; ?>);
-    background-repeat: repeat-x;
-}
-
-.small_tab {
-    vertical-align: top;
-    background-color: #0064ea;
-    color: #fff;
-    background-image: url(<?php echo $smallTabImg; ?>);
-    cursor: default;
-    text-align: center;
-    font-weight: bold;
-    padding-left: 2px;
-    padding-right: 2px;
-    width: 1px;
-    text-decoration: none;
-}
-
-.small_tab2 {
-    vertical-align: top;
-    color: #fff;
-    background-color: #FF9966;
-    cursor: default;
-    padding-left: 2px;
-    padding-right: 2px;
-    text-align: center;
-    font-weight: bold;
-    width: 1px;
-    text-decoration: none;
-}
-
-.small_tab_pref {
-    background-image: url(<?php echo $headerImg; ?>);
-    background-repeat: repeat-x;
-    text-align: center;
-    width: 1px;
-}
-
-.small_tab_pref2 {
-    vertical-align: top;
-    color: #fff;
-    background-color: #FF9966;
-    cursor: default;
-    text-align: center;
-    font-weight: bold;
-    width: 1px;
-    text-decoration: none;
-}
-
-.butt {
-    border: #4477aa solid 1px;
-    font-weight: bold;
-    height: 19px;
-    width: 70px;
-    background-color: #fff;
-    color: #000;
-    vertical-align: baseline;
-}
-
-.L_butt2_1 {
-    padding: 1px;
-    text-decoration: none;
-    vertical-align: middle;
-    cursor: default;
-}
-
-.L_butt2_2 {
-    padding: 0;
-    border: #0099CC solid 1px;
-    background: #FFEE99;
-    color: #000;
-    text-decoration: none;
-    vertical-align: middle;
-    cursor: default;
-}
-
-/* ---------------------------------------------------------------------------*/
-.bor {
-    width: 10px;
-    height: 10px;
-}
-
-.frams1 {
-    background: url(<?php echo $frams1Img; ?>) no-repeat right bottom;
-}
-
-.frams2 {
-    background: url(<?php echo $frams2Img; ?>) no-repeat left bottom;
-}
-
-.frams3 {
-    background: url(<?php echo $frams3Img; ?>) no-repeat left top;
-}
-
-.frams4 {
-    background: url(<?php echo $frams4Img; ?>) no-repeat right top;
-}
-
-.frams5 {
-    background: url(<?php echo $frams5Img; ?>) repeat-x center bottom;
-}
-
-.frams6 {
-    background: url(<?php echo $frams6Img; ?>) repeat-y left;
-}
-
-.frams7 {
-    background: url(<?php echo $frams7Img; ?>) repeat-x top;
-}
-
-.frams8 {
-    background: url(<?php echo $frams8Img; ?>) repeat-y right;
-}
-
-#osn_tab {
-    position: absolute;
-    background-color: #fff;
-    color: #000;
-}
-
-.pmd_header {
-    background-color: #EAEEF0;
-    color: #000;
-    text-align: center;
-    font-weight: bold;
-    margin: 0;
-    padding: 0;
-    background-image: url(<?php echo $topPanelImg; ?>);
-    background-position: top;
-    background-repeat: repeat-x;
-    border-right: #999 solid 1px;
-    border-left: #999 solid 1px;
-    height: 28px;
-    z-index: 101;
-    width: 100%;
-    position: fixed;
-}
-
-.pmd_header a, .pmd_header span{
-    display: block;
-    float: <?php echo $left; ?>;
-    margin: 3px 1px 4px;
-    height: 20px;
-    border: 1px dotted #fff;
-}
-
-.pmd_header .M_bord {
-    display: block;
-    float: <?php echo $left; ?>;
-    margin: 4px;
-    height: 20px;
-    width: 2px;
-}
-
-.pmd_header a.first {
-    margin-right: 1em;
-}
-
-.pmd_header a.last {
-    margin-left: 1em;
-}
-
-a.M_butt_Selected_down_IE,
-a.M_butt_Selected_down {
-    border: 1px solid #C0C0BB;
-    background-color: #99FF99;
-    color: #000;
-}
-
-a.M_butt_Selected_down_IE:hover,
-a.M_butt_Selected_down:hover,
-a.M_butt:hover {
-    border: 1px solid #0099CC;
-    background-color: #FFEE99;
-    color: #000;
-}
-
-#layer_menu {
-    z-index: 98;
-    position: relative;
-    float: right;
-    background-color: #EAEEF0;
-    border: #999 solid 1px;
-}
-
-#layer_menu.left {
-    float: left;
-}
-
-#layer_upd_relation {
-    position: absolute;
-    <?php echo $left; ?>: 637px;
-    top: 224px;
-    z-index: 100;
-}
-
-#layer_new_relation {
-    position: absolute;
-    <?php echo $left; ?>: 636px;
-    top: 85px;
-    z-index: 100;
-    width: 153px;
-}
-
-#pmd_optionse {
-    position: absolute;
-    <?php echo $left; ?>: 636px;
-    top: 85px;
-    z-index: 100;
-    width: 153px;
-}
-
-#layer_menu_sizer {
-    background-image: url(<?php echo $resizeImg; ?>);
-    cursor: ew-resize;
-}
-
-#layer_menu_sizer .icon {
-    margin: 0;
-}
-
-.panel {
-    position: fixed;
-    top: 60px;
-    <?php echo $right; ?>: 0;
-    width: 350px;
-    max-height: 500px;
-    display: none;
-    overflow: auto;
-    padding-top: 34px;
-    z-index: 102;
-}
-
-a.trigger {
-    position: fixed;
-    text-decoration: none;
-    top: 60px;
-    <?php echo $right; ?>: 0;
-    color: #fff;
-    padding: 10px 40px 10px 15px;
-    background: #333 url(<?php echo $plusImg; ?>) 85% 55% no-repeat;
-    border: 1px solid #444;
-    display: block;
-    z-index: 102;
-}
-
-a.trigger:hover {
-    color: #080808;
-    background: #fff696 url(<?php echo $plusImg; ?>) 85% 55% no-repeat;
-    border: 1px solid #999;
-}
-
-a.active.trigger {
-    background: #222 url(<?php echo $minusImg; ?>) 85% 55% no-repeat;
-    z-index: 999;
-}
-
-a.active.trigger:hover {
-    background: #fff696 url(<?php echo $minusImg; ?>) 85% 55% no-repeat;
-}
-
-.toggle_container .block {
-    background-color: #DBE4E8;
-    border-top: 1px solid #999;
-}
-
-.history_table {
-    text-align: center;
-    background-color: #9999CC;
-    cursor: pointer;
-}
-
-.history_table2 {
-    text-align: center;
-    background-color: #DBE4E8;
-}
-
-#ab {
-    min-width: 300px;
-}
-
-#ab .ui-accordion-content {
-    padding: 0;
-}
-
-#box {
-    display: none;
-}
-
-#foreignkeychk {
-    text-align: <?php echo $left; ?>;
-    position: absolute;
-    cursor: pointer;
-}
-
-.side-menu {
-    float: left;
-    position: fixed;
-    width: auto;
-    height: auto;
-    background: #efefef;
-    border: 1px solid grey;
-    overflow: hidden;
-    z-index: 50;
-    padding: 2px;
-}
-
-.side-menu.right {
-    float: right;
-    right: 0;
-}
-
-.side-menu .hide {
-    display: none;
-}
-
-.side-menu a {
-    display: block;
-    float: none;
-    overflow: hidden;
-}
-
-.side-menu img,
-.side-menu .text {
-    float: left;
-}
-
-#name-panel {
-    border-bottom: 1px solid grey;
-    text-align: center;
-    background: #efefef;
-    width: 100%;
-    font-size: 1.2em;
-    padding: 10px;
-    font-weight: bold;
-}
-
-#container-form {
-    width: 100%;
-    position: absolute;
-    left: 0;
-}
diff --git a/#pma/themes/pmahomme/css/printview.css b/#pma/themes/pmahomme/css/printview.css
deleted file mode 100644
index 7f3680f1..00000000
--- a/#pma/themes/pmahomme/css/printview.css
+++ /dev/null
@@ -1,170 +0,0 @@
-@media print {
-    #back_button_print_view, #print_button_print_view {
-        display: none;
-    }
-}
-
-/* For removing element from Print View */
-.print_ignore {
-    display: none;
-}
-
-.nowrap {
-    white-space: nowrap;
-}
-
-.hide {
-    display: none;
-}
-
-/* Standard CSS */
-body, table, th, td {
-    color:             #000;
-    background-color:  #fff;
-    font-size: 12px;
-}
-
-/* To remove link text decoration */
-a:link {
-    color:#000;
-    text-decoration:none
-}
-
-/* To remove any image borders */
-img {
-    border: 0;
-}
-
-/* Table specific */
-table, th, td {
-    border: .1em solid #000;
-    background-color: #fff;
-}
-
-table {
-    border-collapse:   collapse;
-    border-spacing:    0.2em;
-}
-
-thead {
-    border-collapse:   collapse;
-    border-spacing:    0.2em;
-    border: .1em solid #000;
-    font-weight: 900;
-}
-
-th, td {
-    padding:           0.2em;
-}
-
-thead th {
-    font-weight:       bold;
-    background-color:  #e5e5e5;
-    border: .1em solid #000;
-}
-
-th.vtop, td.vtop {
-    vertical-align: top;
-}
-
-th.vbottom, td.vbottom {
-    vertical-align: bottom;
-}
-
-/* Common Elements not to be included */
-/* Hide Navigation and Top Menu bar */
-#pma_navigation, #floating_menubar {
-    display: none;
-}
-/* Hide console */
-#pma_console_container {
-    display: none;
-}
-
-/* Hide Navigation items (like Goto Top) */
-#page_nav_icons {
-    display: none;
-}
-
-/* Hide the Create Table form */
-#create_table_form_minimal {
-    display: none;
-}
-
-/* Hide the Page Settings Modal box */
-#page_settings_modal {
-    display: none;
-}
-
-/* Hide footer, Demo notice, errors div */
-#pma_footer, #pma_demo, #pma_errors {
-    display: none;
-}
-
-/* Hide the #selflink div */
-#selflink {
-    display: none;
-}
-
-/* Position the main content */
-#page_content {
-    position: absolute;
-    left: 0;
-    top: 0;
-    width: 95%;
-    float: none;
-}
-
-/* Specific Class for overriding while Print */
-.print {
-    background-color: #000;
-}
-
-/* For the Success message div */
-div.success {
-    background-color: #fff;
-}
-
-.sqlOuter {
-    color: black;
-    background-color: #000;
-}
-
-/* For hiding 'Open a New phpMyAdmin Window' button */
-.ic_window-new, .ic_s_cog {
-    display: none;
-}
-
-.sticky_columns tr {
-    display: none;
-}
-
-#structure-action-links, #addColumns {
-    display: none;
-}
-
-/* Hide extra menu on tbl_structure.php */
-#topmenu2 {
-    display: none;
-}
-
-.cDrop, .cEdit, .cList, .cCpy, .cPointer {
-    display: none;
-}
-
-/* For Odd-Even contrast */
-table tr.odd th,
-table tr.odd td,
-.odd {
-    background: #fff;
-}
-
-table tr.even th,
-table tr.even td,
-.even {
-    background: #dfdfdf;
-}
-
-.column_attribute {
-    font-size: 100%;
-}
diff --git a/#pma/themes/pmahomme/css/resizable-menu.css.php b/#pma/themes/pmahomme/css/resizable-menu.css.php
deleted file mode 100644
index 21d90dc5..00000000
--- a/#pma/themes/pmahomme/css/resizable-menu.css.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Styles for the resizable menus
- *
- * used by js/jquery/jquery.menuResizer-1.0.js
- *
- * @package    PhpMyAdmin-theme
- * @subpackage PMAHomme
- */
-
-// unplanned execution path
-if (! defined('PMA_MINIMUM_COMMON') && ! defined('TESTSUITE')) {
-    exit();
-}
-?>
-ul.resizable-menu a,
-ul.resizable-menu span {
-    display: block;
-    margin: 0;
-    padding: 0;
-    white-space: nowrap;
-}
-
-ul.resizable-menu .submenu {
-    display: none;
-    position: relative;
-}
-
-ul.resizable-menu .shown {
-    display: inline-block;
-}
-
-ul.resizable-menu ul {
-    margin: 0;
-    padding: 0;
-    position: absolute;
-    list-style-type: none;
-    display: none;
-    border: 1px #ddd solid;
-    z-index: 2;
-    <?php echo $right; ?>: 0;
-}
-
-ul.resizable-menu li:hover {
-    <?php echo $_SESSION['PMA_Theme']->getCssGradient('ffffff', 'e5e5e5'); ?>
-}
-
-ul.resizable-menu li:hover ul,
-ul.resizable-menu .submenuhover ul {
-    display: block;
-    background: #fff;
-}
-
-ul.resizable-menu ul li {
-    width: 100%;
-}
diff --git a/#pma/themes/pmahomme/css/rte.css.php b/#pma/themes/pmahomme/css/rte.css.php
deleted file mode 100644
index 55d7832e..00000000
--- a/#pma/themes/pmahomme/css/rte.css.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Styles for management of Routines, Triggers and Events
- * for the pmahomme theme
- *
- * @package    PhpMyAdmin-theme
- * @subpackage PMAHomme
- */
-
-// unplanned execution path
-if (! defined('PMA_MINIMUM_COMMON') && ! defined('TESTSUITE')) {
-    exit();
-}
-?>
-
-.rte_table {
-    table-layout: fixed;
-}
-
-.rte_table td {
-    vertical-align: middle;
-    padding: 0.2em;
-}
-
-.rte_table tr td:nth-child(1) {
-    font-weight: bold;
-}
-
-.rte_table input,
-.rte_table select,
-.rte_table textarea {
-    width: 100%;
-    margin: 0;
-    box-sizing: border-box;
-    -ms-box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    -webkit-box-sizing: border-box;
-}
-
-.rte_table input[type=checkbox],
-.rte_table input[type=radio] {
-    width: auto;
-    margin-right: 6px;
-}
-
-.rte_table .routine_params_table {
-    width: 100%;
-}
diff --git a/#pma/themes/pmahomme/img/ajax_clock_small.gif b/#pma/themes/pmahomme/img/ajax_clock_small.gif
deleted file mode 100644
index bde4932c..00000000
Binary files a/#pma/themes/pmahomme/img/ajax_clock_small.gif and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/arrow_ltr.png b/#pma/themes/pmahomme/img/arrow_ltr.png
deleted file mode 100644
index 7ff8ed9c..00000000
Binary files a/#pma/themes/pmahomme/img/arrow_ltr.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/arrow_rtl.png b/#pma/themes/pmahomme/img/arrow_rtl.png
deleted file mode 100644
index 0192d103..00000000
Binary files a/#pma/themes/pmahomme/img/arrow_rtl.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/asc_order.png b/#pma/themes/pmahomme/img/asc_order.png
deleted file mode 100644
index f8d09ccb..00000000
Binary files a/#pma/themes/pmahomme/img/asc_order.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_bookmark.png b/#pma/themes/pmahomme/img/b_bookmark.png
deleted file mode 100644
index 0bc3caf5..00000000
Binary files a/#pma/themes/pmahomme/img/b_bookmark.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_browse.png b/#pma/themes/pmahomme/img/b_browse.png
deleted file mode 100644
index 64dbe2c5..00000000
Binary files a/#pma/themes/pmahomme/img/b_browse.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_calendar.png b/#pma/themes/pmahomme/img/b_calendar.png
deleted file mode 100644
index 23254a6a..00000000
Binary files a/#pma/themes/pmahomme/img/b_calendar.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_chart.png b/#pma/themes/pmahomme/img/b_chart.png
deleted file mode 100644
index 741e9b59..00000000
Binary files a/#pma/themes/pmahomme/img/b_chart.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_close.png b/#pma/themes/pmahomme/img/b_close.png
deleted file mode 100644
index 2c234b6f..00000000
Binary files a/#pma/themes/pmahomme/img/b_close.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_column_add.png b/#pma/themes/pmahomme/img/b_column_add.png
deleted file mode 100644
index 87fd6b28..00000000
Binary files a/#pma/themes/pmahomme/img/b_column_add.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_comment.png b/#pma/themes/pmahomme/img/b_comment.png
deleted file mode 100644
index b6c39693..00000000
Binary files a/#pma/themes/pmahomme/img/b_comment.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_dbstatistics.png b/#pma/themes/pmahomme/img/b_dbstatistics.png
deleted file mode 100644
index 741e9b59..00000000
Binary files a/#pma/themes/pmahomme/img/b_dbstatistics.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_deltbl.png b/#pma/themes/pmahomme/img/b_deltbl.png
deleted file mode 100644
index 867996bc..00000000
Binary files a/#pma/themes/pmahomme/img/b_deltbl.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_docs.png b/#pma/themes/pmahomme/img/b_docs.png
deleted file mode 100644
index 0bf05632..00000000
Binary files a/#pma/themes/pmahomme/img/b_docs.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_docsql.png b/#pma/themes/pmahomme/img/b_docsql.png
deleted file mode 100644
index 81c8b044..00000000
Binary files a/#pma/themes/pmahomme/img/b_docsql.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_drop.png b/#pma/themes/pmahomme/img/b_drop.png
deleted file mode 100644
index 012acf15..00000000
Binary files a/#pma/themes/pmahomme/img/b_drop.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_edit.png b/#pma/themes/pmahomme/img/b_edit.png
deleted file mode 100644
index a6426ae8..00000000
Binary files a/#pma/themes/pmahomme/img/b_edit.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_empty.png b/#pma/themes/pmahomme/img/b_empty.png
deleted file mode 100644
index fd6ec8d7..00000000
Binary files a/#pma/themes/pmahomme/img/b_empty.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_engine.png b/#pma/themes/pmahomme/img/b_engine.png
deleted file mode 100644
index 4d5f80d9..00000000
Binary files a/#pma/themes/pmahomme/img/b_engine.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_event_add.png b/#pma/themes/pmahomme/img/b_event_add.png
deleted file mode 100644
index ef594b10..00000000
Binary files a/#pma/themes/pmahomme/img/b_event_add.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_events.png b/#pma/themes/pmahomme/img/b_events.png
deleted file mode 100644
index 86bcc87f..00000000
Binary files a/#pma/themes/pmahomme/img/b_events.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_export.png b/#pma/themes/pmahomme/img/b_export.png
deleted file mode 100644
index 367c1156..00000000
Binary files a/#pma/themes/pmahomme/img/b_export.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_favorite.png b/#pma/themes/pmahomme/img/b_favorite.png
deleted file mode 100644
index f2ec2e9a..00000000
Binary files a/#pma/themes/pmahomme/img/b_favorite.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_find_replace.png b/#pma/themes/pmahomme/img/b_find_replace.png
deleted file mode 100644
index e6249b5c..00000000
Binary files a/#pma/themes/pmahomme/img/b_find_replace.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_firstpage.png b/#pma/themes/pmahomme/img/b_firstpage.png
deleted file mode 100644
index e1242e61..00000000
Binary files a/#pma/themes/pmahomme/img/b_firstpage.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_ftext.png b/#pma/themes/pmahomme/img/b_ftext.png
deleted file mode 100644
index f991a4dc..00000000
Binary files a/#pma/themes/pmahomme/img/b_ftext.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_globe.gif b/#pma/themes/pmahomme/img/b_globe.gif
deleted file mode 100644
index ef03dcf0..00000000
Binary files a/#pma/themes/pmahomme/img/b_globe.gif and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_group.png b/#pma/themes/pmahomme/img/b_group.png
deleted file mode 100644
index 4530760b..00000000
Binary files a/#pma/themes/pmahomme/img/b_group.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_help.png b/#pma/themes/pmahomme/img/b_help.png
deleted file mode 100644
index 730b7f9e..00000000
Binary files a/#pma/themes/pmahomme/img/b_help.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_home.png b/#pma/themes/pmahomme/img/b_home.png
deleted file mode 100644
index 75966aac..00000000
Binary files a/#pma/themes/pmahomme/img/b_home.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_import.png b/#pma/themes/pmahomme/img/b_import.png
deleted file mode 100644
index 4e115ab6..00000000
Binary files a/#pma/themes/pmahomme/img/b_import.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_index.png b/#pma/themes/pmahomme/img/b_index.png
deleted file mode 100644
index 93bf593c..00000000
Binary files a/#pma/themes/pmahomme/img/b_index.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_index_add.png b/#pma/themes/pmahomme/img/b_index_add.png
deleted file mode 100644
index a703bd6b..00000000
Binary files a/#pma/themes/pmahomme/img/b_index_add.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_info.png b/#pma/themes/pmahomme/img/b_info.png
deleted file mode 100644
index cfd49e52..00000000
Binary files a/#pma/themes/pmahomme/img/b_info.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_inline_edit.png b/#pma/themes/pmahomme/img/b_inline_edit.png
deleted file mode 100644
index 5afdba10..00000000
Binary files a/#pma/themes/pmahomme/img/b_inline_edit.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_insrow.png b/#pma/themes/pmahomme/img/b_insrow.png
deleted file mode 100644
index 05328711..00000000
Binary files a/#pma/themes/pmahomme/img/b_insrow.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_lastpage.png b/#pma/themes/pmahomme/img/b_lastpage.png
deleted file mode 100644
index 03102d9b..00000000
Binary files a/#pma/themes/pmahomme/img/b_lastpage.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_minus.png b/#pma/themes/pmahomme/img/b_minus.png
deleted file mode 100644
index c0575ca8..00000000
Binary files a/#pma/themes/pmahomme/img/b_minus.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_more.png b/#pma/themes/pmahomme/img/b_more.png
deleted file mode 100644
index 681f862b..00000000
Binary files a/#pma/themes/pmahomme/img/b_more.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_move.png b/#pma/themes/pmahomme/img/b_move.png
deleted file mode 100644
index b8b5f4af..00000000
Binary files a/#pma/themes/pmahomme/img/b_move.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_newdb.png b/#pma/themes/pmahomme/img/b_newdb.png
deleted file mode 100644
index 22d1fe0c..00000000
Binary files a/#pma/themes/pmahomme/img/b_newdb.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_newtbl.png b/#pma/themes/pmahomme/img/b_newtbl.png
deleted file mode 100644
index 7402ad88..00000000
Binary files a/#pma/themes/pmahomme/img/b_newtbl.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_nextpage.png b/#pma/themes/pmahomme/img/b_nextpage.png
deleted file mode 100644
index 6169d538..00000000
Binary files a/#pma/themes/pmahomme/img/b_nextpage.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_no_favorite.png b/#pma/themes/pmahomme/img/b_no_favorite.png
deleted file mode 100644
index dbb883ec..00000000
Binary files a/#pma/themes/pmahomme/img/b_no_favorite.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_pdfdoc.png b/#pma/themes/pmahomme/img/b_pdfdoc.png
deleted file mode 100644
index f5759ea9..00000000
Binary files a/#pma/themes/pmahomme/img/b_pdfdoc.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_plugin.png b/#pma/themes/pmahomme/img/b_plugin.png
deleted file mode 100644
index 6187b15a..00000000
Binary files a/#pma/themes/pmahomme/img/b_plugin.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_plus.png b/#pma/themes/pmahomme/img/b_plus.png
deleted file mode 100644
index 40668150..00000000
Binary files a/#pma/themes/pmahomme/img/b_plus.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_prevpage.png b/#pma/themes/pmahomme/img/b_prevpage.png
deleted file mode 100644
index 0a3b85d0..00000000
Binary files a/#pma/themes/pmahomme/img/b_prevpage.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_primary.png b/#pma/themes/pmahomme/img/b_primary.png
deleted file mode 100644
index d27b04b1..00000000
Binary files a/#pma/themes/pmahomme/img/b_primary.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_print.png b/#pma/themes/pmahomme/img/b_print.png
deleted file mode 100644
index 830defcd..00000000
Binary files a/#pma/themes/pmahomme/img/b_print.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_props.png b/#pma/themes/pmahomme/img/b_props.png
deleted file mode 100644
index c0895fe6..00000000
Binary files a/#pma/themes/pmahomme/img/b_props.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_relations.png b/#pma/themes/pmahomme/img/b_relations.png
deleted file mode 100644
index 0ef2521d..00000000
Binary files a/#pma/themes/pmahomme/img/b_relations.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_report.png b/#pma/themes/pmahomme/img/b_report.png
deleted file mode 100644
index 779ad58e..00000000
Binary files a/#pma/themes/pmahomme/img/b_report.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_routine_add.png b/#pma/themes/pmahomme/img/b_routine_add.png
deleted file mode 100644
index 2d144426..00000000
Binary files a/#pma/themes/pmahomme/img/b_routine_add.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_routines.png b/#pma/themes/pmahomme/img/b_routines.png
deleted file mode 100644
index 2cc102d3..00000000
Binary files a/#pma/themes/pmahomme/img/b_routines.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_save.png b/#pma/themes/pmahomme/img/b_save.png
deleted file mode 100644
index 4192901a..00000000
Binary files a/#pma/themes/pmahomme/img/b_save.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_saveimage.png b/#pma/themes/pmahomme/img/b_saveimage.png
deleted file mode 100644
index 777fb5d2..00000000
Binary files a/#pma/themes/pmahomme/img/b_saveimage.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_sbrowse.png b/#pma/themes/pmahomme/img/b_sbrowse.png
deleted file mode 100644
index 64dbe2c5..00000000
Binary files a/#pma/themes/pmahomme/img/b_sbrowse.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_sdb.png b/#pma/themes/pmahomme/img/b_sdb.png
deleted file mode 100644
index 0f57239b..00000000
Binary files a/#pma/themes/pmahomme/img/b_sdb.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_search.png b/#pma/themes/pmahomme/img/b_search.png
deleted file mode 100644
index b6ac5b91..00000000
Binary files a/#pma/themes/pmahomme/img/b_search.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_select.png b/#pma/themes/pmahomme/img/b_select.png
deleted file mode 100644
index 0fab0e6d..00000000
Binary files a/#pma/themes/pmahomme/img/b_select.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_snewtbl.png b/#pma/themes/pmahomme/img/b_snewtbl.png
deleted file mode 100644
index 1d8b3ef0..00000000
Binary files a/#pma/themes/pmahomme/img/b_snewtbl.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_spatial.png b/#pma/themes/pmahomme/img/b_spatial.png
deleted file mode 100644
index 5e6c8c72..00000000
Binary files a/#pma/themes/pmahomme/img/b_spatial.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_sql.png b/#pma/themes/pmahomme/img/b_sql.png
deleted file mode 100644
index a4d3f027..00000000
Binary files a/#pma/themes/pmahomme/img/b_sql.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_sqldoc.png b/#pma/themes/pmahomme/img/b_sqldoc.png
deleted file mode 100644
index 5051757e..00000000
Binary files a/#pma/themes/pmahomme/img/b_sqldoc.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_sqlhelp.png b/#pma/themes/pmahomme/img/b_sqlhelp.png
deleted file mode 100644
index 08a13f21..00000000
Binary files a/#pma/themes/pmahomme/img/b_sqlhelp.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_table_add.png b/#pma/themes/pmahomme/img/b_table_add.png
deleted file mode 100644
index 98753b26..00000000
Binary files a/#pma/themes/pmahomme/img/b_table_add.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_tblanalyse.png b/#pma/themes/pmahomme/img/b_tblanalyse.png
deleted file mode 100644
index 604f1d5f..00000000
Binary files a/#pma/themes/pmahomme/img/b_tblanalyse.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_tblexport.png b/#pma/themes/pmahomme/img/b_tblexport.png
deleted file mode 100644
index 367c1156..00000000
Binary files a/#pma/themes/pmahomme/img/b_tblexport.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_tblimport.png b/#pma/themes/pmahomme/img/b_tblimport.png
deleted file mode 100644
index 4e115ab6..00000000
Binary files a/#pma/themes/pmahomme/img/b_tblimport.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_tblops.png b/#pma/themes/pmahomme/img/b_tblops.png
deleted file mode 100644
index 153b267b..00000000
Binary files a/#pma/themes/pmahomme/img/b_tblops.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_tbloptimize.png b/#pma/themes/pmahomme/img/b_tbloptimize.png
deleted file mode 100644
index 04e7c3eb..00000000
Binary files a/#pma/themes/pmahomme/img/b_tbloptimize.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_tipp.png b/#pma/themes/pmahomme/img/b_tipp.png
deleted file mode 100644
index 13e05171..00000000
Binary files a/#pma/themes/pmahomme/img/b_tipp.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_trigger_add.png b/#pma/themes/pmahomme/img/b_trigger_add.png
deleted file mode 100644
index 8a754dfe..00000000
Binary files a/#pma/themes/pmahomme/img/b_trigger_add.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_triggers.png b/#pma/themes/pmahomme/img/b_triggers.png
deleted file mode 100644
index 84a89ef4..00000000
Binary files a/#pma/themes/pmahomme/img/b_triggers.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_undo.png b/#pma/themes/pmahomme/img/b_undo.png
deleted file mode 100644
index 981c6b22..00000000
Binary files a/#pma/themes/pmahomme/img/b_undo.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_unique.png b/#pma/themes/pmahomme/img/b_unique.png
deleted file mode 100644
index 0ec7d576..00000000
Binary files a/#pma/themes/pmahomme/img/b_unique.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_usradd.png b/#pma/themes/pmahomme/img/b_usradd.png
deleted file mode 100644
index 50fc6a26..00000000
Binary files a/#pma/themes/pmahomme/img/b_usradd.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_usrcheck.png b/#pma/themes/pmahomme/img/b_usrcheck.png
deleted file mode 100644
index a3edfb1c..00000000
Binary files a/#pma/themes/pmahomme/img/b_usrcheck.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_usrdrop.png b/#pma/themes/pmahomme/img/b_usrdrop.png
deleted file mode 100644
index 7d5e6990..00000000
Binary files a/#pma/themes/pmahomme/img/b_usrdrop.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_usredit.png b/#pma/themes/pmahomme/img/b_usredit.png
deleted file mode 100644
index 79393d6a..00000000
Binary files a/#pma/themes/pmahomme/img/b_usredit.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_usrlist.png b/#pma/themes/pmahomme/img/b_usrlist.png
deleted file mode 100644
index 2a67259d..00000000
Binary files a/#pma/themes/pmahomme/img/b_usrlist.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_versions.png b/#pma/themes/pmahomme/img/b_versions.png
deleted file mode 100644
index da5c622e..00000000
Binary files a/#pma/themes/pmahomme/img/b_versions.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_view.png b/#pma/themes/pmahomme/img/b_view.png
deleted file mode 100644
index 96f90eb2..00000000
Binary files a/#pma/themes/pmahomme/img/b_view.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_view_add.png b/#pma/themes/pmahomme/img/b_view_add.png
deleted file mode 100644
index 9c2cff66..00000000
Binary files a/#pma/themes/pmahomme/img/b_view_add.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/b_views.png b/#pma/themes/pmahomme/img/b_views.png
deleted file mode 100644
index b1c78e32..00000000
Binary files a/#pma/themes/pmahomme/img/b_views.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/bd_browse.png b/#pma/themes/pmahomme/img/bd_browse.png
deleted file mode 100644
index d21edab1..00000000
Binary files a/#pma/themes/pmahomme/img/bd_browse.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/bd_deltbl.png b/#pma/themes/pmahomme/img/bd_deltbl.png
deleted file mode 100644
index a5449371..00000000
Binary files a/#pma/themes/pmahomme/img/bd_deltbl.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/bd_drop.png b/#pma/themes/pmahomme/img/bd_drop.png
deleted file mode 100644
index 20120db7..00000000
Binary files a/#pma/themes/pmahomme/img/bd_drop.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/bd_edit.png b/#pma/themes/pmahomme/img/bd_edit.png
deleted file mode 100644
index 6478c24a..00000000
Binary files a/#pma/themes/pmahomme/img/bd_edit.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/bd_empty.png b/#pma/themes/pmahomme/img/bd_empty.png
deleted file mode 100644
index 2accb4d5..00000000
Binary files a/#pma/themes/pmahomme/img/bd_empty.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/bd_export.png b/#pma/themes/pmahomme/img/bd_export.png
deleted file mode 100644
index 90caa026..00000000
Binary files a/#pma/themes/pmahomme/img/bd_export.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/bd_firstpage.png b/#pma/themes/pmahomme/img/bd_firstpage.png
deleted file mode 100644
index 586bbba5..00000000
Binary files a/#pma/themes/pmahomme/img/bd_firstpage.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/bd_ftext.png b/#pma/themes/pmahomme/img/bd_ftext.png
deleted file mode 100644
index da469fcb..00000000
Binary files a/#pma/themes/pmahomme/img/bd_ftext.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/bd_index.png b/#pma/themes/pmahomme/img/bd_index.png
deleted file mode 100644
index b899ba4e..00000000
Binary files a/#pma/themes/pmahomme/img/bd_index.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/bd_insrow.png b/#pma/themes/pmahomme/img/bd_insrow.png
deleted file mode 100644
index 5162577e..00000000
Binary files a/#pma/themes/pmahomme/img/bd_insrow.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/bd_lastpage.png b/#pma/themes/pmahomme/img/bd_lastpage.png
deleted file mode 100644
index b3ccb6ad..00000000
Binary files a/#pma/themes/pmahomme/img/bd_lastpage.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/bd_nextpage.png b/#pma/themes/pmahomme/img/bd_nextpage.png
deleted file mode 100644
index 244cdbd2..00000000
Binary files a/#pma/themes/pmahomme/img/bd_nextpage.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/bd_prevpage.png b/#pma/themes/pmahomme/img/bd_prevpage.png
deleted file mode 100644
index e0073cfa..00000000
Binary files a/#pma/themes/pmahomme/img/bd_prevpage.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/bd_primary.png b/#pma/themes/pmahomme/img/bd_primary.png
deleted file mode 100644
index b6c71c70..00000000
Binary files a/#pma/themes/pmahomme/img/bd_primary.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/bd_routine_add.png b/#pma/themes/pmahomme/img/bd_routine_add.png
deleted file mode 100644
index 91ec8e1f..00000000
Binary files a/#pma/themes/pmahomme/img/bd_routine_add.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/bd_sbrowse.png b/#pma/themes/pmahomme/img/bd_sbrowse.png
deleted file mode 100644
index d21edab1..00000000
Binary files a/#pma/themes/pmahomme/img/bd_sbrowse.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/bd_select.png b/#pma/themes/pmahomme/img/bd_select.png
deleted file mode 100644
index 2533e690..00000000
Binary files a/#pma/themes/pmahomme/img/bd_select.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/bd_spatial.png b/#pma/themes/pmahomme/img/bd_spatial.png
deleted file mode 100644
index f8fbf841..00000000
Binary files a/#pma/themes/pmahomme/img/bd_spatial.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/bd_unique.png b/#pma/themes/pmahomme/img/bd_unique.png
deleted file mode 100644
index 81cb9287..00000000
Binary files a/#pma/themes/pmahomme/img/bd_unique.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/centralColumns.png b/#pma/themes/pmahomme/img/centralColumns.png
deleted file mode 100644
index ae82638e..00000000
Binary files a/#pma/themes/pmahomme/img/centralColumns.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/centralColumns_add.png b/#pma/themes/pmahomme/img/centralColumns_add.png
deleted file mode 100644
index 42c93b04..00000000
Binary files a/#pma/themes/pmahomme/img/centralColumns_add.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/centralColumns_delete.png b/#pma/themes/pmahomme/img/centralColumns_delete.png
deleted file mode 100644
index c2214c8b..00000000
Binary files a/#pma/themes/pmahomme/img/centralColumns_delete.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/col_drop.png b/#pma/themes/pmahomme/img/col_drop.png
deleted file mode 100644
index 681f862b..00000000
Binary files a/#pma/themes/pmahomme/img/col_drop.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/col_pointer.png b/#pma/themes/pmahomme/img/col_pointer.png
deleted file mode 100644
index 7147edb5..00000000
Binary files a/#pma/themes/pmahomme/img/col_pointer.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/col_pointer_ver.png b/#pma/themes/pmahomme/img/col_pointer_ver.png
deleted file mode 100644
index 1cbadec0..00000000
Binary files a/#pma/themes/pmahomme/img/col_pointer_ver.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/console.png b/#pma/themes/pmahomme/img/console.png
deleted file mode 100644
index 625d0216..00000000
Binary files a/#pma/themes/pmahomme/img/console.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/database.png b/#pma/themes/pmahomme/img/database.png
deleted file mode 100644
index 9cc16be9..00000000
Binary files a/#pma/themes/pmahomme/img/database.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/east-mini.png b/#pma/themes/pmahomme/img/east-mini.png
deleted file mode 100644
index bee419d6..00000000
Binary files a/#pma/themes/pmahomme/img/east-mini.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/error.ico b/#pma/themes/pmahomme/img/error.ico
deleted file mode 100644
index 8f4d509d..00000000
Binary files a/#pma/themes/pmahomme/img/error.ico and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/eye.png b/#pma/themes/pmahomme/img/eye.png
deleted file mode 100644
index ed38db23..00000000
Binary files a/#pma/themes/pmahomme/img/eye.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/eye_grey.png b/#pma/themes/pmahomme/img/eye_grey.png
deleted file mode 100644
index 6fcae474..00000000
Binary files a/#pma/themes/pmahomme/img/eye_grey.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/item.png b/#pma/themes/pmahomme/img/item.png
deleted file mode 100644
index 5465aaf9..00000000
Binary files a/#pma/themes/pmahomme/img/item.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/left_nav_bg.png b/#pma/themes/pmahomme/img/left_nav_bg.png
deleted file mode 100644
index 864ba158..00000000
Binary files a/#pma/themes/pmahomme/img/left_nav_bg.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/lightbulb.png b/#pma/themes/pmahomme/img/lightbulb.png
deleted file mode 100644
index d22fde8b..00000000
Binary files a/#pma/themes/pmahomme/img/lightbulb.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/lightbulb_off.png b/#pma/themes/pmahomme/img/lightbulb_off.png
deleted file mode 100644
index e95b8c5b..00000000
Binary files a/#pma/themes/pmahomme/img/lightbulb_off.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/logo_left.png b/#pma/themes/pmahomme/img/logo_left.png
deleted file mode 100644
index b7adbf86..00000000
Binary files a/#pma/themes/pmahomme/img/logo_left.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/logo_right.png b/#pma/themes/pmahomme/img/logo_right.png
deleted file mode 100644
index d61c6284..00000000
Binary files a/#pma/themes/pmahomme/img/logo_right.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/more.png b/#pma/themes/pmahomme/img/more.png
deleted file mode 100644
index 32aaf61a..00000000
Binary files a/#pma/themes/pmahomme/img/more.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/new_data.png b/#pma/themes/pmahomme/img/new_data.png
deleted file mode 100644
index 6f4e1863..00000000
Binary files a/#pma/themes/pmahomme/img/new_data.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/new_data_hovered.png b/#pma/themes/pmahomme/img/new_data_hovered.png
deleted file mode 100644
index a470dbbc..00000000
Binary files a/#pma/themes/pmahomme/img/new_data_hovered.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/new_data_selected.png b/#pma/themes/pmahomme/img/new_data_selected.png
deleted file mode 100644
index a75abe34..00000000
Binary files a/#pma/themes/pmahomme/img/new_data_selected.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/new_data_selected_hovered.png b/#pma/themes/pmahomme/img/new_data_selected_hovered.png
deleted file mode 100644
index 04a2ad84..00000000
Binary files a/#pma/themes/pmahomme/img/new_data_selected_hovered.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/new_struct.png b/#pma/themes/pmahomme/img/new_struct.png
deleted file mode 100644
index 0f7302f8..00000000
Binary files a/#pma/themes/pmahomme/img/new_struct.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/new_struct_hovered.png b/#pma/themes/pmahomme/img/new_struct_hovered.png
deleted file mode 100644
index 70e2ab87..00000000
Binary files a/#pma/themes/pmahomme/img/new_struct_hovered.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/new_struct_selected.png b/#pma/themes/pmahomme/img/new_struct_selected.png
deleted file mode 100644
index 142bf115..00000000
Binary files a/#pma/themes/pmahomme/img/new_struct_selected.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/new_struct_selected_hovered.png b/#pma/themes/pmahomme/img/new_struct_selected_hovered.png
deleted file mode 100644
index 9a82bc42..00000000
Binary files a/#pma/themes/pmahomme/img/new_struct_selected_hovered.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/normalize.png b/#pma/themes/pmahomme/img/normalize.png
deleted file mode 100644
index e8b146ff..00000000
Binary files a/#pma/themes/pmahomme/img/normalize.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/north-mini.png b/#pma/themes/pmahomme/img/north-mini.png
deleted file mode 100644
index 8283839c..00000000
Binary files a/#pma/themes/pmahomme/img/north-mini.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/pause.png b/#pma/themes/pmahomme/img/pause.png
deleted file mode 100644
index 46a6318d..00000000
Binary files a/#pma/themes/pmahomme/img/pause.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/php_sym.png b/#pma/themes/pmahomme/img/php_sym.png
deleted file mode 100644
index cd5e9b8a..00000000
Binary files a/#pma/themes/pmahomme/img/php_sym.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/play.png b/#pma/themes/pmahomme/img/play.png
deleted file mode 100644
index 6169d538..00000000
Binary files a/#pma/themes/pmahomme/img/play.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/pma_logo2.png b/#pma/themes/pmahomme/img/pma_logo2.png
deleted file mode 100644
index bc17b986..00000000
Binary files a/#pma/themes/pmahomme/img/pma_logo2.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/pmd/1.png b/#pma/themes/pmahomme/img/pmd/1.png
deleted file mode 100644
index 48b9d3f9..00000000
Binary files a/#pma/themes/pmahomme/img/pmd/1.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/pmd/2.png b/#pma/themes/pmahomme/img/pmd/2.png
deleted file mode 100644
index 7545d86f..00000000
Binary files a/#pma/themes/pmahomme/img/pmd/2.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/pmd/2leftarrow.png b/#pma/themes/pmahomme/img/pmd/2leftarrow.png
deleted file mode 100644
index e33e21cf..00000000
Binary files a/#pma/themes/pmahomme/img/pmd/2leftarrow.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/pmd/2leftarrow_m.png b/#pma/themes/pmahomme/img/pmd/2leftarrow_m.png
deleted file mode 100644
index 6ec8d81c..00000000
Binary files a/#pma/themes/pmahomme/img/pmd/2leftarrow_m.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/pmd/2rightarrow.png b/#pma/themes/pmahomme/img/pmd/2rightarrow.png
deleted file mode 100644
index b6554ae7..00000000
Binary files a/#pma/themes/pmahomme/img/pmd/2rightarrow.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/pmd/2rightarrow_m.png b/#pma/themes/pmahomme/img/pmd/2rightarrow_m.png
deleted file mode 100644
index e5ff1f0b..00000000
Binary files a/#pma/themes/pmahomme/img/pmd/2rightarrow_m.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/pmd/3.png b/#pma/themes/pmahomme/img/pmd/3.png
deleted file mode 100644
index 46179111..00000000
Binary files a/#pma/themes/pmahomme/img/pmd/3.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/pmd/4.png b/#pma/themes/pmahomme/img/pmd/4.png
deleted file mode 100644
index 9b534594..00000000
Binary files a/#pma/themes/pmahomme/img/pmd/4.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/pmd/5.png b/#pma/themes/pmahomme/img/pmd/5.png
deleted file mode 100644
index 51f536dc..00000000
Binary files a/#pma/themes/pmahomme/img/pmd/5.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/pmd/6.png b/#pma/themes/pmahomme/img/pmd/6.png
deleted file mode 100644
index ed93cfee..00000000
Binary files a/#pma/themes/pmahomme/img/pmd/6.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/pmd/7.png b/#pma/themes/pmahomme/img/pmd/7.png
deleted file mode 100644
index 7c7530f1..00000000
Binary files a/#pma/themes/pmahomme/img/pmd/7.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/pmd/8.png b/#pma/themes/pmahomme/img/pmd/8.png
deleted file mode 100644
index 451998d1..00000000
Binary files a/#pma/themes/pmahomme/img/pmd/8.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/pmd/FieldKey_small.png b/#pma/themes/pmahomme/img/pmd/FieldKey_small.png
deleted file mode 100644
index 8a55b161..00000000
Binary files a/#pma/themes/pmahomme/img/pmd/FieldKey_small.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/pmd/Field_small.png b/#pma/themes/pmahomme/img/pmd/Field_small.png
deleted file mode 100644
index 4d80059a..00000000
Binary files a/#pma/themes/pmahomme/img/pmd/Field_small.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/pmd/Field_small_char.png b/#pma/themes/pmahomme/img/pmd/Field_small_char.png
deleted file mode 100644
index dcaa1c61..00000000
Binary files a/#pma/themes/pmahomme/img/pmd/Field_small_char.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/pmd/Field_small_date.png b/#pma/themes/pmahomme/img/pmd/Field_small_date.png
deleted file mode 100644
index 259a8d98..00000000
Binary files a/#pma/themes/pmahomme/img/pmd/Field_small_date.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/pmd/Field_small_int.png b/#pma/themes/pmahomme/img/pmd/Field_small_int.png
deleted file mode 100644
index 70f3f38d..00000000
Binary files a/#pma/themes/pmahomme/img/pmd/Field_small_int.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/pmd/Header.png b/#pma/themes/pmahomme/img/pmd/Header.png
deleted file mode 100644
index 1f33ef7c..00000000
Binary files a/#pma/themes/pmahomme/img/pmd/Header.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/pmd/Header_Linked.png b/#pma/themes/pmahomme/img/pmd/Header_Linked.png
deleted file mode 100644
index d185fe45..00000000
Binary files a/#pma/themes/pmahomme/img/pmd/Header_Linked.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/pmd/anchor.png b/#pma/themes/pmahomme/img/pmd/anchor.png
deleted file mode 100644
index 9b3422c6..00000000
Binary files a/#pma/themes/pmahomme/img/pmd/anchor.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/pmd/and_icon.png b/#pma/themes/pmahomme/img/pmd/and_icon.png
deleted file mode 100644
index 3767aba9..00000000
Binary files a/#pma/themes/pmahomme/img/pmd/and_icon.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/pmd/ang_direct.png b/#pma/themes/pmahomme/img/pmd/ang_direct.png
deleted file mode 100644
index 2be3f29a..00000000
Binary files a/#pma/themes/pmahomme/img/pmd/ang_direct.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/pmd/bord.png b/#pma/themes/pmahomme/img/pmd/bord.png
deleted file mode 100644
index 351b9591..00000000
Binary files a/#pma/themes/pmahomme/img/pmd/bord.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/pmd/bottom.png b/#pma/themes/pmahomme/img/pmd/bottom.png
deleted file mode 100644
index 97abfc93..00000000
Binary files a/#pma/themes/pmahomme/img/pmd/bottom.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/pmd/def.png b/#pma/themes/pmahomme/img/pmd/def.png
deleted file mode 100644
index 33d55930..00000000
Binary files a/#pma/themes/pmahomme/img/pmd/def.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/pmd/display_field.png b/#pma/themes/pmahomme/img/pmd/display_field.png
deleted file mode 100644
index a7d7cb4e..00000000
Binary files a/#pma/themes/pmahomme/img/pmd/display_field.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/pmd/downarrow1.png b/#pma/themes/pmahomme/img/pmd/downarrow1.png
deleted file mode 100644
index 80632dd5..00000000
Binary files a/#pma/themes/pmahomme/img/pmd/downarrow1.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/pmd/downarrow2.png b/#pma/themes/pmahomme/img/pmd/downarrow2.png
deleted file mode 100644
index 2c925e9d..00000000
Binary files a/#pma/themes/pmahomme/img/pmd/downarrow2.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/pmd/downarrow2_m.png b/#pma/themes/pmahomme/img/pmd/downarrow2_m.png
deleted file mode 100644
index 461eeefb..00000000
Binary files a/#pma/themes/pmahomme/img/pmd/downarrow2_m.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/pmd/exec.png b/#pma/themes/pmahomme/img/pmd/exec.png
deleted file mode 100644
index d5eaa767..00000000
Binary files a/#pma/themes/pmahomme/img/pmd/exec.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/pmd/exec_small.png b/#pma/themes/pmahomme/img/pmd/exec_small.png
deleted file mode 100644
index d5162ea1..00000000
Binary files a/#pma/themes/pmahomme/img/pmd/exec_small.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/pmd/exitFullscreen.png b/#pma/themes/pmahomme/img/pmd/exitFullscreen.png
deleted file mode 100644
index cff388ff..00000000
Binary files a/#pma/themes/pmahomme/img/pmd/exitFullscreen.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/pmd/export.png b/#pma/themes/pmahomme/img/pmd/export.png
deleted file mode 100644
index ea2fd9f3..00000000
Binary files a/#pma/themes/pmahomme/img/pmd/export.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/pmd/favicon.ico b/#pma/themes/pmahomme/img/pmd/favicon.ico
deleted file mode 100644
index 29c2595b..00000000
Binary files a/#pma/themes/pmahomme/img/pmd/favicon.ico and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/pmd/grid.png b/#pma/themes/pmahomme/img/pmd/grid.png
deleted file mode 100644
index 6aee6e5b..00000000
Binary files a/#pma/themes/pmahomme/img/pmd/grid.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/pmd/help.png b/#pma/themes/pmahomme/img/pmd/help.png
deleted file mode 100644
index 65cfd09c..00000000
Binary files a/#pma/themes/pmahomme/img/pmd/help.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/pmd/help_relation.png b/#pma/themes/pmahomme/img/pmd/help_relation.png
deleted file mode 100644
index 3bcaac08..00000000
Binary files a/#pma/themes/pmahomme/img/pmd/help_relation.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/pmd/left_panel_butt.png b/#pma/themes/pmahomme/img/pmd/left_panel_butt.png
deleted file mode 100644
index 492f84cd..00000000
Binary files a/#pma/themes/pmahomme/img/pmd/left_panel_butt.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/pmd/left_panel_tab.png b/#pma/themes/pmahomme/img/pmd/left_panel_tab.png
deleted file mode 100644
index 733588e3..00000000
Binary files a/#pma/themes/pmahomme/img/pmd/left_panel_tab.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/pmd/minus.png b/#pma/themes/pmahomme/img/pmd/minus.png
deleted file mode 100644
index 664956f3..00000000
Binary files a/#pma/themes/pmahomme/img/pmd/minus.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/pmd/or_icon.png b/#pma/themes/pmahomme/img/pmd/or_icon.png
deleted file mode 100644
index 5a12061c..00000000
Binary files a/#pma/themes/pmahomme/img/pmd/or_icon.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/pmd/page_add.png b/#pma/themes/pmahomme/img/pmd/page_add.png
deleted file mode 100644
index 5681c129..00000000
Binary files a/#pma/themes/pmahomme/img/pmd/page_add.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/pmd/page_delete.png b/#pma/themes/pmahomme/img/pmd/page_delete.png
deleted file mode 100644
index 87951a45..00000000
Binary files a/#pma/themes/pmahomme/img/pmd/page_delete.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/pmd/page_edit.png b/#pma/themes/pmahomme/img/pmd/page_edit.png
deleted file mode 100644
index 8359a6ac..00000000
Binary files a/#pma/themes/pmahomme/img/pmd/page_edit.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/pmd/pdf.png b/#pma/themes/pmahomme/img/pmd/pdf.png
deleted file mode 100644
index 8c110d30..00000000
Binary files a/#pma/themes/pmahomme/img/pmd/pdf.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/pmd/plus.png b/#pma/themes/pmahomme/img/pmd/plus.png
deleted file mode 100644
index 11ef0023..00000000
Binary files a/#pma/themes/pmahomme/img/pmd/plus.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/pmd/query_builder.png b/#pma/themes/pmahomme/img/pmd/query_builder.png
deleted file mode 100644
index 13262f92..00000000
Binary files a/#pma/themes/pmahomme/img/pmd/query_builder.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/pmd/relation.png b/#pma/themes/pmahomme/img/pmd/relation.png
deleted file mode 100644
index b7b541e6..00000000
Binary files a/#pma/themes/pmahomme/img/pmd/relation.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/pmd/reload.png b/#pma/themes/pmahomme/img/pmd/reload.png
deleted file mode 100644
index 63f0b6c9..00000000
Binary files a/#pma/themes/pmahomme/img/pmd/reload.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/pmd/resize.png b/#pma/themes/pmahomme/img/pmd/resize.png
deleted file mode 100644
index 337dae7a..00000000
Binary files a/#pma/themes/pmahomme/img/pmd/resize.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/pmd/resizeright.png b/#pma/themes/pmahomme/img/pmd/resizeright.png
deleted file mode 100644
index 38fc5bc7..00000000
Binary files a/#pma/themes/pmahomme/img/pmd/resizeright.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/pmd/rightarrow1.png b/#pma/themes/pmahomme/img/pmd/rightarrow1.png
deleted file mode 100644
index 6d4f63b0..00000000
Binary files a/#pma/themes/pmahomme/img/pmd/rightarrow1.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/pmd/rightarrow2.png b/#pma/themes/pmahomme/img/pmd/rightarrow2.png
deleted file mode 100644
index 5cecf9ee..00000000
Binary files a/#pma/themes/pmahomme/img/pmd/rightarrow2.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/pmd/save.png b/#pma/themes/pmahomme/img/pmd/save.png
deleted file mode 100644
index 3e65b6ab..00000000
Binary files a/#pma/themes/pmahomme/img/pmd/save.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/pmd/save_as.png b/#pma/themes/pmahomme/img/pmd/save_as.png
deleted file mode 100644
index 08527f9a..00000000
Binary files a/#pma/themes/pmahomme/img/pmd/save_as.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/pmd/small_tab.png b/#pma/themes/pmahomme/img/pmd/small_tab.png
deleted file mode 100644
index 839d74e2..00000000
Binary files a/#pma/themes/pmahomme/img/pmd/small_tab.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/pmd/table.png b/#pma/themes/pmahomme/img/pmd/table.png
deleted file mode 100644
index caf214d2..00000000
Binary files a/#pma/themes/pmahomme/img/pmd/table.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/pmd/toggle_lines.png b/#pma/themes/pmahomme/img/pmd/toggle_lines.png
deleted file mode 100644
index 605b0605..00000000
Binary files a/#pma/themes/pmahomme/img/pmd/toggle_lines.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/pmd/top_panel.png b/#pma/themes/pmahomme/img/pmd/top_panel.png
deleted file mode 100644
index 6856d505..00000000
Binary files a/#pma/themes/pmahomme/img/pmd/top_panel.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/pmd/uparrow2_m.png b/#pma/themes/pmahomme/img/pmd/uparrow2_m.png
deleted file mode 100644
index 2c3b9352..00000000
Binary files a/#pma/themes/pmahomme/img/pmd/uparrow2_m.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/pmd/viewInFullscreen.png b/#pma/themes/pmahomme/img/pmd/viewInFullscreen.png
deleted file mode 100644
index 8692df67..00000000
Binary files a/#pma/themes/pmahomme/img/pmd/viewInFullscreen.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/s_asc.png b/#pma/themes/pmahomme/img/s_asc.png
deleted file mode 100644
index d518fa68..00000000
Binary files a/#pma/themes/pmahomme/img/s_asc.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/s_asci.png b/#pma/themes/pmahomme/img/s_asci.png
deleted file mode 100644
index da50ff9f..00000000
Binary files a/#pma/themes/pmahomme/img/s_asci.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/s_attention.png b/#pma/themes/pmahomme/img/s_attention.png
deleted file mode 100644
index 7f257818..00000000
Binary files a/#pma/themes/pmahomme/img/s_attention.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/s_cancel.png b/#pma/themes/pmahomme/img/s_cancel.png
deleted file mode 100644
index 19974265..00000000
Binary files a/#pma/themes/pmahomme/img/s_cancel.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/s_cancel2.png b/#pma/themes/pmahomme/img/s_cancel2.png
deleted file mode 100644
index 28c60831..00000000
Binary files a/#pma/themes/pmahomme/img/s_cancel2.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/s_cog.png b/#pma/themes/pmahomme/img/s_cog.png
deleted file mode 100644
index e90dd936..00000000
Binary files a/#pma/themes/pmahomme/img/s_cog.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/s_collapseall.png b/#pma/themes/pmahomme/img/s_collapseall.png
deleted file mode 100644
index 8cb7c297..00000000
Binary files a/#pma/themes/pmahomme/img/s_collapseall.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/s_db.png b/#pma/themes/pmahomme/img/s_db.png
deleted file mode 100644
index 9cc16be9..00000000
Binary files a/#pma/themes/pmahomme/img/s_db.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/s_desc.png b/#pma/themes/pmahomme/img/s_desc.png
deleted file mode 100644
index f8d09ccb..00000000
Binary files a/#pma/themes/pmahomme/img/s_desc.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/s_error.png b/#pma/themes/pmahomme/img/s_error.png
deleted file mode 100644
index bb615ff3..00000000
Binary files a/#pma/themes/pmahomme/img/s_error.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/s_error2.png b/#pma/themes/pmahomme/img/s_error2.png
deleted file mode 100644
index e4f02e9a..00000000
Binary files a/#pma/themes/pmahomme/img/s_error2.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/s_fulltext.png b/#pma/themes/pmahomme/img/s_fulltext.png
deleted file mode 100644
index 9f8db13f..00000000
Binary files a/#pma/themes/pmahomme/img/s_fulltext.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/s_host.png b/#pma/themes/pmahomme/img/s_host.png
deleted file mode 100644
index f27c337d..00000000
Binary files a/#pma/themes/pmahomme/img/s_host.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/s_info.png b/#pma/themes/pmahomme/img/s_info.png
deleted file mode 100644
index f636683e..00000000
Binary files a/#pma/themes/pmahomme/img/s_info.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/s_lang.png b/#pma/themes/pmahomme/img/s_lang.png
deleted file mode 100644
index a62fa502..00000000
Binary files a/#pma/themes/pmahomme/img/s_lang.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/s_link.png b/#pma/themes/pmahomme/img/s_link.png
deleted file mode 100644
index babbb64a..00000000
Binary files a/#pma/themes/pmahomme/img/s_link.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/s_lock.png b/#pma/themes/pmahomme/img/s_lock.png
deleted file mode 100644
index 2ebc4f6f..00000000
Binary files a/#pma/themes/pmahomme/img/s_lock.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/s_loggoff.png b/#pma/themes/pmahomme/img/s_loggoff.png
deleted file mode 100644
index cc53f167..00000000
Binary files a/#pma/themes/pmahomme/img/s_loggoff.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/s_notice.png b/#pma/themes/pmahomme/img/s_notice.png
deleted file mode 100644
index 7f257818..00000000
Binary files a/#pma/themes/pmahomme/img/s_notice.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/s_okay.png b/#pma/themes/pmahomme/img/s_okay.png
deleted file mode 100644
index 5587dc63..00000000
Binary files a/#pma/themes/pmahomme/img/s_okay.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/s_partialtext.png b/#pma/themes/pmahomme/img/s_partialtext.png
deleted file mode 100644
index e6711401..00000000
Binary files a/#pma/themes/pmahomme/img/s_partialtext.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/s_passwd.png b/#pma/themes/pmahomme/img/s_passwd.png
deleted file mode 100644
index 82d6f264..00000000
Binary files a/#pma/themes/pmahomme/img/s_passwd.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/s_process.png b/#pma/themes/pmahomme/img/s_process.png
deleted file mode 100644
index e90dd936..00000000
Binary files a/#pma/themes/pmahomme/img/s_process.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/s_really.png b/#pma/themes/pmahomme/img/s_really.png
deleted file mode 100644
index f9902ef0..00000000
Binary files a/#pma/themes/pmahomme/img/s_really.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/s_reload.png b/#pma/themes/pmahomme/img/s_reload.png
deleted file mode 100644
index 345e6875..00000000
Binary files a/#pma/themes/pmahomme/img/s_reload.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/s_replication.png b/#pma/themes/pmahomme/img/s_replication.png
deleted file mode 100644
index f51a1779..00000000
Binary files a/#pma/themes/pmahomme/img/s_replication.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/s_rights.png b/#pma/themes/pmahomme/img/s_rights.png
deleted file mode 100644
index 4fa395ed..00000000
Binary files a/#pma/themes/pmahomme/img/s_rights.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/s_sortable.png b/#pma/themes/pmahomme/img/s_sortable.png
deleted file mode 100644
index e318e67a..00000000
Binary files a/#pma/themes/pmahomme/img/s_sortable.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/s_status.png b/#pma/themes/pmahomme/img/s_status.png
deleted file mode 100644
index 31dbb875..00000000
Binary files a/#pma/themes/pmahomme/img/s_status.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/s_success.png b/#pma/themes/pmahomme/img/s_success.png
deleted file mode 100644
index c9a2cfdb..00000000
Binary files a/#pma/themes/pmahomme/img/s_success.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/s_sync.png b/#pma/themes/pmahomme/img/s_sync.png
deleted file mode 100644
index 8545ba1b..00000000
Binary files a/#pma/themes/pmahomme/img/s_sync.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/s_tbl.png b/#pma/themes/pmahomme/img/s_tbl.png
deleted file mode 100644
index 437e76d3..00000000
Binary files a/#pma/themes/pmahomme/img/s_tbl.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/s_theme.png b/#pma/themes/pmahomme/img/s_theme.png
deleted file mode 100644
index ca6feca2..00000000
Binary files a/#pma/themes/pmahomme/img/s_theme.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/s_top.png b/#pma/themes/pmahomme/img/s_top.png
deleted file mode 100644
index f86dad26..00000000
Binary files a/#pma/themes/pmahomme/img/s_top.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/s_unlink.png b/#pma/themes/pmahomme/img/s_unlink.png
deleted file mode 100644
index 52357530..00000000
Binary files a/#pma/themes/pmahomme/img/s_unlink.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/s_vars.png b/#pma/themes/pmahomme/img/s_vars.png
deleted file mode 100644
index 73f060b8..00000000
Binary files a/#pma/themes/pmahomme/img/s_vars.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/s_views.png b/#pma/themes/pmahomme/img/s_views.png
deleted file mode 100644
index b1c78e32..00000000
Binary files a/#pma/themes/pmahomme/img/s_views.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/select_bg.png b/#pma/themes/pmahomme/img/select_bg.png
deleted file mode 100644
index 65336435..00000000
Binary files a/#pma/themes/pmahomme/img/select_bg.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/south-mini.png b/#pma/themes/pmahomme/img/south-mini.png
deleted file mode 100644
index 954c202b..00000000
Binary files a/#pma/themes/pmahomme/img/south-mini.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/spacer.png b/#pma/themes/pmahomme/img/spacer.png
deleted file mode 100644
index c6008d7c..00000000
Binary files a/#pma/themes/pmahomme/img/spacer.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/sprites.png b/#pma/themes/pmahomme/img/sprites.png
deleted file mode 100644
index 118c682d..00000000
Binary files a/#pma/themes/pmahomme/img/sprites.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/toggle-ltr.png b/#pma/themes/pmahomme/img/toggle-ltr.png
deleted file mode 100644
index 37a9d4fb..00000000
Binary files a/#pma/themes/pmahomme/img/toggle-ltr.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/toggle-rtl.png b/#pma/themes/pmahomme/img/toggle-rtl.png
deleted file mode 100644
index 67f5c3e3..00000000
Binary files a/#pma/themes/pmahomme/img/toggle-rtl.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/vertical_line.png b/#pma/themes/pmahomme/img/vertical_line.png
deleted file mode 100644
index a88a7c7b..00000000
Binary files a/#pma/themes/pmahomme/img/vertical_line.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/west-mini.png b/#pma/themes/pmahomme/img/west-mini.png
deleted file mode 100644
index a13f0835..00000000
Binary files a/#pma/themes/pmahomme/img/west-mini.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/window-new.png b/#pma/themes/pmahomme/img/window-new.png
deleted file mode 100644
index 431fe851..00000000
Binary files a/#pma/themes/pmahomme/img/window-new.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/zoom-minus-mini.png b/#pma/themes/pmahomme/img/zoom-minus-mini.png
deleted file mode 100644
index 4262ad46..00000000
Binary files a/#pma/themes/pmahomme/img/zoom-minus-mini.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/zoom-plus-mini.png b/#pma/themes/pmahomme/img/zoom-plus-mini.png
deleted file mode 100644
index 4fabfd1e..00000000
Binary files a/#pma/themes/pmahomme/img/zoom-plus-mini.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/img/zoom-world-mini.png b/#pma/themes/pmahomme/img/zoom-world-mini.png
deleted file mode 100644
index e4d72318..00000000
Binary files a/#pma/themes/pmahomme/img/zoom-world-mini.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/info.inc.php b/#pma/themes/pmahomme/info.inc.php
deleted file mode 100644
index cd47da6d..00000000
--- a/#pma/themes/pmahomme/info.inc.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Theme information
- *
- * @package    PhpMyAdmin-theme
- * @subpackage PMAHomme
- */
-
-/**
- * If you have problems or questions about this theme email
- * mikehomme@users.sourceforge.net
- */
-
-/**
- * Icon set used by this theme: http://famfamfam.com/lab/icons/silk/
- */
-
-$theme_name = 'pmahomme';
-$theme_full_version = '1.1';
diff --git a/#pma/themes/pmahomme/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png b/#pma/themes/pmahomme/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png
deleted file mode 100644
index 2e11dd55..00000000
Binary files a/#pma/themes/pmahomme/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/jquery/images/ui-bg_glass_65_ffffff_1x400.png b/#pma/themes/pmahomme/jquery/images/ui-bg_glass_65_ffffff_1x400.png
deleted file mode 100644
index 2e2990fa..00000000
Binary files a/#pma/themes/pmahomme/jquery/images/ui-bg_glass_65_ffffff_1x400.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/jquery/images/ui-bg_glass_75_dadada_1x400.png b/#pma/themes/pmahomme/jquery/images/ui-bg_glass_75_dadada_1x400.png
deleted file mode 100644
index f4dcd0af..00000000
Binary files a/#pma/themes/pmahomme/jquery/images/ui-bg_glass_75_dadada_1x400.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png b/#pma/themes/pmahomme/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png
deleted file mode 100644
index 471fed08..00000000
Binary files a/#pma/themes/pmahomme/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/jquery/images/ui-bg_glass_95_fef1ec_1x400.png b/#pma/themes/pmahomme/jquery/images/ui-bg_glass_95_fef1ec_1x400.png
deleted file mode 100644
index c0d07d44..00000000
Binary files a/#pma/themes/pmahomme/jquery/images/ui-bg_glass_95_fef1ec_1x400.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/#pma/themes/pmahomme/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png
deleted file mode 100644
index a8b36eed..00000000
Binary files a/#pma/themes/pmahomme/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/jquery/images/ui-icons_222222_256x240.png b/#pma/themes/pmahomme/jquery/images/ui-icons_222222_256x240.png
deleted file mode 100644
index 9fc74146..00000000
Binary files a/#pma/themes/pmahomme/jquery/images/ui-icons_222222_256x240.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/jquery/images/ui-icons_2e83ff_256x240.png b/#pma/themes/pmahomme/jquery/images/ui-icons_2e83ff_256x240.png
deleted file mode 100644
index 3db66861..00000000
Binary files a/#pma/themes/pmahomme/jquery/images/ui-icons_2e83ff_256x240.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/jquery/images/ui-icons_454545_256x240.png b/#pma/themes/pmahomme/jquery/images/ui-icons_454545_256x240.png
deleted file mode 100644
index b25ea80e..00000000
Binary files a/#pma/themes/pmahomme/jquery/images/ui-icons_454545_256x240.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/jquery/images/ui-icons_888888_256x240.png b/#pma/themes/pmahomme/jquery/images/ui-icons_888888_256x240.png
deleted file mode 100644
index 62bbf842..00000000
Binary files a/#pma/themes/pmahomme/jquery/images/ui-icons_888888_256x240.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/jquery/images/ui-icons_cd0a0a_256x240.png b/#pma/themes/pmahomme/jquery/images/ui-icons_cd0a0a_256x240.png
deleted file mode 100644
index fabba4d3..00000000
Binary files a/#pma/themes/pmahomme/jquery/images/ui-icons_cd0a0a_256x240.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/jquery/jquery-ui-1.11.4.css b/#pma/themes/pmahomme/jquery/jquery-ui-1.11.4.css
deleted file mode 100644
index 41f6b445..00000000
--- a/#pma/themes/pmahomme/jquery/jquery-ui-1.11.4.css
+++ /dev/null
@@ -1,1225 +0,0 @@
-/*! jQuery UI - v1.11.4 - 2016-01-08
-* http://jqueryui.com
-* Includes: core.css, draggable.css, resizable.css, selectable.css, sortable.css, accordion.css, autocomplete.css, button.css, datepicker.css, dialog.css, menu.css, progressbar.css, selectmenu.css, slider.css, spinner.css, tabs.css, tooltip.css, theme.css
-* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana%2CArial%2Csans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=highlight_soft&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=flat&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=glass&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=glass&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=glass&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=glass&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=glass&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=flat&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=flat&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px
-* Copyright jQuery Foundation and other contributors; Licensed MIT */
-
-/* Layout helpers
-----------------------------------*/
-.ui-helper-hidden {
-	display: none;
-}
-.ui-helper-hidden-accessible {
-	border: 0;
-	clip: rect(0 0 0 0);
-	height: 1px;
-	margin: -1px;
-	overflow: hidden;
-	padding: 0;
-	position: absolute;
-	width: 1px;
-}
-.ui-helper-reset {
-	margin: 0;
-	padding: 0;
-	border: 0;
-	outline: 0;
-	line-height: 1.3;
-	text-decoration: none;
-	font-size: 100%;
-	list-style: none;
-}
-.ui-helper-clearfix:before,
-.ui-helper-clearfix:after {
-	content: "";
-	display: table;
-	border-collapse: collapse;
-}
-.ui-helper-clearfix:after {
-	clear: both;
-}
-.ui-helper-clearfix {
-	min-height: 0; /* support: IE7 */
-}
-.ui-helper-zfix {
-	width: 100%;
-	height: 100%;
-	top: 0;
-	left: 0;
-	position: absolute;
-	opacity: 0;
-	filter:Alpha(Opacity=0); /* support: IE8 */
-}
-
-.ui-front {
-	z-index: 100;
-}
-
-
-/* Interaction Cues
-----------------------------------*/
-.ui-state-disabled {
-	cursor: default !important;
-}
-
-
-/* Icons
-----------------------------------*/
-
-/* states and images */
-.ui-icon {
-	display: block;
-	text-indent: -99999px;
-	overflow: hidden;
-	background-repeat: no-repeat;
-}
-
-
-/* Misc visuals
-----------------------------------*/
-
-/* Overlays */
-.ui-widget-overlay {
-	position: fixed;
-	top: 0;
-	left: 0;
-	width: 100%;
-	height: 100%;
-}
-.ui-draggable-handle {
-	-ms-touch-action: none;
-	touch-action: none;
-}
-.ui-resizable {
-	position: relative;
-}
-.ui-resizable-handle {
-	position: absolute;
-	font-size: 0.1px;
-	display: block;
-	-ms-touch-action: none;
-	touch-action: none;
-}
-.ui-resizable-disabled .ui-resizable-handle,
-.ui-resizable-autohide .ui-resizable-handle {
-	display: none;
-}
-.ui-resizable-n {
-	cursor: n-resize;
-	height: 7px;
-	width: 100%;
-	top: -5px;
-	left: 0;
-}
-.ui-resizable-s {
-	cursor: s-resize;
-	height: 7px;
-	width: 100%;
-	bottom: -5px;
-	left: 0;
-}
-.ui-resizable-e {
-	cursor: e-resize;
-	width: 7px;
-	right: -5px;
-	top: 0;
-	height: 100%;
-}
-.ui-resizable-w {
-	cursor: w-resize;
-	width: 7px;
-	left: -5px;
-	top: 0;
-	height: 100%;
-}
-.ui-resizable-se {
-	cursor: se-resize;
-	width: 12px;
-	height: 12px;
-	right: 1px;
-	bottom: 1px;
-}
-.ui-resizable-sw {
-	cursor: sw-resize;
-	width: 9px;
-	height: 9px;
-	left: -5px;
-	bottom: -5px;
-}
-.ui-resizable-nw {
-	cursor: nw-resize;
-	width: 9px;
-	height: 9px;
-	left: -5px;
-	top: -5px;
-}
-.ui-resizable-ne {
-	cursor: ne-resize;
-	width: 9px;
-	height: 9px;
-	right: -5px;
-	top: -5px;
-}
-.ui-selectable {
-	-ms-touch-action: none;
-	touch-action: none;
-}
-.ui-selectable-helper {
-	position: absolute;
-	z-index: 100;
-	border: 1px dotted black;
-}
-.ui-sortable-handle {
-	-ms-touch-action: none;
-	touch-action: none;
-}
-.ui-accordion .ui-accordion-header {
-	display: block;
-	cursor: pointer;
-	position: relative;
-	margin: 2px 0 0 0;
-	padding: .5em .5em .5em .7em;
-	min-height: 0; /* support: IE7 */
-	font-size: 100%;
-}
-.ui-accordion .ui-accordion-icons {
-	padding-left: 2.2em;
-}
-.ui-accordion .ui-accordion-icons .ui-accordion-icons {
-	padding-left: 2.2em;
-}
-.ui-accordion .ui-accordion-header .ui-accordion-header-icon {
-	position: absolute;
-	left: .5em;
-	top: 50%;
-	margin-top: -8px;
-}
-.ui-accordion .ui-accordion-content {
-	padding: 1em 2.2em;
-	border-top: 0;
-	overflow: auto;
-}
-.ui-autocomplete {
-	position: absolute;
-	top: 0;
-	left: 0;
-	cursor: default;
-}
-.ui-button {
-	display: inline-block;
-	position: relative;
-	padding: 0;
-	line-height: normal;
-	margin-right: .1em;
-	cursor: pointer;
-	vertical-align: middle;
-	text-align: center;
-	overflow: visible; /* removes extra width in IE */
-}
-.ui-button,
-.ui-button:link,
-.ui-button:visited,
-.ui-button:hover,
-.ui-button:active {
-	text-decoration: none;
-}
-/* to make room for the icon, a width needs to be set here */
-.ui-button-icon-only {
-	width: 2.2em;
-}
-/* button elements seem to need a little more width */
-button.ui-button-icon-only {
-	width: 2.4em;
-}
-.ui-button-icons-only {
-	width: 3.4em;
-}
-button.ui-button-icons-only {
-	width: 3.7em;
-}
-
-/* button text element */
-.ui-button .ui-button-text {
-	display: block;
-	line-height: normal;
-}
-.ui-button-text-only .ui-button-text {
-	padding: .4em 1em;
-}
-.ui-button-icon-only .ui-button-text,
-.ui-button-icons-only .ui-button-text {
-	padding: .4em;
-	text-indent: -9999999px;
-}
-.ui-button-text-icon-primary .ui-button-text,
-.ui-button-text-icons .ui-button-text {
-	padding: .4em 1em .4em 2.1em;
-}
-.ui-button-text-icon-secondary .ui-button-text,
-.ui-button-text-icons .ui-button-text {
-	padding: .4em 2.1em .4em 1em;
-}
-.ui-button-text-icons .ui-button-text {
-	padding-left: 2.1em;
-	padding-right: 2.1em;
-}
-/* no icon support for input elements, provide padding by default */
-input.ui-button {
-	padding: .4em 1em;
-}
-
-/* button icon element(s) */
-.ui-button-icon-only .ui-icon,
-.ui-button-text-icon-primary .ui-icon,
-.ui-button-text-icon-secondary .ui-icon,
-.ui-button-text-icons .ui-icon,
-.ui-button-icons-only .ui-icon {
-	position: absolute;
-	top: 50%;
-	margin-top: -8px;
-}
-.ui-button-icon-only .ui-icon {
-	left: 50%;
-	margin-left: -8px;
-}
-.ui-button-text-icon-primary .ui-button-icon-primary,
-.ui-button-text-icons .ui-button-icon-primary,
-.ui-button-icons-only .ui-button-icon-primary {
-	left: .5em;
-}
-.ui-button-text-icon-secondary .ui-button-icon-secondary,
-.ui-button-text-icons .ui-button-icon-secondary,
-.ui-button-icons-only .ui-button-icon-secondary {
-	right: .5em;
-}
-
-/* button sets */
-.ui-buttonset {
-	margin-right: 7px;
-}
-.ui-buttonset .ui-button {
-	margin-left: 0;
-	margin-right: -.3em;
-}
-
-/* workarounds */
-/* reset extra padding in Firefox, see h5bp.com/l */
-input.ui-button::-moz-focus-inner,
-button.ui-button::-moz-focus-inner {
-	border: 0;
-	padding: 0;
-}
-.ui-datepicker {
-	width: 17em;
-	padding: .2em .2em 0;
-	display: none;
-}
-.ui-datepicker .ui-datepicker-header {
-	position: relative;
-	padding: .2em 0;
-}
-.ui-datepicker .ui-datepicker-prev,
-.ui-datepicker .ui-datepicker-next {
-	position: absolute;
-	top: 2px;
-	width: 1.8em;
-	height: 1.8em;
-}
-.ui-datepicker .ui-datepicker-prev-hover,
-.ui-datepicker .ui-datepicker-next-hover {
-	top: 1px;
-}
-.ui-datepicker .ui-datepicker-prev {
-	left: 2px;
-}
-.ui-datepicker .ui-datepicker-next {
-	right: 2px;
-}
-.ui-datepicker .ui-datepicker-prev-hover {
-	left: 1px;
-}
-.ui-datepicker .ui-datepicker-next-hover {
-	right: 1px;
-}
-.ui-datepicker .ui-datepicker-prev span,
-.ui-datepicker .ui-datepicker-next span {
-	display: block;
-	position: absolute;
-	left: 50%;
-	margin-left: -8px;
-	top: 50%;
-	margin-top: -8px;
-}
-.ui-datepicker .ui-datepicker-title {
-	margin: 0 2.3em;
-	line-height: 1.8em;
-	text-align: center;
-}
-.ui-datepicker .ui-datepicker-title select {
-	font-size: 1em;
-	margin: 1px 0;
-}
-.ui-datepicker select.ui-datepicker-month,
-.ui-datepicker select.ui-datepicker-year {
-	width: 45%;
-}
-.ui-datepicker table {
-	width: 100%;
-	font-size: .9em;
-	border-collapse: collapse;
-	margin: 0 0 .4em;
-}
-.ui-datepicker th {
-	padding: .7em .3em;
-	text-align: center;
-	font-weight: bold;
-	border: 0;
-}
-.ui-datepicker td {
-	border: 0;
-	padding: 1px;
-}
-.ui-datepicker td span,
-.ui-datepicker td a {
-	display: block;
-	padding: .2em;
-	text-align: right;
-	text-decoration: none;
-}
-.ui-datepicker .ui-datepicker-buttonpane {
-	background-image: none;
-	margin: .7em 0 0 0;
-	padding: 0 .2em;
-	border-left: 0;
-	border-right: 0;
-	border-bottom: 0;
-}
-.ui-datepicker .ui-datepicker-buttonpane button {
-	float: right;
-	margin: .5em .2em .4em;
-	cursor: pointer;
-	padding: .2em .6em .3em .6em;
-	width: auto;
-	overflow: visible;
-}
-.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current {
-	float: left;
-}
-
-/* with multiple calendars */
-.ui-datepicker.ui-datepicker-multi {
-	width: auto;
-}
-.ui-datepicker-multi .ui-datepicker-group {
-	float: left;
-}
-.ui-datepicker-multi .ui-datepicker-group table {
-	width: 95%;
-	margin: 0 auto .4em;
-}
-.ui-datepicker-multi-2 .ui-datepicker-group {
-	width: 50%;
-}
-.ui-datepicker-multi-3 .ui-datepicker-group {
-	width: 33.3%;
-}
-.ui-datepicker-multi-4 .ui-datepicker-group {
-	width: 25%;
-}
-.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header,
-.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header {
-	border-left-width: 0;
-}
-.ui-datepicker-multi .ui-datepicker-buttonpane {
-	clear: left;
-}
-.ui-datepicker-row-break {
-	clear: both;
-	width: 100%;
-	font-size: 0;
-}
-
-/* RTL support */
-.ui-datepicker-rtl {
-	direction: rtl;
-}
-.ui-datepicker-rtl .ui-datepicker-prev {
-	right: 2px;
-	left: auto;
-}
-.ui-datepicker-rtl .ui-datepicker-next {
-	left: 2px;
-	right: auto;
-}
-.ui-datepicker-rtl .ui-datepicker-prev:hover {
-	right: 1px;
-	left: auto;
-}
-.ui-datepicker-rtl .ui-datepicker-next:hover {
-	left: 1px;
-	right: auto;
-}
-.ui-datepicker-rtl .ui-datepicker-buttonpane {
-	clear: right;
-}
-.ui-datepicker-rtl .ui-datepicker-buttonpane button {
-	float: left;
-}
-.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current,
-.ui-datepicker-rtl .ui-datepicker-group {
-	float: right;
-}
-.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header,
-.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header {
-	border-right-width: 0;
-	border-left-width: 1px;
-}
-.ui-dialog {
-	overflow: hidden;
-	position: absolute;
-	top: 0;
-	left: 0;
-	padding: .2em;
-	outline: 0;
-}
-.ui-dialog .ui-dialog-titlebar {
-	padding: .4em 1em;
-	position: relative;
-}
-.ui-dialog .ui-dialog-title {
-	float: left;
-	margin: .1em 0;
-	white-space: nowrap;
-	width: 90%;
-	overflow: hidden;
-	text-overflow: ellipsis;
-}
-.ui-dialog .ui-dialog-titlebar-close {
-	position: absolute;
-	right: .3em;
-	top: 50%;
-	width: 20px;
-	margin: -10px 0 0 0;
-	padding: 1px;
-	height: 20px;
-}
-.ui-dialog .ui-dialog-content {
-	position: relative;
-	border: 0;
-	padding: .5em 1em;
-	background: none;
-	overflow: auto;
-}
-.ui-dialog .ui-dialog-buttonpane {
-	text-align: left;
-	border-width: 1px 0 0 0;
-	background-image: none;
-	margin-top: .5em;
-	padding: .3em 1em .5em .4em;
-}
-.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset {
-	float: right;
-}
-.ui-dialog .ui-dialog-buttonpane button {
-	margin: .5em .4em .5em 0;
-	cursor: pointer;
-}
-.ui-dialog .ui-resizable-se {
-	width: 12px;
-	height: 12px;
-	right: -5px;
-	bottom: -5px;
-	background-position: 16px 16px;
-}
-.ui-draggable .ui-dialog-titlebar {
-	cursor: move;
-}
-.ui-menu {
-	list-style: none;
-	padding: 0;
-	margin: 0;
-	display: block;
-	outline: none;
-}
-.ui-menu .ui-menu {
-	position: absolute;
-}
-.ui-menu .ui-menu-item {
-	position: relative;
-	margin: 0;
-	padding: 3px 1em 3px .4em;
-	cursor: pointer;
-	min-height: 0; /* support: IE7 */
-	/* support: IE10, see #8844 */
-	list-style-image: url("data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7");
-}
-.ui-menu .ui-menu-divider {
-	margin: 5px 0;
-	height: 0;
-	font-size: 0;
-	line-height: 0;
-	border-width: 1px 0 0 0;
-}
-.ui-menu .ui-state-focus,
-.ui-menu .ui-state-active {
-	margin: -1px;
-}
-
-/* icon support */
-.ui-menu-icons {
-	position: relative;
-}
-.ui-menu-icons .ui-menu-item {
-	padding-left: 2em;
-}
-
-/* left-aligned */
-.ui-menu .ui-icon {
-	position: absolute;
-	top: 0;
-	bottom: 0;
-	left: .2em;
-	margin: auto 0;
-}
-
-/* right-aligned */
-.ui-menu .ui-menu-icon {
-	left: auto;
-	right: 0;
-}
-.ui-progressbar {
-	height: 2em;
-	text-align: left;
-	overflow: hidden;
-}
-.ui-progressbar .ui-progressbar-value {
-	margin: -1px;
-	height: 100%;
-}
-.ui-progressbar .ui-progressbar-overlay {
-	background: url("data:image/gif;base64,R0lGODlhKAAoAIABAAAAAP///yH/C05FVFNDQVBFMi4wAwEAAAAh+QQJAQABACwAAAAAKAAoAAACkYwNqXrdC52DS06a7MFZI+4FHBCKoDeWKXqymPqGqxvJrXZbMx7Ttc+w9XgU2FB3lOyQRWET2IFGiU9m1frDVpxZZc6bfHwv4c1YXP6k1Vdy292Fb6UkuvFtXpvWSzA+HycXJHUXiGYIiMg2R6W459gnWGfHNdjIqDWVqemH2ekpObkpOlppWUqZiqr6edqqWQAAIfkECQEAAQAsAAAAACgAKAAAApSMgZnGfaqcg1E2uuzDmmHUBR8Qil95hiPKqWn3aqtLsS18y7G1SzNeowWBENtQd+T1JktP05nzPTdJZlR6vUxNWWjV+vUWhWNkWFwxl9VpZRedYcflIOLafaa28XdsH/ynlcc1uPVDZxQIR0K25+cICCmoqCe5mGhZOfeYSUh5yJcJyrkZWWpaR8doJ2o4NYq62lAAACH5BAkBAAEALAAAAAAoACgAAAKVDI4Yy22ZnINRNqosw0Bv7i1gyHUkFj7oSaWlu3ovC8GxNso5fluz3qLVhBVeT/Lz7ZTHyxL5dDalQWPVOsQWtRnuwXaFTj9jVVh8pma9JjZ4zYSj5ZOyma7uuolffh+IR5aW97cHuBUXKGKXlKjn+DiHWMcYJah4N0lYCMlJOXipGRr5qdgoSTrqWSq6WFl2ypoaUAAAIfkECQEAAQAsAAAAACgAKAAAApaEb6HLgd/iO7FNWtcFWe+ufODGjRfoiJ2akShbueb0wtI50zm02pbvwfWEMWBQ1zKGlLIhskiEPm9R6vRXxV4ZzWT2yHOGpWMyorblKlNp8HmHEb/lCXjcW7bmtXP8Xt229OVWR1fod2eWqNfHuMjXCPkIGNileOiImVmCOEmoSfn3yXlJWmoHGhqp6ilYuWYpmTqKUgAAIfkECQEAAQAsAAAAACgAKAAAApiEH6kb58biQ3FNWtMFWW3eNVcojuFGfqnZqSebuS06w5V80/X02pKe8zFwP6EFWOT1lDFk8rGERh1TTNOocQ61Hm4Xm2VexUHpzjymViHrFbiELsefVrn6XKfnt2Q9G/+Xdie499XHd2g4h7ioOGhXGJboGAnXSBnoBwKYyfioubZJ2Hn0RuRZaflZOil56Zp6iioKSXpUAAAh+QQJAQABACwAAAAAKAAoAAACkoQRqRvnxuI7kU1a1UU5bd5tnSeOZXhmn5lWK3qNTWvRdQxP8qvaC+/yaYQzXO7BMvaUEmJRd3TsiMAgswmNYrSgZdYrTX6tSHGZO73ezuAw2uxuQ+BbeZfMxsexY35+/Qe4J1inV0g4x3WHuMhIl2jXOKT2Q+VU5fgoSUI52VfZyfkJGkha6jmY+aaYdirq+lQAACH5BAkBAAEALAAAAAAoACgAAAKWBIKpYe0L3YNKToqswUlvznigd4wiR4KhZrKt9Upqip61i9E3vMvxRdHlbEFiEXfk9YARYxOZZD6VQ2pUunBmtRXo1Lf8hMVVcNl8JafV38aM2/Fu5V16Bn63r6xt97j09+MXSFi4BniGFae3hzbH9+hYBzkpuUh5aZmHuanZOZgIuvbGiNeomCnaxxap2upaCZsq+1kAACH5BAkBAAEALAAAAAAoACgAAAKXjI8By5zf4kOxTVrXNVlv1X0d8IGZGKLnNpYtm8Lr9cqVeuOSvfOW79D9aDHizNhDJidFZhNydEahOaDH6nomtJjp1tutKoNWkvA6JqfRVLHU/QUfau9l2x7G54d1fl995xcIGAdXqMfBNadoYrhH+Mg2KBlpVpbluCiXmMnZ2Sh4GBqJ+ckIOqqJ6LmKSllZmsoq6wpQAAAh+QQJAQABACwAAAAAKAAoAAAClYx/oLvoxuJDkU1a1YUZbJ59nSd2ZXhWqbRa2/gF8Gu2DY3iqs7yrq+xBYEkYvFSM8aSSObE+ZgRl1BHFZNr7pRCavZ5BW2142hY3AN/zWtsmf12p9XxxFl2lpLn1rseztfXZjdIWIf2s5dItwjYKBgo9yg5pHgzJXTEeGlZuenpyPmpGQoKOWkYmSpaSnqKileI2FAAACH5BAkBAAEALAAAAAAoACgAAAKVjB+gu+jG4kORTVrVhRlsnn2dJ3ZleFaptFrb+CXmO9OozeL5VfP99HvAWhpiUdcwkpBH3825AwYdU8xTqlLGhtCosArKMpvfa1mMRae9VvWZfeB2XfPkeLmm18lUcBj+p5dnN8jXZ3YIGEhYuOUn45aoCDkp16hl5IjYJvjWKcnoGQpqyPlpOhr3aElaqrq56Bq7VAAAOw==");
-	height: 100%;
-	filter: alpha(opacity=25); /* support: IE8 */
-	opacity: 0.25;
-}
-.ui-progressbar-indeterminate .ui-progressbar-value {
-	background-image: none;
-}
-.ui-selectmenu-menu {
-	padding: 0;
-	margin: 0;
-	position: absolute;
-	top: 0;
-	left: 0;
-	display: none;
-}
-.ui-selectmenu-menu .ui-menu {
-	overflow: auto;
-	/* Support: IE7 */
-	overflow-x: hidden;
-	padding-bottom: 1px;
-}
-.ui-selectmenu-menu .ui-menu .ui-selectmenu-optgroup {
-	font-size: 1em;
-	font-weight: bold;
-	line-height: 1.5;
-	padding: 2px 0.4em;
-	margin: 0.5em 0 0 0;
-	height: auto;
-	border: 0;
-}
-.ui-selectmenu-open {
-	display: block;
-}
-.ui-selectmenu-button {
-	display: inline-block;
-	overflow: hidden;
-	position: relative;
-	text-decoration: none;
-	cursor: pointer;
-}
-.ui-selectmenu-button span.ui-icon {
-	right: 0.5em;
-	left: auto;
-	margin-top: -8px;
-	position: absolute;
-	top: 50%;
-}
-.ui-selectmenu-button span.ui-selectmenu-text {
-	text-align: left;
-	padding: 0.4em 2.1em 0.4em 1em;
-	display: block;
-	line-height: 1.4;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	white-space: nowrap;
-}
-.ui-slider {
-	position: relative;
-	text-align: left;
-}
-.ui-slider .ui-slider-handle {
-	position: absolute;
-	z-index: 2;
-	width: 1.2em;
-	height: 1.2em;
-	cursor: default;
-	-ms-touch-action: none;
-	touch-action: none;
-}
-.ui-slider .ui-slider-range {
-	position: absolute;
-	z-index: 1;
-	font-size: .7em;
-	display: block;
-	border: 0;
-	background-position: 0 0;
-}
-
-/* support: IE8 - See #6727 */
-.ui-slider.ui-state-disabled .ui-slider-handle,
-.ui-slider.ui-state-disabled .ui-slider-range {
-	filter: inherit;
-}
-
-.ui-slider-horizontal {
-	height: .8em;
-}
-.ui-slider-horizontal .ui-slider-handle {
-	top: -.3em;
-	margin-left: -.6em;
-}
-.ui-slider-horizontal .ui-slider-range {
-	top: 0;
-	height: 100%;
-}
-.ui-slider-horizontal .ui-slider-range-min {
-	left: 0;
-}
-.ui-slider-horizontal .ui-slider-range-max {
-	right: 0;
-}
-
-.ui-slider-vertical {
-	width: .8em;
-	height: 100px;
-}
-.ui-slider-vertical .ui-slider-handle {
-	left: -.3em;
-	margin-left: 0;
-	margin-bottom: -.6em;
-}
-.ui-slider-vertical .ui-slider-range {
-	left: 0;
-	width: 100%;
-}
-.ui-slider-vertical .ui-slider-range-min {
-	bottom: 0;
-}
-.ui-slider-vertical .ui-slider-range-max {
-	top: 0;
-}
-.ui-spinner {
-	position: relative;
-	display: inline-block;
-	overflow: hidden;
-	padding: 0;
-	vertical-align: middle;
-}
-.ui-spinner-input {
-	border: none;
-	background: none;
-	color: inherit;
-	padding: 0;
-	margin: .2em 0;
-	vertical-align: middle;
-	margin-left: .4em;
-	margin-right: 22px;
-}
-.ui-spinner-button {
-	width: 16px;
-	height: 50%;
-	font-size: .5em;
-	padding: 0;
-	margin: 0;
-	text-align: center;
-	position: absolute;
-	cursor: default;
-	display: block;
-	overflow: hidden;
-	right: 0;
-}
-/* more specificity required here to override default borders */
-.ui-spinner a.ui-spinner-button {
-	border-top: none;
-	border-bottom: none;
-	border-right: none;
-}
-/* vertically center icon */
-.ui-spinner .ui-icon {
-	position: absolute;
-	margin-top: -8px;
-	top: 50%;
-	left: 0;
-}
-.ui-spinner-up {
-	top: 0;
-}
-.ui-spinner-down {
-	bottom: 0;
-}
-
-/* TR overrides */
-.ui-spinner .ui-icon-triangle-1-s {
-	/* need to fix icons sprite */
-	background-position: -65px -16px;
-}
-.ui-tabs {
-	position: relative;/* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
-	padding: .2em;
-}
-.ui-tabs .ui-tabs-nav {
-	margin: 0;
-	padding: .2em .2em 0;
-}
-.ui-tabs .ui-tabs-nav li {
-	list-style: none;
-	float: left;
-	position: relative;
-	top: 0;
-	margin: 1px .2em 0 0;
-	border-bottom-width: 0;
-	padding: 0;
-	white-space: nowrap;
-}
-.ui-tabs .ui-tabs-nav .ui-tabs-anchor {
-	float: left;
-	padding: .5em 1em;
-	text-decoration: none;
-}
-.ui-tabs .ui-tabs-nav li.ui-tabs-active {
-	margin-bottom: -1px;
-	padding-bottom: 1px;
-}
-.ui-tabs .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor,
-.ui-tabs .ui-tabs-nav li.ui-state-disabled .ui-tabs-anchor,
-.ui-tabs .ui-tabs-nav li.ui-tabs-loading .ui-tabs-anchor {
-	cursor: text;
-}
-.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor {
-	cursor: pointer;
-}
-.ui-tabs .ui-tabs-panel {
-	display: block;
-	border-width: 0;
-	padding: 1em 1.4em;
-	background: none;
-}
-.ui-tooltip {
-	padding: 8px;
-	position: absolute;
-	z-index: 9999;
-	max-width: 300px;
-	-webkit-box-shadow: 0 0 5px #aaa;
-	box-shadow: 0 0 5px #aaa;
-}
-body .ui-tooltip {
-	border-width: 2px;
-}
-
-/* Component containers
-----------------------------------*/
-.ui-widget {
-	font-family: Verdana,Arial,sans-serif;
-	font-size: 1.1em;
-}
-.ui-widget .ui-widget {
-	font-size: 1em;
-}
-.ui-widget input,
-.ui-widget select,
-.ui-widget textarea,
-.ui-widget button {
-	font-family: Verdana,Arial,sans-serif;
-	font-size: 1em;
-}
-.ui-widget-content {
-	border: 1px solid #aaaaaa;
-	background: #ffffff;
-	color: #222222;
-}
-.ui-widget-content a {
-	color: #222222;
-}
-.ui-widget-header {
-	border: 1px solid #aaaaaa;
-	background: #cccccc url("images/ui-bg_highlight-soft_75_cccccc_1x100.png") 50% 50% repeat-x;
-	color: #222222;
-	font-weight: bold;
-}
-.ui-widget-header a {
-	color: #222222;
-}
-
-/* Interaction states
-----------------------------------*/
-.ui-state-default,
-.ui-widget-content .ui-state-default,
-.ui-widget-header .ui-state-default {
-	border: 1px solid #d3d3d3;
-	background: #e6e6e6 url("images/ui-bg_glass_75_e6e6e6_1x400.png") 50% 50% repeat-x;
-	font-weight: normal;
-	color: #555555;
-}
-.ui-state-default a,
-.ui-state-default a:link,
-.ui-state-default a:visited {
-	color: #555555;
-	text-decoration: none;
-}
-.ui-state-hover,
-.ui-widget-content .ui-state-hover,
-.ui-widget-header .ui-state-hover,
-.ui-state-focus,
-.ui-widget-content .ui-state-focus,
-.ui-widget-header .ui-state-focus {
-	border: 1px solid #999999;
-	background: #dadada url("images/ui-bg_glass_75_dadada_1x400.png") 50% 50% repeat-x;
-	font-weight: normal;
-	color: #212121;
-}
-.ui-state-hover a,
-.ui-state-hover a:hover,
-.ui-state-hover a:link,
-.ui-state-hover a:visited,
-.ui-state-focus a,
-.ui-state-focus a:hover,
-.ui-state-focus a:link,
-.ui-state-focus a:visited {
-	color: #212121;
-	text-decoration: none;
-}
-.ui-state-active,
-.ui-widget-content .ui-state-active,
-.ui-widget-header .ui-state-active {
-	border: 1px solid #aaaaaa;
-	background: #ffffff url("images/ui-bg_glass_65_ffffff_1x400.png") 50% 50% repeat-x;
-	font-weight: normal;
-	color: #212121;
-}
-.ui-state-active a,
-.ui-state-active a:link,
-.ui-state-active a:visited {
-	color: #212121;
-	text-decoration: none;
-}
-
-/* Interaction Cues
-----------------------------------*/
-.ui-state-highlight,
-.ui-widget-content .ui-state-highlight,
-.ui-widget-header .ui-state-highlight {
-	border: 1px solid #fcefa1;
-	background: #fbf9ee url("images/ui-bg_glass_55_fbf9ee_1x400.png") 50% 50% repeat-x;
-	color: #363636;
-}
-.ui-state-highlight a,
-.ui-widget-content .ui-state-highlight a,
-.ui-widget-header .ui-state-highlight a {
-	color: #363636;
-}
-.ui-state-error,
-.ui-widget-content .ui-state-error,
-.ui-widget-header .ui-state-error {
-	border: 1px solid #cd0a0a;
-	background: #fef1ec url("images/ui-bg_glass_95_fef1ec_1x400.png") 50% 50% repeat-x;
-	color: #cd0a0a;
-}
-.ui-state-error a,
-.ui-widget-content .ui-state-error a,
-.ui-widget-header .ui-state-error a {
-	color: #cd0a0a;
-}
-.ui-state-error-text,
-.ui-widget-content .ui-state-error-text,
-.ui-widget-header .ui-state-error-text {
-	color: #cd0a0a;
-}
-.ui-priority-primary,
-.ui-widget-content .ui-priority-primary,
-.ui-widget-header .ui-priority-primary {
-	font-weight: bold;
-}
-.ui-priority-secondary,
-.ui-widget-content .ui-priority-secondary,
-.ui-widget-header .ui-priority-secondary {
-	opacity: .7;
-	filter:Alpha(Opacity=70); /* support: IE8 */
-	font-weight: normal;
-}
-.ui-state-disabled,
-.ui-widget-content .ui-state-disabled,
-.ui-widget-header .ui-state-disabled {
-	opacity: .35;
-	filter:Alpha(Opacity=35); /* support: IE8 */
-	background-image: none;
-}
-.ui-state-disabled .ui-icon {
-	filter:Alpha(Opacity=35); /* support: IE8 - See #6059 */
-}
-
-/* Icons
-----------------------------------*/
-
-/* states and images */
-.ui-icon {
-	width: 16px;
-	height: 16px;
-}
-.ui-icon,
-.ui-widget-content .ui-icon {
-	background-image: url("images/ui-icons_222222_256x240.png");
-}
-.ui-widget-header .ui-icon {
-	background-image: url("images/ui-icons_222222_256x240.png");
-}
-.ui-state-default .ui-icon {
-	background-image: url("images/ui-icons_888888_256x240.png");
-}
-.ui-state-hover .ui-icon,
-.ui-state-focus .ui-icon {
-	background-image: url("images/ui-icons_454545_256x240.png");
-}
-.ui-state-active .ui-icon {
-	background-image: url("images/ui-icons_454545_256x240.png");
-}
-.ui-state-highlight .ui-icon {
-	background-image: url("images/ui-icons_2e83ff_256x240.png");
-}
-.ui-state-error .ui-icon,
-.ui-state-error-text .ui-icon {
-	background-image: url("images/ui-icons_cd0a0a_256x240.png");
-}
-
-/* positioning */
-.ui-icon-blank { background-position: 16px 16px; }
-.ui-icon-carat-1-n { background-position: 0 0; }
-.ui-icon-carat-1-ne { background-position: -16px 0; }
-.ui-icon-carat-1-e { background-position: -32px 0; }
-.ui-icon-carat-1-se { background-position: -48px 0; }
-.ui-icon-carat-1-s { background-position: -64px 0; }
-.ui-icon-carat-1-sw { background-position: -80px 0; }
-.ui-icon-carat-1-w { background-position: -96px 0; }
-.ui-icon-carat-1-nw { background-position: -112px 0; }
-.ui-icon-carat-2-n-s { background-position: -128px 0; }
-.ui-icon-carat-2-e-w { background-position: -144px 0; }
-.ui-icon-triangle-1-n { background-position: 0 -16px; }
-.ui-icon-triangle-1-ne { background-position: -16px -16px; }
-.ui-icon-triangle-1-e { background-position: -32px -16px; }
-.ui-icon-triangle-1-se { background-position: -48px -16px; }
-.ui-icon-triangle-1-s { background-position: -64px -16px; }
-.ui-icon-triangle-1-sw { background-position: -80px -16px; }
-.ui-icon-triangle-1-w { background-position: -96px -16px; }
-.ui-icon-triangle-1-nw { background-position: -112px -16px; }
-.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
-.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
-.ui-icon-arrow-1-n { background-position: 0 -32px; }
-.ui-icon-arrow-1-ne { background-position: -16px -32px; }
-.ui-icon-arrow-1-e { background-position: -32px -32px; }
-.ui-icon-arrow-1-se { background-position: -48px -32px; }
-.ui-icon-arrow-1-s { background-position: -64px -32px; }
-.ui-icon-arrow-1-sw { background-position: -80px -32px; }
-.ui-icon-arrow-1-w { background-position: -96px -32px; }
-.ui-icon-arrow-1-nw { background-position: -112px -32px; }
-.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
-.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
-.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
-.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
-.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
-.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
-.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
-.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
-.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
-.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
-.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
-.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
-.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
-.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
-.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
-.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
-.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
-.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
-.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
-.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
-.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
-.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
-.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
-.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
-.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
-.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
-.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
-.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
-.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
-.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
-.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
-.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
-.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
-.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
-.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
-.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
-.ui-icon-arrow-4 { background-position: 0 -80px; }
-.ui-icon-arrow-4-diag { background-position: -16px -80px; }
-.ui-icon-extlink { background-position: -32px -80px; }
-.ui-icon-newwin { background-position: -48px -80px; }
-.ui-icon-refresh { background-position: -64px -80px; }
-.ui-icon-shuffle { background-position: -80px -80px; }
-.ui-icon-transfer-e-w { background-position: -96px -80px; }
-.ui-icon-transferthick-e-w { background-position: -112px -80px; }
-.ui-icon-folder-collapsed { background-position: 0 -96px; }
-.ui-icon-folder-open { background-position: -16px -96px; }
-.ui-icon-document { background-position: -32px -96px; }
-.ui-icon-document-b { background-position: -48px -96px; }
-.ui-icon-note { background-position: -64px -96px; }
-.ui-icon-mail-closed { background-position: -80px -96px; }
-.ui-icon-mail-open { background-position: -96px -96px; }
-.ui-icon-suitcase { background-position: -112px -96px; }
-.ui-icon-comment { background-position: -128px -96px; }
-.ui-icon-person { background-position: -144px -96px; }
-.ui-icon-print { background-position: -160px -96px; }
-.ui-icon-trash { background-position: -176px -96px; }
-.ui-icon-locked { background-position: -192px -96px; }
-.ui-icon-unlocked { background-position: -208px -96px; }
-.ui-icon-bookmark { background-position: -224px -96px; }
-.ui-icon-tag { background-position: -240px -96px; }
-.ui-icon-home { background-position: 0 -112px; }
-.ui-icon-flag { background-position: -16px -112px; }
-.ui-icon-calendar { background-position: -32px -112px; }
-.ui-icon-cart { background-position: -48px -112px; }
-.ui-icon-pencil { background-position: -64px -112px; }
-.ui-icon-clock { background-position: -80px -112px; }
-.ui-icon-disk { background-position: -96px -112px; }
-.ui-icon-calculator { background-position: -112px -112px; }
-.ui-icon-zoomin { background-position: -128px -112px; }
-.ui-icon-zoomout { background-position: -144px -112px; }
-.ui-icon-search { background-position: -160px -112px; }
-.ui-icon-wrench { background-position: -176px -112px; }
-.ui-icon-gear { background-position: -192px -112px; }
-.ui-icon-heart { background-position: -208px -112px; }
-.ui-icon-star { background-position: -224px -112px; }
-.ui-icon-link { background-position: -240px -112px; }
-.ui-icon-cancel { background-position: 0 -128px; }
-.ui-icon-plus { background-position: -16px -128px; }
-.ui-icon-plusthick { background-position: -32px -128px; }
-.ui-icon-minus { background-position: -48px -128px; }
-.ui-icon-minusthick { background-position: -64px -128px; }
-.ui-icon-close { background-position: -80px -128px; }
-.ui-icon-closethick { background-position: -96px -128px; }
-.ui-icon-key { background-position: -112px -128px; }
-.ui-icon-lightbulb { background-position: -128px -128px; }
-.ui-icon-scissors { background-position: -144px -128px; }
-.ui-icon-clipboard { background-position: -160px -128px; }
-.ui-icon-copy { background-position: -176px -128px; }
-.ui-icon-contact { background-position: -192px -128px; }
-.ui-icon-image { background-position: -208px -128px; }
-.ui-icon-video { background-position: -224px -128px; }
-.ui-icon-script { background-position: -240px -128px; }
-.ui-icon-alert { background-position: 0 -144px; }
-.ui-icon-info { background-position: -16px -144px; }
-.ui-icon-notice { background-position: -32px -144px; }
-.ui-icon-help { background-position: -48px -144px; }
-.ui-icon-check { background-position: -64px -144px; }
-.ui-icon-bullet { background-position: -80px -144px; }
-.ui-icon-radio-on { background-position: -96px -144px; }
-.ui-icon-radio-off { background-position: -112px -144px; }
-.ui-icon-pin-w { background-position: -128px -144px; }
-.ui-icon-pin-s { background-position: -144px -144px; }
-.ui-icon-play { background-position: 0 -160px; }
-.ui-icon-pause { background-position: -16px -160px; }
-.ui-icon-seek-next { background-position: -32px -160px; }
-.ui-icon-seek-prev { background-position: -48px -160px; }
-.ui-icon-seek-end { background-position: -64px -160px; }
-.ui-icon-seek-start { background-position: -80px -160px; }
-/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
-.ui-icon-seek-first { background-position: -80px -160px; }
-.ui-icon-stop { background-position: -96px -160px; }
-.ui-icon-eject { background-position: -112px -160px; }
-.ui-icon-volume-off { background-position: -128px -160px; }
-.ui-icon-volume-on { background-position: -144px -160px; }
-.ui-icon-power { background-position: 0 -176px; }
-.ui-icon-signal-diag { background-position: -16px -176px; }
-.ui-icon-signal { background-position: -32px -176px; }
-.ui-icon-battery-0 { background-position: -48px -176px; }
-.ui-icon-battery-1 { background-position: -64px -176px; }
-.ui-icon-battery-2 { background-position: -80px -176px; }
-.ui-icon-battery-3 { background-position: -96px -176px; }
-.ui-icon-circle-plus { background-position: 0 -192px; }
-.ui-icon-circle-minus { background-position: -16px -192px; }
-.ui-icon-circle-close { background-position: -32px -192px; }
-.ui-icon-circle-triangle-e { background-position: -48px -192px; }
-.ui-icon-circle-triangle-s { background-position: -64px -192px; }
-.ui-icon-circle-triangle-w { background-position: -80px -192px; }
-.ui-icon-circle-triangle-n { background-position: -96px -192px; }
-.ui-icon-circle-arrow-e { background-position: -112px -192px; }
-.ui-icon-circle-arrow-s { background-position: -128px -192px; }
-.ui-icon-circle-arrow-w { background-position: -144px -192px; }
-.ui-icon-circle-arrow-n { background-position: -160px -192px; }
-.ui-icon-circle-zoomin { background-position: -176px -192px; }
-.ui-icon-circle-zoomout { background-position: -192px -192px; }
-.ui-icon-circle-check { background-position: -208px -192px; }
-.ui-icon-circlesmall-plus { background-position: 0 -208px; }
-.ui-icon-circlesmall-minus { background-position: -16px -208px; }
-.ui-icon-circlesmall-close { background-position: -32px -208px; }
-.ui-icon-squaresmall-plus { background-position: -48px -208px; }
-.ui-icon-squaresmall-minus { background-position: -64px -208px; }
-.ui-icon-squaresmall-close { background-position: -80px -208px; }
-.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
-.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
-.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
-.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
-.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
-.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
-
-
-/* Misc visuals
-----------------------------------*/
-
-/* Corner radius */
-.ui-corner-all,
-.ui-corner-top,
-.ui-corner-left,
-.ui-corner-tl {
-	border-top-left-radius: 4px;
-}
-.ui-corner-all,
-.ui-corner-top,
-.ui-corner-right,
-.ui-corner-tr {
-	border-top-right-radius: 4px;
-}
-.ui-corner-all,
-.ui-corner-bottom,
-.ui-corner-left,
-.ui-corner-bl {
-	border-bottom-left-radius: 4px;
-}
-.ui-corner-all,
-.ui-corner-bottom,
-.ui-corner-right,
-.ui-corner-br {
-	border-bottom-right-radius: 4px;
-}
-
-/* Overlays */
-.ui-widget-overlay {
-	background: #aaaaaa;
-	opacity: .3;
-	filter: Alpha(Opacity=30); /* support: IE8 */
-}
-.ui-widget-shadow {
-	margin: -8px 0 0 -8px;
-	padding: 8px;
-	background: #aaaaaa;
-	opacity: .3;
-	filter: Alpha(Opacity=30); /* support: IE8 */
-	border-radius: 8px;
-}
diff --git a/#pma/themes/pmahomme/layout.inc.php b/#pma/themes/pmahomme/layout.inc.php
deleted file mode 100644
index 6ac5ddce..00000000
--- a/#pma/themes/pmahomme/layout.inc.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * configures general layout
- * for detailed layout configuration please refer to the css files
- *
- * @package    PhpMyAdmin-theme
- * @subpackage PMAHomme
- */
-
-/**
- * navi frame
- */
-// navi frame width
-$GLOBALS['cfg']['NaviWidth']                = 240;
-
-// foreground (text) color for the navi frame
-$GLOBALS['cfg']['NaviColor']                = '#000';
-
-// background for the navi frame
-$GLOBALS['cfg']['NaviBackground']           = '#f3f3f3';
-
-// foreground (text) color of the pointer in navi frame
-$GLOBALS['cfg']['NaviPointerColor']         = '#000';
-
-// background of the pointer in navi frame
-$GLOBALS['cfg']['NaviPointerBackground']    = '#ddd';
-
-/**
- * main frame
- */
-// foreground (text) color for the main frame
-$GLOBALS['cfg']['MainColor']                = '#444';
-
-// background for the main frame
-$GLOBALS['cfg']['MainBackground']           = '#fff';
-
-// foreground (text) color of the pointer in browse mode
-$GLOBALS['cfg']['BrowsePointerColor']       = '#000';
-
-// background of the pointer in browse mode
-$GLOBALS['cfg']['BrowsePointerBackground']  = '#cfc';
-
-// foreground (text) color of the marker (visually marks row by clicking on it)
-// in browse mode
-$GLOBALS['cfg']['BrowseMarkerColor']        = '#000';
-
-// background of the marker (visually marks row by clicking on it) in browse mode
-$GLOBALS['cfg']['BrowseMarkerBackground']   = '#fc9';
-
-/**
- * fonts
- */
-/**
- * the font family as a valid css font family value,
- * if not set the browser default will be used
- * (depending on browser, DTD and system settings)
- */
-$GLOBALS['cfg']['FontFamily']           = 'sans-serif';
-/**
- * fixed width font family, used in textarea
- */
-$GLOBALS['cfg']['FontFamilyFixed']      = 'monospace';
-
-/**
- * tables
- */
-// border
-$GLOBALS['cfg']['Border']               = 0;
-// table header and footer color
-$GLOBALS['cfg']['ThBackground']         = '#D3DCE3';
-// table header and footer background
-$GLOBALS['cfg']['ThColor']              = '#000';
-// table data row background
-$GLOBALS['cfg']['BgOne']                = '#E5E5E5';
-// table data row background, alternate
-$GLOBALS['cfg']['BgTwo']                = '#D5D5D5';
diff --git a/#pma/themes/pmahomme/screen.png b/#pma/themes/pmahomme/screen.png
deleted file mode 100644
index 695c155b..00000000
Binary files a/#pma/themes/pmahomme/screen.png and /dev/null differ
diff --git a/#pma/themes/pmahomme/sprites.lib.php b/#pma/themes/pmahomme/sprites.lib.php
deleted file mode 100644
index 56ea1904..00000000
--- a/#pma/themes/pmahomme/sprites.lib.php
+++ /dev/null
@@ -1,819 +0,0 @@
-<?php
-/**
- * AUTOGENERATED CONTENT - DO NOT EDIT!
- * ALL CHANGES WILL BE UNDONE!
- * RUN `./scripts/generate-sprites` TO UPDATE THIS FILE
- *
- * @package PhpMyAdmin-theme
- */
-
-/**
- * Returns map of sprites inside sprite.png
- *
- * @return array Data of sprites
- */
-function PMA_sprites()
-{
-    return array(
-        'asc_order' => array(
-            'position' => '1',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_bookmark' => array(
-            'position' => '2',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_browse' => array(
-            'position' => '3',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_calendar' => array(
-            'position' => '4',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_chart' => array(
-            'position' => '5',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_close' => array(
-            'position' => '6',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_column_add' => array(
-            'position' => '7',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_comment' => array(
-            'position' => '8',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_dbstatistics' => array(
-            'position' => '9',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_deltbl' => array(
-            'position' => '10',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_docs' => array(
-            'position' => '11',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_docsql' => array(
-            'position' => '12',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_drop' => array(
-            'position' => '13',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_edit' => array(
-            'position' => '14',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_empty' => array(
-            'position' => '15',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_engine' => array(
-            'position' => '16',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_event_add' => array(
-            'position' => '17',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_events' => array(
-            'position' => '18',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_export' => array(
-            'position' => '19',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_favorite' => array(
-            'position' => '20',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_find_replace' => array(
-            'position' => '21',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_firstpage' => array(
-            'position' => '22',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_ftext' => array(
-            'position' => '23',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_group' => array(
-            'position' => '24',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_help' => array(
-            'position' => '25',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_home' => array(
-            'position' => '26',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_import' => array(
-            'position' => '27',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_index' => array(
-            'position' => '28',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_index_add' => array(
-            'position' => '29',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_info' => array(
-            'position' => '30',
-            'width'    => '11',
-            'height'   => '11'
-        ),
-        'b_inline_edit' => array(
-            'position' => '31',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_insrow' => array(
-            'position' => '32',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_lastpage' => array(
-            'position' => '33',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_minus' => array(
-            'position' => '34',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_more' => array(
-            'position' => '35',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_move' => array(
-            'position' => '36',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_newdb' => array(
-            'position' => '37',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_newtbl' => array(
-            'position' => '38',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_nextpage' => array(
-            'position' => '39',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_no_favorite' => array(
-            'position' => '40',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_pdfdoc' => array(
-            'position' => '41',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_plus' => array(
-            'position' => '42',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_prevpage' => array(
-            'position' => '43',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_primary' => array(
-            'position' => '44',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_print' => array(
-            'position' => '45',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_props' => array(
-            'position' => '46',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_relations' => array(
-            'position' => '47',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_report' => array(
-            'position' => '48',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_routine_add' => array(
-            'position' => '49',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_routines' => array(
-            'position' => '50',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_save' => array(
-            'position' => '51',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_saveimage' => array(
-            'position' => '52',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_sbrowse' => array(
-            'position' => '53',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_sdb' => array(
-            'position' => '54',
-            'width'    => '10',
-            'height'   => '10'
-        ),
-        'b_search' => array(
-            'position' => '55',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_selboard' => array(
-            'position' => '56',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_select' => array(
-            'position' => '57',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_snewtbl' => array(
-            'position' => '58',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_spatial' => array(
-            'position' => '59',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_sql' => array(
-            'position' => '60',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_sqldoc' => array(
-            'position' => '61',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_sqlhelp' => array(
-            'position' => '62',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_table_add' => array(
-            'position' => '63',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_tblanalyse' => array(
-            'position' => '64',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_tblexport' => array(
-            'position' => '65',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_tblimport' => array(
-            'position' => '66',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_tblops' => array(
-            'position' => '67',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_tbloptimize' => array(
-            'position' => '68',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_tipp' => array(
-            'position' => '69',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_trigger_add' => array(
-            'position' => '70',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_triggers' => array(
-            'position' => '71',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_undo' => array(
-            'position' => '72',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_unique' => array(
-            'position' => '73',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_usradd' => array(
-            'position' => '74',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_usrcheck' => array(
-            'position' => '75',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_usrdrop' => array(
-            'position' => '76',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_usredit' => array(
-            'position' => '77',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_usrlist' => array(
-            'position' => '78',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_versions' => array(
-            'position' => '79',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_view' => array(
-            'position' => '80',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_view_add' => array(
-            'position' => '81',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_views' => array(
-            'position' => '82',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_browse' => array(
-            'position' => '83',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_deltbl' => array(
-            'position' => '84',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_drop' => array(
-            'position' => '85',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_edit' => array(
-            'position' => '86',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_empty' => array(
-            'position' => '87',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_export' => array(
-            'position' => '88',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_firstpage' => array(
-            'position' => '89',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_ftext' => array(
-            'position' => '90',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_index' => array(
-            'position' => '91',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_insrow' => array(
-            'position' => '92',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_lastpage' => array(
-            'position' => '93',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_nextpage' => array(
-            'position' => '94',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_prevpage' => array(
-            'position' => '95',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_primary' => array(
-            'position' => '96',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_routine_add' => array(
-            'position' => '97',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_sbrowse' => array(
-            'position' => '98',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_select' => array(
-            'position' => '99',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_spatial' => array(
-            'position' => '100',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_unique' => array(
-            'position' => '101',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'centralColumns' => array(
-            'position' => '102',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'centralColumns_add' => array(
-            'position' => '103',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'centralColumns_delete' => array(
-            'position' => '104',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'col_drop' => array(
-            'position' => '105',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'console' => array(
-            'position' => '106',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'database' => array(
-            'position' => '107',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'eye' => array(
-            'position' => '108',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'eye_grey' => array(
-            'position' => '109',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'item' => array(
-            'position' => '110',
-            'width'    => '9',
-            'height'   => '9'
-        ),
-        'lightbulb' => array(
-            'position' => '111',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'lightbulb_off' => array(
-            'position' => '112',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'more' => array(
-            'position' => '113',
-            'width'    => '13',
-            'height'   => '16'
-        ),
-        'new_data' => array(
-            'position' => '114',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'new_data_hovered' => array(
-            'position' => '115',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'new_data_selected' => array(
-            'position' => '116',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'new_data_selected_hovered' => array(
-            'position' => '117',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'new_struct' => array(
-            'position' => '118',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'new_struct_hovered' => array(
-            'position' => '119',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'new_struct_selected' => array(
-            'position' => '120',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'new_struct_selected_hovered' => array(
-            'position' => '121',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'normalize' => array(
-            'position' => '122',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'pause' => array(
-            'position' => '123',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'php_sym' => array(
-            'position' => '124',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'play' => array(
-            'position' => '125',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_asc' => array(
-            'position' => '126',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_asci' => array(
-            'position' => '127',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_attention' => array(
-            'position' => '128',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_cancel' => array(
-            'position' => '129',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_cancel2' => array(
-            'position' => '130',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_cog' => array(
-            'position' => '131',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_db' => array(
-            'position' => '132',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_desc' => array(
-            'position' => '133',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_error' => array(
-            'position' => '134',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_error2' => array(
-            'position' => '135',
-            'width'    => '11',
-            'height'   => '11'
-        ),
-        's_host' => array(
-            'position' => '136',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_info' => array(
-            'position' => '137',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_lang' => array(
-            'position' => '138',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_link' => array(
-            'position' => '139',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_lock' => array(
-            'position' => '140',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_loggoff' => array(
-            'position' => '141',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_notice' => array(
-            'position' => '142',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_okay' => array(
-            'position' => '143',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_passwd' => array(
-            'position' => '144',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_process' => array(
-            'position' => '145',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_really' => array(
-            'position' => '146',
-            'width'    => '11',
-            'height'   => '11'
-        ),
-        's_reload' => array(
-            'position' => '147',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_replication' => array(
-            'position' => '148',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_rights' => array(
-            'position' => '149',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_sortable' => array(
-            'position' => '150',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_status' => array(
-            'position' => '151',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_success' => array(
-            'position' => '152',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_sync' => array(
-            'position' => '153',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_tbl' => array(
-            'position' => '154',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_theme' => array(
-            'position' => '155',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_top' => array(
-            'position' => '156',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_unlink' => array(
-            'position' => '157',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_vars' => array(
-            'position' => '158',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_views' => array(
-            'position' => '159',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'window-new' => array(
-            'position' => '160',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-    );
-}
diff --git a/#pma/themes/sprites.css.php b/#pma/themes/sprites.css.php
deleted file mode 100644
index 768804ed..00000000
--- a/#pma/themes/sprites.css.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * This file generates the CSS code for the sprites of a theme
- *
- * @package PhpMyAdmin-theme
- */
-
-// unplanned execution path
-if (! defined('PMA_MINIMUM_COMMON') && ! defined('TESTSUITE')) {
-    exit();
-}
-
-$bg = $_SESSION['PMA_Theme']->getImgPath() . 'sprites.png?v=' . urlencode(PMA_VERSION);
-/* Check if there is a valid data file for sprites */
-if (is_readable($_SESSION['PMA_Theme']->getPath() . '/sprites.lib.php')) {
-
-    ?>
-    /* Icon sprites */
-    .icon {
-    margin: 0;
-    margin-<?php echo $left; ?>: .3em;
-    padding: 0 !important;
-    width: 16px;
-    height: 16px;
-    background-image: url('<?php echo $bg; ?>') !important;
-    background-repeat: no-repeat !important;
-    background-position: top left !important;
-    }
-    <?php
-
-    include_once $_SESSION['PMA_Theme']->getPath() . '/sprites.lib.php';
-    $sprites = array();
-    if (function_exists('PMA_sprites')) {
-        $sprites = PMA_sprites();
-    }
-    $template = ".ic_%s { background-position: 0 -%upx !important;%s%s }\n";
-    foreach ($sprites as $name => $data) {
-        // generate the CSS code for each icon
-        $width = '';
-        $height = '';
-        // if either the height or width of an icon is 16px,
-        // then it's pointless to set this as a parameter,
-        //since it will be inherited from the "icon" class
-        if ($data['width'] != 16) {
-            $width = " width: " . $data['width'] . "px;";
-        }
-        if ($data['height'] != 16) {
-            $height = " height: " . $data['height'] . "px;";
-        }
-        printf(
-            $template,
-            $name,
-            ($data['position'] * 16),
-            $width,
-            $height
-        );
-    }
-}
-?>
diff --git a/#pma/themes/svg_gradient.php b/#pma/themes/svg_gradient.php
deleted file mode 100644
index bebb691f..00000000
--- a/#pma/themes/svg_gradient.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
- * Theme based generator for SVG gradient.
- *
- * @package PhpMyAdmin-theme
- */
-header('Content-Type: image/svg+xml');
-header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 3600) . ' GMT');
-
-/**
- * Gets single color from GET parameters validating it.
- *
- * @param string $get_name Name of parameter in request
- * @param string $default  Default value
- *
- * @return string Color name or code.
- */
-function PMA_gradientGetColor($get_name, $default)
-{
-    // get color from GET args, only alphanumeric characters
-    $opts = array('options' => array('regexp' => '/^[a-z0-9]+$/i'));
-    $color = filter_input(INPUT_GET, $get_name, FILTER_VALIDATE_REGEXP, $opts);
-    if (preg_match('/^[a-f0-9]{6}$/', $color)) {
-        return '#' . $color;
-    }
-    return $color ? $color : $default;
-}
-
-$from = PMA_gradientGetColor('from', 'white');
-$to = PMA_gradientGetColor('to', 'blank');
-
-echo '<?xml version="1.0" ?>';
-?>
-<svg
-    xmlns="http://www.w3.org/2000/svg"
-    preserveAspectRatio="none"
-    version="1.0" width="100%" height="100%">
-    <defs>
-        <linearGradient id="linear-gradient" x1="0%" y1="0%" x2="0%" y2="100%">
-            <stop
-                offset="0%"
-                stop-color="<?php echo $from; ?>"
-                stop-opacity="1"
-            />
-            <stop
-                offset="100%"
-                stop-color="<?php echo $to; ?>"
-                stop-opacity="1"
-            />
-        </linearGradient>
-    </defs>
-    <rect width="100%" height="100%" style="fill:url(#linear-gradient);" />
-</svg>
diff --git a/#pma/transformation_overview.php b/#pma/transformation_overview.php
deleted file mode 100644
index 697d1f02..00000000
--- a/#pma/transformation_overview.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Lists available transformation plugins
- *
- * @package PhpMyAdmin
- */
-
-/**
- * Gets some core libraries and displays a top message if required
- */
-require_once './libraries/common.inc.php';
-require_once './libraries/transformations.lib.php';
-
-$response = PMA\libraries\Response::getInstance();
-$header   = $response->getHeader();
-$header->disableMenuAndConsole();
-
-$types = PMA_getAvailableMIMEtypes();
-?>
-
-<h2><?php echo __('Available MIME types'); ?></h2>
-<?php
-foreach ($types['mimetype'] as $key => $mimetype) {
-
-    if (isset($types['empty_mimetype'][$mimetype])) {
-        echo '<i>' , $mimetype , '</i><br />';
-    } else {
-        echo $mimetype , '<br />';
-    }
-
-}
-$transformation_types = array(
-    'transformation', 'input_transformation'
-);
-$label = array(
-    'transformation' => __('Available browser display transformations'),
-    'input_transformation' => __('Available input transformations')
-);
-$th = array(
-    'transformation' => __('Browser display transformation'),
-    'input_transformation' => __('Input transformation')
-);
-?>
-<br />
-<?php foreach ($transformation_types as $ttype) { ?>
-    <a name="<?php echo $ttype; ?>"></a>
-    <h2><?php echo $label[$ttype] ?></h2>
-    <table width="90%">
-    <thead>
-    <tr>
-        <th><?php echo $th[$ttype] ?></th>
-        <th><?php echo _pgettext('for MIME transformation', 'Description'); ?></th>
-    </tr>
-    </thead>
-    <tbody>
-    <?php
-    $odd_row = true;
-    foreach ($types[$ttype] as $key => $transform) {
-        $desc = PMA_getTransformationDescription($types[$ttype . '_file'][$key]);
-        ?>
-        <tr class="<?php echo $odd_row ? 'odd' : 'even'; ?>">
-            <td><?php echo $transform; ?></td>
-            <td><?php echo $desc; ?></td>
-        </tr>
-        <?php
-        $odd_row = !$odd_row;
-    }
-    ?>
-    </tbody>
-    </table>
-    <?php
-} // End of foreach ($transformation_types)
diff --git a/#pma/transformation_wrapper.php b/#pma/transformation_wrapper.php
deleted file mode 100644
index 8a8e3caa..00000000
--- a/#pma/transformation_wrapper.php
+++ /dev/null
@@ -1,162 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Wrapper script for rendering transformations
- *
- * @package PhpMyAdmin
- */
-
-/**
- *
- */
-define('IS_TRANSFORMATION_WRAPPER', true);
-
-/**
- * Gets a core script and starts output buffering work
- */
-require_once './libraries/common.inc.php';
-require_once './libraries/transformations.lib.php'; // Transformations
-$cfgRelation = PMA_getRelationsParam();
-
-/**
- * Ensures db and table are valid, else moves to the "parent" script
- */
-require_once './libraries/db_table_exists.lib.php';
-
-
-/**
- * Sets globals from $_REQUEST
- */
-$request_params = array(
-    'cn',
-    'ct',
-    'sql_query',
-    'transform_key',
-    'where_clause'
-);
-$size_params = array(
-    'newHeight',
-    'newWidth',
-);
-foreach ($request_params as $one_request_param) {
-    if (isset($_REQUEST[$one_request_param])) {
-        if (in_array($one_request_param, $size_params)) {
-            $GLOBALS[$one_request_param] = intval($_REQUEST[$one_request_param]);
-            if ($GLOBALS[$one_request_param] > 2000) {
-                $GLOBALS[$one_request_param] = 2000;
-            }
-        } else {
-            $GLOBALS[$one_request_param] = $_REQUEST[$one_request_param];
-        }
-    }
-}
-
-
-/**
- * Get the list of the fields of the current table
- */
-$GLOBALS['dbi']->selectDb($db);
-if (isset($where_clause)) {
-    $result = $GLOBALS['dbi']->query(
-        'SELECT * FROM ' . PMA\libraries\Util::backquote($table)
-        . ' WHERE ' . $where_clause . ';',
-        null,
-        PMA\libraries\DatabaseInterface::QUERY_STORE
-    );
-    $row = $GLOBALS['dbi']->fetchAssoc($result);
-} else {
-    $result = $GLOBALS['dbi']->query(
-        'SELECT * FROM ' . PMA\libraries\Util::backquote($table) . ' LIMIT 1;',
-        null,
-        PMA\libraries\DatabaseInterface::QUERY_STORE
-    );
-    $row = $GLOBALS['dbi']->fetchAssoc($result);
-}
-
-// No row returned
-if (! $row) {
-    exit;
-} // end if (no record returned)
-
-$default_ct = 'application/octet-stream';
-
-if ($cfgRelation['commwork'] && $cfgRelation['mimework']) {
-    $mime_map = PMA_getMime($db, $table);
-    $mime_options = PMA_Transformation_getOptions(
-        isset($mime_map[$transform_key]['transformation_options'])
-        ? $mime_map[$transform_key]['transformation_options'] : ''
-    );
-
-    foreach ($mime_options as $key => $option) {
-        if (substr($option, 0, 10) == '; charset=') {
-            $mime_options['charset'] = $option;
-        }
-    }
-}
-
-// Only output the http headers
-$response = PMA\libraries\Response::getInstance();
-$response->getHeader()->sendHttpHeaders();
-
-// [MIME]
-if (isset($ct) && ! empty($ct)) {
-    $mime_type = $ct;
-} else {
-    $mime_type = (!empty($mime_map[$transform_key]['mimetype'])
-        ? str_replace('_', '/', $mime_map[$transform_key]['mimetype'])
-        : $default_ct)
-    . (isset($mime_options['charset']) ? $mime_options['charset'] : '');
-}
-
-PMA_downloadHeader($cn, $mime_type);
-
-if (! isset($_REQUEST['resize'])) {
-    if (stripos($mime_type, 'html') === false) {
-        echo $row[$transform_key];
-    } else {
-        echo htmlspecialchars($row[$transform_key]);
-    }
-} else {
-    // if image_*__inline.inc.php finds that we can resize,
-    // it sets the resize parameter to jpeg or png
-
-    $srcImage = imagecreatefromstring($row[$transform_key]);
-    $srcWidth = ImageSX($srcImage);
-    $srcHeight = ImageSY($srcImage);
-
-    // Check to see if the width > height or if width < height
-    // if so adjust accordingly to make sure the image
-    // stays smaller than the new width and new height
-
-    $ratioWidth = $srcWidth/$_REQUEST['newWidth'];
-    $ratioHeight = $srcHeight/$_REQUEST['newHeight'];
-
-    if ($ratioWidth < $ratioHeight) {
-        $destWidth = $srcWidth/$ratioHeight;
-        $destHeight = $_REQUEST['newHeight'];
-    } else {
-        $destWidth = $_REQUEST['newWidth'];
-        $destHeight = $srcHeight/$ratioWidth;
-    }
-
-    if ($_REQUEST['resize']) {
-        $destImage = ImageCreateTrueColor($destWidth, $destHeight);
-    }
-
-    // ImageCopyResized($destImage, $srcImage, 0, 0, 0, 0,
-    // $destWidth, $destHeight, $srcWidth, $srcHeight);
-    // better quality but slower:
-    ImageCopyResampled(
-        $destImage, $srcImage, 0, 0, 0, 0, $destWidth,
-        $destHeight, $srcWidth, $srcHeight
-    );
-
-    if ($_REQUEST['resize'] == 'jpeg') {
-        ImageJPEG($destImage, null, 75);
-    }
-    if ($_REQUEST['resize'] == 'png') {
-        ImagePNG($destImage);
-    }
-    ImageDestroy($srcImage);
-    ImageDestroy($destImage);
-}
diff --git a/#pma/url.php b/#pma/url.php
deleted file mode 100644
index 60b0f7d6..00000000
--- a/#pma/url.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * URL redirector to avoid leaking Referer with some sensitive information.
- *
- * @package PhpMyAdmin
- */
-
-/**
- * Gets core libraries and defines some variables
- */
-define('PMA_MINIMUM_COMMON', true);
-require_once './libraries/common.inc.php';
-/**
- * JavaScript escaping.
- */
-require_once './libraries/js_escape.lib.php';
-
-// Only output the http headers
-$response = PMA\libraries\Response::getInstance();
-$response->getHeader()->sendHttpHeaders();
-$response->disable();
-
-if (! PMA_isValid($_REQUEST['url'])
-    || ! preg_match('/^https:\/\/[^\n\r]*$/', $_REQUEST['url'])
-    || ! PMA_isAllowedDomain($_REQUEST['url'])
-) {
-    PMA_sendHeaderLocation('./');
-} else {
-    // JavaScript redirection is necessary. Because if header() is used
-    //  then web browser sometimes does not change the HTTP_REFERER
-    //  field and so with old URL as Referer, token also goes to
-    //  external site.
-    echo "<script type='text/javascript'>
-            window.onload=function(){
-                window.location='" , PMA_escapeJsString($_REQUEST['url']) , "';
-            }
-        </script>";
-    // Display redirecting msg on screen.
-    // Do not display the value of $_REQUEST['url'] to avoid showing injected content
-    echo __('Taking you to the target site.');
-}
-die();
diff --git a/#pma/user_password.php b/#pma/user_password.php
deleted file mode 100644
index d2063e55..00000000
--- a/#pma/user_password.php
+++ /dev/null
@@ -1,300 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * displays and handles the form where the user can change his password
- * linked from index.php
- *
- * @package PhpMyAdmin
- */
-
-/**
- * Gets some core libraries
- */
-require_once './libraries/common.inc.php';
-
-/**
- * Libraries needed for some functions
- */
-require_once './libraries/server_privileges.lib.php';
-
-$response = PMA\libraries\Response::getInstance();
-$header   = $response->getHeader();
-$scripts  = $header->getScripts();
-$scripts->addFile('server_privileges.js');
-
-/**
- * Displays an error message and exits if the user isn't allowed to use this
- * script
- */
-if (! $GLOBALS['cfg']['ShowChgPassword']) {
-    $GLOBALS['cfg']['ShowChgPassword'] = $GLOBALS['dbi']->selectDb('mysql');
-}
-if ($cfg['Server']['auth_type'] == 'config' || ! $cfg['ShowChgPassword']) {
-    PMA\libraries\Message::error(
-        __('You don\'t have sufficient privileges to be here right now!')
-    )->display();
-    exit;
-} // end if
-
-/**
- * If the "change password" form has been submitted, checks for valid values
- * and submit the query or logout
- */
-if (isset($_REQUEST['nopass'])) {
-    if ($_REQUEST['nopass'] == '1') {
-        $password = '';
-    } else {
-        $password = $_REQUEST['pma_pw'];
-    }
-    $change_password_message = PMA_setChangePasswordMsg();
-    $msg = $change_password_message['msg'];
-    if (! $change_password_message['error']) {
-        PMA_changePassword($password, $msg, $change_password_message);
-    } else {
-        PMA_getChangePassMessage($change_password_message);
-    }
-}
-
-/**
- * If the "change password" form hasn't been submitted or the values submitted
- * aren't valid -> displays the form
- */
-
-// Displays an error message if required
-if (isset($msg)) {
-    $msg->display();
-    unset($msg);
-}
-
-require_once './libraries/display_change_password.lib.php';
-
-echo PMA_getHtmlForChangePassword('change_pw', $username, $hostname);
-exit;
-
-/**
- * Send the message as an ajax request
- *
- * @param array  $change_password_message Message to display
- * @param string $sql_query               SQL query executed
- *
- * @return void
- */
-function PMA_getChangePassMessage($change_password_message, $sql_query = '')
-{
-    if ($GLOBALS['is_ajax_request'] == true) {
-        /**
-         * If in an Ajax request, we don't need to show the rest of the page
-         */
-        $response = PMA\libraries\Response::getInstance();
-        if ($change_password_message['error']) {
-            $response->addJSON('message', $change_password_message['msg']);
-            $response->setRequestStatus(false);
-        } else {
-            $sql_query = PMA\libraries\Util::getMessage(
-                $change_password_message['msg'],
-                $sql_query,
-                'success'
-            );
-            $response->addJSON('message', $sql_query);
-        }
-        exit;
-    }
-}
-
-/**
- * Generate the message
- *
- * @return array   error value and message
- */
-function PMA_setChangePasswordMsg()
-{
-    $error = false;
-    $message = PMA\libraries\Message::success(__('The profile has been updated.'));
-
-    if (($_REQUEST['nopass'] != '1')) {
-        if (strlen($_REQUEST['pma_pw']) === 0 || strlen($_REQUEST['pma_pw2']) === 0) {
-            $message = PMA\libraries\Message::error(__('The password is empty!'));
-            $error = true;
-        } elseif ($_REQUEST['pma_pw'] !== $_REQUEST['pma_pw2']) {
-            $message = PMA\libraries\Message::error(
-                __('The passwords aren\'t the same!')
-            );
-            $error = true;
-        } elseif (strlen($_REQUEST['pma_pw']) > 256) {
-            $message = PMA_Message::error(__('Password is too long!'));
-            $error = true;
-        }
-    }
-    return array('error' => $error, 'msg' => $message);
-}
-
-/**
- * Change the password
- *
- * @param string $password                New password
- * @param string $message                 Message
- * @param array  $change_password_message Message to show
- *
- * @return void
- */
-function PMA_changePassword($password, $message, $change_password_message)
-{
-    global $auth_plugin;
-
-    $hashing_function = PMA_changePassHashingFunction();
-
-    $row = $GLOBALS['dbi']->fetchSingleRow('SELECT CURRENT_USER() as user');
-    $curr_user = $row['user'];
-    list($username, $hostname) = explode('@', $curr_user);
-
-    $serverType = PMA\libraries\Util::getServerType();
-
-    if (isset($_REQUEST['authentication_plugin'])
-        && ! empty($_REQUEST['authentication_plugin'])
-    ) {
-        $orig_auth_plugin = $_REQUEST['authentication_plugin'];
-    } else {
-        $orig_auth_plugin = PMA_getCurrentAuthenticationPlugin(
-            'change', $username, $hostname
-        );
-    }
-
-    $sql_query = 'SET password = '
-        . (($password == '') ? '\'\'' : $hashing_function . '(\'***\')');
-
-    if ($serverType == 'MySQL'
-        && PMA_MYSQL_INT_VERSION >= 50706
-    ) {
-        $sql_query = 'ALTER USER \'' . $username . '\'@\'' . $hostname
-            . '\' IDENTIFIED WITH ' . $orig_auth_plugin . ' BY '
-            . (($password == '') ? '\'\'' : '\'***\'');
-    } else if (($serverType == 'MySQL'
-        && PMA_MYSQL_INT_VERSION >= 50507)
-        || ($serverType == 'MariaDB'
-        && PMA_MYSQL_INT_VERSION >= 50200)
-    ) {
-        // For MySQL versions 5.5.7+ and MariaDB versions 5.2+,
-        // explicitly set value of `old_passwords` so that
-        // it does not give an error while using
-        // the PASSWORD() function
-        if ($orig_auth_plugin == 'sha256_password') {
-            $value = 2;
-        } else {
-            $value = 0;
-        }
-        $GLOBALS['dbi']->tryQuery('SET `old_passwords` = ' . $value . ';');
-    }
-
-    PMA_changePassUrlParamsAndSubmitQuery(
-        $username, $hostname, $password,
-        $sql_query, $hashing_function, $orig_auth_plugin
-    );
-
-    $auth_plugin->handlePasswordChange($password);
-    PMA_getChangePassMessage($change_password_message, $sql_query);
-    PMA_changePassDisplayPage($message, $sql_query);
-}
-
-/**
- * Generate the hashing function
- *
- * @return string  $hashing_function
- */
-function PMA_changePassHashingFunction()
-{
-    if (PMA_isValid(
-        $_REQUEST['authentication_plugin'], 'identical', 'mysql_old_password'
-    )) {
-        $hashing_function = 'OLD_PASSWORD';
-    } else {
-        $hashing_function = 'PASSWORD';
-    }
-    return $hashing_function;
-}
-
-/**
- * Changes password for a user
- *
- * @param string $username         Username
- * @param string $hostname         Hostname
- * @param string $password         Password
- * @param string $sql_query        SQL query
- * @param string $hashing_function Hashing function
- * @param string $orig_auth_plugin Original Authentication Plugin
- *
- * @return void
- */
-function PMA_changePassUrlParamsAndSubmitQuery(
-    $username, $hostname, $password, $sql_query, $hashing_function, $orig_auth_plugin
-) {
-    $err_url = 'user_password.php' . PMA_URL_getCommon();
-
-    $serverType = PMA\libraries\Util::getServerType();
-
-    if ($serverType == 'MySQL' && PMA_MYSQL_INT_VERSION >= 50706) {
-        $local_query = 'ALTER USER \'' . $username . '\'@\'' . $hostname . '\''
-            . ' IDENTIFIED with ' . $orig_auth_plugin . ' BY '
-            . (($password == '')
-            ? '\'\''
-            : '\'' . $GLOBALS['dbi']->escapeString($password) . '\'');
-    } else if ($serverType == 'MariaDB'
-        && PMA_MYSQL_INT_VERSION >= 50200
-        && PMA_MYSQL_INT_VERSION < 100100
-        && $orig_auth_plugin !== ''
-    ) {
-        if ($orig_auth_plugin == 'mysql_native_password') {
-            // Set the hashing method used by PASSWORD()
-            // to be 'mysql_native_password' type
-            $GLOBALS['dbi']->tryQuery('SET old_passwords = 0;');
-        } else if ($orig_auth_plugin == 'sha256_password') {
-            // Set the hashing method used by PASSWORD()
-            // to be 'sha256_password' type
-            $GLOBALS['dbi']->tryQuery('SET `old_passwords` = 2;');
-        }
-
-        $hashedPassword = PMA_getHashedPassword($_POST['pma_pw']);
-
-        $local_query = "UPDATE `mysql`.`user` SET"
-            . " `authentication_string` = '" . $hashedPassword
-            . "', `Password` = '', "
-            . " `plugin` = '" . $orig_auth_plugin . "'"
-            . " WHERE `User` = '" . $username . "' AND Host = '"
-            . $hostname . "';";
-    } else {
-        $local_query = 'SET password = ' . (($password == '')
-            ? '\'\''
-            : $hashing_function . '(\''
-                . $GLOBALS['dbi']->escapeString($password) . '\')');
-    }
-    if (! @$GLOBALS['dbi']->tryQuery($local_query)) {
-        PMA\libraries\Util::mysqlDie(
-            $GLOBALS['dbi']->getError(),
-            $sql_query,
-            false,
-            $err_url
-        );
-    }
-
-    // Flush privileges after successful password change
-    $GLOBALS['dbi']->tryQuery("FLUSH PRIVILEGES;");
-}
-
-/**
- * Display the page
- *
- * @param string $message   Message
- * @param string $sql_query SQL query
- *
- * @return void
- */
-function PMA_changePassDisplayPage($message, $sql_query)
-{
-    echo '<h1>' , __('Change password') , '</h1>' , "\n\n";
-    echo PMA\libraries\Util::getMessage(
-        $message, $sql_query, 'success'
-    );
-    echo '<a href="index.php' , PMA_URL_getCommon()
-        , ' target="_parent">' , "\n"
-        , '<strong>' , __('Back') , '</strong></a>';
-    exit;
-}
diff --git a/#pma/version_check.php b/#pma/version_check.php
deleted file mode 100644
index fbbe3f9a..00000000
--- a/#pma/version_check.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * A caching proxy for retrieving version information from phpmyadmin.net
- *
- * @package PhpMyAdmin
- */
-
-// Sets up the session
-use PMA\libraries\VersionInformation;
-
-$_GET['ajax_request'] = 'true';
-
-require_once 'libraries/common.inc.php';
-
-// Disabling standard response.
-PMA\libraries\Response::getInstance()->disable();
-
-// Always send the correct headers
-PMA_headerJSON();
-
-$versionInformation = new VersionInformation();
-$versionDetails = $versionInformation->getLatestVersion();
-
-if (empty($versionDetails)) {
-    echo json_encode(array());
-} else {
-    $latestCompatible = $versionInformation->getLatestCompatibleVersion(
-        $versionDetails->releases
-    );
-    $version = '';
-    $date = '';
-    if ($latestCompatible != null) {
-        $version = $latestCompatible['version'];
-        $date = $latestCompatible['date'];
-    }
-    echo json_encode(
-        array(
-            'version' => (! empty($version) ? $version : ''),
-            'date' => (! empty($date) ? $date : ''),
-        )
-    );
-}
diff --git a/#pma/view_create.php b/#pma/view_create.php
deleted file mode 100644
index d9f4f007..00000000
--- a/#pma/view_create.php
+++ /dev/null
@@ -1,307 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * handles creation of VIEWs
- *
- * @todo js error when view name is empty (strFormEmpty)
- * @todo (also validate if js is disabled, after form submission?)
- * @package PhpMyAdmin
- */
-
-require_once './libraries/common.inc.php';
-
-/**
- * Runs common work
- */
-require './libraries/db_common.inc.php';
-$url_params['goto'] = 'tbl_structure.php';
-$url_params['back'] = 'view_create.php';
-
-$view_algorithm_options = array(
-    'UNDEFINED',
-    'MERGE',
-    'TEMPTABLE',
-);
-
-$view_with_options = array(
-    'CASCADED',
-    'LOCAL'
-);
-
-$view_security_options = array(
-    'DEFINER',
-    'INVOKER'
-);
-
-if (empty($sql_query)) {
-    $sql_query = '';
-}
-
-// View name is a compulsory field
-if (isset($_REQUEST['view']['name'])
-    && empty($_REQUEST['view']['name'])
-) {
-    $message = PMA\libraries\Message::error(__('View name can not be empty'));
-    $response = PMA\libraries\Response::getInstance();
-    $response->addJSON(
-        'message',
-        $message
-    );
-    $response->setRequestStatus(false);
-    exit;
-}
-
-if (isset($_REQUEST['createview']) || isset($_REQUEST['alterview'])) {
-    /**
-     * Creates the view
-     */
-    $sep = "\r\n";
-
-    if (isset($_REQUEST['createview'])) {
-        $sql_query = 'CREATE';
-        if (isset($_REQUEST['view']['or_replace'])) {
-            $sql_query .= ' OR REPLACE';
-        }
-    } else {
-        $sql_query = 'ALTER';
-    }
-
-    if (PMA_isValid($_REQUEST['view']['algorithm'], $view_algorithm_options)) {
-        $sql_query .= $sep . ' ALGORITHM = ' . $_REQUEST['view']['algorithm'];
-    }
-
-    if (! empty($_REQUEST['view']['definer'])) {
-        $arr = explode('@', $_REQUEST['view']['definer']);
-        $sql_query .= $sep . 'DEFINER=' . PMA\libraries\Util::backquote($arr[0]);
-        $sql_query .= '@' . PMA\libraries\Util::backquote($arr[1]) . ' ';
-    }
-
-    if (isset($_REQUEST['view']['sql_security'])) {
-        if (in_array($_REQUEST['view']['sql_security'], $view_security_options)) {
-            $sql_query .= $sep . ' SQL SECURITY '
-                . $_REQUEST['view']['sql_security'];
-        }
-    }
-
-    $sql_query .= $sep . ' VIEW '
-        . PMA\libraries\Util::backquote($_REQUEST['view']['name']);
-
-    if (! empty($_REQUEST['view']['column_names'])) {
-        $sql_query .= $sep . ' (' . $_REQUEST['view']['column_names'] . ')';
-    }
-
-    $sql_query .= $sep . ' AS ' . $_REQUEST['view']['as'];
-
-    if (isset($_REQUEST['view']['with'])) {
-        if (in_array($_REQUEST['view']['with'], $view_with_options)) {
-            $sql_query .= $sep . ' WITH ' . $_REQUEST['view']['with']
-                . '  CHECK OPTION';
-        }
-    }
-
-    if (!$GLOBALS['dbi']->tryQuery($sql_query)) {
-        if (! isset($_REQUEST['ajax_dialog'])) {
-            $message = PMA\libraries\Message::rawError($GLOBALS['dbi']->getError());
-            return;
-        }
-
-        $response = PMA\libraries\Response::getInstance();
-        $response->addJSON(
-            'message',
-            PMA\libraries\Message::error(
-                "<i>" . htmlspecialchars($sql_query) . "</i><br /><br />"
-                . $GLOBALS['dbi']->getError()
-            )
-        );
-        $response->setRequestStatus(false);
-        exit;
-    }
-
-    // If different column names defined for VIEW
-    $view_columns = array();
-    if (isset($_REQUEST['view']['column_names'])) {
-        $view_columns = explode(',', $_REQUEST['view']['column_names']);
-    }
-
-    $column_map = $GLOBALS['dbi']->getColumnMapFromSql(
-        $_REQUEST['view']['as'], $view_columns
-    );
-
-    $systemDb = $GLOBALS['dbi']->getSystemDatabase();
-    $pma_transformation_data = $systemDb->getExistingTransformationData(
-        $GLOBALS['db']
-    );
-
-    if ($pma_transformation_data !== false) {
-
-        // SQL for store new transformation details of VIEW
-        $new_transformations_sql = $systemDb->getNewTransformationDataSql(
-            $pma_transformation_data, $column_map,
-            $_REQUEST['view']['name'], $GLOBALS['db']
-        );
-
-        // Store new transformations
-        if ($new_transformations_sql != '') {
-            $GLOBALS['dbi']->tryQuery($new_transformations_sql);
-        }
-
-    }
-    unset($pma_transformation_data);
-
-    if (! isset($_REQUEST['ajax_dialog'])) {
-        $message = PMA\libraries\Message::success();
-        include 'tbl_structure.php';
-    } else {
-        $response = PMA\libraries\Response::getInstance();
-        $response->addJSON(
-            'message',
-            PMA\libraries\Util::getMessage(
-                PMA\libraries\Message::success(),
-                $sql_query
-            )
-        );
-        $response->setRequestStatus(true);
-    }
-
-    exit;
-}
-
-// prefill values if not already filled from former submission
-$view = array(
-    'operation' => 'create',
-    'or_replace' => '',
-    'algorithm' => '',
-    'definer' => '',
-    'sql_security' => '',
-    'name' => '',
-    'column_names' => '',
-    'as' => $sql_query,
-    'with' => '',
-);
-
-if (PMA_isValid($_REQUEST['view'], 'array')) {
-    $view = array_merge($view, $_REQUEST['view']);
-}
-
-$url_params['db'] = $GLOBALS['db'];
-$url_params['reload'] = 1;
-
-/**
- * Displays the page
- */
-$htmlString = '<!-- CREATE VIEW options -->'
-    . '<div id="div_view_options">'
-    . '<form method="post" action="view_create.php">'
-    . PMA_URL_getHiddenInputs($url_params)
-    . '<fieldset>'
-    . '<legend>'
-    . (isset($_REQUEST['ajax_dialog']) ?
-        __('Details') :
-        ($view['operation'] == 'create' ? __('Create view') : __('Edit view'))
-    )
-    . '</legend>'
-    . '<table class="rte_table">';
-
-if ($view['operation'] == 'create') {
-    $htmlString .= '<tr>'
-        . '<td class="nowrap"><label for="or_replace">OR REPLACE</label></td>'
-        . '<td><input type="checkbox" name="view[or_replace]" id="or_replace"';
-    if ($view['or_replace']) {
-        $htmlString .= ' checked="checked"';
-    }
-    $htmlString .= ' value="1" /></td></tr>';
-}
-
-$htmlString .= '<tr>'
-    . '<td class="nowrap"><label for="algorithm">ALGORITHM</label></td>'
-    . '<td><select name="view[algorithm]" id="algorithm">';
-foreach ($view_algorithm_options as $option) {
-    $htmlString .= '<option value="' . htmlspecialchars($option) . '"';
-    if ($view['algorithm'] === $option) {
-        $htmlString .= ' selected="selected"';
-    }
-    $htmlString .= '>' . htmlspecialchars($option) . '</option>';
-}
-$htmlString .= '</select>'
-    . '</td></tr>';
-
-$htmlString .= '<tr><td class="nowrap">' . __('Definer') . '</td>'
-    . '<td><input type="text" maxlength="100" size="50" name="view[definer]"'
-    . ' value="' . htmlspecialchars($view['definer']) . '" />'
-    . '</td></tr>';
-
-$htmlString .= '<tr><td class="nowrap">SQL SECURITY</td>'
-    . '<td><select name="view[sql_security]">'
-    . '<option value=""></option>';
-foreach ($view_security_options as $option) {
-    $htmlString .= '<option value="' . htmlspecialchars($option) . '"';
-    if ($option == $view['sql_security']) {
-        $htmlString .= ' selected="selected"';
-    }
-    $htmlString .= '>' . htmlspecialchars($option) . '</option>';
-}
-$htmlString .= '<select>'
-    . '</td></tr>';
-
-if ($view['operation'] == 'create') {
-    $htmlString .= '<tr><td class="nowrap">' . __('VIEW name') . '</td>'
-        . '<td><input type="text" size="20" name="view[name]"'
-        . ' onfocus="this.select()" maxlength="64"'
-        . ' value="' . htmlspecialchars($view['name']) . '" />'
-        . '</td></tr>';
-} else {
-    $htmlString .= '<tr><td><input type="hidden" name="view[name]"'
-        . ' value="' . htmlspecialchars($view['name']) . '" />'
-        . '</td></tr>';
-}
-
-$htmlString .= '<tr><td class="nowrap">' . __('Column names') . '</td>'
-    . '<td><input type="text" maxlength="100" size="50" name="view[column_names]"'
-    . ' onfocus="this.select()"'
-    . ' value="' . htmlspecialchars($view['column_names']) . '" />'
-    . '</td></tr>';
-
-$htmlString .= '<tr><td class="nowrap">AS</td>'
-    . '<td>'
-    . '<textarea name="view[as]" rows="15" cols="40" dir="' . $text_dir . '"';
-if ($GLOBALS['cfg']['TextareaAutoSelect'] || true) {
-    $htmlString .= ' onclick="selectContent(this, sql_box_locked, true)"';
-}
-$htmlString .= '>' . htmlspecialchars($view['as']) . '</textarea>'
-    . '</td></tr>';
-
-$htmlString .= '<tr><td class="nowrap">WITH CHECK OPTION</td>'
-    . '<td><select name="view[with]">'
-    . '<option value=""></option>';
-foreach ($view_with_options as $option) {
-    $htmlString .= '<option value="' . htmlspecialchars($option) . '"';
-    if ($option == $view['with']) {
-        $htmlString .= ' selected="selected"';
-    }
-    $htmlString .= '>' . htmlspecialchars($option) . '</option>';
-}
-$htmlString .= '<select>'
-    . '</td></tr>';
-
-$htmlString .= '</table>'
-    . '</fieldset>';
-
-if (! isset($_REQUEST['ajax_dialog'])) {
-    $htmlString .= '<fieldset class="tblFooters">'
-        . '<input type="hidden" name="'
-        . ($view['operation'] == 'create' ? 'createview' : 'alterview' )
-        . '" value="1" />'
-        . '<input type="submit" name="" value="' . __('Go') . '" />'
-        . '</fieldset>';
-} else {
-    $htmlString .= '<input type="hidden" name="'
-        . ($view['operation'] == 'create' ? 'createview' : 'alterview' )
-        . '" value="1" />'
-        . '<input type="hidden" name="ajax_dialog" value="1" />'
-        . '<input type="hidden" name="ajax_request" value="1" />';
-}
-
-$htmlString .= '</form>'
-    . '</div>';
-
-echo $htmlString;
diff --git a/#pma/view_operations.php b/#pma/view_operations.php
deleted file mode 100644
index 1a891df0..00000000
--- a/#pma/view_operations.php
+++ /dev/null
@@ -1,150 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * View manipulations
- *
- * @package PhpMyAdmin
- */
-use PMA\libraries\Table;
-use PMA\libraries\Response;
-
-/**
- *
- */
-require_once './libraries/common.inc.php';
-
-$pma_table = new Table($GLOBALS['table'], $GLOBALS['db']);
-
-/**
- * functions implementation for this script
- */
-require_once 'libraries/operations.lib.php';
-
-/**
- * Load JavaScript files
- */
-$response = Response::getInstance();
-$header   = $response->getHeader();
-$scripts  = $header->getScripts();
-$scripts->addFile('tbl_operations.js');
-
-/**
- * Runs common work
- */
-require './libraries/tbl_common.inc.php';
-$url_query .= '&amp;goto=view_operations.php&amp;back=view_operations.php';
-$url_params['goto'] = $url_params['back'] = 'view_operations.php';
-
-/**
- * Gets tables information
- */
-
-require './libraries/tbl_info.inc.php';
-$reread_info = false;
-
-/**
- * Updates if required
- */
-if (isset($_REQUEST['submitoptions'])) {
-    $_message = '';
-    $warning_messages = array();
-
-    if (isset($_REQUEST['new_name'])) {
-        if ($pma_table->rename($_REQUEST['new_name'])) {
-            $_message .= $pma_table->getLastMessage();
-            $result = true;
-            $GLOBALS['table'] = $pma_table->getName();
-            $reread_info = true;
-            $reload = true;
-        } else {
-            $_message .= $pma_table->getLastError();
-            $result = false;
-        }
-    }
-}
-
-if (isset($result)) {
-    // set to success by default, because result set could be empty
-    // (for example, a table rename)
-    $_type = 'success';
-    if (empty($_message)) {
-        $_message = $result
-            ? __('Your SQL query has been executed successfully.')
-            : __('Error');
-        // $result should exist, regardless of $_message
-        $_type = $result ? 'success' : 'error';
-    }
-    if (! empty($warning_messages)) {
-        $_message = new PMA\libraries\Message;
-        $_message->addMessages($warning_messages);
-        $_message->isError(true);
-        unset($warning_messages);
-    }
-    echo PMA\libraries\Util::getMessage(
-        $_message, $sql_query, $_type
-    );
-    unset($_message, $_type);
-}
-
-$url_params['goto'] = 'view_operations.php';
-$url_params['back'] = 'view_operations.php';
-
-/**
- * Displays the page
- */
-?>
-<!-- Table operations -->
-<div class="operations_half_width">
-<form method="post" action="view_operations.php">
-<?php echo PMA_URL_getHiddenInputs($GLOBALS['db'], $GLOBALS['table']); ?>
-<input type="hidden" name="reload" value="1" />
-<fieldset>
-    <legend><?php echo __('Operations'); ?></legend>
-
-    <table>
-    <!-- Change view name -->
-    <tr><td><?php echo __('Rename view to'); ?></td>
-        <td><input type="text" size="20" name="new_name" onfocus="this.select()"
-                value="<?php echo htmlspecialchars($GLOBALS['table']); ?>"
-                required />
-        </td>
-    </tr>
-    </table>
-</fieldset>
-<fieldset class="tblFooters">
-        <input type="hidden" name="submitoptions" value="1" />
-        <input type="submit" value="<?php echo __('Go'); ?>" />
-</fieldset>
-</form>
-</div>
-<?php
-$drop_view_url_params = array_merge(
-    $url_params,
-    array(
-        'sql_query' => 'DROP VIEW ' . PMA\libraries\Util::backquote(
-            $GLOBALS['table']
-        ),
-        'goto' => 'tbl_structure.php',
-        'reload' => '1',
-        'purge' => '1',
-        'message_to_show' => sprintf(
-            __('View %s has been dropped.'),
-            htmlspecialchars($GLOBALS['table'])
-        ),
-        'table' => $GLOBALS['table']
-    )
-);
-echo '<div class="operations_half_width">';
-echo '<fieldset class="caution">';
-echo '<legend>' , __('Delete data or table') , '</legend>';
-
-echo '<ul>';
-echo PMA_getDeleteDataOrTableLink(
-    $drop_view_url_params,
-    'DROP VIEW',
-    __('Delete the view (DROP)'),
-    'drop_view_anchor'
-);
-echo '</ul>';
-echo '</fieldset>';
-echo '</div>';
diff --git a/ajax.js_20170928 b/ajax.js_20170928
deleted file mode 100644
index 2894319a..00000000
--- a/ajax.js_20170928
+++ /dev/null
@@ -1,193 +0,0 @@
-/* Simple AJAX Code-Kit (SACK) v1.6.1 */
-/* ©2005 Gregory Wild-Smith */
-/* www.twilightuniverse.com */
-/* Software licenced under a modified X11 licence,
-   see documentation or authors website for more details */
-
-function sack(file) {
-	this.xmlhttp = null;
-
-	this.resetData = function() {
-		this.method = "POST";
-  		this.queryStringSeparator = "?";
-		this.argumentSeparator = "&";
-		this.URLString = "";
-		this.encodeURIString = true;
-  		this.execute = false;
-  		this.element = null;
-		this.elementObj = null;
-		this.requestFile = file;
-		this.vars = new Object();
-		this.responseStatus = new Array(2);
-  	};
-
-	this.resetFunctions = function() {
-  		this.onLoading = function() { };
-  		this.onLoaded = function() { };
-  		this.onInteractive = function() { };
-  		this.onCompletion = function() { };
-  		this.onError = function() { };
-		this.onFail = function() { };
-	};
-
-	this.reset = function() {
-		this.resetFunctions();
-		this.resetData();
-	};
-
-	this.createAJAX = function() {
-		try {
-			this.xmlhttp = new ActiveXObject("Msxml2.XMLHTTP");
-		} catch (e1) {
-			try {
-				this.xmlhttp = new ActiveXObject("Microsoft.XMLHTTP");
-			} catch (e2) {
-				this.xmlhttp = null;
-			}
-		}
-
-		if (! this.xmlhttp) {
-			if (typeof XMLHttpRequest != "undefined") {
-				this.xmlhttp = new XMLHttpRequest();
-			} else {
-				this.failed = true;
-			}
-		}
-	};
-
-	this.setVar = function(name, value){
-		this.vars[name] = Array(value, false);
-	};
-
-	this.encVar = function(name, value, returnvars) {
-		if (true == returnvars) {
-			return Array(encodeURIComponent(name), encodeURIComponent(value));
-		} else {
-			this.vars[encodeURIComponent(name)] = Array(encodeURIComponent(value), true);
-		}
-	}
-
-	this.processURLString = function(string, encode) {
-		encoded = encodeURIComponent(this.argumentSeparator);
-		regexp = new RegExp(this.argumentSeparator + "|" + encoded);
-		varArray = string.split(regexp);
-		for (i = 0; i < varArray.length; i++){
-			urlVars = varArray[i].split("=");
-			if (true == encode){
-				this.encVar(urlVars[0], urlVars[1]);
-			} else {
-				this.setVar(urlVars[0], urlVars[1]);
-			}
-		}
-	}
-
-	this.createURLString = function(urlstring) {
-		if (this.encodeURIString && this.URLString.length) {
-			this.processURLString(this.URLString, true);
-		}
-
-		if (urlstring) {
-			if (this.URLString.length) {
-				this.URLString += this.argumentSeparator + urlstring;
-			} else {
-				this.URLString = urlstring;
-			}
-		}
-
-		// prevents caching of URLString
-		this.setVar("rndval", new Date().getTime());
-
-		urlstringtemp = new Array();
-		for (key in this.vars) {
-			if (false == this.vars[key][1] && true == this.encodeURIString) {
-				encoded = this.encVar(key, this.vars[key][0], true);
-				delete this.vars[key];
-				this.vars[encoded[0]] = Array(encoded[1], true);
-				key = encoded[0];
-			}
-
-			urlstringtemp[urlstringtemp.length] = key + "=" + this.vars[key][0];
-		}
-		if (urlstring){
-			this.URLString += this.argumentSeparator + urlstringtemp.join(this.argumentSeparator);
-		} else {
-			this.URLString += urlstringtemp.join(this.argumentSeparator);
-		}
-	}
-
-	this.runResponse = function() {
-		eval(this.response);
-	}
-
-	this.runAJAX = function(urlstring) {
-		if (this.failed) {
-			this.onFail();
-		} else {
-			this.createURLString(urlstring);
-			if (this.element) {
-				this.elementObj = document.getElementById(this.element);
-			}
-			if (this.xmlhttp) {
-				var self = this;
-				if (this.method == "GET") {
-					totalurlstring = this.requestFile + this.queryStringSeparator + this.URLString;
-					this.xmlhttp.open(this.method, totalurlstring, true);
-				} else {
-					this.xmlhttp.open(this.method, this.requestFile, true);
-					try {
-						this.xmlhttp.setRequestHeader("Content-Type", "application/x-www-form-urlencoded")
-					} catch (e) { }
-				}
-
-				this.xmlhttp.onreadystatechange = function() {
-					switch (self.xmlhttp.readyState) {
-						case 1:
-							self.onLoading();
-							break;
-						case 2:
-							self.onLoaded();
-							break;
-						case 3:
-							self.onInteractive();
-							break;
-						case 4:
-							self.response = self.xmlhttp.responseText;
-							self.responseXML = self.xmlhttp.responseXML;
-							self.responseStatus[0] = self.xmlhttp.status;
-							self.responseStatus[1] = self.xmlhttp.statusText;
-
-							if (self.execute) {
-								self.runResponse();
-							}
-
-							if (self.elementObj) {
-								elemNodeName = self.elementObj.nodeName;
-								elemNodeName.toLowerCase();
-								if (elemNodeName == "input"
-								|| elemNodeName == "select"
-								|| elemNodeName == "option"
-								|| elemNodeName == "textarea") {
-									self.elementObj.value = self.response;
-								} else {
-									self.elementObj.innerHTML = self.response;
-								}
-							}
-							if (self.responseStatus[0] == "200") {
-								self.onCompletion();
-							} else {
-								self.onError();
-							}
-
-							self.URLString = "";
-							break;
-					}
-				};
-
-				this.xmlhttp.send(this.URLString);
-			}
-		}
-	};
-
-	this.reset();
-	this.createAJAX();
-}
diff --git a/ansicht.php_20200212 b/ansicht.php_20200212
deleted file mode 100644
index 869c587e..00000000
--- a/ansicht.php_20200212
+++ /dev/null
@@ -1,901 +0,0 @@
-<?php
-# Fuer debugging
-#error_reporting(E_ALL);
-#ini_set('display_errors', 1);
-#echo __LINE__."<br>";	
-session_start();
-#error_reporting(E_ALL);
-#ini_set('display_errors', 1);
-
-require_once("config/ftpanbindung.php");     // f&uuml;gt die FTP-anbindung ein
-
-include_once 'classes/lg-on_Smarty.class.php';
-$smarty = new lgon_Smarty();
-#$smarty->caching = true;
-require_once("config.inc.php");
-require_once("func_rollenrechte.php");
-$templatename = substr(basename($_SERVER['PHP_SELF']),0,-3)."html";
-require_once "language/german.inc.php";
-require_once("func_highlight.php");
-require_once("func_ansicht.php");
-
-
-
-$lid = $_GET['lid'];
-
-$sid = session_id();
-$datum=date("Y-m-d H:i:s");
-$result = $db->query( "INSERT INTO historie (vaid, datum, session_id, art, art_id) VALUES ('$user_vaid;', '$datum', '$sid', 'L', '$lid')" );
-
-$suchart = @$_GET['suchart'];
-$fadeout = @$_GET['fadeout'];
-
-
-if(isset($_GET['inhalt_hig'])){
-  $inhalt_hig = stripslashes($_GET['inhalt_hig']);
-  $inhalt_hig = unserialize("$inhalt_hig");
-}
-
-$verweis = @stripslashes($_GET['verweis']);
-$verweis = @unserialize($verweis);
-
-
-
-if ($user_admin == ""){ require("index.php"); exit;} //Wenn man nicht angemeldet ist, darf man nicht auf die Seite
-
-$db = dbconnect();
-$result = $db->query( "SELECT lid, txt_anz_buch, txt_buch, txt_kapitel, txt_vers, Ueberschrift, thema, unterthema, textstelle, replace(replace(replace(textstelle, ' aus ', ''), 'vgl',''), ' ','') textstelle2, vorwort, botschaft, textwort, inhalt, zusammenfassung, kontext, DATE_Format(datum, '%d.%m.%Y') as datum, kid, ukid, DATE_Format(datum, '%d') tag, DATE_Format(datum, '%m') monat, DATE_Format(datum, '%Y') jahr, ukid, DATE_Format(datum, '%Y-%m-%d')AS datum_berechnung, stapgd
-                         FROM quelle
-                        WHERE lid='$lid'");
-$row = $result->fetch_array();
-
-
-##### ÄNDERUNG NEUE LUTHERBIBEL ########
-if($row['jahr'] < 2019){
-  # Lutherbibel 1984
-  require_once("bibellookup_1984.php");
-  $bibelversion = "1984";
-}else{
-  # Lutherbibel 2017
-  require_once("bibellookup_2017.php");
-  $bibelversion = "2017";
-}
-
-
-$result_link_bibel = $db->query( "SELECT bibellink
-                                     FROM profil
-                                    WHERE user='$user_admin'");
-$row_link_bibel = $result_link_bibel->fetch_array();
-
-$result_count = $db->query( "SELECT count(*) Anz
-                              FROM quelle_cache
-                             WHERE link = '$row_link_bibel[bibellink]'
-                               AND lid='$lid'");
-$row_cache_count = $result_count->fetch_array();
-
-$ueberschrift = html_entity_decode($row['Ueberschrift']);
-
-# typografische Anführungszeichen im UTF8 Format Korrekt darstellen
-$ueberschrift = preg_replace("/\x{0084}/u","&bdquo;",$ueberschrift);
-$ueberschrift = preg_replace("/\x{0093}/u","&ldquo;",$ueberschrift);
-
-
-
-$wochentag = date("l", mktime(0,0,0,$row['monat'],$row['tag'],$row['jahr']));
-
-$result_gd = $db->query( "SELECT wgd FROM profil WHERE user = '$user_admin'");
-$row_gd = $result_gd->fetch_array();
-
-if($wochentag == 'Wednesday' AND $row_gd['wgd'] != '0' AND ($row['ukid'] == '1')){  // Hintergrund kommt aus der wort_wahl.php. Es gibt einige Gottesdienste, die auf einen Mittwoch fallen (1. vom Monat) aber kein Tag addiert werden darf, daher: Wann muss ein Tag (faktor) addiert werden, generell, wenn Wochengottesdienst, wenn Faktor im Profil != 0 und wenn unterkategorie 1 (GD normal) ist. Bei allen anderen Gottesdiensten bleibt der Mittwoch erhalten. (Buß und Bettag ist Mittwoch, Erntedank bleibt auch am 1. des Monats)
-  $datum_wt = date("d.m.Y", mktime(0,0,0,$row['monat'],$row['tag']+$row_gd['wgd'],$row['jahr']));
-  $wochentag = date("l", mktime(0,0,0,$row['monat'],$row['tag']+$row_gd['wgd'],$row['jahr']));
-}else{
-  $wochentag = date("l", mktime(0,0,0,$row['monat'],$row['tag'],$row['jahr']));
-  $datum_wt = date("d.m.Y", mktime(0,0,0,$row['monat'],$row['tag'],$row['jahr']));
-}
-
-
-
-switch($wochentag)
-{
-  case 'Sunday':
-      $wochentag_wt = "So.";
-      break;
-  case 'Monday':
-      $wochentag_wt = "Mo.";
-      break;
-  case 'Tuesday':
-      $wochentag_wt = "Di.";
-      break;
-  case 'Wednesday':
-      $wochentag_wt = "Mi.";
-      break;
-  case 'Thursday':
-      $wochentag_wt = "Do.";
-      break;
-  case 'Friday':
-      $wochentag_wt = "Fr.";
-      break;
-  case 'Saturday':
-      $wochentag_wt = "Sa.";
-      break;
-}
-
-
-$result1 = $db->query( "SELECT bezeichnung
-                          FROM kategorie
-                         WHERE kid='$row[kid]'");
-$row1 = $result1->fetch_array();
-$cat_text = $row1['bezeichnung'];
-
-$result2 = $db->query( "SELECT bezeichnung
-                          FROM unterkategorie
-                         WHERE ukid='$row[ukid]'");
-$row2 = $result2->fetch_array();
-
-$result3 = $db->query( "SELECT bezeichnung
-                          FROM thema
-                         WHERE tid='$row[thema]'");
-$row3 = $result3->fetch_array();
-$thema_head = $row3['bezeichnung'];
-
-$result4 = $db->query( "SELECT bezeichnung
-                          FROM unterthema
-                         WHERE tid='$row[thema]'
-                           AND utid='$row[unterthema]'");
-$row4 = $result4->fetch_array();
-
-
-
-
-$textwort = strip_tags($row['textwort']);
-if($row_cache_count['Anz'] == 0){
-  $vorwort = strip_tags($row['vorwort'], '<br>,<b>,<strong>,<ul>,<li>,<ol>,<a>');
-  $botschaft = strip_tags($row['botschaft'], '<br>,<b>,<strong>,<ul>,<li>,<ol>,<a>');
-  $zusammenfassung = strip_tags($row['zusammenfassung'], '<br>,<b>,<strong>,<ul>,<li>,<ol>,<a>');
-  $kontext = strip_tags($row['kontext'], '<br>,<b>,<strong>,<ul>,<li>,<ol>,<a>');
-  $text = strip_tags($row['inhalt'], '<br>,<b>,<strong>,<ul>,<li>,<ol>,<a>,<table>,<tr>,<td>,<h1>,<h2>,<h3>,<img>');
- 
-  # Sonst kommt empty_string Fehlermeldung von Dom-Document. Besonders bei uralten LGs
-  if($vorwort == ''){$vorwort="<br />";}
-  if($botschaft == ''){$botschaft="<br />";}
-  if($zusammenfassung == ''){$zusammenfassung="<br />";}
-  if($kontext == ''){$kontext="<br />";}
-  if($text == ''){$text="<br />";}
-
-
-  $kontext = str_replace(' "', ' \"', $kontext);
-  $kontext =preg_replace_callback("/([0-9]\s*)?()(Sir|Mo|Jos|Ri|Rut|Sam|K&ouml;n|Chr|Esr|Neh|Est|Hiob|Ps|Spr|Pred|Hld|Jes|Jer|Kla|Klgl|Hes|St zu Dan|Dan|Hos|Joel|Am|Obd|Jona|Mi|Nah|Hab|Zef|Hag|Sach|Weish|Mal|Tob|Mt|Mk|Lk|Luk|Joh|Jh|Apg|R&ouml;m|Rom|Kor|Gal|Eph|Phil|Kol|Thess|Tim|Tit|Phlm|Ptr|Petr|Joh|Hbr|Hebr|Jak|Jk|Jud|Offb|Off)(\s*)".
-                                 "([0-9]{1,3})(\,\s*)?(aus\s*)?([0-9]{0,3})/", function($m) use (&$lid) { return refill($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $m[9], $lid);}, $kontext);
-  $jahr = "$row[jahr]";
-  $bibellink = $row_link_bibel['bibellink'];
-  $kontext=preg_replace_callback("/([0-9][0-9]?\.\s*)?(Makkab&auml;er|Johannes|Mose|K&ouml;nige|Chronik|Korinther|Samuel|Thessalonicher|Timotheus|Petrus|Gebet Manasses|St&uuml;cke zu Daniel|St&uuml;cke zu Ester|Baruch|Weisheit|Judit|Judith|Sirach|Josua|Richter|Rut|Ruth|Esra|Nehemia|Esther|Ester|Hiob|Ijob|Psalm|Spr&uuml;che|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Ezechiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matth&auml;us|Markus|Lukas|Apostelgeschichte|R&ouml;mer|Galater|Epheser|Philipper|Kolosser|Titus|Hebr&auml;er|Jakobus|Offenbarung|Philemon|Judas)(\s*[0-9]{1,3})(,\s*)?(\s*aus\s*|\s*Verse\s*|\s*Vers\s*)?([0-9]{0,3})?(\s*\-\s*|\s*\.\s*)?([0-9]{0,3})?/", function($m) use (&$lid,&$bibellink,&$jahr) { return makeLink($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $lid, $bibellink,$jahr);}, $kontext);
-  
-  $suchmuster = '/(KNK) (([0-9]{1,2}\.?){0,5})/';
-  $kontext=preg_replace_callback($suchmuster, function($m) { return makeKNK($m[1], $m[2]);}, $kontext);
-  
-  $suchmuster2 = '/(KNK-FA) ([0-9]{1,3})/';
-  $kontext=preg_replace_callback($suchmuster2, function($m) { return makeKNK_FA($m[1], $m[2]);}, $kontext);
-  
-  
-  $zusammenfassung = str_replace(' "', ' \"', $zusammenfassung);
-  $zusammenfassung =preg_replace_callback("/([0-9]\s*)?()(Sir|Mo|Jos|Ri|Rut|Sam|K&ouml;n|Chr|Esr|Neh|Est|Hiob|Ps|Spr|Pred|Hld|Jes|Jer|Kla|Klgl|Hes|St zu Dan|Dan|Hos|Joel|Am|Obd|Jona|Mi|Nah|Hab|Zef|Hag|Sach|Weish|Mal|Tob|Mt|Mk|Lk|Luk|Joh|Jh|Apg|R&ouml;m|Rom|Kor|Gal|Eph|Phil|Kol|Thess|Tim|Tit|Phlm|Ptr|Petr|Joh|Hbr|Hebr|Jak|Jk|Jud|Offb|Off)(\s*)".
-                                  "([0-9]{1,3})(\,\s*)?(aus\s*)?([0-9]{0,3})/", function($m) use (&$lid) { return refill($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $m[9], $lid);}, $zusammenfassung);
-                                  
-  $zusammenfassung=preg_replace_callback("/([0-9][0-9]?\.\s*)?(Makkab&auml;er|Johannes|Mose|K&ouml;nige|Chronik|Korinther|Samuel|Thessalonicher|Timotheus|Petrus|Gebet Manasses|St&uuml;cke zu Daniel|St&uuml;cke zu Ester|Baruch|Weisheit|Judit|Judith|Sirach|Josua|Richter|Rut|Ruth|Esra|Nehemia|Esther|Ester|Hiob|Ijob|Psalm|Spr&uuml;che|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Ezechiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matth&auml;us|Markus|Lukas|Apostelgeschichte|R&ouml;mer|Galater|Epheser|Philipper|Kolosser|Titus|Hebr&auml;er|Jakobus|Offenbarung|Philemon|Judas)(\s*[0-9]{1,3})(,\s*)?(\s*aus\s*|\s*Verse\s*|\s*Vers\s*)?([0-9]{0,3})?(\s*\-\s*|\s*\.\s*)?([0-9]{0,3})?/", function($m) use (&$lid,&$bibellink,&$jahr) { return makeLink($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $lid, $bibellink,$jahr);}, $zusammenfassung);
-
-  $vorwort = str_replace(' "', ' \"', $vorwort);
-  $vorwort=preg_replace_callback("/([0-9]\s*)?()(Sir|Mo|Jos|Ri|Rut|Sam|K&ouml;n|Chr|Esr|Neh|Est|Hiob|Ps|Spr|Pred|Hld|Jes|Jer|Kla|Klgl|Hes|St zu Dan|Dan|Hos|Joel|Am|Obd|Jona|Mi|Nah|Hab|Zef|Hag|Sach|Weish|Mal|Tob|Mt|Mk|Lk|Luk|Joh|Jh|Apg|R&ouml;m|Rom|Kor|Gal|Eph|Phil|Kol|Thess|Tim|Tit|Phlm|Ptr|Petr|Joh|Hbr|Hebr|Jak|Jk|Jud|Offb|Off)(\s*)".
-                         "([0-9]{1,3})(\,\s*)?(aus\s*)?([0-9]{0,3})/", function($m) use (&$lid) { return refill($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $m[9], $lid);}, $vorwort);
-                         
-  $vorwort=preg_replace_callback("/([0-9][0-9]?\.\s*)?(Makkab&auml;er|Johannes|Mose|K&ouml;nige|Chronik|Korinther|Samuel|Thessalonicher|Timotheus|Petrus|Gebet Manasses|St&uuml;cke zu Daniel|St&uuml;cke zu Ester|Baruch|Weisheit|Judit|Judith|Sirach|Josua|Richter|Rut|Ruth|Esra|Nehemia|Esther|Ester|Hiob|Ijob|Psalm|Spr&uuml;che|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Ezechiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matth&auml;us|Markus|Lukas|Apostelgeschichte|R&ouml;mer|Galater|Epheser|Philipper|Kolosser|Titus|Hebr&auml;er|Jakobus|Offenbarung|Philemon|Judas)(\s*[0-9]{1,3})(,\s*)?(\s*aus\s*|\s*Verse\s*|\s*Vers\s*)?([0-9]{0,3})?(\s*\-\s*|\s*\.\s*)?([0-9]{0,3})?/", function($m) use (&$lid,&$bibellink,&$jahr) { return makeLink($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $lid, $bibellink,$jahr);}, $vorwort);
-
-  $botschaft = str_replace(' "', ' \"', $botschaft);
-  $botschaft=preg_replace_callback("/([0-9]\s*)?()(Sir|Mo|Jos|Ri|Rut|Sam|K&ouml;n|Chr|Esr|Neh|Est|Hiob|Ps|Spr|Pred|Hld|Jes|Jer|Kla|Klgl|Hes|St zu Dan|Dan|Hos|Joel|Am|Obd|Jona|Mi|Nah|Hab|Zef|Hag|Sach|Weish|Mal|Tob|Mt|Mk|Lk|Luk|Joh|Jh|Apg|R&ouml;m|Rom|Kor|Gal|Eph|Phil|Kol|Thess|Tim|Tit|Phlm|Ptr|Petr|Joh|Hbr|Hebr|Jak|Jk|Jud|Offb|Off)(\s*)".
-                           "([0-9]{1,3})(\,\s*)?(aus\s*)?([0-9]{0,3})/", function($m) { return refill($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $m[9], $lid);}, $botschaft);
-                           
-  $botschaft=preg_replace_callback("/([0-9][0-9]?\.\s*)?(Makkab&auml;er|Johannes|Mose|K&ouml;nige|Chronik|Korinther|Samuel|Thessalonicher|Timotheus|Petrus|Gebet Manasses|St&uuml;cke zu Daniel|St&uuml;cke zu Ester|Baruch|Weisheit|Judit|Judith|Sirach|Josua|Richter|Rut|Ruth|Esra|Nehemia|Esther|Ester|Hiob|Ijob|Psalm|Spr&uuml;che|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Ezechiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matth&auml;us|Markus|Lukas|Apostelgeschichte|R&ouml;mer|Galater|Epheser|Philipper|Kolosser|Titus|Hebr&auml;er|Jakobus|Offenbarung|Philemon|Judas)(\s*[0-9]{1,3})(,\s*)?(\s*aus\s*|\s*Verse\s*|\s*Vers\s*)?([0-9]{0,3})?(\s*\-\s*|\s*\.\s*)?([0-9]{0,3})?/", function($m) use (&$lid,&$bibellink,&$jahr) { return makeLink($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $lid, $bibellink,$jahr);}, $botschaft);
-
-}
-
-$textstelle = str_replace (array(" ", "aus", "vgl"), array("", "", ""), $row['textstelle']);
-
-$date_nlg  = mktime(0, 0, 0, 12, 1, 2007);  // Datum ab dem neue LGs gelten
-$date_nlg_format = date("Y-m-d", $date_nlg);  // ISO-8601 Format wie in der Datenbank: Formatierung f&uuml;r Vergleiche erforderlich
-
-$switch_date = strtotime ($date_nlg_format); //Umrechnung des Fristgrenztages in eine Zahl
-$lg_datum = strtotime ($row['datum_berechnung']); // Umrechnung des Enddatums in eine Zahl
-
-$result_podcast = $db->query( "SELECT dateiname
-	                           FROM admin_rechte
-	                          WHERE admin_rolle = 'a_podcast'");
-$row_podcast = $result_podcast->fetch_array();
-
-$verzeichnis = "$row[jahr]-$row[monat]";
-$suchbegriff1 = "$row[jahr]_$row[monat]_$row[tag].";
-$suchbegriff2 = "$row[jahr]-$row[monat]-$row[tag].";
-   
-   $verzeichnis2 = "/Leitgedanken/Podcast/$verzeichnis/";
-   #$verzeichnis2 = "/homes/admin/Drive/Podcast/$verzeichnis/";
-   $VerbindungsID = @ftp_connect($FTPServer2, 21, 1); # Timeout auf 1 Sek
-   $LoginErgebnis = @ftp_login($VerbindungsID, $FTPUser2, $FTPPasswort2);
-   
-   ########DEBUGINFO#################
-#   if($LoginErgebnis){
-#     echo "Verbunden<br>";
-#   }else{
-#     echo "keine Verbindung<br>";
-#   }
-   
-#   echo "VerbindungsID: $VerbindungsID<br>
-#         FTPUser: $FTPUser2<br>
-#         FTPPasswort2: $FTPPasswort2<br>
-#         Verzeichnis: $verzeichnis2<br>
-#         <strong>Dateiname:</strong><br>
-#        ";
-   ########DEBUGINFO ENDE############
-   
-
-   $filename = 0;
-   $filename_podcast_lesung = 0;
-   
-   if($VerbindungsID && $LoginErgebnis)
-   {
-     $smarty->assign('ftp_ansicht_connect', "1");
-     $Dateiliste=ftp_nlist($VerbindungsID, $verzeichnis2);
-     @sort($Dateiliste);
-     for($i=0; $i<count($Dateiliste); $i++)
-     {
-     
-             $dateiname = basename($Dateiliste[$i]);
-#echo $dateiname."<br>";
-          
-          if($row['ukid'] != 5){ #Jugendgottesdienst ist der Dateiname anders
-            if($row['ukid'] != 37){
-	
-             $pos1 = strpos($dateiname, $suchbegriff1);
-             $pos2 = strpos($dateiname, $suchbegriff2);
-             
-#echo "$dateiname -> $suchbegriff -> $pos1 -> -> $pos2<br>";
-             if($pos1 > 0 or $pos2 > 0){
-               $filename = $dateiname;
-             }
-            }
-          }else{
-             $suchbegriff1 = "$row[jahr]_$row[monat]_JGD.";
-             $suchbegriff2 = "G_$row[jahr]_$row[monat].";
-             $suchbegriff3 = "G_$row[jahr]-$row[monat].";
-             $suchbegriff4 = "JG_$row[jahr]-$row[monat].";
-             $pos1 = strpos($dateiname, $suchbegriff1);
-             $pos2 = strpos($dateiname, $suchbegriff2);
-             $pos3 = strpos($dateiname, $suchbegriff3);
-             $pos4 = strpos($dateiname, $suchbegriff4);
-
-             if($pos != '' or $pos2 != '' or $pos3 != '' or $pos3 != ''){
-               $filename = $dateiname;
-#echo "pos1: $pos1 <br> pos2: $pos2 <br> pos3: $pos3 <br> pos4: $pos4 <br>$filename<br><br>";
-             }
-          }
-          
-             $suchbegriff_lesung = "$row[jahr]_$row[monat]_$row[tag]_Lesung";
-             $pos = strpos($dateiname, $suchbegriff_lesung);
-             $suchbegriff_lesung2 = "$row[jahr]-$row[monat]-$row[tag]_Lesung";
-             $pos2 = strpos($dateiname, $suchbegriff_lesung2);
-             if($pos > 0 or $pos2 > 0){
-               $filename_podcast_lesung = $dateiname;
-             }
-          
-
-     }
-   }
-
-#echo "$row_podcast[dateiname]/$verzeichnis/$filename<br><br>";
-
-
-// Preg auf vollständige Bibelbücher überprüft
-$textstelle_stopmark=preg_replace_callback("/^([0-9]\.)*\s*".	//1 a
-  				 "(Philemon|Judas|Johannes|Mose|Könige|Korinther|Petrus|Sirach|Josua|Richter|Rut|Ruth|Samuel|Chronik|Esra|Nehemia|Esther|Ester|Hiob|Psalm|Sprüche|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Judit|Weisheit|Baruch|Makkabäer|Stücke zu Ester|Stücke zu Daniel|Gebet Manasses|Matthäus|Markus|Lukas|Apostelgeschichte|Römer|Galater|Epheser|Philipper|Kolosser|Thessalonicher|Timotheus|Titus|Hebräer|Jakobus|Offenbarung)\s*". //2
-  				 "([0-9]{1,3})". 	//3  c
-  				 "(\,)?\s*". 		//4  d
-  				 "(aus)?\s*".		//5  e
-  				 "([0-9]{0,3})".	//6  f
-  				 "(\.|-)?".		//7  g
-  				 "([0-9]{0,3})?".	//8  h
-  				 "(\.|-)?".		//9  i
-  				 "([0-9]{0,3})".        //10 j
-  				 "$/", function($m) { return splitword_stopmark($m[1], $m[2], $m[3], $m[6], $m[7], $m[8], $m[9], $m[10]);},
- 				 $row['textstelle']);
-
-// stopmark Ende
-
-
-
-// Textwort: Link zu verschiedenen Onlinebibeln
-if($row_link_bibel['bibellink'] == 'lokal'){
-  ##### ÄNDERUNG NEUE LUTHERBIBEL ########
-  if($bibelversion == "1984"){
-    $link = "<a class=\"biblelink\" href=\"javascript:bib_link_lokal1('bibelpopup/bib_popup_1984.php?wort=$row[textstelle]&stopmark=$textstelle_stopmark&vers_select=Y','Bibellink','640','480','center','front');\">$row[textstelle]</a>";
-  }
-  if($bibelversion == "2017"){
-    $link = "<a class=\"biblelink\" href=\"javascript:bib_link_lokal1('bibelpopup/bib_popup_2017.php?wort=$row[textstelle]&stopmark=$textstelle_stopmark&vers_select=Y','Bibellink','640','480','center','front');\">$row[textstelle]</a>";
-  }
-}elseif($row_link_bibel['bibellink'] == 'bibleserver'){
-  ##### ÄNDERUNG NEUE LUTHERBIBEL ########
-  if($bibelversion == "1984"){
-    $link = "<a href=http://www.bibleserver.com/go.php?lang={de}&bible={LUT84}&ref={$textstelle} target='_blank'>$row[textstelle]</a>";
-  }
-  if($bibelversion == "2017"){
-    $link = "<a href=http://www.bibleserver.com/go.php?lang={de}&bible={LUT}&ref={$textstelle} target='_blank'>$row[textstelle]</a>";
-  }
-}
-
-  $result_verweis = $db->query( "SELECT querverweis
-                                   FROM profil
-                                  WHERE user='$user_admin'");
-  $row_verweis = $result_verweis->fetch_array();
-
-  
-  require_once("verweise.php");
-  $querverweis = verweise($lid, $user_admin, $template);
-  # Erst werden die Verweise immer erzeugt, und ich cache geschrieben, dann abgefragt, wenn was im Cac dann qv_vorhanden =1. 
-  # Verweisfenster wird dann nur eingeblendet, wenn ein Verweis vorhanden ist.
-
-  $result_te_cache = $db->query( "SELECT erg_lid
-                                    FROM quelle_verweise_cache
-                                   WHERE erg_lid = $lid" );
-  if($result_te_cache->num_rows > 0){
-    $qv_vorhanden = "1";
-  }
-
-
-######################################################################
-## Prüfung, ob Bibellesung vorhanden ist, die zur Kategorie passt
-######################################################################
- # Neu am 05.12.2019: Bibellesung Jugendgottesdienst, die ja immer am ersten im Monat sind, wurden auch bei normalen GDs angezeigt, die am 01. des Monats waren.
-                                
-  $result_lesung = $db->query( "SELECT lid
-                                  FROM quelle a
-                                 WHERE datum='$row[datum_berechnung]'
-                                   AND kid = 12
-                                   AND lid != '$lid'
-                                   AND a.ukid = (select ukid from unterkategorie b where a.ukid=b.ukid and b.bezeichnung ='$row2[bezeichnung]')
-                              ");
-  $row_lesung = $result_lesung->fetch_array();
-  
-  
-
-
-if($row_lesung['lid'] != ''){
-  
-  $result_lesung1 = $db->query( "SELECT lesung
-                                  FROM profil
-                                 WHERE user='$user_admin'");
-  $row_lesung1 = $result_lesung1->fetch_array();
-  
-  
-  require_once("lesung.php");
-  
-  
-  $bibellesung = lesung($row['datum_berechnung'], $template, $verzeichnis, $filename_podcast_lesung);
-
-}
-
-######################################################################
-## Ende Prüfung, ob Bibellesung vorhanden ist
-######################################################################
-
-
-
-if($row_cache_count['Anz'] == 0){
-  $text = str_replace(' "', ' \"', $text);
-  $text=preg_replace_callback("/([0-9]\s*)?()?(Sir|Mo|Jos|Ri|Rut|Sam|K&ouml;n|Chr|Esr|Neh|Est|Hiob|Ps|Spr|Pred|Hld|Jes|Jer|Kla|Klgl|Hes|St zu Dan|Dan|Hos|Joel|Am|Obd|Jona|Mi|Nah|Hab|Zef|Hag|Sach|Weish|Mal|Tob|Mt|Mk|Lk|Luk|Joh|Jh|Apg|R&ouml;m|Rom|Kor|Gal|Eph|Phil|Kol|Thess|Tim|Tit|Phlm|Ptr|Petr|Joh|Hbr|Hebr|Jak|Jk|Jud|Offb|Off)(\s*)".
-                      "([0-9]{1,3})(\,\s*)?(aus\s*)?([0-9]{0,3})/", function($m) use (&$lid) { return refill($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $m[9], $lid);}, $text);
-
-  $text = str_replace("$verweis","<a name='verweis'>$verweis</a>",$text);
-  $text=preg_replace_callback("/([0-9][0-9]?\.\s*)?(Makkab&auml;er|Johannes|Mose|K&ouml;nige|Chronik|Korinther|Samuel|Thessalonicher|Timotheus|Petrus|Gebet Manasses|St&uuml;cke zu Daniel|St&uuml;cke zu Ester|Baruch|Weisheit|Judit|Judith|Sirach|Josua|Richter|Rut|Ruth|Esra|Nehemia|Esther|Ester|Hiob|Ijob|Psalm|Spr&uuml;che|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Ezechiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matth&auml;us|Markus|Lukas|Apostelgeschichte|R&ouml;mer|Galater|Epheser|Philipper|Kolosser|Titus|Hebr&auml;er|Jakobus|Offenbarung|Philemon|Judas)(\s*[0-9]{1,3})(,\s*)?(\s*aus\s*|\s*Verse\s*|\s*Vers\s*)?([0-9]{0,3})?(\s*\-\s*|\s*\.\s*)?([0-9]{0,3})?/", function($m) use (&$lid,&$bibellink,&$jahr) { return makeLink($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $lid, $bibellink,$jahr);}, $text);
-  $suchmuster = '/(KNK) (([0-9]{1,2}\.?){0,5})/';
-  $text=preg_replace_callback($suchmuster, function($m) { return makeKNK($m[1], $m[2]);}, $text);
-  
-  $suchmuster2 = '/(KNK-FA) ([0-9]{1,3})/';
-  $text=preg_replace_callback($suchmuster2, function($m) { return makeKNK_FA($m[1], $m[2]);}, $text);
-
-}
-
-
-
-
-
-// Automatisch in Lehre und Erkenntnis verweisen - Start
-if($row_cache_count['Anz'] == 0){
-
-  $db = dbconnect();
-  $query_lue = "SELECT eid, thema
-                  FROM lue_quelle";
-  $result_lue = $db->query( $query_lue);
-  $ln_zaehler =0;
-
-  while ($row_lue = $result_lue->fetch_array()){
-    $thema = strpos("$row_lue[thema]", "Teil");  // Ermitteln wo das Wort "Teil" steht
-
-    if($thema >0){
-      $thema = substr("$row_lue[thema]",0 ,$thema ); // Alles vor dem Wort "Teil" anzeigen
-    }else{
-      $thema = "$row_lue[thema]";
-    }
-    $thema = trim($thema);
-
- 
- 
- while(substr($thema, -1) =='-' or substr($thema, -1)==':' or substr($thema, -1) =='(' or substr($thema, -1) ==' '){
-  $thema =trim($thema);
-  $thema =substr($thema, 0, -1);
-  $thema =trim($thema);
- }
-
-  if (!@in_array($thema, $thema1)) {
-    #echo "$thema<br>";
-
-    $thema2[$ln_zaehler]['thema_kurz'] =$thema;
-    $thema2[$ln_zaehler]['eid'] = $row_lue['eid'];
-    $thema2[$ln_zaehler]['thema'] =$row_lue['thema'];
-    
-    $thema1[] = $thema;
-    $ln_zaehler++;  
-  }  
-
- }
-
- #print_r($thema2);
-
-
- // Automatisch in Lehre und Erkenntnis verweisen - Ende
-
-
-
-
-
-
- #print_r($thema2);
-
-  // Automatisch in Lehre und Erkenntnis und Begriffserklärung verweisen
-  foreach ($thema2 as $wert)
-  { 
-  # Modifikator /i hinzugefügt, damit Groß- Kleinschreibung nicht beachtet wird: 21.11.2011
-  # Modifikator /i wieder weggenommen, da die Groß- Kleinschreibung nicht mehr korrekt war "Die Hoffnung auf Die Wiederkunft Christi": 05.01.2012
-  $thema_kurz =str_replace  ("/",  "\/"  ,  $wert['thema_kurz']);
-  
-  # Wenn das Thema auch noch als Begriffserklärung vorkommt, dann nicht mit dem Thema von Lehre und Erkenntnis verknüpfen,
-  # sondern später mit einem Popup verknüpfen
-  $result_exeg = $db->query( "SELECT count(*) Anz FROM wort_exegese WHERE wort = '$thema_kurz'");
-  $row_exeg = $result_exeg->fetch_array();
-  
-  if($row_exeg['Anz'] >0){
-  
-    $result_exeg3 = $db->query( "SELECT verweis FROM wort_exegese WHERE upper(wort) = upper('$thema_kurz')" );
-    $row_exeg3 = $result_exeg3->fetch_array();
-   
-    $repl = "__lueexeg-$row_exeg3[verweis]-$wert[eid]__";
-    #echo $text;
-    #exit;
-    
-    
-    $text = replace_text_links("$thema_kurz", "$repl", $text);
-    $vorwort = replace_text_links("$thema_kurz", "$repl", $vorwort);
-    $botschaft = replace_text_links("$thema_kurz", "$repl", $botschaft);
-    $zusammenfassung = replace_text_links("$thema_kurz", "$repl", $zusammenfassung);
-    $kontext = replace_text_links("$thema_kurz", "$repl", $kontext);
-
-    $text=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz", "$template");}, $text);
-    $vorwort=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz", "$template");}, $vorwort);
-    $botschaft=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz", "$template");}, $botschaft);
-    $zusammenfassung=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz", "$template");}, $zusammenfassung);
-    $kontext=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz", "$template");}, $kontext);
-    
-
-    #$text =preg_replace  ("/\b$thema_kurz\b/",  "<a class=alue href='lue_ansicht.php?eid=$wert[eid]' title='Lehre und Erkenntnis: $wert[thema]' target='_parent'>$thema_kurz</a><a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $thema_kurz',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $text);
-    #$botschaft =preg_replace  ("/\b$thema_kurz\b/",  "<a class=alue href='lue_ansicht.php?eid=$wert[eid]' title='Lehre und Erkenntnis: $wert[thema]'target='_parent'>$thema_kurz</a><a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $thema_kurz',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $botschaft);
-    #$zusammenfassung =preg_replace  ("/\b$thema_kurz\b/",  "<a class=alue href='lue_ansicht.php?eid=$wert[eid]' title='Lehre und Erkenntnis: $wert[thema]' target='_parent'>$thema_kurz</a><a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $thema_kurz',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $zusammenfassung);
-    #$kontext =preg_replace  ("/\b$thema_kurz\b/",  "<a class=alue href='lue_ansicht.php?eid=$wert[eid]' title='Lehre und Erkenntnis: $wert[thema]' target='_parent'>$thema_kurz</a><a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $thema_kurz',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $kontext);
-  }
-  }
-
-  # Das gleiche nochmals mit Kleinbuchstaben am Anfanng (lcfirst). Dann wird auch "Die Hoffnung auf die Wiederkunft Christi" gefunden statt nur "Die Wiederkunft..."
-  foreach ($thema2 as $wert)
-  { 
-  $thema_kurz =str_replace  ("/",  "\/"  ,  $wert['thema_kurz']);
-  #$thema_kurz1=lcfirst($thema_kurz); # Erst ab PHP 5.3
-  $thema_kurz1 = strtolower(substr($thema_kurz,0,1)).substr($thema_kurz,1);
-  
-  # Wenn das Thema auch noch als Begriffserklärung vorkommt, dann nicht mit dem Thema von Lehre und Erkenntnis verknüpfen,
-  # sondern später mit einem Popup verknüpfen
-  $result_exeg = $db->query( "SELECT count(*) Anz FROM wort_exegese WHERE wort = '$thema_kurz1'" );
-  $row_exeg = $result_exeg->fetch_array();
-
-  
-  if($row_exeg['Anz'] >0){
-
-    $result_exeg3 = $db->query( "SELECT verweis FROM wort_exegese WHERE upper(wort) = upper('$thema_kurz1')" );
-    $row_exeg3 = $result_exeg3->fetch_array();
-
-    
-    
-    $repl = "__lueexeg-$row_exeg3[verweis]-$wert[eid]__";
-    #echo $text;
-    #exit;
-    
-    $thema_kurz1 = $thema_kurz1;
-    $text = replace_text_links("$thema_kurz1", "$repl", $text);
-    $vorwort = replace_text_links("$thema_kurz1", "$repl", $vorwort);
-    $botschaft = replace_text_links("$thema_kurz1", "$repl", $botschaft);
-    $zusammenfassung = replace_text_links("$thema_kurz1", "$repl", $zusammenfassung);
-    $kontext = replace_text_links("$thema_kurz1", "$repl", $kontext);
-   
-    $text=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz1,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz1", "$template");}, $text);
-    $vorwort=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz1,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz1", "$template");}, $vorwort);
-    $botschaft=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz1,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz1", "$template");}, $botschaft);
-    $zusammenfassung=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz1,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz1", "$template");}, $zusammenfassung);
-    $kontext=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz1,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz1", "$template");}, $kontext);
-    
-
-  
-
-    #$text =preg_replace  ("/\b$thema_kurz1\b/",  "<a class=alue href='lue_ansicht.php?eid=$wert[eid]' title='Lehre und Erkenntnis: $wert[thema]' target='_parent'>$thema_kurz1</a><a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $thema_kurz',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $text);
-    #$botschaft =preg_replace  ("/\b$thema_kurz1\b/",  "<a class=alue href='lue_ansicht.php?eid=$wert[eid]' title='Lehre und Erkenntnis: $wert[thema]'target='_parent'>$thema_kurz1</a><a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $thema_kurz',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $botschaft);
-    #$zusammenfassung =preg_replace  ("/\b$thema_kurz1\b/",  "<a class=alue href='lue_ansicht.php?eid=$wert[eid]' title='Lehre und Erkenntnis: $wert[thema]' target='_parent'>$thema_kurz1</a><a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $thema_kurz',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $zusammenfassung);
-    #$kontext =preg_replace  ("/\b$thema_kurz1\b/",  "<a class=alue href='lue_ansicht.php?eid=$wert[eid]' title='Lehre und Erkenntnis: $wert[thema]' target='_parent'>$thema_kurz1</a><a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $thema_kurz',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $kontext);
-  }
-  }
-  // Automatisch in Lehre und Erkenntnis und Begriffserklärung verweisen - Ende
-
-
-  // Begriffserklärung einbinden
-
-
-
-
-  $query_exeg1 = "SELECT distinct wort, verweis
-                    FROM wort_exegese";
-  $result_exeg1 = $db->query( $query_exeg1);
-
-  while ($row_exeg1 = $result_exeg1->fetch_array()){
-
-    if (!get_array_key($row_exeg1['wort'], $thema2)) {
-  
-  
-      $repl = "__exeg-$row_exeg1[verweis]-0__"; #eid wird nicht benötigt, daher 0
-      $exeg_wort = $row_exeg1['wort'];
-      $text = replace_text_links("$exeg_wort", "$repl", $text);
-      $vorwort = replace_text_links("$exeg_wort", "$repl", $vorwort);
-      $botschaft = replace_text_links("$exeg_wort", "$repl", $botschaft);
-      $zusammenfassung = replace_text_links("$exeg_wort", "$repl", $zusammenfassung);
-      $kontext = replace_text_links("$exeg_wort", "$repl", $kontext);
-
-
-
-
-    if(!@in_array($row_exeg1['wort'], $arr_wort)){
-     # Die Begriffserklärung wird in ein Array geschrieben, so dass die Ersetzung nur einmal stattfindet, Wenn ein gleiches Wort ein der
-     # Tabelle wort_exegese wäre, dann würde er beim zweiten durchlauf der Schleife die Ãœberschrift im Popup ersetzen:CAPTION,'$exegese_wort'
-     $arr_wort = array($row_exeg1['wort']);
-     
-     $text=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$exeg_wort,&$template) { return makepopup($m[1], $m[2], $m[3], "$exeg_wort", "$template");}, $text);
-     $vorwort=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$exeg_wort,&$template) { return makepopup($m[1], $m[2], $m[3], "$exeg_wort", "$template");}, $vorwort);
-     $botschaft=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$exeg_wort,&$template) { return makepopup($m[1], $m[2], $m[3], "$exeg_wort", "$template");}, $botschaft);
-     $zusammenfassung=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$exeg_wort,&$template) { return makepopup($m[1], $m[2], $m[3], "$exeg_wort", "$template");}, $zusammenfassung);
-     $kontext=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$exeg_wort,&$template) { return makepopup($m[1], $m[2], $m[3], "$exeg_wort", "$template");}, $kontext);
-
-     #$text =preg_replace  ("/\b$row_exeg1[wort]\b/",  "$row_exeg1[wort]<a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $row_exeg1[wort]',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $text);
-     #$botschaft=preg_replace  ("/\b$row_exeg1[wort]\b/",  "$row_exeg1[wort]<a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $row_exeg1[wort]',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $botschaft);
-     #$zusammenfassung =preg_replace  ("/\b$row_exeg1[wort]\b/",  "$row_exeg1[wort]<a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $row_exeg1[wort]',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $zusammenfassung);
-     #$kontext =preg_replace  ("/\b$row_exeg1[wort]\b/",  "$row_exeg1[wort]<a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $row_exeg1[wort]',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $kontext);
-    }
-  
-  }
-  
-  }
-
-  // Begriffserklärung einbinden - Ende
-
-
-  // Automatisch in Lehre und Erkenntnis
-  foreach ($thema2 as $wert)
-  { 
-  # Modifikator /i hinzugefügt, damit Groß- Kleinschreibung nicht beachtet wird: 21.11.2011
-  # Modifikator /i wieder weggenommen, da die Groß- Kleinschreibung nicht mehr korrekt war "Die Hoffnung auf Die Wiederkunft Christi": 05.01.2012
-  $thema_kurz =str_replace  ("/",  "\/"  ,  $wert['thema_kurz']);
-  
-  # Wenn das Thema auch noch als Begriffserklärung vorkommt, dann nicht mit dem Thema von Lehre und Erkenntnis verknüpfen,
-  # sondern später mit einem Popup verknüpfen
-  $result_exeg = $db->query( "SELECT count(*) Anz FROM wort_exegese WHERE upper(wort) = upper('$thema_kurz')" );
-  $row_exeg = $result_exeg->fetch_array();
-
-  
-  if($row_exeg['Anz'] ==0){
-
-    $repl = "__lue-0-$wert[eid]__"; #weid wird nicht benötigt, daher 0
-
-    
-
-    #echo "$thema_kurz -> $repl<br>\n";
-    $text = replace_text_links("$thema_kurz", "$repl", $text);
-    $vorwort = replace_text_links("$thema_kurz", "$repl", $vorwort);
-    $botschaft = replace_text_links("$thema_kurz", "$repl", $botschaft);
-    $zusammenfassung = replace_text_links("$thema_kurz", "$repl", $zusammenfassung);
-    $kontext = replace_text_links("$thema_kurz", "$repl", $kontext);
-    
-    $text=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz", "$template");}, $text);
-    $vorwort=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz", "$template");}, $vorwort);
-    $botschaft=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz", "$template");}, $botschaft);
-    $zusammenfassung=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz", "$template");}, $zusammenfassung);
-    $kontext=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz", "$template");}, $kontext);
-
-
-  }
-  }
-
-
-  # Das geliche nochmals mit Kleinbuchstaben am Anfanng (lcfirst). Dann wird auch "Die Hoffnung auf die Wiederkunft Christi" gefunden statt nur "Die Wiederkunft..."
-  foreach ($thema2 as $wert)
-  { 
-  $thema_kurz =str_replace  ("/",  "\/"  ,  $wert['thema_kurz']);
-  #$thema_kurz=lcfirst($thema_kurz); # Erst ab PHP 5.3
-  $thema_kurz1 = strtolower(substr($thema_kurz,0,1)).substr($thema_kurz,1);
-  
-  # Wenn das Thema auch noch als Begriffserklärung vorkommt, dann nicht mit dem Thema von Lehre und Erkenntnis verknüpfen,
-  # sondern später mit einem Popup verknüpfen
-  $result_exeg = $db->query( "SELECT count(*) Anz FROM wort_exegese WHERE upper(wort) = upper('$thema_kurz')" );
-  $row_exeg = $result_exeg->fetch_array();
-  
-  if($row_exeg['Anz'] ==0){
-      
-      $repl = "__lue-0-$wert[eid]__"; #weid wird nicht benötigt, daher 0
-      
-      $thema_kurz1 = $thema_kurz1;
-      #echo "$thema_kurz -> $repl<br>\n";
-      $text = replace_text_links("$thema_kurz1", "$repl", $text);
-      $vorwort = replace_text_links("$thema_kurz1", "$repl", $vorwort);
-      $botschaft = replace_text_links("$thema_kurz1", "$repl", $botschaft);
-      $zusammenfassung = replace_text_links("$thema_kurz1", "$repl", $zusammenfassung);
-      $kontext = replace_text_links("$thema_kurz1", "$repl", $kontext);
-      
-      $text=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz1,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz1", "$template");}, $text);
-      $vorwort=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz1,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz1", "$template");}, $vorwort);
-      $botschaft=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz1,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz1", "$template");}, $botschaft);
-      $zusammenfassung=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz1,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz1", "$template");}, $zusammenfassung);
-      $kontext=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz1,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz1", "$template");}, $kontext);
-      
-  }
-  }
-
-  // Automatisch in Lehre und Erkenntnis - Ende
-
-
-
-
-
-
-  if ($suchart == 1){
-    $suchopt = "{0,1}";
-  }else{
-    $suchopt = "";
-  }
-  
-  if(!isset($inhalt_hig)){
-    $text2 = $text;
-  }else{
-    $text2 = highlight_results(" ".$text." ", $suchopt, "$inhalt_hig");
-  }
-
-} # Ende: if($row_cache_count['Anz'] == 0){
-
-###########################
-## Ausgabe der Variablen ##
-###########################
-
-$smarty->assign('ansicht_fadeout', "$fadeout");
-$smarty->assign('ansicht_lid', "$lid");
-$smarty->assign('ansicht_headline_text', "$ueberschrift");
-$smarty->assign('ansicht_date', "$datum_wt");
-$smarty->assign('ansicht_weekday', "$wochentag_wt");
-$smarty->assign('ansicht_cat_text', "$cat_text");
-$smarty->assign('ansicht_thema_text', "$thema_head");
-
-if($row4['bezeichnung'] != ""){
-  $smarty->assign('ansicht_subthema_exists', "1");
-  $subthema = $row4['bezeichnung'];
-  $smarty->assign('ansicht_subthema_text', "$subthema");
-}
-
-if($row2['bezeichnung'] != ''){
-  $smarty->assign('ansicht_subcat_exists', "1");
-  $subcat_text = $row2['bezeichnung'];
-  $smarty->assign('ansicht_subcat_text', "$subcat_text");
-} 
-
-if ($row['stapgd'] == 'Y' AND $row['ukid'] != '37'){
-  $smarty->assign('ansicht_stapgd_exists', "1");
-  $smarty->assign('ansicht_stapgd_text', "Aus einem Gottesdienst des Stammapostels");
-}
-  
-if ($row['stapgd'] == 'Y' AND $row['ukid'] == '37'){
-  $smarty->assign('ansicht_stapgd1_exists', "1");
-  $smarty->assign('ansicht_stapgd1_text', "Stammapostelsgottesdienst");
-}
-
-if ($lg_datum >= $switch_date){
-  $smarty->assign('ansicht_lg_new', "1");
-}
-
-if(rore($user_admin,'a_pdf','RE')){
-  $smarty->assign('ansicht_icon_pdf_right', "1");
-  $smarty->assign('ansicht_icon_pdf', "<a href=\"pdf_gen.php?lid=$lid\" target='_blank'><img src=\"images/ico_pdf.gif\" border=\"0\"></a>");
-}
-
-if(rore($user_admin,'a_wortbear','RE')){
-  $smarty->assign('ansicht_icon_edit_right', "1");
-  $smarty->assign('ansicht_icon_edit', "<a href=\"wort_bearbeiten.php?action=bearbeiten1&wort=$lid\" target=\"_parent\"><img src=\"images/edit.png\" border=\"0\"></a>");
-}
-
-
-if(rore($user_admin,'a_outlook','RE')){
-  $smarty->assign('ansicht_icon_outlook_right', "1");
-  $smarty->assign('ansicht_icon_outlook', "<a href=\"outlook.php?lid=$lid&typ=1\"><img src=\"images/outlook.gif\" border=\"0\"></a>");
-}
-
-if(rore($user_admin,'a_podcast','RE') and $filename != ''){
-#echo "$row_podcast[dateiname]/$verzeichnis/$filename<br><br>";
-  $smarty->assign('ansicht_icon_podcast_right', "1");
-  $smarty->assign('ansicht_icon_podcast', "<a href=\"$row_podcast[dateiname]/$verzeichnis/$filename\" target='top'><img src=\"images/lautsprecher.gif\" border=\"0\"></a>");
-}
-
-
-
-$smarty->assign('ansicht_textwort_link', "$link");
-
-if(isset($qv_vorhanden) AND $qv_vorhanden == '1'){
-  $smarty->assign('ansicht_qv_vorhanden', "1");
-  $smarty->assign('ansicht_qv_modus', "$row_verweis[querverweis]");
-  $smarty->assign('ansicht_qv_gen', "$querverweis");
-}
-
-
-if($row_lesung['lid'] != ''){
-  #echo "Lesung: $bibellesung<br>";
-  $smarty->assign('ansicht_lesung_vorhanden', "1");
-  $smarty->assign('ansicht_lesung_modus', "$row_lesung1[lesung]");
-  $smarty->assign('ansicht_lesung_gen', "$bibellesung");
-  
-}
-
-if($textwort != ''){
-  $textwort = $textwort;
-  $smarty->assign('ansicht_textwort', "$textwort");
-} 
-
-if($verweis!=''){
-  $kontext .="<br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>";
-  $kontext .="<br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>";
-}
-
-
-
-if ($lg_datum >= $switch_date AND $row['ukid'] == '37'){
-  $smarty->assign('ansicht_inhalt_exists', "2");
-}
-
-  $result_vw = $db->query( "SELECT inhalt
-                              FROM quelle_cache
-                             WHERE link = '$row_link_bibel[bibellink]'
-                               AND lid='$lid'");
-  $row_cache_vw = $result_vw->fetch_array();
-  
-  if($row_cache_vw['inhalt'] != ""){
-    $smarty->assign('ansicht_inhalt_exists', "1"); # Variable muss nochmals gesetzt werden, da die Where Bedinung nicht greifen würde oben, da Variable im Cachemodus leer ist
-    $inhalt =  base64_decode($row_cache_vw['inhalt']);
-    $smarty->assign('ansicht_inhalt_text', "$inhalt");
-  }elseif(trim($text2) != '<br/>' AND trim($text2) != ''){
-    $smarty->assign('ansicht_inhalt_exists', "1");
-    $text2_dec = base64_encode($text2);
-    $sql1 = $db->query( "INSERT INTO quelle_cache ( lid, inhalt, link) VALUES ($lid, '$text2_dec', '$row_link_bibel[bibellink]')" );
-    $cid = $db->insert_id;
-    $smarty->assign('ansicht_inhalt_text', "$text2");
-  }
-
-
-
-if ($lg_datum >= $switch_date AND $row['ukid'] != '37'){ 
-  
-  $result_vw = $db->query( "SELECT vorwort
-                              FROM quelle_cache
-                              WHERE link = '$row_link_bibel[bibellink]'
-                                AND lid='$lid'");
-  $row_cache_vw = $result_vw->fetch_array();
-
-  
-    if($row_cache_vw['vorwort'] != ""){
-      $smarty->assign('ansicht_vorwort_exists', "1"); # Variable muss nochmals gesetzt werden, da die Where Bedinung nicht greifen würde oben, da Variable im Cachemodus leer ist
-      $vorwort = base64_decode($row_cache_vw['vorwort']);
-      $smarty->assign('ansicht_vorwort_text', "$vorwort");
-    }elseif( trim($vorwort) != '<br/>' AND trim($vorwort) != ''){
-      $smarty->assign('ansicht_vorwort_exists', "1");
-      $smarty->assign('ansicht_vorwort_text', "$vorwort");
-      $vorwort_dec =base64_encode($vorwort);
-      $sql1 = $db->query( "UPDATE quelle_cache SET vorwort='$vorwort_dec' WHERE cid=$cid" );
-  }
-}
-
-          
-if ($lg_datum >= $switch_date AND $row['ukid'] != '37'){ 
-  
-  $result_vw = $db->query( "SELECT botschaft
-                              FROM quelle_cache
-                              WHERE link = '$row_link_bibel[bibellink]'
-                                AND lid='$lid'");
-  $row_cache_vw = $result_vw->fetch_array();
-
-  if($row_cache_vw['botschaft'] != ""){
-    $smarty->assign('ansicht_botschaft_exists', "1");
-    $botschaft = base64_decode($row_cache_vw['botschaft']);
-    $smarty->assign('ansicht_botschaft_text', "$botschaft");
-  }elseif(trim($botschaft) != '<br/>' AND trim($botschaft) != ''){
-    $smarty->assign('ansicht_botschaft_exists', "1");
-    $botschaft_dec =base64_encode($botschaft);
-    $sql1 = $db->query( "UPDATE quelle_cache SET botschaft='$botschaft_dec' WHERE cid=$cid" );
-    $smarty->assign('ansicht_botschaft_text', "$botschaft");
-  }
-  
-}
-
-
-if ($lg_datum >= $switch_date AND $row['ukid'] != '37'){ 
-  
-  
-  $result_vw = $db->query( "SELECT zusammenfassung
-                              FROM quelle_cache
-                             WHERE link = '$row_link_bibel[bibellink]'
-                               AND lid='$lid'" );
-  $row_cache_vw = $result_vw->fetch_array();
-
-  
-  if($row_cache_vw['zusammenfassung'] != ""){
-    $smarty->assign('ansicht_zusammenfassung_exists', "1"); # Variable muss nochmals gesetzt werden, da die Where Bedinung nicht greifen würde oben, da Variable im Cachemodus leer ist
-    $zusammenfassung =  base64_decode($row_cache_vw['zusammenfassung']);
-    $smarty->assign('ansicht_zusammenfassung_text', "$zusammenfassung");
-  }elseif(trim($zusammenfassung) != '<br/>' AND trim($zusammenfassung) != ''){
-    $smarty->assign('ansicht_zusammenfassung_exists', "1");
-    $zusammenfassung_dec = base64_encode($zusammenfassung);
-    $sql1 = $db->query( "UPDATE quelle_cache SET zusammenfassung='$zusammenfassung_dec' WHERE cid=$cid" );
-    $smarty->assign('ansicht_zusammenfassung_text', "$zusammenfassung");
-  }
-  
-  
-}
-
-if ($lg_datum >= $switch_date){ 
-
-  $result_vw = $db->query( "SELECT kontext
-                              FROM quelle_cache
-                             WHERE link = '$row_link_bibel[bibellink]'
-                               AND lid='$lid'" );
-  $row_cache_vw = $result_vw->fetch_array();
-
-  
-  if($row_cache_vw['kontext'] != ""){
-    $smarty->assign('ansicht_kontext_exists', "1");
-    $kontext =  base64_decode($row_cache_vw['kontext']);
-    $smarty->assign('ansicht_kontext_text', "$kontext");
-  }elseif(trim($kontext) != '<br/>' AND trim($kontext) != ''){
-    $smarty->assign('ansicht_kontext_exists', "1");
-    $kontext_dec = base64_encode($kontext);
-    $sql1 = $db->query( "UPDATE quelle_cache SET kontext='$kontext_dec' WHERE cid=$cid" );
-    $smarty->assign('ansicht_kontext_text', "$kontext");
-  }
-  
-  
-  
-}
-
-## Ausgabe Variablen Ende ##
-
-$smarty->display("$template/$templatename");
-?>
\ No newline at end of file
diff --git a/ansicht.php_20200915 b/ansicht.php_20200915
deleted file mode 100644
index 99df8991..00000000
--- a/ansicht.php_20200915
+++ /dev/null
@@ -1,1041 +0,0 @@
-<?php
-# Fuer debugging
-#error_reporting(E_ALL);
-#ini_set('display_errors', 1);
-#echo __LINE__."<br>";	
-session_start();
-#error_reporting(E_ALL);
-#ini_set('display_errors', 1);
-
-require_once("config/ftpanbindung.php");     // f&uuml;gt die FTP-anbindung ein
-
-include_once 'classes/lg-on_Smarty.class.php';
-$smarty = new lgon_Smarty();
-#$smarty->caching = true;
-require_once("config.inc.php");
-require_once("func_rollenrechte.php");
-$templatename = substr(basename($_SERVER['PHP_SELF']),0,-3)."html";
-require_once "language/german.inc.php";
-require_once("func_highlight.php");
-require_once("func_ansicht.php");
-
-
-if (isset($_GET['action'])) {
-  $action = $_GET['action'];
-} else {
-  $action = '';
-}
-
-if ($action == '') {
-
-$lid = $_GET['lid'];
-
-$sid = session_id();
-$datum=date("Y-m-d H:i:s");
-$result = $db->query( "INSERT INTO historie (vaid, datum, session_id, art, art_id) VALUES ('$user_vaid;', '$datum', '$sid', 'L', '$lid')" );
-
-$suchart = @$_GET['suchart'];
-$fadeout = @$_GET['fadeout'];
-
-
-if(isset($_GET['inhalt_hig'])){
-  $inhalt_hig = stripslashes($_GET['inhalt_hig']);
-  $inhalt_hig = unserialize("$inhalt_hig");
-}
-
-$verweis = @stripslashes($_GET['verweis']);
-$verweis = @unserialize($verweis);
-
-
-
-if ($user_admin == ""){ require("index.php"); exit;} //Wenn man nicht angemeldet ist, darf man nicht auf die Seite
-
-$db = dbconnect();
-$result = $db->query( "SELECT lid, txt_anz_buch, txt_buch, txt_kapitel, txt_vers, Ueberschrift, thema, unterthema, textstelle, replace(replace(replace(textstelle, ' aus ', ''), 'vgl',''), ' ','') textstelle2, vorwort, botschaft, textwort, inhalt, zusammenfassung, kontext, DATE_Format(datum, '%d.%m.%Y') as datum, kid, ukid, DATE_Format(datum, '%d') tag, DATE_Format(datum, '%m') monat, DATE_Format(datum, '%Y') jahr, ukid, DATE_Format(datum, '%Y-%m-%d')AS datum_berechnung, stapgd
-                         FROM quelle
-                        WHERE lid='$lid'");
-$row = $result->fetch_array();
-
-
-##### ÄNDERUNG NEUE LUTHERBIBEL ########
-if($row['jahr'] < 2019){
-  # Lutherbibel 1984
-  require_once("bibellookup_1984.php");
-  $bibelversion = "1984";
-}else{
-  # Lutherbibel 2017
-  require_once("bibellookup_2017.php");
-  $bibelversion = "2017";
-}
-
-
-$result_link_bibel = $db->query( "SELECT bibellink
-                                     FROM profil
-                                    WHERE user='$user_admin'");
-$row_link_bibel = $result_link_bibel->fetch_array();
-
-$result_count = $db->query( "SELECT count(*) Anz
-                              FROM quelle_cache
-                             WHERE link = '$row_link_bibel[bibellink]'
-                               AND lid='$lid'");
-$row_cache_count = $result_count->fetch_array();
-
-$ueberschrift = html_entity_decode($row['Ueberschrift']);
-
-# typografische Anführungszeichen im UTF8 Format Korrekt darstellen
-$ueberschrift = preg_replace("/\x{0084}/u","&bdquo;",$ueberschrift);
-$ueberschrift = preg_replace("/\x{0093}/u","&ldquo;",$ueberschrift);
-
-
-
-$wochentag = date("l", mktime(0,0,0,$row['monat'],$row['tag'],$row['jahr']));
-
-$result_gd = $db->query( "SELECT wgd FROM profil WHERE user = '$user_admin'");
-$row_gd = $result_gd->fetch_array();
-
-if($wochentag == 'Wednesday' AND $row_gd['wgd'] != '0' AND ($row['ukid'] == '1')){  // Hintergrund kommt aus der wort_wahl.php. Es gibt einige Gottesdienste, die auf einen Mittwoch fallen (1. vom Monat) aber kein Tag addiert werden darf, daher: Wann muss ein Tag (faktor) addiert werden, generell, wenn Wochengottesdienst, wenn Faktor im Profil != 0 und wenn unterkategorie 1 (GD normal) ist. Bei allen anderen Gottesdiensten bleibt der Mittwoch erhalten. (Buß und Bettag ist Mittwoch, Erntedank bleibt auch am 1. des Monats)
-  $datum_wt = date("d.m.Y", mktime(0,0,0,$row['monat'],$row['tag']+$row_gd['wgd'],$row['jahr']));
-  $wochentag = date("l", mktime(0,0,0,$row['monat'],$row['tag']+$row_gd['wgd'],$row['jahr']));
-}else{
-  $wochentag = date("l", mktime(0,0,0,$row['monat'],$row['tag'],$row['jahr']));
-  $datum_wt = date("d.m.Y", mktime(0,0,0,$row['monat'],$row['tag'],$row['jahr']));
-}
-
-
-
-switch($wochentag)
-{
-  case 'Sunday':
-      $wochentag_wt = "So.";
-      break;
-  case 'Monday':
-      $wochentag_wt = "Mo.";
-      break;
-  case 'Tuesday':
-      $wochentag_wt = "Di.";
-      break;
-  case 'Wednesday':
-      $wochentag_wt = "Mi.";
-      break;
-  case 'Thursday':
-      $wochentag_wt = "Do.";
-      break;
-  case 'Friday':
-      $wochentag_wt = "Fr.";
-      break;
-  case 'Saturday':
-      $wochentag_wt = "Sa.";
-      break;
-}
-
-
-$result1 = $db->query( "SELECT bezeichnung
-                          FROM kategorie
-                         WHERE kid='$row[kid]'");
-$row1 = $result1->fetch_array();
-$cat_text = $row1['bezeichnung'];
-
-$result2 = $db->query( "SELECT bezeichnung
-                          FROM unterkategorie
-                         WHERE ukid='$row[ukid]'");
-$row2 = $result2->fetch_array();
-
-$result3 = $db->query( "SELECT bezeichnung
-                          FROM thema
-                         WHERE tid='$row[thema]'");
-$row3 = $result3->fetch_array();
-$thema_head = $row3['bezeichnung'];
-
-$result4 = $db->query( "SELECT bezeichnung
-                          FROM unterthema
-                         WHERE tid='$row[thema]'
-                           AND utid='$row[unterthema]'");
-$row4 = $result4->fetch_array();
-
-
-
-
-$textwort = strip_tags($row['textwort']);
-if($row_cache_count['Anz'] == 0){
-  $vorwort = strip_tags($row['vorwort'], '<br>,<b>,<strong>,<ul>,<li>,<ol>,<a>');
-  $botschaft = strip_tags($row['botschaft'], '<br>,<b>,<strong>,<ul>,<li>,<ol>,<a>');
-  $zusammenfassung = strip_tags($row['zusammenfassung'], '<br>,<b>,<strong>,<ul>,<li>,<ol>,<a>');
-  $kontext = strip_tags($row['kontext'], '<br>,<b>,<strong>,<ul>,<li>,<ol>,<a>');
-  $text = strip_tags($row['inhalt'], '<br>,<b>,<strong>,<ul>,<li>,<ol>,<a>,<table>,<tr>,<td>,<h1>,<h2>,<h3>,<img>');
- 
-  # Sonst kommt empty_string Fehlermeldung von Dom-Document. Besonders bei uralten LGs
-  if($vorwort == ''){$vorwort="<br />";}
-  if($botschaft == ''){$botschaft="<br />";}
-  if($zusammenfassung == ''){$zusammenfassung="<br />";}
-  if($kontext == ''){$kontext="<br />";}
-  if($text == ''){$text="<br />";}
-
-
-  $kontext = str_replace(' "', ' \"', $kontext);
-  $kontext =preg_replace_callback("/([0-9]\s*)?()(Sir|Mo|Jos|Ri|Rut|Sam|K&ouml;n|Chr|Esr|Neh|Est|Hiob|Ps|Spr|Pred|Hld|Jes|Jer|Kla|Klgl|Hes|St zu Dan|Dan|Hos|Joel|Am|Obd|Jona|Mi|Nah|Hab|Zef|Hag|Sach|Weish|Mal|Tob|Mt|Mk|Lk|Luk|Joh|Jh|Apg|R&ouml;m|Rom|Kor|Gal|Eph|Phil|Kol|Thess|Tim|Tit|Phlm|Ptr|Petr|Joh|Hbr|Hebr|Jak|Jk|Jud|Offb|Off)(\s*)".
-                                 "([0-9]{1,3})(\,\s*)?(aus\s*)?([0-9]{0,3})/", function($m) use (&$lid) { return refill($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $m[9], $lid);}, $kontext);
-  $jahr = "$row[jahr]";
-  $bibellink = $row_link_bibel['bibellink'];
-  $kontext=preg_replace_callback("/([0-9][0-9]?\.\s*)?(Makkab&auml;er|Johannes|Mose|K&ouml;nige|Chronik|Korinther|Samuel|Thessalonicher|Timotheus|Petrus|Gebet Manasses|St&uuml;cke zu Daniel|St&uuml;cke zu Ester|Baruch|Weisheit|Judit|Judith|Sirach|Josua|Richter|Rut|Ruth|Esra|Nehemia|Esther|Ester|Hiob|Ijob|Psalm|Spr&uuml;che|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Ezechiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matth&auml;us|Markus|Lukas|Apostelgeschichte|R&ouml;mer|Galater|Epheser|Philipper|Kolosser|Titus|Hebr&auml;er|Jakobus|Offenbarung|Philemon|Judas)(\s*[0-9]{1,3})(,\s*)?(\s*aus\s*|\s*Verse\s*|\s*Vers\s*)?([0-9]{0,3})?(\s*\-\s*|\s*\.\s*)?([0-9]{0,3})?/", function($m) use (&$lid,&$bibellink,&$jahr) { return makeLink($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $lid, $bibellink,$jahr);}, $kontext);
-  
-  $suchmuster = '/(KNK) (([0-9]{1,2}\.?){0,5})/';
-  $kontext=preg_replace_callback($suchmuster, function($m) { return makeKNK($m[1], $m[2]);}, $kontext);
-  
-  $suchmuster2 = '/(KNK-FA) ([0-9]{1,3})/';
-  $kontext=preg_replace_callback($suchmuster2, function($m) { return makeKNK_FA($m[1], $m[2]);}, $kontext);
-  
-  
-  $zusammenfassung = str_replace(' "', ' \"', $zusammenfassung);
-  $zusammenfassung =preg_replace_callback("/([0-9]\s*)?()(Sir|Mo|Jos|Ri|Rut|Sam|K&ouml;n|Chr|Esr|Neh|Est|Hiob|Ps|Spr|Pred|Hld|Jes|Jer|Kla|Klgl|Hes|St zu Dan|Dan|Hos|Joel|Am|Obd|Jona|Mi|Nah|Hab|Zef|Hag|Sach|Weish|Mal|Tob|Mt|Mk|Lk|Luk|Joh|Jh|Apg|R&ouml;m|Rom|Kor|Gal|Eph|Phil|Kol|Thess|Tim|Tit|Phlm|Ptr|Petr|Joh|Hbr|Hebr|Jak|Jk|Jud|Offb|Off)(\s*)".
-                                  "([0-9]{1,3})(\,\s*)?(aus\s*)?([0-9]{0,3})/", function($m) use (&$lid) { return refill($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $m[9], $lid);}, $zusammenfassung);
-                                  
-  $zusammenfassung=preg_replace_callback("/([0-9][0-9]?\.\s*)?(Makkab&auml;er|Johannes|Mose|K&ouml;nige|Chronik|Korinther|Samuel|Thessalonicher|Timotheus|Petrus|Gebet Manasses|St&uuml;cke zu Daniel|St&uuml;cke zu Ester|Baruch|Weisheit|Judit|Judith|Sirach|Josua|Richter|Rut|Ruth|Esra|Nehemia|Esther|Ester|Hiob|Ijob|Psalm|Spr&uuml;che|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Ezechiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matth&auml;us|Markus|Lukas|Apostelgeschichte|R&ouml;mer|Galater|Epheser|Philipper|Kolosser|Titus|Hebr&auml;er|Jakobus|Offenbarung|Philemon|Judas)(\s*[0-9]{1,3})(,\s*)?(\s*aus\s*|\s*Verse\s*|\s*Vers\s*)?([0-9]{0,3})?(\s*\-\s*|\s*\.\s*)?([0-9]{0,3})?/", function($m) use (&$lid,&$bibellink,&$jahr) { return makeLink($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $lid, $bibellink,$jahr);}, $zusammenfassung);
-
-  $vorwort = str_replace(' "', ' \"', $vorwort);
-  $vorwort=preg_replace_callback("/([0-9]\s*)?()(Sir|Mo|Jos|Ri|Rut|Sam|K&ouml;n|Chr|Esr|Neh|Est|Hiob|Ps|Spr|Pred|Hld|Jes|Jer|Kla|Klgl|Hes|St zu Dan|Dan|Hos|Joel|Am|Obd|Jona|Mi|Nah|Hab|Zef|Hag|Sach|Weish|Mal|Tob|Mt|Mk|Lk|Luk|Joh|Jh|Apg|R&ouml;m|Rom|Kor|Gal|Eph|Phil|Kol|Thess|Tim|Tit|Phlm|Ptr|Petr|Joh|Hbr|Hebr|Jak|Jk|Jud|Offb|Off)(\s*)".
-                         "([0-9]{1,3})(\,\s*)?(aus\s*)?([0-9]{0,3})/", function($m) use (&$lid) { return refill($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $m[9], $lid);}, $vorwort);
-                         
-  $vorwort=preg_replace_callback("/([0-9][0-9]?\.\s*)?(Makkab&auml;er|Johannes|Mose|K&ouml;nige|Chronik|Korinther|Samuel|Thessalonicher|Timotheus|Petrus|Gebet Manasses|St&uuml;cke zu Daniel|St&uuml;cke zu Ester|Baruch|Weisheit|Judit|Judith|Sirach|Josua|Richter|Rut|Ruth|Esra|Nehemia|Esther|Ester|Hiob|Ijob|Psalm|Spr&uuml;che|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Ezechiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matth&auml;us|Markus|Lukas|Apostelgeschichte|R&ouml;mer|Galater|Epheser|Philipper|Kolosser|Titus|Hebr&auml;er|Jakobus|Offenbarung|Philemon|Judas)(\s*[0-9]{1,3})(,\s*)?(\s*aus\s*|\s*Verse\s*|\s*Vers\s*)?([0-9]{0,3})?(\s*\-\s*|\s*\.\s*)?([0-9]{0,3})?/", function($m) use (&$lid,&$bibellink,&$jahr) { return makeLink($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $lid, $bibellink,$jahr);}, $vorwort);
-
-  $botschaft = str_replace(' "', ' \"', $botschaft);
-  $botschaft=preg_replace_callback("/([0-9]\s*)?()(Sir|Mo|Jos|Ri|Rut|Sam|K&ouml;n|Chr|Esr|Neh|Est|Hiob|Ps|Spr|Pred|Hld|Jes|Jer|Kla|Klgl|Hes|St zu Dan|Dan|Hos|Joel|Am|Obd|Jona|Mi|Nah|Hab|Zef|Hag|Sach|Weish|Mal|Tob|Mt|Mk|Lk|Luk|Joh|Jh|Apg|R&ouml;m|Rom|Kor|Gal|Eph|Phil|Kol|Thess|Tim|Tit|Phlm|Ptr|Petr|Joh|Hbr|Hebr|Jak|Jk|Jud|Offb|Off)(\s*)".
-                           "([0-9]{1,3})(\,\s*)?(aus\s*)?([0-9]{0,3})/", function($m) { return refill($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $m[9], $lid);}, $botschaft);
-                           
-  $botschaft=preg_replace_callback("/([0-9][0-9]?\.\s*)?(Makkab&auml;er|Johannes|Mose|K&ouml;nige|Chronik|Korinther|Samuel|Thessalonicher|Timotheus|Petrus|Gebet Manasses|St&uuml;cke zu Daniel|St&uuml;cke zu Ester|Baruch|Weisheit|Judit|Judith|Sirach|Josua|Richter|Rut|Ruth|Esra|Nehemia|Esther|Ester|Hiob|Ijob|Psalm|Spr&uuml;che|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Ezechiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matth&auml;us|Markus|Lukas|Apostelgeschichte|R&ouml;mer|Galater|Epheser|Philipper|Kolosser|Titus|Hebr&auml;er|Jakobus|Offenbarung|Philemon|Judas)(\s*[0-9]{1,3})(,\s*)?(\s*aus\s*|\s*Verse\s*|\s*Vers\s*)?([0-9]{0,3})?(\s*\-\s*|\s*\.\s*)?([0-9]{0,3})?/", function($m) use (&$lid,&$bibellink,&$jahr) { return makeLink($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $lid, $bibellink,$jahr);}, $botschaft);
-
-}
-
-$textstelle = str_replace (array(" ", "aus", "vgl"), array("", "", ""), $row['textstelle']);
-
-$date_nlg  = mktime(0, 0, 0, 12, 1, 2007);  // Datum ab dem neue LGs gelten
-$date_nlg_format = date("Y-m-d", $date_nlg);  // ISO-8601 Format wie in der Datenbank: Formatierung f&uuml;r Vergleiche erforderlich
-
-$switch_date = strtotime ($date_nlg_format); //Umrechnung des Fristgrenztages in eine Zahl
-$lg_datum = strtotime ($row['datum_berechnung']); // Umrechnung des Enddatums in eine Zahl
-
-$result_podcast = $db->query( "SELECT dateiname
-	                           FROM admin_rechte
-	                          WHERE admin_rolle = 'a_podcast'");
-$row_podcast = $result_podcast->fetch_array();
-
-$verzeichnis = "$row[jahr]-$row[monat]";
-$suchbegriff1 = "$row[jahr]_$row[monat]_$row[tag].";
-$suchbegriff2 = "$row[jahr]-$row[monat]-$row[tag].";
-   
-   $verzeichnis2 = "/Leitgedanken/Podcast/$verzeichnis/";
-   #$verzeichnis2 = "/homes/admin/Drive/Podcast/$verzeichnis/";
-   $VerbindungsID = @ftp_connect($FTPServer2, 21, 1); # Timeout auf 1 Sek
-   $LoginErgebnis = @ftp_login($VerbindungsID, $FTPUser2, $FTPPasswort2);
-   
-   ########DEBUGINFO#################
-#   if($LoginErgebnis){
-#     echo "Verbunden<br>";
-#   }else{
-#     echo "keine Verbindung<br>";
-#   }
-   
-#   echo "VerbindungsID: $VerbindungsID<br>
-#         FTPUser: $FTPUser2<br>
-#         FTPPasswort2: $FTPPasswort2<br>
-#         Verzeichnis: $verzeichnis2<br>
-#         <strong>Dateiname:</strong><br>
-#        ";
-   ########DEBUGINFO ENDE############
-   
-
-   $filename = 0;
-   $filename_podcast_lesung = 0;
-   
-   if($VerbindungsID && $LoginErgebnis)
-   {
-     $smarty->assign('ftp_ansicht_connect', "1");
-     $Dateiliste=ftp_nlist($VerbindungsID, $verzeichnis2);
-     @sort($Dateiliste);
-     for($i=0; $i<count($Dateiliste); $i++)
-     {
-     
-             $dateiname = basename($Dateiliste[$i]);
-#echo $dateiname."<br>";
-          
-          if($row['ukid'] != 5){ #Jugendgottesdienst ist der Dateiname anders
-            if($row['ukid'] != 37){
-	
-             $pos1 = strpos($dateiname, $suchbegriff1);
-             $pos2 = strpos($dateiname, $suchbegriff2);
-             
-#echo "$dateiname -> $suchbegriff -> $pos1 -> -> $pos2<br>";
-             if($pos1 > 0 or $pos2 > 0){
-               $filename = $dateiname;
-             }
-            }
-          }else{
-             $suchbegriff1 = "$row[jahr]_$row[monat]_JGD.";
-             $suchbegriff2 = "G_$row[jahr]_$row[monat].";
-             $suchbegriff3 = "G_$row[jahr]-$row[monat].";
-             $suchbegriff4 = "JG_$row[jahr]-$row[monat].";
-             $pos1 = strpos($dateiname, $suchbegriff1);
-             $pos2 = strpos($dateiname, $suchbegriff2);
-             $pos3 = strpos($dateiname, $suchbegriff3);
-             $pos4 = strpos($dateiname, $suchbegriff4);
-
-             if($pos != '' or $pos2 != '' or $pos3 != '' or $pos3 != ''){
-               $filename = $dateiname;
-#echo "pos1: $pos1 <br> pos2: $pos2 <br> pos3: $pos3 <br> pos4: $pos4 <br>$filename<br><br>";
-             }
-          }
-          
-             $suchbegriff_lesung = "$row[jahr]_$row[monat]_$row[tag]_Lesung";
-             $pos = strpos($dateiname, $suchbegriff_lesung);
-             $suchbegriff_lesung2 = "$row[jahr]-$row[monat]-$row[tag]_Lesung";
-             $pos2 = strpos($dateiname, $suchbegriff_lesung2);
-             if($pos > 0 or $pos2 > 0){
-               $filename_podcast_lesung = $dateiname;
-             }
-          
-
-     }
-   }
-
-#echo "$row_podcast[dateiname]/$verzeichnis/$filename<br><br>";
-
-
-// Preg auf vollständige Bibelbücher überprüft
-$textstelle_stopmark=preg_replace_callback("/^([0-9]\.)*\s*".	//1 a
-  				 "(Philemon|Judas|Johannes|Mose|Könige|Korinther|Petrus|Sirach|Josua|Richter|Rut|Ruth|Samuel|Chronik|Esra|Nehemia|Esther|Ester|Hiob|Psalm|Sprüche|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Judit|Weisheit|Baruch|Makkabäer|Stücke zu Ester|Stücke zu Daniel|Gebet Manasses|Matthäus|Markus|Lukas|Apostelgeschichte|Römer|Galater|Epheser|Philipper|Kolosser|Thessalonicher|Timotheus|Titus|Hebräer|Jakobus|Offenbarung)\s*". //2
-  				 "([0-9]{1,3})". 	//3  c
-  				 "(\,)?\s*". 		//4  d
-  				 "(aus)?\s*".		//5  e
-  				 "([0-9]{0,3})".	//6  f
-  				 "(\.|-)?".		//7  g
-  				 "([0-9]{0,3})?".	//8  h
-  				 "(\.|-)?".		//9  i
-  				 "([0-9]{0,3})".        //10 j
-  				 "$/", function($m) { return splitword_stopmark($m[1], $m[2], $m[3], $m[6], $m[7], $m[8], $m[9], $m[10]);},
- 				 $row['textstelle']);
-
-// stopmark Ende
-
-
-
-// Textwort: Link zu verschiedenen Onlinebibeln
-if($row_link_bibel['bibellink'] == 'lokal'){
-  ##### ÄNDERUNG NEUE LUTHERBIBEL ########
-  if($bibelversion == "1984"){
-    $link = "<a class=\"biblelink\" href=\"javascript:bib_link_lokal1('bibelpopup/bib_popup_1984.php?wort=$row[textstelle]&stopmark=$textstelle_stopmark&vers_select=Y','Bibellink','640','480','center','front');\">$row[textstelle]</a>";
-  }
-  if($bibelversion == "2017"){
-    $link = "<a class=\"biblelink\" href=\"javascript:bib_link_lokal1('bibelpopup/bib_popup_2017.php?wort=$row[textstelle]&stopmark=$textstelle_stopmark&vers_select=Y','Bibellink','640','480','center','front');\">$row[textstelle]</a>";
-  }
-}elseif($row_link_bibel['bibellink'] == 'bibleserver'){
-  ##### ÄNDERUNG NEUE LUTHERBIBEL ########
-  if($bibelversion == "1984"){
-    $link = "<a href=http://www.bibleserver.com/go.php?lang={de}&bible={LUT84}&ref={$textstelle} target='_blank'>$row[textstelle]</a>";
-  }
-  if($bibelversion == "2017"){
-    $textstelle = str_replace(',','%2C', $textstelle);
-    $link = "<a href=http://www.bibleserver.com/go.php?lang={de}&bible={LUT}&ref={$textstelle} target='_blank'>$row[textstelle]</a>";
-  }
-}
-
-  $result_verweis = $db->query( "SELECT querverweis
-                                   FROM profil
-                                  WHERE user='$user_admin'");
-  $row_verweis = $result_verweis->fetch_array();
-
-  
-  require_once("verweise.php");
-  $querverweis = verweise($lid, $user_admin, $template);
-  # Erst werden die Verweise immer erzeugt, und ich cache geschrieben, dann abgefragt, wenn was im Cac dann qv_vorhanden =1. 
-  # Verweisfenster wird dann nur eingeblendet, wenn ein Verweis vorhanden ist.
-
-  $result_te_cache = $db->query( "SELECT erg_lid
-                                    FROM quelle_verweise_cache
-                                   WHERE erg_lid = $lid" );
-  if($result_te_cache->num_rows > 0){
-    $qv_vorhanden = "1";
-  }
-
-
-######################################################################
-## Prüfung, ob Bibellesung vorhanden ist, die zur Kategorie passt
-######################################################################
- # Neu am 05.12.2019: Bibellesung Jugendgottesdienst, die ja immer am ersten im Monat sind, wurden auch bei normalen GDs angezeigt, die am 01. des Monats waren.
-                                
-  $result_lesung = $db->query( "SELECT lid
-                                  FROM quelle a
-                                 WHERE datum='$row[datum_berechnung]'
-                                   AND kid = 12
-                                   AND lid != '$lid'
-                                   AND a.ukid = (select ukid from unterkategorie b where a.ukid=b.ukid and b.bezeichnung ='$row2[bezeichnung]')
-                              ");
-  $row_lesung = $result_lesung->fetch_array();
-  
-  
-
-
-if($row_lesung['lid'] != ''){
-  
-  $result_lesung1 = $db->query( "SELECT lesung
-                                  FROM profil
-                                 WHERE user='$user_admin'");
-  $row_lesung1 = $result_lesung1->fetch_array();
-  
-  
-  require_once("lesung.php");
-  
-  
-  $bibellesung = lesung($row['datum_berechnung'], $template, $verzeichnis, $filename_podcast_lesung);
-
-}
-
-######################################################################
-## Ende Prüfung, ob Bibellesung vorhanden ist
-######################################################################
-
-
-
-if($row_cache_count['Anz'] == 0){
-  $text = str_replace(' "', ' \"', $text);
-  $text=preg_replace_callback("/([0-9]\s*)?()?(Sir|Mo|Jos|Ri|Rut|Sam|K&ouml;n|Chr|Esr|Neh|Est|Hiob|Ps|Spr|Pred|Hld|Jes|Jer|Kla|Klgl|Hes|St zu Dan|Dan|Hos|Joel|Am|Obd|Jona|Mi|Nah|Hab|Zef|Hag|Sach|Weish|Mal|Tob|Mt|Mk|Lk|Luk|Joh|Jh|Apg|R&ouml;m|Rom|Kor|Gal|Eph|Phil|Kol|Thess|Tim|Tit|Phlm|Ptr|Petr|Joh|Hbr|Hebr|Jak|Jk|Jud|Offb|Off)(\s*)".
-                      "([0-9]{1,3})(\,\s*)?(aus\s*)?([0-9]{0,3})/", function($m) use (&$lid) { return refill($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $m[9], $lid);}, $text);
-
-  $text = str_replace("$verweis","<a name='verweis'>$verweis</a>",$text);
-  $text=preg_replace_callback("/([0-9][0-9]?\.\s*)?(Makkab&auml;er|Johannes|Mose|K&ouml;nige|Chronik|Korinther|Samuel|Thessalonicher|Timotheus|Petrus|Gebet Manasses|St&uuml;cke zu Daniel|St&uuml;cke zu Ester|Baruch|Weisheit|Judit|Judith|Sirach|Josua|Richter|Rut|Ruth|Esra|Nehemia|Esther|Ester|Hiob|Ijob|Psalm|Spr&uuml;che|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Ezechiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matth&auml;us|Markus|Lukas|Apostelgeschichte|R&ouml;mer|Galater|Epheser|Philipper|Kolosser|Titus|Hebr&auml;er|Jakobus|Offenbarung|Philemon|Judas)(\s*[0-9]{1,3})(,\s*)?(\s*aus\s*|\s*Verse\s*|\s*Vers\s*)?([0-9]{0,3})?(\s*\-\s*|\s*\.\s*)?([0-9]{0,3})?/", function($m) use (&$lid,&$bibellink,&$jahr) { return makeLink($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $lid, $bibellink,$jahr);}, $text);
-  $suchmuster = '/(KNK) (([0-9]{1,2}\.?){0,5})/';
-  $text=preg_replace_callback($suchmuster, function($m) { return makeKNK($m[1], $m[2]);}, $text);
-  
-  $suchmuster2 = '/(KNK-FA) ([0-9]{1,3})/';
-  $text=preg_replace_callback($suchmuster2, function($m) { return makeKNK_FA($m[1], $m[2]);}, $text);
-
-}
-
-
-
-
-
-// Automatisch in Lehre und Erkenntnis verweisen - Start
-if($row_cache_count['Anz'] == 0){
-
-  $db = dbconnect();
-  $query_lue = "SELECT eid, thema
-                  FROM lue_quelle";
-  $result_lue = $db->query( $query_lue);
-  $ln_zaehler =0;
-
-  while ($row_lue = $result_lue->fetch_array()){
-    $thema = strpos("$row_lue[thema]", "Teil");  // Ermitteln wo das Wort "Teil" steht
-
-    if($thema >0){
-      $thema = substr("$row_lue[thema]",0 ,$thema ); // Alles vor dem Wort "Teil" anzeigen
-    }else{
-      $thema = "$row_lue[thema]";
-    }
-    $thema = trim($thema);
-
- 
- 
- while(substr($thema, -1) =='-' or substr($thema, -1)==':' or substr($thema, -1) =='(' or substr($thema, -1) ==' '){
-  $thema =trim($thema);
-  $thema =substr($thema, 0, -1);
-  $thema =trim($thema);
- }
-
-  if (!@in_array($thema, $thema1)) {
-    #echo "$thema<br>";
-
-    $thema2[$ln_zaehler]['thema_kurz'] =$thema;
-    $thema2[$ln_zaehler]['eid'] = $row_lue['eid'];
-    $thema2[$ln_zaehler]['thema'] =$row_lue['thema'];
-    
-    $thema1[] = $thema;
-    $ln_zaehler++;  
-  }  
-
- }
-
- #print_r($thema2);
-
-
- // Automatisch in Lehre und Erkenntnis verweisen - Ende
-
-
-
-
-
-
- #print_r($thema2);
-
-  // Automatisch in Lehre und Erkenntnis und Begriffserklärung verweisen
-  foreach ($thema2 as $wert)
-  { 
-  # Modifikator /i hinzugefügt, damit Groß- Kleinschreibung nicht beachtet wird: 21.11.2011
-  # Modifikator /i wieder weggenommen, da die Groß- Kleinschreibung nicht mehr korrekt war "Die Hoffnung auf Die Wiederkunft Christi": 05.01.2012
-  $thema_kurz =str_replace  ("/",  "\/"  ,  $wert['thema_kurz']);
-  
-  # Wenn das Thema auch noch als Begriffserklärung vorkommt, dann nicht mit dem Thema von Lehre und Erkenntnis verknüpfen,
-  # sondern später mit einem Popup verknüpfen
-  $result_exeg = $db->query( "SELECT count(*) Anz FROM wort_exegese WHERE wort = '$thema_kurz'");
-  $row_exeg = $result_exeg->fetch_array();
-  
-  if($row_exeg['Anz'] >0){
-  
-    $result_exeg3 = $db->query( "SELECT verweis FROM wort_exegese WHERE upper(wort) = upper('$thema_kurz')" );
-    $row_exeg3 = $result_exeg3->fetch_array();
-   
-    $repl = "__lueexeg-$row_exeg3[verweis]-$wert[eid]__";
-    #echo $text;
-    #exit;
-    
-    
-    $text = replace_text_links("$thema_kurz", "$repl", $text);
-    $vorwort = replace_text_links("$thema_kurz", "$repl", $vorwort);
-    $botschaft = replace_text_links("$thema_kurz", "$repl", $botschaft);
-    $zusammenfassung = replace_text_links("$thema_kurz", "$repl", $zusammenfassung);
-    $kontext = replace_text_links("$thema_kurz", "$repl", $kontext);
-
-    $text=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz", "$template");}, $text);
-    $vorwort=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz", "$template");}, $vorwort);
-    $botschaft=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz", "$template");}, $botschaft);
-    $zusammenfassung=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz", "$template");}, $zusammenfassung);
-    $kontext=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz", "$template");}, $kontext);
-    
-
-    #$text =preg_replace  ("/\b$thema_kurz\b/",  "<a class=alue href='lue_ansicht.php?eid=$wert[eid]' title='Lehre und Erkenntnis: $wert[thema]' target='_parent'>$thema_kurz</a><a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $thema_kurz',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $text);
-    #$botschaft =preg_replace  ("/\b$thema_kurz\b/",  "<a class=alue href='lue_ansicht.php?eid=$wert[eid]' title='Lehre und Erkenntnis: $wert[thema]'target='_parent'>$thema_kurz</a><a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $thema_kurz',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $botschaft);
-    #$zusammenfassung =preg_replace  ("/\b$thema_kurz\b/",  "<a class=alue href='lue_ansicht.php?eid=$wert[eid]' title='Lehre und Erkenntnis: $wert[thema]' target='_parent'>$thema_kurz</a><a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $thema_kurz',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $zusammenfassung);
-    #$kontext =preg_replace  ("/\b$thema_kurz\b/",  "<a class=alue href='lue_ansicht.php?eid=$wert[eid]' title='Lehre und Erkenntnis: $wert[thema]' target='_parent'>$thema_kurz</a><a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $thema_kurz',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $kontext);
-  }
-  }
-
-  # Das gleiche nochmals mit Kleinbuchstaben am Anfanng (lcfirst). Dann wird auch "Die Hoffnung auf die Wiederkunft Christi" gefunden statt nur "Die Wiederkunft..."
-  foreach ($thema2 as $wert)
-  { 
-  $thema_kurz =str_replace  ("/",  "\/"  ,  $wert['thema_kurz']);
-  #$thema_kurz1=lcfirst($thema_kurz); # Erst ab PHP 5.3
-  $thema_kurz1 = strtolower(substr($thema_kurz,0,1)).substr($thema_kurz,1);
-  
-  # Wenn das Thema auch noch als Begriffserklärung vorkommt, dann nicht mit dem Thema von Lehre und Erkenntnis verknüpfen,
-  # sondern später mit einem Popup verknüpfen
-  $result_exeg = $db->query( "SELECT count(*) Anz FROM wort_exegese WHERE wort = '$thema_kurz1'" );
-  $row_exeg = $result_exeg->fetch_array();
-
-  
-  if($row_exeg['Anz'] >0){
-
-    $result_exeg3 = $db->query( "SELECT verweis FROM wort_exegese WHERE upper(wort) = upper('$thema_kurz1')" );
-    $row_exeg3 = $result_exeg3->fetch_array();
-
-    
-    
-    $repl = "__lueexeg-$row_exeg3[verweis]-$wert[eid]__";
-    #echo $text;
-    #exit;
-    
-    $thema_kurz1 = $thema_kurz1;
-    $text = replace_text_links("$thema_kurz1", "$repl", $text);
-    $vorwort = replace_text_links("$thema_kurz1", "$repl", $vorwort);
-    $botschaft = replace_text_links("$thema_kurz1", "$repl", $botschaft);
-    $zusammenfassung = replace_text_links("$thema_kurz1", "$repl", $zusammenfassung);
-    $kontext = replace_text_links("$thema_kurz1", "$repl", $kontext);
-   
-    $text=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz1,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz1", "$template");}, $text);
-    $vorwort=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz1,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz1", "$template");}, $vorwort);
-    $botschaft=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz1,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz1", "$template");}, $botschaft);
-    $zusammenfassung=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz1,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz1", "$template");}, $zusammenfassung);
-    $kontext=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz1,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz1", "$template");}, $kontext);
-    
-
-  
-
-    #$text =preg_replace  ("/\b$thema_kurz1\b/",  "<a class=alue href='lue_ansicht.php?eid=$wert[eid]' title='Lehre und Erkenntnis: $wert[thema]' target='_parent'>$thema_kurz1</a><a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $thema_kurz',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $text);
-    #$botschaft =preg_replace  ("/\b$thema_kurz1\b/",  "<a class=alue href='lue_ansicht.php?eid=$wert[eid]' title='Lehre und Erkenntnis: $wert[thema]'target='_parent'>$thema_kurz1</a><a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $thema_kurz',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $botschaft);
-    #$zusammenfassung =preg_replace  ("/\b$thema_kurz1\b/",  "<a class=alue href='lue_ansicht.php?eid=$wert[eid]' title='Lehre und Erkenntnis: $wert[thema]' target='_parent'>$thema_kurz1</a><a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $thema_kurz',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $zusammenfassung);
-    #$kontext =preg_replace  ("/\b$thema_kurz1\b/",  "<a class=alue href='lue_ansicht.php?eid=$wert[eid]' title='Lehre und Erkenntnis: $wert[thema]' target='_parent'>$thema_kurz1</a><a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $thema_kurz',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $kontext);
-  }
-  }
-  // Automatisch in Lehre und Erkenntnis und Begriffserklärung verweisen - Ende
-
-
-  // Begriffserklärung einbinden
-
-
-
-
-  $query_exeg1 = "SELECT distinct wort, verweis
-                    FROM wort_exegese";
-  $result_exeg1 = $db->query( $query_exeg1);
-
-  while ($row_exeg1 = $result_exeg1->fetch_array()){
-
-    if (!get_array_key($row_exeg1['wort'], $thema2)) {
-  
-  
-      $repl = "__exeg-$row_exeg1[verweis]-0__"; #eid wird nicht benötigt, daher 0
-      $exeg_wort = $row_exeg1['wort'];
-      $text = replace_text_links("$exeg_wort", "$repl", $text);
-      $vorwort = replace_text_links("$exeg_wort", "$repl", $vorwort);
-      $botschaft = replace_text_links("$exeg_wort", "$repl", $botschaft);
-      $zusammenfassung = replace_text_links("$exeg_wort", "$repl", $zusammenfassung);
-      $kontext = replace_text_links("$exeg_wort", "$repl", $kontext);
-
-
-
-
-    if(!@in_array($row_exeg1['wort'], $arr_wort)){
-     # Die Begriffserklärung wird in ein Array geschrieben, so dass die Ersetzung nur einmal stattfindet, Wenn ein gleiches Wort ein der
-     # Tabelle wort_exegese wäre, dann würde er beim zweiten durchlauf der Schleife die Ãœberschrift im Popup ersetzen:CAPTION,'$exegese_wort'
-     $arr_wort = array($row_exeg1['wort']);
-     
-     $text=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$exeg_wort,&$template) { return makepopup($m[1], $m[2], $m[3], "$exeg_wort", "$template");}, $text);
-     $vorwort=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$exeg_wort,&$template) { return makepopup($m[1], $m[2], $m[3], "$exeg_wort", "$template");}, $vorwort);
-     $botschaft=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$exeg_wort,&$template) { return makepopup($m[1], $m[2], $m[3], "$exeg_wort", "$template");}, $botschaft);
-     $zusammenfassung=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$exeg_wort,&$template) { return makepopup($m[1], $m[2], $m[3], "$exeg_wort", "$template");}, $zusammenfassung);
-     $kontext=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$exeg_wort,&$template) { return makepopup($m[1], $m[2], $m[3], "$exeg_wort", "$template");}, $kontext);
-
-     #$text =preg_replace  ("/\b$row_exeg1[wort]\b/",  "$row_exeg1[wort]<a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $row_exeg1[wort]',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $text);
-     #$botschaft=preg_replace  ("/\b$row_exeg1[wort]\b/",  "$row_exeg1[wort]<a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $row_exeg1[wort]',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $botschaft);
-     #$zusammenfassung =preg_replace  ("/\b$row_exeg1[wort]\b/",  "$row_exeg1[wort]<a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $row_exeg1[wort]',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $zusammenfassung);
-     #$kontext =preg_replace  ("/\b$row_exeg1[wort]\b/",  "$row_exeg1[wort]<a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $row_exeg1[wort]',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $kontext);
-    }
-  
-  }
-  
-  }
-
-  // Begriffserklärung einbinden - Ende
-
-
-  // Automatisch in Lehre und Erkenntnis
-  foreach ($thema2 as $wert)
-  { 
-  # Modifikator /i hinzugefügt, damit Groß- Kleinschreibung nicht beachtet wird: 21.11.2011
-  # Modifikator /i wieder weggenommen, da die Groß- Kleinschreibung nicht mehr korrekt war "Die Hoffnung auf Die Wiederkunft Christi": 05.01.2012
-  $thema_kurz =str_replace  ("/",  "\/"  ,  $wert['thema_kurz']);
-  
-  # Wenn das Thema auch noch als Begriffserklärung vorkommt, dann nicht mit dem Thema von Lehre und Erkenntnis verknüpfen,
-  # sondern später mit einem Popup verknüpfen
-  $result_exeg = $db->query( "SELECT count(*) Anz FROM wort_exegese WHERE upper(wort) = upper('$thema_kurz')" );
-  $row_exeg = $result_exeg->fetch_array();
-
-  
-  if($row_exeg['Anz'] ==0){
-
-    $repl = "__lue-0-$wert[eid]__"; #weid wird nicht benötigt, daher 0
-
-    
-
-    #echo "$thema_kurz -> $repl<br>\n";
-    $text = replace_text_links("$thema_kurz", "$repl", $text);
-    $vorwort = replace_text_links("$thema_kurz", "$repl", $vorwort);
-    $botschaft = replace_text_links("$thema_kurz", "$repl", $botschaft);
-    $zusammenfassung = replace_text_links("$thema_kurz", "$repl", $zusammenfassung);
-    $kontext = replace_text_links("$thema_kurz", "$repl", $kontext);
-    
-    $text=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz", "$template");}, $text);
-    $vorwort=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz", "$template");}, $vorwort);
-    $botschaft=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz", "$template");}, $botschaft);
-    $zusammenfassung=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz", "$template");}, $zusammenfassung);
-    $kontext=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz", "$template");}, $kontext);
-
-
-  }
-  }
-
-
-  # Das geliche nochmals mit Kleinbuchstaben am Anfanng (lcfirst). Dann wird auch "Die Hoffnung auf die Wiederkunft Christi" gefunden statt nur "Die Wiederkunft..."
-  foreach ($thema2 as $wert)
-  { 
-  $thema_kurz =str_replace  ("/",  "\/"  ,  $wert['thema_kurz']);
-  #$thema_kurz=lcfirst($thema_kurz); # Erst ab PHP 5.3
-  $thema_kurz1 = strtolower(substr($thema_kurz,0,1)).substr($thema_kurz,1);
-  
-  # Wenn das Thema auch noch als Begriffserklärung vorkommt, dann nicht mit dem Thema von Lehre und Erkenntnis verknüpfen,
-  # sondern später mit einem Popup verknüpfen
-  $result_exeg = $db->query( "SELECT count(*) Anz FROM wort_exegese WHERE upper(wort) = upper('$thema_kurz')" );
-  $row_exeg = $result_exeg->fetch_array();
-  
-  if($row_exeg['Anz'] ==0){
-      
-      $repl = "__lue-0-$wert[eid]__"; #weid wird nicht benötigt, daher 0
-      
-      $thema_kurz1 = $thema_kurz1;
-      #echo "$thema_kurz -> $repl<br>\n";
-      $text = replace_text_links("$thema_kurz1", "$repl", $text);
-      $vorwort = replace_text_links("$thema_kurz1", "$repl", $vorwort);
-      $botschaft = replace_text_links("$thema_kurz1", "$repl", $botschaft);
-      $zusammenfassung = replace_text_links("$thema_kurz1", "$repl", $zusammenfassung);
-      $kontext = replace_text_links("$thema_kurz1", "$repl", $kontext);
-      
-      $text=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz1,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz1", "$template");}, $text);
-      $vorwort=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz1,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz1", "$template");}, $vorwort);
-      $botschaft=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz1,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz1", "$template");}, $botschaft);
-      $zusammenfassung=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz1,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz1", "$template");}, $zusammenfassung);
-      $kontext=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz1,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz1", "$template");}, $kontext);
-      
-  }
-  }
-
-  // Automatisch in Lehre und Erkenntnis - Ende
-
-
-
-
-
-
-  if ($suchart == 1){
-    $suchopt = "{0,1}";
-  }else{
-    $suchopt = "";
-  }
-  
-  if(!isset($inhalt_hig)){
-    $text2 = $text;
-  }else{
-    $text2 = highlight_results(" ".$text." ", $suchopt, "$inhalt_hig");
-  }
-
-} # Ende: if($row_cache_count['Anz'] == 0){
-
-###########################
-## Ausgabe der Variablen ##
-###########################
-
-$smarty->assign('ansicht_fadeout', "$fadeout");
-$smarty->assign('ansicht_lid', "$lid");
-$smarty->assign('ansicht_headline_text', "$ueberschrift");
-$smarty->assign('ansicht_date', "$datum_wt");
-$smarty->assign('ansicht_weekday', "$wochentag_wt");
-$smarty->assign('ansicht_cat_text', "$cat_text");
-
-
-$result_anzthema = $db->query( "SELECT count(*) Anz
-                                  FROM quelle
-                                 WHERE thema='$row[thema]'");
-$row_anzthema = $result_anzthema->fetch_array();
-
-if($row_anzthema['Anz'] > 1){
- $smarty->assign('ansicht_thema_text_link', "1");
- $smarty->assign('ansicht_thema_text_tid', "$row[thema]");
-}else{
- $smarty->assign('ansicht_thema_text_link', "0");
-}
-$smarty->assign('ansicht_thema_text', "$thema_head");
-
-if($row4['bezeichnung'] != ""){
-  $smarty->assign('ansicht_subthema_exists', "1");
-  $subthema = $row4['bezeichnung'];
-  $smarty->assign('ansicht_subthema_text', "$subthema");
-}
-
-if($row2['bezeichnung'] != ''){
-  $smarty->assign('ansicht_subcat_exists', "1");
-  $subcat_text = $row2['bezeichnung'];
-  $smarty->assign('ansicht_subcat_text', "$subcat_text");
-} 
-
-if ($row['stapgd'] == 'Y' AND $row['ukid'] != '37'){
-  $smarty->assign('ansicht_stapgd_exists', "1");
-  $smarty->assign('ansicht_stapgd_text', "Aus einem Gottesdienst des Stammapostels");
-}
-  
-if ($row['stapgd'] == 'Y' AND $row['ukid'] == '37'){
-  $smarty->assign('ansicht_stapgd1_exists', "1");
-  $smarty->assign('ansicht_stapgd1_text', "Stammapostelsgottesdienst");
-}
-
-if ($lg_datum >= $switch_date){
-  $smarty->assign('ansicht_lg_new', "1");
-}
-
-if(rore($user_admin,'a_pdf','RE')){
-  $smarty->assign('ansicht_icon_pdf_right', "1");
-  $smarty->assign('ansicht_icon_pdf', "<a href=\"pdf_gen.php?lid=$lid\" target='_blank'><img src=\"images/ico_pdf.gif\" border=\"0\"></a>");
-}
-
-if(rore($user_admin,'a_wortbear','RE')){
-  $smarty->assign('ansicht_icon_edit_right', "1");
-  $smarty->assign('ansicht_icon_edit', "<a href=\"wort_bearbeiten.php?action=bearbeiten1&wort=$lid\" target=\"_parent\"><img src=\"images/edit.png\" border=\"0\"></a>");
-}
-
-
-if(rore($user_admin,'a_outlook','RE')){
-  $smarty->assign('ansicht_icon_outlook_right', "1");
-  $smarty->assign('ansicht_icon_outlook', "<a href=\"outlook.php?lid=$lid&typ=1\"><img src=\"images/outlook.gif\" border=\"0\"></a>");
-}
-
-if(rore($user_admin,'a_podcast','RE') and $filename != ''){
-#echo "$row_podcast[dateiname]/$verzeichnis/$filename<br><br>";
-  $smarty->assign('ansicht_icon_podcast_right', "1");
-  $smarty->assign('ansicht_icon_podcast', "<a href=\"$row_podcast[dateiname]/$verzeichnis/$filename\" target='top'><img src=\"images/lautsprecher.gif\" border=\"0\"></a>");
-}
-
-
-
-$smarty->assign('ansicht_textwort_link', "$link");
-
-if(isset($qv_vorhanden) AND $qv_vorhanden == '1'){
-  $smarty->assign('ansicht_qv_vorhanden', "1");
-  $smarty->assign('ansicht_qv_modus', "$row_verweis[querverweis]");
-  $smarty->assign('ansicht_qv_gen', "$querverweis");
-}
-
-
-if($row_lesung['lid'] != ''){
-  #echo "Lesung: $bibellesung<br>";
-  $smarty->assign('ansicht_lesung_vorhanden', "1");
-  $smarty->assign('ansicht_lesung_modus', "$row_lesung1[lesung]");
-  $smarty->assign('ansicht_lesung_gen', "$bibellesung");
-  
-}
-
-if($textwort != ''){
-  $textwort = $textwort;
-  $smarty->assign('ansicht_textwort', "$textwort");
-} 
-
-if($verweis!=''){
-  $kontext .="<br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>";
-  $kontext .="<br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>";
-}
-
-
-
-if ($lg_datum >= $switch_date AND $row['ukid'] == '37'){
-  $smarty->assign('ansicht_inhalt_exists', "2");
-}
-
-  $result_vw = $db->query( "SELECT inhalt
-                              FROM quelle_cache
-                             WHERE link = '$row_link_bibel[bibellink]'
-                               AND lid='$lid'");
-  $row_cache_vw = $result_vw->fetch_array();
-  
-  if($row_cache_vw['inhalt'] != ""){
-    $smarty->assign('ansicht_inhalt_exists', "1"); # Variable muss nochmals gesetzt werden, da die Where Bedinung nicht greifen würde oben, da Variable im Cachemodus leer ist
-    $inhalt =  base64_decode($row_cache_vw['inhalt']);
-    $smarty->assign('ansicht_inhalt_text', "$inhalt");
-  }elseif(trim($text2) != '<br/>' AND trim($text2) != ''){
-    $smarty->assign('ansicht_inhalt_exists', "1");
-    $text2_dec = base64_encode($text2);
-    $sql1 = $db->query( "INSERT INTO quelle_cache ( lid, inhalt, link) VALUES ($lid, '$text2_dec', '$row_link_bibel[bibellink]')" );
-    $cid = $db->insert_id;
-    $smarty->assign('ansicht_inhalt_text', "$text2");
-  }
-
-
-
-if ($lg_datum >= $switch_date AND $row['ukid'] != '37'){ 
-  
-  $result_vw = $db->query( "SELECT vorwort
-                              FROM quelle_cache
-                              WHERE link = '$row_link_bibel[bibellink]'
-                                AND lid='$lid'");
-  $row_cache_vw = $result_vw->fetch_array();
-
-  
-    if($row_cache_vw['vorwort'] != ""){
-      $smarty->assign('ansicht_vorwort_exists', "1"); # Variable muss nochmals gesetzt werden, da die Where Bedinung nicht greifen würde oben, da Variable im Cachemodus leer ist
-      $vorwort = base64_decode($row_cache_vw['vorwort']);
-      $smarty->assign('ansicht_vorwort_text', "$vorwort");
-    }elseif( trim($vorwort) != '<br/>' AND trim($vorwort) != ''){
-      $smarty->assign('ansicht_vorwort_exists', "1");
-      $smarty->assign('ansicht_vorwort_text', "$vorwort");
-      $vorwort_dec =base64_encode($vorwort);
-      $sql1 = $db->query( "UPDATE quelle_cache SET vorwort='$vorwort_dec' WHERE cid=$cid" );
-  }
-}
-
-          
-if ($lg_datum >= $switch_date AND $row['ukid'] != '37'){ 
-  
-  $result_vw = $db->query( "SELECT botschaft
-                              FROM quelle_cache
-                              WHERE link = '$row_link_bibel[bibellink]'
-                                AND lid='$lid'");
-  $row_cache_vw = $result_vw->fetch_array();
-
-  if($row_cache_vw['botschaft'] != ""){
-    $smarty->assign('ansicht_botschaft_exists', "1");
-    $botschaft = base64_decode($row_cache_vw['botschaft']);
-    $smarty->assign('ansicht_botschaft_text', "$botschaft");
-  }elseif(trim($botschaft) != '<br/>' AND trim($botschaft) != ''){
-    $smarty->assign('ansicht_botschaft_exists', "1");
-    $botschaft_dec =base64_encode($botschaft);
-    $sql1 = $db->query( "UPDATE quelle_cache SET botschaft='$botschaft_dec' WHERE cid=$cid" );
-    $smarty->assign('ansicht_botschaft_text', "$botschaft");
-  }
-  
-}
-
-
-if ($lg_datum >= $switch_date AND $row['ukid'] != '37'){ 
-  
-  
-  $result_vw = $db->query( "SELECT zusammenfassung
-                              FROM quelle_cache
-                             WHERE link = '$row_link_bibel[bibellink]'
-                               AND lid='$lid'" );
-  $row_cache_vw = $result_vw->fetch_array();
-
-  
-  if($row_cache_vw['zusammenfassung'] != ""){
-    $smarty->assign('ansicht_zusammenfassung_exists', "1"); # Variable muss nochmals gesetzt werden, da die Where Bedinung nicht greifen würde oben, da Variable im Cachemodus leer ist
-    $zusammenfassung =  base64_decode($row_cache_vw['zusammenfassung']);
-    $smarty->assign('ansicht_zusammenfassung_text', "$zusammenfassung");
-  }elseif(trim($zusammenfassung) != '<br/>' AND trim($zusammenfassung) != ''){
-    $smarty->assign('ansicht_zusammenfassung_exists', "1");
-    $zusammenfassung_dec = base64_encode($zusammenfassung);
-    $sql1 = $db->query( "UPDATE quelle_cache SET zusammenfassung='$zusammenfassung_dec' WHERE cid=$cid" );
-    $smarty->assign('ansicht_zusammenfassung_text', "$zusammenfassung");
-  }
-  
-  
-}
-
-if ($lg_datum >= $switch_date){ 
-
-  $result_vw = $db->query( "SELECT kontext
-                              FROM quelle_cache
-                             WHERE link = '$row_link_bibel[bibellink]'
-                               AND lid='$lid'" );
-  $row_cache_vw = $result_vw->fetch_array();
-
-  
-  if($row_cache_vw['kontext'] != ""){
-    $smarty->assign('ansicht_kontext_exists', "1");
-    $kontext =  base64_decode($row_cache_vw['kontext']);
-    $smarty->assign('ansicht_kontext_text', "$kontext");
-  }elseif(trim($kontext) != '<br/>' AND trim($kontext) != ''){
-    $smarty->assign('ansicht_kontext_exists', "1");
-    $kontext_dec = base64_encode($kontext);
-    $sql1 = $db->query( "UPDATE quelle_cache SET kontext='$kontext_dec' WHERE cid=$cid" );
-    $smarty->assign('ansicht_kontext_text', "$kontext");
-  }
-  
-  
-  
-}
-} //Ende Action
-
-if ($action == 'thema') {
-$tid = $_GET['tid'];
-
-
-  function kurzer_text($string,$laenge){ 
-      $origin=strlen($string);
-      $stri_arr=explode(" ",$string);
-      $anzzahl=count($stri_arr);
-      $gekuerzt=0;
-      $string="";
-      while($gekuerzt<$anzzahl){ 
-          $string_alt=$string;
-          $string=$string." ".$stri_arr[$gekuerzt];
-          $gekuerzt++;
-          if(strlen($string)>$laenge){ 
-              $gekuerzt=$anzzahl; 
-              $string=$string_alt;
-          } 
-      } 
-      if($laenge<$origin){ 
-          $string=$string."<nobr>&nbsp;<b>...</b></nobr>";
-      } 
-      return $string; 
-  }
-  
-	  
-    $db = dbconnect();
-  $query = "SELECT a.lid, a.ueberschrift, a.textstelle, a.inhalt, DATE_Format(a.datum, '%d') tag, DATE_Format(a.datum, '%m') monat, DATE_Format(a.datum, '%Y') jahr, b.bezeichnung, c.bezeichnung, a.kid, a.ukid
-              FROM quelle a, kategorie b, unterkategorie c
-             WHERE a.kid=b.kid
-               AND a.ukid=c.ukid
-               AND thema = '$tid'
-               AND a.kid = 1
-               ORDER BY `a`.`datum` ASC
-           ";
-                    
-                    
-  $result = $db->query( $query);
-  $menge = $result->num_rows;
-
-    $ln_zaehler = 0;
-    
-    #$abfrage = "SELECT id FROM links"
-    
-    
-
-    $smarty->assign('anzahltreffer', "$menge");
-    
-    while ($row = $result->fetch_array()){
-
-    
-    
-      if($inhalt == ''){
-        ##$preview = substr(strip_tags($row[inhalt]),0,200)." <b>...</b> ";
-        $preview = kurzer_text(strip_tags($row['inhalt']),200);
-        
-      }else{
-        #$preview = preview(strip_tags($row[inhalt]),trim($_POST[inhalt]));
-        ##$preview = substr(strip_tags($row[inhalt]),0,200)." <b>...</b> ";
-        $preview = kurzer_text(strip_tags($row['inhalt']),200);
-      }
-    
-      
-      $wochentag = date("l", mktime(0,0,0,$row['monat'],$row['tag'],$row['jahr']));
-    
-      switch($wochentag)
-      {
-        case 'Sunday':
-            $wochentag = "So.";
-            break;
-        case 'Monday':
-            $wochentag = "Mo.";
-            break;
-        case 'Tuesday':
-            $wochentag = "Di.";
-            break;
-        case 'Wednesday':
-            $wochentag = "Mi.";
-            break;
-        case 'Thursday':
-            $wochentag = "Do.";
-            break;
-        case 'Friday':
-            $wochentag = "Fr.";
-            break;
-        case 'Saturday':
-            $wochentag = "Sa.";
-            break;
-      }
-      
-      $result1 = $db->query("SELECT bezeichnung FROM kategorie WHERE kid='$row[kid]'");
-      $row1 = $result1->fetch_array();
-
-      $result2 = $db->query("SELECT bezeichnung FROM unterkategorie WHERE ukid='$row[ukid]'");
-      $row2 = $result2->fetch_array();
-
-      
-      $ln_zaehler = $ln_zaehler + 1;
-        
-      if($art == 'exact'){ // Übergabe für Highligthing. Wenn exact, dann darf bei Begriff nicht Gottesdienst hervorgehoben werden
-        $suchart = 0;
-      }else{
-        $suchart = 1;
-      }
-                  
-      $inhalt_hig = urlencode(serialize($_POST['inhalt']));
-      $row['suchart'] = $suchart;
-      $row['inhalt_hig'] = $inhalt_hig;
-      $row['kategorie'] = $row1['bezeichnung'];
-      $row['unterkategorie'] = $row2['bezeichnung'];
-      $row['preview'] = $preview;
-      $row['wochentag'] = $wochentag;
-      $value3[] = $row;
-    }
-    $smarty->assign('table_data3', $value3);
-
-}
-## Ausgabe Variablen Ende ##
-
-$smarty->assign('action', "$action");
-$smarty->display("$template/$templatename");
-?>
\ No newline at end of file
diff --git a/ansicht.php_lut84_20180219 b/ansicht.php_lut84_20180219
deleted file mode 100644
index 7fbe9348..00000000
--- a/ansicht.php_lut84_20180219
+++ /dev/null
@@ -1,847 +0,0 @@
-<?php
-# Fuer debugging
-#error_reporting(E_ALL);
-#ini_set('display_errors', 1);
-#echo __LINE__."<br>";	
-session_start();
-#error_reporting(E_ALL);
-#ini_set('display_errors', 1);
-
-require_once("config/ftpanbindung.php");     // f&uuml;gt die FTP-anbindung ein
-
-include_once 'classes/lg-on_Smarty.class.php';
-$smarty = new lgon_Smarty();
-#$smarty->caching = true;
-require_once("config.inc.php");
-require_once("func_rollenrechte.php");
-$templatename = substr(basename($_SERVER['PHP_SELF']),0,-3)."html";
-require_once "language/german.inc.php";
-require_once("func_highlight.php");
-require_once("func_ansicht.php");
-require_once("bibellookup.php");
-
-
-$lid = $_GET['lid'];
-
-$sid = session_id();
-$datum=date("Y-m-d H:i:s");
-$result = $db->query( "INSERT INTO historie (vaid, datum, session_id, art, art_id) VALUES ('$user_vaid;', '$datum', '$sid', 'L', '$lid')" );
-
-$suchart = @$_GET['suchart'];
-$fadeout = @$_GET['fadeout'];
-
-
-if(isset($_GET['inhalt_hig'])){
-  $inhalt_hig = stripslashes($_GET['inhalt_hig']);
-  $inhalt_hig = unserialize("$inhalt_hig");
-}
-
-$verweis = @stripslashes($_GET['verweis']);
-$verweis = @unserialize($verweis);
-
-
-
-if ($user_admin == ""){ require("index.php"); exit;} //Wenn man nicht angemeldet ist, darf man nicht auf die Seite
-
-$db = dbconnect();
-$result = $db->query( "SELECT lid, txt_anz_buch, txt_buch, txt_kapitel, txt_vers, Ueberschrift, thema, unterthema, textstelle, replace(replace(replace(textstelle, ' aus ', ''), 'vgl',''), ' ','') textstelle2, vorwort, botschaft, textwort, inhalt, zusammenfassung, kontext, DATE_Format(datum, '%d.%m.%Y') as datum, kid, ukid, DATE_Format(datum, '%d') tag, DATE_Format(datum, '%m') monat, DATE_Format(datum, '%Y') jahr, ukid, DATE_Format(datum, '%Y-%m-%d')AS datum_berechnung, stapgd
-                         FROM quelle
-                        WHERE lid='$lid'");
-$row = $result->fetch_array();
-
-$result_link_bibel = $db->query( "SELECT bibellink
-                                     FROM profil
-                                    WHERE user='$user_admin'");
-$row_link_bibel = $result_link_bibel->fetch_array();
-
-$result_count = $db->query( "SELECT count(*) Anz
-                              FROM quelle_cache
-                             WHERE link = '$row_link_bibel[bibellink]'
-                               AND lid='$lid'");
-$row_cache_count = $result_count->fetch_array();
-
-$ueberschrift = html_entity_decode($row['Ueberschrift']);
-
-# typografische Anführungszeichen im UTF8 Format Korrekt darstellen
-$ueberschrift = preg_replace("/\x{0084}/u","&bdquo;",$ueberschrift);
-$ueberschrift = preg_replace("/\x{0093}/u","&ldquo;",$ueberschrift);
-
-
-
-$wochentag = date("l", mktime(0,0,0,$row['monat'],$row['tag'],$row['jahr']));
-
-$result_gd = $db->query( "SELECT wgd FROM profil WHERE user = '$user_admin'");
-$row_gd = $result_gd->fetch_array();
-
-if($wochentag == 'Wednesday' AND $row_gd['wgd'] != '0' AND ($row['ukid'] == '1')){  // Hintergrund kommt aus der wort_wahl.php. Es gibt einige Gottesdienste, die auf einen Mittwoch fallen (1. vom Monat) aber kein Tag addiert werden darf, daher: Wann muss ein Tag (faktor) addiert werden, generell, wenn Wochengottesdienst, wenn Faktor im Profil != 0 und wenn unterkategorie 1 (GD normal) ist. Bei allen anderen Gottesdiensten bleibt der Mittwoch erhalten. (Buß und Bettag ist Mittwoch, Erntedank bleibt auch am 1. des Monats)
-  $datum_wt = date("d.m.Y", mktime(0,0,0,$row['monat'],$row['tag']+$row_gd['wgd'],$row['jahr']));
-  $wochentag = date("l", mktime(0,0,0,$row['monat'],$row['tag']+$row_gd['wgd'],$row['jahr']));
-}else{
-  $wochentag = date("l", mktime(0,0,0,$row['monat'],$row['tag'],$row['jahr']));
-  $datum_wt = date("d.m.Y", mktime(0,0,0,$row['monat'],$row['tag'],$row['jahr']));
-}
-
-
-
-switch($wochentag)
-{
-  case 'Sunday':
-      $wochentag_wt = "So.";
-      break;
-  case 'Monday':
-      $wochentag_wt = "Mo.";
-      break;
-  case 'Tuesday':
-      $wochentag_wt = "Di.";
-      break;
-  case 'Wednesday':
-      $wochentag_wt = "Mi.";
-      break;
-  case 'Thursday':
-      $wochentag_wt = "Do.";
-      break;
-  case 'Friday':
-      $wochentag_wt = "Fr.";
-      break;
-  case 'Saturday':
-      $wochentag_wt = "Sa.";
-      break;
-}
-
-
-$result1 = $db->query( "SELECT bezeichnung
-                          FROM kategorie
-                         WHERE kid='$row[kid]'");
-$row1 = $result1->fetch_array();
-$cat_text = $row1['bezeichnung'];
-
-$result2 = $db->query( "SELECT bezeichnung
-                          FROM unterkategorie
-                         WHERE ukid='$row[ukid]'");
-$row2 = $result2->fetch_array();
-
-$result3 = $db->query( "SELECT bezeichnung
-                          FROM thema
-                         WHERE tid='$row[thema]'");
-$row3 = $result3->fetch_array();
-$thema_head = $row3['bezeichnung'];
-
-$result4 = $db->query( "SELECT bezeichnung
-                          FROM unterthema
-                         WHERE tid='$row[thema]'
-                           AND utid='$row[unterthema]'");
-$row4 = $result4->fetch_array();
-
-
-
-
-$textwort = strip_tags($row['textwort']);
-if($row_cache_count['Anz'] == 0){
-  $vorwort = strip_tags($row['vorwort'], '<br>,<b>,<strong>,<ul>,<li>,<ol>,<a>');
-  $botschaft = strip_tags($row['botschaft'], '<br>,<b>,<strong>,<ul>,<li>,<ol>,<a>');
-  $zusammenfassung = strip_tags($row['zusammenfassung'], '<br>,<b>,<strong>,<ul>,<li>,<ol>,<a>');
-  $kontext = strip_tags($row['kontext'], '<br>,<b>,<strong>,<ul>,<li>,<ol>,<a>');
-  $text = strip_tags($row['inhalt'], '<br>,<b>,<strong>,<ul>,<li>,<ol>,<a>,<table>,<tr>,<td>,<h1>,<h2>,<h3>,<img>');
- 
-  # Sonst kommt empty_string Fehlermeldung von Dom-Document. Besonders bei uralten LGs
-  if($vorwort == ''){$vorwort="<br />";}
-  if($botschaft == ''){$botschaft="<br />";}
-  if($zusammenfassung == ''){$zusammenfassung="<br />";}
-  if($kontext == ''){$kontext="<br />";}
-  if($text == ''){$text="<br />";}
-
-
-  $kontext = str_replace(' "', ' \"', $kontext);
-  $kontext =preg_replace_callback("/([0-9]\s*)?()(Sir|Mo|Jos|Ri|Rut|Sam|K&ouml;n|Chr|Esr|Neh|Est|Hiob|Ps|Spr|Pred|Hld|Jes|Jer|Kla|Klgl|Hes|St zu Dan|Dan|Hos|Joel|Am|Obd|Jona|Mi|Nah|Hab|Zef|Hag|Sach|Weish|Mal|Tob|Mt|Mk|Lk|Luk|Joh|Jh|Apg|R&ouml;m|Rom|Kor|Gal|Eph|Phil|Kol|Thess|Tim|Tit|Phlm|Ptr|Petr|Joh|Hbr|Hebr|Jak|Jk|Jud|Offb|Off)(\s*)".
-                                 "([0-9]{1,3})(\,\s*)?(aus\s*)?([0-9]{0,3})/", function($m) use (&$lid) { return refill($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $m[9], $lid);}, $kontext);
-                                 
-  $bibellink = $row_link_bibel['bibellink'];
-  $kontext=preg_replace_callback("/([0-9][0-9]?\.\s*)?(Makkab&auml;er|Johannes|Mose|K&ouml;nige|Chronik|Korinther|Samuel|Thessalonicher|Timotheus|Petrus|Gebet Manasses|St&uuml;cke zu Daniel|St&uuml;cke zu Ester|Baruch|Weisheit|Judit|Judith|Sirach|Josua|Richter|Rut|Ruth|Esra|Nehemia|Esther|Ester|Hiob|Ijob|Psalm|Spr&uuml;che|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Ezechiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matth&auml;us|Markus|Lukas|Apostelgeschichte|R&ouml;mer|Galater|Epheser|Philipper|Kolosser|Titus|Hebr&auml;er|Jakobus|Offenbarung|Philemon|Judas)(\s*[0-9]{1,3})(,\s*)?(\s*aus\s*|\s*Verse\s*|\s*Vers\s*)?([0-9]{0,3})?(\s*\-\s*|\s*\.\s*)?([0-9]{0,3})?/", function($m) use (&$lid,&$bibellink) { return makeLink($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $lid, $bibellink);}, $kontext);
-  
-  $suchmuster = '/(KNK) (([0-9]{1,2}\.?){0,5})/';
-  $kontext=preg_replace_callback($suchmuster, function($m) { return makeKNK($m[1], $m[2]);}, $kontext);
-  
-  $suchmuster2 = '/(KNK-FA) ([0-9]{1,3})/';
-  $kontext=preg_replace_callback($suchmuster2, function($m) { return makeKNK_FA($m[1], $m[2]);}, $kontext);
-  
-  
-  $zusammenfassung = str_replace(' "', ' \"', $zusammenfassung);
-  $zusammenfassung =preg_replace_callback("/([0-9]\s*)?()(Sir|Mo|Jos|Ri|Rut|Sam|K&ouml;n|Chr|Esr|Neh|Est|Hiob|Ps|Spr|Pred|Hld|Jes|Jer|Kla|Klgl|Hes|St zu Dan|Dan|Hos|Joel|Am|Obd|Jona|Mi|Nah|Hab|Zef|Hag|Sach|Weish|Mal|Tob|Mt|Mk|Lk|Luk|Joh|Jh|Apg|R&ouml;m|Rom|Kor|Gal|Eph|Phil|Kol|Thess|Tim|Tit|Phlm|Ptr|Petr|Joh|Hbr|Hebr|Jak|Jk|Jud|Offb|Off)(\s*)".
-                                  "([0-9]{1,3})(\,\s*)?(aus\s*)?([0-9]{0,3})/", function($m) use (&$lid) { return refill($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $m[9], $lid);}, $zusammenfassung);
-                                  
-  $zusammenfassung=preg_replace_callback("/([0-9][0-9]?\.\s*)?(Makkab&auml;er|Johannes|Mose|K&ouml;nige|Chronik|Korinther|Samuel|Thessalonicher|Timotheus|Petrus|Gebet Manasses|St&uuml;cke zu Daniel|St&uuml;cke zu Ester|Baruch|Weisheit|Judit|Judith|Sirach|Josua|Richter|Rut|Ruth|Esra|Nehemia|Esther|Ester|Hiob|Ijob|Psalm|Spr&uuml;che|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Ezechiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matth&auml;us|Markus|Lukas|Apostelgeschichte|R&ouml;mer|Galater|Epheser|Philipper|Kolosser|Titus|Hebr&auml;er|Jakobus|Offenbarung|Philemon|Judas)(\s*[0-9]{1,3})(,\s*)?(\s*aus\s*|\s*Verse\s*|\s*Vers\s*)?([0-9]{0,3})?(\s*\-\s*|\s*\.\s*)?([0-9]{0,3})?/", function($m) use (&$lid,&$bibellink) { return makeLink($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $lid, $bibellink);}, $zusammenfassung);
-
-  $vorwort = str_replace(' "', ' \"', $vorwort);
-  $vorwort=preg_replace_callback("/([0-9]\s*)?()(Sir|Mo|Jos|Ri|Rut|Sam|K&ouml;n|Chr|Esr|Neh|Est|Hiob|Ps|Spr|Pred|Hld|Jes|Jer|Kla|Klgl|Hes|St zu Dan|Dan|Hos|Joel|Am|Obd|Jona|Mi|Nah|Hab|Zef|Hag|Sach|Weish|Mal|Tob|Mt|Mk|Lk|Luk|Joh|Jh|Apg|R&ouml;m|Rom|Kor|Gal|Eph|Phil|Kol|Thess|Tim|Tit|Phlm|Ptr|Petr|Joh|Hbr|Hebr|Jak|Jk|Jud|Offb|Off)(\s*)".
-                         "([0-9]{1,3})(\,\s*)?(aus\s*)?([0-9]{0,3})/", function($m) use (&$lid) { return refill($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $m[9], $lid);}, $vorwort);
-                         
-  $vorwort=preg_replace_callback("/([0-9][0-9]?\.\s*)?(Makkab&auml;er|Johannes|Mose|K&ouml;nige|Chronik|Korinther|Samuel|Thessalonicher|Timotheus|Petrus|Gebet Manasses|St&uuml;cke zu Daniel|St&uuml;cke zu Ester|Baruch|Weisheit|Judit|Judith|Sirach|Josua|Richter|Rut|Ruth|Esra|Nehemia|Esther|Ester|Hiob|Ijob|Psalm|Spr&uuml;che|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Ezechiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matth&auml;us|Markus|Lukas|Apostelgeschichte|R&ouml;mer|Galater|Epheser|Philipper|Kolosser|Titus|Hebr&auml;er|Jakobus|Offenbarung|Philemon|Judas)(\s*[0-9]{1,3})(,\s*)?(\s*aus\s*|\s*Verse\s*|\s*Vers\s*)?([0-9]{0,3})?(\s*\-\s*|\s*\.\s*)?([0-9]{0,3})?/", function($m) use (&$lid,&$bibellink) { return makeLink($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $lid, $bibellink);}, $vorwort);
-
-  $botschaft = str_replace(' "', ' \"', $botschaft);
-  $botschaft=preg_replace_callback("/([0-9]\s*)?()(Sir|Mo|Jos|Ri|Rut|Sam|K&ouml;n|Chr|Esr|Neh|Est|Hiob|Ps|Spr|Pred|Hld|Jes|Jer|Kla|Klgl|Hes|St zu Dan|Dan|Hos|Joel|Am|Obd|Jona|Mi|Nah|Hab|Zef|Hag|Sach|Weish|Mal|Tob|Mt|Mk|Lk|Luk|Joh|Jh|Apg|R&ouml;m|Rom|Kor|Gal|Eph|Phil|Kol|Thess|Tim|Tit|Phlm|Ptr|Petr|Joh|Hbr|Hebr|Jak|Jk|Jud|Offb|Off)(\s*)".
-                           "([0-9]{1,3})(\,\s*)?(aus\s*)?([0-9]{0,3})/", function($m) { return refill($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $m[9], $lid);}, $botschaft);
-                           
-  $botschaft=preg_replace_callback("/([0-9][0-9]?\.\s*)?(Makkab&auml;er|Johannes|Mose|K&ouml;nige|Chronik|Korinther|Samuel|Thessalonicher|Timotheus|Petrus|Gebet Manasses|St&uuml;cke zu Daniel|St&uuml;cke zu Ester|Baruch|Weisheit|Judit|Judith|Sirach|Josua|Richter|Rut|Ruth|Esra|Nehemia|Esther|Ester|Hiob|Ijob|Psalm|Spr&uuml;che|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Ezechiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matth&auml;us|Markus|Lukas|Apostelgeschichte|R&ouml;mer|Galater|Epheser|Philipper|Kolosser|Titus|Hebr&auml;er|Jakobus|Offenbarung|Philemon|Judas)(\s*[0-9]{1,3})(,\s*)?(\s*aus\s*|\s*Verse\s*|\s*Vers\s*)?([0-9]{0,3})?(\s*\-\s*|\s*\.\s*)?([0-9]{0,3})?/", function($m) use (&$lid,&$bibellink) { return makeLink($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $lid, $bibellink);}, $botschaft);
-
-}
-
-$textstelle = str_replace (array(" ", "aus", "vgl"), array("", "", ""), $row['textstelle']);
-
-$date_nlg  = mktime(0, 0, 0, 12, 1, 2007);  // Datum ab dem neue LGs gelten
-$date_nlg_format = date("Y-m-d", $date_nlg);  // ISO-8601 Format wie in der Datenbank: Formatierung f&uuml;r Vergleiche erforderlich
-
-$switch_date = strtotime ($date_nlg_format); //Umrechnung des Fristgrenztages in eine Zahl
-$lg_datum = strtotime ($row['datum_berechnung']); // Umrechnung des Enddatums in eine Zahl
-
-$result_podcast = $db->query( "SELECT dateiname
-	                           FROM admin_rechte
-	                          WHERE admin_rolle = 'a_podcast'");
-$row_podcast = $result_podcast->fetch_array();
-
-$verzeichnis = "$row[jahr]-$row[monat]";
-$suchbegriff = "$row[jahr]_$row[monat]_$row[tag].";
-
-   
-   $verzeichnis3 = "/Leitgedanken/Podcast/$verzeichnis/";
-   $VerbindungsID = @ftp_connect($FTPServer3, 21, 1); # Timeout auf 1 Sek
-   $LoginErgebnis = @ftp_login($VerbindungsID, $FTPUser3, $FTPPasswort3);
-
-
-
-   $filename = 0;
-   $filename_podcast_lesung = 0;
-   
-   if($VerbindungsID && $LoginErgebnis)
-   {
-     $smarty->assign('ftp_ansicht_connect', "1");
-     $Dateiliste=ftp_nlist($VerbindungsID, $verzeichnis3);
-     @sort($Dateiliste);
-     for($i=0; $i<count($Dateiliste); $i++)
-     {
-     
-             $dateiname = basename($Dateiliste[$i]);
-
-          
-          if($row['ukid'] != 5){ #Jugendgottesdienst ist der Dateiname anders
-            if($row['ukid'] != 37){
-	
-             $pos = strpos($dateiname, $suchbegriff);
-#echo "$dateiname -> $suchbegriff -> $pos<br>";
-             if($pos > 0){
-               $filename = $dateiname;
-             }
-            }
-          }else{
-             $suchbegriff = "$row[jahr]_$row[monat]_JGD.";
-             $suchbegriff2 = "G_$row[jahr]_$row[monat].";
-             $pos = strpos($dateiname, $suchbegriff);
-             $pos2 = strpos($dateiname, $suchbegriff2);
-
-             if($pos != '' or $pos2 != ''){
-               $filename = $dateiname;
-#echo "pos: $pos -> pos2: $pos2 -> $filename<br>";
-             }
-          }
-          
-             $suchbegriff_lesung = "$row[jahr]_$row[monat]_$row[tag]_Lesung";
-             $pos = strpos($dateiname, $suchbegriff_lesung);
-             if($pos > 0){
-               $filename_podcast_lesung = $dateiname;
-             }
-          
-
-     }
-   }
-
-#echo "$row_podcast[dateiname]/$verzeichnis/$filename<br><br>";
-
-
-// Preg auf vollständige Bibelbücher überprüft
-$textstelle_stopmark=preg_replace_callback("/^([0-9]\.)*\s*".	//1 a
-  				 "(Philemon|Judas|Johannes|Mose|Könige|Korinther|Petrus|Sirach|Josua|Richter|Rut|Ruth|Samuel|Chronik|Esra|Nehemia|Esther|Ester|Hiob|Psalm|Sprüche|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Judit|Weisheit|Baruch|Makkabäer|Stücke zu Ester|Stücke zu Daniel|Gebet Manasses|Matthäus|Markus|Lukas|Apostelgeschichte|Römer|Galater|Epheser|Philipper|Kolosser|Thessalonicher|Timotheus|Titus|Hebräer|Jakobus|Offenbarung)\s*". //2
-  				 "([0-9]{1,3})". 	//3  c
-  				 "(\,)?\s*". 		//4  d
-  				 "(aus)?\s*".		//5  e
-  				 "([0-9]{0,3})".	//6  f
-  				 "(\.|-)?".		//7  g
-  				 "([0-9]{0,3})?".	//8  h
-  				 "(\.|-)?".		//9  i
-  				 "([0-9]{0,3})".        //10 j
-  				 "$/", function($m) { return splitword_stopmark($m[1], $m[2], $m[3], $m[6], $m[7], $m[8], $m[9], $m[10]);},
- 				 $row['textstelle']);
-
-// stopmark Ende
-
-
-
-// Textwort: Link zu verschiedenen Onlinebibeln
-if($row_link_bibel['bibellink'] == 'lokal'){
-  $link = "<a class=\"biblelink\" href=\"javascript:bib_link_lokal1('bibelpopup/bib_popup.php?wort=$row[textstelle]&stopmark=$textstelle_stopmark&vers_select=Y','Bibellink','640','480','center','front');\">$row[textstelle]</a>";
-  
-}elseif($row_link_bibel['bibellink'] == 'bibleserver'){
-  $link = "<a href=http://www.bibleserver.com/go.php?lang={de}&bible={LUT84}&ref={$textstelle} target='_blank'>$row[textstelle]</a>";
-}
-
-  $result_verweis = $db->query( "SELECT querverweis
-                                   FROM profil
-                                  WHERE user='$user_admin'");
-  $row_verweis = $result_verweis->fetch_array();
-
-  
-  require_once("verweise.php");
-  $querverweis = verweise($lid, $user_admin, $template);
-  # Erst werden die Verweise immer erzeugt, und ich cache geschrieben, dann abgefragt, wenn was im Cac dann qv_vorhanden =1. 
-  # Verweisfenster wird dann nur eingeblendet, wenn ein Verweis vorhanden ist.
-
-  $result_te_cache = $db->query( "SELECT erg_lid
-                                    FROM quelle_verweise_cache
-                                   WHERE erg_lid = $lid" );
-  if($result_te_cache->num_rows > 0){
-    $qv_vorhanden = "1";
-  }
-
-
-######################################################################
-## Prüfung, ob Bibellesung vorhanden ist
-######################################################################
-
-  $result_lesung = $db->query( "SELECT lid
-                                  FROM quelle
-                                 WHERE datum='$row[datum_berechnung]'
-                                   AND kid = 12
-                                   AND lid != '$lid'");
-  $row_lesung = $result_lesung->fetch_array();
-
-
-if($row_lesung != ''){
-  
-  $result_lesung1 = $db->query( "SELECT lesung
-                                  FROM profil
-                                 WHERE user='$user_admin'");
-  $row_lesung1 = $result_lesung1->fetch_array();
-  
-  
-  require_once("lesung.php");
-  
-  
-  $bibellesung = lesung($row['datum_berechnung'], $template, $verzeichnis, $filename_podcast_lesung);
-
-}
-
-######################################################################
-## Ende Prüfung, ob Bibellesung vorhanden ist
-######################################################################
-
-
-
-if($row_cache_count['Anz'] == 0){
-  $text = str_replace(' "', ' \"', $text);
-  $text=preg_replace_callback("/([0-9]\s*)?()?(Sir|Mo|Jos|Ri|Rut|Sam|K&ouml;n|Chr|Esr|Neh|Est|Hiob|Ps|Spr|Pred|Hld|Jes|Jer|Kla|Klgl|Hes|St zu Dan|Dan|Hos|Joel|Am|Obd|Jona|Mi|Nah|Hab|Zef|Hag|Sach|Weish|Mal|Tob|Mt|Mk|Lk|Luk|Joh|Jh|Apg|R&ouml;m|Rom|Kor|Gal|Eph|Phil|Kol|Thess|Tim|Tit|Phlm|Ptr|Petr|Joh|Hbr|Hebr|Jak|Jk|Jud|Offb|Off)(\s*)".
-                      "([0-9]{1,3})(\,\s*)?(aus\s*)?([0-9]{0,3})/", function($m) use (&$lid) { return refill($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $m[9], $lid);}, $text);
-
-  $text = str_replace("$verweis","<a name='verweis'>$verweis</a>",$text);
-  $text=preg_replace_callback("/([0-9][0-9]?\.\s*)?(Makkab&auml;er|Johannes|Mose|K&ouml;nige|Chronik|Korinther|Samuel|Thessalonicher|Timotheus|Petrus|Gebet Manasses|St&uuml;cke zu Daniel|St&uuml;cke zu Ester|Baruch|Weisheit|Judit|Judith|Sirach|Josua|Richter|Rut|Ruth|Esra|Nehemia|Esther|Ester|Hiob|Ijob|Psalm|Spr&uuml;che|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Ezechiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matth&auml;us|Markus|Lukas|Apostelgeschichte|R&ouml;mer|Galater|Epheser|Philipper|Kolosser|Titus|Hebr&auml;er|Jakobus|Offenbarung|Philemon|Judas)(\s*[0-9]{1,3})(,\s*)?(\s*aus\s*|\s*Verse\s*|\s*Vers\s*)?([0-9]{0,3})?(\s*\-\s*|\s*\.\s*)?([0-9]{0,3})?/", function($m) use (&$lid,&$bibellink) { return makeLink($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $lid, $bibellink);}, $text);
-  $suchmuster = '/(KNK) (([0-9]{1,2}\.?){0,5})/';
-  $text=preg_replace_callback($suchmuster, function($m) { return makeKNK($m[1], $m[2]);}, $text);
-  
-  $suchmuster2 = '/(KNK-FA) ([0-9]{1,3})/';
-  $text=preg_replace_callback($suchmuster2, function($m) { return makeKNK_FA($m[1], $m[2]);}, $text);
-
-}
-
-
-
-
-
-// Automatisch in Lehre und Erkenntnis verweisen - Start
-if($row_cache_count['Anz'] == 0){
-
-  $db = dbconnect();
-  $query_lue = "SELECT eid, thema
-                  FROM lue_quelle";
-  $result_lue = $db->query( $query_lue);
-  $ln_zaehler =0;
-
-  while ($row_lue = $result_lue->fetch_array()){
-    $thema = strpos("$row_lue[thema]", "Teil");  // Ermitteln wo das Wort "Teil" steht
-
-    if($thema >0){
-      $thema = substr("$row_lue[thema]",0 ,$thema ); // Alles vor dem Wort "Teil" anzeigen
-    }else{
-      $thema = "$row_lue[thema]";
-    }
-    $thema = trim($thema);
-
- 
- 
- while(substr($thema, -1) =='-' or substr($thema, -1)==':' or substr($thema, -1) =='(' or substr($thema, -1) ==' '){
-  $thema =trim($thema);
-  $thema =substr($thema, 0, -1);
-  $thema =trim($thema);
- }
-
-  if (!@in_array($thema, $thema1)) {
-    #echo "$thema<br>";
-
-    $thema2[$ln_zaehler]['thema_kurz'] =$thema;
-    $thema2[$ln_zaehler]['eid'] = $row_lue['eid'];
-    $thema2[$ln_zaehler]['thema'] =$row_lue['thema'];
-    
-    $thema1[] = $thema;
-    $ln_zaehler++;  
-  }  
-
- }
-
- #print_r($thema2);
-
-
- // Automatisch in Lehre und Erkenntnis verweisen - Ende
-
-
-
-
-
-
- #print_r($thema2);
-
-  // Automatisch in Lehre und Erkenntnis und Begriffserklärung verweisen
-  foreach ($thema2 as $wert)
-  { 
-  # Modifikator /i hinzugefügt, damit Groß- Kleinschreibung nicht beachtet wird: 21.11.2011
-  # Modifikator /i wieder weggenommen, da die Groß- Kleinschreibung nicht mehr korrekt war "Die Hoffnung auf Die Wiederkunft Christi": 05.01.2012
-  $thema_kurz =str_replace  ("/",  "\/"  ,  $wert['thema_kurz']);
-  
-  # Wenn das Thema auch noch als Begriffserklärung vorkommt, dann nicht mit dem Thema von Lehre und Erkenntnis verknüpfen,
-  # sondern später mit einem Popup verknüpfen
-  $result_exeg = $db->query( "SELECT count(*) Anz FROM wort_exegese WHERE wort = '$thema_kurz'");
-  $row_exeg = $result_exeg->fetch_array();
-  
-  if($row_exeg['Anz'] >0){
-  
-    $result_exeg3 = $db->query( "SELECT verweis FROM wort_exegese WHERE upper(wort) = upper('$thema_kurz')" );
-    $row_exeg3 = $result_exeg3->fetch_array();
-   
-    $repl = "__lueexeg-$row_exeg3[verweis]-$wert[eid]__";
-    #echo $text;
-    #exit;
-    
-    
-    $text = replace_text_links("$thema_kurz", "$repl", $text);
-    $vorwort = replace_text_links("$thema_kurz", "$repl", $vorwort);
-    $botschaft = replace_text_links("$thema_kurz", "$repl", $botschaft);
-    $zusammenfassung = replace_text_links("$thema_kurz", "$repl", $zusammenfassung);
-    $kontext = replace_text_links("$thema_kurz", "$repl", $kontext);
-
-    $text=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz", "$template");}, $text);
-    $vorwort=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz", "$template");}, $vorwort);
-    $botschaft=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz", "$template");}, $botschaft);
-    $zusammenfassung=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz", "$template");}, $zusammenfassung);
-    $kontext=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz", "$template");}, $kontext);
-    
-
-    #$text =preg_replace  ("/\b$thema_kurz\b/",  "<a class=alue href='lue_ansicht.php?eid=$wert[eid]' title='Lehre und Erkenntnis: $wert[thema]' target='_parent'>$thema_kurz</a><a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $thema_kurz',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $text);
-    #$botschaft =preg_replace  ("/\b$thema_kurz\b/",  "<a class=alue href='lue_ansicht.php?eid=$wert[eid]' title='Lehre und Erkenntnis: $wert[thema]'target='_parent'>$thema_kurz</a><a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $thema_kurz',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $botschaft);
-    #$zusammenfassung =preg_replace  ("/\b$thema_kurz\b/",  "<a class=alue href='lue_ansicht.php?eid=$wert[eid]' title='Lehre und Erkenntnis: $wert[thema]' target='_parent'>$thema_kurz</a><a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $thema_kurz',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $zusammenfassung);
-    #$kontext =preg_replace  ("/\b$thema_kurz\b/",  "<a class=alue href='lue_ansicht.php?eid=$wert[eid]' title='Lehre und Erkenntnis: $wert[thema]' target='_parent'>$thema_kurz</a><a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $thema_kurz',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $kontext);
-  }
-  }
-
-  # Das gleiche nochmals mit Kleinbuchstaben am Anfanng (lcfirst). Dann wird auch "Die Hoffnung auf die Wiederkunft Christi" gefunden statt nur "Die Wiederkunft..."
-  foreach ($thema2 as $wert)
-  { 
-  $thema_kurz =str_replace  ("/",  "\/"  ,  $wert['thema_kurz']);
-  #$thema_kurz1=lcfirst($thema_kurz); # Erst ab PHP 5.3
-  $thema_kurz1 = strtolower(substr($thema_kurz,0,1)).substr($thema_kurz,1);
-  
-  # Wenn das Thema auch noch als Begriffserklärung vorkommt, dann nicht mit dem Thema von Lehre und Erkenntnis verknüpfen,
-  # sondern später mit einem Popup verknüpfen
-  $result_exeg = $db->query( "SELECT count(*) Anz FROM wort_exegese WHERE wort = '$thema_kurz1'" );
-  $row_exeg = $result_exeg->fetch_array();
-
-  
-  if($row_exeg['Anz'] >0){
-
-    $result_exeg3 = $db->query( "SELECT verweis FROM wort_exegese WHERE upper(wort) = upper('$thema_kurz1')" );
-    $row_exeg3 = $result_exeg3->fetch_array();
-
-    
-    
-    $repl = "__lueexeg-$row_exeg3[verweis]-$wert[eid]__";
-    #echo $text;
-    #exit;
-    
-    $thema_kurz1 = $thema_kurz1;
-    $text = replace_text_links("$thema_kurz1", "$repl", $text);
-    $vorwort = replace_text_links("$thema_kurz1", "$repl", $vorwort);
-    $botschaft = replace_text_links("$thema_kurz1", "$repl", $botschaft);
-    $zusammenfassung = replace_text_links("$thema_kurz1", "$repl", $zusammenfassung);
-    $kontext = replace_text_links("$thema_kurz1", "$repl", $kontext);
-   
-    $text=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz1,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz1", "$template");}, $text);
-    $vorwort=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz1,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz1", "$template");}, $vorwort);
-    $botschaft=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz1,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz1", "$template");}, $botschaft);
-    $zusammenfassung=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz1,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz1", "$template");}, $zusammenfassung);
-    $kontext=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz1,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz1", "$template");}, $kontext);
-    
-
-  
-
-    #$text =preg_replace  ("/\b$thema_kurz1\b/",  "<a class=alue href='lue_ansicht.php?eid=$wert[eid]' title='Lehre und Erkenntnis: $wert[thema]' target='_parent'>$thema_kurz1</a><a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $thema_kurz',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $text);
-    #$botschaft =preg_replace  ("/\b$thema_kurz1\b/",  "<a class=alue href='lue_ansicht.php?eid=$wert[eid]' title='Lehre und Erkenntnis: $wert[thema]'target='_parent'>$thema_kurz1</a><a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $thema_kurz',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $botschaft);
-    #$zusammenfassung =preg_replace  ("/\b$thema_kurz1\b/",  "<a class=alue href='lue_ansicht.php?eid=$wert[eid]' title='Lehre und Erkenntnis: $wert[thema]' target='_parent'>$thema_kurz1</a><a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $thema_kurz',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $zusammenfassung);
-    #$kontext =preg_replace  ("/\b$thema_kurz1\b/",  "<a class=alue href='lue_ansicht.php?eid=$wert[eid]' title='Lehre und Erkenntnis: $wert[thema]' target='_parent'>$thema_kurz1</a><a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $thema_kurz',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $kontext);
-  }
-  }
-  // Automatisch in Lehre und Erkenntnis und Begriffserklärung verweisen - Ende
-
-
-  // Begriffserklärung einbinden
-
-
-
-
-  $query_exeg1 = "SELECT distinct wort, verweis
-                    FROM wort_exegese";
-  $result_exeg1 = $db->query( $query_exeg1);
-
-  while ($row_exeg1 = $result_exeg1->fetch_array()){
-
-    if (!get_array_key($row_exeg1['wort'], $thema2)) {
-  
-  
-      $repl = "__exeg-$row_exeg1[verweis]-0__"; #eid wird nicht benötigt, daher 0
-      $exeg_wort = $row_exeg1['wort'];
-      $text = replace_text_links("$exeg_wort", "$repl", $text);
-      $vorwort = replace_text_links("$exeg_wort", "$repl", $vorwort);
-      $botschaft = replace_text_links("$exeg_wort", "$repl", $botschaft);
-      $zusammenfassung = replace_text_links("$exeg_wort", "$repl", $zusammenfassung);
-      $kontext = replace_text_links("$exeg_wort", "$repl", $kontext);
-
-
-
-
-    if(!@in_array($row_exeg1['wort'], $arr_wort)){
-     # Die Begriffserklärung wird in ein Array geschrieben, so dass die Ersetzung nur einmal stattfindet, Wenn ein gleiches Wort ein der
-     # Tabelle wort_exegese wäre, dann würde er beim zweiten durchlauf der Schleife die Ãœberschrift im Popup ersetzen:CAPTION,'$exegese_wort'
-     $arr_wort = array($row_exeg1['wort']);
-     
-     $text=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$exeg_wort,&$template) { return makepopup($m[1], $m[2], $m[3], "$exeg_wort", "$template");}, $text);
-     $vorwort=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$exeg_wort,&$template) { return makepopup($m[1], $m[2], $m[3], "$exeg_wort", "$template");}, $vorwort);
-     $botschaft=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$exeg_wort,&$template) { return makepopup($m[1], $m[2], $m[3], "$exeg_wort", "$template");}, $botschaft);
-     $zusammenfassung=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$exeg_wort,&$template) { return makepopup($m[1], $m[2], $m[3], "$exeg_wort", "$template");}, $zusammenfassung);
-     $kontext=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$exeg_wort,&$template) { return makepopup($m[1], $m[2], $m[3], "$exeg_wort", "$template");}, $kontext);
-
-     #$text =preg_replace  ("/\b$row_exeg1[wort]\b/",  "$row_exeg1[wort]<a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $row_exeg1[wort]',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $text);
-     #$botschaft=preg_replace  ("/\b$row_exeg1[wort]\b/",  "$row_exeg1[wort]<a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $row_exeg1[wort]',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $botschaft);
-     #$zusammenfassung =preg_replace  ("/\b$row_exeg1[wort]\b/",  "$row_exeg1[wort]<a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $row_exeg1[wort]',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $zusammenfassung);
-     #$kontext =preg_replace  ("/\b$row_exeg1[wort]\b/",  "$row_exeg1[wort]<a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $row_exeg1[wort]',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $kontext);
-    }
-  
-  }
-  
-  }
-
-  // Begriffserklärung einbinden - Ende
-
-
-  // Automatisch in Lehre und Erkenntnis
-  foreach ($thema2 as $wert)
-  { 
-  # Modifikator /i hinzugefügt, damit Groß- Kleinschreibung nicht beachtet wird: 21.11.2011
-  # Modifikator /i wieder weggenommen, da die Groß- Kleinschreibung nicht mehr korrekt war "Die Hoffnung auf Die Wiederkunft Christi": 05.01.2012
-  $thema_kurz =str_replace  ("/",  "\/"  ,  $wert['thema_kurz']);
-  
-  # Wenn das Thema auch noch als Begriffserklärung vorkommt, dann nicht mit dem Thema von Lehre und Erkenntnis verknüpfen,
-  # sondern später mit einem Popup verknüpfen
-  $result_exeg = $db->query( "SELECT count(*) Anz FROM wort_exegese WHERE upper(wort) = upper('$thema_kurz')" );
-  $row_exeg = $result_exeg->fetch_array();
-
-  
-  if($row_exeg['Anz'] ==0){
-
-    $repl = "__lue-0-$wert[eid]__"; #weid wird nicht benötigt, daher 0
-
-    
-
-    #echo "$thema_kurz -> $repl<br>\n";
-    $text = replace_text_links("$thema_kurz", "$repl", $text);
-    $vorwort = replace_text_links("$thema_kurz", "$repl", $vorwort);
-    $botschaft = replace_text_links("$thema_kurz", "$repl", $botschaft);
-    $zusammenfassung = replace_text_links("$thema_kurz", "$repl", $zusammenfassung);
-    $kontext = replace_text_links("$thema_kurz", "$repl", $kontext);
-    
-    $text=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz", "$template");}, $text);
-    $vorwort=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz", "$template");}, $vorwort);
-    $botschaft=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz", "$template");}, $botschaft);
-    $zusammenfassung=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz", "$template");}, $zusammenfassung);
-    $kontext=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz", "$template");}, $kontext);
-
-
-  }
-  }
-
-
-  # Das geliche nochmals mit Kleinbuchstaben am Anfanng (lcfirst). Dann wird auch "Die Hoffnung auf die Wiederkunft Christi" gefunden statt nur "Die Wiederkunft..."
-  foreach ($thema2 as $wert)
-  { 
-  $thema_kurz =str_replace  ("/",  "\/"  ,  $wert['thema_kurz']);
-  #$thema_kurz=lcfirst($thema_kurz); # Erst ab PHP 5.3
-  $thema_kurz1 = strtolower(substr($thema_kurz,0,1)).substr($thema_kurz,1);
-  
-  # Wenn das Thema auch noch als Begriffserklärung vorkommt, dann nicht mit dem Thema von Lehre und Erkenntnis verknüpfen,
-  # sondern später mit einem Popup verknüpfen
-  $result_exeg = $db->query( "SELECT count(*) Anz FROM wort_exegese WHERE upper(wort) = upper('$thema_kurz')" );
-  $row_exeg = $result_exeg->fetch_array();
-  
-  if($row_exeg['Anz'] ==0){
-      
-      $repl = "__lue-0-$wert[eid]__"; #weid wird nicht benötigt, daher 0
-      
-      $thema_kurz1 = $thema_kurz1;
-      #echo "$thema_kurz -> $repl<br>\n";
-      $text = replace_text_links("$thema_kurz1", "$repl", $text);
-      $vorwort = replace_text_links("$thema_kurz1", "$repl", $vorwort);
-      $botschaft = replace_text_links("$thema_kurz1", "$repl", $botschaft);
-      $zusammenfassung = replace_text_links("$thema_kurz1", "$repl", $zusammenfassung);
-      $kontext = replace_text_links("$thema_kurz1", "$repl", $kontext);
-      
-      $text=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz1,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz1", "$template");}, $text);
-      $vorwort=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz1,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz1", "$template");}, $vorwort);
-      $botschaft=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz1,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz1", "$template");}, $botschaft);
-      $zusammenfassung=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz1,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz1", "$template");}, $zusammenfassung);
-      $kontext=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz1,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz1", "$template");}, $kontext);
-      
-  }
-  }
-
-  // Automatisch in Lehre und Erkenntnis - Ende
-
-
-
-
-
-
-  if ($suchart == 1){
-    $suchopt = "{0,1}";
-  }else{
-    $suchopt = "";
-  }
-  
-  if(!isset($inhalt_hig)){
-    $text2 = $text;
-  }else{
-    $text2 = highlight_results(" ".$text." ", $suchopt, "$inhalt_hig");
-  }
-
-} # Ende: if($row_cache_count['Anz'] == 0){
-
-###########################
-## Ausgabe der Variablen ##
-###########################
-
-$smarty->assign('ansicht_fadeout', "$fadeout");
-$smarty->assign('ansicht_lid', "$lid");
-$smarty->assign('ansicht_headline_text', "$ueberschrift");
-$smarty->assign('ansicht_date', "$datum_wt");
-$smarty->assign('ansicht_weekday', "$wochentag_wt");
-$smarty->assign('ansicht_cat_text', "$cat_text");
-$smarty->assign('ansicht_thema_text', "$thema_head");
-
-if($row4['bezeichnung'] != ""){
-  $smarty->assign('ansicht_subthema_exists', "1");
-  $subthema = $row4['bezeichnung'];
-  $smarty->assign('ansicht_subthema_text', "$subthema");
-}
-
-if($row2['bezeichnung'] != ''){
-  $smarty->assign('ansicht_subcat_exists', "1");
-  $subcat_text = $row2['bezeichnung'];
-  $smarty->assign('ansicht_subcat_text', "$subcat_text");
-} 
-
-if ($row['stapgd'] == 'Y' AND $row['ukid'] != '37'){
-  $smarty->assign('ansicht_stapgd_exists', "1");
-  $smarty->assign('ansicht_stapgd_text', "Aus einem Gottesdienst des Stammapostels");
-}
-  
-if ($row['stapgd'] == 'Y' AND $row['ukid'] == '37'){
-  $smarty->assign('ansicht_stapgd1_exists', "1");
-  $smarty->assign('ansicht_stapgd1_text', "Stammapostelsgottesdienst");
-}
-
-if ($lg_datum >= $switch_date){
-  $smarty->assign('ansicht_lg_new', "1");
-}
-
-if(rore($user_admin,'a_pdf','RE')){
-  $smarty->assign('ansicht_icon_pdf_right', "1");
-  $smarty->assign('ansicht_icon_pdf', "<a href=\"pdf_gen.php?lid=$lid\" target='_blank'><img src=\"images/ico_pdf.gif\" border=\"0\"></a>");
-}
-
-if(rore($user_admin,'a_wortbear','RE')){
-  $smarty->assign('ansicht_icon_edit_right', "1");
-  $smarty->assign('ansicht_icon_edit', "<a href=\"wort_bearbeiten.php?action=bearbeiten1&wort=$lid\" target=\"_parent\"><img src=\"images/edit.png\" border=\"0\"></a>");
-}
-
-
-if(rore($user_admin,'a_outlook','RE')){
-  $smarty->assign('ansicht_icon_outlook_right', "1");
-  $smarty->assign('ansicht_icon_outlook', "<a href=\"outlook.php?lid=$lid&typ=1\"><img src=\"images/outlook.gif\" border=\"0\"></a>");
-}
-
-if(rore($user_admin,'a_podcast','RE') and $filename != ''){
-#echo "$row_podcast[dateiname]/$verzeichnis/$filename<br><br>";
-  $smarty->assign('ansicht_icon_podcast_right', "1");
-  $smarty->assign('ansicht_icon_podcast', "<a href=\"$row_podcast[dateiname]/$verzeichnis/$filename\" target='top'><img src=\"images/lautsprecher.gif\" border=\"0\"></a>");
-}
-
-
-
-$smarty->assign('ansicht_textwort_link', "$link");
-
-if(isset($qv_vorhanden) AND $qv_vorhanden == '1'){
-  $smarty->assign('ansicht_qv_vorhanden', "1");
-  $smarty->assign('ansicht_qv_modus', "$row_verweis[querverweis]");
-  $smarty->assign('ansicht_qv_gen', "$querverweis");
-}
-
-
-if($row_lesung != ''){
-  $smarty->assign('ansicht_lesung_vorhanden', "1");
-  $smarty->assign('ansicht_lesung_modus', "$row_lesung1[lesung]");
-  $smarty->assign('ansicht_lesung_gen', "$bibellesung");
-}
-
-if($textwort != ''){
-  $textwort = $textwort;
-  $smarty->assign('ansicht_textwort', "$textwort");
-} 
-
-if($verweis!=''){
-  $kontext .="<br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>";
-  $kontext .="<br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>";
-}
-
-
-
-if ($lg_datum >= $switch_date AND $row['ukid'] == '37'){
-  $smarty->assign('ansicht_inhalt_exists', "2");
-}
-
-  $result_vw = $db->query( "SELECT inhalt
-                              FROM quelle_cache
-                             WHERE link = '$row_link_bibel[bibellink]'
-                               AND lid='$lid'");
-  $row_cache_vw = $result_vw->fetch_array();
-  
-  if($row_cache_vw['inhalt'] != ""){
-    $smarty->assign('ansicht_inhalt_exists', "1"); # Variable muss nochmals gesetzt werden, da die Where Bedinung nicht greifen würde oben, da Variable im Cachemodus leer ist
-    $inhalt =  base64_decode($row_cache_vw['inhalt']);
-    $smarty->assign('ansicht_inhalt_text', "$inhalt");
-  }elseif(trim($text2) != '<br/>' AND trim($text2) != ''){
-    $smarty->assign('ansicht_inhalt_exists', "1");
-    $text2_dec = base64_encode($text2);
-    $sql1 = $db->query( "INSERT INTO quelle_cache ( lid, inhalt, link) VALUES ($lid, '$text2_dec', '$row_link_bibel[bibellink]')" );
-    $cid = $db->insert_id;
-    $smarty->assign('ansicht_inhalt_text', "$text2");
-  }
-
-
-
-if ($lg_datum >= $switch_date AND $row['ukid'] != '37'){ 
-  
-  $result_vw = $db->query( "SELECT vorwort
-                              FROM quelle_cache
-                              WHERE link = '$row_link_bibel[bibellink]'
-                                AND lid='$lid'");
-  $row_cache_vw = $result_vw->fetch_array();
-
-  
-    if($row_cache_vw['vorwort'] != ""){
-      $smarty->assign('ansicht_vorwort_exists', "1"); # Variable muss nochmals gesetzt werden, da die Where Bedinung nicht greifen würde oben, da Variable im Cachemodus leer ist
-      $vorwort = base64_decode($row_cache_vw['vorwort']);
-      $smarty->assign('ansicht_vorwort_text', "$vorwort");
-    }elseif( trim($vorwort) != '<br/>' AND trim($vorwort) != ''){
-      $smarty->assign('ansicht_vorwort_exists', "1");
-      $smarty->assign('ansicht_vorwort_text', "$vorwort");
-      $vorwort_dec =base64_encode($vorwort);
-      $sql1 = $db->query( "UPDATE quelle_cache SET vorwort='$vorwort_dec' WHERE cid=$cid" );
-  }
-}
-
-          
-if ($lg_datum >= $switch_date AND $row['ukid'] != '37'){ 
-  
-  $result_vw = $db->query( "SELECT botschaft
-                              FROM quelle_cache
-                              WHERE link = '$row_link_bibel[bibellink]'
-                                AND lid='$lid'");
-  $row_cache_vw = $result_vw->fetch_array();
-
-  if($row_cache_vw['botschaft'] != ""){
-    $smarty->assign('ansicht_botschaft_exists', "1");
-    $botschaft = base64_decode($row_cache_vw['botschaft']);
-    $smarty->assign('ansicht_botschaft_text', "$botschaft");
-  }elseif(trim($botschaft) != '<br/>' AND trim($botschaft) != ''){
-    $smarty->assign('ansicht_botschaft_exists', "1");
-    $botschaft_dec =base64_encode($botschaft);
-    $sql1 = $db->query( "UPDATE quelle_cache SET botschaft='$botschaft_dec' WHERE cid=$cid" );
-    $smarty->assign('ansicht_botschaft_text', "$botschaft");
-  }
-  
-}
-
-
-if ($lg_datum >= $switch_date AND $row['ukid'] != '37'){ 
-  
-  
-  $result_vw = $db->query( "SELECT zusammenfassung
-                              FROM quelle_cache
-                             WHERE link = '$row_link_bibel[bibellink]'
-                               AND lid='$lid'" );
-  $row_cache_vw = $result_vw->fetch_array();
-
-  
-  if($row_cache_vw['zusammenfassung'] != ""){
-    $smarty->assign('ansicht_zusammenfassung_exists', "1"); # Variable muss nochmals gesetzt werden, da die Where Bedinung nicht greifen würde oben, da Variable im Cachemodus leer ist
-    $zusammenfassung =  base64_decode($row_cache_vw['zusammenfassung']);
-    $smarty->assign('ansicht_zusammenfassung_text', "$zusammenfassung");
-  }elseif(trim($zusammenfassung) != '<br/>' AND trim($zusammenfassung) != ''){
-    $smarty->assign('ansicht_zusammenfassung_exists', "1");
-    $zusammenfassung_dec = base64_encode($zusammenfassung);
-    $sql1 = $db->query( "UPDATE quelle_cache SET zusammenfassung='$zusammenfassung_dec' WHERE cid=$cid" );
-    $smarty->assign('ansicht_zusammenfassung_text', "$zusammenfassung");
-  }
-  
-  
-}
-
-if ($lg_datum >= $switch_date AND $row['ukid'] != '37'){ 
-
-  $result_vw = $db->query( "SELECT kontext
-                              FROM quelle_cache
-                             WHERE link = '$row_link_bibel[bibellink]'
-                               AND lid='$lid'" );
-  $row_cache_vw = $result_vw->fetch_array();
-
-  
-  if($row_cache_vw['kontext'] != ""){
-    $smarty->assign('ansicht_kontext_exists', "1");
-    $kontext =  base64_decode($row_cache_vw['kontext']);
-    $smarty->assign('ansicht_kontext_text', "$kontext");
-  }elseif(trim($kontext) != '<br/>' AND trim($kontext) != ''){
-    $smarty->assign('ansicht_kontext_exists', "1");
-    $kontext_dec = base64_encode($kontext);
-    $sql1 = $db->query( "UPDATE quelle_cache SET kontext='$kontext_dec' WHERE cid=$cid" );
-    $smarty->assign('ansicht_kontext_text', "$kontext");
-  }
-  
-  
-  
-}
-
-## Ausgabe Variablen Ende ##
-
-$smarty->display("$template/$templatename");
-?>
\ No newline at end of file
diff --git a/ansicht2.php_20200212 b/ansicht2.php_20200212
deleted file mode 100644
index 869c587e..00000000
--- a/ansicht2.php_20200212
+++ /dev/null
@@ -1,901 +0,0 @@
-<?php
-# Fuer debugging
-#error_reporting(E_ALL);
-#ini_set('display_errors', 1);
-#echo __LINE__."<br>";	
-session_start();
-#error_reporting(E_ALL);
-#ini_set('display_errors', 1);
-
-require_once("config/ftpanbindung.php");     // f&uuml;gt die FTP-anbindung ein
-
-include_once 'classes/lg-on_Smarty.class.php';
-$smarty = new lgon_Smarty();
-#$smarty->caching = true;
-require_once("config.inc.php");
-require_once("func_rollenrechte.php");
-$templatename = substr(basename($_SERVER['PHP_SELF']),0,-3)."html";
-require_once "language/german.inc.php";
-require_once("func_highlight.php");
-require_once("func_ansicht.php");
-
-
-
-$lid = $_GET['lid'];
-
-$sid = session_id();
-$datum=date("Y-m-d H:i:s");
-$result = $db->query( "INSERT INTO historie (vaid, datum, session_id, art, art_id) VALUES ('$user_vaid;', '$datum', '$sid', 'L', '$lid')" );
-
-$suchart = @$_GET['suchart'];
-$fadeout = @$_GET['fadeout'];
-
-
-if(isset($_GET['inhalt_hig'])){
-  $inhalt_hig = stripslashes($_GET['inhalt_hig']);
-  $inhalt_hig = unserialize("$inhalt_hig");
-}
-
-$verweis = @stripslashes($_GET['verweis']);
-$verweis = @unserialize($verweis);
-
-
-
-if ($user_admin == ""){ require("index.php"); exit;} //Wenn man nicht angemeldet ist, darf man nicht auf die Seite
-
-$db = dbconnect();
-$result = $db->query( "SELECT lid, txt_anz_buch, txt_buch, txt_kapitel, txt_vers, Ueberschrift, thema, unterthema, textstelle, replace(replace(replace(textstelle, ' aus ', ''), 'vgl',''), ' ','') textstelle2, vorwort, botschaft, textwort, inhalt, zusammenfassung, kontext, DATE_Format(datum, '%d.%m.%Y') as datum, kid, ukid, DATE_Format(datum, '%d') tag, DATE_Format(datum, '%m') monat, DATE_Format(datum, '%Y') jahr, ukid, DATE_Format(datum, '%Y-%m-%d')AS datum_berechnung, stapgd
-                         FROM quelle
-                        WHERE lid='$lid'");
-$row = $result->fetch_array();
-
-
-##### ÄNDERUNG NEUE LUTHERBIBEL ########
-if($row['jahr'] < 2019){
-  # Lutherbibel 1984
-  require_once("bibellookup_1984.php");
-  $bibelversion = "1984";
-}else{
-  # Lutherbibel 2017
-  require_once("bibellookup_2017.php");
-  $bibelversion = "2017";
-}
-
-
-$result_link_bibel = $db->query( "SELECT bibellink
-                                     FROM profil
-                                    WHERE user='$user_admin'");
-$row_link_bibel = $result_link_bibel->fetch_array();
-
-$result_count = $db->query( "SELECT count(*) Anz
-                              FROM quelle_cache
-                             WHERE link = '$row_link_bibel[bibellink]'
-                               AND lid='$lid'");
-$row_cache_count = $result_count->fetch_array();
-
-$ueberschrift = html_entity_decode($row['Ueberschrift']);
-
-# typografische Anführungszeichen im UTF8 Format Korrekt darstellen
-$ueberschrift = preg_replace("/\x{0084}/u","&bdquo;",$ueberschrift);
-$ueberschrift = preg_replace("/\x{0093}/u","&ldquo;",$ueberschrift);
-
-
-
-$wochentag = date("l", mktime(0,0,0,$row['monat'],$row['tag'],$row['jahr']));
-
-$result_gd = $db->query( "SELECT wgd FROM profil WHERE user = '$user_admin'");
-$row_gd = $result_gd->fetch_array();
-
-if($wochentag == 'Wednesday' AND $row_gd['wgd'] != '0' AND ($row['ukid'] == '1')){  // Hintergrund kommt aus der wort_wahl.php. Es gibt einige Gottesdienste, die auf einen Mittwoch fallen (1. vom Monat) aber kein Tag addiert werden darf, daher: Wann muss ein Tag (faktor) addiert werden, generell, wenn Wochengottesdienst, wenn Faktor im Profil != 0 und wenn unterkategorie 1 (GD normal) ist. Bei allen anderen Gottesdiensten bleibt der Mittwoch erhalten. (Buß und Bettag ist Mittwoch, Erntedank bleibt auch am 1. des Monats)
-  $datum_wt = date("d.m.Y", mktime(0,0,0,$row['monat'],$row['tag']+$row_gd['wgd'],$row['jahr']));
-  $wochentag = date("l", mktime(0,0,0,$row['monat'],$row['tag']+$row_gd['wgd'],$row['jahr']));
-}else{
-  $wochentag = date("l", mktime(0,0,0,$row['monat'],$row['tag'],$row['jahr']));
-  $datum_wt = date("d.m.Y", mktime(0,0,0,$row['monat'],$row['tag'],$row['jahr']));
-}
-
-
-
-switch($wochentag)
-{
-  case 'Sunday':
-      $wochentag_wt = "So.";
-      break;
-  case 'Monday':
-      $wochentag_wt = "Mo.";
-      break;
-  case 'Tuesday':
-      $wochentag_wt = "Di.";
-      break;
-  case 'Wednesday':
-      $wochentag_wt = "Mi.";
-      break;
-  case 'Thursday':
-      $wochentag_wt = "Do.";
-      break;
-  case 'Friday':
-      $wochentag_wt = "Fr.";
-      break;
-  case 'Saturday':
-      $wochentag_wt = "Sa.";
-      break;
-}
-
-
-$result1 = $db->query( "SELECT bezeichnung
-                          FROM kategorie
-                         WHERE kid='$row[kid]'");
-$row1 = $result1->fetch_array();
-$cat_text = $row1['bezeichnung'];
-
-$result2 = $db->query( "SELECT bezeichnung
-                          FROM unterkategorie
-                         WHERE ukid='$row[ukid]'");
-$row2 = $result2->fetch_array();
-
-$result3 = $db->query( "SELECT bezeichnung
-                          FROM thema
-                         WHERE tid='$row[thema]'");
-$row3 = $result3->fetch_array();
-$thema_head = $row3['bezeichnung'];
-
-$result4 = $db->query( "SELECT bezeichnung
-                          FROM unterthema
-                         WHERE tid='$row[thema]'
-                           AND utid='$row[unterthema]'");
-$row4 = $result4->fetch_array();
-
-
-
-
-$textwort = strip_tags($row['textwort']);
-if($row_cache_count['Anz'] == 0){
-  $vorwort = strip_tags($row['vorwort'], '<br>,<b>,<strong>,<ul>,<li>,<ol>,<a>');
-  $botschaft = strip_tags($row['botschaft'], '<br>,<b>,<strong>,<ul>,<li>,<ol>,<a>');
-  $zusammenfassung = strip_tags($row['zusammenfassung'], '<br>,<b>,<strong>,<ul>,<li>,<ol>,<a>');
-  $kontext = strip_tags($row['kontext'], '<br>,<b>,<strong>,<ul>,<li>,<ol>,<a>');
-  $text = strip_tags($row['inhalt'], '<br>,<b>,<strong>,<ul>,<li>,<ol>,<a>,<table>,<tr>,<td>,<h1>,<h2>,<h3>,<img>');
- 
-  # Sonst kommt empty_string Fehlermeldung von Dom-Document. Besonders bei uralten LGs
-  if($vorwort == ''){$vorwort="<br />";}
-  if($botschaft == ''){$botschaft="<br />";}
-  if($zusammenfassung == ''){$zusammenfassung="<br />";}
-  if($kontext == ''){$kontext="<br />";}
-  if($text == ''){$text="<br />";}
-
-
-  $kontext = str_replace(' "', ' \"', $kontext);
-  $kontext =preg_replace_callback("/([0-9]\s*)?()(Sir|Mo|Jos|Ri|Rut|Sam|K&ouml;n|Chr|Esr|Neh|Est|Hiob|Ps|Spr|Pred|Hld|Jes|Jer|Kla|Klgl|Hes|St zu Dan|Dan|Hos|Joel|Am|Obd|Jona|Mi|Nah|Hab|Zef|Hag|Sach|Weish|Mal|Tob|Mt|Mk|Lk|Luk|Joh|Jh|Apg|R&ouml;m|Rom|Kor|Gal|Eph|Phil|Kol|Thess|Tim|Tit|Phlm|Ptr|Petr|Joh|Hbr|Hebr|Jak|Jk|Jud|Offb|Off)(\s*)".
-                                 "([0-9]{1,3})(\,\s*)?(aus\s*)?([0-9]{0,3})/", function($m) use (&$lid) { return refill($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $m[9], $lid);}, $kontext);
-  $jahr = "$row[jahr]";
-  $bibellink = $row_link_bibel['bibellink'];
-  $kontext=preg_replace_callback("/([0-9][0-9]?\.\s*)?(Makkab&auml;er|Johannes|Mose|K&ouml;nige|Chronik|Korinther|Samuel|Thessalonicher|Timotheus|Petrus|Gebet Manasses|St&uuml;cke zu Daniel|St&uuml;cke zu Ester|Baruch|Weisheit|Judit|Judith|Sirach|Josua|Richter|Rut|Ruth|Esra|Nehemia|Esther|Ester|Hiob|Ijob|Psalm|Spr&uuml;che|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Ezechiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matth&auml;us|Markus|Lukas|Apostelgeschichte|R&ouml;mer|Galater|Epheser|Philipper|Kolosser|Titus|Hebr&auml;er|Jakobus|Offenbarung|Philemon|Judas)(\s*[0-9]{1,3})(,\s*)?(\s*aus\s*|\s*Verse\s*|\s*Vers\s*)?([0-9]{0,3})?(\s*\-\s*|\s*\.\s*)?([0-9]{0,3})?/", function($m) use (&$lid,&$bibellink,&$jahr) { return makeLink($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $lid, $bibellink,$jahr);}, $kontext);
-  
-  $suchmuster = '/(KNK) (([0-9]{1,2}\.?){0,5})/';
-  $kontext=preg_replace_callback($suchmuster, function($m) { return makeKNK($m[1], $m[2]);}, $kontext);
-  
-  $suchmuster2 = '/(KNK-FA) ([0-9]{1,3})/';
-  $kontext=preg_replace_callback($suchmuster2, function($m) { return makeKNK_FA($m[1], $m[2]);}, $kontext);
-  
-  
-  $zusammenfassung = str_replace(' "', ' \"', $zusammenfassung);
-  $zusammenfassung =preg_replace_callback("/([0-9]\s*)?()(Sir|Mo|Jos|Ri|Rut|Sam|K&ouml;n|Chr|Esr|Neh|Est|Hiob|Ps|Spr|Pred|Hld|Jes|Jer|Kla|Klgl|Hes|St zu Dan|Dan|Hos|Joel|Am|Obd|Jona|Mi|Nah|Hab|Zef|Hag|Sach|Weish|Mal|Tob|Mt|Mk|Lk|Luk|Joh|Jh|Apg|R&ouml;m|Rom|Kor|Gal|Eph|Phil|Kol|Thess|Tim|Tit|Phlm|Ptr|Petr|Joh|Hbr|Hebr|Jak|Jk|Jud|Offb|Off)(\s*)".
-                                  "([0-9]{1,3})(\,\s*)?(aus\s*)?([0-9]{0,3})/", function($m) use (&$lid) { return refill($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $m[9], $lid);}, $zusammenfassung);
-                                  
-  $zusammenfassung=preg_replace_callback("/([0-9][0-9]?\.\s*)?(Makkab&auml;er|Johannes|Mose|K&ouml;nige|Chronik|Korinther|Samuel|Thessalonicher|Timotheus|Petrus|Gebet Manasses|St&uuml;cke zu Daniel|St&uuml;cke zu Ester|Baruch|Weisheit|Judit|Judith|Sirach|Josua|Richter|Rut|Ruth|Esra|Nehemia|Esther|Ester|Hiob|Ijob|Psalm|Spr&uuml;che|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Ezechiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matth&auml;us|Markus|Lukas|Apostelgeschichte|R&ouml;mer|Galater|Epheser|Philipper|Kolosser|Titus|Hebr&auml;er|Jakobus|Offenbarung|Philemon|Judas)(\s*[0-9]{1,3})(,\s*)?(\s*aus\s*|\s*Verse\s*|\s*Vers\s*)?([0-9]{0,3})?(\s*\-\s*|\s*\.\s*)?([0-9]{0,3})?/", function($m) use (&$lid,&$bibellink,&$jahr) { return makeLink($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $lid, $bibellink,$jahr);}, $zusammenfassung);
-
-  $vorwort = str_replace(' "', ' \"', $vorwort);
-  $vorwort=preg_replace_callback("/([0-9]\s*)?()(Sir|Mo|Jos|Ri|Rut|Sam|K&ouml;n|Chr|Esr|Neh|Est|Hiob|Ps|Spr|Pred|Hld|Jes|Jer|Kla|Klgl|Hes|St zu Dan|Dan|Hos|Joel|Am|Obd|Jona|Mi|Nah|Hab|Zef|Hag|Sach|Weish|Mal|Tob|Mt|Mk|Lk|Luk|Joh|Jh|Apg|R&ouml;m|Rom|Kor|Gal|Eph|Phil|Kol|Thess|Tim|Tit|Phlm|Ptr|Petr|Joh|Hbr|Hebr|Jak|Jk|Jud|Offb|Off)(\s*)".
-                         "([0-9]{1,3})(\,\s*)?(aus\s*)?([0-9]{0,3})/", function($m) use (&$lid) { return refill($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $m[9], $lid);}, $vorwort);
-                         
-  $vorwort=preg_replace_callback("/([0-9][0-9]?\.\s*)?(Makkab&auml;er|Johannes|Mose|K&ouml;nige|Chronik|Korinther|Samuel|Thessalonicher|Timotheus|Petrus|Gebet Manasses|St&uuml;cke zu Daniel|St&uuml;cke zu Ester|Baruch|Weisheit|Judit|Judith|Sirach|Josua|Richter|Rut|Ruth|Esra|Nehemia|Esther|Ester|Hiob|Ijob|Psalm|Spr&uuml;che|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Ezechiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matth&auml;us|Markus|Lukas|Apostelgeschichte|R&ouml;mer|Galater|Epheser|Philipper|Kolosser|Titus|Hebr&auml;er|Jakobus|Offenbarung|Philemon|Judas)(\s*[0-9]{1,3})(,\s*)?(\s*aus\s*|\s*Verse\s*|\s*Vers\s*)?([0-9]{0,3})?(\s*\-\s*|\s*\.\s*)?([0-9]{0,3})?/", function($m) use (&$lid,&$bibellink,&$jahr) { return makeLink($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $lid, $bibellink,$jahr);}, $vorwort);
-
-  $botschaft = str_replace(' "', ' \"', $botschaft);
-  $botschaft=preg_replace_callback("/([0-9]\s*)?()(Sir|Mo|Jos|Ri|Rut|Sam|K&ouml;n|Chr|Esr|Neh|Est|Hiob|Ps|Spr|Pred|Hld|Jes|Jer|Kla|Klgl|Hes|St zu Dan|Dan|Hos|Joel|Am|Obd|Jona|Mi|Nah|Hab|Zef|Hag|Sach|Weish|Mal|Tob|Mt|Mk|Lk|Luk|Joh|Jh|Apg|R&ouml;m|Rom|Kor|Gal|Eph|Phil|Kol|Thess|Tim|Tit|Phlm|Ptr|Petr|Joh|Hbr|Hebr|Jak|Jk|Jud|Offb|Off)(\s*)".
-                           "([0-9]{1,3})(\,\s*)?(aus\s*)?([0-9]{0,3})/", function($m) { return refill($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $m[9], $lid);}, $botschaft);
-                           
-  $botschaft=preg_replace_callback("/([0-9][0-9]?\.\s*)?(Makkab&auml;er|Johannes|Mose|K&ouml;nige|Chronik|Korinther|Samuel|Thessalonicher|Timotheus|Petrus|Gebet Manasses|St&uuml;cke zu Daniel|St&uuml;cke zu Ester|Baruch|Weisheit|Judit|Judith|Sirach|Josua|Richter|Rut|Ruth|Esra|Nehemia|Esther|Ester|Hiob|Ijob|Psalm|Spr&uuml;che|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Ezechiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matth&auml;us|Markus|Lukas|Apostelgeschichte|R&ouml;mer|Galater|Epheser|Philipper|Kolosser|Titus|Hebr&auml;er|Jakobus|Offenbarung|Philemon|Judas)(\s*[0-9]{1,3})(,\s*)?(\s*aus\s*|\s*Verse\s*|\s*Vers\s*)?([0-9]{0,3})?(\s*\-\s*|\s*\.\s*)?([0-9]{0,3})?/", function($m) use (&$lid,&$bibellink,&$jahr) { return makeLink($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $lid, $bibellink,$jahr);}, $botschaft);
-
-}
-
-$textstelle = str_replace (array(" ", "aus", "vgl"), array("", "", ""), $row['textstelle']);
-
-$date_nlg  = mktime(0, 0, 0, 12, 1, 2007);  // Datum ab dem neue LGs gelten
-$date_nlg_format = date("Y-m-d", $date_nlg);  // ISO-8601 Format wie in der Datenbank: Formatierung f&uuml;r Vergleiche erforderlich
-
-$switch_date = strtotime ($date_nlg_format); //Umrechnung des Fristgrenztages in eine Zahl
-$lg_datum = strtotime ($row['datum_berechnung']); // Umrechnung des Enddatums in eine Zahl
-
-$result_podcast = $db->query( "SELECT dateiname
-	                           FROM admin_rechte
-	                          WHERE admin_rolle = 'a_podcast'");
-$row_podcast = $result_podcast->fetch_array();
-
-$verzeichnis = "$row[jahr]-$row[monat]";
-$suchbegriff1 = "$row[jahr]_$row[monat]_$row[tag].";
-$suchbegriff2 = "$row[jahr]-$row[monat]-$row[tag].";
-   
-   $verzeichnis2 = "/Leitgedanken/Podcast/$verzeichnis/";
-   #$verzeichnis2 = "/homes/admin/Drive/Podcast/$verzeichnis/";
-   $VerbindungsID = @ftp_connect($FTPServer2, 21, 1); # Timeout auf 1 Sek
-   $LoginErgebnis = @ftp_login($VerbindungsID, $FTPUser2, $FTPPasswort2);
-   
-   ########DEBUGINFO#################
-#   if($LoginErgebnis){
-#     echo "Verbunden<br>";
-#   }else{
-#     echo "keine Verbindung<br>";
-#   }
-   
-#   echo "VerbindungsID: $VerbindungsID<br>
-#         FTPUser: $FTPUser2<br>
-#         FTPPasswort2: $FTPPasswort2<br>
-#         Verzeichnis: $verzeichnis2<br>
-#         <strong>Dateiname:</strong><br>
-#        ";
-   ########DEBUGINFO ENDE############
-   
-
-   $filename = 0;
-   $filename_podcast_lesung = 0;
-   
-   if($VerbindungsID && $LoginErgebnis)
-   {
-     $smarty->assign('ftp_ansicht_connect', "1");
-     $Dateiliste=ftp_nlist($VerbindungsID, $verzeichnis2);
-     @sort($Dateiliste);
-     for($i=0; $i<count($Dateiliste); $i++)
-     {
-     
-             $dateiname = basename($Dateiliste[$i]);
-#echo $dateiname."<br>";
-          
-          if($row['ukid'] != 5){ #Jugendgottesdienst ist der Dateiname anders
-            if($row['ukid'] != 37){
-	
-             $pos1 = strpos($dateiname, $suchbegriff1);
-             $pos2 = strpos($dateiname, $suchbegriff2);
-             
-#echo "$dateiname -> $suchbegriff -> $pos1 -> -> $pos2<br>";
-             if($pos1 > 0 or $pos2 > 0){
-               $filename = $dateiname;
-             }
-            }
-          }else{
-             $suchbegriff1 = "$row[jahr]_$row[monat]_JGD.";
-             $suchbegriff2 = "G_$row[jahr]_$row[monat].";
-             $suchbegriff3 = "G_$row[jahr]-$row[monat].";
-             $suchbegriff4 = "JG_$row[jahr]-$row[monat].";
-             $pos1 = strpos($dateiname, $suchbegriff1);
-             $pos2 = strpos($dateiname, $suchbegriff2);
-             $pos3 = strpos($dateiname, $suchbegriff3);
-             $pos4 = strpos($dateiname, $suchbegriff4);
-
-             if($pos != '' or $pos2 != '' or $pos3 != '' or $pos3 != ''){
-               $filename = $dateiname;
-#echo "pos1: $pos1 <br> pos2: $pos2 <br> pos3: $pos3 <br> pos4: $pos4 <br>$filename<br><br>";
-             }
-          }
-          
-             $suchbegriff_lesung = "$row[jahr]_$row[monat]_$row[tag]_Lesung";
-             $pos = strpos($dateiname, $suchbegriff_lesung);
-             $suchbegriff_lesung2 = "$row[jahr]-$row[monat]-$row[tag]_Lesung";
-             $pos2 = strpos($dateiname, $suchbegriff_lesung2);
-             if($pos > 0 or $pos2 > 0){
-               $filename_podcast_lesung = $dateiname;
-             }
-          
-
-     }
-   }
-
-#echo "$row_podcast[dateiname]/$verzeichnis/$filename<br><br>";
-
-
-// Preg auf vollständige Bibelbücher überprüft
-$textstelle_stopmark=preg_replace_callback("/^([0-9]\.)*\s*".	//1 a
-  				 "(Philemon|Judas|Johannes|Mose|Könige|Korinther|Petrus|Sirach|Josua|Richter|Rut|Ruth|Samuel|Chronik|Esra|Nehemia|Esther|Ester|Hiob|Psalm|Sprüche|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Judit|Weisheit|Baruch|Makkabäer|Stücke zu Ester|Stücke zu Daniel|Gebet Manasses|Matthäus|Markus|Lukas|Apostelgeschichte|Römer|Galater|Epheser|Philipper|Kolosser|Thessalonicher|Timotheus|Titus|Hebräer|Jakobus|Offenbarung)\s*". //2
-  				 "([0-9]{1,3})". 	//3  c
-  				 "(\,)?\s*". 		//4  d
-  				 "(aus)?\s*".		//5  e
-  				 "([0-9]{0,3})".	//6  f
-  				 "(\.|-)?".		//7  g
-  				 "([0-9]{0,3})?".	//8  h
-  				 "(\.|-)?".		//9  i
-  				 "([0-9]{0,3})".        //10 j
-  				 "$/", function($m) { return splitword_stopmark($m[1], $m[2], $m[3], $m[6], $m[7], $m[8], $m[9], $m[10]);},
- 				 $row['textstelle']);
-
-// stopmark Ende
-
-
-
-// Textwort: Link zu verschiedenen Onlinebibeln
-if($row_link_bibel['bibellink'] == 'lokal'){
-  ##### ÄNDERUNG NEUE LUTHERBIBEL ########
-  if($bibelversion == "1984"){
-    $link = "<a class=\"biblelink\" href=\"javascript:bib_link_lokal1('bibelpopup/bib_popup_1984.php?wort=$row[textstelle]&stopmark=$textstelle_stopmark&vers_select=Y','Bibellink','640','480','center','front');\">$row[textstelle]</a>";
-  }
-  if($bibelversion == "2017"){
-    $link = "<a class=\"biblelink\" href=\"javascript:bib_link_lokal1('bibelpopup/bib_popup_2017.php?wort=$row[textstelle]&stopmark=$textstelle_stopmark&vers_select=Y','Bibellink','640','480','center','front');\">$row[textstelle]</a>";
-  }
-}elseif($row_link_bibel['bibellink'] == 'bibleserver'){
-  ##### ÄNDERUNG NEUE LUTHERBIBEL ########
-  if($bibelversion == "1984"){
-    $link = "<a href=http://www.bibleserver.com/go.php?lang={de}&bible={LUT84}&ref={$textstelle} target='_blank'>$row[textstelle]</a>";
-  }
-  if($bibelversion == "2017"){
-    $link = "<a href=http://www.bibleserver.com/go.php?lang={de}&bible={LUT}&ref={$textstelle} target='_blank'>$row[textstelle]</a>";
-  }
-}
-
-  $result_verweis = $db->query( "SELECT querverweis
-                                   FROM profil
-                                  WHERE user='$user_admin'");
-  $row_verweis = $result_verweis->fetch_array();
-
-  
-  require_once("verweise.php");
-  $querverweis = verweise($lid, $user_admin, $template);
-  # Erst werden die Verweise immer erzeugt, und ich cache geschrieben, dann abgefragt, wenn was im Cac dann qv_vorhanden =1. 
-  # Verweisfenster wird dann nur eingeblendet, wenn ein Verweis vorhanden ist.
-
-  $result_te_cache = $db->query( "SELECT erg_lid
-                                    FROM quelle_verweise_cache
-                                   WHERE erg_lid = $lid" );
-  if($result_te_cache->num_rows > 0){
-    $qv_vorhanden = "1";
-  }
-
-
-######################################################################
-## Prüfung, ob Bibellesung vorhanden ist, die zur Kategorie passt
-######################################################################
- # Neu am 05.12.2019: Bibellesung Jugendgottesdienst, die ja immer am ersten im Monat sind, wurden auch bei normalen GDs angezeigt, die am 01. des Monats waren.
-                                
-  $result_lesung = $db->query( "SELECT lid
-                                  FROM quelle a
-                                 WHERE datum='$row[datum_berechnung]'
-                                   AND kid = 12
-                                   AND lid != '$lid'
-                                   AND a.ukid = (select ukid from unterkategorie b where a.ukid=b.ukid and b.bezeichnung ='$row2[bezeichnung]')
-                              ");
-  $row_lesung = $result_lesung->fetch_array();
-  
-  
-
-
-if($row_lesung['lid'] != ''){
-  
-  $result_lesung1 = $db->query( "SELECT lesung
-                                  FROM profil
-                                 WHERE user='$user_admin'");
-  $row_lesung1 = $result_lesung1->fetch_array();
-  
-  
-  require_once("lesung.php");
-  
-  
-  $bibellesung = lesung($row['datum_berechnung'], $template, $verzeichnis, $filename_podcast_lesung);
-
-}
-
-######################################################################
-## Ende Prüfung, ob Bibellesung vorhanden ist
-######################################################################
-
-
-
-if($row_cache_count['Anz'] == 0){
-  $text = str_replace(' "', ' \"', $text);
-  $text=preg_replace_callback("/([0-9]\s*)?()?(Sir|Mo|Jos|Ri|Rut|Sam|K&ouml;n|Chr|Esr|Neh|Est|Hiob|Ps|Spr|Pred|Hld|Jes|Jer|Kla|Klgl|Hes|St zu Dan|Dan|Hos|Joel|Am|Obd|Jona|Mi|Nah|Hab|Zef|Hag|Sach|Weish|Mal|Tob|Mt|Mk|Lk|Luk|Joh|Jh|Apg|R&ouml;m|Rom|Kor|Gal|Eph|Phil|Kol|Thess|Tim|Tit|Phlm|Ptr|Petr|Joh|Hbr|Hebr|Jak|Jk|Jud|Offb|Off)(\s*)".
-                      "([0-9]{1,3})(\,\s*)?(aus\s*)?([0-9]{0,3})/", function($m) use (&$lid) { return refill($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $m[9], $lid);}, $text);
-
-  $text = str_replace("$verweis","<a name='verweis'>$verweis</a>",$text);
-  $text=preg_replace_callback("/([0-9][0-9]?\.\s*)?(Makkab&auml;er|Johannes|Mose|K&ouml;nige|Chronik|Korinther|Samuel|Thessalonicher|Timotheus|Petrus|Gebet Manasses|St&uuml;cke zu Daniel|St&uuml;cke zu Ester|Baruch|Weisheit|Judit|Judith|Sirach|Josua|Richter|Rut|Ruth|Esra|Nehemia|Esther|Ester|Hiob|Ijob|Psalm|Spr&uuml;che|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Ezechiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matth&auml;us|Markus|Lukas|Apostelgeschichte|R&ouml;mer|Galater|Epheser|Philipper|Kolosser|Titus|Hebr&auml;er|Jakobus|Offenbarung|Philemon|Judas)(\s*[0-9]{1,3})(,\s*)?(\s*aus\s*|\s*Verse\s*|\s*Vers\s*)?([0-9]{0,3})?(\s*\-\s*|\s*\.\s*)?([0-9]{0,3})?/", function($m) use (&$lid,&$bibellink,&$jahr) { return makeLink($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $lid, $bibellink,$jahr);}, $text);
-  $suchmuster = '/(KNK) (([0-9]{1,2}\.?){0,5})/';
-  $text=preg_replace_callback($suchmuster, function($m) { return makeKNK($m[1], $m[2]);}, $text);
-  
-  $suchmuster2 = '/(KNK-FA) ([0-9]{1,3})/';
-  $text=preg_replace_callback($suchmuster2, function($m) { return makeKNK_FA($m[1], $m[2]);}, $text);
-
-}
-
-
-
-
-
-// Automatisch in Lehre und Erkenntnis verweisen - Start
-if($row_cache_count['Anz'] == 0){
-
-  $db = dbconnect();
-  $query_lue = "SELECT eid, thema
-                  FROM lue_quelle";
-  $result_lue = $db->query( $query_lue);
-  $ln_zaehler =0;
-
-  while ($row_lue = $result_lue->fetch_array()){
-    $thema = strpos("$row_lue[thema]", "Teil");  // Ermitteln wo das Wort "Teil" steht
-
-    if($thema >0){
-      $thema = substr("$row_lue[thema]",0 ,$thema ); // Alles vor dem Wort "Teil" anzeigen
-    }else{
-      $thema = "$row_lue[thema]";
-    }
-    $thema = trim($thema);
-
- 
- 
- while(substr($thema, -1) =='-' or substr($thema, -1)==':' or substr($thema, -1) =='(' or substr($thema, -1) ==' '){
-  $thema =trim($thema);
-  $thema =substr($thema, 0, -1);
-  $thema =trim($thema);
- }
-
-  if (!@in_array($thema, $thema1)) {
-    #echo "$thema<br>";
-
-    $thema2[$ln_zaehler]['thema_kurz'] =$thema;
-    $thema2[$ln_zaehler]['eid'] = $row_lue['eid'];
-    $thema2[$ln_zaehler]['thema'] =$row_lue['thema'];
-    
-    $thema1[] = $thema;
-    $ln_zaehler++;  
-  }  
-
- }
-
- #print_r($thema2);
-
-
- // Automatisch in Lehre und Erkenntnis verweisen - Ende
-
-
-
-
-
-
- #print_r($thema2);
-
-  // Automatisch in Lehre und Erkenntnis und Begriffserklärung verweisen
-  foreach ($thema2 as $wert)
-  { 
-  # Modifikator /i hinzugefügt, damit Groß- Kleinschreibung nicht beachtet wird: 21.11.2011
-  # Modifikator /i wieder weggenommen, da die Groß- Kleinschreibung nicht mehr korrekt war "Die Hoffnung auf Die Wiederkunft Christi": 05.01.2012
-  $thema_kurz =str_replace  ("/",  "\/"  ,  $wert['thema_kurz']);
-  
-  # Wenn das Thema auch noch als Begriffserklärung vorkommt, dann nicht mit dem Thema von Lehre und Erkenntnis verknüpfen,
-  # sondern später mit einem Popup verknüpfen
-  $result_exeg = $db->query( "SELECT count(*) Anz FROM wort_exegese WHERE wort = '$thema_kurz'");
-  $row_exeg = $result_exeg->fetch_array();
-  
-  if($row_exeg['Anz'] >0){
-  
-    $result_exeg3 = $db->query( "SELECT verweis FROM wort_exegese WHERE upper(wort) = upper('$thema_kurz')" );
-    $row_exeg3 = $result_exeg3->fetch_array();
-   
-    $repl = "__lueexeg-$row_exeg3[verweis]-$wert[eid]__";
-    #echo $text;
-    #exit;
-    
-    
-    $text = replace_text_links("$thema_kurz", "$repl", $text);
-    $vorwort = replace_text_links("$thema_kurz", "$repl", $vorwort);
-    $botschaft = replace_text_links("$thema_kurz", "$repl", $botschaft);
-    $zusammenfassung = replace_text_links("$thema_kurz", "$repl", $zusammenfassung);
-    $kontext = replace_text_links("$thema_kurz", "$repl", $kontext);
-
-    $text=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz", "$template");}, $text);
-    $vorwort=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz", "$template");}, $vorwort);
-    $botschaft=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz", "$template");}, $botschaft);
-    $zusammenfassung=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz", "$template");}, $zusammenfassung);
-    $kontext=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz", "$template");}, $kontext);
-    
-
-    #$text =preg_replace  ("/\b$thema_kurz\b/",  "<a class=alue href='lue_ansicht.php?eid=$wert[eid]' title='Lehre und Erkenntnis: $wert[thema]' target='_parent'>$thema_kurz</a><a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $thema_kurz',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $text);
-    #$botschaft =preg_replace  ("/\b$thema_kurz\b/",  "<a class=alue href='lue_ansicht.php?eid=$wert[eid]' title='Lehre und Erkenntnis: $wert[thema]'target='_parent'>$thema_kurz</a><a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $thema_kurz',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $botschaft);
-    #$zusammenfassung =preg_replace  ("/\b$thema_kurz\b/",  "<a class=alue href='lue_ansicht.php?eid=$wert[eid]' title='Lehre und Erkenntnis: $wert[thema]' target='_parent'>$thema_kurz</a><a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $thema_kurz',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $zusammenfassung);
-    #$kontext =preg_replace  ("/\b$thema_kurz\b/",  "<a class=alue href='lue_ansicht.php?eid=$wert[eid]' title='Lehre und Erkenntnis: $wert[thema]' target='_parent'>$thema_kurz</a><a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $thema_kurz',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $kontext);
-  }
-  }
-
-  # Das gleiche nochmals mit Kleinbuchstaben am Anfanng (lcfirst). Dann wird auch "Die Hoffnung auf die Wiederkunft Christi" gefunden statt nur "Die Wiederkunft..."
-  foreach ($thema2 as $wert)
-  { 
-  $thema_kurz =str_replace  ("/",  "\/"  ,  $wert['thema_kurz']);
-  #$thema_kurz1=lcfirst($thema_kurz); # Erst ab PHP 5.3
-  $thema_kurz1 = strtolower(substr($thema_kurz,0,1)).substr($thema_kurz,1);
-  
-  # Wenn das Thema auch noch als Begriffserklärung vorkommt, dann nicht mit dem Thema von Lehre und Erkenntnis verknüpfen,
-  # sondern später mit einem Popup verknüpfen
-  $result_exeg = $db->query( "SELECT count(*) Anz FROM wort_exegese WHERE wort = '$thema_kurz1'" );
-  $row_exeg = $result_exeg->fetch_array();
-
-  
-  if($row_exeg['Anz'] >0){
-
-    $result_exeg3 = $db->query( "SELECT verweis FROM wort_exegese WHERE upper(wort) = upper('$thema_kurz1')" );
-    $row_exeg3 = $result_exeg3->fetch_array();
-
-    
-    
-    $repl = "__lueexeg-$row_exeg3[verweis]-$wert[eid]__";
-    #echo $text;
-    #exit;
-    
-    $thema_kurz1 = $thema_kurz1;
-    $text = replace_text_links("$thema_kurz1", "$repl", $text);
-    $vorwort = replace_text_links("$thema_kurz1", "$repl", $vorwort);
-    $botschaft = replace_text_links("$thema_kurz1", "$repl", $botschaft);
-    $zusammenfassung = replace_text_links("$thema_kurz1", "$repl", $zusammenfassung);
-    $kontext = replace_text_links("$thema_kurz1", "$repl", $kontext);
-   
-    $text=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz1,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz1", "$template");}, $text);
-    $vorwort=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz1,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz1", "$template");}, $vorwort);
-    $botschaft=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz1,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz1", "$template");}, $botschaft);
-    $zusammenfassung=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz1,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz1", "$template");}, $zusammenfassung);
-    $kontext=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz1,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz1", "$template");}, $kontext);
-    
-
-  
-
-    #$text =preg_replace  ("/\b$thema_kurz1\b/",  "<a class=alue href='lue_ansicht.php?eid=$wert[eid]' title='Lehre und Erkenntnis: $wert[thema]' target='_parent'>$thema_kurz1</a><a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $thema_kurz',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $text);
-    #$botschaft =preg_replace  ("/\b$thema_kurz1\b/",  "<a class=alue href='lue_ansicht.php?eid=$wert[eid]' title='Lehre und Erkenntnis: $wert[thema]'target='_parent'>$thema_kurz1</a><a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $thema_kurz',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $botschaft);
-    #$zusammenfassung =preg_replace  ("/\b$thema_kurz1\b/",  "<a class=alue href='lue_ansicht.php?eid=$wert[eid]' title='Lehre und Erkenntnis: $wert[thema]' target='_parent'>$thema_kurz1</a><a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $thema_kurz',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $zusammenfassung);
-    #$kontext =preg_replace  ("/\b$thema_kurz1\b/",  "<a class=alue href='lue_ansicht.php?eid=$wert[eid]' title='Lehre und Erkenntnis: $wert[thema]' target='_parent'>$thema_kurz1</a><a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $thema_kurz',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $kontext);
-  }
-  }
-  // Automatisch in Lehre und Erkenntnis und Begriffserklärung verweisen - Ende
-
-
-  // Begriffserklärung einbinden
-
-
-
-
-  $query_exeg1 = "SELECT distinct wort, verweis
-                    FROM wort_exegese";
-  $result_exeg1 = $db->query( $query_exeg1);
-
-  while ($row_exeg1 = $result_exeg1->fetch_array()){
-
-    if (!get_array_key($row_exeg1['wort'], $thema2)) {
-  
-  
-      $repl = "__exeg-$row_exeg1[verweis]-0__"; #eid wird nicht benötigt, daher 0
-      $exeg_wort = $row_exeg1['wort'];
-      $text = replace_text_links("$exeg_wort", "$repl", $text);
-      $vorwort = replace_text_links("$exeg_wort", "$repl", $vorwort);
-      $botschaft = replace_text_links("$exeg_wort", "$repl", $botschaft);
-      $zusammenfassung = replace_text_links("$exeg_wort", "$repl", $zusammenfassung);
-      $kontext = replace_text_links("$exeg_wort", "$repl", $kontext);
-
-
-
-
-    if(!@in_array($row_exeg1['wort'], $arr_wort)){
-     # Die Begriffserklärung wird in ein Array geschrieben, so dass die Ersetzung nur einmal stattfindet, Wenn ein gleiches Wort ein der
-     # Tabelle wort_exegese wäre, dann würde er beim zweiten durchlauf der Schleife die Ãœberschrift im Popup ersetzen:CAPTION,'$exegese_wort'
-     $arr_wort = array($row_exeg1['wort']);
-     
-     $text=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$exeg_wort,&$template) { return makepopup($m[1], $m[2], $m[3], "$exeg_wort", "$template");}, $text);
-     $vorwort=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$exeg_wort,&$template) { return makepopup($m[1], $m[2], $m[3], "$exeg_wort", "$template");}, $vorwort);
-     $botschaft=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$exeg_wort,&$template) { return makepopup($m[1], $m[2], $m[3], "$exeg_wort", "$template");}, $botschaft);
-     $zusammenfassung=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$exeg_wort,&$template) { return makepopup($m[1], $m[2], $m[3], "$exeg_wort", "$template");}, $zusammenfassung);
-     $kontext=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$exeg_wort,&$template) { return makepopup($m[1], $m[2], $m[3], "$exeg_wort", "$template");}, $kontext);
-
-     #$text =preg_replace  ("/\b$row_exeg1[wort]\b/",  "$row_exeg1[wort]<a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $row_exeg1[wort]',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $text);
-     #$botschaft=preg_replace  ("/\b$row_exeg1[wort]\b/",  "$row_exeg1[wort]<a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $row_exeg1[wort]',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $botschaft);
-     #$zusammenfassung =preg_replace  ("/\b$row_exeg1[wort]\b/",  "$row_exeg1[wort]<a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $row_exeg1[wort]',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $zusammenfassung);
-     #$kontext =preg_replace  ("/\b$row_exeg1[wort]\b/",  "$row_exeg1[wort]<a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $row_exeg1[wort]',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $kontext);
-    }
-  
-  }
-  
-  }
-
-  // Begriffserklärung einbinden - Ende
-
-
-  // Automatisch in Lehre und Erkenntnis
-  foreach ($thema2 as $wert)
-  { 
-  # Modifikator /i hinzugefügt, damit Groß- Kleinschreibung nicht beachtet wird: 21.11.2011
-  # Modifikator /i wieder weggenommen, da die Groß- Kleinschreibung nicht mehr korrekt war "Die Hoffnung auf Die Wiederkunft Christi": 05.01.2012
-  $thema_kurz =str_replace  ("/",  "\/"  ,  $wert['thema_kurz']);
-  
-  # Wenn das Thema auch noch als Begriffserklärung vorkommt, dann nicht mit dem Thema von Lehre und Erkenntnis verknüpfen,
-  # sondern später mit einem Popup verknüpfen
-  $result_exeg = $db->query( "SELECT count(*) Anz FROM wort_exegese WHERE upper(wort) = upper('$thema_kurz')" );
-  $row_exeg = $result_exeg->fetch_array();
-
-  
-  if($row_exeg['Anz'] ==0){
-
-    $repl = "__lue-0-$wert[eid]__"; #weid wird nicht benötigt, daher 0
-
-    
-
-    #echo "$thema_kurz -> $repl<br>\n";
-    $text = replace_text_links("$thema_kurz", "$repl", $text);
-    $vorwort = replace_text_links("$thema_kurz", "$repl", $vorwort);
-    $botschaft = replace_text_links("$thema_kurz", "$repl", $botschaft);
-    $zusammenfassung = replace_text_links("$thema_kurz", "$repl", $zusammenfassung);
-    $kontext = replace_text_links("$thema_kurz", "$repl", $kontext);
-    
-    $text=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz", "$template");}, $text);
-    $vorwort=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz", "$template");}, $vorwort);
-    $botschaft=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz", "$template");}, $botschaft);
-    $zusammenfassung=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz", "$template");}, $zusammenfassung);
-    $kontext=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz", "$template");}, $kontext);
-
-
-  }
-  }
-
-
-  # Das geliche nochmals mit Kleinbuchstaben am Anfanng (lcfirst). Dann wird auch "Die Hoffnung auf die Wiederkunft Christi" gefunden statt nur "Die Wiederkunft..."
-  foreach ($thema2 as $wert)
-  { 
-  $thema_kurz =str_replace  ("/",  "\/"  ,  $wert['thema_kurz']);
-  #$thema_kurz=lcfirst($thema_kurz); # Erst ab PHP 5.3
-  $thema_kurz1 = strtolower(substr($thema_kurz,0,1)).substr($thema_kurz,1);
-  
-  # Wenn das Thema auch noch als Begriffserklärung vorkommt, dann nicht mit dem Thema von Lehre und Erkenntnis verknüpfen,
-  # sondern später mit einem Popup verknüpfen
-  $result_exeg = $db->query( "SELECT count(*) Anz FROM wort_exegese WHERE upper(wort) = upper('$thema_kurz')" );
-  $row_exeg = $result_exeg->fetch_array();
-  
-  if($row_exeg['Anz'] ==0){
-      
-      $repl = "__lue-0-$wert[eid]__"; #weid wird nicht benötigt, daher 0
-      
-      $thema_kurz1 = $thema_kurz1;
-      #echo "$thema_kurz -> $repl<br>\n";
-      $text = replace_text_links("$thema_kurz1", "$repl", $text);
-      $vorwort = replace_text_links("$thema_kurz1", "$repl", $vorwort);
-      $botschaft = replace_text_links("$thema_kurz1", "$repl", $botschaft);
-      $zusammenfassung = replace_text_links("$thema_kurz1", "$repl", $zusammenfassung);
-      $kontext = replace_text_links("$thema_kurz1", "$repl", $kontext);
-      
-      $text=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz1,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz1", "$template");}, $text);
-      $vorwort=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz1,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz1", "$template");}, $vorwort);
-      $botschaft=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz1,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz1", "$template");}, $botschaft);
-      $zusammenfassung=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz1,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz1", "$template");}, $zusammenfassung);
-      $kontext=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz1,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz1", "$template");}, $kontext);
-      
-  }
-  }
-
-  // Automatisch in Lehre und Erkenntnis - Ende
-
-
-
-
-
-
-  if ($suchart == 1){
-    $suchopt = "{0,1}";
-  }else{
-    $suchopt = "";
-  }
-  
-  if(!isset($inhalt_hig)){
-    $text2 = $text;
-  }else{
-    $text2 = highlight_results(" ".$text." ", $suchopt, "$inhalt_hig");
-  }
-
-} # Ende: if($row_cache_count['Anz'] == 0){
-
-###########################
-## Ausgabe der Variablen ##
-###########################
-
-$smarty->assign('ansicht_fadeout', "$fadeout");
-$smarty->assign('ansicht_lid', "$lid");
-$smarty->assign('ansicht_headline_text', "$ueberschrift");
-$smarty->assign('ansicht_date', "$datum_wt");
-$smarty->assign('ansicht_weekday', "$wochentag_wt");
-$smarty->assign('ansicht_cat_text', "$cat_text");
-$smarty->assign('ansicht_thema_text', "$thema_head");
-
-if($row4['bezeichnung'] != ""){
-  $smarty->assign('ansicht_subthema_exists', "1");
-  $subthema = $row4['bezeichnung'];
-  $smarty->assign('ansicht_subthema_text', "$subthema");
-}
-
-if($row2['bezeichnung'] != ''){
-  $smarty->assign('ansicht_subcat_exists', "1");
-  $subcat_text = $row2['bezeichnung'];
-  $smarty->assign('ansicht_subcat_text', "$subcat_text");
-} 
-
-if ($row['stapgd'] == 'Y' AND $row['ukid'] != '37'){
-  $smarty->assign('ansicht_stapgd_exists', "1");
-  $smarty->assign('ansicht_stapgd_text', "Aus einem Gottesdienst des Stammapostels");
-}
-  
-if ($row['stapgd'] == 'Y' AND $row['ukid'] == '37'){
-  $smarty->assign('ansicht_stapgd1_exists', "1");
-  $smarty->assign('ansicht_stapgd1_text', "Stammapostelsgottesdienst");
-}
-
-if ($lg_datum >= $switch_date){
-  $smarty->assign('ansicht_lg_new', "1");
-}
-
-if(rore($user_admin,'a_pdf','RE')){
-  $smarty->assign('ansicht_icon_pdf_right', "1");
-  $smarty->assign('ansicht_icon_pdf', "<a href=\"pdf_gen.php?lid=$lid\" target='_blank'><img src=\"images/ico_pdf.gif\" border=\"0\"></a>");
-}
-
-if(rore($user_admin,'a_wortbear','RE')){
-  $smarty->assign('ansicht_icon_edit_right', "1");
-  $smarty->assign('ansicht_icon_edit', "<a href=\"wort_bearbeiten.php?action=bearbeiten1&wort=$lid\" target=\"_parent\"><img src=\"images/edit.png\" border=\"0\"></a>");
-}
-
-
-if(rore($user_admin,'a_outlook','RE')){
-  $smarty->assign('ansicht_icon_outlook_right', "1");
-  $smarty->assign('ansicht_icon_outlook', "<a href=\"outlook.php?lid=$lid&typ=1\"><img src=\"images/outlook.gif\" border=\"0\"></a>");
-}
-
-if(rore($user_admin,'a_podcast','RE') and $filename != ''){
-#echo "$row_podcast[dateiname]/$verzeichnis/$filename<br><br>";
-  $smarty->assign('ansicht_icon_podcast_right', "1");
-  $smarty->assign('ansicht_icon_podcast', "<a href=\"$row_podcast[dateiname]/$verzeichnis/$filename\" target='top'><img src=\"images/lautsprecher.gif\" border=\"0\"></a>");
-}
-
-
-
-$smarty->assign('ansicht_textwort_link', "$link");
-
-if(isset($qv_vorhanden) AND $qv_vorhanden == '1'){
-  $smarty->assign('ansicht_qv_vorhanden', "1");
-  $smarty->assign('ansicht_qv_modus', "$row_verweis[querverweis]");
-  $smarty->assign('ansicht_qv_gen', "$querverweis");
-}
-
-
-if($row_lesung['lid'] != ''){
-  #echo "Lesung: $bibellesung<br>";
-  $smarty->assign('ansicht_lesung_vorhanden', "1");
-  $smarty->assign('ansicht_lesung_modus', "$row_lesung1[lesung]");
-  $smarty->assign('ansicht_lesung_gen', "$bibellesung");
-  
-}
-
-if($textwort != ''){
-  $textwort = $textwort;
-  $smarty->assign('ansicht_textwort', "$textwort");
-} 
-
-if($verweis!=''){
-  $kontext .="<br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>";
-  $kontext .="<br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>";
-}
-
-
-
-if ($lg_datum >= $switch_date AND $row['ukid'] == '37'){
-  $smarty->assign('ansicht_inhalt_exists', "2");
-}
-
-  $result_vw = $db->query( "SELECT inhalt
-                              FROM quelle_cache
-                             WHERE link = '$row_link_bibel[bibellink]'
-                               AND lid='$lid'");
-  $row_cache_vw = $result_vw->fetch_array();
-  
-  if($row_cache_vw['inhalt'] != ""){
-    $smarty->assign('ansicht_inhalt_exists', "1"); # Variable muss nochmals gesetzt werden, da die Where Bedinung nicht greifen würde oben, da Variable im Cachemodus leer ist
-    $inhalt =  base64_decode($row_cache_vw['inhalt']);
-    $smarty->assign('ansicht_inhalt_text', "$inhalt");
-  }elseif(trim($text2) != '<br/>' AND trim($text2) != ''){
-    $smarty->assign('ansicht_inhalt_exists', "1");
-    $text2_dec = base64_encode($text2);
-    $sql1 = $db->query( "INSERT INTO quelle_cache ( lid, inhalt, link) VALUES ($lid, '$text2_dec', '$row_link_bibel[bibellink]')" );
-    $cid = $db->insert_id;
-    $smarty->assign('ansicht_inhalt_text', "$text2");
-  }
-
-
-
-if ($lg_datum >= $switch_date AND $row['ukid'] != '37'){ 
-  
-  $result_vw = $db->query( "SELECT vorwort
-                              FROM quelle_cache
-                              WHERE link = '$row_link_bibel[bibellink]'
-                                AND lid='$lid'");
-  $row_cache_vw = $result_vw->fetch_array();
-
-  
-    if($row_cache_vw['vorwort'] != ""){
-      $smarty->assign('ansicht_vorwort_exists', "1"); # Variable muss nochmals gesetzt werden, da die Where Bedinung nicht greifen würde oben, da Variable im Cachemodus leer ist
-      $vorwort = base64_decode($row_cache_vw['vorwort']);
-      $smarty->assign('ansicht_vorwort_text', "$vorwort");
-    }elseif( trim($vorwort) != '<br/>' AND trim($vorwort) != ''){
-      $smarty->assign('ansicht_vorwort_exists', "1");
-      $smarty->assign('ansicht_vorwort_text', "$vorwort");
-      $vorwort_dec =base64_encode($vorwort);
-      $sql1 = $db->query( "UPDATE quelle_cache SET vorwort='$vorwort_dec' WHERE cid=$cid" );
-  }
-}
-
-          
-if ($lg_datum >= $switch_date AND $row['ukid'] != '37'){ 
-  
-  $result_vw = $db->query( "SELECT botschaft
-                              FROM quelle_cache
-                              WHERE link = '$row_link_bibel[bibellink]'
-                                AND lid='$lid'");
-  $row_cache_vw = $result_vw->fetch_array();
-
-  if($row_cache_vw['botschaft'] != ""){
-    $smarty->assign('ansicht_botschaft_exists', "1");
-    $botschaft = base64_decode($row_cache_vw['botschaft']);
-    $smarty->assign('ansicht_botschaft_text', "$botschaft");
-  }elseif(trim($botschaft) != '<br/>' AND trim($botschaft) != ''){
-    $smarty->assign('ansicht_botschaft_exists', "1");
-    $botschaft_dec =base64_encode($botschaft);
-    $sql1 = $db->query( "UPDATE quelle_cache SET botschaft='$botschaft_dec' WHERE cid=$cid" );
-    $smarty->assign('ansicht_botschaft_text', "$botschaft");
-  }
-  
-}
-
-
-if ($lg_datum >= $switch_date AND $row['ukid'] != '37'){ 
-  
-  
-  $result_vw = $db->query( "SELECT zusammenfassung
-                              FROM quelle_cache
-                             WHERE link = '$row_link_bibel[bibellink]'
-                               AND lid='$lid'" );
-  $row_cache_vw = $result_vw->fetch_array();
-
-  
-  if($row_cache_vw['zusammenfassung'] != ""){
-    $smarty->assign('ansicht_zusammenfassung_exists', "1"); # Variable muss nochmals gesetzt werden, da die Where Bedinung nicht greifen würde oben, da Variable im Cachemodus leer ist
-    $zusammenfassung =  base64_decode($row_cache_vw['zusammenfassung']);
-    $smarty->assign('ansicht_zusammenfassung_text', "$zusammenfassung");
-  }elseif(trim($zusammenfassung) != '<br/>' AND trim($zusammenfassung) != ''){
-    $smarty->assign('ansicht_zusammenfassung_exists', "1");
-    $zusammenfassung_dec = base64_encode($zusammenfassung);
-    $sql1 = $db->query( "UPDATE quelle_cache SET zusammenfassung='$zusammenfassung_dec' WHERE cid=$cid" );
-    $smarty->assign('ansicht_zusammenfassung_text', "$zusammenfassung");
-  }
-  
-  
-}
-
-if ($lg_datum >= $switch_date){ 
-
-  $result_vw = $db->query( "SELECT kontext
-                              FROM quelle_cache
-                             WHERE link = '$row_link_bibel[bibellink]'
-                               AND lid='$lid'" );
-  $row_cache_vw = $result_vw->fetch_array();
-
-  
-  if($row_cache_vw['kontext'] != ""){
-    $smarty->assign('ansicht_kontext_exists', "1");
-    $kontext =  base64_decode($row_cache_vw['kontext']);
-    $smarty->assign('ansicht_kontext_text', "$kontext");
-  }elseif(trim($kontext) != '<br/>' AND trim($kontext) != ''){
-    $smarty->assign('ansicht_kontext_exists', "1");
-    $kontext_dec = base64_encode($kontext);
-    $sql1 = $db->query( "UPDATE quelle_cache SET kontext='$kontext_dec' WHERE cid=$cid" );
-    $smarty->assign('ansicht_kontext_text', "$kontext");
-  }
-  
-  
-  
-}
-
-## Ausgabe Variablen Ende ##
-
-$smarty->display("$template/$templatename");
-?>
\ No newline at end of file
diff --git a/ansicht2.php_20200915 b/ansicht2.php_20200915
deleted file mode 100644
index 99df8991..00000000
--- a/ansicht2.php_20200915
+++ /dev/null
@@ -1,1041 +0,0 @@
-<?php
-# Fuer debugging
-#error_reporting(E_ALL);
-#ini_set('display_errors', 1);
-#echo __LINE__."<br>";	
-session_start();
-#error_reporting(E_ALL);
-#ini_set('display_errors', 1);
-
-require_once("config/ftpanbindung.php");     // f&uuml;gt die FTP-anbindung ein
-
-include_once 'classes/lg-on_Smarty.class.php';
-$smarty = new lgon_Smarty();
-#$smarty->caching = true;
-require_once("config.inc.php");
-require_once("func_rollenrechte.php");
-$templatename = substr(basename($_SERVER['PHP_SELF']),0,-3)."html";
-require_once "language/german.inc.php";
-require_once("func_highlight.php");
-require_once("func_ansicht.php");
-
-
-if (isset($_GET['action'])) {
-  $action = $_GET['action'];
-} else {
-  $action = '';
-}
-
-if ($action == '') {
-
-$lid = $_GET['lid'];
-
-$sid = session_id();
-$datum=date("Y-m-d H:i:s");
-$result = $db->query( "INSERT INTO historie (vaid, datum, session_id, art, art_id) VALUES ('$user_vaid;', '$datum', '$sid', 'L', '$lid')" );
-
-$suchart = @$_GET['suchart'];
-$fadeout = @$_GET['fadeout'];
-
-
-if(isset($_GET['inhalt_hig'])){
-  $inhalt_hig = stripslashes($_GET['inhalt_hig']);
-  $inhalt_hig = unserialize("$inhalt_hig");
-}
-
-$verweis = @stripslashes($_GET['verweis']);
-$verweis = @unserialize($verweis);
-
-
-
-if ($user_admin == ""){ require("index.php"); exit;} //Wenn man nicht angemeldet ist, darf man nicht auf die Seite
-
-$db = dbconnect();
-$result = $db->query( "SELECT lid, txt_anz_buch, txt_buch, txt_kapitel, txt_vers, Ueberschrift, thema, unterthema, textstelle, replace(replace(replace(textstelle, ' aus ', ''), 'vgl',''), ' ','') textstelle2, vorwort, botschaft, textwort, inhalt, zusammenfassung, kontext, DATE_Format(datum, '%d.%m.%Y') as datum, kid, ukid, DATE_Format(datum, '%d') tag, DATE_Format(datum, '%m') monat, DATE_Format(datum, '%Y') jahr, ukid, DATE_Format(datum, '%Y-%m-%d')AS datum_berechnung, stapgd
-                         FROM quelle
-                        WHERE lid='$lid'");
-$row = $result->fetch_array();
-
-
-##### ÄNDERUNG NEUE LUTHERBIBEL ########
-if($row['jahr'] < 2019){
-  # Lutherbibel 1984
-  require_once("bibellookup_1984.php");
-  $bibelversion = "1984";
-}else{
-  # Lutherbibel 2017
-  require_once("bibellookup_2017.php");
-  $bibelversion = "2017";
-}
-
-
-$result_link_bibel = $db->query( "SELECT bibellink
-                                     FROM profil
-                                    WHERE user='$user_admin'");
-$row_link_bibel = $result_link_bibel->fetch_array();
-
-$result_count = $db->query( "SELECT count(*) Anz
-                              FROM quelle_cache
-                             WHERE link = '$row_link_bibel[bibellink]'
-                               AND lid='$lid'");
-$row_cache_count = $result_count->fetch_array();
-
-$ueberschrift = html_entity_decode($row['Ueberschrift']);
-
-# typografische Anführungszeichen im UTF8 Format Korrekt darstellen
-$ueberschrift = preg_replace("/\x{0084}/u","&bdquo;",$ueberschrift);
-$ueberschrift = preg_replace("/\x{0093}/u","&ldquo;",$ueberschrift);
-
-
-
-$wochentag = date("l", mktime(0,0,0,$row['monat'],$row['tag'],$row['jahr']));
-
-$result_gd = $db->query( "SELECT wgd FROM profil WHERE user = '$user_admin'");
-$row_gd = $result_gd->fetch_array();
-
-if($wochentag == 'Wednesday' AND $row_gd['wgd'] != '0' AND ($row['ukid'] == '1')){  // Hintergrund kommt aus der wort_wahl.php. Es gibt einige Gottesdienste, die auf einen Mittwoch fallen (1. vom Monat) aber kein Tag addiert werden darf, daher: Wann muss ein Tag (faktor) addiert werden, generell, wenn Wochengottesdienst, wenn Faktor im Profil != 0 und wenn unterkategorie 1 (GD normal) ist. Bei allen anderen Gottesdiensten bleibt der Mittwoch erhalten. (Buß und Bettag ist Mittwoch, Erntedank bleibt auch am 1. des Monats)
-  $datum_wt = date("d.m.Y", mktime(0,0,0,$row['monat'],$row['tag']+$row_gd['wgd'],$row['jahr']));
-  $wochentag = date("l", mktime(0,0,0,$row['monat'],$row['tag']+$row_gd['wgd'],$row['jahr']));
-}else{
-  $wochentag = date("l", mktime(0,0,0,$row['monat'],$row['tag'],$row['jahr']));
-  $datum_wt = date("d.m.Y", mktime(0,0,0,$row['monat'],$row['tag'],$row['jahr']));
-}
-
-
-
-switch($wochentag)
-{
-  case 'Sunday':
-      $wochentag_wt = "So.";
-      break;
-  case 'Monday':
-      $wochentag_wt = "Mo.";
-      break;
-  case 'Tuesday':
-      $wochentag_wt = "Di.";
-      break;
-  case 'Wednesday':
-      $wochentag_wt = "Mi.";
-      break;
-  case 'Thursday':
-      $wochentag_wt = "Do.";
-      break;
-  case 'Friday':
-      $wochentag_wt = "Fr.";
-      break;
-  case 'Saturday':
-      $wochentag_wt = "Sa.";
-      break;
-}
-
-
-$result1 = $db->query( "SELECT bezeichnung
-                          FROM kategorie
-                         WHERE kid='$row[kid]'");
-$row1 = $result1->fetch_array();
-$cat_text = $row1['bezeichnung'];
-
-$result2 = $db->query( "SELECT bezeichnung
-                          FROM unterkategorie
-                         WHERE ukid='$row[ukid]'");
-$row2 = $result2->fetch_array();
-
-$result3 = $db->query( "SELECT bezeichnung
-                          FROM thema
-                         WHERE tid='$row[thema]'");
-$row3 = $result3->fetch_array();
-$thema_head = $row3['bezeichnung'];
-
-$result4 = $db->query( "SELECT bezeichnung
-                          FROM unterthema
-                         WHERE tid='$row[thema]'
-                           AND utid='$row[unterthema]'");
-$row4 = $result4->fetch_array();
-
-
-
-
-$textwort = strip_tags($row['textwort']);
-if($row_cache_count['Anz'] == 0){
-  $vorwort = strip_tags($row['vorwort'], '<br>,<b>,<strong>,<ul>,<li>,<ol>,<a>');
-  $botschaft = strip_tags($row['botschaft'], '<br>,<b>,<strong>,<ul>,<li>,<ol>,<a>');
-  $zusammenfassung = strip_tags($row['zusammenfassung'], '<br>,<b>,<strong>,<ul>,<li>,<ol>,<a>');
-  $kontext = strip_tags($row['kontext'], '<br>,<b>,<strong>,<ul>,<li>,<ol>,<a>');
-  $text = strip_tags($row['inhalt'], '<br>,<b>,<strong>,<ul>,<li>,<ol>,<a>,<table>,<tr>,<td>,<h1>,<h2>,<h3>,<img>');
- 
-  # Sonst kommt empty_string Fehlermeldung von Dom-Document. Besonders bei uralten LGs
-  if($vorwort == ''){$vorwort="<br />";}
-  if($botschaft == ''){$botschaft="<br />";}
-  if($zusammenfassung == ''){$zusammenfassung="<br />";}
-  if($kontext == ''){$kontext="<br />";}
-  if($text == ''){$text="<br />";}
-
-
-  $kontext = str_replace(' "', ' \"', $kontext);
-  $kontext =preg_replace_callback("/([0-9]\s*)?()(Sir|Mo|Jos|Ri|Rut|Sam|K&ouml;n|Chr|Esr|Neh|Est|Hiob|Ps|Spr|Pred|Hld|Jes|Jer|Kla|Klgl|Hes|St zu Dan|Dan|Hos|Joel|Am|Obd|Jona|Mi|Nah|Hab|Zef|Hag|Sach|Weish|Mal|Tob|Mt|Mk|Lk|Luk|Joh|Jh|Apg|R&ouml;m|Rom|Kor|Gal|Eph|Phil|Kol|Thess|Tim|Tit|Phlm|Ptr|Petr|Joh|Hbr|Hebr|Jak|Jk|Jud|Offb|Off)(\s*)".
-                                 "([0-9]{1,3})(\,\s*)?(aus\s*)?([0-9]{0,3})/", function($m) use (&$lid) { return refill($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $m[9], $lid);}, $kontext);
-  $jahr = "$row[jahr]";
-  $bibellink = $row_link_bibel['bibellink'];
-  $kontext=preg_replace_callback("/([0-9][0-9]?\.\s*)?(Makkab&auml;er|Johannes|Mose|K&ouml;nige|Chronik|Korinther|Samuel|Thessalonicher|Timotheus|Petrus|Gebet Manasses|St&uuml;cke zu Daniel|St&uuml;cke zu Ester|Baruch|Weisheit|Judit|Judith|Sirach|Josua|Richter|Rut|Ruth|Esra|Nehemia|Esther|Ester|Hiob|Ijob|Psalm|Spr&uuml;che|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Ezechiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matth&auml;us|Markus|Lukas|Apostelgeschichte|R&ouml;mer|Galater|Epheser|Philipper|Kolosser|Titus|Hebr&auml;er|Jakobus|Offenbarung|Philemon|Judas)(\s*[0-9]{1,3})(,\s*)?(\s*aus\s*|\s*Verse\s*|\s*Vers\s*)?([0-9]{0,3})?(\s*\-\s*|\s*\.\s*)?([0-9]{0,3})?/", function($m) use (&$lid,&$bibellink,&$jahr) { return makeLink($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $lid, $bibellink,$jahr);}, $kontext);
-  
-  $suchmuster = '/(KNK) (([0-9]{1,2}\.?){0,5})/';
-  $kontext=preg_replace_callback($suchmuster, function($m) { return makeKNK($m[1], $m[2]);}, $kontext);
-  
-  $suchmuster2 = '/(KNK-FA) ([0-9]{1,3})/';
-  $kontext=preg_replace_callback($suchmuster2, function($m) { return makeKNK_FA($m[1], $m[2]);}, $kontext);
-  
-  
-  $zusammenfassung = str_replace(' "', ' \"', $zusammenfassung);
-  $zusammenfassung =preg_replace_callback("/([0-9]\s*)?()(Sir|Mo|Jos|Ri|Rut|Sam|K&ouml;n|Chr|Esr|Neh|Est|Hiob|Ps|Spr|Pred|Hld|Jes|Jer|Kla|Klgl|Hes|St zu Dan|Dan|Hos|Joel|Am|Obd|Jona|Mi|Nah|Hab|Zef|Hag|Sach|Weish|Mal|Tob|Mt|Mk|Lk|Luk|Joh|Jh|Apg|R&ouml;m|Rom|Kor|Gal|Eph|Phil|Kol|Thess|Tim|Tit|Phlm|Ptr|Petr|Joh|Hbr|Hebr|Jak|Jk|Jud|Offb|Off)(\s*)".
-                                  "([0-9]{1,3})(\,\s*)?(aus\s*)?([0-9]{0,3})/", function($m) use (&$lid) { return refill($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $m[9], $lid);}, $zusammenfassung);
-                                  
-  $zusammenfassung=preg_replace_callback("/([0-9][0-9]?\.\s*)?(Makkab&auml;er|Johannes|Mose|K&ouml;nige|Chronik|Korinther|Samuel|Thessalonicher|Timotheus|Petrus|Gebet Manasses|St&uuml;cke zu Daniel|St&uuml;cke zu Ester|Baruch|Weisheit|Judit|Judith|Sirach|Josua|Richter|Rut|Ruth|Esra|Nehemia|Esther|Ester|Hiob|Ijob|Psalm|Spr&uuml;che|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Ezechiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matth&auml;us|Markus|Lukas|Apostelgeschichte|R&ouml;mer|Galater|Epheser|Philipper|Kolosser|Titus|Hebr&auml;er|Jakobus|Offenbarung|Philemon|Judas)(\s*[0-9]{1,3})(,\s*)?(\s*aus\s*|\s*Verse\s*|\s*Vers\s*)?([0-9]{0,3})?(\s*\-\s*|\s*\.\s*)?([0-9]{0,3})?/", function($m) use (&$lid,&$bibellink,&$jahr) { return makeLink($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $lid, $bibellink,$jahr);}, $zusammenfassung);
-
-  $vorwort = str_replace(' "', ' \"', $vorwort);
-  $vorwort=preg_replace_callback("/([0-9]\s*)?()(Sir|Mo|Jos|Ri|Rut|Sam|K&ouml;n|Chr|Esr|Neh|Est|Hiob|Ps|Spr|Pred|Hld|Jes|Jer|Kla|Klgl|Hes|St zu Dan|Dan|Hos|Joel|Am|Obd|Jona|Mi|Nah|Hab|Zef|Hag|Sach|Weish|Mal|Tob|Mt|Mk|Lk|Luk|Joh|Jh|Apg|R&ouml;m|Rom|Kor|Gal|Eph|Phil|Kol|Thess|Tim|Tit|Phlm|Ptr|Petr|Joh|Hbr|Hebr|Jak|Jk|Jud|Offb|Off)(\s*)".
-                         "([0-9]{1,3})(\,\s*)?(aus\s*)?([0-9]{0,3})/", function($m) use (&$lid) { return refill($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $m[9], $lid);}, $vorwort);
-                         
-  $vorwort=preg_replace_callback("/([0-9][0-9]?\.\s*)?(Makkab&auml;er|Johannes|Mose|K&ouml;nige|Chronik|Korinther|Samuel|Thessalonicher|Timotheus|Petrus|Gebet Manasses|St&uuml;cke zu Daniel|St&uuml;cke zu Ester|Baruch|Weisheit|Judit|Judith|Sirach|Josua|Richter|Rut|Ruth|Esra|Nehemia|Esther|Ester|Hiob|Ijob|Psalm|Spr&uuml;che|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Ezechiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matth&auml;us|Markus|Lukas|Apostelgeschichte|R&ouml;mer|Galater|Epheser|Philipper|Kolosser|Titus|Hebr&auml;er|Jakobus|Offenbarung|Philemon|Judas)(\s*[0-9]{1,3})(,\s*)?(\s*aus\s*|\s*Verse\s*|\s*Vers\s*)?([0-9]{0,3})?(\s*\-\s*|\s*\.\s*)?([0-9]{0,3})?/", function($m) use (&$lid,&$bibellink,&$jahr) { return makeLink($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $lid, $bibellink,$jahr);}, $vorwort);
-
-  $botschaft = str_replace(' "', ' \"', $botschaft);
-  $botschaft=preg_replace_callback("/([0-9]\s*)?()(Sir|Mo|Jos|Ri|Rut|Sam|K&ouml;n|Chr|Esr|Neh|Est|Hiob|Ps|Spr|Pred|Hld|Jes|Jer|Kla|Klgl|Hes|St zu Dan|Dan|Hos|Joel|Am|Obd|Jona|Mi|Nah|Hab|Zef|Hag|Sach|Weish|Mal|Tob|Mt|Mk|Lk|Luk|Joh|Jh|Apg|R&ouml;m|Rom|Kor|Gal|Eph|Phil|Kol|Thess|Tim|Tit|Phlm|Ptr|Petr|Joh|Hbr|Hebr|Jak|Jk|Jud|Offb|Off)(\s*)".
-                           "([0-9]{1,3})(\,\s*)?(aus\s*)?([0-9]{0,3})/", function($m) { return refill($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $m[9], $lid);}, $botschaft);
-                           
-  $botschaft=preg_replace_callback("/([0-9][0-9]?\.\s*)?(Makkab&auml;er|Johannes|Mose|K&ouml;nige|Chronik|Korinther|Samuel|Thessalonicher|Timotheus|Petrus|Gebet Manasses|St&uuml;cke zu Daniel|St&uuml;cke zu Ester|Baruch|Weisheit|Judit|Judith|Sirach|Josua|Richter|Rut|Ruth|Esra|Nehemia|Esther|Ester|Hiob|Ijob|Psalm|Spr&uuml;che|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Ezechiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matth&auml;us|Markus|Lukas|Apostelgeschichte|R&ouml;mer|Galater|Epheser|Philipper|Kolosser|Titus|Hebr&auml;er|Jakobus|Offenbarung|Philemon|Judas)(\s*[0-9]{1,3})(,\s*)?(\s*aus\s*|\s*Verse\s*|\s*Vers\s*)?([0-9]{0,3})?(\s*\-\s*|\s*\.\s*)?([0-9]{0,3})?/", function($m) use (&$lid,&$bibellink,&$jahr) { return makeLink($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $lid, $bibellink,$jahr);}, $botschaft);
-
-}
-
-$textstelle = str_replace (array(" ", "aus", "vgl"), array("", "", ""), $row['textstelle']);
-
-$date_nlg  = mktime(0, 0, 0, 12, 1, 2007);  // Datum ab dem neue LGs gelten
-$date_nlg_format = date("Y-m-d", $date_nlg);  // ISO-8601 Format wie in der Datenbank: Formatierung f&uuml;r Vergleiche erforderlich
-
-$switch_date = strtotime ($date_nlg_format); //Umrechnung des Fristgrenztages in eine Zahl
-$lg_datum = strtotime ($row['datum_berechnung']); // Umrechnung des Enddatums in eine Zahl
-
-$result_podcast = $db->query( "SELECT dateiname
-	                           FROM admin_rechte
-	                          WHERE admin_rolle = 'a_podcast'");
-$row_podcast = $result_podcast->fetch_array();
-
-$verzeichnis = "$row[jahr]-$row[monat]";
-$suchbegriff1 = "$row[jahr]_$row[monat]_$row[tag].";
-$suchbegriff2 = "$row[jahr]-$row[monat]-$row[tag].";
-   
-   $verzeichnis2 = "/Leitgedanken/Podcast/$verzeichnis/";
-   #$verzeichnis2 = "/homes/admin/Drive/Podcast/$verzeichnis/";
-   $VerbindungsID = @ftp_connect($FTPServer2, 21, 1); # Timeout auf 1 Sek
-   $LoginErgebnis = @ftp_login($VerbindungsID, $FTPUser2, $FTPPasswort2);
-   
-   ########DEBUGINFO#################
-#   if($LoginErgebnis){
-#     echo "Verbunden<br>";
-#   }else{
-#     echo "keine Verbindung<br>";
-#   }
-   
-#   echo "VerbindungsID: $VerbindungsID<br>
-#         FTPUser: $FTPUser2<br>
-#         FTPPasswort2: $FTPPasswort2<br>
-#         Verzeichnis: $verzeichnis2<br>
-#         <strong>Dateiname:</strong><br>
-#        ";
-   ########DEBUGINFO ENDE############
-   
-
-   $filename = 0;
-   $filename_podcast_lesung = 0;
-   
-   if($VerbindungsID && $LoginErgebnis)
-   {
-     $smarty->assign('ftp_ansicht_connect', "1");
-     $Dateiliste=ftp_nlist($VerbindungsID, $verzeichnis2);
-     @sort($Dateiliste);
-     for($i=0; $i<count($Dateiliste); $i++)
-     {
-     
-             $dateiname = basename($Dateiliste[$i]);
-#echo $dateiname."<br>";
-          
-          if($row['ukid'] != 5){ #Jugendgottesdienst ist der Dateiname anders
-            if($row['ukid'] != 37){
-	
-             $pos1 = strpos($dateiname, $suchbegriff1);
-             $pos2 = strpos($dateiname, $suchbegriff2);
-             
-#echo "$dateiname -> $suchbegriff -> $pos1 -> -> $pos2<br>";
-             if($pos1 > 0 or $pos2 > 0){
-               $filename = $dateiname;
-             }
-            }
-          }else{
-             $suchbegriff1 = "$row[jahr]_$row[monat]_JGD.";
-             $suchbegriff2 = "G_$row[jahr]_$row[monat].";
-             $suchbegriff3 = "G_$row[jahr]-$row[monat].";
-             $suchbegriff4 = "JG_$row[jahr]-$row[monat].";
-             $pos1 = strpos($dateiname, $suchbegriff1);
-             $pos2 = strpos($dateiname, $suchbegriff2);
-             $pos3 = strpos($dateiname, $suchbegriff3);
-             $pos4 = strpos($dateiname, $suchbegriff4);
-
-             if($pos != '' or $pos2 != '' or $pos3 != '' or $pos3 != ''){
-               $filename = $dateiname;
-#echo "pos1: $pos1 <br> pos2: $pos2 <br> pos3: $pos3 <br> pos4: $pos4 <br>$filename<br><br>";
-             }
-          }
-          
-             $suchbegriff_lesung = "$row[jahr]_$row[monat]_$row[tag]_Lesung";
-             $pos = strpos($dateiname, $suchbegriff_lesung);
-             $suchbegriff_lesung2 = "$row[jahr]-$row[monat]-$row[tag]_Lesung";
-             $pos2 = strpos($dateiname, $suchbegriff_lesung2);
-             if($pos > 0 or $pos2 > 0){
-               $filename_podcast_lesung = $dateiname;
-             }
-          
-
-     }
-   }
-
-#echo "$row_podcast[dateiname]/$verzeichnis/$filename<br><br>";
-
-
-// Preg auf vollständige Bibelbücher überprüft
-$textstelle_stopmark=preg_replace_callback("/^([0-9]\.)*\s*".	//1 a
-  				 "(Philemon|Judas|Johannes|Mose|Könige|Korinther|Petrus|Sirach|Josua|Richter|Rut|Ruth|Samuel|Chronik|Esra|Nehemia|Esther|Ester|Hiob|Psalm|Sprüche|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Judit|Weisheit|Baruch|Makkabäer|Stücke zu Ester|Stücke zu Daniel|Gebet Manasses|Matthäus|Markus|Lukas|Apostelgeschichte|Römer|Galater|Epheser|Philipper|Kolosser|Thessalonicher|Timotheus|Titus|Hebräer|Jakobus|Offenbarung)\s*". //2
-  				 "([0-9]{1,3})". 	//3  c
-  				 "(\,)?\s*". 		//4  d
-  				 "(aus)?\s*".		//5  e
-  				 "([0-9]{0,3})".	//6  f
-  				 "(\.|-)?".		//7  g
-  				 "([0-9]{0,3})?".	//8  h
-  				 "(\.|-)?".		//9  i
-  				 "([0-9]{0,3})".        //10 j
-  				 "$/", function($m) { return splitword_stopmark($m[1], $m[2], $m[3], $m[6], $m[7], $m[8], $m[9], $m[10]);},
- 				 $row['textstelle']);
-
-// stopmark Ende
-
-
-
-// Textwort: Link zu verschiedenen Onlinebibeln
-if($row_link_bibel['bibellink'] == 'lokal'){
-  ##### ÄNDERUNG NEUE LUTHERBIBEL ########
-  if($bibelversion == "1984"){
-    $link = "<a class=\"biblelink\" href=\"javascript:bib_link_lokal1('bibelpopup/bib_popup_1984.php?wort=$row[textstelle]&stopmark=$textstelle_stopmark&vers_select=Y','Bibellink','640','480','center','front');\">$row[textstelle]</a>";
-  }
-  if($bibelversion == "2017"){
-    $link = "<a class=\"biblelink\" href=\"javascript:bib_link_lokal1('bibelpopup/bib_popup_2017.php?wort=$row[textstelle]&stopmark=$textstelle_stopmark&vers_select=Y','Bibellink','640','480','center','front');\">$row[textstelle]</a>";
-  }
-}elseif($row_link_bibel['bibellink'] == 'bibleserver'){
-  ##### ÄNDERUNG NEUE LUTHERBIBEL ########
-  if($bibelversion == "1984"){
-    $link = "<a href=http://www.bibleserver.com/go.php?lang={de}&bible={LUT84}&ref={$textstelle} target='_blank'>$row[textstelle]</a>";
-  }
-  if($bibelversion == "2017"){
-    $textstelle = str_replace(',','%2C', $textstelle);
-    $link = "<a href=http://www.bibleserver.com/go.php?lang={de}&bible={LUT}&ref={$textstelle} target='_blank'>$row[textstelle]</a>";
-  }
-}
-
-  $result_verweis = $db->query( "SELECT querverweis
-                                   FROM profil
-                                  WHERE user='$user_admin'");
-  $row_verweis = $result_verweis->fetch_array();
-
-  
-  require_once("verweise.php");
-  $querverweis = verweise($lid, $user_admin, $template);
-  # Erst werden die Verweise immer erzeugt, und ich cache geschrieben, dann abgefragt, wenn was im Cac dann qv_vorhanden =1. 
-  # Verweisfenster wird dann nur eingeblendet, wenn ein Verweis vorhanden ist.
-
-  $result_te_cache = $db->query( "SELECT erg_lid
-                                    FROM quelle_verweise_cache
-                                   WHERE erg_lid = $lid" );
-  if($result_te_cache->num_rows > 0){
-    $qv_vorhanden = "1";
-  }
-
-
-######################################################################
-## Prüfung, ob Bibellesung vorhanden ist, die zur Kategorie passt
-######################################################################
- # Neu am 05.12.2019: Bibellesung Jugendgottesdienst, die ja immer am ersten im Monat sind, wurden auch bei normalen GDs angezeigt, die am 01. des Monats waren.
-                                
-  $result_lesung = $db->query( "SELECT lid
-                                  FROM quelle a
-                                 WHERE datum='$row[datum_berechnung]'
-                                   AND kid = 12
-                                   AND lid != '$lid'
-                                   AND a.ukid = (select ukid from unterkategorie b where a.ukid=b.ukid and b.bezeichnung ='$row2[bezeichnung]')
-                              ");
-  $row_lesung = $result_lesung->fetch_array();
-  
-  
-
-
-if($row_lesung['lid'] != ''){
-  
-  $result_lesung1 = $db->query( "SELECT lesung
-                                  FROM profil
-                                 WHERE user='$user_admin'");
-  $row_lesung1 = $result_lesung1->fetch_array();
-  
-  
-  require_once("lesung.php");
-  
-  
-  $bibellesung = lesung($row['datum_berechnung'], $template, $verzeichnis, $filename_podcast_lesung);
-
-}
-
-######################################################################
-## Ende Prüfung, ob Bibellesung vorhanden ist
-######################################################################
-
-
-
-if($row_cache_count['Anz'] == 0){
-  $text = str_replace(' "', ' \"', $text);
-  $text=preg_replace_callback("/([0-9]\s*)?()?(Sir|Mo|Jos|Ri|Rut|Sam|K&ouml;n|Chr|Esr|Neh|Est|Hiob|Ps|Spr|Pred|Hld|Jes|Jer|Kla|Klgl|Hes|St zu Dan|Dan|Hos|Joel|Am|Obd|Jona|Mi|Nah|Hab|Zef|Hag|Sach|Weish|Mal|Tob|Mt|Mk|Lk|Luk|Joh|Jh|Apg|R&ouml;m|Rom|Kor|Gal|Eph|Phil|Kol|Thess|Tim|Tit|Phlm|Ptr|Petr|Joh|Hbr|Hebr|Jak|Jk|Jud|Offb|Off)(\s*)".
-                      "([0-9]{1,3})(\,\s*)?(aus\s*)?([0-9]{0,3})/", function($m) use (&$lid) { return refill($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $m[9], $lid);}, $text);
-
-  $text = str_replace("$verweis","<a name='verweis'>$verweis</a>",$text);
-  $text=preg_replace_callback("/([0-9][0-9]?\.\s*)?(Makkab&auml;er|Johannes|Mose|K&ouml;nige|Chronik|Korinther|Samuel|Thessalonicher|Timotheus|Petrus|Gebet Manasses|St&uuml;cke zu Daniel|St&uuml;cke zu Ester|Baruch|Weisheit|Judit|Judith|Sirach|Josua|Richter|Rut|Ruth|Esra|Nehemia|Esther|Ester|Hiob|Ijob|Psalm|Spr&uuml;che|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Ezechiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matth&auml;us|Markus|Lukas|Apostelgeschichte|R&ouml;mer|Galater|Epheser|Philipper|Kolosser|Titus|Hebr&auml;er|Jakobus|Offenbarung|Philemon|Judas)(\s*[0-9]{1,3})(,\s*)?(\s*aus\s*|\s*Verse\s*|\s*Vers\s*)?([0-9]{0,3})?(\s*\-\s*|\s*\.\s*)?([0-9]{0,3})?/", function($m) use (&$lid,&$bibellink,&$jahr) { return makeLink($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $lid, $bibellink,$jahr);}, $text);
-  $suchmuster = '/(KNK) (([0-9]{1,2}\.?){0,5})/';
-  $text=preg_replace_callback($suchmuster, function($m) { return makeKNK($m[1], $m[2]);}, $text);
-  
-  $suchmuster2 = '/(KNK-FA) ([0-9]{1,3})/';
-  $text=preg_replace_callback($suchmuster2, function($m) { return makeKNK_FA($m[1], $m[2]);}, $text);
-
-}
-
-
-
-
-
-// Automatisch in Lehre und Erkenntnis verweisen - Start
-if($row_cache_count['Anz'] == 0){
-
-  $db = dbconnect();
-  $query_lue = "SELECT eid, thema
-                  FROM lue_quelle";
-  $result_lue = $db->query( $query_lue);
-  $ln_zaehler =0;
-
-  while ($row_lue = $result_lue->fetch_array()){
-    $thema = strpos("$row_lue[thema]", "Teil");  // Ermitteln wo das Wort "Teil" steht
-
-    if($thema >0){
-      $thema = substr("$row_lue[thema]",0 ,$thema ); // Alles vor dem Wort "Teil" anzeigen
-    }else{
-      $thema = "$row_lue[thema]";
-    }
-    $thema = trim($thema);
-
- 
- 
- while(substr($thema, -1) =='-' or substr($thema, -1)==':' or substr($thema, -1) =='(' or substr($thema, -1) ==' '){
-  $thema =trim($thema);
-  $thema =substr($thema, 0, -1);
-  $thema =trim($thema);
- }
-
-  if (!@in_array($thema, $thema1)) {
-    #echo "$thema<br>";
-
-    $thema2[$ln_zaehler]['thema_kurz'] =$thema;
-    $thema2[$ln_zaehler]['eid'] = $row_lue['eid'];
-    $thema2[$ln_zaehler]['thema'] =$row_lue['thema'];
-    
-    $thema1[] = $thema;
-    $ln_zaehler++;  
-  }  
-
- }
-
- #print_r($thema2);
-
-
- // Automatisch in Lehre und Erkenntnis verweisen - Ende
-
-
-
-
-
-
- #print_r($thema2);
-
-  // Automatisch in Lehre und Erkenntnis und Begriffserklärung verweisen
-  foreach ($thema2 as $wert)
-  { 
-  # Modifikator /i hinzugefügt, damit Groß- Kleinschreibung nicht beachtet wird: 21.11.2011
-  # Modifikator /i wieder weggenommen, da die Groß- Kleinschreibung nicht mehr korrekt war "Die Hoffnung auf Die Wiederkunft Christi": 05.01.2012
-  $thema_kurz =str_replace  ("/",  "\/"  ,  $wert['thema_kurz']);
-  
-  # Wenn das Thema auch noch als Begriffserklärung vorkommt, dann nicht mit dem Thema von Lehre und Erkenntnis verknüpfen,
-  # sondern später mit einem Popup verknüpfen
-  $result_exeg = $db->query( "SELECT count(*) Anz FROM wort_exegese WHERE wort = '$thema_kurz'");
-  $row_exeg = $result_exeg->fetch_array();
-  
-  if($row_exeg['Anz'] >0){
-  
-    $result_exeg3 = $db->query( "SELECT verweis FROM wort_exegese WHERE upper(wort) = upper('$thema_kurz')" );
-    $row_exeg3 = $result_exeg3->fetch_array();
-   
-    $repl = "__lueexeg-$row_exeg3[verweis]-$wert[eid]__";
-    #echo $text;
-    #exit;
-    
-    
-    $text = replace_text_links("$thema_kurz", "$repl", $text);
-    $vorwort = replace_text_links("$thema_kurz", "$repl", $vorwort);
-    $botschaft = replace_text_links("$thema_kurz", "$repl", $botschaft);
-    $zusammenfassung = replace_text_links("$thema_kurz", "$repl", $zusammenfassung);
-    $kontext = replace_text_links("$thema_kurz", "$repl", $kontext);
-
-    $text=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz", "$template");}, $text);
-    $vorwort=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz", "$template");}, $vorwort);
-    $botschaft=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz", "$template");}, $botschaft);
-    $zusammenfassung=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz", "$template");}, $zusammenfassung);
-    $kontext=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz", "$template");}, $kontext);
-    
-
-    #$text =preg_replace  ("/\b$thema_kurz\b/",  "<a class=alue href='lue_ansicht.php?eid=$wert[eid]' title='Lehre und Erkenntnis: $wert[thema]' target='_parent'>$thema_kurz</a><a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $thema_kurz',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $text);
-    #$botschaft =preg_replace  ("/\b$thema_kurz\b/",  "<a class=alue href='lue_ansicht.php?eid=$wert[eid]' title='Lehre und Erkenntnis: $wert[thema]'target='_parent'>$thema_kurz</a><a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $thema_kurz',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $botschaft);
-    #$zusammenfassung =preg_replace  ("/\b$thema_kurz\b/",  "<a class=alue href='lue_ansicht.php?eid=$wert[eid]' title='Lehre und Erkenntnis: $wert[thema]' target='_parent'>$thema_kurz</a><a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $thema_kurz',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $zusammenfassung);
-    #$kontext =preg_replace  ("/\b$thema_kurz\b/",  "<a class=alue href='lue_ansicht.php?eid=$wert[eid]' title='Lehre und Erkenntnis: $wert[thema]' target='_parent'>$thema_kurz</a><a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $thema_kurz',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $kontext);
-  }
-  }
-
-  # Das gleiche nochmals mit Kleinbuchstaben am Anfanng (lcfirst). Dann wird auch "Die Hoffnung auf die Wiederkunft Christi" gefunden statt nur "Die Wiederkunft..."
-  foreach ($thema2 as $wert)
-  { 
-  $thema_kurz =str_replace  ("/",  "\/"  ,  $wert['thema_kurz']);
-  #$thema_kurz1=lcfirst($thema_kurz); # Erst ab PHP 5.3
-  $thema_kurz1 = strtolower(substr($thema_kurz,0,1)).substr($thema_kurz,1);
-  
-  # Wenn das Thema auch noch als Begriffserklärung vorkommt, dann nicht mit dem Thema von Lehre und Erkenntnis verknüpfen,
-  # sondern später mit einem Popup verknüpfen
-  $result_exeg = $db->query( "SELECT count(*) Anz FROM wort_exegese WHERE wort = '$thema_kurz1'" );
-  $row_exeg = $result_exeg->fetch_array();
-
-  
-  if($row_exeg['Anz'] >0){
-
-    $result_exeg3 = $db->query( "SELECT verweis FROM wort_exegese WHERE upper(wort) = upper('$thema_kurz1')" );
-    $row_exeg3 = $result_exeg3->fetch_array();
-
-    
-    
-    $repl = "__lueexeg-$row_exeg3[verweis]-$wert[eid]__";
-    #echo $text;
-    #exit;
-    
-    $thema_kurz1 = $thema_kurz1;
-    $text = replace_text_links("$thema_kurz1", "$repl", $text);
-    $vorwort = replace_text_links("$thema_kurz1", "$repl", $vorwort);
-    $botschaft = replace_text_links("$thema_kurz1", "$repl", $botschaft);
-    $zusammenfassung = replace_text_links("$thema_kurz1", "$repl", $zusammenfassung);
-    $kontext = replace_text_links("$thema_kurz1", "$repl", $kontext);
-   
-    $text=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz1,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz1", "$template");}, $text);
-    $vorwort=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz1,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz1", "$template");}, $vorwort);
-    $botschaft=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz1,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz1", "$template");}, $botschaft);
-    $zusammenfassung=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz1,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz1", "$template");}, $zusammenfassung);
-    $kontext=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz1,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz1", "$template");}, $kontext);
-    
-
-  
-
-    #$text =preg_replace  ("/\b$thema_kurz1\b/",  "<a class=alue href='lue_ansicht.php?eid=$wert[eid]' title='Lehre und Erkenntnis: $wert[thema]' target='_parent'>$thema_kurz1</a><a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $thema_kurz',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $text);
-    #$botschaft =preg_replace  ("/\b$thema_kurz1\b/",  "<a class=alue href='lue_ansicht.php?eid=$wert[eid]' title='Lehre und Erkenntnis: $wert[thema]'target='_parent'>$thema_kurz1</a><a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $thema_kurz',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $botschaft);
-    #$zusammenfassung =preg_replace  ("/\b$thema_kurz1\b/",  "<a class=alue href='lue_ansicht.php?eid=$wert[eid]' title='Lehre und Erkenntnis: $wert[thema]' target='_parent'>$thema_kurz1</a><a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $thema_kurz',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $zusammenfassung);
-    #$kontext =preg_replace  ("/\b$thema_kurz1\b/",  "<a class=alue href='lue_ansicht.php?eid=$wert[eid]' title='Lehre und Erkenntnis: $wert[thema]' target='_parent'>$thema_kurz1</a><a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $thema_kurz',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $kontext);
-  }
-  }
-  // Automatisch in Lehre und Erkenntnis und Begriffserklärung verweisen - Ende
-
-
-  // Begriffserklärung einbinden
-
-
-
-
-  $query_exeg1 = "SELECT distinct wort, verweis
-                    FROM wort_exegese";
-  $result_exeg1 = $db->query( $query_exeg1);
-
-  while ($row_exeg1 = $result_exeg1->fetch_array()){
-
-    if (!get_array_key($row_exeg1['wort'], $thema2)) {
-  
-  
-      $repl = "__exeg-$row_exeg1[verweis]-0__"; #eid wird nicht benötigt, daher 0
-      $exeg_wort = $row_exeg1['wort'];
-      $text = replace_text_links("$exeg_wort", "$repl", $text);
-      $vorwort = replace_text_links("$exeg_wort", "$repl", $vorwort);
-      $botschaft = replace_text_links("$exeg_wort", "$repl", $botschaft);
-      $zusammenfassung = replace_text_links("$exeg_wort", "$repl", $zusammenfassung);
-      $kontext = replace_text_links("$exeg_wort", "$repl", $kontext);
-
-
-
-
-    if(!@in_array($row_exeg1['wort'], $arr_wort)){
-     # Die Begriffserklärung wird in ein Array geschrieben, so dass die Ersetzung nur einmal stattfindet, Wenn ein gleiches Wort ein der
-     # Tabelle wort_exegese wäre, dann würde er beim zweiten durchlauf der Schleife die Ãœberschrift im Popup ersetzen:CAPTION,'$exegese_wort'
-     $arr_wort = array($row_exeg1['wort']);
-     
-     $text=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$exeg_wort,&$template) { return makepopup($m[1], $m[2], $m[3], "$exeg_wort", "$template");}, $text);
-     $vorwort=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$exeg_wort,&$template) { return makepopup($m[1], $m[2], $m[3], "$exeg_wort", "$template");}, $vorwort);
-     $botschaft=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$exeg_wort,&$template) { return makepopup($m[1], $m[2], $m[3], "$exeg_wort", "$template");}, $botschaft);
-     $zusammenfassung=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$exeg_wort,&$template) { return makepopup($m[1], $m[2], $m[3], "$exeg_wort", "$template");}, $zusammenfassung);
-     $kontext=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$exeg_wort,&$template) { return makepopup($m[1], $m[2], $m[3], "$exeg_wort", "$template");}, $kontext);
-
-     #$text =preg_replace  ("/\b$row_exeg1[wort]\b/",  "$row_exeg1[wort]<a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $row_exeg1[wort]',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $text);
-     #$botschaft=preg_replace  ("/\b$row_exeg1[wort]\b/",  "$row_exeg1[wort]<a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $row_exeg1[wort]',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $botschaft);
-     #$zusammenfassung =preg_replace  ("/\b$row_exeg1[wort]\b/",  "$row_exeg1[wort]<a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $row_exeg1[wort]',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $zusammenfassung);
-     #$kontext =preg_replace  ("/\b$row_exeg1[wort]\b/",  "$row_exeg1[wort]<a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $row_exeg1[wort]',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $kontext);
-    }
-  
-  }
-  
-  }
-
-  // Begriffserklärung einbinden - Ende
-
-
-  // Automatisch in Lehre und Erkenntnis
-  foreach ($thema2 as $wert)
-  { 
-  # Modifikator /i hinzugefügt, damit Groß- Kleinschreibung nicht beachtet wird: 21.11.2011
-  # Modifikator /i wieder weggenommen, da die Groß- Kleinschreibung nicht mehr korrekt war "Die Hoffnung auf Die Wiederkunft Christi": 05.01.2012
-  $thema_kurz =str_replace  ("/",  "\/"  ,  $wert['thema_kurz']);
-  
-  # Wenn das Thema auch noch als Begriffserklärung vorkommt, dann nicht mit dem Thema von Lehre und Erkenntnis verknüpfen,
-  # sondern später mit einem Popup verknüpfen
-  $result_exeg = $db->query( "SELECT count(*) Anz FROM wort_exegese WHERE upper(wort) = upper('$thema_kurz')" );
-  $row_exeg = $result_exeg->fetch_array();
-
-  
-  if($row_exeg['Anz'] ==0){
-
-    $repl = "__lue-0-$wert[eid]__"; #weid wird nicht benötigt, daher 0
-
-    
-
-    #echo "$thema_kurz -> $repl<br>\n";
-    $text = replace_text_links("$thema_kurz", "$repl", $text);
-    $vorwort = replace_text_links("$thema_kurz", "$repl", $vorwort);
-    $botschaft = replace_text_links("$thema_kurz", "$repl", $botschaft);
-    $zusammenfassung = replace_text_links("$thema_kurz", "$repl", $zusammenfassung);
-    $kontext = replace_text_links("$thema_kurz", "$repl", $kontext);
-    
-    $text=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz", "$template");}, $text);
-    $vorwort=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz", "$template");}, $vorwort);
-    $botschaft=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz", "$template");}, $botschaft);
-    $zusammenfassung=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz", "$template");}, $zusammenfassung);
-    $kontext=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz", "$template");}, $kontext);
-
-
-  }
-  }
-
-
-  # Das geliche nochmals mit Kleinbuchstaben am Anfanng (lcfirst). Dann wird auch "Die Hoffnung auf die Wiederkunft Christi" gefunden statt nur "Die Wiederkunft..."
-  foreach ($thema2 as $wert)
-  { 
-  $thema_kurz =str_replace  ("/",  "\/"  ,  $wert['thema_kurz']);
-  #$thema_kurz=lcfirst($thema_kurz); # Erst ab PHP 5.3
-  $thema_kurz1 = strtolower(substr($thema_kurz,0,1)).substr($thema_kurz,1);
-  
-  # Wenn das Thema auch noch als Begriffserklärung vorkommt, dann nicht mit dem Thema von Lehre und Erkenntnis verknüpfen,
-  # sondern später mit einem Popup verknüpfen
-  $result_exeg = $db->query( "SELECT count(*) Anz FROM wort_exegese WHERE upper(wort) = upper('$thema_kurz')" );
-  $row_exeg = $result_exeg->fetch_array();
-  
-  if($row_exeg['Anz'] ==0){
-      
-      $repl = "__lue-0-$wert[eid]__"; #weid wird nicht benötigt, daher 0
-      
-      $thema_kurz1 = $thema_kurz1;
-      #echo "$thema_kurz -> $repl<br>\n";
-      $text = replace_text_links("$thema_kurz1", "$repl", $text);
-      $vorwort = replace_text_links("$thema_kurz1", "$repl", $vorwort);
-      $botschaft = replace_text_links("$thema_kurz1", "$repl", $botschaft);
-      $zusammenfassung = replace_text_links("$thema_kurz1", "$repl", $zusammenfassung);
-      $kontext = replace_text_links("$thema_kurz1", "$repl", $kontext);
-      
-      $text=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz1,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz1", "$template");}, $text);
-      $vorwort=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz1,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz1", "$template");}, $vorwort);
-      $botschaft=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz1,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz1", "$template");}, $botschaft);
-      $zusammenfassung=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz1,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz1", "$template");}, $zusammenfassung);
-      $kontext=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz1,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz1", "$template");}, $kontext);
-      
-  }
-  }
-
-  // Automatisch in Lehre und Erkenntnis - Ende
-
-
-
-
-
-
-  if ($suchart == 1){
-    $suchopt = "{0,1}";
-  }else{
-    $suchopt = "";
-  }
-  
-  if(!isset($inhalt_hig)){
-    $text2 = $text;
-  }else{
-    $text2 = highlight_results(" ".$text." ", $suchopt, "$inhalt_hig");
-  }
-
-} # Ende: if($row_cache_count['Anz'] == 0){
-
-###########################
-## Ausgabe der Variablen ##
-###########################
-
-$smarty->assign('ansicht_fadeout', "$fadeout");
-$smarty->assign('ansicht_lid', "$lid");
-$smarty->assign('ansicht_headline_text', "$ueberschrift");
-$smarty->assign('ansicht_date', "$datum_wt");
-$smarty->assign('ansicht_weekday', "$wochentag_wt");
-$smarty->assign('ansicht_cat_text', "$cat_text");
-
-
-$result_anzthema = $db->query( "SELECT count(*) Anz
-                                  FROM quelle
-                                 WHERE thema='$row[thema]'");
-$row_anzthema = $result_anzthema->fetch_array();
-
-if($row_anzthema['Anz'] > 1){
- $smarty->assign('ansicht_thema_text_link', "1");
- $smarty->assign('ansicht_thema_text_tid', "$row[thema]");
-}else{
- $smarty->assign('ansicht_thema_text_link', "0");
-}
-$smarty->assign('ansicht_thema_text', "$thema_head");
-
-if($row4['bezeichnung'] != ""){
-  $smarty->assign('ansicht_subthema_exists', "1");
-  $subthema = $row4['bezeichnung'];
-  $smarty->assign('ansicht_subthema_text', "$subthema");
-}
-
-if($row2['bezeichnung'] != ''){
-  $smarty->assign('ansicht_subcat_exists', "1");
-  $subcat_text = $row2['bezeichnung'];
-  $smarty->assign('ansicht_subcat_text', "$subcat_text");
-} 
-
-if ($row['stapgd'] == 'Y' AND $row['ukid'] != '37'){
-  $smarty->assign('ansicht_stapgd_exists', "1");
-  $smarty->assign('ansicht_stapgd_text', "Aus einem Gottesdienst des Stammapostels");
-}
-  
-if ($row['stapgd'] == 'Y' AND $row['ukid'] == '37'){
-  $smarty->assign('ansicht_stapgd1_exists', "1");
-  $smarty->assign('ansicht_stapgd1_text', "Stammapostelsgottesdienst");
-}
-
-if ($lg_datum >= $switch_date){
-  $smarty->assign('ansicht_lg_new', "1");
-}
-
-if(rore($user_admin,'a_pdf','RE')){
-  $smarty->assign('ansicht_icon_pdf_right', "1");
-  $smarty->assign('ansicht_icon_pdf', "<a href=\"pdf_gen.php?lid=$lid\" target='_blank'><img src=\"images/ico_pdf.gif\" border=\"0\"></a>");
-}
-
-if(rore($user_admin,'a_wortbear','RE')){
-  $smarty->assign('ansicht_icon_edit_right', "1");
-  $smarty->assign('ansicht_icon_edit', "<a href=\"wort_bearbeiten.php?action=bearbeiten1&wort=$lid\" target=\"_parent\"><img src=\"images/edit.png\" border=\"0\"></a>");
-}
-
-
-if(rore($user_admin,'a_outlook','RE')){
-  $smarty->assign('ansicht_icon_outlook_right', "1");
-  $smarty->assign('ansicht_icon_outlook', "<a href=\"outlook.php?lid=$lid&typ=1\"><img src=\"images/outlook.gif\" border=\"0\"></a>");
-}
-
-if(rore($user_admin,'a_podcast','RE') and $filename != ''){
-#echo "$row_podcast[dateiname]/$verzeichnis/$filename<br><br>";
-  $smarty->assign('ansicht_icon_podcast_right', "1");
-  $smarty->assign('ansicht_icon_podcast', "<a href=\"$row_podcast[dateiname]/$verzeichnis/$filename\" target='top'><img src=\"images/lautsprecher.gif\" border=\"0\"></a>");
-}
-
-
-
-$smarty->assign('ansicht_textwort_link', "$link");
-
-if(isset($qv_vorhanden) AND $qv_vorhanden == '1'){
-  $smarty->assign('ansicht_qv_vorhanden', "1");
-  $smarty->assign('ansicht_qv_modus', "$row_verweis[querverweis]");
-  $smarty->assign('ansicht_qv_gen', "$querverweis");
-}
-
-
-if($row_lesung['lid'] != ''){
-  #echo "Lesung: $bibellesung<br>";
-  $smarty->assign('ansicht_lesung_vorhanden', "1");
-  $smarty->assign('ansicht_lesung_modus', "$row_lesung1[lesung]");
-  $smarty->assign('ansicht_lesung_gen', "$bibellesung");
-  
-}
-
-if($textwort != ''){
-  $textwort = $textwort;
-  $smarty->assign('ansicht_textwort', "$textwort");
-} 
-
-if($verweis!=''){
-  $kontext .="<br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>";
-  $kontext .="<br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>";
-}
-
-
-
-if ($lg_datum >= $switch_date AND $row['ukid'] == '37'){
-  $smarty->assign('ansicht_inhalt_exists', "2");
-}
-
-  $result_vw = $db->query( "SELECT inhalt
-                              FROM quelle_cache
-                             WHERE link = '$row_link_bibel[bibellink]'
-                               AND lid='$lid'");
-  $row_cache_vw = $result_vw->fetch_array();
-  
-  if($row_cache_vw['inhalt'] != ""){
-    $smarty->assign('ansicht_inhalt_exists', "1"); # Variable muss nochmals gesetzt werden, da die Where Bedinung nicht greifen würde oben, da Variable im Cachemodus leer ist
-    $inhalt =  base64_decode($row_cache_vw['inhalt']);
-    $smarty->assign('ansicht_inhalt_text', "$inhalt");
-  }elseif(trim($text2) != '<br/>' AND trim($text2) != ''){
-    $smarty->assign('ansicht_inhalt_exists', "1");
-    $text2_dec = base64_encode($text2);
-    $sql1 = $db->query( "INSERT INTO quelle_cache ( lid, inhalt, link) VALUES ($lid, '$text2_dec', '$row_link_bibel[bibellink]')" );
-    $cid = $db->insert_id;
-    $smarty->assign('ansicht_inhalt_text', "$text2");
-  }
-
-
-
-if ($lg_datum >= $switch_date AND $row['ukid'] != '37'){ 
-  
-  $result_vw = $db->query( "SELECT vorwort
-                              FROM quelle_cache
-                              WHERE link = '$row_link_bibel[bibellink]'
-                                AND lid='$lid'");
-  $row_cache_vw = $result_vw->fetch_array();
-
-  
-    if($row_cache_vw['vorwort'] != ""){
-      $smarty->assign('ansicht_vorwort_exists', "1"); # Variable muss nochmals gesetzt werden, da die Where Bedinung nicht greifen würde oben, da Variable im Cachemodus leer ist
-      $vorwort = base64_decode($row_cache_vw['vorwort']);
-      $smarty->assign('ansicht_vorwort_text', "$vorwort");
-    }elseif( trim($vorwort) != '<br/>' AND trim($vorwort) != ''){
-      $smarty->assign('ansicht_vorwort_exists', "1");
-      $smarty->assign('ansicht_vorwort_text', "$vorwort");
-      $vorwort_dec =base64_encode($vorwort);
-      $sql1 = $db->query( "UPDATE quelle_cache SET vorwort='$vorwort_dec' WHERE cid=$cid" );
-  }
-}
-
-          
-if ($lg_datum >= $switch_date AND $row['ukid'] != '37'){ 
-  
-  $result_vw = $db->query( "SELECT botschaft
-                              FROM quelle_cache
-                              WHERE link = '$row_link_bibel[bibellink]'
-                                AND lid='$lid'");
-  $row_cache_vw = $result_vw->fetch_array();
-
-  if($row_cache_vw['botschaft'] != ""){
-    $smarty->assign('ansicht_botschaft_exists', "1");
-    $botschaft = base64_decode($row_cache_vw['botschaft']);
-    $smarty->assign('ansicht_botschaft_text', "$botschaft");
-  }elseif(trim($botschaft) != '<br/>' AND trim($botschaft) != ''){
-    $smarty->assign('ansicht_botschaft_exists', "1");
-    $botschaft_dec =base64_encode($botschaft);
-    $sql1 = $db->query( "UPDATE quelle_cache SET botschaft='$botschaft_dec' WHERE cid=$cid" );
-    $smarty->assign('ansicht_botschaft_text', "$botschaft");
-  }
-  
-}
-
-
-if ($lg_datum >= $switch_date AND $row['ukid'] != '37'){ 
-  
-  
-  $result_vw = $db->query( "SELECT zusammenfassung
-                              FROM quelle_cache
-                             WHERE link = '$row_link_bibel[bibellink]'
-                               AND lid='$lid'" );
-  $row_cache_vw = $result_vw->fetch_array();
-
-  
-  if($row_cache_vw['zusammenfassung'] != ""){
-    $smarty->assign('ansicht_zusammenfassung_exists', "1"); # Variable muss nochmals gesetzt werden, da die Where Bedinung nicht greifen würde oben, da Variable im Cachemodus leer ist
-    $zusammenfassung =  base64_decode($row_cache_vw['zusammenfassung']);
-    $smarty->assign('ansicht_zusammenfassung_text', "$zusammenfassung");
-  }elseif(trim($zusammenfassung) != '<br/>' AND trim($zusammenfassung) != ''){
-    $smarty->assign('ansicht_zusammenfassung_exists', "1");
-    $zusammenfassung_dec = base64_encode($zusammenfassung);
-    $sql1 = $db->query( "UPDATE quelle_cache SET zusammenfassung='$zusammenfassung_dec' WHERE cid=$cid" );
-    $smarty->assign('ansicht_zusammenfassung_text', "$zusammenfassung");
-  }
-  
-  
-}
-
-if ($lg_datum >= $switch_date){ 
-
-  $result_vw = $db->query( "SELECT kontext
-                              FROM quelle_cache
-                             WHERE link = '$row_link_bibel[bibellink]'
-                               AND lid='$lid'" );
-  $row_cache_vw = $result_vw->fetch_array();
-
-  
-  if($row_cache_vw['kontext'] != ""){
-    $smarty->assign('ansicht_kontext_exists', "1");
-    $kontext =  base64_decode($row_cache_vw['kontext']);
-    $smarty->assign('ansicht_kontext_text', "$kontext");
-  }elseif(trim($kontext) != '<br/>' AND trim($kontext) != ''){
-    $smarty->assign('ansicht_kontext_exists', "1");
-    $kontext_dec = base64_encode($kontext);
-    $sql1 = $db->query( "UPDATE quelle_cache SET kontext='$kontext_dec' WHERE cid=$cid" );
-    $smarty->assign('ansicht_kontext_text', "$kontext");
-  }
-  
-  
-  
-}
-} //Ende Action
-
-if ($action == 'thema') {
-$tid = $_GET['tid'];
-
-
-  function kurzer_text($string,$laenge){ 
-      $origin=strlen($string);
-      $stri_arr=explode(" ",$string);
-      $anzzahl=count($stri_arr);
-      $gekuerzt=0;
-      $string="";
-      while($gekuerzt<$anzzahl){ 
-          $string_alt=$string;
-          $string=$string." ".$stri_arr[$gekuerzt];
-          $gekuerzt++;
-          if(strlen($string)>$laenge){ 
-              $gekuerzt=$anzzahl; 
-              $string=$string_alt;
-          } 
-      } 
-      if($laenge<$origin){ 
-          $string=$string."<nobr>&nbsp;<b>...</b></nobr>";
-      } 
-      return $string; 
-  }
-  
-	  
-    $db = dbconnect();
-  $query = "SELECT a.lid, a.ueberschrift, a.textstelle, a.inhalt, DATE_Format(a.datum, '%d') tag, DATE_Format(a.datum, '%m') monat, DATE_Format(a.datum, '%Y') jahr, b.bezeichnung, c.bezeichnung, a.kid, a.ukid
-              FROM quelle a, kategorie b, unterkategorie c
-             WHERE a.kid=b.kid
-               AND a.ukid=c.ukid
-               AND thema = '$tid'
-               AND a.kid = 1
-               ORDER BY `a`.`datum` ASC
-           ";
-                    
-                    
-  $result = $db->query( $query);
-  $menge = $result->num_rows;
-
-    $ln_zaehler = 0;
-    
-    #$abfrage = "SELECT id FROM links"
-    
-    
-
-    $smarty->assign('anzahltreffer', "$menge");
-    
-    while ($row = $result->fetch_array()){
-
-    
-    
-      if($inhalt == ''){
-        ##$preview = substr(strip_tags($row[inhalt]),0,200)." <b>...</b> ";
-        $preview = kurzer_text(strip_tags($row['inhalt']),200);
-        
-      }else{
-        #$preview = preview(strip_tags($row[inhalt]),trim($_POST[inhalt]));
-        ##$preview = substr(strip_tags($row[inhalt]),0,200)." <b>...</b> ";
-        $preview = kurzer_text(strip_tags($row['inhalt']),200);
-      }
-    
-      
-      $wochentag = date("l", mktime(0,0,0,$row['monat'],$row['tag'],$row['jahr']));
-    
-      switch($wochentag)
-      {
-        case 'Sunday':
-            $wochentag = "So.";
-            break;
-        case 'Monday':
-            $wochentag = "Mo.";
-            break;
-        case 'Tuesday':
-            $wochentag = "Di.";
-            break;
-        case 'Wednesday':
-            $wochentag = "Mi.";
-            break;
-        case 'Thursday':
-            $wochentag = "Do.";
-            break;
-        case 'Friday':
-            $wochentag = "Fr.";
-            break;
-        case 'Saturday':
-            $wochentag = "Sa.";
-            break;
-      }
-      
-      $result1 = $db->query("SELECT bezeichnung FROM kategorie WHERE kid='$row[kid]'");
-      $row1 = $result1->fetch_array();
-
-      $result2 = $db->query("SELECT bezeichnung FROM unterkategorie WHERE ukid='$row[ukid]'");
-      $row2 = $result2->fetch_array();
-
-      
-      $ln_zaehler = $ln_zaehler + 1;
-        
-      if($art == 'exact'){ // Übergabe für Highligthing. Wenn exact, dann darf bei Begriff nicht Gottesdienst hervorgehoben werden
-        $suchart = 0;
-      }else{
-        $suchart = 1;
-      }
-                  
-      $inhalt_hig = urlencode(serialize($_POST['inhalt']));
-      $row['suchart'] = $suchart;
-      $row['inhalt_hig'] = $inhalt_hig;
-      $row['kategorie'] = $row1['bezeichnung'];
-      $row['unterkategorie'] = $row2['bezeichnung'];
-      $row['preview'] = $preview;
-      $row['wochentag'] = $wochentag;
-      $value3[] = $row;
-    }
-    $smarty->assign('table_data3', $value3);
-
-}
-## Ausgabe Variablen Ende ##
-
-$smarty->assign('action', "$action");
-$smarty->display("$template/$templatename");
-?>
\ No newline at end of file
diff --git a/ansicht2.php_lut84_20180219 b/ansicht2.php_lut84_20180219
deleted file mode 100644
index 7fbe9348..00000000
--- a/ansicht2.php_lut84_20180219
+++ /dev/null
@@ -1,847 +0,0 @@
-<?php
-# Fuer debugging
-#error_reporting(E_ALL);
-#ini_set('display_errors', 1);
-#echo __LINE__."<br>";	
-session_start();
-#error_reporting(E_ALL);
-#ini_set('display_errors', 1);
-
-require_once("config/ftpanbindung.php");     // f&uuml;gt die FTP-anbindung ein
-
-include_once 'classes/lg-on_Smarty.class.php';
-$smarty = new lgon_Smarty();
-#$smarty->caching = true;
-require_once("config.inc.php");
-require_once("func_rollenrechte.php");
-$templatename = substr(basename($_SERVER['PHP_SELF']),0,-3)."html";
-require_once "language/german.inc.php";
-require_once("func_highlight.php");
-require_once("func_ansicht.php");
-require_once("bibellookup.php");
-
-
-$lid = $_GET['lid'];
-
-$sid = session_id();
-$datum=date("Y-m-d H:i:s");
-$result = $db->query( "INSERT INTO historie (vaid, datum, session_id, art, art_id) VALUES ('$user_vaid;', '$datum', '$sid', 'L', '$lid')" );
-
-$suchart = @$_GET['suchart'];
-$fadeout = @$_GET['fadeout'];
-
-
-if(isset($_GET['inhalt_hig'])){
-  $inhalt_hig = stripslashes($_GET['inhalt_hig']);
-  $inhalt_hig = unserialize("$inhalt_hig");
-}
-
-$verweis = @stripslashes($_GET['verweis']);
-$verweis = @unserialize($verweis);
-
-
-
-if ($user_admin == ""){ require("index.php"); exit;} //Wenn man nicht angemeldet ist, darf man nicht auf die Seite
-
-$db = dbconnect();
-$result = $db->query( "SELECT lid, txt_anz_buch, txt_buch, txt_kapitel, txt_vers, Ueberschrift, thema, unterthema, textstelle, replace(replace(replace(textstelle, ' aus ', ''), 'vgl',''), ' ','') textstelle2, vorwort, botschaft, textwort, inhalt, zusammenfassung, kontext, DATE_Format(datum, '%d.%m.%Y') as datum, kid, ukid, DATE_Format(datum, '%d') tag, DATE_Format(datum, '%m') monat, DATE_Format(datum, '%Y') jahr, ukid, DATE_Format(datum, '%Y-%m-%d')AS datum_berechnung, stapgd
-                         FROM quelle
-                        WHERE lid='$lid'");
-$row = $result->fetch_array();
-
-$result_link_bibel = $db->query( "SELECT bibellink
-                                     FROM profil
-                                    WHERE user='$user_admin'");
-$row_link_bibel = $result_link_bibel->fetch_array();
-
-$result_count = $db->query( "SELECT count(*) Anz
-                              FROM quelle_cache
-                             WHERE link = '$row_link_bibel[bibellink]'
-                               AND lid='$lid'");
-$row_cache_count = $result_count->fetch_array();
-
-$ueberschrift = html_entity_decode($row['Ueberschrift']);
-
-# typografische Anführungszeichen im UTF8 Format Korrekt darstellen
-$ueberschrift = preg_replace("/\x{0084}/u","&bdquo;",$ueberschrift);
-$ueberschrift = preg_replace("/\x{0093}/u","&ldquo;",$ueberschrift);
-
-
-
-$wochentag = date("l", mktime(0,0,0,$row['monat'],$row['tag'],$row['jahr']));
-
-$result_gd = $db->query( "SELECT wgd FROM profil WHERE user = '$user_admin'");
-$row_gd = $result_gd->fetch_array();
-
-if($wochentag == 'Wednesday' AND $row_gd['wgd'] != '0' AND ($row['ukid'] == '1')){  // Hintergrund kommt aus der wort_wahl.php. Es gibt einige Gottesdienste, die auf einen Mittwoch fallen (1. vom Monat) aber kein Tag addiert werden darf, daher: Wann muss ein Tag (faktor) addiert werden, generell, wenn Wochengottesdienst, wenn Faktor im Profil != 0 und wenn unterkategorie 1 (GD normal) ist. Bei allen anderen Gottesdiensten bleibt der Mittwoch erhalten. (Buß und Bettag ist Mittwoch, Erntedank bleibt auch am 1. des Monats)
-  $datum_wt = date("d.m.Y", mktime(0,0,0,$row['monat'],$row['tag']+$row_gd['wgd'],$row['jahr']));
-  $wochentag = date("l", mktime(0,0,0,$row['monat'],$row['tag']+$row_gd['wgd'],$row['jahr']));
-}else{
-  $wochentag = date("l", mktime(0,0,0,$row['monat'],$row['tag'],$row['jahr']));
-  $datum_wt = date("d.m.Y", mktime(0,0,0,$row['monat'],$row['tag'],$row['jahr']));
-}
-
-
-
-switch($wochentag)
-{
-  case 'Sunday':
-      $wochentag_wt = "So.";
-      break;
-  case 'Monday':
-      $wochentag_wt = "Mo.";
-      break;
-  case 'Tuesday':
-      $wochentag_wt = "Di.";
-      break;
-  case 'Wednesday':
-      $wochentag_wt = "Mi.";
-      break;
-  case 'Thursday':
-      $wochentag_wt = "Do.";
-      break;
-  case 'Friday':
-      $wochentag_wt = "Fr.";
-      break;
-  case 'Saturday':
-      $wochentag_wt = "Sa.";
-      break;
-}
-
-
-$result1 = $db->query( "SELECT bezeichnung
-                          FROM kategorie
-                         WHERE kid='$row[kid]'");
-$row1 = $result1->fetch_array();
-$cat_text = $row1['bezeichnung'];
-
-$result2 = $db->query( "SELECT bezeichnung
-                          FROM unterkategorie
-                         WHERE ukid='$row[ukid]'");
-$row2 = $result2->fetch_array();
-
-$result3 = $db->query( "SELECT bezeichnung
-                          FROM thema
-                         WHERE tid='$row[thema]'");
-$row3 = $result3->fetch_array();
-$thema_head = $row3['bezeichnung'];
-
-$result4 = $db->query( "SELECT bezeichnung
-                          FROM unterthema
-                         WHERE tid='$row[thema]'
-                           AND utid='$row[unterthema]'");
-$row4 = $result4->fetch_array();
-
-
-
-
-$textwort = strip_tags($row['textwort']);
-if($row_cache_count['Anz'] == 0){
-  $vorwort = strip_tags($row['vorwort'], '<br>,<b>,<strong>,<ul>,<li>,<ol>,<a>');
-  $botschaft = strip_tags($row['botschaft'], '<br>,<b>,<strong>,<ul>,<li>,<ol>,<a>');
-  $zusammenfassung = strip_tags($row['zusammenfassung'], '<br>,<b>,<strong>,<ul>,<li>,<ol>,<a>');
-  $kontext = strip_tags($row['kontext'], '<br>,<b>,<strong>,<ul>,<li>,<ol>,<a>');
-  $text = strip_tags($row['inhalt'], '<br>,<b>,<strong>,<ul>,<li>,<ol>,<a>,<table>,<tr>,<td>,<h1>,<h2>,<h3>,<img>');
- 
-  # Sonst kommt empty_string Fehlermeldung von Dom-Document. Besonders bei uralten LGs
-  if($vorwort == ''){$vorwort="<br />";}
-  if($botschaft == ''){$botschaft="<br />";}
-  if($zusammenfassung == ''){$zusammenfassung="<br />";}
-  if($kontext == ''){$kontext="<br />";}
-  if($text == ''){$text="<br />";}
-
-
-  $kontext = str_replace(' "', ' \"', $kontext);
-  $kontext =preg_replace_callback("/([0-9]\s*)?()(Sir|Mo|Jos|Ri|Rut|Sam|K&ouml;n|Chr|Esr|Neh|Est|Hiob|Ps|Spr|Pred|Hld|Jes|Jer|Kla|Klgl|Hes|St zu Dan|Dan|Hos|Joel|Am|Obd|Jona|Mi|Nah|Hab|Zef|Hag|Sach|Weish|Mal|Tob|Mt|Mk|Lk|Luk|Joh|Jh|Apg|R&ouml;m|Rom|Kor|Gal|Eph|Phil|Kol|Thess|Tim|Tit|Phlm|Ptr|Petr|Joh|Hbr|Hebr|Jak|Jk|Jud|Offb|Off)(\s*)".
-                                 "([0-9]{1,3})(\,\s*)?(aus\s*)?([0-9]{0,3})/", function($m) use (&$lid) { return refill($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $m[9], $lid);}, $kontext);
-                                 
-  $bibellink = $row_link_bibel['bibellink'];
-  $kontext=preg_replace_callback("/([0-9][0-9]?\.\s*)?(Makkab&auml;er|Johannes|Mose|K&ouml;nige|Chronik|Korinther|Samuel|Thessalonicher|Timotheus|Petrus|Gebet Manasses|St&uuml;cke zu Daniel|St&uuml;cke zu Ester|Baruch|Weisheit|Judit|Judith|Sirach|Josua|Richter|Rut|Ruth|Esra|Nehemia|Esther|Ester|Hiob|Ijob|Psalm|Spr&uuml;che|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Ezechiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matth&auml;us|Markus|Lukas|Apostelgeschichte|R&ouml;mer|Galater|Epheser|Philipper|Kolosser|Titus|Hebr&auml;er|Jakobus|Offenbarung|Philemon|Judas)(\s*[0-9]{1,3})(,\s*)?(\s*aus\s*|\s*Verse\s*|\s*Vers\s*)?([0-9]{0,3})?(\s*\-\s*|\s*\.\s*)?([0-9]{0,3})?/", function($m) use (&$lid,&$bibellink) { return makeLink($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $lid, $bibellink);}, $kontext);
-  
-  $suchmuster = '/(KNK) (([0-9]{1,2}\.?){0,5})/';
-  $kontext=preg_replace_callback($suchmuster, function($m) { return makeKNK($m[1], $m[2]);}, $kontext);
-  
-  $suchmuster2 = '/(KNK-FA) ([0-9]{1,3})/';
-  $kontext=preg_replace_callback($suchmuster2, function($m) { return makeKNK_FA($m[1], $m[2]);}, $kontext);
-  
-  
-  $zusammenfassung = str_replace(' "', ' \"', $zusammenfassung);
-  $zusammenfassung =preg_replace_callback("/([0-9]\s*)?()(Sir|Mo|Jos|Ri|Rut|Sam|K&ouml;n|Chr|Esr|Neh|Est|Hiob|Ps|Spr|Pred|Hld|Jes|Jer|Kla|Klgl|Hes|St zu Dan|Dan|Hos|Joel|Am|Obd|Jona|Mi|Nah|Hab|Zef|Hag|Sach|Weish|Mal|Tob|Mt|Mk|Lk|Luk|Joh|Jh|Apg|R&ouml;m|Rom|Kor|Gal|Eph|Phil|Kol|Thess|Tim|Tit|Phlm|Ptr|Petr|Joh|Hbr|Hebr|Jak|Jk|Jud|Offb|Off)(\s*)".
-                                  "([0-9]{1,3})(\,\s*)?(aus\s*)?([0-9]{0,3})/", function($m) use (&$lid) { return refill($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $m[9], $lid);}, $zusammenfassung);
-                                  
-  $zusammenfassung=preg_replace_callback("/([0-9][0-9]?\.\s*)?(Makkab&auml;er|Johannes|Mose|K&ouml;nige|Chronik|Korinther|Samuel|Thessalonicher|Timotheus|Petrus|Gebet Manasses|St&uuml;cke zu Daniel|St&uuml;cke zu Ester|Baruch|Weisheit|Judit|Judith|Sirach|Josua|Richter|Rut|Ruth|Esra|Nehemia|Esther|Ester|Hiob|Ijob|Psalm|Spr&uuml;che|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Ezechiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matth&auml;us|Markus|Lukas|Apostelgeschichte|R&ouml;mer|Galater|Epheser|Philipper|Kolosser|Titus|Hebr&auml;er|Jakobus|Offenbarung|Philemon|Judas)(\s*[0-9]{1,3})(,\s*)?(\s*aus\s*|\s*Verse\s*|\s*Vers\s*)?([0-9]{0,3})?(\s*\-\s*|\s*\.\s*)?([0-9]{0,3})?/", function($m) use (&$lid,&$bibellink) { return makeLink($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $lid, $bibellink);}, $zusammenfassung);
-
-  $vorwort = str_replace(' "', ' \"', $vorwort);
-  $vorwort=preg_replace_callback("/([0-9]\s*)?()(Sir|Mo|Jos|Ri|Rut|Sam|K&ouml;n|Chr|Esr|Neh|Est|Hiob|Ps|Spr|Pred|Hld|Jes|Jer|Kla|Klgl|Hes|St zu Dan|Dan|Hos|Joel|Am|Obd|Jona|Mi|Nah|Hab|Zef|Hag|Sach|Weish|Mal|Tob|Mt|Mk|Lk|Luk|Joh|Jh|Apg|R&ouml;m|Rom|Kor|Gal|Eph|Phil|Kol|Thess|Tim|Tit|Phlm|Ptr|Petr|Joh|Hbr|Hebr|Jak|Jk|Jud|Offb|Off)(\s*)".
-                         "([0-9]{1,3})(\,\s*)?(aus\s*)?([0-9]{0,3})/", function($m) use (&$lid) { return refill($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $m[9], $lid);}, $vorwort);
-                         
-  $vorwort=preg_replace_callback("/([0-9][0-9]?\.\s*)?(Makkab&auml;er|Johannes|Mose|K&ouml;nige|Chronik|Korinther|Samuel|Thessalonicher|Timotheus|Petrus|Gebet Manasses|St&uuml;cke zu Daniel|St&uuml;cke zu Ester|Baruch|Weisheit|Judit|Judith|Sirach|Josua|Richter|Rut|Ruth|Esra|Nehemia|Esther|Ester|Hiob|Ijob|Psalm|Spr&uuml;che|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Ezechiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matth&auml;us|Markus|Lukas|Apostelgeschichte|R&ouml;mer|Galater|Epheser|Philipper|Kolosser|Titus|Hebr&auml;er|Jakobus|Offenbarung|Philemon|Judas)(\s*[0-9]{1,3})(,\s*)?(\s*aus\s*|\s*Verse\s*|\s*Vers\s*)?([0-9]{0,3})?(\s*\-\s*|\s*\.\s*)?([0-9]{0,3})?/", function($m) use (&$lid,&$bibellink) { return makeLink($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $lid, $bibellink);}, $vorwort);
-
-  $botschaft = str_replace(' "', ' \"', $botschaft);
-  $botschaft=preg_replace_callback("/([0-9]\s*)?()(Sir|Mo|Jos|Ri|Rut|Sam|K&ouml;n|Chr|Esr|Neh|Est|Hiob|Ps|Spr|Pred|Hld|Jes|Jer|Kla|Klgl|Hes|St zu Dan|Dan|Hos|Joel|Am|Obd|Jona|Mi|Nah|Hab|Zef|Hag|Sach|Weish|Mal|Tob|Mt|Mk|Lk|Luk|Joh|Jh|Apg|R&ouml;m|Rom|Kor|Gal|Eph|Phil|Kol|Thess|Tim|Tit|Phlm|Ptr|Petr|Joh|Hbr|Hebr|Jak|Jk|Jud|Offb|Off)(\s*)".
-                           "([0-9]{1,3})(\,\s*)?(aus\s*)?([0-9]{0,3})/", function($m) { return refill($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $m[9], $lid);}, $botschaft);
-                           
-  $botschaft=preg_replace_callback("/([0-9][0-9]?\.\s*)?(Makkab&auml;er|Johannes|Mose|K&ouml;nige|Chronik|Korinther|Samuel|Thessalonicher|Timotheus|Petrus|Gebet Manasses|St&uuml;cke zu Daniel|St&uuml;cke zu Ester|Baruch|Weisheit|Judit|Judith|Sirach|Josua|Richter|Rut|Ruth|Esra|Nehemia|Esther|Ester|Hiob|Ijob|Psalm|Spr&uuml;che|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Ezechiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matth&auml;us|Markus|Lukas|Apostelgeschichte|R&ouml;mer|Galater|Epheser|Philipper|Kolosser|Titus|Hebr&auml;er|Jakobus|Offenbarung|Philemon|Judas)(\s*[0-9]{1,3})(,\s*)?(\s*aus\s*|\s*Verse\s*|\s*Vers\s*)?([0-9]{0,3})?(\s*\-\s*|\s*\.\s*)?([0-9]{0,3})?/", function($m) use (&$lid,&$bibellink) { return makeLink($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $lid, $bibellink);}, $botschaft);
-
-}
-
-$textstelle = str_replace (array(" ", "aus", "vgl"), array("", "", ""), $row['textstelle']);
-
-$date_nlg  = mktime(0, 0, 0, 12, 1, 2007);  // Datum ab dem neue LGs gelten
-$date_nlg_format = date("Y-m-d", $date_nlg);  // ISO-8601 Format wie in der Datenbank: Formatierung f&uuml;r Vergleiche erforderlich
-
-$switch_date = strtotime ($date_nlg_format); //Umrechnung des Fristgrenztages in eine Zahl
-$lg_datum = strtotime ($row['datum_berechnung']); // Umrechnung des Enddatums in eine Zahl
-
-$result_podcast = $db->query( "SELECT dateiname
-	                           FROM admin_rechte
-	                          WHERE admin_rolle = 'a_podcast'");
-$row_podcast = $result_podcast->fetch_array();
-
-$verzeichnis = "$row[jahr]-$row[monat]";
-$suchbegriff = "$row[jahr]_$row[monat]_$row[tag].";
-
-   
-   $verzeichnis3 = "/Leitgedanken/Podcast/$verzeichnis/";
-   $VerbindungsID = @ftp_connect($FTPServer3, 21, 1); # Timeout auf 1 Sek
-   $LoginErgebnis = @ftp_login($VerbindungsID, $FTPUser3, $FTPPasswort3);
-
-
-
-   $filename = 0;
-   $filename_podcast_lesung = 0;
-   
-   if($VerbindungsID && $LoginErgebnis)
-   {
-     $smarty->assign('ftp_ansicht_connect', "1");
-     $Dateiliste=ftp_nlist($VerbindungsID, $verzeichnis3);
-     @sort($Dateiliste);
-     for($i=0; $i<count($Dateiliste); $i++)
-     {
-     
-             $dateiname = basename($Dateiliste[$i]);
-
-          
-          if($row['ukid'] != 5){ #Jugendgottesdienst ist der Dateiname anders
-            if($row['ukid'] != 37){
-	
-             $pos = strpos($dateiname, $suchbegriff);
-#echo "$dateiname -> $suchbegriff -> $pos<br>";
-             if($pos > 0){
-               $filename = $dateiname;
-             }
-            }
-          }else{
-             $suchbegriff = "$row[jahr]_$row[monat]_JGD.";
-             $suchbegriff2 = "G_$row[jahr]_$row[monat].";
-             $pos = strpos($dateiname, $suchbegriff);
-             $pos2 = strpos($dateiname, $suchbegriff2);
-
-             if($pos != '' or $pos2 != ''){
-               $filename = $dateiname;
-#echo "pos: $pos -> pos2: $pos2 -> $filename<br>";
-             }
-          }
-          
-             $suchbegriff_lesung = "$row[jahr]_$row[monat]_$row[tag]_Lesung";
-             $pos = strpos($dateiname, $suchbegriff_lesung);
-             if($pos > 0){
-               $filename_podcast_lesung = $dateiname;
-             }
-          
-
-     }
-   }
-
-#echo "$row_podcast[dateiname]/$verzeichnis/$filename<br><br>";
-
-
-// Preg auf vollständige Bibelbücher überprüft
-$textstelle_stopmark=preg_replace_callback("/^([0-9]\.)*\s*".	//1 a
-  				 "(Philemon|Judas|Johannes|Mose|Könige|Korinther|Petrus|Sirach|Josua|Richter|Rut|Ruth|Samuel|Chronik|Esra|Nehemia|Esther|Ester|Hiob|Psalm|Sprüche|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Judit|Weisheit|Baruch|Makkabäer|Stücke zu Ester|Stücke zu Daniel|Gebet Manasses|Matthäus|Markus|Lukas|Apostelgeschichte|Römer|Galater|Epheser|Philipper|Kolosser|Thessalonicher|Timotheus|Titus|Hebräer|Jakobus|Offenbarung)\s*". //2
-  				 "([0-9]{1,3})". 	//3  c
-  				 "(\,)?\s*". 		//4  d
-  				 "(aus)?\s*".		//5  e
-  				 "([0-9]{0,3})".	//6  f
-  				 "(\.|-)?".		//7  g
-  				 "([0-9]{0,3})?".	//8  h
-  				 "(\.|-)?".		//9  i
-  				 "([0-9]{0,3})".        //10 j
-  				 "$/", function($m) { return splitword_stopmark($m[1], $m[2], $m[3], $m[6], $m[7], $m[8], $m[9], $m[10]);},
- 				 $row['textstelle']);
-
-// stopmark Ende
-
-
-
-// Textwort: Link zu verschiedenen Onlinebibeln
-if($row_link_bibel['bibellink'] == 'lokal'){
-  $link = "<a class=\"biblelink\" href=\"javascript:bib_link_lokal1('bibelpopup/bib_popup.php?wort=$row[textstelle]&stopmark=$textstelle_stopmark&vers_select=Y','Bibellink','640','480','center','front');\">$row[textstelle]</a>";
-  
-}elseif($row_link_bibel['bibellink'] == 'bibleserver'){
-  $link = "<a href=http://www.bibleserver.com/go.php?lang={de}&bible={LUT84}&ref={$textstelle} target='_blank'>$row[textstelle]</a>";
-}
-
-  $result_verweis = $db->query( "SELECT querverweis
-                                   FROM profil
-                                  WHERE user='$user_admin'");
-  $row_verweis = $result_verweis->fetch_array();
-
-  
-  require_once("verweise.php");
-  $querverweis = verweise($lid, $user_admin, $template);
-  # Erst werden die Verweise immer erzeugt, und ich cache geschrieben, dann abgefragt, wenn was im Cac dann qv_vorhanden =1. 
-  # Verweisfenster wird dann nur eingeblendet, wenn ein Verweis vorhanden ist.
-
-  $result_te_cache = $db->query( "SELECT erg_lid
-                                    FROM quelle_verweise_cache
-                                   WHERE erg_lid = $lid" );
-  if($result_te_cache->num_rows > 0){
-    $qv_vorhanden = "1";
-  }
-
-
-######################################################################
-## Prüfung, ob Bibellesung vorhanden ist
-######################################################################
-
-  $result_lesung = $db->query( "SELECT lid
-                                  FROM quelle
-                                 WHERE datum='$row[datum_berechnung]'
-                                   AND kid = 12
-                                   AND lid != '$lid'");
-  $row_lesung = $result_lesung->fetch_array();
-
-
-if($row_lesung != ''){
-  
-  $result_lesung1 = $db->query( "SELECT lesung
-                                  FROM profil
-                                 WHERE user='$user_admin'");
-  $row_lesung1 = $result_lesung1->fetch_array();
-  
-  
-  require_once("lesung.php");
-  
-  
-  $bibellesung = lesung($row['datum_berechnung'], $template, $verzeichnis, $filename_podcast_lesung);
-
-}
-
-######################################################################
-## Ende Prüfung, ob Bibellesung vorhanden ist
-######################################################################
-
-
-
-if($row_cache_count['Anz'] == 0){
-  $text = str_replace(' "', ' \"', $text);
-  $text=preg_replace_callback("/([0-9]\s*)?()?(Sir|Mo|Jos|Ri|Rut|Sam|K&ouml;n|Chr|Esr|Neh|Est|Hiob|Ps|Spr|Pred|Hld|Jes|Jer|Kla|Klgl|Hes|St zu Dan|Dan|Hos|Joel|Am|Obd|Jona|Mi|Nah|Hab|Zef|Hag|Sach|Weish|Mal|Tob|Mt|Mk|Lk|Luk|Joh|Jh|Apg|R&ouml;m|Rom|Kor|Gal|Eph|Phil|Kol|Thess|Tim|Tit|Phlm|Ptr|Petr|Joh|Hbr|Hebr|Jak|Jk|Jud|Offb|Off)(\s*)".
-                      "([0-9]{1,3})(\,\s*)?(aus\s*)?([0-9]{0,3})/", function($m) use (&$lid) { return refill($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $m[9], $lid);}, $text);
-
-  $text = str_replace("$verweis","<a name='verweis'>$verweis</a>",$text);
-  $text=preg_replace_callback("/([0-9][0-9]?\.\s*)?(Makkab&auml;er|Johannes|Mose|K&ouml;nige|Chronik|Korinther|Samuel|Thessalonicher|Timotheus|Petrus|Gebet Manasses|St&uuml;cke zu Daniel|St&uuml;cke zu Ester|Baruch|Weisheit|Judit|Judith|Sirach|Josua|Richter|Rut|Ruth|Esra|Nehemia|Esther|Ester|Hiob|Ijob|Psalm|Spr&uuml;che|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Ezechiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matth&auml;us|Markus|Lukas|Apostelgeschichte|R&ouml;mer|Galater|Epheser|Philipper|Kolosser|Titus|Hebr&auml;er|Jakobus|Offenbarung|Philemon|Judas)(\s*[0-9]{1,3})(,\s*)?(\s*aus\s*|\s*Verse\s*|\s*Vers\s*)?([0-9]{0,3})?(\s*\-\s*|\s*\.\s*)?([0-9]{0,3})?/", function($m) use (&$lid,&$bibellink) { return makeLink($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $lid, $bibellink);}, $text);
-  $suchmuster = '/(KNK) (([0-9]{1,2}\.?){0,5})/';
-  $text=preg_replace_callback($suchmuster, function($m) { return makeKNK($m[1], $m[2]);}, $text);
-  
-  $suchmuster2 = '/(KNK-FA) ([0-9]{1,3})/';
-  $text=preg_replace_callback($suchmuster2, function($m) { return makeKNK_FA($m[1], $m[2]);}, $text);
-
-}
-
-
-
-
-
-// Automatisch in Lehre und Erkenntnis verweisen - Start
-if($row_cache_count['Anz'] == 0){
-
-  $db = dbconnect();
-  $query_lue = "SELECT eid, thema
-                  FROM lue_quelle";
-  $result_lue = $db->query( $query_lue);
-  $ln_zaehler =0;
-
-  while ($row_lue = $result_lue->fetch_array()){
-    $thema = strpos("$row_lue[thema]", "Teil");  // Ermitteln wo das Wort "Teil" steht
-
-    if($thema >0){
-      $thema = substr("$row_lue[thema]",0 ,$thema ); // Alles vor dem Wort "Teil" anzeigen
-    }else{
-      $thema = "$row_lue[thema]";
-    }
-    $thema = trim($thema);
-
- 
- 
- while(substr($thema, -1) =='-' or substr($thema, -1)==':' or substr($thema, -1) =='(' or substr($thema, -1) ==' '){
-  $thema =trim($thema);
-  $thema =substr($thema, 0, -1);
-  $thema =trim($thema);
- }
-
-  if (!@in_array($thema, $thema1)) {
-    #echo "$thema<br>";
-
-    $thema2[$ln_zaehler]['thema_kurz'] =$thema;
-    $thema2[$ln_zaehler]['eid'] = $row_lue['eid'];
-    $thema2[$ln_zaehler]['thema'] =$row_lue['thema'];
-    
-    $thema1[] = $thema;
-    $ln_zaehler++;  
-  }  
-
- }
-
- #print_r($thema2);
-
-
- // Automatisch in Lehre und Erkenntnis verweisen - Ende
-
-
-
-
-
-
- #print_r($thema2);
-
-  // Automatisch in Lehre und Erkenntnis und Begriffserklärung verweisen
-  foreach ($thema2 as $wert)
-  { 
-  # Modifikator /i hinzugefügt, damit Groß- Kleinschreibung nicht beachtet wird: 21.11.2011
-  # Modifikator /i wieder weggenommen, da die Groß- Kleinschreibung nicht mehr korrekt war "Die Hoffnung auf Die Wiederkunft Christi": 05.01.2012
-  $thema_kurz =str_replace  ("/",  "\/"  ,  $wert['thema_kurz']);
-  
-  # Wenn das Thema auch noch als Begriffserklärung vorkommt, dann nicht mit dem Thema von Lehre und Erkenntnis verknüpfen,
-  # sondern später mit einem Popup verknüpfen
-  $result_exeg = $db->query( "SELECT count(*) Anz FROM wort_exegese WHERE wort = '$thema_kurz'");
-  $row_exeg = $result_exeg->fetch_array();
-  
-  if($row_exeg['Anz'] >0){
-  
-    $result_exeg3 = $db->query( "SELECT verweis FROM wort_exegese WHERE upper(wort) = upper('$thema_kurz')" );
-    $row_exeg3 = $result_exeg3->fetch_array();
-   
-    $repl = "__lueexeg-$row_exeg3[verweis]-$wert[eid]__";
-    #echo $text;
-    #exit;
-    
-    
-    $text = replace_text_links("$thema_kurz", "$repl", $text);
-    $vorwort = replace_text_links("$thema_kurz", "$repl", $vorwort);
-    $botschaft = replace_text_links("$thema_kurz", "$repl", $botschaft);
-    $zusammenfassung = replace_text_links("$thema_kurz", "$repl", $zusammenfassung);
-    $kontext = replace_text_links("$thema_kurz", "$repl", $kontext);
-
-    $text=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz", "$template");}, $text);
-    $vorwort=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz", "$template");}, $vorwort);
-    $botschaft=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz", "$template");}, $botschaft);
-    $zusammenfassung=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz", "$template");}, $zusammenfassung);
-    $kontext=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz", "$template");}, $kontext);
-    
-
-    #$text =preg_replace  ("/\b$thema_kurz\b/",  "<a class=alue href='lue_ansicht.php?eid=$wert[eid]' title='Lehre und Erkenntnis: $wert[thema]' target='_parent'>$thema_kurz</a><a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $thema_kurz',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $text);
-    #$botschaft =preg_replace  ("/\b$thema_kurz\b/",  "<a class=alue href='lue_ansicht.php?eid=$wert[eid]' title='Lehre und Erkenntnis: $wert[thema]'target='_parent'>$thema_kurz</a><a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $thema_kurz',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $botschaft);
-    #$zusammenfassung =preg_replace  ("/\b$thema_kurz\b/",  "<a class=alue href='lue_ansicht.php?eid=$wert[eid]' title='Lehre und Erkenntnis: $wert[thema]' target='_parent'>$thema_kurz</a><a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $thema_kurz',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $zusammenfassung);
-    #$kontext =preg_replace  ("/\b$thema_kurz\b/",  "<a class=alue href='lue_ansicht.php?eid=$wert[eid]' title='Lehre und Erkenntnis: $wert[thema]' target='_parent'>$thema_kurz</a><a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $thema_kurz',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $kontext);
-  }
-  }
-
-  # Das gleiche nochmals mit Kleinbuchstaben am Anfanng (lcfirst). Dann wird auch "Die Hoffnung auf die Wiederkunft Christi" gefunden statt nur "Die Wiederkunft..."
-  foreach ($thema2 as $wert)
-  { 
-  $thema_kurz =str_replace  ("/",  "\/"  ,  $wert['thema_kurz']);
-  #$thema_kurz1=lcfirst($thema_kurz); # Erst ab PHP 5.3
-  $thema_kurz1 = strtolower(substr($thema_kurz,0,1)).substr($thema_kurz,1);
-  
-  # Wenn das Thema auch noch als Begriffserklärung vorkommt, dann nicht mit dem Thema von Lehre und Erkenntnis verknüpfen,
-  # sondern später mit einem Popup verknüpfen
-  $result_exeg = $db->query( "SELECT count(*) Anz FROM wort_exegese WHERE wort = '$thema_kurz1'" );
-  $row_exeg = $result_exeg->fetch_array();
-
-  
-  if($row_exeg['Anz'] >0){
-
-    $result_exeg3 = $db->query( "SELECT verweis FROM wort_exegese WHERE upper(wort) = upper('$thema_kurz1')" );
-    $row_exeg3 = $result_exeg3->fetch_array();
-
-    
-    
-    $repl = "__lueexeg-$row_exeg3[verweis]-$wert[eid]__";
-    #echo $text;
-    #exit;
-    
-    $thema_kurz1 = $thema_kurz1;
-    $text = replace_text_links("$thema_kurz1", "$repl", $text);
-    $vorwort = replace_text_links("$thema_kurz1", "$repl", $vorwort);
-    $botschaft = replace_text_links("$thema_kurz1", "$repl", $botschaft);
-    $zusammenfassung = replace_text_links("$thema_kurz1", "$repl", $zusammenfassung);
-    $kontext = replace_text_links("$thema_kurz1", "$repl", $kontext);
-   
-    $text=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz1,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz1", "$template");}, $text);
-    $vorwort=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz1,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz1", "$template");}, $vorwort);
-    $botschaft=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz1,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz1", "$template");}, $botschaft);
-    $zusammenfassung=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz1,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz1", "$template");}, $zusammenfassung);
-    $kontext=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz1,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz1", "$template");}, $kontext);
-    
-
-  
-
-    #$text =preg_replace  ("/\b$thema_kurz1\b/",  "<a class=alue href='lue_ansicht.php?eid=$wert[eid]' title='Lehre und Erkenntnis: $wert[thema]' target='_parent'>$thema_kurz1</a><a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $thema_kurz',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $text);
-    #$botschaft =preg_replace  ("/\b$thema_kurz1\b/",  "<a class=alue href='lue_ansicht.php?eid=$wert[eid]' title='Lehre und Erkenntnis: $wert[thema]'target='_parent'>$thema_kurz1</a><a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $thema_kurz',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $botschaft);
-    #$zusammenfassung =preg_replace  ("/\b$thema_kurz1\b/",  "<a class=alue href='lue_ansicht.php?eid=$wert[eid]' title='Lehre und Erkenntnis: $wert[thema]' target='_parent'>$thema_kurz1</a><a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $thema_kurz',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $zusammenfassung);
-    #$kontext =preg_replace  ("/\b$thema_kurz1\b/",  "<a class=alue href='lue_ansicht.php?eid=$wert[eid]' title='Lehre und Erkenntnis: $wert[thema]' target='_parent'>$thema_kurz1</a><a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $thema_kurz',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $kontext);
-  }
-  }
-  // Automatisch in Lehre und Erkenntnis und Begriffserklärung verweisen - Ende
-
-
-  // Begriffserklärung einbinden
-
-
-
-
-  $query_exeg1 = "SELECT distinct wort, verweis
-                    FROM wort_exegese";
-  $result_exeg1 = $db->query( $query_exeg1);
-
-  while ($row_exeg1 = $result_exeg1->fetch_array()){
-
-    if (!get_array_key($row_exeg1['wort'], $thema2)) {
-  
-  
-      $repl = "__exeg-$row_exeg1[verweis]-0__"; #eid wird nicht benötigt, daher 0
-      $exeg_wort = $row_exeg1['wort'];
-      $text = replace_text_links("$exeg_wort", "$repl", $text);
-      $vorwort = replace_text_links("$exeg_wort", "$repl", $vorwort);
-      $botschaft = replace_text_links("$exeg_wort", "$repl", $botschaft);
-      $zusammenfassung = replace_text_links("$exeg_wort", "$repl", $zusammenfassung);
-      $kontext = replace_text_links("$exeg_wort", "$repl", $kontext);
-
-
-
-
-    if(!@in_array($row_exeg1['wort'], $arr_wort)){
-     # Die Begriffserklärung wird in ein Array geschrieben, so dass die Ersetzung nur einmal stattfindet, Wenn ein gleiches Wort ein der
-     # Tabelle wort_exegese wäre, dann würde er beim zweiten durchlauf der Schleife die Ãœberschrift im Popup ersetzen:CAPTION,'$exegese_wort'
-     $arr_wort = array($row_exeg1['wort']);
-     
-     $text=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$exeg_wort,&$template) { return makepopup($m[1], $m[2], $m[3], "$exeg_wort", "$template");}, $text);
-     $vorwort=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$exeg_wort,&$template) { return makepopup($m[1], $m[2], $m[3], "$exeg_wort", "$template");}, $vorwort);
-     $botschaft=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$exeg_wort,&$template) { return makepopup($m[1], $m[2], $m[3], "$exeg_wort", "$template");}, $botschaft);
-     $zusammenfassung=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$exeg_wort,&$template) { return makepopup($m[1], $m[2], $m[3], "$exeg_wort", "$template");}, $zusammenfassung);
-     $kontext=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$exeg_wort,&$template) { return makepopup($m[1], $m[2], $m[3], "$exeg_wort", "$template");}, $kontext);
-
-     #$text =preg_replace  ("/\b$row_exeg1[wort]\b/",  "$row_exeg1[wort]<a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $row_exeg1[wort]',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $text);
-     #$botschaft=preg_replace  ("/\b$row_exeg1[wort]\b/",  "$row_exeg1[wort]<a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $row_exeg1[wort]',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $botschaft);
-     #$zusammenfassung =preg_replace  ("/\b$row_exeg1[wort]\b/",  "$row_exeg1[wort]<a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $row_exeg1[wort]',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $zusammenfassung);
-     #$kontext =preg_replace  ("/\b$row_exeg1[wort]\b/",  "$row_exeg1[wort]<a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $row_exeg1[wort]',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserklärung' border='0' height=10 src='tmpl/$template/images/i.png'></sup></a>"  ,  $kontext);
-    }
-  
-  }
-  
-  }
-
-  // Begriffserklärung einbinden - Ende
-
-
-  // Automatisch in Lehre und Erkenntnis
-  foreach ($thema2 as $wert)
-  { 
-  # Modifikator /i hinzugefügt, damit Groß- Kleinschreibung nicht beachtet wird: 21.11.2011
-  # Modifikator /i wieder weggenommen, da die Groß- Kleinschreibung nicht mehr korrekt war "Die Hoffnung auf Die Wiederkunft Christi": 05.01.2012
-  $thema_kurz =str_replace  ("/",  "\/"  ,  $wert['thema_kurz']);
-  
-  # Wenn das Thema auch noch als Begriffserklärung vorkommt, dann nicht mit dem Thema von Lehre und Erkenntnis verknüpfen,
-  # sondern später mit einem Popup verknüpfen
-  $result_exeg = $db->query( "SELECT count(*) Anz FROM wort_exegese WHERE upper(wort) = upper('$thema_kurz')" );
-  $row_exeg = $result_exeg->fetch_array();
-
-  
-  if($row_exeg['Anz'] ==0){
-
-    $repl = "__lue-0-$wert[eid]__"; #weid wird nicht benötigt, daher 0
-
-    
-
-    #echo "$thema_kurz -> $repl<br>\n";
-    $text = replace_text_links("$thema_kurz", "$repl", $text);
-    $vorwort = replace_text_links("$thema_kurz", "$repl", $vorwort);
-    $botschaft = replace_text_links("$thema_kurz", "$repl", $botschaft);
-    $zusammenfassung = replace_text_links("$thema_kurz", "$repl", $zusammenfassung);
-    $kontext = replace_text_links("$thema_kurz", "$repl", $kontext);
-    
-    $text=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz", "$template");}, $text);
-    $vorwort=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz", "$template");}, $vorwort);
-    $botschaft=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz", "$template");}, $botschaft);
-    $zusammenfassung=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz", "$template");}, $zusammenfassung);
-    $kontext=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz", "$template");}, $kontext);
-
-
-  }
-  }
-
-
-  # Das geliche nochmals mit Kleinbuchstaben am Anfanng (lcfirst). Dann wird auch "Die Hoffnung auf die Wiederkunft Christi" gefunden statt nur "Die Wiederkunft..."
-  foreach ($thema2 as $wert)
-  { 
-  $thema_kurz =str_replace  ("/",  "\/"  ,  $wert['thema_kurz']);
-  #$thema_kurz=lcfirst($thema_kurz); # Erst ab PHP 5.3
-  $thema_kurz1 = strtolower(substr($thema_kurz,0,1)).substr($thema_kurz,1);
-  
-  # Wenn das Thema auch noch als Begriffserklärung vorkommt, dann nicht mit dem Thema von Lehre und Erkenntnis verknüpfen,
-  # sondern später mit einem Popup verknüpfen
-  $result_exeg = $db->query( "SELECT count(*) Anz FROM wort_exegese WHERE upper(wort) = upper('$thema_kurz')" );
-  $row_exeg = $result_exeg->fetch_array();
-  
-  if($row_exeg['Anz'] ==0){
-      
-      $repl = "__lue-0-$wert[eid]__"; #weid wird nicht benötigt, daher 0
-      
-      $thema_kurz1 = $thema_kurz1;
-      #echo "$thema_kurz -> $repl<br>\n";
-      $text = replace_text_links("$thema_kurz1", "$repl", $text);
-      $vorwort = replace_text_links("$thema_kurz1", "$repl", $vorwort);
-      $botschaft = replace_text_links("$thema_kurz1", "$repl", $botschaft);
-      $zusammenfassung = replace_text_links("$thema_kurz1", "$repl", $zusammenfassung);
-      $kontext = replace_text_links("$thema_kurz1", "$repl", $kontext);
-      
-      $text=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz1,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz1", "$template");}, $text);
-      $vorwort=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz1,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz1", "$template");}, $vorwort);
-      $botschaft=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz1,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz1", "$template");}, $botschaft);
-      $zusammenfassung=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz1,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz1", "$template");}, $zusammenfassung);
-      $kontext=preg_replace_callback("/__(lue|exeg|lueexeg)-([0-9]*)-([0-9]*)__/", function($m) use (&$thema_kurz1,&$template) { return makepopup($m[1], $m[2], $m[3], "$thema_kurz1", "$template");}, $kontext);
-      
-  }
-  }
-
-  // Automatisch in Lehre und Erkenntnis - Ende
-
-
-
-
-
-
-  if ($suchart == 1){
-    $suchopt = "{0,1}";
-  }else{
-    $suchopt = "";
-  }
-  
-  if(!isset($inhalt_hig)){
-    $text2 = $text;
-  }else{
-    $text2 = highlight_results(" ".$text." ", $suchopt, "$inhalt_hig");
-  }
-
-} # Ende: if($row_cache_count['Anz'] == 0){
-
-###########################
-## Ausgabe der Variablen ##
-###########################
-
-$smarty->assign('ansicht_fadeout', "$fadeout");
-$smarty->assign('ansicht_lid', "$lid");
-$smarty->assign('ansicht_headline_text', "$ueberschrift");
-$smarty->assign('ansicht_date', "$datum_wt");
-$smarty->assign('ansicht_weekday', "$wochentag_wt");
-$smarty->assign('ansicht_cat_text', "$cat_text");
-$smarty->assign('ansicht_thema_text', "$thema_head");
-
-if($row4['bezeichnung'] != ""){
-  $smarty->assign('ansicht_subthema_exists', "1");
-  $subthema = $row4['bezeichnung'];
-  $smarty->assign('ansicht_subthema_text', "$subthema");
-}
-
-if($row2['bezeichnung'] != ''){
-  $smarty->assign('ansicht_subcat_exists', "1");
-  $subcat_text = $row2['bezeichnung'];
-  $smarty->assign('ansicht_subcat_text', "$subcat_text");
-} 
-
-if ($row['stapgd'] == 'Y' AND $row['ukid'] != '37'){
-  $smarty->assign('ansicht_stapgd_exists', "1");
-  $smarty->assign('ansicht_stapgd_text', "Aus einem Gottesdienst des Stammapostels");
-}
-  
-if ($row['stapgd'] == 'Y' AND $row['ukid'] == '37'){
-  $smarty->assign('ansicht_stapgd1_exists', "1");
-  $smarty->assign('ansicht_stapgd1_text', "Stammapostelsgottesdienst");
-}
-
-if ($lg_datum >= $switch_date){
-  $smarty->assign('ansicht_lg_new', "1");
-}
-
-if(rore($user_admin,'a_pdf','RE')){
-  $smarty->assign('ansicht_icon_pdf_right', "1");
-  $smarty->assign('ansicht_icon_pdf', "<a href=\"pdf_gen.php?lid=$lid\" target='_blank'><img src=\"images/ico_pdf.gif\" border=\"0\"></a>");
-}
-
-if(rore($user_admin,'a_wortbear','RE')){
-  $smarty->assign('ansicht_icon_edit_right', "1");
-  $smarty->assign('ansicht_icon_edit', "<a href=\"wort_bearbeiten.php?action=bearbeiten1&wort=$lid\" target=\"_parent\"><img src=\"images/edit.png\" border=\"0\"></a>");
-}
-
-
-if(rore($user_admin,'a_outlook','RE')){
-  $smarty->assign('ansicht_icon_outlook_right', "1");
-  $smarty->assign('ansicht_icon_outlook', "<a href=\"outlook.php?lid=$lid&typ=1\"><img src=\"images/outlook.gif\" border=\"0\"></a>");
-}
-
-if(rore($user_admin,'a_podcast','RE') and $filename != ''){
-#echo "$row_podcast[dateiname]/$verzeichnis/$filename<br><br>";
-  $smarty->assign('ansicht_icon_podcast_right', "1");
-  $smarty->assign('ansicht_icon_podcast', "<a href=\"$row_podcast[dateiname]/$verzeichnis/$filename\" target='top'><img src=\"images/lautsprecher.gif\" border=\"0\"></a>");
-}
-
-
-
-$smarty->assign('ansicht_textwort_link', "$link");
-
-if(isset($qv_vorhanden) AND $qv_vorhanden == '1'){
-  $smarty->assign('ansicht_qv_vorhanden', "1");
-  $smarty->assign('ansicht_qv_modus', "$row_verweis[querverweis]");
-  $smarty->assign('ansicht_qv_gen', "$querverweis");
-}
-
-
-if($row_lesung != ''){
-  $smarty->assign('ansicht_lesung_vorhanden', "1");
-  $smarty->assign('ansicht_lesung_modus', "$row_lesung1[lesung]");
-  $smarty->assign('ansicht_lesung_gen', "$bibellesung");
-}
-
-if($textwort != ''){
-  $textwort = $textwort;
-  $smarty->assign('ansicht_textwort', "$textwort");
-} 
-
-if($verweis!=''){
-  $kontext .="<br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>";
-  $kontext .="<br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>";
-}
-
-
-
-if ($lg_datum >= $switch_date AND $row['ukid'] == '37'){
-  $smarty->assign('ansicht_inhalt_exists', "2");
-}
-
-  $result_vw = $db->query( "SELECT inhalt
-                              FROM quelle_cache
-                             WHERE link = '$row_link_bibel[bibellink]'
-                               AND lid='$lid'");
-  $row_cache_vw = $result_vw->fetch_array();
-  
-  if($row_cache_vw['inhalt'] != ""){
-    $smarty->assign('ansicht_inhalt_exists', "1"); # Variable muss nochmals gesetzt werden, da die Where Bedinung nicht greifen würde oben, da Variable im Cachemodus leer ist
-    $inhalt =  base64_decode($row_cache_vw['inhalt']);
-    $smarty->assign('ansicht_inhalt_text', "$inhalt");
-  }elseif(trim($text2) != '<br/>' AND trim($text2) != ''){
-    $smarty->assign('ansicht_inhalt_exists', "1");
-    $text2_dec = base64_encode($text2);
-    $sql1 = $db->query( "INSERT INTO quelle_cache ( lid, inhalt, link) VALUES ($lid, '$text2_dec', '$row_link_bibel[bibellink]')" );
-    $cid = $db->insert_id;
-    $smarty->assign('ansicht_inhalt_text', "$text2");
-  }
-
-
-
-if ($lg_datum >= $switch_date AND $row['ukid'] != '37'){ 
-  
-  $result_vw = $db->query( "SELECT vorwort
-                              FROM quelle_cache
-                              WHERE link = '$row_link_bibel[bibellink]'
-                                AND lid='$lid'");
-  $row_cache_vw = $result_vw->fetch_array();
-
-  
-    if($row_cache_vw['vorwort'] != ""){
-      $smarty->assign('ansicht_vorwort_exists', "1"); # Variable muss nochmals gesetzt werden, da die Where Bedinung nicht greifen würde oben, da Variable im Cachemodus leer ist
-      $vorwort = base64_decode($row_cache_vw['vorwort']);
-      $smarty->assign('ansicht_vorwort_text', "$vorwort");
-    }elseif( trim($vorwort) != '<br/>' AND trim($vorwort) != ''){
-      $smarty->assign('ansicht_vorwort_exists', "1");
-      $smarty->assign('ansicht_vorwort_text', "$vorwort");
-      $vorwort_dec =base64_encode($vorwort);
-      $sql1 = $db->query( "UPDATE quelle_cache SET vorwort='$vorwort_dec' WHERE cid=$cid" );
-  }
-}
-
-          
-if ($lg_datum >= $switch_date AND $row['ukid'] != '37'){ 
-  
-  $result_vw = $db->query( "SELECT botschaft
-                              FROM quelle_cache
-                              WHERE link = '$row_link_bibel[bibellink]'
-                                AND lid='$lid'");
-  $row_cache_vw = $result_vw->fetch_array();
-
-  if($row_cache_vw['botschaft'] != ""){
-    $smarty->assign('ansicht_botschaft_exists', "1");
-    $botschaft = base64_decode($row_cache_vw['botschaft']);
-    $smarty->assign('ansicht_botschaft_text', "$botschaft");
-  }elseif(trim($botschaft) != '<br/>' AND trim($botschaft) != ''){
-    $smarty->assign('ansicht_botschaft_exists', "1");
-    $botschaft_dec =base64_encode($botschaft);
-    $sql1 = $db->query( "UPDATE quelle_cache SET botschaft='$botschaft_dec' WHERE cid=$cid" );
-    $smarty->assign('ansicht_botschaft_text', "$botschaft");
-  }
-  
-}
-
-
-if ($lg_datum >= $switch_date AND $row['ukid'] != '37'){ 
-  
-  
-  $result_vw = $db->query( "SELECT zusammenfassung
-                              FROM quelle_cache
-                             WHERE link = '$row_link_bibel[bibellink]'
-                               AND lid='$lid'" );
-  $row_cache_vw = $result_vw->fetch_array();
-
-  
-  if($row_cache_vw['zusammenfassung'] != ""){
-    $smarty->assign('ansicht_zusammenfassung_exists', "1"); # Variable muss nochmals gesetzt werden, da die Where Bedinung nicht greifen würde oben, da Variable im Cachemodus leer ist
-    $zusammenfassung =  base64_decode($row_cache_vw['zusammenfassung']);
-    $smarty->assign('ansicht_zusammenfassung_text', "$zusammenfassung");
-  }elseif(trim($zusammenfassung) != '<br/>' AND trim($zusammenfassung) != ''){
-    $smarty->assign('ansicht_zusammenfassung_exists', "1");
-    $zusammenfassung_dec = base64_encode($zusammenfassung);
-    $sql1 = $db->query( "UPDATE quelle_cache SET zusammenfassung='$zusammenfassung_dec' WHERE cid=$cid" );
-    $smarty->assign('ansicht_zusammenfassung_text', "$zusammenfassung");
-  }
-  
-  
-}
-
-if ($lg_datum >= $switch_date AND $row['ukid'] != '37'){ 
-
-  $result_vw = $db->query( "SELECT kontext
-                              FROM quelle_cache
-                             WHERE link = '$row_link_bibel[bibellink]'
-                               AND lid='$lid'" );
-  $row_cache_vw = $result_vw->fetch_array();
-
-  
-  if($row_cache_vw['kontext'] != ""){
-    $smarty->assign('ansicht_kontext_exists', "1");
-    $kontext =  base64_decode($row_cache_vw['kontext']);
-    $smarty->assign('ansicht_kontext_text', "$kontext");
-  }elseif(trim($kontext) != '<br/>' AND trim($kontext) != ''){
-    $smarty->assign('ansicht_kontext_exists', "1");
-    $kontext_dec = base64_encode($kontext);
-    $sql1 = $db->query( "UPDATE quelle_cache SET kontext='$kontext_dec' WHERE cid=$cid" );
-    $smarty->assign('ansicht_kontext_text', "$kontext");
-  }
-  
-  
-  
-}
-
-## Ausgabe Variablen Ende ##
-
-$smarty->display("$template/$templatename");
-?>
\ No newline at end of file
diff --git a/bibellookup.php_lut84_20180219 b/bibellookup.php_lut84_20180219
deleted file mode 100644
index 05e213d6..00000000
--- a/bibellookup.php_lut84_20180219
+++ /dev/null
@@ -1,394 +0,0 @@
-<?php
-
-function mailnachricht($wort, $art, $id)
-{
-  $db = dbconnect();  #12.09.2014
-  $user_admin=$_COOKIE["user_admin"];
-  $empfaenger = "admin@lg-on.de";
-  $betreff = "Leitgedanken-Online: Fehler bei Bibelstelle";
-
-           if($art=='T'){
-            $systemart="Textwort";
-            $result1_daten = $db->query("SELECT ueberschrift,date_format(datum, '%d.%m.%Y') datum
-                                            FROM quelle
-                                           WHERE lid = '$id'
-	                                ");
-            $row_daten = $result1_daten->fetch_array();	      
-            
-            $info ="$row_daten[ueberschrift] ($row_daten[datum])";
-           
-           }
-           
-           if($art=='L'){
-            $systemart="Lehre und Erkenntnis";
-            $result1_daten = $db->query("SELECT thema
-                                            FROM lue_quelle
-                                           WHERE eid = '$id'
-	                                ");
-            $row_daten = $result1_daten->fetch_array();	      
-            
-            $info ="$row_daten[thema]";
-           }
-           
-           if($art=='B'){
-            $systemart="Luther Bibel 1984";
-
-            $info ="Falscher Textverweis in Bibelstelle";
-           }
-           
-           $result_user = $db->query("SELECT nachname, vorname FROM admin where user=\"$user_admin\"");
-           $row_user = $result_user->fetch_array();	      
-
-
-  $text = "
-    <html>
-    <head>
-    <title>Fehler bei Bibelstelle</title>
-    </head>
-    <body>
-    <font face='Arial' size='2'>
-    Guten Tag!<br><br>
-    In Leitgedanken Online wurde ein Fehler in der einer Bibelstelle gefunden.
-    <br>
-    <br>
-    <table>
-    <tr>
-       <td valign='top'>
-         <font face='Arial' size='2'>
-           Textwort:
-         </font>
-       </td>
-       <td valign='top'>
-         <font face='Arial' size='2'>
-           <b>$wort</b>
-         </font>
-       </td>
-    </tr>
-    <tr>
-       <td valign='top'>
-         <font face='Arial' size='2'>
-           System:
-         </font>
-       </td>
-       <td valign='top'>
-         <font face='Arial' size='2'>
-           <b>$systemart</b>
-         </font>
-       </td>
-    </tr>
-    <tr>
-        <td valign='top'>
-          <font face='Arial' size='2'>
-            Thema:
-          </font>
-        </td>
-        <td valign='top'>
-          <font face='Arial' size='2'>
-            <b>$info</b>
-          </font>
-        </td>
-    </tr>
-    <tr>
-        <td valign='top'>
-          <font face='Arial' size='2'>
-            ID:
-          </font>
-        </td>
-        <td valign='top'>
-          <font face='Arial' size='2'>
-            <b>$id</b>
-          </font>
-        </td>
-    </tr>
-    <tr>
-        <td valign='top'>
-          <font face='Arial' size='2'>
-            Betroffener:
-          </font>
-        </td>
-        <td valign='top'>
-          <font face='Arial' size='2'>
-            <b>$row_user[vorname] $row_user[nachname]</b>
-          </font>
-        </td>
-    </tr>
-    </table>
-    <br>
-    Bitte korrigieren Sie den Fehler umgehend!
-    <p>
-    Diese Mail wurde automatisch generiert!<br>
-    Antworten Sie daher nicht auf diese Mail<br>
-    <br>
-    Vielen Dank
-    </body>
-    </html>";
-
-
-$headers = "MIME-Version: 1.0\n";
-#$headers .= "Content-type: text/html; charset=iso-8859-1\n";
-$headers .= "Content-type: text/html; charset=utf-8\n";
-$headers .= "From: Leitgedanken Online <admin@lg-on.de>\n";
-    
-@$return = @mail($empfaenger, $betreff, $text,  $headers);
-
-}
-
-
-# Text zwischen Text ausblenden, wie Überschriften
-# http://entwickler-forum.de/showthread.php?t=61357
-function strip_only($str, $tags, $stripContent = false) {
-    $content = '';
-    if(!is_array($tags)) {
-        $tags = (strpos($str, '>') !== false ? explode('>', str_replace('<', '', $tags)) : array($tags));
-        if(end($tags) == '') array_pop($tags);
-    }
-    foreach($tags as $tag) {
-        if ($stripContent)
-             $content = '(.+</'.$tag.'[^>]*>|)';
-         $str = preg_replace('#</?'.$tag.'[^>]*>'.$content.'#is', '', $str);
-    }
-    return $str;
-}
-
-
-
-function splitWord($a, $b, $c, $d, $e, $f, $g, $h, $art, $id)
-{
-
-/*
-$ "a: '$a'<br>
-      b: '$b'<br>
-      c: '$c'<br>
-      d: '$d'<br>
-      e: '$e'<br>
-      f: '$f'<br>
-      g: '$g'<br>
-      h: '$h'<br>
-      i: '$i'<br>
-      <br>
-      ";
-*/
-
-// mehrere Textwörter
-
-if($g=='-'){
-  
-  $db = dbconnect();
-  $result1_pruef = $db->query("SELECT count(*) Anz
-                            FROM bibel_lut_1984
-  	                   WHERE anz_buch = '$a'
-  	                     AND buch = '$b'
-  	                     AND kapitel ='$c'
-  	                     AND vers = '$f'
-                           ORDER BY bid ASC
-                       ");
-  $row_pruef1 = $result1_pruef->fetch_array();	
-  
-  
-  $result2_pruef = $db->query("SELECT count(*) Anz
-                            FROM bibel_lut_1984
-  	                   WHERE anz_buch = '$a'
-  	                     AND buch = '$b'
-  	                     AND kapitel ='$c'
-  	                     AND vers = '$h'
-                           ORDER BY bid ASC
-                       ");
-  $row_pruef2 = $result2_pruef->fetch_array();	
-  
-  
-  if($row_pruef1['Anz'] > 0 AND $row_pruef2 ['Anz'] > 0){
-  
-  $result1 = $db->query("SELECT bid
-                            FROM bibel_lut_1984
-  	                   WHERE anz_buch = '$a'
-  	                     AND buch = '$b'
-  	                     AND kapitel ='$c'
-  	                     AND vers = '$f'
-                           ORDER BY bid ASC
-                       ");
-  $row1 = $result1->fetch_array();	
-
-  $result2 = $db->query("SELECT bid
-                            FROM bibel_lut_1984
-  	                   WHERE anz_buch = '$a'
-  	                     AND buch = '$b'
-  	                     AND kapitel ='$c'
-  	                     AND vers = '$h'
-                           ORDER BY bid ASC
-                       ");
-  $row2 = $result2->fetch_array();	
-  
-  
- 
-  $query = "SELECT vers, inhalt
-              FROM bibel_lut_1984
-  	     WHERE bid between $row1[bid] AND $row2[bid]
-  	       AND vers !=''
-             ORDER BY bid ASC
-           ";
-
-  $result = $db->query( $query)
-	   or die ("Cannot execute query: mehrere Textwörter");
-
-  // Schleife über alle Kapitel der Bibel
-  $ret_wort = "";
-
-  while ($row = $result->fetch_array()){
-  # Text zwischen Überschriften wegfiltern
-  $tags = 'h3';
-  $inhalt = strip_only($row['inhalt'], $tags, true); // text 
-  
-  $ret_wort .= " <span class=\'verse\'>$row[vers]</span> $inhalt";
-  }
-
-  }else{
-   $ret_wort ="Die Textstelle konnte nicht geladen werden<br>Evtl liegt ein Schreibfehler vor. <br>Der Administrator wurde verst&auml;ndigt!";
-   $wort="$a$b $c$d$e$f$g$h";
-   mailnachricht($wort, $art,$id);
-   
-  }
-}
-
-// einzelne Textstellen
-if($g=='' AND $f!=''){
-  $db = dbconnect();
-  $result_pruef = $db->query("SELECT count(*) Anz
-                            FROM bibel_lut_1984
-  	                   WHERE anz_buch = '$a'
-  	                     AND buch = '$b'
-  	                     AND kapitel ='$c'
-  	                     AND vers = '$f'
-                           ORDER BY bid ASC
-                       ");
-  $row_pruef = $result_pruef->fetch_array();
-  
-  
-  
-  if($row_pruef['Anz'] > 0){
-  $result1 = $db->query("SELECT bid
-                            FROM bibel_lut_1984
-  	                   WHERE anz_buch = '$a'
-  	                     AND buch = '$b'
-  	                     AND kapitel ='$c'
-  	                     AND vers = '$f'
-                           ORDER BY bid ASC
-                       ");
-  $row1 = $result1->fetch_array();
-
- 
-  $query = "SELECT vers, inhalt
-              FROM bibel_lut_1984
-  	     WHERE bid = $row1[bid]
-  	       AND vers !=''
-             ORDER BY bid ASC
-           ";
-
-  $result = $db->query( $query)
-            or die ("Cannot execute query");
-
-  // Schleife über alle Kapitel der Bibel
-  $ret_wort = "";
-
-  while ($row = $result->fetch_array()){
-  
-  # Text zwischen Überschriften wegfiltern
-  $tags = 'h3';
-  $inhalt = strip_only($row['inhalt'], $tags, true); // text 
-
-  $ret_wort .= " <span class=\'verse\'>$row[vers]</span> $inhalt";
-  }
-  
-  }else{
-   $ret_wort ="Die Textstelle konnte nicht geladen werden<br>Evtl liegt ein Schreibfehler vor. <br>Der Administrator wurde verst&auml;ndigt!";
-   $wort="$a$b $c$d$e$f$g$h";
-   mailnachricht($wort, $art,$id);
-  }
-  
-}
-
-// ganze Kapitel
-if($g=='' AND $f==''){
-  $db = dbconnect();
-
-  $query = "SELECT vers, inhalt
-              FROM bibel_lut_1984
-  	     WHERE anz_buch = '$a'
-  	       AND buch = '$b'
-  	       AND kapitel ='$c'
-  	       AND vers != ''
-             ORDER BY bid ASC
-           ";
-
-
-  $result = $db->query( $query)
-            or die ("Cannot execute query: Ganze Kapitel");
-
-  // Schleife über alle Kapitel der Bibel
-  $ret_wort = "";
-  
-  while ($row = $result->fetch_array()){
-  
-  # Text zwischen Überschriften wegfiltern
-  $tags = 'h3';
-  $inhalt = strip_only($row['inhalt'], $tags, true); // text 
-  
-  $ret_wort .= " <span class=\'verse\'>$row[vers]</span> $inhalt";
-  }
-
-  $max=1000;
-  $origin=strlen($ret_wort);
-  $ret_wort = substr($ret_wort.' ' , 0 , $max + 1);
-  $ret_wort = substr($ret_wort , 0 , strrpos ($ret_wort , ' '));
-
-  $ret_wort = strip_tags($ret_wort, '<nobr><em>,<span>,<br>,<b>,<strong>,<ul>,<li>,<ol>,<a>');
-  if($max<=$origin){ 
-   # Funktioniert manchmal nicht, da nicht zwischen Wort getrennt wird [strrpos ($ret_wort , ' ')] sondern immer nach einem
-   # vollständigen Wort. Das Merkmal ist: Wenn ein Leerzeichen kommt, dann trennen.
-   # Es kann passieren, dass es dann nach dem Wort span [<span class=\'verse\'>] getrennt wird,
-   # Dann sieht es so aus: <span<nobr> <b>[...]</b></nobr>, weil nach dem Span ein Leerzeichen kommt.
-   # Der Tag wird dann nicht dargestellt.
-   # Zur Minderung: $ret_wort = strip_tags($ret_wort, '<nobr><em>,<span>,<br>,<b>,<strong>,<ul>,<li>,<ol>,<a>');
-   $ret_wort.="<nobr> <b>[...]</b></nobr>";
-  } 
-  
-}
-
-$wort="$a$b $c$d$e$f$g$h";
-$sql1 = $db->query( "INSERT INTO test (wort, inhalt) VALUES ('$wort', '$ret_wort')" );
-
-
-$ret_wort=trim($ret_wort);
-$ret_wort = strip_tags($ret_wort, '<nobr><em>,<span>,<br>,<b>,<strong>,<ul>,<li>,<ol>,<a>');
-$ret_wort =str_replace  ("#",  "\#"  ,  $ret_wort);
-return $ret_wort;
-
-}
-
-
-function getword($wort){
-      
-      $wort = str_replace (array("&auml;", "&Auml;", "&uuml;", "&Uuml;", "&ouml;", "&Ouml;", "&szlig;")
-                         , array("ä", "Ä", "ü", "Ü", "ö", "Ö", "ß")
-                         , $wort
-                          );
-  
-  $trenner = explode("|", $wort);
-  $wort = $trenner[0];
-  
-  if(isset($trenner[1])){
-    $art = $trenner[1];
-  }else{
-    $art = "";
-  }
-  
-  if(isset($trenner[2])){
-    $id = $trenner[2];
-  }else{
-    $id = "";
-  }
-  
-  return preg_replace_callback("/([0-9][0-9]?\.\s*)?(Philemon|Judas|Johannes|Mose|Könige|Chronik|Korinther|Samuel|Thessalonicher|Timotheus|Petrus|Sirach|Mose|Josua|Richter|Rut|Ruth|Samuel|Könige|Chronik|Esra|Nehemia|Esther|Ester|Hiob|Psalm|Sprüche|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Judit|Weisheit|Baruch|Makkabäer|Stücke zu Ester|Stücke zu Daniel|Gebet Manasses|Matthäus|Markus|Lukas|Apostelgeschichte|Römer|Korinther|Galater|Epheser|Philipper|Kolosser|Thessalonicher|Timotheus|Titus|Hebräer|Jakobus|Offenbarung)(\s*[0-9]{1,3})(,\s*)?(\s*aus\s*|\s*Vers\s*)?([0-9]{0,3})?(\-|\.{0,1})?([0-9]{0,3})?/", function($m) use (&$art,&$id) { return splitWord($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8],"$art", "$id");}, $wort);
-}
-
-
-?>
\ No newline at end of file
diff --git a/bibellookup_2017.php_20200212 b/bibellookup_2017.php_20200212
deleted file mode 100644
index a8b328b6..00000000
--- a/bibellookup_2017.php_20200212
+++ /dev/null
@@ -1,399 +0,0 @@
-<?php
-
-function mailnachricht($wort, $art, $id)
-{
-  $db = dbconnect();  #12.09.2014
-  $user_admin=$_COOKIE["user_admin"];
-  $empfaenger = "admin@lg-on.de";
-  $betreff = "Leitgedanken-Online: Fehler bei Bibelstelle";
-
-           if($art=='T'){
-            $systemart="Textwort";
-            $result1_daten = $db->query("SELECT ueberschrift,date_format(datum, '%d.%m.%Y') datum
-                                            FROM quelle
-                                           WHERE lid = '$id'
-	                                ");
-            $row_daten = $result1_daten->fetch_array();	      
-            
-            $info ="$row_daten[ueberschrift] ($row_daten[datum])";
-           
-           }
-           
-           if($art=='L'){
-            $systemart="Lehre und Erkenntnis";
-            $result1_daten = $db->query("SELECT thema
-                                            FROM lue_quelle
-                                           WHERE eid = '$id'
-	                                ");
-            $row_daten = $result1_daten->fetch_array();	      
-            
-            $info ="$row_daten[thema]";
-           }
-           
-           if($art=='B'){
-            $systemart="Luther Bibel 2017";
-
-            $info ="Falscher Textverweis in Bibelstelle";
-           }
-           
-           $result_user = $db->query("SELECT nachname, vorname FROM admin where user=\"$user_admin\"");
-           $row_user = $result_user->fetch_array();	      
-
-
-  $text = "
-    <html>
-    <head>
-    <title>Fehler bei Bibelstelle</title>
-    </head>
-    <body>
-    <font face='Arial' size='2'>
-    Guten Tag!<br><br>
-    In Leitgedanken Online wurde ein Fehler in der einer Bibelstelle gefunden.
-    <br>
-    <br>
-    <table>
-    <tr>
-       <td valign='top'>
-         <font face='Arial' size='2'>
-           Textwort:
-         </font>
-       </td>
-       <td valign='top'>
-         <font face='Arial' size='2'>
-           <b>$wort</b>
-         </font>
-       </td>
-    </tr>
-    <tr>
-       <td valign='top'>
-         <font face='Arial' size='2'>
-           System:
-         </font>
-       </td>
-       <td valign='top'>
-         <font face='Arial' size='2'>
-           <b>$systemart</b>
-         </font>
-       </td>
-    </tr>
-    <tr>
-        <td valign='top'>
-          <font face='Arial' size='2'>
-            Thema:
-          </font>
-        </td>
-        <td valign='top'>
-          <font face='Arial' size='2'>
-            <b>$info</b>
-          </font>
-        </td>
-    </tr>
-    <tr>
-        <td valign='top'>
-          <font face='Arial' size='2'>
-            ID:
-          </font>
-        </td>
-        <td valign='top'>
-          <font face='Arial' size='2'>
-            <b>$id</b>
-          </font>
-        </td>
-    </tr>
-    <tr>
-        <td valign='top'>
-          <font face='Arial' size='2'>
-            Betroffener:
-          </font>
-        </td>
-        <td valign='top'>
-          <font face='Arial' size='2'>
-            <b>$row_user[vorname] $row_user[nachname]</b>
-          </font>
-        </td>
-    </tr>
-    </table>
-    <br>
-    Bitte korrigieren Sie den Fehler umgehend!
-    <p>
-    Diese Mail wurde automatisch generiert!<br>
-    Antworten Sie daher nicht auf diese Mail<br>
-    <br>
-    Vielen Dank
-    </body>
-    </html>";
-
-
-$headers = "MIME-Version: 1.0\n";
-#$headers .= "Content-type: text/html; charset=iso-8859-1\n";
-$headers .= "Content-type: text/html; charset=utf-8\n";
-$headers .= "From: Leitgedanken Online <admin@lg-on.de>\n";
-    
-@$return = @mail($empfaenger, $betreff, $text,  $headers);
-
-}
-
-
-# Text zwischen Text ausblenden, wie Überschriften
-# http://entwickler-forum.de/showthread.php?t=61357
-function strip_only($str, $tags, $stripContent = false) {
-    $content = '';
-    if(!is_array($tags)) {
-        $tags = (strpos($str, '>') !== false ? explode('>', str_replace('<', '', $tags)) : array($tags));
-        if(end($tags) == '') array_pop($tags);
-    }
-    foreach($tags as $tag) {
-        if ($stripContent)
-             $content = '(.+</'.$tag.'[^>]*>|)';
-         $str = preg_replace('#</?'.$tag.'[^>]*>'.$content.'#is', '', $str);
-    }
-    return $str;
-}
-
-
-
-function splitWord($a, $b, $c, $d, $e, $f, $g, $h, $art, $id)
-{
-
-/*
-$ "a: '$a'<br>
-      b: '$b'<br>
-      c: '$c'<br>
-      d: '$d'<br>
-      e: '$e'<br>
-      f: '$f'<br>
-      g: '$g'<br>
-      h: '$h'<br>
-      i: '$i'<br>
-      <br>
-      ";
-*/
-
-// mehrere Textwörter
-
-if($g=='-'){
-  
-  $db = dbconnect();
-  $result1_pruef = $db->query("SELECT count(*) Anz
-                            FROM bibel_lut_2017
-  	                   WHERE anz_buch = '$a'
-  	                     AND buch = '$b'
-  	                     AND kapitel ='$c'
-  	                     AND vers = '$f'
-                           ORDER BY bid ASC
-                       ");
-  $row_pruef1 = $result1_pruef->fetch_array();	
-  
-  
-  $result2_pruef = $db->query("SELECT count(*) Anz
-                            FROM bibel_lut_2017
-  	                   WHERE anz_buch = '$a'
-  	                     AND buch = '$b'
-  	                     AND kapitel ='$c'
-  	                     AND vers = '$h'
-                           ORDER BY bid ASC
-                       ");
-  $row_pruef2 = $result2_pruef->fetch_array();	
-  
-  
-  if($row_pruef1['Anz'] > 0 AND $row_pruef2 ['Anz'] > 0){
-  
-  $result1 = $db->query("SELECT bid
-                            FROM bibel_lut_2017
-  	                   WHERE anz_buch = '$a'
-  	                     AND buch = '$b'
-  	                     AND kapitel ='$c'
-  	                     AND vers = '$f'
-                           ORDER BY bid ASC
-                       ");
-  $row1 = $result1->fetch_array();	
-
-  $result2 = $db->query("SELECT bid
-                            FROM bibel_lut_2017
-  	                   WHERE anz_buch = '$a'
-  	                     AND buch = '$b'
-  	                     AND kapitel ='$c'
-  	                     AND vers = '$h'
-                           ORDER BY bid ASC
-                       ");
-  $row2 = $result2->fetch_array();	
-  
-  
- 
-  $query = "SELECT vers, inhalt
-              FROM bibel_lut_2017
-  	     WHERE bid between $row1[bid] AND $row2[bid]
-  	       AND vers !=''
-             ORDER BY bid ASC
-           ";
-
-  $result = $db->query( $query)
-	   or die ("Cannot execute query: mehrere Textwörter");
-
-  // Schleife über alle Kapitel der Bibel
-  $ret_wort = "";
-
-  while ($row = $result->fetch_array()){
-  # Text zwischen Überschriften wegfiltern
-
-  $tags = 'h3';
-  $inhalt = strip_only($row['inhalt'], $tags, true); // text 
-
-  $ret_wort .= " <span class=\'verse\'>$row[vers]</span> $inhalt";
-  }
-
-  }else{
-   $ret_wort ="Die Textstelle konnte nicht geladen werden<br>Evtl liegt ein Schreibfehler vor. <br>Der Administrator wurde verst&auml;ndigt!";
-   $wort="$a$b $c$d$e$f$g$h";
-   mailnachricht($wort, $art,$id);
-   
-  }
-}
-
-// einzelne Textstellen
-if($g=='' AND $f!=''){
-  $db = dbconnect();
-  $result_pruef = $db->query("SELECT count(*) Anz
-                            FROM bibel_lut_2017
-  	                   WHERE anz_buch = '$a'
-  	                     AND buch = '$b'
-  	                     AND kapitel ='$c'
-  	                     AND vers = '$f'
-                           ORDER BY bid ASC
-                       ");
-  $row_pruef = $result_pruef->fetch_array();
-  
-  
-  
-  if($row_pruef['Anz'] > 0){
-  $result1 = $db->query("SELECT bid
-                            FROM bibel_lut_2017
-  	                   WHERE anz_buch = '$a'
-  	                     AND buch = '$b'
-  	                     AND kapitel ='$c'
-  	                     AND vers = '$f'
-                           ORDER BY bid ASC
-                       ");
-  $row1 = $result1->fetch_array();
-
- 
-  $query = "SELECT vers, inhalt
-              FROM bibel_lut_2017
-  	     WHERE bid = $row1[bid]
-  	       AND vers !=''
-             ORDER BY bid ASC
-           ";
-
-  $result = $db->query( $query)
-            or die ("Cannot execute query");
-
-  // Schleife über alle Kapitel der Bibel
-  $ret_wort = "";
-
-  while ($row = $result->fetch_array()){
-  
-  # Text zwischen Überschriften wegfiltern
-  $tags = 'h3';
-  $inhalt = strip_only($row['inhalt'], $tags, true); // text 
-
-  $ret_wort .= " <span class=\'verse\'>$row[vers]</span> $inhalt";
-  }
-  
-  }else{
-   $ret_wort ="Die Textstelle konnte nicht geladen werden<br>Evtl liegt ein Schreibfehler vor. <br>Der Administrator wurde verst&auml;ndigt!";
-   $wort="$a$b $c$d$e$f$g$h";
-   mailnachricht($wort, $art,$id);
-  }
-  
-}
-
-// ganze Kapitel
-if($g=='' AND $f==''){
-  $db = dbconnect();
-
-  $query = "SELECT vers, inhalt
-              FROM bibel_lut_2017
-  	     WHERE anz_buch = '$a'
-  	       AND buch = '$b'
-  	       AND kapitel ='$c'
-  	       AND vers != ''
-             ORDER BY bid ASC
-           ";
-
-
-  $result = $db->query( $query)
-            or die ("Cannot execute query: Ganze Kapitel");
-
-  // Schleife über alle Kapitel der Bibel
-  $ret_wort = "";
-  
-  while ($row = $result->fetch_array()){
-  
-  # Text zwischen Überschriften wegfiltern
-  $tags = 'h3';
-  $inhalt = strip_only($row['inhalt'], $tags, true); // text 
-
-  $ret_wort .= " <span class=\'verse\'>$row[vers]</span> $inhalt";
-  }
-
-  $max=1000;
-  $origin=strlen($ret_wort);
-  $ret_wort = substr($ret_wort.' ' , 0 , $max + 1);
-  $ret_wort = substr($ret_wort , 0 , strrpos ($ret_wort , ' '));
-
-  $ret_wort = strip_tags($ret_wort, '<nobr><em>,<span>,<br>,<b>,<strong>,<ul>,<li>,<ol>,<a>');
-  if($max<=$origin){ 
-   # Funktioniert manchmal nicht, da nicht zwischen Wort getrennt wird [strrpos ($ret_wort , ' ')] sondern immer nach einem
-   # vollständigen Wort. Das Merkmal ist: Wenn ein Leerzeichen kommt, dann trennen.
-   # Es kann passieren, dass es dann nach dem Wort span [<span class=\'verse\'>] getrennt wird,
-   # Dann sieht es so aus: <span<nobr> <b>[...]</b></nobr>, weil nach dem Span ein Leerzeichen kommt.
-   # Der Tag wird dann nicht dargestellt.
-   # Zur Minderung: $ret_wort = strip_tags($ret_wort, '<nobr><em>,<span>,<br>,<b>,<strong>,<ul>,<li>,<ol>,<a>');
-   $ret_wort.="<nobr> <b>[...]</b></nobr>";
-  } 
-  
-}
-
-$wort="$a$b $c$d$e$f$g$h";
-#$sql1 = $db->query( "INSERT INTO test (wort, inhalt) VALUES ('$wort', '$ret_wort')" );
-
-
-$ret_wort=trim($ret_wort);
-$ret_wort = strip_tags($ret_wort, '<nobr><em>,<br>,<b>,<strong>,<ul>,<li>,<ol>,<a>');
-$ret_wort =str_replace  ("#",  "\#"  ,  $ret_wort);
-
-# Neu mit Lutherbibel 2017 (real_escape_string) damit die Hochkommas escaped werden
-$ret_wort = $db->real_escape_string($ret_wort);
-#echo "<pre>$ret_wort</pre>";
-return $ret_wort;
-
-}
-
-
-function getword($wort){
-      
-      $wort = str_replace (array("&auml;", "&Auml;", "&uuml;", "&Uuml;", "&ouml;", "&Ouml;", "&szlig;")
-                         , array("ä", "Ä", "ü", "Ü", "ö", "Ö", "ß")
-                         , $wort
-                          );
-  
-  $trenner = explode("|", $wort);
-  $wort = $trenner[0];
-  
-  if(isset($trenner[1])){
-    $art = $trenner[1];
-  }else{
-    $art = "";
-  }
-  
-  if(isset($trenner[2])){
-    $id = $trenner[2];
-  }else{
-    $id = "";
-  }
-  
-  return preg_replace_callback("/([0-9][0-9]?\.\s*)?(Philemon|Judas|Johannes|Mose|Könige|Chronik|Korinther|Samuel|Thessalonicher|Timotheus|Petrus|Sirach|Mose|Josua|Richter|Rut|Ruth|Samuel|Könige|Chronik|Esra|Nehemia|Esther|Ester|Hiob|Psalm|Sprüche|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Judit|Weisheit|Baruch|Makkabäer|Stücke zu Ester|Stücke zu Daniel|Gebet Manasses|Matthäus|Markus|Lukas|Apostelgeschichte|Römer|Korinther|Galater|Epheser|Philipper|Kolosser|Thessalonicher|Timotheus|Titus|Hebräer|Jakobus|Offenbarung)(\s*[0-9]{1,3})(,\s*)?(\s*aus\s*|\s*Vers\s*)?([0-9]{0,3})?(\-|\.{0,1})?([0-9]{0,3})?/", function($m) use (&$art,&$id) { return splitWord($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8],"$art", "$id");}, $wort);
-}
-
-
-?>
\ No newline at end of file
diff --git a/ftp_ansicht.php_20181214 b/ftp_ansicht.php_20181214
deleted file mode 100644
index 32bc4e77..00000000
--- a/ftp_ansicht.php_20181214
+++ /dev/null
@@ -1,230 +0,0 @@
-<?php
-/*
-# Fuer debugging
-error_reporting(E_ALL);
-ini_set('display_errors', 1);
-#echo __LINE__."<br>";
-*/
-#error_reporting(E_ALL);
-#ini_set('display_errors', 1);
-
-require_once("config/ftpanbindung.php");     // f&uuml;gt die Datenbankanbindung ein
-include_once 'classes/lg-on_Smarty.class.php';
-$smarty = new lgon_Smarty();
-require_once("config.inc.php");
-require_once("func_rollenrechte.php");
-$templatename = substr(basename($_SERVER['PHP_SELF']),0,-3)."html";
-require_once "language/german.inc.php";
-
-dbconnect();
-if ($user_admin == ""){ require("index.php"); exit;} //Wenn man nicht angemeldet ist, darf man nicht auf die Seite
-if(!rore($user_admin,'a_backup','RE')){require("lib/rechte.php");exit;}
-// Rechteüberprüfung ende
-
-$Verzeichnis = "./htdocs/leitgedanken_utf8/backup/dump/save";
-$Verzeichnis2 = "/ali/";
-$Verzeichnis3 = "/backup/lg-on";
-#$Verzeichnis = ".";
-
-
-if(isset($_GET['action'])){
-  $action = $_GET['action'];
-}else{
-  $action = '';
-}
-if($action == ''){
-   $VerbindungsID = @ftp_connect($FTPServer);
-   $LoginErgebnis = @ftp_login($VerbindungsID, $FTPUser, $FTPPasswort);
-   
-   $VerbindungsID_NAS = @ftp_connect($FTPServer2);
-   $LoginErgebnis2 = @ftp_login($VerbindungsID_NAS, $FTPUser2, $FTPPasswort2);
-   #$upload =ftp_put($VerbindungsID, "$destination_file", "$file_name", FTP_BINARY); // Zeile braucht er sonst zeigt er nichts an????
-
-   if($VerbindungsID && $LoginErgebnis)
-   {
-     $smarty->assign('ftp_ansicht_connect', "1");
-     $Dateiliste=ftp_nlist($VerbindungsID, $Verzeichnis);
-     sort($Dateiliste);
-     
-     if($VerbindungsID_NAS && $LoginErgebnis2){
-       $Dateiliste2=ftp_nlist($VerbindungsID_NAS, $Verzeichnis2);
-       sort($Dateiliste2);
-     }
-     
-     $table_data = array();
-     for($i=0; $i<count($Dateiliste); $i++){
-       if(basename($Dateiliste[$i]) != '.' AND basename($Dateiliste[$i]) != '..'){
-         $datei="./backup/dump/save/".basename($Dateiliste[$i]);
-         $Dateigroesse=filesize($datei);
-     
-             $Dateien++;
-             $Verzeichnisgroesse+=$Dateigroesse;
-             $dateizeit = filemtime($datei);
-     
-             if ($Dateigroesse <= 1024){
-             $einheit = "Byte";
-             $Dateigroesse = $Dateigroesse;
-             }
-     
-     
-             if ($Dateigroesse > 1024){
-             $einheit = "KB";
-             $Dateigroesse = $Dateigroesse/1024;
-             }
-     
-             if ($Dateigroesse > 1024){
-             $einheit = "MB";
-             $Dateigroesse = $Dateigroesse/1024;
-             }
-             $dateiname = basename($Dateiliste[$i]);
-             $Dateigroesse = number_format($Dateigroesse, 2, ",", ".");
-             #$dateitag = date("d.m.Y H:i:s", $dateizeit);
-             $dateitag2 = date("Y.m.d H:i:s", $dateizeit);
-             $dateitag = date("d", $dateizeit);
-             $dateimon = date("m", $dateizeit);
-             $dateijahr = date("Y", $dateizeit);
-             $dateihr = date("H", $dateizeit);
-             $dateimi = date("i", $dateizeit);
-             $dateiss = date("s", $dateizeit);
-     
-             # Pear Package date: Wird hier zur Überprüfung der Sommerzeit verwendet
-             require_once("Date/Date.php");
-     
-     
-     
-             $date=new Date($dateitag2);
-             if (true==$date->inDaylightTime())
-             {
-                $faktor = "0";
-             }else{
-                $faktor = "0";
-             }
-     
-             $dateitag = date("d.m.Y,  H:i:s", mktime($dateihr+$faktor, $dateimi, $dateiss, $dateimon, $dateitag, $dateijahr));
-     
-                 if($VerbindungsID_NAS && $LoginErgebnis2){
-                   for($j=0; $j<count($Dateiliste2); $j++){
-                    $dateiname2 = basename($Dateiliste2[$j]);
-     
-                    if($dateiname == $dateiname2){
-                      $status = "<img src='templates/$template/images/ok.gif' border=0>";
-                      $j = count($Dateiliste2); # Wenn gefunden, dann aus der Schleife aussteigen
-                    }
-     
-                    if($dateiname != $dateiname2){
-                      $status = "<img src='templates/$template/images/cross.jpg' border=0>";
-                    }
-                   }
-                   
-                 }else{
-                   $status = "<img src='templates/$template/images/offline.gif' border=0>";
-                 }
-                 $unlink = "<a href=?action=unlink&datei=$dateiname><img src='templates/$template/images/deleteicon_enabled.gif' border=0></a>";
-          
-          $table_data['dateiname'] = $dateiname;
-          $table_data['Dateigroesse'] = $Dateigroesse;
-          $table_data['einheit'] = $einheit;
-          $table_data['dateitag'] = $dateitag;
-          $table_data['status_button'] = $status;
-          $table_data['unlink_button'] = $unlink;
-          $value1[] = $table_data;
-       }       
-     }
-     $smarty->assign('table_data', $value1);
-     
-     if ($Verzeichnisgroesse > 1024){
-       $einheit = "KB";
-       $Verzeichnisgroesse = $Verzeichnisgroesse/1024;
-     }
-     
-     if ($Verzeichnisgroesse > 1024){
-       $einheit = "MB";
-       $Verzeichnisgroesse = $Verzeichnisgroesse/1024;
-     }
-     $groesse = number_format($Verzeichnisgroesse, 2, ",", ".");
-     
-     $smarty->assign('ftp_ansicht_anz_dateien', "$Dateien");
-     $smarty->assign('ftp_ansicht_dateigroesse', "$groesse");
-     $smarty->assign('ftp_ansicht_einheit', "$einheit");
-        
-   }else{
-     $smarty->assign('ftp_ansicht_connect', "2");
-   }
-   
-}
-if($action == 'download'){
-  $dateiname = $_GET['datei'];
-  $VerbindungsID = ftp_connect($FTPServer);
-  $LoginErgebnis = ftp_login($VerbindungsID, $FTPUser, $FTPPasswort);
-  
-  if($VerbindungsID && $LoginErgebnis){
-  
-   ftp_chdir($VerbindungsID, $Verzeichnis);
-   ftp_get($VerbindungsID, $dateiname, $dateiname, FTP_BINARY);
-   $size = filesize($dateiname);
-   header("HTTP/1.1 200 OK"); 
-   header("Content-type: \"application/octet-stream\""); 
-   header ("Content-length: $size");
-   header("Content-Disposition: attachment; filename=\"".basename($dateiname)."\""); 
-   readfile($dateiname);
-  
-   @unlink($dateiname);
-  }else{
-    $smarty->assign('ftp_ansicht_connect', "2");
-  } 
-}
-if($action == 'unlink'){
-  
-  $dateiname = $_GET['datei'];     
-  
-  $VerbindungsID = ftp_connect($FTPServer);
-  $LoginErgebnis = ftp_login($VerbindungsID, $FTPUser, $FTPPasswort);
-  if($VerbindungsID && $LoginErgebnis){
-  
-   @ftp_chdir($VerbindungsID, $Verzeichnis);
-   @ftp_delete($VerbindungsID, $dateiname);
-   
-   
-  
-  }else{
-    $smarty->assign('ftp_ansicht_connect', "2");
-  } 
-  ftp_quit($VerbindungsID);
-  
-  
-  $VerbindungsID = ftp_connect($FTPServer2);
-  $LoginErgebnis = ftp_login($VerbindungsID, $FTPUser2, $FTPPasswort2);
-  if($VerbindungsID && $LoginErgebnis){
-  
-   @ftp_chdir($VerbindungsID, $Verzeichnis2);
-   @ftp_delete($VerbindungsID, $dateiname);
-   
-   
-  
-  }else{
-    $smarty->assign('ftp_ansicht_connect', "2");
-  } 
-  
-  $VerbindungsID = ftp_connect($FTPServer3);
-  $LoginErgebnis = ftp_login($VerbindungsID, $FTPUser3, $FTPPasswort3);
-  if($VerbindungsID && $LoginErgebnis){
-  
-   @ftp_chdir($VerbindungsID, $Verzeichnis3);
-   @ftp_delete($VerbindungsID, $dateiname);
-   
-   
-  
-  }else{
-    $smarty->assign('ftp_ansicht_connect', "2");
-  } 
-  
-  
-  
-  ftp_quit($VerbindungsID);
-  
-  echo "<meta http-equiv=\"refresh\" content=\"0; URL=$_SERVER[PHP_SELF] \">";
-}
-   
-$smarty->assign('action', "$action");
-$smarty->display("$template/$templatename");
-?>
\ No newline at end of file
diff --git a/func_ansicht.php_20200212 b/func_ansicht.php_20200212
deleted file mode 100644
index 27c75e5b..00000000
--- a/func_ansicht.php_20200212
+++ /dev/null
@@ -1,772 +0,0 @@
-<?php
-
-
-function makeLink($a, $b, $c, $d, $e, $f, $g, $h, $lid, $link, $jahr)
-{
-
-
-  $a=trim($a);
-  $b=trim($b);
-  $c=trim($c);
-  $d=trim($d);
-  $e=trim($e);
-  $f=trim($f);
-  $g=trim($g);
-  $h=trim($h);
-  
-  # $d muss immer ein Komma haben, wenn danach noch was kommt
-  if($e != '' or $f != "" or $g != "" or $h != ""){
-   if($d == ''){
-     $d=',';
-   }
-  }
-  
-  /*
-  echo "a: '$a'<br>
-        b: '$b'<br>
-        c: '$c'<br>
-        d: '$d'<br>
-        e: '$e'<br>
-        f: '$f'<br>
-        g: '$g'<br>
-        h: '$h'<br>
-        i: '$i'<br>
-        ";
-  */
-  
-  $b =str_replace  ("Ruth",  "Rut"  ,  $b);
-  $b =str_replace  ("Esther",  "Ester"  ,  $b);
-  $b =str_replace  ("Judith",  "Judit"  ,  $b);
-  $b =str_replace  ("Ezechiel",  "Hesekiel"  ,  $b);
-  $b =str_replace  ("Ijob",  "Hiob"  ,  $b);
-  
-  if($a!=''){
-   $a=$a." ";
-  }
-  
-  if($c!=''){
-   $c=" ".$c;
-  }
-  if($e!=''){
-   $e=" ".$e." ";
-  }
-  
-  // Handling, wenn bei Bibelstelle Bindestrich oder Punkt enthalten sind
-  if($g == '-'){
-
-    #$wort="Römer 8,31-39";
-    $wort="$a$b$c$d$f$g$h";
-    $wort=trim($wort);
-    
-    
-    if($link == 'lokal'){
-      $wort="$wort|T|$lid";
-      #target=\"_blank\" 
-      
-      ##### ÄNDERUNG NEUE LUTHERBIBEL ########
-      if($jahr < 2019){
-        return sprintf("<a class=\"biblelink\" href=\"javascript:bib_link_lokal1('bibelpopup/bib_popup_1984.php?wort=%s&amp;stopmark=$f','Bibellink','640','480','center','front');\" onmouseover=\"return overlib('".getword("$wort")."',  ABOVE, CAPTION,'%s', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 450 );\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$d.$f.$g.$h,  $a.$b.$c.$d.$f.$g.$h, $a.$b.$c.$d.$e.$f.$g.$h);
-      }else{
-        return sprintf("<a class=\"biblelink\" href=\"javascript:bib_link_lokal1('bibelpopup/bib_popup_2017.php?wort=%s&amp;stopmark=$f','Bibellink','640','480','center','front');\" onmouseover=\"return overlib('".getword("$wort")."',  ABOVE, CAPTION,'%s', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 450 );\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$d.$f.$g.$h,  $a.$b.$c.$d.$f.$g.$h, $a.$b.$c.$d.$e.$f.$g.$h);
-      }
-      
-    }elseif($link == 'bibleserver'){
-      #target=\"_blank\"
-      
-      ##### ÄNDERUNG NEUE LUTHERBIBEL ########
-      if($jahr < 2019){
-        return sprintf("<a class=\"biblelink\" href=\"http://www.bibleserver.com/go.php?lang={de}&amp;bible={LUT84}&amp;ref=%s\" target=\"_blank\" onmouseover=\"return overlib('".getword("$wort")."',  ABOVE, CAPTION,'%s', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 450 );\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$d.$f.$g.$h,  $a.$b.$c.$d.$f.$g.$h, $a.$b.$c.$d.$e.$f.$g.$h);
-      }else{
-        return sprintf("<a class=\"biblelink\" href=\"http://www.bibleserver.com/go.php?lang={de}&amp;bible={LUT}&amp;ref=%s\" target=\"_blank\" onmouseover=\"return overlib('".getword("$wort")."',  ABOVE, CAPTION,'%s', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 450 );\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$d.$f.$g.$h,  $a.$b.$c.$d.$f.$g.$h, $a.$b.$c.$d.$e.$f.$g.$h);
-      }
-      
-    }
-    
-    
-  }elseif($g == '.'){
-    
-    // Wenn Punkt, dann muss unterschieden werden, ob die Textstelle forlaufend ist
-    $next=$f+1;
-    if($h==$next){
-      // Beispiel Matthäus 1,1.2
-      // aus dem Punkt wird ein Bindestrich für bibleserver
-      $g1='-';
-
-      $wort="$a$b$c$d$f$g1$h";
-      $wort=trim($wort);
-      
-      
-    if($link == 'lokal'){
-      $wort="$wort|T|$lid";
-      
-      ##### ÄNDERUNG NEUE LUTHERBIBEL ########
-      if($jahr < 2019){
-        return sprintf("<a class=\"biblelink\" href=\"javascript:bib_link_lokal1('bibelpopup/bib_popup_1984.php?wort=%s&amp;stopmark=$f','Bibellink','640','480','center','front');\" onmouseover=\"return overlib('".getword("$wort")."',  ABOVE, CAPTION,'%s', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 450 );\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$d.$f.$g1.$h,  $a.$b.$c.$d.$f.$g1.$h, $a.$b.$c.$d.$e.$f.$g.$h);
-      }else{
-        return sprintf("<a class=\"biblelink\" href=\"javascript:bib_link_lokal1('bibelpopup/bib_popup_2017.php?wort=%s&amp;stopmark=$f','Bibellink','640','480','center','front');\" onmouseover=\"return overlib('".getword("$wort")."',  ABOVE, CAPTION,'%s', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 450 );\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$d.$f.$g1.$h,  $a.$b.$c.$d.$f.$g1.$h, $a.$b.$c.$d.$e.$f.$g.$h);
-      }
-      
-      
-    }elseif($link == 'bibleserver'){
-      ##### ÄNDERUNG NEUE LUTHERBIBEL ########
-      if($jahr < 2019){
-        return sprintf("<a class=\"biblelink\" href=\"http://www.bibleserver.com/go.php?lang={de}&amp;bible={LUT84}&amp;ref=%s\" target=\"_blank\" onmouseover=\"return overlib('".getword("$wort")."',  ABOVE, CAPTION,'%s', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 450 );\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$d.$f.$g1.$h,  $a.$b.$c.$d.$f.$g1.$h, $a.$b.$c.$d.$e.$f.$g.$h);
-      }else{
-        return sprintf("<a class=\"biblelink\" href=\"http://www.bibleserver.com/go.php?lang={de}&amp;bible={LUT}&amp;ref=%s\" target=\"_blank\" onmouseover=\"return overlib('".getword("$wort")."',  ABOVE, CAPTION,'%s', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 450 );\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$d.$f.$g1.$h,  $a.$b.$c.$d.$f.$g1.$h, $a.$b.$c.$d.$e.$f.$g.$h);
-      }
-      
-    }
-      
-
-      
-    }else{
-      // Beispiel Matthäus 1,1.3
-      // Da Vers 2 nicht aufgeführt ist, darf man nicht 1-3 machen
-      // Parameter $g und $h (.3) wird daher nicht im Link übergeben
-
-      $wort="$a$b$c$d$f";
-      $wort=trim($wort);
-      
-    if($link == 'lokal'){
-      $wort="$wort|T|$lid";
-      
-      ##### ÄNDERUNG NEUE LUTHERBIBEL ########  
-      if($jahr < 2019){
-        return sprintf("<a class=\"biblelink\" href=\"javascript:bib_link_lokal1('bibelpopup/bib_popup_1984.php?wort=%s&amp;stopmark=$f','Bibellink','640','480','center','front');\" onmouseover=\"return overlib('".getword("$wort")."',  ABOVE, CAPTION,'%s', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 450 );\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$d.$f,  $a.$b.$c.$d.$f, $a.$b.$c.$d.$e.$f.$g.$h);
-      }else{
-        return sprintf("<a class=\"biblelink\" href=\"javascript:bib_link_lokal1('bibelpopup/bib_popup_2017.php?wort=%s&amp;stopmark=$f','Bibellink','640','480','center','front');\" onmouseover=\"return overlib('".getword("$wort")."',  ABOVE, CAPTION,'%s', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 450 );\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$d.$f,  $a.$b.$c.$d.$f, $a.$b.$c.$d.$e.$f.$g.$h);
-      }
-      
-      
-    }elseif($link == 'bibleserver'){
-      ##### ÄNDERUNG NEUE LUTHERBIBEL ########  
-      if($jahr < 2019){
-        return sprintf("<a class=\"biblelink\" href=\"http://www.bibleserver.com/go.php?lang={de}&amp;bible={LUT84}&amp;ref=%s\" target=\"_blank\" onmouseover=\"return overlib('".getword("$wort")."',  ABOVE, CAPTION,'%s', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 450 );\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$d.$f,  $a.$b.$c.$d.$f, $a.$b.$c.$d.$e.$f.$g.$h);
-      }else{
-        return sprintf("<a class=\"biblelink\" href=\"http://www.bibleserver.com/go.php?lang={de}&amp;bible={LUT}&amp;ref=%s\" target=\"_blank\" onmouseover=\"return overlib('".getword("$wort")."',  ABOVE, CAPTION,'%s', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 450 );\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$d.$f,  $a.$b.$c.$d.$f, $a.$b.$c.$d.$e.$f.$g.$h);
-      }
-      
-    }
-   
-      
-    }
-    
-  }else{
-    // Alles Ohne Bindestrich und Punkt, daher auch kein $g und $h
-    
-    $wort="$a$b$c$d$f$g$h";
-    $wort=trim($wort);
-
-    if($link == 'lokal'){
-      $wort="$wort|T|$lid";
-      
-      ##### ÄNDERUNG NEUE LUTHERBIBEL ########  
-      if($jahr < 2019){
-        return sprintf("<a class=\"biblelink\" href=\"javascript:bib_link_lokal1('bibelpopup/bib_popup_1984.php?wort=%s&amp;stopmark=$f','Bibellink','640','480','center','front');\" onmouseover=\"return overlib('".getword("$wort")."',  ABOVE, CAPTION,'%s', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 450 );\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$d.$f.$g.$h,  $a.$b.$c.$d.$f.$g.$h, $a.$b.$c.$d.$e.$f.$g.$h);
-      }else{
-        return sprintf("<a class=\"biblelink\" href=\"javascript:bib_link_lokal1('bibelpopup/bib_popup_2017.php?wort=%s&amp;stopmark=$f','Bibellink','640','480','center','front');\" onmouseover=\"return overlib('".getword("$wort")."',  ABOVE, CAPTION,'%s', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 450 );\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$d.$f.$g.$h,  $a.$b.$c.$d.$f.$g.$h, $a.$b.$c.$d.$e.$f.$g.$h);
-      }
-      
-      
-    }elseif($link == 'bibleserver'){
-      ##### ÄNDERUNG NEUE LUTHERBIBEL ########  
-      if($jahr < 2019){
-        return sprintf("<a class=\"biblelink\" href=\"http://www.bibleserver.com/go.php?lang={de}&amp;bible={LUT84}&amp;ref=%s\" target=\"_blank\" onmouseover=\"return overlib('".getword("$wort")."',  ABOVE, CAPTION,'%s', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 450 );\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$d.$f.$g.$h,  $a.$b.$c.$d.$f.$g.$h, $a.$b.$c.$d.$e.$f.$g.$h);
-      }else{
-        return sprintf("<a class=\"biblelink\" href=\"http://www.bibleserver.com/go.php?lang={de}&amp;bible={LUT}&amp;ref=%s\" target=\"_blank\" onmouseover=\"return overlib('".getword("$wort")."',  ABOVE, CAPTION,'%s', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 450 );\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$d.$f.$g.$h,  $a.$b.$c.$d.$f.$g.$h, $a.$b.$c.$d.$e.$f.$g.$h);
-      }
-      
-    }
-    
-  }
-}
-
-
-function refill($a,$b,$c,$d,$e,$f,$g,$h,$i)
-{
-// Funktion die aus Textstellenkurzeichen die vollständige Textstelle erstellt
-
-/*
-echo "a: '$a'<br>
-      b: '$b'<br>
-      c: '$c'<br>
-      d: '$d'<br>
-      e: '$e'<br>
-      f: '$f'<br>
-      g: '$g'<br>
-      h: '$h'<br>
-      i: '$i'<br>
-      ";
-*/
-
-switch($c)
-{
-case'Sir':
-     $c= 'Sirach';
-     break;
-case'Mo':
-     $c= 'Mose';
-     break;
-case'Jos':
-     $c= 'Josua';
-     break;
-case'Ri':
-     $c= 'Richter';
-     break;
-case'Rut':
-     $c= 'Rut';
-     break;
-case'Sam':
-     $c= 'Samuel';
-     break;
-case'K&ouml;n':
-     $c= 'K&ouml;nige';
-     break;
-case'Chr':
-     $c= 'Chronik';
-     break;
-case'Esr':
-     $c= 'Esra';
-     break;
-case'Neh':
-     $c= 'Nehemia';
-     break;
-case'Est':
-     $c= 'Esther';
-     break;
-case'Hiob':
-     $c= 'Hiob';
-     break;
-case'Hi':
-     $c= 'Hiob';
-     break;
-case'Ps':
-     $c= 'Psalm';
-     break;
-case'Spr':
-     $c= 'Spr&uuml;che';
-     break;
-case'Pred':
-     $c= 'Prediger';
-     break;
-case'Hld':
-     $c= 'Hoheslied';
-     break;
-case'Jes':
-     $c= 'Jesaja';
-     break;
-case'Jer':
-     $c= 'Jeremia';
-     break;
-case'Kla':
-     $c= 'Klagelieder';
-     break;
-case'Klgl':
-     $c= 'Klagelieder';
-     break;
-case'Hes':
-     $c= 'Hesekiel';
-     break;
-case'St zu Dan':
-     $c= 'St&uuml;cke zu Daniel';
-     break;
-case'Dan':
-     $c= 'Daniel';
-     break;
-case'Hos':
-     $c= 'Hosea';
-     break;
-case'Joel':
-     $c= 'Joel';
-     break;
-case'Am':
-     $c= 'Amos';
-     break;
-case'Obd':
-     $c= 'Obadja';
-     break;
-case'Jona':
-     $c= 'Jona';
-     break;
-case'Mi':
-     $c= 'Micha';
-     break;
-case'Nah':
-     $c= 'Nahum';
-     break;
-case'Hab':
-     $c= 'Habakuk';
-     break;
-case'Zef':
-     $c= 'Zefanja';
-     break;
-case'Hag':
-     $c= 'Haggai';
-     break;
-case'Sach':
-     $c= 'Sacharja';
-     break;
-case'Weish':
-     $c= 'Weisheit';
-     break;
-case'Mal':
-     $c= 'Maleachi';
-     break;
-case'Tob':
-     $c= 'Tobias';
-     break;
-case'Mt':
-     $c= 'Matth&auml;us';
-     break;
-case'Mk':
-     $c= 'Markus';
-     break;
-case'Lk':
-     $c= 'Lukas';
-     break;
-case'Luk':
-     $c= 'Lukas';
-     break;
-case'Joh':
-     $c= 'Johannes';
-     break;
-case'Jh':
-     $c= 'Johannes';
-     break;
-case'Apg':
-     $c= 'Apostelgeschichte';
-     break;
-case'R&ouml;m':
-     $c= 'R&ouml;mer';
-     break;
-case'Rom':
-     $c= 'R&ouml;mer';
-     break;
-case'Kor':
-     $c= 'Korinther';
-     break;
-case'Gal':
-     $c= 'Galater';
-     break;
-case'Eph':
-     $c= 'Epheser';
-     break;
-case'Phil':
-     $c= 'Philipper';
-     break;
-case'Kol':
-     $c= 'Kolosser';
-     break;
-case'Thess':
-     $c= 'Thessalonicher';
-     break;
-case'Tim':
-     $c= 'Timotheus';
-     break;
-case'Tit':
-     $c= 'Titus';
-     break;
-case'Phlm':
-     $c= 'Philemon';
-     break;
-case'Ptr':
-     $c= 'Petrus';
-     break;
-case'Petr':
-     $c= 'Petrus';
-     break;
-case'Hbr':
-     $c= 'Hebr&auml;er';
-     break;
-case'Hebr':
-     $c= 'Hebr&auml;er';
-     break;
-case'Jak':
-     $c= 'Jakobus';
-     break;
-case'Jk':
-     $c= 'Jakobus';
-     break;
-case'Jud':
-     $c= 'Judas';
-     break;
-case'Offb':
-     $c= 'Offenbarung';
-     break;
-case'Off':
-     $c= 'Offenbarung';
-     break;
-}
-
-#  $a=trim($a);
-  if($a !=""){$a=trim($a).".";} // nach der Zahl noch der Punkt hinzufügen
-  if($a != ""){$a=trim($a)." ";$b="";} // nach dem Punkt ein Leerzeichen, B kann dann entfallen
-  if($d ==""){$d=" ";}
-  if($g !=""){$g=" ".$g." ";} // --> "1. Johannes 3,aus3" wird "1. Johannes 3, aus 3"
-  
- 
- 
- return trim($a.$b.$c.$d.$e.$f.$g.$h);
-}
-
-
-// Herausfinden des Verses, damit bei bibelpopup an den Anker "Stopmark" gesprungen wird           
-function splitword_stopmark($a,$b,$c,$d,$e,$f,$g,$h){
-  return "$d";
-}       
-
-
-function makepopup($art, $weid, $eid, $thema_kurz, $template1){
-  $db = dbconnect();
-  if($art=="lueexeg"){
-    
-    $result_exeg1a = $db->query("SELECT count(*) Anz 
-                                    FROM wort_exegese
-                                   WHERE verweis='$weid'
-                                     AND beschreibung != ''");
-    $row_exeg1a = $result_exeg1a->fetch_array(); 
-  
-    if($row_exeg1a['Anz']>1){
-    $query_exeg2 = "SELECT weid, wort, beschreibung, verweis
-                      FROM wort_exegese
-                     WHERE verweis='$weid'
-                       AND beschreibung != ''";
-    $result_exeg2 = $db->query( $query_exeg2)
-	             or die ("Cannot execute query: result_exeg2");
-
-    $zaehler_exeg=1;
-    $exegese = "<table width=100%>";
-    
-      
-      while ($row_exeg2 = $result_exeg2->fetch_array()){
-       $exegese .= "<tr>
-                       <td valign=top>
-                         <font style=\"font-size:8pt\">$zaehler_exeg</font>
-                       </td>
-                       <td valign=top>
-                         <font style=\"font-size:8pt\">$row_exeg2[beschreibung]</font>
-                       </td>
-                    </tr>";  
-       $zaehler_exeg=$zaehler_exeg+1;
-      }
-     
-     $exegese .= "</table>";
-     
-    }else{
-      $result_exeg3 = $db->query("SELECT beschreibung
-                                    FROM wort_exegese
-                                   WHERE weid='$weid'");
-      $row_exeg3 = $result_exeg3->fetch_array();
-      $exegese = $row_exeg3['beschreibung'];
-    }
-
-     $exegese=preg_replace("/\n/", "", $exegese);
-     $exegese=preg_replace("/\r/", "", $exegese);
-     $exegese= preg_replace('/\s{2,}/sm',' ',$exegese,PREG_SET_ORDER); //Mehr als zwei leerzeichen entfernen
-     $exegese = str_replace (array('"'), array("&quot;"), $exegese);
-     $exegese = str_replace (array("'"), array("\'"), $exegese);
-     
-     $result_lue1 = $db->query("SELECT thema
-                                   FROM lue_quelle
-                                  WHERE eid='$eid'");
-     $row_lue1 = $result_lue1->fetch_array();
-     $thema = $row_lue1['thema'];
-     
-    $repl="<a class=alue href='lue_ansicht.php?eid=$eid' title='Lehre und Erkenntnis: $thema' target='_parent'>$thema_kurz</a><a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $thema_kurz',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserkl&auml;rung' border='0' height=10 src='templates/$template1/images/i.png'></sup></a>";
-  }
-  
-  
-  if($art=="exeg"){
-    
-    $result_exeg1a = $db->query("SELECT count(*) Anz 
-                                    FROM wort_exegese
-                                   WHERE verweis='$weid'
-                                     AND beschreibung != ''");
-    $row_exeg1a = $result_exeg1a->fetch_array();
-
-    
-    if($row_exeg1a['Anz']>1){
-    $query_exeg2 = "SELECT weid, wort, beschreibung, verweis
-                      FROM wort_exegese
-                     WHERE verweis='$weid'
-                       AND beschreibung != ''";
-
-    $result_exeg2 = $db->query( $query_exeg2)
-	             or die ("Cannot execute query: result_exeg2");
-    
-    $zaehler_exeg=1;
-    $exegese = "<table width=100%>";
-    
-      while ($row_exeg2 = $result_exeg2->fetch_array()){
-       $exegese .= "<tr>
-                       <td valign=top>
-                         <font style=\"font-size:8pt\">$zaehler_exeg</font>
-                       </td>
-                       <td valign=top>
-                         <font style=\"font-size:8pt\">$row_exeg2[beschreibung]</font>
-                       </td>
-                    </tr>";  
-       $zaehler_exeg=$zaehler_exeg+1;
-      }
-     
-     $exegese .= "</table>";
-     
-    }else{
-      $result_exeg1 = $db->query("SELECT beschreibung
-                                      FROM wort_exegese
-                                     WHERE weid='$weid'");
-      $row_exeg1 = $result_exeg1->fetch_array();
-      $exegese = $row_exeg1['beschreibung'];
-    }
-
-     $exegese=preg_replace("/\n/", "", $exegese);
-     $exegese=preg_replace("/\r/", "", $exegese);
-     $exegese= preg_replace('/\s{2,}/sm',' ',$exegese,PREG_SET_ORDER); //Mehr als zwei leerzeichen entfernen
-     $exegese = str_replace (array('"'), array("&quot;"), $exegese);
-     $exegese = str_replace (array("'"), array("\'"), $exegese);
-     
-     $repl="$thema_kurz<a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $thema_kurz',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserkl&auml;rung' border='0' height=10 src='templates/$template1/images/i.png'></sup></a>";
-  }
-  
-  if($art=="lue"){
-    $result_lue1 = $db->query("SELECT thema
-                                  FROM lue_quelle
-                                 WHERE eid='$eid'");
-    $row_lue1 = $result_lue1->fetch_array();
-
-    
-    
-    #echo "$row_lue1[thema] --> $eid<br>\n";
-    $thema = $row_lue1['thema'];
-    $repl="<a class=alue href='lue_ansicht.php?eid=$eid' title='Lehre und Erkenntnis: $thema' target='_parent'>$thema_kurz</a>";
-    #$repl ="";
-  }
-
-return $repl;
-}
-
-function replace_text_links($suche, $repl, $text){
- $dom = new DOMDocument;
- @$dom->loadHtml(mb_convert_encoding($text, 'HTML-ENTITIES', "UTF-8"));
- $dom->recover = true;
- $dom->strictErrorChecking = false; 
- $dom->formatOutput = TRUE;
-
- $xpath = new DOMXPath($dom);
- $nodes = $xpath->query("//text()[contains(., \"$suche\")]");
- 
- foreach($xpath->query("//text()[not(ancestor::a)]") as $node){
-
-     $replaced = str_replace($suche, $repl, $node->wholeText);
-     $newNode  = $dom->createDocumentFragment();
-     $newNode->appendXML($replaced);
-     $node->parentNode->replaceChild($newNode, $node);
- 
-}
- #echo $dom->saveXML($dom->documentElement);
- 
- # http://stackoverflow.com/questions/4044812/regex-domdocument-match-and-replace-text-not-in-a-link
- return mb_substr($dom->saveXML($xpath->query('//body')->item(0)), 6, -7, "UTF-8");
-}
-
-function get_array_key($search, $array)
-{
-# funktion durchsucht eine Mehrdimensionales Array(thema2) ob ein Suchbegriff darin enthalten ist und liefert ggf. key zurück
-  foreach($array as $key => $values)
-  {
-    if(in_array($search, $values))
-    {
-      return $key;
-    }
-  }
-  return false;
-}
-
-function makeKNK_FA($a, $b)
-{ 
-  $db = dbconnect();
-  $db->query("SET NAMES 'utf8'");
-
-  $result_knk_fa = $db->query("SELECT number, question, answer, reference, description, description2, headline
-                               FROM knk_fa
-  	                      WHERE number ='$b'
-                           ");
-  $row_knk_fa = $result_knk_fa->fetch_array();
-
-  $ueberschrift = str_replace (array("—", "ä", "ö", "ü", "ß", "Ä", "Ö", "Ü", '"'), array("-", "&auml;", "&ouml;", "&uuml;", "&szlig;", "&Auml;", "&Ouml;", "&Uuml;", '\"'), "Frage ".$row_knk_fa['number']);
-  $question= str_replace (array("&#39;"), array("&amp;\#39;"), $row_knk_fa['question']);
-  $answer= str_replace (array("&#39;"), array("&amp;\#39;"), $row_knk_fa['answer']);
-  $reference= str_replace (array("&#39;"), array("&amp;\#39;"), $row_knk_fa['reference']);
-  $description= str_replace (array("&#39;"), array("&amp;\#39;"), $row_knk_fa['description']);
-  $description2= str_replace (array("&#39;"), array("&amp;\#39;"), $row_knk_fa['description2']);
-  
-  $max=1000;
-  $origin=strlen($answer);
-  $answer = substr($answer.' ' , 0 , $max + 1);
-  $answer = substr($answer , 0 , strrpos ($answer , ' '));
-
-  $answer = strip_tags($answer, '<nobr><em>,<span>,<br>,<b>,<strong>,<ul>,<li>,<ol>,<a>');
-  if($max<=$origin){ 
-   # Funktioniert manchmal nicht, da nicht zwischen Wort getrennt wird [strrpos ($text , ' ')] sondern immer nach einem
-   # vollständigen Wort. Das Merkmal ist: Wenn ein Leerzeichen kommt, dann trennen.
-   # Es kann passieren, dass es dann nach dem Wort span [<span class=\'verse\'>] getrennt wird,
-   # Dann sieht es so aus: <span<nobr> <b>[...]</b></nobr>, weil nach dem Span ein Leerzeichen kommt.
-   # Der Tag wird dann nicht dargestellt.
-   # Zur Minderung: $text = strip_tags($text, '<nobr><em>,<span>,<br>,<b>,<strong>,<ul>,<li>,<ol>,<a>');
-   $answer.="<nobr> <b>[...]</b></nobr>";
-  }
-  $kapitel = $b;
-  $kap=$row_knk_fa['headline'];
-  $body = "<table><tr><td class=knkfa><b>$question</b><td></tr><tr><td class=knkfa>$answer<td></tr>";
-  if($reference != ''){
-    $body_ref = "<tr><td class=knkfa>$reference</td></tr>";
-    $body = $body.$body_ref;
-  }
-  if($description != ''){
-    $body_desc = "<tr><td class=knkfa bgcolor=#ffffff>$description</td></tr>";
-    $body = $body.$body_desc;
-  }
-  if($description2 != ''){
-    $body_desc2 = "<tr><td class=knkfa bgcolor=#ffffff>$description2</td></tr>";
-    $body = $body.$body_desc2;
-  }
-  $body_footer .= "</table>";
-  $body = $body.$body_footer;
-  
-  return sprintf("<a href=\"katechismus_fa.php?katechismus_knk=$kap&katechismus_kapitel=$b\" target=_parent class=\"biblelink\" onmouseover=\"return overlib('$body',  ABOVE, CAPTION,'$ueberschrift', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 600);\" onmouseout=\"nd();\">%s</a>",  $a.' '.$b,  $a.' '.$b);
-}
-
-function makeKNK($a, $b)
-{ 
-  $db = dbconnect();
-  $result_knk = $db->query("SELECT ueberschrift, text
-                               FROM knk
-  	                      WHERE knk ='$b'
-                           ");
-  $row_knk = $result_knk->fetch_array();
-
-  $ueberschrift = str_replace (array("—", "ä", "ö", "ü", "ß", "Ä", "Ö", "Ü", '"'), array("-", "&auml;", "&ouml;", "&uuml;", "&szlig;", "&Auml;", "&Ouml;", "&Uuml;", '\"'), $row_knk['ueberschrift']);
-  $text= str_replace (array("&#39;"), array("&amp;\#39;"), $row_knk['text']);
-  
-  $max=1000;
-  $origin=strlen($text);
-  $text = substr($text.' ' , 0 , $max + 1);
-  $text = substr($text , 0 , strrpos ($text , ' '));
-
-  $text = strip_tags($text, '<nobr><em>,<span>,<br>,<b>,<strong>,<ul>,<li>,<ol>,<a>');
-  if($max<=$origin){ 
-   # Funktioniert manchmal nicht, da nicht zwischen Wort getrennt wird [strrpos ($text , ' ')] sondern immer nach einem
-   # vollständigen Wort. Das Merkmal ist: Wenn ein Leerzeichen kommt, dann trennen.
-   # Es kann passieren, dass es dann nach dem Wort span [<span class=\'verse\'>] getrennt wird,
-   # Dann sieht es so aus: <span<nobr> <b>[...]</b></nobr>, weil nach dem Span ein Leerzeichen kommt.
-   # Der Tag wird dann nicht dargestellt.
-   # Zur Minderung: $text = strip_tags($text, '<nobr><em>,<span>,<br>,<b>,<strong>,<ul>,<li>,<ol>,<a>');
-   $text.="<nobr> <b>[...]</b></nobr>";
-  }
-  $kapitel = explode('.', $b);
-  $kap=$kapitel[0];
-  return sprintf("<a href=\"katechismus.php?katechismus_knk=$kap&katechismus_kapitel=$b\" target=_parent class=\"biblelink\" onmouseover=\"return overlib('$text',  ABOVE, CAPTION,'Katechismus: $ueberschrift', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 600);\" onmouseout=\"nd();\">%s</a>",  $a.' '.$b,  $a.' '.$b);
-}
-
-
-function makeKNK2($a, $b, $c, $d, $e, $f)
-{
-
-  $db = dbconnect();
-  $result_knk = $db->query("SELECT ueberschrift, text
-                               FROM knk
-  	                      WHERE knk ='$d'
-                           ");
-  $row_knk = $result_knk->fetch_array();
-
-  
-  $ueberschrift = str_replace (array("—", "ä", "ö", "ü", "ß", "Ä", "Ö", "Ü", '"'), array("-", "&auml;", "&ouml;", "&uuml;", "&szlig;", "&Auml;", "&Ouml;", "&Uuml;", '\"'), $row_knk['ueberschrift']);
-  $text= str_replace (array("&#39;"), array("&amp;\#39;"), $row_knk['text']);
-  
-  $max=1000;
-  $origin=strlen($text);
-  $text = substr($text.' ' , 0 , $max + 1);
-  $text = substr($text , 0 , strrpos ($text , ' '));
-
-  $text = strip_tags($text, '<nobr><em>,<span>,<br>,<b>,<strong>,<ul>,<li>,<ol>,<a>');
-  if($max<=$origin){ 
-   # Funktioniert manchmal nicht, da nicht zwischen Wort getrennt wird [strrpos ($text , ' ')] sondern immer nach einem
-   # vollständigen Wort. Das Merkmal ist: Wenn ein Leerzeichen kommt, dann trennen.
-   # Es kann passieren, dass es dann nach dem Wort span [<span class=\'verse\'>] getrennt wird,
-   # Dann sieht es so aus: <span<nobr> <b>[...]</b></nobr>, weil nach dem Span ein Leerzeichen kommt.
-   # Der Tag wird dann nicht dargestellt.
-   # Zur Minderung: $text = strip_tags($text, '<nobr><em>,<span>,<br>,<b>,<strong>,<ul>,<li>,<ol>,<a>');
-   $text.="<nobr> <b>[...]</b></nobr>";
-  }
-  $kapitel = explode('.', $d);
-  $kap=$kapitel[0];
-  if(strlen($row_knk['text'])>0){
-    if($a == ' '){
-    #bei Konstellationen (5.3.2.3; 5.3.2.4) ist $a entweder ( oder Leerzeichen. Für saubere Darstellung des Links, ohne dass das Leerzeichen Teil des Links ist, kommt $a bei der Ausgabe weg und das Leerzeichen vor dem Link
-      return sprintf(" <a href=\"katechismus.php?katechismus_knk=$kap&katechismus_kapitel=$d\" target=_parent class=\"biblelink\" onmouseover=\"return overlib('$text', ABOVE , CAPTION,'Katechismus: $ueberschrift', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 600);\" onmouseout=\"nd();\">%s</a>",  $b.$c.$d.$f,  $b.$c.$d.$f);
-    }else{
-      return sprintf("<a href=\"katechismus.php?katechismus_knk=$kap&katechismus_kapitel=$d\" target=_parent class=\"biblelink\" onmouseover=\"return overlib('$text', ABOVE , CAPTION,'Katechismus: $ueberschrift', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 600);\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$d.$f,  $a.$b.$c.$d.$f);
-    }
-  }else{
-      return $a.$b.$c.$d.$f;
-  }
-
-}
-
-
- # Wurde nur für die Erstellung der Textvarianten reference_lokal bzw reference_bibleserver aus func_make_reference_fa.php verwendet
-function makeKNK_FA2($b)
-{ 
-  $db = dbconnect();
-  $db->query("SET NAMES 'utf8'");
-
-  $result_knk_fa = $db->query("SELECT number, question, answer, reference, description, description2, headline
-                               FROM knk_fa
-  	                      WHERE number ='$b'
-                           ");
-  $row_knk_fa = $result_knk_fa->fetch_array();
-
-  $ueberschrift = str_replace (array("—", "ä", "ö", "ü", "ß", "Ä", "Ö", "Ü", '"'), array("-", "&auml;", "&ouml;", "&uuml;", "&szlig;", "&Auml;", "&Ouml;", "&Uuml;", '\"'), "Frage ".$row_knk_fa['number']);
-  $question= str_replace (array("&#39;"), array("&amp;\#39;"), $row_knk_fa['question']);
-  $answer= str_replace (array("&#39;"), array("&amp;\#39;"), $row_knk_fa['answer']);
-  $reference= str_replace (array("&#39;"), array("&amp;\#39;"), $row_knk_fa['reference']);
-  $description= str_replace (array("&#39;"), array("&amp;\#39;"), $row_knk_fa['description']);
-  $description2= str_replace (array("&#39;"), array("&amp;\#39;"), $row_knk_fa['description2']);
-  
-  $max=1000;
-  $origin=strlen($answer);
-  $answer = substr($answer.' ' , 0 , $max + 1);
-  $answer = substr($answer , 0 , strrpos ($answer , ' '));
-
-  $answer = strip_tags($answer, '<nobr><em>,<span>,<br>,<b>,<strong>,<ul>,<li>,<ol>,<a>');
-  if($max<=$origin){ 
-   # Funktioniert manchmal nicht, da nicht zwischen Wort getrennt wird [strrpos ($text , ' ')] sondern immer nach einem
-   # vollständigen Wort. Das Merkmal ist: Wenn ein Leerzeichen kommt, dann trennen.
-   # Es kann passieren, dass es dann nach dem Wort span [<span class=\'verse\'>] getrennt wird,
-   # Dann sieht es so aus: <span<nobr> <b>[...]</b></nobr>, weil nach dem Span ein Leerzeichen kommt.
-   # Der Tag wird dann nicht dargestellt.
-   # Zur Minderung: $text = strip_tags($text, '<nobr><em>,<span>,<br>,<b>,<strong>,<ul>,<li>,<ol>,<a>');
-   $answer.="<nobr> <b>[...]</b></nobr>";
-  }
-  $kapitel = $b;
-  $kap=$row_knk_fa['headline'];
-  $body = "<table><tr><td class=knkfa><b>$question</b><td></tr><tr><td class=knkfa>$answer<td></tr>";
-  if($reference != ''){
-    $body_ref = "<tr><td class=knkfa>$reference</td></tr>";
-    $body = $body.$body_ref;
-  }
-  if($description != ''){
-    $body_desc = "<tr><td class=knkfa bgcolor=#ffffff>$description</td></tr>";
-    $body = $body.$body_desc;
-  }
-  if($description2 != ''){
-    $body_desc2 = "<tr><td class=knkfa bgcolor=#ffffff>$description2</td></tr>";
-    $body = $body.$body_desc2;
-  }
-  $body_footer .= "</table>";
-  $body = $body.$body_footer;
-  
-  return sprintf("<a href=\"katechismus_fa.php?katechismus_knk=$kap&katechismus_kapitel=$b\" target=_parent class=\"biblelink\" onmouseover=\"return overlib('$body',  ABOVE, CAPTION,'$ueberschrift', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 600);\" onmouseout=\"nd();\">%s</a>",  $b,  $b);
-}
-
-?>
\ No newline at end of file
diff --git a/func_ansicht.php_20200915 b/func_ansicht.php_20200915
deleted file mode 100644
index 74a2ea07..00000000
--- a/func_ansicht.php_20200915
+++ /dev/null
@@ -1,776 +0,0 @@
-<?php
-
-
-function makeLink($a, $b, $c, $d, $e, $f, $g, $h, $lid, $link, $jahr)
-{
-
-
-  $a=trim($a);
-  $b=trim($b);
-  $c=trim($c);
-  $d=trim($d);
-  $e=trim($e);
-  $f=trim($f);
-  $g=trim($g);
-  $h=trim($h);
-  
-  # $d muss immer ein Komma haben, wenn danach noch was kommt
-  if($e != '' or $f != "" or $g != "" or $h != ""){
-   if($d == ''){
-     $d=',';
-   }
-  }
-  
-  /*
-  echo "a: '$a'<br>
-        b: '$b'<br>
-        c: '$c'<br>
-        d: '$d'<br>
-        e: '$e'<br>
-        f: '$f'<br>
-        g: '$g'<br>
-        h: '$h'<br>
-        i: '$i'<br>
-        ";
-  */
-  
-  $b =str_replace  ("Ruth",  "Rut"  ,  $b);
-  $b =str_replace  ("Esther",  "Ester"  ,  $b);
-  $b =str_replace  ("Judith",  "Judit"  ,  $b);
-  $b =str_replace  ("Ezechiel",  "Hesekiel"  ,  $b);
-  $b =str_replace  ("Ijob",  "Hiob"  ,  $b);
-  
-  if($a!=''){
-   $a=$a." ";
-  }
-  
-  if($c!=''){
-   $c=" ".$c;
-  }
-  if($e!=''){
-   $e=" ".$e." ";
-  }
-  
-  // Handling, wenn bei Bibelstelle Bindestrich oder Punkt enthalten sind
-  if($g == '-'){
-
-    #$wort="Römer 8,31-39";
-    $wort="$a$b$c$d$f$g$h";
-    $wort=trim($wort);
-    
-    
-    if($link == 'lokal'){
-      $wort="$wort|T|$lid";
-      #target=\"_blank\" 
-      
-      ##### ÄNDERUNG NEUE LUTHERBIBEL ########
-      if($jahr < 2019){
-        return sprintf("<a class=\"biblelink\" href=\"javascript:bib_link_lokal1('bibelpopup/bib_popup_1984.php?wort=%s&amp;stopmark=$f','Bibellink','640','480','center','front');\" onmouseover=\"return overlib('".getword("$wort")."',  ABOVE, CAPTION,'%s', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 450 );\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$d.$f.$g.$h,  $a.$b.$c.$d.$f.$g.$h, $a.$b.$c.$d.$e.$f.$g.$h);
-      }else{
-        return sprintf("<a class=\"biblelink\" href=\"javascript:bib_link_lokal1('bibelpopup/bib_popup_2017.php?wort=%s&amp;stopmark=$f','Bibellink','640','480','center','front');\" onmouseover=\"return overlib('".getword("$wort")."',  ABOVE, CAPTION,'%s', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 450 );\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$d.$f.$g.$h,  $a.$b.$c.$d.$f.$g.$h, $a.$b.$c.$d.$e.$f.$g.$h);
-      }
-      
-    }elseif($link == 'bibleserver'){
-      #target=\"_blank\"
-      
-      ##### ÄNDERUNG NEUE LUTHERBIBEL ########
-      if($jahr < 2019){
-        return sprintf("<a class=\"biblelink\" href=\"http://www.bibleserver.com/go.php?lang={de}&amp;bible={LUT84}&amp;ref=%s\" target=\"_blank\" onmouseover=\"return overlib('".getword("$wort")."',  ABOVE, CAPTION,'%s', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 450 );\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$d.$f.$g.$h,  $a.$b.$c.$d.$f.$g.$h, $a.$b.$c.$d.$e.$f.$g.$h);
-      }else{
-        $x = str_replace(',','%2C',$d);
-        return sprintf("<a class=\"biblelink\" href=\"http://www.bibleserver.com/go.php?lang={de}&amp;bible={LUT}&amp;ref=%s\" target=\"_blank\" onmouseover=\"return overlib('".getword("$wort")."',  ABOVE, CAPTION,'%s', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 450 );\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$x.$f.$g.$h,  $a.$b.$c.$d.$f.$g.$h, $a.$b.$c.$d.$e.$f.$g.$h);
-      }
-      
-    }
-    
-    
-  }elseif($g == '.'){
-    
-    // Wenn Punkt, dann muss unterschieden werden, ob die Textstelle forlaufend ist
-    $next=$f+1;
-    if($h==$next){
-      // Beispiel Matthäus 1,1.2
-      // aus dem Punkt wird ein Bindestrich für bibleserver
-      $g1='-';
-
-      $wort="$a$b$c$d$f$g1$h";
-      $wort=trim($wort);
-      
-      
-    if($link == 'lokal'){
-      $wort="$wort|T|$lid";
-      
-      ##### ÄNDERUNG NEUE LUTHERBIBEL ########
-      if($jahr < 2019){
-        return sprintf("<a class=\"biblelink\" href=\"javascript:bib_link_lokal1('bibelpopup/bib_popup_1984.php?wort=%s&amp;stopmark=$f','Bibellink','640','480','center','front');\" onmouseover=\"return overlib('".getword("$wort")."',  ABOVE, CAPTION,'%s', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 450 );\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$d.$f.$g1.$h,  $a.$b.$c.$d.$f.$g1.$h, $a.$b.$c.$d.$e.$f.$g.$h);
-      }else{
-        return sprintf("<a class=\"biblelink\" href=\"javascript:bib_link_lokal1('bibelpopup/bib_popup_2017.php?wort=%s&amp;stopmark=$f','Bibellink','640','480','center','front');\" onmouseover=\"return overlib('".getword("$wort")."',  ABOVE, CAPTION,'%s', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 450 );\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$d.$f.$g1.$h,  $a.$b.$c.$d.$f.$g1.$h, $a.$b.$c.$d.$e.$f.$g.$h);
-      }
-      
-      
-    }elseif($link == 'bibleserver'){
-      ##### ÄNDERUNG NEUE LUTHERBIBEL ########
-      if($jahr < 2019){
-        return sprintf("<a class=\"biblelink\" href=\"http://www.bibleserver.com/go.php?lang={de}&amp;bible={LUT84}&amp;ref=%s\" target=\"_blank\" onmouseover=\"return overlib('".getword("$wort")."',  ABOVE, CAPTION,'%s', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 450 );\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$d.$f.$g1.$h,  $a.$b.$c.$d.$f.$g1.$h, $a.$b.$c.$d.$e.$f.$g.$h);
-      }else{
-        $x = str_replace(',','%2C',$d);
-        return sprintf("<a class=\"biblelink\" href=\"http://www.bibleserver.com/go.php?lang={de}&amp;bible={LUT}&amp;ref=%s\" target=\"_blank\" onmouseover=\"return overlib('".getword("$wort")."',  ABOVE, CAPTION,'%s', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 450 );\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$x.$f.$g1.$h,  $a.$b.$c.$d.$f.$g1.$h, $a.$b.$c.$d.$e.$f.$g.$h);
-      }
-      
-    }
-      
-
-      
-    }else{
-      // Beispiel Matthäus 1,1.3
-      // Da Vers 2 nicht aufgeführt ist, darf man nicht 1-3 machen
-      // Parameter $g und $h (.3) wird daher nicht im Link übergeben
-
-      $wort="$a$b$c$d$f";
-      $wort=trim($wort);
-      
-    if($link == 'lokal'){
-      $wort="$wort|T|$lid";
-      
-      ##### ÄNDERUNG NEUE LUTHERBIBEL ########  
-      if($jahr < 2019){
-        return sprintf("<a class=\"biblelink\" href=\"javascript:bib_link_lokal1('bibelpopup/bib_popup_1984.php?wort=%s&amp;stopmark=$f','Bibellink','640','480','center','front');\" onmouseover=\"return overlib('".getword("$wort")."',  ABOVE, CAPTION,'%s', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 450 );\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$d.$f,  $a.$b.$c.$d.$f, $a.$b.$c.$d.$e.$f.$g.$h);
-      }else{
-        return sprintf("<a class=\"biblelink\" href=\"javascript:bib_link_lokal1('bibelpopup/bib_popup_2017.php?wort=%s&amp;stopmark=$f','Bibellink','640','480','center','front');\" onmouseover=\"return overlib('".getword("$wort")."',  ABOVE, CAPTION,'%s', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 450 );\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$d.$f,  $a.$b.$c.$d.$f, $a.$b.$c.$d.$e.$f.$g.$h);
-      }
-      
-      
-    }elseif($link == 'bibleserver'){
-      ##### ÄNDERUNG NEUE LUTHERBIBEL ########  
-      if($jahr < 2019){
-        return sprintf("<a class=\"biblelink\" href=\"http://www.bibleserver.com/go.php?lang={de}&amp;bible={LUT84}&amp;ref=%s\" target=\"_blank\" onmouseover=\"return overlib('".getword("$wort")."',  ABOVE, CAPTION,'%s', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 450 );\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$d.$f,  $a.$b.$c.$d.$f, $a.$b.$c.$d.$e.$f.$g.$h);
-      }else{
-        $x = str_replace(',','%2C',$d);
-        return sprintf("<a class=\"biblelink\" href=\"http://www.bibleserver.com/go.php?lang={de}&amp;bible={LUT}&amp;ref=%s\" target=\"_blank\" onmouseover=\"return overlib('".getword("$wort")."',  ABOVE, CAPTION,'%s', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 450 );\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$x.$f,  $a.$b.$c.$d.$f, $a.$b.$c.$d.$e.$f.$g.$h);
-      }
-      
-    }
-   
-      
-    }
-    
-  }else{
-    // Alles Ohne Bindestrich und Punkt, daher auch kein $g und $h
-    
-    $wort="$a$b$c$d$f$g$h";
-    $wort=trim($wort);
-
-    if($link == 'lokal'){
-      $wort="$wort|T|$lid";
-      
-      ##### ÄNDERUNG NEUE LUTHERBIBEL ########  
-      if($jahr < 2019){
-        return sprintf("<a class=\"biblelink\" href=\"javascript:bib_link_lokal1('bibelpopup/bib_popup_1984.php?wort=%s&amp;stopmark=$f','Bibellink','640','480','center','front');\" onmouseover=\"return overlib('".getword("$wort")."',  ABOVE, CAPTION,'%s', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 450 );\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$d.$f.$g.$h,  $a.$b.$c.$d.$f.$g.$h, $a.$b.$c.$d.$e.$f.$g.$h);
-      }else{
-        return sprintf("<a class=\"biblelink\" href=\"javascript:bib_link_lokal1('bibelpopup/bib_popup_2017.php?wort=%s&amp;stopmark=$f','Bibellink','640','480','center','front');\" onmouseover=\"return overlib('".getword("$wort")."',  ABOVE, CAPTION,'%s', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 450 );\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$d.$f.$g.$h,  $a.$b.$c.$d.$f.$g.$h, $a.$b.$c.$d.$e.$f.$g.$h);
-      }
-      
-      
-    }elseif($link == 'bibleserver'){
-      ##### ÄNDERUNG NEUE LUTHERBIBEL ########  
-      if($jahr < 2019){
-        return sprintf("<a class=\"biblelink\" href=\"http://www.bibleserver.com/go.php?lang={de}&amp;bible={LUT84}&amp;ref=%s\" target=\"_blank\" onmouseover=\"return overlib('".getword("$wort")."',  ABOVE, CAPTION,'%s', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 450 );\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$d.$f.$g.$h,  $a.$b.$c.$d.$f.$g.$h, $a.$b.$c.$d.$e.$f.$g.$h);
-      }else{
-        $x = str_replace(',','%2C',$d);
-        return sprintf("<a class=\"biblelink\" href=\"http://www.bibleserver.com/go.php?lang={de}&amp;bible={LUT}&amp;ref=%s\" target=\"_blank\" onmouseover=\"return overlib('".getword("$wort")."',  ABOVE, CAPTION,'%s', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 450 );\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$x.$f.$g.$h,  $a.$b.$c.$d.$f.$g.$h, $a.$b.$c.$d.$e.$f.$g.$h);
-      }
-      
-    }
-    
-  }
-}
-
-
-function refill($a,$b,$c,$d,$e,$f,$g,$h,$i)
-{
-// Funktion die aus Textstellenkurzeichen die vollständige Textstelle erstellt
-
-/*
-echo "a: '$a'<br>
-      b: '$b'<br>
-      c: '$c'<br>
-      d: '$d'<br>
-      e: '$e'<br>
-      f: '$f'<br>
-      g: '$g'<br>
-      h: '$h'<br>
-      i: '$i'<br>
-      ";
-*/
-
-switch($c)
-{
-case'Sir':
-     $c= 'Sirach';
-     break;
-case'Mo':
-     $c= 'Mose';
-     break;
-case'Jos':
-     $c= 'Josua';
-     break;
-case'Ri':
-     $c= 'Richter';
-     break;
-case'Rut':
-     $c= 'Rut';
-     break;
-case'Sam':
-     $c= 'Samuel';
-     break;
-case'K&ouml;n':
-     $c= 'K&ouml;nige';
-     break;
-case'Chr':
-     $c= 'Chronik';
-     break;
-case'Esr':
-     $c= 'Esra';
-     break;
-case'Neh':
-     $c= 'Nehemia';
-     break;
-case'Est':
-     $c= 'Esther';
-     break;
-case'Hiob':
-     $c= 'Hiob';
-     break;
-case'Hi':
-     $c= 'Hiob';
-     break;
-case'Ps':
-     $c= 'Psalm';
-     break;
-case'Spr':
-     $c= 'Spr&uuml;che';
-     break;
-case'Pred':
-     $c= 'Prediger';
-     break;
-case'Hld':
-     $c= 'Hoheslied';
-     break;
-case'Jes':
-     $c= 'Jesaja';
-     break;
-case'Jer':
-     $c= 'Jeremia';
-     break;
-case'Kla':
-     $c= 'Klagelieder';
-     break;
-case'Klgl':
-     $c= 'Klagelieder';
-     break;
-case'Hes':
-     $c= 'Hesekiel';
-     break;
-case'St zu Dan':
-     $c= 'St&uuml;cke zu Daniel';
-     break;
-case'Dan':
-     $c= 'Daniel';
-     break;
-case'Hos':
-     $c= 'Hosea';
-     break;
-case'Joel':
-     $c= 'Joel';
-     break;
-case'Am':
-     $c= 'Amos';
-     break;
-case'Obd':
-     $c= 'Obadja';
-     break;
-case'Jona':
-     $c= 'Jona';
-     break;
-case'Mi':
-     $c= 'Micha';
-     break;
-case'Nah':
-     $c= 'Nahum';
-     break;
-case'Hab':
-     $c= 'Habakuk';
-     break;
-case'Zef':
-     $c= 'Zefanja';
-     break;
-case'Hag':
-     $c= 'Haggai';
-     break;
-case'Sach':
-     $c= 'Sacharja';
-     break;
-case'Weish':
-     $c= 'Weisheit';
-     break;
-case'Mal':
-     $c= 'Maleachi';
-     break;
-case'Tob':
-     $c= 'Tobias';
-     break;
-case'Mt':
-     $c= 'Matth&auml;us';
-     break;
-case'Mk':
-     $c= 'Markus';
-     break;
-case'Lk':
-     $c= 'Lukas';
-     break;
-case'Luk':
-     $c= 'Lukas';
-     break;
-case'Joh':
-     $c= 'Johannes';
-     break;
-case'Jh':
-     $c= 'Johannes';
-     break;
-case'Apg':
-     $c= 'Apostelgeschichte';
-     break;
-case'R&ouml;m':
-     $c= 'R&ouml;mer';
-     break;
-case'Rom':
-     $c= 'R&ouml;mer';
-     break;
-case'Kor':
-     $c= 'Korinther';
-     break;
-case'Gal':
-     $c= 'Galater';
-     break;
-case'Eph':
-     $c= 'Epheser';
-     break;
-case'Phil':
-     $c= 'Philipper';
-     break;
-case'Kol':
-     $c= 'Kolosser';
-     break;
-case'Thess':
-     $c= 'Thessalonicher';
-     break;
-case'Tim':
-     $c= 'Timotheus';
-     break;
-case'Tit':
-     $c= 'Titus';
-     break;
-case'Phlm':
-     $c= 'Philemon';
-     break;
-case'Ptr':
-     $c= 'Petrus';
-     break;
-case'Petr':
-     $c= 'Petrus';
-     break;
-case'Hbr':
-     $c= 'Hebr&auml;er';
-     break;
-case'Hebr':
-     $c= 'Hebr&auml;er';
-     break;
-case'Jak':
-     $c= 'Jakobus';
-     break;
-case'Jk':
-     $c= 'Jakobus';
-     break;
-case'Jud':
-     $c= 'Judas';
-     break;
-case'Offb':
-     $c= 'Offenbarung';
-     break;
-case'Off':
-     $c= 'Offenbarung';
-     break;
-}
-
-#  $a=trim($a);
-  if($a !=""){$a=trim($a).".";} // nach der Zahl noch der Punkt hinzufügen
-  if($a != ""){$a=trim($a)." ";$b="";} // nach dem Punkt ein Leerzeichen, B kann dann entfallen
-  if($d ==""){$d=" ";}
-  if($g !=""){$g=" ".$g." ";} // --> "1. Johannes 3,aus3" wird "1. Johannes 3, aus 3"
-  
- 
- 
- return trim($a.$b.$c.$d.$e.$f.$g.$h);
-}
-
-
-// Herausfinden des Verses, damit bei bibelpopup an den Anker "Stopmark" gesprungen wird           
-function splitword_stopmark($a,$b,$c,$d,$e,$f,$g,$h){
-  return "$d";
-}       
-
-
-function makepopup($art, $weid, $eid, $thema_kurz, $template1){
-  $db = dbconnect();
-  if($art=="lueexeg"){
-    
-    $result_exeg1a = $db->query("SELECT count(*) Anz 
-                                    FROM wort_exegese
-                                   WHERE verweis='$weid'
-                                     AND beschreibung != ''");
-    $row_exeg1a = $result_exeg1a->fetch_array(); 
-  
-    if($row_exeg1a['Anz']>1){
-    $query_exeg2 = "SELECT weid, wort, beschreibung, verweis
-                      FROM wort_exegese
-                     WHERE verweis='$weid'
-                       AND beschreibung != ''";
-    $result_exeg2 = $db->query( $query_exeg2)
-	             or die ("Cannot execute query: result_exeg2");
-
-    $zaehler_exeg=1;
-    $exegese = "<table width=100%>";
-    
-      
-      while ($row_exeg2 = $result_exeg2->fetch_array()){
-       $exegese .= "<tr>
-                       <td valign=top>
-                         <font style=\"font-size:8pt\">$zaehler_exeg</font>
-                       </td>
-                       <td valign=top>
-                         <font style=\"font-size:8pt\">$row_exeg2[beschreibung]</font>
-                       </td>
-                    </tr>";  
-       $zaehler_exeg=$zaehler_exeg+1;
-      }
-     
-     $exegese .= "</table>";
-     
-    }else{
-      $result_exeg3 = $db->query("SELECT beschreibung
-                                    FROM wort_exegese
-                                   WHERE weid='$weid'");
-      $row_exeg3 = $result_exeg3->fetch_array();
-      $exegese = $row_exeg3['beschreibung'];
-    }
-
-     $exegese=preg_replace("/\n/", "", $exegese);
-     $exegese=preg_replace("/\r/", "", $exegese);
-     $exegese= preg_replace('/\s{2,}/sm',' ',$exegese,PREG_SET_ORDER); //Mehr als zwei leerzeichen entfernen
-     $exegese = str_replace (array('"'), array("&quot;"), $exegese);
-     $exegese = str_replace (array("'"), array("\'"), $exegese);
-     
-     $result_lue1 = $db->query("SELECT thema
-                                   FROM lue_quelle
-                                  WHERE eid='$eid'");
-     $row_lue1 = $result_lue1->fetch_array();
-     $thema = $row_lue1['thema'];
-     
-    $repl="<a class=alue href='lue_ansicht.php?eid=$eid' title='Lehre und Erkenntnis: $thema' target='_parent'>$thema_kurz</a><a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $thema_kurz',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserkl&auml;rung' border='0' height=10 src='templates/$template1/images/i.png'></sup></a>";
-  }
-  
-  
-  if($art=="exeg"){
-    
-    $result_exeg1a = $db->query("SELECT count(*) Anz 
-                                    FROM wort_exegese
-                                   WHERE verweis='$weid'
-                                     AND beschreibung != ''");
-    $row_exeg1a = $result_exeg1a->fetch_array();
-
-    
-    if($row_exeg1a['Anz']>1){
-    $query_exeg2 = "SELECT weid, wort, beschreibung, verweis
-                      FROM wort_exegese
-                     WHERE verweis='$weid'
-                       AND beschreibung != ''";
-
-    $result_exeg2 = $db->query( $query_exeg2)
-	             or die ("Cannot execute query: result_exeg2");
-    
-    $zaehler_exeg=1;
-    $exegese = "<table width=100%>";
-    
-      while ($row_exeg2 = $result_exeg2->fetch_array()){
-       $exegese .= "<tr>
-                       <td valign=top>
-                         <font style=\"font-size:8pt\">$zaehler_exeg</font>
-                       </td>
-                       <td valign=top>
-                         <font style=\"font-size:8pt\">$row_exeg2[beschreibung]</font>
-                       </td>
-                    </tr>";  
-       $zaehler_exeg=$zaehler_exeg+1;
-      }
-     
-     $exegese .= "</table>";
-     
-    }else{
-      $result_exeg1 = $db->query("SELECT beschreibung
-                                      FROM wort_exegese
-                                     WHERE weid='$weid'");
-      $row_exeg1 = $result_exeg1->fetch_array();
-      $exegese = $row_exeg1['beschreibung'];
-    }
-
-     $exegese=preg_replace("/\n/", "", $exegese);
-     $exegese=preg_replace("/\r/", "", $exegese);
-     $exegese= preg_replace('/\s{2,}/sm',' ',$exegese,PREG_SET_ORDER); //Mehr als zwei leerzeichen entfernen
-     $exegese = str_replace (array('"'), array("&quot;"), $exegese);
-     $exegese = str_replace (array("'"), array("\'"), $exegese);
-     
-     $repl="$thema_kurz<a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $thema_kurz',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserkl&auml;rung' border='0' height=10 src='templates/$template1/images/i.png'></sup></a>";
-  }
-  
-  if($art=="lue"){
-    $result_lue1 = $db->query("SELECT thema
-                                  FROM lue_quelle
-                                 WHERE eid='$eid'");
-    $row_lue1 = $result_lue1->fetch_array();
-
-    
-    
-    #echo "$row_lue1[thema] --> $eid<br>\n";
-    $thema = $row_lue1['thema'];
-    $repl="<a class=alue href='lue_ansicht.php?eid=$eid' title='Lehre und Erkenntnis: $thema' target='_parent'>$thema_kurz</a>";
-    #$repl ="";
-  }
-
-return $repl;
-}
-
-function replace_text_links($suche, $repl, $text){
- $dom = new DOMDocument;
- @$dom->loadHtml(mb_convert_encoding($text, 'HTML-ENTITIES', "UTF-8"));
- $dom->recover = true;
- $dom->strictErrorChecking = false; 
- $dom->formatOutput = TRUE;
-
- $xpath = new DOMXPath($dom);
- $nodes = $xpath->query("//text()[contains(., \"$suche\")]");
- 
- foreach($xpath->query("//text()[not(ancestor::a)]") as $node){
-
-     $replaced = str_replace($suche, $repl, $node->wholeText);
-     $newNode  = $dom->createDocumentFragment();
-     $newNode->appendXML($replaced);
-     $node->parentNode->replaceChild($newNode, $node);
- 
-}
- #echo $dom->saveXML($dom->documentElement);
- 
- # http://stackoverflow.com/questions/4044812/regex-domdocument-match-and-replace-text-not-in-a-link
- return mb_substr($dom->saveXML($xpath->query('//body')->item(0)), 6, -7, "UTF-8");
-}
-
-function get_array_key($search, $array)
-{
-# funktion durchsucht eine Mehrdimensionales Array(thema2) ob ein Suchbegriff darin enthalten ist und liefert ggf. key zurück
-  foreach($array as $key => $values)
-  {
-    if(in_array($search, $values))
-    {
-      return $key;
-    }
-  }
-  return false;
-}
-
-function makeKNK_FA($a, $b)
-{ 
-  $db = dbconnect();
-  $db->query("SET NAMES 'utf8'");
-
-  $result_knk_fa = $db->query("SELECT number, question, answer, reference, description, description2, headline
-                               FROM knk_fa
-  	                      WHERE number ='$b'
-                           ");
-  $row_knk_fa = $result_knk_fa->fetch_array();
-
-  $ueberschrift = str_replace (array("—", "ä", "ö", "ü", "ß", "Ä", "Ö", "Ü", '"'), array("-", "&auml;", "&ouml;", "&uuml;", "&szlig;", "&Auml;", "&Ouml;", "&Uuml;", '\"'), "Frage ".$row_knk_fa['number']);
-  $question= str_replace (array("&#39;"), array("&amp;\#39;"), $row_knk_fa['question']);
-  $answer= str_replace (array("&#39;"), array("&amp;\#39;"), $row_knk_fa['answer']);
-  $reference= str_replace (array("&#39;"), array("&amp;\#39;"), $row_knk_fa['reference']);
-  $description= str_replace (array("&#39;"), array("&amp;\#39;"), $row_knk_fa['description']);
-  $description2= str_replace (array("&#39;"), array("&amp;\#39;"), $row_knk_fa['description2']);
-  
-  $max=1000;
-  $origin=strlen($answer);
-  $answer = substr($answer.' ' , 0 , $max + 1);
-  $answer = substr($answer , 0 , strrpos ($answer , ' '));
-
-  $answer = strip_tags($answer, '<nobr><em>,<span>,<br>,<b>,<strong>,<ul>,<li>,<ol>,<a>');
-  if($max<=$origin){ 
-   # Funktioniert manchmal nicht, da nicht zwischen Wort getrennt wird [strrpos ($text , ' ')] sondern immer nach einem
-   # vollständigen Wort. Das Merkmal ist: Wenn ein Leerzeichen kommt, dann trennen.
-   # Es kann passieren, dass es dann nach dem Wort span [<span class=\'verse\'>] getrennt wird,
-   # Dann sieht es so aus: <span<nobr> <b>[...]</b></nobr>, weil nach dem Span ein Leerzeichen kommt.
-   # Der Tag wird dann nicht dargestellt.
-   # Zur Minderung: $text = strip_tags($text, '<nobr><em>,<span>,<br>,<b>,<strong>,<ul>,<li>,<ol>,<a>');
-   $answer.="<nobr> <b>[...]</b></nobr>";
-  }
-  $kapitel = $b;
-  $kap=$row_knk_fa['headline'];
-  $body = "<table><tr><td class=knkfa><b>$question</b><td></tr><tr><td class=knkfa>$answer<td></tr>";
-  if($reference != ''){
-    $body_ref = "<tr><td class=knkfa>$reference</td></tr>";
-    $body = $body.$body_ref;
-  }
-  if($description != ''){
-    $body_desc = "<tr><td class=knkfa bgcolor=#ffffff>$description</td></tr>";
-    $body = $body.$body_desc;
-  }
-  if($description2 != ''){
-    $body_desc2 = "<tr><td class=knkfa bgcolor=#ffffff>$description2</td></tr>";
-    $body = $body.$body_desc2;
-  }
-  $body_footer .= "</table>";
-  $body = $body.$body_footer;
-  
-  return sprintf("<a href=\"katechismus_fa.php?katechismus_knk=$kap&katechismus_kapitel=$b\" target=_parent class=\"biblelink\" onmouseover=\"return overlib('$body',  ABOVE, CAPTION,'$ueberschrift', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 600);\" onmouseout=\"nd();\">%s</a>",  $a.' '.$b,  $a.' '.$b);
-}
-
-function makeKNK($a, $b)
-{ 
-  $db = dbconnect();
-  $result_knk = $db->query("SELECT ueberschrift, text
-                               FROM knk
-  	                      WHERE knk ='$b'
-                           ");
-  $row_knk = $result_knk->fetch_array();
-
-  $ueberschrift = str_replace (array("—", "ä", "ö", "ü", "ß", "Ä", "Ö", "Ü", '"'), array("-", "&auml;", "&ouml;", "&uuml;", "&szlig;", "&Auml;", "&Ouml;", "&Uuml;", '\"'), $row_knk['ueberschrift']);
-  $text= str_replace (array("&#39;"), array("&amp;\#39;"), $row_knk['text']);
-  
-  $max=1000;
-  $origin=strlen($text);
-  $text = substr($text.' ' , 0 , $max + 1);
-  $text = substr($text , 0 , strrpos ($text , ' '));
-
-  $text = strip_tags($text, '<nobr><em>,<span>,<br>,<b>,<strong>,<ul>,<li>,<ol>,<a>');
-  if($max<=$origin){ 
-   # Funktioniert manchmal nicht, da nicht zwischen Wort getrennt wird [strrpos ($text , ' ')] sondern immer nach einem
-   # vollständigen Wort. Das Merkmal ist: Wenn ein Leerzeichen kommt, dann trennen.
-   # Es kann passieren, dass es dann nach dem Wort span [<span class=\'verse\'>] getrennt wird,
-   # Dann sieht es so aus: <span<nobr> <b>[...]</b></nobr>, weil nach dem Span ein Leerzeichen kommt.
-   # Der Tag wird dann nicht dargestellt.
-   # Zur Minderung: $text = strip_tags($text, '<nobr><em>,<span>,<br>,<b>,<strong>,<ul>,<li>,<ol>,<a>');
-   $text.="<nobr> <b>[...]</b></nobr>";
-  }
-  $kapitel = explode('.', $b);
-  $kap=$kapitel[0];
-  return sprintf("<a href=\"katechismus.php?katechismus_knk=$kap&katechismus_kapitel=$b\" target=_parent class=\"biblelink\" onmouseover=\"return overlib('$text',  ABOVE, CAPTION,'Katechismus: $ueberschrift', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 600);\" onmouseout=\"nd();\">%s</a>",  $a.' '.$b,  $a.' '.$b);
-}
-
-
-function makeKNK2($a, $b, $c, $d, $e, $f)
-{
-
-  $db = dbconnect();
-  $result_knk = $db->query("SELECT ueberschrift, text
-                               FROM knk
-  	                      WHERE knk ='$d'
-                           ");
-  $row_knk = $result_knk->fetch_array();
-
-  
-  $ueberschrift = str_replace (array("—", "ä", "ö", "ü", "ß", "Ä", "Ö", "Ü", '"'), array("-", "&auml;", "&ouml;", "&uuml;", "&szlig;", "&Auml;", "&Ouml;", "&Uuml;", '\"'), $row_knk['ueberschrift']);
-  $text= str_replace (array("&#39;"), array("&amp;\#39;"), $row_knk['text']);
-  
-  $max=1000;
-  $origin=strlen($text);
-  $text = substr($text.' ' , 0 , $max + 1);
-  $text = substr($text , 0 , strrpos ($text , ' '));
-
-  $text = strip_tags($text, '<nobr><em>,<span>,<br>,<b>,<strong>,<ul>,<li>,<ol>,<a>');
-  if($max<=$origin){ 
-   # Funktioniert manchmal nicht, da nicht zwischen Wort getrennt wird [strrpos ($text , ' ')] sondern immer nach einem
-   # vollständigen Wort. Das Merkmal ist: Wenn ein Leerzeichen kommt, dann trennen.
-   # Es kann passieren, dass es dann nach dem Wort span [<span class=\'verse\'>] getrennt wird,
-   # Dann sieht es so aus: <span<nobr> <b>[...]</b></nobr>, weil nach dem Span ein Leerzeichen kommt.
-   # Der Tag wird dann nicht dargestellt.
-   # Zur Minderung: $text = strip_tags($text, '<nobr><em>,<span>,<br>,<b>,<strong>,<ul>,<li>,<ol>,<a>');
-   $text.="<nobr> <b>[...]</b></nobr>";
-  }
-  $kapitel = explode('.', $d);
-  $kap=$kapitel[0];
-  if(strlen($row_knk['text'])>0){
-    if($a == ' '){
-    #bei Konstellationen (5.3.2.3; 5.3.2.4) ist $a entweder ( oder Leerzeichen. Für saubere Darstellung des Links, ohne dass das Leerzeichen Teil des Links ist, kommt $a bei der Ausgabe weg und das Leerzeichen vor dem Link
-      return sprintf(" <a href=\"katechismus.php?katechismus_knk=$kap&katechismus_kapitel=$d\" target=_parent class=\"biblelink\" onmouseover=\"return overlib('$text', ABOVE , CAPTION,'Katechismus: $ueberschrift', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 600);\" onmouseout=\"nd();\">%s</a>",  $b.$c.$d.$f,  $b.$c.$d.$f);
-    }else{
-      return sprintf("<a href=\"katechismus.php?katechismus_knk=$kap&katechismus_kapitel=$d\" target=_parent class=\"biblelink\" onmouseover=\"return overlib('$text', ABOVE , CAPTION,'Katechismus: $ueberschrift', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 600);\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$d.$f,  $a.$b.$c.$d.$f);
-    }
-  }else{
-      return $a.$b.$c.$d.$f;
-  }
-
-}
-
-
- # Wurde nur für die Erstellung der Textvarianten reference_lokal bzw reference_bibleserver aus func_make_reference_fa.php verwendet
-function makeKNK_FA2($b)
-{ 
-  $db = dbconnect();
-  $db->query("SET NAMES 'utf8'");
-
-  $result_knk_fa = $db->query("SELECT number, question, answer, reference, description, description2, headline
-                               FROM knk_fa
-  	                      WHERE number ='$b'
-                           ");
-  $row_knk_fa = $result_knk_fa->fetch_array();
-
-  $ueberschrift = str_replace (array("—", "ä", "ö", "ü", "ß", "Ä", "Ö", "Ü", '"'), array("-", "&auml;", "&ouml;", "&uuml;", "&szlig;", "&Auml;", "&Ouml;", "&Uuml;", '\"'), "Frage ".$row_knk_fa['number']);
-  $question= str_replace (array("&#39;"), array("&amp;\#39;"), $row_knk_fa['question']);
-  $answer= str_replace (array("&#39;"), array("&amp;\#39;"), $row_knk_fa['answer']);
-  $reference= str_replace (array("&#39;"), array("&amp;\#39;"), $row_knk_fa['reference']);
-  $description= str_replace (array("&#39;"), array("&amp;\#39;"), $row_knk_fa['description']);
-  $description2= str_replace (array("&#39;"), array("&amp;\#39;"), $row_knk_fa['description2']);
-  
-  $max=1000;
-  $origin=strlen($answer);
-  $answer = substr($answer.' ' , 0 , $max + 1);
-  $answer = substr($answer , 0 , strrpos ($answer , ' '));
-
-  $answer = strip_tags($answer, '<nobr><em>,<span>,<br>,<b>,<strong>,<ul>,<li>,<ol>,<a>');
-  if($max<=$origin){ 
-   # Funktioniert manchmal nicht, da nicht zwischen Wort getrennt wird [strrpos ($text , ' ')] sondern immer nach einem
-   # vollständigen Wort. Das Merkmal ist: Wenn ein Leerzeichen kommt, dann trennen.
-   # Es kann passieren, dass es dann nach dem Wort span [<span class=\'verse\'>] getrennt wird,
-   # Dann sieht es so aus: <span<nobr> <b>[...]</b></nobr>, weil nach dem Span ein Leerzeichen kommt.
-   # Der Tag wird dann nicht dargestellt.
-   # Zur Minderung: $text = strip_tags($text, '<nobr><em>,<span>,<br>,<b>,<strong>,<ul>,<li>,<ol>,<a>');
-   $answer.="<nobr> <b>[...]</b></nobr>";
-  }
-  $kapitel = $b;
-  $kap=$row_knk_fa['headline'];
-  $body = "<table><tr><td class=knkfa><b>$question</b><td></tr><tr><td class=knkfa>$answer<td></tr>";
-  if($reference != ''){
-    $body_ref = "<tr><td class=knkfa>$reference</td></tr>";
-    $body = $body.$body_ref;
-  }
-  if($description != ''){
-    $body_desc = "<tr><td class=knkfa bgcolor=#ffffff>$description</td></tr>";
-    $body = $body.$body_desc;
-  }
-  if($description2 != ''){
-    $body_desc2 = "<tr><td class=knkfa bgcolor=#ffffff>$description2</td></tr>";
-    $body = $body.$body_desc2;
-  }
-  $body_footer .= "</table>";
-  $body = $body.$body_footer;
-  
-  return sprintf("<a href=\"katechismus_fa.php?katechismus_knk=$kap&katechismus_kapitel=$b\" target=_parent class=\"biblelink\" onmouseover=\"return overlib('$body',  ABOVE, CAPTION,'$ueberschrift', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 600);\" onmouseout=\"nd();\">%s</a>",  $b,  $b);
-}
-
-?>
\ No newline at end of file
diff --git a/func_ansicht.php_lut84_20180219 b/func_ansicht.php_lut84_20180219
deleted file mode 100644
index 5bc72bdd..00000000
--- a/func_ansicht.php_lut84_20180219
+++ /dev/null
@@ -1,714 +0,0 @@
-<?php
-
-
-function makeLink($a, $b, $c, $d, $e, $f, $g, $h, $lid, $link)
-{
-
-  $a=trim($a);
-  $b=trim($b);
-  $c=trim($c);
-  $d=trim($d);
-  $e=trim($e);
-  $f=trim($f);
-  $g=trim($g);
-  $h=trim($h);
-  
-  # $d muss immer ein Komma haben, wenn danach noch was kommt
-  if($e != '' or $f != "" or $g != "" or $h != ""){
-   if($d == ''){
-     $d=',';
-   }
-  }
-  
-  /*
-  echo "a: '$a'<br>
-        b: '$b'<br>
-        c: '$c'<br>
-        d: '$d'<br>
-        e: '$e'<br>
-        f: '$f'<br>
-        g: '$g'<br>
-        h: '$h'<br>
-        i: '$i'<br>
-        ";
-  */
-  
-  $b =str_replace  ("Ruth",  "Rut"  ,  $b);
-  $b =str_replace  ("Esther",  "Ester"  ,  $b);
-  $b =str_replace  ("Judith",  "Judit"  ,  $b);
-  $b =str_replace  ("Ezechiel",  "Hesekiel"  ,  $b);
-  $b =str_replace  ("Ijob",  "Hiob"  ,  $b);
-  
-  if($a!=''){
-   $a=$a." ";
-  }
-  
-  if($c!=''){
-   $c=" ".$c;
-  }
-  if($e!=''){
-   $e=" ".$e." ";
-  }
-  
-  // Handling, wenn bei Bibelstelle Bindestrich oder Punkt enthalten sind
-  if($g == '-'){
-
-    #$wort="Römer 8,31-39";
-    $wort="$a$b$c$d$f$g$h";
-    $wort=trim($wort);
-    
-    
-    if($link == 'lokal'){
-      $wort="$wort|T|$lid";
-      #target=\"_blank\" 
-      return sprintf("<a class=\"biblelink\" href=\"javascript:bib_link_lokal1('bibelpopup/bib_popup.php?wort=%s&amp;stopmark=$f','Bibellink','640','480','center','front');\" onmouseover=\"return overlib('".getword("$wort")."',  ABOVE, CAPTION,'%s', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 450 );\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$d.$f.$g.$h,  $a.$b.$c.$d.$f.$g.$h, $a.$b.$c.$d.$e.$f.$g.$h);
-    }elseif($link == 'bibleserver'){
-      #target=\"_blank\" 
-      return sprintf("<a class=\"biblelink\" href=\"http://www.bibleserver.com/go.php?lang={de}&amp;bible={LUT84}&amp;ref=%s\" target=\"_blank\" onmouseover=\"return overlib('".getword("$wort")."',  ABOVE, CAPTION,'%s', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 450 );\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$d.$f.$g.$h,  $a.$b.$c.$d.$f.$g.$h, $a.$b.$c.$d.$e.$f.$g.$h);
-    }
-    
-    
-  }elseif($g == '.'){
-    
-    // Wenn Punkt, dann muss unterschieden werden, ob die Textstelle forlaufend ist
-    $next=$f+1;
-    if($h==$next){
-      // Beispiel Matthäus 1,1.2
-      // aus dem Punkt wird ein Bindestrich für bibleserver
-      $g1='-';
-
-      $wort="$a$b$c$d$f$g1$h";
-      $wort=trim($wort);
-      
-      
-    if($link == 'lokal'){
-      $wort="$wort|T|$lid";
-      return sprintf("<a class=\"biblelink\" href=\"javascript:bib_link_lokal1('bibelpopup/bib_popup.php?wort=%s&amp;stopmark=$f','Bibellink','640','480','center','front');\" onmouseover=\"return overlib('".getword("$wort")."',  ABOVE, CAPTION,'%s', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 450 );\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$d.$f.$g1.$h,  $a.$b.$c.$d.$f.$g1.$h, $a.$b.$c.$d.$e.$f.$g.$h);
-    }elseif($link == 'bibleserver'){
-      return sprintf("<a class=\"biblelink\" href=\"http://www.bibleserver.com/go.php?lang={de}&amp;bible={LUT84}&amp;ref=%s\" target=\"_blank\" onmouseover=\"return overlib('".getword("$wort")."',  ABOVE, CAPTION,'%s', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 450 );\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$d.$f.$g1.$h,  $a.$b.$c.$d.$f.$g1.$h, $a.$b.$c.$d.$e.$f.$g.$h);
-    }
-      
-
-      
-    }else{
-      // Beispiel Matthäus 1,1.3
-      // Da Vers 2 nicht aufgeführt ist, darf man nicht 1-3 machen
-      // Parameter $g und $h (.3) wird daher nicht im Link übergeben
-
-      $wort="$a$b$c$d$f";
-      $wort=trim($wort);
-      
-    if($link == 'lokal'){
-      $wort="$wort|T|$lid";
-      return sprintf("<a class=\"biblelink\" href=\"javascript:bib_link_lokal1('bibelpopup/bib_popup.php?wort=%s&amp;stopmark=$f','Bibellink','640','480','center','front');\" onmouseover=\"return overlib('".getword("$wort")."',  ABOVE, CAPTION,'%s', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 450 );\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$d.$f,  $a.$b.$c.$d.$f, $a.$b.$c.$d.$e.$f.$g.$h);
-    }elseif($link == 'bibleserver'){
-      return sprintf("<a class=\"biblelink\" href=\"http://www.bibleserver.com/go.php?lang={de}&amp;bible={LUT84}&amp;ref=%s\" target=\"_blank\" onmouseover=\"return overlib('".getword("$wort")."',  ABOVE, CAPTION,'%s', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 450 );\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$d.$f,  $a.$b.$c.$d.$f, $a.$b.$c.$d.$e.$f.$g.$h);
-    }
-   
-      
-    }
-    
-  }else{
-    // Alles Ohne Bindestrich und Punkt, daher auch kein $g und $h
-    
-    $wort="$a$b$c$d$f$g$h";
-    $wort=trim($wort);
-
-    if($link == 'lokal'){
-      $wort="$wort|T|$lid";
-      return sprintf("<a class=\"biblelink\" href=\"javascript:bib_link_lokal1('bibelpopup/bib_popup.php?wort=%s&amp;stopmark=$f','Bibellink','640','480','center','front');\" onmouseover=\"return overlib('".getword("$wort")."',  ABOVE, CAPTION,'%s', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 450 );\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$d.$f.$g.$h,  $a.$b.$c.$d.$f.$g.$h, $a.$b.$c.$d.$e.$f.$g.$h);
-    }elseif($link == 'bibleserver'){
-      return sprintf("<a class=\"biblelink\" href=\"http://www.bibleserver.com/go.php?lang={de}&amp;bible={LUT84}&amp;ref=%s\" target=\"_blank\" onmouseover=\"return overlib('".getword("$wort")."',  ABOVE, CAPTION,'%s', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 450 );\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$d.$f.$g.$h,  $a.$b.$c.$d.$f.$g.$h, $a.$b.$c.$d.$e.$f.$g.$h);
-    }
-    
-  }
-}
-
-
-function refill($a,$b,$c,$d,$e,$f,$g,$h,$i)
-{
-// Funktion die aus Textstellenkurzeichen die vollständige Textstelle erstellt
-
-/*
-echo "a: '$a'<br>
-      b: '$b'<br>
-      c: '$c'<br>
-      d: '$d'<br>
-      e: '$e'<br>
-      f: '$f'<br>
-      g: '$g'<br>
-      h: '$h'<br>
-      i: '$i'<br>
-      ";
-*/
-
-switch($c)
-{
-case'Sir':
-     $c= 'Sirach';
-     break;
-case'Mo':
-     $c= 'Mose';
-     break;
-case'Jos':
-     $c= 'Josua';
-     break;
-case'Ri':
-     $c= 'Richter';
-     break;
-case'Rut':
-     $c= 'Rut';
-     break;
-case'Sam':
-     $c= 'Samuel';
-     break;
-case'K&ouml;n':
-     $c= 'K&ouml;nige';
-     break;
-case'Chr':
-     $c= 'Chronik';
-     break;
-case'Esr':
-     $c= 'Esra';
-     break;
-case'Neh':
-     $c= 'Nehemia';
-     break;
-case'Est':
-     $c= 'Esther';
-     break;
-case'Hiob':
-     $c= 'Hiob';
-     break;
-case'Hi':
-     $c= 'Hiob';
-     break;
-case'Ps':
-     $c= 'Psalm';
-     break;
-case'Spr':
-     $c= 'Spr&uuml;che';
-     break;
-case'Pred':
-     $c= 'Prediger';
-     break;
-case'Hld':
-     $c= 'Hoheslied';
-     break;
-case'Jes':
-     $c= 'Jesaja';
-     break;
-case'Jer':
-     $c= 'Jeremia';
-     break;
-case'Kla':
-     $c= 'Klagelieder';
-     break;
-case'Klgl':
-     $c= 'Klagelieder';
-     break;
-case'Hes':
-     $c= 'Hesekiel';
-     break;
-case'St zu Dan':
-     $c= 'St&uuml;cke zu Daniel';
-     break;
-case'Dan':
-     $c= 'Daniel';
-     break;
-case'Hos':
-     $c= 'Hosea';
-     break;
-case'Joel':
-     $c= 'Joel';
-     break;
-case'Am':
-     $c= 'Amos';
-     break;
-case'Obd':
-     $c= 'Obadja';
-     break;
-case'Jona':
-     $c= 'Jona';
-     break;
-case'Mi':
-     $c= 'Micha';
-     break;
-case'Nah':
-     $c= 'Nahum';
-     break;
-case'Hab':
-     $c= 'Habakuk';
-     break;
-case'Zef':
-     $c= 'Zefanja';
-     break;
-case'Hag':
-     $c= 'Haggai';
-     break;
-case'Sach':
-     $c= 'Sacharja';
-     break;
-case'Weish':
-     $c= 'Weisheit';
-     break;
-case'Mal':
-     $c= 'Maleachi';
-     break;
-case'Tob':
-     $c= 'Tobias';
-     break;
-case'Mt':
-     $c= 'Matth&auml;us';
-     break;
-case'Mk':
-     $c= 'Markus';
-     break;
-case'Lk':
-     $c= 'Lukas';
-     break;
-case'Luk':
-     $c= 'Lukas';
-     break;
-case'Joh':
-     $c= 'Johannes';
-     break;
-case'Jh':
-     $c= 'Johannes';
-     break;
-case'Apg':
-     $c= 'Apostelgeschichte';
-     break;
-case'R&ouml;m':
-     $c= 'R&ouml;mer';
-     break;
-case'Rom':
-     $c= 'R&ouml;mer';
-     break;
-case'Kor':
-     $c= 'Korinther';
-     break;
-case'Gal':
-     $c= 'Galater';
-     break;
-case'Eph':
-     $c= 'Epheser';
-     break;
-case'Phil':
-     $c= 'Philipper';
-     break;
-case'Kol':
-     $c= 'Kolosser';
-     break;
-case'Thess':
-     $c= 'Thessalonicher';
-     break;
-case'Tim':
-     $c= 'Timotheus';
-     break;
-case'Tit':
-     $c= 'Titus';
-     break;
-case'Phlm':
-     $c= 'Philemon';
-     break;
-case'Ptr':
-     $c= 'Petrus';
-     break;
-case'Petr':
-     $c= 'Petrus';
-     break;
-case'Hbr':
-     $c= 'Hebr&auml;er';
-     break;
-case'Hebr':
-     $c= 'Hebr&auml;er';
-     break;
-case'Jak':
-     $c= 'Jakobus';
-     break;
-case'Jk':
-     $c= 'Jakobus';
-     break;
-case'Jud':
-     $c= 'Judas';
-     break;
-case'Offb':
-     $c= 'Offenbarung';
-     break;
-case'Off':
-     $c= 'Offenbarung';
-     break;
-}
-
-#  $a=trim($a);
-  if($a !=""){$a=trim($a).".";} // nach der Zahl noch der Punkt hinzufügen
-  if($a != ""){$a=trim($a)." ";$b="";} // nach dem Punkt ein Leerzeichen, B kann dann entfallen
-  if($d ==""){$d=" ";}
-  if($g !=""){$g=" ".$g." ";} // --> "1. Johannes 3,aus3" wird "1. Johannes 3, aus 3"
-  
- 
- 
- return trim($a.$b.$c.$d.$e.$f.$g.$h);
-}
-
-
-// Herausfinden des Verses, damit bei bibelpopup an den Anker "Stopmark" gesprungen wird           
-function splitword_stopmark($a,$b,$c,$d,$e,$f,$g,$h){
-  return "$d";
-}       
-
-
-function makepopup($art, $weid, $eid, $thema_kurz, $template1){
-  $db = dbconnect();
-  if($art=="lueexeg"){
-    
-    $result_exeg1a = $db->query("SELECT count(*) Anz 
-                                    FROM wort_exegese
-                                   WHERE verweis='$weid'
-                                     AND beschreibung != ''");
-    $row_exeg1a = $result_exeg1a->fetch_array(); 
-  
-    if($row_exeg1a['Anz']>1){
-    $query_exeg2 = "SELECT weid, wort, beschreibung, verweis
-                      FROM wort_exegese
-                     WHERE verweis='$weid'
-                       AND beschreibung != ''";
-    $result_exeg2 = $db->query( $query_exeg2)
-	             or die ("Cannot execute query: result_exeg2");
-
-    $zaehler_exeg=1;
-    $exegese = "<table width=100%>";
-    
-      
-      while ($row_exeg2 = $result_exeg2->fetch_array()){
-       $exegese .= "<tr>
-                       <td valign=top>
-                         <font style=\"font-size:8pt\">$zaehler_exeg</font>
-                       </td>
-                       <td valign=top>
-                         <font style=\"font-size:8pt\">$row_exeg2[beschreibung]</font>
-                       </td>
-                    </tr>";  
-       $zaehler_exeg=$zaehler_exeg+1;
-      }
-     
-     $exegese .= "</table>";
-     
-    }else{
-      $result_exeg3 = $db->query("SELECT beschreibung
-                                    FROM wort_exegese
-                                   WHERE weid='$weid'");
-      $row_exeg3 = $result_exeg3->fetch_array();
-      $exegese = $row_exeg3['beschreibung'];
-    }
-
-     $exegese=preg_replace("/\n/", "", $exegese);
-     $exegese=preg_replace("/\r/", "", $exegese);
-     $exegese= preg_replace('/\s{2,}/sm',' ',$exegese,PREG_SET_ORDER); //Mehr als zwei leerzeichen entfernen
-     $exegese = str_replace (array('"'), array("&quot;"), $exegese);
-     $exegese = str_replace (array("'"), array("\'"), $exegese);
-     
-     $result_lue1 = $db->query("SELECT thema
-                                   FROM lue_quelle
-                                  WHERE eid='$eid'");
-     $row_lue1 = $result_lue1->fetch_array();
-     $thema = $row_lue1['thema'];
-     
-    $repl="<a class=alue href='lue_ansicht.php?eid=$eid' title='Lehre und Erkenntnis: $thema' target='_parent'>$thema_kurz</a><a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $thema_kurz',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserkl&auml;rung' border='0' height=10 src='templates/$template1/images/i.png'></sup></a>";
-  }
-  
-  
-  if($art=="exeg"){
-    
-    $result_exeg1a = $db->query("SELECT count(*) Anz 
-                                    FROM wort_exegese
-                                   WHERE verweis='$weid'
-                                     AND beschreibung != ''");
-    $row_exeg1a = $result_exeg1a->fetch_array();
-
-    
-    if($row_exeg1a['Anz']>1){
-    $query_exeg2 = "SELECT weid, wort, beschreibung, verweis
-                      FROM wort_exegese
-                     WHERE verweis='$weid'
-                       AND beschreibung != ''";
-
-    $result_exeg2 = $db->query( $query_exeg2)
-	             or die ("Cannot execute query: result_exeg2");
-    
-    $zaehler_exeg=1;
-    $exegese = "<table width=100%>";
-    
-      while ($row_exeg2 = $result_exeg2->fetch_array()){
-       $exegese .= "<tr>
-                       <td valign=top>
-                         <font style=\"font-size:8pt\">$zaehler_exeg</font>
-                       </td>
-                       <td valign=top>
-                         <font style=\"font-size:8pt\">$row_exeg2[beschreibung]</font>
-                       </td>
-                    </tr>";  
-       $zaehler_exeg=$zaehler_exeg+1;
-      }
-     
-     $exegese .= "</table>";
-     
-    }else{
-      $result_exeg1 = $db->query("SELECT beschreibung
-                                      FROM wort_exegese
-                                     WHERE weid='$weid'");
-      $row_exeg1 = $result_exeg1->fetch_array();
-      $exegese = $row_exeg1['beschreibung'];
-    }
-
-     $exegese=preg_replace("/\n/", "", $exegese);
-     $exegese=preg_replace("/\r/", "", $exegese);
-     $exegese= preg_replace('/\s{2,}/sm',' ',$exegese,PREG_SET_ORDER); //Mehr als zwei leerzeichen entfernen
-     $exegese = str_replace (array('"'), array("&quot;"), $exegese);
-     $exegese = str_replace (array("'"), array("\'"), $exegese);
-     
-     $repl="$thema_kurz<a onmouseover=\"return overlib('$exegese',  ABOVE, CAPTION,'Begriffserkl&auml;rung: $thema_kurz',  STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 300);\" onmouseout='nd();'><sup><img title = 'Begriffserkl&auml;rung' border='0' height=10 src='templates/$template1/images/i.png'></sup></a>";
-  }
-  
-  if($art=="lue"){
-    $result_lue1 = $db->query("SELECT thema
-                                  FROM lue_quelle
-                                 WHERE eid='$eid'");
-    $row_lue1 = $result_lue1->fetch_array();
-
-    
-    
-    #echo "$row_lue1[thema] --> $eid<br>\n";
-    $thema = $row_lue1['thema'];
-    $repl="<a class=alue href='lue_ansicht.php?eid=$eid' title='Lehre und Erkenntnis: $thema' target='_parent'>$thema_kurz</a>";
-    #$repl ="";
-  }
-
-return $repl;
-}
-
-function replace_text_links($suche, $repl, $text){
- $dom = new DOMDocument;
- @$dom->loadHtml(mb_convert_encoding($text, 'HTML-ENTITIES', "UTF-8"));
- $dom->recover = true;
- $dom->strictErrorChecking = false; 
- $dom->formatOutput = TRUE;
-
- $xpath = new DOMXPath($dom);
- $nodes = $xpath->query("//text()[contains(., \"$suche\")]");
- 
- foreach($xpath->query("//text()[not(ancestor::a)]") as $node){
-
-     $replaced = str_replace($suche, $repl, $node->wholeText);
-     $newNode  = $dom->createDocumentFragment();
-     $newNode->appendXML($replaced);
-     $node->parentNode->replaceChild($newNode, $node);
- 
-}
- #echo $dom->saveXML($dom->documentElement);
- 
- # http://stackoverflow.com/questions/4044812/regex-domdocument-match-and-replace-text-not-in-a-link
- return mb_substr($dom->saveXML($xpath->query('//body')->item(0)), 6, -7, "UTF-8");
-}
-
-function get_array_key($search, $array)
-{
-# funktion durchsucht eine Mehrdimensionales Array(thema2) ob ein Suchbegriff darin enthalten ist und liefert ggf. key zurück
-  foreach($array as $key => $values)
-  {
-    if(in_array($search, $values))
-    {
-      return $key;
-    }
-  }
-  return false;
-}
-
-function makeKNK_FA($a, $b)
-{ 
-  $db = dbconnect();
-  $db->query("SET NAMES 'utf8'");
-
-  $result_knk_fa = $db->query("SELECT number, question, answer, reference, description, description2, headline
-                               FROM knk_fa
-  	                      WHERE number ='$b'
-                           ");
-  $row_knk_fa = $result_knk_fa->fetch_array();
-
-  $ueberschrift = str_replace (array("—", "ä", "ö", "ü", "ß", "Ä", "Ö", "Ü", '"'), array("-", "&auml;", "&ouml;", "&uuml;", "&szlig;", "&Auml;", "&Ouml;", "&Uuml;", '\"'), "Frage ".$row_knk_fa['number']);
-  $question= str_replace (array("&#39;"), array("&amp;\#39;"), $row_knk_fa['question']);
-  $answer= str_replace (array("&#39;"), array("&amp;\#39;"), $row_knk_fa['answer']);
-  $reference= str_replace (array("&#39;"), array("&amp;\#39;"), $row_knk_fa['reference']);
-  $description= str_replace (array("&#39;"), array("&amp;\#39;"), $row_knk_fa['description']);
-  $description2= str_replace (array("&#39;"), array("&amp;\#39;"), $row_knk_fa['description2']);
-  
-  $max=1000;
-  $origin=strlen($answer);
-  $answer = substr($answer.' ' , 0 , $max + 1);
-  $answer = substr($answer , 0 , strrpos ($answer , ' '));
-
-  $answer = strip_tags($answer, '<nobr><em>,<span>,<br>,<b>,<strong>,<ul>,<li>,<ol>,<a>');
-  if($max<=$origin){ 
-   # Funktioniert manchmal nicht, da nicht zwischen Wort getrennt wird [strrpos ($text , ' ')] sondern immer nach einem
-   # vollständigen Wort. Das Merkmal ist: Wenn ein Leerzeichen kommt, dann trennen.
-   # Es kann passieren, dass es dann nach dem Wort span [<span class=\'verse\'>] getrennt wird,
-   # Dann sieht es so aus: <span<nobr> <b>[...]</b></nobr>, weil nach dem Span ein Leerzeichen kommt.
-   # Der Tag wird dann nicht dargestellt.
-   # Zur Minderung: $text = strip_tags($text, '<nobr><em>,<span>,<br>,<b>,<strong>,<ul>,<li>,<ol>,<a>');
-   $answer.="<nobr> <b>[...]</b></nobr>";
-  }
-  $kapitel = $b;
-  $kap=$row_knk_fa['headline'];
-  $body = "<table><tr><td class=knkfa><b>$question</b><td></tr><tr><td class=knkfa>$answer<td></tr>";
-  if($reference != ''){
-    $body_ref = "<tr><td class=knkfa>$reference</td></tr>";
-    $body = $body.$body_ref;
-  }
-  if($description != ''){
-    $body_desc = "<tr><td class=knkfa bgcolor=#ffffff>$description</td></tr>";
-    $body = $body.$body_desc;
-  }
-  if($description2 != ''){
-    $body_desc2 = "<tr><td class=knkfa bgcolor=#ffffff>$description2</td></tr>";
-    $body = $body.$body_desc2;
-  }
-  $body_footer .= "</table>";
-  $body = $body.$body_footer;
-  
-  return sprintf("<a href=\"katechismus_fa.php?katechismus_knk=$kap&katechismus_kapitel=$b\" target=_parent class=\"biblelink\" onmouseover=\"return overlib('$body',  ABOVE, CAPTION,'$ueberschrift', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 600);\" onmouseout=\"nd();\">%s</a>",  $a.' '.$b,  $a.' '.$b);
-}
-
-function makeKNK($a, $b)
-{ 
-  $db = dbconnect();
-  $result_knk = $db->query("SELECT ueberschrift, text
-                               FROM knk
-  	                      WHERE knk ='$b'
-                           ");
-  $row_knk = $result_knk->fetch_array();
-
-  $ueberschrift = str_replace (array("—", "ä", "ö", "ü", "ß", "Ä", "Ö", "Ü", '"'), array("-", "&auml;", "&ouml;", "&uuml;", "&szlig;", "&Auml;", "&Ouml;", "&Uuml;", '\"'), $row_knk['ueberschrift']);
-  $text= str_replace (array("&#39;"), array("&amp;\#39;"), $row_knk['text']);
-  
-  $max=1000;
-  $origin=strlen($text);
-  $text = substr($text.' ' , 0 , $max + 1);
-  $text = substr($text , 0 , strrpos ($text , ' '));
-
-  $text = strip_tags($text, '<nobr><em>,<span>,<br>,<b>,<strong>,<ul>,<li>,<ol>,<a>');
-  if($max<=$origin){ 
-   # Funktioniert manchmal nicht, da nicht zwischen Wort getrennt wird [strrpos ($text , ' ')] sondern immer nach einem
-   # vollständigen Wort. Das Merkmal ist: Wenn ein Leerzeichen kommt, dann trennen.
-   # Es kann passieren, dass es dann nach dem Wort span [<span class=\'verse\'>] getrennt wird,
-   # Dann sieht es so aus: <span<nobr> <b>[...]</b></nobr>, weil nach dem Span ein Leerzeichen kommt.
-   # Der Tag wird dann nicht dargestellt.
-   # Zur Minderung: $text = strip_tags($text, '<nobr><em>,<span>,<br>,<b>,<strong>,<ul>,<li>,<ol>,<a>');
-   $text.="<nobr> <b>[...]</b></nobr>";
-  }
-  $kapitel = explode('.', $b);
-  $kap=$kapitel[0];
-  return sprintf("<a href=\"katechismus.php?katechismus_knk=$kap&katechismus_kapitel=$b\" target=_parent class=\"biblelink\" onmouseover=\"return overlib('$text',  ABOVE, CAPTION,'Katechismus: $ueberschrift', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 600);\" onmouseout=\"nd();\">%s</a>",  $a.' '.$b,  $a.' '.$b);
-}
-
-
-function makeKNK2($a, $b, $c, $d, $f)
-{
-  $db = dbconnect();
-  $result_knk = $db->query("SELECT ueberschrift, text
-                               FROM knk
-  	                      WHERE knk ='$d'
-                           ");
-  $row_knk = $result_knk->fetch_array();
-
-  
-  $ueberschrift = str_replace (array("—", "ä", "ö", "ü", "ß", "Ä", "Ö", "Ü", '"'), array("-", "&auml;", "&ouml;", "&uuml;", "&szlig;", "&Auml;", "&Ouml;", "&Uuml;", '\"'), $row_knk['ueberschrift']);
-  $text= str_replace (array("&#39;"), array("&amp;\#39;"), $row_knk['text']);
-  
-  $max=1000;
-  $origin=strlen($text);
-  $text = substr($text.' ' , 0 , $max + 1);
-  $text = substr($text , 0 , strrpos ($text , ' '));
-
-  $text = strip_tags($text, '<nobr><em>,<span>,<br>,<b>,<strong>,<ul>,<li>,<ol>,<a>');
-  if($max<=$origin){ 
-   # Funktioniert manchmal nicht, da nicht zwischen Wort getrennt wird [strrpos ($text , ' ')] sondern immer nach einem
-   # vollständigen Wort. Das Merkmal ist: Wenn ein Leerzeichen kommt, dann trennen.
-   # Es kann passieren, dass es dann nach dem Wort span [<span class=\'verse\'>] getrennt wird,
-   # Dann sieht es so aus: <span<nobr> <b>[...]</b></nobr>, weil nach dem Span ein Leerzeichen kommt.
-   # Der Tag wird dann nicht dargestellt.
-   # Zur Minderung: $text = strip_tags($text, '<nobr><em>,<span>,<br>,<b>,<strong>,<ul>,<li>,<ol>,<a>');
-   $text.="<nobr> <b>[...]</b></nobr>";
-  }
-  $kapitel = explode('.', $d);
-  $kap=$kapitel[0];
-  if(strlen($row_knk['text'])>0){
-    if($a == ' '){
-    #bei Konstellationen (5.3.2.3; 5.3.2.4) ist $a entweder ( oder Leerzeichen. Für saubere Darstellung des Links, ohne dass das Leerzeichen Teil des Links ist, kommt $a bei der Ausgabe weg und das Leerzeichen vor dem Link
-      return sprintf(" <a href=\"katechismus.php?katechismus_knk=$kap&katechismus_kapitel=$d\" target=_parent class=\"biblelink\" onmouseover=\"return overlib('$text', ABOVE , CAPTION,'Katechismus: $ueberschrift', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 600);\" onmouseout=\"nd();\">%s</a>",  $b.$c.$d.$f,  $b.$c.$d.$f);
-    }else{
-      return sprintf("<a href=\"katechismus.php?katechismus_knk=$kap&katechismus_kapitel=$d\" target=_parent class=\"biblelink\" onmouseover=\"return overlib('$text', ABOVE , CAPTION,'Katechismus: $ueberschrift', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 600);\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$d.$f,  $a.$b.$c.$d.$f);
-    }
-  }else{
-      return $a.$b.$c.$d.$f;
-  }
-
-}
-
-
-/* # Wurde nur für die Erstellung der Textvarianten reference_lokal bzw reference_bibleserver aus func_make_reference_fa.php verwendet
-function makeKNK_FA2($b)
-{ 
-  $db = dbconnect();
-  $db->query("SET NAMES 'utf8'");
-
-  $result_knk_fa = $db->query("SELECT number, question, answer, reference, description, description2, headline
-                               FROM knk_fa
-  	                      WHERE number ='$b'
-                           ");
-  $row_knk_fa = $result_knk_fa->fetch_array();
-
-  $ueberschrift = str_replace (array("—", "ä", "ö", "ü", "ß", "Ä", "Ö", "Ü", '"'), array("-", "&auml;", "&ouml;", "&uuml;", "&szlig;", "&Auml;", "&Ouml;", "&Uuml;", '\"'), "Frage ".$row_knk_fa['number']);
-  $question= str_replace (array("&#39;"), array("&amp;\#39;"), $row_knk_fa['question']);
-  $answer= str_replace (array("&#39;"), array("&amp;\#39;"), $row_knk_fa['answer']);
-  $reference= str_replace (array("&#39;"), array("&amp;\#39;"), $row_knk_fa['reference']);
-  $description= str_replace (array("&#39;"), array("&amp;\#39;"), $row_knk_fa['description']);
-  $description2= str_replace (array("&#39;"), array("&amp;\#39;"), $row_knk_fa['description2']);
-  
-  $max=1000;
-  $origin=strlen($answer);
-  $answer = substr($answer.' ' , 0 , $max + 1);
-  $answer = substr($answer , 0 , strrpos ($answer , ' '));
-
-  $answer = strip_tags($answer, '<nobr><em>,<span>,<br>,<b>,<strong>,<ul>,<li>,<ol>,<a>');
-  if($max<=$origin){ 
-   # Funktioniert manchmal nicht, da nicht zwischen Wort getrennt wird [strrpos ($text , ' ')] sondern immer nach einem
-   # vollständigen Wort. Das Merkmal ist: Wenn ein Leerzeichen kommt, dann trennen.
-   # Es kann passieren, dass es dann nach dem Wort span [<span class=\'verse\'>] getrennt wird,
-   # Dann sieht es so aus: <span<nobr> <b>[...]</b></nobr>, weil nach dem Span ein Leerzeichen kommt.
-   # Der Tag wird dann nicht dargestellt.
-   # Zur Minderung: $text = strip_tags($text, '<nobr><em>,<span>,<br>,<b>,<strong>,<ul>,<li>,<ol>,<a>');
-   $answer.="<nobr> <b>[...]</b></nobr>";
-  }
-  $kapitel = $b;
-  $kap=$row_knk_fa['headline'];
-  $body = "<table><tr><td class=knkfa><b>$question</b><td></tr><tr><td class=knkfa>$answer<td></tr>";
-  if($reference != ''){
-    $body_ref = "<tr><td class=knkfa>$reference</td></tr>";
-    $body = $body.$body_ref;
-  }
-  if($description != ''){
-    $body_desc = "<tr><td class=knkfa bgcolor=#ffffff>$description</td></tr>";
-    $body = $body.$body_desc;
-  }
-  if($description2 != ''){
-    $body_desc2 = "<tr><td class=knkfa bgcolor=#ffffff>$description2</td></tr>";
-    $body = $body.$body_desc2;
-  }
-  $body_footer .= "</table>";
-  $body = $body.$body_footer;
-  
-  return sprintf("<a href=\"katechismus_fa.php?katechismus_knk=$kap&katechismus_kapitel=$b\" target=_parent class=\"biblelink\" onmouseover=\"return overlib('$body',  ABOVE, CAPTION,'$ueberschrift', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 600);\" onmouseout=\"nd();\">%s</a>",  $b,  $b);
-}
-*/
-?>
\ No newline at end of file
diff --git a/func_make_knk_fa.php_lut84_20180219 b/func_make_knk_fa.php_lut84_20180219
deleted file mode 100644
index 06c1283b..00000000
--- a/func_make_knk_fa.php_lut84_20180219
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-#error_reporting(E_ALL);
-require_once("config.inc.php");
-require_once("func_ansicht.php");
-require_once("bibellookup.php");
-#require_once("func_htmlclean.php");
-echo "
-<script type='text/javascript' src='overlib/overlib.js'></script>
-";
-
-$link = 'bibleserver';
-#$link = 'lokal';
-$lid="";
-$db = dbconnect();
-
-#$db->query("SET NAMES 'utf8'");
-
-  $query = "SELECT description2, knkfa_id
-              FROM knk_fa
-             ORDER BY knkfa_id ASC";
-  $result = $db->query($query);
-
-
-  while ($row = $result->fetch_array()){
-    
-      $text = str_replace(' "', ' \"', $row['description2']);
-      $text=preg_replace_callback("/([0-9]\s*)?()?(Sir|Mo|Jos|Ri|Rut|Sam|K&ouml;n|Chr|Esr|Neh|Est|Hiob|Ps|Spr|Pred|Hld|Jes|Jer|Kla|Klgl|Hes|St zu Dan|Dan|Hos|Joel|Am|Obd|Jona|Mi|Nah|Hab|Zef|Hag|Sach|Weish|Mal|Tob|Mt|Mk|Lk|Luk|Joh|Jh|Apg|R&ouml;m|Rom|Kor|Gal|Eph|Phil|Kol|Thess|Tim|Tit|Phlm|Ptr|Petr|Joh|Hbr|Hebr|Jak|Jk|Jud|Offb|Off)(\s*)".
-                          "([0-9]{1,3})(\,\s*)?(aus\s*)?([0-9]{0,3})/", function($m) use (&$lid) { return refill($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $m[9], $lid);}, $text);
-
-      $text=preg_replace_callback("/([0-9][0-9]?\.\s*)?(Makkabäer|Johannes|Mose|Könige|Chronik|Korinther|Samuel|Thessalonicher|Timotheus|Petrus|Gebet Manasses|Stücke zu Daniel|Stücke zu Ester|Baruch|Weisheit|Judit|Judith|Sirach|Josua|Richter|Rut|Ruth|Esra|Nehemia|Esther|Ester|Hiob|Ijob|Psalm|Sprüche|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Ezechiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matthäus|Markus|Lukas|Apostelgeschichte|Römer|Galater|Epheser|Philipper|Kolosser|Titus|Hebräer|Jakobus|Offenbarung|Philemon|Judas)(\s*[0-9]{1,3})(,\s*)?(\s*aus\s*|\s*Verse\s*|\s*Vers\s*)?([0-9]{0,3})?(\s*\-\s*|\s*\.\s*)?([0-9]{0,3})?/", function($m) use (&$lid,&$link) { return makeLink($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $lid, $link);}, $text);
-      
-      $suchmuster = '/(\(|\s)(siehe|siehe auch)?(\s)?(([0-9\.]{1,2}){1,5})(\)|;)/';
-      $text=preg_replace_callback($suchmuster, function($m) { return makeKNK2($m[1],$m[2],$m[3],$m[4],$m[6]);}, $text);
-
-      $text= str_replace (array("'"), array("''"), $text);
-      $text= str_replace (array("\''verse\''"), array("\\\''verse\\\''"), $text);
-      
-      $text= str_replace (array("&\#39;"), array("&amp;\#39;"), $text);
-
-      if($link == 'lokal'){
-        #echo"UPDATE knk_fa SET description2_lokal='$text' WHERE knkfa_id='$row[knkfa_id]'";
-        #$sql1 = $db->query("UPDATE knk_fa SET description2_lokal='$text' WHERE knkfa_id='$row[knkfa_id]'");
-
-      }else{
-        #echo "$row[knkfa_id]<br>";
-        $sql = $db->query ("UPDATE knk_fa SET description2_bibleserver='$text' WHERE knkfa_id='$row[knkfa_id]'");      
-      }
-      
-  }
-
-
-?>
\ No newline at end of file
diff --git a/func_make_reference_fa.php_lut84_20180219 b/func_make_reference_fa.php_lut84_20180219
deleted file mode 100644
index 7a5a5837..00000000
--- a/func_make_reference_fa.php_lut84_20180219
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-#error_reporting(E_ALL);
-require_once("config.inc.php");
-require_once("func_ansicht.php");
-require_once("bibellookup.php");
-#require_once("func_htmlclean.php");
-echo "
-<script type='text/javascript' src='overlib/overlib.js'></script>
-";
-
-#$link = 'bibleserver';
-$link = 'lokal';
-$lid="";
-$db = dbconnect();
-
-$db->query("SET NAMES 'utf8'");
-
-  $query = "SELECT reference, knkfa_id
-              FROM knk_fa
-              where knkfa_id != 745
-             ORDER BY knkfa_id ASC";
-  $result = $db->query($query);
-
-
-  while ($row = $result->fetch_array()){
-    
-      $text = str_replace(' "', ' \"', $row['reference']);
-      $suchmuster = '/([0-9]{1,3})/';
-      $text=preg_replace_callback($suchmuster, function($m) { return makeKNK_FA2($m[1]);}, $text);
-
-      $text= str_replace (array("'"), array("''"), $text);
-      $text= str_replace (array("\''verse\''"), array("\\\''verse\\\''"), $text);
-      
-      $text= str_replace (array("&\#39;"), array("&amp;\#39;"), $text);
-
-      if($link == 'lokal'){
-        if( $row['reference'] != ''){
-        #echo"UPDATE knk_fa SET reference_lokal='$text' WHERE knkfa_id='$row[knkfa_id]<br>'";
-        
-        #Beides auf einmal, da keine Bibellinks vorkommen, außer bei frage 745, dort aber keine internen Verweise auf KNK-FA
-        $sql1 = $db->query("UPDATE knk_fa SET reference_lokal='$text' WHERE knkfa_id='$row[knkfa_id]'");
-        $sql = $db->query ("UPDATE knk_fa SET reference_bibleserver='$text' WHERE knkfa_id='$row[knkfa_id]'");
-        }
-      }else{
-        #echo "$row[knkfa_id]<br>";
-        #$sql = $db->query ("UPDATE knk_fa SET reference_bibleserver='$text' WHERE knkfa_id='$row[knkfa_id]'");
-      }
-      
-  }
-
-
-?>
\ No newline at end of file
diff --git a/func_rollenrechte_20220202.php b/func_rollenrechte_20220202.php
deleted file mode 100644
index fb9132bf..00000000
--- a/func_rollenrechte_20220202.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-require_once("config.inc.php");
-#error_reporting(E_ALL);
-#ini_set('display_errors', 1);
-#echo __LINE__."<br>";
-
-function rore($user_admin_rore, $rore, $art_rore)
-{
-
-$rore =  strtoupper($rore);
-  # Funktion zum überprüfen von Rollen / Rechten
-  # Hat ein Benutzer die angegebene Rolle / das Recht wird true zurückgegeben
-  
-  $db = dbconnect();
-  if($art_rore == 'RE'){
-
-    
-    $result2_rore = $db->query( "SELECT DISTINCT 1
-                                  FROM admin_rolle a, admin b, admin_rechte c, admin_rollen_user_zuord d, admin_rollen_rechte_zuord e
-                                 WHERE a.rid = d.rid
-                                   AND b.VAID = d.VAID
-                                   AND a.rid = e.rid
-                                   AND c.admin_rolle = e.admin_rolle
-                                   AND b.user = '$user_admin_rore'
-                                   AND upper(e.admin_rolle) LIKE '$rore'" );
-    $row2_rore = $result2_rore->fetch_array();
-    if($row2_rore[0] == 1){
-      return true;
-    }else{
-      return false;
-    }
-  }
-
-  if($art_rore == 'RO'){
-
-    $result2_rore = $db->query( "SELECT 1
-                                   FROM admin, admin_rollen_user_zuord, admin_rolle
-                                  WHERE admin.vaid = admin_rollen_user_zuord.vaid
-                                    AND admin_rolle.rid = admin_rollen_user_zuord.rid
-                                    AND upper(admin_rolle.bezeichnung) LIKE '$rore'
-                                    AND admin.user = '$user_admin_rore'" );
-    $row2_rore = $result2_rore->fetch_array();
-
-
-    if($row2_rore[0] == 1){
-      return true;
-    }else{
-      return false;
-    }
-  }
-}
-
-#if(rore('schwaral','Administrator','RO')){ 
-#  echo "berechtigt";
-#}else{
-#  echo "nicht berechtigt";
-#}
-?>
\ No newline at end of file
diff --git a/html2pdf-master/.gitignore b/html2pdf-master/.gitignore
deleted file mode 100644
index 0f84dfe6..00000000
--- a/html2pdf-master/.gitignore
+++ /dev/null
@@ -1,19 +0,0 @@
-# Eclipse
-/.settings/
-/.buildpath
-/.project
-/nbproject
-
-# PHPStorm
-/.idea
-
-# Examples
-/test/*.pdf
-
-# PhpUnit
-/build/
-
-# Composer
-/bin/
-/vendor/
-/composer.lock
\ No newline at end of file
diff --git a/html2pdf-master/.travis.yml b/html2pdf-master/.travis.yml
deleted file mode 100644
index 6177dc01..00000000
--- a/html2pdf-master/.travis.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-language: php
-
-php:
-  - 5.6
-  - 7.0
-  - 7.1
-  - 7.2
-  - 7.3
-  - 7.4
-
-before_script:
-  - composer selfupdate
-  - composer install --dev --prefer-dist
diff --git a/html2pdf-master/CHANGELOG.md b/html2pdf-master/CHANGELOG.md
deleted file mode 100644
index a6d3abaf..00000000
--- a/html2pdf-master/CHANGELOG.md
+++ /dev/null
@@ -1,516 +0,0 @@
-# Change Log
-
-All notable changes to this project will be documented in this file.
-
-## [5.2.3](https://github.com/spipu/html2pdf/compare/v5.2.2...master) - unreleased
-
-  *  fix issue on write2DBarcode parameters - thanks to @Sarigue
-
-## [5.2.2](https://github.com/spipu/html2pdf/compare/v5.2.1...v5.2.2) - 2020-03-22
-
-  * allow usage of [[page_cu]] in css class names - thanks to @marbetschar - see example 15
-  * add support for BASE64 encoded images - thanks to @darius-heavy
-  * add Chinese local file - thanks to @Jaggle
-  * add powershell test script
-  * bump supported version from 5.4-7.2 to 5.6-7.4 - thanks to @coffeemedia
-  * fix issue on \_drawRectangle where array offset was being accessed on value of type null - thanks to @coffeemedia
-  * fix issue on lower-roman style - thanks to @jigneshsolanki
-  * fix issue on composer autoload warning - thanks to @adrienfr
-
-## [5.2.1](https://github.com/spipu/html2pdf/compare/v5.2.0...v5.2.1) - 2018-10-26
-
-  * add `cert` tag - thanks to @LittleBigFox
-  * add `balloon` example - issue #385
-  * change the name of all the examples from `exemple` to `example`
-  * fix tag parser - css style corruption
-  * fix issue on relative margin calculation
-  * fix issue on border radius calculation
-  * fix issue on page background image width - issue #394
-  * fix issue on qrcode value with multi lines - issue #390
-  * fix issue on colspan usage when all the columns don't really exist - issue #360
-  * fix documentation - thanks to @noxlux and @tpohchai
-
-## [5.2.0](https://github.com/spipu/html2pdf/compare/v5.1.0...v5.2.0) - 2018-07-31
-
-  * change the name of `CoreExtension` to `Core\HtmlExtension`
-  * change the namespace of all the html tags from `Tag\` to `Tag\Html`
-  * change all the svg tag from internal methods to new external tags
-  * add the extension `Core\SvgExtension`
-  * add locale fi - thanks to @RWAP
-  * add `$marginTop` parameter on the `createIndex` method - issue #333
-  * add `xx-large` to `xx-small` font-size management - issue #320
-  * add `colgoup` html tag - issue #306
-  * fix locale pt - thanks to @marcoshenzel
-  * fix issue on testing the filename when asking for string output
-  * fix issue - clean locale before PDF generation - thanks to @quimcalpe
-  * fix issue on radio/checkbow width - thanks to @Ohda
-  * fix issue on line number when using style tag - issue #338
-  * fix issue on svg draw path - relative move was not implemented
-  * fix issue on svg draw path when Z directive is not separate from the next directive - issue #308
-  * fix issue on justify text with an inline html tag at the end of a line - issue #258
-  * fix better doc
-
-## [5.1.0](https://github.com/spipu/html2pdf/compare/v5.0.1...v5.1.0) - 2018-01-23
-
-  * add support of css `page-break-before:always` and `page-break-after:always` on `DIV` tag, based on PR #190 and PR #204
-  * add no-html mode for debug output
-  * add php 7.2 compatibility
-  * add some unit tests, better coverage
-  * fix lots of bad method names and minor improvements, from PR #147
-  * fix bad cleaning after output or exception
-  * fix bad format detecting on `page` tag - issue #260
-  * fix changelog file
-  
-## [5.0.1](https://github.com/spipu/html2pdf/compare/v5.0.0...v5.0.1) - 2017-06-15
-
-  * fix issue #200 pb with absolute path when saving the pdf file on server 
-
-## [5.0.0](https://github.com/spipu/html2pdf/compare/v4.6.1...v5.0.0) - 2017-06-15
-
-**BREAK COMPATIBILITY**
-
-This new version is not compatible with the 4.x.x version.
-
-Lots of classes / methods have been renamed, moved, deleted, exploded.
-
-  * change licence to OSL-3.0
-  * change PHP minimum compatibility to 5.4
-  * change Using Namespaces
-  * change all the classes have moved
-  * change all the classes have been renamed
-  * change new tag structure : one class per tag
-  * change output method does not allow bool value on `$dest` parameter anymore
-  * change output method has been renamed from `Output` to `output`
-  * change values for the footer`attribute` of the `page` tag
-  * add PHP 7.0 and 7.1 compatibility
-  * add improve string handling for UTF8
-  * add better exception management
-  * add unit testing
-  * add support 'start' attribute for ordered list
-  * add russian language https://github.com/spipu/html2pdf/pull/131
-  * add Dimension-Parameter on barcode (for PDF417, Datamatrix = 2D) https://github.com/spipu/html2pdf/pull/127
-  * add `pdfa` parameter on Html2Pdf constructor https://github.com/spipu/html2pdf/pull/122
-  * add new documentation folder `./doc/`
-  * add new attribute to page tag `hidefooter` which accepts a list of pages that gonna skip footer https://github.com/spipu/html2pdf/issues/162
-  * add protection on the fallback image if it does not exist
-  * add protection on thead and tfoot tags: they must contain at least one tr tag
-  * add norwegian locale 
-  * fix a infinite loop case when reading a svg path
-  * fix issue from https://github.com/spipu/html2pdf/pull/177
-  * fix issue from https://github.com/spipu/html2pdf/pull/163
-  * fix bug on div position https://github.com/spipu/html2pdf/issues/73
-  * fix margin-bottom on table https://github.com/spipu/html2pdf/issues/108
-  * fix position of fallback image
-  * fix li bullet points altered by uppercase styles
-  * fix save PDF file on server https://github.com/spipu/html2pdf/issues/164
-  * remove old barcode type compatibility
-
-## [4.6.1](https://github.com/spipu/html2pdf/compare/v4.6.0...v4.6.1) - 2016-04-05
-
-  * fix css font-family lowercase check on inherit value
-
-## [4.6.0](https://github.com/spipu/html2pdf/compare/v4.5.1...v4.6.0) - 2016-03-30
-
-  * add Support 'start' attribute for ordered list
-  * add Enable RTL languages support
-  * add fallback support for images
-
-## [4.5.1](https://github.com/spipu/html2pdf/compare/v4.5.0...v4.5.1) - 2016-03-03
-
-  * Support the "inherit" value for font-family
-  * Allow the HTML font tag to define a color attribute
-  * Support for max-width and max-height attributes for images
-  * Fix "border: 0" being displayed
-
-## [4.5.0](https://github.com/spipu/html2pdf/compare/v4.4.0...v4.5.0) - 2015-12-18
-
-  * add tag 'end_last_page' with property 'end_height'. Update example 5 to use it
-  * better composer.json file
-  * update TCPDF from 5.0.002 to v6.2.12 => important changes. See the TCPDF changelogs
-
-## [4.4.0](https://github.com/spipu/html2pdf/compare/v4.03...v4.4.0) - 2015-12-11
-
-  * includes a new attribute to page tag 'hideheader' which accepts a list of pages that gonna skip header.
-  * some doc fixes, rephrasing and removing french words
-  * add composer management
-  * Update autoload type
-  * README more readable
-  * add automatic generation of pdf test files
-
-    * script ./test/generate.sh
-    * You must have the html2pdf folder in http:/localhost/html2pdf/
-
-  * fix: Set default font from PDF_FONT_NAME_MAIN constant from TCPDF, if available
-  * fix: Make space-collapsing regexp Unicode-aware
-  * fix: some pbs on examples to generate them automatically
-
-## 4.03 - 2011-05-27
-
-  * correction de l'exemple "form.php" : vulnérabilité cross-site scripting corrigée
-  * correction sur la gestion des retours à la ligne automatique
-  * correction sur le calcul de la hauteur des balises H1->H6
-  * amélioration de la gestion des exceptions
-
-## 4.02 - 2011-04-29
-
-  * ATTENTION : beaucoup de changements dans la structure du projet. version 3.xx abandonnée
-  * uniformisation des fichiers du projet (standard Zend)
-  * conversion des fichiers de langue en CSV, déplacement dans le répertoire "locale". création d'une classe spécifique à la gestion des locales
-  * amélioration de la gestion de certaines erreurs
-  * modification du nom de toutes les sous classes
-  * déplacement de toutes les sous classes
-  * modification du nom de toutes les méthodes protected
-  * correction sur la gestion des tables
-  * correction sur la lecture des path des SVG
-  * premiere version de text-align:justify
-  * correction sur la gestion de la balise BLOCKQUOTE
-  * correction sur la gestion de la balise P
-  * gestion des styles CSS pour les balises TEXTAREA, SELECT, INPUT
-  * ajout de la propriété pagegroup="new" sur la balise PAGE
-  * correction pour la balise INPUT de type radio : checked au lieu de selected
-
-## 3.30 / 4.01 - 2010-05-07
-
-  * correction sur la gestion des textes
-  * correction sur le parseur HTML
-  * correction sur la gestion de border-collapse
-  * correction sur la gestion des TDs, H1->H6
-  * ajout des balises fieldset et legend (cf exemple 4)
-  * ajout de la langue CS
-  * nombreuses améliorations
-  * v4.01 uniquement : Utilisation de TCPDF 5.0.002
-  * v4.01 uniquement : Utilisation des QR-code de TCPDF, il n'y a plus besoin d'une librairie externe
-  * v4.01 uniquement : Utilisation des exceptions PHP pour les erreurs. Tous les exemples ont été mis à jour en consequence
-  * (merci à Pavel Kochman pour ses sugestions et ses ajouts)
-
-## 4.00 - 2010-03-17
-
-  * modification des barcodes. ATTENTION : bar_w et bar_h n'existent plus !
-  * correction sur la gestion de page_footer
-  * correction sur la gestion des html entities
-  * correction sur le positionnement des textes
-  * correction sur le positionnement des tableaux
-  * nombreuses corrections sur les positionnements, les couleurs, ...
-  * amélioration de la partie SVG (balise G, ...)
-  * amélioration sur createIndex
-  * harmonisation des noms des méthodes
-  * correction sur la gestion des textes
-  * v4.00 uniquement : Html2Pdf est maintenant écrit en PHP5 et basé sur TCPDF (=> unicode, utf8, ...)
-  * v4.00 uniquement : utilisation de TCPDF pour les formulaires et les barcodes
-  * v4.00 uniquement : amélioration de la partie SVG (alpha)
-
-## 3.28 - 2010-01-18
-
-  * ajout de la gestion de la balise label
-  * correction pour compatibilité PHP4
-
-## 3.27 - 2010-01-11
-
-  * correction sur page_header et page_footer
-  * ajout de la possibilité de pouvoir mettre l'index automatique dans la page que l'on veut
-  * correction sur la gestion du canal alpha pour les PNGs
-  * correction sur la gestion des border-radius (cf exemple radius) conforme au CSS3
-  * correction sur la gestion du background-color
-  * correction sur la gestion de thead, tfoot, et tbody
-  * ajout du dessin verctoriel (cf exemples draw, tigre, sapin)
-  * ajout de la propriété label="none/label" pour la balise barcode
-  * nombreux petits correctifs
-
-## 3.26 - 2009-11-16
-
-  * correction pour support des images générés en CGI
-  * ajout de la gestion du canal alpha pour les PNGs (nécessite GD2)
-  * ajout de la méthode setDefaultFont permettant de spécifier une fonte par défaut
-  * ajout de la propriété format pour la balise page (cf exemple 4)
-  * amélioration de la gestion des couleurs css RGB (cf exemple 2)
-  * ajout de la gestion des couleurs css CMYK (cf exemple 2)
-  * ajout de la propriété css overflow:hidden pour la balise div (cf exemple 2)
-  * correction sur page_header et page_footer
-  * ajout de la possibilité de pouvoir directement convertir le résultat d'une vraie page HTML
-  * nombreux petits correctifs sur les styles
-
-## 3.25 - 2009-10-07
-
-  * correctif sur le calcul des tableaux dans le page_footer
-  * correctif sur l'interprétation des espaces entre certaines balises
-  * correction sur la gestion des balises H1, H2, H3, H4, H5, H6
-  * correction sur la gestion de la balise table
-  * support des balises xhtml du type span
-  * ajout des balises COL (cf exemple 5), DEL, INS, et QRCODE (cf exemple 13)
-  * ajout de la propriété css text-transform
-  * ajout de la propriété css rotate (uniquement sur les DIV, cf exemple 8)
-  * ne plus rendre obligatoire l'existence d'une image (nouvelle méthode setTestIsImage)
-  * ajout d'un mode DEBUG - les anciennes fonction d'analyse des ressources ont été supprimées
-  * ajout de la méthode setEncoding
-  * ajout de la langue danoise DA (merci à Daniel K.)
-
-## 3.24 - 2009-08-05
-
-  * correction sur le calcul de la largeur des divs
-  * modification pour compatibilité avec la localisation PHP
-  * modification pour compatibilité avec PHP 5.3.0
-
-## 3.23 - 2009-07-30
-
-  * correction sur le calcul des DIVs
-  * correction sur l'interpretation de certains styles CSS
-  * correction de la fonction de creation d'index automatique CreateIndex
-  * ATTENTION : la methode d'appel de CreateIndex a changé. Regardez l'exemple About !!!!
-
-## 3.22a (2009-06-16
-
-  * redistribution de Html2Pdf sous la licence LGPL !!! (au lieu de GPL)
-
-## 3.22 - 2009-06-08
-
-  * correction sur le background-color
-  * refonte totale de la gestion de text-align. les valeurs center et right marchent maintenant meme en cas de contenu riche
-
-## 3.21 - 2009-05-05
-
-  * ajout de la propriété css FLOAT pour la balise IMG
-  * correction sur la gestion des TFOOT
-  * correction sur le positionnement des images
-
-## 3.20 - 2009-04-06
-
-  * ajout de la gestion des margins pour la balise DIV
-  * ajout de la gestion de la propriete css LINE-HEIGHT
-  * correction sur l'interpretation de la valeur de certains styles CSS (background-image, background-position, ...)
-  * correction sur la reconnaissance des balises thead et tfoot
-  * correction sur la balise select
-  * correction sur les fichiers de langue (merci à Sinan)
-
-## 3.19 - 2009-03-11
-
-  * optimisation du parseur HTML - merci à Jezelinside
-  * ajout de la balise TFOOT
-  * amélioration de la gestion des tableaux : les contenus des balises THEAD et TFOOT sont maintenant répétés sur chaque page.
-  * ajout de la balise spécifique BOOKMARK afin de créer des "marques-page"
-  * possibilité de rajouter un index automatique en fin de fichier
-  * ajout de la langue turque TR (merci à Hidayet)
-  * amélioration de la méthode Output. Elle est maintenant également utilisable comme celle de FPDF
-
-## 3.18 - 2009-02-22
-
-  * correction sur les sauts de page automatique pour les balises TABLE, UL, OL
-  * correction sur l'interpretation des styles pour la balise HR
-  * correction sur l'interpretation du style border-collapse pour la balise TABLE
-  * prise en compte de margin:auto pour les tables et les divs
-  * les commentaires dans les CSS sont acceptés
-
-## 3.17 - 2008-12-30
-
-  * ajout de la gestion des balises INPUT (text, radio, checkbox, button, hidden, ...), SELECT, OPTION, TEXTAREA (cf exemple 14)
-  * ajout de la possibilité de mettre des scripts dans le pdf (cf exemples JS)
-  * correction sur le saut de page automatique pour les images
-  * correction sur les sauts de lignes automatiques pour certaines balises (UL, P, ...)
-  * ajout de la langue NL (merci à Roland)
-
-## 3.16 - 2008-12-09
-
-  * ajout de la gestion de list-style: none (cf exemple 13)
-  * correction dans la gestion des fontes ajoutées à fpdf (via la méthode AddFont)
-  * nombreuses corrections sur le calcul des largeurs des éléments table, div, hr, td, th
-  * ajout de l'exemple about.php
-  * (pour info, les PDF générés à partir des exemples sont maintenant dans le répertoire /exemples/pdf/, et sont supprimables)
-
-## 3.15 - 2008-12-01
-
-  * correction sur l'identification des styles en cas de valeurs multiples dans la propriete class
-  * prise en compte de border-radius pour la limite des backgrounds (color et image)
-  * ajout des proprietes CSS border-top-*, border-right-*, border-bottom-*, border-left-*
-  * ajout de la propriété CSS list-style-image (cf exemple 12)
-  * pour la balise table, ajout de l'interprétation de align="center" et align="right" (cf exemple 1)
-  * correction dans le positionnement des images
-  * correction de quelques bugs
-  * ajout d'une fonction d'analyse des ressources getTimerDebug (cf début du fichier html2pdf.class.php)
-
-## 3.14 - 2008-11-17
-
-  * ajout d'une langue (pt : Brazilian Portuguese language) et amelioration de la methode vueHTML (merci à Rodrigo)
-  * correction du positionnement du contenu des DIVs. gestion des proprietes valign et align
-  * ajout de la propriete CSS border-collapse (cf exemple 0)
-  * ajout de la propriete CSS border-radius (cf exemple 1)
-  * correction de quelques bugs
-
-## 3.13 - 2008-09-24
-
-  * reecriture de la balise hr, avec prise en compte des styles (cf exemple 0)
-  * ajout de la propriete backcolor pour la balise page (cf exemple 9)
-  * ajout des proprietes backleft et backright pour la balise page afin de pouvoir changer les marges des pages (cf exemple 8)
-  * nombreuses corrections sur les balises et les styles
-
-## 3.12 - 2008-09-16
-
-  * ajout des balises ol, ul, li (cf exemple 12)
-  * correction sur le calcul de la taille des td en cas de colspan et rowspan
-  * ajout de la méthode setTestTdInOnePage afin de pouvoir desactiver le test sur la taille des TD (cf exemple 11)
-  * correction de quelques bugs
-
-## 3.11 - 2008-08-29
-
-  * ajout des balises div, p, pre, s
-  * gestion des styles CSS position (relative, absolute), left, top, right, bottom (cf exemple 10)
-  * meilleur gestion des border : border-style, border-color, border-width (cf exemple 10)
-  * possibilité d'indiquer les marges par défault, via le constructeur (cf exemple 2)
-
-## 3.10a - 2008-08-26
-
-  * correction pour compatibilité php4 / php5
-
-## 3.10 - 2008-08-25
-
-  * ajout des liens internes (cf exemple 7)
-  * gestion complete des background : image, repeat, position, color (cf exemple 1)
-  * gestion de underline, overline, linethrough (cf exemple 2)
-  * correction de quelques bugs
-
-## 3.09
-
-  * mise à jour vers fpdf version 1.6, ajout de barcode, correction de l'affichage de certains caractères spéciaux
-  * correction du calcul de la hauteur de ligne de la balise br
-  * detection en cas de contenu trop grand dans un TD
-  * amélioration de la balise page (ajout de l'attribue pageset, avec les valeurs new et old)
-  * ajout de FPDF_PROTECTION, accesible via $pdf->pdf->SetProtection(...)
-
-## 3.08
-
-  * version opérationnelle de page_header
-  * ajout de page_footer
-  * correction des borders des tableaux
-
-## 3.07
-
-  * correction de l'interpretation de cellspacing,
-  * amélioration de la balise page_header
-
-## 3.06
-
-  * première gestion de la balise page_header
-  * correction des dimensions des tableaux
-
-## 3.05
-
-  * ajout de la propriété vertical-align
-  * ajout de la gestion des fichiers de langue
-
-## 3.04
-
-  * correction du saut de page automatique pour les tableaux
-  * Ajout de propriétés à la balise PAGE
-
-## 3.03
-
-  * correction de bugs au niveau de la gestion des images PHP par FPDF
-  * meilleure gestion des erreurs
-
-## 3.02
-
-  * ajout de la gestion des noms des couleurs
-  * correction de la gestion des images générées par php
-  * correction de quelques bugs
-
-## 3.01
-
-  * correction de quelques bugs
-  * ajout d'une protection pour les balises non existantes
-
-## 3.00
-
-  * refonte totale du calcul des tableaux
-  * Prise en compte des colspan et rowspan
-  * 
-## 2.85
-
-  * ajout de la propriété cellspacing
-  * nouvelle gestion des padding des tableaux
-
-## 2.80
-
-  * ajout des types de border dotted et dasheds
-
-## 2.75
-
-  * ajout des top, left, right, bottom pour padding et border
-
-## 2.70
-
-  * correction de la balise HR, ajout de la propriété padding pour les table, th, td
-  * correction des dimensions, les unités px, mm, in, pt sont enfin réellement reproduites, correction de font-size, border, ...
-  * ajout d'une propriété à la balise page : footer
-  * correction dans l'affichage et le calcul des tables
-
-## 2.55
-
-  * vérification de la validité du code (ouverture / fermeture)
-  * ajout des unités mm, in, pt
-
-## 2.50
-
-  * correction de nobreak
-  * correction des marges
-  * ajout de nombreuses balises
-
-## 2.40
-
-  * refonte totale de l'identification des styles CSS (Les héritages marchent)
-
-## 2.39
-
-  * corrections diverses
-  * ajout de certaines propriétés (bgcolor, ...)
-
-## 2.38
-
-  * meilleur identification des propriétés border et color
-
-## 2.37
-
-  * nombreuses corrections :
-  
-    * balise A
-    * couleur de fond
-    * retour à la ligne
-    * gestion des images dans un texte
-
-## 2.36
-
-  * ajout de la balises STRONG
-  * ajout de la balise EM
-
-## 2.35
-
-  * amélioration de la gestion des feuilles de style
-
-## 2.31
-
-  * correction de quelques bugs
-
-## 2.30
-
-  * première version opérationnel des feuilles de style
-
-## 2.25
-
-  * ajout de la balise LINK pour le type text/css
-
-## 2.20
-
-  * premier jet de la gestion des feuilles de style, ajout de la balise STYLE
-
-## 2.15
-
-  * n'interpréte plus l'HTML en commentaire
-
-## 2.10
-
-  * ajout des balises H1 -> H6
-
-## 2.01
-
-  * correction de quelques bugs
-
-## 2.00
-
-  * première version diffusée
diff --git a/html2pdf-master/LICENSE.md b/html2pdf-master/LICENSE.md
deleted file mode 100644
index 9934ef28..00000000
--- a/html2pdf-master/LICENSE.md
+++ /dev/null
@@ -1,54 +0,0 @@
-Open Software License v. 3.0 (OSL-3.0)
-======================================
-
-This Open Software License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:
-
-Licensed under the Open Software License version 3.0
-
-1. **Grant of Copyright License.** Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:
-
- 1. to reproduce the Original Work in copies, either alone or as part of a collective work;
-
- 2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work;
-
- 3. to distribute or communicate copies of the Original Work and Derivative Works to the public, with the proviso that copies of Original Work or Derivative Works that You distribute or communicate shall be licensed under this Open Software License;
-
- 4. to perform the Original Work publicly; and
-
- 5. to display the Original Work publicly.
-
-2. **Grant** of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.
-
-3. **Grant** of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work.
-
-4. **Exclusions From License Grant.** Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license.
-
-5. **External Deployment.** The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c).
-
-6. **Attribution Rights.** You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.
-
-7. **Warranty of Provenance and Disclaimer of Warranty.** Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer.
-
-8. **Limitation of Liability.** Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation.
-
-9. **Acceptance and Termination.** If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including "fair use" or "fair dealing"). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c).
-
-10. **Termination for Patent Action.** This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.
-
-11. **Jurisdiction, Venue and Governing Law.** Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License.
-
-12. **Attorneys' Fees.** In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.
-
-13. **Miscellaneous.** If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.
-
-14. **Definition of "You" in This License.** "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
-
-15. **Right to Use.** You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.
-
-16. **Modification of This License.** This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions:
-
- 1. You may not indicate in any way that your Modified License is the "Open Software License" or "OSL" and you may not use those names in the name of your Modified License;
-  
- 2. You must replace the notice specified in the first paragraph above with the notice "Licensed under <insert your license name here>" or with a notice of your own that is not confusingly similar to the notice in this License;
- 
- 3. You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.
\ No newline at end of file
diff --git a/html2pdf-master/README.md b/html2pdf-master/README.md
deleted file mode 100644
index 3a480343..00000000
--- a/html2pdf-master/README.md
+++ /dev/null
@@ -1,48 +0,0 @@
-# Html2Pdf
-
-Html2Pdf is a HTML to PDF converter written in PHP, and compatible with PHP **5.6** to **7.4**.
-
-It allows the conversion of valid HTML in PDF format, to generate documents like invoices, documentation, ...
-
-You have to write a code of HTML for Html2Pdf, and not try to convert directly an already existing html page.
-
-Specific tags have been implemented, to adapt the html standard to a PDF usage.
-
-You must use Composer to install this library.
-
-It uses TCPDF for the PDF part.
-
-## Requirements
-
-Html2Pdf works with PHP >5.6 and Composer.
-
-You will also need at least the following php extensions:
-
-* gd
-* mbstring
-
-## Documentation
-
-You will find the install documentation [here](./doc/install.md).
-
-You will find all the documentation [here](./doc/README.md).
-
-You will find lots of examples [here](./examples/).
-
-## Donate
-
-You can support this project by making a [donation](http://html2pdf.fr/en/donate).
-
-## Change log
-
-See the [./CHANGELOG.md](./CHANGELOG.md) file.
-
-## Help & Support
-
-For questions and bug reports, please use the GitHub issues page.
-
-## License
-
-This program is distributed under the OSL License. For more information see the [./LICENSE.md](./LICENSE.md) file.
-
-Copyright 2008-2018 by Laurent Minguet
diff --git a/html2pdf-master/composer.json b/html2pdf-master/composer.json
deleted file mode 100644
index 6a77476d..00000000
--- a/html2pdf-master/composer.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    "name": "spipu/html2pdf",
-    "type": "library",
-    "description": "Html2Pdf is a HTML to PDF converter written in PHP5 (it uses TCPDF). OFFICIAL PACKAGE",
-    "keywords": ["html", "pdf", "html2pdf"],
-    "homepage": "http://html2pdf.fr/",
-    "license": "OSL-3.0",
-    "authors": [
-        {
-            "name": "Spipu",
-            "homepage": "https://github.com/spipu",
-            "role": "Developer"
-        }
-    ],
-    "require": {
-        "php": "^5.6 || ^7.0",
-        "ext-mbstring": "*",
-        "ext-gd": "*",
-        "tecnickcom/tcpdf": "^6.2"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "^5.0",
-        "phake/phake": "^2.0"
-    },
-    "suggest": {
-        "fagundes/zff-html2pdf": "if you need to integrate Html2Pdf with Zend Framework 2 (zf2)",
-        "ext-gd": "Allows to embed images into the PDF"
-    },
-    "autoload": {
-        "psr-4": {
-            "Spipu\\Html2Pdf\\": "src/"
-        }
-    }
-}
diff --git a/html2pdf-master/doc/README.md b/html2pdf-master/doc/README.md
deleted file mode 100644
index 7a7fc0ee..00000000
--- a/html2pdf-master/doc/README.md
+++ /dev/null
@@ -1,68 +0,0 @@
-# Html2Pdf Documentation
-
-
-## Documentation
-
-  * [How to Install Html2Pdf](./install.md)
-  * [Basic Usage](./basic.md)
-  * [Page and Margin](./page.md)
-  * [Output](./output.md)
-  * [Barcode](./barcode.md)
-  * [Bookmark](./bookmark.md)
-  * [Font](./font.md)
-  * [SVG](./svg.md)
-  * [Electronic Signature](./cert.md)
-  * [Extensions](./extension.md)
-  * [Exceptions](./exception.md)
-  * [Useful Methods](./methods.md)
-  * [Tcpdf Methods](./tcpdf_methods.md)
-
-## Recommandations
-   
-  * It is very important to provide valid HTML 4.01 to the converter, but only what is in the `<body>`.
-  * Use the `<page>` tag. Does not use the `<html>` or `<body>` tag.
-  * for borders: it is advised that they are like `solid 1mm #000000`
-  * for padding, they are applicable only on tags `table`, `th`, `td`, `div`, `li`
-  * A default font can be specified, if the requested font does not exist or if no font is specified: `$html2pdf->setDefaultFont('Arial');`
-  * The possibility to protect your PDF is present, CF Example 7.
-  * Some tests can be enabled (true) or disabled (false):
-  
-     * `setTestIsImage` method:      test that images must exist
-     * `setTestTdInOnePage` method:  test that the contents of TDs fit on one page
-
-  * A DEBUG mode to know the resources used is present. It is activated by adding the following command just after the contructor (see Example 0): `$html2pdf->setModeDebug();`
-  * Some specific tags have been introduced:
-  
-     * `<page></page>`  (CF Exemple 7)
-    
-        * Determines the orientation, margins left, right, top and bottom, the background image and the background color of a page, its size and position, the footer.
-        * It is also possible to keep the header and footer of the previous pages, through the attribut `pageset="old"` (see Example 3 & 4)
-
-     * `<page_header></page_header>` (CF Example 3)
-     * `<page_footer></page_footer>` (CF Example 3)
-     * `<nobreak></nobreak>`
-    
-        * Used to force the display of a section on the same page.
-        * If this section does not fit into the rest of the page, a page break is done before.
-
-     * `<barcode></barcode>`  (CF Examples 0 & 9)
-    
-        * Can insert barcodes in pdfs, CF Examples 0 and 9.
-        * the possible types of codebar are alls of TCPDF.
-
-     * `<qrcode></qrcode>` (CF Example 13)
-    
-        * can insert QRcode 2D barcodes
-        * (QR Code is registered trademark of DENSO WAVE INCORPORATED)
-
-     * `<bookmark></bookmark>` (CF Examples 7 & About)
-    
-        * Can insert bookmark in pdfs, CF Example 7 and About.
-        * It is also possible to automatically create an index at the end of document (CF Example About)
-
-     * `<end_last_page end_height="30mm"></end_last_page>` (CF Example 5)
-
-     * css property `rotate`:
-    
-        * Values : 0, 90, 180, 270
-        * Works only on div (cf example 8)
diff --git a/html2pdf-master/doc/barcode.md b/html2pdf-master/doc/barcode.md
deleted file mode 100644
index 94c5b907..00000000
--- a/html2pdf-master/doc/barcode.md
+++ /dev/null
@@ -1,89 +0,0 @@
-# BarCode
-
-[back](./README.md)
-
-## tag barcode
-
-You can add barcode, by directly inserting the `<barcode>` tag in the HTML to convert :
-
-```html
-<barcode dimension="1D" type="EAN13" value="45" label="label" style="width:30mm; height:6mm; color: #770000; font-size: 4mm"></barcode>
-```
-
-### attributes
-
-Attribute| Default | Description
----------|---------|-------------
-dimension | 1D | create a 1D or 2D barcode
-type| C39 | type of barcode to use
-value| 0 | value to convert into barcode
-label| label | indicates that the label must be present below the bar code (label) or not (none) (not required)
-style| | sets the color for the bar, its width and height (without the label) and the size of the label if it is displayed (not required)
-
-### 1D types
-
-For 1D bar-codes, the possible values for `type` attribute are:
-
-Type| Description
-----|------------
-C39| CODE 39 - ANSI MH10.8M-1983 - USD-3 - 3 of 9.
-C39+| CODE 39 with checksum
-C39E| CODE 39 EXTENDED
-C39E+| CODE 39 EXTENDED + CHECKSUM
-C93| CODE 93 - USS-93
-S25| Standard 2 of 5
-S25+| Standard 2 of 5 + CHECKSUM
-I25| Interleaved 2 of 5
-I25+| Interleaved 2 of 5 + CHECKSUM
-C128| CODE 128
-C128A| CODE 128 A
-C128B| CODE 128 B
-C128C| CODE 128 C
-EAN2| 2-Digits UPC-Based Extension
-EAN5| 5-Digits UPC-Based Extension
-EAN8| EAN 8
-EAN13| EAN 13
-UPCA| UPC-A
-UPCE| UPC-E
-MSI| MSI (Variation of Plessey code)
-MSI+| MSI + CHECKSUM (modulo 11)
-POSTNET| POSTNET
-PLANET| PLANET
-RMS4CC| RMS4CC (Royal Mail 4-state Customer Code) - CBC (Customer Bar Code)
-KIX| KIX (Klant index - Customer index)
-IMB| IMB - Intelligent Mail Barcode - Onecode - USPS-B-3200
-IMBPRE| IMB - Intelligent Mail Barcode - Onecode - USPS-B-3200- pre-processed
-CODABAR| CODABAR
-CODE11| CODE 11
-PHARMA| PHARMACODE
-PHARMA2T| PHARMACODE TWO-TRACKS
-
-### 2D types
-
-For 2D barcodes, the possible values for `type` attribute are:
-
-Type| Description
-----|------------
-DATAMATRIX| DATAMATRIX (ISO/IEC 16022)
-PDF417| PDF417 (ISO/IEC 15438:2006)
-QRCODE| QR-CODE
-RAW| RAW MODE
-RAW2| RAW MODE
-
-## tag qrcode
-
-You can directly add bar-codes to two-dimensional QR-Code, by inserting the tag QRcode directly in the HTML to convert:
-
-```html
-<qrcode value="Value to Coder" ec="H" style="width: 50mm; background-color: white; color: black;"></qrcode>
-```
-
-### attributes
-
-Attribute| Default | Description
----------|---------|-------------
-value| | value to convert into barcode
-ec| H | level of error correction (L, M, Q, H)
-style| | sets the width, color, background-color, and border of the qrcode
-
-[back](./README.md)
\ No newline at end of file
diff --git a/html2pdf-master/doc/basic.md b/html2pdf-master/doc/basic.md
deleted file mode 100644
index ad8b8711..00000000
--- a/html2pdf-master/doc/basic.md
+++ /dev/null
@@ -1,75 +0,0 @@
-# Basic Usage
-
-[back](./README.md)
-
-## PHP Constructor
-
-The main class of this library is `\Spipu\Html2Pdf\Html2Pdf`.
-
-The PHP constructor takes the following parameters:
-
-Variable | Default value |Description
----------|---------------|--------------
-$orientation | P | The default page orientation, can be P (portrait) or L (landscape)
-$format | A4 | The default page format used for pages. The list of the available value are [here](https://github.com/tecnickcom/TCPDF/blob/485956db63b5a225760e80fa2278bdb22eca4650/include/tcpdf_static.php#L2129). You can also give a array with 2 values the width and the height in mm.
-$lang | fr | Language to use, for some minor translations. The list of the available languages are [here](https://github.com/spipu/html2pdf/tree/master/src/locale)
-$unicode | true | means that the input HTML string is unicode
-$encoding |UTF-8 | charset encoding of the input HTML string
-$margins | array(5, 5, 5, 8) | Main margins of the page (left, top, right, bottom) in mm
-$pdfa | false | If TRUE set the document to PDF/A mode
-
-In most of the case, you will just use the 3 first parameters :
-
-```php
-$html2pdf = new \Spipu\Html2Pdf\Html2Pdf('P', 'A4', 'en');
-```
-
-## Convert the HTML
-
-The main method to use is `writeHTML`. 
-
-It takes one parameter : the HTML in string format that you want to convert into PDF.
-
-```php
-$html2pdf->writeHTML('<h1>HelloWorld</h1>This is my first test');
-```
-
-You can call it more than one time, if you want to split the conversion in order to use less memory. It will continue on the same page, directly at the end of the last converted part.
-
-```php
-$html2pdf->writeHTML('<h1>HelloWorld</h1>This is my first text');
-$html2pdf->writeHTML('<h1>HelloWorld</h1>This is my second text');
-```
-
-If you want to separate on a new page, you can use the specific HTML tag `page`.
-
-```php
-$html2pdf->writeHTML('<page><h1>HelloWorld</h1>This is my first page</page>');
-$html2pdf->writeHTML('<page><h1>HelloWorld</h1>This is my second page</page>');
-```
-
-You can find more information about this specific tag on the [page](page.md) documentation.
-
-## Get the PDF
-
-The main method to use is `output`.
- 
-It takes two not required parameters. You can find more information on the [output](output.md) documentation.
-
-If you do not give any parameters, it will send the PDF file to the browser, to display it.
-
-```php
-$html2pdf->output();
-```
-
-## Full Example
-
-Here is the full code for a helloworld example:
-
-```php
-$html2pdf = new \Spipu\Html2Pdf\Html2Pdf('P', 'A4', 'en');
-$html2pdf->writeHTML('<h1>HelloWorld</h1>This is my first page');
-$html2pdf->output();
-```
-
-[back](./README.md)
diff --git a/html2pdf-master/doc/bookmark.md b/html2pdf-master/doc/bookmark.md
deleted file mode 100644
index e55b5dde..00000000
--- a/html2pdf-master/doc/bookmark.md
+++ /dev/null
@@ -1,228 +0,0 @@
-# Bookmark
-
-[back](./README.md)
-
-## tag bookmark
-
-You can add automatic bookmark,  by directly inserting the `<bookmark>` tag in the HTML to convert :
-
-```html
-<bookmark title="My Title" level="0" ></bookmark>
-```
-
-### attributes
-
-Attribute| Default | Description
----------|---------|-------------
-title | | Title of the bookmark
-level | 0 | Level of the bookmark, must be a positive integer. Level 0 is the main level
-
-## Page Index
-
-You can insert an index (summary) of all bookmarks automatically, using the following function : 
-
-```php
-$html2pdf->createIndex($titre, $sizeTitle, $sizeBookmark, $bookmarkTitle, $displayPage, $onPage, $fontName, $marginTop);
-```
-
-### parameters
-
-Parameter| Default | Description
----------|---------|-------------
-$title | Index | index title
-$sizeTitle | 20 | font size of the index title, in mm
-$sizeBookmark | 15 | font size of the index, in mm
-$bookmarkTitle | true | add a bookmark for the index, at his beginning
-$displayPage | true | display the page numbers
-$onPage | null | if null : at the end of the document on a new page, else on the $onPage page
-$fontName | null | font name to use. If null, use helvetica
-$marginTop | null | margin top to use on the index page
-
-**IMPORTANT**:
-If you want the summary index on a specific page (using $onPage) you must have anticipated this page during the creation of HTML (see example below).
-Furthermore, if the summary index takes more than one page, you must have provided the necessary number of pages...
-
-## Example with automatic index on last page
-
-```html
-<style type="text/css">
-<!--
-    table.page_header {width: 100%; border: none; background-color: #DDDDFF; border-bottom: solid 1mm #AAAADD; padding: 2mm }
-    table.page_footer {width: 100%; border: none; background-color: #DDDDFF; border-top: solid 1mm #AAAADD; padding: 2mm}
-    h1 {color: #000033}
-    h2 {color: #000055}
-    h3 {color: #000077}
-    
-    div.standard
-    {
-        padding-left: 5mm;
-    }
--->
-</style>
-<page backtop="14mm" backbottom="14mm" backleft="10mm" backright="10mm" style="font-size: 12pt">
-    <page_header>
-        <table class="page_header">
-            <tr>
-                <td style="width: 100%; text-align: left">
-                    Example of using bookmarks
-                </td>
-            </tr>
-        </table>
-    </page_header>
-    <page_footer>
-        <table class="page_footer">
-            <tr>
-                <td style="width: 100%; text-align: right">
-                    page [[page_cu]]/[[page_nb]]
-                </td>
-            </tr>
-        </table>
-    </page_footer>
-    <bookmark title="Chapter 1" level="0" ></bookmark><h1>Chapter 1</h1>
-    <div class="standard">
-        Contents of Chapter 1
-    </div>
-</page>
-<page pageset="old">
-    <bookmark title="Chapter 2" level="0" ></bookmark><h1>Chapter 2</h1>
-    <div class="standard">
-        Intro to Chapter 2
-        <bookmark title="Chapter 2.1" level="1" ></bookmark><h2>Chapter 2.1</h2>
-        <div class="standard">
-            Contents of Chapter 2.1
-        </div>
-        <bookmark title="Chapter 2.2" level="1" ></bookmark><h2>Chapter 2.2</h2>
-        <div class="standard">
-            Contents of Chapter 2.2
-        </div>
-        <bookmark title="Chapter 2.3" level="1" ></bookmark><h2>Chapter 2.3</h2>
-        <div class="standard">
-            Contents of Chapter 2.3
-        </div>
-    </div>
-</page>
-<page pageset="old">
-    <bookmark title="Chapter 3" level="0" ></bookmark><h1>Chapter 3</h1>
-    <div class="standard">
-        Intro to Chapter 3
-        <bookmark title="Chapter 3.1" level="1" ></bookmark><h2>Chapter 3.1</h2>
-        <div class="standard">
-            Contents of Chapter 3.1
-        </div>
-        <bookmark title="Chapter 3.2" level="1" ></bookmark><h2>Chapter 3.2</h2>
-        <div class="standard">
-            Intro to Chapter 3.2
-            <bookmark title="Chapter 3.2.1" level="2" ></bookmark><h3>Chapter 3.2.1</h3>
-            <div class="standard">
-                Contents of Chapter 3.2.1
-            </div>
-            <bookmark title="Chapter 3.2.2" level="2" ></bookmark><h3>Chapter 3.2.2</h3>
-            <div class="standard">
-                Contents of Chapter 3.2.2
-            </div>
-        </div>
-    </div>
-</page>
-```
-
-```php
-$html2pdf = new Spipu\Html2Pdf\Html2Pdf('P','A4','en');
-$html2pdf->writeHTML($html);
-$html2pdf->createIndex('Summary', 25, 12, true, true);
-$html2pdf->output();
-```
-
-## Example with automatic index on specific page
-
-```html
-<style type="text/css">
-<!--
-    table.page_header {width: 100%; border: none; background-color: #DDDDFF; border-bottom: solid 1mm #AAAADD; padding: 2mm }
-    table.page_footer {width: 100%; border: none; background-color: #DDDDFF; border-top: solid 1mm #AAAADD; padding: 2mm}
-    h1 {color: #000033}
-    h2 {color: #000055}
-    h3 {color: #000077}
-    
-    div.standard
-    {
-        padding-left: 5mm;
-    }
--->
-</style>
-<page backtop="14mm" backbottom="14mm" backleft="10mm" backright="10mm" style="font-size: 12pt">
-    <page_header>
-        <table class="page_header">
-            <tr>
-                <td style="width: 100%; text-align: left">
-                    Example of using bookmarks
-                </td>
-            </tr>
-        </table>
-    </page_header>
-    <page_footer>
-        <table class="page_footer">
-            <tr>
-                <td style="width: 100%; text-align: right">
-                    page [[page_cu]]/[[page_nb]]
-                </td>
-            </tr>
-        </table>
-    </page_footer>
-    <bookmark title="Summary" level="0" ></bookmark>
-</page>
-<page pageset="old">
-    <bookmark title="Chapter 1" level="0" ></bookmark><h1>Chapter 1</h1>
-    <div class="standard">
-        Contents of Chapter 1
-    </div>
-</page>
-<page pageset="old">
-    <bookmark title="Chapter 2" level="0" ></bookmark><h1>Chapter 2</h1>
-    <div class="standard">
-        Intro to Chapter 2
-        <bookmark title="Chapter 2.1" level="1" ></bookmark><h2>Chapter 2.1</h2>
-        <div class="standard">
-            Contents of Chapter 2.1
-        </div>
-        <bookmark title="Chapter 2.2" level="1" ></bookmark><h2>Chapter 2.2</h2>
-        <div class="standard">
-            Contents of Chapter 2.2
-        </div>
-        <bookmark title="Chapter 2.3" level="1" ></bookmark><h2>Chapter 2.3</h2>
-        <div class="standard">
-            Contents of Chapter 2.3
-        </div>
-    </div>
-</page>
-<page pageset="old">
-    <bookmark title="Chapter 3" level="0" ></bookmark><h1>Chapter 3</h1>
-    <div class="standard">
-        Intro to Chapter 3
-        <bookmark title="Chapter 3.1" level="1" ></bookmark><h2>Chapter 3.1</h2>
-        <div class="standard">
-            Contents of Chapter 3.1
-        </div>
-        <bookmark title="Chapter 3.2" level="1" ></bookmark><h2>Chapter 3.2</h2>
-        <div class="standard">
-            Intro to Chapter 3.2
-            <bookmark title="Chapter 3.2.1" level="2" ></bookmark><h3>Chapter 3.2.1</h3>
-            <div class="standard">
-                Contents of Chapter 3.2.1
-            </div>
-            <bookmark title="Chapter 3.2.2" level="2" ></bookmark><h3>Chapter 3.2.2</h3>
-            <div class="standard">
-                Contents of Chapter 3.2.2
-            </div>
-        </div>
-    </div>
-</page>
-```
-
-```php
-$html2pdf = new Spipu\Html2Pdf\Html2Pdf('P','A4','en');
-$html2pdf->writeHTML($html);
-$html2pdf->createIndex('Summary', 25, 12, false, true, 1);
-$html2pdf->output();
-```
-
-[back](./README.md)
diff --git a/html2pdf-master/doc/cert.md b/html2pdf-master/doc/cert.md
deleted file mode 100644
index f1bbeb02..00000000
--- a/html2pdf-master/doc/cert.md
+++ /dev/null
@@ -1,32 +0,0 @@
-# Electronic Signature 
-
-[back](./README.md)
-
-You can add an electronic signature to the PDF, by using the following specific html TAG:
-
-```
-<cert
-    src="/path/to/cert.pem"
-    privkey="/path/to/priv.pem"
-    name="sender_name"
-    location="sender_location"
-    reason="sender_reason"
-    contactinfo="sender_contact"
->                            
-/** html **/
-</cert>
-```
-
-Attribute   |  Description                      |  Example 1          | Example 2
-------------|-----------------------------------|---------------------|-------------------
-src         | Path to the Cert                  | /www/certs/my.pem   | /www/certs/my.crt
-privkey     | Private key of the Cert if needed | /www/certs/priv.pem | nothing
-name        | Name of the Cert                  | My.org Cert         |
-location    | Country of the Cert               | France              |
-reason      | Purpose of the Cert               | Invoice validation  |
-contactinfo | EMail of organisation's contact   | contact@my.org      |
-
-/** HTML **/ 
-part could be any HTML formatted string, img, etc...
-
-[back](./README.md)
diff --git a/html2pdf-master/doc/exception.md b/html2pdf-master/doc/exception.md
deleted file mode 100644
index 9ed9e3b1..00000000
--- a/html2pdf-master/doc/exception.md
+++ /dev/null
@@ -1,48 +0,0 @@
-# Exception
-
-[back](./README.md)
-
-## Exceptions
-
-All the specific Html2Pdf exceptions are under the namespace `\Spipu\Html2Pdf\Exception`;
-
-Exception|Error Code|Additional Info|Description
----------|----------|---------------|-----------
-Html2PdfException | 0 | | Occurs for every generic error during the process
-HtmlParsingException | 1 | <ul><li>getInvalidTag</li><li>getHtmlLine</li></ul> | Occurs if the html is no valid
-ImageException | 2 | <ul><li>getImage</li></ul> | Occurs if the asked image does not exist
-LongSentenceException | 3 | <ul><li>getSentence</li><li>getWidthBox</li><li>getLength</li></ul> | Occurs is a sentence is too long and does not fit in the current box
-TableException | 4 | | Occurs if the content of a TD does not fit on only one page
-
-## Exception Format
-
-An exception formatter can be used to display the exceptions: `\Spipu\Html2Pdf\Exception\ExceptionFormatter`.
-
-It takes the current exception as a parameter of the constructor.
-
-It provides 2 methods
-
-  * getMessage()
-  * getHtmlMessage();
-
-Usage example:
-
-```php
-try {
-    use Spipu\Html2Pdf\Html2Pdf;
-    use Spipu\Html2Pdf\Exception\Html2PdfException;
-    use Spipu\Html2Pdf\Exception\ExceptionFormatter;
-
-    $html2pdf = new Html2Pdf('P', 'A4', 'fr');
-    $html2pdf->setDefaultFont('Arial');
-    $html2pdf->writeHTML($htmlContent);
-    $html2pdf->output();
-} catch (Html2PdfException $e) {
-    $html2pdf->clean();
-
-    $formatter = new ExceptionFormatter($e);
-    echo $formatter->getHtmlMessage();
-}
-```
-
-[back](./README.md)
diff --git a/html2pdf-master/doc/extension.md b/html2pdf-master/doc/extension.md
deleted file mode 100644
index d0dfac42..00000000
--- a/html2pdf-master/doc/extension.md
+++ /dev/null
@@ -1,141 +0,0 @@
-# Extensions and Tags
-
-[back](./README.md)
-
-## Html Tags
-
-All the existing tags are under the namespace `\Spipu\Html2Pdf\Tag`.
-
-A tag must implement the interface `\Spipu\Html2Pdf\Tag\TagInterface`.
-
-A tag can extends the abstract class `\Spipu\Html2Pdf\Tag\AbstractTag` to implement some generic methods.
-
-Here is a tag example that will do nothing:
-
-```php
-<?php
-namespace Example\Html2Pdf\Tag;
-
-use \Spipu\Html2Pdf\Tag\AbstractTag;
-
-/**
- * Tag Example
- */
-class Example extends AbstractTag
-{
-    /**
-     * get the name of the tag
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'example';
-    }
-
-    /**
-     * Open the HTML tag
-     *
-     * @param array $properties properties of the HTML tag
-     *
-     * @return boolean
-     */
-    public function open($properties)
-    {
-        // there is nothing to do here
-
-        return true;
-    }
-
-    /**
-     * Close the HTML tag
-     *
-     * @param array $properties properties of the HTML tag
-     *
-     * @return boolean
-     */
-    public function close($properties)
-    {
-        // there is nothing to do here
-
-        return true;
-    }
-}
-```
-
-Then, you will be able to use the `<example>` html tag.
-
-Look at all the existing tags in the `/src/Tag` folder to see examples.
-
-## Extensions
-
-In order to add your new tags to Html2Pdf, you must a extension.
-
-An extension must implement the interface `\Spipu\Html2Pdf\Extension\ExtensionInterface`.
-
-You must implement the `getTags` method that will return a list of tag objects.
-
-```php
-<?php
-/**
- * Extension Example
- */
-namespace Example\Html2Pdf\Extension;
-
-use \Spipu\Html2Pdf\Extension\ExtensionInterface;
-
-/**
- * Class MyExtension
- */
-class MyExtension implements ExtensionInterface
-{
-    /**
-     * @var array
-     */
-    private $tagDefinitions = array();
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getName()
-    {
-        return 'example_extension';
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getTags()
-    {
-        if (empty($this->tagDefinitions)) {
-            $this->tagDefinitions = array(
-                new \Example\Html2Pdf\Tag\Example(),
-                new \Example\Html2Pdf\Tag\Other(),
-            );
-        }
-
-        return $this->tagDefinitions;
-    }
-}
-```
-
-Then, you can add your extension to Html2Pdf with the following method:
-
-```php
-$html2pdf->addExtension(new \Example\Html2Pdf\Extension\MyExtension());
-```
-
-The following core extensions are automatically added to Html2pdf:
-
-  * `\Spipu\Html2Pdf\Extension\Core\HtmlExtension`
-  * `\Spipu\Html2Pdf\Extension\Core\SvgExtension`
-
-It contains all the native tags.
-
-## Overriding
-
-If an extension has the same name that an already added extension, it will replace the first one.
-
-If tag has the same name that an already added tag throw an extension, it will replace the first one.
-
-[back](./README.md)
diff --git a/html2pdf-master/doc/font.md b/html2pdf-master/doc/font.md
deleted file mode 100644
index 64f2b002..00000000
--- a/html2pdf-master/doc/font.md
+++ /dev/null
@@ -1,44 +0,0 @@
-# Font
-
-[back](./README.md)
-
-## Creating new Font
-
-To create new font, you should use this tutorial from TCPDF: 
-
-https://tcpdf.org/docs/fonts/
-
-## Adding new font
-
-To use this new font, you must add it to Html2Pdf, by using the following method:
-
-```php
-$html2pdf->addFont($family, $style, $file);
-```
-
-The parameters are:
-
-Parameter| Default | Description
----------|---------|-------------
-$family | | Font family. The name can be chosen arbitrarily. If it is a standard family name, it will override the corresponding font.
-$style  | | Font style. Possible values are (case insensitive):<ul><li>empty string: regular (default)</li><li>B: bold</li><li>I: italic</li><li>BI or IB: bold italic</li></ul>
-$file   | | The font definition file. By default, the name is built from the family and style, in lower case with no spaces.
-
-If you want to add font for normal and for bold style, you must call the `addFont` method twice, one for each font file. 
-
-**WARNING**:
-In 4em parameter constructor of Html2pdf, you must specify whether you use a Unicode font (true) or an old font (false). 
-
-## Using new font
-
-You have just to se the new font family name in your css.
-
-## Setting the default font
-
-You can set the default font to use with the following method:
-
-```php
-$html2pdf->setDefaultFont($default);
-```
-
-[back](./README.md)
diff --git a/html2pdf-master/doc/install.md b/html2pdf-master/doc/install.md
deleted file mode 100644
index 3a2a0ea2..00000000
--- a/html2pdf-master/doc/install.md
+++ /dev/null
@@ -1,64 +0,0 @@
-# How to Install Html2Pdf
-
-[back](./README.md)
-
-## Composer and Packagist
-
-You must use Composer to install Html2Pdf.
-
-If you do not know what is Composer, you are a few years late...
-
-It is used by all the modern PHP applications (Magento2, Drupal, EasyPlatform, Symfony, ...).
-
-You can read all the pages on https://getcomposer.org/doc/
-
-You can find all the available packages on https://packagist.org/
-
-For example, you can find Html2Pdf: https://packagist.org/packages/spipu/html2pdf
-
-You have to commit the `composer.json` and `composer.lock` files, but **never** commit the `vendor` folder.
-
-If you do not understand why, it is because you have not read the Composer documentation...
-
-## Install
-
-You have just to launch the following command on the root folder of your project:
-
-```bash
-composer require spipu/html2pdf
-```
-
-### First Test
-
-Here is a HelloWorld example, that you can put on the root folder of your project.
-
-```php
-require __DIR__.'/vendor/autoload.php';
-
-use Spipu\Html2Pdf\Html2Pdf;
-
-$html2pdf = new Html2Pdf();
-$html2pdf->writeHTML('<h1>HelloWorld</h1>This is my first test');
-$html2pdf->output();
-```
-
-Html2Pdf use the PSR-4 autoloader of Composer. You have just to require it. Never require manually the classes, it will not work at all. You must use the Composer functionnalities.
-
-Then, you have just to use the main class `Spipu\Html2Pdf\Html2Pdf`, with the 2 main methods `writeHTML` and `output`.
-
-### And on production ?
-
-You have **not** to install composer on your production server. 
-
-You have to install composer **only** on your dev environement. Composer is a dev tool.
- 
-To deliver you app on a server, you have to (on you dev environement) :
-
-  * Git clone the tag/branch that you want to deliver
-  * Launch the command `composer install --no-dev`
-  * Remove the useless files (like the `.git` folder)
-  * Zip all
-
-That's all, you have a beautifull package that can be deliver on a server !
-
-[back](./README.md)
diff --git a/html2pdf-master/doc/methods.md b/html2pdf-master/doc/methods.md
deleted file mode 100644
index be98f48f..00000000
--- a/html2pdf-master/doc/methods.md
+++ /dev/null
@@ -1,65 +0,0 @@
-# Useful Methods
-
-[back](./README.md)
-
-## Image Must Exist
-
-By default, if you try to use an image that Html2Pdf can not read, it will throw an `ImageException`.
-
-You can disable this test with the following method:
-
-```php
-$html2pdf->setTestIsImage(false);
-```
-
-If you disable the test, and if an image does not exist, it will display a 16x16 grey square instead.
-
-## FallBack Image
-
-If you disable the "Image Must Exist" test, you can specify a fallback image with the following method: 
-
-```php
-$html2pdf->setFallbackImage($imageFilename);
-```
-
-## Can not split TD content
-
-By default, the content of a TD should not exceed one page.
-
-You can disable this protection with the following method:
-
-```php
-$html2pdf->setTestTdInOnePage(false);
-```
-
-**WARNING**:
-If you disable this test, you may have big layouts problems on tables in multiple columns.
-
-Rather than disabling this test it is better to break the TD content in smaller ones.
-
-**We do not support the consequencies of disable this test.**
-
-## Debug Mode
-
-You can enable a debug mode by using the following method:
-
-```php
-$html2pdf->setModeDebug();
-```
-
-You can specify your own debugger. It must implement `\Spipu\Html2Pdf\Debug\DebugInterface`.
-
-```php
-$debug = new \Spipu\Html2Pdf\Debug\Debug();
-$html2pdf->setModeDebug($debug);
-```
-## Version
-
-You can get the current Html2Pdf version with the following methods:
-
-```php
-$html2pdf->getVersion();
-$html2pdf->getVersionAsArray();
-```
-
-[back](./README.md)
diff --git a/html2pdf-master/doc/output.md b/html2pdf-master/doc/output.md
deleted file mode 100644
index 9a80125b..00000000
--- a/html2pdf-master/doc/output.md
+++ /dev/null
@@ -1,50 +0,0 @@
-# Output
-
-[back](./README.md)
-
-The main method to use is `output`.
- 
-It takes two not required parameters.
-
-## Parameters
-
-Parameter| Default | Description
----------|---------|-------------
-$name | document.pdf | The name of the file when saved. Note that special characters are removed and blanks characters are replaced with the underscore character.
-$dest | I | Destination where to send the document. It can take one of the following values:<ul><li>I: send the file inline to the browser (default). The plug-in is used if available. The name given by name is used when one selects the "Save as" option on the link generating the PDF.</li><li>D: send to the browser and force a file download with the name given by name.</li><li>F: save to a local server file with the name given by name.</li><li>S: return the document as a string (name is ignored).</li><li>FI: equivalent to F + I option</li><li>FD: equivalent to F + D option</li><li>E: return the document as base64 mime multi-part email attachment (RFC 2045)</li></ul>
-
-## Examples
-
-### Send PDF to browser without specifying a name
-
-```php
-$html2pdf->output(); 
-```
-
-### Send the PDF document in browser with a specific name
-
-```php
-$html2pdf->output('my_doc.pdf'); 
-```
-
-### Forcing the download of PDF via web browser, with a specific name
-
-```php
-$html2pdf->output('my_doc.pdf', 'D'); 
-```
-
-### Write the contents of a PDF file on the server
-
-```php
-$html2pdf->output('/absolute/path/file_xxxx.pdf', 'F');
-```
-
-### Retrieve the contents of the PDF and then do whatever you want
-
-```php
-$pdfContent = $html2pdf->output('my_doc.pdf', 'S');
-```
-
-Then, you can send it by email, using a Bin Attachment document.
-
-[back](./README.md)
diff --git a/html2pdf-master/doc/page.md b/html2pdf-master/doc/page.md
deleted file mode 100644
index bacbd64b..00000000
--- a/html2pdf-master/doc/page.md
+++ /dev/null
@@ -1,138 +0,0 @@
-# Page Management
-
-[back](./README.md)
-
-To facilitate the layout, three specific tags have been added:
- 
-  * `<page>`
-  * `<page_header>`
-  * `<page_footer>`
-  
-They must be used as follow:
-
-```html
- <page> 
-    <page_header> 
-       ...              
-    </page_header> 
-    <page_footer> 
-       ...
-    </page_footer> 
-    ...
- </page> 
-```
-
-You **must not** use `<body>` and `<html>` tags.
-
-## Page tag
-
-### Attributes
-
-You can use the main following attributes:
-
-Attribute| Default | Description
----------|---------|-------------
-pageset | new | Specify if we want to use the previous page definition (old) or a new one (new)
-pagegroup | old | Specify if we are in the same page group (old) or in a new one (new)
-hideheader | | comma-separate page numbers on which we want to hide the header
-hidefooter | | comma-separate page numbers on which we want to hide the footer
-orientation | | Portrait (P) or Lanscape (L). By default, the orientation specified in the Html2Pdf constructor
-format | | Format to use The list of the available values are [here](https://github.com/tecnickcom/TCPDF/blob/master/include/tcpdf_static.php#L2097). By default, the orientation specified in the Html2Pdf constructor
-style | | css style
-class | | css class
-
-You can use the following attributes to manage page margin:
-
-Attribute| Default | Description
----------|---------|-------------
-backtop | 0 | value with unit (mm, px, pt, % )
-backbottom | 0 | value with unit (mm, px, pt, % )
-backleft | 0 | value with unit (mm, px, pt, % )
-backright | 0 | value with unit (mm, px, pt, % )
-
-You can use the following attributes to manage page background:
-
-Attribute| Default | Description
----------|---------|-------------
-backcolor | transparent | css color value
-backimg | | url of the image to use
-backimgx | center | x position of the image on the page background: left / center / right / value with unit (mm, px, pt, % )
-backimgy | middle | y position of the image on the page background: top / middle / bottom / value with unit (mm, px, pt, % )
-backimgw | 100% | width on the image on the page background: value with unit (mm, px, pt, % )
-
-You can add a light footer by using the attribute footer. It takes coma-separated values:
-
-Value| Description
------|-------------
-page | display the current page
-date | display the generation date
-time | display the generation time
-form | display a disclamer about form compatibility
-
-### explanation
-
-It allows to define, for the entire html code included within the layout :
-
-  * margins left, right, top, bottom (backleft, backright, backtop, backbottom)
-  * background image, with its position and size (backimg, backimgx, backimgy, backimgw)
-  * the background color (backcolor)
-  * orientation (orientation) and format (format)
-  * simple automatic footer (footer)
-  * a header and a footer complex HTML (using tags page_header and page_footer).
-
-It does not limit it-self to one final page of the PDF, but to a set of pages.
-
-Any HTML code will be included automatically within the same layout.
-
-It is possible to reuse the layout of the previous tag page using property pageset = “old.” This also automatically resume the header and the footer. 
-
-## Page Header tag
-
-Its allows you to use complex HTML as the header of the current page.
-
-Its definition must necessarily be located just after the opening of the `<page>` tag.
-
-It can contain any valid HTML.
-
-It is **REQUIRED** to specify the top margin, using the `backtop` attribute on the `<page>` tag. 
-
-You can use ̀`css` and `class` attribute on this specific tag.
-
-## Page Footer tag
-
-Its allows you to use complex HTML as the header of the current page.
-
-Its definition must necessarily be located just after the opening of the `<page>` tag.
-
-It can contain any valid HTML.
-
-It is **REQUIRED** to specify the top margin, using the `backtop` attribute on the `<page>` tag.
-
-You can use `css` and `class` attribute on this specific tag.
-
-## Margin Explanation
-
-Here's a little explanation of different margins:
-
-```html
-<page backtop="7mm" backbottom="7mm" backleft="10mm" backright="10mm"> 
-    <page_header> 
-         Page Header 
-    </page_header> 
-    <page_footer> 
-         Page Footer 
-    </page_footer> 
-
-    Page Content 
-</page> 
-```
-
-```php
-$pdf = new \Spipu\Html2Pdf\Html2Pdf('P','A4','en', false, 'UTF-8', array(mL, mT, mR, mB)); 
-$pdf->writeHTML($htmlContent); 
-$pdf->Output(); 
-```
-
-![Margins](res/margins.jpg "Margins")
-
-[back](./README.md)
diff --git a/html2pdf-master/doc/res/margins.jpg b/html2pdf-master/doc/res/margins.jpg
deleted file mode 100644
index e905d2a6..00000000
Binary files a/html2pdf-master/doc/res/margins.jpg and /dev/null differ
diff --git a/html2pdf-master/doc/svg.md b/html2pdf-master/doc/svg.md
deleted file mode 100644
index b33ec083..00000000
--- a/html2pdf-master/doc/svg.md
+++ /dev/null
@@ -1,53 +0,0 @@
-# SVG tags
-
-[back](./README.md)
-
-## Tag draw
-
-A new html tag `<draw>` has been implemented.
-
-It allows to insert a SVG image in your PDF.
-
-The only allowed attributes are `css` and `class`.
-
-Example:
-
-```html
-<page>
-    <draw style="margin: auto; width:150mm; height:100mm; background: #000000; border: solid 0.5mm #777777;">
-        <line    style="stroke:#FF0000; stroke-width:1mm" x1="10mm" y1="10mm" x2="140mm" y2="10mm" >
-        <rect    style="stroke:#770077; stroke-width:1mm; fill:#008888" x="15%" y="15%"  w="70%" h="70%">
-        <ellipse style="stroke:#000077; stroke-width:1mm; fill:#888800" cx="50%" cy="50%" rx="30%" ry="30%">
-        <circle  style="stroke:#0000AA; stroke-width:1mm; fill:#AAAA00" cx="50%" cy="50%" r="15%">
-    </draw><br>
-    <draw style="margin: auto; width:150mm; height:100mm; background: #000000; border: solid 0.5mm #777777;">
-        <path style="fill:#AAAA00; stroke:#0000AA; stroke-width:1mm" d="M20mm,10mm H130mm A10mm,10mm 0,0,0 140mm,20mm V80mm A10mm,10mm 0,0,0 130mm,90mm H20mm A10mm,10mm 0,0,0 10mm,80mm V20mm A10mm,10mm 0,0,0 20mm,10mm">
-        <path style="fill:#770000; stroke:#AA0033; stroke-width:0.5mm" d="M 20mm,40mm a16mm,8mm 0,0,0 16mm,8mm" />
-        <path style="fill:#770000; stroke:#00AA33; stroke-width:0.5mm" d="M 20mm,40mm l16mm,8mm" />
-        <path style="fill:#770000; stroke:#AA0033; stroke-width:0.5mm" d="M 40mm,40mm a16mm,8mm 0,0,1 16mm,8mm" />
-        <path style="fill:#770000; stroke:#00AA33; stroke-width:0.5mm" d="M 40mm,40mm l16mm,8mm" />
-        <path style="fill:#770000; stroke:#AA0033; stroke-width:0.5mm" d="M 80mm,40mm a16mm,8mm 0,1,0 16mm,8mm" />
-        <path style="fill:#770000; stroke:#00AA33; stroke-width:0.5mm" d="M 80mm,40mm l16mm,8mm" />
-        <path style="fill:#770000; stroke:#AA0033; stroke-width:0.5mm" d="M100mm,40mm a16mm,8mm 0,1,1 16mm,8mm" />
-        <path style="fill:#770000; stroke:#00AA33; stroke-width:0.5mm" d="M100mm,40mm l16mm,8mm" />
-    </draw><br>
-    <br>
-</page>
-```
-
-## Allowed SVG tags
-
-  * LINE
-  * RECT
-  * CIRCLE
-  * ELLIPSE
-  * PATH
-  * POLYGON
-  * POLYLINE
-  * G
-
-## SVG Documentation
-
-See http://www.w3.org/TR/SVG11/expanded-toc.html
-
-[back](./README.md)
diff --git a/html2pdf-master/doc/tcpdf_methods.md b/html2pdf-master/doc/tcpdf_methods.md
deleted file mode 100644
index 3e9825b4..00000000
--- a/html2pdf-master/doc/tcpdf_methods.md
+++ /dev/null
@@ -1,62 +0,0 @@
-# TCPDF Methods
-
-[back](./README.md)
-
-All the TCPDF methods can be used, by using the `pdf` property:
-
-```php
-$html2pdf->pdf->...
-```
-
-## Display Mode
-
-You can change how your PDF document will be displayed, with the `SetDisplayMode` method:
-
-```php
-$html2pdf = new \Spipu\Html2Pdf\Html2Pdf('P', 'A4', 'en');
-$html2pdf->pdf->SetDisplayMode('fullpage');
-$html2pdf->writeHTML($htmlContent);
-$html2pdf->output();
-```
-
-The parameters are:
-
-Parameter| Default | Description
----------|---------|-------------
-$zoom | | The zoom to use. It can be one of the following string values or a number indicating the zooming factor to use. <ul><li>fullpage: displays the entire page on screen </li><li>fullwidth: uses maximum width of window</li><li>real: uses real size (equivalent to 100% zoom)</li><li>default: uses viewer default mode</li></ul>
-$layout | SinglePage | The page layout. Possible values are:<ul><li>SinglePage Display one page at a time</li><li>OneColumn Display the pages in one column</li><li>TwoColumnLeft Display the pages in two columns, with odd-numbered pages on the left</li><li>TwoColumnRight Display the pages in two columns, with odd-numbered pages on the right</li><li>TwoPageLeft (PDF 1.5) Display the pages two at a time, with odd-numbered pages on the left</li><li>TwoPageRight (PDF 1.5) Display the pages two at a time, with odd-numbered pages on the right</li></ul>
-$mode | UseNone | A name object specifying how the document should be displayed when opened:<ul><li>UseNone Neither document outline nor thumbnail images visible</li><li>UseOutlines Document outline visible</li><li>UseThumbs Thumbnail images visible</li><li>FullScreen Full-screen mode, with no menu bar, window controls, or any other window visible</li><li>UseOC (PDF 1.5) Optional content group panel visible</li><li>UseAttachments (PDF 1.6) Attachments panel visible</li></ul>
-
-## Document Information
-
-You can change the document information, with the following methods:
-
-```php
-$html2pdf = new \Spipu\Html2Pdf\Html2Pdf('P', 'A4', 'en');
-$html2pdf->pdf->SetAuthor('LAST-NAME Frist-Name');
-$html2pdf->pdf->SetTitle('My Pdf Document');
-$html2pdf->pdf->SetSubject('it will be about something important');
-$html2pdf->pdf->SetKeywords('example, keywords, others');
-$html2pdf->writeHTML($htmlContent);
-$html2pdf->output();
-```
-
-## Document Protection
-
-You can protect your PDF document, with the `setProtection` method:
-
-```php
-$html2pdf->pdf->SetProtection($permissions, $userPass, $ownerPass, $mode, $pubkeys);
-```
-
-The parameters are:
-
-Parameter| Default | Description
----------|---------|-------------
-$permissions | | the set of permissions (specify the ones you want to block):<ul><li>print : Print the document;</li><li>modify : Modify the contents of the document by operations other than those controlled by 'fill-forms', 'extract' and 'assemble';</li><li>copy : Copy or otherwise extract text and graphics from the document;</li><li>annot-forms : Add or modify text annotations, fill in interactive form fields, and, if 'modify' is also set, create or modify interactive form fields (including signature fields);</li><li>fill-forms : Fill in existing interactive form fields (including signature fields), even if 'annot-forms' is not specified;</li><li>extract : Extract text and graphics (in support of accessibility to users with disabilities or for other purposes);</li><li>assemble : Assemble the document (insert, rotate, or delete pages and create bookmarks or thumbnail images), even if 'modify' is not set;</li><li>print-high : Print the document to a representation from which a faithful digital copy of the PDF content could be generated. When this is not set, printing is limited to a low-level representation of the appearance, possibly of degraded quality.</li><li>owner : (inverted logic - only for public-key) when set permits change of encryption and enables all other permissions.</li></ul>
-$userPass | | user password. Empty by default.
-$ownerPass | null | owner password. If not specified, a random value is used.
-$mode | 0 | encryption strength: 0 = RC4 40 bit; 1 = RC4 128 bit; 2 = AES 128 bit; 3 = AES 256 bit.
-$pubkeys | null| array of recipients containing public-key certificates ('c') and permissions ('p'). For example: array(array('c' => 'file://../examples/data/cert/tcpdf.crt', 'p' => array('print')))
-
-[back](./README.md)
diff --git a/html2pdf-master/examples/about.php b/html2pdf-master/examples/about.php
deleted file mode 100644
index ad446d67..00000000
--- a/html2pdf-master/examples/about.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - example
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-require_once dirname(__FILE__).'/../vendor/autoload.php';
-
-use Spipu\Html2Pdf\Html2Pdf;
-use Spipu\Html2Pdf\Exception\Html2PdfException;
-use Spipu\Html2Pdf\Exception\ExceptionFormatter;
-
-try {
-    $html2pdf = new Html2Pdf('P', 'A4', 'fr', true, 'UTF-8', array(0, 0, 0, 0));
-    $html2pdf->pdf->SetDisplayMode('fullpage');
-
-    ob_start();
-    include dirname(__FILE__).'/res/about.php';
-    $content = ob_get_clean();
-
-    $html2pdf->writeHTML($content);
-    $html2pdf->createIndex('Sommaire', 30, 12, false, true, 2, null, '10mm');
-    $html2pdf->output('about.pdf');
-} catch (Html2PdfException $e) {
-    $html2pdf->clean();
-
-    $formatter = new ExceptionFormatter($e);
-    echo $formatter->getHtmlMessage();
-}
diff --git a/html2pdf-master/examples/balloon.php b/html2pdf-master/examples/balloon.php
deleted file mode 100644
index 48f812c2..00000000
--- a/html2pdf-master/examples/balloon.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - example
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-require_once dirname(__FILE__).'/../vendor/autoload.php';
-
-use Spipu\Html2Pdf\Html2Pdf;
-use Spipu\Html2Pdf\Exception\Html2PdfException;
-use Spipu\Html2Pdf\Exception\ExceptionFormatter;
-
-try {
-    ob_start();
-    include dirname(__FILE__).'/res/balloon.php';
-    $content = ob_get_clean();
-
-    $html2pdf = new Html2Pdf('P', 'A4', 'fr');
-    $html2pdf->writeHTML($content);
-    $html2pdf->output('baloon.pdf');
-} catch (Html2PdfException $e) {
-    $html2pdf->clean();
-
-    $formatter = new ExceptionFormatter($e);
-    echo $formatter->getHtmlMessage();
-}
diff --git a/html2pdf-master/examples/bookmark.php b/html2pdf-master/examples/bookmark.php
deleted file mode 100644
index 9b950f0b..00000000
--- a/html2pdf-master/examples/bookmark.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - example
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-require_once dirname(__FILE__).'/../vendor/autoload.php';
-
-use Spipu\Html2Pdf\Html2Pdf;
-use Spipu\Html2Pdf\Exception\Html2PdfException;
-use Spipu\Html2Pdf\Exception\ExceptionFormatter;
-
-try {
-    ob_start();
-    include dirname(__FILE__).'/res/bookmark.php';
-    $content = ob_get_clean();
-
-    $html2pdf = new Html2Pdf('P', 'A4', 'fr', true, 'UTF-8', 0);
-    $html2pdf->writeHTML($content);
-    $html2pdf->createIndex('Sommaire', 25, 12, false, true, 1);
-    $html2pdf->output('bookmark.pdf');
-} catch (Html2PdfException $e) {
-    $html2pdf->clean();
-
-    $formatter = new ExceptionFormatter($e);
-    echo $formatter->getHtmlMessage();
-}
diff --git a/html2pdf-master/examples/example00.php b/html2pdf-master/examples/example00.php
deleted file mode 100644
index f48b8b5c..00000000
--- a/html2pdf-master/examples/example00.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - example
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-require_once dirname(__FILE__).'/../vendor/autoload.php';
-
-use Spipu\Html2Pdf\Html2Pdf;
-use Spipu\Html2Pdf\Exception\Html2PdfException;
-use Spipu\Html2Pdf\Exception\ExceptionFormatter;
-
-try {
-    ob_start();
-    include dirname(__FILE__).'/res/example00.php';
-    $content = ob_get_clean();
-
-    $html2pdf = new Html2Pdf('P', 'A4', 'fr');
-    $html2pdf->setDefaultFont('Arial');
-    $html2pdf->writeHTML($content);
-    $html2pdf->output('example00.pdf');
-} catch (Html2PdfException $e) {
-    $html2pdf->clean();
-
-    $formatter = new ExceptionFormatter($e);
-    echo $formatter->getHtmlMessage();
-}
diff --git a/html2pdf-master/examples/example01.php b/html2pdf-master/examples/example01.php
deleted file mode 100644
index 1fbd5487..00000000
--- a/html2pdf-master/examples/example01.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - example
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-require_once dirname(__FILE__).'/../vendor/autoload.php';
-
-use Spipu\Html2Pdf\Html2Pdf;
-use Spipu\Html2Pdf\Exception\Html2PdfException;
-use Spipu\Html2Pdf\Exception\ExceptionFormatter;
-
-try {
-    ob_start();
-    include dirname(__FILE__).'/res/example01.php';
-    $content = ob_get_clean();
-
-    $html2pdf = new Html2Pdf('P', 'A4', 'fr');
-    $html2pdf->writeHTML($content);
-    $html2pdf->output('example01.pdf');
-} catch (Html2PdfException $e) {
-    $html2pdf->clean();
-
-    $formatter = new ExceptionFormatter($e);
-    echo $formatter->getHtmlMessage();
-}
diff --git a/html2pdf-master/examples/example02.php b/html2pdf-master/examples/example02.php
deleted file mode 100644
index 637e7db7..00000000
--- a/html2pdf-master/examples/example02.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - example
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-require_once dirname(__FILE__).'/../vendor/autoload.php';
-
-use Spipu\Html2Pdf\Html2Pdf;
-use Spipu\Html2Pdf\Exception\Html2PdfException;
-use Spipu\Html2Pdf\Exception\ExceptionFormatter;
-
-try {
-    ob_start();
-    include dirname(__FILE__).'/res/example02.php';
-    $content = ob_get_clean();
-
-    $html2pdf = new Html2Pdf('P', 'A4', 'fr', true, 'UTF-8', array(15, 5, 15, 5));
-    $html2pdf->pdf->SetDisplayMode('fullpage');
-    $html2pdf->writeHTML($content);
-    $html2pdf->output('example02.pdf');
-} catch (Html2PdfException $e) {
-    $html2pdf->clean();
-
-    $formatter = new ExceptionFormatter($e);
-    echo $formatter->getHtmlMessage();
-}
diff --git a/html2pdf-master/examples/example03.php b/html2pdf-master/examples/example03.php
deleted file mode 100644
index 7742eab3..00000000
--- a/html2pdf-master/examples/example03.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - example
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-require_once dirname(__FILE__).'/../vendor/autoload.php';
-
-use Spipu\Html2Pdf\Html2Pdf;
-use Spipu\Html2Pdf\Exception\Html2PdfException;
-use Spipu\Html2Pdf\Exception\ExceptionFormatter;
-
-try {
-    ob_start();
-    include dirname(__FILE__).'/res/example03.php';
-    $content = ob_get_clean();
-
-    $html2pdf = new Html2Pdf('P', 'A4', 'fr', true, 'UTF-8', 3);
-    $html2pdf->pdf->SetDisplayMode('fullpage');
-    $html2pdf->writeHTML($content);
-    $html2pdf->output('example03.pdf');
-} catch (Html2PdfException $e) {
-    $html2pdf->clean();
-
-    $formatter = new ExceptionFormatter($e);
-    echo $formatter->getHtmlMessage();
-}
diff --git a/html2pdf-master/examples/example04.php b/html2pdf-master/examples/example04.php
deleted file mode 100644
index 733db7cd..00000000
--- a/html2pdf-master/examples/example04.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - example
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-require_once dirname(__FILE__).'/../vendor/autoload.php';
-
-use Spipu\Html2Pdf\Html2Pdf;
-use Spipu\Html2Pdf\Exception\Html2PdfException;
-use Spipu\Html2Pdf\Exception\ExceptionFormatter;
-
-try {
-    ob_start();
-    include dirname(__FILE__).'/res/example04.php';
-    $content = ob_get_clean();
-
-    $html2pdf = new Html2Pdf('P', 'A4', 'fr');
-    $html2pdf->pdf->SetDisplayMode('fullpage');
-    $html2pdf->writeHTML($content);
-    $html2pdf->output('example04.pdf');
-} catch (Html2PdfException $e) {
-    $html2pdf->clean();
-
-    $formatter = new ExceptionFormatter($e);
-    echo $formatter->getHtmlMessage();
-}
diff --git a/html2pdf-master/examples/example05.php b/html2pdf-master/examples/example05.php
deleted file mode 100644
index 53ecb3f5..00000000
--- a/html2pdf-master/examples/example05.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - example
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-require_once dirname(__FILE__).'/../vendor/autoload.php';
-
-use Spipu\Html2Pdf\Html2Pdf;
-use Spipu\Html2Pdf\Exception\Html2PdfException;
-use Spipu\Html2Pdf\Exception\ExceptionFormatter;
-
-try {
-    ob_start();
-    include dirname(__FILE__).'/res/example05.php';
-    $content = ob_get_clean();
-
-    $html2pdf = new Html2Pdf('P', 'A4', 'fr');
-    $html2pdf->pdf->SetDisplayMode('fullpage');
-    $html2pdf->writeHTML($content);
-    $html2pdf->output('example05.pdf');
-} catch (Html2PdfException $e) {
-    $html2pdf->clean();
-
-    $formatter = new ExceptionFormatter($e);
-    echo $formatter->getHtmlMessage();
-}
diff --git a/html2pdf-master/examples/example06.php b/html2pdf-master/examples/example06.php
deleted file mode 100644
index 5bed87e4..00000000
--- a/html2pdf-master/examples/example06.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - example
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-require_once dirname(__FILE__).'/../vendor/autoload.php';
-
-use Spipu\Html2Pdf\Html2Pdf;
-use Spipu\Html2Pdf\Exception\Html2PdfException;
-use Spipu\Html2Pdf\Exception\ExceptionFormatter;
-
-try {
-    ob_start();
-    include dirname(__FILE__).'/res/example06.php';
-    $content = ob_get_clean();
-
-    $html2pdf = new Html2Pdf('P', 'A4', 'fr');
-    $html2pdf->writeHTML($content);
-    $html2pdf->output('example06.pdf');
-} catch (Html2PdfException $e) {
-    $html2pdf->clean();
-
-    $formatter = new ExceptionFormatter($e);
-    echo $formatter->getHtmlMessage();
-}
diff --git a/html2pdf-master/examples/example07.php b/html2pdf-master/examples/example07.php
deleted file mode 100644
index c5fce900..00000000
--- a/html2pdf-master/examples/example07.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - example
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-require_once dirname(__FILE__).'/../vendor/autoload.php';
-
-use Spipu\Html2Pdf\Html2Pdf;
-use Spipu\Html2Pdf\Exception\Html2PdfException;
-use Spipu\Html2Pdf\Exception\ExceptionFormatter;
-
-try {
-    // get the HTML
-    ob_start();
-    include dirname(__FILE__).'/res/example07a.php';
-    include dirname(__FILE__).'/res/example07b.php';
-    $content = ob_get_clean();
-
-    $html2pdf = new Html2Pdf('P', 'A4', 'fr');
-    $html2pdf->pdf->SetDisplayMode('fullpage');
-    $html2pdf->writeHTML($content);
-    $html2pdf->output('example07.pdf');
-} catch (Html2PdfException $e) {
-    $html2pdf->clean();
-
-    $formatter = new ExceptionFormatter($e);
-    echo $formatter->getHtmlMessage();
-}
diff --git a/html2pdf-master/examples/example08.php b/html2pdf-master/examples/example08.php
deleted file mode 100644
index 64f199f8..00000000
--- a/html2pdf-master/examples/example08.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - example
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-require_once dirname(__FILE__).'/../vendor/autoload.php';
-
-use Spipu\Html2Pdf\Html2Pdf;
-use Spipu\Html2Pdf\Exception\Html2PdfException;
-use Spipu\Html2Pdf\Exception\ExceptionFormatter;
-
-try {
-    ob_start();
-    include dirname(__FILE__).'/res/example08.php';
-    $content = ob_get_clean();
-
-    $html2pdf = new Html2Pdf('P', 'A4', 'fr', true, 'UTF-8', 0);
-    $html2pdf->writeHTML($content);
-    $html2pdf->output('example08.pdf');
-} catch (Html2PdfException $e) {
-    $html2pdf->clean();
-
-    $formatter = new ExceptionFormatter($e);
-    echo $formatter->getHtmlMessage();
-}
diff --git a/html2pdf-master/examples/example09.php b/html2pdf-master/examples/example09.php
deleted file mode 100644
index baf6bd1e..00000000
--- a/html2pdf-master/examples/example09.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - example
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-require_once dirname(__FILE__).'/../vendor/autoload.php';
-
-use Spipu\Html2Pdf\Html2Pdf;
-use Spipu\Html2Pdf\Exception\Html2PdfException;
-use Spipu\Html2Pdf\Exception\ExceptionFormatter;
-
-if (isset($_SERVER['REQUEST_URI'])) {
-    $generate = isset($_GET['make_pdf']);
-    $nom = isset($_GET['nom']) ? $_GET['nom'] : 'inconnu';
-    $url = dirname($_SERVER['REQUEST_URI']);
-    if (substr($url, 0, 7)!=='http://') {
-        $url = 'http://'.$_SERVER['HTTP_HOST'].$url;
-    }
-} else {
-    $generate = true;
-    $nom = 'spipu';
-    $url = 'http://localhost/html2pdf/examples/';
-}
-
-$nom = substr(preg_replace('/[^a-zA-Z0-9]/isU', '', $nom), 0, 26);
-$url.= '/res/example09.png.php?px=5&amp;py=20';
-
-
-if ($generate) {
-    ob_start();
-} else {
-?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" >
-        <title>Exemple d'auto génération de PDF</title>
-    </head>
-    <body>
-<?php
-}
-?>
-<br>
-Ceci est un exemple de génération de PDF via un bouton :)<br>
-<br>
-<img src="<?php echo $url; ?>" alt="image_php" ><br>
-<br>
-<?php
-if ($generate) {
-?>
-Bonjour <b><?php echo $nom; ?></b>, ton nom peut s'écrire : <br>
-<barcode type="C39" value="<?php echo strtoupper($nom); ?>" style="color: #770000" ></barcode><hr>
-<br>
-<?php
-}
-?>
-<br>
-<?php
-if ($generate) {
-    $content = ob_get_clean();
-
-    try {
-        $html2pdf = new Html2Pdf('P', 'A4', 'fr');
-        $html2pdf->writeHTML($content);
-        $html2pdf->output('example09.pdf');
-        exit;
-    } catch (Html2PdfException $e) {
-        $html2pdf->clean();
-
-        $formatter = new ExceptionFormatter($e);
-        echo $formatter->getHtmlMessage();
-        exit;
-    }
-}
-?>
-        <form method="get" action="">
-            <input type="hidden" name="make_pdf" value="">
-            Ton nom : <input type="text" name="nom" value=""> -
-            <input type="submit" value="Generer le PDF" >
-        </form>
-    </body>
-</html>
diff --git a/html2pdf-master/examples/example10.php b/html2pdf-master/examples/example10.php
deleted file mode 100644
index b6138063..00000000
--- a/html2pdf-master/examples/example10.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - example
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-require_once dirname(__FILE__).'/../vendor/autoload.php';
-
-use Spipu\Html2Pdf\Html2Pdf;
-use Spipu\Html2Pdf\Exception\Html2PdfException;
-use Spipu\Html2Pdf\Exception\ExceptionFormatter;
-
-try {
-    ob_start();
-    include dirname(__FILE__).'/res/example10.php';
-    $content = ob_get_clean();
-    $html2pdf = new Html2Pdf('P', 'A4', 'fr');
-    $html2pdf->writeHTML($content);
-    $html2pdf->output('example10.pdf');
-} catch (Html2PdfException $e) {
-    $html2pdf->clean();
-
-    $formatter = new ExceptionFormatter($e);
-    echo $formatter->getHtmlMessage();
-}
diff --git a/html2pdf-master/examples/example11.php b/html2pdf-master/examples/example11.php
deleted file mode 100644
index 6d857c6d..00000000
--- a/html2pdf-master/examples/example11.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - example
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-require_once dirname(__FILE__).'/../vendor/autoload.php';
-
-use Spipu\Html2Pdf\Html2Pdf;
-use Spipu\Html2Pdf\Exception\Html2PdfException;
-use Spipu\Html2Pdf\Exception\ExceptionFormatter;
-
-try {
-    ob_start();
-    include dirname(__FILE__).'/res/example11.php';
-    $content = ob_get_clean();
-
-    $html2pdf = new Html2Pdf('P', 'A4', 'fr');
-    $html2pdf->setTestTdInOnePage(false);
-    $html2pdf->writeHTML($content);
-    $html2pdf->output('example11.pdf');
-} catch (Html2PdfException $e) {
-    $html2pdf->clean();
-
-    $formatter = new ExceptionFormatter($e);
-    echo $formatter->getHtmlMessage();
-}
diff --git a/html2pdf-master/examples/example12.php b/html2pdf-master/examples/example12.php
deleted file mode 100644
index 73768aac..00000000
--- a/html2pdf-master/examples/example12.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - example
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-require_once dirname(__FILE__).'/../vendor/autoload.php';
-
-use Spipu\Html2Pdf\Html2Pdf;
-use Spipu\Html2Pdf\Exception\Html2PdfException;
-use Spipu\Html2Pdf\Exception\ExceptionFormatter;
-
-try {
-    ob_start();
-    include dirname(__FILE__).'/res/example12.php';
-    $content = ob_get_clean();
-
-    $html2pdf = new Html2Pdf('P', 'A4', 'fr');
-    $html2pdf->writeHTML($content);
-    $html2pdf->output('example12.pdf');
-} catch (Html2PdfException $e) {
-    $html2pdf->clean();
-
-    $formatter = new ExceptionFormatter($e);
-    echo $formatter->getHtmlMessage();
-}
diff --git a/html2pdf-master/examples/example13.php b/html2pdf-master/examples/example13.php
deleted file mode 100644
index 29d80524..00000000
--- a/html2pdf-master/examples/example13.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - example
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-require_once dirname(__FILE__).'/../vendor/autoload.php';
-
-use Spipu\Html2Pdf\Html2Pdf;
-use Spipu\Html2Pdf\Exception\Html2PdfException;
-use Spipu\Html2Pdf\Exception\ExceptionFormatter;
-
-try {
-    ob_start();
-    include dirname(__FILE__).'/res/example13.php';
-    $content = ob_get_clean();
-
-    $html2pdf = new Html2Pdf('P', 'A4', 'fr');
-    $html2pdf->writeHTML($content);
-    $html2pdf->output('example13.pdf');
-} catch (Html2PdfException $e) {
-    $html2pdf->clean();
-
-    $formatter = new ExceptionFormatter($e);
-    echo $formatter->getHtmlMessage();
-}
diff --git a/html2pdf-master/examples/example14.php b/html2pdf-master/examples/example14.php
deleted file mode 100644
index 137bdd34..00000000
--- a/html2pdf-master/examples/example14.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - example
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-require_once dirname(__FILE__).'/../vendor/autoload.php';
-
-use Spipu\Html2Pdf\Html2Pdf;
-use Spipu\Html2Pdf\Exception\Html2PdfException;
-use Spipu\Html2Pdf\Exception\ExceptionFormatter;
-
-try {
-    ob_start();
-    include dirname(__FILE__).'/res/example14.php';
-    $content = ob_get_clean();
-
-    $html2pdf = new Html2Pdf('P', 'A4', 'fr');
-    $html2pdf->setTestIsImage(false);
-    $html2pdf->setFallbackImage('./res/off.png');
-    $html2pdf->writeHTML($content);
-    $html2pdf->output('example14.pdf');
-} catch (Html2PdfException $e) {
-    $html2pdf->clean();
-
-    $formatter = new ExceptionFormatter($e);
-    echo $formatter->getHtmlMessage();
-}
diff --git a/html2pdf-master/examples/example15.php b/html2pdf-master/examples/example15.php
deleted file mode 100644
index 63d03080..00000000
--- a/html2pdf-master/examples/example15.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - example
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-require_once dirname(__FILE__).'/../vendor/autoload.php';
-
-use Spipu\Html2Pdf\Html2Pdf;
-use Spipu\Html2Pdf\Exception\Html2PdfException;
-use Spipu\Html2Pdf\Exception\ExceptionFormatter;
-
-try {
-    ob_start();
-    include dirname(__FILE__).'/res/example15.php';
-    $content = ob_get_clean();
-
-    $html2pdf = new Html2Pdf('P', 'A4', 'fr');
-    $html2pdf->writeHTML($content);
-    $html2pdf->output('example15.pdf');
-} catch (Html2PdfException $e) {
-    $html2pdf->clean();
-
-    $formatter = new ExceptionFormatter($e);
-    echo $formatter->getHtmlMessage();
-}
diff --git a/html2pdf-master/examples/forms.php b/html2pdf-master/examples/forms.php
deleted file mode 100644
index ccbe9e0c..00000000
--- a/html2pdf-master/examples/forms.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - example
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-require_once dirname(__FILE__).'/../vendor/autoload.php';
-
-use Spipu\Html2Pdf\Html2Pdf;
-use Spipu\Html2Pdf\Exception\Html2PdfException;
-use Spipu\Html2Pdf\Exception\ExceptionFormatter;
-
-// for display the post information
-if (isset($_POST['test'])) {
-    echo '<pre>';
-    echo htmlentities(print_r($_POST, true));
-    echo '</pre>';
-    exit;
-}
-
-try {
-    ob_start();
-    require dirname(__FILE__).'/res/forms.php';
-    $content = ob_get_clean();
-
-    $html2pdf = new Html2Pdf('P', 'A4', 'fr');
-    $html2pdf->pdf->SetDisplayMode('fullpage');
-    $html2pdf->writeHTML($content);
-    $html2pdf->output('forms.pdf');
-} catch (Html2PdfException $e) {
-    $html2pdf->clean();
-
-    $formatter = new ExceptionFormatter($e);
-    echo $formatter->getHtmlMessage();
-}
diff --git a/html2pdf-master/examples/groups.php b/html2pdf-master/examples/groups.php
deleted file mode 100644
index 8893e580..00000000
--- a/html2pdf-master/examples/groups.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - example
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-require_once dirname(__FILE__).'/../vendor/autoload.php';
-
-use Spipu\Html2Pdf\Html2Pdf;
-use Spipu\Html2Pdf\Exception\Html2PdfException;
-use Spipu\Html2Pdf\Exception\ExceptionFormatter;
-
-try {
-    ob_start();
-    include dirname(__FILE__).'/res/groups.php';
-    $content = ob_get_clean();
-
-    $html2pdf = new Html2Pdf('P', 'A4', 'fr', true, 'UTF-8', 0);
-    $html2pdf->pdf->SetDisplayMode('fullpage');
-    $html2pdf->writeHTML($content);
-    $html2pdf->output('groups.pdf');
-} catch (Html2PdfException $e) {
-    $html2pdf->clean();
-
-    $formatter = new ExceptionFormatter($e);
-    echo $formatter->getHtmlMessage();
-}
diff --git a/html2pdf-master/examples/measure.php b/html2pdf-master/examples/measure.php
deleted file mode 100644
index fb50ebd6..00000000
--- a/html2pdf-master/examples/measure.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - example
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-require_once dirname(__FILE__).'/../vendor/autoload.php';
-
-use Spipu\Html2Pdf\Html2Pdf;
-use Spipu\Html2Pdf\Exception\Html2PdfException;
-use Spipu\Html2Pdf\Exception\ExceptionFormatter;
-
-try {
-    ob_start();
-    include dirname(__FILE__).'/res/measure.php';
-    $content = ob_get_clean();
-
-    $html2pdf = new Html2Pdf('L', 'A4', 'fr', true, 'UTF-8', 10);
-    $html2pdf->pdf->SetDisplayMode('fullpage');
-    $html2pdf->writeHTML($content);
-    $html2pdf->output('measure.pdf');
-} catch (Html2PdfException $e) {
-    $html2pdf->clean();
-
-    $formatter = new ExceptionFormatter($e);
-    echo $formatter->getHtmlMessage();
-}
diff --git a/html2pdf-master/examples/qrcode.php b/html2pdf-master/examples/qrcode.php
deleted file mode 100644
index 1083e161..00000000
--- a/html2pdf-master/examples/qrcode.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - example
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-require_once dirname(__FILE__).'/../vendor/autoload.php';
-
-use Spipu\Html2Pdf\Html2Pdf;
-use Spipu\Html2Pdf\Exception\Html2PdfException;
-use Spipu\Html2Pdf\Exception\ExceptionFormatter;
-
-try {
-    ob_start();
-    include dirname(__FILE__).'/res/qrcode.php';
-    $content = ob_get_clean();
-
-    $html2pdf = new Html2Pdf('P', 'A4', 'fr');
-    $html2pdf->pdf->SetDisplayMode('fullpage');
-    $html2pdf->writeHTML($content);
-    $html2pdf->output('qrcode.pdf');
-} catch (Html2PdfException $e) {
-    $html2pdf->clean();
-
-    $formatter = new ExceptionFormatter($e);
-    echo $formatter->getHtmlMessage();
-}
diff --git a/html2pdf-master/examples/radius.php b/html2pdf-master/examples/radius.php
deleted file mode 100644
index 822d36ab..00000000
--- a/html2pdf-master/examples/radius.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - example
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-require_once dirname(__FILE__).'/../vendor/autoload.php';
-
-use Spipu\Html2Pdf\Html2Pdf;
-use Spipu\Html2Pdf\Exception\Html2PdfException;
-use Spipu\Html2Pdf\Exception\ExceptionFormatter;
-
-try {
-    ob_start();
-    include dirname(__FILE__).'/res/radius.php';
-    $content = ob_get_clean();
-
-    $html2pdf = new Html2Pdf('P', 'A4', 'fr');
-    $html2pdf->writeHTML($content);
-    $html2pdf->output('radius.pdf');
-} catch (Html2PdfException $e) {
-    $html2pdf->clean();
-
-    $formatter = new ExceptionFormatter($e);
-    echo $formatter->getHtmlMessage();
-}
diff --git a/html2pdf-master/examples/res/about.php b/html2pdf-master/examples/res/about.php
deleted file mode 100644
index fbf3f062..00000000
--- a/html2pdf-master/examples/res/about.php
+++ /dev/null
@@ -1,242 +0,0 @@
-<style type="text/css">
-<!--
-    table.page_header {width: 100%; border: none; background-color: #DDDDFF; border-bottom: solid 1mm #AAAADD; padding: 2mm }
-    table.page_footer {width: 100%; border: none; background-color: #DDDDFF; border-top: solid 1mm #AAAADD; padding: 2mm}
-    div.note {border: solid 1mm #DDDDDD;background-color: #EEEEEE; padding: 2mm; border-radius: 2mm; width: 100%; }
-    ul.main { width: 95%; list-style-type: square; }
-    ul.main li { padding-bottom: 2mm; }
-    h1 { text-align: center; font-size: 20mm}
-    h3 { text-align: center; font-size: 14mm}
--->
-</style>
-<page backtop="14mm" backbottom="14mm" backleft="10mm" backright="10mm" style="font-size: 12pt">
-    <page_header>
-        <table class="page_header">
-            <tr>
-                <td style="width: 50%; text-align: left">
-                    A propos de ...
-                </td>
-                <td style="width: 50%; text-align: right">
-                    Html2Pdf v<?php echo $html2pdf->getVersion(); ?>
-                </td>
-            </tr>
-        </table>
-    </page_header>
-    <page_footer>
-        <table class="page_footer">
-            <tr>
-                <td style="width: 33%; text-align: left;">
-                    http://html2pdf.fr/
-                </td>
-                <td style="width: 34%; text-align: center">
-                    page [[page_cu]]/[[page_nb]]
-                </td>
-                <td style="width: 33%; text-align: right">
-                    &copy;Spipu 2008-<?php echo date('Y'); ?>
-                </td>
-            </tr>
-        </table>
-    </page_footer>
-    <bookmark title="Présentation" level="0" ></bookmark>
-    <br><br><br><br><br><br><br><br>
-    <h1>Html2Pdf</h1>
-    <h3>v<?php echo $html2pdf->getVersion(); ?></h3><br>
-    <br><br><br><br><br>
-    <div style="text-align: center; width: 100%;">
-        <br>
-        <img src="./res/logo.png" alt="Logo Html2Pdf" style="width: 150mm">
-        <br>
-    </div>
-    <br><br><br><br><br>
-    <div class="note">
-        Html2Pdf est un convertisseur de code HTML vers PDF écrit en PHP5, utilisant la librairie <a href="http://tcpdf.org">TCPDF.</a><br>
-        <br>
-        Il permet la conversion d'HTML et d'xHTML valide au format PDF, et est distribué sous licence OSL-3.0.<br>
-        <br>
-        Cette librairie a été conçue pour gérer principalement les TABLE imbriquées afin de générer des factures, bon de livraison, et autres documents officiels.<br>
-        <br>
-        Vous pouvez télécharger la dernière version de Html2Pdf ici : <a href="http://html2pdf.fr/">http://html2pdf.fr/</a>.<br>
-    </div>
-</page>
-<page pageset="old">
-    <bookmark title="Sommaire" level="0" ></bookmark>
-    <!-- here will be the automatic index -->
-</page>
-<page pageset="old">
-    <bookmark title="Compatibilité" level="0" ></bookmark>
-    <bookmark title="Balises HTML" level="1" ></bookmark>
-    <bookmark title="Balises classiques" level="2" ></bookmark>
-    <div class="note">
-        La liste des balises HTML utilisables est la suivante :<br>
-    </div>
-    <br>
-    <ul class="main">
-        <li>&lt;a&gt; : Ceci est un lien vers <a href="http://html2pdf.fr">le site de Html2Pdf</a></li>
-        <li>&lt;b&gt;, &lt;strong&gt; : Ecrire en <b>gras</b>.</li>
-        <li>&lt;big&gt; : Ecrire plus <big>gros</big>.</li>
-        <li>&lt;br&gt; : Permet d'aller à la ligne</li>
-        <li>&lt;cite&gt; : <cite>Ceci est une citation</cite></li>
-        <li>&lt;code&gt;, &lt;pre&gt;</li>
-        <li>&lt;div&gt; :&nbsp;<div style="border: solid 1px #AADDAA; background: #DDFFDD; text-align: center; width: 50mm">exemple de DIV</div></li>
-        <li>&lt;em&gt;, &lt;i&gt;, &lt;samp&gt; : Ecrire en <em>italique</em>.</li>
-        <li>&lt;font&gt;, &lt;span&gt; : <font style="color: #000066; font-family: times">Exemple d'utilisation</font></li>
-        <li>&lt;h1&gt;, &lt;h2&gt;, &lt;h3&gt;, &lt;h4&gt;, &lt;h5&gt;, &lt;h6&gt;</li>
-        <li>&lt;hr&gt; : barre horizontale</li>
-        <li>&lt;img&gt; : <img src="./res/tcpdf_logo.jpg" style="width: 10mm"></li>
-        <li>&lt;p&gt; : Ecrire dans un paragraphe</li>
-        <li>&lt;s&gt; : Texte <s>barré</s></li>
-        <li>&lt;small&gt; : Ecrire plus <small>petit</small>.</li>
-        <li>&lt;style&gt;</li>
-        <li>&lt;sup&gt; : Exemple<sup>haut</sup>.</li>
-        <li>&lt;sub&gt; : Exemple<sub>bas</sub>.</li>
-        <li>&lt;u&gt; : Texte <u>souligné</u></li>
-        <li>&lt;table&gt;, &lt;td&gt;, &lt;th&gt;, &lt;tr&gt;, &lt;thead&gt;, &lt;tbody&gt;, &lt;tfoot&gt;, &lt;col&gt;, &lt;colgroup&gt; </li>
-        <li>&lt;ol&gt;, &lt;ul&gt;, &lt;li&gt;</li>
-        <li>&lt;form&gt;, &lt;input&gt;, &lt;textarea&gt;, &lt;select&gt;, &lt;option&gt;</li>
-        <li>&lt;fieldset&gt;, &lt;legend&gt;</li>
-        <li>&lt;del&gt;, &lt;ins&gt;</li>
-        <li>&lt;draw&gt;, &lt;line&gt;, &lt;rect&gt;, &lt;circle&gt;, &lt;ellipse&gt;, &lt;polygone&gt;, &lt;polyline&gt;, &lt;path&gt;</li>
-    </ul>
-    <bookmark title="Balises spécifiques" level="2" ></bookmark>
-    <div class="note">
-        Les balises spécifiques suivantes ont été ajoutées :<br>
-    </div>
-    <br>
-    <ul class="main" >
-        <li>&lt;page&gt;</li>
-        <li>&lt;page_header&gt;</li>
-        <li>&lt;page_footer&gt;</li>
-        <li>&lt;end_last_page&gt;</li>
-        <li>&lt;nobreak&gt;</li>
-        <li>&lt;barcode&gt;</li>
-        <li>&lt;bookmark&gt;</li>
-        <li>&lt;qrcode&gt;</li>
-    </ul>
-</page>
-<page pageset="old">
-    <bookmark title="Styles CSS" level="1" ></bookmark>
-    <div class="note">
-        La liste des styles CSS utilisables est la suivante :<br>
-    </div>
-    <br>
-    <table style="width: 100%">
-        <tr style="vertical-align: top">
-            <td style="width: 50%">
-                <ul class="main">
-                    <li>color</li>
-                    <li>font-family</li>
-                    <li>font-weight</li>
-                    <li>font-style</li>
-                    <li>font-size</li>
-                    <li>text-decoration</li>
-                    <li>text-indent</li>
-                    <li>text-align</li>
-                    <li>text-transform</li>
-                    <li>vertical-align</li>
-                    <li>width</li>
-                    <li>height</li>
-                    <li>line-height</li>
-                    <li>padding</li>
-                    <li>padding-top</li>
-                    <li>padding-right</li>
-                    <li>padding-bottom</li>
-                    <li>padding-left</li>
-                    <li>margin</li>
-                    <li>margin-top</li>
-                    <li>margin-right</li>
-                    <li>margin-bottom</li>
-                    <li>margin-left</li>
-                    <li>position</li>
-                    <li>top</li>
-                    <li>bottom</li>
-                    <li>left</li>
-                    <li>right</li>
-                    <li>float</li>
-                    <li>rotate</li>
-                    <li>background</li>
-                    <li>background-color</li>
-                    <li>background-image</li>
-                    <li>background-position</li>
-                    <li>background-repeat</li>
-                </ul>
-            </td>
-            <td style="width: 50%">
-                <ul class="main">
-                    <li>border</li>
-                    <li>border-style</li>
-                    <li>border-color</li>
-                    <li>border-width</li>
-                    <li>border-collapse</li>
-                    <li>border-top</li>
-                    <li>border-top-style</li>
-                    <li>border-top-color</li>
-                    <li>border-top-width</li>
-                    <li>border-right</li>
-                    <li>border-right-style</li>
-                    <li>border-right-color</li>
-                    <li>border-right-width</li>
-                    <li>border-bottom</li>
-                    <li>border-bottom-style</li>
-                    <li>border-bottom-color</li>
-                    <li>border-bottom-width</li>
-                    <li>border-left</li>
-                    <li>border-left-style</li>
-                    <li>border-left-color</li>
-                    <li>border-left-width</li>
-                    <li>border-radius</li>
-                    <li>border-top-left-radius</li>
-                    <li>border-top-right-radius</li>
-                    <li>border-bottom-left-radius</li>
-                    <li>border-bottom-right-radius</li>
-                    <li>list-style</li>
-                    <li>list-style-type</li>
-                    <li>list-style-image</li>
-                </ul>
-            </td>
-        </tr>
-    </table>
-</page>
-<page pageset="old">
-    <bookmark title="Propriétés" level="1" ></bookmark>
-    <div class="note">
-        La liste des propriétés utilisables est la suivante :<br>
-    </div>
-    <br>
-    <table style="width: 100%">
-        <tr style="vertical-align: top">
-            <td style="width: 50%">
-                <ul class="main">
-                    <li>cellpadding</li>
-                    <li>cellspacing</li>
-                    <li>colspan</li>
-                    <li>rowspan</li>
-                    <li>width</li>
-                    <li>height</li>
-                </ul>
-            </td>
-            <td style="width: 50%">
-                <ul class="main">
-                    <li>align</li>
-                    <li>valign</li>
-                    <li>bgcolor</li>
-                    <li>bordercolor</li>
-                    <li>border</li>
-                    <li>type</li>
-                    <li>value</li>
-                </ul>
-            </td>
-        </tr>
-    </table>
-    <bookmark title="Limitations" level="0" ></bookmark>
-    <div class="note">
-        Cette librairie comporte des limitations :<br>
-    </div>
-    <br>
-    <ul class="main">
-        <li>Les float ne sont gérés que pour la balise IMG.</li>
-        <li>Elle ne permet généralement pas la conversion directe d'une page HTML en PDF, ni la conversion du résultat d'un WYSIWYG en PDF.</li>
-        <li>Cette librairie est là pour faciliter la génération de documents PDF, pas pour convertir n'importe quelle page HTML.</li>
-        <li>Les formulaires ne marchent pas avec tous les viewers PDFs...</li>
-        <li>Lisez bien la documentation : <a href="https://github.com/spipu/html2pdf/blob/master/doc/README.md">https://github.com/spipu/html2pdf/blob/master/doc/README.md</a>.</li>
-    </ul>
-</page>
\ No newline at end of file
diff --git a/html2pdf-master/examples/res/balloon.php b/html2pdf-master/examples/res/balloon.php
deleted file mode 100644
index 6ba81e0f..00000000
--- a/html2pdf-master/examples/res/balloon.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<style type="text/css">
-
-.balloon {
-    width: 75%;
-    position: relative;
-}
-
-.on-left {
-    margin-left: 0;
-}
-
-.on-right {
-    margin-left: 25%;
-}
-
-.balloon .balloon-content {
-    position: relative;
-    padding: 4mm;
-    padding: 4mm;
-    margin-left: 2.8mm;
-    margin-right: 2.8mm;
-    margin-bottom: 4mm;
-    border:  0.1mm solid grey;
-    border-top: none;
-    border-radius: 2mm;
-    text-align: left;
-    color:   black;
-}
-
-.balloon .balloon-corner {
-    width: 0;
-    height: 0;
-    border: none;
-    margin: 0;
-    padding: 0;
-    position: absolute;
-    top: 0;
-}
-
-.on-left .balloon-content {
-    background-color: #FEFEFE;
-    border-top-left-radius: 0;
-}
-
-.on-right .balloon-content {
-    background-color: #E2FECB;
-    border-top-right-radius: 0;
-}
-
-.on-left .balloon-corner {
-    border-top:  solid 3mm #FEFEFE;
-    border-left: solid 3mm transparent;
-    left: 0;
-}
-
-.on-right .balloon-corner {
-    border-top:   solid 3mm #E2FECB;
-    border-right: solid 3mm transparent;
-    right: 0;
-}
-
-.balloon .balloon-status {
-    color: grey;
-    position: absolute;
-    right: 2mm;
-    bottom: 2mm;
-    font-size: 80%
-}
-
-.balloon .balloon-status img {
-    width: 3mm;
-}
-
-</style>
-<page backcolor="#DDD">
-    <div class="balloon on-right">
-        <div class="balloon-content">
-            Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam lacinia lectus ut lobortis vestibulum. In id consectetur enim. Donec eu erat ut magna consectetur vestibulum ac malesuada turpis. Suspendisse turpis risus, feugiat id gravida eu, euismod id orci. Nunc egestas ut erat molestie rutrum. Morbi posuere posuere sapien sed mattis. Fusce dapibus nunc leo, viverra mollis massa varius non. Ut in maximus quam. Aliquam volutpat consectetur odio, sed viverra eros tincidunt non. Ut consequat mi maximus congue faucibus. Morbi id finibus nisi.
-            <div class="balloon-status">10:01 PM <img src="./res/check.png" alt="check" /></div>
-        </div>
-        <div class="balloon-corner"></div>
-    </div>
-    <div class="balloon on-left">
-        <div class="balloon-content">
-            Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam lacinia lectus ut lobortis vestibulum. In id consectetur enim. Donec eu erat ut magna consectetur vestibulum ac malesuada turpis. Suspendisse turpis risus, feugiat id gravida eu, euismod id orci. Nunc egestas ut erat molestie rutrum. Morbi posuere posuere sapien sed mattis. Fusce dapibus nunc leo, viverra mollis massa varius non. Ut in maximus quam. Aliquam volutpat consectetur odio, sed viverra eros tincidunt non. Ut consequat mi maximus congue faucibus. Morbi id finibus nisi.
-            <div class="balloon-status">10:02 PM <img src="./res/check.png" alt="check" /></div>
-        </div>
-        <div class="balloon-corner"></div>
-    </div>
-    <div class="balloon on-right">
-        <div class="balloon-content">
-            Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam lacinia lectus ut lobortis vestibulum.
-            <div class="balloon-status">10:03 PM</div>
-        </div>
-        <div class="balloon-corner"></div>
-    </div>
-    <div class="balloon on-left">
-        <div class="balloon-content">
-            Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam lacinia lectus ut lobortis vestibulum.
-            <div class="balloon-status">10:04 PM</div>
-        </div>
-        <div class="balloon-corner"></div>
-    </div>
-</page>
\ No newline at end of file
diff --git a/html2pdf-master/examples/res/bas_page.png b/html2pdf-master/examples/res/bas_page.png
deleted file mode 100644
index 16d532ff..00000000
Binary files a/html2pdf-master/examples/res/bas_page.png and /dev/null differ
diff --git a/html2pdf-master/examples/res/bookmark.php b/html2pdf-master/examples/res/bookmark.php
deleted file mode 100644
index d899365e..00000000
--- a/html2pdf-master/examples/res/bookmark.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<style type="text/css">
-<!--
-    table.page_header {width: 100%; border: none; background-color: #DDDDFF; border-bottom: solid 1mm #AAAADD; padding: 2mm }
-    table.page_footer {width: 100%; border: none; background-color: #DDDDFF; border-top: solid 1mm #AAAADD; padding: 2mm}
-    h1 {color: #000033}
-    h2 {color: #000055}
-    h3 {color: #000077}
-
-    div.niveau
-    {
-        padding-left: 5mm;
-    }
--->
-</style>
-<page backtop="14mm" backbottom="14mm" backleft="10mm" backright="10mm" style="font-size: 12pt">
-    <page_header>
-        <table class="page_header">
-            <tr>
-                <td style="width: 100%; text-align: left">
-                    Exemple d'utilisation des bookmarks
-                </td>
-            </tr>
-        </table>
-    </page_header>
-    <page_footer>
-        <table class="page_footer">
-            <tr>
-                <td style="width: 100%; text-align: right">
-                    page [[page_cu]]/[[page_nb]]
-                </td>
-            </tr>
-        </table>
-    </page_footer>
-    <bookmark title="Sommaire" level="0" ></bookmark>
-</page>
-<page pageset="old">
-    <bookmark title="Chapitre 1" level="0" ></bookmark><h1>Chapitre 1</h1>
-    <div class="niveau">
-        Contenu du chapitre 1
-    </div>
-</page>
-<page pageset="old">
-    <bookmark title="Chapitre 2" level="0" ></bookmark><h1>Chapitre 2</h1>
-    <div class="niveau">
-        intro au chapitre 2
-        <bookmark title="Chapitre 2.1" level="1" ></bookmark><h2>Chapitre 2.1</h2>
-        <div class="niveau">
-            Contenu du chapitre 2.1
-        </div>
-        <bookmark title="Chapitre 2.2" level="1" ></bookmark><h2>Chapitre 2.2</h2>
-        <div class="niveau">
-            Contenu du chapitre 2.2
-        </div>
-        <bookmark title="Chapitre 2.3" level="1" ></bookmark><h2>Chapitre 2.3</h2>
-        <div class="niveau">
-            Contenu du chapitre 2.3
-        </div>
-    </div>
-</page>
-<page pageset="old">
-    <bookmark title="Chapitre 3" level="0" ></bookmark><h1>Chapitre 3</h1>
-    <div class="niveau">
-        intro au chapitre 3
-        <bookmark title="Chapitre 3.1" level="1" ></bookmark><h2>Chapitre 3.1</h2>
-        <div class="niveau">
-            Contenu du chapitre 3.1
-        </div>
-        <bookmark title="Chapitre 3.2" level="1" ></bookmark><h2>Chapitre 3.2</h2>
-        <div class="niveau">
-            intro au chapitre 3.2
-            <bookmark title="Chapitre 3.2.1" level="2" ></bookmark><h3>Chapitre 3.2.1</h3>
-            <div class="niveau">
-                Contenu du chapitre 3.2.1
-            </div>
-            <bookmark title="Chapitre 3.2.2" level="2" ></bookmark><h3>Chapitre 3.2.2</h3>
-            <div class="niveau">
-                Contenu du chapitre 3.2.2
-            </div>
-        </div>
-    </div>
-</page>
diff --git a/html2pdf-master/examples/res/check.png b/html2pdf-master/examples/res/check.png
deleted file mode 100644
index ef02f7f5..00000000
Binary files a/html2pdf-master/examples/res/check.png and /dev/null differ
diff --git a/html2pdf-master/examples/res/example00.php b/html2pdf-master/examples/res/example00.php
deleted file mode 100644
index f826ffd4..00000000
--- a/html2pdf-master/examples/res/example00.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<style type="text/Css">
-<!--
-.test1
-{
-    border: solid 1px #FF0000;
-    background: #FFFFFF;
-    border-collapse: collapse;
-}
--->
-</style>
-<page style="font-size: 14px">
-    <span style="font-weight: bold; font-size: 18pt; color: #FF0000; font-family: Times">Bonjour, voici quelques exemples<br></span>
-    <br>
-    Retours à la ligne autorisés : &lt;br&gt;, &lt;br &gt;, &lt;br/&gt;, &lt;br /&gt; <br />
-    <br>
-    Barre horizontale &lt;hr&gt;<hr style="height: 4mm; background: #AA5500; border: solid 1mm #0055AA">
-    Exemple de lien : <a href="http://html2pdf.fr/" >le site Html2Pdf</a><br>
-    <br>
-    Image : <img src="./res/logo.gif" alt="Logo" width=150 /><br>
-    <br>
-    Alignement horizontal des DIVs et TABLEs<br />
-    <table style="text-align: center; border: solid 2px red; background: #FFEEEE;width: 40%" align="center"><tr><td style="width: 100%">Test 1</td></tr></table><br />
-    <table style="text-align: center; border: solid 2px red; background: #FFEEEE;width: 40%; margin: auto"><tr><td style="width: 100%">Test 2</td></tr></table><br />
-    <div style="text-align: center; border: solid 2px red; background: #FFEEEE;width: 40%; margin: auto">Test 3</div><br />
-    test de tableau imbriqué :<br>
-    <table border="1" bordercolor="#007" bgcolor="#AAAAAA" align="center">
-        <tr>
-            <td border="1">
-                <table style="border: solid 1px #FF0000; background: #FFFFFF; width: 100%; text-align: center">
-                    <tr>
-                        <th style="border: solid 1px #007700;width: 50%">C1 € «</th>
-                        <td style="border: solid 1px #007700;width: 50%">C2 € «</td>
-                    </tr>
-                    <tr>
-                        <td style="border: solid 1px #007700;width: 50%">D1 &euro; &laquo;</td>
-                        <th style="border: solid 1px #007700;width: 50%">D2 &euro; &laquo;</th>
-                    </tr>
-                </table>
-            </td>
-            <td border="1">A2</td>
-            <td border="1">AAAAAAAA</td>
-        </tr>
-        <tr>
-            <td border="1">B1</td>
-            <td border="1" rowspan="2">
-                <table class="test1">
-                    <tr>
-                        <td style="border: solid 2px #007700">E1</td>
-                        <td style="border: solid 2px #000077; padding: 2mm">
-                            <table style="border: solid 1px #445500">
-                                <tr>
-                                    <td>
-                                        <img src="./res/logo.gif" alt="Logo" width=100 />
-                                    </td>
-                                </tr>
-                            </table>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td style="border: solid 2px #770000">F1</td>
-                        <td style="border: solid 2px #007777">F2</td>
-                    </tr>
-                </table>
-            </td>
-            <td border="1"><barcode type="EAN13" value="45" style="width: 30mm; height: 6mm; font-size: 4mm"></barcode></td>
-        </tr>
-        <tr>
-            <td border="1"><barcode type="C39" value="Html2Pdf" label="none" style="width: 35mm; height: 8mm"></barcode></td>
-            <td border="1">A2</td>
-        </tr>
-    </table>
-    <br>
-    Exemple avec border et padding : <br>
-    <table style="border: solid 5mm #770000; padding: 5mm;" cellspacing="0" >
-        <tr>
-            <td style="border: solid 3mm #007700; padding: 2mm;"><img src="./res/off.png" alt="" style="width: 20mm"></td>
-        </tr>
-    </table>
-    <img src="./res/off.png" style="width: 10mm;"><img src="./res/off.png" style="width: 10mm;"><img src="./res/off.png" style="width: 10mm;"><img src="./res/off.png" style="width: 10mm;"><img src="./res/off.png" style="width: 10mm;"><br>
-    <br>
-    <table style="border: solid 1px #440000; width: 150px"  cellspacing="0"><tr><td style="width: 100%">Largeur : 150px</td></tr></table><br>
-    <table style="border: solid 1px #440000; width: 150pt"  cellspacing="0"><tr><td style="width: 100%">Largeur : 150pt</td></tr></table><br>
-    <table style="border: solid 1px #440000; width: 100mm"  cellspacing="0"><tr><td style="width: 100%">Largeur : 100mm</td></tr></table><br>
-    <table style="border: solid 1px #440000; width: 5in"    cellspacing="0"><tr><td style="width: 100%">Largeur : 5in</td></tr></table><br>
-    <table style="border: solid 1px #440000; width: 80%"    cellspacing="0"><tr><td style="width: 100%">Largeur : 80% </td></tr></table><br>
-</page>
\ No newline at end of file
diff --git a/html2pdf-master/examples/res/example01.php b/html2pdf-master/examples/res/example01.php
deleted file mode 100644
index 49cb76b4..00000000
--- a/html2pdf-master/examples/res/example01.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<style type="text/css">
-<!--
-table.morpion
-{
-    border:        dashed 1px #444444;
-}
-
-table.morpion td
-{
-    font-size:    15pt;
-    font-weight:  bold;
-    border:       solid 1px #000000;
-    padding:      1px;
-    text-align:   center;
-    width:        25px;
-}
-
-table.morpion td.j1 { color: #0A0; }
-table.morpion td.j2 { color: #A00; }
-
--->
-</style>
-<page style="font-size: 10pt">
-    <span style="font-weight: bold; font-size: 20pt; color: #F00">Bonjour, voici quelques exemples</span><br>
-    Bonjour, ceci est un test <b>de gras</b>, <i>d'italic</i>, <b><i>et des 2 ensembles</i></b>.<br>
-    <br>
-    <span style="background: red; color: white;">Ceci est un message important</span><br>
-    <br>
-    <small>Texte écrit avec small</small>, Texte écrit normalement, <big>Texte écrit avec big</big><br>
-    <span style="font-size: 20px">A<sub>test d'<b>indice</b></sub> et N<sup>test d'<b>exposant</b></sup>,
-        test<sub>test<sub>test</sub></sub>,
-        test<sup>test<sup>test</sup></sup>,
-        test<sub>test<sup>test</sup></sub>.
-    </span><br>
-    <br>
-    <table align="center" style="border-radius: 6mm; border-top: solid 3mm #000077; border-right: solid 2mm #007700; border-bottom: solid 1mm #770000;    border-left: solid 2mm #007777;    background: #DDDDAA;" ><tr><td style="width: 100mm; height: 20mm; text-align: center; ">Coucou ! ceci est un border solid avec un radius !!! </td></tr></table>
-    <br>
-    <table align="center" style="border-radius: 6mm; border: none; background: #DDDDAA;" ><tr><td style="width: 100mm; height: 20mm; text-align: center; ">Coucou ! ceci est un background avec un radius !!! </td></tr></table>
-    <br>
-    <table align="center" style="border: solid 1px #000000;"><tr><td style="border-top: solid 4mm #000077;  border-right: solid 3mm #007700;  border-bottom: solid 2mm #770000;  border-left: solid  1mm #007777; padding: 2mm 4mm 6mm 8mm; width: 100mm; background: #FFDDDD">Coucou ! ceci est un border solid</td></tr></table><br>
-    <table align="center" style="border: solid 1px #000000;"><tr><td style="border-top: dotted 4mm #000077; border-right: dotted 3mm #007700; border-bottom: dotted 2mm #770000; border-left: dotted 1mm #007777; padding: 2mm 4mm 6mm 8mm; width: 100mm; background: #FFDDDD">Coucou ! ceci est un border dotted</td></tr></table><br>
-    <table align="center" style="border: solid 1px #000000;"><tr><td style="border-top: dashed 4mm #000077; border-right: dashed 3mm #007700; border-bottom: dashed 2mm #770000; border-left: dashed 1mm #007777; padding: 2mm 4mm 6mm 8mm; width: 100mm; background: #FFDDDD">Coucou ! ceci est un border dashed</td></tr></table><br>
-    <table align="center" style="border: solid 1px #000000;"><tr><td style="border-top: double 4mm #000077; border-right: double 3mm #007700; border-bottom: double 2mm #770000; border-left: double 1mm #007777; padding: 2mm 4mm 6mm 8mm; width: 100mm; background: #FFDDDD">Coucou ! ceci est un border double</td></tr></table><br>
-<?php $back = 'background-image: url(./res/off.png); background-position: left top; background-repeat: repeat; '; ?>
-    <table style="background: #FFAAAA; color: #000022; border: 3px solid #555555;">
-        <tr>
-            <td style="width: 40mm; border: solid 1px #000000; <?php echo $back; ?>color: #003300">Case A1</td>
-            <td style="width: 50mm; border: solid 1px #000000; <?php echo $back; ?>font-weight: bold;">Case A2</td>
-            <td style="width: 60mm; border: solid 1px #000000; <?php echo $back; ?>font-size: 20px;">Case A3</td>
-        </tr>
-        <tr>
-            <td style="border: solid 1px #000000; text-align: left;   <?php echo $back; ?>vertical-align: top; ">Case B1</td>
-            <td style="border: solid 1px #000000; text-align: center; <?php echo $back; ?>vertical-align: middle; height: 20mm">Case B2<hr style="color: #22AA22">test de hr</td>
-            <td style="border: solid 1px #000000; text-align: right;  <?php echo $back; ?>vertical-align: bottom; border-radius: 3mm; ">Case B3</td>
-        </tr>
-    </table>
-    <br>
-    <table style="border: solid 2px #550000; background: #000022 url(./res/logo.png) center center no-repeat; color: #FFFFFF;">
-        <tr >
-            <td style="border: solid 1px #AAAAAA;">Case A1<BR>avec tests diverses</td>
-            <td style="border: solid 1px #AAAAAA;">Case A2</td>
-            <td style="border: solid 1px #AAAAAA;">Case A3 classic</td>
-        </tr>
-        <tr>
-            <td style="border: solid 1px #AAAAAA;">Case B1<br>toto</td>
-            <td style="border: solid 1px #AAAAAA;background: #FF0000">Case B2</td>
-            <td style="border: solid 1px #AAAAAA;">Case B3</td>
-        </tr>
-    </table>
-    <br>
-    <table class="morpion" cellspacing="5px">
-        <tr>
-            <td class="j1">X</td>
-            <td class="j2">O</td>
-            <td class="j1">X</td>
-        </tr>
-        <tr>
-            <td class="j2">O</td>
-            <td class="j1">X</td>
-            <td ></td>
-        </tr>
-        <tr>
-            <td class="j2">O</td>
-            <td></td>
-            <td class="j1">X</td>
-        </tr>
-    </table>
-    <br>
-    <table style="border: dotted 1mm #FFFFFF; background: #AAAAFF">
-        <tr>
-            <td style="width: 42mm; text-align: center;font-size: 5mm">
-                Ceci est un test
-            </td>
-        </tr>
-    </table>
-</page>
\ No newline at end of file
diff --git a/html2pdf-master/examples/res/example02.php b/html2pdf-master/examples/res/example02.php
deleted file mode 100644
index a7854bd9..00000000
--- a/html2pdf-master/examples/res/example02.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-$content = 'A Test overflow<br>A Test overflow<br>A Test overflow<br>
-<img src="./res/logo.gif" alt="logo" style="width: XXXmm"><br>
-B Test overflow<br>B Test overflow<br>B Test overflow<br>
-<img src="./res/logo.gif" alt="logo" style="width: XXXmm"><br>
-C Test overflow<br>C Test overflow<br>C Test overflow<br>';
-?>
-<style type="text/css">
-<!--
-div.zone
-{
-    border: solid 2mm #66AACC;
-    border-radius: 3mm;
-    padding: 1mm;
-    background-color: #FFEEEE;
-    color: #440000;
-}
-div.zone_over
-{
-    width: 30mm;
-    height: 35mm;
-    overflow: hidden;
-}
-
--->
-</style>
-<page style="font-size: 10pt">
-    <span style="font-size: 16pt ; font-weight: bold">Démonstration des images</span><br>
-    <br>
-    <b>Dans un tableau :</b><br>
-    <table style="width: 50%;border: solid 3px #5544DD" align="center">
-        <tr>
-            <td style="width: 30%; text-align: left; ">Text à gauche<br>avec retour à<br>la ligne</td>
-            <td style="width: 40%; text-align: center;"><img src="./res/logo.gif" alt="" ><br><i>légende</i></td>
-            <td style="width: 30%; text-align: right; ">Texte à droite</td>
-        </tr>
-    </table>
-    <br>
-    Texte <span style="text-decoration: underline">souligné</span>,
-    texte <span style="text-decoration: overline">surligné</span>,
-    texte <span style="text-decoration: line-through">barré</span>,
-    texte <span style="text-decoration: underline overline line-through">avec les trois</span>.<br>
-    <br>
-    <b>Dans un texte :</b><br>
-    texte à la suite d'une image, <img src="./res/logo.gif" alt="" style="height: 10mm">
-    texte à la suite d'une image, répétitif car besoin d'un retour à la ligne
-    texte à la suite d'une image, répétitif car besoin d'un retour à la ligne
-    texte à la suite d'une image, répétitif car besoin d'un retour à la ligne
-    texte à la suite d'une image, répétitif car besoin d'un retour à la ligne<br>
-    <br>
-    <br>
-    Test différentes tailles texte
-    <span style="font-size: 18pt;">Test Size</span>
-    <span style="font-size: 16pt;">Test Size</span>
-    <span style="font-size: 14pt;">Test Size</span>
-    <span style="font-size: 12pt;">Test Size</span>
-    Test différentes tailles texte, répétitif car besoin d'un retour à la ligne
-    Test différentes tailles texte, répétitif car besoin d'un retour à la ligne
-    Test différentes tailles texte, répétitif car besoin d'un retour à la ligne
-    Test différentes tailles texte, répétitif car besoin d'un retour à la ligne
-    <br>
-    <br>
-    <b>Exemple de couleur : </b><br>
-    <span style="color: RGB(255, 0, 0)">Texte de couleur</span><br>
-    <span style="color: RGB(0, 1.0, 0)">Texte de couleur</span><br>
-    <span style="color: RGB(0, 0, 100%)">Texte de couleur</span><br>
-    <span style="color: CMYK(255, 0, 0, 0)">Texte de couleur</span><br>
-    <span style="color: CMYK(0, 1.0, 0, 0)">Texte de couleur</span><br>
-    <span style="color: CMYK(0, 0, 100%, 0)">Texte de couleur</span><br>
-    <span style="color: CMYK(0, 0, 0, 255)">Texte de couleur</span><br>
-    <br>
-    <table>
-        <tr style="vertical-align: top">
-            <td>
-                <u>Exemple 0 :</u><br><br>
-                <div class="zone" ><?php echo str_replace('XXX', '40', $content); ?></div>
-                sans overflow
-            </td>
-            <td>
-                <u>Exemple 1 :</u><br><br>
-                <div class="zone zone_over" style="text-align: left; vertical-align: top; "><?php echo str_replace('XXX', '40', $content); ?></div>
-                hidden left top
-            </td>
-            <td>
-                <u>Exemple 2 :</u><br><br>
-                <div class="zone zone_over" style="text-align: center; vertical-align: middle;"><?php echo str_replace('XXX', '40', $content); ?></div>
-                hidden center middle
-            </td>
-            <td>
-                <u>Exemple 3 :</u><br><br>
-                <div class="zone zone_over" style="text-align: right; vertical-align: bottom;"><?php echo str_replace('XXX', '40', $content); ?></div>
-                hidden right bottom
-            </td>
-        </tr>
-        <tr style="vertical-align: top">
-            <td>
-                <u>Exemple 0 :</u><br><br>
-                <div class="zone" ><?php echo str_replace('XXX', '20', $content); ?></div>
-                sans overflow
-            </td>
-            <td>
-                <u>Exemple 1 :</u><br><br>
-                <div class="zone zone_over" style="text-align: left; vertical-align: top; "><?php echo str_replace('XXX', '20', $content); ?></div>
-                hidden left top
-            </td>
-            <td>
-                <u>Exemple 2 :</u><br><br>
-                <div class="zone zone_over" style="text-align: center; vertical-align: middle;"><?php echo str_replace('XXX', '20', $content); ?></div>
-                hidden center middle
-            </td>
-            <td>
-                <u>Exemple 3 :</u><br><br>
-                <div class="zone zone_over" style="text-align: right; vertical-align: bottom;"><?php echo str_replace('XXX', '20', $content); ?></div>
-                hidden right bottom
-            </td>
-        </tr>
-    </table>
-</page>
\ No newline at end of file
diff --git a/html2pdf-master/examples/res/example03.php b/html2pdf-master/examples/res/example03.php
deleted file mode 100644
index 0b272d52..00000000
--- a/html2pdf-master/examples/res/example03.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<page backtop="10mm" backbottom="10mm" backleft="20mm" backright="20mm">
-    <page_header>
-        <table style="width: 100%; border: solid 1px black;">
-            <tr>
-                <td style="text-align: left;    width: 33%">html2pdf</td>
-                <td style="text-align: center;    width: 34%">Test d'header</td>
-                <td style="text-align: right;    width: 33%"><?php echo date('d/m/Y'); ?></td>
-            </tr>
-        </table>
-    </page_header>
-    <page_footer>
-        <table style="width: 100%; border: solid 1px black;">
-            <tr>
-                <td style="text-align: left;    width: 50%">html2pdf.fr</td>
-                <td style="text-align: right;    width: 50%">page [[page_cu]]/[[page_nb]]</td>
-            </tr>
-        </table>
-    </page_footer>
-    <span style="font-size: 20px; font-weight: bold">Démonstration des retour à la ligne automatique, ainsi que des sauts de page automatique</span><br>
-    <br>
-    <br>
-    <table style="width: 80%;border: solid 1px #5544DD; border-collapse: collapse" align="center">
-        <thead>
-            <tr>
-                <th style="width: 30%; text-align: left; border: solid 1px #337722; background: #CCFFCC">Header 1</th>
-                <th style="width: 30%; text-align: left; border: solid 1px #337722; background: #CCFFCC">Header 2</th>
-            </tr>
-        </thead>
-        <tbody>
-<?php
-for ($k=0; $k<13; $k++) {
-?>
-        <tr>
-            <td style="width: 30%; text-align: left; border: solid 1px #55DD44">
-                test de texte assez long pour engendrer des retours à la ligne automatique...
-                a b c d e f g h i j k l m n o p q r s t u v w x y z
-                a b c d e f g h i j k l m n o p q r s t u v w x y z
-            </td>
-            <td style="width: 70%; text-align: left; border: solid 1px #55DD44">
-                test de texte assez long pour engendrer des retours à la ligne automatique...
-                a b c d e f g h i j k l m n o p q r s t u v w x y z
-                a b c d e f g h i j k l m n o p q r s t u v w x y z
-
-            </td>
-        </tr>
-<?php
-}
-?>
-        </tbody>
-        <tfoot>
-            <tr>
-                <th style="width: 30%; text-align: left; border: solid 1px #337722; background: #CCFFCC">Footer 1</th>
-                <th style="width: 30%; text-align: left; border: solid 1px #337722; background: #CCFFCC">Footer 2</th>
-            </tr>
-        </tfoot>
-    </table>
-    <br>
-    Ca marche !!!<br>
-    refaisons un test : <br>
-    <table style="width: 80%;border: solid 1px #5544DD">
-<?php
-for ($k=0; $k<12; $k++) {
-?>
-    <tr>
-        <td style="width: 30%; text-align: left; border: solid 1px #55DD44">
-            test de texte assez long pour engendrer des retours à la ligne automatique...
-            a b c d e f g h i j k l m n o p q r s t u v w x y z
-            a b c d e f g h i j k l m n o p q r s t u v w x y z
-        </td>
-        <td style="width: 70%; text-align: left; border: solid 1px #55DD44">
-            test de texte assez long pour engendrer des retours à la ligne automatique...
-            a b c d e f g h i j k l m n o p q r s t u v w x y z
-            a b c d e f g h i j k l m n o p q r s t u v w x y z
-
-        </td>
-    </tr>
-<?php
-}
-?>
-    </table>
-    <br>
-    Ca marche toujours !<br>
-    De plus, vous pouvez faire des sauts de page manuellement en utilisant les balises &lt;page&gt; &lt;/page&gt;, comme ici par exemple :
-</page>
-<page pageset="old">
-    Nouvelle page !!!!
-</page>
\ No newline at end of file
diff --git a/html2pdf-master/examples/res/example04.php b/html2pdf-master/examples/res/example04.php
deleted file mode 100644
index 1a0e4a56..00000000
--- a/html2pdf-master/examples/res/example04.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<style type="text/css">
-<!--
-div.special { margin: auto; width:95%; border:1px solid #000000; padding: 2px; }
-div.special table { width:100%; border:1px solid #000000; font-size:10px; border-collapse:collapse; }
-.topLeftRight     { border-top:1px solid #000; border-left:1px solid #000; border-right:1px solid #000;}
-.topLeftBottom    { border-top:1px solid #000; border-left:1px solid #000; border-bottom:1px solid #000; }
-.topLeft          { border-top:1px solid #000; border-left:1px solid #000; }
-.bottomLeft       { border-bottom:1px solid #000; border-left:1px solid #000; }
-.topRight         { border-top:1px solid #000; border-right:1px solid #000; }
-.bottomRight      { border-bottom:1px solid #000; border-right:1px solid #000; }
-.topRightBottom   { border-top:1px solid #000; border-bottom:1px solid #000; border-right:1px solid #000; }
--->
-</style>
-<page style="font-size: 16px" >
-    Vous pouvez choisir le format et l'orientation de votre document, en utilisant ceci :<br>
-    <br>
-    &lt;page orientation="portrait" format="A5" &gt; <i>A5 en portrait</i> &lt;/page&gt; <br>
-    <br>
-    &lt;page orientation="paysage" format="100x200" &gt; <i>100mm x 200mm en paysage</i> &lt;/page&gt;<br>
-    <br>
-    En voici un petit exemple !
-</page>
-<page orientation="paysage" style="font-size: 18px">
-    Ceci est une page en paysage<br>
-    <table style="width: 100%; border: solid 1px #FFFFFF;">
-        <tr>
-            <td style="width: 30%; border: solid 1px #FF0000;">AAA</td>
-            <td style="width: 40%; border: solid 1px #00FF00;">BBB</td>
-            <td style="width: 30%; border: solid 1px #0000FF;">CCC</td>
-        </tr>
-        <tr>
-            <td style="width: 30%; border: solid 1px #FF0000;">AAA</td>
-            <td style="width: 40%; border: solid 1px #00FF00;">BBB</td>
-            <td style="width: 30%; border: solid 1px #0000FF;">CCC</td>
-        </tr>
-        <tr>
-            <td style="width: 30%; border: solid 1px #FF0000;">AAA</td>
-            <td style="width: 40%; border: solid 1px #00FF00;">BBB</td>
-            <td style="width: 30%; border: solid 1px #0000FF;">CCC</td>
-        </tr>
-    </table>
-    <div style="width: 70%; border: solid 1mm #770000; margin: 1mm; padding: 2mm; font-size: 4mm; line-height: normal; text-align: justify">
-        <img src="./res/logo.gif" alt="logo html2pdf" style="float: left; width: 60mm; margin: 2mm;">
-        Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed elementum, nibh eu ultricies scelerisque, est lorem dignissim elit, quis tempus tortor eros non ipsum. Mauris convallis augue ac sapien. In scelerisque dignissim elit. Donec consequat semper lectus. Sed in quam. Nunc molestie hendrerit ipsum. Curabitur elit risus, rhoncus ut, mattis a, convallis eu, neque. Morbi luctus est sit amet nunc. In nisl. Donec magna libero, aliquet eu, vestibulum ut, mollis sed, felis.
-        Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed elementum, nibh eu ultricies scelerisque, est lorem dignissim elit, quis tempus tortor eros non ipsum. Mauris convallis augue ac sapien. In scelerisque dignissim elit. Donec consequat semper lectus. Sed in quam. Nunc molestie hendrerit ipsum. Curabitur elit risus, rhoncus ut, mattis a, convallis eu, neque. Morbi luctus est sit amet nunc. In nisl. Donec magna libero, aliquet eu, vestibulum ut, mollis sed, felis.
-    </div>
-    <div style="width: 70%; border: solid 1mm #770000; margin: 1mm; padding: 2mm; font-size: 4mm; line-height: 150%;text-align: right;">
-        <img src="./res/logo.gif" alt="logo html2pdf" style="float: right; width: 60mm; margin: 2mm; ">
-        Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed elementum, nibh eu ultricies scelerisque, est lorem dignissim elit, quis tempus tortor eros non ipsum. Mauris convallis augue ac sapien. In scelerisque dignissim elit. Donec consequat semper lectus. Sed in quam. Nunc molestie hendrerit ipsum. Curabitur elit risus, rhoncus ut, mattis a, convallis eu, neque. Morbi luctus est sit amet nunc. In nisl. Donec magna libero, aliquet eu, vestibulum ut, mollis sed, felis.
-    </div>
-    <fieldset style="width: 70%; border: solid 1mm #770000; margin: 1mm; padding: 2mm; padding-top: 0mm; font-size: 4mm; line-height: normal; background: #FFFFFF;">
-        <legend style=" background: #FFFFFF; padding: 1; border: solid 1px #440000;">Ceci est un exemple de fieldset</legend>
-        <img src="./res/logo.gif" alt="logo html2pdf" style="float: left; width: 60mm; margin: 2mm; ">
-        Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed elementum, nibh eu ultricies scelerisque, est lorem dignissim elit, quis tempus tortor eros non ipsum. Mauris convallis augue ac sapien. In scelerisque dignissim elit. Donec consequat semper lectus. Sed in quam. Nunc molestie hendrerit ipsum. Curabitur elit risus, rhoncus ut, mattis a, convallis eu, neque. Morbi luctus est sit amet nunc. In nisl. Donec magna libero, aliquet eu, vestibulum ut, mollis sed, felis.
-        Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed elementum, nibh eu ultricies scelerisque, est lorem dignissim elit, quis tempus tortor eros non ipsum. Mauris convallis augue ac sapien. In scelerisque dignissim elit. Donec consequat semper lectus. Sed in quam. Nunc molestie hendrerit ipsum. Curabitur elit risus, rhoncus ut, mattis a, convallis eu, neque. Morbi luctus est sit amet nunc. In nisl. Donec magna libero, aliquet eu, vestibulum ut, mollis sed, felis.
-    </fieldset>
-</page>
-<page orientation="portrait" format="150x200" style="font-size: 18px">
-    Ceci est une page en portrait de 150mm x 200mm<br>
-    <table style="width: 100%; border: solid 1px #FFFFFF;">
-        <tr>
-            <td style="width: 30%; border: solid 1px #FF0000;">AAA</td>
-            <td style="width: 40%; border: solid 1px #00FF00;">BBB</td>
-            <td style="width: 30%; border: solid 1px #0000FF;">CCC</td>
-        </tr>
-        <tr>
-            <td style="width: 30%; border: solid 1px #FF0000;">AAA</td>
-            <td style="width: 40%; border: solid 1px #00FF00;">BBB</td>
-            <td style="width: 30%; border: solid 1px #0000FF;">CCC</td>
-        </tr>
-        <tr>
-            <td style="width: 30%; border: solid 1px #FF0000;">AAA</td>
-            <td style="width: 40%; border: solid 1px #00FF00;">BBB</td>
-            <td style="width: 30%; border: solid 1px #0000FF;">CCC</td>
-        </tr>
-    </table>
-    <br>
-    <div class="special">
-        <table>
-            <tr>
-                <td colspan="2" class="topLeftRight" style="width: 100%; text-align:left;border-bottom:1px dashed #000000">blabla blabla</td>
-            </tr>
-            <tr>
-                <td class="bottomLeft" style="width:70%;border-right:1px dashed #000000;text-align:left;">blabla blabla</td>
-                <td class="bottomRight" style="width: 30%; text-align:left;vertical-align:top;">Date :<br /> Signature :</td>
-            </tr>
-        </table>
-    </div>
-</page>
\ No newline at end of file
diff --git a/html2pdf-master/examples/res/example05.php b/html2pdf-master/examples/res/example05.php
deleted file mode 100644
index 872b953c..00000000
--- a/html2pdf-master/examples/res/example05.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<style type="text/css">
-<!--
-table
-{
-    width:  100%;
-    border: solid 1px #5544DD;
-}
-
-th
-{
-    text-align: center;
-    border: solid 1px #113300;
-    background: #EEFFEE;
-}
-
-td
-{
-    text-align: left;
-    border: solid 1px #55DD44;
-}
-
-td.col1
-{
-    border: solid 1px red;
-    text-align: right;
-}
-
-end_last_page div
-{
-    border: solid 1mm red;
-    height: 27mm;
-    margin: 0;
-    padding: 0;
-    text-align: center;
-    font-weight: bold;
-}
--->
-</style>
-<span style="font-size: 20px; font-weight: bold">Démonstration des retour à la ligne automatique, ainsi que des sauts de page automatique<br></span>
-<br>
-<br>
-<table>
-    <colgroup>
-        <col style="width: 5%" class="col1">
-        <col style="width: 25%">
-        <col style="width: 30%">
-        <col style="width: 40%">
-    </colgroup>
-    <thead>
-        <tr>
-            <th rowspan="2">n°</th>
-            <th colspan="3" style="font-size: 16px;">
-                Titre du tableau
-            </th>
-        </tr>
-        <tr>
-            <th>Colonne 1</th>
-            <th>Colonne 2</th>
-            <th>Colonne 3</th>
-        </tr>
-    </thead>
-<?php
-for ($k=0; $k<50; $k++) {
-?>
-<tr>
-    <td><?php echo $k; ?></td>
-    <td>test de texte assez long pour engendrer des retours à la ligne automatique...</td>
-    <td>test de texte assez long pour engendrer des retours à la ligne automatique...</td>
-    <td>test de texte assez long pour engendrer des retours à la ligne automatique...</td>
-</tr>
-<?php
-}
-?>
-    <tfoot>
-        <tr>
-            <th colspan="4" style="font-size: 16px;">
-                bas du tableau
-            </th>
-        </tr>
-    </tfoot>
-</table>
-Cool non ?<br>
-<end_last_page end_height="30mm">
-    <div>
-        Ceci est un test de fin de page
-    </div>
-</end_last_page>
\ No newline at end of file
diff --git a/html2pdf-master/examples/res/example06.css b/html2pdf-master/examples/res/example06.css
deleted file mode 100644
index 7825066f..00000000
--- a/html2pdf-master/examples/res/example06.css
+++ /dev/null
@@ -1,12 +0,0 @@
-.titre
-{
-    text-decoration: underline;
-}
-
-*    {color: #FF0000; }
-H1   {color: #AA0055; }
-H2   {color: #990066; }
-H3   {color: #880077; }
-H4   {color: #770088; }
-H5   {color: #660099; }
-H6   {color: #5500AA; }
\ No newline at end of file
diff --git a/html2pdf-master/examples/res/example06.php b/html2pdf-master/examples/res/example06.php
deleted file mode 100644
index cb9899ec..00000000
--- a/html2pdf-master/examples/res/example06.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<link type="text/css" href="./res/example06.css" rel="stylesheet" />
-<style type="text/css">
-<!--
-/* commentaire dans un css */
-table, td { border: solid 1px #000000; color: #0000AA; }
-td.col1   { color: #00AA00; }
-
-/* autre commentaire */
-table.liste         { border: solid 2px #FF0000; }
-table.liste td      { background: #DDDDDD; }
-table.liste td.col1 { color: #FF0000; }
--->
-</style>
-<page>
-    <table>
-        <tr>
-            <td>Ceci est un</td>
-            <td class="col1">test de style</td>
-        </tr>
-    </table>
-    <br>
-    <table class="liste">
-        <tr>
-            <td>Ceci est un</td>
-            <td class="col1">test de style</td>
-        </tr>
-    </table>
-    <br>
-    <H1>Essai de titre en H1</H1>
-    <H2>Essai de titre en H2</H2>
-    <H3>Essai de titre en H3</H3>
-    <H4>Essai de titre en H4</H4>
-    <H5>Essai de titre en H5</H5>
-    <H6>Essai de titre en H6</H6>
-    <H6 class="titre">Essai de titre en H6</H6>
-    <H5 class="titre">Essai de titre en H5</H5>
-    <H4 class="titre">Essai de titre en H4</H4>
-    <H3 class="titre">Essai de titre en H3</H3>
-    <H2 class="titre">Essai de titre en H2</H2>
-    <H1 class="titre">Essai de titre en H1</H1>
-    <br>
-    <s>Texte barré !</s><br>
-    <br>
-    <span>Texte avec la couleur par défault (style *)</span><br>
-</page>
\ No newline at end of file
diff --git a/html2pdf-master/examples/res/example07a.php b/html2pdf-master/examples/res/example07a.php
deleted file mode 100644
index 37188dec..00000000
--- a/html2pdf-master/examples/res/example07a.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<style type="text/css">
-<!--
-table { vertical-align: top; }
-tr    { vertical-align: top; }
-td    { vertical-align: top; }
--->
-</style>
-<page backcolor="#FEFEFE" backimg="./res/bas_page.png" backimgx="center" backimgy="bottom" backimgw="100%" backtop="0" backbottom="30mm" footer="date;time;page" style="font-size: 12pt">
-    <bookmark title="Lettre" level="0" ></bookmark>
-    <table cellspacing="0" style="width: 100%; text-align: center; font-size: 14px">
-        <tr>
-            <td style="width: 75%;">
-            </td>
-            <td style="width: 25%; color: #444444;">
-                <img style="width: 100%;" src="./res/logo.gif" alt="Logo"><br>
-                RELATION CLIENT
-            </td>
-        </tr>
-    </table>
-    <br>
-    <br>
-    <table cellspacing="0" style="width: 100%; text-align: left; font-size: 11pt;">
-        <tr>
-            <td style="width:50%;"></td>
-            <td style="width:14%; ">Client :</td>
-            <td style="width:36%">M. Albert Dupont</td>
-        </tr>
-        <tr>
-            <td style="width:50%;"></td>
-            <td style="width:14%; ">Adresse :</td>
-            <td style="width:36%">
-                Résidence perdue<br>
-                1, rue sans nom<br>
-                00 000 - Pas de Ville<br>
-            </td>
-        </tr>
-        <tr>
-            <td style="width:50%;"></td>
-            <td style="width:14%; ">Email :</td>
-            <td style="width:36%">nomail@domain.com</td>
-        </tr>
-        <tr>
-            <td style="width:50%;"></td>
-            <td style="width:14%; ">Tel :</td>
-            <td style="width:36%">33 (0) 1 00 00 00 00</td>
-        </tr>
-    </table>
-    <br>
-    <br>
-    <table cellspacing="0" style="width: 100%; text-align: left;font-size: 10pt">
-        <tr>
-            <td style="width:50%;"></td>
-            <td style="width:50%; ">Spipu Ville, le <?php echo date('d/m/Y'); ?></td>
-        </tr>
-    </table>
-    <br>
-    <i>
-        <b><u>Objet </u>: &laquo; Bon de Retour &raquo;</b><br>
-        Compte client : 00C4520100A<br>
-        Référence du Dossier : 71326<br>
-    </i>
-    <br>
-    <br>
-    Madame, Monsieur, Cher Client,<br>
-    <br>
-    <br>
-    Nous souhaitons vous informer que le dossier <b>71326</b> concernant un &laquo; Bon de Retour &raquo; pour les articles suivants a été accepté.<br>
-    <br>
-    <table cellspacing="0" style="width: 100%; border: solid 1px black; background: #F7F7F7; font-size: 10pt;">
-        <colgroup>
-            <col style="width: 12%; text-align: left">
-            <col style="width: 52%; text-align: left">
-            <col style="width: 13%; text-align: right">
-            <col style="width: 10%; text-align: center">
-            <col style="width: 13%; text-align: right">
-        </colgroup>
-        <thead>
-            <tr style="background: #E7E7E7;">
-                <th style="border-bottom: solid 1px black;">Produit</th>
-                <th style="border-bottom: solid 1px black;">Désignation</th>
-                <th style="border-bottom: solid 1px black;">Prix Unitaire</th>
-                <th style="border-bottom: solid 1px black;">Quantité</th>
-                <th style="border-bottom: solid 1px black;">Prix Net</th>
-            </tr>
-        </thead>
-        <tbody>
-<?php
-    $nb = rand(5, 11);
-    $produits = array();
-    $total = 0;
-    for ($k=0; $k<$nb; $k++) {
-        $num = rand(100000, 999999);
-        $nom = "le produit n°".rand(1, 100);
-        $qua = rand(1, 20);
-        $prix = rand(100, 9999)/100.;
-        $total+= $prix*$qua;
-        $produits[] = array($num, $nom, $qua, $prix, rand(0, $qua));
-?>
-            <tr>
-                <td><?php echo $num; ?></td>
-                <td><?php echo $nom; ?></td>
-                <td><?php echo number_format($prix, 2, ',', ' '); ?> &euro;</td>
-                <td><?php echo $qua; ?></td>
-                <td><?php echo number_format($prix*$qua, 2, ',', ' '); ?> &euro;</td>
-            </tr>
-<?php
-    }
-?>
-            <tr style="background: #E7E7E7;">
-                <th colspan="4" style="border-top: solid 1px black; text-align: right;">Total : </th>
-                <th style="border-top: solid 1px black;"><?php echo number_format($total, 2, ',', ' '); ?> &euro;</th>
-            </tr>
-        </tbody>
-    </table>
-    <br>
-    Cette reprise concerne la quantité et les matériels dont la référence figure sur le <a href="#document_reprise">document de reprise joint</a>.<br>
-    Nous vous demandons de nous retourner ces produits en parfait état et dans leur emballage d'origine.<br>
-    <br>
-    Nous vous demandons également de coller impérativement l'autorisation de reprise jointe, sur le colis à reprendre afin de faciliter le traitement à l'entrepôt.<br>
-    <br>
-    Notre Service Clients ne manquera pas de revenir vers vous dès que l'avoir de ces matériels sera établi.<br>
-    <nobreak>
-        <br>
-        Dans cette attente, nous vous prions de recevoir, Madame, Monsieur, Cher Client, nos meilleures salutations.<br>
-        <br>
-        <table cellspacing="0" style="width: 100%; text-align: left;">
-            <tr>
-                <td style="width:50%;"></td>
-                <td style="width:50%; ">
-                    Mle Jesuis CELIBATAIRE<br>
-                    Service Relation Client<br>
-                    Tel : 33 (0) 1 00 00 00 00<br>
-                    Email : on_va@chez.moi<br>
-                </td>
-            </tr>
-        </table>
-    </nobreak>
-</page>
\ No newline at end of file
diff --git a/html2pdf-master/examples/res/example07b.php b/html2pdf-master/examples/res/example07b.php
deleted file mode 100644
index d660ca6c..00000000
--- a/html2pdf-master/examples/res/example07b.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<page orientation="paysage" >
-    <bookmark title="Document" level="0" ></bookmark>
-    <a name="document_reprise"></a>
-    <table cellspacing="0" style="width: 100%;">
-        <tr>
-            <td style="width: 10%;">
-                <img style="width: 100%" src="./res/logo.gif" alt="Logo Html2Pdf" >
-            </td>
-            <td style="width: 80%; text-align: center; text-decoration: underline; font-weight: bold; font-size: 20pt;">
-                <span style="font-size: 10pt"><br></span>
-                ACCORD DE RETOUR
-            </td>
-            <td style="width: 10%;">
-            </td>
-        </tr>
-    </table>
-    <table cellspacing="0" style="width: 100%;">
-        <tr>
-            <td style="width: 55% ">
-                <table cellspacing="0" style="width: 100%; border: solid 2px #000000; ">
-                    <tr>
-                        <td style="width: 100%; font-size: 12pt;">
-                            <span style="font-size: 15pt; font-weight: bold;">ADRESSE DE RETOUR<br></span>
-                            <br>
-                            <b>Entrepot des Bois</b><br>
-                            sur une grande route<br>
-                            00000 - Spipu Ville<br>
-                            <br>
-                            Date : <?php echo date('d/m/Y'); ?><br>
-                            Dossier suivi par <b>Mle Jesuis CELIBATAIRE</b><br>
-                            Tel : 33 (0) 1 00 00 00 00<br>
-                            Email : on_va@chez.moi<br>
-                        </td>
-                    </tr>
-                </table>
-                <br>&nbsp;
-            </td>
-            <td style="width: 4%"></td>
-            <td style="width: 37% ">
-                <table cellspacing="0" style="width: 100%; border: solid 2px #000000; font-size: 12pt;">
-                    <tr><td style="width: 40%;">Référence :        </td><td style="width: 60%;">71326</td></tr>
-                    <tr><td style="width: 40%;">Client :        </td><td style="width: 60%;">M. Albert Dupont</td></tr>
-                    <tr><td style="width: 40%;">Adresse :        </td><td style="width: 60%;">Résidence perdue<br>1, rue sans nom<br>00 000 - Pas de Ville</td></tr>
-                    <tr><td style="width: 40%;">TEL :             </td><td style="width: 60%;">33 (0) 1 00 00 00 00</td></tr>
-                    <tr><td style="width: 40%;">FAX :            </td><td style="width: 60%;">33 (0) 1 00 00 00 01</td></tr>
-                    <tr><td style="width: 40%;">Code Client    :    </td><td style="width: 60%;">00C4520100A</td></tr>
-                </table>
-                <table cellspacing="0" style="width: 100%; border: solid 2px #000000">
-                    <tr>
-                        <th style="width: 40%;">Motif de la Reprise</th>
-                        <td style="width: 60%;">Produit non Conforme</td>
-                    </tr>
-                </table>
-                <br>
-            </td>
-            <td style="width: 4%"></td>
-        </tr>
-        <tr>
-            <td style="width:55%;">
-                <table cellspacing="0" style="padding: 1px; width: 100%; border: solid 2px #000000; font-size: 11pt; ">
-                    <tr>
-                        <th style="width: 100%; text-align: center; border: solid 1px #000000;" colspan="4">
-                            Partie réservée à Spipu Corp
-                        </th>
-                    </tr>
-                    <tr>
-                        <th style="width: 100%; text-align: center; border: solid 1px #000000;" colspan="4">
-                            QUANTITE PREVUE AU CHARGEMENT
-                        </th>
-                    </tr>
-                    <tr>
-                        <th style="width: 15%; border: solid 1px #000000;">Produit</th>
-                        <th style="width: 55%; border: solid 1px #000000;">Designation</th>
-                        <th style="width: 15%; border: solid 1px #000000;">Neuf</th>
-                        <th style="width: 15%; border: solid 1px #000000;">Abîmé</th>
-                    </tr>
-<?php
-$i=0;
-foreach ($produits as $produit) {
-    $i++;
-?>
-                    <tr>
-                        <td style="width: 15%; border: solid 1px #000000;"><?php echo $produit[0];        ?></td>
-                        <td style="width: 55%; border: solid 1px #000000;text-align: left;"><?php echo $produit[1];        ?></td>
-                        <td style="width: 15%; border: solid 1px #000000;"><?php echo $produit[4];        ?></td>
-                        <td style="width: 15%; border: solid 1px #000000;"><?php echo $produit[2]-$produit[4];        ?></td>
-                    </tr>
-
-<?php
-}
-for ($i; $i<12; $i++) {
-?>
-                    <tr>
-                        <td style="width: 15%; border: solid 1px #000000;">&nbsp;</td>
-                        <td style="width: 55%; border: solid 1px #000000;">&nbsp;</td>
-                        <td style="width: 15%; border: solid 1px #000000;">&nbsp;</td>
-                        <td style="width: 15%; border: solid 1px #000000;">&nbsp;</td>
-                    </tr>
-<?php
-}
-?>
-                </table>
-                <br>
-                <table cellspacing="0" style="width: 100%; text-align: left; font-size: 8pt">
-                    <tr>
-                        <td style="width: 100%">
-                            <b><u>Conditions des Retours</u></b><br>
-                            1 - il faut des conditions<br>
-                            2 - encore des conditions<br>
-                            3 - toujours des conditions<br>
-                        </td>
-                    </tr>
-                </table>
-                <br>
-                <table cellspacing="0" style="width: 100%; border: solid 2px #000000; text-align: center; font-size: 10pt">
-                    <tr>
-                        <td style="width: 30%"></td>
-                        <td style="width: 40%">ACCORD SOCIETE</td>
-                        <td style="width: 30%"></td>
-                    </tr>
-                    <tr>
-                        <td style="width: 30%"><br><br>M. XX</td>
-                        <td style="width: 40%"></td>
-                        <td style="width: 30%"><br><br>Mme XY</td>
-                    </tr>
-                </table>
-            </td>
-            <td style="width: 4%"></td>
-            <td style="width: 37%;">
-                <table cellspacing="0" style="padding: 1px; width: 100%; border: solid 2px #000000; font-size: 11pt; ">
-                    <tr>
-                        <th style="width: 100%; text-align: center; border: solid 1px #000000;" colspan="2">
-                            Partie réservée à l'entrepôt
-                        </th>
-                    </tr>
-                    <tr>
-                        <th style="width: 100%; text-align: center; border: solid 1px #000000;" colspan="2">
-                            QUANTITE PREVUE AU CHARGEMENT
-                        </th>
-                    </tr>
-                    <tr>
-                        <th style="width: 50%; border: solid 1px #000000;">Produit neuf                </th>
-                        <th style="width: 50%; border: solid 1px #000000;">Produit à reconditionner    </th>
-                    </tr>
-<?php
-for ($i=0; $i<12; $i++) {
-?>
-                <tr>
-                    <td style="width: 50%; border: solid 1px #000000;">&nbsp;</td>
-                    <td style="width: 50%; border: solid 1px #000000;">&nbsp;</td>
-                </tr>
-<?php
-}
-?>
-                </table>
-                <br>
-                <table cellspacing="0" style="width: 100%; border: solid 2px #000000; text-align: left; font-size: 10pt">
-                    <tr>
-                        <th style="width: 30%;">
-                            Commentaire<br>
-                            Retour :<br>
-                            &nbsp;<br>
-                            &nbsp;<br>
-                        </th>
-                        <td style="width: 70%;">
-                        </td>
-                    </tr>
-                </table>
-                <br>
-                <br>
-                <span style="font-size: 13pt"><b><u>A COLLER IMPERATIVEMENT SUR LES COLIS</u></b></span>
-            </td>
-            <td style="width: 4%"></td>
-        </tr>
-    </table>
-</page>
\ No newline at end of file
diff --git a/html2pdf-master/examples/res/example08.php b/html2pdf-master/examples/res/example08.php
deleted file mode 100644
index bffd99a1..00000000
--- a/html2pdf-master/examples/res/example08.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<style type="text/css">
-<!--
-table
-{
-    padding: 0;
-    border: solid 1mm LawnGreen;
-    font-size: 12pt;
-    background: #FFFFFF;
-    text-align: center;
-    vertical-align: middle;
-}
-
-td
-{
-    padding: 1mm;
-    border: solid 1mm black;
-}
-
-td.div
-{
-    width: 110px;
-    height: 110px;
-    text-align: left;
-    padding: 0
-}
-
-td.div div
-{
-    margin: auto;
-    background: yellow;
-    border: solid 2px blue;
-    color: red;
-    width: 100px;
-    height: 65px;
-    text-align: center;
-}
-
--->
-</style>
-<page backcolor="#AACCFF" backleft="5mm" backright="5mm" backtop="10mm" backbottom="10mm" >
-    <table>
-        <tr>
-            <td class="div"><div style="rotate: 0;">Hello ! ceci <b>est</b> un test !<br><img src="./res/logo.png" style="width: 80px;" alt="logo"></div></td>
-            <td class="div"><div style="rotate: 270;">Hello ! ceci <b>est</b> un test !<br><img src="./res/logo.png" style="width: 80px;" alt="logo"></div></td>
-        </tr>
-        <tr>
-            <td class="div"><div style="rotate: 90;">Hello ! ceci <b>est</b> un test !<br><img src="./res/logo.png" style="width: 80px;" alt="logo"></div></td>
-            <td class="div"><div style="rotate: 180;">Hello ! ceci <b>est</b> un test !<br><img src="./res/logo.png" style="width: 80px;" alt="logo"></div></td>
-        </tr>
-    </table>
-    <br>
-    <table cellspacing="4">
-        <tr>
-            <td>a A1</td>
-            <td>aa A2</td>
-            <td>aaa A3</td>
-            <td>aaaa A4</td>
-        </tr>
-        <tr>
-            <td rowspan="2">B1</td>
-            <td style="font-size: 16pt">B2</td>
-            <td colspan="2">B3</td>
-        </tr>
-        <tr>
-            <td>C1</td>
-            <td>C2</td>
-            <td>C3</td>
-        </tr>
-        <tr>
-            <td colspan="2">D1</td>
-            <td colspan="2">D2</td>
-        </tr>
-    </table>
-    <hr>
-    <table>
-        <tr>
-            <td colspan="2">CoucouCoucou !</td>
-            <td>B</td>
-            <td>CC</td>
-        </tr>
-        <tr>
-            <td>AA</td>
-            <td colspan="2">CoucouCoucou !</td>
-            <td>CC</td>
-        </tr>
-        <tr>
-            <td>AA</td>
-            <td>B</td>
-            <td colspan="2">CoucouCoucou !</td>
-        </tr>
-    </table>
-    <hr>
-    <table style="background: #FFFFFF">
-        <tr>
-            <td>AA</td>
-            <td>AA</td>
-            <td>AA</td>
-            <td rowspan="2">AA</td>
-        </tr>
-        <tr>
-            <td>AA</td>
-            <td rowspan="2" colspan="2" >CoucouCoucou !</td>
-        </tr>
-        <tr>
-            <td>AA</td>
-            <td>CC</td>
-        </tr>
-        <tr>
-            <td colspan="2">D1</td>
-            <td colspan="2">D2</td>
-        </tr>
-    </table>
-    <hr>
-</page>
\ No newline at end of file
diff --git a/html2pdf-master/examples/res/example09.png.php b/html2pdf-master/examples/res/example09.png.php
deleted file mode 100644
index 39d6ab66..00000000
--- a/html2pdf-master/examples/res/example09.png.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-$px = isset($_GET['px']) ? $_GET['px'] : 0;
-$px = preg_replace('/[^0-9]/isU', '', $px);
-
-$py = isset($_GET['py']) ? $_GET['py'] : 0;
-$py = preg_replace('/[^0-9]/isU', '', $py);
-
-if ($px<1) {
-    $px = 5;
-}
-if ($py<1) {
-    $py = 5;
-}
-
-if ($px>20) {
-    $px = 20;
-}
-if ($py>20) {
-    $py = 20;
-}
-
-    $width  = 100;
-    $height = 100;
-    $im = imagecreatetruecolor($width, $height);
-
-for ($y=0; $y<$height; $y+= $py) {
-    for ($x=0; $x<$width; $x+= $px) {
-        $c = imagecolorallocate($im, 200-$x, 100+$y, 100+$x-$y);
-        imagefilledrectangle($im, $x, $y, $x+$px, $y+$py, $c);
-    }
-}
-
-    header("Content-type: image/png");
-    imagepng($im);
-    imagedestroy($im);
diff --git a/html2pdf-master/examples/res/example10.php b/html2pdf-master/examples/res/example10.php
deleted file mode 100644
index f6525814..00000000
--- a/html2pdf-master/examples/res/example10.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<style type="text/css">
-<!--
-div.minifiche
-{
-    position:    relative;
-    overflow:    hidden;
-    width:       454px;
-    height:      138px;
-    padding:     0;
-    font-size:   11px;
-    text-align:  left;
-    font-weight: normal;
-    background-image: url(./res/example10a.gif);
-}
-div.minifiche img.icone    { position: absolute; border: none; left: 5px;   top: 5px;  width: 240px; height: 128px;overflow: hidden; }
-div.minifiche div.zone1    { position: absolute; border: none; left: 257px; top: 8px;  width: 188px; height: 14px; padding-top: 1px; overflow: hidden; text-align: center; font-weight: bold; }
-div.minifiche div.zone2    { position: absolute; border: none; left: 315px; top: 28px; width: 131px; height: 14px; padding-top: 1px; overflow: hidden; text-align: left; font-weight: normal; }
-div.minifiche div.zone3    { position: absolute; border: none; left: 315px; top: 48px; width: 131px; height: 14px; padding-top: 1px; overflow: hidden; text-align: left; font-weight: normal; }
-div.minifiche div.zone4    { position: absolute; border: none; left: 315px; top: 68px; width: 131px; height: 14px; padding-top: 1px; overflow: hidden; text-align: left; font-weight: normal; }
-div.minifiche div.zone5    { position: absolute; border: none; left: 315px; top: 88px; width: 131px; height: 14px; padding-top: 1px; overflow: hidden; text-align: left; font-weight: normal; }
-div.minifiche div.download { position: absolute; border: none; left: 257px; top: 108px;width: 188px; height: 22px; overflow: hidden; text-align: center; font-weight: normal; }
--->
-</style>
-<page>
-    <div style="position: absolute; width: 10mm; height: 10mm; left:    0; top:     0; border: solid 2px #0000EE; background: #AAAAEE"></div>
-    <div style="position: absolute; width: 10mm; height: 10mm; right:    0; top:     0; border: solid 2px #00EE00; background: #AAEEAA"></div>
-    <div style="position: absolute; width: 10mm; height: 10mm; left:    0; bottom:    0; border: solid 2px #EE0000; background: #EEAAAA"></div>
-    <div style="position: absolute; width: 10mm; height: 10mm; right:    0; bottom:    0; border: solid 2px #EEEE00; background: #EEEEAA"></div>
-    <table style="width: 100%">
-        <tr>
-            <td style="text-indent: 10mm; border: solid 1px #007700; width: 80%">
-                <p>
-                    Ligne dans un paragraphe,
-                    test de texte assez long pour engendrer des retours à la ligne automatique... a b c d e f g h i j k l m n o p q r s t u v w x y z a b c d e f g h i j k l m n o p q r s t u v w x y z
-                    test de texte assez long pour engendrer des retours à la ligne automatique... a b c d e f g h i j k l m n o p q r s t u v w x y z a b c d e f g h i j k l m n o p q r s t u v w x y z
-                </p>
-                <p>
-                    Ligne dans un paragraphe,
-                    test de texte assez long pour engendrer des retours à la ligne automatique... a b c d e f g h i j k l m n o p q r s t u v w x y z a b c d e f g h i j k l m n o p q r s t u v w x y z
-                    test de texte assez long pour engendrer des retours à la ligne automatique... a b c d e f g h i j k l m n o p q r s t u v w x y z a b c d e f g h i j k l m n o p q r s t u v w x y z
-                </p>
-            </td>
-            <td style="border: solid 1px #000077; width: 20%">
-                Test de paragraphe :)
-            </td>
-        </tr>
-    </table>
-    <hr>
-    <div class="minifiche" >
-        <img class="icone"    src="./res/example10b.jpg" alt="Html2Pdf" >
-        <div class="zone1">Html2Pdf</div>
-        <div class="zone2">PHP</div>
-        <div class="zone3">Utilitaire</div>
-        <div class="zone4">1.00</div>
-        <div class="zone5">01/01/1901</div>
-        <div class="download"><img src="./res/example10c.gif" alt="" style="border: none;"></div>
-    </div>
-    <hr>
-    <div style="border: solid 1px #000000; margin: 0; padding: 0; background: rgb(255, 255, 255); width: 400px; height: 300px; position: relative;">
-        <div style="border-style: solid; border-color: transparent rgb(170, 34, 34) rgb(170, 34, 34) transparent; border-width: 39.5px 59px;    position: absolute; left: 101px; top: 52px; height: 0pt; width: 0pt;"></div>
-        <div style="border-style: solid; border-color: rgb(34, 170, 34) rgb(34, 170, 34) transparent transparent; border-width: 59px 39.5px;    position: absolute; left: 101px; top: 131px; height: 0pt; width: 0pt;"></div>
-        <div style="border-style: solid; border-color: rgb(34, 34, 170) transparent transparent rgb(34, 34, 170); border-width: 39.5px 59px;    position: absolute; left: 180px; top: 170px; height: 0pt; width: 0pt;"></div>
-        <div style="border-style: solid; border-color: transparent transparent rgb(170, 170, 34) rgb(170, 170, 34); border-width: 59px 39.5px;    position: absolute; left: 219px; top: 52px; height: 0pt; width: 0pt;"></div>
-        <div style="position: absolute; left: 10px; top: 10px; font-size: 20px; font-family: Arial;">Exemple</div>
-    </div>
-    <hr>
-    <pre><?php
-    ob_start();
-    readfile(dirname(__FILE__).'/../example10.php');
-    echo htmlentities(ob_get_clean());
-    ?></pre>
-</page>
-<page orientation="paysage" >
-<style type="text/css">
-<!--
-
-div.main
-{
-    padding:     0;
-    margin:      0;
-    position:    relative;
-    left:        50%;
-    margin-left: -80mm;
-    width:       160mm;
-    height:      100mm;
-    text-align:  center;
-    border:      solid 10px #111111;
-    background:  #222222;
-    color:       #FFFFFF;
-    font-size:   10pt;
-    font-weight: bold;
-    text-align:  center;
-}
-
-div.main a
-{
-    text-decoration: none;
-    color: #EEEEEE;
-}
-
-div.main a:hover
-{
-    text-decoration: underline;
-    color: #FFFFFF;
-}
--->
-</style>
-    <div class="main">
-        <div style="position: absolute; top: 5mm; left: 5mm; font-size:12pt;text-align: left;">Spipu.net</div><br>
-        <div style="position: absolute; bottom: 5mm; right: 5mm; font-size:12pt; text-align: right; ">(c)<?php echo date('Y'); ?> Spipu</div>
-        <br><br><br>
-        <a href="http://cineblog.spipu.net/" >Cineblog by Spipu           </a><br><br>
-        <a href="http://html2pdf.fr/"        >Html2Pdf                    </a><br><br>
-        <a href="http://lambda.spipu.net/"   >Lambda Finder               </a><br><br>
-        <a href="http://open.spipu.net/"     >Gestion des Opens - Yaronet </a><br><br>
-        <a href="http://perso.spipu.net/"    >A propos de moi             </a><br><br>
-        <a href="http://prgm.spipu.net/"     >Programmes by Spipu         </a><br><br>
-        <br><br><br>
-    </div>
-</page>
\ No newline at end of file
diff --git a/html2pdf-master/examples/res/example10a.gif b/html2pdf-master/examples/res/example10a.gif
deleted file mode 100644
index c575f1c9..00000000
Binary files a/html2pdf-master/examples/res/example10a.gif and /dev/null differ
diff --git a/html2pdf-master/examples/res/example10b.jpg b/html2pdf-master/examples/res/example10b.jpg
deleted file mode 100644
index 2c4b7aac..00000000
Binary files a/html2pdf-master/examples/res/example10b.jpg and /dev/null differ
diff --git a/html2pdf-master/examples/res/example10c.gif b/html2pdf-master/examples/res/example10c.gif
deleted file mode 100644
index 955d4986..00000000
Binary files a/html2pdf-master/examples/res/example10c.gif and /dev/null differ
diff --git a/html2pdf-master/examples/res/example11.php b/html2pdf-master/examples/res/example11.php
deleted file mode 100644
index 640030e1..00000000
--- a/html2pdf-master/examples/res/example11.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<div style="border: 1px solid rgb(0, 0, 0); margin: 0; padding: 0; background: rgb(255, 255, 255); width: 400px; height: 300px;">
-    <div style="border-style: solid; border-color: transparent rgb(170, 34, 170) rgb(170, 34, 170) transparent; border-width: 18px 56px; position: absolute; left: 111px; top: 69px; height: 0pt; width: 0pt;"></div><div style="border-style: solid; border-color: rgb(170, 34, 170) transparent transparent rgb(170, 34, 170); border-width: 18px 9px; position: absolute; left: 223px; top: 69px; height: 0pt; width: 0pt;"></div><div style="border-style: solid; border-color: transparent rgb(170, 34, 170) rgb(170, 34, 170) transparent; border-width: 3px 9px; position: absolute; left: 223px; top: 63px; height: 0pt; width: 0pt;"></div><div style="border-style: solid; border-color: rgb(170, 34, 170) transparent transparent rgb(170, 34, 170); border-width: 3px 1.5px; position: absolute; left: 241px; top: 63px; height: 0pt; width: 0pt;"></div><div style="border-style: solid; border-color: transparent rgb(170, 34, 170) rgb(170, 34, 170) transparent; border-width: 0.5px 1.5px; position: absolute; left: 241px; top: 62px; height: 0pt; width: 0pt;"></div><div style="border-style: solid; border-color: rgb(170, 34, 170) rgb(170, 34, 170) transparent transparent; border-width: 67px 22px; position: absolute; left: 111px; top: 105px; height: 0pt; width: 0pt;"></div><div style="border-style: solid; border-color: rgb(170, 34, 170) transparent transparent rgb(170, 34, 170); border-width: 67px 34px; position: absolute; left: 155px; top: 105px; height: 0pt; width: 0pt;"></div><div style="border-style: solid; border-color: transparent rgb(34, 170, 170) rgb(34, 170, 170) transparent; border-width: 67px 33.5px; position: absolute; left: 178px; top: 61px; height: 0pt; width: 0pt;"></div><div style="border-style: solid; border-color: transparent transparent rgb(34, 170, 170) rgb(34, 170, 170); border-width: 67px 22px; position: absolute; left: 245px; top: 61px; height: 0pt; width: 0pt;"></div><div style="border-style: solid; border-color: rgb(34, 170, 170) transparent transparent rgb(34, 170, 170); border-width: 18px 55.5px; position: absolute; left: 178px; top: 195px; height: 0pt; width: 0pt;"></div><div style="border-style: solid; border-color: transparent rgb(34, 170, 170) rgb(34, 170, 170) transparent; border-width: 18px 9px; position: absolute; left: 160px; top: 195px; height: 0pt; width: 0pt;"></div><div style="border-style: solid; border-color: rgb(34, 170, 170) transparent transparent rgb(34, 170, 170); border-width: 3px 9px; position: absolute; left: 160px; top: 231px; height: 0pt; width: 0pt;"></div><div style="border-style: solid; border-color: transparent rgb(34, 170, 170) rgb(34, 170, 170) transparent; border-width: 3px 1.5px; position: absolute; left: 157px; top: 231px; height: 0pt; width: 0pt;"></div><div style="border-style: solid; border-color: rgb(34, 170, 170) transparent transparent rgb(34, 170, 170); border-width: 0.5px 1.5px; position: absolute; left: 157px; top: 237px; height: 0pt; width: 0pt;"></div>
-</div>
-<hr>
-<table style="width:100%;">
-    <tr>
-        <td id="mon_td_trop_grand" style="width:100%;">
-            Test de TD très grand, en désactivant le test de TD ne devant pas depasser une page<br>
-            via la méthode <b>setTestTdInOnePage</b>.<br>
-            <table style="width:100%;">
-<?php
-for ($i=0; $i<=40; $i++) {
-?>
-            <tr>
-                <td style="border:1px solid red;width:100%;">
-                    test de texte assez long pour engendrer des retours à la ligne automatique...
-                    a b c d e f g h i j k l m n o p q r s t u v w x y z
-                    a b c d e f g h i j k l m n o p q r s t u v w x y z
-                </td>
-            </tr>
-<?php
-}
-?>
-            </table>
-        </td>
-    </tr>
-</table>
\ No newline at end of file
diff --git a/html2pdf-master/examples/res/example12.php b/html2pdf-master/examples/res/example12.php
deleted file mode 100644
index dcebe84c..00000000
--- a/html2pdf-master/examples/res/example12.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-    $chaine = 'test de texte assez long pour engendrer des retours à la ligne automatique...';
-    $chaine.= ', répétitif car besoin d\'un retour à la ligne';
-    $chaine.= ', répétitif car besoin d\'un retour à la ligne';
-    $chaine.= ', répétitif car besoin d\'un retour à la ligne';
-    $chaine.= ', répétitif car besoin d\'un retour à la ligne';
-?>
-<style type="text/css">
-<!--
-ul
-{
-    background: #FFDDDD;
-    border: solid 1px #FF0000;
-}
-
-ol
-{
-    background: #DDFFDD;
-    border: solid 1px #00FF00;
-}
-
-ul li
-{
-    background: #DDFFAA;
-    border: solid 1px #AAFF00;
-}
-
-ol li
-{
-    background: #AADDFF;
-    border: solid 1px #00AAFF;
-}
--->
-</style>
-<page style="font-size: 11px">
-    <ul style="list-style-type: disc; width: 80%">
-        <li>
-            Point 1 :<br><?php echo $chaine; ?>
-        </li>
-        <li>
-            Point 2 :<br><?php echo $chaine; ?>
-            <ul style="list-style-type: circle">
-                <li>
-                    Point 1 :<br><?php echo $chaine; ?>
-                </li>
-                <li>
-                    Point 2 :<br><?php echo $chaine; ?>
-                    <ul style="list-style-type: square">
-                        <li>
-                            Point 1 :<br><?php echo $chaine; ?>
-                        </li>
-                        <li>
-                            Point 2 :<br><?php echo $chaine; ?>
-                        </li>
-                        <li>
-                            Point 3 :<br><?php echo $chaine; ?>
-                            <ul style="list-style-image: url(./res/puce.gif)">
-                                <li>
-                                    Puce en image 1 :<br><?php echo $chaine; ?>
-                                </li>
-                                <li>
-                                    Puce en image 2 :<br><?php echo $chaine; ?>
-                                </li>
-                                <li>
-                                    Puce en image 3 :<br><?php echo $chaine; ?>
-                                </li>
-                            </ul>
-                        </li>
-                    </ul>
-                </li>
-                <li>
-                    Point 3 :<br><?php echo $chaine; ?>
-                </li>
-            </ul>
-        </li>
-        <li>
-            Point 3 :<br><?php echo $chaine; ?>
-        </li>
-    </ul>
-    <hr><hr>
-    <ol style="list-style-type: upper-roman">
-        <li>
-            Point 1 :<br><?php echo $chaine; ?>
-        </li>
-        <li>
-            Point 2 :<br><?php echo $chaine; ?>
-            <ol style="list-style-type: lower-alpha">
-                <li>
-                    Point 1 :<br><?php echo $chaine; ?>
-                </li>
-                <li>
-                    Point 2 :<br><?php echo $chaine; ?>
-                    <ol style="list-style-type: decimal">
-                        <li>
-                            Point 1 :<br><?php echo $chaine; ?>
-                        </li>
-                        <li>
-                            Point 2 :<br><?php echo $chaine; ?>
-                        </li>
-                        <li>
-                            Point 3 :<br><?php echo $chaine; ?>
-                        </li>
-                    </ol>
-                </li>
-                <li>
-                    Point 3 :<br><?php echo $chaine; ?>
-                </li>
-            </ol>
-        </li>
-        <li>
-            Point 3 :<br><?php echo $chaine; ?>
-        </li>
-    </ol>
-</page>
\ No newline at end of file
diff --git a/html2pdf-master/examples/res/example13.php b/html2pdf-master/examples/res/example13.php
deleted file mode 100644
index 7243d4fc..00000000
--- a/html2pdf-master/examples/res/example13.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<style type="text/css">
-<!--
-table.tableau { text-align: left; }
-table.tableau td { width: 15mm; font-family: courier; }
-table.tableau th { width: 15mm; font-family: courier; }
-
-.ul1
-{
-    list-style-image: url(./res/puce2.gif);
-}
-.ul1 li
-{
-    color:#F19031;
-}
-.ul2
-{
-    list-style: square;
-}
-.ul2 li
-{
-    color:#31F190;
-}
-.ul3
-{
-    list-style: none;
-}
-.ul3 li
-{
-    color:#9031F1;
-}
--->
-</style>
-Exemple de liste avec puce personnalisée :<br>
-<table style="width: 100%;" >
-    <tr>
-        <td style="width: 33%;">
-            <ul class="ul1">
-                <li>Votre ligne 1</li>
-                <li>Votre ligne 2</li>
-                <li>Votre ligne 3</li>
-            </ul>
-        </td>
-        <td style="width: 34%;">
-            <ul class="ul2">
-                <li>Votre ligne 1</li>
-                <li>Votre ligne 2</li>
-                <li>Votre ligne 3</li>
-            </ul>
-        </td>
-        <td style="width: 33%;">
-            <ul class="ul3">
-                <li>Votre ligne 1</li>
-                <li>Votre ligne 2</li>
-                <li>Votre ligne 3</li>
-            </ul>
-        </td>
-    </tr>
-</table>
-Exemple de caracteres :<br>
-<table class="tableau" >
-    <tr><th>0</th><th>a</th><th>e</th><th>i</th><th>o</th><th>u</th></tr>
-    <tr><th>1</th><td>&agrave;</td><td>&egrave;</td><td>&igrave;</td><td>&ograve;</td><td>&ugrave;</td></tr>
-    <tr><th>2</th><td>&aacute;</td><td>&eacute;</td><td>&iacute;</td><td>&oacute;</td><td>&uacute;</td></tr>
-    <tr><th>3</th><td>&acirc;</td><td>&ecirc;</td><td>&icirc;</td><td>&ocirc;</td><td>&ucirc;</td></tr>
-    <tr><th>4</th><td>&auml;</td><td>&euml;</td><td>&iuml;</td><td>&ouml;</td><td>&uuml;</td></tr>
-    <tr><th>5</th><td>&atilde;</td><td> </td><td> </td><td>&otilde;</td><td> </td></tr>
-    <tr><th>6</th><td>&aring;</td><td> </td><td> </td><td> </td><td> </td></tr>
-    <tr><th>7</th><td>&euro;</td><td>&laquo;</td><td> </td><td>&oslash;</td><td> </td></tr>
-</table>
-<br>
-<?php
-    $phrase = "ceci est un exemple avec <b>du gras</b>, ";
-    $phrase.= "<i>de l'italique</i>, ";
-    $phrase.= "<u>du souligné</u>, ";
-    $phrase.= "<u><i><b>et une image</b></i></u> : ";
-    $phrase.= "<img src='./res/logo.gif' alt='logo' style='width: 15mm'>";
-?>
-Table :<br>
-<table style="border: solid 1px red; width: 105mm">
-    <tr><td style="width: 100%; border: solid 1px green; text-align: left; "><?php echo $phrase; ?></td></tr>
-    <tr><td style="width: 100%; border: solid 1px green; text-align: center;"><?php echo $phrase; ?></td></tr>
-    <tr><td style="width: 100%; border: solid 1px green; text-align: right; "><?php echo $phrase; ?></td></tr>
-</table>
-<br>
-Div :<br>
-<div style="width: 103mm; border: solid 1px green; text-align: left; margin: 1mm 0 1mm 0;padding: 1mm;"><?php echo $phrase; ?></div>
-<div style="width: 103mm; border: solid 1px green; text-align: center;margin: 1mm 0 1mm 0;padding: 1mm;"><?php echo $phrase; ?></div>
-<div style="width: 103mm; border: solid 1px green; text-align: right; margin: 1mm 0 1mm 0;padding: 1mm;"><?php echo $phrase; ?></div>
\ No newline at end of file
diff --git a/html2pdf-master/examples/res/example14.php b/html2pdf-master/examples/res/example14.php
deleted file mode 100644
index 530e65c2..00000000
--- a/html2pdf-master/examples/res/example14.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<style type="text/css">
-    .table-bordered {border-width: 0.25mm; border-style: solid; border-color: #aaaaaa;}
-</style>
-<page backtop="5mm" backbottom="5mm" backleft="5mm" backright="5mm">
-    <table style="border-top: solid 1px green;">
-        <col class="table-bordered" style="width: 20mm;">
-        <col class="table-bordered" style="width: 21mm;">
-        <col class="table-bordered" style="width: 22mm;">
-        <tr>
-            <th style="border-top: solid 1px red">0 0</th>
-            <th style="border-top: solid 1px red">0 1</th>
-            <th style="border-top: solid 1px red">0 2</th>
-        </tr>
-        <tr>
-            <td><div>1 0</div></td>
-            <td>1 1</td>
-            <td>1 2</td>
-        </tr>
-    </table>
-    <br /><hr /><br />
-    <table style="border-collapse: collapse;">
-        <col class="table-bordered" style="width: 20mm;">
-        <col class="table-bordered" style="width: 21mm;">
-        <col class="table-bordered" style="width: 22mm;">
-        <tr>
-            <th style="border: solid 1px red" >0 0</th>
-            <th style="border: solid 1px red">0 1</th>
-            <th style="border: solid 1px red">0 2</th>
-        </tr>
-        <tr>
-            <td><div>1 0</div></td>
-            <td>1 1</td>
-            <td>1 2</td>
-        </tr>
-    </table>
-    <br /><hr /><br />
-    <table border="1" style="width:150mm">
-        <colgroup>
-            <col style="width: 33%">
-            <col style="width: 33%">
-            <col style="width: 33%">
-        </colgroup>
-        <tr>
-            <td>A</td>
-            <td>B</td>
-            <td>C</td>
-        </tr>
-    </table>
-    <br /><hr /><br />
-    <table border="1" style="width:150mm">
-        <colgroup>
-            <col style="width: 33%">
-            <col style="width: 33%">
-            <col style="width: 33%">
-        </colgroup>
-        <tr>
-            <td>A</td>
-            <td>B</td>
-            <td>C</td>
-        </tr>
-        <tr>
-            <td style="padding: 1cm;">First column</td>
-            <td colspan="2" style="padding: 1cm;">Second column with a colspan of 2</td>
-        </tr>
-        <tr>
-            <td colspan="3" style="padding: 1cm;">Third column with a colspan of 3</td>
-        </tr>
-    </table>
-    <br /><hr /><br />
-    <table border="1" style="width:150mm">
-        <colgroup>
-            <col style="width: 33%">
-            <col style="width: 33%">
-            <col style="width: 33%">
-        </colgroup>
-        <tr>
-            <td style="padding: 1cm;">First column</td>
-            <td colspan="2" style="padding: 1cm;">Second column with a colspan of 2</td>
-        </tr>
-        <tr>
-            <td colspan="3" style="padding: 1cm;">Third column with a colspan of 3</td>
-        </tr>
-    </table>
-    <br /><hr /><br />
-    <table border="1" style="width:150mm">
-        <colgroup>
-            <col style="width: 33%">
-            <col style="width: 33%">
-            <col style="width: 33%">
-        </colgroup>
-        <tr>
-            <td colspan="2" style="padding: 1cm;">Second column with a colspan of 2</td>
-            <td style="padding: 1cm;">First column</td>
-        </tr>
-        <tr>
-            <td colspan="3" style="padding: 1cm;">Third column with a colspan of 3</td>
-        </tr>
-    </table>
-    <br />
-    <font color="red">Hello</font><br />
-    <br />
-    Image : <img src="./res/logos.png" /><br />
-    Image : <img src="./res/logo.png" /><br />
-
-    <h2>Css Large FontSize</h2>
-    <span style="font-size: medium;"  >text with font-style medium</span><br />
-    <span style="font-size: large;"   >text with font-style large</span><br />
-    <span style="font-size: x-large;" >text with font-style x-large</span><br />
-    <span style="font-size: xx-large;">text with font-style xx-large</span><br />
-
-    <h2>Css Small FontSize</h2>
-    <span style="font-size: medium;"  >text with font-style medium</span><br />
-    <span style="font-size: small;"   >text with font-style small</span><br />
-    <span style="font-size: x-small;" >text with font-style x-small</span><br />
-    <span style="font-size: xx-small;">text with font-style xx-small</span><br />
-
-    <h2>Css Relative FontSize</h2>
-    <span style="font-size: medium;"  >text with font-style medium</span><br />
-    <span style="font-size: smaller;"  ><span style="font-size: larger;"  >text with font-style smaller larger</span></span><br />
-    <span style="font-size: larger;"  >text with font-style larger</span><br />
-    <span style="font-size: smaller;"  >text with font-style smaller</span><br />
-</page>
\ No newline at end of file
diff --git a/html2pdf-master/examples/res/example15.php b/html2pdf-master/examples/res/example15.php
deleted file mode 100644
index baed3597..00000000
--- a/html2pdf-master/examples/res/example15.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<style type="text/css">
-<!--
-div {
-    border: solid 2mm red;
-}
-
-div.content-1 {
-    background: green;
-}
-
-
-div.content-2 {
-    background: blue;
-}
-
--->
-</style>
-<page>
-    <div class="content-[[page_cu]]">Page [[page_cu]]</div>
-</page>
-<page>
-    <div class="content-[[page_cu]]">Page [[page_cu]]</div>
-</page>
diff --git a/html2pdf-master/examples/res/forms.php b/html2pdf-master/examples/res/forms.php
deleted file mode 100644
index 1278f82c..00000000
--- a/html2pdf-master/examples/res/forms.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-
-if (isset($_SERVER['REQUEST_URI'])) {
-    $url = $_SERVER['REQUEST_URI'];
-    if (substr($url, 0, 7)!=='http://') {
-        $url = 'http://'.$_SERVER['HTTP_HOST'];
-        if (isset($_SERVER['SERVER_PORT']) && $_SERVER['SERVER_PORT']!=80) {
-            $url.= ':'.$_SERVER['SERVER_PORT'];
-        }
-        $url.= $_SERVER['REQUEST_URI'];
-    }
-} else {
-    $url = 'http://localhost/html2pdf/examples/forms.php';
-}
-?>
-<style type="text/css">
-li
-{ font-size: 10pt; }
-
-input, textarea, select
-{
-    border: dashed 1mm red;
-    background: #FCC;
-    color: #400;
-    text-align: left;
-    font-size: 11pt;
-}
-</style>
-<page footer="form,date,time">
-    <h1>Test de formulaire</h1><br>
-    <br>
-    <form action="<?php echo $url; ?>">
-        <input type="hidden" name="test" value="1">
-        Vous utilisez cette librairie dans le cadre :
-        <ul style="list-style: none">
-            <li><input type="checkbox" name="cadre_boulot" checked="checked"> du boulot</li>
-            <li><input type="checkbox" name="cadre_perso" > perso</li>
-        </ul>
-        Vous êtes :
-        <ul style="list-style: none">
-            <li><input type="radio" name="sexe" value="homme" checked="checked"> un homme</li>
-            <li><input type="radio" name="sexe" value="femme"> une femme</li>
-        </ul>
-        Vous avez :
-        <select name="age" >
-            <option value="15">moins de 15 ans</option>
-            <option value="20">entre 15 et 20 ans</option>
-            <option value="25">entre 20 et 25 ans</option>
-            <option value="30">entre 25 et 30 ans</option>
-            <option value="40">plus de 30 ans</option>
-        </select><br>
-        <br>
-        Vous aimez :
-        <select name="aime[]" size="5" multiple="multiple">
-            <option value="ch1">l'informatique</option>
-            <option value="ch2">le cinéma</option>
-            <option value="ch3">le sport</option>
-            <option value="ch4">la littérature</option>
-            <option value="ch5">autre</option>
-        </select><br>
-        <br>
-        Votre phrase fétiche : <input type="text" name="phrase" value="cette lib est géniale !!!" style="width: 100mm"><br>
-        <br>
-        Un commentaire ?<br>
-        <textarea name="comment" rows="3" cols="30">rien de particulier</textarea><br>
-        <br>
-        <input type="reset" name="btn_reset" value="Initialiser">
-        <input type="button" name="btn_print" value="Imprimer" onclick="print(true);">
-        <input type="submit" name="btn_submit" value="Envoyer">
-    </form>
-</page>
\ No newline at end of file
diff --git a/html2pdf-master/examples/res/groups.php b/html2pdf-master/examples/res/groups.php
deleted file mode 100644
index 309d8c7b..00000000
--- a/html2pdf-master/examples/res/groups.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<style type="text/css">
-<!--
-    table.page_header {width: 100%; border: none; background-color: #DDDDFF; border-bottom: solid 1mm #AAAADD; padding: 2mm }
-    table.page_footer {width: 100%; border: none; background-color: #DDDDFF; border-top: solid 1mm #AAAADD; padding: 2mm}
--->
-</style>
-<page backtop="14mm" backbottom="14mm" backleft="10mm" backright="10mm" pagegroup="new">
-    <page_header>
-        <table class="page_header">
-            <tr>
-                <td style="width: 100%; text-align: left">
-                    Exemple d'utilisation des groupes de pages
-                </td>
-            </tr>
-        </table>
-    </page_header>
-    <page_footer>
-        <table class="page_footer">
-            <tr>
-                <td style="width: 100%; text-align: right">
-                    page [[page_cu]]/[[page_nb]]
-                </td>
-            </tr>
-        </table>
-    </page_footer>
-    Ceci est la page 1 du groupe 1
-</page>
-<page pageset="old">
-    Ceci est la page 2 du groupe 1
-</page>
-<page pageset="old">
-    Ceci est la page 3 du groupe 1
-</page>
-<?php
-for ($k=2; $k<5; $k++) :
-?>
-<page pageset="old" pagegroup="new">
-    Ceci est la page 1 du groupe <?php echo $k; ?>
-</page>
-<page pageset="old">
-    Ceci est la page 2 du groupe <?php echo $k; ?>
-</page>
-<?php
-endfor;
diff --git a/html2pdf-master/examples/res/logo.gif b/html2pdf-master/examples/res/logo.gif
deleted file mode 100644
index 1400667e..00000000
Binary files a/html2pdf-master/examples/res/logo.gif and /dev/null differ
diff --git a/html2pdf-master/examples/res/logo.png b/html2pdf-master/examples/res/logo.png
deleted file mode 100644
index bdd7594d..00000000
Binary files a/html2pdf-master/examples/res/logo.png and /dev/null differ
diff --git a/html2pdf-master/examples/res/measure.php b/html2pdf-master/examples/res/measure.php
deleted file mode 100644
index 29885750..00000000
--- a/html2pdf-master/examples/res/measure.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<style type="text/css">
-<!--
-    table
-    {
-        padding: 0;
-        margin: 0;
-        border: none;
-        border-right: solid 0.2mm black;
-    }
-    td
-    {
-        padding: 0;
-        margin: 0;
-        border: none;
-    }
-
-    img
-    {
-        width: 10mm;
-    }
--->
-</style>
-<page>
-    <table cellpadding="0" cellspacing="0">
-        <tr>
-<?php
-for ($k=0; $k<28;$k++) {
-    echo '<td><img src="./res/measure.png" alt="" ><br>'.$k.'</td>';
-}
-?>
-        </tr>
-    </table>
-</page>
diff --git a/html2pdf-master/examples/res/measure.png b/html2pdf-master/examples/res/measure.png
deleted file mode 100644
index 9ad4310f..00000000
Binary files a/html2pdf-master/examples/res/measure.png and /dev/null differ
diff --git a/html2pdf-master/examples/res/off.png b/html2pdf-master/examples/res/off.png
deleted file mode 100644
index ebb30bbf..00000000
Binary files a/html2pdf-master/examples/res/off.png and /dev/null differ
diff --git a/html2pdf-master/examples/res/puce.gif b/html2pdf-master/examples/res/puce.gif
deleted file mode 100644
index 7d35e4d3..00000000
Binary files a/html2pdf-master/examples/res/puce.gif and /dev/null differ
diff --git a/html2pdf-master/examples/res/puce2.gif b/html2pdf-master/examples/res/puce2.gif
deleted file mode 100644
index be43fe78..00000000
Binary files a/html2pdf-master/examples/res/puce2.gif and /dev/null differ
diff --git a/html2pdf-master/examples/res/qrcode.php b/html2pdf-master/examples/res/qrcode.php
deleted file mode 100644
index e7834f2e..00000000
--- a/html2pdf-master/examples/res/qrcode.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-$msg = "Le site de html2pdf\nhttp://html2pdf.fr/";
-?>
-<page backtop="10mm" >
-    <page_header>
-        <table style="width: 100%; border: solid 1px black;">
-            <tr>
-                <td style="text-align: left;    width: 50%">html2pdf</td>
-                <td style="text-align: right;    width: 50%">Exemples de QRcode</td>
-            </tr>
-        </table>
-    </page_header>
-    <h1>Exemples de QRcode</h1>
-    <h3>Message avec Correction d'erreur L, M, Q, H (valeur par défaut : H)</h3>
-    <qrcode value="<?php echo $msg; ?>" ec="L" style="width: 30mm;"></qrcode>
-    <qrcode value="<?php echo $msg; ?>" ec="M" style="width: 30mm;"></qrcode>
-    <qrcode value="<?php echo $msg; ?>" ec="Q" style="width: 30mm;"></qrcode>
-    <qrcode value="<?php echo $msg; ?>" ec="H" style="width: 30mm;"></qrcode>
-    <br>
-    <h3>Message avec différentes largeurs</h3>
-    <qrcode value="<?php echo $msg; ?>" style="width: 20mm;"></qrcode>
-    <qrcode value="<?php echo $msg; ?>" style="width: 30mm;"></qrcode>
-    <qrcode value="<?php echo $msg; ?>" style="width: 40mm;"></qrcode>
-    <qrcode value="<?php echo $msg; ?>" style="width: 50mm;"></qrcode>
-    <br>
-    <h3>Message de différentes couleurs</h3>
-    <qrcode value="<?php echo $msg; ?>" style="width: 40mm; background-color: white; color: black;"></qrcode>
-    <qrcode value="<?php echo $msg; ?>" style="width: 40mm; background-color: yellow; color: red"></qrcode>
-    <qrcode value="<?php echo $msg; ?>" style="width: 40mm; background-color: #FFCCFF; color: #003300"></qrcode>
-    <qrcode value="<?php echo $msg; ?>" style="width: 40mm; background-color: #CCFFFF; color: #003333"></qrcode>
-    <br>
-    <h3>Message sans border</h3>
-    <qrcode value="<?php echo $msg; ?>" style="border: none; width: 40mm;"></qrcode>
-    <br>
-</page>
diff --git a/html2pdf-master/examples/res/radius.php b/html2pdf-master/examples/res/radius.php
deleted file mode 100644
index f4bb50d9..00000000
--- a/html2pdf-master/examples/res/radius.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<style type="text/css">
-<!--
-.div { background: #CCDDCC; color: #002200; text-align: center; width: 70mm; height: 20mm; margin: 2mm; }
-.div1 { border: solid 2mm black; border-radius: 5mm;              -moz-border-radius: 5mm;              }
-.div2 { border: solid 2mm black; border-radius: 3mm 10mm 0mm 3mm; -moz-border-radius: 3mm 10mm 0mm 3mm; }
-.div3 { border: solid 2mm black; border-radius: 10mm / 7mm;       -moz-border-radius: 10mm / 7mm;       }
-.div4 { border: solid 6mm black; border-radius: 5mm / 10mm;       -moz-border-radius: 5mm / 10mm;       }
-.div5 { border: solid 5mm black; border-top: none; border-bottom: none; border-radius: 5mm; -moz-border-radius: 5mm; }
-.div6 { border: solid 5mm black; border-left: none; border-right: none; border-radius: 5mm; -moz-border-radius: 5mm; }
-.div7 { border: solid 5mm black; border-left: none; border-top: none; border-radius: 5mm;   -moz-border-radius: 5mm; }
-.div8 { border-radius: 8mm; -moz-border-radius: 8mm; border-left: solid 2mm #660000; border-top: solid 1mm #006600; border-right: solid 2mm #000066; border-bottom: solid 4mm #004444;}
--->
-</style>
-<page>
-    <div class="div div1">Exemple de div</div>
-    <div class="div div2">Exemple de div</div>
-    <div class="div div3">Exemple de div</div>
-    <div class="div div4">Exemple de div</div>
-    <div class="div div5">Exemple de div</div>
-    <div class="div div6">Exemple de div</div>
-    <div class="div div7">Exemple de div</div>
-    <div class="div div8">Exemple de div</div>
-</page>
diff --git a/html2pdf-master/examples/res/svg.php b/html2pdf-master/examples/res/svg.php
deleted file mode 100644
index 846c1f10..00000000
--- a/html2pdf-master/examples/res/svg.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<style type="text/css">
-.main-draw {
-    margin: auto;
-    background: #000000;
-    border: solid 0.5mm #777777;
-    width:150mm;
-    height:100mm;
-}
-
-.full-stroke {
-    stroke-width:1mm;
-}
-
-.middle-stroke {
-    stroke-width:0.5mm;
-}
-</style>
-<page>
-    <draw class="main-draw">
-        <line    class="full-stroke" style="stroke:#FF0000;" x1="10mm" y1="10mm" x2="140mm" y2="10mm" >
-        <rect    class="full-stroke" style="stroke:#770077; fill:#008888" x="15%" y="15%"  w="70%" h="70%">
-        <ellipse class="full-stroke" style="stroke:#000077; fill:#888800" cx="50%" cy="50%" rx="30%" ry="30%">
-        <circle  class="full-stroke" style="stroke:#0000AA; fill:#AAAA00" cx="50%" cy="50%" r="15%">
-    </draw><br>
-    <draw class="main-draw">
-        <path class="full-stroke"   style="fill:#AAAA00; stroke:#0000AA;" d="M20mm,10mm H130mm A10mm,10mm 0,0,0 140mm,20mm V80mm A10mm,10mm 0,0,0 130mm,90mm H20mm A10mm,10mm 0,0,0 10mm,80mm V20mm A10mm,10mm 0,0,0 20mm,10mm">
-        <path class="middle-stroke" style="fill:#770000; stroke:#AA0033;" d="M 20mm,40mm a16mm,8mm 0,0,0 16mm,8mm" />
-        <path class="middle-stroke" style="fill:#770000; stroke:#00AA33;" d="M 20mm,40mm l16mm,8mm" />
-        <path class="middle-stroke" style="fill:#770000; stroke:#AA0033;" d="M 40mm,40mm a16mm,8mm 0,0,1 16mm,8mm" />
-        <path class="middle-stroke" style="fill:#770000; stroke:#00AA33;" d="M 40mm,40mm l16mm,8mm" />
-        <path class="middle-stroke" style="fill:#770000; stroke:#AA0033;" d="M 80mm,40mm a16mm,8mm 0,1,0 16mm,8mm" />
-        <path class="middle-stroke" style="fill:#770000; stroke:#00AA33;" d="M 80mm,40mm l16mm,8mm" />
-        <path class="middle-stroke" style="fill:#770000; stroke:#AA0033;" d="M100mm,40mm a16mm,8mm 0,1,1 16mm,8mm" />
-        <path class="middle-stroke" style="fill:#770000; stroke:#00AA33;" d="M100mm,40mm l16mm,8mm" />
-    </draw><br>
-    <br>
-    Les balises SVG suivantes sont reconnues : LINE, RECT, CIRCLE, ELLIPSE, PATH, POLYGON, POLYLINE, G<br>
-    <br>
-    Spécifications SVG : <a href="http://www.w3.org/TR/SVG11/expanded-toc.html">http://www.w3.org/TR/SVG11/expanded-toc.html</a>
-</page>
\ No newline at end of file
diff --git a/html2pdf-master/examples/res/svg_tiger.php b/html2pdf-master/examples/res/svg_tiger.php
deleted file mode 100644
index 0000bb9d..00000000
--- a/html2pdf-master/examples/res/svg_tiger.php
+++ /dev/null
@@ -1,246 +0,0 @@
-<page>
-    <draw style="margin:auto; width:180mm; height:180mm; background: #444444; border: solid 0.5mm #777777;">
-        <g transform="translate(90mm,90mm) scale(1.3) translate(-20mm,-30mm)">
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.172"><path d="M-122.304 84.285C-122.304 84.285 -122.203 86.179 -123.027 86.16C-123.851 86.141 -140.305 38.066 -160.833 40.309C-160.833 40.309 -143.05 32.956 -122.304 84.285z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.172"><path d="M-118.774 81.262C-118.774 81.262 -119.323 83.078 -120.092 82.779C-120.86 82.481 -119.977 31.675 -140.043 26.801C-140.043 26.801 -120.82 25.937 -118.774 81.262z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.172"><path d="M-91.284 123.59C-91.284 123.59 -89.648 124.55 -90.118 125.227C-90.589 125.904 -139.763 113.102 -149.218 131.459C-149.218 131.459 -145.539 112.572 -91.284 123.59z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.172"><path d="M-94.093 133.801C-94.093 133.801 -92.237 134.197 -92.471 134.988C-92.704 135.779 -143.407 139.121 -146.597 159.522C-146.597 159.522 -149.055 140.437 -94.093 133.801z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.172"><path d="M-98.304 128.276C-98.304 128.276 -96.526 128.939 -96.872 129.687C-97.218 130.435 -147.866 126.346 -153.998 146.064C-153.998 146.064 -153.646 126.825 -98.304 128.276z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.172"><path d="M-109.009 110.072C-109.009 110.072 -107.701 111.446 -108.34 111.967C-108.979 112.488 -152.722 86.634 -166.869 101.676C-166.869 101.676 -158.128 84.533 -109.009 110.072z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.172"><path d="M-116.554 114.263C-116.554 114.263 -115.098 115.48 -115.674 116.071C-116.25 116.661 -162.638 95.922 -174.992 112.469C-174.992 112.469 -168.247 94.447 -116.554 114.263z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.172"><path d="M-119.154 118.335C-119.154 118.335 -117.546 119.343 -118.036 120.006C-118.526 120.669 -167.308 106.446 -177.291 124.522C-177.291 124.522 -173.066 105.749 -119.154 118.335z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.172"><path d="M-108.42 118.949C-108.42 118.949 -107.298 120.48 -107.999 120.915C-108.7 121.35 -148.769 90.102 -164.727 103.207C-164.727 103.207 -153.862 87.326 -108.42 118.949z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.172"><path d="M-128.2 90C-128.2 90 -127.6 91.8 -128.4 92C-129.2 92.2 -157.8 50.2 -177.001 57.8C-177.001 57.8 -161.8 46 -128.2 90z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.172"><path d="M-127.505 96.979C-127.505 96.979 -126.53 98.608 -127.269 98.975C-128.007 99.343 -164.992 64.499 -182.101 76.061C-182.101 76.061 -169.804 61.261 -127.505 96.979z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.172"><path d="M-127.62 101.349C-127.62 101.349 -126.498 102.88 -127.199 103.315C-127.9 103.749 -167.969 72.502 -183.927 85.607C-183.927 85.607 -173.062 69.726 -127.62 101.349z"/></g>
-            <g style="fill: #ffffff; stroke:#000000"><path d="M-129.83 103.065C-129.327 109.113 -128.339 115.682 -126.6 118.801C-126.6 118.801 -130.2 131.201 -121.4 144.401C-121.4 144.401 -121.8 151.601 -120.2 154.801C-120.2 154.801 -116.2 163.201 -111.4 164.001C-107.516 164.648 -98.793 167.717 -88.932 169.121C-88.932 169.121 -71.8 183.201 -75 196.001C-75 196.001 -75.4 212.401 -79 214.001C-79 214.001 -67.4 202.801 -77 219.601L-81.4 238.401C-81.4 238.401 -55.8 216.801 -71.4 235.201L-81.4 261.201C-81.4 261.201 -61.8 242.801 -69 251.201L-72.2 260.001C-72.2 260.001 -29 232.801 -59.8 262.401C-59.8 262.401 -51.8 258.801 -47.4 261.601C-47.4 261.601 -40.6 260.401 -41.4 262.001C-41.4 262.001 -62.2 272.401 -65.8 290.801C-65.8 290.801 -57.4 280.801 -60.6 291.601L-60.2 303.201C-60.2 303.201 -56.2 281.601 -56.6 319.201C-56.6 319.201 -37.4 301.201 -49 322.001L-49 338.801C-49 338.801 -33.8 322.401 -40.2 335.201C-40.2 335.201 -30.2 326.401 -34.2 341.601C-34.2 341.601 -35 352.001 -30.6 340.801C-30.6 340.801 -14.6 310.201 -20.6 336.401C-20.6 336.401 -21.4 355.601 -16.6 340.801C-16.6 340.801 -16.2 351.201 -7 358.401C-7 358.401 -8.2 307.601 4.6 343.601L8.6 360.001C8.6 360.001 11.4 350.801 11 345.601C11 345.601 25.8 329.201 19 353.601C19 353.601 34.2 330.801 31 344.001C31 344.001 23.4 360.001 25 364.801C25 364.801 41.8 330.001 43 328.401C43 328.401 41 370.802 51.8 334.801C51.8 334.801 57.4 346.801 54.6 351.201C54.6 351.201 62.6 343.201 61.8 340.001C61.8 340.001 66.4 331.801 69.2 345.401C69.2 345.401 71 354.801 72.6 351.601C72.6 351.601 76.6 375.602 77.8 352.801C77.8 352.801 79.4 339.201 72.2 327.601C72.2 327.601 73 324.401 70.2 320.401C70.2 320.401 83.8 342.001 76.6 313.201C76.6 313.201 87.801 321.201 89.001 321.201C89.001 321.201 75.4 298.001 84.2 302.801C84.2 302.801 79 292.401 97.001 304.401C97.001 304.401 81 288.401 98.601 298.001C98.601 298.001 106.601 304.401 99.001 294.401C99.001 294.401 84.6 278.401 106.601 296.401C106.601 296.401 118.201 312.801 119.001 315.601C119.001 315.601 109.001 286.401 104.601 283.601C104.601 283.601 113.001 247.201 154.201 262.801C154.201 262.801 161.001 280.001 165.401 261.601C165.401 261.601 178.201 255.201 189.401 282.801C189.401 282.801 193.401 269.201 192.601 266.401C192.601 266.401 199.401 267.601 198.601 266.401C198.601 266.401 211.801 270.801 213.001 270.001C213.001 270.001 219.801 276.801 220.201 273.201C220.201 273.201 229.401 276.001 227.401 272.401C227.401 272.401 236.201 288.001 236.601 291.601L239.001 277.601L241.001 280.401C241.001 280.401 242.601 272.801 241.801 271.601C241.001 270.401 261.801 278.401 266.601 299.201L268.601 307.601C268.601 307.601 274.601 292.801 273.001 288.801C273.001 288.801 278.201 289.601 278.601 294.001C278.601 294.001 282.601 270.801 277.801 264.801C277.801 264.801 282.201 264.001 283.401 267.601L283.401 260.401C283.401 260.401 290.601 261.201 290.601 258.801C290.601 258.801 295.001 254.801 297.001 259.601C297.001 259.601 284.601 224.401 303.001 243.601C303.001 243.601 310.201 254.401 306.601 235.601C303.001 216.801 299.001 215.201 303.801 214.801C303.801 214.801 304.601 211.201 302.601 209.601C300.601 208.001 303.801 209.601 303.801 209.601C303.801 209.601 308.601 213.601 303.401 191.601C303.401 191.601 309.801 193.201 297.801 164.001C297.801 164.001 300.601 161.601 296.601 153.201C296.601 153.201 304.601 157.601 307.401 156.001C307.401 156.001 307.001 154.401 303.801 150.401C303.801 150.401 282.201 95.6 302.601 117.601C302.601 117.601 314.451 131.151 308.051 108.351C308.051 108.351 298.94 84.341 299.717 80.045L-129.83 103.065z"/></g>
-            <g style="fill: #cc7226; stroke:#000000"><path d="M299.717 80.245C300.345 80.426 302.551 81.55 303.801 83.2C303.801 83.2 310.601 94 305.401 75.6C305.401 75.6 296.201 46.8 305.001 58C305.001 58 311.001 65.2 307.801 51.6C303.936 35.173 301.401 28.8 301.401 28.8C301.401 28.8 313.001 33.6 286.201 -6L295.001 -2.4C295.001 -2.4 275.401 -42 253.801 -47.2L245.801 -53.2C245.801 -53.2 284.201 -91.2 271.401 -128C271.401 -128 264.601 -133.2 255.001 -124C255.001 -124 248.601 -119.2 242.601 -120.8C242.601 -120.8 211.801 -119.6 209.801 -119.6C207.801 -119.6 173.001 -156.8 107.401 -139.2C107.401 -139.2 102.201 -137.2 97.801 -138.4C97.801 -138.4 79.4 -154.4 30.6 -131.6C30.6 -131.6 20.6 -129.6 19 -129.6C17.4 -129.6 14.6 -129.6 6.6 -123.2C-1.4 -116.8 -1.8 -116 -3.8 -114.4C-3.8 -114.4 -20.2 -103.2 -25 -102.4C-25 -102.4 -36.6 -96 -41 -86L-44.6 -84.8C-44.6 -84.8 -46.2 -77.6 -46.6 -76.4C-46.6 -76.4 -51.4 -72.8 -52.2 -67.2C-52.2 -67.2 -61 -61.2 -60.6 -56.8C-60.6 -56.8 -62.2 -51.6 -63 -46.8C-63 -46.8 -70.2 -42 -69.4 -39.2C-69.4 -39.2 -77 -25.2 -75.8 -18.4C-75.8 -18.4 -82.2 -18.8 -85 -16.4C-85 -16.4 -85.8 -11.6 -87.4 -11.2C-87.4 -11.2 -90.2 -10 -87.8 -6C-87.8 -6 -89.4 -3.2 -89.8 -1.6C-89.8 -1.6 -89 1.2 -93.4 6.8C-93.4 6.8 -99.8 25.6 -97.8 30.8C-97.8 30.8 -97.4 35.6 -100.2 37.2C-100.2 37.2 -103.8 36.8 -95.4 48.8C-95.4 48.8 -94.6 50 -97.8 52.4C-97.8 52.4 -115 56 -117.4 72.4C-117.4 72.4 -131 87.2 -131 92.4C-131 94.705 -130.729 97.852 -130.03 102.465C-130.03 102.465 -130.6 110.801 -103 111.601C-75.4 112.401 299.717 80.245 299.717 80.245z"/></g>
-            <g style="fill: #cc7226"><path d="M-115.6 102.6C-140.6 63.2 -126.2 119.601 -126.2 119.601C-117.4 154.001 12.2 116.401 12.2 116.401C12.2 116.401 181.001 86 192.201 82C203.401 78 298.601 84.4 298.601 84.4L293.001 67.6C228.201 21.2 209.001 44.4 195.401 40.4C181.801 36.4 184.201 46 181.001 46.8C177.801 47.6 138.601 22.8 132.201 23.6C125.801 24.4 100.459 0.649 115.401 32.4C131.401 66.4 57 71.6 40.2 60.4C23.4 49.2 47.4 78.8 47.4 78.8C65.8 98.8 31.4 82 31.4 82C-3 69.2 -27 94.8 -30.2 95.6C-33.4 96.4 -38.2 99.6 -39 93.2C-39.8 86.8 -47.31 70.099 -79 96.4C-99 113.001 -112.8 91 -112.8 91L-115.6 102.6z"/></g>
-            <g style="fill: #e87f3a"><path d="M133.51 25.346C127.11 26.146 101.743 2.407 116.71 34.146C133.31 69.346 58.31 73.346 41.51 62.146C24.709 50.946 48.71 80.546 48.71 80.546C67.11 100.546 32.709 83.746 32.709 83.746C-1.691 70.946 -25.691 96.546 -28.891 97.346C-32.091 98.146 -36.891 101.346 -37.691 94.946C-38.491 88.546 -45.87 72.012 -77.691 98.146C-98.927 115.492 -112.418 94.037 -112.418 94.037L-115.618 104.146C-140.618 64.346 -125.546 122.655 -125.546 122.655C-116.745 157.056 13.509 118.146 13.509 118.146C13.509 118.146 182.31 87.746 193.51 83.746C204.71 79.746 299.038 86.073 299.038 86.073L293.51 68.764C228.71 22.364 210.31 46.146 196.71 42.146C183.11 38.146 185.51 47.746 182.31 48.546C179.11 49.346 139.91 24.546 133.51 25.346z"/></g>
-            <g style="fill: #ea8c4d"><path d="M134.819 27.091C128.419 27.891 103.685 3.862 118.019 35.891C134.219 72.092 59.619 75.092 42.819 63.892C26.019 52.692 50.019 82.292 50.019 82.292C68.419 102.292 34.019 85.492 34.019 85.492C-0.381 72.692 -24.382 98.292 -27.582 99.092C-30.782 99.892 -35.582 103.092 -36.382 96.692C-37.182 90.292 -44.43 73.925 -76.382 99.892C-98.855 117.983 -112.036 97.074 -112.036 97.074L-115.636 105.692C-139.436 66.692 -124.891 125.71 -124.891 125.71C-116.091 160.11 14.819 119.892 14.819 119.892C14.819 119.892 183.619 89.492 194.819 85.492C206.019 81.492 299.474 87.746 299.474 87.746L294.02 69.928C229.219 23.528 211.619 47.891 198.019 43.891C184.419 39.891 186.819 49.491 183.619 50.292C180.419 51.092 141.219 26.291 134.819 27.091z"/></g>
-            <g style="fill: #ec9961"><path d="M136.128 28.837C129.728 29.637 104.999 5.605 119.328 37.637C136.128 75.193 60.394 76.482 44.128 65.637C27.328 54.437 51.328 84.037 51.328 84.037C69.728 104.037 35.328 87.237 35.328 87.237C0.928 74.437 -23.072 100.037 -26.272 100.837C-29.472 101.637 -34.272 104.837 -35.072 98.437C-35.872 92.037 -42.989 75.839 -75.073 101.637C-98.782 120.474 -111.655 100.11 -111.655 100.11L-115.655 107.237C-137.455 70.437 -124.236 128.765 -124.236 128.765C-115.436 163.165 16.128 121.637 16.128 121.637C16.128 121.637 184.928 91.237 196.129 87.237C207.329 83.237 299.911 89.419 299.911 89.419L294.529 71.092C229.729 24.691 212.929 49.637 199.329 45.637C185.728 41.637 188.128 51.237 184.928 52.037C181.728 52.837 142.528 28.037 136.128 28.837z"/></g>
-            <g style="fill: #eea575"><path d="M137.438 30.583C131.037 31.383 106.814 7.129 120.637 39.383C137.438 78.583 62.237 78.583 45.437 67.383C28.637 56.183 52.637 85.783 52.637 85.783C71.037 105.783 36.637 88.983 36.637 88.983C2.237 76.183 -21.763 101.783 -24.963 102.583C-28.163 103.383 -32.963 106.583 -33.763 100.183C-34.563 93.783 -41.548 77.752 -73.763 103.383C-98.709 122.965 -111.273 103.146 -111.273 103.146L-115.673 108.783C-135.473 73.982 -123.582 131.819 -123.582 131.819C-114.782 166.22 17.437 123.383 17.437 123.383C17.437 123.383 186.238 92.983 197.438 88.983C208.638 84.983 300.347 91.092 300.347 91.092L295.038 72.255C230.238 25.855 214.238 51.383 200.638 47.383C187.038 43.383 189.438 52.983 186.238 53.783C183.038 54.583 143.838 29.783 137.438 30.583z"/></g>
-            <g style="fill: #f1b288"><path d="M138.747 32.328C132.347 33.128 106.383 9.677 121.947 41.128C141.147 79.928 63.546 80.328 46.746 69.128C29.946 57.928 53.946 87.528 53.946 87.528C72.346 107.528 37.946 90.728 37.946 90.728C3.546 77.928 -20.454 103.528 -23.654 104.328C-26.854 105.128 -31.654 108.328 -32.454 101.928C-33.254 95.528 -40.108 79.665 -72.454 105.128C-98.636 125.456 -110.891 106.183 -110.891 106.183L-115.691 110.328C-133.691 77.128 -122.927 134.874 -122.927 134.874C-114.127 169.274 18.746 125.128 18.746 125.128C18.746 125.128 187.547 94.728 198.747 90.728C209.947 86.728 300.783 92.764 300.783 92.764L295.547 73.419C230.747 27.019 215.547 53.128 201.947 49.128C188.347 45.128 190.747 54.728 187.547 55.528C184.347 56.328 145.147 31.528 138.747 32.328z"/></g>
-            <g style="fill: #f3bf9c"><path d="M140.056 34.073C133.655 34.873 107.313 11.613 123.255 42.873C143.656 82.874 64.855 82.074 48.055 70.874C31.255 59.674 55.255 89.274 55.255 89.274C73.655 109.274 39.255 92.474 39.255 92.474C4.855 79.674 -19.145 105.274 -22.345 106.074C-25.545 106.874 -30.345 110.074 -31.145 103.674C-31.945 97.274 -38.668 81.578 -71.145 106.874C-98.564 127.947 -110.509 109.219 -110.509 109.219L-115.709 111.874C-131.709 81.674 -122.273 137.929 -122.273 137.929C-113.473 172.329 20.055 126.874 20.055 126.874C20.055 126.874 188.856 96.474 200.056 92.474C211.256 88.474 301.22 94.437 301.22 94.437L296.056 74.583C231.256 28.183 216.856 54.874 203.256 50.874C189.656 46.873 192.056 56.474 188.856 57.274C185.656 58.074 146.456 33.273 140.056 34.073z"/></g>
-            <g style="fill: #f5ccb0"><path d="M141.365 35.819C134.965 36.619 107.523 13.944 124.565 44.619C146.565 84.219 66.164 83.819 49.364 72.619C32.564 61.419 56.564 91.019 56.564 91.019C74.964 111.019 40.564 94.219 40.564 94.219C6.164 81.419 -17.836 107.019 -21.036 107.819C-24.236 108.619 -29.036 111.819 -29.836 105.419C-30.636 99.019 -37.227 83.492 -69.836 108.619C-98.491 130.438 -110.127 112.256 -110.127 112.256L-115.727 113.419C-130.128 85.019 -121.618 140.983 -121.618 140.983C-112.818 175.384 21.364 128.619 21.364 128.619C21.364 128.619 190.165 98.219 201.365 94.219C212.565 90.219 301.656 96.11 301.656 96.11L296.565 75.746C231.765 29.346 218.165 56.619 204.565 52.619C190.965 48.619 193.365 58.219 190.165 59.019C186.965 59.819 147.765 35.019 141.365 35.819z"/></g>
-            <g style="fill: #f8d8c4"><path d="M142.674 37.565C136.274 38.365 108.832 15.689 125.874 46.365C147.874 85.965 67.474 85.565 50.674 74.365C33.874 63.165 57.874 92.765 57.874 92.765C76.274 112.765 41.874 95.965 41.874 95.965C7.473 83.165 -16.527 108.765 -19.727 109.565C-22.927 110.365 -27.727 113.565 -28.527 107.165C-29.327 100.765 -35.786 85.405 -68.527 110.365C-98.418 132.929 -109.745 115.293 -109.745 115.293L-115.745 114.965C-129.346 88.564 -120.963 144.038 -120.963 144.038C-112.163 178.438 22.673 130.365 22.673 130.365C22.673 130.365 191.474 99.965 202.674 95.965C213.874 91.965 302.093 97.783 302.093 97.783L297.075 76.91C232.274 30.51 219.474 58.365 205.874 54.365C192.274 50.365 194.674 59.965 191.474 60.765C188.274 61.565 149.074 36.765 142.674 37.565z"/></g>
-            <g style="fill: #fae5d7"><path d="M143.983 39.31C137.583 40.11 110.529 17.223 127.183 48.11C149.183 88.91 68.783 87.31 51.983 76.11C35.183 64.91 59.183 94.51 59.183 94.51C77.583 114.51 43.183 97.71 43.183 97.71C8.783 84.91 -15.217 110.51 -18.417 111.31C-21.618 112.11 -26.418 115.31 -27.218 108.91C-28.018 102.51 -34.346 87.318 -67.218 112.11C-98.345 135.42 -109.363 118.329 -109.363 118.329L-115.764 116.51C-128.764 92.51 -120.309 147.093 -120.309 147.093C-111.509 181.493 23.983 132.11 23.983 132.11C23.983 132.11 192.783 101.71 203.983 97.71C215.183 93.71 302.529 99.456 302.529 99.456L297.583 78.074C232.783 31.673 220.783 60.11 207.183 56.11C193.583 52.11 195.983 61.71 192.783 62.51C189.583 63.31 150.383 38.51 143.983 39.31z"/></g>
-            <g style="fill: #fcf2eb"><path d="M145.292 41.055C138.892 41.855 112.917 18.411 128.492 49.855C149.692 92.656 70.092 89.056 53.292 77.856C36.492 66.656 60.492 96.256 60.492 96.256C78.892 116.256 44.492 99.456 44.492 99.456C10.092 86.656 -13.908 112.256 -17.108 113.056C-20.308 113.856 -25.108 117.056 -25.908 110.656C-26.708 104.256 -32.905 89.232 -65.908 113.856C-98.273 137.911 -108.982 121.365 -108.982 121.365L-115.782 118.056C-128.582 94.856 -119.654 150.147 -119.654 150.147C-110.854 184.547 25.292 133.856 25.292 133.856C25.292 133.856 194.093 103.456 205.293 99.456C216.493 95.456 302.965 101.128 302.965 101.128L298.093 79.237C233.292 32.837 222.093 61.856 208.493 57.856C194.893 53.855 197.293 63.456 194.093 64.256C190.892 65.056 151.692 40.255 145.292 41.055z"/></g>
-            <g style="fill: #ffffff"><path d="M-115.8 119.601C-128.6 97.6 -119 153.201 -119 153.201C-110.2 187.601 26.6 135.601 26.6 135.601C26.6 135.601 195.401 105.2 206.601 101.2C217.801 97.2 303.401 102.8 303.401 102.8L298.601 80.4C233.801 34 223.401 63.6 209.801 59.6C196.201 55.6 198.601 65.2 195.401 66C192.201 66.8 153.001 42 146.601 42.8C140.201 43.6 114.981 19.793 129.801 51.6C152.028 99.307 69.041 89.227 54.6 79.6C37.8 68.4 61.8 98 61.8 98C80.2 118.001 45.8 101.2 45.8 101.2C11.4 88.4 -12.6 114.001 -15.8 114.801C-19 115.601 -23.8 118.801 -24.6 112.401C-25.4 106 -31.465 91.144 -64.6 115.601C-98.2 140.401 -108.6 124.401 -108.6 124.401L-115.8 119.601z"/></g>
-            <g style="fill: #000000"><path d="M-74.2 149.601C-74.2 149.601 -81.4 161.201 -60.6 174.401C-60.6 174.401 -59.2 175.801 -77.2 171.601C-77.2 171.601 -83.4 169.601 -85 159.201C-85 159.201 -89.8 154.801 -94.6 149.201C-99.4 143.601 -74.2 149.601 -74.2 149.601z"/></g>
-            <g style="fill: #cccccc"><path d="M65.8 102C65.8 102 83.498 128.821 82.9 133.601C81.6 144.001 81.4 153.601 84.6 157.601C87.801 161.601 96.601 194.801 96.601 194.801C96.601 194.801 96.201 196.001 108.601 158.001C108.601 158.001 120.201 142.001 100.201 123.601C100.201 123.601 65 94.8 65.8 102z"/></g>
-            <g style="fill: #000000"><path d="M-54.2 176.401C-54.2 176.401 -43 183.601 -57.4 214.801L-51 212.401C-51 212.401 -51.8 223.601 -55 226.001L-47.8 222.801C-47.8 222.801 -43 230.801 -47 235.601C-47 235.601 -30.2 243.601 -31 250.001C-31 250.001 -24.6 242.001 -28.6 235.601C-32.6 229.201 -39.8 233.201 -39 214.801L-47.8 218.001C-47.8 218.001 -42.2 209.201 -42.2 202.801L-50.2 205.201C-50.2 205.201 -34.731 178.623 -45.4 177.201C-51.4 176.401 -54.2 176.401 -54.2 176.401z"/></g>
-            <g style="fill: #cccccc"><path d="M-21.8 193.201C-21.8 193.201 -19 188.801 -21.8 189.601C-24.6 190.401 -55.8 205.201 -61.8 214.801C-61.8 214.801 -27.4 190.401 -21.8 193.201z"/></g>
-            <g style="fill: #cccccc"><path d="M-11.4 201.201C-11.4 201.201 -8.6 196.801 -11.4 197.601C-14.2 198.401 -45.4 213.201 -51.4 222.801C-51.4 222.801 -17 198.401 -11.4 201.201z"/></g>
-            <g style="fill: #cccccc"><path d="M1.8 186.001C1.8 186.001 4.6 181.601 1.8 182.401C-1 183.201 -32.2 198.001 -38.2 207.601C-38.2 207.601 -3.8 183.201 1.8 186.001z"/></g>
-            <g style="fill: #cccccc"><path d="M-21.4 229.601C-21.4 229.601 -21.4 223.601 -24.2 224.401C-27 225.201 -63 242.801 -69 252.401C-69 252.401 -27 226.801 -21.4 229.601z"/></g>
-            <g style="fill: #cccccc"><path d="M-20.2 218.801C-20.2 218.801 -19 214.001 -21.8 214.801C-23.8 214.801 -50.2 226.401 -56.2 236.001C-56.2 236.001 -26.6 214.401 -20.2 218.801z"/></g>
-            <g style="fill: #cccccc"><path d="M-34.6 266.401L-44.6 274.001C-44.6 274.001 -34.2 266.401 -30.6 267.601C-30.6 267.601 -37.4 278.801 -38.2 284.001C-38.2 284.001 -27.8 271.201 -22.2 271.601C-22.2 271.601 -14.6 272.001 -14.6 282.801C-14.6 282.801 -9 272.401 -5.8 272.801C-5.8 272.801 -4.6 279.201 -5.8 286.001C-5.8 286.001 -1.8 278.401 2.2 280.001C2.2 280.001 8.6 278.001 7.8 289.601C7.8 289.601 7.8 300.001 7 302.801C7 302.801 12.6 276.401 15 276.001C15 276.001 23 274.801 27.8 283.601C27.8 283.601 23.8 276.001 28.6 278.001C28.6 278.001 39.4 279.601 42.6 286.401C42.6 286.401 35.8 274.401 41.4 277.601C41.4 277.601 48.2 277.601 49.4 284.001C49.4 284.001 57.8 305.201 59.8 306.801C59.8 306.801 52.2 285.201 53.8 285.201C53.8 285.201 51.8 273.201 57 288.001C57 288.001 53.8 274.001 59.4 274.801C65 275.601 69.4 285.601 77.8 283.201C77.8 283.201 87.401 288.801 89.401 219.601L-34.6 266.401z"/></g>
-            <g style="fill: #000000"><path d="M-29.8 173.601C-29.8 173.601 -15 167.601 25 173.601C25 173.601 32.2 174.001 39 165.201C45.8 156.401 72.6 149.201 79 151.201L88.601 157.601L89.401 158.801C89.401 158.801 101.801 169.201 102.201 176.801C102.601 184.401 87.801 232.401 78.2 248.401C68.6 264.401 59 276.801 39.8 274.401C39.8 274.401 19 270.401 -6.6 274.401C-6.6 274.401 -35.8 272.801 -38.6 264.801C-41.4 256.801 -27.4 241.601 -27.4 241.601C-27.4 241.601 -23 233.201 -24.2 218.801C-25.4 204.401 -25 176.401 -29.8 173.601z"/></g>
-            <g style="fill: #e5668c"><path d="M-7.8 175.601C0.6 194.001 -29 259.201 -29 259.201C-31 260.801 -16.34 266.846 -6.2 264.401C4.746 261.763 45 266.001 45 266.001C68.6 250.401 81.4 206.001 81.4 206.001C81.4 206.001 91.801 182.001 74.2 178.801C56.6 175.601 -7.8 175.601 -7.8 175.601z"/></g>
-            <g style="fill: #b23259"><path d="M-9.831 206.497C-6.505 193.707 -4.921 181.906 -7.8 175.601C-7.8 175.601 54.6 182.001 65.8 161.201C70.041 153.326 84.801 184.001 84.4 193.601C84.4 193.601 21.4 208.001 6.6 196.801L-9.831 206.497z"/></g>
-            <g style="fill: #a5264c"><path d="M-5.4 222.801C-5.4 222.801 -3.4 230.001 -5.8 234.001C-5.8 234.001 -7.4 234.801 -8.6 235.201C-8.6 235.201 -7.4 238.801 -1.4 240.401C-1.4 240.401 0.6 244.801 3 245.201C5.4 245.601 10.2 251.201 14.2 250.001C18.2 248.801 29.4 244.801 29.4 244.801C29.4 244.801 35 241.601 43.8 245.201C43.8 245.201 46.175 244.399 46.6 240.401C47.1 235.701 50.2 232.001 52.2 230.001C54.2 228.001 63.8 215.201 62.6 214.801C61.4 214.401 -5.4 222.801 -5.4 222.801z"/></g>
-            <g style="fill: #ff727f; stroke:#000000"><path d="M-9.8 174.401C-9.8 174.401 -12.6 196.801 -9.4 205.201C-6.2 213.601 -7 215.601 -7.8 219.601C-8.6 223.601 -4.2 233.601 1.4 239.601L13.4 241.201C13.4 241.201 28.6 237.601 37.8 240.401C37.8 240.401 46.794 241.744 50.2 226.801C50.2 226.801 55 220.401 62.2 217.601C69.4 214.801 76.6 173.201 72.6 165.201C68.6 157.201 54.2 152.801 38.2 168.401C22.2 184.001 20.2 167.201 -9.8 174.401z"/></g>
-            <g style="fill: #ffffcc; stroke:#000000; stroke-width:0.5"><path d="M-8.2 249.201C-8.2 249.201 -9 247.201 -13.4 246.801C-13.4 246.801 -35.8 243.201 -44.2 230.801C-44.2 230.801 -51 225.201 -46.6 236.801C-46.6 236.801 -36.2 257.201 -29.4 260.001C-29.4 260.001 -13 264.001 -8.2 249.201z"/></g>
-            <g style="fill: #cc3f4c"><path d="M71.742 185.229C72.401 177.323 74.354 168.709 72.6 165.201C66.154 152.307 49.181 157.695 38.2 168.401C22.2 184.001 20.2 167.201 -9.8 174.401C-9.8 174.401 -11.545 188.364 -10.705 198.376C-10.705 198.376 26.6 186.801 27.4 192.401C27.4 192.401 29 189.201 38.2 189.201C47.4 189.201 70.142 188.029 71.742 185.229z"/></g>
-            <g style="stroke:#a51926; stroke-width:2"><path d="M28.6 175.201C28.6 175.201 33.4 180.001 29.8 189.601C29.8 189.601 15.4 205.601 17.4 219.601"/></g>
-            <g style="fill: #ffffcc; stroke:#000000; stroke-width:0.5"><path d="M-19.4 260.001C-19.4 260.001 -23.8 247.201 -15 254.001C-15 254.001 -10.2 256.001 -11.4 257.601C-12.6 259.201 -18.2 263.201 -19.4 260.001z"/></g>
-            <g style="fill: #ffffcc; stroke:#000000; stroke-width:0.5"><path d="M-14.36 261.201C-14.36 261.201 -17.88 250.961 -10.84 256.401C-10.84 256.401 -6.419 258.849 -7.96 259.281C-12.52 260.561 -7.96 263.121 -14.36 261.201z"/></g>
-            <g style="fill: #ffffcc; stroke:#000000; stroke-width:0.5"><path d="M-9.56 261.201C-9.56 261.201 -13.08 250.961 -6.04 256.401C-6.04 256.401 -1.665 258.711 -3.16 259.281C-6.52 260.561 -3.16 263.121 -9.56 261.201z"/></g>
-            <g style="fill: #ffffcc; stroke:#000000; stroke-width:0.5"><path d="M-2.96 261.401C-2.96 261.401 -6.48 251.161 0.56 256.601C0.56 256.601 4.943 258.933 3.441 259.481C0.48 260.561 3.441 263.321 -2.96 261.401z"/></g>
-            <g style="fill: #ffffcc; stroke:#000000; stroke-width:0.5"><path d="M3.52 261.321C3.52 261.321 0 251.081 7.041 256.521C7.041 256.521 10.881 258.121 9.921 259.401C8.961 260.681 9.921 263.241 3.52 261.321z"/></g>
-            <g style="fill: #ffffcc; stroke:#000000; stroke-width:0.5"><path d="M10.2 262.001C10.2 262.001 5.4 249.601 14.6 256.001C14.6 256.001 19.4 258.001 18.2 259.601C17 261.201 18.2 264.401 10.2 262.001z"/></g>
-            <g style="stroke:#a5264c; stroke-width:2"><path d="M-18.2 244.801C-18.2 244.801 -5 242.001 1 245.201C1 245.201 7 246.401 8.2 246.001C9.4 245.601 12.6 245.201 12.6 245.201"/></g>
-            <g style="stroke:#a5264c; stroke-width:2"><path d="M15.8 253.601C15.8 253.601 27.8 240.001 39.8 244.401C46.816 246.974 45.8 243.601 46.6 240.801C47.4 238.001 47.6 233.801 52.6 230.801"/></g>
-            <g style="fill: #ffffcc; stroke:#000000; stroke-width:0.5"><path d="M33 237.601C33 237.601 29 226.801 26.2 239.601C23.4 252.401 20.2 256.001 18.6 258.801C18.6 258.801 18.6 264.001 27 263.601C27 263.601 37.8 263.201 38.2 260.401C38.6 257.601 37 246.001 33 237.601z"/></g>
-            <g style="stroke:#a5264c; stroke-width:2"><path d="M47 244.801C47 244.801 50.6 242.401 53 243.601"/></g>
-            <g style="stroke:#a5264c; stroke-width:2"><path d="M53.5 228.401C53.5 228.401 56.4 223.501 61.2 222.701"/></g>
-            <g style="fill: #b2b2b2"><path d="M-25.8 265.201C-25.8 265.201 -7.8 268.401 -3.4 266.801C-3.4 266.801 5.4 266.801 -3 268.801C-3 268.801 -15.8 268.801 -23.8 267.601C-23.8 267.601 -35.4 262.001 -25.8 265.201z"/></g>
-            <g style="fill: #ffffcc; stroke:#000000; stroke-width:0.5"><path d="M-11.8 172.001C-11.8 172.001 5.8 172.001 7.8 172.801C7.8 172.801 15 203.601 11.4 211.201C11.4 211.201 10.2 214.001 7.4 208.401C7.4 208.401 -11 175.601 -14.2 173.601C-17.4 171.601 -13 172.001 -11.8 172.001z"/></g>
-            <g style="fill: #ffffcc; stroke:#000000; stroke-width:0.5"><path d="M-88.9 169.301C-88.9 169.301 -80 171.001 -67.4 173.601C-67.4 173.601 -62.6 196.001 -59.4 200.801C-56.2 205.601 -59.8 205.601 -63.4 202.801C-67 200.001 -81.8 186.001 -83.8 181.601C-85.8 177.201 -88.9 169.301 -88.9 169.301z"/></g>
-            <g style="fill: #ffffcc; stroke:#000000; stroke-width:0.5"><path d="M-67.039 173.818C-67.039 173.818 -61.239 175.366 -60.23 177.581C-59.222 179.795 -61.432 183.092 -61.432 183.092C-61.432 183.092 -62.432 186.397 -63.634 184.235C-64.836 182.072 -67.708 174.412 -67.039 173.818z"/></g>
-            <g style="fill: #000000"><path d="M-67 173.601C-67 173.601 -63.4 178.801 -59.8 178.801C-56.2 178.801 -55.818 178.388 -53 179.001C-48.4 180.001 -48.8 178.001 -42.2 179.201C-39.56 179.681 -37 178.801 -34.2 180.001C-31.4 181.201 -28.2 180.401 -27 178.401C-25.8 176.401 -21 172.201 -21 172.201C-21 172.201 -33.8 174.001 -36.6 174.801C-36.6 174.801 -59 176.001 -67 173.601z"/></g>
-            <g style="fill: #ffffcc; stroke:#000000; stroke-width:0.5"><path d="M-22.4 173.801C-22.4 173.801 -28.85 177.301 -29.25 179.701C-29.65 182.101 -24 185.801 -24 185.801C-24 185.801 -21.25 190.401 -20.65 188.001C-20.05 185.601 -21.6 174.201 -22.4 173.801z"/></g>
-            <g style="fill: #ffffcc; stroke:#000000; stroke-width:0.5"><path d="M-59.885 179.265C-59.885 179.265 -52.878 190.453 -52.661 179.242C-52.661 179.242 -52.104 177.984 -53.864 177.962C-59.939 177.886 -58.418 173.784 -59.885 179.265z"/></g>
-            <g style="fill: #ffffcc; stroke:#000000; stroke-width:0.5"><path d="M-52.707 179.514C-52.707 179.514 -44.786 190.701 -45.422 179.421C-45.422 179.421 -45.415 179.089 -47.168 178.936C-51.915 178.522 -51.57 174.004 -52.707 179.514z"/></g>
-            <g style="fill: #ffffcc; stroke:#000000; stroke-width:0.5"><path d="M-45.494 179.522C-45.494 179.522 -37.534 190.15 -38.203 180.484C-38.203 180.484 -38.084 179.251 -39.738 178.95C-43.63 178.244 -43.841 174.995 -45.494 179.522z"/></g>
-            <g style="fill: #ffffcc; stroke:#000000; stroke-width:0.5"><path d="M-38.618 179.602C-38.618 179.602 -30.718 191.163 -30.37 181.382C-30.37 181.382 -28.726 180.004 -30.472 179.782C-36.29 179.042 -35.492 174.588 -38.618 179.602z"/></g>
-            <g style="fill: #e5e5b2"><path d="M-74.792 183.132L-82.45 181.601C-85.05 176.601 -87.15 170.451 -87.15 170.451C-87.15 170.451 -80.8 171.451 -68.3 174.251C-68.3 174.251 -67.424 177.569 -65.952 183.364L-74.792 183.132z"/></g>
-            <g style="fill: #e5e5b2"><path d="M-9.724 178.47C-11.39 175.964 -12.707 174.206 -13.357 173.8C-16.37 171.917 -12.227 172.294 -11.098 172.294C-11.098 172.294 5.473 172.294 7.356 173.047C7.356 173.047 7.88 175.289 8.564 178.68C8.564 178.68 -1.524 176.67 -9.724 178.47z"/></g>
-            <g style="fill: #cc7226"><path d="M43.88 40.321C71.601 44.281 97.121 8.641 98.881 -1.04C100.641 -10.72 90.521 -22.6 90.521 -22.6C91.841 -25.68 87.001 -39.76 81.721 -49C76.441 -58.24 60.54 -57.266 43 -58.24C27.16 -59.12 8.68 -35.8 7.36 -34.04C6.04 -32.28 12.2 6.001 13.52 11.721C14.84 17.441 12.2 43.841 12.2 43.841C46.44 34.741 16.16 36.361 43.88 40.321z"/></g>
-            <g style="fill: #ea8e51"><path d="M8.088 -33.392C6.792 -31.664 12.84 5.921 14.136 11.537C15.432 17.153 12.84 43.073 12.84 43.073C45.512 34.193 16.728 35.729 43.944 39.617C71.161 43.505 96.217 8.513 97.945 -0.992C99.673 -10.496 89.737 -22.16 89.737 -22.16C91.033 -25.184 86.281 -39.008 81.097 -48.08C75.913 -57.152 60.302 -56.195 43.08 -57.152C27.528 -58.016 9.384 -35.12 8.088 -33.392z"/></g>
-            <g style="fill: #efaa7c"><path d="M8.816 -32.744C7.544 -31.048 13.48 5.841 14.752 11.353C16.024 16.865 13.48 42.305 13.48 42.305C44.884 33.145 17.296 35.097 44.008 38.913C70.721 42.729 95.313 8.385 97.009 -0.944C98.705 -10.272 88.953 -21.72 88.953 -21.72C90.225 -24.688 85.561 -38.256 80.473 -47.16C75.385 -56.064 60.063 -55.125 43.16 -56.064C27.896 -56.912 10.088 -34.44 8.816 -32.744z"/></g>
-            <g style="fill: #f4c6a8"><path d="M9.544 -32.096C8.296 -30.432 14.12 5.761 15.368 11.169C16.616 16.577 14.12 41.537 14.12 41.537C43.556 32.497 17.864 34.465 44.072 38.209C70.281 41.953 94.409 8.257 96.073 -0.895C97.737 -10.048 88.169 -21.28 88.169 -21.28C89.417 -24.192 84.841 -37.504 79.849 -46.24C74.857 -54.976 59.824 -54.055 43.24 -54.976C28.264 -55.808 10.792 -33.76 9.544 -32.096z"/></g>
-            <g style="fill: #f9e2d3"><path d="M10.272 -31.448C9.048 -29.816 14.76 5.681 15.984 10.985C17.208 16.289 14.76 40.769 14.76 40.769C42.628 31.849 18.432 33.833 44.136 37.505C69.841 41.177 93.505 8.129 95.137 -0.848C96.769 -9.824 87.385 -20.84 87.385 -20.84C88.609 -23.696 84.121 -36.752 79.225 -45.32C74.329 -53.888 59.585 -52.985 43.32 -53.888C28.632 -54.704 11.496 -33.08 10.272 -31.448z"/></g>
-            <g style="fill: #ffffff"><path d="M44.2 36.8C69.4 40.4 92.601 8 94.201 -0.8C95.801 -9.6 86.601 -20.4 86.601 -20.4C87.801 -23.2 83.4 -36 78.6 -44.4C73.8 -52.8 59.346 -51.914 43.4 -52.8C29 -53.6 12.2 -32.4 11 -30.8C9.8 -29.2 15.4 5.6 16.6 10.8C17.8 16 15.4 40 15.4 40C40.9 31.4 19 33.2 44.2 36.8z"/></g>
-            <g style="fill: #cccccc"><path d="M90.601 2.8C90.601 2.8 62.8 10.4 51.2 8.8C51.2 8.8 35.4 2.2 26.6 24C26.6 24 23 31.2 21 33.2C19 35.2 90.601 2.8 90.601 2.8z"/></g>
-            <g style="fill: #000000"><path d="M94.401 0.6C94.401 0.6 65.4 12.8 55.4 12.4C55.4 12.4 39 7.8 30.6 22.4C30.6 22.4 22.2 31.6 19 33.2C19 33.2 18.6 34.8 25 30.8L35.4 36C35.4 36 50.2 45.6 59.8 29.6C59.8 29.6 63.8 18.4 63.8 16.4C63.8 14.4 85 8.8 86.601 8.4C88.201 8 94.801 3.8 94.401 0.6z"/></g>
-            <g style="fill: #99cc32"><path d="M47 36.514C40.128 36.514 31.755 32.649 31.755 26.4C31.755 20.152 40.128 13.887 47 13.887C53.874 13.887 59.446 18.952 59.446 25.2C59.446 31.449 53.874 36.514 47 36.514z"/></g>
-            <g style="fill: #659900"><path d="M43.377 19.83C38.531 20.552 33.442 22.055 33.514 21.839C35.054 17.22 41.415 13.887 47 13.887C51.296 13.887 55.084 15.865 57.32 18.875C57.32 18.875 52.004 18.545 43.377 19.83z"/></g>
-            <g style="fill: #ffffff"><path d="M55.4 19.6C55.4 19.6 51 16.4 51 18.6C51 18.6 54.6 23 55.4 19.6z"/></g>
-            <g style="fill: #000000"><path d="M45.4 27.726C42.901 27.726 40.875 25.7 40.875 23.2C40.875 20.701 42.901 18.675 45.4 18.675C47.9 18.675 49.926 20.701 49.926 23.2C49.926 25.7 47.9 27.726 45.4 27.726z"/></g>
-            <g style="fill: #cc7226"><path d="M-58.6 14.4C-58.6 14.4 -61.8 -6.8 -59.4 -11.2C-59.4 -11.2 -48.6 -21.2 -49 -24.8C-49 -24.8 -49.4 -42.8 -50.6 -43.6C-51.8 -44.4 -59.4 -50.4 -65.4 -44C-65.4 -44 -75.8 -26 -75 -19.6L-75 -17.6C-75 -17.6 -82.6 -18 -84.2 -16C-84.2 -16 -85.4 -10.8 -86.6 -10.4C-86.6 -10.4 -89.4 -8 -87.4 -5.2C-87.4 -5.2 -89.4 -2.8 -89 1.2L-81.4 5.2C-81.4 5.2 -79.4 19.6 -68.6 24.8C-63.764 27.129 -60.6 20.4 -58.6 14.4z"/></g>
-            <g style="fill: #ffffff"><path d="M-59.6 12.56C-59.6 12.56 -62.48 -6.52 -60.32 -10.48C-60.32 -10.48 -50.6 -19.48 -50.96 -22.72C-50.96 -22.72 -51.32 -38.92 -52.4 -39.64C-53.48 -40.36 -60.32 -45.76 -65.72 -40C-65.72 -40 -75.08 -23.8 -74.36 -18.04L-74.36 -16.24C-74.36 -16.24 -81.2 -16.6 -82.64 -14.8C-82.64 -14.8 -83.72 -10.12 -84.8 -9.76C-84.8 -9.76 -87.32 -7.6 -85.52 -5.08C-85.52 -5.08 -87.32 -2.92 -86.96 0.68L-80.12 4.28C-80.12 4.28 -78.32 17.24 -68.6 21.92C-64.248 24.015 -61.4 17.96 -59.6 12.56z"/></g>
-            <g style="fill: #eb955c"><path d="M-51.05 -42.61C-52.14 -43.47 -59.63 -49.24 -65.48 -43C-65.48 -43 -75.62 -25.45 -74.84 -19.21L-74.84 -17.26C-74.84 -17.26 -82.25 -17.65 -83.81 -15.7C-83.81 -15.7 -84.98 -10.63 -86.15 -10.24C-86.15 -10.24 -88.88 -7.9 -86.93 -5.17C-86.93 -5.17 -88.88 -2.83 -88.49 1.07L-81.08 4.97C-81.08 4.97 -79.13 19.01 -68.6 24.08C-63.886 26.35 -60.8 19.79 -58.85 13.94C-58.85 13.94 -61.97 -6.73 -59.63 -11.02C-59.63 -11.02 -49.1 -20.77 -49.49 -24.28C-49.49 -24.28 -49.88 -41.83 -51.05 -42.61z"/></g>
-            <g style="fill: #f2b892"><path d="M-51.5 -41.62C-52.48 -42.54 -59.86 -48.08 -65.56 -42C-65.56 -42 -75.44 -24.9 -74.68 -18.82L-74.68 -16.92C-74.68 -16.92 -81.9 -17.3 -83.42 -15.4C-83.42 -15.4 -84.56 -10.46 -85.7 -10.08C-85.7 -10.08 -88.36 -7.8 -86.46 -5.14C-86.46 -5.14 -88.36 -2.86 -87.98 0.94L-80.76 4.74C-80.76 4.74 -78.86 18.42 -68.6 23.36C-64.006 25.572 -61 19.18 -59.1 13.48C-59.1 13.48 -62.14 -6.66 -59.86 -10.84C-59.86 -10.84 -49.6 -20.34 -49.98 -23.76C-49.98 -23.76 -50.36 -40.86 -51.5 -41.62z"/></g>
-            <g style="fill: #f8dcc8"><path d="M-51.95 -40.63C-52.82 -41.61 -60.09 -46.92 -65.64 -41C-65.64 -41 -75.26 -24.35 -74.52 -18.43L-74.52 -16.58C-74.52 -16.58 -81.55 -16.95 -83.03 -15.1C-83.03 -15.1 -84.14 -10.29 -85.25 -9.92C-85.25 -9.92 -87.84 -7.7 -85.99 -5.11C-85.99 -5.11 -87.84 -2.89 -87.47 0.81L-80.44 4.51C-80.44 4.51 -78.59 17.83 -68.6 22.64C-64.127 24.794 -61.2 18.57 -59.35 13.02C-59.35 13.02 -62.31 -6.59 -60.09 -10.66C-60.09 -10.66 -50.1 -19.91 -50.47 -23.24C-50.47 -23.24 -50.84 -39.89 -51.95 -40.63z"/></g>
-            <g style="fill: #ffffff"><path d="M-59.6 12.46C-59.6 12.46 -62.48 -6.52 -60.32 -10.48C-60.32 -10.48 -50.6 -19.48 -50.96 -22.72C-50.96 -22.72 -51.32 -38.92 -52.4 -39.64C-53.16 -40.68 -60.32 -45.76 -65.72 -40C-65.72 -40 -75.08 -23.8 -74.36 -18.04L-74.36 -16.24C-74.36 -16.24 -81.2 -16.6 -82.64 -14.8C-82.64 -14.8 -83.72 -10.12 -84.8 -9.76C-84.8 -9.76 -87.32 -7.6 -85.52 -5.08C-85.52 -5.08 -87.32 -2.92 -86.96 0.68L-80.12 4.28C-80.12 4.28 -78.32 17.24 -68.6 21.92C-64.248 24.015 -61.4 17.86 -59.6 12.46z"/></g>
-            <g style="fill: #cccccc"><path d="M-62.7 6.2C-62.7 6.2 -84.3 -4 -85.2 -4.8C-85.2 -4.8 -76.1 3.4 -75.3 3.4C-74.5 3.4 -62.7 6.2 -62.7 6.2z"/></g>
-            <g style="fill: #000000"><path d="M-79.8 0C-79.8 0 -61.4 3.6 -61.4 8C-61.4 10.912 -61.643 24.331 -67 22.8C-75.4 20.4 -71.8 6 -79.8 0z"/></g>
-            <g style="fill: #99cc32"><path d="M-71.4 3.8C-71.4 3.8 -62.422 5.274 -61.4 8C-60.8 9.6 -60.137 17.908 -65.6 19C-70.152 19.911 -72.382 9.69 -71.4 3.8z"/></g>
-            <g style="fill: #000000"><path d="M14.595 46.349C14.098 44.607 15.409 44.738 17.2 44.2C19.2 43.6 31.4 39.8 32.2 37.2C33 34.6 46.2 39 46.2 39C48 39.8 52.4 42.4 52.4 42.4C57.2 43.6 63.8 44 63.8 44C66.2 45 69.6 47.8 69.6 47.8C84.2 58 96.601 50.8 96.601 50.8C116.601 44.2 110.601 27 110.601 27C107.601 18 110.801 14.6 110.801 14.6C111.001 10.8 118.201 17.2 118.201 17.2C120.801 21.4 121.601 26.4 121.601 26.4C129.601 37.6 126.201 19.8 126.201 19.8C126.401 18.8 123.601 15.2 123.601 14C123.601 12.8 121.801 9.4 121.801 9.4C118.801 6 121.201 -1 121.201 -1C123.001 -14.8 120.801 -13 120.801 -13C119.601 -14.8 110.401 -4.8 110.401 -4.8C108.201 -1.4 102.201 0.2 102.201 0.2C99.401 2 96.001 0.6 96.001 0.6C93.401 0.2 87.801 7.2 87.801 7.2C90.601 7 93.001 11.4 95.401 11.6C97.801 11.8 99.601 9.2 101.201 8.6C102.801 8 105.601 13.8 105.601 13.8C106.001 16.4 100.401 21.2 100.401 21.2C100.001 25.8 98.401 24.2 98.401 24.2C95.401 23.6 94.201 27.4 93.201 32C92.201 36.6 88.001 37 88.001 37C86.401 44.4 85.2 41.4 85.2 41.4C85 35.8 79 41.6 79 41.6C77.8 43.6 73.2 41.4 73.2 41.4C66.4 39.4 68.8 37.4 68.8 37.4C70.6 35.2 81.8 37.4 81.8 37.4C84 35.8 76 31.8 76 31.8C75.4 30 76.4 25.6 76.4 25.6C77.6 22.4 84.4 16.8 84.4 16.8C93.801 15.6 91.001 14 91.001 14C84.801 8.8 79 16.4 79 16.4C76.8 22.6 59.4 37.6 59.4 37.6C54.6 41 57.2 34.2 53.2 37.6C49.2 41 28.6 32 28.6 32C17.038 30.807 14.306 46.549 10.777 43.429C10.777 43.429 16.195 51.949 14.595 46.349z"/></g>
-            <g style="fill: #000000"><path d="M209.401 -120C209.401 -120 183.801 -112 181.001 -93.2C181.001 -93.2 178.601 -70.4 199.001 -52.8C199.001 -52.8 199.401 -46.4 201.401 -43.2C201.401 -43.2 199.801 -38.4 218.601 -46L245.801 -54.4C245.801 -54.4 252.201 -56.8 257.401 -65.6C262.601 -74.4 277.801 -93.2 274.201 -118.4C274.201 -118.4 275.401 -129.6 269.401 -130C269.401 -130 261.001 -131.6 253.801 -124C253.801 -124 247.001 -120.8 244.601 -121.2L209.401 -120z"/></g>
-            <g style="fill: #000000"><path d="M264.022 -120.99C264.022 -120.99 266.122 -129.92 261.282 -125.08C261.282 -125.08 254.242 -119.36 246.761 -119.36C246.761 -119.36 232.241 -117.16 227.841 -103.96C227.841 -103.96 223.881 -77.12 231.801 -71.4C231.801 -71.4 236.641 -63.92 243.681 -70.52C250.722 -77.12 266.222 -107.35 264.022 -120.99z"/></g>
-            <g style="fill: #323232"><path d="M263.648 -120.632C263.648 -120.632 265.738 -129.376 260.986 -124.624C260.986 -124.624 254.074 -119.008 246.729 -119.008C246.729 -119.008 232.473 -116.848 228.153 -103.888C228.153 -103.888 224.265 -77.536 232.041 -71.92C232.041 -71.92 236.793 -64.576 243.705 -71.056C250.618 -77.536 265.808 -107.24 263.648 -120.632z"/></g>
-            <g style="fill: #666666"><path d="M263.274 -120.274C263.274 -120.274 265.354 -128.832 260.69 -124.168C260.69 -124.168 253.906 -118.656 246.697 -118.656C246.697 -118.656 232.705 -116.536 228.465 -103.816C228.465 -103.816 224.649 -77.952 232.281 -72.44C232.281 -72.44 236.945 -65.232 243.729 -71.592C250.514 -77.952 265.394 -107.13 263.274 -120.274z"/></g>
-            <g style="fill: #999999"><path d="M262.9 -119.916C262.9 -119.916 264.97 -128.288 260.394 -123.712C260.394 -123.712 253.738 -118.304 246.665 -118.304C246.665 -118.304 232.937 -116.224 228.777 -103.744C228.777 -103.744 225.033 -78.368 232.521 -72.96C232.521 -72.96 237.097 -65.888 243.753 -72.128C250.41 -78.368 264.98 -107.02 262.9 -119.916z"/></g>
-            <g style="fill: #cccccc"><path d="M262.526 -119.558C262.526 -119.558 264.586 -127.744 260.098 -123.256C260.098 -123.256 253.569 -117.952 246.633 -117.952C246.633 -117.952 233.169 -115.912 229.089 -103.672C229.089 -103.672 225.417 -78.784 232.761 -73.48C232.761 -73.48 237.249 -66.544 243.777 -72.664C250.305 -78.784 264.566 -106.91 262.526 -119.558z"/></g>
-            <g style="fill: #ffffff"><path d="M262.151 -119.2C262.151 -119.2 264.201 -127.2 259.801 -122.8C259.801 -122.8 253.401 -117.6 246.601 -117.6C246.601 -117.6 233.401 -115.6 229.401 -103.6C229.401 -103.6 225.801 -79.2 233.001 -74C233.001 -74 237.401 -67.2 243.801 -73.2C250.201 -79.2 264.151 -106.8 262.151 -119.2z"/></g>
-            <g style="fill: #992600"><path d="M50.6 84C50.6 84 30.2 64.8 22.2 64C22.2 64 -12.2 60 -27 78C-27 78 -9.4 57.6 18.2 63.2C18.2 63.2 -3.4 58.8 -15.8 62C-15.8 62 -32.6 62 -42.2 76L-45 80.8C-45 80.8 -41 66 -22.6 60C-22.6 60 0.2 55.2 11 60C11 60 -10.6 53.2 -20.6 55.2C-20.6 55.2 -51 52.8 -63.8 79.2C-63.8 79.2 -59.8 64.8 -45 57.6C-45 57.6 -31.4 48.8 -11 51.6C-11 51.6 3.4 54.8 8.6 57.2C13.8 59.6 12.6 56.8 4.2 52C4.2 52 -1.4 42 -15.4 42.4C-15.4 42.4 -58.2 46 -68.6 58C-68.6 58 -55 46.8 -44.6 44C-44.6 44 -22.2 36 -13.8 36.8C-13.8 36.8 11 37.8 18.6 33.8C18.6 33.8 7.4 38.8 10.6 42C13.8 45.2 20.6 52.8 20.6 54C20.6 55.2 44.8 77.3 48.4 81.7L50.6 84z"/></g>
-            <g style="fill: #cccccc"><path d="M189 278C189 278 173.5 241.5 161 232C161 232 187 248 190.5 266C190.5 266 190.5 276 189 278z"/></g>
-            <g style="fill: #cccccc"><path d="M236 285.5C236 285.5 209.5 230.5 191 206.5C191 206.5 234.5 244 239.5 270.5L240 276L237 273.5C237 273.5 236.5 282.5 236 285.5z"/></g>
-            <g style="fill: #cccccc"><path d="M292.5 237C292.5 237 230 177.5 228.5 175C228.5 175 289 241 292 248.5C292 248.5 290 239.5 292.5 237z"/></g>
-            <g style="fill: #cccccc"><path d="M104 280.5C104 280.5 123.5 228.5 142.5 251C142.5 251 157.5 261 157 264C157 264 153 257.5 135 258C135 258 116 255 104 280.5z"/></g>
-            <g style="fill: #cccccc"><path d="M294.5 153C294.5 153 249.5 124.5 242 123C230.193 120.639 291.5 152 296.5 162.5C296.5 162.5 298.5 160 294.5 153z"/></g>
-            <g style="fill: #000000"><path d="M143.801 259.601C143.801 259.601 164.201 257.601 171.001 250.801L175.401 254.401L193.001 216.001L196.601 221.201C196.601 221.201 211.001 206.401 210.201 198.401C209.401 190.401 223.001 204.401 223.001 204.401C223.001 204.401 222.201 192.801 229.401 199.601C229.401 199.601 227.001 184.001 235.401 192.001C235.401 192.001 224.864 161.844 247.401 187.601C253.001 194.001 248.601 187.201 248.601 187.201C248.601 187.201 222.601 139.201 244.201 153.601C244.201 153.601 246.201 130.801 245.001 126.401C243.801 122.001 241.801 99.6 237.001 94.4C232.201 89.2 237.401 87.6 243.001 92.8C243.001 92.8 231.801 68.8 245.001 80.8C245.001 80.8 241.401 65.6 237.001 62.8C237.001 62.8 231.401 45.6 246.601 56.4C246.601 56.4 242.201 44 239.001 40.8C239.001 40.8 227.401 13.2 234.601 18L239.001 21.6C239.001 21.6 232.201 7.6 238.601 12C245.001 16.4 245.001 16 245.001 16C245.001 16 223.801 -17.2 244.201 0.4C244.201 0.4 236.042 -13.518 232.601 -20.4C232.601 -20.4 213.801 -40.8 228.201 -34.4L233.001 -32.8C233.001 -32.8 224.201 -42.8 216.201 -44.4C208.201 -46 218.601 -52.4 225.001 -50.4C231.401 -48.4 247.001 -40.8 247.001 -40.8C247.001 -40.8 259.801 -22 263.801 -21.6C263.801 -21.6 243.801 -29.2 249.801 -21.2C249.801 -21.2 264.201 -7.2 257.001 -7.6C257.001 -7.6 251.001 -0.4 255.801 8.4C255.801 8.4 237.342 -9.991 252.201 15.6L259.001 32C259.001 32 234.601 7.2 245.801 29.2C245.801 29.2 263.001 52.8 265.001 53.2C267.001 53.6 271.401 62.4 271.401 62.4L267.001 60.4L272.201 69.2C272.201 69.2 261.001 57.2 267.001 70.4L272.601 84.8C272.601 84.8 252.201 62.8 265.801 92.4C265.801 92.4 249.401 87.2 258.201 104.4C258.201 104.4 256.601 120.401 257.001 125.601C257.401 130.801 258.601 159.201 254.201 167.201C249.801 175.201 260.201 194.401 262.201 198.401C264.201 202.401 267.801 213.201 259.001 204.001C250.201 194.801 254.601 200.401 256.601 209.201C258.601 218.001 264.601 233.601 263.801 239.201C263.801 239.201 262.601 240.401 259.401 236.801C259.401 236.801 244.601 214.001 246.201 228.401C246.201 228.401 245.001 236.401 241.801 245.201C241.801 245.201 238.601 256.001 238.601 247.201C238.601 247.201 235.401 230.401 232.601 238.001C229.801 245.601 226.201 251.601 223.401 254.001C220.601 256.401 215.401 233.601 214.201 244.001C214.201 244.001 202.201 231.601 197.401 248.001L185.801 264.401C185.801 264.401 185.401 252.001 184.201 258.001C184.201 258.001 154.201 264.001 143.801 259.601z"/></g>
-            <g style="fill: #000000"><path d="M109.401 -97.2C109.401 -97.2 97.801 -105.2 93.801 -104.8C89.801 -104.4 121.401 -113.6 162.601 -86C162.601 -86 167.401 -83.2 171.001 -83.6C171.001 -83.6 174.201 -81.2 171.401 -77.6C171.401 -77.6 162.601 -68 173.801 -56.8C173.801 -56.8 192.201 -50 186.601 -58.8C186.601 -58.8 197.401 -54.8 199.801 -50.8C202.201 -46.8 201.001 -50.8 201.001 -50.8C201.001 -50.8 194.601 -58 188.601 -63.2C188.601 -63.2 183.401 -65.2 180.601 -73.6C177.801 -82 175.401 -92 179.801 -95.2C179.801 -95.2 175.801 -90.8 176.601 -94.8C177.401 -98.8 181.001 -102.4 182.601 -102.8C184.201 -103.2 200.601 -119 207.401 -119.4C207.401 -119.4 198.201 -118 195.201 -119C192.201 -120 165.601 -131.4 159.601 -132.6C159.601 -132.6 142.801 -139.2 154.801 -137.2C154.801 -137.2 190.601 -133.4 208.801 -120.2C208.801 -120.2 201.601 -128.6 183.201 -135.6C183.201 -135.6 161.001 -148.2 125.801 -143.2C125.801 -143.2 108.001 -140 100.201 -138.2C100.201 -138.2 97.601 -138.8 97.001 -139.2C96.401 -139.6 84.6 -148.6 57 -141.6C57 -141.6 40 -137 31.4 -132.2C31.4 -132.2 16.2 -131 12.6 -127.8C12.6 -127.8 -6 -113.2 -8 -112.4C-10 -111.6 -21.4 -104 -22.2 -103.6C-22.2 -103.6 2.4 -110.2 4.8 -112.6C7.2 -115 24.6 -117.6 27 -116.2C29.4 -114.8 37.8 -115.4 28.2 -114.8C28.2 -114.8 103.801 -100 104.601 -98C105.401 -96 109.401 -97.2 109.401 -97.2z"/></g>
-            <g style="fill: #cc7226"><path d="M180.801 -106.4C180.801 -106.4 170.601 -113.8 168.601 -113.8C166.601 -113.8 154.201 -124 150.001 -123.6C145.801 -123.2 133.601 -133.2 106.201 -125C106.201 -125 105.601 -127 109.201 -127.8C109.201 -127.8 115.601 -130 116.001 -130.6C116.001 -130.6 136.201 -134.8 143.401 -131.2C143.401 -131.2 152.601 -128.6 158.801 -122.4C158.801 -122.4 170.001 -119.2 173.201 -120.2C173.201 -120.2 182.001 -118 182.401 -116.2C182.401 -116.2 188.201 -113.2 186.401 -110.6C186.401 -110.6 186.801 -109 180.801 -106.4z"/></g>
-            <g style="fill: #cc7226"><path d="M168.33 -108.509C169.137 -107.877 170.156 -107.779 170.761 -106.97C170.995 -106.656 170.706 -106.33 170.391 -106.233C169.348 -105.916 168.292 -106.486 167.15 -105.898C166.748 -105.691 166.106 -105.873 165.553 -106.022C163.921 -106.463 162.092 -106.488 160.401 -105.8C158.416 -106.929 156.056 -106.345 153.975 -107.346C153.917 -107.373 153.695 -107.027 153.621 -107.054C150.575 -108.199 146.832 -107.916 144.401 -110.2C141.973 -110.612 139.616 -111.074 137.188 -111.754C135.37 -112.263 133.961 -113.252 132.341 -114.084C130.964 -114.792 129.507 -115.314 127.973 -115.686C126.11 -116.138 124.279 -116.026 122.386 -116.546C122.293 -116.571 122.101 -116.227 122.019 -116.254C121.695 -116.362 121.405 -116.945 121.234 -116.892C119.553 -116.37 118.065 -117.342 116.401 -117C115.223 -118.224 113.495 -117.979 111.949 -118.421C108.985 -119.269 105.831 -117.999 102.801 -119C106.914 -120.842 111.601 -119.61 115.663 -121.679C117.991 -122.865 120.653 -121.763 123.223 -122.523C123.71 -122.667 124.401 -122.869 124.801 -122.2C124.935 -122.335 125.117 -122.574 125.175 -122.546C127.625 -121.389 129.94 -120.115 132.422 -119.049C132.763 -118.903 133.295 -119.135 133.547 -118.933C135.067 -117.717 137.01 -117.82 138.401 -116.6C140.099 -117.102 141.892 -116.722 143.621 -117.346C143.698 -117.373 143.932 -117.032 143.965 -117.054C145.095 -117.802 146.25 -117.531 147.142 -117.227C147.48 -117.112 148.143 -116.865 148.448 -116.791C149.574 -116.515 150.43 -116.035 151.609 -115.852C151.723 -115.834 151.908 -116.174 151.98 -116.146C153.103 -115.708 154.145 -115.764 154.801 -114.6C154.936 -114.735 155.101 -114.973 155.183 -114.946C156.21 -114.608 156.859 -113.853 157.96 -113.612C158.445 -113.506 159.057 -112.88 159.633 -112.704C162.025 -111.973 163.868 -110.444 166.062 -109.549C166.821 -109.239 167.697 -109.005 168.33 -108.509z"/></g>
-            <g style="fill: #cc7226"><path d="M91.696 -122.739C89.178 -124.464 86.81 -125.57 84.368 -127.356C84.187 -127.489 83.827 -127.319 83.625 -127.441C82.618 -128.05 81.73 -128.631 80.748 -129.327C80.209 -129.709 79.388 -129.698 78.88 -129.956C76.336 -131.248 73.707 -131.806 71.2 -133C71.882 -133.638 73.004 -133.394 73.6 -134.2C73.795 -133.92 74.033 -133.636 74.386 -133.827C76.064 -134.731 77.914 -134.884 79.59 -134.794C81.294 -134.702 83.014 -134.397 84.789 -134.125C85.096 -134.078 85.295 -133.555 85.618 -133.458C87.846 -132.795 90.235 -133.32 92.354 -132.482C93.945 -131.853 95.515 -131.03 96.754 -129.755C97.006 -129.495 96.681 -129.194 96.401 -129C96.789 -129.109 97.062 -128.903 97.173 -128.59C97.257 -128.351 97.257 -128.049 97.173 -127.81C97.061 -127.498 96.782 -127.397 96.408 -127.346C95.001 -127.156 96.773 -128.536 96.073 -128.088C94.8 -127.274 95.546 -125.868 94.801 -124.6C94.521 -124.794 94.291 -125.012 94.401 -125.4C94.635 -124.878 94.033 -124.588 93.865 -124.272C93.48 -123.547 92.581 -122.132 91.696 -122.739z"/></g>
-            <g style="fill: #cc7226"><path d="M59.198 -115.391C56.044 -116.185 52.994 -116.07 49.978 -117.346C49.911 -117.374 49.688 -117.027 49.624 -117.054C48.258 -117.648 47.34 -118.614 46.264 -119.66C45.351 -120.548 43.693 -120.161 42.419 -120.648C42.095 -120.772 41.892 -121.284 41.591 -121.323C40.372 -121.48 39.445 -122.429 38.4 -123C40.736 -123.795 43.147 -123.764 45.609 -124.148C45.722 -124.166 45.867 -123.845 46 -123.845C46.136 -123.845 46.266 -124.066 46.4 -124.2C46.595 -123.92 46.897 -123.594 47.154 -123.848C47.702 -124.388 48.258 -124.198 48.798 -124.158C48.942 -124.148 49.067 -123.845 49.2 -123.845C49.336 -123.845 49.467 -124.156 49.6 -124.156C49.736 -124.155 49.867 -123.845 50 -123.845C50.136 -123.845 50.266 -124.066 50.4 -124.2C51.092 -123.418 51.977 -123.972 52.799 -123.793C53.837 -123.566 54.104 -122.418 55.178 -122.12C59.893 -120.816 64.03 -118.671 68.393 -116.584C68.7 -116.437 68.91 -116.189 68.8 -115.8C69.067 -115.8 69.38 -115.888 69.57 -115.756C70.628 -115.024 71.669 -114.476 72.366 -113.378C72.582 -113.039 72.253 -112.632 72.02 -112.684C67.591 -113.679 63.585 -114.287 59.198 -115.391z"/></g>
-            <g style="fill: #cc7226"><path d="M45.338 -71.179C43.746 -72.398 43.162 -74.429 42.034 -76.221C41.82 -76.561 42.094 -76.875 42.411 -76.964C42.971 -77.123 43.514 -76.645 43.923 -76.443C45.668 -75.581 47.203 -74.339 49.2 -74.2C51.19 -71.966 55.45 -71.581 55.457 -68.2C55.458 -67.341 54.03 -68.259 53.6 -67.4C51.149 -68.403 48.76 -68.3 46.38 -69.767C45.763 -70.148 46.093 -70.601 45.338 -71.179z"/></g>
-            <g style="fill: #cc7226"><path d="M17.8 -123.756C17.935 -123.755 24.966 -123.522 24.949 -123.408C24.904 -123.099 17.174 -122.05 16.81 -122.22C16.646 -122.296 9.134 -119.866 9 -120C9.268 -120.135 17.534 -123.756 17.8 -123.756z"/></g>
-            <g style="fill: #000000"><path d="M33.2 -114C33.2 -114 18.4 -112.2 14 -111C9.6 -109.8 -9 -102.2 -12 -100.2C-12 -100.2 -25.4 -94.8 -42.4 -74.8C-42.4 -74.8 -34.8 -78.2 -32.6 -81C-32.6 -81 -19 -93.6 -19.2 -91C-19.2 -91 -7 -99.6 -7.6 -97.4C-7.6 -97.4 16.8 -108.6 14.8 -105.4C14.8 -105.4 36.4 -110 35.4 -108C35.4 -108 54.2 -103.6 51.4 -103.4C51.4 -103.4 45.6 -102.2 52 -98.6C52 -98.6 48.6 -94.2 43.2 -98.2C37.8 -102.2 40.8 -100 35.8 -99C35.8 -99 33.2 -98.2 28.6 -102.2C28.6 -102.2 23 -106.8 14.2 -103.2C14.2 -103.2 -16.4 -90.6 -18.4 -90C-18.4 -90 -22 -87.2 -24.4 -83.6C-24.4 -83.6 -30.2 -79.2 -33.2 -77.8C-33.2 -77.8 -46 -66.2 -47.2 -64.8C-47.2 -64.8 -50.6 -59.6 -51.4 -59.2C-51.4 -59.2 -45 -63 -43 -65C-43 -65 -29 -75 -23.6 -75.8C-23.6 -75.8 -19.2 -78.8 -18.4 -80.2C-18.4 -80.2 -4 -89.4 0.2 -89.4C0.2 -89.4 9.4 -84.2 11.8 -91.2C11.8 -91.2 17.6 -93 23.2 -91.8C23.2 -91.8 26.4 -94.4 25.6 -96.6C25.6 -96.6 27.2 -98.4 28.2 -94.6C28.2 -94.6 31.6 -91 36.4 -93C36.4 -93 40.4 -93.2 38.4 -90.8C38.4 -90.8 34 -87 22.2 -86.8C22.2 -86.8 9.8 -86.2 -6.6 -78.6C-6.6 -78.6 -36.4 -68.2 -45.6 -57.8C-45.6 -57.8 -52 -49 -57.4 -47.8C-57.4 -47.8 -63.2 -47 -69.2 -39.6C-69.2 -39.6 -59.4 -45.4 -50.4 -45.4C-50.4 -45.4 -46.4 -47.8 -50.2 -44.2C-50.2 -44.2 -53.8 -36.6 -52.2 -31.2C-52.2 -31.2 -52.8 -26 -53.6 -24.4C-53.6 -24.4 -61.4 -11.6 -61.4 -9.2C-61.4 -6.8 -60.2 3 -59.8 3.6C-59.4 4.2 -60.8 2 -57 4.4C-53.2 6.8 -50.4 8.4 -49.6 11.2C-48.8 14 -51.6 5.8 -51.8 4C-52 2.2 -56.2 -5 -55.4 -7.4C-55.4 -7.4 -54.4 -6.4 -53.6 -5C-53.6 -5 -54.2 -5.6 -53.6 -9.2C-53.6 -9.2 -52.8 -14.4 -51.4 -17.6C-50 -20.8 -48 -24.6 -47.6 -25.4C-47.2 -26.2 -47.2 -32 -45.8 -29.4L-42.4 -26.8C-42.4 -26.8 -45.2 -29.4 -43 -31.6C-43 -31.6 -44 -37.2 -42.2 -39.8C-42.2 -39.8 -35.2 -48.2 -33.6 -49.2C-32 -50.2 -33.4 -49.8 -33.4 -49.8C-33.4 -49.8 -27.4 -54 -33.2 -52.4C-33.2 -52.4 -37.2 -50.8 -40.2 -50.8C-40.2 -50.8 -47.8 -48.8 -43.8 -53C-39.8 -57.2 -29.8 -62.6 -26 -62.4L-25.2 -60.8L-14 -63.2L-15.2 -62.4C-15.2 -62.4 -15.4 -62.6 -11.2 -63C-7 -63.4 -1.2 -62 0.2 -63.8C1.6 -65.6 5 -66.6 4.6 -65.2C4.2 -63.8 4 -61.8 4 -61.8C4 -61.8 9 -67.6 8.4 -65.4C7.8 -63.2 -0.4 -58 -1.8 -51.8L8.6 -60L12.2 -63C12.2 -63 15.8 -60.8 16 -62.4C16.2 -64 20.8 -69.8 22 -69.6C23.2 -69.4 25.2 -72.2 25 -69.6C24.8 -67 32.4 -61.6 32.4 -61.6C32.4 -61.6 35.6 -63.4 37 -62C38.4 -60.6 42.6 -81.8 42.6 -81.8L67.6 -92.4L111.201 -95.8L94.201 -102.6L33.2 -114z"/></g>
-            <g style="stroke:#4c0000; stroke-width:2"><path d="M51.4 85C51.4 85 36.4 68.2 28 65.6C28 65.6 14.6 58.8 -10 66.6"/></g>
-            <g style="stroke:#4c0000; stroke-width:2"><path d="M24.8 64.2C24.8 64.2 -0.4 56.2 -15.8 60.4C-15.8 60.4 -34.2 62.4 -42.6 76.2"/></g>
-            <g style="stroke:#4c0000; stroke-width:2"><path d="M21.2 63C21.2 63 4.2 55.8 -10.6 53.6C-10.6 53.6 -27.2 51 -43.8 58.2C-43.8 58.2 -56 64.2 -61.4 74.4"/></g>
-            <g style="stroke:#4c0000; stroke-width:2"><path d="M22.2 63.4C22.2 63.4 6.8 52.4 5.8 51C5.8 51 -1.2 40 -14.2 39.6C-14.2 39.6 -35.6 40.4 -52.8 48.4"/></g>
-            <g style="fill: #000000"><path d="M20.895 54.407C22.437 55.87 49.4 84.8 49.4 84.8C84.6 121.401 56.6 87.2 56.6 87.2C49 82.4 39.8 63.6 39.8 63.6C38.6 60.8 53.8 70.8 53.8 70.8C57.8 71.6 71.4 90.8 71.4 90.8C64.6 88.4 69.4 95.6 69.4 95.6C72.2 97.6 92.601 113.201 92.601 113.201C96.201 117.201 100.201 118.801 100.201 118.801C114.201 113.601 107.801 126.801 107.801 126.801C110.201 133.601 115.801 122.001 115.801 122.001C127.001 105.2 110.601 107.601 110.601 107.601C80.6 110.401 73.8 94.4 73.8 94.4C71.4 92 80.2 94.4 80.2 94.4C88.601 96.4 73 82 73 82C75.4 82 84.6 88.8 84.6 88.8C95.001 98 97.001 96 97.001 96C115.001 87.2 125.401 94.8 125.401 94.8C127.401 96.4 121.801 103.2 123.401 108.401C125.001 113.601 129.801 126.001 129.801 126.001C127.401 127.601 127.801 138.401 127.801 138.401C144.601 161.601 135.001 159.601 135.001 159.601C119.401 159.201 134.201 166.801 134.201 166.801C137.401 168.801 146.201 176.001 146.201 176.001C143.401 174.801 141.801 180.001 141.801 180.001C146.601 184.001 143.801 188.801 143.801 188.801C137.801 190.001 136.601 194.001 136.601 194.001C143.401 202.001 133.401 202.401 133.401 202.401C137.001 206.801 132.201 218.801 132.201 218.801C127.401 218.801 121.001 224.401 121.001 224.401C123.401 229.201 113.001 234.801 113.001 234.801C104.601 236.401 107.401 243.201 107.401 243.201C99.401 249.201 97.001 265.201 97.001 265.201C96.201 275.601 93.801 278.801 99.001 276.801C104.201 274.801 103.401 262.401 103.401 262.401C98.601 246.801 141.401 230.801 141.401 230.801C145.401 229.201 146.201 224.001 146.201 224.001C148.201 224.401 157.001 232.001 157.001 232.001C164.601 243.201 165.001 234.001 165.001 234.001C166.201 230.401 164.601 224.401 164.601 224.401C170.601 202.801 156.601 196.401 156.601 196.401C146.601 162.801 160.601 171.201 160.601 171.201C163.401 176.801 174.201 182.001 174.201 182.001L177.801 179.601C176.201 174.801 184.601 168.801 184.601 168.801C187.401 175.201 193.401 167.201 193.401 167.201C197.001 142.801 209.401 157.201 209.401 157.201C213.401 158.401 214.601 151.601 214.601 151.601C218.201 141.201 214.601 127.601 214.601 127.601C218.201 127.201 227.801 133.201 227.801 133.201C230.601 129.601 221.401 112.801 225.401 115.201C229.401 117.601 233.801 119.201 233.801 119.201C234.601 117.201 224.601 104.801 224.601 104.801C220.201 102 215.001 81.6 215.001 81.6C222.201 85.2 212.201 70 212.201 70C212.201 66.8 218.201 55.6 218.201 55.6C217.401 48.8 218.201 49.2 218.201 49.2C221.001 50.4 229.001 52 222.201 45.6C215.401 39.2 223.001 34.4 223.001 34.4C227.401 31.6 213.801 32 213.801 32C208.601 27.6 209.001 23.6 209.001 23.6C217.001 25.6 202.601 11.2 200.201 7.6C197.801 4 207.401 -1.2 207.401 -1.2C220.601 -4.8 209.001 -8 209.001 -8C189.401 -7.6 200.201 -18.4 200.201 -18.4C206.201 -18 204.601 -20.4 204.601 -20.4C199.401 -21.6 189.801 -28 189.801 -28C185.801 -31.6 189.401 -30.8 189.401 -30.8C206.201 -29.6 177.401 -40.8 177.401 -40.8C185.401 -40.8 167.401 -51.2 167.401 -51.2C165.401 -52.8 162.201 -60.4 162.201 -60.4C156.201 -65.6 151.401 -72.4 151.401 -72.4C151.001 -76.8 146.201 -81.6 146.201 -81.6C134.601 -95.2 129.001 -94.8 129.001 -94.8C114.201 -98.4 109.001 -97.6 109.001 -97.6L56.2 -93.2C29.8 -80.4 37.6 -59.4 37.6 -59.4C44 -51 53.2 -54.8 53.2 -54.8C57.8 -61 69.4 -58.8 69.4 -58.8C89.801 -55.6 87.201 -59.2 87.201 -59.2C84.801 -63.8 68.6 -70 68.4 -70.6C68.2 -71.2 59.4 -74.6 59.4 -74.6C56.4 -75.8 52 -85 52 -85C48.8 -88.4 64.6 -82.6 64.6 -82.6C63.4 -81.6 70.8 -77.6 70.8 -77.6C88.201 -78.6 98.801 -67.8 98.801 -67.8C109.601 -51.2 109.801 -59.4 109.801 -59.4C112.601 -68.8 100.801 -90 100.801 -90C101.201 -92 109.401 -85.4 109.401 -85.4C110.801 -87.4 111.601 -81.6 111.601 -81.6C111.801 -79.2 115.601 -71.2 115.601 -71.2C118.401 -58.2 122.001 -65.6 122.001 -65.6L126.601 -56.2C128.001 -53.6 122.001 -46 122.001 -46C121.801 -43.2 122.601 -43.4 117.001 -35.8C111.401 -28.2 114.801 -23.8 114.801 -23.8C113.401 -17.2 122.201 -17.6 122.201 -17.6C124.801 -15.4 128.201 -15.4 128.201 -15.4C130.001 -13.4 132.401 -14 132.401 -14C134.001 -17.8 140.201 -15.8 140.201 -15.8C141.601 -18.2 149.801 -18.6 149.801 -18.6C150.801 -21.2 151.201 -22.8 154.601 -23.4C158.001 -24 133.401 -67 133.401 -67C139.801 -67.8 131.601 -80.2 131.601 -80.2C129.401 -86.8 140.801 -72.2 143.001 -70.8C145.201 -69.4 146.201 -67.2 144.601 -67.4C143.001 -67.6 141.201 -65.4 142.601 -65.2C144.001 -65 157.001 -50 160.401 -39.8C163.801 -29.6 169.801 -25.6 176.001 -19.6C182.201 -13.6 181.401 10.6 181.401 10.6C181.001 19.4 187.001 30 187.001 30C189.001 33.8 184.801 52 184.801 52C182.801 54.2 184.201 55 184.201 55C185.201 56.2 192.001 69.4 192.001 69.4C190.201 69.2 193.801 72.8 193.801 72.8C199.001 78.8 192.601 75.8 192.601 75.8C186.601 74.2 193.601 84 193.601 84C194.801 85.8 185.801 81.2 185.801 81.2C176.601 80.6 188.201 87.8 188.201 87.8C196.801 95 185.401 90.6 185.401 90.6C180.801 88.8 184.001 95.6 184.001 95.6C187.201 97.2 204.401 104.2 204.401 104.2C204.801 108.001 201.801 113.001 201.801 113.001C202.201 117.001 200.001 120.401 200.001 120.401C198.801 128.601 198.201 129.401 198.201 129.401C194.001 129.601 186.601 143.401 186.601 143.401C184.801 146.001 174.601 158.001 174.601 158.001C172.601 165.001 154.601 157.801 154.601 157.801C148.001 161.201 150.001 157.801 150.001 157.801C149.601 155.601 154.401 149.601 154.401 149.601C161.401 147.001 158.801 136.201 158.801 136.201C162.801 134.801 151.601 132.001 151.801 130.801C152.001 129.601 157.801 128.201 157.801 128.201C165.801 126.201 161.401 123.801 161.401 123.801C160.801 119.801 163.801 114.201 163.801 114.201C175.401 113.401 163.801 97.2 163.801 97.2C153.001 89.6 152.001 83.8 152.001 83.8C164.601 75.6 156.401 63.2 156.601 59.6C156.801 56 158.001 34.4 158.001 34.4C156.001 28.2 153.001 14.6 153.001 14.6C155.201 9.4 162.601 -3.2 162.601 -3.2C165.401 -7.4 174.201 -12.2 172.001 -15.2C169.801 -18.2 162.001 -16.4 162.001 -16.4C154.201 -17.8 154.801 -12.6 154.801 -12.6C153.201 -11.6 152.401 -6.6 152.401 -6.6C151.68 1.333 142.801 7.6 142.801 7.6C131.601 13.8 140.801 17.8 140.801 17.8C146.801 24.4 137.001 24.6 137.001 24.6C126.001 22.8 134.201 33 134.201 33C145.001 45.8 142.001 48.6 142.001 48.6C131.801 49.6 144.401 58.8 144.401 58.8C144.401 58.8 143.601 56.8 143.801 58.6C144.001 60.4 147.001 64.6 147.801 66.6C148.601 68.6 144.601 68.8 144.601 68.8C145.201 78.4 129.801 74.2 129.801 74.2C129.801 74.2 129.801 74.2 128.201 74.4C126.601 74.6 115.401 73.8 109.601 71.6C103.801 69.4 97.001 69.4 97.001 69.4C97.001 69.4 93.001 71.2 85.4 71C77.8 70.8 69.8 73.6 69.8 73.6C65.4 73.2 74 68.8 74.2 69C74.4 69.2 80 63.6 72 64.2C50.203 65.835 39.4 55.6 39.4 55.6C37.4 54.2 34.8 51.4 34.8 51.4C24.8 49.4 36.2 63.8 36.2 63.8C37.4 65.2 36 66.2 36 66.2C35.2 64.6 27.4 59.2 27.4 59.2C24.589 58.227 23.226 56.893 20.895 54.407z"/></g>
-            <g style="fill: #4c0000"><path d="M-3 42.8C-3 42.8 8.6 48.4 11.2 51.2C13.8 54 27.8 65.4 27.8 65.4C27.8 65.4 22.4 63.4 19.8 61.6C17.2 59.8 6.4 51.6 6.4 51.6C6.4 51.6 2.6 45.6 -3 42.8z"/></g>
-            <g style="fill: #99cc32"><path d="M-61.009 11.603C-60.672 11.455 -61.196 8.743 -61.4 8.2C-62.422 5.474 -71.4 4 -71.4 4C-71.627 5.365 -71.682 6.961 -71.576 8.599C-71.576 8.599 -66.708 14.118 -61.009 11.603z"/></g>
-            <g style="fill: #659900"><path d="M-61.009 11.403C-61.458 11.561 -61.024 8.669 -61.2 8.2C-62.222 5.474 -71.4 3.9 -71.4 3.9C-71.627 5.265 -71.682 6.861 -71.576 8.499C-71.576 8.499 -67.308 13.618 -61.009 11.403z"/></g>
-            <g style="fill: #000000"><path d="M-65.4 11.546C-66.025 11.546 -66.531 10.406 -66.531 9C-66.531 7.595 -66.025 6.455 -65.4 6.455C-64.775 6.455 -64.268 7.595 -64.268 9C-64.268 10.406 -64.775 11.546 -65.4 11.546z"/></g>
-            <g style="fill: #000000"><path d="M-65.4 9z"/></g>
-            <g style="fill: #000000"><path d="M-111 109.601C-111 109.601 -116.6 119.601 -91.8 113.601C-91.8 113.601 -77.8 112.401 -75.4 110.001C-74.2 110.801 -65.834 113.734 -63 114.401C-56.2 116.001 -47.8 106 -47.8 106C-47.8 106 -43.2 95.5 -40.4 95.5C-37.6 95.5 -40.8 97.1 -40.8 97.1C-40.8 97.1 -47.4 107.201 -47 108.801C-47 108.801 -52.2 128.801 -68.2 129.601C-68.2 129.601 -84.35 130.551 -83 136.401C-83 136.401 -74.2 134.001 -71.8 136.401C-71.8 136.401 -61 136.001 -69 142.401L-75.8 154.001C-75.8 154.001 -75.66 157.919 -85.8 154.401C-95.6 151.001 -105.9 138.101 -105.9 138.101C-105.9 138.101 -121.85 123.551 -111 109.601z"/></g>
-            <g style="fill: #e59999"><path d="M-112.2 113.601C-112.2 113.601 -114.2 123.201 -77.4 112.801C-77.4 112.801 -73 112.801 -70.6 113.601C-68.2 114.401 -56.2 117.201 -54.2 116.001C-54.2 116.001 -61.4 129.601 -73 128.001C-73 128.001 -86.2 129.601 -85.8 134.401C-85.8 134.401 -81.8 141.601 -77 144.001C-77 144.001 -74.2 146.401 -74.6 149.601C-75 152.801 -77.8 154.401 -79.8 155.201C-81.8 156.001 -85 152.801 -86.6 152.801C-88.2 152.801 -96.6 146.401 -101 141.601C-105.4 136.801 -113.8 124.801 -113.4 122.001C-113 119.201 -112.2 113.601 -112.2 113.601z"/></g>
-            <g style="fill: #b26565"><path d="M-109 131.051C-106.4 135.001 -103.2 139.201 -101 141.601C-96.6 146.401 -88.2 152.801 -86.6 152.801C-85 152.801 -81.8 156.001 -79.8 155.201C-77.8 154.401 -75 152.801 -74.6 149.601C-74.2 146.401 -77 144.001 -77 144.001C-80.066 142.468 -82.806 138.976 -84.385 136.653C-84.385 136.653 -84.2 139.201 -89.4 138.401C-94.6 137.601 -99.8 134.801 -101.4 131.601C-103 128.401 -105.4 126.001 -103.8 129.601C-102.2 133.201 -99.8 136.801 -98.2 137.201C-96.6 137.601 -97 138.801 -99.4 138.401C-101.8 138.001 -104.6 137.601 -109 132.401z"/></g>
-            <g style="fill: #992600"><path d="M-111.6 110.001C-111.6 110.001 -109.8 96.4 -108.6 92.4C-108.6 92.4 -109.4 85.6 -107 81.4C-104.6 77.2 -102.6 71 -99.6 65.6C-96.6 60.2 -96.4 56.2 -92.4 54.6C-88.4 53 -82.4 44.4 -79.6 43.4C-76.8 42.4 -77 43.2 -77 43.2C-77 43.2 -70.2 28.4 -56.6 32.4C-56.6 32.4 -72.8 29.6 -57 20.2C-57 20.2 -61.8 21.3 -58.5 14.3C-56.299 9.632 -56.8 16.4 -67.8 28.2C-67.8 28.2 -72.8 36.8 -78 39.8C-83.2 42.8 -95.2 49.8 -96.4 53.6C-97.6 57.4 -100.8 63.2 -102.8 64.8C-104.8 66.4 -107.6 70.6 -108 74C-108 74 -109.2 78 -110.6 79.2C-112 80.4 -112.2 83.6 -112.2 85.6C-112.2 87.6 -114.2 90.4 -114 92.8C-114 92.8 -113.2 111.801 -113.6 113.801L-111.6 110.001z"/></g>
-            <g style="fill: #ffffff"><path d="M-120.2 114.601C-120.2 114.601 -122.2 113.201 -126.6 119.201C-126.6 119.201 -119.3 152.201 -119.3 153.601C-119.3 153.601 -118.2 151.501 -119.5 144.301C-120.8 137.101 -121.7 124.401 -121.7 124.401L-120.2 114.601z"/></g>
-            <g style="fill: #992600"><path d="M-98.6 54C-98.6 54 -116.2 57.2 -115.8 86.4L-116.6 111.201C-116.6 111.201 -117.8 85.6 -119 84C-120.2 82.4 -116.2 71.2 -119.4 77.2C-119.4 77.2 -133.4 91.2 -125.4 112.401C-125.4 112.401 -123.9 115.701 -126.9 111.101C-126.9 111.101 -131.5 98.5 -130.4 92.1C-130.4 92.1 -130.2 89.9 -128.3 87.1C-128.3 87.1 -119.7 75.4 -117 73.1C-117 73.1 -115.2 58.7 -99.8 53.5C-99.8 53.5 -94.1 51.2 -98.6 54z"/></g>
-            <g style="fill: #000000"><path d="M40.8 -12.2C41.46 -12.554 41.451 -13.524 42.031 -13.697C43.18 -14.041 43.344 -15.108 43.862 -15.892C44.735 -17.211 44.928 -18.744 45.51 -20.235C45.782 -20.935 45.809 -21.89 45.496 -22.55C44.322 -25.031 43.62 -27.48 42.178 -29.906C41.91 -30.356 41.648 -31.15 41.447 -31.748C40.984 -33.132 39.727 -34.123 38.867 -35.443C38.579 -35.884 39.104 -36.809 38.388 -36.893C37.491 -36.998 36.042 -37.578 35.809 -36.552C35.221 -33.965 36.232 -31.442 37.2 -29C36.418 -28.308 36.752 -27.387 36.904 -26.62C37.614 -23.014 36.416 -19.662 35.655 -16.188C35.632 -16.084 35.974 -15.886 35.946 -15.824C34.724 -13.138 33.272 -10.693 31.453 -8.312C30.695 -7.32 29.823 -6.404 29.326 -5.341C28.958 -4.554 28.55 -3.588 28.8 -2.6C25.365 0.18 23.115 4.025 20.504 7.871C20.042 8.551 20.333 9.76 20.884 10.029C21.697 10.427 22.653 9.403 23.123 8.557C23.512 7.859 23.865 7.209 24.356 6.566C24.489 6.391 24.31 5.972 24.445 5.851C27.078 3.504 28.747 0.568 31.2 -1.8C33.15 -2.129 34.687 -3.127 36.435 -4.14C36.743 -4.319 37.267 -4.07 37.557 -4.265C39.31 -5.442 39.308 -7.478 39.414 -9.388C39.464 -10.272 39.66 -11.589 40.8 -12.2z"/></g>
-            <g style="fill: #000000"><path d="M31.959 -16.666C32.083 -16.743 31.928 -17.166 32.037 -17.382C32.199 -17.706 32.602 -17.894 32.764 -18.218C32.873 -18.434 32.71 -18.814 32.846 -18.956C35.179 -21.403 35.436 -24.427 34.4 -27.4C35.424 -28.02 35.485 -29.282 35.06 -30.129C34.207 -31.829 34.014 -33.755 33.039 -35.298C32.237 -36.567 30.659 -37.811 29.288 -36.508C28.867 -36.108 28.546 -35.321 28.824 -34.609C28.888 -34.446 29.173 -34.3 29.146 -34.218C29.039 -33.894 28.493 -33.67 28.487 -33.398C28.457 -31.902 27.503 -30.391 28.133 -29.062C28.905 -27.433 29.724 -25.576 30.4 -23.8C29.166 -21.684 30.199 -19.235 28.446 -17.358C28.31 -17.212 28.319 -16.826 28.441 -16.624C28.733 -16.138 29.139 -15.732 29.625 -15.44C29.827 -15.319 30.175 -15.317 30.375 -15.441C30.953 -15.803 31.351 -16.29 31.959 -16.666z"/></g>
-            <g style="fill: #000000"><path d="M94.771 -26.977C96.16 -25.185 96.45 -22.39 94.401 -21C94.951 -17.691 98.302 -19.67 100.401 -20.2C100.292 -20.588 100.519 -20.932 100.802 -20.937C101.859 -20.952 102.539 -21.984 103.601 -21.8C104.035 -23.357 105.673 -24.059 106.317 -25.439C108.043 -29.134 107.452 -33.407 104.868 -36.653C104.666 -36.907 104.883 -37.424 104.759 -37.786C104.003 -39.997 101.935 -40.312 100.001 -41C98.824 -44.875 98.163 -48.906 96.401 -52.6C94.787 -52.85 94.089 -54.589 92.752 -55.309C91.419 -56.028 90.851 -54.449 90.892 -53.403C90.899 -53.198 91.351 -52.974 91.181 -52.609C91.105 -52.445 90.845 -52.334 90.845 -52.2C90.846 -52.065 91.067 -51.934 91.201 -51.8C90.283 -50.98 88.86 -50.503 88.565 -49.358C87.611 -45.648 90.184 -42.523 91.852 -39.322C92.443 -38.187 91.707 -36.916 90.947 -35.708C90.509 -35.013 90.617 -33.886 90.893 -33.03C91.645 -30.699 93.236 -28.96 94.771 -26.977z"/></g>
-            <g style="fill: #000000"><path d="M57.611 -8.591C56.124 -6.74 52.712 -4.171 55.629 -2.243C55.823 -2.114 56.193 -2.11 56.366 -2.244C58.387 -3.809 60.39 -4.712 62.826 -5.294C62.95 -5.323 63.224 -4.856 63.593 -5.017C65.206 -5.72 67.216 -5.662 68.4 -7C72.167 -6.776 75.732 -7.892 79.123 -9.2C80.284 -9.648 81.554 -10.207 82.755 -10.709C84.131 -11.285 85.335 -12.213 86.447 -13.354C86.58 -13.49 86.934 -13.4 87.201 -13.4C87.161 -14.263 88.123 -14.39 88.37 -15.012C88.462 -15.244 88.312 -15.64 88.445 -15.742C90.583 -17.372 91.503 -19.39 90.334 -21.767C90.049 -22.345 89.8 -22.963 89.234 -23.439C88.149 -24.35 87.047 -23.496 86 -23.8C85.841 -23.172 85.112 -23.344 84.726 -23.146C83.867 -22.707 82.534 -23.292 81.675 -22.854C80.313 -22.159 79.072 -21.99 77.65 -21.613C77.338 -21.531 76.56 -21.627 76.4 -21C76.266 -21.134 76.118 -21.368 76.012 -21.346C74.104 -20.95 72.844 -20.736 71.543 -19.044C71.44 -18.911 70.998 -19.09 70.839 -18.955C69.882 -18.147 69.477 -16.913 68.376 -16.241C68.175 -16.118 67.823 -16.286 67.629 -16.157C66.983 -15.726 66.616 -15.085 65.974 -14.638C65.645 -14.409 65.245 -14.734 65.277 -14.99C65.522 -16.937 66.175 -18.724 65.6 -20.6C67.677 -23.12 70.194 -25.069 72 -27.8C72.015 -29.966 72.707 -32.112 72.594 -34.189C72.584 -34.382 72.296 -35.115 72.17 -35.462C71.858 -36.316 72.764 -37.382 71.92 -38.106C70.516 -39.309 69.224 -38.433 68.4 -37C66.562 -36.61 64.496 -35.917 62.918 -37.151C61.911 -37.938 61.333 -38.844 60.534 -39.9C59.549 -41.202 59.884 -42.638 59.954 -44.202C59.96 -44.33 59.645 -44.466 59.645 -44.6C59.646 -44.735 59.866 -44.866 60 -45C59.294 -45.626 59.019 -46.684 58 -47C58.305 -48.092 57.629 -48.976 56.758 -49.278C54.763 -49.969 53.086 -48.057 51.194 -47.984C50.68 -47.965 50.213 -49.003 49.564 -49.328C49.132 -49.544 48.428 -49.577 48.066 -49.311C47.378 -48.807 46.789 -48.693 46.031 -48.488C44.414 -48.052 43.136 -46.958 41.656 -46.103C40.171 -45.246 39.216 -43.809 38.136 -42.489C37.195 -41.337 37.059 -38.923 38.479 -38.423C40.322 -37.773 41.626 -40.476 43.592 -40.15C43.904 -40.099 44.11 -39.788 44 -39.4C44.389 -39.291 44.607 -39.52 44.8 -39.8C45.658 -38.781 46.822 -38.444 47.76 -37.571C48.73 -36.667 50.476 -37.085 51.491 -36.088C53.02 -34.586 52.461 -31.905 54.4 -30.6C53.814 -29.287 53.207 -28.01 52.872 -26.583C52.59 -25.377 53.584 -24.18 54.795 -24.271C56.053 -24.365 56.315 -25.124 56.8 -26.2C57.067 -25.933 57.536 -25.636 57.495 -25.42C57.038 -23.033 56.011 -21.04 55.553 -18.609C55.494 -18.292 55.189 -18.09 54.8 -18.2C54.332 -14.051 50.28 -11.657 47.735 -8.492C47.332 -7.99 47.328 -6.741 47.737 -6.338C49.14 -4.951 51.1 -6.497 52.8 -7C53.013 -8.206 53.872 -9.148 55.204 -9.092C55.46 -9.082 55.695 -9.624 56.019 -9.754C56.367 -9.892 56.869 -9.668 57.155 -9.866C58.884 -11.061 60.292 -12.167 62.03 -13.356C62.222 -13.487 62.566 -13.328 62.782 -13.436C63.107 -13.598 63.294 -13.985 63.617 -14.17C63.965 -14.37 64.207 -14.08 64.4 -13.8C63.754 -13.451 63.75 -12.494 63.168 -12.292C62.393 -12.024 61.832 -11.511 61.158 -11.064C60.866 -10.871 60.207 -11.119 60.103 -10.94C59.505 -9.912 58.321 -9.474 57.611 -8.591z"/></g>
-            <g style="fill: #000000"><path d="M2.2 -58C2.2 -58 -7.038 -60.872 -18.2 -35.2C-18.2 -35.2 -20.6 -30 -23 -28C-25.4 -26 -36.6 -22.4 -38.6 -18.4L-49 -2.4C-49 -2.4 -34.2 -18.4 -31 -20.8C-31 -20.8 -23 -29.2 -26.2 -22.4C-26.2 -22.4 -40.2 -11.6 -39 -2.4C-39 -2.4 -44.6 12 -45.4 14C-45.4 14 -29.4 -18 -27 -19.2C-24.6 -20.4 -23.4 -20.4 -24.6 -16.8C-25.8 -13.2 -26.2 3.2 -29 5.2C-29 5.2 -21 -15.2 -21.8 -18.4C-21.8 -18.4 -18.6 -22 -16.2 -16.8L-17.4 -0.8L-13 11.2C-13 11.2 -15.4 0 -13.8 -15.6C-13.8 -15.6 -15.8 -26 -11.8 -20.4C-7.8 -14.8 1.8 -8.8 1.8 -4C1.8 -4 -3.4 -21.6 -12.6 -26.4L-16.6 -20.4L-17.8 -22.4C-17.8 -22.4 -21.4 -23.2 -17 -30C-12.6 -36.8 -13 -37.6 -13 -37.6C-13 -37.6 -6.6 -30.4 -5 -30.4C-5 -30.4 8.2 -38 9.4 -13.6C9.4 -13.6 16.2 -28 7 -34.8C7 -34.8 -7.8 -36.8 -6.6 -42L0.6 -54.4C4.2 -59.6 2.6 -56.8 2.6 -56.8z"/></g>
-            <g style="fill: #000000"><path d="M-17.8 -41.6C-17.8 -41.6 -30.6 -41.6 -33.8 -36.4L-41 -26.8C-41 -26.8 -23.8 -36.8 -19.8 -38C-15.8 -39.2 -17.8 -41.6 -17.8 -41.6z"/></g>
-            <g style="fill: #000000"><path d="M-57.8 -35.2C-57.8 -35.2 -59.8 -34 -60.2 -31.2C-60.6 -28.4 -63 -28 -62.2 -25.2C-61.4 -22.4 -59.4 -20 -59.4 -24C-59.4 -28 -57.8 -30 -57 -31.2C-56.2 -32.4 -54.6 -36.8 -57.8 -35.2z"/></g>
-            <g style="fill: #000000"><path d="M-66.6 26C-66.6 26 -75 22 -78.2 18.4C-81.4 14.8 -80.948 19.966 -85.8 19.6C-91.647 19.159 -90.6 3.2 -90.6 3.2L-94.6 10.8C-94.6 10.8 -95.8 25.2 -87.8 22.8C-83.893 21.628 -82.6 23.2 -84.2 24C-85.8 24.8 -78.6 25.2 -81.4 26.8C-84.2 28.4 -69.8 23.2 -72.2 33.6L-66.6 26z"/></g>
-            <g style="fill: #000000"><path d="M-79.2 40.4C-79.2 40.4 -94.6 44.8 -98.2 35.2C-98.2 35.2 -103 37.6 -100.8 40.6C-98.6 43.6 -97.4 44 -97.4 44C-97.4 44 -92 45.2 -92.6 46C-93.2 46.8 -95.6 50.2 -95.6 50.2C-95.6 50.2 -85.4 44.2 -79.2 40.4z"/></g>
-            <g style="fill: #ffffff"><path d="M149.201 118.601C148.774 120.735 147.103 121.536 145.201 122.201C143.284 121.243 140.686 118.137 138.801 120.201C138.327 119.721 137.548 119.661 137.204 118.999C136.739 118.101 137.011 117.055 136.669 116.257C136.124 114.985 135.415 113.619 135.601 112.201C137.407 111.489 138.002 109.583 137.528 107.82C137.459 107.563 137.03 107.366 137.23 107.017C137.416 106.694 137.734 106.467 138.001 106.2C137.866 106.335 137.721 106.568 137.61 106.548C137 106.442 137.124 105.805 137.254 105.418C137.839 103.672 139.853 103.408 141.201 104.6C141.457 104.035 141.966 104.229 142.401 104.2C142.351 103.621 142.759 103.094 142.957 102.674C143.475 101.576 145.104 102.682 145.901 102.07C146.977 101.245 148.04 100.546 149.118 101.149C150.927 102.162 152.636 103.374 153.835 105.115C154.41 105.949 154.65 107.23 154.592 108.188C154.554 108.835 153.173 108.483 152.83 109.412C152.185 111.16 154.016 111.679 154.772 113.017C154.97 113.366 154.706 113.67 154.391 113.768C153.98 113.896 153.196 113.707 153.334 114.16C154.306 117.353 151.55 118.031 149.201 118.601z"/></g>
-            <g style="fill: #ffffff"><path d="M139.6 138.201C139.593 136.463 137.992 134.707 139.201 133.001C139.336 133.135 139.467 133.356 139.601 133.356C139.736 133.356 139.867 133.135 140.001 133.001C141.496 135.217 145.148 136.145 145.006 138.991C144.984 139.438 143.897 140.356 144.801 141.001C142.988 142.349 142.933 144.719 142.001 146.601C140.763 146.315 139.551 145.952 138.401 145.401C138.753 143.915 138.636 142.231 139.456 140.911C139.89 140.213 139.603 139.134 139.6 138.201z"/></g>
-            <g style="fill: #cccccc"><path d="M-26.6 129.201C-26.6 129.201 -43.458 139.337 -29.4 124.001C-20.6 114.401 -10.6 108.801 -10.6 108.801C-10.6 108.801 -0.2 104.4 3.4 103.2C7 102 22.2 96.8 25.4 96.4C28.6 96 38.2 92 45 96C51.8 100 59.8 104.4 59.8 104.4C59.8 104.4 43.4 96 39.8 98.4C36.2 100.8 29 100.4 23 103.6C23 103.6 8.2 108.001 5 110.001C1.8 112.001 -8.6 123.601 -10.2 122.801C-11.8 122.001 -9.8 121.601 -8.6 118.801C-7.4 116.001 -9.4 114.401 -17.4 120.801C-25.4 127.201 -26.6 129.201 -26.6 129.201z"/></g>
-            <g style="fill: #000000"><path d="M-19.195 123.234C-19.195 123.234 -17.785 110.194 -9.307 111.859C-9.307 111.859 -1.081 107.689 1.641 105.721C1.641 105.721 9.78 104.019 11.09 103.402C29.569 94.702 44.288 99.221 44.835 98.101C45.381 96.982 65.006 104.099 68.615 108.185C69.006 108.628 58.384 102.588 48.686 100.697C40.413 99.083 18.811 100.944 7.905 106.48C4.932 107.989 -4.013 113.773 -6.544 113.662C-9.075 113.55 -19.195 123.234 -19.195 123.234z"/></g>
-            <g style="fill: #cccccc"><path d="M-23 148.801C-23 148.801 -38.2 146.401 -21.4 144.801C-21.4 144.801 -3.4 142.801 0.6 137.601C0.6 137.601 14.2 128.401 17 128.001C19.8 127.601 49.8 120.401 50.2 118.001C50.6 115.601 56.2 115.601 57.8 116.401C59.4 117.201 58.6 118.401 55.8 119.201C53 120.001 21.8 136.401 15.4 137.601C9 138.801 -2.6 146.401 -7.4 147.601C-12.2 148.801 -23 148.801 -23 148.801z"/></g>
-            <g style="fill: #000000"><path d="M-3.48 141.403C-3.48 141.403 -12.062 140.574 -3.461 139.755C-3.461 139.755 5.355 136.331 7.403 133.668C7.403 133.668 14.367 128.957 15.8 128.753C17.234 128.548 31.194 124.861 31.399 123.633C31.604 122.404 65.67 109.823 70.09 113.013C73.001 115.114 63.1 113.437 53.466 117.847C52.111 118.467 18.258 133.054 14.981 133.668C11.704 134.283 5.765 138.174 3.307 138.788C0.85 139.403 -3.48 141.403 -3.48 141.403z"/></g>
-            <g style="fill: #000000"><path d="M-11.4 143.601C-11.4 143.601 -6.2 143.201 -7.4 144.801C-8.6 146.401 -11 145.601 -11 145.601L-11.4 143.601z"/></g>
-            <g style="fill: #000000"><path d="M-18.6 145.201C-18.6 145.201 -13.4 144.801 -14.6 146.401C-15.8 148.001 -18.2 147.201 -18.2 147.201L-18.6 145.201z"/></g>
-            <g style="fill: #000000"><path d="M-29 146.801C-29 146.801 -23.8 146.401 -25 148.001C-26.2 149.601 -28.6 148.801 -28.6 148.801L-29 146.801z"/></g>
-            <g style="fill: #000000"><path d="M-36.6 147.601C-36.6 147.601 -31.4 147.201 -32.6 148.801C-33.8 150.401 -36.2 149.601 -36.2 149.601L-36.6 147.601z"/></g>
-            <g style="fill: #000000"><path d="M1.8 108.001C1.8 108.001 6.2 108.001 5 109.601C3.8 111.201 0.6 110.801 0.6 110.801L1.8 108.001z"/></g>
-            <g style="fill: #000000"><path d="M-8.2 113.601C-8.2 113.601 -1.694 111.46 -4.2 114.801C-5.4 116.401 -7.8 115.601 -7.8 115.601L-8.2 113.601z"/></g>
-            <g style="fill: #000000"><path d="M-19.4 118.401C-19.4 118.401 -14.2 118.001 -15.4 119.601C-16.6 121.201 -19 120.401 -19 120.401L-19.4 118.401z"/></g>
-            <g style="fill: #000000"><path d="M-27 124.401C-27 124.401 -21.8 124.001 -23 125.601C-24.2 127.201 -26.6 126.401 -26.6 126.401L-27 124.401z"/></g>
-            <g style="fill: #000000"><path d="M-33.8 129.201C-33.8 129.201 -28.6 128.801 -29.8 130.401C-31 132.001 -33.4 131.201 -33.4 131.201L-33.8 129.201z"/></g>
-            <g style="fill: #000000"><path d="M5.282 135.598C5.282 135.598 12.203 135.066 10.606 137.195C9.009 139.325 5.814 138.26 5.814 138.26L5.282 135.598z"/></g>
-            <g style="fill: #000000"><path d="M15.682 130.798C15.682 130.798 22.603 130.266 21.006 132.395C19.409 134.525 16.214 133.46 16.214 133.46L15.682 130.798z"/></g>
-            <g style="fill: #000000"><path d="M26.482 126.398C26.482 126.398 33.403 125.866 31.806 127.995C30.209 130.125 27.014 129.06 27.014 129.06L26.482 126.398z"/></g>
-            <g style="fill: #000000"><path d="M36.882 121.598C36.882 121.598 43.803 121.066 42.206 123.195C40.609 125.325 37.414 124.26 37.414 124.26L36.882 121.598z"/></g>
-            <g style="fill: #000000"><path d="M9.282 103.598C9.282 103.598 16.203 103.066 14.606 105.195C13.009 107.325 9.014 107.06 9.014 107.06L9.282 103.598z"/></g>
-            <g style="fill: #000000"><path d="M19.282 100.398C19.282 100.398 26.203 99.866 24.606 101.995C23.009 104.125 18.614 103.86 18.614 103.86L19.282 100.398z"/></g>
-            <g style="fill: #000000"><path d="M-3.4 140.401C-3.4 140.401 1.8 140.001 0.6 141.601C-0.6 143.201 -3 142.401 -3 142.401L-3.4 140.401z"/></g>
-            <g style="fill: #992600"><path d="M-76.6 41.2C-76.6 41.2 -81 50 -81.4 53.2C-81.4 53.2 -80.6 44.4 -79.4 42.4C-78.2 40.4 -76.6 41.2 -76.6 41.2z"/></g>
-            <g style="fill: #992600"><path d="M-95 55.2C-95 55.2 -98.2 69.6 -97.8 72.4C-97.8 72.4 -99 60.8 -98.6 59.6C-98.2 58.4 -95 55.2 -95 55.2z"/></g>
-            <g style="fill: #cccccc"><path d="M-74.2 -19.4L-74.4 -16.2L-76.6 -16C-76.6 -16 -62.4 -3.4 -61.8 4.2C-61.8 4.2 -61 -4 -74.2 -19.4z"/></g>
-            <g style="fill: #000000"><path d="M-70.216 -18.135C-70.647 -18.551 -70.428 -19.296 -70.836 -19.556C-71.645 -20.072 -69.538 -20.129 -69.766 -20.845C-70.149 -22.051 -69.962 -22.072 -70.084 -23.348C-70.141 -23.946 -69.553 -25.486 -69.168 -25.926C-67.722 -27.578 -69.046 -30.51 -67.406 -32.061C-67.102 -32.35 -66.726 -32.902 -66.441 -33.32C-65.782 -34.283 -64.598 -34.771 -63.648 -35.599C-63.33 -35.875 -63.531 -36.702 -62.962 -36.61C-62.248 -36.495 -61.007 -36.625 -61.052 -35.784C-61.165 -33.664 -62.494 -31.944 -63.774 -30.276C-63.323 -29.572 -63.781 -28.937 -64.065 -28.38C-65.4 -25.76 -65.211 -22.919 -65.385 -20.079C-65.39 -19.994 -65.697 -19.916 -65.689 -19.863C-65.336 -17.528 -64.752 -15.329 -63.873 -13.1C-63.507 -12.17 -63.036 -11.275 -62.886 -10.348C-62.775 -9.662 -62.672 -8.829 -63.08 -8.124C-61.045 -5.234 -62.354 -2.583 -61.185 0.948C-60.978 1.573 -59.286 3.487 -59.749 3.326C-62.262 2.455 -62.374 2.057 -62.551 1.304C-62.697 0.681 -63.027 -0.696 -63.264 -1.298C-63.328 -1.462 -63.499 -3.346 -63.577 -3.468C-65.09 -5.85 -63.732 -5.674 -65.102 -8.032C-66.53 -8.712 -67.496 -9.816 -68.619 -10.978C-68.817 -11.182 -67.674 -11.906 -67.855 -12.119C-68.947 -13.408 -70.1 -14.175 -69.764 -15.668C-69.609 -16.358 -69.472 -17.415 -70.216 -18.135z"/></g>
-            <g style="fill: #000000"><path d="M-73.8 -16.4C-73.8 -16.4 -73.4 -9.6 -71 -8C-68.6 -6.4 -69.8 -7.2 -73 -8.4C-76.2 -9.6 -75 -10.4 -75 -10.4C-75 -10.4 -77.8 -10 -75.4 -8C-73 -6 -69.4 -3.6 -71 -3.6C-72.6 -3.6 -80.2 -7.6 -80.2 -10.4C-80.2 -13.2 -81.2 -17.3 -81.2 -17.3C-81.2 -17.3 -80.1 -18.1 -75.3 -18C-75.3 -18 -73.9 -17.3 -73.8 -16.4z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M-74.6 2.2C-74.6 2.2 -83.12 -0.591 -101.6 2.8C-101.6 2.8 -92.569 0.722 -73.8 3C-63.5 4.25 -74.6 2.2 -74.6 2.2z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M-72.502 2.129C-72.502 2.129 -80.748 -1.389 -99.453 0.392C-99.453 0.392 -90.275 -0.897 -71.774 2.995C-61.62 5.131 -72.502 2.129 -72.502 2.129z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M-70.714 2.222C-70.714 2.222 -78.676 -1.899 -97.461 -1.514C-97.461 -1.514 -88.213 -2.118 -70.052 3.14C-60.086 6.025 -70.714 2.222 -70.714 2.222z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M-69.444 2.445C-69.444 2.445 -76.268 -1.862 -93.142 -2.96C-93.142 -2.96 -84.803 -2.79 -68.922 3.319C-60.206 6.672 -69.444 2.445 -69.444 2.445z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M45.84 12.961C45.84 12.961 44.91 13.605 45.124 12.424C45.339 11.243 73.547 -1.927 77.161 -1.677C77.161 -1.677 46.913 11.529 45.84 12.961z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M42.446 13.6C42.446 13.6 41.57 14.315 41.691 13.121C41.812 11.927 68.899 -3.418 72.521 -3.452C72.521 -3.452 43.404 12.089 42.446 13.6z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M39.16 14.975C39.16 14.975 38.332 15.747 38.374 14.547C38.416 13.348 58.233 -2.149 68.045 -4.023C68.045 -4.023 50.015 4.104 39.16 14.975z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M36.284 16.838C36.284 16.838 35.539 17.532 35.577 16.453C35.615 15.373 53.449 1.426 62.28 -0.26C62.28 -0.26 46.054 7.054 36.284 16.838z"/></g>
-            <g style="fill: #cccccc"><path d="M4.6 164.801C4.6 164.801 -10.6 162.401 6.2 160.801C6.2 160.801 24.2 158.801 28.2 153.601C28.2 153.601 41.8 144.401 44.6 144.001C47.4 143.601 63.8 140.001 64.2 137.601C64.6 135.201 70.6 132.801 72.2 133.601C73.8 134.401 73.8 143.601 71 144.401C68.2 145.201 49.4 152.401 43 153.601C36.6 154.801 25 162.401 20.2 163.601C15.4 164.801 4.6 164.801 4.6 164.801z"/></g>
-            <g style="fill: #000000"><path d="M77.6 127.401C77.6 127.401 74.6 129.001 73.4 131.601C73.4 131.601 67 142.201 52.8 145.401C52.8 145.401 29.8 154.401 22 156.401C22 156.401 8.6 161.401 1.2 160.601C1.2 160.601 -5.8 160.801 0.4 162.401C0.4 162.401 20.6 160.401 24 158.601C24 158.601 39.6 153.401 42.6 150.801C45.6 148.201 63.8 143.201 66 141.201C68.2 139.201 78 130.801 77.6 127.401z"/></g>
-            <g style="fill: #000000"><path d="M18.882 158.911C18.882 158.911 24.111 158.685 22.958 160.234C21.805 161.784 19.357 160.91 19.357 160.91L18.882 158.911z"/></g>
-            <g style="fill: #000000"><path d="M11.68 160.263C11.68 160.263 16.908 160.037 15.756 161.586C14.603 163.136 12.155 162.263 12.155 162.263L11.68 160.263z"/></g>
-            <g style="fill: #000000"><path d="M1.251 161.511C1.251 161.511 6.48 161.284 5.327 162.834C4.174 164.383 1.726 163.51 1.726 163.51L1.251 161.511z"/></g>
-            <g style="fill: #000000"><path d="M-6.383 162.055C-6.383 162.055 -1.154 161.829 -2.307 163.378C-3.46 164.928 -5.908 164.054 -5.908 164.054L-6.383 162.055z"/></g>
-            <g style="fill: #000000"><path d="M35.415 151.513C35.415 151.513 42.375 151.212 40.84 153.274C39.306 155.336 36.047 154.174 36.047 154.174L35.415 151.513z"/></g>
-            <g style="fill: #000000"><path d="M45.73 147.088C45.73 147.088 51.689 143.787 51.155 148.849C50.885 151.405 46.362 149.749 46.362 149.749L45.73 147.088z"/></g>
-            <g style="fill: #000000"><path d="M54.862 144.274C54.862 144.274 62.021 140.573 60.287 146.035C59.509 148.485 55.493 146.935 55.493 146.935L54.862 144.274z"/></g>
-            <g style="fill: #000000"><path d="M64.376 139.449C64.376 139.449 68.735 134.548 69.801 141.21C70.207 143.748 65.008 142.11 65.008 142.11L64.376 139.449z"/></g>
-            <g style="fill: #000000"><path d="M26.834 155.997C26.834 155.997 32.062 155.77 30.91 157.32C29.757 158.869 27.308 157.996 27.308 157.996L26.834 155.997z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M62.434 34.603C62.434 34.603 61.708 35.268 61.707 34.197C61.707 33.127 79.191 19.863 88.034 18.479C88.034 18.479 71.935 25.208 62.434 34.603z"/></g>
-            <g style="fill: #000000"><path d="M65.4 98.4C65.4 98.4 87.401 120.801 96.601 124.401C96.601 124.401 105.801 135.601 101.801 161.601C101.801 161.601 98.601 169.201 95.401 148.401C95.401 148.401 98.601 123.201 87.401 139.201C87.401 139.201 79 129.301 85.4 129.601C85.4 129.601 88.601 131.601 89.001 130.001C89.401 128.401 81.4 114.801 64.2 100.4C47 86 65.4 98.4 65.4 98.4z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M7 137.201C7 137.201 6.8 135.401 8.6 136.201C10.4 137.001 104.601 143.201 136.201 167.201C136.201 167.201 91.001 144.001 7 137.201z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M17.4 132.801C17.4 132.801 17.2 131.001 19 131.801C20.8 132.601 157.401 131.601 181.001 164.001C181.001 164.001 159.001 138.801 17.4 132.801z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M29 128.801C29 128.801 28.8 127.001 30.6 127.801C32.4 128.601 205.801 115.601 229.401 148.001C229.401 148.001 219.801 122.401 29 128.801z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M39 124.001C39 124.001 38.8 122.201 40.6 123.001C42.4 123.801 164.601 85.2 188.201 117.601C188.201 117.601 174.801 93 39 124.001z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M-19 146.801C-19 146.801 -19.2 145.001 -17.4 145.801C-15.6 146.601 2.2 148.801 4.2 187.601C4.2 187.601 -3 145.601 -19 146.801z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M-27.8 148.401C-27.8 148.401 -28 146.601 -26.2 147.401C-24.4 148.201 -10.2 143.601 -13 182.401C-13 182.401 -11.8 147.201 -27.8 148.401z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M-35.8 148.801C-35.8 148.801 -36 147.001 -34.2 147.801C-32.4 148.601 -17 149.201 -29.4 171.601C-29.4 171.601 -19.8 147.601 -35.8 148.801z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M11.526 104.465C11.526 104.465 11.082 106.464 12.631 105.247C28.699 92.622 61.141 33.72 116.826 28.086C116.826 28.086 78.518 15.976 11.526 104.465z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M22.726 102.665C22.726 102.665 21.363 101.472 23.231 100.847C25.099 100.222 137.541 27.72 176.826 35.686C176.826 35.686 149.719 28.176 22.726 102.665z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M1.885 108.767C1.885 108.767 1.376 110.366 3.087 109.39C12.062 104.27 15.677 47.059 59.254 45.804C59.254 45.804 26.843 31.09 1.885 108.767z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M-18.038 119.793C-18.038 119.793 -19.115 121.079 -17.162 120.825C-6.916 119.493 14.489 78.222 58.928 83.301C58.928 83.301 26.962 68.955 -18.038 119.793z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M-6.8 113.667C-6.8 113.667 -7.611 115.136 -5.742 114.511C4.057 111.237 17.141 66.625 61.729 63.078C61.729 63.078 27.603 55.135 -6.8 113.667z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M-25.078 124.912C-25.078 124.912 -25.951 125.954 -24.369 125.748C-16.07 124.669 1.268 91.24 37.264 95.354C37.264 95.354 11.371 83.734 -25.078 124.912z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M-32.677 130.821C-32.677 130.821 -33.682 131.866 -32.091 131.748C-27.923 131.439 2.715 98.36 21.183 113.862C21.183 113.862 9.168 95.139 -32.677 130.821z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M36.855 98.898C36.855 98.898 35.654 97.543 37.586 97.158C39.518 96.774 160.221 39.061 198.184 51.927C198.184 51.927 172.243 41.053 36.855 98.898z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M3.4 163.201C3.4 163.201 3.2 161.401 5 162.201C6.8 163.001 22.2 163.601 9.8 186.001C9.8 186.001 19.4 162.001 3.4 163.201z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M13.8 161.601C13.8 161.601 13.6 159.801 15.4 160.601C17.2 161.401 35 163.601 37 202.401C37 202.401 29.8 160.401 13.8 161.601z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M20.6 160.001C20.6 160.001 20.4 158.201 22.2 159.001C24 159.801 48.6 163.201 72.2 195.601C72.2 195.601 36.6 158.801 20.6 160.001z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M28.225 157.972C28.225 157.972 27.788 156.214 29.678 156.768C31.568 157.322 52.002 155.423 90.099 189.599C90.099 189.599 43.924 154.656 28.225 157.972z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M38.625 153.572C38.625 153.572 38.188 151.814 40.078 152.368C41.968 152.922 76.802 157.423 128.499 192.399C128.499 192.399 54.324 150.256 38.625 153.572z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M-1.8 142.001C-1.8 142.001 -2 140.201 -0.2 141.001C1.6 141.801 55 144.401 85.4 171.201C85.4 171.201 50.499 146.426 -1.8 142.001z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M-11.8 146.001C-11.8 146.001 -12 144.201 -10.2 145.001C-8.4 145.801 16.2 149.201 39.8 181.601C39.8 181.601 4.2 144.801 -11.8 146.001z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M49.503 148.962C49.503 148.962 48.938 147.241 50.864 147.655C52.79 148.068 87.86 150.004 141.981 181.098C141.981 181.098 64.317 146.704 49.503 148.962z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M57.903 146.562C57.903 146.562 57.338 144.841 59.264 145.255C61.19 145.668 96.26 147.604 150.381 178.698C150.381 178.698 73.317 143.904 57.903 146.562z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M67.503 141.562C67.503 141.562 66.938 139.841 68.864 140.255C70.79 140.668 113.86 145.004 203.582 179.298C203.582 179.298 82.917 138.904 67.503 141.562z"/></g>
-            <g style="fill: #000000"><path d="M-43.8 148.401C-43.8 148.401 -38.6 148.001 -39.8 149.601C-41 151.201 -43.4 150.401 -43.4 150.401L-43.8 148.401z"/></g>
-            <g style="fill: #000000"><path d="M-13 162.401C-13 162.401 -7.8 162.001 -9 163.601C-10.2 165.201 -12.6 164.401 -12.6 164.401L-13 162.401z"/></g>
-            <g style="fill: #000000"><path d="M-21.8 162.001C-21.8 162.001 -16.6 161.601 -17.8 163.201C-19 164.801 -21.4 164.001 -21.4 164.001L-21.8 162.001z"/></g>
-            <g style="fill: #000000"><path d="M-117.169 150.182C-117.169 150.182 -112.124 151.505 -113.782 152.624C-115.439 153.744 -117.446 152.202 -117.446 152.202L-117.169 150.182z"/></g>
-            <g style="fill: #000000"><path d="M-115.169 140.582C-115.169 140.582 -110.124 141.905 -111.782 143.024C-113.439 144.144 -115.446 142.602 -115.446 142.602L-115.169 140.582z"/></g>
-            <g style="fill: #000000"><path d="M-122.369 136.182C-122.369 136.182 -117.324 137.505 -118.982 138.624C-120.639 139.744 -122.646 138.202 -122.646 138.202L-122.369 136.182z"/></g>
-            <g style="fill: #cccccc"><path d="M-42.6 211.201C-42.6 211.201 -44.2 211.201 -48.2 213.201C-50.2 213.201 -61.4 216.801 -67 226.801C-67 226.801 -54.6 217.201 -42.6 211.201z"/></g>
-            <g style="fill: #cccccc"><path d="M45.116 303.847C45.257 304.105 45.312 304.525 45.604 304.542C46.262 304.582 47.495 304.883 47.37 304.247C46.522 299.941 45.648 295.004 41.515 293.197C40.876 292.918 39.434 293.331 39.36 294.215C39.233 295.739 39.116 297.088 39.425 298.554C39.725 299.975 41.883 299.985 42.8 298.601C43.736 300.273 44.168 302.116 45.116 303.847z"/></g>
-            <g style="fill: #cccccc"><path d="M34.038 308.581C34.786 309.994 34.659 311.853 36.074 312.416C36.814 312.71 38.664 311.735 38.246 310.661C37.444 308.6 37.056 306.361 35.667 304.55C35.467 304.288 35.707 303.755 35.547 303.427C34.953 302.207 33.808 301.472 32.4 301.801C31.285 304.004 32.433 306.133 33.955 307.842C34.091 307.994 33.925 308.37 34.038 308.581z"/></g>
-            <g style="fill: #cccccc"><path d="M-5.564 303.391C-5.672 303.014 -5.71 302.551 -5.545 302.23C-5.014 301.197 -4.221 300.075 -4.558 299.053C-4.906 297.997 -6.022 298.179 -6.672 298.748C-7.807 299.742 -7.856 301.568 -8.547 302.927C-8.743 303.313 -8.692 303.886 -9.133 304.277C-9.607 304.698 -10.047 306.222 -9.951 306.793C-9.898 307.106 -10.081 317.014 -9.859 316.751C-9.24 316.018 -6.19 306.284 -6.121 305.392C-6.064 304.661 -5.332 304.196 -5.564 303.391z"/></g>
-            <g style="fill: #cccccc"><path d="M-31.202 296.599C-28.568 294.1 -25.778 291.139 -26.22 287.427C-26.336 286.451 -28.111 286.978 -28.298 287.824C-29.1 291.449 -31.139 294.11 -33.707 296.502C-35.903 298.549 -37.765 304.893 -38 305.401C-34.303 300.145 -32.046 297.399 -31.202 296.599z"/></g>
-            <g style="fill: #cccccc"><path d="M-44.776 290.635C-44.253 290.265 -44.555 289.774 -44.338 289.442C-43.385 287.984 -42.084 286.738 -42.066 285C-42.063 284.723 -42.441 284.414 -42.776 284.638C-43.053 284.822 -43.395 284.952 -43.503 285.082C-45.533 287.531 -46.933 290.202 -48.376 293.014C-48.559 293.371 -49.703 297.862 -49.39 297.973C-49.151 298.058 -47.431 293.877 -47.221 293.763C-45.958 293.077 -45.946 291.462 -44.776 290.635z"/></g>
-            <g style="fill: #cccccc"><path d="M-28.043 310.179C-27.599 309.31 -26.023 308.108 -26.136 307.219C-26.254 306.291 -25.786 304.848 -26.698 305.536C-27.955 306.484 -31.404 307.833 -31.674 313.641C-31.7 314.212 -28.726 311.519 -28.043 310.179z"/></g>
-            <g style="fill: #cccccc"><path d="M-13.6 293.001C-13.2 292.333 -12.492 292.806 -12.033 292.543C-11.385 292.171 -10.774 291.613 -10.482 290.964C-9.512 288.815 -7.743 286.995 -7.6 284.601C-9.091 283.196 -9.77 285.236 -10.4 286.201C-11.723 284.554 -12.722 286.428 -14.022 286.947C-14.092 286.975 -14.305 286.628 -14.38 286.655C-15.557 287.095 -16.237 288.176 -17.235 288.957C-17.406 289.091 -17.811 288.911 -17.958 289.047C-18.61 289.65 -19.583 289.975 -19.863 290.657C-20.973 293.364 -24.113 295.459 -26 303.001C-25.619 303.91 -21.488 296.359 -21.001 295.661C-20.165 294.465 -20.047 297.322 -18.771 296.656C-18.72 296.629 -18.534 296.867 -18.4 297.001C-18.206 296.721 -17.988 296.492 -17.6 296.601C-17.6 296.201 -17.734 295.645 -17.533 295.486C-16.296 294.509 -16.38 293.441 -15.6 292.201C-15.142 292.99 -14.081 292.271 -13.6 293.001z"/></g>
-            <g style="fill: #cccccc"><path d="M46.2 347.401C46.2 347.401 53.6 327.001 49.2 315.801C49.2 315.801 60.6 337.401 56 348.601C56 348.601 55.6 338.201 51.6 333.201C51.6 333.201 47.6 346.001 46.2 347.401z"/></g>
-            <g style="fill: #cccccc"><path d="M31.4 344.801C31.4 344.801 36.8 336.001 28.8 317.601C28.8 317.601 28 338.001 21.2 349.001C21.2 349.001 35.4 328.801 31.4 344.801z"/></g>
-            <g style="fill: #cccccc"><path d="M21.4 342.801C21.4 342.801 21.2 322.801 21.6 319.801C21.6 319.801 17.8 336.401 7.6 346.001C7.6 346.001 22 334.001 21.4 342.801z"/></g>
-            <g style="fill: #cccccc"><path d="M11.8 310.801C11.8 310.801 17.8 324.401 7.8 342.801C7.8 342.801 14.2 330.601 9.4 323.601C9.4 323.601 12 320.201 11.8 310.801z"/></g>
-            <g style="fill: #cccccc"><path d="M-7.4 342.401C-7.4 342.401 -8.4 326.801 -6.6 324.601C-6.6 324.601 -6.4 318.201 -6.8 317.201C-6.8 317.201 -2.8 311.001 -2.6 318.401C-2.6 318.401 -1.2 326.201 1.6 330.801C1.6 330.801 5.2 336.201 5 342.601C5 342.601 -5 312.401 -7.4 342.401z"/></g>
-            <g style="fill: #cccccc"><path d="M-11 314.801C-11 314.801 -17.6 325.601 -19.4 344.601C-19.4 344.601 -20.8 338.401 -17 324.001C-17 324.001 -12.8 308.601 -11 314.801z"/></g>
-            <g style="fill: #cccccc"><path d="M-32.8 334.601C-32.8 334.601 -27.8 329.201 -26.4 324.201C-26.4 324.201 -22.8 308.401 -29.2 317.001C-29.2 317.001 -29 325.001 -37.2 332.401C-37.2 332.401 -32.4 330.001 -32.8 334.601z"/></g>
-            <g style="fill: #cccccc"><path d="M-38.6 329.601C-38.6 329.601 -35.2 312.201 -34.4 311.401C-34.4 311.401 -32.6 308.001 -35.4 311.201C-35.4 311.201 -44.2 330.401 -48.2 337.001C-48.2 337.001 -40.2 327.801 -38.6 329.601z"/></g>
-            <g style="fill: #cccccc"><path d="M-44.4 313.001C-44.4 313.001 -32.8 290.601 -54.6 316.401C-54.6 316.401 -43.6 306.601 -44.4 313.001z"/></g>
-            <g style="fill: #cccccc"><path d="M-59.8 298.401C-59.8 298.401 -55 279.601 -52.4 279.801C-52.4 279.801 -44.2 270.801 -50.8 281.401C-50.8 281.401 -56.8 291.001 -56.2 300.801C-56.2 300.801 -56.8 291.201 -59.8 298.401z"/></g>
-            <g style="fill: #cccccc"><path d="M270.5 287C270.5 287 258.5 277 256 273.5C256 273.5 269.5 292 269.5 299C269.5 299 272 291.5 270.5 287z"/></g>
-            <g style="fill: #cccccc"><path d="M276 265C276 265 255 250 251.5 242.5C251.5 242.5 278 272 278 276.5C278 276.5 278.5 267.5 276 265z"/></g>
-            <g style="fill: #cccccc"><path d="M293 111C293 111 281 103 279.5 105C279.5 105 290 111.5 292.5 120C292.5 120 291 111 293 111z"/></g>
-            <g style="fill: #cccccc"><path d="M301.5 191.5L284 179.5C284 179.5 303 196.5 303.5 200.5L301.5 191.5z"/></g>
-            <g style="stroke:#000000"><path d="M-89.25 169L-67.25 173.75"/></g>
-            <g style="stroke:#000000"><path d="M-39 331C-39 331 -39.5 327.5 -48.5 338"/></g>
-            <g style="stroke:#000000"><path d="M-33.5 336C-33.5 336 -31.5 329.5 -38 334"/></g>
-            <g style="stroke:#000000"><path d="M20.5 344.5C20.5 344.5 22 333.5 10.5 346.5"/></g>
-        </g>
-    </draw>
-</page>
diff --git a/html2pdf-master/examples/res/svg_tree.php b/html2pdf-master/examples/res/svg_tree.php
deleted file mode 100644
index ba8b62f2..00000000
--- a/html2pdf-master/examples/res/svg_tree.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<page>
-    <draw style="margin: auto; width:180mm; height:240mm; background: #444444; border: solid 0.5mm #777777;">
-        <g transform="translate(90mm,120mm) scale(1.8) translate(-250,-245)">
-            <path d="M 157.219 412.757 C 158.128 465.467 355.334 465.467 354.425 413.666 C 353.516 358.23 159.036 357.322 157.219 412.757 z " id="path749" sodipodi:nodetypes="ccc" style="fill:#623e35;fill-rule:evenodd;stroke:black;stroke-opacity:1;stroke-width:3.75;stroke-linejoin:bevel;stroke-linecap:butt;fill-opacity:1;stroke-dasharray:none;"/>
-            <path d="M 212.655 306.43 L 211.746 413.665 C 219.694 425.479 288.517 427.298 299.898 412.757 L 299.898 305.521 C 289.901 320.97 232.647 326.423 212.655 306.43 z " id="path748" sodipodi:nodetypes="ccccc" style="fill:#623e35;fill-rule:evenodd;stroke:black;stroke-opacity:1;stroke-width:4.76806;stroke-linejoin:bevel;stroke-linecap:butt;fill-opacity:1;stroke-dasharray:none;" transform="matrix(0.618557,0.000000,0.000000,1.000000,98.94439,-0.908813)"/>
-            <path d="M 248.097 24.7078 C 244.462 35.6132 134.5 111.951 71.7941 150.119 C 109.053 250.994 394.412 247.359 425.31 150.121 C 371.692 134.671 250.823 34.7044 248.097 24.7078 z " id="path747" sodipodi:nodetypes="cccc" style="fill:#009500;fill-rule:evenodd;stroke:black;stroke-opacity:1;stroke-width:3.75;stroke-linejoin:bevel;stroke-linecap:butt;fill-opacity:1;stroke-dasharray:none;" transform="translate(0.908775,139.0434)"/>
-            <path d="M 248.097 24.7078 C 244.462 35.6132 168.125 111.951 105.419 150.119 C 144.496 206.464 356.243 212.826 390.776 148.303 C 337.158 132.853 250.823 34.7044 248.097 24.7078 z " id="path746" sodipodi:nodetypes="cccc" style="fill:#009500;fill-rule:evenodd;stroke:black;stroke-opacity:1;stroke-width:3.75;stroke-linejoin:bevel;stroke-linecap:butt;fill-opacity:1;stroke-dasharray:none;" transform="translate(-3.725290e-7,71.79367)"/>
-            <path d="M 157.343 412.757 L 158.596 431.841 C 201.308 481.824 340.324 469.226 353.047 431.966 L 354.205 412.757 C 356.023 466.375 160.07 463.649 157.343 412.757 z " id="path750" sodipodi:nodetypes="ccccc" style="fill:#623e35;fill-rule:evenodd;stroke:black;stroke-opacity:1;stroke-width:3.75;stroke-linejoin:bevel;stroke-linecap:butt;fill-opacity:1;stroke-dasharray:none;"/>
-            <path d="M 248.097 24.7078 C 244.462 35.6132 207.202 107.407 144.497 145.575 C 181.756 190.106 322.618 193.742 357.151 146.485 C 303.533 131.035 250.823 34.7044 248.097 24.7078 z " id="path745" sodipodi:nodetypes="cccc" style="fill:#009500;fill-rule:evenodd;stroke:black;stroke-opacity:1;stroke-width:3.75;stroke-linejoin:bevel;stroke-linecap:butt;fill-opacity:1;stroke-dasharray:none;"/>
-            <path d="M 247.188 38.3395 C 219.016 91.0487 170.85 136.488 151.766 145.575 C 159.946 160.116 206.293 174.657 225.378 171.931 C 213.564 141.032 216.289 111.951 247.188 38.3395 z " id="path751" sodipodi:nodetypes="cccc" style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-opacity:1;stroke-width:1pt;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:0.5;"/>
-            <path d="M 179.938 171.93 C 168.124 181.927 125.412 215.552 114.506 222.822 C 106.327 223.731 157.219 251.903 175.395 251.903 C 135.408 228.275 217.199 177.383 179.938 171.93 z " id="path752" sodipodi:nodetypes="cccc" style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-opacity:1;stroke-width:1pt;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:0.498039;"/>
-            <path d="M 140.861 250.994 C 126.321 260.082 102.692 277.349 78.1551 290.071 C 83.6078 310.065 123.594 335.511 132.682 338.237 C 96.331 292.798 175.395 260.082 140.861 250.994 z " id="path753" sodipodi:nodetypes="cccc" style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-opacity:1;stroke-width:1pt;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:0.498039;"/>
-            <path d="M 233.308 366.285 C 234.121 379.008 231.643 403.487 233.623 413.293 C 247.255 420.056 256.276 418.554 266.962 418.114 C 253.33 412.661 242.329 402.388 233.308 366.285 z " id="path755" sodipodi:nodetypes="cccc" style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-opacity:1;stroke-width:1pt;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:0.3;"/>
-            <path d="M 222.459 376.374 C 201.797 379.129 155.308 391.181 161.506 415.975 C 167.705 438.703 213.505 443.18 226.247 446.624 C 220.048 439.392 171.837 405.988 222.459 376.374 z " id="path756" sodipodi:nodetypes="cccc" style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-opacity:1;stroke-width:1pt;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:0.3;"/>
-            <path d="M 161.162 428.028 C 163.573 429.061 172.871 441.803 208.685 456.955 C 193.532 452.822 163.228 440.425 161.162 428.028 z " id="path757" sodipodi:nodetypes="ccc" style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-opacity:1;stroke-width:1pt;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:0.3;" transform=""/>
-            <path d="M 315.437 454.544 C 329.556 448.345 346.774 443.524 349.873 432.505 C 355.039 422.174 348.496 436.292 315.437 454.544 z " id="path758" sodipodi:nodetypes="ccc" style="fill:#000011;fill-rule:evenodd;stroke:none;stroke-opacity:1;stroke-width:1pt;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:0.25;"/>
-            <path d="M 287.888 377.407 C 326.457 377.407 383.965 411.154 327.834 438.359 C 362.615 398.413 287.888 378.44 287.888 377.407 z " id="path759" sodipodi:nodetypes="ccc" style="fill:#000011;fill-rule:evenodd;stroke:none;stroke-opacity:1;stroke-width:1pt;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:0.247059;"/>
-            <path d="M 259.65 366.043 C 259.65 366.043 279.967 363.288 281.345 365.698 C 282.722 368.109 281.689 387.049 281.001 391.87 C 279.968 382.572 282.378 368.798 259.65 366.043 z " id="path760" sodipodi:nodetypes="cccc" style="fill:#000011;fill-rule:evenodd;stroke:none;stroke-opacity:1;stroke-width:1pt;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:0.247059;"/>
-            <path d="M 387.929 328.061 C 401.191 322.851 418.716 301.536 421.559 292.536 C 418.243 288.747 385.56 275.484 377.982 268.853 C 383.666 278.326 409.717 297.747 387.929 328.061 z " id="path761" sodipodi:nodetypes="cccc" style="fill:#000011;fill-rule:evenodd;stroke:none;stroke-opacity:1;stroke-width:1pt;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:0.247059;"/>
-            <path d="M 352.404 245.644 C 370.876 238.539 382.244 229.065 384.613 222.908 C 375.613 219.119 355.246 205.856 345.299 200.172 C 352.878 208.224 368.509 221.487 352.404 245.644 z " id="path762" sodipodi:nodetypes="cccc" style="fill:#000011;fill-rule:evenodd;stroke:none;stroke-opacity:1;stroke-width:1pt;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:0.247059;"/>
-            <path d="M 305.038 115.861 C 312.617 126.755 346.72 147.595 350.51 148.543 C 345.773 156.122 322.09 168.437 313.09 169.384 C 308.354 168.911 336.773 152.806 305.038 115.861 z " id="path763" sodipodi:nodetypes="cccc" style="fill:#000011;fill-rule:evenodd;stroke:none;stroke-opacity:1;stroke-width:1pt;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:0.247059;"/>
-            <g id="g771" transform="translate(-249.1874,169.4743)">
-                <path d="M 424.69 52.5344 C 445.456 51.8645 445.456 82.0082 426.03 82.0082 C 401.245 82.678 404.594 53.2043 424.69 52.5344 z " id="path772" sodipodi:nodetypes="ccc" style="fill:#ff0000;fill-rule:evenodd;stroke:black;stroke-opacity:1;stroke-width:3.75;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:1;stroke-dasharray:none;"/>
-                <path d="M 425.36 55.2139 C 423.35 53.2043 401.915 63.922 415.982 75.3096 C 424.691 74.6397 427.37 57.2234 425.36 55.2139 z " id="path773" sodipodi:nodetypes="ccc" style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-opacity:1;stroke-width:1pt;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:0.7;"/>
-            </g>
-            <g id="g774" transform="translate(-46.89011,243.8286)">
-                <path d="M 424.69 52.5344 C 445.456 51.8645 445.456 82.0082 426.03 82.0082 C 401.245 82.678 404.594 53.2043 424.69 52.5344 z " id="path775" sodipodi:nodetypes="ccc" style="fill:#ff0000;fill-rule:evenodd;stroke:black;stroke-opacity:1;stroke-width:3.75;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:1;stroke-dasharray:none;"/>
-                <path d="M 425.36 55.2139 C 423.35 53.2043 401.915 63.922 415.982 75.3096 C 424.691 74.6397 427.37 57.2234 425.36 55.2139 z " id="path776" sodipodi:nodetypes="ccc" style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-opacity:1;stroke-width:1pt;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:0.7;"/>
-            </g>
-            <g id="g777" transform="translate(-226.4122,271.2928)">
-                <path d="M 424.69 52.5344 C 445.456 51.8645 445.456 82.0082 426.03 82.0082 C 401.245 82.678 404.594 53.2043 424.69 52.5344 z " id="path778" sodipodi:nodetypes="ccc" style="fill:#ff0000;fill-rule:evenodd;stroke:black;stroke-opacity:1;stroke-width:3.75;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:1;stroke-dasharray:none;"/>
-                <path d="M 425.36 55.2139 C 423.35 53.2043 401.915 63.922 415.982 75.3096 C 424.691 74.6397 427.37 57.2234 425.36 55.2139 z " id="path779" sodipodi:nodetypes="ccc" style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-opacity:1;stroke-width:1pt;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:0.7;"/>
-            </g>
-            <g id="g780" transform="translate(-117.8951,83.73234)">
-                <path d="M 424.69 52.5344 C 445.456 51.8645 445.456 82.0082 426.03 82.0082 C 401.245 82.678 404.594 53.2043 424.69 52.5344 z " id="path781" sodipodi:nodetypes="ccc" style="fill:#ff0000;fill-rule:evenodd;stroke:black;stroke-opacity:1;stroke-width:3.75;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:1;stroke-dasharray:none;"/>
-                <path d="M 425.36 55.2139 C 423.35 53.2043 401.915 63.922 415.982 75.3096 C 424.691 74.6397 427.37 57.2234 425.36 55.2139 z " id="path782" sodipodi:nodetypes="ccc" style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-opacity:1;stroke-width:1pt;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:0.7;"/>
-            </g>
-            <g id="g791" transform="translate(-236.4601,103.1582)">
-                <path d="M 424.69 52.5344 C 445.456 51.8645 445.456 82.0082 426.03 82.0082 C 401.245 82.678 404.594 53.2043 424.69 52.5344 z " id="path792" sodipodi:nodetypes="ccc" style="font-size:12;fill:#ff00ff;fill-rule:evenodd;stroke:#000000;stroke-width:3.75;fill-opacity:1;"/>
-                <path d="M 425.36 55.2139 C 423.35 53.2043 401.915 63.922 415.982 75.3096 C 424.691 74.6397 427.37 57.2234 425.36 55.2139 z " id="path793" sodipodi:nodetypes="ccc" style="font-size:12;fill:#ffffff;fill-opacity:0.7;fill-rule:evenodd;stroke-width:1pt;"/>
-            </g>
-            <g id="g794" transform="translate(-85.74192,124.5937)">
-                <path d="M 424.69 52.5344 C 445.456 51.8645 445.456 82.0082 426.03 82.0082 C 401.245 82.678 404.594 53.2043 424.69 52.5344 z " id="path795" sodipodi:nodetypes="ccc" style="font-size:12;fill:#ff00ff;fill-rule:evenodd;stroke:#000000;stroke-width:3.75;fill-opacity:1;"/>
-                <path d="M 425.36 55.2139 C 423.35 53.2043 401.915 63.922 415.982 75.3096 C 424.691 74.6397 427.37 57.2234 425.36 55.2139 z " id="path796" sodipodi:nodetypes="ccc" style="font-size:12;fill:#ffffff;fill-opacity:0.7;fill-rule:evenodd;stroke-width:1pt;"/>
-            </g>
-            <g id="g797" transform="translate(-144.0196,236.4601)">
-                <path d="M 424.69 52.5344 C 445.456 51.8645 445.456 82.0082 426.03 82.0082 C 401.245 82.678 404.594 53.2043 424.69 52.5344 z " id="path798" sodipodi:nodetypes="ccc" style="font-size:12;fill:#ff00ff;fill-rule:evenodd;stroke:#000000;stroke-width:3.75;fill-opacity:1;"/>
-                <path d="M 425.36 55.2139 C 423.35 53.2043 401.915 63.922 415.982 75.3096 C 424.691 74.6397 427.37 57.2234 425.36 55.2139 z " id="path799" sodipodi:nodetypes="ccc" style="font-size:12;fill:#ffffff;fill-opacity:0.7;fill-rule:evenodd;stroke-width:1pt;"/>
-            </g>
-            <g id="g808" transform="translate(-158.7565,60.28728)">
-                <path d="M 424.69 52.5344 C 445.456 51.8645 445.456 82.0082 426.03 82.0082 C 401.245 82.678 404.594 53.2043 424.69 52.5344 z " id="path809" sodipodi:nodetypes="ccc" style="font-size:12;fill:#0000ff;fill-rule:evenodd;stroke:#000000;stroke-width:3.75;fill-opacity:1;"/>
-                <path d="M 425.36 55.2139 C 423.35 53.2043 401.915 63.922 415.982 75.3096 C 424.691 74.6397 427.37 57.2234 425.36 55.2139 z " id="path810" sodipodi:nodetypes="ccc" style="font-size:12;fill:#ffffff;fill-opacity:0.7;fill-rule:evenodd;stroke-width:1pt;"/>
-            </g>
-            <g id="g811" transform="translate(-300.7665,212.3452)">
-                <path d="M 424.69 52.5344 C 445.456 51.8645 445.456 82.0082 426.03 82.0082 C 401.245 82.678 404.594 53.2043 424.69 52.5344 z " id="path812" sodipodi:nodetypes="ccc" style="font-size:12;fill:#0000ff;fill-rule:evenodd;stroke:#000000;stroke-width:3.75;fill-opacity:1;"/>
-                <path d="M 425.36 55.2139 C 423.35 53.2043 401.915 63.922 415.982 75.3096 C 424.691 74.6397 427.37 57.2234 425.36 55.2139 z " id="path813" sodipodi:nodetypes="ccc" style="font-size:12;fill:#ffffff;fill-opacity:0.7;fill-rule:evenodd;stroke-width:1pt;"/>
-            </g>
-            <g id="g814" transform="translate(-109.1869,185.5508)">
-                <path d="M 424.69 52.5344 C 445.456 51.8645 445.456 82.0082 426.03 82.0082 C 401.245 82.678 404.594 53.2043 424.69 52.5344 z " id="path815" sodipodi:nodetypes="ccc" style="font-size:12;fill:#0000ff;fill-rule:evenodd;stroke:#000000;stroke-width:3.75;fill-opacity:1;"/>
-                <path d="M 425.36 55.2139 C 423.35 53.2043 401.915 63.922 415.982 75.3096 C 424.691 74.6397 427.37 57.2234 425.36 55.2139 z " id="path816" sodipodi:nodetypes="ccc" style="font-size:12;fill:#ffffff;fill-opacity:0.7;fill-rule:evenodd;stroke-width:1pt;"/>
-            </g>
-            <g id="g822" transform="translate(-192.9193,111.8663)">
-                <path d="M 424.69 52.5344 C 445.456 51.8645 445.456 82.0082 426.03 82.0082 C 401.245 82.678 404.594 53.2043 424.69 52.5344 z " id="path823" sodipodi:nodetypes="ccc" style="font-size:12;fill:#00ffff;fill-rule:evenodd;stroke:#000000;stroke-width:3.75;fill-opacity:1;"/>
-                <path d="M 425.36 55.2139 C 423.35 53.2043 401.915 63.922 415.982 75.3096 C 424.691 74.6397 427.37 57.2234 425.36 55.2139 z " id="path824" sodipodi:nodetypes="ccc" style="font-size:12;fill:#ffffff;fill-opacity:0.7;fill-rule:evenodd;stroke-width:1pt;"/>
-            </g>
-            <g id="g825" transform="translate(-101.1486,279.3311)">
-                <path d="M 424.69 52.5344 C 445.456 51.8645 445.456 82.0082 426.03 82.0082 C 401.245 82.678 404.594 53.2043 424.69 52.5344 z " id="path826" sodipodi:nodetypes="ccc" style="font-size:12;fill:#00ffff;fill-rule:evenodd;stroke:#000000;stroke-width:3.75;fill-opacity:1;"/>
-                <path d="M 425.36 55.2139 C 423.35 53.2043 401.915 63.922 415.982 75.3096 C 424.691 74.6397 427.37 57.2234 425.36 55.2139 z " id="path827" sodipodi:nodetypes="ccc" style="font-size:12;fill:#ffffff;fill-opacity:0.7;fill-rule:evenodd;stroke-width:1pt;"/>
-            </g>
-            <g id="g836" transform="translate(-293.3981,267.9435)">
-                <path d="M 424.69 52.5344 C 445.456 51.8645 445.456 82.0082 426.03 82.0082 C 401.245 82.678 404.594 53.2043 424.69 52.5344 z " id="path837" sodipodi:nodetypes="ccc" style="font-size:12;fill:#00ff00;fill-rule:evenodd;stroke:#000000;stroke-width:3.75;fill-opacity:1;"/>
-                <path d="M 425.36 55.2139 C 423.35 53.2043 401.915 63.922 415.982 75.3096 C 424.691 74.6397 427.37 57.2234 425.36 55.2139 z " id="path838" sodipodi:nodetypes="ccc" style="font-size:12;fill:#ffffff;fill-opacity:0.7;fill-rule:evenodd;stroke-width:1pt;"/>
-            </g>
-            <g id="g839" transform="translate(-203.6370,194.9289)">
-                <path d="M 424.69 52.5344 C 445.456 51.8645 445.456 82.0082 426.03 82.0082 C 401.245 82.678 404.594 53.2043 424.69 52.5344 z " id="path840" sodipodi:nodetypes="ccc" style="font-size:12;fill:#00ff00;fill-rule:evenodd;stroke:#000000;stroke-width:3.75;fill-opacity:1;"/>
-                <path d="M 425.36 55.2139 C 423.35 53.2043 401.915 63.922 415.982 75.3096 C 424.691 74.6397 427.37 57.2234 425.36 55.2139 z " id="path841" sodipodi:nodetypes="ccc" style="font-size:12;fill:#ffffff;fill-opacity:0.7;fill-rule:evenodd;stroke-width:1pt;"/>
-            </g>
-            <g id="g851" transform="translate(-81.05289,214.3548)">
-                <path d="M 424.69 52.5344 C 445.456 51.8645 445.456 82.0082 426.03 82.0082 C 401.245 82.678 404.594 53.2043 424.69 52.5344 z " id="path852" sodipodi:nodetypes="ccc" style="font-size:12;fill:#ffff00;fill-rule:evenodd;stroke:#000000;stroke-width:3.75;fill-opacity:1;"/>
-                <path d="M 425.36 55.2139 C 423.35 53.2043 401.915 63.922 415.982 75.3096 C 424.691 74.6397 427.37 57.2234 425.36 55.2139 z " id="path853" sodipodi:nodetypes="ccc" style="font-size:12;fill:#ffffff;fill-opacity:0.7;fill-rule:evenodd;stroke-width:1pt;"/>
-            </g>
-            <g id="g854" transform="translate(-146.0292,146.0292)">
-                <path d="M 424.69 52.5344 C 445.456 51.8645 445.456 82.0082 426.03 82.0082 C 401.245 82.678 404.594 53.2043 424.69 52.5344 z " id="path855" sodipodi:nodetypes="ccc" style="font-size:12;fill:#ffff00;fill-rule:evenodd;stroke:#000000;stroke-width:3.75;fill-opacity:1;"/>
-                <path d="M 425.36 55.2139 C 423.35 53.2043 401.915 63.922 415.982 75.3096 C 424.691 74.6397 427.37 57.2234 425.36 55.2139 z " id="path856" sodipodi:nodetypes="ccc" style="font-size:12;fill:#ffffff;fill-opacity:0.7;fill-rule:evenodd;stroke-width:1pt;"/>
-            </g>
-            <g id="g857" transform="translate(-231.7711,227.7519)">
-                <path d="M 424.69 52.5344 C 445.456 51.8645 445.456 82.0082 426.03 82.0082 C 401.245 82.678 404.594 53.2043 424.69 52.5344 z " id="path858" sodipodi:nodetypes="ccc" style="font-size:12;fill:#ffff00;fill-rule:evenodd;stroke:#000000;stroke-width:3.75;fill-opacity:1;"/>
-                <path d="M 425.36 55.2139 C 423.35 53.2043 401.915 63.922 415.982 75.3096 C 424.691 74.6397 427.37 57.2234 425.36 55.2139 z " id="path859" sodipodi:nodetypes="ccc" style="font-size:12;fill:#ffffff;fill-opacity:0.7;fill-rule:evenodd;stroke-width:1pt;"/>
-            </g>
-            <g id="g865" transform="translate(-202.9672,64.97627)">
-                <path d="M 424.69 52.5344 C 445.456 51.8645 445.456 82.0082 426.03 82.0082 C 401.245 82.678 404.594 53.2043 424.69 52.5344 z " id="path866" sodipodi:nodetypes="ccc" style="font-size:12;fill:#ff9300;fill-rule:evenodd;stroke:#000000;stroke-width:3.75;fill-opacity:1;"/>
-                <path d="M 425.36 55.2139 C 423.35 53.2043 401.915 63.922 415.982 75.3096 C 424.691 74.6397 427.37 57.2234 425.36 55.2139 z " id="path867" sodipodi:nodetypes="ccc" style="font-size:12;fill:#ffffff;fill-opacity:0.7;fill-rule:evenodd;stroke-width:1pt;"/>
-            </g>
-            <g id="g868" transform="translate(-158.0866,287.3694)">
-                <path d="M 424.69 52.5344 C 445.456 51.8645 445.456 82.0082 426.03 82.0082 C 401.245 82.678 404.594 53.2043 424.69 52.5344 z " id="path869" sodipodi:nodetypes="ccc" style="font-size:12;fill:#ff9300;fill-rule:evenodd;stroke:#000000;stroke-width:3.75;fill-opacity:1;"/>
-                <path d="M 425.36 55.2139 C 423.35 53.2043 401.915 63.922 415.982 75.3096 C 424.691 74.6397 427.37 57.2234 425.36 55.2139 z " id="path870" sodipodi:nodetypes="ccc" style="font-size:12;fill:#ffffff;fill-opacity:0.7;fill-rule:evenodd;stroke-width:1pt;"/>
-            </g>
-            <g id="g871" transform="translate(-152.7278,188.2303)">
-                <path d="M 424.69 52.5344 C 445.456 51.8645 445.456 82.0082 426.03 82.0082 C 401.245 82.678 404.594 53.2043 424.69 52.5344 z " id="path872" sodipodi:nodetypes="ccc" style="font-size:12;fill:#ff9300;fill-rule:evenodd;stroke:#000000;stroke-width:3.75;fill-opacity:1;"/>
-                <path d="M 425.36 55.2139 C 423.35 53.2043 401.915 63.922 415.982 75.3096 C 424.691 74.6397 427.37 57.2234 425.36 55.2139 z " id="path873" sodipodi:nodetypes="ccc" style="font-size:12;fill:#ffffff;fill-opacity:0.7;fill-rule:evenodd;stroke-width:1pt;"/>
-            </g>
-            <g id="g880" transform="translate(-140.0000,25.00000)">
-                <polygon id="polygon878" points="418.662,76.6493 399.532,56.5037 376.859,72.5587 390.107,48.1396 367.832,31.538 395.15,36.5918 404.055,10.2764 407.69,37.819 435.47,38.1568 410.399,50.1252 418.662,76.6493 " sodipodi:arg1="1.04002345" sodipodi:arg2="1.66834199" sodipodi:cx="400.575500" sodipodi:cy="45.8358383" sodipodi:r1="35.7292557" sodipodi:r2="10.7187767" sodipodi:sides="5" sodipodi:type="star" style="font-size:12;fill:#ff0000;fill-rule:evenodd;stroke-width:3.75;stroke:#000000;stroke-opacity:1;stroke-dasharray:none;fill-opacity:1;" transform="matrix(0.994342,-0.106230,0.106230,0.994342,-2.344353,42.91328)"/>
-                <path d="M 388.532 62.8101 C 401.79 40.713 380.796 41.775 381.792 39.3513 C 399.139 44.4405 399.022 35.5462 400.79 24.014 C 403.441 40.3242 406.708 43.765 388.532 62.8101 z " id="path879" sodipodi:nodetypes="cccc" style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-opacity:1;stroke-width:1pt;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:0.5;"/>
-            </g>
-            <g id="g883" transform="translate(-216.1370,24.92889)">
-                <path d="M 424.69 52.5344 C 445.456 51.8645 445.456 82.0082 426.03 82.0082 C 401.245 82.678 404.594 53.2043 424.69 52.5344 z " id="path884" sodipodi:nodetypes="ccc" style="font-size:12;fill:#00ff00;fill-rule:evenodd;stroke:#000000;stroke-width:3.75;fill-opacity:1;"/>
-                <path d="M 425.36 55.2139 C 423.35 53.2043 401.915 63.922 415.982 75.3096 C 424.691 74.6397 427.37 57.2234 425.36 55.2139 z " id="path885" sodipodi:nodetypes="ccc" style="font-size:12;fill:#ffffff;fill-opacity:0.7;fill-rule:evenodd;stroke-width:1pt;"/>
-            </g>
-        </g>
-    </draw>
-</page>
diff --git a/html2pdf-master/examples/res/tcpdf_logo.jpg b/html2pdf-master/examples/res/tcpdf_logo.jpg
deleted file mode 100644
index 257f8fb6..00000000
Binary files a/html2pdf-master/examples/res/tcpdf_logo.jpg and /dev/null differ
diff --git a/html2pdf-master/examples/res/ticket.php b/html2pdf-master/examples/res/ticket.php
deleted file mode 100644
index 39666813..00000000
--- a/html2pdf-master/examples/res/ticket.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-    $num = 'CMD01-'.date('ymd');
-    $nom = 'DUPONT Alphonse';
-    $date = '31/12/'.date('Y');
-?>
-<style type="text/css">
-<!--
-    div.zone { border: none; border-radius: 6mm; background: #FFFFFF; border-collapse: collapse; padding:3mm; font-size: 2.7mm;}
-    h1 { padding: 0; margin: 0; color: #DD0000; font-size: 7mm; }
-    h2 { padding: 0; margin: 0; color: #222222; font-size: 5mm; position: relative; }
--->
-</style>
-<page format="100x200" orientation="L" backcolor="#AAAACC" style="font: arial;">
-    <div style="rotate: 90; position: absolute; width: 100mm; height: 4mm; left: 195mm; top: 0; font-style: italic; font-weight: normal; text-align: center; font-size: 2.5mm;">
-        Ceci est votre e-ticket à présenter au contrôle d'accès -
-        billet généré par <a href="http://html2pdf.fr/" style="color: #222222; text-decoration: none;">html2pdf</a>
-    </div>
-    <table style="width: 99%;border: none;" cellspacing="4mm" cellpadding="0">
-        <tr>
-            <td colspan="2" style="width: 100%">
-                <div class="zone" style="height: 34mm;position: relative;font-size: 5mm;">
-                    <div style="position: absolute; right: 3mm; top: 3mm; text-align: right; font-size: 4mm; ">
-                        <b><?php echo $nom; ?></b><br>
-                    </div>
-                    <div style="position: absolute; right: 3mm; bottom: 3mm; text-align: right; font-size: 4mm; ">
-                        <b>1</b> place <b>plein tarif</b><br>
-                        Prix unitaire TTC : <b>45,00&euro;</b><br>
-                        N° commande : <b><?php echo $num; ?></b><br>
-                        Date d'achat : <b><?php echo date('d/m/Y à H:i:s'); ?></b><br>
-                    </div>
-                    <h1>Billet soirée spécial Html2Pdf</h1>
-                    &nbsp;&nbsp;&nbsp;&nbsp;<b>Valable le <?php echo $date; ?> à 20h30</b><br>
-                    <img src="./res/logo.gif" alt="logo" style="margin-top: 3mm; margin-left: 20mm">
-                </div>
-            </td>
-        </tr>
-        <tr>
-            <td style="width: 25%;">
-                <div class="zone" style="height: 40mm;vertical-align: middle;text-align: center;">
-                    <qrcode value="<?php echo $num."\n".$nom."\n".$date; ?>" ec="Q" style="width: 37mm; border: none;" ></qrcode>
-                </div>
-            </td>
-            <td style="width: 75%">
-                <div class="zone" style="height: 40mm;vertical-align: middle; text-align: justify">
-                    <b>Conditions d'utilisation du billet</b><br>
-                    Le billet est soumis aux conditions générales de vente que vous avez
-                    acceptées avant l'achat du billet. Le billet d'entrée est uniquement
-                    valable s'il est imprimé sur du papier A4 blanc, vierge recto et verso.
-                    L'entrée est soumise au contrôle de la validité de votre billet. Une bonne
-                    qualité d'impression est nécessaire. Les billets partiellement imprimés,
-                    souillés, endommagés ou illisibles ne seront pas acceptés et seront
-                    considérés comme non valables. En cas d'incident ou de mauvaise qualité
-                    d'impression, vous devez imprimer à nouveau votre fichier. Pour vérifier
-                    la bonne qualité de l'impression, assurez-vous que les informations écrites
-                    sur le billet, ainsi que les pictogrammes (code à barres 2D) sont bien
-                    lisibles. Ce titre doit être conservé jusqu'à la fin de la manifestation.
-                    Une pièce d'identité pourra être demandée conjointement à ce billet. En
-                    cas de non respect de l'ensemble des règles précisées ci-dessus, ce billet
-                    sera considéré comme non valable.<br>
-                    <br>
-                    <i>Ce billet est reconnu électroniquement lors de votre
-                    arrivée sur site. A ce titre, il ne doit être ni dupliqué, ni photocopié.
-                    Toute reproduction est frauduleuse et inutile.</i>
-                </div>
-            </td>
-        </tr>
-    </table>
-</page>
diff --git a/html2pdf-master/examples/svg.php b/html2pdf-master/examples/svg.php
deleted file mode 100644
index 5a45f48e..00000000
--- a/html2pdf-master/examples/svg.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - example
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-require_once dirname(__FILE__).'/../vendor/autoload.php';
-
-use Spipu\Html2Pdf\Html2Pdf;
-use Spipu\Html2Pdf\Exception\Html2PdfException;
-use Spipu\Html2Pdf\Exception\ExceptionFormatter;
-
-try {
-    ob_start();
-    include dirname(__FILE__).'/res/svg.php';
-    $content = ob_get_clean();
-
-    $html2pdf = new Html2Pdf('P', 'A4', 'fr');
-    $html2pdf->pdf->SetDisplayMode('fullpage');
-    $html2pdf->writeHTML($content);
-    $html2pdf->output('svg.pdf');
-} catch (Html2PdfException $e) {
-    $html2pdf->clean();
-
-    $formatter = new ExceptionFormatter($e);
-    echo $formatter->getHtmlMessage();
-}
diff --git a/html2pdf-master/examples/svg_tiger.php b/html2pdf-master/examples/svg_tiger.php
deleted file mode 100644
index da775e6d..00000000
--- a/html2pdf-master/examples/svg_tiger.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - example
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-require_once dirname(__FILE__).'/../vendor/autoload.php';
-
-use Spipu\Html2Pdf\Html2Pdf;
-use Spipu\Html2Pdf\Exception\Html2PdfException;
-use Spipu\Html2Pdf\Exception\ExceptionFormatter;
-
-try {
-    ob_start();
-    include dirname(__FILE__).'/res/svg_tiger.php';
-    $content = ob_get_clean();
-
-    $html2pdf = new Html2Pdf('L', 'A4', 'fr');
-    $html2pdf->pdf->SetDisplayMode('fullpage');
-    $html2pdf->writeHTML($content);
-    $html2pdf->output('svg_tiger.pdf');
-} catch (Html2PdfException $e) {
-    $html2pdf->clean();
-
-    $formatter = new ExceptionFormatter($e);
-    echo $formatter->getHtmlMessage();
-}
diff --git a/html2pdf-master/examples/svg_tree.php b/html2pdf-master/examples/svg_tree.php
deleted file mode 100644
index 5ed3b3b1..00000000
--- a/html2pdf-master/examples/svg_tree.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - example
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-require_once dirname(__FILE__).'/../vendor/autoload.php';
-
-use Spipu\Html2Pdf\Html2Pdf;
-use Spipu\Html2Pdf\Exception\Html2PdfException;
-use Spipu\Html2Pdf\Exception\ExceptionFormatter;
-
-try {
-    ob_start();
-    include dirname(__FILE__).'/res/svg_tree.php';
-    $content = ob_get_clean();
-
-    $html2pdf = new Html2Pdf('P', 'A4', 'fr');
-    $html2pdf->pdf->SetDisplayMode('fullpage');
-    $html2pdf->writeHTML($content);
-    $html2pdf->output('svg_tree.pdf');
-} catch (Html2PdfException $e) {
-    $html2pdf->clean();
-
-    $formatter = new ExceptionFormatter($e);
-    echo $formatter->getHtmlMessage();
-}
diff --git a/html2pdf-master/examples/ticket.php b/html2pdf-master/examples/ticket.php
deleted file mode 100644
index ae8138a8..00000000
--- a/html2pdf-master/examples/ticket.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - example
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-require_once dirname(__FILE__).'/../vendor/autoload.php';
-
-use Spipu\Html2Pdf\Html2Pdf;
-use Spipu\Html2Pdf\Exception\Html2PdfException;
-use Spipu\Html2Pdf\Exception\ExceptionFormatter;
-
-try {
-    ob_start();
-    include dirname(__FILE__).'/res/ticket.php';
-    $content = ob_get_clean();
-
-    $html2pdf = new Html2Pdf('P', 'A4', 'fr', true, 'UTF-8', 0);
-    $html2pdf->pdf->SetDisplayMode('fullpage');
-    $html2pdf->writeHTML($content);
-    $html2pdf->output('ticket.pdf');
-} catch (Html2PdfException $e) {
-    $html2pdf->clean();
-
-    $formatter = new ExceptionFormatter($e);
-    echo $formatter->getHtmlMessage();
-}
diff --git a/html2pdf-master/examples/utf8.php b/html2pdf-master/examples/utf8.php
deleted file mode 100644
index 610f3feb..00000000
--- a/html2pdf-master/examples/utf8.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - example
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-require_once dirname(__FILE__).'/../vendor/autoload.php';
-
-use Spipu\Html2Pdf\Html2Pdf;
-use Spipu\Html2Pdf\Exception\Html2PdfException;
-use Spipu\Html2Pdf\Exception\ExceptionFormatter;
-
-
-try {
-    $html2pdf = new Html2Pdf('P', 'A4', 'fr');
-
-    $content = file_get_contents(K_PATH_MAIN.'examples/data/utf8test.txt');
-    $content = '<page style="font-family: freeserif"><br />'.nl2br($content).'</page>';
-
-    $html2pdf->pdf->SetDisplayMode('real');
-    $html2pdf->writeHTML($content);
-    $html2pdf->output('utf8.pdf');
-} catch (Html2PdfException $e) {
-    $html2pdf->clean();
-
-    $formatter = new ExceptionFormatter($e);
-    echo $formatter->getHtmlMessage();
-}
diff --git a/html2pdf-master/phpunit.xml b/html2pdf-master/phpunit.xml
deleted file mode 100644
index a86805a1..00000000
--- a/html2pdf-master/phpunit.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-     bootstrap="./vendor/autoload.php" colors="true" backupGlobals="false"
-     backupStaticAttributes="false"
-     verbose="true"
->
-    <testsuites>
-        <testsuite name="unit">
-            <directory>src/Tests</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist addUncoveredFilesFromWhiteList="true">
-            <directory suffix=".php">src</directory>
-            <exclude>
-                <directory>src/Tests</directory>
-                <directory>src/config</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-    <!-- logging>
-        <log type="coverage-html" target="build/logs/coverage" charset="UTF-8" yui="true" highlight="true"/>
-        <log type="coverage-clover" target="build/logs/clover.xml"/>
-    </logging -->
-</phpunit>
diff --git a/html2pdf-master/src/CssConverter.php b/html2pdf-master/src/CssConverter.php
deleted file mode 100644
index 5e7bbb9a..00000000
--- a/html2pdf-master/src/CssConverter.php
+++ /dev/null
@@ -1,405 +0,0 @@
-<?php
-/**
- * Html2Pdf Library
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-namespace Spipu\Html2Pdf;
-
-/**
- * Class CssConverter
- */
-class CssConverter
-{
-    private $htmlColor   = array(); // list of the HTML colors
-
-    /**
-     * fontsize ratios
-     * @var float[]
-     */
-    private $fontSizeRatio = [
-        'smaller'  => 0.8,
-        'larger'   => 1.25,
-        'xx-small' => 0.512,
-        'x-small'  => 0.64,
-        'small'    => 0.8,
-        'medium'   => 1.,
-        'large'    => 1.25,
-        'x-large'  => 1.5625,
-        'xx-large' => 1.953125,
-    ];
-
-    public function __construct()
-    {
-        $this->htmlColor = \TCPDF_COLORS::$webcolor;
-    }
-
-    /**
-     * convert a distance to mm
-     *
-     * @param string $css distance to convert
-     * @param float  $old parent distance
-     *
-     * @return float
-     */
-    public function convertToMM($css, $old = 0.)
-    {
-        $css = trim($css);
-        if (preg_match('/^[0-9\.\-]+$/isU', $css)) {
-            $css.= 'px';
-        }
-        if (preg_match('/^[0-9\.\-]+px$/isU', $css)) {
-            $css = 25.4/96. * str_replace('px', '', $css);
-        } elseif (preg_match('/^[0-9\.\-]+pt$/isU', $css)) {
-            $css = 25.4/72. * str_replace('pt', '', $css);
-        } elseif (preg_match('/^[0-9\.\-]+in$/isU', $css)) {
-            $css = 25.4 * str_replace('in', '', $css);
-        } elseif (preg_match('/^[0-9\.\-]+mm$/isU', $css)) {
-            $css = 1.*str_replace('mm', '', $css);
-        } elseif (preg_match('/^[0-9\.\-]+%$/isU', $css)) {
-            $css = 1.*$old*str_replace('%', '', $css)/100.;
-        } else {
-            $css = null;
-        }
-
-        return $css;
-    }
-
-    /**
-     * @param string $css    font size to convert
-     * @param float  $parent parent font size
-     * @return float
-     */
-    public function convertFontSize($css, $parent = 0.)
-    {
-        $css = trim($css);
-        if (array_key_exists($css, $this->fontSizeRatio)) {
-            $css = ($this->fontSizeRatio[$css] * $parent).'mm';
-        }
-
-        return $this->convertToMM($css, $parent);
-    }
-
-    /**
-     * convert a css radius
-     *
-     * @access public
-     * @param  string $css
-     * @return float  $value
-     */
-    public function convertToRadius($css)
-    {
-        // explode the value
-        $css = explode(' ', $css);
-
-        foreach ($css as $k => $v) {
-            $v = trim($v);
-            if ($v !== '') {
-                $v = $this->convertToMM($v, 0);
-                if ($v !== null) {
-                    $css[$k] = $v;
-                } else {
-                    unset($css[$k]);
-                }
-            } else {
-                unset($css[$k]);
-            }
-        }
-
-        return array_values($css);
-    }
-
-    /**
-     * convert a css color to an RGB array
-     *
-     * @param string   $css
-     * @param &boolean $res
-     *
-     * @return array (r, g, b)
-     */
-    public function convertToColor($css, &$res)
-    {
-        // prepare the value
-        $css = trim($css);
-        $res = true;
-
-        // if transparent => return null
-        if (strtolower($css) === 'transparent') {
-            return array(null, null, null);
-        }
-
-        // HTML color
-        if (isset($this->htmlColor[strtolower($css)])) {
-            $css = $this->htmlColor[strtolower($css)];
-            $r = floatVal(hexdec(substr($css, 0, 2)));
-            $g = floatVal(hexdec(substr($css, 2, 2)));
-            $b = floatVal(hexdec(substr($css, 4, 2)));
-            return array($r, $g, $b);
-        }
-
-        // like #FFFFFF
-        if (preg_match('/^#[0-9A-Fa-f]{6}$/isU', $css)) {
-            $r = floatVal(hexdec(substr($css, 1, 2)));
-            $g = floatVal(hexdec(substr($css, 3, 2)));
-            $b = floatVal(hexdec(substr($css, 5, 2)));
-            return array($r, $g, $b);
-        }
-
-        // like #FFF
-        if (preg_match('/^#[0-9A-F]{3}$/isU', $css)) {
-            $r = floatVal(hexdec(substr($css, 1, 1).substr($css, 1, 1)));
-            $g = floatVal(hexdec(substr($css, 2, 1).substr($css, 2, 1)));
-            $b = floatVal(hexdec(substr($css, 3, 1).substr($css, 3, 1)));
-            return array($r, $g, $b);
-        }
-
-        // like rgb(100, 100, 100)
-        $sub = '[\s]*([0-9%\.]+)[\s]*';
-        if (preg_match('/rgb\('.$sub.','.$sub.','.$sub.'\)/isU', $css, $match)) {
-            $r = $this->convertSubColor($match[1]);
-            $g = $this->convertSubColor($match[2]);
-            $b = $this->convertSubColor($match[3]);
-            return array($r * 255., $g * 255., $b * 255.);
-        }
-
-        // like cmyk(100, 100, 100, 100)
-        $sub = '[\s]*([0-9%\.]+)[\s]*';
-        if (preg_match('/cmyk\('.$sub.','.$sub.','.$sub.','.$sub.'\)/isU', $css, $match)) {
-            $c = $this->convertSubColor($match[1]);
-            $m = $this->convertSubColor($match[2]);
-            $y = $this->convertSubColor($match[3]);
-            $k = $this->convertSubColor($match[4]);
-            return array($c * 100., $m * 100., $y * 100., $k * 100.);
-        }
-
-        $res = false;
-        return array(0., 0., 0.);
-    }
-
-    /**
-     * color value to convert
-     *
-     * @access protected
-     * @param  string $c
-     * @return float $c 0.->1.
-     */
-    protected function convertSubColor($c)
-    {
-        if (substr($c, -1) === '%') {
-            $c = floatVal(substr($c, 0, -1)) / 100.;
-        } else {
-            $c = floatVal($c);
-            if ($c > 1) {
-                $c = $c / 255.;
-            }
-        }
-
-        return $c;
-    }
-
-
-    /**
-     * Analyse a background
-     *
-     * @param  string $css css background properties
-     * @param  &array $value parsed values (by reference, because, ther is a legacy of the parent CSS properties)
-     *
-     * @return void
-     */
-    public function convertBackground($css, &$value)
-    {
-        // is there a image ?
-        $text = '/url\(([^)]*)\)/isU';
-        if (preg_match($text, $css, $match)) {
-            // get the image
-            $value['image'] = $this->convertBackgroundImage($match[0]);
-
-            // remove if from the css properties
-            $css = preg_replace($text, '', $css);
-            $css = preg_replace('/[\s]+/', ' ', $css);
-        }
-
-        // protect some spaces
-        $css = preg_replace('/,[\s]+/', ',', $css);
-
-        // explode the values
-        $css = explode(' ', $css);
-
-        // background position to parse
-        $pos = '';
-
-        // foreach value
-        foreach ($css as $val) {
-            // try to parse the value as a color
-            $ok = false;
-            $color = $this->convertToColor($val, $ok);
-
-            // if ok => it is a color
-            if ($ok) {
-                $value['color'] = $color;
-                // else if transparent => no coloàr
-            } elseif ($val === 'transparent') {
-                $value['color'] = null;
-                // else
-            } else {
-                // try to parse the value as a repeat
-                $repeat = $this->convertBackgroundRepeat($val);
-
-                // if ok => it is repeat
-                if ($repeat) {
-                    $value['repeat'] = $repeat;
-                    // else => it could only be a position
-                } else {
-                    $pos.= ($pos ? ' ' : '').$val;
-                }
-            }
-        }
-
-        // if we have a position to parse
-        if ($pos) {
-            // try to read it
-            $pos = $this->convertBackgroundPosition($pos, $ok);
-            if ($ok) {
-                $value['position'] = $pos;
-            }
-        }
-    }
-
-    /**
-     * Parse a background color
-     *
-     * @param  string $css
-     *
-     * @return string|null $value
-     */
-    public function convertBackgroundColor($css)
-    {
-        $res = null;
-        if ($css === 'transparent') {
-            return null;
-        }
-
-        return $this->convertToColor($css, $res);
-    }
-
-    /**
-     * Parse a background image
-     *
-     * @param  string $css
-     *
-     * @return string|null $value
-     */
-    public function convertBackgroundImage($css)
-    {
-        if ($css === 'none') {
-            return null;
-        }
-
-        if (preg_match('/^url\(([^)]*)\)$/isU', $css, $match)) {
-            return $match[1];
-        }
-
-        return null;
-    }
-
-    /**
-     * Parse a background position
-     *
-     * @param  string $css
-     * @param  boolean &$res flag if convert is ok or not
-     *
-     * @return array (x, y)
-     */
-    public function convertBackgroundPosition($css, &$res)
-    {
-        // init the res
-        $res = false;
-
-        // explode the value
-        $css = explode(' ', $css);
-
-        // we must have 2 values. if 0 or >2 : error. if 1 => put center for 2
-        if (count($css)<2) {
-            if (!$css[0]) {
-                return null;
-            }
-            $css[1] = 'center';
-        }
-        if (count($css)>2) {
-            return null;
-        }
-
-        // prepare the values
-        $x = 0;
-        $y = 0;
-        $res = true;
-
-        // convert the first value
-        if ($css[0] === 'left') {
-            $x = '0%';
-        } elseif ($css[0] === 'center') {
-            $x = '50%';
-        } elseif ($css[0] === 'right') {
-            $x = '100%';
-        } elseif ($css[0] === 'top') {
-            $y = '0%';
-        } elseif ($css[0] === 'bottom') {
-            $y = '100%';
-        } elseif (preg_match('/^[-]?[0-9\.]+%$/isU', $css[0])) {
-            $x = $css[0];
-        } elseif ($this->convertToMM($css[0])) {
-            $x = $this->convertToMM($css[0]);
-        } else {
-            $res = false;
-        }
-
-        // convert the second value
-        if ($css[1] === 'left') {
-            $x = '0%';
-        } elseif ($css[1] === 'right') {
-            $x = '100%';
-        } elseif ($css[1] === 'top') {
-            $y = '0%';
-        } elseif ($css[1] === 'center') {
-            $y = '50%';
-        } elseif ($css[1] === 'bottom') {
-            $y = '100%';
-        } elseif (preg_match('/^[-]?[0-9\.]+%$/isU', $css[1])) {
-            $y = $css[1];
-        } elseif ($this->convertToMM($css[1])) {
-            $y = $this->convertToMM($css[1]);
-        } else {
-            $res = false;
-        }
-
-        // return the values
-        return array($x, $y);
-    }
-
-    /**
-     * Parse a background repeat
-     *
-     * @param  string $css
-     *
-     * @return array|null background repeat as array
-     */
-    public function convertBackgroundRepeat($css)
-    {
-        switch ($css) {
-            case 'repeat':
-                return array(true, true);
-            case 'repeat-x':
-                return array(true, false);
-            case 'repeat-y':
-                return array(false, true);
-            case 'no-repeat':
-                return array(false, false);
-        }
-        return null;
-    }
-}
diff --git a/html2pdf-master/src/Debug/Debug.php b/html2pdf-master/src/Debug/Debug.php
deleted file mode 100644
index 065b429a..00000000
--- a/html2pdf-master/src/Debug/Debug.php
+++ /dev/null
@@ -1,143 +0,0 @@
-<?php
-/**
- * Html2Pdf Library
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-
-namespace Spipu\Html2Pdf\Debug;
-
-/**
- * Class Debug
- */
-class Debug implements DebugInterface
-{
-    /**
-     * @var float
-     */
-    protected $startTime;
-
-    /**
-     * @var float
-     */
-    protected $lastTime;
-
-    /**
-     * @var int
-     */
-    protected $level = 0;
-
-    /**
-     * @var bool
-     */
-    protected $htmlOutput;
-
-    /**
-     * Debug constructor
-     *
-     * @param bool $htmlOutput
-     */
-    public function __construct($htmlOutput = true)
-    {
-        $this->htmlOutput = $htmlOutput;
-    }
-
-    /**
-     * display a debug line
-     *
-     * @param  string $name
-     * @param  string $timeTotal
-     * @param  string $timeStep
-     * @param  string $memoryUsage
-     * @param  string $memoryPeak
-     *
-     * @return void
-     */
-    protected function displayLine($name, $timeTotal, $timeStep, $memoryUsage, $memoryPeak)
-    {
-        $output =
-            str_pad($name, 30, ' ', STR_PAD_RIGHT).
-            str_pad($timeTotal, 12, ' ', STR_PAD_LEFT).
-            str_pad($timeStep, 12, ' ', STR_PAD_LEFT).
-            str_pad($memoryUsage, 15, ' ', STR_PAD_LEFT).
-            str_pad($memoryPeak, 15, ' ', STR_PAD_LEFT);
-
-        if ($this->htmlOutput) {
-            $output = '<pre style="padding:0; margin:0">'.$output.'</pre>';
-        }
-
-        echo $output."\n";
-    }
-
-    /**
-     * Start the debugger
-     *
-     * @return Debug
-     */
-    public function start()
-    {
-        $time = microtime(true);
-
-        $this->startTime = $time;
-        $this->lastTime = $time;
-
-        $this->displayLine('step', 'time', 'delta', 'memory', 'peak');
-        $this->addStep('Init debug');
-
-        return $this;
-    }
-
-    /**
-     * stop the debugger
-     *
-     * @return Debug
-     */
-    public function stop()
-    {
-        $this->addStep('Before output');
-        return $this;
-    }
-
-    /**
-     * add a debug step
-     *
-     * @param  string  $name step name
-     * @param  boolean $level (true=up, false=down, null=nothing to do)
-     *
-     * @return Debug
-     */
-    public function addStep($name, $level = null)
-    {
-        // if true : UP
-        if ($level === true) {
-            $this->level++;
-        }
-
-        $time  = microtime(true);
-        $usage = memory_get_usage();
-        $peak  = memory_get_peak_usage();
-        $type  = ($level === true ? ' Begin' : ($level === false ? ' End' : ''));
-
-        $this->displayLine(
-            str_repeat('  ', $this->level) . $name . $type,
-            number_format(($time - $this->startTime)*1000, 1, '.', ' ').' ms',
-            number_format(($time - $this->lastTime)*1000, 1, '.', ' ').' ms',
-            number_format($usage/1024, 1, '.', ' ').' Ko',
-            number_format($peak/1024, 1, '.', ' ').' Ko'
-        );
-
-        $this->lastTime = $time;
-
-        // it false : DOWN
-        if ($level === false) {
-            $this->level--;
-        }
-
-        return $this;
-    }
-}
diff --git a/html2pdf-master/src/Debug/DebugInterface.php b/html2pdf-master/src/Debug/DebugInterface.php
deleted file mode 100644
index 84c17270..00000000
--- a/html2pdf-master/src/Debug/DebugInterface.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Debug
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-
-namespace Spipu\Html2Pdf\Debug;
-
-interface DebugInterface
-{
-    /**
-     * Start the debugger
-     *
-     * @return DebugInterface
-     */
-    public function start();
-
-    /**
-     * Stop the debugger
-     *
-     * @return DebugInterface
-     */
-    public function stop();
-
-    /**
-     * add a debug step
-     *
-     * @param  string  $name step name
-     * @param  boolean $level (true=up, false=down, null=nothing to do)
-     *
-     * @return DebugInterface
-     */
-    public function addStep($name, $level = null);
-}
diff --git a/html2pdf-master/src/Exception/ExceptionFormatter.php b/html2pdf-master/src/Exception/ExceptionFormatter.php
deleted file mode 100644
index 87b7d8c7..00000000
--- a/html2pdf-master/src/Exception/ExceptionFormatter.php
+++ /dev/null
@@ -1,152 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Exception class
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-
-namespace Spipu\Html2Pdf\Exception;
-
-/**
- * Exception Formatter
- */
-class ExceptionFormatter
-{
-    /**
-     * the text message
-     * @var string
-     */
-    protected $message;
-
-    /**
-     * the html message
-     * @var string
-     */
-    protected $htmlMessage;
-
-    /**
-     * PHP Constructor
-     *
-     * @param Html2PdfException $e the exception to format
-     *
-     * @return ExceptionFormatter
-     */
-    public function __construct(Html2PdfException $e)
-    {
-        $data = $this->getAdditionalData($e);
-
-        $this->buildTextMessage($e, $data);
-        $this->buildHtmlMessage($e, $data);
-    }
-
-    /**
-     * get the txt message
-     *
-     * @return string
-     */
-    public function getMessage()
-    {
-        return $this->message;
-    }
-
-    /**
-     * get tht HTML message
-     *
-     * @return string
-     */
-    public function getHtmlMessage()
-    {
-        return $this->htmlMessage;
-    }
-
-    /**
-     * get the additional data from the exception
-     *
-     * @param Html2PdfException $e the exception to display
-     *
-     * @return array
-     */
-    protected function getAdditionalData(Html2PdfException $e)
-    {
-        $data = array();
-
-        // read the error
-        switch ($e->getCode()) {
-            case HtmlParsingException::ERROR_CODE:
-                /** @var HtmlParsingException $e */
-                $data['invalid tag'] = $e->getInvalidTag();
-                $data['html line'] = $e->getHtmlLine();
-                break;
-
-            case ImageException::ERROR_CODE:
-                /** @var ImageException $e */
-                $data['image src'] = $e->getImage();
-                break;
-
-            case LongSentenceException::ERROR_CODE:
-                /** @var LongSentenceException $e */
-                $data['sentence']  = $e->getSentence();
-                $data['box width'] = $e->getWidthBox();
-                $data['length']    = $e->getLength();
-                break;
-
-            case TableException::ERROR_CODE:
-            case Html2PdfException::ERROR_CODE:
-            default:
-                break;
-        }
-
-        return $data;
-    }
-
-    /**
-     * Build the text message
-     *
-     * @param Html2PdfException $e    the exception of the error
-     * @param array             $data additionnal data
-     *
-     * @return void
-     */
-    protected function buildTextMessage(Html2PdfException $e, $data)
-    {
-        $this->message = 'Html2Pdf Error ['.$e->getCode().']'."\n";
-        $this->message.= $e->getMessage()."\n";
-        $this->message.= ' File: '.$e->getFile()."\n";
-        $this->message.= ' Line: '.$e->getLine()."\n";
-
-        if (!empty($data)) {
-            foreach ($data as $key => $value) {
-                $this->message .= ' '.ucwords($key).': '.trim($value)."\n";
-            }
-        }
-    }
-
-    /**
-     * build the html message
-     *
-     * @param Html2PdfException $e    the exception of the error
-     * @param array             $data additional data
-     *
-     * @return void
-     */
-    protected function buildHtmlMessage(Html2PdfException $e, $data)
-    {
-        $this->htmlMessage = '<span style="color: #A00; font-weight: bold;">';
-        $this->htmlMessage.= 'Html2Pdf Error ['.$e->getCode().']';
-        $this->htmlMessage.= '</span><br />'."\n";
-        $this->htmlMessage.= htmlentities($e->getMessage())."<br />\n";
-        $this->htmlMessage.= ' File: '.$e->getFile()."<br />\n";
-        $this->htmlMessage.= ' Line: '.$e->getLine()."<br />\n";
-
-        if (!empty($data)) {
-            foreach ($data as $key => $value) {
-                $this->htmlMessage .= ' '.ucwords($key).': '.trim(htmlentities($value))."<br />\n";
-            }
-        }
-    }
-}
diff --git a/html2pdf-master/src/Exception/Html2PdfException.php b/html2pdf-master/src/Exception/Html2PdfException.php
deleted file mode 100644
index 171a7808..00000000
--- a/html2pdf-master/src/Exception/Html2PdfException.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Exception class
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-
-namespace Spipu\Html2Pdf\Exception;
-
-/**
- * Html2Pdf Exception
- */
-class Html2PdfException extends \Exception
-{
-    /**
-     * ERROR CODE 0
-     * @var int
-     */
-    const ERROR_CODE = 0;
-
-    /**
-     * Construct the exception.
-     *
-     * @param string $message The Exception message to throw.
-     *
-     * @return Html2PdfException
-     */
-    public function __construct($message)
-    {
-        parent::__construct($message, static::ERROR_CODE);
-    }
-}
diff --git a/html2pdf-master/src/Exception/HtmlParsingException.php b/html2pdf-master/src/Exception/HtmlParsingException.php
deleted file mode 100644
index bed255f8..00000000
--- a/html2pdf-master/src/Exception/HtmlParsingException.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Exception class
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-
-namespace Spipu\Html2Pdf\Exception;
-
-/**
- * Html Parsing Exception
- */
-class HtmlParsingException extends Html2PdfException
-{
-    /**
-     * ERROR CODE 1
-     * @var int
-     */
-    const ERROR_CODE = 1;
-
-    /**
-     * invalid tag
-     * @var string
-     */
-    protected $invalidTag;
-
-    /**
-     * the line in HTML data where the error occurred
-     * @var int
-     */
-    protected $htmlLine;
-
-    /**
-     * set the invalid Tag
-     *
-     * @param string $value the value
-     *
-     * @return HtmlParsingException
-     */
-    public function setInvalidTag($value)
-    {
-        $this->invalidTag = $value;
-
-        return $this;
-    }
-
-    /**
-     * get the invalid Tag
-     *
-     * @return string
-     */
-    public function getInvalidTag()
-    {
-        return $this->invalidTag;
-    }
-
-    /**
-     * @param int $lineNumber the value
-     *
-     * @return HtmlParsingException
-     */
-    public function setHtmlLine($lineNumber)
-    {
-        $this->htmlLine = $lineNumber;
-
-        return $this;
-    }
-
-    /**
-     * @return int
-     */
-    public function getHtmlLine()
-    {
-        return $this->htmlLine;
-    }
-}
diff --git a/html2pdf-master/src/Exception/ImageException.php b/html2pdf-master/src/Exception/ImageException.php
deleted file mode 100644
index 0c31bc71..00000000
--- a/html2pdf-master/src/Exception/ImageException.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Exception class
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-
-namespace Spipu\Html2Pdf\Exception;
-
-/**
- * Image Exception
- */
-class ImageException extends Html2PdfException
-{
-    /**
-     * ERROR CODE 2
-     * @var int
-     */
-    const ERROR_CODE = 2;
-
-    /**
-     * asked unknown image
-     * @var string
-     */
-    protected $image;
-
-    /**
-     * set the image in error
-     *
-     * @param string $value the value
-     *
-     * @return ImageException
-     */
-    public function setImage($value)
-    {
-        $this->image = $value;
-
-        return $this;
-    }
-
-    /**
-     * get the image in error
-     *
-     * @return string
-     */
-    public function getImage()
-    {
-        return $this->image;
-    }
-}
diff --git a/html2pdf-master/src/Exception/LocaleException.php b/html2pdf-master/src/Exception/LocaleException.php
deleted file mode 100644
index a8cfa3d1..00000000
--- a/html2pdf-master/src/Exception/LocaleException.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Exception class
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-
-namespace Spipu\Html2Pdf\Exception;
-
-/**
- * Table Exception
- */
-class LocaleException extends Html2PdfException
-{
-    /**
-     * ERROR CODE 5
-     * @var int
-     */
-    const ERROR_CODE = 5;
-
-    /**
-     * @var string
-     */
-    protected $localCode;
-
-    /**
-     * set the code
-     *
-     * @param string $localCode
-     *
-     * @return $this
-     */
-    public function setLocaleCode($localCode)
-    {
-        $this->localCode = $localCode;
-
-        return $this;
-    }
-
-    /**
-     * get the local code
-     *
-     * @return string
-     */
-    public function getLocalCode()
-    {
-        return $this->localCode;
-    }
-}
diff --git a/html2pdf-master/src/Exception/LongSentenceException.php b/html2pdf-master/src/Exception/LongSentenceException.php
deleted file mode 100644
index c1c41ef4..00000000
--- a/html2pdf-master/src/Exception/LongSentenceException.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Exception class
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-
-namespace Spipu\Html2Pdf\Exception;
-
-/**
- * Long Sentence Exception
- */
-class LongSentenceException extends Html2PdfException
-{
-    /**
-     * ERROR CODE 3
-     * @var int
-     */
-    const ERROR_CODE = 3;
-
-    /**
-     * the sentence
-     * @var string
-     */
-    protected $sentence;
-
-    /**
-     * the width of the box
-     * @var string
-     */
-    protected $widthBox;
-
-    /**
-     * the length of the sentence
-     * @var string
-     */
-    protected $length;
-
-    /**
-     * set the sentence
-     *
-     * @param string $value the value
-     *
-     * @return LongSentenceException
-     */
-    public function setSentence($value)
-    {
-        $this->sentence = $value;
-
-        return $this;
-    }
-
-    /**
-     * get the image in error
-     *
-     * @return string
-     */
-    public function getSentence()
-    {
-        return $this->sentence;
-    }
-
-    /**
-     * set the width of the box that contain the sentence
-     *
-     * @param string $value the value
-     *
-     * @return LongSentenceException
-     */
-    public function setWidthBox($value)
-    {
-        $this->widthBox = $value;
-
-        return $this;
-    }
-
-    /**
-     * get the image in error
-     *
-     * @return string
-     */
-    public function getWidthBox()
-    {
-        return $this->widthBox;
-    }
-
-    /**
-     * set the length
-     *
-     * @param string $value the value
-     *
-     * @return LongSentenceException
-     */
-    public function setLength($value)
-    {
-        $this->length = $value;
-
-        return $this;
-    }
-
-    /**
-     * get the length
-     *
-     * @return string
-     */
-    public function getLength()
-    {
-        return $this->length;
-    }
-}
diff --git a/html2pdf-master/src/Exception/TableException.php b/html2pdf-master/src/Exception/TableException.php
deleted file mode 100644
index 9670053c..00000000
--- a/html2pdf-master/src/Exception/TableException.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Exception class
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-
-namespace Spipu\Html2Pdf\Exception;
-
-/**
- * Table Exception
- */
-class TableException extends Html2PdfException
-{
-    /**
-     * ERROR CODE 4
-     * @var int
-     */
-    const ERROR_CODE = 4;
-}
diff --git a/html2pdf-master/src/Extension/AbstractExtension.php b/html2pdf-master/src/Extension/AbstractExtension.php
deleted file mode 100644
index 85459146..00000000
--- a/html2pdf-master/src/Extension/AbstractExtension.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * Html2Pdf Library
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-namespace Spipu\Html2Pdf\Extension;
-
-use Spipu\Html2Pdf\Tag\TagInterface;
-
-/**
- * Class AbstractExtension
- */
-abstract class AbstractExtension implements ExtensionInterface
-{
-    /**
-     * @var array
-     */
-    protected $tagDefinitions = array();
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getTags()
-    {
-        if (empty($this->tagDefinitions)) {
-            $this->tagDefinitions = $this->initTags();
-        }
-
-        return $this->tagDefinitions;
-    }
-
-    /**
-     * Init the tags
-     *
-     * @return TagInterface[]
-     */
-    abstract protected function initTags();
-}
diff --git a/html2pdf-master/src/Extension/Core/HtmlExtension.php b/html2pdf-master/src/Extension/Core/HtmlExtension.php
deleted file mode 100644
index 46cf9a9f..00000000
--- a/html2pdf-master/src/Extension/Core/HtmlExtension.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Html2Pdf Library
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-namespace Spipu\Html2Pdf\Extension\Core;
-
-use Spipu\Html2Pdf\Extension\AbstractExtension;
-use Spipu\Html2Pdf\Tag\Html;
-
-/**
- * Class HtmlExtension
- */
-class HtmlExtension extends AbstractExtension
-{
-    /**
-     * {@inheritDoc}
-     */
-    public function getName()
-    {
-        return 'core_html';
-    }
-
-    /**
-     * @inheritdoc
-     */
-    protected function initTags()
-    {
-        return array(
-            new Html\Address(),
-            new Html\B(),
-            new Html\Big(),
-            new Html\Bookmark(),
-            new Html\Cite(),
-            new Html\Del(),
-            new Html\Em(),
-            new Html\Font(),
-            new Html\I(),
-            new Html\Ins(),
-            new Html\Label(),
-            new Html\S(),
-            new Html\Samp(),
-            new Html\Small(),
-            new Html\Span(),
-            new Html\Strong(),
-            new Html\Sub(),
-            new Html\Sup(),
-            new Html\U(),
-        );
-    }
-}
diff --git a/html2pdf-master/src/Extension/Core/SvgExtension.php b/html2pdf-master/src/Extension/Core/SvgExtension.php
deleted file mode 100644
index 0fa5b46d..00000000
--- a/html2pdf-master/src/Extension/Core/SvgExtension.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/**
- * Html2Pdf Library
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-namespace Spipu\Html2Pdf\Extension\Core;
-
-use Spipu\Html2Pdf\Extension\AbstractExtension;
-use Spipu\Html2Pdf\SvgDrawer;
-use Spipu\Html2Pdf\Tag\Svg;
-
-/**
- * Class SvgExtension
- */
-class SvgExtension extends AbstractExtension
-{
-    /**
-     * @var SvgDrawer
-     */
-    private $svgDrawer;
-
-    /**
-     * SvgExtension constructor.
-     *
-     * @param SvgDrawer $svgDrawer
-     */
-    public function __construct(SvgDrawer $svgDrawer)
-    {
-        $this->svgDrawer = $svgDrawer;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getName()
-    {
-        return 'core_svg';
-    }
-
-    /**
-     * @inheritdoc
-     */
-    protected function initTags()
-    {
-        return array(
-            new Svg\Circle($this->svgDrawer),
-            new Svg\Ellipse($this->svgDrawer),
-            new Svg\G($this->svgDrawer),
-            new Svg\Line($this->svgDrawer),
-            new Svg\Path($this->svgDrawer),
-            new Svg\Polygon($this->svgDrawer),
-            new Svg\Polyline($this->svgDrawer),
-            new Svg\Rect($this->svgDrawer),
-        );
-    }
-}
diff --git a/html2pdf-master/src/Extension/ExtensionInterface.php b/html2pdf-master/src/Extension/ExtensionInterface.php
deleted file mode 100644
index 5ef04fe2..00000000
--- a/html2pdf-master/src/Extension/ExtensionInterface.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * Html2Pdf Library
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-namespace Spipu\Html2Pdf\Extension;
-
-/**
- * Interface ExtensionInterface
- */
-interface ExtensionInterface
-{
-    /**
-     * Get the extension's name
-     *
-     * @return string
-     */
-    public function getName();
-
-    /**
-     * @return array()
-     */
-    public function getTags();
-}
diff --git a/html2pdf-master/src/Html2Pdf.php b/html2pdf-master/src/Html2Pdf.php
deleted file mode 100644
index 840f6506..00000000
--- a/html2pdf-master/src/Html2Pdf.php
+++ /dev/null
@@ -1,6439 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - main class
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-
-namespace Spipu\Html2Pdf;
-
-use Spipu\Html2Pdf\Exception\Html2PdfException;
-use Spipu\Html2Pdf\Exception\ImageException;
-use Spipu\Html2Pdf\Exception\LongSentenceException;
-use Spipu\Html2Pdf\Exception\TableException;
-use Spipu\Html2Pdf\Exception\HtmlParsingException;
-use Spipu\Html2Pdf\Extension\Core;
-use Spipu\Html2Pdf\Extension\ExtensionInterface;
-use Spipu\Html2Pdf\Parsing\HtmlLexer;
-use Spipu\Html2Pdf\Parsing\Node;
-use Spipu\Html2Pdf\Parsing\TagParser;
-use Spipu\Html2Pdf\Parsing\TextParser;
-use Spipu\Html2Pdf\Tag\TagInterface;
-use Spipu\Html2Pdf\Debug\DebugInterface;
-use Spipu\Html2Pdf\Debug\Debug;
-
-require_once dirname(__FILE__) . '/config/tcpdf.config.php';
-
-class Html2Pdf
-{
-    /**
-     * myPdf object, extends from TCPDF
-     * @var MyPdf
-     */
-    public $pdf = null;
-
-    /**
-     * CSS parsing
-     * @var Parsing\Css
-     */
-    public $parsingCss = null;
-
-    /**
-     * HTML parsing
-     * @var Parsing\Html
-     */
-    public $parsingHtml = null;
-
-    /**
-     * @var Debug
-     */
-    private $debug;
-
-    /**
-     * @var HtmlLexer
-     */
-    private $lexer;
-
-    /**
-     * @var CssConverter
-     */
-    private $cssConverter;
-
-    /**
-     * @var SvgDrawer
-     */
-    private $svgDrawer;
-
-    protected $_langue           = 'fr';        // locale of the messages
-    protected $_orientation      = 'P';         // page orientation : Portrait ou Landscape
-    protected $_format           = 'A4';        // page format : A4, A3, ...
-    protected $_encoding         = '';          // charset encoding
-    protected $_unicode          = true;        // means that the input text is unicode (default = true)
-
-    protected $_testTdInOnepage  = true;        // test of TD that can not take more than one page
-    protected $_testIsImage      = true;        // test if the images exist or not
-    protected $_fallbackImage    = null;        // fallback image to use in img tags
-
-    protected $_parsePos         = 0;           // position in the parsing
-    protected $_tempPos          = 0;           // temporary position for complex table
-    protected $_page             = 0;           // current page number
-
-    protected $_subHtml          = null;        // sub html
-    protected $_subPart          = false;       // sub Html2Pdf
-    protected $_subHEADER        = array();     // sub action to make the header
-    protected $_subFOOTER        = array();     // sub action to make the footer
-    protected $_subSTATES        = array();     // array to save some parameters
-
-    protected $_isSubPart        = false;       // flag : in a sub html2pdf
-    protected $_isInThead        = false;       // flag : in a thead
-    protected $_isInTfoot        = false;       // flag : in a tfoot
-    protected $_isInOverflow     = false;       // flag : in a overflow
-    protected $_isInFooter       = false;       // flag : in a footer
-    protected $_isInDraw         = null;        // flag : in a draw (svg)
-    protected $_isAfterFloat     = false;       // flag : is just after a float
-    protected $_isInForm         = false;       // flag : is in a float. false / action of the form
-    protected $_isInLink         = '';          // flag : is in a link. empty / href of the link
-    protected $_isInParagraph    = false;       // flag : is in a paragraph
-    protected $_isForOneLine     = false;       // flag : in a specific sub html2pdf to have the height of the next line
-
-    protected $_maxX             = 0;           // maximum X of the current zone
-    protected $_maxY             = 0;           // maximum Y of the current zone
-    protected $_maxE             = 0;           // number of elements in the current zone
-    protected $_maxH             = 0;           // maximum height of the line in the current zone
-    protected $_maxSave          = array();     // save the maximums of the current zone
-    protected $_currentH         = 0;           // height of the current line
-
-    protected $_defaultLeft      = 0;           // default marges of the page
-    protected $_defaultTop       = 0;
-    protected $_defaultRight     = 0;
-    protected $_defaultBottom    = 0;
-    protected $_defaultFont      = null;        // default font to use, is the asked font does not exist
-
-    protected $_margeLeft        = 0;           // current marges of the page
-    protected $_margeTop         = 0;
-    protected $_margeRight       = 0;
-    protected $_margeBottom      = 0;
-    protected $_marges           = array();     // save the different marges of the current page
-    protected $_pageMarges       = array();     // float marges of the current page
-    protected $_background       = array();     // background informations
-
-    protected $_hideHeader       = array();     // array : list of pages which the header gonna be hidden
-    protected $_hideFooter       = array();     // array : list of pages which the footer gonna be hidden
-    protected $_firstPage        = true;        // flag : first page
-    protected $_defList          = array();     // table to save the stats of the tags UL and OL
-
-    protected $_lstAnchor        = array();     // list of the anchors
-    protected $_lstField         = array();     // list of the fields
-    protected $_lstSelect        = array();     // list of the options of the current select
-    protected $_previousCall     = null;        // last action called
-
-    protected $_sentenceMaxLines = 1000;        // max number of lines for a sentence
-
-    /**
-     * @var Html2Pdf
-     */
-    static protected $_subobj    = null;        // object html2pdf prepared in order to accelerate the creation of sub html2pdf
-    static protected $_tables    = array();     // static table to prepare the nested html tables
-
-    /**
-     * list of tag definitions
-     * @var ExtensionInterface[]
-     */
-    protected $extensions = array();
-
-    /**
-     * List of tag objects
-     * @var TagInterface[]
-     */
-    protected $tagObjects = array();
-
-    /**
-     * @var bool
-     */
-    protected $extensionsLoaded = false;
-
-    /**
-     * class constructor
-     *
-     * @param string  $orientation page orientation, same as TCPDF
-     * @param mixed   $format      The format used for pages, same as TCPDF
-     * @param string  $lang        Lang : fr, en, it...
-     * @param boolean $unicode     TRUE means that the input text is unicode (default = true)
-     * @param String  $encoding    charset encoding; default is UTF-8
-     * @param array   $margins     Default margins (left, top, right, bottom)
-     * @param boolean $pdfa        If TRUE set the document to PDF/A mode.
-     *
-     * @return Html2Pdf
-     */
-    public function __construct(
-        $orientation = 'P',
-        $format = 'A4',
-        $lang = 'fr',
-        $unicode = true,
-        $encoding = 'UTF-8',
-        $margins = array(5, 5, 5, 8),
-        $pdfa = false
-    ) {
-        // init the page number
-        $this->_page         = 0;
-        $this->_firstPage    = true;
-
-        // save the parameters
-        $this->_orientation  = $orientation;
-        $this->_format       = $format;
-        $this->_langue       = strtolower($lang);
-        $this->_unicode      = $unicode;
-        $this->_encoding     = $encoding;
-        $this->_pdfa         = $pdfa;
-
-        // load the Locale
-        Locale::load($this->_langue);
-
-        // create the  myPdf object
-        $this->pdf = new MyPdf($orientation, 'mm', $format, $unicode, $encoding, false, $pdfa);
-
-        // init the CSS parsing object
-        $this->cssConverter = new CssConverter();
-        $textParser = new TextParser($encoding);
-        $this->parsingCss = new Parsing\Css($this->pdf, new TagParser($textParser), $this->cssConverter);
-        $this->parsingCss->fontSet();
-        $this->_defList = array();
-
-        // init some tests
-        $this->setTestTdInOnePage(true);
-        $this->setTestIsImage(true);
-
-        // init the default font
-        $this->setDefaultFont(null);
-
-        $this->lexer = new HtmlLexer();
-        // init the HTML parsing object
-        $this->parsingHtml = new Parsing\Html($textParser);
-        $this->_subHtml = null;
-        $this->_subPart = false;
-
-        $this->setDefaultMargins($margins);
-        $this->setMargins();
-        $this->_marges = array();
-
-        // init the form's fields
-        $this->_lstField = array();
-
-        $this->svgDrawer = new SvgDrawer($this->pdf, $this->cssConverter);
-
-        $this->addExtension(new Core\HtmlExtension());
-        $this->addExtension(new Core\SvgExtension($this->svgDrawer));
-
-        return $this;
-    }
-
-    /**
-     * Gets the detailed version as array
-     *
-     * @return array
-     */
-    public function getVersionAsArray()
-    {
-        return array(
-            'major'     => 5,
-            'minor'     => 2,
-            'revision'  => 3
-        );
-    }
-
-    /**
-     * Gets the current version as string
-     *
-     * @return string
-     */
-    public function getVersion()
-    {
-        $v = $this->getVersionAsArray();
-        return $v['major'].'.'.$v['minor'].'.'.$v['revision'];
-    }
-
-    /**
-     * Clone to create a sub Html2Pdf from self::$_subobj
-     *
-     * @access public
-     */
-    public function __clone()
-    {
-        $this->pdf = clone $this->pdf;
-        $this->parsingHtml = clone $this->parsingHtml;
-        $this->parsingCss = clone $this->parsingCss;
-        $this->parsingCss->setPdfParent($this->pdf);
-    }
-
-    /**
-     * Set the max number of lines for a sentence
-     *
-     * @param int $nbLines
-     *
-     * @return $this
-     */
-    public function setSentenceMaxLines($nbLines)
-    {
-        $this->_sentenceMaxLines = (int) $nbLines;
-
-        return $this;
-    }
-
-    /**
-     * Get the max number of lines for a sentence
-     *
-     * @return int
-     */
-    public function getSentenceMaxLines()
-    {
-        return $this->_sentenceMaxLines;
-    }
-
-    /**
-     * @param ExtensionInterface $extension
-     */
-    public function addExtension(ExtensionInterface $extension)
-    {
-        $name = strtolower($extension->getName());
-        $this->extensions[$name] = $extension;
-    }
-
-    /**
-     * Get the number of pages
-     * @return int
-     */
-    public function getNbPages()
-    {
-        return $this->_page;
-    }
-
-    /**
-     * Initialize the registered extensions
-     *
-     * @throws Html2PdfException
-     */
-    protected function loadExtensions()
-    {
-        if ($this->extensionsLoaded) {
-            return;
-        }
-        foreach ($this->extensions as $extension) {
-            foreach ($extension->getTags() as $tag) {
-                if (!$tag instanceof TagInterface) {
-                    throw new Html2PdfException('The ExtensionInterface::getTags() method must return an array of TagInterface.');
-                }
-                $this->addTagObject($tag);
-            }
-        }
-
-        $this->extensionsLoaded = true;
-    }
-
-    /**
-     * register a tag object
-     *
-     * @param TagInterface $tagObject the object
-     */
-    protected function addTagObject(TagInterface $tagObject)
-    {
-        $tagName = strtolower($tagObject->getName());
-        $this->tagObjects[$tagName] = $tagObject;
-    }
-
-    /**
-     * get the tag object from a tag name
-     *
-     * @param string $tagName tag name to load
-     *
-     * @return TagInterface|null
-     */
-    protected function getTagObject($tagName)
-    {
-        if (!$this->extensionsLoaded) {
-            $this->loadExtensions();
-        }
-
-        if (!array_key_exists($tagName, $this->tagObjects)) {
-            return null;
-        }
-
-        $tagObject = $this->tagObjects[$tagName];
-        $tagObject->setParsingCssObject($this->parsingCss);
-        $tagObject->setCssConverterObject($this->cssConverter);
-        $tagObject->setPdfObject($this->pdf);
-        if (!is_null($this->debug)) {
-            $tagObject->setDebugObject($this->debug);
-        }
-
-        return $tagObject;
-    }
-
-    /**
-     * set the debug mode to On
-     *
-     * @param DebugInterface $debugObject
-     *
-     * @return Html2Pdf $this
-     */
-    public function setModeDebug(DebugInterface $debugObject = null)
-    {
-        if (is_null($debugObject)) {
-            $this->debug = new Debug();
-        } else {
-            $this->debug = $debugObject;
-        }
-        $this->debug->start();
-
-        return $this;
-    }
-
-    /**
-     * Set the test of TD that can not take more than one page
-     *
-     * @access public
-     * @param  boolean  $mode
-     * @return Html2Pdf $this
-     */
-    public function setTestTdInOnePage($mode = true)
-    {
-        $this->_testTdInOnepage = $mode ? true : false;
-
-        return $this;
-    }
-
-    /**
-     * Set the test if the images exist or not
-     *
-     * @access public
-     * @param  boolean  $mode
-     * @return Html2Pdf $this
-     */
-    public function setTestIsImage($mode = true)
-    {
-        $this->_testIsImage = $mode ? true : false;
-
-        return $this;
-    }
-
-    /**
-     * Set the default font to use, if no font is specified, or if the asked font does not exist
-     *
-     * @access public
-     * @param  string   $default name of the default font to use. If null : Arial if no font is specified, and error if the asked font does not exist
-     * @return Html2Pdf $this
-     */
-    public function setDefaultFont($default = null)
-    {
-        $this->_defaultFont = $default;
-        $this->parsingCss->setDefaultFont($default);
-
-        return $this;
-    }
-
-    /**
-     * Set a fallback image
-     *
-     * @param string $fallback Path or URL to the fallback image
-     *
-     * @return $this
-     */
-    public function setFallbackImage($fallback)
-    {
-        $this->_fallbackImage = $fallback;
-
-        return $this;
-    }
-
-    /**
-     * add a font, see TCPDF function addFont
-     *
-     * @access public
-     * @param string $family Font family. The name can be chosen arbitrarily. If it is a standard family name, it will override the corresponding font.
-     * @param string $style Font style. Possible values are (case insensitive):<ul><li>empty string: regular (default)</li><li>B: bold</li><li>I: italic</li><li>BI or IB: bold italic</li></ul>
-     * @param string $file The font definition file. By default, the name is built from the family and style, in lower case with no spaces.
-     * @return Html2Pdf $this
-     * @see TCPDF::addFont
-     */
-    public function addFont($family, $style = '', $file = '')
-    {
-        $this->pdf->AddFont($family, $style, $file);
-
-        return $this;
-    }
-
-    /**
-     * display a automatic index, from the bookmarks
-     *
-     * @access public
-     * @param  string  $titre         index title
-     * @param  int     $sizeTitle     font size of the index title, in mm
-     * @param  int     $sizeBookmark  font size of the index, in mm
-     * @param  boolean $bookmarkTitle add a bookmark for the index, at his beginning
-     * @param  boolean $displayPage   display the page numbers
-     * @param  int     $onPage        if null : at the end of the document on a new page, else on the $onPage page
-     * @param  string  $fontName      font name to use
-     * @param  string  $marginTop     margin top to use on the index page
-     * @return null
-     */
-    public function createIndex(
-        $titre = 'Index',
-        $sizeTitle = 20,
-        $sizeBookmark = 15,
-        $bookmarkTitle = true,
-        $displayPage = true,
-        $onPage = null,
-        $fontName = null,
-        $marginTop = null
-    ) {
-        if ($fontName === null) {
-            $fontName = 'helvetica';
-        }
-
-        $oldPage = $this->_INDEX_NewPage($onPage);
-
-        if ($marginTop !== null) {
-            $marginTop = $this->cssConverter->convertToMM($marginTop);
-            $this->pdf->SetY($this->pdf->GetY() + $marginTop);
-        }
-
-        $this->pdf->createIndex($this, $titre, $sizeTitle, $sizeBookmark, $bookmarkTitle, $displayPage, $onPage, $fontName);
-        if ($oldPage) {
-            $this->pdf->setPage($oldPage);
-        }
-    }
-
-    /**
-     * clean up the objects, if the method output can not be called because of an exception
-     *
-     * @return Html2Pdf
-     */
-    public function clean()
-    {
-        self::$_subobj = null;
-        self::$_tables = array();
-
-        Locale::clean();
-
-        return $this;
-    }
-
-    /**
-     * Send the document to a given destination: string, local file or browser.
-     * Dest can be :
-     *  I : send the file inline to the browser (default). The plug-in is used if available. The name given by name is used when one selects the "Save as" option on the link generating the PDF.
-     *  D : send to the browser and force a file download with the name given by name.
-     *  F : save to a local server file with the name given by name.
-     *  S : return the document as a string (name is ignored).
-     *  FI: equivalent to F + I option
-     *  FD: equivalent to F + D option
-     *  E : return the document as base64 mime multi-part email attachment (RFC 2045)
-     *
-     * @param string $name The name of the file when saved.
-     * @param string $dest Destination where to send the document.
-     *
-     * @throws Html2PdfException
-     * @return string content of the PDF, if $dest=S
-     * @see    TCPDF::close
-     */
-    public function output($name = 'document.pdf', $dest = 'I')
-    {
-        // if on debug mode
-        if (!is_null($this->debug)) {
-            $this->debug->stop();
-            $this->pdf->Close();
-            return '';
-        }
-
-        //Normalize parameters
-        $dest = strtoupper($dest);
-        if (!in_array($dest, array('I', 'D', 'F', 'S', 'FI','FD', 'E'))) {
-            throw new Html2PdfException('The output destination mode ['.$dest.'] is invalid');
-        }
-
-        if ($dest !== 'S') {
-            // the name must be a PDF name
-            if (strtolower(substr($name, -4)) !== '.pdf') {
-                throw new Html2PdfException('The output document name [' . $name . '] is not a PDF name');
-            }
-        }
-
-        // if save on server: it must be an absolute path
-        if ($dest[0] === 'F') {
-            $isWindowsPath = preg_match("/^[A-Z]:\\\\/", $name);
-            // If windows is not saving on a remote file server
-            if($name[0] !== DIRECTORY_SEPARATOR &&  $isWindowsPath === false ){
-                $name = getcwd() . DIRECTORY_SEPARATOR . $name;
-            }
-        }
-
-        // call the output of TCPDF
-        $output = $this->pdf->Output($name, $dest);
-        
-        // close the pdf and clean up
-        $this->clean();
-
-        return $output;
-    }
-
-    /**
-     * convert HTML to PDF
-     *
-     * @param string $html
-     *
-     * @return Html2Pdf
-     */
-    public function writeHTML($html)
-    {
-        $html = $this->parsingHtml->prepareHtml($html);
-        $html = $this->parsingCss->extractStyle($html);
-        $this->parsingHtml->parse($this->lexer->tokenize($html));
-        $this->_makeHTMLcode();
-
-        return $this;
-    }
-
-
-    /**
-     * Preview the HTML before conversion
-     *
-     * @param string $html
-     *
-     * @return void
-     */
-    public function previewHTML($html)
-    {
-        $html = $this->parsingHtml->prepareHtml($html);
-
-        $html = preg_replace('/<page([^>]*)>/isU', '<hr>Page : $1<hr><div$1>', $html);
-        $html = preg_replace('/<page_header([^>]*)>/isU', '<hr>Page Header : $1<hr><div$1>', $html);
-        $html = preg_replace('/<page_footer([^>]*)>/isU', '<hr>Page Footer : $1<hr><div$1>', $html);
-        $html = preg_replace('/<\/page([^>]*)>/isU', '</div><hr>', $html);
-        $html = preg_replace('/<\/page_header([^>]*)>/isU', '</div><hr>', $html);
-        $html = preg_replace('/<\/page_footer([^>]*)>/isU', '</div><hr>', $html);
-
-        $html = preg_replace('/<bookmark([^>]*)>/isU', '<hr>bookmark : $1<hr>', $html);
-        $html = preg_replace('/<\/bookmark([^>]*)>/isU', '', $html);
-
-        $html = preg_replace('/<barcode([^>]*)>/isU', '<hr>barcode : $1<hr>', $html);
-        $html = preg_replace('/<\/barcode([^>]*)>/isU', '', $html);
-
-        $html = preg_replace('/<qrcode([^>]*)>/isU', '<hr>qrcode : $1<hr>', $html);
-        $html = preg_replace('/<\/qrcode([^>]*)>/isU', '', $html);
-
-        echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-    <head>
-        <title>HTML View</title>
-        <meta http-equiv="Content-Type" content="text/html; charset='.$this->_encoding.'" >
-    </head>
-    <body style="padding: 10px; font-size: 10pt;font-family:    Verdana;">
-    '.$html.'
-    </body>
-</html>';
-    }
-
-    /**
-     * init a sub Html2Pdf. do not use it directly. Only the method createSubHTML must use it
-     *
-     * @access public
-     * @param  string  $format
-     * @param  string  $orientation
-     * @param  array   $marge
-     * @param  integer $page
-     * @param  array   $defLIST
-     * @param  integer $myLastPageGroup
-     * @param  integer $myLastPageGroupNb
-     */
-    public function initSubHtml($format, $orientation, $marge, $page, $defLIST, $myLastPageGroup, $myLastPageGroupNb)
-    {
-        $this->_isSubPart = true;
-
-        $this->parsingCss->setOnlyLeft();
-
-        $this->_setNewPage($format, $orientation, null, null, ($myLastPageGroup !== null));
-
-        $this->_saveMargin(0, 0, $marge);
-        $this->_defList = $defLIST;
-
-        $this->_page = $page;
-        $this->pdf->setMyLastPageGroup($myLastPageGroup);
-        $this->pdf->setMyLastPageGroupNb($myLastPageGroupNb);
-        $this->pdf->SetXY(0, 0);
-        $this->parsingCss->fontSet();
-    }
-
-    /**
-     * set the default margins of the page
-     *
-     * @param array|int $margins (mm, left top right bottom)
-     */
-    protected function setDefaultMargins($margins)
-    {
-        if (!is_array($margins)) {
-            $margins = array($margins, $margins, $margins, $margins);
-        }
-
-        if (!isset($margins[2])) {
-            $margins[2] = $margins[0];
-        }
-        if (!isset($margins[3])) {
-            $margins[3] = 8;
-        }
-
-        $this->_defaultLeft   = $this->cssConverter->convertToMM($margins[0].'mm');
-        $this->_defaultTop    = $this->cssConverter->convertToMM($margins[1].'mm');
-        $this->_defaultRight  = $this->cssConverter->convertToMM($margins[2].'mm');
-        $this->_defaultBottom = $this->cssConverter->convertToMM($margins[3].'mm');
-    }
-
-    /**
-     * create a new page
-     *
-     * @access protected
-     * @param  mixed   $format
-     * @param  string  $orientation
-     * @param  array   $background background information
-     * @param  integer $curr real position in the html parser (if break line in the write of a text)
-     * @param  boolean $resetPageNumber
-     */
-    protected function _setNewPage($format = null, $orientation = '', $background = null, $curr = null, $resetPageNumber = false)
-    {
-        $this->_firstPage = false;
-
-        $this->_format = $format ? $format : $this->_format;
-        $this->_orientation = $orientation ? $orientation : $this->_orientation;
-        $this->_background = $background !== null ? $background : $this->_background;
-        $this->_maxY = 0;
-        $this->_maxX = 0;
-        $this->_maxH = 0;
-        $this->_maxE = 0;
-
-        $this->pdf->SetMargins($this->_defaultLeft, $this->_defaultTop, $this->_defaultRight);
-
-        if ($resetPageNumber) {
-            $this->pdf->startPageGroup();
-        }
-
-        $this->pdf->AddPage($this->_orientation, $this->_format);
-
-        if ($resetPageNumber) {
-            $this->pdf->myStartPageGroup();
-        }
-
-        $this->_page++;
-
-        if (!$this->_subPart && !$this->_isSubPart) {
-            if (is_array($this->_background)) {
-                if (isset($this->_background['color']) && $this->_background['color']) {
-                    $this->pdf->SetFillColorArray($this->_background['color']);
-                    $this->pdf->Rect(0, 0, $this->pdf->getW(), $this->pdf->getH(), 'F');
-                }
-
-                if (isset($this->_background['img']) && is_array($this->_background['img'])) {
-                    $imageWidth  = $this->cssConverter->convertToMM($this->_background['width'], $this->pdf->getW());
-                    $imageHeight = $imageWidth * $this->_background['img']['height'] / $this->_background['img']['width'];
-
-                    $posX = $this->cssConverter->convertToMM($this->_background['posX'], $this->pdf->getW() - $imageWidth);
-                    $posY = $this->cssConverter->convertToMM($this->_background['posY'], $this->pdf->getH() - $imageHeight);
-
-                    $this->pdf->Image($this->_background['img']['file'], $posX, $posY, $imageWidth);
-                }
-            }
-
-            $this->_setPageHeader();
-            $this->_setPageFooter();
-        }
-
-        $this->setMargins();
-        $this->pdf->SetY($this->_margeTop);
-
-        $this->_setNewPositionForNewLine($curr);
-        $this->_maxH = 0;
-    }
-
-    /**
-     * set the real margin, using the default margins and the page margins
-     */
-    protected function setMargins()
-    {
-        // prepare the margins
-        $this->_margeLeft   = $this->_defaultLeft   + (isset($this->_background['left'])   ? $this->_background['left']   : 0);
-        $this->_margeRight  = $this->_defaultRight  + (isset($this->_background['right'])  ? $this->_background['right']  : 0);
-        $this->_margeTop    = $this->_defaultTop    + (isset($this->_background['top'])    ? $this->_background['top']    : 0);
-        $this->_margeBottom = $this->_defaultBottom + (isset($this->_background['bottom']) ? $this->_background['bottom'] : 0);
-
-        // set the PDF margins
-        $this->pdf->SetMargins($this->_margeLeft, $this->_margeTop, $this->_margeRight);
-        $this->pdf->SetAutoPageBreak(false, $this->_margeBottom);
-
-        // set the float Margins
-        $this->_pageMarges = array();
-        if ($this->_isInParagraph !== false) {
-            $this->_pageMarges[floor($this->_margeTop*100)] = array($this->_isInParagraph[0], $this->pdf->getW()-$this->_isInParagraph[1]);
-        } else {
-            $this->_pageMarges[floor($this->_margeTop*100)] = array($this->_margeLeft, $this->pdf->getW()-$this->_margeRight);
-        }
-    }
-
-
-    /**
-     * get the Min and Max X, for Y (use the float margins)
-     *
-     * @access protected
-     * @param  float $y
-     * @return array(float, float)
-     */
-    protected function _getMargins($y)
-    {
-        $y = floor($y*100);
-        $x = array($this->pdf->getlMargin(), $this->pdf->getW()-$this->pdf->getrMargin());
-
-        foreach ($this->_pageMarges as $mY => $mX) {
-            if ($mY<=$y) {
-                $x = $mX;
-            }
-        }
-
-        return $x;
-    }
-
-    /**
-     * Add margins, for a float
-     *
-     * @access protected
-     * @param  string $float (left / right)
-     * @param  float  $xLeft
-     * @param  float  $yTop
-     * @param  float  $xRight
-     * @param  float  $yBottom
-     */
-    protected function _addMargins($float, $xLeft, $yTop, $xRight, $yBottom)
-    {
-        // get the current float margins, for top and bottom
-        $oldTop    = $this->_getMargins($yTop);
-        $oldBottom = $this->_getMargins($yBottom);
-
-        // update the top float margin
-        if ($float === 'left'  && $oldTop[0]<$xRight) {
-            $oldTop[0] = $xRight;
-        }
-        if ($float === 'right' && $oldTop[1]>$xLeft) {
-            $oldTop[1] = $xLeft;
-        }
-
-        $yTop = floor($yTop*100);
-        $yBottom = floor($yBottom*100);
-
-        // erase all the float margins that are smaller than the new one
-        foreach ($this->_pageMarges as $mY => $mX) {
-            if ($mY<$yTop) {
-                continue;
-            }
-            if ($mY>$yBottom) {
-                break;
-            }
-            if ($float === 'left' && $this->_pageMarges[$mY][0]<$xRight) {
-                unset($this->_pageMarges[$mY]);
-            }
-            if ($float === 'right' && $this->_pageMarges[$mY][1]>$xLeft) {
-                unset($this->_pageMarges[$mY]);
-            }
-        }
-
-        // save the new Top and Bottom margins
-        $this->_pageMarges[$yTop] = $oldTop;
-        $this->_pageMarges[$yBottom] = $oldBottom;
-
-        // sort the margins
-        ksort($this->_pageMarges);
-
-        // we are just after float
-        $this->_isAfterFloat = true;
-    }
-
-    /**
-     * Save old margins (push), and set new ones
-     *
-     * @access protected
-     * @param  float  $ml left margin
-     * @param  float  $mt top margin
-     * @param  float  $mr right margin
-     */
-    protected function _saveMargin($ml, $mt, $mr)
-    {
-        // save old margins
-        $this->_marges[] = array(
-            'l' => $this->pdf->getlMargin(),
-            't' => $this->pdf->gettMargin(),
-            'r' => $this->pdf->getrMargin(),
-            'page' => $this->_pageMarges
-        );
-
-        // set new ones
-        $this->pdf->SetMargins($ml, $mt, $mr);
-
-        // prepare for float margins
-        $this->_pageMarges = array();
-        $this->_pageMarges[floor($mt*100)] = array($ml, $this->pdf->getW()-$mr);
-    }
-
-    /**
-     * load the last saved margins (pop)
-     *
-     * @access protected
-     */
-    protected function _loadMargin()
-    {
-        $old = array_pop($this->_marges);
-        if ($old) {
-            $ml = $old['l'];
-            $mt = $old['t'];
-            $mr = $old['r'];
-            $mP = $old['page'];
-        } else {
-            $ml = $this->_margeLeft;
-            $mt = 0;
-            $mr = $this->_margeRight;
-            $mP = array($mt => array($ml, $this->pdf->getW()-$mr));
-        }
-
-        $this->pdf->SetMargins($ml, $mt, $mr);
-        $this->_pageMarges = $mP;
-    }
-
-    /**
-     * save the current maxs (push)
-     *
-     * @access protected
-     */
-    protected function _saveMax()
-    {
-        $this->_maxSave[] = array($this->_maxX, $this->_maxY, $this->_maxH, $this->_maxE);
-    }
-
-    /**
-     * load the last saved current maxs (pop)
-     *
-     * @access protected
-     */
-    protected function _loadMax()
-    {
-        $old = array_pop($this->_maxSave);
-
-        if ($old) {
-            $this->_maxX = $old[0];
-            $this->_maxY = $old[1];
-            $this->_maxH = $old[2];
-            $this->_maxE = $old[3];
-        } else {
-            $this->_maxX = 0;
-            $this->_maxY = 0;
-            $this->_maxH = 0;
-            $this->_maxE = 0;
-        }
-    }
-
-    /**
-     * draw the PDF header with the HTML in page_header
-     *
-     * @access protected
-     */
-    protected function _setPageHeader()
-    {
-        if (!count($this->_subHEADER)) {
-            return false;
-        }
-
-        if (in_array($this->pdf->getPage(), $this->_hideHeader)) {
-            return false;
-        }
-
-        $oldParsePos = $this->_parsePos;
-        $oldParseCode = $this->parsingHtml->code;
-
-        $this->_parsePos = 0;
-        $this->parsingHtml->code = $this->_subHEADER;
-        $this->_makeHTMLcode();
-
-        $this->_parsePos = $oldParsePos;
-        $this->parsingHtml->code = $oldParseCode;
-    }
-
-    /**
-     * draw the PDF footer with the HTML in page_footer
-     *
-     * @access protected
-     */
-    protected function _setPageFooter()
-    {
-        if (!count($this->_subFOOTER)) {
-            return false;
-        }
-
-        if (in_array($this->pdf->getPage(), $this->_hideFooter)) {
-            return false;
-        }
-
-        $oldParsePos = $this->_parsePos;
-        $oldParseCode = $this->parsingHtml->code;
-
-        $this->_parsePos = 0;
-        $this->parsingHtml->code = $this->_subFOOTER;
-        $this->_isInFooter = true;
-        $this->_makeHTMLcode();
-        $this->_isInFooter = false;
-
-        $this->_parsePos = $oldParsePos;
-        $this->parsingHtml->code = $oldParseCode;
-    }
-
-    /**
-     * new line, with a specific height
-     *
-     * @access protected
-     * @param float   $h
-     * @param integer $curr real current position in the text, if new line in the write of a text
-     */
-    protected function _setNewLine($h, $curr = null)
-    {
-        $this->pdf->Ln($h);
-        $this->_setNewPositionForNewLine($curr);
-    }
-
-    /**
-     * calculate the start position of the next line,  depending on the text-align
-     *
-     * @access protected
-     * @param  integer $curr real current position in the text, if new line in the write of a text
-     */
-    protected function _setNewPositionForNewLine($curr = null)
-    {
-        // get the margins for the current line
-        list($lx, $rx) = $this->_getMargins($this->pdf->GetY());
-        $this->pdf->SetX($lx);
-        $wMax = $rx-$lx;
-        $this->_currentH = 0;
-
-        // if subPart => return because align left
-        if ($this->_subPart || $this->_isSubPart || $this->_isForOneLine) {
-            $this->pdf->setWordSpacing(0);
-            return null;
-        }
-
-        // create the sub object
-        $sub = $this->createSubHTML();
-        $sub->_saveMargin(0, 0, $sub->pdf->getW()-$wMax);
-        $sub->_isForOneLine = true;
-        $sub->_parsePos = $this->_parsePos;
-        $sub->parsingHtml->code = $this->parsingHtml->getCloneCodes();
-
-        // if $curr => adapt the current position of the parsing
-        if ($curr !== null && $sub->parsingHtml->code[$this->_parsePos]->getName() === 'write') {
-            $txt = $sub->parsingHtml->code[$this->_parsePos]->getParam('txt');
-            $txt = str_replace('[[page_cu]]', $sub->pdf->getMyNumPage($this->_page), $txt);
-            $sub->parsingHtml->code[$this->_parsePos]->setParam('txt', substr($txt, $curr + 1));
-        } else {
-            $sub->_parsePos++;
-        }
-
-        // for each element of the parsing => load the action
-        $res = null;
-        $amountHtmlCodes = count($sub->parsingHtml->code);
-        for ($sub->_parsePos; $sub->_parsePos < $amountHtmlCodes; $sub->_parsePos++) {
-            $action = $sub->parsingHtml->code[$sub->_parsePos];
-            $res = $sub->_executeAction($action);
-            if (!$res) {
-                break;
-            }
-        }
-
-        $w = $sub->_maxX; // max width
-        $h = $sub->_maxH; // max height
-        $e = ($res === null ? $sub->_maxE : 0); // maxnumber of elemets on the line
-
-        // destroy the sub HTML
-        $this->_destroySubHTML($sub);
-
-        // adapt the start of the line, depending on the text-align
-        if ($this->parsingCss->value['text-align'] === 'center') {
-            $this->pdf->SetX(($rx+$this->pdf->GetX()-$w)*0.5-0.01);
-        } elseif ($this->parsingCss->value['text-align'] === 'right') {
-            $this->pdf->SetX($rx-$w-0.01);
-        } else {
-            $this->pdf->SetX($lx);
-        }
-
-        // set the height of the line
-        $this->_currentH = $h;
-
-        // if justify => set the word spacing
-        if ($this->parsingCss->value['text-align'] === 'justify' && $e>1) {
-            $this->pdf->setWordSpacing(($wMax-$w)/($e-1));
-        } else {
-            $this->pdf->setWordSpacing(0);
-        }
-    }
-
-    /**
-     * prepare self::$_subobj (used for create the sub Html2Pdf objects
-     *
-     * @access protected
-     */
-    protected function _prepareSubObj()
-    {
-        $pdf = null;
-
-        // create the sub object
-        self::$_subobj = new Html2Pdf(
-            $this->_orientation,
-            $this->_format,
-            $this->_langue,
-            $this->_unicode,
-            $this->_encoding,
-            array($this->_defaultLeft,$this->_defaultTop,$this->_defaultRight,$this->_defaultBottom),
-            $this->_pdfa
-        );
-
-        // init
-        self::$_subobj->setSentenceMaxLines($this->_sentenceMaxLines);
-        self::$_subobj->setTestTdInOnePage($this->_testTdInOnepage);
-        self::$_subobj->setTestIsImage($this->_testIsImage);
-        self::$_subobj->setDefaultFont($this->_defaultFont);
-        self::$_subobj->setFallbackImage($this->_fallbackImage);
-        self::$_subobj->parsingCss->css            = &$this->parsingCss->css;
-        self::$_subobj->parsingCss->cssKeys        = &$this->parsingCss->cssKeys;
-
-        // add all the extensions
-        foreach ($this->extensions as $extension) {
-            self::$_subobj->addExtension($extension);
-        }
-
-        // clone font from the original PDF
-        self::$_subobj->pdf->cloneFontFrom($this->pdf);
-
-        // remove the link to the parent
-        self::$_subobj->parsingCss->setPdfParent($pdf);
-    }
-
-    /**
-     * create a sub Html2Pdf, to calculate the multi-tables
-     *
-     * @return Html2Pdf
-     */
-    protected function createSubHTML()
-    {
-        // prepare the subObject, if never prepare before
-        if (self::$_subobj === null) {
-            $this->_prepareSubObj();
-        }
-
-        // calculate the width to use
-        if ($this->parsingCss->value['width']) {
-            $marge = $this->parsingCss->value['padding']['l'] + $this->parsingCss->value['padding']['r'];
-            $marge+= $this->parsingCss->value['border']['l']['width'] + $this->parsingCss->value['border']['r']['width'];
-            $marge = $this->pdf->getW() - $this->parsingCss->value['width'] + $marge;
-        } else {
-            $marge = $this->_margeLeft+$this->_margeRight;
-        }
-
-        // BUGFIX : we have to call the method, because of a bug in php 5.1.6
-        self::$_subobj->pdf->getPage();
-
-        // clone the sub object
-        $subHtml = clone self::$_subobj;
-        $subHtml->parsingCss->table = $this->parsingCss->table;
-        $subHtml->parsingCss->value = $this->parsingCss->value;
-        $subHtml->initSubHtml(
-            $this->_format,
-            $this->_orientation,
-            $marge,
-            $this->_page,
-            $this->_defList,
-            $this->pdf->getMyLastPageGroup(),
-            $this->pdf->getMyLastPageGroupNb()
-        );
-
-        return $subHtml;
-    }
-
-    /**
-     * destroy a subHtml2Pdf
-     *
-     * @access protected
-     */
-    protected function _destroySubHTML(&$subHtml)
-    {
-        unset($subHtml);
-        $subHtml = null;
-    }
-
-    /**
-     * Convert an arabic number into a roman number
-     *
-     * @access protected
-     * @param  integer $nbArabic
-     * @return string  $nbRoman
-     */
-    protected function _listeArab2Rom($nbArabic)
-    {
-        $nbBaseTen  = array('i','x','c','m');
-        $nbBaseFive = array('v','l','d');
-        $nbRoman    = '';
-
-        if ($nbArabic<1) {
-            return $nbArabic;
-        }
-        if ($nbArabic>3999) {
-            return $nbArabic;
-        }
-
-        for ($i=3; $i>=0; $i--) {
-            $digit=floor($nbArabic/pow(10, $i));
-            if ($digit>=1) {
-                $nbArabic -= $digit*pow(10, $i);
-                if ($digit<=3) {
-                    for ($j=$digit; $j>=1; $j--) {
-                        $nbRoman .= $nbBaseTen[$i];
-                    }
-                } elseif ($digit == 9) {
-                    $nbRoman .= $nbBaseTen[$i].$nbBaseTen[$i+1];
-                } elseif ($digit == 4) {
-                    $nbRoman .= $nbBaseTen[$i].$nbBaseFive[$i];
-                } else {
-                    $nbRoman .= $nbBaseFive[$i];
-                    for ($j=$digit-5; $j>=1; $j--) {
-                        $nbRoman .= $nbBaseTen[$i];
-                    }
-                }
-            }
-        }
-        return $nbRoman;
-    }
-
-    /**
-     * add a LI to the current level
-     *
-     * @access protected
-     */
-    protected function _listeAddLi()
-    {
-        $this->_defList[count($this->_defList)-1]['nb']++;
-    }
-
-    /**
-     * get the width to use for the column of the list
-     *
-     * @access protected
-     * @return string $width
-     */
-    protected function _listeGetWidth()
-    {
-        return '7mm';
-    }
-
-    /**
-     * get the padding to use for the column of the list
-     *
-     * @access protected
-     * @return string $padding
-     */
-    protected function _listeGetPadding()
-    {
-        return '1mm';
-    }
-
-    /**
-     * get the information of the li on the current level
-     *
-     * @access protected
-     * @return array(fontName, small size, string)
-     */
-    protected function _listeGetLi()
-    {
-        $im = $this->_defList[count($this->_defList)-1]['img'];
-        $st = $this->_defList[count($this->_defList)-1]['style'];
-        $nb = $this->_defList[count($this->_defList)-1]['nb'];
-        $up = (substr($st, 0, 6) === 'upper-');
-
-        if ($im) {
-            return array(false, false, $im);
-        }
-
-        switch ($st) {
-            case 'none':
-                return array('helvetica', true, ' ');
-
-            case 'upper-alpha':
-            case 'lower-alpha':
-                $str = '';
-                while ($nb>26) {
-                    $str = chr(96+$nb%26).$str;
-                    $nb = floor($nb/26);
-                }
-                $str = chr(96+$nb).$str;
-
-                return array('helvetica', false, ($up ? strtoupper($str) : $str).'.');
-
-            case 'upper-roman':
-            case 'lower-roman':
-                $str = $this->_listeArab2Rom($nb);
-
-                return array('helvetica', false, ($up ? strtoupper($str) : $str).'.');
-
-            case 'decimal':
-                return array('helvetica', false, $nb.'.');
-
-            case 'square':
-                return array('zapfdingbats', true, chr(110));
-
-            case 'circle':
-                return array('zapfdingbats', true, chr(109));
-
-            case 'disc':
-            default:
-                return array('zapfdingbats', true, chr(108));
-        }
-    }
-
-    /**
-     * add a level to the list
-     *
-     * @access protected
-     * @param  string $type  : ul, ol
-     * @param  string $style : lower-alpha, ...
-     * @param  string $img
-     */
-    protected function _listeAddLevel($type = 'ul', $style = '', $img = null, $start = null)
-    {
-        // get the url of the image, if we want to use a image
-        if ($img) {
-            if (preg_match('/^url\(([^)]+)\)$/isU', trim($img), $match)) {
-                $img = $match[1];
-            } else {
-                $img = null;
-            }
-        } else {
-            $img = null;
-        }
-
-        // prepare the datas
-        if (!in_array($type, array('ul', 'ol'))) {
-            $type = 'ul';
-        }
-        if (!in_array($style, array('lower-alpha', 'upper-alpha', 'upper-roman', 'lower-roman', 'decimal', 'square', 'circle', 'disc', 'none'))) {
-            $style = '';
-        }
-
-        if (!$style) {
-            if ($type === 'ul') {
-                $style = 'disc';
-            } else {
-                $style = 'decimal';
-            }
-        }
-
-        if (is_null($start) || (int) $start<1) {
-            $start=0;
-        } else {
-            $start--;
-        }
-
-        // add the new level
-        $this->_defList[count($this->_defList)] = array('style' => $style, 'nb' => $start, 'img' => $img);
-    }
-
-    /**
-     * remove a level from the list
-     *
-     * @access protected
-     */
-    protected function _listeDelLevel()
-    {
-        if (count($this->_defList)) {
-            unset($this->_defList[count($this->_defList)-1]);
-            $this->_defList = array_values($this->_defList);
-        }
-    }
-
-    /**
-     * execute the actions to convert the html
-     *
-     * @access protected
-     */
-    protected function _makeHTMLcode()
-    {
-        $amountHtmlCode = count($this->parsingHtml->code);
-
-        // foreach elements of the parsing
-        for ($this->_parsePos=0; $this->_parsePos<$amountHtmlCode; $this->_parsePos++) {
-
-            // get the action to do
-            $action = $this->parsingHtml->code[$this->_parsePos];
-
-            // if it is a opening of table / ul / ol
-            if (in_array($action->getName(), array('table', 'ul', 'ol')) && !$action->isClose()) {
-
-                //  we will work as a sub HTML to calculate the size of the element
-                $this->_subPart = true;
-
-                // get the name of the opening tag
-                $tagOpen = $action->getName();
-
-                // save the actual pos on the parsing
-                $this->_tempPos = $this->_parsePos;
-
-                // foreach elements, while we are in the opened tag
-                while (isset($this->parsingHtml->code[$this->_tempPos]) && !($this->parsingHtml->code[$this->_tempPos]->getName() == $tagOpen && $this->parsingHtml->code[$this->_tempPos]->isClose())) {
-                    // make the action
-                    $this->_executeAction($this->parsingHtml->code[$this->_tempPos]);
-                    $this->_tempPos++;
-                }
-
-                // execute the closure of the tag
-                if (isset($this->parsingHtml->code[$this->_tempPos])) {
-                    $this->_executeAction($this->parsingHtml->code[$this->_tempPos]);
-                }
-
-                // end of the sub part
-                $this->_subPart = false;
-            }
-
-            // execute the action
-            $this->_executeAction($action);
-        }
-    }
-
-    /**
-     * execute the action from the parsing
-     *
-     * @param Node $action
-     */
-    protected function _executeAction(Node $action)
-    {
-        $name = strtoupper($action->getName());
-
-        if ($this->_firstPage && $name !== 'PAGE' && !$action->isClose()) {
-            $this->_setNewPage();
-        }
-
-        // properties of the action
-        $properties = $action->getParams();
-
-        // name of the action (old method)
-        $fnc = ($action->isClose() ? '_tag_close_' : '_tag_open_').$name;
-
-        $tagObject = $this->getTagObject($action->getName());
-
-        if (!is_null($tagObject)) {
-            if ($action->isClose()) {
-                $res = $tagObject->close($properties);
-            } else {
-                $res = $tagObject->open($properties);
-            }
-        } elseif (is_callable(array($this, $fnc))) {
-            $res = $this->{$fnc}($properties);
-        } else {
-            $e = new HtmlParsingException(
-                'The html tag ['.$action->getName().'] is not known by Html2Pdf. '.
-                'You can create it and push it on the Html2Pdf GitHub project.'
-            );
-            $e->setInvalidTag($action->getName());
-            $e->setHtmlLine($action->getLine());
-            throw $e;
-        }
-
-        // save the name of the action
-        $this->_previousCall = $fnc;
-
-        // return the result
-        return $res;
-    }
-
-    /**
-     * get the position of the element on the current line, depending on its height
-     *
-     * @access protected
-     * @param  float $h
-     * @return float
-     */
-    protected function _getElementY($h)
-    {
-        if ($this->_subPart || $this->_isSubPart || !$this->_currentH || $this->_currentH<$h) {
-            return 0;
-        }
-
-        return ($this->_currentH-$h)*0.8;
-    }
-
-    /**
-     * make a break line
-     *
-     * @access protected
-     * @param  float $h current line height
-     * @param  integer $curr real current position in the text, if new line in the write of a text
-     */
-    protected function _makeBreakLine($h, $curr = null)
-    {
-        if ($h) {
-            if (($this->pdf->GetY()+$h<$this->pdf->getH() - $this->pdf->getbMargin()) || $this->_isInOverflow || $this->_isInFooter) {
-                $this->_setNewLine($h, $curr);
-            } else {
-                $this->_setNewPage(null, '', null, $curr);
-            }
-        } else {
-            $this->_setNewPositionForNewLine($curr);
-        }
-
-        $this->_maxH = 0;
-        $this->_maxE = 0;
-    }
-
-    /**
-     * display an image
-     *
-     * @access protected
-     * @param  string $src
-     * @param  boolean $subLi if true=image of a list
-     * @return boolean depending on "isForOneLine"
-     */
-    protected function _drawImage($src, $subLi = false)
-    {
-        // get the size of the image
-        // WARNING : if URL, "allow_url_fopen" must turned to "on" in php.ini
-        if( strpos($src,'data:') === 0 ) {
-            $src = base64_decode( preg_replace('#^data:image/[^;]+;base64,#', '', $src) );
-            $infos = @getimagesizefromstring($src);
-            $src = "@{$src}";
-        } else {
-            $infos = @getimagesize($src);
-        }
-
-        // if the image does not exist, or can not be loaded
-        if (!is_array($infos) || count($infos)<2) {
-            if ($this->_testIsImage) {
-                $e = new ImageException('Unable to get the size of the image ['.$src.']');
-                $e->setImage($src);
-                throw $e;
-            }
-
-            // display a gray rectangle
-            $src = null;
-            $infos = array(16, 16);
-
-            // if we have a fallback Image, we use it
-            if ($this->_fallbackImage) {
-                $src = $this->_fallbackImage;
-                $infos = @getimagesize($src);
-
-                if (count($infos)<2) {
-                    $e = new ImageException('Unable to get the size of the fallback image ['.$src.']');
-                    $e->setImage($src);
-                    throw $e;
-                }
-            }
-        }
-
-        // convert the size of the image in the unit of the PDF
-        $imageWidth = $infos[0]/$this->pdf->getK();
-        $imageHeight = $infos[1]/$this->pdf->getK();
-
-        $ratio = $imageWidth / $imageHeight;
-
-        // calculate the size from the css style
-        if ($this->parsingCss->value['width'] && $this->parsingCss->value['height']) {
-            $w = $this->parsingCss->value['width'];
-            $h = $this->parsingCss->value['height'];
-        } elseif ($this->parsingCss->value['width']) {
-            $w = $this->parsingCss->value['width'];
-            $h = $w / $ratio;
-        } elseif ($this->parsingCss->value['height']) {
-            $h = $this->parsingCss->value['height'];
-            $w = $h * $ratio;
-        } else {
-            // convert px to pt
-            $w = 72./96.*$imageWidth;
-            $h = 72./96.*$imageHeight;
-        }
-
-        if (isset($this->parsingCss->value['max-width']) && $this->parsingCss->value['max-width'] < $w) {
-            $w = $this->parsingCss->value['max-width'];
-            if (!$this->parsingCss->value['height']) {
-                // reprocess the height if not constrained
-                $h = $w / $ratio;
-            }
-        }
-        if (isset($this->parsingCss->value['max-height']) && $this->parsingCss->value['max-height'] < $h) {
-            $h = $this->parsingCss->value['max-height'];
-            if (!$this->parsingCss->value['width']) {
-                // reprocess the width if not constrained
-                $w = $h * $ratio;
-            }
-        }
-
-        // are we in a float
-        $float = $this->parsingCss->getFloat();
-
-        // if we are in a float, but if something else if on the line
-        // => make the break line (false if we are in "_isForOneLine" mode)
-        if ($float && $this->_maxH && !$this->_tag_open_BR(array())) {
-            return false;
-        }
-
-        // position of the image
-        $x = $this->pdf->GetX();
-        $y = $this->pdf->GetY();
-
-        // if the image can not be put on the current line => new line
-        if (!$float && ($x + $w>$this->pdf->getW() - $this->pdf->getrMargin()) && $this->_maxH) {
-            if ($this->_isForOneLine) {
-                return false;
-            }
-
-            // set the new line
-            $hnl = max($this->_maxH, $this->parsingCss->getLineHeight());
-            $this->_setNewLine($hnl);
-
-            // get the new position
-            $x = $this->pdf->GetX();
-            $y = $this->pdf->GetY();
-        }
-
-        // if the image can not be put on the current page
-        if (($y + $h>$this->pdf->getH() - $this->pdf->getbMargin()) && !$this->_isInOverflow) {
-            // new page
-            $this->_setNewPage();
-
-            // get the new position
-            $x = $this->pdf->GetX();
-            $y = $this->pdf->GetY();
-        }
-
-        // correction for display the image of a list
-        $hT = 0.80*$this->parsingCss->value['font-size'];
-        if ($subLi && $h<$hT) {
-            $y+=($hT-$h);
-        }
-
-        // add the margin top
-        $yc = $y-$this->parsingCss->value['margin']['t'];
-
-        // get the width and the position of the parent
-        $old = $this->parsingCss->getOldValues();
-        if ($old['width']) {
-            $parentWidth = $old['width'];
-            $parentX = $x;
-        } else {
-            $parentWidth = $this->pdf->getW() - $this->pdf->getlMargin() - $this->pdf->getrMargin();
-            $parentX = $this->pdf->getlMargin();
-        }
-
-        // if we are in a gloat => adapt the parent position and width
-        if ($float) {
-            list($lx, $rx) = $this->_getMargins($yc);
-            $parentX = $lx;
-            $parentWidth = $rx-$lx;
-        }
-
-        // calculate the position of the image, if align to the right
-        if ($parentWidth>$w && $float !== 'left') {
-            if ($float === 'right' || $this->parsingCss->value['text-align'] === 'li_right') {
-                $x = $parentX + $parentWidth - $w-$this->parsingCss->value['margin']['r']-$this->parsingCss->value['margin']['l'];
-            }
-        }
-
-        // display the image
-        if (!$this->_subPart && !$this->_isSubPart) {
-            if ($src) {
-                $this->pdf->Image($src, $x, $y, $w, $h, '', $this->_isInLink);
-            } else {
-                // rectangle if the image can not be loaded
-                $this->pdf->SetFillColorArray(array(240, 220, 220));
-                $this->pdf->Rect($x, $y, $w, $h, 'F');
-            }
-        }
-
-        // apply the margins
-        $x-= $this->parsingCss->value['margin']['l'];
-        $y-= $this->parsingCss->value['margin']['t'];
-        $w+= $this->parsingCss->value['margin']['l'] + $this->parsingCss->value['margin']['r'];
-        $h+= $this->parsingCss->value['margin']['t'] + $this->parsingCss->value['margin']['b'];
-
-        if ($float === 'left') {
-            // save the current max
-            $this->_maxX = max($this->_maxX, $x+$w);
-            $this->_maxY = max($this->_maxY, $y+$h);
-
-            // add the image to the margins
-            $this->_addMargins($float, $x, $y, $x+$w, $y+$h);
-
-            // get the new position
-            list($lx, $rx) = $this->_getMargins($yc);
-            $this->pdf->SetXY($lx, $yc);
-        } elseif ($float === 'right') {
-            // save the current max. We don't save the X because it is not the real max of the line
-            $this->_maxY = max($this->_maxY, $y+$h);
-
-            // add the image to the margins
-            $this->_addMargins($float, $x, $y, $x+$w, $y+$h);
-
-            // get the new position
-            list($lx, $rx) = $this->_getMargins($yc);
-            $this->pdf->SetXY($lx, $yc);
-        } else {
-            // set the new position at the end of the image
-            $this->pdf->SetX($x+$w);
-
-            // save the current max
-            $this->_maxX = max($this->_maxX, $x+$w);
-            $this->_maxY = max($this->_maxY, $y+$h);
-            $this->_maxH = max($this->_maxH, $h);
-        }
-
-        return true;
-    }
-
-    /**
-     * draw a rectangle
-     *
-     * @access protected
-     * @param  float $x
-     * @param  float $y
-     * @param  float $w
-     * @param  float $h
-     * @param  array $border
-     * @param  float $padding - internal margin of the rectangle => not used, but...
-     * @param  float $margin  - external margin of the rectangle
-     * @param  array $background
-     * @return boolean
-     */
-    protected function _drawRectangle($x, $y, $w, $h, $border, $padding, $margin, $background)
-    {
-        // if we are in a subpart or if height is null => return false
-        if ($this->_subPart || $this->_isSubPart || $h === null) {
-            return false;
-        }
-
-        // add the margin
-        $x+= $margin;
-        $y+= $margin;
-        $w-= $margin*2;
-        $h-= $margin*2;
-
-        // get the radius of the border
-        $outTL = $border['radius']['tl'];
-        $outTR = $border['radius']['tr'];
-        $outBR = $border['radius']['br'];
-        $outBL = $border['radius']['bl'];
-
-        // prepare the out radius
-        $outTL = ($outTL[0] && $outTL[1]) ? $outTL : null;
-        $outTR = ($outTR[0] && $outTR[1]) ? $outTR : null;
-        $outBR = ($outBR[0] && $outBR[1]) ? $outBR : null;
-        $outBL = ($outBL[0] && $outBL[1]) ? $outBL : null;
-
-        // prepare the in radius
-        $inTL = $outTL;
-        $inTR = $outTR;
-        $inBR = $outBR;
-        $inBL = $outBL;
-
-        if (is_array($inTL)) {
-            $inTL[0]-= $border['l']['width'];
-            $inTL[1]-= $border['t']['width'];
-        }
-        if (is_array($inTR)) {
-            $inTR[0]-= $border['r']['width'];
-            $inTR[1]-= $border['t']['width'];
-        }
-        if (is_array($inBR)) {
-            $inBR[0]-= $border['r']['width'];
-            $inBR[1]-= $border['b']['width'];
-        }
-        if (is_array($inBL)) {
-            $inBL[0]-= $border['l']['width'];
-            $inBL[1]-= $border['b']['width'];
-        }
-
-        if (!is_array($inTL) || $inTL[0]<=0 || $inTL[1]<=0) {
-            $inTL = null;
-        }
-        if (!is_array($inTR) || $inTR[0]<=0 || $inTR[1]<=0) {
-            $inTR = null;
-        }
-        if (!is_array($inBR) || $inBR[0]<=0 || $inBR[1]<=0) {
-            $inBR = null;
-        }
-        if (!is_array($inBL) || $inBL[0]<=0 || $inBL[1]<=0) {
-            $inBL = null;
-        }
-
-        // prepare the background color
-        $pdfStyle = '';
-        if ($background['color']) {
-            $this->pdf->SetFillColorArray($background['color']);
-            $pdfStyle.= 'F';
-        }
-
-        // if we have a background to fill => fill it with a path (because of the radius)
-        if ($pdfStyle) {
-            $this->pdf->clippingPathStart($x, $y, $w, $h, $outTL, $outTR, $outBL, $outBR);
-            $this->pdf->Rect($x, $y, $w, $h, $pdfStyle);
-            $this->pdf->clippingPathStop();
-        }
-
-        // prepare the background image
-        if ($background['image']) {
-            $iName      = $background['image'];
-            $iPosition  = $background['position'] !== null ? $background['position'] : array(0, 0);
-            $iRepeat    = $background['repeat'] !== null   ? $background['repeat']   : array(true, true);
-
-            // size of the background without the borders
-            $bX = $x;
-            $bY = $y;
-            $bW = $w;
-            $bH = $h;
-
-            if ($border['b']['width']) {
-                $bH-= $border['b']['width'];
-            }
-            if ($border['l']['width']) {
-                $bW-= $border['l']['width'];
-                $bX+= $border['l']['width'];
-            }
-            if ($border['t']['width']) {
-                $bH-= $border['t']['width'];
-                $bY+= $border['t']['width'];
-            }
-            if ($border['r']['width']) {
-                $bW-= $border['r']['width'];
-            }
-
-            // get the size of the image
-            // WARNING : if URL, "allow_url_fopen" must turned to "on" in php.ini
-            $imageInfos=@getimagesize($iName);
-
-            // if the image can not be loaded
-            if (!is_array($imageInfos) || count($imageInfos)<2) {
-                if ($this->_testIsImage) {
-                    $e = new ImageException('Unable to get the size of the image ['.$iName.']');
-                    $e->setImage($iName);
-                    throw $e;
-                }
-            } else {
-                // convert the size of the image from pixel to the unit of the PDF
-                $imageWidth    = 72./96.*$imageInfos[0]/$this->pdf->getK();
-                $imageHeight    = 72./96.*$imageInfos[1]/$this->pdf->getK();
-
-                // prepare the position of the backgroung
-                if ($iRepeat[0]) {
-                    $iPosition[0] = $bX;
-                } elseif (preg_match('/^([-]?[0-9\.]+)%/isU', $iPosition[0], $match)) {
-                    $iPosition[0] = $bX + $match[1]*($bW-$imageWidth)/100;
-                } else {
-                    $iPosition[0] = $bX+$iPosition[0];
-                }
-
-                if ($iRepeat[1]) {
-                    $iPosition[1] = $bY;
-                } elseif (preg_match('/^([-]?[0-9\.]+)%/isU', $iPosition[1], $match)) {
-                    $iPosition[1] = $bY + $match[1]*($bH-$imageHeight)/100;
-                } else {
-                    $iPosition[1] = $bY+$iPosition[1];
-                }
-
-                $imageXmin = $bX;
-                $imageXmax = $bX+$bW;
-                $imageYmin = $bY;
-                $imageYmax = $bY+$bH;
-
-                if (!$iRepeat[0] && !$iRepeat[1]) {
-                    $imageXmin =     $iPosition[0];
-                    $imageXmax =     $iPosition[0]+$imageWidth;
-                    $imageYmin =     $iPosition[1];
-                    $imageYmax =     $iPosition[1]+$imageHeight;
-                } elseif ($iRepeat[0] && !$iRepeat[1]) {
-                    $imageYmin =     $iPosition[1];
-                    $imageYmax =     $iPosition[1]+$imageHeight;
-                } elseif (!$iRepeat[0] && $iRepeat[1]) {
-                    $imageXmin =     $iPosition[0];
-                    $imageXmax =     $iPosition[0]+$imageWidth;
-                }
-
-                // build the path to display the image (because of radius)
-                $this->pdf->clippingPathStart($bX, $bY, $bW, $bH, $inTL, $inTR, $inBL, $inBR);
-
-                // repeat the image
-                for ($iY=$imageYmin; $iY<$imageYmax; $iY+=$imageHeight) {
-                    for ($iX=$imageXmin; $iX<$imageXmax; $iX+=$imageWidth) {
-                        $cX = null;
-                        $cY = null;
-                        $cW = $imageWidth;
-                        $cH = $imageHeight;
-                        if ($imageYmax-$iY<$imageHeight) {
-                            $cX = $iX;
-                            $cY = $iY;
-                            $cH = $imageYmax-$iY;
-                        }
-                        if ($imageXmax-$iX<$imageWidth) {
-                            $cX = $iX;
-                            $cY = $iY;
-                            $cW = $imageXmax-$iX;
-                        }
-
-                        $this->pdf->Image($iName, $iX, $iY, $imageWidth, $imageHeight, '', '');
-                    }
-                }
-
-                // end of the path
-                $this->pdf->clippingPathStop();
-            }
-        }
-
-        // adding some loose (0.01mm)
-        $loose = 0.01;
-        $x-= $loose;
-        $y-= $loose;
-        $w+= 2.*$loose;
-        $h+= 2.*$loose;
-        if ($border['l']['width']) {
-            $border['l']['width']+= 2.*$loose;
-        }
-        if ($border['t']['width']) {
-            $border['t']['width']+= 2.*$loose;
-        }
-        if ($border['r']['width']) {
-            $border['r']['width']+= 2.*$loose;
-        }
-        if ($border['b']['width']) {
-            $border['b']['width']+= 2.*$loose;
-        }
-
-        // prepare the test on borders
-        $testBl = ($border['l']['width'] && $border['l']['color'][0] !== null);
-        $testBt = ($border['t']['width'] && $border['t']['color'][0] !== null);
-        $testBr = ($border['r']['width'] && $border['r']['color'][0] !== null);
-        $testBb = ($border['b']['width'] && $border['b']['color'][0] !== null);
-
-        // draw the radius bottom-left
-        if (is_array($outBL) && ($testBb || $testBl)) {
-            if ($inBL) {
-                $courbe = array();
-                $courbe[] = $x+$outBL[0];
-                $courbe[] = $y+$h;
-                $courbe[] = $x;
-                $courbe[] = $y+$h-$outBL[1];
-                $courbe[] = $x+$outBL[0];
-                $courbe[] = $y+$h-$border['b']['width'];
-                $courbe[] = $x+$border['l']['width'];
-                $courbe[] = $y+$h-$outBL[1];
-                $courbe[] = $x+$outBL[0];
-                $courbe[] = $y+$h-$outBL[1];
-            } else {
-                $courbe = array();
-                $courbe[] = $x+$outBL[0];
-                $courbe[] = $y+$h;
-                $courbe[] = $x;
-                $courbe[] = $y+$h-$outBL[1];
-                $courbe[] = $x+$border['l']['width'];
-                $courbe[] = $y+$h-$border['b']['width'];
-                $courbe[] = $x+$outBL[0];
-                $courbe[] = $y+$h-$outBL[1];
-            }
-            $this->_drawCurve($courbe, $border['l']['color']);
-        }
-
-        // draw the radius left-top
-        if (is_array($outTL) && ($testBt || $testBl)) {
-            if ($inTL) {
-                $courbe = array();
-                $courbe[] = $x;
-                $courbe[] = $y+$outTL[1];
-                $courbe[] = $x+$outTL[0];
-                $courbe[] = $y;
-                $courbe[] = $x+$border['l']['width'];
-                $courbe[] = $y+$outTL[1];
-                $courbe[] = $x+$outTL[0];
-                $courbe[] = $y+$border['t']['width'];
-                $courbe[] = $x+$outTL[0];
-                $courbe[] = $y+$outTL[1];
-            } else {
-                $courbe = array();
-                $courbe[] = $x;
-                $courbe[] = $y+$outTL[1];
-                $courbe[] = $x+$outTL[0];
-                $courbe[] = $y;
-                $courbe[] = $x+$border['l']['width'];
-                $courbe[] = $y+$border['t']['width'];
-                $courbe[] = $x+$outTL[0];
-                $courbe[] = $y+$outTL[1];
-            }
-            $this->_drawCurve($courbe, $border['t']['color']);
-        }
-
-        // draw the radius top-right
-        if (is_array($outTR) && ($testBt || $testBr)) {
-            if ($inTR) {
-                $courbe = array();
-                $courbe[] = $x+$w-$outTR[0];
-                $courbe[] = $y;
-                $courbe[] = $x+$w;
-                $courbe[] = $y+$outTR[1];
-                $courbe[] = $x+$w-$outTR[0];
-                $courbe[] = $y+$border['t']['width'];
-                $courbe[] = $x+$w-$border['r']['width'];
-                $courbe[] = $y+$outTR[1];
-                $courbe[] = $x+$w-$outTR[0];
-                $courbe[] = $y+$outTR[1];
-            } else {
-                $courbe = array();
-                $courbe[] = $x+$w-$outTR[0];
-                $courbe[] = $y;
-                $courbe[] = $x+$w;
-                $courbe[] = $y+$outTR[1];
-                $courbe[] = $x+$w-$border['r']['width'];
-                $courbe[] = $y+$border['t']['width'];
-                $courbe[] = $x+$w-$outTR[0];
-                $courbe[] = $y+$outTR[1];
-            }
-            $this->_drawCurve($courbe, $border['r']['color']);
-        }
-
-        // draw the radius right-bottom
-        if (is_array($outBR) && ($testBb || $testBr)) {
-            if ($inBR) {
-                $courbe = array();
-                $courbe[] = $x+$w;
-                $courbe[] = $y+$h-$outBR[1];
-                $courbe[] = $x+$w-$outBR[0];
-                $courbe[] = $y+$h;
-                $courbe[] = $x+$w-$border['r']['width'];
-                $courbe[] = $y+$h-$outBR[1];
-                $courbe[] = $x+$w-$outBR[0];
-                $courbe[] = $y+$h-$border['b']['width'];
-                $courbe[] = $x+$w-$outBR[0];
-                $courbe[] = $y+$h-$outBR[1];
-            } else {
-                $courbe = array();
-                $courbe[] = $x+$w;
-                $courbe[] = $y+$h-$outBR[1];
-                $courbe[] = $x+$w-$outBR[0];
-                $courbe[] = $y+$h;
-                $courbe[] = $x+$w-$border['r']['width'];
-                $courbe[] = $y+$h-$border['b']['width'];
-                $courbe[] = $x+$w-$outBR[0];
-                $courbe[] = $y+$h-$outBR[1];
-            }
-            $this->_drawCurve($courbe, $border['b']['color']);
-        }
-
-        // draw the left border
-        if ($testBl) {
-            $pt = array();
-            $pt[] = $x;
-            $pt[] = $y+$h;
-            $pt[] = $x;
-            $pt[] = $y+$h-$border['b']['width'];
-            $pt[] = $x;
-            $pt[] = $y+$border['t']['width'];
-            $pt[] = $x;
-            $pt[] = $y;
-            $pt[] = $x+$border['l']['width'];
-            $pt[] = $y+$border['t']['width'];
-            $pt[] = $x+$border['l']['width'];
-            $pt[] = $y+$h-$border['b']['width'];
-
-            $bord = 3;
-            if (is_array($outBL)) {
-                $bord-=1;
-                $pt[3] -= $outBL[1] - $border['b']['width'];
-                if ($inBL) {
-                    $pt[11]-= $inBL[1];
-                }
-                unset($pt[0]);
-                unset($pt[1]);
-            }
-            if (is_array($outTL)) {
-                $bord-=2;
-                $pt[5] += $outTL[1]-$border['t']['width'];
-                if ($inTL) {
-                    $pt[9] += $inTL[1];
-                }
-                unset($pt[6]);
-                unset($pt[7]);
-            }
-
-            $pt = array_values($pt);
-            $this->_drawLine($pt, $border['l']['color'], $border['l']['type'], $border['l']['width'], $bord);
-        }
-
-        // draw the top border
-        if ($testBt) {
-            $pt = array();
-            $pt[] = $x;
-            $pt[] = $y;
-            $pt[] = $x+$border['l']['width'];
-            $pt[] = $y;
-            $pt[] = $x+$w-$border['r']['width'];
-            $pt[] = $y;
-            $pt[] = $x+$w;
-            $pt[] = $y;
-            $pt[] = $x+$w-$border['r']['width'];
-            $pt[] = $y+$border['t']['width'];
-            $pt[] = $x+$border['l']['width'];
-            $pt[] = $y+$border['t']['width'];
-
-            $bord = 3;
-            if (is_array($outTL)) {
-                $bord-=1;
-                $pt[2] += $outTL[0] - $border['l']['width'];
-                if ($inTL) {
-                    $pt[10]+= $inTL[0];
-                }
-                unset($pt[0]);
-                unset($pt[1]);
-            }
-            if (is_array($outTR)) {
-                $bord-=2;
-                $pt[4] -= $outTR[0] - $border['r']['width'];
-                if ($inTR) {
-                    $pt[8] -= $inTR[0];
-                }
-                unset($pt[6]);
-                unset($pt[7]);
-            }
-
-            $pt = array_values($pt);
-            $this->_drawLine($pt, $border['t']['color'], $border['t']['type'], $border['t']['width'], $bord);
-        }
-
-        // draw the right border
-        if ($testBr) {
-            $pt = array();
-            $pt[] = $x+$w;
-            $pt[] = $y;
-            $pt[] = $x+$w;
-            $pt[] = $y+$border['t']['width'];
-            $pt[] = $x+$w;
-            $pt[] = $y+$h-$border['b']['width'];
-            $pt[] = $x+$w;
-            $pt[] = $y+$h;
-            $pt[] = $x+$w-$border['r']['width'];
-            $pt[] = $y+$h-$border['b']['width'];
-            $pt[] = $x+$w-$border['r']['width'];
-            $pt[] = $y+$border['t']['width'];
-
-            $bord = 3;
-            if (is_array($outTR)) {
-                $bord-=1;
-                $pt[3] += $outTR[1] - $border['t']['width'];
-                if ($inTR) {
-                    $pt[11]+= $inTR[1];
-                }
-                unset($pt[0]);
-                unset($pt[1]);
-            }
-            if (is_array($outBR)) {
-                $bord-=2;
-                $pt[5] -= $outBR[1] - $border['b']['width'];
-                if ($inBR) {
-                    $pt[9] -= $inBR[1];
-                }
-                unset($pt[6]);
-                unset($pt[7]);
-            }
-
-            $pt = array_values($pt);
-            $this->_drawLine($pt, $border['r']['color'], $border['r']['type'], $border['r']['width'], $bord);
-        }
-
-        // draw the bottom border
-        if ($testBb) {
-            $pt = array();
-            $pt[] = $x+$w;
-            $pt[] = $y+$h;
-            $pt[] = $x+$w-$border['r']['width'];
-            $pt[] = $y+$h;
-            $pt[] = $x+$border['l']['width'];
-            $pt[] = $y+$h;
-            $pt[] = $x;
-            $pt[] = $y+$h;
-            $pt[] = $x+$border['l']['width'];
-            $pt[] = $y+$h-$border['b']['width'];
-            $pt[] = $x+$w-$border['r']['width'];
-            $pt[] = $y+$h-$border['b']['width'];
-
-            $bord = 3;
-            if (is_array($outBL)) {
-                $bord-=2;
-                $pt[4] += $outBL[0] - $border['l']['width'];
-                if ($inBL) {
-                    $pt[8] += $inBL[0];
-                }
-                unset($pt[6]);
-                unset($pt[7]);
-            }
-            if (is_array($outBR)) {
-                $bord-=1;
-                $pt[2] -= $outBR[0] - $border['r']['width'];
-                if ($inBR) {
-                    $pt[10]-= $inBR[0];
-                }
-                unset($pt[0]);
-                unset($pt[1]);
-
-            }
-
-            $pt = array_values($pt);
-            $this->_drawLine($pt, $border['b']['color'], $border['b']['type'], $border['b']['width'], $bord);
-        }
-
-        if ($background['color']) {
-            $this->pdf->SetFillColorArray($background['color']);
-        }
-
-        return true;
-    }
-
-    /**
-     * draw a curve (for border radius)
-     *
-     * @access protected
-     * @param  array $pt
-     * @param  array $color
-     */
-    protected function _drawCurve($pt, $color)
-    {
-        $this->pdf->SetFillColorArray($color);
-
-        if (count($pt) == 10) {
-            $this->pdf->drawCurve($pt[0], $pt[1], $pt[2], $pt[3], $pt[4], $pt[5], $pt[6], $pt[7], $pt[8], $pt[9]);
-        } else {
-            $this->pdf->drawCorner($pt[0], $pt[1], $pt[2], $pt[3], $pt[4], $pt[5], $pt[6], $pt[7]);
-        }
-    }
-
-    /**
-     * draw a line with a specific type, and specific start and end for radius
-     *
-     * @access protected
-     * @param  array   $pt
-     * @param  array   $color
-     * @param  string  $type (dashed, dotted, double, solid)
-     * @param  float   $width
-     * @param  integer $radius (binary from 0 to 3 with 1=>start with a radius, 2=>end with a radius)
-     */
-    protected function _drawLine($pt, $color, $type, $width, $radius = 3)
-    {
-        // set the fill color
-        $this->pdf->SetFillColorArray($color);
-
-        // if dashed or dotted
-        if ($type === 'dashed' || $type === 'dotted') {
-
-            // clean the end of the line, if radius
-            if ($radius == 1) {
-                $tmp = array();
-                $tmp[]=$pt[0];
-                $tmp[]=$pt[1];
-                $tmp[]=$pt[2];
-                $tmp[]=$pt[3];
-                $tmp[]=$pt[8];
-                $tmp[]=$pt[9];
-                $this->pdf->Polygon($tmp, 'F');
-
-                $tmp = array();
-                $tmp[]=$pt[2];
-                $tmp[]=$pt[3];
-                $tmp[]=$pt[4];
-                $tmp[]=$pt[5];
-                $tmp[]=$pt[6];
-                $tmp[]=$pt[7];
-                $tmp[]=$pt[8];
-                $tmp[]=$pt[9];
-                $pt = $tmp;
-            } elseif ($radius == 2) {
-                $tmp = array();
-                $tmp[]=$pt[2];
-                $tmp[]=$pt[3];
-                $tmp[]=$pt[4];
-                $tmp[]=$pt[5];
-                $tmp[]=$pt[6];
-                $tmp[]=$pt[7];
-                $this->pdf->Polygon($tmp, 'F');
-
-                $tmp = array();
-                $tmp[]=$pt[0];
-                $tmp[]=$pt[1];
-                $tmp[]=$pt[2];
-                $tmp[]=$pt[3];
-                $tmp[]=$pt[6];
-                $tmp[]=$pt[7];
-                $tmp[]=$pt[8];
-                $tmp[]=$pt[9];
-                $pt = $tmp;
-            } elseif ($radius == 3) {
-                $tmp = array();
-                $tmp[]=$pt[0];
-                $tmp[]=$pt[1];
-                $tmp[]=$pt[2];
-                $tmp[]=$pt[3];
-                $tmp[]=$pt[10];
-                $tmp[]=$pt[11];
-                $this->pdf->Polygon($tmp, 'F');
-
-                $tmp = array();
-                $tmp[]=$pt[4];
-                $tmp[]=$pt[5];
-                $tmp[]=$pt[6];
-                $tmp[]=$pt[7];
-                $tmp[]=$pt[8];
-                $tmp[]=$pt[9];
-                $this->pdf->Polygon($tmp, 'F');
-
-                $tmp = array();
-                $tmp[]=$pt[2];
-                $tmp[]=$pt[3];
-                $tmp[]=$pt[4];
-                $tmp[]=$pt[5];
-                $tmp[]=$pt[8];
-                $tmp[]=$pt[9];
-                $tmp[]=$pt[10];
-                $tmp[]=$pt[11];
-                $pt = $tmp;
-            }
-
-            // horisontal or vertical line
-            if ($pt[2] == $pt[0]) {
-                $l = abs(($pt[3]-$pt[1])*0.5);
-                $px = 0;
-                $py = $width;
-                $x1 = $pt[0];
-                $y1 = ($pt[3]+$pt[1])*0.5;
-                $x2 = $pt[6];
-                $y2 = ($pt[7]+$pt[5])*0.5;
-            } else {
-                $l = abs(($pt[2]-$pt[0])*0.5);
-                $px = $width;
-                $py = 0;
-                $x1 = ($pt[2]+$pt[0])*0.5;
-                $y1 = $pt[1];
-                $x2 = ($pt[6]+$pt[4])*0.5;
-                $y2 = $pt[7];
-            }
-
-            // if dashed : 3x bigger than dotted
-            if ($type === 'dashed') {
-                $px = $px*3.;
-                $py = $py*3.;
-            }
-            $mode = ($l/($px+$py)<.5);
-
-            // display the dotted/dashed line
-            for ($i=0; $l-($px+$py)*($i-0.5)>0; $i++) {
-                if (($i%2) == $mode) {
-                    $j = $i-0.5;
-                    $lx1 = $px*$j;
-                    if ($lx1<-$l) {
-                        $lx1 =-$l;
-                    }
-                    $ly1 = $py*$j;
-                    if ($ly1<-$l) {
-                        $ly1 =-$l;
-                    }
-                    $lx2 = $px*($j+1);
-                    if ($lx2>$l) {
-                        $lx2 = $l;
-                    }
-                    $ly2 = $py*($j+1);
-                    if ($ly2>$l) {
-                        $ly2 = $l;
-                    }
-
-                    $tmp = array();
-                    $tmp[] = $x1+$lx1;
-                    $tmp[] = $y1+$ly1;
-                    $tmp[] = $x1+$lx2;
-                    $tmp[] = $y1+$ly2;
-                    $tmp[] = $x2+$lx2;
-                    $tmp[] = $y2+$ly2;
-                    $tmp[] = $x2+$lx1;
-                    $tmp[] = $y2+$ly1;
-                    $this->pdf->Polygon($tmp, 'F');
-
-                    if ($j>0) {
-                        $tmp = array();
-                        $tmp[] = $x1-$lx1;
-                        $tmp[] = $y1-$ly1;
-                        $tmp[] = $x1-$lx2;
-                        $tmp[] = $y1-$ly2;
-                        $tmp[] = $x2-$lx2;
-                        $tmp[] = $y2-$ly2;
-                        $tmp[] = $x2-$lx1;
-                        $tmp[] = $y2-$ly1;
-                        $this->pdf->Polygon($tmp, 'F');
-                    }
-                }
-            }
-        } elseif ($type === 'double') {
-
-            // if double, 2 lines : 0=>1/3 and 2/3=>1
-            $pt1 = $pt;
-            $pt2 = $pt;
-
-            if (count($pt) == 12) {
-                // line 1
-                $pt1[0] = ($pt[0]-$pt[10])*0.33 + $pt[10];
-                $pt1[1] = ($pt[1]-$pt[11])*0.33 + $pt[11];
-                $pt1[2] = ($pt[2]-$pt[10])*0.33 + $pt[10];
-                $pt1[3] = ($pt[3]-$pt[11])*0.33 + $pt[11];
-                $pt1[4] = ($pt[4]-$pt[8])*0.33 + $pt[8];
-                $pt1[5] = ($pt[5]-$pt[9])*0.33 + $pt[9];
-                $pt1[6] = ($pt[6]-$pt[8])*0.33 + $pt[8];
-                $pt1[7] = ($pt[7]-$pt[9])*0.33 + $pt[9];
-                $pt2[10]= ($pt[10]-$pt[0])*0.33 + $pt[0];
-                $pt2[11]= ($pt[11]-$pt[1])*0.33 + $pt[1];
-
-                // line 2
-                $pt2[2] = ($pt[2] -$pt[0])*0.33 + $pt[0];
-                $pt2[3] = ($pt[3] -$pt[1])*0.33 + $pt[1];
-                $pt2[4] = ($pt[4] -$pt[6])*0.33 + $pt[6];
-                $pt2[5] = ($pt[5] -$pt[7])*0.33 + $pt[7];
-                $pt2[8] = ($pt[8] -$pt[6])*0.33 + $pt[6];
-                $pt2[9] = ($pt[9] -$pt[7])*0.33 + $pt[7];
-            } else {
-                // line 1
-                $pt1[0] = ($pt[0]-$pt[6])*0.33 + $pt[6];
-                $pt1[1] = ($pt[1]-$pt[7])*0.33 + $pt[7];
-                $pt1[2] = ($pt[2]-$pt[4])*0.33 + $pt[4];
-                $pt1[3] = ($pt[3]-$pt[5])*0.33 + $pt[5];
-
-                // line 2
-                $pt2[6] = ($pt[6]-$pt[0])*0.33 + $pt[0];
-                $pt2[7] = ($pt[7]-$pt[1])*0.33 + $pt[1];
-                $pt2[4] = ($pt[4]-$pt[2])*0.33 + $pt[2];
-                $pt2[5] = ($pt[5]-$pt[3])*0.33 + $pt[3];
-            }
-            $this->pdf->Polygon($pt1, 'F');
-            $this->pdf->Polygon($pt2, 'F');
-        } elseif ($type === 'solid') {
-            // solid line : draw directly the polygon
-            $this->pdf->Polygon($pt, 'F');
-        }
-    }
-
-    /**
-     * @access protected
-     * @param  &array $cases
-     * @param  &array $corr
-     */
-    protected function _calculateTableCellSize(&$cases, &$corr)
-    {
-        if (!isset($corr[0])) {
-            return true;
-        }
-
-        $amountCorr = count($corr);
-        $amountCorr0 = count($corr[0]);
-
-        // for each cell without colspan, we get the max width for each column
-        $sw = array();
-        for ($x=0; $x<$amountCorr0; $x++) {
-            $m=0;
-            $found = false;
-            for ($y=0; $y<$amountCorr; $y++) {
-                if (isset($corr[$y][$x]) && is_array($corr[$y][$x]) && $corr[$y][$x][2] == 1) {
-                    $found = true;
-                    $m = max($m, $cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['w']);
-                }
-            }
-            if (!$found) {
-                for ($y=0; $y<$amountCorr; $y++) {
-                    for ($previousCell = 0; $previousCell <= $x; $previousCell++) {
-                        $xPrevious = $x - $previousCell;
-                        if (isset($corr[$y][$xPrevious]) && is_array($corr[$y][$xPrevious]) && $corr[$y][$xPrevious][2] > ($previousCell)) {
-                            $m = max($m, $cases[$corr[$y][$xPrevious][1]][$corr[$y][$xPrevious][0]]['w'] / $corr[$y][$xPrevious][2]);
-                            break 1;
-                        }
-                    }
-                }
-            }
-            $sw[$x] = $m;
-        }
-
-        // for each cell with colspan, we adapt the width of each column
-        for ($x=0; $x<$amountCorr0; $x++) {
-            for ($y=0; $y<$amountCorr; $y++) {
-                if (isset($corr[$y][$x]) && is_array($corr[$y][$x]) && $corr[$y][$x][2]>1) {
-
-                    // sum the max width of each column in colspan
-                    // if  you have an error here, it is because you have not the same number of columns on each row...
-                    $s = 0;
-                    for ($i=0; $i<$corr[$y][$x][2]; $i++) {
-                        $s+= $sw[$x+$i];
-                    }
-
-                    // if the max width is < the width of the cell with colspan => we adapt the width of each max width
-                    if ($s>0 && $s<$cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['w']) {
-                        for ($i=0; $i<$corr[$y][$x][2]; $i++) {
-                            $sw[$x+$i] = $sw[$x+$i]/$s*$cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['w'];
-                        }
-                    }
-                }
-            }
-        }
-
-        // set the new width, for each cell
-        for ($x=0; $x<$amountCorr0; $x++) {
-            for ($y=0; $y<$amountCorr; $y++) {
-                if (isset($corr[$y][$x]) && is_array($corr[$y][$x])) {
-                    // without colspan
-                    if ($corr[$y][$x][2] == 1) {
-                        $cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['w'] = $sw[$x];
-                    // with colspan
-                    } else {
-                        $s = 0;
-                        for ($i=0; $i<$corr[$y][$x][2]; $i++) {
-                            $s+= $sw[$x+$i];
-                        }
-                        $cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['w'] = $s;
-                    }
-                }
-            }
-        }
-
-        // for each cell without rowspan, we get the max height for each line
-        $sh = array();
-        for ($y=0; $y<$amountCorr; $y++) {
-            $m=0;
-            for ($x=0; $x<$amountCorr0; $x++) {
-                if (isset($corr[$y][$x]) && is_array($corr[$y][$x]) && $corr[$y][$x][3] == 1) {
-                    $m = max($m, $cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['h']);
-                }
-            }
-            $sh[$y] = $m;
-        }
-
-        // for each cell with rowspan, we adapt the height of each line
-        for ($y=0; $y<$amountCorr; $y++) {
-            for ($x=0; $x<$amountCorr0; $x++) {
-                if (isset($corr[$y][$x]) && is_array($corr[$y][$x]) && $corr[$y][$x][3]>1) {
-
-                    // sum the max height of each line in rowspan
-                    $s = 0;
-                    for ($i=0; $i<$corr[$y][$x][3]; $i++) {
-                        $s+= isset($sh[$y+$i]) ? $sh[$y+$i] : 0;
-                    }
-
-                    // if the max height is < the height of the cell with rowspan => we adapt the height of each max height
-                    if ($s>0 && $s<$cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['h']) {
-                        for ($i=0; $i<$corr[$y][$x][3]; $i++) {
-                            $sh[$y+$i] = $sh[$y+$i]/$s*$cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['h'];
-                        }
-                    }
-                }
-            }
-        }
-
-        // set the new height, for each cell
-        for ($y=0; $y<$amountCorr; $y++) {
-            for ($x=0; $x<$amountCorr0; $x++) {
-                if (isset($corr[$y][$x]) && is_array($corr[$y][$x])) {
-                    // without rowspan
-                    if ($corr[$y][$x][3] == 1) {
-                        $cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['h'] = $sh[$y];
-                    // with rowspan
-                    } else {
-                        $s = 0;
-                        for ($i=0; $i<$corr[$y][$x][3]; $i++) {
-                            $s+= $sh[$y+$i];
-                        }
-                        $cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['h'] = $s;
-
-                        for ($j=1; $j<$corr[$y][$x][3]; $j++) {
-                            $tx = $x+1;
-                            $ty = $y+$j;
-                            for (true; isset($corr[$ty][$tx]) && !is_array($corr[$ty][$tx]);
-                            $tx++) {
-
-                            }
-                            if (isset($corr[$ty][$tx])) {
-                                $cases[$corr[$ty][$tx][1]][$corr[$ty][$tx][0]]['dw']+= $cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['w'];
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * tag : PAGE
-     * mode : OPEN
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_open_PAGE($param)
-    {
-        if ($this->_isForOneLine) {
-            return false;
-        }
-        if (!is_null($this->debug)) {
-            $this->debug->addStep('PAGE '.($this->_page+1), true);
-        }
-
-        $newPageSet= (!isset($param['pageset']) || $param['pageset'] !== 'old');
-
-        $resetPageNumber = (isset($param['pagegroup']) && $param['pagegroup'] === 'new');
-
-        if (array_key_exists('hideheader', $param) && $param['hideheader'] !== 'false' && !empty($param['hideheader'])) {
-            $this->_hideHeader = (array) array_merge($this->_hideHeader, explode(',', $param['hideheader']));
-        }
-
-        if (array_key_exists('hidefooter', $param) && $param['hidefooter'] !== 'false' && !empty($param['hidefooter'])) {
-            $this->_hideFooter = (array) array_merge($this->_hideFooter, explode(',', $param['hidefooter']));
-        }
-
-        $this->_maxH = 0;
-
-        // if new page set asked
-        if ($newPageSet) {
-            $this->_subHEADER = array();
-            $this->_subFOOTER = array();
-
-            // orientation
-            $orientation = '';
-            if (isset($param['orientation'])) {
-                $param['orientation'] = strtolower($param['orientation']);
-                if ($param['orientation'] === 'p') {
-                    $orientation = 'P';
-                }
-                if ($param['orientation'] === 'portrait') {
-                    $orientation = 'P';
-                }
-
-                if ($param['orientation'] === 'l') {
-                    $orientation = 'L';
-                }
-                if ($param['orientation'] === 'paysage') {
-                    $orientation = 'L';
-                }
-                if ($param['orientation'] === 'landscape') {
-                    $orientation = 'L';
-                }
-            }
-
-            // format
-            $format = null;
-            if (isset($param['format'])) {
-                $format = (string) $param['format'];
-                if (preg_match('/^([0-9]+)x([0-9]+)$/isU', $format, $match)) {
-                    $format = array((int)$match[1], (int)$match[2]);
-                }
-            }
-
-            // background
-            $background = array();
-            if (isset($param['backimg'])) {
-                $background['img']    = isset($param['backimg'])  ? $param['backimg']  : '';       // src of the image
-                $background['posX']   = isset($param['backimgx']) ? $param['backimgx'] : 'center'; // horizontal position of the image
-                $background['posY']   = isset($param['backimgy']) ? $param['backimgy'] : 'middle'; // vertical position of the image
-                $background['width']  = isset($param['backimgw']) ? $param['backimgw'] : '100%';   // width of the image (100% = page width)
-
-                // convert the src of the image, if parameters
-                $background['img'] = str_replace('&amp;', '&', $background['img']);
-
-                // convert the positions
-                if ($background['posX'] === 'left') {
-                    $background['posX'] = '0%';
-                }
-                if ($background['posX'] === 'center') {
-                    $background['posX'] = '50%';
-                }
-                if ($background['posX'] === 'right') {
-                    $background['posX'] = '100%';
-                }
-                if ($background['posY'] === 'top') {
-                    $background['posY'] = '0%';
-                }
-                if ($background['posY'] === 'middle') {
-                    $background['posY'] = '50%';
-                }
-                if ($background['posY'] === 'bottom') {
-                    $background['posY'] = '100%';
-                }
-
-                if ($background['img']) {
-                    // get the size of the image
-                    // WARNING : if URL, "allow_url_fopen" must turned to "on" in php.ini
-                    $infos=@getimagesize($background['img']);
-                    if (is_array($infos) && count($infos)>1) {
-                        $background['img'] = [
-                            'file'   => $background['img'],
-                            'width'  => (int) $infos[0],
-                            'height' => (int) $infos[1]
-                        ];
-                    } else {
-                        $background = array();
-                    }
-                } else {
-                    $background = array();
-                }
-            }
-
-            // margins of the page
-            $background['top']    = isset($param['backtop'])    ? $param['backtop']    : '0';
-            $background['bottom'] = isset($param['backbottom']) ? $param['backbottom'] : '0';
-            $background['left']   = isset($param['backleft'])   ? $param['backleft']   : '0';
-            $background['right']  = isset($param['backright'])  ? $param['backright']  : '0';
-
-            // if no unit => mm
-            if (preg_match('/^([0-9]*)$/isU', $background['top'])) {
-                $background['top']    .= 'mm';
-            }
-            if (preg_match('/^([0-9]*)$/isU', $background['bottom'])) {
-                $background['bottom'] .= 'mm';
-            }
-            if (preg_match('/^([0-9]*)$/isU', $background['left'])) {
-                $background['left']   .= 'mm';
-            }
-            if (preg_match('/^([0-9]*)$/isU', $background['right'])) {
-                $background['right']  .= 'mm';
-            }
-
-            // convert to mm
-            $background['top']    = $this->cssConverter->convertToMM($background['top'], $this->pdf->getH());
-            $background['bottom'] = $this->cssConverter->convertToMM($background['bottom'], $this->pdf->getH());
-            $background['left']   = $this->cssConverter->convertToMM($background['left'], $this->pdf->getW());
-            $background['right']  = $this->cssConverter->convertToMM($background['right'], $this->pdf->getW());
-
-            // get the background color
-            $res = false;
-            $background['color'] = isset($param['backcolor']) ? $this->cssConverter->convertToColor($param['backcolor'], $res) : null;
-            if (!$res) {
-                $background['color'] = null;
-            }
-
-            $this->parsingCss->save();
-            $this->parsingCss->analyse('PAGE', $param);
-            $this->parsingCss->setPosition();
-            $this->parsingCss->fontSet();
-
-            // new page
-            $this->_setNewPage($format, $orientation, $background, null, $resetPageNumber);
-
-            // automatic footer
-            if (isset($param['footer'])) {
-                $lst = explode(';', $param['footer']);
-                foreach ($lst as $key => $val) {
-                    $lst[$key] = trim(strtolower($val));
-                }
-                $page    = in_array('page', $lst);
-                $date    = in_array('date', $lst);
-                $time    = in_array('time', $lst);
-                $form    = in_array('form', $lst);
-            } else {
-                $page    = null;
-                $date    = null;
-                $time    = null;
-                $form    = null;
-            }
-            $this->pdf->SetMyFooter($page, $date, $time, $form);
-        // else => we use the last page set used
-        } else {
-            $this->parsingCss->save();
-            $this->parsingCss->analyse('PAGE', $param);
-            $this->parsingCss->setPosition();
-            $this->parsingCss->fontSet();
-
-            $this->_setNewPage(null, null, null, null, $resetPageNumber);
-        }
-
-        return true;
-    }
-
-    /**
-     * tag : PAGE
-     * mode : CLOSE
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_close_PAGE($param)
-    {
-        if ($this->_isForOneLine) {
-            return false;
-        }
-
-        $this->_maxH = 0;
-
-        $this->parsingCss->load();
-        $this->parsingCss->fontSet();
-
-        if (!is_null($this->debug)) {
-            $this->debug->addStep('PAGE '.$this->_page, false);
-        }
-
-        return true;
-    }
-
-    /**
-     * tag : PAGE_HEADER
-     * mode : OPEN
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_open_PAGE_HEADER($param)
-    {
-        if ($this->_isForOneLine) {
-            return false;
-        }
-
-        $amountHtmlCodes = count($this->parsingHtml->code);
-
-        $this->_subHEADER = array();
-        for ($this->_parsePos; $this->_parsePos<$amountHtmlCodes; $this->_parsePos++) {
-            $action = $this->parsingHtml->code[$this->_parsePos];
-            if ($action->getName() === 'page_header') {
-                $action->setName('page_header_sub');
-            }
-            $this->_subHEADER[] = $action;
-            if (strtolower($action->getName()) === 'page_header_sub' && $action->isClose()) {
-                break;
-            }
-        }
-
-        $this->_setPageHeader();
-
-        return true;
-    }
-
-    /**
-     * tag : PAGE_FOOTER
-     * mode : OPEN
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_open_PAGE_FOOTER($param)
-    {
-        if ($this->_isForOneLine) {
-            return false;
-        }
-
-        $amountHtmlCodes = count($this->parsingHtml->code);
-
-        $this->_subFOOTER = array();
-        for ($this->_parsePos; $this->_parsePos<$amountHtmlCodes; $this->_parsePos++) {
-            $action = $this->parsingHtml->code[$this->_parsePos];
-            if ($action->getName() === 'page_footer') {
-                $action->setName('page_footer_sub');
-            }
-            $this->_subFOOTER[] = $action;
-            if (strtolower($action->getName()) === 'page_footer_sub' && $action->isClose()) {
-                break;
-            }
-        }
-
-        $this->_setPageFooter();
-
-        return true;
-    }
-
-    /**
-     * It is not a real tag. Does not use it directly
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_open_PAGE_HEADER_SUB($param)
-    {
-        if ($this->_isForOneLine) {
-            return false;
-        }
-
-        // save the current stat
-        $this->_subSTATES = array();
-        $this->_subSTATES['x']  = $this->pdf->GetX();
-        $this->_subSTATES['y']  = $this->pdf->GetY();
-        $this->_subSTATES['s']  = $this->parsingCss->value;
-        $this->_subSTATES['t']  = $this->parsingCss->table;
-        $this->_subSTATES['ml'] = $this->_margeLeft;
-        $this->_subSTATES['mr'] = $this->_margeRight;
-        $this->_subSTATES['mt'] = $this->_margeTop;
-        $this->_subSTATES['mb'] = $this->_margeBottom;
-        $this->_subSTATES['mp'] = $this->_pageMarges;
-
-        // new stat for the header
-        $this->_pageMarges = array();
-        $this->_margeLeft    = $this->_defaultLeft;
-        $this->_margeRight   = $this->_defaultRight;
-        $this->_margeTop     = $this->_defaultTop;
-        $this->_margeBottom  = $this->_defaultBottom;
-        $this->pdf->SetMargins($this->_margeLeft, $this->_margeTop, $this->_margeRight);
-        $this->pdf->SetAutoPageBreak(false, $this->_margeBottom);
-        $this->pdf->SetXY($this->_defaultLeft, $this->_defaultTop);
-
-        $this->parsingCss->initStyle();
-        $this->parsingCss->resetStyle();
-        $this->parsingCss->value['width'] = $this->pdf->getW() - $this->_defaultLeft - $this->_defaultRight;
-        $this->parsingCss->table = array();
-
-        $this->parsingCss->save();
-        $this->parsingCss->analyse('page_header_sub', $param);
-        $this->parsingCss->setPosition();
-        $this->parsingCss->fontSet();
-        $this->_setNewPositionForNewLine();
-        return true;
-    }
-
-    /**
-     * It is not a real tag. Does not use it directly
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_close_PAGE_HEADER_SUB($param)
-    {
-        if ($this->_isForOneLine) {
-            return false;
-        }
-
-        $this->parsingCss->load();
-
-        // restore the stat
-        $this->parsingCss->value = $this->_subSTATES['s'];
-        $this->parsingCss->table = $this->_subSTATES['t'];
-        $this->_pageMarges       = $this->_subSTATES['mp'];
-        $this->_margeLeft        = $this->_subSTATES['ml'];
-        $this->_margeRight       = $this->_subSTATES['mr'];
-        $this->_margeTop         = $this->_subSTATES['mt'];
-        $this->_margeBottom      = $this->_subSTATES['mb'];
-        $this->pdf->SetMargins($this->_margeLeft, $this->_margeTop, $this->_margeRight);
-        $this->pdf->setbMargin($this->_margeBottom);
-        $this->pdf->SetAutoPageBreak(false, $this->_margeBottom);
-        $this->pdf->SetXY($this->_subSTATES['x'], $this->_subSTATES['y']);
-
-        $this->parsingCss->fontSet();
-        $this->_maxH = 0;
-
-        return true;
-    }
-
-    /**
-     * It is not a real tag. Does not use it directly
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_open_PAGE_FOOTER_SUB($param)
-    {
-        if ($this->_isForOneLine) {
-            return false;
-        }
-
-        // save the current stat
-        $this->_subSTATES = array();
-        $this->_subSTATES['x']    = $this->pdf->GetX();
-        $this->_subSTATES['y']    = $this->pdf->GetY();
-        $this->_subSTATES['s']    = $this->parsingCss->value;
-        $this->_subSTATES['t']    = $this->parsingCss->table;
-        $this->_subSTATES['ml']    = $this->_margeLeft;
-        $this->_subSTATES['mr']    = $this->_margeRight;
-        $this->_subSTATES['mt']    = $this->_margeTop;
-        $this->_subSTATES['mb']    = $this->_margeBottom;
-        $this->_subSTATES['mp']    = $this->_pageMarges;
-
-        // new stat for the footer
-        $this->_pageMarges  = array();
-        $this->_margeLeft   = $this->_defaultLeft;
-        $this->_margeRight  = $this->_defaultRight;
-        $this->_margeTop    = $this->_defaultTop;
-        $this->_margeBottom = $this->_defaultBottom;
-        $this->pdf->SetMargins($this->_margeLeft, $this->_margeTop, $this->_margeRight);
-        $this->pdf->SetAutoPageBreak(false, $this->_margeBottom);
-        $this->pdf->SetXY($this->_defaultLeft, $this->_defaultTop);
-
-        $this->parsingCss->initStyle();
-        $this->parsingCss->resetStyle();
-        $this->parsingCss->value['width']    = $this->pdf->getW() - $this->_defaultLeft - $this->_defaultRight;
-        $this->parsingCss->table                = array();
-
-        // we create a sub HTML2PFDF, and we execute on it the content of the footer, to get the height of it
-        $sub = $this->createSubHTML();
-        $sub->parsingHtml->code = $this->parsingHtml->getLevel($this->_parsePos);
-        $sub->_makeHTMLcode();
-        $this->pdf->SetY($this->pdf->getH() - $sub->_maxY - $this->_defaultBottom - 0.01);
-        $this->_destroySubHTML($sub);
-
-        $this->parsingCss->save();
-        $this->parsingCss->analyse('page_footer_sub', $param);
-        $this->parsingCss->setPosition();
-        $this->parsingCss->fontSet();
-        $this->_setNewPositionForNewLine();
-
-        return true;
-    }
-
-    /**
-     * It is not a real tag. Do not use it directly
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_close_PAGE_FOOTER_SUB($param)
-    {
-        if ($this->_isForOneLine) {
-            return false;
-        }
-
-        $this->parsingCss->load();
-
-        $this->parsingCss->value                = $this->_subSTATES['s'];
-        $this->parsingCss->table                = $this->_subSTATES['t'];
-        $this->_pageMarges                 = $this->_subSTATES['mp'];
-        $this->_margeLeft                = $this->_subSTATES['ml'];
-        $this->_margeRight                = $this->_subSTATES['mr'];
-        $this->_margeTop                    = $this->_subSTATES['mt'];
-        $this->_margeBottom                = $this->_subSTATES['mb'];
-        $this->pdf->SetMargins($this->_margeLeft, $this->_margeTop, $this->_margeRight);
-        $this->pdf->SetAutoPageBreak(false, $this->_margeBottom);
-        $this->pdf->SetXY($this->_subSTATES['x'], $this->_subSTATES['y']);
-
-        $this->parsingCss->fontSet();
-        $this->_maxH = 0;
-
-        return true;
-    }
-
-    /**
-     * tag : NOBREAK
-     * mode : OPEN
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_open_NOBREAK($param)
-    {
-        if ($this->_isForOneLine) {
-            return false;
-        }
-
-        $this->_maxH = 0;
-
-        // create a sub Html2Pdf to execute the content of the tag, to get the dimensions
-        $sub = $this->createSubHTML();
-        $sub->parsingHtml->code = $this->parsingHtml->getLevel($this->_parsePos);
-        $sub->_makeHTMLcode();
-        $y = $this->pdf->GetY();
-
-        // if the content does not fit on the page => new page
-        if ($sub->_maxY < ($this->pdf->getH() - $this->pdf->gettMargin()-$this->pdf->getbMargin()) &&
-            $y + $sub->_maxY>=($this->pdf->getH() - $this->pdf->getbMargin())
-        ) {
-            $this->_setNewPage();
-        }
-
-        // destroy the sub Html2Pdf
-        $this->_destroySubHTML($sub);
-
-        return true;
-    }
-
-
-    /**
-     * tag : NOBREAK
-     * mode : CLOSE
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_close_NOBREAK($param)
-    {
-        if ($this->_isForOneLine) {
-            return false;
-        }
-
-        $this->_maxH = 0;
-
-        return true;
-    }
-
-    /**
-     * tag : DIV
-     * mode : OPEN
-     *
-     * @param  array $param
-     * @param  string $other name of tag that used the div tag
-     * @return boolean
-     */
-    protected function _tag_open_DIV($param, $other = 'div')
-    {
-        if ($this->_isForOneLine) {
-            return false;
-        }
-
-        if (!is_null($this->debug)) {
-            $this->debug->addStep(strtoupper($other), true);
-        }
-
-        $this->parsingCss->save();
-        $this->parsingCss->analyse($other, $param);
-        $this->parsingCss->fontSet();
-
-        // for fieldset and legend
-        if (in_array($other, array('fieldset', 'legend'))) {
-            if (isset($param['moveTop'])) {
-                $this->parsingCss->value['margin']['t']    += $param['moveTop'];
-            }
-            if (isset($param['moveLeft'])) {
-                $this->parsingCss->value['margin']['l']    += $param['moveLeft'];
-            }
-            if (isset($param['moveDown'])) {
-                $this->parsingCss->value['margin']['b']    += $param['moveDown'];
-            }
-        }
-
-        $alignObject = null;
-        if ($this->parsingCss->value['margin-auto']) {
-            $alignObject = 'center';
-        }
-
-        $marge = array();
-        $marge['l'] = $this->parsingCss->value['border']['l']['width'] + $this->parsingCss->value['padding']['l']+0.03;
-        $marge['r'] = $this->parsingCss->value['border']['r']['width'] + $this->parsingCss->value['padding']['r']+0.03;
-        $marge['t'] = $this->parsingCss->value['border']['t']['width'] + $this->parsingCss->value['padding']['t']+0.03;
-        $marge['b'] = $this->parsingCss->value['border']['b']['width'] + $this->parsingCss->value['padding']['b']+0.03;
-
-        // extract the content of the div
-        $level = $this->parsingHtml->getLevel($this->_parsePos);
-
-        // create a sub Html2Pdf to get the dimensions of the content of the div
-        $w = 0;
-        $h = 0;
-        if (count($level)) {
-            $sub = $this->createSubHTML();
-            $sub->parsingHtml->code = $level;
-            $sub->_makeHTMLcode();
-            $w = $sub->_maxX;
-            $h = $sub->_maxY;
-            $this->_destroySubHTML($sub);
-        }
-        $wReel = $w;
-        $hReel = $h;
-
-        $w+= $marge['l']+$marge['r']+0.001;
-        $h+= $marge['t']+$marge['b']+0.001;
-
-        if ($this->parsingCss->value['overflow'] === 'hidden') {
-            $overW = max($w, $this->parsingCss->value['width']);
-            $overH = max($h, $this->parsingCss->value['height']);
-            $overflow = true;
-            $this->parsingCss->value['old_maxX'] = $this->_maxX;
-            $this->parsingCss->value['old_maxY'] = $this->_maxY;
-            $this->parsingCss->value['old_maxH'] = $this->_maxH;
-            $this->parsingCss->value['old_overflow'] = $this->_isInOverflow;
-            $this->_isInOverflow = true;
-        } else {
-            $overW = null;
-            $overH = null;
-            $overflow = false;
-            $this->parsingCss->value['width']  = max($w, $this->parsingCss->value['width']);
-            $this->parsingCss->value['height'] = max($h, $this->parsingCss->value['height']);
-        }
-
-        switch ($this->parsingCss->value['rotate']) {
-            case 90:
-                $tmp = $overH;
-                $overH = $overW;
-                $overW = $tmp;
-                $tmp = $hReel;
-                $hReel = $wReel;
-                $wReel = $tmp;
-                unset($tmp);
-                $w = $this->parsingCss->value['height'];
-                $h = $this->parsingCss->value['width'];
-                $tX =-$h;
-                $tY = 0;
-                break;
-
-            case 180:
-                $w = $this->parsingCss->value['width'];
-                $h = $this->parsingCss->value['height'];
-                $tX = -$w;
-                $tY = -$h;
-                break;
-
-            case 270:
-                $tmp = $overH;
-                $overH = $overW;
-                $overW = $tmp;
-                $tmp = $hReel;
-                $hReel = $wReel;
-                $wReel = $tmp;
-                unset($tmp);
-                $w = $this->parsingCss->value['height'];
-                $h = $this->parsingCss->value['width'];
-                $tX = 0;
-                $tY =-$w;
-                break;
-
-            default:
-                $w = $this->parsingCss->value['width'];
-                $h = $this->parsingCss->value['height'];
-                $tX = 0;
-                $tY = 0;
-                break;
-        }
-
-        $maxW = ($this->pdf->getW() - $this->pdf->getlMargin()-$this->pdf->getrMargin());
-        $maxH = ($this->pdf->getH() - $this->pdf->gettMargin()-$this->pdf->getbMargin());
-        $maxX = ($this->pdf->getW() - $this->pdf->getrMargin());
-        $maxY = ($this->pdf->getH() - $this->pdf->getbMargin());
-        $endX = ($this->pdf->GetX() + $w);
-        $endY = ($this->pdf->GetY() + $h);
-
-        $w = round($w, 6);
-        $h = round($h, 6);
-        $maxW = round($maxW, 6);
-        $maxH = round($maxH, 6);
-        $maxX = round($maxX, 6);
-        $maxY = round($maxY, 6);
-        $endX = round($endX, 6);
-        $endY = round($endY, 6);
-
-        if ($this->parsingCss->value['page-break-before'] == "always") {
-            $this->_setNewPage();
-        }
-
-        if (!$this->parsingCss->value['position']) {
-            if ($w < $maxW && $endX >= $maxX) {
-                $this->_tag_open_BR(array());
-            }
-
-            if ($h < $maxH && $endY >= $maxY && !$this->_isInOverflow) {
-                $this->_setNewPage();
-            }
-
-            $old = $this->parsingCss->getOldValues();
-            $parentWidth = $old['width'] ? $old['width'] : $this->pdf->getW() - $this->pdf->getlMargin() - $this->pdf->getrMargin();
-
-            if ($parentWidth>$w) {
-                if ($alignObject === 'center') {
-                    $this->pdf->SetX($this->pdf->GetX() + ($parentWidth-$w)*0.5);
-                } elseif ($alignObject === 'right') {
-                    $this->pdf->SetX($this->pdf->GetX() + $parentWidth-$w);
-                }
-            }
-
-            $this->parsingCss->setPosition();
-        } else {
-            $old = $this->parsingCss->getOldValues();
-            $parentWidth = $old['width'] ? $old['width'] : $this->pdf->getW() - $this->pdf->getlMargin() - $this->pdf->getrMargin();
-
-            if ($parentWidth>$w) {
-                if ($alignObject === 'center') {
-                    $this->pdf->SetX($this->pdf->GetX() + ($parentWidth-$w)*0.5);
-                } elseif ($alignObject === 'right') {
-                    $this->pdf->SetX($this->pdf->GetX() + $parentWidth-$w);
-                }
-            }
-
-            $this->parsingCss->setPosition();
-            $this->_saveMax();
-            $this->_maxX = 0;
-            $this->_maxY = 0;
-            $this->_maxH = 0;
-            $this->_maxE = 0;
-        }
-
-        if ($this->parsingCss->value['rotate']) {
-            $this->pdf->startTransform();
-            $this->pdf->setRotation($this->parsingCss->value['rotate']);
-            $this->pdf->setTranslate($tX, $tY);
-        }
-
-        $this->_drawRectangle(
-            $this->parsingCss->value['x'],
-            $this->parsingCss->value['y'],
-            $this->parsingCss->value['width'],
-            $this->parsingCss->value['height'],
-            $this->parsingCss->value['border'],
-            $this->parsingCss->value['padding'],
-            0,
-            $this->parsingCss->value['background']
-        );
-
-        $marge = array();
-        $marge['l'] = $this->parsingCss->value['border']['l']['width'] + $this->parsingCss->value['padding']['l']+0.03;
-        $marge['r'] = $this->parsingCss->value['border']['r']['width'] + $this->parsingCss->value['padding']['r']+0.03;
-        $marge['t'] = $this->parsingCss->value['border']['t']['width'] + $this->parsingCss->value['padding']['t']+0.03;
-        $marge['b'] = $this->parsingCss->value['border']['b']['width'] + $this->parsingCss->value['padding']['b']+0.03;
-
-        $this->parsingCss->value['width'] -= $marge['l']+$marge['r'];
-        $this->parsingCss->value['height']-= $marge['t']+$marge['b'];
-
-        $xCorr = 0;
-        $yCorr = 0;
-        if (!$this->_subPart && !$this->_isSubPart) {
-            switch ($this->parsingCss->value['text-align']) {
-                case 'right':
-                    $xCorr = ($this->parsingCss->value['width']-$wReel);
-                    break;
-                case 'center':
-                    $xCorr = ($this->parsingCss->value['width']-$wReel)*0.5;
-                    break;
-            }
-            if ($xCorr>0) {
-                $xCorr=0;
-            }
-            switch ($this->parsingCss->value['vertical-align']) {
-                case 'bottom':
-                    $yCorr = ($this->parsingCss->value['height']-$hReel);
-                    break;
-                case 'middle':
-                    $yCorr = ($this->parsingCss->value['height']-$hReel)*0.5;
-                    break;
-            }
-        }
-
-        if ($overflow) {
-            $overW-= $marge['l']+$marge['r'];
-            $overH-= $marge['t']+$marge['b'];
-            $this->pdf->clippingPathStart(
-                $this->parsingCss->value['x']+$marge['l'],
-                $this->parsingCss->value['y']+$marge['t'],
-                $this->parsingCss->value['width'],
-                $this->parsingCss->value['height']
-            );
-
-            $this->parsingCss->value['x']+= $xCorr;
-
-            // marges from the dimension of the content
-            $mL = $this->parsingCss->value['x']+$marge['l'];
-            $mR = $this->pdf->getW() - $mL - $overW;
-        } else {
-            // marges from the dimension of the div
-            $mL = $this->parsingCss->value['x']+$marge['l'];
-            $mR = $this->pdf->getW() - $mL - $this->parsingCss->value['width'];
-        }
-
-        $x = $this->parsingCss->value['x']+$marge['l'];
-        $y = $this->parsingCss->value['y']+$marge['t']+$yCorr;
-        $this->_saveMargin($mL, 0, $mR);
-        $this->pdf->SetXY($x, $y);
-
-        $this->_setNewPositionForNewLine();
-
-        return true;
-    }
-
-    /**
-     * tag : BLOCKQUOTE
-     * mode : OPEN
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_open_BLOCKQUOTE($param)
-    {
-        return $this->_tag_open_DIV($param, 'blockquote');
-    }
-
-    /**
-     * tag : LEGEND
-     * mode : OPEN
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_open_LEGEND($param)
-    {
-        return $this->_tag_open_DIV($param, 'legend');
-    }
-
-    /**
-     * tag : FIELDSET
-     * mode : OPEN
-     *
-     * @author Pavel Kochman
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_open_FIELDSET($param)
-    {
-
-        $this->parsingCss->save();
-        $this->parsingCss->analyse('fieldset', $param);
-
-        $amountHtmlCodes = count($this->parsingHtml->code);
-
-        // get height of LEGEND element and make fieldset corrections
-        for ($tempPos = $this->_parsePos + 1; $tempPos<$amountHtmlCodes; $tempPos++) {
-            $action = $this->parsingHtml->code[$tempPos];
-            if ($action->getName() === 'fieldset') {
-                break;
-            }
-            if ($action->getName() === 'legend' && !$action->isClose()) {
-                $legendOpenPos = $tempPos;
-
-                $sub = $this->createSubHTML();
-                $sub->parsingHtml->code = $this->parsingHtml->getLevel($tempPos - 1);
-
-                $amountSubHtmlCodes = count($sub->parsingHtml->code);
-                $res = null;
-                for ($sub->_parsePos = 0; $sub->_parsePos<$amountSubHtmlCodes; $sub->_parsePos++) {
-                    $action = $sub->parsingHtml->code[$sub->_parsePos];
-                    $sub->_executeAction($action);
-
-                    if ($action->getName() === 'legend' && $action->isClose()) {
-                        break;
-                    }
-                }
-
-                $legendH = $sub->_maxY;
-                $this->_destroySubHTML($sub);
-
-                $move = $this->parsingCss->value['padding']['t'] + $this->parsingCss->value['border']['t']['width'] + 0.03;
-
-                $param['moveTop'] = $legendH / 2;
-
-                $node = $this->parsingHtml->code[$legendOpenPos];
-                $node->setParam('moveTop', - ($legendH / 2 + $move));
-                $node->setParam('moveLeft', 2 - $this->parsingCss->value['border']['l']['width'] - $this->parsingCss->value['padding']['l']);
-                $node->setParam('moveDown', $move);
-                break;
-            }
-        }
-        $this->parsingCss->load();
-
-        return $this->_tag_open_DIV($param, 'fieldset');
-    }
-
-    /**
-     * tag : DIV
-     * mode : CLOSE
-     *
-     * @param  array $param
-     * @param  string $other name of tag that used the div tag
-     * @return boolean
-     */
-    protected function _tag_close_DIV($param, $other = 'div')
-    {
-        if ($this->_isForOneLine) {
-            return false;
-        }
-
-        if ($this->parsingCss->value['overflow'] === 'hidden') {
-            $this->_maxX = $this->parsingCss->value['old_maxX'];
-            $this->_maxY = $this->parsingCss->value['old_maxY'];
-            $this->_maxH = $this->parsingCss->value['old_maxH'];
-            $this->_isInOverflow = $this->parsingCss->value['old_overflow'];
-            $this->pdf->clippingPathStop();
-        }
-
-        if ($this->parsingCss->value['rotate']) {
-            $this->pdf->stopTransform();
-        }
-
-        $marge = array();
-        $marge['l'] = $this->parsingCss->value['border']['l']['width'] + $this->parsingCss->value['padding']['l']+0.03;
-        $marge['r'] = $this->parsingCss->value['border']['r']['width'] + $this->parsingCss->value['padding']['r']+0.03;
-        $marge['t'] = $this->parsingCss->value['border']['t']['width'] + $this->parsingCss->value['padding']['t']+0.03;
-        $marge['b'] = $this->parsingCss->value['border']['b']['width'] + $this->parsingCss->value['padding']['b']+0.03;
-
-        $x = $this->parsingCss->value['x'];
-        $y = $this->parsingCss->value['y'];
-        $w = $this->parsingCss->value['width']+$marge['l']+$marge['r']+$this->parsingCss->value['margin']['r'];
-        $h = $this->parsingCss->value['height']+$marge['t']+$marge['b']+$this->parsingCss->value['margin']['b'];
-
-        switch ($this->parsingCss->value['rotate']) {
-            case 90:
-                $t = $w;
-                $w = $h;
-                $h = $t;
-                break;
-
-            case 270:
-                $t = $w;
-                $w = $h;
-                $h = $t;
-                break;
-
-            default:
-                break;
-        }
-
-
-        if ($this->parsingCss->value['position'] !== 'absolute') {
-            $this->pdf->SetXY($x+$w, $y);
-
-            $this->_maxX = max($this->_maxX, $x+$w);
-            $this->_maxY = max($this->_maxY, $y+$h);
-            $this->_maxH = max($this->_maxH, $h);
-        } else {
-            $this->pdf->SetXY($this->parsingCss->value['xc'], $this->parsingCss->value['yc']);
-
-            $this->_loadMax();
-        }
-
-        $newLineAfter = ($this->parsingCss->value['display'] !== 'inline' && $this->parsingCss->value['position'] !== 'absolute');
-        $newPageAfter = ($this->parsingCss->value['page-break-after'] == "always");
-
-        $this->parsingCss->load();
-        $this->parsingCss->fontSet();
-        $this->_loadMargin();
-
-        if ($newPageAfter) {
-            $this->_setNewPage();
-        } elseif ($newLineAfter) {
-            $this->_tag_open_BR(array());
-        }
-
-        if (!is_null($this->debug)) {
-            $this->debug->addStep(strtoupper($other), false);
-        }
-
-        return true;
-    }
-
-    /**
-     * tag : BLOCKQUOTE
-     * mode : CLOSE
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_close_BLOCKQUOTE($param)
-    {
-        return $this->_tag_close_DIV($param, 'blockquote');
-    }
-
-    /**
-     * tag : FIELDSET
-     * mode : CLOSE
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_close_FIELDSET($param)
-    {
-        return $this->_tag_close_DIV($param, 'fieldset');
-    }
-
-    /**
-     * tag : LEGEND
-     * mode : CLOSE
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_close_LEGEND($param)
-    {
-        return $this->_tag_close_DIV($param, 'legend');
-    }
-
-    /**
-     * tag : BARCODE
-     * mode : OPEN
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_open_BARCODE($param)
-    {
-        if (!isset($param['type'])) {
-            $param['type'] = 'C39';
-        }
-        if (!isset($param['value'])) {
-            $param['value']    = 0;
-        }
-        if (!isset($param['label'])) {
-            $param['label']    = 'label';
-        }
-        if (!isset($param['style']['color'])) {
-            $param['style']['color'] = '#000000';
-        }
-
-        $param['type'] = strtoupper($param['type']);
-        if (!isset($param['dimension'])) {
-            $param['dimension'] = '1D';
-        }
-
-        $this->parsingCss->save();
-        $this->parsingCss->analyse('barcode', $param);
-        $this->parsingCss->setPosition();
-        $this->parsingCss->fontSet();
-
-        $x = $this->pdf->GetX();
-        $y = $this->pdf->GetY();
-        $w = $this->parsingCss->value['width'];
-        if (!$w) {
-            $w = $this->cssConverter->convertToMM('50mm');
-        }
-        $h = $this->parsingCss->value['height'];
-        if (!$h) {
-            $h = $this->cssConverter->convertToMM('10mm');
-        }
-        $txt = ($param['label'] !== 'none' ? $this->parsingCss->value['font-size'] : false);
-        $c = $this->parsingCss->value['color'];
-        $infos = $this->pdf->myBarcode($param['value'], $param['type'], $x, $y, $w, $h, $txt, $c, $param['dimension']);
-
-        $this->_maxX = max($this->_maxX, $x+$infos[0]);
-        $this->_maxY = max($this->_maxY, $y+$infos[1]);
-        $this->_maxH = max($this->_maxH, $infos[1]);
-        $this->_maxE++;
-
-        $this->pdf->SetXY($x+$infos[0], $y);
-
-        $this->parsingCss->load();
-        $this->parsingCss->fontSet();
-
-        return true;
-    }
-
-    /**
-     * tag : BARCODE
-     * mode : CLOSE
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_close_BARCODE($param)
-    {
-        // there is nothing to do here
-
-        return true;
-    }
-
-    /**
-     * tag : QRCODE
-     * mode : OPEN
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_open_QRCODE($param)
-    {
-        if (!is_null($this->debug)) {
-            $this->debug->addStep('QRCODE');
-        }
-
-        if (!isset($param['value'])) {
-            $param['value'] = '';
-        }
-        if (!isset($param['ec'])) {
-            $param['ec'] = 'H';
-        }
-        if (!isset($param['style']['color'])) {
-            $param['style']['color'] = '#000000';
-        }
-        if (!isset($param['style']['background-color'])) {
-            $param['style']['background-color'] = '#FFFFFF';
-        }
-        if (isset($param['style']['border'])) {
-            $borders = $param['style']['border'] !== 'none';
-            unset($param['style']['border']);
-        } else {
-            $borders = true;
-        }
-
-        if ($param['value'] === '') {
-            return true;
-        }
-        if (!in_array($param['ec'], array('L', 'M', 'Q', 'H'))) {
-            $param['ec'] = 'H';
-        }
-
-        $this->parsingCss->save();
-        $this->parsingCss->analyse('qrcode', $param);
-        $this->parsingCss->setPosition();
-        $this->parsingCss->fontSet();
-
-        $x = $this->pdf->GetX();
-        $y = $this->pdf->GetY();
-        $w = $this->parsingCss->value['width'];
-        $h = $this->parsingCss->value['height'];
-        $size = max($w, $h);
-        if (!$size) {
-            $size = $this->cssConverter->convertToMM('50mm');
-        }
-
-        $style = array(
-                'fgcolor' => $this->parsingCss->value['color'],
-                'bgcolor' => $this->parsingCss->value['background']['color'],
-            );
-
-        if ($borders) {
-            $style['border'] = true;
-            $style['padding'] = 'auto';
-        } else {
-            $style['border'] = false;
-            $style['padding'] = 0;
-        }
-
-        if (!$this->_subPart && !$this->_isSubPart) {
-            $this->pdf->write2DBarcode($param['value'], 'QRCODE,'.$param['ec'], $x, $y, $size, $size, $style);
-        }
-
-        $this->_maxX = max($this->_maxX, $x+$size);
-        $this->_maxY = max($this->_maxY, $y+$size);
-        $this->_maxH = max($this->_maxH, $size);
-        $this->_maxE++;
-
-        $this->pdf->SetX($x+$size);
-
-        $this->parsingCss->load();
-        $this->parsingCss->fontSet();
-
-        return true;
-    }
-
-    /**
-     * tag : QRCODE
-     * mode : CLOSE
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_close_QRCODE($param)
-    {
-        // there is nothing to do here
-
-        return true;
-    }
-
-    /**
-     * this is not a real TAG, it is just to write texts
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_open_WRITE($param)
-    {
-        $fill = ($this->parsingCss->value['background']['color'] !== null && $this->parsingCss->value['background']['image'] === null);
-        if (in_array($this->parsingCss->value['id_tag'], array('fieldset', 'legend', 'div', 'table', 'tr', 'td', 'th'))) {
-            $fill = false;
-        }
-
-        // get the text to write
-        $txt = $param['txt'];
-
-        if ($this->_isAfterFloat) {
-            $txt = ltrim($txt);
-            $this->_isAfterFloat = false;
-        }
-
-        $txt = str_replace('[[page_nb]]', $this->pdf->getMyAliasNbPages(), $txt);
-        $txt = str_replace('[[page_cu]]', $this->pdf->getMyNumPage($this->_page), $txt);
-
-        if ($this->parsingCss->value['text-transform'] !== 'none') {
-            if ($this->parsingCss->value['text-transform'] === 'capitalize') {
-                $txt = mb_convert_case($txt, MB_CASE_TITLE, $this->_encoding);
-            } elseif ($this->parsingCss->value['text-transform'] === 'uppercase') {
-                $txt = mb_convert_case($txt, MB_CASE_UPPER, $this->_encoding);
-            } elseif ($this->parsingCss->value['text-transform'] === 'lowercase') {
-                $txt = mb_convert_case($txt, MB_CASE_LOWER, $this->_encoding);
-            }
-        }
-
-        // size of the text
-        $h  = 1.08*$this->parsingCss->value['font-size'];
-        $dh = $h*$this->parsingCss->value['mini-decal'];
-        $lh = $this->parsingCss->getLineHeight();
-
-        // identify the align
-        $align = 'L';
-        if ($this->parsingCss->value['text-align'] === 'li_right') {
-            $w = $this->parsingCss->value['width'];
-            $align = 'R';
-        }
-
-        // calculate the width of each words, and of all the sentence
-        $w = 0;
-        $words = explode(' ', $txt);
-        foreach ($words as $k => $word) {
-            $words[$k] = array($word, $this->pdf->GetStringWidth($word));
-            $w+= $words[$k][1];
-        }
-        $space = $this->pdf->GetStringWidth(' ');
-        $w+= $space*(count($words)-1);
-
-        // position in the text
-        $currPos = 0;
-
-        // the bigger width of the text, after automatic break line
-        $maxX = 0;
-
-        // position of the text
-        $x = $this->pdf->GetX();
-        $y = $this->pdf->GetY();
-        $dy = $this->_getElementY($lh);
-
-        // margins
-        list($left, $right) = $this->_getMargins($y);
-
-        // number of lines after automatic break line
-        $nb = 0;
-
-        // while we have words, and the text does not fit on the line => we cut the sentence
-        while ($x+$w>$right && $x<$right+$space && count($words)) {
-            // adding words 1 by 1 to fit on the line
-            $i=0;
-            $old = array('', 0);
-            $str = $words[0];
-            $add = false;
-            while (($x+$str[1])<$right) {
-                $i++;
-                $add = true;
-
-                array_shift($words);
-                $old = $str;
-
-                if (!count($words)) {
-                    break;
-                }
-                $str[0].= ' '.$words[0][0];
-                $str[1]+= $space+$words[0][1];
-            }
-            $str = $old;
-
-            // if nothing fits on the line, and if the first word does not fit on the line => the word is too long, we put it
-            if ($i == 0 && (($left+$words[0][1])>=$right)) {
-                $str = $words[0];
-                array_shift($words);
-                $i++;
-                $add = true;
-            }
-            $currPos+= ($currPos ? 1 : 0)+strlen($str[0]);
-
-            // write the extract sentence that fit on the page
-            $wc = ($align === 'L' ? $str[1] : $this->parsingCss->value['width']);
-            if ($right - $left<$wc) {
-                $wc = $right - $left;
-            }
-
-            if (strlen($str[0])) {
-                $this->pdf->SetXY($this->pdf->GetX(), $y+$dh+$dy);
-                $this->pdf->Cell($wc, $h, $str[0], 0, 0, $align, $fill, $this->_isInLink);
-                $this->pdf->SetXY($this->pdf->GetX(), $y);
-            }
-            $this->_maxH = max($this->_maxH, $lh);
-
-            // max width
-            $maxX = max($maxX, $this->pdf->GetX());
-
-            // new position and new width for the "while"
-            $w-= $str[1];
-            $y = $this->pdf->GetY();
-            $x = $this->pdf->GetX();
-            $dy = $this->_getElementY($lh);
-
-            // if we have again words to write
-            if (count($words)) {
-                // remove the space at the end
-                if ($add) {
-                    $w-= $space;
-                }
-
-                // if we don't add any word, and if the first word is empty => useless space to skip
-                if (!$add && $words[0][0] === '') {
-                    array_shift($words);
-                }
-
-                // if it is just to calculate for one line => adding the number of words
-                if ($this->_isForOneLine) {
-                    $this->_maxE+= $i;
-                    $this->_maxX = max($this->_maxX, $maxX);
-                    return null;
-                }
-
-                // automatic line break
-                $this->_tag_open_BR(array('style' => ''), $currPos);
-
-                // new position
-                $y = $this->pdf->GetY();
-                $x = $this->pdf->GetX();
-                $dy = $this->_getElementY($lh);
-
-                // if the next line does  not fit on the page => new page
-                if ($y + $h>=$this->pdf->getH() - $this->pdf->getbMargin()) {
-                    if (!$this->_isInOverflow && !$this->_isInFooter) {
-                        $this->_setNewPage(null, '', null, $currPos);
-                        $y = $this->pdf->GetY();
-                        $x = $this->pdf->GetX();
-                        $dy = $this->_getElementY($lh);
-                    }
-                }
-
-                // if more than X line => error
-                $nb++;
-                if ($nb > $this->_sentenceMaxLines) {
-                    $txt = '';
-                    foreach ($words as $k => $word) {
-                        $txt.= ($k ? ' ' : '').$word[0];
-                    }
-                    $e = new LongSentenceException(
-                        'The current sentence takes more than '.$this->_sentenceMaxLines.' lines is the current box'
-                    );
-                    $e->setSentence($txt);
-                    $e->setWidthBox($right-$left);
-                    $e->setLength($w);
-                    throw $e;
-                }
-
-                // new margins for the new line
-                list($left, $right) = $this->_getMargins($y);
-            }
-        }
-
-        // if we have words after automatic cut, it is because they fit on the line => we write the text
-        if (count($words)) {
-            $txt = '';
-            foreach ($words as $k => $word) {
-                $txt.= ($k ? ' ' : '').$word[0];
-            }
-            $w+= $this->pdf->getWordSpacing()*(count($words));
-            $this->pdf->SetXY($this->pdf->GetX(), $y+$dh+$dy);
-            $this->pdf->Cell(($align === 'L' ? $w : $this->parsingCss->value['width']), $h, $txt, 0, 0, $align, $fill, $this->_isInLink);
-            $this->pdf->SetXY($this->pdf->GetX(), $y);
-            $this->_maxH = max($this->_maxH, $lh);
-            $this->_maxE+= count($words);
-        }
-
-        $maxX = max($maxX, $this->pdf->GetX());
-        $maxY = $this->pdf->GetY()+$h;
-
-        $this->_maxX = max($this->_maxX, $maxX);
-        $this->_maxY = max($this->_maxY, $maxY);
-
-        return true;
-    }
-
-    /**
-     * tag : BR
-     * mode : OPEN
-     *
-     * @param  array   $param
-     * @param  integer $curr real position in the html parseur (if break line in the write of a text)
-     * @return boolean
-     */
-    protected function _tag_open_BR($param, $curr = null)
-    {
-        if ($this->_isForOneLine) {
-            return false;
-        }
-
-        $h = max($this->_maxH, $this->parsingCss->getLineHeight());
-
-        if ($this->_maxH == 0) {
-            $this->_maxY = max($this->_maxY, $this->pdf->GetY()+$h);
-        }
-
-        $this->_makeBreakLine($h, $curr);
-
-        $this->_maxH = 0;
-        $this->_maxE = 0;
-
-        return true;
-    }
-
-    /**
-     * tag : HR
-     * mode : OPEN
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_open_HR($param)
-    {
-        if ($this->_isForOneLine) {
-            return false;
-        }
-        $oldAlign = $this->parsingCss->value['text-align'];
-        $this->parsingCss->value['text-align'] = 'left';
-
-        if ($this->_maxH) {
-            $this->_tag_open_BR($param);
-        }
-
-        $fontSize = $this->parsingCss->value['font-size'];
-        $this->parsingCss->value['font-size']=$fontSize*0.5;
-        $this->_tag_open_BR($param);
-        $this->parsingCss->value['font-size']=$fontSize;
-
-        $param['style']['width'] = '100%';
-
-        $this->parsingCss->save();
-        $this->parsingCss->value['height']=$this->cssConverter->convertToMM('1mm');
-
-        $this->parsingCss->analyse('hr', $param);
-        $this->parsingCss->setPosition();
-        $this->parsingCss->fontSet();
-
-        $h = $this->parsingCss->value['height'];
-        if ($h) {
-            $h-= $this->parsingCss->value['border']['t']['width']+$this->parsingCss->value['border']['b']['width'];
-        }
-        if ($h<=0) {
-            $h = $this->parsingCss->value['border']['t']['width']+$this->parsingCss->value['border']['b']['width'];
-        }
-
-        $this->_drawRectangle($this->pdf->GetX(), $this->pdf->GetY(), $this->parsingCss->value['width'], $h, $this->parsingCss->value['border'], 0, 0, $this->parsingCss->value['background']);
-        $this->_maxH = $h;
-
-        $this->parsingCss->load();
-        $this->parsingCss->fontSet();
-
-        $this->parsingCss->value['font-size'] = 0;
-        $this->_tag_open_BR($param);
-
-        $this->parsingCss->value['font-size']=$fontSize*0.5;
-        $this->_tag_open_BR($param);
-        $this->parsingCss->value['font-size']=$fontSize;
-
-        $this->parsingCss->value['text-align'] = $oldAlign;
-        $this->_setNewPositionForNewLine();
-
-        return true;
-    }
-
-    /**
-     * tag : A
-     * mode : OPEN
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_open_A($param)
-    {
-        $this->_isInLink = str_replace('&amp;', '&', isset($param['href']) ? $param['href'] : '');
-
-        if (isset($param['name'])) {
-            $name =     $param['name'];
-            if (!isset($this->_lstAnchor[$name])) {
-                $this->_lstAnchor[$name] = array($this->pdf->AddLink(), false);
-            }
-
-            if (!$this->_lstAnchor[$name][1]) {
-                $this->_lstAnchor[$name][1] = true;
-                $this->pdf->SetLink($this->_lstAnchor[$name][0], -1, -1);
-            }
-        }
-
-        if (preg_match('/^#([^#]+)$/isU', $this->_isInLink, $match)) {
-            $name = $match[1];
-            if (!isset($this->_lstAnchor[$name])) {
-                $this->_lstAnchor[$name] = array($this->pdf->AddLink(), false);
-            }
-
-            $this->_isInLink = $this->_lstAnchor[$name][0];
-        }
-
-        $this->parsingCss->save();
-        $this->parsingCss->value['font-underline'] = true;
-        $this->parsingCss->value['color'] = array(20, 20, 250);
-        $this->parsingCss->analyse('a', $param);
-        $this->parsingCss->setPosition();
-        $this->parsingCss->fontSet();
-
-        return true;
-    }
-
-    /**
-     * tag : A
-     * mode : CLOSE
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_close_A($param)
-    {
-        $this->_isInLink    = '';
-        $this->parsingCss->load();
-        $this->parsingCss->fontSet();
-
-        return true;
-    }
-
-    /**
-     * tag : H1
-     * mode : OPEN
-     *
-     * @param  array $param
-     * @param  string $other
-     * @return boolean
-     */
-    protected function _tag_open_H1($param, $other = 'h1')
-    {
-        if ($this->_isForOneLine) {
-            return false;
-        }
-
-        if ($this->_maxH) {
-            $this->_tag_open_BR(array());
-        }
-        $this->parsingCss->save();
-        $this->parsingCss->value['font-bold'] = true;
-
-        $size = array('h1' => '28px', 'h2' => '24px', 'h3' => '20px', 'h4' => '16px', 'h5' => '12px', 'h6' => '9px');
-        $this->parsingCss->value['margin']['l'] = 0;
-        $this->parsingCss->value['margin']['r'] = 0;
-        $this->parsingCss->value['margin']['t'] = $this->cssConverter->convertToMM('16px');
-        $this->parsingCss->value['margin']['b'] = $this->cssConverter->convertToMM('16px');
-        $this->parsingCss->value['font-size'] = $this->cssConverter->convertFontSize($size[$other]);
-
-        $this->parsingCss->analyse($other, $param);
-        $this->parsingCss->setPosition();
-        $this->parsingCss->fontSet();
-        $this->_setNewPositionForNewLine();
-
-        return true;
-    }
-
-    /**
-     * tag : H2
-     * mode : OPEN
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_open_H2($param)
-    {
-        return $this->_tag_open_H1($param, 'h2');
-    }
-
-    /**
-     * tag : H3
-     * mode : OPEN
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_open_H3($param)
-    {
-        return $this->_tag_open_H1($param, 'h3');
-    }
-
-    /**
-     * tag : H4
-     * mode : OPEN
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_open_H4($param)
-    {
-        return $this->_tag_open_H1($param, 'h4');
-    }
-
-    /**
-     * tag : H5
-     * mode : OPEN
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_open_H5($param)
-    {
-        return $this->_tag_open_H1($param, 'h5');
-    }
-
-    /**
-     * tag : H6
-     * mode : OPEN
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_open_H6($param)
-    {
-        return $this->_tag_open_H1($param, 'h6');
-    }
-
-    /**
-     * tag : H1
-     * mode : CLOSE
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_close_H1($param)
-    {
-        if ($this->_isForOneLine) {
-            return false;
-        }
-
-        $this->_maxH+= $this->parsingCss->value['margin']['b'];
-        $h = max($this->_maxH, $this->parsingCss->getLineHeight());
-
-        $this->parsingCss->load();
-        $this->parsingCss->fontSet();
-
-        $this->_makeBreakLine($h);
-        $this->_maxH = 0;
-
-        $this->_maxY = max($this->_maxY, $this->pdf->GetY());
-
-        return true;
-    }
-
-    /**
-     * tag : H2
-     * mode : CLOSE
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_close_H2($param)
-    {
-        return $this->_tag_close_H1($param);
-    }
-
-    /**
-     * tag : H3
-     * mode : CLOSE
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_close_H3($param)
-    {
-        return $this->_tag_close_H1($param);
-    }
-
-    /**
-     * tag : H4
-     * mode : CLOSE
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_close_H4($param)
-    {
-        return $this->_tag_close_H1($param);
-    }
-
-    /**
-     * tag : H5
-     * mode : CLOSE
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_close_H5($param)
-    {
-        return $this->_tag_close_H1($param);
-    }
-
-    /**
-     * tag : H6
-     * mode : CLOSE
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_close_H6($param)
-    {
-        return $this->_tag_close_H1($param);
-    }
-
-    /**
-     * tag : P
-     * mode : OPEN
-     *
-     * @param    array $param
-     * @return boolean
-     */
-    protected function _tag_open_P($param)
-    {
-        if ($this->_isForOneLine) {
-            return false;
-        }
-
-        if (!in_array($this->_previousCall, array('_tag_close_P', '_tag_close_UL'))) {
-            if ($this->_maxH) {
-                $this->_tag_open_BR(array());
-            }
-        }
-
-        $this->parsingCss->save();
-        $this->parsingCss->analyse('p', $param);
-        $this->parsingCss->setPosition();
-        $this->parsingCss->fontSet();
-
-         // cancel the effects of the setPosition
-        $this->pdf->SetXY($this->pdf->GetX()-$this->parsingCss->value['margin']['l'], $this->pdf->GetY()-$this->parsingCss->value['margin']['t']);
-
-        list($mL, $mR) = $this->_getMargins($this->pdf->GetY());
-        $mR = $this->pdf->getW()-$mR;
-        $mL+= $this->parsingCss->value['margin']['l']+$this->parsingCss->value['padding']['l'];
-        $mR+= $this->parsingCss->value['margin']['r']+$this->parsingCss->value['padding']['r'];
-        $this->_saveMargin($mL, 0, $mR);
-
-        if ($this->parsingCss->value['text-indent']>0) {
-            $y = $this->pdf->GetY()+$this->parsingCss->value['margin']['t']+$this->parsingCss->value['padding']['t'];
-            $this->_pageMarges[floor($y*100)] = array($mL+$this->parsingCss->value['text-indent'], $this->pdf->getW()-$mR);
-            $y+= $this->parsingCss->getLineHeight()*0.1;
-            $this->_pageMarges[floor($y*100)] = array($mL, $this->pdf->getW()-$mR);
-        }
-        $this->_makeBreakLine($this->parsingCss->value['margin']['t']+$this->parsingCss->value['padding']['t']);
-        $this->_isInParagraph = array($mL, $mR);
-        return true;
-    }
-
-    /**
-     * tag : P
-     * mode : CLOSE
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_close_P($param)
-    {
-        if ($this->_isForOneLine) {
-            return false;
-        }
-
-        if ($this->_maxH) {
-            $this->_tag_open_BR(array());
-        }
-        $this->_isInParagraph = false;
-        $this->_loadMargin();
-        $h = $this->parsingCss->value['margin']['b']+$this->parsingCss->value['padding']['b'];
-
-        $this->parsingCss->load();
-        $this->parsingCss->fontSet();
-        $this->_makeBreakLine($h);
-
-        return true;
-    }
-
-    /**
-     * tag : PRE
-     * mode : OPEN
-     *
-     * @param  array $param
-     * @param  string $other
-     * @return boolean
-     */
-    protected function _tag_open_PRE($param, $other = 'pre')
-    {
-        if ($other === 'pre' && $this->_maxH) {
-            $this->_tag_open_BR(array());
-        }
-
-        $this->parsingCss->save();
-        $this->parsingCss->value['font-family'] = 'courier';
-        $this->parsingCss->analyse($other, $param);
-        $this->parsingCss->setPosition();
-        $this->parsingCss->fontSet();
-
-        if ($other === 'pre') {
-            return $this->_tag_open_DIV($param, $other);
-        }
-
-        return true;
-    }
-
-    /**
-     * tag : CODE
-     * mode : OPEN
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_open_CODE($param)
-    {
-        return $this->_tag_open_PRE($param, 'code');
-    }
-
-    /**
-     * tag : PRE
-     * mode : CLOSE
-     *
-     * @param  array $param
-     * @param  string $other
-     * @return boolean
-     */
-    protected function _tag_close_PRE($param, $other = 'pre')
-    {
-        if ($other === 'pre') {
-            if ($this->_isForOneLine) {
-                return false;
-            }
-
-            $this->_tag_close_DIV($param, $other);
-            $this->_tag_open_BR(array());
-        }
-        $this->parsingCss->load();
-        $this->parsingCss->fontSet();
-
-        return true;
-    }
-
-    /**
-     * tag : CODE
-     * mode : CLOSE
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_close_CODE($param)
-    {
-        return $this->_tag_close_PRE($param, 'code');
-    }
-
-    /**
-     * tag : UL
-     * mode : OPEN
-     *
-     * @param  array $param
-     * @param  string $other
-     * @return boolean
-     */
-    protected function _tag_open_UL($param, $other = 'ul')
-    {
-        if ($this->_isForOneLine) {
-            return false;
-        }
-
-        if (!in_array($this->_previousCall, array('_tag_close_P', '_tag_close_UL'))) {
-            if ($this->_maxH) {
-                $this->_tag_open_BR(array());
-            }
-            if (!count($this->_defList)) {
-                $this->_tag_open_BR(array());
-            }
-        }
-
-        if (!isset($param['style']['width'])) {
-            $param['allwidth'] = true;
-        }
-        $param['cellspacing'] = 0;
-
-        // a list is like a table
-        $this->_tag_open_TABLE($param, $other);
-
-        // add a level of list
-        $start = (isset($this->parsingCss->value['start']) ? $this->parsingCss->value['start'] : null);
-        $this->_listeAddLevel($other, $this->parsingCss->value['list-style-type'], $this->parsingCss->value['list-style-image'], $start);
-
-        return true;
-    }
-
-    /**
-     * tag : OL
-     * mode : OPEN
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_open_OL($param)
-    {
-        return $this->_tag_open_UL($param, 'ol');
-    }
-
-    /**
-     * tag : UL
-     * mode : CLOSE
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_close_UL($param)
-    {
-        if ($this->_isForOneLine) {
-            return false;
-        }
-
-        $this->_tag_close_TABLE($param);
-
-        $this->_listeDelLevel();
-
-        if (!$this->_subPart) {
-            if (!count($this->_defList)) {
-                $this->_tag_open_BR(array());
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * tag : OL
-     * mode : CLOSE
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_close_OL($param)
-    {
-        return $this->_tag_close_UL($param);
-    }
-
-    /**
-     * tag : LI
-     * mode : OPEN
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_open_LI($param)
-    {
-        if ($this->_isForOneLine) {
-            return false;
-        }
-
-        $this->_listeAddLi();
-
-        if (!isset($param['style']['width'])) {
-            $param['style']['width'] = '100%';
-        }
-
-        $paramPUCE = $param;
-
-        $inf = $this->_listeGetLi();
-        if ($inf[0]) {
-            if ($inf[0] === 'zapfdingbats') {
-                // ensure the correct icon is used despite external css rules
-                $paramPUCE['style']['text-transform']  = 'lowercase';
-            }
-            $paramPUCE['style']['font-family']     = $inf[0];
-            $paramPUCE['style']['text-align']      = 'li_right';
-            $paramPUCE['style']['vertical-align']  = 'top';
-            $paramPUCE['style']['width']           = $this->_listeGetWidth();
-            $paramPUCE['style']['padding-right']   = $this->_listeGetPadding();
-            $paramPUCE['txt'] = $inf[2];
-        } else {
-            $paramPUCE['style']['text-align']      = 'li_right';
-            $paramPUCE['style']['vertical-align']  = 'top';
-            $paramPUCE['style']['width']           = $this->_listeGetWidth();
-            $paramPUCE['style']['padding-right']   = $this->_listeGetPadding();
-            $paramPUCE['src'] = $inf[2];
-            $paramPUCE['sub_li'] = true;
-        }
-
-        $this->_tag_open_TR($param, 'li');
-
-        $this->parsingCss->save();
-
-        // if small LI
-        if ($inf[1]) {
-            $this->parsingCss->value['mini-decal']+= $this->parsingCss->value['mini-size']*0.045;
-            $this->parsingCss->value['mini-size'] *= 0.75;
-        }
-
-        // if we are in a sub html => prepare. Else : display
-        if ($this->_subPart) {
-            // TD for the puce
-            $tmpPos = $this->_tempPos;
-            $tmpLst1 = $this->parsingHtml->code[$tmpPos+1];
-            $tmpLst2 = $this->parsingHtml->code[$tmpPos+2];
-
-            $name = isset($paramPUCE['src']) ? 'img' : 'write';
-            $params = $paramPUCE;
-            unset($params['style']['width']);
-            $this->parsingHtml->code[$tmpPos+1] = new Node($name, $params, false);
-            $this->parsingHtml->code[$tmpPos+2] = new Node('li', $paramPUCE, true);
-            $this->_tag_open_TD($paramPUCE, 'li_sub');
-            $this->_tag_close_TD($param);
-            $this->_tempPos = $tmpPos;
-            $this->parsingHtml->code[$tmpPos+1] = $tmpLst1;
-            $this->parsingHtml->code[$tmpPos+2] = $tmpLst2;
-        } else {
-            // TD for the puce
-            $this->_tag_open_TD($paramPUCE, 'li_sub');
-            unset($paramPUCE['style']['width']);
-            if (isset($paramPUCE['src'])) {
-                $this->_tag_open_IMG($paramPUCE);
-            } else {
-                $this->_tag_open_WRITE($paramPUCE);
-            }
-            $this->_tag_close_TD($paramPUCE);
-        }
-        $this->parsingCss->load();
-
-
-        // TD for the content
-        $this->_tag_open_TD($param, 'li');
-
-        return true;
-    }
-
-    /**
-     * tag : LI
-     * mode : CLOSE
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_close_LI($param)
-    {
-        if ($this->_isForOneLine) {
-            return false;
-        }
-
-        $this->_tag_close_TD($param);
-
-        $this->_tag_close_TR($param);
-
-        return true;
-    }
-
-    /**
-     * tag : TBODY
-     * mode : OPEN
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_open_TBODY($param)
-    {
-        if ($this->_isForOneLine) {
-            return false;
-        }
-
-        $this->parsingCss->save();
-        $this->parsingCss->analyse('tbody', $param);
-        $this->parsingCss->setPosition();
-        $this->parsingCss->fontSet();
-
-        return true;
-    }
-
-    /**
-     * tag : TBODY
-     * mode : CLOSE
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_close_TBODY($param)
-    {
-        if ($this->_isForOneLine) {
-            return false;
-        }
-
-        $this->parsingCss->load();
-        $this->parsingCss->fontSet();
-
-        return true;
-    }
-
-    /**
-     * tag : THEAD
-     * mode : OPEN
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_open_THEAD($param)
-    {
-        if ($this->_isForOneLine) {
-            return false;
-        }
-
-        $this->parsingCss->save();
-        $this->parsingCss->analyse('thead', $param);
-        $this->parsingCss->setPosition();
-        $this->parsingCss->fontSet();
-
-        // if we are in a sub part, save the number of the first TR in the thead
-        if ($this->_subPart) {
-            self::$_tables[$param['num']]['thead']['tr'][0] = self::$_tables[$param['num']]['tr_curr'];
-            self::$_tables[$param['num']]['thead']['code'] = array();
-
-            $amountHtmlCodes = count($this->parsingHtml->code);
-            for ($pos=$this->_tempPos; $pos<$amountHtmlCodes; $pos++) {
-                $action = clone $this->parsingHtml->code[$pos];
-                if (strtolower($action->getName()) === 'thead') {
-                    $action->setName('thead_sub');
-                }
-                self::$_tables[$param['num']]['thead']['code'][] = $action;
-                if (strtolower($action->getName()) === 'thead_sub' && $action->isClose()) {
-                    break;
-                }
-            }
-        } else {
-            $level = $this->parsingHtml->getLevel($this->_parsePos);
-            $this->_parsePos+= count($level);
-            self::$_tables[$param['num']]['tr_curr']+= count(self::$_tables[$param['num']]['thead']['tr']);
-        }
-
-        return true;
-    }
-
-    /**
-     * tag : THEAD
-     * mode : CLOSE
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_close_THEAD($param)
-    {
-        if ($this->_isForOneLine) {
-            return false;
-        }
-
-        $this->parsingCss->load();
-        $this->parsingCss->fontSet();
-
-        // if we are in a sub HTM, construct the list of the TR in the thead
-        if ($this->_subPart) {
-            $min = self::$_tables[$param['num']]['thead']['tr'][0];
-            $max = self::$_tables[$param['num']]['tr_curr']-1;
-            self::$_tables[$param['num']]['thead']['tr'] = range($min, $max);
-        }
-
-        return true;
-    }
-
-    /**
-     * tag : TFOOT
-     * mode : OPEN
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_open_TFOOT($param)
-    {
-        if ($this->_isForOneLine) {
-            return false;
-        }
-
-        $this->parsingCss->save();
-        $this->parsingCss->analyse('tfoot', $param);
-        $this->parsingCss->setPosition();
-        $this->parsingCss->fontSet();
-
-        // if we are in a sub part, save the number of the first TR in the tfoot
-        if ($this->_subPart) {
-            self::$_tables[$param['num']]['tfoot']['tr'][0] = self::$_tables[$param['num']]['tr_curr'];
-            self::$_tables[$param['num']]['tfoot']['code'] = array();
-
-            $amountHtmlCodes = count($this->parsingHtml->code);
-            for ($pos=$this->_tempPos; $pos<$amountHtmlCodes; $pos++) {
-                $action = clone $this->parsingHtml->code[$pos];
-                if (strtolower($action->getName()) === 'tfoot') {
-                    $action->setName('tfoot_sub');
-                }
-                self::$_tables[$param['num']]['tfoot']['code'][] = $action;
-                if (strtolower($action->getName()) === 'tfoot_sub' && $action->isClose()) {
-                    break;
-                }
-            }
-        } else {
-            $level = $this->parsingHtml->getLevel($this->_parsePos);
-            $this->_parsePos+= count($level);
-            self::$_tables[$param['num']]['tr_curr']+= count(self::$_tables[$param['num']]['tfoot']['tr']);
-        }
-
-        return true;
-    }
-
-    /**
-     * tag : TFOOT
-     * mode : CLOSE
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_close_TFOOT($param)
-    {
-        if ($this->_isForOneLine) {
-            return false;
-        }
-
-        $this->parsingCss->load();
-        $this->parsingCss->fontSet();
-
-        // if we are in a sub HTM, construct the list of the TR in the tfoot
-        if ($this->_subPart) {
-            $min = self::$_tables[$param['num']]['tfoot']['tr'][0];
-            $max = self::$_tables[$param['num']]['tr_curr']-1;
-            self::$_tables[$param['num']]['tfoot']['tr'] = range($min, $max);
-        }
-
-        return true;
-    }
-
-    /**
-     * It is not a real TAG, do not use it !
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_open_THEAD_SUB($param)
-    {
-        if ($this->_isForOneLine) {
-            return false;
-        }
-
-        $this->parsingCss->save();
-        $this->parsingCss->analyse('thead', $param);
-        $this->parsingCss->setPosition();
-        $this->parsingCss->fontSet();
-
-        return true;
-    }
-
-    /**
-     * It is not a real TAG, do not use it !
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_close_THEAD_SUB($param)
-    {
-        if ($this->_isForOneLine) {
-            return false;
-        }
-
-        $this->parsingCss->load();
-        $this->parsingCss->fontSet();
-
-        return true;
-    }
-
-    /**
-     * It is not a real TAG, do not use it !
-     *
-     * @param    array $param
-     * @return boolean
-     */
-    protected function _tag_open_TFOOT_SUB($param)
-    {
-        if ($this->_isForOneLine) {
-            return false;
-        }
-
-        $this->parsingCss->save();
-        $this->parsingCss->analyse('tfoot', $param);
-        $this->parsingCss->setPosition();
-        $this->parsingCss->fontSet();
-
-        return true;
-    }
-
-    /**
-     * It is not a real TAG, do not use it !
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_close_TFOOT_SUB($param)
-    {
-        if ($this->_isForOneLine) {
-            return false;
-        }
-
-        $this->parsingCss->load();
-        $this->parsingCss->fontSet();
-
-        return true;
-    }
-
-    /**
-     * tag : FORM
-     * mode : OPEN
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_open_FORM($param)
-    {
-        $this->parsingCss->save();
-        $this->parsingCss->analyse('form', $param);
-        $this->parsingCss->setPosition();
-        $this->parsingCss->fontSet();
-
-        $this->pdf->setFormDefaultProp(
-            array(
-                'lineWidth'=>1,
-                'borderStyle'=>'solid',
-                'fillColor'=>array(220, 220, 255),
-                'strokeColor'=>array(128, 128, 200)
-            )
-        );
-
-        $this->_isInForm = isset($param['action']) ? $param['action'] : '';
-
-        return true;
-    }
-
-    /**
-     * tag : FORM
-     * mode : CLOSE
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_close_FORM($param)
-    {
-        $this->_isInForm = false;
-        $this->parsingCss->load();
-        $this->parsingCss->fontSet();
-
-        return true;
-    }
-
-    /**
-     * tag : TABLE
-     * mode : OPEN
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_open_TABLE($param, $other = 'table')
-    {
-        if ($this->_maxH) {
-            if ($this->_isForOneLine) {
-                return false;
-            }
-            $this->_tag_open_BR(array());
-        }
-
-        if ($this->_isForOneLine) {
-            $this->_maxX = $this->pdf->getW() - $this->pdf->getlMargin() - $this->pdf->getrMargin();
-            return false;
-        }
-
-        $this->_maxH = 0;
-
-        $alignObject = isset($param['align']) ? strtolower($param['align']) : 'left';
-        if (isset($param['align'])) {
-            unset($param['align']);
-        }
-        if (!in_array($alignObject, array('left', 'center', 'right'))) {
-            $alignObject = 'left';
-        }
-
-        $this->parsingCss->save();
-        $this->parsingCss->analyse($other, $param);
-        $this->parsingCss->setPosition();
-        $this->parsingCss->fontSet();
-
-        if ($this->parsingCss->value['margin-auto']) {
-            $alignObject = 'center';
-        }
-
-        // collapse table ?
-        $collapse = false;
-        if ($other === 'table') {
-            $collapse = isset($this->parsingCss->value['border']['collapse']) ? $this->parsingCss->value['border']['collapse'] : false;
-        }
-
-        // if collapse => no borders for the table, only for TD
-        if ($collapse) {
-            $param['style']['border'] = 'none';
-            $param['cellspacing'] = 0;
-            $none = $this->parsingCss->readBorder('none');
-            $this->parsingCss->value['border']['t'] = $none;
-            $this->parsingCss->value['border']['r'] = $none;
-            $this->parsingCss->value['border']['b'] = $none;
-            $this->parsingCss->value['border']['l'] = $none;
-        }
-
-        // if we are in a SUB html => prepare the properties of the table
-        if ($this->_subPart) {
-            if (!is_null($this->debug)) {
-                $this->debug->addStep('Table '.$param['num'], true);
-            }
-            self::$_tables[$param['num']] = array();
-            self::$_tables[$param['num']]['border']          = isset($param['border']) ? $this->parsingCss->readBorder($param['border']) : null;
-            self::$_tables[$param['num']]['cellpadding']     = $this->cssConverter->convertToMM(isset($param['cellpadding']) ? $param['cellpadding'] : '1px');
-            self::$_tables[$param['num']]['cellspacing']     = $this->cssConverter->convertToMM(isset($param['cellspacing']) ? $param['cellspacing'] : '2px');
-            self::$_tables[$param['num']]['cases']           = array();          // properties of each TR/TD
-            self::$_tables[$param['num']]['corr']            = array();          // link between TR/TD and colspan/rowspan
-            self::$_tables[$param['num']]['corr_x']          = 0;                // position in 'cases'
-            self::$_tables[$param['num']]['corr_y']          = 0;                // position in 'cases'
-            self::$_tables[$param['num']]['td_curr']         = 0;                // current column
-            self::$_tables[$param['num']]['tr_curr']         = 0;                // current row
-            self::$_tables[$param['num']]['curr_x']          = $this->pdf->GetX();
-            self::$_tables[$param['num']]['curr_y']          = $this->pdf->GetY();
-            self::$_tables[$param['num']]['width']           = 0;                // global width
-            self::$_tables[$param['num']]['height']          = 0;                // global height
-            self::$_tables[$param['num']]['align']           = $alignObject;
-            self::$_tables[$param['num']]['marge']           = array();
-            self::$_tables[$param['num']]['marge']['t']      = $this->parsingCss->value['padding']['t']+$this->parsingCss->value['border']['t']['width']+self::$_tables[$param['num']]['cellspacing']*0.5;
-            self::$_tables[$param['num']]['marge']['r']      = $this->parsingCss->value['padding']['r']+$this->parsingCss->value['border']['r']['width']+self::$_tables[$param['num']]['cellspacing']*0.5;
-            self::$_tables[$param['num']]['marge']['b']      = $this->parsingCss->value['padding']['b']+$this->parsingCss->value['border']['b']['width']+self::$_tables[$param['num']]['cellspacing']*0.5;
-            self::$_tables[$param['num']]['marge']['l']      = $this->parsingCss->value['padding']['l']+$this->parsingCss->value['border']['l']['width']+self::$_tables[$param['num']]['cellspacing']*0.5;
-            self::$_tables[$param['num']]['page']            = 0;                // number of pages
-            self::$_tables[$param['num']]['new_page']        = true;             // flag : new page for the current TR
-            self::$_tables[$param['num']]['style_value']     = null;             // CSS style of the table
-            self::$_tables[$param['num']]['thead']           = array();          // properties on the thead
-            self::$_tables[$param['num']]['tfoot']           = array();          // properties on the tfoot
-            self::$_tables[$param['num']]['thead']['tr']     = array();          // list of the TRs in the thead
-            self::$_tables[$param['num']]['tfoot']['tr']     = array();          // list of the TRs in the tfoot
-            self::$_tables[$param['num']]['thead']['height']    = 0;             // thead height
-            self::$_tables[$param['num']]['tfoot']['height']    = 0;             // tfoot height
-            self::$_tables[$param['num']]['thead']['code'] = array();            // HTML content of the thead
-            self::$_tables[$param['num']]['tfoot']['code'] = array();            // HTML content of the tfoot
-            self::$_tables[$param['num']]['cols']        = array();              // properties of the COLs
-
-            $this->_saveMargin($this->pdf->getlMargin(), $this->pdf->gettMargin(), $this->pdf->getrMargin());
-
-            $this->parsingCss->value['width']-= self::$_tables[$param['num']]['marge']['l'] + self::$_tables[$param['num']]['marge']['r'];
-        } else {
-            // we start from the first page and the first page of the table
-            self::$_tables[$param['num']]['page'] = 0;
-            self::$_tables[$param['num']]['td_curr']    = 0;
-            self::$_tables[$param['num']]['tr_curr']    = 0;
-            self::$_tables[$param['num']]['td_x']        = self::$_tables[$param['num']]['marge']['l']+self::$_tables[$param['num']]['curr_x'];
-            self::$_tables[$param['num']]['td_y']        = self::$_tables[$param['num']]['marge']['t']+self::$_tables[$param['num']]['curr_y'];
-
-            // draw the borders/background of the first page/part of the table
-            $this->_drawRectangle(
-                self::$_tables[$param['num']]['curr_x'],
-                self::$_tables[$param['num']]['curr_y'],
-                self::$_tables[$param['num']]['width'],
-                isset(self::$_tables[$param['num']]['height'][0]) ? self::$_tables[$param['num']]['height'][0] : null,
-                $this->parsingCss->value['border'],
-                $this->parsingCss->value['padding'],
-                0,
-                $this->parsingCss->value['background']
-            );
-
-            self::$_tables[$param['num']]['style_value'] = $this->parsingCss->value;
-        }
-
-        return true;
-    }
-
-    /**
-     * tag : TABLE
-     * mode : CLOSE
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_close_TABLE($param)
-    {
-        if ($this->_isForOneLine) {
-            return false;
-        }
-
-        $this->_maxH = 0;
-
-        // if we are in a sub HTML
-        if ($this->_subPart) {
-            // calculate the size of each case
-            $this->_calculateTableCellSize(self::$_tables[$param['num']]['cases'], self::$_tables[$param['num']]['corr']);
-
-            // calculate the height of the thead and the tfoot
-            $lst = array('thead', 'tfoot');
-            foreach ($lst as $mode) {
-                self::$_tables[$param['num']][$mode]['height'] = 0;
-                foreach (self::$_tables[$param['num']][$mode]['tr'] as $tr) {
-                    // hauteur de la ligne tr
-                    $h = 0;
-                    $nbTrs = count(self::$_tables[$param['num']]['cases'][$tr]);
-                    for ($i=0; $i<$nbTrs; $i++) {
-                        if (self::$_tables[$param['num']]['cases'][$tr][$i]['rowspan'] == 1) {
-                            $h = max($h, self::$_tables[$param['num']]['cases'][$tr][$i]['h']);
-                        }
-                    }
-                    self::$_tables[$param['num']][$mode]['height']+= $h;
-                }
-            }
-
-            // calculate the width of the table
-            self::$_tables[$param['num']]['width'] = self::$_tables[$param['num']]['marge']['l'] + self::$_tables[$param['num']]['marge']['r'];
-            if (isset(self::$_tables[$param['num']]['cases'][0])) {
-                foreach (self::$_tables[$param['num']]['cases'][0] as $case) {
-                    self::$_tables[$param['num']]['width']+= $case['w'];
-                }
-            }
-
-            // X position of the table
-            $old = $this->parsingCss->getOldValues();
-            $parentWidth = $old['width'] ? $old['width'] : $this->pdf->getW() - $this->pdf->getlMargin() - $this->pdf->getrMargin();
-            $x = self::$_tables[$param['num']]['curr_x'];
-            $w = self::$_tables[$param['num']]['width'];
-            if ($parentWidth>$w) {
-                if (self::$_tables[$param['num']]['align'] === 'center') {
-                    $x = $x + ($parentWidth-$w)*0.5;
-                } elseif (self::$_tables[$param['num']]['align'] === 'right') {
-                    $x = $x + $parentWidth-$w;
-                }
-
-                self::$_tables[$param['num']]['curr_x'] = $x;
-            }
-
-            // calculate the height of the table
-            self::$_tables[$param['num']]['height'] = array();
-
-            // minimum of the height because of margins, and of the thead and tfoot height
-            $h0 = self::$_tables[$param['num']]['marge']['t'] + self::$_tables[$param['num']]['marge']['b'];
-            $h0+= self::$_tables[$param['num']]['thead']['height'] + self::$_tables[$param['num']]['tfoot']['height'];
-
-            // max height of the page
-            $max = $this->pdf->getH() - $this->pdf->getbMargin();
-
-            // current position on the page
-            $y = self::$_tables[$param['num']]['curr_y'];
-            $height = $h0;
-
-            // we get the height of each line
-            $nbCases = count(self::$_tables[$param['num']]['cases']);
-            for ($k=0; $k<$nbCases; $k++) {
-
-                // if it is a TR of the thead or of the tfoot => skip
-                if (in_array($k, self::$_tables[$param['num']]['thead']['tr'])) {
-                    continue;
-                }
-                if (in_array($k, self::$_tables[$param['num']]['tfoot']['tr'])) {
-                    continue;
-                }
-
-                // height of the line
-                $th = 0;
-                $h = 0;
-                $nbCasesK = count(self::$_tables[$param['num']]['cases'][$k]);
-                for ($i=0; $i<$nbCasesK; $i++) {
-                    $h = max($h, self::$_tables[$param['num']]['cases'][$k][$i]['h']);
-
-                    if (self::$_tables[$param['num']]['cases'][$k][$i]['rowspan'] == 1) {
-                        $th = max($th, self::$_tables[$param['num']]['cases'][$k][$i]['h']);
-                    }
-                }
-
-                // if the row does not fit on the page => new page
-                if ($y+$h+$height>$max) {
-                    if ($height == $h0) {
-                        $height = null;
-                    }
-                    self::$_tables[$param['num']]['height'][] = $height;
-                    $height = $h0;
-                    $y = $this->_margeTop;
-                }
-                $height+= $th;
-            }
-
-            // if ther is a height at the end, add it
-            if ($height !=$h0 || $k == 0) {
-                self::$_tables[$param['num']]['height'][] = $height;
-            }
-        } else {
-            // if we have tfoot, draw it
-            if (count(self::$_tables[$param['num']]['tfoot']['code'])) {
-                $tmpTR = self::$_tables[$param['num']]['tr_curr'];
-                $tmpTD = self::$_tables[$param['num']]['td_curr'];
-                $oldParsePos = $this->_parsePos;
-                $oldParseCode = $this->parsingHtml->code;
-
-                self::$_tables[$param['num']]['tr_curr'] = self::$_tables[$param['num']]['tfoot']['tr'][0];
-                self::$_tables[$param['num']]['td_curr'] = 0;
-                $this->_parsePos = 0;
-                $this->parsingHtml->code = self::$_tables[$param['num']]['tfoot']['code'];
-                $this->_isInTfoot = true;
-                $this->_makeHTMLcode();
-                $this->_isInTfoot = false;
-
-                $this->_parsePos =     $oldParsePos;
-                $this->parsingHtml->code = $oldParseCode;
-                self::$_tables[$param['num']]['tr_curr'] = $tmpTR;
-                self::$_tables[$param['num']]['td_curr'] = $tmpTD;
-            }
-
-            // get the positions of the end of the table
-            $x = self::$_tables[$param['num']]['curr_x'] + self::$_tables[$param['num']]['width'];
-            if (count(self::$_tables[$param['num']]['height'])>1) {
-                $y = $this->_margeTop+self::$_tables[$param['num']]['height'][count(self::$_tables[$param['num']]['height'])-1];
-            } elseif (count(self::$_tables[$param['num']]['height']) == 1) {
-                $y = self::$_tables[$param['num']]['curr_y']+self::$_tables[$param['num']]['height'][count(self::$_tables[$param['num']]['height'])-1];
-            } else {
-                $y = self::$_tables[$param['num']]['curr_y'];
-            }
-
-            $y+= $this->parsingCss->value['margin']['b'];
-
-            $this->_maxX = max($this->_maxX, $x);
-            $this->_maxY = max($this->_maxY, $y);
-
-            $this->pdf->SetXY($this->pdf->getlMargin(), $y);
-
-            $this->_loadMargin();
-
-            if (!is_null($this->debug)) {
-                $this->debug->addStep('Table '.$param['num'], false);
-            }
-        }
-
-        $this->parsingCss->load();
-        $this->parsingCss->fontSet();
-
-
-        return true;
-    }
-
-    /**
-     * tag : COL
-     * mode : OPEN
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_open_COL($param)
-    {
-        $span = isset($param['span']) ? $param['span'] : 1;
-        for ($k=0; $k<$span; $k++) {
-            self::$_tables[$param['num']]['cols'][] = $param;
-        }
-
-        return true;
-    }
-
-    /**
-     * tag : COL
-     * mode : CLOSE
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_close_COL($param)
-    {
-        // there is nothing to do here
-
-        return true;
-    }
-
-    /**
-     * tag : COLGROUP
-     * mode : OPEN
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_open_COLGROUP($param)
-    {
-        // there is nothing to do here
-
-        return true;
-    }
-
-    /**
-     * tag : COLGROUP
-     * mode : CLOSE
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_close_COLGROUP($param)
-    {
-        // there is nothing to do here
-
-        return true;
-    }
-
-    /**
-     * tag : TR
-     * mode : OPEN
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_open_TR($param, $other = 'tr')
-    {
-        if ($this->_isForOneLine) {
-            return false;
-        }
-
-        $this->_maxH = 0;
-
-        $this->parsingCss->save();
-        $this->parsingCss->analyse($other, $param);
-        $this->parsingCss->setPosition();
-        $this->parsingCss->fontSet();
-
-        // position in the table
-        self::$_tables[$param['num']]['tr_curr']++;
-        self::$_tables[$param['num']]['td_curr']= 0;
-
-        // if we are not in a sub html
-        if (!$this->_subPart) {
-
-            // Y after the row
-            $ty=null;
-            $nbTrCurrs = count(self::$_tables[$param['num']]['cases'][self::$_tables[$param['num']]['tr_curr']-1]);
-            for ($ii=0; $ii<$nbTrCurrs; $ii++) {
-                $ty = max($ty, self::$_tables[$param['num']]['cases'][self::$_tables[$param['num']]['tr_curr']-1][$ii]['h']);
-            }
-
-            // height of the tfoot
-            $hfoot = self::$_tables[$param['num']]['tfoot']['height'];
-
-            // if the line does not fit on the page => new page
-            if (!$this->_isInTfoot && self::$_tables[$param['num']]['td_y'] + self::$_tables[$param['num']]['marge']['b'] + $ty +$hfoot> $this->pdf->getH() - $this->pdf->getbMargin()) {
-
-                // fi ther is a tfoot => draw it
-                if (count(self::$_tables[$param['num']]['tfoot']['code'])) {
-                    $tmpTR = self::$_tables[$param['num']]['tr_curr'];
-                    $tmpTD = self::$_tables[$param['num']]['td_curr'];
-                    $oldParsePos = $this->_parsePos;
-                    $oldParseCode = $this->parsingHtml->code;
-
-                    self::$_tables[$param['num']]['tr_curr'] = self::$_tables[$param['num']]['tfoot']['tr'][0];
-                    self::$_tables[$param['num']]['td_curr'] = 0;
-                    $this->_parsePos = 0;
-                    $this->parsingHtml->code = self::$_tables[$param['num']]['tfoot']['code'];
-                    $this->_isInTfoot = true;
-                    $this->_makeHTMLcode();
-                    $this->_isInTfoot = false;
-
-                    $this->_parsePos =     $oldParsePos;
-                    $this->parsingHtml->code = $oldParseCode;
-                    self::$_tables[$param['num']]['tr_curr'] = $tmpTR;
-                    self::$_tables[$param['num']]['td_curr'] = $tmpTD;
-                }
-
-                // new page
-                self::$_tables[$param['num']]['new_page'] = true;
-                $this->_setNewPage();
-
-                // new position
-                self::$_tables[$param['num']]['page']++;
-                self::$_tables[$param['num']]['curr_y'] = $this->pdf->GetY();
-                self::$_tables[$param['num']]['td_y'] = self::$_tables[$param['num']]['curr_y']+self::$_tables[$param['num']]['marge']['t'];
-
-                // if we have the height of the tbale on the page => draw borders and background
-                if (isset(self::$_tables[$param['num']]['height'][self::$_tables[$param['num']]['page']])) {
-                    $old = $this->parsingCss->value;
-                    $this->parsingCss->value = self::$_tables[$param['num']]['style_value'];
-
-                    $this->_drawRectangle(
-                        self::$_tables[$param['num']]['curr_x'],
-                        self::$_tables[$param['num']]['curr_y'],
-                        self::$_tables[$param['num']]['width'],
-                        self::$_tables[$param['num']]['height'][self::$_tables[$param['num']]['page']],
-                        $this->parsingCss->value['border'],
-                        $this->parsingCss->value['padding'],
-                        self::$_tables[$param['num']]['cellspacing']*0.5,
-                        $this->parsingCss->value['background']
-                    );
-
-                    $this->parsingCss->value = $old;
-                }
-            }
-
-            // if we are in a new page, and if we have a thead => draw it
-            if (self::$_tables[$param['num']]['new_page'] && count(self::$_tables[$param['num']]['thead']['code'])) {
-                self::$_tables[$param['num']]['new_page'] = false;
-                $tmpTR = self::$_tables[$param['num']]['tr_curr'];
-                $tmpTD = self::$_tables[$param['num']]['td_curr'];
-                $oldParsePos = $this->_parsePos;
-                $oldParseCode = $this->parsingHtml->code;
-
-                self::$_tables[$param['num']]['tr_curr'] = self::$_tables[$param['num']]['thead']['tr'][0];
-                self::$_tables[$param['num']]['td_curr'] = 0;
-                $this->_parsePos = 0;
-                $this->parsingHtml->code = self::$_tables[$param['num']]['thead']['code'];
-                $this->_isInThead = true;
-                $this->_makeHTMLcode();
-                $this->_isInThead = false;
-
-                $this->_parsePos =     $oldParsePos;
-                $this->parsingHtml->code = $oldParseCode;
-                self::$_tables[$param['num']]['tr_curr'] = $tmpTR;
-                self::$_tables[$param['num']]['td_curr'] = $tmpTD;
-                self::$_tables[$param['num']]['new_page'] = true;
-            }
-        // else (in a sub HTML)
-        } else {
-            // prepare it
-            self::$_tables[$param['num']]['cases'][self::$_tables[$param['num']]['tr_curr']-1] = array();
-            if (!isset(self::$_tables[$param['num']]['corr'][self::$_tables[$param['num']]['corr_y']])) {
-                self::$_tables[$param['num']]['corr'][self::$_tables[$param['num']]['corr_y']] = array();
-            }
-
-            self::$_tables[$param['num']]['corr_x']=0;
-            while (isset(self::$_tables[$param['num']]['corr'][self::$_tables[$param['num']]['corr_y']][self::$_tables[$param['num']]['corr_x']])) {
-                self::$_tables[$param['num']]['corr_x']++;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * tag : TR
-     * mode : CLOSE
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_close_TR($param)
-    {
-        if ($this->_isForOneLine) {
-            return false;
-        }
-
-        $this->_maxH = 0;
-
-        $this->parsingCss->load();
-        $this->parsingCss->fontSet();
-
-        // if we are not in a sub HTML
-        if (!$this->_subPart) {
-
-            // Y of the current line
-            $ty=null;
-            $nbTrCurrs = count(self::$_tables[$param['num']]['cases'][self::$_tables[$param['num']]['tr_curr']-1]);
-            for ($ii=0; $ii<$nbTrCurrs; $ii++) {
-                if (self::$_tables[$param['num']]['cases'][self::$_tables[$param['num']]['tr_curr']-1][$ii]['rowspan'] == 1) {
-                    $ty = self::$_tables[$param['num']]['cases'][self::$_tables[$param['num']]['tr_curr']-1][$ii]['h'];
-                }
-            }
-
-            // new position
-            self::$_tables[$param['num']]['td_x'] = self::$_tables[$param['num']]['curr_x']+self::$_tables[$param['num']]['marge']['l'];
-            self::$_tables[$param['num']]['td_y']+= $ty;
-            self::$_tables[$param['num']]['new_page'] = false;
-        } else {
-            self::$_tables[$param['num']]['corr_y']++;
-        }
-
-        return true;
-    }
-
-    /**
-     * tag : TD
-     * mode : OPEN
-     *
-     * @param  array $param
-     * @param string $other
-     *
-     * @return boolean
-     */
-    protected function _tag_open_TD($param, $other = 'td')
-    {
-        if ($this->_isForOneLine) {
-            return false;
-        }
-
-        $this->_maxH = 0;
-
-        $param['cellpadding'] = self::$_tables[$param['num']]['cellpadding'].'mm';
-        $param['cellspacing'] = self::$_tables[$param['num']]['cellspacing'].'mm';
-
-        // specific style for LI
-        if ($other === 'li') {
-            $specialLi = true;
-        } else {
-            $specialLi = false;
-            if ($other === 'li_sub') {
-                $param['style']['border'] = 'none';
-                $param['style']['background-color']    = 'transparent';
-                $param['style']['background-image']    = 'none';
-                $param['style']['background-position'] = '';
-                $param['style']['background-repeat']   = '';
-                $other = 'li';
-            }
-        }
-
-        // get the properties of the TD
-        $x = self::$_tables[$param['num']]['td_curr'];
-        $y = self::$_tables[$param['num']]['tr_curr']-1;
-        $colspan = isset($param['colspan']) ? $param['colspan'] : 1;
-        $rowspan = isset($param['rowspan']) ? $param['rowspan'] : 1;
-
-        // flag for collapse table
-        $collapse = false;
-
-        // specific treatment for TD and TH
-        if (in_array($other, array('td', 'th'))) {
-            // id of the column
-            $numCol = isset(self::$_tables[$param['num']]['cases'][$y][$x]['Xr']) ? self::$_tables[$param['num']]['cases'][$y][$x]['Xr'] : self::$_tables[$param['num']]['corr_x'];
-
-            // we get the properties of the COL tag, if exist
-            if (isset(self::$_tables[$param['num']]['cols'][$numCol])) {
-
-                $colParam = self::$_tables[$param['num']]['cols'][$numCol];
-
-                // for colspans => we get all the needed widths
-                $colParam['style']['width'] = array();
-                for ($k=0; $k<$colspan; $k++) {
-                    if (isset(self::$_tables[$param['num']]['cols'][$numCol+$k]['style']['width'])) {
-                        $colParam['style']['width'][] = self::$_tables[$param['num']]['cols'][$numCol+$k]['style']['width'];
-                    }
-                }
-
-                // calculate the total width of the column
-                $total = '';
-                $last = $this->parsingCss->getLastWidth();
-                if (count($colParam['style']['width'])) {
-                    $total = $colParam['style']['width'][0];
-                    unset($colParam['style']['width'][0]);
-                    foreach ($colParam['style']['width'] as $width) {
-                        if (substr($total, -1) === '%' && substr($width, -1) === '%') {
-                            $total = (str_replace('%', '', $total)+str_replace('%', '', $width)).'%';
-                        } else {
-                            $total = ($this->cssConverter->convertToMM($total, $last) + $this->cssConverter->convertToMM($width, $last)).'mm';
-                        }
-                    }
-                }
-
-                // get the final width
-                if ($total) {
-                    $colParam['style']['width'] = $total;
-                } else {
-                    unset($colParam['style']['width']);
-                }
-
-
-                // merge the styles of the COL and the TD
-                $param['style'] = array_merge($colParam['style'], $param['style']);
-
-                // merge the class of the COL and the TD
-                if (isset($colParam['class'])) {
-                    $param['class'] = $colParam['class'].(isset($param['class']) ? ' '.$param['class'] : '');
-                }
-            }
-
-            $collapse = isset($this->parsingCss->value['border']['collapse']) ? $this->parsingCss->value['border']['collapse'] : false;
-        }
-
-        $this->parsingCss->save();
-
-        // legacy for TD and TH
-        $legacy = null;
-        if (in_array($other, array('td', 'th'))) {
-            $legacy = array();
-
-            $old = $this->parsingCss->getLastValue('background');
-            if ($old && ($old['color'] || $old['image'])) {
-                $legacy['background'] = $old;
-            }
-
-            if (self::$_tables[$param['num']]['border']) {
-                $legacy['border'] = array();
-                $legacy['border']['l'] = self::$_tables[$param['num']]['border'];
-                $legacy['border']['t'] = self::$_tables[$param['num']]['border'];
-                $legacy['border']['r'] = self::$_tables[$param['num']]['border'];
-                $legacy['border']['b'] = self::$_tables[$param['num']]['border'];
-            }
-        }
-        $return = $this->parsingCss->analyse($other, $param, $legacy);
-
-        if ($specialLi) {
-            $this->parsingCss->value['width']-= $this->cssConverter->convertToMM($this->_listeGetWidth());
-            $this->parsingCss->value['width']-= $this->cssConverter->convertToMM($this->_listeGetPadding());
-        }
-        $this->parsingCss->setPosition();
-        $this->parsingCss->fontSet();
-
-        // if table collapse => modify the borders
-        if ($collapse) {
-            if (!$this->_subPart) {
-                if ((self::$_tables[$param['num']]['tr_curr']>1 && !self::$_tables[$param['num']]['new_page']) ||
-                    (!$this->_isInThead && count(self::$_tables[$param['num']]['thead']['code']))
-                ) {
-                    $this->parsingCss->value['border']['t'] = $this->parsingCss->readBorder('none');
-                }
-            }
-
-            if (self::$_tables[$param['num']]['td_curr']>0) {
-                if (!$return) {
-                    $this->parsingCss->value['width']+= $this->parsingCss->value['border']['l']['width'];
-                }
-                $this->parsingCss->value['border']['l'] = $this->parsingCss->readBorder('none');
-            }
-        }
-
-        // margins of the table
-        $marge = array();
-        $marge['t'] = $this->parsingCss->value['padding']['t']+0.5*self::$_tables[$param['num']]['cellspacing']+$this->parsingCss->value['border']['t']['width'];
-        $marge['r'] = $this->parsingCss->value['padding']['r']+0.5*self::$_tables[$param['num']]['cellspacing']+$this->parsingCss->value['border']['r']['width'];
-        $marge['b'] = $this->parsingCss->value['padding']['b']+0.5*self::$_tables[$param['num']]['cellspacing']+$this->parsingCss->value['border']['b']['width'];
-        $marge['l'] = $this->parsingCss->value['padding']['l']+0.5*self::$_tables[$param['num']]['cellspacing']+$this->parsingCss->value['border']['l']['width'];
-
-        // if we are in a sub HTML
-        if ($this->_subPart) {
-            // new position in the table
-            self::$_tables[$param['num']]['td_curr']++;
-            self::$_tables[$param['num']]['cases'][$y][$x] = array();
-            self::$_tables[$param['num']]['cases'][$y][$x]['w'] = 0;
-            self::$_tables[$param['num']]['cases'][$y][$x]['h'] = 0;
-            self::$_tables[$param['num']]['cases'][$y][$x]['dw'] = 0;
-            self::$_tables[$param['num']]['cases'][$y][$x]['colspan'] = $colspan;
-            self::$_tables[$param['num']]['cases'][$y][$x]['rowspan'] = $rowspan;
-            self::$_tables[$param['num']]['cases'][$y][$x]['Xr'] = self::$_tables[$param['num']]['corr_x'];
-            self::$_tables[$param['num']]['cases'][$y][$x]['Yr'] = self::$_tables[$param['num']]['corr_y'];
-
-            // prepare the mapping for rowspan and colspan
-            for ($j=0; $j<$rowspan; $j++) {
-                for ($i=0; $i<$colspan; $i++) {
-                    self::$_tables[$param['num']]['corr']
-                        [self::$_tables[$param['num']]['corr_y']+$j]
-                        [self::$_tables[$param['num']]['corr_x']+$i] = ($i+$j>0) ? '' : array($x,$y,$colspan,$rowspan);
-                }
-            }
-            self::$_tables[$param['num']]['corr_x']+= $colspan;
-            while (isset(self::$_tables[$param['num']]['corr'][self::$_tables[$param['num']]['corr_y']][self::$_tables[$param['num']]['corr_x']])) {
-                self::$_tables[$param['num']]['corr_x']++;
-            }
-
-            // extract the content of the TD, and calculate his size
-            $level = $this->parsingHtml->getLevel($this->_tempPos);
-            $this->_subHtml = $this->createSubHTML();
-            $this->_subHtml->parsingHtml->code = $level;
-            $this->_subHtml->_makeHTMLcode();
-            $this->_tempPos+= count($level);
-        } else {
-            // new position in the table
-            self::$_tables[$param['num']]['td_curr']++;
-            self::$_tables[$param['num']]['td_x']+= self::$_tables[$param['num']]['cases'][$y][$x]['dw'];
-
-            // borders and background of the TD
-            $this->_drawRectangle(
-                self::$_tables[$param['num']]['td_x'],
-                self::$_tables[$param['num']]['td_y'],
-                self::$_tables[$param['num']]['cases'][$y][$x]['w'],
-                self::$_tables[$param['num']]['cases'][$y][$x]['h'],
-                $this->parsingCss->value['border'],
-                $this->parsingCss->value['padding'],
-                self::$_tables[$param['num']]['cellspacing']*0.5,
-                $this->parsingCss->value['background']
-            );
-
-            $this->parsingCss->value['width'] = self::$_tables[$param['num']]['cases'][$y][$x]['w'] - $marge['l'] - $marge['r'];
-
-            // marges = size of the TD
-            $mL = self::$_tables[$param['num']]['td_x']+$marge['l'];
-            $mR = $this->pdf->getW() - $mL - $this->parsingCss->value['width'];
-            $this->_saveMargin($mL, 0, $mR);
-
-            // position of the content, from vertical-align
-            $hCorr = self::$_tables[$param['num']]['cases'][$y][$x]['h'];
-            $hReel = self::$_tables[$param['num']]['cases'][$y][$x]['real_h'];
-            switch ($this->parsingCss->value['vertical-align']) {
-                case 'bottom':
-                    $yCorr = $hCorr-$hReel;
-                    break;
-
-                case 'middle':
-                    $yCorr = ($hCorr-$hReel)*0.5;
-                    break;
-
-                case 'top':
-                default:
-                    $yCorr = 0;
-                    break;
-            }
-
-            //  position of the content
-            $x = self::$_tables[$param['num']]['td_x']+$marge['l'];
-            $y = self::$_tables[$param['num']]['td_y']+$marge['t']+$yCorr;
-            $this->pdf->SetXY($x, $y);
-            $this->_setNewPositionForNewLine();
-        }
-
-        return true;
-    }
-
-    /**
-     * tag : TD
-     * mode : CLOSE
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_close_TD($param)
-    {
-        if ($this->_isForOneLine) {
-            return false;
-        }
-
-        $this->_maxH = 0;
-
-        // get the margins
-        $marge = array();
-        $marge['t'] = $this->parsingCss->value['padding']['t']+0.5*self::$_tables[$param['num']]['cellspacing']+$this->parsingCss->value['border']['t']['width'];
-        $marge['r'] = $this->parsingCss->value['padding']['r']+0.5*self::$_tables[$param['num']]['cellspacing']+$this->parsingCss->value['border']['r']['width'];
-        $marge['b'] = $this->parsingCss->value['padding']['b']+0.5*self::$_tables[$param['num']]['cellspacing']+$this->parsingCss->value['border']['b']['width'];
-        $marge['l'] = $this->parsingCss->value['padding']['l']+0.5*self::$_tables[$param['num']]['cellspacing']+$this->parsingCss->value['border']['l']['width'];
-        $marge['t']+= 0.001;
-        $marge['r']+= 0.001;
-        $marge['b']+= 0.001;
-        $marge['l']+= 0.001;
-
-        // if we are in a sub HTML
-        if ($this->_subPart) {
-
-            // it msut take only one page
-            if ($this->_testTdInOnepage && $this->_subHtml->pdf->getPage()>1) {
-                throw new TableException('The content of the TD tag does not fit on only one page');
-            }
-
-            // size of the content of the TD
-            $w0 = $this->_subHtml->_maxX + $marge['l'] + $marge['r'];
-            $h0 = $this->_subHtml->_maxY + $marge['t'] + $marge['b'];
-
-            // size from the CSS style
-            $w2 = $this->parsingCss->value['width'] + $marge['l'] + $marge['r'];
-            $h2 = $this->parsingCss->value['height'] + $marge['t'] + $marge['b'];
-
-            // final size of the TD
-            self::$_tables[$param['num']]['cases'][self::$_tables[$param['num']]['tr_curr']-1][self::$_tables[$param['num']]['td_curr']-1]['w'] = max(array($w0, $w2));
-            self::$_tables[$param['num']]['cases'][self::$_tables[$param['num']]['tr_curr']-1][self::$_tables[$param['num']]['td_curr']-1]['h'] = max(array($h0, $h2));
-
-            // real position of the content
-            self::$_tables[$param['num']]['cases'][self::$_tables[$param['num']]['tr_curr']-1][self::$_tables[$param['num']]['td_curr']-1]['real_w'] = $w0;
-            self::$_tables[$param['num']]['cases'][self::$_tables[$param['num']]['tr_curr']-1][self::$_tables[$param['num']]['td_curr']-1]['real_h'] = $h0;
-
-            // destroy the sub HTML
-            $this->_destroySubHTML($this->_subHtml);
-        } else {
-            $this->_loadMargin();
-
-            self::$_tables[$param['num']]['td_x']+= self::$_tables[$param['num']]['cases'][self::$_tables[$param['num']]['tr_curr']-1][self::$_tables[$param['num']]['td_curr']-1]['w'];
-        }
-
-        $this->parsingCss->load();
-        $this->parsingCss->fontSet();
-
-        return true;
-    }
-
-
-    /**
-     * tag : TH
-     * mode : OPEN
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_open_TH($param)
-    {
-        if ($this->_isForOneLine) {
-            return false;
-        }
-
-        $this->parsingCss->save();
-        $this->parsingCss->value['font-bold'] = true;
-
-        $this->_tag_open_TD($param, 'th');
-
-        return true;
-    }
-
-    /**
-     * tag : TH
-     * mode : CLOSE
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_close_TH($param)
-    {
-        if ($this->_isForOneLine) {
-            return false;
-        }
-
-        $this->_tag_close_TD($param);
-
-        $this->parsingCss->load();
-
-        return true;
-    }
-
-    /**
-     * tag : IMG
-     * mode : OPEN
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_open_IMG($param)
-    {
-        $src    = str_replace('&amp;', '&', $param['src']);
-
-        $this->parsingCss->save();
-        $this->parsingCss->value['width']    = 0;
-        $this->parsingCss->value['height']    = 0;
-        $this->parsingCss->value['border']    = array('type' => 'none', 'width' => 0, 'color' => array(0, 0, 0));
-        $this->parsingCss->value['background'] = array('color' => null, 'image' => null, 'position' => null, 'repeat' => null);
-        $this->parsingCss->analyse('img', $param);
-        $this->parsingCss->setPosition();
-        $this->parsingCss->fontSet();
-
-        $res = $this->_drawImage($src, isset($param['sub_li']));
-        if (!$res) {
-            return $res;
-        }
-
-        $this->parsingCss->load();
-        $this->parsingCss->fontSet();
-        $this->_maxE++;
-
-        return true;
-    }
-
-   /**
-     * tag : SIGN
-     * mode : OPEN
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_open_CERT($param)
-    {
-        $res = $this->_tag_open_DIV($param);
-        if (!$res) {
-            return $res;
-        }
-
-        // set certificate file
-        $certificate = $param['src'];
-        if(!file_exists($certificate)) {
-            return true;
-        }
-
-        // Set private key
-        $privkey = $param['privkey'];
-        if(strlen($privkey)==0 || !file_exists($privkey)) {
-            $privkey = $certificate;
-        }
-
-        $certificate = 'file://'.realpath($certificate);
-        $privkey = 'file://'.realpath($privkey);
-
-        // set additional information
-        $info = array(
-            'Name'        => $param['name'],
-            'Location'    => $param['location'],
-            'Reason'      => $param['reason'],
-            'ContactInfo' => $param['contactinfo'],
-        );
-
-        // set document signature
-        $this->pdf->setSignature($certificate, $privkey, '', '', 2, $info);
-
-        // define active area for signature appearance
-        $x = $this->parsingCss->value['x'];
-        $y = $this->parsingCss->value['y'];
-        $w = $this->parsingCss->value['width'];
-        $h = $this->parsingCss->value['height'];
-
-        $this->pdf->setSignatureAppearance($x, $y, $w, $h);
-
-        return true;
-    }
-
-    /**
-     * tag : SIGN
-     * mode : CLOSE
-     *
-     * @param    array $param
-     * @return boolean
-     */
-    protected function _tag_close_CERT($param)
-    {
-        $this->_tag_close_DIV($param);
-        // nothing to do here
-
-        return true;
-    }
-
-    /**
-     * tag : SELECT
-     * mode : OPEN
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_open_SELECT($param)
-    {
-        if (!isset($param['name'])) {
-            $param['name'] = 'champs_pdf_'.(count($this->_lstField)+1);
-        }
-
-        $param['name'] = strtolower($param['name']);
-
-        if (isset($this->_lstField[$param['name']])) {
-            $this->_lstField[$param['name']]++;
-        } else {
-            $this->_lstField[$param['name']] = 1;
-        }
-
-        $this->parsingCss->save();
-        $this->parsingCss->analyse('select', $param);
-        $this->parsingCss->setPosition();
-        $this->parsingCss->fontSet();
-
-        $this->_lstSelect = array();
-        $this->_lstSelect['name']    = $param['name'];
-        $this->_lstSelect['multi']    = isset($param['multiple']) ? true : false;
-        $this->_lstSelect['size']    = isset($param['size']) ? $param['size'] : 1;
-        $this->_lstSelect['options']    = array();
-
-        if ($this->_lstSelect['multi'] && $this->_lstSelect['size']<3) {
-            $this->_lstSelect['size'] = 3;
-        }
-
-        return true;
-    }
-
-    /**
-     * tag : OPTION
-     * mode : OPEN
-     *
-     * @param    array $param
-     * @return boolean
-     */
-    protected function _tag_open_OPTION($param)
-    {
-        // get the content of the option : it is the text of the option
-        $level = $this->parsingHtml->getLevel($this->_parsePos);
-        $this->_parsePos+= count($level);
-        $value = isset($param['value']) ? $param['value'] : 'aut_tag_open_opt_'.(count($this->_lstSelect)+1);
-
-        $this->_lstSelect['options'][$value] = $level[0]->getParam('txt', '');
-
-        return true;
-    }
-
-    /**
-     * tag : OPTION
-     * mode : CLOSE
-     *
-     * @param    array $param
-     * @return boolean
-     */
-    protected function _tag_close_OPTION($param)
-    {
-        // nothing to do here
-
-        return true;
-    }
-
-    /**
-     * tag : SELECT
-     * mode : CLOSE
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_close_SELECT()
-    {
-        // position of the select
-        $x = $this->pdf->GetX();
-        $y = $this->pdf->GetY();
-        $f = 1.08*$this->parsingCss->value['font-size'];
-
-        // width
-        $w = $this->parsingCss->value['width'];
-        if (!$w) {
-            $w = 50;
-        }
-
-        // height (automatic)
-        $h = ($f*1.07*$this->_lstSelect['size'] + 1);
-
-        $prop = $this->parsingCss->getFormStyle();
-
-        // multy select
-        if ($this->_lstSelect['multi']) {
-            $prop['multipleSelection'] = 'true';
-        }
-
-
-        // single or multi select
-        if ($this->_lstSelect['size']>1) {
-            $this->pdf->ListBox($this->_lstSelect['name'], $w, $h, $this->_lstSelect['options'], $prop);
-        } else {
-            $this->pdf->ComboBox($this->_lstSelect['name'], $w, $h, $this->_lstSelect['options'], $prop);
-        }
-
-        $this->_maxX = max($this->_maxX, $x+$w);
-        $this->_maxY = max($this->_maxY, $y+$h);
-        $this->_maxH = max($this->_maxH, $h);
-        $this->_maxE++;
-        $this->pdf->SetX($x+$w);
-
-        $this->parsingCss->load();
-        $this->parsingCss->fontSet();
-
-        $this->_lstSelect = array();
-
-        return true;
-    }
-
-    /**
-     * tag : TEXTAREA
-     * mode : OPEN
-     *
-     * @param    array $param
-     * @return boolean
-     */
-    protected function _tag_open_TEXTAREA($param)
-    {
-        if (!isset($param['name'])) {
-            $param['name'] = 'champs_pdf_'.(count($this->_lstField)+1);
-        }
-
-        $param['name'] = strtolower($param['name']);
-
-        if (isset($this->_lstField[$param['name']])) {
-            $this->_lstField[$param['name']]++;
-        } else {
-            $this->_lstField[$param['name']] = 1;
-        }
-
-        $this->parsingCss->save();
-        $this->parsingCss->analyse('textarea', $param);
-        $this->parsingCss->setPosition();
-        $this->parsingCss->fontSet();
-
-        $x = $this->pdf->GetX();
-        $y = $this->pdf->GetY();
-        $fx = 0.65*$this->parsingCss->value['font-size'];
-        $fy = 1.08*$this->parsingCss->value['font-size'];
-
-        // extract the content the textarea : value
-        $level = $this->parsingHtml->getLevel($this->_parsePos);
-        $this->_parsePos+= count($level);
-
-        // automatic size, from cols and rows properties
-        $w = $fx*(isset($param['cols']) ? $param['cols'] : 22)+1;
-        $h = $fy*1.07*(isset($param['rows']) ? $param['rows'] : 3)+3;
-
-        $prop = $this->parsingCss->getFormStyle();
-
-        $prop['multiline'] = true;
-        $prop['value'] = $level[0]->getParam('txt', '');
-
-        $this->pdf->TextField($param['name'], $w, $h, $prop, array(), $x, $y);
-
-        $this->_maxX = max($this->_maxX, $x+$w);
-        $this->_maxY = max($this->_maxY, $y+$h);
-        $this->_maxH = max($this->_maxH, $h);
-        $this->_maxE++;
-        $this->pdf->SetX($x+$w);
-
-        return true;
-    }
-
-    /**
-     * tag : TEXTAREA
-     * mode : CLOSE
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_close_TEXTAREA()
-    {
-        $this->parsingCss->load();
-        $this->parsingCss->fontSet();
-
-        return true;
-    }
-
-    /**
-     * tag : INPUT
-     * mode : OPEN
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_open_INPUT($param)
-    {
-        if (!isset($param['name'])) {
-            $param['name']  = 'champs_pdf_'.(count($this->_lstField)+1);
-        }
-        if (!isset($param['value'])) {
-            $param['value'] = '';
-        }
-        if (!isset($param['type'])) {
-            $param['type']  = 'text';
-        }
-
-        $param['name'] = strtolower($param['name']);
-        $param['type'] = strtolower($param['type']);
-
-        // the type must be valid
-        if (!in_array($param['type'], array('text', 'checkbox', 'radio', 'hidden', 'submit', 'reset', 'button'))) {
-            $param['type'] = 'text';
-        }
-
-        if (isset($this->_lstField[$param['name']])) {
-            $this->_lstField[$param['name']]++;
-        } else {
-            $this->_lstField[$param['name']] = 1;
-        }
-
-        $this->parsingCss->save();
-        $this->parsingCss->analyse('input', $param);
-        $this->parsingCss->setPosition();
-        $this->parsingCss->fontSet();
-
-        $name = $param['name'];
-
-        $x = $this->pdf->GetX();
-        $y = $this->pdf->GetY();
-        $f = 1.08*$this->parsingCss->value['font-size'];
-
-        $prop = $this->parsingCss->getFormStyle();
-
-        switch ($param['type']) {
-            case 'checkbox':
-                $w = 4;
-                $h = $w;
-                if ($h<$f) {
-                    $y+= ($f-$h)*0.5;
-                }
-                $checked = (isset($param['checked']) && $param['checked'] === 'checked');
-                $this->pdf->CheckBox($name, $w, $checked, $prop, array(), ($param['value'] ? $param['value'] : 'Yes'), $x, $y);
-                break;
-
-            case 'radio':
-                $w = 4;
-                $h = $w;
-                if ($h<$f) {
-                    $y+= ($f-$h)*0.5;
-                }
-                $checked = (isset($param['checked']) && $param['checked'] === 'checked');
-                $this->pdf->RadioButton($name, $w, $prop, array(), ($param['value'] ? $param['value'] : 'On'), $checked, $x, $y);
-                break;
-
-            case 'hidden':
-                $w = 0;
-                $h = 0;
-                $prop['value'] = $param['value'];
-                $this->pdf->TextField($name, $w, $h, $prop, array(), $x, $y);
-                break;
-
-            case 'text':
-                $w = $this->parsingCss->value['width'];
-                if (!$w) {
-                    $w = 40;
-                }
-                $h = $f*1.3;
-                $prop['value'] = $param['value'];
-                $this->pdf->TextField($name, $w, $h, $prop, array(), $x, $y);
-                break;
-
-            case 'submit':
-                $w = $this->parsingCss->value['width'];
-                if (!$w) {
-                    $w = 40;
-                }
-                $h = $this->parsingCss->value['height'];
-                if (!$h) {
-                    $h = $f*1.3;
-                }
-                $action = array('S'=>'SubmitForm', 'F'=>$this->_isInForm, 'Flags'=>array('ExportFormat'));
-                $this->pdf->Button($name, $w, $h, $param['value'], $action, $prop, array(), $x, $y);
-                break;
-
-            case 'reset':
-                $w = $this->parsingCss->value['width'];
-                if (!$w) {
-                    $w = 40;
-                }
-                $h = $this->parsingCss->value['height'];
-                if (!$h) {
-                    $h = $f*1.3;
-                }
-                $action = array('S'=>'ResetForm');
-                $this->pdf->Button($name, $w, $h, $param['value'], $action, $prop, array(), $x, $y);
-                break;
-
-            case 'button':
-                $w = $this->parsingCss->value['width'];
-                if (!$w) {
-                    $w = 40;
-                }
-                $h = $this->parsingCss->value['height'];
-                if (!$h) {
-                    $h = $f*1.3;
-                }
-                $action = isset($param['onclick']) ? $param['onclick'] : '';
-                $this->pdf->Button($name, $w, $h, $param['value'], $action, $prop, array(), $x, $y);
-                break;
-
-            default:
-                $w = 0;
-                $h = 0;
-                break;
-        }
-
-        $this->_maxX = max($this->_maxX, $x+$w);
-        $this->_maxY = max($this->_maxY, $y+$h);
-        $this->_maxH = max($this->_maxH, $h);
-        $this->_maxE++;
-        $this->pdf->SetX($x+$w);
-
-        $this->parsingCss->load();
-        $this->parsingCss->fontSet();
-
-        return true;
-    }
-
-    /**
-     * tag : DRAW
-     * mode : OPEN
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_open_DRAW($param)
-    {
-        if ($this->_isForOneLine) {
-            return false;
-        }
-        if (!is_null($this->debug)) {
-            $this->debug->addStep('DRAW', true);
-        }
-
-        $this->parsingCss->save();
-        $this->parsingCss->analyse('draw', $param);
-        $this->parsingCss->fontSet();
-
-        $alignObject = null;
-        if ($this->parsingCss->value['margin-auto']) {
-            $alignObject = 'center';
-        }
-
-        $overW = $this->parsingCss->value['width'];
-        $overH = $this->parsingCss->value['height'];
-        $this->parsingCss->value['old_maxX'] = $this->_maxX;
-        $this->parsingCss->value['old_maxY'] = $this->_maxY;
-        $this->parsingCss->value['old_maxH'] = $this->_maxH;
-
-        $w = $this->parsingCss->value['width'];
-        $h = $this->parsingCss->value['height'];
-
-        if (!$this->parsingCss->value['position']) {
-            if ($w < ($this->pdf->getW() - $this->pdf->getlMargin()-$this->pdf->getrMargin()) &&
-                $this->pdf->GetX() + $w>=($this->pdf->getW() - $this->pdf->getrMargin())
-                ) {
-                $this->_tag_open_BR(array());
-            }
-
-            if (($h < ($this->pdf->getH() - $this->pdf->gettMargin()-$this->pdf->getbMargin())) &&
-                    ($this->pdf->GetY() + $h>=($this->pdf->getH() - $this->pdf->getbMargin())) &&
-                    !$this->_isInOverflow
-                ) {
-                $this->_setNewPage();
-            }
-
-            $old = $this->parsingCss->getOldValues();
-            $parentWidth = $old['width'] ? $old['width'] : $this->pdf->getW() - $this->pdf->getlMargin() - $this->pdf->getrMargin();
-
-            if ($parentWidth>$w) {
-                if ($alignObject === 'center') {
-                    $this->pdf->SetX($this->pdf->GetX() + ($parentWidth-$w)*0.5);
-                } elseif ($alignObject === 'right') {
-                    $this->pdf->SetX($this->pdf->GetX() + $parentWidth-$w);
-                }
-            }
-
-            $this->parsingCss->setPosition();
-        } else {
-            $old = $this->parsingCss->getOldValues();
-            $parentWidth = $old['width'] ? $old['width'] : $this->pdf->getW() - $this->pdf->getlMargin() - $this->pdf->getrMargin();
-
-            if ($parentWidth>$w) {
-                if ($alignObject === 'center') {
-                    $this->pdf->SetX($this->pdf->GetX() + ($parentWidth-$w)*0.5);
-                } elseif ($alignObject === 'right') {
-                    $this->pdf->SetX($this->pdf->GetX() + $parentWidth-$w);
-                }
-            }
-
-            $this->parsingCss->setPosition();
-            $this->_saveMax();
-            $this->_maxX = 0;
-            $this->_maxY = 0;
-            $this->_maxH = 0;
-            $this->_maxE = 0;
-        }
-
-        $this->_drawRectangle(
-            $this->parsingCss->value['x'],
-            $this->parsingCss->value['y'],
-            $this->parsingCss->value['width'],
-            $this->parsingCss->value['height'],
-            $this->parsingCss->value['border'],
-            $this->parsingCss->value['padding'],
-            0,
-            $this->parsingCss->value['background']
-        );
-
-        $marge = array();
-        $marge['l'] = $this->parsingCss->value['border']['l']['width'];
-        $marge['r'] = $this->parsingCss->value['border']['r']['width'];
-        $marge['t'] = $this->parsingCss->value['border']['t']['width'];
-        $marge['b'] = $this->parsingCss->value['border']['b']['width'];
-
-        $this->parsingCss->value['width'] -= $marge['l']+$marge['r'];
-        $this->parsingCss->value['height']-= $marge['t']+$marge['b'];
-
-        $overW-= $marge['l']+$marge['r'];
-        $overH-= $marge['t']+$marge['b'];
-
-        // clipping to draw only in the size opf the DRAW tag
-        $this->pdf->clippingPathStart(
-            $this->parsingCss->value['x']+$marge['l'],
-            $this->parsingCss->value['y']+$marge['t'],
-            $this->parsingCss->value['width'],
-            $this->parsingCss->value['height']
-        );
-
-        // left and right of the DRAW tag
-        $mL = $this->parsingCss->value['x']+$marge['l'];
-        $mR = $this->pdf->getW() - $mL - $overW;
-
-        // position of the DRAW tag
-        $x = $this->parsingCss->value['x']+$marge['l'];
-        $y = $this->parsingCss->value['y']+$marge['t'];
-
-        // prepare the drawing area
-        $this->_saveMargin($mL, 0, $mR);
-        $this->pdf->SetXY($x, $y);
-
-        $this->svgDrawer->startDrawing(
-            array(
-                'x' => $x,
-                'y' => $y,
-                'w' => $overW,
-                'h' => $overH,
-            )
-        );
-
-        return true;
-    }
-
-    /**
-     * tag : DRAW
-     * mode : CLOSE
-     *
-     * @param  array $param
-     * @return boolean
-     */
-    protected function _tag_close_DRAW($param)
-    {
-        if ($this->_isForOneLine) {
-            return false;
-        }
-
-        $this->svgDrawer->stopDrawing();
-
-
-        $this->_maxX = $this->parsingCss->value['old_maxX'];
-        $this->_maxY = $this->parsingCss->value['old_maxY'];
-        $this->_maxH = $this->parsingCss->value['old_maxH'];
-
-        $marge = array();
-        $marge['l'] = $this->parsingCss->value['border']['l']['width'];
-        $marge['r'] = $this->parsingCss->value['border']['r']['width'];
-        $marge['t'] = $this->parsingCss->value['border']['t']['width'];
-        $marge['b'] = $this->parsingCss->value['border']['b']['width'];
-
-        $x = $this->parsingCss->value['x'];
-        $y = $this->parsingCss->value['y'];
-        $w = $this->parsingCss->value['width']+$marge['l']+$marge['r'];
-        $h = $this->parsingCss->value['height']+$marge['t']+$marge['b'];
-
-        if ($this->parsingCss->value['position'] !== 'absolute') {
-            $this->pdf->SetXY($x+$w, $y);
-
-            $this->_maxX = max($this->_maxX, $x+$w);
-            $this->_maxY = max($this->_maxY, $y+$h);
-            $this->_maxH = max($this->_maxH, $h);
-            $this->_maxE++;
-        } else {
-            // position
-            $this->pdf->SetXY($this->parsingCss->value['xc'], $this->parsingCss->value['yc']);
-
-            $this->_loadMax();
-        }
-
-        $block = ($this->parsingCss->value['display'] !== 'inline' && $this->parsingCss->value['position'] !== 'absolute');
-
-        $this->parsingCss->load();
-        $this->parsingCss->fontSet();
-        $this->_loadMargin();
-
-        if ($block) {
-            $this->_tag_open_BR(array());
-        }
-        if (!is_null($this->debug)) {
-            $this->debug->addStep('DRAW', false);
-        }
-
-        return true;
-    }
-
-    /**
-     * tag : END_LAST_PAGE
-     * mode : OPEN
-     *
-     * @param  array $param
-     * @return void
-     */
-    protected function _tag_open_END_LAST_PAGE($param)
-    {
-        $height = $this->cssConverter->convertToMM(
-            $param['end_height'],
-            $this->pdf->getH() - $this->pdf->gettMargin()-$this->pdf->getbMargin()
-        );
-
-        if ($height < ($this->pdf->getH() - $this->pdf->gettMargin()-$this->pdf->getbMargin())
-            && $this->pdf->GetY() + $height>=($this->pdf->getH() - $this->pdf->getbMargin())
-        ) {
-            $this->_setNewPage();
-        }
-
-        $this->parsingCss->save();
-        $this->parsingCss->analyse('end_last_page', $param);
-        $this->parsingCss->setPosition();
-        $this->parsingCss->fontSet();
-
-        $this->pdf->SetY($this->pdf->getH() - $this->pdf->getbMargin() - $height);
-    }
-
-    /**
-     * tag : END_LAST_PAGE
-     * mode : CLOSE
-     *
-     * @param  array $param
-     * @return void
-     */
-    protected function _tag_close_END_LAST_PAGE($param)
-    {
-        $this->parsingCss->load();
-        $this->parsingCss->fontSet();
-    }
-
-    /**
-     * new page for the automatic Index, do not use this method. Only myPdf could use it !!!!
-     *
-     * @param  &int $page
-     * @return integer $oldPage
-     */
-    public function _INDEX_NewPage(&$page)
-    {
-        if ($page) {
-            $oldPage = $this->pdf->getPage();
-            $this->pdf->setPage($page);
-            $this->pdf->SetXY($this->_margeLeft, $this->_margeTop);
-            $this->_maxH = 0;
-            $page++;
-            return $oldPage;
-        } else {
-            $this->_setNewPage();
-            return null;
-        }
-    }
-}
diff --git a/html2pdf-master/src/Locale.php b/html2pdf-master/src/Locale.php
deleted file mode 100644
index e3c4259c..00000000
--- a/html2pdf-master/src/Locale.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Locale
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-
-namespace Spipu\Html2Pdf;
-
-use Spipu\Html2Pdf\Exception\LocaleException;
-
-class Locale
-{
-    /**
-     * code of the current used locale
-     * @var string
-     */
-    static protected $code = null;
-
-    /**
-     * texts of the current used locale
-     * @var array
-     */
-    static protected $list = array();
-
-    /**
-     * directory where locale files are
-     * @var string
-     */
-    static protected $directory = null;
-
-    /**
-     * load the locale
-     *
-     * @param  string $code
-     *
-     * @return void
-     * @throws LocaleException
-     */
-    public static function load($code)
-    {
-        if (self::$directory === null) {
-            self::$directory = __DIR__ . '/locale/';
-        }
-
-        // must be in lower case
-        $code = strtolower($code);
-
-        // must be [a-z-0-9]
-        if (!preg_match('/^([a-z0-9]+)$/isU', $code)) {
-            $e = new LocaleException(
-                'invalid language code'
-            );
-            $e->setLocaleCode($code);
-
-            throw $e;
-        }
-
-        // save the code
-        self::$code = $code;
-
-        // get the name of the locale file
-        $file = self::$directory.self::$code.'.csv';
-
-        // the file must exist
-        if (!is_file($file)) {
-            $e = new LocaleException(
-                'unknown language code. You can create the locale file and push it on the Html2Pdf GitHub project.'
-            );
-            $e->setLocaleCode($code);
-
-            throw $e;
-        }
-
-        // load the file
-        self::$list = array();
-        $handle = fopen($file, 'r');
-        while (!feof($handle)) {
-            $line = fgetcsv($handle);
-            if (!is_array($line) || count($line) !=2) {
-                continue;
-            }
-            self::$list[trim($line[0])] = trim($line[1]);
-        }
-        fclose($handle);
-    }
-
-    /**
-     * clean the locale
-     *
-     * @return void
-     */
-    public static function clean()
-    {
-        self::$code = null;
-        self::$list = array();
-    }
-
-    /**
-     * get a text
-     *
-     * @param string $key
-     * @param string $default
-     *
-     * @return string
-     */
-    public static function get($key, $default = '######')
-    {
-        return (isset(self::$list[$key]) ? self::$list[$key] : $default);
-    }
-}
diff --git a/html2pdf-master/src/MyPdf.php b/html2pdf-master/src/MyPdf.php
deleted file mode 100644
index 384842d9..00000000
--- a/html2pdf-master/src/MyPdf.php
+++ /dev/null
@@ -1,1545 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - myPdf class
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-
-namespace Spipu\Html2Pdf;
-
-use Spipu\Html2Pdf\Exception\HtmlParsingException;
-
-class MyPdf extends \TCPDF
-{
-    protected $_footerParam = array();
-    protected $_transf      = array();
-    protected $_myLastPageGroup = null;
-    protected $_myLastPageGroupNb = 0;
-
-    // used to make a radius with bezier : (4/3 * (sqrt(2) - 1))
-    const MY_ARC = 0.5522847498;
-
-    // nb of segment to build a arc with bezier curv
-    const ARC_NB_SEGMENT = 8;
-
-    /**
-     * class constructor
-     *
-     * @param string  $orientation page orientation, same as TCPDF
-     * @param string  $unit        User measure unit, same as TCPDF
-     * @param mixed   $format      The format used for pages, same as TCPDF
-     * @param boolean $unicode     TRUE means that the input text is unicode (default = true)
-     * @param String  $encoding    charset encoding; default is UTF-8
-     * @param boolean $diskcache   if TRUE reduce the RAM memory usage by caching temporary data on filesystem (slower).
-     * @param boolean $pdfa        If TRUE set the document to PDF/A mode.
-     * @access public
-     */
-    public function __construct(
-        $orientation = 'P',
-        $unit = 'mm',
-        $format = 'A4',
-        $unicode = true,
-        $encoding = 'UTF-8',
-        $diskcache = false,
-        $pdfa = false
-    ) {
-        // call the parent constructor
-        parent::__construct($orientation, $unit, $format, $unicode, $encoding, $diskcache, $pdfa);
-
-        // init the specific parameters used by Html2Pdf
-        $this->SetCreator(PDF_CREATOR);
-        $this->SetAutoPageBreak(false, 0);
-        $this->linestyleCap = '2 J';
-        $this->setPrintHeader(false);
-        $this->jpeg_quality = 90;
-
-        // prepare the automatic footer
-        $this->SetMyFooter();
-
-        $this->setCellPaddings(0, 0, 0, 0);
-        $this->setCellMargins(0, 0, 0, 0);
-    }
-
-    /**
-     * Set the parameters for the automatic footer
-     *
-     * @param boolean $page display the page number
-     * @param boolean $date display the date
-     * @param boolean $time display the time
-     * @param boolean $form display a warning abour forms
-     * @access public
-     */
-    public function SetMyFooter($page = false, $date = false, $time = false, $form = false)
-    {
-        $page    = ($page ? true : false);
-        $date    = ($date ? true : false);
-        $time    = ($time ? true : false);
-        $form    = ($form ? true : false);
-
-        $this->_footerParam = array('page' => $page, 'date' => $date, 'time' => $time, 'form' => $form);
-    }
-
-    /**
-     * This function is call automatically by TCPDF at the end of a page
-     * It takes no parameters
-     *
-     * @access public
-     */
-    public function Footer()
-    {
-        // prepare the text from the tranlated text
-        $txt = '';
-        if ($this->_footerParam['form']) {
-            $txt = Locale::get('pdf05');
-        }
-        if ($this->_footerParam['date'] && $this->_footerParam['time']) {
-            $txt.= ($txt ? ' - ' : '').Locale::get('pdf03');
-        }
-        if ($this->_footerParam['date'] && !$this->_footerParam['time']) {
-            $txt.= ($txt ? ' - ' : '').Locale::get('pdf01');
-        }
-        if (!$this->_footerParam['date'] && $this->_footerParam['time']) {
-            $txt.= ($txt ? ' - ' : '').Locale::get('pdf02');
-        }
-        if ($this->_footerParam['page']) {
-            $txt.= ($txt ? ' - ' : '').Locale::get('pdf04');
-        }
-
-        if (strlen($txt)>0) {
-            // replace some values
-            $toReplace = array(
-                '[[date_d]]'  => date('d'),
-                '[[date_m]]'  => date('m'),
-                '[[date_y]]'  => date('Y'),
-                '[[date_h]]'  => date('H'),
-                '[[date_i]]'  => date('i'),
-                '[[date_s]]'  => date('s'),
-                '[[page_cu]]' => $this->getMyNumPage(),
-                '[[page_nb]]' => $this->getMyAliasNbPages(),
-            );
-            $txt = str_replace(array_keys($toReplace), array_values($toReplace), $txt);
-
-            // draw the footer
-            parent::SetY(-11);
-            $this->SetFont('helvetica', 'I', 8);
-            $this->Cell(0, 10, $txt, 0, 0, 'R');
-        }
-    }
-
-    /**
-     * after cloning a object, we does not want to clone all the front informations
-     * because it take a lot a time and a lot of memory => we use reference
-     *
-     * @param myPdf &$pdf
-     * @access public
-     */
-    public function cloneFontFrom(&$pdf)
-    {
-        $this->n                = &$pdf->getN();
-        $this->fonts            = &$pdf->getFonts();
-        $this->FontFiles        = &$pdf->getFontFiles();
-        $this->diffs            = &$pdf->getDiffs();
-        $this->fontlist         = &$pdf->getFontList();
-        $this->numfonts         = &$pdf->getNumFonts();
-        $this->fontkeys         = &$pdf->getFontKeys();
-        $this->font_obj_ids     = &$pdf->getFontObjIds();
-        $this->annotation_fonts = &$pdf->getAnnotFonts();
-    }
-
-    /**
-     * multiple public accessor for some private attributs
-     * used only by cloneFontFrom
-     *
-     * @return &array
-     * @access public
-     */
-    public function &getFonts()
-    {
-        return $this->fonts;
-    }
-    public function &getFontFiles()
-    {
-        return $this->FontFiles;
-    }
-    public function &getDiffs()
-    {
-        return $this->diffs;
-    }
-    public function &getFontList()
-    {
-        return $this->fontlist;
-    }
-    public function &getNumFonts()
-    {
-        return $this->numfonts;
-    }
-    public function &getFontKeys()
-    {
-        return $this->fontkeys;
-    }
-    public function &getFontObjIds()
-    {
-        return $this->font_obj_ids;
-    }
-    public function &getAnnotFonts()
-    {
-        return $this->annotation_fonts;
-    }
-    public function &getN()
-    {
-        return $this->n;
-    }
-
-    /**
-     * Verify that a Font is already loaded
-     *
-     * @param string Font Key
-     * @return boolean
-     * @access public
-     */
-    public function isLoadedFont($fontKey)
-    {
-        if (isset($this->fonts[$fontKey])) {
-            return true;
-        }
-
-        if (isset($this->CoreFonts[$fontKey])) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Get the Word Spacing
-     *
-     * @access public
-     * @return float word spacing
-     */
-    public function getWordSpacing()
-    {
-        return $this->ws;
-    }
-
-    /**
-     * set the Word Spacing
-     *
-     * @param float word spacing
-     * @access public
-     */
-    public function setWordSpacing($ws = 0.)
-    {
-        $this->ws = $ws;
-        $this->_out(sprintf('%.3F Tw', $ws*$this->k));
-    }
-
-    /**
-     * start to use a rectangular Cliping Path with radius corners
-     *
-     * @param float $x (top left corner)
-     * @param float $y (top left corner)
-     * @param float $w (x+w  = botom rigth corner)
-     * @param float $h (y+h = botom rigth corner)
-     * @param array $cornerTL radius of the Top Left corner
-     * @param array $cornerTR radius of the Top Right corner
-     * @param array $cornerBL radius of the Bottom Left corner
-     * @param array $cornerBR radius of the Bottom Right corner
-     * @access public
-     */
-    public function clippingPathStart(
-        $x = null,
-        $y = null,
-        $w = null,
-        $h = null,
-        $cornerTL = null,
-        $cornerTR = null,
-        $cornerBL = null,
-        $cornerBR = null
-    ) {
-    
-        // init the path
-        $path = '';
-
-        // if we have the position and the size of the rectangle, we can proceed
-        if ($x !== null && $y !== null && $w !== null && $h !== null) {
-            // the positions of the rectangle's corners
-            $x1 = $x*$this->k;
-            $y1 = ($this->h-$y)*$this->k;
-
-            $x2 = ($x+$w)*$this->k;
-            $y2 = ($this->h-$y)*$this->k;
-
-            $x3 = ($x+$w)*$this->k;
-            $y3 = ($this->h-$y-$h)*$this->k;
-
-            $x4 = $x*$this->k;
-            $y4 = ($this->h-$y-$h)*$this->k;
-
-            // if we have at least one radius corner, then we proceed to a specific path, else it is just a rectangle
-            if ($cornerTL || $cornerTR || $cornerBL || $cornerBR) {
-                // prepare the radius values
-                if ($cornerTL) {
-                    $cornerTL[0] = $cornerTL[0]*$this->k;
-                    $cornerTL[1] =-$cornerTL[1]*$this->k;
-                }
-                if ($cornerTR) {
-                    $cornerTR[0] = $cornerTR[0]*$this->k;
-                    $cornerTR[1] =-$cornerTR[1]*$this->k;
-                }
-                if ($cornerBL) {
-                    $cornerBL[0] = $cornerBL[0]*$this->k;
-                    $cornerBL[1] =-$cornerBL[1]*$this->k;
-                }
-                if ($cornerBR) {
-                    $cornerBR[0] = $cornerBR[0]*$this->k;
-                    $cornerBR[1] =-$cornerBR[1]*$this->k;
-                }
-
-                // if TL radius then specific start else (X1,Y1)
-                if ($cornerTL) {
-                    $path.= sprintf('%.2F %.2F m ', $x1+$cornerTL[0], $y1);
-                } else {
-                    $path.= sprintf('%.2F %.2F m ', $x1, $y1);
-                }
-
-                // if TR radius then line + arc, else line to (X2,Y2)
-                if ($cornerTR) {
-                    $xt1 = ($x2-$cornerTR[0])+$cornerTR[0]*self::MY_ARC;
-                    $yt1 = ($y2+$cornerTR[1])-$cornerTR[1];
-                    $xt2 = ($x2-$cornerTR[0])+$cornerTR[0];
-                    $yt2 = ($y2+$cornerTR[1])-$cornerTR[1]*self::MY_ARC;
-
-                    $path.= sprintf('%.2F %.2F l ', $x2-$cornerTR[0], $y2);
-                    $path.= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $x2, $y2+$cornerTR[1]);
-                } else {
-                    $path.= sprintf('%.2F %.2F l ', $x2, $y2);
-                }
-
-                // if BR radius then line + arc, else line to (X3, Y3)
-                if ($cornerBR) {
-                    $xt1 = ($x3-$cornerBR[0])+$cornerBR[0];
-                    $yt1 = ($y3-$cornerBR[1])+$cornerBR[1]*self::MY_ARC;
-                    $xt2 = ($x3-$cornerBR[0])+$cornerBR[0]*self::MY_ARC;
-                    $yt2 = ($y3-$cornerBR[1])+$cornerBR[1];
-
-                    $path.= sprintf('%.2F %.2F l ', $x3, $y3-$cornerBR[1]);
-                    $path.= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $x3-$cornerBR[0], $y3);
-                } else {
-                    $path.= sprintf('%.2F %.2F l ', $x3, $y3);
-                }
-
-                // if BL radius then line + arc, else line to (X4, Y4)
-                if ($cornerBL) {
-                    $xt1 = ($x4+$cornerBL[0])-$cornerBL[0]*self::MY_ARC;
-                    $yt1 = ($y4-$cornerBL[1])+$cornerBL[1];
-                    $xt2 = ($x4+$cornerBL[0])-$cornerBL[0];
-                    $yt2 = ($y4-$cornerBL[1])+$cornerBL[1]*self::MY_ARC;
-
-                    $path.= sprintf('%.2F %.2F l ', $x4+$cornerBL[0], $y4);
-                    $path.= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $x4, $y4-$cornerBL[1]);
-                } else {
-                    $path.= sprintf('%.2F %.2F l ', $x4, $y4);
-                }
-
-                // if RL radius then line + arc
-                if ($cornerTL) {
-                    $xt1 = ($x1+$cornerTL[0])-$cornerTL[0];
-                    $yt1 = ($y1+$cornerTL[1])-$cornerTL[1]*self::MY_ARC;
-                    $xt2 = ($x1+$cornerTL[0])-$cornerTL[0]*self::MY_ARC;
-                    $yt2 = ($y1+$cornerTL[1])-$cornerTL[1];
-
-                    $path.= sprintf('%.2F %.2F l ', $x1, $y1+$cornerTL[1]);
-                    $path.= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $x1+$cornerTL[0], $y1);
-                }
-            } else {
-                $path.= sprintf('%.2F %.2F m ', $x1, $y1);
-                $path.= sprintf('%.2F %.2F l ', $x2, $y2);
-                $path.= sprintf('%.2F %.2F l ', $x3, $y3);
-                $path.= sprintf('%.2F %.2F l ', $x4, $y4);
-            }
-
-            // close the path
-            $path.= ' h W n';
-        }
-
-        // using the path as a clipping path
-        $this->_out('q '.$path.' ');
-    }
-
-    /**
-     * stop to use the Cliping Path
-     *
-     * @access public
-     */
-    public function clippingPathStop()
-    {
-        $this->_out(' Q');
-    }
-
-    /**
-     * draw a filled corner of a border with a external and a internal radius
-     *         /--------+ ext2
-     *        /         |
-     *       /  /-------+ int2
-     *      /  /
-     *      | /
-     *      | |
-     *      | |
-     * ext1 +-+ int1        + cen
-     *
-     * @param float $ext1X
-     * @param float $ext1Y
-     * @param float $ext2X
-     * @param float $ext2Y
-     * @param float $int1X
-     * @param float $int1Y
-     * @param float $int2X
-     * @param float $int2Y
-     * @param float $cenX
-     * @param float $cenY
-     * @access public
-     */
-    public function drawCurve($ext1X, $ext1Y, $ext2X, $ext2Y, $int1X, $int1Y, $int2X, $int2Y, $cenX, $cenY)
-    {
-        // prepare the coordinates
-        $ext1X = $ext1X*$this->k;
-        $ext2X = $ext2X*$this->k;
-        $int1X = $int1X*$this->k;
-        $int2X = $int2X*$this->k;
-        $cenX  = $cenX*$this->k;
-
-        $ext1Y = ($this->h-$ext1Y)*$this->k;
-        $ext2Y = ($this->h-$ext2Y)*$this->k;
-        $int1Y = ($this->h-$int1Y)*$this->k;
-        $int2Y = ($this->h-$int2Y)*$this->k;
-        $cenY  = ($this->h-$cenY) *$this->k;
-
-        // init the curve
-        $path = '';
-
-        if ($ext1X-$cenX !=0) {
-            $xt1 = $cenX+($ext1X-$cenX);
-            $yt1 = $cenY+($ext2Y-$cenY)*self::MY_ARC;
-            $xt2 = $cenX+($ext1X-$cenX)*self::MY_ARC;
-            $yt2 = $cenY+($ext2Y-$cenY);
-        } else {
-            $xt1 = $cenX+($ext2X-$cenX)*self::MY_ARC;
-            $yt1 = $cenY+($ext1Y-$cenY);
-            $xt2 = $cenX+($ext2X-$cenX);
-            $yt2 = $cenY+($ext1Y-$cenY)*self::MY_ARC;
-        }
-        $path.= sprintf('%.2F %.2F m ', $ext1X, $ext1Y);
-        $path.= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $ext2X, $ext2Y);
-
-        if ($int1X-$cenX !=0) {
-            $xt1 = $cenX+($int1X-$cenX)*self::MY_ARC;
-            $yt1 = $cenY+($int2Y-$cenY);
-            $xt2 = $cenX+($int1X-$cenX);
-            $yt2 = $cenY+($int2Y-$cenY)*self::MY_ARC;
-        } else {
-            $xt1 = $cenX+($int2X-$cenX);
-            $yt1 = $cenY+($int1Y-$cenY)*self::MY_ARC;
-            $xt2 = $cenX+($int2X-$cenX)*self::MY_ARC;
-            $yt2 = $cenY+($int1Y-$cenY);
-        }
-        $path.= sprintf('%.2F %.2F l ', $int2X, $int2Y);
-        $path.= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $int1X, $int1Y);
-
-        // draw the curve
-        $this->_out($path . 'f');
-    }
-
-    /**
-     * draw a filled corner of a border with only a external radius
-     *         /--+ ext2
-     *        /   |
-     *       /    |
-     *      /     |
-     *      |     |
-     *      |     |
-     *      |     |
-     * ext1 +-----+ int      + cen
-     *
-     * @param float $ext1X
-     * @param float $ext1Y
-     * @param float $ext2X
-     * @param float $ext2Y
-     * @param float $intX
-     * @param float $intY
-     * @param float $cenX
-     * @param float $cenY
-     * @access public
-     */
-    public function drawCorner($ext1X, $ext1Y, $ext2X, $ext2Y, $intX, $intY, $cenX, $cenY)
-    {
-        // prepare the coordinates
-        $ext1X = $ext1X*$this->k;
-        $ext2X = $ext2X*$this->k;
-        $intX  = $intX*$this->k;
-        $cenX  = $cenX*$this->k;
-
-        $ext1Y = ($this->h-$ext1Y)*$this->k;
-        $ext2Y = ($this->h-$ext2Y)*$this->k;
-        $intY  = ($this->h-$intY)*$this->k;
-        $cenY  = ($this->h-$cenY)*$this->k;
-
-        // init the curve
-        $path = '';
-
-        if ($ext1X-$cenX !=0) {
-            $xt1 = $cenX+($ext1X-$cenX);
-            $yt1 = $cenY+($ext2Y-$cenY)*self::MY_ARC;
-            $xt2 = $cenX+($ext1X-$cenX)*self::MY_ARC;
-            $yt2 = $cenY+($ext2Y-$cenY);
-        } else {
-            $xt1 = $cenX+($ext2X-$cenX)*self::MY_ARC;
-            $yt1 = $cenY+($ext1Y-$cenY);
-            $xt2 = $cenX+($ext2X-$cenX);
-            $yt2 = $cenY+($ext1Y-$cenY)*self::MY_ARC;
-        }
-        $path.= sprintf('%.2F %.2F m ', $ext1X, $ext1Y);
-        $path.= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $ext2X, $ext2Y);
-        $path.= sprintf('%.2F %.2F l ', $intX, $intY);
-        $path.= sprintf('%.2F %.2F l ', $ext1X, $ext1Y);
-
-        // draw the curve
-        $this->_out($path . 'f');
-    }
-
-    /**
-     * Start a transformation
-     *
-     * @access public
-     */
-    public function startTransform()
-    {
-        $this->_out('q');
-    }
-
-    /**
-     * Stop a transformation
-     *
-     * @access public
-     */
-    public function stopTransform()
-    {
-        $this->_out('Q');
-    }
-
-    /**
-     * add a Translate transformation
-     *
-     * @param float $Tx
-     * @param float $Ty
-     * @access public
-     */
-    public function setTranslate($xT, $yT)
-    {
-        // Matrix for Translate
-        $tm[0]=1;
-        $tm[1]=0;
-        $tm[2]=0;
-        $tm[3]=1;
-        $tm[4]=$xT*$this->k;
-        $tm[5]=-$yT*$this->k;
-
-        // apply the Transform Matric
-        $this->_out(sprintf('%.3F %.3F %.3F %.3F %.3F %.3F cm', $tm[0], $tm[1], $tm[2], $tm[3], $tm[4], $tm[5]));
-    }
-
-    /**
-     * add a Rotate transformation
-     *
-     * @param float $angle
-     * @param float $Cx
-     * @param float $Cy
-     * @access public
-     */
-    public function setRotation($angle, $xC = null, $yC = null)
-    {
-        // if no center, rotate around the current posiition
-        if ($xC === null) {
-            $xC=$this->x;
-        }
-        if ($yC === null) {
-            $yC=$this->y;
-        }
-
-        // prepare the coordinate
-        $yC=($this->h-$yC)*$this->k;
-        $xC*=$this->k;
-
-        // Matrix for Rotate
-        $tm[0]=cos(deg2rad($angle));
-        $tm[1]=sin(deg2rad($angle));
-        $tm[2]=-$tm[1];
-        $tm[3]=$tm[0];
-        $tm[4]=$xC+$tm[1]*$yC-$tm[0]*$xC;
-        $tm[5]=$yC-$tm[0]*$yC-$tm[1]*$xC;
-
-        // apply the Transform Matric
-        $this->_out(sprintf('%.3F %.3F %.3F %.3F %.3F %.3F cm', $tm[0], $tm[1], $tm[2], $tm[3], $tm[4], $tm[5]));
-    }
-
-    /**
-     * we redefine the original SetX method, because we don't want the automatic treatment.
-     * It is Html2Pdf that make the treatment.
-     * If language is RTL direction this method will call to parent (TCPDF class).
-     *
-     * @param float   $x
-     * @param boolean $rtloff
-     * @access public
-     */
-    public function SetX($x, $rtloff = false)
-    {
-        if (!$rtloff && $this->rtl) {
-            parent::SetX($x, $rtloff);
-            return;
-        }
-
-        $this->x=$x;
-    }
-
-    /**
-     * we redefine the original SetY method, because we don't want the automatic treatment.
-     * It is Html2Pdf that make the treatment.
-     * If language is RTL direction this method will call to parent (TCPDF class).
-     *
-     * @param float   $y
-     * @param boolean $resetx Reset the X position
-     * @param boolean $rtloff
-     * @access public
-     */
-    public function SetY($y, $resetx = true, $rtloff = false)
-    {
-        if (!$rtloff && $this->rtl) {
-            parent::SetY($y, $resetx, $rtloff);
-            return;
-        }
-
-        if ($resetx) {
-            $this->x=$this->lMargin;
-        }
-
-        $this->y=$y;
-    }
-
-    /**
-     * we redefine the original SetXY method, because we don't want the automatic treatment.
-     * It is Html2Pdf that make the treatment.
-     * If language is RTL direction this method will call to parent (TCPDF class).
-     *
-     * @param integer $x
-     * @param integer $y
-     * @param boolean $rtloff
-     * @access public
-     */
-    public function SetXY($x, $y, $rtloff = false)
-    {
-        if (!$rtloff && $this->rtl) {
-            parent::SetXY($x, $y, $rtloff);
-            return;
-        }
-
-        $this->x=$x;
-        $this->y=$y;
-    }
-
-    /**
-     * multiple public accessor because Html2Pdf need to use TCPDF without being a extend of it
-     *
-     * @param  mixed
-     * @return mixed
-     * @access public
-     */
-    public function getK()
-    {
-        return $this->k;
-    }
-    public function getW()
-    {
-        return $this->w;
-    }
-    public function getH()
-    {
-        return $this->h;
-    }
-    public function getlMargin()
-    {
-        return $this->lMargin;
-    }
-    public function getrMargin()
-    {
-        return $this->rMargin;
-    }
-    public function gettMargin()
-    {
-        return $this->tMargin;
-    }
-    public function getbMargin()
-    {
-        return $this->bMargin;
-    }
-    public function setbMargin($v)
-    {
-        $this->bMargin=$v;
-    }
-
-    /**
-     * SVG - Convert a SVG Style in PDF Style
-     *
-     * @param  array  $styles SVG Style
-     * @return string PDF style
-     * @access public
-     */
-    public function svgSetStyle($styles)
-    {
-        // init the PDF style
-        $style = '';
-
-        // Style : fill
-        if ($styles['fill']) {
-            $this->SetFillColorArray($styles['fill']);
-            $style.= 'F';
-        }
-
-        // Style : stroke
-        if ($styles['stroke'] && $styles['stroke-width']) {
-            $this->SetDrawColorArray($styles['stroke']);
-            $this->SetLineWidth($styles['stroke-width']);
-            $style.= 'D';
-        }
-
-        // Style : opacity
-        if ($styles['fill-opacity']) {
-            $this->SetAlpha($styles['fill-opacity']);
-        }
-
-        return $style;
-    }
-
-    /**
-     * SVG - make a Rectangle
-     *
-     * @param float $x
-     * @param float $y
-     * @param float $w
-     * @param float $h
-     * @param string $style PDF Style
-     * @access public
-     */
-    public function svgRect($x, $y, $w, $h, $style)
-    {
-        // prepare the 4 corners
-        $x1=$x;
-        $x2=$x+$w;
-        $x3=$x+$w;
-        $x4=$x;
-
-        $y1=$y;
-        $y2=$y;
-        $y3=$y+$h;
-        $y4=$y+$h;
-
-        // get the Closing operator from the PDF Style
-        if ($style === 'F') {
-            $op='f';
-        } elseif ($style === 'FD' || $style === 'DF') {
-            $op='B';
-        } else {
-            $op='S';
-        }
-
-        // drawing
-        $this->_Point($x1, $y1, true);
-        $this->_Line($x2, $y2, true);
-        $this->_Line($x3, $y3, true);
-        $this->_Line($x4, $y4, true);
-        $this->_Line($x1, $y1, true);
-        $this->_out($op);
-    }
-
-    /**
-     * SVG - make a Line
-     *
-     * @param float $x1
-     * @param float $y1
-     * @param float $x2
-     * @param float $y2
-     * @access public
-     */
-    public function svgLine($x1, $y1, $x2, $y2)
-    {
-        // get the Closing operator
-        $op='S';
-
-        // drawing
-        $this->_Point($x1, $y1, true);
-        $this->_Line($x2, $y2, true);
-        $this->_out($op);
-    }
-
-    /**
-     * SVG - make a Ellipse
-     *
-     * @param float  $x0 x Center
-     * @param float  $y0 y Center
-     * @param float  $rx x radius
-     * @param float  $ry y radius
-     * @param string $style PDF Style
-     * @access public
-     */
-    public function svgEllipse($x0, $y0, $rx, $ry, $style)
-    {
-        // get the Closing operator from the PDF Style
-        if ($style === 'F') {
-            $op='f';
-        } elseif ($style === 'FD' || $style === 'DF') {
-            $op='B';
-        } else {
-            $op='S';
-        }
-
-        // drawing
-        $this->_Arc($x0, $y0, $rx, $ry, 0, 2*M_PI, true, true, true);
-        $this->_out($op);
-    }
-
-    /**
-     * SVG - make a Advanced Polygone
-     *
-     * @param array  $actions list of actions
-     * @param string $style PDF Style
-     * @access public
-     */
-    public function svgPolygone($actions, $style)
-    {
-        // get the Closing operator from the PDF Style
-        if ($style === 'F') {
-            $op='f';
-        } elseif ($style === 'FD' || $style === 'DF') {
-            $op='B';
-        } else {
-            $op='S';
-        }
-
-        // To save the First action and the last point
-        $first = array('', 0, 0);
-        $last = array(0, 0, 0, 0);
-
-        foreach ($actions as $action) {
-            switch ($action[0]) {
-                // Start the Path - move - absolute
-                case 'M':
-                    $first = $action;
-                    $x = $action[1];
-                    $y = $action[2];
-                    $xc = $x;
-                    $yc = $y;
-                    $this->_Point($x, $y, true);
-                    break;
-
-                // Start the Path - move - relative
-                case 'm':
-                    $first = $action;
-                    $x = $last[0]+$action[1];
-                    $y = $last[1]+$action[2];
-                    $xc = $x;
-                    $yc = $y;
-                    $this->_Point($x, $y, true);
-                    break;
-
-                // Close the Path
-                case 'Z':
-                case 'z':
-                    $x = $first[1];
-                    $y = $first[2];
-                    $xc = $x;
-                    $yc = $y;
-                    $this->_Line($x, $y, true);
-                    break;
-
-                // Make a Line (new point)
-                case 'L':
-                    $x = $action[1];
-                    $y = $action[2];
-                    $xc = $x;
-                    $yc = $y;
-                    $this->_Line($x, $y, true);
-                    break;
-
-                // Make a Line (vector from last point)
-                case 'l':
-                    $x = $last[0]+$action[1];
-                    $y = $last[1]+$action[2];
-                    $xc = $x;
-                    $yc = $y;
-                    $this->_Line($x, $y, true);
-                    break;
-
-                // Make a Horizontal Line (new point)
-                case 'H':
-                    $x = $action[1];
-                    $y = $last[1];
-                    $xc = $x;
-                    $yc = $y;
-                    $this->_Line($x, $y, true);
-                    break;
-
-                // Make a Horisontal Line (vector from last point)
-                case 'h':
-                    $x = $last[0]+$action[1];
-                    $y = $last[1];
-                    $xc = $x;
-                    $yc = $y;
-                    $this->_Line($x, $y, true);
-                    break;
-
-                // Make a Vertical Line (new point)
-                case 'V':
-                    $x = $last[0];
-                    $y = $action[1];
-                    $xc = $x;
-                    $yc = $y;
-                    $this->_Line($x, $y, true);
-                    break;
-
-                // Make a Vertical Line (vector from last point)
-                case 'v':
-                    $x = $last[0];
-                    $y = $last[1]+$action[1];
-                    $xc = $x;
-                    $yc = $y;
-                    $this->_Line($x, $y, true);
-                    break;
-
-                // Make a Arc (new point)
-                case 'A':
-                    $rx = $action[1];   // rx
-                    $ry = $action[2];   // ry
-                    $a = $action[3];    // deviation angle of the axis X
-                    $l = $action[4];    // large-arc-flag
-                    $s = $action[5];    // sweep-flag
-                    $x1 = $last[0];     // begin x
-                    $y1 = $last[1];     // begin y
-                    $x2 = $action[6];   // final x
-                    $y2 = $action[7];   // final y
-
-                    $this->_Arc2($x1, $y1, $x2, $y2, $rx, $ry, $a, $l, $s, true);
-                    $x = $x2;
-                    $y = $y2;
-                    $xc = $x;
-                    $yc = $y;
-                    break;
-
-                // Make a Arc (vector from last point)
-                case 'a':
-                    $rx = $action[1];   // rx
-                    $ry = $action[2];   // ry
-                    $a = $action[3];    // deviation angle of the axis X
-                    $l = $action[4];    // large-arc-flag
-                    $s = $action[5];    // sweep-flag
-                    $x1 = $last[0];     // begin x
-                    $y1 = $last[1];     // begin y
-                    $x2 = $last[0]+$action[6]; // final x
-                    $y2 = $last[1]+$action[7]; // final y
-
-                    $this->_Arc2($x1, $y1, $x2, $y2, $rx, $ry, $a, $l, $s, true);
-                    $x = $x2;
-                    $y = $y2;
-                    $xc = $x;
-                    $yc = $y;
-                    break;
-
-                // Make a Bezier Curve (new point)
-                case 'C':
-                    $x1 = $action[1];
-                    $y1 = $action[2];
-                    $x2 = $action[3];
-                    $y2 = $action[4];
-                    $xf = $action[5];
-                    $yf = $action[6];
-                    $this->_Curve($x1, $y1, $x2, $y2, $xf, $yf, true);
-                    $x = $xf;
-                    $y = $yf;
-                    $xc = $x2;
-                    $yc = $y2;
-                    break;
-
-                // Make a Bezier Curve (vector from last point)
-                case 'c':
-                    $x1 = $last[0]+$action[1];
-                    $y1 = $last[1]+$action[2];
-                    $x2 = $last[0]+$action[3];
-                    $y2 = $last[1]+$action[4];
-                    $xf = $last[0]+$action[5];
-                    $yf = $last[1]+$action[6];
-                    $this->_Curve($x1, $y1, $x2, $y2, $xf, $yf, true);
-                    $x = $xf;
-                    $y = $yf;
-                    $xc = $x2;
-                    $yc = $y2;
-                    break;
-
-                // Unknown Path
-                default:
-                    $e = new HtmlParsingException('SVG Path Error : ['.$action[0].'] is unknown');
-                    $e->setInvalidTag('POLYGON');
-                    throw $e;
-            }
-
-            // save the last point
-            $last = array($x, $y, $xc, $yc);
-        }
-
-        // finish the path
-        $this->_out($op);
-    }
-
-    /**
-     * SVG - go to a point
-     *
-     * @param float   $x
-     * @param float   $y
-     * @param boolean $trans apply transformation
-     * @access protected
-     */
-    protected function _Point($x, $y, $trans = false)
-    {
-        if ($trans) {
-            $this->ptTransform($x, $y);
-        }
-
-        $this->_out(sprintf('%.2F %.2F m', $x, $y));
-    }
-
-    /**
-     * SVG - make a line from the last point to (x,y)
-     *
-     * @param float   $x
-     * @param float   $y
-     * @param boolean $trans apply transformation
-     * @access protected
-     */
-    protected function _Line($x, $y, $trans = false)
-    {
-        if ($trans) {
-            $this->ptTransform($x, $y);
-        }
-
-        $this->_out(sprintf('%.2F %.2F l', $x, $y));
-    }
-
-    /**
-     * SVG - make a bezier curve from the last point to (xf,yf), with the 2 direction points (x1,y1) and (x2,y2)
-     *
-     * @param float $x1
-     * @param float $y1
-     * @param float $x2
-     * @param float $y2
-     * @param float $xf
-     * @param float $yf
-     * @param boolean $trans apply transformation
-     * @access protected
-     */
-    protected function _Curve($x1, $y1, $x2, $y2, $xf, $yf, $trans = false)
-    {
-        if ($trans) {
-            $this->ptTransform($x1, $y1);
-            $this->ptTransform($x2, $y2);
-            $this->ptTransform($xf, $yf);
-        }
-        $this->_out(sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c', $x1, $y1, $x2, $y2, $xf, $yf));
-    }
-
-    /**
-     * SVG - make a arc with Center, Radius, from angleBegin to angleEnd
-     *
-     * @param float $xc
-     * @param float $yc
-     * @param float $rx
-     * @param float $ry
-     * @param float $angleBegin in radians
-     * @param float $angleEng in radians
-     * @param boolean $direction
-     * @param boolean $drawFirst, true => add the first point
-     * @param boolean $trans apply transformation
-     * @access protected
-     */
-    protected function _Arc(
-        $xc,
-        $yc,
-        $rx,
-        $ry,
-        $angleBegin,
-        $angleEnd,
-        $direction = true,
-        $drawFirst = true,
-        $trans = false
-    ) {
-    
-        // if we want the no trigo direction : add 2PI to the begin angle, to invert the direction
-        if (!$direction) {
-            $angleBegin+= M_PI*2.;
-        }
-
-        // cut in segment to convert in berize curv
-        $dt = ($angleEnd - $angleBegin)/self::ARC_NB_SEGMENT;
-        $dtm = $dt/3;
-
-        // center of the arc
-        $x0 = $xc;
-        $y0 = $yc;
-
-        // calculing the first point
-        $t1 = $angleBegin;
-        $a0 = $x0 + ($rx * cos($t1));
-        $b0 = $y0 + ($ry * sin($t1));
-        $c0 = -$rx * sin($t1);
-        $d0 = $ry * cos($t1);
-
-        // if drawFirst => draw the first point
-        if ($drawFirst) {
-            $this->_Point($a0, $b0, $trans);
-        }
-
-        // foreach segment
-        for ($i = 1; $i <= self::ARC_NB_SEGMENT; $i++) {
-            // calculing the next point
-            $t1 = ($i * $dt)+$angleBegin;
-            $a1 = $x0 + ($rx * cos($t1));
-            $b1 = $y0 + ($ry * sin($t1));
-            $c1 = -$rx * sin($t1);
-            $d1 = $ry * cos($t1);
-
-            // make the bezier curv
-            $this->_Curve(
-                $a0 + ($c0 * $dtm),
-                $b0 + ($d0 * $dtm),
-                $a1 - ($c1 * $dtm),
-                $b1 - ($d1 * $dtm),
-                $a1,
-                $b1,
-                $trans
-            );
-
-            // save the point
-            $a0 = $a1;
-            $b0 = $b1;
-            $c0 = $c1;
-            $d0 = $d1;
-        }
-    }
-
-    /**
-     * SVG - make a arc from Pt1 to Pt2, with Radius
-     *
-     * @param float $x1
-     * @param float $y1
-     * @param float $x2
-     * @param float $y2
-     * @param float $rx
-     * @param float $ry
-     * @param float $angle deviation angle of the axis X
-     * @param boolean $l large-arc-flag
-     * @param boolean $s sweep-flag
-     * @param boolean $trans apply transformation
-     * @access protected
-     */
-    protected function _Arc2($x1, $y1, $x2, $y2, $rx, $ry, $angle = 0., $l = 0, $s = 0, $trans = false)
-    {
-        // array to stock the parameters
-        $v = array();
-
-        // the original values
-        $v['x1'] = $x1;
-        $v['y1'] = $y1;
-        $v['x2'] = $x2;
-        $v['y2'] = $y2;
-        $v['rx'] = $rx;
-        $v['ry'] = $ry;
-
-        // rotate with the deviation angle of the axis X
-        $v['xr1'] = $v['x1']*cos($angle) - $v['y1']*sin($angle);
-        $v['yr1'] = $v['x1']*sin($angle) + $v['y1']*cos($angle);
-        $v['xr2'] = $v['x2']*cos($angle) - $v['y2']*sin($angle);
-        $v['yr2'] = $v['x2']*sin($angle) + $v['y2']*cos($angle);
-
-        // the normalized vector
-        $v['Xr1'] = $v['xr1']/$v['rx'];
-        $v['Yr1'] = $v['yr1']/$v['ry'];
-        $v['Xr2'] = $v['xr2']/$v['rx'];
-        $v['Yr2'] = $v['yr2']/$v['ry'];
-        $v['dXr'] = $v['Xr2']-$v['Xr1'];
-        $v['dYr'] = $v['Yr2']-$v['Yr1'];
-        $v['D'] = $v['dXr']*$v['dXr'] + $v['dYr']*$v['dYr'];
-
-        // if |vector| is Null, or if |vector| > 2 : impossible to make a arc => Line
-        if ($v['D'] == 0 || $v['D']>4) {
-            $this->_Line($x2, $y2, $trans);
-            return false;
-        }
-
-        // convert paramters for make a arc with Center, Radius, from angleBegin to angleEnd
-        $v['s1'] = array();
-        $v['s1']['t'] = sqrt((4.-$v['D'])/$v['D']);
-        $v['s1']['Xr'] = ($v['Xr1']+$v['Xr2'])/2. + $v['s1']['t']*($v['Yr2']-$v['Yr1'])/2.;
-        $v['s1']['Yr'] = ($v['Yr1']+$v['Yr2'])/2. + $v['s1']['t']*($v['Xr1']-$v['Xr2'])/2.;
-        $v['s1']['xr'] = $v['s1']['Xr']*$v['rx'];
-        $v['s1']['yr'] = $v['s1']['Yr']*$v['ry'];
-        $v['s1']['x'] = $v['s1']['xr']*cos($angle)+$v['s1']['yr']*sin($angle);
-        $v['s1']['y'] =-$v['s1']['xr']*sin($angle)+$v['s1']['yr']*cos($angle);
-        $v['s1']['a1'] = atan2($v['y1']-$v['s1']['y'], $v['x1']-$v['s1']['x']);
-        $v['s1']['a2'] = atan2($v['y2']-$v['s1']['y'], $v['x2']-$v['s1']['x']);
-        if ($v['s1']['a1']>$v['s1']['a2']) {
-            $v['s1']['a1']-=2*M_PI;
-        }
-
-        $v['s2'] = array();
-        $v['s2']['t'] = -$v['s1']['t'];
-        $v['s2']['Xr'] = ($v['Xr1']+$v['Xr2'])/2. + $v['s2']['t']*($v['Yr2']-$v['Yr1'])/2.;
-        $v['s2']['Yr'] = ($v['Yr1']+$v['Yr2'])/2. + $v['s2']['t']*($v['Xr1']-$v['Xr2'])/2.;
-        $v['s2']['xr'] = $v['s2']['Xr']*$v['rx'];
-        $v['s2']['yr'] = $v['s2']['Yr']*$v['ry'];
-        $v['s2']['x'] = $v['s2']['xr']*cos($angle)+$v['s2']['yr']*sin($angle);
-        $v['s2']['y'] =-$v['s2']['xr']*sin($angle)+$v['s2']['yr']*cos($angle);
-        $v['s2']['a1'] = atan2($v['y1']-$v['s2']['y'], $v['x1']-$v['s2']['x']);
-        $v['s2']['a2'] = atan2($v['y2']-$v['s2']['y'], $v['x2']-$v['s2']['x']);
-        if ($v['s2']['a1']>$v['s2']['a2']) {
-            $v['s2']['a1']-=2*M_PI;
-        }
-
-        if (!$l) {
-            if ($s) {
-                $xc = $v['s2']['x'];
-                $yc = $v['s2']['y'];
-                $a1 = $v['s2']['a1'];
-                $a2 = $v['s2']['a2'];
-                $this->_Arc($xc, $yc, $rx, $ry, $a1, $a2, true, false, $trans);
-            } else {
-                $xc = $v['s1']['x'];
-                $yc = $v['s1']['y'];
-                $a1 = $v['s1']['a1'];
-                $a2 = $v['s1']['a2'];
-                $this->_Arc($xc, $yc, $rx, $ry, $a1, $a2, false, false, $trans);
-            }
-        } else {
-            if ($s) {
-                $xc = $v['s1']['x'];
-                $yc = $v['s1']['y'];
-                $a1 = $v['s1']['a1'];
-                $a2 = $v['s1']['a2'];
-                $this->_Arc($xc, $yc, $rx, $ry, $a1, $a2, true, false, $trans);
-            } else {
-                $xc = $v['s2']['x'];
-                $yc = $v['s2']['y'];
-                $a1 = $v['s2']['a1'];
-                $a2 = $v['s2']['a2'];
-                $this->_Arc($xc, $yc, $rx, $ry, $a1, $a2, false, false, $trans);
-            }
-        }
-    }
-
-    /**
-     * SVG - transform the point (reference)
-     *
-     * @param float &$x
-     * @param float &$y
-     * @param boolean $trans true => convert into PDF unit
-     * @return boolean
-     * @access public
-     */
-    public function ptTransform(&$x, &$y, $trans = true)
-    {
-        // load the last Transfomation Matrix
-        $nb = count($this->_transf);
-        if ($nb) {
-            $m = $this->_transf[$nb-1];
-        } else {
-            $m = array(1,0,0,1,0,0);
-        }
-
-        // apply the Transformation Matrix
-        list($x, $y) = array(($x*$m[0]+$y*$m[2]+$m[4]),($x*$m[1]+$y*$m[3]+$m[5]));
-
-        // if true => convert into PDF unit
-        if ($trans) {
-            $x = $x*$this->k;
-            $y = ($this->h-$y)*$this->k;
-        }
-
-        return true;
-    }
-
-    /**
-     * SVG - add a transformation Matric
-     *
-     * @param array $n matrix
-     * @access public
-     */
-    public function doTransform($n = null)
-    {
-        // get the last Transformation Matrix
-        $nb = count($this->_transf);
-        if ($nb) {
-            $m = $this->_transf[$nb-1];
-        } else {
-            $m = array(1,0,0,1,0,0);
-        }
-
-        // if no transform, get the Identity Matrix
-        if (!$n) {
-            $n = array(1,0,0,1,0,0);
-        }
-
-        // create the new Transformation Matrix
-        $this->_transf[] = array(
-            $m[0]*$n[0]+$m[2]*$n[1],
-            $m[1]*$n[0]+$m[3]*$n[1],
-            $m[0]*$n[2]+$m[2]*$n[3],
-            $m[1]*$n[2]+$m[3]*$n[3],
-            $m[0]*$n[4]+$m[2]*$n[5]+$m[4],
-            $m[1]*$n[4]+$m[3]*$n[5]+$m[5]
-        );
-    }
-
-    /**
-     * SVG - remove a transformation Matric
-     *
-     * @access public
-     */
-    public function undoTransform()
-    {
-        array_pop($this->_transf);
-    }
-
-    /**
-     * Convert a Html2Pdf barcode in a TCPDF barcode
-     *
-     * @param string $code code to print
-     * @param string $type type of barcode (see tcpdf/barcodes.php for supported formats)
-     * @param int $x x position in user units
-     * @param int $y y position in user units
-     * @param int $w width in user units
-     * @param int $h height in user units
-     * @param int $labelFontsize of the Test Label. If false : no Label
-     * @param array $color color of the foreground
-     * @param string $dimension 1D or 2D
-     * @access public
-     */
-    public function myBarcode($code, $type, $x, $y, $w, $h, $labelFontsize, $color, $dimension = '1D')
-    {
-        // the style of the barcode
-        $style = array(
-            'position' => 'S',
-            'text' => ($labelFontsize ? true : false),
-            'fgcolor' => $color,
-            'bgcolor' => false,
-        );
-
-        // build the barcode
-        if ($dimension === '2D') {
-            // PDF417, DATAMATRIX ...
-            $this->write2DBarcode($code, $type, $x, $y, $w, $h, $style, 'N');
-        } else {
-            $this->write1DBarcode($code, $type, $x, $y, $w, $h, '', $style, 'N');
-        }
-
-        // it Label => add the FontSize to the height
-        if ($labelFontsize) {
-            $h+= $labelFontsize;
-        }
-
-        // return the size of the barcode
-        return array($w, $h);
-    }
-
-    /**
-     * create a automatic Index on a page
-     *
-     * @param html2pdf $obj           parent object
-     * @param string   $titre         Title of the Index Page
-     * @param integer  $sizeTitle     Font size for hthe Title
-     * @param integer  $sizeBookmark  Font size for the bookmarks
-     * @param boolean  $bookmarkTitle Bookmark the Title
-     * @param boolean  $displayPage   Display the page number for each bookmark
-     * @param integer  $page draw the automatic Index on a specific Page. if null => add a page at the end
-     * @param string   $fontName      FontName to use
-     * @access public
-     */
-    public function createIndex(
-        &$obj,
-        $titre = 'Index',
-        $sizeTitle = 20,
-        $sizeBookmark = 15,
-        $bookmarkTitle = true,
-        $displayPage = true,
-        $page = null,
-        $fontName = 'helvetica'
-    ) {
-    
-        // bookmark the Title if wanted
-        if ($bookmarkTitle) {
-            $this->Bookmark($titre, 0, -1);
-        }
-
-        // display the Title with the good Font size
-        $this->SetFont($fontName, '', $sizeTitle);
-        $this->Cell(0, 5, $titre, 0, 1, 'C');
-
-        // set the good Font size for the bookmarks
-        $this->SetFont($fontName, '', $sizeBookmark);
-        $this->Ln(10);
-
-        // get the number of bookmarks
-        $size=sizeof($this->outlines);
-
-        // get the size of the "P. xx" cell
-        $pageCellSize=$this->GetStringWidth('p. '.$this->outlines[$size-1]['p'])+2;
-
-        // Foreach bookmark
-        for ($i=0; $i<$size; $i++) {
-            // if we need a new page => add a new page
-            if ($this->getY()+$this->FontSize>=($this->h - $this->bMargin)) {
-                $obj->_INDEX_NewPage($page);
-                $this->SetFont($fontName, '', $sizeBookmark);
-            }
-
-            // Offset of the current level
-            $level=$this->outlines[$i]['l'];
-            if ($level>0) {
-                $this->Cell($level*8);
-            }
-
-            // Caption (cut to fit on the width page)
-            $str=$this->outlines[$i]['t'];
-            $strsize=$this->GetStringWidth($str);
-            $availableSize=$this->w-$this->lMargin-$this->rMargin-$pageCellSize-($level*8)-4;
-            while ($strsize>=$availableSize) {
-                $str=substr($str, 0, -1);
-                $strsize=$this->GetStringWidth($str);
-            }
-
-            // if we want to display the page nmber
-            if ($displayPage) {
-                // display the Bookmark Caption
-                $this->Cell($strsize+2, $this->FontSize+2, $str);
-
-                //Filling dots
-                $w=$this->w-$this->lMargin-$this->rMargin-$pageCellSize-($level*8)-($strsize+2);
-                $nb=$w/$this->GetStringWidth('.');
-                $dots=str_repeat('.', $nb);
-                $this->Cell($w, $this->FontSize+2, $dots, 0, 0, 'R');
-
-                //Page number
-                $this->Cell($pageCellSize, $this->FontSize+2, 'p. '.$this->outlines[$i]['p'], 0, 1, 'R');
-            } else {
-                // display the Bookmark Caption
-                $this->Cell($strsize+2, $this->FontSize+2, $str, 0, 1);
-            }
-        }
-    }
-
-    /**
-     * Returns the string alias used for the total number of pages.
-     *
-     * @access public
-     * @return string;
-     * @see TCPDF::getAliasNbPages(), TCPDF::getPageGroupAlias()
-     */
-    public function getMyAliasNbPages()
-    {
-        if ($this->_myLastPageGroupNb == 0) {
-            return $this->getAliasNbPages();
-        } else {
-            $old = $this->currpagegroup;
-            $this->currpagegroup = '{nb'.$this->_myLastPageGroupNb.'}';
-            $new = $this->getPageGroupAlias();
-            $this->currpagegroup = $old;
-
-            return $new;
-        }
-    }
-
-    /**
-     * Returns the current page number.
-     *
-     * @access public
-     * @param  integer $page
-     * @return integer;
-     */
-    public function getMyNumPage($page = null)
-    {
-        if ($page === null) {
-            $page = $this->page;
-        }
-
-        if ($this->_myLastPageGroupNb == 0) {
-            return $page;
-        } else {
-            return $page-$this->_myLastPageGroup;
-        }
-    }
-
-    /**
-     * Start a new group of pages
-     *
-     * @access public
-     * @return integer;
-     * @see tcpdf::startPageGroup
-     */
-    public function myStartPageGroup()
-    {
-        $this->_myLastPageGroup = $this->page-1;
-        $this->_myLastPageGroupNb++;
-    }
-
-    /**
-     * get $_myLastPageGroup;
-     *
-     * @access public
-     * @return integer $_myLastPageGroup;
-     */
-    public function getMyLastPageGroup()
-    {
-        return $this->_myLastPageGroup;
-    }
-
-    /**
-     * set $_myLastPageGroup;
-     *
-     * @access public
-     * @param integer $myLastPageGroup;
-     */
-    public function setMyLastPageGroup($myLastPageGroup)
-    {
-        $this->_myLastPageGroup = $myLastPageGroup;
-    }
-
-    /**
-     * get $_myLastPageGroupNb;
-     *
-     * @access public
-     * @return integer $_myLastPageGroupNb;
-     */
-    public function getMyLastPageGroupNb()
-    {
-        return $this->_myLastPageGroupNb;
-    }
-
-    /**
-     * set $_myLastPageGroupNb;
-     *
-     * @access public
-     * @param integer $myLastPageGroupNb;
-     */
-    public function setMyLastPageGroupNb($myLastPageGroupNb)
-    {
-        $this->_myLastPageGroupNb = $myLastPageGroupNb;
-    }
-}
diff --git a/html2pdf-master/src/Parsing/Css.php b/html2pdf-master/src/Parsing/Css.php
deleted file mode 100644
index 9881f73e..00000000
--- a/html2pdf-master/src/Parsing/Css.php
+++ /dev/null
@@ -1,1753 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - parsing Css class
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-
-namespace Spipu\Html2Pdf\Parsing;
-
-use Spipu\Html2Pdf\CssConverter;
-use Spipu\Html2Pdf\MyPdf;
-
-class Css
-{
-    /**
-     * @var TagParser
-     */
-    protected $tagParser;
-
-    /**
-     * @var CssConverter
-     */
-    protected $cssConverter;
-
-    /**
-     * Reference to the pdf object
-     *
-     * @var MyPdf
-     */
-    protected $pdf         = null;
-
-    protected $onlyLeft    = false; // flag if we are in a sub html => only "text-align:left" is used
-    protected $defaultFont = null;  // default font to use if the asked font does not exist
-
-    public $value        = array(); // current values
-    public $css          = array(); // css values
-    public $cssKeys      = array(); // css key, for the execution order
-    public $table        = array(); // level history
-
-    /**
-     * Constructor
-     *
-     * @param MyPdf        $pdf reference to the PDF $object
-     * @param TagParser    $tagParser
-     * @param CssConverter $cssConverter
-     */
-    public function __construct(&$pdf, TagParser $tagParser, CssConverter $cssConverter)
-    {
-        $this->cssConverter = $cssConverter;
-        $this->init();
-        $this->setPdfParent($pdf);
-        $this->tagParser = $tagParser;
-    }
-
-    /**
-     * Set the $pdf parent object
-     *
-     * @param  MyPdf &$pdf reference to the Html2Pdf parent
-     *
-     * @return void
-     */
-    public function setPdfParent(&$pdf)
-    {
-        $this->pdf = &$pdf;
-    }
-
-    /**
-     * Inform that we want only "test-align:left" because we are in a sub HTML
-     *
-     * @return void
-     */
-    public function setOnlyLeft()
-    {
-        $this->value['text-align'] = 'left';
-        $this->onlyLeft = true;
-    }
-
-    /**
-     * Get the vales of the parent, if exist
-     *
-     * @return array CSS values
-     */
-    public function getOldValues()
-    {
-        return isset($this->table[count($this->table)-1]) ? $this->table[count($this->table)-1] : $this->value;
-    }
-
-   /**
-    * Define the Default Font to use, if the font does not exist, or if no font asked
-    *
-    * @param string  default font-family. If null : Arial for no font asked, and error fot ont does not exist
-    *
-    * @return string  old default font-family
-    */
-    public function setDefaultFont($default = null)
-    {
-        $old = $this->defaultFont;
-        $this->defaultFont = $default;
-        if ($default) {
-            $this->value['font-family'] = $default;
-        }
-        return $old;
-    }
-
-    /**
-     * Init the object
-     *
-     * @return void
-     */
-    protected function init()
-    {
-        // init the Style
-        $this->table = array();
-        $this->value = array();
-        $this->initStyle();
-
-        // Init the styles without legacy
-        $this->resetStyle();
-    }
-
-    /**
-     * Init the CSS Style
-     *
-     * @return void
-     */
-    public function initStyle()
-    {
-        $this->value['id_tag']           = 'body';       // tag name
-        $this->value['id_name']          = null;         // tag - attribute name
-        $this->value['id_id']            = null;         // tag - attribute id
-        $this->value['id_class']         = null;         // tag - attribute class
-        $this->value['id_lst']           = array('*');   // tag - list of legacy
-        $this->value['mini-size']        = 1.;           // specific size report for sup, sub
-        $this->value['mini-decal']       = 0;            // specific position report for sup, sub
-        $this->value['font-family']      = defined('PDF_FONT_NAME_MAIN') ? PDF_FONT_NAME_MAIN : 'Arial';
-        $this->value['font-bold']        = false;
-        $this->value['font-italic']      = false;
-        $this->value['font-underline']   = false;
-        $this->value['font-overline']    = false;
-        $this->value['font-linethrough'] = false;
-        $this->value['text-transform']   = 'none';
-        $this->value['font-size']        = $this->cssConverter->convertFontSize('10pt');
-        $this->value['text-indent']      = 0;
-        $this->value['text-align']       = 'left';
-        $this->value['vertical-align']   = 'middle';
-        $this->value['line-height']      = 'normal';
-
-        $this->value['position']         = null;
-        $this->value['x']                = null;
-        $this->value['y']                = null;
-        $this->value['width']            = 0;
-        $this->value['height']           = 0;
-        $this->value['top']              = null;
-        $this->value['right']            = null;
-        $this->value['bottom']           = null;
-        $this->value['left']             = null;
-        $this->value['float']            = null;
-        $this->value['display']          = null;
-        $this->value['rotate']           = null;
-        $this->value['overflow']         = 'visible';
-
-        $this->value['color']            = array(0, 0, 0);
-        $this->value['background']       = array(
-            'color'    => null,
-            'image'    => null,
-            'position' => null,
-            'repeat'   => null
-        );
-        $this->value['border']           = array();
-        $this->value['padding']          = array();
-        $this->value['margin']           = array();
-        $this->value['margin-auto']      = false;
-
-        $this->value['list-style-type']  = '';
-        $this->value['list-style-image'] = '';
-
-        $this->value['xc'] = null;
-        $this->value['yc'] = null;
-
-        $this->value['page-break-before'] = null;
-        $this->value['page-break-after']  = null;
-    }
-
-    /**
-     * Init the CSS Style without legacy
-     *
-     * @param string tag name
-     *
-     * @return void
-     */
-    public function resetStyle($tagName = '')
-    {
-        // prepare somme values
-        $border = $this->readBorder('solid 1px #000000');
-        $units = array(
-            '1px' => $this->cssConverter->convertToMM('1px'),
-            '5px' => $this->cssConverter->convertToMM('5px'),
-        );
-
-        // prepare the Collapse attribute
-        $collapse = isset($this->value['border']['collapse']) ? $this->value['border']['collapse'] : false;
-        if (!in_array($tagName, array('tr', 'td', 'th', 'thead', 'tbody', 'tfoot'))) {
-            $collapse = false;
-        }
-
-        // set the global css values
-        $this->value['position']   = null;
-        $this->value['x']          = null;
-        $this->value['y']          = null;
-        $this->value['width']      = 0;
-        $this->value['height']     = 0;
-        $this->value['top']        = null;
-        $this->value['right']      = null;
-        $this->value['bottom']     = null;
-        $this->value['left']       = null;
-        $this->value['float']      = null;
-        $this->value['display']    = null;
-        $this->value['rotate']     = null;
-        $this->value['overflow']   = 'visible';
-        $this->value['background'] = array('color' => null, 'image' => null, 'position' => null, 'repeat' => null);
-        $this->value['border']     = array(
-            't' => $this->readBorder('none'),
-            'r' => $this->readBorder('none'),
-            'b' => $this->readBorder('none'),
-            'l' => $this->readBorder('none'),
-            'radius' => array(
-                'tl' => array(0, 0),
-                'tr' => array(0, 0),
-                'br' => array(0, 0),
-                'bl' => array(0, 0)
-            ),
-            'collapse' => $collapse,
-        );
-
-        // specific values for some tags
-        if (!in_array($tagName, array('h1', 'h2', 'h3', 'h4', 'h5', 'h6'))) {
-            $this->value['margin'] = array('t'=>0,'r'=>0,'b'=>0,'l'=>0);
-        }
-
-        if (in_array($tagName, array('input', 'select', 'textarea'))) {
-            $this->value['border']['t'] = null;
-            $this->value['border']['r'] = null;
-            $this->value['border']['b'] = null;
-            $this->value['border']['l'] = null;
-        }
-
-        if ($tagName === 'p') {
-            $this->value['margin']['t'] = null;
-            $this->value['margin']['b'] = null;
-        }
-        if ($tagName === 'blockquote') {
-            $this->value['margin']['t'] = 3;
-            $this->value['margin']['r'] = 3;
-            $this->value['margin']['b'] = 3;
-            $this->value['margin']['l'] = 6;
-        }
-        $this->value['margin-auto'] = false;
-
-        if (in_array($tagName, array('blockquote', 'div', 'fieldset'))) {
-            $this->value['vertical-align'] = 'top';
-        }
-
-        if (in_array($tagName, array('fieldset', 'legend'))) {
-            $this->value['border'] = array(
-                't' => $border,
-                'r' => $border,
-                'b' => $border,
-                'l' => $border,
-                'radius' => array(
-                    'tl' => array($units['5px'], $units['5px']),
-                    'tr' => array($units['5px'], $units['5px']),
-                    'br' => array($units['5px'], $units['5px']),
-                    'bl' => array($units['5px'], $units['5px'])
-                ),
-                'collapse' => false,
-            );
-        }
-
-        if (in_array($tagName, array('ul', 'li'))) {
-            $this->value['list-style-type']  = '';
-            $this->value['list-style-image'] = '';
-        }
-
-        if (!in_array($tagName, array('tr', 'td'))) {
-            $this->value['padding'] = array(
-                't' => 0,
-                'r' => 0,
-                'b' => 0,
-                'l' => 0
-            );
-        } else {
-            $this->value['padding'] = array(
-                't' => $units['1px'],
-                'r' => $units['1px'],
-                'b' => $units['1px'],
-                'l' => $units['1px']
-            );
-        }
-
-        if ($tagName === 'hr') {
-            $this->value['border'] = array(
-                't' => $border,
-                'r' => $border,
-                'b' => $border,
-                'l' => $border,
-                'radius' => array(
-                    'tl' => array(0, 0),
-                    'tr' => array(0, 0),
-                    'br' => array(0, 0),
-                    'bl' => array(0, 0)
-                ),
-                'collapse' => false,
-            );
-            $this->cssConverter->convertBackground('#FFFFFF', $this->value['background']);
-        }
-
-        $this->value['xc'] = null;
-        $this->value['yc'] = null;
-    }
-
-    /**
-     * Init the PDF Font
-     *
-     * @return void
-     */
-    public function fontSet()
-    {
-        $family = strtolower($this->value['font-family']);
-
-        $b = ($this->value['font-bold']        ? 'B' : '');
-        $i = ($this->value['font-italic']      ? 'I' : '');
-        $u = ($this->value['font-underline']   ? 'U' : '');
-        $d = ($this->value['font-linethrough'] ? 'D' : '');
-        $o = ($this->value['font-overline']    ? 'O' : '');
-
-        // font style
-        $style = $b.$i;
-
-        if ($this->defaultFont) {
-            if ($family === 'arial') {
-                $family='helvetica';
-            } elseif ($family === 'symbol' || $family === 'zapfdingbats') {
-                $style='';
-            }
-
-            $fontkey = $family.$style;
-            if (!$this->pdf->isLoadedFont($fontkey)) {
-                $family = $this->defaultFont;
-            }
-        }
-
-        if ($family === 'arial') {
-            $family='helvetica';
-        } elseif ($family === 'symbol' || $family === 'zapfdingbats') {
-            $style='';
-        }
-
-        // complete style
-        $style.= $u.$d.$o;
-
-        // size : mm => pt
-        $size = $this->value['font-size'];
-        $size = 72 * $size / 25.4;
-
-        // apply the font
-        $this->pdf->SetFont($family, $style, $this->value['mini-size']*$size);
-        $this->pdf->SetTextColorArray($this->value['color']);
-        if ($this->value['background']['color']) {
-            $this->pdf->SetFillColorArray($this->value['background']['color']);
-        } else {
-            $this->pdf->SetFillColor(255);
-        }
-    }
-
-    /**
-     * Add a level in the CSS history
-     *
-     * @return void
-     */
-    public function save()
-    {
-        array_push($this->table, $this->value);
-    }
-
-    /**
-     * Remove a level in the CSS history
-     *
-     * @return void
-     */
-    public function load()
-    {
-        if (count($this->table)) {
-            $this->value = array_pop($this->table);
-        }
-    }
-
-    /**
-     * Restore the Y position (used after a span)
-     *
-     * @return void
-     */
-    public function restorePosition()
-    {
-        if ($this->value['y'] == $this->pdf->GetY()) {
-            $this->pdf->SetY($this->value['yc'], false);
-        }
-    }
-
-    /**
-     * Set the New position for the current Tag
-     *
-     * @return void
-     */
-    public function setPosition()
-    {
-        // get the current position
-        $currentX = $this->pdf->GetX();
-        $currentY = $this->pdf->GetY();
-
-        // save it
-        $this->value['xc'] = $currentX;
-        $this->value['yc'] = $currentY;
-
-        if ($this->value['position'] === 'relative' || $this->value['position'] === 'absolute') {
-            if ($this->value['right'] !== null) {
-                $x = $this->getLastWidth(true) - $this->value['right'] - $this->value['width'];
-                if ($this->value['margin']['r']) {
-                    $x-= $this->value['margin']['r'];
-                }
-            } else {
-                $x = $this->value['left'];
-                if ($this->value['margin']['l']) {
-                    $x+= $this->value['margin']['l'];
-                }
-            }
-
-            if ($this->value['bottom'] !== null) {
-                $y = $this->getLastHeight(true) - $this->value['bottom'] - $this->value['height'];
-                if ($this->value['margin']['b']) {
-                    $y-= $this->value['margin']['b'];
-                }
-            } else {
-                $y = $this->value['top'];
-                if ($this->value['margin']['t']) {
-                    $y+= $this->value['margin']['t'];
-                }
-            }
-
-            if ($this->value['position'] === 'relative') {
-                $this->value['x'] = $currentX + $x;
-                $this->value['y'] = $currentY + $y;
-            } else {
-                $this->value['x'] = $this->getLastAbsoluteX()+$x;
-                $this->value['y'] = $this->getLastAbsoluteY()+$y;
-            }
-        } else {
-            $this->value['x'] = $currentX;
-            $this->value['y'] = $currentY;
-            if ($this->value['margin']['l']) {
-                $this->value['x']+= $this->value['margin']['l'];
-            }
-            if ($this->value['margin']['t']) {
-                $this->value['y']+= $this->value['margin']['t'];
-            }
-        }
-
-        // save the new position
-        $this->pdf->SetXY($this->value['x'], $this->value['y']);
-    }
-
-    /**
-     * Analyse the CSS style to convert it into Form style
-     *
-     * @return array styles
-     */
-    public function getFormStyle()
-    {
-        $prop = array(
-            'alignment' => $this->value['text-align']
-        );
-
-        if (isset($this->value['background']['color']) && is_array($this->value['background']['color'])) {
-            $prop['fillColor'] = $this->value['background']['color'];
-        }
-
-        if (isset($this->value['border']['t']['color'])) {
-            $prop['strokeColor'] = $this->value['border']['t']['color'];
-        }
-
-        if (isset($this->value['border']['t']['width'])) {
-            $prop['lineWidth'] = $this->value['border']['t']['width'];
-        }
-
-        if (isset($this->value['border']['t']['type'])) {
-            $prop['borderStyle'] = $this->value['border']['t']['type'];
-        }
-
-        if (!empty($this->value['color'])) {
-            $prop['textColor'] = $this->value['color'];
-        }
-
-        if (!empty($this->value['font-size'])) {
-            $prop['textSize'] = $this->value['font-size'];
-        }
-
-        return $prop;
-    }
-
-    /**
-     * Analise the CSS style to convert it into SVG style
-     *
-     * @param string tag name
-     * @param array  styles
-     *
-     * @return array svg style
-     */
-    public function getSvgStyle($tagName, &$param)
-    {
-        // prepare
-        $tagName = strtolower($tagName);
-        $id   = isset($param['id'])   ? strtolower(trim($param['id']))   : null;
-        if (!$id) {
-            $id   = null;
-        }
-        $name = isset($param['name']) ? strtolower(trim($param['name'])) : null;
-        if (!$name) {
-            $name = null;
-        }
-
-        // read the class attribute
-        $class = array();
-        $tmp = isset($param['class']) ? strtolower(trim($param['class'])) : '';
-        $tmp = explode(' ', $tmp);
-        foreach ($tmp as $k => $v) {
-            $v = trim($v);
-            if ($v) {
-                $class[] = $v;
-            }
-        }
-
-        // identify the tag, and the direct styles
-        $this->value['id_tag'] = $tagName;
-        $this->value['id_name']   = $name;
-        $this->value['id_id']     = $id;
-        $this->value['id_class']  = $class;
-        $this->value['id_lst']    = array();
-        $this->value['id_lst'][] = '*';
-        $this->value['id_lst'][] = $tagName;
-        if (!isset($this->value['svg'])) {
-            $this->value['svg'] = array(
-                'stroke'         => null,
-                'stroke-width'   => $this->cssConverter->convertToMM('1pt'),
-                'fill'           => null,
-                'fill-opacity'   => null,
-            );
-        }
-
-        if (count($class)) {
-            foreach ($class as $v) {
-                $this->value['id_lst'][] = '*.'.$v;
-                $this->value['id_lst'][] = '.'.$v;
-                $this->value['id_lst'][] = $tagName.'.'.$v;
-            }
-        }
-        if ($id) {
-            $this->value['id_lst'][] = '*#'.$id;
-            $this->value['id_lst'][] = '#'.$id;
-            $this->value['id_lst'][] = $tagName.'#'.$id;
-        }
-
-        // CSS style
-        $styles = $this->getFromCSS();
-
-        // adding the style from the tag
-        $styles = array_merge($styles, $param['style']);
-
-        if (isset($styles['stroke'])) {
-            $this->value['svg']['stroke']       = $this->cssConverter->convertToColor($styles['stroke'], $res);
-        }
-        if (isset($styles['stroke-width'])) {
-            $this->value['svg']['stroke-width'] = $this->cssConverter->convertToMM($styles['stroke-width']);
-        }
-        if (isset($styles['fill'])) {
-            $this->value['svg']['fill']         = $this->cssConverter->convertToColor($styles['fill'], $res);
-        }
-        if (isset($styles['fill-opacity'])) {
-            $this->value['svg']['fill-opacity'] = 1.*$styles['fill-opacity'];
-        }
-
-        return $this->value['svg'];
-    }
-
-    /**
-     * Analyse the CSS properties from the HTML parsing
-     *
-     * @param string $tagName
-     * @param array  $param
-     * @param array  $legacy
-     *
-     * @return boolean
-     */
-    public function analyse($tagName, &$param, $legacy = null)
-    {
-        // prepare the informations
-        $tagName = strtolower($tagName);
-        $id   = isset($param['id'])   ? strtolower(trim($param['id']))    : null;
-        if (!$id) {
-            $id   = null;
-        }
-        $name = isset($param['name']) ? strtolower(trim($param['name']))  : null;
-        if (!$name) {
-            $name = null;
-        }
-
-        // get the class names to use
-        $class = array();
-        $tmp = isset($param['class']) ? strtolower(trim($param['class'])) : '';
-        $tmp = explode(' ', $tmp);
-        
-        // replace some values
-        $toReplace = array(
-            '[[page_cu]]' => $this->pdf->getMyNumPage()
-        );
-        
-        foreach ($tmp as $k => $v) {
-            $v = trim($v);
-            if (strlen($v)>0) {
-                $v = str_replace(array_keys($toReplace), array_values($toReplace), $v);
-            }
-            if ($v) {
-                $class[] = $v;
-            }
-        }
-
-        // prepare the values, and the list of css tags to identify
-        $this->value['id_tag']   = $tagName;
-        $this->value['id_name']  = $name;
-        $this->value['id_id']    = $id;
-        $this->value['id_class'] = $class;
-        $this->value['id_lst']   = array();
-        $this->value['id_lst'][] = '*';
-        $this->value['id_lst'][] = $tagName;
-        if (count($class)) {
-            foreach ($class as $v) {
-                $this->value['id_lst'][] = '*.'.$v;
-                $this->value['id_lst'][] = '.'.$v;
-                $this->value['id_lst'][] = $tagName.'.'.$v;
-            }
-        }
-        if ($id) {
-            $this->value['id_lst'][] = '*#'.$id;
-            $this->value['id_lst'][] = '#'.$id;
-            $this->value['id_lst'][] = $tagName.'#'.$id;
-        }
-
-        // get the css styles from class
-        $styles = $this->getFromCSS();
-
-        // merge with the css styles from tag
-        $styles = array_merge($styles, $param['style']);
-        if (isset($param['allwidth']) && !isset($styles['width'])) {
-            $styles['width'] = '100%';
-        }
-
-        // reset some styles, depending on the tag name
-        $this->resetStyle($tagName);
-
-        // add the legacy values
-        if ($legacy) {
-            foreach ($legacy as $legacyName => $legacyValue) {
-                if (is_array($legacyValue)) {
-                    foreach ($legacyValue as $legacy2Name => $legacy2Value) {
-                        $this->value[$legacyName][$legacy2Name] = $legacy2Value;
-                    }
-                } else {
-                    $this->value[$legacyName] = $legacyValue;
-                }
-            }
-        }
-
-        // some flags
-        $correctWidth = false;
-        $noWidth = true;
-
-        // read all the css styles
-        foreach ($styles as $nom => $val) {
-            switch ($nom) {
-                case 'font-family':
-                    $val = explode(',', $val);
-                    $val = trim($val[0]);
-                    $val = trim($val, '\'"');
-                    if ($val && strtolower($val) !== 'inherit') {
-                        $this->value['font-family'] = $val;
-                    }
-                    break;
-
-                case 'font-weight':
-                    $this->value['font-bold'] = ($val === 'bold');
-                    break;
-
-                case 'font-style':
-                    $this->value['font-italic'] = ($val === 'italic');
-                    break;
-
-                case 'text-decoration':
-                    $val = explode(' ', $val);
-                    $this->value['font-underline']   = (in_array('underline', $val));
-                    $this->value['font-overline']    = (in_array('overline', $val));
-                    $this->value['font-linethrough'] = (in_array('line-through', $val));
-                    break;
-
-                case 'text-indent':
-                    $this->value['text-indent'] = $this->cssConverter->convertToMM($val);
-                    break;
-
-                case 'text-transform':
-                    if (!in_array($val, array('none', 'capitalize', 'uppercase', 'lowercase'))) {
-                        $val = 'none';
-                    }
-                    $this->value['text-transform']  = $val;
-                    break;
-
-                case 'font-size':
-                    $val = $this->cssConverter->convertFontSize($val, $this->value['font-size']);
-                    if ($val) {
-                        $this->value['font-size'] = $val;
-                    }
-                    break;
-
-                case 'color':
-                    $res = null;
-                    $this->value['color'] = $this->cssConverter->convertToColor($val, $res);
-                    if ($tagName === 'hr') {
-                        $this->value['border']['l']['color'] = $this->value['color'];
-                        $this->value['border']['t']['color'] = $this->value['color'];
-                        $this->value['border']['r']['color'] = $this->value['color'];
-                        $this->value['border']['b']['color'] = $this->value['color'];
-                    }
-                    break;
-
-                case 'text-align':
-                    $val = strtolower($val);
-                    if (!in_array($val, array('left', 'right', 'center', 'justify', 'li_right'))) {
-                        $val = 'left';
-                    }
-                    $this->value['text-align'] = $val;
-                    break;
-
-                case 'vertical-align':
-                    $this->value['vertical-align'] = $val;
-                    break;
-
-                case 'width':
-                    $this->value['width'] = $this->cssConverter->convertToMM($val, $this->getLastWidth());
-                    if ($this->value['width'] && substr($val, -1) === '%') {
-                        $correctWidth=true;
-                    }
-                    $noWidth = false;
-                    break;
-
-                case 'max-width':
-                    $this->value[$nom] = $this->cssConverter->convertToMM($val, $this->getLastWidth());
-                    break;
-
-                case 'height':
-                case 'max-height':
-                    $this->value[$nom] = $this->cssConverter->convertToMM($val, $this->getLastHeight());
-                    break;
-
-                case 'line-height':
-                    if (preg_match('/^[0-9\.]+$/isU', $val)) {
-                        $val = floor($val*100).'%';
-                    }
-                    $this->value['line-height'] = $val;
-                    break;
-
-                case 'rotate':
-                    if (!in_array($val, array(0, -90, 90, 180, 270, -180, -270))) {
-                        $val = null;
-                    }
-                    if ($val<0) {
-                        $val+= 360;
-                    }
-                    $this->value['rotate'] = $val;
-                    break;
-
-                case 'overflow':
-                    if (!in_array($val, array('visible', 'hidden'))) {
-                        $val = 'visible';
-                    }
-                    $this->value['overflow'] = $val;
-                    break;
-
-                case 'padding':
-                    $val = explode(' ', $val);
-                    foreach ($val as $k => $v) {
-                        $v = trim($v);
-                        if ($v !== '') {
-                            $val[$k] = $v;
-                        } else {
-                            unset($val[$k]);
-                        }
-                    }
-                    $val = array_values($val);
-                    $this->duplicateBorder($val);
-                    $this->value['padding']['t'] = $this->cssConverter->convertToMM($val[0], 0);
-                    $this->value['padding']['r'] = $this->cssConverter->convertToMM($val[1], 0);
-                    $this->value['padding']['b'] = $this->cssConverter->convertToMM($val[2], 0);
-                    $this->value['padding']['l'] = $this->cssConverter->convertToMM($val[3], 0);
-                    break;
-
-                case 'padding-top':
-                    $this->value['padding']['t'] = $this->cssConverter->convertToMM($val, 0);
-                    break;
-
-                case 'padding-right':
-                    $this->value['padding']['r'] = $this->cssConverter->convertToMM($val, 0);
-                    break;
-
-                case 'padding-bottom':
-                    $this->value['padding']['b'] = $this->cssConverter->convertToMM($val, 0);
-                    break;
-
-                case 'padding-left':
-                    $this->value['padding']['l'] = $this->cssConverter->convertToMM($val, 0);
-                    break;
-
-                case 'margin':
-                    if ($val === 'auto') {
-                        $this->value['margin-auto'] = true;
-                        break;
-                    }
-                    $val = explode(' ', $val);
-                    foreach ($val as $k => $v) {
-                        $v = trim($v);
-                        if ($v !== '') {
-                            $val[$k] = $v;
-                        } else {
-                            unset($val[$k]);
-                        }
-                    }
-                    $val = array_values($val);
-                    $this->duplicateBorder($val);
-                    $this->value['margin']['t'] = $this->cssConverter->convertToMM($val[0], $this->getLastHeight());
-                    $this->value['margin']['r'] = $this->cssConverter->convertToMM($val[1], $this->getLastWidth());
-                    $this->value['margin']['b'] = $this->cssConverter->convertToMM($val[2], $this->getLastHeight());
-                    $this->value['margin']['l'] = $this->cssConverter->convertToMM($val[3], $this->getLastWidth());
-                    break;
-
-                case 'margin-top':
-                    $this->value['margin']['t'] = $this->cssConverter->convertToMM($val, $this->getLastHeight());
-                    break;
-
-                case 'margin-right':
-                    $this->value['margin']['r'] = $this->cssConverter->convertToMM($val, $this->getLastWidth());
-                    break;
-
-                case 'margin-bottom':
-                    $this->value['margin']['b'] = $this->cssConverter->convertToMM($val, $this->getLastHeight());
-                    break;
-
-                case 'margin-left':
-                    $this->value['margin']['l'] = $this->cssConverter->convertToMM($val, $this->getLastWidth());
-                    break;
-
-                case 'border':
-                    $val = $this->readBorder($val);
-                    $this->value['border']['t'] = $val;
-                    $this->value['border']['r'] = $val;
-                    $this->value['border']['b'] = $val;
-                    $this->value['border']['l'] = $val;
-                    break;
-
-                case 'border-style':
-                    $val = explode(' ', $val);
-                    foreach ($val as $valK => $valV) {
-                        if (!in_array($valV, array('solid', 'dotted', 'dashed'))) {
-                            $val[$valK] = null;
-                        }
-                    }
-                    $this->duplicateBorder($val);
-                    if ($val[0]) {
-                        $this->value['border']['t']['type'] = $val[0];
-                    }
-                    if ($val[1]) {
-                        $this->value['border']['r']['type'] = $val[1];
-                    }
-                    if ($val[2]) {
-                        $this->value['border']['b']['type'] = $val[2];
-                    }
-                    if ($val[3]) {
-                        $this->value['border']['l']['type'] = $val[3];
-                    }
-                    break;
-
-                case 'border-top-style':
-                    if (in_array($val, array('solid', 'dotted', 'dashed'))) {
-                        $this->value['border']['t']['type'] = $val;
-                    }
-                    break;
-
-                case 'border-right-style':
-                    if (in_array($val, array('solid', 'dotted', 'dashed'))) {
-                        $this->value['border']['r']['type'] = $val;
-                    }
-                    break;
-
-                case 'border-bottom-style':
-                    if (in_array($val, array('solid', 'dotted', 'dashed'))) {
-                        $this->value['border']['b']['type'] = $val;
-                    }
-                    break;
-
-                case 'border-left-style':
-                    if (in_array($val, array('solid', 'dotted', 'dashed'))) {
-                        $this->value['border']['l']['type'] = $val;
-                    }
-                    break;
-
-                case 'border-color':
-                    $res = false;
-                    $val = preg_replace('/,[\s]+/', ',', $val);
-                    $val = explode(' ', $val);
-                    foreach ($val as $valK => $valV) {
-                            $val[$valK] = $this->cssConverter->convertToColor($valV, $res);
-                        if (!$res) {
-                            $val[$valK] = null;
-                        }
-                    }
-                    $this->duplicateBorder($val);
-                    if (is_array($val[0])) {
-                        $this->value['border']['t']['color'] = $val[0];
-                    }
-                    if (is_array($val[1])) {
-                        $this->value['border']['r']['color'] = $val[1];
-                    }
-                    if (is_array($val[2])) {
-                        $this->value['border']['b']['color'] = $val[2];
-                    }
-                    if (is_array($val[3])) {
-                        $this->value['border']['l']['color'] = $val[3];
-                    }
-
-                    break;
-
-                case 'border-top-color':
-                    $res = false;
-                    $val = $this->cssConverter->convertToColor($val, $res);
-                    if ($res) {
-                        $this->value['border']['t']['color'] = $val;
-                    }
-                    break;
-
-                case 'border-right-color':
-                    $res = false;
-                    $val = $this->cssConverter->convertToColor($val, $res);
-                    if ($res) {
-                        $this->value['border']['r']['color'] = $val;
-                    }
-                    break;
-
-                case 'border-bottom-color':
-                    $res = false;
-                    $val = $this->cssConverter->convertToColor($val, $res);
-                    if ($res) {
-                        $this->value['border']['b']['color'] = $val;
-                    }
-                    break;
-
-                case 'border-left-color':
-                    $res = false;
-                    $val = $this->cssConverter->convertToColor($val, $res);
-                    if ($res) {
-                        $this->value['border']['l']['color'] = $val;
-                    }
-                    break;
-
-                case 'border-width':
-                    $val = explode(' ', $val);
-                    foreach ($val as $valK => $valV) {
-                            $val[$valK] = $this->cssConverter->convertToMM($valV, 0);
-                    }
-                    $this->duplicateBorder($val);
-                    if ($val[0]) {
-                        $this->value['border']['t']['width'] = $val[0];
-                    }
-                    if ($val[1]) {
-                        $this->value['border']['r']['width'] = $val[1];
-                    }
-                    if ($val[2]) {
-                        $this->value['border']['b']['width'] = $val[2];
-                    }
-                    if ($val[3]) {
-                        $this->value['border']['l']['width'] = $val[3];
-                    }
-                    break;
-
-                case 'border-top-width':
-                    $val = $this->cssConverter->convertToMM($val, 0);
-                    if ($val) {
-                        $this->value['border']['t']['width'] = $val;
-                    }
-                    break;
-
-                case 'border-right-width':
-                    $val = $this->cssConverter->convertToMM($val, 0);
-                    if ($val) {
-                        $this->value['border']['r']['width'] = $val;
-                    }
-                    break;
-
-                case 'border-bottom-width':
-                    $val = $this->cssConverter->convertToMM($val, 0);
-                    if ($val) {
-                        $this->value['border']['b']['width'] = $val;
-                    }
-                    break;
-
-                case 'border-left-width':
-                    $val = $this->cssConverter->convertToMM($val, 0);
-                    if ($val) {
-                        $this->value['border']['l']['width'] = $val;
-                    }
-                    break;
-
-                case 'border-collapse':
-                    if ($tagName === 'table') {
-                        $this->value['border']['collapse'] = ($val === 'collapse');
-                    }
-                    break;
-
-                case 'border-radius':
-                    $val = explode('/', $val);
-                    if (count($val)>2) {
-                        break;
-                    }
-                    $valH = $this->cssConverter->convertToRadius(trim($val[0]));
-                    if (count($valH)<1 || count($valH)>4) {
-                        break;
-                    }
-                    if (!isset($valH[1])) {
-                        $valH[1] = $valH[0];
-                    }
-                    if (!isset($valH[2])) {
-                        $valH = array($valH[0], $valH[0], $valH[1], $valH[1]);
-                    }
-                    if (!isset($valH[3])) {
-                        $valH[3] = $valH[1];
-                    }
-                    if (isset($val[1])) {
-                        $valV = $this->cssConverter->convertToRadius(trim($val[1]));
-                        if (count($valV)<1 || count($valV)>4) {
-                            break;
-                        }
-                        if (!isset($valV[1])) {
-                            $valV[1] = $valV[0];
-                        }
-                        if (!isset($valV[2])) {
-                            $valV = array($valV[0], $valV[0], $valV[1], $valV[1]);
-                        }
-                        if (!isset($valV[3])) {
-                            $valV[3] = $valV[1];
-                        }
-                    } else {
-                        $valV = $valH;
-                    }
-                    $this->value['border']['radius'] = array(
-                                'tl' => array($valH[0], $valV[0]),
-                                'tr' => array($valH[1], $valV[1]),
-                                'br' => array($valH[2], $valV[2]),
-                                'bl' => array($valH[3], $valV[3])
-                            );
-                    break;
-
-                case 'border-top-left-radius':
-                    $val = $this->cssConverter->convertToRadius($val);
-                    if (count($val)<1 || count($val)>2) {
-                        break;
-                    }
-                    $this->value['border']['radius']['tl'] = array($val[0], isset($val[1]) ? $val[1] : $val[0]);
-                    break;
-
-                case 'border-top-right-radius':
-                    $val = $this->cssConverter->convertToRadius($val);
-                    if (count($val)<1 || count($val)>2) {
-                        break;
-                    }
-                    $this->value['border']['radius']['tr'] = array($val[0], isset($val[1]) ? $val[1] : $val[0]);
-                    break;
-
-                case 'border-bottom-right-radius':
-                    $val = $this->cssConverter->convertToRadius($val);
-                    if (count($val)<1 || count($val)>2) {
-                        break;
-                    }
-                    $this->value['border']['radius']['br'] = array($val[0], isset($val[1]) ? $val[1] : $val[0]);
-                    break;
-
-                case 'border-bottom-left-radius':
-                    $val = $this->cssConverter->convertToRadius($val);
-                    if (count($val)<1 || count($val)>2) {
-                        break;
-                    }
-                    $this->value['border']['radius']['bl'] = array($val[0], isset($val[1]) ? $val[1] : $val[0]);
-                    break;
-
-                case 'border-top':
-                    $this->value['border']['t'] = $this->readBorder($val);
-                    break;
-
-                case 'border-right':
-                    $this->value['border']['r'] = $this->readBorder($val);
-                    break;
-
-                case 'border-bottom':
-                    $this->value['border']['b'] = $this->readBorder($val);
-                    break;
-
-                case 'border-left':
-                    $this->value['border']['l'] = $this->readBorder($val);
-                    break;
-
-                case 'background-color':
-                    $this->value['background']['color'] = $this->cssConverter->convertBackgroundColor($val);
-                    break;
-
-                case 'background-image':
-                    $this->value['background']['image'] = $this->cssConverter->convertBackgroundImage($val);
-                    break;
-
-                case 'background-position':
-                    $res = null;
-                    $this->value['background']['position'] = $this->cssConverter->convertBackgroundPosition($val, $res);
-                    break;
-
-                case 'background-repeat':
-                    $this->value['background']['repeat'] = $this->cssConverter->convertBackgroundRepeat($val);
-                    break;
-
-                case 'background':
-                    $this->cssConverter->convertBackground($val, $this->value['background']);
-                    break;
-
-                case 'position':
-                    if ($val === 'absolute') {
-                        $this->value['position'] = 'absolute';
-                    } elseif ($val === 'relative') {
-                        $this->value['position'] = 'relative';
-                    } else {
-                        $this->value['position'] = null;
-                    }
-                    break;
-
-                case 'float':
-                    if ($val === 'left') {
-                        $this->value['float'] = 'left';
-                    } elseif ($val === 'right') {
-                        $this->value['float'] = 'right';
-                    } else {
-                        $this->value['float'] = null;
-                    }
-                    break;
-
-                case 'display':
-                    if ($val === 'inline') {
-                        $this->value['display'] = 'inline';
-                    } elseif ($val === 'block') {
-                        $this->value['display'] = 'block';
-                    } elseif ($val === 'none') {
-                        $this->value['display'] = 'none';
-                    } else {
-                        $this->value['display'] = null;
-                    }
-                    break;
-
-                case 'top':
-                case 'bottom':
-                case 'left':
-                case 'right':
-                    $this->value[$nom] = $val;
-                    break;
-
-                case 'list-style':
-                case 'list-style-type':
-                case 'list-style-image':
-                    if ($nom === 'list-style') {
-                        $nom = 'list-style-type';
-                    }
-                    $this->value[$nom] = $val;
-                    break;
-
-                case 'page-break-before':
-                case 'page-break-after':
-                    $this->value[$nom] = $val;
-                    break;
-
-                case 'start':
-                    $this->value[$nom] = intval($val);
-                    break;
-
-                default:
-                    break;
-            }
-        }
-
-        $return = true;
-
-        // only for P tag
-        if ($this->value['margin']['t'] === null) {
-            $this->value['margin']['t'] = $this->value['font-size'];
-        }
-        if ($this->value['margin']['b'] === null) {
-            $this->value['margin']['b'] = $this->value['font-size'];
-        }
-
-        // force the text align to left, if asked by html2pdf
-        if ($this->onlyLeft) {
-            $this->value['text-align'] = 'left';
-        }
-
-        // correction on the width (quick box)
-        if ($noWidth
-            && in_array($tagName, array('div', 'blockquote', 'fieldset'))
-            && $this->value['position'] !== 'absolute'
-        ) {
-            $this->value['width'] = $this->getLastWidth();
-            $this->value['width']-= $this->value['margin']['l'] + $this->value['margin']['r'];
-        } else {
-            if ($correctWidth) {
-                if (!in_array($tagName, array('table', 'div', 'blockquote', 'fieldset', 'hr'))) {
-                    $this->value['width']-= $this->value['padding']['l'] + $this->value['padding']['r'];
-                    $this->value['width']-= $this->value['border']['l']['width'] + $this->value['border']['r']['width'];
-                }
-                if (in_array($tagName, array('th', 'td'))) {
-                    $this->value['width']-= $this->cssConverter->convertToMM(isset($param['cellspacing']) ? $param['cellspacing'] : '2px');
-                    $return = false;
-                }
-                if ($this->value['width']<0) {
-                    $this->value['width']=0;
-                }
-            } else {
-                if ($this->value['width']) {
-                    if ($this->value['border']['l']['width']) {
-                        $this->value['width'] += $this->value['border']['l']['width'];
-                    }
-                    if ($this->value['border']['r']['width']) {
-                        $this->value['width'] += $this->value['border']['r']['width'];
-                    }
-                    if ($this->value['padding']['l']) {
-                        $this->value['width'] += $this->value['padding']['l'];
-                    }
-                    if ($this->value['padding']['r']) {
-                        $this->value['width'] += $this->value['padding']['r'];
-                    }
-                }
-            }
-        }
-        if ($this->value['height']) {
-            if ($this->value['border']['b']['width']) {
-                $this->value['height'] += $this->value['border']['b']['width'];
-            }
-            if ($this->value['border']['t']['width']) {
-                $this->value['height'] += $this->value['border']['t']['width'];
-            }
-            if ($this->value['padding']['b']) {
-                $this->value['height'] += $this->value['padding']['b'];
-            }
-            if ($this->value['padding']['t']) {
-                $this->value['height'] += $this->value['padding']['t'];
-            }
-        }
-
-        if ($this->value['top'] != null) {
-            $this->value['top']     = $this->cssConverter->convertToMM($this->value['top'], $this->getLastHeight(true));
-        }
-        if ($this->value['bottom'] != null) {
-            $this->value['bottom']  = $this->cssConverter->convertToMM($this->value['bottom'], $this->getLastHeight(true));
-        }
-        if ($this->value['left'] != null) {
-            $this->value['left']    = $this->cssConverter->convertToMM($this->value['left'], $this->getLastWidth(true));
-        }
-        if ($this->value['right'] != null) {
-            $this->value['right']   = $this->cssConverter->convertToMM($this->value['right'], $this->getLastWidth(true));
-        }
-
-        if ($this->value['top'] && $this->value['bottom'] && $this->value['height']) {
-            $this->value['bottom']  = null;
-        }
-        if ($this->value['left'] && $this->value['right'] && $this->value['width']) {
-            $this->value['right']   = null;
-        }
-
-        return $return;
-    }
-
-    /**
-     * Get the height of the current line
-     *
-     * @return float height in mm
-     */
-    public function getLineHeight()
-    {
-        $val = $this->value['line-height'];
-        if ($val === 'normal') {
-            $val = '108%';
-        }
-        return $this->cssConverter->convertToMM($val, $this->value['font-size']);
-    }
-
-    /**
-     * Get the width of the parent
-     *
-     * @param  boolean $mode true => adding padding and border
-     *
-     * @return float width in mm
-     */
-    public function getLastWidth($mode = false)
-    {
-        for ($k=count($this->table)-1; $k>=0; $k--) {
-            if ($this->table[$k]['width']) {
-                $w = $this->table[$k]['width'];
-                if ($mode) {
-                    $w+= $this->table[$k]['border']['l']['width'] + $this->table[$k]['padding']['l'] + 0.02;
-                    $w+= $this->table[$k]['border']['r']['width'] + $this->table[$k]['padding']['r'] + 0.02;
-                }
-                return $w;
-            }
-        }
-        return $this->pdf->getW() - $this->pdf->getlMargin() - $this->pdf->getrMargin();
-    }
-
-    /**
-     * Get the height of the parent
-     *
-     * @param  boolean $mode true => adding padding and border
-     *
-     * @return float height in mm
-     */
-    public function getLastHeight($mode = false)
-    {
-        for ($k=count($this->table)-1; $k>=0; $k--) {
-            if ($this->table[$k]['height']) {
-                $h = $this->table[$k]['height'];
-                if ($mode) {
-                    $h+= $this->table[$k]['border']['t']['width'] + $this->table[$k]['padding']['t'] + 0.02;
-                    $h+= $this->table[$k]['border']['b']['width'] + $this->table[$k]['padding']['b'] + 0.02;
-                }
-                return $h;
-            }
-        }
-        return $this->pdf->getH() - $this->pdf->gettMargin() - $this->pdf->getbMargin();
-    }
-
-    /**
-     * Get the value of the float property
-     *
-     * @return string left/right
-     */
-    public function getFloat()
-    {
-        if ($this->value['float'] === 'left') {
-            return 'left';
-        }
-        if ($this->value['float'] === 'right') {
-            return 'right';
-        }
-        return null;
-    }
-
-    /**
-     * Get the last value for a specific key
-     *
-     * @param  string $key
-     *
-     * @return mixed
-     */
-    public function getLastValue($key)
-    {
-        $nb = count($this->table);
-        if ($nb>0) {
-            return $this->table[$nb-1][$key];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Get the last absolute X
-     *
-     * @return float x
-     */
-    protected function getLastAbsoluteX()
-    {
-        for ($k=count($this->table)-1; $k>=0; $k--) {
-            if ($this->table[$k]['x'] && $this->table[$k]['position']) {
-                return $this->table[$k]['x'];
-            }
-        }
-        return $this->pdf->getlMargin();
-    }
-
-    /**
-     * Get the last absolute Y
-     *
-     * @return float y
-     */
-    protected function getLastAbsoluteY()
-    {
-        for ($k=count($this->table)-1; $k>=0; $k--) {
-            if ($this->table[$k]['y'] && $this->table[$k]['position']) {
-                return $this->table[$k]['y'];
-            }
-        }
-        return $this->pdf->gettMargin();
-    }
-
-    /**
-     * Get the CSS properties of the current tag
-     *
-     * @return array styles
-     */
-    protected function getFromCSS()
-    {
-        // styles to apply
-        $styles = array();
-
-        // list of the selectors to get in the CSS files
-        $getit  = array();
-
-        // get the list of the selectors of each tags
-        $lst = array();
-        $lst[] = $this->value['id_lst'];
-        for ($i=count($this->table)-1; $i>=0; $i--) {
-            $lst[] = $this->table[$i]['id_lst'];
-        }
-
-        // foreach selectors in the CSS files, verify if it match with the list of selectors
-        foreach ($this->cssKeys as $key => $num) {
-            if ($this->getReccursiveStyle($key, $lst)) {
-                $getit[$key] = $num;
-            }
-        }
-
-        // if we have selectors
-        if (count($getit)) {
-            // get them, but in the definition order, because of priority
-            asort($getit);
-            foreach ($getit as $key => $val) {
-                $styles = array_merge($styles, $this->css[$key]);
-            }
-        }
-
-        return $styles;
-    }
-
-    /**
-     * Identify if the selector $key match with the list of tag selectors
-     *
-     * @param  string   $key CSS selector to analyse
-     * @param  array    $lst list of the selectors of each tags
-     * @param  string   $next next step of parsing the selector
-     *
-     * @return boolean
-     */
-    protected function getReccursiveStyle($key, $lst, $next = null)
-    {
-        // if next step
-        if ($next !== null) {
-            // we remove this step
-            if ($next) {
-                $key = trim(substr($key, 0, -strlen($next)));
-            }
-            array_shift($lst);
-
-            // if no more step to identify => return false
-            if (!count($lst)) {
-                return false;
-            }
-        }
-
-        // for each selector of the current step
-        foreach ($lst[0] as $name) {
-            // if selector = key => ok
-            if ($key == $name) {
-                return true;
-            }
-
-            // if the end of the key = the selector and the next step is ok => ok
-            if (substr($key, -strlen(' '.$name)) === ' '.$name && $this->getReccursiveStyle($key, $lst, $name)) {
-                return true;
-            }
-        }
-
-        // if we are not in the first step, we analyse the sub steps (the pareng tag of the current tag)
-        if ($next !== null && $this->getReccursiveStyle($key, $lst, '')) {
-            return true;
-        }
-
-        // no corresponding found
-        return false;
-    }
-
-    /**
-     * Analyse a border
-     *
-     * @param   string $css css border properties
-     *
-     * @return  array border properties
-     */
-    public function readBorder($css)
-    {
-        // border none
-        $none = array('type' => 'none', 'width' => 0, 'color' => array(0, 0, 0));
-
-        // default value
-        $type  = 'solid';
-        $width = $this->cssConverter->convertToMM('1pt');
-        $color = array(0, 0, 0);
-
-        // clean up the values
-        $css = explode(' ', $css);
-        foreach ($css as $k => $v) {
-            $v = trim($v);
-            if ($v !== '') {
-                $css[$k] = $v;
-            } else {
-                unset($css[$k]);
-            }
-        }
-        $css = array_values($css);
-
-        // read the values
-        $res = null;
-        foreach ($css as $value) {
-
-            // if no border => return none
-            if ($value === 'none' || $value === 'hidden') {
-                return $none;
-            }
-
-            // try to convert the value as a distance
-            $tmp = $this->cssConverter->convertToMM($value);
-
-            // if the convert is ok => it is a width
-            if ($tmp !== null) {
-                $width = $tmp;
-            // else, it could be the type
-            } elseif (in_array($value, array('solid', 'dotted', 'dashed', 'double'))) {
-                $type = $value;
-            // else, it could be the color
-            } else {
-                $tmp = $this->cssConverter->convertToColor($value, $res);
-                if ($res) {
-                    $color = $tmp;
-                }
-            }
-        }
-
-        // if no witdh => return none
-        if (!$width) {
-            return $none;
-        }
-
-        // return the border properties
-        return array('type' => $type, 'width' => $width, 'color' => $color);
-    }
-
-    /**
-     * Duplicate the borders if needed
-     *
-     * @param  &array $val
-     *
-     * @return void
-     */
-    protected function duplicateBorder(&$val)
-    {
-        // 1 value => L => RTB
-        if (count($val) == 1) {
-            $val[1] = $val[0];
-            $val[2] = $val[0];
-            $val[3] = $val[0];
-        // 2 values => L => R & T => B
-        } elseif (count($val) == 2) {
-            $val[2] = $val[0];
-            $val[3] = $val[1];
-        // 3 values => T => B
-        } elseif (count($val) == 3) {
-            $val[3] = $val[1];
-        }
-    }
-
-
-    /**
-     * Read a css content
-     *
-     * @param  &string $code
-     *
-     * @return void
-     */
-    protected function analyseStyle($code)
-    {
-        // clean the spaces
-        $code = preg_replace('/[\s]+/', ' ', $code);
-
-        // remove the comments
-        $code = preg_replace('/\/\*.*?\*\//s', '', $code);
-
-        // split each CSS code "selector { value }"
-        preg_match_all('/([^{}]+){([^}]*)}/isU', $code, $match);
-
-        // for each CSS code
-        $amountMatch = count($match[0]);
-        for ($k = 0; $k < $amountMatch; $k++) {
-
-            // selectors
-            $names = strtolower(trim($match[1][$k]));
-
-            // css style
-            $styles = trim($match[2][$k]);
-
-            // explode each value
-            $styles = explode(';', $styles);
-
-            // parse each value
-            $css = array();
-            foreach ($styles as $style) {
-                $tmp = explode(':', $style);
-                if (count($tmp) > 1) {
-                    $cod = $tmp[0];
-                    unset($tmp[0]);
-                    $tmp = implode(':', $tmp);
-                    $css[trim(strtolower($cod))] = trim($tmp);
-                }
-            }
-
-            // explode the names
-            $names = explode(',', $names);
-
-            // save the values for each names
-            foreach ($names as $name) {
-                // clean the name
-                $name = trim($name);
-
-                // if a selector with something like :hover => continue
-                if (strpos($name, ':') !== false) {
-                    continue;
-                }
-
-                // save the value
-                if (!isset($this->css[$name])) {
-                    $this->css[$name] = $css;
-                } else {
-                    $this->css[$name] = array_merge($this->css[$name], $css);
-                }
-
-            }
-        }
-
-        // get he list of the keys
-        $this->cssKeys = array_flip(array_keys($this->css));
-    }
-
-    /**
-     * Extract the css files from a html code
-     *
-     * @param  string $html
-     *
-     * @return string
-     */
-    public function extractStyle($html)
-    {
-        // the CSS content
-        $style = ' ';
-
-        // extract the link tags, and remove them in the html code
-        preg_match_all('/<link([^>]*)>/isU', $html, $match);
-        $html = preg_replace('/<link[^>]*>/isU', '', $html);
-        $html = preg_replace('/<\/link[^>]*>/isU', '', $html);
-
-        // analyse each link tag
-        foreach ($match[1] as $code) {
-            $tmp = $this->tagParser->extractTagAttributes($code);
-
-            // if type text/css => we keep it
-            if (isset($tmp['type']) && strtolower($tmp['type']) === 'text/css' && isset($tmp['href'])) {
-
-                // get the href
-                $url = $tmp['href'];
-
-                // get the content of the css file
-                $content = @file_get_contents($url);
-
-                // if "http://" in the url
-                if (strpos($url, 'http://') !== false) {
-
-                    // get the domain "http://xxx/"
-                    $url = str_replace('http://', '', $url);
-                    $url = explode('/', $url);
-                    $urlMain = 'http://'.$url[0].'/';
-
-                    // get the absolute url of the path
-                    $urlSelf = $url;
-                    unset($urlSelf[count($urlSelf)-1]);
-                    $urlSelf = 'http://'.implode('/', $urlSelf).'/';
-
-                    // adapt the url in the css content
-                    $content = preg_replace('/url\(([^\\\\][^)]*)\)/isU', 'url('.$urlSelf.'$1)', $content);
-                    $content = preg_replace('/url\((\\\\[^)]*)\)/isU', 'url('.$urlMain.'$1)', $content);
-                } else {
-                    // @TODO correction on url in absolute on a local css content
-                    // $content = preg_replace('/url\(([^)]*)\)/isU', 'url('.dirname($url).'/$1)', $content);
-                }
-
-                // add to the CSS content
-                $style.= $content."\n";
-            }
-        }
-
-        // extract the style tags des tags style, and remove them in the html code
-        preg_match_all('/<style[^>]*>(.*)<\/style[^>]*>/isU', $html, $match);
-        $html = preg_replace_callback('/<style[^>]*>(.*)<\/style[^>]*>/isU', [$this, 'removeStyleTag'], $html);
-
-        // analyse each style tags
-        foreach ($match[1] as $code) {
-            // add to the CSS content
-            $code = str_replace('<!--', '', $code);
-            $code = str_replace('-->', '', $code);
-            $style.= $code."\n";
-        }
-
-        //analyse the css content
-        $this->analyseStyle($style);
-
-        return $html;
-    }
-
-    /**
-     * put the same line number for the lexer
-     * @param string[] $match
-     * @return string
-     */
-    private function removeStyleTag(array $match)
-    {
-        $nbLines = count(explode("\n", $match[0]))-1;
-
-        return str_pad('', $nbLines, "\n");
-    }
-}
diff --git a/html2pdf-master/src/Parsing/Html.php b/html2pdf-master/src/Parsing/Html.php
deleted file mode 100644
index 06da40f3..00000000
--- a/html2pdf-master/src/Parsing/Html.php
+++ /dev/null
@@ -1,473 +0,0 @@
-<?php
-/**
- * Html2Pdf Library
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-namespace Spipu\Html2Pdf\Parsing;
-
-use Spipu\Html2Pdf\Exception\HtmlParsingException;
-
-/**
- * Class Html
- */
-class Html
-{
-    const HTML_TAB = '        ';
-
-    /**
-     * @var TagParser
-     */
-    protected $tagParser;
-
-    /**
-     * @var TextParser
-     */
-    protected $textParser;
-
-    /**
-     * are we in a pre ?
-     * @var boolean
-     */
-    protected $tagPreIn = false;
-
-    /**
-     * parsed HTML code
-     * @var Node[]
-     */
-    public $code = array();
-
-    /**
-     * main constructor
-     *
-     * @param TextParser $textParser
-     */
-    public function __construct(TextParser $textParser)
-    {
-        $this->textParser = $textParser;
-        $this->tagParser = new TagParser($this->textParser);
-        $this->code  = array();
-    }
-
-    /**
-     * Get the list of the codes, but cloned
-     *
-     * @return Node[]
-     */
-    public function getCloneCodes()
-    {
-        $codes = array();
-        foreach ($this->code as $key => $code) {
-            $codes[$key] = clone $code;
-        }
-        return $codes;
-    }
-
-    /**
-     * parse the HTML code
-     *
-     * @param Token[] $tokens A list of tokens to parse
-     *
-     * @throws HtmlParsingException
-     */
-    public function parse($tokens)
-    {
-        $parents = array();
-
-        // flag : are we in a <pre> Tag ?
-        $this->tagPreIn = false;
-
-        /**
-         * all the actions to do
-         * @var Node[] $actions
-         */
-        $actions = array();
-
-        // get the actions from the html tokens
-        foreach ($tokens as $token) {
-            if ($token->getType() === 'code') {
-                $actions = array_merge($actions, $this->getTagAction($token, $parents));
-            } elseif ($token->getType() === 'txt') {
-                $actions = array_merge($actions, $this->getTextAction($token));
-            }
-        }
-
-        // for each identified action, we have to clean up the begin and the end of the texte
-        // based on tags that surround it
-
-        // list of the tags to clean
-        $tagsToClean = array(
-            'page', 'page_header', 'page_footer', 'form',
-            'table', 'thead', 'tfoot', 'tr', 'td', 'th', 'br',
-            'div', 'hr', 'p', 'ul', 'ol', 'li',
-            'h1', 'h2', 'h3', 'h4', 'h5', 'h6',
-            'bookmark', 'fieldset', 'legend',
-            'draw', 'circle', 'ellipse', 'path', 'rect', 'line', 'g', 'polygon', 'polyline',
-            'option'
-        );
-
-        // list of the tags to move space
-        $tagsToSpace = array(
-            'span', 'font', 'label',
-            'strong', 'b',
-            'address', 'cite', 'em', 'i', 'samp',
-            'cite', 's',
-            'ins', 'u',
-            'big', 'small', 'sub', 'sup'
-        );
-
-        // foreach action
-        $nb = count($actions);
-        for ($k = 0; $k < $nb; $k++) {
-            // if it is a Text
-            if ($actions[$k]->getName() !== 'write') {
-                continue;
-            }
-
-            // if the tag before the text is a tag to clean => ltrim on the text
-            if ($k>0) {
-                if (in_array($actions[$k - 1]->getName(), $tagsToClean)) {
-                    $actions[$k]->setParam('txt', ltrim($actions[$k]->getParam('txt')));
-                }
-            }
-
-            if ($k < $nb - 1) {
-                // if the tag after the text is a tag to clean => rtrim on the text
-                if (in_array($actions[$k + 1]->getName(), $tagsToClean)) {
-                    $actions[$k]->setParam('txt', rtrim($actions[$k]->getParam('txt')));
-                }
-
-                // if the tag after the text is a tag with space to move => move the space to the next write
-                if (in_array($actions[$k + 1]->getName(), $tagsToSpace)) {
-                    if (substr($actions[$k]->getParam('txt'), -1) == ' ') {
-                        $actions[$k]->setParam('txt', rtrim($actions[$k]->getParam('txt')));
-                        for ($subK = $k+2; $subK < $nb; $subK++) {
-                            if ($actions[$subK]->getName() === 'write') {
-                                $actions[$subK]->setParam('txt', ' '.ltrim($actions[$subK]->getParam('txt')));
-                                break;
-                            }
-                        }
-                    }
-                }
-            }
-
-            // if the text is empty => remove the action
-            if (!strlen($actions[$k]->getParam('txt'))) {
-                unset($actions[$k]);
-            }
-        }
-
-        // if we are not on the level 0 => HTML validator ERROR
-        if (count($parents)) {
-            if (count($parents)>1) {
-                $errorMsg = 'The following tags have not been closed:';
-            } else {
-                $errorMsg = 'The following tag has not been closed:';
-            }
-
-            $e = new HtmlParsingException($errorMsg.' '.implode(', ', $parents));
-            $e->setInvalidTag($parents[0]);
-            throw $e;
-        }
-
-        $this->verifyMustContain($actions, 'thead', 'tr');
-        $this->verifyMustContain($actions, 'tfoot', 'tr');
-
-        // save the actions to do
-        $this->code = array_values($actions);
-    }
-
-    /**
-     * Verify some tags that must contain other tags
-     *
-     * @param Node[] $actions
-     * @param string $mainTag
-     * @param string $mustTag
-     *
-     * @return bool
-     * @throws HtmlParsingException
-     */
-    protected function verifyMustContain(&$actions, $mainTag, $mustTag)
-    {
-        $inMainTag = 0;
-        $foundMustTag = false;
-
-        foreach ($actions as $action) {
-            if ($action->getName() == $mainTag && !$action->isClose()) {
-                $inMainTag++;
-                $foundMustTag = false;
-            }
-
-            if ($action->getName() == $mustTag && $inMainTag > 0) {
-                $foundMustTag = true;
-            }
-
-            if ($action->getName() == $mainTag && $action->isClose()) {
-                if (!$foundMustTag) {
-                    $exception = new HtmlParsingException(
-                        "The tag [$mainTag] must contain at least one tag [$mustTag]"
-                    );
-                    $exception->setInvalidTag($action->getName());
-                    $exception->setHtmlLine($action->getLine());
-                    throw $exception;
-                }
-                $inMainTag--;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * TODO remove the reference on the $parents variable
-     *
-     * @param Token $token
-     * @param array $parents
-     *
-     * @return array
-     * @throws HtmlParsingException
-     */
-    protected function getTagAction(Token $token, &$parents)
-    {
-        // tag that can be not closed
-        $tagsNotClosed = array(
-            'br', 'hr', 'img', 'col',
-            'input', 'link', 'option',
-            'circle', 'ellipse', 'path', 'rect', 'line', 'polygon', 'polyline'
-        );
-
-        // analyze the HTML code
-        $node = $this->tagParser->analyzeTag($token->getData());
-
-        // save the current position in the HTML code
-        $node->setLine($token->getLine());
-
-        $actions = array();
-        // if the tag must be closed
-        if (!in_array($node->getName(), $tagsNotClosed)) {
-            // if it is a closure tag
-            if ($node->isClose()) {
-                // HTML validation
-                if (count($parents) < 1) {
-                    $e = new HtmlParsingException('Too many tag closures found for ['.$node->getName().']');
-                    $e->setInvalidTag($node->getName());
-                    $e->setHtmlLine($token->getLine());
-                    throw $e;
-                } elseif (end($parents) != $node->getName()) {
-                    $e = new HtmlParsingException('Tags are closed in a wrong order for ['.$node->getName().']');
-                    $e->setInvalidTag($node->getName());
-                    $e->setHtmlLine($token->getLine());
-                    throw $e;
-                } else {
-                    array_pop($parents);
-                }
-            } else {
-                // if it is an auto-closed tag
-                if ($node->isAutoClose()) {
-                    // save the opened tag
-                    $actions[] = $node;
-
-                    // prepare the closed tag
-                    $node = clone $node;
-                    $node->setParams(array());
-                    $node->setClose(true);
-                } else {
-                    // else: add a child for validation
-                    array_push($parents, $node->getName());
-                }
-            }
-
-            // if it is a <pre> tag (or <code> tag) not auto-closed => update the flag
-            if (($node->getName() === 'pre' || $node->getName() === 'code') && !$node->isAutoClose()) {
-                $this->tagPreIn = !$node->isClose();
-            }
-        }
-
-        // save the actions to convert
-        $actions[] = $node;
-
-        return $actions;
-    }
-
-    /**
-     * get the Text action
-     *
-     * @param Token $token
-     *
-     * @return array
-     */
-    protected function getTextAction(Token $token)
-    {
-        // action to use for each line of the content of a <pre> Tag
-        $tagPreBr = new Node('br', array('style' => array(), 'num' => 0), false);
-
-        $actions = array();
-
-        // if we are not in a <pre> tag
-        if (!$this->tagPreIn) {
-            // save the action
-            $actions[] = new Node('write', array('txt' => $this->textParser->prepareTxt($token->getData())), false);
-        } else { // else (if we are in a <pre> tag)
-            // prepare the text
-            $data = str_replace("\r", '', $token->getData());
-            $lines = explode("\n", $data);
-
-            // foreach line of the text
-            foreach ($lines as $k => $txt) {
-                // transform the line
-                $txt = str_replace("\t", self::HTML_TAB, $txt);
-                $txt = str_replace(' ', '&nbsp;', $txt);
-
-                // add a break line
-                if ($k > 0) {
-                    $actions[] = clone $tagPreBr;
-                }
-
-                // save the action
-                $actions[] = new Node('write', array('txt' => $this->textParser->prepareTxt($txt, false)), false);
-            }
-        }
-        return $actions;
-    }
-
-    /**
-     * get a full level of HTML, between an opening and closing corresponding
-     *
-     * @param   integer $k
-     * @return  array   actions
-     */
-    public function getLevel($k)
-    {
-        // if the code does not exist => return empty
-        if (!isset($this->code[$k])) {
-            return array();
-        }
-
-        // the tag to detect
-        $detect = $this->code[$k]->getName();
-
-        // if it is a text => return
-        if ($detect === 'write') {
-            return array($this->code[$k]);
-        }
-
-        //
-        $level = 0;      // depth level
-        $end = false;    // end of the search
-        $code = array(); // extract code
-
-        // while it's not ended
-        while (!$end) {
-            // current action
-            /** @var Node $node */
-            $node = $this->code[$k];
-
-            // if 'write' => we add the text
-            if ($node->getName() === 'write') {
-                $code[] = $node;
-            } else { // else, it is a html tag
-                $not = false; // flag for not taking into account the current tag
-
-                // if it is the searched tag
-                if ($node->getName() == $detect) {
-                    // if we are just at the root level => dont take it
-                    if ($level == 0) {
-                        $not = true;
-                    }
-
-                    // update the level
-                    $level += ($node->isClose() ? -1 : 1);
-
-                    // if we are now at the root level => it is the end, and dont take it
-                    if ($level == 0) {
-                        $not = true;
-                        $end = true;
-                    }
-                }
-
-                // if we can take into account the current tag => save it
-                if (!$not) {
-                    $code[] = $node;
-                }
-            }
-
-            // it continues as long as there has code to analyze
-            if (isset($this->code[$k + 1])) {
-                $k++;
-            } else {
-                $end = true;
-            }
-        }
-
-        // return the extract
-        return $code;
-    }
-
-    /**
-     * prepare the HTML
-     *
-     * @param string $html
-     *
-     * @return string
-     */
-    public function prepareHtml($html)
-    {
-        // if it is a real html page, we have to convert it
-        if (preg_match('/<body/isU', $html)) {
-            $html = $this->getHtmlFromRealPage($html);
-        }
-
-        // replace some constants
-        $html = str_replace('[[date_y]]', date('Y'), $html);
-        $html = str_replace('[[date_m]]', date('m'), $html);
-        $html = str_replace('[[date_d]]', date('d'), $html);
-
-        $html = str_replace('[[date_h]]', date('H'), $html);
-        $html = str_replace('[[date_i]]', date('i'), $html);
-        $html = str_replace('[[date_s]]', date('s'), $html);
-
-        return $html;
-    }
-
-    /**
-     * convert the HTML of a real page, to a code adapted to Html2Pdf
-     *
-     * @param  string $html HTML code of a real page
-     * @return string HTML adapted to Html2Pdf
-     */
-    protected function getHtmlFromRealPage($html)
-    {
-        // set body tag to lower case
-        $html = str_replace('<BODY', '<body', $html);
-        $html = str_replace('</BODY', '</body', $html);
-
-        // explode from the body tag. If no body tag => end
-        $res = explode('<body', $html);
-
-        // the html content is between body tag openning and closing
-        $content = '<page'.$res[1];
-        $content = explode('</body', $content);
-        $content = $content[0].'</page>';
-
-        // extract the link tags from the original html
-        // and add them before the content
-        preg_match_all('/<link ([^>]*)[\/]?>/isU', $html, $match);
-        foreach ($match[1] as $src) {
-            $content = '<link '.$src.'/>'.$content;
-        }
-
-        // extract the css style tags from the original html
-        // and add them before the content
-        preg_match_all('/<style[^>]*>(.*)<\/style[^>]*>/isU', $html, $match);
-        foreach ($match[0] as $src) {
-            $content = $src.$content;
-        }
-
-        return $content;
-    }
-}
diff --git a/html2pdf-master/src/Parsing/HtmlLexer.php b/html2pdf-master/src/Parsing/HtmlLexer.php
deleted file mode 100644
index 70c2e439..00000000
--- a/html2pdf-master/src/Parsing/HtmlLexer.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - parsing Html class
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-namespace Spipu\Html2Pdf\Parsing;
-
-/**
- * Class HtmlLexer
- */
-class HtmlLexer
-{
-    /**
-     * Tokenize the HTML code
-     *
-     * @param string $html HTML code to tokenize
-     *
-     * @return Token[]
-     */
-    public function tokenize($html)
-    {
-        // initialise the array
-        $tokens = array();
-
-        // regexp to separate the tags from the texts
-        $reg = '/(<\/?\w[^<>]*>)|([^<]+|<)/is';
-        $commentRegex = '/(<!--.*-->)/isU';
-
-        // last match found
-        $str = '';
-        $offset = 0;
-        $line = 1;
-        $length = strlen($html);
-
-        // As it finds a match
-        while ($offset < $length) {
-            if (strpos($html, '<!--', $offset) === $offset
-                && preg_match($commentRegex, $html, $match, PREG_OFFSET_CAPTURE, $offset)
-            ) {
-                $line += substr_count($match[1][0], "\n");
-                $offset = $match[0][1] + strlen($match[0][0]);
-                continue;
-            }
-            preg_match($reg, $html, $parse, PREG_OFFSET_CAPTURE, $offset);
-            // if it is a tag
-            if ($parse[1][0]) {
-                // save the previous text if it exists
-                if ($str !== '') {
-                    $tokens[] = new Token('txt', $str);
-                }
-
-                // save the tag, with the offset
-                $tokens[] = new Token('code', trim($parse[1][0]), $line);
-                $line += substr_count($parse[1][0], "\n");
-
-                // init the current text
-                $str = '';
-            } else { // else (if it is a text)
-                // add the new text to the current text
-                $str .= $parse[2][0];
-                $line += substr_count($parse[2][0], "\n");
-            }
-
-            // Update offset to the end of the match
-            $offset = $parse[0][1] + strlen($parse[0][0]);
-            unset($parse);
-        }
-        // if a text is present in the end, we save it
-        if ($str !== '') {
-            $tokens[] = new Token('txt', $str);
-        }
-
-        return $tokens;
-    }
-}
diff --git a/html2pdf-master/src/Parsing/Node.php b/html2pdf-master/src/Parsing/Node.php
deleted file mode 100644
index 27102d57..00000000
--- a/html2pdf-master/src/Parsing/Node.php
+++ /dev/null
@@ -1,180 +0,0 @@
-<?php
-/**
- * Html2Pdf Library
- *
- * HTML => PDF convertor
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-namespace Spipu\Html2Pdf\Parsing;
-
-/**
- * Class Node
- *
- * Represent an DOM node in the document
- */
-class Node
-{
-    /**
-     * @var string
-     */
-    private $name;
-
-    /**
-     * @var array
-     */
-    private $params;
-
-    /**
-     * @var bool
-     */
-    private $close;
-
-    /**
-     * @var bool
-     */
-    private $autoClose;
-
-    /**
-     * @var int
-     */
-    private $line;
-
-    /**
-     * @param string $name
-     * @param array  $params
-     * @param bool   $close
-     * @param bool   $autoClose
-     */
-    public function __construct($name, $params, $close, $autoClose = false)
-    {
-        $this->setName($name);
-        $this->setParams($params);
-        $this->setClose($close);
-        $this->setAutoClose($autoClose);
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * @param string $name
-     */
-    public function setName($name)
-    {
-        $this->name = $name;
-    }
-
-    /**
-     * @return array
-     */
-    public function getParams()
-    {
-        return $this->params;
-    }
-
-    /**
-     * @param string $key
-     * @param mixed  $default
-     *
-     * @return null
-     */
-    public function getParam($key, $default = null)
-    {
-        if (array_key_exists($key, $this->params)) {
-            return $this->params[$key];
-        }
-        return $default;
-    }
-
-    /**
-     * Get a style
-     * @param string $key
-     * @param string|null $default
-     *
-     * @return string|null
-     */
-    public function getStyle($key, $default = null)
-    {
-        $styles = $this->getParam('style', []);
-
-        if (array_key_exists($key, $styles)) {
-            return $styles[$key];
-        }
-        return $default;
-    }
-
-    /**
-     * @param string $key
-     * @param mixed  $value
-     *
-     * @return mixed
-     */
-    public function setParam($key, $value)
-    {
-        return $this->params[$key] = $value;
-    }
-
-    /**
-     * @param array $params
-     */
-    public function setParams($params)
-    {
-        $this->params = $params;
-    }
-
-    /**
-     * @return bool
-     */
-    public function isClose()
-    {
-        return $this->close;
-    }
-
-    /**
-     * @param bool $close
-     */
-    public function setClose($close)
-    {
-        $this->close = (bool) $close;
-    }
-    /**
-     * @return bool
-     */
-    public function isAutoClose()
-    {
-        return $this->autoClose;
-    }
-
-    /**
-     * @param $autoClose
-     */
-    public function setAutoClose($autoClose)
-    {
-        $this->autoClose = (bool) $autoClose;
-    }
-
-    /**
-     * @return int
-     */
-    public function getLine()
-    {
-        return $this->line;
-    }
-
-    /**
-     * @param int $line
-     */
-    public function setLine($line)
-    {
-        $this->line = $line;
-    }
-}
diff --git a/html2pdf-master/src/Parsing/TagParser.php b/html2pdf-master/src/Parsing/TagParser.php
deleted file mode 100644
index 6f14d750..00000000
--- a/html2pdf-master/src/Parsing/TagParser.php
+++ /dev/null
@@ -1,227 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - parsing Html class
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-namespace Spipu\Html2Pdf\Parsing;
-
-use Spipu\Html2Pdf\Exception\HtmlParsingException;
-
-/**
- * Class TagParser
- */
-class TagParser
-{
-    protected $level;         // table level
-    protected $num = 0;       // table number
-    protected $textParser;
-
-    public function __construct(TextParser $textParser)
-    {
-        $this->textParser = $textParser;
-        $this->level = array($this->num);
-    }
-
-    /**
-     * analyze a HTML tag
-     *
-     * @param string $code HTML code to analyze
-     *
-     * @return Node corresponding action
-     * @throws HtmlParsingException
-     */
-    public function analyzeTag($code)
-    {
-        // name of the tag, opening, closure, autoclosure
-        $tag = '<([\/]{0,1})([_a-z0-9]+)([\/>\s]+)';
-        if (!preg_match('/'.$tag.'/isU', $code, $match)) {
-            $e = new HtmlParsingException('The HTML tag ['.$code.'] provided is invalid');
-            $e->setInvalidTag($code);
-            throw $e;
-        }
-        $close     = ($match[1] === '/' ? true : false);
-        $autoclose = preg_match('/\/>$/isU', $code);
-        $name      = strtolower($match[2]);
-
-        // required parameters (depends on the tag name)
-        $defaultParams = array();
-        $defaultParams['style'] = '';
-        if ($name === 'img') {
-            $defaultParams['alt'] = '';
-            $defaultParams['src'] = '';
-        } elseif ($name === 'a') {
-            $defaultParams['href'] = '';
-        }
-
-        $param = array_merge($defaultParams, $this->extractTagAttributes($code));
-        $param['style'] = trim($param['style']);
-        if (strlen($param['style']) > 0 && substr($param['style'], -1) !== ';') {
-            $param['style'].= ';';
-        }
-
-        // compliance of each parameter
-        $color  = "#000000";
-        $border = null;
-        foreach ($param as $key => $val) {
-            switch ($key) {
-                case 'width':
-                    unset($param[$key]);
-                    $param['style'] .= 'width: '.$val.'px; ';
-                    break;
-
-                case 'align':
-                    if ($name === 'img') {
-                        unset($param[$key]);
-                        $param['style'] .= 'float: '.$val.'; ';
-                    } elseif ($name !== 'table') {
-                        unset($param[$key]);
-                        $param['style'] .= 'text-align: '.$val.'; ';
-                    }
-                    break;
-
-                case 'valign':
-                    unset($param[$key]);
-                    $param['style'] .= 'vertical-align: '.$val.'; ';
-                    break;
-
-                case 'height':
-                    unset($param[$key]);
-                    $param['style'] .= 'height: '.$val.'px; ';
-                    break;
-
-                case 'bgcolor':
-                    unset($param[$key]);
-                    $param['style'] .= 'background: '.$val.'; ';
-                    break;
-
-                case 'bordercolor':
-                    unset($param[$key]);
-                    $color = $val;
-                    break;
-
-                case 'border':
-                    unset($param[$key]);
-                    if (preg_match('/^[0-9]+$/isU', $val)) {
-                        $val = $val.'px';
-                    }
-                    $border = $val;
-                    break;
-
-                case 'cellpadding':
-                case 'cellspacing':
-                    if (preg_match('/^([0-9]+)$/isU', $val)) {
-                        $param[$key] = $val.'px';
-                    }
-                    break;
-
-                case 'colspan':
-                case 'rowspan':
-                    $val = preg_replace('/[^0-9]/isU', '', $val);
-                    if (!$val) {
-                        $val = 1;
-                    }
-                    $param[$key] = (int) $val;
-                    break;
-
-                case 'color':
-                    if ($name === 'font') {
-                        unset($param[$key]);
-                        $param['style'] .= 'color: '.$val.'; ';
-                    }
-                    break;
-            }
-        }
-
-        // compliance of the border
-        if ($border !== null) {
-            if ($border && $border !== '0px') {
-                $border = 'solid '.$border.' '.$color;
-            } else {
-                $border = 'none';
-            }
-
-            $param['style'] .= 'border: '.$border.'; ';
-            $param['border'] = $border;
-        }
-
-        // reading styles: decomposition and standardization
-        $styles = explode(';', $param['style']);
-        $param['style'] = array();
-        foreach ($styles as $style) {
-            $tmp = explode(':', $style);
-            if (count($tmp) > 1) {
-                $cod = $tmp[0];
-                unset($tmp[0]);
-                $tmp = implode(':', $tmp);
-                $param['style'][trim(strtolower($cod))] = preg_replace('/[\s]+/isU', ' ', trim($tmp));
-            }
-        }
-
-        // determining the level of table opening, with an added level
-        if (in_array($name, array('ul', 'ol', 'table')) && !$close) {
-            $this->num++;
-            array_push($this->level, $this->num);
-        }
-
-        // get the level of the table containing the element
-        if (!isset($param['num'])) {
-            $param['num'] = end($this->level);
-        }
-
-        // for closures table: remove a level
-        if (in_array($name, array('ul', 'ol', 'table')) && $close) {
-            array_pop($this->level);
-        }
-
-        // prepare the parameters
-        if (isset($param['value'])) {
-            $keepSpaces = in_array($name, array('qrcode', 'barcode'));
-            $param['value']  = $this->textParser->prepareTxt($param['value'], !$keepSpaces);
-        }
-        if (isset($param['alt'])) {
-            $param['alt']    = $this->textParser->prepareTxt($param['alt']);
-        }
-        if (isset($param['title'])) {
-            $param['title']  = $this->textParser->prepareTxt($param['title']);
-        }
-        if (isset($param['class'])) {
-            $param['class']  = $this->textParser->prepareTxt($param['class']);
-        }
-
-        // return the new action to do
-        return new Node($name, $param, $close, $autoclose);
-    }
-
-    /**
-     * Extract the list of attribute => value inside an HTML tag
-     *
-     * @param string $code The full HTML tag to parse
-     *
-     * @return array
-     */
-    public function extractTagAttributes($code)
-    {
-        $param = array();
-        $regexes = array(
-            '([a-zA-Z0-9_]+)=([^"\'\s>]+)',  // read the parameters : name=value
-            '([a-zA-Z0-9_]+)=["]([^"]*)["]', // read the parameters : name="value"
-            "([a-zA-Z0-9_]+)=[']([^']*)[']"  // read the parameters : name='value'
-        );
-
-        foreach ($regexes as $regex) {
-            preg_match_all('/'.$regex.'/is', $code, $match);
-            $amountMatch = count($match[0]);
-            for ($k = 0; $k < $amountMatch; $k++) {
-                $param[trim(strtolower($match[1][$k]))] = trim($match[2][$k]);
-            }
-        }
-
-        return $param;
-    }
-}
diff --git a/html2pdf-master/src/Parsing/TextParser.php b/html2pdf-master/src/Parsing/TextParser.php
deleted file mode 100644
index 127fae75..00000000
--- a/html2pdf-master/src/Parsing/TextParser.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - parsing Html class
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-namespace Spipu\Html2Pdf\Parsing;
-
-/**
- * Class TextParser
- */
-class TextParser
-{
-    /**
-     * @var string
-     */
-    private $encoding;
-
-    /**
-     * @param string $encoding
-     */
-    public function __construct($encoding = 'UTF-8')
-    {
-        $this->encoding = $encoding;
-    }
-
-    /**
-     * prepare the text
-     *
-     * @param   string $txt
-     * @param   boolean $spaces true => replace multiple space+\t+\r+\n by a single space
-     * @return  string txt
-     * @access  protected
-     */
-    public function prepareTxt($txt, $spaces = true)
-    {
-        if ($spaces) {
-            $txt = preg_replace('/\s+/isu', ' ', $txt);
-        }
-        $txt = str_replace('&euro;', '€', $txt);
-        $txt = html_entity_decode($txt, ENT_QUOTES, $this->encoding);
-        return $txt;
-    }
-}
diff --git a/html2pdf-master/src/Parsing/Token.php b/html2pdf-master/src/Parsing/Token.php
deleted file mode 100644
index dfcbf12b..00000000
--- a/html2pdf-master/src/Parsing/Token.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-/**
- * Html2Pdf Library
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-namespace Spipu\Html2Pdf\Parsing;
-
-/**
- * Class Token
- *
- * Represents a token in the HTML flow
- */
-class Token
-{
-    /**
-     * @var string
-     */
-    private $type;
-
-    /**
-     * @var string
-     */
-    private $data;
-
-    /**
-     * @var int
-     */
-    private $line;
-
-    /**
-     * @param string $type
-     * @param string $data
-     * @param int    $line
-     */
-    public function __construct($type, $data, $line = -1)
-    {
-        $this->type = $type;
-        $this->data = $data;
-        $this->line = $line;
-    }
-
-    /**
-     * @return string
-     */
-    public function getType()
-    {
-        return $this->type;
-    }
-
-    /**
-     * @return string
-     */
-    public function getData()
-    {
-        return $this->data;
-    }
-
-    /**
-     * @return int
-     */
-    public function getLine()
-    {
-        return $this->line;
-    }
-}
diff --git a/html2pdf-master/src/SvgDrawer.php b/html2pdf-master/src/SvgDrawer.php
deleted file mode 100644
index eebfc078..00000000
--- a/html2pdf-master/src/SvgDrawer.php
+++ /dev/null
@@ -1,287 +0,0 @@
-<?php
-/**
- * Html2Pdf Library
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-namespace Spipu\Html2Pdf;
-
-use Spipu\Html2Pdf\Exception\HtmlParsingException;
-
-/**
- * Class SvgDrawer
- */
-class SvgDrawer
-{
-    /**
-     * @var MyPdf
-     */
-    private $pdf;
-
-    /**
-     * @var array
-     */
-    private $properties;
-    /**
-     * @var CssConverter
-     */
-    private $cssConverter;
-
-    /**
-     * SvgDrawer constructor.
-     *
-     * @param MyPdf $pdf
-     * @param CssConverter $cssConverter
-     */
-    public function __construct(
-        MyPdf $pdf,
-        CssConverter $cssConverter
-    ) {
-
-        $this->pdf = $pdf;
-        $this->cssConverter = $cssConverter;
-    }
-
-    /**
-     * Start Drawing
-     *
-     * @param array $properties
-     * @throws HtmlParsingException
-     */
-    public function startDrawing($properties)
-    {
-        if ($this->isDrawing()) {
-            $e = new HtmlParsingException('We are already in a draw tag');
-            $e->setInvalidTag('draw');
-            throw $e;
-        }
-
-        $this->properties = $properties;
-
-        // init the translate matrix : (0,0) => (x, y)
-        $this->pdf->doTransform(array(1,0,0,1,$this->getProperty('x'),$this->getProperty('y')));
-        $this->pdf->setAlpha(1.);
-    }
-
-    /**
-     * Stop Drawing
-     */
-    public function stopDrawing()
-    {
-        $this->properties = null;
-
-        $this->pdf->setAlpha(1.);
-        $this->pdf->undoTransform();
-        $this->pdf->clippingPathStop();
-    }
-
-    /**
-     * Are we drawing ?
-     *
-     * @return bool
-     */
-    public function isDrawing()
-    {
-        return is_array($this->properties);
-    }
-
-    /**
-     * Get the property
-     *
-     * @param string $key
-     * @return mixed
-     */
-    public function getProperty($key)
-    {
-        return $this->properties[$key];
-    }
-
-
-    /**
-     * prepare a transform matrix
-     *
-     * @param  string $transform
-     * @return array
-     */
-    public function prepareTransform($transform)
-    {
-        // it can not be  empty
-        if (!$transform) {
-            return null;
-        }
-
-        // sections must be like scale(...)
-        if (!preg_match_all('/([a-z]+)\(([^\)]*)\)/isU', $transform, $match)) {
-            return null;
-        }
-
-        // prepare the list of the actions
-        $actions = array();
-
-        // for actions
-        $amountMatches = count($match[0]);
-        for ($k=0; $k < $amountMatches; $k++) {
-            // get the name of the action
-            $name = strtolower($match[1][$k]);
-
-            // get the parameters of the action
-            $values = [];
-            $string = trim($match[2][$k]);
-            if ($string !== '') {
-                $values = explode(',', $string);
-            }
-            foreach ($values as $key => $value) {
-                $value = trim($value);
-                if ($value === '') {
-                    unset($values[$key]);
-                    continue;
-                }
-
-                $values[$key] = $value;
-            }
-
-            // prepare the matrix, depending on the action
-            switch ($name) {
-                case 'scale':
-                    if (!array_key_exists(0, $values)) {
-                        $values[0] = 1.;
-                    }
-
-                    if (!array_key_exists(1, $values)) {
-                        $values[1] = $values[0];
-                    }
-
-                    $values[0] = floatval($values[0]);
-                    $values[1] = floatval($values[1]);
-
-                    $actions[] = array($values[0],0.,0.,$values[1],0.,0.);
-                    break;
-
-                case 'translate':
-                    if (!array_key_exists(0, $values)) {
-                        $values[0] = 0.;
-                    }
-
-                    if (!array_key_exists(1, $values)) {
-                        $values[1] = 0.;
-                    }
-
-                    $values[0] = $this->cssConverter->convertToMM($values[0], $this->getProperty('w'));
-                    $values[1] = $this->cssConverter->convertToMM($values[1], $this->getProperty('h'));
-
-                    $actions[] = array(1.,0.,0.,1.,$values[0],$values[1]);
-                    break;
-
-                case 'rotate':
-                    if (!array_key_exists(0, $values)) {
-                        $values[0] = 0.;
-                    }
-                    if (!array_key_exists(1, $values)) {
-                        $values[1] = 0.;
-                    }
-                    if (!array_key_exists(2, $values)) {
-                        $values[2] = 0.;
-                    }
-
-                    $values[0] = $values[0]*M_PI/180.;
-                    $values[1] = $this->cssConverter->convertToMM($values[1], $this->getProperty('w'));
-                    $values[2] = $this->cssConverter->convertToMM($values[2], $this->getProperty('h'));
-
-                    if ($values[1] || $values[2]) {
-                        $actions[] = array(1.,0.,0.,1.,-$values[1],-$values[2]);
-                    }
-
-                    $actions[] = array(cos($values[0]),sin($values[0]),-sin($values[0]),cos($values[0]),0.,0.);
-
-                    if ($values[1] || $values[2]) {
-                        $actions[] = array(1.,0.,0.,1.,$values[1],$values[2]);
-                    }
-                    break;
-
-                case 'skewx':
-                    if (!array_key_exists(0, $values)) {
-                        $values[0] = 0.;
-                    }
-
-                    $values[0] = $values[0]*M_PI/180.;
-
-                    $actions[] = array(1.,0.,tan($values[0]),1.,0.,0.);
-                    break;
-
-                case 'skewy':
-                    if (!array_key_exists(0, $values)) {
-                        $values[0] = 0.;
-                    }
-
-                    $values[0] = $values[0]*M_PI/180.;
-
-                    $actions[] = array(1.,tan($values[0]),0.,1.,0.,0.);
-                    break;
-
-                case 'matrix':
-                    if (!array_key_exists(0, $values)) {
-                        $values[0] = 0.;
-                    }
-
-                    if (!array_key_exists(1, $values)) {
-                        $values[1] = 0.;
-                    }
-
-                    if (!array_key_exists(2, $values)) {
-                        $values[2] = 0.;
-                    }
-
-                    if (!array_key_exists(3, $values)) {
-                        $values[3] = 0.;
-                    }
-
-                    if (!array_key_exists(4, $values)) {
-                        $values[4] = 0.;
-                    }
-
-                    if (!array_key_exists(5, $values)) {
-                        $values[5] = 0.;
-                    }
-
-                    $values[0] = floatval($values[0]);
-                    $values[1] = floatval($values[1]);
-                    $values[2] = floatval($values[2]);
-                    $values[3] = floatval($values[3]);
-                    $values[4] = $this->cssConverter->convertToMM($values[4], $this->getProperty('w'));
-                    $values[5] = $this->cssConverter->convertToMM($values[5], $this->getProperty('h'));
-
-                    $actions[] = $values;
-                    break;
-            }
-        }
-
-        // if there are no actions => return
-        if (!$actions) {
-            return null;
-        }
-
-        // get the first matrix
-        $m = $actions[0];
-        unset($actions[0]);
-
-        // foreach matrix => multiply to the last matrix
-        foreach ($actions as $n) {
-            $m = array(
-                $m[0]*$n[0]+$m[2]*$n[1],
-                $m[1]*$n[0]+$m[3]*$n[1],
-                $m[0]*$n[2]+$m[2]*$n[3],
-                $m[1]*$n[2]+$m[3]*$n[3],
-                $m[0]*$n[4]+$m[2]*$n[5]+$m[4],
-                $m[1]*$n[4]+$m[3]*$n[5]+$m[5]
-            );
-        }
-
-        // return the matrix
-        return $m;
-    }
-}
diff --git a/html2pdf-master/src/Tag/AbstractHtmlTag.php b/html2pdf-master/src/Tag/AbstractHtmlTag.php
deleted file mode 100644
index 609670ee..00000000
--- a/html2pdf-master/src/Tag/AbstractHtmlTag.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Tag class
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-namespace Spipu\Html2Pdf\Tag;
-
-/**
- * Abstract Default Tag
- * used by all the simple tags like b, u, i, ...
- */
-abstract class AbstractHtmlTag extends AbstractTag
-{
-    /**
-     * Open the HTML tag
-     *
-     * @param array $properties properties of the HTML tag
-     *
-     * @return boolean
-     */
-    public function open($properties)
-    {
-        $this->parsingCss->save();
-        $this->overrideStyles();
-        $this->parsingCss->analyse($this->getName(), $properties);
-        $this->parsingCss->setPosition();
-        $this->parsingCss->fontSet();
-
-        return true;
-    }
-
-    /**
-     * override some styles
-     *
-     * @return $this
-     */
-    protected function overrideStyles()
-    {
-        return $this;
-    }
-
-    /**
-     * Close the HTML tag
-     *
-     * @param array $properties properties of the HTML tag
-     *
-     * @return boolean
-     */
-    public function close($properties)
-    {
-        $this->parsingCss->load();
-        $this->parsingCss->fontSet();
-
-        return true;
-    }
-}
diff --git a/html2pdf-master/src/Tag/AbstractSvgTag.php b/html2pdf-master/src/Tag/AbstractSvgTag.php
deleted file mode 100644
index ca15c58d..00000000
--- a/html2pdf-master/src/Tag/AbstractSvgTag.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Tag class
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-namespace Spipu\Html2Pdf\Tag;
-
-use Spipu\Html2Pdf\Exception\HtmlParsingException;
-use Spipu\Html2Pdf\SvgDrawer;
-
-/**
- * Abstract Default Tag
- * used by all the svg tags
- */
-abstract class AbstractSvgTag extends AbstractTag
-{
-    /**
-     * @var SvgDrawer
-     */
-    protected $svgDrawer;
-
-    /**
-     * AbstractSvgTag constructor.
-     *
-     * @param SvgDrawer $svgDrawer
-     */
-    public function __construct(SvgDrawer $svgDrawer)
-    {
-        parent::__construct();
-
-        $this->svgDrawer = $svgDrawer;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function open($properties)
-    {
-        $this->openSvg($properties);
-        $this->drawSvg($properties);
-        $this->closeSvg();
-        return true;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function close($properties)
-    {
-        return true;
-    }
-
-    /**
-     * Open the SVG tag
-     *
-     * @param array $properties
-     * @throws HtmlParsingException
-     */
-    protected function openSvg($properties)
-    {
-        if (!$this->svgDrawer->isDrawing()) {
-            $e = new HtmlParsingException('The asked ['.$this->getName().'] tag is not in a [DRAW] tag');
-            $e->setInvalidTag($this->getName());
-            throw $e;
-        }
-
-        $transform = null;
-        if (array_key_exists('transform', $properties)) {
-            $transform = $this->svgDrawer->prepareTransform($properties['transform']);
-        }
-
-        $this->pdf->doTransform($transform);
-        $this->parsingCss->save();
-    }
-
-    /**
-     * Close the SVG tag
-     */
-    protected function closeSvg()
-    {
-        $this->pdf->undoTransform();
-
-        $this->parsingCss->load();
-    }
-
-    /**
-     * Draw the SVG tag
-     *
-     * @param array $properties
-     *
-     * @return void
-     */
-    abstract protected function drawSvg($properties);
-}
diff --git a/html2pdf-master/src/Tag/AbstractTag.php b/html2pdf-master/src/Tag/AbstractTag.php
deleted file mode 100644
index 5824f5f9..00000000
--- a/html2pdf-master/src/Tag/AbstractTag.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Tag class
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-
-namespace Spipu\Html2Pdf\Tag;
-
-use Spipu\Html2Pdf\CssConverter;
-use Spipu\Html2Pdf\MyPdf;
-use Spipu\Html2Pdf\Debug\DebugInterface;
-use Spipu\Html2Pdf\Parsing\Css as ParsingCss;
-
-/**
- * Abstract Tag
- * must be used by all the tags
- */
-abstract class AbstractTag implements TagInterface
-{
-    /**
-     * Css Parsing object
-     * @var ParsingCss
-     */
-    protected $parsingCss;
-
-    /**
-     * Css Converter object
-     * @var CssConverter
-     */
-    protected $cssConverter;
-
-    /**
-     * Pdf object
-     * @var MyPdf
-     */
-    protected $pdf;
-
-    /**
-     * Debug object
-     * @var DebugInterface
-     */
-    protected $debug;
-
-    /**
-     * PHP constructor.
-     */
-    public function __construct()
-    {
-
-    }
-
-    /**
-     * Set the Parsing Css Object
-     *
-     * @param ParsingCss $parsingCss The parsing css object
-     *
-     * @return AbstractTag
-     */
-    public function setParsingCssObject(ParsingCss $parsingCss)
-    {
-        $this->parsingCss = $parsingCss;
-
-        return $this;
-    }
-
-    /**
-     * Set the Parsing Css Object
-     *
-     * @param CssConverter $cssConverter The css converter object
-     *
-     * @return AbstractTag
-     */
-    public function setCssConverterObject(CssConverter $cssConverter)
-    {
-        $this->cssConverter = $cssConverter;
-
-        return $this;
-    }
-
-    /**
-     * Set the Pdf Object
-     *
-     * @param MyPdf $pdf The pdf object
-     *
-     * @return TagInterface
-     */
-    public function setPdfObject(MyPdf $pdf)
-    {
-        $this->pdf = $pdf;
-
-        return $this;
-    }
-
-    /**
-     * Set the Debug Object
-     *
-     * @param DebugInterface $debug The Debug object
-     *
-     * @return TagInterface
-     */
-    public function setDebugObject(DebugInterface $debug)
-    {
-        $this->debug = $debug;
-
-        return $this;
-    }
-}
diff --git a/html2pdf-master/src/Tag/Html/Address.php b/html2pdf-master/src/Tag/Html/Address.php
deleted file mode 100644
index dffef6c0..00000000
--- a/html2pdf-master/src/Tag/Html/Address.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Tag class
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-namespace Spipu\Html2Pdf\Tag\Html;
-
-/**
- * Tag Address
- */
-class Address extends I
-{
-    /**
-     * @inheritdoc
-     */
-    public function getName()
-    {
-        return 'address';
-    }
-}
diff --git a/html2pdf-master/src/Tag/Html/B.php b/html2pdf-master/src/Tag/Html/B.php
deleted file mode 100644
index 6cd9649f..00000000
--- a/html2pdf-master/src/Tag/Html/B.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Tag class
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-namespace Spipu\Html2Pdf\Tag\Html;
-
-use Spipu\Html2Pdf\Tag\AbstractHtmlTag;
-
-/**
- * Tag B
- */
-class B extends AbstractHtmlTag
-{
-    /**
-     * @inheritdoc
-     */
-    public function getName()
-    {
-        return 'b';
-    }
-
-    /**
-     * @inheritdoc
-     */
-    protected function overrideStyles()
-    {
-        $this->parsingCss->value['font-bold'] = true;
-
-        return $this;
-    }
-}
diff --git a/html2pdf-master/src/Tag/Html/Big.php b/html2pdf-master/src/Tag/Html/Big.php
deleted file mode 100644
index 5da0479d..00000000
--- a/html2pdf-master/src/Tag/Html/Big.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Tag class
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-namespace Spipu\Html2Pdf\Tag\Html;
-
-use Spipu\Html2Pdf\Tag\AbstractHtmlTag;
-
-/**
- * Tag Big
- */
-class Big extends AbstractHtmlTag
-{
-    /**
-     * @inheritdoc
-     */
-    public function getName()
-    {
-        return 'big';
-    }
-
-    /**
-     * @inheritdoc
-     */
-    protected function overrideStyles()
-    {
-        $this->parsingCss->value['mini-decal']-= $this->parsingCss->value['mini-size']*0.12;
-        $this->parsingCss->value['mini-size'] *= 1.2;
-
-        return $this;
-    }
-}
diff --git a/html2pdf-master/src/Tag/Html/Bookmark.php b/html2pdf-master/src/Tag/Html/Bookmark.php
deleted file mode 100644
index 2130613d..00000000
--- a/html2pdf-master/src/Tag/Html/Bookmark.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Tag class
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-namespace Spipu\Html2Pdf\Tag\Html;
-
-use Spipu\Html2Pdf\Tag\AbstractTag;
-
-/**
- * Tag Bookmark
- */
-class Bookmark extends AbstractTag
-{
-    /**
-     * @inheritdoc
-     */
-    public function getName()
-    {
-        return 'bookmark';
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function open($properties)
-    {
-        $titre = isset($properties['title']) ? trim($properties['title']) : '';
-        $level = isset($properties['level']) ? floor($properties['level']) : 0;
-
-        if ($level < 0) {
-            $level = 0;
-        }
-        if ($titre) {
-            $this->pdf->Bookmark($titre, $level, -1);
-        }
-
-        return true;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function close($properties)
-    {
-        // there is nothing to do here
-
-        return true;
-    }
-}
diff --git a/html2pdf-master/src/Tag/Html/Cite.php b/html2pdf-master/src/Tag/Html/Cite.php
deleted file mode 100644
index 385b78a2..00000000
--- a/html2pdf-master/src/Tag/Html/Cite.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Tag class
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-namespace Spipu\Html2Pdf\Tag\Html;
-
-/**
- * Tag Cite
- */
-class Cite extends I
-{
-    /**
-     * @inheritdoc
-     */
-    public function getName()
-    {
-        return 'cite';
-    }
-}
diff --git a/html2pdf-master/src/Tag/Html/Del.php b/html2pdf-master/src/Tag/Html/Del.php
deleted file mode 100644
index ab9f11ca..00000000
--- a/html2pdf-master/src/Tag/Html/Del.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Tag class
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-namespace Spipu\Html2Pdf\Tag\Html;
-
-/**
- * Tag Del
- */
-class Del extends S
-{
-    /**
-     * @inheritdoc
-     */
-    public function getName()
-    {
-        return 'del';
-    }
-}
diff --git a/html2pdf-master/src/Tag/Html/Em.php b/html2pdf-master/src/Tag/Html/Em.php
deleted file mode 100644
index f3f14e8b..00000000
--- a/html2pdf-master/src/Tag/Html/Em.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Tag class
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-namespace Spipu\Html2Pdf\Tag\Html;
-
-/**
- * Tag Em
- */
-class Em extends I
-{
-    /**
-     * @inheritdoc
-     */
-    public function getName()
-    {
-        return 'em';
-    }
-}
diff --git a/html2pdf-master/src/Tag/Html/Font.php b/html2pdf-master/src/Tag/Html/Font.php
deleted file mode 100644
index c912b7e6..00000000
--- a/html2pdf-master/src/Tag/Html/Font.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Tag class
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-namespace Spipu\Html2Pdf\Tag\Html;
-
-/**
- * Tag Font
- */
-class Font extends Span
-{
-    /**
-     * @inheritdoc
-     */
-    public function getName()
-    {
-        return 'font';
-    }
-}
diff --git a/html2pdf-master/src/Tag/Html/I.php b/html2pdf-master/src/Tag/Html/I.php
deleted file mode 100644
index 4fa88d26..00000000
--- a/html2pdf-master/src/Tag/Html/I.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Tag class
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-namespace Spipu\Html2Pdf\Tag\Html;
-
-use Spipu\Html2Pdf\Tag\AbstractHtmlTag;
-
-/**
- * Tag I
- */
-class I extends AbstractHtmlTag
-{
-    /**
-     * @inheritdoc
-     */
-    public function getName()
-    {
-        return 'i';
-    }
-
-    /**
-     * @inheritdoc
-     */
-    protected function overrideStyles()
-    {
-        $this->parsingCss->value['font-italic'] = true;
-
-        return $this;
-    }
-}
diff --git a/html2pdf-master/src/Tag/Html/Ins.php b/html2pdf-master/src/Tag/Html/Ins.php
deleted file mode 100644
index ea6c47af..00000000
--- a/html2pdf-master/src/Tag/Html/Ins.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Tag class
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-namespace Spipu\Html2Pdf\Tag\Html;
-
-/**
- * Tag Ins
- */
-class Ins extends U
-{
-    /**
-     * @inheritdoc
-     */
-    public function getName()
-    {
-        return 'ins';
-    }
-}
diff --git a/html2pdf-master/src/Tag/Html/Label.php b/html2pdf-master/src/Tag/Html/Label.php
deleted file mode 100644
index d211876e..00000000
--- a/html2pdf-master/src/Tag/Html/Label.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Tag class
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-namespace Spipu\Html2Pdf\Tag\Html;
-
-/**
- * Tag Label
- */
-class Label extends Span
-{
-    /**
-     * @inheritdoc
-     */
-    public function getName()
-    {
-        return 'label';
-    }
-}
diff --git a/html2pdf-master/src/Tag/Html/S.php b/html2pdf-master/src/Tag/Html/S.php
deleted file mode 100644
index aeb81696..00000000
--- a/html2pdf-master/src/Tag/Html/S.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Tag class
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-namespace Spipu\Html2Pdf\Tag\Html;
-
-use Spipu\Html2Pdf\Tag\AbstractHtmlTag;
-
-/**
- * Tag S
- */
-class S extends AbstractHtmlTag
-{
-    /**
-     * @inheritdoc
-     */
-    public function getName()
-    {
-        return 's';
-    }
-
-    /**
-     * @inheritdoc
-     */
-    protected function overrideStyles()
-    {
-        $this->parsingCss->value['font-linethrough'] = true;
-
-        return $this;
-    }
-}
diff --git a/html2pdf-master/src/Tag/Html/Samp.php b/html2pdf-master/src/Tag/Html/Samp.php
deleted file mode 100644
index 07dedd21..00000000
--- a/html2pdf-master/src/Tag/Html/Samp.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Tag class
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-namespace Spipu\Html2Pdf\Tag\Html;
-
-/**
- * Tag Samp
- */
-class Samp extends I
-{
-    /**
-     * @inheritdoc
-     */
-    public function getName()
-    {
-        return 'samp';
-    }
-}
diff --git a/html2pdf-master/src/Tag/Html/Small.php b/html2pdf-master/src/Tag/Html/Small.php
deleted file mode 100644
index b878631b..00000000
--- a/html2pdf-master/src/Tag/Html/Small.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Tag class
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-namespace Spipu\Html2Pdf\Tag\Html;
-
-use Spipu\Html2Pdf\Tag\AbstractHtmlTag;
-
-/**
- * Tag Small
- */
-class Small extends AbstractHtmlTag
-{
-    /**
-     * @inheritdoc
-     */
-    public function getName()
-    {
-        return 'small';
-    }
-
-    /**
-     * @inheritdoc
-     */
-    protected function overrideStyles()
-    {
-        $this->parsingCss->value['mini-decal']+= $this->parsingCss->value['mini-size']*0.05;
-        $this->parsingCss->value['mini-size'] *= 0.82;
-
-        return $this;
-    }
-}
diff --git a/html2pdf-master/src/Tag/Html/Span.php b/html2pdf-master/src/Tag/Html/Span.php
deleted file mode 100644
index 7aa6cb28..00000000
--- a/html2pdf-master/src/Tag/Html/Span.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Tag class
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-namespace Spipu\Html2Pdf\Tag\Html;
-
-use Spipu\Html2Pdf\Tag\AbstractHtmlTag;
-
-/**
- * Tag Span
- */
-class Span extends AbstractHtmlTag
-{
-    /**
-     * @inheritdoc
-     */
-    public function getName()
-    {
-        return 'span';
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function close($properties)
-    {
-        $this->parsingCss->restorePosition();
-
-        return parent::close($properties);
-    }
-}
diff --git a/html2pdf-master/src/Tag/Html/Strong.php b/html2pdf-master/src/Tag/Html/Strong.php
deleted file mode 100644
index e0e875ab..00000000
--- a/html2pdf-master/src/Tag/Html/Strong.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Tag class
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-namespace Spipu\Html2Pdf\Tag\Html;
-
-/**
- * Tag Strong
- */
-class Strong extends B
-{
-    /**
-     * @inheritdoc
-     */
-    public function getName()
-    {
-        return 'strong';
-    }
-}
diff --git a/html2pdf-master/src/Tag/Html/Sub.php b/html2pdf-master/src/Tag/Html/Sub.php
deleted file mode 100644
index 1b7f2ef2..00000000
--- a/html2pdf-master/src/Tag/Html/Sub.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Tag class
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-namespace Spipu\Html2Pdf\Tag\Html;
-
-use Spipu\Html2Pdf\Tag\AbstractHtmlTag;
-
-/**
- * Tag Sub
- */
-class Sub extends AbstractHtmlTag
-{
-    /**
-     * @inheritdoc
-     */
-    public function getName()
-    {
-        return 'sub';
-    }
-
-    /**
-     * @inheritdoc
-     */
-    protected function overrideStyles()
-    {
-        $this->parsingCss->value['mini-decal']+= $this->parsingCss->value['mini-size']*0.15;
-        $this->parsingCss->value['mini-size'] *= 0.75;
-
-        return $this;
-    }
-}
diff --git a/html2pdf-master/src/Tag/Html/Sup.php b/html2pdf-master/src/Tag/Html/Sup.php
deleted file mode 100644
index 7727ef8e..00000000
--- a/html2pdf-master/src/Tag/Html/Sup.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Tag class
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-namespace Spipu\Html2Pdf\Tag\Html;
-
-use Spipu\Html2Pdf\Tag\AbstractHtmlTag;
-
-/**
- * Tag Sup
- */
-class Sup extends AbstractHtmlTag
-{
-    /**
-     * @inheritdoc
-     */
-    public function getName()
-    {
-        return 'sup';
-    }
-
-    /**
-     * @inheritdoc
-     */
-    protected function overrideStyles()
-    {
-        $this->parsingCss->value['mini-decal']-= $this->parsingCss->value['mini-size']*0.15;
-        $this->parsingCss->value['mini-size'] *= 0.75;
-
-        return $this;
-    }
-}
diff --git a/html2pdf-master/src/Tag/Html/U.php b/html2pdf-master/src/Tag/Html/U.php
deleted file mode 100644
index 92477bb8..00000000
--- a/html2pdf-master/src/Tag/Html/U.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Tag class
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-namespace Spipu\Html2Pdf\Tag\Html;
-
-use Spipu\Html2Pdf\Tag\AbstractHtmlTag;
-
-/**
- * Tag U
- */
-class U extends AbstractHtmlTag
-{
-    /**
-     * @inheritdoc
-     */
-    public function getName()
-    {
-        return 'u';
-    }
-
-    /**
-     * @inheritdoc
-     */
-    protected function overrideStyles()
-    {
-        $this->parsingCss->value['font-underline'] = true;
-
-        return $this;
-    }
-}
diff --git a/html2pdf-master/src/Tag/Svg/Circle.php b/html2pdf-master/src/Tag/Svg/Circle.php
deleted file mode 100644
index 474cdcec..00000000
--- a/html2pdf-master/src/Tag/Svg/Circle.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Tag class
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-namespace Spipu\Html2Pdf\Tag\Svg;
-
-use Spipu\Html2Pdf\Tag\AbstractSvgTag;
-
-/**
- * Tag Circle
- */
-class Circle extends AbstractSvgTag
-{
-    /**
-     * @inheritdoc
-     */
-    public function getName()
-    {
-        return 'circle';
-    }
-
-    /**
-     * @inheritdoc
-     */
-    protected function drawSvg($properties)
-    {
-        $styles = $this->parsingCss->getSvgStyle($this->getName(), $properties);
-        $style = $this->pdf->svgSetStyle($styles);
-
-        $cx = 0.;
-        if (isset($properties['cx'])) {
-            $cx = $this->cssConverter->convertToMM($properties['cx'], $this->svgDrawer->getProperty('w'));
-        }
-
-        $cy = 0.;
-        if (isset($properties['cy'])) {
-            $cy = $this->cssConverter->convertToMM($properties['cy'], $this->svgDrawer->getProperty('h'));
-        }
-
-        $r = 0.;
-        if (isset($properties['r'])) {
-            $r = $this->cssConverter->convertToMM($properties['r'], $this->svgDrawer->getProperty('w'));
-        }
-
-        $this->pdf->svgEllipse($cx, $cy, $r, $r, $style);
-    }
-}
diff --git a/html2pdf-master/src/Tag/Svg/Ellipse.php b/html2pdf-master/src/Tag/Svg/Ellipse.php
deleted file mode 100644
index aa44971e..00000000
--- a/html2pdf-master/src/Tag/Svg/Ellipse.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Tag class
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-namespace Spipu\Html2Pdf\Tag\Svg;
-
-use Spipu\Html2Pdf\Tag\AbstractSvgTag;
-
-/**
- * Tag Ellipse
- */
-class Ellipse extends AbstractSvgTag
-{
-    /**
-     * @inheritdoc
-     */
-    public function getName()
-    {
-        return 'ellipse';
-    }
-
-    /**
-     * @inheritdoc
-     */
-    protected function drawSvg($properties)
-    {
-        $styles = $this->parsingCss->getSvgStyle($this->getName(), $properties);
-        $style = $this->pdf->svgSetStyle($styles);
-
-        $cx = 0.;
-        if (isset($properties['cx'])) {
-            $cx = $this->cssConverter->convertToMM($properties['cx'], $this->svgDrawer->getProperty('w'));
-        }
-
-        $cy = 0.;
-        if (isset($properties['cy'])) {
-            $cy = $this->cssConverter->convertToMM($properties['cy'], $this->svgDrawer->getProperty('h'));
-        }
-
-        $rx = 0.;
-        if (isset($properties['rx'])) {
-            $rx = $this->cssConverter->convertToMM($properties['rx'], $this->svgDrawer->getProperty('w'));
-        }
-
-        $ry = 0.;
-        if (isset($properties['ry'])) {
-            $ry = $this->cssConverter->convertToMM($properties['ry'], $this->svgDrawer->getProperty('h'));
-        }
-
-        $this->pdf->svgEllipse($cx, $cy, $rx, $ry, $style);
-    }
-}
diff --git a/html2pdf-master/src/Tag/Svg/G.php b/html2pdf-master/src/Tag/Svg/G.php
deleted file mode 100644
index cbe2173f..00000000
--- a/html2pdf-master/src/Tag/Svg/G.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Tag class
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-namespace Spipu\Html2Pdf\Tag\Svg;
-
-use Spipu\Html2Pdf\Tag\AbstractSvgTag;
-
-/**
- * Tag G
- */
-class G extends AbstractSvgTag
-{
-    /**
-     * @inheritdoc
-     */
-    public function getName()
-    {
-        return 'g';
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function open($properties)
-    {
-        $this->openSvg($properties);
-        $this->drawSvg($properties);
-
-        return true;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function close($properties)
-    {
-        $this->closeSvg();
-
-        return true;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    protected function drawSvg($properties)
-    {
-        $styles = $this->parsingCss->getSvgStyle($this->getName(), $properties);
-        $this->pdf->svgSetStyle($styles);
-    }
-}
diff --git a/html2pdf-master/src/Tag/Svg/Line.php b/html2pdf-master/src/Tag/Svg/Line.php
deleted file mode 100644
index 3fbbeb4a..00000000
--- a/html2pdf-master/src/Tag/Svg/Line.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Tag class
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-namespace Spipu\Html2Pdf\Tag\Svg;
-
-use Spipu\Html2Pdf\Tag\AbstractSvgTag;
-
-/**
- * Tag Line
- */
-class Line extends AbstractSvgTag
-{
-    /**
-     * @inheritdoc
-     */
-    public function getName()
-    {
-        return 'line';
-    }
-
-    /**
-     * @inheritdoc
-     */
-    protected function drawSvg($properties)
-    {
-        $styles = $this->parsingCss->getSvgStyle($this->getName(), $properties);
-        $styles['fill'] = null;
-        $this->pdf->svgSetStyle($styles);
-
-        $x1 = 0.;
-        if (isset($properties['x1'])) {
-            $x1 = $this->cssConverter->convertToMM($properties['x1'], $this->svgDrawer->getProperty('w'));
-        }
-
-        $y1 = 0.;
-        if (isset($properties['y1'])) {
-            $y1 = $this->cssConverter->convertToMM($properties['y1'], $this->svgDrawer->getProperty('h'));
-        }
-
-        $x2 = 0.;
-        if (isset($properties['x2'])) {
-            $x2 = $this->cssConverter->convertToMM($properties['x2'], $this->svgDrawer->getProperty('w'));
-        }
-
-        $y2 = 0.;
-        if (isset($properties['y2'])) {
-            $y2 = $this->cssConverter->convertToMM($properties['y2'], $this->svgDrawer->getProperty('h'));
-        }
-
-        $this->pdf->svgLine($x1, $y1, $x2, $y2);
-    }
-}
diff --git a/html2pdf-master/src/Tag/Svg/Path.php b/html2pdf-master/src/Tag/Svg/Path.php
deleted file mode 100644
index 9593ce91..00000000
--- a/html2pdf-master/src/Tag/Svg/Path.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Tag class
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-namespace Spipu\Html2Pdf\Tag\Svg;
-
-use Spipu\Html2Pdf\Tag\AbstractSvgTag;
-
-/**
- * Tag Path
- */
-class Path extends AbstractSvgTag
-{
-    /**
-     * @inheritdoc
-     */
-    public function getName()
-    {
-        return 'path';
-    }
-
-    /**
-     * @inheritdoc
-     */
-    protected function drawSvg($properties)
-    {
-        $styles = $this->parsingCss->getSvgStyle($this->getName(), $properties);
-        $style = $this->pdf->svgSetStyle($styles);
-
-        $path = isset($properties['d']) ? $properties['d'] : null;
-
-        if ($path) {
-            // prepare the path
-            $path = str_replace(',', ' ', $path);
-            $path = preg_replace('/([a-zA-Z])([0-9\.\-])/', '$1 $2', $path);
-            $path = preg_replace('/([0-9\.])([a-zA-Z])/', '$1 $2', $path);
-            $path = preg_replace('/[\s]+/', ' ', trim($path));
-            $path = preg_replace('/ ([a-z]{2})/', '$1', $path);
-            $path = preg_replace('/Z([a-zA-Z])/', 'Z $1', $path);
-
-            $path = explode(' ', $path);
-            foreach ($path as $k => $v) {
-                $path[$k] = trim($v);
-                if ($path[$k] === '') {
-                    unset($path[$k]);
-                }
-            }
-            $path = array_values($path);
-            $amountPath = count($path);
-
-            // read each actions in the path
-            $actions = array();
-            $lastAction = null; // last action found
-            for ($k=0; $k<$amountPath; true) {
-                // for this actions, we can not have multi coordinate
-                if (in_array($lastAction, array('z', 'Z'))) {
-                    $lastAction = null;
-                }
-
-                // read the new action (forcing if no action before)
-                if (preg_match('/^[a-z]+$/i', $path[$k]) || $lastAction === null) {
-                    $lastAction = $path[$k];
-                    $k++;
-                }
-
-                // current action
-                $action = array();
-                $action[] = $lastAction;
-                switch ($lastAction) {
-                    case 'C':
-                    case 'c':
-                        // x1 y1 x2 y2 x y
-                        $action[] = $this->cssConverter->convertToMM($path[$k+0], $this->svgDrawer->getProperty('w'));
-                        $action[] = $this->cssConverter->convertToMM($path[$k+1], $this->svgDrawer->getProperty('h'));
-                        $action[] = $this->cssConverter->convertToMM($path[$k+2], $this->svgDrawer->getProperty('w'));
-                        $action[] = $this->cssConverter->convertToMM($path[$k+3], $this->svgDrawer->getProperty('h'));
-                        $action[] = $this->cssConverter->convertToMM($path[$k+4], $this->svgDrawer->getProperty('w'));
-                        $action[] = $this->cssConverter->convertToMM($path[$k+5], $this->svgDrawer->getProperty('h'));
-                        $k+= 6;
-                        break;
-
-                    case 'Q':
-                    case 'S':
-                    case 'q':
-                    case 's':
-                        // x2 y2 x y
-                        $action[] = $this->cssConverter->convertToMM($path[$k+0], $this->svgDrawer->getProperty('w'));
-                        $action[] = $this->cssConverter->convertToMM($path[$k+1], $this->svgDrawer->getProperty('h'));
-                        $action[] = $this->cssConverter->convertToMM($path[$k+2], $this->svgDrawer->getProperty('w'));
-                        $action[] = $this->cssConverter->convertToMM($path[$k+3], $this->svgDrawer->getProperty('h'));
-                        $k+= 4;
-                        break;
-
-                    case 'A':
-                    case 'a':
-                        // rx ry (angle de deviation de l'axe X) (large-arc-flag) (sweep-flag) x y
-                        $action[] = $this->cssConverter->convertToMM($path[$k+0], $this->svgDrawer->getProperty('w'));
-                        $action[] = $this->cssConverter->convertToMM($path[$k+1], $this->svgDrawer->getProperty('h'));
-                        $action[] = 1.*$path[$k+2];
-                        $action[] = ($path[$k+3] === '1') ? 1 : 0;
-                        $action[] = ($path[$k+4] === '1') ? 1 : 0;
-                        $action[] = $this->cssConverter->convertToMM($path[$k+5], $this->svgDrawer->getProperty('w'));
-                        $action[] = $this->cssConverter->convertToMM($path[$k+6], $this->svgDrawer->getProperty('h'));
-                        $k+= 7;
-                        break;
-
-                    case 'M':
-                    case 'L':
-                    case 'T':
-                    case 'm':
-                    case 'l':
-                    case 't':
-                        // x y
-                        $action[] = $this->cssConverter->convertToMM($path[$k+0], $this->svgDrawer->getProperty('w'));
-                        $action[] = $this->cssConverter->convertToMM($path[$k+1], $this->svgDrawer->getProperty('h'));
-                        $k+= 2;
-                        break;
-
-                    case 'H':
-                    case 'h':
-                        // x
-                        $action[] = $this->cssConverter->convertToMM($path[$k+0], $this->svgDrawer->getProperty('w'));
-                        $k+= 1;
-                        break;
-
-                    case 'V':
-                    case 'v':
-                        // y
-                        $action[] = $this->cssConverter->convertToMM($path[$k+0], $this->svgDrawer->getProperty('h'));
-                        $k+= 1;
-                        break;
-
-                    case 'z':
-                    case 'Z':
-                        break;
-
-                    default:
-                        $k+= 1;
-                        break;
-                }
-                // add the action
-                $actions[] = $action;
-            }
-
-            // drawing
-            $this->pdf->svgPolygone($actions, $style);
-        }
-    }
-}
diff --git a/html2pdf-master/src/Tag/Svg/Polygon.php b/html2pdf-master/src/Tag/Svg/Polygon.php
deleted file mode 100644
index a78d880b..00000000
--- a/html2pdf-master/src/Tag/Svg/Polygon.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Tag class
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-namespace Spipu\Html2Pdf\Tag\Svg;
-
-use Spipu\Html2Pdf\Tag\AbstractSvgTag;
-
-/**
- * Tag Polygon
- */
-class Polygon extends AbstractSvgTag
-{
-    /**
-     * @inheritdoc
-     */
-    public function getName()
-    {
-        return 'polygon';
-    }
-
-    /**
-     * @inheritdoc
-     */
-    protected function drawSvg($properties)
-    {
-        $styles = $this->parsingCss->getSvgStyle($this->getName(), $properties);
-        $style = $this->pdf->svgSetStyle($styles);
-
-        $path = (isset($properties['points']) ? $properties['points'] : null);
-        if ($path) {
-            $path = str_replace(',', ' ', $path);
-            $path = preg_replace('/[\s]+/', ' ', trim($path));
-
-            // prepare the path
-            $path = explode(' ', $path);
-            foreach ($path as $k => $v) {
-                $path[$k] = trim($v);
-                if ($path[$k] === '') {
-                    unset($path[$k]);
-                }
-            }
-            $path = array_values($path);
-
-            $amountPath = count($path);
-            $actions = array();
-            for ($k=0; $k<$amountPath; $k+=2) {
-                $actions[] = array(
-                    ($k ? 'L' : 'M') ,
-                    $this->cssConverter->convertToMM($path[$k+0], $this->svgDrawer->getProperty('w')),
-                    $this->cssConverter->convertToMM($path[$k+1], $this->svgDrawer->getProperty('h'))
-                );
-            }
-            $actions[] = array('z');
-
-            // drawing
-            $this->pdf->svgPolygone($actions, $style);
-        }
-    }
-}
diff --git a/html2pdf-master/src/Tag/Svg/Polyline.php b/html2pdf-master/src/Tag/Svg/Polyline.php
deleted file mode 100644
index 680d0c67..00000000
--- a/html2pdf-master/src/Tag/Svg/Polyline.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Tag class
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-namespace Spipu\Html2Pdf\Tag\Svg;
-
-use Spipu\Html2Pdf\Tag\AbstractSvgTag;
-
-/**
- * Tag Polyline
- */
-class Polyline extends AbstractSvgTag
-{
-    /**
-     * @inheritdoc
-     */
-    public function getName()
-    {
-        return 'polyline';
-    }
-
-    /**
-     * @inheritdoc
-     */
-    protected function drawSvg($properties)
-    {
-        $styles = $this->parsingCss->getSvgStyle($this->getName(), $properties);
-        $style = $this->pdf->svgSetStyle($styles);
-
-        $path = isset($properties['points']) ? $properties['points'] : null;
-        if ($path) {
-            $path = str_replace(',', ' ', $path);
-            $path = preg_replace('/[\s]+/', ' ', trim($path));
-
-            // prepare the path
-            $path = explode(' ', $path);
-            foreach ($path as $k => $v) {
-                $path[$k] = trim($v);
-                if ($path[$k] === '') {
-                    unset($path[$k]);
-                }
-            }
-            $path = array_values($path);
-
-            $amountPath = count($path);
-
-            $actions = array();
-            for ($k=0; $k<$amountPath; $k+=2) {
-                $actions[] = array(
-                    ($k ? 'L' : 'M') ,
-                    $this->cssConverter->convertToMM($path[$k+0], $this->svgDrawer->getProperty('w')),
-                    $this->cssConverter->convertToMM($path[$k+1], $this->svgDrawer->getProperty('h'))
-                );
-            }
-
-            // drawing
-            $this->pdf->svgPolygone($actions, $style);
-        }
-    }
-}
diff --git a/html2pdf-master/src/Tag/Svg/Rect.php b/html2pdf-master/src/Tag/Svg/Rect.php
deleted file mode 100644
index e64aa24f..00000000
--- a/html2pdf-master/src/Tag/Svg/Rect.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Tag class
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-namespace Spipu\Html2Pdf\Tag\Svg;
-
-use Spipu\Html2Pdf\Tag\AbstractSvgTag;
-
-/**
- * Tag Rect
- */
-class Rect extends AbstractSvgTag
-{
-    /**
-     * @inheritdoc
-     */
-    public function getName()
-    {
-        return 'rect';
-    }
-
-    /**
-     * @inheritdoc
-     */
-    protected function drawSvg($properties)
-    {
-        $styles = $this->parsingCss->getSvgStyle($this->getName(), $properties);
-        $style = $this->pdf->svgSetStyle($styles);
-
-        $x = 0.;
-        if (isset($properties['x'])) {
-            $x = $this->cssConverter->convertToMM($properties['x'], $this->svgDrawer->getProperty('w'));
-        }
-
-        $y = 0.;
-        if (isset($properties['y'])) {
-            $y = $this->cssConverter->convertToMM($properties['y'], $this->svgDrawer->getProperty('h'));
-        }
-
-        $w = 0.;
-        if (isset($properties['w'])) {
-            $w = $this->cssConverter->convertToMM($properties['w'], $this->svgDrawer->getProperty('w'));
-        }
-
-        $h = 0.;
-        if (isset($properties['h'])) {
-            $h = $this->cssConverter->convertToMM($properties['h'], $this->svgDrawer->getProperty('h'));
-        }
-
-        $this->pdf->svgRect($x, $y, $w, $h, $style);
-    }
-}
diff --git a/html2pdf-master/src/Tag/TagInterface.php b/html2pdf-master/src/Tag/TagInterface.php
deleted file mode 100644
index 43d18bc9..00000000
--- a/html2pdf-master/src/Tag/TagInterface.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - TagInterface interface
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-
-namespace Spipu\Html2Pdf\Tag;
-
-use Spipu\Html2Pdf\CssConverter;
-use Spipu\Html2Pdf\MyPdf;
-use Spipu\Html2Pdf\Debug\DebugInterface;
-use Spipu\Html2Pdf\Parsing\Css as ParsingCss;
-
-interface TagInterface
-{
-    /**
-     * Set the Parsing Css Object
-     *
-     * @param ParsingCss $parsingCss The parsing css object
-     *
-     * @return TagInterface
-     */
-    public function setParsingCssObject(ParsingCss $parsingCss);
-
-    /**
-     * Set the Parsing Css Object
-     *
-     * @param CssConverter $cssConverter The css converter object
-     *
-     * @return TagInterface
-     */
-    public function setCssConverterObject(CssConverter $cssConverter);
-
-    /**
-     * Set the Pdf Object
-     *
-     * @param MyPdf $pdf The pdf object
-     *
-     * @return TagInterface
-     */
-    public function setPdfObject(MyPdf $pdf);
-
-    /**
-     * Set the Debug Object
-     *
-     * @param DebugInterface $debug The Debug object
-     *
-     * @return TagInterface
-     */
-    public function setDebugObject(DebugInterface $debug);
-
-    /**
-     * get the name of the tag
-     *
-     * @return string
-     */
-    public function getName();
-
-    /**
-     * Open the HTML tag
-     *
-     * @param array $properties properties of the HTML tag
-     *
-     * @return boolean
-     */
-    public function open($properties);
-
-    /**
-     * Close the HTML tag
-     *
-     * @param array $properties properties of the HTML tag
-     *
-     * @return boolean
-     */
-    public function close($properties);
-}
diff --git a/html2pdf-master/src/Tests/AbstractTest.php b/html2pdf-master/src/Tests/AbstractTest.php
deleted file mode 100644
index 28f071b0..00000000
--- a/html2pdf-master/src/Tests/AbstractTest.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-namespace Spipu\Html2Pdf\Tests;
-
-use Spipu\Html2Pdf\Html2Pdf;
-
-/**
- * Class Html2PdfTest
- */
-abstract class AbstractTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @var Html2Pdf
-     */
-    private $html2pdf;
-
-    /**
-     * Executed before each test
-     */
-    protected function setUp()
-    {
-        $this->html2pdf = new Html2Pdf('P', 'A4', 'fr', true, 'UTF-8', [0, 0, 0, 0]);
-        $this->html2pdf->pdf->SetTitle('PhpUnit Test');
-    }
-
-    /**
-     * Executed after each test
-     */
-    protected function tearDown()
-    {
-        $this->html2pdf->clean();
-        $this->html2pdf = null;
-    }
-
-    /**
-     * Get the object to test
-     *
-     * @return Html2Pdf
-     */
-    protected function getObject()
-    {
-        return $this->html2pdf;
-    }
-}
diff --git a/html2pdf-master/src/Tests/CssConverterTest.php b/html2pdf-master/src/Tests/CssConverterTest.php
deleted file mode 100644
index 2b39e158..00000000
--- a/html2pdf-master/src/Tests/CssConverterTest.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-
-namespace Spipu\Html2Pdf\Tests;
-
-use Spipu\Html2Pdf\CssConverter;
-
-/**
- * Class CssConverterTest
- */
-class CssConverterTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @var CssConverter
-     */
-    private $cssConverter;
-
-    public function setUp()
-    {
-        $this->cssConverter = new CssConverter();
-    }
-
-    /**
-     * @param string $css
-     * @param string $old
-     * @param array  $expected
-     *
-     * @dataProvider convertToMMProvider
-     */
-    public function testConvertToMM($css, $old, $expected)
-    {
-        $result = $this->cssConverter->convertToMM($css, $old);
-
-        $this->assertEquals($expected, $result);
-    }
-
-    public function convertToMMProvider()
-    {
-        return array(
-            array('100mm', null, 100),
-            array('100px', null, 25.4 / 96. * 100),
-            array('100',   null, 25.4 / 96. * 100),
-            array('100pt', null, 25.4 / 72. * 100),
-            array('100in', null, 25.4 * 100),
-            array('10%',    100, 10),
-            array('100cm', null, null),
-        );
-    }
-
-    /**
-     * @param string $css
-     * @param array  $expected
-     *
-     * @dataProvider convertToRadiusProvider
-     */
-    public function testConvertToRadius($css, $expected)
-    {
-        $result = $this->cssConverter->convertToRadius($css);
-
-        $this->assertEquals(count($expected), count($result));
-
-        for ($i = 0; $i < count($result); $i++) {
-            $this->assertEquals($expected[$i], $result[$i]);
-        }
-    }
-
-    public function convertToRadiusProvider()
-    {
-        return array(
-            array('100mm',           array(100)),
-            array('100mm 10mm',      array(100, 10)),
-            array('100mm  10mm ',    array(100, 10)),
-            array('100mm 10cm 10mm', array(100, 10)),
-            array('1mm 2mm 3mm 4mm', array(1, 2, 3, 4)),
-        );
-    }
-
-    /**
-     * @param string  $css
-     * @param boolean $expectedRes
-     * @param array   $expectedColor
-     *
-     * @dataProvider convertToColorProvider
-     */
-    public function testConvertToColor($css, $expectedRes, $expectedColor)
-    {
-        $res = true;
-        $resultColor = $this->cssConverter->convertToColor($css, $res);
-
-        $this->assertEquals($expectedRes, $res);
-        $this->assertEquals(count($expectedColor), count($resultColor));
-
-        for ($i = 0; $i < count($resultColor); $i++) {
-            if (is_null($expectedColor[$i])) {
-                $this->assertNull($resultColor[$i]);
-            } else {
-                $this->assertEquals($expectedColor[$i], $resultColor[$i]);
-            }
-        }
-    }
-
-    public function convertToColorProvider()
-    {
-        return array(
-            array('transparent',              true,  array(null, null, null)),
-            array('aliceblue',                true,  array( 240,  248,  255)),
-            array('#F0A050',                  true,  array( 240,  160,   80)),
-            array('#FA5',                     true,  array( 255,  170,   85)),
-            array('rgb(  50, 100, 150)',      true,  array(  50,  100,  150)),
-            array('rgb( 10%, 20%, 30%)',      true,  array(25.5,   51, 76.5)),
-            array('rgb( 0.2, 0.4, 0.6)',      true,  array(  51,  102,  153)),
-            array('cmyk(255, 255, 255, 255)', true,  array( 100,  100,  100, 100)),
-            array('cmyk(10%, 20%, 30%, 40%)', true,  array(  10,   20,   30,  40)),
-            array('cmyk(0.2, 0.4, 0.6, 0.8)', true,  array(  20,   40,   60,  80)),
-            array('blakc',                    false, array(   0,    0,    0)),
-        );
-    }
-}
diff --git a/html2pdf-master/src/Tests/Debug/DebugTest.php b/html2pdf-master/src/Tests/Debug/DebugTest.php
deleted file mode 100644
index c2885e37..00000000
--- a/html2pdf-master/src/Tests/Debug/DebugTest.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Tests
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-
-namespace Spipu\Html2Pdf\Tests\Debug;
-
-use Spipu\Html2Pdf\Debug\Debug;
-use Spipu\Html2Pdf\Tests\AbstractTest;
-
-/**
- * Class DebugTest
- */
-class DebugTest extends AbstractTest
-{
-    /**
-     * test Debug Mode, Automatic
-     *
-     * @return void
-     */
-    public function testAutomatic()
-    {
-        $html = '<p>First Tag</p>';
-        $html.= '<div>Second Tag</div>';
-        $html.= '<b>Third Tag</b>';
-
-        ob_start();
-        $object = $this->getObject();
-        $object->setModeDebug();
-        $object->writeHTML($html);
-        $pdfResult = $object->output('test.pdf', 'S');
-        $debugResult = ob_get_clean();
-
-        $this->assertSame('', $pdfResult);
-        $this->assertNotEmpty($debugResult);
-    }
-
-    /**
-     * test Debug Mode, manual
-     *
-     * @return void
-     */
-    public function testManual()
-    {
-        $html = '<p>First Tag</p>';
-        $html.= '<div>Second Tag</div>';
-        $html.= '<b>Third Tag</b>';
-
-        // Prepare debug object, without html output
-        $debug = new Debug(false);
-
-        ob_start();
-        $object = $this->getObject();
-        $object->setModeDebug($debug);
-        $object->writeHTML($html);
-        $pdfResult = $object->output('test.pdf', 'S');
-        $debugResult = ob_get_clean();
-
-        $this->assertSame('', $pdfResult);
-        $this->assertNotEmpty($debugResult);
-    }
-
-}
diff --git a/html2pdf-master/src/Tests/ExamplesTest.php b/html2pdf-master/src/Tests/ExamplesTest.php
deleted file mode 100644
index 1154f789..00000000
--- a/html2pdf-master/src/Tests/ExamplesTest.php
+++ /dev/null
@@ -1,334 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Tests
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-
-namespace Spipu\Html2Pdf\Tests;
-
-/**
- * Class ExamplesTest
- */
-class ExamplesTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * Launch a example
-     *
-     * @param string $example code of the example
-     *
-     * @return void
-     * @throws \Exception
-     */
-    protected function launchExample($example)
-    {
-        $filename = dirname(dirname(dirname(__FILE__))).'/examples/'.$example.'.php';
-        if (!is_file($filename)) {
-            throw new \Exception('The filename of the example ['.$example.'] does not exist!');
-        }
-        $folder = dirname($filename);
-
-        // get the content of the file
-        $content = file_get_contents($filename);
-
-        // keep only the example
-        $parts = explode('try {', $content);
-        $parts = explode('} catch', $parts[1]);
-        $content = $parts[0];
-
-        // replace the good path
-        $content = str_replace('dirname(__FILE__)', "'$folder'", $content);
-
-        // add the class to use
-        $content = 'use Spipu\Html2Pdf\Html2Pdf; '.$content;
-
-        // get the output
-        $regexp = '/\$html2pdf->output\(([^\)]*)\);/';
-        $replace = 'return $html2pdf->output(\'test.pdf\', \'S\');';
-        $content = preg_replace($regexp, $replace, $content);
-
-        // execute
-        $currentDir = getcwd();
-        chdir($folder);
-        $result = eval($content);
-        chdir($currentDir);
-
-        // test
-        $this->assertNotEmpty($result);
-    }
-
-    /**
-     * test: about
-     *
-     * @return void
-     */
-    public function testAbout()
-    {
-        $this->launchExample('about');
-    }
-
-    /**
-     * test: bookmark
-     *
-     * @return void
-     */
-    public function testBookmark()
-    {
-        $this->launchExample('bookmark');
-    }
-
-    /**
-     * test: bookmark
-     *
-     * @return void
-     */
-    public function testBalloon()
-    {
-        $this->launchExample('balloon');
-    }
-
-    /**
-     * test: example01
-     *
-     * @return void
-     */
-    public function testExample01()
-    {
-        $this->launchExample('example01');
-    }
-
-    /**
-     * test: example02
-     *
-     * @return void
-     */
-    public function testExample02()
-    {
-        $this->launchExample('example02');
-    }
-
-    /**
-     * test: example03
-     *
-     * @return void
-     */
-    public function testExample03()
-    {
-        $this->launchExample('example03');
-    }
-
-    /**
-     * test: example04
-     *
-     * @return void
-     */
-    public function testExample04()
-    {
-        $this->launchExample('example04');
-    }
-
-    /**
-     * test: example05
-     *
-     * @return void
-     */
-    public function testExample05()
-    {
-        $this->launchExample('example05');
-    }
-
-    /**
-     * test: example06
-     *
-     * @return void
-     */
-    public function testExample06()
-    {
-        $this->launchExample('example06');
-    }
-
-    /**
-     * test: example07
-     *
-     * @return void
-     */
-    public function testExample07()
-    {
-        $this->launchExample('example07');
-    }
-
-    /**
-     * test: example08
-     *
-     * @return void
-     */
-    public function testExample08()
-    {
-        $this->launchExample('example08');
-    }
-
-    /**
-     * test: example10
-     *
-     * @return void
-     */
-    public function testExample10()
-    {
-        $this->launchExample('example10');
-    }
-
-    /**
-     * test: example11
-     *
-     * @return void
-     */
-    public function testExample11()
-    {
-        $this->launchExample('example11');
-    }
-
-    /**
-     * test: example12
-     *
-     * @return void
-     */
-    public function testExample12()
-    {
-        $this->launchExample('example12');
-    }
-
-    /**
-     * test: example13
-     *
-     * @return void
-     */
-    public function testExample13()
-    {
-        $this->launchExample('example13');
-    }
-
-    /**
-     * test: example14
-     *
-     * @return void
-     */
-    public function testExample14()
-    {
-        $this->launchExample('example14');
-    }
-
-    /**
-     * test: example15
-     *
-     * @return void
-     */
-    public function testExample15()
-    {
-        $this->launchExample('example15');
-    }
-
-    /**
-     * test: forms
-     *
-     * @return void
-     */
-    public function testForms()
-    {
-        $this->launchExample('forms');
-    }
-
-    /**
-     * test: groups
-     *
-     * @return void
-     */
-    public function testGroups()
-    {
-        $this->launchExample('groups');
-    }
-
-    /**
-     * test: qrcode
-     *
-     * @return void
-     */
-    public function testQrcode()
-    {
-        $this->launchExample('qrcode');
-    }
-
-    /**
-     * test: radius
-     *
-     * @return void
-     */
-    public function testRadius()
-    {
-        $this->launchExample('radius');
-    }
-
-    /**
-     * test: regle
-     *
-     * @return void
-     */
-    public function testMeasure()
-    {
-        $this->launchExample('measure');
-    }
-
-    /**
-     * test: svg
-     *
-     * @return void
-     */
-    public function testSvg()
-    {
-        $this->launchExample('svg');
-    }
-
-    /**
-     * test: svg_tiger
-     *
-     * @return void
-     */
-    public function testSvgTiger()
-    {
-        $this->launchExample('svg_tiger');
-    }
-
-    /**
-     * test: svg_tree
-     *
-     * @return void
-     */
-    public function testSvgTree()
-    {
-        $this->launchExample('svg_tree');
-    }
-
-    /**
-     * test: ticket
-     *
-     * @return void
-     */
-    public function testTicket()
-    {
-        $this->launchExample('ticket');
-    }
-
-    /**
-     * test: utf8
-     *
-     * @return void
-     */
-    public function testUtf8()
-    {
-        $this->launchExample('utf8');
-    }
-}
diff --git a/html2pdf-master/src/Tests/Exception/ExceptionFormatterTest.php b/html2pdf-master/src/Tests/Exception/ExceptionFormatterTest.php
deleted file mode 100644
index 5a4ce27b..00000000
--- a/html2pdf-master/src/Tests/Exception/ExceptionFormatterTest.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Tests
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-
-namespace Spipu\Html2Pdf\Tests\Exception;
-
-use Spipu\Html2Pdf\Exception\ExceptionFormatter;
-use Spipu\Html2Pdf\Exception\Html2PdfException;
-use Spipu\Html2Pdf\Exception\HtmlParsingException;
-use Spipu\Html2Pdf\Exception\ImageException;
-use Spipu\Html2Pdf\Exception\LongSentenceException;
-
-/**
- * Class ExceptionFormaterTest
- */
-class ExceptionFormatterTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * Test the formatter / generic exception
-     */
-    public function testGeneric()
-    {
-        $exception = new Html2PdfException('My Message');
-        $formatter = new ExceptionFormatter($exception);
-
-        $messages = [
-            $formatter->getMessage(),
-            $formatter->getHtmlMessage()
-        ];
-
-        foreach ($messages as $message) {
-            $this->assertContains('Html2Pdf Error ['.Html2PdfException::ERROR_CODE.']', $message);
-            $this->assertContains('My Message', $message);
-        }
-    }
-
-    /**
-     * Test the formatter / parsing exception
-     */
-    public function testParsing()
-    {
-        $exception = new HtmlParsingException('My Message');
-        $exception->setInvalidTag('my_tag');
-        $exception->setHtmlLine(42);
-
-        $formatter = new ExceptionFormatter($exception);
-
-        $messages = [
-            $formatter->getMessage(),
-            $formatter->getHtmlMessage()
-        ];
-
-        foreach ($messages as $message) {
-            $this->assertContains('Html2Pdf Error ['.HtmlParsingException::ERROR_CODE.']', $message);
-            $this->assertContains('My Message', $message);
-            $this->assertContains('my_tag', $message);
-            $this->assertContains('42', $message);
-        }
-    }
-
-    /**
-     * Test the formatter / image exception
-     */
-    public function testImage()
-    {
-        $exception = new ImageException('My Message');
-        $exception->setImage('my_image.png');
-
-        $formatter = new ExceptionFormatter($exception);
-
-        $messages = [
-            $formatter->getMessage(),
-            $formatter->getHtmlMessage()
-        ];
-
-        foreach ($messages as $message) {
-            $this->assertContains('Html2Pdf Error ['.ImageException::ERROR_CODE.']', $message);
-            $this->assertContains('My Message', $message);
-            $this->assertContains('my_image.png', $message);
-        }
-    }
-
-    /**
-     * Test the formatter / long sentence exception
-     */
-    public function testLongSentence()
-    {
-        $exception = new LongSentenceException('My Message');
-        $exception->setSentence('my sentence');
-        $exception->setLength(142);
-        $exception->setWidthBox(242);
-
-        $formatter = new ExceptionFormatter($exception);
-
-        $messages = [
-            $formatter->getMessage(),
-            $formatter->getHtmlMessage()
-        ];
-
-        foreach ($messages as $message) {
-            $this->assertContains('Html2Pdf Error ['.LongSentenceException::ERROR_CODE.']', $message);
-            $this->assertContains('My Message', $message);
-            $this->assertContains('my sentence', $message);
-            $this->assertContains('142', $message);
-            $this->assertContains('242', $message);
-        }
-    }
-}
diff --git a/html2pdf-master/src/Tests/Exception/LongSentenceExceptionTest.php b/html2pdf-master/src/Tests/Exception/LongSentenceExceptionTest.php
deleted file mode 100644
index 00709ee2..00000000
--- a/html2pdf-master/src/Tests/Exception/LongSentenceExceptionTest.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Tests
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-
-namespace Spipu\Html2Pdf\Tests\Exception;
-
-use Spipu\Html2Pdf\Tests\AbstractTest;
-
-/**
- * Class DebugTest
- */
-class LongSentenceExceptionTest extends AbstractTest
-{
-    /**
-     * test LongSentence Exception
-     *
-     * @return void
-     * @expectedException \Spipu\Html2Pdf\Exception\LongSentenceException
-     */
-    public function testBug()
-    {
-        $sentence = 'This is a sentence.';
-        $bigSentence = $sentence;
-        for ($k=0; $k<110; $k++) {
-            $bigSentence.= ' '.$sentence;
-        }
-        $html = '<page backleft="0" backright="200mm"style="font-size: 1mm">'.$bigSentence.'</page>';
-
-        $object = $this->getObject();
-        $object->setSentenceMaxLines(100);
-        $object->writeHTML($html);
-        $object->output('test.pdf', 'S');
-    }
-}
diff --git a/html2pdf-master/src/Tests/Html2PdfTest.php b/html2pdf-master/src/Tests/Html2PdfTest.php
deleted file mode 100644
index e0b68c60..00000000
--- a/html2pdf-master/src/Tests/Html2PdfTest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace Spipu\Html2Pdf\Tests;
-
-use Phake;
-use Spipu\Html2Pdf\Html2Pdf;
-
-/**
- * Class Html2PdfTest
- */
-class Html2PdfTest extends AbstractTest
-{
-    public function testExtensionTag()
-    {
-        $tag = Phake::mock('Spipu\Html2Pdf\Tag\TagInterface');
-        Phake::when($tag)->getName()->thenReturn('test_tag');
-
-        $extension = Phake::mock('Spipu\Html2Pdf\Extension\ExtensionInterface');
-        Phake::when($extension)->getName()->thenReturn('test');
-        Phake::when($extension)->getTags()->thenReturn(array($tag));
-
-        $object = $this->getObject();
-
-        $object->addExtension($extension);
-        $object->writeHTML('<div><test_tag>Hello</test_tag></div>');
-
-        Phake::verify($tag, Phake::times(4))->open;
-        Phake::verify($tag, Phake::times(2))->close;
-    }
-}
diff --git a/html2pdf-master/src/Tests/Image/BackgroundErrorTest.php b/html2pdf-master/src/Tests/Image/BackgroundErrorTest.php
deleted file mode 100644
index f329019f..00000000
--- a/html2pdf-master/src/Tests/Image/BackgroundErrorTest.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Tests
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-
-namespace Spipu\Html2Pdf\Tests\Image;
-
-use Spipu\Html2Pdf\Exception\ImageException;
-use Spipu\Html2Pdf\Tests\AbstractTest;
-
-/**
- * Class BackgroundErrorTest
- */
-class BackgroundErrorTest extends AbstractTest
-{
-    /**
-     * test: The image src is unknown
-     *
-     * @return void
-     * @expectedException \Spipu\Html2Pdf\Exception\ImageException
-     */
-    public function testCase()
-    {
-        $image = '/res/wrong.png';
-
-        try {
-            $object = $this->getObject();
-            $object->writeHTML('<div style="background-image: url('.$image.')">Hello World</div>');
-            $object->output('test.pdf', 'S');
-        } catch (ImageException $e) {
-            $this->assertSame($image, $e->getImage());
-            throw $e;
-        }
-    }
-}
diff --git a/html2pdf-master/src/Tests/Image/BackgroundOkTest.php b/html2pdf-master/src/Tests/Image/BackgroundOkTest.php
deleted file mode 100644
index 700b73f7..00000000
--- a/html2pdf-master/src/Tests/Image/BackgroundOkTest.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Tests
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-
-namespace Spipu\Html2Pdf\Tests\Image;
-
-use Spipu\Html2Pdf\Tests\AbstractTest;
-
-/**
- * Class BackgroundOkTest
- */
-class BackgroundOkTest extends AbstractTest
-{
-    /**
-     * test: The image src is unknown
-     *
-     * @return void
-     */
-    public function testCase()
-    {
-        $object = $this->getObject();
-        $object->writeHTML('<div style="background-image: url('.dirname(__FILE__).'/res/logo.png)">Hello World</div>');
-        $result = $object->output('test.pdf', 'S');
-
-        $this->assertContains('PhpUnit Test', $result);
-    }
-}
diff --git a/html2pdf-master/src/Tests/Image/SrcErrorTest.php b/html2pdf-master/src/Tests/Image/SrcErrorTest.php
deleted file mode 100644
index 036fa2bf..00000000
--- a/html2pdf-master/src/Tests/Image/SrcErrorTest.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Tests
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-
-namespace Spipu\Html2Pdf\Tests\Image;
-
-use Spipu\Html2Pdf\Html2Pdf;
-use Spipu\Html2Pdf\Exception\ImageException;
-use Spipu\Html2Pdf\Tests\AbstractTest;
-
-/**
- * Class SrcErrorTest
- */
-class SrcErrorTest extends AbstractTest
-{
-    /**
-     * test: The image src is unknown
-     *
-     * @return void
-     * @expectedException \Spipu\Html2Pdf\Exception\ImageException
-     */
-    public function testCase()
-    {
-        $image = '/res/wrong.png';
-
-        try {
-            $object = $this->getObject();
-            $object->writeHTML('Hello World <img src="'.$image.'" />');
-            $object->output('test.pdf', 'S');
-        } catch (ImageException $e) {
-            $this->assertSame($image, $e->getImage());
-            throw $e;
-        }
-    }
-}
diff --git a/html2pdf-master/src/Tests/Image/SrcOkTest.php b/html2pdf-master/src/Tests/Image/SrcOkTest.php
deleted file mode 100644
index f3d9f3e7..00000000
--- a/html2pdf-master/src/Tests/Image/SrcOkTest.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Tests
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-
-namespace Spipu\Html2Pdf\Tests\Image;
-
-use Spipu\Html2Pdf\Tests\AbstractTest;
-
-/**
- * Class SrcOkTest
- */
-class SrcOkTest extends AbstractTest
-{
-    /**
-     * test: The image src is unknown
-     *
-     * @return void
-     */
-    public function testCase()
-    {
-        $object = $this->getObject();
-        $object->writeHTML('Hello World <img src="'.dirname(__FILE__).'/res/logo.png" />');
-        $result = $object->output('test.pdf', 'S');
-
-        $this->assertContains('PhpUnit Test', $result);
-    }
-}
diff --git a/html2pdf-master/src/Tests/Image/res/logo.png b/html2pdf-master/src/Tests/Image/res/logo.png
deleted file mode 100644
index bdd7594d..00000000
Binary files a/html2pdf-master/src/Tests/Image/res/logo.png and /dev/null differ
diff --git a/html2pdf-master/src/Tests/LocaleTest.php b/html2pdf-master/src/Tests/LocaleTest.php
deleted file mode 100644
index 800593de..00000000
--- a/html2pdf-master/src/Tests/LocaleTest.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Tests
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-
-namespace Spipu\Html2Pdf\Tests;
-
-use Spipu\Html2Pdf\Locale;
-use Spipu\Html2Pdf\Exception\LocaleException;
-
-/**
- * Class LocaleTest
- */
-class LocaleTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * test bad code
-     *
-     * @return void
-     * @expectedException \Spipu\Html2Pdf\Exception\LocaleException
-     */
-    public function testBadCode()
-    {
-        Locale::clean();
-
-        try {
-            Locale::load('$aa');
-        } catch (LocaleException $e) {
-            $this->assertSame('$aa', $e->getLocalCode());
-            throw $e;
-        }
-    }
-
-    /**
-     * test unknown code
-     *
-     * @return void
-     * @expectedException \Spipu\Html2Pdf\Exception\LocaleException
-     */
-    public function testUnknownCode()
-    {
-        Locale::clean();
-        try {
-            Locale::load('aa');
-        } catch (LocaleException $e) {
-            $this->assertSame('aa', $e->getLocalCode());
-            throw $e;
-        }
-    }
-
-    /**
-     * test good code
-     *
-     * @return void
-     */
-    public function testGoodCode()
-    {
-        Locale::clean();
-        Locale::load('en');
-
-        $this->assertSame('Page [[page_cu]]/[[page_nb]]', Locale::get('pdf04'));
-        $this->assertSame('bad_return', Locale::get('bad_code', 'bad_return'));
-        Locale::clean();
-        $this->assertSame('bad_return', Locale::get('pdf04', 'bad_return'));
-    }
-}
diff --git a/html2pdf-master/src/Tests/Output/FileNameOkTest.php b/html2pdf-master/src/Tests/Output/FileNameOkTest.php
deleted file mode 100644
index bb04fe2a..00000000
--- a/html2pdf-master/src/Tests/Output/FileNameOkTest.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Tests
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-
-namespace Spipu\Html2Pdf\Tests\Output;
-
-use Spipu\Html2Pdf\Html2Pdf;
-use Spipu\Html2Pdf\Tests\AbstractTest;
-
-/**
- * Class FileNameOkTest
- */
-class FileNameOkTest extends AbstractTest
-{
-    /**
-     * test: the file extension must be PDF - OK
-     *
-     * @return void
-     */
-    public function testOk()
-    {
-        $object = $this->getObject();
-        $object->writeHTML('Hello World');
-
-        ob_start();
-        $object->output('test.pdf');
-        $result = ob_get_clean();
-
-        $this->assertContains('PhpUnit Test', $result);
-    }
-
-    /**
-     * test: the file extension is ignored if output string
-     *
-     * @return void
-     */
-    public function testIgnore()
-    {
-        $object = $this->getObject();
-        $object->writeHTML('Hello World');
-        $result = $object->output('test.bad', 'S');
-
-        $this->assertContains('PhpUnit Test', $result);
-    }
-
-    /**
-     * test: the file extension must be PDF - Error
-     *
-     * @return void
-     * @expectedException \Spipu\Html2Pdf\Exception\Html2PdfException
-     */
-    public function testError()
-    {
-        $object = $this->getObject();
-        $object->writeHTML('<p>Hello World</p>');
-        $object->output('test.bad');
-    }
-}
diff --git a/html2pdf-master/src/Tests/Parsing/HtmlLexerTest.php b/html2pdf-master/src/Tests/Parsing/HtmlLexerTest.php
deleted file mode 100644
index 01e963ca..00000000
--- a/html2pdf-master/src/Tests/Parsing/HtmlLexerTest.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Tests
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-
-namespace Spipu\Html2Pdf\Tests\Parsing;
-
-use Spipu\Html2Pdf\Parsing\HtmlLexer;
-
-/**
- * Class HtmlLexerTest
- */
-class HtmlLexerTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * Test: tokenize
-     *
-     * @param string $html           html to test
-     * @param array  $expectedTokens expected token
-     *
-     * @dataProvider tokenizeProvider
-     */
-    public function testTokenize($html, $expectedTokens)
-    {
-        $lexer = new HtmlLexer();
-        $tokens = $lexer->tokenize($html);
-
-        $this->assertEquals(count($expectedTokens), count($tokens));
-
-        for ($i = 0; $i < count($tokens); $i++) {
-            $this->assertEquals($expectedTokens[$i][0], $tokens[$i]->getType());
-            $this->assertEquals($expectedTokens[$i][1], $tokens[$i]->getData());
-            $this->assertEquals($expectedTokens[$i][2], $tokens[$i]->getLine());
-        }
-    }
-
-    /**
-     * provider: tokenize
-     *
-     * @return array
-     */
-    public function tokenizeProvider()
-    {
-        return array(
-            array(
-                '<p>test</p>',
-                array(
-                    array('code', '<p>', 1),
-                    array('txt', 'test', -1),
-                    array('code', '</p>', 1),
-                )
-            ),
-            array(
-                "<a><!-- comment -->\n<b><c>test",
-                array(
-                    array('code', '<a>', 1),
-                    array('txt', "\n", -1),
-                    array('code', '<b>', 2),
-                    array('code', '<c>', 2),
-                    array('txt', "test", -1),
-                )
-            )
-        );
-    }
-}
diff --git a/html2pdf-master/src/Tests/Parsing/HtmlTest.php b/html2pdf-master/src/Tests/Parsing/HtmlTest.php
deleted file mode 100644
index 4dd5fd22..00000000
--- a/html2pdf-master/src/Tests/Parsing/HtmlTest.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Tests
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-
-namespace Spipu\Html2Pdf\Tests\Parsing;
-
-use Spipu\Html2Pdf\Parsing\Html;
-
-/**
- * Class HtmlTest
- */
-class HtmlTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @var Html
-     */
-    private $object;
-
-    protected function setUp()
-    {
-        $textParser = $this->getMockBuilder('Spipu\Html2Pdf\Parsing\TextParser')
-            ->disableOriginalConstructor()
-            ->setMethods(['prepareTxt'])
-            ->getMock();
-
-        $textParser
-            ->expects($this->any())
-            ->method('prepareTxt')
-            ->will($this->returnCallback([$this, 'mockPrepareTxt']));
-
-        $this->object = new Html($textParser);
-    }
-
-    /**
-     * mock of prepareTxt method
-     *
-     * @param $txt
-     * @param bool $spaces
-     * @return mixed
-     */
-    public function mockPrepareTxt($txt, $spaces = true)
-    {
-        return $txt;
-    }
-
-    /**
-     * Test the prepareHtml method
-     */
-    public function testPrepareHtml()
-    {
-        $result = $this->object->prepareHtml('Hello [[date_y]]-[[date_m]]-[[date_d]] World');
-        $this->assertSame('Hello '.date('Y-m-d').' World', $result);
-
-        $result = $this->object->prepareHtml('Hello [[date_h]]:[[date_i]]:[[date_s]] World');
-        $this->assertSame('Hello '.date('H:i:s').' World', $result);
-
-        $html  = '
-<html>
-    <head>
-        <style type="text">.my-class { color: red; }</style>
-        <link type="text/css" href="my-style.css"/>
-    </head>
-    <body class="my-class"><p>Hello World</p></body>
-</html>';
-
-        $expected='<style type="text">.my-class { color: red; }</style>'.
-            '<link type="text/css" href="my-style.css"/>'.
-            '<page class="my-class"><p>Hello World</p></page>';
-
-        $result = $this->object->prepareHtml($html);
-        $this->assertSame($expected, $result);
-    }
-}
diff --git a/html2pdf-master/src/Tests/Parsing/ParsingTest.php b/html2pdf-master/src/Tests/Parsing/ParsingTest.php
deleted file mode 100644
index 6a406546..00000000
--- a/html2pdf-master/src/Tests/Parsing/ParsingTest.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Tests
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-
-namespace Spipu\Html2Pdf\Tests\Parsing;
-
-use Spipu\Html2Pdf\Html2Pdf;
-use Spipu\Html2Pdf\Tests\AbstractTest;
-
-/**
- * Class ParsingTest
- */
-class ParsingTest extends AbstractTest
-{
-    /**
-     * test: The tag is unknown
-     *
-     * @return void
-     * @expectedException \Spipu\Html2Pdf\Exception\HtmlParsingException
-     */
-    public function testUnknownTag()
-    {
-        $object = $this->getObject();
-        $object->writeHTML('<bad_tag>Hello World</bad_tag>');
-        $object->output('test.pdf', 'S');
-    }
-
-    /**
-     * test: Too many tag closures found
-     *
-     * @return void
-     * @expectedException \Spipu\Html2Pdf\Exception\HtmlParsingException
-     */
-    public function testTooManyClosuresFound()
-    {
-        $object = $this->getObject();
-        $object->writeHTML('<i><u>Hello</u></i></b>');
-        $object->output('test.pdf', 'S');
-    }
-
-    /**
-     * test: Tags are closed in a wrong order
-     *
-     * @return void
-     * @expectedException \Spipu\Html2Pdf\Exception\HtmlParsingException
-     */
-    public function testWrongClosedOrder()
-    {
-        $object = $this->getObject();
-        $object->writeHTML('<b><u><i>Hello</u></i></b>');
-        $object->output('test.pdf', 'S');
-    }
-
-    /**
-     * test: The following tag has not been closed
-     *
-     * @return void
-     * @expectedException \Spipu\Html2Pdf\Exception\HtmlParsingException
-     */
-    public function testNotClosed()
-    {
-        $object = $this->getObject();
-        $object->writeHTML('<b><i>Hello</i>');
-        $object->output('test.pdf', 'S');
-    }
-
-    /**
-     * test: The following tags have not been closed
-     *
-     * @return void
-     * @expectedException \Spipu\Html2Pdf\Exception\HtmlParsingException
-     */
-    public function testNotClosedMore()
-    {
-        $object = $this->getObject();
-        $object->writeHTML('<b><u><i>Hello</i>');
-        $object->output('test.pdf', 'S');
-    }
-
-    /**
-     * test: The HTML tag code provided is invalid
-     *
-     * @return void
-     * @expectedException \Spipu\Html2Pdf\Exception\HtmlParsingException
-     */
-    public function testInvalidCode()
-    {
-        $object = $this->getObject();
-        $object->writeHTML('<az1-r_h>Hello</az1-r_h>');
-        $object->output('test.pdf', 'S');
-    }
-}
diff --git a/html2pdf-master/src/Tests/Parsing/TagParserTest.php b/html2pdf-master/src/Tests/Parsing/TagParserTest.php
deleted file mode 100644
index 026a5f59..00000000
--- a/html2pdf-master/src/Tests/Parsing/TagParserTest.php
+++ /dev/null
@@ -1,223 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Tests
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-
-namespace Spipu\Html2Pdf\Tests\Parsing;
-
-use Spipu\Html2Pdf\Parsing\Node;
-use Spipu\Html2Pdf\Parsing\TagParser;
-
-/**
- * Class TagParserTest
- */
-class TagParserTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @var TagParser
-     */
-    private $parser;
-
-    protected function setUp()
-    {
-        $textParser = $this->getMockBuilder('Spipu\Html2Pdf\Parsing\TextParser')
-            ->disableOriginalConstructor()
-            ->setMethods(['prepareTxt'])
-            ->getMock();
-
-        $textParser
-            ->expects($this->any())
-            ->method('prepareTxt')
-            ->will($this->returnCallback([$this, 'mockPrepareTxt']));
-
-        $this->parser = new TagParser($textParser);
-    }
-
-    /**
-     * mock of prepareTxt method
-     *
-     * @param $txt
-     * @param bool $spaces
-     * @return mixed
-     */
-    public function mockPrepareTxt($txt, $spaces = true)
-    {
-        return $txt;
-    }
-
-    /**
-     * @param string $code
-     * @param array  $expected
-     *
-     * @dataProvider tagAttributesProvider
-     */
-    public function testExtractTagAttributes($code, $expected)
-    {
-        $result = $this->parser->extractTagAttributes($code);
-
-        $this->assertEquals($expected, $result);
-    }
-
-    /**
-     * @return array
-     */
-    public function tagAttributesProvider()
-    {
-        return array(
-            array('attr=value', array('attr' => 'value')),
-            array('attr="value"', array('attr' => 'value')),
-            array('attr=\'value\'', array('attr' => 'value')),
-            array('attr="value with spaces"', array('attr' => 'value with spaces')),
-            array('attr="value with \'quotes"', array('attr' => 'value with \'quotes')),
-            array('my attr="value"', array('attr' => 'value')),
-            array('attr1=val1 attr2="value2"', array('attr1' => 'val1', 'attr2' => 'value2')),
-        );
-    }
-
-    /**
-     * Test if a bad tag is detected
-     *
-     * @expectedException  \Spipu\Html2Pdf\Exception\HtmlParsingException
-     */
-    public function testAnalyzeTagBadTag()
-    {
-        $this->parser->analyzeTag('test');
-    }
-
-    /**
-     * Test basic open, close, autoclose tags
-     */
-    public function testBasicTags()
-    {
-        $result = $this->parser->analyzeTag('<my_tag/>');
-
-        $this->assertTrue($result instanceof Node);
-        $this->assertSame('my_tag', $result->getName());
-        $this->assertSame(true, $result->isAutoClose());
-        $this->assertSame(false, $result->isClose());
-
-        $result->setLine(10);
-        $this->assertSame(10, $result->getLine());
-
-        $result->setParam('attr', 'value');
-        $this->assertSame('value', $result->getParam('attr'));
-
-
-        $result = $this->parser->analyzeTag('<my_tag>');
-
-        $this->assertSame('my_tag', $result->getName());
-        $this->assertSame(false, $result->isAutoClose());
-        $this->assertSame(false, $result->isClose());
-        $this->assertSame(['style' => [], 'num' => 0], $result->getParams());
-        $this->assertSame('default', $result->getParam('attr', 'default'));
-
-        $result = $this->parser->analyzeTag('</my_tag>');
-
-        $this->assertSame('my_tag', $result->getName());
-        $this->assertSame(false, $result->isAutoClose());
-        $this->assertSame(true, $result->isClose());
-
-    }
-
-    /**
-     * Test styles
-     */
-    public function testAnalyzeAttributes()
-    {
-        $result = $this->parser->analyzeTag('<img src="my_src" alt="my alt"/>');
-        $this->assertSame('my_src', $result->getParam('src'));
-        $this->assertSame('my alt', $result->getParam('alt'));
-
-        $result = $this->parser->analyzeTag('<a href="my_src" title="my title"/>');
-        $this->assertSame('my_src', $result->getParam('href'));
-        $this->assertSame('my title', $result->getParam('title'));
-
-
-        $result = $this->parser->analyzeTag('<input type="text" value="my value" class="my_class" />');
-        $this->assertSame('text', $result->getParam('type'));
-        $this->assertSame('my value', $result->getParam('value'));
-        $this->assertSame('my_class', $result->getParam('class'));
-
-        $result = $this->parser->analyzeTag('<my_tag width="10" height="20" align="center" valign="bottom" bgcolor="red">');
-        $this->assertSame('10px', $result->getStyle('width'));
-        $this->assertSame('20px', $result->getStyle('height'));
-        $this->assertSame('center', $result->getStyle('text-align'));
-        $this->assertSame('bottom', $result->getStyle('vertical-align'));
-        $this->assertSame('red', $result->getStyle('background'));
-
-        $result = $this->parser->analyzeTag('<img align="right">');
-        $this->assertSame('right', $result->getStyle('float'));
-
-        $result = $this->parser->analyzeTag('<table cellpadding="1" cellspacing="2">');
-        $this->assertSame('1px', $result->getParam('cellpadding'));
-        $this->assertSame('2px', $result->getParam('cellspacing'));
-
-        $result = $this->parser->analyzeTag('<td rowspan="0" colspan="2px">');
-        $this->assertSame(1, $result->getParam('rowspan'));
-        $this->assertSame(2, $result->getParam('colspan'));
-
-        $result = $this->parser->analyzeTag('<my_tag color="red">');
-        $this->assertSame('red', $result->getParam('color'));
-        $this->assertSame(null, $result->getStyle('color'));
-
-        $result = $this->parser->analyzeTag('<font color="red">');
-        $this->assertSame(null, $result->getParam('color'));
-        $this->assertSame('red', $result->getStyle('color'));
-    }
-
-    /**
-     * Test borders
-     */
-    public function testBorders()
-    {
-        $result = $this->parser->analyzeTag('<div border="1" bordercolor="red" />');
-
-        $this->assertSame('div', $result->getName());
-        $this->assertSame('solid 1px red', $result->getParam('border'));
-        $this->assertSame('solid 1px red', $result->getStyle('border'));
-
-        $result = $this->parser->analyzeTag('<div border="0" bordercolor="red" />');
-
-        $this->assertSame('div', $result->getName());
-        $this->assertSame('none', $result->getParam('border'));
-        $this->assertSame('none', $result->getStyle('border'));
-    }
-
-    /**
-     * Test levels
-     */
-    public function testLevels()
-    {
-        $result = $this->parser->analyzeTag('<basic_tag>');
-        $this->assertSame(0, $result->getParam('num'));
-
-        $result = $this->parser->analyzeTag('<table>');
-        $this->assertSame(1, $result->getParam('num'));
-
-        $result = $this->parser->analyzeTag('<ol>');
-        $this->assertSame(2, $result->getParam('num'));
-
-        $result = $this->parser->analyzeTag('<ul>');
-        $this->assertSame(3, $result->getParam('num'));
-
-        $result = $this->parser->analyzeTag('</ul>');
-        $this->assertSame('ul', $result->getName());
-        $this->assertSame(3, $result->getParam('num'));
-
-        $result = $this->parser->analyzeTag('</ol>');
-        $this->assertSame(2, $result->getParam('num'));
-
-        $result = $this->parser->analyzeTag('</table>');
-        $this->assertSame(1, $result->getParam('num'));
-
-        $result = $this->parser->analyzeTag('<basic_tag>');
-        $this->assertSame(0, $result->getParam('num'));
-    }
-}
diff --git a/html2pdf-master/src/Tests/Parsing/TextParserTest.php b/html2pdf-master/src/Tests/Parsing/TextParserTest.php
deleted file mode 100644
index 3d41bbc4..00000000
--- a/html2pdf-master/src/Tests/Parsing/TextParserTest.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Tests
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-
-namespace Spipu\Html2Pdf\Tests\Parsing;
-
-use Spipu\Html2Pdf\Parsing\TextParser;
-
-/**
- * Class TextParserTest
- */
-class TextParserTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @var TextParser
-     */
-    private $parser;
-
-    protected function setUp()
-    {
-        $this->parser = new TextParser();
-    }
-
-    /**
-     * Test if it works
-     */
-    public function testOk()
-    {
-        $result = $this->parser->prepareTxt('hello  world', false);
-        $this->assertSame('hello  world', $result);
-
-        $result = $this->parser->prepareTxt('hello  world', true);
-        $this->assertSame('hello world', $result);
-
-        $result = $this->parser->prepareTxt('hello 10&euro; world');
-        $this->assertSame('hello 10€ world', $result);
-
-        $result = $this->parser->prepareTxt('hello &lt; world');
-        $this->assertSame('hello < world', $result);
-    }
-}
diff --git a/html2pdf-master/src/Tests/Parsing/TokenTest.php b/html2pdf-master/src/Tests/Parsing/TokenTest.php
deleted file mode 100644
index ed1bc783..00000000
--- a/html2pdf-master/src/Tests/Parsing/TokenTest.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Tests
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-
-namespace Spipu\Html2Pdf\Tests\Parsing;
-
-use Spipu\Html2Pdf\Parsing\Token;
-
-/**
- * Class TokenTest
- */
-class TokenTest extends \PHPUnit_Framework_TestCase
-{
-
-    /**
-     * Test if it works
-     */
-    public function testOk()
-    {
-        $token = new Token('hello', 'world', 45);
-        $this->assertSame('hello', $token->getType());
-        $this->assertSame('world', $token->getData());
-        $this->assertSame(45, $token->getLine());
-    }
-}
diff --git a/html2pdf-master/src/Tests/SvgDrawerTest.php b/html2pdf-master/src/Tests/SvgDrawerTest.php
deleted file mode 100644
index cdf433ce..00000000
--- a/html2pdf-master/src/Tests/SvgDrawerTest.php
+++ /dev/null
@@ -1,296 +0,0 @@
-<?php
-
-namespace Spipu\Html2Pdf\Tests;
-
-use Phake;
-use Spipu\Html2Pdf\CssConverter;
-use Spipu\Html2Pdf\SvgDrawer;
-
-/**
- * Class Html2PdfTest
- */
-class SvgDrawerTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @var SvgDrawer
-     */
-    private $svgDrawer;
-
-    public function setUp()
-    {
-        $myPdf = Phake::mock('Spipu\Html2Pdf\MyPdf');
-
-        $cssConverter = new CssConverter();
-
-        $this->svgDrawer = new SvgDrawer($myPdf, $cssConverter);
-    }
-
-    /**
-     * Test IsDrawing Exception
-     *
-     * @expectedException \Spipu\Html2Pdf\Exception\HtmlParsingException
-     */
-    public function testIsDrawingException()
-    {
-        $properties = [
-            'x' => 0,
-            'y' => 0,
-            'w' => '100mm',
-            'h' => '100mm',
-        ];
-
-        $this->svgDrawer->startDrawing($properties);
-        $this->svgDrawer->startDrawing($properties);
-    }
-
-    /**
-     * Test IsDrawing
-     */
-    public function testIsDrawingOk()
-    {
-        $properties = [
-            'x' => 0,
-            'y' => 0,
-            'w' => 100,
-            'h' => 100,
-        ];
-
-        $this->assertFalse($this->svgDrawer->isDrawing());
-        $this->svgDrawer->startDrawing($properties);
-        $this->assertTrue($this->svgDrawer->isDrawing());
-        $this->svgDrawer->stopDrawing();
-        $this->assertFalse($this->svgDrawer->isDrawing());
-    }
-
-    /**
-     * Test properties
-     */
-    public function testProperties()
-    {
-        $properties = [
-            'x' => 1,
-            'y' => 2,
-            'w' => 3,
-            'h' => 4,
-        ];
-
-        $this->svgDrawer->startDrawing($properties);
-
-        $this->assertSame(1, $this->svgDrawer->getProperty('x'));
-        $this->assertSame(2, $this->svgDrawer->getProperty('y'));
-        $this->assertSame(3, $this->svgDrawer->getProperty('w'));
-        $this->assertSame(4, $this->svgDrawer->getProperty('h'));
-    }
-
-    /**
-     * Test: tokenize
-     *
-     * @param mixed $transform
-     * @param mixed  $expected
-     *
-     * @dataProvider transformProvider
-     */
-    public function testTransform($transform, $expected)
-    {
-        $properties = [
-            'x' => 0,
-            'y' => 0,
-            'w' => 100,
-            'h' => 100,
-        ];
-
-        $this->svgDrawer->startDrawing($properties);
-
-        $result = $this->svgDrawer->prepareTransform($transform);
-
-        $this->assertArraySame($expected, $result);
-    }
-
-    /**
-     * @param array $expected
-     * @param array $result
-     */
-    protected function assertArraySame($expected, $result)
-    {
-        if (is_array($expected)) {
-            foreach ($expected as $key => $value) {
-                $expected[$key] = round($value, 5);
-            }
-        }
-
-        if (is_array($result)) {
-            foreach ($result as $key => $value) {
-                $result[$key] = round($value, 5);
-            }
-        }
-
-        $this->assertSame($expected, $result);
-    }
-
-    /**
-     * provider: tokenize
-     *
-     * @return array
-     */
-    public function transformProvider()
-    {
-        return array(
-            array(
-                false,
-                null
-            ),
-            array(
-                'no instruction',
-                null
-            ),
-            array(
-                'foo(1,2)',
-                null
-            ),
-            array(
-                'before scale( 0.1 , 0.2 ) after',
-                [
-                    0.1,  0.,
-                    0.,   0.2,
-                    0.,   0.
-                ]
-            ),
-            array(
-                'scale(0.1,0.2)',
-                [
-                    0.1, 0.,
-                    0.,  0.2,
-                    0.,  0.
-                ]
-            ),
-            array(
-                'scale(0.1)',
-                [
-                    0.1, 0.,
-                    0.,  0.1,
-                    0.,  0.
-                ]
-            ),
-            array(
-                'scale(,)',
-                [
-                    1., 0.,
-                    0., 1.,
-                    0., 0.
-                ]
-            ),
-            array(
-                'scale()',
-                [
-                    1., 0.,
-                    0., 1.,
-                    0., 0.
-                ]
-            ),
-            array(
-                'translate()',
-                [
-                    1., 0.,
-                    0., 1.,
-                    0., 0.
-                ]
-            ),
-            array(
-                'translate(10mm)',
-                [
-                    1.,  0.,
-                    0.,  1.,
-                    10., 0.
-                ]
-            ),
-            array(
-                'translate(10mm, 20mm)',
-                [
-                    1.,  0.,
-                    0.,  1.,
-                    10., 20.
-                ]
-            ),
-            array(
-                'rotate()',
-                [
-                    1., 0.,
-                    0., 1.,
-                    0., 0.
-                ]
-            ),
-            array(
-                'rotate(90)',
-                [
-                    0.,  1.,
-                    -1., 0.,
-                    0., 0.
-                ]
-            ),
-            array(
-                'rotate(180)',
-                [
-                    -1.,  0.,
-                    0.,  -1.,
-                    0.,   0.
-                ]
-            ),
-            array(
-                'rotate(180, 10mm, 10mm)',
-                [
-                    -1.,    0.,
-                    0.,    -1.,
-                    -20.,  -20.
-                ]
-            ),
-            array(
-                'skewx()',
-                [
-                    1., 0.,
-                    0., 1.,
-                    0., 0.
-                ]
-            ),
-            array(
-                'skewx(45)',
-                [
-                    1., 0.,
-                    1., 1.,
-                    0., 0.
-                ]
-            ),
-            array(
-                'skewy()',
-                [
-                    1., 0.,
-                    0., 1.,
-                    0., 0.
-                ]
-            ),
-            array(
-                'skewy(45)',
-                [
-                    1., 1.,
-                    0., 1.,
-                    0., 0.
-                ]
-            ),
-            array(
-                'matrix()',
-                [
-                    0., 0.,
-                    0., 0.,
-                    0., 0.
-                ]
-            ),
-            array(
-                'matrix(1,2,3,4,5%,6%)',
-                [
-                    1., 2.,
-                    3., 4.,
-                    5., 6.
-                ]
-            ),
-        );
-    }
-}
diff --git a/html2pdf-master/src/Tests/Tag/DivTest.php b/html2pdf-master/src/Tests/Tag/DivTest.php
deleted file mode 100644
index 90bf76b4..00000000
--- a/html2pdf-master/src/Tests/Tag/DivTest.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Tests
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-
-namespace Spipu\Html2Pdf\Tests\Tag;
-
-use Spipu\Html2Pdf\Html2Pdf;
-use Spipu\Html2Pdf\Tests\AbstractTest;
-
-/**
- * Div Tag test
- */
-class DivTest extends AbstractTest
-{
-    /**
-     * test No Break
-     *
-     * @return void
-     */
-    public function testNoBreak()
-    {
-        $html = '<p>First Tag</p>';
-        $html.= '<div>Second Tag</div>';
-        $html.= '<p>Third Tag</p>';
-
-        $object = $this->getObject();
-        $object->writeHTML($html);
-        $result = $object->output('test.pdf', 'S');
-
-        $this->assertNotEmpty($result);
-        $this->assertSame(1, $object->getNbPages());
-    }
-
-    /**
-     * test Break Before
-     *
-     * @return void
-     */
-    public function testBreakBefore()
-    {
-        $html = '<p>First Tag</p>';
-        $html.= '<div style="page-break-before:always">Second Tag</div>';
-        $html.= '<p>Third Tag</p>';
-
-        $object = $this->getObject();
-        $object->writeHTML($html);
-        $result = $object->output('test.pdf', 'S');
-
-        $this->assertNotEmpty($result);
-        $this->assertSame(2, $object->getNbPages());
-    }
-
-    /**
-     * test Break After
-     *
-     * @return void
-     */
-    public function testBreakAfter()
-    {
-        $html = '<p>First Tag</p>';
-        $html.= '<div style="page-break-after:always">Second Tag</div>';
-        $html.= '<p>Third Tag</p>';
-
-        $object = $this->getObject();
-        $object->writeHTML($html);
-        $result = $object->output('test.pdf', 'S');
-
-        $this->assertNotEmpty($result);
-        $this->assertSame(2, $object->getNbPages());
-    }
-
-
-    /**
-     * test Break before and After
-     *
-     * @return void
-     */
-    public function testBreakBeforeAndAfter()
-    {
-        $html = '<p>First Tag</p>';
-        $html.= '<div style="page-break-before:always; page-break-after:always">Second Tag</div>';
-        $html.= '<p>Third Tag</p>';
-
-        $object = $this->getObject();
-        $object->writeHTML($html);
-        $result = $object->output('test.pdf', 'S');
-
-        $this->assertNotEmpty($result);
-        $this->assertSame(3, $object->getNbPages());
-    }
-}
diff --git a/html2pdf-master/src/Tests/Tag/MustHaveTagsTest.php b/html2pdf-master/src/Tests/Tag/MustHaveTagsTest.php
deleted file mode 100644
index 90f930f1..00000000
--- a/html2pdf-master/src/Tests/Tag/MustHaveTagsTest.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Tests
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-
-namespace Spipu\Html2Pdf\Tests\Tag;
-
-use Spipu\Html2Pdf\Html2Pdf;
-use Spipu\Html2Pdf\Tests\AbstractTest;
-
-/**
- * Class Thead must not be empty
- */
-class MustHaveTagsTest extends AbstractTest
-{
-    /**
-     * test
-     *
-     * @return void
-     */
-    public function testOk()
-    {
-        $html = '<table>';
-        $html.= '<thead><tr><td>Hello</td></tr></thead>';
-        $html.= '<tbody><tr><td>World</td></tr></tbody>';
-        $html.= '</table>';
-
-        $object = $this->getObject();
-        $object->writeHTML($html);
-        $result = $object->output('test.pdf', 'S');
-
-        $this->assertNotEmpty($result);
-    }
-
-    /**
-     * test
-     *
-     * @return void
-     * @expectedException \Spipu\Html2Pdf\Exception\HtmlParsingException
-     */
-    public function testNotEmptyThead()
-    {
-        $html = '<table>';
-        $html.= '<thead></thead>';
-        $html.= '<tbody><tr><td>World</td></tr></tbody>';
-        $html.= '</table>';
-
-        $object = $this->getObject();
-        $object->writeHTML($html);
-        $object->output('test.pdf', 'S');
-    }
-
-    /**
-     * test
-     *
-     * @return void
-     * @expectedException \Spipu\Html2Pdf\Exception\HtmlParsingException
-     */
-    public function testNotEmptyTfoot()
-    {
-        $html = '<table>';
-        $html.= '<tfoot></tfoot>';
-        $html.= '<tbody><tr><td>World</td></tr></tbody>';
-        $html.= '</table>';
-
-        $object = $this->getObject();
-        $object->writeHTML($html);
-        $object->output('test.pdf', 'S');
-    }
-}
diff --git a/html2pdf-master/src/Tests/Tag/Svg/CircleErrorTest.php b/html2pdf-master/src/Tests/Tag/Svg/CircleErrorTest.php
deleted file mode 100644
index 520466a1..00000000
--- a/html2pdf-master/src/Tests/Tag/Svg/CircleErrorTest.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Tests
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-
-namespace Spipu\Html2Pdf\Tests\Tag\Svg;
-
-use Spipu\Html2Pdf\Tests\AbstractTest;
-
-/**
- * Class CircleErrorTest
- */
-class CircleErrorTest extends AbstractTest
-{
-    /**
-     * test
-     *
-     * @return void
-     * @expectedException \Spipu\Html2Pdf\Exception\HtmlParsingException
-     */
-    public function testCase()
-    {
-        $object = $this->getObject();
-        $object->writeHTML('<circle />');
-        $object->output('test.pdf', 'S');
-    }
-}
diff --git a/html2pdf-master/src/Tests/Tag/Svg/EllipseErrorTest.php b/html2pdf-master/src/Tests/Tag/Svg/EllipseErrorTest.php
deleted file mode 100644
index 2274fd42..00000000
--- a/html2pdf-master/src/Tests/Tag/Svg/EllipseErrorTest.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Tests
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-
-namespace Spipu\Html2Pdf\Tests\Tag\Svg;
-
-use Spipu\Html2Pdf\Tests\AbstractTest;
-
-/**
- * Class EllipseErrorTest
- */
-class EllipseErrorTest extends AbstractTest
-{
-    /**
-     * test
-     *
-     * @return void
-     * @expectedException \Spipu\Html2Pdf\Exception\HtmlParsingException
-     */
-    public function testCase()
-    {
-        $object = $this->getObject();
-        $object->writeHTML('<ellipse />');
-        $object->output('test.pdf', 'S');
-    }
-}
diff --git a/html2pdf-master/src/Tests/Tag/Svg/GErrorTest.php b/html2pdf-master/src/Tests/Tag/Svg/GErrorTest.php
deleted file mode 100644
index 6cce43d7..00000000
--- a/html2pdf-master/src/Tests/Tag/Svg/GErrorTest.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Tests
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-
-namespace Spipu\Html2Pdf\Tests\Tag\Svg;
-
-use Spipu\Html2Pdf\Tests\AbstractTest;
-
-/**
- * Class GErrorTest
- */
-class GErrorTest extends AbstractTest
-{
-    /**
-     * test
-     *
-     * @return void
-     * @expectedException \Spipu\Html2Pdf\Exception\HtmlParsingException
-     */
-    public function testCase()
-    {
-        $object = $this->getObject();
-        $object->writeHTML('<g />');
-        $object->output('test.pdf', 'S');
-    }
-}
diff --git a/html2pdf-master/src/Tests/Tag/Svg/LineErrorTest.php b/html2pdf-master/src/Tests/Tag/Svg/LineErrorTest.php
deleted file mode 100644
index d99cb0f7..00000000
--- a/html2pdf-master/src/Tests/Tag/Svg/LineErrorTest.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Tests
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-
-namespace Spipu\Html2Pdf\Tests\Tag\Svg;
-
-use Spipu\Html2Pdf\Tests\AbstractTest;
-
-/**
- * Class LineErrorTest
- */
-class LineErrorTest extends AbstractTest
-{
-    /**
-     * test
-     *
-     * @return void
-     * @expectedException \Spipu\Html2Pdf\Exception\HtmlParsingException
-     */
-    public function testCase()
-    {
-        $object = $this->getObject();
-        $object->writeHTML('<line />');
-        $object->output('test.pdf', 'S');
-    }
-}
diff --git a/html2pdf-master/src/Tests/Tag/Svg/PathErrorTest.php b/html2pdf-master/src/Tests/Tag/Svg/PathErrorTest.php
deleted file mode 100644
index 6fb16bad..00000000
--- a/html2pdf-master/src/Tests/Tag/Svg/PathErrorTest.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Tests
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-
-namespace Spipu\Html2Pdf\Tests\Tag\Svg;
-
-use Spipu\Html2Pdf\Tests\AbstractTest;
-
-/**
- * Class PathErrorTest
- */
-class PathErrorTest extends AbstractTest
-{
-    /**
-     * test
-     *
-     * @return void
-     * @expectedException \Spipu\Html2Pdf\Exception\HtmlParsingException
-     */
-    public function testCase()
-    {
-        $object = $this->getObject();
-        $object->writeHTML('<path />');
-        $object->output('test.pdf', 'S');
-    }
-}
diff --git a/html2pdf-master/src/Tests/Tag/Svg/PathInvalidTest.php b/html2pdf-master/src/Tests/Tag/Svg/PathInvalidTest.php
deleted file mode 100644
index e270c938..00000000
--- a/html2pdf-master/src/Tests/Tag/Svg/PathInvalidTest.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Tests
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-
-namespace Spipu\Html2Pdf\Tests\Tag\Svg;
-
-use Spipu\Html2Pdf\Tests\AbstractTest;
-
-/**
- * Class PathInvalidTest
- */
-class PathInvalidTest extends AbstractTest
-{
-    /**
-     * test
-     *
-     * @return void
-     * @expectedException \Spipu\Html2Pdf\Exception\HtmlParsingException
-     */
-    public function testCase()
-    {
-        $html = '
-<page>
-    <draw style="width:150mm; height:100mm;">
-        <path style="fill:#770000; stroke:#AA0033;" d="n 20mm,40mm a16mm,8mm 0,0,0 16mm,8mm" />
-    </draw>
-</page>';
-
-        $object = $this->getObject();
-        $object->writeHTML($html);
-        $object->output('test.pdf', 'S');
-    }
-}
diff --git a/html2pdf-master/src/Tests/Tag/Svg/PolygonErrorTest.php b/html2pdf-master/src/Tests/Tag/Svg/PolygonErrorTest.php
deleted file mode 100644
index eac218bf..00000000
--- a/html2pdf-master/src/Tests/Tag/Svg/PolygonErrorTest.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Tests
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-
-namespace Spipu\Html2Pdf\Tests\Tag\Svg;
-
-use Spipu\Html2Pdf\Tests\AbstractTest;
-
-/**
- * Class PolygonErrorTest
- */
-class PolygonErrorTest extends AbstractTest
-{
-    /**
-     * test
-     *
-     * @return void
-     * @expectedException \Spipu\Html2Pdf\Exception\HtmlParsingException
-     */
-    public function testCase()
-    {
-        $object = $this->getObject();
-        $object->writeHTML('<polygon />');
-        $object->output('test.pdf', 'S');
-    }
-}
diff --git a/html2pdf-master/src/Tests/Tag/Svg/PolylineErrorTest.php b/html2pdf-master/src/Tests/Tag/Svg/PolylineErrorTest.php
deleted file mode 100644
index 4f6c4db1..00000000
--- a/html2pdf-master/src/Tests/Tag/Svg/PolylineErrorTest.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Tests
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-
-namespace Spipu\Html2Pdf\Tests\Tag\Svg;
-
-use Spipu\Html2Pdf\Tests\AbstractTest;
-
-/**
- * Class PolylineErrorTest
- */
-class PolylineErrorTest extends AbstractTest
-{
-    /**
-     * test
-     *
-     * @return void
-     * @expectedException \Spipu\Html2Pdf\Exception\HtmlParsingException
-     */
-    public function testCase()
-    {
-        $object = $this->getObject();
-        $object->writeHTML('<polyline />');
-        $object->output('test.pdf', 'S');
-    }
-}
diff --git a/html2pdf-master/src/Tests/Tag/Svg/RectErrorTest.php b/html2pdf-master/src/Tests/Tag/Svg/RectErrorTest.php
deleted file mode 100644
index 1f21be9f..00000000
--- a/html2pdf-master/src/Tests/Tag/Svg/RectErrorTest.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Tests
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-
-namespace Spipu\Html2Pdf\Tests\Tag\Svg;
-
-use Spipu\Html2Pdf\Tests\AbstractTest;
-
-/**
- * Class RectErrorTest
- */
-class RectErrorTest extends AbstractTest
-{
-    /**
-     * test
-     *
-     * @return void
-     * @expectedException \Spipu\Html2Pdf\Exception\HtmlParsingException
-     */
-    public function testCase()
-    {
-        $object = $this->getObject();
-        $object->writeHTML('<rect />');
-        $object->output('test.pdf', 'S');
-    }
-}
diff --git a/html2pdf-master/src/Tests/Tag/TdTooLongTest.php b/html2pdf-master/src/Tests/Tag/TdTooLongTest.php
deleted file mode 100644
index 89b5f546..00000000
--- a/html2pdf-master/src/Tests/Tag/TdTooLongTest.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/**
- * Html2Pdf Library - Tests
- *
- * HTML => PDF converter
- * distributed under the OSL-3.0 License
- *
- * @package   Html2pdf
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @copyright 2017 Laurent MINGUET
- */
-
-namespace Spipu\Html2Pdf\Tests\Tag;
-
-use Spipu\Html2Pdf\Html2Pdf;
-use Spipu\Html2Pdf\Tests\AbstractTest;
-
-/**
- * Class TdTooLongTest
- */
-class TdTooLongTest extends AbstractTest
-{
-    /**
-     * test
-     *
-     * @return void
-     * @expectedException \Spipu\Html2Pdf\Exception\TableException
-     */
-    public function testCase()
-    {
-        $sentence = 'Hello World ! ';
-        $sentences = '';
-        for ($k=0; $k<100; $k++) {
-            $sentences.= $sentence;
-        }
-
-        $object = $this->getObject();
-        $object->writeHTML('<table><tr><td style="width: 28mm">'.$sentences.'</td></tr></table>');
-        $object->output('test.pdf', 'S');
-    }
-}
diff --git a/html2pdf-master/src/config/tcpdf.config.php b/html2pdf-master/src/config/tcpdf.config.php
deleted file mode 100644
index 8b564094..00000000
--- a/html2pdf-master/src/config/tcpdf.config.php
+++ /dev/null
@@ -1,277 +0,0 @@
-<?php
-//============================================================+
-// File name   : tcpdf_config.php
-// Begin       : 2004-06-11
-// Last Update : 2013-02-06
-//
-// Description : Configuration file for TCPDF.
-// Author      : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
-// License     : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
-// -------------------------------------------------------------------
-// Copyright (C) 2004-2013  Nicola Asuni - Tecnick.com LTD
-//
-// This file is part of TCPDF software library.
-//
-// TCPDF is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// TCPDF is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-// See the GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with TCPDF.  If not, see <http://www.gnu.org/licenses/>.
-//
-// See LICENSE.TXT file for more information.
-//============================================================+
-
-/**
- * Configuration file for TCPDF.
- * @author Nicola Asuni
- * @package com.tecnick.tcpdf
- * @version 4.9.005
- * @since 2004-10-27
- */
-
-// If you define the constant K_TCPDF_EXTERNAL_CONFIG, the following settings will be ignored.
-
-if (!defined('K_TCPDF_EXTERNAL_CONFIG')) {
-
-    define('K_TCPDF_EXTERNAL_CONFIG', true);
-
-    // DOCUMENT_ROOT fix for IIS Webserver
-    if ((!isset($_SERVER['DOCUMENT_ROOT'])) or (empty($_SERVER['DOCUMENT_ROOT']))) {
-        if (isset($_SERVER['SCRIPT_FILENAME'])) {
-            $_SERVER['DOCUMENT_ROOT'] = str_replace(
-                '\\',
-                '/',
-                substr($_SERVER['SCRIPT_FILENAME'], 0, 0-strlen($_SERVER['PHP_SELF']))
-            );
-        } elseif (isset($_SERVER['PATH_TRANSLATED'])) {
-            $_SERVER['DOCUMENT_ROOT'] = str_replace(
-                '\\',
-                '/',
-                substr(str_replace('\\\\', '\\', $_SERVER['PATH_TRANSLATED']), 0, 0-strlen($_SERVER['PHP_SELF']))
-            );
-        } else {
-            // define here your DOCUMENT_ROOT path if the previous fails (e.g. '/var/www')
-            $_SERVER['DOCUMENT_ROOT'] = '/var/www';
-        }
-    }
-
-    // be sure that the end slash is present
-    $_SERVER['DOCUMENT_ROOT'] = str_replace('//', '/', $_SERVER['DOCUMENT_ROOT'].'/');
-
-    /**
-     * Installation path of tcpdf with composer.
-     */
-    $vendorFolders = array(
-        dirname(dirname(dirname(__FILE__))) . '/vendor/',
-        dirname(dirname(dirname(__FILE__))) . '/../../',
-    );
-    foreach ($vendorFolders as $vendorFolder) {
-        if (file_exists($vendorFolder.'autoload.php')) {
-            $k_path_main = $vendorFolder . 'tecnickcom/tcpdf/';
-
-            break;
-        }
-    }
-
-    if (!isset($k_path_main)) {
-        echo "
-      [ERROR]
-         It seems that Html2Pdf dependencies are not installed...
-         you must install thems with `composer install`
-
-";
-        exit;
-    }
-    define('K_PATH_MAIN', $k_path_main);
-
-    // Automatic calculation for the following K_PATH_URL constant
-    $k_path_url = $k_path_main; // default value for console mode
-    if (isset($_SERVER['HTTP_HOST']) and (!empty($_SERVER['HTTP_HOST']))) {
-        if (isset($_SERVER['HTTPS']) and (!empty($_SERVER['HTTPS'])) and strtolower($_SERVER['HTTPS']) !== 'off') {
-            $k_path_url = 'https://';
-        } else {
-            $k_path_url = 'http://';
-        }
-        $k_path_url .= $_SERVER['HTTP_HOST'];
-        $k_path_url .= str_replace('\\', '/', substr(K_PATH_MAIN, (strlen($_SERVER['DOCUMENT_ROOT']) - 1)));
-    }
-
-    /**
-     * URL path to tcpdf installation folder (http://localhost/tcpdf/).
-     * By default it is automatically calculated but you can also set it as a fixed string to improve performances.
-     */
-    define('K_PATH_URL', $k_path_url);
-
-    /**
-     * path for PDF fonts
-     * use K_PATH_MAIN.'fonts/old/' for old non-UTF8 fonts
-     */
-    define('K_PATH_FONTS', K_PATH_MAIN.'fonts/');
-
-    /**
-     * cache directory for temporary files (url path)
-     */
-    define('K_PATH_URL_CACHE', K_PATH_URL.'cache/');
-
-    /**
-     *images directory
-     */
-    define('K_PATH_IMAGES', K_PATH_MAIN.'images/');
-
-    /**
-     * blank image
-     */
-    define('K_BLANK_IMAGE', K_PATH_IMAGES.'_blank.png');
-
-    /**
-     * page format
-     */
-    define('PDF_PAGE_FORMAT', 'A4');
-
-    /**
-     * page orientation (P=portrait, L=landscape)
-     */
-    define('PDF_PAGE_ORIENTATION', 'P');
-
-    /**
-     * document creator
-     */
-    define('PDF_CREATOR', 'Html2Pdf - TCPDF');
-
-    /**
-     * document author
-     */
-    define('PDF_AUTHOR', 'Html2Pdf - TCPDF');
-
-    /**
-     * header title
-     */
-    define('PDF_HEADER_TITLE', null);
-
-    /**
-     * header description string
-     */
-    define('PDF_HEADER_STRING', null);
-
-    /**
-     * image logo
-     */
-    define('PDF_HEADER_LOGO', null);
-
-    /**
-     * header logo image width [mm]
-     */
-    define('PDF_HEADER_LOGO_WIDTH', null);
-
-    /**
-     *  document unit of measure [pt=point, mm=millimeter, cm=centimeter, in=inch]
-     */
-    define('PDF_UNIT', 'mm');
-
-    /**
-     * header margin
-     */
-    define('PDF_MARGIN_HEADER', 0);
-
-    /**
-     * footer margin
-     */
-    define('PDF_MARGIN_FOOTER', 0);
-
-    /**
-     * top margin
-     */
-    define('PDF_MARGIN_TOP', 0);
-
-    /**
-     * bottom margin
-     */
-    define('PDF_MARGIN_BOTTOM', 0);
-
-    /**
-     * left margin
-     */
-    define('PDF_MARGIN_LEFT', 0);
-
-    /**
-     * right margin
-     */
-    define('PDF_MARGIN_RIGHT', 0);
-
-    /**
-     * default main font name
-     */
-    define('PDF_FONT_NAME_MAIN', 'helvetica');
-
-    /**
-     * default main font size
-     */
-    define('PDF_FONT_SIZE_MAIN', 10);
-
-    /**
-     * default data font name
-     */
-    define('PDF_FONT_NAME_DATA', 'helvetica');
-
-    /**
-     * default data font size
-     */
-    define('PDF_FONT_SIZE_DATA', 8);
-
-    /**
-     * default monospaced font name
-     */
-    define('PDF_FONT_MONOSPACED', 'courier');
-
-    /**
-     * ratio used to adjust the conversion of pixels to user units
-     */
-    define('PDF_IMAGE_SCALE_RATIO', 1);
-
-    /**
-     * magnification factor for titles
-     */
-    define('HEAD_MAGNIFICATION', 1);
-
-    /**
-     * height of cell respect font height
-     */
-    define('K_CELL_HEIGHT_RATIO', 1);
-
-    /**
-     * title magnification respect main font size
-     */
-    define('K_TITLE_MAGNIFICATION', 1);
-
-    /**
-     * reduction factor for small font
-     */
-    define('K_SMALL_RATIO', 2/3);
-
-    /**
-     * set to true to enable the special procedure used to avoid the overlappind of symbols on Thai language
-     */
-    define('K_THAI_TOPCHARS', true);
-
-    /**
-     * if true allows to call TCPDF methods using HTML syntax
-     * IMPORTANT: For security reason, disable this feature if you are printing user HTML content.
-     */
-    define('K_TCPDF_CALLS_IN_HTML', false);
-
-    /**
-     * if true and PHP version is greater than 5, then the Error() method throw new exception instead of terminating the execution.
-     */
-    define('K_TCPDF_THROW_EXCEPTION_ERROR', true);
-}
-
-//============================================================+
-// END OF FILE
-//============================================================+
diff --git a/html2pdf-master/src/locale/ca.csv b/html2pdf-master/src/locale/ca.csv
deleted file mode 100644
index 80e88eb6..00000000
--- a/html2pdf-master/src/locale/ca.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-"pdf01","Document generat el [[date_d]]/[[date_m]]/[[date_y]]"
-"pdf02","Document generat a les [[date_h]]:[[date_i]]"
-"pdf03","Document generat el [[date_d]]/[[date_m]]/[[date_y]] a les [[date_h]]:[[date_i]]"
-"pdf04","Pàgina [[page_cu]]/[[page_nb]]"
-"pdf05","Els formularis requereixen l'ús de l'Adobe Reader 9"
diff --git a/html2pdf-master/src/locale/cn.csv b/html2pdf-master/src/locale/cn.csv
deleted file mode 100644
index cdd1c20c..00000000
--- a/html2pdf-master/src/locale/cn.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-pdf01,文稿生成日期 [[date_y]]-[[date_m]]-[[date_d]]
-pdf02,文稿生成时间 [[date_h]]:[[date_i]]
-pdf03,文稿生成于 [[date_y]]-[[date_m]]-[[date_d]] at [[date_h]]:[[date_i]]
-pdf04,页 [[page_cu]]/[[page_nb]]
-pdf05,表单需要使用 Adobe Reader 9
diff --git a/html2pdf-master/src/locale/cs.csv b/html2pdf-master/src/locale/cs.csv
deleted file mode 100644
index 4a6090e7..00000000
--- a/html2pdf-master/src/locale/cs.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-"pdf01","Dokument vytvořen dne [[date_d]].[[date_m]].[[date_y]]"
-"pdf02","Dokument vytvořen v [[date_h]]:[[date_i]]"
-"pdf03","Dokument vytvořen dne [[date_d]].[[date_m]].[[date_y]] v [[date_h]]:[[date_i]]"
-"pdf04","Stránka [[page_cu]]/[[page_nb]]"
-"pdf05","Formuláře vyžadují Adobe Reader 9"
diff --git a/html2pdf-master/src/locale/da.csv b/html2pdf-master/src/locale/da.csv
deleted file mode 100644
index 46884ffd..00000000
--- a/html2pdf-master/src/locale/da.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-"pdf01","Siden oprettet d. [[date_y]]-[[date_m]]-[[date_d]]"
-"pdf02","Siden oprettet d. [[date_h]]:[[date_i]]"
-"pdf03","Siden oprettet d. [[date_y]]-[[date_m]]-[[date_d]] at [[date_h]]:[[date_i]]"
-"pdf04","Side [[page_cu]]/[[page_nb]]"
-"pdf05","De formularer kræver brug af Adobe Reader 9"
diff --git a/html2pdf-master/src/locale/de.csv b/html2pdf-master/src/locale/de.csv
deleted file mode 100644
index 61361d27..00000000
--- a/html2pdf-master/src/locale/de.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-"pdf01","Datei erstellt am [[date_d]].[[date_m]].[[date_y]]"
-"pdf02","Datei erstellt um [[date_h]]:[[date_m]]"
-"pdf03","Datei erstellt am [[date_d]].[[date_m]].[[date_y]] um [[date_h]]:[[date_i]]"
-"pdf04","Seite [[page_cu]]/[[page_nb]]"
-"pdf05","Die Formulare in dieser Datei benötigen den Adobe Reader 9"
diff --git a/html2pdf-master/src/locale/en.csv b/html2pdf-master/src/locale/en.csv
deleted file mode 100644
index f1deacb1..00000000
--- a/html2pdf-master/src/locale/en.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-"pdf01","Document generated on [[date_y]]-[[date_m]]-[[date_d]]"
-"pdf02","Document generated at [[date_h]]:[[date_i]]"
-"pdf03","Document generated on [[date_y]]-[[date_m]]-[[date_d]] at [[date_h]]:[[date_i]]"
-"pdf04","Page [[page_cu]]/[[page_nb]]"
-"pdf05","The forms require the use of Adobe Reader 9"
diff --git a/html2pdf-master/src/locale/es.csv b/html2pdf-master/src/locale/es.csv
deleted file mode 100644
index bc8c74f0..00000000
--- a/html2pdf-master/src/locale/es.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-"pdf01","Documento generado el [[date_d]]/[[date_m]]/[[date_y]]"
-"pdf02","Documento generado a las [[date_h]]:[[date_i]]"
-"pdf03","Documento generado el [[date_d]]/[[date_m]]/[[date_y]] a las [[date_h]]:[[date_i]]"
-"pdf04","Página [[page_cu]]/[[page_nb]]"
-"pdf05","Los formularios requieren el uso de Adobe Reader 9"
diff --git a/html2pdf-master/src/locale/fi.csv b/html2pdf-master/src/locale/fi.csv
deleted file mode 100644
index 7d6fcbcc..00000000
--- a/html2pdf-master/src/locale/fi.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-"pdf01","Dokumentti luotu [[date_y]]-[[date_m]]-[[date_d]]"
-"pdf02","Dokumentti luotu [[date_h]]:[[date_i]]"
-"pdf03","Dokumentti luotu [[date_y]]-[[date_m]]-[[date_d]] klo [[date_h]]:[[date_i]]"
-"pdf04","Sivu [[page_cu]]/[[page_nb]]"
-"pdf05","Lomakkeet edellyttävät Adobe Reader 9 käyttöä"
diff --git a/html2pdf-master/src/locale/fr.csv b/html2pdf-master/src/locale/fr.csv
deleted file mode 100644
index 39cfa6f9..00000000
--- a/html2pdf-master/src/locale/fr.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-"pdf01","Document généré le [[date_d]]/[[date_m]]/[[date_y]]"
-"pdf02","Document généré à [[date_h]]:[[date_i]]"
-"pdf03","Document généré le [[date_d]]/[[date_m]]/[[date_y]] à [[date_h]]:[[date_i]]"
-"pdf04","Page [[page_cu]]/[[page_nb]]"
-"pdf05","Les formulaires nécessitent  l'utilisation de Adobe Reader 9"
diff --git a/html2pdf-master/src/locale/it.csv b/html2pdf-master/src/locale/it.csv
deleted file mode 100644
index 7e7df057..00000000
--- a/html2pdf-master/src/locale/it.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-"pdf01","Documento generato il [[date_d]]/[[date_m]]/[[date_y]]"
-"pdf02","Documento generato [[date_h]]:[[date_i]]"
-"pdf03","Documento generato il [[date_d]]/[[date_m]]/[[date_y]] nel [[date_h]]:[[date_i]]"
-"pdf04","Pagina [[page_cu]]/[[page_nb]]"
-"pdf05","I moduli richiedono l'uso di Adobe Reader 9"
diff --git a/html2pdf-master/src/locale/ja.csv b/html2pdf-master/src/locale/ja.csv
deleted file mode 100644
index 8875ff5a..00000000
--- a/html2pdf-master/src/locale/ja.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-"pdf01","[[date_y]]年[[date_m]]月[[date_d]]日に作成された文書"
-"pdf02","[[date_h]]時[[date_i]]分に作成された文書"
-"pdf03","[[date_y]]年[[date_m]]月[[date_d]]日 [[date_h]]時[[date_i]]分に作成された文書"
-"pdf04","[[page_cu]]/[[page_nb]]ページ"
-"pdf05","フォームの利用にはAdobe Reader 9が必要です"
diff --git a/html2pdf-master/src/locale/lt.csv b/html2pdf-master/src/locale/lt.csv
deleted file mode 100644
index 528a5dd5..00000000
--- a/html2pdf-master/src/locale/lt.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-"pdf01","Dokumentas sugeneruotas [[date_y]]-[[date_m]]-[[date_d]]"
-"pdf02","Dokumentas sugeneruotas [[date_h]]:[[date_i]]"
-"pdf03","dokumentas sugeneruotas [[date_y]]-[[date_m]]-[[date_d]] [[date_h]]:[[date_i]]"
-"pdf04","Puslapis [[page_cu]]/[[page_nb]]"
-"pdf05","Formų naudojimui reikalingas Adobe Reader 9"
diff --git a/html2pdf-master/src/locale/nl.csv b/html2pdf-master/src/locale/nl.csv
deleted file mode 100644
index fab2de78..00000000
--- a/html2pdf-master/src/locale/nl.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-"pdf01","Document gemaakt op [[date_d]]-[[date_m]]-[[date_y]]"
-"pdf02","Document gemaakt om [[date_h]]:[[date_i]]"
-"pdf03","Document gemaakt op [[date_d]]-[[date_m]]-[[date_y]] om [[date_h]]:[[date_i]]"
-"pdf04","Pagina [[page_cu]] van [[page_nb]]"
-"pdf05","De formulieren vereisen het gebruik van Adobe Reader 9"
diff --git a/html2pdf-master/src/locale/no.csv b/html2pdf-master/src/locale/no.csv
deleted file mode 100644
index bb71eeda..00000000
--- a/html2pdf-master/src/locale/no.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-"pdf01","Dokument generert [[date_y]]-[[date_m]]-[[date_d]]"
-"pdf02","Dokument generert kl [[date_h]]:[[date_i]]"
-"pdf03","Dokument generert [[date_y]]-[[date_m]]-[[date_d]] kl [[date_h]]:[[date_i]]"
-"pdf04","Side [[page_cu]]/[[page_nb]]"
-"pdf05","Skjemaene krever Adobe Reader 9"
diff --git a/html2pdf-master/src/locale/pl.csv b/html2pdf-master/src/locale/pl.csv
deleted file mode 100644
index a5a68fc8..00000000
--- a/html2pdf-master/src/locale/pl.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-"pdf01","Dokument wygenerowany dnia [[date_y]]-[[date_m]]-[[date_d]]"
-"pdf02","Dokument wygenerowany o [[date_h]]:[[date_i]]"
-"pdf03","Dokument wygenerowany dnia [[date_y]]-[[date_m]]-[[date_d]] o [[date_h]]:[[date_i]]"
-"pdf04","Strona [[page_cu]]/[[page_nb]]"
-"pdf05","Formularze wymagają użycia programu Adobe Reader 9"
\ No newline at end of file
diff --git a/html2pdf-master/src/locale/pt.csv b/html2pdf-master/src/locale/pt.csv
deleted file mode 100644
index a59b87bf..00000000
--- a/html2pdf-master/src/locale/pt.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-"pdf01","Documento gerado em [[date_d]]/[[date_m]]/[[date_y]]"
-"pdf02","Documento gerado às [[date_h]]:[[date_i]]"
-"pdf03","Documento gerado em [[date_d]]/[[date_m]]/[[date_y]] às [[date_h]]:[[date_i]]"
-"pdf04","Página [[page_cu]]/[[page_nb]]"
-"pdf05","Os formulários exigem a utilização do Adobe Reader 9"
diff --git a/html2pdf-master/src/locale/ru.csv b/html2pdf-master/src/locale/ru.csv
deleted file mode 100644
index 95c51066..00000000
--- a/html2pdf-master/src/locale/ru.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-"pdf01","Документ сгенерирован [[date_y]]-[[date_m]]-[[date_d]]"
-"pdf02","Документ сгенерирован в [[date_h]]:[[date_i]]"
-"pdf03","Документ сгенерирован [[date_y]]-[[date_m]]-[[date_d]] в [[date_h]]:[[date_i]]"
-"pdf04","Страница [[page_cu]]/[[page_nb]]"
-"pdf05","Формы требуют использования Adobe Reader 9"
diff --git a/html2pdf-master/src/locale/tr.csv b/html2pdf-master/src/locale/tr.csv
deleted file mode 100644
index 045d2e3d..00000000
--- a/html2pdf-master/src/locale/tr.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-"pdf01","Doküman üretilme tarihi [[date_y]]-[[date_m]]-[[date_d]]"
-"pdf02","Doküman üretilme tarihi [[date_h]]:[[date_i]]"
-"pdf03","Doküman üretilme tarihi [[date_y]]-[[date_m]]-[[date_d]] saati [[date_h]]:[[date_i]]"
-"pdf04","Sayfa [[page_cu]]/[[page_nb]]"
-"pdf05","Adobe Reader 9 gerektirir"
diff --git a/html2pdf-master/test/generate.ps1 b/html2pdf-master/test/generate.ps1
deleted file mode 100644
index 40b0da2b..00000000
--- a/html2pdf-master/test/generate.ps1
+++ /dev/null
@@ -1,26 +0,0 @@
-# Windows PowerShell Script
-$ErrorActionPreference = "Stop"
-
-# Go to current location
-$CURRENT_FOLDER=(Get-Location)
-Set-Location (Split-Path $MyInvocation.Line -Parent)
-
-# Remove the old generated PDF files
-Remove-Item *.pdf
-
-# Go to the examples folder
-Set-Location ../examples
-
-Get-ChildItem ./ -File | ForEach-Object {
-    $PHP_SCRIPT="$_"
-    $PDF_FILE="../test/$_" -replace ".php",".pdf"
-    Write-Output " - $PHP_SCRIPT > $PDF_FILE"
-    php $PHP_SCRIPT > $PDF_FILE
-}
-
-# Go to the test folder to see the result
-Set-Location ../test
-Get-ChildItem
-
-# Restore the current location
-Set-Location $CURRENT_FOLDER
diff --git a/html2pdf-master/test/generate.sh b/html2pdf-master/test/generate.sh
deleted file mode 100644
index 3b21b23c..00000000
--- a/html2pdf-master/test/generate.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-
-cd "$( dirname "${BASH_SOURCE[0]}" )"
-
-rm -f *.pdf
-
-cd ../examples
-for PHP_SCRIPT in $(ls ./*.php);
-do
-    PDF_FILE=`echo "$PHP_SCRIPT" | sed 's/\.php/\.pdf/g' | sed 's/\.\//\.\.\/test\//g'`
-    echo "Example $PHP_SCRIPT => $PDF_FILE"
-    php $PHP_SCRIPT > $PDF_FILE
-done
-
-cd ../test
-ls -l
diff --git a/html2pdf_v4.03/_LGPL.txt b/html2pdf_v4.03/_LGPL.txt
deleted file mode 100644
index 755013bb..00000000
--- a/html2pdf_v4.03/_LGPL.txt
+++ /dev/null
@@ -1,165 +0,0 @@
-           GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-  This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
-  0. Additional Definitions.
-
-  As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
-  "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
-  An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
-  A "Combined Work" is a work produced by combining or linking an
-Application with the Library.  The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
-  The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
-  The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
-  1. Exception to Section 3 of the GNU GPL.
-
-  You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
-  2. Conveying Modified Versions.
-
-  If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
-   a) under this License, provided that you make a good faith effort to
-   ensure that, in the event an Application does not supply the
-   function or data, the facility still operates, and performs
-   whatever part of its purpose remains meaningful, or
-
-   b) under the GNU GPL, with none of the additional permissions of
-   this License applicable to that copy.
-
-  3. Object Code Incorporating Material from Library Header Files.
-
-  The object code form of an Application may incorporate material from
-a header file that is part of the Library.  You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
-   a) Give prominent notice with each copy of the object code that the
-   Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the object code with a copy of the GNU GPL and this license
-   document.
-
-  4. Combined Works.
-
-  You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
-   a) Give prominent notice with each copy of the Combined Work that
-   the Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
-   document.
-
-   c) For a Combined Work that displays copyright notices during
-   execution, include the copyright notice for the Library among
-   these notices, as well as a reference directing the user to the
-   copies of the GNU GPL and this license document.
-
-   d) Do one of the following:
-
-       0) Convey the Minimal Corresponding Source under the terms of this
-       License, and the Corresponding Application Code in a form
-       suitable for, and under terms that permit, the user to
-       recombine or relink the Application with a modified version of
-       the Linked Version to produce a modified Combined Work, in the
-       manner specified by section 6 of the GNU GPL for conveying
-       Corresponding Source.
-
-       1) Use a suitable shared library mechanism for linking with the
-       Library.  A suitable mechanism is one that (a) uses at run time
-       a copy of the Library already present on the user's computer
-       system, and (b) will operate properly with a modified version
-       of the Library that is interface-compatible with the Linked
-       Version.
-
-   e) Provide Installation Information, but only if you would otherwise
-   be required to provide such information under section 6 of the
-   GNU GPL, and only to the extent that such information is
-   necessary to install and execute a modified version of the
-   Combined Work produced by recombining or relinking the
-   Application with a modified version of the Linked Version. (If
-   you use option 4d0, the Installation Information must accompany
-   the Minimal Corresponding Source and Corresponding Application
-   Code. If you use option 4d1, you must provide the Installation
-   Information in the manner specified by section 6 of the GNU GPL
-   for conveying Corresponding Source.)
-
-  5. Combined Libraries.
-
-  You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
-   a) Accompany the combined library with a copy of the same work based
-   on the Library, uncombined with any other library facilities,
-   conveyed under the terms of this License.
-
-   b) Give prominent notice with the combined library that part of it
-   is a work based on the Library, and explaining where to find the
-   accompanying uncombined form of the same work.
-
-  6. Revised Versions of the GNU Lesser General Public License.
-
-  The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
-  Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
-  If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.
diff --git a/html2pdf_v4.03/_changelog.txt b/html2pdf_v4.03/_changelog.txt
deleted file mode 100644
index 2fd3d651..00000000
--- a/html2pdf_v4.03/_changelog.txt
+++ /dev/null
@@ -1,314 +0,0 @@
-4.03 (2011-05-27)
-    correction de l'exemple "form.php" : vulnérabilité cross-site scripting corrigée
-    correction sur la gestion des retours à la ligne automatique
-    correction sur le calcul de la hauteur des balises H1->H6
-    amélioration de la gestion des exceptions
-
-4.02 (2011-04-29)
-    ATTENTION : beaucoup de changements dans la structure du projet. version 3.xx abandonnée
-    uniformisation des fichiers du projet (standard Zend)
-    conversion des fichiers de langue en CSV, déplacement dans le répertoire "locale". création d'une classe spécifique à la gestion des locales
-    amélioration de la gestion de certaines erreurs
-    modification du nom de toutes les sous classes
-    déplacement de toutes les sous classes
-    modification du nom de toutes les méthodes protected
-    correction sur la gestion des tables
-    correction sur la lecture des path des SVG
-    premiere version de text-align:justify
-    correction sur la gestion de la balise BLOCKQUOTE
-    correction sur la gestion de la balise P
-    gestion des styles CSS pour les balises TEXTAREA, SELECT, INPUT
-    ajout de la propriété pagegroup="new" sur la balise PAGE
-    correction pour la balise INPUT de type radio : checked au lieu de selected
-
-3.30 / 4.01 (2010-05-07)
-    correction sur la gestion des textes
-    correction sur le parseur HTML
-    correction sur la gestion de border-collapse
-    correction sur la gestion des TDs, H1->H6
-    ajout des balises fieldset et legend (cf exemple 4)
-    ajout de la langue CS
-    nombreuses améliorations
-    v4.01 uniquement : Utilisation de TCPDF 5.0.002
-    v4.01 uniquement : Utilisation des QR-code de TCPDF, il n'y a plus besoin d'une librairie externe
-    v4.01 uniquement : Utilisation des exceptions PHP pour les erreurs. Tous les exemples ont été mis à jour en consequence
-    (merci à Pavel Kochman pour ses sugestions et ses ajouts)
-
-3.29 / 4.00 (2010-03-17)
-    modification des barcodes. ATTENTION : bar_w et bar_h n'existent plus !
-    correction sur la gestion de page_footer
-    correction sur la gestion des html entities
-    correction sur le positionnement des textes
-    correction sur le positionnement des tableaux
-    nombreuses corrections sur les positionnements, les couleurs, ...
-    amélioration de la partie SVG (balise G, ...)
-    amélioration sur createIndex
-    harmonisation des noms des méthodes
-    correction sur la gestion des textes
-    v4.00 uniquement : HTML2PDF est maintenant écrit en PHP5 et basé sur TCPDF (=> unicode, utf8, ...)
-    v4.00 uniquement : utilisation de TCPDF pour les formulaires et les barcodes
-    v4.00 uniquement : amélioration de la partie SVG (alpha)
-
-3.28 (2010-01-18)
-    ajout de la gestion de la balise label
-    correction pour compatibilité PHP4
-
-3.27 (2010-01-11)
-    correction sur page_header et page_footer
-    ajout de la possibilité de pouvoir mettre l'index automatique dans la page que l'on veut
-    correction sur la gestion du canal alpha pour les PNGs
-    correction sur la gestion des border-radius (cf exemple radius) conforme au CSS3
-    correction sur la gestion du background-color
-    correction sur la gestion de thead, tfoot, et tbody
-    ajout du dessin verctoriel (cf exemples draw, tigre, sapin)
-    ajout de la propriété label="none/label" pour la balise <barcode>
-    nombreux petits correctifs
-
-3.26 (2009-11-16)
-    correction pour support des images générés en CGI
-    ajout de la gestion du canal alpha pour les PNGs (nécessite GD2)
-    ajout de la méthode setDefaultFont permettant de spécifier une fonte par défaut
-    ajout de la propriété format pour la balise <page> (cf exemple 4)
-    amélioration de la gestion des couleurs css RGB (cf exemple 2)
-    ajout de la gestion des couleurs css CMYK (cf exemple 2)
-    ajout de la propriété css overflow:hidden pour la balise <div> (cf exemple 2)
-    correction sur page_header et page_footer
-    ajout de la possibilité de pouvoir directement convertir le résultat d'une vraie page HTML
-    nombreux petits correctifs sur les styles
-
-3.25 (2009-10-07)
-    correctif sur le calcul des tableaux dans le page_footer
-    correctif sur l'interprétation des espaces entre certaines balises
-    correction sur la gestion des balises H1, H2, H3, H4, H5, H6
-    correction sur la gestion de la balise table
-    support des balises xhtml du type <span />
-    ajout des balises COL (cf exemple 5), DEL, INS, et QRCODE (cf exemple 13)
-    ajout de la propriété css text-transform
-    ajout de la propriété css rotate (uniquement sur les DIV, cf exemple 8)
-    ne plus rendre obligatoire l'existence d'une image (nouvelle méthode setTestIsImage)
-    ajout d'un mode DEBUG - les anciennes fonction d'analyse des ressources ont été supprimées
-    ajout de la méthode setEncoding
-    ajout de la langue danoise DA (merci à Daniel K.)
-
-3.24 (2009-08-05)
-    correction sur le calcul de la largeur des divs
-    modification pour compatibilité avec la localisation PHP
-    modification pour compatibilité avec PHP 5.3.0
-
-3.23 (2009-07-30)
-    correction sur le calcul des DIVs
-    correction sur l'interpretation de certains styles CSS
-    correction de la fonction de creation d'index automatique CreateIndex
-    ATTENTION : la methode d'appel de CreateIndex a changé. Regardez l'exemple About !!!!
-
-3.22a (2009-06-16)
-    redistribution de HTML2PDF sous la licence LGPL !!! (au lieu de GPL)
-
-3.22 (2009-06-08)
-    correction sur le background-color
-    refonte totale de la gestion de text-align. les valeurs center et right marchent maintenant meme en cas de contenu riche
-
-3.21 (2009-05-05)
-    ajout de la propriété css FLOAT pour la balise IMG
-    correction sur la gestion des TFOOT
-    correction sur le positionnement des images
-
-3.20 (2009-04-06)
-    ajout de la gestion des margins pour la balise DIV
-    ajout de la gestion de la propriete css LINE-HEIGHT
-    correction sur l'interpretation de la valeur de certains styles CSS (background-image, background-position, ...)
-    correction sur la reconnaissance des balises thead et tfoot
-    correction sur la balise select
-    correction sur les fichiers de langue (merci à Sinan)
-
-3.19 (2009-03-11)
-    optimisation du parseur HTML - merci à Jezelinside
-    ajout de la balise TFOOT
-    amélioration de la gestion des tableaux : les contenus des balises THEAD et TFOOT sont maintenant répétés sur chaque page.
-    ajout de la balise spécifique BOOKMARK afin de créer des "marques-page"
-    possibilité de rajouter un index automatique en fin de fichier
-    ajout de la langue turque TR (merci à Hidayet)
-    amélioration de la méthode Output. Elle est maintenant également utilisable comme celle de FPDF
-
-3.18 (2009-02-22)
-    correction sur les sauts de page automatique pour les balises TABLE, UL, OL
-    correction sur l'interpretation des styles pour la balise HR
-    correction sur l'interpretation du style border-collapse pour la balise TABLE
-    prise en compte de margin:auto pour les tables et les divs
-    les commentaires dans les CSS sont acceptés
-
-3.17 (2008-12-30)
-    ajout de la gestion des balises INPUT (text, radio, checkbox, button, hidden, ...), SELECT, OPTION, TEXTAREA (cf exemple 14)
-    ajout de la possibilité de mettre des scripts dans le pdf, via $html2pdf->pdf->IncludeJS(...); (cf exemples JS)
-    correction sur le saut de page automatique pour les images
-    correction sur les sauts de lignes automatiques pour certaines balises (UL, P, ...)
-    ajout de la langue NL (merci à Roland)
-
-3.16 (2008-12-09)
-    ajout de la gestion de list-style: none (cf exemple 13)
-    correction dans la gestion des fontes ajoutées à fpdf (via la méthode AddFont)
-    nombreuses corrections sur le calcul des largeurs des éléments table, div, hr, td, th
-    ajout de l'exemple about.php
-    (pour info, les PDF générés à partir des exemples sont maintenant dans le répertoire /exemples/pdf/, et sont supprimables)
-
-3.15 (2008-12-01)
-    correction sur l'identification des styles en cas de valeurs multiples dans la propriete class
-    prise en compte de border-radius pour la limite des backgrounds (color et image)
-    ajout des proprietes CSS border-top-*, border-right-*, border-bottom-*, border-left-*
-    ajout de la propriété CSS list-style-image (cf exemple 12)
-    pour la balise table, ajout de l'interprétation de align="center" et align="right" (cf exemple 1)
-    correction dans le positionnement des images
-    correction de quelques bugs
-    ajout d'une fonction d'analyse des ressources HTML2PDFgetTimerDebug (cf début du fichier html2pdf.class.php)
-
-3.14 (2008-11-17)
-    ajout d'une langue (pt : Brazilian Portuguese language) et amelioration de la methode vueHTML (merci à Rodrigo)
-    correction du positionnement du contenu des DIVs. gestion des proprietes valign et align
-    ajout de la propriete CSS border-collapse (cf exemple 0)
-    ajout de la propriete CSS border-radius (cf exemple 1)
-    correction de quelques bugs
-
-3.13 (2008-09-24)
-    reecriture de la balise hr, avec prise en compte des styles (cf exemple 0)
-    ajout de la propriete backcolor pour la balise page (cf exemple 9)
-    ajout des proprietes backleft et backright pour la balise page afin de pouvoir changer les marges des pages (cf exemple 8)
-    nombreuses corrections sur les balises et les styles
-
-3.12 (2008-09-16)
-    ajout des balises ol, ul, li (cf exemple 12)
-    correction sur le calcul de la taille des td en cas de colspan et rowspan
-    ajout de la méthode setTestTdInOnePage afin de pouvoir desactiver le test sur la taille des TD (cf exemple 11)
-    correction de quelques bugs
-
-3.11 (2008-08-29)
-    ajout des balises div, p, pre, s
-    gestion des styles CSS position (relative, absolute), left, top, right, bottom (cf exemple 10)
-    meilleur gestion des border : border-style, border-color, border-width (cf exemple 10)
-    possibilité d'indiquer les marges par défault, via le constructeur (cf exemple 2)
-
-3.10a (2008-08-26)
-    correction pour compatibilité php4 / php5
-
-3.10 (2008-08-25)
-    ajout des liens internes (cf exemple 7)
-    gestion complete des background : image, repeat, position, color (cf exemple 1)
-    gestion de underline, overline, linethrough (cf exemple 2)
-    correction de quelques bugs
-
-3.09
-    mise à jour vers fpdf version 1.6, ajout de barcode, correction de l'affichage de certains caractères spéciaux
-    correction du calcul de la hauteur de ligne de la balise br
-    detection en cas de contenu trop grand dans un TD
-    amélioration de la balise page (ajout de l'attribue pageset, avec les valeurs new et old)
-    ajout de FPDF_PROTECTION, accesible via $pdf->pdf->SetProtection(...)
-
-3.08
-    version opérationnelle de page_header
-    ajout de page_footer
-    correction des borders des tableaux
-
-3.07
-    correction de l'interpretation de cellspacing,
-    amélioration de la balise page_header
-
-3.06
-    première gestion de la balise page_header
-    correction des dimensions des tableaux
-
-3.05
-    ajout de la propriété vertical-align
-    ajout de la gestion des fichiers de langue
-
-3.04
-    correction du saut de page automatique pour les tableaux
-    Ajout de propriétés à la balise PAGE
-
-3.03
-    correction de bugs au niveau de la gestion des images PHP par FPDF
-    meilleure gestion des erreurs
-
-3.02
-    ajout de la gestion des noms des couleurs
-    correction de la gestion des images générées par php
-    correction de quelques bugs
-
-3.01
-    correction de quelques bugs
-    ajout d'une protection pour les balises non existantes
-
-3.00
-    refonte totale du calcul des tableaux
-    Prise en compte des colspan et rowspan
-    
-2.85
-    ajout de la propriété cellspacing
-    nouvelle gestion des padding des tableaux
-
-2.80
-    ajout des types de border dotted et dasheds
-
-2.75
-    ajout des top, left, right, bottom pour padding et border
-
-2.70
-    correction de la balise HR, ajout de la propriété padding pour les table, th, td
-    correction des dimensions, les unités px, mm, in, pt sont enfin réellement reproduites, correction de font-size, border, ...
-    ajout d'une propriété à la balise page : footer
-    correction dans l'affichage et le calcul des tables
-
-2.55
-    vérification de la validité du code (ouverture / fermeture)
-    ajout des unités mm, in, pt
-
-2.50
-    correction de nobreak
-    correction des marges
-    ajout de nombreuses balises
-
-2.40
-    refonte totale de l'identification des styles CSS (Les héritages marchent)
-
-2.39
-    corrections diverses
-    ajout de certaines propriétés (bgcolor, ...)
-
-2.38
-    meilleur identification des propriétés border et color
-
-2.37
-    nombreuses corrections :
-        balise A
-        couleur de fond
-        retour à la ligne
-        gestion des images dans un texte
-
-2.36
-    ajout de la balises STRONG
-    ajout de la balise EM
-
-2.35
-    amélioration de la gestion des feuilles de style
-
-2.31
-    correction de quelques bugs
-
-2.30
-    première version opérationnel des feuilles de style
-
-2.25
-    ajout de la balise LINK pour le type text/css
-
-2.20
-    premier jet de la gestion des feuilles de style, ajout de la balise STYLE
-
-2.15
-    n'interpréte plus l'HTML en commentaire <!-- -->
-
-2.10
-    ajout des balises H1 -> H6
-
-2.01
-    correction de quelques bugs
-
-2.00
-    première version diffusée
\ No newline at end of file
diff --git a/html2pdf_v4.03/_class/exception.class.php b/html2pdf_v4.03/_class/exception.class.php
deleted file mode 100644
index a1676ac6..00000000
--- a/html2pdf_v4.03/_class/exception.class.php
+++ /dev/null
@@ -1,168 +0,0 @@
-<?php
-/**
- * HTML2PDF Librairy - HTML2PDF Exception
- *
- * HTML => PDF convertor
- * distributed under the LGPL License
- *
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @version   4.03
- */
-
-class HTML2PDF_exception extends exception
-{
-    protected $_tag = null;
-    protected $_html = null;
-    protected $_other = null;
-    protected $_image = null;
-    protected $_messageHtml = '';
-
-    /**
-     * generate a HTML2PDF exception
-     *
-     * @param    int     $err error number
-     * @param    mixed   $other additionnal informations
-     * @return   string  $html optionnal code HTML associated to the error
-     */
-    final public function __construct($err = 0, $other = null, $html = '')
-    {
-        // read the error
-        switch($err)
-        {
-            case 1: // Unsupported tag
-                $msg = (HTML2PDF_locale::get('err01'));
-                $msg = str_replace('[[OTHER]]', $other, $msg);
-                $this->_tag = $other;
-                break;
-
-            case 2: // too long sentence
-                $msg = (HTML2PDF_locale::get('err02'));
-                $msg = str_replace('[[OTHER_0]]', $other[0], $msg);
-                $msg = str_replace('[[OTHER_1]]', $other[1], $msg);
-                $msg = str_replace('[[OTHER_2]]', $other[2], $msg);
-                break;
-
-            case 3: // closing tag in excess
-                $msg = (HTML2PDF_locale::get('err03'));
-                $msg = str_replace('[[OTHER]]', $other, $msg);
-                $this->_tag = $other;
-                break;
-
-            case 4: // tags closed in the wrong order
-                $msg = (HTML2PDF_locale::get('err04'));
-                $msg = str_replace('[[OTHER]]', print_r($other, true), $msg);
-                break;
-
-            case 5: // unclosed tag
-                $msg = (HTML2PDF_locale::get('err05'));
-                $msg = str_replace('[[OTHER]]', print_r($other, true), $msg);
-                break;
-
-            case 6: // image can not be loaded
-                $msg = (HTML2PDF_locale::get('err06'));
-                $msg = str_replace('[[OTHER]]', $other, $msg);
-                $this->_image = $other;
-                break;
-
-            case 7: // too big TD content
-                $msg = (HTML2PDF_locale::get('err07'));
-                break;
-
-            case 8: // SVG tag not in DRAW tag
-                $msg = (HTML2PDF_locale::get('err08'));
-                $msg = str_replace('[[OTHER]]', $other, $msg);
-                $this->_tag = $other;
-                break;
-
-            case 9: // deprecated
-                $msg = (HTML2PDF_locale::get('err09'));
-                $msg = str_replace('[[OTHER_0]]', $other[0], $msg);
-                $msg = str_replace('[[OTHER_1]]', $other[1], $msg);
-                $this->_tag = $other[0];
-                break;
-
-            case 0: // specific error
-            default:
-                $msg = $other;
-                break;
-        }
-
-        // create the HTML message
-        $this->_messageHtml = '<span style="color: #AA0000; font-weight: bold;">'.HTML2PDF_locale::get('txt01', 'error: ').$err.'</span><br>';
-        $this->_messageHtml.= HTML2PDF_locale::get('txt02', 'file:').' '.$this->file.'<br>';
-        $this->_messageHtml.= HTML2PDF_locale::get('txt03', 'line:').' '.$this->line.'<br>';
-        $this->_messageHtml.= '<br>';
-        $this->_messageHtml.= $msg;
-
-        // create the text message
-        $msg = HTML2PDF_locale::get('txt01', 'error: ').$err.' : '.strip_tags($msg);
-
-        // add the optionnal html content
-        if ($html) {
-            $this->_messageHtml.= "<br><br>HTML : ...".trim(htmlentities($html)).'...';
-            $this->_html = $html;
-            $msg.= ' HTML : ...'.trim($html).'...';
-        }
-
-        // save the other informations
-        $this->_other = $other;
-
-        // construct the exception
-        parent::__construct($msg, $err);
-    }
-
-    /**
-     * get the message as string
-     *
-     * @access public
-     * @return string $messageHtml
-     */
-    public function __toString()
-    {
-        return $this->_messageHtml;
-    }
-
-    /**
-     * get the html tag name
-     *
-     * @access public
-     * @return string $tagName
-     */
-    public function getTAG()
-    {
-        return $this->_tag;
-    }
-
-    /**
-     * get the optional html code
-     *
-     * @access public
-     * @return string $html
-     */
-    public function getHTML()
-    {
-        return $this->_html;
-    }
-
-    /**
-     * get the optional other informations
-     *
-     * @access public
-     * @return mixed $other
-     */
-    public function getOTHER()
-    {
-        return $this->_other;
-    }
-
-    /**
-     * get the image source
-     *
-     * @access public
-     * @return string $imageSrc
-     */
-    public function getIMAGE()
-    {
-        return $this->_image;
-    }
-}
\ No newline at end of file
diff --git a/html2pdf_v4.03/_class/locale.class.php b/html2pdf_v4.03/_class/locale.class.php
deleted file mode 100644
index 345343bb..00000000
--- a/html2pdf_v4.03/_class/locale.class.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-/**
- * HTML2PDF Librairy - HTML2PDF Locale
- *
- * HTML => PDF convertor
- * distributed under the LGPL License
- *
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @version   4.03
- */
-
-class HTML2PDF_locale
-{
-    /**
-     * code of the current used locale
-     * @var string
-     */
-    static protected $_code = null;
-
-    /**
-     * texts of the current used locale
-     * @var array
-     */
-    static protected $_list = array();
-
-    /**
-     * directory where locale files are
-     * @var string
-     */
-    static protected $_directory = null;
-
-    /**
-     * load the locale
-     *
-     * @access public
-     * @param  string $code
-     */
-    static public function load($code)
-    {
-        if (self::$_directory===null) {
-            self::$_directory = dirname(dirname(__FILE__)).'/locale/';
-        }
-
-        // must be in lower case
-        $code = strtolower($code);
-
-        // must be [a-z-0-9]
-        if (!preg_match('/^([a-z0-9]+)$/isU', $code)) {
-            throw new HTML2PDF_exception(0, 'invalid language code ['.self::$_code.']');
-        }
-
-        // save the code
-        self::$_code = $code;
-
-        // get the name of the locale file
-        $file = self::$_directory.self::$_code.'.csv';
-
-        // the file must exist
-        if (!is_file($file)) {
-            throw new HTML2PDF_exception(0, 'language code ['.self::$_code.'] unknown. You can create the translation file ['.$file.'] and send it to the webmaster of html2pdf in order to integrate it into a future release');
-        }
-
-        // load the file
-        self::$_list = array();
-        $handle = fopen($file, 'r');
-        while (!feof($handle)) {
-            $line = fgetcsv($handle);
-            if (count($line)!=2) continue;
-            self::$_list[trim($line[0])] = trim($line[1]);
-        }
-        fclose($handle);
-    }
-
-    /**
-     * clean the locale
-     *
-     * @access public static
-     */
-    static public function clean()
-    {
-        self::$_code = null;
-        self::$_list = array();
-    }
-
-    /**
-     * get a text
-     *
-     * @access public static
-     * @param  string $key
-     * @return string
-     */
-    static public function get($key, $default='######')
-    {
-        return (isset(self::$_list[$key]) ? self::$_list[$key] : $default);
-    }
-}
\ No newline at end of file
diff --git a/html2pdf_v4.03/_class/myPdf.class.php b/html2pdf_v4.03/_class/myPdf.class.php
deleted file mode 100644
index 19628bff..00000000
--- a/html2pdf_v4.03/_class/myPdf.class.php
+++ /dev/null
@@ -1,1415 +0,0 @@
-<?php
-/**
- * HTML2PDF Librairy - myPdf class
- *
- * HTML => PDF convertor
- * distributed under the LGPL License
- *
- * @author    Laurent MINGUET <webmaster@html2pdf.fr>
- * @version   4.03
- */
-
-require_once(dirname(__FILE__).'/tcpdfConfig.php');
-require_once(dirname(__FILE__).'/../_tcpdf_'.HTML2PDF_USED_TCPDF_VERSION.'/tcpdf.php');
-
-class HTML2PDF_myPdf extends TCPDF
-{
-    protected $_footerParam = array();
-    protected $_transf      = array();
-    protected $_myLastPageGroup = null;
-    protected $_myLastPageGroupNb = 0;
-
-    // used to make a radius with bezier : (4/3 * (sqrt(2) - 1))
-    const MY_ARC = 0.5522847498;
-
-    // nb of segment to build a arc with bezier curv
-    const ARC_NB_SEGMENT = 8;
-
-    /**
-     * class constructor
-     *
-     * @param string  $orientation page orientation, same as TCPDF
-     * @param string  $unit        User measure unit, same as TCPDF
-     * @param mixed   $format      The format used for pages, same as TCPDF
-     * @param boolean $unicode     TRUE means that the input text is unicode (default = true)
-     * @param String  $encoding    charset encoding; default is UTF-8
-     * @param boolean $diskcache   if TRUE reduce the RAM memory usage by caching temporary data on filesystem (slower).
-     * @access public
-     */
-    public function __construct(
-        $orientation='P',
-        $unit='mm',
-        $format='A4',
-        $unicode=true,
-        $encoding='UTF-8',
-        $diskcache=false)
-    {
-        // call the parent constructor
-        parent::__construct($orientation, $unit, $format, $unicode, $encoding, $diskcache);
-
-        // init the specific parameters used by HTML2PDF
-        $this->SetCreator(PDF_CREATOR);
-        $this->SetAutoPageBreak(false, 0);
-        $this->linestyleCap = '2 J';
-        $this->setPrintHeader(false);
-        $this->jpeg_quality = 90;
-
-        // prepare the automatic footer
-        $this->SetMyFooter();
-
-        $this->cMargin = 0;
-    }
-
-    /**
-     * Set the parameters for the automatic footer
-     *
-     * @param boolean $page display the page number
-     * @param boolean $date display the date
-     * @param boolean $hour display the hour
-     * @param boolean $form display a warning abour forms
-     * @access public
-     */
-    public function SetMyFooter($page = false, $date = false, $hour = false, $form = false)
-    {
-        $page    = ($page ? true : false);
-        $date    = ($date ? true : false);
-        $hour    = ($hour ? true : false);
-        $form    = ($form ? true : false);
-
-        $this->_footerParam = array('page' => $page, 'date' => $date, 'hour' => $hour, 'form' => $form);
-    }
-
-    /**
-     * This function is call automatically by TCPDF at the end of a page
-     * It takes no parameters
-     *
-     * @access public
-     */
-    public function Footer()
-    {
-        // prepare the text from the tranlated text
-        $txt = '';
-        if ($this->_footerParam['form']) {
-            $txt = (HTML2PDF_locale::get('pdf05'));
-        }
-        if ($this->_footerParam['date'] && $this->_footerParam['hour']) {
-            $txt.= ($txt ? ' - ' : '').(HTML2PDF_locale::get('pdf03'));
-        }
-        if ($this->_footerParam['date'] && !$this->_footerParam['hour']) {
-            $txt.= ($txt ? ' - ' : '').(HTML2PDF_locale::get('pdf01'));
-        }
-        if (!$this->_footerParam['date'] && $this->_footerParam['hour']) {
-            $txt.= ($txt ? ' - ' : '').(HTML2PDF_locale::get('pdf02'));
-        }
-        if ($this->_footerParam['page']) {
-            $txt.= ($txt ? ' - ' : '').(HTML2PDF_locale::get('pdf04'));
-        }
-
-        if (strlen($txt)>0) {
-            // replace some values
-            $toReplace = array(
-                '[[date_d]]'  => date('d'),
-                '[[date_m]]'  => date('m'),
-                '[[date_y]]'  => date('Y'),
-                '[[date_h]]'  => date('H'),
-                '[[date_i]]'  => date('i'),
-                '[[date_s]]'  => date('s'),
-                '[[page_cu]]' => $this->getMyNumPage(),
-                '[[page_nb]]' => $this->getMyAliasNbPages(),
-            );
-            $txt = str_replace(array_keys($toReplace), array_values($toReplace), $txt);
-
-            // draw the footer
-            parent::SetY(-11);
-            $this->SetFont('helvetica', 'I', 8);
-            $this->Cell(0, 10, $txt, 0, 0, 'R');
-        }
-    }
-
-     /**
-     * after cloning a object, we does not want to clone all the front informations
-     * because it take a lot a time and a lot of memory => we use reference
-     *
-     * @param &HTML2PDF_myPdf object
-     * @access public
-     */
-    public function cloneFontFrom(&$pdf)
-    {
-        $this->fonts            = &$pdf->getFonts();
-        $this->FontFiles        = &$pdf->getFontFiles();
-        $this->diffs            = &$pdf->getDiffs();
-        $this->fontlist         = &$pdf->getFontList();
-        $this->numfonts         = &$pdf->getNumFonts();
-        $this->fontkeys         = &$pdf->getFontKeys();
-        $this->font_obj_ids     = &$pdf->getFontObjIds();
-        $this->annotation_fonts = &$pdf->getAnnotFonts();
-    }
-
-    /**
-     * multiple public accessor for some private attributs
-     * used only by cloneFontFrom
-     *
-     * @return &array
-     * @access public
-     */
-    public function &getFonts()
-    {
-        return $this->fonts;
-    }
-    public function &getFontFiles()
-    {
-        return $this->FontFiles;
-    }
-    public function &getDiffs()
-    {
-        return $this->diffs;
-    }
-    public function &getFontList()
-    {
-        return $this->fontlist;
-    }
-    public function &getNumFonts()
-    {
-        return $this->numfonts;
-    }
-    public function &getFontKeys()
-    {
-        return $this->fontkeys;
-    }
-    public function &getFontObjIds()
-    {
-        return $this->font_obj_ids;
-    }
-    public function &getAnnotFonts()
-    {
-        return $this->annotation_fonts;
-    }
-
-    /**
-     * Verify that a Font is already loaded
-     *
-     * @param string Font Key
-     * @return boolean
-     * @access public
-     */
-    public function isLoadedFont($fontKey)
-    {
-        if (isset($this->fonts[$fontKey])) {
-            return true;
-        }
-
-        if (isset($this->CoreFonts[$fontKey])) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Get the Word Spacing
-     *
-     * @access public
-     * @return float word spacing
-     */
-    public function getWordSpacing()
-    {
-        return $this->ws;
-    }
-
-    /**
-     * set the Word Spacing
-     *
-     * @param float word spacing
-     * @access public
-     */
-    public function setWordSpacing($ws=0.)
-    {
-        $this->ws = $ws;
-        $this->_out(sprintf('%.3F Tw', $ws*$this->k));
-    }
-
-    /**
-     * start to use a rectangular Cliping Path with radius corners
-     *
-     * @param float $x (top left corner)
-     * @param float $y (top left corner)
-     * @param float $w (x+w  = botom rigth corner)
-     * @param float $h (y+h = botom rigth corner)
-     * @param array $cornerTL radius of the Top Left corner
-     * @param array $cornerTR radius of the Top Right corner
-     * @param array $cornerBL radius of the Bottom Left corner
-     * @param array $cornerBR radius of the Bottom Right corner
-     * @access public
-     */
-    public function clippingPathStart(
-        $x = null,
-        $y = null,
-        $w = null,
-        $h = null,
-        $cornerTL=null,
-        $cornerTR=null,
-        $cornerBL=null,
-        $cornerBR=null)
-    {
-        // init the path
-        $path = '';
-
-        // if we have the position and the size of the rectangle, we can proceed
-        if ($x!==null && $y!==null && $w!==null && $h!==null) {
-            // the positions of the rectangle's corners
-            $x1 = $x*$this->k;
-            $y1 = ($this->h-$y)*$this->k;
-
-            $x2 = ($x+$w)*$this->k;
-            $y2 = ($this->h-$y)*$this->k;
-
-            $x3 = ($x+$w)*$this->k;
-            $y3 = ($this->h-$y-$h)*$this->k;
-
-            $x4 = $x*$this->k;
-            $y4 = ($this->h-$y-$h)*$this->k;
-
-            // if we have at least one radius corner, then we proceed to a specific path, else it is just a rectangle
-            if ($cornerTL || $cornerTR || $cornerBL || $cornerBR) {
-                // prepare the radius values
-                if ($cornerTL) {
-                    $cornerTL[0] = $cornerTL[0]*$this->k;
-                    $cornerTL[1] =-$cornerTL[1]*$this->k;
-                }
-                if ($cornerTR) {
-                    $cornerTR[0] = $cornerTR[0]*$this->k;
-                    $cornerTR[1] =-$cornerTR[1]*$this->k;
-                }
-                if ($cornerBL) {
-                    $cornerBL[0] = $cornerBL[0]*$this->k;
-                    $cornerBL[1] =-$cornerBL[1]*$this->k;
-                }
-                if ($cornerBR) {
-                    $cornerBR[0] = $cornerBR[0]*$this->k;
-                    $cornerBR[1] =-$cornerBR[1]*$this->k;
-                }
-
-                // if TL radius then specific start else (X1,Y1)
-                if ($cornerTL) {
-                    $path.= sprintf('%.2F %.2F m ', $x1+$cornerTL[0], $y1);
-                } else {
-                    $path.= sprintf('%.2F %.2F m ', $x1, $y1);
-                }
-
-                // if TR radius then line + arc, else line to (X2,Y2)
-                if ($cornerTR) {
-                    $xt1 = ($x2-$cornerTR[0])+$cornerTR[0]*self::MY_ARC;
-                    $yt1 = ($y2+$cornerTR[1])-$cornerTR[1];
-                    $xt2 = ($x2-$cornerTR[0])+$cornerTR[0];
-                    $yt2 = ($y2+$cornerTR[1])-$cornerTR[1]*self::MY_ARC;
-
-                    $path.= sprintf('%.2F %.2F l ', $x2-$cornerTR[0], $y2);
-                    $path.= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $x2, $y2+$cornerTR[1]);
-                } else {
-                    $path.= sprintf('%.2F %.2F l ', $x2, $y2);
-                }
-
-                // if BR radius then line + arc, else line to (X3, Y3)
-                if ($cornerBR) {
-                    $xt1 = ($x3-$cornerBR[0])+$cornerBR[0];
-                    $yt1 = ($y3-$cornerBR[1])+$cornerBR[1]*self::MY_ARC;
-                    $xt2 = ($x3-$cornerBR[0])+$cornerBR[0]*self::MY_ARC;
-                    $yt2 = ($y3-$cornerBR[1])+$cornerBR[1];
-
-                    $path.= sprintf('%.2F %.2F l ', $x3, $y3-$cornerBR[1]);
-                    $path.= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $x3-$cornerBR[0], $y3);
-                } else {
-                    $path.= sprintf('%.2F %.2F l ', $x3, $y3);
-                }
-
-                // if BL radius then line + arc, else line to (X4, Y4)
-                if ($cornerBL) {
-                    $xt1 = ($x4+$cornerBL[0])-$cornerBL[0]*self::MY_ARC;
-                    $yt1 = ($y4-$cornerBL[1])+$cornerBL[1];
-                    $xt2 = ($x4+$cornerBL[0])-$cornerBL[0];
-                    $yt2 = ($y4-$cornerBL[1])+$cornerBL[1]*self::MY_ARC;
-
-                    $path.= sprintf('%.2F %.2F l ', $x4+$cornerBL[0], $y4);
-                    $path.= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $x4, $y4-$cornerBL[1]);
-                } else {
-                    $path.= sprintf('%.2F %.2F l ', $x4, $y4);
-                }
-
-                // if RL radius then line + arc
-                if ($cornerTL) {
-                    $xt1 = ($x1+$cornerTL[0])-$cornerTL[0];
-                    $yt1 = ($y1+$cornerTL[1])-$cornerTL[1]*self::MY_ARC;
-                    $xt2 = ($x1+$cornerTL[0])-$cornerTL[0]*self::MY_ARC;
-                    $yt2 = ($y1+$cornerTL[1])-$cornerTL[1];
-
-                    $path.= sprintf('%.2F %.2F l ', $x1, $y1+$cornerTL[1]);
-                    $path.= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $x1+$cornerTL[0], $y1);
-                }
-            } else {
-                $path.= sprintf('%.2F %.2F m ', $x1, $y1);
-                $path.= sprintf('%.2F %.2F l ', $x2, $y2);
-                $path.= sprintf('%.2F %.2F l ', $x3, $y3);
-                $path.= sprintf('%.2F %.2F l ', $x4, $y4);
-            }
-
-            // close the path
-            $path.= ' h W n';
-        }
-
-        // using the path as a clipping path
-        $this->_out('q '.$path.' ');
-    }
-
-    /**
-     * stop to use the Cliping Path
-     *
-     * @access public
-     */
-    public function clippingPathStop()
-    {
-        $this->_out(' Q');
-    }
-
-    /**
-     * draw a filled corner of a border with a external and a internal radius
-     *         /--------+ ext2
-     *        /         |
-     *       /  /-------+ int2
-     *      /  /
-     *      | /
-     *      | |
-     *      | |
-     * ext1 +-+ int1        + cen
-     *
-     * @param float $ext1X
-     * @param float $ext1Y
-     * @param float $ext2X
-     * @param float $ext2Y
-     * @param float $int1X
-     * @param float $int1Y
-     * @param float $int2X
-     * @param float $int2Y
-     * @param float $cenX
-     * @param float $cenY
-     * @access public
-     */
-    public function drawCurve($ext1X, $ext1Y, $ext2X, $ext2Y, $int1X, $int1Y, $int2X, $int2Y, $cenX, $cenY)
-    {
-        // prepare the coordinates
-        $ext1X = $ext1X*$this->k;
-        $ext2X = $ext2X*$this->k;
-        $int1X = $int1X*$this->k;
-        $int2X = $int2X*$this->k;
-        $cenX  = $cenX*$this->k;
-
-        $ext1Y = ($this->h-$ext1Y)*$this->k;
-        $ext2Y = ($this->h-$ext2Y)*$this->k;
-        $int1Y = ($this->h-$int1Y)*$this->k;
-        $int2Y = ($this->h-$int2Y)*$this->k;
-        $cenY  = ($this->h-$cenY) *$this->k;
-
-        // init the curve
-        $path = '';
-
-        if ($ext1X-$cenX!=0) {
-            $xt1 = $cenX+($ext1X-$cenX);
-            $yt1 = $cenY+($ext2Y-$cenY)*self::MY_ARC;
-            $xt2 = $cenX+($ext1X-$cenX)*self::MY_ARC;
-            $yt2 = $cenY+($ext2Y-$cenY);
-        } else {
-            $xt1 = $cenX+($ext2X-$cenX)*self::MY_ARC;
-            $yt1 = $cenY+($ext1Y-$cenY);
-            $xt2 = $cenX+($ext2X-$cenX);
-            $yt2 = $cenY+($ext1Y-$cenY)*self::MY_ARC;
-        }
-        $path.= sprintf('%.2F %.2F m ', $ext1X, $ext1Y);
-        $path.= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $ext2X, $ext2Y);
-
-        if ($int1X-$cenX!=0) {
-            $xt1 = $cenX+($int1X-$cenX)*self::MY_ARC;
-            $yt1 = $cenY+($int2Y-$cenY);
-            $xt2 = $cenX+($int1X-$cenX);
-            $yt2 = $cenY+($int2Y-$cenY)*self::MY_ARC;
-        } else {
-            $xt1 = $cenX+($int2X-$cenX);
-            $yt1 = $cenY+($int1Y-$cenY)*self::MY_ARC;
-            $xt2 = $cenX+($int2X-$cenX)*self::MY_ARC;
-            $yt2 = $cenY+($int1Y-$cenY);
-        }
-        $path.= sprintf('%.2F %.2F l ', $int2X, $int2Y);
-        $path.= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $int1X, $int1Y);
-
-        // draw the curve
-        $this->_out($path . 'f');
-    }
-
-    /**
-     * draw a filled corner of a border with only a external radius
-     *         /--+ ext2
-     *        /   |
-     *       /    |
-     *      /     |
-     *      |     |
-     *      |     |
-     *      |     |
-     * ext1 +-----+ int      + cen
-     *
-     * @param float $ext1X
-     * @param float $ext1Y
-     * @param float $ext2X
-     * @param float $ext2Y
-     * @param float $intX
-     * @param float $intY
-     * @param float $cenX
-     * @param float $cenY
-     * @access public
-     */
-    public function drawCorner($ext1X, $ext1Y, $ext2X, $ext2Y, $intX, $intY, $cenX, $cenY)
-    {
-        // prepare the coordinates
-        $ext1X = $ext1X*$this->k;
-        $ext2X = $ext2X*$this->k;
-        $intX  = $intX*$this->k;
-        $cenX  = $cenX*$this->k;
-
-        $ext1Y = ($this->h-$ext1Y)*$this->k;
-        $ext2Y = ($this->h-$ext2Y)*$this->k;
-        $intY  = ($this->h-$intY)*$this->k;
-        $cenY  = ($this->h-$cenY)*$this->k;
-
-        // init the curve
-        $path = '';
-
-        if ($ext1X-$cenX!=0) {
-            $xt1 = $cenX+($ext1X-$cenX);
-            $yt1 = $cenY+($ext2Y-$cenY)*self::MY_ARC;
-            $xt2 = $cenX+($ext1X-$cenX)*self::MY_ARC;
-            $yt2 = $cenY+($ext2Y-$cenY);
-        } else {
-            $xt1 = $cenX+($ext2X-$cenX)*self::MY_ARC;
-            $yt1 = $cenY+($ext1Y-$cenY);
-            $xt2 = $cenX+($ext2X-$cenX);
-            $yt2 = $cenY+($ext1Y-$cenY)*self::MY_ARC;
-        }
-        $path.= sprintf('%.2F %.2F m ', $ext1X, $ext1Y);
-        $path.= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $ext2X, $ext2Y);
-        $path.= sprintf('%.2F %.2F l ', $intX, $intY);
-        $path.= sprintf('%.2F %.2F l ', $ext1X, $ext1Y);
-
-        // draw the curve
-        $this->_out($path . 'f');
-    }
-
-    /**
-     * Start a transformation
-     *
-     * @access public
-     */
-    public function startTransform()
-    {
-        $this->_out('q');
-    }
-
-    /**
-     * Stop a transformation
-     *
-     * @access public
-     */
-    public function stopTransform()
-    {
-        $this->_out('Q');
-    }
-
-    /**
-     * add a Translate transformation
-     *
-     * @param float $Tx
-     * @param float $Ty
-     * @access public
-     */
-    public function setTranslate($xT, $yT)
-    {
-        // Matrix for Translate
-        $tm[0]=1;
-        $tm[1]=0;
-        $tm[2]=0;
-        $tm[3]=1;
-        $tm[4]=$xT*$this->k;
-        $tm[5]=-$yT*$this->k;
-
-        // apply the Transform Matric
-        $this->_out(sprintf('%.3F %.3F %.3F %.3F %.3F %.3F cm', $tm[0], $tm[1], $tm[2], $tm[3], $tm[4], $tm[5]));
-    }
-
-    /**
-     * add a Rotate transformation
-     *
-     * @param float $angle
-     * @param float $Cx
-     * @param float $Cy
-     * @access public
-     */
-    public function setRotation($angle, $xC=null, $yC=null)
-    {
-        // if no center, rotate around the current posiition
-        if($xC === null) $xC=$this->x;
-        if($yC === null) $yC=$this->y;
-
-        // prepare the coordinate
-        $yC=($this->h-$yC)*$this->k;
-        $xC*=$this->k;
-
-        // Matrix for Rotate
-        $tm[0]=cos(deg2rad($angle));
-        $tm[1]=sin(deg2rad($angle));
-        $tm[2]=-$tm[1];
-        $tm[3]=$tm[0];
-        $tm[4]=$xC+$tm[1]*$yC-$tm[0]*$xC;
-        $tm[5]=$yC-$tm[0]*$yC-$tm[1]*$xC;
-
-        // apply the Transform Matric
-        $this->_out(sprintf('%.3F %.3F %.3F %.3F %.3F %.3F cm', $tm[0], $tm[1], $tm[2], $tm[3], $tm[4], $tm[5]));
-    }
-
-    /**
-     * we redifine the original SetX method, because we don't want the automatic treatment.
-     * It is HTML2PDF that make the treatment
-     *
-     * @param float   $x
-     * @param boolean $rtloff NOT USED
-     * @access public
-     */
-    public function SetX($x, $rtloff=false)
-    {
-        $this->x=$x;
-    }
-
-    /**
-     * we redifine the original SetY method, because we don't want the automatic treatment.
-     * It is HTML2PDF that make the treatment
-     *
-     * @param float   $y
-     * @param boolean $resetx Reset the X position
-     * @param boolean $rtloff NOT USED
-     * @access public
-     */
-    public function SetY($y, $resetx=true, $rtloff=false)
-    {
-        if ($resetx)
-            $this->x=$this->lMargin;
-
-        $this->y=$y;
-    }
-
-    /**
-     * we redifine the original SetXY method, because we don't want the automatic treatment.
-     * It is HTML2PDF that make the treatment
-     *
-     * @param integer $x
-     * @param integer $y
-     * @param boolean $rtloff NOT USED
-     * @access public
-     */
-    public function SetXY($x, $y, $rtloff=false)
-    {
-        $this->x=$x;
-        $this->y=$y;
-    }
-
-    /**
-     * multiple public accessor because HTML2PDF need to use TCPDF without being a extend of it
-     *
-     * @param  mixed
-     * @return mixed
-     * @access public
-     */
-    public function getK()
-    {
-        return $this->k;
-    }
-    public function getW()
-    {
-        return $this->w;
-    }
-    public function getH()
-    {
-        return $this->h;
-    }
-    public function getlMargin()
-    {
-        return $this->lMargin;
-    }
-    public function getrMargin()
-    {
-        return $this->rMargin;
-    }
-    public function gettMargin()
-    {
-        return $this->tMargin;
-    }
-    public function getbMargin()
-    {
-        return $this->bMargin;
-    }
-    public function setbMargin($v)
-    {
-        $this->bMargin=$v;
-    }
-
-    /**
-     * SVG - Convert a SVG Style in PDF Style
-     *
-     * @param  array  $styles SVG Style
-     * @return string PDF style
-     * @access public
-     */
-    public function svgSetStyle($styles)
-    {
-        // init the PDF style
-        $style = '';
-
-        // Style : fill
-        if ($styles['fill']) {
-            $this->setFillColorArray($styles['fill']);
-            $style.= 'F';
-        }
-
-        // Style : stroke
-        if ($styles['stroke'] && $styles['stroke-width']) {
-            $this->SetDrawColorArray($styles['stroke']);
-            $this->SetLineWidth($styles['stroke-width']);
-            $style.= 'D';
-        }
-
-        // Style : opacity
-        if ($styles['fill-opacity']) {
-            $this->SetAlpha($styles['fill-opacity']);
-        }
-
-        return $style;
-    }
-
-    /**
-     * SVG - make a Rectangle
-     *
-     * @param float $x
-     * @param float $y
-     * @param float $w
-     * @param float $h
-     * @param string $style PDF Style
-     * @access public
-     */
-    public function svgRect($x, $y, $w, $h, $style)
-    {
-        // prepare the 4 corners
-        $x1=$x;
-        $x2=$x+$w;
-        $x3=$x+$w;
-        $x4=$x;
-
-        $y1=$y;
-        $y2=$y;
-        $y3=$y+$h;
-        $y4=$y+$h;
-
-        // get the Closing operator from the PDF Style
-        if($style=='F') $op='f';
-        elseif($style=='FD' || $style=='DF') $op='B';
-        else $op='S';
-
-        // drawing
-        $this->_Point($x1, $y1, true);
-        $this->_Line($x2, $y2, true);
-        $this->_Line($x3, $y3, true);
-        $this->_Line($x4, $y4, true);
-        $this->_Line($x1, $y1, true);
-        $this->_out($op);
-    }
-
-    /**
-     * SVG - make a Line
-     *
-     * @param float $x1
-     * @param float $y1
-     * @param float $x2
-     * @param float $y2
-     * @access public
-     */
-    public function svgLine($x1, $y1, $x2, $y2)
-    {
-        // get the Closing operator
-        $op='S';
-
-        // drawing
-        $this->_Point($x1, $y1, true);
-        $this->_Line($x2, $y2, true);
-        $this->_out($op);
-    }
-
-    /**
-     * SVG - make a Ellipse
-     *
-     * @param float  $x0 x Center
-     * @param float  $y0 y Center
-     * @param float  $rx x radius
-     * @param float  $ry y radius
-     * @param string $style PDF Style
-     * @access public
-     */
-    public function svgEllipse($x0, $y0, $rx, $ry, $style)
-    {
-        // get the Closing operator from the PDF Style
-        if($style=='F') $op='f';
-        elseif($style=='FD' || $style=='DF') $op='B';
-        else $op='S';
-
-        // drawing
-        $this->_Arc($x0, $y0, $rx, $ry, 0, 2*M_PI, true, true, true);
-        $this->_out($op);
-    }
-
-    /**
-     * SVG - make a Advanced Polygone
-     *
-     * @param array  $actions list of actions
-     * @param string $style PDF Style
-     * @access public
-     */
-    public function svgPolygone($actions, $style)
-    {
-        // get the Closing operator from the PDF Style
-        if($style=='F') $op='f';
-        elseif($style=='FD' || $style=='DF') $op='B';
-        else $op='S';
-
-        // To save the First action and the last point
-        $first = array('', 0, 0);
-        $last = array(0, 0, 0, 0);
-
-        foreach ($actions as $action) {
-            switch($action[0])
-            {
-                // Start the Path
-                case 'M':
-                case 'm':
-                    $first = $action;
-                    $x = $action[1]; $y = $action[2]; $xc = $x; $yc = $y;
-                    $this->_Point($x, $y, true);
-                    break;
-
-                // Close the Path
-                case 'Z':
-                case 'z':
-                    $x = $first[1]; $y = $first[2]; $xc = $x; $yc = $y;
-                    $this->_Line($x, $y, true);
-                    break;
-
-                // Make a Line (new point)
-                case 'L':
-                    $x = $action[1]; $y = $action[2]; $xc = $x; $yc = $y;
-                    $this->_Line($x, $y, true);
-                    break;
-
-                // Make a Line (vector from last point)
-                case 'l':
-                    $x = $last[0]+$action[1]; $y = $last[1]+$action[2]; $xc = $x; $yc = $y;
-                    $this->_Line($x, $y, true);
-                    break;
-
-                // Make a Horizontal Line (new point)
-                case 'H':
-                    $x = $action[1]; $y = $last[1]; $xc = $x; $yc = $y;
-                    $this->_Line($x, $y, true);
-                    break;
-
-                // Make a Horisontal Line (vector from last point)
-                case 'h':
-                    $x = $last[0]+$action[1]; $y = $last[1]; $xc = $x; $yc = $y;
-                    $this->_Line($x, $y, true);
-                    break;
-
-                // Make a Vertical Line (new point)
-                case 'V':
-                    $x = $last[0]; $y = $action[1]; $xc = $x; $yc = $y;
-                    $this->_Line($x, $y, true);
-                    break;
-
-                // Make a Vertical Line (vector from last point)
-                case 'v':
-                    $x = $last[0]; $y = $last[1]+$action[1]; $xc = $x; $yc = $y;
-                    $this->_Line($x, $y, true);
-                    break;
-
-                // Make a Arc (new point)
-                case 'A':
-                    $rx = $action[1];   // rx
-                    $ry = $action[2];   // ry
-                    $a = $action[3];    // deviation angle of the axis X
-                    $l = $action[4];    // large-arc-flag
-                    $s = $action[5];    // sweep-flag
-                    $x1 = $last[0];     // begin x
-                    $y1 = $last[1];     // begin y
-                    $x2 = $action[6];   // final x
-                    $y2 = $action[7];   // final y
-
-                    $this->_Arc2($x1, $y1, $x2, $y2, $rx, $ry, $a, $l, $s, true);
-                    $x = $x2; $y = $y2; $xc = $x; $yc = $y;
-                    break;
-
-                // Make a Arc (vector from last point)
-                case 'a':
-                    $rx = $action[1];   // rx
-                    $ry = $action[2];   // ry
-                    $a = $action[3];    // deviation angle of the axis X
-                    $l = $action[4];    // large-arc-flag
-                    $s = $action[5];    // sweep-flag
-                    $x1 = $last[0];     // begin x
-                    $y1 = $last[1];     // begin y
-                    $x2 = $last[0]+$action[6]; // final x
-                    $y2 = $last[1]+$action[7]; // final y
-
-                    $this->_Arc2($x1, $y1, $x2, $y2, $rx, $ry, $a, $l, $s, true);
-                    $x = $x2; $y = $y2; $xc = $x; $yc = $y;
-                    break;
-
-                // Make a Bezier Curve (new point)
-                case 'C':
-                    $x1 = $action[1];
-                    $y1 = $action[2];
-                    $x2 = $action[3];
-                    $y2 = $action[4];
-                    $xf = $action[5];
-                    $yf = $action[6];
-                    $this->_Curve($x1, $y1, $x2, $y2, $xf, $yf, true);
-                    $x = $xf; $y = $yf; $xc = $x2; $yc = $y2;
-                    break;
-
-                // Make a Bezier Curve (vector from last point)
-                case 'c':
-                    $x1 = $last[0]+$action[1];
-                    $y1 = $last[1]+$action[2];
-                    $x2 = $last[0]+$action[3];
-                    $y2 = $last[1]+$action[4];
-                    $xf = $last[0]+$action[5];
-                    $yf = $last[1]+$action[6];
-                    $this->_Curve($x1, $y1, $x2, $y2, $xf, $yf, true);
-                    $x = $xf; $y = $yf; $xc = $x2; $yc = $y2;
-                    break;
-
-                // Unknown Path
-                default:
-                    throw new HTML2PDF_exception(0, 'SVG Path Error : ['.$action[0].'] unkown');
-            }
-
-            // save the last point
-            $last = array($x, $y, $xc, $yc);
-        }
-
-        // finish the path
-        $this->_out($op);
-    }
-
-    /**
-     * SVG - go to a point
-     *
-     * @param float   $x
-     * @param float   $y
-     * @param boolean $trans apply transformation
-     * @access protected
-     */
-    protected function _Point($x, $y, $trans = false)
-    {
-        if ($trans) $this->ptTransform($x, $y);
-
-        $this->_out(sprintf('%.2F %.2F m', $x, $y));
-    }
-
-    /**
-     * SVG - make a line from the last point to (x,y)
-     *
-     * @param float   $x
-     * @param float   $y
-     * @param boolean $trans apply transformation
-     * @access protected
-     */
-    protected function _Line($x, $y, $trans = false)
-    {
-        if ($trans) $this->ptTransform($x, $y);
-
-        $this->_out(sprintf('%.2F %.2F l', $x, $y));
-    }
-
-    /**
-     * SVG - make a bezier curve from the last point to (xf,yf), with the 2 direction points (x1,y1) and (x2,y2)
-     *
-     * @param float $x1
-     * @param float $y1
-     * @param float $x2
-     * @param float $y2
-     * @param float $xf
-     * @param float $yf
-     * @param boolean $trans apply transformation
-     * @access protected
-     */
-    protected function _Curve($x1, $y1, $x2, $y2, $xf, $yf, $trans = false)
-    {
-        if ($trans) {
-            $this->ptTransform($x1, $y1);
-            $this->ptTransform($x2, $y2);
-            $this->ptTransform($xf, $yf);
-        }
-        $this->_out(sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c', $x1, $y1, $x2, $y2, $xf, $yf));
-    }
-
-    /**
-     * SVG - make a arc with Center, Radius, from angleBegin to angleEnd
-     *
-     * @param float $xc
-     * @param float $yc
-     * @param float $rx
-     * @param float $ry
-     * @param float $angleBegin in radians
-     * @param float $angleEng in radians
-     * @param boolean $direction
-     * @param boolean $drawFirst, true => add the first point
-     * @param boolean $trans apply transformation
-     * @access protected
-     */
-    protected function _Arc(
-        $xc,
-        $yc,
-        $rx,
-        $ry,
-        $angleBegin,
-        $angleEnd,
-        $direction = true,
-        $drawFirst = true,
-        $trans=false)
-    {
-        // if we want the no trigo direction : add 2PI to the begin angle, to invert the direction
-        if (!$direction) $angleBegin+= M_PI*2.;
-
-        // cut in segment to convert in berize curv
-        $dt = ($angleEnd - $angleBegin)/self::ARC_NB_SEGMENT;
-        $dtm = $dt/3;
-
-        // center of the arc
-        $x0 = $xc; $y0 = $yc;
-
-        // calculing the first point
-        $t1 = $angleBegin;
-        $a0 = $x0 + ($rx * cos($t1));
-        $b0 = $y0 + ($ry * sin($t1));
-        $c0 = -$rx * sin($t1);
-        $d0 = $ry * cos($t1);
-
-        // if drawFirst => draw the first point
-        if ($drawFirst) $this->_Point($a0, $b0, $trans);
-
-        // foreach segment
-        for ($i = 1; $i <= self::ARC_NB_SEGMENT; $i++) {
-            // calculing the next point
-            $t1 = ($i * $dt)+$angleBegin;
-            $a1 = $x0 + ($rx * cos($t1));
-            $b1 = $y0 + ($ry * sin($t1));
-            $c1 = -$rx * sin($t1);
-            $d1 = $ry * cos($t1);
-
-            // make the bezier curv
-            $this->_Curve(
-                $a0 + ($c0 * $dtm), $b0 + ($d0 * $dtm),
-                $a1 - ($c1 * $dtm), $b1 - ($d1 * $dtm),
-                $a1, $b1,
-                $trans
-            );
-
-            // save the point
-            $a0 = $a1;
-            $b0 = $b1;
-            $c0 = $c1;
-            $d0 = $d1;
-        }
-    }
-
-    /**
-     * SVG - make a arc from Pt1 to Pt2, with Radius
-     *
-     * @param float $x1
-     * @param float $y1
-     * @param float $x2
-     * @param float $y2
-     * @param float $rx
-     * @param float $ry
-     * @param float $angle deviation angle of the axis X
-     * @param boolean $l large-arc-flag
-     * @param boolean $s sweep-flag
-     * @param boolean $trans apply transformation
-     * @access protected
-     */
-    protected function _Arc2($x1, $y1, $x2, $y2, $rx, $ry, $angle=0., $l=0, $s=0, $trans = false)
-    {
-        // array to stock the parameters
-        $v = array();
-
-        // the original values
-        $v['x1'] = $x1;
-        $v['y1'] = $y1;
-        $v['x2'] = $x2;
-        $v['y2'] = $y2;
-        $v['rx'] = $rx;
-        $v['ry'] = $ry;
-
-        // rotate with the deviation angle of the axis X
-        $v['xr1'] = $v['x1']*cos($angle) - $v['y1']*sin($angle);
-        $v['yr1'] = $v['x1']*sin($angle) + $v['y1']*cos($angle);
-        $v['xr2'] = $v['x2']*cos($angle) - $v['y2']*sin($angle);
-        $v['yr2'] = $v['x2']*sin($angle) + $v['y2']*cos($angle);
-
-        // the normalized vector
-        $v['Xr1'] = $v['xr1']/$v['rx'];
-        $v['Yr1'] = $v['yr1']/$v['ry'];
-        $v['Xr2'] = $v['xr2']/$v['rx'];
-        $v['Yr2'] = $v['yr2']/$v['ry'];
-        $v['dXr'] = $v['Xr2']-$v['Xr1'];
-        $v['dYr'] = $v['Yr2']-$v['Yr1'];
-        $v['D'] = $v['dXr']*$v['dXr'] + $v['dYr']*$v['dYr'];
-
-        // if |vector| is Null, or if |vector| > 2 : impossible to make a arc => Line
-        if ($v['D']==0 || $v['D']>4) {
-            $this->_Line($x2, $y2, $trans);
-            return false;
-        }
-
-        // convert paramters for make a arc with Center, Radius, from angleBegin to angleEnd
-        $v['s1'] = array();
-        $v['s1']['t'] = sqrt((4.-$v['D'])/$v['D']);
-        $v['s1']['Xr'] = ($v['Xr1']+$v['Xr2'])/2. + $v['s1']['t']*($v['Yr2']-$v['Yr1'])/2.;
-        $v['s1']['Yr'] = ($v['Yr1']+$v['Yr2'])/2. + $v['s1']['t']*($v['Xr1']-$v['Xr2'])/2.;
-        $v['s1']['xr'] = $v['s1']['Xr']*$v['rx'];
-        $v['s1']['yr'] = $v['s1']['Yr']*$v['ry'];
-        $v['s1']['x'] = $v['s1']['xr']*cos($angle)+$v['s1']['yr']*sin($angle);
-        $v['s1']['y'] =-$v['s1']['xr']*sin($angle)+$v['s1']['yr']*cos($angle);
-        $v['s1']['a1'] = atan2($v['y1']-$v['s1']['y'], $v['x1']-$v['s1']['x']);
-        $v['s1']['a2'] = atan2($v['y2']-$v['s1']['y'], $v['x2']-$v['s1']['x']);
-        if ($v['s1']['a1']>$v['s1']['a2']) $v['s1']['a1']-=2*M_PI;
-
-        $v['s2'] = array();
-        $v['s2']['t'] = -$v['s1']['t'];
-        $v['s2']['Xr'] = ($v['Xr1']+$v['Xr2'])/2. + $v['s2']['t']*($v['Yr2']-$v['Yr1'])/2.;
-        $v['s2']['Yr'] = ($v['Yr1']+$v['Yr2'])/2. + $v['s2']['t']*($v['Xr1']-$v['Xr2'])/2.;
-        $v['s2']['xr'] = $v['s2']['Xr']*$v['rx'];
-        $v['s2']['yr'] = $v['s2']['Yr']*$v['ry'];
-        $v['s2']['x'] = $v['s2']['xr']*cos($angle)+$v['s2']['yr']*sin($angle);
-        $v['s2']['y'] =-$v['s2']['xr']*sin($angle)+$v['s2']['yr']*cos($angle);
-        $v['s2']['a1'] = atan2($v['y1']-$v['s2']['y'], $v['x1']-$v['s2']['x']);
-        $v['s2']['a2'] = atan2($v['y2']-$v['s2']['y'], $v['x2']-$v['s2']['x']);
-        if ($v['s2']['a1']>$v['s2']['a2']) $v['s2']['a1']-=2*M_PI;
-
-        if (!$l) {
-            if ($s) {
-                $xc = $v['s2']['x'];
-                $yc = $v['s2']['y'];
-                $a1 = $v['s2']['a1'];
-                $a2 = $v['s2']['a2'];
-                $this->_Arc($xc, $yc, $rx, $ry, $a1, $a2, true, false, $trans);
-            } else {
-                $xc = $v['s1']['x'];
-                $yc = $v['s1']['y'];
-                $a1 = $v['s1']['a1'];
-                $a2 = $v['s1']['a2'];
-                $this->_Arc($xc, $yc, $rx, $ry, $a1, $a2, false, false, $trans);
-            }
-        } else {
-            if ($s) {
-                $xc = $v['s1']['x'];
-                $yc = $v['s1']['y'];
-                $a1 = $v['s1']['a1'];
-                $a2 = $v['s1']['a2'];
-                $this->_Arc($xc, $yc, $rx, $ry, $a1, $a2, true, false, $trans);
-            } else {
-                $xc = $v['s2']['x'];
-                $yc = $v['s2']['y'];
-                $a1 = $v['s2']['a1'];
-                $a2 = $v['s2']['a2'];
-                $this->_Arc($xc, $yc, $rx, $ry, $a1, $a2, false, false, $trans);
-            }
-        }
-    }
-
-    /**
-     * SVG - transform the point (reference)
-     *
-     * @param float &$x
-     * @param float &$y
-     * @param boolean $trans true => convert into PDF unit
-     * @return boolean
-     * @access public
-     */
-    public function ptTransform(&$x,  &$y, $trans=true)
-    {
-        // load the last Transfomation Matrix
-        $nb = count($this->_transf);
-        if ($nb)    $m = $this->_transf[$nb-1];
-        else        $m = array(1,0,0,1,0,0);
-
-        // apply the Transformation Matrix
-        list($x,$y) = array(($x*$m[0]+$y*$m[2]+$m[4]),($x*$m[1]+$y*$m[3]+$m[5]));
-
-        // if true => convert into PDF unit
-        if ($trans) {
-            $x = $x*$this->k;
-            $y = ($this->h-$y)*$this->k;
-        }
-
-        return true;
-    }
-
-    /**
-     * SVG - add a transformation Matric
-     *
-     * @param array $n matrix
-     * @access public
-     */
-    public function doTransform($n = null)
-    {
-        // get the last Transformation Matrix
-        $nb = count($this->_transf);
-        if ($nb)    $m = $this->_transf[$nb-1];
-        else        $m = array(1,0,0,1,0,0);
-
-        // if no transform, get the Identity Matrix
-        if (!$n) $n = array(1,0,0,1,0,0);
-
-        // create the new Transformation Matrix
-        $this->_transf[] = array(
-            $m[0]*$n[0]+$m[2]*$n[1],
-            $m[1]*$n[0]+$m[3]*$n[1],
-            $m[0]*$n[2]+$m[2]*$n[3],
-            $m[1]*$n[2]+$m[3]*$n[3],
-            $m[0]*$n[4]+$m[2]*$n[5]+$m[4],
-            $m[1]*$n[4]+$m[3]*$n[5]+$m[5]
-        );
-    }
-
-    /**
-     * SVG - remove a transformation Matric
-     *
-     * @access public
-     */
-    public function undoTransform()
-    {
-        array_pop($this->_transf);
-    }
-
-    /**
-     * Convert a HTML2PDF barcode in a TCPDF barcode
-     *
-     * @param string $code code to print
-     * @param string $type type of barcode (see tcpdf/barcodes.php for supported formats)
-     * @param int $x x position in user units
-     * @param int $y y position in user units
-     * @param int $w width in user units
-     * @param int $h height in user units
-     * @param int $labelFontsize of the Test Label. If false : no Label
-     * @param array $color color of the foreground
-     * @access public
-     */
-    public function myBarcode($code, $type, $x, $y, $w, $h, $labelFontsize, $color)
-    {
-        // the style of the barcode
-        $style = array(
-            'position' => 'S',
-            'text' => ($labelFontsize ? true : false),
-            'fgcolor' => $color,
-            'bgcolor' => false,
-        );
-
-        // build the barcode
-        $this->write1DBarcode($code, $type, $x, $y, $w, $h, '', $style, 'N');
-
-        // it Label => add the FontSize to the height
-        if ($labelFontsize) $h+= ($labelFontsize);
-
-        // return the size of the barcode
-        return array($w, $h);
-    }
-
-    /**
-     * create a automatic Index on a page
-     *
-     * @param html2pdf $obj           parent object
-     * @param string   $titre         Title of the Index Page
-     * @param integer  $sizeTitle     Font size for hthe Title
-     * @param integer  $sizeBookmark  Font size for the bookmarks
-     * @param boolean  $bookmarkTitle Bookmark the Title
-     * @param boolean  $displayPage   Display the page number for each bookmark
-     * @param integer  $page draw the automatic Index on a specific Page. if null => add a page at the end
-     * @param string   $fontName      FontName to use
-     * @access public
-     */
-    public function createIndex(
-        &$obj,
-        $titre = 'Index',
-        $sizeTitle = 20,
-        $sizeBookmark = 15,
-        $bookmarkTitle = true,
-        $displayPage = true,
-        $page = null,
-        $fontName = 'helvetica')
-    {
-        // bookmark the Title if wanted
-        if ($bookmarkTitle) $this->Bookmark($titre, 0, -1);
-
-        // display the Title with the good Font size
-        $this->SetFont($fontName, '', $sizeTitle);
-        $this->Cell(0, 5, $titre, 0, 1, 'C');
-
-        // set the good Font size for the bookmarks
-        $this->SetFont($fontName, '', $sizeBookmark);
-        $this->Ln(10);
-
-        // get the number of bookmarks
-        $size=sizeof($this->outlines);
-
-        // get the size of the "P. xx" cell
-        $pageCellSize=$this->GetStringWidth('p. '.$this->outlines[$size-1]['p'])+2;
-
-        // Foreach bookmark
-        for ($i=0;$i<$size;$i++) {
-            // if we need a new page => add a new page
-            if ($this->getY()+$this->FontSize>=($this->h - $this->bMargin)) {
-                $obj->_INDEX_NewPage($page);
-                $this->SetFont($fontName, '', $sizeBookmark);
-            }
-
-            // Offset of the current level
-            $level=$this->outlines[$i]['l'];
-            if($level>0) $this->Cell($level*8);
-
-            // Caption (cut to fit on the width page)
-            $str=$this->outlines[$i]['t'];
-            $strsize=$this->GetStringWidth($str);
-            $availableSize=$this->w-$this->lMargin-$this->rMargin-$pageCellSize-($level*8)-4;
-            while ($strsize>=$availableSize) {
-                $str=substr($str, 0, -1);
-                $strsize=$this->GetStringWidth($str);
-            }
-
-            // if we want to display the page nmber
-            if ($displayPage) {
-                // display the Bookmark Caption
-                $this->Cell($strsize+2, $this->FontSize+2, $str);
-
-                //Filling dots
-                $w=$this->w-$this->lMargin-$this->rMargin-$pageCellSize-($level*8)-($strsize+2);
-                $nb=$w/$this->GetStringWidth('.');
-                $dots=str_repeat('.', $nb);
-                $this->Cell($w, $this->FontSize+2, $dots, 0, 0, 'R');
-
-                //Page number
-                $this->Cell($pageCellSize, $this->FontSize+2, 'p. '.$this->outlines[$i]['p'], 0, 1, 'R');
-            } else {
-                // display the Bookmark Caption
-                $this->Cell($strsize+2, $this->FontSize+2, $str, 0, 1);
-            }
-        }
-    }
-
-    /**
-     * Returns the string alias used for the total number of pages.
-     *
-     * @access public
-     * @return string;
-     * @see TCPDF::getAliasNbPages(), TCPDF::getPageGroupAlias()
-     */
-    public function getMyAliasNbPages()
-    {
-        if ($this->_myLastPageGroupNb==0) {
-            return $this->getAliasNbPages();
-        } else {
-            $old = $this->currpagegroup;
-            $this->currpagegroup = '{nb'.$this->_myLastPageGroupNb.'}';
-            $new = $this->getPageGroupAlias();
-            $this->currpagegroup = $old;
-
-            return $new;
-        }
-    }
-
-    /**
-     * Returns the current page number.
-     *
-     * @access public
-     * @param  integer $page
-     * @return integer;
-     */
-    public function getMyNumPage($page=null)
-    {
-        if ($page===null) {
-            $page = $this->page;
-        }
-
-        if ($this->_myLastPageGroupNb==0) {
-            return $page;
-        } else {
-            return $page-$this->_myLastPageGroup;
-        }
-    }
-
-    /**
-     * Start a new group of pages
-     *
-     * @access public
-     * @return integer;
-     * @see tcpdf::startPageGroup
-     */
-    public function myStartPageGroup()
-    {
-        $this->_myLastPageGroup = $this->page-1;
-        $this->_myLastPageGroupNb++;
-    }
-
-    /**
-     * get $_myLastPageGroup;
-     *
-     * @access public
-     * @return integer $_myLastPageGroup;
-     */
-    public function getMyLastPageGroup()
-    {
-        return $this->_myLastPageGroup;
-    }
-
-    /**
-     * set $_myLastPageGroup;
-     *
-     * @access public
-     * @param integer $myLastPageGroup;
-     */
-    public function setMyLastPageGroup($myLastPageGroup)
-    {
-        $this->_myLastPageGroup = $myLastPageGroup;
-    }
-
-    /**
-     * get $_myLastPageGroupNb;
-     *
-     * @access public
-     * @return integer $_myLastPageGroupNb;
-     */
-    public function getMyLastPageGroupNb()
-    {
-        return $this->_myLastPageGroupNb;
-    }
-
-    /**
-     * set $_myLastPageGroupNb;
-     *
-     * @access public
-     * @param integer $myLastPageGroupNb;
-     */
-    public function setMyLastPageGroupNb($myLastPageGroupNb)
-    {
-        $this->_myLastPageGroupNb = $myLastPageGroupNb;
-    }
-}
diff --git a/html2pdf_v4.03/_class/parsingCss.class.php b/html2pdf_v4.03/_class/parsingCss.class.php
deleted file mode 100644
index eaca4d80..00000000
--- a/html2pdf_v4.03/_class/parsingCss.class.php
+++ /dev/null
@@ -1,1812 +0,0 @@
-<?php
-/**
- * HTML2PDF Librairy - parsingCss class
- *
- * HTML => PDF convertor
- * distributed under the LGPL License
- *
- * @author      Laurent MINGUET <webmaster@html2pdf.fr>
- * @version     4.03
- */
-
-class HTML2PDF_parsingCss
-{
-    /**
-     * reference to the pdf object
-     * @var TCPDF
-     */
-    protected $_pdf         = null;
-
-    protected $_htmlColor   = array(); // list of the HTML colors
-    protected $_onlyLeft    = false;   // flag if we are in a sub html => only "text-align:left" is used
-    protected $_defaultFont = null;    // default font to use if the asked font does not exist
-
-    public    $value        = array(); // current values
-    public    $css          = array(); // css values
-    public    $cssKeys      = array(); // css key, for the execution order
-    public    $table        = array(); // level history
-
-    /**
-     * Constructor
-     *
-     * @param  &HTML2PDF_myPdf reference to the PDF $object
-     * @access public
-     */
-    public function __construct(&$pdf)
-    {
-        $this->_init();
-        $this->setPdfParent($pdf);
-    }
-
-    /**
-     * Set the HTML2PDF parent object
-     *
-     * @param  &HTML2PDF reference to the HTML2PDF parent $object
-     * @access public
-     */
-    public function setPdfParent(&$pdf)
-    {
-        $this->_pdf = &$pdf;
-    }
-
-    /**
-     * Inform that we want only "test-align:left" because we are in a sub HTML
-     *
-     * @access public
-     */
-    public function setOnlyLeft()
-    {
-        $this->value['text-align'] = 'left';
-        $this->_onlyLeft = true;
-    }
-
-    /**
-     * Get the vales of the parent, if exist
-     *
-     * @return array CSS values
-     * @access public
-     */
-    public function getOldValues()
-    {
-        return isset($this->table[count($this->table)-1]) ? $this->table[count($this->table)-1] : $this->value;
-    }
-
-    /**
-    * define the Default Font to use, if the font does not exist, or if no font asked
-    *
-    * @param  string  default font-family. If null : Arial for no font asked, and error fot ont does not exist
-    * @return string  old default font-family
-    * @access public
-    */
-    public function setDefaultFont($default = null)
-    {
-        $old = $this->_defaultFont;
-        $this->_defaultFont = $default;
-        if ($default) $this->value['font-family'] = $default;
-        return $old;
-    }
-
-     /**
-     * Init the object
-     *
-     * @access protected
-     */
-    protected function _init()
-    {
-        // get the Web Colors from TCPDF
-        require(K_PATH_MAIN.'htmlcolors.php');
-        $this->_htmlColor = $webcolor;
-
-        // init the Style
-        $this->table = array();
-        $this->value = array();
-        $this->initStyle();
-
-        // Init the styles without legacy
-        $this->resetStyle();
-    }
-
-    /**
-     * Init the CSS Style
-     *
-     * @access public
-     */
-    public function initStyle()
-    {
-        $this->value['id_tag']       = 'body';        // tag name
-        $this->value['id_name']          = null;         // tag - attribute name
-        $this->value['id_id']            = null;         // tag - attribute id
-        $this->value['id_class']         = null;         // tag - attribute class
-        $this->value['id_lst']           = array('*');   // tag - list of legacy
-        $this->value['mini-size']        = 1.;           // specific size report for sup, sub
-        $this->value['mini-decal']       = 0;            // specific position report for sup, sub
-        $this->value['font-family']      = 'Arial';
-        $this->value['font-bold']        = false;
-        $this->value['font-italic']      = false;
-        $this->value['font-underline']   = false;
-        $this->value['font-overline']    = false;
-        $this->value['font-linethrough'] = false;
-        $this->value['text-transform']   = 'none';
-        $this->value['font-size']        = $this->convertToMM('10pt');
-        $this->value['text-indent']      = 0;
-        $this->value['text-align']       = 'left';
-        $this->value['vertical-align']   = 'middle';
-        $this->value['line-height']      = 'normal';
-
-        $this->value['position']         = null;
-        $this->value['x']                = null;
-        $this->value['y']                = null;
-        $this->value['width']            = 0;
-        $this->value['height']           = 0;
-        $this->value['top']              = null;
-        $this->value['right']            = null;
-        $this->value['bottom']           = null;
-        $this->value['left']             = null;
-        $this->value['float']            = null;
-        $this->value['display']          = null;
-        $this->value['rotate']           = null;
-        $this->value['overflow']         = 'visible';
-
-        $this->value['color']            = array(0, 0, 0);
-        $this->value['background']       = array('color' => null, 'image' => null, 'position' => null, 'repeat' => null);
-        $this->value['border']           = array();
-        $this->value['padding']          = array();
-        $this->value['margin']           = array();
-        $this->value['margin-auto']      = false;
-
-        $this->value['list-style-type']  = '';
-        $this->value['list-style-image'] = '';
-
-        $this->value['xc'] = null;
-        $this->value['yc'] = null;
-    }
-
-    /**
-     * Init the CSS Style without legacy
-     *
-     * @param  string  tag name
-     * @access public
-     */
-    public function resetStyle($tagName = '')
-    {
-        // prepare somme values
-        $border = $this->readBorder('solid 1px #000000');
-        $units = array(
-            '1px' => $this->convertToMM('1px'),
-            '5px' => $this->convertToMM('5px'),
-        );
-
-
-        // prepare the Collapse attribute
-        $collapse = isset($this->value['border']['collapse']) ? $this->value['border']['collapse'] : false;
-        if (!in_array($tagName, array('tr', 'td', 'th', 'thead', 'tbody', 'tfoot'))) $collapse = false;
-
-        // set the global css values
-        $this->value['position']   = null;
-        $this->value['x']          = null;
-        $this->value['y']          = null;
-        $this->value['width']      = 0;
-        $this->value['height']     = 0;
-        $this->value['top']        = null;
-        $this->value['right']      = null;
-        $this->value['bottom']     = null;
-        $this->value['left']       = null;
-        $this->value['float']      = null;
-        $this->value['display']    = null;
-        $this->value['rotate']     = null;
-        $this->value['overflow']   = 'visible';
-        $this->value['background'] = array('color' => null, 'image' => null, 'position' => null, 'repeat' => null);
-        $this->value['border']     = array(
-            't' => $this->readBorder('none'),
-            'r' => $this->readBorder('none'),
-            'b' => $this->readBorder('none'),
-            'l' => $this->readBorder('none'),
-            'radius' => array(
-                'tl' => array(0, 0),
-                'tr' => array(0, 0),
-                'br' => array(0, 0),
-                'bl' => array(0, 0)
-            ),
-            'collapse' => $collapse,
-        );
-
-        // specific values for some tags
-        if (!in_array($tagName, array('h1', 'h2', 'h3', 'h4', 'h5', 'h6'))) {
-            $this->value['margin'] = array('t'=>0,'r'=>0,'b'=>0,'l'=>0);
-        }
-
-        if (in_array($tagName, array('input', 'select', 'textarea'))) {
-            $this->value['border']['t'] = null;
-            $this->value['border']['r'] = null;
-            $this->value['border']['b'] = null;
-            $this->value['border']['l'] = null;
-        }
-
-        if ($tagName=='p') {
-            $this->value['margin']['t'] = null;
-            $this->value['margin']['b'] = null;
-        }
-        if ($tagName=='blockquote') {
-            $this->value['margin']['t'] = 3;
-            $this->value['margin']['r'] = 3;
-            $this->value['margin']['b'] = 3;
-            $this->value['margin']['l'] = 6;
-        }
-        $this->value['margin-auto'] = false;
-
-        if (in_array($tagName, array('blockquote', 'div', 'fieldset'))) {
-            $this->value['vertical-align'] = 'top';
-        }
-
-        if (in_array($tagName, array('fieldset', 'legend'))) {
-            $this->value['border'] = array(
-                't' => $border,
-                'r' => $border,
-                'b' => $border,
-                'l' => $border,
-                'radius' => array(
-                    'tl' => array($units['5px'], $units['5px']),
-                    'tr' => array($units['5px'], $units['5px']),
-                    'br' => array($units['5px'], $units['5px']),
-                    'bl' => array($units['5px'], $units['5px'])
-                ),
-                'collapse' => false,
-            );
-        }
-
-        if (in_array($tagName, array('ul', 'li'))) {
-            $this->value['list-style-type']  = '';
-            $this->value['list-style-image'] = '';
-        }
-
-        if (!in_array($tagName, array('tr', 'td'))) {
-            $this->value['padding'] = array(
-                't' => 0,
-                'r' => 0,
-                'b' => 0,
-                'l' => 0
-            );
-        } else {
-            $this->value['padding'] = array(
-                't' => $units['1px'],
-                'r' => $units['1px'],
-                'b' => $units['1px'],
-                'l' => $units['1px']
-            );
-        }
-
-        if ($tagName=='hr') {
-            $this->value['border'] = array(
-                't' => $border,
-                'r' => $border,
-                'b' => $border,
-                'l' => $border,
-                'radius' => array(
-                    'tl' => array(0, 0),
-                    'tr' => array(0, 0),
-                    'br' => array(0, 0),
-                    'bl' => array(0, 0)
-                ),
-                'collapse' => false,
-            );
-            $this->convertBackground('#FFFFFF', $this->value['background']);
-        }
-
-        $this->value['xc'] = null;
-        $this->value['yc'] = null;
-    }
-
-    /**
-     * Init the PDF Font
-     *
-     * @access public
-     */
-    public function fontSet()
-    {
-        $family = strtolower($this->value['font-family']);
-
-        $b = ($this->value['font-bold']        ? 'B' : '');
-        $i = ($this->value['font-italic']      ? 'I' : '');
-        $u = ($this->value['font-underline']   ? 'U' : '');
-        $d = ($this->value['font-linethrough'] ? 'D' : '');
-        $o = ($this->value['font-overline']    ? 'O' : '');
-
-        // font style
-        $style = $b.$i;
-
-        if ($this->_defaultFont) {
-            if($family=='arial')
-                $family='helvetica';
-            elseif($family=='symbol' || $family=='zapfdingbats')
-                $style='';
-
-            $fontkey = $family.$style;
-            if (!$this->_pdf->isLoadedFont($fontkey))
-                $family = $this->_defaultFont;
-        }
-
-        if($family=='arial')
-            $family='helvetica';
-        elseif($family=='symbol' || $family=='zapfdingbats')
-            $style='';
-
-        // complete style
-        $style.= $u.$d.$o;
-
-        // size : mm => pt
-        $size = $this->value['font-size'];
-        $size = 72 * $size / 25.4;
-
-        // apply the font
-        $this->_pdf->SetFont($family, $style, $this->value['mini-size']*$size);
-        $this->_pdf->setTextColorArray($this->value['color']);
-        if ($this->value['background']['color'])
-            $this->_pdf->setFillColorArray($this->value['background']['color']);
-        else
-            $this->_pdf->setFillColor(255);
-    }
-
-     /**
-     * add a level in the CSS history
-     *
-     * @access public
-     */
-    public function save()
-    {
-        array_push($this->table, $this->value);
-    }
-
-     /**
-     * remove a level in the CSS history
-     *
-     * @access public
-     */
-    public function load()
-    {
-        if (count($this->table)) {
-            $this->value = array_pop($this->table);
-        }
-    }
-
-     /**
-     * restore the Y positiony (used after a span)
-     *
-     * @access public
-     */
-    public function restorePosition()
-    {
-        if ($this->value['y']==$this->_pdf->getY()) $this->_pdf->setY($this->value['yc'], false);
-    }
-
-     /**
-     * set the New position for the current Tag
-     *
-     * @access public
-     */
-    public function setPosition()
-    {
-        // get the current position
-        $currentX = $this->_pdf->getX();
-        $currentY = $this->_pdf->getY();
-
-        // save it
-        $this->value['xc'] = $currentX;
-        $this->value['yc'] = $currentY;
-
-        if ($this->value['position']=='relative' || $this->value['position']=='absolute') {
-            if ($this->value['right']!==null) {
-                $x = $this->getLastWidth(true) - $this->value['right'] - $this->value['width'];
-                if ($this->value['margin']['r']) $x-= $this->value['margin']['r'];
-            } else {
-                $x = $this->value['left'];
-                if ($this->value['margin']['l']) $x+= $this->value['margin']['l'];
-            }
-
-            if ($this->value['bottom']!==null) {
-                $y = $this->getLastHeight(true) - $this->value['bottom'] - $this->value['height'];
-                if ($this->value['margin']['b']) $y-= $this->value['margin']['b'];
-            } else {
-                $y = $this->value['top'];
-                if ($this->value['margin']['t']) $y+= $this->value['margin']['t'];
-            }
-
-            if ($this->value['position']=='relative') {
-                $this->value['x'] = $currentX + $x;
-                $this->value['y'] = $currentY + $y;
-            } else {
-                $this->value['x'] = $this->_getLastAbsoluteX()+$x;
-                $this->value['y'] = $this->_getLastAbsoluteY()+$y;
-            }
-        } else {
-            $this->value['x'] = $currentX;
-            $this->value['y'] = $currentY;
-            if ($this->value['margin']['l']) $this->value['x']+= $this->value['margin']['l'];
-            if ($this->value['margin']['t']) $this->value['y']+= $this->value['margin']['t'];
-        }
-
-        // save the new position
-        $this->_pdf->setXY($this->value['x'], $this->value['y']);
-    }
-
-     /**
-     * Analise the CSS style to convert it into Form style
-     *
-     * @access public
-     * @param  array    styles
-     */
-    public function getFormStyle()
-    {
-        $prop = array();
-
-        $prop['alignment'] = $this->value['text-align'];
-
-        if (isset($this->value['background']['color']) && is_array($this->value['background']['color'])) {
-            $prop['fillColor'] = $this->value['background']['color'];
-        }
-
-        if (isset($this->value['border']['t']['color'])) {
-            $prop['strokeColor'] = $this->value['border']['t']['color'];
-        }
-
-        if (isset($this->value['border']['t']['width'])) {
-            $prop['lineWidth'] = $this->value['border']['t']['width'];
-        }
-
-        if (isset($this->value['border']['t']['type'])) {
-            $prop['borderStyle'] = $this->value['border']['t']['type'];
-        }
-
-        if (!empty($this->value['color'])) {
-            $prop['textColor'] = $this->value['color'];
-        }
-
-        if (!empty($this->value['font-size'])) {
-            $prop['textSize'] = $this->value['font-size'];
-        }
-
-        return $prop;
-    }
-
-     /**
-     * Analise the CSS style to convert it into SVG style
-     *
-     * @access public
-     * @param  string   tag name
-     * @param  array    styles
-     */
-    public function getSvgStyle($tagName, &$param)
-    {
-        // prepare
-        $tagName = strtolower($tagName);
-        $id   = isset($param['id'])   ? strtolower(trim($param['id']))   : null; if (!$id)   $id   = null;
-        $name = isset($param['name']) ? strtolower(trim($param['name'])) : null; if (!$name) $name = null;
-
-        // read the class attribute
-        $class = array();
-        $tmp = isset($param['class']) ? strtolower(trim($param['class'])) : '';
-        $tmp = explode(' ', $tmp);
-        foreach ($tmp as $k => $v) {
-            $v = trim($v);
-            if ($v) $class[] = $v;
-        }
-
-        // identify the tag, and the direct styles
-        $this->value['id_tag'] = $tagName;
-        $this->value['id_name']   = $name;
-        $this->value['id_id']     = $id;
-        $this->value['id_class']  = $class;
-        $this->value['id_lst']    = array();
-        $this->value['id_lst'][] = '*';
-        $this->value['id_lst'][] = $tagName;
-        if (!isset($this->value['svg'])) {
-            $this->value['svg'] = array(
-                'stroke'         => null,
-                'stroke-width'   => $this->convertToMM('1pt'),
-                'fill'           => null,
-                'fill-opacity'   => null,
-            );
-        }
-
-        if (count($class)) {
-            foreach ($class as $v) {
-                $this->value['id_lst'][] = '*.'.$v;
-                $this->value['id_lst'][] = '.'.$v;
-                $this->value['id_lst'][] = $tagName.'.'.$v;
-            }
-        }
-        if ($id) {
-            $this->value['id_lst'][] = '*#'.$id;
-            $this->value['id_lst'][] = '#'.$id;
-            $this->value['id_lst'][] = $tagName.'#'.$id;
-        }
-
-        // CSS style
-        $styles = $this->_getFromCSS();
-
-        // adding the style from the tag
-        $styles = array_merge($styles, $param['style']);
-
-        if (isset($styles['stroke']))        $this->value['svg']['stroke']       = $this->convertToColor($styles['stroke'], $res);
-        if (isset($styles['stroke-width']))  $this->value['svg']['stroke-width'] = $this->convertToMM($styles['stroke-width']);
-        if (isset($styles['fill']))          $this->value['svg']['fill']         = $this->convertToColor($styles['fill'], $res);
-        if (isset($styles['fill-opacity']))  $this->value['svg']['fill-opacity'] = 1.*$styles['fill-opacity'];
-
-        return $this->value['svg'];
-    }
-
-    /**
-     * analyse the css properties from the HTML parsing
-     *
-     * @access public
-     * @param  string  $tagName
-     * @param  array   $param
-     * @param  array   $legacy
-     */
-    public function analyse($tagName, &$param, $legacy = null)
-    {
-        // prepare the informations
-        $tagName = strtolower($tagName);
-        $id   = isset($param['id'])   ? strtolower(trim($param['id']))    : null; if (!$id)   $id   = null;
-        $name = isset($param['name']) ? strtolower(trim($param['name']))  : null; if (!$name) $name = null;
-
-        // get the class names to use
-        $class = array();
-        $tmp = isset($param['class']) ? strtolower(trim($param['class'])) : '';
-        $tmp = explode(' ', $tmp);
-        foreach ($tmp as $k => $v) {
-            $v = trim($v);
-            if ($v) $class[] = $v;
-        }
-
-        // prepare the values, and the list of css tags to identify
-        $this->value['id_tag']   = $tagName;
-        $this->value['id_name']  = $name;
-        $this->value['id_id']    = $id;
-        $this->value['id_class'] = $class;
-        $this->value['id_lst']   = array();
-        $this->value['id_lst'][] = '*';
-        $this->value['id_lst'][] = $tagName;
-        if (count($class)) {
-            foreach ($class as $v) {
-                $this->value['id_lst'][] = '*.'.$v;
-                $this->value['id_lst'][] = '.'.$v;
-                $this->value['id_lst'][] = $tagName.'.'.$v;
-            }
-        }
-        if ($id) {
-            $this->value['id_lst'][] = '*#'.$id;
-            $this->value['id_lst'][] = '#'.$id;
-            $this->value['id_lst'][] = $tagName.'#'.$id;
-        }
-
-        // get the css styles from class
-        $styles = $this->_getFromCSS();
-
-        // merge with the css styles from tag
-        $styles = array_merge($styles, $param['style']);
-        if (isset($param['allwidth']) && !isset($styles['width'])) $styles['width'] = '100%';
-
-        // reset some styles, depending on the tag name
-        $this->resetStyle($tagName);
-
-        // add the legacy values
-        if ($legacy) {
-            foreach ($legacy as $legacyName => $legacyValue) {
-                if (is_array($legacyValue)) {
-                    foreach($legacyValue as $legacy2Name => $legacy2Value)
-                        $this->value[$legacyName][$legacy2Name] = $legacy2Value;
-                } else {
-                    $this->value[$legacyName] = $legacyValue;
-                }
-            }
-        }
-
-        // some flags
-        $correctWidth = false;
-        $noWidth = true;
-
-        // read all the css styles
-        foreach ($styles as $nom => $val) {
-            switch($nom)
-            {
-                case 'font-family':
-                    $val = explode(',', $val);
-                    $val = trim($val[0]);
-                    if ($val) $this->value['font-family'] = $val;
-                    break;
-
-                case 'font-weight':
-                    $this->value['font-bold'] = ($val=='bold');
-                    break;
-
-                case 'font-style':
-                    $this->value['font-italic'] = ($val=='italic');
-                    break;
-
-                case 'text-decoration':
-                    $val = explode(' ', $val);
-                    $this->value['font-underline']   = (in_array('underline', $val));
-                    $this->value['font-overline']    = (in_array('overline', $val));
-                    $this->value['font-linethrough'] = (in_array('line-through', $val));
-                    break;
-
-                case 'text-indent':
-                    $this->value['text-indent'] = $this->convertToMM($val);
-                    break;
-
-                case 'text-transform':
-                    if (!in_array($val, array('none', 'capitalize', 'uppercase', 'lowercase'))) $val = 'none';
-                    $this->value['text-transform']  = $val;
-                    break;
-
-                case 'font-size':
-                    $val = $this->convertToMM($val, $this->value['font-size']);
-                    if ($val) $this->value['font-size'] = $val;
-                    break;
-
-                case 'color':
-                    $res = null;
-                    $this->value['color'] = $this->convertToColor($val, $res);
-                    if ($tagName=='hr') {
-                        $this->value['border']['l']['color'] = $this->value['color'];
-                        $this->value['border']['t']['color'] = $this->value['color'];
-                        $this->value['border']['r']['color'] = $this->value['color'];
-                        $this->value['border']['b']['color'] = $this->value['color'];
-                    }
-                    break;
-
-                case 'text-align':
-                    $val = strtolower($val);
-                    if (!in_array($val, array('left', 'right', 'center', 'justify', 'li_right'))) $val = 'left';
-                    $this->value['text-align'] = $val;
-                    break;
-
-                case 'vertical-align':
-                    $this->value['vertical-align'] = $val;
-                    break;
-
-                case 'width':
-                    $this->value['width'] = $this->convertToMM($val, $this->getLastWidth());
-                    if ($this->value['width'] && substr($val, -1)=='%') $correctWidth=true;
-                    $noWidth = false;
-                    break;
-
-                case 'height':
-                    $this->value['height'] = $this->convertToMM($val, $this->getLastHeight());
-                    break;
-
-                case 'line-height':
-                    if (preg_match('/^[0-9\.]+$/isU', $val)) $val = floor($val*100).'%';
-                    $this->value['line-height'] = $val;
-                    break;
-
-                case 'rotate':
-                    if (!in_array($val, array(0, -90, 90, 180, 270, -180, -270))) $val = null;
-                    if ($val<0) $val+= 360;
-                    $this->value['rotate'] = $val;
-                    break;
-
-                case 'overflow':
-                    if (!in_array($val, array('visible', 'hidden'))) $val = 'visible';
-                    $this->value['overflow'] = $val;
-                    break;
-
-                case 'padding':
-                    $val = explode(' ', $val);
-                    foreach ($val as $k => $v) {
-                        $v = trim($v);
-                        if ($v!='') {
-                            $val[$k] = $v;
-                        } else {
-                            unset($val[$k]);
-                        }
-                    }
-                    $val = array_values($val);
-                    $this->_duplicateBorder($val);
-                    $this->value['padding']['t'] = $this->convertToMM($val[0], 0);
-                    $this->value['padding']['r'] = $this->convertToMM($val[1], 0);
-                    $this->value['padding']['b'] = $this->convertToMM($val[2], 0);
-                    $this->value['padding']['l'] = $this->convertToMM($val[3], 0);
-                    break;
-
-                case 'padding-top':
-                    $this->value['padding']['t'] = $this->convertToMM($val, 0);
-                    break;
-
-                case 'padding-right':
-                    $this->value['padding']['r'] = $this->convertToMM($val, 0);
-                    break;
-
-                case 'padding-bottom':
-                    $this->value['padding']['b'] = $this->convertToMM($val, 0);
-                    break;
-
-                case 'padding-left':
-                    $this->value['padding']['l'] = $this->convertToMM($val, 0);
-                    break;
-
-                case 'margin':
-                    if ($val=='auto') {
-                        $this->value['margin-auto'] = true;
-                        break;
-                    }
-                    $val = explode(' ', $val);
-                    foreach ($val as $k => $v) {
-                        $v = trim($v);
-                        if ($v!='') {
-                            $val[$k] = $v;
-                        } else {
-                            unset($val[$k]);
-                        }
-                    }
-                    $val = array_values($val);
-                    $this->_duplicateBorder($val);
-                    $this->value['margin']['t'] = $this->convertToMM($val[0], 0);
-                    $this->value['margin']['r'] = $this->convertToMM($val[1], 0);
-                    $this->value['margin']['b'] = $this->convertToMM($val[2], 0);
-                    $this->value['margin']['l'] = $this->convertToMM($val[3], 0);
-                    break;
-
-                case 'margin-top':
-                    $this->value['margin']['t'] = $this->convertToMM($val, 0);
-                    break;
-
-                case 'margin-right':
-                    $this->value['margin']['r'] = $this->convertToMM($val, 0);
-                    break;
-
-                case 'margin-bottom':
-                    $this->value['margin']['b'] = $this->convertToMM($val, 0);
-                    break;
-
-                case 'margin-left':
-                    $this->value['margin']['l'] = $this->convertToMM($val, 0);
-                    break;
-
-                case 'border':
-                    $val = $this->readBorder($val);
-                    $this->value['border']['t'] = $val;
-                    $this->value['border']['r'] = $val;
-                    $this->value['border']['b'] = $val;
-                    $this->value['border']['l'] = $val;
-                    break;
-
-                case 'border-style':
-                    $val = explode(' ', $val);
-                    foreach ($val as $valK => $valV) {
-                        if (!in_array($valV, array('solid', 'dotted', 'dashed'))) {
-                            $val[$valK] = null;
-                        }
-                    }
-                    $this->_duplicateBorder($val);
-                    if ($val[0]) $this->value['border']['t']['type'] = $val[0];
-                    if ($val[1]) $this->value['border']['r']['type'] = $val[1];
-                    if ($val[2]) $this->value['border']['b']['type'] = $val[2];
-                    if ($val[3]) $this->value['border']['l']['type'] = $val[3];
-                    break;
-
-                case 'border-top-style':
-                    if (in_array($val, array('solid', 'dotted', 'dashed'))) {
-                        $this->value['border']['t']['type'] = $val;
-                    }
-                    break;
-
-                case 'border-right-style':
-                    if (in_array($val, array('solid', 'dotted', 'dashed'))) {
-                        $this->value['border']['r']['type'] = $val;
-                    }
-                    break;
-
-                case 'border-bottom-style':
-                    if (in_array($val, array('solid', 'dotted', 'dashed'))) {
-                        $this->value['border']['b']['type'] = $val;
-                    }
-                    break;
-
-                case 'border-left-style':
-                    if (in_array($val, array('solid', 'dotted', 'dashed')))
-                        $this->value['border']['l']['type'] = $val;
-                    break;
-
-                case 'border-color':
-                    $res = false;
-                    $val = preg_replace('/,[\s]+/', ',', $val);
-                    $val = explode(' ', $val);
-                    foreach ($val as $valK => $valV) {
-                            $val[$valK] = $this->convertToColor($valV, $res);
-                            if (!$res) {
-                                $val[$valK] = null;
-                            }
-                    }
-                    $this->_duplicateBorder($val);
-                    if (is_array($val[0])) $this->value['border']['t']['color'] = $val[0];
-                    if (is_array($val[1])) $this->value['border']['r']['color'] = $val[1];
-                    if (is_array($val[2])) $this->value['border']['b']['color'] = $val[2];
-                    if (is_array($val[3])) $this->value['border']['l']['color'] = $val[3];
-
-                    break;
-
-                case 'border-top-color':
-                    $res = false;
-                    $val = $this->convertToColor($val, $res);
-                    if ($res) $this->value['border']['t']['color'] = $val;
-                    break;
-
-                case 'border-right-color':
-                    $res = false;
-                    $val = $this->convertToColor($val, $res);
-                    if ($res) $this->value['border']['r']['color'] = $val;
-                    break;
-
-                case 'border-bottom-color':
-                    $res = false;
-                    $val = $this->convertToColor($val, $res);
-                    if ($res) $this->value['border']['b']['color'] = $val;
-                    break;
-
-                case 'border-left-color':
-                    $res = false;
-                    $val = $this->convertToColor($val, $res);
-                    if ($res) $this->value['border']['l']['color'] = $val;
-                    break;
-
-                case 'border-width':
-                    $val = explode(' ', $val);
-                    foreach ($val as $valK => $valV) {
-                            $val[$valK] = $this->convertToMM($valV, 0);
-                    }
-                    $this->_duplicateBorder($val);
-                    if ($val[0]) $this->value['border']['t']['width'] = $val[0];
-                    if ($val[1]) $this->value['border']['r']['width'] = $val[1];
-                    if ($val[2]) $this->value['border']['b']['width'] = $val[2];
-                    if ($val[3]) $this->value['border']['l']['width'] = $val[3];
-                    break;
-
-                case 'border-top-width':
-                    $val = $this->convertToMM($val, 0);
-                    if ($val) $this->value['border']['t']['width'] = $val;
-                    break;
-
-                case 'border-right-width':
-                    $val = $this->convertToMM($val, 0);
-                    if ($val) $this->value['border']['r']['width'] = $val;
-                    break;
-
-                case 'border-bottom-width':
-                    $val = $this->convertToMM($val, 0);
-                    if ($val) $this->value['border']['b']['width'] = $val;
-                    break;
-
-                case 'border-left-width':
-                    $val = $this->convertToMM($val, 0);
-                    if ($val) $this->value['border']['l']['width'] = $val;
-                    break;
-
-                case 'border-collapse':
-                    if ($tagName=='table') $this->value['border']['collapse'] = ($val=='collapse');
-                    break;
-
-                case 'border-radius':
-                    $val = explode('/', $val);
-                    if (count($val)>2) {
-                        break;
-                    }
-                    $valH = $this->convertToRadius(trim($val[0]));
-                    if (count($valH)<1 || count($valH)>4) {
-                        break;
-                    }
-                    if (!isset($valH[1])) $valH[1] = $valH[0];
-                    if (!isset($valH[2])) $valH = array($valH[0], $valH[0], $valH[1], $valH[1]);
-                    if (!isset($valH[3])) $valH[3] = $valH[1];
-                    if (isset($val[1])) {
-                        $valV = $this->convertToRadius(trim($val[1]));
-                        if (count($valV)<1 || count($valV)>4) {
-                            break;
-                        }
-                        if (!isset($valV[1])) $valV[1] = $valV[0];
-                        if (!isset($valV[2])) $valV = array($valV[0], $valV[0], $valV[1], $valV[1]);
-                        if (!isset($valV[3])) $valV[3] = $valV[1];
-                    } else {
-                        $valV = $valH;
-                    }
-                    $this->value['border']['radius'] = array(
-                                'tl' => array($valH[0], $valV[0]),
-                                'tr' => array($valH[1], $valV[1]),
-                                'br' => array($valH[2], $valV[2]),
-                                'bl' => array($valH[3], $valV[3])
-                            );
-                    break;
-
-                case 'border-top-left-radius':
-                    $val = $this->convertToRadius($val);
-                    if (count($val)<1 || count($val)>2) {
-                        break;
-                    }
-                    $this->value['border']['radius']['tl'] = array($val[0], isset($val[1]) ? $val[1] : $val[0]);
-                    break;
-
-                case 'border-top-right-radius':
-                    $val = $this->convertToRadius($val);
-                    if (count($val)<1 || count($val)>2) {
-                        break;
-                    }
-                    $this->value['border']['radius']['tr'] = array($val[0], isset($val[1]) ? $val[1] : $val[0]);
-                    break;
-
-                case 'border-bottom-right-radius':
-                    $val = $this->convertToRadius($val);
-                    if (count($val)<1 || count($val)>2) {
-                        break;
-                    }
-                    $this->value['border']['radius']['br'] = array($val[0], isset($val[1]) ? $val[1] : $val[0]);
-                    break;
-
-                case 'border-bottom-left-radius':
-                    $val = $this->convertToRadius($val);
-                    if (count($val)<1 || count($val)>2) {
-                        break;
-                    }
-                    $this->value['border']['radius']['bl'] = array($val[0], isset($val[1]) ? $val[1] : $val[0]);
-                    break;
-
-                case 'border-top':
-                    $this->value['border']['t'] = $this->readBorder($val);
-                    break;
-
-                case 'border-right':
-                    $this->value['border']['r'] = $this->readBorder($val);
-                    break;
-
-                case 'border-bottom':
-                    $this->value['border']['b'] = $this->readBorder($val);
-                    break;
-
-                case 'border-left':
-                    $this->value['border']['l'] = $this->readBorder($val);
-                    break;
-
-                case 'background-color':
-                    $this->value['background']['color'] = $this->convertBackgroundColor($val);
-                    break;
-
-                case 'background-image':
-                    $this->value['background']['image'] = $this->convertBackgroundImage($val);
-                    break;
-
-                case 'background-position':
-                    $res = null;
-                    $this->value['background']['position'] = $this->convertBackgroundPosition($val, $res);
-                    break;
-
-                case 'background-repeat':
-                    $this->value['background']['repeat'] = $this->convertBackgroundRepeat($val);
-                    break;
-
-                case 'background':
-                    $this->convertBackground($val, $this->value['background']);
-                    break;
-
-                case 'position':
-                    if ($val=='absolute')       $this->value['position'] = 'absolute';
-                    else if ($val=='relative')  $this->value['position'] = 'relative';
-                    else                        $this->value['position'] = null;
-                    break;
-
-                case 'float':
-                    if ($val=='left')           $this->value['float'] = 'left';
-                    else if ($val=='right')     $this->value['float'] = 'right';
-                    else                        $this->value['float'] = null;
-                    break;
-
-                case 'display':
-                    if ($val=='inline')         $this->value['display'] = 'inline';
-                    else if ($val=='block')     $this->value['display'] = 'block';
-                    else if ($val=='none')      $this->value['display'] = 'none';
-                    else                        $this->value['display'] = null;
-                    break;
-
-                case 'top':
-                case 'bottom':
-                case 'left':
-                case 'right':
-                    $this->value[$nom] = $val;
-                    break;
-
-                case 'list-style':
-                case 'list-style-type':
-                case 'list-style-image':
-                    if ($nom=='list-style') $nom = 'list-style-type';
-                    $this->value[$nom] = $val;
-                    break;
-
-                default:
-                    break;
-            }
-        }
-
-        $return = true;
-
-        // only for P tag
-        if ($this->value['margin']['t']===null) $this->value['margin']['t'] = $this->value['font-size'];
-        if ($this->value['margin']['b']===null) $this->value['margin']['b'] = $this->value['font-size'];
-
-        // force the text align to left, if asked by html2pdf
-        if ($this->_onlyLeft) $this->value['text-align'] = 'left';
-
-        // correction on the width (quick box)
-        if ($noWidth && in_array($tagName, array('div', 'blockquote', 'fieldset')) && $this->value['position']!='absolute') {
-            $this->value['width'] = $this->getLastWidth();
-            $this->value['width']-= $this->value['margin']['l'] + $this->value['margin']['r'];
-        } else {
-            if ($correctWidth) {
-                if (!in_array($tagName, array('table', 'div', 'blockquote', 'fieldset', 'hr'))) {
-                    $this->value['width']-= $this->value['padding']['l'] + $this->value['padding']['r'];
-                    $this->value['width']-= $this->value['border']['l']['width'] + $this->value['border']['r']['width'];
-                }
-                if (in_array($tagName, array('th', 'td'))) {
-                    $this->value['width']-= $this->convertToMM(isset($param['cellspacing']) ? $param['cellspacing'] : '2px');
-                    $return = false;
-                }
-                if ($this->value['width']<0) $this->value['width']=0;
-            } else {
-                if ($this->value['width']) {
-                    if ($this->value['border']['l']['width']) $this->value['width'] += $this->value['border']['l']['width'];
-                    if ($this->value['border']['r']['width']) $this->value['width'] += $this->value['border']['r']['width'];
-                    if ($this->value['padding']['l'])         $this->value['width'] += $this->value['padding']['l'];
-                    if ($this->value['padding']['r'])         $this->value['width'] += $this->value['padding']['r'];
-                }
-            }
-        }
-        if ($this->value['height']) {
-            if ($this->value['border']['b']['width']) $this->value['height'] += $this->value['border']['b']['width'];
-            if ($this->value['border']['t']['width']) $this->value['height'] += $this->value['border']['t']['width'];
-            if ($this->value['padding']['b'])         $this->value['height'] += $this->value['padding']['b'];
-            if ($this->value['padding']['t'])         $this->value['height'] += $this->value['padding']['t'];
-        }
-
-        if ($this->value['top']!=null)      $this->value['top']     = $this->convertToMM($this->value['top'], $this->getLastHeight(true));
-        if ($this->value['bottom']!=null)   $this->value['bottom']  = $this->convertToMM($this->value['bottom'], $this->getLastHeight(true));
-        if ($this->value['left']!=null)     $this->value['left']    = $this->convertToMM($this->value['left'], $this->getLastWidth(true));
-        if ($this->value['right']!=null)    $this->value['right']   = $this->convertToMM($this->value['right'], $this->getLastWidth(true));
-
-        if ($this->value['top'] && $this->value['bottom'] && $this->value['height'])    $this->value['bottom']  = null;
-        if ($this->value['left'] && $this->value['right'] && $this->value['width'])     $this->value['right']   = null;
-
-        return $return;
-    }
-
-     /**
-     * get the height of the current line
-     *
-     * @access public
-     * @return float $height in mm
-     */
-    public function getLineHeight()
-    {
-        $val = $this->value['line-height'];
-        if ($val=='normal') $val = '108%';
-        return $this->convertToMM($val, $this->value['font-size']);
-    }
-
-     /**
-     * get the width of the parent
-     *
-     * @access public
-     * @param  boolean $mode true => adding padding and border
-     * @return float $width in mm
-     */
-    public function getLastWidth($mode = false)
-    {
-        for ($k=count($this->table)-1; $k>=0; $k--) {
-            if ($this->table[$k]['width']) {
-                $w = $this->table[$k]['width'];
-                if ($mode) {
-                    $w+= $this->table[$k]['border']['l']['width'] + $this->table[$k]['padding']['l'] + 0.02;
-                    $w+= $this->table[$k]['border']['r']['width'] + $this->table[$k]['padding']['r'] + 0.02;
-                }
-                return $w;
-            }
-        }
-        return $this->_pdf->getW() - $this->_pdf->getlMargin() - $this->_pdf->getrMargin();
-    }
-
-     /**
-     * get the height of the parent
-     *
-     * @access public
-     * @param  boolean $mode true => adding padding and border
-     * @return float $height in mm
-     */
-    public function getLastHeight($mode = false)
-    {
-        for ($k=count($this->table)-1; $k>=0; $k--) {
-            if ($this->table[$k]['height']) {
-                $h = $this->table[$k]['height'];
-                if ($mode) {
-                    $h+= $this->table[$k]['border']['t']['width'] + $this->table[$k]['padding']['t'] + 0.02;
-                    $h+= $this->table[$k]['border']['b']['width'] + $this->table[$k]['padding']['b'] + 0.02;
-                }
-                return $h;
-            }
-        }
-        return $this->_pdf->getH() - $this->_pdf->gettMargin() - $this->_pdf->getbMargin();
-    }
-
-    /**
-     * get the value of the float property
-     *
-     * @access public
-     * @return $float left/right
-     */
-    public function getFloat()
-    {
-        if ($this->value['float']=='left')    return 'left';
-        if ($this->value['float']=='right')   return 'right';
-        return null;
-    }
-
-    /**
-     * get the last value for a specific key
-     *
-     * @access public
-     * @param  string $key
-     * @return mixed
-     */
-    public function getLastValue($key)
-    {
-        $nb = count($this->table);
-        if ($nb>0) {
-            return $this->table[$nb-1][$key];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * get the last absolute X
-     *
-     * @access protected
-     * @return float $x
-     */
-    protected function _getLastAbsoluteX()
-    {
-        for ($k=count($this->table)-1; $k>=0; $k--) {
-            if ($this->table[$k]['x'] && $this->table[$k]['position']) return $this->table[$k]['x'];
-        }
-        return $this->_pdf->getlMargin();
-    }
-
-    /**
-     * get the last absolute Y
-     *
-     * @access protected
-     * @return float $y
-     */
-    protected function _getLastAbsoluteY()
-    {
-        for ($k=count($this->table)-1; $k>=0; $k--) {
-            if ($this->table[$k]['y'] && $this->table[$k]['position']) return $this->table[$k]['y'];
-        }
-        return $this->_pdf->gettMargin();
-    }
-
-    /**
-     * get the CSS properties of the current tag
-     *
-     * @access protected
-     * @return array $styles
-     */
-    protected function _getFromCSS()
-    {
-        // styles to apply
-        $styles = array();
-
-        // list of the selectors to get in the CSS files
-        $getit  = array();
-
-        // get the list of the selectors of each tags
-        $lst = array();
-        $lst[] = $this->value['id_lst'];
-        for ($i=count($this->table)-1; $i>=0; $i--) {
-            $lst[] = $this->table[$i]['id_lst'];
-        }
-
-        // foreach selectors in the CSS files, verify if it match with the list of selectors
-        foreach ($this->cssKeys as $key => $num) {
-            if ($this->_getReccursiveStyle($key, $lst)) {
-                $getit[$key] = $num;
-            }
-        }
-
-        // if we have selectors
-        if (count($getit)) {
-            // get them, but in the definition order, because of priority
-            asort($getit);
-            foreach ($getit as $key => $val) $styles = array_merge($styles, $this->css[$key]);
-        }
-
-        return $styles;
-    }
-
-    /**
-     * identify if the selector $key match with the list of tag selectors
-     *
-     * @access protected
-     * @param  string   $key CSS selector to analyse
-     * @param  array    $lst list of the selectors of each tags
-     * @param  string   $next next step of parsing the selector
-     * @return boolean
-     */
-    protected function _getReccursiveStyle($key, $lst, $next = null)
-    {
-        // if next step
-        if ($next!==null) {
-            // we remove this step
-            if ($next) $key = trim(substr($key, 0, -strlen($next)));
-            array_shift($lst);
-
-            // if no more step to identify => return false
-            if (!count($lst)) {
-                return false;
-            }
-        }
-
-        // for each selector of the current step
-        foreach ($lst[0] as $name) {
-            // if selector = key => ok
-            if ($key==$name) {
-                return true;
-            }
-
-            // if the end of the key = the selector and the next step is ok => ok
-            if (substr($key, -strlen(' '.$name))==' '.$name && $this->_getReccursiveStyle($key, $lst, $name)) {
-                return true;
-            }
-        }
-
-        // if we are not in the first step, we analyse the sub steps (the pareng tag of the current tag)
-        if ($next!==null && $this->_getReccursiveStyle($key, $lst, '')) {
-            return true;
-        }
-
-        // no corresponding found
-        return false;
-    }
-
-    /**
-     * Analyse a border
-     *
-     * @access  public
-     * @param   string $css css border properties
-     * @return  array  border properties
-     */
-    public function readBorder($css)
-    {
-        // border none
-        $none = array('type' => 'none', 'width' => 0, 'color' => array(0, 0, 0));
-
-        // default value
-        $type  = 'solid';
-        $width = $this->convertToMM('1pt');
-        $color = array(0, 0, 0);
-
-        // clean up the values
-        $css = explode(' ', $css);
-        foreach ($css as $k => $v) {
-            $v = trim($v);
-            if ($v) $css[$k] = $v;
-            else    unset($css[$k]);
-        }
-        $css = array_values($css);
-
-        // read the values
-        $res = null;
-        foreach ($css as $value) {
-
-            // if no border => return none
-            if ($value=='none' || $value=='hidden') {
-                return $none;
-            }
-
-            // try to convert the value as a distance
-            $tmp = $this->convertToMM($value);
-
-            // if the convert is ok => it is a width
-            if ($tmp!==null) {
-                $width = $tmp;
-            // else, it could be the type
-            } else if (in_array($value, array('solid', 'dotted', 'dashed', 'double'))) {
-                $type = $value;
-            // else, it could be the color
-            } else {
-                $tmp = $this->convertToColor($value, $res);
-                if ($res) $color = $tmp;
-            }
-        }
-
-        // if no witdh => return none
-        if (!$width) return $none;
-
-        // return the border properties
-        return array('type' => $type, 'width' => $width, 'color' => $color);
-    }
-
-    /**
-     * duplicate the borders if needed
-     *
-     * @access protected
-     * @param  &array $val
-     */
-    protected function _duplicateBorder(&$val)
-    {
-        // 1 value => L => RTB
-        if (count($val)==1) {
-            $val[1] = $val[0];
-            $val[2] = $val[0];
-            $val[3] = $val[0];
-        // 2 values => L => R & T => B
-        } else if (count($val)==2) {
-            $val[2] = $val[0];
-            $val[3] = $val[1];
-        // 3 values => T => B
-        } else if (count($val)==3) {
-            $val[3] = $val[1];
-        }
-    }
-
-    /**
-     * Analyse a background
-     *
-     * @access public
-     * @param  string $css css background properties
-     * @param  &array $value parsed values (by reference, because, ther is a legacy of the parent CSS properties)
-     */
-    public function convertBackground($css, &$value)
-    {
-        // is there a image ?
-        $text = '/url\(([^)]*)\)/isU';
-        if (preg_match($text, $css, $match)) {
-            // get the image
-            $value['image'] = $this->convertBackgroundImage($match[0]);
-
-            // remove if from the css properties
-            $css = preg_replace($text, '', $css);
-            $css = preg_replace('/[\s]+/', ' ', $css);
-        }
-
-        // protect some spaces
-        $css = preg_replace('/,[\s]+/', ',', $css);
-
-        // explode the values
-        $css = explode(' ', $css);
-
-        // background position to parse
-        $pos = '';
-
-        // foreach value
-        foreach ($css as $val) {
-            // try to parse the value as a color
-            $ok = false;
-            $color = $this->convertToColor($val, $ok);
-
-            // if ok => it is a color
-            if ($ok) {
-                $value['color'] = $color;
-            // else if transparent => no coloàr
-            } else if ($val=='transparent') {
-                $value['color'] = null;
-            // else
-            } else {
-                // try to parse the value as a repeat
-                $repeat = $this->convertBackgroundRepeat($val);
-
-                // if ok => it is repeat
-                if ($repeat) {
-                    $value['repeat'] = $repeat;
-                // else => it could only be a position
-                } else {
-                    $pos.= ($pos ? ' ' : '').$val;
-                }
-            }
-        }
-
-        // if we have a position to parse
-        if ($pos) {
-            // try to read it
-            $pos = $this->convertBackgroundPosition($pos, $ok);
-            if ($ok) $value['position'] = $pos;
-        }
-    }
-
-    /**
-     * parse a background color
-     *
-     * @access public
-     * @param  string $css
-     * @return string $value
-     */
-    public function convertBackgroundColor($css)
-    {
-        $res = null;
-        if ($css=='transparent') return null;
-        else                     return $this->convertToColor($css, $res);
-    }
-
-    /**
-     * parse a background image
-     *
-     * @access public
-     * @param  string $css
-     * @return string $value
-     */
-    public function convertBackgroundImage($css)
-    {
-        if ($css=='none')
-            return null;
-        else if (preg_match('/^url\(([^)]*)\)$/isU', $css, $match))
-            return $match[1];
-        else
-            return null;
-    }
-
-    /**
-     * parse a background position
-     *
-     * @access public
-     * @param  string $css
-     * @param  &boolean $res flag if conver is ok or not
-     * @return array ($x, $y)
-     */
-    public function convertBackgroundPosition($css, &$res)
-    {
-        // init the res
-        $res = false;
-
-        // explode the value
-        $css = explode(' ', $css);
-
-        // we must have 2 values. if 0 or >2 : error. if 1 => put center for 2
-        if (count($css)<2) {
-            if (!$css[0]) return null;
-            $css[1] = 'center';
-        }
-        if (count($css)>2) return null;
-
-        // prepare the values
-        $x = 0;
-        $y = 0;
-        $res = true;
-
-        // convert the first value
-        if ($css[0]=='left')        $x = '0%';
-        else if ($css[0]=='center') $x = '50%';
-        else if ($css[0]=='right')  $x = '100%';
-        else if ($css[0]=='top')    $y = '0%';
-        else if ($css[0]=='bottom') $y = '100%';
-        else if (preg_match('/^[-]?[0-9\.]+%$/isU', $css[0])) $x = $css[0];
-        else if ($this->convertToMM($css[0])) $x = $this->convertToMM($css[0]);
-        else $res = false;
-
-        // convert the second value
-        if ($css[1]=='left')        $x = '0%';
-        else if ($css[1]=='right')  $x = '100%';
-        else if ($css[1]=='top')    $y = '0%';
-        else if ($css[1]=='center') $y = '50%';
-        else if ($css[1]=='bottom') $y = '100%';
-        else if (preg_match('/^[-]?[0-9\.]+%$/isU', $css[1])) $y = $css[1];
-        else if ($this->convertToMM($css[1])) $y = $this->convertToMM($css[1]);
-        else $res = false;
-
-        // return the values
-        return array($x, $y);
-    }
-
-    /**
-     * parse a background repeat
-     *
-     * @access public
-     * @param  string $css
-     * @return string $value
-     */
-    public function convertBackgroundRepeat($css)
-    {
-        switch($css)
-        {
-            case 'repeat':
-                return array(true, true);
-            case 'repeat-x':
-                return array(true, false);
-            case 'repeat-y':
-                return array(false, true);
-            case 'no-repeat':
-                return array(false, false);
-        }
-        return null;
-    }
-
-     /**
-     * convert a distance to mm
-     *
-     * @access public
-     * @param  string $css distance to convert
-     * @param  float  $old parent distance
-     * @return float  $value
-     */
-    public function convertToMM($css, $old=0.)
-    {
-        $css = trim($css);
-        if (preg_match('/^[0-9\.\-]+$/isU', $css))        $css.= 'px';
-        if (preg_match('/^[0-9\.\-]+px$/isU', $css))      $css = 25.4/96. * str_replace('px', '', $css);
-        else if (preg_match('/^[0-9\.\-]+pt$/isU', $css)) $css = 25.4/72. * str_replace('pt', '', $css);
-        else if (preg_match('/^[0-9\.\-]+in$/isU', $css)) $css = 25.4 * str_replace('in', '', $css);
-        else if (preg_match('/^[0-9\.\-]+mm$/isU', $css)) $css = 1.*str_replace('mm', '', $css);
-        else if (preg_match('/^[0-9\.\-]+%$/isU', $css))  $css = 1.*$old*str_replace('%', '', $css)/100.;
-        else                                              $css = null;
-
-        return $css;
-    }
-
-    /**
-     * convert a css radius
-     *
-     * @access public
-     * @param  string $css
-     * @return float  $value
-     */
-    public function convertToRadius($css)
-    {
-        // explode the value
-        $css = explode(' ', $css);
-
-        foreach ($css as $k => $v) {
-            $v = trim($v);
-            if ($v) {
-                $v = $this->convertToMM($v, 0);
-                if ($v!==null) {
-                    $css[$k] = $v;
-                } else {
-                    unset($css[$k]);
-                }
-            } else {
-                unset($css[$k]);
-            }
-        }
-
-        return array_values($css);
-    }
-
-    /**
-     * convert a css color
-     *
-     * @access public
-     * @param  string $css
-     * @param  &boolean $res
-     * @return array (r,g, b)
-     */
-    public function convertToColor($css, &$res)
-    {
-        // prepare the value
-        $css = trim($css);
-        $res = true;
-
-        // if transparent => return null
-        if (strtolower($css)=='transparent') return array(null, null, null);
-
-        // HTML color
-        if (isset($this->_htmlColor[strtolower($css)])) {
-            $css = $this->_htmlColor[strtolower($css)];
-            $r = floatVal(hexdec(substr($css, 0, 2)));
-            $v = floatVal(hexdec(substr($css, 2, 2)));
-            $b = floatVal(hexdec(substr($css, 4, 2)));
-            return array($r, $v, $b);
-        }
-
-        // like #FFFFFF
-        if (preg_match('/^#[0-9A-Fa-f]{6}$/isU', $css)) {
-            $r = floatVal(hexdec(substr($css, 1, 2)));
-            $v = floatVal(hexdec(substr($css, 3, 2)));
-            $b = floatVal(hexdec(substr($css, 5, 2)));
-            return array($r, $v, $b);
-        }
-
-        // like #FFF
-        if (preg_match('/^#[0-9A-F]{3}$/isU', $css)) {
-            $r = floatVal(hexdec(substr($css, 1, 1).substr($css, 1, 1)));
-            $v = floatVal(hexdec(substr($css, 2, 1).substr($css, 2, 1)));
-            $b = floatVal(hexdec(substr($css, 3, 1).substr($css, 3, 1)));
-            return array($r, $v, $b);
-        }
-
-        // like rgb(100, 100, 100)
-        if (preg_match('/rgb\([\s]*([0-9%\.]+)[\s]*,[\s]*([0-9%\.]+)[\s]*,[\s]*([0-9%\.]+)[\s]*\)/isU', $css, $match)) {
-            $r = $this->_convertSubColor($match[1]);
-            $v = $this->_convertSubColor($match[2]);
-            $b = $this->_convertSubColor($match[3]);
-            return array($r*255., $v*255., $b*255.);
-        }
-
-        // like cmyk(100, 100, 100, 100)
-        if (preg_match('/cmyk\([\s]*([0-9%\.]+)[\s]*,[\s]*([0-9%\.]+)[\s]*,[\s]*([0-9%\.]+)[\s]*,[\s]*([0-9%\.]+)[\s]*\)/isU', $css, $match)) {
-            $c = $this->_convertSubColor($match[1]);
-            $m = $this->_convertSubColor($match[2]);
-            $y = $this->_convertSubColor($match[3]);
-            $k = $this->_convertSubColor($match[4]);
-            return array($c*100., $m*100., $y*100., $k*100.);
-        }
-
-        $res = false;
-        return array(0., 0., 0.);
-    }
-
-    /**
-     * color value to convert
-     *
-     * @access protected
-     * @param  string $c
-     * @return float $c 0.->1.
-     */
-    protected function _convertSubColor($c)
-    {
-        if (substr($c, -1)=='%') {
-            $c = floatVal(substr($c, 0, -1))/100.;
-        } else {
-            $c = floatVal($c);
-            if ($c>1) $c = $c/255.;
-        }
-
-        return $c;
-    }
-
-    /**
-     * read a css content
-     *
-     * @access protected
-     * @param  &string $code
-     */
-    protected function _analyseStyle(&$code)
-    {
-        // clean the spaces
-        $code = preg_replace('/[\s]+/', ' ', $code);
-
-        // remove the comments
-        $code = preg_replace('/\/\*.*?\*\//s', '', $code);
-
-        // split each CSS code "selector { value }"
-        preg_match_all('/([^{}]+){([^}]*)}/isU', $code, $match);
-
-        // for each CSS code
-        for ($k=0; $k<count($match[0]); $k++) {
-
-            // selectors
-            $names = strtolower(trim($match[1][$k]));
-
-            // css style
-            $styles = trim($match[2][$k]);
-
-            // explode each value
-            $styles = explode(';', $styles);
-
-            // parse each value
-            $css = array();
-            foreach ($styles as $style) {
-                $tmp = explode(':', $style);
-                if (count($tmp)>1) {
-                    $cod = $tmp[0]; unset($tmp[0]); $tmp = implode(':', $tmp);
-                    $css[trim(strtolower($cod))] = trim($tmp);
-                }
-            }
-
-            // explode the names
-            $names = explode(',', $names);
-
-            // save the values for each names
-            foreach ($names as $name) {
-                // clean the name
-                $name = trim($name);
-
-                // if a selector with somethink lige :hover => continue
-                if (strpos($name, ':')!==false) continue;
-
-                // save the value
-                if (!isset($this->css[$name]))
-                    $this->css[$name] = $css;
-                else
-                    $this->css[$name] = array_merge($this->css[$name], $css);
-
-            }
-        }
-
-        // get he list of the keys
-        $this->cssKeys = array_flip(array_keys($this->css));
-    }
-
-    /**
-     * Extract the css files from a html code
-     *
-     * @access public
-     * @param  string   &$html
-     */
-    public function readStyle(&$html)
-    {
-        // the CSS content
-        $style = ' ';
-
-        // extract the link tags, and remove them in the html code
-        preg_match_all('/<link([^>]*)>/isU', $html, $match);
-        $html = preg_replace('/<link[^>]*>/isU', '', $html);
-        $html = preg_replace('/<\/link[^>]*>/isU', '', $html);
-
-        // analyse each link tag
-        foreach ($match[1] as $code) {
-            $tmp = array();
-
-            // read the attributes name=value
-            $prop = '([a-zA-Z0-9_]+)=([^"\'\s>]+)';
-            preg_match_all('/'.$prop.'/is', $code, $match);
-            for ($k=0; $k<count($match[0]); $k++) {
-                $tmp[trim(strtolower($match[1][$k]))] = trim($match[2][$k]);
-            }
-
-            // read the attributes name="value"
-            $prop = '([a-zA-Z0-9_]+)=["]([^"]*)["]';
-            preg_match_all('/'.$prop.'/is', $code, $match);
-            for ($k=0; $k<count($match[0]); $k++) {
-                $tmp[trim(strtolower($match[1][$k]))] = trim($match[2][$k]);
-            }
-
-            // read the attributes name='value'
-            $prop = "([a-zA-Z0-9_]+)=[']([^']*)[']";
-            preg_match_all('/'.$prop.'/is', $code, $match);
-            for ($k=0; $k<count($match[0]); $k++) {
-                $tmp[trim(strtolower($match[1][$k]))] = trim($match[2][$k]);
-            }
-
-            // if type text/css => we keep it
-            if (isset($tmp['type']) && strtolower($tmp['type'])=='text/css' && isset($tmp['href'])) {
-
-                // get the href
-                $url = $tmp['href'];
-
-                // get the content of the css file
-                $content = @file_get_contents($url);
-
-                // if "http://" in the url
-                if (strpos($url, 'http://')!==false) {
-
-                    // get the domain "http://xxx/"
-                    $url = str_replace('http://', '', $url);
-                    $url = explode('/', $url);
-                    $urlMain = 'http://'.$url[0].'/';
-
-                    // get the absolute url of the path
-                    $urlSelf = $url; unset($urlSelf[count($urlSelf)-1]); $urlSelf = 'http://'.implode('/', $urlSelf).'/';
-
-                    // adapt the url in the css content
-                    $content = preg_replace('/url\(([^\\\\][^)]*)\)/isU', 'url('.$urlSelf.'$1)', $content);
-                    $content = preg_replace('/url\((\\\\[^)]*)\)/isU', 'url('.$urlMain.'$1)', $content);
-                } else {
-// @TODO correction on url in absolute on a local css content
-                    // $content = preg_replace('/url\(([^)]*)\)/isU', 'url('.dirname($url).'/$1)', $content);
-                }
-
-                // add to the CSS content
-                $style.= $content."\n";
-            }
-        }
-
-        // extract the style tags des tags style, and remove them in the html code
-        preg_match_all('/<style[^>]*>(.*)<\/style[^>]*>/isU', $html, $match);
-        $html = preg_replace('/<style[^>]*>(.*)<\/style[^>]*>/isU', '', $html);
-
-        // analyse each style tags
-        foreach ($match[1] as $code) {
-            // add to the CSS content
-            $code = str_replace('<!--', '', $code);
-            $code = str_replace('-->', '', $code);
-            $style.= $code."\n";
-        }
-
-        //analyse the css content
-        $this->_analyseStyle($style);
-    }
-}
\ No newline at end of file
diff --git a/html2pdf_v4.03/_class/parsingHtml.class.php b/html2pdf_v4.03/_class/parsingHtml.class.php
deleted file mode 100644
index fa24449c..00000000
--- a/html2pdf_v4.03/_class/parsingHtml.class.php
+++ /dev/null
@@ -1,520 +0,0 @@
-<?php
-/**
- * HTML2PDF Librairy - parsingHtml class
- *
- * HTML => PDF convertor
- * distributed under the LGPL License
- *
- * @author      Laurent MINGUET <webmaster@html2pdf.fr>
- * @version     4.03
- */
-
-class HTML2PDF_parsingHtml
-{
-    protected    $_html     = '';        // HTML code to parse
-    protected    $_num      = 0;         // table number
-    protected    $_level    = 0;         // table level
-    protected    $_encoding = '';        // encoding
-    public       $code      = array();   // parsed HTML codfe
-
-    const HTML_TAB = '        ';
-
-    /**
-     * main constructor
-     *
-     * @param   string encoding
-     * @access  public
-     */
-    public function __construct($encoding = 'UTF-8')
-    {
-        $this->_num   = 0;
-        $this->_level = array($this->_num);
-        $this->_html  = '';
-        $this->code  = array();
-        $this->setEncoding($encoding);
-    }
-
-    /**
-     * change the encoding
-     *
-     * @param   string encoding
-     * @access  public
-     */
-    public function setEncoding($encoding)
-    {
-        $this->_encoding = $encoding;
-    }
-
-    /**
-     * Define the HTML code to parse
-     *
-     * @param   string HTML code
-     * @access  public
-     */
-    public function setHTML($html)
-    {
-        // remove the HTML in comment
-        $html = preg_replace('/<!--(.*)-->/isU', '', $html);
-
-        // save the HTML code
-        $this->_html = $html;
-    }
-
-    /**
-     * parse the HTML code
-     *
-     * @access public
-     */
-    public function parse()
-    {
-        $parents = array();
-
-        // flag : are we in a <pre> Tag ?
-        $tagPreIn = false;
-
-        // action to use for each line of the content of a <pre> Tag
-        $tagPreBr = array(
-                    'name' => 'br',
-                    'close' => false,
-                    'param' => array(
-                        'style' => array(),
-                        'num'    => 0
-                    )
-                );
-
-        // tag that can be not closed
-        $tagsNotClosed = array(
-            'br', 'hr', 'img', 'col',
-            'input', 'link', 'option',
-            'circle', 'ellipse', 'path', 'rect', 'line', 'polygon', 'polyline'
-        );
-
-        // search the HTML tags
-        $tmp = array();
-        $this->_searchCode($tmp);
-
-        // all the actions to do
-        $actions = array();
-
-        // foreach part of the HTML code
-        foreach ($tmp as $part) {
-            // if it is a tag code
-            if ($part[0]=='code') {
-                // analise the HTML code
-                $res = $this->_analiseCode($part[1]);
-
-                // if it is a real HTML tag
-                if ($res) {
-                    // save the current posistion in the HTML code
-                    $res['html_pos'] = $part[2];
-
-                    // if the tag must be closed
-                    if (!in_array($res['name'], $tagsNotClosed)) {
-                        // if it is a closure tag
-                        if ($res['close']) {
-                            // HTML validation
-                            if (count($parents)<1)
-                                throw new HTML2PDF_exception(3, $res['name'], $this->getHtmlErrorCode($res['html_pos']));
-                            else if ($parents[count($parents)-1]!=$res['name'])
-                                throw new HTML2PDF_exception(4, $parents, $this->getHtmlErrorCode($res['html_pos']));
-                            else
-                                unset($parents[count($parents)-1]);
-                        } else {
-                            // if it is a autoclosed tag
-                            if ($res['autoclose']) {
-                                // save the opened tag
-                                $actions[] = $res;
-
-                                // prepare the closed tag
-                                $res['params'] = array();
-                                $res['close'] = true;
-                            }
-                            // else :add a child for validation
-                            else
-                                $parents[count($parents)] = $res['name'];
-                        }
-
-                        // if it is a <pre> tag (or <code> tag) not auclosed => update the flag
-                        if (($res['name']=='pre' || $res['name']=='code') && !$res['autoclose']) {
-                            $tagPreIn = !$res['close'];
-                        }
-                    }
-
-                    // save the actions to convert
-                    $actions[] = $res;
-                } else { // else (it is not a real HTML tag => we transform it in Texte
-                    $part[0]='txt';
-                }
-            }
-            // if it is text
-            if ($part[0]=='txt') {
-                // if we are not in a <pre> tag
-                if (!$tagPreIn) {
-                    // save the action
-                    $actions[] = array(
-                        'name'    => 'write',
-                        'close'    => false,
-                        'param' => array('txt' => $this->_prepareTxt($part[1])),
-                    );
-                } else { // else (if we are in a <pre> tag)
-                    // prepare the text
-                    $part[1] = str_replace("\r", '', $part[1]);
-                    $part[1] = explode("\n", $part[1]);
-
-                    // foreach line of the text
-                    foreach ($part[1] as $k => $txt) {
-                        // transform the line
-                        $txt = str_replace("\t", self::HTML_TAB, $txt);
-                        $txt = str_replace(' ', '&nbsp;', $txt);
-
-                        // add a break line
-                        if ($k>0) $actions[] = $tagPreBr;
-
-                        // save the action
-                        $actions[] = array(
-                            'name'    => 'write',
-                            'close'    => false,
-                            'param' => array('txt' => $this->_prepareTxt($txt, false)),
-                        );
-                    }
-                }
-            }
-        }
-
-        // for each indentified action, we have to clean up the begin and the end of the texte
-        // based on tags that surround it
-
-        // list of the tags to clean
-        $tagsToClean = array(
-            'page', 'page_header', 'page_footer', 'form',
-            'table', 'thead', 'tfoot', 'tr', 'td', 'th', 'br',
-            'div', 'hr', 'p', 'ul', 'ol', 'li',
-            'h1', 'h2', 'h3', 'h4', 'h5', 'h6',
-            'bookmark', 'fieldset', 'legend',
-            'draw', 'circle', 'ellipse', 'path', 'rect', 'line', 'g', 'polygon', 'polyline',
-            'option'
-        );
-
-        // foreach action
-        $nb = count($actions);
-        for ($k=0; $k<$nb; $k++) {
-            // if it is a Text
-            if ($actions[$k]['name']=='write') {
-                // if the tag before the text is a tag to clean => ltrim on the text
-                if ($k>0 && in_array($actions[$k-1]['name'], $tagsToClean))
-                    $actions[$k]['param']['txt'] = ltrim($actions[$k]['param']['txt']);
-
-                // if the tag after the text is a tag to clean => rtrim on the text
-                if ($k<$nb-1 && in_array($actions[$k+1]['name'], $tagsToClean))
-                    $actions[$k]['param']['txt'] = rtrim($actions[$k]['param']['txt']);
-
-                // if the text is empty => remove the action
-                if (!strlen($actions[$k]['param']['txt']))
-                    unset($actions[$k]);
-            }
-        }
-
-        // if we are not on the level 0 => HTML validator ERROR
-        if (count($parents)) throw new HTML2PDF_exception(5, $parents);
-
-        // save the actions to do
-        $this->code = array_values($actions);
-    }
-
-    /**
-     * prepare the text
-     *
-     * @param   string texte
-     * @param   boolean true => replace multiple space+\t+\r+\n by a single space
-     * @return  string texte
-     * @access  protected
-     */
-    protected function _prepareTxt($txt, $spaces = true)
-    {
-        if ($spaces) $txt = preg_replace('/\s+/is', ' ', $txt);
-        $txt = str_replace('&euro;', '€', $txt);
-        $txt = html_entity_decode($txt, ENT_QUOTES, $this->_encoding);
-        return $txt;
-    }
-
-    /**
-     * parse the HTML code
-     *
-     * @param    &array    array's result
-     * @return   null
-     */
-    protected function _searchCode(&$tmp)
-    {
-        // initialise the array
-        $tmp = array();
-
-        // regexp to separate the tags from the texts
-        $reg = '/(<[^>]+>)|([^<]+)+/isU';
-
-        // last match found
-        $str = '';
-        $offset = 0;
-
-        // As it finds a match
-        while (preg_match($reg, $this->_html, $parse, PREG_OFFSET_CAPTURE, $offset)) {
-            // if it is a tag
-            if ($parse[1][0]) {
-                // save the previous text if it exists
-                if ($str!=='')    $tmp[] = array('txt', $str);
-
-                // save the tag, with the offset
-                $tmp[] = array('code', trim($parse[1][0]), $offset);
-
-                // init the current text
-                $str = '';
-            } else { // else (if it is a text)
-                // add the new text to the current text
-                $str.= $parse[2][0];
-            }
-
-            // Update offset to the end of the match
-            $offset = $parse[0][1] + strlen($parse[0][0]);
-            unset($parse);
-        }
-        // if a text is present in the end, we save it
-        if ($str!='') $tmp[] = array('txt', $str);
-        unset($str);
-    }
-
-    /**
-     * analise a HTML tag
-     *
-     * @param   string   HTML code to analise
-     * @return  array    corresponding action
-     */
-    protected function _analiseCode($code)
-    {
-        // name of the tag, opening, closure, autoclosure
-        $tag = '<([\/]{0,1})([_a-z0-9]+)([\/>\s]+)';
-        if (!preg_match('/'.$tag.'/isU', $code, $match)) return null;
-        $close     = ($match[1]=='/' ? true : false);
-        $autoclose = preg_match('/\/>$/isU', $code);
-        $name      = strtolower($match[2]);
-
-        // required parameters (depends on the tag name)
-        $param    = array();
-        $param['style'] = '';
-        if ($name=='img') {
-            $param['alt'] = '';
-            $param['src'] = '';
-        }
-        if ($name=='a') {
-            $param['href'] = '';
-        }
-
-        // read the parameters : nom=valeur
-        $prop = '([a-zA-Z0-9_]+)=([^"\'\s>]+)';
-        preg_match_all('/'.$prop.'/is', $code, $match);
-        for($k=0; $k<count($match[0]); $k++)
-            $param[trim(strtolower($match[1][$k]))] = trim($match[2][$k]);
-
-        // read the parameters : nom="valeur"
-        $prop = '([a-zA-Z0-9_]+)=["]([^"]*)["]';
-        preg_match_all('/'.$prop.'/is', $code, $match);
-        for($k=0; $k<count($match[0]); $k++)
-            $param[trim(strtolower($match[1][$k]))] = trim($match[2][$k]);
-
-        // read the parameters : nom='valeur'
-        $prop = "([a-zA-Z0-9_]+)=[']([^']*)[']";
-        preg_match_all('/'.$prop.'/is', $code, $match);
-        for($k=0; $k<count($match[0]); $k++)
-            $param[trim(strtolower($match[1][$k]))] = trim($match[2][$k]);
-
-        // compliance of each parameter
-        $color  = "#000000";
-        $border = null;
-        foreach ($param as $key => $val) {
-            $key = strtolower($key);
-            switch($key)
-            {
-                case 'width':
-                    unset($param[$key]);
-                    $param['style'] .= 'width: '.$val.'px; ';
-                    break;
-
-                case 'align':
-                    if ($name==='img') {
-                        unset($param[$key]);
-                        $param['style'] .= 'float: '.$val.'; ';
-                    } elseif ($name!=='table') {
-                        unset($param[$key]);
-                        $param['style'] .= 'text-align: '.$val.'; ';
-                    }
-                    break;
-
-                case 'valign':
-                    unset($param[$key]);
-                    $param['style'] .= 'vertical-align: '.$val.'; ';
-                    break;
-
-                case 'height':
-                    unset($param[$key]);
-                    $param['style'] .= 'height: '.$val.'px; ';
-                    break;
-
-                case 'bgcolor':
-                    unset($param[$key]);
-                    $param['style'] .= 'background: '.$val.'; ';
-                    break;
-
-                case 'bordercolor':
-                    unset($param[$key]);
-                    $color = $val;
-                    break;
-
-                case 'border':
-                    unset($param[$key]);
-                    if (preg_match('/^[0-9]+$/isU', $val)) $val = $val.'px';
-                    $border = $val;
-                    break;
-
-                case 'cellpadding':
-                case 'cellspacing':
-                    if (preg_match('/^([0-9]+)$/isU', $val)) $param[$key] = $val.'px';
-                    break;
-
-                case 'colspan':
-                case 'rowspan':
-                    $val = preg_replace('/[^0-9]/isU', '', $val);
-                    if (!$val) $val = 1;
-                    $param[$key] = $val;
-                    break;
-            }
-        }
-
-        // compliance of the border
-        if ($border!==null) {
-            if ($border)    $border = 'border: solid '.$border.' '.$color;
-            else            $border = 'border: none';
-
-            $param['style'] .= $border.'; ';
-            $param['border'] = $border;
-        }
-
-        // reading styles: decomposition and standardization
-        $styles = explode(';', $param['style']);
-        $param['style'] = array();
-        foreach ($styles as $style) {
-            $tmp = explode(':', $style);
-            if (count($tmp)>1) {
-                $cod = $tmp[0];
-                unset($tmp[0]);
-                $tmp = implode(':', $tmp);
-                $param['style'][trim(strtolower($cod))] = preg_replace('/[\s]+/isU', ' ', trim($tmp));
-            }
-        }
-
-        // determining the level of table opening, with an added level
-        if (in_array($name, array('ul', 'ol', 'table')) && !$close) {
-            $this->_num++;
-            $this->_level[count($this->_level)] = $this->_num;
-        }
-
-        // get the level of the table containing the element
-        if (!isset($param['num'])) {
-            $param['num'] = $this->_level[count($this->_level)-1];
-        }
-
-        // for closures table: remove a level
-        if (in_array($name, array('ul', 'ol', 'table')) && $close) {
-            unset($this->_level[count($this->_level)-1]);
-        }
-
-        // prepare the parameters
-        if (isset($param['value']))  $param['value']  = $this->_prepareTxt($param['value']);
-        if (isset($param['alt']))    $param['alt']    = $this->_prepareTxt($param['alt']);
-        if (isset($param['title']))  $param['title']  = $this->_prepareTxt($param['title']);
-        if (isset($param['class']))  $param['class']  = $this->_prepareTxt($param['class']);
-
-        // return the new action to do
-        return array('name' => $name, 'close' => $close ? 1 : 0, 'autoclose' => $autoclose, 'param' => $param);
-    }
-
-    /**
-     * get a full level of HTML, between an opening and closing corresponding
-     *
-     * @param   integer key
-     * @return  array   actions
-     */
-    public function getLevel($k)
-    {
-        // if the code does not exist => return empty
-        if (!isset($this->code[$k])) return array();
-
-        // the tag to detect
-        $detect = $this->code[$k]['name'];
-
-        // if it is a text => return
-        if ($detect=='write') {
-            return array($this->code[$k]);
-        }
-
-        //
-        $level = 0;      // depth level
-        $end = false;    // end of the search
-        $code = array(); // extract code
-
-        // while it's not ended
-        while (!$end) {
-            // current action
-            $row = $this->code[$k];
-
-            // if 'write' => we add the text
-            if ($row['name']=='write') {
-                $code[] = $row;
-            } else { // else, it is a html tag
-                $not = false; // flag for not taking into account the current tag
-
-                // if it is the searched tag
-                if ($row['name']==$detect) {
-                    // if we are just at the root level => dont take it
-                    if ($level==0) {
-                        $not = true;
-                    }
-
-                    // update the level
-                    $level+= ($row['close'] ? -1 : 1);
-
-                    // if we are now at the root level => it is the end, and dont take it
-                    if ($level==0) {
-                        $not = true;
-                        $end = true;
-                    }
-                }
-
-                // if we can takin into account the current tag => save it
-                if (!$not) {
-                    if (isset($row['style']['text-align'])) unset($row['style']['text-align']);
-                    $code[] = $row;
-                }
-            }
-
-            // it continues as long as there has code to analise
-            if (isset($this->code[$k+1]))
-                $k++;
-            else
-                $end = true;
-        }
-
-        // return the extract
-        return $code;
-    }
-
-    /**
-     * return a part of the HTML code, for error message
-     *
-     * @param   integer position
-     * @param   integer take before
-     * @param   integer take after
-     * @return  string  part of the html code
-     */
-    public function getHtmlErrorCode($pos, $before=30, $after=40)
-    {
-        return substr($this->_html, $pos-$before, $before+$after);
-    }
-}
\ No newline at end of file
diff --git a/html2pdf_v4.03/_class/tcpdfConfig.php b/html2pdf_v4.03/_class/tcpdfConfig.php
deleted file mode 100644
index 6f10893c..00000000
--- a/html2pdf_v4.03/_class/tcpdfConfig.php
+++ /dev/null
@@ -1,247 +0,0 @@
-<?php
-//============================================================+
-// File name   : tcpdf_config.php
-// Begin       : 2004-06-11
-// Last Update : 2009-09-30
-//
-// Description : Configuration file for TCPDF.
-//
-// Author: Nicola Asuni
-//
-// (c) Copyright:
-//               Nicola Asuni
-//               Tecnick.com s.r.l.
-//               Via Della Pace, 11
-//               09044 Quartucciu (CA)
-//               ITALY
-//               www.tecnick.com
-//               info@tecnick.com
-//============================================================+
-
-/**
- * Configuration file for TCPDF.
- * @author Nicola Asuni
- * @copyright 2004-2008 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com)
- *            Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
- * @package com.tecnick.tcpdf
- * @version 4.0.014
- * @link http://tcpdf.sourceforge.net
- * @license http://www.gnu.org/copyleft/lesser.html LGPL
- * @since 2004-10-27
- */
-
-// If you define the constant K_TCPDF_EXTERNAL_CONFIG, the following settings will be ignored.
-
-if (!defined('K_TCPDF_EXTERNAL_CONFIG')) {
-
-    define('K_TCPDF_EXTERNAL_CONFIG', true);
-
-    // DOCUMENT_ROOT fix for IIS Webserver
-    if ((!isset($_SERVER['DOCUMENT_ROOT'])) OR (empty($_SERVER['DOCUMENT_ROOT']))) {
-        if (isset($_SERVER['SCRIPT_FILENAME'])) {
-            $_SERVER['DOCUMENT_ROOT'] = str_replace(
-                '\\',
-                '/',
-                substr($_SERVER['SCRIPT_FILENAME'], 0, 0-strlen($_SERVER['PHP_SELF']))
-            );
-        } elseif (isset($_SERVER['PATH_TRANSLATED'])) {
-            $_SERVER['DOCUMENT_ROOT'] = str_replace(
-                '\\',
-                '/',
-                substr(str_replace('\\\\', '\\', $_SERVER['PATH_TRANSLATED']), 0, 0-strlen($_SERVER['PHP_SELF']))
-            );
-        } else {
-            // define here your DOCUMENT_ROOT path if the previous fails
-            $_SERVER['DOCUMENT_ROOT'] = '/var/www';
-        }
-    }
-
-    // Automatic calculation for the following K_PATH_MAIN constant
-    $kPathMain = str_replace('\\', '/', dirname(__FILE__));
-    $kPathMain = dirname($kPathMain).'/'; // remove the current directory
-    $kPathMain.= '_tcpdf_'.HTML2PDF_USED_TCPDF_VERSION.'/';
-    define('K_PATH_MAIN', $kPathMain);
-
-    // Automatic calculation for the following K_PATH_URL constant
-    if (isset($_SERVER['HTTP_HOST']) AND (!empty($_SERVER['HTTP_HOST']))) {
-        if (isset($_SERVER['HTTPS']) AND (!empty($_SERVER['HTTPS'])) AND strtolower($_SERVER['HTTPS'])!='off') {
-            $kPathUrl = 'https://';
-        } else {
-            $kPathUrl = 'http://';
-        }
-        $kPathUrl .= $_SERVER['HTTP_HOST'];
-        $kPathUrl .= str_replace('\\', '/', substr(K_PATH_MAIN, (strlen($_SERVER['DOCUMENT_ROOT']) - 1)));
-    }
-
-    /**
-     * URL path to tcpdf installation folder (http://localhost/tcpdf/).
-     * By default it is automatically calculated but you can also set it as a fixed string to improve performances.
-     */
-    define('K_PATH_URL', $kPathUrl);
-
-    /**
-     * path for PDF fonts
-     * use K_PATH_MAIN.'fonts/old/' for old non-UTF8 fonts
-     */
-    define('K_PATH_FONTS', K_PATH_MAIN.'fonts/');
-
-    /**
-     * cache directory for temporary files (full path)
-     */
-    define('K_PATH_CACHE', K_PATH_MAIN.'cache/');
-
-    /**
-     * cache directory for temporary files (url path)
-     */
-    define('K_PATH_URL_CACHE', K_PATH_URL.'cache/');
-
-    /**
-     *images directory
-     */
-    define('K_PATH_IMAGES', K_PATH_MAIN.'images/');
-
-    /**
-     * blank image
-     */
-    define('K_BLANK_IMAGE', K_PATH_IMAGES.'_blank.png');
-
-    /**
-     * page format
-     */
-    define('PDF_PAGE_FORMAT', 'A4');
-
-    /**
-     * page orientation (P=portrait, L=landscape)
-     */
-    define('PDF_PAGE_ORIENTATION', 'P');
-
-    /**
-     * document creator
-     */
-    define('PDF_CREATOR', 'HTML2PDF - TCPDF');
-
-    /**
-     * document author
-     */
-    define('PDF_AUTHOR', 'HTML2PDF - TCPDF');
-
-    /**
-     * header title
-     */
-    define('PDF_HEADER_TITLE', null);
-
-    /**
-     * header description string
-     */
-    define('PDF_HEADER_STRING', null);
-
-    /**
-     * image logo
-     */
-    define('PDF_HEADER_LOGO', null);
-
-    /**
-     * header logo image width [mm]
-     */
-    define('PDF_HEADER_LOGO_WIDTH', null);
-
-    /**
-     *  document unit of measure [pt=point, mm=millimeter, cm=centimeter, in=inch]
-     */
-    define('PDF_UNIT', 'mm');
-
-    /**
-     * header margin
-     */
-    define('PDF_MARGIN_HEADER', 0);
-
-    /**
-     * footer margin
-     */
-    define('PDF_MARGIN_FOOTER', 0);
-
-    /**
-     * top margin
-     */
-    define('PDF_MARGIN_TOP', 0);
-
-    /**
-     * bottom margin
-     */
-    define('PDF_MARGIN_BOTTOM', 0);
-
-    /**
-     * left margin
-     */
-    define('PDF_MARGIN_LEFT', 0);
-
-    /**
-     * right margin
-     */
-    define('PDF_MARGIN_RIGHT', 0);
-
-    /**
-     * default main font name
-     */
-    define('PDF_FONT_NAME_MAIN', 'helvetica');
-
-    /**
-     * default main font size
-     */
-    define('PDF_FONT_SIZE_MAIN', 10);
-
-    /**
-     * default data font name
-     */
-    define('PDF_FONT_NAME_DATA', 'helvetica');
-
-    /**
-     * default data font size
-     */
-    define('PDF_FONT_SIZE_DATA', 8);
-
-    /**
-     * default monospaced font name
-     */
-    define('PDF_FONT_MONOSPACED', 'courier');
-
-    /**
-     * ratio used to adjust the conversion of pixels to user units
-     */
-    define('PDF_IMAGE_SCALE_RATIO', 1);
-
-    /**
-     * magnification factor for titles
-     */
-    define('HEAD_MAGNIFICATION', 1);
-
-    /**
-     * height of cell repect font height
-     */
-    define('K_CELL_HEIGHT_RATIO', 1);
-
-    /**
-     * title magnification respect main font size
-     */
-    define('K_TITLE_MAGNIFICATION', 1);
-
-    /**
-     * reduction factor for small font
-     */
-    define('K_SMALL_RATIO', 2/3);
-
-    /**
-     * set to true to enable the special procedure used to avoid the overlappind of symbols on Thai language
-     */
-    define('K_THAI_TOPCHARS', true);
-
-    /**
-     * if true allows to call TCPDF methods using HTML syntax
-     * IMPORTANT: For security reason, disable this feature if you are printing user HTML content.
-     */
-    define('K_TCPDF_CALLS_IN_HTML', false);
-}
-
-//============================================================+
-// END OF FILE
-//============================================================+
diff --git a/html2pdf_v4.03/_lisez_moi.txt b/html2pdf_v4.03/_lisez_moi.txt
deleted file mode 100644
index 30091f93..00000000
--- a/html2pdf_v4.03/_lisez_moi.txt
+++ /dev/null
@@ -1,95 +0,0 @@
-*******************************************************
-** Ce programme est distribué sous la licence LGPL,  **
-** reportez-vous au fichier _LGPL.txt ou à           **
-** http://www.gnu.org/licenses/lgpl.html             **
-** pour en savoir plus.                              **
-**                                                   **
-**  Copyright 2008-2011 par Laurent Minguet          **
-*******************************************************
-*******************************
-* HTML2PDF v4.03 - 27/05/2011 *
-*******************************
-
-Utilisation :
-------------
- - nécessite au minimum PHP5
-
- - regardez les exemples fournis, et lisez le wiki pour comprendre le fonctionnement.
-
- - il est TRES IMPORTANT de fournir du HTML 4.01 valide au convertisseur,
-   mais seulement ce que contient le <body>
-
- - pour les borders : il est conseillé qu'ils soient au format "solid 1mm #000000"
-
- - pour les paddings : ils ne sont applicables qu'aux balises table, th, td, div, li
-
- - Une fonte par défaut peut être précisée,au cas ou la fonte demandée n'existe pas ou si aucune fonte n'est indiquée :
-     $html2pdf->setDefaultFont('Arial');
-
- - la possibilité de protéger vos PDF est présente, CF Exemple 7.
-
- - Certains tests peuvent être activés (true) ou de désactivés(false) :
-     * méthode setTestIsImage      : tester que les images existent bien
-     * méthode setTestTdInOnePage  : tester que le contenu des TDs rentre sur une seule page
-     * méthode setTestIsDeprecated : tester que les anciennes propriétes des balises spécifiques ne sont plus présentes
-
- - Un mode DEBUG permettant de connaitre les ressources utilisées lors de la construction du PDF est présent.
-   Il est activable en rajoutant la commande suivante juste après le constructeur (cf exemple 0):
-      $htmlpdf->setModeDebug();
-
- - Certaines balises spécifiques ont été introduites :
-     * <page></page>  (CF Exemple 7 & wiki)
-         permet de définir le format, l'orientation, les marges left, right, top et bottom, l'image
-         et la couleur de fond d'une page, sa taille et position, le footer.
-         Il est également possible de garder les header et footer des pages précédentes,
-         grâce à l'attribue pageset="old" (CF Exemple 3 & 4 & wiki)
- 
-     * <page_header></page_header> (CF Exemple 3 & wiki)
-
-     * <page_footer></page_footer> (CF Exemple 3 & wiki)
-
-     * <nobreak></nobreak> (cf wiki)
-         permet de forcer l'affichage d'une partie sur une même page.
-         Si cette partie ne rentre pas dans le reste de la page, un saut de page est
-         effectué avant.
- 
-    * <barcode></barcode>  (CF Exemples 0 et 9 & wiki)
-         permet d'insérer des barcodes dans les pdfs, CF Exemples 0 et 9
-         Les types de codebar possible sont ceux de TCPDF
-         
-     * <qrcode></qrcode> (CF Exemple 13 & wiki)
-         permet d'insérer un codebar à 2 dimensions de type QRcode
-         (QR Code is registered trademark of DENSO WAVE INCORPORATED | http://www.denso-wave.com/qrcode/)
-
-     * <bookmark></bookmark>  (CF Exemples 7 & About & wiki)
-         permet d'insérer des bookmarks dans les pdfs, CF Exemple 7 et About.
-         Il est également possible de créer un index automatiquement en fin de
-         document (cf wiki)
-
-     * propriété css "rotate" :
-         valeurs possibles : 0, 90, 180, 270
-         applicable uniquement sur les divs (cf exemple 8)
-
-change log :
------------
- regardez le fichier _changelog.txt
-
-Aide et Support :
-----------------
- pour toutes questions et rapport de bug, merci d'utiliser exclusivement le lien de support ci-dessous.
- Je ne répondrai à aucune question en dehors, afin que tout le monde puisse profiter des réponses.
-
-Informations :
--------------
- Programmeur : Spipu
-      email   : webmaster@html2pdf.fr
-      site    : http://html2pdf.fr/
-      wiki    : http://html2pdf.fr/fr/wiki
-      support : http://html2pdf.fr/fr/forum
-
-Remerciement :
--------------
- * Olivier Plathey pour avoir conçu FPDF
- * Nicola Asuni pour les modifications qu'il a accepté d'apporter à TCPDF
- * yAronet pour l'hébergement du forum de support
- * toutes les personnes qui m'ont aidé à développer cette librairie, et à traduire les différents textes
diff --git a/html2pdf_v4.03/_read_me.txt b/html2pdf_v4.03/_read_me.txt
deleted file mode 100644
index bb80e5ad..00000000
--- a/html2pdf_v4.03/_read_me.txt
+++ /dev/null
@@ -1,93 +0,0 @@
-*********************************************************
-** This program is distributed under the LGPL License, **
-** for more information see file _LGPL.txt or          **
-** http://www.gnu.org/licenses/lgpl.html               **
-**                                                     **
-**  Copyright 2008-2011 by Laurent Minguet             **
-*********************************************************
-*******************************
-* HTML2PDF v4.03 - 2011-05-27 *
-*******************************
-
-How to use :
-------------
- - You need at least PHP 5
-
- - Look at the examples provided to see how it works.
-
- - It is very important to provide valid HTML 4.01 to the converter,
-   but only what is in the <body>
-
- - for borders: it is advised that they are like "solid 1mm #000000"
-
- - for padding, they are applicable only on tags table, th, td, div, li
-
- - A default font can be specified, if the requested font does not exist or if no font is specified:
-     $html2pdf->setDefaultFont('Arial');
-
- - The possibility to protect your PDF is present, CF Example 7.
-
- - Some tests can be enabled (true) or disabled (false) :
-     * setTestIsImage method:      test that images must exist
-     * setTestTdInOnePage method:  test that the contents of TDs fit on one page
-     * setTestIsDeprecated method: test that old properties of specific tags are not used anymore
-
-  - A DEBUG mode to know the resources used is present
-   It is activated by adding the following command just after the contructor (see Example 0):
-      $htmlpdf->setModeDebug();
-
- - Some specific tags have been introduced:
-     * <page></page>  (CF Exemple 7 & wiki)
-       determines the orientation, margins left, right, top and bottom, the background image
-       and the background color of a page, its size and position, the footer.
-       It is also possible to keep the header and footer of the previous pages,
-       through the attribut pageset="old" (see Example 3 & 4 & wiki)
-
-     * <page_header></page_header> (CF Example 3 & wiki)
-
-     * <page_footer></page_footer> (CF Example 3 & wiki)
-
-     * <nobreak></nobreak> (cd wiki)
-         used to force the display of a section on the same page.
-         If this section does not fit into the rest of the page, a page break is done before.
-
-     * <barcode></barcode>  (CF Examples 0 & 9 & wiki)
-         can insert barcodes in pdfs, CF Examples 0 and 9
-         The possible types of codebar are alls of TCPDF
-
-     * <qrcode></qrcode> (CF Example 13 & wiki)
-         can insert QRcode 2D barcodes
-         (QR Code is registered trademark of DENSO WAVE INCORPORATED | http://www.denso-wave.com/qrcode/)
-
-     * <bookmark></bookmark>  (CF Examples 7 & About & wiki)
-         can insert bookmark in pdfs, CF Example 7 and About.
-         It is also possible to automatically create an index at the end of
-         document  (CF Example About & wiki)
-
-     * css property "rotate" :
-         values : 0, 90, 180, 270
-         works only on div (cf example 8)
-
-change log :
------------
- see on this page : http://html2pdf.fr/en/download
-
-Help & Support :
----------------
- For questions and bug reports, thank you to use only the support link below.
- I will answer to your questions only on it...
-
-Informations :
--------------
- Programmer : Spipu
-      email    : webmaster@html2pdf.fr
-      web site : http://html2pdf.fr/
-      wiki     : http://html2pdf.fr/en/wiki
-      support  : http://html2pdf.fr/en/forum
-
-Thanks :
--------
- * Olivier Plathey: for have made FPDF
- * Nicola Asuni: for the changes he has agreed to make to TCPDF
- * yAronet: for hosting support forum
- * everyone who helped me to develop this library and to bring the texts
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/2dbarcodes.php b/html2pdf_v4.03/_tcpdf_5.0.002/2dbarcodes.php
deleted file mode 100644
index a266bfbf..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/2dbarcodes.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php
-//============================================================+
-// File name   : 2dbarcodes.php
-// Begin       : 2009-04-07
-// Last Update : 2010-04-30
-// Version     : 1.0.003
-// License     : GNU LGPL (http://www.gnu.org/copyleft/lesser.html)
-// 	----------------------------------------------------------------------------
-//  Copyright (C) 2008-2009 Nicola Asuni - Tecnick.com S.r.l.
-//
-// 	This program is free software: you can redistribute it and/or modify
-// 	it under the terms of the GNU Lesser General Public License as published by
-// 	the Free Software Foundation, either version 2.1 of the License, or
-// 	(at your option) any later version.
-//
-// 	This program is distributed in the hope that it will be useful,
-// 	but WITHOUT ANY WARRANTY; without even the implied warranty of
-// 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// 	GNU Lesser General Public License for more details.
-//
-// 	You should have received a copy of the GNU Lesser General Public License
-// 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-// 	See LICENSE.TXT file for more information.
-//  ----------------------------------------------------------------------------
-//
-// Description : PHP class to creates array representations for
-//               2D barcodes to be used with TCPDF.
-//
-// Author: Nicola Asuni
-//
-// (c) Copyright:
-//               Nicola Asuni
-//               Tecnick.com S.r.l.
-//               Via della Pace, 11
-//               09044 Quartucciu (CA)
-//               ITALY
-//               www.tecnick.com
-//               info@tecnick.com
-//============================================================+
-
-/**
- * PHP class to creates array representations for 2D barcodes to be used with TCPDF.
- * @package com.tecnick.tcpdf
- * @abstract Functions for generating string representation of 2D barcodes.
- * @author Nicola Asuni
- * @copyright 2008-2009 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
- * @link http://www.tcpdf.org
- * @license http://www.gnu.org/copyleft/lesser.html LGPL
- * @version 1.0.003
- */
-
-	/**
-	* PHP class to creates array representations for 2D barcodes to be used with TCPDF (http://www.tcpdf.org).<br>
-	* @name TCPDFBarcode
-	* @package com.tecnick.tcpdf
-	* @version 1.0.003
-	* @author Nicola Asuni
-	* @link http://www.tcpdf.org
-	* @license http://www.gnu.org/copyleft/lesser.html LGPL
-	*/
-class TCPDF2DBarcode {
-
-	/**
-	 * @var array representation of barcode.
-	 * @access protected
-	 */
-	protected $barcode_array = false;
-
-	/**
-	 * This is the class constructor.
-	 * Return an array representations for 2D barcodes:<ul>
-	 * <li>$arrcode['code'] code to be printed on text label</li>
-	 * <li>$arrcode['num_rows'] required number of rows</li>
-	 * <li>$arrcode['num_cols'] required number of columns</li>
-	 * <li>$arrcode['bcode'][$r][$c] value of the cell is $r row and $c column (0 = transparent, 1 = black)</li></ul>
-	 * @param string $code code to print
- 	 * @param string $type type of barcode: <ul>li>RAW: raw mode - comma-separad list of array rows</li><li>RAW2: raw mode - array rows are surrounded by square parenthesis.</li><li>QRCODE : QR-CODE Low error correction</li><li>QRCODE,L : QR-CODE Low error correction</li><li>QRCODE,M : QR-CODE Medium error correction</li><li>QRCODE,Q : QR-CODE Better error correction</li><li>QRCODE,H : QR-CODE Best error correction</li></ul>
-	 */
-	public function __construct($code, $type) {
-		$this->setBarcode($code, $type);
-	}
-
-	/**
-	 * Return an array representations of barcode.
- 	 * @return array
-	 */
-	public function getBarcodeArray() {
-		return $this->barcode_array;
-	}
-
-	/**
-	 * Set the barcode.
-	 * @param string $code code to print
- 	 * @param string $type type of barcode: <ul><li>RAW: raw mode - comma-separad list of array rows</li><li>RAW2: raw mode - array rows are surrounded by square parenthesis.</li><li>QRCODE : QR-CODE Low error correction</li><li>QRCODE,L : QR-CODE Low error correction</li><li>QRCODE,M : QR-CODE Medium error correction</li><li>QRCODE,Q : QR-CODE Better error correction</li><li>QRCODE,H : QR-CODE Best error correction</li></ul>
- 	 * @return array
-	 */
-	public function setBarcode($code, $type) {
-		$mode = explode(',', $type);
-		$qrtype = strtoupper($mode[0]);
-		switch ($qrtype) {
-			case 'QRCODE': { // QR-CODE
-				require_once(dirname(__FILE__).'/qrcode.php');
-				if (!isset($mode[1]) OR (!in_array($mode[1],array('L','M','Q','H')))) {
-					$mode[1] = 'L'; // Ddefault: Low error correction
-				}
-				$qrcode = new QRcode($code, strtoupper($mode[1]));
-				$this->barcode_array = $qrcode->getBarcodeArray();
-				break;
-			}
-			case 'RAW':
-			case 'RAW2': { // RAW MODE
-				// remove spaces
-				$code = preg_replace('/[\s]*/si', '', $code);
-				if (strlen($code) < 3) {
-					break;
-				}
-				if ($qrtype == 'RAW') {
-					// comma-separated rows
-					$rows = explode(',', $code);
-				} else {
-					// rows enclosed in square parethesis
-					$code = substr($code, 1, -1);
-					$rows = explode('][', $code);
-				}
-				$this->barcode_array['num_rows'] = count($rows);
-				$this->barcode_array['num_cols'] = strlen($rows[0]);
-				$this->barcode_array['bcode'] = array();
-				foreach ($rows as $r) {
-					$this->barcode_array['bcode'][] = str_split($r, 1);
-				}
-				break;
-			}
-			case 'TEST': { // TEST MODE
-				$this->barcode_array['num_rows'] = 5;
-				$this->barcode_array['num_cols'] = 15;
-				$this->barcode_array['bcode'] = array(
-					array(1,1,1,0,1,1,1,0,1,1,1,0,1,1,1),
-					array(0,1,0,0,1,0,0,0,1,0,0,0,0,1,0),
-					array(0,1,0,0,1,1,0,0,1,1,1,0,0,1,0),
-					array(0,1,0,0,1,0,0,0,0,0,1,0,0,1,0),
-					array(0,1,0,0,1,1,1,0,1,1,1,0,0,1,0));
-				break;
-			}
-			default: {
-				$this->barcode_array = false;
-			}
-		}
-	}
-} // end of class
-
-//============================================================+
-// END OF FILE
-//============================================================+
-?>
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/CHANGELOG.TXT b/html2pdf_v4.03/_tcpdf_5.0.002/CHANGELOG.TXT
deleted file mode 100644
index fdc27028..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/CHANGELOG.TXT
+++ /dev/null
@@ -1,1384 +0,0 @@
-5.0.002 (2010-05-06)
-	- Bookmark() and related methods were fixed to accept HTML code.
-	- A problem on HTML links was fixed.
-
-5.0.001 (2010-05-06)
-	- Protected method _putstream was re-added for backward compatibility.
-	- The following method were added to display HTML Table Of Content (see example n. 59):
-		addTOCPage(), endTOCPage(), addHTMLTOC().
-
-5.0.000 (2010-05-05)
-	- Method ImageSVG() was added to embedd SVG images (see example n. 58). Note that not all SVG images are supported.
-	- Method setRasterizeVectorImages() was added to enable/disable rasterization for vector images via ImageMagick library.
-	- Method RoundedRectXY() was added.
-	- Method PieSectorXY() was added.
-	- Gradient() method is now public and support new features.
-	- Shading to transparency is now supported.
-	- Image alignments were fixed.
-	- Support for dynamic images were improved.
-	- PDF_IMAGE_SCALE_RATIO has been changed to 1.25 for better compatibility with SVG.
-	- RAW and RAW2 modes were added to 2D Barcodes (see example n. 50).
-	- Automatic padding feature was added on barcodes (see examples n. 27 and 50).
-	- Bug #2995003 "Reproduced thead bug" was fixed.
-	- The Output() method now accepts FI and FD destinations to save the document on server before sending it to the client.
-	- Ellipse() method was improved and fixed (see page 2 of example n. 12).
-	
---------------------------------------------------------------------------------
-
-4.9.018 (2010-04-21)
-	- Bug item #2990356 "Current font size not respected with more than two HTML <p>" was fixed.
-
-4.9.017 (2010-04-21)
-	- Bug item #2990224 "Different behaviour for equivalent HTML strings" was fixed.
-	- Bug item #2990314 "Dash is not appearing with SHY character" was fixed.
-
-4.9.016 (2010-04-20)
-	- An error on htmlcolors.php was fixed.
-	- getImageFileType() method was improved.
-	- GIF images with transparency are now better supported.
-	- Automatic page orientation was improved.
-
-4.9.015 (2010-04-20)
-	- A new method copyPage() was added to clone pages (see example n. 44).
-	- Support for text overline was added.
-	- Underline and linethrough methods were fixed.
-	- Bug #2989058 "SHY character causes unnecessary word-wrapping" was fixed.
-
-4.9.014 (2010-04-18)
-	- Bug item #2988845 was fixed.
-
-4.9.013 (2010-04-15)
-	- Image() and ImageEPS() methods were fixed and improved; $fitonpage parameter was added.
-
-4.9.012 (2010-04-12)
-	- The hyphenateText() method was added to automatically hyphenate text (see example n. 46).
-
-4.9.011 (2010-04-07)
-	- Vertical alignments for Cell() method were improved (see example n. 57).
-
-4.9.010 (2010-04-06)
-	- Signature of Cell() method now includes new parameters for vertical alignment (see example n. 57).
-	- Text() method was extended to include all Cell() parameters.
-	- HTML line alignment procedure was changed to fix some bugs.
-
-4.9.009 (2010-04-05)
-	- Text() method was fixed for backward compatibility.
-
-4.9.008 (2010-04-03)
-	- Additional line space after table header was removed.
-	- Support for HTML lists in multicolumn mode was added.
-	- The method setTextRenderingMode() was added to set text rendering modes (see the example n. 26).
-	- The following HTML attributes were added to set text rendering modes (see the example n. 26): stroke, strokecolor, fill.
-
-4.9.007 (2010-04-03)
-	- Font Descent computation was fixed (patch #2981441).
-
-4.9.006 (2010-04-02)
-	- The constant K_TCPDF_CALLS_IN_HTML was added on configuration file to enable/disable the ability to call TCPDF methods in HTML.
-	- The usage of tcpdf tag in HTML mode was changed to remove the possible security flaw offered by the eval() function (thanks to Matthias Hecker for spotting this security problem). See the new example n. 49 for further information.
-
-4.9.005 (2010-04-01)
-	- Bug# 2980354 "Wrong File attachment description with security" was fixed.
-	- Several problems with HTML line alignment were fixed.
-	- The constant K_THAI_TOPCHAR was added on configuration file to enable/disable the special procedure used to avoid the overlappind of symbols on Thai language.
-	- A problem with font name directory was fixed.
-	- A bug on _destroy() method was fixed.
-
-4.9.004 (2010-03-31)
-	- Patch #979681 "GetCharWidth - default character width" was applied (bugfix).
-
-4.9.003 (2010-03-30)
-	- Problem of first <br /> on multiple columns was fixed.
-	- HTML line alignment was fixed.
-	- A QR-code bug was fixed.
-
-4.9.002 (2010-03-29)
-	- Patch #2978349 "$ignore_min_height is ignored in function Cell()" was applied.
-	- Bug #2978607 "2D Barcodes are wrong" was fixed.
-	- A problem with HTML block tags was fixed.
-	- Artificial italic for CID-0 fonts was added.
-	- Several multicolumn bugs were fixed.
-	- Support for HTML tables on multicolumn was added.
-
-4.9.001 (2010-03-28)
-	- QR Code minor bug was fixed.
-	- Multicolumn mode was added (see the new example n. 10).
-	- The following methods were added: setEqualColumns(), setColumnsArray(), selectColumn().
-	- Thai diacritics support were changed (note that this is incompatible with html justification).
-
-4.9.000 (2010-03-27)
-	- QR Code (2D barcode) support was added (see example n. 50).
-	- The following methods were added to print crop and registration marks (see example n. 56): colorRegistrationBar(), cropMark(), registrationMark().
-	- Limited support for CSS line-height property was added.
-	- Gradient method now supports Gray, RGB and CMYK space color.
-	- Example n. 51 was updated.
-	- Vertical alignment of font inside cell was fixed.
-	- Support for multiple Thai diacritics was added.
-	- Bug item #2974929 "Duplicate case values" was fixed.
-	- Bug item #2976729 "File attachment not working with security" was fixed.
-
---------------------------------------------------------------------------------
-
-4.8.039 (2010-03-20)
-	- Problems related to custom locale settings were fixed.
-	- Problems related to HTML on Header and Footer were fixed.
-
-4.8.038 (2010-03-13)
-	- Various bugs related to page-break in HTML mode were fixed.
-	- Bug item #2968974 "Another <thead> pagebreak problem" was fixed.
-	- Bug item #2969276 "justification problem" was fixed.
-	- Bug item #2969289 "bug when using justified text and custom headers" was fixed.
-	- Images are now automatically resized to be contained on the page.
-	- Some HTML line alignments were fixed.
-	- Signature of AddPage() and SetMargins() methods were changed to include an option to set default page margins.
-
-4.8.037 (2010-03-03)
-	- Bug item #2962068 was fixed.
-	- Bug item #2967017 "Problems with <thead> and pagebreaks" was fixed.
-	- Bug item #2967023 "table header lost with pagebreak" was fixed.
-	- Bug item #2967032 "Header lost with nested tables" was fixed.
-
-4.8.036 (2010-02-24)
-	- Automatic page break for HTML images was improved.
-	- Example 10 was updated.
-	- Japanese was removed from example 8 because the freeserif font doesn't contain japanese (you can display it using arialunicid0 font).
-
-4.8.035 (2010-02-23)
-	- Automatic page break for HTML images was added.
-	- Support for multicolumn HTML was added (example 10 was updated).
-
-4.8.034 (2010-02-17)
-	- Language files were updated.
-
-4.8.033 (2010-02-12)
-	- A bug related to protection mode with links was fixed.
-
-4.8.032 (2010-02-04)
-	- A bug related to $maxh parameter on Write() and MultiCell() was fixed.
-	- Support for body tag was added.
-
-4.8.031 (2010-01-30)
-	- Bug item #2941589 "paragraph justify not working on some non-C locales" was fixed.
-
-4.8.030 (2010-01-27)
-	- Some text alignment cases were fixed.
-
-4.8.029 (2010-01-27)
-	- Bug item #2941057 "TOC Error in PDF File Output" was fixed.
-	- Some text alignment cases were fixed.
-
-4.8.028 (2010-01-26)
-	- Text alignment for RTL mode was fixed.
-
-4.8.027 (2010-01-25)
-	- Bug item #2938412 "Table related problems - thead, nobr, table width" was fixed.
-
-4.8.026 (2010-01-19)
-	- The misspelled word "lenght" was replaced with "length" in some variables and comments.
-
-4.8.025 (2010-01-18)
-	- addExtGState() method was improved to reuse existing ExtGState objects.
-
-4.8.024 (2010-01-15)
-	- Justification mode for HTML was fixed (Bug item #2932470).
-
-4.8.023 (2010-01-15)
-	- Bug item #2932470 "Some HTML entities breaks justification" was fixed.
-
-4.8.022 (2010-01-14)
-	- Source code documentation was fixed.
-
-4.8.021 (2010-01-03)
-	- A Bug relative to Table Of Content index was fixed.
-
-4.8.020 (2009-12-21)
-	- Bug item #2918545 "Display problem of the first row of a table with larger font" was fixed.
-	- A Bug relative to table rowspan mode was fixed.
-
-4.8.019 (2009-12-16)
-	- Bug item #2915684 "Image size" was fixed.
-	- Bug item #2914995 "Image jpeg quality" was fixed.
-	- The signature of the Image() method was changed (check the documentation for the $resize parameter).
-
-4.8.018 (2009-12-15)
-	- Bug item #2914352 "write error" was fixed.
-
-4.8.017 (2009-11-27)
-	- THEAD problem when table is used on header/footer was fixed.
-	- A first line alignment on HTML justification was fixed.
-	- Method getImageFileType() was added.
-	- Images with unknown extension and type are now supported via ImageMagick PHP extension.
-
-4.8.016 (2009-11-21)
-	- Document Information Dictionary was fixed.
-	- CSS attributes 'page-break-before', 'page-break-after' and 'page-break-inside' are now supported.
-	- Problem of unclosed last page was fixed.
-	- Problem of 'thead' unnecessarily repeated on the next page was fixed.
-
-4.8.015 (2009-11-20)
-	- A problem with some PNG transparency images was fixed.
-	- Bug #2900762 "Sort issues in Bookmarks" was fixed.
-	- Text justification was fixed for various modes: underline, strikeout and background.
-
-4.8.014 (2009-11-04)
-	- Bug item #2891316 "writeHTML, underlining replacing spaces" was fixed.
-	- The handling of temporary RTL text direction mode was fixed.
-
-4.8.013 (2009-10-26)
-	- Bug item #2884729 "Problem with word-wrap and hyphen" was fixed.
-
-4.8.012 (2009-10-23)
-	- Table cell alignments for RTL booklet mode were fixed.
-	- Images and barcode alignments for booklet mode were fixed.
-
-4.8.011 (2009-10-22)
-	- DejaVu fonts were updated to latest version.
-
-4.8.010 (2009-10-21)
-	- Bookmark for TOC page was added.
-	- Signature of addTOC() method is changed.
-	- Bookmarks are now automatically sorted by page and Y position.
-	- Example n. 45 was updated.
-	- Example n. 55 was added to display all charactes available on core fonts.
-
-4.8.009 (2009-09-30)
-	- Compatibility with PHP 5.3 was improved.
-	- All examples were updated.
-	- Index file for examples was added.
-
-4.8.008 (2009-09-29)
-	- Example 49 was updated.
-	- Underline and linethrough now works with cell stretching mode.
-
-4.8.007 (2009-09-23)
-	- Infinite loop problem caused by nobr attribute was fixed.
-
-4.8.006 (2009-09-23)
-	- Bug item #2864522 "No images if DOCUMENT_ROOT=='/'" was fixed.
-	- Support for text-indent CSS attribute was added.
-	- Method rollbackTransaction() was changed to support self-reassigment of previous object (check source code documentation).
-	- Support for the HTML "nobr" attribute was added to avoid splitting a table or a table row on two pages (i.e.: <tr nobr="true">...</tr>).
-
-4.8.005 (2009-09-17)
-	- A bug relative to multiple transformations and annotations was fixed.
-
-4.8.004 (2009-09-16)
-	- A bug on _putannotsrefs() method was fixed.
-
-4.8.003 (2009-09-15)
-	- Bug item #2858754 "Division by zero" was fixed.
-	- A bug relative to HTML list items was fixed.
-	- A bug relative to form fields on multiple pages was fixed.
-	- PolyLine() method was added (see example n. 12).
-	- Signature of Polygon() method was changed.
-
-4.8.002 (2009-09-12)
-	- A problem related to CID-0 fonts offset was fixed: if the $cw[1] entry on the CID-0 font file is not defined, then a CID keys offset is introduced.
-
-4.8.001 (2009-09-09)
-	- The appearance streams (AP) for anotations form fields was fixed (see examples n. 14 and 54).
-	- Radiobuttons were fixed.
-
-4.8.000 (2009-09-07)
-	- This version includes some support for Forms fields (see example n. 14) and XHTML forms (see example n. 54).
-	- The following methods were changed to work without JavaScript: TextField(), RadioButton(), ListBox(), ComboBox(), CheckBox(), Button().
-	- Support for Widget annotations was improved.
-	- Alignment of annotation objects was fixed (examples 36 and 41 were updated).
-	- addJavascriptObject() method was added.
-	- Signature of Image() method was changed.
-	- htmlcolors.php file was updated.
-
---------------------------------------------------------------------------------
-
-4.7.003 (2009-09-03)
-	- Support for TCPDF methods on HTML was improved (see example n. 49).
-
-4.7.002 (2009-09-02)
-	- Bug item #2848892 "writeHTML + table: Gaps between rows" was fixed.
-	- JavaScript support was fixed (see example n. 53).
-
-4.7.001 (2009-08-30)
-	- The Polygon() and Arrow() methods were fixed and improved (see example n. 12).
-
-4.7.000 (2009-08-29)
-	- This is a major release.
-	- Some procedures were internally optimized.
-	- The problem of mixed signature and annotations was fixed (example n. 52).
-
-4.6.030 (2009-08-29)
-	- IMPORTANT: percentages on table cell widths are now relative to the full table width (as in standard HTML).
-	- Various minor bugs were fixed.
-	- Example n. 52 (digital signature) was updated.
-
-4.6.029 (2009-08-26)
-	- PHP4 version was fixed.
-
-4.6.028 (2009-08-25)
-	- Signature algorithm was finally fixed (see example n. 52).
-
-4.6.027 (2009-08-24)
-	- TCPDF now supports unembedded TrueTypeUnicode Fonts (just comment the $file entry on the fonts' php file.
-
-4.6.026 (2009-08-21)
-	- Bug #2841693 "Problem with MultiCell and ishtml and justification" was fixed.
-	- Signature functions were improved but not yet fixed (tcpdf.crt and example n. 52 were updated).
-
-4.6.025 (2009-08-17)
-	- Carriage returns (\r) were removed from source code.
-	- Problem related to set_magic_quotes_runtime() depracated was fixed.
-
-4.6.024 (2009-08-07)
-	- Bug item #2833556 "justification using other units than mm" was fixed.
-	- Documentation was fixed/updated.
-
-4.6.023 (2009-08-02)
-	- Bug item #2830537 "MirrorH can show mask for transparent PNGs" was fixed.
-
-4.6.022 (2009-07-24)
-	- A bug relative to single line printing when using WriteHTMLCell() was fixed.
-	- Signature support were improved but is still experimental.
-	- Fonts Free and Dejavu were updated to latest versions.
-
-4.6.021 (2009-07-20)
-	- Bug item #2824015 "XHTML Ampersand &amp; in hyperlink bug" was fixed.
-	- Bug item #2824036 "Image as hyperlink in table, text displaced at page break" was fixed.
-	- Links alignment on justified text was fixed.
-	- Unicode "\u" modifier was added to re_spaces variable by default.
-
-4.6.020 (2009-07-16)
-	- Bug item #2821921 "issue in example 18" was fixed.
-	- Signature of SetRTL() method was changed.
-
-4.6.019 (2009-07-13)
-	- Bug item #2820703 "xref table broken" was fixed.
-
-4.6.018 (2009-07-10)
-	- Bug item #2819319 "Text over text" was fixed.
-	- Method Arrow() was added to print graphic arrows (example 12 was updated).
-
-4.6.017 (2009-07-05)
-	- Bug item #2816079 "Example 48 not working" was fixed.
-	- The signature of the checkPageBreak() was changed. The parameter $addpage was added to turn off the automatic page creation.
-
-4.6.016 (2009-06-16)
-	- Method setSpacesRE() was added to set the regular expression used for detecting withespaces or word separators. If you are using chinese, try: setSpacesRE('/[\s\p{Z}\p{Lo}]/');, otherwise you can use setSpacesRE('/[\s\p{Z}]/');
-	- The method _putinfo() now automatically fills the metadata with '?' in case of empty string.
-
-4.6.015 (2009-06-11)
-	- Bug #2804667 "word wrap bug" was fixed.
-
-4.6.014 (2009-06-04)
-	- Bug #2800931 "Table thead tag bug" was fixed.
-	- A bug related to <pre> tag was fixed.
-
-4.6.013 (2009-05-28)
-	- List bullets position was fixed for RTL languages.
-
-4.6.012 (2009-05-23)
-	- setUserRights() method doesn't work anymore unless you call the setSignature() method with the Adobe private key!
-
-4.6.011 (2009-05-18)
-	- Signature of the Image() method was changed to include the new $fitbox parameter (see source code documentation).
-
-4.6.010 (2009-05-17)
-	- Image() method was improved: now is possible to specify the maximum dimensions for a constraint box defined by $w and $h parameters, and setting the $resize parameter to null.
-	- <tcpdf> tag indent problem was fixed.
-	- $y parameter was added to checkPageBreak() method.
-	- Bug n. 2791773 "writeHTML" was fixed.
-
-4.6.009 (2009-05-13)
-	- xref table for embedded files was fixed.
-
-4.6.008 (2009-05-07)
-	- setSignature() method was improved (but is still experimental).
-	- Example n. 52 was added.
-
-4.6.007 (2009-05-05)
-	- Bug #2786685 "writeHtmlCell and <br /> in custom footer" was fixed.
-	- Table header repeating bug was fixed.
-	- Some newlines and tabs are now automatically removed from HTML strings.
-
-4.6.006 (2009-04-28)
-	- Support for "<a name="...">...</a>" was added.
-	- By default TCPDF requires PCRE Unicode support turned on but now works also without it (with limited ability to detect some Unicode blank spaces).
-
-4.6.005 (2009-04-25)
-	- Points (pt) conversion in getHTMLUnitToUnits() was fixed.
-	- Default tcpdf.pem certificate file was added.
-	- Experimental support for signing document was added but it is not yet completed (some help is needed - I think that the calculation of the ByteRange is OK and the problem is on the signature calculation).
-
-4.6.004 (2009-04-23)
-	- Method deletePage() was added to delete pages (see example n. 44).
-
-4.6.003 (2009-04-21)
-	- The caching mechanism of the UTF8StringToArray() method was fixed.
-
-4.6.002 (2009-04-20)
-	- Documentation of rollbackTransaction() method was fixed.
-	- The setImageScale() and getImageScale() methods now set and get the adjusting parameter used by pixelsToUnits() method.
-	- HTML images now support other units of measure than pixels (getHTMLUnitToUnits() is now used instead of pixelsToUnits()).
-	- WARNING: PDF_IMAGE_SCALE_RATIO has been changed by default to 1.
-
-4.6.001 (2009-04-17)
-	- Spaces between HTML block tags are now automatically removed.
-	- The bug related to cMargin changes between tables was fixed.
-
-4.6.000 (2009-04-16)
-	- WARNING: THIS VERSION CHANGES THE BEHAVIOUR OF $x and $y parameters for several TCPDF methods:
-		zero coordinates for $x and $y are now valid coordinates;
-		set $x and $y as empty strings to get the current value.
-	- Some error caused by 'empty' funtion were fixed.
-	- Default color for convertHTMLColorToDec() method was changed to white and the return value for invalid color is false.
-	- HTML on footer bug was fixed.
-	- The following examples were fixed: 5,7,10,17,19,20,21,33,42,43.
-
-4.5.043 (2009-04-15)
-	- Barcode class (barcode.php) was extended to include new linear barcode types (see example n. 27):
-		C39 : CODE 39 - ANSI MH10.8M-1983 - USD-3 - 3 of 9
-		C39+ : CODE 39 with checksum
-		C39E : CODE 39 EXTENDED
-		C39E+ : CODE 39 EXTENDED + CHECKSUM
-		C93 : CODE 93 - USS-93
-		S25 : Standard 2 of 5
-		S25+ : Standard 2 of 5 + CHECKSUM
-		I25 : Interleaved 2 of 5
-		I25+ : Interleaved 2 of 5 + CHECKSUM
-		C128A : CODE 128 A
-		C128B : CODE 128 B
-		C128C : CODE 128 C
-		EAN2 : 2-Digits UPC-Based Extention
-		EAN5 : 5-Digits UPC-Based Extention
-		EAN8 : EAN 8
-		EAN13 : EAN 13
-		UPCA : UPC-A
-		UPCE : UPC-E
-		MSI : MSI (Variation of Plessey code)
-		MSI+ : MSI + CHECKSUM (modulo 11)
-		POSTNET : POSTNET
-		PLANET : PLANET
-		RMS4CC : RMS4CC (Royal Mail 4-state Customer Code) - CBC (Customer Bar Code)
-		KIX : KIX (Klant index - Customer index)
-		IMB: Intelligent Mail Barcode - Onecode - USPS-B-3200 (NOTE: requires BCMath PHP extension)
-		CODABAR : CODABAR
-		CODE11 : CODE 11
-		PHARMA : PHARMACODE
-		PHARMA2T : PHARMACODE TWO-TRACKS
-
-4.5.042 (2009-04-15)
-	- Method Write() was fixed for the strings containing only zero value.
-
-4.5.041 (2009-04-14)
-	- Barcode methods were fixed.
-
-4.5.040 (2009-04-14)
-	- Method Write() was fixed to handle empty strings.
-
-4.5.039 (2009-04-11)
-	- Support for linear barcodes was extended (see example n. 27 and barcodes.php documentation).
-
-4.5.038 (2009-04-10)
-	- Write() method was improved to support separators for Japanese, Korean, Chinese Traditional and Chinese Simplified.
-
-4.5.037 (2009-04-09)
-	- General performances were improved.
-	- The signature of the method utf8Bidi() was changed.
-	- The method UniArrSubString() was added.
-	- Experimental support for 2D barcodes were added (see example n. 50 and 2dbarcodes.php class).
-
-4.5.036 (2009-04-03)
-	- TCPDF methods can be called inside the HTML code (see example n. 49).
-	- All tag attributes, such as <p align="center"> must be enclosed within double quotes.
-
-4.5.035 (2009-03-28)
-	- Bug #2717436 "writeHTML rowspan problem (continued)" was fixed.
-	- Bug #2719090 "writeHTML fix follow up" was fixed.
-	- The method _putuserrights() was changed to avoid Adobe Reader 9.1 crash. This broken the 'trick' that was used to display forms in Acrobat Reader.
-
-4.5.034 (2009-03-27)
-	- Bug #2716914 "Bug writeHTML of a table in body and footer related with pb" was fixed.
-	- Bug #2717056 ] "writeHTML problem when setting tr style" was fixed.
-	- The signature of the Cell() method was changed.
-
-4.5.033 (2009-03-27)
-	- The support for rowspan/colspan on HTML tables was improved (see example n. 48).
-
-4.5.032 (2009-03-23)
-	- setPrintFooter(false) bug was fixed.
-
-4.5.031 (2009-03-20)
-	- Table header support was extended to multiple pages.
-
-4.5.030 (2009-03-20)
-	- thead tag is now supported on HTML tables (header rows are repeated after page breaks).
-	- The startTransaction() was improved to autocommit.
-	- List bullets now uses the foreground color (putHtmlListBullet()).
-
-4.5.029 (2009-03-19)
-	- The following methods were added to UNDO commands (see example 47): startTransaction(), commitTransaction(), rollbackTransaction().
-	- All examples were updated.
-
-4.5.028 (2009-03-18)
-	- Bug #2690945 "List Bugs" was fixed.
-	- HTML text alignment on lists was fixed.
-	- The constant PDF_FONT_MONOSPACED was added to the configuration file to define the default monospaced font.
-	- The following methods were fixed: getPageWidth(), getPageHeight(), getBreakMargin().
-	- All examples were updated.
-
-4.5.027 (2009-03-16)
-	- Method getPageDimensions() was added to get page dimensions.
-	- The signature of the following methos were changed: getPageWidth(), getPageHeight(), getBreakMargin().
-	- _parsepng() method was fixed for PNG URL images (fread bug).
-
-4.5.026 (2009-03-11)
-	- Bug #2681793 affecting URL images with spaces was fixed.
-
-4.5.025 (2009-03-10)
-	- A small bug affecting hyphenation support was fixed.
-	- The method SetDefaultMonospacedFont() was added to define the default monospaced font.
-
-4.5.024 (2009-03-07)
-	- The bug #2666493 was fixed "Footer corrupts document".
-
-4.5.023 (2009-03-06)
-	- The bug #2666688 was fixed "Rowspan in tables".
-
-4.5.022 (2009-03-05)
-	- The bug #2659676 was fixed "refer to #2157099 test 4 < BR > problem still not fixed".
-	- addTOC() function bug was fixed.
-
-4.5.020 (2009-03-03)
-	- The following bug was fixed: "function removeSHY corrupts unicode".
-
-4.5.019 (2009-02-28)
-	- The problem of decimal separator using different locale was fixed.
-	- The text hyphenation is now supported (see example n. 46).
-
-4.5.018 (2009-02-26)
-	- The _destroy() method was added to unset all class variables and frees memory.
-	- Now it's possible to call Output() method multiple times.
-
-4.5.017 (2009-02-24)
-	- A minor bug that raises a PHP warning was fixed.
-
-4.5.016 (2009-02-24)
-	- Bug item #2631200 "getNumLines() counts wrong" was fixed.
-	- Multiple attachments bug was fixed.
-	- All class variables are now cleared on Output() for memory otpimization.
-
-4.5.015 (2009-02-18)
-	- Bug item #2612553 "function Write() must not break a line on &nbsp;  character" was fixed.
-
-4.5.014 (2009-02-13)
-	- Bug item #2595015 "POSTNET Barcode Checksum Error" was fixed (on barcode.php).
-	- Pagebreak bug for barcode was fixed.
-
-4.5.013 (2009-02-12)
-	- border attribute is now supported on HTML images (only accepts the same values accepted by Cell()).
-
-4.5.012 (2009-02-12)
-	- An error on image border feature was fixed.
-
-4.5.011 (2009-02-12)
-	- HTML links for images are now supported.
-	- height attribute is now supported on HTML cells.
-	- $border parameter was added to Image() and ImageEps() methods.
-	- The method getNumLines() was added to estimate the number of lines required for the specified text.
-
-4.5.010 (2009-01-29)
-	- Bug n. 2546108 "BarCode Y position" was fixed.
-
-4.5.009 (2009-01-26)
-	- Bug n. 2538094 "Empty pdf file created" was fixed.
-
-4.5.008 (2009-01-26)
-	- setPage() method was fixed to correctly restore graphic states.
-	- Source code was cleaned up for performances.
-
-4.5.007 (2009-01-24)
-	- checkPageBreak() and write1DBarcode() methods were fixed.
-	- Source code was cleaned up for performances.
-	- barcodes.php was updated.
-
-4.5.006 (2009-01-23)
-	- getHTMLUnitToPoints() method was replaced by getHTMLUnitToUnits() to fix HTML units bugs.
-
-4.5.005 (2009-01-23)
-	- Page closing bug was fixed.
-
-4.5.004 (2009-01-21)
-	- The access of convertHTMLColorToDec() method was changed to public
-	- Fixed bug on UL tag.
-
-4.5.003 (2009-01-19)
-	- Fonts on different folders are now supported.
-
-4.5.002 (2009-01-07)
-	- addTOC() function was improved (see example n. 45).
-
-4.5.001 (2009-01-04)
-	- The signature of startPageGroup() function was changed.
-	- Method Footer() was improved to automatically print page or page-group number (see example n. 23).
-	- Protected method formatTOCPageNumber() was added to customize the format of page numbers on the Table Of Content.
-	- The signature of addTOC() was changed to include the font used for page numbers.
-
-4.5.000 (2009-01-03)
-	- A new $diskcache parameter was added to class constructor to enable disk caching and reduce RAM memory usage (see example n. 43).
-	- The method movePageTo() was added to move pages to previous positions (see example n. 44).
-	- The methods getAliasNumPage() and getPageNumGroupAlias() were added to get the alias for page number (needed when using movepageTo()).
-	- The methods addTOC() was added to print a Table Of Content (see example n. 45).
-	- Imagick class constant was removed for better compatibility with PHP4.
-	- All existing examples were updated and new examples were added.
-
-4.4.009 (2008-12-29)
-	- Examples 1 and 35 were fixed.
-
-4.4.008 (2008-12-28)
-	- Bug #2472169 "Unordered bullet size not adjusted for unit type" was fixed.
-
-4.4.007 (2008-12-23)
-	- Bug #2459935 "no unit conversion for header line" was fixed.
-	- Example n. 42 for image alpha channel was added.
-	- All examples were updated.
-
-4.4.006 (2008-12-11)
-	- Method setLIsymbol() was changed to reflect latest changes in HTML list handling.
-
-4.4.005 (2008-12-10)
-	- Bug item #2413870 "ordered list override value" was fixed.
-
-4.4.004 (2008-12-10)
-	- The protected method getHTMLUnitToPoints() was added to accept various HTML units of measure (em, ex, px, in, cm, mm, pt, pc, %).
-	- The method intToRoman() was added to convert integer number to Roman representation.
-	- Support fot HTML lists was improved: the CSS property list-style-type is now supported.
-
-4.4.003 (2008-12-09)
-	- Bug item #2412147 "Warning on line 3367" was fixed.
-	- Method setHtmlLinksStyle() was added to set default HTML link colors and font style.
-	- Method addHtmlLink() was changed to use color and style defined on the inline CSS.
-
-4.4.002 (2008-12-09)
-	- Borders on Multicell() were fixed.
-	- Problem of Multicell() on Header function (Bug item #2407579) was fixed.
-	- Problem on graphics tranformations applied to Multicell() was fixed.
-	- Support for ImageMagick was added.
-	- Width calculation for nested tables was fixed.
-
-4.4.001 (2008-12-08)
-	- Some missing core fonts were added on fonts directory.
-	- CID0 fonts rendering was fixed.
-	- HTML support was improved (<pre> and <tt> tags are now supported).
-	- Bug item #2406022 "Left padding bug in MultiCell with maxh" was fixed.
-
-4.4.000 (2008-12-07)
-	- File attachments are now supported (see example n. 41).
-	- Font functions were optimized to reduce document size.
-	- makefont.php was updated.
-	- Linux binaries were added on /fonts/utils
-	- All fonts were updated.
-	- $autopadding parameter was added to Multicell() to disable automatic padding features.
-	- $maxh parameter was added to Multicell() and Write() to set a maximum height.
-
-4.3.009 (2008-12-05)
-	- Bug item #2392989 (Custom header + setlinewidth + cell border bug) was fixed.
-
-4.3.008 (2008-12-05)
-	- Bug item #2390566 "rect bug" was fixed.
-	- File path was fixed for font embedded files.
-	- SetFont() method signature was changed to include the font filename.
-	- Some font-related methods were improved.
-	- Methods getFontFamily() and getFontStyle() were added.
-
-4.3.007 (2008-12-03)
-	- PNG alpha channel is now supported (GD library is required).
-	- AddFont() function now support custom font file path on $file parameter.
-	- The default width variable ($dw) is now always defined for any font.
-	- The 'Style' attribute on CID-0 fonts was removed because of protection bug.
-
-4.3.006 (2008-12-01)
-	- A regular expression on getHtmlDomArray() to find HTML tags was fixed.
-
-4.3.005 (2008-11-25)
-	- makefont.php was fixed.
-	- Bug item #2339877 was fixed (false loop condition detected on WriteHTML()).
-	- Bug item #2336733 was fixed (lasth value update on Multicell() when border and fill are disabled).
-	- Bug item #2342303 was fixed (automatic page-break on Image() and ImageEPS()).
-
-4.3.004 (2008-11-19)
-	- Function _textstring() was fixed (bug 2309051).
-	- All examples were updated.
-
-4.3.003 (2008-11-18)
-	- CID-0 font bug was fixed.
-	- Some functions were optimized.
-	- Function getGroupPageNoFormatted() was added.
-	- Example n. 23 was updated.
-
-4.3.002 (2008-11-17)
-	- Bug item #2305518 "CID-0 font don't work with encryption" was fixed.
-
-4.3.001 (2008-11-17)
-	- Bug item #2300007 "download mimetype pdf" was fixed.
-	- Double quotes were replaced by single quotes to improve PHP performances.
-	- A bug relative to HTML cell borders was fixed.
-
-4.3.000 (2008-11-14)
-	- The function setOpenCell() was added to set the top/bottom cell sides to be open or closed when the cell cross the page.
-	- A bug relative to list items indentation was fixed.
-	- A bug relative to borders on HTML tables and Multicell was fixed.
-	- A bug relative to rowspanned cells was fixed.
-	- A bug relative to html images across pages was fixed.
-
-4.2.009 (2008-11-13)
-	- Spaces between li tags are now automatically removed.
-
-4.2.008 (2008-11-12)
-	- A bug relative to fill color on next page was fixed.
-
-4.2.007 (2008-11-12)
-	- The function setListIndentWidth() was added to set custom indentation widht for HTML lists.
-
-4.2.006 (2008-11-06)
-	- A bug relative to HTML justification was fixed.
-
-4.2.005 (2008-11-06)
-	- A bug relative to HTML justification was fixed.
-	- The methods formatPageNumber() and PageNoFormatted() were added to format page numbers.
-	- Default Footer() method was changed to use PageNoFormatted() instead of PageNo().
-	- Example 6 was updated.
-
-4.2.004 (2008-11-04)
-	- Bug item n. 2217039 "filename handling improvement" was fixed.
-
-4.2.003 (2008-10-31)
-	- Font style bug was fixed.
-
-4.2.002 (2008-10-31)
-	- Bug item #2210922 (htm element br not work) was fixed.
-	- Write() function was improved to support margin changes.
-
-4.2.001 (2008-10-30)
-	- setHtmlVSpace($tagvs) function was added to set custom vertical spaces for HTML tags.
-	- writeHTML() function now support margin changes during execution.
-	- Signature of addHTMLVertSpace() function is changed.
-
-4.2.000 (2008-10-29)
-	- htmlcolors.php was changed to support class-loaders.
-	- ImageEps() function was improved in performances.
-	- Signature of Link() And Annotation() functions were changed.
-	- (Bug item #2198926) Links and Annotations alignment were fixed (support for geometric tranformations was added).
-	- rowspan mode for HTML table cells was improved and fixed.
-	- Booklet mode for double-sided pages was added; see SetBooklet() function and example n. 40.
-	- lastPage() signature is changed.
-	- Signature of Write() function is changed.
-	- Some HTML justification problems were fixed.
-	- Some functions were fixed to better support RTL mode.
-	- Example n. 10 was changed to support RTL mode.
-	- All examples were updated.
-
-4.1.004 (2008-10-23)
-	- unicode_data.php was changed to support class-loaders.
-	- Bug item #2186040/2 (writeHTML margin problem) was fixed.
-
-4.1.003 (2008-10-22)
-	- Bug item #2185399 was fixed (rowspan and page break).
-	- Bugs item #2186040 was fixed (writeHTML margin problem).
-	- Newline after table was removed.
-
-4.1.002 (2008-10-21)
-	- Bug item #2184525 was fixed (rowspan on HTML cell).
-
-4.1.001 (2008-10-21)
-	- Support for "start" attribute was added to HTML ordered list.
-	- unicode_data.php file was changed to include UTF-8 to ASCII table.
-	- Some functions were modified to better support UTF-8 extensions to core fonts.
-	- Support for images on HTML lists was improved.
-	- Examples n. 1 and 6 were updated.
-
-4.1.000 (2008-10-18)
-	- Page-break bug using HTML content was fixed.
-	- The "false" parameter was reintroduced to class_exists function on PHP5 version to avoid autoload.
-	- addHtmlLink() function was improved to support internal links (i.e.: <a href="#23">link to page 23</a>).
-	- Justification alignment is now supported on HTML (see example n. 39).
-	- example_006.php was updated.
-
-4.0.033 (2008-10-13)
-	- Bug n. 2157099 was fixed.
-	- SetX() and SetY() functions were improved.
-	- SetY() includes a new parameter to avoid the X reset.
-
-4.0.032 (2008-10-10)
-	- Bug n. 2156926 was fixed (bold, italic, underlined, linethrough).
-	- setStyle() method was removed.
-	- Configuration file was changed to use helvetica (non-unicode) font by default.
-	- The use of mixed font types was improved.
-	- All examples were updated.
-
-4.0.031 (2008-10-09)
-	- _putannots() and _putbookmarks() links alignments were fixed.
-
-4.0.030 (2008-10-07)
-	- _putbookmarks() function was fixed.
-	- _putannots() was fixed to include internal links.
-
-4.0.029 (2008-09-27)
-	- Infinite loop bug was fixed [Bug item #130309].
-	- Multicell() problem on Header() was fixed.
-
-4.0.028 (2008-09-26)
-	- setLIsymbol() was added to set the LI symbol used on UL lists.
-	- Missing $padding and $encryption_key variables declarations were added [Bug item #2129058].
-
-4.0.027 (2008-09-19)
-	- Bug #2118588 "Undefined offset in tcpdf.php on line 9581" was fixed.
-	- arailunicid0.php font was updated.
-	- The problem of javascript form fields duplication after saving was fixed.
-
-4.0.026 (2008-09-17)
-	- convertHTMLColorToDec() function was improved to support rgb(RR,GG,BB) notation.
-	- The following inline CSS attributes are now supported: text-decoration, color, background-color and font-size names: xx-small, x-small, small, medium, large, x-large, xx-large
-	- Example n. 6 was updated.
-
-4.0.025 (2008-09-15)
-	- _putcidfont0 function was improved to include CJK fonts (Chinese, Japanese, Korean, CJK, Asian fonts) without embedding.
-	- arialunicid0 font was added (see the new example n. 38).
-	- The following Unicode to CID-0 tables were added on fonts folder: uni2cid_ak12.php, uni2cid_aj16.php, uni2cid_ag15.php, uni2cid_ac15.php.
-
-4.0.024 (2008-09-12)
-	- "stripos" function was replaced with "strpos + strtolower" for backward compatibility with PHP4.
-	- support for Spot Colors were added. Check the new example n. 37 and the following new functions:
-		AddSpotColor()
-		SetDrawSpotColor()
-		SetFillSpotColor()
-		SetTextSpotColor()
-		_putspotcolors()
-	- Bookmark() function was improved to fix wrong levels.
-	- $lasth changes after header/footer calls were fixed.
-
-4.0.023 (2008-09-05)
-	- Some HTML related problems were fixed.
-	- Image alignment on HTML was changed, now it always defaults to the normal mode (see example_006.php).
-
-4.0.022 (2008-08-28)
-	- Line height on HTML was fixed.
-	- Image inside an HTML cell problem was fixed.
-	- A new "zarbold" persian font was added.
-
-4.0.021 (2008-08-24)
-	- HTTP headers were fixed on Output function().
-	- getAliasNbPages() and getPageGroupAlias() functions were changed to support non-unicode fonts on unicode documents.
-	- Function Write() was fixed.
-	- The problem of additional vertical spaces on HTML was fixed.
-	- The problem of frame around HTML links was fixed.
-
-4.0.020 (2008-08-15)
-	- "[2052259] WriteHTML <u> & <b>" bug was fixed.
-
-4.0.019 (2008-08-13)
-	- "Rowspan on first cell" bug was fixed.
-
-4.0.018 (2008-08-08)
-	- Default cellpadding for HTML tables was fixed.
-	- Annotation() function was added to support some PDF annotations (see example_036.php and section 8.4 of PDF reference 1.7).
-	- HTML links are now correclty shifted during line alignments.
-	- function getAliasNbPages() was added and Footer() was updated.
-	- RowSpan mode for HTML tables was fixed.
-	- Bugs item #2043610 "Multiple sizes vertical align wrong" was fixed.
-	- ImageEPS() function was improved and RTL alignment was fixed (see example_032.php).
-
-4.0.017 (2008-08-05)
-	- Missing CNZ and CEO style modes were added to Rect() function.
-	- Fonts utils were updated to include support for OpenType fonts.
-	- getLastH() function was added.
-
-4.0.016 (2008-07-30)
-	- setPageMark() function was added. This function must be called after calling Image() function for a background image.
-
-4.0.015 (2008-07-29)
-	- Some functions were changed to support different page formats (see example_028.php).
-	- The signature of setPage() function is changed.
-
-4.0.014 (2008-07-29)
-	- K_PATH_MAIN calculation on tcpdf_config.php was fixed.
-	- HTML support for EPS/AI images was added (see example_006.php).
-	- Bugs item #2030807 "Truncated text on multipage html fields" was fixed.
-	- PDF header bug was fixed.
-	- helvetica was added as default font family.
-	- Stroke mode was fixed on Text function.
-	- several minor bugs were fixed.
-
-4.0.013 (2008-07-27)
-	- Bugs item #2027799 " Big spaces between lines after page break" was fixed.
-	- K_PATH_MAIN calculation on tcpdf_config.php was changed.
-	- Function setVisibility() was fixed to avoid the "Incorrect PDEObject type" error message.
-
-4.0.012 (2008-07-24)
-	- Addpage(), Header() and Footer() functions were changed to simplify the implementation of external header/footer functions.
-	- The following functions were added:
-			setHeader()
-			setFooter()
-			getImageRBX()
-			getImageRBY()
-			getCellHeightRatio()
-			getHeaderFont()
-			getFooterFont()
-			getRTL()
-			getBarcode()
-			getHeaderData()
-			getHeaderMargin()
-			getFooterMargin()
-
-4.0.011 (2008-07-23)
-	- Font support was improved.
-	- The folder /fonts/utils contains new utilities and instructions for embedd font files.
-	- Documentation was updated.
-
-4.0.010 (2008-07-22)
-	- HTML tables were fixed to work across pages.
-	- Header() and Footer() functions were updated to preserve previous settings.
-	- example_035.php was added.
-
-4.0.009 (2008-07-21)
-	- UTF8StringToArray() function was fixed for non-unicode mode.
-
-4.0.008 (2008-07-21)
-	- Barcodes alignment was fixed (see example_027.php).
-	- unicode_data.php was updated.
-	- Arabic shaping for "Zero-Width Non-Joiner" character (U+200C) was fixed.
-
-4.0.007 (2008-07-18)
-	- str_split was replaced by preg_split for compatibility with PHP4 version.
-	- Clipping mode was added to all graphic functions by using parameter $style = "CNZ" or "CEO" (see example_034.php).
-
-4.0.006 (2008-07-16)
-	- HTML rowspan bug was fixed.
-	- Line style for MultiCell() was fixed.
-	- WriteHTML() function was improved.
-	- CODE128C barcode was fixed (barcodes.php).
-
-4.0.005 (2008-07-11)
-	- Bug [2015715] "PHP Error/Warning" was fixed.
-
-4.0.004 (2008-07-09)
-	- HTML cell internal padding was fixed.
-
-4.0.003 (2008-07-08)
-	- Removed URL encoding when F option is selected on Output() function.
-	- fixed some minor bugs in html tables.
-
-4.0.002 (2008-07-07)
-	- Bug [2000861] was still unfixed and has been fixed.
-
-4.0.001 (2008-07-05)
-	- Bug [2000861] was fixed.
-
-4.0.000 (2008-07-03)
-	- THIS IS A MAIN RELEASE THAT INCLUDES SEVERAL NEW FEATURES AND BUGFIXES
-	- Signature fo SetTextColor() and SetFillColor() functions was changed (parameter $storeprev was removed).
-	- HTML support was completely rewritten and improved (see example 6).
-	- Alignments parameters were fixed.
-	- Functions GetArrStringWidth() and GetStringWidth() now include font parameters.
-	- Fonts support was improved.
-	- All core fonts were replaced and moved to fonts/ directory.
-	- The following functions were added: getMargins(), getFontSize(), getFontSizePt().
-	- File config/tcpdf_config_old.php was renamed tcpdf_config_alt.php and updated.
-	- Multicell and WriteHTMLCell fill function was fixed.
-	- Several minor bugs were fixed.
-	- barcodes.php was updated.
-	- All examples were updated.
-
-------------------------------------------------------------
-
-3.1.001 (2008-06-13)
-	- Bug [1992515] "K_PATH_FONTS default value wrong" was fixed.
-	- Vera font was removed, DejaVu font and Free fonts were updated.
-	- Image handling was improved.
-	- All examples were updated.
-
-3.1.000 (2008-06-11)
-	- setPDFVersion() was added to change the default PDF version (currently 1.7).
-	- setViewerPreferences() was added to control the way the document is to be presented on the screen or printed (see example 29).
-	- SetDisplayMode() signature was changed (new options were added).
-	- LinearGradient(), RadialGradient(), CoonsPatchMesh() functions were added to print various color gradients (see example 30).
-	- PieSector() function was added to render render pie charts (see example 31).
-	- ImageEps() was added to display EPS and AI images with limited support (see example 32).
-	- writeBarcode() function is now depracated, a new write1DBarcode() function was added. The barcode directory was removed and a new barcodes.php file was added.
-	- The new write1DBarcode() function support more barcodes and do not need the GD library (see example 027). All barcodes are directly written to PDF using graphic functions.
-	- HTML lists were improved and could be nested (you may now represent trees).
-	- AddFont() bug was fixed.
-	- _putfonts() bug was fixed.
-	- graphics functions were fixed.
-	- unicode_data.php file was updated (fixed).
-	- almohanad font was updated.
-	- example 18 was updated (Farsi and Arabic languages).
-	- source code cleanup.
-	- All examples were updated and new examples were added.
-
-3.0.015 (2008-06-06)
-	- AddPage() function signature is changed to include page format.
-	- example 28 was added to show page format changes.
-	- setPageUnit() function was added to change the page units of measure.
-	- setPageFormat() function was added to change the page format and orientation between pages.
-	- setPageOrientation() function was added to change the page orientation.
-	- Arabic font shaping was fixed for laa letter and square boxes (see the example 18).
-
-3.0.014 (2008-06-04)
-	- Arabic font shaping was fixed.
-	- setDefaultTableColumns() function was added.
-	- $cell_height_ratio variable was added.
-	- setCellHeightRatio() function was added to define the default height of cell repect font height.
-
-3.0.013 (2008-06-03)
-	- Multicell height parameter was fixed.
-	- Arabic font shaping was improved.
-	- unicode_data.php was updated.
-
-3.0.012 (2008-05-30)
-	- K_PATH_MAIN and K_PATH_URL constants are now automatically set on config file.
-	- DOCUMENT_ROOT constant was fixed for IIS Webserver (config file was updated).
-	- Arabic font shaping was improved.
-	- TranslateY() function was fixed (bug [1977962]).
-	- setVisibility() function was fixed.
-	- writeBarcode() function was fixed to scale using $xref parameter.
-	- All examples were updated.
-
-3.0.011 (2008-05-23)
-	- CMYK color support was added to all graphic functions.
-	- HTML table support was improved:
-	  -- now it's possible to include additional html tags inside a cell;
-	  -- colspan attribute was added.
-	- example 006 was updated.
-
-3.0.010 (2008-05-21)
-	- fixed $laa_array inclusion on utf8Bidi() function.
-
-3.0.009 (2008-05-20)
-	- unicode_data.php was updated.
-	- Arabic laa letter problem was fixed.
-
-3.0.008 (2008-05-12)
-	- Arabic support was fixed and improved (unicode_data.php was updated).
-	- Polycurve() function was added to draw a poly-Bezier curve.
-	- list items alignment was fixed.
-	- example 6 was updated.
-
-3.0.007 (2008-05-06)
-	- Arabic support was fixed and improved.
-	- AlMohanad (arabic) font was added.
-	- C128 barcode bugs were fixed.
-
-3.0.006 (2008-04-21)
-	- Condition to check negative width values was added.
-
-3.0.005 (2008-04-18)
-	- back-Slash character escape was fixed on writeHTML() function.
-	- Exampe 6 was updated.
-
-3.0.004 (2008-04-11)
-	- Bug [1939304] (Right to Left Issue) was fixed.
-
-3.0.003 (2008-04-07)
-	- Bug [1934523](Words between HTML tags in cell not kept on one line) was fixed.
-	- "face" attribute of "font" tag is now fully supported.
-
-3.0.002 (2008-04-01)
-	- Write() functions now return the number of cells and not the number of lines.
-	- TCPDF is released under LGPL 2.1, or any later version.
-
-3.0.001 (2008-05-28)
-	- _legacyparsejpeg() and _legacyparsepng() were renamed _parsejpeg() and _parsepng().
-	- function writeBarcode() was fixed.
-	- all examples were updated.
-	- example 27 was added to show various barcodes.
-
-3.0.000 (2008-03-27)
-	- private function pixelsToMillimeters() was changed to public function pixelsToUnits() to fix html image size bug.
-	- Image-related functions were rewritten.
-	- resize parameter was added to Image() signature to reduce the image size and fit width and height (see example 9).
-	- TCPDF now supports all images supported by GD library: GD, GD2, GD2PART, GIF, JPEG, PNG, BMP, XBM, XPM.
-	- CMYK support was added to SetDrawColor(), SetFillColor(), SetTextColor() (see example 22).
-	- Page Groups were added (see example 23).
-	- setVisibility() function was added to restrict the rendering of some elements to screen or printout (see example 24).
-	- All private variables and functions were changed to protected.
-	- setAlpha() function was added to give transparency support for all objects (see example 25).
-	- Clipping and stroke modes were added to Text() function (see example 26).
-	- All examples were moved to "examples" directory.
-	- function setJPEGQuality() was added to set the JPEG image comrpession (see example 9).
-
-2.9.000 (2008-03-26)
-	- htmlcolors.php file was added to include html colors.
-	- Support for HTML color names and three-digit hexadecimal color codes was added.
-	- private function convertColorHexToDec() was renamed convertHTMLColorToDec().
-	- color and bgcolor attributes are now supported on all HTML tags (color nesting is also supported).
-	- Write() function were fixed.
-	- example_006.php was updated.
-	- private function setUserRights() was added to release user rights on Acrobat Reader (this allows to display forms, see example 14)
-
-2.8.000 (2008-03-20)
-	- Private variables were changed to protected.
-	- Function Write() was fixed and improved.
-	- Support for dl, dt, dd, del HTML tags was introduced.
-	- Line-trought mode was added for HTML and text.
-	- Text vertical alignment on cells were fixed.
-	- Examples were updated to reflect changes.
-
-2.7.002 (2008-03-13)
-	- Bug "[1912142] Encrypted PDF created/modified date" was fixed.
-
-2.7.001 (2008-03-10)
-	- Cell justification was fixed for non-unicode mode.
-
-2.7.000 (2008-03-09)
-	- Cell() stretching mode 4 (forced character spacing) was fixed.
-	- writeHTMLCell() now uses Multicell() to write.
-	- Multicell() has a new parameter $ishtml to act as writeHTMLCell().
-	- Write() speed was improved for non-arabic strings.
-	- Example n. 20 was changed.
-
-2.6.000 (2008-03-07)
-	- various alignments bugs were fixed.
-
-2.5.000 (2008-03-07)
-	- Several bugs were fixed.
-	- example_019.php was added to test non-unicode mode using old fonts.
-
-2.4.000 (2008-03-06)
-	- RTL support was deeply improved.
-	- GetStringWidth() was fixed to support RTL languages.
-	- Text() RTL alignment was fixed.
-	- Some functions were added: GetArrStringWidth(), GetCharWidth(), uniord(), utf8Bidi().
-	- example_018.php was added and test_unicode.php was removed.
-
-2.3.000 (2008-03-05)
-	- MultiCell() signature is changed. Now support multiple columns across pages (see example_017).
-	- Write() signature is changed. Now support the cell mode to be used with MultiCell.
-	- Header() and Footer() were changed.
-	- The following functions were added: UTF8ArrSubString() and unichr().
-	- Examples were updated to reflect last changes.
-
-2.2.004 (2008-03-04)
-	- Several examples were added.
-	- AddPage() Header() and Footer() were fixed.
-	- Documentation is now available on http://www.tcpdf.org
-
-2.2.003 (2008-03-03)
-	- [1894853] Performance of MultiCell() was improved.
-	- RadioButton and ListBox functions were added.
-	- javascript form functions were rewritten and properties names are changed. The properties function supported by form fields are listed on Possible values are listed on http://www.adobe.com/devnet/acrobat/pdfs/js_developer_guide.pdf.
-
-2.2.002 (2008-02-28)
-	- [1900495] html images path was fixed.
-	- Legacy image functions were reintroduced to allow PNG and JPEG support without GD library.
-
-2.2.001 (2008-02-16)
-	- The bug "[1894700] bug with replace relative path" was fixed
-	- Justification was fixed
-
-2.2.000 (2008-02-12)
-	- fixed javascript bug introduced with latest release
-
-2.1.002 (2008-02-12)
-	- Justify function was fixed on PHP4 version.
-	- Bookmank function was added ([1578250] Table of contents).
-	- Javascript and Form fields support was added ([1796359] Form fields).
-
-2.1.001 (2008-02-10)
-	- The bug "[1885776] Race Condition in function justitfy" was fixed.
-	- The bug "[1890217] xpdf complains that pdf is incorrect" was fixed.
-
-2.1.000 (2008-01-07)
-	- FPDF_FONTPATH constant was changed to K_PATH_FONTS on config file
-	- Bidirectional Algorithm to correctly reverse bidirectional languages was added.
-	- SetLeftMargin, SetTopMargin, SetRightMargin functions were fixed.
-	- SetCellPadding function was added.
-	- writeHTML was updated with new parameters.
-	- Text function was fixed.
-	- MultiCell function was fixed, now works also across multiple pages.
-	- Line width was fixed on Header and Footer functions and <hr> tag.
-	- "GetImageSize" was renamed "getimagesize".
-	- Document version was changed from 1.3 to 1.5.
-	- _begindoc() function was fixed.
-	- ChangeDate was fixed and ModDate was added.
-	- The following functions were added:
-	  setPage() : Move pointer to the specified document page.
-	  getPage() : Get current document page number.
-	  lastpage() : Reset pointer to the last document page.
-	  getNumPages() : Get the total number of inserted pages.
-	  GetNumChars() : count the number of (UTF-8) characters in a string.
-	- $stretch parameter was added to Cell() function to fit text on cell:
-			0 = disabled
-			1 = horizontal scaling only if necessary
-			2 = forced horizontal scaling
-			3 = character spacing only if necessary
-			4 = forced character spacing
-	- Line function was fixed for RTL.
-	- Graphic transformation functions were added [1811158]:
-			StartTransform()
-			StopTransform()
-			ScaleX()
-			ScaleY()
-			ScaleXY()
-			Scale()
-			MirrorH()
-			MirrorV()
-			MirrorP()
-			MirrorL()
-			TranslateX()
-			TranslateY()
-			Translate()
-			Rotate()
-			SkewX()
-			SkewY()
-			Skew()
-	- Graphic function were added/updated [1688549]:
-			SetLineStyle()
-			_outPoint()
-			_outLine()
-			_outRect()
-			_outCurve()
-			Line()
-			Rect()
-			Curve
-			Ellipse
-			Circle
-			Polygon
-			RegularPolygon
-
-2.0.000 (2008-01-04)
-	- RTL (Right-To-Left) languages support was added. Language direction is set using the $l['a_meta_dir'] setting on /configure/language/xxx.php language files.
-	- setRTL($enable) method was added to manually enable/disable the RTL text direction.
-	- The attribute "dir" was added to support custom text direction on HTML tags. Possible values are: ltr - for Left-To-Right and RTL for Right-To-Left.
-	- RC4 40bit encryption was added. Check the SetProtection method.
-	- [1815213] Improved image support for GIF, JPEG, PNG formats.
-	- [1800094] Attribute "value" was added to ordered list items <li>.
-	- Image function now has a new "align" parameter that indicates the alignment of the pointer next to image insertion and relative to image height. The value can be:
-			T: top-right for LTR or top-left for RTL
-			M: middle-right for LTR or middle-left for RTL
-			B: bottom-right for LTR or bottom-left for RTL
-			N: next line
-	- Attribute "align" was added to <img> html tag to set the above image "align" parameter. Possible values are:
-			top: top-right for LTR or top-left for RTL
-			middle: middle-right for LTR or middle-left for RTL
-			bottom: bottom-right for LTR or bottom-left for RTL
-	- [1798103] newline was added after </ul>, </ol> and </p> tages.
-	- [1816393] Documentation was updated.
-	- 'ln' parameter was fixed on writeHTMLCell. Now it's possible to print two or more columns across several pages;
-	- The method lastPage() was added to move the pointer on the last page;
-
-------------------------------------------------------------
-
-1.53.0.TC034 (2007-07-30)
-	- fixed htmlentities conversion.
-	- MultiCell() function returns the number of cells.
-
-1.53.0.TC033 (2007-07-30)
-	- fixed bug 1762550: case sensitive for font files
-	- NOTE: all fonts files names must be in lowercase!
-
-1.53.0.TC032 (2007-07-27)
-	- setLastH method was added to resolve bug 1689071.
-	- all fonts names were converted in lowercase (bug 1713005).
-	- bug 1740954 was fixed.
-	- justification was added as Cell option.
-
-1.53.0.TC031 (2007-03-20)
-	- ToUnicode CMap were added on _puttruetypeunicode function. Now you may search and copy unicode text.
-
-1.53.0.TC030 (2007-03-06)
-	- fixed bug on PHP4 version.
-
-1.53.0.TC029 (2007-03-06)
-	- DejaVu Fonts were added.
-
-1.53.0.TC028 (2007-03-03)
-	- MultiCell function signature were changed: the $ln parameter were added. Check documentation for further information.
-	- Greek language were added on example sentences.
-	- setPrintHeader() and setPrintFooter() functions were added to enable or disable page header and footer.
-
-1.53.0.TC027 (2006-12-14)
-	- $attr['face'] bug were fixed.
-	- K_TCPDF_EXTERNAL_CONFIG control where introduced on /config/tcpdf_config.php to use external configuration files.
-
-1.53.0.TC026 (2006-10-28)
-	- writeHTML function call were fixed on examples.
-
-1.53.0.TC025 (2006-10-27)
-	- Bugs item #1421290 were fixed (0D - 0A substitution in some characters)
-	- Bugs item #1573174 were fixed (MultiCell documentation)
-
-1.53.0.TC024 (2006-09-26)
-	- getPageHeight() function were fixed (bug 1543476).
-	- fixed missing breaks on closedHTMLTagHandler function (bug 1535263).
-	- fixed extra spaces on Write function (bug 1535262).
-
-1.53.0.TC023 (2006-08-04)
-	- paths to barcode directory were fixed.
-	- documentation were updated.
-
-1.53.0.TC022 (2006-07-16)
-	- fixed bug: [ 1516858 ] Probs with PHP autoloader and class_exists()
-
-1.53.0.TC021 (2006-07-01)
-	- HTML attributes with whitespaces are now supported (thanks to Nelson Benitez for his support)
-
-1.53.0.TC020 (2006-06-23)
-	- code cleanup
-
-1.53.0.TC019 (2006-05-21)
-	- fixed <strong> and <em> closing tags
-
-1.53.0.TC018 (2006-05-18)
-	- fixed font names bug
-
-1.53.0.TC017 (2006-05-18)
-	- the TTF2UFM utility to convert True Type fonts for TCPDF were included on fonts folder.
-	- new free unicode fonts were included on /fonts/freefont.
-	- test_unicode.php example were exended.
-	- parameter $fill were added on Write, writeHTML and writeHTMLCell functions.
-	- documentation were updated.
-
-1.53.0.TC016 (2006-03-09)
-	- fixed closing <strong> tag on html parser.
-
-1.53.0.TC016 (2005-08-28)
-	- fpdf.php and tcpdf.php files were joined in one single class (you can still extend TCPDF with your own class).
-	- fixed problem when mb_internal_encoding is set.
-
-1.53.0.TC014 (2005-05-29)
-	- fixed WriteHTMLCell new page issue.
-
-1.53.0.TC013 (2005-05-29)
-	- fixed WriteHTMLCell across pages.
-
-1.53.0.TC012 (2005-05-29)
-	- font color attribute bug were fixed.
-
-1.53.0.TC011 (2005-03-31)
-	- SetFont function were fixed (thank Sjaak Lauwers for bug notice).
-
-1.53.0.TC010 (2005-03-22)
-	- the html functions were improved (thanks to Manfred Vervuert for bug reporting).
-
-1.53.0.TC009 (2005-03-19)
-	- a wrong reference to convertColorHexToDec were fixed.
-
-1.53.0.TC008 (2005-02-07)
-	- removed some extra bytes from PHP files.
-
-1.53.0.TC007 (2005-01-08)
-	- fill attribute were removed from writeHTMLCell method.
-
-1.53.0.TC006 (2005-01-08)
-	- the documentation were updated.
-
-1.53.0.TC005 (2005-01-05)
-	- Steven Wittens's unicode methods were removed.
-	- All unicode methods were rewritten from scratch.
-	- TCPDF is now licensed as LGPL.
-
-1.53.0.TC004 (2005-01-04)
-	- this changelog were added.
-	- removed commercial fonts for licensing issue.
-	- Bitstream Vera Fonts were added (http://www.bitstream.com/font_rendering/products/dev_fonts/vera.html).
-	- Now the AddFont and SetFont functions returns the basic font if the styled version do not exist.
-
-EOF ----------------------------------------------------------------------------
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/LICENSE.TXT b/html2pdf_v4.03/_tcpdf_5.0.002/LICENSE.TXT
deleted file mode 100644
index b1e3f5a2..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/LICENSE.TXT
+++ /dev/null
@@ -1,504 +0,0 @@
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-		  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-  
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
-
-
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/README.TXT b/html2pdf_v4.03/_tcpdf_5.0.002/README.TXT
deleted file mode 100644
index 585e2ed8..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/README.TXT
+++ /dev/null
@@ -1,84 +0,0 @@
-TCPDF - README
-============================================================
-
-IF YOU'D LIKE TO SUPPORT TCPDF, PLEASE CONSIDER MAKING A 
-DONATION: 
-http://sourceforge.net/donate/index.php?group_id=128076
-
-------------------------------------------------------------
-
-Name: TCPDF
-Version: 5.0.002
-Release date: 2010-05-06
-Author:	Nicola Asuni
-	
-Copyright (c) 2001-2010:
-	Nicola Asuni
-	Tecnick.com s.r.l.
-	Via Della Pace, 11
-	09044 Quartucciu (CA)
-	ITALY
-	www.tecnick.com
-	
-URLs:
-	http://www.tcpdf.org
-	http://www.sourceforge.net/projects/tcpdf
-	
-Description:
-	TCPDF is a PHP class for generating PDF files on-the-fly without requiring external extensions.
-	TCPDF has been originally derived from the Public Domain FPDF class by Olivier Plathey (http://www.fpdf.org).
-	
-Main Features:
-//  * no external libraries are required for the basic functions;
-//  * all ISO page formats, custom page formats, custom margins and units of measure;
-//  * UTF-8 Unicode and Right-To-Left languages;
-//  * TrueTypeUnicode, OpenTypeUnicode, TrueType, OpenType, Type1 and CID-0 fonts;
-//  * methods to publish some XHTML code, Javascript and Forms;
-//  * images, graphic (geometric figures) and transformation methods;
-//  * supports JPEG, PNG and SVG images natively, all images supported by GD (GD, GD2, GD2PART, GIF, JPEG, PNG, BMP, XBM, XPM) and all images supported via ImagMagick (http://www.imagemagick.org/www/formats.html)
-//  * 1D and 2D barcodes: CODE 39, ANSI MH10.8M-1983, USD-3, 3 of 9, CODE 93, USS-93, Standard 2 of 5, Interleaved 2 of 5, CODE 128 A/B/C, 2 and 5 Digits UPC-Based Extention, EAN 8, EAN 13, UPC-A, UPC-E, MSI, POSTNET, PLANET, RMS4CC (Royal Mail 4-state Customer Code), CBC (Customer Bar Code), KIX (Klant index - Customer index), Intelligent Mail Barcode, Onecode, USPS-B-3200, CODABAR, CODE 11, PHARMACODE, PHARMACODE TWO-TRACKS, QR-Code;
-//  * Grayscale, RGB, CMYK, Spot Colors and Transparencies;
-//  * automatic page header and footer management;
-//  * document encryption and digital signature certifications;
-//  * transactions to UNDO commands;
-//  * PDF annotations, including links, text and file attachments;
-//  * text rendering modes (fill, stroke and clipping);
-//  * multiple columns mode;
-//  * bookmarks and table of content;
-//  * text hyphenation;
-//  * automatic page break, line break and text alignments including justification;
-//  * automatic page numbering and page groups;
-//  * move and delete pages;
-//  * page compression (requires php-zlib extension);
-
-
-Installation (full instructions on http://www.tcpdf.org):
-	1. copy the folder on your Web server
-	2. set your installation path and other parameters on the config/tcpdf_config.php
-	3. call the examples/example_001.php page with your browser to see an example
-
-Source Code Documentation:
-	doc/index.html
-	
-For Additional Documentation:
-	http://www.tcpdf.org
-
-License
-	Copyright (C) 2002-2010 Nicola Asuni - Tecnick.com S.r.l.
-	
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 2.1 of the License, or
-	(at your option) any later version.
-	
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU Lesser General Public License for more details.
-	
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	
-	See LICENSE.TXT file for more information.
-	
-============================================================
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/barcodes.php b/html2pdf_v4.03/_tcpdf_5.0.002/barcodes.php
deleted file mode 100644
index c8595957..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/barcodes.php
+++ /dev/null
@@ -1,1978 +0,0 @@
-<?php
-//============================================================+
-// File name   : barcodes.php
-// Begin       : 2008-06-09
-// Last Update : 2009-08-26
-// Version     : 1.0.009
-// License     : GNU LGPL (http://www.gnu.org/copyleft/lesser.html)
-// 	----------------------------------------------------------------------------
-//  Copyright (C) 2008-2009 Nicola Asuni - Tecnick.com S.r.l.
-// 	
-// 	This program is free software: you can redistribute it and/or modify
-// 	it under the terms of the GNU Lesser General Public License as published by
-// 	the Free Software Foundation, either version 2.1 of the License, or
-// 	(at your option) any later version.
-// 	
-// 	This program is distributed in the hope that it will be useful,
-// 	but WITHOUT ANY WARRANTY; without even the implied warranty of
-// 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// 	GNU Lesser General Public License for more details.
-// 	
-// 	You should have received a copy of the GNU Lesser General Public License
-// 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-// 	
-// 	See LICENSE.TXT file for more information.
-//  ----------------------------------------------------------------------------
-//
-// Description : PHP class to creates array representations for 
-//               common 1D barcodes to be used with TCPDF.
-//
-// Author: Nicola Asuni
-//
-// (c) Copyright:
-//               Nicola Asuni
-//               Tecnick.com S.r.l.
-//               Via della Pace, 11
-//               09044 Quartucciu (CA)
-//               ITALY
-//               www.tecnick.com
-//               info@tecnick.com
-//============================================================+
-
-/**
- * PHP class to creates array representations for common 1D barcodes to be used with TCPDF.
- * @package com.tecnick.tcpdf
- * @abstract Functions for generating string representation of common 1D barcodes.
- * @author Nicola Asuni
- * @copyright 2008-2009 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
- * @link http://www.tcpdf.org
- * @license http://www.gnu.org/copyleft/lesser.html LGPL
- * @version 1.0.008
- */
-
-	/**
-	* PHP class to creates array representations for common 1D barcodes to be used with TCPDF (http://www.tcpdf.org).<br>
-	* @name TCPDFBarcode
-	* @package com.tecnick.tcpdf
-	* @version 1.0.008
-	* @author Nicola Asuni
-	* @link http://www.tcpdf.org
-	* @license http://www.gnu.org/copyleft/lesser.html LGPL
-	*/
-class TCPDFBarcode {
-	
-	/**
-	 * @var array representation of barcode.
-	 * @access protected
-	 */
-	protected $barcode_array;
-		
-	/**
-	 * This is the class constructor. 
-	 * Return an array representations for common 1D barcodes:<ul>
-	 * <li>$arrcode['code'] code to be printed on text label</li>
-	 * <li>$arrcode['maxh'] max bar height</li>
-	 * <li>$arrcode['maxw'] max bar width</li>
-	 * <li>$arrcode['bcode'][$k] single bar or space in $k position</li>
-	 * <li>$arrcode['bcode'][$k]['t'] bar type: true = bar, false = space.</li>
-	 * <li>$arrcode['bcode'][$k]['w'] bar width in units.</li>
-	 * <li>$arrcode['bcode'][$k]['h'] bar height in units.</li>
-	 * <li>$arrcode['bcode'][$k]['p'] bar top position (0 = top, 1 = middle)</li></ul>
-	 * @param string $code code to print
- 	 * @param string $type type of barcode: <ul><li>C39 : CODE 39 - ANSI MH10.8M-1983 - USD-3 - 3 of 9.</li><li>C39+ : CODE 39 with checksum</li><li>C39E : CODE 39 EXTENDED</li><li>C39E+ : CODE 39 EXTENDED + CHECKSUM</li><li>C93 : CODE 93 - USS-93</li><li>S25 : Standard 2 of 5</li><li>S25+ : Standard 2 of 5 + CHECKSUM</li><li>I25 : Interleaved 2 of 5</li><li>I25+ : Interleaved 2 of 5 + CHECKSUM</li><li>C128A : CODE 128 A</li><li>C128B : CODE 128 B</li><li>C128C : CODE 128 C</li><li>EAN2 : 2-Digits UPC-Based Extention</li><li>EAN5 : 5-Digits UPC-Based Extention</li><li>EAN8 : EAN 8</li><li>EAN13 : EAN 13</li><li>UPCA : UPC-A</li><li>UPCE : UPC-E</li><li>MSI : MSI (Variation of Plessey code)</li><li>MSI+ : MSI + CHECKSUM (modulo 11)</li><li>POSTNET : POSTNET</li><li>PLANET : PLANET</li><li>RMS4CC : RMS4CC (Royal Mail 4-state Customer Code) - CBC (Customer Bar Code)</li><li>KIX : KIX (Klant index - Customer index)</li><li>IMB: Intelligent Mail Barcode - Onecode - USPS-B-3200</li><li>CODABAR : CODABAR</li><li>CODE11 : CODE 11</li><li>PHARMA : PHARMACODE</li><li>PHARMA2T : PHARMACODE TWO-TRACKS</li></ul>
-	 */
-	public function __construct($code, $type) {
-		$this->setBarcode($code, $type);
-	}
-	
-	/** 
-	 * Return an array representations of barcode.
- 	 * @return array
-	 */
-	public function getBarcodeArray() {
-		return $this->barcode_array;
-	}
-	
-	/** 
-	 * Set the barcode.
-	 * @param string $code code to print
- 	 * @param string $type type of barcode: <ul><li>C39 : CODE 39 - ANSI MH10.8M-1983 - USD-3 - 3 of 9.</li><li>C39+ : CODE 39 with checksum</li><li>C39E : CODE 39 EXTENDED</li><li>C39E+ : CODE 39 EXTENDED + CHECKSUM</li><li>C93 : CODE 93 - USS-93</li><li>S25 : Standard 2 of 5</li><li>S25+ : Standard 2 of 5 + CHECKSUM</li><li>I25 : Interleaved 2 of 5</li><li>I25+ : Interleaved 2 of 5 + CHECKSUM</li><li>C128A : CODE 128 A</li><li>C128B : CODE 128 B</li><li>C128C : CODE 128 C</li><li>EAN2 : 2-Digits UPC-Based Extention</li><li>EAN5 : 5-Digits UPC-Based Extention</li><li>EAN8 : EAN 8</li><li>EAN13 : EAN 13</li><li>UPCA : UPC-A</li><li>UPCE : UPC-E</li><li>MSI : MSI (Variation of Plessey code)</li><li>MSI+ : MSI + CHECKSUM (modulo 11)</li><li>POSTNET : POSTNET</li><li>PLANET : PLANET</li><li>RMS4CC : RMS4CC (Royal Mail 4-state Customer Code) - CBC (Customer Bar Code)</li><li>KIX : KIX (Klant index - Customer index)</li><li>IMB: Intelligent Mail Barcode - Onecode - USPS-B-3200</li><li>CODABAR : CODABAR</li><li>CODE11 : CODE 11</li><li>PHARMA : PHARMACODE</li><li>PHARMA2T : PHARMACODE TWO-TRACKS</li></ul>
- 	 * @return array
-	 */
-	public function setBarcode($code, $type) {
-		switch (strtoupper($type)) {
-			case 'C39': { // CODE 39 - ANSI MH10.8M-1983 - USD-3 - 3 of 9.
-				$arrcode = $this->barcode_code39($code, false, false);
-				break;
-			}
-			case 'C39+': { // CODE 39 with checksum
-				$arrcode = $this->barcode_code39($code, false, true);
-				break;
-			}
-			case 'C39E': { // CODE 39 EXTENDED
-				$arrcode = $this->barcode_code39($code, true, false);
-				break;
-			}
-			case 'C39E+': { // CODE 39 EXTENDED + CHECKSUM
-				$arrcode = $this->barcode_code39($code, true, true);
-				break;
-			}
-			case 'C93': { // CODE 93 - USS-93
-				$arrcode = $this->barcode_code93($code);
-				break;
-			}
-			case 'S25': { // Standard 2 of 5
-				$arrcode = $this->barcode_s25($code, false);
-				break;
-			}
-			case 'S25+': { // Standard 2 of 5 + CHECKSUM
-				$arrcode = $this->barcode_s25($code, true);
-				break;
-			}
-			case 'I25': { // Interleaved 2 of 5
-				$arrcode = $this->barcode_i25($code, false);
-				break;
-			}
-			case 'I25+': { // Interleaved 2 of 5 + CHECKSUM
-				$arrcode = $this->barcode_i25($code, true);
-				break;
-			}
-			case 'C128A': { // CODE 128 A
-				$arrcode = $this->barcode_c128($code, 'A');
-				break;
-			}
-			case 'C128B': { // CODE 128 B
-				$arrcode = $this->barcode_c128($code, 'B');
-				break;
-			}
-			case 'C128C': { // CODE 128 C
-				$arrcode = $this->barcode_c128($code, 'C');
-				break;
-			}
-			case 'EAN2': { // 2-Digits UPC-Based Extention
-				$arrcode = $this->barcode_eanext($code, 2);
-				break;
-			}
-			case 'EAN5': { // 5-Digits UPC-Based Extention
-				$arrcode = $this->barcode_eanext($code, 5);
-				break;
-			}
-			case 'EAN8': { // EAN 8
-				$arrcode = $this->barcode_eanupc($code, 8);
-				break;
-			}
-			case 'EAN13': { // EAN 13
-				$arrcode = $this->barcode_eanupc($code, 13);
-				break;
-			}
-			case 'UPCA': { // UPC-A
-				$arrcode = $this->barcode_eanupc($code, 12);
-				break;
-			}
-			case 'UPCE': { // UPC-E
-				$arrcode = $this->barcode_eanupc($code, 6);
-				break;
-			}
-			case 'MSI': { // MSI (Variation of Plessey code)
-				$arrcode = $this->barcode_msi($code, false);
-				break;
-			}
-			case 'MSI+': { // MSI + CHECKSUM (modulo 11)
-				$arrcode = $this->barcode_msi($code, true);
-				break;
-			}
-			case 'POSTNET': { // POSTNET
-				$arrcode = $this->barcode_postnet($code, false);
-				break;
-			}
-			case 'PLANET': { // PLANET
-				$arrcode = $this->barcode_postnet($code, true);
-				break;
-			}
-			case 'RMS4CC': { // RMS4CC (Royal Mail 4-state Customer Code) - CBC (Customer Bar Code)
-				$arrcode = $this->barcode_rms4cc($code, false);
-				break;
-			}
-			case 'KIX': { // KIX (Klant index - Customer index)
-				$arrcode = $this->barcode_rms4cc($code, true);
-				break;
-			}
-			case 'IMB': { // IMB - Intelligent Mail Barcode - Onecode - USPS-B-3200
-				$arrcode = $this->barcode_imb($code);
-				break;
-			}
-			case 'CODABAR': { // CODABAR
-				$arrcode = $this->barcode_codabar($code);
-				break;
-			}
-			case 'CODE11': { // CODE 11
-				$arrcode = $this->barcode_code11($code);
-				break;
-			}
-			case 'PHARMA': { // PHARMACODE
-				$arrcode = $this->barcode_pharmacode($code);
-				break;
-			}
-			case 'PHARMA2T': { // PHARMACODE TWO-TRACKS
-				$arrcode = $this->barcode_pharmacode2t($code);
-				break;
-			}
-			default: {
-				$this->barcode_array = false;
-				$arrcode = false;
-				break;
-			}
-		}
-		$this->barcode_array = $arrcode;
-	}
-	
-	/**
-	 * CODE 39 - ANSI MH10.8M-1983 - USD-3 - 3 of 9.
-	 * General-purpose code in very wide use world-wide
-	 * @param string $code code to represent.
-	 * @param boolean $checksum if true add a checksum to the code
-	 * @return array barcode representation.
-	 * @access protected
-	 */
-	protected function barcode_code39($code, $extended=false, $checksum=false) {
-		$chr['0'] = '111221211';
-		$chr['1'] = '211211112';
-		$chr['2'] = '112211112';
-		$chr['3'] = '212211111';
-		$chr['4'] = '111221112';
-		$chr['5'] = '211221111';
-		$chr['6'] = '112221111';
-		$chr['7'] = '111211212';
-		$chr['8'] = '211211211';
-		$chr['9'] = '112211211';
-		$chr['A'] = '211112112';
-		$chr['B'] = '112112112';
-		$chr['C'] = '212112111';
-		$chr['D'] = '111122112';
-		$chr['E'] = '211122111';
-		$chr['F'] = '112122111';
-		$chr['G'] = '111112212';
-		$chr['H'] = '211112211';
-		$chr['I'] = '112112211';
-		$chr['J'] = '111122211';
-		$chr['K'] = '211111122';
-		$chr['L'] = '112111122';
-		$chr['M'] = '212111121';
-		$chr['N'] = '111121122';
-		$chr['O'] = '211121121';
-		$chr['P'] = '112121121';
-		$chr['Q'] = '111111222';
-		$chr['R'] = '211111221';
-		$chr['S'] = '112111221';
-		$chr['T'] = '111121221';
-		$chr['U'] = '221111112';
-		$chr['V'] = '122111112';
-		$chr['W'] = '222111111';
-		$chr['X'] = '121121112';
-		$chr['Y'] = '221121111';
-		$chr['Z'] = '122121111';
-		$chr['-'] = '121111212';
-		$chr['.'] = '221111211';
-		$chr[' '] = '122111211';
-		$chr['$'] = '121212111';
-		$chr['/'] = '121211121';
-		$chr['+'] = '121112121';
-		$chr['%'] = '111212121';
-		$chr['*'] = '121121211';
-		
-		$code = strtoupper($code);
-		if ($extended) {
-			// extended mode
-			$code = $this->encode_code39_ext($code);
-		}
-		if ($code === false) {
-			return false;
-		}
-		if ($checksum) {
-			// checksum
-			$code .= $this->checksum_code39($code);
-		}
-		// add start and stop codes
-		$code = '*'.$code.'*';
-		
-		$bararray = array('code' => $code, 'maxw' => 0, 'maxh' => 1, 'bcode' => array());
-		$k = 0;
-		$clen = strlen($code);
-		for ($i = 0; $i < $clen; ++$i) {
-			$char = $code{$i};
-			if(!isset($chr[$char])) {
-				// invalid character
-				return false;
-			}
-			for ($j = 0; $j < 9; ++$j) {
-				if (($j % 2) == 0) {
-					$t = true; // bar
-				} else {
-					$t = false; // space
-				}
-				$w = $chr[$char]{$j};
-				$bararray['bcode'][$k] = array('t' => $t, 'w' => $w, 'h' => 1, 'p' => 0);
-				$bararray['maxw'] += $w;
-				++$k;
-			}
-			$bararray['bcode'][$k] = array('t' => false, 'w' => 1, 'h' => 1, 'p' => 0);
-			$bararray['maxw'] += 1;
-			++$k;
-		}
-		return $bararray;
-	}
-	
-	/**
-	 * Encode a string to be used for CODE 39 Extended mode.
-	 * @param string $code code to represent.
-	 * @return encoded string.
-	 * @access protected
-	 */
-	protected function encode_code39_ext($code) {
-		$encode = array(
-			chr(0) => '%U', chr(1) => '$A', chr(2) => '$B', chr(3) => '$C',
-			chr(4) => '$D', chr(5) => '$E', chr(6) => '$F', chr(7) => '$G',
-			chr(8) => '$H', chr(9) => '$I', chr(10) => '$J', chr(11) => '£K',
-			chr(12) => '$L', chr(13) => '$M', chr(14) => '$N', chr(15) => '$O',
-			chr(16) => '$P', chr(17) => '$Q', chr(18) => '$R', chr(19) => '$S',
-			chr(20) => '$T', chr(21) => '$U', chr(22) => '$V', chr(23) => '$W',
-			chr(24) => '$X', chr(25) => '$Y', chr(26) => '$Z', chr(27) => '%A',
-			chr(28) => '%B', chr(29) => '%C', chr(30) => '%D', chr(31) => '%E',
-			chr(32) => ' ', chr(33) => '/A', chr(34) => '/B', chr(35) => '/C',
-			chr(36) => '/D', chr(37) => '/E', chr(38) => '/F', chr(39) => '/G',
-			chr(40) => '/H', chr(41) => '/I', chr(42) => '/J', chr(43) => '/K',
-			chr(44) => '/L', chr(45) => '-', chr(46) => '.', chr(47) => '/O',
-			chr(48) => '0', chr(49) => '1', chr(50) => '2', chr(51) => '3',
-			chr(52) => '4', chr(53) => '5', chr(54) => '6', chr(55) => '7',
-			chr(56) => '8', chr(57) => '9', chr(58) => '/Z', chr(59) => '%F',
-			chr(60) => '%G', chr(61) => '%H', chr(62) => '%I', chr(63) => '%J',
-			chr(64) => '%V', chr(65) => 'A', chr(66) => 'B', chr(67) => 'C',
-			chr(68) => 'D', chr(69) => 'E', chr(70) => 'F', chr(71) => 'G',
-			chr(72) => 'H', chr(73) => 'I', chr(74) => 'J', chr(75) => 'K',
-			chr(76) => 'L', chr(77) => 'M', chr(78) => 'N', chr(79) => 'O',
-			chr(80) => 'P', chr(81) => 'Q', chr(82) => 'R', chr(83) => 'S',
-			chr(84) => 'T', chr(85) => 'U', chr(86) => 'V', chr(87) => 'W',
-			chr(88) => 'X', chr(89) => 'Y', chr(90) => 'Z', chr(91) => '%K',
-			chr(92) => '%L', chr(93) => '%M', chr(94) => '%N', chr(95) => '%O',
-			chr(96) => '%W', chr(97) => '+A', chr(98) => '+B', chr(99) => '+C',
-			chr(100) => '+D', chr(101) => '+E', chr(102) => '+F', chr(103) => '+G',
-			chr(104) => '+H', chr(105) => '+I', chr(106) => '+J', chr(107) => '+K',
-			chr(108) => '+L', chr(109) => '+M', chr(110) => '+N', chr(111) => '+O',
-			chr(112) => '+P', chr(113) => '+Q', chr(114) => '+R', chr(115) => '+S',
-			chr(116) => '+T', chr(117) => '+U', chr(118) => '+V', chr(119) => '+W',
-			chr(120) => '+X', chr(121) => '+Y', chr(122) => '+Z', chr(123) => '%P',
-			chr(124) => '%Q', chr(125) => '%R', chr(126) => '%S', chr(127) => '%T');
-		$code_ext = '';
-		$clen = strlen($code);
-		for ($i = 0 ; $i < $clen; ++$i) {
-			if (ord($code{$i}) > 127) {
-				return false;
-			}
-			$code_ext .= $encode[$code{$i}];
-		}
-		return $code_ext;
-	}
-	
-	/**
-	 * Calculate CODE 39 checksum (modulo 43).
-	 * @param string $code code to represent.
-	 * @return char checksum.
-	 * @access protected
-	 */
-	protected function checksum_code39($code) {
-		$chars = array(
-			'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
-			'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K',
-			'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V',
-			'W', 'X', 'Y', 'Z', '-', '.', ' ', '$', '/', '+', '%');
-		$sum = 0;
-		$clen = strlen($code);
-		for ($i = 0 ; $i < $clen; ++$i) {
-			$k = array_keys($chars, $code{$i});
-			$sum += $k[0];
-		}
-		$j = ($sum % 43);
-		return $chars[$j];
-	}
-	
-	/**
-	 * CODE 93 - USS-93
-	 * Compact code similar to Code 39
-	 * @param string $code code to represent.
-	 * @param boolean $checksum if true add a checksum to the code
-	 * @return array barcode representation.
-	 * @access protected
-	 */
-	protected function barcode_code93($code) {
-		$chr['0'] = '131112';
-		$chr['1'] = '111213';
-		$chr['2'] = '111312';
-		$chr['3'] = '111411';
-		$chr['4'] = '121113';
-		$chr['5'] = '121212';
-		$chr['6'] = '121311';
-		$chr['7'] = '111114';
-		$chr['8'] = '131211';
-		$chr['9'] = '141111';
-		$chr['A'] = '211113';
-		$chr['B'] = '211212';
-		$chr['C'] = '211311';
-		$chr['D'] = '221112';
-		$chr['E'] = '221211';
-		$chr['F'] = '231111';
-		$chr['G'] = '112113';
-		$chr['H'] = '112212';
-		$chr['I'] = '112311';
-		$chr['J'] = '122112';
-		$chr['K'] = '132111';
-		$chr['L'] = '111123';
-		$chr['M'] = '111222';
-		$chr['N'] = '111321';
-		$chr['O'] = '121122';
-		$chr['P'] = '131121';
-		$chr['Q'] = '212112';
-		$chr['R'] = '212211';
-		$chr['S'] = '211122';
-		$chr['T'] = '211221';
-		$chr['U'] = '221121';
-		$chr['V'] = '222111';
-		$chr['W'] = '112122';
-		$chr['X'] = '112221';
-		$chr['Y'] = '122121';
-		$chr['Z'] = '123111';
-		$chr['-'] = '121131';
-		$chr['.'] = '311112';
-		$chr[' '] = '311211';
-		$chr['$'] = '321111';
-		$chr['/'] = '112131';
-		$chr['+'] = '113121';
-		$chr['%'] = '211131';
-		$chr[128] = '121221'; // ($)
-		$chr[129] = '311121'; // (/)
-		$chr[130] = '122211'; // (+)
-		$chr[131] = '312111'; // (%)
-		$chr['*'] = '111141';
-		$code = strtoupper($code);
-		$encode = array(
-			chr(0) => chr(131).'U', chr(1) => chr(128).'A', chr(2) => chr(128).'B', chr(3) => chr(128).'C',
-			chr(4) => chr(128).'D', chr(5) => chr(128).'E', chr(6) => chr(128).'F', chr(7) => chr(128).'G',
-			chr(8) => chr(128).'H', chr(9) => chr(128).'I', chr(10) => chr(128).'J', chr(11) => '£K',
-			chr(12) => chr(128).'L', chr(13) => chr(128).'M', chr(14) => chr(128).'N', chr(15) => chr(128).'O',
-			chr(16) => chr(128).'P', chr(17) => chr(128).'Q', chr(18) => chr(128).'R', chr(19) => chr(128).'S',
-			chr(20) => chr(128).'T', chr(21) => chr(128).'U', chr(22) => chr(128).'V', chr(23) => chr(128).'W',
-			chr(24) => chr(128).'X', chr(25) => chr(128).'Y', chr(26) => chr(128).'Z', chr(27) => chr(131).'A',
-			chr(28) => chr(131).'B', chr(29) => chr(131).'C', chr(30) => chr(131).'D', chr(31) => chr(131).'E',
-			chr(32) => ' ', chr(33) => chr(129).'A', chr(34) => chr(129).'B', chr(35) => chr(129).'C',
-			chr(36) => chr(129).'D', chr(37) => chr(129).'E', chr(38) => chr(129).'F', chr(39) => chr(129).'G',
-			chr(40) => chr(129).'H', chr(41) => chr(129).'I', chr(42) => chr(129).'J', chr(43) => chr(129).'K',
-			chr(44) => chr(129).'L', chr(45) => '-', chr(46) => '.', chr(47) => chr(129).'O',
-			chr(48) => '0', chr(49) => '1', chr(50) => '2', chr(51) => '3',
-			chr(52) => '4', chr(53) => '5', chr(54) => '6', chr(55) => '7',
-			chr(56) => '8', chr(57) => '9', chr(58) => chr(129).'Z', chr(59) => chr(131).'F',
-			chr(60) => chr(131).'G', chr(61) => chr(131).'H', chr(62) => chr(131).'I', chr(63) => chr(131).'J',
-			chr(64) => chr(131).'V', chr(65) => 'A', chr(66) => 'B', chr(67) => 'C',
-			chr(68) => 'D', chr(69) => 'E', chr(70) => 'F', chr(71) => 'G',
-			chr(72) => 'H', chr(73) => 'I', chr(74) => 'J', chr(75) => 'K',
-			chr(76) => 'L', chr(77) => 'M', chr(78) => 'N', chr(79) => 'O',
-			chr(80) => 'P', chr(81) => 'Q', chr(82) => 'R', chr(83) => 'S',
-			chr(84) => 'T', chr(85) => 'U', chr(86) => 'V', chr(87) => 'W',
-			chr(88) => 'X', chr(89) => 'Y', chr(90) => 'Z', chr(91) => chr(131).'K',
-			chr(92) => chr(131).'L', chr(93) => chr(131).'M', chr(94) => chr(131).'N', chr(95) => chr(131).'O',
-			chr(96) => chr(131).'W', chr(97) => chr(130).'A', chr(98) => chr(130).'B', chr(99) => chr(130).'C',
-			chr(100) => chr(130).'D', chr(101) => chr(130).'E', chr(102) => chr(130).'F', chr(103) => chr(130).'G',
-			chr(104) => chr(130).'H', chr(105) => chr(130).'I', chr(106) => chr(130).'J', chr(107) => chr(130).'K',
-			chr(108) => chr(130).'L', chr(109) => chr(130).'M', chr(110) => chr(130).'N', chr(111) => chr(130).'O',
-			chr(112) => chr(130).'P', chr(113) => chr(130).'Q', chr(114) => chr(130).'R', chr(115) => chr(130).'S',
-			chr(116) => chr(130).'T', chr(117) => chr(130).'U', chr(118) => chr(130).'V', chr(119) => chr(130).'W',
-			chr(120) => chr(130).'X', chr(121) => chr(130).'Y', chr(122) => chr(130).'Z', chr(123) => chr(131).'P',
-			chr(124) => chr(131).'Q', chr(125) => chr(131).'R', chr(126) => chr(131).'S', chr(127) => chr(131).'T');
-		$code_ext = '';
-		$clen = strlen($code);
-		for ($i = 0 ; $i < $clen; ++$i) {
-			if (ord($code{$i}) > 127) {
-				return false;
-			}
-			$code_ext .= $encode[$code{$i}];
-		}
-		// checksum
-		$code .= $this->checksum_code93($code);
-		// add start and stop codes
-		$code = '*'.$code.'*';
-		$bararray = array('code' => $code, 'maxw' => 0, 'maxh' => 1, 'bcode' => array());
-		$k = 0;
-		$clen = strlen($code);
-		for ($i = 0; $i < $clen; ++$i) {
-			$char = $code{$i};
-			if(!isset($chr[$char])) {
-				// invalid character
-				return false;
-			}
-			for ($j = 0; $j < 6; ++$j) {
-				if (($j % 2) == 0) {
-					$t = true; // bar
-				} else {
-					$t = false; // space
-				}
-				$w = $chr[$char]{$j};
-				$bararray['bcode'][$k] = array('t' => $t, 'w' => $w, 'h' => 1, 'p' => 0);
-				$bararray['maxw'] += $w;
-				++$k;
-			}
-		}
-		$bararray['bcode'][$k] = array('t' => true, 'w' => 1, 'h' => 1, 'p' => 0);
-		$bararray['maxw'] += 1;
-		++$k;		
-		return $bararray;
-	}
-	
-	/**
-	 * Calculate CODE 93 checksum (modulo 47).
-	 * @param string $code code to represent.
-	 * @return string checksum code.
-	 * @access protected
-	 */
-	protected function checksum_code93($code) {
-		$chars = array(
-			'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
-			'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K',
-			'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V',
-			'W', 'X', 'Y', 'Z', '-', '.', ' ', '$', '/', '+', '%');
-		// translate special characters
-		$code = strtr($code, chr(128).chr(129).chr(130).chr(131), '$/+%');	
-		$len = strlen($code);
-		// calculate check digit C
-		$p = 1;
-		$check = 0;
-		for ($i = ($len - 1); $i >= 0; --$i) {
-			$k = array_keys($chars, $code{$i});
-			$check += ($k[0] * $p);
-			++$p;
-			if ($p > 20) {
-				$p = 1;
-			}
-		}
-		$check %= 47;
-		$c = $chars[$check];
-		$code .= $c;
-		// calculate check digit K
-		$p = 1;
-		$check = 0;
-		for ($i = $len; $i >= 0; --$i) {
-			$k = array_keys($chars, $code{$i});
-			$check += ($k[0] * $p);
-			++$p;
-			if ($p > 15) {
-				$p = 1;
-			}
-		}
-		$check %= 47;
-		$k = $chars[$check];
-		return $c.$k;
-	}
-	
-	/**
-	 * Checksum for standard 2 of 5 barcodes.
-	 * @param string $code code to process.
-	 * @return int checksum.
-	 * @access protected
-	 */
-	protected function checksum_s25($code) {
-		$len = strlen($code);
-		$sum = 0;
-		for ($i = 0; $i < $len; $i+=2) {
-			$sum += $code{$i};
-		}
-		$sum *= 3;
-		for ($i = 1; $i < $len; $i+=2) {
-			$sum += ($code{$i});
-		}
-		$r = $sum % 10;
-		if($r > 0) {
-			$r = (10 - $r);
-		}
-		return $r;
-	}
-	
-	/**
-	 * MSI.
-	 * Variation of Plessey code, with similar applications 
-	 * Contains digits (0 to 9) and encodes the data only in the width of bars.
-	 * @param string $code code to represent.
-	 * @param boolean $checksum if true add a checksum to the code (modulo 11)
-	 * @return array barcode representation.
-	 * @access protected
-	 */
-	protected function barcode_msi($code, $checksum=false) {
-		$chr['0'] = '100100100100';
-		$chr['1'] = '100100100110';
-		$chr['2'] = '100100110100';
-		$chr['3'] = '100100110110';
-		$chr['4'] = '100110100100';
-		$chr['5'] = '100110100110';
-		$chr['6'] = '100110110100';
-		$chr['7'] = '100110110110';
-		$chr['8'] = '110100100100';
-		$chr['9'] = '110100100110';
-		$chr['A'] = '110100110100';
-		$chr['B'] = '110100110110';
-		$chr['C'] = '110110100100';
-		$chr['D'] = '110110100110';
-		$chr['E'] = '110110110100';
-		$chr['F'] = '110110110110';
-		if ($checksum) {
-			// add checksum
-			$clen = strlen($code);
-			$p = 2;
-			$check = 0;
-			for ($i = ($clen - 1); $i >= 0; --$i) {
-				$check += (hexdec($code{$i}) * $p);
-				++$p;
-				if ($p > 7) {
-					$p = 2;
-				}
-			}
-			$check %= 11;
-			if ($check > 0) {
-				$check = 11 - $check;
-			}
-			$code .= $check;
-		}
-		$seq = '110'; // left guard
-		$clen = strlen($code);
-		for ($i = 0; $i < $clen; ++$i) {
-			$digit = $code{$i};
-			if (!isset($chr[$digit])) {
-				// invalid character
-				return false;
-			}
-			$seq .= $chr[$digit];
-		}		
-		$seq .= '1001'; // right guard
-		$bararray = array('code' => $code, 'maxw' => 0, 'maxh' => 1, 'bcode' => array());
-		return $this->binseq_to_array($seq, $bararray);
-	}
-	
-	/**
-	 * Standard 2 of 5 barcodes.
-	 * Used in airline ticket marking, photofinishing
-	 * Contains digits (0 to 9) and encodes the data only in the width of bars.
-	 * @param string $code code to represent.
-	 * @param boolean $checksum if true add a checksum to the code
-	 * @return array barcode representation.
-	 * @access protected
-	 */
-	protected function barcode_s25($code, $checksum=false) {
-		$chr['0'] = '10101110111010';
-		$chr['1'] = '11101010101110';
-		$chr['2'] = '10111010101110';
-		$chr['3'] = '11101110101010';
-		$chr['4'] = '10101110101110';
-		$chr['5'] = '11101011101010';
-		$chr['6'] = '10111011101010';
-		$chr['7'] = '10101011101110';
-		$chr['8'] = '10101110111010';
-		$chr['9'] = '10111010111010';
-		if ($checksum) {
-			// add checksum
-			$code .= $this->checksum_s25($code);
-		}
-		if((strlen($code) % 2) != 0) {
-			// add leading zero if code-length is odd
-			$code = '0'.$code;
-		}
-		$seq = '11011010';
-		$clen = strlen($code);
-		for ($i = 0; $i < $clen; ++$i) {
-			$digit = $code{$i};
-			if (!isset($chr[$digit])) {
-				// invalid character
-				return false;
-			}
-			$seq .= $chr[$digit];
-		}		
-		$seq .= '1101011';
-		$bararray = array('code' => $code, 'maxw' => 0, 'maxh' => 1, 'bcode' => array());
-		return $this->binseq_to_array($seq, $bararray);
-	}
-	
-	/**
-	 * Convert binary barcode sequence to TCPDF barcode array
-	 * @param string $seq barcode as binary sequence
-	 * òparam array $bararray TCPDF barcode array to fill up
-	 * @return array barcode representation.
-	 * @access protected
-	 */
-	protected function binseq_to_array($seq, $bararray) {
-		$len = strlen($seq);
-		$w = 0;
-		$k = 0;
-		for ($i = 0; $i < $len; ++$i) {
-			$w += 1;
-			if (($i == ($len - 1)) OR (($i < ($len - 1)) AND ($seq{$i} != $seq{($i+1)}))) {
-				if ($seq{$i} == '1') {
-					$t = true; // bar
-				} else {
-					$t = false; // space
-				}
-				$bararray['bcode'][$k] = array('t' => $t, 'w' => $w, 'h' => 1, 'p' => 0);
-				$bararray['maxw'] += $w;
-				++$k;
-				$w = 0;
-			}
-		}
-		return $bararray;
-	}
-	
-	/**
-	 * Interleaved 2 of 5 barcodes.
-	 * Compact numeric code, widely used in industry, air cargo
-	 * Contains digits (0 to 9) and encodes the data in the width of both bars and spaces.
-	 * @param string $code code to represent.
-	 * @param boolean $checksum if true add a checksum to the code
-	 * @return array barcode representation.
-	 * @access protected
-	 */
-	protected function barcode_i25($code, $checksum=false) {
-		$chr['0'] = '11221';
-		$chr['1'] = '21112';
-		$chr['2'] = '12112';
-		$chr['3'] = '22111';
-		$chr['4'] = '11212';
-		$chr['5'] = '21211';
-		$chr['6'] = '12211';
-		$chr['7'] = '11122';
-		$chr['8'] = '21121';
-		$chr['9'] = '12121';
-		$chr['A'] = '11';
-		$chr['Z'] = '21';
-		if ($checksum) {
-			// add checksum
-			$code .= $this->checksum_s25($code);
-		}
-		if((strlen($code) % 2) != 0) {
-			// add leading zero if code-length is odd
-			$code = '0'.$code;
-		}
-		// add start and stop codes
-		$code = 'AA'.strtolower($code).'ZA';
-			
-		$bararray = array('code' => $code, 'maxw' => 0, 'maxh' => 1, 'bcode' => array());
-		$k = 0;
-		$clen = strlen($code);
-		for ($i = 0; $i < $clen; $i = ($i + 2)) {
-			$char_bar = $code{$i};
-			$char_space = $code{$i+1};
-			if((!isset($chr[$char_bar])) OR (!isset($chr[$char_space]))) {
-				// invalid character
-				return false;
-			}
-			// create a bar-space sequence
-			$seq = '';
-			$chrlen = strlen($chr[$char_bar]);
-			for ($s = 0; $s < $chrlen; $s++){
-				$seq .= $chr[$char_bar]{$s} . $chr[$char_space]{$s};
-			}
-			$seqlen = strlen($seq);
-			for ($j = 0; $j < $seqlen; ++$j) {
-				if (($j % 2) == 0) {
-					$t = true; // bar
-				} else {
-					$t = false; // space
-				}
-				$w = $seq{$j};
-				$bararray['bcode'][$k] = array('t' => $t, 'w' => $w, 'h' => 1, 'p' => 0);
-				$bararray['maxw'] += $w;
-				++$k;
-			}
-		}
-		return $bararray;
-	}
-	
-	/**
-	 * C128 barcodes. 
-	 * Very capable code, excellent density, high reliability; in very wide use world-wide
-	 * @param string $code code to represent.
-	 * @param string $type barcode type: A, B or C
-	 * @return array barcode representation.
-	 * @access protected
-	 */
-	protected function barcode_c128($code, $type='B') {
-		$chr = array(
-			'212222', /* 00 */
-			'222122', /* 01 */
-			'222221', /* 02 */
-			'121223', /* 03 */
-			'121322', /* 04 */
-			'131222', /* 05 */
-			'122213', /* 06 */
-			'122312', /* 07 */
-			'132212', /* 08 */
-			'221213', /* 09 */
-			'221312', /* 10 */
-			'231212', /* 11 */
-			'112232', /* 12 */
-			'122132', /* 13 */
-			'122231', /* 14 */
-			'113222', /* 15 */
-			'123122', /* 16 */
-			'123221', /* 17 */
-			'223211', /* 18 */
-			'221132', /* 19 */
-			'221231', /* 20 */
-			'213212', /* 21 */
-			'223112', /* 22 */
-			'312131', /* 23 */
-			'311222', /* 24 */
-			'321122', /* 25 */
-			'321221', /* 26 */
-			'312212', /* 27 */
-			'322112', /* 28 */
-			'322211', /* 29 */
-			'212123', /* 30 */
-			'212321', /* 31 */
-			'232121', /* 32 */
-			'111323', /* 33 */
-			'131123', /* 34 */
-			'131321', /* 35 */
-			'112313', /* 36 */
-			'132113', /* 37 */
-			'132311', /* 38 */
-			'211313', /* 39 */
-			'231113', /* 40 */
-			'231311', /* 41 */
-			'112133', /* 42 */
-			'112331', /* 43 */
-			'132131', /* 44 */
-			'113123', /* 45 */
-			'113321', /* 46 */
-			'133121', /* 47 */
-			'313121', /* 48 */
-			'211331', /* 49 */
-			'231131', /* 50 */
-			'213113', /* 51 */
-			'213311', /* 52 */
-			'213131', /* 53 */
-			'311123', /* 54 */
-			'311321', /* 55 */
-			'331121', /* 56 */
-			'312113', /* 57 */
-			'312311', /* 58 */
-			'332111', /* 59 */
-			'314111', /* 60 */
-			'221411', /* 61 */
-			'431111', /* 62 */
-			'111224', /* 63 */
-			'111422', /* 64 */
-			'121124', /* 65 */
-			'121421', /* 66 */
-			'141122', /* 67 */
-			'141221', /* 68 */
-			'112214', /* 69 */
-			'112412', /* 70 */
-			'122114', /* 71 */
-			'122411', /* 72 */
-			'142112', /* 73 */
-			'142211', /* 74 */
-			'241211', /* 75 */
-			'221114', /* 76 */
-			'413111', /* 77 */
-			'241112', /* 78 */
-			'134111', /* 79 */
-			'111242', /* 80 */
-			'121142', /* 81 */
-			'121241', /* 82 */
-			'114212', /* 83 */
-			'124112', /* 84 */
-			'124211', /* 85 */
-			'411212', /* 86 */
-			'421112', /* 87 */
-			'421211', /* 88 */
-			'212141', /* 89 */
-			'214121', /* 90 */
-			'412121', /* 91 */
-			'111143', /* 92 */
-			'111341', /* 93 */
-			'131141', /* 94 */
-			'114113', /* 95 */
-			'114311', /* 96 */
-			'411113', /* 97 */
-			'411311', /* 98 */
-			'113141', /* 99 */
-			'114131', /* 100 */
-			'311141', /* 101 */
-			'411131', /* 102 */
-			'211412', /* 103 START A */
-			'211214', /* 104 START B  */
-			'211232', /* 105 START C  */
-			'233111', /* STOP */
-			'200000'  /* END */
-		);
-		$keys = '';
-		switch(strtoupper($type)) {
-			case 'A': {
-				$startid = 103;
-				$keys = ' !"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_';
-				for ($i = 0; $i < 32; ++$i) {
-					$keys .= chr($i);
-				}
-				break;
-			}
-			case 'B': {
-				$startid = 104;
-				$keys = ' !"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~'.chr(127);
-				break;
-			}
-			case 'C': {
-				$startid = 105;
-				$keys = '';
-				if ((strlen($code) % 2) != 0) {
-					// The length of barcode value must be even ($code). You must pad the number with zeros
-					return false;
-				}
-				for ($i = 0; $i <= 99; ++$i) {
-					$keys .= chr($i);
-				}
-				$new_code = '';
-				$hclen = (strlen($code) / 2);
-				for ($i = 0; $i < $hclen; ++$i) {
-					$new_code .= chr(intval($code{(2 * $i)}.$code{(2 * $i + 1)}));
-				}
-				$code = $new_code;
-				break;
-			}
-			default: {
-				return false;
-			}
-		}
-		// calculate check character
-		$sum = $startid;
-		$clen = strlen($code);
-		for ($i = 0; $i < $clen; ++$i) {
-			$sum +=  (strpos($keys, $code{$i}) * ($i+1));
-		}
-		$check = ($sum % 103);
-		// add start, check and stop codes
-		$code = chr($startid).$code.chr($check).chr(106).chr(107);
-		$bararray = array('code' => $code, 'maxw' => 0, 'maxh' => 1, 'bcode' => array());
-		$k = 0;
-		$len = strlen($code);
-		for ($i = 0; $i < $len; ++$i) {
-			$ck = strpos($keys, $code{$i});
-			if (($i == 0) OR ($i > ($len-4))) {
-				$char_num = ord($code{$i});
-				$seq = $chr[$char_num];
-			} elseif(($ck >= 0) AND isset($chr[$ck])) {
-					$seq = $chr[$ck];
-			} else {
-				// invalid character
-				return false;
-			}
-			for ($j = 0; $j < 6; ++$j) {
-				if (($j % 2) == 0) {
-					$t = true; // bar
-				} else {
-					$t = false; // space
-				}
-				$w = $seq{$j};
-				$bararray['bcode'][$k] = array('t' => $t, 'w' => $w, 'h' => 1, 'p' => 0);
-				$bararray['maxw'] += $w;
-				++$k;
-			}
-		}
-		return $bararray;		
-	}
-	
-	/**
-	 * EAN13 and UPC-A barcodes.
-	 * EAN13: European Article Numbering international retail product code
-	 * UPC-A: Universal product code seen on almost all retail products in the USA and Canada
-	 * UPC-E: Short version of UPC symbol
-	 * @param string $code code to represent.
-	 * @param string $len barcode type: 6 = UPC-E, 8 = EAN8, 13 = EAN13, 12 = UPC-A
-	 * @return array barcode representation.
-	 * @access protected
-	 */
-	protected function barcode_eanupc($code, $len=13) {
-		$upce = false;
-		if ($len == 6) {
-			$len = 12; // UPC-A
-			$upce = true; // UPC-E mode
-		}
-		$data_len = $len - 1;
-		//Padding
-		$code = str_pad($code, $data_len, '0', STR_PAD_LEFT);
-		$code_len = strlen($code);
-		// calculate check digit
-		$sum_a = 0;
-		for ($i = 1; $i < $data_len; $i+=2) {
-			$sum_a += $code{$i};
-		}
-		if ($len > 12) {
-			$sum_a *= 3;
-		}
-		$sum_b = 0;
-		for ($i = 0; $i < $data_len; $i+=2) {
-			$sum_b += ($code{$i});
-		}
-		if ($len < 13) {
-			$sum_b *= 3;
-		}
-		$r = ($sum_a + $sum_b) % 10;
-		if($r > 0) {
-			$r = (10 - $r);
-		}
-		if ($code_len == $data_len) {
-			// add check digit
-			$code .= $r;
-		} elseif ($r !== intval($code{$data_len})) {
-			// wrong checkdigit
-			return false;
-		}
-		if ($len == 12) {
-			// UPC-A
-			$code = '0'.$code;
-			++$len;
-		}
-		if ($upce) {
-			// convert UPC-A to UPC-E
-			$tmp = substr($code, 4, 3);
-			if (($tmp == '000') OR ($tmp == '100') OR ($tmp == '200')) {
-				// manufacturer code ends in 000, 100, or 200
-				$upce_code = substr($code, 2, 2).substr($code, 9, 3).substr($code, 4, 1);
-			} else {
-				$tmp = substr($code, 5, 2);
-				if ($tmp == '00') {
-					// manufacturer code ends in 00
-					$upce_code = substr($code, 2, 3).substr($code, 10, 2).'3';
-				} else {
-					$tmp = substr($code, 6, 1);
-					if ($tmp == '0') {
-						// manufacturer code ends in 0
-						$upce_code = substr($code, 2, 4).substr($code, 11, 1).'4';
-					} else {
-						// manufacturer code does not end in zero
-						$upce_code = substr($code, 2, 5).substr($code, 11, 1);
-					}
-				}
-			}
-		}
-		//Convert digits to bars
-		$codes = array(
-			'A'=>array( // left odd parity
-				'0'=>'0001101',
-				'1'=>'0011001',
-				'2'=>'0010011',
-				'3'=>'0111101',
-				'4'=>'0100011',
-				'5'=>'0110001',
-				'6'=>'0101111',
-				'7'=>'0111011',
-				'8'=>'0110111',
-				'9'=>'0001011'),
-			'B'=>array( // left even parity
-				'0'=>'0100111',
-				'1'=>'0110011',
-				'2'=>'0011011',
-				'3'=>'0100001',
-				'4'=>'0011101',
-				'5'=>'0111001',
-				'6'=>'0000101',
-				'7'=>'0010001',
-				'8'=>'0001001',
-				'9'=>'0010111'),
-			'C'=>array( // right
-				'0'=>'1110010',
-				'1'=>'1100110',
-				'2'=>'1101100',
-				'3'=>'1000010',
-				'4'=>'1011100',
-				'5'=>'1001110',
-				'6'=>'1010000',
-				'7'=>'1000100',
-				'8'=>'1001000',
-				'9'=>'1110100')
-		);
-		$parities = array(
-			'0'=>array('A','A','A','A','A','A'),
-			'1'=>array('A','A','B','A','B','B'),
-			'2'=>array('A','A','B','B','A','B'),
-			'3'=>array('A','A','B','B','B','A'),
-			'4'=>array('A','B','A','A','B','B'),
-			'5'=>array('A','B','B','A','A','B'),
-			'6'=>array('A','B','B','B','A','A'),
-			'7'=>array('A','B','A','B','A','B'),
-			'8'=>array('A','B','A','B','B','A'),
-			'9'=>array('A','B','B','A','B','A')
-		);
-		$upce_parities = array();
-		$upce_parities[0] = array(
-			'0'=>array('B','B','B','A','A','A'),
-			'1'=>array('B','B','A','B','A','A'),
-			'2'=>array('B','B','A','A','B','A'),
-			'3'=>array('B','B','A','A','A','B'),
-			'4'=>array('B','A','B','B','A','A'),
-			'5'=>array('B','A','A','B','B','A'),
-			'6'=>array('B','A','A','A','B','B'),
-			'7'=>array('B','A','B','A','B','A'),
-			'8'=>array('B','A','B','A','A','B'),
-			'9'=>array('B','A','A','B','A','B')
-		);
-		$upce_parities[1] = array(
-			'0'=>array('A','A','A','B','B','B'),
-			'1'=>array('A','A','B','A','B','B'),
-			'2'=>array('A','A','B','B','A','B'),
-			'3'=>array('A','A','B','B','B','A'),
-			'4'=>array('A','B','A','A','B','B'),
-			'5'=>array('A','B','B','A','A','B'),
-			'6'=>array('A','B','B','B','A','A'),
-			'7'=>array('A','B','A','B','A','B'),
-			'8'=>array('A','B','A','B','B','A'),
-			'9'=>array('A','B','B','A','B','A')
-		);
-		$k = 0;
-		$seq = '101'; // left guard bar
-		if ($upce) {
-			$bararray = array('code' => $upce_code, 'maxw' => 0, 'maxh' => 1, 'bcode' => array());
-			$p = $upce_parities[$code{1}][$r];
-			for ($i = 0; $i < 6; ++$i) {
-				$seq .= $codes[$p[$i]][$upce_code{$i}];
-			}
-			$seq .= '010101'; // right guard bar
-		} else {
-			$bararray = array('code' => $code, 'maxw' => 0, 'maxh' => 1, 'bcode' => array());
-			$half_len = ceil($len / 2);
-			if ($len == 8) {
-				for ($i = 0; $i < $half_len; ++$i) {
-					$seq .= $codes['A'][$code{$i}];
-				}
-			} else {
-				$p = $parities[$code{0}];
-				for ($i = 1; $i < $half_len; ++$i) {
-					$seq .= $codes[$p[$i-1]][$code{$i}];
-				}
-			}
-			$seq .= '01010'; // center guard bar
-			for ($i = $half_len; $i < $len; ++$i) {
-				$seq .= $codes['C'][$code{$i}];
-			}
-			$seq .= '101'; // right guard bar
-		}
-		$clen = strlen($seq);
-		$w = 0;
-		for ($i = 0; $i < $clen; ++$i) {
-			$w += 1;
-			if (($i == ($clen - 1)) OR (($i < ($clen - 1)) AND ($seq{$i} != $seq{($i+1)}))) {
-				if ($seq{$i} == '1') {
-					$t = true; // bar
-				} else {
-					$t = false; // space
-				}
-				$bararray['bcode'][$k] = array('t' => $t, 'w' => $w, 'h' => 1, 'p' => 0);
-				$bararray['maxw'] += $w;
-				++$k;
-				$w = 0;
-			}
-		}
-		return $bararray;
-	}
-	
-	/**
-	 * UPC-Based Extentions
-	 * 2-Digit Ext.: Used to indicate magazines and newspaper issue numbers
-	 * 5-Digit Ext.: Used to mark suggested retail price of books
-	 * @param string $code code to represent.
-	 * @param string $len barcode type: 2 = 2-Digit, 5 = 5-Digit
-	 * @return array barcode representation.
-	 * @access protected
-	 */
-	protected function barcode_eanext($code, $len=5) {
-		//Padding
-		$code = str_pad($code, $len, '0', STR_PAD_LEFT);
-		// calculate check digit
-		if ($len == 2) {
-			$r = $code % 4;
-		} elseif ($len == 5) {
-			$r = (3 * ($code{0} + $code{2} + $code{4})) + (9 * ($code{1} + $code{3}));
-			$r %= 10;
-		} else {
-			return false;
-		}
-		//Convert digits to bars
-		$codes = array(
-			'A'=>array( // left odd parity
-				'0'=>'0001101',
-				'1'=>'0011001',
-				'2'=>'0010011',
-				'3'=>'0111101',
-				'4'=>'0100011',
-				'5'=>'0110001',
-				'6'=>'0101111',
-				'7'=>'0111011',
-				'8'=>'0110111',
-				'9'=>'0001011'),
-			'B'=>array( // left even parity
-				'0'=>'0100111',
-				'1'=>'0110011',
-				'2'=>'0011011',
-				'3'=>'0100001',
-				'4'=>'0011101',
-				'5'=>'0111001',
-				'6'=>'0000101',
-				'7'=>'0010001',
-				'8'=>'0001001',
-				'9'=>'0010111')
-		);
-		$parities = array();
-		$parities[2] = array(
-			'0'=>array('A','A'),
-			'1'=>array('A','B'),
-			'2'=>array('B','A'),
-			'3'=>array('B','B')
-		);
-		$parities[5] = array(
-			'0'=>array('B','B','A','A','A'),
-			'1'=>array('B','A','B','A','A'),
-			'2'=>array('B','A','A','B','A'),
-			'3'=>array('B','A','A','A','B'),
-			'4'=>array('A','B','B','A','A'),
-			'5'=>array('A','A','B','B','A'),
-			'6'=>array('A','A','A','B','B'),
-			'7'=>array('A','B','A','B','A'),
-			'8'=>array('A','B','A','A','B'),
-			'9'=>array('A','A','B','A','B')
-		);	
-		$p = $parities[$len][$r];
-		$seq = '1011'; // left guard bar
-		$seq .= $codes[$p[0]][$code{0}];
-		for ($i = 1; $i < $len; ++$i) {
-			$seq .= '01'; // separator
-			$seq .= $codes[$p[$i]][$code{$i}];
-		}
-		$bararray = array('code' => $code, 'maxw' => 0, 'maxh' => 1, 'bcode' => array());
-		return $this->binseq_to_array($seq, $bararray);
-	}
-	
-	/**
-	 * POSTNET and PLANET barcodes.
-	 * Used by U.S. Postal Service for automated mail sorting
-	 * @param string $code zip code to represent. Must be a string containing a zip code of the form DDDDD or DDDDD-DDDD.
-	 * @param boolean $planet if true print the PLANET barcode, otherwise print POSTNET
-	 * @return array barcode representation.
-	 * @access protected
-	 */
-	protected function barcode_postnet($code, $planet=false) {
-		// bar lenght
-		if ($planet) {
-			$barlen = Array(
-				0 => Array(1,1,2,2,2),
-				1 => Array(2,2,2,1,1),
-				2 => Array(2,2,1,2,1),
-				3 => Array(2,2,1,1,2),
-				4 => Array(2,1,2,2,1),
-				5 => Array(2,1,2,1,2),
-				6 => Array(2,1,1,2,2),
-				7 => Array(1,2,2,2,1),
-				8 => Array(1,2,2,1,2),
-				9 => Array(1,2,1,2,2)
-			);
-		} else {
-			$barlen = Array(
-				0 => Array(2,2,1,1,1),
-				1 => Array(1,1,1,2,2),
-				2 => Array(1,1,2,1,2),
-				3 => Array(1,1,2,2,1),
-				4 => Array(1,2,1,1,2),
-				5 => Array(1,2,1,2,1),
-				6 => Array(1,2,2,1,1),
-				7 => Array(2,1,1,1,2),
-				8 => Array(2,1,1,2,1),
-				9 => Array(2,1,2,1,1)
-			);
-		}
-		$bararray = array('code' => $code, 'maxw' => 0, 'maxh' => 2, 'bcode' => array());
-		$k = 0;
-		$code = str_replace('-', '', $code);
-		$code = str_replace(' ', '', $code);
-		$len = strlen($code);
-		// calculate checksum
-		$sum = 0;
-		for ($i = 0; $i < $len; ++$i) {
-			$sum += intval($code{$i});
-		}
-		$chkd = ($sum % 10);
-		if($chkd > 0) {
-			$chkd = (10 - $chkd);
-		}
-		$code .= $chkd;
-		$len = strlen($code);
-		// start bar
-		$bararray['bcode'][$k++] = array('t' => 1, 'w' => 1, 'h' => 2, 'p' => 0);
-		$bararray['bcode'][$k++] = array('t' => 0, 'w' => 1, 'h' => 2, 'p' => 0);
-		$bararray['maxw'] += 2;
-		for ($i = 0; $i < $len; ++$i) {
-			for ($j = 0; $j < 5; ++$j) {
-				$h = $barlen[$code{$i}][$j];
-				$p = floor(1 / $h);
-				$bararray['bcode'][$k++] = array('t' => 1, 'w' => 1, 'h' => $h, 'p' => $p);
-				$bararray['bcode'][$k++] = array('t' => 0, 'w' => 1, 'h' => 2, 'p' => 0);
-				$bararray['maxw'] += 2;
-			}
-		}
-		// end bar
-		$bararray['bcode'][$k++] = array('t' => 1, 'w' => 1, 'h' => 2, 'p' => 0);
-		$bararray['maxw'] += 1;
-		return $bararray;
-	}
-	
-	/**
-	 * RMS4CC - CBC - KIX
-	 * RMS4CC (Royal Mail 4-state Customer Code) - CBC (Customer Bar Code) - KIX (Klant index - Customer index)
-	 * RM4SCC is the name of the barcode symbology used by the Royal Mail for its Cleanmail service.
-	 * @param string $code code to print
-	 * @param boolean $kix if true prints the KIX variation (doesn't use the start and end symbols, and the checksum) - in this case the house number must be sufficed with an X and placed at the end of the code.
-	 * @return array barcode representation.
-	 * @access protected
-	 */
-	protected function barcode_rms4cc($code, $kix=false) {
-		$notkix = !$kix;
-		// bar mode
-		// 1 = pos 1, length 2
-		// 2 = pos 1, length 3
-		// 3 = pos 2, length 1
-		// 4 = pos 2, length 2
-		$barmode = array(
-			'0' => array(3,3,2,2),
-			'1' => array(3,4,1,2),
-			'2' => array(3,4,2,1),
-			'3' => array(4,3,1,2),
-			'4' => array(4,3,2,1),
-			'5' => array(4,4,1,1),
-			'6' => array(3,1,4,2),
-			'7' => array(3,2,3,2),
-			'8' => array(3,2,4,1),
-			'9' => array(4,1,3,2),
-			'A' => array(4,1,4,1),
-			'B' => array(4,2,3,1),
-			'C' => array(3,1,2,4),
-			'D' => array(3,2,1,4),
-			'E' => array(3,2,2,3),
-			'F' => array(4,1,1,4),
-			'G' => array(4,1,2,3),
-			'H' => array(4,2,1,3),
-			'I' => array(1,3,4,2),
-			'J' => array(1,4,3,2),
-			'K' => array(1,4,4,1),
-			'L' => array(2,3,3,2),
-			'M' => array(2,3,4,1),
-			'N' => array(2,4,3,1),
-			'O' => array(1,3,2,4),
-			'P' => array(1,4,1,4),
-			'Q' => array(1,4,2,3),
-			'R' => array(2,3,1,4),
-			'S' => array(2,3,2,3),
-			'T' => array(2,4,1,3),
-			'U' => array(1,1,4,4),
-			'V' => array(1,2,3,4),
-			'W' => array(1,2,4,3),
-			'X' => array(2,1,3,4),
-			'Y' => array(2,1,4,3),
-			'Z' => array(2,2,3,3)		
-		);
-		$code = strtoupper($code);
-		$len = strlen($code);
-		$bararray = array('code' => $code, 'maxw' => 0, 'maxh' => 3, 'bcode' => array());
-		if ($notkix) {
-			// table for checksum calculation (row,col)
-			$checktable = array(
-				'0' => array(1,1),
-				'1' => array(1,2),
-				'2' => array(1,3),
-				'3' => array(1,4),
-				'4' => array(1,5),
-				'5' => array(1,0),
-				'6' => array(2,1),
-				'7' => array(2,2),
-				'8' => array(2,3),
-				'9' => array(2,4),
-				'A' => array(2,5),
-				'B' => array(2,0),
-				'C' => array(3,1),
-				'D' => array(3,2),
-				'E' => array(3,3),
-				'F' => array(3,4),
-				'G' => array(3,5),
-				'H' => array(3,0),
-				'I' => array(4,1),
-				'J' => array(4,2),
-				'K' => array(4,3),
-				'L' => array(4,4),
-				'M' => array(4,5),
-				'N' => array(4,0),
-				'O' => array(5,1),
-				'P' => array(5,2),
-				'Q' => array(5,3),
-				'R' => array(5,4),
-				'S' => array(5,5),
-				'T' => array(5,0),
-				'U' => array(0,1),
-				'V' => array(0,2),
-				'W' => array(0,3),
-				'X' => array(0,4),
-				'Y' => array(0,5),
-				'Z' => array(0,0)
-			);
-			$row = 0;
-			$col = 0;
-			for ($i = 0; $i < $len; ++$i) {
-				$row += $checktable[$code{$i}][0];
-				$col += $checktable[$code{$i}][1];
-			}
-			$row %= 6;
-			$col %= 6;
-			$chk = array_keys($checktable, array($row,$col));
-			$code .= $chk[0];
-			++$len;
-		}
-		$k = 0;
-		if ($notkix) {
-			// start bar
-			$bararray['bcode'][$k++] = array('t' => 1, 'w' => 1, 'h' => 2, 'p' => 0);
-			$bararray['bcode'][$k++] = array('t' => 0, 'w' => 1, 'h' => 2, 'p' => 0);
-			$bararray['maxw'] += 2;
-		}
-		for ($i = 0; $i < $len; ++$i) {
-			for ($j = 0; $j < 4; ++$j) {
-				switch ($barmode[$code{$i}][$j]) {
-					case 1: {
-						$p = 0;
-						$h = 2;
-						break;
-					}
-					case 2: {
-						$p = 0;
-						$h = 3;
-						break;
-					}
-					case 3: {
-						$p = 1;
-						$h = 1;
-						break;
-					}
-					case 4: {
-						$p = 1;
-						$h = 2;
-						break;
-					}
-				}
-				$bararray['bcode'][$k++] = array('t' => 1, 'w' => 1, 'h' => $h, 'p' => $p);
-				$bararray['bcode'][$k++] = array('t' => 0, 'w' => 1, 'h' => 2, 'p' => 0);
-				$bararray['maxw'] += 2;
-			}
-		}
-		if ($notkix) {
-			// stop bar
-			$bararray['bcode'][$k++] = array('t' => 1, 'w' => 1, 'h' => 3, 'p' => 0);
-			$bararray['maxw'] += 1;
-		}
-		return $bararray;
-	}
-	
-	/**
-	 * CODABAR barcodes.
-	 * Older code often used in library systems, sometimes in blood banks
-	 * @param string $code code to represent.
-	 * @return array barcode representation.
-	 * @access protected
-	 */
-	protected function barcode_codabar($code) {
-		$chr = array(
-			'0' => '11111221',
-			'1' => '11112211',
-			'2' => '11121121',
-			'3' => '22111111',
-			'4' => '11211211',
-			'5' => '21111211',
-			'6' => '12111121',
-			'7' => '12112111',
-			'8' => '12211111',
-			'9' => '21121111',
-			'-' => '11122111',
-			'$' => '11221111',
-			':' => '21112121',
-			'/' => '21211121',
-			'.' => '21212111',
-			'+' => '11222221',
-			'A' => '11221211',
-			'B' => '12121121',
-			'C' => '11121221',
-			'D' => '11122211'
-		);
-		$bararray = array('code' => $code, 'maxw' => 0, 'maxh' => 1, 'bcode' => array());
-		$k = 0;
-		$w = 0;
-		$seq = '';
-		$code = 'A'.strtoupper($code).'A';
-		$len = strlen($code);
-		for ($i = 0; $i < $len; ++$i) {
-			if (!isset($chr[$code{$i}])) {
-				return false;
-			}
-			$seq = $chr[$code{$i}];
-			for ($j = 0; $j < 8; ++$j) {
-				if (($j % 2) == 0) {
-					$t = true; // bar
-				} else {
-					$t = false; // space
-				}
-				$w = $seq{$j};
-				$bararray['bcode'][$k] = array('t' => $t, 'w' => $w, 'h' => 1, 'p' => 0);
-				$bararray['maxw'] += $w;
-				++$k;
-			}
-		}
-		return $bararray;
-	}
-	
-	/**
-	 * CODE11 barcodes.
-	 * Used primarily for labeling telecommunications equipment
-	 * @param string $code code to represent.
-	 * @return array barcode representation.
-	 * @access protected
-	 */
-	protected function barcode_code11($code) {
-		$chr = array(
-			'0' => '111121',
-			'1' => '211121',
-			'2' => '121121',
-			'3' => '221111',
-			'4' => '112121',
-			'5' => '212111',
-			'6' => '122111',
-			'7' => '111221',
-			'8' => '211211',
-			'9' => '211111',
-			'-' => '112111',
-			'S' => '112211'
-		);
-		
-		$bararray = array('code' => $code, 'maxw' => 0, 'maxh' => 1, 'bcode' => array());
-		$k = 0;
-		$w = 0;
-		$seq = '';
-		$len = strlen($code);
-		// calculate check digit C
-		$p = 1;
-		$check = 0;
-		for ($i = ($len - 1); $i >= 0; --$i) {
-			$digit = $code{$i};
-			if ($digit == '-') {
-				$dval = 10;
-			} else {
-				$dval = intval($digit);
-			}
-			$check += ($dval * $p);
-			++$p;
-			if ($p > 10) {
-				$p = 1;
-			}
-		}
-		$check %= 11;
-		if ($check == 10) {
-			$check = '-';
-		} 
-		$code .= $check;
-		if ($len > 10) {
-			// calculate check digit K
-			$p = 1;
-			$check = 0;
-			for ($i = $len; $i >= 0; --$i) {
-				$digit = $code{$i};
-				if ($digit == '-') {
-					$dval = 10;
-				} else {
-					$dval = intval($digit);
-				}
-				$check += ($dval * $p);
-				++$p;
-				if ($p > 9) {
-					$p = 1;
-				}
-			}
-			$check %= 11;
-			$code .= $check;
-			++$len;
-		}
-		$code = 'S'.$code.'S';
-		$len += 3;
-		for ($i = 0; $i < $len; ++$i) {
-			if (!isset($chr[$code{$i}])) {
-				return false;
-			}
-			$seq = $chr[$code{$i}];
-			for ($j = 0; $j < 6; ++$j) {
-				if (($j % 2) == 0) {
-					$t = true; // bar
-				} else {
-					$t = false; // space
-				}
-				$w = $seq{$j};
-				$bararray['bcode'][$k] = array('t' => $t, 'w' => $w, 'h' => 1, 'p' => 0);
-				$bararray['maxw'] += $w;
-				++$k;
-			}
-		}
-		return $bararray;
-	}
-	
-	/**
-	 * Pharmacode
-	 * Contains digits (0 to 9)
-	 * @param string $code code to represent.
-	 * @return array barcode representation.
-	 * @access protected
-	 */
-	protected function barcode_pharmacode($code) {
-		$seq = '';
-		$code = intval($code);
-		while ($code > 0) {
-			if (($code % 2) == 0) {
-				$seq .= '11100';
-				$code -= 2;
-			} else {
-				$seq .= '100';
-				$code -= 1;
-			}
-			$code /= 2;
-		}
-		$seq = substr($seq, 0, -2);
-		$seq = strrev($seq);
-		$bararray = array('code' => $code, 'maxw' => 0, 'maxh' => 1, 'bcode' => array());
-		return $this->binseq_to_array($seq, $bararray);
-	}
-	
-	/**
-	 * Pharmacode two-track
-	 * Contains digits (0 to 9)
-	 * @param string $code code to represent.
-	 * @return array barcode representation.
-	 * @access protected
-	 */
-	protected function barcode_pharmacode2t($code) {
-		$seq = '';
-		$code = intval($code);
-		do {
-			switch ($code % 3) {
-				case 0: {
-					$seq .= '3';
-					$code = ($code - 3) / 3;
-					break;
-				}
-				case 1: {
-					$seq .= '1';
-					$code = ($code - 1) / 3;
-					break;
-				}
-				case 2: {
-					$seq .= '2';
-					$code = ($code - 2) / 3;
-					break;
-				}
-			}
-		} while($code != 0);
-		$seq = strrev($seq);
-		$k = 0;
-		$bararray = array('code' => $code, 'maxw' => 0, 'maxh' => 2, 'bcode' => array());
-		$len = strlen($seq);
-		for ($i = 0; $i < $len; ++$i) {
-			switch ($seq{$i}) {
-				case '1': {
-					$p = 1;
-					$h = 1;
-					break;
-				}
-				case '2': {
-					$p = 0;
-					$h = 1;
-					break;
-				}
-				case '3': {
-					$p = 0;
-					$h = 2;
-					break;
-				}
-			}
-			$bararray['bcode'][$k++] = array('t' => 1, 'w' => 1, 'h' => $h, 'p' => $p);
-			$bararray['bcode'][$k++] = array('t' => 0, 'w' => 1, 'h' => 2, 'p' => 0);
-			$bararray['maxw'] += 2;
-		}
-		unset($bararray['bcode'][($k - 1)]);
-		--$bararray['maxw'];
-		return $bararray;
-	}
-	
-	
-	/**
-	 * IMB - Intelligent Mail Barcode - Onecode - USPS-B-3200
-	 * (requires PHP bcmath extension) 
-	 * Intelligent Mail barcode is a 65-bar code for use on mail in the United States.
-	 * The fields are described as follows:<ul><li>The Barcode Identifier shall be assigned by USPS to encode the presort identification that is currently printed in human readable form on the optional endorsement line (OEL) as well as for future USPS use. This shall be two digits, with the second digit in the range of 0–4. The allowable encoding ranges shall be 00–04, 10–14, 20–24, 30–34, 40–44, 50–54, 60–64, 70–74, 80–84, and 90–94.</li><li>The Service Type Identifier shall be assigned by USPS for any combination of services requested on the mailpiece. The allowable encoding range shall be 000http://it2.php.net/manual/en/function.dechex.php–999. Each 3-digit value shall correspond to a particular mail class with a particular combination of service(s). Each service program, such as OneCode Confirm and OneCode ACS, shall provide the list of Service Type Identifier values.</li><li>The Mailer or Customer Identifier shall be assigned by USPS as a unique, 6 or 9 digit number that identifies a business entity. The allowable encoding range for the 6 digit Mailer ID shall be 000000- 899999, while the allowable encoding range for the 9 digit Mailer ID shall be 900000000-999999999.</li><li>The Serial or Sequence Number shall be assigned by the mailer for uniquely identifying and tracking mailpieces. The allowable encoding range shall be 000000000–999999999 when used with a 6 digit Mailer ID and 000000-999999 when used with a 9 digit Mailer ID. e. The Delivery Point ZIP Code shall be assigned by the mailer for routing the mailpiece. This shall replace POSTNET for routing the mailpiece to its final delivery point. The length may be 0, 5, 9, or 11 digits. The allowable encoding ranges shall be no ZIP Code, 00000–99999,  000000000–999999999, and 00000000000–99999999999.</li></ul>
-	 * @param string $code code to print, separate the ZIP (routing code) from the rest using a minus char '-' (BarcodeID_ServiceTypeID_MailerID_SerialNumber-RoutingCode)
-	 * @return array barcode representation.
-	 * @access protected
-	 */
-	protected function barcode_imb($code) {
-		$asc_chr = array(4,0,2,6,3,5,1,9,8,7,1,2,0,6,4,8,2,9,5,3,0,1,3,7,4,6,8,9,2,0,5,1,9,4,3,8,6,7,1,2,4,3,9,5,7,8,3,0,2,1,4,0,9,1,7,0,2,4,6,3,7,1,9,5,8);
-		$dsc_chr = array(7,1,9,5,8,0,2,4,6,3,5,8,9,7,3,0,6,1,7,4,6,8,9,2,5,1,7,5,4,3,8,7,6,0,2,5,4,9,3,0,1,6,8,2,0,4,5,9,6,7,5,2,6,3,8,5,1,9,8,7,4,0,2,6,3);
-		$asc_pos = array(3,0,8,11,1,12,8,11,10,6,4,12,2,7,9,6,7,9,2,8,4,0,12,7,10,9,0,7,10,5,7,9,6,8,2,12,1,4,2,0,1,5,4,6,12,1,0,9,4,7,5,10,2,6,9,11,2,12,6,7,5,11,0,3,2);
-		$dsc_pos = array(2,10,12,5,9,1,5,4,3,9,11,5,10,1,6,3,4,1,10,0,2,11,8,6,1,12,3,8,6,4,4,11,0,6,1,9,11,5,3,7,3,10,7,11,8,2,10,3,5,8,0,3,12,11,8,4,5,1,3,0,7,12,9,8,10);
-		$code_arr = explode('-', $code);
-		$tracking_number = $code_arr[0];
-		if (isset($code_arr[1])) {
-			$routing_code = $code_arr[1];
-		} else {
-			$routing_code = '';
-		}
-		// Conversion of Routing Code
-		switch (strlen($routing_code)) {
-			case 0: {
-				$binary_code = 0;
-				break;
-			}
-			case 5: {
-				$binary_code = bcadd($routing_code, '1');
-				break;
-			}
-			case 9: {
-				$binary_code = bcadd($routing_code, '100001');
-				break;
-			}
-			case 11: {
-				$binary_code = bcadd($routing_code, '1000100001');
-				break;
-			}
-			default: {
-				return false;
-				break;
-			}
-		}
-		$binary_code = bcmul($binary_code, 10);
-		$binary_code = bcadd($binary_code, $tracking_number{0});
-		$binary_code = bcmul($binary_code, 5);
-		$binary_code = bcadd($binary_code, $tracking_number{1});
-		$binary_code .= substr($tracking_number, 2, 18);
-		// convert to hexadecimal
-		$binary_code = $this->dec_to_hex($binary_code);
-		// pad to get 13 bytes
-		$binary_code = str_pad($binary_code, 26, '0', STR_PAD_LEFT);
-		// convert string to array of bytes
-		$binary_code_arr = chunk_split($binary_code, 2, "\r");
-		$binary_code_arr = substr($binary_code_arr, 0, -1);
-		$binary_code_arr = explode("\r", $binary_code_arr);
-		// calculate frame check sequence
-		$fcs = $this->imb_crc11fcs($binary_code_arr);
-		// exclude first 2 bits from first byte
-		$first_byte = sprintf('%2s', dechex((hexdec($binary_code_arr[0]) << 2) >> 2));
-		$binary_code_102bit = $first_byte.substr($binary_code, 2);
-		// convert binary data to codewords
-		$codewords = array();
-		$data = $this->hex_to_dec($binary_code_102bit);
-		$codewords[0] = bcmod($data, 636) * 2;
-		$data = bcdiv($data, 636);
-		for ($i = 1; $i < 9; ++$i) {
-			$codewords[$i] = bcmod($data, 1365);
-			$data = bcdiv($data, 1365);
-		}
-		$codewords[9] = $data;
-		if (($fcs >> 10) == 1) {
-			$codewords[9] += 659;
-		}
-		// generate lookup tables
-		$table2of13 = $this->imb_tables(2, 78);
-		$table5of13 = $this->imb_tables(5, 1287);
-		// convert codewords to characters
-		$characters = array();
-		$bitmask = 512;
-		foreach($codewords as $k => $val) {
-			if ($val <= 1286) {
-				$chrcode = $table5of13[$val];
-			} else {
-				$chrcode = $table2of13[($val - 1287)];
-			}
-			if (($fcs & $bitmask) > 0) {
-				// bitwise invert
-				$chrcode = ((~$chrcode) & 8191);
-			}
-			$characters[] = $chrcode;
-			$bitmask /= 2;
-		}
-		$characters = array_reverse($characters);
-		// build bars
-		$k = 0;
-		$bararray = array('code' => $code, 'maxw' => 0, 'maxh' => 3, 'bcode' => array());
-		for ($i = 0; $i < 65; ++$i) {
-			$asc = (($characters[$asc_chr[$i]] & pow(2, $asc_pos[$i])) > 0);
-			$dsc = (($characters[$dsc_chr[$i]] & pow(2, $dsc_pos[$i])) > 0);
-			if ($asc AND $dsc) {
-				// full bar (F)
-				$p = 0;
-				$h = 3;
-			} elseif ($asc) {
-				// ascender (A)
-				$p = 0;
-				$h = 2;
-			} elseif ($dsc) {
-				// descender (D)
-				$p = 1;
-				$h = 2;
-			} else {
-				// tracker (T)
-				$p = 1;
-				$h = 1;
-			}
-			$bararray['bcode'][$k++] = array('t' => 1, 'w' => 1, 'h' => $h, 'p' => $p);
-			$bararray['bcode'][$k++] = array('t' => 0, 'w' => 1, 'h' => 2, 'p' => 0);
-			$bararray['maxw'] += 2;
-		}
-		unset($bararray['bcode'][($k - 1)]);
-		--$bararray['maxw'];
-		return $bararray;
-	}
-	
-	/**
-	 * Convert large integer number to hexadecimal representation.
-	 * (requires PHP bcmath extension) 
-	 * @param string $number number to convert specified as a string
-	 * @return string hexadecimal representation
-	 */
-	public function dec_to_hex($number) {
-		$i = 0;
-		$hex = array();
-		if($number == 0) {
-			return '00';
-		}
-		while($number > 0) {
-			if($number == 0) {
-				array_push($hex, '0');
-			} else {
-				array_push($hex, strtoupper(dechex(bcmod($number, '16'))));
-				$number = bcdiv($number, '16', 0);
-			}
-		}
-		$hex = array_reverse($hex);
-		return implode($hex);
-	}
-	
-	/**
-	 * Convert large hexadecimal number to decimal representation (string).
-	 * (requires PHP bcmath extension) 
-	 * @param string $hex hexadecimal number to convert specified as a string
-	 * @return string hexadecimal representation
-	 */
-	public function hex_to_dec($hex) {
-		$dec = 0;
-		$bitval = 1;
-		$len = strlen($hex);
-		for($pos = ($len - 1); $pos >= 0; --$pos) {
-			$dec = bcadd($dec, bcmul(hexdec($hex{$pos}), $bitval));
-			$bitval = bcmul($bitval, 16);
-		}
-		return $dec;
-	}	
-	
-	/**
-	 * Intelligent Mail Barcode calculation of Frame Check Sequence
-	 * @param string $code_arr array of hexadecimal values (13 bytes holding 102 bits right justified).
-	 * @return int 11 bit Frame Check Sequence as integer (decimal base)
-	 * @access protected
-	 */
-	protected function imb_crc11fcs($code_arr) {
-		$genpoly = 0x0F35; // generator polynomial
-		$fcs = 0x07FF; // Frame Check Sequence
-		// do most significant byte skipping the 2 most significant bits
-		$data = hexdec($code_arr[0]) << 5;
-		for ($bit = 2; $bit < 8; ++$bit) {
-			if (($fcs ^ $data) & 0x400) {
-				$fcs = ($fcs << 1) ^ $genpoly;
-			} else {
-				$fcs = ($fcs << 1);
-			}
-			$fcs &= 0x7FF;
-			$data <<= 1;
-		}
-		// do rest of bytes
-		for ($byte = 1; $byte < 13; ++$byte) {
-			$data = hexdec($code_arr[$byte]) << 3;
-			for ($bit = 0; $bit < 8; ++$bit) {
-				if (($fcs ^ $data) & 0x400) {
-					$fcs = ($fcs << 1) ^ $genpoly;
-				} else {
-					$fcs = ($fcs << 1);
-				}
-				$fcs &= 0x7FF;
-				$data <<= 1;
-			}
-		}
-		return $fcs;		
-	}
-	
-	/**
-	 * Reverse unsigned short value
-	 * @param int $num value to reversr
-	 * @return int reversed value
-	 * @access protected
-	 */
-	protected function imb_reverse_us($num) {
-		$rev = 0;
-		for ($i = 0; $i < 16; ++$i) {
-			$rev <<= 1;
-			$rev |= ($num & 1);
-			$num >>= 1;
-		}
-		return $rev;
-	}
-	
-	/**
-	 * generate Nof13 tables used for Intelligent Mail Barcode
-	 * @param int $n is the type of table: 2 for 2of13 table, 5 for 5of13table
-	 * @param int $size size of table (78 for n=2 and 1287 for n=5)
-	 * @return array requested table
-	 * @access protected
-	 */
-	protected function imb_tables($n, $size) {
-		$table = array();
-		$lli = 0; // LUT lower index
-		$lui = $size - 1; // LUT upper index
-		for ($count = 0; $count < 8192; ++$count) {
-			$bit_count = 0;
-			for ($bit_index = 0; $bit_index < 13; ++$bit_index) {
-				$bit_count += intval(($count & (1 << $bit_index)) != 0);
-			}
-			// if we don't have the right number of bits on, go on to the next value
-			if ($bit_count == $n) {
-				$reverse = ($this->imb_reverse_us($count) >> 3);
-				// if the reverse is less than count, we have already visited this pair before
-				if ($reverse >= $count) {
-					// If count is symmetric, place it at the first free slot from the end of the list.
-					// Otherwise, place it at the first free slot from the beginning of the list AND place $reverse ath the next free slot from the beginning of the list
-					if ($reverse == $count) {
-						$table[$lui] = $count;
-						--$lui;
-					} else {
-						$table[$lli] = $count;
-						++$lli;
-						$table[$lli] = $reverse;
-						++$lli;
-					}
-				}
-			}
-		}
-		return $table;
-	}
-	
-} // end of class
-
-//============================================================+
-// END OF FILE                                                 
-//============================================================+
-?>
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/cache/chapter_demo_1.txt b/html2pdf_v4.03/_tcpdf_5.0.002/cache/chapter_demo_1.txt
deleted file mode 100644
index 422eb436..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/cache/chapter_demo_1.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-The year 1866 was marked by a bizarre development, an unexplained and downright inexplicable phenomenon that surely no one has forgotten. Without getting into those rumors that upset civilians in the seaports and deranged the public mind even far inland, it must be said that professional seamen were especially alarmed. Traders, shipowners, captains of vessels, skippers, and master mariners from Europe and America, naval officers from every country, and at their heels the various national governments on these two continents, were all extremely disturbed by the business.
-In essence, over a period of time several ships had encountered "an enormous thing" at sea, a long spindle-shaped object, sometimes giving off a phosphorescent glow, infinitely bigger and faster than any whale.
-The relevant data on this apparition, as recorded in various logbooks, agreed pretty closely as to the structure of the object or creature in question, its unprecedented speed of movement, its startling locomotive power, and the unique vitality with which it seemed to be gifted.  If it was a cetacean, it exceeded in bulk any whale previously classified by science.  No naturalist, neither Cuvier nor Lacépède, neither Professor Dumeril nor Professor de Quatrefages, would have accepted the existence of such a monster sight unseen -- specifically, unseen by their own scientific eyes.
-Striking an average of observations taken at different times -- rejecting those timid estimates that gave the object a length of 200 feet, and ignoring those exaggerated views that saw it as a mile wide and three long--you could still assert that this phenomenal creature greatly exceeded the dimensions of anything then known to ichthyologists, if it existed at all.
-Now then, it did exist, this was an undeniable fact; and since the human mind dotes on objects of wonder, you can understand the worldwide excitement caused by this unearthly apparition. As for relegating it to the realm of fiction, that charge had to be dropped.
-In essence, on July 20, 1866, the steamer Governor Higginson, from the Calcutta & Burnach Steam Navigation Co., encountered this moving mass five miles off the eastern shores of Australia. Captain Baker at first thought he was in the presence of an unknown reef; he was even about to fix its exact position when two waterspouts shot out of this inexplicable object and sprang hissing into the air some 150 feet.  So, unless this reef was subject to the intermittent eruptions of a geyser, the Governor Higginson had fair and honest dealings with some aquatic mammal, until then unknown, that could spurt from its blowholes waterspouts mixed with air and steam.
-Similar events were likewise observed in Pacific seas, on July 23 of the same year, by the Christopher Columbus from the West India & Pacific Steam Navigation Co.  Consequently, this extraordinary cetacean could transfer itself from one locality to another with startling swiftness, since within an interval of just three days, the Governor Higginson and the Christopher Columbus had observed it at two positions on the charts separated by a distance of more than 700 nautical leagues.
-Fifteen days later and 2,000 leagues farther, the Helvetia from the Compagnie Nationale and the Shannon from the Royal Mail line, running on opposite tacks in that part of the Atlantic lying between the United States and Europe, respectively signaled each other that the monster had been sighted in latitude 42 degrees 15' north and longitude 60 degrees 35' west of the meridian of Greenwich.  From their simultaneous observations, they were able to estimate the mammal's minimum length at more than 350 English feet; this was because both the Shannon and the Helvetia were of smaller dimensions, although each measured 100 meters stem to stern. Now then, the biggest whales, those rorqual whales that frequent the waterways of the Aleutian Islands, have never exceeded a length of 56 meters--if they reach even that.
-One after another, reports arrived that would profoundly affect public opinion:  new observations taken by the transatlantic liner Pereire, the Inman line's Etna running afoul of the monster, an official report drawn up by officers on the French frigate Normandy, dead-earnest reckonings obtained by the general staff of Commodore Fitz-James aboard the Lord Clyde. In lighthearted countries, people joked about this phenomenon, but such serious, practical countries as England, America, and Germany were deeply concerned.
-In every big city the monster was the latest rage; they sang about it in the coffee houses, they ridiculed it in the newspapers, they dramatized it in the theaters.  The tabloids found it a fine opportunity for hatching all sorts of hoaxes. In those newspapers short of copy, you saw the reappearance of every gigantic imaginary creature, from "Moby Dick," that dreadful white whale from the High Arctic regions, to the stupendous kraken whose tentacles could entwine a 500-ton craft and drag it into the ocean depths. They even reprinted reports from ancient times: the views of Aristotle and Pliny accepting the existence of such monsters, then the Norwegian stories of Bishop Pontoppidan, the narratives of Paul Egede, and finally the reports of Captain Harrington -- whose good faith is above suspicion--in which he claims he saw, while aboard the Castilian in 1857, one of those enormous serpents that, until then, had frequented only the seas of France's old extremist newspaper, The Constitutionalist.
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/cache/chapter_demo_2.txt b/html2pdf_v4.03/_tcpdf_5.0.002/cache/chapter_demo_2.txt
deleted file mode 100644
index 6f7165c7..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/cache/chapter_demo_2.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-During the period in which these developments were occurring, I had returned from a scientific undertaking organized to explore the Nebraska badlands in the United States. In my capacity as Assistant Professor at the Paris Museum of Natural History, I had been attached to this expedition by the French government. After spending six months in Nebraska, I arrived in New York laden with valuable collections near the end of March. My departure for France was set for early May. In the meantime, then, I was busy classifying my mineralogical, botanical, and zoological treasures when that incident took place with the Scotia.
-I was perfectly abreast of this question, which was the big news of the day, and how could I not have been? I had read and reread every American and European newspaper without being any farther along. This mystery puzzled me. Finding it impossible to form any views, I drifted from one extreme to the other. Something was out there, that much was certain, and any doubting Thomas was invited to place his finger on the Scotia's wound.
-When I arrived in New York, the question was at the boiling point. The hypothesis of a drifting islet or an elusive reef, put forward by people not quite in their right minds, was completely eliminated. And indeed, unless this reef had an engine in its belly, how could it move about with such prodigious speed?
-Also discredited was the idea of a floating hull or some other enormous wreckage, and again because of this speed of movement.
-So only two possible solutions to the question were left, creating two very distinct groups of supporters: on one side, those favoring a monster of colossal strength; on the other, those favoring an "underwater boat" of tremendous motor power.
-Now then, although the latter hypothesis was completely admissible, it couldn't stand up to inquiries conducted in both the New World and the Old. That a private individual had such a mechanism at his disposal was less than probable. Where and when had he built it, and how could he have built it in secret?
-Only some government could own such an engine of destruction, and in these disaster-filled times, when men tax their ingenuity to build increasingly powerful aggressive weapons, it was possible that, unknown to the rest of the world, some nation could have been testing such a fearsome machine. The Chassepot rifle led to the torpedo, and the torpedo has led to this underwater battering ram, which in turn will lead to the world putting its foot down. At least I hope it will.
-But this hypothesis of a war machine collapsed in the face of formal denials from the various governments. Since the public interest was at stake and transoceanic travel was suffering, the sincerity of these governments could not be doubted. Besides, how could the assembly of this underwater boat have escaped public notice? Keeping a secret under such circumstances would be difficult enough for an individual, and certainly impossible for a nation whose every move is under constant surveillance by rival powers.
-So, after inquiries conducted in England, France, Russia, Prussia, Spain, Italy, America, and even Turkey, the hypothesis of an underwater Monitor was ultimately rejected.
-After I arrived in New York, several people did me the honor of consulting me on the phenomenon in question. In France I had published a two-volume work, in quarto, entitled The Mysteries of the Great Ocean Depths. Well received in scholarly circles, this book had established me as a specialist in this pretty obscure field of natural history. My views were in demand. As long as I could deny the reality of the business, I confined myself to a flat "no comment." But soon, pinned to the wall, I had to explain myself straight out. And in this vein, "the honorable Pierre Aronnax, Professor at the Paris Museum," was summoned by The New York Herald to formulate his views no matter what.
-I complied. Since I could no longer hold my tongue, I let it wag. I discussed the question in its every aspect, both political and scientific, and this is an excerpt from the well-padded article I published in the issue of April 30.
-
-"Therefore," I wrote, "after examining these different hypotheses one by one, we are forced, every other supposition having been refuted, to accept the existence of an extremely powerful marine animal.
-"The deepest parts of the ocean are totally unknown to us. No soundings have been able to reach them. What goes on in those distant depths? What creatures inhabit, or could inhabit, those regions twelve or fifteen miles beneath the surface of the water? What is the constitution of these animals? It's almost beyond conjecture.
-"However, the solution to this problem submitted to me can take the form of a choice between two alternatives.
-"Either we know every variety of creature populating our planet, or we do not.
-"If we do not know every one of them, if nature still keeps ichthyological secrets from us, nothing is more admissible than to accept the existence of fish or cetaceans of new species or even new genera, animals with a basically 'cast-iron' constitution that inhabit strata beyond the reach of our soundings, and which some development or other, an urge or a whim if you prefer, can bring to the upper level of the ocean for long intervals.
-"If, on the other hand, we do know every living species, we must look for the animal in question among those marine creatures already cataloged, and in this event I would be inclined to accept the existence of a giant narwhale.
-"The common narwhale, or sea unicorn, often reaches a length of sixty feet. Increase its dimensions fivefold or even tenfold, then give this cetacean a strength in proportion to its size while enlarging its offensive weapons, and you have the animal we're looking for. It would have the proportions determined by the officers of the Shannon, the instrument needed to perforate the Scotia, and the power to pierce a steamer's hull.
-"In essence, the narwhale is armed with a sort of ivory sword, or lance, as certain naturalists have expressed it. It's a king-sized tooth as hard as steel. Some of these teeth have been found buried in the bodies of baleen whales, which the narwhale attacks with invariable success. Others have been wrenched, not without difficulty, from the undersides of vessels that narwhales have pierced clean through, as a gimlet pierces a wine barrel. The museum at the Faculty of Medicine in Paris owns one of these tusks with a length of 2.25 meters and a width at its base of forty-eight centimeters!
-"All right then! Imagine this weapon to be ten times stronger and the animal ten times more powerful, launch it at a speed of twenty miles per hour, multiply its mass times its velocity, and you get just the collision we need to cause the specified catastrophe.
-"So, until information becomes more abundant, I plump for a sea unicorn of colossal dimensions, no longer armed with a mere lance but with an actual spur, like ironclad frigates or those warships called 'rams,' whose mass and motor power it would possess simultaneously.
-"This inexplicable phenomenon is thus explained away unless it's something else entirely, which, despite everything that has been sighted, studied, explored and experienced, is still possible!"
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/cache/table_data_demo.txt b/html2pdf_v4.03/_tcpdf_5.0.002/cache/table_data_demo.txt
deleted file mode 100644
index 5a48a42e..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/cache/table_data_demo.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-Austria;Vienna;83859;8075
-Belgium;Brussels;30518;10192
-Denmark;Copenhagen;43094;5295
-Finland;Helsinki;304529;5147
-France;Paris;543965;58728
-Germany;Berlin;357022;82057
-Greece;Athens;131625;10511
-Ireland;Dublin;70723;3694
-Italy;Roma;301316;57563
-Luxembourg;Luxembourg;2586;424
-Netherlands;Amsterdam;41526;15654
-Portugal;Lisbon;91906;9957
-Spain;Madrid;504790;39348
-Sweden;Stockholm;410934;8839
-United Kingdom;London;243820;58862
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/cache/utf8test.txt b/html2pdf_v4.03/_tcpdf_5.0.002/cache/utf8test.txt
deleted file mode 100644
index e5cd0924..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/cache/utf8test.txt
+++ /dev/null
@@ -1,120 +0,0 @@
-Sentences that contain all letters commonly used in a language
---------------------------------------------------------------
-
-Markus Kuhn <http://www.cl.cam.ac.uk/~mgk25/> -- 2001-09-02
-
-This file is UTF-8 encoded.
-
-
-Danish (da)
----------
-
-  Quizdeltagerne spiste jordbær med fløde, mens cirkusklovnen
-  Wolther spillede på xylofon.
-  (= Quiz contestants were eating strawbery with cream while Wolther
-  the circus clown played on xylophone.)
-
-German (de)
------------
-
-  Falsches Üben von Xylophonmusik quält jeden größeren Zwerg
-  (= Wrongful practicing of xylophone music tortures every larger dwarf)
-
-  Zwölf Boxkämpfer jagten Eva quer über den Sylter Deich
-  (= Twelve boxing fighters hunted Eva across the dike of Sylt)
-
-  Heizölrückstoßabdämpfung
-  (= fuel oil recoil absorber)
-  (jqvwxy missing, but all non-ASCII letters in one word)
-
-English (en)
-------------
-
-  The quick brown fox jumps over the lazy dog
-
-Spanish (es)
-------------
-
-  El pingüino Wenceslao hizo kilómetros bajo exhaustiva lluvia y 
-  frío, añoraba a su querido cachorro.
-  (Contains every letter and every accent, but not every combination
-  of vowel + acute.)
-
-French (fr)
------------
-
-  Portez ce vieux whisky au juge blond qui fume sur son île intérieure, à
-  côté de l'alcôve ovoïde, où les bûches se consument dans l'âtre, ce
-  qui lui permet de penser à la cænogenèse de l'être dont il est question
-  dans la cause ambiguë entendue à Moÿ, dans un capharnaüm qui,
-  pense-t-il, diminue çà et là la qualité de son œuvre. 
-
-  l'île exiguë
-  Où l'obèse jury mûr
-  Fête l'haï volapük,
-  Âne ex aéquo au whist,
-  Ôtez ce vœu déçu.
-
-  Le cœur déçu mais l'âme plutôt naïve, Louÿs rêva de crapaüter en
-  canoë au delà des îles, près du mälström où brûlent les novæ.
-
-Irish Gaelic (ga)
------------------
-
-  D'fhuascail Íosa, Úrmhac na hÓighe Beannaithe, pór Éava agus Ádhaimh
-
-Hungarian (hu)
---------------
-
-  Árvíztűrő tükörfúrógép
-  (= flood-proof mirror-drilling machine, only all non-ASCII letters)
-
-Icelandic (is)
---------------
-
-  Kæmi ný öxi hér ykist þjófum nú bæði víl og ádrepa
-
-  Sævör grét áðan því úlpan var ónýt
-  (some ASCII letters missing)
-
-Greek (el)
--------------
-
-  Γαζέες καὶ μυρτιὲς δὲν θὰ βρῶ πιὰ στὸ χρυσαφὶ ξέφωτο
-  (= No more shall I see acacias or myrtles in the golden clearing)
-
-  Ξεσκεπάζω τὴν ψυχοφθόρα βδελυγμία
-  (= I uncover the soul-destroying abhorrence)
-
-Hebrew (iw)
------------
-
-  ? דג סקרן שט בים מאוכזב ולפתע מצא לו חברה איך הקליטה
-
-Polish (pl)
------------
-
-  Pchnąć w tę łódź jeża lub ośm skrzyń fig
-  (= To push a hedgehog or eight bins of figs in this boat)
-
-Russian (ru)
-------------
-
-  В чащах юга жил бы цитрус? Да, но фальшивый экземпляр!
-  (= Would a citrus live in the bushes of south? Yes, but only a fake one!)
-
-Thai (th)
----------
-
-  [--------------------------|------------------------]
-  ๏ เป็นมนุษย์สุดประเสริฐเลิศคุณค่า  กว่าบรรดาฝูงสัตว์เดรัจฉาน
-  จงฝ่าฟันพัฒนาวิชาการ           อย่าล้างผลาญฤๅเข่นฆ่าบีฑาใคร
-  ไม่ถือโทษโกรธแช่งซัดฮึดฮัดด่า     หัดอภัยเหมือนกีฬาอัชฌาสัย
-  ปฏิบัติประพฤติกฎกำหนดใจ        พูดจาให้จ๊ะๆ จ๋าๆ น่าฟังเอย ฯ
-
-  [The copyright for the Thai example is owned by The Computer
-  Association of Thailand under the Royal Patronage of His Majesty the
-  King.]
-
-Please let me know if you find others! Special thanks to the people
-from all over the world who contributed these sentences.
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/config/lang/bra.php b/html2pdf_v4.03/_tcpdf_5.0.002/config/lang/bra.php
deleted file mode 100644
index 81c17d76..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/config/lang/bra.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-//============================================================+
-// File name   : eng.php
-// Begin       : 2004-03-03
-// Last Update : 2010-02-17
-// 
-// Description : Language module for TCPDF
-//               (contains translated texts)
-// 
-// Author: Nicola Asuni
-// 
-// (c) Copyright:
-//               Nicola Asuni
-//               Tecnick.com s.r.l.
-//               Via Della Pace, 11
-//               09044 Quartucciu (CA)
-//               ITALY
-//               www.tecnick.com
-//               info@tecnick.com
-//============================================================+
-
-/**
- * TCPDF language file (contains translated texts).
- * @package com.tecnick.tcpdf
- * @abstract TCPDF language file.
- * @author Nicola Asuni
- * @copyright 2004-2009 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
- * @link http://tcpdf.sourceforge.net
- * @license http://www.gnu.org/copyleft/lesser.html LGPL
- * @since 2004-03-03
- */
- 
-// ENGLISH
-
-global $l;
-$l = Array();
-
-// PAGE META DESCRIPTORS --------------------------------------
-
-$l['a_meta_charset'] = 'UTF-8';
-$l['a_meta_dir'] = 'ltr';
-$l['a_meta_language'] = 'pt';
-
-// TRANSLATIONS --------------------------------------
-$l['w_page'] = 'página';
-
-//============================================================+
-// END OF FILE                                                 
-//============================================================+
-?>
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/config/lang/eng.php b/html2pdf_v4.03/_tcpdf_5.0.002/config/lang/eng.php
deleted file mode 100644
index 64691051..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/config/lang/eng.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-//============================================================+
-// File name   : eng.php
-// Begin       : 2004-03-03
-// Last Update : 2010-02-17
-// 
-// Description : Language module for TCPDF
-//               (contains translated texts)
-// 
-// Author: Nicola Asuni
-// 
-// (c) Copyright:
-//               Nicola Asuni
-//               Tecnick.com s.r.l.
-//               Via Della Pace, 11
-//               09044 Quartucciu (CA)
-//               ITALY
-//               www.tecnick.com
-//               info@tecnick.com
-//============================================================+
-
-/**
- * TCPDF language file (contains translated texts).
- * @package com.tecnick.tcpdf
- * @abstract TCPDF language file.
- * @author Nicola Asuni
- * @copyright 2004-2009 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
- * @link http://tcpdf.sourceforge.net
- * @license http://www.gnu.org/copyleft/lesser.html LGPL
- * @since 2004-03-03
- */
- 
-// ENGLISH
-
-global $l;
-$l = Array();
-
-// PAGE META DESCRIPTORS --------------------------------------
-
-$l['a_meta_charset'] = 'UTF-8';
-$l['a_meta_dir'] = 'ltr';
-$l['a_meta_language'] = 'en';
-
-// TRANSLATIONS --------------------------------------
-$l['w_page'] = 'page';
-
-//============================================================+
-// END OF FILE                                                 
-//============================================================+
-?>
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/config/lang/ger.php b/html2pdf_v4.03/_tcpdf_5.0.002/config/lang/ger.php
deleted file mode 100644
index 2a703527..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/config/lang/ger.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-//============================================================+
-// File name   : eng.php
-// Begin       : 2004-03-03
-// Last Update : 2010-02-17
-// 
-// Description : Language module for TCPDF
-//               (contains translated texts)
-// 
-// Author: Nicola Asuni
-// 
-// (c) Copyright:
-//               Nicola Asuni
-//               Tecnick.com s.r.l.
-//               Via Della Pace, 11
-//               09044 Quartucciu (CA)
-//               ITALY
-//               www.tecnick.com
-//               info@tecnick.com
-//============================================================+
-
-/**
- * TCPDF language file (contains translated texts).
- * @package com.tecnick.tcpdf
- * @abstract TCPDF language file.
- * @author Nicola Asuni
- * @copyright 2004-2009 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
- * @link http://tcpdf.sourceforge.net
- * @license http://www.gnu.org/copyleft/lesser.html LGPL
- * @since 2004-03-03
- */
- 
-// ENGLISH
-
-global $l;
-$l = Array();
-
-// PAGE META DESCRIPTORS --------------------------------------
-
-$l['a_meta_charset'] = 'UTF-8';
-$l['a_meta_dir'] = 'ltr';
-$l['a_meta_language'] = 'de';
-
-// TRANSLATIONS --------------------------------------
-$l['w_page'] = 'seite';
-
-//============================================================+
-// END OF FILE                                                 
-//============================================================+
-?>
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/config/lang/ita.php b/html2pdf_v4.03/_tcpdf_5.0.002/config/lang/ita.php
deleted file mode 100644
index 25f95487..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/config/lang/ita.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-//============================================================+
-// File name   : ita.php
-// Begin       : 2004-03-03
-// Last Update : 2010-02-17
-// 
-// Description : Language module for TCPDF
-//               (contains translated texts)
-// 
-// Author: Nicola Asuni
-// 
-// (c) Copyright:
-//               Nicola Asuni
-//               Tecnick.com s.r.l.
-//               Via Della Pace, 11
-//               09044 Quartucciu (CA)
-//               ITALY
-//               www.tecnick.com
-//               info@tecnick.com
-//============================================================+
-
-/**
- * TCPDF language file (contains translated texts).
- * @package com.tecnick.tcpdf
- * @abstract TCPDF language file.
- * @author Nicola Asuni
- * @copyright 2004-2009 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
- * @link http://tcpdf.sourceforge.net
- * @license http://www.gnu.org/copyleft/lesser.html LGPL
- * @since 2004-03-03
- */
- 
-// ENGLISH
-
-global $l;
-$l = Array();
-
-// PAGE META DESCRIPTORS --------------------------------------
-
-$l['a_meta_charset'] = 'UTF-8';
-$l['a_meta_dir'] = 'ltr';
-$l['a_meta_language'] = 'it';
-
-// TRANSLATIONS --------------------------------------
-$l['w_page'] = 'pagina';
-
-//============================================================+
-// END OF FILE                                                 
-//============================================================+
-?>
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/config/tcpdf_config.php b/html2pdf_v4.03/_tcpdf_5.0.002/config/tcpdf_config.php
deleted file mode 100644
index d824f5b5..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/config/tcpdf_config.php
+++ /dev/null
@@ -1,244 +0,0 @@
-<?php
-//============================================================+
-// File name   : tcpdf_config.php
-// Begin       : 2004-06-11
-// Last Update : 2010-04-28
-//
-// Description : Configuration file for TCPDF.
-//
-// Author: Nicola Asuni
-//
-// (c) Copyright:
-//               Nicola Asuni
-//               Tecnick.com s.r.l.
-//               Via Della Pace, 11
-//               09044 Quartucciu (CA)
-//               ITALY
-//               www.tecnick.com
-//               info@tecnick.com
-//============================================================+
-
-/**
- * Configuration file for TCPDF.
- * @author Nicola Asuni
- * @copyright 2004-2010 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
- * @package com.tecnick.tcpdf
- * @version 4.9.005
- * @link http://tcpdf.sourceforge.net
- * @license http://www.gnu.org/copyleft/lesser.html LGPL
- * @since 2004-10-27
- */
-
-// If you define the constant K_TCPDF_EXTERNAL_CONFIG, the following settings will be ignored.
-
-if (!defined('K_TCPDF_EXTERNAL_CONFIG')) {
-
-	// DOCUMENT_ROOT fix for IIS Webserver
-	if ((!isset($_SERVER['DOCUMENT_ROOT'])) OR (empty($_SERVER['DOCUMENT_ROOT']))) {
-		if(isset($_SERVER['SCRIPT_FILENAME'])) {
-			$_SERVER['DOCUMENT_ROOT'] = str_replace( '\\', '/', substr($_SERVER['SCRIPT_FILENAME'], 0, 0-strlen($_SERVER['PHP_SELF'])));
-		} elseif(isset($_SERVER['PATH_TRANSLATED'])) {
-			$_SERVER['DOCUMENT_ROOT'] = str_replace( '\\', '/', substr(str_replace('\\\\', '\\', $_SERVER['PATH_TRANSLATED']), 0, 0-strlen($_SERVER['PHP_SELF'])));
-		}	else {
-			// define here your DOCUMENT_ROOT path if the previous fails
-			$_SERVER['DOCUMENT_ROOT'] = '/var/www';
-		}
-	}
-
-	// Automatic calculation for the following K_PATH_MAIN constant
-	$k_path_main = str_replace( '\\', '/', realpath(substr(dirname(__FILE__), 0, 0-strlen('config'))));
-	if (substr($k_path_main, -1) != '/') {
-		$k_path_main .= '/';
-	}
-
-	/**
-	 * Installation path (/var/www/tcpdf/).
-	 * By default it is automatically calculated but you can also set it as a fixed string to improve performances.
-	 */
-	define ('K_PATH_MAIN', $k_path_main);
-
-	// Automatic calculation for the following K_PATH_URL constant
-	$k_path_url = $k_path_main; // default value for console mode
-	if (isset($_SERVER['HTTP_HOST']) AND (!empty($_SERVER['HTTP_HOST']))) {
-		if(isset($_SERVER['HTTPS']) AND (!empty($_SERVER['HTTPS'])) AND strtolower($_SERVER['HTTPS'])!='off') {
-			$k_path_url = 'https://';
-		} else {
-			$k_path_url = 'http://';
-		}
-		$k_path_url .= $_SERVER['HTTP_HOST'];
-		$k_path_url .= str_replace( '\\', '/', substr($_SERVER['PHP_SELF'], 0, -24));
-	}
-
-	/**
-	 * URL path to tcpdf installation folder (http://localhost/tcpdf/).
-	 * By default it is automatically calculated but you can also set it as a fixed string to improve performances.
-	 */
-	define ('K_PATH_URL', $k_path_url);
-
-	/**
-	 * path for PDF fonts
-	 * use K_PATH_MAIN.'fonts/old/' for old non-UTF8 fonts
-	 */
-	define ('K_PATH_FONTS', K_PATH_MAIN.'fonts/');
-
-	/**
-	 * cache directory for temporary files (full path)
-	 */
-	define ('K_PATH_CACHE', K_PATH_MAIN.'cache/');
-
-	/**
-	 * cache directory for temporary files (url path)
-	 */
-	define ('K_PATH_URL_CACHE', K_PATH_URL.'cache/');
-
-	/**
-	 *images directory
-	 */
-	define ('K_PATH_IMAGES', K_PATH_MAIN.'images/');
-
-	/**
-	 * blank image
-	 */
-	define ('K_BLANK_IMAGE', K_PATH_IMAGES.'_blank.png');
-
-	/**
-	 * page format
-	 */
-	define ('PDF_PAGE_FORMAT', 'A4');
-
-	/**
-	 * page orientation (P=portrait, L=landscape)
-	 */
-	define ('PDF_PAGE_ORIENTATION', 'P');
-
-	/**
-	 * document creator
-	 */
-	define ('PDF_CREATOR', 'TCPDF');
-
-	/**
-	 * document author
-	 */
-	define ('PDF_AUTHOR', 'TCPDF');
-
-	/**
-	 * header title
-	 */
-	define ('PDF_HEADER_TITLE', 'TCPDF Example');
-
-	/**
-	 * header description string
-	 */
-	define ('PDF_HEADER_STRING', "by Nicola Asuni - Tecnick.com\nwww.tcpdf.org");
-
-	/**
-	 * image logo
-	 */
-	define ('PDF_HEADER_LOGO', 'tcpdf_logo.jpg');
-
-	/**
-	 * header logo image width [mm]
-	 */
-	define ('PDF_HEADER_LOGO_WIDTH', 30);
-
-	/**
-	 *  document unit of measure [pt=point, mm=millimeter, cm=centimeter, in=inch]
-	 */
-	define ('PDF_UNIT', 'mm');
-
-	/**
-	 * header margin
-	 */
-	define ('PDF_MARGIN_HEADER', 5);
-
-	/**
-	 * footer margin
-	 */
-	define ('PDF_MARGIN_FOOTER', 10);
-
-	/**
-	 * top margin
-	 */
-	define ('PDF_MARGIN_TOP', 27);
-
-	/**
-	 * bottom margin
-	 */
-	define ('PDF_MARGIN_BOTTOM', 25);
-
-	/**
-	 * left margin
-	 */
-	define ('PDF_MARGIN_LEFT', 15);
-
-	/**
-	 * right margin
-	 */
-	define ('PDF_MARGIN_RIGHT', 15);
-
-	/**
-	 * default main font name
-	 */
-	define ('PDF_FONT_NAME_MAIN', 'helvetica');
-
-	/**
-	 * default main font size
-	 */
-	define ('PDF_FONT_SIZE_MAIN', 10);
-
-	/**
-	 * default data font name
-	 */
-	define ('PDF_FONT_NAME_DATA', 'helvetica');
-
-	/**
-	 * default data font size
-	 */
-	define ('PDF_FONT_SIZE_DATA', 8);
-
-	/**
-	 * default monospaced font name
-	 */
-	define ('PDF_FONT_MONOSPACED', 'courier');
-
-	/**
-	 * ratio used to adjust the conversion of pixels to user units
-	 */
-	define ('PDF_IMAGE_SCALE_RATIO', 1.25);
-
-	/**
-	 * magnification factor for titles
-	 */
-	define('HEAD_MAGNIFICATION', 1.1);
-
-	/**
-	 * height of cell repect font height
-	 */
-	define('K_CELL_HEIGHT_RATIO', 1.25);
-
-	/**
-	 * title magnification respect main font size
-	 */
-	define('K_TITLE_MAGNIFICATION', 1.3);
-
-	/**
-	 * reduction factor for small font
-	 */
-	define('K_SMALL_RATIO', 2/3);
-
-	/**
-	 * set to true to enable the special procedure used to avoid the overlappind of symbols on Thai language
-	 */
-	define('K_THAI_TOPCHARS', true);
-
-	/**
-	 * if true allows to call TCPDF methods using HTML syntax
-	 * IMPORTANT: For security reason, disable this feature if you are printing user HTML content.
-	 */
-	define('K_TCPDF_CALLS_IN_HTML', true);
-}
-
-//============================================================+
-// END OF FILE
-//============================================================+
-?>
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/config/tcpdf_config_alt.php b/html2pdf_v4.03/_tcpdf_5.0.002/config/tcpdf_config_alt.php
deleted file mode 100644
index 471c2ccb..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/config/tcpdf_config_alt.php
+++ /dev/null
@@ -1,238 +0,0 @@
-<?php
-//============================================================+
-// File name   : tcpdf_config.php
-// Begin       : 2004-06-11
-// Last Update : 2010-04-28
-//
-// Description : Alternative configuration file for TCPDF.
-//
-// Author: Nicola Asuni
-//
-// (c) Copyright:
-//               Nicola Asuni
-//               Tecnick.com s.r.l.
-//               Via Della Pace, 11
-//               09044 Quartucciu (CA)
-//               ITALY
-//               www.tecnick.com
-//               info@tecnick.com
-//============================================================+
-
-/**
- * Alternative configuration file for TCPDF.
- * @author Nicola Asuni
- * @copyright 2004-2010 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
- * @package com.tecnick.tcpdf
- * @version 4.9.005
- * @link http://tcpdf.sourceforge.net
- * @license http://www.gnu.org/copyleft/lesser.html LGPL
- * @since 2004-10-27
- */
-
-// DOCUMENT_ROOT fix for IIS Webserver
-if ((!isset($_SERVER['DOCUMENT_ROOT'])) OR (empty($_SERVER['DOCUMENT_ROOT']))) {
-	if(isset($_SERVER['SCRIPT_FILENAME'])) {
-		$_SERVER['DOCUMENT_ROOT'] = str_replace( '\\', '/', substr($_SERVER['SCRIPT_FILENAME'], 0, 0-strlen($_SERVER['PHP_SELF'])));
-	} elseif(isset($_SERVER['PATH_TRANSLATED'])) {
-		$_SERVER['DOCUMENT_ROOT'] = str_replace( '\\', '/', substr(str_replace('\\\\', '\\', $_SERVER['PATH_TRANSLATED']), 0, 0-strlen($_SERVER['PHP_SELF'])));
-	}	else {
-		// define here your DOCUMENT_ROOT path if the previous fails
-		$_SERVER['DOCUMENT_ROOT'] = '/var/www';
-	}
-}
-
-// Automatic calculation for the following K_PATH_MAIN constant
-$k_path_main = str_replace( '\\', '/', realpath(substr(dirname(__FILE__), 0, 0-strlen('config'))));
-if (substr($k_path_main, -1) != '/') {
-	$k_path_main .= '/';
-}
-
-/**
- * Installation path (/var/www/tcpdf/).
- * By default it is automatically calculated but you can also set it as a fixed string to improve performances.
- */
-define ('K_PATH_MAIN', $k_path_main);
-
-// Automatic calculation for the following K_PATH_URL constant
-if (isset($_SERVER['HTTP_HOST']) AND (!empty($_SERVER['HTTP_HOST']))) {
-	if(isset($_SERVER['HTTPS']) AND (!empty($_SERVER['HTTPS'])) AND strtolower($_SERVER['HTTPS'])!='off') {
-		$k_path_url = 'https://';
-	} else {
-		$k_path_url = 'http://';
-	}
-	$k_path_url .= $_SERVER['HTTP_HOST'];
-	$k_path_url .= str_replace( '\\', '/', substr($_SERVER['PHP_SELF'], 0, -24));
-}
-
-/**
- * URL path to tcpdf installation folder (http://localhost/tcpdf/).
- * By default it is automatically calculated but you can also set it as a fixed string to improve performances..
- */
-define ('K_PATH_URL', $k_path_url);
-
-/**
- * path for PDF fonts
- * use K_PATH_MAIN.'fonts/old/' for old non-UTF8 fonts
- */
-define ('K_PATH_FONTS', K_PATH_MAIN.'fonts/');
-
-/**
- * cache directory for temporary files (full path)
- */
-define ('K_PATH_CACHE', K_PATH_MAIN.'cache/');
-
-/**
- * cache directory for temporary files (url path)
- */
-define ('K_PATH_URL_CACHE', K_PATH_URL.'cache/');
-
-/**
- *images directory
- */
-define ('K_PATH_IMAGES', K_PATH_MAIN.'images/');
-
-/**
- * blank image
- */
-define ('K_BLANK_IMAGE', K_PATH_IMAGES.'_blank.png');
-
-/**
- * page format
- */
-define ('PDF_PAGE_FORMAT', 'A4');
-
-/**
- * page orientation (P=portrait, L=landscape)
- */
-define ('PDF_PAGE_ORIENTATION', 'P');
-
-/**
- * document creator
- */
-define ('PDF_CREATOR', 'TCPDF');
-
-/**
- * document author
- */
-define ('PDF_AUTHOR', 'TCPDF');
-
-/**
- * header title
- */
-define ('PDF_HEADER_TITLE', 'TCPDF Example');
-
-/**
- * header description string
- */
-define ('PDF_HEADER_STRING', "by Nicola Asuni - Tecnick.com\nwww.tcpdf.org");
-
-/**
- * image logo
- */
-define ('PDF_HEADER_LOGO', 'tcpdf_logo.jpg');
-
-/**
- * header logo image width [mm]
- */
-define ('PDF_HEADER_LOGO_WIDTH', 30);
-
-/**
- *  document unit of measure [pt=point, mm=millimeter, cm=centimeter, in=inch]
- */
-define ('PDF_UNIT', 'mm');
-
-/**
- * header margin
- */
-define ('PDF_MARGIN_HEADER', 5);
-
-/**
- * footer margin
- */
-define ('PDF_MARGIN_FOOTER', 10);
-
-/**
- * top margin
- */
-define ('PDF_MARGIN_TOP', 27);
-
-/**
- * bottom margin
- */
-define ('PDF_MARGIN_BOTTOM', 25);
-
-/**
- * left margin
- */
-define ('PDF_MARGIN_LEFT', 15);
-
-/**
- * right margin
- */
-define ('PDF_MARGIN_RIGHT', 15);
-
-/**
- * default main font name
- */
-define ('PDF_FONT_NAME_MAIN', 'helvetica');
-
-/**
- * default main font size
- */
-define ('PDF_FONT_SIZE_MAIN', 10);
-
-/**
- * default data font name
- */
-define ('PDF_FONT_NAME_DATA', 'helvetica');
-
-/**
- * default data font size
- */
-define ('PDF_FONT_SIZE_DATA', 8);
-
-/**
- * default monospaced font name
- */
-define ('PDF_FONT_MONOSPACED', 'courier');
-
-/**
- * ratio used to adjust the conversion of pixels to user units
- */
-define ('PDF_IMAGE_SCALE_RATIO', 1.25);
-
-/**
- * magnification factor for titles
- */
-define('HEAD_MAGNIFICATION', 1.1);
-
-/**
- * height of cell repect font height
- */
-define('K_CELL_HEIGHT_RATIO', 1.25);
-
-/**
- * title magnification respect main font size
- */
-define('K_TITLE_MAGNIFICATION', 1.3);
-
-/**
- * reduction factor for small font
- */
-define('K_SMALL_RATIO', 2/3);
-
-/**
- * set to true to enable the special procedure used to avoid the overlappind of symbols on Thai language
- */
-define('K_THAI_TOPCHARS', true);
-
-/**
- * if true allows to call TCPDF methods using HTML syntax
- * IMPORTANT: For security reason, disable this feature if you are printing user HTML content.
- */
-define('K_TCPDF_CALLS_IN_HTML', true);
-
-//============================================================+
-// END OF FILE
-//============================================================+
-?>
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/doc/read_me.txt b/html2pdf_v4.03/_tcpdf_5.0.002/doc/read_me.txt
deleted file mode 100644
index e9fa63ca..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/doc/read_me.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-You can read the documentation at : http://www.tecnick.com/pagefiles/tcpdf/doc/index.html
-
-it has been removed because of the size of the package of HTML2PDF... 
\ No newline at end of file
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/examples/read_me.txt b/html2pdf_v4.03/_tcpdf_5.0.002/examples/read_me.txt
deleted file mode 100644
index 2a1a2005..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/examples/read_me.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-You can read the documentation at : http://www.tecnick.com/public/code/cp_dpage.php?aiocp_dp=tcpdf_examples
-
-it has been removed because of the size of the package of HTML2PDF... 
\ No newline at end of file
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/README.TXT b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/README.TXT
deleted file mode 100644
index c27086f2..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/README.TXT
+++ /dev/null
@@ -1,3 +0,0 @@
-This folder contains fonts descriptions for TCPDF.
-All fonts names must be in lowercase.
-Please read the documentation on subfolders for copyright, license and other information.
\ No newline at end of file
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/ZarBold.ctg.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/ZarBold.ctg.z
deleted file mode 100644
index e096e5cc..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/ZarBold.ctg.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/ZarBold.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/ZarBold.z
deleted file mode 100644
index 41df8dab..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/ZarBold.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/almohanad.ctg.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/almohanad.ctg.z
deleted file mode 100644
index 8e9b577e..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/almohanad.ctg.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/almohanad.php b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/almohanad.php
deleted file mode 100644
index cec1fb32..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/almohanad.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='AlMohanad';
-$desc=array('Ascent'=>1093,'Descent'=>-509,'CapHeight'=>1093,'Flags'=>32,'FontBBox'=>'[-278 -507 1124 1093]','ItalicAngle'=>0,'StemV'=>70,'MissingWidth'=>600);
-$up=-136;
-$ut=64;
-$dw=600;
-$cw=array(
-	0=>0,32=>139,33=>185,34=>308,35=>278,36=>278,37=>556,38=>463,39=>154,40=>185,41=>185,42=>278,43=>317,44=>139,45=>185,46=>139,
-	47=>154,48=>278,49=>278,50=>278,51=>278,52=>278,53=>278,54=>278,55=>278,56=>278,57=>278,58=>185,59=>185,60=>317,61=>317,62=>317,
-	63=>278,64=>517,65=>401,66=>371,67=>401,68=>402,69=>371,70=>339,71=>432,72=>430,73=>214,74=>278,75=>424,76=>369,77=>524,78=>401,
-	79=>432,80=>339,81=>432,82=>396,83=>309,84=>371,85=>401,86=>401,87=>556,88=>401,89=>401,90=>371,91=>185,92=>154,93=>185,94=>323,
-	95=>278,96=>185,97=>278,98=>309,99=>247,100=>309,101=>247,102=>185,103=>278,104=>309,105=>154,106=>185,107=>309,108=>154,109=>463,110=>309,
-	111=>278,112=>309,113=>309,114=>247,115=>216,116=>185,117=>309,118=>278,119=>401,120=>278,121=>278,122=>247,123=>219,124=>122,125=>219,126=>289,
-	8364=>278,1027=>339,8218=>185,1107=>254,8222=>278,8230=>556,8224=>278,8225=>278,710=>185,8240=>556,352=>309,8249=>185,338=>556,1036=>432,381=>371,1039=>432,
-	8216=>185,8217=>185,8220=>278,8221=>278,8226=>194,8211=>278,8212=>556,732=>185,8482=>556,353=>216,8250=>185,339=>401,1116=>297,382=>247,376=>401,161=>185,
-	162=>278,163=>278,164=>278,165=>278,166=>122,167=>278,168=>185,169=>415,170=>167,171=>278,172=>317,174=>415,175=>185,176=>222,177=>317,178=>167,
-	179=>167,180=>185,181=>309,182=>300,183=>139,184=>185,185=>167,186=>183,187=>278,188=>417,189=>417,190=>417,191=>278,192=>401,193=>401,194=>401,
-	195=>401,196=>401,197=>401,198=>556,199=>401,200=>371,201=>371,202=>371,203=>371,204=>216,205=>216,206=>216,207=>216,208=>401,209=>401,210=>432,
-	211=>432,212=>432,213=>432,214=>432,215=>317,216=>432,217=>401,218=>401,219=>401,220=>401,221=>401,222=>339,223=>309,224=>278,225=>278,226=>278,
-	227=>278,228=>278,229=>278,230=>401,231=>247,232=>247,233=>247,234=>247,235=>247,236=>154,237=>154,238=>154,239=>154,240=>278,241=>309,242=>278,
-	243=>278,244=>278,245=>278,246=>278,247=>317,248=>278,249=>309,250=>309,251=>309,252=>309,253=>278,254=>309,255=>278,256=>401,257=>278,258=>401,
-	259=>278,260=>401,261=>278,262=>401,263=>247,264=>401,265=>247,266=>401,267=>247,268=>401,269=>247,270=>401,271=>309,272=>401,273=>309,274=>371,
-	275=>247,276=>371,277=>247,278=>371,279=>247,280=>371,281=>247,282=>371,283=>247,284=>432,285=>278,286=>432,287=>278,288=>432,289=>278,290=>432,
-	291=>278,292=>432,293=>309,294=>432,295=>309,296=>216,297=>154,298=>216,299=>154,300=>216,301=>154,302=>216,303=>154,304=>216,305=>154,306=>490,
-	307=>270,308=>278,309=>185,310=>432,311=>309,312=>297,313=>371,314=>154,315=>371,316=>154,317=>371,318=>154,319=>371,320=>293,321=>371,322=>154,
-	323=>401,324=>309,325=>401,326=>309,327=>401,328=>309,329=>391,330=>401,331=>309,332=>432,333=>278,334=>432,335=>278,336=>432,337=>278,340=>401,
-	341=>247,342=>401,343=>247,344=>401,345=>247,346=>309,347=>216,348=>309,349=>216,350=>309,351=>216,354=>371,355=>185,356=>371,357=>185,358=>371,
-	359=>185,360=>401,361=>309,362=>401,363=>309,364=>401,365=>309,366=>401,367=>309,368=>401,369=>309,370=>401,371=>309,372=>556,373=>401,374=>401,
-	375=>278,377=>371,378=>247,379=>371,380=>247,383=>185,450=>317,477=>247,484=>432,485=>278,536=>309,537=>216,538=>371,539=>185,658=>282,711=>185,
-	728=>185,729=>185,730=>185,731=>185,733=>185,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,864=>0,865=>0,884=>111,885=>111,890=>0,894=>185,900=>100,901=>183,902=>401,903=>139,904=>451,
-	905=>532,906=>316,908=>451,910=>501,911=>451,912=>183,913=>401,914=>371,915=>339,916=>422,917=>371,918=>371,919=>432,920=>432,921=>216,922=>432,
-	923=>401,924=>524,925=>401,926=>361,927=>432,928=>451,929=>339,931=>361,932=>371,933=>401,934=>482,935=>401,936=>482,937=>451,938=>0,939=>401,
-	940=>336,941=>244,942=>336,943=>183,944=>306,945=>336,946=>306,947=>306,948=>306,949=>244,950=>275,951=>336,952=>306,953=>183,954=>338,955=>275,
-	956=>336,957=>275,958=>275,959=>306,960=>336,961=>306,962=>244,963=>306,964=>244,965=>306,966=>367,967=>275,968=>397,969=>397,970=>183,971=>306,
-	972=>306,973=>306,974=>397,976=>306,977=>306,978=>401,979=>401,980=>401,981=>367,982=>336,986=>283,987=>237,988=>339,989=>261,1024=>371,1025=>371,
-	1026=>371,1028=>401,1029=>309,1030=>216,1031=>216,1032=>278,1033=>573,1034=>573,1035=>449,1037=>432,1038=>401,1040=>401,1041=>371,1042=>371,1043=>328,1044=>432,
-	1045=>371,1046=>615,1047=>313,1048=>429,1049=>429,1050=>424,1051=>432,1052=>524,1053=>432,1054=>432,1055=>430,1056=>339,1057=>401,1058=>371,1059=>401,1060=>444,
-	1061=>401,1062=>429,1063=>432,1064=>618,1065=>618,1066=>482,1067=>539,1068=>350,1069=>401,1070=>619,1071=>408,1072=>278,1073=>278,1074=>279,1075=>246,1076=>309,
-	1077=>247,1078=>417,1079=>227,1080=>319,1081=>319,1082=>297,1083=>302,1084=>376,1085=>309,1086=>278,1087=>309,1088=>309,1089=>247,1090=>274,1091=>278,1092=>458,
-	1093=>278,1094=>309,1095=>309,1096=>454,1097=>454,1098=>340,1099=>423,1100=>284,1101=>247,1102=>439,1103=>284,1104=>247,1105=>247,1106=>309,1108=>247,1109=>216,
-	1110=>154,1111=>154,1112=>185,1113=>440,1114=>437,1115=>309,1117=>309,1118=>278,1119=>309,1164=>339,1165=>284,1166=>339,1167=>309,1168=>339,1169=>254,1170=>339,
-	1171=>254,1172=>339,1173=>254,1174=>615,1175=>417,1176=>322,1177=>216,1178=>432,1179=>297,1180=>432,1181=>297,1182=>432,1183=>297,1184=>537,1185=>352,1186=>432,
-	1187=>309,1188=>563,1189=>408,1190=>432,1191=>461,1192=>401,1193=>247,1194=>401,1195=>247,1196=>371,1197=>274,1198=>401,1199=>278,1200=>401,1201=>278,1202=>401,
-	1203=>278,1204=>581,1205=>432,1206=>432,1207=>309,1208=>432,1209=>309,1210=>432,1211=>309,1212=>367,1213=>247,1214=>367,1215=>247,1216=>216,1217=>615,1218=>417,
-	1219=>432,1220=>297,1223=>432,1224=>309,1227=>432,1228=>309,1232=>401,1233=>278,1234=>401,1235=>278,1236=>556,1237=>401,1238=>371,1239=>247,1240=>367,1241=>247,
-	1242=>367,1243=>247,1244=>615,1245=>417,1246=>313,1247=>227,1248=>322,1249=>216,1250=>432,1251=>309,1252=>432,1253=>309,1254=>432,1255=>278,1256=>432,1257=>278,
-	1258=>432,1259=>278,1260=>401,1261=>247,1262=>401,1263=>278,1264=>401,1265=>278,1266=>401,1267=>278,1268=>432,1269=>309,1272=>548,1273=>423,1488=>280,1489=>280,
-	1490=>174,1491=>280,1492=>280,1493=>158,1494=>158,1495=>280,1496=>280,1497=>158,1498=>287,1499=>280,1500=>280,1501=>280,1502=>280,1503=>156,1504=>158,1505=>280,
-	1506=>280,1507=>292,1508=>280,1509=>273,1510=>280,1511=>305,1512=>285,1513=>299,1514=>280,1548=>195,1563=>246,1567=>340,1569=>392,1570=>306,1571=>247,1572=>447,
-	1573=>247,1574=>602,1575=>192,1576=>635,1577=>369,1578=>635,1579=>635,1580=>548,1581=>1173,1582=>548,1583=>363,1584=>363,1585=>439,1586=>442,1587=>875,1588=>875,
-	1589=>1061,1590=>1061,1591=>811,1592=>811,1593=>549,1594=>547,1600=>389,1601=>755,1602=>574,1603=>717,1604=>555,1605=>423,1606=>532,1607=>371,1608=>454,1609=>633,
-	1610=>643,1611=>-19,1612=>-26,1613=>-20,1614=>-19,1615=>-18,1616=>-19,1617=>-19,1618=>-15,1632=>383,1633=>383,1634=>383,1635=>383,1636=>383,1637=>383,1638=>383,
-	1639=>383,1640=>383,1641=>383,1642=>383,1645=>398,7936=>336,7937=>336,7938=>336,7939=>336,7940=>336,7941=>336,7942=>336,7943=>336,7944=>401,7945=>401,7946=>401,
-	7947=>401,7948=>401,7949=>401,7950=>401,7951=>401,7952=>244,7953=>244,7954=>244,7955=>244,7956=>244,7957=>244,7960=>371,7961=>371,7962=>371,7963=>371,7964=>371,
-	7965=>371,7968=>336,7969=>336,7970=>336,7971=>336,7972=>336,7973=>336,7974=>336,7975=>336,7976=>432,7977=>432,7978=>432,7979=>432,7980=>432,7981=>432,7982=>432,
-	7983=>432,7984=>183,7985=>183,7986=>183,7987=>183,7988=>183,7989=>183,7990=>183,7991=>183,7992=>216,7993=>216,7994=>216,7995=>216,7996=>216,7997=>216,7998=>216,
-	7999=>216,8000=>306,8001=>306,8002=>306,8003=>306,8004=>306,8005=>306,8008=>432,8009=>432,8010=>432,8011=>432,8012=>432,8013=>432,8016=>306,8017=>306,8018=>306,
-	8019=>306,8020=>306,8021=>306,8022=>306,8023=>306,8025=>401,8027=>401,8029=>401,8031=>401,8032=>397,8033=>397,8034=>397,8035=>397,8036=>397,8037=>397,8038=>397,
-	8039=>397,8040=>451,8041=>451,8042=>451,8043=>451,8044=>451,8045=>451,8046=>451,8047=>451,8048=>336,8049=>336,8050=>244,8051=>244,8052=>336,8053=>336,8054=>183,
-	8055=>183,8056=>306,8057=>306,8058=>306,8059=>306,8060=>397,8061=>397,8064=>336,8065=>336,8066=>336,8067=>336,8068=>336,8069=>336,8070=>336,8071=>336,8072=>401,
-	8073=>401,8074=>401,8075=>401,8076=>401,8077=>401,8078=>401,8079=>401,8080=>336,8081=>336,8082=>336,8083=>336,8084=>336,8085=>336,8086=>336,8087=>336,8088=>432,
-	8089=>432,8090=>432,8091=>432,8092=>432,8093=>432,8094=>432,8095=>432,8096=>397,8097=>397,8098=>397,8099=>397,8100=>397,8101=>397,8102=>397,8103=>397,8104=>451,
-	8105=>451,8106=>451,8107=>451,8108=>451,8109=>451,8110=>451,8111=>451,8112=>336,8113=>336,8114=>336,8115=>336,8116=>336,8118=>336,8119=>336,8120=>401,8121=>401,
-	8122=>401,8123=>401,8124=>401,8125=>278,8126=>0,8127=>278,8128=>278,8129=>306,8130=>336,8131=>336,8132=>336,8134=>336,8135=>336,8136=>371,8137=>371,8138=>432,
-	8139=>432,8140=>432,8141=>278,8142=>278,8143=>278,8144=>183,8145=>183,8146=>183,8147=>183,8150=>183,8151=>183,8152=>216,8153=>216,8154=>216,8155=>216,8157=>278,
-	8158=>278,8159=>278,8160=>306,8161=>306,8162=>306,8163=>306,8164=>306,8165=>306,8166=>306,8167=>306,8168=>401,8169=>401,8170=>401,8171=>401,8172=>339,8173=>306,
-	8174=>306,8175=>278,8178=>397,8179=>397,8180=>397,8182=>397,8183=>397,8184=>432,8185=>432,8186=>451,8187=>451,8188=>451,8189=>278,8190=>278,8208=>185,8209=>185,
-	8219=>185,8223=>278,8227=>311,8241=>1011,8248=>261,8251=>404,8253=>386,8255=>529,8256=>529,8257=>188,8258=>517,8259=>185,8260=>93,8261=>184,8262=>184,8267=>300,
-	8308=>167,8309=>556,8321=>167,8322=>167,8323=>167,8324=>167,8352=>394,8353=>401,8354=>435,8355=>339,8356=>278,8357=>463,8358=>401,8359=>389,8361=>556,8470=>530,
-	8471=>415,8479=>401,8483=>401,8486=>451,8487=>451,8494=>306,8498=>339,8543=>417,8706=>274,8710=>340,8721=>396,8722=>317,8730=>305,8734=>418,8800=>317,8804=>317,
-	8805=>317,9674=>274,12353=>556,12354=>556,12355=>556,12356=>556,12357=>556,12358=>556,12359=>556,12360=>556,12361=>556,12362=>556,12363=>556,12364=>556,12365=>556,12366=>556,
-	12367=>556,12368=>556,12369=>556,12370=>556,12371=>556,12372=>556,12373=>556,12374=>556,12375=>556,12376=>556,12377=>556,12378=>556,12379=>556,12380=>556,12381=>556,12382=>556,
-	12383=>556,12384=>556,12385=>556,12386=>556,12387=>556,12388=>556,12389=>556,12390=>556,12391=>556,12392=>556,12393=>556,12394=>556,12395=>556,12396=>556,12397=>556,12398=>556,
-	12399=>556,12400=>556,12401=>556,12402=>556,12403=>556,12404=>556,12405=>556,12406=>556,12407=>556,12408=>556,12409=>556,12410=>556,12411=>556,12412=>556,12413=>556,12414=>556,
-	12415=>556,12416=>556,12417=>556,12418=>556,12419=>556,12420=>556,12421=>556,12422=>556,12423=>556,12424=>556,12425=>556,12426=>556,12427=>556,12428=>556,12429=>556,12430=>556,
-	12431=>556,12432=>556,12433=>556,12434=>556,12435=>556,12449=>556,12450=>556,12451=>556,12452=>556,12453=>556,12454=>556,12455=>556,12456=>556,12457=>556,12458=>556,12459=>556,
-	12460=>556,12461=>556,12462=>556,12463=>556,12464=>556,12465=>556,12466=>556,12467=>556,12468=>556,12469=>556,12470=>556,12471=>556,12472=>556,12473=>556,12474=>556,12475=>556,
-	12476=>556,12477=>556,12478=>556,12479=>556,12480=>556,12481=>556,12482=>556,12483=>556,12484=>556,12485=>556,12486=>556,12487=>556,12488=>556,12489=>556,12490=>556,12491=>556,
-	12492=>556,12493=>556,12494=>556,12495=>556,12496=>556,12497=>556,12498=>556,12499=>556,12500=>556,12501=>556,12502=>556,12503=>556,12504=>556,12505=>556,12506=>556,12507=>556,
-	12508=>556,12509=>556,12510=>556,12511=>556,12512=>556,12513=>556,12514=>556,12515=>556,12516=>556,12517=>556,12518=>556,12519=>556,12520=>556,12521=>556,12522=>556,12523=>556,
-	12524=>556,12525=>556,12526=>556,12527=>556,12528=>556,12529=>556,12530=>556,12531=>556,12532=>556,12533=>556,12534=>556,63033=>278,63034=>278,63035=>278,63036=>278,63037=>278,
-	63038=>278,63039=>278,63040=>278,63041=>278,63171=>185,63196=>278,64256=>309,64257=>309,64258=>309,64259=>463,64260=>463,64262=>402,64606=>0,64607=>0,64608=>0,64609=>0,
-	64610=>0,64830=>467,64831=>467,65010=>814,65152=>392,65153=>306,65154=>281,65155=>247,65156=>250,65157=>447,65158=>412,65159=>247,65160=>222,65161=>602,65162=>535,65163=>360,
-	65164=>329,65165=>192,65166=>220,65167=>635,65168=>644,65169=>338,65170=>321,65171=>369,65172=>419,65173=>635,65174=>644,65175=>345,65176=>336,65177=>635,65178=>644,65179=>393,
-	65180=>345,65181=>548,65182=>553,65183=>637,65184=>652,65185=>548,65186=>546,65187=>637,65188=>656,65189=>548,65190=>544,65191=>637,65192=>656,65193=>363,65194=>439,65195=>363,
-	65196=>439,65197=>440,65198=>471,65199=>439,65200=>474,65201=>875,65202=>871,65203=>608,65204=>588,65205=>875,65206=>871,65207=>609,65208=>587,65209=>1061,65210=>1033,65211=>794,
-	65212=>758,65213=>1061,65214=>1033,65215=>794,65216=>761,65217=>811,65218=>793,65219=>659,65220=>647,65221=>811,65222=>793,65223=>659,65224=>642,65225=>549,65226=>481,65227=>512,
-	65228=>409,65229=>547,65230=>476,65231=>512,65232=>409,65233=>755,65234=>748,65235=>416,65236=>442,65237=>574,65238=>550,65239=>416,65240=>442,65241=>717,65242=>687,65243=>883,
-	65244=>409,65245=>555,65246=>511,65247=>338,65248=>297,65249=>423,65250=>478,65251=>489,65252=>476,65253=>532,65254=>548,65255=>336,65256=>326,65257=>371,65258=>391,65259=>524,
-	65260=>412,65261=>454,65262=>412,65263=>633,65264=>566,65265=>643,65266=>560,65267=>357,65268=>333,65269=>623,65270=>617,65271=>603,65272=>621,65273=>576,65274=>617,65275=>576,
-	65276=>625);
-$enc='';
-$diff='';
-$file='almohanad.z';
-$ctg='almohanad.ctg.z';
-$originalsize=227760;
-?>
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/almohanad.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/almohanad.z
deleted file mode 100644
index 27426a68..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/almohanad.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/arialunicid0.php b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/arialunicid0.php
deleted file mode 100644
index 2e32061e..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/arialunicid0.php
+++ /dev/null
@@ -1,1768 +0,0 @@
-<?php
-$type='cidfont0';
-$name='ArialUnicodeMS';
-$desc=array('Ascent'=>1069,'Descent'=>-271,'CapHeight'=>1069,'Flags'=>32,'FontBBox'=>'[-1011 -330 2260 1078]','ItalicAngle'=>0,'StemV'=>70,'MissingWidth'=>600);
-$up=-100;
-$ut=50;
-$dw=1000;
-$cw=array(
-	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=>500,
-	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,8364=>556,
-	1027=>567,8218=>222,402=>278,8222=>333,8230=>1000,8224=>556,8225=>556,710=>333,8240=>1000,352=>667,8249=>333,338=>1000,1036=>584,381=>611,1039=>723,8216=>222,
-	8217=>222,8220=>333,8221=>333,8226=>350,8211=>500,8212=>1000,732=>333,8482=>1000,353=>500,8250=>333,339=>944,1116=>437,382=>500,376=>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=>500,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,256=>667,257=>556,
-	258=>667,259=>556,260=>667,261=>556,262=>722,263=>500,264=>722,265=>500,266=>722,267=>500,268=>722,269=>500,270=>722,271=>627,272=>722,273=>556,
-	274=>667,275=>556,276=>667,277=>556,278=>667,279=>556,280=>667,281=>556,282=>667,283=>556,284=>778,285=>556,286=>778,287=>556,288=>778,289=>556,
-	290=>778,291=>556,292=>722,293=>556,294=>722,295=>556,296=>278,297=>222,298=>278,299=>222,300=>278,301=>222,302=>278,303=>222,304=>278,305=>278,
-	306=>751,307=>444,308=>500,309=>222,310=>667,311=>500,312=>437,313=>556,314=>222,315=>556,316=>222,317=>556,318=>222,319=>556,320=>318,321=>556,
-	322=>222,323=>722,324=>556,325=>722,326=>556,327=>722,328=>556,329=>626,330=>723,331=>556,332=>778,333=>556,334=>778,335=>556,336=>778,337=>556,
-	340=>722,341=>333,342=>722,343=>333,344=>722,345=>333,346=>667,347=>500,348=>667,349=>500,350=>667,351=>500,354=>611,355=>278,356=>611,357=>406,
-	358=>611,359=>278,360=>722,361=>556,362=>722,363=>556,364=>722,365=>556,366=>722,367=>556,368=>722,369=>556,370=>722,371=>556,372=>944,373=>722,
-	374=>667,375=>500,377=>611,378=>500,379=>611,380=>500,383=>222,384=>556,385=>740,386=>655,387=>556,388=>556,389=>556,390=>722,391=>766,392=>579,
-	393=>722,394=>789,395=>655,396=>556,397=>557,398=>667,399=>729,400=>604,401=>611,403=>791,404=>649,405=>806,406=>245,407=>322,408=>667,409=>500,
-	410=>322,411=>500,412=>833,413=>722,414=>556,415=>778,416=>776,417=>556,418=>1019,419=>782,420=>735,421=>556,422=>722,423=>667,424=>500,425=>602,
-	426=>366,427=>278,428=>571,429=>278,430=>611,431=>776,432=>620,433=>748,434=>667,435=>752,436=>615,437=>611,438=>500,439=>628,440=>628,441=>526,
-	442=>480,443=>556,444=>556,445=>526,446=>556,447=>556,448=>278,449=>464,450=>474,451=>278,452=>1333,453=>1222,454=>1056,455=>1030,456=>778,457=>444,
-	458=>1222,459=>944,460=>778,461=>667,462=>556,463=>278,464=>278,465=>778,466=>556,467=>722,468=>556,469=>722,470=>556,471=>722,472=>556,473=>722,
-	474=>556,475=>722,476=>556,477=>556,478=>667,479=>556,480=>667,481=>556,482=>1000,483=>889,484=>778,485=>556,486=>778,487=>556,488=>667,489=>500,
-	490=>778,491=>556,492=>778,493=>556,494=>534,495=>534,496=>222,497=>1333,498=>1222,499=>1056,500=>778,501=>556,506=>667,507=>556,508=>1000,509=>889,
-	510=>778,511=>611,512=>667,513=>556,514=>667,515=>556,516=>667,517=>556,518=>667,519=>556,520=>278,521=>278,522=>278,523=>278,524=>778,525=>556,
-	526=>778,527=>556,528=>722,529=>333,530=>722,531=>333,532=>722,533=>556,534=>722,535=>556,592=>556,593=>556,594=>556,595=>556,596=>500,597=>500,
-	598=>556,599=>556,600=>556,601=>556,602=>777,603=>485,604=>485,605=>686,606=>519,607=>260,608=>556,609=>556,610=>557,611=>500,612=>500,613=>556,
-	614=>556,615=>556,616=>242,617=>282,618=>356,619=>356,620=>425,621=>222,622=>635,623=>833,624=>833,625=>833,626=>556,627=>556,628=>558,629=>556,
-	630=>715,631=>674,632=>558,633=>333,634=>333,635=>333,636=>333,637=>333,638=>312,639=>312,640=>530,641=>530,642=>500,643=>216,644=>276,645=>216,
-	646=>222,647=>278,648=>278,649=>596,650=>558,651=>556,652=>500,653=>722,654=>500,655=>500,656=>500,657=>564,658=>530,659=>530,660=>464,661=>464,
-	662=>464,663=>500,664=>614,665=>526,666=>519,667=>557,668=>558,669=>222,670=>500,671=>416,672=>556,673=>464,674=>464,675=>966,676=>966,677=>1030,
-	678=>689,679=>484,680=>718,688=>326,689=>326,690=>153,691=>201,692=>201,693=>201,694=>304,695=>389,696=>278,697=>222,698=>372,699=>222,700=>222,
-	701=>222,702=>222,703=>222,704=>250,705=>250,706=>320,707=>320,708=>320,709=>320,711=>333,712=>192,713=>333,714=>333,715=>333,716=>192,717=>333,
-	718=>333,719=>333,720=>300,721=>300,722=>222,723=>222,724=>340,725=>340,726=>280,727=>362,728=>333,729=>333,730=>333,731=>333,733=>333,734=>333,
-	736=>278,737=>153,738=>270,739=>274,740=>325,741=>360,742=>360,743=>360,744=>360,745=>360,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,832=>0,833=>0,834=>0,835=>0,836=>0,837=>0,
-	864=>0,865=>0,884=>308,885=>308,890=>278,894=>278,900=>278,901=>278,902=>667,903=>278,904=>704,905=>759,906=>315,908=>778,910=>746,911=>758,
-	912=>222,913=>667,914=>667,915=>550,916=>682,917=>667,918=>611,919=>722,920=>778,921=>278,922=>667,923=>667,924=>833,925=>722,926=>650,927=>778,
-	928=>722,929=>667,931=>602,932=>611,933=>667,934=>808,935=>667,936=>804,937=>758,938=>278,939=>667,940=>576,941=>434,942=>556,943=>222,944=>551,
-	945=>576,946=>563,947=>500,948=>557,949=>434,950=>440,951=>556,952=>556,953=>222,954=>498,955=>500,956=>553,957=>500,958=>432,959=>556,960=>678,
-	961=>571,962=>472,963=>619,964=>382,965=>551,966=>649,967=>522,968=>729,969=>766,970=>222,971=>551,972=>556,973=>551,974=>766,976=>563,977=>616,
-	978=>631,979=>726,980=>631,981=>644,982=>781,986=>722,988=>578,990=>570,992=>692,994=>880,995=>833,996=>684,997=>558,998=>680,999=>529,1000=>557,
-	1001=>505,1002=>623,1003=>603,1004=>610,1005=>611,1006=>568,1007=>434,1008=>600,1009=>571,1010=>500,1011=>222,1025=>667,1026=>865,1028=>717,1029=>667,1030=>278,
-	1031=>278,1032=>500,1033=>1105,1034=>1009,1035=>867,1038=>635,1040=>667,1041=>655,1042=>667,1043=>567,1044=>677,1045=>667,1046=>923,1047=>604,1048=>722,1049=>722,
-	1050=>584,1051=>705,1052=>833,1053=>722,1054=>778,1055=>723,1056=>667,1057=>722,1058=>611,1059=>635,1060=>760,1061=>667,1062=>740,1063=>684,1064=>920,1065=>939,
-	1066=>793,1067=>883,1068=>655,1069=>717,1070=>1006,1071=>722,1072=>556,1073=>573,1074=>531,1075=>383,1076=>583,1077=>556,1078=>669,1079=>458,1080=>559,1081=>559,
-	1082=>437,1083=>571,1084=>683,1085=>552,1086=>556,1087=>542,1088=>556,1089=>500,1090=>458,1091=>500,1092=>823,1093=>500,1094=>562,1095=>533,1096=>802,1097=>823,
-	1098=>620,1099=>717,1100=>523,1101=>510,1102=>744,1103=>542,1105=>556,1106=>556,1107=>383,1108=>510,1109=>500,1110=>222,1111=>278,1112=>222,1113=>873,1114=>811,
-	1115=>556,1118=>500,1119=>542,1120=>976,1121=>766,1122=>656,1123=>521,1124=>950,1125=>694,1126=>667,1127=>597,1128=>952,1129=>817,1130=>654,1131=>600,1132=>932,
-	1133=>817,1134=>604,1135=>458,1136=>804,1137=>729,1138=>778,1139=>556,1140=>667,1141=>500,1142=>667,1143=>500,1144=>1279,1145=>1060,1146=>778,1147=>556,1148=>976,
-	1149=>766,1150=>976,1151=>766,1152=>722,1153=>514,1154=>686,1155=>334,1156=>382,1157=>334,1158=>334,1168=>435,1169=>339,1170=>567,1171=>383,1172=>656,1173=>556,
-	1174=>923,1175=>669,1176=>604,1177=>458,1178=>584,1179=>437,1180=>584,1181=>437,1182=>584,1183=>437,1184=>764,1185=>537,1186=>741,1187=>573,1188=>900,1189=>670,
-	1190=>736,1191=>560,1192=>778,1193=>560,1194=>722,1195=>500,1196=>611,1197=>458,1198=>667,1199=>500,1200=>667,1201=>500,1202=>667,1203=>500,1204=>916,1205=>661,
-	1206=>684,1207=>533,1208=>684,1209=>533,1210=>684,1211=>556,1212=>829,1213=>667,1214=>829,1215=>667,1216=>278,1217=>923,1218=>669,1219=>584,1220=>437,1223=>735,
-	1224=>570,1227=>684,1228=>533,1232=>667,1233=>556,1234=>667,1235=>556,1236=>1000,1237=>889,1238=>667,1239=>556,1240=>729,1241=>556,1242=>729,1243=>556,1244=>923,
-	1245=>669,1246=>604,1247=>458,1248=>604,1249=>492,1250=>722,1251=>559,1252=>722,1253=>559,1254=>778,1255=>556,1256=>778,1257=>556,1258=>778,1259=>556,1262=>635,
-	1263=>500,1264=>635,1265=>500,1266=>635,1267=>500,1268=>684,1269=>533,1272=>883,1273=>717,1329=>635,1330=>531,1331=>583,1332=>583,1333=>531,1334=>531,1335=>427,
-	1336=>531,1337=>750,1338=>635,1339=>531,1340=>375,1341=>583,1342=>698,1343=>531,1344=>427,1345=>531,1346=>583,1347=>531,1348=>635,1349=>698,1350=>635,1351=>635,
-	1352=>531,1353=>531,1354=>698,1355=>531,1356=>635,1357=>531,1358=>698,1359=>583,1360=>479,1361=>583,1362=>531,1363=>698,1364=>698,1365=>635,1366=>750,1369=>271,
-	1370=>271,1371=>150,1372=>300,1373=>271,1374=>271,1375=>420,1377=>583,1378=>427,1379=>427,1380=>427,1381=>427,1382=>427,1383=>427,1384=>427,1385=>459,1386=>427,
-	1387=>427,1388=>323,1389=>531,1390=>427,1391=>427,1392=>427,1393=>427,1394=>427,1395=>427,1396=>427,1397=>271,1398=>427,1399=>375,1400=>427,1401=>375,1402=>583,
-	1403=>427,1404=>427,1405=>427,1406=>427,1407=>583,1408=>427,1409=>427,1410=>323,1411=>583,1412=>375,1413=>375,1414=>583,1415=>527,1417=>271,1425=>360,1426=>360,
-	1427=>360,1428=>360,1429=>360,1430=>360,1431=>360,1432=>360,1433=>360,1434=>360,1435=>360,1436=>360,1437=>360,1438=>360,1439=>360,1440=>360,1441=>360,1443=>360,
-	1444=>360,1445=>360,1446=>360,1447=>360,1448=>360,1449=>360,1450=>360,1451=>360,1452=>360,1453=>360,1454=>360,1455=>360,1456=>360,1457=>360,1458=>360,1459=>360,
-	1460=>360,1461=>360,1462=>360,1463=>360,1464=>360,1465=>360,1467=>360,1468=>360,1469=>360,1470=>366,1471=>360,1472=>225,1473=>360,1474=>360,1475=>238,1476=>360,
-	1488=>577,1489=>563,1490=>411,1491=>512,1492=>594,1493=>316,1494=>326,1495=>594,1496=>594,1497=>316,1498=>507,1499=>527,1500=>484,1501=>594,1502=>594,1503=>316,
-	1504=>338,1505=>604,1506=>550,1507=>567,1508=>569,1509=>505,1510=>514,1511=>583,1512=>507,1513=>700,1514=>633,1520=>590,1521=>590,1522=>590,1523=>216,1524=>412,
-	1548=>278,1563=>278,1567=>556,1569=>529,1570=>243,1571=>243,1572=>470,1573=>243,1574=>731,1575=>243,1576=>771,1577=>514,1578=>771,1579=>771,1580=>544,1581=>544,
-	1582=>544,1583=>430,1584=>430,1585=>421,1586=>421,1587=>1194,1588=>1194,1589=>1291,1590=>1291,1591=>843,1592=>843,1593=>594,1594=>594,1600=>279,1601=>957,1602=>800,
-	1603=>757,1604=>662,1605=>589,1606=>692,1607=>514,1608=>470,1609=>731,1610=>731,1611=>0,1612=>0,1613=>0,1614=>0,1615=>0,1616=>0,1617=>0,1618=>0,
-	1632=>480,1633=>480,1634=>480,1635=>480,1636=>480,1637=>480,1638=>480,1639=>480,1640=>480,1641=>480,1642=>547,1643=>278,1644=>278,1645=>438,1648=>0,1649=>243,
-	1650=>243,1651=>243,1652=>0,1653=>380,1654=>470,1655=>548,1656=>772,1657=>771,1658=>771,1659=>771,1660=>771,1661=>771,1662=>771,1663=>771,1664=>771,1665=>544,
-	1666=>544,1667=>544,1668=>544,1669=>544,1670=>544,1671=>544,1672=>430,1673=>430,1674=>430,1675=>430,1676=>430,1677=>430,1678=>430,1679=>430,1680=>430,1681=>421,
-	1682=>421,1683=>421,1684=>421,1685=>421,1686=>419,1687=>421,1688=>421,1689=>421,1690=>1194,1691=>1194,1692=>1194,1693=>1291,1694=>1291,1695=>843,1696=>594,1697=>957,
-	1698=>957,1699=>957,1700=>957,1701=>957,1702=>957,1703=>800,1704=>800,1705=>828,1706=>1058,1707=>828,1708=>757,1709=>757,1710=>757,1711=>828,1712=>828,1713=>828,
-	1714=>828,1715=>828,1716=>828,1717=>662,1718=>662,1719=>662,1722=>692,1723=>692,1724=>692,1725=>692,1726=>706,1728=>514,1729=>509,1730=>509,1731=>509,1732=>470,
-	1733=>470,1734=>470,1735=>470,1736=>470,1737=>470,1738=>470,1739=>470,1740=>731,1741=>841,1742=>731,1744=>731,1745=>731,1746=>550,1747=>550,1748=>279,1749=>514,
-	1750=>726,1751=>558,1752=>321,1753=>318,1754=>342,1755=>373,1756=>716,1757=>688,1758=>852,1759=>288,1760=>288,1761=>388,1762=>350,1763=>716,1764=>146,1765=>282,
-	1766=>339,1767=>339,1768=>415,1769=>514,1770=>220,1771=>220,1772=>220,1773=>350,1776=>480,1777=>480,1778=>480,1779=>480,1780=>480,1781=>480,1782=>480,1783=>480,
-	1784=>480,1785=>480,2305=>0,2306=>0,2307=>294,2309=>693,2310=>910,2311=>533,2312=>533,2313=>590,2314=>713,2315=>920,2316=>677,2317=>611,2318=>611,2319=>611,
-	2320=>611,2321=>910,2322=>910,2323=>910,2324=>910,2325=>667,2326=>732,2327=>593,2328=>639,2329=>624,2330=>688,2331=>713,2332=>688,2333=>712,2334=>697,2335=>502,
-	2336=>533,2337=>583,2338=>523,2339=>693,2340=>585,2341=>638,2342=>533,2343=>640,2344=>585,2345=>585,2346=>565,2347=>699,2348=>592,2349=>689,2350=>633,2351=>600,
-	2352=>486,2353=>486,2354=>680,2355=>730,2356=>730,2357=>592,2358=>684,2359=>608,2360=>646,2361=>546,2364=>0,2365=>373,2366=>319,2367=>319,2368=>319,2369=>0,
-	2370=>0,2371=>0,2372=>0,2373=>0,2374=>0,2375=>0,2376=>0,2377=>319,2378=>319,2379=>319,2380=>319,2381=>0,2384=>884,2385=>0,2386=>0,2387=>0,
-	2388=>0,2392=>667,2393=>732,2394=>593,2395=>688,2396=>583,2397=>523,2398=>699,2399=>600,2400=>920,2401=>677,2402=>0,2403=>0,2404=>331,2405=>513,2406=>639,
-	2407=>639,2408=>639,2409=>639,2410=>639,2411=>639,2412=>639,2413=>639,2414=>639,2415=>639,2416=>362,2433=>0,2434=>430,2435=>430,2437=>786,2438=>1030,2439=>582,
-	2440=>603,2441=>648,2442=>757,2443=>758,2444=>630,2447=>685,2448=>746,2451=>711,2452=>776,2453=>779,2454=>655,2455=>606,2456=>645,2457=>661,2458=>554,2459=>585,
-	2460=>729,2461=>752,2462=>893,2463=>567,2464=>625,2465=>648,2466=>567,2467=>598,2468=>680,2469=>645,2470=>609,2471=>596,2472=>595,2474=>635,2475=>780,2476=>593,
-	2477=>677,2478=>621,2479=>601,2480=>593,2482=>640,2486=>598,2487=>596,2488=>637,2489=>582,2492=>0,2494=>245,2495=>245,2496=>245,2497=>0,2498=>0,2499=>0,
-	2500=>0,2503=>309,2504=>309,2507=>932,2508=>932,2509=>0,2519=>245,2524=>648,2525=>553,2527=>596,2528=>758,2529=>630,2530=>0,2531=>335,2534=>610,2535=>559,
-	2536=>595,2537=>711,2538=>610,2539=>661,2540=>661,2541=>559,2542=>661,2543=>600,2544=>593,2545=>593,2546=>601,2547=>567,2548=>601,2549=>699,2550=>661,2551=>267,
-	2552=>610,2553=>424,2554=>548,2562=>0,2565=>691,2566=>936,2567=>803,2568=>803,2569=>678,2570=>678,2575=>557,2576=>691,2579=>678,2580=>691,2581=>602,2582=>567,
-	2583=>641,2584=>688,2585=>565,2586=>592,2587=>603,2588=>591,2589=>541,2590=>558,2591=>543,2592=>581,2593=>596,2594=>640,2595=>640,2596=>591,2597=>564,2598=>640,
-	2599=>564,2600=>581,2602=>564,2603=>551,2604=>560,2605=>549,2606=>558,2607=>652,2608=>540,2610=>677,2611=>677,2613=>601,2614=>558,2616=>558,2617=>549,2620=>0,
-	2622=>246,2623=>246,2624=>246,2625=>0,2626=>0,2631=>0,2632=>0,2635=>0,2636=>0,2637=>0,2649=>567,2650=>690,2651=>591,2652=>591,2654=>581,2662=>591,
-	2663=>591,2664=>591,2665=>591,2666=>591,2667=>591,2668=>591,2669=>591,2670=>591,2671=>591,2672=>0,2673=>0,2674=>557,2675=>678,2676=>894,2689=>0,2690=>0,
-	2691=>300,2693=>781,2694=>1044,2695=>589,2696=>589,2697=>560,2698=>758,2699=>806,2701=>781,2703=>781,2704=>781,2705=>1044,2707=>1044,2708=>1044,2709=>413,2710=>773,
-	2711=>606,2712=>558,2713=>483,2714=>600,2715=>691,2716=>811,2717=>647,2718=>651,2719=>453,2720=>450,2721=>425,2722=>478,2723=>694,2724=>534,2725=>553,2726=>446,
-	2727=>541,2728=>582,2730=>572,2731=>437,2732=>663,2733=>756,2734=>594,2735=>493,2736=>392,2738=>613,2739=>656,2741=>538,2742=>611,2743=>507,2744=>663,2745=>587,
-	2748=>0,2749=>478,2750=>273,2751=>273,2752=>273,2753=>0,2754=>0,2755=>0,2756=>0,2757=>0,2759=>0,2760=>0,2761=>273,2763=>273,2764=>273,2765=>0,
-	2768=>843,2784=>893,2790=>625,2791=>625,2792=>625,2793=>625,2794=>625,2795=>625,2796=>625,2797=>625,2798=>625,2799=>625,2817=>0,2818=>306,2819=>391,2821=>590,
-	2822=>808,2823=>658,2824=>658,2825=>633,2826=>654,2827=>636,2828=>540,2831=>560,2832=>938,2835=>600,2836=>973,2837=>603,2838=>620,2839=>620,2840=>605,2841=>712,
-	2842=>579,2843=>579,2844=>593,2845=>564,2846=>581,2847=>604,2848=>578,2849=>579,2850=>579,2851=>607,2852=>579,2853=>587,2854=>579,2855=>602,2856=>579,2858=>605,
-	2859=>728,2860=>579,2861=>643,2862=>605,2863=>628,2864=>619,2866=>653,2867=>593,2870=>620,2871=>605,2872=>605,2873=>579,2876=>0,2877=>333,2878=>218,2879=>0,
-	2880=>294,2881=>0,2882=>0,2883=>0,2887=>479,2888=>479,2891=>1026,2892=>1026,2893=>0,2902=>0,2903=>218,2908=>579,2909=>579,2911=>599,2912=>636,2913=>540,
-	2918=>578,2919=>480,2920=>480,2921=>622,2922=>506,2923=>605,2924=>529,2925=>548,2926=>512,2927=>528,2928=>561,2946=>0,2947=>742,2949=>1002,2950=>1118,2951=>994,
-	2952=>660,2953=>1012,2954=>1231,2958=>726,2959=>731,2960=>870,2962=>763,2963=>763,2964=>1636,2965=>667,2969=>830,2970=>584,2972=>876,2974=>986,2975=>802,2979=>1295,
-	2980=>656,2984=>630,2985=>1012,2986=>694,2990=>727,2991=>790,2992=>545,2993=>718,2994=>821,2995=>871,2996=>724,2997=>873,2999=>1087,3000=>1098,3001=>1274,3006=>547,
-	3007=>172,3008=>93,3009=>519,3010=>814,3014=>748,3015=>681,3016=>956,3018=>1666,3019=>1666,3020=>1994,3021=>0,3031=>871,3047=>667,3048=>1012,3049=>751,3050=>740,
-	3051=>924,3052=>884,3053=>726,3054=>1002,3055=>825,3056=>717,3057=>719,3058=>774,3073=>365,3074=>601,3075=>346,3077=>720,3078=>786,3079=>567,3080=>1159,3081=>690,
-	3082=>1047,3083=>1299,3084=>913,3086=>625,3087=>625,3088=>712,3090=>655,3091=>655,3092=>862,3093=>515,3094=>680,3095=>526,3096=>943,3097=>655,3098=>684,3099=>684,
-	3100=>670,3101=>1205,3102=>732,3103=>888,3104=>597,3105=>709,3106=>709,3107=>809,3108=>715,3109=>702,3110=>702,3111=>702,3112=>607,3114=>623,3115=>623,3116=>681,
-	3117=>681,3118=>932,3119=>1203,3120=>597,3121=>893,3122=>631,3123=>608,3125=>620,3126=>541,3127=>667,3128=>640,3129=>911,3134=>644,3135=>298,3136=>298,3137=>361,
-	3138=>682,3139=>342,3140=>704,3142=>624,3143=>624,3144=>900,3146=>849,3147=>849,3148=>976,3149=>669,3157=>298,3158=>119,3168=>1620,3169=>1281,3174=>840,3175=>840,
-	3176=>840,3177=>840,3178=>840,3179=>840,3180=>840,3181=>840,3182=>840,3183=>840,3202=>440,3203=>251,3205=>654,3206=>654,3207=>631,3208=>891,3209=>957,3210=>1293,
-	3211=>1044,3212=>744,3214=>650,3215=>650,3216=>659,3218=>667,3219=>667,3220=>667,3221=>462,3222=>749,3223=>543,3224=>779,3225=>674,3226=>682,3227=>660,3228=>667,
-	3229=>1171,3230=>926,3231=>671,3232=>557,3233=>669,3234=>669,3235=>728,3236=>544,3237=>672,3238=>672,3239=>672,3240=>560,3242=>668,3243=>668,3244=>681,3245=>687,
-	3246=>972,3247=>1101,3248=>556,3249=>677,3250=>661,3251=>545,3253=>666,3254=>553,3255=>670,3256=>549,3257=>716,3262=>425,3263=>341,3264=>680,3265=>354,3266=>714,
-	3267=>386,3268=>638,3270=>307,3271=>670,3272=>462,3274=>908,3275=>1251,3276=>434,3277=>336,3285=>344,3286=>404,3294=>673,3296=>1695,3297=>978,3302=>549,3303=>549,
-	3304=>549,3305=>549,3306=>549,3307=>549,3308=>549,3309=>549,3310=>549,3311=>549,3330=>368,3331=>305,3333=>1201,3334=>1351,3335=>905,3336=>1459,3337=>635,3338=>1198,
-	3339=>861,3340=>957,3342=>1211,3343=>1202,3344=>1839,3346=>642,3347=>1114,3348=>1195,3349=>861,3350=>982,3351=>874,3352=>1354,3353=>957,3354=>1016,3355=>1266,3356=>712,
-	3357=>1454,3358=>1215,3359=>563,3360=>565,3361=>1192,3362=>1244,3363=>1268,3364=>878,3365=>966,3366=>545,3367=>879,3368=>879,3370=>1031,3371=>1175,3372=>1334,3373=>546,
-	3374=>643,3375=>949,3376=>642,3377=>555,3378=>945,3379=>631,3380=>553,3381=>959,3382=>936,3383=>1122,3384=>1190,3385=>1112,3390=>475,3391=>418,3392=>442,3393=>340,
-	3394=>340,3395=>473,3398=>640,3399=>530,3400=>1279,3402=>1368,3403=>1258,3404=>1447,3405=>0,3415=>553,3424=>861,3425=>1100,3430=>1095,3431=>929,3432=>854,3433=>1181,
-	3434=>658,3435=>972,3436=>1210,3437=>650,3438=>959,3439=>896,3585=>595,3586=>648,3587=>665,3588=>608,3589=>608,3590=>665,3591=>471,3592=>556,3593=>652,3594=>664,
-	3595=>681,3596=>816,3597=>849,3598=>620,3599=>620,3600=>541,3601=>785,3602=>826,3603=>887,3604=>598,3605=>605,3606=>595,3607=>650,3608=>541,3609=>652,3610=>608,
-	3611=>608,3612=>630,3613=>630,3614=>695,3615=>695,3616=>620,3617=>581,3618=>588,3619=>501,3620=>595,3621=>569,3622=>620,3623=>519,3624=>592,3625=>659,3626=>574,
-	3627=>654,3628=>695,3629=>566,3630=>574,3631=>517,3632=>452,3633=>0,3634=>496,3635=>496,3636=>0,3637=>0,3638=>0,3639=>0,3640=>0,3641=>0,3642=>0,
-	3647=>687,3648=>302,3649=>571,3650=>478,3651=>515,3652=>515,3653=>496,3654=>506,3655=>0,3656=>0,3657=>0,3658=>0,3659=>0,3660=>0,3661=>0,3662=>0,
-	3663=>555,3664=>598,3665=>640,3666=>688,3667=>690,3668=>657,3669=>657,3670=>635,3671=>839,3672=>693,3673=>769,3674=>673,3675=>994,3713=>775,3714=>707,3716=>724,
-	3719=>524,3720=>690,3722=>678,3725=>711,3732=>719,3733=>834,3734=>776,3735=>916,3737=>744,3738=>740,3739=>740,3740=>834,3741=>834,3742=>854,3743=>854,3745=>775,
-	3746=>724,3747=>697,3749=>700,3751=>700,3754=>708,3755=>916,3757=>700,3758=>697,3759=>658,3760=>432,3761=>534,3762=>476,3763=>476,3764=>778,3765=>778,3766=>778,
-	3767=>778,3768=>778,3769=>778,3771=>778,3772=>778,3773=>670,3776=>420,3777=>806,3778=>430,3779=>446,3780=>346,3782=>571,3784=>778,3785=>778,3786=>778,3787=>778,
-	3788=>778,3789=>778,3792=>721,3793=>719,3794=>601,3795=>711,3796=>686,3797=>686,3798=>834,3799=>756,3800=>724,3801=>906,3804=>1272,3805=>1272,3840=>600,3841=>600,
-	3842=>600,3843=>600,3844=>600,3845=>600,3846=>600,3847=>600,3848=>600,3849=>600,3850=>600,3851=>600,3852=>600,3853=>600,3854=>600,3855=>600,3856=>600,3857=>600,
-	3858=>600,3859=>600,3860=>600,3861=>600,3862=>600,3863=>600,3864=>600,3865=>600,3866=>600,3867=>600,3868=>600,3869=>600,3870=>600,3871=>600,3872=>600,3873=>600,
-	3874=>600,3875=>600,3876=>600,3877=>600,3878=>600,3879=>600,3880=>600,3881=>600,3882=>600,3883=>600,3884=>600,3885=>600,3886=>600,3887=>600,3888=>600,3889=>600,
-	3890=>600,3891=>600,3892=>600,3893=>600,3894=>600,3895=>600,3896=>600,3897=>600,3898=>600,3899=>600,3900=>600,3901=>600,3902=>600,3903=>600,3904=>600,3905=>600,
-	3906=>600,3907=>600,3908=>600,3909=>600,3910=>600,3911=>600,3913=>600,3914=>600,3915=>600,3916=>600,3917=>600,3918=>600,3919=>600,3920=>600,3921=>600,3922=>600,
-	3923=>600,3924=>600,3925=>600,3926=>600,3927=>600,3928=>600,3929=>600,3930=>600,3931=>600,3932=>600,3933=>600,3934=>600,3935=>600,3936=>600,3937=>600,3938=>600,
-	3939=>600,3940=>600,3941=>600,3942=>600,3943=>600,3944=>600,3945=>600,3953=>600,3954=>600,3955=>600,3956=>600,3957=>600,3958=>600,3959=>600,3960=>600,3961=>600,
-	3962=>600,3963=>600,3964=>600,3965=>600,3966=>600,3967=>600,3968=>600,3969=>600,3970=>600,3971=>600,3972=>600,3973=>600,3974=>600,3975=>600,3976=>600,3977=>600,
-	3978=>600,3979=>600,3984=>600,3985=>600,3986=>600,3987=>600,3988=>600,3989=>600,3991=>600,3993=>600,3994=>600,3995=>600,3996=>600,3997=>600,3998=>600,3999=>600,
-	4000=>600,4001=>600,4002=>600,4003=>600,4004=>600,4005=>600,4006=>600,4007=>600,4008=>600,4009=>600,4010=>600,4011=>600,4012=>600,4013=>600,4017=>600,4018=>600,
-	4019=>600,4020=>600,4021=>600,4022=>600,4023=>600,4025=>600,4256=>662,4257=>677,4258=>708,4259=>696,4260=>609,4261=>790,4262=>664,4263=>785,4264=>560,4265=>634,
-	4266=>782,4267=>701,4268=>629,4269=>682,4270=>705,4271=>692,4272=>734,4273=>615,4274=>592,4275=>680,4276=>679,4277=>705,4278=>643,4279=>623,4280=>623,4281=>629,
-	4282=>633,4283=>770,4284=>592,4285=>662,4286=>629,4287=>672,4288=>735,4289=>576,4290=>606,4291=>605,4292=>676,4293=>792,4304=>435,4305=>556,4306=>565,4307=>872,
-	4308=>506,4309=>544,4310=>723,4311=>868,4312=>530,4313=>532,4314=>955,4315=>552,4316=>565,4317=>712,4318=>547,4319=>574,4320=>685,4321=>554,4322=>806,4323=>810,
-	4324=>777,4325=>502,4326=>686,4327=>512,4328=>552,4329=>496,4330=>568,4331=>552,4332=>592,4333=>565,4334=>552,4335=>741,4336=>549,4337=>659,4338=>559,4339=>524,
-	4340=>482,4341=>565,4342=>822,4347=>506,4352=>1000,4353=>1000,4354=>1000,4355=>1000,4356=>1000,4357=>1000,4358=>1000,4359=>1000,4360=>1000,4361=>1000,4362=>1000,4363=>1000,
-	4364=>1000,4365=>1000,4366=>1000,4367=>1000,4368=>1000,4369=>1000,4370=>1000,4371=>1000,4372=>1000,4373=>1000,4374=>1000,4375=>1000,4376=>1000,4377=>1000,4378=>1000,4379=>1000,
-	4380=>1000,4381=>1000,4382=>1000,4383=>1000,4384=>1000,4385=>1000,4386=>1000,4387=>1000,4388=>1000,4389=>1000,4390=>1000,4391=>1000,4392=>1000,4393=>1000,4394=>1000,4395=>1000,
-	4396=>1000,4397=>1000,4398=>1000,4399=>1000,4400=>1000,4401=>1000,4402=>1000,4403=>1000,4404=>1000,4405=>1000,4406=>1000,4407=>1000,4408=>1000,4409=>1000,4410=>1000,4411=>1000,
-	4412=>1000,4413=>1000,4414=>1000,4415=>1000,4416=>1000,4417=>1000,4418=>1000,4419=>1000,4420=>1000,4421=>1000,4422=>1000,4423=>1000,4424=>1000,4425=>1000,4426=>1000,4427=>1000,
-	4428=>1000,4429=>1000,4430=>1000,4431=>1000,4432=>1000,4433=>1000,4434=>1000,4435=>1000,4436=>1000,4437=>1000,4438=>1000,4439=>1000,4440=>1000,4441=>1000,4447=>1000,4448=>1000,
-	4449=>1000,4450=>1000,4451=>1000,4452=>1000,4453=>1000,4454=>1000,4455=>1000,4456=>1000,4457=>1000,4458=>1000,4459=>1000,4460=>1000,4461=>1000,4462=>1000,4463=>1000,4464=>1000,
-	4465=>1000,4466=>1000,4467=>1000,4468=>1000,4469=>1000,4470=>1000,4471=>1000,4472=>1000,4473=>1000,4474=>1000,4475=>1000,4476=>1000,4477=>1000,4478=>1000,4479=>1000,4480=>1000,
-	4481=>1000,4482=>1000,4483=>1000,4484=>1000,4485=>1000,4486=>1000,4487=>1000,4488=>1000,4489=>1000,4490=>1000,4491=>1000,4492=>1000,4493=>1000,4494=>1000,4495=>1000,4496=>1000,
-	4497=>1000,4498=>1000,4499=>1000,4500=>1000,4501=>1000,4502=>1000,4503=>1000,4504=>1000,4505=>1000,4506=>1000,4507=>1000,4508=>1000,4509=>1000,4510=>1000,4511=>1000,4512=>1000,
-	4513=>1000,4514=>1000,4520=>1000,4521=>1000,4522=>1000,4523=>1000,4524=>1000,4525=>1000,4526=>1000,4527=>1000,4528=>1000,4529=>1000,4530=>1000,4531=>1000,4532=>1000,4533=>1000,
-	4534=>1000,4535=>1000,4536=>1000,4537=>1000,4538=>1000,4539=>1000,4540=>1000,4541=>1000,4542=>1000,4543=>1000,4544=>1000,4545=>1000,4546=>1000,4547=>1000,4548=>1000,4549=>1000,
-	4550=>1000,4551=>1000,4552=>1000,4553=>1000,4554=>1000,4555=>1000,4556=>1000,4557=>1000,4558=>1000,4559=>1000,4560=>1000,4561=>1000,4562=>1000,4563=>1000,4564=>1000,4565=>1000,
-	4566=>1000,4567=>1000,4568=>1000,4569=>1000,4570=>1000,4571=>1000,4572=>1000,4573=>1000,4574=>1000,4575=>1000,4576=>1000,4577=>1000,4578=>1000,4579=>1000,4580=>1000,4581=>1000,
-	4582=>1000,4583=>1000,4584=>1000,4585=>1000,4586=>1000,4587=>1000,4588=>1000,4589=>1000,4590=>1000,4591=>1000,4592=>1000,4593=>1000,4594=>1000,4595=>1000,4596=>1000,4597=>1000,
-	4598=>1000,4599=>1000,4600=>1000,4601=>1000,7680=>667,7681=>556,7682=>667,7683=>556,7684=>667,7685=>556,7686=>667,7687=>556,7688=>722,7689=>500,7690=>722,7691=>556,
-	7692=>722,7693=>556,7694=>722,7695=>556,7696=>722,7697=>556,7698=>722,7699=>556,7700=>667,7701=>556,7702=>667,7703=>556,7704=>667,7705=>556,7706=>667,7707=>556,
-	7708=>667,7709=>556,7710=>611,7711=>278,7712=>778,7713=>556,7714=>722,7715=>556,7716=>722,7717=>556,7718=>722,7719=>556,7720=>722,7721=>556,7722=>722,7723=>556,
-	7724=>278,7725=>222,7726=>278,7727=>278,7728=>667,7729=>500,7730=>667,7731=>500,7732=>667,7733=>500,7734=>556,7735=>222,7736=>556,7737=>222,7738=>556,7739=>222,
-	7740=>556,7741=>222,7742=>833,7743=>833,7744=>833,7745=>833,7746=>833,7747=>833,7748=>722,7749=>556,7750=>722,7751=>556,7752=>722,7753=>556,7754=>722,7755=>556,
-	7756=>778,7757=>556,7758=>778,7759=>556,7760=>778,7761=>556,7762=>778,7763=>556,7764=>667,7765=>556,7766=>667,7767=>556,7768=>722,7769=>333,7770=>722,7771=>333,
-	7772=>722,7773=>333,7774=>722,7775=>333,7776=>667,7777=>500,7778=>667,7779=>500,7780=>667,7781=>500,7782=>667,7783=>500,7784=>667,7785=>500,7786=>611,7787=>278,
-	7788=>611,7789=>278,7790=>611,7791=>278,7792=>611,7793=>278,7794=>722,7795=>556,7796=>722,7797=>556,7798=>722,7799=>556,7800=>722,7801=>556,7802=>722,7803=>556,
-	7804=>667,7805=>500,7806=>667,7807=>500,7808=>944,7809=>722,7810=>944,7811=>722,7812=>944,7813=>722,7814=>944,7815=>722,7816=>944,7817=>722,7818=>667,7819=>500,
-	7820=>667,7821=>500,7822=>667,7823=>500,7824=>611,7825=>500,7826=>611,7827=>500,7828=>611,7829=>500,7830=>556,7831=>278,7832=>722,7833=>500,7834=>556,7835=>278,
-	7840=>667,7841=>556,7842=>667,7843=>556,7844=>667,7845=>556,7846=>667,7847=>556,7848=>667,7849=>556,7850=>667,7851=>556,7852=>667,7853=>556,7854=>667,7855=>556,
-	7856=>667,7857=>556,7858=>667,7859=>556,7860=>667,7861=>556,7862=>667,7863=>556,7864=>667,7865=>556,7866=>667,7867=>556,7868=>667,7869=>556,7870=>667,7871=>556,
-	7872=>667,7873=>556,7874=>667,7875=>556,7876=>667,7877=>556,7878=>667,7879=>556,7880=>278,7881=>278,7882=>278,7883=>222,7884=>778,7885=>556,7886=>778,7887=>556,
-	7888=>778,7889=>556,7890=>778,7891=>556,7892=>778,7893=>556,7894=>778,7895=>556,7896=>778,7897=>556,7898=>776,7899=>556,7900=>776,7901=>556,7902=>776,7903=>556,
-	7904=>776,7905=>556,7906=>776,7907=>556,7908=>722,7909=>556,7910=>722,7911=>556,7912=>776,7913=>620,7914=>776,7915=>620,7916=>776,7917=>620,7918=>776,7919=>620,
-	7920=>776,7921=>620,7922=>667,7923=>500,7924=>667,7925=>500,7926=>667,7927=>500,7928=>667,7929=>500,7936=>576,7937=>576,7938=>576,7939=>576,7940=>576,7941=>576,
-	7942=>576,7943=>576,7944=>667,7945=>667,7946=>680,7947=>680,7948=>680,7949=>680,7950=>718,7951=>718,7952=>434,7953=>434,7954=>434,7955=>434,7956=>434,7957=>434,
-	7960=>692,7961=>692,7962=>823,7963=>823,7964=>823,7965=>823,7968=>556,7969=>556,7970=>556,7971=>556,7972=>556,7973=>556,7974=>556,7975=>556,7976=>747,7977=>747,
-	7978=>878,7979=>878,7980=>878,7981=>878,7982=>923,7983=>923,7984=>222,7985=>222,7986=>222,7987=>222,7988=>222,7989=>222,7990=>222,7991=>222,7992=>303,7993=>303,
-	7994=>434,7995=>434,7996=>434,7997=>434,7998=>479,7999=>479,8000=>556,8001=>556,8002=>556,8003=>556,8004=>556,8005=>556,8008=>778,8009=>778,8010=>894,8011=>894,
-	8012=>894,8013=>894,8016=>551,8017=>551,8018=>551,8019=>551,8020=>551,8021=>551,8022=>551,8023=>551,8025=>777,8027=>893,8029=>885,8031=>940,8032=>766,8033=>766,
-	8034=>766,8035=>766,8036=>766,8037=>766,8038=>766,8039=>766,8040=>758,8041=>758,8042=>874,8043=>874,8044=>868,8045=>867,8046=>911,8047=>911,8048=>576,8049=>576,
-	8050=>434,8051=>434,8052=>556,8053=>556,8054=>222,8055=>222,8056=>556,8057=>556,8058=>551,8059=>551,8060=>766,8061=>766,8064=>576,8065=>576,8066=>576,8067=>576,
-	8068=>576,8069=>576,8070=>576,8071=>576,8072=>667,8073=>667,8074=>680,8075=>680,8076=>680,8077=>680,8078=>718,8079=>718,8080=>556,8081=>556,8082=>556,8083=>556,
-	8084=>556,8085=>556,8086=>556,8087=>556,8088=>747,8089=>747,8090=>878,8091=>878,8092=>878,8093=>878,8094=>923,8095=>923,8096=>766,8097=>766,8098=>766,8099=>766,
-	8100=>766,8101=>766,8102=>766,8103=>766,8104=>758,8105=>758,8106=>874,8107=>874,8108=>868,8109=>867,8110=>911,8111=>911,8112=>576,8113=>576,8114=>576,8115=>576,
-	8116=>576,8118=>576,8119=>576,8120=>667,8121=>667,8122=>667,8123=>667,8124=>667,8125=>278,8126=>278,8127=>278,8128=>278,8129=>278,8130=>556,8131=>556,8132=>556,
-	8134=>556,8135=>556,8136=>693,8137=>704,8138=>748,8139=>759,8140=>722,8141=>278,8142=>278,8143=>278,8144=>222,8145=>222,8146=>222,8147=>222,8150=>222,8151=>222,
-	8152=>278,8153=>278,8154=>304,8155=>304,8157=>278,8158=>278,8159=>278,8160=>551,8161=>551,8162=>551,8163=>551,8164=>571,8165=>571,8166=>551,8167=>551,8168=>667,
-	8169=>667,8170=>742,8171=>746,8172=>693,8173=>278,8174=>278,8175=>278,8178=>766,8179=>766,8180=>766,8182=>766,8183=>766,8184=>778,8185=>778,8186=>758,8187=>758,
-	8188=>758,8189=>278,8190=>278,8192=>500,8193=>1000,8194=>500,8195=>1000,8196=>333,8197=>250,8198=>167,8199=>556,8200=>278,8201=>100,8202=>50,8203=>0,8204=>0,
-	8205=>0,8208=>333,8209=>333,8210=>556,8213=>564,8214=>428,8215=>500,8219=>222,8223=>333,8227=>350,8228=>278,8229=>556,8231=>278,8232=>0,8233=>0,8241=>1330,
-	8242=>222,8243=>372,8244=>522,8245=>206,8246=>356,8247=>506,8248=>312,8251=>1000,8252=>471,8253=>556,8254=>500,8255=>945,8256=>945,8257=>312,8258=>820,8259=>333,
-	8260=>167,8261=>278,8262=>278,8304=>333,8308=>333,8309=>333,8310=>333,8311=>333,8312=>333,8313=>333,8314=>333,8315=>333,8316=>333,8317=>210,8318=>210,8319=>333,
-	8320=>333,8321=>333,8322=>333,8323=>333,8324=>333,8325=>333,8326=>333,8327=>333,8328=>333,8329=>333,8330=>333,8331=>333,8332=>333,8333=>210,8334=>210,8352=>556,
-	8353=>556,8354=>556,8355=>556,8356=>556,8357=>833,8358=>556,8359=>556,8360=>1024,8361=>940,8362=>784,8363=>556,8400=>600,8401=>600,8402=>600,8403=>600,8404=>700,
-	8405=>700,8406=>600,8407=>600,8408=>600,8409=>600,8410=>600,8411=>600,8412=>600,8413=>900,8414=>900,8415=>900,8416=>900,8417=>700,8448=>889,8449=>889,8450=>667,
-	8451=>1022,8452=>611,8453=>889,8454=>889,8455=>501,8456=>667,8457=>921,8458=>510,8459=>906,8460=>988,8461=>722,8462=>500,8463=>500,8464=>688,8465=>553,8466=>708,
-	8467=>291,8468=>778,8469=>722,8470=>1073,8471=>737,8472=>740,8473=>556,8474=>722,8475=>927,8476=>795,8477=>667,8478=>667,8479=>667,8480=>1000,8481=>1174,8483=>722,
-	8484=>611,8485=>542,8486=>768,8487=>768,8488=>698,8489=>321,8490=>667,8491=>667,8492=>927,8493=>646,8494=>556,8495=>385,8496=>615,8497=>688,8498=>611,8499=>1115,
-	8500=>406,8501=>688,8502=>688,8503=>344,8504=>688,8531=>834,8532=>834,8533=>834,8534=>834,8535=>834,8536=>834,8537=>834,8538=>834,8539=>834,8540=>834,8541=>834,
-	8542=>834,8543=>834,8544=>278,8545=>555,8546=>832,8547=>933,8548=>667,8549=>934,8550=>1031,8551=>1268,8552=>944,8553=>667,8554=>944,8555=>1035,8556=>556,8557=>722,
-	8558=>722,8559=>833,8560=>222,8561=>444,8562=>666,8563=>700,8564=>500,8565=>700,8566=>922,8567=>1144,8568=>712,8569=>500,8570=>712,8571=>934,8572=>222,8573=>500,
-	8574=>556,8575=>833,8576=>983,8577=>722,8578=>983,8592=>713,8593=>713,8594=>713,8595=>713,8596=>713,8597=>713,8598=>713,8599=>713,8600=>713,8601=>713,8602=>713,
-	8603=>713,8604=>713,8605=>713,8606=>713,8607=>713,8608=>713,8609=>713,8610=>713,8611=>713,8612=>713,8613=>713,8614=>713,8615=>713,8616=>713,8617=>713,8618=>713,
-	8619=>713,8620=>713,8621=>813,8622=>813,8623=>713,8624=>713,8625=>713,8626=>713,8627=>713,8628=>713,8629=>713,8630=>713,8631=>713,8632=>713,8633=>713,8634=>800,
-	8635=>800,8636=>713,8637=>713,8638=>713,8639=>713,8640=>713,8641=>713,8642=>713,8643=>713,8644=>713,8645=>713,8646=>713,8647=>713,8648=>713,8649=>713,8650=>713,
-	8651=>713,8652=>713,8653=>713,8654=>950,8655=>713,8656=>713,8657=>713,8658=>713,8659=>713,8660=>863,8661=>713,8662=>713,8663=>713,8664=>713,8665=>713,8666=>713,
-	8667=>713,8668=>813,8669=>813,8670=>713,8671=>713,8672=>713,8673=>713,8674=>713,8675=>713,8676=>713,8677=>713,8678=>713,8679=>713,8680=>713,8681=>713,8682=>713,
-	8704=>600,8705=>600,8706=>494,8707=>600,8708=>600,8709=>800,8710=>612,8711=>612,8712=>549,8713=>549,8714=>549,8715=>549,8716=>549,8717=>549,8718=>549,8719=>823,
-	8720=>823,8721=>713,8722=>584,8723=>584,8724=>584,8725=>167,8726=>278,8727=>389,8728=>400,8729=>400,8730=>600,8731=>600,8732=>600,8733=>549,8734=>549,8735=>584,
-	8736=>584,8737=>584,8738=>584,8739=>260,8740=>444,8741=>418,8742=>602,8743=>561,8744=>561,8745=>561,8746=>561,8747=>506,8748=>806,8749=>1106,8750=>506,8751=>806,
-	8752=>1106,8753=>506,8754=>506,8755=>506,8756=>561,8757=>561,8758=>422,8759=>561,8760=>584,8761=>584,8762=>584,8763=>584,8764=>584,8765=>584,8766=>584,8767=>584,
-	8768=>422,8769=>584,8770=>584,8771=>584,8772=>584,8773=>584,8774=>584,8775=>584,8776=>584,8777=>584,8778=>584,8779=>584,8780=>584,8781=>584,8782=>584,8783=>584,
-	8784=>584,8785=>584,8786=>584,8787=>584,8788=>737,8789=>737,8790=>584,8791=>584,8792=>584,8793=>584,8794=>584,8795=>584,8796=>584,8797=>584,8798=>584,8799=>584,
-	8800=>584,8801=>584,8802=>584,8803=>584,8804=>584,8805=>584,8806=>584,8807=>584,8808=>584,8809=>584,8810=>969,8811=>969,8812=>584,8813=>584,8814=>584,8815=>584,
-	8816=>584,8817=>584,8818=>584,8819=>584,8820=>584,8821=>584,8822=>584,8823=>584,8824=>584,8825=>584,8826=>584,8827=>584,8828=>584,8829=>584,8830=>584,8831=>584,
-	8832=>584,8833=>584,8834=>678,8835=>678,8836=>678,8837=>678,8838=>678,8839=>678,8840=>678,8841=>678,8842=>678,8843=>678,8844=>561,8845=>561,8846=>561,8847=>678,
-	8848=>678,8849=>673,8850=>673,8851=>561,8852=>561,8853=>800,8854=>800,8855=>800,8856=>800,8857=>800,8858=>800,8859=>800,8860=>800,8861=>800,8862=>800,8863=>800,
-	8864=>800,8865=>800,8866=>549,8867=>549,8868=>549,8869=>549,8870=>399,8871=>399,8872=>549,8873=>549,8874=>549,8875=>672,8876=>549,8877=>549,8878=>549,8879=>672,
-	8880=>549,8881=>549,8882=>549,8883=>549,8884=>549,8885=>549,8886=>713,8887=>713,8888=>713,8889=>549,8890=>549,8891=>584,8892=>584,8893=>584,8894=>584,8895=>584,
-	8896=>561,8897=>561,8898=>561,8899=>561,8900=>549,8901=>250,8902=>549,8903=>649,8904=>630,8905=>630,8906=>630,8907=>630,8908=>630,8909=>584,8910=>561,8911=>561,
-	8912=>668,8913=>668,8914=>668,8915=>668,8916=>561,8917=>602,8918=>584,8919=>584,8920=>1354,8921=>1354,8922=>584,8923=>584,8924=>584,8925=>584,8926=>584,8927=>584,
-	8928=>584,8929=>584,8930=>673,8931=>673,8932=>673,8933=>673,8934=>584,8935=>584,8936=>584,8937=>584,8938=>584,8939=>584,8940=>584,8941=>584,8942=>278,8943=>1000,
-	8944=>1000,8945=>1000,8960=>549,8962=>549,8963=>549,8964=>549,8965=>549,8966=>549,8967=>549,8968=>449,8969=>449,8970=>449,8971=>449,8972=>549,8973=>549,8974=>549,
-	8975=>549,8976=>549,8977=>549,8978=>800,8979=>800,8980=>549,8981=>549,8982=>549,8983=>650,8984=>780,8985=>549,8986=>549,8987=>549,8988=>549,8989=>549,8990=>549,
-	8991=>549,8992=>506,8993=>506,8994=>713,8995=>713,8996=>1000,8997=>1000,8998=>1000,8999=>1000,9000=>1000,9001=>329,9002=>329,9003=>1000,9004=>549,9005=>549,9006=>549,
-	9007=>549,9008=>549,9009=>549,9010=>549,9011=>549,9012=>549,9013=>549,9014=>600,9015=>600,9016=>600,9017=>600,9018=>600,9019=>600,9020=>600,9021=>600,9022=>600,
-	9023=>600,9024=>600,9025=>600,9026=>600,9027=>600,9028=>600,9029=>600,9030=>600,9031=>600,9032=>600,9033=>600,9034=>600,9035=>600,9036=>600,9037=>600,9038=>600,
-	9039=>600,9040=>600,9041=>600,9042=>600,9043=>600,9044=>600,9045=>600,9046=>600,9047=>600,9048=>600,9049=>600,9050=>600,9051=>600,9052=>600,9053=>600,9054=>600,
-	9055=>600,9056=>600,9057=>600,9058=>600,9059=>600,9060=>600,9061=>600,9062=>600,9063=>600,9064=>600,9065=>600,9066=>600,9067=>600,9068=>600,9069=>600,9070=>600,
-	9071=>600,9072=>600,9073=>600,9074=>600,9075=>600,9076=>600,9077=>600,9078=>600,9079=>600,9080=>600,9081=>600,9082=>600,9109=>600,9216=>600,9217=>600,9218=>600,
-	9219=>600,9220=>600,9221=>600,9222=>600,9223=>600,9224=>600,9225=>600,9226=>600,9227=>600,9228=>600,9229=>600,9230=>600,9231=>600,9232=>600,9233=>600,9234=>600,
-	9235=>600,9236=>600,9237=>600,9238=>600,9239=>600,9240=>600,9241=>600,9242=>600,9243=>600,9244=>600,9245=>600,9246=>600,9247=>600,9248=>600,9249=>600,9250=>600,
-	9251=>600,9252=>600,9280=>604,9281=>604,9282=>604,9283=>604,9284=>604,9285=>604,9286=>750,9287=>750,9288=>750,9289=>750,9290=>604,9312=>1000,9313=>1000,9314=>1000,
-	9315=>1000,9316=>1000,9317=>1000,9318=>1000,9319=>1000,9320=>1000,9321=>1000,9322=>1000,9323=>1000,9324=>1000,9325=>1000,9326=>1000,9327=>1000,9328=>1000,9329=>1000,9330=>1000,
-	9331=>1000,9332=>1000,9333=>1000,9334=>1000,9335=>1000,9336=>1000,9337=>1000,9338=>1000,9339=>1000,9340=>1000,9341=>1000,9342=>1000,9343=>1000,9344=>1000,9345=>1000,9346=>1000,
-	9347=>1000,9348=>1000,9349=>1000,9350=>1000,9351=>1000,9352=>1000,9353=>1000,9354=>1000,9355=>1000,9356=>1000,9357=>1000,9358=>1000,9359=>1000,9360=>1000,9361=>1000,9362=>1000,
-	9363=>1000,9364=>1000,9365=>1000,9366=>1000,9367=>1000,9368=>1000,9369=>1000,9370=>1000,9371=>1000,9372=>1000,9373=>1000,9374=>1000,9375=>1000,9376=>1000,9377=>1000,9378=>1000,
-	9379=>1000,9380=>1000,9381=>1000,9382=>1000,9383=>1000,9384=>1000,9385=>1000,9386=>1000,9387=>1000,9388=>1000,9389=>1000,9390=>1000,9391=>1000,9392=>1000,9393=>1000,9394=>1000,
-	9395=>1000,9396=>1000,9397=>1000,9398=>1000,9399=>1000,9400=>1000,9401=>1000,9402=>1000,9403=>1000,9404=>1000,9405=>1000,9406=>1000,9407=>1000,9408=>1000,9409=>1000,9410=>1000,
-	9411=>1000,9412=>1000,9413=>1000,9414=>1000,9415=>1000,9416=>1000,9417=>1000,9418=>1000,9419=>1000,9420=>1000,9421=>1000,9422=>1000,9423=>1000,9424=>1000,9425=>1000,9426=>1000,
-	9427=>1000,9428=>1000,9429=>1000,9430=>1000,9431=>1000,9432=>1000,9433=>1000,9434=>1000,9435=>1000,9436=>1000,9437=>1000,9438=>1000,9439=>1000,9440=>1000,9441=>1000,9442=>1000,
-	9443=>1000,9444=>1000,9445=>1000,9446=>1000,9447=>1000,9448=>1000,9449=>1000,9450=>1000,9472=>600,9473=>600,9474=>600,9475=>600,9476=>600,9477=>600,9478=>600,9479=>600,
-	9480=>600,9481=>600,9482=>600,9483=>600,9484=>600,9485=>600,9486=>600,9487=>600,9488=>600,9489=>600,9490=>600,9491=>600,9492=>600,9493=>600,9494=>600,9495=>600,
-	9496=>600,9497=>600,9498=>600,9499=>600,9500=>600,9501=>600,9502=>600,9503=>600,9504=>600,9505=>600,9506=>600,9507=>600,9508=>600,9509=>600,9510=>600,9511=>600,
-	9512=>600,9513=>600,9514=>600,9515=>600,9516=>600,9517=>600,9518=>600,9519=>600,9520=>600,9521=>600,9522=>600,9523=>600,9524=>600,9525=>600,9526=>600,9527=>600,
-	9528=>600,9529=>600,9530=>600,9531=>600,9532=>600,9533=>600,9534=>600,9535=>600,9536=>600,9537=>600,9538=>600,9539=>600,9540=>600,9541=>600,9542=>600,9543=>600,
-	9544=>600,9545=>600,9546=>600,9547=>600,9548=>600,9549=>600,9550=>600,9551=>600,9552=>600,9553=>600,9554=>600,9555=>600,9556=>600,9557=>600,9558=>600,9559=>600,
-	9560=>600,9561=>600,9562=>600,9563=>600,9564=>600,9565=>600,9566=>600,9567=>600,9568=>600,9569=>600,9570=>600,9571=>600,9572=>600,9573=>600,9574=>600,9575=>600,
-	9576=>600,9577=>600,9578=>600,9579=>600,9580=>600,9581=>600,9582=>600,9583=>600,9584=>600,9585=>600,9586=>600,9587=>600,9588=>600,9589=>600,9590=>600,9591=>600,
-	9592=>600,9593=>600,9594=>600,9595=>600,9596=>600,9597=>600,9598=>600,9599=>600,9600=>600,9601=>600,9602=>600,9603=>600,9604=>600,9605=>600,9606=>600,9607=>600,
-	9608=>600,9609=>600,9610=>600,9611=>600,9612=>600,9613=>600,9614=>600,9615=>600,9616=>600,9617=>600,9618=>600,9619=>600,9620=>600,9621=>600,9632=>600,9633=>600,
-	9634=>600,9635=>600,9636=>600,9637=>600,9638=>600,9639=>600,9640=>600,9641=>600,9642=>600,9643=>600,9644=>600,9645=>600,9646=>600,9647=>600,9648=>600,9649=>600,
-	9650=>600,9651=>600,9652=>600,9653=>600,9654=>600,9655=>600,9656=>600,9657=>600,9658=>600,9659=>600,9660=>600,9661=>600,9662=>600,9663=>600,9664=>600,9665=>600,
-	9666=>600,9667=>600,9668=>600,9669=>600,9670=>600,9671=>600,9672=>600,9673=>600,9674=>600,9675=>600,9676=>600,9677=>600,9678=>600,9679=>600,9680=>600,9681=>600,
-	9682=>600,9683=>600,9684=>600,9685=>600,9686=>600,9687=>600,9688=>600,9689=>600,9690=>600,9691=>600,9692=>600,9693=>600,9694=>600,9695=>600,9696=>600,9697=>600,
-	9698=>600,9699=>600,9700=>600,9701=>600,9702=>600,9703=>600,9704=>600,9705=>600,9706=>600,9707=>600,9708=>600,9709=>600,9710=>600,9711=>600,9728=>750,9729=>1000,
-	9730=>750,9731=>750,9732=>1000,9733=>816,9734=>823,9735=>500,9736=>500,9737=>800,9738=>800,9739=>800,9740=>800,9741=>800,9742=>719,9743=>719,9744=>734,9745=>734,
-	9746=>734,9747=>762,9754=>960,9755=>960,9756=>939,9757=>939,9758=>939,9759=>939,9760=>750,9761=>600,9762=>750,9763=>750,9764=>580,9765=>460,9766=>444,9767=>650,
-	9768=>444,9769=>768,9770=>800,9771=>850,9772=>675,9773=>800,9774=>750,9775=>750,9776=>900,9777=>900,9778=>900,9779=>900,9780=>900,9781=>900,9782=>900,9783=>900,
-	9784=>750,9785=>750,9786=>750,9787=>750,9788=>750,9789=>750,9790=>750,9791=>740,9792=>740,9793=>740,9794=>740,9795=>653,9796=>490,9797=>632,9798=>780,9799=>560,
-	9800=>838,9801=>780,9802=>734,9803=>887,9804=>780,9805=>1080,9806=>896,9807=>1080,9808=>804,9809=>868,9810=>922,9811=>696,9812=>1000,9813=>1000,9814=>1000,9815=>1000,
-	9816=>1000,9817=>1000,9818=>1000,9819=>1000,9820=>1000,9821=>1000,9822=>1000,9823=>1000,9824=>722,9825=>734,9826=>674,9827=>804,9828=>722,9829=>734,9830=>674,9831=>804,
-	9832=>860,9833=>423,9834=>592,9835=>750,9836=>750,9837=>439,9838=>439,9839=>439,9985=>974,9986=>961,9987=>974,9988=>980,9990=>789,9991=>790,9992=>791,9993=>690,
-	9996=>549,9997=>855,9998=>911,9999=>933,10000=>911,10001=>945,10002=>974,10003=>755,10004=>846,10005=>762,10006=>761,10007=>571,10008=>677,10009=>763,10010=>760,10011=>759,
-	10012=>754,10013=>494,10014=>552,10015=>537,10016=>577,10017=>692,10018=>786,10019=>788,10020=>788,10021=>790,10022=>793,10023=>794,10025=>823,10026=>789,10027=>841,10028=>823,
-	10029=>833,10030=>816,10031=>831,10032=>923,10033=>744,10034=>723,10035=>749,10036=>790,10037=>792,10038=>695,10039=>776,10040=>768,10041=>792,10042=>759,10043=>707,10044=>708,
-	10045=>682,10046=>701,10047=>826,10048=>815,10049=>789,10050=>789,10051=>707,10052=>687,10053=>696,10054=>689,10055=>786,10056=>787,10057=>713,10058=>791,10059=>785,10061=>873,
-	10063=>762,10064=>762,10065=>759,10066=>759,10070=>784,10072=>138,10073=>277,10074=>415,10075=>392,10076=>392,10077=>668,10078=>668,10081=>732,10082=>544,10083=>544,10084=>910,
-	10085=>667,10086=>760,10087=>760,10102=>788,10103=>788,10104=>788,10105=>788,10106=>788,10107=>788,10108=>788,10109=>788,10110=>788,10111=>788,10112=>788,10113=>788,10114=>788,
-	10115=>788,10116=>788,10117=>788,10118=>788,10119=>788,10120=>788,10121=>788,10122=>788,10123=>788,10124=>788,10125=>788,10126=>788,10127=>788,10128=>788,10129=>788,10130=>788,
-	10131=>788,10132=>894,10136=>748,10137=>924,10138=>748,10139=>918,10140=>927,10141=>928,10142=>928,10143=>834,10144=>873,10145=>828,10146=>924,10147=>924,10148=>917,10149=>930,
-	10150=>931,10151=>463,10152=>883,10153=>836,10154=>836,10155=>867,10156=>867,10157=>696,10158=>696,10159=>874,10161=>874,10162=>760,10163=>946,10164=>771,10165=>865,10166=>771,
-	10167=>888,10168=>967,10169=>888,10170=>831,10171=>873,10172=>927,10173=>970,10174=>918,12288=>1000,12289=>1000,12290=>1000,12291=>1000,12292=>1000,12293=>1000,12294=>1000,12295=>1000,
-	12296=>1000,12297=>1000,12298=>1000,12299=>1000,12300=>1000,12301=>1000,12302=>1000,12303=>1000,12304=>1000,12305=>1000,12306=>1000,12307=>1000,12308=>1000,12309=>1000,12310=>1000,12311=>1000,
-	12312=>1000,12313=>1000,12314=>1000,12315=>1000,12316=>1000,12317=>1000,12318=>1000,12319=>1000,12320=>1000,12321=>1000,12322=>1000,12323=>1000,12324=>1000,12325=>1000,12326=>1000,12327=>1000,
-	12328=>1000,12329=>1000,12330=>1000,12331=>1000,12332=>1000,12333=>1000,12334=>1000,12335=>1000,12336=>1000,12337=>1000,12338=>1000,12339=>1000,12340=>1000,12341=>1000,12342=>1000,12343=>1000,
-	12351=>1000,12353=>1000,12354=>1000,12355=>1000,12356=>1000,12357=>1000,12358=>1000,12359=>1000,12360=>1000,12361=>1000,12362=>1000,12363=>1000,12364=>1000,12365=>1000,12366=>1000,12367=>1000,
-	12368=>1000,12369=>1000,12370=>1000,12371=>1000,12372=>1000,12373=>1000,12374=>1000,12375=>1000,12376=>1000,12377=>1000,12378=>1000,12379=>1000,12380=>1000,12381=>1000,12382=>1000,12383=>1000,
-	12384=>1000,12385=>1000,12386=>1000,12387=>1000,12388=>1000,12389=>1000,12390=>1000,12391=>1000,12392=>1000,12393=>1000,12394=>1000,12395=>1000,12396=>1000,12397=>1000,12398=>1000,12399=>1000,
-	12400=>1000,12401=>1000,12402=>1000,12403=>1000,12404=>1000,12405=>1000,12406=>1000,12407=>1000,12408=>1000,12409=>1000,12410=>1000,12411=>1000,12412=>1000,12413=>1000,12414=>1000,12415=>1000,
-	12416=>1000,12417=>1000,12418=>1000,12419=>1000,12420=>1000,12421=>1000,12422=>1000,12423=>1000,12424=>1000,12425=>1000,12426=>1000,12427=>1000,12428=>1000,12429=>1000,12430=>1000,12431=>1000,
-	12432=>1000,12433=>1000,12434=>1000,12435=>1000,12436=>1000,12441=>1000,12442=>1000,12443=>1000,12444=>1000,12445=>1000,12446=>1000,12449=>1000,12450=>1000,12451=>1000,12452=>1000,12453=>1000,
-	12454=>1000,12455=>1000,12456=>1000,12457=>1000,12458=>1000,12459=>1000,12460=>1000,12461=>1000,12462=>1000,12463=>1000,12464=>1000,12465=>1000,12466=>1000,12467=>1000,12468=>1000,12469=>1000,
-	12470=>1000,12471=>1000,12472=>1000,12473=>1000,12474=>1000,12475=>1000,12476=>1000,12477=>1000,12478=>1000,12479=>1000,12480=>1000,12481=>1000,12482=>1000,12483=>1000,12484=>1000,12485=>1000,
-	12486=>1000,12487=>1000,12488=>1000,12489=>1000,12490=>1000,12491=>1000,12492=>1000,12493=>1000,12494=>1000,12495=>1000,12496=>1000,12497=>1000,12498=>1000,12499=>1000,12500=>1000,12501=>1000,
-	12502=>1000,12503=>1000,12504=>1000,12505=>1000,12506=>1000,12507=>1000,12508=>1000,12509=>1000,12510=>1000,12511=>1000,12512=>1000,12513=>1000,12514=>1000,12515=>1000,12516=>1000,12517=>1000,
-	12518=>1000,12519=>1000,12520=>1000,12521=>1000,12522=>1000,12523=>1000,12524=>1000,12525=>1000,12526=>1000,12527=>1000,12528=>1000,12529=>1000,12530=>1000,12531=>1000,12532=>1000,12533=>1000,
-	12534=>1000,12535=>1000,12536=>1000,12537=>1000,12538=>1000,12539=>1000,12540=>1000,12541=>1000,12542=>1000,12549=>1000,12550=>1000,12551=>1000,12552=>1000,12553=>1000,12554=>1000,12555=>1000,
-	12556=>1000,12557=>1000,12558=>1000,12559=>1000,12560=>1000,12561=>1000,12562=>1000,12563=>1000,12564=>1000,12565=>1000,12566=>1000,12567=>1000,12568=>1000,12569=>1000,12570=>1000,12571=>1000,
-	12572=>1000,12573=>1000,12574=>1000,12575=>1000,12576=>1000,12577=>1000,12578=>1000,12579=>1000,12580=>1000,12581=>1000,12582=>1000,12583=>1000,12584=>1000,12585=>1000,12586=>1000,12587=>1000,
-	12588=>1000,12593=>1000,12594=>1000,12595=>1000,12596=>1000,12597=>1000,12598=>1000,12599=>1000,12600=>1000,12601=>1000,12602=>1000,12603=>1000,12604=>1000,12605=>1000,12606=>1000,12607=>1000,
-	12608=>1000,12609=>1000,12610=>1000,12611=>1000,12612=>1000,12613=>1000,12614=>1000,12615=>1000,12616=>1000,12617=>1000,12618=>1000,12619=>1000,12620=>1000,12621=>1000,12622=>1000,12623=>1000,
-	12624=>1000,12625=>1000,12626=>1000,12627=>1000,12628=>1000,12629=>1000,12630=>1000,12631=>1000,12632=>1000,12633=>1000,12634=>1000,12635=>1000,12636=>1000,12637=>1000,12638=>1000,12639=>1000,
-	12640=>1000,12641=>1000,12642=>1000,12643=>1000,12644=>1000,12645=>1000,12646=>1000,12647=>1000,12648=>1000,12649=>1000,12650=>1000,12651=>1000,12652=>1000,12653=>1000,12654=>1000,12655=>1000,
-	12656=>1000,12657=>1000,12658=>1000,12659=>1000,12660=>1000,12661=>1000,12662=>1000,12663=>1000,12664=>1000,12665=>1000,12666=>1000,12667=>1000,12668=>1000,12669=>1000,12670=>1000,12671=>1000,
-	12672=>1000,12673=>1000,12674=>1000,12675=>1000,12676=>1000,12677=>1000,12678=>1000,12679=>1000,12680=>1000,12681=>1000,12682=>1000,12683=>1000,12684=>1000,12685=>1000,12686=>1000,12688=>1000,
-	12689=>1000,12690=>1000,12691=>1000,12692=>1000,12693=>1000,12694=>1000,12695=>1000,12696=>1000,12697=>1000,12698=>1000,12699=>1000,12700=>1000,12701=>1000,12702=>1000,12703=>1000,12800=>1000,
-	12801=>1000,12802=>1000,12803=>1000,12804=>1000,12805=>1000,12806=>1000,12807=>1000,12808=>1000,12809=>1000,12810=>1000,12811=>1000,12812=>1000,12813=>1000,12814=>1000,12815=>1000,12816=>1000,
-	12817=>1000,12818=>1000,12819=>1000,12820=>1000,12821=>1000,12822=>1000,12823=>1000,12824=>1000,12825=>1000,12826=>1000,12827=>1000,12828=>1000,12832=>1000,12833=>1000,12834=>1000,12835=>1000,
-	12836=>1000,12837=>1000,12838=>1000,12839=>1000,12840=>1000,12841=>1000,12842=>1000,12843=>1000,12844=>1000,12845=>1000,12846=>1000,12847=>1000,12848=>1000,12849=>1000,12850=>1000,12851=>1000,
-	12852=>1000,12853=>1000,12854=>1000,12855=>1000,12856=>1000,12857=>1000,12858=>1000,12859=>1000,12860=>1000,12861=>1000,12862=>1000,12863=>1000,12864=>1000,12865=>1000,12866=>1000,12867=>1000,
-	12896=>1000,12897=>1000,12898=>1000,12899=>1000,12900=>1000,12901=>1000,12902=>1000,12903=>1000,12904=>1000,12905=>1000,12906=>1000,12907=>1000,12908=>1000,12909=>1000,12910=>1000,12911=>1000,
-	12912=>1000,12913=>1000,12914=>1000,12915=>1000,12916=>1000,12917=>1000,12918=>1000,12919=>1000,12920=>1000,12921=>1000,12922=>1000,12923=>1000,12927=>1000,12928=>1000,12929=>1000,12930=>1000,
-	12931=>1000,12932=>1000,12933=>1000,12934=>1000,12935=>1000,12936=>1000,12937=>1000,12938=>1000,12939=>1000,12940=>1000,12941=>1000,12942=>1000,12943=>1000,12944=>1000,12945=>1000,12946=>1000,
-	12947=>1000,12948=>1000,12949=>1000,12950=>1000,12951=>1000,12952=>1000,12953=>1000,12954=>1000,12955=>1000,12956=>1000,12957=>1000,12958=>1000,12959=>1000,12960=>1000,12961=>1000,12962=>1000,
-	12963=>1000,12964=>1000,12965=>1000,12966=>1000,12967=>1000,12968=>1000,12969=>1000,12970=>1000,12971=>1000,12972=>1000,12973=>1000,12974=>1000,12975=>1000,12976=>1000,12992=>1000,12993=>1000,
-	12994=>1000,12995=>1000,12996=>1000,12997=>1000,12998=>1000,12999=>1000,13000=>1000,13001=>1000,13002=>1000,13003=>1000,13008=>1000,13009=>1000,13010=>1000,13011=>1000,13012=>1000,13013=>1000,
-	13014=>1000,13015=>1000,13016=>1000,13017=>1000,13018=>1000,13019=>1000,13020=>1000,13021=>1000,13022=>1000,13023=>1000,13024=>1000,13025=>1000,13026=>1000,13027=>1000,13028=>1000,13029=>1000,
-	13030=>1000,13031=>1000,13032=>1000,13033=>1000,13034=>1000,13035=>1000,13036=>1000,13037=>1000,13038=>1000,13039=>1000,13040=>1000,13041=>1000,13042=>1000,13043=>1000,13044=>1000,13045=>1000,
-	13046=>1000,13047=>1000,13048=>1000,13049=>1000,13050=>1000,13051=>1000,13052=>1000,13053=>1000,13054=>1000,13056=>1000,13057=>1000,13058=>1000,13059=>1000,13060=>1000,13061=>1000,13062=>1000,
-	13063=>1000,13064=>1000,13065=>1000,13066=>1000,13067=>1000,13068=>1000,13069=>1000,13070=>1000,13071=>1000,13072=>1000,13073=>1000,13074=>1000,13075=>1000,13076=>1000,13077=>1000,13078=>1000,
-	13079=>1000,13080=>1000,13081=>1000,13082=>1000,13083=>1000,13084=>1000,13085=>1000,13086=>1000,13087=>1000,13088=>1000,13089=>1000,13090=>1000,13091=>1000,13092=>1000,13093=>1000,13094=>1000,
-	13095=>1000,13096=>1000,13097=>1000,13098=>1000,13099=>1000,13100=>1000,13101=>1000,13102=>1000,13103=>1000,13104=>1000,13105=>1000,13106=>1000,13107=>1000,13108=>1000,13109=>1000,13110=>1000,
-	13111=>1000,13112=>1000,13113=>1000,13114=>1000,13115=>1000,13116=>1000,13117=>1000,13118=>1000,13119=>1000,13120=>1000,13121=>1000,13122=>1000,13123=>1000,13124=>1000,13125=>1000,13126=>1000,
-	13127=>1000,13128=>1000,13129=>1000,13130=>1000,13131=>1000,13132=>1000,13133=>1000,13134=>1000,13135=>1000,13136=>1000,13137=>1000,13138=>1000,13139=>1000,13140=>1000,13141=>1000,13142=>1000,
-	13143=>1000,13144=>1000,13145=>1000,13146=>1000,13147=>1000,13148=>1000,13149=>1000,13150=>1000,13151=>1000,13152=>1000,13153=>1000,13154=>1000,13155=>1000,13156=>1000,13157=>1000,13158=>1000,
-	13159=>1000,13160=>1000,13161=>1000,13162=>1000,13163=>1000,13164=>1000,13165=>1000,13166=>1000,13167=>1000,13168=>1000,13169=>1000,13170=>1000,13171=>1000,13172=>1000,13173=>1000,13174=>1000,
-	13179=>1000,13180=>1000,13181=>1000,13182=>1000,13183=>1000,13184=>1000,13185=>1000,13186=>1000,13187=>1000,13188=>1000,13189=>1000,13190=>1000,13191=>1000,13192=>1000,13193=>1000,13194=>1000,
-	13195=>1000,13196=>1000,13197=>1000,13198=>1000,13199=>1000,13200=>1000,13201=>1000,13202=>1000,13203=>1000,13204=>1000,13205=>1000,13206=>1000,13207=>1000,13208=>1000,13209=>1000,13210=>1000,
-	13211=>1000,13212=>1000,13213=>1000,13214=>1000,13215=>1000,13216=>1000,13217=>1000,13218=>1000,13219=>1000,13220=>1000,13221=>1000,13222=>1000,13223=>1000,13224=>1000,13225=>1000,13226=>1000,
-	13227=>1000,13228=>1000,13229=>1000,13230=>1000,13231=>1000,13232=>1000,13233=>1000,13234=>1000,13235=>1000,13236=>1000,13237=>1000,13238=>1000,13239=>1000,13240=>1000,13241=>1000,13242=>1000,
-	13243=>1000,13244=>1000,13245=>1000,13246=>1000,13247=>1000,13248=>1000,13249=>1000,13250=>1000,13251=>1000,13252=>1000,13253=>1000,13254=>1000,13255=>1000,13256=>1000,13257=>1000,13258=>1000,
-	13259=>1000,13260=>1000,13261=>1000,13262=>1000,13263=>1000,13264=>1000,13265=>1000,13266=>1000,13267=>1000,13268=>1000,13269=>1000,13270=>1000,13271=>1000,13272=>1000,13273=>1000,13274=>1000,
-	13275=>1000,13276=>1000,13277=>1000,13280=>1000,13281=>1000,13282=>1000,13283=>1000,13284=>1000,13285=>1000,13286=>1000,13287=>1000,13288=>1000,13289=>1000,13290=>1000,13291=>1000,13292=>1000,
-	13293=>1000,13294=>1000,13295=>1000,13296=>1000,13297=>1000,13298=>1000,13299=>1000,13300=>1000,13301=>1000,13302=>1000,13303=>1000,13304=>1000,13305=>1000,13306=>1000,13307=>1000,13308=>1000,
-	13309=>1000,13310=>1000,59393=>316,59394=>507,59395=>507,59396=>484,59397=>484,59416=>0,59492=>480,59495=>480,59536=>458,59557=>466,59558=>480,59559=>903,61441=>500,61442=>500,
-	63232=>541,63233=>0,63234=>0,63235=>0,63236=>0,63237=>0,63238=>0,63239=>0,63240=>0,63241=>0,63242=>0,63243=>0,63244=>0,63245=>0,63246=>0,63247=>849,
-	63248=>0,63249=>0,63250=>0,63251=>0,63252=>0,63253=>0,63254=>0,63255=>0,63256=>0,63257=>0,63258=>0,63260=>333,63261=>287,63744=>1000,63745=>1000,63746=>1000,
-	63747=>1000,63748=>1000,63749=>1000,63750=>1000,63751=>1000,63752=>1000,63753=>1000,63754=>1000,63755=>1000,63756=>1000,63757=>1000,63758=>1000,63759=>1000,63760=>1000,63761=>1000,63762=>1000,
-	63763=>1000,63764=>1000,63765=>1000,63766=>1000,63767=>1000,63768=>1000,63769=>1000,63770=>1000,63771=>1000,63772=>1000,63773=>1000,63774=>1000,63775=>1000,63776=>1000,63777=>1000,63778=>1000,
-	63779=>1000,63780=>1000,63781=>1000,63782=>1000,63783=>1000,63784=>1000,63785=>1000,63786=>1000,63787=>1000,63788=>1000,63789=>1000,63790=>1000,63791=>1000,63792=>1000,63793=>1000,63794=>1000,
-	63795=>1000,63796=>1000,63797=>1000,63798=>1000,63799=>1000,63800=>1000,63801=>1000,63802=>1000,63803=>1000,63804=>1000,63805=>1000,63806=>1000,63807=>1000,63808=>1000,63809=>1000,63810=>1000,
-	63811=>1000,63812=>1000,63813=>1000,63814=>1000,63815=>1000,63816=>1000,63817=>1000,63818=>1000,63819=>1000,63820=>1000,63821=>1000,63822=>1000,63823=>1000,63824=>1000,63825=>1000,63826=>1000,
-	63827=>1000,63828=>1000,63829=>1000,63830=>1000,63831=>1000,63832=>1000,63833=>1000,63834=>1000,63835=>1000,63836=>1000,63837=>1000,63838=>1000,63839=>1000,63840=>1000,63841=>1000,63842=>1000,
-	63843=>1000,63844=>1000,63845=>1000,63846=>1000,63847=>1000,63848=>1000,63849=>1000,63850=>1000,63851=>1000,63852=>1000,63853=>1000,63854=>1000,63855=>1000,63856=>1000,63857=>1000,63858=>1000,
-	63859=>1000,63860=>1000,63861=>1000,63862=>1000,63863=>1000,63864=>1000,63865=>1000,63866=>1000,63867=>1000,63868=>1000,63869=>1000,63870=>1000,63871=>1000,63872=>1000,63873=>1000,63874=>1000,
-	63875=>1000,63876=>1000,63877=>1000,63878=>1000,63879=>1000,63880=>1000,63881=>1000,63882=>1000,63883=>1000,63884=>1000,63885=>1000,63886=>1000,63887=>1000,63888=>1000,63889=>1000,63890=>1000,
-	63891=>1000,63892=>1000,63893=>1000,63894=>1000,63895=>1000,63896=>1000,63897=>1000,63898=>1000,63899=>1000,63900=>1000,63901=>1000,63902=>1000,63903=>1000,63904=>1000,63905=>1000,63906=>1000,
-	63907=>1000,63908=>1000,63909=>1000,63910=>1000,63911=>1000,63912=>1000,63913=>1000,63914=>1000,63915=>1000,63916=>1000,63917=>1000,63918=>1000,63919=>1000,63920=>1000,63921=>1000,63922=>1000,
-	63923=>1000,63924=>1000,63925=>1000,63926=>1000,63927=>1000,63928=>1000,63929=>1000,63930=>1000,63931=>1000,63932=>1000,63933=>1000,63934=>1000,63935=>1000,63936=>1000,63937=>1000,63938=>1000,
-	63939=>1000,63940=>1000,63941=>1000,63942=>1000,63943=>1000,63944=>1000,63945=>1000,63946=>1000,63947=>1000,63948=>1000,63949=>1000,63950=>1000,63951=>1000,63952=>1000,63953=>1000,63954=>1000,
-	63955=>1000,63956=>1000,63957=>1000,63958=>1000,63959=>1000,63960=>1000,63961=>1000,63962=>1000,63963=>1000,63964=>1000,63965=>1000,63966=>1000,63967=>1000,63968=>1000,63969=>1000,63970=>1000,
-	63971=>1000,63972=>1000,63973=>1000,63974=>1000,63975=>1000,63976=>1000,63977=>1000,63978=>1000,63979=>1000,63980=>1000,63981=>1000,63982=>1000,63983=>1000,63984=>1000,63985=>1000,63986=>1000,
-	63987=>1000,63988=>1000,63989=>1000,63990=>1000,63991=>1000,63992=>1000,63993=>1000,63994=>1000,63995=>1000,63996=>1000,63997=>1000,63998=>1000,63999=>1000,64000=>1000,64001=>1000,64002=>1000,
-	64003=>1000,64004=>1000,64005=>1000,64006=>1000,64007=>1000,64008=>1000,64009=>1000,64010=>1000,64011=>1000,64012=>1000,64013=>1000,64014=>1000,64015=>1000,64016=>1000,64017=>1000,64018=>1000,
-	64019=>1000,64020=>1000,64021=>1000,64022=>1000,64023=>1000,64024=>1000,64025=>1000,64026=>1000,64027=>1000,64028=>1000,64029=>1000,64030=>1000,64031=>1000,64032=>1000,64033=>1000,64034=>1000,
-	64035=>1000,64036=>1000,64037=>1000,64038=>1000,64039=>1000,64040=>1000,64041=>1000,64042=>1000,64043=>1000,64044=>1000,64045=>1000,64256=>537,64257=>500,64258=>500,64259=>778,64260=>750,
-	64261=>532,64262=>758,64275=>784,64276=>784,64277=>784,64278=>784,64279=>893,64286=>333,64287=>590,64288=>550,64289=>709,64290=>649,64291=>730,64292=>656,64293=>605,64294=>730,
-	64295=>633,64296=>794,64297=>584,64298=>700,64299=>700,64300=>700,64301=>700,64302=>577,64303=>577,64304=>577,64305=>563,64306=>411,64307=>512,64308=>594,64309=>316,64310=>326,
-	64312=>594,64313=>316,64314=>507,64315=>527,64316=>484,64318=>594,64320=>338,64321=>604,64323=>567,64324=>569,64326=>514,64327=>583,64328=>507,64329=>700,64330=>633,64331=>316,
-	64332=>563,64333=>527,64334=>569,64335=>577,64336=>243,64337=>273,64338=>771,64339=>788,64340=>276,64341=>243,64342=>771,64343=>788,64344=>276,64345=>243,64346=>771,64347=>788,
-	64348=>276,64349=>243,64350=>771,64351=>788,64352=>276,64353=>243,64354=>771,64355=>788,64356=>276,64357=>243,64358=>771,64359=>788,64360=>276,64361=>243,64362=>957,64363=>903,
-	64364=>466,64365=>480,64366=>957,64367=>903,64368=>466,64369=>480,64370=>544,64371=>658,64372=>646,64373=>637,64374=>544,64375=>658,64376=>646,64377=>637,64378=>544,64379=>658,
-	64380=>646,64381=>637,64382=>544,64383=>658,64384=>646,64385=>637,64386=>430,64387=>458,64388=>430,64389=>458,64390=>430,64391=>458,64392=>430,64393=>458,64394=>421,64395=>436,
-	64396=>421,64397=>436,64398=>828,64399=>942,64400=>432,64401=>549,64402=>828,64403=>942,64404=>432,64405=>549,64406=>828,64407=>942,64408=>432,64409=>549,64410=>828,64411=>942,
-	64412=>432,64413=>549,64414=>692,64415=>723,64416=>692,64417=>723,64418=>276,64419=>243,64420=>514,64421=>477,64422=>514,64423=>509,64424=>273,64425=>427,64426=>706,64427=>706,
-	64428=>686,64429=>686,64430=>550,64431=>461,64432=>550,64433=>461,64467=>757,64468=>733,64469=>432,64470=>549,64471=>470,64472=>466,64473=>470,64474=>466,64475=>470,64476=>466,
-	64477=>470,64478=>470,64479=>466,64480=>470,64481=>466,64482=>470,64483=>466,64484=>781,64485=>933,64486=>276,64487=>243,64488=>276,64489=>243,64490=>547,64491=>517,64492=>783,
-	64493=>753,64494=>740,64495=>710,64496=>740,64497=>710,64498=>740,64499=>710,64500=>740,64501=>710,64502=>1207,64503=>1177,64504=>517,64505=>1067,64506=>1037,64507=>517,64508=>731,
-	64509=>793,64510=>276,64511=>243,64512=>932,64513=>932,64514=>914,64515=>1067,64516=>1077,64517=>935,64518=>935,64519=>935,64520=>917,64521=>1070,64522=>1080,64523=>932,64524=>932,
-	64525=>932,64526=>914,64527=>1067,64528=>1077,64529=>932,64530=>914,64531=>1067,64532=>1077,64533=>1305,64534=>1287,64535=>1305,64536=>1287,64537=>1305,64538=>1305,64539=>1287,64540=>1429,
-	64541=>1429,64542=>1429,64543=>1411,64544=>1476,64545=>1458,64546=>1476,64547=>1476,64548=>1476,64549=>1458,64550=>1392,64551=>1374,64552=>1374,64553=>1245,64554=>1227,64555=>1245,64556=>1227,
-	64557=>1125,64558=>1125,64559=>1125,64560=>1107,64561=>1260,64562=>1270,64563=>1125,64564=>1107,64565=>1260,64566=>1270,64567=>706,64568=>1091,64569=>1091,64570=>1091,64571=>1106,64572=>1073,
-	64573=>1226,64574=>1236,64575=>932,64576=>932,64577=>932,64578=>914,64579=>1067,64580=>1077,64581=>1140,64582=>1140,64583=>1140,64584=>1122,64585=>1275,64586=>1285,64587=>932,64588=>932,
-	64589=>932,64590=>914,64591=>1067,64592=>1077,64593=>1345,64594=>1327,64595=>1480,64596=>1490,64597=>932,64598=>932,64599=>932,64600=>914,64601=>1067,64602=>1077,64603=>430,64604=>421,
-	64605=>731,64606=>296,64607=>300,64608=>300,64609=>300,64610=>300,64611=>300,64612=>680,64613=>680,64614=>884,64615=>967,64616=>1037,64617=>1047,64618=>680,64619=>680,64620=>884,
-	64621=>967,64622=>1037,64623=>1047,64624=>680,64625=>680,64626=>884,64627=>967,64628=>1037,64629=>1047,64630=>680,64631=>680,64632=>884,64633=>967,64634=>1037,64635=>1047,64636=>1274,
-	64637=>1284,64638=>1274,64639=>1284,64640=>821,64641=>1221,64642=>1188,64643=>1341,64644=>1351,64645=>884,64646=>1037,64647=>1047,64648=>806,64649=>1173,64650=>680,64651=>680,64652=>884,
-	64653=>967,64654=>1037,64655=>1047,64656=>793,64657=>680,64658=>680,64659=>884,64660=>967,64661=>1037,64662=>1047,64663=>911,64664=>911,64665=>911,64666=>806,64667=>679,64668=>911,
-	64669=>911,64670=>911,64671=>806,64672=>679,64673=>911,64674=>911,64675=>911,64676=>806,64677=>679,64678=>806,64679=>1284,64680=>1179,64681=>1284,64682=>1179,64683=>1284,64684=>1179,
-	64685=>1408,64686=>1408,64687=>1408,64688=>1303,64689=>1455,64690=>1455,64691=>1350,64692=>1455,64693=>1455,64694=>1455,64695=>1350,64696=>1371,64697=>1266,64698=>1224,64699=>1119,64700=>1224,
-	64701=>1119,64702=>1104,64703=>1104,64704=>1104,64705=>999,64706=>1104,64707=>999,64708=>1070,64709=>1070,64710=>1070,64711=>676,64712=>965,64713=>911,64714=>911,64715=>911,64716=>806,
-	64717=>679,64718=>1119,64719=>1119,64720=>1119,64721=>1014,64722=>911,64723=>911,64724=>911,64725=>806,64726=>679,64727=>1324,64728=>1219,64729=>686,64730=>911,64731=>911,64732=>911,
-	64733=>806,64734=>679,64735=>776,64736=>649,64737=>776,64738=>649,64739=>776,64740=>649,64741=>776,64742=>649,64743=>1303,64744=>1176,64745=>1303,64746=>1176,64747=>793,64748=>1082,
-	64749=>776,64750=>776,64751=>649,64752=>776,64753=>649,64754=>306,64755=>302,64756=>298,64757=>1527,64758=>1537,64759=>1380,64760=>1390,64761=>1380,64762=>1390,64763=>1564,64764=>1574,
-	64765=>1564,64766=>1574,64767=>1440,64768=>1450,64769=>1440,64770=>1450,64771=>1440,64772=>1450,64773=>1611,64774=>1621,64775=>1611,64776=>1621,64777=>1429,64778=>1429,64779=>1429,64780=>1411,
-	64781=>1207,64782=>1207,64783=>1254,64784=>1254,64785=>1527,64786=>1537,64787=>1348,64788=>1358,64789=>1348,64790=>1358,64791=>1564,64792=>1574,64793=>1564,64794=>1574,64795=>1431,64796=>1441,
-	64797=>1431,64798=>1441,64799=>1431,64800=>1441,64801=>1611,64802=>1621,64803=>1611,64804=>1621,64805=>1429,64806=>1429,64807=>1429,64808=>1411,64809=>1207,64810=>1207,64811=>1254,64812=>1254,
-	64813=>1408,64814=>1408,64815=>1408,64816=>1303,64817=>1176,64818=>1176,64819=>1266,64820=>1408,64821=>1408,64822=>1408,64823=>1408,64824=>1408,64825=>1408,64826=>1266,64827=>1266,64828=>273,
-	64829=>243,64830=>600,64831=>600,64848=>1444,64849=>1541,64850=>1549,64851=>1444,64852=>1444,64853=>1444,64854=>1444,64855=>1444,64856=>1830,64857=>1817,64858=>1975,64859=>1964,64860=>2046,
-	64861=>2046,64862=>2202,64863=>1962,64864=>1941,64865=>1941,64866=>1944,64867=>1836,64868=>2114,64869=>2093,64870=>1991,64871=>2049,64872=>1941,64873=>2212,64874=>1962,64875=>1941,64876=>1944,
-	64877=>1836,64878=>2249,64879=>2096,64880=>1988,64881=>1925,64882=>1904,64883=>1799,64884=>2070,64885=>1833,64886=>1729,64887=>1652,64888=>1881,64889=>1729,64890=>1892,64891=>1881,64892=>1759,
-	64893=>1637,64894=>1670,64895=>1654,64896=>1522,64897=>1686,64898=>1675,64899=>1549,64900=>1541,64901=>1522,64902=>1444,64903=>1436,64904=>1444,64905=>1757,64906=>1652,64907=>1975,64908=>1757,
-	64909=>1652,64910=>1757,64911=>1652,64914=>1757,64915=>1857,64916=>1752,64917=>1444,64918=>1675,64919=>1522,64920=>1444,64921=>1675,64922=>1581,64923=>1570,64924=>1417,64925=>1362,64926=>1686,
-	64927=>1686,64928=>1675,64929=>1686,64930=>1675,64931=>1581,64932=>1570,64933=>1975,64934=>2069,64935=>1964,64936=>2202,64937=>2259,64938=>2212,64939=>2259,64940=>1686,64941=>1581,64942=>1686,
-	64943=>1686,64944=>1581,64945=>1870,64946=>1817,64947=>1686,64948=>1637,64949=>1444,64950=>1892,64951=>1886,64952=>1549,64953=>1975,64954=>1444,64955=>1723,64956=>1522,64957=>1541,64958=>2080,
-	64959=>2080,64960=>1975,64961=>1817,64962=>1686,64963=>1499,64964=>1757,64965=>1883,64966=>2212,64967=>1686,65008=>1523,65009=>1172,65010=>1159,65011=>1356,65012=>2111,65013=>2258,65014=>2130,
-	65015=>1552,65016=>2046,65017=>1856,65018=>1930,65019=>1070,65056=>450,65057=>450,65058=>450,65059=>450,65072=>1000,65073=>1000,65074=>1000,65075=>1000,65076=>1000,65077=>1000,65078=>1000,
-	65079=>1000,65080=>1000,65081=>1000,65082=>1000,65083=>1000,65084=>1000,65085=>1000,65086=>1000,65087=>1000,65088=>1000,65089=>1000,65090=>1000,65091=>1000,65092=>1000,65097=>1000,65098=>1000,
-	65099=>1000,65100=>1000,65101=>1000,65102=>1000,65103=>1000,65104=>167,65105=>250,65106=>167,65108=>167,65109=>167,65110=>334,65111=>167,65112=>600,65113=>200,65114=>200,65115=>200,
-	65116=>200,65117=>200,65118=>200,65119=>334,65120=>400,65121=>233,65122=>350,65123=>200,65124=>350,65125=>350,65126=>350,65128=>167,65129=>334,65130=>533,65131=>609,65136=>300,
-	65137=>298,65138=>296,65140=>298,65142=>300,65143=>298,65144=>300,65145=>302,65146=>298,65147=>296,65148=>306,65149=>306,65150=>154,65151=>154,65152=>529,65153=>243,65154=>273,
-	65155=>243,65156=>273,65157=>470,65158=>466,65159=>243,65160=>273,65161=>731,65162=>793,65163=>276,65164=>243,65165=>243,65166=>273,65167=>771,65168=>788,65169=>276,65170=>243,
-	65171=>514,65172=>477,65173=>771,65174=>788,65175=>276,65176=>243,65177=>771,65178=>788,65179=>276,65180=>243,65181=>544,65182=>658,65183=>646,65184=>637,65185=>544,65186=>658,
-	65187=>646,65188=>637,65189=>544,65190=>658,65191=>646,65192=>637,65193=>430,65194=>458,65195=>430,65196=>458,65197=>421,65198=>436,65199=>421,65200=>436,65201=>1194,65202=>1194,
-	65203=>770,65204=>770,65205=>1194,65206=>1194,65207=>770,65208=>770,65209=>1291,65210=>1291,65211=>817,65212=>817,65213=>1291,65214=>1291,65215=>817,65216=>817,65217=>843,65218=>843,
-	65219=>733,65220=>733,65221=>843,65222=>843,65223=>733,65224=>733,65225=>594,65226=>556,65227=>586,65228=>554,65229=>594,65230=>556,65231=>586,65232=>554,65233=>957,65234=>903,
-	65235=>466,65236=>480,65237=>800,65238=>823,65239=>466,65240=>480,65241=>757,65242=>733,65243=>432,65244=>549,65245=>662,65246=>673,65247=>273,65248=>243,65249=>589,65250=>640,
-	65251=>481,65252=>532,65253=>692,65254=>723,65255=>276,65256=>243,65257=>514,65258=>477,65259=>686,65260=>405,65261=>470,65262=>466,65263=>731,65264=>793,65265=>731,65266=>803,
-	65267=>276,65268=>243,65269=>551,65270=>603,65271=>551,65272=>603,65273=>551,65274=>603,65275=>551,65276=>603,65281=>1000,65282=>1000,65283=>1000,65284=>1000,65285=>1000,65286=>1000,
-	65287=>1000,65288=>1000,65289=>1000,65290=>1000,65291=>1000,65292=>1000,65293=>1000,65294=>1000,65295=>1000,65296=>1000,65297=>1000,65298=>1000,65299=>1000,65300=>1000,65301=>1000,65302=>1000,
-	65303=>1000,65304=>1000,65305=>1000,65306=>1000,65307=>1000,65308=>1000,65309=>1000,65310=>1000,65311=>1000,65312=>1000,65313=>1000,65314=>1000,65315=>1000,65316=>1000,65317=>1000,65318=>1000,
-	65319=>1000,65320=>1000,65321=>1000,65322=>1000,65323=>1000,65324=>1000,65325=>1000,65326=>1000,65327=>1000,65328=>1000,65329=>1000,65330=>1000,65331=>1000,65332=>1000,65333=>1000,65334=>1000,
-	65335=>1000,65336=>1000,65337=>1000,65338=>1000,65339=>1000,65340=>1000,65341=>1000,65342=>1000,65343=>1000,65344=>1000,65345=>1000,65346=>1000,65347=>1000,65348=>1000,65349=>1000,65350=>1000,
-	65351=>1000,65352=>1000,65353=>1000,65354=>1000,65355=>1000,65356=>1000,65357=>1000,65358=>1000,65359=>1000,65360=>1000,65361=>1000,65362=>1000,65363=>1000,65364=>1000,65365=>1000,65366=>1000,
-	65367=>1000,65368=>1000,65369=>1000,65370=>1000,65371=>1000,65372=>1000,65373=>1000,65374=>1000,65377=>500,65378=>500,65379=>500,65380=>500,65381=>500,65382=>500,65383=>500,65384=>500,
-	65385=>500,65386=>500,65387=>500,65388=>500,65389=>500,65390=>500,65391=>500,65392=>500,65393=>500,65394=>500,65395=>500,65396=>500,65397=>500,65398=>500,65399=>500,65400=>500,
-	65401=>500,65402=>500,65403=>500,65404=>500,65405=>500,65406=>500,65407=>500,65408=>500,65409=>500,65410=>500,65411=>500,65412=>500,65413=>500,65414=>500,65415=>500,65416=>500,
-	65417=>500,65418=>500,65419=>500,65420=>500,65421=>500,65422=>500,65423=>500,65424=>500,65425=>500,65426=>500,65427=>500,65428=>500,65429=>500,65430=>500,65431=>500,65432=>500,
-	65433=>500,65434=>500,65435=>500,65436=>500,65437=>500,65438=>500,65439=>500,65440=>500,65441=>500,65442=>500,65443=>500,65444=>500,65445=>500,65446=>500,65447=>500,65448=>500,
-	65449=>500,65450=>500,65451=>500,65452=>500,65453=>500,65454=>500,65455=>500,65456=>500,65457=>500,65458=>500,65459=>500,65460=>500,65461=>500,65462=>500,65463=>500,65464=>500,
-	65465=>500,65466=>500,65467=>500,65468=>500,65469=>500,65470=>500,65474=>500,65475=>500,65476=>500,65477=>500,65478=>500,65479=>500,65482=>500,65483=>500,65484=>500,65485=>500,
-	65486=>500,65487=>500,65490=>500,65491=>500,65492=>500,65493=>500,65494=>500,65495=>500,65498=>500,65499=>500,65500=>500,65504=>1000,65505=>1000,65506=>1000,65507=>1000,65508=>1000,
-	65509=>1000,65510=>1000,65512=>500,65513=>500,65514=>500,65515=>500,65516=>500,65517=>500,65518=>500,65532=>1000,65533=>1000,19968=>1000,19969=>1000,19970=>1000,19971=>1000,19972=>1000,
-	19973=>1000,19974=>1000,19975=>1000,19976=>1000,19977=>1000,19978=>1000,19979=>1000,19980=>1000,19981=>1000,19982=>1000,19983=>1000,19984=>1000,19985=>1000,19986=>1000,19987=>1000,19988=>1000,
-	19989=>1000,19990=>1000,19991=>1000,19992=>1000,19993=>1000,19994=>1000,19995=>1000,19996=>1000,19997=>1000,19998=>1000,19999=>1000,20000=>1000,20001=>1000,20002=>1000,20003=>1000,20004=>1000,
-	20005=>1000,20006=>1000,20007=>1000,20008=>1000,20009=>1000,20010=>1000,20011=>1000,20012=>1000,20013=>1000,20014=>1000,20015=>1000,20016=>1000,20017=>1000,20018=>1000,20019=>1000,20020=>1000,
-	20021=>1000,20022=>1000,20023=>1000,20024=>1000,20025=>1000,20026=>1000,20027=>1000,20028=>1000,20029=>1000,20030=>1000,20031=>1000,20032=>1000,20033=>1000,20034=>1000,20035=>1000,20036=>1000,
-	20037=>1000,20038=>1000,20039=>1000,20040=>1000,20041=>1000,20042=>1000,20043=>1000,20044=>1000,20045=>1000,20046=>1000,20047=>1000,20048=>1000,20049=>1000,20050=>1000,20051=>1000,20052=>1000,
-	20053=>1000,20054=>1000,20055=>1000,20056=>1000,20057=>1000,20058=>1000,20059=>1000,20060=>1000,20061=>1000,20062=>1000,20063=>1000,20064=>1000,20065=>1000,20066=>1000,20067=>1000,20068=>1000,
-	20069=>1000,20070=>1000,20071=>1000,20072=>1000,20073=>1000,20074=>1000,20075=>1000,20076=>1000,20077=>1000,20078=>1000,20079=>1000,20080=>1000,20081=>1000,20082=>1000,20083=>1000,20084=>1000,
-	20085=>1000,20086=>1000,20087=>1000,20088=>1000,20089=>1000,20090=>1000,20091=>1000,20092=>1000,20093=>1000,20094=>1000,20095=>1000,20096=>1000,20097=>1000,20098=>1000,20099=>1000,20100=>1000,
-	20101=>1000,20102=>1000,20103=>1000,20104=>1000,20105=>1000,20106=>1000,20107=>1000,20108=>1000,20109=>1000,20110=>1000,20111=>1000,20112=>1000,20113=>1000,20114=>1000,20115=>1000,20116=>1000,
-	20117=>1000,20118=>1000,20119=>1000,20120=>1000,20121=>1000,20122=>1000,20123=>1000,20124=>1000,20125=>1000,20126=>1000,20127=>1000,20128=>1000,20129=>1000,20130=>1000,20131=>1000,20132=>1000,
-	20133=>1000,20134=>1000,20135=>1000,20136=>1000,20137=>1000,20138=>1000,20139=>1000,20140=>1000,20141=>1000,20142=>1000,20143=>1000,20144=>1000,20145=>1000,20146=>1000,20147=>1000,20148=>1000,
-	20149=>1000,20150=>1000,20151=>1000,20152=>1000,20153=>1000,20154=>1000,20155=>1000,20156=>1000,20157=>1000,20158=>1000,20159=>1000,20160=>1000,20161=>1000,20162=>1000,20163=>1000,20164=>1000,
-	20165=>1000,20166=>1000,20167=>1000,20168=>1000,20169=>1000,20170=>1000,20171=>1000,20172=>1000,20173=>1000,20174=>1000,20175=>1000,20176=>1000,20177=>1000,20178=>1000,20179=>1000,20180=>1000,
-	20181=>1000,20182=>1000,20183=>1000,20184=>1000,20185=>1000,20186=>1000,20187=>1000,20188=>1000,20189=>1000,20190=>1000,20191=>1000,20192=>1000,20193=>1000,20194=>1000,20195=>1000,20196=>1000,
-	20197=>1000,20198=>1000,20199=>1000,20200=>1000,20201=>1000,20202=>1000,20203=>1000,20204=>1000,20205=>1000,20206=>1000,20207=>1000,20208=>1000,20209=>1000,20210=>1000,20211=>1000,20212=>1000,
-	20213=>1000,20214=>1000,20215=>1000,20216=>1000,20217=>1000,20218=>1000,20219=>1000,20220=>1000,20221=>1000,20222=>1000,20223=>1000,20224=>1000,20225=>1000,20226=>1000,20227=>1000,20228=>1000,
-	20229=>1000,20230=>1000,20231=>1000,20232=>1000,20233=>1000,20234=>1000,20235=>1000,20236=>1000,20237=>1000,20238=>1000,20239=>1000,20240=>1000,20241=>1000,20242=>1000,20243=>1000,20244=>1000,
-	20245=>1000,20246=>1000,20247=>1000,20248=>1000,20249=>1000,20250=>1000,20251=>1000,20252=>1000,20253=>1000,20254=>1000,20255=>1000,20256=>1000,20257=>1000,20258=>1000,20259=>1000,20260=>1000,
-	20261=>1000,20262=>1000,20263=>1000,20264=>1000,20265=>1000,20266=>1000,20267=>1000,20268=>1000,20269=>1000,20270=>1000,20271=>1000,20272=>1000,20273=>1000,20274=>1000,20275=>1000,20276=>1000,
-	20277=>1000,20278=>1000,20279=>1000,20280=>1000,20281=>1000,20282=>1000,20283=>1000,20284=>1000,20285=>1000,20286=>1000,20287=>1000,20288=>1000,20289=>1000,20290=>1000,20291=>1000,20292=>1000,
-	20293=>1000,20294=>1000,20295=>1000,20296=>1000,20297=>1000,20298=>1000,20299=>1000,20300=>1000,20301=>1000,20302=>1000,20303=>1000,20304=>1000,20305=>1000,20306=>1000,20307=>1000,20308=>1000,
-	20309=>1000,20310=>1000,20311=>1000,20312=>1000,20313=>1000,20314=>1000,20315=>1000,20316=>1000,20317=>1000,20318=>1000,20319=>1000,20320=>1000,20321=>1000,20322=>1000,20323=>1000,20324=>1000,
-	20325=>1000,20326=>1000,20327=>1000,20328=>1000,20329=>1000,20330=>1000,20331=>1000,20332=>1000,20333=>1000,20334=>1000,20335=>1000,20336=>1000,20337=>1000,20338=>1000,20339=>1000,20340=>1000,
-	20341=>1000,20342=>1000,20343=>1000,20344=>1000,20345=>1000,20346=>1000,20347=>1000,20348=>1000,20349=>1000,20350=>1000,20351=>1000,20352=>1000,20353=>1000,20354=>1000,20355=>1000,20356=>1000,
-	20357=>1000,20358=>1000,20359=>1000,20360=>1000,20361=>1000,20362=>1000,20363=>1000,20364=>1000,20365=>1000,20366=>1000,20367=>1000,20368=>1000,20369=>1000,20370=>1000,20371=>1000,20372=>1000,
-	20373=>1000,20374=>1000,20375=>1000,20376=>1000,20377=>1000,20378=>1000,20379=>1000,20380=>1000,20381=>1000,20382=>1000,20383=>1000,20384=>1000,20385=>1000,20386=>1000,20387=>1000,20388=>1000,
-	20389=>1000,20390=>1000,20391=>1000,20392=>1000,20393=>1000,20394=>1000,20395=>1000,20396=>1000,20397=>1000,20398=>1000,20399=>1000,20400=>1000,20401=>1000,20402=>1000,20403=>1000,20404=>1000,
-	20405=>1000,20406=>1000,20407=>1000,20408=>1000,20409=>1000,20410=>1000,20411=>1000,20412=>1000,20413=>1000,20414=>1000,20415=>1000,20416=>1000,20417=>1000,20418=>1000,20419=>1000,20420=>1000,
-	20421=>1000,20422=>1000,20423=>1000,20424=>1000,20425=>1000,20426=>1000,20427=>1000,20428=>1000,20429=>1000,20430=>1000,20431=>1000,20432=>1000,20433=>1000,20434=>1000,20435=>1000,20436=>1000,
-	20437=>1000,20438=>1000,20439=>1000,20440=>1000,20441=>1000,20442=>1000,20443=>1000,20444=>1000,20445=>1000,20446=>1000,20447=>1000,20448=>1000,20449=>1000,20450=>1000,20451=>1000,20452=>1000,
-	20453=>1000,20454=>1000,20455=>1000,20456=>1000,20457=>1000,20458=>1000,20459=>1000,20460=>1000,20461=>1000,20462=>1000,20463=>1000,20464=>1000,20465=>1000,20466=>1000,20467=>1000,20468=>1000,
-	20469=>1000,20470=>1000,20471=>1000,20472=>1000,20473=>1000,20474=>1000,20475=>1000,20476=>1000,20477=>1000,20478=>1000,20479=>1000,20480=>1000,20481=>1000,20482=>1000,20483=>1000,20484=>1000,
-	20485=>1000,20486=>1000,20487=>1000,20488=>1000,20489=>1000,20490=>1000,20491=>1000,20492=>1000,20493=>1000,20494=>1000,20495=>1000,20496=>1000,20497=>1000,20498=>1000,20499=>1000,20500=>1000,
-	20501=>1000,20502=>1000,20503=>1000,20504=>1000,20505=>1000,20506=>1000,20507=>1000,20508=>1000,20509=>1000,20510=>1000,20511=>1000,20512=>1000,20513=>1000,20514=>1000,20515=>1000,20516=>1000,
-	20517=>1000,20518=>1000,20519=>1000,20520=>1000,20521=>1000,20522=>1000,20523=>1000,20524=>1000,20525=>1000,20526=>1000,20527=>1000,20528=>1000,20529=>1000,20530=>1000,20531=>1000,20532=>1000,
-	20533=>1000,20534=>1000,20535=>1000,20536=>1000,20537=>1000,20538=>1000,20539=>1000,20540=>1000,20541=>1000,20542=>1000,20543=>1000,20544=>1000,20545=>1000,20546=>1000,20547=>1000,20548=>1000,
-	20549=>1000,20550=>1000,20551=>1000,20552=>1000,20553=>1000,20554=>1000,20555=>1000,20556=>1000,20557=>1000,20558=>1000,20559=>1000,20560=>1000,20561=>1000,20562=>1000,20563=>1000,20564=>1000,
-	20565=>1000,20566=>1000,20567=>1000,20568=>1000,20569=>1000,20570=>1000,20571=>1000,20572=>1000,20573=>1000,20574=>1000,20575=>1000,20576=>1000,20577=>1000,20578=>1000,20579=>1000,20580=>1000,
-	20581=>1000,20582=>1000,20583=>1000,20584=>1000,20585=>1000,20586=>1000,20587=>1000,20588=>1000,20589=>1000,20590=>1000,20591=>1000,20592=>1000,20593=>1000,20594=>1000,20595=>1000,20596=>1000,
-	20597=>1000,20598=>1000,20599=>1000,20600=>1000,20601=>1000,20602=>1000,20603=>1000,20604=>1000,20605=>1000,20606=>1000,20607=>1000,20608=>1000,20609=>1000,20610=>1000,20611=>1000,20612=>1000,
-	20613=>1000,20614=>1000,20615=>1000,20616=>1000,20617=>1000,20618=>1000,20619=>1000,20620=>1000,20621=>1000,20622=>1000,20623=>1000,20624=>1000,20625=>1000,20626=>1000,20627=>1000,20628=>1000,
-	20629=>1000,20630=>1000,20631=>1000,20632=>1000,20633=>1000,20634=>1000,20635=>1000,20636=>1000,20637=>1000,20638=>1000,20639=>1000,20640=>1000,20641=>1000,20642=>1000,20643=>1000,20644=>1000,
-	20645=>1000,20646=>1000,20647=>1000,20648=>1000,20649=>1000,20650=>1000,20651=>1000,20652=>1000,20653=>1000,20654=>1000,20655=>1000,20656=>1000,20657=>1000,20658=>1000,20659=>1000,20660=>1000,
-	20661=>1000,20662=>1000,20663=>1000,20664=>1000,20665=>1000,20666=>1000,20667=>1000,20668=>1000,20669=>1000,20670=>1000,20671=>1000,20672=>1000,20673=>1000,20674=>1000,20675=>1000,20676=>1000,
-	20677=>1000,20678=>1000,20679=>1000,20680=>1000,20681=>1000,20682=>1000,20683=>1000,20684=>1000,20685=>1000,20686=>1000,20687=>1000,20688=>1000,20689=>1000,20690=>1000,20691=>1000,20692=>1000,
-	20693=>1000,20694=>1000,20695=>1000,20696=>1000,20697=>1000,20698=>1000,20699=>1000,20700=>1000,20701=>1000,20702=>1000,20703=>1000,20704=>1000,20705=>1000,20706=>1000,20707=>1000,20708=>1000,
-	20709=>1000,20710=>1000,20711=>1000,20712=>1000,20713=>1000,20714=>1000,20715=>1000,20716=>1000,20717=>1000,20718=>1000,20719=>1000,20720=>1000,20721=>1000,20722=>1000,20723=>1000,20724=>1000,
-	20725=>1000,20726=>1000,20727=>1000,20728=>1000,20729=>1000,20730=>1000,20731=>1000,20732=>1000,20733=>1000,20734=>1000,20735=>1000,20736=>1000,20737=>1000,20738=>1000,20739=>1000,20740=>1000,
-	20741=>1000,20742=>1000,20743=>1000,20744=>1000,20745=>1000,20746=>1000,20747=>1000,20748=>1000,20749=>1000,20750=>1000,20751=>1000,20752=>1000,20753=>1000,20754=>1000,20755=>1000,20756=>1000,
-	20757=>1000,20758=>1000,20759=>1000,20760=>1000,20761=>1000,20762=>1000,20763=>1000,20764=>1000,20765=>1000,20766=>1000,20767=>1000,20768=>1000,20769=>1000,20770=>1000,20771=>1000,20772=>1000,
-	20773=>1000,20774=>1000,20775=>1000,20776=>1000,20777=>1000,20778=>1000,20779=>1000,20780=>1000,20781=>1000,20782=>1000,20783=>1000,20784=>1000,20785=>1000,20786=>1000,20787=>1000,20788=>1000,
-	20789=>1000,20790=>1000,20791=>1000,20792=>1000,20793=>1000,20794=>1000,20795=>1000,20796=>1000,20797=>1000,20798=>1000,20799=>1000,20800=>1000,20801=>1000,20802=>1000,20803=>1000,20804=>1000,
-	20805=>1000,20806=>1000,20807=>1000,20808=>1000,20809=>1000,20810=>1000,20811=>1000,20812=>1000,20813=>1000,20814=>1000,20815=>1000,20816=>1000,20817=>1000,20818=>1000,20819=>1000,20820=>1000,
-	20821=>1000,20822=>1000,20823=>1000,20824=>1000,20825=>1000,20826=>1000,20827=>1000,20828=>1000,20829=>1000,20830=>1000,20831=>1000,20832=>1000,20833=>1000,20834=>1000,20835=>1000,20836=>1000,
-	20837=>1000,20838=>1000,20839=>1000,20840=>1000,20841=>1000,20842=>1000,20843=>1000,20844=>1000,20845=>1000,20846=>1000,20847=>1000,20848=>1000,20849=>1000,20850=>1000,20851=>1000,20852=>1000,
-	20853=>1000,20854=>1000,20855=>1000,20856=>1000,20857=>1000,20858=>1000,20859=>1000,20860=>1000,20861=>1000,20862=>1000,20863=>1000,20864=>1000,20865=>1000,20866=>1000,20867=>1000,20868=>1000,
-	20869=>1000,20870=>1000,20871=>1000,20872=>1000,20873=>1000,20874=>1000,20875=>1000,20876=>1000,20877=>1000,20878=>1000,20879=>1000,20880=>1000,20881=>1000,20882=>1000,20883=>1000,20884=>1000,
-	20885=>1000,20886=>1000,20887=>1000,20888=>1000,20889=>1000,20890=>1000,20891=>1000,20892=>1000,20893=>1000,20894=>1000,20895=>1000,20896=>1000,20897=>1000,20898=>1000,20899=>1000,20900=>1000,
-	20901=>1000,20902=>1000,20903=>1000,20904=>1000,20905=>1000,20906=>1000,20907=>1000,20908=>1000,20909=>1000,20910=>1000,20911=>1000,20912=>1000,20913=>1000,20914=>1000,20915=>1000,20916=>1000,
-	20917=>1000,20918=>1000,20919=>1000,20920=>1000,20921=>1000,20922=>1000,20923=>1000,20924=>1000,20925=>1000,20926=>1000,20927=>1000,20928=>1000,20929=>1000,20930=>1000,20931=>1000,20932=>1000,
-	20933=>1000,20934=>1000,20935=>1000,20936=>1000,20937=>1000,20938=>1000,20939=>1000,20940=>1000,20941=>1000,20942=>1000,20943=>1000,20944=>1000,20945=>1000,20946=>1000,20947=>1000,20948=>1000,
-	20949=>1000,20950=>1000,20951=>1000,20952=>1000,20953=>1000,20954=>1000,20955=>1000,20956=>1000,20957=>1000,20958=>1000,20959=>1000,20960=>1000,20961=>1000,20962=>1000,20963=>1000,20964=>1000,
-	20965=>1000,20966=>1000,20967=>1000,20968=>1000,20969=>1000,20970=>1000,20971=>1000,20972=>1000,20973=>1000,20974=>1000,20975=>1000,20976=>1000,20977=>1000,20978=>1000,20979=>1000,20980=>1000,
-	20981=>1000,20982=>1000,20983=>1000,20984=>1000,20985=>1000,20986=>1000,20987=>1000,20988=>1000,20989=>1000,20990=>1000,20991=>1000,20992=>1000,20993=>1000,20994=>1000,20995=>1000,20996=>1000,
-	20997=>1000,20998=>1000,20999=>1000,21000=>1000,21001=>1000,21002=>1000,21003=>1000,21004=>1000,21005=>1000,21006=>1000,21007=>1000,21008=>1000,21009=>1000,21010=>1000,21011=>1000,21012=>1000,
-	21013=>1000,21014=>1000,21015=>1000,21016=>1000,21017=>1000,21018=>1000,21019=>1000,21020=>1000,21021=>1000,21022=>1000,21023=>1000,21024=>1000,21025=>1000,21026=>1000,21027=>1000,21028=>1000,
-	21029=>1000,21030=>1000,21031=>1000,21032=>1000,21033=>1000,21034=>1000,21035=>1000,21036=>1000,21037=>1000,21038=>1000,21039=>1000,21040=>1000,21041=>1000,21042=>1000,21043=>1000,21044=>1000,
-	21045=>1000,21046=>1000,21047=>1000,21048=>1000,21049=>1000,21050=>1000,21051=>1000,21052=>1000,21053=>1000,21054=>1000,21055=>1000,21056=>1000,21057=>1000,21058=>1000,21059=>1000,21060=>1000,
-	21061=>1000,21062=>1000,21063=>1000,21064=>1000,21065=>1000,21066=>1000,21067=>1000,21068=>1000,21069=>1000,21070=>1000,21071=>1000,21072=>1000,21073=>1000,21074=>1000,21075=>1000,21076=>1000,
-	21077=>1000,21078=>1000,21079=>1000,21080=>1000,21081=>1000,21082=>1000,21083=>1000,21084=>1000,21085=>1000,21086=>1000,21087=>1000,21088=>1000,21089=>1000,21090=>1000,21091=>1000,21092=>1000,
-	21093=>1000,21094=>1000,21095=>1000,21096=>1000,21097=>1000,21098=>1000,21099=>1000,21100=>1000,21101=>1000,21102=>1000,21103=>1000,21104=>1000,21105=>1000,21106=>1000,21107=>1000,21108=>1000,
-	21109=>1000,21110=>1000,21111=>1000,21112=>1000,21113=>1000,21114=>1000,21115=>1000,21116=>1000,21117=>1000,21118=>1000,21119=>1000,21120=>1000,21121=>1000,21122=>1000,21123=>1000,21124=>1000,
-	21125=>1000,21126=>1000,21127=>1000,21128=>1000,21129=>1000,21130=>1000,21131=>1000,21132=>1000,21133=>1000,21134=>1000,21135=>1000,21136=>1000,21137=>1000,21138=>1000,21139=>1000,21140=>1000,
-	21141=>1000,21142=>1000,21143=>1000,21144=>1000,21145=>1000,21146=>1000,21147=>1000,21148=>1000,21149=>1000,21150=>1000,21151=>1000,21152=>1000,21153=>1000,21154=>1000,21155=>1000,21156=>1000,
-	21157=>1000,21158=>1000,21159=>1000,21160=>1000,21161=>1000,21162=>1000,21163=>1000,21164=>1000,21165=>1000,21166=>1000,21167=>1000,21168=>1000,21169=>1000,21170=>1000,21171=>1000,21172=>1000,
-	21173=>1000,21174=>1000,21175=>1000,21176=>1000,21177=>1000,21178=>1000,21179=>1000,21180=>1000,21181=>1000,21182=>1000,21183=>1000,21184=>1000,21185=>1000,21186=>1000,21187=>1000,21188=>1000,
-	21189=>1000,21190=>1000,21191=>1000,21192=>1000,21193=>1000,21194=>1000,21195=>1000,21196=>1000,21197=>1000,21198=>1000,21199=>1000,21200=>1000,21201=>1000,21202=>1000,21203=>1000,21204=>1000,
-	21205=>1000,21206=>1000,21207=>1000,21208=>1000,21209=>1000,21210=>1000,21211=>1000,21212=>1000,21213=>1000,21214=>1000,21215=>1000,21216=>1000,21217=>1000,21218=>1000,21219=>1000,21220=>1000,
-	21221=>1000,21222=>1000,21223=>1000,21224=>1000,21225=>1000,21226=>1000,21227=>1000,21228=>1000,21229=>1000,21230=>1000,21231=>1000,21232=>1000,21233=>1000,21234=>1000,21235=>1000,21236=>1000,
-	21237=>1000,21238=>1000,21239=>1000,21240=>1000,21241=>1000,21242=>1000,21243=>1000,21244=>1000,21245=>1000,21246=>1000,21247=>1000,21248=>1000,21249=>1000,21250=>1000,21251=>1000,21252=>1000,
-	21253=>1000,21254=>1000,21255=>1000,21256=>1000,21257=>1000,21258=>1000,21259=>1000,21260=>1000,21261=>1000,21262=>1000,21263=>1000,21264=>1000,21265=>1000,21266=>1000,21267=>1000,21268=>1000,
-	21269=>1000,21270=>1000,21271=>1000,21272=>1000,21273=>1000,21274=>1000,21275=>1000,21276=>1000,21277=>1000,21278=>1000,21279=>1000,21280=>1000,21281=>1000,21282=>1000,21283=>1000,21284=>1000,
-	21285=>1000,21286=>1000,21287=>1000,21288=>1000,21289=>1000,21290=>1000,21291=>1000,21292=>1000,21293=>994,21294=>1000,21295=>1000,21296=>1000,21297=>1000,21298=>1000,21299=>1000,21300=>1000,
-	21301=>1000,21302=>1000,21303=>1000,21304=>1000,21305=>1000,21306=>1000,21307=>1000,21308=>1000,21309=>1000,21310=>1000,21311=>1000,21312=>1000,21313=>1000,21314=>1000,21315=>1000,21316=>1000,
-	21317=>1000,21318=>1000,21319=>1000,21320=>1000,21321=>1000,21322=>1000,21323=>1000,21324=>1000,21325=>1000,21326=>1000,21327=>1000,21328=>1000,21329=>1000,21330=>1000,21331=>1000,21332=>1000,
-	21333=>1000,21334=>1000,21335=>1000,21336=>1000,21337=>1000,21338=>1000,21339=>1000,21340=>1000,21341=>1000,21342=>1000,21343=>1000,21344=>1000,21345=>1000,21346=>1000,21347=>1000,21348=>1000,
-	21349=>1000,21350=>1000,21351=>1000,21352=>1000,21353=>1000,21354=>1000,21355=>1000,21356=>1000,21357=>1000,21358=>1000,21359=>1000,21360=>1000,21361=>1000,21362=>1000,21363=>1000,21364=>1000,
-	21365=>1000,21366=>1000,21367=>1000,21368=>1000,21369=>1000,21370=>1000,21371=>1000,21372=>1000,21373=>1000,21374=>1000,21375=>1000,21376=>1000,21377=>1000,21378=>1000,21379=>1000,21380=>1000,
-	21381=>1000,21382=>1000,21383=>1000,21384=>1000,21385=>1000,21386=>1000,21387=>1000,21388=>1000,21389=>1000,21390=>1000,21391=>1000,21392=>1000,21393=>1000,21394=>1000,21395=>1000,21396=>1000,
-	21397=>1000,21398=>1000,21399=>1000,21400=>1000,21401=>1000,21402=>1000,21403=>1000,21404=>1000,21405=>1000,21406=>1000,21407=>1000,21408=>1000,21409=>1000,21410=>1000,21411=>1000,21412=>1000,
-	21413=>1000,21414=>1000,21415=>1000,21416=>1000,21417=>1000,21418=>1000,21419=>1000,21420=>1000,21421=>1000,21422=>1000,21423=>1000,21424=>1000,21425=>1000,21426=>1000,21427=>1000,21428=>1000,
-	21429=>1000,21430=>1000,21431=>1000,21432=>1000,21433=>1000,21434=>1000,21435=>1000,21436=>1000,21437=>1000,21438=>1000,21439=>1000,21440=>1000,21441=>1000,21442=>1000,21443=>1000,21444=>1000,
-	21445=>1000,21446=>1000,21447=>1000,21448=>1000,21449=>1000,21450=>1000,21451=>1000,21452=>1000,21453=>1000,21454=>1000,21455=>1000,21456=>1000,21457=>1000,21458=>1000,21459=>1000,21460=>1000,
-	21461=>1000,21462=>1000,21463=>1000,21464=>1000,21465=>1000,21466=>1000,21467=>1000,21468=>1000,21469=>1000,21470=>1000,21471=>1000,21472=>1000,21473=>1000,21474=>1000,21475=>1000,21476=>1000,
-	21477=>1000,21478=>1000,21479=>1000,21480=>1000,21481=>1000,21482=>1000,21483=>1000,21484=>1000,21485=>1000,21486=>1000,21487=>1000,21488=>1000,21489=>1000,21490=>1000,21491=>1000,21492=>1000,
-	21493=>1000,21494=>1000,21495=>1000,21496=>1000,21497=>1000,21498=>1000,21499=>1000,21500=>1000,21501=>1000,21502=>1000,21503=>1000,21504=>1000,21505=>1000,21506=>1000,21507=>1000,21508=>1000,
-	21509=>1000,21510=>1000,21511=>1000,21512=>1000,21513=>1000,21514=>1000,21515=>1000,21516=>1000,21517=>1000,21518=>1000,21519=>1000,21520=>1000,21521=>1000,21522=>1000,21523=>1000,21524=>1000,
-	21525=>1000,21526=>1000,21527=>1000,21528=>1000,21529=>1000,21530=>1000,21531=>1000,21532=>1000,21533=>1000,21534=>1000,21535=>1000,21536=>1000,21537=>1000,21538=>1000,21539=>1000,21540=>1000,
-	21541=>1000,21542=>1000,21543=>1000,21544=>1000,21545=>1000,21546=>1000,21547=>1000,21548=>1000,21549=>1000,21550=>1000,21551=>1000,21552=>1000,21553=>1000,21554=>1000,21555=>1000,21556=>1000,
-	21557=>1000,21558=>1000,21559=>1000,21560=>1000,21561=>1000,21562=>1000,21563=>1000,21564=>1000,21565=>1000,21566=>1000,21567=>1000,21568=>1000,21569=>1000,21570=>1000,21571=>1000,21572=>1000,
-	21573=>1000,21574=>1000,21575=>1000,21576=>1000,21577=>1000,21578=>1000,21579=>1000,21580=>1000,21581=>1000,21582=>1000,21583=>1000,21584=>1000,21585=>1000,21586=>1000,21587=>1000,21588=>1000,
-	21589=>1000,21590=>1000,21591=>1000,21592=>1000,21593=>1000,21594=>1000,21595=>1000,21596=>1000,21597=>1000,21598=>1000,21599=>1000,21600=>1000,21601=>1000,21602=>1000,21603=>1000,21604=>1000,
-	21605=>1000,21606=>1000,21607=>1000,21608=>1000,21609=>1000,21610=>1000,21611=>1000,21612=>1000,21613=>1000,21614=>1000,21615=>1000,21616=>1000,21617=>1000,21618=>1000,21619=>1000,21620=>1000,
-	21621=>1000,21622=>1000,21623=>1000,21624=>1000,21625=>1000,21626=>1000,21627=>1000,21628=>1000,21629=>1000,21630=>1000,21631=>1000,21632=>1000,21633=>1000,21634=>1000,21635=>1000,21636=>1000,
-	21637=>1000,21638=>1000,21639=>1000,21640=>1000,21641=>1000,21642=>1000,21643=>1000,21644=>1000,21645=>1000,21646=>1000,21647=>1000,21648=>1000,21649=>1000,21650=>1000,21651=>1000,21652=>1000,
-	21653=>1000,21654=>1000,21655=>1000,21656=>1000,21657=>1000,21658=>1000,21659=>1000,21660=>1000,21661=>1000,21662=>1000,21663=>1000,21664=>1000,21665=>1000,21666=>1000,21667=>1000,21668=>1000,
-	21669=>1000,21670=>1000,21671=>1000,21672=>1000,21673=>1000,21674=>1000,21675=>1000,21676=>1000,21677=>1000,21678=>1000,21679=>1000,21680=>1000,21681=>1000,21682=>1000,21683=>1000,21684=>1000,
-	21685=>1000,21686=>1000,21687=>1000,21688=>1000,21689=>1000,21690=>1000,21691=>1000,21692=>1000,21693=>1000,21694=>1000,21695=>1000,21696=>1000,21697=>1000,21698=>1000,21699=>1000,21700=>1000,
-	21701=>1000,21702=>1000,21703=>1000,21704=>1000,21705=>1000,21706=>1000,21707=>1000,21708=>1000,21709=>1000,21710=>1000,21711=>1000,21712=>1000,21713=>1000,21714=>1000,21715=>1000,21716=>1000,
-	21717=>1000,21718=>1000,21719=>1000,21720=>1000,21721=>1000,21722=>1000,21723=>1000,21724=>1000,21725=>1000,21726=>1000,21727=>1000,21728=>1000,21729=>1000,21730=>1000,21731=>1000,21732=>1000,
-	21733=>1000,21734=>1000,21735=>1000,21736=>1000,21737=>1000,21738=>1000,21739=>1000,21740=>1000,21741=>1000,21742=>1000,21743=>1000,21744=>1000,21745=>1000,21746=>1000,21747=>1000,21748=>1000,
-	21749=>1000,21750=>1000,21751=>1000,21752=>1000,21753=>1000,21754=>1000,21755=>1000,21756=>1000,21757=>1000,21758=>1000,21759=>1000,21760=>1000,21761=>1000,21762=>1000,21763=>1000,21764=>1000,
-	21765=>1000,21766=>1000,21767=>1000,21768=>1000,21769=>1000,21770=>1000,21771=>1000,21772=>1000,21773=>1000,21774=>1000,21775=>1000,21776=>1000,21777=>1000,21778=>1000,21779=>1000,21780=>1000,
-	21781=>1000,21782=>1000,21783=>1000,21784=>1000,21785=>1000,21786=>1000,21787=>1000,21788=>1000,21789=>1000,21790=>1000,21791=>1000,21792=>1000,21793=>1000,21794=>1000,21795=>1000,21796=>1000,
-	21797=>1000,21798=>1000,21799=>1000,21800=>1000,21801=>1000,21802=>1000,21803=>1000,21804=>1000,21805=>1000,21806=>1000,21807=>1000,21808=>1000,21809=>1000,21810=>1000,21811=>1000,21812=>1000,
-	21813=>1000,21814=>1000,21815=>1000,21816=>1000,21817=>1000,21818=>1000,21819=>1000,21820=>1000,21821=>1000,21822=>1000,21823=>1000,21824=>1000,21825=>1000,21826=>1000,21827=>1000,21828=>1000,
-	21829=>1000,21830=>1000,21831=>1000,21832=>1000,21833=>1000,21834=>1000,21835=>1000,21836=>1000,21837=>1000,21838=>1000,21839=>1000,21840=>1000,21841=>1000,21842=>1000,21843=>1000,21844=>1000,
-	21845=>1000,21846=>1000,21847=>1000,21848=>1000,21849=>1000,21850=>1000,21851=>1000,21852=>1000,21853=>1000,21854=>1000,21855=>1000,21856=>1000,21857=>1000,21858=>1000,21859=>1000,21860=>1000,
-	21861=>1000,21862=>1000,21863=>1000,21864=>1000,21865=>1000,21866=>1000,21867=>1000,21868=>1000,21869=>1000,21870=>1000,21871=>1000,21872=>1000,21873=>1000,21874=>1000,21875=>1000,21876=>1000,
-	21877=>1000,21878=>1000,21879=>1000,21880=>1000,21881=>1000,21882=>1000,21883=>1000,21884=>1000,21885=>1000,21886=>1000,21887=>1000,21888=>1000,21889=>1000,21890=>1000,21891=>1000,21892=>1000,
-	21893=>1000,21894=>1000,21895=>1000,21896=>1000,21897=>1000,21898=>1000,21899=>1000,21900=>1000,21901=>1000,21902=>1000,21903=>1000,21904=>1000,21905=>1000,21906=>1000,21907=>1000,21908=>1000,
-	21909=>1000,21910=>1000,21911=>1000,21912=>1000,21913=>1000,21914=>1000,21915=>1000,21916=>1000,21917=>1000,21918=>1000,21919=>1000,21920=>1000,21921=>1000,21922=>1000,21923=>1000,21924=>1000,
-	21925=>1000,21926=>1000,21927=>1000,21928=>1000,21929=>1000,21930=>1000,21931=>1000,21932=>1000,21933=>1000,21934=>1000,21935=>1000,21936=>1000,21937=>1000,21938=>1000,21939=>1000,21940=>1000,
-	21941=>1000,21942=>1000,21943=>1000,21944=>1000,21945=>1000,21946=>1000,21947=>1000,21948=>1000,21949=>1000,21950=>1000,21951=>1000,21952=>1000,21953=>1000,21954=>1000,21955=>1000,21956=>1000,
-	21957=>1000,21958=>1000,21959=>1000,21960=>1000,21961=>1000,21962=>1000,21963=>1000,21964=>1000,21965=>1000,21966=>1000,21967=>1000,21968=>1000,21969=>1000,21970=>1000,21971=>1000,21972=>1000,
-	21973=>1000,21974=>1000,21975=>1000,21976=>1000,21977=>1000,21978=>1000,21979=>1000,21980=>1000,21981=>1000,21982=>1000,21983=>1000,21984=>1000,21985=>1000,21986=>1000,21987=>1000,21988=>1000,
-	21989=>1000,21990=>1000,21991=>1000,21992=>1000,21993=>1000,21994=>1000,21995=>1000,21996=>1000,21997=>1000,21998=>1000,21999=>1000,22000=>1000,22001=>1000,22002=>1000,22003=>1000,22004=>1000,
-	22005=>1000,22006=>1000,22007=>1000,22008=>1000,22009=>1000,22010=>1000,22011=>1000,22012=>1000,22013=>1000,22014=>1000,22015=>1000,22016=>1000,22017=>1000,22018=>1000,22019=>1000,22020=>1000,
-	22021=>1000,22022=>1000,22023=>1000,22024=>1000,22025=>1000,22026=>1000,22027=>1000,22028=>1000,22029=>1000,22030=>1000,22031=>1000,22032=>1000,22033=>1000,22034=>1000,22035=>1000,22036=>1000,
-	22037=>1000,22038=>1000,22039=>1000,22040=>1000,22041=>1000,22042=>1000,22043=>1000,22044=>1000,22045=>1000,22046=>1000,22047=>1000,22048=>1000,22049=>1000,22050=>1000,22051=>1000,22052=>1000,
-	22053=>1000,22054=>1000,22055=>1000,22056=>1000,22057=>1000,22058=>1000,22059=>1000,22060=>1000,22061=>1000,22062=>1000,22063=>1000,22064=>1000,22065=>1000,22066=>1000,22067=>1000,22068=>1000,
-	22069=>1000,22070=>1000,22071=>1000,22072=>1000,22073=>1000,22074=>1000,22075=>1000,22076=>1000,22077=>1000,22078=>1000,22079=>1000,22080=>1000,22081=>1000,22082=>1000,22083=>1000,22084=>1000,
-	22085=>1000,22086=>1000,22087=>1000,22088=>1000,22089=>1000,22090=>1000,22091=>1000,22092=>1000,22093=>1000,22094=>1000,22095=>1000,22096=>1000,22097=>1000,22098=>1000,22099=>1000,22100=>1000,
-	22101=>1000,22102=>1000,22103=>1000,22104=>1000,22105=>1000,22106=>1000,22107=>1000,22108=>1000,22109=>1000,22110=>1000,22111=>1000,22112=>1000,22113=>1000,22114=>1000,22115=>1000,22116=>1000,
-	22117=>1000,22118=>1000,22119=>1000,22120=>1000,22121=>1000,22122=>1000,22123=>1000,22124=>1000,22125=>1000,22126=>1000,22127=>1000,22128=>1000,22129=>1000,22130=>1000,22131=>1000,22132=>1000,
-	22133=>1000,22134=>1000,22135=>1000,22136=>1000,22137=>1000,22138=>1000,22139=>1000,22140=>1000,22141=>1000,22142=>1000,22143=>1000,22144=>1000,22145=>1000,22146=>1000,22147=>1000,22148=>1000,
-	22149=>1000,22150=>1000,22151=>1000,22152=>1000,22153=>1000,22154=>1000,22155=>1000,22156=>1000,22157=>1000,22158=>1000,22159=>1000,22160=>1000,22161=>1000,22162=>1000,22163=>1000,22164=>1000,
-	22165=>1000,22166=>1000,22167=>1000,22168=>1000,22169=>1000,22170=>1000,22171=>1000,22172=>1000,22173=>1000,22174=>1000,22175=>1000,22176=>1000,22177=>1000,22178=>1000,22179=>1000,22180=>1000,
-	22181=>1000,22182=>1000,22183=>1000,22184=>1000,22185=>1000,22186=>1000,22187=>1000,22188=>1000,22189=>1000,22190=>1000,22191=>1000,22192=>1000,22193=>1000,22194=>1000,22195=>1000,22196=>1000,
-	22197=>1000,22198=>1000,22199=>1000,22200=>1000,22201=>1000,22202=>1000,22203=>1000,22204=>1000,22205=>1000,22206=>1000,22207=>1000,22208=>1000,22209=>1000,22210=>1000,22211=>1000,22212=>1000,
-	22213=>1000,22214=>1000,22215=>1000,22216=>1000,22217=>1000,22218=>1000,22219=>1000,22220=>1000,22221=>1000,22222=>1000,22223=>1000,22224=>1000,22225=>1000,22226=>1000,22227=>1000,22228=>1000,
-	22229=>1000,22230=>1000,22231=>1000,22232=>1000,22233=>1000,22234=>1000,22235=>1000,22236=>1000,22237=>1000,22238=>1000,22239=>1000,22240=>1000,22241=>1000,22242=>1000,22243=>1000,22244=>1000,
-	22245=>1000,22246=>1000,22247=>1000,22248=>1000,22249=>1000,22250=>1000,22251=>1000,22252=>1000,22253=>1000,22254=>1000,22255=>1000,22256=>1000,22257=>1000,22258=>1000,22259=>1000,22260=>1000,
-	22261=>1000,22262=>1000,22263=>1000,22264=>1000,22265=>1000,22266=>1000,22267=>1000,22268=>1000,22269=>1000,22270=>1000,22271=>1000,22272=>1000,22273=>1000,22274=>1000,22275=>1000,22276=>1000,
-	22277=>1000,22278=>1000,22279=>1000,22280=>1000,22281=>1000,22282=>1000,22283=>1000,22284=>1000,22285=>1000,22286=>1000,22287=>1000,22288=>1000,22289=>1000,22290=>1000,22291=>1000,22292=>1000,
-	22293=>1000,22294=>1000,22295=>1000,22296=>1000,22297=>1000,22298=>1000,22299=>1000,22300=>1000,22301=>1000,22302=>1000,22303=>1000,22304=>1000,22305=>1000,22306=>1000,22307=>1000,22308=>1000,
-	22309=>1000,22310=>1000,22311=>1000,22312=>1000,22313=>1000,22314=>1000,22315=>1000,22316=>1000,22317=>1000,22318=>1000,22319=>1000,22320=>1000,22321=>1000,22322=>1000,22323=>1000,22324=>1000,
-	22325=>1000,22326=>1000,22327=>1000,22328=>1000,22329=>1000,22330=>1000,22331=>1000,22332=>1000,22333=>1000,22334=>1000,22335=>1000,22336=>1000,22337=>1000,22338=>1000,22339=>1000,22340=>1000,
-	22341=>1000,22342=>1000,22343=>1000,22344=>1000,22345=>1000,22346=>1000,22347=>1000,22348=>1000,22349=>1000,22350=>1000,22351=>1000,22352=>1000,22353=>1000,22354=>1000,22355=>1000,22356=>1000,
-	22357=>1000,22358=>1000,22359=>1000,22360=>1000,22361=>1000,22362=>1000,22363=>1000,22364=>1000,22365=>1000,22366=>1000,22367=>1000,22368=>1000,22369=>1000,22370=>1000,22371=>1000,22372=>1000,
-	22373=>1000,22374=>1000,22375=>1000,22376=>1000,22377=>1000,22378=>1000,22379=>1000,22380=>1000,22381=>1000,22382=>1000,22383=>1000,22384=>1000,22385=>1000,22386=>1000,22387=>1000,22388=>1000,
-	22389=>1000,22390=>1000,22391=>1000,22392=>1000,22393=>1000,22394=>1000,22395=>1000,22396=>1000,22397=>1000,22398=>1000,22399=>1000,22400=>1000,22401=>1000,22402=>1000,22403=>1000,22404=>1000,
-	22405=>1000,22406=>1000,22407=>1000,22408=>1000,22409=>1000,22410=>1000,22411=>1000,22412=>1000,22413=>1000,22414=>1000,22415=>1000,22416=>1000,22417=>1000,22418=>1000,22419=>1000,22420=>1000,
-	22421=>1000,22422=>1000,22423=>1000,22424=>1000,22425=>1000,22426=>1000,22427=>1000,22428=>1000,22429=>1000,22430=>1000,22431=>1000,22432=>1000,22433=>1000,22434=>1000,22435=>1000,22436=>1000,
-	22437=>1000,22438=>1000,22439=>1000,22440=>1000,22441=>1000,22442=>1000,22443=>1000,22444=>1000,22445=>1000,22446=>1000,22447=>1000,22448=>1000,22449=>1000,22450=>1000,22451=>1000,22452=>1000,
-	22453=>1000,22454=>1000,22455=>1000,22456=>1000,22457=>1000,22458=>1000,22459=>1000,22460=>1000,22461=>1000,22462=>1000,22463=>1000,22464=>1000,22465=>1000,22466=>1000,22467=>1000,22468=>1000,
-	22469=>1000,22470=>1000,22471=>1000,22472=>1000,22473=>1000,22474=>1000,22475=>1000,22476=>1000,22477=>1000,22478=>1000,22479=>1000,22480=>1000,22481=>1000,22482=>1000,22483=>1000,22484=>1000,
-	22485=>1000,22486=>1000,22487=>1000,22488=>1000,22489=>1000,22490=>1000,22491=>1000,22492=>1000,22493=>1000,22494=>1000,22495=>1000,22496=>1000,22497=>1000,22498=>1000,22499=>1000,22500=>1000,
-	22501=>1000,22502=>1000,22503=>1000,22504=>1000,22505=>1000,22506=>1000,22507=>1000,22508=>1000,22509=>1000,22510=>1000,22511=>1000,22512=>1000,22513=>1000,22514=>1000,22515=>1000,22516=>1000,
-	22517=>1000,22518=>1000,22519=>1000,22520=>1000,22521=>1000,22522=>1000,22523=>1000,22524=>1000,22525=>1000,22526=>1000,22527=>1000,22528=>1000,22529=>1000,22530=>1000,22531=>1000,22532=>1000,
-	22533=>1000,22534=>1000,22535=>1000,22536=>1000,22537=>1000,22538=>1000,22539=>1000,22540=>1000,22541=>1000,22542=>1000,22543=>1000,22544=>1000,22545=>1000,22546=>1000,22547=>1000,22548=>1000,
-	22549=>1000,22550=>1000,22551=>1000,22552=>1000,22553=>1000,22554=>1000,22555=>1000,22556=>1000,22557=>1000,22558=>1000,22559=>1000,22560=>1000,22561=>1000,22562=>1000,22563=>1000,22564=>1000,
-	22565=>1000,22566=>1000,22567=>1000,22568=>1000,22569=>1000,22570=>1000,22571=>1000,22572=>1000,22573=>1000,22574=>1000,22575=>1000,22576=>1000,22577=>1000,22578=>1000,22579=>1000,22580=>1000,
-	22581=>1000,22582=>1000,22583=>1000,22584=>1000,22585=>1000,22586=>1000,22587=>1000,22588=>1000,22589=>1000,22590=>1000,22591=>1000,22592=>1000,22593=>1000,22594=>1000,22595=>1000,22596=>1000,
-	22597=>1000,22598=>1000,22599=>1000,22600=>1000,22601=>1000,22602=>1000,22603=>1000,22604=>1000,22605=>1000,22606=>1000,22607=>1000,22608=>1000,22609=>1000,22610=>1000,22611=>1000,22612=>1000,
-	22613=>1000,22614=>1000,22615=>1000,22616=>1000,22617=>1000,22618=>1000,22619=>1000,22620=>1000,22621=>1000,22622=>1000,22623=>1000,22624=>1000,22625=>1000,22626=>1000,22627=>1000,22628=>1000,
-	22629=>1000,22630=>1000,22631=>1000,22632=>1000,22633=>1000,22634=>1000,22635=>1000,22636=>1000,22637=>1000,22638=>1000,22639=>1000,22640=>1000,22641=>1000,22642=>1000,22643=>1000,22644=>1000,
-	22645=>1000,22646=>1000,22647=>1000,22648=>1000,22649=>1000,22650=>1000,22651=>1000,22652=>1000,22653=>1000,22654=>1000,22655=>1000,22656=>1000,22657=>1000,22658=>1000,22659=>1000,22660=>1000,
-	22661=>1000,22662=>1000,22663=>1000,22664=>1000,22665=>1000,22666=>1000,22667=>1000,22668=>1000,22669=>1000,22670=>1000,22671=>1000,22672=>1000,22673=>1000,22674=>1000,22675=>1000,22676=>1000,
-	22677=>1000,22678=>1000,22679=>1000,22680=>1000,22681=>1000,22682=>1000,22683=>1000,22684=>1000,22685=>1000,22686=>1000,22687=>1000,22688=>1000,22689=>1000,22690=>1000,22691=>1000,22692=>1000,
-	22693=>1000,22694=>1000,22695=>1000,22696=>1000,22697=>1000,22698=>1000,22699=>1000,22700=>1000,22701=>1000,22702=>1000,22703=>1000,22704=>1000,22705=>1000,22706=>1000,22707=>1000,22708=>1000,
-	22709=>1000,22710=>1000,22711=>1000,22712=>1000,22713=>1000,22714=>1000,22715=>1000,22716=>1000,22717=>1000,22718=>1000,22719=>1000,22720=>1000,22721=>1000,22722=>1000,22723=>1000,22724=>1000,
-	22725=>1000,22726=>1000,22727=>1000,22728=>1000,22729=>1000,22730=>1000,22731=>1000,22732=>1000,22733=>1000,22734=>1000,22735=>1000,22736=>1000,22737=>1000,22738=>1000,22739=>1000,22740=>1000,
-	22741=>1000,22742=>1000,22743=>1000,22744=>1000,22745=>1000,22746=>1000,22747=>1000,22748=>1000,22749=>1000,22750=>1000,22751=>1000,22752=>1000,22753=>1000,22754=>1000,22755=>1000,22756=>1000,
-	22757=>1000,22758=>1000,22759=>1000,22760=>1000,22761=>1000,22762=>1000,22763=>1000,22764=>1000,22765=>1000,22766=>1000,22767=>1000,22768=>1000,22769=>1000,22770=>1000,22771=>1000,22772=>1000,
-	22773=>1000,22774=>1000,22775=>1000,22776=>1000,22777=>1000,22778=>1000,22779=>1000,22780=>1000,22781=>1000,22782=>1000,22783=>1000,22784=>1000,22785=>1000,22786=>1000,22787=>1000,22788=>1000,
-	22789=>1000,22790=>1000,22791=>1000,22792=>1000,22793=>1000,22794=>1000,22795=>1000,22796=>1000,22797=>1000,22798=>1000,22799=>1000,22800=>1000,22801=>1000,22802=>1000,22803=>1000,22804=>1000,
-	22805=>1000,22806=>1000,22807=>1000,22808=>1000,22809=>1000,22810=>1000,22811=>1000,22812=>1000,22813=>1000,22814=>1000,22815=>1000,22816=>1000,22817=>1000,22818=>1000,22819=>1000,22820=>1000,
-	22821=>1000,22822=>1000,22823=>1000,22824=>1000,22825=>1000,22826=>1000,22827=>1000,22828=>1000,22829=>1000,22830=>1000,22831=>1000,22832=>1000,22833=>1000,22834=>1000,22835=>1000,22836=>1000,
-	22837=>1000,22838=>1000,22839=>1000,22840=>1000,22841=>1000,22842=>1000,22843=>1000,22844=>1000,22845=>1000,22846=>1000,22847=>1000,22848=>1000,22849=>1000,22850=>1000,22851=>1000,22852=>1000,
-	22853=>1000,22854=>1000,22855=>1000,22856=>1000,22857=>1000,22858=>1000,22859=>1000,22860=>1000,22861=>1000,22862=>1000,22863=>1000,22864=>1000,22865=>1000,22866=>1000,22867=>1000,22868=>1000,
-	22869=>1000,22870=>1000,22871=>1000,22872=>1000,22873=>1000,22874=>1000,22875=>1000,22876=>1000,22877=>1000,22878=>1000,22879=>1000,22880=>1000,22881=>1000,22882=>1000,22883=>1000,22884=>1000,
-	22885=>1000,22886=>1000,22887=>1000,22888=>1000,22889=>1000,22890=>1000,22891=>1000,22892=>1000,22893=>1000,22894=>1000,22895=>1000,22896=>1000,22897=>1000,22898=>1000,22899=>1000,22900=>1000,
-	22901=>1000,22902=>1000,22903=>1000,22904=>1000,22905=>1000,22906=>1000,22907=>1000,22908=>1000,22909=>1000,22910=>1000,22911=>1000,22912=>1000,22913=>1000,22914=>1000,22915=>1000,22916=>1000,
-	22917=>1000,22918=>1000,22919=>1000,22920=>1000,22921=>1000,22922=>1000,22923=>1000,22924=>1000,22925=>1000,22926=>1000,22927=>1000,22928=>1000,22929=>1000,22930=>1000,22931=>1000,22932=>1000,
-	22933=>1000,22934=>1000,22935=>1000,22936=>1000,22937=>1000,22938=>1000,22939=>1000,22940=>1000,22941=>1000,22942=>1000,22943=>1000,22944=>1000,22945=>1000,22946=>1000,22947=>1000,22948=>1000,
-	22949=>1000,22950=>1000,22951=>1000,22952=>1000,22953=>1000,22954=>1000,22955=>1000,22956=>1000,22957=>1000,22958=>1000,22959=>1000,22960=>1000,22961=>1000,22962=>1000,22963=>1000,22964=>1000,
-	22965=>1000,22966=>1000,22967=>1000,22968=>1000,22969=>1000,22970=>1000,22971=>1000,22972=>1000,22973=>1000,22974=>1000,22975=>1000,22976=>1000,22977=>1000,22978=>1000,22979=>1000,22980=>1000,
-	22981=>1000,22982=>1000,22983=>1000,22984=>1000,22985=>1000,22986=>1000,22987=>1000,22988=>1000,22989=>1000,22990=>1000,22991=>1000,22992=>1000,22993=>1000,22994=>1000,22995=>1000,22996=>1000,
-	22997=>1000,22998=>1000,22999=>1000,23000=>1000,23001=>1000,23002=>1000,23003=>1000,23004=>1000,23005=>1000,23006=>1000,23007=>1000,23008=>1000,23009=>1000,23010=>1000,23011=>1000,23012=>1000,
-	23013=>1000,23014=>1000,23015=>1000,23016=>1000,23017=>1000,23018=>1000,23019=>1000,23020=>1000,23021=>1000,23022=>1000,23023=>1000,23024=>1000,23025=>1000,23026=>1000,23027=>1000,23028=>1000,
-	23029=>1000,23030=>1000,23031=>1000,23032=>1000,23033=>1000,23034=>1000,23035=>1000,23036=>1000,23037=>1000,23038=>1000,23039=>1000,23040=>1000,23041=>1000,23042=>1000,23043=>1000,23044=>1000,
-	23045=>1000,23046=>1000,23047=>1000,23048=>1000,23049=>1000,23050=>1000,23051=>1000,23052=>1000,23053=>1000,23054=>1000,23055=>1000,23056=>1000,23057=>1000,23058=>1000,23059=>1000,23060=>1000,
-	23061=>1000,23062=>1000,23063=>1000,23064=>1000,23065=>1000,23066=>1000,23067=>1000,23068=>1000,23069=>1000,23070=>1000,23071=>1000,23072=>1000,23073=>1000,23074=>1000,23075=>1000,23076=>1000,
-	23077=>1000,23078=>1000,23079=>1000,23080=>1000,23081=>1000,23082=>1000,23083=>1000,23084=>1000,23085=>1000,23086=>1000,23087=>1000,23088=>1000,23089=>1000,23090=>1000,23091=>1000,23092=>1000,
-	23093=>1000,23094=>1000,23095=>1000,23096=>1000,23097=>1000,23098=>1000,23099=>1000,23100=>1000,23101=>1000,23102=>1000,23103=>1000,23104=>1000,23105=>1000,23106=>1000,23107=>1000,23108=>1000,
-	23109=>1000,23110=>1000,23111=>1000,23112=>1000,23113=>1000,23114=>1000,23115=>1000,23116=>1000,23117=>1000,23118=>1000,23119=>1000,23120=>1000,23121=>1000,23122=>1000,23123=>1000,23124=>1000,
-	23125=>1000,23126=>1000,23127=>1000,23128=>1000,23129=>1000,23130=>1000,23131=>1000,23132=>1000,23133=>1000,23134=>1000,23135=>1000,23136=>1000,23137=>1000,23138=>1000,23139=>1000,23140=>1000,
-	23141=>1000,23142=>1000,23143=>1000,23144=>1000,23145=>1000,23146=>1000,23147=>1000,23148=>1000,23149=>1000,23150=>1000,23151=>1000,23152=>1000,23153=>1000,23154=>1000,23155=>1000,23156=>1000,
-	23157=>1000,23158=>1000,23159=>1000,23160=>1000,23161=>1000,23162=>1000,23163=>1000,23164=>1000,23165=>1000,23166=>1000,23167=>1000,23168=>1000,23169=>1000,23170=>1000,23171=>1000,23172=>1000,
-	23173=>1000,23174=>1000,23175=>1000,23176=>1000,23177=>1000,23178=>1000,23179=>1000,23180=>1000,23181=>1000,23182=>1000,23183=>1000,23184=>1000,23185=>1000,23186=>1000,23187=>1000,23188=>1000,
-	23189=>1000,23190=>1000,23191=>1000,23192=>1000,23193=>1000,23194=>1000,23195=>1000,23196=>1000,23197=>1000,23198=>1000,23199=>1000,23200=>1000,23201=>1000,23202=>1000,23203=>1000,23204=>1000,
-	23205=>1000,23206=>1000,23207=>1000,23208=>1000,23209=>1000,23210=>1000,23211=>1000,23212=>1000,23213=>1000,23214=>1000,23215=>1000,23216=>1000,23217=>1000,23218=>1000,23219=>1000,23220=>1000,
-	23221=>1000,23222=>1000,23223=>1000,23224=>1000,23225=>1000,23226=>1000,23227=>1000,23228=>1000,23229=>1000,23230=>1000,23231=>1000,23232=>1000,23233=>1000,23234=>1000,23235=>1000,23236=>1000,
-	23237=>1000,23238=>1000,23239=>1000,23240=>1000,23241=>1000,23242=>1000,23243=>1000,23244=>1000,23245=>1000,23246=>1000,23247=>1000,23248=>1000,23249=>1000,23250=>1000,23251=>1000,23252=>1000,
-	23253=>1000,23254=>1000,23255=>1000,23256=>1000,23257=>1000,23258=>1000,23259=>1000,23260=>1000,23261=>1000,23262=>1000,23263=>1000,23264=>1000,23265=>1000,23266=>1000,23267=>1000,23268=>1000,
-	23269=>1000,23270=>1000,23271=>1000,23272=>1000,23273=>1000,23274=>1000,23275=>1000,23276=>1000,23277=>1000,23278=>1000,23279=>1000,23280=>1000,23281=>1000,23282=>1000,23283=>1000,23284=>1000,
-	23285=>1000,23286=>1000,23287=>1000,23288=>1000,23289=>1000,23290=>1000,23291=>1000,23292=>1000,23293=>1000,23294=>1000,23295=>1000,23296=>1000,23297=>1000,23298=>1000,23299=>1000,23300=>1000,
-	23301=>1000,23302=>1000,23303=>1000,23304=>1000,23305=>1000,23306=>1000,23307=>1000,23308=>1000,23309=>1000,23310=>1000,23311=>1000,23312=>1000,23313=>1000,23314=>1000,23315=>1000,23316=>1000,
-	23317=>1000,23318=>1000,23319=>1000,23320=>1000,23321=>1000,23322=>1000,23323=>1000,23324=>1000,23325=>1000,23326=>1000,23327=>1000,23328=>1000,23329=>1000,23330=>1000,23331=>1000,23332=>1000,
-	23333=>1000,23334=>1000,23335=>1000,23336=>1000,23337=>1000,23338=>1000,23339=>1000,23340=>1000,23341=>1000,23342=>1000,23343=>1000,23344=>1000,23345=>1000,23346=>1000,23347=>1000,23348=>1000,
-	23349=>1000,23350=>1000,23351=>1000,23352=>1000,23353=>1000,23354=>1000,23355=>1000,23356=>1000,23357=>1000,23358=>1000,23359=>1000,23360=>1000,23361=>1000,23362=>1000,23363=>1000,23364=>1000,
-	23365=>1000,23366=>1000,23367=>1000,23368=>1000,23369=>1000,23370=>1000,23371=>1000,23372=>1000,23373=>1000,23374=>1000,23375=>1000,23376=>1000,23377=>1000,23378=>1000,23379=>1000,23380=>1000,
-	23381=>1000,23382=>1000,23383=>1000,23384=>1000,23385=>1000,23386=>1000,23387=>1000,23388=>1000,23389=>1000,23390=>1000,23391=>1000,23392=>1000,23393=>1000,23394=>1000,23395=>1000,23396=>1000,
-	23397=>1000,23398=>1000,23399=>1000,23400=>1000,23401=>1000,23402=>1000,23403=>1000,23404=>1000,23405=>1000,23406=>1000,23407=>1000,23408=>1000,23409=>1000,23410=>1000,23411=>1000,23412=>1000,
-	23413=>1000,23414=>1000,23415=>1000,23416=>1000,23417=>1000,23418=>1000,23419=>1000,23420=>1000,23421=>1000,23422=>1000,23423=>1000,23424=>1000,23425=>1000,23426=>1000,23427=>1000,23428=>1000,
-	23429=>1000,23430=>1000,23431=>1000,23432=>1000,23433=>1000,23434=>1000,23435=>1000,23436=>1000,23437=>1000,23438=>1000,23439=>1000,23440=>1000,23441=>1000,23442=>1000,23443=>1000,23444=>1000,
-	23445=>1000,23446=>1000,23447=>1000,23448=>1000,23449=>1000,23450=>1000,23451=>1000,23452=>1000,23453=>1000,23454=>1000,23455=>1000,23456=>1000,23457=>1000,23458=>1000,23459=>1000,23460=>1000,
-	23461=>1000,23462=>1000,23463=>1000,23464=>1000,23465=>1000,23466=>1000,23467=>1000,23468=>1000,23469=>1000,23470=>1000,23471=>1000,23472=>1000,23473=>1000,23474=>1000,23475=>1000,23476=>1000,
-	23477=>1000,23478=>1000,23479=>1000,23480=>1000,23481=>1000,23482=>1000,23483=>1000,23484=>1000,23485=>1000,23486=>1000,23487=>1000,23488=>1000,23489=>1000,23490=>1000,23491=>1000,23492=>1000,
-	23493=>1000,23494=>1000,23495=>1000,23496=>1000,23497=>1000,23498=>1000,23499=>1000,23500=>1000,23501=>1000,23502=>1000,23503=>1000,23504=>1000,23505=>1000,23506=>1000,23507=>1000,23508=>1000,
-	23509=>1000,23510=>1000,23511=>1000,23512=>1000,23513=>1000,23514=>1000,23515=>1000,23516=>1000,23517=>1000,23518=>1000,23519=>1000,23520=>1000,23521=>1000,23522=>1000,23523=>1000,23524=>1000,
-	23525=>1000,23526=>1000,23527=>1000,23528=>1000,23529=>1000,23530=>1000,23531=>1000,23532=>1000,23533=>1000,23534=>1000,23535=>1000,23536=>1000,23537=>1000,23538=>1000,23539=>1000,23540=>1000,
-	23541=>1000,23542=>1000,23543=>1000,23544=>1000,23545=>1000,23546=>1000,23547=>1000,23548=>1000,23549=>1000,23550=>1000,23551=>1000,23552=>1000,23553=>1000,23554=>1000,23555=>1000,23556=>1000,
-	23557=>1000,23558=>1000,23559=>1000,23560=>1000,23561=>1000,23562=>1000,23563=>1000,23564=>1000,23565=>1000,23566=>1000,23567=>1000,23568=>1000,23569=>1000,23570=>1000,23571=>1000,23572=>1000,
-	23573=>1000,23574=>1000,23575=>1000,23576=>1000,23577=>1000,23578=>1000,23579=>1000,23580=>1000,23581=>1000,23582=>1000,23583=>1000,23584=>1000,23585=>1000,23586=>1000,23587=>1000,23588=>1000,
-	23589=>1000,23590=>1000,23591=>1000,23592=>1000,23593=>1000,23594=>1000,23595=>1000,23596=>1000,23597=>1000,23598=>1000,23599=>1000,23600=>1000,23601=>1000,23602=>1000,23603=>1000,23604=>1000,
-	23605=>1000,23606=>1000,23607=>1000,23608=>1000,23609=>1000,23610=>1000,23611=>1000,23612=>1000,23613=>1000,23614=>1000,23615=>1000,23616=>1000,23617=>1000,23618=>1000,23619=>1000,23620=>1000,
-	23621=>1000,23622=>1000,23623=>1000,23624=>1000,23625=>1000,23626=>1000,23627=>1000,23628=>1000,23629=>1000,23630=>1000,23631=>1000,23632=>1000,23633=>1000,23634=>1000,23635=>1000,23636=>1000,
-	23637=>1000,23638=>1000,23639=>1000,23640=>1000,23641=>1000,23642=>1000,23643=>1000,23644=>1000,23645=>1000,23646=>1000,23647=>1000,23648=>1000,23649=>1000,23650=>1000,23651=>1000,23652=>1000,
-	23653=>1000,23654=>1000,23655=>1000,23656=>1000,23657=>1000,23658=>1000,23659=>1000,23660=>1000,23661=>1000,23662=>1000,23663=>1000,23664=>1000,23665=>1000,23666=>1000,23667=>1000,23668=>1000,
-	23669=>1000,23670=>1000,23671=>1000,23672=>1000,23673=>1000,23674=>1000,23675=>1000,23676=>1000,23677=>1000,23678=>1000,23679=>1000,23680=>1000,23681=>1000,23682=>1000,23683=>1000,23684=>1000,
-	23685=>1000,23686=>1000,23687=>1000,23688=>1000,23689=>1000,23690=>1000,23691=>1000,23692=>1000,23693=>1000,23694=>1000,23695=>1000,23696=>1000,23697=>1000,23698=>1000,23699=>1000,23700=>1000,
-	23701=>1000,23702=>1000,23703=>1000,23704=>1000,23705=>1000,23706=>1000,23707=>1000,23708=>1000,23709=>1000,23710=>1000,23711=>1000,23712=>1000,23713=>1000,23714=>1000,23715=>1000,23716=>1000,
-	23717=>1000,23718=>1000,23719=>1000,23720=>1000,23721=>1000,23722=>1000,23723=>1000,23724=>1000,23725=>1000,23726=>1000,23727=>1000,23728=>1000,23729=>1000,23730=>1000,23731=>1000,23732=>1000,
-	23733=>1000,23734=>1000,23735=>1000,23736=>1000,23737=>1000,23738=>1000,23739=>1000,23740=>1000,23741=>1000,23742=>1000,23743=>1000,23744=>1000,23745=>1000,23746=>1000,23747=>1000,23748=>1000,
-	23749=>1000,23750=>1000,23751=>1000,23752=>1000,23753=>1000,23754=>1000,23755=>1000,23756=>1000,23757=>1000,23758=>1000,23759=>1000,23760=>1000,23761=>1000,23762=>1000,23763=>1000,23764=>1000,
-	23765=>1000,23766=>1000,23767=>1000,23768=>1000,23769=>1000,23770=>1000,23771=>1000,23772=>1000,23773=>1000,23774=>1000,23775=>1000,23776=>1000,23777=>1000,23778=>1000,23779=>1000,23780=>1000,
-	23781=>1000,23782=>1000,23783=>1000,23784=>1000,23785=>1000,23786=>1000,23787=>1000,23788=>1000,23789=>1000,23790=>1000,23791=>1000,23792=>1000,23793=>1000,23794=>1000,23795=>1000,23796=>1000,
-	23797=>1000,23798=>1000,23799=>1000,23800=>1000,23801=>1000,23802=>1000,23803=>1000,23804=>1000,23805=>1000,23806=>1000,23807=>1000,23808=>1000,23809=>1000,23810=>1000,23811=>1000,23812=>1000,
-	23813=>1000,23814=>1000,23815=>1000,23816=>1000,23817=>1000,23818=>1000,23819=>1000,23820=>1000,23821=>1000,23822=>1000,23823=>1000,23824=>1000,23825=>1000,23826=>1000,23827=>1000,23828=>1000,
-	23829=>1000,23830=>1000,23831=>1000,23832=>1000,23833=>1000,23834=>1000,23835=>1000,23836=>1000,23837=>1000,23838=>1000,23839=>1000,23840=>1000,23841=>1000,23842=>1000,23843=>1000,23844=>1000,
-	23845=>1000,23846=>1000,23847=>1000,23848=>1000,23849=>1000,23850=>1000,23851=>1000,23852=>1000,23853=>1000,23854=>1000,23855=>1000,23856=>1000,23857=>1000,23858=>1000,23859=>1000,23860=>1000,
-	23861=>1000,23862=>1000,23863=>1000,23864=>1000,23865=>1000,23866=>1000,23867=>1000,23868=>1000,23869=>1000,23870=>1000,23871=>1000,23872=>1000,23873=>1000,23874=>1000,23875=>1000,23876=>1000,
-	23877=>1000,23878=>1000,23879=>1000,23880=>1000,23881=>1000,23882=>1000,23883=>1000,23884=>1000,23885=>1000,23886=>1000,23887=>1000,23888=>1000,23889=>1000,23890=>1000,23891=>1000,23892=>1000,
-	23893=>1000,23894=>1000,23895=>1000,23896=>1000,23897=>1000,23898=>1000,23899=>1000,23900=>1000,23901=>1000,23902=>1000,23903=>1000,23904=>1000,23905=>1000,23906=>1000,23907=>1000,23908=>1000,
-	23909=>1000,23910=>1000,23911=>1000,23912=>1000,23913=>1000,23914=>1000,23915=>1000,23916=>1000,23917=>1000,23918=>1000,23919=>1000,23920=>1000,23921=>1000,23922=>1000,23923=>1000,23924=>1000,
-	23925=>1000,23926=>1000,23927=>1000,23928=>1000,23929=>1000,23930=>1000,23931=>1000,23932=>1000,23933=>1000,23934=>1000,23935=>1000,23936=>1000,23937=>1000,23938=>1000,23939=>1000,23940=>1000,
-	23941=>1000,23942=>1000,23943=>1000,23944=>1000,23945=>1000,23946=>1000,23947=>1000,23948=>1000,23949=>1000,23950=>1000,23951=>1000,23952=>1000,23953=>1000,23954=>1000,23955=>1000,23956=>1000,
-	23957=>1000,23958=>1000,23959=>1000,23960=>1000,23961=>1000,23962=>1000,23963=>1000,23964=>1000,23965=>1000,23966=>1000,23967=>1000,23968=>1000,23969=>1000,23970=>1000,23971=>1000,23972=>1000,
-	23973=>1000,23974=>1000,23975=>1000,23976=>1000,23977=>1000,23978=>1000,23979=>1000,23980=>1000,23981=>1000,23982=>1000,23983=>1000,23984=>1000,23985=>1000,23986=>1000,23987=>1000,23988=>1000,
-	23989=>1000,23990=>1000,23991=>1000,23992=>1000,23993=>1000,23994=>1000,23995=>1000,23996=>1000,23997=>1000,23998=>1000,23999=>1000,24000=>1000,24001=>1000,24002=>1000,24003=>1000,24004=>1000,
-	24005=>1000,24006=>1000,24007=>1000,24008=>1000,24009=>1000,24010=>1000,24011=>1000,24012=>1000,24013=>1000,24014=>1000,24015=>1000,24016=>1000,24017=>1000,24018=>1000,24019=>1000,24020=>1000,
-	24021=>1000,24022=>1000,24023=>1000,24024=>1000,24025=>1000,24026=>1000,24027=>1000,24028=>1000,24029=>1000,24030=>1000,24031=>1000,24032=>1000,24033=>1000,24034=>1000,24035=>1000,24036=>1000,
-	24037=>1000,24038=>1000,24039=>1000,24040=>1000,24041=>1000,24042=>1000,24043=>1000,24044=>1000,24045=>1000,24046=>1000,24047=>1000,24048=>1000,24049=>1000,24050=>1000,24051=>1000,24052=>1000,
-	24053=>1000,24054=>1000,24055=>1000,24056=>1000,24057=>1000,24058=>1000,24059=>1000,24060=>1000,24061=>1000,24062=>1000,24063=>1000,24064=>1000,24065=>1000,24066=>1000,24067=>1000,24068=>1000,
-	24069=>1000,24070=>1000,24071=>1000,24072=>1000,24073=>1000,24074=>1000,24075=>1000,24076=>1000,24077=>1000,24078=>1000,24079=>1000,24080=>1000,24081=>1000,24082=>1000,24083=>1000,24084=>1000,
-	24085=>1000,24086=>1000,24087=>1000,24088=>1000,24089=>1000,24090=>1000,24091=>1000,24092=>1000,24093=>1000,24094=>1000,24095=>1000,24096=>1000,24097=>1000,24098=>1000,24099=>1000,24100=>1000,
-	24101=>1000,24102=>1000,24103=>1000,24104=>1000,24105=>1000,24106=>1000,24107=>1000,24108=>1000,24109=>1000,24110=>1000,24111=>1000,24112=>1000,24113=>1000,24114=>1000,24115=>1000,24116=>1000,
-	24117=>1000,24118=>1000,24119=>1000,24120=>1000,24121=>1000,24122=>1000,24123=>1000,24124=>1000,24125=>1000,24126=>1000,24127=>1000,24128=>1000,24129=>1000,24130=>1000,24131=>1000,24132=>1000,
-	24133=>1000,24134=>1000,24135=>1000,24136=>1000,24137=>1000,24138=>1000,24139=>1000,24140=>1000,24141=>1000,24142=>1000,24143=>1000,24144=>1000,24145=>1000,24146=>1000,24147=>1000,24148=>1000,
-	24149=>1000,24150=>1000,24151=>1000,24152=>1000,24153=>1000,24154=>1000,24155=>1000,24156=>1000,24157=>1000,24158=>1000,24159=>1000,24160=>1000,24161=>1000,24162=>1000,24163=>1000,24164=>1000,
-	24165=>1000,24166=>1000,24167=>1000,24168=>1000,24169=>1000,24170=>1000,24171=>1000,24172=>1000,24173=>1000,24174=>1000,24175=>1000,24176=>1000,24177=>1000,24178=>1000,24179=>1000,24180=>1000,
-	24181=>1000,24182=>1000,24183=>1000,24184=>1000,24185=>1000,24186=>1000,24187=>1000,24188=>1000,24189=>1000,24190=>1000,24191=>1000,24192=>1000,24193=>1000,24194=>1000,24195=>1000,24196=>1000,
-	24197=>1000,24198=>1000,24199=>1000,24200=>1000,24201=>1000,24202=>1000,24203=>1000,24204=>1000,24205=>1000,24206=>1000,24207=>1000,24208=>1000,24209=>1000,24210=>1000,24211=>1000,24212=>1000,
-	24213=>1000,24214=>1000,24215=>1000,24216=>1000,24217=>1000,24218=>1000,24219=>1000,24220=>1000,24221=>1000,24222=>1000,24223=>1000,24224=>1000,24225=>1000,24226=>1000,24227=>1000,24228=>1000,
-	24229=>1000,24230=>1000,24231=>1000,24232=>1000,24233=>1000,24234=>1000,24235=>1000,24236=>1000,24237=>1000,24238=>1000,24239=>1000,24240=>1000,24241=>1000,24242=>1000,24243=>1000,24244=>1000,
-	24245=>1000,24246=>1000,24247=>1000,24248=>1000,24249=>1000,24250=>1000,24251=>1000,24252=>1000,24253=>1000,24254=>1000,24255=>1000,24256=>1000,24257=>1000,24258=>1000,24259=>1000,24260=>1000,
-	24261=>1000,24262=>1000,24263=>1000,24264=>1000,24265=>1000,24266=>1000,24267=>1000,24268=>1000,24269=>1000,24270=>1000,24271=>1000,24272=>1000,24273=>1000,24274=>1000,24275=>1000,24276=>1000,
-	24277=>1000,24278=>1000,24279=>1000,24280=>1000,24281=>1000,24282=>1000,24283=>1000,24284=>1000,24285=>1000,24286=>1000,24287=>1000,24288=>1000,24289=>1000,24290=>1000,24291=>1000,24292=>1000,
-	24293=>1000,24294=>1000,24295=>1000,24296=>1000,24297=>1000,24298=>1000,24299=>1000,24300=>1000,24301=>1000,24302=>1000,24303=>1000,24304=>1000,24305=>1000,24306=>1000,24307=>1000,24308=>1000,
-	24309=>1000,24310=>1000,24311=>1000,24312=>1000,24313=>1000,24314=>1000,24315=>1000,24316=>1000,24317=>1000,24318=>1000,24319=>1000,24320=>1000,24321=>1000,24322=>1000,24323=>1000,24324=>1000,
-	24325=>1000,24326=>1000,24327=>1000,24328=>1000,24329=>1000,24330=>1000,24331=>1000,24332=>1000,24333=>1000,24334=>1000,24335=>1000,24336=>1000,24337=>1000,24338=>1000,24339=>1000,24340=>1000,
-	24341=>1000,24342=>1000,24343=>1000,24344=>1000,24345=>1000,24346=>1000,24347=>1000,24348=>1000,24349=>1000,24350=>1000,24351=>1000,24352=>1000,24353=>1000,24354=>1000,24355=>1000,24356=>1000,
-	24357=>1000,24358=>1000,24359=>1000,24360=>1000,24361=>1000,24362=>1000,24363=>1000,24364=>1000,24365=>1000,24366=>1000,24367=>1000,24368=>1000,24369=>1000,24370=>1000,24371=>1000,24372=>1000,
-	24373=>1000,24374=>1000,24375=>1000,24376=>1000,24377=>1000,24378=>1000,24379=>1000,24380=>1000,24381=>1000,24382=>1000,24383=>1000,24384=>1000,24385=>1000,24386=>1000,24387=>1000,24388=>1000,
-	24389=>1000,24390=>1000,24391=>1000,24392=>1000,24393=>1000,24394=>1000,24395=>1000,24396=>1000,24397=>1000,24398=>1000,24399=>1000,24400=>1000,24401=>1000,24402=>1000,24403=>1000,24404=>1000,
-	24405=>1000,24406=>1000,24407=>1000,24408=>1000,24409=>1000,24410=>1000,24411=>1000,24412=>1000,24413=>1000,24414=>1000,24415=>1000,24416=>1000,24417=>1000,24418=>1000,24419=>1000,24420=>1000,
-	24421=>1000,24422=>1000,24423=>1000,24424=>1000,24425=>1000,24426=>1000,24427=>1000,24428=>1000,24429=>1000,24430=>1000,24431=>1000,24432=>1000,24433=>1000,24434=>1000,24435=>1000,24436=>1000,
-	24437=>1000,24438=>1000,24439=>1000,24440=>1000,24441=>1000,24442=>1000,24443=>1000,24444=>1000,24445=>1000,24446=>1000,24447=>1000,24448=>1000,24449=>1000,24450=>1000,24451=>1000,24452=>1000,
-	24453=>1000,24454=>1000,24455=>1000,24456=>1000,24457=>1000,24458=>1000,24459=>1000,24460=>1000,24461=>1000,24462=>1000,24463=>1000,24464=>1000,24465=>1000,24466=>1000,24467=>1000,24468=>1000,
-	24469=>1000,24470=>1000,24471=>1000,24472=>1000,24473=>1000,24474=>1000,24475=>1000,24476=>1000,24477=>1000,24478=>1000,24479=>1000,24480=>1000,24481=>1000,24482=>1000,24483=>1000,24484=>1000,
-	24485=>1000,24486=>1000,24487=>1000,24488=>1000,24489=>1000,24490=>1000,24491=>1000,24492=>1000,24493=>1000,24494=>1000,24495=>1000,24496=>1000,24497=>1000,24498=>1000,24499=>1000,24500=>1000,
-	24501=>1000,24502=>1000,24503=>1000,24504=>1000,24505=>1000,24506=>1000,24507=>1000,24508=>1000,24509=>1000,24510=>1000,24511=>1000,24512=>1000,24513=>1000,24514=>1000,24515=>1000,24516=>1000,
-	24517=>1000,24518=>1000,24519=>1000,24520=>1000,24521=>1000,24522=>1000,24523=>1000,24524=>1000,24525=>1000,24526=>1000,24527=>1000,24528=>1000,24529=>1000,24530=>1000,24531=>1000,24532=>1000,
-	24533=>1000,24534=>1000,24535=>1000,24536=>1000,24537=>1000,24538=>1000,24539=>1000,24540=>1000,24541=>1000,24542=>1000,24543=>1000,24544=>1000,24545=>1000,24546=>1000,24547=>1000,24548=>1000,
-	24549=>1000,24550=>1000,24551=>1000,24552=>1000,24553=>1000,24554=>1000,24555=>1000,24556=>1000,24557=>1000,24558=>1000,24559=>1000,24560=>1000,24561=>1000,24562=>1000,24563=>1000,24564=>1000,
-	24565=>1000,24566=>1000,24567=>1000,24568=>1000,24569=>1000,24570=>1000,24571=>1000,24572=>1000,24573=>1000,24574=>1000,24575=>1000,24576=>1000,24577=>1000,24578=>1000,24579=>1000,24580=>1000,
-	24581=>1000,24582=>1000,24583=>1000,24584=>1000,24585=>1000,24586=>1000,24587=>1000,24588=>1000,24589=>1000,24590=>1000,24591=>1000,24592=>1000,24593=>1000,24594=>1000,24595=>1000,24596=>1000,
-	24597=>1000,24598=>1000,24599=>1000,24600=>1000,24601=>1000,24602=>1000,24603=>1000,24604=>1000,24605=>1000,24606=>1000,24607=>1000,24608=>1000,24609=>1000,24610=>1000,24611=>1000,24612=>1000,
-	24613=>1000,24614=>1000,24615=>1000,24616=>1000,24617=>1000,24618=>1000,24619=>1000,24620=>1000,24621=>1000,24622=>1000,24623=>1000,24624=>1000,24625=>1000,24626=>1000,24627=>1000,24628=>1000,
-	24629=>1000,24630=>1000,24631=>1000,24632=>1000,24633=>1000,24634=>1000,24635=>1000,24636=>1000,24637=>1000,24638=>1000,24639=>1000,24640=>1000,24641=>1000,24642=>1000,24643=>1000,24644=>1000,
-	24645=>1000,24646=>1000,24647=>1000,24648=>1000,24649=>1000,24650=>1000,24651=>1000,24652=>1000,24653=>1000,24654=>1000,24655=>1000,24656=>1000,24657=>1000,24658=>1000,24659=>1000,24660=>1000,
-	24661=>1000,24662=>1000,24663=>1000,24664=>1000,24665=>1000,24666=>1000,24667=>1000,24668=>1000,24669=>1000,24670=>1000,24671=>1000,24672=>1000,24673=>1000,24674=>1000,24675=>1000,24676=>1000,
-	24677=>1000,24678=>1000,24679=>1000,24680=>1000,24681=>1000,24682=>1000,24683=>1000,24684=>1000,24685=>1000,24686=>1000,24687=>1000,24688=>1000,24689=>1000,24690=>1000,24691=>1000,24692=>1000,
-	24693=>1000,24694=>1000,24695=>1000,24696=>1000,24697=>1000,24698=>1000,24699=>1000,24700=>1000,24701=>1000,24702=>1000,24703=>1000,24704=>1000,24705=>1000,24706=>1000,24707=>1000,24708=>1000,
-	24709=>1000,24710=>1000,24711=>1000,24712=>1000,24713=>1000,24714=>1000,24715=>1000,24716=>1000,24717=>1000,24718=>1000,24719=>1000,24720=>1000,24721=>1000,24722=>1000,24723=>1000,24724=>1000,
-	24725=>1000,24726=>1000,24727=>1000,24728=>1000,24729=>1000,24730=>1000,24731=>1000,24732=>1000,24733=>1000,24734=>1000,24735=>1000,24736=>1000,24737=>1000,24738=>1000,24739=>1000,24740=>1000,
-	24741=>1000,24742=>1000,24743=>1000,24744=>1000,24745=>1000,24746=>1000,24747=>1000,24748=>1000,24749=>1000,24750=>1000,24751=>1000,24752=>1000,24753=>1000,24754=>1000,24755=>1000,24756=>1000,
-	24757=>1000,24758=>1000,24759=>1000,24760=>1000,24761=>1000,24762=>1000,24763=>1000,24764=>1000,24765=>1000,24766=>1000,24767=>1000,24768=>1000,24769=>1000,24770=>1000,24771=>1000,24772=>1000,
-	24773=>1000,24774=>1000,24775=>1000,24776=>1000,24777=>1000,24778=>1000,24779=>1000,24780=>1000,24781=>1000,24782=>1000,24783=>1000,24784=>1000,24785=>1000,24786=>1000,24787=>1000,24788=>1000,
-	24789=>1000,24790=>1000,24791=>1000,24792=>1000,24793=>1000,24794=>1000,24795=>1000,24796=>1000,24797=>1000,24798=>1000,24799=>1000,24800=>1000,24801=>1000,24802=>1000,24803=>1000,24804=>1000,
-	24805=>1000,24806=>1000,24807=>1000,24808=>1000,24809=>1000,24810=>1000,24811=>1000,24812=>1000,24813=>1000,24814=>1000,24815=>1000,24816=>1000,24817=>1000,24818=>1000,24819=>1000,24820=>1000,
-	24821=>1000,24822=>1000,24823=>1000,24824=>1000,24825=>1000,24826=>1000,24827=>1000,24828=>1000,24829=>1000,24830=>1000,24831=>1000,24832=>1000,24833=>1000,24834=>1000,24835=>1000,24836=>1000,
-	24837=>1000,24838=>1000,24839=>1000,24840=>1000,24841=>1000,24842=>1000,24843=>1000,24844=>1000,24845=>1000,24846=>1000,24847=>1000,24848=>1000,24849=>1000,24850=>1000,24851=>1000,24852=>1000,
-	24853=>1000,24854=>1000,24855=>1000,24856=>1000,24857=>1000,24858=>1000,24859=>1000,24860=>1000,24861=>1000,24862=>1000,24863=>1000,24864=>1000,24865=>1000,24866=>1000,24867=>1000,24868=>1000,
-	24869=>1000,24870=>1000,24871=>1000,24872=>1000,24873=>1000,24874=>1000,24875=>1000,24876=>1000,24877=>1000,24878=>1000,24879=>1000,24880=>1000,24881=>1000,24882=>1000,24883=>1000,24884=>1000,
-	24885=>1000,24886=>1000,24887=>1000,24888=>1000,24889=>1000,24890=>1000,24891=>1000,24892=>1000,24893=>1000,24894=>1000,24895=>1000,24896=>1000,24897=>1000,24898=>1000,24899=>1000,24900=>1000,
-	24901=>1000,24902=>1000,24903=>1000,24904=>1000,24905=>1000,24906=>1000,24907=>1000,24908=>1000,24909=>1000,24910=>1000,24911=>1000,24912=>1000,24913=>1000,24914=>1000,24915=>1000,24916=>1000,
-	24917=>1000,24918=>1000,24919=>1000,24920=>1000,24921=>1000,24922=>1000,24923=>1000,24924=>1000,24925=>1000,24926=>1000,24927=>1000,24928=>1000,24929=>1000,24930=>1000,24931=>1000,24932=>1000,
-	24933=>1000,24934=>1000,24935=>1000,24936=>1000,24937=>1000,24938=>1000,24939=>1000,24940=>1000,24941=>1000,24942=>1000,24943=>1000,24944=>1000,24945=>1000,24946=>1000,24947=>1000,24948=>1000,
-	24949=>1000,24950=>1000,24951=>1000,24952=>1000,24953=>1000,24954=>1000,24955=>1000,24956=>1000,24957=>1000,24958=>1000,24959=>1000,24960=>1000,24961=>1001,24962=>1000,24963=>1000,24964=>1000,
-	24965=>1000,24966=>1000,24967=>1000,24968=>1000,24969=>1000,24970=>1000,24971=>1000,24972=>1000,24973=>1000,24974=>1000,24975=>1000,24976=>1000,24977=>1000,24978=>1000,24979=>1000,24980=>1000,
-	24981=>1000,24982=>1000,24983=>1000,24984=>1000,24985=>1000,24986=>1000,24987=>1000,24988=>1000,24989=>1000,24990=>1000,24991=>1000,24992=>1000,24993=>1000,24994=>1000,24995=>1000,24996=>1000,
-	24997=>1000,24998=>1000,24999=>1000,25000=>1000,25001=>1000,25002=>1000,25003=>1000,25004=>1000,25005=>1000,25006=>1000,25007=>1000,25008=>1000,25009=>1000,25010=>1000,25011=>1000,25012=>1000,
-	25013=>1000,25014=>1000,25015=>1000,25016=>1000,25017=>1000,25018=>1000,25019=>1000,25020=>1000,25021=>1000,25022=>1000,25023=>1000,25024=>1000,25025=>1000,25026=>1000,25027=>1000,25028=>1000,
-	25029=>1000,25030=>1000,25031=>1000,25032=>1000,25033=>1000,25034=>1000,25035=>1000,25036=>1000,25037=>1000,25038=>1000,25039=>1000,25040=>1000,25041=>1000,25042=>1000,25043=>1000,25044=>1000,
-	25045=>1000,25046=>1000,25047=>1000,25048=>1000,25049=>1000,25050=>1000,25051=>1000,25052=>1000,25053=>1000,25054=>1000,25055=>1000,25056=>1000,25057=>1000,25058=>1000,25059=>1000,25060=>1000,
-	25061=>1000,25062=>1000,25063=>1000,25064=>1000,25065=>1000,25066=>1000,25067=>1000,25068=>1000,25069=>1000,25070=>1000,25071=>1000,25072=>1000,25073=>1000,25074=>1000,25075=>1000,25076=>1000,
-	25077=>1000,25078=>1000,25079=>1000,25080=>1000,25081=>1000,25082=>1000,25083=>1000,25084=>1000,25085=>1000,25086=>1000,25087=>1000,25088=>1000,25089=>1000,25090=>1000,25091=>1000,25092=>1000,
-	25093=>1000,25094=>1000,25095=>1000,25096=>1000,25097=>1000,25098=>1000,25099=>1000,25100=>1000,25101=>1000,25102=>1000,25103=>1000,25104=>1000,25105=>1000,25106=>1000,25107=>1000,25108=>1000,
-	25109=>1000,25110=>1000,25111=>1000,25112=>1000,25113=>1000,25114=>1000,25115=>1000,25116=>1000,25117=>1000,25118=>1000,25119=>1000,25120=>1000,25121=>1000,25122=>1000,25123=>1000,25124=>1000,
-	25125=>1000,25126=>1000,25127=>1000,25128=>1000,25129=>1000,25130=>1000,25131=>1000,25132=>1000,25133=>1000,25134=>1000,25135=>1000,25136=>1000,25137=>1000,25138=>1000,25139=>1000,25140=>1000,
-	25141=>1000,25142=>1000,25143=>1000,25144=>1000,25145=>1000,25146=>1000,25147=>1000,25148=>1000,25149=>1000,25150=>1000,25151=>1000,25152=>1000,25153=>1000,25154=>1000,25155=>1000,25156=>1000,
-	25157=>1000,25158=>1000,25159=>1000,25160=>1000,25161=>1000,25162=>1000,25163=>1000,25164=>1000,25165=>1000,25166=>1000,25167=>1000,25168=>1000,25169=>1000,25170=>1000,25171=>1000,25172=>1000,
-	25173=>1000,25174=>1000,25175=>1000,25176=>1000,25177=>1000,25178=>1000,25179=>1000,25180=>1000,25181=>1000,25182=>1000,25183=>1000,25184=>1000,25185=>1000,25186=>1000,25187=>1000,25188=>1000,
-	25189=>1000,25190=>1000,25191=>1000,25192=>1000,25193=>1000,25194=>1000,25195=>1000,25196=>1000,25197=>1000,25198=>1000,25199=>1000,25200=>1000,25201=>1000,25202=>1000,25203=>1000,25204=>1000,
-	25205=>1000,25206=>1000,25207=>1000,25208=>1000,25209=>1000,25210=>1000,25211=>1000,25212=>1000,25213=>1000,25214=>1000,25215=>1000,25216=>1000,25217=>1000,25218=>1000,25219=>1000,25220=>1000,
-	25221=>1000,25222=>1000,25223=>1000,25224=>1000,25225=>1000,25226=>1000,25227=>1000,25228=>1000,25229=>1000,25230=>1000,25231=>1000,25232=>1000,25233=>1000,25234=>1000,25235=>1000,25236=>1000,
-	25237=>1000,25238=>1000,25239=>1000,25240=>1000,25241=>1000,25242=>1000,25243=>1000,25244=>1000,25245=>1000,25246=>1000,25247=>1000,25248=>1000,25249=>1000,25250=>1000,25251=>1000,25252=>1000,
-	25253=>1000,25254=>1000,25255=>1000,25256=>1000,25257=>1000,25258=>1000,25259=>1000,25260=>1000,25261=>1000,25262=>1000,25263=>1000,25264=>1000,25265=>1000,25266=>1000,25267=>1000,25268=>1000,
-	25269=>1000,25270=>1000,25271=>1000,25272=>1000,25273=>1000,25274=>1000,25275=>1000,25276=>1000,25277=>1000,25278=>1000,25279=>1000,25280=>1000,25281=>1000,25282=>1000,25283=>1000,25284=>1000,
-	25285=>1000,25286=>1000,25287=>1000,25288=>1000,25289=>1000,25290=>1000,25291=>1000,25292=>1000,25293=>1000,25294=>1000,25295=>1000,25296=>1000,25297=>1000,25298=>1000,25299=>1000,25300=>1000,
-	25301=>1000,25302=>1000,25303=>1000,25304=>1000,25305=>1000,25306=>1000,25307=>1000,25308=>1000,25309=>1000,25310=>1000,25311=>1000,25312=>1000,25313=>1000,25314=>1000,25315=>1000,25316=>1000,
-	25317=>1000,25318=>1000,25319=>1000,25320=>1000,25321=>1000,25322=>1000,25323=>1000,25324=>1000,25325=>1000,25326=>1000,25327=>1000,25328=>1000,25329=>1000,25330=>1000,25331=>1000,25332=>1000,
-	25333=>1000,25334=>1000,25335=>1000,25336=>1000,25337=>1000,25338=>1000,25339=>1000,25340=>1000,25341=>1000,25342=>1000,25343=>1000,25344=>1000,25345=>1000,25346=>1000,25347=>1000,25348=>1000,
-	25349=>1000,25350=>1000,25351=>1000,25352=>1000,25353=>1000,25354=>1000,25355=>1000,25356=>1000,25357=>1000,25358=>1000,25359=>1000,25360=>1000,25361=>1000,25362=>1000,25363=>1000,25364=>1000,
-	25365=>1000,25366=>1000,25367=>1000,25368=>1000,25369=>1000,25370=>1000,25371=>1000,25372=>1000,25373=>1000,25374=>1000,25375=>1000,25376=>1000,25377=>1000,25378=>1000,25379=>1000,25380=>1000,
-	25381=>1000,25382=>1000,25383=>1000,25384=>1000,25385=>1000,25386=>1000,25387=>1000,25388=>1000,25389=>1000,25390=>1000,25391=>1000,25392=>1000,25393=>1000,25394=>1000,25395=>1000,25396=>1000,
-	25397=>1000,25398=>1000,25399=>1000,25400=>1000,25401=>1000,25402=>1000,25403=>1000,25404=>1000,25405=>1000,25406=>1000,25407=>1000,25408=>1000,25409=>1000,25410=>1000,25411=>1000,25412=>1000,
-	25413=>1000,25414=>1000,25415=>1000,25416=>1000,25417=>1000,25418=>1000,25419=>1000,25420=>1000,25421=>1000,25422=>1000,25423=>1000,25424=>1000,25425=>1000,25426=>1000,25427=>1000,25428=>1000,
-	25429=>1000,25430=>1000,25431=>1000,25432=>1000,25433=>1000,25434=>1000,25435=>1000,25436=>1000,25437=>1000,25438=>1000,25439=>1000,25440=>1000,25441=>1000,25442=>1000,25443=>1000,25444=>1000,
-	25445=>1000,25446=>1000,25447=>1000,25448=>1000,25449=>1000,25450=>1000,25451=>1000,25452=>1000,25453=>1000,25454=>1000,25455=>1000,25456=>1000,25457=>1000,25458=>1000,25459=>1000,25460=>1000,
-	25461=>1000,25462=>1000,25463=>1000,25464=>1000,25465=>1000,25466=>1000,25467=>1000,25468=>1000,25469=>1000,25470=>1000,25471=>1000,25472=>1000,25473=>1000,25474=>1000,25475=>1000,25476=>1000,
-	25477=>1000,25478=>1000,25479=>1000,25480=>1000,25481=>1000,25482=>1000,25483=>1000,25484=>1000,25485=>1000,25486=>1000,25487=>1000,25488=>1000,25489=>1000,25490=>1000,25491=>1000,25492=>1000,
-	25493=>1000,25494=>1000,25495=>1000,25496=>1000,25497=>1000,25498=>1000,25499=>1000,25500=>1000,25501=>1000,25502=>1000,25503=>1000,25504=>1000,25505=>1000,25506=>1000,25507=>1000,25508=>1000,
-	25509=>1000,25510=>1000,25511=>1000,25512=>1000,25513=>1000,25514=>1000,25515=>1000,25516=>1000,25517=>1000,25518=>1000,25519=>1000,25520=>1000,25521=>1000,25522=>1000,25523=>1000,25524=>1000,
-	25525=>1000,25526=>1000,25527=>1000,25528=>1000,25529=>1000,25530=>1000,25531=>1000,25532=>1000,25533=>1000,25534=>1000,25535=>1000,25536=>1000,25537=>1000,25538=>1000,25539=>1000,25540=>1000,
-	25541=>1000,25542=>1000,25543=>1000,25544=>1000,25545=>1000,25546=>1000,25547=>1000,25548=>1000,25549=>1000,25550=>1000,25551=>1000,25552=>1000,25553=>1000,25554=>1000,25555=>1000,25556=>1000,
-	25557=>1000,25558=>1000,25559=>1000,25560=>1000,25561=>1000,25562=>1000,25563=>1000,25564=>1000,25565=>1000,25566=>1000,25567=>1000,25568=>1000,25569=>1000,25570=>1000,25571=>1000,25572=>1000,
-	25573=>1000,25574=>1000,25575=>1000,25576=>1000,25577=>1000,25578=>1000,25579=>1000,25580=>1000,25581=>1000,25582=>1000,25583=>1000,25584=>1000,25585=>1000,25586=>1000,25587=>1000,25588=>1000,
-	25589=>1000,25590=>1000,25591=>1000,25592=>1000,25593=>1000,25594=>1000,25595=>1000,25596=>1000,25597=>1000,25598=>1000,25599=>1000,25600=>1000,25601=>1000,25602=>1000,25603=>1000,25604=>1000,
-	25605=>1000,25606=>1000,25607=>1000,25608=>1000,25609=>1000,25610=>1000,25611=>1000,25612=>1000,25613=>1000,25614=>1000,25615=>1000,25616=>1000,25617=>1000,25618=>1000,25619=>1000,25620=>1000,
-	25621=>1000,25622=>1000,25623=>1000,25624=>1000,25625=>1000,25626=>1000,25627=>1000,25628=>1000,25629=>1000,25630=>1000,25631=>1000,25632=>1000,25633=>1000,25634=>1000,25635=>1000,25636=>1000,
-	25637=>1000,25638=>1000,25639=>1000,25640=>1000,25641=>1000,25642=>1000,25643=>1000,25644=>1000,25645=>1000,25646=>1000,25647=>1000,25648=>1000,25649=>1000,25650=>1000,25651=>1000,25652=>1000,
-	25653=>1000,25654=>1000,25655=>1000,25656=>1000,25657=>1000,25658=>1000,25659=>1000,25660=>1000,25661=>1000,25662=>1000,25663=>1000,25664=>1000,25665=>1000,25666=>1000,25667=>1000,25668=>1000,
-	25669=>1000,25670=>1000,25671=>1000,25672=>1000,25673=>1000,25674=>1000,25675=>1000,25676=>1000,25677=>1000,25678=>1000,25679=>1000,25680=>1000,25681=>1000,25682=>1000,25683=>1000,25684=>1000,
-	25685=>1000,25686=>1000,25687=>1000,25688=>1000,25689=>1000,25690=>1000,25691=>1000,25692=>1000,25693=>1000,25694=>1000,25695=>1000,25696=>1000,25697=>1000,25698=>1000,25699=>1000,25700=>1000,
-	25701=>1000,25702=>1000,25703=>1000,25704=>1000,25705=>1000,25706=>1000,25707=>1000,25708=>1000,25709=>1000,25710=>1000,25711=>1000,25712=>1000,25713=>1000,25714=>1000,25715=>1000,25716=>1000,
-	25717=>1000,25718=>1000,25719=>1000,25720=>1000,25721=>1000,25722=>1000,25723=>1000,25724=>1000,25725=>1000,25726=>1000,25727=>1000,25728=>1000,25729=>1000,25730=>1000,25731=>1000,25732=>1000,
-	25733=>1000,25734=>1000,25735=>1000,25736=>1000,25737=>1000,25738=>1000,25739=>1000,25740=>1000,25741=>1000,25742=>1000,25743=>1000,25744=>1000,25745=>1000,25746=>1000,25747=>1000,25748=>1000,
-	25749=>1000,25750=>1000,25751=>1000,25752=>1000,25753=>1000,25754=>1000,25755=>1000,25756=>1000,25757=>1000,25758=>1000,25759=>1000,25760=>1000,25761=>1000,25762=>1000,25763=>1000,25764=>1000,
-	25765=>1000,25766=>1000,25767=>1000,25768=>1000,25769=>1000,25770=>1000,25771=>1000,25772=>1000,25773=>1000,25774=>1000,25775=>1000,25776=>1000,25777=>1000,25778=>1000,25779=>1000,25780=>1000,
-	25781=>1000,25782=>1000,25783=>1000,25784=>1000,25785=>1000,25786=>1000,25787=>1000,25788=>1000,25789=>1000,25790=>1000,25791=>1000,25792=>1000,25793=>1000,25794=>1000,25795=>1000,25796=>1000,
-	25797=>1000,25798=>1000,25799=>1000,25800=>1000,25801=>1000,25802=>1000,25803=>1000,25804=>1000,25805=>1000,25806=>1000,25807=>1000,25808=>1000,25809=>1000,25810=>1000,25811=>1000,25812=>1000,
-	25813=>1000,25814=>1000,25815=>1000,25816=>1000,25817=>1000,25818=>1000,25819=>1000,25820=>1000,25821=>1000,25822=>1000,25823=>1000,25824=>1000,25825=>1000,25826=>1000,25827=>1000,25828=>1000,
-	25829=>1000,25830=>1000,25831=>1000,25832=>1000,25833=>1000,25834=>1000,25835=>1000,25836=>1000,25837=>1000,25838=>1000,25839=>1000,25840=>1000,25841=>1000,25842=>1000,25843=>1000,25844=>1000,
-	25845=>1000,25846=>1000,25847=>1000,25848=>1000,25849=>1000,25850=>1000,25851=>1000,25852=>1000,25853=>1000,25854=>1000,25855=>1000,25856=>1000,25857=>1000,25858=>1000,25859=>1000,25860=>1000,
-	25861=>1000,25862=>1000,25863=>1000,25864=>1000,25865=>1000,25866=>1000,25867=>1000,25868=>1000,25869=>1000,25870=>1000,25871=>1000,25872=>1000,25873=>1000,25874=>1000,25875=>1000,25876=>1000,
-	25877=>1000,25878=>1000,25879=>1000,25880=>1000,25881=>1000,25882=>1000,25883=>1000,25884=>1000,25885=>1000,25886=>1000,25887=>1000,25888=>1000,25889=>1000,25890=>1000,25891=>1000,25892=>1000,
-	25893=>1000,25894=>1000,25895=>1000,25896=>1000,25897=>1000,25898=>1000,25899=>1000,25900=>1000,25901=>1000,25902=>1000,25903=>1000,25904=>1000,25905=>1000,25906=>1000,25907=>1000,25908=>1000,
-	25909=>1000,25910=>1000,25911=>1000,25912=>1000,25913=>1000,25914=>1000,25915=>1000,25916=>1000,25917=>1000,25918=>1000,25919=>1000,25920=>1000,25921=>1000,25922=>1000,25923=>1000,25924=>1000,
-	25925=>1000,25926=>1000,25927=>1000,25928=>1000,25929=>1000,25930=>1000,25931=>1000,25932=>1000,25933=>1000,25934=>1000,25935=>1000,25936=>1000,25937=>1000,25938=>1000,25939=>1000,25940=>1000,
-	25941=>1000,25942=>1000,25943=>1000,25944=>1000,25945=>1000,25946=>1000,25947=>1000,25948=>1000,25949=>1000,25950=>1000,25951=>1000,25952=>1000,25953=>1000,25954=>1000,25955=>1000,25956=>1000,
-	25957=>1000,25958=>1000,25959=>1000,25960=>1000,25961=>1000,25962=>1000,25963=>1000,25964=>1000,25965=>1000,25966=>1000,25967=>1000,25968=>1000,25969=>1000,25970=>1000,25971=>1000,25972=>1000,
-	25973=>1000,25974=>1000,25975=>1000,25976=>1000,25977=>1000,25978=>1000,25979=>1000,25980=>1000,25981=>1000,25982=>1000,25983=>1000,25984=>1000,25985=>1000,25986=>1000,25987=>1000,25988=>1000,
-	25989=>1000,25990=>1000,25991=>1000,25992=>1000,25993=>1000,25994=>1000,25995=>1000,25996=>1000,25997=>1000,25998=>1000,25999=>1000,26000=>1000,26001=>1000,26002=>1000,26003=>1000,26004=>1000,
-	26005=>1000,26006=>1000,26007=>1000,26008=>1000,26009=>1000,26010=>1000,26011=>1000,26012=>1000,26013=>1000,26014=>1000,26015=>1000,26016=>1000,26017=>1000,26018=>1000,26019=>1000,26020=>1000,
-	26021=>1000,26022=>1000,26023=>1000,26024=>1000,26025=>1000,26026=>1000,26027=>1000,26028=>1000,26029=>1000,26030=>1000,26031=>1000,26032=>1000,26033=>1000,26034=>1000,26035=>1000,26036=>1000,
-	26037=>1000,26038=>1000,26039=>1000,26040=>1000,26041=>1000,26042=>1000,26043=>1000,26044=>1000,26045=>1000,26046=>1000,26047=>1000,26048=>1000,26049=>1000,26050=>1000,26051=>1000,26052=>1000,
-	26053=>1000,26054=>1000,26055=>1000,26056=>1000,26057=>1000,26058=>1000,26059=>1000,26060=>1000,26061=>1000,26062=>1000,26063=>1000,26064=>1000,26065=>1000,26066=>1000,26067=>1000,26068=>1000,
-	26069=>1000,26070=>1000,26071=>1000,26072=>1000,26073=>1000,26074=>1000,26075=>1000,26076=>1000,26077=>1000,26078=>1000,26079=>1000,26080=>1000,26081=>1000,26082=>1000,26083=>1000,26084=>1000,
-	26085=>1000,26086=>1000,26087=>1000,26088=>1000,26089=>1000,26090=>1000,26091=>1000,26092=>1000,26093=>1000,26094=>1000,26095=>1000,26096=>1000,26097=>1000,26098=>1000,26099=>1000,26100=>1000,
-	26101=>1000,26102=>1000,26103=>1000,26104=>1000,26105=>1000,26106=>1000,26107=>1000,26108=>1000,26109=>1000,26110=>1000,26111=>1000,26112=>1000,26113=>1000,26114=>1000,26115=>1000,26116=>1000,
-	26117=>1000,26118=>1000,26119=>1000,26120=>1000,26121=>1000,26122=>1000,26123=>1000,26124=>1000,26125=>1000,26126=>1000,26127=>1000,26128=>1000,26129=>1000,26130=>1000,26131=>1000,26132=>1000,
-	26133=>1000,26134=>1000,26135=>1000,26136=>1000,26137=>1000,26138=>1000,26139=>1000,26140=>1000,26141=>1000,26142=>1000,26143=>1000,26144=>1000,26145=>1000,26146=>1000,26147=>1000,26148=>1000,
-	26149=>1000,26150=>1000,26151=>1000,26152=>1000,26153=>1000,26154=>1000,26155=>1000,26156=>1000,26157=>1000,26158=>1000,26159=>1000,26160=>1000,26161=>1000,26162=>1000,26163=>1000,26164=>1000,
-	26165=>1000,26166=>1000,26167=>1000,26168=>1000,26169=>1000,26170=>1000,26171=>1000,26172=>1000,26173=>1000,26174=>1000,26175=>1000,26176=>1000,26177=>1000,26178=>1000,26179=>1000,26180=>1000,
-	26181=>1000,26182=>1000,26183=>1000,26184=>1000,26185=>1000,26186=>1000,26187=>1000,26188=>1000,26189=>1000,26190=>1000,26191=>1000,26192=>1000,26193=>1000,26194=>1000,26195=>1000,26196=>1000,
-	26197=>1000,26198=>1000,26199=>1000,26200=>1000,26201=>1000,26202=>1000,26203=>1000,26204=>1000,26205=>1000,26206=>1000,26207=>1000,26208=>1000,26209=>1000,26210=>1000,26211=>1000,26212=>1000,
-	26213=>1000,26214=>1000,26215=>1000,26216=>1000,26217=>1000,26218=>1000,26219=>1000,26220=>1000,26221=>1000,26222=>1000,26223=>1000,26224=>1000,26225=>1000,26226=>1000,26227=>1000,26228=>1000,
-	26229=>1000,26230=>1000,26231=>1000,26232=>1000,26233=>1000,26234=>1000,26235=>1000,26236=>1000,26237=>1000,26238=>1000,26239=>1000,26240=>1000,26241=>1000,26242=>1000,26243=>1000,26244=>1000,
-	26245=>1000,26246=>1000,26247=>1000,26248=>1000,26249=>1000,26250=>1000,26251=>1000,26252=>1000,26253=>1000,26254=>1000,26255=>1000,26256=>1000,26257=>1000,26258=>1000,26259=>1000,26260=>1000,
-	26261=>1000,26262=>1000,26263=>1000,26264=>1000,26265=>1000,26266=>1000,26267=>1000,26268=>1000,26269=>1000,26270=>1000,26271=>1000,26272=>1000,26273=>1000,26274=>1000,26275=>1000,26276=>1000,
-	26277=>1000,26278=>1000,26279=>1000,26280=>1000,26281=>1000,26282=>1000,26283=>1000,26284=>1000,26285=>1000,26286=>1000,26287=>1000,26288=>1000,26289=>1000,26290=>1000,26291=>1000,26292=>1000,
-	26293=>1000,26294=>1000,26295=>1000,26296=>1000,26297=>1000,26298=>1000,26299=>1000,26300=>1000,26301=>1000,26302=>1000,26303=>1000,26304=>1000,26305=>1000,26306=>1000,26307=>1000,26308=>1000,
-	26309=>1000,26310=>1000,26311=>1000,26312=>1000,26313=>1000,26314=>1000,26315=>1000,26316=>1000,26317=>1000,26318=>1000,26319=>1000,26320=>1000,26321=>1000,26322=>1000,26323=>1000,26324=>1000,
-	26325=>1000,26326=>1000,26327=>1000,26328=>1000,26329=>1000,26330=>1000,26331=>1000,26332=>1000,26333=>1000,26334=>1000,26335=>1000,26336=>1000,26337=>1000,26338=>1000,26339=>1000,26340=>1000,
-	26341=>1000,26342=>1000,26343=>1000,26344=>1000,26345=>1000,26346=>1000,26347=>1000,26348=>1000,26349=>1000,26350=>1000,26351=>1000,26352=>1000,26353=>1000,26354=>1000,26355=>1000,26356=>1000,
-	26357=>1000,26358=>1000,26359=>1000,26360=>1000,26361=>1000,26362=>1000,26363=>1000,26364=>1000,26365=>1000,26366=>1000,26367=>1000,26368=>1000,26369=>1000,26370=>1000,26371=>1000,26372=>1000,
-	26373=>1000,26374=>1000,26375=>1000,26376=>1000,26377=>1000,26378=>1000,26379=>1000,26380=>1000,26381=>1000,26382=>1000,26383=>1000,26384=>1000,26385=>1000,26386=>1000,26387=>1000,26388=>1000,
-	26389=>1000,26390=>1000,26391=>1000,26392=>1000,26393=>1000,26394=>1000,26395=>1000,26396=>1000,26397=>1000,26398=>1000,26399=>1000,26400=>1000,26401=>1000,26402=>1000,26403=>1000,26404=>1000,
-	26405=>1000,26406=>1000,26407=>1000,26408=>1000,26409=>1000,26410=>1000,26411=>1000,26412=>1000,26413=>1000,26414=>1000,26415=>1000,26416=>1000,26417=>1000,26418=>1000,26419=>1000,26420=>1000,
-	26421=>1000,26422=>1000,26423=>1000,26424=>1000,26425=>1000,26426=>1000,26427=>1000,26428=>1000,26429=>1000,26430=>1000,26431=>1000,26432=>1000,26433=>1000,26434=>1000,26435=>1000,26436=>1000,
-	26437=>1000,26438=>1000,26439=>1000,26440=>1000,26441=>1000,26442=>1000,26443=>1000,26444=>1000,26445=>1000,26446=>1000,26447=>1000,26448=>1000,26449=>1000,26450=>1000,26451=>1000,26452=>1000,
-	26453=>1000,26454=>1000,26455=>1000,26456=>1000,26457=>1000,26458=>1000,26459=>1000,26460=>1000,26461=>1000,26462=>1000,26463=>1000,26464=>1000,26465=>1000,26466=>1000,26467=>1000,26468=>1000,
-	26469=>1000,26470=>1000,26471=>1000,26472=>1000,26473=>1000,26474=>1000,26475=>1000,26476=>1000,26477=>1000,26478=>1000,26479=>1000,26480=>1000,26481=>1000,26482=>1000,26483=>1000,26484=>1000,
-	26485=>1000,26486=>1000,26487=>1000,26488=>1000,26489=>1000,26490=>1000,26491=>1000,26492=>1000,26493=>1000,26494=>1000,26495=>1000,26496=>1000,26497=>1000,26498=>1000,26499=>1000,26500=>1000,
-	26501=>1000,26502=>1000,26503=>1000,26504=>1000,26505=>1000,26506=>1000,26507=>1000,26508=>1000,26509=>1000,26510=>1000,26511=>1000,26512=>1000,26513=>1000,26514=>1000,26515=>1000,26516=>1000,
-	26517=>1000,26518=>1000,26519=>1000,26520=>1000,26521=>1000,26522=>1000,26523=>1000,26524=>1000,26525=>1000,26526=>1000,26527=>1000,26528=>1000,26529=>1000,26530=>1000,26531=>1000,26532=>1000,
-	26533=>1000,26534=>1000,26535=>1000,26536=>1000,26537=>1000,26538=>1000,26539=>1000,26540=>1000,26541=>1000,26542=>1000,26543=>1000,26544=>1000,26545=>1000,26546=>1000,26547=>1000,26548=>1000,
-	26549=>1000,26550=>1000,26551=>1000,26552=>1000,26553=>1000,26554=>1000,26555=>1000,26556=>1000,26557=>1000,26558=>1000,26559=>1000,26560=>1000,26561=>1000,26562=>1000,26563=>1000,26564=>1000,
-	26565=>1000,26566=>1000,26567=>1000,26568=>1000,26569=>1000,26570=>1000,26571=>1000,26572=>1000,26573=>1000,26574=>1000,26575=>1000,26576=>1000,26577=>1000,26578=>1000,26579=>1000,26580=>1000,
-	26581=>1000,26582=>1000,26583=>1000,26584=>1000,26585=>1000,26586=>1000,26587=>1000,26588=>1000,26589=>1000,26590=>1000,26591=>1000,26592=>1000,26593=>1000,26594=>1000,26595=>1000,26596=>1000,
-	26597=>1000,26598=>1000,26599=>1000,26600=>1000,26601=>1000,26602=>1000,26603=>1000,26604=>1000,26605=>1000,26606=>1000,26607=>1000,26608=>1000,26609=>1000,26610=>1000,26611=>1000,26612=>1000,
-	26613=>1000,26614=>1000,26615=>1000,26616=>1000,26617=>1000,26618=>1000,26619=>1000,26620=>1000,26621=>1000,26622=>1000,26623=>1000,26624=>1000,26625=>1000,26626=>1000,26627=>1000,26628=>1000,
-	26629=>1000,26630=>1000,26631=>1000,26632=>1000,26633=>1000,26634=>1000,26635=>1000,26636=>1000,26637=>1000,26638=>1000,26639=>1000,26640=>1000,26641=>1000,26642=>1000,26643=>1000,26644=>1000,
-	26645=>1000,26646=>1000,26647=>1000,26648=>1000,26649=>1000,26650=>1000,26651=>1000,26652=>1000,26653=>1000,26654=>1000,26655=>1000,26656=>1000,26657=>1000,26658=>1000,26659=>1000,26660=>1000,
-	26661=>1000,26662=>1000,26663=>1000,26664=>1000,26665=>1000,26666=>1000,26667=>1000,26668=>1000,26669=>1000,26670=>1000,26671=>1000,26672=>1000,26673=>1000,26674=>1000,26675=>1000,26676=>1000,
-	26677=>1000,26678=>1000,26679=>1000,26680=>1000,26681=>1000,26682=>1000,26683=>1000,26684=>1000,26685=>1000,26686=>1000,26687=>1000,26688=>1000,26689=>1000,26690=>1000,26691=>1000,26692=>1000,
-	26693=>1000,26694=>1000,26695=>1000,26696=>1000,26697=>1000,26698=>1000,26699=>1000,26700=>1000,26701=>1000,26702=>1000,26703=>1000,26704=>1000,26705=>1000,26706=>1000,26707=>1000,26708=>1000,
-	26709=>1000,26710=>1000,26711=>1000,26712=>1000,26713=>1000,26714=>1000,26715=>1000,26716=>1000,26717=>1000,26718=>1000,26719=>1000,26720=>1000,26721=>1000,26722=>1000,26723=>1000,26724=>1000,
-	26725=>1000,26726=>1000,26727=>1000,26728=>1000,26729=>1000,26730=>1000,26731=>1000,26732=>1000,26733=>1000,26734=>1000,26735=>1000,26736=>1000,26737=>1000,26738=>1000,26739=>1000,26740=>1000,
-	26741=>1000,26742=>1000,26743=>1000,26744=>1000,26745=>1000,26746=>1000,26747=>1000,26748=>1000,26749=>1000,26750=>1000,26751=>1000,26752=>1000,26753=>1000,26754=>1000,26755=>1000,26756=>1000,
-	26757=>1000,26758=>1000,26759=>1000,26760=>1000,26761=>1000,26762=>1000,26763=>1000,26764=>1000,26765=>1000,26766=>1000,26767=>1000,26768=>1000,26769=>1000,26770=>1000,26771=>1000,26772=>1000,
-	26773=>1000,26774=>1000,26775=>1000,26776=>1000,26777=>1000,26778=>1000,26779=>1000,26780=>1000,26781=>1000,26782=>1000,26783=>1000,26784=>1000,26785=>1000,26786=>1000,26787=>1000,26788=>1000,
-	26789=>1000,26790=>1000,26791=>1000,26792=>1000,26793=>1000,26794=>1000,26795=>1000,26796=>1000,26797=>1000,26798=>1000,26799=>1000,26800=>1000,26801=>1000,26802=>1000,26803=>1000,26804=>1000,
-	26805=>1000,26806=>1000,26807=>1000,26808=>1000,26809=>1000,26810=>1000,26811=>1000,26812=>1000,26813=>1000,26814=>1000,26815=>1000,26816=>1000,26817=>1000,26818=>1000,26819=>1000,26820=>1000,
-	26821=>1000,26822=>1000,26823=>1000,26824=>1000,26825=>1000,26826=>1000,26827=>1000,26828=>1000,26829=>1000,26830=>1000,26831=>1000,26832=>1000,26833=>1000,26834=>1000,26835=>1000,26836=>1000,
-	26837=>1000,26838=>1000,26839=>1000,26840=>1000,26841=>1000,26842=>1000,26843=>1000,26844=>1000,26845=>1000,26846=>1000,26847=>1000,26848=>1000,26849=>1000,26850=>1000,26851=>1000,26852=>1000,
-	26853=>1000,26854=>1000,26855=>1000,26856=>1000,26857=>1000,26858=>1000,26859=>1000,26860=>1000,26861=>1000,26862=>1000,26863=>1000,26864=>1000,26865=>1000,26866=>1000,26867=>1000,26868=>1000,
-	26869=>1000,26870=>1000,26871=>1000,26872=>1000,26873=>1000,26874=>1000,26875=>1000,26876=>1000,26877=>1000,26878=>1000,26879=>1000,26880=>1000,26881=>1000,26882=>1000,26883=>1000,26884=>1000,
-	26885=>1000,26886=>1000,26887=>1000,26888=>1000,26889=>1000,26890=>1000,26891=>1000,26892=>1000,26893=>1000,26894=>1000,26895=>1000,26896=>1000,26897=>1000,26898=>1000,26899=>1000,26900=>1000,
-	26901=>1000,26902=>1000,26903=>1000,26904=>1000,26905=>1000,26906=>1000,26907=>1000,26908=>1000,26909=>1000,26910=>1000,26911=>1000,26912=>1000,26913=>1000,26914=>1000,26915=>1000,26916=>1000,
-	26917=>1000,26918=>1000,26919=>1000,26920=>1000,26921=>1000,26922=>1000,26923=>1000,26924=>1000,26925=>1000,26926=>1000,26927=>1000,26928=>1000,26929=>1000,26930=>1000,26931=>1000,26932=>1000,
-	26933=>1000,26934=>1000,26935=>1000,26936=>1000,26937=>1000,26938=>1000,26939=>1000,26940=>1000,26941=>1000,26942=>1000,26943=>1000,26944=>1000,26945=>1000,26946=>1000,26947=>1000,26948=>1000,
-	26949=>1000,26950=>1000,26951=>1000,26952=>1000,26953=>1000,26954=>1000,26955=>1000,26956=>1000,26957=>1000,26958=>1000,26959=>1000,26960=>1000,26961=>1000,26962=>1000,26963=>1000,26964=>1000,
-	26965=>1000,26966=>1000,26967=>1000,26968=>1000,26969=>1000,26970=>1000,26971=>1000,26972=>1000,26973=>1000,26974=>1000,26975=>1000,26976=>1000,26977=>1000,26978=>1000,26979=>1000,26980=>1000,
-	26981=>1000,26982=>1000,26983=>1000,26984=>1000,26985=>1000,26986=>1000,26987=>1000,26988=>1000,26989=>1000,26990=>1000,26991=>1000,26992=>1000,26993=>1000,26994=>1000,26995=>1000,26996=>1000,
-	26997=>1000,26998=>1000,26999=>1000,27000=>1000,27001=>1000,27002=>1000,27003=>1000,27004=>1000,27005=>1000,27006=>1000,27007=>1000,27008=>1000,27009=>1000,27010=>1000,27011=>1000,27012=>1000,
-	27013=>1000,27014=>1000,27015=>1000,27016=>1000,27017=>1000,27018=>1000,27019=>1000,27020=>1000,27021=>1000,27022=>1000,27023=>1000,27024=>1000,27025=>1000,27026=>1000,27027=>1000,27028=>1000,
-	27029=>1000,27030=>1000,27031=>1000,27032=>1000,27033=>1000,27034=>1000,27035=>1000,27036=>1000,27037=>1000,27038=>1000,27039=>1000,27040=>1000,27041=>1000,27042=>1000,27043=>1000,27044=>1000,
-	27045=>1000,27046=>1000,27047=>1000,27048=>1000,27049=>1000,27050=>1000,27051=>1000,27052=>1000,27053=>1000,27054=>1000,27055=>1000,27056=>1000,27057=>1000,27058=>1000,27059=>1000,27060=>1000,
-	27061=>1000,27062=>1000,27063=>1000,27064=>1000,27065=>1000,27066=>1000,27067=>1000,27068=>1000,27069=>1000,27070=>1000,27071=>1000,27072=>1000,27073=>1000,27074=>1000,27075=>1000,27076=>1000,
-	27077=>1000,27078=>1000,27079=>1000,27080=>1000,27081=>1000,27082=>1000,27083=>1000,27084=>1000,27085=>1000,27086=>1000,27087=>1000,27088=>1000,27089=>1000,27090=>1000,27091=>1000,27092=>1000,
-	27093=>1000,27094=>1000,27095=>1000,27096=>1000,27097=>1000,27098=>1000,27099=>1000,27100=>1000,27101=>1000,27102=>1000,27103=>1000,27104=>1000,27105=>1000,27106=>1000,27107=>1000,27108=>1000,
-	27109=>1000,27110=>1000,27111=>1000,27112=>1000,27113=>1000,27114=>1000,27115=>1000,27116=>1000,27117=>1000,27118=>1000,27119=>1000,27120=>1000,27121=>1000,27122=>1000,27123=>1000,27124=>1000,
-	27125=>1000,27126=>1000,27127=>1000,27128=>1000,27129=>1000,27130=>1000,27131=>1000,27132=>1000,27133=>1000,27134=>1000,27135=>1000,27136=>1000,27137=>1000,27138=>1000,27139=>1000,27140=>1000,
-	27141=>1000,27142=>1000,27143=>1000,27144=>1000,27145=>1000,27146=>1000,27147=>1000,27148=>1000,27149=>1000,27150=>1000,27151=>1000,27152=>1000,27153=>1000,27154=>1000,27155=>1000,27156=>1000,
-	27157=>1000,27158=>1000,27159=>1000,27160=>1000,27161=>1000,27162=>1000,27163=>1000,27164=>1000,27165=>1000,27166=>1000,27167=>1000,27168=>1000,27169=>1000,27170=>1000,27171=>1000,27172=>1000,
-	27173=>1000,27174=>1000,27175=>1000,27176=>1000,27177=>1000,27178=>1000,27179=>1000,27180=>1000,27181=>1000,27182=>1000,27183=>1000,27184=>1000,27185=>1000,27186=>1000,27187=>1000,27188=>1000,
-	27189=>1000,27190=>1000,27191=>1000,27192=>1000,27193=>1000,27194=>1000,27195=>1000,27196=>1000,27197=>1000,27198=>1000,27199=>1000,27200=>1000,27201=>1000,27202=>1000,27203=>1000,27204=>1000,
-	27205=>1000,27206=>1000,27207=>1000,27208=>1000,27209=>1000,27210=>1000,27211=>1000,27212=>1000,27213=>1000,27214=>1000,27215=>1000,27216=>1000,27217=>1000,27218=>1000,27219=>1000,27220=>1000,
-	27221=>1000,27222=>1000,27223=>1000,27224=>1000,27225=>1000,27226=>1000,27227=>1000,27228=>1000,27229=>1000,27230=>1000,27231=>1000,27232=>1000,27233=>1000,27234=>1000,27235=>1000,27236=>1000,
-	27237=>1000,27238=>1000,27239=>1000,27240=>1000,27241=>1000,27242=>1000,27243=>1000,27244=>1000,27245=>1000,27246=>1000,27247=>1000,27248=>1000,27249=>1000,27250=>1000,27251=>1000,27252=>1000,
-	27253=>1000,27254=>1000,27255=>1000,27256=>1000,27257=>1000,27258=>1000,27259=>1000,27260=>1000,27261=>1000,27262=>1000,27263=>1000,27264=>1000,27265=>1000,27266=>1000,27267=>1000,27268=>1000,
-	27269=>1000,27270=>1000,27271=>1000,27272=>1000,27273=>1000,27274=>1000,27275=>1000,27276=>1000,27277=>1000,27278=>1000,27279=>1000,27280=>1000,27281=>1000,27282=>1000,27283=>1000,27284=>1000,
-	27285=>1000,27286=>1000,27287=>1000,27288=>1000,27289=>1000,27290=>1000,27291=>1000,27292=>1000,27293=>1000,27294=>1000,27295=>1000,27296=>1000,27297=>1000,27298=>1000,27299=>1000,27300=>1000,
-	27301=>1000,27302=>1000,27303=>1000,27304=>1000,27305=>1000,27306=>1000,27307=>1000,27308=>1000,27309=>1000,27310=>1000,27311=>1000,27312=>1000,27313=>1000,27314=>1000,27315=>1000,27316=>1000,
-	27317=>1000,27318=>1000,27319=>1000,27320=>1000,27321=>1000,27322=>1000,27323=>1000,27324=>1000,27325=>1000,27326=>1000,27327=>1000,27328=>1000,27329=>1000,27330=>1000,27331=>1000,27332=>1000,
-	27333=>1000,27334=>1000,27335=>1000,27336=>1000,27337=>1000,27338=>1000,27339=>1000,27340=>1000,27341=>1000,27342=>1000,27343=>1000,27344=>1000,27345=>1000,27346=>1000,27347=>1000,27348=>1000,
-	27349=>1000,27350=>1000,27351=>1000,27352=>1000,27353=>1000,27354=>1000,27355=>1000,27356=>1000,27357=>1000,27358=>1000,27359=>1000,27360=>1000,27361=>1000,27362=>1000,27363=>1000,27364=>1000,
-	27365=>1000,27366=>1000,27367=>1000,27368=>1000,27369=>1000,27370=>1000,27371=>1000,27372=>1000,27373=>1000,27374=>1000,27375=>1000,27376=>1000,27377=>1000,27378=>1000,27379=>1000,27380=>1000,
-	27381=>1000,27382=>1000,27383=>1000,27384=>1000,27385=>1000,27386=>1000,27387=>1000,27388=>1000,27389=>1000,27390=>1000,27391=>1000,27392=>1000,27393=>1000,27394=>1000,27395=>1000,27396=>1000,
-	27397=>1000,27398=>1000,27399=>1000,27400=>1000,27401=>1000,27402=>1000,27403=>1000,27404=>1000,27405=>1000,27406=>1000,27407=>1000,27408=>1000,27409=>1000,27410=>1000,27411=>1000,27412=>1000,
-	27413=>1000,27414=>1000,27415=>1000,27416=>1000,27417=>1000,27418=>1000,27419=>1000,27420=>1000,27421=>1000,27422=>1000,27423=>1000,27424=>1000,27425=>1000,27426=>1000,27427=>1000,27428=>1000,
-	27429=>1000,27430=>1000,27431=>1000,27432=>1000,27433=>1000,27434=>1000,27435=>1000,27436=>1000,27437=>1000,27438=>1000,27439=>1000,27440=>1000,27441=>1000,27442=>1000,27443=>1000,27444=>1000,
-	27445=>1000,27446=>1000,27447=>1000,27448=>1000,27449=>1000,27450=>1000,27451=>1000,27452=>1000,27453=>1000,27454=>1000,27455=>1000,27456=>1000,27457=>1000,27458=>1000,27459=>1000,27460=>1000,
-	27461=>1000,27462=>1000,27463=>1000,27464=>1000,27465=>1000,27466=>1000,27467=>1000,27468=>1000,27469=>1000,27470=>1000,27471=>1000,27472=>1000,27473=>1000,27474=>1000,27475=>1000,27476=>1000,
-	27477=>1000,27478=>1000,27479=>1000,27480=>1000,27481=>1000,27482=>1000,27483=>1000,27484=>1000,27485=>1000,27486=>1000,27487=>1000,27488=>1000,27489=>1000,27490=>1000,27491=>1000,27492=>1000,
-	27493=>1000,27494=>1000,27495=>1000,27496=>1000,27497=>1000,27498=>1000,27499=>1000,27500=>1000,27501=>1000,27502=>1000,27503=>1000,27504=>1000,27505=>1000,27506=>1000,27507=>1000,27508=>1000,
-	27509=>1000,27510=>1000,27511=>1000,27512=>1000,27513=>1000,27514=>1000,27515=>1000,27516=>1000,27517=>1000,27518=>1000,27519=>1000,27520=>1000,27521=>1000,27522=>1000,27523=>1000,27524=>1000,
-	27525=>1000,27526=>1000,27527=>1000,27528=>1000,27529=>1000,27530=>1000,27531=>1000,27532=>1000,27533=>1000,27534=>1000,27535=>1000,27536=>1000,27537=>1000,27538=>1000,27539=>1000,27540=>1000,
-	27541=>1000,27542=>1000,27543=>1000,27544=>1000,27545=>1000,27546=>1000,27547=>1000,27548=>1000,27549=>1000,27550=>1000,27551=>1000,27552=>1000,27553=>1000,27554=>1000,27555=>1000,27556=>1000,
-	27557=>1000,27558=>1000,27559=>1000,27560=>1000,27561=>1000,27562=>1000,27563=>1000,27564=>1000,27565=>1000,27566=>1000,27567=>1000,27568=>1000,27569=>1000,27570=>1000,27571=>1000,27572=>1000,
-	27573=>1000,27574=>1000,27575=>1000,27576=>1000,27577=>1000,27578=>1000,27579=>1000,27580=>1000,27581=>1000,27582=>1000,27583=>1000,27584=>1000,27585=>1000,27586=>1000,27587=>1000,27588=>1000,
-	27589=>1000,27590=>1000,27591=>1000,27592=>1000,27593=>1000,27594=>1000,27595=>1000,27596=>1000,27597=>1000,27598=>1000,27599=>1000,27600=>1000,27601=>1000,27602=>1000,27603=>1000,27604=>1000,
-	27605=>1000,27606=>1000,27607=>1000,27608=>1000,27609=>1000,27610=>1000,27611=>1000,27612=>1000,27613=>1000,27614=>1000,27615=>1000,27616=>1000,27617=>1000,27618=>1000,27619=>1000,27620=>1000,
-	27621=>1000,27622=>1000,27623=>1000,27624=>1000,27625=>1000,27626=>1000,27627=>1000,27628=>1000,27629=>1000,27630=>1000,27631=>1000,27632=>1000,27633=>1000,27634=>1000,27635=>1000,27636=>1000,
-	27637=>1000,27638=>1000,27639=>1000,27640=>1000,27641=>1000,27642=>1000,27643=>1000,27644=>1000,27645=>1000,27646=>1000,27647=>1000,27648=>1000,27649=>1000,27650=>1000,27651=>1000,27652=>1000,
-	27653=>1000,27654=>1000,27655=>1000,27656=>1000,27657=>1000,27658=>1000,27659=>1000,27660=>1000,27661=>1000,27662=>1000,27663=>1000,27664=>1000,27665=>1000,27666=>1000,27667=>1000,27668=>1000,
-	27669=>1000,27670=>1000,27671=>1000,27672=>1000,27673=>1000,27674=>1000,27675=>1000,27676=>1000,27677=>1000,27678=>1000,27679=>1000,27680=>1000,27681=>1000,27682=>1000,27683=>1000,27684=>1000,
-	27685=>1000,27686=>1000,27687=>1000,27688=>1000,27689=>1000,27690=>1000,27691=>1000,27692=>1000,27693=>1000,27694=>1000,27695=>1000,27696=>1000,27697=>1000,27698=>1000,27699=>1000,27700=>1000,
-	27701=>1000,27702=>1000,27703=>1000,27704=>1000,27705=>1000,27706=>1000,27707=>1000,27708=>1000,27709=>1000,27710=>1000,27711=>1000,27712=>1000,27713=>1000,27714=>1000,27715=>1000,27716=>1000,
-	27717=>1000,27718=>1000,27719=>1000,27720=>1000,27721=>1000,27722=>1000,27723=>1000,27724=>1000,27725=>1000,27726=>1000,27727=>1000,27728=>1000,27729=>1000,27730=>1000,27731=>1000,27732=>1000,
-	27733=>1000,27734=>1000,27735=>1000,27736=>1000,27737=>1000,27738=>1000,27739=>1000,27740=>1000,27741=>1000,27742=>1000,27743=>1000,27744=>1000,27745=>1000,27746=>1000,27747=>1000,27748=>1000,
-	27749=>1000,27750=>1000,27751=>1000,27752=>1000,27753=>1000,27754=>1000,27755=>1000,27756=>1000,27757=>1000,27758=>1000,27759=>1000,27760=>1000,27761=>1000,27762=>1000,27763=>1000,27764=>1000,
-	27765=>1000,27766=>1000,27767=>1000,27768=>1000,27769=>1000,27770=>1000,27771=>1000,27772=>1000,27773=>1000,27774=>1000,27775=>1000,27776=>1000,27777=>1000,27778=>1000,27779=>1000,27780=>1000,
-	27781=>1000,27782=>1000,27783=>1000,27784=>1000,27785=>1000,27786=>1000,27787=>1000,27788=>1000,27789=>1000,27790=>1000,27791=>1000,27792=>1000,27793=>1000,27794=>1000,27795=>1000,27796=>1000,
-	27797=>1000,27798=>1000,27799=>1000,27800=>1000,27801=>1000,27802=>1000,27803=>1000,27804=>1000,27805=>1000,27806=>1000,27807=>1000,27808=>1000,27809=>1000,27810=>1000,27811=>1000,27812=>1000,
-	27813=>1000,27814=>1000,27815=>1000,27816=>1000,27817=>1000,27818=>1000,27819=>1000,27820=>1000,27821=>1000,27822=>1000,27823=>1000,27824=>1000,27825=>1000,27826=>1000,27827=>1000,27828=>1000,
-	27829=>1000,27830=>1000,27831=>1000,27832=>1000,27833=>1000,27834=>1000,27835=>1000,27836=>1000,27837=>1000,27838=>1000,27839=>1000,27840=>1000,27841=>1000,27842=>1000,27843=>1000,27844=>1000,
-	27845=>1000,27846=>1000,27847=>1000,27848=>1000,27849=>1000,27850=>1000,27851=>1000,27852=>1000,27853=>1000,27854=>1000,27855=>1000,27856=>1000,27857=>1000,27858=>1000,27859=>1000,27860=>1000,
-	27861=>1000,27862=>1000,27863=>1000,27864=>1000,27865=>1000,27866=>1000,27867=>1000,27868=>1000,27869=>1000,27870=>1000,27871=>1000,27872=>1000,27873=>1000,27874=>1000,27875=>1000,27876=>1000,
-	27877=>1000,27878=>1000,27879=>1000,27880=>1000,27881=>1000,27882=>1000,27883=>1000,27884=>1000,27885=>1000,27886=>1000,27887=>1000,27888=>1000,27889=>1000,27890=>1000,27891=>1000,27892=>1000,
-	27893=>1000,27894=>1000,27895=>1000,27896=>1000,27897=>1000,27898=>1000,27899=>1000,27900=>1000,27901=>1000,27902=>1000,27903=>1000,27904=>1000,27905=>1000,27906=>1000,27907=>1000,27908=>1000,
-	27909=>1000,27910=>1000,27911=>1000,27912=>1000,27913=>1000,27914=>1000,27915=>1000,27916=>1000,27917=>1000,27918=>1000,27919=>1000,27920=>1000,27921=>1000,27922=>1000,27923=>1000,27924=>1000,
-	27925=>1000,27926=>1000,27927=>1000,27928=>1000,27929=>1000,27930=>1000,27931=>1000,27932=>1000,27933=>1000,27934=>1000,27935=>1000,27936=>1000,27937=>1000,27938=>1000,27939=>1000,27940=>1000,
-	27941=>1000,27942=>1000,27943=>1000,27944=>1000,27945=>1000,27946=>1000,27947=>1000,27948=>1000,27949=>1000,27950=>1000,27951=>1000,27952=>1000,27953=>1000,27954=>1000,27955=>1000,27956=>1000,
-	27957=>1000,27958=>1000,27959=>1000,27960=>1000,27961=>1000,27962=>1000,27963=>1000,27964=>1000,27965=>1000,27966=>1000,27967=>1000,27968=>1000,27969=>1000,27970=>1000,27971=>1000,27972=>1000,
-	27973=>1000,27974=>1000,27975=>1000,27976=>1000,27977=>1000,27978=>1000,27979=>1000,27980=>1000,27981=>1000,27982=>1000,27983=>1000,27984=>1000,27985=>1000,27986=>1000,27987=>1000,27988=>1000,
-	27989=>1000,27990=>1000,27991=>1000,27992=>1000,27993=>1000,27994=>1000,27995=>1000,27996=>1000,27997=>1000,27998=>1000,27999=>1000,28000=>1000,28001=>1000,28002=>1000,28003=>1000,28004=>1000,
-	28005=>1000,28006=>1000,28007=>1000,28008=>1000,28009=>1000,28010=>1000,28011=>1000,28012=>1000,28013=>1000,28014=>1000,28015=>1000,28016=>1000,28017=>1000,28018=>1000,28019=>1000,28020=>1000,
-	28021=>1000,28022=>1000,28023=>1000,28024=>1000,28025=>1000,28026=>1000,28027=>1000,28028=>1000,28029=>1000,28030=>1000,28031=>1000,28032=>1000,28033=>1000,28034=>1000,28035=>1000,28036=>1000,
-	28037=>1000,28038=>1000,28039=>1000,28040=>1000,28041=>1000,28042=>1000,28043=>1000,28044=>1000,28045=>1000,28046=>1000,28047=>1000,28048=>1000,28049=>1000,28050=>1000,28051=>1000,28052=>1000,
-	28053=>1000,28054=>1000,28055=>1000,28056=>1000,28057=>1000,28058=>1000,28059=>1000,28060=>1000,28061=>1000,28062=>1000,28063=>1000,28064=>1000,28065=>1000,28066=>1000,28067=>1000,28068=>1000,
-	28069=>1000,28070=>1000,28071=>1000,28072=>1000,28073=>1000,28074=>1000,28075=>1000,28076=>1000,28077=>1000,28078=>1000,28079=>1000,28080=>1000,28081=>1000,28082=>1000,28083=>1000,28084=>1000,
-	28085=>1000,28086=>1000,28087=>1000,28088=>1000,28089=>1000,28090=>1000,28091=>1000,28092=>1000,28093=>1000,28094=>1000,28095=>1000,28096=>1000,28097=>1000,28098=>1000,28099=>1000,28100=>1000,
-	28101=>1000,28102=>1000,28103=>1000,28104=>1000,28105=>1000,28106=>1000,28107=>1000,28108=>1000,28109=>1000,28110=>1000,28111=>1000,28112=>1000,28113=>1000,28114=>1000,28115=>1000,28116=>1000,
-	28117=>1000,28118=>1000,28119=>1000,28120=>1000,28121=>1000,28122=>1000,28123=>1000,28124=>1000,28125=>1000,28126=>1000,28127=>1000,28128=>1000,28129=>1000,28130=>1000,28131=>1000,28132=>1000,
-	28133=>1000,28134=>1000,28135=>1000,28136=>1000,28137=>1000,28138=>1000,28139=>1000,28140=>1000,28141=>1000,28142=>1000,28143=>1000,28144=>1000,28145=>1000,28146=>1000,28147=>1000,28148=>1000,
-	28149=>1000,28150=>1000,28151=>1000,28152=>1000,28153=>1000,28154=>1000,28155=>1000,28156=>1000,28157=>1000,28158=>1000,28159=>1000,28160=>1000,28161=>1000,28162=>1000,28163=>1000,28164=>1000,
-	28165=>1000,28166=>1000,28167=>1000,28168=>1000,28169=>1000,28170=>1000,28171=>1000,28172=>1000,28173=>1000,28174=>1000,28175=>1000,28176=>1000,28177=>1000,28178=>1000,28179=>1000,28180=>1000,
-	28181=>1000,28182=>1000,28183=>1000,28184=>1000,28185=>1000,28186=>1000,28187=>1000,28188=>1000,28189=>1000,28190=>1000,28191=>1000,28192=>1000,28193=>1000,28194=>1000,28195=>1000,28196=>1000,
-	28197=>1000,28198=>1000,28199=>1000,28200=>1000,28201=>1000,28202=>1000,28203=>1000,28204=>1000,28205=>1000,28206=>1000,28207=>1000,28208=>1000,28209=>1000,28210=>1000,28211=>1000,28212=>1000,
-	28213=>1000,28214=>1000,28215=>1000,28216=>1000,28217=>1000,28218=>1000,28219=>1000,28220=>1000,28221=>1000,28222=>1000,28223=>1000,28224=>1000,28225=>1000,28226=>1000,28227=>1000,28228=>1000,
-	28229=>1000,28230=>1000,28231=>1000,28232=>1000,28233=>1000,28234=>1000,28235=>1000,28236=>1000,28237=>1000,28238=>1000,28239=>1000,28240=>1000,28241=>1000,28242=>1000,28243=>1000,28244=>1000,
-	28245=>1000,28246=>1000,28247=>1000,28248=>1000,28249=>1000,28250=>1000,28251=>1000,28252=>1000,28253=>1000,28254=>1000,28255=>1000,28256=>1000,28257=>1000,28258=>1000,28259=>1000,28260=>1000,
-	28261=>1000,28262=>1000,28263=>1000,28264=>1000,28265=>1000,28266=>1000,28267=>1000,28268=>1000,28269=>1000,28270=>1000,28271=>1000,28272=>1000,28273=>1000,28274=>1000,28275=>1000,28276=>1000,
-	28277=>1000,28278=>1000,28279=>1000,28280=>1000,28281=>1000,28282=>1000,28283=>1000,28284=>1000,28285=>1000,28286=>1000,28287=>1000,28288=>1000,28289=>1000,28290=>1000,28291=>1000,28292=>1000,
-	28293=>1000,28294=>1000,28295=>1000,28296=>1000,28297=>1000,28298=>1000,28299=>1000,28300=>1000,28301=>1000,28302=>1000,28303=>1000,28304=>1000,28305=>1000,28306=>1000,28307=>1000,28308=>1000,
-	28309=>1000,28310=>1000,28311=>1000,28312=>1000,28313=>1000,28314=>1000,28315=>1000,28316=>1000,28317=>1000,28318=>1000,28319=>1000,28320=>1000,28321=>1000,28322=>1000,28323=>1000,28324=>1000,
-	28325=>1000,28326=>1000,28327=>1000,28328=>1000,28329=>1000,28330=>1000,28331=>1000,28332=>1000,28333=>1000,28334=>1000,28335=>1000,28336=>1000,28337=>1000,28338=>1000,28339=>1000,28340=>1000,
-	28341=>1000,28342=>1000,28343=>1000,28344=>1000,28345=>1000,28346=>1000,28347=>1000,28348=>1000,28349=>1000,28350=>1000,28351=>1000,28352=>1000,28353=>1000,28354=>1000,28355=>1000,28356=>1000,
-	28357=>1000,28358=>1000,28359=>1000,28360=>1000,28361=>1000,28362=>1000,28363=>1000,28364=>1000,28365=>1000,28366=>1000,28367=>1000,28368=>1000,28369=>1000,28370=>1000,28371=>1000,28372=>1000,
-	28373=>1000,28374=>1000,28375=>1000,28376=>1000,28377=>1000,28378=>1000,28379=>1000,28380=>1000,28381=>1000,28382=>1000,28383=>1000,28384=>1000,28385=>1000,28386=>1000,28387=>1000,28388=>1000,
-	28389=>1000,28390=>1000,28391=>1000,28392=>1000,28393=>1000,28394=>1000,28395=>1000,28396=>1000,28397=>1000,28398=>1000,28399=>1000,28400=>1000,28401=>1000,28402=>1000,28403=>1000,28404=>1000,
-	28405=>1000,28406=>1000,28407=>1000,28408=>1000,28409=>1000,28410=>1000,28411=>1000,28412=>1000,28413=>1000,28414=>1000,28415=>1000,28416=>1000,28417=>1000,28418=>1000,28419=>1000,28420=>1000,
-	28421=>1000,28422=>1000,28423=>1000,28424=>1000,28425=>1000,28426=>1000,28427=>1000,28428=>1000,28429=>1000,28430=>1000,28431=>1000,28432=>1000,28433=>1000,28434=>1000,28435=>1000,28436=>1000,
-	28437=>1000,28438=>1000,28439=>1000,28440=>1000,28441=>1000,28442=>1000,28443=>1000,28444=>1000,28445=>1000,28446=>1000,28447=>1000,28448=>1000,28449=>1000,28450=>1000,28451=>1000,28452=>1000,
-	28453=>1000,28454=>1000,28455=>1000,28456=>1000,28457=>1000,28458=>1000,28459=>1000,28460=>1000,28461=>1000,28462=>1000,28463=>1000,28464=>1000,28465=>1000,28466=>1000,28467=>1000,28468=>1000,
-	28469=>1000,28470=>1000,28471=>1000,28472=>1000,28473=>1000,28474=>1000,28475=>1000,28476=>1000,28477=>1000,28478=>1000,28479=>1000,28480=>1000,28481=>1000,28482=>1000,28483=>1000,28484=>1000,
-	28485=>1000,28486=>1000,28487=>1000,28488=>1000,28489=>1000,28490=>1000,28491=>1000,28492=>1000,28493=>1000,28494=>1000,28495=>1000,28496=>1000,28497=>1000,28498=>1000,28499=>1000,28500=>1000,
-	28501=>1000,28502=>1000,28503=>1000,28504=>1000,28505=>1000,28506=>1000,28507=>1000,28508=>1000,28509=>1000,28510=>1000,28511=>1000,28512=>1000,28513=>1000,28514=>1000,28515=>1000,28516=>1000,
-	28517=>1000,28518=>1000,28519=>1000,28520=>1000,28521=>1000,28522=>1000,28523=>1000,28524=>1000,28525=>1000,28526=>1000,28527=>1000,28528=>1000,28529=>1000,28530=>1000,28531=>1000,28532=>1000,
-	28533=>1000,28534=>1000,28535=>1000,28536=>1000,28537=>1000,28538=>1000,28539=>1000,28540=>1000,28541=>1000,28542=>1000,28543=>1000,28544=>1000,28545=>1000,28546=>1000,28547=>1000,28548=>1000,
-	28549=>1000,28550=>1000,28551=>1000,28552=>1000,28553=>1000,28554=>1000,28555=>1000,28556=>1000,28557=>1000,28558=>1000,28559=>1000,28560=>1000,28561=>1000,28562=>1000,28563=>1000,28564=>1000,
-	28565=>1000,28566=>1000,28567=>1000,28568=>1000,28569=>1000,28570=>1000,28571=>1000,28572=>1000,28573=>1000,28574=>1000,28575=>1000,28576=>1000,28577=>1000,28578=>1000,28579=>1000,28580=>1000,
-	28581=>1000,28582=>1000,28583=>1000,28584=>1000,28585=>1000,28586=>1000,28587=>1000,28588=>1000,28589=>1000,28590=>1000,28591=>1000,28592=>1000,28593=>1000,28594=>1000,28595=>1000,28596=>1000,
-	28597=>1000,28598=>1000,28599=>1000,28600=>1000,28601=>1000,28602=>1000,28603=>1000,28604=>1000,28605=>1000,28606=>1000,28607=>1000,28608=>1000,28609=>1000,28610=>1000,28611=>1000,28612=>1000,
-	28613=>1000,28614=>1000,28615=>1000,28616=>1000,28617=>1000,28618=>1000,28619=>1000,28620=>1000,28621=>1000,28622=>1000,28623=>1000,28624=>1000,28625=>1000,28626=>1000,28627=>1000,28628=>1000,
-	28629=>1000,28630=>1000,28631=>1000,28632=>1000,28633=>1000,28634=>1000,28635=>1000,28636=>1000,28637=>1000,28638=>1000,28639=>1000,28640=>1000,28641=>1000,28642=>1000,28643=>1000,28644=>1000,
-	28645=>1000,28646=>1000,28647=>1000,28648=>1000,28649=>1000,28650=>1000,28651=>1000,28652=>1000,28653=>1000,28654=>1000,28655=>1000,28656=>1000,28657=>1000,28658=>1000,28659=>1000,28660=>1000,
-	28661=>1000,28662=>1000,28663=>1000,28664=>1000,28665=>1000,28666=>1000,28667=>1000,28668=>1000,28669=>1000,28670=>1000,28671=>1000,28672=>1000,28673=>1000,28674=>1000,28675=>1000,28676=>1000,
-	28677=>1000,28678=>1000,28679=>1000,28680=>1000,28681=>1000,28682=>1000,28683=>1000,28684=>1000,28685=>1000,28686=>1000,28687=>1000,28688=>1000,28689=>1000,28690=>1000,28691=>1000,28692=>1000,
-	28693=>1000,28694=>1000,28695=>1000,28696=>1000,28697=>1000,28698=>1000,28699=>1000,28700=>1000,28701=>1000,28702=>1000,28703=>1000,28704=>1000,28705=>1000,28706=>1000,28707=>1000,28708=>1000,
-	28709=>1000,28710=>1000,28711=>1000,28712=>1000,28713=>1000,28714=>1000,28715=>1000,28716=>1000,28717=>1000,28718=>1000,28719=>1000,28720=>1000,28721=>1000,28722=>1000,28723=>1000,28724=>1000,
-	28725=>1000,28726=>1000,28727=>1000,28728=>1000,28729=>1000,28730=>1000,28731=>1000,28732=>1000,28733=>1000,28734=>1000,28735=>1000,28736=>1000,28737=>1000,28738=>1000,28739=>1000,28740=>1000,
-	28741=>1000,28742=>1000,28743=>1000,28744=>1000,28745=>1000,28746=>1000,28747=>1000,28748=>1000,28749=>1000,28750=>1000,28751=>1000,28752=>1000,28753=>1000,28754=>1000,28755=>1000,28756=>1000,
-	28757=>1000,28758=>1000,28759=>1000,28760=>1000,28761=>1000,28762=>1000,28763=>1000,28764=>1000,28765=>1000,28766=>1000,28767=>1000,28768=>1000,28769=>1000,28770=>1000,28771=>1000,28772=>1000,
-	28773=>1000,28774=>1000,28775=>1000,28776=>1000,28777=>1000,28778=>1000,28779=>1000,28780=>1000,28781=>1000,28782=>1000,28783=>1000,28784=>1000,28785=>1000,28786=>1000,28787=>1000,28788=>1000,
-	28789=>1000,28790=>1000,28791=>1000,28792=>1000,28793=>1000,28794=>1000,28795=>1000,28796=>1000,28797=>1000,28798=>1000,28799=>1000,28800=>1000,28801=>1000,28802=>1000,28803=>1000,28804=>1000,
-	28805=>1000,28806=>1000,28807=>1000,28808=>1000,28809=>1000,28810=>1000,28811=>1000,28812=>1000,28813=>1000,28814=>1000,28815=>1000,28816=>1000,28817=>1000,28818=>1000,28819=>1000,28820=>1000,
-	28821=>1000,28822=>1000,28823=>1000,28824=>1000,28825=>1000,28826=>1000,28827=>1000,28828=>1000,28829=>1000,28830=>1000,28831=>1000,28832=>1000,28833=>1000,28834=>1000,28835=>1000,28836=>1000,
-	28837=>1000,28838=>1000,28839=>1000,28840=>1000,28841=>1000,28842=>1000,28843=>1000,28844=>1000,28845=>1000,28846=>1000,28847=>1000,28848=>1000,28849=>1000,28850=>1000,28851=>1000,28852=>1000,
-	28853=>1000,28854=>1000,28855=>1000,28856=>1000,28857=>1000,28858=>1000,28859=>1000,28860=>1000,28861=>1000,28862=>1000,28863=>1000,28864=>1000,28865=>1000,28866=>1000,28867=>1000,28868=>1000,
-	28869=>1000,28870=>1000,28871=>1000,28872=>1000,28873=>1000,28874=>1000,28875=>1000,28876=>1000,28877=>1000,28878=>1000,28879=>1000,28880=>1000,28881=>1000,28882=>1000,28883=>1000,28884=>1000,
-	28885=>1000,28886=>1000,28887=>1000,28888=>1000,28889=>1000,28890=>1000,28891=>1000,28892=>1000,28893=>1000,28894=>1000,28895=>1000,28896=>1000,28897=>1000,28898=>1000,28899=>1000,28900=>1000,
-	28901=>1000,28902=>1000,28903=>1000,28904=>1000,28905=>1000,28906=>1000,28907=>1000,28908=>1000,28909=>1000,28910=>1000,28911=>1000,28912=>1000,28913=>1000,28914=>1000,28915=>1000,28916=>1000,
-	28917=>1000,28918=>1000,28919=>1000,28920=>1000,28921=>1000,28922=>1000,28923=>1000,28924=>1000,28925=>1000,28926=>1000,28927=>1000,28928=>1000,28929=>1000,28930=>1000,28931=>1000,28932=>1000,
-	28933=>1000,28934=>1000,28935=>1000,28936=>1000,28937=>1000,28938=>1000,28939=>1000,28940=>1000,28941=>1000,28942=>1000,28943=>1000,28944=>1000,28945=>1000,28946=>1000,28947=>1000,28948=>1000,
-	28949=>1000,28950=>1000,28951=>1000,28952=>1000,28953=>1000,28954=>1000,28955=>1000,28956=>1000,28957=>1000,28958=>1000,28959=>1000,28960=>1000,28961=>1000,28962=>1000,28963=>1000,28964=>1000,
-	28965=>1000,28966=>1000,28967=>1000,28968=>1000,28969=>1000,28970=>1000,28971=>1000,28972=>1000,28973=>1000,28974=>1000,28975=>1000,28976=>1000,28977=>1000,28978=>1000,28979=>1000,28980=>1000,
-	28981=>1000,28982=>1000,28983=>1000,28984=>1000,28985=>1000,28986=>1000,28987=>1000,28988=>1000,28989=>1000,28990=>1000,28991=>1000,28992=>1000,28993=>1000,28994=>1000,28995=>1000,28996=>1000,
-	28997=>1000,28998=>1000,28999=>1000,29000=>1000,29001=>1000,29002=>1000,29003=>1000,29004=>1000,29005=>1000,29006=>1000,29007=>1000,29008=>1000,29009=>1000,29010=>1000,29011=>1000,29012=>1000,
-	29013=>1000,29014=>1000,29015=>1000,29016=>1000,29017=>1000,29018=>1000,29019=>1000,29020=>1000,29021=>1000,29022=>1000,29023=>1000,29024=>1000,29025=>1000,29026=>1000,29027=>1000,29028=>1000,
-	29029=>1000,29030=>1000,29031=>1000,29032=>1000,29033=>1000,29034=>1000,29035=>1000,29036=>1000,29037=>1000,29038=>1000,29039=>1000,29040=>1000,29041=>1000,29042=>1000,29043=>1000,29044=>1000,
-	29045=>1000,29046=>1000,29047=>1000,29048=>1000,29049=>1000,29050=>1000,29051=>1000,29052=>1000,29053=>1000,29054=>1000,29055=>1000,29056=>1000,29057=>1000,29058=>1000,29059=>1000,29060=>1000,
-	29061=>1000,29062=>1000,29063=>1000,29064=>1000,29065=>1000,29066=>1000,29067=>1000,29068=>1000,29069=>1000,29070=>1000,29071=>1000,29072=>1000,29073=>1000,29074=>1000,29075=>1000,29076=>1000,
-	29077=>1000,29078=>1000,29079=>1000,29080=>1000,29081=>1000,29082=>1000,29083=>1000,29084=>1000,29085=>1000,29086=>1000,29087=>1000,29088=>1000,29089=>1000,29090=>1000,29091=>1000,29092=>1000,
-	29093=>1000,29094=>1000,29095=>1000,29096=>1000,29097=>1000,29098=>1000,29099=>1000,29100=>1000,29101=>1000,29102=>1000,29103=>1000,29104=>1000,29105=>1000,29106=>1000,29107=>1000,29108=>1000,
-	29109=>1000,29110=>1000,29111=>1000,29112=>1000,29113=>1000,29114=>1000,29115=>1000,29116=>1000,29117=>1000,29118=>1000,29119=>1000,29120=>1000,29121=>1000,29122=>1000,29123=>1000,29124=>1000,
-	29125=>1000,29126=>1000,29127=>1000,29128=>1000,29129=>1000,29130=>1000,29131=>1000,29132=>1000,29133=>1000,29134=>1000,29135=>1000,29136=>1000,29137=>1000,29138=>1000,29139=>1000,29140=>1000,
-	29141=>1000,29142=>1000,29143=>1000,29144=>1000,29145=>1000,29146=>1000,29147=>1000,29148=>1000,29149=>1000,29150=>1000,29151=>1000,29152=>1000,29153=>1000,29154=>1000,29155=>1000,29156=>1000,
-	29157=>1000,29158=>1000,29159=>1000,29160=>1000,29161=>1000,29162=>1000,29163=>1000,29164=>1000,29165=>1000,29166=>1000,29167=>1000,29168=>1000,29169=>1000,29170=>1000,29171=>1000,29172=>1000,
-	29173=>1000,29174=>1000,29175=>1000,29176=>1000,29177=>1000,29178=>1000,29179=>1000,29180=>1000,29181=>1000,29182=>1000,29183=>1000,29184=>1000,29185=>1000,29186=>1000,29187=>1000,29188=>1000,
-	29189=>1000,29190=>1000,29191=>1000,29192=>1000,29193=>1000,29194=>1000,29195=>1000,29196=>1000,29197=>1000,29198=>1000,29199=>1000,29200=>1000,29201=>1000,29202=>1000,29203=>1000,29204=>1000,
-	29205=>1000,29206=>1000,29207=>1000,29208=>1000,29209=>1000,29210=>1000,29211=>1000,29212=>1000,29213=>1000,29214=>1000,29215=>1000,29216=>1000,29217=>1000,29218=>1000,29219=>1000,29220=>1000,
-	29221=>1000,29222=>1000,29223=>1000,29224=>1000,29225=>1000,29226=>1000,29227=>1000,29228=>1000,29229=>1000,29230=>1000,29231=>1000,29232=>1000,29233=>1000,29234=>1000,29235=>1000,29236=>1000,
-	29237=>1000,29238=>1000,29239=>1000,29240=>1000,29241=>1000,29242=>1000,29243=>1000,29244=>1000,29245=>1000,29246=>1000,29247=>1000,29248=>1000,29249=>1000,29250=>1000,29251=>1000,29252=>1000,
-	29253=>1000,29254=>1000,29255=>1000,29256=>1000,29257=>1000,29258=>1000,29259=>1000,29260=>1000,29261=>1000,29262=>1000,29263=>1000,29264=>1000,29265=>1000,29266=>1000,29267=>1000,29268=>1000,
-	29269=>1000,29270=>1000,29271=>1000,29272=>1000,29273=>1000,29274=>1000,29275=>1000,29276=>1000,29277=>1000,29278=>1000,29279=>1000,29280=>1000,29281=>1000,29282=>1000,29283=>1000,29284=>1000,
-	29285=>1000,29286=>1000,29287=>1000,29288=>1000,29289=>1000,29290=>1000,29291=>1000,29292=>1000,29293=>1000,29294=>1000,29295=>1000,29296=>1000,29297=>1000,29298=>1000,29299=>1000,29300=>1000,
-	29301=>1000,29302=>1000,29303=>1000,29304=>1000,29305=>1000,29306=>1000,29307=>1000,29308=>1000,29309=>1000,29310=>1000,29311=>1000,29312=>1000,29313=>1000,29314=>1000,29315=>1000,29316=>1000,
-	29317=>1000,29318=>1000,29319=>1000,29320=>1000,29321=>1000,29322=>1000,29323=>1000,29324=>1000,29325=>1000,29326=>1000,29327=>1000,29328=>1000,29329=>1000,29330=>1000,29331=>1000,29332=>1000,
-	29333=>1000,29334=>1000,29335=>1000,29336=>1000,29337=>1000,29338=>1000,29339=>1000,29340=>1000,29341=>1000,29342=>1000,29343=>1000,29344=>1000,29345=>1000,29346=>1000,29347=>1000,29348=>1000,
-	29349=>1000,29350=>1000,29351=>1000,29352=>1000,29353=>1000,29354=>1000,29355=>1000,29356=>1000,29357=>1000,29358=>1000,29359=>1000,29360=>1000,29361=>1000,29362=>1000,29363=>1000,29364=>1000,
-	29365=>1000,29366=>1000,29367=>1000,29368=>1000,29369=>1000,29370=>1000,29371=>1000,29372=>1000,29373=>1000,29374=>1000,29375=>1000,29376=>1000,29377=>1000,29378=>1000,29379=>1000,29380=>1000,
-	29381=>1000,29382=>1000,29383=>1000,29384=>1000,29385=>1000,29386=>1000,29387=>1000,29388=>1000,29389=>1000,29390=>1000,29391=>1000,29392=>1000,29393=>1000,29394=>1000,29395=>1000,29396=>1000,
-	29397=>1000,29398=>1000,29399=>1000,29400=>1000,29401=>1000,29402=>1000,29403=>1000,29404=>1000,29405=>1000,29406=>1000,29407=>1000,29408=>1000,29409=>1000,29410=>1000,29411=>1000,29412=>1000,
-	29413=>1000,29414=>1000,29415=>1000,29416=>1000,29417=>1000,29418=>1000,29419=>1000,29420=>1000,29421=>1000,29422=>1000,29423=>1000,29424=>1000,29425=>1000,29426=>1000,29427=>1000,29428=>1000,
-	29429=>1000,29430=>1000,29431=>1000,29432=>1000,29433=>1000,29434=>1000,29435=>1000,29436=>1000,29437=>1000,29438=>1000,29439=>1000,29440=>1000,29441=>1000,29442=>1000,29443=>1000,29444=>1000,
-	29445=>1000,29446=>1000,29447=>1000,29448=>1000,29449=>1000,29450=>1000,29451=>1000,29452=>1000,29453=>1000,29454=>1000,29455=>1000,29456=>1000,29457=>1000,29458=>1000,29459=>1000,29460=>1000,
-	29461=>1000,29462=>1000,29463=>1000,29464=>1000,29465=>1000,29466=>1000,29467=>1000,29468=>1000,29469=>1000,29470=>1000,29471=>1000,29472=>1000,29473=>1000,29474=>1000,29475=>1000,29476=>1000,
-	29477=>1000,29478=>1000,29479=>1000,29480=>1000,29481=>1000,29482=>1000,29483=>1000,29484=>1000,29485=>1000,29486=>1000,29487=>1000,29488=>1000,29489=>1000,29490=>1000,29491=>1000,29492=>1000,
-	29493=>1000,29494=>1000,29495=>1000,29496=>1000,29497=>1000,29498=>1000,29499=>1000,29500=>1000,29501=>1000,29502=>1000,29503=>1000,29504=>1000,29505=>1000,29506=>1000,29507=>1000,29508=>1000,
-	29509=>1000,29510=>1000,29511=>1000,29512=>1000,29513=>1000,29514=>1000,29515=>1000,29516=>1000,29517=>1000,29518=>1000,29519=>1000,29520=>1000,29521=>1000,29522=>1000,29523=>1000,29524=>1000,
-	29525=>1000,29526=>1000,29527=>1000,29528=>1000,29529=>1000,29530=>1000,29531=>1000,29532=>1000,29533=>1000,29534=>1000,29535=>1000,29536=>1000,29537=>1000,29538=>1000,29539=>1000,29540=>1000,
-	29541=>1000,29542=>1000,29543=>1000,29544=>1000,29545=>1000,29546=>1000,29547=>1000,29548=>1000,29549=>1000,29550=>1000,29551=>1000,29552=>1000,29553=>1000,29554=>1000,29555=>1000,29556=>1000,
-	29557=>1000,29558=>1000,29559=>1000,29560=>1000,29561=>1000,29562=>1000,29563=>1000,29564=>1000,29565=>1000,29566=>1000,29567=>1000,29568=>1000,29569=>1000,29570=>1000,29571=>1000,29572=>1000,
-	29573=>1000,29574=>1000,29575=>1000,29576=>1000,29577=>1000,29578=>1000,29579=>1000,29580=>1000,29581=>1000,29582=>1000,29583=>1000,29584=>1000,29585=>1000,29586=>1000,29587=>1000,29588=>1000,
-	29589=>1000,29590=>1000,29591=>1000,29592=>1000,29593=>1000,29594=>1000,29595=>1000,29596=>1000,29597=>1000,29598=>1000,29599=>1000,29600=>1000,29601=>1000,29602=>1000,29603=>1000,29604=>1000,
-	29605=>1000,29606=>1000,29607=>1000,29608=>1000,29609=>1000,29610=>1000,29611=>1000,29612=>1000,29613=>1000,29614=>1000,29615=>1000,29616=>1000,29617=>1000,29618=>1000,29619=>1000,29620=>1000,
-	29621=>1000,29622=>1000,29623=>1000,29624=>1000,29625=>1000,29626=>1000,29627=>1000,29628=>1000,29629=>1000,29630=>1000,29631=>1000,29632=>1000,29633=>1000,29634=>1000,29635=>1000,29636=>1000,
-	29637=>1000,29638=>1000,29639=>1000,29640=>1000,29641=>1000,29642=>1000,29643=>1000,29644=>1000,29645=>1000,29646=>1000,29647=>1000,29648=>1000,29649=>1000,29650=>1000,29651=>1000,29652=>1000,
-	29653=>1000,29654=>1000,29655=>1000,29656=>1000,29657=>1000,29658=>1000,29659=>1000,29660=>1000,29661=>1000,29662=>1000,29663=>1000,29664=>1000,29665=>1000,29666=>1000,29667=>1000,29668=>1000,
-	29669=>1000,29670=>1000,29671=>1000,29672=>1000,29673=>1000,29674=>1000,29675=>1000,29676=>1000,29677=>1000,29678=>1000,29679=>1000,29680=>1000,29681=>1000,29682=>1000,29683=>1000,29684=>1000,
-	29685=>1000,29686=>1000,29687=>1000,29688=>1000,29689=>1000,29690=>1000,29691=>1000,29692=>1000,29693=>1000,29694=>1000,29695=>1000,29696=>1000,29697=>1000,29698=>1000,29699=>1000,29700=>1000,
-	29701=>1000,29702=>1000,29703=>1000,29704=>1000,29705=>1000,29706=>1000,29707=>1000,29708=>1000,29709=>1000,29710=>1000,29711=>1000,29712=>1000,29713=>1000,29714=>1000,29715=>1000,29716=>1000,
-	29717=>1000,29718=>1000,29719=>1000,29720=>1000,29721=>1000,29722=>1000,29723=>1000,29724=>1000,29725=>1000,29726=>1000,29727=>1000,29728=>1000,29729=>1000,29730=>1000,29731=>1000,29732=>1000,
-	29733=>1000,29734=>1000,29735=>1000,29736=>1000,29737=>1000,29738=>1000,29739=>1000,29740=>1000,29741=>1000,29742=>1000,29743=>1000,29744=>1000,29745=>1000,29746=>1000,29747=>1000,29748=>1000,
-	29749=>1000,29750=>1000,29751=>1000,29752=>1000,29753=>1000,29754=>1000,29755=>1000,29756=>1000,29757=>1000,29758=>1000,29759=>1000,29760=>1000,29761=>1000,29762=>1000,29763=>1000,29764=>1000,
-	29765=>1000,29766=>1000,29767=>1000,29768=>1000,29769=>1000,29770=>1000,29771=>1000,29772=>1000,29773=>1000,29774=>1000,29775=>1000,29776=>1000,29777=>1000,29778=>1000,29779=>1000,29780=>1000,
-	29781=>1000,29782=>1000,29783=>1000,29784=>1000,29785=>1000,29786=>1000,29787=>1000,29788=>1000,29789=>1000,29790=>1000,29791=>1000,29792=>1000,29793=>1000,29794=>1000,29795=>1000,29796=>1000,
-	29797=>1000,29798=>1000,29799=>1000,29800=>1000,29801=>1000,29802=>1000,29803=>1000,29804=>1000,29805=>1000,29806=>1000,29807=>1000,29808=>1000,29809=>1000,29810=>1000,29811=>1000,29812=>1000,
-	29813=>1000,29814=>1000,29815=>1000,29816=>1000,29817=>1000,29818=>1000,29819=>1000,29820=>1000,29821=>1000,29822=>1000,29823=>1000,29824=>1000,29825=>1000,29826=>1000,29827=>1000,29828=>1000,
-	29829=>1000,29830=>1000,29831=>1000,29832=>1000,29833=>1000,29834=>1000,29835=>1000,29836=>1000,29837=>1000,29838=>1000,29839=>1000,29840=>1000,29841=>1000,29842=>1000,29843=>1000,29844=>1000,
-	29845=>1000,29846=>1000,29847=>1000,29848=>1000,29849=>1000,29850=>1000,29851=>1000,29852=>1000,29853=>1000,29854=>1000,29855=>1000,29856=>1000,29857=>1000,29858=>1000,29859=>1000,29860=>1000,
-	29861=>1000,29862=>1000,29863=>1000,29864=>1000,29865=>1000,29866=>1000,29867=>1000,29868=>1000,29869=>1000,29870=>1000,29871=>1000,29872=>1000,29873=>1000,29874=>1000,29875=>1000,29876=>1000,
-	29877=>1000,29878=>1000,29879=>1000,29880=>1000,29881=>1000,29882=>1000,29883=>1000,29884=>1000,29885=>1000,29886=>1000,29887=>1000,29888=>1000,29889=>1000,29890=>1000,29891=>1000,29892=>1000,
-	29893=>1000,29894=>1000,29895=>1000,29896=>1000,29897=>1000,29898=>1000,29899=>1000,29900=>1000,29901=>1000,29902=>1000,29903=>1000,29904=>1000,29905=>1000,29906=>1000,29907=>1000,29908=>1000,
-	29909=>1000,29910=>1000,29911=>1000,29912=>1000,29913=>1000,29914=>1000,29915=>1000,29916=>1000,29917=>1000,29918=>1000,29919=>1000,29920=>1000,29921=>1000,29922=>1000,29923=>1000,29924=>1000,
-	29925=>1000,29926=>1000,29927=>1000,29928=>1000,29929=>1000,29930=>1000,29931=>1000,29932=>1000,29933=>1000,29934=>1000,29935=>1000,29936=>1000,29937=>1000,29938=>1000,29939=>1000,29940=>1000,
-	29941=>1000,29942=>1000,29943=>1000,29944=>1000,29945=>1000,29946=>1000,29947=>1000,29948=>1000,29949=>1000,29950=>1000,29951=>1000,29952=>1000,29953=>1000,29954=>1000,29955=>1000,29956=>1000,
-	29957=>1000,29958=>1000,29959=>1000,29960=>1000,29961=>1000,29962=>1000,29963=>1000,29964=>1000,29965=>1000,29966=>1000,29967=>1000,29968=>1000,29969=>1000,29970=>1000,29971=>1000,29972=>1000,
-	29973=>1000,29974=>1000,29975=>1000,29976=>1000,29977=>1000,29978=>1000,29979=>1000,29980=>1000,29981=>1000,29982=>1000,29983=>1000,29984=>1000,29985=>1000,29986=>1000,29987=>1000,29988=>1000,
-	29989=>1000,29990=>1000,29991=>1000,29992=>1000,29993=>1000,29994=>1000,29995=>1000,29996=>1000,29997=>1000,29998=>1000,29999=>1000,30000=>1000,30001=>1000,30002=>1000,30003=>1000,30004=>1000,
-	30005=>1000,30006=>1000,30007=>1000,30008=>1000,30009=>1000,30010=>1000,30011=>1000,30012=>1000,30013=>1000,30014=>1000,30015=>1000,30016=>1000,30017=>1000,30018=>1000,30019=>1000,30020=>1000,
-	30021=>1000,30022=>1000,30023=>1000,30024=>1000,30025=>1000,30026=>1000,30027=>1000,30028=>1000,30029=>1000,30030=>1000,30031=>1000,30032=>1000,30033=>1000,30034=>1000,30035=>1000,30036=>1000,
-	30037=>1000,30038=>1000,30039=>1000,30040=>1000,30041=>1000,30042=>1000,30043=>1000,30044=>1000,30045=>1000,30046=>1000,30047=>1000,30048=>1000,30049=>1000,30050=>1000,30051=>1000,30052=>1000,
-	30053=>1000,30054=>1000,30055=>1000,30056=>1000,30057=>1000,30058=>1000,30059=>1000,30060=>1000,30061=>1000,30062=>1000,30063=>1000,30064=>1000,30065=>1000,30066=>1000,30067=>1000,30068=>1000,
-	30069=>1000,30070=>1000,30071=>1000,30072=>1000,30073=>1000,30074=>1000,30075=>1000,30076=>1000,30077=>1000,30078=>1000,30079=>1000,30080=>1000,30081=>1000,30082=>1000,30083=>1000,30084=>1000,
-	30085=>1000,30086=>1000,30087=>1000,30088=>1000,30089=>1000,30090=>1000,30091=>1000,30092=>1000,30093=>1000,30094=>1000,30095=>1000,30096=>1000,30097=>1000,30098=>1000,30099=>1000,30100=>1000,
-	30101=>1000,30102=>1000,30103=>1000,30104=>1000,30105=>1000,30106=>1000,30107=>1000,30108=>1000,30109=>1000,30110=>1000,30111=>1000,30112=>1000,30113=>1000,30114=>1000,30115=>1000,30116=>1000,
-	30117=>1000,30118=>1000,30119=>1000,30120=>1000,30121=>1000,30122=>1000,30123=>1000,30124=>1000,30125=>1000,30126=>1000,30127=>1000,30128=>1000,30129=>1000,30130=>1000,30131=>1000,30132=>1000,
-	30133=>1000,30134=>1000,30135=>1000,30136=>1000,30137=>1000,30138=>1000,30139=>1000,30140=>1000,30141=>1000,30142=>1000,30143=>1000,30144=>1000,30145=>1000,30146=>1000,30147=>1000,30148=>1000,
-	30149=>1000,30150=>1000,30151=>1000,30152=>1000,30153=>1000,30154=>1000,30155=>1000,30156=>1000,30157=>1000,30158=>1000,30159=>1000,30160=>1000,30161=>1000,30162=>1000,30163=>1000,30164=>1000,
-	30165=>1000,30166=>1000,30167=>1000,30168=>1000,30169=>1000,30170=>1000,30171=>1000,30172=>1000,30173=>1000,30174=>1000,30175=>1000,30176=>1000,30177=>1000,30178=>1000,30179=>1000,30180=>1000,
-	30181=>1000,30182=>1000,30183=>1000,30184=>1000,30185=>1000,30186=>1000,30187=>1000,30188=>1000,30189=>1000,30190=>1000,30191=>1000,30192=>1000,30193=>1000,30194=>1000,30195=>1000,30196=>1000,
-	30197=>1000,30198=>1000,30199=>1000,30200=>1000,30201=>1000,30202=>1000,30203=>1000,30204=>1000,30205=>1000,30206=>1000,30207=>1000,30208=>1000,30209=>1000,30210=>1000,30211=>1000,30212=>1000,
-	30213=>1000,30214=>1000,30215=>1000,30216=>1000,30217=>1000,30218=>1000,30219=>1000,30220=>1000,30221=>1000,30222=>1000,30223=>1000,30224=>1000,30225=>1000,30226=>1000,30227=>1000,30228=>1000,
-	30229=>1000,30230=>1000,30231=>1000,30232=>1000,30233=>1000,30234=>1000,30235=>1000,30236=>1000,30237=>1000,30238=>1000,30239=>1000,30240=>1000,30241=>1000,30242=>1000,30243=>1000,30244=>1000,
-	30245=>1000,30246=>1000,30247=>1000,30248=>1000,30249=>1000,30250=>1000,30251=>1000,30252=>1000,30253=>1000,30254=>1000,30255=>1000,30256=>1000,30257=>1000,30258=>1000,30259=>1000,30260=>1000,
-	30261=>1000,30262=>1000,30263=>1000,30264=>1000,30265=>1000,30266=>1000,30267=>1000,30268=>1000,30269=>1000,30270=>1000,30271=>1000,30272=>1000,30273=>1000,30274=>1000,30275=>1000,30276=>1000,
-	30277=>1000,30278=>1000,30279=>1000,30280=>1000,30281=>1000,30282=>1000,30283=>1000,30284=>1000,30285=>1000,30286=>1000,30287=>1000,30288=>1000,30289=>1000,30290=>1000,30291=>1000,30292=>1000,
-	30293=>1000,30294=>1000,30295=>1000,30296=>1000,30297=>1000,30298=>1000,30299=>1000,30300=>1000,30301=>1000,30302=>1000,30303=>1000,30304=>1000,30305=>1000,30306=>1000,30307=>1000,30308=>1000,
-	30309=>1000,30310=>1000,30311=>1000,30312=>1000,30313=>1000,30314=>1000,30315=>1000,30316=>1000,30317=>1000,30318=>1000,30319=>1000,30320=>1000,30321=>1000,30322=>1000,30323=>1000,30324=>1000,
-	30325=>1000,30326=>1000,30327=>1000,30328=>1000,30329=>1000,30330=>1000,30331=>1000,30332=>1000,30333=>1000,30334=>1000,30335=>1000,30336=>1000,30337=>1000,30338=>1000,30339=>1000,30340=>1000,
-	30341=>1000,30342=>1000,30343=>1000,30344=>1000,30345=>1000,30346=>1000,30347=>1000,30348=>1000,30349=>1000,30350=>1000,30351=>1000,30352=>1000,30353=>1000,30354=>1000,30355=>1000,30356=>1000,
-	30357=>1000,30358=>1000,30359=>1000,30360=>1000,30361=>1000,30362=>1000,30363=>1000,30364=>1000,30365=>1000,30366=>1000,30367=>1000,30368=>1000,30369=>1000,30370=>1000,30371=>1000,30372=>1000,
-	30373=>1000,30374=>1000,30375=>1000,30376=>1000,30377=>1000,30378=>1000,30379=>1000,30380=>1000,30381=>1000,30382=>1000,30383=>1000,30384=>1000,30385=>1000,30386=>1000,30387=>1000,30388=>1000,
-	30389=>1000,30390=>1000,30391=>1000,30392=>1000,30393=>1000,30394=>1000,30395=>1000,30396=>1000,30397=>1000,30398=>1000,30399=>1000,30400=>1000,30401=>1000,30402=>1000,30403=>1000,30404=>1000,
-	30405=>1000,30406=>1000,30407=>1000,30408=>1000,30409=>1000,30410=>1000,30411=>1000,30412=>1000,30413=>1000,30414=>1000,30415=>1000,30416=>1000,30417=>1000,30418=>1000,30419=>1000,30420=>1000,
-	30421=>1000,30422=>1000,30423=>1000,30424=>1000,30425=>1000,30426=>1000,30427=>1000,30428=>1000,30429=>1000,30430=>1000,30431=>1000,30432=>1000,30433=>1000,30434=>1000,30435=>1000,30436=>1000,
-	30437=>1000,30438=>1000,30439=>1000,30440=>1000,30441=>1000,30442=>1000,30443=>1000,30444=>1000,30445=>1000,30446=>1000,30447=>1000,30448=>1000,30449=>1000,30450=>1000,30451=>1000,30452=>1000,
-	30453=>1000,30454=>1000,30455=>1000,30456=>1000,30457=>1000,30458=>1000,30459=>1000,30460=>1000,30461=>1000,30462=>1000,30463=>1000,30464=>1000,30465=>1000,30466=>1000,30467=>1000,30468=>1000,
-	30469=>1000,30470=>1000,30471=>1000,30472=>1000,30473=>1000,30474=>1000,30475=>1000,30476=>1000,30477=>1000,30478=>1000,30479=>1000,30480=>1000,30481=>1000,30482=>1000,30483=>1000,30484=>1000,
-	30485=>1000,30486=>1000,30487=>1000,30488=>1000,30489=>1000,30490=>1000,30491=>1000,30492=>1000,30493=>1000,30494=>1000,30495=>1000,30496=>1000,30497=>1000,30498=>1000,30499=>1000,30500=>1000,
-	30501=>1000,30502=>1000,30503=>1000,30504=>1000,30505=>1000,30506=>1000,30507=>1000,30508=>1000,30509=>1000,30510=>1000,30511=>1000,30512=>1000,30513=>1000,30514=>1000,30515=>1000,30516=>1000,
-	30517=>1000,30518=>1000,30519=>1000,30520=>1000,30521=>1000,30522=>1000,30523=>1000,30524=>1000,30525=>1000,30526=>1000,30527=>1000,30528=>1000,30529=>1000,30530=>1000,30531=>1000,30532=>1000,
-	30533=>1000,30534=>1000,30535=>1000,30536=>1000,30537=>1000,30538=>1000,30539=>1000,30540=>1000,30541=>1000,30542=>1000,30543=>1000,30544=>1000,30545=>1000,30546=>1000,30547=>1000,30548=>1000,
-	30549=>1000,30550=>1000,30551=>1000,30552=>1000,30553=>1000,30554=>1000,30555=>1000,30556=>1000,30557=>1000,30558=>1000,30559=>1000,30560=>1000,30561=>1000,30562=>1000,30563=>1000,30564=>1000,
-	30565=>1000,30566=>1000,30567=>1000,30568=>1000,30569=>1000,30570=>1000,30571=>1000,30572=>1000,30573=>1000,30574=>1000,30575=>1000,30576=>1000,30577=>1000,30578=>1000,30579=>1000,30580=>1000,
-	30581=>1000,30582=>1000,30583=>1000,30584=>1000,30585=>1000,30586=>1000,30587=>1000,30588=>1000,30589=>1000,30590=>1000,30591=>1000,30592=>1000,30593=>1000,30594=>1000,30595=>1000,30596=>1000,
-	30597=>1000,30598=>1000,30599=>1000,30600=>1000,30601=>1000,30602=>1000,30603=>1000,30604=>1000,30605=>1000,30606=>1000,30607=>1000,30608=>1000,30609=>1000,30610=>1000,30611=>1000,30612=>1000,
-	30613=>1000,30614=>1000,30615=>1000,30616=>1000,30617=>1000,30618=>1000,30619=>1000,30620=>1000,30621=>1000,30622=>1000,30623=>1000,30624=>1000,30625=>1000,30626=>1000,30627=>1000,30628=>1000,
-	30629=>1000,30630=>1000,30631=>1000,30632=>1000,30633=>1000,30634=>1000,30635=>1000,30636=>1000,30637=>1000,30638=>1000,30639=>1000,30640=>1000,30641=>1000,30642=>1000,30643=>1000,30644=>1000,
-	30645=>1000,30646=>1000,30647=>1000,30648=>1000,30649=>1000,30650=>1000,30651=>1000,30652=>1000,30653=>1000,30654=>1000,30655=>1000,30656=>1000,30657=>1000,30658=>1000,30659=>1000,30660=>1000,
-	30661=>1000,30662=>1000,30663=>1000,30664=>1000,30665=>1000,30666=>1000,30667=>1000,30668=>1000,30669=>1000,30670=>1000,30671=>1000,30672=>1000,30673=>1000,30674=>1000,30675=>1000,30676=>1000,
-	30677=>1000,30678=>1000,30679=>1000,30680=>1000,30681=>1000,30682=>1000,30683=>1000,30684=>1000,30685=>1000,30686=>1000,30687=>1000,30688=>1000,30689=>1000,30690=>1000,30691=>1000,30692=>1000,
-	30693=>1000,30694=>1000,30695=>1000,30696=>1000,30697=>1000,30698=>1000,30699=>1000,30700=>1000,30701=>1000,30702=>1000,30703=>1000,30704=>1000,30705=>1000,30706=>1000,30707=>1000,30708=>1000,
-	30709=>1000,30710=>1000,30711=>1000,30712=>1000,30713=>1000,30714=>1000,30715=>1000,30716=>1000,30717=>1000,30718=>1000,30719=>1000,30720=>1000,30721=>1000,30722=>1000,30723=>1000,30724=>1000,
-	30725=>1000,30726=>1000,30727=>1000,30728=>1000,30729=>1000,30730=>1000,30731=>1000,30732=>1000,30733=>1000,30734=>1000,30735=>1000,30736=>1000,30737=>1000,30738=>1000,30739=>1000,30740=>1000,
-	30741=>1000,30742=>1000,30743=>1000,30744=>1000,30745=>1000,30746=>1000,30747=>1000,30748=>1000,30749=>1000,30750=>1000,30751=>1000,30752=>1000,30753=>1000,30754=>1000,30755=>1000,30756=>1000,
-	30757=>1000,30758=>1000,30759=>1000,30760=>1000,30761=>1000,30762=>1000,30763=>1000,30764=>1000,30765=>1000,30766=>1000,30767=>1000,30768=>1000,30769=>1000,30770=>1000,30771=>1000,30772=>1000,
-	30773=>1000,30774=>1000,30775=>1000,30776=>1000,30777=>1000,30778=>1000,30779=>1000,30780=>1000,30781=>1000,30782=>1000,30783=>1000,30784=>1000,30785=>1000,30786=>1000,30787=>1000,30788=>1000,
-	30789=>1000,30790=>1000,30791=>1000,30792=>1000,30793=>1000,30794=>1000,30795=>1000,30796=>1000,30797=>1000,30798=>1000,30799=>1000,30800=>1000,30801=>1000,30802=>1000,30803=>1000,30804=>1000,
-	30805=>1000,30806=>1000,30807=>1000,30808=>1000,30809=>1000,30810=>1000,30811=>1000,30812=>1000,30813=>1000,30814=>1000,30815=>1000,30816=>1000,30817=>1000,30818=>1000,30819=>1000,30820=>1000,
-	30821=>1000,30822=>1000,30823=>1000,30824=>1000,30825=>1000,30826=>1000,30827=>1000,30828=>1000,30829=>1000,30830=>1000,30831=>1000,30832=>1000,30833=>1000,30834=>1000,30835=>1000,30836=>1000,
-	30837=>1000,30838=>1000,30839=>1000,30840=>1000,30841=>1000,30842=>1000,30843=>1000,30844=>1000,30845=>1000,30846=>1000,30847=>1000,30848=>1000,30849=>1000,30850=>1000,30851=>1000,30852=>1000,
-	30853=>1000,30854=>1000,30855=>1000,30856=>1000,30857=>1000,30858=>1000,30859=>1000,30860=>1000,30861=>1000,30862=>1000,30863=>1000,30864=>1000,30865=>1000,30866=>1000,30867=>1000,30868=>1000,
-	30869=>1000,30870=>1000,30871=>1000,30872=>1000,30873=>1000,30874=>1000,30875=>1000,30876=>1000,30877=>1000,30878=>1000,30879=>1000,30880=>1000,30881=>1000,30882=>1000,30883=>1000,30884=>1000,
-	30885=>1000,30886=>1000,30887=>1000,30888=>1000,30889=>1000,30890=>1000,30891=>1000,30892=>1000,30893=>1000,30894=>1000,30895=>1000,30896=>1000,30897=>1000,30898=>1000,30899=>1000,30900=>1000,
-	30901=>1000,30902=>1000,30903=>1000,30904=>1000,30905=>1000,30906=>1000,30907=>1000,30908=>1000,30909=>1000,30910=>1000,30911=>1000,30912=>1000,30913=>1000,30914=>1000,30915=>1000,30916=>1000,
-	30917=>1000,30918=>1000,30919=>1000,30920=>1000,30921=>1000,30922=>1000,30923=>1000,30924=>1000,30925=>1000,30926=>1000,30927=>1000,30928=>1000,30929=>1000,30930=>1000,30931=>1000,30932=>1000,
-	30933=>1000,30934=>1000,30935=>1000,30936=>1000,30937=>1000,30938=>1000,30939=>1000,30940=>1000,30941=>1000,30942=>1000,30943=>1000,30944=>1000,30945=>1000,30946=>1000,30947=>1000,30948=>1000,
-	30949=>1000,30950=>1000,30951=>1000,30952=>1000,30953=>1000,30954=>1000,30955=>1000,30956=>1000,30957=>1000,30958=>1000,30959=>1000,30960=>1000,30961=>1000,30962=>1000,30963=>1000,30964=>1000,
-	30965=>1000,30966=>1000,30967=>1000,30968=>1000,30969=>1000,30970=>1000,30971=>1000,30972=>1000,30973=>1000,30974=>1000,30975=>1000,30976=>1000,30977=>1000,30978=>1000,30979=>1000,30980=>1000,
-	30981=>1000,30982=>1000,30983=>1000,30984=>1000,30985=>1000,30986=>1000,30987=>1000,30988=>1000,30989=>1000,30990=>1000,30991=>1000,30992=>1000,30993=>1000,30994=>1000,30995=>1000,30996=>1000,
-	30997=>1000,30998=>1000,30999=>1000,31000=>1000,31001=>1000,31002=>1000,31003=>1000,31004=>1000,31005=>1000,31006=>1000,31007=>1000,31008=>1000,31009=>1000,31010=>1000,31011=>1000,31012=>1000,
-	31013=>1000,31014=>1000,31015=>1000,31016=>1000,31017=>1000,31018=>1000,31019=>1000,31020=>1000,31021=>1000,31022=>1000,31023=>1000,31024=>1000,31025=>1000,31026=>1000,31027=>1000,31028=>1000,
-	31029=>1000,31030=>1000,31031=>1000,31032=>1000,31033=>1000,31034=>1000,31035=>1000,31036=>1000,31037=>1000,31038=>1000,31039=>1000,31040=>1000,31041=>1000,31042=>1000,31043=>1000,31044=>1000,
-	31045=>1000,31046=>1000,31047=>1000,31048=>1000,31049=>1000,31050=>1000,31051=>1000,31052=>1000,31053=>1000,31054=>1000,31055=>1000,31056=>1000,31057=>1000,31058=>1000,31059=>1000,31060=>1000,
-	31061=>1000,31062=>1000,31063=>1000,31064=>1000,31065=>1000,31066=>1000,31067=>1000,31068=>1000,31069=>1000,31070=>1000,31071=>1000,31072=>1000,31073=>1000,31074=>1000,31075=>1000,31076=>1000,
-	31077=>1000,31078=>1000,31079=>1000,31080=>1000,31081=>1000,31082=>1000,31083=>1000,31084=>1000,31085=>1000,31086=>1000,31087=>1000,31088=>1000,31089=>1000,31090=>1000,31091=>1000,31092=>1000,
-	31093=>1000,31094=>1000,31095=>1000,31096=>1000,31097=>1000,31098=>1000,31099=>1000,31100=>1000,31101=>1000,31102=>1000,31103=>1000,31104=>1000,31105=>1000,31106=>1000,31107=>1000,31108=>1000,
-	31109=>1000,31110=>1000,31111=>1000,31112=>1000,31113=>1000,31114=>1000,31115=>1000,31116=>1000,31117=>1000,31118=>1000,31119=>1000,31120=>1000,31121=>1000,31122=>1000,31123=>1000,31124=>1000,
-	31125=>1000,31126=>1000,31127=>1000,31128=>1000,31129=>1000,31130=>1000,31131=>1000,31132=>1000,31133=>1000,31134=>1000,31135=>1000,31136=>1000,31137=>1000,31138=>1000,31139=>1000,31140=>1000,
-	31141=>1000,31142=>1000,31143=>1000,31144=>1000,31145=>1000,31146=>1000,31147=>1000,31148=>1000,31149=>1000,31150=>1000,31151=>1000,31152=>1000,31153=>1000,31154=>1000,31155=>1000,31156=>1000,
-	31157=>1000,31158=>1000,31159=>1000,31160=>1000,31161=>1000,31162=>1000,31163=>1000,31164=>1000,31165=>1000,31166=>1000,31167=>1000,31168=>1000,31169=>1000,31170=>1000,31171=>1000,31172=>1000,
-	31173=>1000,31174=>1000,31175=>1000,31176=>1000,31177=>1000,31178=>1000,31179=>1000,31180=>1000,31181=>1000,31182=>1000,31183=>1000,31184=>1000,31185=>1000,31186=>1000,31187=>1000,31188=>1000,
-	31189=>1000,31190=>1000,31191=>1000,31192=>1000,31193=>1000,31194=>1000,31195=>1000,31196=>1000,31197=>1000,31198=>1000,31199=>1000,31200=>1000,31201=>1000,31202=>1000,31203=>1000,31204=>1000,
-	31205=>1000,31206=>1000,31207=>1000,31208=>1000,31209=>1000,31210=>1000,31211=>1000,31212=>1000,31213=>1000,31214=>1000,31215=>1000,31216=>1000,31217=>1000,31218=>1000,31219=>1000,31220=>1000,
-	31221=>1000,31222=>1000,31223=>1000,31224=>1000,31225=>1000,31226=>1000,31227=>1000,31228=>1000,31229=>1000,31230=>1000,31231=>1000,31232=>1000,31233=>1000,31234=>1000,31235=>1000,31236=>1000,
-	31237=>1000,31238=>1000,31239=>1000,31240=>1000,31241=>1000,31242=>1000,31243=>1000,31244=>1000,31245=>1000,31246=>1000,31247=>1000,31248=>1000,31249=>1000,31250=>1000,31251=>1000,31252=>1000,
-	31253=>1000,31254=>1000,31255=>1000,31256=>1000,31257=>1000,31258=>1000,31259=>1000,31260=>1000,31261=>1000,31262=>1000,31263=>1000,31264=>1000,31265=>1000,31266=>1000,31267=>1000,31268=>1000,
-	31269=>1000,31270=>1000,31271=>1000,31272=>1000,31273=>1000,31274=>1000,31275=>1000,31276=>1000,31277=>1000,31278=>1000,31279=>1000,31280=>1000,31281=>1000,31282=>1000,31283=>1000,31284=>1000,
-	31285=>1000,31286=>1000,31287=>1000,31288=>1000,31289=>1000,31290=>1000,31291=>1000,31292=>1000,31293=>1000,31294=>1000,31295=>1000,31296=>1000,31297=>1000,31298=>1000,31299=>1000,31300=>1000,
-	31301=>1000,31302=>1000,31303=>1000,31304=>1000,31305=>1000,31306=>1000,31307=>1000,31308=>1000,31309=>1000,31310=>1000,31311=>1000,31312=>1000,31313=>1000,31314=>1000,31315=>1000,31316=>1000,
-	31317=>1000,31318=>1000,31319=>1000,31320=>1000,31321=>1000,31322=>1000,31323=>1000,31324=>1000,31325=>1000,31326=>1000,31327=>1000,31328=>1000,31329=>1000,31330=>1000,31331=>1000,31332=>1000,
-	31333=>1000,31334=>1000,31335=>1000,31336=>1000,31337=>1000,31338=>1000,31339=>1000,31340=>1000,31341=>1000,31342=>1000,31343=>1000,31344=>1000,31345=>1000,31346=>1000,31347=>1000,31348=>1000,
-	31349=>1000,31350=>1000,31351=>1000,31352=>1000,31353=>1000,31354=>1000,31355=>1000,31356=>1000,31357=>1000,31358=>1000,31359=>1000,31360=>1000,31361=>1000,31362=>1000,31363=>1000,31364=>1000,
-	31365=>1000,31366=>1000,31367=>1000,31368=>1000,31369=>1000,31370=>1000,31371=>1000,31372=>1000,31373=>1000,31374=>1000,31375=>1000,31376=>1000,31377=>1000,31378=>1000,31379=>1000,31380=>1000,
-	31381=>1000,31382=>1000,31383=>1000,31384=>1000,31385=>1000,31386=>1000,31387=>1000,31388=>1000,31389=>1000,31390=>1000,31391=>1000,31392=>1000,31393=>1000,31394=>1000,31395=>1000,31396=>1000,
-	31397=>1000,31398=>1000,31399=>1000,31400=>1000,31401=>1000,31402=>1000,31403=>1000,31404=>1000,31405=>1000,31406=>1000,31407=>1000,31408=>1000,31409=>1000,31410=>1000,31411=>1000,31412=>1000,
-	31413=>1000,31414=>1000,31415=>1000,31416=>1000,31417=>1000,31418=>1000,31419=>1000,31420=>1000,31421=>1000,31422=>1000,31423=>1000,31424=>1000,31425=>1000,31426=>1000,31427=>1000,31428=>1000,
-	31429=>1000,31430=>1000,31431=>1000,31432=>1000,31433=>1000,31434=>1000,31435=>1000,31436=>1000,31437=>1000,31438=>1000,31439=>1000,31440=>1000,31441=>1000,31442=>1000,31443=>1000,31444=>1000,
-	31445=>1000,31446=>1000,31447=>1000,31448=>1000,31449=>1000,31450=>1000,31451=>1000,31452=>1000,31453=>1000,31454=>1000,31455=>1000,31456=>1000,31457=>1000,31458=>1000,31459=>1000,31460=>1000,
-	31461=>1000,31462=>1000,31463=>1000,31464=>1000,31465=>1000,31466=>1000,31467=>1000,31468=>1000,31469=>1000,31470=>1000,31471=>1000,31472=>1000,31473=>1000,31474=>1000,31475=>1000,31476=>1000,
-	31477=>1000,31478=>1000,31479=>1000,31480=>1000,31481=>1000,31482=>1000,31483=>1000,31484=>1000,31485=>1000,31486=>1000,31487=>1000,31488=>1000,31489=>1000,31490=>1000,31491=>1000,31492=>1000,
-	31493=>1000,31494=>1000,31495=>1000,31496=>1000,31497=>1000,31498=>1000,31499=>1000,31500=>1000,31501=>1000,31502=>1000,31503=>1000,31504=>1000,31505=>1000,31506=>1000,31507=>1000,31508=>1000,
-	31509=>1000,31510=>1000,31511=>1000,31512=>1000,31513=>1000,31514=>1000,31515=>1000,31516=>1000,31517=>1000,31518=>1000,31519=>1000,31520=>1000,31521=>1000,31522=>1000,31523=>1000,31524=>1000,
-	31525=>1000,31526=>1000,31527=>1000,31528=>1000,31529=>1000,31530=>1000,31531=>1000,31532=>1000,31533=>1000,31534=>1000,31535=>1000,31536=>1000,31537=>1000,31538=>1000,31539=>1000,31540=>1000,
-	31541=>1000,31542=>1000,31543=>1000,31544=>1000,31545=>1000,31546=>1000,31547=>1000,31548=>1000,31549=>1000,31550=>1000,31551=>1000,31552=>1000,31553=>1000,31554=>1000,31555=>1000,31556=>1000,
-	31557=>1000,31558=>1000,31559=>1000,31560=>1000,31561=>1000,31562=>1000,31563=>1000,31564=>1000,31565=>1000,31566=>1000,31567=>1000,31568=>1000,31569=>1000,31570=>1000,31571=>1000,31572=>1000,
-	31573=>1000,31574=>1000,31575=>1000,31576=>1000,31577=>1000,31578=>1000,31579=>1000,31580=>1000,31581=>1000,31582=>1000,31583=>1000,31584=>1000,31585=>1000,31586=>1000,31587=>1000,31588=>1000,
-	31589=>1000,31590=>1000,31591=>1000,31592=>1000,31593=>1000,31594=>1000,31595=>1000,31596=>1000,31597=>1000,31598=>1000,31599=>1000,31600=>1000,31601=>1000,31602=>1000,31603=>1000,31604=>1000,
-	31605=>1000,31606=>1000,31607=>1000,31608=>1000,31609=>1000,31610=>1000,31611=>1000,31612=>1000,31613=>1000,31614=>1000,31615=>1000,31616=>1000,31617=>1000,31618=>1000,31619=>1000,31620=>1000,
-	31621=>1000,31622=>1000,31623=>1000,31624=>1000,31625=>1000,31626=>1000,31627=>1000,31628=>1000,31629=>1000,31630=>1000,31631=>1000,31632=>1000,31633=>1000,31634=>1000,31635=>1000,31636=>1000,
-	31637=>1000,31638=>1000,31639=>1000,31640=>1000,31641=>1000,31642=>1000,31643=>1000,31644=>1000,31645=>1000,31646=>1000,31647=>1000,31648=>1000,31649=>1000,31650=>1000,31651=>1000,31652=>1000,
-	31653=>1000,31654=>1000,31655=>1000,31656=>1000,31657=>1000,31658=>1000,31659=>1000,31660=>1000,31661=>1000,31662=>1000,31663=>1000,31664=>1000,31665=>1000,31666=>1000,31667=>1000,31668=>1000,
-	31669=>1000,31670=>1000,31671=>1000,31672=>1000,31673=>1000,31674=>1000,31675=>1000,31676=>1000,31677=>1000,31678=>1000,31679=>1000,31680=>1000,31681=>1000,31682=>1000,31683=>1000,31684=>1000,
-	31685=>1000,31686=>1000,31687=>1000,31688=>1000,31689=>1000,31690=>1000,31691=>1000,31692=>1000,31693=>1000,31694=>1000,31695=>1000,31696=>1000,31697=>1000,31698=>1000,31699=>1000,31700=>1000,
-	31701=>1000,31702=>1000,31703=>1000,31704=>1000,31705=>1000,31706=>1000,31707=>1000,31708=>1000,31709=>1000,31710=>1000,31711=>1000,31712=>1000,31713=>1000,31714=>1000,31715=>1000,31716=>1000,
-	31717=>1000,31718=>1000,31719=>1000,31720=>1000,31721=>1000,31722=>1000,31723=>1000,31724=>1000,31725=>1000,31726=>1000,31727=>1000,31728=>1000,31729=>1000,31730=>1000,31731=>1000,31732=>1000,
-	31733=>1000,31734=>1000,31735=>1000,31736=>1000,31737=>1000,31738=>1000,31739=>1000,31740=>1000,31741=>1000,31742=>1000,31743=>1000,31744=>1000,31745=>1000,31746=>1000,31747=>1000,31748=>1000,
-	31749=>1000,31750=>1000,31751=>1000,31752=>1000,31753=>1000,31754=>1000,31755=>1000,31756=>1000,31757=>1000,31758=>1000,31759=>1000,31760=>1000,31761=>1000,31762=>1000,31763=>1000,31764=>1000,
-	31765=>1000,31766=>1000,31767=>1000,31768=>1000,31769=>1000,31770=>1000,31771=>1000,31772=>1000,31773=>1000,31774=>1000,31775=>1000,31776=>1000,31777=>1000,31778=>1000,31779=>1000,31780=>1000,
-	31781=>1000,31782=>1000,31783=>1000,31784=>1000,31785=>1000,31786=>1000,31787=>1000,31788=>1000,31789=>1000,31790=>1000,31791=>1000,31792=>1000,31793=>1000,31794=>1000,31795=>1000,31796=>1000,
-	31797=>1000,31798=>1000,31799=>1000,31800=>1000,31801=>1000,31802=>1000,31803=>1000,31804=>1000,31805=>1000,31806=>1000,31807=>1000,31808=>1000,31809=>1000,31810=>1000,31811=>1000,31812=>1000,
-	31813=>1000,31814=>1000,31815=>1000,31816=>1000,31817=>1000,31818=>1000,31819=>1000,31820=>1000,31821=>1000,31822=>1000,31823=>1000,31824=>1000,31825=>1000,31826=>1000,31827=>1000,31828=>1000,
-	31829=>1000,31830=>1000,31831=>1000,31832=>1000,31833=>1000,31834=>1000,31835=>1000,31836=>1000,31837=>1000,31838=>1000,31839=>1000,31840=>1000,31841=>1000,31842=>1000,31843=>1000,31844=>1000,
-	31845=>1000,31846=>1000,31847=>1000,31848=>1000,31849=>1000,31850=>1000,31851=>1000,31852=>1000,31853=>1000,31854=>1000,31855=>1000,31856=>1000,31857=>1000,31858=>1000,31859=>1000,31860=>1000,
-	31861=>1000,31862=>1000,31863=>1000,31864=>1000,31865=>1000,31866=>1000,31867=>1000,31868=>1000,31869=>1000,31870=>1000,31871=>1000,31872=>1000,31873=>1000,31874=>1000,31875=>1000,31876=>1000,
-	31877=>1000,31878=>1000,31879=>1000,31880=>1000,31881=>1000,31882=>1000,31883=>1000,31884=>1000,31885=>1000,31886=>1000,31887=>1000,31888=>1000,31889=>1000,31890=>1000,31891=>1000,31892=>1000,
-	31893=>1000,31894=>1000,31895=>1000,31896=>1000,31897=>1000,31898=>1000,31899=>1000,31900=>1000,31901=>1000,31902=>1000,31903=>1000,31904=>1000,31905=>1000,31906=>1000,31907=>1000,31908=>1000,
-	31909=>1000,31910=>1000,31911=>1000,31912=>1000,31913=>1000,31914=>1000,31915=>1000,31916=>1000,31917=>1000,31918=>1000,31919=>1000,31920=>1000,31921=>1000,31922=>1000,31923=>1000,31924=>1000,
-	31925=>1000,31926=>1000,31927=>1000,31928=>1000,31929=>1000,31930=>1000,31931=>1000,31932=>1000,31933=>1000,31934=>1000,31935=>1000,31936=>1000,31937=>1000,31938=>1000,31939=>1000,31940=>1000,
-	31941=>1000,31942=>1000,31943=>1000,31944=>1000,31945=>1000,31946=>1000,31947=>1000,31948=>1000,31949=>1000,31950=>1000,31951=>1000,31952=>1000,31953=>1000,31954=>1000,31955=>1000,31956=>1000,
-	31957=>1000,31958=>1000,31959=>1000,31960=>1000,31961=>1000,31962=>1000,31963=>1000,31964=>1000,31965=>1000,31966=>1000,31967=>1000,31968=>1000,31969=>1000,31970=>1000,31971=>1000,31972=>1000,
-	31973=>1000,31974=>1000,31975=>1000,31976=>1000,31977=>1000,31978=>1000,31979=>1000,31980=>1000,31981=>1000,31982=>1000,31983=>1000,31984=>1000,31985=>1000,31986=>1000,31987=>1000,31988=>1000,
-	31989=>1000,31990=>1000,31991=>1000,31992=>1000,31993=>1000,31994=>1000,31995=>1000,31996=>1000,31997=>1000,31998=>1000,31999=>1000,32000=>1000,32001=>1000,32002=>1000,32003=>1000,32004=>1000,
-	32005=>1000,32006=>1000,32007=>1000,32008=>1000,32009=>1000,32010=>1000,32011=>1000,32012=>1000,32013=>1000,32014=>1000,32015=>1000,32016=>1000,32017=>1000,32018=>1000,32019=>1000,32020=>1000,
-	32021=>1000,32022=>1000,32023=>1000,32024=>1000,32025=>1000,32026=>1000,32027=>1000,32028=>1000,32029=>1000,32030=>1000,32031=>1000,32032=>1000,32033=>1000,32034=>1000,32035=>1000,32036=>1000,
-	32037=>1000,32038=>1000,32039=>1000,32040=>1000,32041=>1000,32042=>1000,32043=>1000,32044=>1000,32045=>1000,32046=>1000,32047=>1000,32048=>1000,32049=>1000,32050=>1000,32051=>1000,32052=>1000,
-	32053=>1000,32054=>1000,32055=>1000,32056=>1000,32057=>1000,32058=>1000,32059=>1000,32060=>1000,32061=>1000,32062=>1000,32063=>1000,32064=>1000,32065=>1000,32066=>1000,32067=>1000,32068=>1000,
-	32069=>1000,32070=>1000,32071=>1000,32072=>1000,32073=>1000,32074=>1000,32075=>1000,32076=>1000,32077=>1000,32078=>1000,32079=>1000,32080=>1000,32081=>1000,32082=>1000,32083=>1000,32084=>1000,
-	32085=>1000,32086=>1000,32087=>1000,32088=>1000,32089=>1000,32090=>1000,32091=>1000,32092=>1000,32093=>1000,32094=>1000,32095=>1000,32096=>1000,32097=>1000,32098=>1000,32099=>1000,32100=>1000,
-	32101=>1000,32102=>1000,32103=>1000,32104=>1000,32105=>1000,32106=>1000,32107=>1000,32108=>1000,32109=>1000,32110=>1000,32111=>1000,32112=>1000,32113=>1000,32114=>1000,32115=>1000,32116=>1000,
-	32117=>1000,32118=>1000,32119=>1000,32120=>1000,32121=>1000,32122=>1000,32123=>1000,32124=>1000,32125=>1000,32126=>1000,32127=>1000,32128=>1000,32129=>1000,32130=>1000,32131=>1000,32132=>1000,
-	32133=>1000,32134=>1000,32135=>1000,32136=>1000,32137=>1000,32138=>1000,32139=>1000,32140=>1000,32141=>1000,32142=>1000,32143=>1000,32144=>1000,32145=>1000,32146=>1000,32147=>1000,32148=>1000,
-	32149=>1000,32150=>1000,32151=>1000,32152=>1000,32153=>1000,32154=>1000,32155=>1000,32156=>1000,32157=>1000,32158=>1000,32159=>1000,32160=>1000,32161=>1000,32162=>1000,32163=>1000,32164=>1000,
-	32165=>1000,32166=>1000,32167=>1000,32168=>1000,32169=>1000,32170=>1000,32171=>1000,32172=>1000,32173=>1000,32174=>1000,32175=>1000,32176=>1000,32177=>1000,32178=>1000,32179=>1000,32180=>1000,
-	32181=>1000,32182=>1000,32183=>1000,32184=>1000,32185=>1000,32186=>1000,32187=>1000,32188=>1000,32189=>1000,32190=>1000,32191=>1000,32192=>1000,32193=>1000,32194=>1000,32195=>1000,32196=>1000,
-	32197=>1000,32198=>1000,32199=>1000,32200=>1000,32201=>1000,32202=>1000,32203=>1000,32204=>1000,32205=>1000,32206=>1000,32207=>1000,32208=>1000,32209=>1000,32210=>1000,32211=>1000,32212=>1000,
-	32213=>1000,32214=>1000,32215=>1000,32216=>1000,32217=>1000,32218=>1000,32219=>1000,32220=>1000,32221=>1000,32222=>1000,32223=>1000,32224=>1000,32225=>1000,32226=>1000,32227=>1000,32228=>1000,
-	32229=>1000,32230=>1000,32231=>1000,32232=>1000,32233=>1000,32234=>1000,32235=>1000,32236=>1000,32237=>1000,32238=>1000,32239=>1000,32240=>1000,32241=>1000,32242=>1000,32243=>1000,32244=>1000,
-	32245=>1000,32246=>1000,32247=>1000,32248=>1000,32249=>1000,32250=>1000,32251=>1000,32252=>1000,32253=>1000,32254=>1000,32255=>1000,32256=>1000,32257=>1000,32258=>1000,32259=>1000,32260=>1000,
-	32261=>1000,32262=>1000,32263=>1000,32264=>1000,32265=>1000,32266=>1000,32267=>1000,32268=>1000,32269=>1000,32270=>1000,32271=>1000,32272=>1000,32273=>1000,32274=>1000,32275=>1000,32276=>1000,
-	32277=>1000,32278=>1000,32279=>1000,32280=>1000,32281=>1000,32282=>1000,32283=>1000,32284=>1000,32285=>1000,32286=>1000,32287=>1000,32288=>1000,32289=>1000,32290=>1000,32291=>1000,32292=>1000,
-	32293=>1000,32294=>1000,32295=>1000,32296=>1000,32297=>1000,32298=>1000,32299=>1000,32300=>1000,32301=>1000,32302=>1000,32303=>1000,32304=>1000,32305=>1000,32306=>1000,32307=>1000,32308=>1000,
-	32309=>1000,32310=>1000,32311=>1000,32312=>1000,32313=>1000,32314=>1000,32315=>1000,32316=>1000,32317=>1000,32318=>1000,32319=>1000,32320=>1000,32321=>1000,32322=>1000,32323=>1000,32324=>1000,
-	32325=>1000,32326=>1000,32327=>1000,32328=>1000,32329=>1000,32330=>1000,32331=>1000,32332=>1000,32333=>1000,32334=>1000,32335=>1000,32336=>1000,32337=>1000,32338=>1000,32339=>1000,32340=>1000,
-	32341=>1000,32342=>1000,32343=>1000,32344=>1000,32345=>1000,32346=>1000,32347=>1000,32348=>1000,32349=>1000,32350=>1000,32351=>1000,32352=>1000,32353=>1000,32354=>1000,32355=>1000,32356=>1000,
-	32357=>1000,32358=>1000,32359=>1000,32360=>1000,32361=>1000,32362=>1000,32363=>1000,32364=>1000,32365=>1000,32366=>1000,32367=>1000,32368=>1000,32369=>1000,32370=>1000,32371=>1000,32372=>1000,
-	32373=>1000,32374=>1000,32375=>1000,32376=>1000,32377=>1000,32378=>1000,32379=>1000,32380=>1000,32381=>1000,32382=>1000,32383=>1000,32384=>1000,32385=>1000,32386=>1000,32387=>1000,32388=>1000,
-	32389=>1000,32390=>1000,32391=>1000,32392=>1000,32393=>1000,32394=>1000,32395=>1000,32396=>1000,32397=>1000,32398=>1000,32399=>1000,32400=>1000,32401=>1000,32402=>1000,32403=>1000,32404=>1000,
-	32405=>1000,32406=>1000,32407=>1000,32408=>1000,32409=>1000,32410=>1000,32411=>1000,32412=>1000,32413=>1000,32414=>1000,32415=>1000,32416=>1000,32417=>1000,32418=>1000,32419=>1000,32420=>1000,
-	32421=>1000,32422=>1000,32423=>1000,32424=>1000,32425=>1000,32426=>1000,32427=>1000,32428=>1000,32429=>1000,32430=>1000,32431=>1000,32432=>1000,32433=>1000,32434=>1000,32435=>1000,32436=>1000,
-	32437=>1000,32438=>1000,32439=>1000,32440=>1000,32441=>1000,32442=>1000,32443=>1000,32444=>1000,32445=>1000,32446=>1000,32447=>1000,32448=>1000,32449=>1000,32450=>1000,32451=>1000,32452=>1000,
-	32453=>1000,32454=>1000,32455=>1000,32456=>1000,32457=>1000,32458=>1000,32459=>1000,32460=>1000,32461=>1000,32462=>1000,32463=>1000,32464=>1000,32465=>1000,32466=>1000,32467=>1000,32468=>1000,
-	32469=>1000,32470=>1000,32471=>1000,32472=>1000,32473=>1000,32474=>1000,32475=>1000,32476=>1000,32477=>1000,32478=>1000,32479=>1000,32480=>1000,32481=>1000,32482=>1000,32483=>1000,32484=>1000,
-	32485=>1000,32486=>1000,32487=>1000,32488=>1000,32489=>1000,32490=>1000,32491=>1000,32492=>1000,32493=>1000,32494=>1000,32495=>1000,32496=>1000,32497=>1000,32498=>1000,32499=>1000,32500=>1000,
-	32501=>1000,32502=>1000,32503=>1000,32504=>1000,32505=>1000,32506=>1000,32507=>1000,32508=>1000,32509=>1000,32510=>1000,32511=>1000,32512=>1000,32513=>1000,32514=>1000,32515=>1000,32516=>1000,
-	32517=>1000,32518=>1000,32519=>1000,32520=>1000,32521=>1000,32522=>1000,32523=>1000,32524=>1000,32525=>1000,32526=>1000,32527=>1000,32528=>1000,32529=>1000,32530=>1000,32531=>1000,32532=>1000,
-	32533=>1000,32534=>1000,32535=>1000,32536=>1000,32537=>1000,32538=>1000,32539=>1000,32540=>1000,32541=>1000,32542=>1000,32543=>1000,32544=>1000,32545=>1000,32546=>1000,32547=>1000,32548=>1000,
-	32549=>1000,32550=>1000,32551=>1000,32552=>1000,32553=>1000,32554=>1000,32555=>1000,32556=>1000,32557=>1000,32558=>1000,32559=>1000,32560=>1000,32561=>1000,32562=>1000,32563=>1000,32564=>1000,
-	32565=>1000,32566=>1000,32567=>1000,32568=>1000,32569=>1000,32570=>1000,32571=>1000,32572=>1000,32573=>1000,32574=>1000,32575=>1000,32576=>1000,32577=>1000,32578=>1000,32579=>1000,32580=>1000,
-	32581=>1000,32582=>1000,32583=>1000,32584=>1000,32585=>1000,32586=>1000,32587=>1000,32588=>1000,32589=>1000,32590=>1000,32591=>1000,32592=>1000,32593=>1000,32594=>1000,32595=>1000,32596=>1000,
-	32597=>1000,32598=>1000,32599=>1000,32600=>1000,32601=>1000,32602=>1000,32603=>1000,32604=>1000,32605=>1000,32606=>1000,32607=>1000,32608=>1000,32609=>1000,32610=>1000,32611=>1000,32612=>1000,
-	32613=>1000,32614=>1000,32615=>1000,32616=>1000,32617=>1000,32618=>1000,32619=>1000,32620=>1000,32621=>1000,32622=>1000,32623=>1000,32624=>1000,32625=>1000,32626=>1000,32627=>1000,32628=>1000,
-	32629=>1000,32630=>1000,32631=>1000,32632=>1000,32633=>1000,32634=>1000,32635=>1000,32636=>1000,32637=>1000,32638=>1000,32639=>1000,32640=>1000,32641=>1000,32642=>1000,32643=>1000,32644=>1000,
-	32645=>1000,32646=>1000,32647=>1000,32648=>1000,32649=>1000,32650=>1000,32651=>1000,32652=>1000,32653=>1000,32654=>1000,32655=>1000,32656=>1000,32657=>1000,32658=>1000,32659=>1000,32660=>1000,
-	32661=>1000,32662=>1000,32663=>1000,32664=>1000,32665=>1000,32666=>1000,32667=>1000,32668=>1000,32669=>1000,32670=>1000,32671=>1000,32672=>1000,32673=>1000,32674=>1000,32675=>1000,32676=>1000,
-	32677=>1000,32678=>1000,32679=>1000,32680=>1000,32681=>1000,32682=>1000,32683=>1000,32684=>1000,32685=>1000,32686=>1000,32687=>1000,32688=>1000,32689=>1000,32690=>1000,32691=>1000,32692=>1000,
-	32693=>1000,32694=>1000,32695=>1000,32696=>1000,32697=>1000,32698=>1000,32699=>1000,32700=>1000,32701=>1000,32702=>1000,32703=>1000,32704=>1000,32705=>1000,32706=>1000,32707=>1000,32708=>1000,
-	32709=>1000,32710=>1000,32711=>1000,32712=>1000,32713=>1000,32714=>1000,32715=>1000,32716=>1000,32717=>1000,32718=>1000,32719=>1000,32720=>1000,32721=>1000,32722=>1000,32723=>1000,32724=>1000,
-	32725=>1000,32726=>1000,32727=>1000,32728=>1000,32729=>1000,32730=>1000,32731=>1000,32732=>1000,32733=>1000,32734=>1000,32735=>1000,32736=>1000,32737=>1000,32738=>1000,32739=>1000,32740=>1000,
-	32741=>1000,32742=>1000,32743=>1000,32744=>1000,32745=>1000,32746=>1000,32747=>1000,32748=>1000,32749=>1000,32750=>1000,32751=>1000,32752=>1000,32753=>1000,32754=>1000,32755=>1000,32756=>1000,
-	32757=>1000,32758=>1000,32759=>1000,32760=>1000,32761=>1000,32762=>1000,32763=>1000,32764=>1000,32765=>1000,32766=>1000,32767=>1000,32768=>1000,32769=>1000,32770=>1000,32771=>1000,32772=>1000,
-	32773=>1000,32774=>1000,32775=>1000,32776=>1000,32777=>1000,32778=>1000,32779=>1000,32780=>1000,32781=>1000,32782=>1000,32783=>1000,32784=>1000,32785=>1000,32786=>1000,32787=>1000,32788=>1000,
-	32789=>1000,32790=>1000,32791=>1000,32792=>1000,32793=>1000,32794=>1000,32795=>1000,32796=>1000,32797=>1000,32798=>1000,32799=>1000,32800=>1000,32801=>1000,32802=>1000,32803=>1000,32804=>1000,
-	32805=>1000,32806=>1000,32807=>1000,32808=>1000,32809=>1000,32810=>1000,32811=>1000,32812=>1000,32813=>1000,32814=>1000,32815=>1000,32816=>1000,32817=>1000,32818=>1000,32819=>1000,32820=>1000,
-	32821=>1000,32822=>1000,32823=>1000,32824=>1000,32825=>1000,32826=>1000,32827=>1000,32828=>1000,32829=>1000,32830=>1000,32831=>1000,32832=>1000,32833=>1000,32834=>1000,32835=>1000,32836=>1000,
-	32837=>1000,32838=>1000,32839=>1000,32840=>1000,32841=>1000,32842=>1000,32843=>1000,32844=>1000,32845=>1000,32846=>1000,32847=>1000,32848=>1000,32849=>1000,32850=>1000,32851=>1000,32852=>1000,
-	32853=>1000,32854=>1000,32855=>1000,32856=>1000,32857=>1000,32858=>1000,32859=>1000,32860=>1000,32861=>1000,32862=>1000,32863=>1000,32864=>1000,32865=>1000,32866=>1000,32867=>1000,32868=>1000,
-	32869=>1000,32870=>1000,32871=>1000,32872=>1000,32873=>1000,32874=>1000,32875=>1000,32876=>1000,32877=>1000,32878=>1000,32879=>1000,32880=>1000,32881=>1000,32882=>1000,32883=>1000,32884=>1000,
-	32885=>1000,32886=>1000,32887=>1000,32888=>1000,32889=>1000,32890=>1000,32891=>1000,32892=>1000,32893=>1000,32894=>1000,32895=>1000,32896=>1000,32897=>1000,32898=>1000,32899=>1000,32900=>1000,
-	32901=>1000,32902=>1000,32903=>1000,32904=>1000,32905=>1000,32906=>1000,32907=>1000,32908=>1000,32909=>1000,32910=>1000,32911=>1000,32912=>1000,32913=>1000,32914=>1000,32915=>1000,32916=>1000,
-	32917=>1000,32918=>1000,32919=>1000,32920=>1000,32921=>1000,32922=>1000,32923=>1000,32924=>1000,32925=>1000,32926=>1000,32927=>1000,32928=>1000,32929=>1000,32930=>1000,32931=>1000,32932=>1000,
-	32933=>1000,32934=>1000,32935=>1000,32936=>1000,32937=>1000,32938=>1000,32939=>1000,32940=>1000,32941=>1000,32942=>1000,32943=>1000,32944=>1000,32945=>1000,32946=>1000,32947=>1000,32948=>1000,
-	32949=>1000,32950=>1000,32951=>1000,32952=>1000,32953=>1000,32954=>1000,32955=>1000,32956=>1000,32957=>1000,32958=>1000,32959=>1000,32960=>1000,32961=>1000,32962=>1000,32963=>1000,32964=>1000,
-	32965=>1000,32966=>1000,32967=>1000,32968=>1000,32969=>1000,32970=>1000,32971=>1000,32972=>1000,32973=>1000,32974=>1000,32975=>1000,32976=>1000,32977=>1000,32978=>1000,32979=>1000,32980=>1000,
-	32981=>1000,32982=>1000,32983=>1000,32984=>1000,32985=>1000,32986=>1000,32987=>1000,32988=>1000,32989=>1000,32990=>1000,32991=>1000,32992=>1000,32993=>1000,32994=>1000,32995=>1000,32996=>1000,
-	32997=>1000,32998=>1000,32999=>1000,33000=>1000,33001=>1000,33002=>1000,33003=>1000,33004=>1000,33005=>1000,33006=>1000,33007=>1000,33008=>1000,33009=>1000,33010=>1000,33011=>1000,33012=>1000,
-	33013=>1000,33014=>1000,33015=>1000,33016=>1000,33017=>1000,33018=>1000,33019=>1000,33020=>1000,33021=>1000,33022=>1000,33023=>1000,33024=>1000,33025=>1000,33026=>1000,33027=>1000,33028=>1000,
-	33029=>1000,33030=>1000,33031=>1000,33032=>1000,33033=>1000,33034=>1000,33035=>1000,33036=>1000,33037=>1000,33038=>1000,33039=>1000,33040=>1000,33041=>1000,33042=>1000,33043=>1000,33044=>1000,
-	33045=>1000,33046=>1000,33047=>1000,33048=>1000,33049=>1000,33050=>1000,33051=>1000,33052=>1000,33053=>1000,33054=>1000,33055=>1000,33056=>1000,33057=>1000,33058=>1000,33059=>1000,33060=>1000,
-	33061=>1000,33062=>1000,33063=>1000,33064=>1000,33065=>1000,33066=>1000,33067=>1000,33068=>1000,33069=>1000,33070=>1000,33071=>1000,33072=>1000,33073=>1000,33074=>1000,33075=>1000,33076=>1000,
-	33077=>1000,33078=>1000,33079=>1000,33080=>1000,33081=>1000,33082=>1000,33083=>1000,33084=>1000,33085=>1000,33086=>1000,33087=>1000,33088=>1000,33089=>1000,33090=>1000,33091=>1000,33092=>1000,
-	33093=>1000,33094=>1000,33095=>1000,33096=>1000,33097=>1000,33098=>1000,33099=>1000,33100=>1000,33101=>1000,33102=>1000,33103=>1000,33104=>1000,33105=>1000,33106=>1000,33107=>1000,33108=>1000,
-	33109=>1000,33110=>1000,33111=>1000,33112=>1000,33113=>1000,33114=>1000,33115=>1000,33116=>1000,33117=>1000,33118=>1000,33119=>1000,33120=>1000,33121=>1000,33122=>1000,33123=>1000,33124=>1000,
-	33125=>1000,33126=>1000,33127=>1000,33128=>1000,33129=>1000,33130=>1000,33131=>1000,33132=>1000,33133=>1000,33134=>1000,33135=>1000,33136=>1000,33137=>1000,33138=>1000,33139=>1000,33140=>1000,
-	33141=>1000,33142=>1000,33143=>1000,33144=>1000,33145=>1000,33146=>1000,33147=>1000,33148=>1000,33149=>1000,33150=>1000,33151=>1000,33152=>1000,33153=>1000,33154=>1000,33155=>1000,33156=>1000,
-	33157=>1000,33158=>1000,33159=>1000,33160=>1000,33161=>1000,33162=>1000,33163=>1000,33164=>1000,33165=>1000,33166=>1000,33167=>1000,33168=>1000,33169=>1000,33170=>1000,33171=>1000,33172=>1000,
-	33173=>1000,33174=>1000,33175=>1000,33176=>1000,33177=>1000,33178=>1000,33179=>1000,33180=>1000,33181=>1000,33182=>1000,33183=>1000,33184=>1000,33185=>1000,33186=>1000,33187=>1000,33188=>1000,
-	33189=>1000,33190=>1000,33191=>1000,33192=>1000,33193=>1000,33194=>1000,33195=>1000,33196=>1000,33197=>1000,33198=>1000,33199=>1000,33200=>1000,33201=>1000,33202=>1000,33203=>1000,33204=>1000,
-	33205=>1000,33206=>1000,33207=>1000,33208=>1000,33209=>1000,33210=>1000,33211=>1000,33212=>1000,33213=>1000,33214=>1000,33215=>1000,33216=>1000,33217=>1000,33218=>1000,33219=>1000,33220=>1000,
-	33221=>1000,33222=>1000,33223=>1000,33224=>1000,33225=>1000,33226=>1000,33227=>1000,33228=>1000,33229=>1000,33230=>1000,33231=>1000,33232=>1000,33233=>1000,33234=>1000,33235=>1000,33236=>1000,
-	33237=>1000,33238=>1000,33239=>1000,33240=>1000,33241=>1000,33242=>1000,33243=>1000,33244=>1000,33245=>1000,33246=>1000,33247=>1000,33248=>1000,33249=>1000,33250=>1000,33251=>1000,33252=>1000,
-	33253=>1000,33254=>1000,33255=>1000,33256=>1000,33257=>1000,33258=>1000,33259=>1000,33260=>1000,33261=>1000,33262=>1000,33263=>1000,33264=>1000,33265=>1000,33266=>1000,33267=>1000,33268=>1000,
-	33269=>1000,33270=>1000,33271=>1000,33272=>1000,33273=>1000,33274=>1000,33275=>1000,33276=>1000,33277=>1000,33278=>1000,33279=>1000,33280=>1000,33281=>1000,33282=>1000,33283=>1000,33284=>1000,
-	33285=>1000,33286=>1000,33287=>1000,33288=>1000,33289=>1000,33290=>1000,33291=>1000,33292=>1000,33293=>1000,33294=>1000,33295=>1000,33296=>1000,33297=>1000,33298=>1000,33299=>1000,33300=>1000,
-	33301=>1000,33302=>1000,33303=>1000,33304=>1000,33305=>1000,33306=>1000,33307=>1000,33308=>1000,33309=>1000,33310=>1000,33311=>1000,33312=>1000,33313=>1000,33314=>1000,33315=>1000,33316=>1000,
-	33317=>1000,33318=>1000,33319=>1000,33320=>1000,33321=>1000,33322=>1000,33323=>1000,33324=>1000,33325=>1000,33326=>1000,33327=>1000,33328=>1000,33329=>1000,33330=>1000,33331=>1000,33332=>1000,
-	33333=>1000,33334=>1000,33335=>1000,33336=>1000,33337=>1000,33338=>1000,33339=>1000,33340=>1000,33341=>1000,33342=>1000,33343=>1000,33344=>1000,33345=>1000,33346=>1000,33347=>1000,33348=>1000,
-	33349=>1000,33350=>1000,33351=>1000,33352=>1000,33353=>1000,33354=>1000,33355=>1000,33356=>1000,33357=>1000,33358=>1000,33359=>1000,33360=>1000,33361=>1000,33362=>1000,33363=>1000,33364=>1000,
-	33365=>1000,33366=>1000,33367=>1000,33368=>1000,33369=>1000,33370=>1000,33371=>1000,33372=>1000,33373=>1000,33374=>1000,33375=>1000,33376=>1000,33377=>1000,33378=>1000,33379=>1000,33380=>1000,
-	33381=>1000,33382=>1000,33383=>1000,33384=>1000,33385=>1000,33386=>1000,33387=>1000,33388=>1000,33389=>1000,33390=>1000,33391=>1000,33392=>1000,33393=>1000,33394=>1000,33395=>1000,33396=>1000,
-	33397=>1000,33398=>1000,33399=>1000,33400=>1000,33401=>1000,33402=>1000,33403=>1000,33404=>1000,33405=>1000,33406=>1000,33407=>1000,33408=>1000,33409=>1000,33410=>1000,33411=>1000,33412=>1000,
-	33413=>1000,33414=>1000,33415=>1000,33416=>1000,33417=>1000,33418=>1000,33419=>1000,33420=>1000,33421=>1000,33422=>1000,33423=>1000,33424=>1000,33425=>1000,33426=>1000,33427=>1000,33428=>1000,
-	33429=>1000,33430=>1000,33431=>1000,33432=>1000,33433=>1000,33434=>1000,33435=>1000,33436=>1000,33437=>1000,33438=>1000,33439=>1000,33440=>1000,33441=>1000,33442=>1000,33443=>1000,33444=>1000,
-	33445=>1000,33446=>1000,33447=>1000,33448=>1000,33449=>1000,33450=>1000,33451=>1000,33452=>1000,33453=>1000,33454=>1000,33455=>1000,33456=>1000,33457=>1000,33458=>1000,33459=>1000,33460=>1000,
-	33461=>1000,33462=>1000,33463=>1000,33464=>1000,33465=>1000,33466=>1000,33467=>1000,33468=>1000,33469=>1000,33470=>1000,33471=>1000,33472=>1000,33473=>1000,33474=>1000,33475=>1000,33476=>1000,
-	33477=>1000,33478=>1000,33479=>1000,33480=>1000,33481=>1000,33482=>1000,33483=>1000,33484=>1000,33485=>1000,33486=>1000,33487=>1000,33488=>1000,33489=>1000,33490=>1000,33491=>1000,33492=>1000,
-	33493=>1000,33494=>1000,33495=>1000,33496=>1000,33497=>1000,33498=>1000,33499=>1000,33500=>1000,33501=>1000,33502=>1000,33503=>1000,33504=>1000,33505=>1000,33506=>1000,33507=>1000,33508=>1000,
-	33509=>1000,33510=>1000,33511=>1000,33512=>1000,33513=>1000,33514=>1000,33515=>1000,33516=>1000,33517=>1000,33518=>1000,33519=>1000,33520=>1000,33521=>1000,33522=>1000,33523=>1000,33524=>1000,
-	33525=>1000,33526=>1000,33527=>1000,33528=>1000,33529=>1000,33530=>1000,33531=>1000,33532=>1000,33533=>1000,33534=>1000,33535=>1000,33536=>1000,33537=>1000,33538=>1000,33539=>1000,33540=>1000,
-	33541=>1000,33542=>1000,33543=>1000,33544=>1000,33545=>1000,33546=>1000,33547=>1000,33548=>1000,33549=>1000,33550=>1000,33551=>1000,33552=>1000,33553=>1000,33554=>1000,33555=>1000,33556=>1000,
-	33557=>1000,33558=>1000,33559=>1000,33560=>1000,33561=>1000,33562=>1000,33563=>1000,33564=>1000,33565=>1000,33566=>1000,33567=>1000,33568=>1000,33569=>1000,33570=>1000,33571=>1000,33572=>1000,
-	33573=>1000,33574=>1000,33575=>1000,33576=>1000,33577=>1000,33578=>1000,33579=>1000,33580=>1000,33581=>1000,33582=>1000,33583=>1000,33584=>1000,33585=>1000,33586=>1000,33587=>1000,33588=>1000,
-	33589=>1000,33590=>1000,33591=>1000,33592=>1000,33593=>1000,33594=>1000,33595=>1000,33596=>1000,33597=>1000,33598=>1000,33599=>1000,33600=>1000,33601=>1000,33602=>1000,33603=>1000,33604=>1000,
-	33605=>1000,33606=>1000,33607=>1000,33608=>1000,33609=>1000,33610=>1000,33611=>1000,33612=>1000,33613=>1000,33614=>1000,33615=>1000,33616=>1000,33617=>1000,33618=>1000,33619=>1000,33620=>1000,
-	33621=>1000,33622=>1000,33623=>1000,33624=>1000,33625=>1000,33626=>1000,33627=>1000,33628=>1000,33629=>1000,33630=>1000,33631=>1000,33632=>1000,33633=>1000,33634=>1000,33635=>1000,33636=>1000,
-	33637=>1000,33638=>1000,33639=>1000,33640=>1000,33641=>1000,33642=>1000,33643=>1000,33644=>1000,33645=>1000,33646=>1000,33647=>1000,33648=>1000,33649=>1000,33650=>1000,33651=>1000,33652=>1000,
-	33653=>1000,33654=>1000,33655=>1000,33656=>1000,33657=>1000,33658=>1000,33659=>1000,33660=>1000,33661=>1000,33662=>1000,33663=>1000,33664=>1000,33665=>1000,33666=>1000,33667=>1000,33668=>1000,
-	33669=>1000,33670=>1000,33671=>1000,33672=>1000,33673=>1000,33674=>1000,33675=>1000,33676=>1000,33677=>1000,33678=>1000,33679=>1000,33680=>1000,33681=>1000,33682=>1000,33683=>1000,33684=>1000,
-	33685=>1000,33686=>1000,33687=>1000,33688=>1000,33689=>1000,33690=>1000,33691=>1000,33692=>1000,33693=>1000,33694=>1000,33695=>1000,33696=>1000,33697=>1000,33698=>1000,33699=>1000,33700=>1000,
-	33701=>1000,33702=>1000,33703=>1000,33704=>1000,33705=>1000,33706=>1000,33707=>1000,33708=>1000,33709=>1000,33710=>1000,33711=>1000,33712=>1000,33713=>1000,33714=>1000,33715=>1000,33716=>1000,
-	33717=>1000,33718=>1000,33719=>1000,33720=>1000,33721=>1000,33722=>1000,33723=>1000,33724=>1000,33725=>1000,33726=>1000,33727=>1000,33728=>1000,33729=>1000,33730=>1000,33731=>1000,33732=>1000,
-	33733=>1000,33734=>1000,33735=>1000,33736=>1000,33737=>1000,33738=>1000,33739=>1000,33740=>1000,33741=>1000,33742=>1000,33743=>1000,33744=>1000,33745=>1000,33746=>1000,33747=>1000,33748=>1000,
-	33749=>1000,33750=>1000,33751=>1000,33752=>1000,33753=>1000,33754=>1000,33755=>1000,33756=>1000,33757=>1000,33758=>1000,33759=>1000,33760=>1000,33761=>1000,33762=>1000,33763=>1000,33764=>1000,
-	33765=>1000,33766=>1000,33767=>1000,33768=>1000,33769=>1000,33770=>1000,33771=>1000,33772=>1000,33773=>1000,33774=>1000,33775=>1000,33776=>1000,33777=>1000,33778=>1000,33779=>1000,33780=>1000,
-	33781=>1000,33782=>1000,33783=>1000,33784=>1000,33785=>1000,33786=>1000,33787=>1000,33788=>1000,33789=>1000,33790=>1000,33791=>1000,33792=>1000,33793=>1000,33794=>1000,33795=>1000,33796=>1000,
-	33797=>1000,33798=>1000,33799=>1000,33800=>1000,33801=>1000,33802=>1000,33803=>1000,33804=>1000,33805=>1000,33806=>1000,33807=>1000,33808=>1000,33809=>1000,33810=>1000,33811=>1000,33812=>1000,
-	33813=>1000,33814=>1000,33815=>1000,33816=>1000,33817=>1000,33818=>1000,33819=>1000,33820=>1000,33821=>1000,33822=>1000,33823=>1000,33824=>1000,33825=>1000,33826=>1000,33827=>1000,33828=>1000,
-	33829=>1000,33830=>1000,33831=>1000,33832=>1000,33833=>1000,33834=>1000,33835=>1000,33836=>1000,33837=>1000,33838=>1000,33839=>1000,33840=>1000,33841=>1000,33842=>1000,33843=>1000,33844=>1000,
-	33845=>1000,33846=>1000,33847=>1000,33848=>1000,33849=>1000,33850=>1000,33851=>1000,33852=>1000,33853=>1000,33854=>1000,33855=>1000,33856=>1000,33857=>1000,33858=>1000,33859=>1000,33860=>1000,
-	33861=>1000,33862=>1000,33863=>1000,33864=>1000,33865=>1000,33866=>1000,33867=>1000,33868=>1000,33869=>1000,33870=>1000,33871=>1000,33872=>1000,33873=>1000,33874=>1000,33875=>1000,33876=>1000,
-	33877=>1000,33878=>1000,33879=>1000,33880=>1000,33881=>1000,33882=>1000,33883=>1000,33884=>1000,33885=>1000,33886=>1000,33887=>1000,33888=>1000,33889=>1000,33890=>1000,33891=>1000,33892=>1000,
-	33893=>1000,33894=>1000,33895=>1000,33896=>1000,33897=>1000,33898=>1000,33899=>1000,33900=>1000,33901=>1000,33902=>1000,33903=>1000,33904=>1000,33905=>1000,33906=>1000,33907=>1000,33908=>1000,
-	33909=>1000,33910=>1000,33911=>1000,33912=>1000,33913=>1000,33914=>1000,33915=>1000,33916=>1000,33917=>1000,33918=>1000,33919=>1000,33920=>1000,33921=>1000,33922=>1000,33923=>1000,33924=>1000,
-	33925=>1000,33926=>1000,33927=>1000,33928=>1000,33929=>1000,33930=>1000,33931=>1000,33932=>1000,33933=>1000,33934=>1000,33935=>1000,33936=>1000,33937=>1000,33938=>1000,33939=>1000,33940=>1000,
-	33941=>1000,33942=>1000,33943=>1000,33944=>1000,33945=>1000,33946=>1000,33947=>1000,33948=>1000,33949=>1000,33950=>1000,33951=>1000,33952=>1000,33953=>1000,33954=>1000,33955=>1000,33956=>1000,
-	33957=>1000,33958=>1000,33959=>1000,33960=>1000,33961=>1000,33962=>1000,33963=>1000,33964=>1000,33965=>1000,33966=>1000,33967=>1000,33968=>1000,33969=>1000,33970=>1000,33971=>1000,33972=>1000,
-	33973=>1000,33974=>1000,33975=>1000,33976=>1000,33977=>1000,33978=>1000,33979=>1000,33980=>1000,33981=>1000,33982=>1000,33983=>1000,33984=>1000,33985=>1000,33986=>1000,33987=>1000,33988=>1000,
-	33989=>1000,33990=>1000,33991=>1000,33992=>1000,33993=>1000,33994=>1000,33995=>1000,33996=>1000,33997=>1000,33998=>1000,33999=>1000,34000=>1000,34001=>1000,34002=>1000,34003=>1000,34004=>1000,
-	34005=>1000,34006=>1000,34007=>1000,34008=>1000,34009=>1000,34010=>1000,34011=>1000,34012=>1000,34013=>1000,34014=>1000,34015=>1000,34016=>1000,34017=>1000,34018=>1000,34019=>1000,34020=>1000,
-	34021=>1000,34022=>1000,34023=>1000,34024=>1000,34025=>1000,34026=>1000,34027=>1000,34028=>1000,34029=>1000,34030=>1000,34031=>1000,34032=>1000,34033=>1000,34034=>1000,34035=>1000,34036=>1000,
-	34037=>1000,34038=>1000,34039=>1000,34040=>1000,34041=>1000,34042=>1000,34043=>1000,34044=>1000,34045=>1000,34046=>1000,34047=>1000,34048=>1000,34049=>1000,34050=>1000,34051=>1000,34052=>1000,
-	34053=>1000,34054=>1000,34055=>1000,34056=>1000,34057=>1000,34058=>1000,34059=>1000,34060=>1000,34061=>1000,34062=>1000,34063=>1000,34064=>1000,34065=>1000,34066=>1000,34067=>1000,34068=>1000,
-	34069=>1000,34070=>1000,34071=>1000,34072=>1000,34073=>1000,34074=>1000,34075=>1000,34076=>1000,34077=>1000,34078=>1000,34079=>1000,34080=>1000,34081=>1000,34082=>1000,34083=>1000,34084=>1000,
-	34085=>1000,34086=>1000,34087=>1000,34088=>1000,34089=>1000,34090=>1000,34091=>1000,34092=>1000,34093=>1000,34094=>1000,34095=>1000,34096=>1000,34097=>1000,34098=>1000,34099=>1000,34100=>1000,
-	34101=>1000,34102=>1000,34103=>1000,34104=>1000,34105=>1000,34106=>1000,34107=>1000,34108=>1000,34109=>1000,34110=>1000,34111=>1000,34112=>1000,34113=>1000,34114=>1000,34115=>1000,34116=>1000,
-	34117=>1000,34118=>1000,34119=>1000,34120=>1000,34121=>1000,34122=>1000,34123=>1000,34124=>1000,34125=>1000,34126=>1000,34127=>1000,34128=>1000,34129=>1000,34130=>1000,34131=>1000,34132=>1000,
-	34133=>1000,34134=>1000,34135=>1000,34136=>1000,34137=>1000,34138=>1000,34139=>1000,34140=>1000,34141=>1000,34142=>1000,34143=>1000,34144=>1000,34145=>1000,34146=>1000,34147=>1000,34148=>1000,
-	34149=>1000,34150=>1000,34151=>1000,34152=>1000,34153=>1000,34154=>1000,34155=>1000,34156=>1000,34157=>1000,34158=>1000,34159=>1000,34160=>1000,34161=>1000,34162=>1000,34163=>1000,34164=>1000,
-	34165=>1000,34166=>1000,34167=>1000,34168=>1000,34169=>1000,34170=>1000,34171=>1000,34172=>1000,34173=>1000,34174=>1000,34175=>1000,34176=>1000,34177=>1000,34178=>1000,34179=>1000,34180=>1000,
-	34181=>1000,34182=>1000,34183=>1000,34184=>1000,34185=>1000,34186=>1000,34187=>1000,34188=>1000,34189=>1000,34190=>1000,34191=>1000,34192=>1000,34193=>1000,34194=>1000,34195=>1000,34196=>1000,
-	34197=>1000,34198=>1000,34199=>1000,34200=>1000,34201=>1000,34202=>1000,34203=>1000,34204=>1000,34205=>1000,34206=>1000,34207=>1000,34208=>1000,34209=>1000,34210=>1000,34211=>1000,34212=>1000,
-	34213=>1000,34214=>1000,34215=>1000,34216=>1000,34217=>1000,34218=>1000,34219=>1000,34220=>1000,34221=>1000,34222=>1000,34223=>1000,34224=>1000,34225=>1000,34226=>1000,34227=>1000,34228=>1000,
-	34229=>1000,34230=>1000,34231=>1000,34232=>1000,34233=>1000,34234=>1000,34235=>1000,34236=>1000,34237=>1000,34238=>1000,34239=>1000,34240=>1000,34241=>1000,34242=>1000,34243=>1000,34244=>1000,
-	34245=>1000,34246=>1000,34247=>1000,34248=>1000,34249=>1000,34250=>1000,34251=>1000,34252=>1000,34253=>1000,34254=>1000,34255=>1000,34256=>1000,34257=>1000,34258=>1000,34259=>1000,34260=>1000,
-	34261=>1000,34262=>1000,34263=>1000,34264=>1000,34265=>1000,34266=>1000,34267=>1000,34268=>1000,34269=>1000,34270=>1000,34271=>1000,34272=>1000,34273=>1000,34274=>1000,34275=>1000,34276=>1000,
-	34277=>1000,34278=>1000,34279=>1000,34280=>1000,34281=>1000,34282=>1000,34283=>1000,34284=>1000,34285=>1000,34286=>1000,34287=>1000,34288=>1000,34289=>1000,34290=>1000,34291=>1000,34292=>1000,
-	34293=>1000,34294=>1000,34295=>1000,34296=>1000,34297=>1000,34298=>1000,34299=>1000,34300=>1000,34301=>1000,34302=>1000,34303=>1000,34304=>1000,34305=>1000,34306=>1000,34307=>1000,34308=>1000,
-	34309=>1000,34310=>1000,34311=>1000,34312=>1000,34313=>1000,34314=>1000,34315=>1000,34316=>1000,34317=>1000,34318=>1000,34319=>1000,34320=>1000,34321=>1000,34322=>1000,34323=>1000,34324=>1000,
-	34325=>1000,34326=>1000,34327=>1000,34328=>1000,34329=>1000,34330=>1000,34331=>1000,34332=>1000,34333=>1000,34334=>1000,34335=>1000,34336=>1000,34337=>1000,34338=>1000,34339=>1000,34340=>1000,
-	34341=>1000,34342=>1000,34343=>1000,34344=>1000,34345=>1000,34346=>1000,34347=>1000,34348=>1000,34349=>1000,34350=>1000,34351=>1000,34352=>1000,34353=>1000,34354=>1000,34355=>1000,34356=>1000,
-	34357=>1000,34358=>1000,34359=>1000,34360=>1000,34361=>1000,34362=>1000,34363=>1000,34364=>1000,34365=>1000,34366=>1000,34367=>1000,34368=>1000,34369=>1000,34370=>1000,34371=>1000,34372=>1000,
-	34373=>1000,34374=>1000,34375=>1000,34376=>1000,34377=>1000,34378=>1000,34379=>1000,34380=>1000,34381=>1000,34382=>1000,34383=>1000,34384=>1000,34385=>1000,34386=>1000,34387=>1000,34388=>1000,
-	34389=>1000,34390=>1000,34391=>1000,34392=>1000,34393=>1000,34394=>1000,34395=>1000,34396=>1000,34397=>1000,34398=>1000,34399=>1000,34400=>1000,34401=>1000,34402=>1000,34403=>1000,34404=>1000,
-	34405=>1000,34406=>1000,34407=>1000,34408=>1000,34409=>1000,34410=>1000,34411=>1000,34412=>1000,34413=>1000,34414=>1000,34415=>1000,34416=>1000,34417=>1000,34418=>1000,34419=>1000,34420=>1000,
-	34421=>1000,34422=>1000,34423=>1000,34424=>1000,34425=>1000,34426=>1000,34427=>1000,34428=>1000,34429=>1000,34430=>1000,34431=>1000,34432=>1000,34433=>1000,34434=>1000,34435=>1000,34436=>1000,
-	34437=>1000,34438=>1000,34439=>1000,34440=>1000,34441=>1000,34442=>1000,34443=>1000,34444=>1000,34445=>1000,34446=>1000,34447=>1000,34448=>1000,34449=>1000,34450=>1000,34451=>1000,34452=>1000,
-	34453=>1000,34454=>1000,34455=>1000,34456=>1000,34457=>1000,34458=>1000,34459=>1000,34460=>1000,34461=>1000,34462=>1000,34463=>1000,34464=>1000,34465=>1000,34466=>1000,34467=>1000,34468=>1000,
-	34469=>1000,34470=>1000,34471=>1000,34472=>1000,34473=>1000,34474=>1000,34475=>1000,34476=>1000,34477=>1000,34478=>1000,34479=>1000,34480=>1000,34481=>1000,34482=>1000,34483=>1000,34484=>1000,
-	34485=>1000,34486=>1000,34487=>1000,34488=>1000,34489=>1000,34490=>1000,34491=>1000,34492=>1000,34493=>1000,34494=>1000,34495=>1000,34496=>1000,34497=>1000,34498=>1000,34499=>1000,34500=>1000,
-	34501=>1000,34502=>1000,34503=>1000,34504=>1000,34505=>1000,34506=>1000,34507=>1000,34508=>1000,34509=>1000,34510=>1000,34511=>1000,34512=>1000,34513=>1000,34514=>1000,34515=>1000,34516=>1000,
-	34517=>1000,34518=>1000,34519=>1000,34520=>1000,34521=>1000,34522=>1000,34523=>1000,34524=>1000,34525=>1000,34526=>1000,34527=>1000,34528=>1000,34529=>1000,34530=>1000,34531=>1000,34532=>1000,
-	34533=>1000,34534=>1000,34535=>1000,34536=>1000,34537=>1000,34538=>1000,34539=>1000,34540=>1000,34541=>1000,34542=>1000,34543=>1000,34544=>1000,34545=>1000,34546=>1000,34547=>1000,34548=>1000,
-	34549=>1000,34550=>1000,34551=>1000,34552=>1000,34553=>1000,34554=>1000,34555=>1000,34556=>1000,34557=>1000,34558=>1000,34559=>1000,34560=>1000,34561=>1000,34562=>1000,34563=>1000,34564=>1000,
-	34565=>1000,34566=>1000,34567=>1000,34568=>1000,34569=>1000,34570=>1000,34571=>1000,34572=>1000,34573=>1000,34574=>1000,34575=>1000,34576=>1000,34577=>1000,34578=>1000,34579=>1000,34580=>1000,
-	34581=>1000,34582=>1000,34583=>1000,34584=>1000,34585=>1000,34586=>1000,34587=>1000,34588=>1000,34589=>1000,34590=>1000,34591=>1000,34592=>1000,34593=>1000,34594=>1000,34595=>1000,34596=>1000,
-	34597=>1000,34598=>1000,34599=>1000,34600=>1000,34601=>1000,34602=>1000,34603=>1000,34604=>1000,34605=>1000,34606=>1000,34607=>1000,34608=>1000,34609=>1000,34610=>1000,34611=>1000,34612=>1000,
-	34613=>1000,34614=>1000,34615=>1000,34616=>1000,34617=>1000,34618=>1000,34619=>1000,34620=>1000,34621=>1000,34622=>1000,34623=>1000,34624=>1000,34625=>1000,34626=>1000,34627=>1000,34628=>1000,
-	34629=>1000,34630=>1000,34631=>1000,34632=>1000,34633=>1000,34634=>1000,34635=>1000,34636=>1000,34637=>1000,34638=>1000,34639=>1000,34640=>1000,34641=>1000,34642=>1000,34643=>1000,34644=>1000,
-	34645=>1000,34646=>1000,34647=>1000,34648=>1000,34649=>1000,34650=>1000,34651=>1000,34652=>1000,34653=>1000,34654=>1000,34655=>1000,34656=>1000,34657=>1000,34658=>1000,34659=>1000,34660=>1000,
-	34661=>1000,34662=>1000,34663=>1000,34664=>1000,34665=>1000,34666=>1000,34667=>1000,34668=>1000,34669=>1000,34670=>1000,34671=>1000,34672=>1000,34673=>1000,34674=>1000,34675=>1000,34676=>1000,
-	34677=>1000,34678=>1000,34679=>1000,34680=>1000,34681=>1000,34682=>1000,34683=>1000,34684=>1000,34685=>1000,34686=>1000,34687=>1000,34688=>1000,34689=>1000,34690=>1000,34691=>1000,34692=>1000,
-	34693=>1000,34694=>1000,34695=>1000,34696=>1000,34697=>1000,34698=>1000,34699=>1000,34700=>1000,34701=>1000,34702=>1000,34703=>1000,34704=>1000,34705=>1000,34706=>1000,34707=>1000,34708=>1000,
-	34709=>1000,34710=>1000,34711=>1000,34712=>1000,34713=>1000,34714=>1000,34715=>1000,34716=>1000,34717=>1000,34718=>1000,34719=>1000,34720=>1000,34721=>1000,34722=>1000,34723=>1000,34724=>1000,
-	34725=>1000,34726=>1000,34727=>1000,34728=>1000,34729=>1000,34730=>1000,34731=>1000,34732=>1000,34733=>1000,34734=>1000,34735=>1000,34736=>1000,34737=>1000,34738=>1000,34739=>1000,34740=>1000,
-	34741=>1000,34742=>1000,34743=>1000,34744=>1000,34745=>1000,34746=>1000,34747=>1000,34748=>1000,34749=>1000,34750=>1000,34751=>1000,34752=>1000,34753=>1000,34754=>1000,34755=>1000,34756=>1000,
-	34757=>1000,34758=>1000,34759=>1000,34760=>1000,34761=>1000,34762=>1000,34763=>1000,34764=>1000,34765=>1000,34766=>1000,34767=>1000,34768=>1000,34769=>1000,34770=>1000,34771=>1000,34772=>1000,
-	34773=>1000,34774=>1000,34775=>1000,34776=>1000,34777=>1000,34778=>1000,34779=>1000,34780=>1000,34781=>1000,34782=>1000,34783=>1000,34784=>1000,34785=>1000,34786=>1000,34787=>1000,34788=>1000,
-	34789=>1000,34790=>1000,34791=>1000,34792=>1000,34793=>1000,34794=>1000,34795=>1000,34796=>1000,34797=>1000,34798=>1000,34799=>1000,34800=>1000,34801=>1000,34802=>1000,34803=>1000,34804=>1000,
-	34805=>1000,34806=>1000,34807=>1000,34808=>1000,34809=>1000,34810=>1000,34811=>1000,34812=>1000,34813=>1000,34814=>1000,34815=>1000,34816=>1000,34817=>1000,34818=>1000,34819=>1000,34820=>1000,
-	34821=>1000,34822=>1000,34823=>1000,34824=>1000,34825=>1000,34826=>1000,34827=>1000,34828=>1000,34829=>1000,34830=>1000,34831=>1000,34832=>1000,34833=>1000,34834=>1000,34835=>1000,34836=>1000,
-	34837=>1000,34838=>1000,34839=>1000,34840=>1000,34841=>1000,34842=>1000,34843=>1000,34844=>1000,34845=>1000,34846=>1000,34847=>1000,34848=>1000,34849=>1000,34850=>1000,34851=>1000,34852=>1000,
-	34853=>1000,34854=>1000,34855=>1000,34856=>1000,34857=>1000,34858=>1000,34859=>1000,34860=>1000,34861=>1000,34862=>1000,34863=>1000,34864=>1000,34865=>1000,34866=>1000,34867=>1000,34868=>1000,
-	34869=>1000,34870=>1000,34871=>1000,34872=>1000,34873=>1000,34874=>1000,34875=>1000,34876=>1000,34877=>1000,34878=>1000,34879=>1000,34880=>1000,34881=>1000,34882=>1000,34883=>1000,34884=>1000,
-	34885=>1000,34886=>1000,34887=>1000,34888=>1000,34889=>1000,34890=>1000,34891=>1000,34892=>1000,34893=>1000,34894=>1000,34895=>1000,34896=>1000,34897=>1000,34898=>1000,34899=>1000,34900=>1000,
-	34901=>1000,34902=>1000,34903=>1000,34904=>1000,34905=>1000,34906=>1000,34907=>1000,34908=>1000,34909=>1000,34910=>1000,34911=>1000,34912=>1000,34913=>1000,34914=>1000,34915=>1000,34916=>1000,
-	34917=>1000,34918=>1000,34919=>1000,34920=>1000,34921=>1000,34922=>1000,34923=>1000,34924=>1000,34925=>1000,34926=>1000,34927=>1000,34928=>1000,34929=>1000,34930=>1000,34931=>1000,34932=>1000,
-	34933=>1000,34934=>1000,34935=>1000,34936=>1000,34937=>1000,34938=>1000,34939=>1000,34940=>1000,34941=>1000,34942=>1000,34943=>1000,34944=>1000,34945=>1000,34946=>1000,34947=>1000,34948=>1000,
-	34949=>1000,34950=>1000,34951=>1000,34952=>1000,34953=>1000,34954=>1000,34955=>1000,34956=>1000,34957=>1000,34958=>1000,34959=>1000,34960=>1000,34961=>1000,34962=>1000,34963=>1000,34964=>1000,
-	34965=>1000,34966=>1000,34967=>1000,34968=>1000,34969=>1000,34970=>1000,34971=>1000,34972=>1000,34973=>1000,34974=>1000,34975=>1000,34976=>1000,34977=>1000,34978=>1000,34979=>1000,34980=>1000,
-	34981=>1000,34982=>1000,34983=>1000,34984=>1000,34985=>1000,34986=>1000,34987=>1000,34988=>1000,34989=>1000,34990=>1000,34991=>1000,34992=>1000,34993=>1000,34994=>1000,34995=>1000,34996=>1000,
-	34997=>1000,34998=>1000,34999=>1000,35000=>1000,35001=>1000,35002=>1000,35003=>1000,35004=>1000,35005=>1000,35006=>1000,35007=>1000,35008=>1000,35009=>1000,35010=>1000,35011=>1000,35012=>1000,
-	35013=>1000,35014=>1000,35015=>1000,35016=>1000,35017=>1000,35018=>1000,35019=>1000,35020=>1000,35021=>1000,35022=>1000,35023=>1000,35024=>1000,35025=>1000,35026=>1000,35027=>1000,35028=>1000,
-	35029=>1000,35030=>1000,35031=>1000,35032=>1000,35033=>1000,35034=>1000,35035=>1000,35036=>1000,35037=>1000,35038=>1000,35039=>1000,35040=>1000,35041=>1000,35042=>1000,35043=>1000,35044=>1000,
-	35045=>1000,35046=>1000,35047=>1000,35048=>1000,35049=>1000,35050=>1000,35051=>1000,35052=>1000,35053=>1000,35054=>1000,35055=>1000,35056=>1000,35057=>1000,35058=>1000,35059=>1000,35060=>1000,
-	35061=>1000,35062=>1000,35063=>1000,35064=>1000,35065=>1000,35066=>1000,35067=>1000,35068=>1000,35069=>1000,35070=>1000,35071=>1000,35072=>1000,35073=>1000,35074=>1000,35075=>1000,35076=>1000,
-	35077=>1000,35078=>1000,35079=>1000,35080=>1000,35081=>1000,35082=>1000,35083=>1000,35084=>1000,35085=>1000,35086=>1000,35087=>1000,35088=>1000,35089=>1000,35090=>1000,35091=>1000,35092=>1000,
-	35093=>1000,35094=>1000,35095=>1000,35096=>1000,35097=>1000,35098=>1000,35099=>1000,35100=>1000,35101=>1000,35102=>1000,35103=>1000,35104=>1000,35105=>1000,35106=>1000,35107=>1000,35108=>1000,
-	35109=>1000,35110=>1000,35111=>1000,35112=>1000,35113=>1000,35114=>1000,35115=>1000,35116=>1000,35117=>1000,35118=>1000,35119=>1000,35120=>1000,35121=>1000,35122=>1000,35123=>1000,35124=>1000,
-	35125=>1000,35126=>1000,35127=>1000,35128=>1000,35129=>1000,35130=>1000,35131=>1000,35132=>1000,35133=>1000,35134=>1000,35135=>1000,35136=>1000,35137=>1000,35138=>1000,35139=>1000,35140=>1000,
-	35141=>1000,35142=>1000,35143=>1000,35144=>1000,35145=>1000,35146=>1000,35147=>1000,35148=>1000,35149=>1000,35150=>1000,35151=>1000,35152=>1000,35153=>1000,35154=>1000,35155=>1000,35156=>1000,
-	35157=>1000,35158=>1000,35159=>1000,35160=>1000,35161=>1000,35162=>1000,35163=>1000,35164=>1000,35165=>1000,35166=>1000,35167=>1000,35168=>1000,35169=>1000,35170=>1000,35171=>1000,35172=>1000,
-	35173=>1000,35174=>1000,35175=>1000,35176=>1000,35177=>1000,35178=>1000,35179=>1000,35180=>1000,35181=>1000,35182=>1000,35183=>1000,35184=>1000,35185=>1000,35186=>1000,35187=>1000,35188=>1000,
-	35189=>1000,35190=>1000,35191=>1000,35192=>1000,35193=>1000,35194=>1000,35195=>1000,35196=>1000,35197=>1000,35198=>1000,35199=>1000,35200=>1000,35201=>1000,35202=>1000,35203=>1000,35204=>1000,
-	35205=>1000,35206=>1000,35207=>1000,35208=>1000,35209=>1000,35210=>1000,35211=>1000,35212=>1000,35213=>1000,35214=>1000,35215=>1000,35216=>1000,35217=>1000,35218=>1000,35219=>1000,35220=>1000,
-	35221=>1000,35222=>1000,35223=>1000,35224=>1000,35225=>1000,35226=>1000,35227=>1000,35228=>1000,35229=>1000,35230=>1000,35231=>1000,35232=>1000,35233=>1000,35234=>1000,35235=>1000,35236=>1000,
-	35237=>1000,35238=>1000,35239=>1000,35240=>1000,35241=>1000,35242=>1000,35243=>1000,35244=>1000,35245=>1000,35246=>1000,35247=>1000,35248=>1000,35249=>1000,35250=>1000,35251=>1000,35252=>1000,
-	35253=>1000,35254=>1000,35255=>1000,35256=>1000,35257=>1000,35258=>1000,35259=>1000,35260=>1000,35261=>1000,35262=>1000,35263=>1000,35264=>1000,35265=>1000,35266=>1000,35267=>1000,35268=>1000,
-	35269=>1000,35270=>1000,35271=>1000,35272=>1000,35273=>1000,35274=>1000,35275=>1000,35276=>1000,35277=>1000,35278=>1000,35279=>1000,35280=>1000,35281=>1000,35282=>1000,35283=>1000,35284=>1000,
-	35285=>1000,35286=>1000,35287=>1000,35288=>1000,35289=>1000,35290=>1000,35291=>1000,35292=>1000,35293=>1000,35294=>1000,35295=>1000,35296=>1000,35297=>1000,35298=>1000,35299=>1000,35300=>1000,
-	35301=>1000,35302=>1000,35303=>1000,35304=>1000,35305=>1000,35306=>1000,35307=>1000,35308=>1000,35309=>1000,35310=>1000,35311=>1000,35312=>1000,35313=>1000,35314=>1000,35315=>1000,35316=>1000,
-	35317=>1000,35318=>1000,35319=>1000,35320=>1000,35321=>1000,35322=>1000,35323=>1000,35324=>1000,35325=>1000,35326=>1000,35327=>1000,35328=>1000,35329=>1000,35330=>1000,35331=>1000,35332=>1000,
-	35333=>1000,35334=>1000,35335=>1000,35336=>1000,35337=>1000,35338=>1000,35339=>1000,35340=>1000,35341=>1000,35342=>1000,35343=>1000,35344=>1000,35345=>1000,35346=>1000,35347=>1000,35348=>1000,
-	35349=>1000,35350=>1000,35351=>1000,35352=>1000,35353=>1000,35354=>1000,35355=>1000,35356=>1000,35357=>1000,35358=>1000,35359=>1000,35360=>1000,35361=>1000,35362=>1000,35363=>1000,35364=>1000,
-	35365=>1000,35366=>1000,35367=>1000,35368=>1000,35369=>1000,35370=>1000,35371=>1000,35372=>1000,35373=>1000,35374=>1000,35375=>1000,35376=>1000,35377=>1000,35378=>1000,35379=>1000,35380=>1000,
-	35381=>1000,35382=>1000,35383=>1000,35384=>1000,35385=>1000,35386=>1000,35387=>1000,35388=>1000,35389=>1000,35390=>1000,35391=>1000,35392=>1000,35393=>1000,35394=>1000,35395=>1000,35396=>1000,
-	35397=>1000,35398=>1000,35399=>1000,35400=>1000,35401=>1000,35402=>1000,35403=>1000,35404=>1000,35405=>1000,35406=>1000,35407=>1000,35408=>1000,35409=>1000,35410=>1000,35411=>1000,35412=>1000,
-	35413=>1000,35414=>1000,35415=>1000,35416=>1000,35417=>1000,35418=>1000,35419=>1000,35420=>1000,35421=>1000,35422=>1000,35423=>1000,35424=>1000,35425=>1000,35426=>1000,35427=>1000,35428=>1000,
-	35429=>1000,35430=>1000,35431=>1000,35432=>1000,35433=>1000,35434=>1000,35435=>1000,35436=>1000,35437=>1000,35438=>1000,35439=>1000,35440=>1000,35441=>1000,35442=>1000,35443=>1000,35444=>1000,
-	35445=>1000,35446=>1000,35447=>1000,35448=>1000,35449=>1000,35450=>1000,35451=>1000,35452=>1000,35453=>1000,35454=>1000,35455=>1000,35456=>1000,35457=>1000,35458=>1000,35459=>1000,35460=>1000,
-	35461=>1000,35462=>1000,35463=>1000,35464=>1000,35465=>1000,35466=>1000,35467=>1000,35468=>1000,35469=>1000,35470=>1000,35471=>1000,35472=>1000,35473=>1000,35474=>1000,35475=>1000,35476=>1000,
-	35477=>1000,35478=>1000,35479=>1000,35480=>1000,35481=>1000,35482=>1000,35483=>1000,35484=>1000,35485=>1000,35486=>1000,35487=>1000,35488=>1000,35489=>1000,35490=>1000,35491=>1000,35492=>1000,
-	35493=>1000,35494=>1000,35495=>1000,35496=>1000,35497=>1000,35498=>1000,35499=>1000,35500=>1000,35501=>1000,35502=>1000,35503=>1000,35504=>1000,35505=>1000,35506=>1000,35507=>1000,35508=>1000,
-	35509=>1000,35510=>1000,35511=>1000,35512=>1000,35513=>1000,35514=>1000,35515=>1000,35516=>1000,35517=>1000,35518=>1000,35519=>1000,35520=>1000,35521=>1000,35522=>1000,35523=>1000,35524=>1000,
-	35525=>1000,35526=>1000,35527=>1000,35528=>1000,35529=>1000,35530=>1000,35531=>1000,35532=>1000,35533=>1000,35534=>1000,35535=>1000,35536=>1000,35537=>1000,35538=>1000,35539=>1000,35540=>1000,
-	35541=>1000,35542=>1000,35543=>1000,35544=>1000,35545=>1000,35546=>1000,35547=>1000,35548=>1000,35549=>1000,35550=>1000,35551=>1000,35552=>1000,35553=>1000,35554=>1000,35555=>1000,35556=>1000,
-	35557=>1000,35558=>1000,35559=>1000,35560=>1000,35561=>1000,35562=>1000,35563=>1000,35564=>1000,35565=>1000,35566=>1000,35567=>1000,35568=>1000,35569=>1000,35570=>1000,35571=>1000,35572=>1000,
-	35573=>1000,35574=>1000,35575=>1000,35576=>1000,35577=>1000,35578=>1000,35579=>1000,35580=>1000,35581=>1000,35582=>1000,35583=>1000,35584=>1000,35585=>1000,35586=>1000,35587=>1000,35588=>1000,
-	35589=>1000,35590=>1000,35591=>1000,35592=>1000,35593=>1000,35594=>1000,35595=>1000,35596=>1000,35597=>1000,35598=>1000,35599=>1000,35600=>1000,35601=>1000,35602=>1000,35603=>1000,35604=>1000,
-	35605=>1000,35606=>1000,35607=>1000,35608=>1000,35609=>1000,35610=>1000,35611=>1000,35612=>1000,35613=>1000,35614=>1000,35615=>1000,35616=>1000,35617=>1000,35618=>1000,35619=>1000,35620=>1000,
-	35621=>1000,35622=>1000,35623=>1000,35624=>1000,35625=>1000,35626=>1000,35627=>1000,35628=>1000,35629=>1000,35630=>1000,35631=>1000,35632=>1000,35633=>1000,35634=>1000,35635=>1000,35636=>1000,
-	35637=>1000,35638=>1000,35639=>1000,35640=>1000,35641=>1000,35642=>1000,35643=>1000,35644=>1000,35645=>1000,35646=>1000,35647=>1000,35648=>1000,35649=>1000,35650=>1000,35651=>1000,35652=>1000,
-	35653=>1000,35654=>1000,35655=>1000,35656=>1000,35657=>1000,35658=>1000,35659=>1000,35660=>1000,35661=>1000,35662=>1000,35663=>1000,35664=>1000,35665=>1000,35666=>1000,35667=>1000,35668=>1000,
-	35669=>1000,35670=>1000,35671=>1000,35672=>1000,35673=>1000,35674=>1000,35675=>1000,35676=>1000,35677=>1000,35678=>1000,35679=>1000,35680=>1000,35681=>1000,35682=>1000,35683=>1000,35684=>1000,
-	35685=>1000,35686=>1000,35687=>1000,35688=>1000,35689=>1000,35690=>1000,35691=>1000,35692=>1000,35693=>1000,35694=>1000,35695=>1000,35696=>1000,35697=>1000,35698=>1000,35699=>1000,35700=>1000,
-	35701=>1000,35702=>1000,35703=>1000,35704=>1000,35705=>1000,35706=>1000,35707=>1000,35708=>1000,35709=>1000,35710=>1000,35711=>1000,35712=>1000,35713=>1000,35714=>1000,35715=>1000,35716=>1000,
-	35717=>1000,35718=>1000,35719=>1000,35720=>1000,35721=>1000,35722=>1000,35723=>1000,35724=>1000,35725=>1000,35726=>1000,35727=>1000,35728=>1000,35729=>1000,35730=>1000,35731=>1000,35732=>1000,
-	35733=>1000,35734=>1000,35735=>1000,35736=>1000,35737=>1000,35738=>1000,35739=>1000,35740=>1000,35741=>1000,35742=>1000,35743=>1000,35744=>1000,35745=>1000,35746=>1000,35747=>1000,35748=>1000,
-	35749=>1000,35750=>1000,35751=>1000,35752=>1000,35753=>1000,35754=>1000,35755=>1000,35756=>1000,35757=>1000,35758=>1000,35759=>1000,35760=>1000,35761=>1000,35762=>1000,35763=>1000,35764=>1000,
-	35765=>1000,35766=>1000,35767=>1000,35768=>1000,35769=>1000,35770=>1000,35771=>1000,35772=>1000,35773=>1000,35774=>1000,35775=>1000,35776=>1000,35777=>1000,35778=>1000,35779=>1000,35780=>1000,
-	35781=>1000,35782=>1000,35783=>1000,35784=>1000,35785=>1000,35786=>1000,35787=>1000,35788=>1000,35789=>1000,35790=>1000,35791=>1000,35792=>1000,35793=>1000,35794=>1000,35795=>1000,35796=>1000,
-	35797=>1000,35798=>1000,35799=>1000,35800=>1000,35801=>1000,35802=>1000,35803=>1000,35804=>1000,35805=>1000,35806=>1000,35807=>1000,35808=>1000,35809=>1000,35810=>1000,35811=>1000,35812=>1000,
-	35813=>1000,35814=>1000,35815=>1000,35816=>1000,35817=>1000,35818=>1000,35819=>1000,35820=>1000,35821=>1000,35822=>1000,35823=>1000,35824=>1000,35825=>1000,35826=>1000,35827=>1000,35828=>1000,
-	35829=>1000,35830=>1000,35831=>1000,35832=>1000,35833=>1000,35834=>1000,35835=>1000,35836=>1000,35837=>1000,35838=>1000,35839=>1000,35840=>1000,35841=>1000,35842=>1000,35843=>1000,35844=>1000,
-	35845=>1000,35846=>1000,35847=>1000,35848=>1000,35849=>1000,35850=>1000,35851=>1000,35852=>1000,35853=>1000,35854=>1000,35855=>1000,35856=>1000,35857=>1000,35858=>1000,35859=>1000,35860=>1000,
-	35861=>1000,35862=>1000,35863=>1000,35864=>1000,35865=>1000,35866=>1000,35867=>1000,35868=>1000,35869=>1000,35870=>1000,35871=>1000,35872=>1000,35873=>1000,35874=>1000,35875=>1000,35876=>1000,
-	35877=>1000,35878=>1000,35879=>1000,35880=>1000,35881=>1000,35882=>1000,35883=>1000,35884=>1000,35885=>1000,35886=>1000,35887=>1000,35888=>1000,35889=>1000,35890=>1000,35891=>1000,35892=>1000,
-	35893=>1000,35894=>1000,35895=>1000,35896=>1000,35897=>1000,35898=>1000,35899=>1000,35900=>1000,35901=>1000,35902=>1000,35903=>1000,35904=>1000,35905=>1000,35906=>1000,35907=>1000,35908=>1000,
-	35909=>1000,35910=>1000,35911=>1000,35912=>1000,35913=>1000,35914=>1000,35915=>1000,35916=>1000,35917=>1000,35918=>1000,35919=>1000,35920=>1000,35921=>1000,35922=>1000,35923=>1000,35924=>1000,
-	35925=>1000,35926=>1000,35927=>1000,35928=>1000,35929=>1000,35930=>1000,35931=>1000,35932=>1000,35933=>1000,35934=>1000,35935=>1000,35936=>1000,35937=>1000,35938=>1000,35939=>1000,35940=>1000,
-	35941=>1000,35942=>1000,35943=>1000,35944=>1000,35945=>1000,35946=>1000,35947=>1000,35948=>1000,35949=>1000,35950=>1000,35951=>1000,35952=>1000,35953=>1000,35954=>1000,35955=>1000,35956=>1000,
-	35957=>1000,35958=>1000,35959=>1000,35960=>1000,35961=>1000,35962=>1000,35963=>1000,35964=>1000,35965=>1000,35966=>1000,35967=>1000,35968=>1000,35969=>1000,35970=>1000,35971=>1000,35972=>1000,
-	35973=>1000,35974=>1000,35975=>1000,35976=>1000,35977=>1000,35978=>1000,35979=>1000,35980=>1000,35981=>1000,35982=>1000,35983=>1000,35984=>1000,35985=>1000,35986=>1000,35987=>1000,35988=>1000,
-	35989=>1000,35990=>1000,35991=>1000,35992=>1000,35993=>1000,35994=>1000,35995=>1000,35996=>1000,35997=>1000,35998=>1000,35999=>1000,36000=>1000,36001=>1000,36002=>1000,36003=>1000,36004=>1000,
-	36005=>1000,36006=>1000,36007=>1000,36008=>1000,36009=>1000,36010=>1000,36011=>1000,36012=>1000,36013=>1000,36014=>1000,36015=>1000,36016=>1000,36017=>1000,36018=>1000,36019=>1000,36020=>1000,
-	36021=>1000,36022=>1000,36023=>1000,36024=>1000,36025=>1000,36026=>1000,36027=>1000,36028=>1000,36029=>1000,36030=>1000,36031=>1000,36032=>1000,36033=>1000,36034=>1000,36035=>1000,36036=>1000,
-	36037=>1000,36038=>1000,36039=>1000,36040=>1000,36041=>1000,36042=>1000,36043=>1000,36044=>1000,36045=>1000,36046=>1000,36047=>1000,36048=>1000,36049=>1000,36050=>1000,36051=>1000,36052=>1000,
-	36053=>1000,36054=>1000,36055=>1000,36056=>1000,36057=>1000,36058=>1000,36059=>1000,36060=>1000,36061=>1000,36062=>1000,36063=>1000,36064=>1000,36065=>1000,36066=>1000,36067=>1000,36068=>1000,
-	36069=>1000,36070=>1000,36071=>1000,36072=>1000,36073=>1000,36074=>1000,36075=>1000,36076=>1000,36077=>1000,36078=>1000,36079=>1000,36080=>1000,36081=>1000,36082=>1000,36083=>1000,36084=>1000,
-	36085=>1000,36086=>1000,36087=>1000,36088=>1000,36089=>1000,36090=>1000,36091=>1000,36092=>1000,36093=>1000,36094=>1000,36095=>1000,36096=>1000,36097=>1000,36098=>1000,36099=>1000,36100=>1000,
-	36101=>1000,36102=>1000,36103=>1000,36104=>1000,36105=>1000,36106=>1000,36107=>1000,36108=>1000,36109=>1000,36110=>1000,36111=>1000,36112=>1000,36113=>1000,36114=>1000,36115=>1000,36116=>1000,
-	36117=>1000,36118=>1000,36119=>1000,36120=>1000,36121=>1000,36122=>1000,36123=>1000,36124=>1000,36125=>1000,36126=>1000,36127=>1000,36128=>1000,36129=>1000,36130=>1000,36131=>1000,36132=>1000,
-	36133=>1000,36134=>1000,36135=>1000,36136=>1000,36137=>1000,36138=>1000,36139=>1000,36140=>1000,36141=>1000,36142=>1000,36143=>1000,36144=>1000,36145=>1000,36146=>1000,36147=>1000,36148=>1000,
-	36149=>1000,36150=>1000,36151=>1000,36152=>1000,36153=>1000,36154=>1000,36155=>1000,36156=>1000,36157=>1000,36158=>1000,36159=>1000,36160=>1000,36161=>1000,36162=>1000,36163=>1000,36164=>1000,
-	36165=>1000,36166=>1000,36167=>1000,36168=>1000,36169=>1000,36170=>1000,36171=>1000,36172=>1000,36173=>1000,36174=>1000,36175=>1000,36176=>1000,36177=>1000,36178=>1000,36179=>1000,36180=>1000,
-	36181=>1000,36182=>1000,36183=>1000,36184=>1000,36185=>1000,36186=>1000,36187=>1000,36188=>1000,36189=>1000,36190=>1000,36191=>1000,36192=>1000,36193=>1000,36194=>1000,36195=>1000,36196=>1000,
-	36197=>1000,36198=>1000,36199=>1000,36200=>1000,36201=>1000,36202=>1000,36203=>1000,36204=>1000,36205=>1000,36206=>1000,36207=>1000,36208=>1000,36209=>1000,36210=>1000,36211=>1000,36212=>1000,
-	36213=>1000,36214=>1000,36215=>1000,36216=>1000,36217=>1000,36218=>1000,36219=>1000,36220=>1000,36221=>1000,36222=>1000,36223=>1000,36224=>1000,36225=>1000,36226=>1000,36227=>1000,36228=>1000,
-	36229=>1000,36230=>1000,36231=>1000,36232=>1000,36233=>1000,36234=>1000,36235=>1000,36236=>1000,36237=>1000,36238=>1000,36239=>1000,36240=>1000,36241=>1000,36242=>1000,36243=>1000,36244=>1000,
-	36245=>1000,36246=>1000,36247=>1000,36248=>1000,36249=>1000,36250=>1000,36251=>1000,36252=>1000,36253=>1000,36254=>1000,36255=>1000,36256=>1000,36257=>1000,36258=>1000,36259=>1000,36260=>1000,
-	36261=>1000,36262=>1000,36263=>1000,36264=>1000,36265=>1000,36266=>1000,36267=>1000,36268=>1000,36269=>1000,36270=>1000,36271=>1000,36272=>1000,36273=>1000,36274=>1000,36275=>1000,36276=>1000,
-	36277=>1000,36278=>1000,36279=>1000,36280=>1000,36281=>1000,36282=>1000,36283=>1000,36284=>1000,36285=>1000,36286=>1000,36287=>1000,36288=>1000,36289=>1000,36290=>1000,36291=>1000,36292=>1000,
-	36293=>1000,36294=>1000,36295=>1000,36296=>1000,36297=>1000,36298=>1000,36299=>1000,36300=>1000,36301=>1000,36302=>1000,36303=>1000,36304=>1000,36305=>1000,36306=>1000,36307=>1000,36308=>1000,
-	36309=>1000,36310=>1000,36311=>1000,36312=>1000,36313=>1000,36314=>1000,36315=>1000,36316=>1000,36317=>1000,36318=>1000,36319=>1000,36320=>1000,36321=>1000,36322=>1000,36323=>1000,36324=>1000,
-	36325=>1000,36326=>1000,36327=>1000,36328=>1000,36329=>1000,36330=>1000,36331=>1000,36332=>1000,36333=>1000,36334=>1000,36335=>1000,36336=>1000,36337=>1000,36338=>1000,36339=>1000,36340=>1000,
-	36341=>1000,36342=>1000,36343=>1000,36344=>1000,36345=>1000,36346=>1000,36347=>1000,36348=>1000,36349=>1000,36350=>1000,36351=>1000,36352=>1000,36353=>1000,36354=>1000,36355=>1000,36356=>1000,
-	36357=>1000,36358=>1000,36359=>1000,36360=>1000,36361=>1000,36362=>1000,36363=>1000,36364=>1000,36365=>1000,36366=>1000,36367=>1000,36368=>1000,36369=>1000,36370=>1000,36371=>1000,36372=>1000,
-	36373=>1000,36374=>1000,36375=>1000,36376=>1000,36377=>1000,36378=>1000,36379=>1000,36380=>1000,36381=>1000,36382=>1000,36383=>1000,36384=>1000,36385=>1000,36386=>1000,36387=>1000,36388=>1000,
-	36389=>1000,36390=>1000,36391=>1000,36392=>1000,36393=>1000,36394=>1000,36395=>1000,36396=>1000,36397=>1000,36398=>1000,36399=>1000,36400=>1000,36401=>1000,36402=>1000,36403=>1000,36404=>1000,
-	36405=>1000,36406=>1000,36407=>1000,36408=>1000,36409=>1000,36410=>1000,36411=>1000,36412=>1000,36413=>1000,36414=>1000,36415=>1000,36416=>1000,36417=>1000,36418=>1000,36419=>1000,36420=>1000,
-	36421=>1000,36422=>1000,36423=>1000,36424=>1000,36425=>1000,36426=>1000,36427=>1000,36428=>1000,36429=>1000,36430=>1000,36431=>1000,36432=>1000,36433=>1000,36434=>1000,36435=>1000,36436=>1000,
-	36437=>1000,36438=>1000,36439=>1000,36440=>1000,36441=>1000,36442=>1000,36443=>1000,36444=>1000,36445=>1000,36446=>1000,36447=>1000,36448=>1000,36449=>1000,36450=>1000,36451=>1000,36452=>1000,
-	36453=>1000,36454=>1000,36455=>1000,36456=>1000,36457=>1000,36458=>1000,36459=>1000,36460=>1000,36461=>1000,36462=>1000,36463=>1000,36464=>1000,36465=>1000,36466=>1000,36467=>1000,36468=>1000,
-	36469=>1000,36470=>1000,36471=>1000,36472=>1000,36473=>1000,36474=>1000,36475=>1000,36476=>1000,36477=>1000,36478=>1000,36479=>1000,36480=>1000,36481=>1000,36482=>1000,36483=>1000,36484=>1000,
-	36485=>1000,36486=>1000,36487=>1000,36488=>1000,36489=>1000,36490=>1000,36491=>1000,36492=>1000,36493=>1000,36494=>1000,36495=>1000,36496=>1000,36497=>1000,36498=>1000,36499=>1000,36500=>1000,
-	36501=>1000,36502=>1000,36503=>1000,36504=>1000,36505=>1000,36506=>1000,36507=>1000,36508=>1000,36509=>1000,36510=>1000,36511=>1000,36512=>1000,36513=>1000,36514=>1000,36515=>1000,36516=>1000,
-	36517=>1000,36518=>1000,36519=>1000,36520=>1000,36521=>1000,36522=>1000,36523=>1000,36524=>1000,36525=>1000,36526=>1000,36527=>1000,36528=>1000,36529=>1000,36530=>1000,36531=>1000,36532=>1000,
-	36533=>1000,36534=>1000,36535=>1000,36536=>1000,36537=>1000,36538=>1000,36539=>1000,36540=>1000,36541=>1000,36542=>1000,36543=>1000,36544=>1000,36545=>1000,36546=>1000,36547=>1000,36548=>1000,
-	36549=>1000,36550=>1000,36551=>1000,36552=>1000,36553=>1000,36554=>1000,36555=>1000,36556=>1000,36557=>1000,36558=>1000,36559=>1000,36560=>1000,36561=>1000,36562=>1000,36563=>1000,36564=>1000,
-	36565=>1000,36566=>1000,36567=>1000,36568=>1000,36569=>1000,36570=>1000,36571=>1000,36572=>1000,36573=>1000,36574=>1000,36575=>1000,36576=>1000,36577=>1000,36578=>1000,36579=>1000,36580=>1000,
-	36581=>1000,36582=>1000,36583=>1000,36584=>1000,36585=>1000,36586=>1000,36587=>1000,36588=>1000,36589=>1000,36590=>1000,36591=>1000,36592=>1000,36593=>1000,36594=>1000,36595=>1000,36596=>1000,
-	36597=>1000,36598=>1000,36599=>1000,36600=>1000,36601=>1000,36602=>1000,36603=>1000,36604=>1000,36605=>1000,36606=>1000,36607=>1000,36608=>1000,36609=>1000,36610=>1000,36611=>1000,36612=>1000,
-	36613=>1000,36614=>1000,36615=>1000,36616=>1000,36617=>1000,36618=>1000,36619=>1000,36620=>1000,36621=>1000,36622=>1000,36623=>1000,36624=>1000,36625=>1000,36626=>1000,36627=>1000,36628=>1000,
-	36629=>1000,36630=>1000,36631=>1000,36632=>1000,36633=>1000,36634=>1000,36635=>1000,36636=>1000,36637=>1000,36638=>1000,36639=>1000,36640=>1000,36641=>1000,36642=>1000,36643=>1000,36644=>1000,
-	36645=>1000,36646=>1000,36647=>1000,36648=>1000,36649=>1000,36650=>1000,36651=>1000,36652=>1000,36653=>1000,36654=>1000,36655=>1000,36656=>1000,36657=>1000,36658=>1000,36659=>1000,36660=>1000,
-	36661=>1000,36662=>1000,36663=>1000,36664=>1000,36665=>1000,36666=>1000,36667=>1000,36668=>1000,36669=>1000,36670=>1000,36671=>1000,36672=>1000,36673=>1000,36674=>1000,36675=>1000,36676=>1000,
-	36677=>1000,36678=>1000,36679=>1000,36680=>1000,36681=>1000,36682=>1000,36683=>1000,36684=>1000,36685=>1000,36686=>1000,36687=>1000,36688=>1000,36689=>1000,36690=>1000,36691=>1000,36692=>1000,
-	36693=>1000,36694=>1000,36695=>1000,36696=>1000,36697=>1000,36698=>1000,36699=>1000,36700=>1000,36701=>1000,36702=>1000,36703=>1000,36704=>1000,36705=>1000,36706=>1000,36707=>1000,36708=>1000,
-	36709=>1000,36710=>1000,36711=>1000,36712=>1000,36713=>1000,36714=>1000,36715=>1000,36716=>1000,36717=>1000,36718=>1000,36719=>1000,36720=>1000,36721=>1000,36722=>1000,36723=>1000,36724=>1000,
-	36725=>1000,36726=>1000,36727=>1000,36728=>1000,36729=>1000,36730=>1000,36731=>1000,36732=>1000,36733=>1000,36734=>1000,36735=>1000,36736=>1000,36737=>1000,36738=>1000,36739=>1000,36740=>1000,
-	36741=>1000,36742=>1000,36743=>1000,36744=>1000,36745=>1000,36746=>1000,36747=>1000,36748=>1000,36749=>1000,36750=>1000,36751=>1000,36752=>1000,36753=>1000,36754=>1000,36755=>1000,36756=>1000,
-	36757=>1000,36758=>1000,36759=>1000,36760=>1000,36761=>1000,36762=>1000,36763=>1000,36764=>1000,36765=>1000,36766=>1000,36767=>1000,36768=>1000,36769=>1000,36770=>1000,36771=>1000,36772=>1000,
-	36773=>1000,36774=>1000,36775=>1000,36776=>1000,36777=>1000,36778=>1000,36779=>1000,36780=>1000,36781=>1000,36782=>1000,36783=>1000,36784=>1000,36785=>1000,36786=>1000,36787=>1000,36788=>1000,
-	36789=>1000,36790=>1000,36791=>1000,36792=>1000,36793=>1000,36794=>1000,36795=>1000,36796=>1000,36797=>1000,36798=>1000,36799=>1000,36800=>1000,36801=>1000,36802=>1000,36803=>1000,36804=>1000,
-	36805=>1000,36806=>1000,36807=>1000,36808=>1000,36809=>1000,36810=>1000,36811=>1000,36812=>1000,36813=>1000,36814=>1000,36815=>1000,36816=>1000,36817=>1000,36818=>1000,36819=>1000,36820=>1000,
-	36821=>1000,36822=>1000,36823=>1000,36824=>1000,36825=>1000,36826=>1000,36827=>1000,36828=>1000,36829=>1000,36830=>1000,36831=>1000,36832=>1000,36833=>1000,36834=>1000,36835=>1000,36836=>1000,
-	36837=>1000,36838=>1000,36839=>1000,36840=>1000,36841=>1000,36842=>1000,36843=>1000,36844=>1000,36845=>1000,36846=>1000,36847=>1000,36848=>1000,36849=>1000,36850=>1000,36851=>1000,36852=>1000,
-	36853=>1000,36854=>1000,36855=>1000,36856=>1000,36857=>1000,36858=>1000,36859=>1000,36860=>1000,36861=>1000,36862=>1000,36863=>1000,36864=>1000,36865=>1000,36866=>1000,36867=>1000,36868=>1000,
-	36869=>1000,36870=>1000,36871=>1000,36872=>1000,36873=>1000,36874=>1000,36875=>1000,36876=>1000,36877=>1000,36878=>1000,36879=>1000,36880=>1000,36881=>1000,36882=>1000,36883=>1000,36884=>1000,
-	36885=>1000,36886=>1000,36887=>1000,36888=>1000,36889=>1000,36890=>1000,36891=>1000,36892=>1000,36893=>1000,36894=>1000,36895=>1000,36896=>1000,36897=>1000,36898=>1000,36899=>1000,36900=>1000,
-	36901=>1000,36902=>1000,36903=>1000,36904=>1000,36905=>1000,36906=>1000,36907=>1000,36908=>1000,36909=>1000,36910=>1000,36911=>1000,36912=>1000,36913=>1000,36914=>1000,36915=>1000,36916=>1000,
-	36917=>1000,36918=>1000,36919=>1000,36920=>1000,36921=>1000,36922=>1000,36923=>1000,36924=>1000,36925=>1000,36926=>1000,36927=>1000,36928=>1000,36929=>1000,36930=>1000,36931=>1000,36932=>1000,
-	36933=>1000,36934=>1000,36935=>1000,36936=>1000,36937=>1000,36938=>1000,36939=>1000,36940=>1000,36941=>1000,36942=>1000,36943=>1000,36944=>1000,36945=>1000,36946=>1000,36947=>1000,36948=>1000,
-	36949=>1000,36950=>1000,36951=>1000,36952=>1000,36953=>1000,36954=>1000,36955=>1000,36956=>1000,36957=>1000,36958=>1000,36959=>1000,36960=>1000,36961=>1000,36962=>1000,36963=>1000,36964=>1000,
-	36965=>1000,36966=>1000,36967=>1000,36968=>1000,36969=>1000,36970=>1000,36971=>1000,36972=>1000,36973=>1000,36974=>1000,36975=>1000,36976=>1000,36977=>1000,36978=>1000,36979=>1000,36980=>1000,
-	36981=>1000,36982=>1000,36983=>1000,36984=>1000,36985=>1000,36986=>1000,36987=>1000,36988=>1000,36989=>1000,36990=>1000,36991=>1000,36992=>1000,36993=>1000,36994=>1000,36995=>1000,36996=>1000,
-	36997=>1000,36998=>1000,36999=>1000,37000=>1000,37001=>1000,37002=>1000,37003=>1000,37004=>1000,37005=>1000,37006=>1000,37007=>1000,37008=>1000,37009=>1000,37010=>1000,37011=>1000,37012=>1000,
-	37013=>1000,37014=>1000,37015=>1000,37016=>1000,37017=>1000,37018=>1000,37019=>1000,37020=>1000,37021=>1000,37022=>1000,37023=>1000,37024=>1000,37025=>1000,37026=>1000,37027=>1000,37028=>1000,
-	37029=>1000,37030=>1000,37031=>1000,37032=>1000,37033=>1000,37034=>1000,37035=>1000,37036=>1000,37037=>1000,37038=>1000,37039=>1000,37040=>1000,37041=>1000,37042=>1000,37043=>1000,37044=>1000,
-	37045=>1000,37046=>1000,37047=>1000,37048=>1000,37049=>1000,37050=>1000,37051=>1000,37052=>1000,37053=>1000,37054=>1000,37055=>1000,37056=>1000,37057=>1000,37058=>1000,37059=>1000,37060=>1000,
-	37061=>1000,37062=>1000,37063=>1000,37064=>1000,37065=>1000,37066=>1000,37067=>1000,37068=>1000,37069=>1000,37070=>1000,37071=>1000,37072=>1000,37073=>1000,37074=>1000,37075=>1000,37076=>1000,
-	37077=>1000,37078=>1000,37079=>1000,37080=>1000,37081=>1000,37082=>1000,37083=>1000,37084=>1000,37085=>1000,37086=>1000,37087=>1000,37088=>1000,37089=>1000,37090=>1000,37091=>1000,37092=>1000,
-	37093=>1000,37094=>1000,37095=>1000,37096=>1000,37097=>1000,37098=>1000,37099=>1000,37100=>1000,37101=>1000,37102=>1000,37103=>1000,37104=>1000,37105=>1000,37106=>1000,37107=>1000,37108=>1000,
-	37109=>1000,37110=>1000,37111=>1000,37112=>1000,37113=>1000,37114=>1000,37115=>1000,37116=>1000,37117=>1000,37118=>1000,37119=>1000,37120=>1000,37121=>1000,37122=>1000,37123=>1000,37124=>1000,
-	37125=>1000,37126=>1000,37127=>1000,37128=>1000,37129=>1000,37130=>1000,37131=>1000,37132=>1000,37133=>1000,37134=>1000,37135=>1000,37136=>1000,37137=>1000,37138=>1000,37139=>1000,37140=>1000,
-	37141=>1000,37142=>1000,37143=>1000,37144=>1000,37145=>1000,37146=>1000,37147=>1000,37148=>1000,37149=>1000,37150=>1000,37151=>1000,37152=>1000,37153=>1000,37154=>1000,37155=>1000,37156=>1000,
-	37157=>1000,37158=>1000,37159=>1000,37160=>1000,37161=>1000,37162=>1000,37163=>1000,37164=>1000,37165=>1000,37166=>1000,37167=>1000,37168=>1000,37169=>1000,37170=>1000,37171=>1000,37172=>1000,
-	37173=>1000,37174=>1000,37175=>1000,37176=>1000,37177=>1000,37178=>1000,37179=>1000,37180=>1000,37181=>1000,37182=>1000,37183=>1000,37184=>1000,37185=>1000,37186=>1000,37187=>1000,37188=>1000,
-	37189=>1000,37190=>1000,37191=>1000,37192=>1000,37193=>1000,37194=>1000,37195=>1000,37196=>1000,37197=>1000,37198=>1000,37199=>1000,37200=>1000,37201=>1000,37202=>1000,37203=>1000,37204=>1000,
-	37205=>1000,37206=>1000,37207=>1000,37208=>1000,37209=>1000,37210=>1000,37211=>1000,37212=>1000,37213=>1000,37214=>1000,37215=>1000,37216=>1000,37217=>1000,37218=>1000,37219=>1000,37220=>1000,
-	37221=>1000,37222=>1000,37223=>1000,37224=>1000,37225=>1000,37226=>1000,37227=>1000,37228=>1000,37229=>1000,37230=>1000,37231=>1000,37232=>1000,37233=>1000,37234=>1000,37235=>1000,37236=>1000,
-	37237=>1000,37238=>1000,37239=>1000,37240=>1000,37241=>1000,37242=>1000,37243=>1000,37244=>1000,37245=>1000,37246=>1000,37247=>1000,37248=>1000,37249=>1000,37250=>1000,37251=>1000,37252=>1000,
-	37253=>1000,37254=>1000,37255=>1000,37256=>1000,37257=>1000,37258=>1000,37259=>1000,37260=>1000,37261=>1000,37262=>1000,37263=>1000,37264=>1000,37265=>1000,37266=>1000,37267=>1000,37268=>1000,
-	37269=>1000,37270=>1000,37271=>1000,37272=>1000,37273=>1000,37274=>1000,37275=>1000,37276=>1000,37277=>1000,37278=>1000,37279=>1000,37280=>1000,37281=>1000,37282=>1000,37283=>1000,37284=>1000,
-	37285=>1000,37286=>1000,37287=>1000,37288=>1000,37289=>1000,37290=>1000,37291=>1000,37292=>1000,37293=>1000,37294=>1000,37295=>1000,37296=>1000,37297=>1000,37298=>1000,37299=>1000,37300=>1000,
-	37301=>1000,37302=>1000,37303=>1000,37304=>1000,37305=>1000,37306=>1000,37307=>1000,37308=>1000,37309=>1000,37310=>1000,37311=>1000,37312=>1000,37313=>1000,37314=>1000,37315=>1000,37316=>1000,
-	37317=>1000,37318=>1000,37319=>1000,37320=>1000,37321=>1000,37322=>1000,37323=>1000,37324=>1000,37325=>1000,37326=>1000,37327=>1000,37328=>1000,37329=>1000,37330=>1000,37331=>1000,37332=>1000,
-	37333=>1000,37334=>1000,37335=>1000,37336=>1000,37337=>1000,37338=>1000,37339=>1000,37340=>1000,37341=>1000,37342=>1000,37343=>1000,37344=>1000,37345=>1000,37346=>1000,37347=>1000,37348=>1000,
-	37349=>1000,37350=>1000,37351=>1000,37352=>1000,37353=>1000,37354=>1000,37355=>1000,37356=>1000,37357=>1000,37358=>1000,37359=>1000,37360=>1000,37361=>1000,37362=>1000,37363=>1000,37364=>1000,
-	37365=>1000,37366=>1000,37367=>1000,37368=>1000,37369=>1000,37370=>1000,37371=>1000,37372=>1000,37373=>1000,37374=>1000,37375=>1000,37376=>1000,37377=>1000,37378=>1000,37379=>1000,37380=>1000,
-	37381=>1000,37382=>1000,37383=>1000,37384=>1000,37385=>1000,37386=>1000,37387=>1000,37388=>1000,37389=>1000,37390=>1000,37391=>1000,37392=>1000,37393=>1000,37394=>1000,37395=>1000,37396=>1000,
-	37397=>1000,37398=>1000,37399=>1000,37400=>1000,37401=>1000,37402=>1000,37403=>1000,37404=>1000,37405=>1000,37406=>1000,37407=>1000,37408=>1000,37409=>1000,37410=>1000,37411=>1000,37412=>1000,
-	37413=>1000,37414=>1000,37415=>1000,37416=>1000,37417=>1000,37418=>1000,37419=>1000,37420=>1000,37421=>1000,37422=>1000,37423=>1000,37424=>1000,37425=>1000,37426=>1000,37427=>1000,37428=>1000,
-	37429=>1000,37430=>1000,37431=>1000,37432=>1000,37433=>1000,37434=>1000,37435=>1000,37436=>1000,37437=>1000,37438=>1000,37439=>1000,37440=>1000,37441=>1000,37442=>1000,37443=>1000,37444=>1000,
-	37445=>1000,37446=>1000,37447=>1000,37448=>1000,37449=>1000,37450=>1000,37451=>1000,37452=>1000,37453=>1000,37454=>1000,37455=>1000,37456=>1000,37457=>1000,37458=>1000,37459=>1000,37460=>1000,
-	37461=>1000,37462=>1000,37463=>1000,37464=>1000,37465=>1000,37466=>1000,37467=>1000,37468=>1000,37469=>1000,37470=>1000,37471=>1000,37472=>1000,37473=>1000,37474=>1000,37475=>1000,37476=>1000,
-	37477=>1000,37478=>1000,37479=>1000,37480=>1000,37481=>1000,37482=>1000,37483=>1000,37484=>1000,37485=>1000,37486=>1000,37487=>1000,37488=>1000,37489=>1000,37490=>1000,37491=>1000,37492=>1000,
-	37493=>1000,37494=>1000,37495=>1000,37496=>1000,37497=>1000,37498=>1000,37499=>1000,37500=>1000,37501=>1000,37502=>1000,37503=>1000,37504=>1000,37505=>1000,37506=>1000,37507=>1000,37508=>1000,
-	37509=>1000,37510=>1000,37511=>1000,37512=>1000,37513=>1000,37514=>1000,37515=>1000,37516=>1000,37517=>1000,37518=>1000,37519=>1000,37520=>1000,37521=>1000,37522=>1000,37523=>1000,37524=>1000,
-	37525=>1000,37526=>1000,37527=>1000,37528=>1000,37529=>1000,37530=>1000,37531=>1000,37532=>1000,37533=>1000,37534=>1000,37535=>1000,37536=>1000,37537=>1000,37538=>1000,37539=>1000,37540=>1000,
-	37541=>1000,37542=>1000,37543=>1000,37544=>1000,37545=>1000,37546=>1000,37547=>1000,37548=>1000,37549=>1000,37550=>1000,37551=>1000,37552=>1000,37553=>1000,37554=>1000,37555=>1000,37556=>1000,
-	37557=>1000,37558=>1000,37559=>1000,37560=>1000,37561=>1000,37562=>1000,37563=>1000,37564=>1000,37565=>1000,37566=>1000,37567=>1000,37568=>1000,37569=>1000,37570=>1000,37571=>1000,37572=>1000,
-	37573=>1000,37574=>1000,37575=>1000,37576=>1000,37577=>1000,37578=>1000,37579=>1000,37580=>1000,37581=>1000,37582=>1000,37583=>1000,37584=>1000,37585=>1000,37586=>1000,37587=>1000,37588=>1000,
-	37589=>1000,37590=>1000,37591=>1000,37592=>1000,37593=>1000,37594=>1000,37595=>1000,37596=>1000,37597=>1000,37598=>1000,37599=>1000,37600=>1000,37601=>1000,37602=>1000,37603=>1000,37604=>1000,
-	37605=>1000,37606=>1000,37607=>1000,37608=>1000,37609=>1000,37610=>1000,37611=>1000,37612=>1000,37613=>1000,37614=>1000,37615=>1000,37616=>1000,37617=>1000,37618=>1000,37619=>1000,37620=>1000,
-	37621=>1000,37622=>1000,37623=>1000,37624=>1000,37625=>1000,37626=>1000,37627=>1000,37628=>1000,37629=>1000,37630=>1000,37631=>1000,37632=>1000,37633=>1000,37634=>1000,37635=>1000,37636=>1000,
-	37637=>1000,37638=>1000,37639=>1000,37640=>1000,37641=>1000,37642=>1000,37643=>1000,37644=>1000,37645=>1000,37646=>1000,37647=>1000,37648=>1000,37649=>1000,37650=>1000,37651=>1000,37652=>1000,
-	37653=>1000,37654=>1000,37655=>1000,37656=>1000,37657=>1000,37658=>1000,37659=>1000,37660=>1000,37661=>1000,37662=>1000,37663=>1000,37664=>1000,37665=>1000,37666=>1000,37667=>1000,37668=>1000,
-	37669=>1000,37670=>1000,37671=>1000,37672=>1000,37673=>1000,37674=>1000,37675=>1000,37676=>1000,37677=>1000,37678=>1000,37679=>1000,37680=>1000,37681=>1000,37682=>1000,37683=>1000,37684=>1000,
-	37685=>1000,37686=>1000,37687=>1000,37688=>1000,37689=>1000,37690=>1000,37691=>1000,37692=>1000,37693=>1000,37694=>1000,37695=>1000,37696=>1000,37697=>1000,37698=>1000,37699=>1000,37700=>1000,
-	37701=>1000,37702=>1000,37703=>1000,37704=>1000,37705=>1000,37706=>1000,37707=>1000,37708=>1000,37709=>1000,37710=>1000,37711=>1000,37712=>1000,37713=>1000,37714=>1000,37715=>1000,37716=>1000,
-	37717=>1000,37718=>1000,37719=>1000,37720=>1000,37721=>1000,37722=>1000,37723=>1000,37724=>1000,37725=>1000,37726=>1000,37727=>1000,37728=>1000,37729=>1000,37730=>1000,37731=>1000,37732=>1000,
-	37733=>1000,37734=>1000,37735=>1000,37736=>1000,37737=>1000,37738=>1000,37739=>1000,37740=>1000,37741=>1000,37742=>1000,37743=>1000,37744=>1000,37745=>1000,37746=>1000,37747=>1000,37748=>1000,
-	37749=>1000,37750=>1000,37751=>1000,37752=>1000,37753=>1000,37754=>1000,37755=>1000,37756=>1000,37757=>1000,37758=>1000,37759=>1000,37760=>1000,37761=>1000,37762=>1000,37763=>1000,37764=>1000,
-	37765=>1000,37766=>1000,37767=>1000,37768=>1000,37769=>1000,37770=>1000,37771=>1000,37772=>1000,37773=>1000,37774=>1000,37775=>1000,37776=>1000,37777=>1000,37778=>1000,37779=>1000,37780=>1000,
-	37781=>1000,37782=>1000,37783=>1000,37784=>1000,37785=>1000,37786=>1000,37787=>1000,37788=>1000,37789=>1000,37790=>1000,37791=>1000,37792=>1000,37793=>1000,37794=>1000,37795=>1000,37796=>1000,
-	37797=>1000,37798=>1000,37799=>1000,37800=>1000,37801=>1000,37802=>1000,37803=>1000,37804=>1000,37805=>1000,37806=>1000,37807=>1000,37808=>1000,37809=>1000,37810=>1000,37811=>1000,37812=>1000,
-	37813=>1000,37814=>1000,37815=>1000,37816=>1000,37817=>1000,37818=>1000,37819=>1000,37820=>1000,37821=>1000,37822=>1000,37823=>1000,37824=>1000,37825=>1000,37826=>1000,37827=>1000,37828=>1000,
-	37829=>1000,37830=>1000,37831=>1000,37832=>1000,37833=>1000,37834=>1000,37835=>1000,37836=>1000,37837=>1000,37838=>1000,37839=>1000,37840=>1000,37841=>1000,37842=>1000,37843=>1000,37844=>1000,
-	37845=>1000,37846=>1000,37847=>1000,37848=>1000,37849=>1000,37850=>1000,37851=>1000,37852=>1000,37853=>1000,37854=>1000,37855=>1000,37856=>1000,37857=>1000,37858=>1000,37859=>1000,37860=>1000,
-	37861=>1000,37862=>1000,37863=>1000,37864=>1000,37865=>1000,37866=>1000,37867=>1000,37868=>1000,37869=>1000,37870=>1000,37871=>1000,37872=>1000,37873=>1000,37874=>1000,37875=>1000,37876=>1000,
-	37877=>1000,37878=>1000,37879=>1000,37880=>1000,37881=>1000,37882=>1000,37883=>1000,37884=>1000,37885=>1000,37886=>1000,37887=>1000,37888=>1000,37889=>1000,37890=>1000,37891=>1000,37892=>1000,
-	37893=>1000,37894=>1000,37895=>1000,37896=>1000,37897=>1000,37898=>1000,37899=>1000,37900=>1000,37901=>1000,37902=>1000,37903=>1000,37904=>1000,37905=>1000,37906=>1000,37907=>1000,37908=>1000,
-	37909=>1000,37910=>1000,37911=>1000,37912=>1000,37913=>1000,37914=>1000,37915=>1000,37916=>1000,37917=>1000,37918=>1000,37919=>1000,37920=>1000,37921=>1000,37922=>1000,37923=>1000,37924=>1000,
-	37925=>1000,37926=>1000,37927=>998,37928=>1000,37929=>1000,37930=>1000,37931=>1000,37932=>1000,37933=>1000,37934=>1000,37935=>1000,37936=>1000,37937=>1000,37938=>1000,37939=>1000,37940=>1000,
-	37941=>1000,37942=>1000,37943=>1000,37944=>1000,37945=>1000,37946=>1000,37947=>1000,37948=>1000,37949=>1000,37950=>1000,37951=>1000,37952=>1000,37953=>1000,37954=>1000,37955=>1000,37956=>1000,
-	37957=>1000,37958=>1000,37959=>1000,37960=>1000,37961=>1000,37962=>1000,37963=>1000,37964=>1000,37965=>1000,37966=>1000,37967=>1000,37968=>1000,37969=>1000,37970=>1000,37971=>1000,37972=>1000,
-	37973=>1000,37974=>1000,37975=>1000,37976=>1000,37977=>1000,37978=>1000,37979=>1000,37980=>1000,37981=>1000,37982=>1000,37983=>1000,37984=>1000,37985=>1000,37986=>1000,37987=>1000,37988=>1000,
-	37989=>1000,37990=>1000,37991=>1000,37992=>1000,37993=>1000,37994=>1000,37995=>1000,37996=>1000,37997=>1000,37998=>1000,37999=>1000,38000=>1000,38001=>1000,38002=>1000,38003=>1000,38004=>1000,
-	38005=>1000,38006=>1000,38007=>1000,38008=>1000,38009=>1000,38010=>1000,38011=>1000,38012=>1000,38013=>1000,38014=>1000,38015=>1000,38016=>1000,38017=>1000,38018=>1000,38019=>1000,38020=>1000,
-	38021=>1000,38022=>1000,38023=>1000,38024=>1000,38025=>1000,38026=>1000,38027=>1000,38028=>1000,38029=>1000,38030=>1000,38031=>1000,38032=>1000,38033=>1000,38034=>1000,38035=>1000,38036=>1000,
-	38037=>1000,38038=>1000,38039=>1000,38040=>1000,38041=>1000,38042=>1000,38043=>1000,38044=>1000,38045=>1000,38046=>1000,38047=>1000,38048=>1000,38049=>1000,38050=>1000,38051=>1000,38052=>1000,
-	38053=>1000,38054=>1000,38055=>1000,38056=>1000,38057=>1000,38058=>1000,38059=>1000,38060=>1000,38061=>1000,38062=>1000,38063=>1000,38064=>1000,38065=>1000,38066=>1000,38067=>1000,38068=>1000,
-	38069=>1000,38070=>1000,38071=>1000,38072=>1000,38073=>1000,38074=>1000,38075=>1000,38076=>1000,38077=>1000,38078=>1000,38079=>1000,38080=>1000,38081=>1000,38082=>1000,38083=>1000,38084=>1000,
-	38085=>1000,38086=>1000,38087=>1000,38088=>1000,38089=>1000,38090=>1000,38091=>1000,38092=>1000,38093=>1000,38094=>1000,38095=>1000,38096=>1000,38097=>1000,38098=>1000,38099=>1000,38100=>1000,
-	38101=>1000,38102=>1000,38103=>1000,38104=>1000,38105=>1000,38106=>1000,38107=>1000,38108=>1000,38109=>1000,38110=>1000,38111=>1000,38112=>1000,38113=>1000,38114=>1000,38115=>1000,38116=>1000,
-	38117=>1000,38118=>1000,38119=>1000,38120=>1000,38121=>1000,38122=>1000,38123=>1000,38124=>1000,38125=>1000,38126=>1000,38127=>1000,38128=>1000,38129=>1000,38130=>1000,38131=>1000,38132=>1000,
-	38133=>1000,38134=>1000,38135=>1000,38136=>1000,38137=>1000,38138=>1000,38139=>1000,38140=>1000,38141=>1000,38142=>1000,38143=>1000,38144=>1000,38145=>1000,38146=>1000,38147=>1000,38148=>1000,
-	38149=>1000,38150=>1000,38151=>1000,38152=>1000,38153=>1000,38154=>1000,38155=>1000,38156=>1000,38157=>1000,38158=>1000,38159=>1000,38160=>1000,38161=>1000,38162=>1000,38163=>1000,38164=>1000,
-	38165=>1000,38166=>1000,38167=>1000,38168=>1000,38169=>1000,38170=>1000,38171=>1000,38172=>1000,38173=>1000,38174=>1000,38175=>1000,38176=>1000,38177=>1000,38178=>1000,38179=>1000,38180=>1000,
-	38181=>1000,38182=>1000,38183=>1000,38184=>1000,38185=>1000,38186=>1000,38187=>1000,38188=>1000,38189=>1000,38190=>1000,38191=>1000,38192=>1000,38193=>1000,38194=>1000,38195=>1000,38196=>1000,
-	38197=>1000,38198=>1000,38199=>1000,38200=>1000,38201=>1000,38202=>1000,38203=>1000,38204=>1000,38205=>1000,38206=>1000,38207=>1000,38208=>1000,38209=>1000,38210=>1000,38211=>1000,38212=>1000,
-	38213=>1000,38214=>1000,38215=>1000,38216=>1000,38217=>1000,38218=>1000,38219=>1000,38220=>1000,38221=>1000,38222=>1000,38223=>1000,38224=>1000,38225=>1000,38226=>1000,38227=>1000,38228=>1000,
-	38229=>1000,38230=>1000,38231=>1000,38232=>1000,38233=>1000,38234=>1000,38235=>1000,38236=>1000,38237=>1000,38238=>1000,38239=>1000,38240=>1000,38241=>1000,38242=>1000,38243=>1000,38244=>1000,
-	38245=>1000,38246=>1000,38247=>1000,38248=>1000,38249=>1000,38250=>1000,38251=>1000,38252=>1000,38253=>1000,38254=>1000,38255=>1000,38256=>1000,38257=>1000,38258=>1000,38259=>1000,38260=>1000,
-	38261=>1000,38262=>1000,38263=>1000,38264=>1000,38265=>1000,38266=>1000,38267=>1000,38268=>1000,38269=>1000,38270=>1000,38271=>1000,38272=>1000,38273=>1000,38274=>1000,38275=>1000,38276=>1000,
-	38277=>1000,38278=>1000,38279=>1000,38280=>1000,38281=>1000,38282=>1000,38283=>1000,38284=>1000,38285=>1000,38286=>1000,38287=>1000,38288=>1000,38289=>1000,38290=>1000,38291=>1000,38292=>1000,
-	38293=>1000,38294=>1000,38295=>1000,38296=>1000,38297=>1000,38298=>1000,38299=>1000,38300=>1000,38301=>1000,38302=>1000,38303=>1000,38304=>1000,38305=>1000,38306=>1000,38307=>1000,38308=>1000,
-	38309=>1000,38310=>1000,38311=>1000,38312=>1000,38313=>1000,38314=>1000,38315=>1000,38316=>1000,38317=>1000,38318=>1000,38319=>1000,38320=>1000,38321=>1000,38322=>1000,38323=>1000,38324=>1000,
-	38325=>1000,38326=>1000,38327=>1000,38328=>1000,38329=>1000,38330=>1000,38331=>1000,38332=>1000,38333=>1000,38334=>1000,38335=>1000,38336=>1000,38337=>1000,38338=>1000,38339=>1000,38340=>1000,
-	38341=>1000,38342=>1000,38343=>1000,38344=>1000,38345=>1000,38346=>1000,38347=>1000,38348=>1000,38349=>1000,38350=>1000,38351=>1000,38352=>1000,38353=>1000,38354=>1000,38355=>1000,38356=>1000,
-	38357=>1000,38358=>1000,38359=>1000,38360=>1000,38361=>1000,38362=>1000,38363=>1000,38364=>1000,38365=>1000,38366=>1000,38367=>1000,38368=>1000,38369=>1000,38370=>1000,38371=>1000,38372=>1000,
-	38373=>1000,38374=>1000,38375=>1000,38376=>1000,38377=>1000,38378=>1000,38379=>1000,38380=>1000,38381=>1000,38382=>1000,38383=>1000,38384=>1000,38385=>1000,38386=>1000,38387=>1000,38388=>1000,
-	38389=>1000,38390=>1000,38391=>1000,38392=>1000,38393=>1000,38394=>1000,38395=>1000,38396=>1000,38397=>1000,38398=>1000,38399=>1000,38400=>1000,38401=>1000,38402=>1000,38403=>1000,38404=>1000,
-	38405=>1000,38406=>1000,38407=>1000,38408=>1000,38409=>1000,38410=>1000,38411=>1000,38412=>1000,38413=>1000,38414=>1000,38415=>1000,38416=>1000,38417=>1000,38418=>1000,38419=>1000,38420=>1000,
-	38421=>1000,38422=>1000,38423=>1000,38424=>1000,38425=>1000,38426=>1000,38427=>1000,38428=>1000,38429=>1000,38430=>1000,38431=>1000,38432=>1000,38433=>1000,38434=>1000,38435=>1000,38436=>1000,
-	38437=>1000,38438=>1000,38439=>1000,38440=>1000,38441=>1000,38442=>1000,38443=>1000,38444=>1000,38445=>1000,38446=>1000,38447=>1000,38448=>1000,38449=>1000,38450=>1000,38451=>1000,38452=>1000,
-	38453=>1000,38454=>1000,38455=>1000,38456=>1000,38457=>1000,38458=>1000,38459=>1000,38460=>1000,38461=>1000,38462=>1000,38463=>1000,38464=>1000,38465=>1000,38466=>1000,38467=>1000,38468=>1000,
-	38469=>1000,38470=>1000,38471=>1000,38472=>1000,38473=>1000,38474=>1000,38475=>1000,38476=>1000,38477=>1000,38478=>1000,38479=>1000,38480=>1000,38481=>1000,38482=>1000,38483=>1000,38484=>1000,
-	38485=>1000,38486=>1000,38487=>1000,38488=>1000,38489=>1000,38490=>1000,38491=>1000,38492=>1000,38493=>1000,38494=>1000,38495=>1000,38496=>1000,38497=>1000,38498=>1000,38499=>1000,38500=>1000,
-	38501=>1000,38502=>1000,38503=>1000,38504=>1000,38505=>1000,38506=>1000,38507=>1000,38508=>1000,38509=>1000,38510=>1000,38511=>1000,38512=>1000,38513=>1000,38514=>1000,38515=>1000,38516=>1000,
-	38517=>1000,38518=>1000,38519=>1000,38520=>1000,38521=>1000,38522=>1000,38523=>1000,38524=>1000,38525=>1000,38526=>1000,38527=>1000,38528=>1000,38529=>1000,38530=>1000,38531=>1000,38532=>1000,
-	38533=>1000,38534=>1000,38535=>1000,38536=>1000,38537=>1000,38538=>1000,38539=>1000,38540=>1000,38541=>1000,38542=>1000,38543=>1000,38544=>1000,38545=>1000,38546=>1000,38547=>1000,38548=>1000,
-	38549=>1000,38550=>1000,38551=>1000,38552=>1000,38553=>1000,38554=>1000,38555=>1000,38556=>1000,38557=>1000,38558=>1000,38559=>1000,38560=>1000,38561=>1000,38562=>1000,38563=>1000,38564=>1000,
-	38565=>1000,38566=>1000,38567=>1000,38568=>1000,38569=>1000,38570=>1000,38571=>1000,38572=>1000,38573=>1000,38574=>1000,38575=>1000,38576=>1000,38577=>1000,38578=>1000,38579=>1000,38580=>1000,
-	38581=>1000,38582=>1000,38583=>1000,38584=>1000,38585=>1000,38586=>1000,38587=>1000,38588=>1000,38589=>1000,38590=>1000,38591=>1000,38592=>1000,38593=>1000,38594=>1000,38595=>1000,38596=>1000,
-	38597=>1000,38598=>1000,38599=>1000,38600=>1000,38601=>1000,38602=>1000,38603=>1000,38604=>1000,38605=>1000,38606=>1000,38607=>1000,38608=>1000,38609=>1000,38610=>1000,38611=>1000,38612=>1000,
-	38613=>1000,38614=>1000,38615=>1000,38616=>1000,38617=>1000,38618=>1000,38619=>1000,38620=>1000,38621=>1000,38622=>1000,38623=>1000,38624=>1000,38625=>1000,38626=>1000,38627=>1000,38628=>1000,
-	38629=>1000,38630=>1000,38631=>1000,38632=>1000,38633=>1000,38634=>1000,38635=>1000,38636=>1000,38637=>1000,38638=>1000,38639=>1000,38640=>1000,38641=>1000,38642=>1000,38643=>1000,38644=>1000,
-	38645=>1000,38646=>1000,38647=>1000,38648=>1000,38649=>1000,38650=>1000,38651=>1000,38652=>1000,38653=>1000,38654=>1000,38655=>1000,38656=>1000,38657=>1000,38658=>1000,38659=>1000,38660=>1000,
-	38661=>1000,38662=>1000,38663=>1000,38664=>1000,38665=>1000,38666=>1000,38667=>1000,38668=>1000,38669=>1000,38670=>1000,38671=>1000,38672=>1000,38673=>1000,38674=>1000,38675=>1000,38676=>1000,
-	38677=>1000,38678=>1000,38679=>1000,38680=>1000,38681=>1000,38682=>1000,38683=>1000,38684=>1000,38685=>1000,38686=>1000,38687=>1000,38688=>1000,38689=>1000,38690=>1000,38691=>1000,38692=>1000,
-	38693=>1000,38694=>1000,38695=>1000,38696=>1000,38697=>1000,38698=>1000,38699=>1000,38700=>1000,38701=>1000,38702=>1000,38703=>1000,38704=>1000,38705=>1000,38706=>1000,38707=>1000,38708=>1000,
-	38709=>1000,38710=>1000,38711=>1000,38712=>1000,38713=>1000,38714=>1000,38715=>1000,38716=>1000,38717=>1000,38718=>1000,38719=>1000,38720=>1000,38721=>1000,38722=>1000,38723=>1000,38724=>1000,
-	38725=>1000,38726=>1000,38727=>1000,38728=>1000,38729=>1000,38730=>1000,38731=>1000,38732=>1000,38733=>1000,38734=>1000,38735=>1000,38736=>1000,38737=>1000,38738=>1000,38739=>1000,38740=>1000,
-	38741=>1000,38742=>1000,38743=>1000,38744=>1000,38745=>1000,38746=>1000,38747=>1000,38748=>1000,38749=>1000,38750=>1000,38751=>1000,38752=>1000,38753=>1000,38754=>1000,38755=>1000,38756=>1000,
-	38757=>1000,38758=>1000,38759=>1000,38760=>1000,38761=>1000,38762=>1000,38763=>1000,38764=>1000,38765=>1000,38766=>1000,38767=>1000,38768=>1000,38769=>1000,38770=>1000,38771=>1000,38772=>1000,
-	38773=>1000,38774=>1000,38775=>1000,38776=>1000,38777=>1000,38778=>1000,38779=>1000,38780=>1000,38781=>1000,38782=>1000,38783=>1000,38784=>1000,38785=>1000,38786=>1000,38787=>1000,38788=>1000,
-	38789=>1000,38790=>1000,38791=>1000,38792=>1000,38793=>1000,38794=>1000,38795=>1000,38796=>1000,38797=>1000,38798=>1000,38799=>1000,38800=>1000,38801=>1000,38802=>1000,38803=>1000,38804=>1000,
-	38805=>1000,38806=>1000,38807=>1000,38808=>1000,38809=>1000,38810=>1000,38811=>1000,38812=>1000,38813=>1000,38814=>1000,38815=>1000,38816=>1000,38817=>1000,38818=>1000,38819=>1000,38820=>1000,
-	38821=>1000,38822=>1000,38823=>1000,38824=>1000,38825=>1000,38826=>1000,38827=>1000,38828=>1000,38829=>1000,38830=>1000,38831=>1000,38832=>1000,38833=>1000,38834=>1000,38835=>1000,38836=>1000,
-	38837=>1000,38838=>1000,38839=>1000,38840=>1000,38841=>1000,38842=>1000,38843=>1000,38844=>1000,38845=>1000,38846=>1000,38847=>1000,38848=>1000,38849=>1000,38850=>1000,38851=>1000,38852=>1000,
-	38853=>1000,38854=>1000,38855=>1000,38856=>1000,38857=>1000,38858=>1000,38859=>1000,38860=>1000,38861=>1000,38862=>1000,38863=>1000,38864=>1000,38865=>1000,38866=>1000,38867=>1000,38868=>1000,
-	38869=>1000,38870=>1000,38871=>1000,38872=>1000,38873=>1000,38874=>1000,38875=>1000,38876=>1000,38877=>1000,38878=>1000,38879=>1000,38880=>1000,38881=>1000,38882=>1000,38883=>1000,38884=>1000,
-	38885=>1000,38886=>1000,38887=>1000,38888=>1000,38889=>1000,38890=>1000,38891=>1000,38892=>1000,38893=>1000,38894=>1000,38895=>1000,38896=>1000,38897=>1000,38898=>1000,38899=>1000,38900=>1000,
-	38901=>1000,38902=>1000,38903=>1000,38904=>1000,38905=>1000,38906=>1000,38907=>1000,38908=>1000,38909=>1000,38910=>1000,38911=>1000,38912=>1000,38913=>1000,38914=>1000,38915=>1000,38916=>1000,
-	38917=>1000,38918=>1000,38919=>1000,38920=>1000,38921=>1000,38922=>1000,38923=>1000,38924=>1000,38925=>1000,38926=>1000,38927=>1000,38928=>1000,38929=>1000,38930=>1000,38931=>1000,38932=>1000,
-	38933=>1000,38934=>1000,38935=>1000,38936=>1000,38937=>1000,38938=>1000,38939=>1000,38940=>1000,38941=>1000,38942=>1000,38943=>1000,38944=>1000,38945=>1000,38946=>1000,38947=>1000,38948=>1000,
-	38949=>1000,38950=>1000,38951=>1000,38952=>1000,38953=>1000,38954=>1000,38955=>1000,38956=>1000,38957=>1000,38958=>1000,38959=>1000,38960=>1000,38961=>1000,38962=>1000,38963=>1000,38964=>1000,
-	38965=>1000,38966=>1000,38967=>1000,38968=>1000,38969=>1000,38970=>1000,38971=>1000,38972=>1000,38973=>1000,38974=>1000,38975=>1000,38976=>1000,38977=>1000,38978=>1000,38979=>1000,38980=>1000,
-	38981=>1000,38982=>1000,38983=>1000,38984=>1000,38985=>1000,38986=>1000,38987=>1000,38988=>1000,38989=>1000,38990=>1000,38991=>1000,38992=>1000,38993=>1000,38994=>1000,38995=>1000,38996=>1000,
-	38997=>1000,38998=>1000,38999=>1000,39000=>1000,39001=>1000,39002=>1000,39003=>1000,39004=>1000,39005=>1000,39006=>1000,39007=>1000,39008=>1000,39009=>1000,39010=>1000,39011=>1000,39012=>1000,
-	39013=>1000,39014=>1000,39015=>1000,39016=>1000,39017=>1000,39018=>1000,39019=>1000,39020=>1000,39021=>1000,39022=>1000,39023=>1000,39024=>1000,39025=>1000,39026=>1000,39027=>1000,39028=>1000,
-	39029=>1000,39030=>1000,39031=>1000,39032=>1000,39033=>1000,39034=>1000,39035=>1000,39036=>1000,39037=>1000,39038=>1000,39039=>1000,39040=>1000,39041=>1000,39042=>1000,39043=>1000,39044=>1000,
-	39045=>1000,39046=>1000,39047=>1000,39048=>1000,39049=>1000,39050=>1000,39051=>1000,39052=>1000,39053=>1000,39054=>1000,39055=>1000,39056=>1000,39057=>1000,39058=>1000,39059=>1000,39060=>1000,
-	39061=>1000,39062=>1000,39063=>1000,39064=>1000,39065=>1000,39066=>1000,39067=>1000,39068=>1000,39069=>1000,39070=>1000,39071=>1000,39072=>1000,39073=>1000,39074=>1000,39075=>1000,39076=>1000,
-	39077=>1000,39078=>1000,39079=>1000,39080=>1000,39081=>1000,39082=>1000,39083=>1000,39084=>1000,39085=>1000,39086=>1000,39087=>1000,39088=>1000,39089=>1000,39090=>1000,39091=>1000,39092=>1000,
-	39093=>1000,39094=>1000,39095=>1000,39096=>1000,39097=>1000,39098=>1000,39099=>1000,39100=>1000,39101=>1000,39102=>1000,39103=>1000,39104=>1000,39105=>1000,39106=>1000,39107=>1000,39108=>1000,
-	39109=>1000,39110=>1000,39111=>1000,39112=>1000,39113=>1000,39114=>1000,39115=>1000,39116=>1000,39117=>1000,39118=>1000,39119=>1000,39120=>1000,39121=>1000,39122=>1000,39123=>1000,39124=>1000,
-	39125=>1000,39126=>1000,39127=>1000,39128=>1000,39129=>1000,39130=>1000,39131=>1000,39132=>1000,39133=>1000,39134=>1000,39135=>1000,39136=>1000,39137=>1000,39138=>1000,39139=>1000,39140=>1000,
-	39141=>1000,39142=>1000,39143=>1000,39144=>1000,39145=>1000,39146=>1000,39147=>1000,39148=>1000,39149=>1000,39150=>1000,39151=>1000,39152=>1000,39153=>1000,39154=>1000,39155=>1000,39156=>1000,
-	39157=>1000,39158=>1000,39159=>1000,39160=>1000,39161=>1000,39162=>1000,39163=>1000,39164=>1000,39165=>1000,39166=>1000,39167=>1000,39168=>1000,39169=>1000,39170=>1000,39171=>1000,39172=>1000,
-	39173=>1000,39174=>1000,39175=>1000,39176=>1000,39177=>1000,39178=>1000,39179=>1000,39180=>1000,39181=>1000,39182=>1000,39183=>1000,39184=>1000,39185=>1000,39186=>1000,39187=>1000,39188=>1000,
-	39189=>1000,39190=>1000,39191=>1000,39192=>1000,39193=>1000,39194=>1000,39195=>1000,39196=>1000,39197=>1000,39198=>1000,39199=>1000,39200=>1000,39201=>1000,39202=>1000,39203=>1000,39204=>1000,
-	39205=>1000,39206=>1000,39207=>1000,39208=>1000,39209=>1000,39210=>1000,39211=>1000,39212=>1000,39213=>1000,39214=>1000,39215=>1000,39216=>1000,39217=>1000,39218=>1000,39219=>1000,39220=>1000,
-	39221=>1000,39222=>1000,39223=>1000,39224=>1000,39225=>1000,39226=>1000,39227=>1000,39228=>1000,39229=>1000,39230=>1000,39231=>1000,39232=>1000,39233=>1000,39234=>1000,39235=>1000,39236=>1000,
-	39237=>1000,39238=>1000,39239=>1000,39240=>1000,39241=>1000,39242=>1000,39243=>1000,39244=>1000,39245=>1000,39246=>1000,39247=>1000,39248=>1000,39249=>1000,39250=>1000,39251=>1000,39252=>1000,
-	39253=>1000,39254=>1000,39255=>1000,39256=>1000,39257=>1000,39258=>1000,39259=>1000,39260=>1000,39261=>1000,39262=>1000,39263=>1000,39264=>1000,39265=>1000,39266=>1000,39267=>1000,39268=>1000,
-	39269=>1000,39270=>1000,39271=>1000,39272=>1000,39273=>1000,39274=>1000,39275=>1000,39276=>1000,39277=>1000,39278=>1000,39279=>1000,39280=>1000,39281=>1000,39282=>1000,39283=>1000,39284=>1000,
-	39285=>1000,39286=>1000,39287=>1000,39288=>1000,39289=>1000,39290=>1000,39291=>1000,39292=>1000,39293=>1000,39294=>1000,39295=>1000,39296=>1000,39297=>1000,39298=>1000,39299=>1000,39300=>1000,
-	39301=>1000,39302=>1000,39303=>1000,39304=>1000,39305=>1000,39306=>1000,39307=>1000,39308=>1000,39309=>1000,39310=>1000,39311=>1000,39312=>1000,39313=>1000,39314=>1000,39315=>1000,39316=>1000,
-	39317=>1000,39318=>1000,39319=>1000,39320=>1000,39321=>1000,39322=>1000,39323=>1000,39324=>1000,39325=>1000,39326=>1000,39327=>1000,39328=>1000,39329=>1000,39330=>1000,39331=>1000,39332=>1000,
-	39333=>1000,39334=>1000,39335=>1000,39336=>1000,39337=>1000,39338=>1000,39339=>1000,39340=>1000,39341=>1000,39342=>1000,39343=>1000,39344=>1000,39345=>1000,39346=>1000,39347=>1000,39348=>1000,
-	39349=>1000,39350=>1000,39351=>1000,39352=>1000,39353=>1000,39354=>1000,39355=>1000,39356=>1000,39357=>1000,39358=>1000,39359=>1000,39360=>1000,39361=>1000,39362=>1000,39363=>1000,39364=>1000,
-	39365=>1000,39366=>1000,39367=>1000,39368=>1000,39369=>1000,39370=>1000,39371=>1000,39372=>1000,39373=>1000,39374=>1000,39375=>1000,39376=>1000,39377=>1000,39378=>1000,39379=>1000,39380=>1000,
-	39381=>1000,39382=>1000,39383=>1000,39384=>1000,39385=>1000,39386=>1000,39387=>1000,39388=>1000,39389=>1000,39390=>1000,39391=>1000,39392=>1000,39393=>1000,39394=>1000,39395=>1000,39396=>1000,
-	39397=>1000,39398=>1000,39399=>1000,39400=>1000,39401=>1000,39402=>1000,39403=>1000,39404=>1000,39405=>1000,39406=>1000,39407=>1000,39408=>1000,39409=>1000,39410=>1000,39411=>1000,39412=>1000,
-	39413=>1000,39414=>1000,39415=>1000,39416=>1000,39417=>1000,39418=>1000,39419=>1000,39420=>1000,39421=>1000,39422=>1000,39423=>1000,39424=>1000,39425=>1000,39426=>1000,39427=>1000,39428=>1000,
-	39429=>1000,39430=>1000,39431=>1000,39432=>1000,39433=>1000,39434=>1000,39435=>1000,39436=>1000,39437=>1000,39438=>1000,39439=>1000,39440=>1000,39441=>1000,39442=>1000,39443=>1000,39444=>1000,
-	39445=>1000,39446=>1000,39447=>1000,39448=>1000,39449=>1000,39450=>1000,39451=>1000,39452=>1000,39453=>1000,39454=>1000,39455=>1000,39456=>1000,39457=>1000,39458=>1000,39459=>1000,39460=>1000,
-	39461=>1000,39462=>1000,39463=>1000,39464=>1000,39465=>1000,39466=>1000,39467=>1000,39468=>1000,39469=>1000,39470=>1000,39471=>1000,39472=>1000,39473=>1000,39474=>1000,39475=>1000,39476=>1000,
-	39477=>1000,39478=>1000,39479=>1000,39480=>1000,39481=>1000,39482=>1000,39483=>1000,39484=>1000,39485=>1000,39486=>1000,39487=>1000,39488=>1000,39489=>1000,39490=>1000,39491=>1000,39492=>1000,
-	39493=>1000,39494=>1000,39495=>1000,39496=>1000,39497=>1000,39498=>1000,39499=>1000,39500=>1000,39501=>1000,39502=>1000,39503=>1000,39504=>1000,39505=>1000,39506=>1000,39507=>1000,39508=>1000,
-	39509=>1000,39510=>1000,39511=>1000,39512=>1000,39513=>1000,39514=>1000,39515=>1000,39516=>1000,39517=>1000,39518=>1000,39519=>1000,39520=>1000,39521=>1000,39522=>1000,39523=>1000,39524=>1000,
-	39525=>1000,39526=>1000,39527=>1000,39528=>1000,39529=>1000,39530=>1000,39531=>1000,39532=>1000,39533=>1000,39534=>1000,39535=>1000,39536=>1000,39537=>1000,39538=>1000,39539=>1000,39540=>1000,
-	39541=>1000,39542=>1000,39543=>1000,39544=>1000,39545=>1000,39546=>1000,39547=>1000,39548=>1000,39549=>1000,39550=>1000,39551=>1000,39552=>1000,39553=>1000,39554=>1000,39555=>1000,39556=>1000,
-	39557=>1000,39558=>1000,39559=>1000,39560=>1000,39561=>1000,39562=>1000,39563=>1000,39564=>1000,39565=>1000,39566=>1000,39567=>1000,39568=>1000,39569=>1000,39570=>1000,39571=>1000,39572=>1000,
-	39573=>1000,39574=>1000,39575=>1000,39576=>1000,39577=>1000,39578=>1000,39579=>1000,39580=>1000,39581=>1000,39582=>1000,39583=>1000,39584=>1000,39585=>1000,39586=>1000,39587=>1000,39588=>1000,
-	39589=>1000,39590=>1000,39591=>1000,39592=>1000,39593=>1000,39594=>1000,39595=>1000,39596=>1000,39597=>1000,39598=>1000,39599=>1000,39600=>1000,39601=>1000,39602=>1000,39603=>1000,39604=>1000,
-	39605=>1000,39606=>1000,39607=>1000,39608=>1000,39609=>1000,39610=>1000,39611=>1000,39612=>1000,39613=>1000,39614=>1000,39615=>1000,39616=>1000,39617=>1000,39618=>1000,39619=>1000,39620=>1000,
-	39621=>1000,39622=>1000,39623=>1000,39624=>1000,39625=>1000,39626=>1000,39627=>1000,39628=>1000,39629=>1000,39630=>1000,39631=>1000,39632=>1000,39633=>1000,39634=>1000,39635=>1000,39636=>1000,
-	39637=>1000,39638=>1000,39639=>1000,39640=>1000,39641=>1000,39642=>1000,39643=>1000,39644=>1000,39645=>1000,39646=>1000,39647=>1000,39648=>1000,39649=>1000,39650=>1000,39651=>1000,39652=>1000,
-	39653=>1000,39654=>1000,39655=>1000,39656=>1000,39657=>1000,39658=>1000,39659=>1000,39660=>1000,39661=>1000,39662=>1000,39663=>1000,39664=>1000,39665=>1000,39666=>1000,39667=>1000,39668=>1000,
-	39669=>1000,39670=>1000,39671=>1000,39672=>1000,39673=>1000,39674=>1000,39675=>1000,39676=>1000,39677=>1000,39678=>1000,39679=>1000,39680=>1000,39681=>1000,39682=>1000,39683=>1000,39684=>1000,
-	39685=>1000,39686=>1000,39687=>1000,39688=>1000,39689=>1000,39690=>1000,39691=>1000,39692=>1000,39693=>1000,39694=>1000,39695=>1000,39696=>1000,39697=>1000,39698=>1000,39699=>1000,39700=>1000,
-	39701=>1000,39702=>1000,39703=>1000,39704=>1000,39705=>1000,39706=>1000,39707=>1000,39708=>1000,39709=>1000,39710=>1000,39711=>1000,39712=>1000,39713=>1000,39714=>1000,39715=>1000,39716=>1000,
-	39717=>1000,39718=>1000,39719=>1000,39720=>1000,39721=>1000,39722=>1000,39723=>1000,39724=>1000,39725=>1000,39726=>1000,39727=>1000,39728=>1000,39729=>1000,39730=>1000,39731=>1000,39732=>1000,
-	39733=>1000,39734=>1000,39735=>1000,39736=>1000,39737=>1000,39738=>1000,39739=>1000,39740=>1000,39741=>1000,39742=>1000,39743=>1000,39744=>1000,39745=>1000,39746=>1000,39747=>1000,39748=>1000,
-	39749=>1000,39750=>1000,39751=>1000,39752=>1000,39753=>1000,39754=>1000,39755=>1000,39756=>1000,39757=>1000,39758=>1000,39759=>1000,39760=>1000,39761=>1000,39762=>1000,39763=>1000,39764=>1000,
-	39765=>1000,39766=>1000,39767=>1000,39768=>1000,39769=>1000,39770=>1000,39771=>1000,39772=>1000,39773=>1000,39774=>1000,39775=>1000,39776=>1000,39777=>1000,39778=>1000,39779=>1000,39780=>1000,
-	39781=>1000,39782=>1000,39783=>1000,39784=>1000,39785=>1000,39786=>1000,39787=>1000,39788=>1000,39789=>1000,39790=>1000,39791=>1000,39792=>1000,39793=>1000,39794=>1000,39795=>1000,39796=>1000,
-	39797=>1000,39798=>1000,39799=>1000,39800=>1000,39801=>1000,39802=>1000,39803=>1000,39804=>1000,39805=>1000,39806=>1000,39807=>1000,39808=>1000,39809=>1000,39810=>1000,39811=>1000,39812=>1000,
-	39813=>1000,39814=>1000,39815=>1000,39816=>1000,39817=>1000,39818=>1000,39819=>1000,39820=>1000,39821=>1000,39822=>1000,39823=>1000,39824=>1000,39825=>1000,39826=>1000,39827=>1000,39828=>1000,
-	39829=>1000,39830=>1000,39831=>1000,39832=>1000,39833=>1000,39834=>1000,39835=>1000,39836=>1000,39837=>1000,39838=>1000,39839=>1000,39840=>1000,39841=>1000,39842=>1000,39843=>1000,39844=>1000,
-	39845=>1000,39846=>1000,39847=>1000,39848=>1000,39849=>1000,39850=>1000,39851=>1000,39852=>1000,39853=>1000,39854=>1000,39855=>1000,39856=>1000,39857=>1000,39858=>1000,39859=>1000,39860=>1000,
-	39861=>1000,39862=>1000,39863=>1000,39864=>1000,39865=>1000,39866=>1000,39867=>1000,39868=>1000,39869=>1000,39870=>1000,39871=>1000,39872=>1000,39873=>1000,39874=>1000,39875=>1000,39876=>1000,
-	39877=>1000,39878=>1000,39879=>1000,39880=>1000,39881=>1000,39882=>1000,39883=>1000,39884=>1000,39885=>1000,39886=>1000,39887=>1000,39888=>1000,39889=>1000,39890=>1000,39891=>1000,39892=>1000,
-	39893=>1000,39894=>1000,39895=>1000,39896=>1000,39897=>1000,39898=>1000,39899=>1000,39900=>1000,39901=>1000,39902=>1000,39903=>1000,39904=>1000,39905=>1000,39906=>1000,39907=>1000,39908=>1000,
-	39909=>1000,39910=>1000,39911=>1000,39912=>1000,39913=>1000,39914=>1000,39915=>1000,39916=>1000,39917=>1000,39918=>1000,39919=>1000,39920=>1000,39921=>1000,39922=>1000,39923=>1000,39924=>1000,
-	39925=>1000,39926=>1000,39927=>1000,39928=>1000,39929=>1000,39930=>1000,39931=>1000,39932=>1000,39933=>1000,39934=>1000,39935=>1000,39936=>1000,39937=>1000,39938=>1000,39939=>1000,39940=>1000,
-	39941=>1000,39942=>1000,39943=>1000,39944=>1000,39945=>1000,39946=>1000,39947=>1000,39948=>1000,39949=>1000,39950=>1000,39951=>1000,39952=>1000,39953=>1000,39954=>1000,39955=>1000,39956=>1000,
-	39957=>1000,39958=>1000,39959=>1000,39960=>1000,39961=>1000,39962=>1000,39963=>1000,39964=>1000,39965=>1000,39966=>1000,39967=>1000,39968=>1000,39969=>1000,39970=>1000,39971=>1000,39972=>1000,
-	39973=>1000,39974=>1000,39975=>1000,39976=>1000,39977=>1000,39978=>1000,39979=>1000,39980=>1000,39981=>1000,39982=>1000,39983=>1000,39984=>1000,39985=>1000,39986=>1000,39987=>1000,39988=>1000,
-	39989=>1000,39990=>1000,39991=>1000,39992=>1000,39993=>1000,39994=>1000,39995=>1000,39996=>1000,39997=>1000,39998=>1000,39999=>1000,40000=>1000,40001=>1000,40002=>1000,40003=>1000,40004=>1000,
-	40005=>1000,40006=>1000,40007=>1000,40008=>1000,40009=>1000,40010=>1000,40011=>1000,40012=>1000,40013=>1000,40014=>1000,40015=>1000,40016=>1000,40017=>1000,40018=>1000,40019=>1000,40020=>1000,
-	40021=>1000,40022=>1000,40023=>1000,40024=>1000,40025=>1000,40026=>1000,40027=>1000,40028=>1000,40029=>1000,40030=>1000,40031=>1000,40032=>1000,40033=>1000,40034=>1000,40035=>1000,40036=>1000,
-	40037=>1000,40038=>1000,40039=>1000,40040=>1000,40041=>1000,40042=>1000,40043=>1000,40044=>1000,40045=>1000,40046=>1000,40047=>1000,40048=>1000,40049=>1000,40050=>1000,40051=>1000,40052=>1000,
-	40053=>1000,40054=>1000,40055=>1000,40056=>1000,40057=>1000,40058=>1000,40059=>1000,40060=>1000,40061=>1000,40062=>1000,40063=>1000,40064=>1000,40065=>1000,40066=>1000,40067=>1000,40068=>1000,
-	40069=>1000,40070=>1000,40071=>1000,40072=>1000,40073=>1000,40074=>1000,40075=>1000,40076=>1000,40077=>1000,40078=>1000,40079=>1000,40080=>1000,40081=>1000,40082=>1000,40083=>1000,40084=>1000,
-	40085=>1000,40086=>1000,40087=>1000,40088=>1000,40089=>1000,40090=>1000,40091=>1000,40092=>1000,40093=>1000,40094=>1000,40095=>1000,40096=>1000,40097=>1000,40098=>1000,40099=>1000,40100=>1000,
-	40101=>1000,40102=>1000,40103=>1000,40104=>1000,40105=>1000,40106=>1000,40107=>1000,40108=>1000,40109=>1000,40110=>1000,40111=>1000,40112=>1000,40113=>1000,40114=>1000,40115=>1000,40116=>1000,
-	40117=>1000,40118=>1000,40119=>1000,40120=>1000,40121=>1000,40122=>1000,40123=>1000,40124=>1000,40125=>1000,40126=>1000,40127=>1000,40128=>1000,40129=>1000,40130=>1000,40131=>1000,40132=>1000,
-	40133=>1000,40134=>1000,40135=>1000,40136=>1000,40137=>1000,40138=>1000,40139=>1000,40140=>1000,40141=>1000,40142=>1000,40143=>1000,40144=>1000,40145=>1000,40146=>1000,40147=>1000,40148=>1000,
-	40149=>1000,40150=>1000,40151=>1000,40152=>1000,40153=>1000,40154=>1000,40155=>1000,40156=>1000,40157=>1000,40158=>1000,40159=>1000,40160=>1000,40161=>1000,40162=>1000,40163=>1000,40164=>1000,
-	40165=>1000,40166=>1000,40167=>1000,40168=>1000,40169=>1000,40170=>1000,40171=>1000,40172=>1000,40173=>1000,40174=>1000,40175=>1000,40176=>1000,40177=>1000,40178=>1000,40179=>1000,40180=>1000,
-	40181=>1000,40182=>1000,40183=>1000,40184=>1000,40185=>1000,40186=>1000,40187=>1000,40188=>1000,40189=>1000,40190=>1000,40191=>1000,40192=>1000,40193=>1000,40194=>1000,40195=>1000,40196=>1000,
-	40197=>1000,40198=>1000,40199=>1000,40200=>1000,40201=>1000,40202=>1000,40203=>1000,40204=>1000,40205=>1000,40206=>1000,40207=>1000,40208=>1000,40209=>1000,40210=>1000,40211=>1000,40212=>1000,
-	40213=>1000,40214=>1000,40215=>1000,40216=>1000,40217=>1000,40218=>1000,40219=>1000,40220=>1000,40221=>1000,40222=>1000,40223=>1000,40224=>1000,40225=>1000,40226=>1000,40227=>1000,40228=>1000,
-	40229=>1000,40230=>1000,40231=>1000,40232=>1000,40233=>1000,40234=>1000,40235=>1000,40236=>1000,40237=>1000,40238=>1000,40239=>1000,40240=>1000,40241=>1000,40242=>1000,40243=>1000,40244=>1000,
-	40245=>1000,40246=>1000,40247=>1000,40248=>1000,40249=>1000,40250=>1000,40251=>1000,40252=>1000,40253=>1000,40254=>1000,40255=>1000,40256=>1000,40257=>1000,40258=>1000,40259=>1000,40260=>1000,
-	40261=>1000,40262=>1000,40263=>1000,40264=>1000,40265=>1000,40266=>1000,40267=>1000,40268=>1000,40269=>1000,40270=>1000,40271=>1000,40272=>1000,40273=>1000,40274=>1000,40275=>1000,40276=>1000,
-	40277=>1000,40278=>1000,40279=>1000,40280=>1000,40281=>1000,40282=>1000,40283=>1000,40284=>1000,40285=>1000,40286=>1000,40287=>1000,40288=>1000,40289=>1000,40290=>1000,40291=>1000,40292=>1000,
-	40293=>1000,40294=>1000,40295=>1000,40296=>1000,40297=>1000,40298=>1000,40299=>1000,40300=>1000,40301=>1000,40302=>1000,40303=>1000,40304=>1000,40305=>1000,40306=>1000,40307=>1000,40308=>1000,
-	40309=>1000,40310=>1000,40311=>1000,40312=>1000,40313=>1000,40314=>1000,40315=>1000,40316=>1000,40317=>1000,40318=>1000,40319=>1000,40320=>1000,40321=>1000,40322=>1000,40323=>1000,40324=>1000,
-	40325=>1000,40326=>1000,40327=>1000,40328=>1000,40329=>1000,40330=>1000,40331=>1000,40332=>1000,40333=>1000,40334=>1000,40335=>1000,40336=>1000,40337=>1000,40338=>1000,40339=>1000,40340=>1000,
-	40341=>1000,40342=>1000,40343=>1000,40344=>1000,40345=>1000,40346=>1000,40347=>1000,40348=>1000,40349=>1000,40350=>1000,40351=>1000,40352=>1000,40353=>1000,40354=>1000,40355=>1000,40356=>1000,
-	40357=>1000,40358=>1000,40359=>1000,40360=>1000,40361=>1000,40362=>1000,40363=>1000,40364=>1000,40365=>1000,40366=>1000,40367=>1000,40368=>1000,40369=>1000,40370=>1000,40371=>1000,40372=>1000,
-	40373=>1000,40374=>1000,40375=>1000,40376=>1000,40377=>1000,40378=>1000,40379=>1000,40380=>1000,40381=>1000,40382=>1000,40383=>1000,40384=>1000,40385=>1000,40386=>1000,40387=>1000,40388=>1000,
-	40389=>1000,40390=>1000,40391=>1000,40392=>1000,40393=>1000,40394=>1000,40395=>1000,40396=>1000,40397=>1000,40398=>1000,40399=>1000,40400=>1000,40401=>1000,40402=>1000,40403=>1000,40404=>1000,
-	40405=>1000,40406=>1000,40407=>1000,40408=>1000,40409=>1000,40410=>1000,40411=>1000,40412=>1000,40413=>1000,40414=>1000,40415=>1000,40416=>1000,40417=>1000,40418=>1000,40419=>1000,40420=>1000,
-	40421=>1000,40422=>1000,40423=>1000,40424=>1000,40425=>1000,40426=>1000,40427=>1000,40428=>1000,40429=>1000,40430=>1000,40431=>1000,40432=>1000,40433=>1000,40434=>1000,40435=>1000,40436=>1000,
-	40437=>1000,40438=>1000,40439=>1000,40440=>1000,40441=>1000,40442=>1000,40443=>1000,40444=>1000,40445=>1000,40446=>1000,40447=>1000,40448=>1000,40449=>1000,40450=>1000,40451=>1000,40452=>1000,
-	40453=>1000,40454=>1000,40455=>1000,40456=>1000,40457=>1000,40458=>1000,40459=>1000,40460=>1000,40461=>1000,40462=>1000,40463=>1000,40464=>1000,40465=>1000,40466=>1000,40467=>1000,40468=>1000,
-	40469=>1000,40470=>1000,40471=>1000,40472=>1000,40473=>1000,40474=>1000,40475=>1000,40476=>1000,40477=>1000,40478=>1000,40479=>1000,40480=>1000,40481=>1000,40482=>1000,40483=>1000,40484=>1000,
-	40485=>1000,40486=>1000,40487=>1000,40488=>1000,40489=>1000,40490=>1000,40491=>1000,40492=>1000,40493=>1000,40494=>1000,40495=>1000,40496=>1000,40497=>1000,40498=>1000,40499=>1000,40500=>1000,
-	40501=>1000,40502=>1000,40503=>1000,40504=>1000,40505=>1000,40506=>1000,40507=>1000,40508=>1000,40509=>1000,40510=>1000,40511=>1000,40512=>1000,40513=>1000,40514=>1000,40515=>1000,40516=>1000,
-	40517=>1000,40518=>1000,40519=>1000,40520=>1000,40521=>1000,40522=>1000,40523=>1000,40524=>1000,40525=>1000,40526=>1000,40527=>1000,40528=>1000,40529=>1000,40530=>1000,40531=>1000,40532=>1000,
-	40533=>1000,40534=>1000,40535=>1000,40536=>1000,40537=>1000,40538=>1000,40539=>1000,40540=>1000,40541=>1000,40542=>1000,40543=>1000,40544=>1000,40545=>1000,40546=>1000,40547=>1000,40548=>1000,
-	40549=>1000,40550=>1000,40551=>1000,40552=>1000,40553=>1000,40554=>1000,40555=>1000,40556=>1000,40557=>1000,40558=>1000,40559=>1000,40560=>1000,40561=>1000,40562=>1000,40563=>1000,40564=>1000,
-	40565=>1000,40566=>1000,40567=>1000,40568=>1000,40569=>1000,40570=>1000,40571=>1000,40572=>1000,40573=>1000,40574=>1000,40575=>1000,40576=>1000,40577=>1000,40578=>1000,40579=>1000,40580=>1000,
-	40581=>1000,40582=>1000,40583=>1000,40584=>1000,40585=>1000,40586=>1000,40587=>1000,40588=>1000,40589=>1000,40590=>1000,40591=>1000,40592=>1000,40593=>1000,40594=>1000,40595=>1000,40596=>1000,
-	40597=>1000,40598=>1000,40599=>1000,40600=>1000,40601=>1000,40602=>1000,40603=>1000,40604=>1000,40605=>1000,40606=>1000,40607=>1000,40608=>1000,40609=>1000,40610=>1000,40611=>1000,40612=>1000,
-	40613=>1000,40614=>1000,40615=>1000,40616=>1000,40617=>1000,40618=>1000,40619=>1000,40620=>1000,40621=>1000,40622=>1000,40623=>1000,40624=>1000,40625=>1000,40626=>1000,40627=>1000,40628=>1000,
-	40629=>1000,40630=>1000,40631=>1000,40632=>1000,40633=>1000,40634=>1000,40635=>1000,40636=>1000,40637=>1000,40638=>1000,40639=>1000,40640=>1000,40641=>1000,40642=>1000,40643=>1000,40644=>1000,
-	40645=>1000,40646=>1000,40647=>1000,40648=>1000,40649=>1000,40650=>1000,40651=>1000,40652=>1000,40653=>1000,40654=>1000,40655=>1000,40656=>1000,40657=>1000,40658=>1000,40659=>1000,40660=>1000,
-	40661=>1000,40662=>1000,40663=>1000,40664=>1000,40665=>1000,40666=>1000,40667=>1000,40668=>1000,40669=>1000,40670=>1000,40671=>1000,40672=>1000,40673=>1000,40674=>1000,40675=>1000,40676=>1000,
-	40677=>1000,40678=>1000,40679=>1000,40680=>1000,40681=>1000,40682=>1000,40683=>1000,40684=>1000,40685=>1000,40686=>1000,40687=>1000,40688=>1000,40689=>1000,40690=>1000,40691=>1000,40692=>1000,
-	40693=>1000,40694=>1000,40695=>1000,40696=>1000,40697=>1000,40698=>1000,40699=>1000,40700=>1000,40701=>1000,40702=>1000,40703=>1000,40704=>1000,40705=>1000,40706=>1000,40707=>1000,40708=>1000,
-	40709=>1000,40710=>1000,40711=>1000,40712=>1000,40713=>1000,40714=>1000,40715=>1000,40716=>1000,40717=>1000,40718=>1000,40719=>1000,40720=>1000,40721=>1000,40722=>1000,40723=>1000,40724=>1000,
-	40725=>1000,40726=>1000,40727=>1000,40728=>1000,40729=>1000,40730=>1000,40731=>1000,40732=>1000,40733=>1000,40734=>1000,40735=>1000,40736=>1000,40737=>1000,40738=>1000,40739=>1000,40740=>1000,
-	40741=>1000,40742=>1000,40743=>1000,40744=>1000,40745=>1000,40746=>1000,40747=>1000,40748=>1000,40749=>1000,40750=>1000,40751=>1000,40752=>1000,40753=>1000,40754=>1000,40755=>1000,40756=>1000,
-	40757=>1000,40758=>1000,40759=>1000,40760=>1000,40761=>1000,40762=>1000,40763=>1000,40764=>1000,40765=>1000,40766=>1000,40767=>1000,40768=>1000,40769=>1000,40770=>1000,40771=>1000,40772=>1000,
-	40773=>1000,40774=>1000,40775=>1000,40776=>1000,40777=>1000,40778=>1000,40779=>1000,40780=>1000,40781=>1000,40782=>1000,40783=>1000,40784=>1000,40785=>1000,40786=>1000,40787=>1000,40788=>1000,
-	40789=>1000,40790=>1000,40791=>1000,40792=>1000,40793=>1000,40794=>1000,40795=>1000,40796=>1000,40797=>1000,40798=>1000,40799=>1000,40800=>1000,40801=>1000,40802=>1000,40803=>1000,40804=>1000,
-	40805=>1000,40806=>1000,40807=>1000,40808=>1000,40809=>1000,40810=>1000,40811=>1000,40812=>1000,40813=>1000,40814=>1000,40815=>1000,40816=>1000,40817=>1000,40818=>1000,40819=>1000,40820=>1000,
-	40821=>1000,40822=>1000,40823=>1000,40824=>1000,40825=>1000,40826=>1000,40827=>1000,40828=>1000,40829=>1000,40830=>1000,40831=>1000,40832=>1000,40833=>1000,40834=>1000,40835=>1000,40836=>1000,
-	40837=>1000,40838=>1000,40839=>1000,40840=>1000,40841=>1000,40842=>1000,40843=>1000,40844=>1000,40845=>1000,40846=>1000,40847=>1000,40848=>1000,40849=>1000,40850=>1000,40851=>1000,40852=>1000,
-	40853=>1000,40854=>1000,40855=>1000,40856=>1000,40857=>1000,40858=>1000,40859=>1000,40860=>1000,40861=>1000,40862=>1000,40863=>1000,40864=>1000,40865=>1000,40866=>1000,40867=>1000,40868=>1000,
-	40869=>1000);
-$diff='';
-$originalsize=23275812;
-
-// CID Information
-// Select your language
-// unicode to cid conversion table is from
-// ftp://ftp.oreilly.com/pub/examples/nutshell/cjkv/adobe/
-// cid2code.txt in ac16.tar.Z,ag15.tar.Z,ak12.tar.Z and aj16.tar.Z.
-
-//$enc='UniCNS-UTF16-H';
-//$cidinfo=array('Registry'=>'Adobe','Ordering'=>'CNS1','Supplement'=>0);
-//include(dirname(__FILE__).'/uni2cid_ac15.php');
-
-//$enc='UniGB-UTF16-H';
-//$cidinfo=array('Registry'=>'Adobe','Ordering'=>'GB1','Supplement'=>2);
-//include(dirname(__FILE__).'/uni2cid_ag15.php');
-
-//$enc='UniKS-UTF16-H';
-//$cidinfo=array('Registry'=>'Adobe','Ordering'=>'Korea1','Supplement'=>0);
-//include(dirname(__FILE__).'/uni2cid_ak12.php');
-
-$enc='UniJIS-UTF16-H';
-$cidinfo=array('Registry'=>'Adobe','Ordering'=>'Japan1','Supplement'=>5);
-include(dirname(__FILE__).'/uni2cid_aj16.php');
-?>
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/courier.php b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/courier.php
deleted file mode 100644
index 1ce3afc8..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/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);
-?>
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavu-fonts-ttf-2.30/AUTHORS b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavu-fonts-ttf-2.30/AUTHORS
deleted file mode 100644
index 94d37c27..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavu-fonts-ttf-2.30/AUTHORS
+++ /dev/null
@@ -1,46 +0,0 @@
-abysta at yandex.ru
-Adrian Schroeter
-Andrey Valentinovich Panov
-Ben Laenen
-Besarion Gugushvili
-Bhikkhu Pesala
-Clayborne Arevalo
-Dafydd Harries
-Danilo Segan
-Davide Viti
-David Jez
-David Lawrence Ramsey
-Denis Jacquerye
-Dwayne Bailey
-Eugeniy Meshcheryakov
-Gee Fung Sit
-Heikki Lindroos
-James Cloos
-James Crippen
-John Karp
-Keenan Pepper
-Lars Naesbye Christensen
-Mashrab Kuvatov
-Max Berger
-Mederic Boquien
-Michael Everson
-Misu Moldovan
-Nguyen Thai Ngoc Duy
-Nicolas Mailhot
-Ognyan Kulev
-Ondrej Koala Vacha
-Peter Cernak
-Remy Oudompheng
-Roozbeh Pournader
-Sahak Petrosyan
-Sander Vesik
-Stepan Roh
-Stephen Hartke
-Steve Tinney
-Tavmjong Bah
-Tim May
-Valentin Stoykov
-Vasek Stodulka
-Wesley Transue
-
-$Id: AUTHORS 2344 2009-03-08 13:02:37Z moyogo $
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavu-fonts-ttf-2.30/BUGS b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavu-fonts-ttf-2.30/BUGS
deleted file mode 100644
index 49b36de5..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavu-fonts-ttf-2.30/BUGS
+++ /dev/null
@@ -1,3 +0,0 @@
-See http://dejavu.sourceforge.net/wiki/index.php/Bugs
-
-$Id: BUGS 80 2004-11-13 13:12:02Z src $
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavu-fonts-ttf-2.30/LICENSE b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavu-fonts-ttf-2.30/LICENSE
deleted file mode 100644
index 254e2cc4..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavu-fonts-ttf-2.30/LICENSE
+++ /dev/null
@@ -1,99 +0,0 @@
-Fonts are (c) Bitstream (see below). DejaVu changes are in public domain.
-Glyphs imported from Arev fonts are (c) Tavmjong Bah (see below)
-
-Bitstream Vera Fonts Copyright
-------------------------------
-
-Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is
-a trademark of Bitstream, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of the fonts accompanying this license ("Fonts") and associated
-documentation files (the "Font Software"), to reproduce and distribute the
-Font Software, including without limitation the rights to use, copy, merge,
-publish, distribute, and/or sell copies of the Font Software, and to permit
-persons to whom the Font Software is furnished to do so, subject to the
-following conditions:
-
-The above copyright and trademark notices and this permission notice shall
-be included in all copies of one or more of the Font Software typefaces.
-
-The Font Software may be modified, altered, or added to, and in particular
-the designs of glyphs or characters in the Fonts may be modified and
-additional glyphs or characters may be added to the Fonts, only if the fonts
-are renamed to names not containing either the words "Bitstream" or the word
-"Vera".
-
-This License becomes null and void to the extent applicable to Fonts or Font
-Software that has been modified and is distributed under the "Bitstream
-Vera" names.
-
-The Font Software may be sold as part of a larger software package but no
-copy of one or more of the Font Software typefaces may be sold by itself.
-
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT,
-TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME
-FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING
-ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
-THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE
-FONT SOFTWARE.
-
-Except as contained in this notice, the names of Gnome, the Gnome
-Foundation, and Bitstream Inc., shall not be used in advertising or
-otherwise to promote the sale, use or other dealings in this Font Software
-without prior written authorization from the Gnome Foundation or Bitstream
-Inc., respectively. For further information, contact: fonts at gnome dot
-org. 
-
-Arev Fonts Copyright
-------------------------------
-
-Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the fonts accompanying this license ("Fonts") and
-associated documentation files (the "Font Software"), to reproduce
-and distribute the modifications to the Bitstream Vera Font Software,
-including without limitation the rights to use, copy, merge, publish,
-distribute, and/or sell copies of the Font Software, and to permit
-persons to whom the Font Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright and trademark notices and this permission notice
-shall be included in all copies of one or more of the Font Software
-typefaces.
-
-The Font Software may be modified, altered, or added to, and in
-particular the designs of glyphs or characters in the Fonts may be
-modified and additional glyphs or characters may be added to the
-Fonts, only if the fonts are renamed to names not containing either
-the words "Tavmjong Bah" or the word "Arev".
-
-This License becomes null and void to the extent applicable to Fonts
-or Font Software that has been modified and is distributed under the 
-"Tavmjong Bah Arev" names.
-
-The Font Software may be sold as part of a larger software package but
-no copy of one or more of the Font Software typefaces may be sold by
-itself.
-
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL
-TAVMJONG BAH BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
-
-Except as contained in this notice, the name of Tavmjong Bah shall not
-be used in advertising or otherwise to promote the sale, use or other
-dealings in this Font Software without prior written authorization
-from Tavmjong Bah. For further information, contact: tavmjong @ free
-. fr.
-
-$Id: LICENSE 2133 2007-11-28 02:46:28Z lechimp $
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavu-fonts-ttf-2.30/NEWS b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavu-fonts-ttf-2.30/NEWS
deleted file mode 100644
index a05a30c2..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavu-fonts-ttf-2.30/NEWS
+++ /dev/null
@@ -1,1215 +0,0 @@
-Changes from 2.29 to 2.30
-
-* added U+0462-U+0463 to Mono (by Denis Jacquerye) 
-* corrected U+1E53 in Serif (by Gee Fung Sit) 
-* added U+1E4C-U+1E4D to Mono and Serif (by Gee Fung Sit) 
-* added U+1E78-U+1E79 to Mono (by Gee Fung Sit) 
-* fixed missing diacritics in Latin Extended Additional in Sans ExtraLight
-  (moved stacked diacritics out of PUA in the process) (by Gee Fung Sit) 
-* fixed anchors on U+1E78 in Serif (by Gee Fung Sit) 
-* added U+1DC4-U+1DC9 to Serif (by Denis Jacquerye) 
-* renamed above-mark to above-mark in Serif-Italic (by Denis Jacquerye) 
-* added U+1DC4-U+1DC9 to context class for dotless substitution (by Denis
-  Jacquerye) 
-* changed Doubleacute to Doublegrave in Sans ExtraLight (by Gee Fung Sit) 
-* removed redundant reference in U+01FB in Sans Oblique (by Gee Fung Sit) 
-* added U+A726-U+A727 to Mono (Denis Jacquerye) 
-* changed U+04BE and U+04BF according to recommedations of Sasha Ankwab in Sans
-  (by Andrey V. Panov) 
-* remove "Symbol Charset" from set of codepages in Sans (by Eugeniy
-  Meshcheryakov)
-
-Changes from 2.28 to 2.29
-
-* modified U+10FB in Sans to be a mirror image of U+2056, since U+10FB is not
-  Georgian-specific (by Roozbeh Pournader)
-* added U+2B1F, U+2B24, U+2B53, U+2B54 in Sans (by Roozbeh Pournader)
-* fixed TUR opentype language tag to TRK in Serif (bug 19825) (by Ben Laenen)
-* early implementation of Abkhaz letter U+0524-U+0525 in Sans
-  (by Michael Everson and abysta)
-* flipped U+1D538 in Sans (by Gee Fung Sit)
-* added U+26B3-U+26B8, U+1D7D8-U+1D7E1 in Sans (by Gee Fung Sit)
-* corrected U+1D7A9 in Sans Bold Oblique (by Gee Fung Sit)
-* Fixed U+0649 to be dual-joining in Sans Mono (by Roozbeh Pournader)
-* Remove unnecessary 'isol' feature from Sans Mono (by Roozbeh Pournader)
-* Remove 'cmap' mappings for U+066E, U+066F, U+067C, U+067D, U+0681, U+0682,
-  U+0685, U+0692, U+06A1, U+06B5, U+06BA, U+06C6, U+06CE, and U+06D5
-  in Sans Mono (bug 20323) (by Roozbeh Pournader)
-* add half brackets (U+2E22 - U+2E25, by Steve Tinney) 
-
-Changes from 2.27 to 2.28
-
-* added U+A789, U+A78A in Sans and Sans Mono (by Denis Jacquerye)
-* modified U+02D6, U+02D7, U+02EE in Sans and Sans Mono (by Denis Jacquerye)
-* added U+1E9E (German capital ß) to Sans and Serif (by Denis Jacquerye)
-* adjusted width of U+01B7-U+01B9 in Serif Italic (by Denis Jacquerye)
-* modified U+021C, U+021D in Sans (by Denis Jacquerye)
-* added U+021C, U+021D in Mono (by Denis Jacquerye)
-* added U+F428 (Georgian Nuskhuri "f") in private use area (by Besarion
-  Gugushvili)
-* updated Georgian mkhedruli (U+10D0-U+10FA) with new version (by Besarion
-  Gugushvili)
-* updated Georgian asomtavruli (U+10A0-U+10C5) with new version (by Besarion
-  Gugushvili)
-* added Georgian nuskhuri (U+2D00-U+2D25) (by Besarion Gugushvili)
-* added Georgian mtavruli in private use area (U+F400-U+F426) (by Besarion
-  Gugushvili)
-* added mark anchors above to Cyrillic U+0430-U+0438, U+043A-U+044F,
-  U+0454-U+0455 in Mono (by Ben Laenen)
-* modified/moved up U+0318-U+0319, U+031C-U+031F, U+0329-U+032A, U+032C-U+032D,
-  U+0339-U+033B, U+0348 and U+0353 in Sans to prevent cut-off (by Gee Fung Sit)
-* added U+035A to Sans (by Gee Fung Sit)
-* updated fontconfig files (by Nicolas Mailhot)
-* added U+2032-2037 to Mono (by Denis Jacquerye)
-* added Ogham to Sans ExtraLight (by Gee Fung Sit)
-* added U+2C6F, U+2C79, U+2C7C-2C7D to Mono (by Gee Fung Sit)
-* added U+210F to Serif and Sans ExtraLight (by Gee Fung Sit)
-* changed U+210F to a more common glyph in Sans and Mono (by Gee Fung Sit)
-
-Changes from 2.26 to 2.27
-
-* added some of Michael Everson's new Cyrillic glyphs to Sans (by Wesley
-  Transue)
-* removed blank glyph at U+05EF from Sans Bold Oblique (by Gee Fung Sit)
-* small adjustments to existing tone bars in Sans and Mono (by Gee Fung Sit)
-* added U+0372-U+0373, U+0376-U+0377, U+03CF, U+A668-U+A66E, U+A708-U+A711,
-  U+A71B-U+A71F to Sans (by Gee Fung Sit)
-* copied U+02E5-U+02E9 over from Sans to fix inconsistencies in Serif (by Gee
-  Fung Sit)
-* added U+021C-U+021D, U+0370-U+0371, U+037B-U+037D, U+0470-U+0471,
-  U+0510-U+0515, U+051A-U+051D, U+1E9F, U+2C64, U+2C6E-U+2C6F, U+2C79,
-  U+2C7C-U+2C7D, U+A644-U+A647, U+A650-U+A651, U+A654-U+A657, U+A708-U+A716,
-  U+A71B-U+A71F to Serif (by Gee Fung Sit)
-* added U+A708-U+A716, U+A71B-U+A71F to Mono (by Gee Fung Sit)
-* added anchors to U+017F (ſ) and fixed U+1E9B (ẛ) in Serif (by Gee Fung Sit)
-* made U+0325 smaller in Sans Bold and Serif to match Sans Book (by Gee Fung
-  Sit)
-* fixes to U+02F3 (moved up), U+228F-U+2294 (more square-like) and
-  U+22CE-U+22CF (stroke width) in Sans (by Gee Fung Sit)
-* replaced U+2202 ∂ (Sans and Mono) and U+221D ∝, U+221E ∞ (Sans) with glyphs
-  from Arev (with small changes) (by Gee Fung Sit)
-* added U+22B0-U+22B1, U+22C7, U+22D0-U+22D5 from Arev to Sans to complete the
-  block (by Gee Fung Sit)
-* added U+0514-U+0515 to Sans ExtraLight (by Gee Fung Sit)
-* skewed U+A78C in all Oblique/Italic fonts (by Gee Fung Sit)
-* moved U+2215 to U+2044 in Sans and Serif and replaced U+2215 with reference
-  to U+002F in all fonts (by Gee Fung Sit)
-* added U+2C6E to Mono (by Denis Jacquerye)
-* added U+A782 and U+A783 in Sans (by Wesley Transue)
-* added U+0244, U+024C-024D, U+2C64 in Sans Mono (by Denis Jacquerye)
-* modified U+01AE in Sans Mono (by Denis Jacquerye)
-* added U+2C7A to all fonts (by Gee Fung Sit)
-* italicized/small changes to U+2C76 in Serif (Bold) Italic (by Gee Fung Sit)
-* improved outlines of U+2C68, U+2C6A, U+2C6C in Serif (Bold) Italic (by Gee
-  Fung Sit)
-* rounded U+2C77 at the bottom in Serif (by Gee Fung Sit)
-* added joining behavior for tone letters (U+02E5-U+02E9) in Sans (bug #15669)
-  (by Gee Fung Sit)
-* fixed outline of y.alt in Sans Regular (by Denis Jacquerye) 
-* changed references of U+1D5A8, U+1D5C5, U+1D5DC, U+1D5F9, U+1D610, U+1D62D,
-  U+1D644 and U+1D661 to stylistic alternates to have a better distinction (by
-  Gee Fung Sit)
-* hinted I.alt in Sans Regular (by Gee Fung Sit)
-* added U+0487, completing Cyrillic block (by Gee Fung Sit)
-* extended the bar of U+0463 to the right and moved the anchor (by Gee Fung
-  Sit)
-* added anchors to glyphs in Cyrillic block (by Gee Fung Sit)
-* added (preliminary) hints to tone letter forms (U+02E5.5, U+02E9.1, stem) in
-  Sans Book (by Gee Fung Sit)
-
-Changes from 2.25 to 2.26
-
-- added glyphs for Cyrillic-B to Sans (by Wesley Transue) 
-- added U+0370-U+0371 to Sans (by Wesley Transue) 
-- added U+019C, U+01A2-U+01A3, U+01A6, U+01E4-U+01E5, U+024C-U+024D, U+0285,
-  U+0290, U+02A0, U+0370-U+0371, U+03F1, U+03FC to Sans ExtraLight (by Wesley
-  Transue) 
-- added U+20A0-U+20A5, U+20A7-U+20B3, U+2105, U+210D, U+210F, U+2115, U+2117,
-  U+2119-U+211A, U+211D, U+2124, U+212E, U+2200-U+2204 to Mono (by Heikki
-  Lindroos) 
-- added U+01BA and U+01BF to Mono (by Heikki Lindroos) 
-- merged OpenType "aalt" feature in Latin in Sans (by Denis Jacquerye) 
-- added alternative shape for y in Sans (by Denis Jacquerye) 
-- added saltillo (U+A78B-U+A78C) to all faces (by James Cloos) 
-- changed U+047C-U+047D to references instead of outlines in Sans (by Wesley
-  Transue) 
-- added Latin letter tresillo U+A72A-U+A72B to Sans (by Wesley Transue) 
-- added U+A734-U+A737 to Sans (by Wesley Transue) 
-- added U+2053 to Serif and fixed it bug:9425 in Sans (by Gee Fung Sit) 
-- removed problematic hints for U+0423 bug:10025 (by Gee Fung Sit) 
-- added U+27C5-U+27C6 bug:10255 to all faces (by Gee Fung Sit) 
-- fixed width of U+2016 in Sans Oblique (by Gee Fung Sit) 
-- added U+2016, U+2032-U+2038, U+2042, U+2045-U+2046, U+204B-U+204F,
-  U+2051-U+2052, U+2057 to Serif (by Gee Fung Sit) 
-- made U+2140 bigger to match other n-ary operators (by Gee Fung Sit) 
-- added U+0606-U+0607, U+0609-U+060A to Sans (by Gee Fung Sit) 
-- added U+221B-U+221C to Mono (by Gee Fung Sit) 
-- small adjustments to U+221B-U+221C in Sans and Serif (by Gee Fung Sit) 
-- update U+04B4-U+04B5 in Serif (by Andrey V. Panov) 
-- increased max-storage value from maxp table to 153 (by Andrey V. Panov) 
-- added U+0472-U+0473, U+0510-U+0511, U+051A-U+051D, U+0606-U+0607,
-  U+0609-U+060A, U+1E26-U+1E27, U+1E54-U+1E55, U+1E7C-U+1E7D, U+1E8C-U+1E8D,
-  U+1E90-U+1E91, U+1E97-U+1E99, U+1E9F, U+1EAC-U+1EAD, U+1EB6-U+1EB7,
-  U+1EC6-U+1EC7, U+1ED8-U+1EDD, U+1EE0-U+1EE3, U+1EE8-U+1EEB, U+1EEE-U+1EF1 to
-  Mono (by Gee Fung Sit) 
-- added locl rules for S/T cedilla for Romanian and Moldavian so they get
-  rendered as S/T with comma accent (see Redhat bug #455981) (by Ben Laenen) 
-- removed ligature rule from Armenian U+0587 bug:16113 (by Gee Fung Sit)
-
-Changes from 2.24 to 2.25
-
-- moved/added U+2E18 (by Gee Fung Sit)
-- added empty glyph for U+2064 in Sans and Serif (by Gee Fung Sit)
-- added U+22CE-U+22CF to Sans (by Gee Fung Sit)
-- Sans Oblique and Bold Oblique, Serif: reverted digits hinting instructions back to before revision 1590, which fixed mistaken debian bug #471024. This fixes Debian bug #411308. The original bug was in freetype not in the fonts (by Denis Jacquerye)
-- added U+A726-U+A729, U+A730-U+A733, U+A738-U+A73F, U+A746-U+A74B, U+A74E-U+A74F, U+A780-U+A781, U+A7FB-U+A7FF to Sans (by Gee Fung Sit)
-- added Macedonian italic glyph shape for U+0453 in Serif (by Ben Laenen)
-- changed descenders in U+0446, U+0449, U+0497, U+04A3, U+04AD (by Andrey V. Panov)
-- updated main SFD files to SplineFontDB 3.0 (Denis Jacquerye and Gee Fung Sit)
-- moved U+0561 2 up since it wasn't aligned with the baseline well (by Ben Laenen)
-- added U+2E2E to Sans (by Gee Fung Sit)
-- replaced U+2699 with simpler version in Sans (by Gee Fung Sit)
-- added a lot of hinting instructions to Latin Extended B, Greek and Coptic glyphs Sans Book (by Wesley Transue)
-- differentiated U+2219 from U+22C5 and adjusted affected references in Sans and Mono (by Gee Fung Sit)
-- made Hebrew narrower in Sans Bold and Sans Bold Oblique (by Denis Jacquerye)
-- added Kurdish and Chuvash letters from Unicode 5.1 Cyrillic Extended block (by Wesley Transue)
-- added U+1E9F, U+A644-U+A647, U+A64C-U+A64D, U+A650-U+A651, U+A654-U+A655, U+A712U+A716 to Sans (by Gee Fung Sit)
-- added several glyphs to Sans ExtraLight (by Gee Fung Sit)
-- added hinting instructions to U+046A-U+046B, U+0508-U+0509, U+050B, U+0512-U+0513 in Sans Book (by Wesley Transue)
-- corrected width of U+027E in Sans Book (by Gee Fung Sit)
-- added U+2C79, U+2C7B-U+2C7D to Sans (by Gee Fung Sit)
-- added a bunch of glyphs+small corrections to Sans Light (by Gee Fung Sit)
-- added U+0496, U+0497, U+04B0, U+04B1 (by Andrey V. Panov)
-- updated U+0493, U+049B, U+04B3, U+04B7, U+04F7 (by Andrey V. Panov)
-- further improvements in extended Cyrillic (by Andrey V. Panov) 
-
-Changes from 2.23 to 2.24
-
-- instructions for U+05C0 ׀, U+05C3 ׃, U+05F3 ׳, and U+05F4 ״ in DejaVu 
-   Sans. (by Wesley Transue)
-- instructions for U+2116 in Sans (by Andrey V. Panov)
-- Unicode 5.1 update: moved U+F208 to U+2C6D, U+F25F to U+2C71, added 
-  U+2C6E-U+2C6F, U+2C72-U+2C73, updated outline of U+2C71 in Sans. (by 
-  Denis Jacquerye)
-- updated and instructed U+0401 in Sans (by Andrey V. Panov)
-- fixed the bug in Sans faces where U+02EC ˬ faced the wrong direction. 
-  Also, added a few more glyph instructions. (by Wesley Transue)
-- removed OS2Sub and OS2Strike that weren't intentional in Sans 
-  ExtraLight. (by Denis Jacquerye)
-- updated instructions for U+401, U+44F in Serif Book. (by Andrey V. 
-  Panov)
-- instructions for U+02C4 ˄, U+02C5 ˅, U+03D8 Ϙ, U+03D9 ϙ, U+0494 Ҕ, and 
-  U+0495 ҕ in Sans Book. (by Wesley Transue)
-- instructions for U+01A6 Ʀ, U+0238 ȸ, U+0239 ȹ, U+02EC ˬ, and U+05C6 ׆ 
-  in Sans Book. (by Wesley Transue)
-- DejaVuSans.sfd DejaVuSerif.sfd: updated instructions for U+447 and 
-  U+451 using code generated with xgridfit (by Andrey V. Panov)
-- instructions for a few glyphs in the Latin Extended-B Block, Greek 
-  Block, Cyrillic Block, and N'Ko block. (by Wesley Transue)
-- updated sfdnormalize.pl, and SFD files to new SFD format with empty 
-  lines. (by Denis Jacquerye) 
-
-Changes from 2.22 to 2.23
-
-- fixed bug which made Condensed fonts appear instead of normal width ones
-- added U+20DB, U+20DC, and U+20E1 to Sans (by Roozbeh Pournader)
-- added hinting instructions to U+01A7, U+01AA-U+01AC, U+01AE-U+01AF,
-  U+01BC-U+01BD, U+01BF, U+01F7, U+0277, U+027F, U+0285-U+0286, U+0297, U+02AF,
-  U+02B4-U+02B5, U+02BD, U+030D, U+0311, U+0329, U+04A0-U+04A1 in Sans Book (by
-  Wesley Transue)
-- modified hinting instructions of U+04A2 in Sans Book (by Wesley Transue)
-- added hinting instructions to U+237D, U+2423 in Mono Book and Mono Bold (by
-  Wesley Transue)
-- added mathematical alphanumeric symbols to all styles (by Max Berger)
-- added Unicode 5.1 U+2E18 as U+2E18.u51 (not yet usable) to Sans (by Roozbeh
-  Pournader) 
-- dereferenced all glyphs with mixed references and outlines (by Denis
-  Jacquerye)
-- removed non-zero width from U+0344 in Sans (by Denis Jacquerye)
-
-Changes from 2.21 to 2.22
-
-- directory structure has changed, we now use the Makefile
-- modified Armenian U+0565 in Sans (by Սահակ Պետրոսյան)
-- added double struck letters and numbers U+2102, U+210D, U+2115,
-  U+2119-U+211A, U+211D, U+2124, U+213C-U+2140, U+2145-U+2149, U+1D538-U+1D539,
-  U+1D53B-U+1D53E, U+1D540-U+1D544, U+1D546, U+1D54A-U+1D550, U+1D552-U+1D56B,
-  U+1D7D8-U+1D7E1 to Serif (by Stephen Hartke)
-- added letterlike symbols U+2103, U+2109, U+2127, U+214B, U+2141-U+2144 to
-  Serif (by Ben Laenen)
-- fixed outline direction of U+2143 in Sans Bold/Bold Oblique (by Ben Laenen)
-- added arrow set in Serif: arrows: U+2194-U+21FF; dingbats: U+27A1;
-  supplemental arrows A: U+27F0-U+27FF; supplemental arrows B: U+2900-U+2975,
-  U+297A; miscellaneous symbols and arrows: U+2B00-U+2B11 (by Ben Laenen)
-- added U+0180, U+01DE, U+01E0-01E1, U+022A, U+022C, U+0230, U+1E08-U+1E09,
-  U+1E10-U+1E11, U+1EB0-U+1EB1 to Mono (by Denis Jacquerye)
-- adjusted U+01D5, U+01D7, U+01D9, U+1DB in Mono (by Denis Jacquerye)
-- added Ogham in Sans (by Wesley Transue)
-- added Yijing Hexagram Symbols in Sans (by Wesley Transue)
-- hinting instructions added to Cyrillic U+0460, U+04A6-U+04A7, U+04AC-U+04AD,
-  U+04C7-U+04C8, U+04F6-U+04F7, U+04FA-U+04FB, U+050C-U+050D in Sans Book (by
-  Wesley Transue)
-- adjusted Cyrillic letters U+042A, U+044A, U+044C, U+0459-U+045B, U+0462,
-  U+048C-U+048D in Serif (by Andrey V. Panov)
-- hinting instructions added to Lao U+0EB7 in Sans (by Wesley Transue)
-- added Roman numerals and Claudian letter U+2160-U+2184 in Serif (by Ben
-  Laenen)
-- added U+FFF9-U+FFFD to Sans, Serif and Mono (by Lars Næsbye Christensen)
-- added mathematical symbols to Serif: U+2200, U+2203-U+2204, U+2213-U+2214,
-  U+2217-U+2218, U+2223-U+2226, U+2250-U+2255, U+2295-U+22AF, U+22C5 (by Ben
-  Laenen)
-- modified bullet symbol U+2219 in Serif (by Ben Laenen)
-
-Changes from 2.20 to 2.21
-
-- added U+FE20-U+FE23 (half diacritics) to Sans (by Denis Jacquerye)
-- added anchor "half" to position right half of double marks, U+FE21 or U+FE23
-  to Sans (by Denis Jacquerye)
-- shifted U+0360 up to avoid collision with some outlines in Sans (by Denis
-  Jacquerye)
-- added anchor above-mark anchor to U+035D, U+035E, U+0360, U+0361 in Sans (by
-  Denis Jacquerye)
-- added instructions for ff, ffi, ffl ligatures in Serif Bold (by Eugeniy
-  Meshcheryakov)
-- added instructions to some N'Ko glyphs (by Wesley Transue)
-- added instructions to some Lao glyphs (by Wesley Transue)
-- cleaning up 'liga' Standard Ligature in Latin, in Sans and Sans Mono (by
-  Denis Jacquerye)
-- added U+046A, U+046B (big yus) in Serif (by Andrey V. Panov)
-- added box drawing symbols to Sans and Serif (by Lars Næsbye Christensen)
-- added Makefile to improve font and packages generating (by Nicolas Mailhot)
-
-Changes from 2.19 to 2.20
-
-- removed TeX and TeXData tags from all sfd files (by Eugeniy  Meshcheryakov)
-- removed all 'frac' lookups (by Eugeniy  Meshcheryakov)
-- fixed duplicate glyph names (by Eugeniy  Meshcheryakov)
-- removed standard ligatures with U+00B7 in Mono (by Eugeniy  Meshcheryakov)
-- use reference to U+002D in U+00AD in Sans Oblique, and adjust instructions
-  (by Eugeniy  Meshcheryakov)
-- updated Cyrillic in Sans Extra Light (by Andrey V. Panov)
-- added instructions to N'Ko U+07C1-U+07C6, U+07CA, U+07CE-U+07CF, U+07D1,
-  U+07D3-U+07D4, U+07D8, U+07DB and U+07EB in Sans (by Wesley Transue)
-- added instructions to Lao U+0E8A, U+0E95, U+0E97, U+EA5, U+0EB4 and U+0EB5
-  (by Wesley Transue)
-- adjusted instructions for Hebrew glyphs (by Denis Jacquerye)
-- added instructions for U+0265 in Sans Bold (by Denis Jacquerye)
-- fix U+1D68 in Sans: it had the shape of delta, where it should be a rho (by
-  Ben Laenen)
-- remove U+1D5C glyph in Sans Oblique (it was empty) (by Ben Laenen)
-- fix instructions of U+01AD in Sans Bold  (by Ben Laenen)
-- fix instructions of U+042D in Serif (by Ben Laenen)
-- remove buggy instructions of U+2328 in Serif (by Ben Laenen)
-- corrected width of U+2C75-U+2C76 in Sans Bold and Serif Bold (by Gee Fung Sit)
-- added U+2C75-U+2C77 to Mono (by Gee Fung Sit)
-
-Changes from 2.18 to 2.19
-
-- fixed misplaced symbols (U+2325,2326) in Sans Oblique (by John Karp) 
-- added Mark to Base anchors: 'cedilla' for combining cedilla and
-  'above-legacy' for stacking above precomposed glyphs (just a,e,i,o,u with
-  macron for now) in Sans (by Denis Jacquerye).
-- added contextual substitution for Case and Dotless forms in all Sans variants
-  (by Denis Jacquerye).
-- renamed 'ccmp' lookups for RTL and Basic (LGC, etc.) (by Denis Jacquerye)
-- added anchor 'cedilla' for vowels in Sans. (by Denis Jacquerye)
-- extended contextual dotless and case substitutions to handle both below and
-  above diacritics (by Denis Jacquerye)
-- renamed Dotless and Case Form GSUB lookups in Sans with meaningful names (by
-  Denis Jacquerye)
-
-Changes from 2.17 to 2.18
-
-- Re-encoded the source files for Full Unicode (by Ben Laenen)
-- Re-enabled the "ff", "fl", "fi", "ffl", "ffi" ligatures by default in Serif
-  (by Ben Laenen)
-- Disabled the "fi", "ffi" ligatures for languages with dotless i in Serif (by
-  Ben Laenen)
-- added Tifinagh to Sans Book and Bold, U+2D30-U+2D65, U+2D6F, partially hinted
-  in Sans Book. (by Denis Jacquerye)
-- added Tai Xuan Jing Symbols (U+1D300-1D356) to Sans (by Remy Oudompheng)
-- added double-struck letters (U+1D538-U+1D56B minus reserved code points) to
-  Sans (by Gee Fung Sit)
-- added U+22EE-U+22F1 to Sans (by Gee Fung Sit)
-- added U+2C67-U+2C6C, U+2C75-U+2C77 to Serif (by Gee Fung Sit)
-- italicized various glyphs in Latin Extended-B, IPA Extensions, Spacing
-  Modifier Letters, Phonetic Extension (Supplement) and Super- and Subscripts
-  in Serif Oblique fonts (by Gee Fung Sit)
-- modified outlines, bearings of Hebrew U+05D6, U+05D8, U+05DB, U+05DE, U+05E0,
-  U+05E1, U+05E2, U+05EA in Sans Book and Oblique, adjusted hinting in Book
-  based on Yotam Benshalom's comments. (by Denis Jacquerye)
-- added Braille Patterns (U+2800-U+28FF) to Serif fonts (by Gee Fung Sit)
-- added N'Ko to Sans Book and Bold: U+07C0-U+07E7, U+07EB-U+07F5, U+07F8-U+07FA
-  (by Eugeniy  Meshcheryakov)
-- added U+0ED8 (Lao digit 8) to Sans (by Remy Oudompheng)
-- added Lao diacritics U+0EB0-0EB9, U+0EBB-0EBC, U+0EC8-0ECD to Mono (by Remy
-  Oudompheng)
-- renamed Serif [Bold] Oblique, make it Italic (by Eugeniy  Meshcheryakov)
-- added U+29FA-U+29FB to Sans and Sans Mono (by Gee Fung Sit)
-- swapped glyphs for Eng U+014A from Sami Eng to African Eng, the latter being
-  more common (by Denis Jacquerye)
-- swapped ae U+00E6 and ae.alt in Serif Italics fonts, thus fixing #8213 (by
-  Denis Jacquerye)
-- minor improvements to Misc. Symbols in Sans (by Gee Fung Sit)
-- minor improvements and additions to Sans ExtraLight (by Gee Fung Sit)
-- improved instructions for various Cyrillic letters (by Eugeniy  Meshcheryakov)
-- fixed hinting of theta and chi in Sans Book (by Ben Laenen)
-- added Georgian Mkhedruli to Sans, Serif and Mono, ASumtavruli to Sans and
-  Serif (by Besarion Gugushvili)
-
-Changes from 2.16 to 2.17
-
-- Sans fonts: fix position for certain combinations of Arabic fatha, kasra,
-  shadda, damma, kasratan, dammatan, fathatan and hamza (by Ben Laenen)
-- added 'ae.alt' to Serif Oblique fonts, with design matching shape of italic
-  'a' instead of slanted 'a', see bug #8213 (by Denis Jacquerye)
-- added super- and subscripts to Serif and Mono: U+1D2C-U+1D2E, U+1D30-U+1D3C,
-  U+1D3E-U+1D42, U+1D62-U+1D65, U+1D78, U+2071, U+207A-U+207E, U+208A-U+208E,
-  U+2090-U+2094 (by Gee Fung Sit)
-
-Changes from 2.15 to 2.16
-
-- fixed hinting instructions for digits in DejaVu Sans Oblique, Bold Oblique,
-  and Serif Book to not change glyph width (by Eugeniy  Meshcheryakov)
-- added instructions for U+0404, U+0411, U+0413, U+0414, U+0417-U+041B, U+041F,
-  U+0423, U+0424, U+0426-U+0429, U+042C, U+042E, U+042F, U+0490 in Serif Bold
-  (by Eugeniy  Meshcheryakov)
-- added U+0220 and Eng.alt to Serif fonts (by Denis Jacquerye)
-- added U+232C, U+2394, U+23E3 to Sans fonts (by John Karp)
-- added U+230C-U+230F, U+231C-U+231F to Sans fonts, fixing bug:9547
-  (by John Karp)
-- adjusted dot below, dot above, dieresis above, dieresis below in Sans fonts
-  (by Denis Jacquerye)
-- added U+2300, U+2301, U+2303, U+2304, U+2305, U+2307, U+2326, U+2327, U+232B,
-  arrow.base to Sans fonts (by John Karp)
-- adjusted dot and dieresis below and above in Serif fonts (by Denis Jacquerye)
-- added U+1E1C-U+1E1D to Serif fonts (by Denis Jacquerye)
-- added U+22BE, U+22BF (by Wesley Transue)
-- added U+2324; modified U+2325: more standard proportions, and matches U+2324 
-  and U+2387; added U+2387 : flipped U+2325 with standard arrowhead 
-  (by John Karp)
-- added Lao digits U+0ED0-0ED7, U+0ED9 (by Remy Oudompheng)
-- added to Mono in Arabic block : U+060C, U+0615, U+061B, U+061F, 
-  U+0621-U+063A, U+0640-0655, U+065A, U+0660-066F, U+0674, U+0679-0687, U+0691, 
-  U+0692, U+0698, U+06A1, U+06A4, U+06A9, U+06AF, U+06B5, U+06BA, U+06BE, 
-  U+06C6, U+06CC, U+06CE, U+06D5, U+06F0-06F9 (by Remy Oudompheng)
-- added to Mono in Arabic Presentations Forms-A : U+FB52-FB81, U+FB8A-FB95, 
-  U+FB9E, U+FB9F, U+FBAA-FBAD, U+FBE8, U+FBE9, U+FBFC-FBFF (by Remy Oudompheng)
-- added to Mono in Arabic Presentations Forms-B : U+FE70-FE74, U+FE76-FEFC, 
-  U+FEFF (by Remy Oudompheng)
-- added U+05BA, U+05BE, U+05F3, U+05F4, U+FB1E, U+FB21-U+FB28, U+FB4F to Sans 
-  (by Eugeniy  Meshcheryakov)
-- added U+2102 to Mono (by Eugeniy  Meshcheryakov)
-- added U+2983-U+2984 to Sans (by Gee Fung Sit)
-- added U+2A2F to Sans, Serif and Mono (by Gee Fung Sit)
-- added U+2373-2375, U+237A to Sans (by John Karp)
-- converted kern pairs to kern classes with Tavmjong Bah's scripts 
-  (by Denis Jacquerye)
-- set ScriptLang of kerning classes to just latn because of Pango bug
-  (by Denis Jacquerye)
-- added DNK to ScriptLang latn otherwise it is excluded, and SRB and MDK to
-  cyrl (by Denis Jacquerye)
-- removed flag 0x80 in generate.pe, otherwise it generates kerning tables some
-  systems don't like; thus loosing Apple tables (by Denis Jacquerye)
-- removed ligature for precomposed legacy characters of Sans Oblique fonts
-  (by Denis Jacquerye)
-- added bearings to en dash U+2013, em dash U+2014 and figure dash U+2012
-  by making dashes shorter, preserving character width (by Denis Jacquerye)
-- reduced U+031C, U+0325 (ring below), U+0339 to be entirely visible; 
-  added instructions in Sans Book; changed U+1e00-U+1e01 to use new ring below
-  (by Denis Jacquerye)
-- adjusted circumflex below on U+1E12-U+1E13, U+1E18-U+1E19, U+1E3C-U+1E3D,
-  U+1E4A-U+1E4B, U+1E70-U+1E71, U+1E76-U+1E77 in Sans fonts (by Denis Jacquerye)
-- Added U+0ED4, U+0ED5 to DejaVu Sans (by Remy Oudompheng)
-- Lao-specific anchors (by Remy Oudompheng)
-- added alternate I to match the small capital in Sans (by Gee Fung Sit)
-
-Changes from 2.14 to 2.15
-
-- improved hinting in Sans Oblique to deal with some spacing and inconsistency
-  issues (by Ben Laenen)
-- added anchors to Mono Book, and added GPOS rules for combining diacritics to
-  show up as zero width glyphs (by Ben Laenen)
-- removed U+F21C (PUA), it was copy of U+2C64 from Latin Extended C (by Eugeniy
-  Meshcheryakov)
-- added U+27E6-U+27E7 to Sans (by Gee Fung Sit)
-- added U+1407, U+1409, U+140C-U+141B, U+141D-U+1425, U+1427-U+142E,
-  U+1435-U+1438, U+143A-U+1449, U+1452, U+1454, U+1457-U+1465, U+1467-U+146A,
-  U+1471, U+1474-U+1482, U+1484-U+1488, U+148F, U+1492, U+14A0, U+14A2, U+14A9,
-  U+14AC-U+14BA, U+14BC, U+14BD, U+14C6, U+14C9-U+14CF, U+14D1, U+14D2, U+14D9,
-  U+14DC-U+14E9, U+14EC, U+14F3, U+14F6-U+1504, U+1506, U+1507, U+1510-U+1525,
-  U+152C, U+152F-U+153D, U+1540, U+1541, U+154E, U+154F, U+1552, U+155B, U+155C,
-  U+1568, U+1569, U+1574-U+157B, U+157D, U+15A7-U+15AE, U+1646, U+1647 (by
-  Eugeniy Meshcheryakov)
-- fixed several contours to not intersect, use horizontal or vertical tangents,
-  use integer coordinates, etc in Sans Book (by Denis Jacquerye)
-- added U+0496-U+0497 in Serif (by Andrey V. Panov)
-
-Changes from 2.13 to 2.14
-
-- added Philippine peso glyph U+20B1 (by Clayborne Arevalo)
-- made U+2012 have the same width as digits, according to Unicode 5.0, 
-  page 206 (by Roozbeh Pournader)
-- made all of the "above" combining characters remove the dot of "i", 
-  "j", etc (Soft_Dotted characters), according to Unicode 5.0, 
-  page 228 (by Roozbeh Pournader)
-- made U+012F, U+03F3, U+0456, U+0458, U+1E2D, and U+1ECB (all fonts 
-  except Mono), U+0249, U+2148, and U+2149 (Sans and Sans Condensed), 
-  U+0268 (Sans ExtraLight, Serif and Serif Condensed), and U+029D (Serif 
-  and Serif Condensed) respect the Soft_Dotted property (by Roozbeh 
-  Pournader)
-- added U+223E, U+223F, U+2240, U+22C2, U+22C3 to Sans (by Remy Oudompheng)
-- added U+203D to Serif (by Gee Fung Sit)
-- added zero-width glyphs for U+2061-U+2063 to Sans and Serif (by Gee 
-  Fung Sit)
-- changed isolated forms of Arabic waw (U+0648, U+0624 and U+06C6) (bug #9432) 
-  (by Ben Laenen)
-- added Lao consonants U+0E81, U+0E82, U+0E84, U+0E87, U+0E88, U+0E8A, 
-  U+0E8D, U+0E94-0E97, U+0E99-0E9F, U+0EA1-0EA3, U+0EA5, U+0EA7, U+0EAA, 
-  U+0EAB, U+0EAD-0EAF to Sans Mono (by Remy Oudompheng)
-- added U+0200-U+0217, U+0226-U+0229, U+02F3, U+1E00-U+1E07, 
-  U+1E0A-U+1E0B, U+1E18-U+1E1F, U+1E22-U+1E23, U+1E28-U+1E2D, 
-  U+1E3A-U+1E3B, U+1E40, U+1E48-U+1E49, U+1E56, U+1E58-U+1E59, 
-  U+1E5E-U+1E5F, U+1E60, U+1E68-U+1E6B, U+1E6E-U+1E6F, U+1E72-U+1E77, 
-  U+1E86-U+1E8B, U+1E92-U+1E96, U+1EA0-U+1EA1, U+1EF4-U+1EF5 to Mono 
-  (by Ben Laenen)
-- renamed uppercase variants of diacritics (macron, breve, double grave, 
-  double acute, inverted breve, dot above) to "uni03XX.case" in Mono 
-  (by Ben Laenen)
-- moved uppercase variants of diacritics up in Mono so they properly 
-  vertically align on capitals (by Ben Laenen)
-- precomposed glyphs with macron, breve, double grave, double acute, 
-  inverted breve, dot above, macron below, breve below, inverted breve 
-  below, dot below, cedilla, caron below, circumflex below, diaeresis 
-  below, tilde below now reference to combining diacritics instead of 
-  space modifiers in Mono (by Ben Laenen)
-- made ring below (U+0325), and half rings below (U+031C and U+0339) 
-  smaller in Mono (by Ben Laenen)
-- added U+205F to all fonts (by Roozbeh Pournader)
-- added U+035E-U+035F to Sans (by Roozbeh Pournader)
-- added empty glyphs for U+034F, U+202A-U+202E, U+2060, U+206A-206F, 
-  U+FE00-U+FE0F to non-Mono fonts (by Roozbeh Pournader)
-- added U+2101, U+2107-U+2108, U+210B, U+210C, U+2110, U+2112, U+211B, 
-  U+211F, U+2123, U+2125, U+2128-U+2129, U+212C-U+212D, U+212F, 
-  U+2130-U+2131, U+2133, U+2136-U+213A, U+2141-U+2144, U+2B00-U+2B11, 
-  U+2B20-U+2B23 to Sans (by John Karp)
-- reshaped omega (U+03C9) in Mono (by Ben Laenen)
-- added U+2205, U+22C6, U+2300-U+2301, U+2303-U+2306, U+230C-U+230F, 
-  U+2312-U+2315, U+231C-U+231F, U+2335, U+2337-U+233E, U+2341-U+2344, 
-  U+2347-U+2348, U+234B-U+234D, U+2349-U+2350, U+2352-U+2354, 
-  U+2357-U+2359, U+235A-U+235C, U+235E-U+2360, U+2363-U+2365, 
-  U+2368-U+2369, U+236B-U+2370, U+2373-U+237A, U+2380-U+2383, 
-  U+2388-U+238B, U+2395 in Mono (by Ben Laenen)
-
-Changes from 2.12 to 2.13
-
-- adjusted U+0198B, U+01B3-U+01B4 in Sans, hinted U+01B4 in Sans Book 
-  (by Denis Jacquerye)
-- added U+27F0-U+27FF, U+2906-U+2907, U+290A-U+290B, U+2940-U+2941 to Sans 
-  (by Denis Jacquerye)
-- added U+01E6-U+01E9, U+01EE-U+01EF, U+01F4-U+01F5, U+01FC-U+01FF, 
-  U+021E-U+021F, U+0245, U+02BD, U+02C9, U+1E9B, U+2045-U+2046, U+2213, U+22C5,
-  U+22EF to Sans Mono (by Roozbeh Pournader)
-- added U+04FA-U+04FD to Sans (by Michael Everson)
-- removed U+2329 and U+232A because of their CJK properties, added U+27E8 
-  and U+27E9 in their stead, fixing part of bug #9038 (by Roozbeh Pournader)
-- corrected and improvised U+0466-U+0469, U+046E-U+0471, U+047C-U+047D, U+0482, 
-  U+0484-U+0486, U+0492-U+0493, U+04B0-U+04B1, U+050C-U+050D, and U+204A 
-  in Sans (by Michael Everson)
-- added instructions for U+0402, U+0409, U+040A, U+040B, U+044D, U+040F, 
-  U+0452, U+0459-U+045B, U+045F to Sans Book (by Eugeniy Meshcheryakov)
-- made italic shape for U+431, U+432, U+437, U+43B, U+43C, U+43D, U+444, U+447, 
-  U+44D, U+44F, U+459, U+45A in SerifOblique and SerifBoldOblique 
-  (by Andrey V. Panov)
-- modified U+024C to match glyph in Unicode chart, fixing bug #9039 
-  (by Denis Jacquerye)
-- made some canonically equivalent characters share the same glyph: 
-  U+02B9 = U+0374, U+0343 = U+0313, and U+0387 = U+00B7 also adjusting U+02BA 
-  to look like double U+02B9, fixing parts of bug #9038 (by Roozbeh Pournader)
-- changed shapes for U+0478 and U+0479 in Sans to those in the Unicode charts, 
-  based on a recent decision by Unicode Technical Committee to only use 
-  the digraph form (by Michael Everson)
-- adjusted width of NBSP U+00A0 and NNBSP U+202F, fixing bug #8401 
-  (by Denis Jacquerye)
-- fixed several contours to not intersect, use horizontal or vertical tangents, 
-  use integer coordinates, etc (by Roozbeh Pournader and Denis Jacquerye)
-- added U+1402, U+1430, U+144D, U+146C, U+148A, U+14A4, U+14C1, U+14D4, U+14EE, 
-  U+1527, U+1545, U+157E, U+158E, U+15AF to Sans (by Eugeniy Meshcheryakov)
-- enlarged width of U+459 and U+45A in Serif (by Andrey V. Panov)
-- made traditional shape for U+452, U+45B (by Andrey V. Panov)
-- added euro sign U+20AC to Sans ExtraLight, making fontconfig recognize 
-  the font as supporting English (by Denis Jacquerye)
-
-Changes from 2.11 to 2.12
-
-- added U+0180 to Serif (by Denis Jacquerye)
-- improved and/or hinted Armenian letters U+0542, U+0546, U+0562,
-  U+0563, U+0564, U+0577, U+0582 in Sans (by Ben Laenen)
-- added U+4FE-U+4FF, U+512-U+513, U+2114, U+214E, U+26B2 to Sans
-  (by Gee Fung Sit)
-- adjusted U+0496-U+0497, U+049A-U+04A1 in Sans to match U+0416,
-  U+041A, U+0436 and U+043A (by Gee Fung Sit)
-- Mathematical Operators in Sans: changed U+22C0-U+22C1 to match
-  other n-ary operators, adjusted U+2203-U+2204, changed U+2220 in
-  Sans to match the style of U+2221 (by Gee Fung Sit)
-- added U+1401, U+1403-U+1406, U+140A, U+140B, U+1426, U+142F,
-  U+1431-U+1434, U+1438, U+1439, U+1449, U+144A, U+144C,
-  U+144E-U+1451, U+1455, U+1456, U+1466, U+146B, U+146D-U+1470,
-  U+1472, U+1473, U+1483, U+1489, U+148B-U+148E, U+1490, U+1491,
-  U+14A1, U+14A3, U+14A5-U+14A8, U+14AA, U+14AB, U+14BB, U+14C0,
-  U+14C2-U+14C5, U+14C7, U+14C8, U+14D0, U+14D3, U+14D5-U+14D8,
-  U+14DA, U+14DB, U+14EA, U+14ED, U+14EF-U+14F2, U+14F4, U+14F5,
-  U+1405, U+1526, U+1528-U+152B, U+152D, U+152E, U+153E,
-  U+1542-U+1544, U+1546-U+154D, U+1550, U+1553, U+1555-U+155A,
-  U+1567, U+156A, U+157C, U+157F-U+1585, U+158A-U+158D,
-  U+158F-U+1596, U+15A0-U+15A6, U+15DE, U+15E1, U+166E-U+1676 to
-  Sans (by Eugeniy Meshcheryakov)
-- re-enabled Latin ligatures fi, ffi, fl, ffl and ff in Sans
-  (by Ben Laenen)
-- made italic shape for U+436, U+44A, U+44B, U+44C, U+44E, U+45F,
-  U+463 in SerifOblique and SerifBoldOblique (by Andrey V. Panov)
-- fixed sub- and superscript metrics in Condensed Sans (bug #8848)
-  (by Ben Laenen)
-- added U+474, U+475 in Serif (by Andrey V. Panov)
-- hinted Greek glyphs U+03B7, U+30B8, U+03B9, U+03C1, U+03C3,
-  U+03C6 in Mono Book (by Ben Laenen)
-
-Changes from 2.10 to 2.11
-
-- added instructions for Hebrew glyphs (Sans Book, by Eugeniy
-  Meshcheryakov)
-- changed U+01A6 (Latin Yr) after bug #8212, in Sans, Serif and
-  Sans Mono fonts (by Denis Jacquerye).
-- removed instruction for U+2600-U+26A1 (by Mederic Boquien)
-- added U+202F and set width of U+00A0 (nobreakingspace) to the
-  same as U+0020, space (by Denis Jacquerye).
-- added and improved instructions for various Cyrillic letters
-  (by Eugeniy Meshcheryakov)
-- Changed U+416, U+42F, U+427 (non-Bold), U+436, U+447 (non-Bold),
-  U+44F, U+437 (Bold), corrected U+40F, U+414, U+424, U+426, U+429,
-  U+434, U+438 (Bold), U+446, U+449, U+44D (non-Bold), U+45F in
-  Sans Mono (by Andrey V. Panov)
-- made small corrections to Cyrillic, most appreciable to U+409,
-  U+413, U+41B, U+427 and U+433, U+434, U+43B, U+447, U+459
-  (upright fonts) to Serif (by Andrey V. Panov)
-- adjusted bearings of U+410, U+416, U+41A, U+42F, U+436, U+43A,
-  U+443, U+44F in Serif (by Andrey V. Panov)
-- enlarged width of U+44A, U+44B, U+44C, U+463 in Serif
-  (by Andrey V. Panov)
-- added ligature "iacute" as "afii10103" (U+456) "acutecomb" in
-  Serif (by Andrey V. Panov)
-- made italic shape to U+446, U+448, U+449 in Serif (by Andrey V.
-  Panov)
-- added "afii10831" (U+F6C7), "afii10832" (U+F6C8) in Serif (by
-  Andrey V. Panov)
-- new minimum version of fontforge is 20061014 (by Ben Laenen)
-
-Changes from 2.9 to 2.10:
-
-- added U+0242, U+024A-U+024B, U+024E-U+024F, U+037C-U+037D, U+0E3F, 
-  U+1D2C-U+1D2E, U+1D30-U+1D42, U+1D5D-U+1D6A, U+1D78, U+1DB8, 
-  U+2090-U+2094, U+20D0-U+20D1, U+2C60-U+2C66, U+2C6B-U+2C6C, U+2C74 and 
-  U+FB29 to Sans (by Gee Fung Sit)
-- added Lao glyphs : U+0E81-0E82, U+E084, U+0E87-0E88, U+0E8A, U+0E8D, 
-  U+0E94-0E97, U+0E99-0E9F, U+0EA1-0EA3, U+0EA5, U+0EA7, U+0EAA-0EAB, 
-  U+0EAD-0EB9, U+0EBB-0EBD, U+0EC0-0EC4, U+0EC6, U+0EC8-0ECD, U+0EDC-0EDD 
-  (by Remy Oudompheng)
-- fixed U+0193 not showing in Windows (bug #7897) (by Ben Laenen)
-- changes to U+222B-222D in Sans Mono (by Remy Oudompheng)
-- ported the three remaining currency symbols from Arev (U+20B0, 
-  U+20B2-U+20B3), and replaced one (U+20AF) in Sans (by Lars Naesbye 
-  Christensen)
-- corrected U+20A5 in Sans (by Gee Fung Sit)
-- merged Double-Struck Letters from Arev: U+2102, U+210D, U+2115, 
-  U+2119-U+211A, U+2124, U+213C-U+2140 (by Gee Fung Sit)
-- added U+2308-U+230B and U+2329-U+232A to Sans Mono and Serif faces, 
-  fixed incorrect direction of U+2329 in Sans faces, and improved 
-  U+2308-U+230B in Sans faces per Ben Laenen's suggestions (by David 
-  Lawrence Ramsey)
-- added U+06D5 and final form of it (needed for Kurdish) (by Ben Laenen)
-- added two special glyphs U+F000 and U+F001 in Sans Book that show the 
-  current ppem size (horizontal and vertical) (by Ben Laenen)
-- added U+2318 and U+2325 to Sans Mono faces, based on the Sans versions 
-  (by David Lawrence Ramsey)
-- added U+2B14-U+2B1A to all faces except Sans ExtraLight (by David 
-  Lawrence Ramsey)
-- respaced all Geometric Shapes characters in Serif faces to match those 
-  in Sans faces again, respaced U+23CF in Sans, Sans ExtraLight, and 
-  Serif faces to match U+25A0 (or Sans in Sans ExtraLight's case) again, 
-  and respaced U+2B12-U+2B13 in Sans and Serif faces to match U+25A1 
-  again (by David Lawrence Ramsey)
-- corrected width of Modifier Small Letters U+1D43-1D5B in Sans Oblique 
-  and U+1D9B-U+1DBF in Sans Oblique and Sans Bold Oblique (by Gee Fung Sit)
-- added a bunch of glyphs to Sans ExtraLight (see SVN for details) (by 
-  Gee Fung Sit)
-- adjusted Cyrillic descenders in Sans ExtraLight to sync with Sans (by 
-  Gee Fung Sit)
-- added U+0242, U+0245 to Serif (by Gee Fung Sit)
-- replaced the SHPIX routines which gave them bad spacing at certain 
-  sizes in FreeType for A, V, Z, v and z in Sans Bold (by Ben Laenen) 
-
-Changes from 2.8 to 2.9:
-
-- DejaVuSansExtraLight.sfd: changed family name from "DejaVu Sans" to
-  "DejaVu Sans Light" (in case we add a Light weight variant), so legacy
-  apps that understand only 4 styles are happy. (by Denis Jacquerye)
-- added Name ID 16, aka preferred family name, and Name ID 17, aka
-  preferred style name, so contemporary apps that understand more that 4
-  styles can use big fonts families "DejaVu Sans" and "DejaVu Serif". For
-  those, Extralight and Condensed are just styles not different families.
-  (by Denis Jacquerye)
-- added U+22B6-22BD, U+22C0-22C1, U+22D6-22D7 to Sans. (by Remy Oudompheng)
-- added U+037B, U+2184, U+2C67-U+2C6A and U+2C75-U+2C77 to Sans (by Gee
-  Fung Sit)
-- adjusted asteriskmath (U+2217) for consistency with other mathematical
-  operators in Sans (by Ben Laenen)
-- hinted some Armenian capitals in Sans Book (by Ben Laenen)
-- added U+0246 - U+0249 (by Ben Laenen)
-- BUGFIX : swapped U+224E and U+224F, in Sans, Sans Condensed and Sans Mono
-  (by Remy Oudompheng)
-- adjusted U+20B5 (by Mederic Boquien)
-- swapped U+21DA and U+21DB which were in wrong order (by Heikki Lindroos)
-- added U+222E-2233, U+239B-23AD, U+2A00-2A02, U+2A0F-2A1C to Sans (by Remy
-  Oudompheng)
-- added U+239B-23AD to Mono (by Remy Oudompheng)
-- added U+2024-2025 to Serif (by Mederic Boquien)
-- added U+222C-222D, U+2A0C-2A0E to Serif (by Remy Oudompheng)
-- added U+2190-21FF to Mono (by Heikki Lindroos)
-- added Hebrew glyphs - U+05B0-U+05BD, U+05BF-U+05C3, U+05C6, U+05C7,
-  U+05D0-U+05EA, U+05F0-U+05F2, U+FB1F, U+FB20, U+FB2A-U+FB36,
-  U+FB38-U+FB3C, U+FB3E, U+FB40, U+FB41, U+FB43, U+FB44, U+FB46-U+FB4E (by
-  Gee Fung Sit and Eugeniy Meshcheryakov)
-- adjustments for Cyrillic in Sans (by Andrey V. Panov)
-- made italic shape for U+0434, U+0456, U+0457 in SerifOblique and Serif
-  Bold Oblique (by Andrey V. Panov)
-
-Changes from 2.7 to 2.8:
-
-- fixed instructions for U+0423, U+0427, U+0447, U+0448 in Serif, so they
-  look good at large sizes too (by Eugeniy Meshcheryakov)
-- added U+FB00 and U+FB03 to U+FB06 to Serif typefaces (by Heikki Lindroos)
-- added U+26B0-U+26B1, U+2701-U+2704, U+2706-U+2709, U+270C-U+2727, U+2729
-  to U+274B, U+274D, U+274F to U+2752, U+2756, U+2758-U+275E, U+2761 to
-  U+2775 (by Heikki Lindroos)
-- added and improved instructions for Cyrillic letters in Mono and Serif
-  (Book, by Eugeniy Meshcheryakov)
-- rotated U+26B0 (was too small in mono) (by Gee Fung Sit)
-- adjusted U+1EDA-U+1EDD, U+1EE8-U+1EEB, capitals using capital specific
-  accent and moved diacritics to match position on U+00F2 (ograve), etc.
-  (by Denis Jacquerye)
-- added U+20D6, U+20D7 to Sans (by Gee Fung Sit)
-- made Armenian ligatures discretionary since the Firefox ligature problem
-  still isn't fixed (by Ben Laenen)
-- moved Armenian hyphen U+058A to a higher position (bug #7436) (by Ben
-  Laenen)
-- hinted Greek glyphs in Sans Bold (by Ben Laenen)
-- enabled Arabic lam-alif ligatures when diacritics are used (by Ben Laenen)
-
-Changes from 2.6 to 2.7:
-
-- added glyphs needed for Kurdish: U+0695, U+06B5, U+06C6, U+06CE and their
-  init/medi/fina forms in Sans (by Ben Laenen)
-- added U+02CD, U+01F8 - U+01F9, U+1E3E - U+1E3F, U+1E30 - U+1E35, U+1EBC -
-  U+1EBD, U+1EF8 - U+1EF9 (includes glyphs needed for Yoruba, Maori, Guarani
-  and Twi) (by Ben Laenen)
-- added U+22C8-22CC, U+29CE-29D5, U+2A7D-2AA0, U+2AAE-2ABA, U+2AF9-2AFA to
-  Sans (by Remy Oudompheng)
-- adjusted diacritics on Vietnamese, Pinyin and other characters:
-  U+01A0-U+01A1, U+01AF-U+01B0, U+01D5-U+01DC, U+01DE-01E1, U+01FA-U+01FB
-  U+022A-U+022D, U+0230-U+0231, U+1E14-U+1E17, U+1E4C-U+1E53, U+1E78-U+1E7B,
-  U+1EA4-U+1EF1 in Sans (Book, Bold and Oblique) (by Denis Jacquerye)
-- added basic arrows U+2190-U+2193 in Serif, which completes MES-1 compliance
-  for Serif (by Ben Laenen)
-- added U+01E4, U+01E5, U+01FA, U+01FB, U+02BD, U+02C9 and U+02EE to Serif
-  (by Ben Laenen)
-- fixed U+0209 in Serif Bold Oblique (by Ben Laenen)
-- adjusted Box Drawing block characters U+2500-257F in Mono to fit character
-  cell, shifting them up by 416 (Denis Jacquerye)
-- redid U+0194 in Sans (by Ben Laenen)
-- added U+2217-2218, U+2295-22A1 to Mono (by Remy Oudompheng)
-- added U+0462 to Serif (by Andrey V. Panov)
-- added U+226C, U+228C-228E, U+2293-2294, U+22F2-22FF to Sans (by Remy
-  Oudompheng)
-- adjusted U+2208-220D in Sans (by Remy Oudompheng)
-- improved some Cyrillic glyphs in Mono (by Andrey V. Panov), rewritten
-  instructions for changed glyphs (by Eugeniy Meshcheryakov)
-- added U+1E0E-1E0F, U+1E8E-1E8F to Mono fonts (by Denis Jacquerye). (bug
-  #7166)
-- renamed 'Dotabove' to 'Dotaccent' in Mono Sans Oblique to match other fonts
-  (by Denis Jacquerye).
-- added U+200B-U+200F in Sans faces and Serif faces, U+200B and U+200C were
-  in Sans already (by Lars Naesbye Christensen)
-- added U+2601-U+262F, U+263D, U+263E, U+2648-U+265F, U+2668, U+2670-U+268B,
-  U+2690-U+269C, U+26A0, U+26A1, U+2794, U+2798-U+27AF, U+27B1-U+27BE to Mono
-  (by Heikki Lindroos)
-- replaced the references with unshifted ones for both κ U+03BA and к U+043A
-  in Mono Book (by Denis Jacquerye)
-- fixing glyph for U+04ED in Mono Book, consisted only of dieresis (by Andrey
-  V. Panov).
-
-Changes from 2.5 to 2.6:
-
-- redid U+2032 - U+2037, U+2057 based on Arev in Sans (by Gee Fung Sit)
-- added U+0195, corrected U+039E, U+204B in Sans ExtraLight (by Gee Fung Sit)
-- added instructions for some Cyrillic letters in Sans Bold (by Eugeniy
-  Meshcheryakov)
-- added vulgar fractions U+2153-U+215F for Serif, made with references (by
-  Lars Naesbye Christensen)
-- added U+228F-2292, U+2299-22AF, U+22B2-22B5, U+22CD, U+22D8-22ED to Sans
-  (by Remy Oudompheng)
-- added U+2208-220D, U+2238-223D, U+2278-2281, U+228A-228B, U+228F-2292,
-  U+22CD, U+22DA-22E9 to Mono (by Remy Oudompheng)
-- fixed misplaced dot in U+2250 in Mono (by Remy Oudompheng)
-- added instructions for some Cyrillic letters in Mono Book and Bold(by
-  Eugeniy Meshcheryakov)
-- minor changes to U+2241, U+2261-2263, U+22A4, U+22A5 in Sans (by Remy
-  Oudompheng)
-- added hinting instructions to lowercase Armenian glyphs in Sans Book (by
-  Ben Laenen)
-- changed U+2208, U+220B to match U+2209 and U+220C in Sans Bold (by Remy
-  Oudompheng)
-- added Braille patterns U+2800-U+28FF to Sans (by Mederic Boquien)
-- added instructions for some Cyrillic letters in Serif Book (by Eugeniy
-  Meshcheryakov)
-- renamed BoldOblique fonts to Bold Oblique in TTF Name as originally in
-  Bitstream Vera fonts (by Denis Jacquerye)
-- added hinting instructions to some Latin-B Extended and IPA characters in
-  Sans Book (by Denis Jacquerye and Ben Laenen)
-- adjusted bearings, replaced diacritics, hinted hook and horn for
-  Vietnamese in Sans Book (by Denis Jacquerye)
-- made FAX, TM, TEL, etc. discritionary ligatures in Sans and Serif fonts
-  (by Denis Jacquerye)
-- removed ligatures of precomposed characters in Sans and Serif fonts (by
-  Denis Jacquerye)
-- added U+F208, U+F20A, U+F215-F217, U+F21A-F21B, U+F25F in PUA (from SIL's
-  PUA, probably in Unicode 5.0): U+0243, U+0244, U+0245, U+024C, U+024D,
-  U+2C64, (U+2C6D), (U+2C71)
-- modified some glyphs in Serif Oblique to make them more italic (by Denis
-  Jacquerye)
-
-Changes from 2.4 to 2.5:
-
-- fixed excessive kerning bug that occurs with Pango (by Denis Jacquerye)
-- added U+20AF to Sans and Serif (by Lars Naesbye Christensen)
-- regenerated Condensed faces (by Ben Laenen)
-- added U+035C-U+035D to Sans, fixed U+0361 (by Denis Jacquerye)
-- integrated 255 characters from Arev fonts: Latin Extended-B, Spacing
-  Modifiers, Combining Diacritical Marks, Cyrillic, Cyrillic supplement,
-  General Punctuation, Letterlike Symbols, Arrows, Mathematical Operators,
-  Miscellaneous Technical, Dingbats, Alphabetic Presentation Forms (by Denis
-  Jacquerye)
-- added basic Cyrillic and basic Greek to Sans ExtraLight (by Denis Jacquerye)
-- added U+0498, U+049A, U+04AA, U+04AB, U+04AF to Serif (by Eugeniy
-  Meshcheryakov)
-- added U+0494, U+0495, U+0498, U+0499, U+04AA, U+04AB, U+04C3, U+04C4,
-  U+04C7, U+04C8 to Mono (by Eugeniy Meshcheryakov)
-- adjusted weight of U+0256, U+0257, U+0260, U+0272, U+0273, U+0277, U+029B,
-  U+02A0 and modifed  U+028B and U+027A in Mono (by Denis Jacquerye)
-- added U+2000-200A to Mono (by Denis Jacquerye)
-- added vulgar fractions U+2153 - U+215F to Mono (by Gee Fung Sit)
-- adapted metrics of Arabic glyphs so they stay above cut-off height in Sans
-  (by Ben Laenen)
-- fixed mkmk anchors for Arabic diacritics so they stack properly in Sans (by
-  Ben Laenen)
-- fixed weight of lowercase upsilon in Sans Bold, make small adjustment to
-  lowercase omega in Sans (by Ben Laenen)
-- added U+210E (by Mederic Boquien)
-- unslanted U+2201, U+221B and U+221C in Sans Oblique (by Mederic Boquien)
-- added several mathematical relation symbols to Sans and Mono (U+2241-224C,
-  U+2250-2255, U+2260-2269, U+226E-2277, U+2282-2287) modified U+223C to match
-  other tildes, and U+2282-2284 to have the same shape. (by Remy Oudompheng)
-- made U+2234-U+2237 refer to U+2219 instead of U+00B7 in Sans (by Mederic
-  Boquien)
-- added U+2238-223B, U+226A-226B, U+2278-2281, U+2288-228B to Sans (by Remy
-  Oudompheng)
-- unslanted and changed reference of U+22C5 from U+00B7 to U+2219 in Sans (by
-  Mederic Boquien)
-- added U+224D-225F, U+226D, U+22C6 to Sans and unslanted U+2219 in Sans
-  Oblique. (by Remy Oudompheng)
-- added U+224D-225F, U+226D to Mono, shifted U+2266-2269 higher upwards and
-  unslanted U+2219 in Oblique. (by Remy Oudompheng)
-- merged Coptic glyphs from Arev 0.2 (by Lars Naesbye Christensen)
-- fixed and adjusted various Cyrillic glyphs in Serif (by Andrey V. Panov)
-- made fi, fl... ligatures discretionary ligatures (by Ben Laenen)
-
-Changes from 2.3 to 2.4:
-
-- added U+04A2, U+04A3, U+04AC - U+04AF, U+04BA, U+04BB, U+04C0 -
-  U+04C2, U+04CB, U+04CD, U+04D8 - U+04DF, U+04E2 - U+04E5, U+04E8 - U+04F5,
-  U+04F6 - U+04F9 to Mono (by Eugeniy Meshcheryakov)
-- added U+048C, U+048D, U+0494, U+0495, U+049E - U+04A7, U+04AC -
-  U+04AE, U+04B4- U+04B7, U+04BA, U+04BB, U+04C0 - U+04C4, U+04C7, U+04C8,
-  U+04CB, U+04CC, U+04D8 - U+04DF, U+04E2 - U+04E5, U+04EC - U+04F9 to Serif
-  (by Eugeniy Meshcheryakov)
-- added U+2134 to Sans (by Gee Fung Sit)
-- added U+2080 - U+2089 to all faces (by Gee Fung Sit)
-- several minor corrections to Sans (by Gee Fung Sit)
-- major corrections to Sans Condensed (by Gee Fung Sit)
-- corrected Superscripts and Subscripts in Sans (by Gee Fung Sit)
-- corrected anchors of U+0316-U+0319 (by Denis Jacquerye)
-- Verajja integrated (by Stepan Roh)
-- copied U+2328, U+2600, U+2639-U+263C, U+263F-U+2647, U+2660-U+2667,
-  and U+2669-U+266F from Sans to Serif, and copied scaled-down versions of
-  them to Sans Mono (by David Lawrence Ramsey)
-- added U+20B4 to all faces (by Eugeniy Meshcheryakov)
-- added more minor positional adjustments to U+2638 in all faces to
-  match the other miscellaneous symbols in Verajja, and rescale it in Sans
-  Mono so that it looks better (by David Lawrence Ramsey)
-- added U+2242, U+2243 and U+22A4 (by Mederic Boquien)
-- corrected U+2245 in Sans (by Mederic Boquien)
-- added U+0221, U+0234-0236 (by Denis Jacquerye)
-- added in Arabic block to Sans: U+060C, U+0615, U+061B, U+061F, U+0621
-- U+063A, U+0640 - U+0655, U+0660 - U+066F, U+0679 - U+0687, U+0698, U+06A1,
-  U+06A9, U+06AF, U+06BA, U+06BF, U+06CC, U+06F0 - U+06F9 (by Ben Laenen)
-- added in Arabic Presentation Forms A to Sans: U+FB52 - U+FB81, U+FB8A
-- U+FB95, U+FB9E - U+FB9F, U+FBE8 - U+FBE9, U+FBFC - U+FBFF (by Ben Laenen)
-- added complete Arabic Presentation Forms B to Sans: U+FE70 - U+FE74,
-  U+FE76 - U+FEFC, U+FEFF (by Ben Laenen)
-- added complete Greek Extended block to Mono (by Ben Laenen)
-- modified Greek capitals with tonos in Mono (by Ben Laenen)
-- added U+01C4-01CC, U+01D5, U+01DE, U+01E0-U+01E1, U+01E6-U+01E9,
-  U+01EE-U+01F5, U+01F8-U+0217, U+021E-U+021F, U+0226-U+022A, U+022C to Serif
-  (by Denis Jacquerye)
-- adjusted U+043B and U+044F in Serif (by Denis Jacquerye)
-- added U+2000-U+200A (by Denis Jacquerye)
-- added U+1E00-U+1E0B, U+1E0E-U+1E11, U+1E14-U+1E1C, U+1E1E-U+1E23,
-  U+1E26-U+1E2D, U+1E30-U+1E35, U+1E3A-U+1E3B, U+1E3E-U+1E40, U+1E48-U+1E49,
-  U+1E50-U+1E56, U+1E58-U+1E59, U+1E5E-U+1E60, U+1E68-U+1E6B, U+1E6E-U+1E6F,
-  U+1E72-U+1E7D, U+1E86-U+1E9B, U+1EA0-U+1EA3, U+1EAC-U+1EB7, U+1EBA-U+1EBD,
-  U+1EC6-U+1ECF, U+1ED8-U+1ED9, U+1EE6-U+1EE7, U+1EF4-U+1EF9 to Serif (by
-  Denis Jacquerye)
-- added U+048E, U+048F, U+049C-U+049F, U+04B8, U+04B9, U+04BC-U+04BF,
-  U+04C3, U+04C4 to Sans (by Eugeniy Meshcheryakov)
-- added DejaVu Sans Extra Light (by Denis Jacquerye)
-- Adjusted underline position for (hopefully) improved legibility in
-  Sans, Serif, Mono (Tim May)
-- added auto-generated DejaVu LGC (by Stepan Roh) 
-
-Changes from 2.2 to 2.3:
-
-- fixed bug U+042B and U+044B behave badly in Sans Bold or Oblique (by
-  Keenan Pepper)
-- added and improved TrueType instructions and related settings (by
-  Keenan Pepper)
-- added U+04D0-U+04D7, U+04E6, U+04E7 to Mono (by Eugeniy Meshcheryakov)
-- added U+048A - U+048D, U+0498, U+0499, U+04AA, U+04AB, U+04B0, U+04B1,
-  U+04C0, U+04C9, U+04CA, U+04CE, U+04CD, U+04DA, U+04DB, U+04DE, U+04DF,
-  U+04E2 - U+04E5, U+04EC - U+04F8, U+04F9 to Sans (by Eugeniy Meshcheryakov)
-- added U+04E0, U+04E1 to all faces (by Eugeniy Meshcheryakov)
-- added Greek Extended to Sans and Serif: U+1F00-U+1F15, U+1F18-U+1F1D,
-  U+1F20-U+1F45, U+1F48-U+1F4D, U+1F50-U+1F57, U+1F59, U+1F5B, U+1F5D,
-  U+1F5F-U+1F7D, U+1F80-U+1FB4, U+1FB6-U+1FC4, U+1FC6-U+1FD3, U+1FD6-U+1FDB,
-  U+1FDD-U+1FEF, U+1FF2-U+1FF4, U+1FF6-U+1FFE (by Ben Laenen)
-- added Greek variant letterforms, archaic letters and symbols to Mono:
-  U+03D0-U+03E1, U+03F0-U+03FF (by Ben Laenen)
-- added Armenian block and Armenian ligatures to Sans (U+0531 - U+0556,
-  U+0559 - U+055F, U+0561 - U+0587, U+0589 - U+058A, U+FB13 - U+FB17) (by Ben
-  Laenen)
-- redid some Greek characters in Sans and Mono to make them look better
-  and to correct some errors (by Ben Laenen)
-- added U+27E0 to all faces (by David Lawrence Ramsey)
-- added underscore (U+005F) consistency fixes: extended the Sans Mono
-  and Sans Mono Oblique underscores to touch both horizontal edges, and
-  reduced the height of the Sans Bold Oblique underscore to match the Sans
-  Bold underscore (by David Lawrence Ramsey)
-- added underscore (U+005F) derivatives and consistency fixes for them:
-  made U+0332 a reference to underscore at Denis Jacquerye's suggestion; made
-  U+0333 two references to underscore; made U+033F two references to U+203E;
-  added U+2017 as two references to underscore, and made U+0333 a reference to
-  it; and added U+203E as a reference to underscore, and made U+0305 a
-  reference to it (by David Lawrence Ramsey)
-- added U+201B, U+2220, U+2320-U+2321, U+23AE, U+23CF, all remaining
-  Geometric Shapes glyphs (U+25A0-U+25C9, U+25CB-U+25D7, U+25D9-U+25E5,
-  U+25E7-U+25FF), and U+2B12-U+2B13 to all faces (by David Lawrence Ramsey)
-- added minor positional adjustments to U+2638 in all faces (by David
-  Lawrence Ramsey)
-- added U+201F to Sans Mono and Serif faces (by David Lawrence Ramsey)
-- added U+01B7, U+01F6, U+0464 - U+0465, U+2160 - U+2180, U+2183,
-  U+220A, U+220D, U+2329, U+232A, U+2422, U+27E8 - U+27EB, U+2680 - U+2685 to
-  Sans (by Gee Fung Sit ???)
-- added U+2116 to Sans and Serif (by Gee Fung Sit)
-- changed florin sign U+0192 in Sans (by Gee Fung Sit)
-- added anchor points to some glyphs (by Denis Jacquerye)
-- adjusted height of IPA superscripts U+02B0-02B8, U+02C0-02C1,
-  U+02E0-02E4, U+207F to match with height of U+00B2 (by Denis Jacquerye)
-- added U+0184-U+0185, U+019C, U+019F, U+01A0-U+01A3, U+01A6, U+01AA,
-  U+01AF-U+01B0, U+01B2-U+01B4, U+01B7-U+01B8, U+01BC-U+01BC, U+0224-U+0225,
-  U+023A-U+0240, U+1D16-U+1D17, U+1D1D-U+1D1E, U+1D43-U+1D5B, U+1D7B,
-  U+1D85,U+1D9B-1DB7, U+1DB9-U+1DBF, U+20A6 to all fonts (by Denis Jacquerye)
-- added added U+0182, U+018B, U+018E, U+01A0-U+01A1, U+01B1, U+01B9,
-  U+01C0-U+01C3, U+0238-U+0239, U+1D02, U+1D08-U+1D09, U+1D14, U+1D1F, U+1D77
-  to Serif and Mono (by Denis Jacquerye)
-- added U+0181, U+0183, U+0187-U+0188, U+018A-U+018F, U+0191, U+0193,
-  U+0195-U+019B, U+019D-U+019E, U+01A4-U+01A5, U+01AC-U+01AE, U+01B5-U+01B6,
-  U+01B9, U+01BB, U+01F6 to Serif (by Denis Jacquerye)
-- added U+0181, U+0187-U+0188, U+018A, U+018D, U+018F, U+0191, U+0193,
-  U+0195-U+019F, U+01A4-01A5, U+01AC-01AD, U+01B5-U+01B6, U+1BB, U+01F6,
-  U+01D7-U+01DC, U+0238-U+0239, U+0241 to Mono (by Denis Jacquerye)
-- added to Mono and Serif (by Denis Jacquerye) 
-
-Changes from 2.1 to 2.2:
-
-- reworked the vertical orientation of the Blocks Elements characters
-  in all faces to remove their overly large descenders, in order to fix
-  problems with e.g. terminal emulators (by David Lawrence Ramsey)
-- copied bullet in Sans faces to Serif faces for consistency (by David
-  Lawrence Ramsey)
-- added U+2023, U+25D8, U+25E6, and U+29EB to all faces (by David
-  Lawrence Ramsey)
-- added U+1EB8, U+1EB9, U+1ECA - U+1ECD, U+1EE4, U+1EE5 (by Tim May)
-- added U+01DD, U+02BE, U+02BF, U+02D3 to all, changed U+02D2 in
-  non-Condensed and U+1EE5 in Serif (by Tim May)
-- fixed U+01CE, replacing wrong circumflex by caron (by Denis Jacquerye)
-- added anchor points to some glyphs (by Denis Jacquerye)
-- added U+20B5 (by Denis Jacquerye)
-- added U+0181 - U+0183, U+0187, U+0188, U+018A - U+018D, U+0191,
-  U+0193, U+0195 - U+019B, U+019D, U+019E, U+01A4, U+01A7 - U+01A9, U+01AB -
-  U+01AE, U+01B1, U+01B5, U+01B6, U+01BB, U+01C0 - U+01C3, U+01F1 - U+01F3,
-  U+0238, U+0239, U+1D02, U+1D08, U+1D09, U+1D14, U+1D1F, U+1D77, U+2103,
-  U+2126, U+2127, U+212A, U+212B, U+2132, U+214B, U+2210, U+2217, U+2218,
-  U+2A0C - U+2A0E, U+FB00, U+FB03 and U+FB04 to Sans (by Gee Fung Sit)
-- added U+01A9, U+01C3 and U+2126 to Mono and Serif (by Gee Fung Sit)
-- adjusted bearings of U+028B in Sans (by Gee Fung Sit)
-- added U+018F, U+0494-U+0497, U+04A0-U+04A7, U+04AC-U+04AF,
-  U+04B4-U+04B7, U+04BA-U+04BB, U+04C1-U+04C2, U+04C5-U+04C8, U+04CB-U+04CC,
-  U+04D0-U+04D9, U+04DC-U+04DD, U+04E6-U+04EB to Sans (by Eugeniy
-  Meshcheryakov)
-- replaced with references U+0391-U+0393, U+0395-U+0397, U+0399, U+039A,
-  U+039C, U+039D, U+039F-U+03A1, U+03A4, U+03A5, U+03A7, U+03BF, U+03DC,
-  U+0405, U+0406, U+0408, U+0410, U+0412, U+0415, U+0417, U+041A,
-  U+041C-U+041E, U+0420-U+0422, U+0425, U+0430, U+0435, U+043E, U+0440,
-  U+0441, U+0443, U+0445, U+0455-U+0458 in Serif and Mono (by Eugeniy
-  Meshcheryakov)
-- added U+04D0-U+04D7, U+04E6-U+04EB to Serif (by Eugeniy Meshcheryakov)
-- added U+212A and U+212B to the rest of the faces (by Lars Naesbye
-  Christensen)
-- added U+2318 and U+2325 to Sans and Serif (by Lars Naesbye Christensen)
-- added and improved TrueType instructions and related settings (by
-  Keenan Pepper)
-- completed basic Greek alphabet: added U+0374-U+0375, U+037A, U+037E,
-  U+0384-U+038A, U+038C, U+038E-U+0390, U+03AC-U+03BF, U+03C1-U+03CE (by Ben
-  Laenen)
-- added U+2070 and U+2074-U+2079 (by Mederic Boquien) 
-
-Changes from 2.0 to 2.1:
-
-*** Be aware that names of some TTF files changed since version 2.0. ***
-
-- added U+0323, U+1E0C, U+1E0D, U+1E24, U+1E25, U+1E36 - U+1E39, U+1E42,
-  U+1E43, U+1E46, U+1E47, U+1E5A - U+1E5D, U+1E62, U+1E63, U+1E6C, U+1E6D,
-  U+1E7E, U+1E7F (by Tim May)
-- fixed bug where GNOME applications used Mono Bold Oblique instead of
-  Mono Oblique (by Keenan Pepper)
-- added and improved TrueType instructions and related settings (by
-  Keenan Pepper)
-- added U+1E41, U+1E57, U+1E61 (by Sander Vesik)
-- added U+0189, U+0309, U+0313, U+0314, U+031A, U+031B, U+0327, U+0328,
-  U+032B, U+0333, U+033C (by Denis Jacquerye)
-- adjusted and fixed U+0186, U+0254, U+0291, U+0316 - U+0319, U+031C -
-  U+0320, U+0323 - U+0326, U+0329 - U+032A, U+032C - U+0332, U+0339 - U+033B,
-  U+033E, U+033F (by Denis Jacquerye)
-- fixed U+1E12, U+1E3C, U+1E4A, U+1E70 to have normal below diacritics
-  (by Denis Jacquerye)
-- fixed U+1E82, U+1E84 and U+1EF2 to have uppercase above diacritics (by
-  Denis Jacquerye)
-- added anchor points to some glyphs (by Denis Jacquerye)
-- dropped "-Roman" from font names - affects both internal TTF names and
-  names of generated files (by Stepan Roh)
-- attempt to fix bug Vertical spacing too big for Mono by exchanging
-  LineGap and OS2TypoLinegap values (proofed by Stefan Rank)
-- added Greek capitals U+0391 - U+03A1, U+03A3 - U+03A9, U+03AA, U+03AB
-  in Mono (by Ben Laenen)
-- added the per ten thousand sign U+2031 (by Mederic Boquien)
-- added U+2207, U+221D, U+221F, U+2227 - U+222A, and U+2261 (by David
-  Lawrence Ramsey)
-- new logo (by Gee Fung Sit)
-- added U+0180, U+018E, U+201F, U+2024, U+2025, U+203D, U+2200, U+2203,
-  U+2213, U+222C, U+222D, U+2263 to Sans (by Gee Fung Sit) 
-
-Changes from 1.15 to 2.0:
-
-- "Italized" basic glyphs in all Serif Oblique and their Condensed faces
-  (by David Jez)
-- added and improved TrueType instructions and related settings (by Keenan
-  Pepper)
-- added anchor points to some glyphs (by Denis Jacquerye)
-- many new spacing and combining accents (by Denis Jacquerye)
-- smart substitutions for transforming i and j to dottless form and for
-  using uppercase diacritics (by Denis Jacquerye)
-- fixed remaining erroneously slanted characters in Serif Oblique faces (by
-  David Lawrence Ramsey)
-- copied bullet in Sans faces to Sans Oblique faces for consistency (by
-  David Lawrence Ramsey)
-- added U+203C and U+2047-U+2049 (by David Lawrence Ramsey)
-- added Greek glyphs to Serif (by Ben Laenen, Condensed merge by David Jez)
-- fixed bug LTR glyphs behaving like RTL (by Ben Laenen)
-- fixed wrong glyph directions (by David Jez)
-- fixed repositioned accents in Condensed faces (by David Jez)
-
-Changes from 1.14 to 1.15:
-
-- added and improved TrueType instructions and related settings (by Keenan
-  Pepper)
-- fixed U+2302, U+2319 (by David Lawrence Ramsey)
-- fixed yet another monospace bug (by Stepan Roh)
-- fixed potential "too big ascender/descender" bug (by Stepan Roh)
-- fixed U+026E and U+028E (by Denis Jacquerye)
-- added U+0186, U+0190, U+0300 - U+0304, U+0306 - U+0308, U+030A - U+030C,
-  U+0321, U+0322 (by Denis Jacquerye)
-- added rest of Block Elements: U+2591 - U+2593 (by David Lawrence Ramsey)
-- added U+2311, U+237D and U+2638 (by David Lawrence Ramsey)
-- added U+01CD - U+01D4 (by Denis Jacquerye)
-- fixed accents of U+00F2 - U+00F6 by replacing them with references in Mono
-  Bold (by David Jez)
-- added U+0490, U+0491 (by Eugeniy Meshcheryakov)
-- added hints to U+0404 and U+0454 in Sans (by Eugeniy Meshcheryakov)
-- completed Greek glyphs from U+0370 to U+03CF in Serif (by Ben Laenen)
-- fixed shape of U+0255 in Sans Bold and Sans Bold Oblique (by Denis
-  Jacquerye)
-
-Changes from 1.13 to 1.14:
-
-- fixed bug where Mono faces were not recognized as fixed pitch in Windows
-  by correcting Venda glyphs (by David Jez)
-- added and improved TrueType instructions (by Keenan Pepper)
-- added 6 Uzbekian glyphs (by Mashrab Kuvatov)
-- added Greek glyphs to Sans and Serif, changed pi and omega to fit in (by
-  Ben Laenen)
-- added IPA and related superscript glyphs (by Denis Jacquerye)
-- fixed buggy Venda glyphs (by David Lawrence Ramsey and Stepan Roh)
-- added U+2302, U+2310, U+2319 (by David Lawrence Ramsey)
-- fixed slanted U+00AC in Serif Oblique faces (by David Lawrence Ramsey)
-- added 29 glyphs from Block Elements (by David Lawrence Ramsey)
-
-Changes from 1.12 to 1.13:
-
-- removed all stems (PS hints) (requested by David Jez)
-- added U+01D6, U+01DF, U+022B, U+022D and U+0231 (by Sander Vesik)
-- added 10 Venda glyphs (by Dwayne Bailey)
-- fixed bug when fonts had no name on Microsoft Windows (by Stepan Roh)
-- updated 'missing' glyph U+FFFD (by David Jez)
-- set TTF flag fsType to 'Installable Embedding' (= unrestricted usage)
-  (idea by C. Tiffany)
-
-Changes from 1.11 to 1.12:
-
-- added long s (by James Cloos)
-- prettier comma accent in gcommaaccent (by David Jez)
-- added Hbar, hbar, kgreenlandic, napostrophe, Eng, eng, Tbar, tbar,
-  afii57929 (by David Jez)
-- changed Iogonek, iogonek, IJ, ij to look better (by David Jez)
-- glyph uni0237 renamed to dotlessj (requested by David Jez)
-- fixed accents for dcaron, lcaron, tcaron, Uogonek, uogonek in Serif (by
-  David Jez)
-- added U+2500 - U+257F box drawing glyphs to Sans Mono (by David Jez)
-- fixed accents in Wcircumflex, Ycircumflex and Zdotaccent (by David Jez)
-- extra kerning for F (by Sander Vesik)
-- added 'missing' glyph U+FFFD (by David Jez)
-
-Changes from 1.10 to 1.11:
-
-- kerning updates (by Sander Vesik)
-- added Iogonek, iogonek, IJ, ij, Uogonek, uogonek (from SuSE standard fonts
-  by Adrian Schroeter, SuSE AG)
-- added Gcommaaccent, gcommaaccent, Kcommaaccent, kcommaaccent,
-  Lcommaaccent, lcommaaccent, Ncommaaccent, ncommaaccent, Rcommaaccent,
-  rcommaaccent (by Stepan Roh)
-
-Changes from 1.9 to 1.10:
-
-- added U+022E, U+022F (by Sander Vesik)
-- kerning updates for DejaVu Sans (by Sander Vesik)
-- fixed too wide cyrillic glyphs in DejaVu Sans Mono (by Valentin Stoykov)
-- fixed ligatures bug in Mono (by Stepan Roh)
-
-Changes from 1.8 to 1.9:
-
-- integrated Arev Cyrillics (by Danilo Segan)
-- added U+01EA, U+01EB, U+01EC, U+01ED (by Sander Vesik)
-
-Changes from 1.7 to 1.8:
-
-- fixed accents in Serif Oblique and Serif Bold Oblique (by Stepan Roh)
-
-Changes from 1.6 to 1.7:
-
-- added automatically generated Condensed typefaces (by Stepan Roh)
-
-Changes from 1.5 to 1.6:
-
-- monospace bug fixed (by Stepan Roh)
-- incorrect Bitstream foundry assigned by fontconfig and KDE Font Installer
-fixed (by Stepan Roh)
-- added automatically generated Oblique version of Serif typefaces (by
-Stepan Roh)
-- corrected cyrillic D and d (by Danilo Segan and David Jez)
-- fixed accents position in Oblique version of Serif typefaces (by Danilo
-Segan and Sander Vesik)
-- fixed incorrect computation of OS2Win* fields (by Stepan Roh)
-- added visiblespace U+2423 (by David Jez)
-- fixed 'line height' bug by fixing ascender and descender values (by David
-Jez and Stepan Roh)
-- fixed part of 'worse than Vera' bug (by Peter Cernak)
-- smaller comma accent U+0326 (by David Jez)
-
-Changes from 1.4 to 1.5:
-
-- added Cyrillics (96 characters) and Dcroat to the rest of typefaces (by
-Danilo Segan)
-- fixed bugs in some Cyrillic characters, some of them reported by Sander
-Vesik (by Danilo Segan)
-- added U+0100, U+0101, U+0112, U+0113, U+012A, U+012B, U+014C, U+014D,
-U+016A, U+016B, U+01E2, U+01E3, U+0232 and U+0233 (by Sander Vesik)
-- added Romanian characters (by Misu Moldovan)
-- added U+0108, U+0109, U+010A, U+010B, U+0114, U+0115, U+0116, U+0117,
-U+011C, U+011D, U+0120, U+0121, U+0124, U+0125, U+0128, U+0129, U+012C,
-U+012D, U+0134, U+0135, U+014E, U+014F, U+0150, U+0151, U+015C, U+015D,
-U+0168, U+0169, U+016C, U+016D, U+0170, U+0171 and U+0237 (by James
-Crippen)
-- added U+02BB, U+2010, U+2011, U+2012 and U+2015 (by Stepan Roh)
-
-Changes from 1.3 to 1.4:
-
-- added Polish characters (Aogonek, aogonek, Eogonek, eogonek, Nacute,
-nacute, Sacute, sacute, Zacute, zacute, Zdotaccent, zdotaccent) (by Stepan
-Roh)
-
-Changes from 1.2 to 1.3:
-
-- added Cyrillics (96 characters) and Dcroat to Sans typefaces (by Danilo
-Segan from his BePa fonts)
-
-Changes from 1.1 to 1.2:
-
-- added Ldot, ldot, Wcircumflex, wcircumflex, Ycircumflex, ycircumflex,
-  Wgrave, wgrave, Wacute, wacute, Wdieresis, wdieresis, Ygrave and ygrave
-  (from The Olwen Font Family 0.2 by Dafydd Harries)
-
-Changes from 1.0 to 1.1:
-
-- added Lacute, lacute, Lcaron, lcaron, Racute and racute (by Peter Cernak)
-
-Changes from 0.9.4 to 1.0:
-
-- none, just changed version and updated README
-
-Changes from 0.9.3 to 0.9.4:
-
-- fixed TTF generation (kerning tables were missing)
-
-Changes from 0.9.2 to 0.9.3:
-
-- kerning of added characters
-- proper caron shape for dcaron in Mono (by Ondrej Koala Vacha)
-- minor visual changes
-
-Changes from 0.9.1 to 0.9.2:
-
-- internal bugged version
-
-Changes from 0.9 to 0.9.1:
-
-- proper caron shape for dcaron and tcaron
-- minor visual changes
-
-$Id: NEWS 2359 2009-08-27 14:13:16Z ben_laenen $
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavu-fonts-ttf-2.30/README b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavu-fonts-ttf-2.30/README
deleted file mode 100644
index 0bcc3aa3..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavu-fonts-ttf-2.30/README
+++ /dev/null
@@ -1,59 +0,0 @@
-DejaVu fonts 2.30 (c)2004-2009 DejaVu fonts team
-------------------------------------------------
-
-The DejaVu fonts are a font family based on the Bitstream Vera Fonts
-(http://gnome.org/fonts/). Its purpose is to provide a wider range of
-characters (see status.txt for more information) while maintaining the
-original look and feel.
-
-DejaVu fonts are based on Bitstream Vera fonts version 1.10.
-
-Available fonts (Sans = sans serif, Mono = monospaced):
-
-DejaVu Sans Mono
-DejaVu Sans Mono Bold
-DejaVu Sans Mono Bold Oblique
-DejaVu Sans Mono Oblique
-DejaVu Sans
-DejaVu Sans Bold
-DejaVu Sans Bold Oblique
-DejaVu Sans Oblique
-DejaVu Sans ExtraLight (experimental)
-DejaVu Serif
-DejaVu Serif Bold
-DejaVu Serif Bold Italic (experimental)
-DejaVu Serif Italic (experimental)
-DejaVu Sans Condensed (experimental)
-DejaVu Sans Condensed Bold (experimental)
-DejaVu Sans Condensed Bold Oblique (experimental)
-DejaVu Sans Condensed Oblique (experimental)
-DejaVu Serif Condensed (experimental)
-DejaVu Serif Condensed Bold (experimental)
-DejaVu Serif Condensed Bold Italic (experimental)
-DejaVu Serif Condensed Italic (experimental)
-
-All fonts are also available as derivative called DejaVu LGC with support
-only for Latin, Greek and Cyrillic scripts.
-
-For license information see LICENSE. What's new is described in NEWS. Known
-bugs are in BUGS. All authors are mentioned in AUTHORS.
-
-Fonts are published in source form as SFD files (Spline Font Database from
-FontForge - http://fontforge.sf.net/) and in compiled form as TTF files
-(TrueType fonts).
-
-For more information go to http://dejavu.sourceforge.net/.
-
-Characters from Arev fonts, Copyright (c) 2006 by Tavmjong Bah:
----------------------------
-U+01BA, U+01BF, U+01F7, U+021C-U+021D, U+0220, U+0222-U+0223,
-U+02B9, U+02BA, U+02BD, U+02C2-U+02C5, U+02d4-U+02D5,
-U+02D7, U+02EC-U+02EE, U+0346-U+034E, U+0360, U+0362,
-U+03E2-03EF, U+0460-0463, U+0466-U+0486, U+0488-U+0489, U+04A8-U+04A9,
-U+0500-U+050F, U+2055-205E, U+20B0, U+20B2-U+20B3, U+2102, U+210D, U+210F,
-U+2111, U+2113, U+2115, U+2118-U+211A, U+211C-U+211D, U+2124, U+2135,
-U+213C-U+2140, U+2295-U+2298, U+2308-U+230B, U+26A2-U+26B1, U+2701-U+2704,
-U+2706-U+2709, U+270C-U+274B, U+2758-U+275A, U+2761-U+2775, U+2780-U+2794,
-U+2798-U+27AF, U+27B1-U+27BE, U+FB05-U+FB06
-
-$Id: README 2359 2009-08-27 14:13:16Z ben_laenen $
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavu-fonts-ttf-2.30/langcover.txt b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavu-fonts-ttf-2.30/langcover.txt
deleted file mode 100644
index 8289ef48..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavu-fonts-ttf-2.30/langcover.txt
+++ /dev/null
@@ -1,242 +0,0 @@
-This is the language coverage file for DejaVu fonts
-($Id$)
-
-                                                Sans               Serif              Sans Mono          
-aa     Afar                                     100% (62/62)       100% (62/62)       100% (62/62)      
-ab     Abkhazia                                 100% (90/90)        93% (84/90)        84% (76/90)      
-af     Afrikaans                                100% (69/69)       100% (69/69)       100% (69/69)      
-ak     Akan                                     100% (73/73)       100% (73/73)       100% (73/73)      
-am     Amharic                                       (0/264)            (0/264)            (0/264)      
-an     Aragonese                                100% (66/66)       100% (66/66)       100% (66/66)      
-ar     Arabic                                   100% (125/125)          (0/125)       100% (125/125)    
-as     Assamese                                      (0/64)             (0/64)             (0/64)       
-ast    Asturian/Bable/Leonese/Asturleonese      100% (66/66)       100% (66/66)       100% (66/66)      
-av     Avaric                                   100% (67/67)       100% (67/67)       100% (67/67)      
-ay     Aymara                                   100% (60/60)       100% (60/60)       100% (60/60)      
-az-az  Azerbaijani in Azerbaijan                100% (66/66)       100% (66/66)       100% (66/66)      
-az-ir  Azerbaijani in Iran                      100% (130/130)          (0/130)       100% (130/130)    
-ba     Bashkir                                  100% (82/82)       100% (82/82)        97% (80/82)      
-be     Byelorussian                             100% (68/68)       100% (68/68)       100% (68/68)      
-ber-dz Berber in Algeria                        100% (70/70)       100% (70/70)       100% (70/70)      
-ber-ma Berber in Morocco                        100% (32/32)            (0/32)             (0/32)       
-bg     Bulgarian                                100% (60/60)       100% (60/60)       100% (60/60)      
-bh     Bihari (Devanagari script)                    (0/68)             (0/68)             (0/68)       
-bho    Bhojpuri (Devanagari script)                  (0/68)             (0/68)             (0/68)       
-bi     Bislama                                  100% (58/58)       100% (58/58)       100% (58/58)      
-bin    Edo or Bini                              100% (78/78)       100% (78/78)       100% (78/78)      
-bm     Bambara                                  100% (60/60)       100% (60/60)       100% (60/60)      
-bn     Bengali                                       (0/63)             (0/63)             (0/63)       
-bo     Tibetan                                       (0/95)             (0/95)             (0/95)       
-br     Breton                                   100% (64/64)       100% (64/64)       100% (64/64)      
-bs     Bosnian                                  100% (62/62)       100% (62/62)       100% (62/62)      
-bua    Buriat (Buryat)                          100% (70/70)       100% (70/70)       100% (70/70)      
-byn    Blin/Bilin                                    (0/255)            (0/255)            (0/255)      
-ca     Catalan                                  100% (74/74)       100% (74/74)       100% (74/74)      
-ce     Chechen                                  100% (67/67)       100% (67/67)       100% (67/67)      
-ch     Chamorro                                 100% (58/58)       100% (58/58)       100% (58/58)      
-chm    Mari (Lower Cheremis / Upper Cheremis)   100% (76/76)       100% (76/76)        97% (74/76)      
-chr    Cherokee                                      (0/85)             (0/85)             (0/85)       
-co     Corsican                                 100% (84/84)       100% (84/84)       100% (84/84)      
-crh    Crimean Tatar/Crimean Turkish            100% (68/68)       100% (68/68)       100% (68/68)      
-cs     Czech                                    100% (82/82)       100% (82/82)       100% (82/82)      
-csb    Kashubian                                100% (74/74)       100% (74/74)       100% (74/74)      
-cu     Old Church Slavonic                      100% (103/103)      86% (89/103)       78% (81/103)     
-cv     Chuvash                                  100% (74/74)       100% (74/74)       100% (74/74)      
-cy     Welsh                                    100% (78/78)       100% (78/78)       100% (78/78)      
-da     Danish                                   100% (70/70)       100% (70/70)       100% (70/70)      
-de     German                                   100% (59/59)       100% (59/59)       100% (59/59)      
-dv     Divehi/Dhivehi/Maldivian                      (0/49)             (0/49)             (0/49)       
-dz     Dzongkha                                      (0/95)             (0/95)             (0/95)       
-ee     Ewe                                      100% (99/99)       100% (99/99)       100% (99/99)      
-el     Greek                                    100% (69/69)       100% (69/69)       100% (69/69)      
-en     English                                  100% (72/72)       100% (72/72)       100% (72/72)      
-eo     Esperanto                                100% (64/64)       100% (64/64)       100% (64/64)      
-es     Spanish                                  100% (66/66)       100% (66/66)       100% (66/66)      
-et     Estonian                                 100% (64/64)       100% (64/64)       100% (64/64)      
-eu     Basque                                   100% (56/56)       100% (56/56)       100% (56/56)      
-fa     Persian                                  100% (129/129)          (0/129)       100% (129/129)    
-fat    Fanti                                    100% (73/73)       100% (73/73)       100% (73/73)      
-ff     Fulah (Fula)                             100% (62/62)       100% (62/62)       100% (62/62)      
-fi     Finnish                                  100% (62/62)       100% (62/62)       100% (62/62)      
-fil    Filipino                                 100% (84/84)       100% (84/84)       100% (84/84)      
-fj     Fijian                                   100% (52/52)       100% (52/52)       100% (52/52)      
-fo     Faroese                                  100% (68/68)       100% (68/68)       100% (68/68)      
-fr     French                                   100% (84/84)       100% (84/84)       100% (84/84)      
-fur    Friulian                                 100% (66/66)       100% (66/66)       100% (66/66)      
-fy     Frisian                                  100% (75/75)       100% (75/75)       100% (75/75)      
-ga     Irish                                    100% (80/80)       100% (80/80)       100% (80/80)      
-gd     Scots Gaelic                             100% (70/70)       100% (70/70)       100% (70/70)      
-gez    Ethiopic (Geez)                               (0/218)            (0/218)            (0/218)      
-gl     Galician                                 100% (66/66)       100% (66/66)       100% (66/66)      
-gn     Guarani                                  100% (70/70)       100% (70/70)       100% (70/70)      
-gu     Gujarati                                      (0/68)             (0/68)             (0/68)       
-gv     Manx Gaelic                              100% (54/54)       100% (54/54)       100% (54/54)      
-ha     Hausa                                    100% (60/60)       100% (60/60)       100% (60/60)      
-haw    Hawaiian                                 100% (63/63)       100% (63/63)       100% (63/63)      
-he     Hebrew                                   100% (27/27)            (0/27)             (0/27)       
-hi     Hindi (Devanagari script)                     (0/68)             (0/68)             (0/68)       
-hne    Chhattisgarhi                                 (0/68)             (0/68)             (0/68)       
-ho     Hiri Motu                                100% (52/52)       100% (52/52)       100% (52/52)      
-hr     Croatian                                 100% (62/62)       100% (62/62)       100% (62/62)      
-hsb    Upper Sorbian                            100% (72/72)       100% (72/72)       100% (72/72)      
-ht     Haitian/Haitian Creole                   100% (56/56)       100% (56/56)       100% (56/56)      
-hu     Hungarian                                100% (70/70)       100% (70/70)       100% (70/70)      
-hy     Armenian                                 100% (77/77)            (0/77)             (0/77)       
-hz     Herero                                   100% (57/57)       100% (57/57)       100% (57/57)      
-ia     Interlingua                              100% (52/52)       100% (52/52)       100% (52/52)      
-id     Indonesian                               100% (54/54)       100% (54/54)       100% (54/54)      
-ie     Interlingue                              100% (52/52)       100% (52/52)       100% (52/52)      
-ig     Igbo                                     100% (58/58)       100% (58/58)       100% (58/58)      
-ii     Sichuan Yi/Nuosu                              (0/1165)           (0/1165)           (0/1165)     
-ik     Inupiaq (Inupiak, Eskimo)                100% (68/68)       100% (68/68)       100% (68/68)      
-io     Ido                                      100% (52/52)       100% (52/52)       100% (52/52)      
-is     Icelandic                                100% (70/70)       100% (70/70)       100% (70/70)      
-it     Italian                                  100% (72/72)       100% (72/72)       100% (72/72)      
-iu     Inuktitut                                100% (161/161)          (0/161)            (0/161)      
-ja     Japanese                                      (0/6537)           (0/6537)           (0/6537)     
-jv     Javanese                                 100% (56/56)       100% (56/56)       100% (56/56)      
-ka     Georgian                                 100% (33/33)       100% (33/33)       100% (33/33)      
-kaa    Kara-Kalpak (Karakalpak)                 100% (78/78)       100% (78/78)       100% (78/78)      
-kab    Kabyle                                   100% (70/70)       100% (70/70)       100% (70/70)      
-ki     Kikuyu                                   100% (56/56)       100% (56/56)       100% (56/56)      
-kj     Kuanyama/Kwanyama                        100% (52/52)       100% (52/52)       100% (52/52)      
-kk     Kazakh                                   100% (77/77)       100% (77/77)       100% (77/77)      
-kl     Greenlandic                              100% (81/81)       100% (81/81)       100% (81/81)      
-km     Central Khmer                                 (0/63)             (0/63)             (0/63)       
-kn     Kannada                                       (0/70)             (0/70)             (0/70)       
-ko     Korean                                        (0/2443)           (0/2443)           (0/2443)     
-kok    Kokani (Devanagari script)                    (0/68)             (0/68)             (0/68)       
-kr     Kanuri                                   100% (56/56)        96% (54/56)       100% (56/56)      
-ks     Kashmiri                                  94% (137/145)          (0/145)        97% (141/145)    
-ku-am  Kurdish in Armenia                       100% (64/64)       100% (64/64)       100% (64/64)      
-ku-iq  Kurdish in Iraq                          100% (32/32)            (0/32)         87% (28/32)      
-ku-ir  Kurdish in Iran                          100% (32/32)            (0/32)         87% (28/32)      
-ku-tr  Kurdish in Turkey                        100% (62/62)       100% (62/62)       100% (62/62)      
-kum    Kumyk                                    100% (66/66)       100% (66/66)       100% (66/66)      
-kv     Komi (Komi-Permyak/Komi-Siryan)          100% (70/70)       100% (70/70)       100% (70/70)      
-kw     Cornish                                  100% (64/64)       100% (64/64)       100% (64/64)      
-kwm    Kwambi                                   100% (52/52)       100% (52/52)       100% (52/52)      
-ky     Kirgiz                                   100% (70/70)       100% (70/70)       100% (70/70)      
-la     Latin                                    100% (68/68)       100% (68/68)       100% (68/68)      
-lah    Lahnda                                    94% (137/145)          (0/145)        97% (141/145)    
-lb     Luxembourgish (Letzeburgesch)            100% (75/75)       100% (75/75)       100% (75/75)      
-lez    Lezghian (Lezgian)                       100% (67/67)       100% (67/67)       100% (67/67)      
-lg     Ganda                                    100% (54/54)       100% (54/54)       100% (54/54)      
-li     Limburgan/Limburger/Limburgish           100% (62/62)       100% (62/62)       100% (62/62)      
-ln     Lingala                                  100% (81/81)       100% (81/81)       100% (81/81)      
-lo     Lao                                      100% (55/55)            (0/55)         83% (46/55)      
-lt     Lithuanian                               100% (70/70)       100% (70/70)       100% (70/70)      
-lv     Latvian                                  100% (78/78)       100% (78/78)       100% (78/78)      
-mai    Maithili (Devanagari script)                  (0/68)             (0/68)             (0/68)       
-mg     Malagasy                                 100% (56/56)       100% (56/56)       100% (56/56)      
-mh     Marshallese                              100% (62/62)       100% (62/62)       100% (62/62)      
-mi     Maori                                    100% (64/64)       100% (64/64)       100% (64/64)      
-mk     Macedonian                               100% (42/42)       100% (42/42)       100% (42/42)      
-ml     Malayalam                                     (0/68)             (0/68)             (0/68)       
-mn-cn  Mongolian in China                            (0/130)            (0/130)            (0/130)      
-mn-mn  Mongolian in Mongolia                    100% (70/70)       100% (70/70)       100% (70/70)      
-mo     Moldavian                                100% (128/128)     100% (128/128)     100% (128/128)    
-mr     Marathi (Devanagari script)                   (0/68)             (0/68)             (0/68)       
-ms     Malay                                    100% (52/52)       100% (52/52)       100% (52/52)      
-mt     Maltese                                  100% (72/72)       100% (72/72)       100% (72/72)      
-my     Burmese (Myanmar)                             (0/48)             (0/48)             (0/48)       
-na     Nauru                                    100% (60/60)       100% (60/60)       100% (60/60)      
-nb     Norwegian Bokmal                         100% (70/70)       100% (70/70)       100% (70/70)      
-nds    Low Saxon                                100% (59/59)       100% (59/59)       100% (59/59)      
-ne     Nepali (Devanagari script)                    (0/68)             (0/68)             (0/68)       
-ng     Ndonga                                   100% (52/52)       100% (52/52)       100% (52/52)      
-nl     Dutch                                    100% (82/82)       100% (82/82)       100% (82/82)      
-nn     Norwegian Nynorsk                        100% (76/76)       100% (76/76)       100% (76/76)      
-no     Norwegian (Bokmal)                       100% (70/70)       100% (70/70)       100% (70/70)      
-nr     Ndebele, South                           100% (52/52)       100% (52/52)       100% (52/52)      
-nso    Northern Sotho                           100% (58/58)       100% (58/58)       100% (58/58)      
-nv     Navajo/Navaho                            100% (72/72)       100% (72/72)       100% (72/72)      
-ny     Chichewa                                 100% (54/54)       100% (54/54)       100% (54/54)      
-oc     Occitan                                  100% (70/70)       100% (70/70)       100% (70/70)      
-om     Oromo or Galla                           100% (52/52)       100% (52/52)       100% (52/52)      
-or     Oriya                                         (0/68)             (0/68)             (0/68)       
-os     Ossetic                                  100% (66/66)       100% (66/66)       100% (66/66)      
-ota    Ottoman Turkish                           97% (36/37)            (0/37)         97% (36/37)      
-pa     Panjabi/Punjabi                               (0/63)             (0/63)             (0/63)       
-pa-pk  Panjabi/Punjabi in Pakistan               94% (137/145)          (0/145)        97% (141/145)    
-pap-an Papiamento in Netherlands Antilles       100% (72/72)       100% (72/72)       100% (72/72)      
-pap-aw Papiamento in Aruba                      100% (54/54)       100% (54/54)       100% (54/54)      
-pl     Polish                                   100% (70/70)       100% (70/70)       100% (70/70)      
-ps-af  Pashto in Afghanistan                     83% (41/49)            (0/49)         77% (38/49)      
-ps-pk  Pashto in Pakistan                        81% (40/49)            (0/49)         75% (37/49)      
-pt     Portuguese                               100% (82/82)       100% (82/82)       100% (82/82)      
-qu     Quechua                                  100% (55/55)       100% (55/55)       100% (55/55)      
-rm     Rhaeto-Romance (Romansch)                100% (66/66)       100% (66/66)       100% (66/66)      
-rn     Rundi                                    100% (52/52)       100% (52/52)       100% (52/52)      
-ro     Romanian                                 100% (62/62)       100% (62/62)       100% (62/62)      
-ru     Russian                                  100% (66/66)       100% (66/66)       100% (66/66)      
-rw     Kinyarwanda                              100% (52/52)       100% (52/52)       100% (52/52)      
-sa     Sanskrit (Devanagari script)                  (0/68)             (0/68)             (0/68)       
-sah    Yakut                                    100% (76/76)       100% (76/76)        97% (74/76)      
-sc     Sardinian                                100% (62/62)       100% (62/62)       100% (62/62)      
-sco    Scots                                    100% (56/56)       100% (56/56)       100% (56/56)      
-sd     Sindhi                                    81% (44/54)            (0/54)         79% (43/54)      
-se     North Sami                               100% (66/66)       100% (66/66)       100% (66/66)      
-sel    Selkup (Ostyak-Samoyed)                  100% (66/66)       100% (66/66)       100% (66/66)      
-sg     Sango                                    100% (72/72)       100% (72/72)       100% (72/72)      
-sh     Serbo-Croatian                           100% (156/156)     100% (156/156)      98% (154/156)    
-shs    Secwepemctsin                            100% (48/48)       100% (48/48)       100% (48/48)      
-si     Sinhala/Sinhalese                             (0/73)             (0/73)             (0/73)       
-sid    Sidamo                                        (0/281)            (0/281)            (0/281)      
-sk     Slovak                                   100% (86/86)       100% (86/86)       100% (86/86)      
-sl     Slovenian                                100% (62/62)       100% (62/62)       100% (62/62)      
-sm     Samoan                                   100% (53/53)       100% (53/53)       100% (53/53)      
-sma    South Sami                               100% (60/60)       100% (60/60)       100% (60/60)      
-smj    Lule Sami                                100% (60/60)       100% (60/60)       100% (60/60)      
-smn    Inari Sami                               100% (68/68)       100% (68/68)       100% (68/68)      
-sms    Skolt Sami                               100% (80/80)       100% (80/80)        97% (78/80)      
-sn     Shona                                    100% (52/52)       100% (52/52)       100% (52/52)      
-so     Somali                                   100% (52/52)       100% (52/52)       100% (52/52)      
-sq     Albanian                                 100% (56/56)       100% (56/56)       100% (56/56)      
-sr     Serbian                                  100% (60/60)       100% (60/60)       100% (60/60)      
-ss     Swati                                    100% (52/52)       100% (52/52)       100% (52/52)      
-st     Sotho, Southern                          100% (52/52)       100% (52/52)       100% (52/52)      
-su     Sundanese                                100% (54/54)       100% (54/54)       100% (54/54)      
-sv     Swedish                                  100% (68/68)       100% (68/68)       100% (68/68)      
-sw     Swahili                                  100% (52/52)       100% (52/52)       100% (52/52)      
-syr    Syriac                                        (0/45)             (0/45)             (0/45)       
-ta     Tamil                                         (0/48)             (0/48)             (0/48)       
-te     Telugu                                        (0/70)             (0/70)             (0/70)       
-tg     Tajik                                    100% (78/78)       100% (78/78)        97% (76/78)      
-th     Thai                                       1% (1/74)             (0/74)             (0/74)       
-ti-er  Eritrean Tigrinya                             (0/255)            (0/255)            (0/255)      
-ti-et  Ethiopian Tigrinya                            (0/281)            (0/281)            (0/281)      
-tig    Tigre                                         (0/221)            (0/221)            (0/221)      
-tk     Turkmen                                  100% (68/68)       100% (68/68)       100% (68/68)      
-tl     Tagalog                                  100% (84/84)       100% (84/84)       100% (84/84)      
-tn     Tswana                                   100% (58/58)       100% (58/58)       100% (58/58)      
-to     Tonga                                    100% (53/53)       100% (53/53)       100% (53/53)      
-tr     Turkish                                  100% (70/70)       100% (70/70)       100% (70/70)      
-ts     Tsonga                                   100% (52/52)       100% (52/52)       100% (52/52)      
-tt     Tatar                                    100% (76/76)       100% (76/76)       100% (76/76)      
-tw     Twi                                      100% (73/73)       100% (73/73)       100% (73/73)      
-ty     Tahitian                                 100% (65/65)       100% (65/65)       100% (65/65)      
-tyv    Tuvinian                                 100% (70/70)       100% (70/70)       100% (70/70)      
-ug     Uighur                                   100% (125/125)          (0/125)       100% (125/125)    
-uk     Ukrainian                                100% (72/72)       100% (72/72)       100% (72/72)      
-ur     Urdu                                      94% (137/145)          (0/145)        97% (141/145)    
-uz     Uzbek                                    100% (52/52)       100% (52/52)       100% (52/52)      
-ve     Venda                                    100% (62/62)       100% (62/62)       100% (62/62)      
-vi     Vietnamese                               100% (194/194)      77% (150/194)      76% (148/194)    
-vo     Volapuk                                  100% (54/54)       100% (54/54)       100% (54/54)      
-vot    Votic                                    100% (62/62)       100% (62/62)       100% (62/62)      
-wa     Walloon                                  100% (70/70)       100% (70/70)       100% (70/70)      
-wal    Wolaitta/Wolaytta                             (0/281)            (0/281)            (0/281)      
-wen    Sorbian languages (lower and upper)      100% (76/76)       100% (76/76)       100% (76/76)      
-wo     Wolof                                    100% (66/66)       100% (66/66)       100% (66/66)      
-xh     Xhosa                                    100% (52/52)       100% (52/52)       100% (52/52)      
-yap    Yapese                                   100% (58/58)       100% (58/58)       100% (58/58)      
-yi     Yiddish                                  100% (27/27)            (0/27)             (0/27)       
-yo     Yoruba                                   100% (119/119)     100% (119/119)     100% (119/119)    
-za     Zhuang/Chuang                            100% (52/52)       100% (52/52)       100% (52/52)      
-zh-cn  Chinese (simplified)                       0% (2/6765)        0% (2/6765)        0% (2/6765)     
-zh-hk  Chinese Hong Kong Supplementary Character Set      (0/2213)           (0/2213)           (0/2213)     
-zh-mo  Chinese in Macau                              (0/2213)           (0/2213)           (0/2213)     
-zh-sg  Chinese in Singapore                       0% (2/6765)        0% (2/6765)        0% (2/6765)     
-zh-tw  Chinese (traditional)                         (0/13063)          (0/13063)          (0/13063)    
-zu     Zulu                                     100% (52/52)       100% (52/52)       100% (52/52)      
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavu-fonts-ttf-2.30/status.txt b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavu-fonts-ttf-2.30/status.txt
deleted file mode 100644
index ecc3055d..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavu-fonts-ttf-2.30/status.txt
+++ /dev/null
@@ -1,6237 +0,0 @@
-This is the status file for DejaVu fonts
-($Id: status.txt 2362 2009-08-27 14:43:39Z ben_laenen $)
-
-original = present in original Bitstream Vera 1.10
-<version> = added in DejaVu fonts <version>
-
-U+0020 space                original
-U+0021 exclam               original
-U+0022 quotedbl             original
-U+0023 numbersign           original
-U+0024 dollar               original
-U+0025 percent              original
-U+0026 ampersand            original
-U+0027 quotesingle          original
-U+0028 parenleft            original
-U+0029 parenright           original
-U+002a asterisk             original
-U+002b plus                 original
-U+002c comma                original
-U+002d hyphen               original
-U+002e period               original
-U+002f slash                original
-U+0030 zero                 original
-U+0031 one                  original
-U+0032 two                  original
-U+0033 three                original
-U+0034 four                 original
-U+0035 five                 original
-U+0036 six                  original
-U+0037 seven                original
-U+0038 eight                original
-U+0039 nine                 original
-U+003a colon                original
-U+003b semicolon            original
-U+003c less                 original
-U+003d equal                original
-U+003e greater              original
-U+003f question             original
-U+0040 at                   original
-U+0041 A                    original
-U+0042 B                    original
-U+0043 C                    original
-U+0044 D                    original
-U+0045 E                    original
-U+0046 F                    original
-U+0047 G                    original
-U+0048 H                    original
-U+0049 I                    original
-U+004a J                    original
-U+004b K                    original
-U+004c L                    original
-U+004d M                    original
-U+004e N                    original
-U+004f O                    original
-U+0050 P                    original
-U+0051 Q                    original
-U+0052 R                    original
-U+0053 S                    original
-U+0054 T                    original
-U+0055 U                    original
-U+0056 V                    original
-U+0057 W                    original
-U+0058 X                    original
-U+0059 Y                    original
-U+005a Z                    original
-U+005b bracketleft          original
-U+005c backslash            original
-U+005d bracketright         original
-U+005e asciicircum          original
-U+005f underscore           original
-U+0060 grave                original
-U+0061 a                    original
-U+0062 b                    original
-U+0063 c                    original
-U+0064 d                    original
-U+0065 e                    original
-U+0066 f                    original
-U+0067 g                    original
-U+0068 h                    original
-U+0069 i                    original
-U+006a j                    original
-U+006b k                    original
-U+006c l                    original
-U+006d m                    original
-U+006e n                    original
-U+006f o                    original
-U+0070 p                    original
-U+0071 q                    original
-U+0072 r                    original
-U+0073 s                    original
-U+0074 t                    original
-U+0075 u                    original
-U+0076 v                    original
-U+0077 w                    original
-U+0078 x                    original
-U+0079 y                    original
-U+007a z                    original
-U+007b braceleft            original
-U+007c bar                  original
-U+007d braceright           original
-U+007e asciitilde           original
-U+00a0 nonbreakingspace     original
-U+00a1 exclamdown           original
-U+00a2 cent                 original
-U+00a3 sterling             original
-U+00a4 currency             original
-U+00a5 yen                  original
-U+00a6 brokenbar            original
-U+00a7 section              original
-U+00a8 dieresis             original
-U+00a9 copyright            original
-U+00aa ordfeminine          original
-U+00ab guillemotleft        original
-U+00ac logicalnot           original
-U+00ad sfthyphen            original
-U+00ae registered           original
-U+00af macron               original
-U+00b0 degree               original
-U+00b1 plusminus            original
-U+00b2 twosuperior          original
-U+00b3 threesuperior        original
-U+00b4 acute                original
-U+00b5 mu                   original
-U+00b6 paragraph            original
-U+00b7 periodcentered       original
-U+00b8 cedilla              original
-U+00b9 onesuperior          original
-U+00ba ordmasculine         original
-U+00bb guillemotright       original
-U+00bc onequarter           original
-U+00bd onehalf              original
-U+00be threequarters        original
-U+00bf questiondown         original
-U+00c0 Agrave               original
-U+00c1 Aacute               original
-U+00c2 Acircumflex          original
-U+00c3 Atilde               original
-U+00c4 Adieresis            original
-U+00c5 Aring                original
-U+00c6 AE                   original
-U+00c7 Ccedilla             original
-U+00c8 Egrave               original
-U+00c9 Eacute               original
-U+00ca Ecircumflex          original
-U+00cb Edieresis            original
-U+00cc Igrave               original
-U+00cd Iacute               original
-U+00ce Icircumflex          original
-U+00cf Idieresis            original
-U+00d0 Eth                  original
-U+00d1 Ntilde               original
-U+00d2 Ograve               original
-U+00d3 Oacute               original
-U+00d4 Ocircumflex          original
-U+00d5 Otilde               original
-U+00d6 Odieresis            original
-U+00d7 multiply             original
-U+00d8 Oslash               original
-U+00d9 Ugrave               original
-U+00da Uacute               original
-U+00db Ucircumflex          original
-U+00dc Udieresis            original
-U+00dd Yacute               original
-U+00de Thorn                original
-U+00df germandbls           original
-U+00e0 agrave               original
-U+00e1 aacute               original
-U+00e2 acircumflex          original
-U+00e3 atilde               original
-U+00e4 adieresis            original
-U+00e5 aring                original
-U+00e6 ae                   original
-U+00e7 ccedilla             original
-U+00e8 egrave               original
-U+00e9 eacute               original
-U+00ea ecircumflex          original
-U+00eb edieresis            original
-U+00ec igrave               original
-U+00ed iacute               original
-U+00ee icircumflex          original
-U+00ef idieresis            original
-U+00f0 eth                  original
-U+00f1 ntilde               original
-U+00f2 ograve               original
-U+00f3 oacute               original
-U+00f4 ocircumflex          original
-U+00f5 otilde               original
-U+00f6 odieresis            original
-U+00f7 divide               original
-U+00f8 oslash               original
-U+00f9 ugrave               original
-U+00fa uacute               original
-U+00fb ucircumflex          original
-U+00fc udieresis            original
-U+00fd yacute               original
-U+00fe thorn                original
-U+00ff ydieresis            original
-U+0100 Amacron              1.5
-U+0101 amacron              1.5
-U+0102 Abreve               1.5
-U+0103 abreve               1.5
-U+0104 Aogonek              1.4
-U+0105 aogonek              1.4
-U+0106 Cacute               original
-U+0107 cacute               original
-U+0108 Ccircumflex          1.5
-U+0109 ccircumflex          1.5
-U+010a Cdotaccent           1.5
-U+010b cdotaccent           1.5
-U+010c Ccaron               original
-U+010d ccaron               original
-U+010e Dcaron               1.0
-U+010f dcaron               1.0
-U+0110 Dcroat               1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0111 dcroat               original
-U+0112 Emacron              1.5
-U+0113 emacron              1.5
-U+0114 Ebreve               1.5
-U+0115 ebreve               1.5
-U+0116 Edotaccent           1.5
-U+0117 edotaccent           1.5
-U+0118 Eogonek              1.4
-U+0119 eogonek              1.4
-U+011a Ecaron               1.0
-U+011b ecaron               1.0
-U+011c Gcircumflex          1.5
-U+011d gcircumflex          1.5
-U+011e Gbreve               original
-U+011f gbreve               original
-U+0120 Gdotaccent           1.5
-U+0121 gdotaccent           1.5
-U+0122 Gcommaaccent         1.11
-U+0123 gcommaaccent         1.11
-U+0124 Hcircumflex          1.5
-U+0125 hcircumflex          1.5
-U+0126 Hbar                 1.12
-U+0127 hbar                 1.12
-U+0128 Itilde               1.5
-U+0129 itilde               1.5
-U+012a Imacron              1.5
-U+012b imacron              1.5
-U+012c Ibreve               1.5
-U+012d ibreve               1.5
-U+012e Iogonek              1.11
-U+012f iogonek              1.11
-U+0130 Idotaccent           original
-U+0131 dotlessi             original
-U+0132 IJ                   1.11
-U+0133 ij                   1.11
-U+0134 Jcircumflex          1.5
-U+0135 jcircumflex          1.5
-U+0136 Kcommaaccent         1.11
-U+0137 kcommaaccent         1.11
-U+0138 kgreenlandic         1.12
-U+0139 Lacute               1.1
-U+013a lacute               1.1
-U+013b Lcommaaccent         1.11
-U+013c lcommaaccent         1.11
-U+013d Lcaron               1.1
-U+013e lcaron               1.1
-U+013f Ldot                 1.2
-U+0140 ldot                 1.2
-U+0141 Lslash               original
-U+0142 lslash               original
-U+0143 Nacute               1.4
-U+0144 nacute               1.4
-U+0145 Ncommaaccent         1.11
-U+0146 ncommaaccent         1.11
-U+0147 Ncaron               1.0
-U+0148 ncaron               1.0
-U+0149 napostrophe          1.12
-U+014a Eng                  1.12
-U+014b eng                  1.12
-U+014c Omacron              1.5
-U+014d omacron              1.5
-U+014e Obreve               1.5
-U+014f obreve               1.5
-U+0150 Ohungarumlaut        1.5
-U+0151 ohungarumlaut        1.5
-U+0152 OE                   original
-U+0153 oe                   original
-U+0154 Racute               1.1
-U+0155 racute               1.1
-U+0156 Rcommaaccent         1.11
-U+0157 rcommaaccent         1.11
-U+0158 Rcaron               1.0
-U+0159 rcaron               1.0
-U+015a Sacute               1.4
-U+015b sacute               1.4
-U+015c Scircumflex          1.5
-U+015d scircumflex          1.5
-U+015e Scedilla             original
-U+015f scedilla             original
-U+0160 Scaron               original
-U+0161 scaron               original
-U+0162 Tcommaaccent         1.5
-U+0163 tcommaaccent         1.5
-U+0164 Tcaron               1.0
-U+0165 tcaron               1.0
-U+0166 Tbar                 1.12
-U+0167 tbar                 1.12
-U+0168 Utilde               1.5
-U+0169 utilde               1.5
-U+016a Umacron              1.5
-U+016b umacron              1.5
-U+016c Ubreve               1.5
-U+016d ubreve               1.5
-U+016e Uring                1.0
-U+016f uring                1.0
-U+0170 Uhungarumlaut        1.5
-U+0171 uhungarumlaut        1.5
-U+0172 Uogonek              1.11
-U+0173 uogonek              1.11
-U+0174 Wcircumflex          1.2
-U+0175 wcircumflex          1.2
-U+0176 Ycircumflex          1.2
-U+0177 ycircumflex          1.2
-U+0178 Ydieresis            original
-U+0179 Zacute               1.4
-U+017a zacute               1.4
-U+017b Zdotaccent           1.4
-U+017c zdotaccent           1.4
-U+017d Zcaron               original
-U+017e zcaron               original
-U+017f longs                1.12
-U+0180 uni0180              2.1 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.12 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.22 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+0181 uni0181              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0182 uni0182              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0183 uni0183              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0184 uni0184              2.3
-U+0185 uni0185              2.3
-U+0186 uni0186              1.15
-U+0187 uni0187              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0188 uni0188              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0189 uni0189              2.1
-U+018a uni018A              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+018b uni018B              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+018c uni018C              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+018d uni018D              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+018e uni018E              2.1 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+018f uni018F              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0190 uni0190              1.15
-U+0191 uni0191              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0192 florin               original
-U+0193 uni0193              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0194 uni0194              1.14
-U+0195 uni0195              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.6 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0196 uni0196              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0197 uni0197              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0198 uni0198              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0199 uni0199              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+019a uni019A              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+019b uni019B              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+019c uni019C              2.3
-U+019d uni019D              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+019e uni019E              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+019f uni019F              2.3
-U+01a0 Ohorn                2.3
-U+01a1 ohorn                2.3
-U+01a2 uni01A2              2.3
-U+01a3 uni01A3              2.3
-U+01a4 uni01A4              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+01a5 uni01A5              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+01a6 uni01A6              2.3
-U+01a7 uni01A7              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+01a8 uni01A8              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+01a9 uni01A9              2.2
-U+01aa uni01AA              2.3
-U+01ab uni01AB              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+01ac uni01AC              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+01ad uni01AD              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+01ae uni01AE              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+01af Uhorn                2.3
-U+01b0 uhorn                2.3
-U+01b1 uni01B1              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+01b2 uni01B2              2.3
-U+01b3 uni01B3              2.3
-U+01b4 uni01B4              2.3
-U+01b5 uni01B5              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+01b6 uni01B6              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+01b7 uni01B7              2.3
-U+01b8 uni01B8              2.3
-U+01b9 uni01B9              2.3
-U+01ba uni01BA              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+01bb uni01BB              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+01bc uni01BC              2.3
-U+01bd uni01BD              2.3
-U+01be uni01BE              2.3
-U+01bf uni01BF              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+01c0 uni01C0              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+01c1 uni01C1              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+01c2 uni01C2              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+01c3 uni01C3              2.2
-U+01c4 uni01C4              1.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+01c5 uni01C5              1.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+01c6 uni01C6              1.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+01c7 uni01C7              1.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+01c8 uni01C8              1.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+01c9 uni01C9              1.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+01ca uni01CA              1.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+01cb uni01CB              1.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+01cc uni01CC              1.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+01cd uni01CD              1.15
-U+01ce uni01CE              1.15
-U+01cf uni01CF              1.15
-U+01d0 uni01D0              1.15
-U+01d1 uni01D1              1.15
-U+01d2 uni01D2              1.15
-U+01d3 uni01D3              1.15
-U+01d4 uni01D4              1.15
-U+01d5 uni01D5              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.22 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+01d6 uni01D6              1.13
-U+01d7 uni01D7              2.3
-U+01d8 uni01D8              2.3
-U+01d9 uni01D9              2.3
-U+01da uni01DA              2.3
-U+01db uni01DB              2.3
-U+01dc uni01DC              2.3
-U+01dd uni01DD              2.2
-U+01de uni01DE              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.22 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique) 2.23 (Serif Italic Condensed)
-U+01df uni01DF              1.13
-U+01e0 uni01E0              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.22 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+01e1 uni01E1              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.22 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+01e2 uni01E2              1.5
-U+01e3 uni01E3              1.5
-U+01e4 uni01E4              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans ExtraLight)
-U+01e5 uni01E5              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans ExtraLight)
-U+01e6 Gcaron               2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.13 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+01e7 gcaron               2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.13 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+01e8 uni01E8              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.13 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+01e9 uni01E9              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.13 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+01ea uni01EA              1.9
-U+01eb uni01EB              1.9
-U+01ec uni01EC              1.9
-U+01ed uni01ED              1.9
-U+01ee uni01EE              2.4 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.13 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+01ef uni01EF              2.4 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.13 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+01f0 uni01F0              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.13 (Sans Mono) 2.22 (Sans Mono Bold) 2.23 (Serif Italic Condensed)
-U+01f1 uni01F1              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+01f2 uni01F2              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+01f3 uni01F3              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+01f4 uni01F4              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.13 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+01f5 uni01F5              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.13 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+01f6 uni01F6              2.3
-U+01f7 uni01F7              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+01f8 uni01F8              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+01f9 uni01F9              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+01fa Aringacute           2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+01fb aringacute           2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+01fc AEacute              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.13 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+01fd aeacute              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.13 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+01fe Oslashacute          2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.13 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+01ff oslashacute          2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.13 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+0200 uni0200              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+0201 uni0201              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+0202 uni0202              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+0203 uni0203              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+0204 uni0204              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+0205 uni0205              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+0206 uni0206              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+0207 uni0207              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+0208 uni0208              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+0209 uni0209              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+020a uni020A              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+020b uni020B              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+020c uni020C              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+020d uni020D              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+020e uni020E              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+020f uni020F              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+0210 uni0210              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+0211 uni0211              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+0212 uni0212              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+0213 uni0213              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+0214 uni0214              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+0215 uni0215              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+0216 uni0216              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+0217 uni0217              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+0218 Scommaaccent         1.5
-U+0219 scommaaccent         1.5
-U+021a uni021A              1.5
-U+021b uni021B              1.5
-U+021c uni021C              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.27 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed) 2.28 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+021d uni021D              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.27 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed) 2.28 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+021e uni021E              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.13 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+021f uni021F              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.13 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+0220 uni0220              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.16 (Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.17 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.18 (Sans Mono, Sans Mono Bold) 2.23 (Serif Italic Condensed)
-U+0221 uni0221              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+0222 uni0222              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0223 uni0223              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0224 uni0224              2.3
-U+0225 uni0225              2.3
-U+0226 uni0226              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+0227 uni0227              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+0228 uni0228              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+0229 uni0229              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+022a uni022A              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.22 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+022b uni022B              1.13
-U+022c uni022C              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.22 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+022d uni022D              1.13
-U+022e uni022E              1.10
-U+022f uni022F              1.10
-U+0230 uni0230              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.22 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+0231 uni0231              1.13
-U+0232 uni0232              1.5
-U+0233 uni0233              1.5
-U+0234 uni0234              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+0235 uni0235              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+0236 uni0236              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+0237 dotlessj             1.5
-U+0238 uni0238              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.10 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0239 uni0239              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.10 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+023a uni023A              2.3
-U+023b uni023B              2.3
-U+023c uni023C              2.3
-U+023d uni023D              2.3
-U+023e uni023E              2.3
-U+023f uni023F              2.3
-U+0240 uni0240              2.3
-U+0241 uni0241              2.3
-U+0242 uni0242              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+0243 uni0243              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0244 uni0244              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.27 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0245 uni0245              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans ExtraLight, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.11 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.13 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+0246 uni0246              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0247 uni0247              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0248 uni0248              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans ExtraLight)
-U+0249 uni0249              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans ExtraLight)
-U+024a uni024A              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+024b uni024B              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.26 (Sans ExtraLight)
-U+024c uni024C              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans ExtraLight) 2.27 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+024d uni024D              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans ExtraLight) 2.27 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+024e uni024E              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+024f uni024F              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+0250 uni0250              1.14
-U+0251 uni0251              1.14
-U+0252 uni0252              1.14
-U+0253 uni0253              1.14
-U+0254 uni0254              1.14
-U+0255 uni0255              1.14
-U+0256 uni0256              1.14
-U+0257 uni0257              1.14
-U+0258 uni0258              1.14
-U+0259 uni0259              1.14
-U+025a uni025A              1.14
-U+025b uni025B              1.14
-U+025c uni025C              1.14
-U+025d uni025D              1.14
-U+025e uni025E              1.14
-U+025f uni025F              1.14
-U+0260 uni0260              1.14
-U+0261 uni0261              1.14
-U+0262 uni0262              1.14
-U+0263 uni0263              1.14
-U+0264 uni0264              1.14
-U+0265 uni0265              1.14
-U+0266 uni0266              1.14
-U+0267 uni0267              1.14
-U+0268 uni0268              1.14
-U+0269 uni0269              1.14
-U+026a uni026A              1.14
-U+026b uni026B              1.14
-U+026c uni026C              1.14
-U+026d uni026D              1.14
-U+026e uni026E              1.14
-U+026f uni026F              1.14
-U+0270 uni0270              1.14
-U+0271 uni0271              1.14
-U+0272 uni0272              1.14
-U+0273 uni0273              1.14
-U+0274 uni0274              1.14
-U+0275 uni0275              1.14
-U+0276 uni0276              1.14
-U+0277 uni0277              1.14
-U+0278 uni0278              1.14
-U+0279 uni0279              1.14
-U+027a uni027A              1.14
-U+027b uni027B              1.14
-U+027c uni027C              1.14
-U+027d uni027D              1.14
-U+027e uni027E              1.14
-U+027f uni027F              1.14
-U+0280 uni0280              1.14
-U+0281 uni0281              1.14
-U+0282 uni0282              1.14
-U+0283 uni0283              1.14
-U+0284 uni0284              1.14
-U+0285 uni0285              1.14
-U+0286 uni0286              1.14
-U+0287 uni0287              1.14
-U+0288 uni0288              1.14
-U+0289 uni0289              1.14
-U+028a uni028A              1.14
-U+028b uni028B              1.14
-U+028c uni028C              1.14
-U+028d uni028D              1.14
-U+028e uni028E              1.14
-U+028f uni028F              1.14
-U+0290 uni0290              1.14
-U+0291 uni0291              1.14
-U+0292 uni0292              1.14
-U+0293 uni0293              1.14
-U+0294 uni0294              1.14
-U+0295 uni0295              1.14
-U+0296 uni0296              1.14
-U+0297 uni0297              1.14
-U+0298 uni0298              1.14
-U+0299 uni0299              1.14
-U+029a uni029A              1.14
-U+029b uni029B              1.14
-U+029c uni029C              1.14
-U+029d uni029D              1.14
-U+029e uni029E              1.14
-U+029f uni029F              1.14
-U+02a0 uni02A0              1.14
-U+02a1 uni02A1              1.14
-U+02a2 uni02A2              1.14
-U+02a3 uni02A3              1.14
-U+02a4 uni02A4              1.14
-U+02a5 uni02A5              1.14
-U+02a6 uni02A6              1.14
-U+02a7 uni02A7              1.14
-U+02a8 uni02A8              1.14
-U+02a9 uni02A9              1.14
-U+02aa uni02AA              1.14
-U+02ab uni02AB              1.14
-U+02ac uni02AC              1.14
-U+02ad uni02AD              1.14
-U+02ae uni02AE              1.14
-U+02af uni02AF              1.14
-U+02b0 uni02B0              1.14
-U+02b1 uni02B1              1.14
-U+02b2 uni02B2              1.14
-U+02b3 uni02B3              1.14
-U+02b4 uni02B4              1.14
-U+02b5 uni02B5              1.14
-U+02b6 uni02B6              1.14
-U+02b7 uni02B7              1.14
-U+02b8 uni02B8              1.14
-U+02b9 uni02B9              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.13 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+02ba uni02BA              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+02bb uni02BB              1.5
-U+02bc uni02BC              1.12
-U+02bd uni02BD              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.13 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+02be uni02BE              2.2
-U+02bf uni02BF              2.2
-U+02c0 uni02C0              1.14
-U+02c1 uni02C1              1.14
-U+02c2 uni02C2              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+02c3 uni02C3              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+02c4 uni02C4              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+02c5 uni02C5              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+02c6 circumflex           original
-U+02c7 caron                original
-U+02c8 uni02C8              2.0
-U+02c9 uni02C9              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.13 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+02ca uni02CA              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+02cb uni02CB              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+02cc uni02CC              2.0
-U+02cd uni02CD              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+02ce uni02CE              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+02cf uni02CF              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+02d0 uni02D0              1.14
-U+02d1 uni02D1              1.14
-U+02d2 uni02D2              2.0
-U+02d3 uni02D3              2.2
-U+02d4 uni02D4              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+02d5 uni02D5              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+02d6 uni02D6              2.0
-U+02d7 uni02D7              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.28 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+02d8 breve                original
-U+02d9 dotaccent            original
-U+02da ring                 original
-U+02db ogonek               original
-U+02dc tilde                original
-U+02dd hungarumlaut         original
-U+02de uni02DE              2.0
-U+02df uni02DF              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+02e0 uni02E0              1.14
-U+02e1 uni02E1              1.14
-U+02e2 uni02E2              1.14
-U+02e3 uni02E3              1.14
-U+02e4 uni02E4              1.14
-U+02e5 uni02E5              2.0
-U+02e6 uni02E6              2.0
-U+02e7 uni02E7              2.0
-U+02e8 uni02E8              2.0
-U+02e9 uni02E9              2.0
-U+02ec uni02EC              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+02ed uni02ED              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+02ee uni02EE              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.28 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+02f3 uni02F3              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+02f7 uni02F7              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+0300 gravecomb            1.15
-U+0301 acutecomb            1.15
-U+0302 uni0302              1.15
-U+0303 tildecomb            1.15
-U+0304 uni0304              1.15
-U+0305 uni0305              2.0
-U+0306 uni0306              1.15
-U+0307 uni0307              1.15
-U+0308 uni0308              1.15
-U+0309 hookabovecomb        2.1
-U+030a uni030A              1.15
-U+030b uni030B              1.15
-U+030c uni030C              1.15
-U+030d uni030D              2.0
-U+030e uni030E              2.0
-U+030f uni030F              2.0
-U+0310 uni0310              2.0
-U+0311 uni0311              2.0
-U+0312 uni0312              1.11
-U+0313 uni0313              2.1
-U+0314 uni0314              2.1
-U+0315 uni0315              2.0
-U+0316 uni0316              2.0
-U+0317 uni0317              2.0
-U+0318 uni0318              2.0
-U+0319 uni0319              2.0
-U+031a uni031A              2.1
-U+031b uni031B              2.1
-U+031c uni031C              2.0
-U+031d uni031D              2.0
-U+031e uni031E              2.0
-U+031f uni031F              2.0
-U+0320 uni0320              2.0
-U+0321 uni0321              1.15
-U+0322 uni0322              1.15
-U+0323 dotbelowcomb         2.1
-U+0324 uni0324              2.0
-U+0325 uni0325              2.0
-U+0326 uni0326              1.5
-U+0327 uni0327              2.1
-U+0328 uni0328              2.1
-U+0329 uni0329              2.0
-U+032a uni032A              2.0
-U+032b uni032B              2.1
-U+032c uni032C              2.0
-U+032d uni032D              2.0
-U+032e uni032E              2.0
-U+032f uni032F              2.0
-U+0330 uni0330              2.0
-U+0331 uni0331              2.0
-U+0332 uni0332              2.0
-U+0333 uni0333              2.1
-U+0334 uni0334              2.3
-U+0335 uni0335              2.3
-U+0336 uni0336              2.3
-U+0337 uni0337              2.3
-U+0338 uni0338              2.3
-U+0339 uni0339              2.0
-U+033a uni033A              2.0
-U+033b uni033B              2.0
-U+033c uni033C              2.1
-U+033d uni033D              2.0
-U+033e uni033E              2.1
-U+033f uni033F              2.1
-U+0340 uni0340              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0341 uni0341              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0342 uni0342              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0343 uni0343              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.13 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+0344 uni0344              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0345 uni0345              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0346 uni0346              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0347 uni0347              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0348 uni0348              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0349 uni0349              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+034a uni034A              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+034b uni034B              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+034c uni034C              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+034d uni034D              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+034e uni034E              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+034f uni034F              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+0351 uni0351              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0352 uni0352              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique) 2.28 (Sans Condensed Oblique, Sans Oblique)
-U+0353 uni0353              2.5 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.28 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0357 uni0357              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0358 uni0358              2.3
-U+035a uni035A              2.28 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+035c uni035C              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+035d uni035D              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+035e uni035E              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+035f uni035F              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0360 uni0360              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0361 uni0361              2.0
-U+0362 uni0362              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0370 uni0370              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.27 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+0371 uni0371              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.27 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+0372 uni0372              2.27 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+0373 uni0373              2.27 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+0374 uni0374              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0375 uni0375              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0376 uni0376              2.27 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+0377 uni0377              2.27 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+037a uni037A              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+037b uni037B              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans ExtraLight) 2.27 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+037c uni037C              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans ExtraLight, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.27 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+037d uni037D              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans ExtraLight, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.27 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+037e uni037E              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0384 tonos                1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0385 dieresistonos        1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0386 Alphatonos           1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0387 anoteleia            1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0388 Epsilontonos         1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0389 Etatonos             1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+038a Iotatonos            1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+038c Omicrontonos         1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+038e Upsilontonos         1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+038f Omegatonos           1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0390 iotadieresistonos    1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0391 Alpha                1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.1 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0392 Beta                 1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.1 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0393 Gamma                1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.1 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0394 uni0394              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.1 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0395 Epsilon              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.1 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0396 Zeta                 1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.1 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0397 Eta                  1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.1 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0398 Theta                1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.1 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0399 Iota                 1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.1 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+039a Kappa                1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.1 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+039b Lambda               1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.1 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+039c Mu                   1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.1 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+039d Nu                   1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.1 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+039e Xi                   1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.1 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+039f Omicron              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.1 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03a0 Pi                   1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.1 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03a1 Rho                  1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.1 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03a3 Sigma                1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.1 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03a4 Tau                  1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.1 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03a5 Upsilon              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.1 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03a6 Phi                  1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.1 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03a7 Chi                  1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.1 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03a8 Psi                  1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.1 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03a9 Omega                original
-U+03aa Iotadieresis         1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.1 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03ab Upsilondieresis      1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.1 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03ac alphatonos           1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03ad epsilontonos         1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03ae etatonos             1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03af iotatonos            1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03b0 upsilondieresistonos 1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03b1 alpha                1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03b2 beta                 1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03b3 gamma                1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03b4 delta                1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03b5 epsilon              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03b6 zeta                 1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03b7 eta                  1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03b8 theta                1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03b9 iota                 1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03ba kappa                1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03bb lambda               1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03bc uni03BC              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03bd nu                   1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03be xi                   1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03bf omicron              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03c0 pi                   original
-U+03c1 rho                  1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03c2 sigma1               1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03c3 sigma                1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03c4 tau                  1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03c5 upsilon              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03c6 phi                  1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03c7 chi                  1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03c8 psi                  1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03c9 omega                1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03ca iotadieresis         1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03cb upsilondieresis      1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03cc omicrontonos         1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03cd upsilontonos         1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03ce omegatonos           1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03cf uni03CF              2.27 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+03d0 uni03D0              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+03d1 theta1               1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+03d2 Upsilon1             1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+03d3 uni03D3              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+03d4 uni03D4              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+03d5 phi1                 1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.18 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03d6 omega1               1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed) 2.26 (Sans ExtraLight)
-U+03d7 uni03D7              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+03d8 uni03D8              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed) 2.26 (Sans ExtraLight)
-U+03d9 uni03D9              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed) 2.26 (Sans ExtraLight)
-U+03da uni03DA              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+03db uni03DB              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+03dc uni03DC              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03dd uni03DD              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+03de uni03DE              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+03df uni03DF              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+03e0 uni03E0              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+03e1 uni03E1              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+03e2 uni03E2              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+03e3 uni03E3              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+03e4 uni03E4              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+03e5 uni03E5              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+03e6 uni03E6              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+03e7 uni03E7              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+03e8 uni03E8              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+03e9 uni03E9              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+03ea uni03EA              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+03eb uni03EB              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+03ec uni03EC              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+03ed uni03ED              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+03ee uni03EE              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+03ef uni03EF              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+03f0 uni03F0              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+03f1 uni03F1              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed) 2.26 (Sans ExtraLight)
-U+03f2 uni03F2              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03f3 uni03F3              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03f4 uni03F4              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03f5 uni03F5              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03f6 uni03F6              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03f7 uni03F7              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03f8 uni03F8              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03f9 uni03F9              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03fa uni03FA              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+03fb uni03FB              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+03fc uni03FC              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed) 2.26 (Sans ExtraLight)
-U+03fd uni03FD              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03fe uni03FE              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03ff uni03FF              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0400 uni0400              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0401 uni0401              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0402 uni0402              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0403 uni0403              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0404 uni0404              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0405 uni0405              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0406 uni0406              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0407 uni0407              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0408 uni0408              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0409 uni0409              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+040a uni040A              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+040b uni040B              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+040c uni040C              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+040d uni040D              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+040e uni040E              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+040f uni040F              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0410 uni0410              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0411 uni0411              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0412 uni0412              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0413 uni0413              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0414 uni0414              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0415 uni0415              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0416 uni0416              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0417 uni0417              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0418 uni0418              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0419 uni0419              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+041a uni041A              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+041b uni041B              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+041c uni041C              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+041d uni041D              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+041e uni041E              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+041f uni041F              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0420 uni0420              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0421 uni0421              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0422 uni0422              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0423 uni0423              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0424 uni0424              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0425 uni0425              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0426 uni0426              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0427 uni0427              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0428 uni0428              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0429 uni0429              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+042a uni042A              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+042b uni042B              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+042c uni042C              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+042d uni042D              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+042e uni042E              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+042f uni042F              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0430 uni0430              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0431 uni0431              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0432 uni0432              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0433 uni0433              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0434 uni0434              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0435 uni0435              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0436 uni0436              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0437 uni0437              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0438 uni0438              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0439 uni0439              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+043a uni043A              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+043b uni043B              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+043c uni043C              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+043d uni043D              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+043e uni043E              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+043f uni043F              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0440 uni0440              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0441 uni0441              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0442 uni0442              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0443 uni0443              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0444 uni0444              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0445 uni0445              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0446 uni0446              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0447 uni0447              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0448 uni0448              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0449 uni0449              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+044a uni044A              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+044b uni044B              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+044c uni044C              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+044d uni044D              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+044e uni044E              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+044f uni044F              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0450 uni0450              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0451 uni0451              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0452 uni0452              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0453 uni0453              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0454 uni0454              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0455 uni0455              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0456 uni0456              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0457 uni0457              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0458 uni0458              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0459 uni0459              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+045a uni045A              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+045b uni045B              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+045c uni045C              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+045d uni045D              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+045e uni045E              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+045f uni045F              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0460 uni0460              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0461 uni0461              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans ExtraLight)
-U+0462 uni0462              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.20 (Sans ExtraLight) 2.23 (Serif Italic Condensed) 2.30 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0463 uni0463              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.20 (Sans ExtraLight) 2.23 (Serif Italic Condensed) 2.30 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0464 uni0464              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+0465 uni0465              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+0466 uni0466              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0467 uni0467              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0468 uni0468              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0469 uni0469              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+046a uni046A              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.21 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+046b uni046B              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.21 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+046c uni046C              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+046d uni046D              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+046e uni046E              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+046f uni046F              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0470 uni0470              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans ExtraLight) 2.27 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+0471 uni0471              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans ExtraLight) 2.27 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+0472 uni0472              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.10 (Sans ExtraLight) 2.23 (Serif Italic Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0473 uni0473              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0474 uni0474              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.12 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+0475 uni0475              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.12 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+0476 uni0476              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0477 uni0477              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0478 uni0478              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0479 uni0479              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+047a uni047A              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+047b uni047B              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+047c uni047C              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+047d uni047D              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+047e uni047E              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+047f uni047F              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0480 uni0480              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0481 uni0481              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0482 uni0482              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0483 uni0483              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0484 uni0484              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0485 uni0485              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0486 uni0486              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0487 uni0487              2.9 (Sans, Sans Condensed) 2.27 (Sans Bold, Sans Bold Oblique, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0488 uni0488              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0489 uni0489              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+048a uni048A              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+048b uni048B              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+048c uni048C              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+048d uni048D              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+048e uni048E              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+048f uni048F              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0490 uni0490              1.15
-U+0491 uni0491              1.15
-U+0492 uni0492              1.14
-U+0493 uni0493              1.14
-U+0494 uni0494              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+0495 uni0495              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+0496 uni0496              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0497 uni0497              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0498 uni0498              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+0499 uni0499              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+049a uni049A              1.14
-U+049b uni049B              1.14
-U+049c uni049C              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+049d uni049D              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+049e uni049E              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+049f uni049F              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04a0 uni04A0              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans ExtraLight)
-U+04a1 uni04A1              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans ExtraLight)
-U+04a2 uni04A2              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04a3 uni04A3              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04a4 uni04A4              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.10 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+04a5 uni04A5              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.10 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+04a6 uni04A6              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04a7 uni04A7              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04a8 uni04A8              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+04a9 uni04A9              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+04aa uni04AA              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04ab uni04AB              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04ac uni04AC              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04ad uni04AD              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04ae uni04AE              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04af uni04AF              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04b0 uni04B0              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+04b1 uni04B1              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+04b2 uni04B2              1.14
-U+04b3 uni04B3              1.14
-U+04b4 uni04B4              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.10 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+04b5 uni04B5              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.10 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+04b6 uni04B6              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04b7 uni04B7              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04b8 uni04B8              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+04b9 uni04B9              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+04ba uni04BA              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+04bb uni04BB              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04bc uni04BC              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+04bd uni04BD              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+04be uni04BE              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+04bf uni04BF              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+04c0 uni04C0              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04c1 uni04C1              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+04c2 uni04C2              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+04c3 uni04C3              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+04c4 uni04C4              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+04c5 uni04C5              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+04c6 uni04C6              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+04c7 uni04C7              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed) 2.26 (Sans ExtraLight)
-U+04c8 uni04C8              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed) 2.26 (Sans ExtraLight)
-U+04c9 uni04C9              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+04ca uni04CA              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+04cb uni04CB              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04cc uni04CC              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04cd uni04CD              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+04ce uni04CE              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+04cf uni04CF              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04d0 uni04D0              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+04d1 uni04D1              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+04d2 uni04D2              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+04d3 uni04D3              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+04d4 uni04D4              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+04d5 uni04D5              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+04d6 uni04D6              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+04d7 uni04D7              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+04d8 uni04D8              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04d9 uni04D9              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04da uni04DA              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04db uni04DB              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04dc uni04DC              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+04dd uni04DD              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+04de uni04DE              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04df uni04DF              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04e0 uni04E0              2.3
-U+04e1 uni04E1              2.3
-U+04e2 uni04E2              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04e3 uni04E3              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04e4 uni04E4              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04e5 uni04E5              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04e6 uni04E6              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+04e7 uni04E7              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+04e8 uni04E8              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+04e9 uni04E9              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+04ea uni04EA              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+04eb uni04EB              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+04ec uni04EC              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+04ed uni04ED              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+04ee uni04EE              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+04ef uni04EF              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04f0 uni04F0              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+04f1 uni04F1              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04f2 uni04F2              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+04f3 uni04F3              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04f4 uni04F4              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+04f5 uni04F5              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+04f6 uni04F6              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04f7 uni04F7              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04f8 uni04F8              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04f9 uni04F9              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+04fa uni04FA              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+04fb uni04FB              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+04fc uni04FC              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+04fd uni04FD              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+04fe uni04FE              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans ExtraLight)
-U+04ff uni04FF              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans ExtraLight)
-U+0500 uni0500              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans ExtraLight)
-U+0501 uni0501              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans ExtraLight)
-U+0502 uni0502              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0503 uni0503              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0504 uni0504              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0505 uni0505              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0506 uni0506              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0507 uni0507              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0508 uni0508              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0509 uni0509              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+050a uni050A              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+050b uni050B              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+050c uni050C              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+050d uni050D              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+050e uni050E              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+050f uni050F              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0510 uni0510              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.27 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+0511 uni0511              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.27 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+0512 uni0512              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans ExtraLight) 2.27 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+0513 uni0513              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans ExtraLight) 2.27 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+0514 uni0514              2.27 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+0515 uni0515              2.27 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+0516 uni0516              2.27 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0517 uni0517              2.27 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0518 uni0518              2.27 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0519 uni0519              2.27 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+051a uni051A              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique) 2.27 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+051b uni051B              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique) 2.27 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+051c uni051C              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique) 2.27 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+051d uni051D              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique) 2.27 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+0520 uni0520              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0521 uni0521              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0522 uni0522              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0523 uni0523              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0524 uni0524              2.29 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0525 uni0525              2.29 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0531 uni0531              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0532 uni0532              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0533 uni0533              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0534 uni0534              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0535 uni0535              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0536 uni0536              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0537 uni0537              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0538 uni0538              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0539 uni0539              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+053a uni053A              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+053b uni053B              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+053c uni053C              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+053d uni053D              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+053e uni053E              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+053f uni053F              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0540 uni0540              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0541 uni0541              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0542 uni0542              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0543 uni0543              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0544 uni0544              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0545 uni0545              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0546 uni0546              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0547 uni0547              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0548 uni0548              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+0549 uni0549              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+054a uni054A              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+054b uni054B              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+054c uni054C              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+054d uni054D              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight)
-U+054e uni054E              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+054f uni054F              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight)
-U+0550 uni0550              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans ExtraLight)
-U+0551 uni0551              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0552 uni0552              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0553 uni0553              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+0554 uni0554              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0555 uni0555              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight)
-U+0556 uni0556              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0559 uni0559              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+055a uni055A              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight)
-U+055b uni055B              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+055c uni055C              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+055d uni055D              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight)
-U+055e uni055E              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+055f uni055F              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0561 uni0561              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+0562 uni0562              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans ExtraLight)
-U+0563 uni0563              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans ExtraLight)
-U+0564 uni0564              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans ExtraLight)
-U+0565 uni0565              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans ExtraLight)
-U+0566 uni0566              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans ExtraLight)
-U+0567 uni0567              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0568 uni0568              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans ExtraLight)
-U+0569 uni0569              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+056a uni056A              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+056b uni056B              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+056c uni056C              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans ExtraLight)
-U+056d uni056D              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans ExtraLight)
-U+056e uni056E              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+056f uni056F              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans ExtraLight)
-U+0570 uni0570              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight)
-U+0571 uni0571              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0572 uni0572              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans ExtraLight)
-U+0573 uni0573              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0574 uni0574              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0575 uni0575              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight)
-U+0576 uni0576              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0577 uni0577              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0578 uni0578              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight)
-U+0579 uni0579              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+057a uni057A              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+057b uni057B              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+057c uni057C              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans ExtraLight)
-U+057d uni057D              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight)
-U+057e uni057E              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans ExtraLight)
-U+057f uni057F              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans ExtraLight)
-U+0580 uni0580              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight)
-U+0581 uni0581              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight)
-U+0582 uni0582              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans ExtraLight)
-U+0583 uni0583              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans ExtraLight)
-U+0584 uni0584              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0585 uni0585              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight)
-U+0586 uni0586              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0587 uni0587              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans ExtraLight)
-U+0589 uni0589              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight)
-U+058a uni058A              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05b0 uni05B0              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05b1 uni05B1              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05b2 uni05B2              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05b3 uni05B3              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05b4 uni05B4              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05b5 uni05B5              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05b6 uni05B6              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05b7 uni05B7              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05b8 uni05B8              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05b9 uni05B9              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05ba uni05BA              2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+05bb uni05BB              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05bc uni05BC              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05bd uni05BD              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05be uni05BE              2.9 (Sans Condensed Oblique, Sans Oblique) 2.16 (Sans, Sans Bold, Sans Bold Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique)
-U+05bf uni05BF              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05c0 uni05C0              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05c1 uni05C1              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05c2 uni05C2              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05c3 uni05C3              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05c6 uni05C6              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05c7 uni05C7              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05d0 uni05D0              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05d1 uni05D1              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05d2 uni05D2              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05d3 uni05D3              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05d4 uni05D4              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05d5 uni05D5              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05d6 uni05D6              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05d7 uni05D7              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05d8 uni05D8              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05d9 uni05D9              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05da uni05DA              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05db uni05DB              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05dc uni05DC              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05dd uni05DD              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05de uni05DE              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05df uni05DF              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05e0 uni05E0              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05e1 uni05E1              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05e2 uni05E2              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05e3 uni05E3              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05e4 uni05E4              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05e5 uni05E5              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05e6 uni05E6              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05e7 uni05E7              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05e8 uni05E8              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05e9 uni05E9              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05ea uni05EA              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05f0 uni05F0              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05f1 uni05F1              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05f2 uni05F2              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05f3 uni05F3              2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+05f4 uni05F4              2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+0606 uni0606              2.26 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold)
-U+0607 uni0607              2.26 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold)
-U+0609 uni0609              2.26 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold)
-U+060a uni060A              2.26 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold)
-U+060c uni060C              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0615 uni0615              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+061b uni061B              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+061f uni061F              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0621 uni0621              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0622 uni0622              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0623 uni0623              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0624 uni0624              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0625 uni0625              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0626 uni0626              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0627 uni0627              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0628 uni0628              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0629 uni0629              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+062a uni062A              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+062b uni062B              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+062c uni062C              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+062d uni062D              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+062e uni062E              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+062f uni062F              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0630 uni0630              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0631 uni0631              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0632 uni0632              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0633 uni0633              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0634 uni0634              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0635 uni0635              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0636 uni0636              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0637 uni0637              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0638 uni0638              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0639 uni0639              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+063a uni063A              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0640 uni0640              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0641 uni0641              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0642 uni0642              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0643 uni0643              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0644 uni0644              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0645 uni0645              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0646 uni0646              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0647 uni0647              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0648 uni0648              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0649 uni0649              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+064a uni064A              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+064b uni064B              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+064c uni064C              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+064d uni064D              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+064e uni064E              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+064f uni064F              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0650 uni0650              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0651 uni0651              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0652 uni0652              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0653 uni0653              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0654 uni0654              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0655 uni0655              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+065a uni065A              2.7 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0660 uni0660              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0661 uni0661              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0662 uni0662              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0663 uni0663              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0664 uni0664              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0665 uni0665              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0666 uni0666              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0667 uni0667              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0668 uni0668              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0669 uni0669              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+066a uni066A              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+066b uni066B              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+066c uni066C              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+066d uni066D              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+066e uni066E              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+066f uni066F              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0674 uni0674              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans ExtraLight) 2.16 (Sans Mono, Sans Mono Bold)
-U+0679 uni0679              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+067a uni067A              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+067b uni067B              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+067c uni067C              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+067d uni067D              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+067e uni067E              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+067f uni067F              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0680 uni0680              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0681 uni0681              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0682 uni0682              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0683 uni0683              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0684 uni0684              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0685 uni0685              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0686 uni0686              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0687 uni0687              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0691 uni0691              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0692 uni0692              2.7 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0695 uni0695              2.7 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+0698 uni0698              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+06a1 uni06A1              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+06a4 uni06A4              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+06a6 uni06A6              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+06a9 uni06A9              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+06af uni06AF              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+06b5 uni06B5              2.7 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+06ba uni06BA              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+06be uni06BE              2.16 (Sans Mono, Sans Mono Bold)
-U+06bf uni06BF              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+06c6 uni06C6              2.7 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+06cc uni06CC              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+06ce uni06CE              2.7 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+06d5 uni06D5              2.10 (Sans, Sans Bold) 2.11 (Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+06f0 uni06F0              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+06f1 uni06F1              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+06f2 uni06F2              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+06f3 uni06F3              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+06f4 uni06F4              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+06f5 uni06F5              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+06f6 uni06F6              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+06f7 uni06F7              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+06f8 uni06F8              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+06f9 uni06F9              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+07c0 uni07C0              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07c1 uni07C1              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07c2 uni07C2              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07c3 uni07C3              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07c4 uni07C4              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07c5 uni07C5              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07c6 uni07C6              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07c7 uni07C7              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07c8 uni07C8              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07c9 uni07C9              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07ca uni07CA              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07cb uni07CB              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07cc uni07CC              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07cd uni07CD              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07ce uni07CE              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07cf uni07CF              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07d0 uni07D0              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07d1 uni07D1              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07d2 uni07D2              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07d3 uni07D3              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07d4 uni07D4              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07d5 uni07D5              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07d6 uni07D6              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07d7 uni07D7              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07d8 uni07D8              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07d9 uni07D9              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07da uni07DA              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07db uni07DB              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07dc uni07DC              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07dd uni07DD              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07de uni07DE              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07df uni07DF              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07e0 uni07E0              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07e1 uni07E1              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07e2 uni07E2              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07e3 uni07E3              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07e4 uni07E4              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07e5 uni07E5              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07e6 uni07E6              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07e7 uni07E7              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07eb uni07EB              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07ec uni07EC              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07ed uni07ED              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07ee uni07EE              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07ef uni07EF              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07f0 uni07F0              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07f1 uni07F1              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07f2 uni07F2              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07f3 uni07F3              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07f4 uni07F4              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07f5 uni07F5              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07f8 uni07F8              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07f9 uni07F9              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07fa uni07FA              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+0e3f uni0E3F              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+0e81 uni0E81              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0e82 uni0E82              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0e84 uni0E84              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0e87 uni0E87              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0e88 uni0E88              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0e8a uni0E8A              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0e8d uni0E8D              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0e94 uni0E94              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0e95 uni0E95              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0e96 uni0E96              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0e97 uni0E97              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0e99 uni0E99              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0e9a uni0E9A              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0e9b uni0E9B              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0e9c uni0E9C              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0e9d uni0E9D              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0e9e uni0E9E              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0e9f uni0E9F              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0ea1 uni0EA1              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0ea2 uni0EA2              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0ea3 uni0EA3              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0ea5 uni0EA5              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0ea7 uni0EA7              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0eaa uni0EAA              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0eab uni0EAB              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0ead uni0EAD              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0eae uni0EAE              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0eaf uni0EAF              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0eb0 uni0EB0              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.18 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0eb1 uni0EB1              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.18 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0eb2 uni0EB2              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.18 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0eb3 uni0EB3              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.18 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0eb4 uni0EB4              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.18 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0eb5 uni0EB5              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.18 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0eb6 uni0EB6              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.18 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0eb7 uni0EB7              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.18 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0eb8 uni0EB8              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.18 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0eb9 uni0EB9              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.18 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0ebb uni0EBB              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.18 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0ebc uni0EBC              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.18 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0ebd uni0EBD              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+0ec0 uni0EC0              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+0ec1 uni0EC1              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+0ec2 uni0EC2              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+0ec3 uni0EC3              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+0ec4 uni0EC4              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+0ec6 uni0EC6              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+0ec8 uni0EC8              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.18 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0ec9 uni0EC9              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.18 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0eca uni0ECA              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.18 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0ecb uni0ECB              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.18 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0ecc uni0ECC              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.18 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0ecd uni0ECD              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.18 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0ed0 uni0ED0              2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+0ed1 uni0ED1              2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+0ed2 uni0ED2              2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+0ed3 uni0ED3              2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+0ed4 uni0ED4              2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+0ed5 uni0ED5              2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+0ed6 uni0ED6              2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+0ed7 uni0ED7              2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+0ed8 uni0ED8              2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0ed9 uni0ED9              2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+0edc uni0EDC              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+0edd uni0EDD              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+10a0 uni10A0              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10a1 uni10A1              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10a2 uni10A2              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10a3 uni10A3              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10a4 uni10A4              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10a5 uni10A5              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10a6 uni10A6              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10a7 uni10A7              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10a8 uni10A8              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10a9 uni10A9              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10aa uni10AA              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10ab uni10AB              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10ac uni10AC              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10ad uni10AD              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10ae uni10AE              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10af uni10AF              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10b0 uni10B0              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10b1 uni10B1              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10b2 uni10B2              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10b3 uni10B3              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10b4 uni10B4              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10b5 uni10B5              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10b6 uni10B6              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10b7 uni10B7              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10b8 uni10B8              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10b9 uni10B9              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10ba uni10BA              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10bb uni10BB              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10bc uni10BC              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10bd uni10BD              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10be uni10BE              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10bf uni10BF              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10c0 uni10C0              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10c1 uni10C1              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10c2 uni10C2              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10c3 uni10C3              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10c4 uni10C4              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10c5 uni10C5              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10d0 uni10D0              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10d1 uni10D1              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10d2 uni10D2              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10d3 uni10D3              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10d4 uni10D4              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10d5 uni10D5              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10d6 uni10D6              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10d7 uni10D7              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10d8 uni10D8              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10d9 uni10D9              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10da uni10DA              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10db uni10DB              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10dc uni10DC              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10dd uni10DD              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10de uni10DE              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10df uni10DF              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10e0 uni10E0              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10e1 uni10E1              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10e2 uni10E2              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10e3 uni10E3              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10e4 uni10E4              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10e5 uni10E5              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10e6 uni10E6              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10e7 uni10E7              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10e8 uni10E8              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10e9 uni10E9              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10ea uni10EA              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10eb uni10EB              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10ec uni10EC              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10ed uni10ED              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10ee uni10EE              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10ef uni10EF              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10f0 uni10F0              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10f1 uni10F1              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10f2 uni10F2              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10f3 uni10F3              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10f4 uni10F4              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10f5 uni10F5              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10f6 uni10F6              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10f7 uni10F7              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10f8 uni10F8              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10f9 uni10F9              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10fa uni10FA              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10fb uni10FB              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10fc uni10FC              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+1401 uni1401              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1402 uni1402              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1403 uni1403              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1404 uni1404              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1405 uni1405              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1406 uni1406              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1407 uni1407              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1409 uni1409              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+140a uni140A              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+140b uni140B              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+140c uni140C              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+140d uni140D              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+140e uni140E              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+140f uni140F              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1410 uni1410              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1411 uni1411              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1412 uni1412              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1413 uni1413              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1414 uni1414              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1415 uni1415              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1416 uni1416              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1417 uni1417              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1418 uni1418              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1419 uni1419              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+141a uni141A              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+141b uni141B              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+141d uni141D              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+141e uni141E              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+141f uni141F              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1420 uni1420              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1421 uni1421              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1422 uni1422              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1423 uni1423              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1424 uni1424              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1425 uni1425              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1426 uni1426              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1427 uni1427              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1428 uni1428              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1429 uni1429              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+142a uni142A              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+142b uni142B              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+142c uni142C              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+142d uni142D              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+142e uni142E              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+142f uni142F              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1430 uni1430              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1431 uni1431              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1432 uni1432              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1433 uni1433              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1434 uni1434              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1435 uni1435              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1437 uni1437              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1438 uni1438              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1439 uni1439              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+143a uni143A              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+143b uni143B              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+143c uni143C              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+143d uni143D              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+143e uni143E              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+143f uni143F              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1440 uni1440              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1441 uni1441              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1442 uni1442              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1443 uni1443              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1444 uni1444              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1445 uni1445              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1446 uni1446              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1447 uni1447              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1448 uni1448              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1449 uni1449              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+144a uni144A              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+144c uni144C              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+144d uni144D              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+144e uni144E              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+144f uni144F              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1450 uni1450              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1451 uni1451              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1452 uni1452              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1454 uni1454              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1455 uni1455              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1456 uni1456              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1457 uni1457              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1458 uni1458              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1459 uni1459              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+145a uni145A              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+145b uni145B              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+145c uni145C              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+145d uni145D              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+145e uni145E              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+145f uni145F              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1460 uni1460              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1461 uni1461              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1462 uni1462              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1463 uni1463              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1464 uni1464              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1465 uni1465              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1466 uni1466              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1467 uni1467              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1468 uni1468              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1469 uni1469              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+146a uni146A              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+146b uni146B              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+146c uni146C              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+146d uni146D              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+146e uni146E              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+146f uni146F              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1470 uni1470              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1471 uni1471              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1472 uni1472              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1473 uni1473              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1474 uni1474              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1475 uni1475              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1476 uni1476              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1477 uni1477              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1478 uni1478              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1479 uni1479              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+147a uni147A              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+147b uni147B              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+147c uni147C              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+147d uni147D              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+147e uni147E              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+147f uni147F              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1480 uni1480              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1481 uni1481              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1482 uni1482              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1483 uni1483              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1484 uni1484              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1485 uni1485              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1486 uni1486              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1487 uni1487              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1488 uni1488              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1489 uni1489              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+148a uni148A              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+148b uni148B              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+148c uni148C              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+148d uni148D              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+148e uni148E              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+148f uni148F              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1490 uni1490              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1491 uni1491              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1492 uni1492              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1493 uni1493              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1494 uni1494              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1495 uni1495              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1496 uni1496              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1497 uni1497              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1498 uni1498              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1499 uni1499              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+149a uni149A              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+149b uni149B              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+149c uni149C              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+149d uni149D              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+149e uni149E              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+149f uni149F              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14a0 uni14A0              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14a1 uni14A1              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14a2 uni14A2              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14a3 uni14A3              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14a4 uni14A4              2.13 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Condensed Oblique, Sans Oblique) 2.15 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+14a5 uni14A5              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14a6 uni14A6              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14a7 uni14A7              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14a8 uni14A8              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14a9 uni14A9              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14aa uni14AA              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14ab uni14AB              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14ac uni14AC              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14ad uni14AD              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14ae uni14AE              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14af uni14AF              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14b0 uni14B0              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14b1 uni14B1              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14b2 uni14B2              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14b3 uni14B3              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14b4 uni14B4              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14b5 uni14B5              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14b6 uni14B6              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14b7 uni14B7              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14b8 uni14B8              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14b9 uni14B9              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14ba uni14BA              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14bb uni14BB              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14bc uni14BC              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14bd uni14BD              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14c0 uni14C0              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14c1 uni14C1              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14c2 uni14C2              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14c3 uni14C3              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14c4 uni14C4              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14c5 uni14C5              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14c6 uni14C6              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14c7 uni14C7              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14c8 uni14C8              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14c9 uni14C9              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14ca uni14CA              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14cb uni14CB              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14cc uni14CC              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14cd uni14CD              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14ce uni14CE              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14cf uni14CF              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14d0 uni14D0              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14d1 uni14D1              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14d2 uni14D2              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14d3 uni14D3              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14d4 uni14D4              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14d5 uni14D5              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14d6 uni14D6              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14d7 uni14D7              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14d8 uni14D8              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14d9 uni14D9              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14da uni14DA              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14db uni14DB              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14dc uni14DC              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14dd uni14DD              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14de uni14DE              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14df uni14DF              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14e0 uni14E0              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14e1 uni14E1              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14e2 uni14E2              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14e3 uni14E3              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14e4 uni14E4              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14e5 uni14E5              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14e6 uni14E6              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14e7 uni14E7              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14e8 uni14E8              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14e9 uni14E9              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14ea uni14EA              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14ec uni14EC              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14ed uni14ED              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14ee uni14EE              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14ef uni14EF              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14f0 uni14F0              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14f1 uni14F1              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14f2 uni14F2              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14f3 uni14F3              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14f4 uni14F4              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14f5 uni14F5              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14f6 uni14F6              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14f7 uni14F7              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14f8 uni14F8              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14f9 uni14F9              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14fa uni14FA              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14fb uni14FB              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14fc uni14FC              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14fd uni14FD              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14fe uni14FE              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14ff uni14FF              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1500 uni1500              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1501 uni1501              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1502 uni1502              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1503 uni1503              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1504 uni1504              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1505 uni1505              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1506 uni1506              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1507 uni1507              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1510 uni1510              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1511 uni1511              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1512 uni1512              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1513 uni1513              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1514 uni1514              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1515 uni1515              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1516 uni1516              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1517 uni1517              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1518 uni1518              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1519 uni1519              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+151a uni151A              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+151b uni151B              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+151c uni151C              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+151d uni151D              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+151e uni151E              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+151f uni151F              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1520 uni1520              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1521 uni1521              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1522 uni1522              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1523 uni1523              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1524 uni1524              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1525 uni1525              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1526 uni1526              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1527 uni1527              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1528 uni1528              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1529 uni1529              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+152a uni152A              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+152b uni152B              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+152c uni152C              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+152d uni152D              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+152e uni152E              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+152f uni152F              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1530 uni1530              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1531 uni1531              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1532 uni1532              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1533 uni1533              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1534 uni1534              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1535 uni1535              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1536 uni1536              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1537 uni1537              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1538 uni1538              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1539 uni1539              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+153a uni153A              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+153b uni153B              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+153c uni153C              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+153d uni153D              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+153e uni153E              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1540 uni1540              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1541 uni1541              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1542 uni1542              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1543 uni1543              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1544 uni1544              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1545 uni1545              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1546 uni1546              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1547 uni1547              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1548 uni1548              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1549 uni1549              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+154a uni154A              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+154b uni154B              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+154c uni154C              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+154d uni154D              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+154e uni154E              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+154f uni154F              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1550 uni1550              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1552 uni1552              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1553 uni1553              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1554 uni1554              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1555 uni1555              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1556 uni1556              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1557 uni1557              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1558 uni1558              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1559 uni1559              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+155a uni155A              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+155b uni155B              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+155c uni155C              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+155d uni155D              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+155e uni155E              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+155f uni155F              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1560 uni1560              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1561 uni1561              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1562 uni1562              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1563 uni1563              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1564 uni1564              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1565 uni1565              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1566 uni1566              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1567 uni1567              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1568 uni1568              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1569 uni1569              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+156a uni156A              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1574 uni1574              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1575 uni1575              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1576 uni1576              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1577 uni1577              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1578 uni1578              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1579 uni1579              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+157a uni157A              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+157b uni157B              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+157c uni157C              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+157d uni157D              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+157e uni157E              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+157f uni157F              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1580 uni1580              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1581 uni1581              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1582 uni1582              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1583 uni1583              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1584 uni1584              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1585 uni1585              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+158a uni158A              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+158b uni158B              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+158c uni158C              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+158d uni158D              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+158e uni158E              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+158f uni158F              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1590 uni1590              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1591 uni1591              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1592 uni1592              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1593 uni1593              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1594 uni1594              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1595 uni1595              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1596 uni1596              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+15a0 uni15A0              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+15a1 uni15A1              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+15a2 uni15A2              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+15a3 uni15A3              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+15a4 uni15A4              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+15a5 uni15A5              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+15a6 uni15A6              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+15a7 uni15A7              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+15a8 uni15A8              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+15a9 uni15A9              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+15aa uni15AA              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+15ab uni15AB              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+15ac uni15AC              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+15ad uni15AD              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+15ae uni15AE              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+15af uni15AF              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+15de uni15DE              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+15e1 uni15E1              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1646 uni1646              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1647 uni1647              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+166e uni166E              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+166f uni166F              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1670 uni1670              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1671 uni1671              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1672 uni1672              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1673 uni1673              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1674 uni1674              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1675 uni1675              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1676 uni1676              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1680 uni1680              2.22 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.28 (Sans ExtraLight)
-U+1681 uni1681              2.22 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.28 (Sans ExtraLight)
-U+1682 uni1682              2.22 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.28 (Sans ExtraLight)
-U+1683 uni1683              2.22 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.28 (Sans ExtraLight)
-U+1684 uni1684              2.22 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.28 (Sans ExtraLight)
-U+1685 uni1685              2.22 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.28 (Sans ExtraLight)
-U+1686 uni1686              2.22 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.28 (Sans ExtraLight)
-U+1687 uni1687              2.22 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.28 (Sans ExtraLight)
-U+1688 uni1688              2.22 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.28 (Sans ExtraLight)
-U+1689 uni1689              2.22 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.28 (Sans ExtraLight)
-U+168a uni168A              2.22 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.28 (Sans ExtraLight)
-U+168b uni168B              2.22 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.28 (Sans ExtraLight)
-U+168c uni168C              2.22 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.28 (Sans ExtraLight)
-U+168d uni168D              2.22 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.28 (Sans ExtraLight)
-U+168e uni168E              2.22 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.28 (Sans ExtraLight)
-U+168f uni168F              2.22 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.28 (Sans ExtraLight)
-U+1690 uni1690              2.22 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.28 (Sans ExtraLight)
-U+1691 uni1691              2.22 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.28 (Sans ExtraLight)
-U+1692 uni1692              2.22 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.28 (Sans ExtraLight)
-U+1693 uni1693              2.22 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.28 (Sans ExtraLight)
-U+1694 uni1694              2.22 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.28 (Sans ExtraLight)
-U+1695 uni1695              2.22 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.28 (Sans ExtraLight)
-U+1696 uni1696              2.22 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.28 (Sans ExtraLight)
-U+1697 uni1697              2.22 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.28 (Sans ExtraLight)
-U+1698 uni1698              2.22 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.28 (Sans ExtraLight)
-U+1699 uni1699              2.22 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.28 (Sans ExtraLight)
-U+169a uni169A              2.22 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.28 (Sans ExtraLight)
-U+169b uni169B              2.22 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.28 (Sans ExtraLight)
-U+169c uni169C              2.22 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.28 (Sans ExtraLight)
-U+1d00 uni1D00              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d01 uni1D01              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d02 uni1D02              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1d03 uni1D03              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d04 uni1D04              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans ExtraLight)
-U+1d05 uni1D05              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d06 uni1D06              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d07 uni1D07              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d08 uni1D08              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+1d09 uni1D09              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1d0a uni1D0A              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d0b uni1D0B              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans ExtraLight)
-U+1d0c uni1D0C              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d0d uni1D0D              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans ExtraLight)
-U+1d0e uni1D0E              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans ExtraLight)
-U+1d0f uni1D0F              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans ExtraLight)
-U+1d10 uni1D10              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans ExtraLight)
-U+1d11 uni1D11              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans ExtraLight)
-U+1d12 uni1D12              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans ExtraLight)
-U+1d13 uni1D13              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans ExtraLight)
-U+1d14 uni1D14              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1d16 uni1D16              2.3
-U+1d17 uni1D17              2.3
-U+1d18 uni1D18              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d19 uni1D19              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans ExtraLight)
-U+1d1a uni1D1A              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans ExtraLight)
-U+1d1b uni1D1B              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d1c uni1D1C              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d1d uni1D1D              2.3
-U+1d1e uni1D1E              2.3
-U+1d1f uni1D1F              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+1d20 uni1D20              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans ExtraLight)
-U+1d21 uni1D21              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans ExtraLight)
-U+1d22 uni1D22              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans ExtraLight)
-U+1d23 uni1D23              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d26 uni1D26              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans ExtraLight)
-U+1d27 uni1D27              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans ExtraLight)
-U+1d28 uni1D28              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans ExtraLight)
-U+1d29 uni1D29              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d2a uni1D2A              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d2b uni1D2B              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans ExtraLight)
-U+1d2c uni1D2C              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+1d2d uni1D2D              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+1d2e uni1D2E              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+1d30 uni1D30              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+1d31 uni1D31              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+1d32 uni1D32              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+1d33 uni1D33              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+1d34 uni1D34              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+1d35 uni1D35              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+1d36 uni1D36              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+1d37 uni1D37              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+1d38 uni1D38              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+1d39 uni1D39              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+1d3a uni1D3A              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+1d3b uni1D3B              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+1d3c uni1D3C              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+1d3d uni1D3D              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.17 (Sans Mono Oblique)
-U+1d3e uni1D3E              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+1d3f uni1D3F              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+1d40 uni1D40              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+1d41 uni1D41              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+1d42 uni1D42              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+1d43 uni1D43              2.3
-U+1d44 uni1D44              2.3
-U+1d45 uni1D45              2.3
-U+1d46 uni1D46              2.3
-U+1d47 uni1D47              2.3
-U+1d48 uni1D48              2.3
-U+1d49 uni1D49              2.3
-U+1d4a uni1D4A              2.3
-U+1d4b uni1D4B              2.3
-U+1d4c uni1D4C              2.3
-U+1d4d uni1D4D              2.3
-U+1d4e uni1D4E              2.3
-U+1d4f uni1D4F              2.3
-U+1d50 uni1D50              2.3
-U+1d51 uni1D51              2.3
-U+1d52 uni1D52              2.3
-U+1d53 uni1D53              2.3
-U+1d54 uni1D54              2.3
-U+1d55 uni1D55              2.3
-U+1d56 uni1D56              2.3
-U+1d57 uni1D57              2.3
-U+1d58 uni1D58              2.3
-U+1d59 uni1D59              2.3
-U+1d5a uni1D5A              2.3
-U+1d5b uni1D5B              2.3
-U+1d5d uni1D5D              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+1d5e uni1D5E              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+1d5f uni1D5F              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+1d60 uni1D60              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+1d61 uni1D61              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+1d62 uni1D62              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+1d63 uni1D63              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+1d64 uni1D64              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+1d65 uni1D65              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+1d66 uni1D66              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+1d67 uni1D67              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+1d68 uni1D68              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+1d69 uni1D69              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+1d6a uni1D6A              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+1d77 uni1D77              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1d78 uni1D78              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+1d7b uni1D7B              2.3
-U+1d85 uni1D85              2.3
-U+1d9b uni1D9B              2.3
-U+1d9c uni1D9C              2.3
-U+1d9d uni1D9D              2.3
-U+1d9e uni1D9E              2.3
-U+1d9f uni1D9F              2.3
-U+1da0 uni1DA0              2.3
-U+1da1 uni1DA1              2.3
-U+1da2 uni1DA2              2.3
-U+1da3 uni1DA3              2.3
-U+1da4 uni1DA4              2.3
-U+1da5 uni1DA5              2.3
-U+1da6 uni1DA6              2.3
-U+1da7 uni1DA7              2.3
-U+1da8 uni1DA8              2.3
-U+1da9 uni1DA9              2.3
-U+1daa uni1DAA              2.3
-U+1dab uni1DAB              2.3
-U+1dac uni1DAC              2.3
-U+1dad uni1DAD              2.3
-U+1dae uni1DAE              2.3
-U+1daf uni1DAF              2.3
-U+1db0 uni1DB0              2.3
-U+1db1 uni1DB1              2.3
-U+1db2 uni1DB2              2.3
-U+1db3 uni1DB3              2.3
-U+1db4 uni1DB4              2.3
-U+1db5 uni1DB5              2.3
-U+1db6 uni1DB6              2.3
-U+1db7 uni1DB7              2.3
-U+1db8 uni1DB8              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+1db9 uni1DB9              2.3
-U+1dba uni1DBA              2.3
-U+1dbb uni1DBB              2.3
-U+1dbc uni1DBC              2.3
-U+1dbd uni1DBD              2.3
-U+1dbe uni1DBE              2.3
-U+1dbf uni1DBF              2.3
-U+1dc4 uni1DC4              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.30 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+1dc5 uni1DC5              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.30 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+1dc6 uni1DC6              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.30 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+1dc7 uni1DC7              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.30 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+1dc8 uni1DC8              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.30 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+1dc9 uni1DC9              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.30 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+1e00 uni1E00              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e01 uni1E01              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e02 uni1E02              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e03 uni1E03              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e04 uni1E04              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e05 uni1E05              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e06 uni1E06              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e07 uni1E07              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e08 uni1E08              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.22 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e09 uni1E09              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.22 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e0a uni1E0A              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e0b uni1E0B              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e0c uni1E0C              2.1
-U+1e0d uni1E0D              2.1
-U+1e0e uni1E0E              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e0f uni1E0F              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e10 uni1E10              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.22 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e11 uni1E11              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.22 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e12 uni1E12              1.13
-U+1e13 uni1E13              1.13
-U+1e14 uni1E14              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1e15 uni1E15              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1e16 uni1E16              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1e17 uni1E17              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1e18 uni1E18              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e19 uni1E19              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e1a uni1E1A              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e1b uni1E1B              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e1c uni1E1C              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.16 (Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.17 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+1e1d uni1E1D              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.16 (Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.17 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+1e1e uni1E1E              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e1f uni1E1F              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e20 uni1E20              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e21 uni1E21              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e22 uni1E22              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e23 uni1E23              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e24 uni1E24              2.1
-U+1e25 uni1E25              2.1
-U+1e26 uni1E26              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1e27 uni1E27              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1e28 uni1E28              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e29 uni1E29              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e2a uni1E2A              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e2b uni1E2B              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e2c uni1E2C              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e2d uni1E2D              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e2e uni1E2E              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1e2f uni1E2F              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1e30 uni1E30              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e31 uni1E31              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e32 uni1E32              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e33 uni1E33              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e34 uni1E34              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e35 uni1E35              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e36 uni1E36              2.1
-U+1e37 uni1E37              2.1
-U+1e38 uni1E38              2.1
-U+1e39 uni1E39              2.1
-U+1e3a uni1E3A              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e3b uni1E3B              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e3c uni1E3C              1.13
-U+1e3d uni1E3D              1.13
-U+1e3e uni1E3E              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e3f uni1E3F              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e40 uni1E40              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e41 uni1E41              2.1
-U+1e42 uni1E42              2.1
-U+1e43 uni1E43              2.1
-U+1e44 uni1E44              1.13
-U+1e45 uni1E45              1.13
-U+1e46 uni1E46              2.1
-U+1e47 uni1E47              2.1
-U+1e48 uni1E48              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e49 uni1E49              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e4a uni1E4A              1.13
-U+1e4b uni1E4B              1.13
-U+1e4c uni1E4C              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight) 2.30 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+1e4d uni1E4D              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight) 2.30 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+1e4e uni1E4E              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1e4f uni1E4F              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1e50 uni1E50              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1e51 uni1E51              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1e52 uni1E52              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1e53 uni1E53              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1e54 uni1E54              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1e55 uni1E55              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1e56 uni1E56              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e57 uni1E57              2.1
-U+1e58 uni1E58              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e59 uni1E59              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e5a uni1E5A              2.1
-U+1e5b uni1E5B              2.1
-U+1e5c uni1E5C              2.1
-U+1e5d uni1E5D              2.1
-U+1e5e uni1E5E              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e5f uni1E5F              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e60 uni1E60              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e61 uni1E61              2.1
-U+1e62 uni1E62              2.1
-U+1e63 uni1E63              2.1
-U+1e64 uni1E64              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+1e65 uni1E65              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+1e66 uni1E66              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1e67 uni1E67              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1e68 uni1E68              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e69 uni1E69              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e6a uni1E6A              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e6b uni1E6B              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e6c uni1E6C              2.1
-U+1e6d uni1E6D              2.1
-U+1e6e uni1E6E              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e6f uni1E6F              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e70 uni1E70              1.13
-U+1e71 uni1E71              1.13
-U+1e72 uni1E72              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e73 uni1E73              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e74 uni1E74              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e75 uni1E75              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e76 uni1E76              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e77 uni1E77              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e78 uni1E78              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed) 2.30 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1e79 uni1E79              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed) 2.30 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1e7a uni1E7A              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1e7b uni1E7B              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1e7c uni1E7C              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1e7d uni1E7D              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1e7e uni1E7E              2.1
-U+1e7f uni1E7F              2.1
-U+1e80 Wgrave               1.2
-U+1e81 wgrave               1.2
-U+1e82 Wacute               1.2
-U+1e83 wacute               1.2
-U+1e84 Wdieresis            1.2
-U+1e85 wdieresis            1.2
-U+1e86 uni1E86              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e87 uni1E87              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e88 uni1E88              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e89 uni1E89              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e8a uni1E8A              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e8b uni1E8B              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e8c uni1E8C              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1e8d uni1E8D              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1e8e uni1E8E              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e8f uni1E8F              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e90 uni1E90              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1e91 uni1E91              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1e92 uni1E92              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e93 uni1E93              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e94 uni1E94              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e95 uni1E95              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e96 uni1E96              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e97 uni1E97              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1e98 uni1E98              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1e99 uni1E99              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1e9a uni1E9A              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.10 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1e9b uni1E9B              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.13 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e9e uni1E9E              2.28 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+1e9f uni1E9F              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique) 2.27 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+1ea0 uni1EA0              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1ea1 uni1EA1              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1ea2 uni1EA2              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1ea3 uni1EA3              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1ea4 uni1EA4              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1ea5 uni1EA5              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1ea6 uni1EA6              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1ea7 uni1EA7              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1ea8 uni1EA8              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1ea9 uni1EA9              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1eaa uni1EAA              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1eab uni1EAB              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1eac uni1EAC              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1ead uni1EAD              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1eae uni1EAE              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1eaf uni1EAF              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1eb0 uni1EB0              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.22 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1eb1 uni1EB1              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.22 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1eb2 uni1EB2              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1eb3 uni1EB3              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1eb4 uni1EB4              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1eb5 uni1EB5              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1eb6 uni1EB6              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1eb7 uni1EB7              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1eb8 uni1EB8              2.2
-U+1eb9 uni1EB9              2.2
-U+1eba uni1EBA              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1ebb uni1EBB              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1ebc uni1EBC              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1ebd uni1EBD              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1ebe uni1EBE              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1ebf uni1EBF              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1ec0 uni1EC0              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1ec1 uni1EC1              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1ec2 uni1EC2              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1ec3 uni1EC3              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1ec4 uni1EC4              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1ec5 uni1EC5              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1ec6 uni1EC6              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1ec7 uni1EC7              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1ec8 uni1EC8              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1ec9 uni1EC9              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1eca uni1ECA              2.2
-U+1ecb uni1ECB              2.2
-U+1ecc uni1ECC              2.2
-U+1ecd uni1ECD              2.2
-U+1ece uni1ECE              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1ecf uni1ECF              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1ed0 uni1ED0              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1ed1 uni1ED1              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1ed2 uni1ED2              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1ed3 uni1ED3              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1ed4 uni1ED4              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1ed5 uni1ED5              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1ed6 uni1ED6              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1ed7 uni1ED7              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1ed8 uni1ED8              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1ed9 uni1ED9              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1eda uni1EDA              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1edb uni1EDB              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1edc uni1EDC              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1edd uni1EDD              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1ede uni1EDE              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1edf uni1EDF              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1ee0 uni1EE0              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1ee1 uni1EE1              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1ee2 uni1EE2              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1ee3 uni1EE3              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1ee4 uni1EE4              2.2
-U+1ee5 uni1EE5              2.2
-U+1ee6 uni1EE6              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1ee7 uni1EE7              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1ee8 uni1EE8              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1ee9 uni1EE9              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1eea uni1EEA              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1eeb uni1EEB              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1eec uni1EEC              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1eed uni1EED              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1eee uni1EEE              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1eef uni1EEF              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1ef0 uni1EF0              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1ef1 uni1EF1              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1ef2 Ygrave               1.2
-U+1ef3 ygrave               1.2
-U+1ef4 uni1EF4              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1ef5 uni1EF5              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1ef6 uni1EF6              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1ef7 uni1EF7              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1ef8 uni1EF8              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1ef9 uni1EF9              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1f00 uni1F00              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f01 uni1F01              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f02 uni1F02              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f03 uni1F03              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f04 uni1F04              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f05 uni1F05              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f06 uni1F06              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f07 uni1F07              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f08 uni1F08              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f09 uni1F09              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f0a uni1F0A              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f0b uni1F0B              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f0c uni1F0C              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f0d uni1F0D              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f0e uni1F0E              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f0f uni1F0F              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f10 uni1F10              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f11 uni1F11              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f12 uni1F12              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f13 uni1F13              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f14 uni1F14              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f15 uni1F15              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f18 uni1F18              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f19 uni1F19              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f1a uni1F1A              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f1b uni1F1B              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f1c uni1F1C              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f1d uni1F1D              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f20 uni1F20              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f21 uni1F21              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f22 uni1F22              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f23 uni1F23              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f24 uni1F24              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f25 uni1F25              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f26 uni1F26              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f27 uni1F27              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f28 uni1F28              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f29 uni1F29              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f2a uni1F2A              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f2b uni1F2B              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f2c uni1F2C              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f2d uni1F2D              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f2e uni1F2E              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f2f uni1F2F              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f30 uni1F30              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f31 uni1F31              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f32 uni1F32              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f33 uni1F33              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f34 uni1F34              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f35 uni1F35              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f36 uni1F36              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f37 uni1F37              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f38 uni1F38              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f39 uni1F39              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f3a uni1F3A              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f3b uni1F3B              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f3c uni1F3C              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f3d uni1F3D              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f3e uni1F3E              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f3f uni1F3F              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f40 uni1F40              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f41 uni1F41              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f42 uni1F42              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f43 uni1F43              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f44 uni1F44              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f45 uni1F45              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f48 uni1F48              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f49 uni1F49              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f4a uni1F4A              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f4b uni1F4B              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f4c uni1F4C              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f4d uni1F4D              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f50 uni1F50              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f51 uni1F51              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f52 uni1F52              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f53 uni1F53              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f54 uni1F54              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f55 uni1F55              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f56 uni1F56              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f57 uni1F57              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f59 uni1F59              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f5b uni1F5B              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f5d uni1F5D              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f5f uni1F5F              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f60 uni1F60              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f61 uni1F61              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f62 uni1F62              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f63 uni1F63              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f64 uni1F64              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f65 uni1F65              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f66 uni1F66              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f67 uni1F67              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f68 uni1F68              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f69 uni1F69              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f6a uni1F6A              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f6b uni1F6B              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f6c uni1F6C              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f6d uni1F6D              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f6e uni1F6E              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f6f uni1F6F              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f70 uni1F70              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1f71 uni1F71              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1f72 uni1F72              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1f73 uni1F73              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1f74 uni1F74              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1f75 uni1F75              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1f76 uni1F76              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f77 uni1F77              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f78 uni1F78              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1f79 uni1F79              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1f7a uni1F7A              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f7b uni1F7B              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f7c uni1F7C              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f7d uni1F7D              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f80 uni1F80              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f81 uni1F81              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f82 uni1F82              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f83 uni1F83              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f84 uni1F84              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f85 uni1F85              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f86 uni1F86              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f87 uni1F87              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f88 uni1F88              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f89 uni1F89              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f8a uni1F8A              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f8b uni1F8B              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f8c uni1F8C              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f8d uni1F8D              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f8e uni1F8E              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f8f uni1F8F              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f90 uni1F90              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f91 uni1F91              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f92 uni1F92              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f93 uni1F93              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f94 uni1F94              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f95 uni1F95              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f96 uni1F96              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f97 uni1F97              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f98 uni1F98              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f99 uni1F99              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f9a uni1F9A              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f9b uni1F9B              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f9c uni1F9C              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f9d uni1F9D              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f9e uni1F9E              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f9f uni1F9F              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fa0 uni1FA0              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fa1 uni1FA1              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fa2 uni1FA2              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fa3 uni1FA3              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fa4 uni1FA4              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fa5 uni1FA5              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fa6 uni1FA6              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fa7 uni1FA7              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fa8 uni1FA8              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fa9 uni1FA9              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1faa uni1FAA              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fab uni1FAB              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fac uni1FAC              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fad uni1FAD              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fae uni1FAE              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1faf uni1FAF              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fb0 uni1FB0              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fb1 uni1FB1              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fb2 uni1FB2              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fb3 uni1FB3              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fb4 uni1FB4              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fb6 uni1FB6              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fb7 uni1FB7              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fb8 uni1FB8              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1fb9 uni1FB9              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1fba uni1FBA              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1fbb uni1FBB              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1fbc uni1FBC              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fbd uni1FBD              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fbe uni1FBE              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1fbf uni1FBF              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fc0 uni1FC0              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1fc1 uni1FC1              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1fc2 uni1FC2              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fc3 uni1FC3              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fc4 uni1FC4              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fc6 uni1FC6              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1fc7 uni1FC7              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fc8 uni1FC8              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1fc9 uni1FC9              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1fca uni1FCA              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1fcb uni1FCB              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1fcc uni1FCC              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.10 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fcd uni1FCD              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fce uni1FCE              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fcf uni1FCF              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fd0 uni1FD0              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fd1 uni1FD1              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fd2 uni1FD2              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fd3 uni1FD3              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fd6 uni1FD6              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fd7 uni1FD7              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fd8 uni1FD8              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1fd9 uni1FD9              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1fda uni1FDA              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1fdb uni1FDB              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1fdd uni1FDD              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fde uni1FDE              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fdf uni1FDF              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fe0 uni1FE0              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fe1 uni1FE1              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fe2 uni1FE2              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fe3 uni1FE3              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fe4 uni1FE4              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fe5 uni1FE5              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fe6 uni1FE6              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fe7 uni1FE7              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fe8 uni1FE8              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1fe9 uni1FE9              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1fea uni1FEA              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1feb uni1FEB              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1fec uni1FEC              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fed uni1FED              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1fee uni1FEE              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1fef uni1FEF              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1ff2 uni1FF2              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1ff3 uni1FF3              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1ff4 uni1FF4              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1ff6 uni1FF6              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1ff7 uni1FF7              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1ff8 uni1FF8              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1ff9 uni1FF9              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1ffa uni1FFA              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1ffb uni1FFB              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.10 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1ffc uni1FFC              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1ffd uni1FFD              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1ffe uni1FFE              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+2000 uni2000              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+2001 uni2001              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+2002 uni2002              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+2003 uni2003              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+2004 uni2004              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+2005 uni2005              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+2006 uni2006              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+2007 uni2007              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+2008 uni2008              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+2009 uni2009              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+200a uni200A              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+200b uni200B              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.8 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+200c uni200C              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.8 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+200d uni200D              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.8 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+200e uni200E              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.8 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+200f uni200F              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.8 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+2010 uni2010              1.5
-U+2011 uni2011              1.5
-U+2012 figuredash           1.5
-U+2013 endash               original
-U+2014 emdash               original
-U+2015 uni2015              1.5
-U+2016 uni2016              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.26 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2017 underscoredbl        2.3
-U+2018 quoteleft            original
-U+2019 quoteright           original
-U+201a quotesinglbase       original
-U+201b quotereversed        2.3
-U+201c quotedblleft         original
-U+201d quotedblright        original
-U+201e quotedblbase         original
-U+201f uni201F              2.1 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+2020 dagger               original
-U+2021 daggerdbl            original
-U+2022 bullet               original
-U+2023 uni2023              2.2
-U+2024 onedotenleader       2.1 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.9 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2025 twodotenleader       2.1 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.9 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2026 ellipsis             original
-U+2027 uni2027              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+202a uni202A              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+202b uni202B              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+202c uni202C              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+202d uni202D              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+202e uni202E              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+202f uni202F              2.11 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique) 2.23 (Serif Italic Condensed)
-U+2030 perthousand          original
-U+2031 uni2031              2.1
-U+2032 minute               2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed) 2.28 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2033 second               2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed) 2.28 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2034 uni2034              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed) 2.28 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2035 uni2035              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed) 2.28 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2036 uni2036              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed) 2.28 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2037 uni2037              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed) 2.28 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2038 uni2038              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2039 guilsinglleft        original
-U+203a guilsinglright       original
-U+203b uni203B              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+203c exclamdbl            2.0
-U+203d uni203D              2.1 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.11 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.14 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+203e uni203E              2.3
-U+203f uni203F              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+2040 uni2040              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+2041 uni2041              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2042 uni2042              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.26 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2043 uni2043              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+2044 fraction             2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.27 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2045 uni2045              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.13 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.26 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2046 uni2046              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.13 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.26 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2047 uni2047              2.0
-U+2048 uni2048              2.0
-U+2049 uni2049              2.0
-U+204a uni204A              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+204b uni204B              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.26 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+204c uni204C              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.26 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+204d uni204D              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.26 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+204e uni204E              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.26 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+204f uni204F              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.26 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2050 uni2050              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+2051 uni2051              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.26 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2052 uni2052              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.26 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2053 uni2053              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.26 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2054 uni2054              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+2055 uni2055              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2056 uni2056              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2057 uni2057              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2058 uni2058              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2059 uni2059              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+205a uni205A              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+205b uni205B              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+205c uni205C              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+205d uni205D              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+205e uni205E              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+205f uni205F              2.14
-U+2060 uni2060              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2061 uni2061              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2062 uni2062              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2063 uni2063              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2064 uni2064              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+206a uni206A              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+206b uni206B              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+206c uni206C              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+206d uni206D              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+206e uni206E              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+206f uni206F              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2070 uni2070              2.2
-U+2071 uni2071              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+2074 uni2074              2.2
-U+2075 uni2075              2.2
-U+2076 uni2076              2.2
-U+2077 uni2077              2.2
-U+2078 uni2078              2.2
-U+2079 uni2079              2.2
-U+207a uni207A              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+207b uni207B              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+207c uni207C              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+207d uni207D              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+207e uni207E              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+207f uni207F              1.14
-U+2080 uni2080              2.4
-U+2081 uni2081              2.4
-U+2082 uni2082              2.4
-U+2083 uni2083              2.4
-U+2084 uni2084              2.4
-U+2085 uni2085              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2086 uni2086              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2087 uni2087              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2088 uni2088              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2089 uni2089              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+208a uni208A              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+208b uni208B              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+208c uni208C              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+208d uni208D              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+208e uni208E              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+2090 uni2090              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+2091 uni2091              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+2092 uni2092              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+2093 uni2093              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+2094 uni2094              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+20a0 uni20A0              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+20a1 colonmonetary        2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+20a2 uni20A2              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+20a3 franc                2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+20a4 lira                 2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+20a5 uni20A5              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+20a6 uni20A6              2.3
-U+20a7 peseta               2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+20a8 uni20A8              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+20a9 uni20A9              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+20aa uni20AA              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+20ab dong                 2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+20ac Euro                 original
-U+20ad uni20AD              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+20ae uni20AE              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+20af uni20AF              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+20b0 uni20B0              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+20b1 uni20B1              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.14 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+20b2 uni20B2              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+20b3 uni20B3              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+20b4 uni20B4              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+20b5 uni20B5              2.2
-U+20d0 uni20D0              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+20d1 uni20D1              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+20d6 uni20D6              2.8 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+20d7 uni20D7              2.8 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+20db uni20DB              2.23 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+20dc uni20DC              2.23 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+20e1 uni20E1              2.23 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2100 uni2100              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2101 uni2101              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2102 uni2102              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.16 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Condensed)
-U+2103 uni2103              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2104 uni2104              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2105 uni2105              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2106 uni2106              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2107 uni2107              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2108 uni2108              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2109 uni2109              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+210b uni210B              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+210c uni210C              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+210d uni210D              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.22 (Serif, Serif Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+210e uni210E              2.5 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique) 2.23 (Serif Italic Condensed) 2.26 (Sans ExtraLight)
-U+210f uni210F              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.28 (Sans ExtraLight, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2110 uni2110              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2111 Ifraktur             2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2112 uni2112              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2113 uni2113              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2114 uni2114              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2115 uni2115              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.22 (Serif, Serif Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2116 uni2116              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+2117 uni2117              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2118 weierstrass          2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2119 uni2119              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.22 (Serif, Serif Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+211a uni211A              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.22 (Serif, Serif Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+211b uni211B              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+211c Rfraktur             2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+211d uni211D              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+211e prescription         2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+211f uni211F              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2120 uni2120              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2121 uni2121              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2122 trademark            original
-U+2123 uni2123              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2124 uni2124              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.22 (Serif, Serif Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2125 uni2125              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2126 uni2126              2.2
-U+2127 uni2127              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2128 uni2128              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2129 uni2129              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+212a uni212A              2.2
-U+212b uni212B              2.2
-U+212c uni212C              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+212d uni212D              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+212e estimated            2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+212f uni212F              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2130 uni2130              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2131 uni2131              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2132 uni2132              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans ExtraLight)
-U+2133 uni2133              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2134 uni2134              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+2135 aleph                2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2136 uni2136              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2137 uni2137              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2138 uni2138              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2139 uni2139              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+213a uni213A              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+213b uni213B              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+213c uni213C              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.22 (Serif, Serif Condensed)
-U+213d uni213D              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.22 (Serif, Serif Condensed)
-U+213e uni213E              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.22 (Serif, Serif Condensed)
-U+213f uni213F              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.22 (Serif, Serif Condensed)
-U+2140 uni2140              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.22 (Serif, Serif Condensed)
-U+2141 uni2141              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2142 uni2142              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2143 uni2143              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2144 uni2144              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2145 uni2145              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.22 (Serif, Serif Condensed)
-U+2146 uni2146              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.22 (Serif, Serif Condensed)
-U+2147 uni2147              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.22 (Serif, Serif Condensed)
-U+2148 uni2148              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.22 (Serif, Serif Condensed)
-U+2149 uni2149              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.22 (Serif, Serif Condensed)
-U+214b uni214B              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+214e uni214E              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2153 onethird             2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.6 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2154 twothirds            2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.6 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2155 uni2155              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.6 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2156 uni2156              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.6 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2157 uni2157              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.6 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2158 uni2158              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.6 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2159 uni2159              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.6 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+215a uni215A              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.6 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+215b oneeighth            2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.6 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+215c threeeighths         2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.6 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+215d fiveeighths          2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.6 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+215e seveneighths         2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.6 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+215f uni215F              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.6 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2160 uni2160              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2161 uni2161              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2162 uni2162              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2163 uni2163              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2164 uni2164              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2165 uni2165              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2166 uni2166              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2167 uni2167              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2168 uni2168              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2169 uni2169              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+216a uni216A              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+216b uni216B              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+216c uni216C              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+216d uni216D              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+216e uni216E              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+216f uni216F              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2170 uni2170              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2171 uni2171              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2172 uni2172              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2173 uni2173              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2174 uni2174              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2175 uni2175              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2176 uni2176              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2177 uni2177              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2178 uni2178              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2179 uni2179              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+217a uni217A              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+217b uni217B              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+217c uni217C              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+217d uni217D              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+217e uni217E              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+217f uni217F              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2180 uni2180              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2181 uni2181              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2182 uni2182              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2183 uni2183              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2184 uni2184              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2190 arrowleft            2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+2191 arrowup              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+2192 arrowright           2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+2193 arrowdown            2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+2194 arrowboth            2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2195 arrowupdn            2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2196 uni2196              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2197 uni2197              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2198 uni2198              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2199 uni2199              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+219a uni219A              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+219b uni219B              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+219c uni219C              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+219d uni219D              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+219e uni219E              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+219f uni219F              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21a0 uni21A0              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21a1 uni21A1              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21a2 uni21A2              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21a3 uni21A3              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21a4 uni21A4              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21a5 uni21A5              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21a6 uni21A6              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21a7 uni21A7              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21a8 arrowupdnbse         2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21a9 uni21A9              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21aa uni21AA              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21ab uni21AB              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21ac uni21AC              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21ad uni21AD              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21ae uni21AE              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21af uni21AF              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21b0 uni21B0              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21b1 uni21B1              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21b2 uni21B2              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21b3 uni21B3              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21b4 uni21B4              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21b5 carriagereturn       2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21b6 uni21B6              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21b7 uni21B7              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21b8 uni21B8              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21b9 uni21B9              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21ba uni21BA              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21bb uni21BB              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21bc uni21BC              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21bd uni21BD              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21be uni21BE              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21bf uni21BF              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21c0 uni21C0              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21c1 uni21C1              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21c2 uni21C2              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21c3 uni21C3              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21c4 uni21C4              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21c5 uni21C5              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21c6 uni21C6              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21c7 uni21C7              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21c8 uni21C8              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21c9 uni21C9              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21ca uni21CA              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21cb uni21CB              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21cc uni21CC              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21cd uni21CD              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21ce uni21CE              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21cf uni21CF              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21d0 arrowdblleft         2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21d1 arrowdblup           2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21d2 arrowdblright        2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21d3 arrowdbldown         2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21d4 arrowdblboth         2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21d5 uni21D5              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21d6 uni21D6              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21d7 uni21D7              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21d8 uni21D8              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21d9 uni21D9              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21da uni21DA              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21db uni21DB              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21dc uni21DC              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21dd uni21DD              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21de uni21DE              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21df uni21DF              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21e0 uni21E0              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21e1 uni21E1              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21e2 uni21E2              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21e3 uni21E3              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21e4 uni21E4              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21e5 uni21E5              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21e6 uni21E6              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21e7 uni21E7              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21e8 uni21E8              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21e9 uni21E9              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21ea uni21EA              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21eb uni21EB              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21ec uni21EC              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21ed uni21ED              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21ee uni21EE              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21ef uni21EF              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21f0 uni21F0              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21f1 uni21F1              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21f2 uni21F2              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21f3 uni21F3              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21f4 uni21F4              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21f5 uni21F5              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21f6 uni21F6              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21f7 uni21F7              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21f8 uni21F8              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21f9 uni21F9              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21fa uni21FA              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21fb uni21FB              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21fc uni21FC              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21fd uni21FD              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21fe uni21FE              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21ff uni21FF              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2200 universal            2.1 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2201 uni2201              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2202 partialdiff          original
-U+2203 existential          2.1 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2204 uni2204              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2205 emptyset             2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2206 Delta                original
-U+2207 gradient             2.1
-U+2208 element              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.6 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2209 notelement           2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.6 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+220a uni220A              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.6 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+220b suchthat             2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.6 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+220c uni220C              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.6 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+220d uni220D              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.6 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+220e uni220E              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+220f product              original
-U+2210 uni2210              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2211 summation            original
-U+2212 minus                original
-U+2213 uni2213              2.1 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.13 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2214 uni2214              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2215 uni2215              original
-U+2216 uni2216              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+2217 asteriskmath         2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2218 uni2218              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2219 uni2219              original
-U+221a radical              original
-U+221b uni221B              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+221c uni221C              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+221d proportional         2.1
-U+221e infinity             original
-U+221f orthogonal           2.1
-U+2220 angle                2.3
-U+2221 uni2221              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2222 uni2222              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2223 uni2223              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2224 uni2224              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2225 uni2225              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2226 uni2226              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2227 logicaland           2.1
-U+2228 logicalor            2.1
-U+2229 intersection         2.1
-U+222a union                2.1
-U+222b integral             original
-U+222c uni222C              2.1 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.10 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+222d uni222D              2.1 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.10 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+222e uni222E              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+222f uni222F              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2230 uni2230              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2231 uni2231              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2232 uni2232              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2233 uni2233              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2234 therefore            2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+2235 uni2235              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+2236 uni2236              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+2237 uni2237              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+2238 uni2238              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.6 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2239 uni2239              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.6 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+223a uni223A              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.6 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+223b uni223B              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.6 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+223c similar              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+223d uni223D              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+223e uni223E              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+223f uni223F              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2240 uni2240              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2241 uni2241              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+2242 uni2242              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2243 uni2243              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2244 uni2244              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+2245 congruent            2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2246 uni2246              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+2247 uni2247              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+2248 approxequal          original
-U+2249 uni2249              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+224a uni224A              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+224b uni224B              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+224c uni224C              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+224d uni224D              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+224e uni224E              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+224f uni224F              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+2250 uni2250              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2251 uni2251              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2252 uni2252              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2253 uni2253              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2254 uni2254              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2255 uni2255              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2256 uni2256              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+2257 uni2257              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+2258 uni2258              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+2259 uni2259              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+225a uni225A              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+225b uni225B              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+225c uni225C              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+225d uni225D              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+225e uni225E              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+225f uni225F              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+2260 notequal             original
-U+2261 equivalence          2.1
-U+2262 uni2262              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+2263 uni2263              2.1 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2264 lessequal            original
-U+2265 greaterequal         original
-U+2266 uni2266              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+2267 uni2267              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+2268 uni2268              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+2269 uni2269              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+226a uni226A              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+226b uni226B              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+226c uni226C              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+226d uni226D              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+226e uni226E              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+226f uni226F              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+2270 uni2270              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+2271 uni2271              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+2272 uni2272              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+2273 uni2273              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+2274 uni2274              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+2275 uni2275              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+2276 uni2276              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+2277 uni2277              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+2278 uni2278              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.6 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2279 uni2279              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.6 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+227a uni227A              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.6 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+227b uni227B              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.6 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+227c uni227C              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.6 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+227d uni227D              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.6 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+227e uni227E              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.6 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+227f uni227F              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.6 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2280 uni2280              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.6 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2281 uni2281              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.6 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2282 propersubset         2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2283 propersuperset       2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2284 notsubset            2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2285 uni2285              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2286 reflexsubset         2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2287 reflexsuperset       2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2288 uni2288              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+2289 uni2289              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+228a uni228A              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.6 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+228b uni228B              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.6 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+228c uni228C              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+228d uni228D              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+228e uni228E              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+228f uni228F              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2290 uni2290              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2291 uni2291              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2292 uni2292              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2293 uni2293              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2294 uni2294              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2295 circleplus           2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2296 uni2296              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2297 circlemultiply       2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2298 uni2298              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2299 uni2299              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+229a uni229A              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+229b uni229B              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+229c uni229C              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+229d uni229D              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+229e uni229E              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+229f uni229F              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+22a0 uni22A0              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+22a1 uni22A1              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+22a2 uni22A2              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+22a3 uni22A3              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+22a4 uni22A4              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+22a5 perpendicular        2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+22a6 uni22A6              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+22a7 uni22A7              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+22a8 uni22A8              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+22a9 uni22A9              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+22aa uni22AA              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+22ab uni22AB              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+22ac uni22AC              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+22ad uni22AD              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+22ae uni22AE              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+22af uni22AF              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+22b0 uni22B0              2.27 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22b1 uni22B1              2.27 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22b2 uni22B2              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22b3 uni22B3              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22b4 uni22B4              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22b5 uni22B5              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22b6 uni22B6              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22b7 uni22B7              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22b8 uni22B8              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22b9 uni22B9              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22ba uni22BA              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22bb uni22BB              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22bc uni22BC              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22bd uni22BD              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22be uni22BE              2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+22bf uni22BF              2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+22c0 uni22C0              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22c1 uni22C1              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22c2 uni22C2              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22c3 uni22C3              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22c4 uni22C4              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22c5 dotmath              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.13 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+22c6 uni22C6              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+22c7 uni22C7              2.27 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22c8 uni22C8              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22c9 uni22C9              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22ca uni22CA              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22cb uni22CB              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22cc uni22CC              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22cd uni22CD              2.6 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique) 2.7 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+22ce uni22CE              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22cf uni22CF              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22d0 uni22D0              2.27 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22d1 uni22D1              2.27 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22d2 uni22D2              2.27 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22d3 uni22D3              2.27 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22d4 uni22D4              2.27 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22d5 uni22D5              2.27 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22d6 uni22D6              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22d7 uni22D7              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22d8 uni22D8              2.6 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+22d9 uni22D9              2.6 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+22da uni22DA              2.6 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique) 2.7 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+22db uni22DB              2.6 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique) 2.7 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+22dc uni22DC              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+22dd uni22DD              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+22de uni22DE              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+22df uni22DF              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+22e0 uni22E0              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+22e1 uni22E1              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+22e2 uni22E2              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+22e3 uni22E3              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+22e4 uni22E4              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+22e5 uni22E5              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+22e6 uni22E6              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+22e7 uni22E7              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+22e8 uni22E8              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+22e9 uni22E9              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+22ea uni22EA              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22eb uni22EB              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22ec uni22EC              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22ed uni22ED              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22ee uni22EE              2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22ef uni22EF              2.13 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22f0 uni22F0              2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22f1 uni22F1              2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22f2 uni22F2              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22f3 uni22F3              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22f4 uni22F4              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22f5 uni22F5              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22f6 uni22F6              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22f7 uni22F7              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22f8 uni22F8              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22f9 uni22F9              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22fa uni22FA              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22fb uni22FB              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22fc uni22FC              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22fd uni22FD              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22fe uni22FE              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22ff uni22FF              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2300 uni2300              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+2301 uni2301              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+2302 house                1.14
-U+2303 uni2303              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+2304 uni2304              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+2305 uni2305              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+2306 uni2306              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2307 uni2307              2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+2308 uni2308              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.11 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+2309 uni2309              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.11 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+230a uni230A              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.11 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+230b uni230B              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.11 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+230c uni230C              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+230d uni230D              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+230e uni230E              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+230f uni230F              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+2310 revlogicalnot        1.14
-U+2311 uni2311              1.15
-U+2312 uni2312              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2313 uni2313              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2314 uni2314              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2315 uni2315              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2318 uni2318              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.10 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+2319 uni2319              1.14
-U+231c uni231C              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+231d uni231D              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+231e uni231E              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+231f uni231F              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+2320 integraltp           2.3
-U+2321 integralbt           2.3
-U+2324 uni2324              2.16 (Sans, Sans Bold, Sans Bold Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique) 2.19 (Sans Condensed Oblique, Sans Oblique)
-U+2325 uni2325              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.10 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+2326 uni2326              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+2327 uni2327              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+2328 uni2328              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2329 angleleft            2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.11 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic)
-U+232a angleright           2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.11 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic)
-U+232b uni232B              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+232c uni232C              2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+2335 uni2335              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2337 uni2337              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2338 uni2338              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2339 uni2339              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+233a uni233A              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+233b uni233B              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+233c uni233C              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+233d uni233D              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+233e uni233E              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2341 uni2341              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2342 uni2342              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2343 uni2343              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2344 uni2344              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2347 uni2347              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2348 uni2348              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2349 uni2349              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+234b uni234B              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+234c uni234C              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+234d uni234D              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2350 uni2350              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2352 uni2352              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2353 uni2353              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2354 uni2354              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2357 uni2357              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2358 uni2358              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2359 uni2359              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+235a uni235A              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+235b uni235B              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+235c uni235C              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+235e uni235E              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+235f uni235F              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2360 uni2360              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2363 uni2363              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2364 uni2364              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2365 uni2365              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2368 uni2368              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2369 uni2369              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+236b uni236B              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+236c uni236C              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+236d uni236D              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+236e uni236E              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+236f uni236F              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2370 uni2370              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2373 uni2373              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+2374 uni2374              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+2375 uni2375              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+2376 uni2376              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2377 uni2377              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2378 uni2378              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2379 uni2379              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+237a uni237A              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+237d uni237D              1.15
-U+2380 uni2380              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2381 uni2381              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2382 uni2382              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2383 uni2383              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2387 uni2387              2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+2388 uni2388              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2389 uni2389              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+238a uni238A              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+238b uni238B              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2394 uni2394              2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+2395 uni2395              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+239b uni239B              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+239c uni239C              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+239d uni239D              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+239e uni239E              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+239f uni239F              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+23a0 uni23A0              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+23a1 uni23A1              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+23a2 uni23A2              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+23a3 uni23A3              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+23a4 uni23A4              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+23a5 uni23A5              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+23a6 uni23A6              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+23a7 uni23A7              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+23a8 uni23A8              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+23a9 uni23A9              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+23aa uni23AA              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+23ab uni23AB              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+23ac uni23AC              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+23ad uni23AD              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+23ae uni23AE              2.3
-U+23ce uni23CE              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+23cf uni23CF              2.3
-U+23e3 uni23E3              2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+23e5 uni23E5              2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+2422 uni2422              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2423 uni2423              1.6
-U+2460 uni2460              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2461 uni2461              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2462 uni2462              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2463 uni2463              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2464 uni2464              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2465 uni2465              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2466 uni2466              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2467 uni2467              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2468 uni2468              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2469 uni2469              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2500 SF100000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2501 uni2501              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2502 SF110000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2503 uni2503              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2504 uni2504              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2505 uni2505              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2506 uni2506              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2507 uni2507              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2508 uni2508              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2509 uni2509              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+250a uni250A              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+250b uni250B              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+250c SF010000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+250d uni250D              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+250e uni250E              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+250f uni250F              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2510 SF030000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2511 uni2511              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2512 uni2512              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2513 uni2513              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2514 SF020000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2515 uni2515              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2516 uni2516              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2517 uni2517              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2518 SF040000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2519 uni2519              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+251a uni251A              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+251b uni251B              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+251c SF080000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+251d uni251D              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+251e uni251E              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+251f uni251F              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2520 uni2520              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2521 uni2521              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2522 uni2522              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2523 uni2523              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2524 SF090000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2525 uni2525              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2526 uni2526              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2527 uni2527              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2528 uni2528              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2529 uni2529              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+252a uni252A              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+252b uni252B              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+252c SF060000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+252d uni252D              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+252e uni252E              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+252f uni252F              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2530 uni2530              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2531 uni2531              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2532 uni2532              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2533 uni2533              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2534 SF070000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2535 uni2535              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2536 uni2536              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2537 uni2537              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2538 uni2538              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2539 uni2539              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+253a uni253A              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+253b uni253B              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+253c SF050000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+253d uni253D              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+253e uni253E              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+253f uni253F              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2540 uni2540              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2541 uni2541              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2542 uni2542              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2543 uni2543              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2544 uni2544              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2545 uni2545              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2546 uni2546              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2547 uni2547              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2548 uni2548              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2549 uni2549              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+254a uni254A              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+254b uni254B              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+254c uni254C              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+254d uni254D              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+254e uni254E              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+254f uni254F              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2550 SF430000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2551 SF240000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2552 SF510000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2553 SF520000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2554 SF390000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2555 SF220000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2556 SF210000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2557 SF250000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2558 SF500000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2559 SF490000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+255a SF380000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+255b SF280000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+255c SF270000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+255d SF260000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+255e SF360000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+255f SF370000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2560 SF420000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2561 SF190000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2562 SF200000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2563 SF230000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2564 SF470000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2565 SF480000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2566 SF410000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2567 SF450000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2568 SF460000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2569 SF400000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+256a SF540000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+256b SF530000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+256c SF440000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+256d uni256D              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+256e uni256E              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+256f uni256F              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2570 uni2570              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2571 uni2571              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2572 uni2572              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2573 uni2573              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2574 uni2574              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2575 uni2575              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2576 uni2576              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2577 uni2577              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2578 uni2578              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2579 uni2579              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+257a uni257A              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+257b uni257B              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+257c uni257C              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+257d uni257D              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+257e uni257E              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+257f uni257F              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2580 upblock              1.14
-U+2581 uni2581              1.14
-U+2582 uni2582              1.14
-U+2583 uni2583              1.14
-U+2584 dnblock              1.14
-U+2585 uni2585              1.14
-U+2586 uni2586              1.14
-U+2587 uni2587              1.14
-U+2588 block                1.14
-U+2589 uni2589              1.14
-U+258a uni258A              1.14
-U+258b uni258B              1.14
-U+258c lfblock              1.14
-U+258d uni258D              1.14
-U+258e uni258E              1.14
-U+258f uni258F              1.14
-U+2590 rtblock              1.14
-U+2591 ltshade              1.15
-U+2592 shade                1.15
-U+2593 dkshade              1.15
-U+2594 uni2594              1.14
-U+2595 uni2595              1.14
-U+2596 uni2596              1.14
-U+2597 uni2597              1.14
-U+2598 uni2598              1.14
-U+2599 uni2599              1.14
-U+259a uni259A              1.14
-U+259b uni259B              1.14
-U+259c uni259C              1.14
-U+259d uni259D              1.14
-U+259e uni259E              1.14
-U+259f uni259F              1.14
-U+25a0 filledbox            2.3
-U+25a1 H22073               2.3
-U+25a2 uni25A2              2.3
-U+25a3 uni25A3              2.3
-U+25a4 uni25A4              2.3
-U+25a5 uni25A5              2.3
-U+25a6 uni25A6              2.3
-U+25a7 uni25A7              2.3
-U+25a8 uni25A8              2.3
-U+25a9 uni25A9              2.3
-U+25aa H18543               2.3
-U+25ab H18551               2.3
-U+25ac filledrect           2.3
-U+25ad uni25AD              2.3
-U+25ae uni25AE              2.3
-U+25af uni25AF              2.3
-U+25b0 uni25B0              2.3
-U+25b1 uni25B1              2.3
-U+25b2 triagup              2.3
-U+25b3 uni25B3              2.3
-U+25b4 uni25B4              2.3
-U+25b5 uni25B5              2.3
-U+25b6 uni25B6              2.3
-U+25b7 uni25B7              2.3
-U+25b8 uni25B8              2.3
-U+25b9 uni25B9              2.3
-U+25ba triagrt              2.3
-U+25bb uni25BB              2.3
-U+25bc triagdn              2.3
-U+25bd uni25BD              2.3
-U+25be uni25BE              2.3
-U+25bf uni25BF              2.3
-U+25c0 uni25C0              2.3
-U+25c1 uni25C1              2.3
-U+25c2 uni25C2              2.3
-U+25c3 uni25C3              2.3
-U+25c4 triaglf              2.3
-U+25c5 uni25C5              2.3
-U+25c6 uni25C6              2.3
-U+25c7 uni25C7              2.3
-U+25c8 uni25C8              2.3
-U+25c9 uni25C9              2.3
-U+25ca lozenge              original
-U+25cb circle               2.3
-U+25cc uni25CC              2.3
-U+25cd uni25CD              2.3
-U+25ce uni25CE              2.3
-U+25cf H18533               2.3
-U+25d0 uni25D0              2.3
-U+25d1 uni25D1              2.3
-U+25d2 uni25D2              2.3
-U+25d3 uni25D3              2.3
-U+25d4 uni25D4              2.3
-U+25d5 uni25D5              2.3
-U+25d6 uni25D6              2.3
-U+25d7 uni25D7              2.3
-U+25d8 invbullet            2.2
-U+25d9 invcircle            2.3
-U+25da uni25DA              2.3
-U+25db uni25DB              2.3
-U+25dc uni25DC              2.3
-U+25dd uni25DD              2.3
-U+25de uni25DE              2.3
-U+25df uni25DF              2.3
-U+25e0 uni25E0              2.3
-U+25e1 uni25E1              2.3
-U+25e2 uni25E2              2.3
-U+25e3 uni25E3              2.3
-U+25e4 uni25E4              2.3
-U+25e5 uni25E5              2.3
-U+25e6 openbullet           2.2
-U+25e7 uni25E7              2.3
-U+25e8 uni25E8              2.3
-U+25e9 uni25E9              2.3
-U+25ea uni25EA              2.3
-U+25eb uni25EB              2.3
-U+25ec uni25EC              2.3
-U+25ed uni25ED              2.3
-U+25ee uni25EE              2.3
-U+25ef uni25EF              2.3
-U+25f0 uni25F0              2.3
-U+25f1 uni25F1              2.3
-U+25f2 uni25F2              2.3
-U+25f3 uni25F3              2.3
-U+25f4 uni25F4              2.3
-U+25f5 uni25F5              2.3
-U+25f6 uni25F6              2.3
-U+25f7 uni25F7              2.3
-U+25f8 uni25F8              2.3
-U+25f9 uni25F9              2.3
-U+25fa uni25FA              2.3
-U+25fb uni25FB              2.3
-U+25fc uni25FC              2.3
-U+25fd uni25FD              2.3
-U+25fe uni25FE              2.3
-U+25ff uni25FF              2.3
-U+2600 uni2600              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2601 uni2601              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2602 uni2602              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2603 uni2603              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2604 uni2604              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2605 uni2605              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2606 uni2606              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2607 uni2607              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2608 uni2608              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2609 uni2609              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+260a uni260A              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+260b uni260B              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+260c uni260C              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+260d uni260D              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+260e uni260E              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+260f uni260F              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2610 uni2610              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2611 uni2611              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2612 uni2612              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2613 uni2613              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2614 uni2614              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2615 uni2615              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2616 uni2616              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2617 uni2617              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2618 uni2618              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2619 uni2619              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+261a uni261A              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+261b uni261B              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+261c uni261C              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+261d uni261D              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+261e uni261E              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+261f uni261F              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2620 uni2620              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2621 uni2621              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2622 uni2622              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2623 uni2623              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2624 uni2624              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2625 uni2625              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2626 uni2626              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2627 uni2627              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2628 uni2628              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2629 uni2629              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+262a uni262A              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+262b uni262B              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+262c uni262C              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+262d uni262D              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+262e uni262E              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+262f uni262F              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2630 uni2630              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+2631 uni2631              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+2632 uni2632              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+2633 uni2633              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+2634 uni2634              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+2635 uni2635              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+2636 uni2636              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+2637 uni2637              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+2638 uni2638              1.15
-U+2639 uni2639              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+263a smileface            2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+263b invsmileface         2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+263c sun                  2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+263d uni263D              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+263e uni263E              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+263f uni263F              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2640 female               2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2641 uni2641              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2642 male                 2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2643 uni2643              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2644 uni2644              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2645 uni2645              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2646 uni2646              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2647 uni2647              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2648 uni2648              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2649 uni2649              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+264a uni264A              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+264b uni264B              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+264c uni264C              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+264d uni264D              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+264e uni264E              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+264f uni264F              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2650 uni2650              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2651 uni2651              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2652 uni2652              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2653 uni2653              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2654 uni2654              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2655 uni2655              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2656 uni2656              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2657 uni2657              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2658 uni2658              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2659 uni2659              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+265a uni265A              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+265b uni265B              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+265c uni265C              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+265d uni265D              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+265e uni265E              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+265f uni265F              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2660 spade                2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2661 uni2661              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2662 uni2662              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2663 club                 2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2664 uni2664              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2665 heart                2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2666 diamond              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2667 uni2667              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2668 uni2668              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2669 uni2669              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+266a musicalnote          2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+266b musicalnotedbl       2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+266c uni266C              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+266d uni266D              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+266e uni266E              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+266f uni266F              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2670 uni2670              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2671 uni2671              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2672 uni2672              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2673 uni2673              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2674 uni2674              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2675 uni2675              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2676 uni2676              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2677 uni2677              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2678 uni2678              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2679 uni2679              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+267a uni267A              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+267b uni267B              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+267c uni267C              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+267d uni267D              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+267e uni267E              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+267f uni267F              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2680 uni2680              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.7 (Sans Mono, Sans Mono Bold)
-U+2681 uni2681              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.7 (Sans Mono, Sans Mono Bold)
-U+2682 uni2682              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.7 (Sans Mono, Sans Mono Bold)
-U+2683 uni2683              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.7 (Sans Mono, Sans Mono Bold)
-U+2684 uni2684              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.7 (Sans Mono, Sans Mono Bold)
-U+2685 uni2685              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.7 (Sans Mono, Sans Mono Bold)
-U+2686 uni2686              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2687 uni2687              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2688 uni2688              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2689 uni2689              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+268a uni268A              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+268b uni268B              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+268c uni268C              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+268d uni268D              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+268e uni268E              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+268f uni268F              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+2690 uni2690              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2691 uni2691              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2692 uni2692              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2693 uni2693              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2694 uni2694              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2695 uni2695              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2696 uni2696              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2697 uni2697              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2698 uni2698              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2699 uni2699              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+269a uni269A              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+269b uni269B              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+269c uni269C              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+26a0 uni26A0              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+26a1 uni26A1              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+26a2 uni26A2              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+26a3 uni26A3              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+26a4 uni26A4              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+26a5 uni26A5              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+26a6 uni26A6              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+26a7 uni26A7              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+26a8 uni26A8              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+26a9 uni26A9              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+26aa uni26AA              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+26ab uni26AB              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+26ac uni26AC              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+26ad uni26AD              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+26ae uni26AE              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+26af uni26AF              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+26b0 uni26B0              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+26b1 uni26B1              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+26b2 uni26B2              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+26b3 uni26B3              2.29 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+26b4 uni26B4              2.29 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+26b5 uni26B5              2.29 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+26b6 uni26B6              2.29 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+26b7 uni26B7              2.29 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+26b8 uni26B8              2.29 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2701 uni2701              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2702 uni2702              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2703 uni2703              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2704 uni2704              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2706 uni2706              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2707 uni2707              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2708 uni2708              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2709 uni2709              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+270c uni270C              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+270d uni270D              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+270e uni270E              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+270f uni270F              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2710 uni2710              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2711 uni2711              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2712 uni2712              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2713 uni2713              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2714 uni2714              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2715 uni2715              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2716 uni2716              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2717 uni2717              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2718 uni2718              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2719 uni2719              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+271a uni271A              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+271b uni271B              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+271c uni271C              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+271d uni271D              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+271e uni271E              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+271f uni271F              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2720 uni2720              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2721 uni2721              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2722 uni2722              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2723 uni2723              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2724 uni2724              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2725 uni2725              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2726 uni2726              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2727 uni2727              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2729 uni2729              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+272a uni272A              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+272b uni272B              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+272c uni272C              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+272d uni272D              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+272e uni272E              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+272f uni272F              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2730 uni2730              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2731 uni2731              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2732 uni2732              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2733 uni2733              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2734 uni2734              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2735 uni2735              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2736 uni2736              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2737 uni2737              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2738 uni2738              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2739 uni2739              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+273a uni273A              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+273b uni273B              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+273c uni273C              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+273d uni273D              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+273e uni273E              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+273f uni273F              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2740 uni2740              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2741 uni2741              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2742 uni2742              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2743 uni2743              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2744 uni2744              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2745 uni2745              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2746 uni2746              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2747 uni2747              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2748 uni2748              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2749 uni2749              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+274a uni274A              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+274b uni274B              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+274d uni274D              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+274f uni274F              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2750 uni2750              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2751 uni2751              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2752 uni2752              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2756 uni2756              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2758 uni2758              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2759 uni2759              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+275a uni275A              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+275b uni275B              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+275c uni275C              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+275d uni275D              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+275e uni275E              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2761 uni2761              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2762 uni2762              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2763 uni2763              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2764 uni2764              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2765 uni2765              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2766 uni2766              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2767 uni2767              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2768 uni2768              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2769 uni2769              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+276a uni276A              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+276b uni276B              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+276c uni276C              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+276d uni276D              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+276e uni276E              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+276f uni276F              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2770 uni2770              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2771 uni2771              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2772 uni2772              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2773 uni2773              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2774 uni2774              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2775 uni2775              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2776 uni2776              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2777 uni2777              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2778 uni2778              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2779 uni2779              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+277a uni277A              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+277b uni277B              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+277c uni277C              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+277d uni277D              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+277e uni277E              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+277f uni277F              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2780 uni2780              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2781 uni2781              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2782 uni2782              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2783 uni2783              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2784 uni2784              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2785 uni2785              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2786 uni2786              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2787 uni2787              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2788 uni2788              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2789 uni2789              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+278a uni278A              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+278b uni278B              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+278c uni278C              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+278d uni278D              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+278e uni278E              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+278f uni278F              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2790 uni2790              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2791 uni2791              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2792 uni2792              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2793 uni2793              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2794 uni2794              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2798 uni2798              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2799 uni2799              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+279a uni279A              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+279b uni279B              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+279c uni279C              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+279d uni279D              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+279e uni279E              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+279f uni279F              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+27a0 uni27A0              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+27a1 uni27A1              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+27a2 uni27A2              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+27a3 uni27A3              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+27a4 uni27A4              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+27a5 uni27A5              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+27a6 uni27A6              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+27a7 uni27A7              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+27a8 uni27A8              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+27a9 uni27A9              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+27aa uni27AA              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+27ab uni27AB              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+27ac uni27AC              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+27ad uni27AD              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+27ae uni27AE              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+27af uni27AF              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+27b1 uni27B1              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+27b2 uni27B2              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+27b3 uni27B3              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+27b4 uni27B4              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+27b5 uni27B5              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+27b6 uni27B6              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+27b7 uni27B7              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+27b8 uni27B8              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+27b9 uni27B9              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+27ba uni27BA              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+27bb uni27BB              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+27bc uni27BC              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+27bd uni27BD              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+27be uni27BE              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+27bf uni27BF              2.7 (Sans Mono Bold)
-U+27c5 uni27C5              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+27c6 uni27C6              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+27e0 uni27E0              2.3
-U+27e6 uni27E6              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+27e7 uni27E7              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+27e8 uni27E8              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.13 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+27e9 uni27E9              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.13 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+27ea uni27EA              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+27eb uni27EB              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+27f0 uni27F0              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+27f1 uni27F1              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+27f2 uni27F2              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+27f3 uni27F3              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+27f4 uni27F4              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+27f5 uni27F5              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+27f6 uni27F6              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+27f7 uni27F7              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+27f8 uni27F8              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+27f9 uni27F9              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+27fa uni27FA              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+27fb uni27FB              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+27fc uni27FC              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+27fd uni27FD              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+27fe uni27FE              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+27ff uni27FF              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2800 uni2800              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2801 uni2801              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2802 uni2802              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2803 uni2803              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2804 uni2804              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2805 uni2805              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2806 uni2806              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2807 uni2807              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2808 uni2808              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2809 uni2809              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+280a uni280A              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+280b uni280B              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+280c uni280C              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+280d uni280D              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+280e uni280E              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+280f uni280F              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2810 uni2810              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2811 uni2811              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2812 uni2812              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2813 uni2813              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2814 uni2814              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2815 uni2815              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2816 uni2816              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2817 uni2817              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2818 uni2818              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2819 uni2819              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+281a uni281A              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+281b uni281B              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+281c uni281C              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+281d uni281D              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+281e uni281E              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+281f uni281F              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2820 uni2820              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2821 uni2821              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2822 uni2822              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2823 uni2823              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2824 uni2824              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2825 uni2825              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2826 uni2826              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2827 uni2827              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2828 uni2828              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2829 uni2829              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+282a uni282A              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+282b uni282B              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+282c uni282C              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+282d uni282D              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+282e uni282E              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+282f uni282F              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2830 uni2830              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2831 uni2831              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2832 uni2832              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2833 uni2833              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2834 uni2834              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2835 uni2835              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2836 uni2836              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2837 uni2837              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2838 uni2838              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2839 uni2839              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+283a uni283A              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+283b uni283B              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+283c uni283C              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+283d uni283D              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+283e uni283E              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+283f uni283F              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2840 uni2840              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2841 uni2841              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2842 uni2842              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2843 uni2843              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2844 uni2844              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2845 uni2845              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2846 uni2846              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2847 uni2847              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2848 uni2848              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2849 uni2849              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+284a uni284A              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+284b uni284B              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+284c uni284C              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+284d uni284D              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+284e uni284E              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+284f uni284F              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2850 uni2850              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2851 uni2851              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2852 uni2852              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2853 uni2853              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2854 uni2854              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2855 uni2855              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2856 uni2856              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2857 uni2857              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2858 uni2858              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2859 uni2859              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+285a uni285A              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+285b uni285B              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+285c uni285C              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+285d uni285D              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+285e uni285E              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+285f uni285F              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2860 uni2860              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2861 uni2861              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2862 uni2862              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2863 uni2863              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2864 uni2864              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2865 uni2865              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2866 uni2866              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2867 uni2867              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2868 uni2868              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2869 uni2869              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+286a uni286A              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+286b uni286B              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+286c uni286C              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+286d uni286D              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+286e uni286E              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+286f uni286F              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2870 uni2870              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2871 uni2871              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2872 uni2872              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2873 uni2873              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2874 uni2874              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2875 uni2875              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2876 uni2876              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2877 uni2877              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2878 uni2878              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2879 uni2879              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+287a uni287A              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+287b uni287B              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+287c uni287C              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+287d uni287D              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+287e uni287E              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+287f uni287F              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2880 uni2880              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2881 uni2881              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2882 uni2882              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2883 uni2883              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2884 uni2884              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2885 uni2885              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2886 uni2886              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2887 uni2887              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2888 uni2888              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2889 uni2889              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+288a uni288A              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+288b uni288B              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+288c uni288C              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+288d uni288D              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+288e uni288E              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+288f uni288F              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2890 uni2890              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2891 uni2891              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2892 uni2892              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2893 uni2893              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2894 uni2894              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2895 uni2895              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2896 uni2896              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2897 uni2897              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2898 uni2898              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2899 uni2899              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+289a uni289A              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+289b uni289B              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+289c uni289C              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+289d uni289D              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+289e uni289E              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+289f uni289F              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28a0 uni28A0              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28a1 uni28A1              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28a2 uni28A2              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28a3 uni28A3              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28a4 uni28A4              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28a5 uni28A5              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28a6 uni28A6              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28a7 uni28A7              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28a8 uni28A8              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28a9 uni28A9              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28aa uni28AA              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28ab uni28AB              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28ac uni28AC              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28ad uni28AD              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28ae uni28AE              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28af uni28AF              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28b0 uni28B0              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28b1 uni28B1              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28b2 uni28B2              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28b3 uni28B3              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28b4 uni28B4              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28b5 uni28B5              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28b6 uni28B6              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28b7 uni28B7              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28b8 uni28B8              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28b9 uni28B9              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28ba uni28BA              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28bb uni28BB              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28bc uni28BC              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28bd uni28BD              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28be uni28BE              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28bf uni28BF              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28c0 uni28C0              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28c1 uni28C1              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28c2 uni28C2              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28c3 uni28C3              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28c4 uni28C4              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28c5 uni28C5              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28c6 uni28C6              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28c7 uni28C7              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28c8 uni28C8              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28c9 uni28C9              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28ca uni28CA              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28cb uni28CB              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28cc uni28CC              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28cd uni28CD              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28ce uni28CE              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28cf uni28CF              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28d0 uni28D0              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28d1 uni28D1              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28d2 uni28D2              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28d3 uni28D3              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28d4 uni28D4              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28d5 uni28D5              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28d6 uni28D6              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28d7 uni28D7              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28d8 uni28D8              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28d9 uni28D9              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28da uni28DA              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28db uni28DB              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28dc uni28DC              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28dd uni28DD              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28de uni28DE              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28df uni28DF              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28e0 uni28E0              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28e1 uni28E1              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28e2 uni28E2              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28e3 uni28E3              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28e4 uni28E4              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28e5 uni28E5              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28e6 uni28E6              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28e7 uni28E7              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28e8 uni28E8              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28e9 uni28E9              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28ea uni28EA              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28eb uni28EB              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28ec uni28EC              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28ed uni28ED              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28ee uni28EE              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28ef uni28EF              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28f0 uni28F0              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28f1 uni28F1              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28f2 uni28F2              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28f3 uni28F3              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28f4 uni28F4              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28f5 uni28F5              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28f6 uni28F6              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28f7 uni28F7              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28f8 uni28F8              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28f9 uni28F9              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28fa uni28FA              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28fb uni28FB              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28fc uni28FC              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28fd uni28FD              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28fe uni28FE              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28ff uni28FF              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2900 uni2900              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2901 uni2901              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2902 uni2902              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2903 uni2903              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2904 uni2904              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2905 uni2905              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2906 uni2906              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2907 uni2907              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2908 uni2908              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2909 uni2909              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+290a uni290A              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+290b uni290B              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+290c uni290C              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+290d uni290D              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+290e uni290E              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+290f uni290F              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2910 uni2910              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2911 uni2911              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2912 uni2912              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2913 uni2913              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2914 uni2914              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2915 uni2915              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2916 uni2916              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2917 uni2917              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2918 uni2918              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2919 uni2919              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+291a uni291A              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+291b uni291B              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+291c uni291C              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+291d uni291D              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+291e uni291E              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+291f uni291F              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2920 uni2920              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2921 uni2921              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2922 uni2922              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2923 uni2923              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2924 uni2924              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2925 uni2925              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2926 uni2926              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2927 uni2927              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2928 uni2928              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2929 uni2929              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+292a uni292A              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+292b uni292B              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+292c uni292C              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+292d uni292D              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+292e uni292E              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+292f uni292F              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2930 uni2930              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2931 uni2931              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2932 uni2932              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2933 uni2933              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2934 uni2934              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2935 uni2935              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2936 uni2936              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2937 uni2937              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2938 uni2938              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2939 uni2939              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+293a uni293A              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+293b uni293B              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+293c uni293C              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+293d uni293D              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+293e uni293E              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+293f uni293F              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2940 uni2940              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2941 uni2941              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2942 uni2942              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2943 uni2943              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2944 uni2944              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2945 uni2945              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2946 uni2946              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2947 uni2947              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2948 uni2948              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2949 uni2949              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+294a uni294A              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+294b uni294B              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+294c uni294C              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+294d uni294D              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+294e uni294E              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+294f uni294F              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2950 uni2950              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2951 uni2951              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2952 uni2952              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2953 uni2953              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2954 uni2954              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2955 uni2955              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2956 uni2956              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2957 uni2957              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2958 uni2958              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2959 uni2959              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+295a uni295A              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+295b uni295B              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+295c uni295C              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+295d uni295D              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+295e uni295E              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+295f uni295F              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2960 uni2960              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2961 uni2961              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2962 uni2962              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2963 uni2963              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2964 uni2964              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2965 uni2965              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2966 uni2966              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2967 uni2967              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2968 uni2968              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2969 uni2969              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+296a uni296A              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+296b uni296B              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+296c uni296C              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+296d uni296D              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+296e uni296E              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+296f uni296F              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2970 uni2970              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2971 uni2971              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2972 uni2972              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2973 uni2973              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2974 uni2974              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2975 uni2975              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2976 uni2976              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2977 uni2977              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2978 uni2978              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2979 uni2979              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+297a uni297A              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+297b uni297B              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+297c uni297C              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+297d uni297D              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+297e uni297E              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+297f uni297F              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2983 uni2983              2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+2984 uni2984              2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+29ce uni29CE              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+29cf uni29CF              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+29d0 uni29D0              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+29d1 uni29D1              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+29d2 uni29D2              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+29d3 uni29D3              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+29d4 uni29D4              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+29d5 uni29D5              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+29eb uni29EB              2.2
-U+29fa uni29FA              2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+29fb uni29FB              2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+2a00 uni2A00              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a01 uni2A01              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a02 uni2A02              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a0c uni2A0C              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2a0d uni2A0D              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2a0e uni2A0E              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2a0f uni2A0F              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a10 uni2A10              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a11 uni2A11              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a12 uni2A12              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a13 uni2A13              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a14 uni2A14              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a15 uni2A15              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a16 uni2A16              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a17 uni2A17              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a18 uni2A18              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a19 uni2A19              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a1a uni2A1A              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a1b uni2A1B              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a1c uni2A1C              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a2f uni2A2F              2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+2a7d uni2A7D              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a7e uni2A7E              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a7f uni2A7F              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a80 uni2A80              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a81 uni2A81              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a82 uni2A82              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a83 uni2A83              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a84 uni2A84              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a85 uni2A85              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a86 uni2A86              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a87 uni2A87              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a88 uni2A88              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a89 uni2A89              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a8a uni2A8A              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a8b uni2A8B              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a8c uni2A8C              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a8d uni2A8D              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a8e uni2A8E              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a8f uni2A8F              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a90 uni2A90              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a91 uni2A91              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a92 uni2A92              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a93 uni2A93              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a94 uni2A94              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a95 uni2A95              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a96 uni2A96              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a97 uni2A97              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a98 uni2A98              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a99 uni2A99              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a9a uni2A9A              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a9b uni2A9B              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a9c uni2A9C              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a9d uni2A9D              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a9e uni2A9E              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a9f uni2A9F              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2aa0 uni2AA0              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2aae uni2AAE              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2aaf uni2AAF              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2ab0 uni2AB0              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2ab1 uni2AB1              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2ab2 uni2AB2              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2ab3 uni2AB3              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2ab4 uni2AB4              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2ab5 uni2AB5              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2ab6 uni2AB6              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2ab7 uni2AB7              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2ab8 uni2AB8              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2ab9 uni2AB9              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2aba uni2ABA              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2af9 uni2AF9              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2afa uni2AFA              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2b00 uni2B00              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2b01 uni2B01              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2b02 uni2B02              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2b03 uni2B03              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2b04 uni2B04              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2b05 uni2B05              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2b06 uni2B06              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2b07 uni2B07              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2b08 uni2B08              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2b09 uni2B09              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2b0a uni2B0A              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2b0b uni2B0B              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2b0c uni2B0C              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2b0d uni2B0D              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2b0e uni2B0E              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2b0f uni2B0F              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2b10 uni2B10              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2b11 uni2B11              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2b12 uni2B12              2.3
-U+2b13 uni2B13              2.3
-U+2b14 uni2B14              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+2b15 uni2B15              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+2b16 uni2B16              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+2b17 uni2B17              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+2b18 uni2B18              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+2b19 uni2B19              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+2b1a uni2B1A              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+2b1f uni2B1F              2.29 (Sans, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.30 (Sans Bold)
-U+2b20 uni2B20              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2b21 uni2B21              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2b22 uni2B22              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2b23 uni2B23              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2b24 uni2B24              2.29 (Sans, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.30 (Sans Bold)
-U+2b53 uni2B53              2.29 (Sans, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.30 (Sans Bold)
-U+2b54 uni2B54              2.29 (Sans, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.30 (Sans Bold)
-U+2c60 uni2C60              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+2c61 uni2C61              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+2c62 uni2C62              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+2c63 uni2C63              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+2c64 uni2C64              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.27 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2c65 uni2C65              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+2c66 uni2C66              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+2c67 uni2C67              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2c68 uni2C68              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2c69 uni2C69              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2c6a uni2C6A              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2c6b uni2C6B              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2c6c uni2C6C              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2c6d uni2C6D              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2c6e uni2C6E              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.27 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2c6f uni2C6F              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.27 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed) 2.28 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2c71 uni2C71              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2c72 uni2C72              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2c73 uni2C73              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2c74 uni2C74              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+2c75 uni2C75              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Sans ExtraLight, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.20 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+2c76 uni2C76              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Sans ExtraLight, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.20 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+2c77 uni2C77              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Sans ExtraLight, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.20 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+2c79 uni2C79              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.27 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed) 2.28 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2c7a uni2C7A              2.27
-U+2c7b uni2C7B              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2c7c uni2C7C              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.27 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed) 2.28 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2c7d uni2C7D              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.27 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed) 2.28 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2d00 uni2D00              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d01 uni2D01              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d02 uni2D02              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d03 uni2D03              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d04 uni2D04              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d05 uni2D05              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d06 uni2D06              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d07 uni2D07              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d08 uni2D08              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d09 uni2D09              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d0a uni2D0A              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d0b uni2D0B              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d0c uni2D0C              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d0d uni2D0D              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d0e uni2D0E              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d0f uni2D0F              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d10 uni2D10              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d11 uni2D11              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d12 uni2D12              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d13 uni2D13              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d14 uni2D14              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d15 uni2D15              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d16 uni2D16              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d17 uni2D17              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d18 uni2D18              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d19 uni2D19              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d1a uni2D1A              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d1b uni2D1B              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d1c uni2D1C              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d1d uni2D1D              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d1e uni2D1E              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d1f uni2D1F              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d20 uni2D20              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d21 uni2D21              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d22 uni2D22              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d23 uni2D23              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d24 uni2D24              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d25 uni2D25              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d30 uni2D30              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d31 uni2D31              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d32 uni2D32              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d33 uni2D33              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d34 uni2D34              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d35 uni2D35              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d36 uni2D36              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d37 uni2D37              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d38 uni2D38              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d39 uni2D39              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d3a uni2D3A              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d3b uni2D3B              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d3c uni2D3C              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d3d uni2D3D              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d3e uni2D3E              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d3f uni2D3F              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d40 uni2D40              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d41 uni2D41              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d42 uni2D42              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d43 uni2D43              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d44 uni2D44              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d45 uni2D45              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d46 uni2D46              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d47 uni2D47              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d48 uni2D48              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d49 uni2D49              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d4a uni2D4A              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d4b uni2D4B              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d4c uni2D4C              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d4d uni2D4D              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d4e uni2D4E              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d4f uni2D4F              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d50 uni2D50              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d51 uni2D51              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d52 uni2D52              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d53 uni2D53              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d54 uni2D54              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d55 uni2D55              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d56 uni2D56              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d57 uni2D57              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d58 uni2D58              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d59 uni2D59              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d5a uni2D5A              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d5b uni2D5B              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d5c uni2D5C              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d5d uni2D5D              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d5e uni2D5E              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d5f uni2D5F              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d60 uni2D60              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d61 uni2D61              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d62 uni2D62              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d63 uni2D63              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d64 uni2D64              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d65 uni2D65              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d6f uni2D6F              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2e18 uni2E18              2.26
-U+2e22 uni2E22              2.29 (Sans, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed) 2.30 (Sans Bold)
-U+2e23 uni2E23              2.29 (Sans, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed) 2.30 (Sans Bold)
-U+2e24 uni2E24              2.29 (Sans, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed) 2.30 (Sans Bold)
-U+2e25 uni2E25              2.29 (Sans, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed) 2.30 (Sans Bold)
-U+2e2e uni2E2E              2.26
-U+4dc0 uni4DC0              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dc1 uni4DC1              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dc2 uni4DC2              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dc3 uni4DC3              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dc4 uni4DC4              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dc5 uni4DC5              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dc6 uni4DC6              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dc7 uni4DC7              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dc8 uni4DC8              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dc9 uni4DC9              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dca uni4DCA              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dcb uni4DCB              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dcc uni4DCC              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dcd uni4DCD              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dce uni4DCE              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dcf uni4DCF              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dd0 uni4DD0              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dd1 uni4DD1              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dd2 uni4DD2              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dd3 uni4DD3              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dd4 uni4DD4              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dd5 uni4DD5              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dd6 uni4DD6              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dd7 uni4DD7              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dd8 uni4DD8              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dd9 uni4DD9              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dda uni4DDA              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4ddb uni4DDB              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4ddc uni4DDC              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4ddd uni4DDD              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dde uni4DDE              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4ddf uni4DDF              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4de0 uni4DE0              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4de1 uni4DE1              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4de2 uni4DE2              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4de3 uni4DE3              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4de4 uni4DE4              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4de5 uni4DE5              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4de6 uni4DE6              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4de7 uni4DE7              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4de8 uni4DE8              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4de9 uni4DE9              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dea uni4DEA              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4deb uni4DEB              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dec uni4DEC              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4ded uni4DED              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dee uni4DEE              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4def uni4DEF              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4df0 uni4DF0              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4df1 uni4DF1              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4df2 uni4DF2              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4df3 uni4DF3              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4df4 uni4DF4              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4df5 uni4DF5              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4df6 uni4DF6              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4df7 uni4DF7              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4df8 uni4DF8              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4df9 uni4DF9              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dfa uni4DFA              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dfb uni4DFB              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dfc uni4DFC              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dfd uni4DFD              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dfe uni4DFE              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dff uni4DFF              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+a644 uniA644              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.27 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+a645 uniA645              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.27 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+a646 uniA646              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.27 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+a647 uniA647              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.27 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+a64c uniA64C              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+a64d uniA64D              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+a650 uniA650              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.27 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+a651 uniA651              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.27 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+a654 uniA654              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.27 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+a655 uniA655              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.27 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+a656 uniA656              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.27 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+a657 uniA657              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.27 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+a662 uniA662              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+a663 uniA663              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+a664 uniA664              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+a665 uniA665              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+a666 uniA666              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+a667 uniA667              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+a668 uniA668              2.27 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+a669 uniA669              2.27 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+a66a uniA66A              2.27 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+a66b uniA66B              2.27 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+a66c uniA66C              2.27 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+a66d uniA66D              2.27 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+a66e uniA66E              2.27 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+a68a uniA68A              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+a68b uniA68B              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+a68c uniA68C              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+a68d uniA68D              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+a694 uniA694              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+a695 uniA695              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+a708 uniA708              2.27
-U+a709 uniA709              2.27
-U+a70a uniA70A              2.27
-U+a70b uniA70B              2.27
-U+a70c uniA70C              2.27
-U+a70d uniA70D              2.27
-U+a70e uniA70E              2.27
-U+a70f uniA70F              2.27
-U+a710 uniA710              2.27
-U+a711 uniA711              2.27
-U+a712 uniA712              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.27 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+a713 uniA713              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.27 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+a714 uniA714              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.27 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+a715 uniA715              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.27 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+a716 uniA716              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.27 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+a71b uniA71B              2.27
-U+a71c uniA71C              2.27
-U+a71d uniA71D              2.27
-U+a71e uniA71E              2.27
-U+a71f uniA71F              2.27
-U+a726 uniA726              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.30 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+a727 uniA727              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.30 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+a728 uniA728              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+a729 uniA729              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+a72a uniA72A              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+a72b uniA72B              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+a730 uniA730              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+a731 uniA731              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+a732 uniA732              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+a733 uniA733              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+a734 uniA734              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+a735 uniA735              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+a736 uniA736              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+a737 uniA737              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+a738 uniA738              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+a739 uniA739              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+a73a uniA73A              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+a73b uniA73B              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+a73c uniA73C              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+a73d uniA73D              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+a73e uniA73E              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+a73f uniA73F              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+a746 uniA746              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+a747 uniA747              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+a748 uniA748              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+a749 uniA749              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+a74a uniA74A              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+a74b uniA74B              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+a74e uniA74E              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+a74f uniA74F              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+a780 uniA780              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+a781 uniA781              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+a782 uniA782              2.27 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+a783 uniA783              2.27 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+a789 uniA789              2.28 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+a78a uniA78A              2.28 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+a78b uniA78B              2.26
-U+a78c uniA78C              2.26
-U+a7fb uniA7FB              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+a7fc uniA7FC              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+a7fd uniA7FD              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+a7fe uniA7FE              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+a7ff uniA7FF              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+e000 uniE000              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+e001 uniE001              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+e002 uniE002              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+e003 uniE003              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+e004 uniE004              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+e005 uniE005              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+e006 uniE006              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+e007 uniE007              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+e008 uniE008              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+e009 uniE009              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+e00a uniE00A              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+e00b uniE00B              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+e00c uniE00C              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+e00d uniE00D              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+e00e uniE00E              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+e00f uniE00F              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+e010 uniE010              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+e011 uniE011              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+e012 uniE012              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+e013 uniE013              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+e014 uniE014              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+e015 uniE015              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+e016 uniE016              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+e017 uniE017              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+e018 uniE018              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+e019 uniE019              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+e01a uniE01A              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+e01b uniE01B              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+e01c uniE01C              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+e01d uniE01D              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+f000 uniF000              2.10 (Sans) 2.11 (Sans Condensed)
-U+f001 uniF001              2.10 (Sans) 2.11 (Sans Condensed)
-U+f208 uniF208              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+f20a uniF20A              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+f215 uniF215              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+f216 uniF216              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+f217 uniF217              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+f21a uniF21A              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+f21b uniF21B              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+f25f uniF25F              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+f400 uniF400              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f401 uniF401              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f402 uniF402              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f403 uniF403              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f404 uniF404              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f405 uniF405              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f406 uniF406              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f407 uniF407              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f408 uniF408              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f409 uniF409              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f40a uniF40A              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f40b uniF40B              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f40c uniF40C              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f40d uniF40D              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f40e uniF40E              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f40f uniF40F              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f410 uniF410              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f411 uniF411              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f412 uniF412              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f413 uniF413              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f414 uniF414              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f415 uniF415              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f416 uniF416              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f417 uniF417              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f418 uniF418              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f419 uniF419              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f41a uniF41A              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f41b uniF41B              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f41c uniF41C              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f41d uniF41D              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f41e uniF41E              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f41f uniF41F              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f420 uniF420              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f421 uniF421              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f422 uniF422              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f423 uniF423              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f424 uniF424              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f425 uniF425              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f426 uniF426              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f428 uniF428              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f5c5 uniF5C5              2.9 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+f6c4 uniF6C4              2.10 (Serif Bold Italic, Serif Italic) 2.11 (Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+f6c5 uniF6C5              2.5 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.9 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Condensed Oblique, Sans Oblique) 2.18 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+f6c6 uniF6C6              2.5 (Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+f6c7 uniF6C7              2.11 (Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+f6c8 uniF6C8              2.11 (Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+f6d1 cyrBreve             2.5 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+f6d4 cyrbreve             2.5 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+fb00 uniFB00              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight) 2.8 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+fb01 fi                   original
-U+fb02 fl                   original
-U+fb03 uniFB03              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight) 2.8 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+fb04 uniFB04              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight) 2.8 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+fb05 uniFB05              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+fb06 uniFB06              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+fb13 uniFB13              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb14 uniFB14              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb15 uniFB15              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb16 uniFB16              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb17 uniFB17              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb1d uniFB1D              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb1e uniFB1E              2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+fb1f uniFB1F              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb20 uniFB20              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb21 uniFB21              2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+fb22 uniFB22              2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+fb23 uniFB23              2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+fb24 uniFB24              2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+fb25 uniFB25              2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+fb26 uniFB26              2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+fb27 uniFB27              2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+fb28 uniFB28              2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+fb29 uniFB29              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans ExtraLight, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+fb2a uniFB2A              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb2b uniFB2B              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb2c uniFB2C              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb2d uniFB2D              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb2e uniFB2E              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb2f uniFB2F              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb30 uniFB30              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb31 uniFB31              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb32 uniFB32              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb33 uniFB33              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb34 uniFB34              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb35 uniFB35              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb36 uniFB36              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb37 uniFB37              2.11 (Sans Condensed Oblique, Sans Oblique)
-U+fb38 uniFB38              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb39 uniFB39              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb3a uniFB3A              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb3b uniFB3B              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb3c uniFB3C              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb3e uniFB3E              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb40 uniFB40              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb41 uniFB41              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb43 uniFB43              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb44 uniFB44              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb46 uniFB46              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb47 uniFB47              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb48 uniFB48              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb49 uniFB49              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb4a uniFB4A              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb4b uniFB4B              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb4c uniFB4C              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb4d uniFB4D              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb4e uniFB4E              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb4f uniFB4F              2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+fb52 uniFB52              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb53 uniFB53              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb54 uniFB54              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb55 uniFB55              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb56 uniFB56              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb57 uniFB57              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb58 uniFB58              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb59 uniFB59              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb5a uniFB5A              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb5b uniFB5B              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb5c uniFB5C              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb5d uniFB5D              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb5e uniFB5E              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb5f uniFB5F              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb60 uniFB60              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb61 uniFB61              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb62 uniFB62              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb63 uniFB63              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb64 uniFB64              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb65 uniFB65              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb66 uniFB66              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb67 uniFB67              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb68 uniFB68              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb69 uniFB69              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb6a uniFB6A              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb6b uniFB6B              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb6c uniFB6C              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb6d uniFB6D              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb6e uniFB6E              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb6f uniFB6F              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb70 uniFB70              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb71 uniFB71              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb72 uniFB72              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb73 uniFB73              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb74 uniFB74              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb75 uniFB75              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb76 uniFB76              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb77 uniFB77              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb78 uniFB78              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb79 uniFB79              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb7a uniFB7A              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb7b uniFB7B              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb7c uniFB7C              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb7d uniFB7D              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb7e uniFB7E              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb7f uniFB7F              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb80 uniFB80              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb81 uniFB81              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb8a uniFB8A              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb8b uniFB8B              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb8c uniFB8C              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb8d uniFB8D              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb8e uniFB8E              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb8f uniFB8F              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb90 uniFB90              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb91 uniFB91              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb92 uniFB92              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb93 uniFB93              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb94 uniFB94              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb95 uniFB95              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb9e uniFB9E              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb9f uniFB9F              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fbaa uniFBAA              2.16 (Sans Mono, Sans Mono Bold)
-U+fbab uniFBAB              2.16 (Sans Mono, Sans Mono Bold)
-U+fbac uniFBAC              2.16 (Sans Mono, Sans Mono Bold)
-U+fbad uniFBAD              2.16 (Sans Mono, Sans Mono Bold)
-U+fbd9 uniFBD9              2.7 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+fbda uniFBDA              2.7 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+fbe8 uniFBE8              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fbe9 uniFBE9              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fbfc uniFBFC              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fbfd uniFBFD              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fbfe uniFBFE              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fbff uniFBFF              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe00 uniFE00              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+fe01 uniFE01              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+fe02 uniFE02              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+fe03 uniFE03              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+fe04 uniFE04              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+fe05 uniFE05              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+fe06 uniFE06              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+fe07 uniFE07              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+fe08 uniFE08              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+fe09 uniFE09              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+fe0a uniFE0A              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+fe0b uniFE0B              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+fe0c uniFE0C              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+fe0d uniFE0D              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+fe0e uniFE0E              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+fe0f uniFE0F              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+fe20 uniFE20              2.21 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fe21 uniFE21              2.21 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fe22 uniFE22              2.21 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fe23 uniFE23              2.21 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fe70 uniFE70              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe71 uniFE71              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe72 uniFE72              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe73 uniFE73              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe74 uniFE74              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe76 uniFE76              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe77 uniFE77              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe78 uniFE78              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe79 uniFE79              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe7a uniFE7A              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe7b uniFE7B              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe7c uniFE7C              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe7d uniFE7D              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe7e uniFE7E              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe7f uniFE7F              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe80 uniFE80              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe81 uniFE81              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe82 uniFE82              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe83 uniFE83              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe84 uniFE84              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe85 uniFE85              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe86 uniFE86              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe87 uniFE87              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe88 uniFE88              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe89 uniFE89              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe8a uniFE8A              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe8b uniFE8B              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe8c uniFE8C              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe8d uniFE8D              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe8e uniFE8E              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe8f uniFE8F              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe90 uniFE90              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe91 uniFE91              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe92 uniFE92              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe93 uniFE93              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe94 uniFE94              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe95 uniFE95              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe96 uniFE96              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe97 uniFE97              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe98 uniFE98              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe99 uniFE99              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe9a uniFE9A              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe9b uniFE9B              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe9c uniFE9C              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe9d uniFE9D              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe9e uniFE9E              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe9f uniFE9F              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fea0 uniFEA0              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fea1 uniFEA1              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fea2 uniFEA2              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fea3 uniFEA3              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fea4 uniFEA4              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fea5 uniFEA5              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fea6 uniFEA6              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fea7 uniFEA7              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fea8 uniFEA8              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fea9 uniFEA9              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+feaa uniFEAA              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+feab uniFEAB              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+feac uniFEAC              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fead uniFEAD              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+feae uniFEAE              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+feaf uniFEAF              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+feb0 uniFEB0              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+feb1 uniFEB1              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+feb2 uniFEB2              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+feb3 uniFEB3              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+feb4 uniFEB4              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+feb5 uniFEB5              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+feb6 uniFEB6              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+feb7 uniFEB7              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+feb8 uniFEB8              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+feb9 uniFEB9              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+feba uniFEBA              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+febb uniFEBB              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+febc uniFEBC              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+febd uniFEBD              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+febe uniFEBE              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+febf uniFEBF              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fec0 uniFEC0              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fec1 uniFEC1              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fec2 uniFEC2              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fec3 uniFEC3              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fec4 uniFEC4              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fec5 uniFEC5              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fec6 uniFEC6              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fec7 uniFEC7              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fec8 uniFEC8              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fec9 uniFEC9              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+feca uniFECA              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fecb uniFECB              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fecc uniFECC              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fecd uniFECD              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fece uniFECE              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fecf uniFECF              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fed0 uniFED0              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fed1 uniFED1              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fed2 uniFED2              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fed3 uniFED3              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fed4 uniFED4              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fed5 uniFED5              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fed6 uniFED6              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fed7 uniFED7              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fed8 uniFED8              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fed9 uniFED9              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+feda uniFEDA              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fedb uniFEDB              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fedc uniFEDC              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fedd uniFEDD              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fede uniFEDE              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fedf uniFEDF              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fee0 uniFEE0              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fee1 uniFEE1              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fee2 uniFEE2              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fee3 uniFEE3              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fee4 uniFEE4              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fee5 uniFEE5              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fee6 uniFEE6              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fee7 uniFEE7              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fee8 uniFEE8              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fee9 uniFEE9              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+feea uniFEEA              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+feeb uniFEEB              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+feec uniFEEC              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+feed uniFEED              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+feee uniFEEE              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+feef uniFEEF              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fef0 uniFEF0              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fef1 uniFEF1              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fef2 uniFEF2              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fef3 uniFEF3              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fef4 uniFEF4              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fef5 uniFEF5              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fef6 uniFEF6              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fef7 uniFEF7              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fef8 uniFEF8              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fef9 uniFEF9              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fefa uniFEFA              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fefb uniFEFB              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fefc uniFEFC              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+feff uniFEFF              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fff9 uniFFF9              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+fffa uniFFFA              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+fffb uniFFFB              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+fffc uniFFFC              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+fffd uniFFFD              1.12
-U+1d300 u1D300               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d301 u1D301               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d302 u1D302               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d303 u1D303               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d304 u1D304               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d305 u1D305               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d306 u1D306               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d307 u1D307               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d308 u1D308               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d309 u1D309               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d30a u1D30A               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d30b u1D30B               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d30c u1D30C               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d30d u1D30D               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d30e u1D30E               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d30f u1D30F               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d310 u1D310               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d311 u1D311               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d312 u1D312               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d313 u1D313               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d314 u1D314               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d315 u1D315               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d316 u1D316               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d317 u1D317               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d318 u1D318               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d319 u1D319               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d31a u1D31A               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d31b u1D31B               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d31c u1D31C               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d31d u1D31D               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d31e u1D31E               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d31f u1D31F               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d320 u1D320               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d321 u1D321               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d322 u1D322               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d323 u1D323               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d324 u1D324               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d325 u1D325               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d326 u1D326               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d327 u1D327               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d328 u1D328               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d329 u1D329               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d32a u1D32A               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d32b u1D32B               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d32c u1D32C               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d32d u1D32D               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d32e u1D32E               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d32f u1D32F               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d330 u1D330               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d331 u1D331               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d332 u1D332               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d333 u1D333               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d334 u1D334               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d335 u1D335               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d336 u1D336               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d337 u1D337               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d338 u1D338               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d339 u1D339               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d33a u1D33A               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d33b u1D33B               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d33c u1D33C               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d33d u1D33D               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d33e u1D33E               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d33f u1D33F               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d340 u1D340               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d341 u1D341               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d342 u1D342               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d343 u1D343               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d344 u1D344               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d345 u1D345               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d346 u1D346               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d347 u1D347               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d348 u1D348               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d349 u1D349               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d34a u1D34A               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d34b u1D34B               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d34c u1D34C               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d34d u1D34D               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d34e u1D34E               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d34f u1D34F               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d350 u1D350               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d351 u1D351               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d352 u1D352               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d353 u1D353               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d354 u1D354               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d355 u1D355               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d356 u1D356               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d400 u1D400               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d401 u1D401               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d402 u1D402               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d403 u1D403               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d404 u1D404               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d405 u1D405               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d406 u1D406               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d407 u1D407               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d408 u1D408               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d409 u1D409               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d40a u1D40A               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d40b u1D40B               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d40c u1D40C               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d40d u1D40D               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d40e u1D40E               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d40f u1D40F               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d410 u1D410               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d411 u1D411               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d412 u1D412               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d413 u1D413               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d414 u1D414               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d415 u1D415               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d416 u1D416               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d417 u1D417               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d418 u1D418               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d419 u1D419               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d41a u1D41A               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d41b u1D41B               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d41c u1D41C               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d41d u1D41D               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d41e u1D41E               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d41f u1D41F               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d420 u1D420               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d421 u1D421               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d422 u1D422               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d423 u1D423               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d424 u1D424               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d425 u1D425               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d426 u1D426               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d427 u1D427               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d428 u1D428               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d429 u1D429               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d42a u1D42A               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d42b u1D42B               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d42c u1D42C               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d42d u1D42D               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d42e u1D42E               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d42f u1D42F               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d430 u1D430               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d431 u1D431               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d432 u1D432               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d433 u1D433               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d434 u1D434               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d435 u1D435               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d436 u1D436               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d437 u1D437               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d438 u1D438               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d439 u1D439               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d43a u1D43A               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d43b u1D43B               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d43c u1D43C               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d43d u1D43D               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d43e u1D43E               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d43f u1D43F               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d440 u1D440               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d441 u1D441               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d442 u1D442               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d443 u1D443               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d444 u1D444               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d445 u1D445               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d446 u1D446               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d447 u1D447               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d448 u1D448               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d449 u1D449               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d44a u1D44A               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d44b u1D44B               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d44c u1D44C               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d44d u1D44D               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d44e u1D44E               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d44f u1D44F               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d450 u1D450               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d451 u1D451               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d452 u1D452               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d453 u1D453               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d454 u1D454               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d456 u1D456               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d457 u1D457               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d458 u1D458               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d459 u1D459               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d45a u1D45A               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d45b u1D45B               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d45c u1D45C               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d45d u1D45D               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d45e u1D45E               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d45f u1D45F               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d460 u1D460               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d461 u1D461               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d462 u1D462               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d463 u1D463               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d464 u1D464               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d465 u1D465               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d466 u1D466               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d467 u1D467               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d468 u1D468               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d469 u1D469               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d46a u1D46A               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d46b u1D46B               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d46c u1D46C               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d46d u1D46D               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d46e u1D46E               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d46f u1D46F               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d470 u1D470               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d471 u1D471               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d472 u1D472               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d473 u1D473               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d474 u1D474               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d475 u1D475               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d476 u1D476               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d477 u1D477               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d478 u1D478               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d479 u1D479               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d47a u1D47A               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d47b u1D47B               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d47c u1D47C               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d47d u1D47D               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d47e u1D47E               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d47f u1D47F               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d480 u1D480               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d481 u1D481               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d482 u1D482               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d483 u1D483               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d484 u1D484               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d485 u1D485               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d486 u1D486               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d487 u1D487               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d488 u1D488               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d489 u1D489               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d48a u1D48A               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d48b u1D48B               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d48c u1D48C               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d48d u1D48D               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d48e u1D48E               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d48f u1D48F               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d490 u1D490               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d491 u1D491               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d492 u1D492               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d493 u1D493               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d494 u1D494               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d495 u1D495               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d496 u1D496               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d497 u1D497               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d498 u1D498               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d499 u1D499               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d49a u1D49A               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d49b u1D49B               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d538 u1D538               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d539 u1D539               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d53b u1D53B               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d53c u1D53C               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d53d u1D53D               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d53e u1D53E               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d540 u1D540               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d541 u1D541               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d542 u1D542               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d543 u1D543               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d544 u1D544               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d546 u1D546               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d54a u1D54A               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d54b u1D54B               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d54c u1D54C               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d54d u1D54D               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d54e u1D54E               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d54f u1D54F               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d550 u1D550               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d552 u1D552               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d553 u1D553               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d554 u1D554               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d555 u1D555               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d556 u1D556               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d557 u1D557               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d558 u1D558               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d559 u1D559               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d55a u1D55A               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d55b u1D55B               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d55c u1D55C               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d55d u1D55D               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d55e u1D55E               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d55f u1D55F               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d560 u1D560               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d561 u1D561               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d562 u1D562               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d563 u1D563               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d564 u1D564               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d565 u1D565               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d566 u1D566               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d567 u1D567               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d568 u1D568               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d569 u1D569               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d56a u1D56A               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d56b u1D56B               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d5a0 u1D5A0               2.23 (Sans, Sans Condensed)
-U+1d5a1 u1D5A1               2.23 (Sans, Sans Condensed)
-U+1d5a2 u1D5A2               2.23 (Sans, Sans Condensed)
-U+1d5a3 u1D5A3               2.23 (Sans, Sans Condensed)
-U+1d5a4 u1D5A4               2.23 (Sans, Sans Condensed)
-U+1d5a5 u1D5A5               2.23 (Sans, Sans Condensed)
-U+1d5a6 u1D5A6               2.23 (Sans, Sans Condensed)
-U+1d5a7 u1D5A7               2.23 (Sans, Sans Condensed)
-U+1d5a8 u1D5A8               2.23 (Sans, Sans Condensed)
-U+1d5a9 u1D5A9               2.23 (Sans, Sans Condensed)
-U+1d5aa u1D5AA               2.23 (Sans, Sans Condensed)
-U+1d5ab u1D5AB               2.23 (Sans, Sans Condensed)
-U+1d5ac u1D5AC               2.23 (Sans, Sans Condensed)
-U+1d5ad u1D5AD               2.23 (Sans, Sans Condensed)
-U+1d5ae u1D5AE               2.23 (Sans, Sans Condensed)
-U+1d5af u1D5AF               2.23 (Sans, Sans Condensed)
-U+1d5b0 u1D5B0               2.23 (Sans, Sans Condensed)
-U+1d5b1 u1D5B1               2.23 (Sans, Sans Condensed)
-U+1d5b2 u1D5B2               2.23 (Sans, Sans Condensed)
-U+1d5b3 u1D5B3               2.23 (Sans, Sans Condensed)
-U+1d5b4 u1D5B4               2.23 (Sans, Sans Condensed)
-U+1d5b5 u1D5B5               2.23 (Sans, Sans Condensed)
-U+1d5b6 u1D5B6               2.23 (Sans, Sans Condensed)
-U+1d5b7 u1D5B7               2.23 (Sans, Sans Condensed)
-U+1d5b8 u1D5B8               2.23 (Sans, Sans Condensed)
-U+1d5b9 u1D5B9               2.23 (Sans, Sans Condensed)
-U+1d5ba u1D5BA               2.23 (Sans, Sans Condensed)
-U+1d5bb u1D5BB               2.23 (Sans, Sans Condensed)
-U+1d5bc u1D5BC               2.23 (Sans, Sans Condensed)
-U+1d5bd u1D5BD               2.23 (Sans, Sans Condensed)
-U+1d5be u1D5BE               2.23 (Sans, Sans Condensed)
-U+1d5bf u1D5BF               2.23 (Sans, Sans Condensed)
-U+1d5c0 u1D5C0               2.23 (Sans, Sans Condensed)
-U+1d5c1 u1D5C1               2.23 (Sans, Sans Condensed)
-U+1d5c2 u1D5C2               2.23 (Sans, Sans Condensed)
-U+1d5c3 u1D5C3               2.23 (Sans, Sans Condensed)
-U+1d5c4 u1D5C4               2.23 (Sans, Sans Condensed)
-U+1d5c5 u1D5C5               2.23 (Sans, Sans Condensed)
-U+1d5c6 u1D5C6               2.23 (Sans, Sans Condensed)
-U+1d5c7 u1D5C7               2.23 (Sans, Sans Condensed)
-U+1d5c8 u1D5C8               2.23 (Sans, Sans Condensed)
-U+1d5c9 u1D5C9               2.23 (Sans, Sans Condensed)
-U+1d5ca u1D5CA               2.23 (Sans, Sans Condensed)
-U+1d5cb u1D5CB               2.23 (Sans, Sans Condensed)
-U+1d5cc u1D5CC               2.23 (Sans, Sans Condensed)
-U+1d5cd u1D5CD               2.23 (Sans, Sans Condensed)
-U+1d5ce u1D5CE               2.23 (Sans, Sans Condensed)
-U+1d5cf u1D5CF               2.23 (Sans, Sans Condensed)
-U+1d5d0 u1D5D0               2.23 (Sans, Sans Condensed)
-U+1d5d1 u1D5D1               2.23 (Sans, Sans Condensed)
-U+1d5d2 u1D5D2               2.23 (Sans, Sans Condensed)
-U+1d5d3 u1D5D3               2.23 (Sans, Sans Condensed)
-U+1d5d4 u1D5D4               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5d5 u1D5D5               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5d6 u1D5D6               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5d7 u1D5D7               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5d8 u1D5D8               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5d9 u1D5D9               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5da u1D5DA               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5db u1D5DB               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5dc u1D5DC               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5dd u1D5DD               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5de u1D5DE               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5df u1D5DF               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5e0 u1D5E0               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5e1 u1D5E1               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5e2 u1D5E2               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5e3 u1D5E3               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5e4 u1D5E4               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5e5 u1D5E5               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5e6 u1D5E6               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5e7 u1D5E7               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5e8 u1D5E8               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5e9 u1D5E9               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5ea u1D5EA               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5eb u1D5EB               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5ec u1D5EC               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5ed u1D5ED               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5ee u1D5EE               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5ef u1D5EF               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5f0 u1D5F0               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5f1 u1D5F1               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5f2 u1D5F2               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5f3 u1D5F3               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5f4 u1D5F4               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5f5 u1D5F5               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5f6 u1D5F6               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5f7 u1D5F7               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5f8 u1D5F8               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5f9 u1D5F9               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5fa u1D5FA               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5fb u1D5FB               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5fc u1D5FC               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5fd u1D5FD               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5fe u1D5FE               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5ff u1D5FF               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d600 u1D600               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d601 u1D601               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d602 u1D602               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d603 u1D603               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d604 u1D604               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d605 u1D605               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d606 u1D606               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d607 u1D607               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d608 u1D608               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d609 u1D609               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d60a u1D60A               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d60b u1D60B               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d60c u1D60C               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d60d u1D60D               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d60e u1D60E               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d60f u1D60F               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d610 u1D610               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d611 u1D611               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d612 u1D612               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d613 u1D613               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d614 u1D614               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d615 u1D615               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d616 u1D616               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d617 u1D617               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d618 u1D618               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d619 u1D619               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d61a u1D61A               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d61b u1D61B               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d61c u1D61C               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d61d u1D61D               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d61e u1D61E               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d61f u1D61F               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d620 u1D620               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d621 u1D621               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d622 u1D622               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d623 u1D623               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d624 u1D624               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d625 u1D625               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d626 u1D626               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d627 u1D627               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d628 u1D628               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d629 u1D629               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d62a u1D62A               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d62b u1D62B               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d62c u1D62C               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d62d u1D62D               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d62e u1D62E               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d62f u1D62F               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d630 u1D630               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d631 u1D631               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d632 u1D632               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d633 u1D633               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d634 u1D634               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d635 u1D635               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d636 u1D636               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d637 u1D637               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d638 u1D638               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d639 u1D639               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d63a u1D63A               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d63b u1D63B               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d63c u1D63C               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d63d u1D63D               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d63e u1D63E               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d63f u1D63F               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d640 u1D640               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d641 u1D641               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d642 u1D642               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d643 u1D643               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d644 u1D644               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d645 u1D645               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d646 u1D646               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d647 u1D647               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d648 u1D648               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d649 u1D649               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d64a u1D64A               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d64b u1D64B               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d64c u1D64C               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d64d u1D64D               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d64e u1D64E               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d64f u1D64F               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d650 u1D650               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d651 u1D651               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d652 u1D652               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d653 u1D653               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d654 u1D654               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d655 u1D655               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d656 u1D656               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d657 u1D657               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d658 u1D658               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d659 u1D659               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d65a u1D65A               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d65b u1D65B               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d65c u1D65C               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d65d u1D65D               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d65e u1D65E               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d65f u1D65F               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d660 u1D660               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d661 u1D661               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d662 u1D662               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d663 u1D663               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d664 u1D664               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d665 u1D665               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d666 u1D666               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d667 u1D667               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d668 u1D668               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d669 u1D669               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d66a u1D66A               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d66b u1D66B               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d66c u1D66C               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d66d u1D66D               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d66e u1D66E               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d66f u1D66F               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d670 u1D670               2.23 (Sans Mono)
-U+1d671 u1D671               2.23 (Sans Mono)
-U+1d672 u1D672               2.23 (Sans Mono)
-U+1d673 u1D673               2.23 (Sans Mono)
-U+1d674 u1D674               2.23 (Sans Mono)
-U+1d675 u1D675               2.23 (Sans Mono)
-U+1d676 u1D676               2.23 (Sans Mono)
-U+1d677 u1D677               2.23 (Sans Mono)
-U+1d678 u1D678               2.23 (Sans Mono)
-U+1d679 u1D679               2.23 (Sans Mono)
-U+1d67a u1D67A               2.23 (Sans Mono)
-U+1d67b u1D67B               2.23 (Sans Mono)
-U+1d67c u1D67C               2.23 (Sans Mono)
-U+1d67d u1D67D               2.23 (Sans Mono)
-U+1d67e u1D67E               2.23 (Sans Mono)
-U+1d67f u1D67F               2.23 (Sans Mono)
-U+1d680 u1D680               2.23 (Sans Mono)
-U+1d681 u1D681               2.23 (Sans Mono)
-U+1d682 u1D682               2.23 (Sans Mono)
-U+1d683 u1D683               2.23 (Sans Mono)
-U+1d684 u1D684               2.23 (Sans Mono)
-U+1d685 u1D685               2.23 (Sans Mono)
-U+1d686 u1D686               2.23 (Sans Mono)
-U+1d687 u1D687               2.23 (Sans Mono)
-U+1d688 u1D688               2.23 (Sans Mono)
-U+1d689 u1D689               2.23 (Sans Mono)
-U+1d68a u1D68A               2.23 (Sans Mono)
-U+1d68b u1D68B               2.23 (Sans Mono)
-U+1d68c u1D68C               2.23 (Sans Mono)
-U+1d68d u1D68D               2.23 (Sans Mono)
-U+1d68e u1D68E               2.23 (Sans Mono)
-U+1d68f u1D68F               2.23 (Sans Mono)
-U+1d690 u1D690               2.23 (Sans Mono)
-U+1d691 u1D691               2.23 (Sans Mono)
-U+1d692 u1D692               2.23 (Sans Mono)
-U+1d693 u1D693               2.23 (Sans Mono)
-U+1d694 u1D694               2.23 (Sans Mono)
-U+1d695 u1D695               2.23 (Sans Mono)
-U+1d696 u1D696               2.23 (Sans Mono)
-U+1d697 u1D697               2.23 (Sans Mono)
-U+1d698 u1D698               2.23 (Sans Mono)
-U+1d699 u1D699               2.23 (Sans Mono)
-U+1d69a u1D69A               2.23 (Sans Mono)
-U+1d69b u1D69B               2.23 (Sans Mono)
-U+1d69c u1D69C               2.23 (Sans Mono)
-U+1d69d u1D69D               2.23 (Sans Mono)
-U+1d69e u1D69E               2.23 (Sans Mono)
-U+1d69f u1D69F               2.23 (Sans Mono)
-U+1d6a0 u1D6A0               2.23 (Sans Mono)
-U+1d6a1 u1D6A1               2.23 (Sans Mono)
-U+1d6a2 u1D6A2               2.23 (Sans Mono)
-U+1d6a3 u1D6A3               2.23 (Sans Mono)
-U+1d6a4 u1D6A4               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d6a5 u1D6A5               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d6a8 u1D6A8               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6a9 u1D6A9               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6aa u1D6AA               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6ab u1D6AB               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6ac u1D6AC               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6ad u1D6AD               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6ae u1D6AE               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6af u1D6AF               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6b0 u1D6B0               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6b1 u1D6B1               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6b2 u1D6B2               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6b3 u1D6B3               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6b4 u1D6B4               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6b5 u1D6B5               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6b6 u1D6B6               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6b7 u1D6B7               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6b8 u1D6B8               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6b9 u1D6B9               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6ba u1D6BA               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6bb u1D6BB               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6bc u1D6BC               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6bd u1D6BD               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6be u1D6BE               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6bf u1D6BF               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6c0 u1D6C0               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6c1 u1D6C1               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6c2 u1D6C2               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6c3 u1D6C3               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6c4 u1D6C4               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6c5 u1D6C5               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6c6 u1D6C6               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6c7 u1D6C7               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6c8 u1D6C8               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6c9 u1D6C9               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6ca u1D6CA               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6cb u1D6CB               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6cc u1D6CC               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6cd u1D6CD               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6ce u1D6CE               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6cf u1D6CF               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6d0 u1D6D0               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6d1 u1D6D1               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6d2 u1D6D2               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6d3 u1D6D3               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6d4 u1D6D4               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6d5 u1D6D5               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6d6 u1D6D6               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6d7 u1D6D7               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6d8 u1D6D8               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6d9 u1D6D9               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6da u1D6DA               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6db u1D6DB               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6dc u1D6DC               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6dd u1D6DD               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6de u1D6DE               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6df u1D6DF               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6e0 u1D6E0               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6e1 u1D6E1               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6e2 u1D6E2               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d6e3 u1D6E3               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d6e4 u1D6E4               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d6e5 u1D6E5               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d6e6 u1D6E6               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d6e7 u1D6E7               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d6e8 u1D6E8               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d6e9 u1D6E9               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d6ea u1D6EA               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d6eb u1D6EB               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d6ec u1D6EC               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d6ed u1D6ED               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d6ee u1D6EE               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d6ef u1D6EF               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d6f0 u1D6F0               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d6f1 u1D6F1               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d6f2 u1D6F2               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d6f3 u1D6F3               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d6f4 u1D6F4               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d6f5 u1D6F5               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d6f6 u1D6F6               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d6f7 u1D6F7               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d6f8 u1D6F8               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d6f9 u1D6F9               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d6fa u1D6FA               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d6fb u1D6FB               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d6fc u1D6FC               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d6fd u1D6FD               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d6fe u1D6FE               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d6ff u1D6FF               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d700 u1D700               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d701 u1D701               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d702 u1D702               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d703 u1D703               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d704 u1D704               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d705 u1D705               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d706 u1D706               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d707 u1D707               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d708 u1D708               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d709 u1D709               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d70a u1D70A               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d70b u1D70B               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d70c u1D70C               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d70d u1D70D               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d70e u1D70E               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d70f u1D70F               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d710 u1D710               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d711 u1D711               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d712 u1D712               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d713 u1D713               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d714 u1D714               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d715 u1D715               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d716 u1D716               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d717 u1D717               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d718 u1D718               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d719 u1D719               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d71a u1D71A               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d71b u1D71B               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d71c u1D71C               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d71d u1D71D               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d71e u1D71E               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d71f u1D71F               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d720 u1D720               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d721 u1D721               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d722 u1D722               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d723 u1D723               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d724 u1D724               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d725 u1D725               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d726 u1D726               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d727 u1D727               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d728 u1D728               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d729 u1D729               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d72a u1D72A               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d72b u1D72B               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d72c u1D72C               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d72d u1D72D               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d72e u1D72E               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d72f u1D72F               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d730 u1D730               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d731 u1D731               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d732 u1D732               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d733 u1D733               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d734 u1D734               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d735 u1D735               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d736 u1D736               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d737 u1D737               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d738 u1D738               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d739 u1D739               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d73a u1D73A               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d73b u1D73B               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d73c u1D73C               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d73d u1D73D               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d73e u1D73E               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d73f u1D73F               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d740 u1D740               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d741 u1D741               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d742 u1D742               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d743 u1D743               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d744 u1D744               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d745 u1D745               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d746 u1D746               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d747 u1D747               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d748 u1D748               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d749 u1D749               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d74a u1D74A               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d74b u1D74B               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d74c u1D74C               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d74d u1D74D               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d74e u1D74E               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d74f u1D74F               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d750 u1D750               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d751 u1D751               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d752 u1D752               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d753 u1D753               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d754 u1D754               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d755 u1D755               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d756 u1D756               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d757 u1D757               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d758 u1D758               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d759 u1D759               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d75a u1D75A               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d75b u1D75B               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d75c u1D75C               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d75d u1D75D               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d75e u1D75E               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d75f u1D75F               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d760 u1D760               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d761 u1D761               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d762 u1D762               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d763 u1D763               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d764 u1D764               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d765 u1D765               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d766 u1D766               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d767 u1D767               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d768 u1D768               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d769 u1D769               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d76a u1D76A               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d76b u1D76B               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d76c u1D76C               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d76d u1D76D               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d76e u1D76E               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d76f u1D76F               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d770 u1D770               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d771 u1D771               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d772 u1D772               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d773 u1D773               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d774 u1D774               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d775 u1D775               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d776 u1D776               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d777 u1D777               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d778 u1D778               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d779 u1D779               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d77a u1D77A               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d77b u1D77B               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d77c u1D77C               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d77d u1D77D               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d77e u1D77E               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d77f u1D77F               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d780 u1D780               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d781 u1D781               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d782 u1D782               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d783 u1D783               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d784 u1D784               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d785 u1D785               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d786 u1D786               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d787 u1D787               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d788 u1D788               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d789 u1D789               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d78a u1D78A               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d78b u1D78B               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d78c u1D78C               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d78d u1D78D               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d78e u1D78E               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d78f u1D78F               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d790 u1D790               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d791 u1D791               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d792 u1D792               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d793 u1D793               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d794 u1D794               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d795 u1D795               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d796 u1D796               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d797 u1D797               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d798 u1D798               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d799 u1D799               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d79a u1D79A               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d79b u1D79B               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d79c u1D79C               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d79d u1D79D               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d79e u1D79E               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d79f u1D79F               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7a0 u1D7A0               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7a1 u1D7A1               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7a2 u1D7A2               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7a3 u1D7A3               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7a4 u1D7A4               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7a5 u1D7A5               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7a6 u1D7A6               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7a7 u1D7A7               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7a8 u1D7A8               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7a9 u1D7A9               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7aa u1D7AA               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7ab u1D7AB               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7ac u1D7AC               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7ad u1D7AD               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7ae u1D7AE               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7af u1D7AF               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7b0 u1D7B0               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7b1 u1D7B1               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7b2 u1D7B2               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7b3 u1D7B3               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7b4 u1D7B4               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7b5 u1D7B5               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7b6 u1D7B6               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7b7 u1D7B7               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7b8 u1D7B8               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7b9 u1D7B9               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7ba u1D7BA               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7bb u1D7BB               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7bc u1D7BC               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7bd u1D7BD               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7be u1D7BE               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7bf u1D7BF               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7c0 u1D7C0               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7c1 u1D7C1               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7c2 u1D7C2               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7c3 u1D7C3               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7c4 u1D7C4               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7c5 u1D7C5               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7c6 u1D7C6               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7c7 u1D7C7               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7c8 u1D7C8               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7c9 u1D7C9               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7ca u1D7CA               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d7cb u1D7CB               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d7ce u1D7CE               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d7cf u1D7CF               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d7d0 u1D7D0               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d7d1 u1D7D1               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d7d2 u1D7D2               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d7d3 u1D7D3               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d7d4 u1D7D4               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d7d5 u1D7D5               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d7d6 u1D7D6               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d7d7 u1D7D7               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d7d8 u1D7D8               2.22 (Serif, Serif Condensed) 2.29 (Sans, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.30 (Sans Bold)
-U+1d7d9 u1D7D9               2.22 (Serif, Serif Condensed) 2.29 (Sans, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.30 (Sans Bold)
-U+1d7da u1D7DA               2.22 (Serif, Serif Condensed) 2.29 (Sans, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.30 (Sans Bold)
-U+1d7db u1D7DB               2.22 (Serif, Serif Condensed) 2.29 (Sans, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.30 (Sans Bold)
-U+1d7dc u1D7DC               2.22 (Serif, Serif Condensed) 2.29 (Sans, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.30 (Sans Bold)
-U+1d7dd u1D7DD               2.22 (Serif, Serif Condensed) 2.29 (Sans, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.30 (Sans Bold)
-U+1d7de u1D7DE               2.22 (Serif, Serif Condensed) 2.29 (Sans, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.30 (Sans Bold)
-U+1d7df u1D7DF               2.22 (Serif, Serif Condensed) 2.29 (Sans, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.30 (Sans Bold)
-U+1d7e0 u1D7E0               2.22 (Serif, Serif Condensed) 2.29 (Sans, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.30 (Sans Bold)
-U+1d7e1 u1D7E1               2.22 (Serif, Serif Condensed) 2.29 (Sans, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.30 (Sans Bold)
-U+1d7e2 u1D7E2               2.23 (Sans, Sans Condensed)
-U+1d7e3 u1D7E3               2.23 (Sans, Sans Condensed)
-U+1d7e4 u1D7E4               2.23 (Sans, Sans Condensed)
-U+1d7e5 u1D7E5               2.23 (Sans, Sans Condensed)
-U+1d7e6 u1D7E6               2.23 (Sans, Sans Condensed)
-U+1d7e7 u1D7E7               2.23 (Sans, Sans Condensed)
-U+1d7e8 u1D7E8               2.23 (Sans, Sans Condensed)
-U+1d7e9 u1D7E9               2.23 (Sans, Sans Condensed)
-U+1d7ea u1D7EA               2.23 (Sans, Sans Condensed)
-U+1d7eb u1D7EB               2.23 (Sans, Sans Condensed)
-U+1d7ec u1D7EC               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d7ed u1D7ED               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d7ee u1D7EE               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d7ef u1D7EF               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d7f0 u1D7F0               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d7f1 u1D7F1               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d7f2 u1D7F2               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d7f3 u1D7F3               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d7f4 u1D7F4               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d7f5 u1D7F5               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d7f6 u1D7F6               2.23 (Sans Mono)
-U+1d7f7 u1D7F7               2.23 (Sans Mono)
-U+1d7f8 u1D7F8               2.23 (Sans Mono)
-U+1d7f9 u1D7F9               2.23 (Sans Mono)
-U+1d7fa u1D7FA               2.23 (Sans Mono)
-U+1d7fb u1D7FB               2.23 (Sans Mono)
-U+1d7fc u1D7FC               2.23 (Sans Mono)
-U+1d7fd u1D7FD               2.23 (Sans Mono)
-U+1d7fe u1D7FE               2.23 (Sans Mono)
-U+1d7ff u1D7FF               2.23 (Sans Mono)
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavu-fonts-ttf-2.30/unicover.txt b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavu-fonts-ttf-2.30/unicover.txt
deleted file mode 100644
index bd467ab2..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavu-fonts-ttf-2.30/unicover.txt
+++ /dev/null
@@ -1,177 +0,0 @@
-This is the Unicode coverage file for DejaVu fonts
-($Id$)
-
-Control and similar characters are discounted from totals.
-
-                                                Sans               Serif              Sans Mono          
-U+0000 Basic Latin                              100% (95/95)       100% (95/95)       100% (95/95)      
-U+0080 Latin-1 Supplement                       100% (96/96)       100% (96/96)       100% (96/96)      
-U+0100 Latin Extended-A                         100% (128/128)     100% (128/128)     100% (128/128)    
-U+0180 Latin Extended-B                         100% (208/208)      91% (191/208)      86% (179/208)    
-U+0250 IPA Extensions                           100% (96/96)       100% (96/96)       100% (96/96)      
-U+02b0 Spacing Modifier Letters                  78% (63/80)        56% (45/80)        60% (48/80)      
-U+0300 Combining Diacritical Marks               83% (93/112)       60% (68/112)       59% (67/112)     
-U+0370 Greek and Coptic                         100% (134/134)      85% (115/134)      82% (110/134)    
-U+0400 Cyrillic                                 100% (256/256)      78% (200/256)      69% (178/256)    
-U+0500 Cyrillic Supplement                       94% (34/36)        27% (10/36)        16% (6/36)       
-U+0530 Armenian                                 100% (86/86)            (0/86)             (0/86)       
-U+0590 Hebrew                                    62% (54/87)            (0/87)             (0/87)       
-U+0600 Arabic                                    46% (115/250)          (0/250)        39% (99/250)     
-U+0700 Syriac                                        (0/77)             (0/77)             (0/77)       
-U+0750 Arabic Supplement                             (0/48)             (0/48)             (0/48)       
-U+0780 Thaana                                        (0/50)             (0/50)             (0/50)       
-U+07c0 NKo                                       91% (54/59)            (0/59)             (0/59)       
-U+0900 Devanagari                                    (0/113)            (0/113)            (0/113)      
-U+0980 Bengali                                       (0/91)             (0/91)             (0/91)       
-U+0a00 Gurmukhi                                      (0/79)             (0/79)             (0/79)       
-U+0a80 Gujarati                                      (0/83)             (0/83)             (0/83)       
-U+0b00 Oriya                                         (0/84)             (0/84)             (0/84)       
-U+0b80 Tamil                                         (0/72)             (0/72)             (0/72)       
-U+0c00 Telugu                                        (0/93)             (0/93)             (0/93)       
-U+0c80 Kannada                                       (0/86)             (0/86)             (0/86)       
-U+0d00 Malayalam                                     (0/95)             (0/95)             (0/95)       
-U+0d80 Sinhala                                       (0/80)             (0/80)             (0/80)       
-U+0e00 Thai                                       1% (1/87)             (0/87)             (0/87)       
-U+0e80 Lao                                      100% (65/65)            (0/65)         70% (46/65)      
-U+0f00 Tibetan                                       (0/201)            (0/201)            (0/201)      
-U+1000 Myanmar                                       (0/156)            (0/156)            (0/156)      
-U+10a0 Georgian                                 100% (83/83)       100% (83/83)        54% (45/83)      
-U+1100 Hangul Jamo                                   (0/240)            (0/240)            (0/240)      
-U+1200 Ethiopic                                      (0/356)            (0/356)            (0/356)      
-U+1380 Ethiopic Supplement                           (0/26)             (0/26)             (0/26)       
-U+13a0 Cherokee                                      (0/85)             (0/85)             (0/85)       
-U+1400 Unified Canadian Aboriginal Syllabics     64% (404/630)          (0/630)            (0/630)      
-U+1680 Ogham                                    100% (29/29)            (0/29)             (0/29)       
-U+16a0 Runic                                         (0/81)             (0/81)             (0/81)       
-U+1700 Tagalog                                       (0/20)             (0/20)             (0/20)       
-U+1720 Hanunoo                                       (0/23)             (0/23)             (0/23)       
-U+1740 Buhid                                         (0/20)             (0/20)             (0/20)       
-U+1760 Tagbanwa                                      (0/18)             (0/18)             (0/18)       
-U+1780 Khmer                                         (0/114)            (0/114)            (0/114)      
-U+1800 Mongolian                                     (0/156)            (0/156)            (0/156)      
-U+1900 Limbu                                         (0/66)             (0/66)             (0/66)       
-U+1950 Tai Le                                        (0/35)             (0/35)             (0/35)       
-U+1980 New Tai Lue                                   (0/80)             (0/80)             (0/80)       
-U+19e0 Khmer Symbols                                 (0/32)             (0/32)             (0/32)       
-U+1a00 Buginese                                      (0/30)             (0/30)             (0/30)       
-U+1b00 Balinese                                      (0/121)            (0/121)            (0/121)      
-U+1b80 Sundanese                                     (0/55)             (0/55)             (0/55)       
-U+1c00 Lepcha                                        (0/74)             (0/74)             (0/74)       
-U+1c50 Ol Chiki                                      (0/48)             (0/48)             (0/48)       
-U+1d00 Phonetic Extensions                       82% (105/128)      48% (62/128)       48% (62/128)     
-U+1d80 Phonetic Extensions Supplement            59% (38/64)        57% (37/64)        57% (37/64)      
-U+1dc0 Combining Diacritical Marks Supplement    14% (6/41)         14% (6/41)             (0/41)       
-U+1e00 Latin Extended Additional                 96% (248/256)      76% (196/256)      71% (182/256)    
-U+1f00 Greek Extended                           100% (233/233)     100% (233/233)     100% (233/233)    
-U+2000 General Punctuation                       98% (105/107)      81% (87/107)       47% (51/107)     
-U+2070 Superscripts and Subscripts              100% (34/34)       100% (34/34)       100% (34/34)      
-U+20a0 Currency Symbols                         100% (22/22)        27% (6/22)        100% (22/22)      
-U+20d0 Combining Diacritical Marks for Symbols   21% (7/33)             (0/33)             (0/33)       
-U+2100 Letterlike Symbols                        93% (75/80)        40% (32/80)        21% (17/80)      
-U+2150 Number Forms                              92% (50/54)        92% (50/54)        24% (13/54)      
-U+2190 Arrows                                   100% (112/112)     100% (112/112)     100% (112/112)    
-U+2200 Mathematical Operators                   100% (256/256)      39% (100/256)      58% (151/256)    
-U+2300 Miscellaneous Technical                   27% (64/232)        6% (16/232)       50% (117/232)    
-U+2400 Control Pictures                           5% (2/39)          2% (1/39)          2% (1/39)       
-U+2440 Optical Character Recognition                 (0/11)             (0/11)             (0/11)       
-U+2460 Enclosed Alphanumerics                     6% (10/160)           (0/160)            (0/160)      
-U+2500 Box Drawing                              100% (128/128)     100% (128/128)     100% (128/128)    
-U+2580 Block Elements                           100% (32/32)       100% (32/32)       100% (32/32)      
-U+25a0 Geometric Shapes                         100% (96/96)       100% (96/96)       100% (96/96)      
-U+2600 Miscellaneous Symbols                     95% (182/191)      15% (30/191)       78% (149/191)    
-U+2700 Dingbats                                 100% (174/174)       0% (1/174)        82% (144/174)    
-U+27c0 Miscellaneous Mathematical Symbols-A      20% (9/44)         11% (5/44)         11% (5/44)       
-U+27f0 Supplemental Arrows-A                    100% (16/16)       100% (16/16)            (0/16)       
-U+2800 Braille Patterns                         100% (256/256)     100% (256/256)          (0/256)      
-U+2900 Supplemental Arrows-B                      4% (6/128)       100% (128/128)          (0/128)      
-U+2980 Miscellaneous Mathematical Symbols-B      10% (13/128)        0% (1/128)         2% (3/128)      
-U+2a00 Supplemental Mathematical Operators       28% (72/256)        1% (4/256)         0% (1/256)      
-U+2b00 Miscellaneous Symbols and Arrows          42% (35/82)        32% (27/82)        10% (9/82)       
-U+2c00 Glagolitic                                    (0/94)             (0/94)             (0/94)       
-U+2c60 Latin Extended-C                          96% (28/29)        55% (16/29)        34% (10/29)      
-U+2c80 Coptic                                        (0/114)            (0/114)            (0/114)      
-U+2d00 Georgian Supplement                           (0/38)        100% (38/38)            (0/38)       
-U+2d30 Tifinagh                                 100% (55/55)            (0/55)             (0/55)       
-U+2d80 Ethiopic Extended                             (0/79)             (0/79)             (0/79)       
-U+2de0 Cyrillic Extended-A                           (0/32)             (0/32)             (0/32)       
-U+2e00 Supplemental Punctuation                  12% (6/49)         12% (6/49)         12% (6/49)       
-U+2e80 CJK Radicals Supplement                       (0/115)            (0/115)            (0/115)      
-U+2f00 Kangxi Radicals                               (0/214)            (0/214)            (0/214)      
-U+2ff0 Ideographic Description Characters            (0/12)             (0/12)             (0/12)       
-U+3000 CJK Symbols and Punctuation                   (0/64)             (0/64)             (0/64)       
-U+3040 Hiragana                                      (0/93)             (0/93)             (0/93)       
-U+30a0 Katakana                                      (0/96)             (0/96)             (0/96)       
-U+3100 Bopomofo                                      (0/41)             (0/41)             (0/41)       
-U+3130 Hangul Compatibility Jamo                     (0/94)             (0/94)             (0/94)       
-U+3190 Kanbun                                        (0/16)             (0/16)             (0/16)       
-U+31a0 Bopomofo Extended                             (0/24)             (0/24)             (0/24)       
-U+31c0 CJK Strokes                                   (0/36)             (0/36)             (0/36)       
-U+31f0 Katakana Phonetic Extensions                  (0/16)             (0/16)             (0/16)       
-U+3200 Enclosed CJK Letters and Months               (0/242)            (0/242)            (0/242)      
-U+3300 CJK Compatibility                             (0/256)            (0/256)            (0/256)      
-U+3400 CJK Unified Ideographs Extension A            (0/0)              (0/0)              (0/0)        
-U+4dc0 Yijing Hexagram Symbols                  100% (64/64)            (0/64)             (0/64)       
-U+4e00 CJK Unified Ideographs                        (0/0)              (0/0)              (0/0)        
-U+a000 Yi Syllables                                  (0/1165)           (0/1165)           (0/1165)     
-U+a490 Yi Radicals                                   (0/55)             (0/55)             (0/55)       
-U+a500 Vai                                           (0/300)            (0/300)            (0/300)      
-U+a640 Cyrillic Extended-B                       39% (31/78)        12% (10/78)            (0/78)       
-U+a700 Modifier Tone Letters                     62% (20/32)        62% (20/32)        62% (20/32)      
-U+a720 Latin Extended-D                          37% (43/114)        1% (2/114)         5% (6/114)      
-U+a800 Syloti Nagri                                  (0/44)             (0/44)             (0/44)       
-U+a840 Phags-pa                                      (0/56)             (0/56)             (0/56)       
-U+a880 Saurashtra                                    (0/81)             (0/81)             (0/81)       
-U+a900 Kayah Li                                      (0/48)             (0/48)             (0/48)       
-U+a930 Rejang                                        (0/37)             (0/37)             (0/37)       
-U+aa00 Cham                                          (0/83)             (0/83)             (0/83)       
-U+ac00 Hangul Syllables                              (0/0)              (0/0)              (0/0)        
-U+d800 High Surrogates                               (0/0)              (0/0)              (0/0)        
-U+db80 High Private Use Surrogates                   (0/0)              (0/0)              (0/0)        
-U+dc00 Low Surrogates                                (0/0)              (0/0)              (0/0)        
-U+e000 Private Use Area                              (0/0)              (0/0)              (0/0)        
-U+f900 CJK Compatibility Ideographs                  (0/467)            (0/467)            (0/467)      
-U+fb00 Alphabetic Presentation Forms            100% (58/58)        12% (7/58)          3% (2/58)       
-U+fb50 Arabic Presentation Forms-A               11% (70/595)           (0/595)        12% (72/595)     
-U+fe00 Variation Selectors                      100% (16/16)       100% (16/16)            (0/16)       
-U+fe10 Vertical Forms                                (0/10)             (0/10)             (0/10)       
-U+fe20 Combining Half Marks                      57% (4/7)              (0/7)              (0/7)        
-U+fe30 CJK Compatibility Forms                       (0/32)             (0/32)             (0/32)       
-U+fe50 Small Form Variants                           (0/26)             (0/26)             (0/26)       
-U+fe70 Arabic Presentation Forms-B              100% (141/141)          (0/141)       100% (141/141)    
-U+ff00 Halfwidth and Fullwidth Forms                 (0/225)            (0/225)            (0/225)      
-U+fff0 Specials                                 100% (5/5)         100% (5/5)         100% (5/5)        
-U+10000 Linear B Syllabary                            (0/88)             (0/88)             (0/88)       
-U+10080 Linear B Ideograms                            (0/123)            (0/123)            (0/123)      
-U+10100 Aegean Numbers                                (0/57)             (0/57)             (0/57)       
-U+10140 Ancient Greek Numbers                         (0/75)             (0/75)             (0/75)       
-U+10190 Ancient Symbols                               (0/12)             (0/12)             (0/12)       
-U+101d0 Phaistos Disc                                 (0/46)             (0/46)             (0/46)       
-U+10280 Lycian                                        (0/29)             (0/29)             (0/29)       
-U+102a0 Carian                                        (0/49)             (0/49)             (0/49)       
-U+10300 Old Italic                                    (0/35)             (0/35)             (0/35)       
-U+10330 Gothic                                        (0/27)             (0/27)             (0/27)       
-U+10380 Ugaritic                                      (0/31)             (0/31)             (0/31)       
-U+103a0 Old Persian                                   (0/50)             (0/50)             (0/50)       
-U+10400 Deseret                                       (0/80)             (0/80)             (0/80)       
-U+10450 Shavian                                       (0/48)             (0/48)             (0/48)       
-U+10480 Osmanya                                       (0/40)             (0/40)             (0/40)       
-U+10800 Cypriot Syllabary                             (0/55)             (0/55)             (0/55)       
-U+10900 Phoenician                                    (0/27)             (0/27)             (0/27)       
-U+10920 Lydian                                        (0/27)             (0/27)             (0/27)       
-U+10a00 Kharoshthi                                    (0/65)             (0/65)             (0/65)       
-U+12000 Cuneiform                                     (0/879)            (0/879)            (0/879)      
-U+12400 Cuneiform Numbers and Punctuation             (0/103)            (0/103)            (0/103)      
-U+1d000 Byzantine Musical Symbols                     (0/246)            (0/246)            (0/246)      
-U+1d100 Musical Symbols                               (0/220)            (0/220)            (0/220)      
-U+1d200 Ancient Greek Musical Notation                (0/70)             (0/70)             (0/70)       
-U+1d300 Tai Xuan Jing Symbols                    100% (87/87)            (0/87)             (0/87)       
-U+1d360 Counting Rod Numerals                         (0/18)             (0/18)             (0/18)       
-U+1d400 Mathematical Alphanumeric Symbols         11% (117/996)       5% (55/996)        6% (62/996)     
-U+1f000 Mahjong Tiles                                 (0/44)             (0/44)             (0/44)       
-U+1f030 Domino Tiles                                  (0/100)            (0/100)            (0/100)      
-U+20000 CJK Unified Ideographs Extension B            (0/0)              (0/0)              (0/0)        
-U+2f800 CJK Compatibility Ideographs Supplement       (0/542)            (0/542)            (0/542)      
-U+e0000 Tags                                          (0/98)             (0/98)             (0/98)       
-U+e0100 Variation Selectors Supplement                (0/240)            (0/240)            (0/240)      
-U+f0000 Supplementary Private Use Area-A              (0/0)              (0/0)              (0/0)        
-U+100000 Supplementary Private Use Area-B              (0/0)              (0/0)              (0/0)        
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusans.ctg.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusans.ctg.z
deleted file mode 100644
index 3170ea6f..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusans.ctg.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusans.php b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusans.php
deleted file mode 100644
index 0a34caf9..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusans.php
+++ /dev/null
@@ -1,517 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='DejaVuSans';
-$desc=array('Ascent'=>928,'Descent'=>-236,'CapHeight'=>30,'Flags'=>96,'FontBBox'=>'[-1021 -350 1681 1167]','ItalicAngle'=>20.8,'StemV'=>70,'MissingWidth'=>600);
-$up=-63;
-$ut=44;
-$dw=600;
-$cw=array(
-0=>600,32=>318,33=>401,34=>460,35=>838,36=>636,37=>950,38=>780,39=>275,40=>390,
-41=>390,42=>500,43=>838,44=>318,45=>361,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=>531,64=>1000,65=>684,66=>686,67=>698,68=>770,69=>632,70=>575,
-71=>775,72=>752,73=>295,74=>295,75=>656,76=>557,77=>863,78=>748,79=>787,80=>603,
-81=>787,82=>695,83=>635,84=>611,85=>732,86=>684,87=>989,88=>685,89=>611,90=>685,
-91=>390,92=>337,93=>390,94=>838,95=>500,96=>500,97=>613,98=>635,99=>550,100=>635,
-101=>615,102=>352,103=>635,104=>634,105=>278,106=>278,107=>579,108=>278,109=>974,110=>634,
-111=>612,112=>635,113=>635,114=>411,115=>521,116=>392,117=>634,118=>592,119=>818,120=>592,
-121=>592,122=>525,123=>636,124=>337,125=>636,126=>838,8364=>636,8218=>318,402=>352,8222=>518,
-8230=>1000,8224=>500,8225=>500,710=>500,8240=>1342,352=>635,8249=>400,338=>1070,381=>685,8216=>318,
-8217=>318,8220=>518,8221=>518,8226=>590,8211=>500,8212=>1000,732=>500,8482=>1000,353=>521,8250=>400,
-339=>1023,382=>525,376=>611,160=>318,161=>401,162=>636,163=>636,164=>636,165=>636,166=>337,
-167=>500,168=>500,169=>1000,170=>471,171=>612,172=>838,173=>361,174=>1000,175=>500,176=>500,
-177=>838,178=>401,179=>401,180=>500,181=>636,182=>636,183=>318,184=>500,185=>401,186=>471,
-187=>612,188=>969,189=>969,190=>969,191=>531,192=>684,193=>684,194=>684,195=>684,196=>684,
-197=>684,198=>974,199=>698,200=>632,201=>632,202=>632,203=>632,204=>295,205=>295,206=>295,
-207=>295,208=>775,209=>748,210=>787,211=>787,212=>787,213=>787,214=>787,215=>838,216=>787,
-217=>732,218=>732,219=>732,220=>732,221=>611,222=>605,223=>630,224=>613,225=>613,226=>613,
-227=>613,228=>613,229=>613,230=>982,231=>550,232=>615,233=>615,234=>615,235=>615,236=>278,
-237=>278,238=>278,239=>278,240=>612,241=>634,242=>612,243=>612,244=>612,245=>612,246=>612,
-247=>838,248=>612,249=>634,250=>634,251=>634,252=>634,253=>592,254=>635,255=>592,256=>684,
-257=>613,258=>684,259=>613,260=>684,261=>613,262=>698,263=>550,264=>698,265=>550,266=>698,
-267=>550,268=>698,269=>550,270=>770,271=>635,272=>775,273=>635,274=>632,275=>615,276=>632,
-277=>615,278=>632,279=>615,280=>632,281=>615,282=>632,283=>615,284=>775,285=>635,286=>775,
-287=>635,288=>775,289=>635,290=>775,291=>635,292=>752,293=>634,294=>916,295=>695,296=>295,
-297=>278,298=>295,299=>278,300=>295,301=>278,302=>295,303=>278,304=>295,305=>278,306=>590,
-307=>556,308=>295,309=>278,310=>656,311=>579,312=>579,313=>557,314=>278,315=>557,316=>278,
-317=>557,318=>375,319=>557,320=>342,321=>562,322=>284,323=>748,324=>634,325=>748,326=>634,
-327=>748,328=>634,329=>813,330=>748,331=>634,332=>787,333=>612,334=>787,335=>612,336=>787,
-337=>612,340=>695,341=>411,342=>695,343=>411,344=>695,345=>411,346=>635,347=>521,348=>635,
-349=>521,350=>635,351=>521,354=>611,355=>392,356=>611,357=>392,358=>611,359=>392,360=>732,
-361=>634,362=>732,363=>634,364=>732,365=>634,366=>732,367=>634,368=>732,369=>634,370=>732,
-371=>634,372=>989,373=>818,374=>611,375=>592,377=>685,378=>525,379=>685,380=>525,383=>352,
-384=>635,385=>735,386=>686,387=>635,388=>686,389=>635,390=>703,391=>698,392=>550,393=>775,
-394=>819,395=>686,396=>635,397=>612,398=>632,399=>787,400=>614,401=>575,403=>775,404=>687,
-405=>984,406=>354,407=>295,408=>746,409=>579,410=>278,411=>592,412=>974,413=>748,414=>634,
-415=>787,416=>913,417=>612,418=>949,419=>759,420=>652,421=>635,422=>695,423=>635,424=>521,
-425=>632,426=>336,427=>392,428=>611,429=>392,430=>611,431=>858,432=>634,433=>764,434=>721,
-435=>744,436=>730,437=>685,438=>525,439=>666,440=>666,441=>578,442=>525,443=>636,444=>666,
-445=>578,446=>510,447=>635,448=>295,449=>492,450=>459,451=>295,452=>1422,453=>1299,454=>1154,
-455=>835,456=>787,457=>457,458=>931,459=>924,460=>797,461=>684,462=>613,463=>295,464=>278,
-465=>787,466=>612,467=>732,468=>634,469=>732,470=>634,471=>732,472=>634,473=>732,474=>634,
-475=>732,476=>634,477=>615,478=>684,479=>613,480=>684,481=>613,482=>974,483=>982,484=>775,
-485=>635,486=>775,487=>635,488=>656,489=>579,490=>787,491=>612,492=>787,493=>612,494=>666,
-495=>578,496=>278,497=>1422,498=>1299,499=>1154,500=>775,501=>635,502=>1113,503=>682,504=>748,
-505=>634,506=>684,507=>613,508=>974,509=>982,510=>787,511=>612,512=>684,513=>613,514=>684,
-515=>613,516=>632,517=>615,518=>632,519=>615,520=>295,521=>278,522=>295,523=>278,524=>787,
-525=>612,526=>787,527=>612,528=>695,529=>411,530=>695,531=>411,532=>732,533=>634,534=>732,
-535=>634,536=>635,537=>521,538=>611,539=>392,540=>627,541=>521,542=>752,543=>634,544=>735,
-545=>838,546=>698,547=>610,548=>685,549=>525,550=>684,551=>613,552=>632,553=>615,554=>787,
-555=>612,556=>787,557=>612,558=>787,559=>612,560=>787,561=>612,562=>611,563=>592,564=>475,
-565=>843,566=>477,567=>278,568=>998,569=>998,570=>684,571=>698,572=>550,573=>557,574=>611,
-575=>521,576=>525,577=>603,578=>479,579=>686,580=>732,581=>684,582=>632,583=>615,584=>295,
-585=>278,586=>781,587=>635,588=>695,589=>411,590=>611,591=>592,592=>600,593=>635,594=>635,
-595=>635,596=>549,597=>550,598=>635,599=>696,600=>615,601=>615,602=>819,603=>541,604=>532,
-605=>775,606=>664,607=>278,608=>696,609=>635,610=>629,611=>596,612=>596,613=>634,614=>634,
-615=>634,616=>278,617=>338,618=>372,619=>396,620=>487,621=>278,622=>706,623=>974,624=>974,
-625=>974,626=>646,627=>642,628=>634,629=>612,630=>858,631=>728,632=>660,633=>414,634=>414,
-635=>414,636=>411,637=>411,638=>530,639=>530,640=>604,641=>604,642=>521,643=>336,644=>336,
-645=>461,646=>336,647=>392,648=>392,649=>634,650=>618,651=>598,652=>592,653=>818,654=>592,
-655=>611,656=>525,657=>525,658=>578,659=>578,660=>510,661=>510,662=>510,663=>510,664=>787,
-665=>580,666=>664,667=>708,668=>654,669=>292,670=>667,671=>507,672=>727,673=>510,674=>510,
-675=>1014,676=>1058,677=>1013,678=>824,679=>610,680=>778,681=>848,682=>641,683=>654,684=>515,
-685=>515,686=>661,687=>664,688=>404,689=>399,690=>175,691=>259,692=>295,693=>296,694=>379,
-695=>515,696=>373,697=>278,698=>460,699=>318,700=>318,701=>318,702=>307,703=>307,704=>370,
-705=>370,706=>500,707=>500,708=>500,709=>500,711=>500,712=>275,713=>500,714=>500,715=>500,
-716=>275,717=>500,718=>500,719=>500,720=>337,721=>337,722=>307,723=>307,724=>500,725=>500,
-726=>390,727=>317,728=>500,729=>500,730=>500,731=>500,733=>500,734=>315,735=>500,736=>426,
-737=>166,738=>373,739=>444,740=>370,741=>493,742=>493,743=>493,744=>493,745=>493,748=>500,
-749=>500,750=>518,755=>500,759=>500,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,832=>0,833=>0,
-834=>0,835=>0,836=>0,837=>0,838=>0,839=>0,840=>0,841=>0,842=>0,843=>0,
-844=>0,845=>0,846=>0,847=>0,849=>0,850=>0,851=>0,855=>0,856=>0,858=>0,
-860=>0,861=>0,862=>0,863=>0,864=>0,865=>0,866=>0,880=>654,881=>568,882=>862,
-883=>647,884=>278,885=>278,886=>748,887=>650,890=>500,891=>549,892=>550,893=>549,894=>337,
-900=>500,901=>500,902=>692,903=>318,904=>746,905=>871,906=>408,908=>813,910=>825,911=>826,
-912=>338,913=>684,914=>686,915=>557,916=>684,917=>632,918=>685,919=>752,920=>787,921=>295,
-922=>656,923=>684,924=>863,925=>748,926=>632,927=>787,928=>752,929=>603,931=>632,932=>611,
-933=>611,934=>787,935=>685,936=>787,937=>764,938=>295,939=>611,940=>659,941=>541,942=>634,
-943=>338,944=>579,945=>659,946=>638,947=>592,948=>612,949=>541,950=>544,951=>634,952=>612,
-953=>338,954=>589,955=>592,956=>636,957=>559,958=>558,959=>612,960=>602,961=>635,962=>587,
-963=>634,964=>602,965=>579,966=>660,967=>578,968=>660,969=>837,970=>338,971=>579,972=>612,
-973=>579,974=>837,975=>656,976=>614,977=>619,978=>699,979=>842,980=>699,981=>660,982=>837,
-983=>664,984=>787,985=>612,986=>648,987=>587,988=>575,989=>458,990=>660,991=>660,992=>865,
-993=>627,994=>934,995=>837,996=>758,997=>659,998=>792,999=>615,1000=>687,1001=>607,1002=>768,
-1003=>625,1004=>699,1005=>612,1006=>611,1007=>536,1008=>664,1009=>635,1010=>550,1011=>278,1012=>787,
-1013=>615,1014=>615,1015=>605,1016=>635,1017=>698,1018=>863,1019=>651,1020=>635,1021=>703,1022=>698,
-1023=>703,1024=>632,1025=>632,1026=>786,1027=>610,1028=>698,1029=>635,1030=>295,1031=>295,1032=>295,
-1033=>1094,1034=>1045,1035=>786,1036=>710,1037=>748,1038=>609,1039=>752,1040=>684,1041=>686,1042=>686,
-1043=>610,1044=>781,1045=>632,1046=>1077,1047=>641,1048=>748,1049=>748,1050=>710,1051=>752,1052=>863,
-1053=>752,1054=>787,1055=>752,1056=>603,1057=>698,1058=>611,1059=>609,1060=>861,1061=>685,1062=>776,
-1063=>686,1064=>1069,1065=>1094,1066=>833,1067=>882,1068=>686,1069=>698,1070=>1080,1071=>695,1072=>613,
-1073=>617,1074=>589,1075=>525,1076=>691,1077=>615,1078=>901,1079=>532,1080=>650,1081=>650,1082=>604,
-1083=>639,1084=>754,1085=>654,1086=>612,1087=>654,1088=>635,1089=>550,1090=>583,1091=>592,1092=>855,
-1093=>592,1094=>681,1095=>591,1096=>915,1097=>942,1098=>707,1099=>790,1100=>589,1101=>549,1102=>842,
-1103=>602,1104=>615,1105=>615,1106=>625,1107=>525,1108=>549,1109=>521,1110=>278,1111=>278,1112=>278,
-1113=>902,1114=>898,1115=>652,1116=>604,1117=>650,1118=>592,1119=>654,1120=>934,1121=>837,1122=>771,
-1123=>672,1124=>942,1125=>749,1126=>879,1127=>783,1128=>1160,1129=>1001,1130=>787,1131=>612,1132=>1027,
-1133=>824,1134=>636,1135=>541,1136=>856,1137=>876,1138=>787,1139=>612,1140=>781,1141=>665,1142=>781,
-1143=>665,1144=>992,1145=>904,1146=>953,1147=>758,1148=>1180,1149=>1028,1150=>934,1151=>837,1152=>698,
-1153=>550,1154=>502,1155=>0,1156=>0,1157=>0,1158=>0,1159=>0,1160=>418,1161=>418,1162=>772,
-1163=>677,1164=>686,1165=>589,1166=>603,1167=>635,1168=>610,1169=>525,1170=>675,1171=>590,1172=>624,
-1173=>530,1174=>1077,1175=>901,1176=>641,1177=>532,1178=>710,1179=>604,1180=>710,1181=>604,1182=>710,
-1183=>604,1184=>856,1185=>832,1186=>752,1187=>661,1188=>1014,1189=>877,1190=>1081,1191=>916,1192=>878,
-1193=>693,1194=>698,1195=>550,1196=>611,1197=>583,1198=>611,1199=>592,1200=>611,1201=>592,1202=>685,
-1203=>592,1204=>934,1205=>807,1206=>686,1207=>591,1208=>686,1209=>591,1210=>686,1211=>634,1212=>941,
-1213=>728,1214=>941,1215=>728,1216=>295,1217=>1077,1218=>901,1219=>656,1220=>604,1221=>776,1222=>670,
-1223=>752,1224=>661,1225=>776,1226=>681,1227=>686,1228=>591,1229=>888,1230=>774,1231=>278,1232=>684,
-1233=>613,1234=>684,1235=>613,1236=>974,1237=>982,1238=>632,1239=>615,1240=>787,1241=>615,1242=>787,
-1243=>615,1244=>1077,1245=>901,1246=>641,1247=>532,1248=>666,1249=>578,1250=>748,1251=>650,1252=>748,
-1253=>650,1254=>787,1255=>612,1256=>787,1257=>612,1258=>787,1259=>612,1260=>698,1261=>549,1262=>609,
-1263=>592,1264=>609,1265=>592,1266=>609,1267=>592,1268=>686,1269=>591,1270=>610,1271=>525,1272=>882,
-1273=>790,1274=>675,1275=>590,1276=>685,1277=>592,1278=>685,1279=>592,1280=>686,1281=>589,1282=>1006,
-1283=>897,1284=>975,1285=>869,1286=>679,1287=>588,1288=>1072,1289=>957,1290=>1113,1291=>967,1292=>775,
-1293=>660,1294=>773,1295=>711,1296=>614,1297=>541,1298=>752,1299=>639,1300=>1169,1301=>994,1302=>894,
-1303=>864,1304=>1032,1305=>986,1306=>787,1307=>635,1308=>989,1309=>818,1312=>1081,1313=>905,1314=>1081,
-1315=>912,1316=>793,1317=>683,1329=>867,1330=>732,1331=>882,1332=>882,1333=>732,1334=>644,1335=>682,
-1336=>732,1337=>851,1338=>882,1339=>732,1340=>557,1341=>824,1342=>986,1343=>732,1344=>707,1345=>644,
-1346=>882,1347=>777,1348=>882,1349=>732,1350=>840,1351=>732,1352=>732,1353=>732,1354=>791,1355=>644,
-1356=>882,1357=>732,1358=>882,1359=>635,1360=>732,1361=>732,1362=>799,1363=>787,1364=>790,1365=>787,
-1366=>635,1369=>307,1370=>318,1371=>500,1372=>500,1373=>392,1374=>526,1375=>500,1377=>974,1378=>634,
-1379=>762,1380=>767,1381=>634,1382=>697,1383=>533,1384=>634,1385=>700,1386=>697,1387=>634,1388=>404,
-1389=>894,1390=>641,1391=>634,1392=>634,1393=>635,1394=>702,1395=>634,1396=>659,1397=>278,1398=>760,
-1399=>516,1400=>634,1401=>453,1402=>974,1403=>516,1404=>769,1405=>634,1406=>696,1407=>974,1408=>634,
-1409=>635,1410=>501,1411=>974,1412=>648,1413=>612,1414=>629,1415=>763,1417=>337,1418=>433,1456=>0,
-1457=>0,1458=>0,1459=>0,1460=>0,1461=>0,1462=>0,1463=>0,1464=>0,1465=>0,1466=>0,
-1467=>0,1468=>0,1469=>0,1470=>361,1471=>0,1472=>295,1473=>0,1474=>0,1475=>295,1478=>441,
-1479=>0,1488=>629,1489=>608,1490=>448,1491=>594,1492=>640,1493=>272,1494=>374,1495=>640,1496=>648,
-1497=>272,1498=>592,1499=>556,1500=>599,1501=>640,1502=>659,1503=>272,1504=>441,1505=>700,1506=>563,
-1507=>640,1508=>604,1509=>521,1510=>581,1511=>663,1512=>592,1513=>808,1514=>657,1520=>471,1521=>454,
-1522=>471,1523=>416,1524=>645,1542=>637,1543=>637,1545=>757,1546=>977,1548=>323,1557=>0,1563=>318,
-1567=>531,1569=>470,1570=>278,1571=>278,1572=>483,1573=>278,1574=>783,1575=>278,1576=>941,1577=>524,
-1578=>941,1579=>941,1580=>646,1581=>646,1582=>646,1583=>445,1584=>445,1585=>483,1586=>483,1587=>1221,
-1588=>1221,1589=>1209,1590=>1209,1591=>925,1592=>925,1593=>597,1594=>597,1600=>293,1601=>1037,1602=>776,
-1603=>824,1604=>727,1605=>619,1606=>734,1607=>524,1608=>483,1609=>783,1610=>783,1611=>0,1612=>0,
-1613=>0,1614=>0,1615=>0,1616=>0,1617=>0,1618=>0,1619=>0,1620=>0,1621=>0,1626=>500,
-1632=>537,1633=>537,1634=>537,1635=>537,1636=>537,1637=>537,1638=>537,1639=>537,1640=>537,1641=>537,
-1642=>537,1643=>325,1644=>318,1645=>545,1646=>941,1647=>776,1652=>292,1657=>941,1658=>941,1659=>941,
-1660=>941,1661=>941,1662=>941,1663=>941,1664=>941,1665=>646,1666=>646,1667=>646,1668=>646,1669=>646,
-1670=>646,1671=>646,1681=>483,1682=>483,1685=>610,1688=>483,1697=>1037,1700=>1037,1702=>1037,1705=>895,
-1711=>895,1717=>727,1722=>734,1727=>646,1734=>483,1740=>783,1742=>783,1749=>524,1776=>537,1777=>537,
-1778=>537,1779=>537,1780=>537,1781=>537,1782=>537,1783=>537,1784=>537,1785=>537,1984=>636,1985=>636,
-1986=>636,1987=>636,1988=>636,1989=>636,1990=>636,1991=>636,1992=>636,1993=>636,1994=>278,1995=>571,
-1996=>424,1997=>592,1998=>654,1999=>654,2000=>594,2001=>654,2002=>829,2003=>438,2004=>438,2005=>559,
-2006=>612,2007=>350,2008=>959,2009=>473,2010=>783,2011=>654,2012=>625,2013=>734,2014=>530,2015=>724,
-2016=>473,2017=>625,2018=>594,2019=>530,2020=>530,2021=>522,2022=>594,2023=>594,2027=>0,2028=>0,
-2029=>0,2030=>0,2031=>0,2032=>0,2033=>0,2034=>0,2035=>0,2036=>313,2037=>313,2040=>560,
-2041=>560,2042=>361,3647=>652,3713=>670,3714=>684,3716=>688,3719=>482,3720=>628,3722=>684,3725=>688,
-3732=>669,3733=>642,3734=>645,3735=>655,3737=>659,3738=>625,3739=>625,3740=>745,3741=>767,3742=>687,
-3743=>687,3745=>702,3746=>688,3747=>684,3749=>649,3751=>632,3754=>703,3755=>819,3757=>633,3758=>684,
-3759=>788,3760=>632,3761=>0,3762=>539,3763=>539,3764=>0,3765=>0,3766=>0,3767=>0,3768=>0,
-3769=>0,3771=>0,3772=>0,3773=>663,3776=>375,3777=>657,3778=>460,3779=>547,3780=>491,3782=>674,
-3784=>0,3785=>0,3786=>0,3787=>0,3788=>0,3789=>0,3792=>636,3793=>641,3794=>641,3795=>670,
-3796=>625,3797=>625,3798=>703,3799=>670,3800=>674,3801=>677,3804=>1028,3805=>1028,4256=>840,4257=>690,
-4258=>642,4259=>759,4260=>591,4261=>686,4262=>789,4263=>811,4264=>467,4265=>565,4266=>789,4267=>793,
-4268=>584,4269=>837,4270=>750,4271=>688,4272=>811,4273=>584,4274=>584,4275=>837,4276=>837,4277=>646,
-4278=>604,4279=>584,4280=>596,4281=>584,4282=>721,4283=>795,4284=>584,4285=>566,4286=>584,4287=>669,
-4288=>799,4289=>542,4290=>664,4291=>542,4292=>565,4293=>674,4304=>508,4305=>508,4306=>533,4307=>785,
-4308=>522,4309=>517,4310=>508,4311=>797,4312=>507,4313=>518,4314=>1058,4315=>522,4316=>523,4317=>783,
-4318=>518,4319=>523,4320=>792,4321=>523,4322=>656,4323=>524,4324=>788,4325=>523,4326=>782,4327=>523,
-4328=>522,4329=>522,4330=>566,4331=>523,4332=>523,4333=>489,4334=>522,4335=>498,4336=>517,4337=>560,
-4338=>508,4339=>508,4340=>508,4341=>563,4342=>824,4343=>595,4344=>522,4345=>554,4346=>553,4347=>586,
-4348=>304,5121=>684,5122=>684,5123=>684,5124=>684,5125=>769,5126=>769,5127=>769,5129=>769,5130=>769,
-5131=>769,5132=>835,5133=>834,5134=>835,5135=>834,5136=>835,5137=>834,5138=>967,5139=>1007,5140=>967,
-5141=>1007,5142=>769,5143=>967,5144=>1007,5145=>967,5146=>1007,5147=>769,5149=>256,5150=>543,5151=>423,
-5152=>423,5153=>389,5154=>389,5155=>393,5156=>389,5157=>466,5158=>385,5159=>256,5160=>389,5161=>389,
-5162=>389,5163=>1090,5164=>909,5165=>953,5166=>1117,5167=>684,5168=>684,5169=>684,5170=>684,5171=>729,
-5172=>729,5173=>729,5175=>729,5176=>729,5177=>729,5178=>835,5179=>684,5180=>835,5181=>834,5182=>835,
-5183=>834,5184=>967,5185=>1007,5186=>967,5187=>1007,5188=>967,5189=>1007,5190=>967,5191=>1007,5192=>729,
-5193=>508,5194=>192,5196=>732,5197=>732,5198=>732,5199=>732,5200=>730,5201=>730,5202=>730,5204=>730,
-5205=>730,5206=>730,5207=>921,5208=>889,5209=>921,5210=>889,5211=>921,5212=>889,5213=>928,5214=>900,
-5215=>928,5216=>900,5217=>947,5218=>900,5219=>947,5220=>900,5221=>947,5222=>434,5223=>877,5224=>877,
-5225=>866,5226=>890,5227=>628,5228=>628,5229=>628,5230=>628,5231=>628,5232=>628,5233=>628,5234=>628,
-5235=>628,5236=>860,5237=>771,5238=>815,5239=>816,5240=>815,5241=>816,5242=>860,5243=>771,5244=>860,
-5245=>771,5246=>815,5247=>816,5248=>815,5249=>816,5250=>815,5251=>407,5252=>407,5253=>750,5254=>775,
-5255=>750,5256=>775,5257=>628,5258=>628,5259=>628,5260=>628,5261=>628,5262=>628,5263=>628,5264=>628,
-5265=>628,5266=>860,5267=>771,5268=>815,5269=>816,5270=>815,5271=>816,5272=>860,5273=>771,5274=>860,
-5275=>771,5276=>815,5277=>816,5278=>815,5279=>816,5280=>815,5281=>435,5282=>435,5283=>610,5284=>557,
-5285=>557,5286=>557,5287=>610,5288=>610,5289=>610,5290=>557,5291=>557,5292=>749,5293=>769,5294=>746,
-5295=>764,5296=>746,5297=>764,5298=>749,5299=>769,5300=>749,5301=>769,5302=>746,5303=>764,5304=>746,
-5305=>764,5306=>746,5307=>386,5308=>508,5309=>386,5312=>852,5313=>852,5314=>852,5315=>852,5316=>852,
-5317=>852,5318=>852,5319=>852,5320=>852,5321=>1069,5322=>1035,5323=>1059,5324=>852,5325=>1059,5326=>852,
-5327=>852,5328=>600,5329=>453,5330=>600,5331=>852,5332=>852,5333=>852,5334=>852,5335=>852,5336=>852,
-5337=>852,5338=>852,5339=>852,5340=>1069,5341=>1035,5342=>1059,5343=>1030,5344=>1059,5345=>1030,5346=>1069,
-5347=>1035,5348=>1069,5349=>1035,5350=>1083,5351=>1030,5352=>1083,5353=>1030,5354=>600,5356=>729,5357=>603,
-5358=>603,5359=>603,5360=>603,5361=>603,5362=>603,5363=>603,5364=>603,5365=>603,5366=>834,5367=>754,
-5368=>792,5369=>771,5370=>792,5371=>771,5372=>834,5373=>754,5374=>834,5375=>754,5376=>792,5377=>771,
-5378=>792,5379=>771,5380=>792,5381=>418,5382=>420,5383=>418,5392=>712,5393=>712,5394=>712,5395=>892,
-5396=>892,5397=>892,5398=>892,5399=>910,5400=>872,5401=>910,5402=>872,5403=>910,5404=>872,5405=>1140,
-5406=>1100,5407=>1140,5408=>1100,5409=>1140,5410=>1100,5411=>1140,5412=>1100,5413=>641,5414=>627,5415=>627,
-5416=>627,5417=>627,5418=>627,5419=>627,5420=>627,5421=>627,5422=>627,5423=>844,5424=>781,5425=>816,
-5426=>818,5427=>816,5428=>818,5429=>844,5430=>781,5431=>844,5432=>781,5433=>816,5434=>818,5435=>816,
-5436=>818,5437=>816,5438=>418,5440=>389,5441=>484,5442=>916,5443=>916,5444=>916,5445=>916,5446=>916,
-5447=>916,5448=>603,5449=>603,5450=>603,5451=>603,5452=>603,5453=>603,5454=>834,5455=>754,5456=>418,
-5458=>729,5459=>684,5460=>684,5461=>684,5462=>684,5463=>726,5464=>726,5465=>726,5466=>726,5467=>924,
-5468=>1007,5469=>508,5470=>732,5471=>732,5472=>732,5473=>732,5474=>732,5475=>732,5476=>730,5477=>730,
-5478=>730,5479=>730,5480=>947,5481=>900,5482=>508,5492=>831,5493=>831,5494=>831,5495=>831,5496=>831,
-5497=>831,5498=>831,5499=>563,5500=>752,5501=>484,5502=>1047,5503=>1047,5504=>1047,5505=>1047,5506=>1047,
-5507=>1047,5508=>1047,5509=>825,5514=>831,5515=>831,5516=>831,5517=>831,5518=>1259,5519=>1259,5520=>1259,
-5521=>1002,5522=>1002,5523=>1259,5524=>1259,5525=>700,5526=>1073,5536=>852,5537=>852,5538=>852,5539=>852,
-5540=>852,5541=>852,5542=>600,5543=>643,5544=>643,5545=>643,5546=>643,5547=>643,5548=>643,5549=>643,
-5550=>418,5551=>628,5598=>770,5601=>767,5702=>468,5703=>468,5742=>444,5743=>1047,5744=>1310,5745=>1632,
-5746=>1632,5747=>1375,5748=>1375,5749=>1632,5750=>1632,5760=>477,5761=>493,5762=>712,5763=>931,5764=>1150,
-5765=>1370,5766=>493,5767=>712,5768=>931,5769=>1150,5770=>1370,5771=>498,5772=>718,5773=>938,5774=>1159,
-5775=>1379,5776=>493,5777=>712,5778=>930,5779=>1149,5780=>1370,5781=>498,5782=>752,5783=>789,5784=>1205,
-5785=>1150,5786=>683,5787=>507,5788=>507,7424=>592,7425=>717,7426=>982,7427=>586,7428=>550,7429=>605,
-7430=>605,7431=>491,7432=>541,7433=>278,7434=>395,7435=>579,7436=>583,7437=>754,7438=>650,7439=>612,
-7440=>550,7441=>684,7442=>684,7443=>684,7444=>1023,7446=>612,7447=>612,7448=>524,7449=>602,7450=>602,
-7451=>583,7452=>574,7453=>737,7454=>948,7455=>638,7456=>592,7457=>818,7458=>525,7459=>526,7462=>583,
-7463=>592,7464=>564,7465=>524,7466=>590,7467=>639,7468=>431,7469=>613,7470=>432,7472=>485,7473=>398,
-7474=>398,7475=>488,7476=>474,7477=>186,7478=>186,7479=>413,7480=>351,7481=>543,7482=>471,7483=>471,
-7484=>496,7485=>439,7486=>380,7487=>438,7488=>385,7489=>461,7490=>623,7491=>392,7492=>392,7493=>405,
-7494=>648,7495=>428,7496=>405,7497=>417,7498=>417,7499=>360,7500=>359,7501=>405,7502=>179,7503=>426,
-7504=>623,7505=>409,7506=>414,7507=>370,7508=>414,7509=>414,7510=>428,7511=>295,7512=>405,7513=>470,
-7514=>623,7515=>417,7517=>402,7518=>373,7519=>385,7520=>416,7521=>364,7522=>179,7523=>259,7524=>405,
-7525=>417,7526=>402,7527=>373,7528=>412,7529=>416,7530=>364,7543=>635,7544=>474,7547=>372,7557=>278,
-7579=>405,7580=>370,7581=>370,7582=>414,7583=>360,7584=>296,7585=>233,7586=>405,7587=>405,7588=>261,
-7589=>250,7590=>261,7591=>261,7592=>234,7593=>250,7594=>235,7595=>376,7596=>623,7597=>623,7598=>411,
-7599=>479,7600=>409,7601=>414,7602=>414,7603=>360,7604=>287,7605=>295,7606=>508,7607=>418,7608=>361,
-7609=>406,7610=>417,7611=>366,7612=>437,7613=>366,7614=>392,7615=>414,7620=>0,7621=>0,7622=>0,
-7623=>0,7624=>0,7625=>0,7680=>684,7681=>613,7682=>686,7683=>635,7684=>686,7685=>635,7686=>686,
-7687=>635,7688=>698,7689=>550,7690=>770,7691=>635,7692=>770,7693=>635,7694=>770,7695=>635,7696=>770,
-7697=>635,7698=>770,7699=>635,7700=>632,7701=>615,7702=>632,7703=>615,7704=>632,7705=>615,7706=>632,
-7707=>615,7708=>632,7709=>615,7710=>575,7711=>352,7712=>775,7713=>635,7714=>752,7715=>634,7716=>752,
-7717=>634,7718=>752,7719=>634,7720=>752,7721=>634,7722=>752,7723=>634,7724=>295,7725=>278,7726=>295,
-7727=>278,7728=>656,7729=>579,7730=>656,7731=>579,7732=>656,7733=>579,7734=>557,7735=>288,7736=>557,
-7737=>288,7738=>557,7739=>278,7740=>557,7741=>278,7742=>863,7743=>974,7744=>863,7745=>974,7746=>863,
-7747=>974,7748=>748,7749=>634,7750=>748,7751=>634,7752=>748,7753=>634,7754=>748,7755=>634,7756=>787,
-7757=>612,7758=>787,7759=>612,7760=>787,7761=>612,7762=>787,7763=>612,7764=>603,7765=>635,7766=>603,
-7767=>635,7768=>695,7769=>411,7770=>695,7771=>411,7772=>695,7773=>411,7774=>695,7775=>411,7776=>635,
-7777=>521,7778=>635,7779=>521,7780=>635,7781=>521,7782=>635,7783=>521,7784=>635,7785=>521,7786=>611,
-7787=>392,7788=>611,7789=>392,7790=>611,7791=>392,7792=>611,7793=>392,7794=>732,7795=>634,7796=>732,
-7797=>634,7798=>732,7799=>634,7800=>732,7801=>634,7802=>732,7803=>634,7804=>684,7805=>592,7806=>684,
-7807=>592,7808=>989,7809=>818,7810=>989,7811=>818,7812=>989,7813=>818,7814=>989,7815=>818,7816=>989,
-7817=>818,7818=>685,7819=>592,7820=>685,7821=>592,7822=>611,7823=>592,7824=>685,7825=>525,7826=>685,
-7827=>525,7828=>685,7829=>525,7830=>634,7831=>392,7832=>818,7833=>592,7834=>613,7835=>352,7838=>769,
-7839=>612,7840=>684,7841=>613,7842=>684,7843=>613,7844=>684,7845=>613,7846=>684,7847=>613,7848=>684,
-7849=>613,7850=>684,7851=>613,7852=>684,7853=>613,7854=>684,7855=>613,7856=>684,7857=>613,7858=>684,
-7859=>613,7860=>684,7861=>613,7862=>684,7863=>613,7864=>632,7865=>615,7866=>632,7867=>615,7868=>632,
-7869=>615,7870=>632,7871=>615,7872=>632,7873=>615,7874=>632,7875=>615,7876=>632,7877=>615,7878=>632,
-7879=>615,7880=>295,7881=>278,7882=>295,7883=>278,7884=>787,7885=>612,7886=>787,7887=>612,7888=>787,
-7889=>612,7890=>787,7891=>612,7892=>787,7893=>612,7894=>787,7895=>612,7896=>787,7897=>612,7898=>913,
-7899=>612,7900=>913,7901=>612,7902=>913,7903=>612,7904=>913,7905=>612,7906=>913,7907=>612,7908=>732,
-7909=>634,7910=>732,7911=>634,7912=>858,7913=>634,7914=>858,7915=>634,7916=>858,7917=>634,7918=>858,
-7919=>634,7920=>858,7921=>634,7922=>611,7923=>592,7924=>611,7925=>592,7926=>611,7927=>592,7928=>611,
-7929=>592,7936=>659,7937=>659,7938=>659,7939=>659,7940=>659,7941=>659,7942=>659,7943=>659,7944=>684,
-7945=>684,7946=>877,7947=>877,7948=>769,7949=>801,7950=>708,7951=>743,7952=>541,7953=>541,7954=>541,
-7955=>541,7956=>541,7957=>541,7960=>711,7961=>711,7962=>966,7963=>975,7964=>898,7965=>928,7968=>634,
-7969=>634,7970=>634,7971=>634,7972=>634,7973=>634,7974=>634,7975=>634,7976=>837,7977=>835,7978=>1086,
-7979=>1089,7980=>1027,7981=>1051,7982=>934,7983=>947,7984=>338,7985=>338,7986=>338,7987=>338,7988=>338,
-7989=>338,7990=>338,7991=>338,7992=>380,7993=>374,7994=>635,7995=>635,7996=>570,7997=>600,7998=>489,
-7999=>493,8000=>612,8001=>612,8002=>612,8003=>612,8004=>612,8005=>612,8008=>804,8009=>848,8010=>1095,
-8011=>1100,8012=>938,8013=>970,8016=>579,8017=>579,8018=>579,8019=>579,8020=>579,8021=>579,8022=>579,
-8023=>579,8025=>784,8027=>998,8029=>1012,8031=>897,8032=>837,8033=>837,8034=>837,8035=>837,8036=>837,
-8037=>837,8038=>837,8039=>837,8040=>802,8041=>843,8042=>1089,8043=>1095,8044=>946,8045=>972,8046=>921,
-8047=>952,8048=>659,8049=>659,8050=>541,8051=>548,8052=>634,8053=>654,8054=>338,8055=>338,8056=>612,
-8057=>612,8058=>579,8059=>579,8060=>837,8061=>837,8064=>659,8065=>659,8066=>659,8067=>659,8068=>659,
-8069=>659,8070=>659,8071=>659,8072=>684,8073=>684,8074=>877,8075=>877,8076=>769,8077=>801,8078=>708,
-8079=>743,8080=>634,8081=>634,8082=>634,8083=>634,8084=>634,8085=>634,8086=>634,8087=>634,8088=>837,
-8089=>835,8090=>1086,8091=>1089,8092=>1027,8093=>1051,8094=>934,8095=>947,8096=>837,8097=>837,8098=>837,
-8099=>837,8100=>837,8101=>837,8102=>837,8103=>837,8104=>802,8105=>843,8106=>1089,8107=>1095,8108=>946,
-8109=>972,8110=>921,8111=>952,8112=>659,8113=>659,8114=>659,8115=>659,8116=>659,8118=>659,8119=>659,
-8120=>684,8121=>684,8122=>716,8123=>692,8124=>684,8125=>500,8126=>500,8127=>500,8128=>500,8129=>500,
-8130=>634,8131=>634,8132=>654,8134=>634,8135=>634,8136=>805,8137=>746,8138=>931,8139=>871,8140=>752,
-8141=>500,8142=>500,8143=>500,8144=>338,8145=>338,8146=>338,8147=>338,8150=>338,8151=>338,8152=>295,
-8153=>295,8154=>475,8155=>408,8157=>500,8158=>500,8159=>500,8160=>579,8161=>579,8162=>579,8163=>579,
-8164=>635,8165=>635,8166=>579,8167=>579,8168=>611,8169=>611,8170=>845,8171=>825,8172=>685,8173=>500,
-8174=>500,8175=>500,8178=>837,8179=>837,8180=>837,8182=>837,8183=>837,8184=>941,8185=>813,8186=>922,
-8187=>826,8188=>764,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=>361,8209=>361,8210=>636,8213=>1000,8214=>500,8215=>500,8219=>318,8223=>518,8227=>590,8228=>334,
-8229=>667,8231=>318,8234=>0,8235=>0,8236=>0,8237=>0,8238=>0,8239=>200,8241=>1735,8242=>227,
-8243=>374,8244=>520,8245=>227,8246=>374,8247=>520,8248=>339,8251=>838,8252=>485,8253=>531,8254=>500,
-8255=>804,8256=>804,8257=>250,8258=>1000,8259=>500,8260=>167,8261=>390,8262=>390,8263=>922,8264=>733,
-8265=>733,8266=>497,8267=>636,8268=>500,8269=>500,8270=>500,8271=>337,8272=>804,8273=>500,8274=>450,
-8275=>1000,8276=>804,8277=>838,8278=>586,8279=>663,8280=>838,8281=>838,8282=>318,8283=>797,8284=>838,
-8285=>318,8286=>318,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=>179,8308=>401,8309=>401,8310=>401,8311=>401,
-8312=>401,8313=>401,8314=>528,8315=>528,8316=>528,8317=>246,8318=>246,8319=>398,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=>392,8337=>417,8338=>414,8339=>444,8340=>417,8352=>877,8353=>636,
-8354=>636,8355=>636,8356=>636,8357=>974,8358=>748,8359=>1272,8360=>1074,8361=>989,8362=>784,8363=>635,
-8365=>636,8366=>636,8367=>1272,8368=>636,8369=>636,8370=>636,8371=>636,8372=>774,8373=>641,8400=>0,
-8401=>0,8406=>0,8407=>0,8411=>0,8412=>0,8417=>0,8448=>1019,8449=>1019,8450=>698,8451=>1123,
-8452=>642,8453=>1019,8454=>1067,8455=>614,8456=>698,8457=>952,8459=>988,8460=>754,8461=>850,8462=>634,
-8463=>634,8464=>470,8465=>697,8466=>720,8467=>413,8468=>818,8469=>801,8470=>1040,8471=>1000,8472=>697,
-8473=>701,8474=>787,8475=>798,8476=>814,8477=>792,8478=>896,8479=>684,8480=>1020,8481=>1074,8483=>684,
-8484=>745,8485=>578,8486=>764,8487=>764,8488=>616,8489=>338,8490=>656,8491=>684,8492=>786,8493=>703,
-8494=>854,8495=>592,8496=>605,8497=>786,8498=>575,8499=>1069,8500=>462,8501=>745,8502=>674,8503=>466,
-8504=>645,8505=>380,8506=>926,8507=>1194,8508=>702,8509=>728,8510=>654,8511=>849,8512=>811,8513=>775,
-8514=>557,8515=>557,8516=>611,8517=>819,8518=>708,8519=>615,8520=>351,8521=>351,8523=>780,8526=>526,
-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=>295,8545=>492,8546=>689,8547=>923,8548=>684,8549=>922,8550=>1120,
-8551=>1317,8552=>917,8553=>685,8554=>933,8555=>1131,8556=>557,8557=>698,8558=>770,8559=>863,8560=>278,
-8561=>458,8562=>637,8563=>812,8564=>592,8565=>811,8566=>991,8567=>1170,8568=>819,8569=>592,8570=>822,
-8571=>1002,8572=>278,8573=>550,8574=>635,8575=>974,8576=>1245,8577=>770,8578=>1245,8579=>703,8580=>549,
-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=>684,8705=>636,8706=>517,8707=>632,8708=>632,8709=>871,8710=>669,8711=>669,
-8712=>871,8713=>871,8714=>718,8715=>871,8716=>871,8717=>718,8718=>636,8719=>757,8720=>757,8721=>674,
-8722=>838,8723=>838,8724=>838,8725=>337,8726=>637,8727=>838,8728=>626,8729=>626,8730=>637,8731=>637,
-8732=>637,8733=>714,8734=>833,8735=>838,8736=>896,8737=>896,8738=>838,8739=>500,8740=>500,8741=>500,
-8742=>500,8743=>732,8744=>732,8745=>732,8746=>732,8747=>521,8748=>789,8749=>1057,8750=>521,8751=>789,
-8752=>1057,8753=>521,8754=>521,8755=>521,8756=>636,8757=>636,8758=>260,8759=>636,8760=>838,8761=>838,
-8762=>838,8763=>838,8764=>838,8765=>838,8766=>838,8767=>838,8768=>375,8769=>838,8770=>838,8771=>838,
-8772=>838,8773=>838,8774=>838,8775=>838,8776=>838,8777=>838,8778=>838,8779=>838,8780=>838,8781=>838,
-8782=>838,8783=>838,8784=>838,8785=>838,8786=>839,8787=>839,8788=>1000,8789=>1000,8790=>838,8791=>838,
-8792=>838,8793=>838,8794=>838,8795=>838,8796=>838,8797=>838,8798=>838,8799=>838,8800=>838,8801=>838,
-8802=>838,8803=>838,8804=>838,8805=>838,8806=>838,8807=>838,8808=>838,8809=>838,8810=>1047,8811=>1047,
-8812=>464,8813=>838,8814=>838,8815=>838,8816=>838,8817=>838,8818=>838,8819=>838,8820=>838,8821=>838,
-8822=>838,8823=>838,8824=>838,8825=>838,8826=>838,8827=>838,8828=>838,8829=>838,8830=>838,8831=>838,
-8832=>838,8833=>838,8834=>838,8835=>838,8836=>838,8837=>838,8838=>838,8839=>838,8840=>838,8841=>838,
-8842=>838,8843=>838,8844=>732,8845=>732,8846=>732,8847=>838,8848=>838,8849=>838,8850=>838,8851=>780,
-8852=>780,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=>871,8867=>871,8868=>871,8869=>871,8870=>521,8871=>521,
-8872=>871,8873=>871,8874=>871,8875=>871,8876=>871,8877=>871,8878=>871,8879=>871,8880=>838,8881=>838,
-8882=>838,8883=>838,8884=>838,8885=>838,8886=>1000,8887=>1000,8888=>838,8889=>838,8890=>521,8891=>732,
-8892=>732,8893=>732,8894=>838,8895=>838,8896=>820,8897=>820,8898=>820,8899=>820,8900=>494,8901=>318,
-8902=>626,8903=>838,8904=>1000,8905=>1000,8906=>1000,8907=>1000,8908=>1000,8909=>838,8910=>732,8911=>732,
-8912=>838,8913=>838,8914=>838,8915=>838,8916=>838,8917=>838,8918=>838,8919=>838,8920=>1422,8921=>1422,
-8922=>838,8923=>838,8924=>838,8925=>838,8926=>838,8927=>838,8928=>838,8929=>838,8930=>838,8931=>838,
-8932=>838,8933=>838,8934=>838,8935=>838,8936=>838,8937=>838,8938=>838,8939=>838,8940=>838,8941=>838,
-8942=>1000,8943=>1000,8944=>1000,8945=>1000,8946=>1000,8947=>871,8948=>718,8949=>871,8950=>871,8951=>718,
-8952=>871,8953=>871,8954=>1000,8955=>871,8956=>718,8957=>871,8958=>718,8959=>871,8960=>602,8961=>602,
-8962=>635,8963=>838,8964=>838,8965=>838,8966=>838,8967=>488,8968=>390,8969=>390,8970=>390,8971=>390,
-8972=>809,8973=>809,8974=>809,8975=>809,8976=>838,8977=>513,8984=>1000,8985=>838,8988=>469,8989=>469,
-8990=>469,8991=>469,8992=>521,8993=>521,8996=>1152,8997=>1152,8998=>1414,8999=>1152,9000=>1443,9003=>1414,
-9004=>873,9075=>338,9076=>635,9077=>837,9082=>659,9085=>757,9095=>1152,9108=>873,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,9166=>838,9167=>945,
-9187=>873,9189=>769,9250=>635,9251=>635,9312=>896,9313=>896,9314=>896,9315=>896,9316=>896,9317=>896,
-9318=>896,9319=>896,9320=>896,9321=>896,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,9729=>1000,9730=>896,9731=>896,9732=>896,9733=>896,9734=>896,9735=>573,9736=>896,9737=>896,
-9738=>888,9739=>888,9740=>671,9741=>1013,9742=>1246,9743=>1250,9744=>896,9745=>896,9746=>896,9747=>532,
-9748=>896,9749=>896,9750=>896,9751=>896,9752=>896,9753=>896,9754=>896,9755=>896,9756=>896,9757=>609,
-9758=>896,9759=>609,9760=>896,9761=>896,9762=>896,9763=>896,9764=>669,9765=>746,9766=>649,9767=>784,
-9768=>545,9769=>896,9770=>896,9771=>896,9772=>710,9773=>896,9774=>896,9775=>896,9776=>896,9777=>896,
-9778=>896,9779=>896,9780=>896,9781=>896,9782=>896,9783=>896,9784=>896,9785=>896,9786=>896,9787=>896,
-9788=>896,9789=>896,9790=>896,9791=>614,9792=>731,9793=>731,9794=>896,9795=>896,9796=>896,9797=>896,
-9798=>896,9799=>896,9800=>896,9801=>896,9802=>896,9803=>896,9804=>896,9805=>896,9806=>896,9807=>896,
-9808=>896,9809=>896,9810=>896,9811=>896,9812=>896,9813=>896,9814=>896,9815=>896,9816=>896,9817=>896,
-9818=>896,9819=>896,9820=>896,9821=>896,9822=>896,9823=>896,9824=>896,9825=>896,9826=>896,9827=>896,
-9828=>896,9829=>896,9830=>896,9831=>896,9832=>896,9833=>472,9834=>638,9835=>896,9836=>896,9837=>472,
-9838=>357,9839=>484,9840=>748,9841=>766,9842=>896,9843=>896,9844=>896,9845=>896,9846=>896,9847=>896,
-9848=>896,9849=>896,9850=>896,9851=>896,9852=>896,9853=>896,9854=>896,9855=>896,9856=>869,9857=>869,
-9858=>869,9859=>869,9860=>869,9861=>869,9862=>896,9863=>896,9864=>896,9865=>896,9866=>896,9867=>896,
-9868=>896,9869=>896,9870=>896,9871=>896,9872=>896,9873=>896,9874=>896,9875=>896,9876=>896,9877=>541,
-9878=>896,9879=>896,9880=>896,9881=>896,9882=>896,9883=>896,9884=>896,9888=>896,9889=>702,9890=>1003,
-9891=>1085,9892=>1143,9893=>901,9894=>838,9895=>838,9896=>838,9897=>838,9898=>838,9899=>838,9900=>838,
-9901=>838,9902=>838,9903=>838,9904=>844,9905=>838,9906=>731,9907=>732,9908=>732,9909=>732,9910=>850,
-9911=>732,9912=>732,9985=>838,9986=>838,9987=>838,9988=>838,9990=>838,9991=>838,9992=>838,9993=>838,
-9996=>838,9997=>838,9998=>838,9999=>838,10000=>838,10001=>838,10002=>838,10003=>838,10004=>838,10005=>838,
-10006=>838,10007=>838,10008=>838,10009=>838,10010=>838,10011=>838,10012=>838,10013=>838,10014=>838,10015=>838,
-10016=>838,10017=>838,10018=>838,10019=>838,10020=>838,10021=>838,10022=>838,10023=>838,10025=>838,10026=>838,
-10027=>838,10028=>838,10029=>838,10030=>838,10031=>838,10032=>838,10033=>838,10034=>838,10035=>838,10036=>838,
-10037=>838,10038=>838,10039=>838,10040=>838,10041=>838,10042=>838,10043=>838,10044=>838,10045=>838,10046=>838,
-10047=>838,10048=>838,10049=>838,10050=>838,10051=>838,10052=>838,10053=>838,10054=>838,10055=>838,10056=>838,
-10057=>838,10058=>838,10059=>838,10061=>896,10063=>896,10064=>896,10065=>896,10066=>896,10070=>896,10072=>838,
-10073=>838,10074=>838,10075=>322,10076=>322,10077=>538,10078=>538,10081=>838,10082=>838,10083=>838,10084=>838,
-10085=>838,10086=>838,10087=>838,10088=>838,10089=>838,10090=>838,10091=>838,10092=>838,10093=>838,10094=>838,
-10095=>838,10096=>838,10097=>838,10098=>838,10099=>838,10100=>838,10101=>838,10102=>896,10103=>896,10104=>896,
-10105=>896,10106=>896,10107=>896,10108=>896,10109=>896,10110=>896,10111=>896,10112=>838,10113=>838,10114=>838,
-10115=>838,10116=>838,10117=>838,10118=>838,10119=>838,10120=>838,10121=>838,10122=>838,10123=>838,10124=>838,
-10125=>838,10126=>838,10127=>838,10128=>838,10129=>838,10130=>838,10131=>838,10132=>838,10136=>838,10137=>838,
-10138=>838,10139=>838,10140=>838,10141=>838,10142=>838,10143=>838,10144=>838,10145=>838,10146=>838,10147=>838,
-10148=>838,10149=>838,10150=>838,10151=>838,10152=>838,10153=>838,10154=>838,10155=>838,10156=>838,10157=>838,
-10158=>838,10159=>838,10161=>838,10162=>838,10163=>838,10164=>838,10165=>838,10166=>838,10167=>838,10168=>838,
-10169=>838,10170=>838,10171=>838,10172=>838,10173=>838,10174=>838,10181=>390,10182=>390,10208=>494,10214=>495,
-10215=>495,10216=>390,10217=>390,10218=>556,10219=>556,10224=>838,10225=>838,10226=>838,10227=>838,10228=>1157,
-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,10502=>838,10503=>838,10506=>838,
-10507=>838,10560=>683,10561=>683,10627=>734,10628=>734,10702=>838,10703=>1000,10704=>1000,10705=>1000,10706=>1000,
-10707=>1000,10708=>1000,10709=>1000,10731=>494,10746=>838,10747=>838,10752=>1000,10753=>1000,10754=>1000,10764=>1325,
-10765=>521,10766=>521,10767=>521,10768=>521,10769=>521,10770=>521,10771=>521,10772=>521,10773=>521,10774=>521,
-10775=>521,10776=>521,10777=>521,10778=>521,10779=>521,10780=>521,10799=>838,10877=>838,10878=>838,10879=>838,
-10880=>838,10881=>838,10882=>838,10883=>838,10884=>838,10885=>838,10886=>838,10887=>838,10888=>838,10889=>838,
-10890=>838,10891=>838,10892=>838,10893=>838,10894=>838,10895=>838,10896=>838,10897=>838,10898=>838,10899=>838,
-10900=>838,10901=>838,10902=>838,10903=>838,10904=>838,10905=>838,10906=>838,10907=>838,10908=>838,10909=>838,
-10910=>838,10911=>838,10912=>838,10926=>838,10927=>838,10928=>838,10929=>838,10930=>838,10931=>838,10932=>838,
-10933=>838,10934=>838,10935=>838,10936=>838,10937=>838,10938=>838,11001=>838,11002=>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=>836,11023=>836,11024=>836,11025=>836,11026=>945,11027=>945,11028=>945,11029=>945,
-11030=>769,11031=>769,11032=>769,11033=>769,11034=>945,11039=>869,11040=>869,11041=>873,11042=>873,11043=>873,
-11044=>1119,11091=>869,11092=>869,11360=>557,11361=>278,11362=>557,11363=>603,11364=>695,11365=>613,11366=>392,
-11367=>752,11368=>634,11369=>656,11370=>579,11371=>685,11372=>525,11373=>781,11374=>863,11375=>684,11377=>734,
-11378=>1128,11379=>961,11380=>592,11381=>654,11382=>568,11383=>660,11385=>414,11386=>612,11387=>491,11388=>175,
-11389=>431,11568=>646,11569=>888,11570=>888,11571=>682,11572=>684,11573=>635,11574=>562,11575=>684,11576=>684,
-11577=>632,11578=>632,11579=>683,11580=>875,11581=>685,11582=>491,11583=>685,11584=>888,11585=>888,11586=>300,
-11587=>627,11588=>752,11589=>656,11590=>527,11591=>685,11592=>645,11593=>632,11594=>502,11595=>953,11596=>778,
-11597=>748,11598=>621,11599=>295,11600=>778,11601=>295,11602=>752,11603=>633,11604=>888,11605=>888,11606=>752,
-11607=>320,11608=>749,11609=>888,11610=>888,11611=>698,11612=>768,11613=>685,11614=>698,11615=>622,11616=>684,
-11617=>752,11618=>632,11619=>788,11620=>567,11621=>788,11631=>515,11800=>531,11810=>390,11811=>390,11812=>390,
-11813=>390,11822=>531,19904=>896,19905=>896,19906=>896,19907=>896,19908=>896,19909=>896,19910=>896,19911=>896,
-19912=>896,19913=>896,19914=>896,19915=>896,19916=>896,19917=>896,19918=>896,19919=>896,19920=>896,19921=>896,
-19922=>896,19923=>896,19924=>896,19925=>896,19926=>896,19927=>896,19928=>896,19929=>896,19930=>896,19931=>896,
-19932=>896,19933=>896,19934=>896,19935=>896,19936=>896,19937=>896,19938=>896,19939=>896,19940=>896,19941=>896,
-19942=>896,19943=>896,19944=>896,19945=>896,19946=>896,19947=>896,19948=>896,19949=>896,19950=>896,19951=>896,
-19952=>896,19953=>896,19954=>896,19955=>896,19956=>896,19957=>896,19958=>896,19959=>896,19960=>896,19961=>896,
-19962=>896,19963=>896,19964=>896,19965=>896,19966=>896,19967=>896,42564=>635,42565=>521,42566=>354,42567=>338,
-42572=>1180,42573=>1028,42576=>1029,42577=>906,42580=>1080,42581=>842,42582=>977,42583=>843,42594=>1062,42595=>912,
-42596=>1066,42597=>901,42598=>1178,42599=>1008,42600=>787,42601=>612,42602=>855,42603=>712,42604=>1358,42605=>1019,
-42606=>879,42634=>782,42635=>685,42636=>611,42637=>583,42644=>686,42645=>634,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=>252,42782=>252,42783=>252,42790=>752,42791=>634,42792=>878,
-42793=>709,42794=>614,42795=>541,42800=>491,42801=>521,42802=>1250,42803=>985,42804=>1203,42805=>990,42806=>1142,
-42807=>981,42808=>971,42809=>818,42810=>971,42811=>818,42812=>959,42813=>818,42814=>703,42815=>549,42822=>680,
-42823=>392,42824=>582,42825=>427,42826=>807,42827=>704,42830=>1358,42831=>1019,42880=>557,42881=>278,42882=>735,
-42883=>634,42889=>337,42890=>376,42891=>401,42892=>275,43003=>575,43004=>603,43005=>863,43006=>295,43007=>1199,
-61440=>977,61441=>977,63173=>612,64256=>689,64257=>630,64258=>630,64259=>967,64260=>967,64261=>686,64262=>861,
-64275=>1202,64276=>1202,64277=>1196,64278=>1186,64279=>1529,64285=>272,64286=>0,64287=>471,64288=>636,64289=>856,
-64290=>774,64291=>906,64292=>771,64293=>843,64294=>855,64295=>807,64296=>875,64297=>838,64298=>808,64299=>808,
-64300=>808,64301=>808,64302=>629,64303=>629,64304=>629,64305=>608,64306=>448,64307=>594,64308=>640,64309=>272,
-64310=>374,64312=>648,64313=>336,64314=>592,64315=>556,64316=>599,64318=>659,64320=>441,64321=>700,64323=>640,
-64324=>604,64326=>581,64327=>663,64328=>592,64329=>808,64330=>657,64331=>272,64332=>608,64333=>556,64334=>604,
-64335=>629,64338=>941,64339=>982,64340=>278,64341=>302,64342=>941,64343=>982,64344=>278,64345=>302,64346=>941,
-64347=>982,64348=>278,64349=>302,64350=>941,64351=>982,64352=>278,64353=>302,64354=>941,64355=>982,64356=>278,
-64357=>302,64358=>941,64359=>982,64360=>278,64361=>302,64362=>1037,64363=>1035,64364=>478,64365=>506,64366=>1037,
-64367=>1035,64368=>478,64369=>506,64370=>646,64371=>646,64372=>618,64373=>646,64374=>646,64375=>646,64376=>618,
-64377=>646,64378=>646,64379=>646,64380=>618,64381=>646,64382=>646,64383=>646,64384=>618,64385=>646,64394=>483,
-64395=>552,64396=>483,64397=>552,64398=>895,64399=>895,64400=>476,64401=>552,64402=>895,64403=>895,64404=>476,
-64405=>552,64414=>734,64415=>761,64473=>483,64474=>517,64488=>278,64489=>302,64508=>783,64509=>833,64510=>278,
-64511=>302,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,65056=>0,65057=>0,65058=>0,
-65059=>0,65136=>293,65137=>293,65138=>293,65139=>262,65140=>293,65142=>293,65143=>293,65144=>293,65145=>293,
-65146=>293,65147=>293,65148=>293,65149=>293,65150=>293,65151=>293,65152=>470,65153=>278,65154=>305,65155=>278,
-65156=>305,65157=>483,65158=>517,65159=>278,65160=>305,65161=>783,65162=>833,65163=>278,65164=>302,65165=>278,
-65166=>305,65167=>941,65168=>982,65169=>278,65170=>302,65171=>524,65172=>536,65173=>941,65174=>982,65175=>278,
-65176=>302,65177=>941,65178=>982,65179=>278,65180=>302,65181=>646,65182=>646,65183=>618,65184=>646,65185=>646,
-65186=>646,65187=>618,65188=>646,65189=>646,65190=>646,65191=>618,65192=>646,65193=>445,65194=>525,65195=>445,
-65196=>525,65197=>483,65198=>552,65199=>483,65200=>552,65201=>1221,65202=>1275,65203=>838,65204=>892,65205=>1221,
-65206=>1275,65207=>838,65208=>892,65209=>1209,65210=>1225,65211=>849,65212=>867,65213=>1209,65214=>1225,65215=>849,
-65216=>867,65217=>925,65218=>949,65219=>796,65220=>820,65221=>925,65222=>949,65223=>796,65224=>820,65225=>597,
-65226=>532,65227=>597,65228=>482,65229=>597,65230=>532,65231=>523,65232=>482,65233=>1037,65234=>1035,65235=>478,
-65236=>506,65237=>776,65238=>834,65239=>478,65240=>506,65241=>824,65242=>843,65243=>476,65244=>552,65245=>727,
-65246=>757,65247=>305,65248=>331,65249=>619,65250=>666,65251=>536,65252=>578,65253=>734,65254=>761,65255=>278,
-65256=>302,65257=>524,65258=>536,65259=>527,65260=>461,65261=>483,65262=>517,65263=>783,65264=>833,65265=>783,
-65266=>833,65267=>278,65268=>302,65269=>570,65270=>597,65271=>570,65272=>597,65273=>570,65274=>597,65275=>570,
-65276=>597,65279=>0,65529=>0,65530=>0,65531=>0,65532=>0,65533=>1025);
-$enc='';
-$diff='';
-$file='dejavusans.z';
-$ctg='dejavusans.ctg.z';
-$originalsize=622280;
-?>
\ No newline at end of file
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusans.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusans.z
deleted file mode 100644
index e7a78d24..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusans.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusansb.ctg.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusansb.ctg.z
deleted file mode 100644
index 514062cc..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusansb.ctg.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusansb.php b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusansb.php
deleted file mode 100644
index bcd70bf7..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusansb.php
+++ /dev/null
@@ -1,504 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='DejaVuSans-Bold';
-$desc=array('Ascent'=>928,'Descent'=>-236,'CapHeight'=>19,'Flags'=>32,'FontBBox'=>'[-1069 -385 1975 1174]','ItalicAngle'=>0,'StemV'=>120,'MissingWidth'=>600);
-$up=-63;
-$ut=44;
-$dw=600;
-$cw=array(
-0=>600,32=>348,33=>456,34=>521,35=>838,36=>696,37=>1002,38=>872,39=>306,40=>457,
-41=>457,42=>523,43=>838,44=>380,45=>415,46=>380,47=>365,48=>696,49=>696,50=>696,
-51=>696,52=>696,53=>696,54=>696,55=>696,56=>696,57=>696,58=>400,59=>400,60=>838,
-61=>838,62=>838,63=>580,64=>1000,65=>774,66=>762,67=>734,68=>830,69=>683,70=>683,
-71=>821,72=>837,73=>372,74=>372,75=>775,76=>637,77=>995,78=>837,79=>850,80=>733,
-81=>850,82=>770,83=>720,84=>682,85=>812,86=>774,87=>1103,88=>771,89=>724,90=>725,
-91=>457,92=>365,93=>457,94=>838,95=>500,96=>500,97=>675,98=>716,99=>593,100=>716,
-101=>678,102=>435,103=>716,104=>712,105=>343,106=>343,107=>665,108=>343,109=>1042,110=>712,
-111=>687,112=>716,113=>716,114=>493,115=>595,116=>478,117=>712,118=>652,119=>924,120=>645,
-121=>652,122=>582,123=>712,124=>365,125=>712,126=>838,8364=>696,8218=>380,402=>435,8222=>657,
-8230=>1000,8224=>500,8225=>500,710=>500,8240=>1440,352=>720,8249=>412,338=>1167,381=>725,8216=>380,
-8217=>380,8220=>657,8221=>657,8226=>639,8211=>500,8212=>1000,732=>500,8482=>1000,353=>595,8250=>412,
-339=>1094,382=>582,376=>724,160=>348,161=>456,162=>696,163=>696,164=>636,165=>696,166=>365,
-167=>500,168=>500,169=>1000,170=>564,171=>646,172=>838,173=>415,174=>1000,175=>500,176=>500,
-177=>838,178=>438,179=>438,180=>500,181=>736,182=>636,183=>380,184=>500,185=>438,186=>564,
-187=>646,188=>1035,189=>1035,190=>1035,191=>580,192=>774,193=>774,194=>774,195=>774,196=>774,
-197=>774,198=>1085,199=>734,200=>683,201=>683,202=>683,203=>683,204=>372,205=>372,206=>372,
-207=>372,208=>838,209=>837,210=>850,211=>850,212=>850,213=>850,214=>850,215=>838,216=>850,
-217=>812,218=>812,219=>812,220=>812,221=>724,222=>738,223=>719,224=>675,225=>675,226=>675,
-227=>675,228=>675,229=>675,230=>1048,231=>593,232=>678,233=>678,234=>678,235=>678,236=>343,
-237=>343,238=>343,239=>343,240=>687,241=>712,242=>687,243=>687,244=>687,245=>687,246=>687,
-247=>838,248=>687,249=>712,250=>712,251=>712,252=>712,253=>652,254=>716,255=>652,256=>774,
-257=>675,258=>774,259=>675,260=>774,261=>675,262=>734,263=>593,264=>734,265=>593,266=>734,
-267=>593,268=>734,269=>593,270=>830,271=>716,272=>838,273=>716,274=>683,275=>678,276=>683,
-277=>678,278=>683,279=>678,280=>683,281=>678,282=>683,283=>678,284=>821,285=>716,286=>821,
-287=>716,288=>821,289=>716,290=>821,291=>716,292=>837,293=>712,294=>974,295=>790,296=>372,
-297=>343,298=>372,299=>343,300=>372,301=>343,302=>372,303=>343,304=>372,305=>343,306=>744,
-307=>686,308=>372,309=>343,310=>775,311=>665,312=>665,313=>637,314=>343,315=>637,316=>343,
-317=>637,318=>479,319=>637,320=>557,321=>642,322=>371,323=>837,324=>712,325=>837,326=>712,
-327=>837,328=>712,329=>983,330=>837,331=>712,332=>850,333=>687,334=>850,335=>687,336=>850,
-337=>687,340=>770,341=>493,342=>770,343=>493,344=>770,345=>493,346=>720,347=>595,348=>720,
-349=>595,350=>720,351=>595,354=>682,355=>478,356=>682,357=>478,358=>682,359=>478,360=>812,
-361=>712,362=>812,363=>712,364=>812,365=>712,366=>812,367=>712,368=>812,369=>712,370=>812,
-371=>712,372=>1103,373=>924,374=>724,375=>652,377=>725,378=>582,379=>725,380=>582,383=>435,
-384=>716,385=>811,386=>762,387=>716,388=>762,389=>716,390=>734,391=>734,392=>593,393=>838,
-394=>879,395=>757,396=>716,397=>688,398=>683,399=>849,400=>696,401=>683,403=>821,404=>793,
-405=>1045,406=>436,407=>389,408=>775,409=>665,410=>360,411=>592,412=>1042,413=>837,414=>712,
-415=>850,416=>874,417=>687,418=>1083,419=>912,420=>782,421=>716,422=>770,423=>720,424=>595,
-425=>683,426=>552,427=>478,428=>707,429=>478,430=>682,431=>835,432=>712,433=>850,434=>813,
-435=>797,436=>778,437=>725,438=>582,439=>772,440=>772,441=>641,442=>582,443=>696,444=>772,
-445=>641,446=>573,447=>716,448=>372,449=>659,450=>544,451=>372,452=>1555,453=>1412,454=>1298,
-455=>1009,456=>980,457=>686,458=>1209,459=>1180,460=>1055,461=>774,462=>675,463=>372,464=>343,
-465=>850,466=>687,467=>812,468=>712,469=>812,470=>712,471=>812,472=>712,473=>812,474=>712,
-475=>812,476=>712,477=>678,478=>774,479=>675,480=>774,481=>675,482=>1085,483=>1048,484=>821,
-485=>716,486=>821,487=>716,488=>775,489=>665,490=>850,491=>687,492=>850,493=>687,494=>772,
-495=>582,496=>343,497=>1555,498=>1412,499=>1298,500=>821,501=>716,502=>1289,503=>787,504=>837,
-505=>712,506=>774,507=>675,508=>1085,509=>1048,510=>850,511=>687,512=>774,513=>675,514=>774,
-515=>675,516=>683,517=>678,518=>683,519=>678,520=>372,521=>343,522=>372,523=>343,524=>850,
-525=>687,526=>850,527=>687,528=>770,529=>493,530=>770,531=>493,532=>812,533=>712,534=>812,
-535=>712,536=>720,537=>595,538=>682,539=>478,540=>690,541=>607,542=>837,543=>712,544=>837,
-545=>865,546=>809,547=>659,548=>725,549=>582,550=>774,551=>675,552=>683,553=>678,554=>850,
-555=>687,556=>850,557=>687,558=>850,559=>687,560=>850,561=>687,562=>724,563=>652,564=>492,
-565=>867,566=>512,567=>343,568=>1088,569=>1088,570=>774,571=>734,572=>593,573=>637,574=>682,
-575=>595,576=>582,577=>782,578=>614,579=>762,580=>812,581=>774,582=>683,583=>678,584=>372,
-585=>343,586=>860,587=>791,588=>770,589=>493,590=>724,591=>652,592=>675,593=>716,594=>716,
-595=>716,596=>593,597=>593,598=>717,599=>792,600=>678,601=>678,602=>876,603=>557,604=>545,
-605=>815,606=>731,607=>343,608=>792,609=>716,610=>627,611=>644,612=>635,613=>712,614=>712,
-615=>712,616=>545,617=>440,618=>545,619=>559,620=>693,621=>343,622=>841,623=>1042,624=>1042,
-625=>1042,626=>712,627=>793,628=>707,629=>687,630=>909,631=>681,632=>796,633=>538,634=>538,
-635=>650,636=>493,637=>493,638=>596,639=>596,640=>642,641=>642,642=>595,643=>415,644=>435,
-645=>605,646=>552,647=>478,648=>478,649=>920,650=>772,651=>670,652=>652,653=>924,654=>652,
-655=>724,656=>694,657=>684,658=>641,659=>641,660=>573,661=>573,662=>573,663=>573,664=>850,
-665=>633,666=>731,667=>685,668=>691,669=>343,670=>732,671=>539,672=>792,673=>573,674=>573,
-675=>1156,676=>1214,677=>1155,678=>974,679=>769,680=>929,681=>1026,682=>792,683=>780,684=>591,
-685=>415,686=>677,687=>789,688=>456,689=>456,690=>219,691=>315,692=>315,693=>315,694=>411,
-695=>591,696=>417,697=>302,698=>521,699=>380,700=>380,701=>380,702=>366,703=>366,704=>326,
-705=>326,706=>500,707=>500,708=>500,709=>500,711=>500,712=>306,713=>500,714=>500,715=>500,
-716=>306,717=>500,718=>500,719=>500,720=>337,721=>337,722=>366,723=>366,724=>500,725=>500,
-726=>416,727=>328,728=>500,729=>500,730=>500,731=>500,733=>500,734=>351,735=>500,736=>412,
-737=>219,738=>381,739=>413,740=>326,741=>500,742=>500,743=>500,744=>500,745=>500,748=>500,
-749=>500,750=>657,755=>500,759=>500,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,832=>0,833=>0,
-834=>0,835=>0,836=>0,837=>0,838=>0,839=>0,840=>0,841=>0,842=>0,843=>0,
-844=>0,845=>0,846=>0,847=>0,849=>0,850=>0,851=>0,855=>0,856=>0,858=>0,
-860=>0,861=>0,862=>0,863=>0,864=>0,865=>0,866=>0,880=>698,881=>565,882=>1022,
-883=>836,884=>302,885=>302,886=>837,887=>701,890=>500,891=>593,892=>550,893=>549,894=>400,
-900=>441,901=>500,902=>797,903=>380,904=>846,905=>1009,906=>563,908=>891,910=>980,911=>894,
-912=>390,913=>774,914=>762,915=>637,916=>774,917=>683,918=>725,919=>837,920=>850,921=>372,
-922=>775,923=>774,924=>995,925=>837,926=>632,927=>850,928=>837,929=>733,931=>683,932=>682,
-933=>724,934=>850,935=>771,936=>850,937=>850,938=>372,939=>724,940=>687,941=>557,942=>712,
-943=>390,944=>675,945=>687,946=>716,947=>681,948=>687,949=>557,950=>591,951=>712,952=>687,
-953=>390,954=>710,955=>633,956=>736,957=>681,958=>591,959=>687,960=>791,961=>716,962=>593,
-963=>779,964=>638,965=>675,966=>782,967=>645,968=>794,969=>869,970=>390,971=>675,972=>687,
-973=>675,974=>869,975=>775,976=>651,977=>661,978=>746,979=>981,980=>746,981=>796,982=>869,
-983=>744,984=>850,985=>687,986=>734,987=>593,988=>683,989=>494,990=>702,991=>660,992=>919,
-993=>627,994=>1093,995=>837,996=>832,997=>716,998=>928,999=>744,1000=>733,1001=>650,1002=>789,
-1003=>671,1004=>752,1005=>716,1006=>682,1007=>590,1008=>744,1009=>716,1010=>593,1011=>343,1012=>850,
-1013=>645,1014=>644,1015=>738,1016=>716,1017=>734,1018=>995,1019=>732,1020=>716,1021=>698,1022=>734,
-1023=>698,1024=>683,1025=>683,1026=>878,1027=>637,1028=>734,1029=>720,1030=>372,1031=>372,1032=>372,
-1033=>1154,1034=>1130,1035=>878,1036=>817,1037=>837,1038=>771,1039=>837,1040=>774,1041=>762,1042=>762,
-1043=>637,1044=>891,1045=>683,1046=>1224,1047=>710,1048=>837,1049=>837,1050=>817,1051=>831,1052=>995,
-1053=>837,1054=>850,1055=>837,1056=>733,1057=>734,1058=>682,1059=>771,1060=>992,1061=>771,1062=>928,
-1063=>808,1064=>1235,1065=>1326,1066=>939,1067=>1036,1068=>762,1069=>734,1070=>1174,1071=>770,1072=>675,
-1073=>698,1074=>633,1075=>522,1076=>808,1077=>678,1078=>995,1079=>581,1080=>701,1081=>701,1082=>679,
-1083=>732,1084=>817,1085=>691,1086=>687,1087=>691,1088=>716,1089=>593,1090=>580,1091=>652,1092=>992,
-1093=>645,1094=>741,1095=>687,1096=>1062,1097=>1105,1098=>751,1099=>904,1100=>632,1101=>593,1102=>972,
-1103=>642,1104=>678,1105=>678,1106=>714,1107=>522,1108=>593,1109=>595,1110=>343,1111=>343,1112=>343,
-1113=>991,1114=>956,1115=>734,1116=>679,1117=>701,1118=>652,1119=>691,1120=>1093,1121=>869,1122=>840,
-1123=>736,1124=>1012,1125=>839,1126=>992,1127=>832,1128=>1358,1129=>1121,1130=>850,1131=>687,1132=>1236,
-1133=>1007,1134=>696,1135=>557,1136=>1075,1137=>1061,1138=>850,1139=>687,1140=>850,1141=>695,1142=>850,
-1143=>695,1144=>1148,1145=>1043,1146=>1074,1147=>863,1148=>1405,1149=>1173,1150=>1093,1151=>869,1152=>734,
-1153=>593,1154=>652,1155=>0,1156=>0,1157=>0,1158=>0,1159=>0,1160=>418,1161=>418,1162=>957,
-1163=>807,1164=>762,1165=>611,1166=>733,1167=>716,1168=>637,1169=>522,1170=>666,1171=>543,1172=>808,
-1173=>669,1174=>1224,1175=>995,1176=>710,1177=>581,1178=>775,1179=>679,1180=>817,1181=>679,1182=>817,
-1183=>679,1184=>1015,1185=>826,1186=>956,1187=>808,1188=>1103,1189=>874,1190=>1273,1191=>1017,1192=>952,
-1193=>858,1194=>734,1195=>593,1196=>682,1197=>580,1198=>724,1199=>652,1200=>724,1201=>652,1202=>771,
-1203=>645,1204=>1112,1205=>1000,1206=>808,1207=>687,1208=>808,1209=>687,1210=>808,1211=>712,1212=>1026,
-1213=>810,1214=>1026,1215=>810,1216=>372,1217=>1224,1218=>995,1219=>775,1220=>630,1221=>951,1222=>805,
-1223=>837,1224=>691,1225=>957,1226=>807,1227=>808,1228=>687,1229=>1115,1230=>933,1231=>343,1232=>774,
-1233=>675,1234=>774,1235=>675,1236=>1085,1237=>1048,1238=>683,1239=>678,1240=>849,1241=>678,1242=>849,
-1243=>678,1244=>1224,1245=>995,1246=>710,1247=>581,1248=>772,1249=>641,1250=>837,1251=>701,1252=>837,
-1253=>701,1254=>850,1255=>687,1256=>850,1257=>687,1258=>850,1259=>687,1260=>734,1261=>593,1262=>771,
-1263=>652,1264=>771,1265=>652,1266=>771,1267=>652,1268=>808,1269=>687,1270=>637,1271=>522,1272=>1036,
-1273=>904,1274=>666,1275=>543,1276=>771,1277=>645,1278=>771,1279=>645,1280=>762,1281=>608,1282=>1159,
-1283=>893,1284=>1119,1285=>920,1286=>828,1287=>693,1288=>1242,1289=>1017,1290=>1289,1291=>1013,1292=>839,
-1293=>638,1294=>938,1295=>803,1296=>696,1297=>557,1298=>831,1299=>732,1300=>1286,1301=>1068,1302=>1065,
-1303=>979,1304=>1082,1305=>1013,1306=>850,1307=>716,1308=>1103,1309=>924,1312=>1267,1313=>1059,1314=>1273,
-1315=>1017,1316=>957,1317=>807,1329=>984,1330=>812,1331=>984,1332=>984,1333=>812,1334=>777,1335=>812,
-1336=>812,1337=>975,1338=>984,1339=>812,1340=>710,1341=>1078,1342=>1136,1343=>812,1344=>710,1345=>757,
-1346=>984,1347=>876,1348=>984,1349=>793,1350=>984,1351=>812,1352=>812,1353=>812,1354=>958,1355=>777,
-1356=>984,1357=>812,1358=>984,1359=>720,1360=>812,1361=>793,1362=>895,1363=>850,1364=>936,1365=>850,
-1366=>720,1369=>366,1370=>380,1371=>550,1372=>550,1373=>380,1374=>546,1375=>521,1377=>1042,1378=>712,
-1379=>866,1380=>868,1381=>712,1382=>817,1383=>653,1384=>712,1385=>811,1386=>817,1387=>712,1388=>498,
-1389=>1018,1390=>716,1391=>712,1392=>712,1393=>716,1394=>819,1395=>712,1396=>751,1397=>343,1398=>882,
-1399=>559,1400=>712,1401=>559,1402=>1042,1403=>559,1404=>863,1405=>712,1406=>813,1407=>1042,1408=>712,
-1409=>716,1410=>571,1411=>1042,1412=>778,1413=>687,1414=>720,1415=>862,1417=>400,1418=>487,1456=>0,
-1457=>0,1458=>0,1459=>0,1460=>0,1461=>0,1462=>0,1463=>0,1464=>0,1465=>0,1466=>0,
-1467=>0,1468=>0,1469=>0,1470=>415,1471=>0,1472=>372,1473=>0,1474=>0,1475=>372,1478=>497,
-1479=>0,1488=>751,1489=>673,1490=>537,1491=>654,1492=>712,1493=>343,1494=>491,1495=>712,1496=>724,
-1497=>343,1498=>649,1499=>650,1500=>679,1501=>712,1502=>775,1503=>343,1504=>497,1505=>773,1506=>678,
-1507=>718,1508=>687,1509=>628,1510=>751,1511=>729,1512=>649,1513=>949,1514=>751,1520=>664,1521=>664,
-1522=>663,1523=>444,1524=>710,1542=>667,1543=>667,1545=>884,1546=>1157,1548=>380,1557=>0,1563=>400,
-1567=>580,1569=>511,1570=>343,1571=>343,1572=>622,1573=>343,1574=>917,1575=>343,1576=>1005,1577=>590,
-1578=>1005,1579=>1005,1580=>721,1581=>721,1582=>721,1583=>513,1584=>513,1585=>576,1586=>576,1587=>1380,
-1588=>1380,1589=>1345,1590=>1345,1591=>1039,1592=>1039,1593=>683,1594=>683,1600=>342,1601=>1162,1602=>894,
-1603=>917,1604=>868,1605=>733,1606=>854,1607=>590,1608=>622,1609=>917,1610=>917,1611=>0,1612=>0,
-1613=>0,1614=>0,1615=>0,1616=>0,1617=>0,1618=>0,1619=>0,1620=>0,1621=>0,1626=>500,
-1632=>610,1633=>610,1634=>610,1635=>610,1636=>610,1637=>610,1638=>610,1639=>610,1640=>610,1641=>610,
-1642=>610,1643=>374,1644=>380,1645=>545,1646=>1005,1647=>894,1652=>292,1657=>1005,1658=>1005,1659=>1005,
-1660=>1005,1661=>1005,1662=>1005,1663=>1005,1664=>1005,1665=>721,1666=>721,1667=>721,1668=>721,1669=>721,
-1670=>721,1671=>721,1681=>576,1682=>576,1685=>681,1688=>576,1697=>1162,1700=>1162,1702=>1162,1705=>1024,
-1711=>1024,1717=>868,1722=>854,1727=>721,1734=>622,1740=>917,1742=>917,1749=>590,1776=>610,1777=>610,
-1778=>610,1779=>610,1780=>610,1781=>610,1782=>610,1783=>610,1784=>610,1785=>610,1984=>696,1985=>696,
-1986=>696,1987=>696,1988=>696,1989=>696,1990=>696,1991=>696,1992=>696,1993=>696,1994=>343,1995=>547,
-1996=>543,1997=>652,1998=>691,1999=>691,2000=>594,2001=>691,2002=>904,2003=>551,2004=>551,2005=>627,
-2006=>688,2007=>444,2008=>1022,2009=>506,2010=>826,2011=>691,2012=>652,2013=>912,2014=>627,2015=>707,
-2016=>506,2017=>652,2018=>574,2019=>627,2020=>627,2021=>627,2022=>574,2023=>574,2027=>0,2028=>0,
-2029=>0,2030=>0,2031=>0,2032=>0,2033=>0,2034=>0,2035=>0,2036=>380,2037=>380,2040=>691,
-2041=>691,2042=>415,3647=>743,3713=>790,3714=>748,3716=>749,3719=>569,3720=>742,3722=>744,3725=>761,
-3732=>706,3733=>704,3734=>747,3735=>819,3737=>730,3738=>727,3739=>727,3740=>922,3741=>827,3742=>866,
-3743=>866,3745=>836,3746=>761,3747=>770,3749=>769,3751=>713,3754=>827,3755=>1031,3757=>724,3758=>784,
-3759=>934,3760=>688,3761=>0,3762=>610,3763=>610,3764=>0,3765=>0,3766=>0,3767=>0,3768=>0,
-3769=>0,3771=>0,3772=>0,3773=>670,3776=>516,3777=>860,3778=>516,3779=>650,3780=>632,3782=>759,
-3784=>0,3785=>0,3786=>0,3787=>0,3788=>0,3789=>0,3792=>771,3793=>771,3794=>693,3795=>836,
-3796=>729,3797=>729,3798=>849,3799=>790,3800=>759,3801=>910,3804=>1363,3805=>1363,4256=>918,4257=>744,
-4258=>739,4259=>837,4260=>649,4261=>773,4262=>857,4263=>889,4264=>530,4265=>633,4266=>857,4267=>900,
-4268=>643,4269=>903,4270=>814,4271=>752,4272=>869,4273=>643,4274=>643,4275=>886,4276=>886,4277=>733,
-4278=>653,4279=>643,4280=>646,4281=>643,4282=>790,4283=>902,4284=>633,4285=>619,4286=>643,4287=>778,
-4288=>892,4289=>601,4290=>742,4291=>616,4292=>633,4293=>742,4304=>553,4305=>552,4306=>596,4307=>815,
-4308=>562,4309=>563,4310=>553,4311=>827,4312=>553,4313=>543,4314=>1074,4315=>563,4316=>563,4317=>812,
-4318=>552,4319=>591,4320=>822,4321=>563,4322=>690,4323=>583,4324=>813,4325=>562,4326=>813,4327=>563,
-4328=>563,4329=>563,4330=>632,4331=>563,4332=>563,4333=>552,4334=>563,4335=>563,4336=>558,4337=>604,
-4338=>552,4339=>552,4340=>553,4341=>605,4342=>852,4343=>635,4344=>563,4345=>596,4346=>542,4347=>684,
-4348=>368,5121=>774,5122=>774,5123=>774,5124=>774,5125=>905,5126=>905,5127=>905,5129=>905,5130=>905,
-5131=>905,5132=>1018,5133=>1009,5134=>1018,5135=>1009,5136=>1018,5137=>1009,5138=>1149,5139=>1140,5140=>1149,
-5141=>1140,5142=>905,5143=>1149,5144=>1142,5145=>1149,5146=>1142,5147=>905,5149=>310,5150=>529,5151=>425,
-5152=>425,5153=>395,5154=>395,5155=>395,5156=>395,5157=>564,5158=>470,5159=>310,5160=>395,5161=>395,
-5162=>395,5163=>1213,5164=>986,5165=>1216,5166=>1297,5167=>774,5168=>774,5169=>774,5170=>774,5171=>886,
-5172=>886,5173=>886,5175=>886,5176=>886,5177=>886,5178=>1018,5179=>1009,5180=>1018,5181=>1009,5182=>1018,
-5183=>1009,5184=>1149,5185=>1140,5186=>1149,5187=>1140,5188=>1149,5189=>1142,5190=>1149,5191=>1142,5192=>886,
-5193=>576,5194=>229,5196=>812,5197=>812,5198=>812,5199=>812,5200=>815,5201=>815,5202=>815,5204=>815,
-5205=>815,5206=>815,5207=>1056,5208=>1048,5209=>1056,5210=>1048,5211=>1056,5212=>1048,5213=>1060,5214=>1054,
-5215=>1060,5216=>1054,5217=>1060,5218=>1052,5219=>1060,5220=>1052,5221=>1060,5222=>483,5223=>1005,5224=>1005,
-5225=>1023,5226=>1017,5227=>743,5228=>743,5229=>743,5230=>743,5231=>743,5232=>743,5233=>743,5234=>743,
-5235=>743,5236=>1029,5237=>975,5238=>980,5239=>975,5240=>980,5241=>975,5242=>1029,5243=>975,5244=>1029,
-5245=>975,5246=>980,5247=>975,5248=>980,5249=>975,5250=>980,5251=>501,5252=>501,5253=>938,5254=>938,
-5255=>938,5256=>938,5257=>743,5258=>743,5259=>743,5260=>743,5261=>743,5262=>743,5263=>743,5264=>743,
-5265=>743,5266=>1029,5267=>975,5268=>1029,5269=>975,5270=>1029,5271=>975,5272=>1029,5273=>975,5274=>1029,
-5275=>975,5276=>1029,5277=>975,5278=>1029,5279=>975,5280=>1029,5281=>501,5282=>501,5283=>626,5284=>626,
-5285=>626,5286=>626,5287=>626,5288=>626,5289=>626,5290=>626,5291=>626,5292=>881,5293=>854,5294=>863,
-5295=>874,5296=>863,5297=>874,5298=>881,5299=>874,5300=>881,5301=>874,5302=>863,5303=>874,5304=>863,
-5305=>874,5306=>863,5307=>436,5308=>548,5309=>436,5312=>988,5313=>988,5314=>988,5315=>988,5316=>931,
-5317=>931,5318=>931,5319=>931,5320=>931,5321=>1238,5322=>1247,5323=>1200,5324=>1228,5325=>1200,5326=>1228,
-5327=>931,5328=>660,5329=>497,5330=>660,5331=>988,5332=>988,5333=>988,5334=>988,5335=>931,5336=>931,
-5337=>931,5338=>931,5339=>931,5340=>1231,5341=>1247,5342=>1283,5343=>1228,5344=>1283,5345=>1228,5346=>1228,
-5347=>1214,5348=>1228,5349=>1214,5350=>1283,5351=>1228,5352=>1283,5353=>1228,5354=>660,5356=>886,5357=>730,
-5358=>730,5359=>730,5360=>730,5361=>730,5362=>730,5363=>730,5364=>730,5365=>730,5366=>998,5367=>958,
-5368=>967,5369=>989,5370=>967,5371=>989,5372=>998,5373=>958,5374=>998,5375=>958,5376=>967,5377=>989,
-5378=>967,5379=>989,5380=>967,5381=>493,5382=>460,5383=>493,5392=>923,5393=>923,5394=>923,5395=>1136,
-5396=>1136,5397=>1136,5398=>1136,5399=>1209,5400=>1202,5401=>1209,5402=>1202,5403=>1209,5404=>1202,5405=>1431,
-5406=>1420,5407=>1431,5408=>1420,5409=>1431,5410=>1420,5411=>1431,5412=>1420,5413=>746,5414=>776,5415=>776,
-5416=>776,5417=>776,5418=>776,5419=>776,5420=>776,5421=>776,5422=>776,5423=>1003,5424=>1003,5425=>1013,
-5426=>996,5427=>1013,5428=>996,5429=>1003,5430=>1003,5431=>1003,5432=>1003,5433=>1013,5434=>996,5435=>1013,
-5436=>996,5437=>1013,5438=>495,5440=>395,5441=>510,5442=>1033,5443=>1033,5444=>976,5445=>976,5446=>976,
-5447=>976,5448=>733,5449=>733,5450=>733,5451=>733,5452=>733,5453=>733,5454=>1003,5455=>959,5456=>495,
-5458=>886,5459=>774,5460=>774,5461=>774,5462=>774,5463=>928,5464=>928,5465=>928,5466=>928,5467=>1172,
-5468=>1142,5469=>602,5470=>812,5471=>812,5472=>812,5473=>812,5474=>812,5475=>812,5476=>815,5477=>815,
-5478=>815,5479=>815,5480=>1060,5481=>1052,5482=>548,5492=>977,5493=>977,5494=>977,5495=>977,5496=>977,
-5497=>977,5498=>977,5499=>618,5500=>837,5501=>510,5502=>1238,5503=>1238,5504=>1238,5505=>1238,5506=>1238,
-5507=>1238,5508=>1238,5509=>989,5514=>977,5515=>977,5516=>977,5517=>977,5518=>1591,5519=>1591,5520=>1591,
-5521=>1295,5522=>1295,5523=>1591,5524=>1591,5525=>848,5526=>1273,5536=>988,5537=>988,5538=>931,5539=>931,
-5540=>931,5541=>931,5542=>660,5543=>776,5544=>776,5545=>776,5546=>776,5547=>776,5548=>776,5549=>776,
-5550=>495,5551=>743,5598=>830,5601=>830,5702=>496,5703=>496,5742=>413,5743=>1238,5744=>1591,5745=>2016,
-5746=>2016,5747=>1720,5748=>1678,5749=>2016,5750=>2016,5760=>543,5761=>637,5762=>945,5763=>1254,5764=>1563,
-5765=>1871,5766=>627,5767=>936,5768=>1254,5769=>1559,5770=>1871,5771=>569,5772=>877,5773=>1187,5774=>1497,
-5775=>1807,5776=>637,5777=>945,5778=>1240,5779=>1555,5780=>1871,5781=>569,5782=>569,5783=>789,5784=>1234,
-5785=>1559,5786=>740,5787=>638,5788=>638,7424=>652,7425=>833,7426=>1048,7427=>608,7428=>593,7429=>676,
-7430=>676,7431=>559,7432=>557,7433=>343,7434=>494,7435=>665,7436=>539,7437=>817,7438=>701,7439=>687,
-7440=>593,7441=>660,7442=>660,7443=>660,7444=>1094,7446=>687,7447=>687,7448=>556,7449=>642,7450=>642,
-7451=>580,7452=>634,7453=>737,7454=>948,7455=>695,7456=>652,7457=>924,7458=>582,7459=>646,7462=>539,
-7463=>652,7464=>691,7465=>556,7466=>781,7467=>732,7468=>487,7469=>683,7470=>480,7472=>523,7473=>430,
-7474=>430,7475=>517,7476=>527,7477=>234,7478=>234,7479=>488,7480=>401,7481=>626,7482=>527,7483=>527,
-7484=>535,7485=>509,7486=>461,7487=>485,7488=>430,7489=>511,7490=>695,7491=>458,7492=>458,7493=>479,
-7494=>712,7495=>479,7496=>479,7497=>479,7498=>479,7499=>386,7500=>386,7501=>479,7502=>219,7503=>487,
-7504=>664,7505=>456,7506=>488,7507=>414,7508=>488,7509=>488,7510=>479,7511=>388,7512=>456,7513=>462,
-7514=>664,7515=>501,7517=>451,7518=>429,7519=>433,7520=>493,7521=>406,7522=>219,7523=>315,7524=>456,
-7525=>501,7526=>451,7527=>429,7528=>451,7529=>493,7530=>406,7543=>716,7544=>527,7547=>545,7557=>514,
-7579=>479,7580=>414,7581=>414,7582=>488,7583=>386,7584=>377,7585=>348,7586=>479,7587=>456,7588=>347,
-7589=>281,7590=>347,7591=>347,7592=>431,7593=>326,7594=>330,7595=>370,7596=>664,7597=>664,7598=>562,
-7599=>562,7600=>448,7601=>488,7602=>542,7603=>422,7604=>396,7605=>388,7606=>583,7607=>494,7608=>399,
-7609=>451,7610=>501,7611=>417,7612=>523,7613=>470,7614=>455,7615=>425,7620=>0,7621=>0,7622=>0,
-7623=>0,7624=>0,7625=>0,7680=>774,7681=>675,7682=>762,7683=>716,7684=>762,7685=>716,7686=>762,
-7687=>716,7688=>734,7689=>593,7690=>830,7691=>716,7692=>830,7693=>716,7694=>830,7695=>716,7696=>830,
-7697=>716,7698=>830,7699=>716,7700=>683,7701=>678,7702=>683,7703=>678,7704=>683,7705=>678,7706=>683,
-7707=>678,7708=>683,7709=>678,7710=>683,7711=>435,7712=>821,7713=>716,7714=>837,7715=>712,7716=>837,
-7717=>712,7718=>837,7719=>712,7720=>837,7721=>712,7722=>837,7723=>712,7724=>372,7725=>343,7726=>372,
-7727=>343,7728=>775,7729=>665,7730=>775,7731=>665,7732=>775,7733=>665,7734=>637,7735=>343,7736=>637,
-7737=>343,7738=>637,7739=>343,7740=>637,7741=>343,7742=>995,7743=>1042,7744=>995,7745=>1042,7746=>995,
-7747=>1042,7748=>837,7749=>712,7750=>837,7751=>712,7752=>837,7753=>712,7754=>837,7755=>712,7756=>850,
-7757=>687,7758=>850,7759=>687,7760=>850,7761=>687,7762=>850,7763=>687,7764=>733,7765=>716,7766=>733,
-7767=>716,7768=>770,7769=>493,7770=>770,7771=>493,7772=>770,7773=>493,7774=>770,7775=>493,7776=>720,
-7777=>595,7778=>720,7779=>595,7780=>720,7781=>595,7782=>720,7783=>595,7784=>720,7785=>595,7786=>682,
-7787=>478,7788=>682,7789=>478,7790=>682,7791=>478,7792=>682,7793=>478,7794=>812,7795=>712,7796=>812,
-7797=>712,7798=>812,7799=>712,7800=>812,7801=>712,7802=>812,7803=>712,7804=>774,7805=>652,7806=>774,
-7807=>652,7808=>1103,7809=>924,7810=>1103,7811=>924,7812=>1103,7813=>924,7814=>1103,7815=>924,7816=>1103,
-7817=>924,7818=>771,7819=>645,7820=>771,7821=>645,7822=>724,7823=>652,7824=>725,7825=>582,7826=>725,
-7827=>582,7828=>725,7829=>582,7830=>712,7831=>478,7832=>924,7833=>652,7834=>675,7835=>435,7838=>896,
-7839=>687,7840=>774,7841=>675,7842=>774,7843=>675,7844=>774,7845=>675,7846=>774,7847=>675,7848=>774,
-7849=>675,7850=>774,7851=>675,7852=>774,7853=>675,7854=>774,7855=>675,7856=>774,7857=>675,7858=>774,
-7859=>675,7860=>774,7861=>675,7862=>774,7863=>675,7864=>683,7865=>678,7866=>683,7867=>678,7868=>683,
-7869=>678,7870=>683,7871=>678,7872=>683,7873=>678,7874=>683,7875=>678,7876=>683,7877=>678,7878=>683,
-7879=>678,7880=>372,7881=>343,7882=>372,7883=>343,7884=>850,7885=>687,7886=>850,7887=>687,7888=>850,
-7889=>687,7890=>850,7891=>687,7892=>850,7893=>687,7894=>850,7895=>687,7896=>850,7897=>687,7898=>874,
-7899=>687,7900=>874,7901=>687,7902=>874,7903=>687,7904=>874,7905=>687,7906=>874,7907=>687,7908=>812,
-7909=>712,7910=>812,7911=>712,7912=>835,7913=>712,7914=>835,7915=>712,7916=>835,7917=>712,7918=>835,
-7919=>712,7920=>835,7921=>712,7922=>724,7923=>652,7924=>724,7925=>652,7926=>724,7927=>652,7928=>724,
-7929=>652,7936=>687,7937=>687,7938=>687,7939=>687,7940=>687,7941=>687,7942=>687,7943=>687,7944=>774,
-7945=>774,7946=>1041,7947=>1043,7948=>935,7949=>963,7950=>835,7951=>859,7952=>557,7953=>557,7954=>557,
-7955=>557,7956=>557,7957=>557,7960=>792,7961=>794,7962=>1100,7963=>1096,7964=>1023,7965=>1052,7968=>712,
-7969=>712,7970=>712,7971=>712,7972=>712,7973=>712,7974=>712,7975=>712,7976=>945,7977=>951,7978=>1250,
-7979=>1250,7980=>1180,7981=>1206,7982=>1054,7983=>1063,7984=>390,7985=>390,7986=>390,7987=>390,7988=>390,
-7989=>390,7990=>390,7991=>390,7992=>483,7993=>489,7994=>777,7995=>785,7996=>712,7997=>738,7998=>604,
-7999=>604,8000=>687,8001=>687,8002=>687,8003=>687,8004=>687,8005=>687,8008=>892,8009=>933,8010=>1221,
-8011=>1224,8012=>1053,8013=>1082,8016=>675,8017=>675,8018=>675,8019=>675,8020=>675,8021=>675,8022=>675,
-8023=>675,8025=>930,8027=>1184,8029=>1199,8031=>1049,8032=>869,8033=>869,8034=>869,8035=>869,8036=>869,
-8037=>869,8038=>869,8039=>869,8040=>909,8041=>958,8042=>1246,8043=>1251,8044=>1076,8045=>1105,8046=>1028,
-8047=>1076,8048=>687,8049=>687,8050=>557,8051=>557,8052=>712,8053=>712,8054=>390,8055=>390,8056=>687,
-8057=>687,8058=>675,8059=>675,8060=>869,8061=>869,8064=>687,8065=>687,8066=>687,8067=>687,8068=>687,
-8069=>687,8070=>687,8071=>687,8072=>774,8073=>774,8074=>1041,8075=>1043,8076=>935,8077=>963,8078=>835,
-8079=>859,8080=>712,8081=>712,8082=>712,8083=>712,8084=>712,8085=>712,8086=>712,8087=>712,8088=>945,
-8089=>951,8090=>1250,8091=>1250,8092=>1180,8093=>1206,8094=>1054,8095=>1063,8096=>869,8097=>869,8098=>869,
-8099=>869,8100=>869,8101=>869,8102=>869,8103=>869,8104=>909,8105=>958,8106=>1246,8107=>1251,8108=>1076,
-8109=>1105,8110=>1028,8111=>1076,8112=>687,8113=>687,8114=>687,8115=>687,8116=>687,8118=>687,8119=>687,
-8120=>774,8121=>774,8122=>876,8123=>797,8124=>774,8125=>500,8126=>500,8127=>500,8128=>500,8129=>500,
-8130=>712,8131=>712,8132=>712,8134=>712,8135=>712,8136=>929,8137=>846,8138=>1080,8139=>1009,8140=>837,
-8141=>500,8142=>500,8143=>500,8144=>390,8145=>390,8146=>390,8147=>390,8150=>390,8151=>390,8152=>372,
-8153=>372,8154=>621,8155=>563,8157=>500,8158=>500,8159=>500,8160=>675,8161=>675,8162=>675,8163=>675,
-8164=>716,8165=>716,8166=>675,8167=>675,8168=>724,8169=>724,8170=>1020,8171=>980,8172=>838,8173=>500,
-8174=>500,8175=>500,8178=>869,8179=>869,8180=>869,8182=>869,8183=>869,8184=>1065,8185=>891,8186=>1084,
-8187=>894,8188=>850,8189=>500,8190=>500,8192=>500,8193=>1000,8194=>500,8195=>1000,8196=>330,8197=>250,
-8198=>167,8199=>696,8200=>380,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=>380,8223=>657,8227=>639,8228=>333,
-8229=>667,8231=>348,8234=>0,8235=>0,8236=>0,8237=>0,8238=>0,8239=>200,8241=>1887,8242=>264,
-8243=>447,8244=>630,8245=>264,8246=>447,8247=>630,8248=>733,8251=>972,8252=>627,8253=>580,8254=>500,
-8255=>828,8256=>828,8257=>329,8258=>1023,8259=>500,8260=>167,8261=>457,8262=>457,8263=>1030,8264=>829,
-8265=>829,8266=>513,8267=>636,8268=>500,8269=>500,8270=>523,8271=>400,8272=>828,8273=>523,8274=>556,
-8275=>1000,8276=>828,8277=>838,8278=>684,8279=>813,8280=>838,8281=>838,8282=>380,8283=>872,8284=>838,
-8285=>380,8286=>380,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=>219,8308=>438,8309=>438,8310=>438,8311=>438,
-8312=>438,8313=>438,8314=>528,8315=>528,8316=>528,8317=>288,8318=>288,8319=>456,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=>288,8334=>288,8336=>458,8337=>479,8338=>488,8339=>413,8340=>479,8352=>929,8353=>696,
-8354=>696,8355=>696,8356=>696,8357=>1042,8358=>837,8359=>1518,8360=>1205,8361=>1103,8362=>904,8363=>696,
-8365=>696,8366=>682,8367=>1392,8368=>696,8369=>696,8370=>696,8371=>696,8372=>859,8373=>696,8400=>0,
-8401=>0,8406=>0,8407=>0,8411=>0,8412=>0,8417=>0,8448=>1120,8449=>1170,8450=>734,8451=>1211,
-8452=>896,8453=>1091,8454=>1144,8455=>614,8456=>698,8457=>1086,8459=>1073,8460=>913,8461=>888,8462=>712,
-8463=>712,8464=>597,8465=>697,8466=>856,8467=>472,8468=>974,8469=>837,8470=>1203,8471=>1000,8472=>697,
-8473=>750,8474=>850,8475=>938,8476=>814,8477=>801,8478=>896,8479=>710,8480=>1020,8481=>1281,8483=>755,
-8484=>754,8485=>578,8486=>850,8487=>850,8488=>763,8489=>338,8490=>775,8491=>774,8492=>928,8493=>818,
-8494=>854,8495=>636,8496=>729,8497=>808,8498=>683,8499=>1184,8500=>465,8501=>794,8502=>731,8503=>494,
-8504=>684,8505=>380,8506=>945,8507=>1348,8508=>790,8509=>737,8510=>654,8511=>863,8512=>840,8513=>775,
-8514=>557,8515=>637,8516=>760,8517=>830,8518=>716,8519=>678,8520=>343,8521=>343,8523=>872,8526=>547,
-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=>372,8545=>659,8546=>945,8547=>1099,8548=>774,8549=>1099,8550=>1386,
-8551=>1672,8552=>1121,8553=>771,8554=>1120,8555=>1407,8556=>637,8557=>734,8558=>830,8559=>995,8560=>343,
-8561=>607,8562=>872,8563=>984,8564=>652,8565=>962,8566=>1227,8567=>1491,8568=>969,8569=>645,8570=>969,
-8571=>1233,8572=>343,8573=>593,8574=>716,8575=>1042,8576=>1289,8577=>830,8578=>1289,8579=>734,8580=>593,
-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=>774,8705=>696,8706=>544,8707=>683,8708=>683,8709=>856,8710=>697,8711=>697,
-8712=>896,8713=>896,8714=>750,8715=>896,8716=>896,8717=>750,8718=>636,8719=>787,8720=>787,8721=>718,
-8722=>838,8723=>838,8724=>696,8725=>365,8726=>696,8727=>838,8728=>626,8729=>380,8730=>667,8731=>667,
-8732=>667,8733=>712,8734=>833,8735=>838,8736=>896,8737=>896,8738=>838,8739=>500,8740=>500,8741=>500,
-8742=>500,8743=>812,8744=>812,8745=>812,8746=>812,8747=>610,8748=>929,8749=>1295,8750=>563,8751=>977,
-8752=>1313,8753=>563,8754=>563,8755=>563,8756=>696,8757=>696,8758=>294,8759=>696,8760=>838,8761=>838,
-8762=>838,8763=>838,8764=>838,8765=>838,8766=>838,8767=>838,8768=>375,8769=>838,8770=>838,8771=>838,
-8772=>838,8773=>838,8774=>838,8775=>838,8776=>838,8777=>838,8778=>838,8779=>838,8780=>838,8781=>838,
-8782=>838,8783=>838,8784=>838,8785=>838,8786=>838,8787=>838,8788=>1063,8789=>1063,8790=>838,8791=>838,
-8792=>838,8793=>838,8794=>838,8795=>838,8796=>838,8797=>838,8798=>838,8799=>838,8800=>838,8801=>838,
-8802=>838,8803=>838,8804=>838,8805=>838,8806=>838,8807=>838,8808=>841,8809=>841,8810=>1047,8811=>1047,
-8812=>500,8813=>838,8814=>838,8815=>838,8816=>838,8817=>838,8818=>838,8819=>838,8820=>838,8821=>838,
-8822=>838,8823=>838,8824=>838,8825=>838,8826=>838,8827=>838,8828=>838,8829=>838,8830=>838,8831=>838,
-8832=>838,8833=>838,8834=>838,8835=>838,8836=>838,8837=>838,8838=>838,8839=>838,8840=>838,8841=>838,
-8842=>838,8843=>838,8844=>812,8845=>812,8846=>812,8847=>838,8848=>838,8849=>838,8850=>838,8851=>796,
-8852=>796,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=>914,8867=>914,8868=>914,8869=>914,8870=>542,8871=>542,
-8872=>914,8873=>914,8874=>914,8875=>914,8876=>914,8877=>914,8878=>914,8879=>914,8880=>838,8881=>838,
-8882=>838,8883=>838,8884=>838,8885=>838,8886=>1000,8887=>1000,8888=>838,8889=>838,8890=>542,8891=>812,
-8892=>812,8893=>812,8894=>838,8895=>838,8896=>843,8897=>843,8898=>843,8899=>843,8900=>494,8901=>380,
-8902=>626,8903=>838,8904=>1000,8905=>1000,8906=>1000,8907=>1000,8908=>1000,8909=>838,8910=>812,8911=>812,
-8912=>838,8913=>838,8914=>838,8915=>838,8916=>838,8917=>838,8918=>838,8919=>838,8920=>1422,8921=>1422,
-8922=>838,8923=>838,8924=>838,8925=>838,8926=>838,8927=>838,8928=>838,8929=>838,8930=>838,8931=>838,
-8932=>838,8933=>838,8934=>838,8935=>838,8936=>838,8937=>838,8938=>838,8939=>838,8940=>838,8941=>838,
-8942=>1000,8943=>1000,8944=>1000,8945=>1000,8946=>1158,8947=>896,8948=>750,8949=>896,8950=>896,8951=>750,
-8952=>896,8953=>896,8954=>1158,8955=>896,8956=>750,8957=>896,8958=>750,8959=>896,8960=>602,8961=>602,
-8962=>716,8963=>838,8964=>838,8965=>838,8966=>838,8967=>488,8968=>457,8969=>457,8970=>457,8971=>457,
-8972=>809,8973=>809,8974=>809,8975=>809,8976=>838,8977=>539,8984=>928,8985=>838,8988=>469,8989=>469,
-8990=>469,8991=>469,8992=>610,8993=>610,8996=>1152,8997=>1152,8998=>1414,8999=>1152,9000=>1443,9003=>1414,
-9004=>873,9075=>390,9076=>716,9077=>869,9082=>687,9085=>863,9095=>1152,9108=>873,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=>610,9166=>838,9167=>945,
-9187=>873,9189=>769,9250=>716,9251=>716,9312=>847,9313=>847,9314=>847,9315=>847,9316=>847,9317=>847,
-9318=>847,9319=>847,9320=>847,9321=>847,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=>840,9689=>970,9690=>970,9691=>970,9692=>387,9693=>387,9694=>387,9695=>387,
-9696=>769,9697=>769,9698=>769,9699=>769,9700=>769,9701=>769,9702=>639,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,9729=>1000,9730=>896,9731=>896,9732=>896,9733=>896,9734=>896,9735=>573,
-9736=>896,9737=>896,9738=>888,9739=>888,9740=>671,9741=>1013,9742=>1246,9743=>1250,9744=>896,9745=>896,
-9746=>896,9747=>532,9748=>896,9749=>896,9750=>896,9751=>896,9752=>896,9753=>896,9754=>896,9755=>896,
-9756=>896,9757=>609,9758=>896,9759=>609,9760=>896,9761=>896,9762=>896,9763=>896,9764=>669,9765=>746,
-9766=>649,9767=>784,9768=>545,9769=>896,9770=>896,9771=>896,9772=>710,9773=>896,9774=>896,9775=>896,
-9776=>896,9777=>896,9778=>896,9779=>896,9780=>896,9781=>896,9782=>896,9783=>896,9784=>896,9785=>896,
-9786=>896,9787=>896,9788=>896,9789=>896,9790=>896,9791=>614,9792=>731,9793=>731,9794=>896,9795=>896,
-9796=>896,9797=>896,9798=>896,9799=>896,9800=>896,9801=>896,9802=>896,9803=>896,9804=>896,9805=>896,
-9806=>896,9807=>896,9808=>896,9809=>896,9810=>896,9811=>896,9812=>896,9813=>896,9814=>896,9815=>896,
-9816=>896,9817=>896,9818=>896,9819=>896,9820=>896,9821=>896,9822=>896,9823=>896,9824=>896,9825=>896,
-9826=>896,9827=>896,9828=>896,9829=>896,9830=>896,9831=>896,9832=>896,9833=>472,9834=>638,9835=>896,
-9836=>896,9837=>472,9838=>357,9839=>484,9840=>748,9841=>766,9842=>896,9843=>896,9844=>896,9845=>896,
-9846=>896,9847=>896,9848=>896,9849=>896,9850=>896,9851=>896,9852=>896,9853=>896,9854=>896,9855=>896,
-9856=>869,9857=>869,9858=>869,9859=>869,9860=>869,9861=>869,9862=>896,9863=>896,9864=>896,9865=>896,
-9866=>896,9867=>896,9868=>896,9869=>896,9870=>896,9871=>896,9872=>896,9873=>896,9874=>896,9875=>896,
-9876=>896,9877=>541,9878=>896,9879=>896,9880=>896,9881=>896,9882=>896,9883=>896,9884=>896,9888=>896,
-9889=>702,9890=>1003,9891=>1085,9892=>1143,9893=>901,9894=>838,9895=>838,9896=>838,9897=>838,9898=>838,
-9899=>838,9900=>838,9901=>838,9902=>838,9903=>838,9904=>844,9905=>838,9906=>731,9907=>732,9908=>732,
-9909=>732,9910=>850,9911=>732,9912=>732,9985=>838,9986=>838,9987=>838,9988=>838,9990=>838,9991=>838,
-9992=>838,9993=>838,9996=>838,9997=>838,9998=>838,9999=>838,10000=>838,10001=>838,10002=>838,10003=>838,
-10004=>838,10005=>838,10006=>838,10007=>838,10008=>838,10009=>838,10010=>838,10011=>838,10012=>838,10013=>838,
-10014=>838,10015=>838,10016=>838,10017=>838,10018=>838,10019=>838,10020=>838,10021=>838,10022=>838,10023=>838,
-10025=>838,10026=>838,10027=>838,10028=>838,10029=>838,10030=>838,10031=>838,10032=>838,10033=>838,10034=>838,
-10035=>838,10036=>838,10037=>838,10038=>838,10039=>838,10040=>838,10041=>838,10042=>838,10043=>838,10044=>838,
-10045=>838,10046=>838,10047=>838,10048=>838,10049=>838,10050=>838,10051=>838,10052=>838,10053=>838,10054=>838,
-10055=>838,10056=>838,10057=>838,10058=>838,10059=>838,10061=>896,10063=>896,10064=>896,10065=>896,10066=>896,
-10070=>896,10072=>838,10073=>838,10074=>838,10075=>347,10076=>347,10077=>587,10078=>587,10081=>838,10082=>838,
-10083=>838,10084=>838,10085=>838,10086=>838,10087=>838,10088=>838,10089=>838,10090=>838,10091=>838,10092=>838,
-10093=>838,10094=>838,10095=>838,10096=>838,10097=>838,10098=>838,10099=>838,10100=>838,10101=>838,10102=>847,
-10103=>847,10104=>847,10105=>847,10106=>847,10107=>847,10108=>847,10109=>847,10110=>847,10111=>847,10112=>838,
-10113=>838,10114=>838,10115=>838,10116=>838,10117=>838,10118=>838,10119=>838,10120=>838,10121=>838,10122=>838,
-10123=>838,10124=>838,10125=>838,10126=>838,10127=>838,10128=>838,10129=>838,10130=>838,10131=>838,10132=>838,
-10136=>838,10137=>838,10138=>838,10139=>838,10140=>838,10141=>838,10142=>838,10143=>838,10144=>838,10145=>838,
-10146=>838,10147=>838,10148=>838,10149=>838,10150=>838,10151=>838,10152=>838,10153=>838,10154=>838,10155=>838,
-10156=>838,10157=>838,10158=>838,10159=>838,10161=>838,10162=>838,10163=>838,10164=>838,10165=>838,10166=>838,
-10167=>838,10168=>838,10169=>838,10170=>838,10171=>838,10172=>838,10173=>838,10174=>838,10181=>457,10182=>457,
-10208=>494,10214=>487,10215=>487,10216=>457,10217=>457,10218=>721,10219=>721,10224=>838,10225=>838,10226=>838,
-10227=>838,10228=>1157,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,10502=>838,
-10503=>838,10506=>838,10507=>838,10560=>838,10561=>838,10627=>753,10628=>753,10702=>838,10703=>1046,10704=>1046,
-10705=>1000,10706=>1000,10707=>1000,10708=>1000,10709=>1000,10731=>494,10746=>838,10747=>838,10752=>1000,10753=>1000,
-10754=>1000,10764=>1661,10765=>563,10766=>563,10767=>563,10768=>563,10769=>563,10770=>563,10771=>563,10772=>563,
-10773=>563,10774=>563,10775=>563,10776=>563,10777=>563,10778=>563,10779=>563,10780=>563,10799=>838,10877=>838,
-10878=>838,10879=>838,10880=>838,10881=>838,10882=>838,10883=>838,10884=>838,10885=>838,10886=>838,10887=>838,
-10888=>838,10889=>838,10890=>838,10891=>838,10892=>838,10893=>838,10894=>838,10895=>838,10896=>838,10897=>838,
-10898=>838,10899=>838,10900=>838,10901=>838,10902=>838,10903=>838,10904=>838,10905=>838,10906=>838,10907=>838,
-10908=>838,10909=>838,10910=>838,10911=>838,10912=>838,10926=>838,10927=>838,10928=>838,10929=>838,10930=>838,
-10931=>838,10932=>838,10933=>838,10934=>838,10935=>838,10936=>838,10937=>838,10938=>838,11001=>838,11002=>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,11039=>869,11040=>869,11041=>873,
-11042=>873,11043=>873,11044=>1119,11091=>869,11092=>869,11360=>637,11361=>360,11362=>637,11363=>733,11364=>770,
-11365=>675,11366=>478,11367=>956,11368=>712,11369=>775,11370=>665,11371=>725,11372=>582,11373=>860,11374=>995,
-11375=>774,11377=>778,11378=>1221,11379=>1056,11380=>652,11381=>698,11382=>565,11383=>782,11385=>538,11386=>687,
-11387=>559,11388=>219,11389=>487,11568=>691,11569=>941,11570=>941,11571=>725,11572=>725,11573=>725,11574=>676,
-11575=>774,11576=>774,11577=>683,11578=>683,11579=>802,11580=>989,11581=>761,11582=>623,11583=>761,11584=>941,
-11585=>941,11586=>373,11587=>740,11588=>837,11589=>914,11590=>672,11591=>737,11592=>680,11593=>683,11594=>602,
-11595=>1039,11596=>778,11597=>837,11598=>683,11599=>372,11600=>778,11601=>373,11602=>725,11603=>691,11604=>941,
-11605=>941,11606=>837,11607=>373,11608=>836,11609=>941,11610=>941,11611=>734,11612=>876,11613=>771,11614=>734,
-11615=>683,11616=>774,11617=>837,11618=>683,11619=>850,11620=>697,11621=>850,11631=>716,11800=>580,11810=>457,
-11811=>457,11812=>457,11813=>457,11822=>580,19904=>896,19905=>896,19906=>896,19907=>896,19908=>896,19909=>896,
-19910=>896,19911=>896,19912=>896,19913=>896,19914=>896,19915=>896,19916=>896,19917=>896,19918=>896,19919=>896,
-19920=>896,19921=>896,19922=>896,19923=>896,19924=>896,19925=>896,19926=>896,19927=>896,19928=>896,19929=>896,
-19930=>896,19931=>896,19932=>896,19933=>896,19934=>896,19935=>896,19936=>896,19937=>896,19938=>896,19939=>896,
-19940=>896,19941=>896,19942=>896,19943=>896,19944=>896,19945=>896,19946=>896,19947=>896,19948=>896,19949=>896,
-19950=>896,19951=>896,19952=>896,19953=>896,19954=>896,19955=>896,19956=>896,19957=>896,19958=>896,19959=>896,
-19960=>896,19961=>896,19962=>896,19963=>896,19964=>896,19965=>896,19966=>896,19967=>896,42564=>720,42565=>595,
-42566=>436,42567=>440,42572=>1405,42573=>1173,42576=>1234,42577=>1027,42580=>1174,42581=>972,42582=>1093,42583=>958,
-42594=>1085,42595=>924,42596=>1096,42597=>912,42598=>1260,42599=>997,42600=>850,42601=>687,42602=>1037,42603=>868,
-42604=>1406,42605=>1106,42606=>961,42634=>963,42635=>787,42636=>682,42637=>580,42644=>808,42645=>712,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=>400,42780=>400,42781=>287,42782=>287,42783=>287,42790=>837,
-42791=>712,42792=>1031,42793=>857,42794=>696,42795=>557,42800=>559,42801=>595,42802=>1349,42803=>1052,42804=>1284,
-42805=>1064,42806=>1216,42807=>1054,42808=>1079,42809=>922,42810=>1079,42811=>922,42812=>1035,42813=>922,42814=>698,
-42815=>549,42822=>850,42823=>542,42824=>683,42825=>531,42826=>918,42827=>814,42830=>1406,42831=>1106,42880=>637,
-42881=>343,42882=>837,42883=>712,42889=>400,42890=>386,42891=>456,42892=>306,43003=>683,43004=>733,43005=>995,
-43006=>372,43007=>1325,63173=>687,64256=>810,64257=>741,64258=>741,64259=>1115,64260=>1116,64261=>808,64262=>1020,
-64275=>1388,64276=>1384,64277=>1378,64278=>1384,64279=>1713,64285=>343,64286=>0,64287=>663,64288=>720,64289=>963,
-64290=>890,64291=>988,64292=>963,64293=>938,64294=>988,64295=>988,64296=>976,64297=>838,64298=>949,64299=>949,
-64300=>949,64301=>949,64302=>751,64303=>751,64304=>751,64305=>673,64306=>537,64307=>654,64308=>712,64309=>438,
-64310=>491,64312=>724,64313=>438,64314=>649,64315=>650,64316=>679,64318=>775,64320=>497,64321=>773,64323=>718,
-64324=>687,64326=>751,64327=>729,64328=>649,64329=>949,64330=>751,64331=>343,64332=>673,64333=>650,64334=>687,
-64335=>751,64338=>1005,64339=>1059,64340=>375,64341=>408,64342=>1005,64343=>1059,64344=>375,64345=>408,64346=>1005,
-64347=>1059,64348=>375,64349=>408,64350=>1005,64351=>1059,64352=>375,64353=>408,64354=>1005,64355=>1059,64356=>375,
-64357=>408,64358=>1005,64359=>1059,64360=>375,64361=>408,64362=>1162,64363=>1191,64364=>655,64365=>720,64366=>1162,
-64367=>1191,64368=>655,64369=>720,64370=>721,64371=>721,64372=>721,64373=>721,64374=>721,64375=>721,64376=>721,
-64377=>721,64378=>721,64379=>721,64380=>721,64381=>721,64382=>721,64383=>721,64384=>721,64385=>721,64394=>576,
-64395=>622,64396=>576,64397=>622,64398=>1024,64399=>1024,64400=>582,64401=>582,64402=>1024,64403=>1024,64404=>582,
-64405=>582,64414=>854,64415=>900,64473=>622,64474=>627,64488=>375,64489=>408,64508=>917,64509=>1012,64510=>375,
-64511=>408,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,65056=>0,65057=>0,65058=>0,
-65059=>0,65136=>342,65137=>342,65138=>342,65139=>346,65140=>342,65142=>342,65143=>342,65144=>342,65145=>342,
-65146=>342,65147=>342,65148=>342,65149=>342,65150=>342,65151=>342,65152=>511,65153=>343,65154=>375,65155=>343,
-65156=>375,65157=>622,65158=>627,65159=>343,65160=>375,65161=>917,65162=>917,65163=>375,65164=>408,65165=>343,
-65166=>375,65167=>1005,65168=>1059,65169=>375,65170=>408,65171=>590,65172=>606,65173=>1005,65174=>1059,65175=>375,
-65176=>408,65177=>1005,65178=>1059,65179=>375,65180=>408,65181=>721,65182=>721,65183=>721,65184=>721,65185=>721,
-65186=>721,65187=>721,65188=>721,65189=>721,65190=>721,65191=>721,65192=>721,65193=>513,65194=>578,65195=>513,
-65196=>578,65197=>576,65198=>622,65199=>576,65200=>622,65201=>1380,65202=>1414,65203=>983,65204=>1018,65205=>1380,
-65206=>1414,65207=>983,65208=>1018,65209=>1345,65210=>1364,65211=>966,65212=>985,65213=>1345,65214=>1364,65215=>966,
-65216=>985,65217=>1039,65218=>1071,65219=>942,65220=>974,65221=>1039,65222=>1071,65223=>942,65224=>974,65225=>683,
-65226=>683,65227=>683,65228=>564,65229=>683,65230=>683,65231=>683,65232=>564,65233=>1162,65234=>1191,65235=>655,
-65236=>720,65237=>894,65238=>901,65239=>655,65240=>720,65241=>917,65242=>931,65243=>582,65244=>582,65245=>868,
-65246=>893,65247=>375,65248=>408,65249=>733,65250=>784,65251=>619,65252=>670,65253=>854,65254=>900,65255=>375,
-65256=>408,65257=>590,65258=>606,65259=>693,65260=>660,65261=>622,65262=>627,65263=>917,65264=>1012,65265=>917,
-65266=>1012,65267=>375,65268=>408,65269=>745,65270=>759,65271=>745,65272=>759,65273=>745,65274=>759,65275=>745,
-65276=>759,65279=>0,65529=>0,65530=>0,65531=>0,65532=>0,65533=>1113);
-$enc='';
-$diff='';
-$file='dejavusansb.z';
-$ctg='dejavusansb.ctg.z';
-$originalsize=573136;
-?>
\ No newline at end of file
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusansb.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusansb.z
deleted file mode 100644
index 9d465a6e..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusansb.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusansbi.ctg.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusansbi.ctg.z
deleted file mode 100644
index 9d1fcd61..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusansbi.ctg.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusansbi.php b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusansbi.php
deleted file mode 100644
index dc63d908..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusansbi.php
+++ /dev/null
@@ -1,458 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='DejaVuSans-BoldOblique';
-$desc=array('Ascent'=>928,'Descent'=>-236,'CapHeight'=>-51,'Flags'=>96,'FontBBox'=>'[-1067 -385 2005 1121]','ItalicAngle'=>-11,'StemV'=>120,'MissingWidth'=>600);
-$up=-63;
-$ut=44;
-$dw=600;
-$cw=array(
-0=>600,32=>348,33=>456,34=>521,35=>696,36=>696,37=>1002,38=>872,39=>306,40=>457,
-41=>457,42=>523,43=>838,44=>380,45=>415,46=>380,47=>365,48=>696,49=>696,50=>696,
-51=>696,52=>696,53=>696,54=>696,55=>696,56=>696,57=>696,58=>400,59=>400,60=>838,
-61=>838,62=>838,63=>580,64=>1000,65=>774,66=>762,67=>734,68=>830,69=>683,70=>683,
-71=>821,72=>837,73=>372,74=>372,75=>775,76=>637,77=>995,78=>837,79=>850,80=>733,
-81=>850,82=>770,83=>720,84=>682,85=>812,86=>774,87=>1103,88=>771,89=>724,90=>725,
-91=>457,92=>365,93=>457,94=>838,95=>500,96=>500,97=>675,98=>716,99=>593,100=>716,
-101=>678,102=>435,103=>716,104=>712,105=>343,106=>343,107=>665,108=>343,109=>1042,110=>712,
-111=>687,112=>716,113=>716,114=>493,115=>595,116=>478,117=>712,118=>652,119=>924,120=>645,
-121=>652,122=>582,123=>712,124=>365,125=>712,126=>838,8364=>696,8218=>380,402=>435,8222=>644,
-8230=>1000,8224=>500,8225=>500,710=>500,8240=>1454,352=>720,8249=>412,338=>1167,381=>725,8216=>380,
-8217=>380,8220=>644,8221=>644,8226=>639,8211=>500,8212=>1000,732=>500,8482=>1000,353=>595,8250=>412,
-339=>1094,382=>582,376=>724,160=>348,161=>456,162=>696,163=>696,164=>636,165=>696,166=>365,
-167=>500,168=>500,169=>1000,170=>564,171=>650,172=>838,173=>415,174=>1000,175=>500,176=>500,
-177=>838,178=>438,179=>438,180=>500,181=>736,182=>636,183=>380,184=>500,185=>438,186=>564,
-187=>650,188=>1035,189=>1035,190=>1035,191=>580,192=>774,193=>774,194=>774,195=>774,196=>774,
-197=>774,198=>1085,199=>734,200=>683,201=>683,202=>683,203=>683,204=>372,205=>372,206=>372,
-207=>372,208=>845,209=>837,210=>850,211=>850,212=>850,213=>850,214=>850,215=>838,216=>850,
-217=>812,218=>812,219=>812,220=>812,221=>724,222=>742,223=>719,224=>675,225=>675,226=>675,
-227=>675,228=>675,229=>675,230=>1048,231=>593,232=>678,233=>678,234=>678,235=>678,236=>343,
-237=>343,238=>343,239=>343,240=>687,241=>712,242=>687,243=>687,244=>687,245=>687,246=>687,
-247=>838,248=>687,249=>712,250=>712,251=>712,252=>712,253=>652,254=>716,255=>652,256=>774,
-257=>675,258=>774,259=>675,260=>774,261=>675,262=>734,263=>593,264=>734,265=>593,266=>734,
-267=>593,268=>734,269=>593,270=>830,271=>716,272=>845,273=>716,274=>683,275=>678,276=>683,
-277=>678,278=>683,279=>678,280=>683,281=>678,282=>683,283=>678,284=>821,285=>716,286=>821,
-287=>716,288=>821,289=>716,290=>821,291=>716,292=>837,293=>712,294=>974,295=>790,296=>372,
-297=>343,298=>372,299=>343,300=>372,301=>343,302=>372,303=>343,304=>372,305=>343,306=>744,
-307=>686,308=>372,309=>343,310=>775,311=>665,312=>665,313=>637,314=>343,315=>637,316=>343,
-317=>637,318=>343,319=>637,320=>343,321=>660,322=>375,323=>837,324=>712,325=>837,326=>712,
-327=>837,328=>712,329=>983,330=>837,331=>712,332=>850,333=>687,334=>850,335=>687,336=>850,
-337=>687,340=>770,341=>493,342=>770,343=>493,344=>770,345=>493,346=>720,347=>595,348=>720,
-349=>595,350=>720,351=>595,354=>682,355=>478,356=>682,357=>478,358=>682,359=>478,360=>812,
-361=>712,362=>812,363=>712,364=>812,365=>712,366=>812,367=>712,368=>812,369=>712,370=>812,
-371=>712,372=>1103,373=>924,374=>724,375=>652,377=>725,378=>582,379=>725,380=>582,383=>435,
-384=>716,385=>811,386=>762,387=>716,388=>762,389=>716,390=>734,391=>734,392=>593,393=>845,
-394=>879,395=>762,396=>716,397=>687,398=>683,399=>850,400=>696,401=>683,403=>821,404=>793,
-405=>1045,406=>436,407=>389,408=>775,409=>665,410=>360,411=>592,412=>1042,413=>837,414=>712,
-415=>850,416=>850,417=>687,418=>1114,419=>962,420=>782,421=>716,422=>770,423=>720,424=>595,
-425=>683,426=>552,427=>478,428=>707,429=>478,430=>682,431=>812,432=>712,433=>769,434=>813,
-435=>797,436=>778,437=>725,438=>582,439=>772,440=>772,441=>641,442=>582,443=>696,444=>772,
-445=>641,446=>573,447=>716,448=>372,449=>659,450=>544,451=>372,452=>1548,453=>1450,454=>1307,
-455=>977,456=>979,457=>670,458=>1193,459=>1213,460=>1063,461=>774,462=>675,463=>372,464=>343,
-465=>850,466=>687,467=>812,468=>712,469=>812,470=>712,471=>812,472=>712,473=>812,474=>712,
-475=>812,476=>712,477=>678,478=>774,479=>675,480=>774,481=>675,482=>1085,483=>1048,484=>821,
-485=>716,486=>821,487=>716,488=>775,489=>665,490=>850,491=>687,492=>850,493=>687,494=>772,
-495=>582,496=>343,497=>1548,498=>1450,499=>1307,500=>821,501=>716,502=>1289,503=>787,504=>837,
-505=>712,506=>774,507=>675,508=>1085,509=>1048,510=>850,511=>687,512=>774,513=>675,514=>774,
-515=>675,516=>683,517=>678,518=>683,519=>678,520=>372,521=>343,522=>372,523=>343,524=>850,
-525=>687,526=>850,527=>687,528=>770,529=>493,530=>770,531=>493,532=>812,533=>712,534=>812,
-535=>712,536=>720,537=>595,538=>682,539=>478,540=>690,541=>607,542=>837,543=>712,544=>837,
-545=>865,546=>809,547=>659,548=>725,549=>582,550=>774,551=>675,552=>683,553=>678,554=>850,
-555=>687,556=>850,557=>687,558=>850,559=>687,560=>850,561=>687,562=>724,563=>652,564=>492,
-565=>867,566=>512,567=>343,568=>1088,569=>1088,570=>774,571=>734,572=>593,573=>637,574=>682,
-575=>595,576=>582,577=>782,578=>614,579=>762,580=>812,581=>774,582=>683,583=>678,584=>372,
-585=>343,586=>860,587=>791,588=>770,589=>493,590=>724,591=>652,592=>675,593=>716,594=>716,
-595=>716,596=>593,597=>593,598=>791,599=>792,600=>678,601=>678,602=>876,603=>557,604=>545,
-605=>774,606=>731,607=>343,608=>792,609=>716,610=>627,611=>735,612=>635,613=>712,614=>712,
-615=>712,616=>545,617=>440,618=>545,619=>559,620=>693,621=>343,622=>841,623=>1042,624=>1042,
-625=>1042,626=>712,627=>793,628=>642,629=>687,630=>909,631=>682,632=>796,633=>538,634=>538,
-635=>650,636=>493,637=>493,638=>596,639=>596,640=>642,641=>642,642=>595,643=>415,644=>435,
-645=>605,646=>552,647=>478,648=>478,649=>920,650=>769,651=>670,652=>652,653=>924,654=>652,
-655=>724,656=>694,657=>684,658=>641,659=>641,660=>573,661=>573,662=>573,663=>573,664=>850,
-665=>633,666=>731,667=>685,668=>691,669=>343,670=>732,671=>539,672=>792,673=>573,674=>573,
-675=>1156,676=>1214,677=>1155,678=>974,679=>769,680=>929,681=>1026,682=>792,683=>780,684=>591,
-685=>415,686=>677,687=>789,688=>456,689=>456,690=>219,691=>315,692=>315,693=>315,694=>411,
-695=>591,696=>417,697=>302,698=>521,699=>380,700=>380,701=>380,702=>366,703=>366,704=>326,
-705=>326,706=>500,707=>500,708=>500,709=>500,711=>500,712=>306,713=>500,714=>500,715=>500,
-716=>306,717=>500,718=>500,719=>500,720=>337,721=>337,722=>366,723=>366,724=>500,725=>500,
-726=>416,727=>328,728=>500,729=>500,730=>500,731=>500,733=>500,734=>351,735=>500,736=>412,
-737=>219,738=>381,739=>413,740=>326,741=>500,742=>500,743=>500,744=>500,745=>500,748=>500,
-749=>500,750=>644,755=>500,759=>500,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,832=>0,833=>0,
-834=>0,835=>0,836=>0,837=>0,838=>0,839=>0,840=>0,841=>0,842=>0,843=>0,
-844=>0,845=>0,846=>0,847=>0,849=>0,850=>0,851=>0,855=>0,856=>0,858=>0,
-860=>0,861=>0,862=>0,863=>0,864=>0,865=>0,866=>0,880=>698,881=>565,882=>1022,
-883=>836,884=>302,885=>302,886=>837,887=>701,890=>500,891=>593,892=>550,893=>549,894=>400,
-900=>441,901=>500,902=>797,903=>380,904=>846,905=>1009,906=>563,908=>891,910=>980,911=>894,
-912=>390,913=>774,914=>762,915=>637,916=>774,917=>683,918=>725,919=>837,920=>850,921=>372,
-922=>775,923=>774,924=>995,925=>837,926=>632,927=>850,928=>837,929=>733,931=>683,932=>682,
-933=>724,934=>850,935=>771,936=>850,937=>850,938=>372,939=>724,940=>687,941=>557,942=>712,
-943=>390,944=>675,945=>687,946=>716,947=>681,948=>687,949=>557,950=>591,951=>712,952=>687,
-953=>390,954=>710,955=>633,956=>736,957=>681,958=>591,959=>687,960=>791,961=>716,962=>593,
-963=>779,964=>638,965=>675,966=>782,967=>645,968=>794,969=>869,970=>390,971=>675,972=>687,
-973=>675,974=>869,975=>775,976=>651,977=>661,978=>746,979=>981,980=>746,981=>796,982=>869,
-983=>744,984=>850,985=>687,986=>734,987=>593,988=>683,989=>494,990=>702,991=>660,992=>919,
-993=>627,994=>1093,995=>837,996=>832,997=>716,998=>928,999=>744,1000=>733,1001=>650,1002=>789,
-1003=>671,1004=>752,1005=>716,1006=>682,1007=>590,1008=>744,1009=>716,1010=>593,1011=>343,1012=>850,
-1013=>645,1014=>645,1015=>742,1016=>716,1017=>734,1018=>995,1019=>732,1020=>716,1021=>734,1022=>734,
-1023=>698,1024=>683,1025=>683,1026=>878,1027=>637,1028=>734,1029=>720,1030=>372,1031=>372,1032=>372,
-1033=>1154,1034=>1130,1035=>878,1036=>817,1037=>837,1038=>771,1039=>837,1040=>774,1041=>762,1042=>762,
-1043=>637,1044=>891,1045=>683,1046=>1224,1047=>710,1048=>837,1049=>837,1050=>817,1051=>831,1052=>995,
-1053=>837,1054=>850,1055=>837,1056=>733,1057=>734,1058=>682,1059=>771,1060=>992,1061=>771,1062=>928,
-1063=>808,1064=>1235,1065=>1326,1066=>939,1067=>1036,1068=>762,1069=>734,1070=>1174,1071=>770,1072=>675,
-1073=>698,1074=>633,1075=>522,1076=>808,1077=>678,1078=>995,1079=>581,1080=>701,1081=>701,1082=>679,
-1083=>732,1084=>817,1085=>691,1086=>687,1087=>691,1088=>716,1089=>593,1090=>580,1091=>652,1092=>992,
-1093=>645,1094=>741,1095=>687,1096=>1062,1097=>1105,1098=>751,1099=>904,1100=>632,1101=>593,1102=>972,
-1103=>642,1104=>678,1105=>678,1106=>714,1107=>522,1108=>593,1109=>595,1110=>343,1111=>343,1112=>343,
-1113=>991,1114=>956,1115=>734,1116=>679,1117=>701,1118=>652,1119=>691,1120=>1093,1121=>869,1122=>840,
-1123=>736,1124=>1012,1125=>839,1126=>992,1127=>832,1128=>1358,1129=>1121,1130=>850,1131=>687,1132=>1236,
-1133=>1007,1134=>696,1135=>557,1136=>1075,1137=>1061,1138=>850,1139=>687,1140=>850,1141=>695,1142=>850,
-1143=>695,1144=>1148,1145=>1043,1146=>1074,1147=>863,1148=>1405,1149=>1173,1150=>1093,1151=>869,1152=>734,
-1153=>593,1154=>652,1155=>0,1156=>0,1157=>0,1158=>0,1159=>0,1160=>418,1161=>418,1162=>938,
-1163=>806,1164=>762,1165=>611,1166=>736,1167=>718,1168=>637,1169=>522,1170=>666,1171=>543,1172=>789,
-1173=>522,1174=>1224,1175=>995,1176=>710,1177=>581,1178=>775,1179=>679,1180=>817,1181=>679,1182=>817,
-1183=>679,1184=>1015,1185=>826,1186=>837,1187=>691,1188=>1103,1189=>871,1190=>1254,1191=>979,1192=>946,
-1193=>859,1194=>734,1195=>593,1196=>682,1197=>580,1198=>724,1199=>652,1200=>724,1201=>652,1202=>771,
-1203=>645,1204=>1104,1205=>1001,1206=>808,1207=>687,1208=>808,1209=>687,1210=>808,1211=>712,1212=>1026,
-1213=>810,1214=>1026,1215=>810,1216=>372,1217=>1224,1218=>995,1219=>778,1220=>629,1221=>933,1222=>804,
-1223=>837,1224=>691,1225=>938,1226=>806,1227=>808,1228=>687,1229=>1096,1230=>932,1231=>343,1232=>774,
-1233=>675,1234=>774,1235=>675,1236=>1085,1237=>1048,1238=>683,1239=>678,1240=>850,1241=>678,1242=>850,
-1243=>678,1244=>1224,1245=>995,1246=>710,1247=>581,1248=>772,1249=>641,1250=>837,1251=>701,1252=>837,
-1253=>701,1254=>850,1255=>687,1256=>850,1257=>687,1258=>850,1259=>687,1260=>734,1261=>593,1262=>771,
-1263=>652,1264=>771,1265=>652,1266=>771,1267=>652,1268=>808,1269=>687,1270=>637,1271=>522,1272=>1036,
-1273=>904,1274=>666,1275=>543,1276=>771,1277=>645,1278=>771,1279=>645,1280=>762,1281=>608,1282=>1159,
-1283=>893,1284=>1119,1285=>920,1286=>828,1287=>693,1288=>1242,1289=>1017,1290=>1289,1291=>1013,1292=>839,
-1293=>638,1294=>938,1295=>803,1296=>696,1297=>557,1298=>831,1299=>732,1300=>1286,1301=>1070,1302=>1065,
-1303=>982,1304=>1082,1305=>960,1306=>850,1307=>716,1308=>1103,1309=>924,1312=>1248,1313=>1022,1314=>1254,
-1315=>979,1316=>957,1317=>807,1329=>984,1330=>812,1331=>984,1332=>984,1333=>812,1334=>777,1335=>812,
-1336=>812,1337=>975,1338=>984,1339=>812,1340=>710,1341=>1078,1342=>1136,1343=>812,1344=>710,1345=>757,
-1346=>984,1347=>876,1348=>984,1349=>793,1350=>984,1351=>812,1352=>812,1353=>812,1354=>958,1355=>777,
-1356=>984,1357=>812,1358=>984,1359=>720,1360=>812,1361=>793,1362=>895,1363=>850,1364=>936,1365=>850,
-1366=>720,1369=>366,1370=>380,1371=>550,1372=>550,1373=>380,1374=>546,1375=>521,1377=>1042,1378=>712,
-1379=>866,1380=>868,1381=>712,1382=>817,1383=>653,1384=>712,1385=>811,1386=>817,1387=>712,1388=>498,
-1389=>1018,1390=>716,1391=>712,1392=>712,1393=>716,1394=>819,1395=>712,1396=>751,1397=>343,1398=>882,
-1399=>559,1400=>712,1401=>559,1402=>1042,1403=>559,1404=>863,1405=>712,1406=>813,1407=>1042,1408=>712,
-1409=>716,1410=>571,1411=>1042,1412=>778,1413=>687,1414=>720,1415=>862,1417=>400,1418=>487,1456=>0,
-1457=>0,1458=>0,1459=>0,1460=>0,1461=>0,1462=>0,1463=>0,1464=>0,1465=>0,1466=>0,
-1467=>0,1468=>0,1469=>0,1470=>415,1471=>0,1472=>372,1473=>0,1474=>0,1475=>372,1478=>497,
-1479=>0,1488=>751,1489=>673,1490=>537,1491=>654,1492=>712,1493=>343,1494=>491,1495=>712,1496=>724,
-1497=>343,1498=>649,1499=>650,1500=>679,1501=>712,1502=>775,1503=>343,1504=>497,1505=>773,1506=>678,
-1507=>718,1508=>687,1509=>628,1510=>751,1511=>729,1512=>649,1513=>949,1514=>751,1520=>664,1521=>664,
-1522=>663,1523=>444,1524=>710,3647=>743,3713=>815,3714=>748,3716=>749,3719=>569,3720=>742,3722=>744,
-3725=>761,3732=>706,3733=>704,3734=>747,3735=>819,3737=>730,3738=>727,3739=>727,3740=>922,3741=>827,
-3742=>866,3743=>866,3745=>836,3746=>761,3747=>770,3749=>769,3751=>713,3754=>827,3755=>1031,3757=>724,
-3758=>784,3759=>934,3760=>688,3761=>0,3762=>610,3763=>610,3764=>0,3765=>0,3766=>0,3767=>0,
-3768=>0,3769=>0,3771=>0,3772=>0,3773=>670,3776=>516,3777=>860,3778=>516,3779=>650,3780=>632,
-3782=>759,3784=>0,3785=>0,3786=>0,3787=>0,3788=>0,3789=>0,3792=>771,3793=>771,3794=>693,
-3795=>836,3796=>729,3797=>729,3798=>849,3799=>790,3800=>759,3801=>910,3804=>1363,3805=>1363,4256=>918,
-4257=>744,4258=>739,4259=>837,4260=>649,4261=>773,4262=>857,4263=>889,4264=>530,4265=>633,4266=>857,
-4267=>900,4268=>643,4269=>903,4270=>814,4271=>752,4272=>869,4273=>643,4274=>643,4275=>886,4276=>886,
-4277=>733,4278=>653,4279=>643,4280=>646,4281=>643,4282=>790,4283=>902,4284=>633,4285=>619,4286=>643,
-4287=>778,4288=>892,4289=>601,4290=>742,4291=>616,4292=>633,4293=>742,4304=>553,4305=>552,4306=>596,
-4307=>815,4308=>562,4309=>563,4310=>553,4311=>827,4312=>553,4313=>543,4314=>1074,4315=>563,4316=>563,
-4317=>812,4318=>552,4319=>591,4320=>822,4321=>563,4322=>690,4323=>583,4324=>813,4325=>562,4326=>813,
-4327=>563,4328=>563,4329=>563,4330=>632,4331=>563,4332=>563,4333=>552,4334=>563,4335=>563,4336=>558,
-4337=>604,4338=>552,4339=>552,4340=>553,4341=>605,4342=>852,4343=>635,4344=>563,4345=>596,4346=>542,
-4347=>684,4348=>368,5121=>774,5122=>774,5123=>774,5124=>774,5125=>905,5126=>905,5127=>905,5129=>905,
-5130=>905,5131=>905,5132=>1018,5133=>1009,5134=>1018,5135=>1009,5136=>1018,5137=>1009,5138=>1149,5139=>1140,
-5140=>1149,5141=>1140,5142=>905,5143=>1149,5144=>1142,5145=>1149,5146=>1142,5147=>905,5149=>310,5150=>529,
-5151=>425,5152=>425,5153=>395,5154=>395,5155=>395,5156=>395,5157=>564,5158=>470,5159=>310,5160=>395,
-5161=>395,5162=>395,5163=>1213,5164=>986,5165=>1216,5166=>1297,5167=>774,5168=>774,5169=>774,5170=>774,
-5171=>886,5172=>886,5173=>886,5175=>886,5176=>886,5177=>886,5178=>1018,5179=>1009,5180=>1018,5181=>1009,
-5182=>1018,5183=>1009,5184=>1149,5185=>1140,5186=>1149,5187=>1140,5188=>1149,5189=>1142,5190=>1149,5191=>1142,
-5192=>886,5193=>576,5194=>229,5196=>812,5197=>812,5198=>812,5199=>812,5200=>815,5201=>815,5202=>815,
-5204=>815,5205=>815,5206=>815,5207=>1056,5208=>1048,5209=>1056,5210=>1048,5211=>1056,5212=>1048,5213=>1060,
-5214=>1054,5215=>1060,5216=>1054,5217=>1060,5218=>1052,5219=>1060,5220=>1052,5221=>1060,5222=>483,5223=>1005,
-5224=>1005,5225=>1023,5226=>1017,5227=>743,5228=>743,5229=>743,5230=>743,5231=>743,5232=>743,5233=>743,
-5234=>743,5235=>743,5236=>1029,5237=>975,5238=>980,5239=>975,5240=>980,5241=>975,5242=>1029,5243=>975,
-5244=>1029,5245=>975,5246=>980,5247=>975,5248=>980,5249=>975,5250=>980,5251=>501,5252=>501,5253=>938,
-5254=>938,5255=>938,5256=>938,5257=>743,5258=>743,5259=>743,5260=>743,5261=>743,5262=>743,5263=>743,
-5264=>743,5265=>743,5266=>1029,5267=>975,5268=>1029,5269=>975,5270=>1029,5271=>975,5272=>1029,5273=>975,
-5274=>1029,5275=>975,5276=>1029,5277=>975,5278=>1029,5279=>975,5280=>1029,5281=>501,5282=>501,5283=>626,
-5284=>626,5285=>626,5286=>626,5287=>626,5288=>626,5289=>626,5290=>626,5291=>626,5292=>881,5293=>854,
-5294=>863,5295=>874,5296=>863,5297=>874,5298=>881,5299=>874,5300=>881,5301=>874,5302=>863,5303=>874,
-5304=>863,5305=>874,5306=>863,5307=>436,5308=>548,5309=>436,5312=>988,5313=>988,5314=>988,5315=>988,
-5316=>931,5317=>931,5318=>931,5319=>931,5320=>931,5321=>1238,5322=>1247,5323=>1200,5324=>1228,5325=>1200,
-5326=>1228,5327=>931,5328=>660,5329=>497,5330=>660,5331=>988,5332=>988,5333=>988,5334=>988,5335=>931,
-5336=>931,5337=>931,5338=>931,5339=>931,5340=>1231,5341=>1247,5342=>1283,5343=>1228,5344=>1283,5345=>1228,
-5346=>1228,5347=>1214,5348=>1228,5349=>1214,5350=>1283,5351=>1228,5352=>1283,5353=>1228,5354=>660,5356=>886,
-5357=>730,5358=>730,5359=>730,5360=>730,5361=>730,5362=>730,5363=>730,5364=>730,5365=>730,5366=>998,
-5367=>958,5368=>967,5369=>989,5370=>967,5371=>989,5372=>998,5373=>958,5374=>998,5375=>958,5376=>967,
-5377=>989,5378=>967,5379=>989,5380=>967,5381=>493,5382=>460,5383=>493,5392=>923,5393=>923,5394=>923,
-5395=>1136,5396=>1136,5397=>1136,5398=>1136,5399=>1209,5400=>1202,5401=>1209,5402=>1202,5403=>1209,5404=>1202,
-5405=>1431,5406=>1420,5407=>1431,5408=>1420,5409=>1431,5410=>1420,5411=>1431,5412=>1420,5413=>746,5414=>776,
-5415=>776,5416=>776,5417=>776,5418=>776,5419=>776,5420=>776,5421=>776,5422=>776,5423=>1003,5424=>1003,
-5425=>1013,5426=>996,5427=>1013,5428=>996,5429=>1003,5430=>1003,5431=>1003,5432=>1003,5433=>1013,5434=>996,
-5435=>1013,5436=>996,5437=>1013,5438=>495,5440=>395,5441=>510,5442=>1033,5443=>1033,5444=>976,5445=>976,
-5446=>976,5447=>976,5448=>733,5449=>733,5450=>733,5451=>733,5452=>733,5453=>733,5454=>1003,5455=>959,
-5456=>495,5458=>886,5459=>774,5460=>774,5461=>774,5462=>774,5463=>928,5464=>928,5465=>928,5466=>928,
-5467=>1172,5468=>1142,5469=>602,5470=>812,5471=>812,5472=>812,5473=>812,5474=>812,5475=>812,5476=>815,
-5477=>815,5478=>815,5479=>815,5480=>1060,5481=>1052,5482=>548,5492=>977,5493=>977,5494=>977,5495=>977,
-5496=>977,5497=>977,5498=>977,5499=>618,5500=>837,5501=>510,5502=>1238,5503=>1238,5504=>1238,5505=>1238,
-5506=>1238,5507=>1238,5508=>1238,5509=>989,5514=>977,5515=>977,5516=>977,5517=>977,5518=>1591,5519=>1591,
-5520=>1591,5521=>1295,5522=>1295,5523=>1591,5524=>1591,5525=>848,5526=>1273,5536=>988,5537=>988,5538=>931,
-5539=>931,5540=>931,5541=>931,5542=>660,5543=>776,5544=>776,5545=>776,5546=>776,5547=>776,5548=>776,
-5549=>776,5550=>495,5551=>743,5598=>830,5601=>830,5702=>496,5703=>496,5742=>413,5743=>1238,5744=>1591,
-5745=>2016,5746=>2016,5747=>1720,5748=>1678,5749=>2016,5750=>2016,7424=>652,7425=>833,7426=>1048,7427=>608,
-7428=>593,7429=>676,7430=>676,7431=>559,7432=>557,7433=>343,7434=>494,7435=>665,7436=>539,7437=>817,
-7438=>701,7439=>687,7440=>593,7441=>660,7442=>660,7443=>660,7444=>1094,7446=>687,7447=>687,7448=>556,
-7449=>642,7450=>642,7451=>580,7452=>634,7453=>737,7454=>948,7455=>695,7456=>652,7457=>924,7458=>582,
-7459=>646,7462=>539,7463=>652,7464=>691,7465=>556,7466=>781,7467=>732,7468=>487,7469=>683,7470=>480,
-7472=>523,7473=>430,7474=>430,7475=>517,7476=>527,7477=>234,7478=>234,7479=>488,7480=>401,7481=>626,
-7482=>527,7483=>527,7484=>535,7485=>509,7486=>461,7487=>485,7488=>430,7489=>511,7490=>695,7491=>458,
-7492=>458,7493=>479,7494=>712,7495=>479,7496=>479,7497=>479,7498=>479,7499=>386,7500=>386,7501=>479,
-7502=>219,7503=>487,7504=>664,7505=>456,7506=>488,7507=>414,7508=>488,7509=>488,7510=>479,7511=>388,
-7512=>456,7513=>462,7514=>664,7515=>501,7517=>451,7518=>429,7519=>433,7520=>493,7521=>406,7522=>219,
-7523=>315,7524=>456,7525=>501,7526=>451,7527=>429,7528=>451,7529=>493,7530=>406,7543=>716,7544=>527,
-7547=>545,7557=>514,7579=>479,7580=>414,7581=>414,7582=>488,7583=>386,7584=>377,7585=>348,7586=>479,
-7587=>456,7588=>347,7589=>281,7590=>347,7591=>347,7592=>431,7593=>326,7594=>330,7595=>370,7596=>664,
-7597=>664,7598=>562,7599=>562,7600=>448,7601=>488,7602=>542,7603=>422,7604=>396,7605=>388,7606=>583,
-7607=>494,7608=>399,7609=>451,7610=>501,7611=>417,7612=>523,7613=>470,7614=>455,7615=>425,7620=>0,
-7621=>0,7622=>0,7623=>0,7624=>0,7625=>0,7680=>774,7681=>675,7682=>762,7683=>716,7684=>762,
-7685=>716,7686=>762,7687=>716,7688=>734,7689=>593,7690=>830,7691=>716,7692=>830,7693=>716,7694=>830,
-7695=>716,7696=>830,7697=>716,7698=>830,7699=>716,7700=>683,7701=>678,7702=>683,7703=>678,7704=>683,
-7705=>678,7706=>683,7707=>678,7708=>683,7709=>678,7710=>683,7711=>435,7712=>821,7713=>716,7714=>837,
-7715=>712,7716=>837,7717=>712,7718=>837,7719=>712,7720=>837,7721=>712,7722=>837,7723=>712,7724=>372,
-7725=>343,7726=>372,7727=>343,7728=>775,7729=>665,7730=>775,7731=>665,7732=>775,7733=>665,7734=>637,
-7735=>343,7736=>637,7737=>343,7738=>637,7739=>343,7740=>637,7741=>343,7742=>995,7743=>1042,7744=>995,
-7745=>1042,7746=>995,7747=>1042,7748=>837,7749=>712,7750=>837,7751=>712,7752=>837,7753=>712,7754=>837,
-7755=>712,7756=>850,7757=>687,7758=>850,7759=>687,7760=>850,7761=>687,7762=>850,7763=>687,7764=>733,
-7765=>716,7766=>733,7767=>716,7768=>770,7769=>493,7770=>770,7771=>493,7772=>770,7773=>493,7774=>770,
-7775=>493,7776=>720,7777=>595,7778=>720,7779=>595,7780=>720,7781=>595,7782=>720,7783=>595,7784=>720,
-7785=>595,7786=>682,7787=>478,7788=>682,7789=>478,7790=>682,7791=>478,7792=>682,7793=>478,7794=>812,
-7795=>712,7796=>812,7797=>712,7798=>812,7799=>712,7800=>812,7801=>712,7802=>812,7803=>712,7804=>774,
-7805=>652,7806=>774,7807=>652,7808=>1103,7809=>924,7810=>1103,7811=>924,7812=>1103,7813=>924,7814=>1103,
-7815=>924,7816=>1103,7817=>924,7818=>771,7819=>645,7820=>771,7821=>645,7822=>724,7823=>652,7824=>725,
-7825=>582,7826=>725,7827=>582,7828=>725,7829=>582,7830=>712,7831=>478,7832=>924,7833=>652,7834=>675,
-7835=>435,7838=>896,7839=>687,7840=>774,7841=>675,7842=>774,7843=>675,7844=>774,7845=>675,7846=>774,
-7847=>675,7848=>774,7849=>675,7850=>774,7851=>675,7852=>774,7853=>675,7854=>774,7855=>675,7856=>774,
-7857=>675,7858=>774,7859=>675,7860=>774,7861=>675,7862=>774,7863=>675,7864=>683,7865=>678,7866=>683,
-7867=>678,7868=>683,7869=>678,7870=>683,7871=>678,7872=>683,7873=>678,7874=>683,7875=>678,7876=>683,
-7877=>678,7878=>683,7879=>678,7880=>372,7881=>343,7882=>372,7883=>343,7884=>850,7885=>687,7886=>850,
-7887=>687,7888=>850,7889=>687,7890=>850,7891=>687,7892=>850,7893=>687,7894=>850,7895=>687,7896=>850,
-7897=>687,7898=>850,7899=>687,7900=>850,7901=>687,7902=>850,7903=>687,7904=>850,7905=>687,7906=>850,
-7907=>687,7908=>812,7909=>712,7910=>812,7911=>712,7912=>812,7913=>712,7914=>812,7915=>712,7916=>812,
-7917=>712,7918=>812,7919=>712,7920=>812,7921=>712,7922=>724,7923=>652,7924=>724,7925=>652,7926=>724,
-7927=>652,7928=>724,7929=>652,7936=>687,7937=>687,7938=>687,7939=>687,7940=>687,7941=>687,7942=>687,
-7943=>687,7944=>774,7945=>774,7946=>1041,7947=>1043,7948=>935,7949=>963,7950=>835,7951=>859,7952=>557,
-7953=>557,7954=>557,7955=>557,7956=>557,7957=>557,7960=>792,7961=>794,7962=>1100,7963=>1096,7964=>1023,
-7965=>1052,7968=>712,7969=>712,7970=>712,7971=>712,7972=>712,7973=>712,7974=>712,7975=>712,7976=>945,
-7977=>951,7978=>1250,7979=>1250,7980=>1180,7981=>1206,7982=>1054,7983=>1063,7984=>390,7985=>390,7986=>390,
-7987=>390,7988=>390,7989=>390,7990=>390,7991=>390,7992=>483,7993=>489,7994=>777,7995=>785,7996=>712,
-7997=>738,7998=>604,7999=>604,8000=>687,8001=>687,8002=>687,8003=>687,8004=>687,8005=>687,8008=>892,
-8009=>933,8010=>1221,8011=>1224,8012=>1053,8013=>1082,8016=>675,8017=>675,8018=>675,8019=>675,8020=>675,
-8021=>675,8022=>675,8023=>675,8025=>930,8027=>1184,8029=>1199,8031=>1049,8032=>869,8033=>869,8034=>869,
-8035=>869,8036=>869,8037=>869,8038=>869,8039=>869,8040=>909,8041=>958,8042=>1246,8043=>1251,8044=>1076,
-8045=>1105,8046=>1028,8047=>1076,8048=>687,8049=>687,8050=>557,8051=>557,8052=>712,8053=>712,8054=>390,
-8055=>390,8056=>687,8057=>687,8058=>675,8059=>675,8060=>869,8061=>869,8064=>687,8065=>687,8066=>687,
-8067=>687,8068=>687,8069=>687,8070=>687,8071=>687,8072=>774,8073=>774,8074=>1041,8075=>1043,8076=>935,
-8077=>963,8078=>835,8079=>859,8080=>712,8081=>712,8082=>712,8083=>712,8084=>712,8085=>712,8086=>712,
-8087=>712,8088=>945,8089=>951,8090=>1250,8091=>1250,8092=>1180,8093=>1206,8094=>1054,8095=>1063,8096=>869,
-8097=>869,8098=>869,8099=>869,8100=>869,8101=>869,8102=>869,8103=>869,8104=>909,8105=>958,8106=>1246,
-8107=>1251,8108=>1076,8109=>1105,8110=>1028,8111=>1076,8112=>687,8113=>687,8114=>687,8115=>687,8116=>687,
-8118=>687,8119=>687,8120=>774,8121=>774,8122=>876,8123=>797,8124=>774,8125=>500,8126=>500,8127=>500,
-8128=>500,8129=>500,8130=>712,8131=>712,8132=>712,8134=>712,8135=>712,8136=>929,8137=>846,8138=>1080,
-8139=>1009,8140=>837,8141=>500,8142=>500,8143=>500,8144=>390,8145=>390,8146=>390,8147=>390,8150=>390,
-8151=>390,8152=>372,8153=>372,8154=>621,8155=>563,8157=>500,8158=>500,8159=>500,8160=>675,8161=>675,
-8162=>675,8163=>675,8164=>716,8165=>716,8166=>675,8167=>675,8168=>724,8169=>724,8170=>1020,8171=>980,
-8172=>838,8173=>500,8174=>500,8175=>500,8178=>869,8179=>869,8180=>869,8182=>869,8183=>869,8184=>1065,
-8185=>891,8186=>1084,8187=>894,8188=>850,8189=>500,8190=>500,8192=>500,8193=>1000,8194=>500,8195=>1000,
-8196=>330,8197=>250,8198=>167,8199=>696,8200=>380,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=>380,8223=>657,
-8227=>639,8228=>380,8229=>685,8231=>348,8234=>0,8235=>0,8236=>0,8237=>0,8238=>0,8239=>200,
-8241=>1908,8242=>264,8243=>447,8244=>630,8245=>264,8246=>447,8247=>630,8248=>733,8251=>972,8252=>627,
-8253=>580,8254=>500,8255=>828,8256=>828,8257=>329,8258=>1023,8259=>500,8260=>167,8261=>457,8262=>457,
-8263=>1030,8264=>829,8265=>829,8266=>513,8267=>687,8268=>500,8269=>500,8270=>523,8271=>400,8272=>828,
-8273=>523,8274=>556,8275=>838,8276=>828,8277=>838,8278=>684,8279=>813,8280=>838,8281=>838,8282=>380,
-8283=>872,8284=>838,8285=>380,8286=>380,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=>219,8308=>438,8309=>438,
-8310=>438,8311=>438,8312=>438,8313=>438,8314=>528,8315=>528,8316=>528,8317=>288,8318=>288,8319=>456,
-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=>288,8334=>288,8336=>458,8337=>479,8338=>488,8339=>413,8340=>479,
-8352=>929,8353=>696,8354=>696,8355=>696,8356=>696,8357=>1042,8358=>837,8359=>1488,8360=>1205,8361=>1103,
-8362=>854,8363=>714,8365=>696,8366=>682,8367=>1392,8368=>696,8369=>696,8370=>696,8371=>696,8372=>859,
-8373=>696,8400=>0,8401=>0,8406=>0,8407=>0,8411=>0,8412=>0,8417=>0,8448=>1106,8449=>1106,
-8450=>734,8451=>1211,8452=>896,8453=>1114,8454=>1148,8455=>696,8456=>698,8457=>952,8459=>1073,8460=>913,
-8461=>888,8462=>712,8463=>712,8464=>597,8465=>697,8466=>856,8467=>472,8468=>974,8469=>837,8470=>1203,
-8471=>1000,8472=>697,8473=>750,8474=>850,8475=>938,8476=>814,8477=>801,8478=>896,8479=>710,8480=>1020,
-8481=>1239,8483=>834,8484=>754,8485=>622,8486=>850,8487=>769,8488=>763,8489=>303,8490=>775,8491=>774,
-8492=>928,8493=>818,8494=>854,8495=>636,8496=>729,8497=>808,8498=>683,8499=>1184,8500=>465,8501=>794,
-8502=>731,8503=>494,8504=>684,8505=>380,8506=>945,8507=>1370,8508=>790,8509=>737,8510=>654,8511=>863,
-8512=>840,8513=>786,8514=>576,8515=>637,8516=>760,8517=>830,8518=>716,8519=>678,8520=>343,8521=>343,
-8523=>872,8526=>547,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=>372,8545=>659,8546=>945,8547=>1099,8548=>774,
-8549=>1099,8550=>1386,8551=>1672,8552=>1121,8553=>771,8554=>1120,8555=>1407,8556=>637,8557=>734,8558=>830,
-8559=>995,8560=>343,8561=>607,8562=>872,8563=>984,8564=>652,8565=>962,8566=>1227,8567=>1491,8568=>969,
-8569=>645,8570=>969,8571=>1233,8572=>343,8573=>593,8574=>716,8575=>1042,8576=>1289,8577=>830,8578=>1289,
-8579=>734,8580=>593,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=>774,8705=>696,8706=>544,8707=>683,8708=>683,8709=>856,
-8710=>697,8711=>697,8712=>896,8713=>896,8714=>750,8715=>896,8716=>896,8717=>750,8718=>636,8719=>787,
-8720=>787,8721=>718,8722=>838,8723=>838,8724=>696,8725=>365,8726=>696,8727=>838,8728=>626,8729=>380,
-8730=>667,8731=>667,8732=>667,8733=>712,8734=>833,8735=>838,8736=>896,8737=>896,8738=>838,8739=>500,
-8740=>500,8741=>500,8742=>500,8743=>812,8744=>812,8745=>812,8746=>812,8747=>610,8748=>929,8749=>1295,
-8750=>563,8751=>977,8752=>1313,8753=>563,8754=>563,8755=>563,8756=>696,8757=>696,8758=>294,8759=>696,
-8760=>838,8761=>838,8762=>838,8763=>838,8764=>838,8765=>838,8766=>838,8767=>838,8768=>375,8769=>838,
-8770=>838,8771=>838,8772=>838,8773=>838,8774=>838,8775=>838,8776=>838,8777=>838,8778=>838,8779=>838,
-8780=>838,8781=>838,8782=>838,8783=>838,8784=>838,8785=>838,8786=>838,8787=>838,8788=>1063,8789=>1063,
-8790=>838,8791=>838,8792=>838,8793=>838,8794=>838,8795=>838,8796=>838,8797=>838,8798=>838,8799=>838,
-8800=>838,8801=>838,8802=>838,8803=>838,8804=>838,8805=>838,8806=>838,8807=>838,8808=>841,8809=>841,
-8810=>1047,8811=>1047,8812=>500,8813=>838,8814=>838,8815=>838,8816=>838,8817=>838,8818=>838,8819=>838,
-8820=>838,8821=>838,8822=>838,8823=>838,8824=>838,8825=>838,8826=>838,8827=>838,8828=>838,8829=>838,
-8830=>838,8831=>838,8832=>838,8833=>838,8834=>838,8835=>838,8836=>838,8837=>838,8838=>838,8839=>838,
-8840=>838,8841=>838,8842=>838,8843=>838,8844=>812,8845=>812,8846=>812,8847=>838,8848=>838,8849=>838,
-8850=>838,8851=>796,8852=>796,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=>914,8867=>914,8868=>914,8869=>914,
-8870=>542,8871=>542,8872=>914,8873=>914,8874=>914,8875=>914,8876=>914,8877=>914,8878=>914,8879=>914,
-8880=>838,8881=>838,8882=>838,8883=>838,8884=>838,8885=>838,8886=>1000,8887=>1000,8888=>838,8889=>838,
-8890=>542,8891=>812,8892=>812,8893=>812,8894=>838,8895=>838,8896=>843,8897=>843,8898=>843,8899=>843,
-8900=>494,8901=>380,8902=>626,8903=>838,8904=>1000,8905=>1000,8906=>1000,8907=>1000,8908=>1000,8909=>838,
-8910=>812,8911=>812,8912=>838,8913=>838,8914=>838,8915=>838,8916=>838,8917=>838,8918=>838,8919=>838,
-8920=>1422,8921=>1422,8922=>838,8923=>838,8924=>838,8925=>838,8926=>838,8927=>838,8928=>838,8929=>838,
-8930=>838,8931=>838,8932=>838,8933=>838,8934=>838,8935=>838,8936=>838,8937=>838,8938=>838,8939=>838,
-8940=>838,8941=>838,8942=>1000,8943=>1000,8944=>1000,8945=>1000,8946=>1158,8947=>896,8948=>750,8949=>896,
-8950=>896,8951=>750,8952=>896,8953=>896,8954=>1158,8955=>896,8956=>750,8957=>896,8958=>750,8959=>896,
-8960=>602,8961=>602,8962=>716,8963=>838,8964=>838,8965=>838,8966=>838,8967=>488,8968=>457,8969=>457,
-8970=>457,8971=>457,8972=>809,8973=>809,8974=>809,8975=>809,8976=>838,8977=>539,8984=>928,8985=>838,
-8988=>469,8989=>469,8990=>469,8991=>469,8992=>610,8993=>610,8996=>1152,8997=>1152,8998=>1414,8999=>1152,
-9000=>1443,9003=>1414,9004=>873,9075=>390,9076=>716,9077=>869,9082=>687,9085=>863,9095=>1152,9108=>873,
-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=>610,
-9166=>838,9167=>945,9187=>873,9189=>769,9250=>716,9251=>716,9312=>847,9313=>847,9314=>847,9315=>847,
-9316=>847,9317=>847,9318=>847,9319=>847,9320=>847,9321=>847,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=>840,9689=>970,9690=>970,9691=>970,9692=>387,9693=>387,
-9694=>387,9695=>387,9696=>769,9697=>769,9698=>769,9699=>769,9700=>769,9701=>769,9702=>639,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,9729=>1000,9730=>896,9731=>896,9732=>896,9733=>896,
-9734=>896,9735=>573,9736=>896,9737=>896,9738=>888,9739=>888,9740=>671,9741=>1013,9742=>1246,9743=>1250,
-9744=>896,9745=>896,9746=>896,9747=>532,9748=>896,9749=>896,9750=>896,9751=>896,9752=>896,9753=>896,
-9754=>896,9755=>896,9756=>896,9757=>609,9758=>896,9759=>609,9760=>896,9761=>896,9762=>896,9763=>896,
-9764=>669,9765=>746,9766=>649,9767=>784,9768=>545,9769=>896,9770=>896,9771=>896,9772=>710,9773=>896,
-9774=>896,9775=>896,9776=>896,9777=>896,9778=>896,9779=>896,9780=>896,9781=>896,9782=>896,9783=>896,
-9784=>896,9785=>896,9786=>896,9787=>896,9788=>896,9789=>896,9790=>896,9791=>614,9792=>731,9793=>731,
-9794=>896,9795=>896,9796=>896,9797=>896,9798=>896,9799=>896,9800=>896,9801=>896,9802=>896,9803=>896,
-9804=>896,9805=>896,9806=>896,9807=>896,9808=>896,9809=>896,9810=>896,9811=>896,9812=>896,9813=>896,
-9814=>896,9815=>896,9816=>896,9817=>896,9818=>896,9819=>896,9820=>896,9821=>896,9822=>896,9823=>896,
-9824=>896,9825=>896,9826=>896,9827=>896,9828=>896,9829=>896,9830=>896,9831=>896,9832=>896,9833=>472,
-9834=>638,9835=>896,9836=>896,9837=>472,9838=>357,9839=>484,9840=>748,9841=>766,9842=>896,9843=>896,
-9844=>896,9845=>896,9846=>896,9847=>896,9848=>896,9849=>896,9850=>896,9851=>896,9852=>896,9853=>896,
-9854=>896,9855=>896,9856=>869,9857=>869,9858=>869,9859=>869,9860=>869,9861=>869,9862=>896,9863=>896,
-9864=>896,9865=>896,9866=>896,9867=>896,9868=>896,9869=>896,9870=>896,9871=>896,9872=>896,9873=>896,
-9874=>896,9875=>896,9876=>896,9877=>541,9878=>896,9879=>896,9880=>896,9881=>896,9882=>896,9883=>896,
-9884=>896,9888=>896,9889=>702,9890=>1003,9891=>1085,9892=>1143,9893=>901,9894=>838,9895=>838,9896=>838,
-9897=>838,9898=>838,9899=>838,9900=>838,9901=>838,9902=>838,9903=>838,9904=>844,9905=>838,9906=>731,
-9907=>732,9908=>732,9909=>732,9910=>850,9911=>732,9912=>732,9985=>838,9986=>838,9987=>838,9988=>838,
-9990=>838,9991=>838,9992=>838,9993=>838,9996=>838,9997=>838,9998=>838,9999=>838,10000=>838,10001=>838,
-10002=>838,10003=>838,10004=>838,10005=>838,10006=>838,10007=>838,10008=>838,10009=>838,10010=>838,10011=>838,
-10012=>838,10013=>838,10014=>838,10015=>838,10016=>838,10017=>838,10018=>838,10019=>838,10020=>838,10021=>838,
-10022=>838,10023=>838,10025=>838,10026=>838,10027=>838,10028=>838,10029=>838,10030=>838,10031=>838,10032=>838,
-10033=>838,10034=>838,10035=>838,10036=>838,10037=>838,10038=>838,10039=>838,10040=>838,10041=>838,10042=>838,
-10043=>838,10044=>838,10045=>838,10046=>838,10047=>838,10048=>838,10049=>838,10050=>838,10051=>838,10052=>838,
-10053=>838,10054=>838,10055=>838,10056=>838,10057=>838,10058=>838,10059=>838,10061=>896,10063=>896,10064=>896,
-10065=>896,10066=>896,10070=>896,10072=>838,10073=>838,10074=>838,10075=>322,10076=>322,10077=>538,10078=>538,
-10081=>838,10082=>838,10083=>838,10084=>838,10085=>838,10086=>838,10087=>838,10088=>838,10089=>838,10090=>838,
-10091=>838,10092=>838,10093=>838,10094=>838,10095=>838,10096=>838,10097=>838,10098=>838,10099=>838,10100=>838,
-10101=>838,10102=>847,10103=>847,10104=>847,10105=>847,10106=>847,10107=>847,10108=>847,10109=>847,10110=>847,
-10111=>847,10112=>838,10113=>838,10114=>838,10115=>838,10116=>838,10117=>838,10118=>838,10119=>838,10120=>838,
-10121=>838,10122=>838,10123=>838,10124=>838,10125=>838,10126=>838,10127=>838,10128=>838,10129=>838,10130=>838,
-10131=>838,10132=>838,10136=>838,10137=>838,10138=>838,10139=>838,10140=>838,10141=>838,10142=>838,10143=>838,
-10144=>838,10145=>838,10146=>838,10147=>838,10148=>838,10149=>838,10150=>838,10151=>838,10152=>838,10153=>838,
-10154=>838,10155=>838,10156=>838,10157=>838,10158=>838,10159=>838,10161=>838,10162=>838,10163=>838,10164=>838,
-10165=>838,10166=>838,10167=>838,10168=>838,10169=>838,10170=>838,10171=>838,10172=>838,10173=>838,10174=>838,
-10181=>457,10182=>457,10208=>494,10214=>487,10215=>487,10216=>457,10217=>457,10218=>721,10219=>721,10224=>838,
-10225=>838,10226=>838,10227=>838,10228=>1157,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,10502=>838,10503=>838,10506=>838,10507=>838,10560=>838,10561=>838,10627=>753,10628=>753,10702=>838,
-10703=>1046,10704=>1046,10705=>1000,10706=>1000,10707=>1000,10708=>1000,10709=>1000,10731=>494,10746=>838,10747=>838,
-10752=>1000,10753=>1000,10754=>1000,10764=>1661,10765=>563,10766=>563,10767=>563,10768=>563,10769=>563,10770=>563,
-10771=>563,10772=>563,10773=>563,10774=>563,10775=>563,10776=>563,10777=>563,10778=>563,10779=>563,10780=>563,
-10799=>838,10877=>838,10878=>838,10879=>838,10880=>838,10881=>838,10882=>838,10883=>838,10884=>838,10885=>838,
-10886=>838,10887=>838,10888=>838,10889=>838,10890=>838,10891=>838,10892=>838,10893=>838,10894=>838,10895=>838,
-10896=>838,10897=>838,10898=>838,10899=>838,10900=>838,10901=>838,10902=>838,10903=>838,10904=>838,10905=>838,
-10906=>838,10907=>838,10908=>838,10909=>838,10910=>838,10911=>838,10912=>838,10926=>838,10927=>838,10928=>838,
-10929=>838,10930=>838,10931=>838,10932=>838,10933=>838,10934=>838,10935=>838,10936=>838,10937=>838,10938=>838,
-11001=>838,11002=>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,11039=>869,
-11040=>869,11041=>873,11042=>873,11043=>873,11044=>1119,11091=>869,11092=>869,11360=>637,11361=>360,11362=>637,
-11363=>733,11364=>770,11365=>675,11366=>478,11367=>956,11368=>712,11369=>775,11370=>665,11371=>725,11372=>582,
-11373=>860,11374=>995,11375=>774,11377=>778,11378=>1221,11379=>1056,11380=>652,11381=>698,11382=>565,11383=>782,
-11385=>538,11386=>687,11387=>559,11388=>219,11389=>487,11800=>586,11810=>457,11811=>457,11812=>457,11813=>457,
-11822=>580,19904=>896,19905=>896,19906=>896,19907=>896,19908=>896,19909=>896,19910=>896,19911=>896,19912=>896,
-19913=>896,19914=>896,19915=>896,19916=>896,19917=>896,19918=>896,19919=>896,19920=>896,19921=>896,19922=>896,
-19923=>896,19924=>896,19925=>896,19926=>896,19927=>896,19928=>896,19929=>896,19930=>896,19931=>896,19932=>896,
-19933=>896,19934=>896,19935=>896,19936=>896,19937=>896,19938=>896,19939=>896,19940=>896,19941=>896,19942=>896,
-19943=>896,19944=>896,19945=>896,19946=>896,19947=>896,19948=>896,19949=>896,19950=>896,19951=>896,19952=>896,
-19953=>896,19954=>896,19955=>896,19956=>896,19957=>896,19958=>896,19959=>896,19960=>896,19961=>896,19962=>896,
-19963=>896,19964=>896,19965=>896,19966=>896,19967=>896,42564=>720,42565=>595,42566=>436,42567=>440,42572=>1405,
-42573=>1173,42576=>1234,42577=>1027,42580=>1174,42581=>972,42582=>1100,42583=>969,42594=>1100,42595=>940,42596=>1096,
-42597=>915,42598=>1260,42599=>997,42600=>850,42601=>687,42602=>1037,42603=>868,42604=>1406,42605=>1106,42606=>961,
-42634=>944,42635=>749,42636=>682,42637=>580,42644=>808,42645=>712,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=>400,42780=>400,42781=>287,42782=>287,42783=>287,42790=>837,42791=>712,42792=>1031,42793=>857,
-42794=>696,42795=>557,42800=>559,42801=>595,42802=>1349,42803=>1052,42804=>1285,42805=>1065,42806=>1245,42807=>1052,
-42808=>1079,42809=>922,42810=>1079,42811=>922,42812=>1035,42813=>922,42814=>698,42815=>549,42822=>850,42823=>542,
-42824=>683,42825=>531,42826=>918,42827=>814,42830=>1406,42831=>1106,42880=>637,42881=>343,42882=>837,42883=>712,
-42889=>400,42890=>396,42891=>456,42892=>306,43003=>683,43004=>733,43005=>995,43006=>372,43007=>1325,62917=>687,
-64256=>833,64257=>787,64258=>787,64259=>1138,64260=>1139,64261=>808,64262=>1020,64275=>1388,64276=>1384,64277=>1378,
-64278=>1384,64279=>1713,64285=>343,64286=>0,64287=>663,64288=>720,64289=>963,64290=>890,64291=>988,64292=>963,
-64293=>938,64294=>988,64295=>988,64296=>976,64297=>838,64298=>949,64299=>949,64300=>949,64301=>949,64302=>751,
-64303=>751,64304=>751,64305=>673,64306=>537,64307=>654,64308=>712,64309=>343,64310=>491,64312=>724,64313=>467,
-64314=>649,64315=>650,64316=>679,64318=>775,64320=>497,64321=>773,64323=>718,64324=>687,64326=>751,64327=>729,
-64328=>649,64329=>949,64330=>751,64331=>343,64332=>673,64333=>650,64334=>687,64335=>751,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,65056=>0,65057=>0,65058=>0,65059=>0,65529=>0,65530=>0,
-65531=>0,65532=>0,65533=>1113);
-$enc='';
-$diff='';
-$file='dejavusansbi.z';
-$ctg='dejavusansbi.ctg.z';
-$originalsize=524056;
-?>
\ No newline at end of file
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusansbi.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusansbi.z
deleted file mode 100644
index 03c4078e..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusansbi.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusanscondensed.ctg.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusanscondensed.ctg.z
deleted file mode 100644
index 3170ea6f..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusanscondensed.ctg.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusanscondensed.php b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusanscondensed.php
deleted file mode 100644
index 6af979ed..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusanscondensed.php
+++ /dev/null
@@ -1,517 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='DejaVuSansCondensed';
-$desc=array('Ascent'=>928,'Descent'=>-236,'CapHeight'=>26,'Flags'=>96,'FontBBox'=>'[-918 -350 1513 1167]','ItalicAngle'=>-18.9,'StemV'=>70,'MissingWidth'=>540);
-$up=-63;
-$ut=44;
-$dw=540;
-$cw=array(
-0=>540,32=>286,33=>360,34=>414,35=>754,36=>572,37=>855,38=>702,39=>247,40=>351,
-41=>351,42=>450,43=>754,44=>286,45=>325,46=>286,47=>303,48=>572,49=>572,50=>572,
-51=>572,52=>572,53=>572,54=>572,55=>572,56=>572,57=>572,58=>303,59=>303,60=>754,
-61=>754,62=>754,63=>478,64=>900,65=>615,66=>617,67=>628,68=>693,69=>568,70=>518,
-71=>697,72=>677,73=>265,74=>265,75=>590,76=>501,77=>776,78=>673,79=>708,80=>542,
-81=>708,82=>625,83=>571,84=>549,85=>659,86=>615,87=>890,88=>616,89=>549,90=>616,
-91=>351,92=>303,93=>351,94=>754,95=>450,96=>450,97=>551,98=>571,99=>495,100=>571,
-101=>554,102=>316,103=>571,104=>570,105=>250,106=>250,107=>521,108=>250,109=>876,110=>570,
-111=>550,112=>571,113=>571,114=>370,115=>469,116=>353,117=>570,118=>532,119=>736,120=>532,
-121=>532,122=>472,123=>572,124=>303,125=>572,126=>754,8364=>572,8218=>286,402=>316,8222=>466,
-8230=>900,8224=>450,8225=>450,710=>450,8240=>1208,352=>571,8249=>360,338=>962,381=>616,8216=>286,
-8217=>286,8220=>466,8221=>466,8226=>531,8211=>450,8212=>900,732=>450,8482=>900,353=>469,8250=>360,
-339=>920,382=>472,376=>549,160=>286,161=>360,162=>572,163=>572,164=>572,165=>572,166=>303,
-167=>450,168=>450,169=>900,170=>424,171=>550,172=>754,173=>325,174=>900,175=>450,176=>450,
-177=>754,178=>360,179=>360,180=>450,181=>572,182=>572,183=>286,184=>450,185=>360,186=>424,
-187=>550,188=>872,189=>872,190=>872,191=>478,192=>615,193=>615,194=>615,195=>615,196=>615,
-197=>615,198=>876,199=>628,200=>568,201=>568,202=>568,203=>568,204=>265,205=>265,206=>265,
-207=>265,208=>697,209=>673,210=>708,211=>708,212=>708,213=>708,214=>708,215=>754,216=>708,
-217=>659,218=>659,219=>659,220=>659,221=>549,222=>544,223=>567,224=>551,225=>551,226=>551,
-227=>551,228=>551,229=>551,230=>883,231=>495,232=>554,233=>554,234=>554,235=>554,236=>250,
-237=>250,238=>250,239=>250,240=>550,241=>570,242=>550,243=>550,244=>550,245=>550,246=>550,
-247=>754,248=>550,249=>570,250=>570,251=>570,252=>570,253=>532,254=>571,255=>532,256=>615,
-257=>551,258=>615,259=>551,260=>615,261=>551,262=>628,263=>495,264=>628,265=>495,266=>628,
-267=>495,268=>628,269=>495,270=>693,271=>571,272=>697,273=>571,274=>568,275=>554,276=>568,
-277=>554,278=>568,279=>554,280=>568,281=>554,282=>568,283=>554,284=>697,285=>571,286=>697,
-287=>571,288=>697,289=>571,290=>697,291=>571,292=>677,293=>570,294=>824,295=>625,296=>265,
-297=>250,298=>265,299=>250,300=>265,301=>250,302=>265,303=>250,304=>265,305=>250,306=>531,
-307=>500,308=>265,309=>250,310=>590,311=>521,312=>521,313=>501,314=>250,315=>501,316=>250,
-317=>501,318=>337,319=>501,320=>308,321=>505,322=>255,323=>673,324=>570,325=>673,326=>570,
-327=>673,328=>570,329=>732,330=>673,331=>570,332=>708,333=>550,334=>708,335=>550,336=>708,
-337=>550,340=>625,341=>370,342=>625,343=>370,344=>625,345=>370,346=>571,347=>469,348=>571,
-349=>469,350=>571,351=>469,354=>549,355=>353,356=>549,357=>353,358=>549,359=>353,360=>659,
-361=>570,362=>659,363=>570,364=>659,365=>570,366=>659,367=>570,368=>659,369=>570,370=>659,
-371=>570,372=>890,373=>736,374=>549,375=>532,377=>616,378=>472,379=>616,380=>472,383=>316,
-384=>571,385=>661,386=>617,387=>571,388=>617,389=>571,390=>633,391=>628,392=>495,393=>697,
-394=>737,395=>617,396=>571,397=>550,398=>568,399=>708,400=>553,401=>518,403=>697,404=>618,
-405=>885,406=>318,407=>265,408=>671,409=>521,410=>250,411=>532,412=>876,413=>673,414=>570,
-415=>708,416=>822,417=>550,418=>854,419=>683,420=>586,421=>571,422=>625,423=>571,424=>469,
-425=>568,426=>302,427=>353,428=>549,429=>353,430=>549,431=>772,432=>570,433=>688,434=>648,
-435=>669,436=>657,437=>616,438=>472,439=>599,440=>599,441=>520,442=>472,443=>572,444=>599,
-445=>520,446=>459,447=>571,448=>265,449=>443,450=>413,451=>266,452=>1279,453=>1169,454=>1039,
-455=>751,456=>708,457=>411,458=>838,459=>831,460=>717,461=>615,462=>551,463=>265,464=>250,
-465=>708,466=>550,467=>659,468=>570,469=>659,470=>570,471=>659,472=>570,473=>659,474=>570,
-475=>659,476=>570,477=>554,478=>615,479=>551,480=>615,481=>551,482=>876,483=>883,484=>697,
-485=>571,486=>697,487=>571,488=>590,489=>521,490=>708,491=>550,492=>708,493=>550,494=>599,
-495=>520,496=>250,497=>1279,498=>1169,499=>1039,500=>697,501=>571,502=>1001,503=>614,504=>673,
-505=>570,506=>615,507=>551,508=>876,509=>883,510=>708,511=>550,512=>615,513=>551,514=>615,
-515=>551,516=>568,517=>554,518=>568,519=>554,520=>265,521=>250,522=>265,523=>250,524=>708,
-525=>550,526=>708,527=>550,528=>625,529=>370,530=>625,531=>370,532=>659,533=>570,534=>659,
-535=>570,536=>571,537=>469,538=>549,539=>353,540=>564,541=>469,542=>677,543=>570,544=>662,
-545=>754,546=>628,547=>549,548=>616,549=>472,550=>615,551=>551,552=>568,553=>554,554=>708,
-555=>550,556=>708,557=>550,558=>708,559=>550,560=>708,561=>550,562=>549,563=>532,564=>427,
-565=>758,566=>429,567=>250,568=>898,569=>898,570=>615,571=>628,572=>495,573=>501,574=>549,
-575=>469,576=>472,577=>542,578=>431,579=>617,580=>659,581=>615,582=>568,583=>554,584=>265,
-585=>250,586=>703,587=>571,588=>625,589=>370,590=>549,591=>532,592=>540,593=>571,594=>571,
-595=>571,596=>494,597=>495,598=>571,599=>626,600=>554,601=>554,602=>737,603=>486,604=>479,
-605=>698,606=>598,607=>250,608=>626,609=>571,610=>566,611=>536,612=>536,613=>570,614=>570,
-615=>570,616=>250,617=>304,618=>334,619=>356,620=>438,621=>250,622=>635,623=>876,624=>876,
-625=>876,626=>581,627=>578,628=>570,629=>550,630=>772,631=>655,632=>593,633=>373,634=>373,
-635=>372,636=>370,637=>369,638=>477,639=>477,640=>543,641=>543,642=>469,643=>302,644=>302,
-645=>415,646=>302,647=>353,648=>353,649=>570,650=>556,651=>538,652=>532,653=>736,654=>532,
-655=>549,656=>472,657=>472,658=>520,659=>520,660=>459,661=>459,662=>459,663=>459,664=>708,
-665=>521,666=>598,667=>637,668=>588,669=>263,670=>600,671=>456,672=>654,673=>459,674=>459,
-675=>913,676=>952,677=>911,678=>742,679=>549,680=>700,681=>763,682=>576,683=>589,684=>463,
-685=>463,686=>595,687=>597,688=>364,689=>359,690=>157,691=>233,692=>266,693=>266,694=>341,
-695=>463,696=>335,697=>250,698=>414,699=>286,700=>286,701=>286,702=>276,703=>276,704=>333,
-705=>333,706=>450,707=>450,708=>450,709=>450,711=>450,712=>247,713=>450,714=>450,715=>450,
-716=>247,717=>450,718=>450,719=>450,720=>303,721=>303,722=>276,723=>276,724=>450,725=>450,
-726=>351,727=>286,728=>450,729=>450,730=>450,731=>450,733=>450,734=>284,735=>450,736=>383,
-737=>149,738=>335,739=>399,740=>333,741=>444,742=>444,743=>444,744=>444,745=>444,748=>450,
-749=>450,750=>466,755=>450,759=>450,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,832=>0,833=>0,
-834=>0,835=>0,836=>0,837=>0,838=>0,839=>0,840=>0,841=>0,842=>0,843=>0,
-844=>0,845=>0,846=>0,847=>0,849=>0,850=>0,851=>0,855=>0,856=>0,858=>0,
-860=>0,861=>0,862=>0,863=>0,864=>0,865=>0,866=>0,880=>589,881=>511,882=>775,
-883=>583,884=>250,885=>250,886=>673,887=>584,890=>450,891=>494,892=>495,893=>494,894=>303,
-900=>450,901=>450,902=>623,903=>286,904=>671,905=>784,906=>367,908=>731,910=>742,911=>743,
-912=>304,913=>615,914=>617,915=>501,916=>615,917=>568,918=>616,919=>677,920=>708,921=>265,
-922=>590,923=>615,924=>776,925=>673,926=>568,927=>708,928=>677,929=>542,931=>568,932=>549,
-933=>549,934=>708,935=>616,936=>708,937=>688,938=>265,939=>549,940=>593,941=>486,942=>570,
-943=>304,944=>521,945=>593,946=>574,947=>532,948=>550,949=>486,950=>489,951=>570,952=>550,
-953=>304,954=>530,955=>532,956=>572,957=>502,958=>501,959=>550,960=>542,961=>571,962=>528,
-963=>570,964=>542,965=>521,966=>593,967=>520,968=>593,969=>753,970=>304,971=>521,972=>550,
-973=>521,974=>753,975=>590,976=>553,977=>557,978=>628,979=>758,980=>628,981=>593,982=>753,
-983=>597,984=>708,985=>550,986=>583,987=>528,988=>518,989=>413,990=>593,991=>593,992=>778,
-993=>564,994=>840,995=>753,996=>682,997=>593,998=>712,999=>553,1000=>618,1001=>546,1002=>690,
-1003=>563,1004=>629,1005=>550,1006=>549,1007=>482,1008=>597,1009=>571,1010=>495,1011=>250,1012=>708,
-1013=>554,1014=>554,1015=>544,1016=>571,1017=>628,1018=>776,1019=>585,1020=>571,1021=>633,1022=>628,
-1023=>633,1024=>568,1025=>568,1026=>708,1027=>549,1028=>628,1029=>571,1030=>265,1031=>265,1032=>265,
-1033=>984,1034=>940,1035=>708,1036=>639,1037=>673,1038=>548,1039=>677,1040=>615,1041=>617,1042=>617,
-1043=>549,1044=>703,1045=>568,1046=>969,1047=>577,1048=>673,1049=>673,1050=>639,1051=>677,1052=>776,
-1053=>677,1054=>708,1055=>677,1056=>542,1057=>628,1058=>549,1059=>548,1060=>774,1061=>616,1062=>699,
-1063=>617,1064=>962,1065=>984,1066=>749,1067=>794,1068=>617,1069=>628,1070=>971,1071=>625,1072=>551,
-1073=>555,1074=>530,1075=>473,1076=>622,1077=>554,1078=>811,1079=>479,1080=>584,1081=>584,1082=>543,
-1083=>575,1084=>679,1085=>588,1086=>550,1087=>588,1088=>571,1089=>495,1090=>524,1091=>532,1092=>769,
-1093=>532,1094=>612,1095=>532,1096=>823,1097=>848,1098=>636,1099=>710,1100=>530,1101=>494,1102=>757,
-1103=>541,1104=>554,1105=>554,1106=>563,1107=>473,1108=>494,1109=>469,1110=>250,1111=>250,1112=>250,
-1113=>812,1114=>809,1115=>586,1116=>543,1117=>584,1118=>532,1119=>588,1120=>840,1121=>753,1122=>693,
-1123=>604,1124=>848,1125=>674,1126=>791,1127=>705,1128=>1043,1129=>901,1130=>708,1131=>550,1132=>924,
-1133=>742,1134=>572,1135=>486,1136=>771,1137=>789,1138=>708,1139=>550,1140=>703,1141=>598,1142=>703,
-1143=>598,1144=>893,1145=>813,1146=>857,1147=>682,1148=>1062,1149=>925,1150=>840,1151=>753,1152=>628,
-1153=>495,1154=>452,1155=>0,1156=>0,1157=>0,1158=>0,1159=>0,1160=>376,1161=>376,1162=>695,
-1163=>609,1164=>617,1165=>530,1166=>542,1167=>571,1168=>549,1169=>473,1170=>607,1171=>531,1172=>562,
-1173=>477,1174=>969,1175=>811,1176=>577,1177=>479,1178=>639,1179=>543,1180=>639,1181=>543,1182=>639,
-1183=>543,1184=>771,1185=>748,1186=>677,1187=>594,1188=>913,1189=>789,1190=>973,1191=>824,1192=>790,
-1193=>624,1194=>628,1195=>495,1196=>549,1197=>524,1198=>549,1199=>532,1200=>549,1201=>532,1202=>616,
-1203=>532,1204=>840,1205=>726,1206=>617,1207=>532,1208=>617,1209=>532,1210=>617,1211=>570,1212=>847,
-1213=>655,1214=>847,1215=>655,1216=>265,1217=>969,1218=>811,1219=>590,1220=>543,1221=>698,1222=>603,
-1223=>677,1224=>594,1225=>699,1226=>612,1227=>617,1228=>532,1229=>799,1230=>697,1231=>250,1232=>615,
-1233=>551,1234=>615,1235=>551,1236=>876,1237=>883,1238=>568,1239=>554,1240=>708,1241=>554,1242=>708,
-1243=>554,1244=>969,1245=>811,1246=>577,1247=>479,1248=>599,1249=>520,1250=>673,1251=>584,1252=>673,
-1253=>584,1254=>708,1255=>550,1256=>708,1257=>550,1258=>708,1259=>550,1260=>628,1261=>494,1262=>548,
-1263=>532,1264=>548,1265=>532,1266=>548,1267=>532,1268=>617,1269=>532,1270=>549,1271=>473,1272=>794,
-1273=>710,1274=>607,1275=>531,1276=>616,1277=>532,1278=>616,1279=>532,1280=>617,1281=>530,1282=>905,
-1283=>807,1284=>877,1285=>782,1286=>611,1287=>529,1288=>964,1289=>861,1290=>1001,1291=>870,1292=>697,
-1293=>593,1294=>695,1295=>640,1296=>553,1297=>486,1298=>677,1299=>575,1300=>1052,1301=>894,1302=>804,
-1303=>778,1304=>928,1305=>887,1306=>708,1307=>571,1308=>890,1309=>736,1312=>972,1313=>814,1314=>973,
-1315=>821,1316=>713,1317=>614,1329=>780,1330=>659,1331=>794,1332=>794,1333=>659,1334=>579,1335=>613,
-1336=>659,1337=>765,1338=>794,1339=>659,1340=>501,1341=>741,1342=>888,1343=>659,1344=>636,1345=>579,
-1346=>794,1347=>699,1348=>794,1349=>659,1350=>756,1351=>659,1352=>659,1353=>659,1354=>711,1355=>579,
-1356=>794,1357=>659,1358=>794,1359=>571,1360=>659,1361=>659,1362=>719,1363=>708,1364=>711,1365=>708,
-1366=>571,1369=>276,1370=>286,1371=>450,1372=>450,1373=>352,1374=>474,1375=>450,1377=>876,1378=>570,
-1379=>686,1380=>690,1381=>570,1382=>627,1383=>479,1384=>570,1385=>630,1386=>627,1387=>570,1388=>363,
-1389=>804,1390=>576,1391=>570,1392=>570,1393=>571,1394=>631,1395=>570,1396=>593,1397=>250,1398=>684,
-1399=>464,1400=>570,1401=>407,1402=>876,1403=>464,1404=>691,1405=>570,1406=>626,1407=>876,1408=>570,
-1409=>571,1410=>451,1411=>876,1412=>583,1413=>550,1414=>566,1415=>686,1417=>303,1418=>390,1456=>0,
-1457=>0,1458=>0,1459=>0,1460=>0,1461=>0,1462=>0,1463=>0,1464=>0,1465=>0,1466=>0,
-1467=>0,1468=>0,1469=>0,1470=>325,1471=>0,1472=>265,1473=>0,1474=>0,1475=>265,1478=>397,
-1479=>0,1488=>566,1489=>547,1490=>403,1491=>534,1492=>576,1493=>245,1494=>336,1495=>576,1496=>583,
-1497=>245,1498=>532,1499=>500,1500=>539,1501=>576,1502=>593,1503=>245,1504=>397,1505=>629,1506=>506,
-1507=>576,1508=>543,1509=>468,1510=>523,1511=>596,1512=>532,1513=>727,1514=>591,1520=>423,1521=>409,
-1522=>423,1523=>374,1524=>580,1542=>573,1543=>573,1545=>681,1546=>879,1548=>290,1557=>0,1563=>286,
-1567=>478,1569=>423,1570=>250,1571=>250,1572=>435,1573=>250,1574=>704,1575=>250,1576=>847,1577=>471,
-1578=>847,1579=>847,1580=>581,1581=>581,1582=>581,1583=>400,1584=>400,1585=>435,1586=>435,1587=>1099,
-1588=>1099,1589=>1088,1590=>1088,1591=>832,1592=>832,1593=>537,1594=>537,1600=>264,1601=>933,1602=>698,
-1603=>742,1604=>654,1605=>557,1606=>661,1607=>471,1608=>435,1609=>704,1610=>704,1611=>0,1612=>0,
-1613=>0,1614=>0,1615=>0,1616=>0,1617=>0,1618=>0,1619=>0,1620=>0,1621=>0,1626=>450,
-1632=>483,1633=>483,1634=>483,1635=>483,1636=>483,1637=>483,1638=>483,1639=>483,1640=>483,1641=>483,
-1642=>483,1643=>292,1644=>286,1645=>490,1646=>847,1647=>698,1652=>263,1657=>847,1658=>847,1659=>847,
-1660=>847,1661=>847,1662=>847,1663=>847,1664=>847,1665=>581,1666=>581,1667=>581,1668=>581,1669=>581,
-1670=>581,1671=>581,1681=>435,1682=>435,1685=>549,1688=>435,1697=>933,1700=>933,1702=>933,1705=>805,
-1711=>805,1717=>654,1722=>661,1727=>581,1734=>435,1740=>704,1742=>704,1749=>471,1776=>483,1777=>483,
-1778=>483,1779=>483,1780=>483,1781=>483,1782=>483,1783=>483,1784=>483,1785=>483,1984=>572,1985=>572,
-1986=>572,1987=>572,1988=>572,1989=>572,1990=>572,1991=>572,1992=>572,1993=>572,1994=>250,1995=>514,
-1996=>381,1997=>532,1998=>588,1999=>588,2000=>534,2001=>588,2002=>746,2003=>394,2004=>394,2005=>502,
-2006=>550,2007=>315,2008=>863,2009=>425,2010=>705,2011=>588,2012=>563,2013=>660,2014=>477,2015=>651,
-2016=>425,2017=>563,2018=>534,2019=>477,2020=>477,2021=>470,2022=>534,2023=>534,2027=>0,2028=>0,
-2029=>0,2030=>0,2031=>0,2032=>0,2033=>0,2034=>0,2035=>0,2036=>282,2037=>282,2040=>504,
-2041=>504,2042=>325,3647=>586,3713=>603,3714=>615,3716=>619,3719=>434,3720=>565,3722=>615,3725=>619,
-3732=>602,3733=>577,3734=>580,3735=>589,3737=>593,3738=>563,3739=>563,3740=>670,3741=>690,3742=>618,
-3743=>618,3745=>631,3746=>619,3747=>615,3749=>584,3751=>569,3754=>633,3755=>737,3757=>569,3758=>615,
-3759=>708,3760=>569,3761=>0,3762=>485,3763=>485,3764=>0,3765=>0,3766=>0,3767=>0,3768=>0,
-3769=>0,3771=>0,3772=>0,3773=>597,3776=>337,3777=>591,3778=>414,3779=>492,3780=>442,3782=>606,
-3784=>0,3785=>0,3786=>0,3787=>0,3788=>0,3789=>0,3792=>572,3793=>576,3794=>576,3795=>603,
-3796=>563,3797=>563,3798=>633,3799=>603,3800=>606,3801=>609,3804=>925,3805=>925,4256=>756,4257=>621,
-4258=>577,4259=>683,4260=>532,4261=>617,4262=>710,4263=>729,4264=>420,4265=>508,4266=>710,4267=>713,
-4268=>526,4269=>753,4270=>675,4271=>620,4272=>729,4273=>526,4274=>526,4275=>753,4276=>753,4277=>581,
-4278=>543,4279=>526,4280=>536,4281=>526,4282=>649,4283=>715,4284=>526,4285=>510,4286=>526,4287=>602,
-4288=>719,4289=>488,4290=>598,4291=>488,4292=>508,4293=>606,4304=>457,4305=>457,4306=>479,4307=>706,
-4308=>470,4309=>465,4310=>457,4311=>717,4312=>457,4313=>466,4314=>952,4315=>470,4316=>470,4317=>704,
-4318=>466,4319=>470,4320=>713,4321=>470,4322=>590,4323=>471,4324=>709,4325=>470,4326=>704,4327=>470,
-4328=>470,4329=>470,4330=>510,4331=>470,4332=>470,4333=>439,4334=>470,4335=>448,4336=>465,4337=>504,
-4338=>457,4339=>457,4340=>457,4341=>507,4342=>741,4343=>536,4344=>470,4345=>498,4346=>498,4347=>527,
-4348=>273,5121=>615,5122=>615,5123=>615,5124=>615,5125=>692,5126=>692,5127=>692,5129=>692,5130=>692,
-5131=>692,5132=>751,5133=>751,5134=>751,5135=>751,5136=>751,5137=>751,5138=>870,5139=>906,5140=>870,
-5141=>906,5142=>692,5143=>870,5144=>906,5145=>870,5146=>906,5147=>692,5149=>230,5150=>488,5151=>381,
-5152=>381,5153=>350,5154=>350,5155=>354,5156=>350,5157=>419,5158=>347,5159=>230,5160=>350,5161=>350,
-5162=>350,5163=>980,5164=>817,5165=>857,5166=>1005,5167=>615,5168=>615,5169=>615,5170=>615,5171=>656,
-5172=>656,5173=>656,5175=>656,5176=>656,5177=>656,5178=>751,5179=>615,5180=>751,5181=>751,5182=>751,
-5183=>751,5184=>870,5185=>906,5186=>870,5187=>906,5188=>870,5189=>906,5190=>870,5191=>906,5192=>656,
-5193=>457,5194=>172,5196=>659,5197=>659,5198=>659,5199=>659,5200=>657,5201=>657,5202=>657,5204=>657,
-5205=>657,5206=>657,5207=>829,5208=>800,5209=>829,5210=>800,5211=>829,5212=>800,5213=>835,5214=>810,
-5215=>835,5216=>810,5217=>853,5218=>810,5219=>853,5220=>810,5221=>853,5222=>391,5223=>790,5224=>790,
-5225=>779,5226=>801,5227=>565,5228=>565,5229=>565,5230=>565,5231=>565,5232=>565,5233=>565,5234=>565,
-5235=>565,5236=>773,5237=>693,5238=>733,5239=>734,5240=>733,5241=>734,5242=>773,5243=>693,5244=>773,
-5245=>693,5246=>733,5247=>734,5248=>733,5249=>734,5250=>733,5251=>366,5252=>366,5253=>675,5254=>697,
-5255=>675,5256=>697,5257=>565,5258=>565,5259=>565,5260=>565,5261=>565,5262=>565,5263=>565,5264=>565,
-5265=>565,5266=>773,5267=>693,5268=>733,5269=>734,5270=>733,5271=>734,5272=>773,5273=>693,5274=>773,
-5275=>693,5276=>733,5277=>734,5278=>733,5279=>734,5280=>733,5281=>391,5282=>391,5283=>549,5284=>501,
-5285=>501,5286=>501,5287=>549,5288=>549,5289=>549,5290=>501,5291=>501,5292=>674,5293=>691,5294=>671,
-5295=>687,5296=>671,5297=>687,5298=>674,5299=>691,5300=>674,5301=>691,5302=>671,5303=>687,5304=>671,
-5305=>687,5306=>671,5307=>347,5308=>457,5309=>347,5312=>766,5313=>766,5314=>766,5315=>766,5316=>766,
-5317=>766,5318=>766,5319=>766,5320=>766,5321=>962,5322=>931,5323=>953,5324=>766,5325=>953,5326=>766,
-5327=>766,5328=>540,5329=>407,5330=>540,5331=>766,5332=>766,5333=>766,5334=>766,5335=>766,5336=>766,
-5337=>766,5338=>766,5339=>766,5340=>962,5341=>931,5342=>953,5343=>927,5344=>953,5345=>927,5346=>962,
-5347=>931,5348=>962,5349=>931,5350=>975,5351=>927,5352=>975,5353=>927,5354=>540,5356=>656,5357=>542,
-5358=>542,5359=>542,5360=>542,5361=>542,5362=>542,5363=>542,5364=>542,5365=>542,5366=>751,5367=>678,
-5368=>712,5369=>694,5370=>712,5371=>694,5372=>751,5373=>678,5374=>751,5375=>678,5376=>712,5377=>694,
-5378=>712,5379=>694,5380=>712,5381=>376,5382=>378,5383=>376,5392=>641,5393=>641,5394=>641,5395=>802,
-5396=>802,5397=>802,5398=>802,5399=>818,5400=>785,5401=>818,5402=>785,5403=>818,5404=>785,5405=>1026,
-5406=>989,5407=>1026,5408=>989,5409=>1026,5410=>989,5411=>1026,5412=>989,5413=>576,5414=>564,5415=>564,
-5416=>564,5417=>564,5418=>564,5419=>564,5420=>564,5421=>564,5422=>564,5423=>760,5424=>703,5425=>734,
-5426=>736,5427=>734,5428=>736,5429=>760,5430=>703,5431=>760,5432=>703,5433=>734,5434=>736,5435=>734,
-5436=>736,5437=>734,5438=>376,5440=>350,5441=>436,5442=>824,5443=>824,5444=>824,5445=>824,5446=>824,
-5447=>824,5448=>542,5449=>542,5450=>542,5451=>542,5452=>542,5453=>542,5454=>751,5455=>678,5456=>376,
-5458=>656,5459=>615,5460=>615,5461=>615,5462=>615,5463=>653,5464=>653,5465=>653,5466=>653,5467=>831,
-5468=>906,5469=>457,5470=>659,5471=>659,5472=>659,5473=>659,5474=>659,5475=>659,5476=>657,5477=>657,
-5478=>657,5479=>657,5480=>853,5481=>810,5482=>457,5492=>747,5493=>747,5494=>747,5495=>747,5496=>747,
-5497=>747,5498=>747,5499=>507,5500=>677,5501=>436,5502=>942,5503=>942,5504=>942,5505=>942,5506=>942,
-5507=>942,5508=>942,5509=>743,5514=>747,5515=>747,5516=>747,5517=>747,5518=>1133,5519=>1133,5520=>1133,
-5521=>901,5522=>901,5523=>1133,5524=>1133,5525=>629,5526=>965,5536=>766,5537=>766,5538=>766,5539=>766,
-5540=>766,5541=>766,5542=>540,5543=>579,5544=>579,5545=>579,5546=>579,5547=>579,5548=>579,5549=>579,
-5550=>376,5551=>565,5598=>693,5601=>690,5702=>421,5703=>421,5742=>399,5743=>942,5744=>1178,5745=>1469,
-5746=>1469,5747=>1237,5748=>1237,5749=>1469,5750=>1469,5760=>429,5761=>443,5762=>641,5763=>838,5764=>1035,
-5765=>1232,5766=>443,5767=>641,5768=>838,5769=>1035,5770=>1232,5771=>448,5772=>646,5773=>844,5774=>1042,
-5775=>1241,5776=>443,5777=>641,5778=>836,5779=>1034,5780=>1232,5781=>448,5782=>677,5783=>709,5784=>1084,
-5785=>1035,5786=>615,5787=>457,5788=>456,7424=>532,7425=>646,7426=>883,7427=>527,7428=>495,7429=>544,
-7430=>544,7431=>441,7432=>486,7433=>250,7434=>355,7435=>521,7436=>524,7437=>679,7438=>584,7439=>550,
-7440=>495,7441=>615,7442=>615,7443=>615,7444=>920,7446=>550,7447=>550,7448=>472,7449=>541,7450=>541,
-7451=>524,7452=>517,7453=>663,7454=>853,7455=>574,7456=>532,7457=>736,7458=>472,7459=>473,7462=>524,
-7463=>532,7464=>507,7465=>472,7466=>531,7467=>575,7468=>387,7469=>552,7470=>389,7472=>436,7473=>358,
-7474=>358,7475=>439,7476=>426,7477=>167,7478=>167,7479=>372,7480=>315,7481=>489,7482=>424,7483=>424,
-7484=>446,7485=>396,7486=>342,7487=>394,7488=>346,7489=>415,7490=>560,7491=>352,7492=>352,7493=>365,
-7494=>583,7495=>385,7496=>365,7497=>375,7498=>375,7499=>324,7500=>323,7501=>365,7502=>161,7503=>383,
-7504=>561,7505=>368,7506=>372,7507=>333,7508=>372,7509=>372,7510=>385,7511=>265,7512=>364,7513=>422,
-7514=>561,7515=>375,7517=>361,7518=>335,7519=>347,7520=>374,7521=>327,7522=>161,7523=>233,7524=>364,
-7525=>375,7526=>361,7527=>335,7528=>370,7529=>374,7530=>327,7543=>571,7544=>426,7547=>334,7557=>250,
-7579=>365,7580=>333,7581=>333,7582=>372,7583=>324,7584=>267,7585=>209,7586=>365,7587=>364,7588=>235,
-7589=>224,7590=>234,7591=>235,7592=>211,7593=>224,7594=>211,7595=>338,7596=>561,7597=>561,7598=>369,
-7599=>431,7600=>368,7601=>372,7602=>372,7603=>324,7604=>258,7605=>265,7606=>457,7607=>376,7608=>325,
-7609=>365,7610=>375,7611=>330,7612=>393,7613=>330,7614=>353,7615=>372,7620=>0,7621=>0,7622=>0,
-7623=>0,7624=>0,7625=>0,7680=>615,7681=>551,7682=>617,7683=>571,7684=>617,7685=>571,7686=>617,
-7687=>571,7688=>628,7689=>495,7690=>693,7691=>571,7692=>693,7693=>571,7694=>693,7695=>571,7696=>693,
-7697=>571,7698=>693,7699=>571,7700=>568,7701=>554,7702=>568,7703=>554,7704=>568,7705=>554,7706=>568,
-7707=>554,7708=>568,7709=>554,7710=>518,7711=>316,7712=>697,7713=>571,7714=>677,7715=>570,7716=>677,
-7717=>570,7718=>677,7719=>570,7720=>677,7721=>570,7722=>677,7723=>570,7724=>265,7725=>250,7726=>265,
-7727=>250,7728=>590,7729=>521,7730=>590,7731=>521,7732=>590,7733=>521,7734=>501,7735=>259,7736=>501,
-7737=>259,7738=>501,7739=>250,7740=>501,7741=>250,7742=>776,7743=>876,7744=>776,7745=>876,7746=>776,
-7747=>876,7748=>673,7749=>570,7750=>673,7751=>570,7752=>673,7753=>570,7754=>673,7755=>570,7756=>708,
-7757=>550,7758=>708,7759=>550,7760=>708,7761=>550,7762=>708,7763=>550,7764=>542,7765=>571,7766=>542,
-7767=>571,7768=>625,7769=>370,7770=>625,7771=>370,7772=>625,7773=>370,7774=>625,7775=>370,7776=>571,
-7777=>469,7778=>571,7779=>469,7780=>571,7781=>469,7782=>571,7783=>469,7784=>571,7785=>469,7786=>549,
-7787=>353,7788=>549,7789=>353,7790=>549,7791=>353,7792=>549,7793=>353,7794=>659,7795=>570,7796=>659,
-7797=>570,7798=>659,7799=>570,7800=>659,7801=>570,7802=>659,7803=>570,7804=>615,7805=>532,7806=>615,
-7807=>532,7808=>890,7809=>736,7810=>890,7811=>736,7812=>890,7813=>736,7814=>890,7815=>736,7816=>890,
-7817=>736,7818=>616,7819=>532,7820=>616,7821=>532,7822=>549,7823=>532,7824=>616,7825=>472,7826=>616,
-7827=>472,7828=>616,7829=>472,7830=>570,7831=>353,7832=>736,7833=>532,7834=>551,7835=>316,7838=>691,
-7839=>550,7840=>615,7841=>551,7842=>615,7843=>551,7844=>615,7845=>551,7846=>615,7847=>551,7848=>615,
-7849=>551,7850=>615,7851=>551,7852=>615,7853=>551,7854=>615,7855=>551,7856=>615,7857=>551,7858=>615,
-7859=>551,7860=>615,7861=>551,7862=>615,7863=>551,7864=>568,7865=>554,7866=>568,7867=>554,7868=>568,
-7869=>554,7870=>568,7871=>554,7872=>568,7873=>554,7874=>568,7875=>554,7876=>568,7877=>554,7878=>568,
-7879=>554,7880=>265,7881=>250,7882=>265,7883=>250,7884=>708,7885=>550,7886=>708,7887=>550,7888=>708,
-7889=>550,7890=>708,7891=>550,7892=>708,7893=>550,7894=>708,7895=>550,7896=>708,7897=>550,7898=>822,
-7899=>550,7900=>822,7901=>550,7902=>822,7903=>550,7904=>822,7905=>550,7906=>822,7907=>550,7908=>659,
-7909=>570,7910=>659,7911=>570,7912=>772,7913=>570,7914=>772,7915=>570,7916=>772,7917=>570,7918=>772,
-7919=>570,7920=>772,7921=>570,7922=>549,7923=>532,7924=>549,7925=>532,7926=>549,7927=>532,7928=>549,
-7929=>532,7936=>593,7937=>593,7938=>593,7939=>593,7940=>593,7941=>593,7942=>593,7943=>593,7944=>615,
-7945=>615,7946=>790,7947=>790,7948=>692,7949=>721,7950=>637,7951=>668,7952=>486,7953=>486,7954=>486,
-7955=>486,7956=>486,7957=>486,7960=>640,7961=>640,7962=>869,7963=>877,7964=>809,7965=>835,7968=>570,
-7969=>570,7970=>570,7971=>570,7972=>570,7973=>570,7974=>570,7975=>570,7976=>753,7977=>751,7978=>977,
-7979=>980,7980=>924,7981=>945,7982=>840,7983=>852,7984=>304,7985=>304,7986=>304,7987=>304,7988=>304,
-7989=>304,7990=>304,7991=>304,7992=>342,7993=>336,7994=>571,7995=>571,7996=>513,7997=>540,7998=>440,
-7999=>443,8000=>550,8001=>550,8002=>550,8003=>550,8004=>550,8005=>550,8008=>724,8009=>763,8010=>985,
-8011=>989,8012=>844,8013=>873,8016=>521,8017=>521,8018=>521,8019=>521,8020=>521,8021=>521,8022=>521,
-8023=>521,8025=>705,8027=>897,8029=>911,8031=>808,8032=>753,8033=>753,8034=>753,8035=>753,8036=>753,
-8037=>753,8038=>753,8039=>753,8040=>722,8041=>759,8042=>980,8043=>985,8044=>851,8045=>875,8046=>829,
-8047=>857,8048=>593,8049=>593,8050=>486,8051=>493,8052=>570,8053=>589,8054=>304,8055=>304,8056=>550,
-8057=>550,8058=>521,8059=>521,8060=>753,8061=>753,8064=>593,8065=>593,8066=>593,8067=>593,8068=>593,
-8069=>593,8070=>593,8071=>593,8072=>615,8073=>615,8074=>790,8075=>790,8076=>692,8077=>721,8078=>637,
-8079=>668,8080=>570,8081=>570,8082=>570,8083=>570,8084=>570,8085=>570,8086=>570,8087=>570,8088=>753,
-8089=>751,8090=>977,8091=>980,8092=>924,8093=>945,8094=>840,8095=>852,8096=>753,8097=>753,8098=>753,
-8099=>753,8100=>753,8101=>753,8102=>753,8103=>753,8104=>722,8105=>759,8106=>980,8107=>985,8108=>851,
-8109=>875,8110=>829,8111=>857,8112=>593,8113=>593,8114=>593,8115=>593,8116=>593,8118=>593,8119=>593,
-8120=>615,8121=>615,8122=>645,8123=>623,8124=>615,8125=>450,8126=>450,8127=>450,8128=>450,8129=>450,
-8130=>570,8131=>570,8132=>589,8134=>570,8135=>570,8136=>724,8137=>671,8138=>837,8139=>784,8140=>677,
-8141=>450,8142=>450,8143=>450,8144=>304,8145=>304,8146=>304,8147=>304,8150=>304,8151=>304,8152=>265,
-8153=>265,8154=>427,8155=>367,8157=>450,8158=>450,8159=>450,8160=>521,8161=>521,8162=>521,8163=>521,
-8164=>571,8165=>571,8166=>521,8167=>521,8168=>549,8169=>549,8170=>760,8171=>742,8172=>616,8173=>450,
-8174=>450,8175=>450,8178=>753,8179=>753,8180=>753,8182=>753,8183=>753,8184=>847,8185=>731,8186=>830,
-8187=>743,8188=>688,8189=>450,8190=>450,8192=>450,8193=>900,8194=>450,8195=>900,8196=>296,8197=>225,
-8198=>150,8199=>572,8200=>286,8201=>180,8202=>89,8203=>0,8204=>0,8205=>0,8206=>0,8207=>0,
-8208=>325,8209=>325,8210=>572,8213=>900,8214=>450,8215=>450,8219=>286,8223=>466,8227=>531,8228=>301,
-8229=>601,8231=>286,8234=>0,8235=>0,8236=>0,8237=>0,8238=>0,8239=>180,8241=>1562,8242=>204,
-8243=>336,8244=>468,8245=>204,8246=>336,8247=>468,8248=>305,8251=>754,8252=>437,8253=>478,8254=>450,
-8255=>723,8256=>723,8257=>225,8258=>900,8259=>450,8260=>150,8261=>351,8262=>351,8263=>830,8264=>659,
-8265=>659,8266=>447,8267=>572,8268=>450,8269=>450,8270=>450,8271=>303,8272=>723,8273=>450,8274=>404,
-8275=>900,8276=>723,8277=>754,8278=>527,8279=>597,8280=>754,8281=>754,8282=>286,8283=>717,8284=>754,
-8285=>286,8286=>286,8287=>200,8288=>0,8289=>0,8290=>0,8291=>0,8292=>0,8298=>0,8299=>0,
-8300=>0,8301=>0,8302=>0,8303=>0,8304=>360,8305=>161,8308=>360,8309=>360,8310=>360,8311=>360,
-8312=>360,8313=>360,8314=>475,8315=>475,8316=>475,8317=>221,8318=>221,8319=>358,8320=>360,8321=>360,
-8322=>360,8323=>360,8324=>360,8325=>360,8326=>360,8327=>360,8328=>360,8329=>360,8330=>475,8331=>475,
-8332=>475,8333=>221,8334=>221,8336=>352,8337=>375,8338=>372,8339=>399,8340=>375,8352=>789,8353=>572,
-8354=>572,8355=>572,8356=>572,8357=>876,8358=>673,8359=>1145,8360=>966,8361=>890,8362=>706,8363=>571,
-8365=>572,8366=>572,8367=>1145,8368=>572,8369=>572,8370=>572,8371=>572,8372=>696,8373=>577,8400=>0,
-8401=>0,8406=>0,8407=>0,8411=>0,8412=>0,8417=>0,8448=>917,8449=>917,8450=>628,8451=>1011,
-8452=>578,8453=>917,8454=>960,8455=>553,8456=>628,8457=>856,8459=>889,8460=>679,8461=>765,8462=>570,
-8463=>570,8464=>422,8465=>627,8466=>648,8467=>372,8468=>736,8469=>721,8470=>936,8471=>900,8472=>627,
-8473=>631,8474=>708,8475=>718,8476=>732,8477=>712,8478=>807,8479=>615,8480=>917,8481=>967,8483=>615,
-8484=>670,8485=>520,8486=>688,8487=>688,8488=>554,8489=>304,8490=>590,8491=>615,8492=>708,8493=>633,
-8494=>769,8495=>532,8496=>545,8497=>708,8498=>518,8499=>962,8500=>416,8501=>670,8502=>606,8503=>419,
-8504=>580,8505=>342,8506=>833,8507=>1074,8508=>632,8509=>655,8510=>589,8511=>764,8512=>729,8513=>697,
-8514=>501,8515=>501,8516=>549,8517=>737,8518=>637,8519=>554,8520=>316,8521=>316,8523=>702,8526=>474,
-8531=>872,8532=>872,8533=>872,8534=>872,8535=>872,8536=>872,8537=>872,8538=>872,8539=>872,8540=>872,
-8541=>872,8542=>872,8543=>511,8544=>265,8545=>443,8546=>620,8547=>831,8548=>615,8549=>830,8550=>1007,
-8551=>1185,8552=>826,8553=>616,8554=>839,8555=>1018,8556=>501,8557=>628,8558=>693,8559=>776,8560=>250,
-8561=>412,8562=>573,8563=>730,8564=>532,8565=>729,8566=>892,8567=>1053,8568=>737,8569=>532,8570=>740,
-8571=>901,8572=>250,8573=>495,8574=>571,8575=>876,8576=>1121,8577=>693,8578=>1121,8579=>633,8580=>494,
-8592=>754,8593=>754,8594=>754,8595=>754,8596=>754,8597=>754,8598=>754,8599=>754,8600=>754,8601=>754,
-8602=>754,8603=>754,8604=>754,8605=>754,8606=>754,8607=>754,8608=>754,8609=>754,8610=>754,8611=>754,
-8612=>754,8613=>754,8614=>754,8615=>754,8616=>754,8617=>754,8618=>754,8619=>754,8620=>754,8621=>754,
-8622=>754,8623=>754,8624=>754,8625=>754,8626=>754,8627=>754,8628=>754,8629=>754,8630=>754,8631=>754,
-8632=>754,8633=>754,8634=>754,8635=>754,8636=>754,8637=>754,8638=>754,8639=>754,8640=>754,8641=>754,
-8642=>754,8643=>754,8644=>754,8645=>754,8646=>754,8647=>754,8648=>754,8649=>754,8650=>754,8651=>754,
-8652=>754,8653=>754,8654=>754,8655=>754,8656=>754,8657=>754,8658=>754,8659=>754,8660=>754,8661=>754,
-8662=>754,8663=>754,8664=>754,8665=>754,8666=>754,8667=>754,8668=>754,8669=>754,8670=>754,8671=>754,
-8672=>754,8673=>754,8674=>754,8675=>754,8676=>754,8677=>754,8678=>754,8679=>754,8680=>754,8681=>754,
-8682=>754,8683=>754,8684=>754,8685=>754,8686=>754,8687=>754,8688=>754,8689=>754,8690=>754,8691=>754,
-8692=>754,8693=>754,8694=>754,8695=>754,8696=>754,8697=>754,8698=>754,8699=>754,8700=>754,8701=>754,
-8702=>754,8703=>754,8704=>615,8705=>572,8706=>465,8707=>568,8708=>568,8709=>784,8710=>602,8711=>602,
-8712=>784,8713=>784,8714=>646,8715=>784,8716=>784,8717=>646,8718=>572,8719=>681,8720=>681,8721=>606,
-8722=>754,8723=>754,8724=>754,8725=>303,8726=>573,8727=>754,8728=>563,8729=>563,8730=>573,8731=>573,
-8732=>573,8733=>643,8734=>750,8735=>754,8736=>807,8737=>807,8738=>754,8739=>450,8740=>450,8741=>450,
-8742=>450,8743=>659,8744=>659,8745=>659,8746=>659,8747=>469,8748=>710,8749=>951,8750=>469,8751=>710,
-8752=>951,8753=>469,8754=>469,8755=>469,8756=>572,8757=>572,8758=>234,8759=>572,8760=>754,8761=>754,
-8762=>754,8763=>754,8764=>754,8765=>754,8766=>754,8767=>754,8768=>337,8769=>754,8770=>754,8771=>754,
-8772=>754,8773=>754,8774=>754,8775=>754,8776=>754,8777=>754,8778=>754,8779=>754,8780=>754,8781=>754,
-8782=>754,8783=>754,8784=>754,8785=>754,8786=>755,8787=>755,8788=>900,8789=>900,8790=>754,8791=>754,
-8792=>754,8793=>754,8794=>754,8795=>754,8796=>754,8797=>754,8798=>754,8799=>754,8800=>754,8801=>754,
-8802=>754,8803=>754,8804=>754,8805=>754,8806=>754,8807=>754,8808=>754,8809=>754,8810=>942,8811=>942,
-8812=>417,8813=>754,8814=>754,8815=>754,8816=>754,8817=>754,8818=>754,8819=>754,8820=>754,8821=>754,
-8822=>754,8823=>754,8824=>754,8825=>754,8826=>754,8827=>754,8828=>754,8829=>754,8830=>754,8831=>754,
-8832=>754,8833=>754,8834=>754,8835=>754,8836=>754,8837=>754,8838=>754,8839=>754,8840=>754,8841=>754,
-8842=>754,8843=>754,8844=>659,8845=>659,8846=>659,8847=>754,8848=>754,8849=>754,8850=>754,8851=>702,
-8852=>702,8853=>754,8854=>754,8855=>754,8856=>754,8857=>754,8858=>754,8859=>754,8860=>754,8861=>754,
-8862=>754,8863=>754,8864=>754,8865=>754,8866=>784,8867=>784,8868=>784,8869=>784,8870=>468,8871=>468,
-8872=>784,8873=>784,8874=>784,8875=>784,8876=>784,8877=>784,8878=>784,8879=>784,8880=>754,8881=>754,
-8882=>754,8883=>754,8884=>754,8885=>754,8886=>900,8887=>900,8888=>754,8889=>754,8890=>468,8891=>659,
-8892=>659,8893=>659,8894=>754,8895=>754,8896=>738,8897=>738,8898=>738,8899=>738,8900=>444,8901=>286,
-8902=>563,8903=>754,8904=>900,8905=>900,8906=>900,8907=>900,8908=>900,8909=>754,8910=>659,8911=>659,
-8912=>754,8913=>754,8914=>754,8915=>754,8916=>754,8917=>754,8918=>754,8919=>754,8920=>1280,8921=>1280,
-8922=>754,8923=>754,8924=>754,8925=>754,8926=>754,8927=>754,8928=>754,8929=>754,8930=>754,8931=>754,
-8932=>754,8933=>754,8934=>754,8935=>754,8936=>754,8937=>754,8938=>754,8939=>754,8940=>754,8941=>754,
-8942=>900,8943=>900,8944=>900,8945=>900,8946=>900,8947=>784,8948=>646,8949=>784,8950=>784,8951=>646,
-8952=>784,8953=>784,8954=>900,8955=>784,8956=>646,8957=>784,8958=>646,8959=>784,8960=>542,8961=>542,
-8962=>571,8963=>754,8964=>754,8965=>754,8966=>754,8967=>439,8968=>351,8969=>351,8970=>351,8971=>351,
-8972=>728,8973=>728,8974=>728,8975=>728,8976=>754,8977=>461,8984=>900,8985=>754,8988=>422,8989=>422,
-8990=>422,8991=>422,8992=>469,8993=>469,8996=>1037,8997=>1037,8998=>1272,8999=>1037,9000=>1299,9003=>1272,
-9004=>786,9075=>304,9076=>571,9077=>753,9082=>593,9085=>681,9095=>1037,9108=>786,9115=>450,9116=>450,
-9117=>450,9118=>450,9119=>450,9120=>450,9121=>450,9122=>450,9123=>450,9124=>450,9125=>450,9126=>450,
-9127=>675,9128=>675,9129=>675,9130=>675,9131=>675,9132=>675,9133=>675,9134=>469,9166=>754,9167=>850,
-9187=>786,9189=>692,9250=>571,9251=>571,9312=>807,9313=>807,9314=>807,9315=>807,9316=>807,9317=>807,
-9318=>807,9319=>807,9320=>807,9321=>807,9472=>542,9473=>542,9474=>542,9475=>542,9476=>542,9477=>542,
-9478=>542,9479=>542,9480=>542,9481=>542,9482=>542,9483=>542,9484=>542,9485=>542,9486=>542,9487=>542,
-9488=>542,9489=>542,9490=>542,9491=>542,9492=>542,9493=>542,9494=>542,9495=>542,9496=>542,9497=>542,
-9498=>542,9499=>542,9500=>542,9501=>542,9502=>542,9503=>542,9504=>542,9505=>542,9506=>542,9507=>542,
-9508=>542,9509=>542,9510=>542,9511=>542,9512=>542,9513=>542,9514=>542,9515=>542,9516=>542,9517=>542,
-9518=>542,9519=>542,9520=>542,9521=>542,9522=>542,9523=>542,9524=>542,9525=>542,9526=>542,9527=>542,
-9528=>542,9529=>542,9530=>542,9531=>542,9532=>542,9533=>542,9534=>542,9535=>542,9536=>542,9537=>542,
-9538=>542,9539=>542,9540=>542,9541=>542,9542=>542,9543=>542,9544=>542,9545=>542,9546=>542,9547=>542,
-9548=>542,9549=>542,9550=>542,9551=>542,9552=>542,9553=>542,9554=>542,9555=>542,9556=>542,9557=>542,
-9558=>542,9559=>542,9560=>542,9561=>542,9562=>542,9563=>542,9564=>542,9565=>542,9566=>542,9567=>542,
-9568=>542,9569=>542,9570=>542,9571=>542,9572=>542,9573=>542,9574=>542,9575=>542,9576=>542,9577=>542,
-9578=>542,9579=>542,9580=>542,9581=>542,9582=>542,9583=>542,9584=>542,9585=>542,9586=>542,9587=>542,
-9588=>542,9589=>542,9590=>542,9591=>542,9592=>542,9593=>542,9594=>542,9595=>542,9596=>542,9597=>542,
-9598=>542,9599=>542,9600=>692,9601=>692,9602=>692,9603=>692,9604=>692,9605=>692,9606=>692,9607=>692,
-9608=>692,9609=>692,9610=>692,9611=>692,9612=>692,9613=>692,9614=>692,9615=>692,9616=>692,9617=>692,
-9618=>692,9619=>692,9620=>692,9621=>692,9622=>692,9623=>692,9624=>692,9625=>692,9626=>692,9627=>692,
-9628=>692,9629=>692,9630=>692,9631=>692,9632=>850,9633=>850,9634=>850,9635=>850,9636=>850,9637=>850,
-9638=>850,9639=>850,9640=>850,9641=>850,9642=>610,9643=>610,9644=>850,9645=>850,9646=>495,9647=>495,
-9648=>692,9649=>692,9650=>692,9651=>692,9652=>452,9653=>452,9654=>692,9655=>692,9656=>452,9657=>452,
-9658=>692,9659=>692,9660=>692,9661=>692,9662=>452,9663=>452,9664=>692,9665=>692,9666=>452,9667=>452,
-9668=>692,9669=>692,9670=>692,9671=>692,9672=>692,9673=>785,9674=>444,9675=>785,9676=>785,9677=>785,
-9678=>785,9679=>785,9680=>785,9681=>785,9682=>785,9683=>785,9684=>785,9685=>785,9686=>474,9687=>474,
-9688=>712,9689=>873,9690=>873,9691=>873,9692=>348,9693=>348,9694=>348,9695=>348,9696=>785,9697=>785,
-9698=>692,9699=>692,9700=>692,9701=>692,9702=>531,9703=>850,9704=>850,9705=>850,9706=>850,9707=>850,
-9708=>692,9709=>692,9710=>692,9711=>1007,9712=>850,9713=>850,9714=>850,9715=>850,9716=>785,9717=>785,
-9718=>785,9719=>785,9720=>692,9721=>692,9722=>692,9723=>747,9724=>747,9725=>659,9726=>659,9727=>692,
-9728=>807,9729=>900,9730=>807,9731=>807,9732=>807,9733=>807,9734=>807,9735=>515,9736=>806,9737=>807,
-9738=>799,9739=>799,9740=>604,9741=>911,9742=>1121,9743=>1125,9744=>807,9745=>807,9746=>807,9747=>479,
-9748=>807,9749=>807,9750=>807,9751=>807,9752=>807,9753=>807,9754=>807,9755=>807,9756=>807,9757=>548,
-9758=>807,9759=>548,9760=>807,9761=>807,9762=>807,9763=>807,9764=>602,9765=>671,9766=>584,9767=>705,
-9768=>490,9769=>807,9770=>807,9771=>807,9772=>639,9773=>807,9774=>807,9775=>807,9776=>807,9777=>807,
-9778=>807,9779=>807,9780=>807,9781=>807,9782=>807,9783=>807,9784=>807,9785=>807,9786=>807,9787=>807,
-9788=>807,9789=>807,9790=>807,9791=>552,9792=>658,9793=>658,9794=>807,9795=>807,9796=>807,9797=>807,
-9798=>807,9799=>807,9800=>807,9801=>807,9802=>807,9803=>807,9804=>807,9805=>807,9806=>807,9807=>807,
-9808=>807,9809=>807,9810=>807,9811=>807,9812=>807,9813=>807,9814=>807,9815=>807,9816=>807,9817=>807,
-9818=>807,9819=>807,9820=>807,9821=>807,9822=>807,9823=>807,9824=>807,9825=>807,9826=>807,9827=>807,
-9828=>807,9829=>807,9830=>807,9831=>807,9832=>807,9833=>424,9834=>574,9835=>807,9836=>807,9837=>424,
-9838=>321,9839=>435,9840=>673,9841=>689,9842=>807,9843=>807,9844=>807,9845=>807,9846=>807,9847=>807,
-9848=>807,9849=>807,9850=>807,9851=>807,9852=>807,9853=>807,9854=>807,9855=>807,9856=>782,9857=>782,
-9858=>782,9859=>782,9860=>782,9861=>782,9862=>807,9863=>807,9864=>807,9865=>807,9866=>807,9867=>807,
-9868=>807,9869=>807,9870=>807,9871=>807,9872=>807,9873=>807,9874=>807,9875=>807,9876=>807,9877=>487,
-9878=>807,9879=>807,9880=>807,9881=>807,9882=>807,9883=>807,9884=>807,9888=>807,9889=>632,9890=>903,
-9891=>977,9892=>1028,9893=>811,9894=>754,9895=>754,9896=>754,9897=>754,9898=>754,9899=>754,9900=>754,
-9901=>754,9902=>754,9903=>754,9904=>759,9905=>754,9906=>658,9907=>659,9908=>659,9909=>659,9910=>765,
-9911=>659,9912=>659,9985=>754,9986=>754,9987=>754,9988=>754,9990=>754,9991=>754,9992=>754,9993=>754,
-9996=>754,9997=>754,9998=>754,9999=>754,10000=>754,10001=>754,10002=>754,10003=>754,10004=>754,10005=>754,
-10006=>754,10007=>754,10008=>754,10009=>754,10010=>754,10011=>754,10012=>754,10013=>754,10014=>754,10015=>754,
-10016=>754,10017=>754,10018=>754,10019=>754,10020=>754,10021=>754,10022=>754,10023=>754,10025=>754,10026=>754,
-10027=>754,10028=>754,10029=>754,10030=>754,10031=>754,10032=>754,10033=>754,10034=>754,10035=>754,10036=>754,
-10037=>754,10038=>754,10039=>754,10040=>754,10041=>754,10042=>754,10043=>754,10044=>754,10045=>754,10046=>754,
-10047=>754,10048=>754,10049=>754,10050=>754,10051=>754,10052=>754,10053=>754,10054=>754,10055=>754,10056=>754,
-10057=>754,10058=>754,10059=>754,10061=>807,10063=>807,10064=>807,10065=>807,10066=>807,10070=>807,10072=>754,
-10073=>754,10074=>754,10075=>290,10076=>290,10077=>484,10078=>484,10081=>754,10082=>754,10083=>754,10084=>754,
-10085=>754,10086=>754,10087=>754,10088=>754,10089=>754,10090=>754,10091=>754,10092=>754,10093=>754,10094=>754,
-10095=>754,10096=>754,10097=>754,10098=>754,10099=>754,10100=>754,10101=>754,10102=>807,10103=>807,10104=>807,
-10105=>807,10106=>807,10107=>807,10108=>807,10109=>807,10110=>807,10111=>807,10112=>754,10113=>754,10114=>754,
-10115=>754,10116=>754,10117=>754,10118=>754,10119=>754,10120=>754,10121=>754,10122=>754,10123=>754,10124=>754,
-10125=>754,10126=>754,10127=>754,10128=>754,10129=>754,10130=>754,10131=>754,10132=>754,10136=>754,10137=>754,
-10138=>754,10139=>754,10140=>754,10141=>754,10142=>754,10143=>754,10144=>754,10145=>754,10146=>754,10147=>754,
-10148=>754,10149=>754,10150=>754,10151=>754,10152=>754,10153=>754,10154=>754,10155=>754,10156=>754,10157=>754,
-10158=>754,10159=>754,10161=>754,10162=>754,10163=>754,10164=>754,10165=>754,10166=>754,10167=>754,10168=>754,
-10169=>754,10170=>754,10171=>754,10172=>754,10173=>754,10174=>754,10181=>351,10182=>351,10208=>444,10214=>445,
-10215=>445,10216=>351,10217=>351,10218=>500,10219=>500,10224=>754,10225=>754,10226=>754,10227=>754,10228=>1042,
-10229=>1290,10230=>1290,10231=>1290,10232=>1290,10233=>1290,10234=>1290,10235=>1290,10236=>1290,10237=>1290,10238=>1290,
-10239=>1290,10240=>659,10241=>659,10242=>659,10243=>659,10244=>659,10245=>659,10246=>659,10247=>659,10248=>659,
-10249=>659,10250=>659,10251=>659,10252=>659,10253=>659,10254=>659,10255=>659,10256=>659,10257=>659,10258=>659,
-10259=>659,10260=>659,10261=>659,10262=>659,10263=>659,10264=>659,10265=>659,10266=>659,10267=>659,10268=>659,
-10269=>659,10270=>659,10271=>659,10272=>659,10273=>659,10274=>659,10275=>659,10276=>659,10277=>659,10278=>659,
-10279=>659,10280=>659,10281=>659,10282=>659,10283=>659,10284=>659,10285=>659,10286=>659,10287=>659,10288=>659,
-10289=>659,10290=>659,10291=>659,10292=>659,10293=>659,10294=>659,10295=>659,10296=>659,10297=>659,10298=>659,
-10299=>659,10300=>659,10301=>659,10302=>659,10303=>659,10304=>659,10305=>659,10306=>659,10307=>659,10308=>659,
-10309=>659,10310=>659,10311=>659,10312=>659,10313=>659,10314=>659,10315=>659,10316=>659,10317=>659,10318=>659,
-10319=>659,10320=>659,10321=>659,10322=>659,10323=>659,10324=>659,10325=>659,10326=>659,10327=>659,10328=>659,
-10329=>659,10330=>659,10331=>659,10332=>659,10333=>659,10334=>659,10335=>659,10336=>659,10337=>659,10338=>659,
-10339=>659,10340=>659,10341=>659,10342=>659,10343=>659,10344=>659,10345=>659,10346=>659,10347=>659,10348=>659,
-10349=>659,10350=>659,10351=>659,10352=>659,10353=>659,10354=>659,10355=>659,10356=>659,10357=>659,10358=>659,
-10359=>659,10360=>659,10361=>659,10362=>659,10363=>659,10364=>659,10365=>659,10366=>659,10367=>659,10368=>659,
-10369=>659,10370=>659,10371=>659,10372=>659,10373=>659,10374=>659,10375=>659,10376=>659,10377=>659,10378=>659,
-10379=>659,10380=>659,10381=>659,10382=>659,10383=>659,10384=>659,10385=>659,10386=>659,10387=>659,10388=>659,
-10389=>659,10390=>659,10391=>659,10392=>659,10393=>659,10394=>659,10395=>659,10396=>659,10397=>659,10398=>659,
-10399=>659,10400=>659,10401=>659,10402=>659,10403=>659,10404=>659,10405=>659,10406=>659,10407=>659,10408=>659,
-10409=>659,10410=>659,10411=>659,10412=>659,10413=>659,10414=>659,10415=>659,10416=>659,10417=>659,10418=>659,
-10419=>659,10420=>659,10421=>659,10422=>659,10423=>659,10424=>659,10425=>659,10426=>659,10427=>659,10428=>659,
-10429=>659,10430=>659,10431=>659,10432=>659,10433=>659,10434=>659,10435=>659,10436=>659,10437=>659,10438=>659,
-10439=>659,10440=>659,10441=>659,10442=>659,10443=>659,10444=>659,10445=>659,10446=>659,10447=>659,10448=>659,
-10449=>659,10450=>659,10451=>659,10452=>659,10453=>659,10454=>659,10455=>659,10456=>659,10457=>659,10458=>659,
-10459=>659,10460=>659,10461=>659,10462=>659,10463=>659,10464=>659,10465=>659,10466=>659,10467=>659,10468=>659,
-10469=>659,10470=>659,10471=>659,10472=>659,10473=>659,10474=>659,10475=>659,10476=>659,10477=>659,10478=>659,
-10479=>659,10480=>659,10481=>659,10482=>659,10483=>659,10484=>659,10485=>659,10486=>659,10487=>659,10488=>659,
-10489=>659,10490=>659,10491=>659,10492=>659,10493=>659,10494=>659,10495=>659,10502=>754,10503=>754,10506=>754,
-10507=>754,10560=>615,10561=>615,10627=>660,10628=>660,10702=>754,10703=>900,10704=>900,10705=>900,10706=>900,
-10707=>900,10708=>900,10709=>900,10731=>444,10746=>754,10747=>754,10752=>900,10753=>900,10754=>900,10764=>1192,
-10765=>469,10766=>469,10767=>469,10768=>469,10769=>469,10770=>469,10771=>469,10772=>469,10773=>469,10774=>469,
-10775=>469,10776=>469,10777=>469,10778=>469,10779=>469,10780=>469,10799=>754,10877=>754,10878=>754,10879=>754,
-10880=>754,10881=>754,10882=>754,10883=>754,10884=>754,10885=>754,10886=>754,10887=>754,10888=>754,10889=>754,
-10890=>754,10891=>754,10892=>754,10893=>754,10894=>754,10895=>754,10896=>754,10897=>754,10898=>754,10899=>754,
-10900=>754,10901=>754,10902=>754,10903=>754,10904=>754,10905=>754,10906=>754,10907=>754,10908=>754,10909=>754,
-10910=>754,10911=>754,10912=>754,10926=>754,10927=>754,10928=>754,10929=>754,10930=>754,10931=>754,10932=>754,
-10933=>754,10934=>754,10935=>754,10936=>754,10937=>754,10938=>754,11001=>754,11002=>754,11008=>754,11009=>754,
-11010=>754,11011=>754,11012=>754,11013=>754,11014=>754,11015=>754,11016=>754,11017=>754,11018=>754,11019=>754,
-11020=>754,11021=>754,11022=>752,11023=>752,11024=>752,11025=>752,11026=>850,11027=>850,11028=>850,11029=>850,
-11030=>692,11031=>692,11032=>692,11033=>692,11034=>850,11039=>782,11040=>782,11041=>786,11042=>786,11043=>786,
-11044=>1007,11091=>782,11092=>782,11360=>501,11361=>250,11362=>501,11363=>542,11364=>625,11365=>551,11366=>353,
-11367=>677,11368=>570,11369=>590,11370=>521,11371=>616,11372=>472,11373=>703,11374=>776,11375=>615,11377=>661,
-11378=>1015,11379=>865,11380=>532,11381=>589,11382=>511,11383=>593,11385=>373,11386=>550,11387=>441,11388=>157,
-11389=>387,11568=>582,11569=>799,11570=>799,11571=>614,11572=>615,11573=>571,11574=>505,11575=>615,11576=>615,
-11577=>568,11578=>568,11579=>614,11580=>787,11581=>616,11582=>441,11583=>616,11584=>799,11585=>799,11586=>270,
-11587=>564,11588=>677,11589=>590,11590=>475,11591=>616,11592=>580,11593=>568,11594=>452,11595=>857,11596=>700,
-11597=>673,11598=>558,11599=>265,11600=>700,11601=>265,11602=>677,11603=>569,11604=>799,11605=>799,11606=>677,
-11607=>288,11608=>674,11609=>799,11610=>799,11611=>628,11612=>690,11613=>616,11614=>628,11615=>560,11616=>615,
-11617=>677,11618=>568,11619=>709,11620=>510,11621=>709,11631=>463,11800=>478,11810=>351,11811=>351,11812=>351,
-11813=>351,11822=>478,19904=>807,19905=>807,19906=>807,19907=>807,19908=>807,19909=>807,19910=>807,19911=>807,
-19912=>807,19913=>807,19914=>807,19915=>807,19916=>807,19917=>807,19918=>807,19919=>807,19920=>807,19921=>807,
-19922=>807,19923=>807,19924=>807,19925=>807,19926=>807,19927=>807,19928=>807,19929=>807,19930=>807,19931=>807,
-19932=>807,19933=>807,19934=>807,19935=>807,19936=>807,19937=>807,19938=>807,19939=>807,19940=>807,19941=>807,
-19942=>807,19943=>807,19944=>807,19945=>807,19946=>807,19947=>807,19948=>807,19949=>807,19950=>807,19951=>807,
-19952=>807,19953=>807,19954=>807,19955=>807,19956=>807,19957=>807,19958=>807,19959=>807,19960=>807,19961=>807,
-19962=>807,19963=>807,19964=>807,19965=>807,19966=>807,19967=>807,42564=>571,42565=>469,42566=>318,42567=>304,
-42572=>1062,42573=>925,42576=>926,42577=>815,42580=>971,42581=>757,42582=>879,42583=>758,42594=>956,42595=>820,
-42596=>959,42597=>811,42598=>1060,42599=>907,42600=>708,42601=>550,42602=>770,42603=>641,42604=>1222,42605=>917,
-42606=>791,42634=>704,42635=>616,42636=>549,42637=>524,42644=>617,42645=>570,42760=>444,42761=>444,42762=>444,
-42763=>444,42764=>444,42765=>444,42766=>444,42767=>444,42768=>444,42769=>444,42770=>444,42771=>444,42772=>444,
-42773=>444,42774=>444,42779=>332,42780=>332,42781=>227,42782=>227,42783=>227,42790=>677,42791=>570,42792=>790,
-42793=>638,42794=>553,42795=>486,42800=>441,42801=>469,42802=>1125,42803=>886,42804=>1083,42805=>891,42806=>1028,
-42807=>883,42808=>874,42809=>736,42810=>874,42811=>736,42812=>863,42813=>736,42814=>633,42815=>494,42822=>612,
-42823=>353,42824=>523,42825=>384,42826=>726,42827=>633,42830=>1222,42831=>917,42880=>501,42881=>250,42882=>662,
-42883=>570,42889=>303,42890=>338,42891=>360,42892=>247,43003=>518,43004=>542,43005=>776,43006=>265,43007=>1079,
-61440=>879,61441=>879,63173=>550,64256=>620,64257=>567,64258=>567,64259=>870,64260=>870,64261=>617,64262=>774,
-64275=>1081,64276=>1081,64277=>1076,64278=>1067,64279=>1376,64285=>245,64286=>0,64287=>423,64288=>572,64289=>770,
-64290=>696,64291=>815,64292=>694,64293=>759,64294=>769,64295=>726,64296=>788,64297=>754,64298=>727,64299=>727,
-64300=>727,64301=>727,64302=>566,64303=>566,64304=>566,64305=>547,64306=>403,64307=>534,64308=>576,64309=>245,
-64310=>336,64312=>583,64313=>302,64314=>532,64315=>500,64316=>539,64318=>593,64320=>397,64321=>629,64323=>576,
-64324=>543,64326=>523,64327=>596,64328=>532,64329=>727,64330=>591,64331=>245,64332=>547,64333=>500,64334=>543,
-64335=>566,64338=>847,64339=>883,64340=>250,64341=>271,64342=>847,64343=>883,64344=>250,64345=>271,64346=>847,
-64347=>883,64348=>250,64349=>271,64350=>847,64351=>883,64352=>250,64353=>271,64354=>847,64355=>883,64356=>250,
-64357=>271,64358=>847,64359=>883,64360=>250,64361=>271,64362=>933,64363=>932,64364=>430,64365=>455,64366=>933,
-64367=>932,64368=>430,64369=>455,64370=>581,64371=>581,64372=>556,64373=>581,64374=>581,64375=>581,64376=>556,
-64377=>581,64378=>581,64379=>581,64380=>556,64381=>581,64382=>581,64383=>581,64384=>556,64385=>581,64394=>435,
-64395=>497,64396=>435,64397=>497,64398=>805,64399=>805,64400=>428,64401=>497,64402=>805,64403=>805,64404=>428,
-64405=>497,64414=>661,64415=>685,64473=>435,64474=>465,64488=>250,64489=>271,64508=>704,64509=>750,64510=>250,
-64511=>271,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,65056=>0,65057=>0,65058=>0,
-65059=>0,65136=>264,65137=>264,65138=>264,65139=>235,65140=>264,65142=>264,65143=>264,65144=>264,65145=>264,
-65146=>264,65147=>264,65148=>264,65149=>264,65150=>264,65151=>264,65152=>423,65153=>250,65154=>274,65155=>250,
-65156=>274,65157=>435,65158=>465,65159=>250,65160=>274,65161=>704,65162=>750,65163=>250,65164=>271,65165=>250,
-65166=>274,65167=>847,65168=>883,65169=>250,65170=>271,65171=>471,65172=>482,65173=>847,65174=>883,65175=>250,
-65176=>271,65177=>847,65178=>883,65179=>250,65180=>271,65181=>581,65182=>581,65183=>556,65184=>581,65185=>581,
-65186=>581,65187=>556,65188=>581,65189=>581,65190=>581,65191=>556,65192=>581,65193=>400,65194=>472,65195=>400,
-65196=>472,65197=>435,65198=>497,65199=>435,65200=>497,65201=>1099,65202=>1147,65203=>754,65204=>803,65205=>1099,
-65206=>1147,65207=>754,65208=>803,65209=>1088,65210=>1103,65211=>764,65212=>780,65213=>1088,65214=>1103,65215=>764,
-65216=>780,65217=>832,65218=>854,65219=>716,65220=>738,65221=>832,65222=>854,65223=>716,65224=>738,65225=>537,
-65226=>479,65227=>537,65228=>434,65229=>537,65230=>479,65231=>470,65232=>434,65233=>933,65234=>932,65235=>430,
-65236=>455,65237=>698,65238=>750,65239=>430,65240=>455,65241=>742,65242=>758,65243=>428,65244=>497,65245=>654,
-65246=>681,65247=>274,65248=>298,65249=>557,65250=>599,65251=>482,65252=>520,65253=>661,65254=>685,65255=>250,
-65256=>271,65257=>471,65258=>482,65259=>475,65260=>415,65261=>435,65262=>465,65263=>704,65264=>750,65265=>704,
-65266=>750,65267=>250,65268=>271,65269=>513,65270=>537,65271=>513,65272=>537,65273=>513,65274=>537,65275=>513,
-65276=>537,65279=>0,65529=>0,65530=>0,65531=>0,65532=>0,65533=>923);
-$enc='';
-$diff='';
-$file='dejavusanscondensed.z';
-$ctg='dejavusanscondensed.ctg.z';
-$originalsize=544636;
-?>
\ No newline at end of file
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusanscondensed.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusanscondensed.z
deleted file mode 100644
index 8198081c..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusanscondensed.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusanscondensedb.ctg.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusanscondensedb.ctg.z
deleted file mode 100644
index 514062cc..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusanscondensedb.ctg.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusanscondensedb.php b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusanscondensedb.php
deleted file mode 100644
index 2c16cab5..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusanscondensedb.php
+++ /dev/null
@@ -1,504 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='DejaVuSansCondensed-Bold';
-$desc=array('Ascent'=>928,'Descent'=>-236,'CapHeight'=>17,'Flags'=>32,'FontBBox'=>'[-962 -385 1777 1174]','ItalicAngle'=>0,'StemV'=>120,'MissingWidth'=>540);
-$up=-63;
-$ut=44;
-$dw=540;
-$cw=array(
-0=>540,32=>313,33=>410,34=>469,35=>754,36=>626,37=>901,38=>785,39=>275,40=>411,
-41=>411,42=>470,43=>754,44=>342,45=>374,46=>342,47=>329,48=>626,49=>626,50=>626,
-51=>626,52=>626,53=>626,54=>626,55=>626,56=>626,57=>626,58=>360,59=>360,60=>754,
-61=>754,62=>754,63=>522,64=>900,65=>696,66=>686,67=>660,68=>747,69=>615,70=>615,
-71=>738,72=>753,73=>334,74=>334,75=>697,76=>573,77=>896,78=>753,79=>765,80=>659,
-81=>765,82=>693,83=>648,84=>614,85=>730,86=>696,87=>993,88=>694,89=>651,90=>652,
-91=>411,92=>329,93=>411,94=>754,95=>450,96=>450,97=>607,98=>644,99=>533,100=>644,
-101=>610,102=>391,103=>644,104=>641,105=>308,106=>308,107=>598,108=>308,109=>938,110=>641,
-111=>618,112=>644,113=>644,114=>444,115=>536,116=>430,117=>641,118=>586,119=>831,120=>580,
-121=>586,122=>523,123=>641,124=>329,125=>641,126=>754,8364=>626,8218=>342,402=>391,8222=>591,
-8230=>900,8224=>450,8225=>450,710=>450,8240=>1296,352=>648,8249=>371,338=>1050,381=>652,8216=>342,
-8217=>342,8220=>591,8221=>591,8226=>575,8211=>450,8212=>900,732=>450,8482=>900,353=>536,8250=>371,
-339=>984,382=>523,376=>651,160=>313,161=>410,162=>626,163=>626,164=>572,165=>626,166=>329,
-167=>450,168=>450,169=>900,170=>507,171=>581,172=>754,173=>374,174=>900,175=>450,176=>450,
-177=>754,178=>394,179=>394,180=>450,181=>662,182=>572,183=>342,184=>450,185=>394,186=>507,
-187=>581,188=>932,189=>932,190=>932,191=>522,192=>696,193=>696,194=>696,195=>696,196=>696,
-197=>696,198=>976,199=>660,200=>615,201=>615,202=>615,203=>615,204=>334,205=>334,206=>334,
-207=>334,208=>754,209=>753,210=>765,211=>765,212=>765,213=>765,214=>765,215=>754,216=>765,
-217=>730,218=>730,219=>730,220=>730,221=>651,222=>664,223=>647,224=>607,225=>607,226=>607,
-227=>607,228=>607,229=>607,230=>943,231=>533,232=>610,233=>610,234=>610,235=>610,236=>308,
-237=>308,238=>308,239=>308,240=>618,241=>641,242=>618,243=>618,244=>618,245=>618,246=>618,
-247=>754,248=>618,249=>641,250=>641,251=>641,252=>641,253=>586,254=>644,255=>586,256=>696,
-257=>607,258=>696,259=>607,260=>696,261=>607,262=>660,263=>533,264=>660,265=>533,266=>660,
-267=>533,268=>660,269=>533,270=>747,271=>644,272=>754,273=>644,274=>615,275=>610,276=>615,
-277=>610,278=>615,279=>610,280=>615,281=>610,282=>615,283=>610,284=>738,285=>644,286=>738,
-287=>644,288=>738,289=>644,290=>738,291=>644,292=>753,293=>641,294=>876,295=>711,296=>334,
-297=>308,298=>334,299=>308,300=>334,301=>308,302=>334,303=>308,304=>334,305=>308,306=>669,
-307=>617,308=>334,309=>308,310=>697,311=>598,312=>598,313=>573,314=>308,315=>573,316=>308,
-317=>573,318=>431,319=>573,320=>501,321=>578,322=>334,323=>753,324=>641,325=>753,326=>641,
-327=>753,328=>641,329=>884,330=>753,331=>641,332=>765,333=>618,334=>765,335=>618,336=>765,
-337=>618,340=>693,341=>444,342=>693,343=>444,344=>693,345=>444,346=>648,347=>536,348=>648,
-349=>536,350=>648,351=>536,354=>614,355=>430,356=>614,357=>430,358=>614,359=>430,360=>730,
-361=>641,362=>730,363=>641,364=>730,365=>641,366=>730,367=>641,368=>730,369=>641,370=>730,
-371=>641,372=>993,373=>831,374=>651,375=>586,377=>652,378=>523,379=>652,380=>523,383=>391,
-384=>644,385=>729,386=>686,387=>644,388=>686,389=>644,390=>660,391=>660,392=>533,393=>754,
-394=>791,395=>681,396=>644,397=>619,398=>615,399=>764,400=>626,401=>615,403=>738,404=>713,
-405=>940,406=>392,407=>350,408=>697,409=>598,410=>324,411=>532,412=>938,413=>753,414=>641,
-415=>765,416=>786,417=>618,418=>974,419=>821,420=>703,421=>644,422=>693,423=>648,424=>536,
-425=>615,426=>497,427=>430,428=>636,429=>430,430=>614,431=>751,432=>641,433=>765,434=>732,
-435=>717,436=>700,437=>652,438=>523,439=>695,440=>695,441=>576,442=>523,443=>626,444=>695,
-445=>576,446=>515,447=>644,448=>334,449=>593,450=>489,451=>334,452=>1399,453=>1271,454=>1168,
-455=>908,456=>882,457=>617,458=>1088,459=>1062,460=>949,461=>696,462=>607,463=>334,464=>308,
-465=>765,466=>618,467=>730,468=>641,469=>730,470=>641,471=>730,472=>641,473=>730,474=>641,
-475=>730,476=>641,477=>610,478=>696,479=>607,480=>696,481=>607,482=>976,483=>943,484=>738,
-485=>644,486=>738,487=>644,488=>697,489=>598,490=>765,491=>618,492=>765,493=>618,494=>695,
-495=>523,496=>308,497=>1399,498=>1271,499=>1168,500=>738,501=>644,502=>1160,503=>708,504=>753,
-505=>641,506=>696,507=>607,508=>976,509=>943,510=>765,511=>618,512=>696,513=>607,514=>696,
-515=>607,516=>615,517=>610,518=>615,519=>610,520=>334,521=>308,522=>334,523=>308,524=>765,
-525=>618,526=>765,527=>618,528=>693,529=>444,530=>693,531=>444,532=>730,533=>641,534=>730,
-535=>641,536=>648,537=>536,538=>614,539=>430,540=>621,541=>546,542=>753,543=>641,544=>753,
-545=>778,546=>728,547=>593,548=>652,549=>523,550=>696,551=>607,552=>615,553=>610,554=>765,
-555=>618,556=>765,557=>618,558=>765,559=>618,560=>765,561=>618,562=>651,563=>586,564=>442,
-565=>780,566=>460,567=>308,568=>979,569=>979,570=>696,571=>660,572=>533,573=>573,574=>614,
-575=>536,576=>523,577=>703,578=>553,579=>686,580=>730,581=>696,582=>615,583=>610,584=>334,
-585=>308,586=>774,587=>712,588=>693,589=>444,590=>651,591=>586,592=>607,593=>644,594=>644,
-595=>644,596=>533,597=>533,598=>645,599=>712,600=>610,601=>610,602=>788,603=>501,604=>490,
-605=>733,606=>658,607=>308,608=>712,609=>644,610=>564,611=>579,612=>571,613=>641,614=>641,
-615=>641,616=>491,617=>396,618=>491,619=>502,620=>624,621=>308,622=>757,623=>938,624=>938,
-625=>938,626=>641,627=>713,628=>636,629=>618,630=>817,631=>613,632=>716,633=>484,634=>484,
-635=>584,636=>444,637=>444,638=>536,639=>536,640=>578,641=>578,642=>536,643=>374,644=>391,
-645=>544,646=>497,647=>430,648=>430,649=>828,650=>695,651=>603,652=>586,653=>831,654=>586,
-655=>651,656=>624,657=>615,658=>576,659=>576,660=>515,661=>515,662=>515,663=>515,664=>765,
-665=>569,666=>658,667=>616,668=>622,669=>308,670=>659,671=>485,672=>712,673=>515,674=>515,
-675=>1040,676=>1093,677=>1039,678=>876,679=>691,680=>836,681=>923,682=>712,683=>702,684=>532,
-685=>374,686=>609,687=>710,688=>410,689=>410,690=>197,691=>284,692=>284,693=>284,694=>369,
-695=>532,696=>375,697=>271,698=>469,699=>342,700=>342,701=>342,702=>330,703=>330,704=>293,
-705=>293,706=>450,707=>450,708=>450,709=>450,711=>450,712=>275,713=>450,714=>450,715=>450,
-716=>275,717=>450,718=>450,719=>450,720=>303,721=>303,722=>330,723=>330,724=>450,725=>450,
-726=>374,727=>295,728=>450,729=>450,730=>450,731=>450,733=>450,734=>315,735=>450,736=>370,
-737=>197,738=>343,739=>371,740=>293,741=>450,742=>450,743=>450,744=>450,745=>450,748=>450,
-749=>450,750=>591,755=>450,759=>450,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,832=>0,833=>0,
-834=>0,835=>0,836=>0,837=>0,838=>0,839=>0,840=>0,841=>0,842=>0,843=>0,
-844=>0,845=>0,846=>0,847=>0,849=>0,850=>0,851=>0,855=>0,856=>0,858=>0,
-860=>0,861=>0,862=>0,863=>0,864=>0,865=>0,866=>0,880=>628,881=>508,882=>919,
-883=>752,884=>271,885=>271,886=>753,887=>630,890=>450,891=>533,892=>495,893=>494,894=>360,
-900=>397,901=>450,902=>717,903=>342,904=>761,905=>908,906=>507,908=>801,910=>882,911=>804,
-912=>351,913=>696,914=>686,915=>573,916=>696,917=>615,918=>652,919=>753,920=>765,921=>334,
-922=>697,923=>696,924=>896,925=>753,926=>568,927=>765,928=>753,929=>659,931=>615,932=>614,
-933=>651,934=>765,935=>694,936=>765,937=>765,938=>334,939=>651,940=>618,941=>501,942=>641,
-943=>351,944=>607,945=>618,946=>644,947=>613,948=>618,949=>501,950=>532,951=>641,952=>618,
-953=>351,954=>639,955=>569,956=>662,957=>613,958=>532,959=>618,960=>712,961=>644,962=>533,
-963=>701,964=>574,965=>607,966=>704,967=>580,968=>714,969=>782,970=>351,971=>607,972=>618,
-973=>607,974=>782,975=>697,976=>585,977=>594,978=>671,979=>883,980=>671,981=>716,982=>782,
-983=>669,984=>765,985=>618,986=>660,987=>533,988=>615,989=>444,990=>632,991=>593,992=>827,
-993=>564,994=>983,995=>753,996=>749,997=>644,998=>835,999=>669,1000=>660,1001=>585,1002=>709,
-1003=>604,1004=>677,1005=>644,1006=>614,1007=>531,1008=>669,1009=>644,1010=>533,1011=>308,1012=>765,
-1013=>580,1014=>580,1015=>664,1016=>644,1017=>660,1018=>896,1019=>659,1020=>644,1021=>628,1022=>660,
-1023=>628,1024=>615,1025=>615,1026=>791,1027=>573,1028=>660,1029=>648,1030=>334,1031=>334,1032=>334,
-1033=>1039,1034=>1017,1035=>791,1036=>735,1037=>753,1038=>694,1039=>753,1040=>696,1041=>686,1042=>686,
-1043=>573,1044=>801,1045=>615,1046=>1102,1047=>639,1048=>753,1049=>753,1050=>735,1051=>747,1052=>896,
-1053=>753,1054=>765,1055=>753,1056=>659,1057=>660,1058=>614,1059=>694,1060=>892,1061=>694,1062=>835,
-1063=>727,1064=>1112,1065=>1193,1066=>845,1067=>932,1068=>686,1069=>660,1070=>1056,1071=>693,1072=>607,
-1073=>628,1074=>569,1075=>470,1076=>727,1077=>610,1078=>896,1079=>523,1080=>630,1081=>630,1082=>611,
-1083=>659,1084=>735,1085=>622,1086=>618,1087=>622,1088=>644,1089=>533,1090=>521,1091=>586,1092=>893,
-1093=>580,1094=>667,1095=>618,1096=>956,1097=>995,1098=>676,1099=>813,1100=>569,1101=>533,1102=>875,
-1103=>578,1104=>610,1105=>610,1106=>642,1107=>470,1108=>533,1109=>536,1110=>308,1111=>308,1112=>308,
-1113=>892,1114=>860,1115=>661,1116=>611,1117=>630,1118=>586,1119=>622,1120=>983,1121=>782,1122=>756,
-1123=>662,1124=>911,1125=>755,1126=>893,1127=>749,1128=>1222,1129=>1009,1130=>765,1131=>618,1132=>1112,
-1133=>906,1134=>626,1135=>501,1136=>967,1137=>955,1138=>765,1139=>618,1140=>765,1141=>625,1142=>765,
-1143=>625,1144=>1033,1145=>939,1146=>967,1147=>776,1148=>1265,1149=>1055,1150=>983,1151=>782,1152=>660,
-1153=>533,1154=>587,1155=>0,1156=>0,1157=>0,1158=>0,1159=>0,1160=>376,1161=>376,1162=>861,
-1163=>726,1164=>686,1165=>550,1166=>659,1167=>644,1168=>573,1169=>470,1170=>599,1171=>488,1172=>727,
-1173=>602,1174=>1102,1175=>896,1176=>639,1177=>523,1178=>697,1179=>611,1180=>735,1181=>611,1182=>735,
-1183=>611,1184=>914,1185=>743,1186=>860,1187=>727,1188=>992,1189=>787,1190=>1146,1191=>915,1192=>856,
-1193=>772,1194=>660,1195=>533,1196=>614,1197=>521,1198=>651,1199=>586,1200=>651,1201=>586,1202=>694,
-1203=>580,1204=>1001,1205=>900,1206=>727,1207=>618,1208=>727,1209=>618,1210=>727,1211=>641,1212=>923,
-1213=>729,1214=>923,1215=>729,1216=>334,1217=>1102,1218=>896,1219=>697,1220=>567,1221=>855,1222=>725,
-1223=>753,1224=>622,1225=>861,1226=>726,1227=>727,1228=>618,1229=>1003,1230=>839,1231=>308,1232=>696,
-1233=>607,1234=>696,1235=>607,1236=>976,1237=>943,1238=>615,1239=>610,1240=>764,1241=>610,1242=>764,
-1243=>610,1244=>1102,1245=>896,1246=>639,1247=>523,1248=>695,1249=>576,1250=>753,1251=>630,1252=>753,
-1253=>630,1254=>765,1255=>618,1256=>765,1257=>618,1258=>765,1259=>618,1260=>660,1261=>533,1262=>694,
-1263=>586,1264=>694,1265=>586,1266=>694,1267=>586,1268=>727,1269=>618,1270=>573,1271=>470,1272=>932,
-1273=>813,1274=>599,1275=>488,1276=>694,1277=>580,1278=>694,1279=>580,1280=>686,1281=>547,1282=>1043,
-1283=>804,1284=>1007,1285=>828,1286=>745,1287=>624,1288=>1117,1289=>915,1290=>1160,1291=>912,1292=>755,
-1293=>574,1294=>844,1295=>722,1296=>626,1297=>501,1298=>747,1299=>659,1300=>1157,1301=>961,1302=>958,
-1303=>881,1304=>973,1305=>912,1306=>765,1307=>644,1308=>993,1309=>831,1312=>1140,1313=>953,1314=>1146,
-1315=>915,1316=>861,1317=>726,1329=>886,1330=>730,1331=>886,1332=>886,1333=>730,1334=>699,1335=>730,
-1336=>730,1337=>877,1338=>886,1339=>730,1340=>639,1341=>970,1342=>1022,1343=>730,1344=>639,1345=>681,
-1346=>886,1347=>789,1348=>886,1349=>714,1350=>886,1351=>730,1352=>730,1353=>730,1354=>862,1355=>699,
-1356=>886,1357=>730,1358=>886,1359=>648,1360=>730,1361=>714,1362=>805,1363=>765,1364=>842,1365=>765,
-1366=>648,1369=>330,1370=>342,1371=>495,1372=>495,1373=>342,1374=>491,1375=>468,1377=>938,1378=>641,
-1379=>779,1380=>781,1381=>641,1382=>735,1383=>588,1384=>641,1385=>729,1386=>735,1387=>641,1388=>448,
-1389=>916,1390=>644,1391=>641,1392=>641,1393=>644,1394=>737,1395=>641,1396=>676,1397=>308,1398=>794,
-1399=>502,1400=>641,1401=>502,1402=>938,1403=>502,1404=>777,1405=>641,1406=>732,1407=>938,1408=>641,
-1409=>644,1410=>514,1411=>938,1412=>700,1413=>618,1414=>648,1415=>776,1417=>360,1418=>438,1456=>0,
-1457=>0,1458=>0,1459=>0,1460=>0,1461=>0,1462=>0,1463=>0,1464=>0,1465=>0,1466=>0,
-1467=>0,1468=>0,1469=>0,1470=>374,1471=>0,1472=>334,1473=>0,1474=>0,1475=>334,1478=>447,
-1479=>0,1488=>676,1489=>605,1490=>483,1491=>589,1492=>641,1493=>308,1494=>442,1495=>641,1496=>651,
-1497=>308,1498=>584,1499=>584,1500=>611,1501=>641,1502=>698,1503=>308,1504=>447,1505=>696,1506=>610,
-1507=>646,1508=>618,1509=>565,1510=>676,1511=>656,1512=>584,1513=>854,1514=>676,1520=>598,1521=>598,
-1522=>597,1523=>399,1524=>639,1542=>600,1543=>600,1545=>795,1546=>1042,1548=>342,1557=>0,1563=>360,
-1567=>522,1569=>460,1570=>308,1571=>308,1572=>559,1573=>308,1574=>825,1575=>308,1576=>904,1577=>531,
-1578=>904,1579=>904,1580=>648,1581=>648,1582=>648,1583=>461,1584=>461,1585=>518,1586=>518,1587=>1242,
-1588=>1242,1589=>1210,1590=>1210,1591=>935,1592=>935,1593=>615,1594=>615,1600=>308,1601=>1045,1602=>804,
-1603=>825,1604=>781,1605=>659,1606=>768,1607=>531,1608=>559,1609=>825,1610=>825,1611=>0,1612=>0,
-1613=>0,1614=>0,1615=>0,1616=>0,1617=>0,1618=>0,1619=>0,1620=>0,1621=>0,1626=>450,
-1632=>549,1633=>549,1634=>549,1635=>549,1636=>549,1637=>549,1638=>549,1639=>549,1640=>549,1641=>549,
-1642=>549,1643=>336,1644=>342,1645=>490,1646=>904,1647=>804,1652=>263,1657=>904,1658=>904,1659=>904,
-1660=>904,1661=>904,1662=>904,1663=>904,1664=>904,1665=>648,1666=>648,1667=>648,1668=>648,1669=>648,
-1670=>648,1671=>648,1681=>518,1682=>518,1685=>613,1688=>518,1697=>1045,1700=>1045,1702=>1045,1705=>921,
-1711=>921,1717=>781,1722=>768,1727=>648,1734=>559,1740=>825,1742=>825,1749=>531,1776=>549,1777=>549,
-1778=>549,1779=>549,1780=>549,1781=>549,1782=>549,1783=>549,1784=>549,1785=>549,1984=>626,1985=>626,
-1986=>626,1987=>626,1988=>626,1989=>626,1990=>626,1991=>626,1992=>626,1993=>626,1994=>308,1995=>492,
-1996=>489,1997=>586,1998=>622,1999=>622,2000=>534,2001=>622,2002=>813,2003=>496,2004=>496,2005=>564,
-2006=>619,2007=>399,2008=>920,2009=>456,2010=>743,2011=>622,2012=>586,2013=>821,2014=>564,2015=>636,
-2016=>456,2017=>586,2018=>517,2019=>564,2020=>564,2021=>564,2022=>517,2023=>517,2027=>0,2028=>0,
-2029=>0,2030=>0,2031=>0,2032=>0,2033=>0,2034=>0,2035=>0,2036=>342,2037=>342,2040=>622,
-2041=>622,2042=>374,3647=>668,3713=>710,3714=>673,3716=>674,3719=>512,3720=>668,3722=>669,3725=>685,
-3732=>635,3733=>633,3734=>672,3735=>737,3737=>657,3738=>654,3739=>654,3740=>830,3741=>744,3742=>779,
-3743=>779,3745=>752,3746=>685,3747=>692,3749=>691,3751=>642,3754=>744,3755=>928,3757=>651,3758=>705,
-3759=>840,3760=>620,3761=>0,3762=>549,3763=>549,3764=>0,3765=>0,3766=>0,3767=>0,3768=>0,
-3769=>0,3771=>0,3772=>0,3773=>603,3776=>464,3777=>774,3778=>464,3779=>584,3780=>569,3782=>683,
-3784=>0,3785=>0,3786=>0,3787=>0,3788=>0,3789=>0,3792=>694,3793=>694,3794=>624,3795=>752,
-3796=>655,3797=>655,3798=>764,3799=>710,3800=>683,3801=>818,3804=>1227,3805=>1227,4256=>826,4257=>669,
-4258=>665,4259=>753,4260=>584,4261=>696,4262=>771,4263=>800,4264=>477,4265=>570,4266=>771,4267=>810,
-4268=>579,4269=>813,4270=>732,4271=>677,4272=>782,4273=>579,4274=>579,4275=>797,4276=>797,4277=>660,
-4278=>587,4279=>579,4280=>582,4281=>579,4282=>710,4283=>812,4284=>570,4285=>557,4286=>579,4287=>700,
-4288=>802,4289=>541,4290=>668,4291=>554,4292=>570,4293=>668,4304=>497,4305=>497,4306=>536,4307=>734,
-4308=>505,4309=>506,4310=>497,4311=>744,4312=>497,4313=>488,4314=>967,4315=>506,4316=>507,4317=>730,
-4318=>497,4319=>532,4320=>740,4321=>506,4322=>621,4323=>525,4324=>732,4325=>505,4326=>731,4327=>506,
-4328=>506,4329=>507,4330=>568,4331=>506,4332=>506,4333=>497,4334=>506,4335=>506,4336=>501,4337=>543,
-4338=>497,4339=>497,4340=>497,4341=>544,4342=>767,4343=>571,4344=>506,4345=>536,4346=>487,4347=>615,
-4348=>331,5121=>696,5122=>696,5123=>696,5124=>696,5125=>814,5126=>814,5127=>814,5129=>814,5130=>814,
-5131=>814,5132=>916,5133=>908,5134=>916,5135=>908,5136=>916,5137=>908,5138=>1034,5139=>1025,5140=>1034,
-5141=>1025,5142=>814,5143=>1034,5144=>1028,5145=>1034,5146=>1028,5147=>814,5149=>278,5150=>476,5151=>382,
-5152=>382,5153=>355,5154=>355,5155=>355,5156=>355,5157=>507,5158=>423,5159=>278,5160=>355,5161=>355,
-5162=>355,5163=>1092,5164=>888,5165=>1094,5166=>1167,5167=>696,5168=>696,5169=>696,5170=>696,5171=>797,
-5172=>797,5173=>797,5175=>797,5176=>797,5177=>797,5178=>916,5179=>908,5180=>916,5181=>908,5182=>916,
-5183=>908,5184=>1034,5185=>1025,5186=>1034,5187=>1025,5188=>1034,5189=>1028,5190=>1034,5191=>1028,5192=>797,
-5193=>518,5194=>206,5196=>730,5197=>730,5198=>730,5199=>730,5200=>734,5201=>734,5202=>734,5204=>734,
-5205=>734,5206=>734,5207=>950,5208=>943,5209=>950,5210=>943,5211=>950,5212=>943,5213=>954,5214=>949,
-5215=>954,5216=>949,5217=>954,5218=>946,5219=>954,5220=>946,5221=>954,5222=>435,5223=>904,5224=>904,
-5225=>921,5226=>915,5227=>668,5228=>668,5229=>668,5230=>668,5231=>668,5232=>668,5233=>668,5234=>668,
-5235=>668,5236=>926,5237=>877,5238=>882,5239=>877,5240=>882,5241=>877,5242=>926,5243=>877,5244=>926,
-5245=>877,5246=>882,5247=>877,5248=>882,5249=>877,5250=>882,5251=>451,5252=>451,5253=>844,5254=>844,
-5255=>844,5256=>844,5257=>668,5258=>668,5259=>668,5260=>668,5261=>668,5262=>668,5263=>668,5264=>668,
-5265=>668,5266=>926,5267=>877,5268=>926,5269=>877,5270=>926,5271=>877,5272=>926,5273=>877,5274=>926,
-5275=>877,5276=>926,5277=>877,5278=>926,5279=>877,5280=>926,5281=>451,5282=>451,5283=>563,5284=>563,
-5285=>563,5286=>563,5287=>563,5288=>563,5289=>563,5290=>563,5291=>563,5292=>793,5293=>769,5294=>777,
-5295=>786,5296=>777,5297=>786,5298=>793,5299=>786,5300=>793,5301=>786,5302=>777,5303=>786,5304=>777,
-5305=>786,5306=>777,5307=>392,5308=>493,5309=>392,5312=>889,5313=>889,5314=>889,5315=>889,5316=>838,
-5317=>838,5318=>838,5319=>838,5320=>838,5321=>1114,5322=>1122,5323=>1080,5324=>1105,5325=>1080,5326=>1105,
-5327=>838,5328=>593,5329=>447,5330=>593,5331=>889,5332=>889,5333=>889,5334=>889,5335=>838,5336=>838,
-5337=>838,5338=>838,5339=>838,5340=>1107,5341=>1122,5342=>1155,5343=>1105,5344=>1155,5345=>1105,5346=>1105,
-5347=>1093,5348=>1105,5349=>1093,5350=>1155,5351=>1105,5352=>1155,5353=>1105,5354=>593,5356=>797,5357=>657,
-5358=>657,5359=>657,5360=>657,5361=>657,5362=>657,5363=>657,5364=>657,5365=>657,5366=>897,5367=>862,
-5368=>870,5369=>890,5370=>870,5371=>890,5372=>897,5373=>862,5374=>897,5375=>862,5376=>870,5377=>890,
-5378=>870,5379=>890,5380=>870,5381=>443,5382=>414,5383=>443,5392=>831,5393=>831,5394=>831,5395=>1022,
-5396=>1022,5397=>1022,5398=>1022,5399=>1088,5400=>1081,5401=>1088,5402=>1081,5403=>1088,5404=>1081,5405=>1288,
-5406=>1278,5407=>1288,5408=>1278,5409=>1288,5410=>1278,5411=>1288,5412=>1278,5413=>671,5414=>698,5415=>698,
-5416=>698,5417=>698,5418=>698,5419=>698,5420=>698,5421=>698,5422=>698,5423=>902,5424=>903,5425=>911,
-5426=>896,5427=>911,5428=>896,5429=>902,5430=>903,5431=>902,5432=>903,5433=>911,5434=>896,5435=>911,
-5436=>896,5437=>911,5438=>445,5440=>355,5441=>458,5442=>929,5443=>929,5444=>878,5445=>878,5446=>878,
-5447=>878,5448=>659,5449=>659,5450=>659,5451=>659,5452=>659,5453=>659,5454=>902,5455=>863,5456=>445,
-5458=>797,5459=>696,5460=>696,5461=>696,5462=>696,5463=>835,5464=>835,5465=>835,5466=>835,5467=>1055,
-5468=>1028,5469=>542,5470=>730,5471=>730,5472=>730,5473=>730,5474=>730,5475=>730,5476=>734,5477=>734,
-5478=>734,5479=>734,5480=>954,5481=>946,5482=>493,5492=>879,5493=>879,5494=>879,5495=>879,5496=>879,
-5497=>879,5498=>879,5499=>556,5500=>753,5501=>458,5502=>1114,5503=>1114,5504=>1114,5505=>1114,5506=>1114,
-5507=>1114,5508=>1114,5509=>890,5514=>879,5515=>879,5516=>879,5517=>879,5518=>1432,5519=>1432,5520=>1432,
-5521=>1165,5522=>1165,5523=>1432,5524=>1432,5525=>763,5526=>1146,5536=>889,5537=>889,5538=>838,5539=>838,
-5540=>838,5541=>838,5542=>593,5543=>698,5544=>698,5545=>698,5546=>698,5547=>698,5548=>698,5549=>698,
-5550=>445,5551=>668,5598=>747,5601=>747,5702=>446,5703=>446,5742=>371,5743=>1114,5744=>1432,5745=>1814,
-5746=>1814,5747=>1548,5748=>1510,5749=>1814,5750=>1814,5760=>489,5761=>573,5762=>851,5763=>1128,5764=>1406,
-5765=>1684,5766=>564,5767=>842,5768=>1128,5769=>1403,5770=>1684,5771=>512,5772=>789,5773=>1068,5774=>1347,
-5775=>1626,5776=>573,5777=>851,5778=>1116,5779=>1399,5780=>1684,5781=>512,5782=>512,5783=>709,5784=>1110,
-5785=>1403,5786=>666,5787=>574,5788=>574,7424=>586,7425=>750,7426=>943,7427=>547,7428=>533,7429=>608,
-7430=>608,7431=>502,7432=>501,7433=>308,7434=>444,7435=>598,7436=>485,7437=>735,7438=>630,7439=>618,
-7440=>533,7441=>594,7442=>594,7443=>594,7444=>984,7446=>618,7447=>618,7448=>500,7449=>578,7450=>578,
-7451=>521,7452=>571,7453=>663,7454=>853,7455=>625,7456=>586,7457=>831,7458=>523,7459=>581,7462=>485,
-7463=>586,7464=>622,7465=>500,7466=>703,7467=>659,7468=>438,7469=>615,7470=>432,7472=>470,7473=>387,
-7474=>387,7475=>465,7476=>474,7477=>211,7478=>211,7479=>439,7480=>361,7481=>563,7482=>474,7483=>474,
-7484=>481,7485=>458,7486=>415,7487=>436,7488=>387,7489=>460,7490=>625,7491=>412,7492=>412,7493=>431,
-7494=>641,7495=>431,7496=>431,7497=>431,7498=>431,7499=>347,7500=>347,7501=>431,7502=>197,7503=>438,
-7504=>597,7505=>410,7506=>439,7507=>372,7508=>439,7509=>439,7510=>431,7511=>349,7512=>410,7513=>416,
-7514=>597,7515=>451,7517=>405,7518=>386,7519=>389,7520=>443,7521=>365,7522=>197,7523=>284,7524=>410,
-7525=>451,7526=>405,7527=>386,7528=>405,7529=>443,7530=>365,7543=>644,7544=>474,7547=>491,7557=>462,
-7579=>431,7580=>372,7581=>372,7582=>439,7583=>347,7584=>339,7585=>313,7586=>431,7587=>410,7588=>312,
-7589=>253,7590=>312,7591=>312,7592=>388,7593=>293,7594=>296,7595=>333,7596=>598,7597=>597,7598=>505,
-7599=>505,7600=>403,7601=>439,7602=>488,7603=>379,7604=>356,7605=>349,7606=>524,7607=>444,7608=>359,
-7609=>405,7610=>451,7611=>375,7612=>471,7613=>422,7614=>409,7615=>382,7620=>0,7621=>0,7622=>0,
-7623=>0,7624=>0,7625=>0,7680=>696,7681=>607,7682=>686,7683=>644,7684=>686,7685=>644,7686=>686,
-7687=>644,7688=>660,7689=>533,7690=>747,7691=>644,7692=>747,7693=>644,7694=>747,7695=>644,7696=>747,
-7697=>644,7698=>747,7699=>644,7700=>615,7701=>610,7702=>615,7703=>610,7704=>615,7705=>610,7706=>615,
-7707=>610,7708=>615,7709=>610,7710=>615,7711=>391,7712=>738,7713=>644,7714=>753,7715=>641,7716=>753,
-7717=>641,7718=>753,7719=>641,7720=>753,7721=>641,7722=>753,7723=>641,7724=>334,7725=>308,7726=>334,
-7727=>308,7728=>697,7729=>598,7730=>697,7731=>598,7732=>697,7733=>598,7734=>573,7735=>308,7736=>573,
-7737=>308,7738=>573,7739=>308,7740=>573,7741=>308,7742=>896,7743=>938,7744=>896,7745=>938,7746=>896,
-7747=>938,7748=>753,7749=>641,7750=>753,7751=>641,7752=>753,7753=>641,7754=>753,7755=>641,7756=>765,
-7757=>618,7758=>765,7759=>618,7760=>765,7761=>618,7762=>765,7763=>618,7764=>659,7765=>644,7766=>659,
-7767=>644,7768=>693,7769=>444,7770=>693,7771=>444,7772=>693,7773=>444,7774=>693,7775=>444,7776=>648,
-7777=>536,7778=>648,7779=>536,7780=>648,7781=>536,7782=>648,7783=>536,7784=>648,7785=>536,7786=>614,
-7787=>430,7788=>614,7789=>430,7790=>614,7791=>430,7792=>614,7793=>430,7794=>730,7795=>641,7796=>730,
-7797=>641,7798=>730,7799=>641,7800=>730,7801=>641,7802=>730,7803=>641,7804=>696,7805=>586,7806=>696,
-7807=>586,7808=>993,7809=>831,7810=>993,7811=>831,7812=>993,7813=>831,7814=>993,7815=>831,7816=>993,
-7817=>831,7818=>694,7819=>580,7820=>694,7821=>580,7822=>651,7823=>586,7824=>652,7825=>523,7826=>652,
-7827=>523,7828=>652,7829=>523,7830=>641,7831=>430,7832=>831,7833=>586,7834=>607,7835=>391,7838=>806,
-7839=>618,7840=>696,7841=>607,7842=>696,7843=>607,7844=>696,7845=>607,7846=>696,7847=>607,7848=>696,
-7849=>607,7850=>696,7851=>607,7852=>696,7853=>607,7854=>696,7855=>607,7856=>696,7857=>607,7858=>696,
-7859=>607,7860=>696,7861=>607,7862=>696,7863=>607,7864=>615,7865=>610,7866=>615,7867=>610,7868=>615,
-7869=>610,7870=>615,7871=>610,7872=>615,7873=>610,7874=>615,7875=>610,7876=>615,7877=>610,7878=>615,
-7879=>610,7880=>334,7881=>308,7882=>334,7883=>308,7884=>765,7885=>618,7886=>765,7887=>618,7888=>765,
-7889=>618,7890=>765,7891=>618,7892=>765,7893=>618,7894=>765,7895=>618,7896=>765,7897=>618,7898=>786,
-7899=>618,7900=>786,7901=>618,7902=>786,7903=>618,7904=>786,7905=>618,7906=>786,7907=>618,7908=>730,
-7909=>641,7910=>730,7911=>641,7912=>751,7913=>641,7914=>751,7915=>641,7916=>751,7917=>641,7918=>751,
-7919=>641,7920=>751,7921=>641,7922=>651,7923=>586,7924=>651,7925=>586,7926=>651,7927=>586,7928=>651,
-7929=>586,7936=>618,7937=>618,7938=>618,7939=>618,7940=>618,7941=>618,7942=>618,7943=>618,7944=>696,
-7945=>696,7946=>937,7947=>939,7948=>841,7949=>866,7950=>751,7951=>773,7952=>501,7953=>501,7954=>501,
-7955=>501,7956=>501,7957=>501,7960=>712,7961=>715,7962=>989,7963=>986,7964=>920,7965=>947,7968=>641,
-7969=>641,7970=>641,7971=>641,7972=>641,7973=>641,7974=>641,7975=>641,7976=>851,7977=>856,7978=>1125,
-7979=>1125,7980=>1062,7981=>1085,7982=>948,7983=>956,7984=>351,7985=>351,7986=>351,7987=>351,7988=>351,
-7989=>351,7990=>351,7991=>351,7992=>435,7993=>440,7994=>699,7995=>707,7996=>641,7997=>664,7998=>544,
-7999=>544,8000=>618,8001=>618,8002=>618,8003=>618,8004=>618,8005=>618,8008=>802,8009=>839,8010=>1099,
-8011=>1101,8012=>947,8013=>974,8016=>607,8017=>607,8018=>607,8019=>607,8020=>607,8021=>607,8022=>607,
-8023=>607,8025=>837,8027=>1065,8029=>1079,8031=>944,8032=>782,8033=>782,8034=>782,8035=>782,8036=>782,
-8037=>782,8038=>782,8039=>782,8040=>817,8041=>862,8042=>1121,8043=>1126,8044=>968,8045=>994,8046=>925,
-8047=>968,8048=>618,8049=>618,8050=>501,8051=>501,8052=>641,8053=>641,8054=>351,8055=>351,8056=>618,
-8057=>618,8058=>607,8059=>607,8060=>782,8061=>782,8064=>618,8065=>618,8066=>618,8067=>618,8068=>618,
-8069=>618,8070=>618,8071=>618,8072=>696,8073=>696,8074=>937,8075=>939,8076=>841,8077=>866,8078=>751,
-8079=>773,8080=>641,8081=>641,8082=>641,8083=>641,8084=>641,8085=>641,8086=>641,8087=>641,8088=>851,
-8089=>856,8090=>1125,8091=>1125,8092=>1062,8093=>1085,8094=>948,8095=>956,8096=>782,8097=>782,8098=>782,
-8099=>782,8100=>782,8101=>782,8102=>782,8103=>782,8104=>817,8105=>862,8106=>1121,8107=>1126,8108=>968,
-8109=>994,8110=>925,8111=>968,8112=>618,8113=>618,8114=>618,8115=>618,8116=>618,8118=>618,8119=>618,
-8120=>696,8121=>696,8122=>789,8123=>717,8124=>696,8125=>450,8126=>450,8127=>450,8128=>450,8129=>450,
-8130=>641,8131=>641,8132=>641,8134=>641,8135=>641,8136=>836,8137=>761,8138=>972,8139=>908,8140=>753,
-8141=>450,8142=>450,8143=>450,8144=>351,8145=>351,8146=>351,8147=>351,8150=>351,8151=>351,8152=>334,
-8153=>334,8154=>559,8155=>507,8157=>450,8158=>450,8159=>450,8160=>607,8161=>607,8162=>607,8163=>607,
-8164=>644,8165=>644,8166=>607,8167=>607,8168=>651,8169=>651,8170=>918,8171=>882,8172=>754,8173=>450,
-8174=>450,8175=>450,8178=>782,8179=>782,8180=>782,8182=>782,8183=>782,8184=>958,8185=>801,8186=>976,
-8187=>804,8188=>765,8189=>450,8190=>450,8192=>450,8193=>900,8194=>450,8195=>900,8196=>296,8197=>225,
-8198=>150,8199=>626,8200=>342,8201=>180,8202=>89,8203=>0,8204=>0,8205=>0,8206=>0,8207=>0,
-8208=>374,8209=>374,8210=>626,8213=>900,8214=>450,8215=>450,8219=>342,8223=>591,8227=>575,8228=>299,
-8229=>600,8231=>313,8234=>0,8235=>0,8236=>0,8237=>0,8238=>0,8239=>180,8241=>1698,8242=>237,
-8243=>402,8244=>567,8245=>237,8246=>402,8247=>567,8248=>659,8251=>875,8252=>564,8253=>522,8254=>450,
-8255=>745,8256=>745,8257=>296,8258=>920,8259=>450,8260=>150,8261=>411,8262=>411,8263=>927,8264=>746,
-8265=>746,8266=>461,8267=>572,8268=>450,8269=>450,8270=>470,8271=>360,8272=>745,8273=>470,8274=>500,
-8275=>900,8276=>745,8277=>754,8278=>615,8279=>731,8280=>754,8281=>754,8282=>342,8283=>784,8284=>754,
-8285=>342,8286=>342,8287=>200,8288=>0,8289=>0,8290=>0,8291=>0,8292=>0,8298=>0,8299=>0,
-8300=>0,8301=>0,8302=>0,8303=>0,8304=>394,8305=>197,8308=>394,8309=>394,8310=>394,8311=>394,
-8312=>394,8313=>394,8314=>475,8315=>475,8316=>475,8317=>259,8318=>259,8319=>410,8320=>394,8321=>394,
-8322=>394,8323=>394,8324=>394,8325=>394,8326=>394,8327=>394,8328=>394,8329=>394,8330=>475,8331=>475,
-8332=>475,8333=>259,8334=>259,8336=>412,8337=>431,8338=>439,8339=>371,8340=>431,8352=>836,8353=>626,
-8354=>626,8355=>626,8356=>626,8357=>938,8358=>753,8359=>1366,8360=>1084,8361=>993,8362=>813,8363=>626,
-8365=>626,8366=>614,8367=>1252,8368=>626,8369=>626,8370=>626,8371=>626,8372=>773,8373=>626,8400=>0,
-8401=>0,8406=>0,8407=>0,8411=>0,8412=>0,8417=>0,8448=>1007,8449=>1053,8450=>660,8451=>1090,
-8452=>806,8453=>982,8454=>1029,8455=>553,8456=>628,8457=>978,8459=>965,8460=>822,8461=>799,8462=>641,
-8463=>641,8464=>537,8465=>627,8466=>771,8467=>424,8468=>876,8469=>753,8470=>1083,8471=>900,8472=>627,
-8473=>675,8474=>765,8475=>844,8476=>732,8477=>721,8478=>807,8479=>639,8480=>917,8481=>1152,8483=>679,
-8484=>679,8485=>520,8486=>765,8487=>765,8488=>686,8489=>304,8490=>697,8491=>696,8492=>835,8493=>736,
-8494=>769,8495=>572,8496=>656,8497=>727,8498=>615,8499=>1065,8500=>418,8501=>714,8502=>658,8503=>444,
-8504=>615,8505=>342,8506=>851,8507=>1213,8508=>710,8509=>663,8510=>589,8511=>776,8512=>756,8513=>697,
-8514=>501,8515=>573,8516=>684,8517=>747,8518=>644,8519=>610,8520=>308,8521=>308,8523=>785,8526=>492,
-8531=>932,8532=>932,8533=>932,8534=>932,8535=>932,8536=>932,8537=>932,8538=>932,8539=>932,8540=>932,
-8541=>932,8542=>932,8543=>554,8544=>334,8545=>593,8546=>851,8547=>989,8548=>696,8549=>989,8550=>1247,
-8551=>1505,8552=>1008,8553=>694,8554=>1008,8555=>1266,8556=>573,8557=>660,8558=>747,8559=>896,8560=>308,
-8561=>546,8562=>785,8563=>885,8564=>586,8565=>866,8566=>1104,8567=>1342,8568=>872,8569=>580,8570=>872,
-8571=>1110,8572=>308,8573=>533,8574=>644,8575=>938,8576=>1160,8577=>747,8578=>1160,8579=>660,8580=>533,
-8592=>754,8593=>754,8594=>754,8595=>754,8596=>754,8597=>754,8598=>754,8599=>754,8600=>754,8601=>754,
-8602=>754,8603=>754,8604=>754,8605=>754,8606=>754,8607=>754,8608=>754,8609=>754,8610=>754,8611=>754,
-8612=>754,8613=>754,8614=>754,8615=>754,8616=>754,8617=>754,8618=>754,8619=>754,8620=>754,8621=>754,
-8622=>754,8623=>754,8624=>754,8625=>754,8626=>754,8627=>754,8628=>754,8629=>754,8630=>754,8631=>754,
-8632=>754,8633=>754,8634=>754,8635=>754,8636=>754,8637=>754,8638=>754,8639=>754,8640=>754,8641=>754,
-8642=>754,8643=>754,8644=>754,8645=>754,8646=>754,8647=>754,8648=>754,8649=>754,8650=>754,8651=>754,
-8652=>754,8653=>754,8654=>754,8655=>754,8656=>754,8657=>754,8658=>754,8659=>754,8660=>754,8661=>754,
-8662=>754,8663=>754,8664=>754,8665=>754,8666=>754,8667=>754,8668=>754,8669=>754,8670=>754,8671=>754,
-8672=>754,8673=>754,8674=>754,8675=>754,8676=>754,8677=>754,8678=>754,8679=>754,8680=>754,8681=>754,
-8682=>754,8683=>754,8684=>754,8685=>754,8686=>754,8687=>754,8688=>754,8689=>754,8690=>754,8691=>754,
-8692=>754,8693=>754,8694=>754,8695=>754,8696=>754,8697=>754,8698=>754,8699=>754,8700=>754,8701=>754,
-8702=>754,8703=>754,8704=>696,8705=>626,8706=>489,8707=>615,8708=>615,8709=>771,8710=>627,8711=>627,
-8712=>807,8713=>807,8714=>675,8715=>807,8716=>807,8717=>675,8718=>572,8719=>708,8720=>708,8721=>646,
-8722=>754,8723=>754,8724=>626,8725=>329,8726=>626,8727=>754,8728=>563,8729=>342,8730=>600,8731=>600,
-8732=>600,8733=>641,8734=>750,8735=>754,8736=>807,8737=>807,8738=>754,8739=>450,8740=>450,8741=>450,
-8742=>450,8743=>730,8744=>730,8745=>730,8746=>730,8747=>549,8748=>835,8749=>1165,8750=>506,8751=>879,
-8752=>1181,8753=>506,8754=>506,8755=>506,8756=>626,8757=>626,8758=>264,8759=>626,8760=>754,8761=>754,
-8762=>754,8763=>754,8764=>754,8765=>754,8766=>754,8767=>754,8768=>337,8769=>754,8770=>754,8771=>754,
-8772=>754,8773=>754,8774=>754,8775=>754,8776=>754,8777=>754,8778=>754,8779=>754,8780=>754,8781=>754,
-8782=>754,8783=>754,8784=>754,8785=>754,8786=>754,8787=>754,8788=>956,8789=>956,8790=>754,8791=>754,
-8792=>754,8793=>754,8794=>754,8795=>754,8796=>754,8797=>754,8798=>754,8799=>754,8800=>754,8801=>754,
-8802=>754,8803=>754,8804=>754,8805=>754,8806=>754,8807=>754,8808=>756,8809=>756,8810=>942,8811=>942,
-8812=>450,8813=>754,8814=>754,8815=>754,8816=>754,8817=>754,8818=>754,8819=>754,8820=>754,8821=>754,
-8822=>754,8823=>754,8824=>754,8825=>754,8826=>754,8827=>754,8828=>754,8829=>754,8830=>754,8831=>754,
-8832=>754,8833=>754,8834=>754,8835=>754,8836=>754,8837=>754,8838=>754,8839=>754,8840=>754,8841=>754,
-8842=>754,8843=>754,8844=>730,8845=>730,8846=>730,8847=>754,8848=>754,8849=>754,8850=>754,8851=>716,
-8852=>716,8853=>754,8854=>754,8855=>754,8856=>754,8857=>754,8858=>754,8859=>754,8860=>754,8861=>754,
-8862=>754,8863=>754,8864=>754,8865=>754,8866=>822,8867=>822,8868=>822,8869=>822,8870=>488,8871=>488,
-8872=>822,8873=>822,8874=>822,8875=>822,8876=>822,8877=>822,8878=>822,8879=>822,8880=>754,8881=>754,
-8882=>754,8883=>754,8884=>754,8885=>754,8886=>900,8887=>900,8888=>754,8889=>754,8890=>488,8891=>730,
-8892=>730,8893=>730,8894=>754,8895=>754,8896=>758,8897=>758,8898=>758,8899=>758,8900=>444,8901=>342,
-8902=>563,8903=>754,8904=>900,8905=>900,8906=>900,8907=>900,8908=>900,8909=>754,8910=>730,8911=>730,
-8912=>754,8913=>754,8914=>754,8915=>754,8916=>754,8917=>754,8918=>754,8919=>754,8920=>1280,8921=>1280,
-8922=>754,8923=>754,8924=>754,8925=>754,8926=>754,8927=>754,8928=>754,8929=>754,8930=>754,8931=>754,
-8932=>754,8933=>754,8934=>754,8935=>754,8936=>754,8937=>754,8938=>754,8939=>754,8940=>754,8941=>754,
-8942=>900,8943=>900,8944=>900,8945=>900,8946=>1042,8947=>807,8948=>675,8949=>807,8950=>807,8951=>675,
-8952=>807,8953=>807,8954=>1042,8955=>807,8956=>675,8957=>807,8958=>675,8959=>807,8960=>542,8961=>542,
-8962=>644,8963=>754,8964=>754,8965=>754,8966=>754,8967=>439,8968=>411,8969=>411,8970=>411,8971=>411,
-8972=>728,8973=>728,8974=>728,8975=>728,8976=>754,8977=>484,8984=>835,8985=>754,8988=>422,8989=>422,
-8990=>422,8991=>422,8992=>549,8993=>549,8996=>1037,8997=>1037,8998=>1272,8999=>1037,9000=>1299,9003=>1272,
-9004=>786,9075=>351,9076=>644,9077=>782,9082=>618,9085=>776,9095=>1037,9108=>786,9115=>450,9116=>450,
-9117=>450,9118=>450,9119=>450,9120=>450,9121=>450,9122=>450,9123=>450,9124=>450,9125=>450,9126=>450,
-9127=>675,9128=>675,9129=>675,9130=>675,9131=>675,9132=>675,9133=>675,9134=>549,9166=>754,9167=>850,
-9187=>786,9189=>692,9250=>644,9251=>644,9312=>762,9313=>762,9314=>762,9315=>762,9316=>762,9317=>762,
-9318=>762,9319=>762,9320=>762,9321=>762,9600=>692,9601=>692,9602=>692,9603=>692,9604=>692,9605=>692,
-9606=>692,9607=>692,9608=>692,9609=>692,9610=>692,9611=>692,9612=>692,9613=>692,9614=>692,9615=>692,
-9616=>692,9617=>692,9618=>692,9619=>692,9620=>692,9621=>692,9622=>692,9623=>692,9624=>692,9625=>692,
-9626=>692,9627=>692,9628=>692,9629=>692,9630=>692,9631=>692,9632=>850,9633=>850,9634=>850,9635=>850,
-9636=>850,9637=>850,9638=>850,9639=>850,9640=>850,9641=>850,9642=>610,9643=>610,9644=>850,9645=>850,
-9646=>495,9647=>495,9648=>692,9649=>692,9650=>692,9651=>692,9652=>452,9653=>452,9654=>692,9655=>692,
-9656=>452,9657=>452,9658=>692,9659=>692,9660=>692,9661=>692,9662=>452,9663=>452,9664=>692,9665=>692,
-9666=>452,9667=>452,9668=>692,9669=>692,9670=>692,9671=>692,9672=>692,9673=>785,9674=>444,9675=>785,
-9676=>785,9677=>785,9678=>785,9679=>785,9680=>785,9681=>785,9682=>785,9683=>785,9684=>785,9685=>785,
-9686=>474,9687=>474,9688=>756,9689=>873,9690=>873,9691=>873,9692=>348,9693=>348,9694=>348,9695=>348,
-9696=>692,9697=>692,9698=>692,9699=>692,9700=>692,9701=>692,9702=>575,9703=>850,9704=>850,9705=>850,
-9706=>850,9707=>850,9708=>692,9709=>692,9710=>692,9711=>1007,9712=>850,9713=>850,9714=>850,9715=>850,
-9716=>785,9717=>785,9718=>785,9719=>785,9720=>692,9721=>692,9722=>692,9723=>747,9724=>747,9725=>659,
-9726=>659,9727=>692,9728=>807,9729=>900,9730=>807,9731=>807,9732=>807,9733=>807,9734=>807,9735=>515,
-9736=>806,9737=>807,9738=>799,9739=>799,9740=>604,9741=>911,9742=>1121,9743=>1125,9744=>807,9745=>807,
-9746=>807,9747=>479,9748=>807,9749=>807,9750=>807,9751=>807,9752=>807,9753=>807,9754=>807,9755=>807,
-9756=>807,9757=>548,9758=>807,9759=>548,9760=>807,9761=>807,9762=>807,9763=>807,9764=>602,9765=>671,
-9766=>584,9767=>705,9768=>490,9769=>807,9770=>807,9771=>807,9772=>639,9773=>807,9774=>807,9775=>807,
-9776=>807,9777=>807,9778=>807,9779=>807,9780=>807,9781=>807,9782=>807,9783=>807,9784=>807,9785=>807,
-9786=>807,9787=>807,9788=>807,9789=>807,9790=>807,9791=>552,9792=>658,9793=>658,9794=>807,9795=>807,
-9796=>807,9797=>807,9798=>807,9799=>807,9800=>807,9801=>807,9802=>807,9803=>807,9804=>807,9805=>807,
-9806=>807,9807=>807,9808=>807,9809=>807,9810=>807,9811=>807,9812=>807,9813=>807,9814=>807,9815=>807,
-9816=>807,9817=>807,9818=>807,9819=>807,9820=>807,9821=>807,9822=>807,9823=>807,9824=>807,9825=>807,
-9826=>807,9827=>807,9828=>807,9829=>807,9830=>807,9831=>807,9832=>807,9833=>424,9834=>574,9835=>807,
-9836=>807,9837=>424,9838=>321,9839=>435,9840=>673,9841=>689,9842=>807,9843=>807,9844=>807,9845=>807,
-9846=>807,9847=>807,9848=>807,9849=>807,9850=>807,9851=>807,9852=>807,9853=>807,9854=>807,9855=>807,
-9856=>782,9857=>782,9858=>782,9859=>782,9860=>782,9861=>782,9862=>807,9863=>807,9864=>807,9865=>807,
-9866=>807,9867=>807,9868=>807,9869=>807,9870=>807,9871=>807,9872=>807,9873=>807,9874=>807,9875=>807,
-9876=>807,9877=>487,9878=>807,9879=>807,9880=>807,9881=>807,9882=>807,9883=>807,9884=>807,9888=>807,
-9889=>632,9890=>903,9891=>977,9892=>1028,9893=>811,9894=>754,9895=>754,9896=>754,9897=>754,9898=>754,
-9899=>754,9900=>754,9901=>754,9902=>754,9903=>754,9904=>759,9905=>754,9906=>658,9907=>659,9908=>659,
-9909=>659,9910=>765,9911=>659,9912=>659,9985=>754,9986=>754,9987=>754,9988=>754,9990=>754,9991=>754,
-9992=>754,9993=>754,9996=>754,9997=>754,9998=>754,9999=>754,10000=>754,10001=>754,10002=>754,10003=>754,
-10004=>754,10005=>754,10006=>754,10007=>754,10008=>754,10009=>754,10010=>754,10011=>754,10012=>754,10013=>754,
-10014=>754,10015=>754,10016=>754,10017=>754,10018=>754,10019=>754,10020=>754,10021=>754,10022=>754,10023=>754,
-10025=>754,10026=>754,10027=>754,10028=>754,10029=>754,10030=>754,10031=>754,10032=>754,10033=>754,10034=>754,
-10035=>754,10036=>754,10037=>754,10038=>754,10039=>754,10040=>754,10041=>754,10042=>754,10043=>754,10044=>754,
-10045=>754,10046=>754,10047=>754,10048=>754,10049=>754,10050=>754,10051=>754,10052=>754,10053=>754,10054=>754,
-10055=>754,10056=>754,10057=>754,10058=>754,10059=>754,10061=>807,10063=>807,10064=>807,10065=>807,10066=>807,
-10070=>807,10072=>754,10073=>754,10074=>754,10075=>312,10076=>312,10077=>528,10078=>528,10081=>754,10082=>754,
-10083=>754,10084=>754,10085=>754,10086=>754,10087=>754,10088=>754,10089=>754,10090=>754,10091=>754,10092=>754,
-10093=>754,10094=>754,10095=>754,10096=>754,10097=>754,10098=>754,10099=>754,10100=>754,10101=>754,10102=>762,
-10103=>762,10104=>762,10105=>762,10106=>762,10107=>762,10108=>762,10109=>762,10110=>762,10111=>762,10112=>754,
-10113=>754,10114=>754,10115=>754,10116=>754,10117=>754,10118=>754,10119=>754,10120=>754,10121=>754,10122=>754,
-10123=>754,10124=>754,10125=>754,10126=>754,10127=>754,10128=>754,10129=>754,10130=>754,10131=>754,10132=>754,
-10136=>754,10137=>754,10138=>754,10139=>754,10140=>754,10141=>754,10142=>754,10143=>754,10144=>754,10145=>754,
-10146=>754,10147=>754,10148=>754,10149=>754,10150=>754,10151=>754,10152=>754,10153=>754,10154=>754,10155=>754,
-10156=>754,10157=>754,10158=>754,10159=>754,10161=>754,10162=>754,10163=>754,10164=>754,10165=>754,10166=>754,
-10167=>754,10168=>754,10169=>754,10170=>754,10171=>754,10172=>754,10173=>754,10174=>754,10181=>411,10182=>411,
-10208=>444,10214=>438,10215=>438,10216=>411,10217=>411,10218=>648,10219=>648,10224=>754,10225=>754,10226=>754,
-10227=>754,10228=>1042,10229=>1290,10230=>1290,10231=>1290,10232=>1290,10233=>1290,10234=>1290,10235=>1290,10236=>1290,
-10237=>1290,10238=>1290,10239=>1290,10240=>703,10241=>703,10242=>703,10243=>703,10244=>703,10245=>703,10246=>703,
-10247=>703,10248=>703,10249=>703,10250=>703,10251=>703,10252=>703,10253=>703,10254=>703,10255=>703,10256=>703,
-10257=>703,10258=>703,10259=>703,10260=>703,10261=>703,10262=>703,10263=>703,10264=>703,10265=>703,10266=>703,
-10267=>703,10268=>703,10269=>703,10270=>703,10271=>703,10272=>703,10273=>703,10274=>703,10275=>703,10276=>703,
-10277=>703,10278=>703,10279=>703,10280=>703,10281=>703,10282=>703,10283=>703,10284=>703,10285=>703,10286=>703,
-10287=>703,10288=>703,10289=>703,10290=>703,10291=>703,10292=>703,10293=>703,10294=>703,10295=>703,10296=>703,
-10297=>703,10298=>703,10299=>703,10300=>703,10301=>703,10302=>703,10303=>703,10304=>703,10305=>703,10306=>703,
-10307=>703,10308=>703,10309=>703,10310=>703,10311=>703,10312=>703,10313=>703,10314=>703,10315=>703,10316=>703,
-10317=>703,10318=>703,10319=>703,10320=>703,10321=>703,10322=>703,10323=>703,10324=>703,10325=>703,10326=>703,
-10327=>703,10328=>703,10329=>703,10330=>703,10331=>703,10332=>703,10333=>703,10334=>703,10335=>703,10336=>703,
-10337=>703,10338=>703,10339=>703,10340=>703,10341=>703,10342=>703,10343=>703,10344=>703,10345=>703,10346=>703,
-10347=>703,10348=>703,10349=>703,10350=>703,10351=>703,10352=>703,10353=>703,10354=>703,10355=>703,10356=>703,
-10357=>703,10358=>703,10359=>703,10360=>703,10361=>703,10362=>703,10363=>703,10364=>703,10365=>703,10366=>703,
-10367=>703,10368=>703,10369=>703,10370=>703,10371=>703,10372=>703,10373=>703,10374=>703,10375=>703,10376=>703,
-10377=>703,10378=>703,10379=>703,10380=>703,10381=>703,10382=>703,10383=>703,10384=>703,10385=>703,10386=>703,
-10387=>703,10388=>703,10389=>703,10390=>703,10391=>703,10392=>703,10393=>703,10394=>703,10395=>703,10396=>703,
-10397=>703,10398=>703,10399=>703,10400=>703,10401=>703,10402=>703,10403=>703,10404=>703,10405=>703,10406=>703,
-10407=>703,10408=>703,10409=>703,10410=>703,10411=>703,10412=>703,10413=>703,10414=>703,10415=>703,10416=>703,
-10417=>703,10418=>703,10419=>703,10420=>703,10421=>703,10422=>703,10423=>703,10424=>703,10425=>703,10426=>703,
-10427=>703,10428=>703,10429=>703,10430=>703,10431=>703,10432=>703,10433=>703,10434=>703,10435=>703,10436=>703,
-10437=>703,10438=>703,10439=>703,10440=>703,10441=>703,10442=>703,10443=>703,10444=>703,10445=>703,10446=>703,
-10447=>703,10448=>703,10449=>703,10450=>703,10451=>703,10452=>703,10453=>703,10454=>703,10455=>703,10456=>703,
-10457=>703,10458=>703,10459=>703,10460=>703,10461=>703,10462=>703,10463=>703,10464=>703,10465=>703,10466=>703,
-10467=>703,10468=>703,10469=>703,10470=>703,10471=>703,10472=>703,10473=>703,10474=>703,10475=>703,10476=>703,
-10477=>703,10478=>703,10479=>703,10480=>703,10481=>703,10482=>703,10483=>703,10484=>703,10485=>703,10486=>703,
-10487=>703,10488=>703,10489=>703,10490=>703,10491=>703,10492=>703,10493=>703,10494=>703,10495=>703,10502=>754,
-10503=>754,10506=>754,10507=>754,10560=>754,10561=>754,10627=>678,10628=>678,10702=>754,10703=>941,10704=>941,
-10705=>900,10706=>900,10707=>900,10708=>900,10709=>900,10731=>444,10746=>754,10747=>754,10752=>900,10753=>900,
-10754=>900,10764=>1495,10765=>506,10766=>506,10767=>506,10768=>506,10769=>506,10770=>506,10771=>506,10772=>506,
-10773=>506,10774=>506,10775=>506,10776=>506,10777=>506,10778=>506,10779=>506,10780=>506,10799=>754,10877=>754,
-10878=>754,10879=>754,10880=>754,10881=>754,10882=>754,10883=>754,10884=>754,10885=>754,10886=>754,10887=>754,
-10888=>754,10889=>754,10890=>754,10891=>754,10892=>754,10893=>754,10894=>754,10895=>754,10896=>754,10897=>754,
-10898=>754,10899=>754,10900=>754,10901=>754,10902=>754,10903=>754,10904=>754,10905=>754,10906=>754,10907=>754,
-10908=>754,10909=>754,10910=>754,10911=>754,10912=>754,10926=>754,10927=>754,10928=>754,10929=>754,10930=>754,
-10931=>754,10932=>754,10933=>754,10934=>754,10935=>754,10936=>754,10937=>754,10938=>754,11001=>754,11002=>754,
-11008=>754,11009=>754,11010=>754,11011=>754,11012=>754,11013=>754,11014=>754,11015=>754,11016=>754,11017=>754,
-11018=>754,11019=>754,11020=>754,11021=>754,11022=>754,11023=>754,11024=>754,11025=>754,11026=>850,11027=>850,
-11028=>850,11029=>850,11030=>692,11031=>692,11032=>692,11033=>692,11034=>850,11039=>782,11040=>782,11041=>786,
-11042=>786,11043=>786,11044=>1007,11091=>782,11092=>782,11360=>573,11361=>324,11362=>573,11363=>659,11364=>693,
-11365=>607,11366=>430,11367=>860,11368=>641,11369=>697,11370=>598,11371=>652,11372=>523,11373=>774,11374=>896,
-11375=>696,11377=>700,11378=>1099,11379=>950,11380=>586,11381=>628,11382=>508,11383=>704,11385=>484,11386=>618,
-11387=>502,11388=>197,11389=>438,11568=>622,11569=>847,11570=>847,11571=>652,11572=>652,11573=>652,11574=>608,
-11575=>696,11576=>696,11577=>615,11578=>615,11579=>721,11580=>890,11581=>685,11582=>561,11583=>685,11584=>847,
-11585=>847,11586=>335,11587=>666,11588=>753,11589=>822,11590=>604,11591=>663,11592=>612,11593=>615,11594=>542,
-11595=>935,11596=>700,11597=>753,11598=>615,11599=>334,11600=>700,11601=>335,11602=>652,11603=>622,11604=>847,
-11605=>847,11606=>753,11607=>335,11608=>752,11609=>847,11610=>847,11611=>660,11612=>789,11613=>694,11614=>660,
-11615=>615,11616=>696,11617=>753,11618=>615,11619=>765,11620=>627,11621=>765,11631=>644,11800=>522,11810=>411,
-11811=>411,11812=>411,11813=>411,11822=>522,19904=>807,19905=>807,19906=>807,19907=>807,19908=>807,19909=>807,
-19910=>807,19911=>807,19912=>807,19913=>807,19914=>807,19915=>807,19916=>807,19917=>807,19918=>807,19919=>807,
-19920=>807,19921=>807,19922=>807,19923=>807,19924=>807,19925=>807,19926=>807,19927=>807,19928=>807,19929=>807,
-19930=>807,19931=>807,19932=>807,19933=>807,19934=>807,19935=>807,19936=>807,19937=>807,19938=>807,19939=>807,
-19940=>807,19941=>807,19942=>807,19943=>807,19944=>807,19945=>807,19946=>807,19947=>807,19948=>807,19949=>807,
-19950=>807,19951=>807,19952=>807,19953=>807,19954=>807,19955=>807,19956=>807,19957=>807,19958=>807,19959=>807,
-19960=>807,19961=>807,19962=>807,19963=>807,19964=>807,19965=>807,19966=>807,19967=>807,42564=>648,42565=>536,
-42566=>392,42567=>396,42572=>1265,42573=>1055,42576=>1110,42577=>924,42580=>1056,42581=>875,42582=>983,42583=>862,
-42594=>976,42595=>832,42596=>986,42597=>821,42598=>1134,42599=>897,42600=>765,42601=>618,42602=>933,42603=>781,
-42604=>1266,42605=>995,42606=>865,42634=>867,42635=>708,42636=>614,42637=>521,42644=>727,42645=>641,42760=>450,
-42761=>450,42762=>450,42763=>450,42764=>450,42765=>450,42766=>450,42767=>450,42768=>450,42769=>450,42770=>450,
-42771=>450,42772=>450,42773=>450,42774=>450,42779=>360,42780=>360,42781=>258,42782=>258,42783=>258,42790=>753,
-42791=>641,42792=>928,42793=>771,42794=>626,42795=>501,42800=>502,42801=>536,42802=>1214,42803=>946,42804=>1156,
-42805=>958,42806=>1094,42807=>949,42808=>971,42809=>830,42810=>971,42811=>830,42812=>932,42813=>830,42814=>628,
-42815=>494,42822=>765,42823=>488,42824=>614,42825=>478,42826=>826,42827=>732,42830=>1266,42831=>995,42880=>573,
-42881=>308,42882=>753,42883=>641,42889=>360,42890=>347,42891=>410,42892=>275,43003=>615,43004=>659,43005=>896,
-43006=>334,43007=>1192,63173=>618,64256=>729,64257=>667,64258=>667,64259=>1003,64260=>1004,64261=>727,64262=>917,
-64275=>1249,64276=>1245,64277=>1240,64278=>1245,64279=>1542,64285=>308,64286=>0,64287=>597,64288=>647,64289=>867,
-64290=>801,64291=>889,64292=>867,64293=>844,64294=>889,64295=>889,64296=>878,64297=>754,64298=>854,64299=>854,
-64300=>854,64301=>854,64302=>676,64303=>676,64304=>676,64305=>605,64306=>483,64307=>589,64308=>641,64309=>394,
-64310=>442,64312=>651,64313=>394,64314=>584,64315=>584,64316=>611,64318=>698,64320=>447,64321=>696,64323=>646,
-64324=>618,64326=>676,64327=>656,64328=>584,64329=>854,64330=>676,64331=>308,64332=>605,64333=>584,64334=>618,
-64335=>676,64338=>904,64339=>953,64340=>338,64341=>367,64342=>904,64343=>953,64344=>338,64345=>367,64346=>904,
-64347=>953,64348=>338,64349=>367,64350=>904,64351=>953,64352=>338,64353=>367,64354=>904,64355=>953,64356=>338,
-64357=>367,64358=>904,64359=>953,64360=>338,64361=>367,64362=>1045,64363=>1072,64364=>589,64365=>647,64366=>1045,
-64367=>1072,64368=>589,64369=>647,64370=>648,64371=>648,64372=>648,64373=>648,64374=>648,64375=>648,64376=>648,
-64377=>648,64378=>648,64379=>648,64380=>648,64381=>648,64382=>648,64383=>648,64384=>648,64385=>648,64394=>518,
-64395=>560,64396=>518,64397=>560,64398=>921,64399=>921,64400=>523,64401=>523,64402=>921,64403=>921,64404=>523,
-64405=>523,64414=>768,64415=>810,64473=>559,64474=>564,64488=>338,64489=>367,64508=>825,64509=>910,64510=>338,
-64511=>367,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,65056=>0,65057=>0,65058=>0,
-65059=>0,65136=>308,65137=>308,65138=>308,65139=>311,65140=>308,65142=>308,65143=>308,65144=>308,65145=>308,
-65146=>308,65147=>308,65148=>308,65149=>308,65150=>308,65151=>308,65152=>460,65153=>308,65154=>338,65155=>308,
-65156=>338,65157=>559,65158=>564,65159=>308,65160=>338,65161=>825,65162=>825,65163=>338,65164=>367,65165=>308,
-65166=>338,65167=>904,65168=>953,65169=>338,65170=>367,65171=>531,65172=>545,65173=>904,65174=>953,65175=>338,
-65176=>367,65177=>904,65178=>953,65179=>338,65180=>367,65181=>648,65182=>648,65183=>648,65184=>648,65185=>648,
-65186=>648,65187=>648,65188=>648,65189=>648,65190=>648,65191=>648,65192=>648,65193=>461,65194=>520,65195=>461,
-65196=>520,65197=>518,65198=>560,65199=>518,65200=>560,65201=>1242,65202=>1272,65203=>885,65204=>916,65205=>1242,
-65206=>1272,65207=>885,65208=>916,65209=>1210,65210=>1228,65211=>870,65212=>887,65213=>1210,65214=>1228,65215=>870,
-65216=>887,65217=>935,65218=>963,65219=>848,65220=>876,65221=>935,65222=>963,65223=>848,65224=>876,65225=>615,
-65226=>615,65227=>615,65228=>508,65229=>615,65230=>615,65231=>615,65232=>508,65233=>1045,65234=>1072,65235=>589,
-65236=>647,65237=>804,65238=>811,65239=>589,65240=>647,65241=>825,65242=>838,65243=>523,65244=>523,65245=>781,
-65246=>803,65247=>338,65248=>367,65249=>659,65250=>706,65251=>557,65252=>603,65253=>768,65254=>810,65255=>338,
-65256=>367,65257=>531,65258=>545,65259=>624,65260=>594,65261=>559,65262=>564,65263=>825,65264=>910,65265=>825,
-65266=>910,65267=>338,65268=>367,65269=>670,65270=>683,65271=>670,65272=>683,65273=>670,65274=>683,65275=>670,
-65276=>683,65279=>0,65529=>0,65530=>0,65531=>0,65532=>0,65533=>1002);
-$enc='';
-$diff='';
-$file='dejavusanscondensedb.z';
-$ctg='dejavusanscondensedb.ctg.z';
-$originalsize=534464;
-?>
\ No newline at end of file
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusanscondensedb.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusanscondensedb.z
deleted file mode 100644
index 5d59661c..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusanscondensedb.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusanscondensedbi.ctg.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusanscondensedbi.ctg.z
deleted file mode 100644
index 9d1fcd61..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusanscondensedbi.ctg.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusanscondensedbi.php b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusanscondensedbi.php
deleted file mode 100644
index eb130ab5..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusanscondensedbi.php
+++ /dev/null
@@ -1,458 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='DejaVuSansCondensed-BoldOblique';
-$desc=array('Ascent'=>928,'Descent'=>-236,'CapHeight'=>-46,'Flags'=>96,'FontBBox'=>'[-960 -385 1804 1121]','ItalicAngle'=>-11,'StemV'=>120,'MissingWidth'=>540);
-$up=-63;
-$ut=44;
-$dw=540;
-$cw=array(
-0=>540,32=>313,33=>410,34=>469,35=>626,36=>626,37=>901,38=>785,39=>275,40=>411,
-41=>411,42=>470,43=>754,44=>342,45=>374,46=>342,47=>329,48=>626,49=>626,50=>626,
-51=>626,52=>626,53=>626,54=>626,55=>626,56=>626,57=>626,58=>360,59=>360,60=>754,
-61=>754,62=>754,63=>522,64=>900,65=>696,66=>686,67=>660,68=>747,69=>615,70=>615,
-71=>738,72=>753,73=>334,74=>334,75=>697,76=>573,77=>896,78=>753,79=>765,80=>659,
-81=>765,82=>693,83=>648,84=>614,85=>730,86=>696,87=>993,88=>694,89=>651,90=>652,
-91=>411,92=>329,93=>411,94=>754,95=>450,96=>450,97=>607,98=>644,99=>533,100=>644,
-101=>610,102=>391,103=>644,104=>641,105=>308,106=>308,107=>598,108=>308,109=>938,110=>641,
-111=>618,112=>644,113=>644,114=>444,115=>536,116=>430,117=>641,118=>586,119=>831,120=>580,
-121=>586,122=>523,123=>641,124=>329,125=>641,126=>754,8364=>626,8218=>342,402=>391,8222=>580,
-8230=>900,8224=>450,8225=>450,710=>450,8240=>1309,352=>648,8249=>371,338=>1050,381=>652,8216=>342,
-8217=>342,8220=>580,8221=>580,8226=>575,8211=>450,8212=>900,732=>450,8482=>900,353=>536,8250=>371,
-339=>984,382=>523,376=>651,160=>313,161=>410,162=>626,163=>626,164=>572,165=>626,166=>329,
-167=>450,168=>450,169=>900,170=>507,171=>584,172=>754,173=>374,174=>900,175=>450,176=>450,
-177=>754,178=>394,179=>394,180=>450,181=>662,182=>572,183=>342,184=>450,185=>394,186=>507,
-187=>584,188=>932,189=>932,190=>932,191=>522,192=>696,193=>696,194=>696,195=>696,196=>696,
-197=>696,198=>976,199=>660,200=>615,201=>615,202=>615,203=>615,204=>334,205=>334,206=>334,
-207=>334,208=>760,209=>753,210=>765,211=>765,212=>765,213=>765,214=>765,215=>754,216=>765,
-217=>730,218=>730,219=>730,220=>730,221=>651,222=>668,223=>647,224=>607,225=>607,226=>607,
-227=>607,228=>607,229=>607,230=>943,231=>533,232=>610,233=>610,234=>610,235=>610,236=>308,
-237=>308,238=>308,239=>308,240=>618,241=>641,242=>618,243=>618,244=>618,245=>618,246=>618,
-247=>754,248=>618,249=>641,250=>641,251=>641,252=>641,253=>586,254=>644,255=>586,256=>696,
-257=>607,258=>696,259=>607,260=>696,261=>607,262=>660,263=>533,264=>660,265=>533,266=>660,
-267=>533,268=>660,269=>533,270=>747,271=>644,272=>760,273=>644,274=>615,275=>610,276=>615,
-277=>610,278=>615,279=>610,280=>615,281=>610,282=>615,283=>610,284=>738,285=>644,286=>738,
-287=>644,288=>738,289=>644,290=>738,291=>644,292=>753,293=>641,294=>876,295=>711,296=>334,
-297=>308,298=>334,299=>308,300=>334,301=>308,302=>334,303=>308,304=>334,305=>308,306=>669,
-307=>617,308=>334,309=>308,310=>697,311=>598,312=>598,313=>573,314=>308,315=>573,316=>308,
-317=>573,318=>308,319=>573,320=>308,321=>594,322=>337,323=>753,324=>641,325=>753,326=>641,
-327=>753,328=>641,329=>884,330=>753,331=>641,332=>765,333=>618,334=>765,335=>618,336=>765,
-337=>618,340=>693,341=>444,342=>693,343=>444,344=>693,345=>444,346=>648,347=>536,348=>648,
-349=>536,350=>648,351=>536,354=>614,355=>430,356=>614,357=>430,358=>614,359=>430,360=>730,
-361=>641,362=>730,363=>641,364=>730,365=>641,366=>730,367=>641,368=>730,369=>641,370=>730,
-371=>641,372=>993,373=>831,374=>651,375=>586,377=>652,378=>523,379=>652,380=>523,383=>391,
-384=>644,385=>729,386=>686,387=>644,388=>686,389=>644,390=>660,391=>660,392=>533,393=>760,
-394=>791,395=>686,396=>644,397=>618,398=>615,399=>765,400=>626,401=>615,403=>738,404=>713,
-405=>940,406=>392,407=>350,408=>697,409=>598,410=>324,411=>532,412=>938,413=>753,414=>641,
-415=>765,416=>765,417=>618,418=>1002,419=>866,420=>703,421=>644,422=>693,423=>648,424=>536,
-425=>615,426=>497,427=>430,428=>636,429=>430,430=>614,431=>730,432=>641,433=>692,434=>732,
-435=>717,436=>700,437=>652,438=>523,439=>695,440=>695,441=>576,442=>523,443=>626,444=>695,
-445=>576,446=>515,447=>644,448=>334,449=>593,450=>489,451=>334,452=>1393,453=>1305,454=>1176,
-455=>879,456=>881,457=>603,458=>1074,459=>1091,460=>957,461=>696,462=>607,463=>334,464=>308,
-465=>765,466=>618,467=>730,468=>641,469=>730,470=>641,471=>730,472=>641,473=>730,474=>641,
-475=>730,476=>641,477=>610,478=>696,479=>607,480=>696,481=>607,482=>976,483=>943,484=>738,
-485=>644,486=>738,487=>644,488=>697,489=>598,490=>765,491=>618,492=>765,493=>618,494=>695,
-495=>523,496=>308,497=>1393,498=>1305,499=>1176,500=>738,501=>644,502=>1160,503=>708,504=>753,
-505=>641,506=>696,507=>607,508=>976,509=>943,510=>765,511=>618,512=>696,513=>607,514=>696,
-515=>607,516=>615,517=>610,518=>615,519=>610,520=>334,521=>308,522=>334,523=>308,524=>765,
-525=>618,526=>765,527=>618,528=>693,529=>444,530=>693,531=>444,532=>730,533=>641,534=>730,
-535=>641,536=>648,537=>536,538=>614,539=>430,540=>621,541=>546,542=>753,543=>641,544=>753,
-545=>778,546=>728,547=>593,548=>652,549=>523,550=>696,551=>607,552=>615,553=>610,554=>765,
-555=>618,556=>765,557=>618,558=>765,559=>618,560=>765,561=>618,562=>651,563=>586,564=>442,
-565=>780,566=>460,567=>308,568=>979,569=>979,570=>696,571=>660,572=>533,573=>573,574=>614,
-575=>536,576=>523,577=>703,578=>553,579=>686,580=>730,581=>696,582=>615,583=>610,584=>334,
-585=>308,586=>774,587=>712,588=>693,589=>444,590=>651,591=>586,592=>607,593=>644,594=>644,
-595=>644,596=>533,597=>533,598=>712,599=>712,600=>610,601=>610,602=>788,603=>501,604=>490,
-605=>696,606=>658,607=>308,608=>712,609=>644,610=>564,611=>661,612=>571,613=>641,614=>641,
-615=>641,616=>491,617=>396,618=>491,619=>502,620=>624,621=>308,622=>757,623=>938,624=>938,
-625=>938,626=>641,627=>713,628=>578,629=>618,630=>817,631=>613,632=>716,633=>484,634=>484,
-635=>584,636=>444,637=>444,638=>536,639=>536,640=>578,641=>578,642=>536,643=>374,644=>391,
-645=>544,646=>497,647=>430,648=>430,649=>828,650=>692,651=>603,652=>586,653=>831,654=>586,
-655=>651,656=>624,657=>615,658=>576,659=>576,660=>515,661=>515,662=>515,663=>515,664=>765,
-665=>569,666=>658,667=>616,668=>622,669=>308,670=>659,671=>485,672=>712,673=>515,674=>515,
-675=>1040,676=>1093,677=>1039,678=>876,679=>691,680=>836,681=>923,682=>712,683=>702,684=>532,
-685=>374,686=>609,687=>710,688=>410,689=>410,690=>197,691=>284,692=>284,693=>284,694=>369,
-695=>532,696=>375,697=>271,698=>469,699=>342,700=>342,701=>342,702=>330,703=>330,704=>293,
-705=>293,706=>450,707=>450,708=>450,709=>450,711=>450,712=>275,713=>450,714=>450,715=>450,
-716=>275,717=>450,718=>450,719=>450,720=>303,721=>303,722=>330,723=>330,724=>450,725=>450,
-726=>374,727=>295,728=>450,729=>450,730=>450,731=>450,733=>450,734=>315,735=>450,736=>370,
-737=>197,738=>343,739=>371,740=>293,741=>450,742=>450,743=>450,744=>450,745=>450,748=>450,
-749=>450,750=>580,755=>450,759=>450,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,832=>0,833=>0,
-834=>0,835=>0,836=>0,837=>0,838=>0,839=>0,840=>0,841=>0,842=>0,843=>0,
-844=>0,845=>0,846=>0,847=>0,849=>0,850=>0,851=>0,855=>0,856=>0,858=>0,
-860=>0,861=>0,862=>0,863=>0,864=>0,865=>0,866=>0,880=>628,881=>508,882=>919,
-883=>752,884=>271,885=>271,886=>753,887=>630,890=>450,891=>533,892=>495,893=>494,894=>360,
-900=>397,901=>450,902=>717,903=>342,904=>761,905=>908,906=>507,908=>801,910=>882,911=>804,
-912=>351,913=>696,914=>686,915=>573,916=>696,917=>615,918=>652,919=>753,920=>765,921=>334,
-922=>697,923=>696,924=>896,925=>753,926=>568,927=>765,928=>753,929=>659,931=>615,932=>614,
-933=>651,934=>765,935=>694,936=>765,937=>765,938=>334,939=>651,940=>618,941=>501,942=>641,
-943=>351,944=>607,945=>618,946=>644,947=>613,948=>618,949=>501,950=>532,951=>641,952=>618,
-953=>351,954=>639,955=>569,956=>662,957=>613,958=>532,959=>618,960=>712,961=>644,962=>533,
-963=>701,964=>574,965=>607,966=>704,967=>580,968=>714,969=>782,970=>351,971=>607,972=>618,
-973=>607,974=>782,975=>697,976=>585,977=>594,978=>671,979=>883,980=>671,981=>716,982=>782,
-983=>669,984=>765,985=>618,986=>660,987=>533,988=>615,989=>444,990=>632,991=>593,992=>827,
-993=>564,994=>983,995=>753,996=>749,997=>644,998=>835,999=>669,1000=>660,1001=>585,1002=>709,
-1003=>604,1004=>677,1005=>644,1006=>614,1007=>531,1008=>669,1009=>644,1010=>533,1011=>308,1012=>765,
-1013=>580,1014=>580,1015=>668,1016=>644,1017=>660,1018=>896,1019=>659,1020=>644,1021=>660,1022=>660,
-1023=>628,1024=>615,1025=>615,1026=>791,1027=>573,1028=>660,1029=>648,1030=>334,1031=>334,1032=>334,
-1033=>1039,1034=>1017,1035=>791,1036=>735,1037=>753,1038=>694,1039=>753,1040=>696,1041=>686,1042=>686,
-1043=>573,1044=>801,1045=>615,1046=>1102,1047=>639,1048=>753,1049=>753,1050=>735,1051=>747,1052=>896,
-1053=>753,1054=>765,1055=>753,1056=>659,1057=>660,1058=>614,1059=>694,1060=>892,1061=>694,1062=>835,
-1063=>727,1064=>1112,1065=>1193,1066=>845,1067=>932,1068=>686,1069=>660,1070=>1056,1071=>693,1072=>607,
-1073=>628,1074=>569,1075=>470,1076=>727,1077=>610,1078=>896,1079=>523,1080=>630,1081=>630,1082=>611,
-1083=>659,1084=>735,1085=>622,1086=>618,1087=>622,1088=>644,1089=>533,1090=>521,1091=>586,1092=>893,
-1093=>580,1094=>667,1095=>618,1096=>956,1097=>995,1098=>676,1099=>813,1100=>569,1101=>533,1102=>875,
-1103=>578,1104=>610,1105=>610,1106=>642,1107=>470,1108=>533,1109=>536,1110=>308,1111=>308,1112=>308,
-1113=>892,1114=>860,1115=>661,1116=>611,1117=>630,1118=>586,1119=>622,1120=>983,1121=>782,1122=>756,
-1123=>662,1124=>911,1125=>755,1126=>893,1127=>749,1128=>1222,1129=>1009,1130=>765,1131=>618,1132=>1112,
-1133=>906,1134=>626,1135=>501,1136=>967,1137=>955,1138=>765,1139=>618,1140=>765,1141=>625,1142=>765,
-1143=>625,1144=>1033,1145=>939,1146=>967,1147=>776,1148=>1265,1149=>1055,1150=>983,1151=>782,1152=>660,
-1153=>533,1154=>587,1155=>0,1156=>0,1157=>0,1158=>0,1159=>0,1160=>376,1161=>376,1162=>844,
-1163=>725,1164=>686,1165=>550,1166=>662,1167=>646,1168=>573,1169=>470,1170=>599,1171=>488,1172=>709,
-1173=>470,1174=>1102,1175=>896,1176=>639,1177=>523,1178=>697,1179=>611,1180=>735,1181=>611,1182=>735,
-1183=>611,1184=>914,1185=>743,1186=>753,1187=>622,1188=>992,1189=>783,1190=>1129,1191=>880,1192=>851,
-1193=>773,1194=>660,1195=>533,1196=>614,1197=>521,1198=>651,1199=>586,1200=>651,1201=>586,1202=>694,
-1203=>580,1204=>993,1205=>901,1206=>727,1207=>618,1208=>727,1209=>618,1210=>727,1211=>641,1212=>923,
-1213=>729,1214=>923,1215=>729,1216=>334,1217=>1102,1218=>896,1219=>700,1220=>566,1221=>839,1222=>724,
-1223=>753,1224=>622,1225=>844,1226=>725,1227=>727,1228=>618,1229=>986,1230=>838,1231=>308,1232=>696,
-1233=>607,1234=>696,1235=>607,1236=>976,1237=>943,1238=>615,1239=>610,1240=>765,1241=>610,1242=>765,
-1243=>610,1244=>1102,1245=>896,1246=>639,1247=>523,1248=>695,1249=>576,1250=>753,1251=>630,1252=>753,
-1253=>630,1254=>765,1255=>618,1256=>765,1257=>618,1258=>765,1259=>618,1260=>660,1261=>533,1262=>694,
-1263=>586,1264=>694,1265=>586,1266=>694,1267=>586,1268=>727,1269=>618,1270=>573,1271=>470,1272=>932,
-1273=>813,1274=>599,1275=>488,1276=>694,1277=>580,1278=>694,1279=>580,1280=>686,1281=>547,1282=>1043,
-1283=>804,1284=>1007,1285=>828,1286=>745,1287=>624,1288=>1117,1289=>915,1290=>1160,1291=>912,1292=>755,
-1293=>574,1294=>844,1295=>722,1296=>626,1297=>501,1298=>747,1299=>659,1300=>1157,1301=>963,1302=>958,
-1303=>883,1304=>973,1305=>864,1306=>765,1307=>644,1308=>993,1309=>831,1312=>1123,1313=>920,1314=>1128,
-1315=>880,1316=>861,1317=>726,1329=>886,1330=>730,1331=>886,1332=>886,1333=>730,1334=>699,1335=>730,
-1336=>730,1337=>877,1338=>886,1339=>730,1340=>639,1341=>970,1342=>1022,1343=>730,1344=>639,1345=>681,
-1346=>886,1347=>789,1348=>886,1349=>714,1350=>886,1351=>730,1352=>730,1353=>730,1354=>862,1355=>699,
-1356=>886,1357=>730,1358=>886,1359=>648,1360=>730,1361=>714,1362=>805,1363=>765,1364=>842,1365=>765,
-1366=>648,1369=>330,1370=>342,1371=>495,1372=>495,1373=>342,1374=>491,1375=>468,1377=>938,1378=>641,
-1379=>779,1380=>781,1381=>641,1382=>735,1383=>588,1384=>641,1385=>729,1386=>735,1387=>641,1388=>448,
-1389=>916,1390=>644,1391=>641,1392=>641,1393=>644,1394=>737,1395=>641,1396=>676,1397=>308,1398=>794,
-1399=>502,1400=>641,1401=>502,1402=>938,1403=>502,1404=>777,1405=>641,1406=>732,1407=>938,1408=>641,
-1409=>644,1410=>514,1411=>938,1412=>700,1413=>618,1414=>648,1415=>776,1417=>360,1418=>438,1456=>0,
-1457=>0,1458=>0,1459=>0,1460=>0,1461=>0,1462=>0,1463=>0,1464=>0,1465=>0,1466=>0,
-1467=>0,1468=>0,1469=>0,1470=>374,1471=>0,1472=>334,1473=>0,1474=>0,1475=>334,1478=>447,
-1479=>0,1488=>676,1489=>605,1490=>483,1491=>589,1492=>641,1493=>308,1494=>442,1495=>641,1496=>651,
-1497=>308,1498=>584,1499=>584,1500=>611,1501=>641,1502=>698,1503=>308,1504=>447,1505=>696,1506=>610,
-1507=>646,1508=>618,1509=>565,1510=>676,1511=>656,1512=>584,1513=>854,1514=>676,1520=>598,1521=>598,
-1522=>597,1523=>399,1524=>639,3647=>668,3713=>734,3714=>673,3716=>674,3719=>512,3720=>668,3722=>669,
-3725=>685,3732=>635,3733=>633,3734=>672,3735=>737,3737=>657,3738=>654,3739=>654,3740=>830,3741=>744,
-3742=>779,3743=>779,3745=>752,3746=>685,3747=>692,3749=>691,3751=>642,3754=>744,3755=>928,3757=>651,
-3758=>705,3759=>840,3760=>620,3761=>0,3762=>549,3763=>549,3764=>0,3765=>0,3766=>0,3767=>0,
-3768=>0,3769=>0,3771=>0,3772=>0,3773=>603,3776=>464,3777=>774,3778=>464,3779=>584,3780=>569,
-3782=>683,3784=>0,3785=>0,3786=>0,3787=>0,3788=>0,3789=>0,3792=>694,3793=>694,3794=>624,
-3795=>752,3796=>655,3797=>655,3798=>764,3799=>710,3800=>683,3801=>818,3804=>1227,3805=>1227,4256=>826,
-4257=>669,4258=>665,4259=>753,4260=>584,4261=>696,4262=>771,4263=>800,4264=>477,4265=>570,4266=>771,
-4267=>810,4268=>579,4269=>813,4270=>732,4271=>677,4272=>782,4273=>579,4274=>579,4275=>797,4276=>797,
-4277=>660,4278=>587,4279=>579,4280=>582,4281=>579,4282=>710,4283=>812,4284=>570,4285=>557,4286=>579,
-4287=>700,4288=>802,4289=>541,4290=>668,4291=>554,4292=>570,4293=>668,4304=>497,4305=>497,4306=>536,
-4307=>734,4308=>505,4309=>506,4310=>497,4311=>744,4312=>497,4313=>488,4314=>967,4315=>506,4316=>507,
-4317=>730,4318=>497,4319=>532,4320=>740,4321=>506,4322=>621,4323=>525,4324=>732,4325=>505,4326=>731,
-4327=>506,4328=>506,4329=>507,4330=>568,4331=>506,4332=>506,4333=>497,4334=>506,4335=>506,4336=>501,
-4337=>543,4338=>497,4339=>497,4340=>497,4341=>544,4342=>767,4343=>571,4344=>506,4345=>536,4346=>487,
-4347=>615,4348=>331,5121=>696,5122=>696,5123=>696,5124=>696,5125=>814,5126=>814,5127=>814,5129=>814,
-5130=>814,5131=>814,5132=>916,5133=>908,5134=>916,5135=>908,5136=>916,5137=>908,5138=>1034,5139=>1025,
-5140=>1034,5141=>1025,5142=>814,5143=>1034,5144=>1028,5145=>1034,5146=>1028,5147=>814,5149=>278,5150=>476,
-5151=>382,5152=>382,5153=>355,5154=>355,5155=>355,5156=>355,5157=>507,5158=>423,5159=>278,5160=>355,
-5161=>355,5162=>355,5163=>1092,5164=>888,5165=>1094,5166=>1167,5167=>696,5168=>696,5169=>696,5170=>696,
-5171=>797,5172=>797,5173=>797,5175=>797,5176=>797,5177=>797,5178=>916,5179=>908,5180=>916,5181=>908,
-5182=>916,5183=>908,5184=>1034,5185=>1025,5186=>1034,5187=>1025,5188=>1034,5189=>1028,5190=>1034,5191=>1028,
-5192=>797,5193=>518,5194=>206,5196=>730,5197=>730,5198=>730,5199=>730,5200=>734,5201=>734,5202=>734,
-5204=>734,5205=>734,5206=>734,5207=>950,5208=>943,5209=>950,5210=>943,5211=>950,5212=>943,5213=>954,
-5214=>949,5215=>954,5216=>949,5217=>954,5218=>946,5219=>954,5220=>946,5221=>954,5222=>435,5223=>904,
-5224=>904,5225=>921,5226=>915,5227=>668,5228=>668,5229=>668,5230=>668,5231=>668,5232=>668,5233=>668,
-5234=>668,5235=>668,5236=>926,5237=>877,5238=>882,5239=>877,5240=>882,5241=>877,5242=>926,5243=>877,
-5244=>926,5245=>877,5246=>882,5247=>877,5248=>882,5249=>877,5250=>882,5251=>451,5252=>451,5253=>844,
-5254=>844,5255=>844,5256=>844,5257=>668,5258=>668,5259=>668,5260=>668,5261=>668,5262=>668,5263=>668,
-5264=>668,5265=>668,5266=>926,5267=>877,5268=>926,5269=>877,5270=>926,5271=>877,5272=>926,5273=>877,
-5274=>926,5275=>877,5276=>926,5277=>877,5278=>926,5279=>877,5280=>926,5281=>451,5282=>451,5283=>563,
-5284=>563,5285=>563,5286=>563,5287=>563,5288=>563,5289=>563,5290=>563,5291=>563,5292=>793,5293=>769,
-5294=>777,5295=>786,5296=>777,5297=>786,5298=>793,5299=>786,5300=>793,5301=>786,5302=>777,5303=>786,
-5304=>777,5305=>786,5306=>777,5307=>392,5308=>493,5309=>392,5312=>889,5313=>889,5314=>889,5315=>889,
-5316=>838,5317=>838,5318=>838,5319=>838,5320=>838,5321=>1114,5322=>1122,5323=>1080,5324=>1105,5325=>1080,
-5326=>1105,5327=>838,5328=>593,5329=>447,5330=>593,5331=>889,5332=>889,5333=>889,5334=>889,5335=>838,
-5336=>838,5337=>838,5338=>838,5339=>838,5340=>1107,5341=>1122,5342=>1155,5343=>1105,5344=>1155,5345=>1105,
-5346=>1105,5347=>1093,5348=>1105,5349=>1093,5350=>1155,5351=>1105,5352=>1155,5353=>1105,5354=>593,5356=>797,
-5357=>657,5358=>657,5359=>657,5360=>657,5361=>657,5362=>657,5363=>657,5364=>657,5365=>657,5366=>897,
-5367=>862,5368=>870,5369=>890,5370=>870,5371=>890,5372=>897,5373=>862,5374=>897,5375=>862,5376=>870,
-5377=>890,5378=>870,5379=>890,5380=>870,5381=>443,5382=>414,5383=>443,5392=>831,5393=>831,5394=>831,
-5395=>1022,5396=>1022,5397=>1022,5398=>1022,5399=>1088,5400=>1081,5401=>1088,5402=>1081,5403=>1088,5404=>1081,
-5405=>1288,5406=>1278,5407=>1288,5408=>1278,5409=>1288,5410=>1278,5411=>1288,5412=>1278,5413=>671,5414=>698,
-5415=>698,5416=>698,5417=>698,5418=>698,5419=>698,5420=>698,5421=>698,5422=>698,5423=>902,5424=>903,
-5425=>911,5426=>896,5427=>911,5428=>896,5429=>902,5430=>903,5431=>902,5432=>903,5433=>911,5434=>896,
-5435=>911,5436=>896,5437=>911,5438=>445,5440=>355,5441=>458,5442=>929,5443=>929,5444=>878,5445=>878,
-5446=>878,5447=>878,5448=>659,5449=>659,5450=>659,5451=>659,5452=>659,5453=>659,5454=>902,5455=>863,
-5456=>445,5458=>797,5459=>696,5460=>696,5461=>696,5462=>696,5463=>835,5464=>835,5465=>835,5466=>835,
-5467=>1055,5468=>1028,5469=>542,5470=>730,5471=>730,5472=>730,5473=>730,5474=>730,5475=>730,5476=>734,
-5477=>734,5478=>734,5479=>734,5480=>954,5481=>946,5482=>493,5492=>879,5493=>879,5494=>879,5495=>879,
-5496=>879,5497=>879,5498=>879,5499=>556,5500=>753,5501=>458,5502=>1114,5503=>1114,5504=>1114,5505=>1114,
-5506=>1114,5507=>1114,5508=>1114,5509=>890,5514=>879,5515=>879,5516=>879,5517=>879,5518=>1432,5519=>1432,
-5520=>1432,5521=>1165,5522=>1165,5523=>1432,5524=>1432,5525=>763,5526=>1146,5536=>889,5537=>889,5538=>838,
-5539=>838,5540=>838,5541=>838,5542=>593,5543=>698,5544=>698,5545=>698,5546=>698,5547=>698,5548=>698,
-5549=>698,5550=>445,5551=>668,5598=>747,5601=>747,5702=>446,5703=>446,5742=>371,5743=>1114,5744=>1432,
-5745=>1814,5746=>1814,5747=>1548,5748=>1510,5749=>1814,5750=>1814,7424=>586,7425=>750,7426=>943,7427=>547,
-7428=>533,7429=>608,7430=>608,7431=>502,7432=>501,7433=>308,7434=>444,7435=>598,7436=>485,7437=>735,
-7438=>630,7439=>618,7440=>533,7441=>594,7442=>594,7443=>594,7444=>984,7446=>618,7447=>618,7448=>500,
-7449=>578,7450=>578,7451=>521,7452=>571,7453=>663,7454=>853,7455=>625,7456=>586,7457=>831,7458=>523,
-7459=>581,7462=>485,7463=>586,7464=>622,7465=>500,7466=>703,7467=>659,7468=>438,7469=>615,7470=>432,
-7472=>470,7473=>387,7474=>387,7475=>465,7476=>474,7477=>211,7478=>211,7479=>439,7480=>361,7481=>563,
-7482=>474,7483=>474,7484=>481,7485=>458,7486=>415,7487=>436,7488=>387,7489=>460,7490=>625,7491=>412,
-7492=>412,7493=>431,7494=>641,7495=>431,7496=>431,7497=>431,7498=>431,7499=>347,7500=>347,7501=>431,
-7502=>197,7503=>438,7504=>597,7505=>410,7506=>439,7507=>372,7508=>439,7509=>439,7510=>431,7511=>349,
-7512=>410,7513=>416,7514=>597,7515=>451,7517=>405,7518=>386,7519=>389,7520=>443,7521=>365,7522=>197,
-7523=>284,7524=>410,7525=>451,7526=>405,7527=>386,7528=>405,7529=>443,7530=>365,7543=>644,7544=>474,
-7547=>491,7557=>462,7579=>431,7580=>372,7581=>372,7582=>439,7583=>347,7584=>339,7585=>313,7586=>431,
-7587=>410,7588=>312,7589=>253,7590=>312,7591=>312,7592=>388,7593=>293,7594=>296,7595=>333,7596=>598,
-7597=>597,7598=>505,7599=>505,7600=>403,7601=>439,7602=>488,7603=>379,7604=>356,7605=>349,7606=>524,
-7607=>444,7608=>359,7609=>405,7610=>451,7611=>375,7612=>471,7613=>422,7614=>409,7615=>382,7620=>0,
-7621=>0,7622=>0,7623=>0,7624=>0,7625=>0,7680=>696,7681=>607,7682=>686,7683=>644,7684=>686,
-7685=>644,7686=>686,7687=>644,7688=>660,7689=>533,7690=>747,7691=>644,7692=>747,7693=>644,7694=>747,
-7695=>644,7696=>747,7697=>644,7698=>747,7699=>644,7700=>615,7701=>610,7702=>615,7703=>610,7704=>615,
-7705=>610,7706=>615,7707=>610,7708=>615,7709=>610,7710=>615,7711=>391,7712=>738,7713=>644,7714=>753,
-7715=>641,7716=>753,7717=>641,7718=>753,7719=>641,7720=>753,7721=>641,7722=>753,7723=>641,7724=>334,
-7725=>308,7726=>334,7727=>308,7728=>697,7729=>598,7730=>697,7731=>598,7732=>697,7733=>598,7734=>573,
-7735=>308,7736=>573,7737=>308,7738=>573,7739=>308,7740=>573,7741=>308,7742=>896,7743=>938,7744=>896,
-7745=>938,7746=>896,7747=>938,7748=>753,7749=>641,7750=>753,7751=>641,7752=>753,7753=>641,7754=>753,
-7755=>641,7756=>765,7757=>618,7758=>765,7759=>618,7760=>765,7761=>618,7762=>765,7763=>618,7764=>659,
-7765=>644,7766=>659,7767=>644,7768=>693,7769=>444,7770=>693,7771=>444,7772=>693,7773=>444,7774=>693,
-7775=>444,7776=>648,7777=>536,7778=>648,7779=>536,7780=>648,7781=>536,7782=>648,7783=>536,7784=>648,
-7785=>536,7786=>614,7787=>430,7788=>614,7789=>430,7790=>614,7791=>430,7792=>614,7793=>430,7794=>730,
-7795=>641,7796=>730,7797=>641,7798=>730,7799=>641,7800=>730,7801=>641,7802=>730,7803=>641,7804=>696,
-7805=>586,7806=>696,7807=>586,7808=>993,7809=>831,7810=>993,7811=>831,7812=>993,7813=>831,7814=>993,
-7815=>831,7816=>993,7817=>831,7818=>694,7819=>580,7820=>694,7821=>580,7822=>651,7823=>586,7824=>652,
-7825=>523,7826=>652,7827=>523,7828=>652,7829=>523,7830=>641,7831=>430,7832=>831,7833=>586,7834=>607,
-7835=>391,7838=>806,7839=>618,7840=>696,7841=>607,7842=>696,7843=>607,7844=>696,7845=>607,7846=>696,
-7847=>607,7848=>696,7849=>607,7850=>696,7851=>607,7852=>696,7853=>607,7854=>696,7855=>607,7856=>696,
-7857=>607,7858=>696,7859=>607,7860=>696,7861=>607,7862=>696,7863=>607,7864=>615,7865=>610,7866=>615,
-7867=>610,7868=>615,7869=>610,7870=>615,7871=>610,7872=>615,7873=>610,7874=>615,7875=>610,7876=>615,
-7877=>610,7878=>615,7879=>610,7880=>334,7881=>308,7882=>334,7883=>308,7884=>765,7885=>618,7886=>765,
-7887=>618,7888=>765,7889=>618,7890=>765,7891=>618,7892=>765,7893=>618,7894=>765,7895=>618,7896=>765,
-7897=>618,7898=>765,7899=>618,7900=>765,7901=>618,7902=>765,7903=>618,7904=>765,7905=>618,7906=>765,
-7907=>618,7908=>730,7909=>641,7910=>730,7911=>641,7912=>730,7913=>641,7914=>730,7915=>641,7916=>730,
-7917=>641,7918=>730,7919=>641,7920=>730,7921=>641,7922=>651,7923=>586,7924=>651,7925=>586,7926=>651,
-7927=>586,7928=>651,7929=>586,7936=>618,7937=>618,7938=>618,7939=>618,7940=>618,7941=>618,7942=>618,
-7943=>618,7944=>696,7945=>696,7946=>937,7947=>939,7948=>841,7949=>866,7950=>751,7951=>773,7952=>501,
-7953=>501,7954=>501,7955=>501,7956=>501,7957=>501,7960=>712,7961=>715,7962=>989,7963=>986,7964=>920,
-7965=>947,7968=>641,7969=>641,7970=>641,7971=>641,7972=>641,7973=>641,7974=>641,7975=>641,7976=>851,
-7977=>856,7978=>1125,7979=>1125,7980=>1062,7981=>1085,7982=>948,7983=>956,7984=>351,7985=>351,7986=>351,
-7987=>351,7988=>351,7989=>351,7990=>351,7991=>351,7992=>435,7993=>440,7994=>699,7995=>707,7996=>641,
-7997=>664,7998=>544,7999=>544,8000=>618,8001=>618,8002=>618,8003=>618,8004=>618,8005=>618,8008=>802,
-8009=>839,8010=>1099,8011=>1101,8012=>947,8013=>974,8016=>607,8017=>607,8018=>607,8019=>607,8020=>607,
-8021=>607,8022=>607,8023=>607,8025=>837,8027=>1065,8029=>1079,8031=>944,8032=>782,8033=>782,8034=>782,
-8035=>782,8036=>782,8037=>782,8038=>782,8039=>782,8040=>817,8041=>862,8042=>1121,8043=>1126,8044=>968,
-8045=>994,8046=>925,8047=>968,8048=>618,8049=>618,8050=>501,8051=>501,8052=>641,8053=>641,8054=>351,
-8055=>351,8056=>618,8057=>618,8058=>607,8059=>607,8060=>782,8061=>782,8064=>618,8065=>618,8066=>618,
-8067=>618,8068=>618,8069=>618,8070=>618,8071=>618,8072=>696,8073=>696,8074=>937,8075=>939,8076=>841,
-8077=>866,8078=>751,8079=>773,8080=>641,8081=>641,8082=>641,8083=>641,8084=>641,8085=>641,8086=>641,
-8087=>641,8088=>851,8089=>856,8090=>1125,8091=>1125,8092=>1062,8093=>1085,8094=>948,8095=>956,8096=>782,
-8097=>782,8098=>782,8099=>782,8100=>782,8101=>782,8102=>782,8103=>782,8104=>817,8105=>862,8106=>1121,
-8107=>1126,8108=>968,8109=>994,8110=>925,8111=>968,8112=>618,8113=>618,8114=>618,8115=>618,8116=>618,
-8118=>618,8119=>618,8120=>696,8121=>696,8122=>789,8123=>717,8124=>696,8125=>450,8126=>450,8127=>450,
-8128=>450,8129=>450,8130=>641,8131=>641,8132=>641,8134=>641,8135=>641,8136=>836,8137=>761,8138=>972,
-8139=>908,8140=>753,8141=>450,8142=>450,8143=>450,8144=>351,8145=>351,8146=>351,8147=>351,8150=>351,
-8151=>351,8152=>334,8153=>334,8154=>559,8155=>507,8157=>450,8158=>450,8159=>450,8160=>607,8161=>607,
-8162=>607,8163=>607,8164=>644,8165=>644,8166=>607,8167=>607,8168=>651,8169=>651,8170=>918,8171=>882,
-8172=>754,8173=>450,8174=>450,8175=>450,8178=>782,8179=>782,8180=>782,8182=>782,8183=>782,8184=>958,
-8185=>801,8186=>976,8187=>804,8188=>765,8189=>450,8190=>450,8192=>450,8193=>900,8194=>450,8195=>900,
-8196=>296,8197=>225,8198=>150,8199=>626,8200=>342,8201=>180,8202=>89,8203=>0,8204=>0,8205=>0,
-8206=>0,8207=>0,8208=>374,8209=>374,8210=>626,8213=>900,8214=>450,8215=>450,8219=>342,8223=>591,
-8227=>575,8228=>342,8229=>616,8231=>313,8234=>0,8235=>0,8236=>0,8237=>0,8238=>0,8239=>180,
-8241=>1717,8242=>237,8243=>402,8244=>567,8245=>237,8246=>402,8247=>567,8248=>659,8251=>875,8252=>564,
-8253=>522,8254=>450,8255=>745,8256=>745,8257=>296,8258=>920,8259=>450,8260=>150,8261=>411,8262=>411,
-8263=>927,8264=>746,8265=>746,8266=>461,8267=>618,8268=>450,8269=>450,8270=>470,8271=>360,8272=>745,
-8273=>470,8274=>500,8275=>754,8276=>745,8277=>754,8278=>615,8279=>731,8280=>754,8281=>754,8282=>342,
-8283=>784,8284=>754,8285=>342,8286=>342,8287=>200,8288=>0,8289=>0,8290=>0,8291=>0,8292=>0,
-8298=>0,8299=>0,8300=>0,8301=>0,8302=>0,8303=>0,8304=>394,8305=>197,8308=>394,8309=>394,
-8310=>394,8311=>394,8312=>394,8313=>394,8314=>475,8315=>475,8316=>475,8317=>259,8318=>259,8319=>410,
-8320=>394,8321=>394,8322=>394,8323=>394,8324=>394,8325=>394,8326=>394,8327=>394,8328=>394,8329=>394,
-8330=>475,8331=>475,8332=>475,8333=>259,8334=>259,8336=>412,8337=>431,8338=>439,8339=>371,8340=>431,
-8352=>836,8353=>626,8354=>626,8355=>626,8356=>626,8357=>938,8358=>753,8359=>1339,8360=>1084,8361=>993,
-8362=>768,8363=>642,8365=>626,8366=>614,8367=>1252,8368=>626,8369=>626,8370=>626,8371=>626,8372=>773,
-8373=>626,8400=>0,8401=>0,8406=>0,8407=>0,8411=>0,8412=>0,8417=>0,8448=>995,8449=>995,
-8450=>660,8451=>1090,8452=>807,8453=>1002,8454=>1033,8455=>626,8456=>628,8457=>856,8459=>965,8460=>822,
-8461=>799,8462=>641,8463=>641,8464=>537,8465=>627,8466=>771,8467=>424,8468=>876,8469=>753,8470=>1083,
-8471=>900,8472=>627,8473=>675,8474=>765,8475=>844,8476=>732,8477=>721,8478=>807,8479=>639,8480=>917,
-8481=>1115,8483=>751,8484=>679,8485=>560,8486=>765,8487=>692,8488=>686,8489=>272,8490=>697,8491=>696,
-8492=>835,8493=>736,8494=>769,8495=>572,8496=>656,8497=>727,8498=>615,8499=>1065,8500=>418,8501=>714,
-8502=>658,8503=>444,8504=>615,8505=>342,8506=>851,8507=>1232,8508=>710,8509=>663,8510=>589,8511=>776,
-8512=>756,8513=>707,8514=>518,8515=>573,8516=>684,8517=>747,8518=>644,8519=>610,8520=>308,8521=>308,
-8523=>785,8526=>492,8531=>932,8532=>932,8533=>932,8534=>932,8535=>932,8536=>932,8537=>932,8538=>932,
-8539=>932,8540=>932,8541=>932,8542=>932,8543=>554,8544=>334,8545=>593,8546=>851,8547=>989,8548=>696,
-8549=>989,8550=>1247,8551=>1505,8552=>1008,8553=>694,8554=>1008,8555=>1266,8556=>573,8557=>660,8558=>747,
-8559=>896,8560=>308,8561=>546,8562=>785,8563=>885,8564=>586,8565=>866,8566=>1104,8567=>1342,8568=>872,
-8569=>580,8570=>872,8571=>1110,8572=>308,8573=>533,8574=>644,8575=>938,8576=>1160,8577=>747,8578=>1160,
-8579=>660,8580=>533,8592=>754,8593=>754,8594=>754,8595=>754,8596=>754,8597=>754,8598=>754,8599=>754,
-8600=>754,8601=>754,8602=>754,8603=>754,8604=>754,8605=>754,8606=>754,8607=>754,8608=>754,8609=>754,
-8610=>754,8611=>754,8612=>754,8613=>754,8614=>754,8615=>754,8616=>754,8617=>754,8618=>754,8619=>754,
-8620=>754,8621=>754,8622=>754,8623=>754,8624=>754,8625=>754,8626=>754,8627=>754,8628=>754,8629=>754,
-8630=>754,8631=>754,8632=>754,8633=>754,8634=>754,8635=>754,8636=>754,8637=>754,8638=>754,8639=>754,
-8640=>754,8641=>754,8642=>754,8643=>754,8644=>754,8645=>754,8646=>754,8647=>754,8648=>754,8649=>754,
-8650=>754,8651=>754,8652=>754,8653=>754,8654=>754,8655=>754,8656=>754,8657=>754,8658=>754,8659=>754,
-8660=>754,8661=>754,8662=>754,8663=>754,8664=>754,8665=>754,8666=>754,8667=>754,8668=>754,8669=>754,
-8670=>754,8671=>754,8672=>754,8673=>754,8674=>754,8675=>754,8676=>754,8677=>754,8678=>754,8679=>754,
-8680=>754,8681=>754,8682=>754,8683=>754,8684=>754,8685=>754,8686=>754,8687=>754,8688=>754,8689=>754,
-8690=>754,8691=>754,8692=>754,8693=>754,8694=>754,8695=>754,8696=>754,8697=>754,8698=>754,8699=>754,
-8700=>754,8701=>754,8702=>754,8703=>754,8704=>696,8705=>626,8706=>489,8707=>615,8708=>615,8709=>771,
-8710=>627,8711=>627,8712=>807,8713=>807,8714=>675,8715=>807,8716=>807,8717=>675,8718=>572,8719=>708,
-8720=>708,8721=>646,8722=>754,8723=>754,8724=>626,8725=>329,8726=>626,8727=>754,8728=>563,8729=>342,
-8730=>600,8731=>600,8732=>600,8733=>641,8734=>750,8735=>754,8736=>807,8737=>807,8738=>754,8739=>450,
-8740=>450,8741=>450,8742=>450,8743=>730,8744=>730,8745=>730,8746=>730,8747=>549,8748=>835,8749=>1165,
-8750=>506,8751=>879,8752=>1181,8753=>506,8754=>506,8755=>506,8756=>626,8757=>626,8758=>264,8759=>626,
-8760=>754,8761=>754,8762=>754,8763=>754,8764=>754,8765=>754,8766=>754,8767=>754,8768=>337,8769=>754,
-8770=>754,8771=>754,8772=>754,8773=>754,8774=>754,8775=>754,8776=>754,8777=>754,8778=>754,8779=>754,
-8780=>754,8781=>754,8782=>754,8783=>754,8784=>754,8785=>754,8786=>754,8787=>754,8788=>956,8789=>956,
-8790=>754,8791=>754,8792=>754,8793=>754,8794=>754,8795=>754,8796=>754,8797=>754,8798=>754,8799=>754,
-8800=>754,8801=>754,8802=>754,8803=>754,8804=>754,8805=>754,8806=>754,8807=>754,8808=>756,8809=>756,
-8810=>942,8811=>942,8812=>450,8813=>754,8814=>754,8815=>754,8816=>754,8817=>754,8818=>754,8819=>754,
-8820=>754,8821=>754,8822=>754,8823=>754,8824=>754,8825=>754,8826=>754,8827=>754,8828=>754,8829=>754,
-8830=>754,8831=>754,8832=>754,8833=>754,8834=>754,8835=>754,8836=>754,8837=>754,8838=>754,8839=>754,
-8840=>754,8841=>754,8842=>754,8843=>754,8844=>730,8845=>730,8846=>730,8847=>754,8848=>754,8849=>754,
-8850=>754,8851=>716,8852=>716,8853=>754,8854=>754,8855=>754,8856=>754,8857=>754,8858=>754,8859=>754,
-8860=>754,8861=>754,8862=>754,8863=>754,8864=>754,8865=>754,8866=>822,8867=>822,8868=>822,8869=>822,
-8870=>488,8871=>488,8872=>822,8873=>822,8874=>822,8875=>822,8876=>822,8877=>822,8878=>822,8879=>822,
-8880=>754,8881=>754,8882=>754,8883=>754,8884=>754,8885=>754,8886=>900,8887=>900,8888=>754,8889=>754,
-8890=>488,8891=>730,8892=>730,8893=>730,8894=>754,8895=>754,8896=>758,8897=>758,8898=>758,8899=>758,
-8900=>444,8901=>342,8902=>563,8903=>754,8904=>900,8905=>900,8906=>900,8907=>900,8908=>900,8909=>754,
-8910=>730,8911=>730,8912=>754,8913=>754,8914=>754,8915=>754,8916=>754,8917=>754,8918=>754,8919=>754,
-8920=>1280,8921=>1280,8922=>754,8923=>754,8924=>754,8925=>754,8926=>754,8927=>754,8928=>754,8929=>754,
-8930=>754,8931=>754,8932=>754,8933=>754,8934=>754,8935=>754,8936=>754,8937=>754,8938=>754,8939=>754,
-8940=>754,8941=>754,8942=>900,8943=>900,8944=>900,8945=>900,8946=>1042,8947=>807,8948=>675,8949=>807,
-8950=>807,8951=>675,8952=>807,8953=>807,8954=>1042,8955=>807,8956=>675,8957=>807,8958=>675,8959=>807,
-8960=>542,8961=>542,8962=>644,8963=>754,8964=>754,8965=>754,8966=>754,8967=>439,8968=>411,8969=>411,
-8970=>411,8971=>411,8972=>728,8973=>728,8974=>728,8975=>728,8976=>754,8977=>484,8984=>835,8985=>754,
-8988=>422,8989=>422,8990=>422,8991=>422,8992=>549,8993=>549,8996=>1037,8997=>1037,8998=>1272,8999=>1037,
-9000=>1299,9003=>1272,9004=>786,9075=>351,9076=>644,9077=>782,9082=>618,9085=>776,9095=>1037,9108=>786,
-9115=>450,9116=>450,9117=>450,9118=>450,9119=>450,9120=>450,9121=>450,9122=>450,9123=>450,9124=>450,
-9125=>450,9126=>450,9127=>675,9128=>675,9129=>675,9130=>675,9131=>675,9132=>675,9133=>675,9134=>549,
-9166=>754,9167=>850,9187=>786,9189=>692,9250=>644,9251=>644,9312=>762,9313=>762,9314=>762,9315=>762,
-9316=>762,9317=>762,9318=>762,9319=>762,9320=>762,9321=>762,9600=>692,9601=>692,9602=>692,9603=>692,
-9604=>692,9605=>692,9606=>692,9607=>692,9608=>692,9609=>692,9610=>692,9611=>692,9612=>692,9613=>692,
-9614=>692,9615=>692,9616=>692,9617=>692,9618=>692,9619=>692,9620=>692,9621=>692,9622=>692,9623=>692,
-9624=>692,9625=>692,9626=>692,9627=>692,9628=>692,9629=>692,9630=>692,9631=>692,9632=>850,9633=>850,
-9634=>850,9635=>850,9636=>850,9637=>850,9638=>850,9639=>850,9640=>850,9641=>850,9642=>610,9643=>610,
-9644=>850,9645=>850,9646=>495,9647=>495,9648=>692,9649=>692,9650=>692,9651=>692,9652=>452,9653=>452,
-9654=>692,9655=>692,9656=>452,9657=>452,9658=>692,9659=>692,9660=>692,9661=>692,9662=>452,9663=>452,
-9664=>692,9665=>692,9666=>452,9667=>452,9668=>692,9669=>692,9670=>692,9671=>692,9672=>692,9673=>785,
-9674=>444,9675=>785,9676=>785,9677=>785,9678=>785,9679=>785,9680=>785,9681=>785,9682=>785,9683=>785,
-9684=>785,9685=>785,9686=>474,9687=>474,9688=>756,9689=>873,9690=>873,9691=>873,9692=>348,9693=>348,
-9694=>348,9695=>348,9696=>692,9697=>692,9698=>692,9699=>692,9700=>692,9701=>692,9702=>575,9703=>850,
-9704=>850,9705=>850,9706=>850,9707=>850,9708=>692,9709=>692,9710=>692,9711=>1007,9712=>850,9713=>850,
-9714=>850,9715=>850,9716=>785,9717=>785,9718=>785,9719=>785,9720=>692,9721=>692,9722=>692,9723=>747,
-9724=>747,9725=>659,9726=>659,9727=>692,9728=>807,9729=>900,9730=>807,9731=>807,9732=>807,9733=>807,
-9734=>807,9735=>515,9736=>806,9737=>807,9738=>799,9739=>799,9740=>604,9741=>911,9742=>1121,9743=>1125,
-9744=>807,9745=>807,9746=>807,9747=>479,9748=>807,9749=>807,9750=>807,9751=>807,9752=>807,9753=>807,
-9754=>807,9755=>807,9756=>807,9757=>548,9758=>807,9759=>548,9760=>807,9761=>807,9762=>807,9763=>807,
-9764=>602,9765=>671,9766=>584,9767=>705,9768=>490,9769=>807,9770=>807,9771=>807,9772=>639,9773=>807,
-9774=>807,9775=>807,9776=>807,9777=>807,9778=>807,9779=>807,9780=>807,9781=>807,9782=>807,9783=>807,
-9784=>807,9785=>807,9786=>807,9787=>807,9788=>807,9789=>807,9790=>807,9791=>552,9792=>658,9793=>658,
-9794=>807,9795=>807,9796=>807,9797=>807,9798=>807,9799=>807,9800=>807,9801=>807,9802=>807,9803=>807,
-9804=>807,9805=>807,9806=>807,9807=>807,9808=>807,9809=>807,9810=>807,9811=>807,9812=>807,9813=>807,
-9814=>807,9815=>807,9816=>807,9817=>807,9818=>807,9819=>807,9820=>807,9821=>807,9822=>807,9823=>807,
-9824=>807,9825=>807,9826=>807,9827=>807,9828=>807,9829=>807,9830=>807,9831=>807,9832=>807,9833=>424,
-9834=>574,9835=>807,9836=>807,9837=>424,9838=>321,9839=>435,9840=>673,9841=>689,9842=>807,9843=>807,
-9844=>807,9845=>807,9846=>807,9847=>807,9848=>807,9849=>807,9850=>807,9851=>807,9852=>807,9853=>807,
-9854=>807,9855=>807,9856=>782,9857=>782,9858=>782,9859=>782,9860=>782,9861=>782,9862=>807,9863=>807,
-9864=>807,9865=>807,9866=>807,9867=>807,9868=>807,9869=>807,9870=>807,9871=>807,9872=>807,9873=>807,
-9874=>807,9875=>807,9876=>807,9877=>487,9878=>807,9879=>807,9880=>807,9881=>807,9882=>807,9883=>807,
-9884=>807,9888=>807,9889=>632,9890=>903,9891=>977,9892=>1028,9893=>811,9894=>754,9895=>754,9896=>754,
-9897=>754,9898=>754,9899=>754,9900=>754,9901=>754,9902=>754,9903=>754,9904=>759,9905=>754,9906=>658,
-9907=>659,9908=>659,9909=>659,9910=>765,9911=>659,9912=>659,9985=>754,9986=>754,9987=>754,9988=>754,
-9990=>754,9991=>754,9992=>754,9993=>754,9996=>754,9997=>754,9998=>754,9999=>754,10000=>754,10001=>754,
-10002=>754,10003=>754,10004=>754,10005=>754,10006=>754,10007=>754,10008=>754,10009=>754,10010=>754,10011=>754,
-10012=>754,10013=>754,10014=>754,10015=>754,10016=>754,10017=>754,10018=>754,10019=>754,10020=>754,10021=>754,
-10022=>754,10023=>754,10025=>754,10026=>754,10027=>754,10028=>754,10029=>754,10030=>754,10031=>754,10032=>754,
-10033=>754,10034=>754,10035=>754,10036=>754,10037=>754,10038=>754,10039=>754,10040=>754,10041=>754,10042=>754,
-10043=>754,10044=>754,10045=>754,10046=>754,10047=>754,10048=>754,10049=>754,10050=>754,10051=>754,10052=>754,
-10053=>754,10054=>754,10055=>754,10056=>754,10057=>754,10058=>754,10059=>754,10061=>807,10063=>807,10064=>807,
-10065=>807,10066=>807,10070=>807,10072=>754,10073=>754,10074=>754,10075=>290,10076=>290,10077=>484,10078=>484,
-10081=>754,10082=>754,10083=>754,10084=>754,10085=>754,10086=>754,10087=>754,10088=>754,10089=>754,10090=>754,
-10091=>754,10092=>754,10093=>754,10094=>754,10095=>754,10096=>754,10097=>754,10098=>754,10099=>754,10100=>754,
-10101=>754,10102=>762,10103=>762,10104=>762,10105=>762,10106=>762,10107=>762,10108=>762,10109=>762,10110=>762,
-10111=>762,10112=>754,10113=>754,10114=>754,10115=>754,10116=>754,10117=>754,10118=>754,10119=>754,10120=>754,
-10121=>754,10122=>754,10123=>754,10124=>754,10125=>754,10126=>754,10127=>754,10128=>754,10129=>754,10130=>754,
-10131=>754,10132=>754,10136=>754,10137=>754,10138=>754,10139=>754,10140=>754,10141=>754,10142=>754,10143=>754,
-10144=>754,10145=>754,10146=>754,10147=>754,10148=>754,10149=>754,10150=>754,10151=>754,10152=>754,10153=>754,
-10154=>754,10155=>754,10156=>754,10157=>754,10158=>754,10159=>754,10161=>754,10162=>754,10163=>754,10164=>754,
-10165=>754,10166=>754,10167=>754,10168=>754,10169=>754,10170=>754,10171=>754,10172=>754,10173=>754,10174=>754,
-10181=>411,10182=>411,10208=>444,10214=>438,10215=>438,10216=>411,10217=>411,10218=>648,10219=>648,10224=>754,
-10225=>754,10226=>754,10227=>754,10228=>1042,10229=>1290,10230=>1290,10231=>1290,10232=>1290,10233=>1290,10234=>1290,
-10235=>1290,10236=>1290,10237=>1290,10238=>1290,10239=>1290,10240=>703,10241=>703,10242=>703,10243=>703,10244=>703,
-10245=>703,10246=>703,10247=>703,10248=>703,10249=>703,10250=>703,10251=>703,10252=>703,10253=>703,10254=>703,
-10255=>703,10256=>703,10257=>703,10258=>703,10259=>703,10260=>703,10261=>703,10262=>703,10263=>703,10264=>703,
-10265=>703,10266=>703,10267=>703,10268=>703,10269=>703,10270=>703,10271=>703,10272=>703,10273=>703,10274=>703,
-10275=>703,10276=>703,10277=>703,10278=>703,10279=>703,10280=>703,10281=>703,10282=>703,10283=>703,10284=>703,
-10285=>703,10286=>703,10287=>703,10288=>703,10289=>703,10290=>703,10291=>703,10292=>703,10293=>703,10294=>703,
-10295=>703,10296=>703,10297=>703,10298=>703,10299=>703,10300=>703,10301=>703,10302=>703,10303=>703,10304=>703,
-10305=>703,10306=>703,10307=>703,10308=>703,10309=>703,10310=>703,10311=>703,10312=>703,10313=>703,10314=>703,
-10315=>703,10316=>703,10317=>703,10318=>703,10319=>703,10320=>703,10321=>703,10322=>703,10323=>703,10324=>703,
-10325=>703,10326=>703,10327=>703,10328=>703,10329=>703,10330=>703,10331=>703,10332=>703,10333=>703,10334=>703,
-10335=>703,10336=>703,10337=>703,10338=>703,10339=>703,10340=>703,10341=>703,10342=>703,10343=>703,10344=>703,
-10345=>703,10346=>703,10347=>703,10348=>703,10349=>703,10350=>703,10351=>703,10352=>703,10353=>703,10354=>703,
-10355=>703,10356=>703,10357=>703,10358=>703,10359=>703,10360=>703,10361=>703,10362=>703,10363=>703,10364=>703,
-10365=>703,10366=>703,10367=>703,10368=>703,10369=>703,10370=>703,10371=>703,10372=>703,10373=>703,10374=>703,
-10375=>703,10376=>703,10377=>703,10378=>703,10379=>703,10380=>703,10381=>703,10382=>703,10383=>703,10384=>703,
-10385=>703,10386=>703,10387=>703,10388=>703,10389=>703,10390=>703,10391=>703,10392=>703,10393=>703,10394=>703,
-10395=>703,10396=>703,10397=>703,10398=>703,10399=>703,10400=>703,10401=>703,10402=>703,10403=>703,10404=>703,
-10405=>703,10406=>703,10407=>703,10408=>703,10409=>703,10410=>703,10411=>703,10412=>703,10413=>703,10414=>703,
-10415=>703,10416=>703,10417=>703,10418=>703,10419=>703,10420=>703,10421=>703,10422=>703,10423=>703,10424=>703,
-10425=>703,10426=>703,10427=>703,10428=>703,10429=>703,10430=>703,10431=>703,10432=>703,10433=>703,10434=>703,
-10435=>703,10436=>703,10437=>703,10438=>703,10439=>703,10440=>703,10441=>703,10442=>703,10443=>703,10444=>703,
-10445=>703,10446=>703,10447=>703,10448=>703,10449=>703,10450=>703,10451=>703,10452=>703,10453=>703,10454=>703,
-10455=>703,10456=>703,10457=>703,10458=>703,10459=>703,10460=>703,10461=>703,10462=>703,10463=>703,10464=>703,
-10465=>703,10466=>703,10467=>703,10468=>703,10469=>703,10470=>703,10471=>703,10472=>703,10473=>703,10474=>703,
-10475=>703,10476=>703,10477=>703,10478=>703,10479=>703,10480=>703,10481=>703,10482=>703,10483=>703,10484=>703,
-10485=>703,10486=>703,10487=>703,10488=>703,10489=>703,10490=>703,10491=>703,10492=>703,10493=>703,10494=>703,
-10495=>703,10502=>754,10503=>754,10506=>754,10507=>754,10560=>754,10561=>754,10627=>678,10628=>678,10702=>754,
-10703=>941,10704=>941,10705=>900,10706=>900,10707=>900,10708=>900,10709=>900,10731=>444,10746=>754,10747=>754,
-10752=>900,10753=>900,10754=>900,10764=>1495,10765=>506,10766=>506,10767=>506,10768=>506,10769=>506,10770=>506,
-10771=>506,10772=>506,10773=>506,10774=>506,10775=>506,10776=>506,10777=>506,10778=>506,10779=>506,10780=>506,
-10799=>754,10877=>754,10878=>754,10879=>754,10880=>754,10881=>754,10882=>754,10883=>754,10884=>754,10885=>754,
-10886=>754,10887=>754,10888=>754,10889=>754,10890=>754,10891=>754,10892=>754,10893=>754,10894=>754,10895=>754,
-10896=>754,10897=>754,10898=>754,10899=>754,10900=>754,10901=>754,10902=>754,10903=>754,10904=>754,10905=>754,
-10906=>754,10907=>754,10908=>754,10909=>754,10910=>754,10911=>754,10912=>754,10926=>754,10927=>754,10928=>754,
-10929=>754,10930=>754,10931=>754,10932=>754,10933=>754,10934=>754,10935=>754,10936=>754,10937=>754,10938=>754,
-11001=>754,11002=>754,11008=>754,11009=>754,11010=>754,11011=>754,11012=>754,11013=>754,11014=>754,11015=>754,
-11016=>754,11017=>754,11018=>754,11019=>754,11020=>754,11021=>754,11022=>754,11023=>754,11024=>754,11025=>754,
-11026=>850,11027=>850,11028=>850,11029=>850,11030=>692,11031=>692,11032=>692,11033=>692,11034=>850,11039=>782,
-11040=>782,11041=>786,11042=>786,11043=>786,11044=>1007,11091=>782,11092=>782,11360=>573,11361=>324,11362=>573,
-11363=>659,11364=>693,11365=>607,11366=>430,11367=>860,11368=>641,11369=>697,11370=>598,11371=>652,11372=>523,
-11373=>774,11374=>896,11375=>696,11377=>700,11378=>1099,11379=>950,11380=>586,11381=>628,11382=>508,11383=>704,
-11385=>484,11386=>618,11387=>502,11388=>197,11389=>438,11800=>527,11810=>411,11811=>411,11812=>411,11813=>411,
-11822=>522,19904=>807,19905=>807,19906=>807,19907=>807,19908=>807,19909=>807,19910=>807,19911=>807,19912=>807,
-19913=>807,19914=>807,19915=>807,19916=>807,19917=>807,19918=>807,19919=>807,19920=>807,19921=>807,19922=>807,
-19923=>807,19924=>807,19925=>807,19926=>807,19927=>807,19928=>807,19929=>807,19930=>807,19931=>807,19932=>807,
-19933=>807,19934=>807,19935=>807,19936=>807,19937=>807,19938=>807,19939=>807,19940=>807,19941=>807,19942=>807,
-19943=>807,19944=>807,19945=>807,19946=>807,19947=>807,19948=>807,19949=>807,19950=>807,19951=>807,19952=>807,
-19953=>807,19954=>807,19955=>807,19956=>807,19957=>807,19958=>807,19959=>807,19960=>807,19961=>807,19962=>807,
-19963=>807,19964=>807,19965=>807,19966=>807,19967=>807,42564=>648,42565=>536,42566=>392,42567=>396,42572=>1265,
-42573=>1055,42576=>1110,42577=>924,42580=>1056,42581=>875,42582=>990,42583=>872,42594=>990,42595=>846,42596=>986,
-42597=>823,42598=>1134,42599=>896,42600=>765,42601=>618,42602=>933,42603=>781,42604=>1266,42605=>995,42606=>865,
-42634=>849,42635=>673,42636=>614,42637=>521,42644=>727,42645=>641,42760=>450,42761=>450,42762=>450,42763=>450,
-42764=>450,42765=>450,42766=>450,42767=>450,42768=>450,42769=>450,42770=>450,42771=>450,42772=>450,42773=>450,
-42774=>450,42779=>360,42780=>360,42781=>258,42782=>258,42783=>258,42790=>753,42791=>641,42792=>928,42793=>771,
-42794=>626,42795=>501,42800=>502,42801=>536,42802=>1214,42803=>946,42804=>1156,42805=>958,42806=>1120,42807=>947,
-42808=>971,42809=>830,42810=>971,42811=>830,42812=>932,42813=>830,42814=>628,42815=>494,42822=>765,42823=>488,
-42824=>614,42825=>478,42826=>826,42827=>732,42830=>1266,42831=>995,42880=>573,42881=>308,42882=>753,42883=>641,
-42889=>360,42890=>356,42891=>410,42892=>275,43003=>615,43004=>659,43005=>896,43006=>334,43007=>1192,62917=>618,
-64256=>749,64257=>708,64258=>708,64259=>1024,64260=>1024,64261=>727,64262=>917,64275=>1249,64276=>1245,64277=>1240,
-64278=>1245,64279=>1542,64285=>308,64286=>0,64287=>597,64288=>647,64289=>867,64290=>801,64291=>889,64292=>867,
-64293=>844,64294=>889,64295=>889,64296=>878,64297=>754,64298=>854,64299=>854,64300=>854,64301=>854,64302=>676,
-64303=>676,64304=>676,64305=>605,64306=>483,64307=>589,64308=>641,64309=>308,64310=>442,64312=>651,64313=>420,
-64314=>584,64315=>584,64316=>611,64318=>698,64320=>447,64321=>696,64323=>646,64324=>618,64326=>676,64327=>656,
-64328=>584,64329=>854,64330=>676,64331=>308,64332=>605,64333=>584,64334=>618,64335=>676,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,65056=>0,65057=>0,65058=>0,65059=>0,65529=>0,65530=>0,
-65531=>0,65532=>0,65533=>1002);
-$enc='';
-$diff='';
-$file='dejavusanscondensedbi.z';
-$ctg='dejavusanscondensedbi.ctg.z';
-$originalsize=493196;
-?>
\ No newline at end of file
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusanscondensedbi.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusanscondensedbi.z
deleted file mode 100644
index 7d570707..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusanscondensedbi.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusanscondensedi.ctg.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusanscondensedi.ctg.z
deleted file mode 100644
index ac628b3e..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusanscondensedi.ctg.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusanscondensedi.php b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusanscondensedi.php
deleted file mode 100644
index e8b79b18..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusanscondensedi.php
+++ /dev/null
@@ -1,471 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='DejaVuSansCondensed-Oblique';
-$desc=array('Ascent'=>928,'Descent'=>-236,'CapHeight'=>-39,'Flags'=>96,'FontBBox'=>'[-914 -350 1493 1068]','ItalicAngle'=>-11,'StemV'=>70,'MissingWidth'=>540);
-$up=-63;
-$ut=44;
-$dw=540;
-$cw=array(
-0=>540,32=>286,33=>360,34=>414,35=>754,36=>572,37=>855,38=>702,39=>247,40=>351,
-41=>351,42=>450,43=>754,44=>286,45=>325,46=>286,47=>303,48=>572,49=>572,50=>572,
-51=>572,52=>572,53=>572,54=>572,55=>572,56=>572,57=>572,58=>303,59=>303,60=>754,
-61=>754,62=>754,63=>478,64=>900,65=>615,66=>617,67=>628,68=>693,69=>568,70=>518,
-71=>697,72=>677,73=>265,74=>265,75=>590,76=>501,77=>776,78=>673,79=>708,80=>542,
-81=>708,82=>625,83=>571,84=>549,85=>659,86=>615,87=>890,88=>616,89=>549,90=>616,
-91=>351,92=>303,93=>351,94=>754,95=>450,96=>450,97=>551,98=>571,99=>495,100=>571,
-101=>554,102=>316,103=>571,104=>570,105=>250,106=>250,107=>521,108=>250,109=>876,110=>570,
-111=>550,112=>571,113=>571,114=>370,115=>469,116=>353,117=>570,118=>532,119=>736,120=>532,
-121=>532,122=>472,123=>572,124=>303,125=>572,126=>754,8364=>572,8218=>286,402=>316,8222=>466,
-8230=>900,8224=>450,8225=>450,710=>450,8240=>1215,352=>571,8249=>360,338=>962,381=>616,8216=>286,
-8217=>286,8220=>466,8221=>466,8226=>531,8211=>450,8212=>900,732=>450,8482=>900,353=>469,8250=>360,
-339=>925,382=>472,376=>549,160=>286,161=>360,162=>572,163=>572,164=>572,165=>572,166=>303,
-167=>450,168=>450,169=>900,170=>424,171=>555,172=>754,173=>325,174=>900,175=>450,176=>450,
-177=>754,178=>360,179=>360,180=>450,181=>572,182=>572,183=>286,184=>450,185=>360,186=>424,
-187=>555,188=>872,189=>872,190=>872,191=>478,192=>615,193=>615,194=>615,195=>615,196=>615,
-197=>615,198=>876,199=>628,200=>568,201=>568,202=>568,203=>568,204=>265,205=>265,206=>265,
-207=>265,208=>697,209=>673,210=>708,211=>708,212=>708,213=>708,214=>708,215=>754,216=>708,
-217=>659,218=>659,219=>659,220=>659,221=>549,222=>547,223=>567,224=>551,225=>551,226=>551,
-227=>551,228=>551,229=>551,230=>896,231=>495,232=>554,233=>554,234=>554,235=>554,236=>250,
-237=>250,238=>250,239=>250,240=>550,241=>570,242=>550,243=>550,244=>550,245=>550,246=>550,
-247=>754,248=>550,249=>570,250=>570,251=>570,252=>570,253=>532,254=>571,255=>532,256=>615,
-257=>551,258=>615,259=>551,260=>615,261=>551,262=>628,263=>495,264=>628,265=>495,266=>628,
-267=>495,268=>628,269=>495,270=>693,271=>571,272=>697,273=>571,274=>568,275=>554,276=>568,
-277=>554,278=>568,279=>554,280=>568,281=>554,282=>568,283=>554,284=>697,285=>571,286=>697,
-287=>571,288=>697,289=>571,290=>697,291=>571,292=>677,293=>570,294=>824,295=>625,296=>265,
-297=>250,298=>265,299=>250,300=>265,301=>250,302=>265,303=>250,304=>265,305=>250,306=>531,
-307=>500,308=>265,309=>250,310=>590,311=>521,312=>521,313=>501,314=>250,315=>501,316=>250,
-317=>501,318=>250,319=>501,320=>250,321=>505,322=>258,323=>673,324=>570,325=>673,326=>570,
-327=>673,328=>570,329=>732,330=>673,331=>570,332=>708,333=>550,334=>708,335=>550,336=>708,
-337=>550,340=>625,341=>370,342=>625,343=>370,344=>625,345=>370,346=>571,347=>469,348=>571,
-349=>469,350=>571,351=>469,354=>549,355=>353,356=>549,357=>353,358=>549,359=>353,360=>659,
-361=>570,362=>659,363=>570,364=>659,365=>570,366=>659,367=>570,368=>659,369=>570,370=>659,
-371=>570,372=>890,373=>736,374=>549,375=>532,377=>616,378=>472,379=>616,380=>472,383=>316,
-384=>571,385=>661,386=>617,387=>571,388=>617,389=>571,390=>633,391=>628,392=>495,393=>697,
-394=>737,395=>617,396=>571,397=>550,398=>568,399=>708,400=>553,401=>518,403=>697,404=>618,
-405=>885,406=>318,407=>265,408=>671,409=>521,410=>250,411=>532,412=>876,413=>673,414=>570,
-415=>708,416=>822,417=>550,418=>844,419=>663,420=>586,421=>571,422=>625,423=>571,424=>469,
-425=>568,426=>302,427=>353,428=>549,429=>353,430=>549,431=>754,432=>570,433=>688,434=>648,
-435=>669,436=>657,437=>616,438=>472,439=>599,440=>599,441=>520,442=>472,443=>572,444=>599,
-445=>520,446=>459,447=>571,448=>265,449=>443,450=>413,451=>266,452=>1310,453=>1165,454=>1043,
-455=>767,456=>751,457=>500,458=>938,459=>923,460=>820,461=>615,462=>551,463=>265,464=>250,
-465=>708,466=>550,467=>659,468=>570,469=>659,470=>570,471=>659,472=>570,473=>659,474=>570,
-475=>659,476=>570,477=>554,478=>615,479=>551,480=>615,481=>551,482=>876,483=>896,484=>697,
-485=>571,486=>697,487=>571,488=>590,489=>521,490=>708,491=>550,492=>708,493=>550,494=>599,
-495=>472,496=>250,497=>1310,498=>1165,499=>1043,500=>697,501=>571,502=>1001,503=>614,504=>673,
-505=>570,506=>615,507=>551,508=>876,509=>896,510=>708,511=>550,512=>615,513=>551,514=>615,
-515=>551,516=>568,517=>554,518=>568,519=>554,520=>265,521=>250,522=>265,523=>250,524=>708,
-525=>550,526=>708,527=>550,528=>625,529=>370,530=>625,531=>370,532=>659,533=>570,534=>659,
-535=>570,536=>571,537=>469,538=>549,539=>353,540=>564,541=>469,542=>677,543=>570,544=>662,
-545=>754,546=>628,547=>549,548=>616,549=>472,550=>615,551=>551,552=>568,553=>554,554=>708,
-555=>550,556=>708,557=>550,558=>708,559=>550,560=>708,561=>550,562=>549,563=>532,564=>427,
-565=>758,566=>429,567=>250,568=>898,569=>898,570=>615,571=>628,572=>495,573=>501,574=>549,
-575=>469,576=>472,577=>542,578=>431,579=>617,580=>659,581=>615,582=>568,583=>554,584=>265,
-585=>250,586=>703,587=>571,588=>625,589=>370,590=>549,591=>532,592=>551,593=>571,594=>571,
-595=>571,596=>495,597=>495,598=>571,599=>654,600=>554,601=>554,602=>759,603=>490,604=>490,
-605=>698,606=>598,607=>293,608=>626,609=>571,610=>566,611=>536,612=>536,613=>570,614=>570,
-615=>570,616=>334,617=>348,618=>334,619=>356,620=>438,621=>250,622=>635,623=>876,624=>876,
-625=>876,626=>581,627=>578,628=>570,629=>550,630=>772,631=>655,632=>593,633=>422,634=>422,
-635=>422,636=>422,637=>422,638=>477,639=>477,640=>541,641=>541,642=>469,643=>302,644=>302,
-645=>415,646=>302,647=>353,648=>353,649=>570,650=>556,651=>538,652=>532,653=>736,654=>532,
-655=>549,656=>472,657=>472,658=>520,659=>520,660=>459,661=>459,662=>459,663=>459,664=>708,
-665=>521,666=>598,667=>637,668=>588,669=>263,670=>600,671=>456,672=>654,673=>459,674=>459,
-675=>913,676=>952,677=>911,678=>742,679=>549,680=>700,681=>763,682=>576,683=>589,684=>463,
-685=>463,686=>513,687=>597,688=>359,689=>359,690=>157,691=>233,692=>266,693=>266,694=>341,
-695=>463,696=>335,697=>250,698=>414,699=>286,700=>286,701=>286,702=>276,703=>276,704=>333,
-705=>333,706=>450,707=>450,708=>450,709=>450,711=>450,712=>247,713=>450,714=>450,715=>450,
-716=>247,717=>450,718=>450,719=>450,720=>303,721=>303,722=>276,723=>276,724=>450,725=>450,
-726=>351,727=>286,728=>450,729=>450,730=>450,731=>450,733=>450,734=>284,735=>450,736=>383,
-737=>149,738=>335,739=>399,740=>333,741=>444,742=>444,743=>444,744=>444,745=>444,748=>450,
-749=>450,750=>466,755=>450,759=>450,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,832=>0,833=>0,
-834=>0,835=>0,836=>0,837=>0,838=>0,839=>0,840=>0,841=>0,842=>0,843=>0,
-844=>0,845=>0,846=>0,847=>0,849=>0,850=>0,851=>0,855=>0,856=>0,858=>0,
-860=>0,861=>0,862=>0,863=>0,864=>0,865=>0,866=>0,880=>589,881=>511,882=>775,
-883=>583,884=>250,885=>250,886=>673,887=>584,890=>450,891=>494,892=>495,893=>494,894=>303,
-900=>450,901=>450,902=>615,903=>286,904=>690,905=>813,906=>391,908=>755,910=>773,911=>814,
-912=>304,913=>615,914=>617,915=>501,916=>615,917=>568,918=>616,919=>677,920=>708,921=>265,
-922=>590,923=>615,924=>776,925=>673,926=>568,927=>708,928=>677,929=>542,931=>568,932=>549,
-933=>549,934=>708,935=>616,936=>708,937=>688,938=>265,939=>549,940=>593,941=>486,942=>570,
-943=>304,944=>521,945=>593,946=>574,947=>532,948=>550,949=>486,950=>489,951=>570,952=>550,
-953=>304,954=>530,955=>532,956=>572,957=>502,958=>501,959=>550,960=>542,961=>571,962=>528,
-963=>570,964=>542,965=>521,966=>593,967=>532,968=>593,969=>753,970=>304,971=>521,972=>550,
-973=>521,974=>753,975=>590,976=>553,977=>557,978=>628,979=>758,980=>628,981=>593,982=>753,
-983=>597,984=>708,985=>550,986=>583,987=>528,988=>518,989=>413,990=>593,991=>593,992=>778,
-993=>564,994=>840,995=>753,996=>682,997=>593,998=>712,999=>553,1000=>618,1001=>546,1002=>690,
-1003=>563,1004=>629,1005=>550,1006=>549,1007=>482,1008=>597,1009=>571,1010=>495,1011=>250,1012=>708,
-1013=>554,1014=>554,1015=>547,1016=>571,1017=>628,1018=>776,1019=>585,1020=>571,1021=>633,1022=>628,
-1023=>633,1024=>568,1025=>568,1026=>708,1027=>501,1028=>628,1029=>571,1030=>265,1031=>265,1032=>265,
-1033=>984,1034=>940,1035=>708,1036=>639,1037=>673,1038=>548,1039=>677,1040=>615,1041=>617,1042=>617,
-1043=>501,1044=>703,1045=>568,1046=>969,1047=>577,1048=>673,1049=>673,1050=>639,1051=>677,1052=>776,
-1053=>677,1054=>708,1055=>677,1056=>542,1057=>628,1058=>549,1059=>548,1060=>774,1061=>616,1062=>699,
-1063=>617,1064=>962,1065=>984,1066=>749,1067=>736,1068=>617,1069=>628,1070=>971,1071=>625,1072=>551,
-1073=>555,1074=>530,1075=>473,1076=>622,1077=>554,1078=>811,1079=>479,1080=>584,1081=>584,1082=>543,
-1083=>575,1084=>679,1085=>588,1086=>550,1087=>588,1088=>571,1089=>495,1090=>524,1091=>532,1092=>769,
-1093=>532,1094=>612,1095=>532,1096=>823,1097=>848,1098=>636,1099=>710,1100=>530,1101=>494,1102=>757,
-1103=>541,1104=>554,1105=>554,1106=>563,1107=>473,1108=>494,1109=>469,1110=>250,1111=>250,1112=>250,
-1113=>812,1114=>809,1115=>586,1116=>543,1117=>584,1118=>532,1119=>588,1120=>840,1121=>753,1122=>693,
-1123=>604,1124=>848,1125=>674,1126=>791,1127=>705,1128=>1043,1129=>901,1130=>708,1131=>550,1132=>924,
-1133=>742,1134=>572,1135=>486,1136=>771,1137=>789,1138=>708,1139=>550,1140=>703,1141=>598,1142=>703,
-1143=>598,1144=>893,1145=>813,1146=>857,1147=>682,1148=>1062,1149=>925,1150=>840,1151=>753,1152=>628,
-1153=>495,1154=>452,1155=>0,1156=>0,1157=>0,1158=>0,1159=>0,1160=>376,1161=>376,1162=>673,
-1163=>591,1164=>617,1165=>530,1166=>542,1167=>571,1168=>549,1169=>473,1170=>607,1171=>500,1172=>501,
-1173=>441,1174=>969,1175=>811,1176=>577,1177=>479,1178=>639,1179=>543,1180=>639,1181=>543,1182=>639,
-1183=>543,1184=>771,1185=>748,1186=>677,1187=>594,1188=>913,1189=>789,1190=>1002,1191=>855,1192=>801,
-1193=>636,1194=>628,1195=>495,1196=>549,1197=>476,1198=>549,1199=>532,1200=>549,1201=>532,1202=>616,
-1203=>532,1204=>840,1205=>726,1206=>617,1207=>532,1208=>617,1209=>532,1210=>617,1211=>570,1212=>836,
-1213=>658,1214=>836,1215=>658,1216=>265,1217=>969,1218=>811,1219=>589,1220=>543,1221=>677,1222=>575,
-1223=>677,1224=>594,1225=>677,1226=>594,1227=>617,1228=>532,1229=>776,1230=>679,1231=>250,1232=>615,
-1233=>551,1234=>615,1235=>551,1236=>876,1237=>896,1238=>568,1239=>554,1240=>708,1241=>554,1242=>708,
-1243=>554,1244=>969,1245=>811,1246=>577,1247=>479,1248=>599,1249=>520,1250=>673,1251=>584,1252=>673,
-1253=>584,1254=>708,1255=>550,1256=>708,1257=>550,1258=>708,1259=>550,1260=>628,1261=>494,1262=>548,
-1263=>532,1264=>548,1265=>532,1266=>548,1267=>532,1268=>617,1269=>532,1270=>501,1271=>442,1272=>736,
-1273=>710,1274=>607,1275=>500,1276=>616,1277=>532,1278=>616,1279=>532,1280=>617,1281=>530,1282=>905,
-1283=>807,1284=>877,1285=>782,1286=>611,1287=>529,1288=>964,1289=>861,1290=>1001,1291=>870,1292=>697,
-1293=>593,1294=>695,1295=>640,1296=>553,1297=>486,1298=>677,1299=>575,1300=>1076,1301=>896,1302=>810,
-1303=>780,1304=>927,1305=>890,1306=>708,1307=>571,1308=>890,1309=>736,1312=>1002,1313=>848,1314=>1002,
-1315=>854,1316=>713,1317=>614,1329=>780,1330=>659,1331=>794,1332=>794,1333=>659,1334=>579,1335=>613,
-1336=>659,1337=>765,1338=>794,1339=>659,1340=>501,1341=>741,1342=>888,1343=>659,1344=>636,1345=>579,
-1346=>794,1347=>699,1348=>794,1349=>659,1350=>756,1351=>659,1352=>659,1353=>659,1354=>711,1355=>579,
-1356=>794,1357=>659,1358=>794,1359=>571,1360=>659,1361=>659,1362=>719,1363=>774,1364=>711,1365=>708,
-1366=>571,1369=>276,1370=>286,1371=>450,1372=>450,1373=>352,1374=>474,1375=>450,1377=>876,1378=>570,
-1379=>686,1380=>690,1381=>570,1382=>627,1383=>479,1384=>570,1385=>630,1386=>627,1387=>570,1388=>363,
-1389=>804,1390=>576,1391=>570,1392=>570,1393=>571,1394=>631,1395=>570,1396=>593,1397=>250,1398=>684,
-1399=>464,1400=>570,1401=>407,1402=>876,1403=>464,1404=>691,1405=>570,1406=>626,1407=>876,1408=>570,
-1409=>571,1410=>451,1411=>876,1412=>583,1413=>550,1414=>566,1415=>686,1417=>303,1418=>390,1456=>0,
-1457=>0,1458=>0,1459=>0,1460=>0,1461=>0,1462=>0,1463=>0,1464=>0,1465=>0,1466=>0,
-1467=>0,1468=>0,1469=>0,1470=>325,1471=>0,1472=>265,1473=>0,1474=>0,1475=>265,1478=>410,
-1479=>0,1488=>566,1489=>547,1490=>403,1491=>534,1492=>576,1493=>245,1494=>336,1495=>576,1496=>583,
-1497=>245,1498=>532,1499=>500,1500=>539,1501=>576,1502=>593,1503=>245,1504=>397,1505=>629,1506=>506,
-1507=>576,1508=>543,1509=>468,1510=>523,1511=>596,1512=>532,1513=>727,1514=>591,1520=>423,1521=>409,
-1522=>423,1523=>374,1524=>580,3647=>586,3713=>603,3714=>615,3716=>619,3719=>434,3720=>565,3722=>615,
-3725=>619,3732=>577,3733=>577,3734=>605,3735=>589,3737=>576,3738=>533,3739=>533,3740=>670,3741=>690,
-3742=>618,3743=>618,3745=>631,3746=>619,3747=>615,3749=>584,3751=>569,3754=>633,3755=>737,3757=>569,
-3758=>615,3759=>708,3760=>569,3761=>0,3762=>485,3763=>485,3764=>0,3765=>0,3766=>0,3767=>0,
-3768=>0,3769=>0,3771=>0,3772=>0,3773=>597,3776=>324,3777=>611,3778=>414,3779=>492,3780=>442,
-3782=>606,3784=>0,3785=>0,3786=>0,3787=>0,3788=>0,3789=>0,3792=>572,3793=>576,3794=>576,
-3795=>603,3796=>563,3797=>563,3798=>633,3799=>603,3800=>606,3801=>609,3804=>925,3805=>925,4256=>756,
-4257=>621,4258=>577,4259=>683,4260=>532,4261=>617,4262=>710,4263=>729,4264=>420,4265=>508,4266=>710,
-4267=>713,4268=>526,4269=>753,4270=>675,4271=>620,4272=>729,4273=>526,4274=>526,4275=>753,4276=>753,
-4277=>581,4278=>543,4279=>526,4280=>536,4281=>526,4282=>649,4283=>715,4284=>526,4285=>510,4286=>526,
-4287=>602,4288=>719,4289=>488,4290=>598,4291=>488,4292=>508,4293=>606,4304=>457,4305=>457,4306=>479,
-4307=>706,4308=>470,4309=>465,4310=>457,4311=>717,4312=>457,4313=>466,4314=>952,4315=>470,4316=>470,
-4317=>704,4318=>466,4319=>470,4320=>713,4321=>470,4322=>590,4323=>471,4324=>709,4325=>470,4326=>704,
-4327=>470,4328=>470,4329=>470,4330=>510,4331=>470,4332=>470,4333=>439,4334=>470,4335=>448,4336=>465,
-4337=>504,4338=>457,4339=>457,4340=>457,4341=>507,4342=>741,4343=>536,4344=>470,4345=>498,4346=>498,
-4347=>527,4348=>273,5121=>615,5122=>615,5123=>615,5124=>615,5125=>692,5126=>692,5127=>692,5129=>692,
-5130=>692,5131=>692,5132=>751,5133=>751,5134=>751,5135=>751,5136=>751,5137=>751,5138=>870,5139=>906,
-5140=>870,5141=>906,5142=>692,5143=>870,5144=>906,5145=>870,5146=>906,5147=>692,5149=>230,5150=>488,
-5151=>381,5152=>381,5153=>350,5154=>350,5155=>354,5156=>350,5157=>419,5158=>347,5159=>230,5160=>350,
-5161=>350,5162=>350,5163=>980,5164=>817,5165=>857,5166=>1005,5167=>615,5168=>615,5169=>615,5170=>615,
-5171=>656,5172=>656,5173=>656,5175=>656,5176=>656,5177=>656,5178=>751,5179=>615,5180=>751,5181=>751,
-5182=>751,5183=>751,5184=>870,5185=>906,5186=>870,5187=>906,5188=>870,5189=>906,5190=>870,5191=>906,
-5192=>656,5193=>457,5194=>172,5196=>659,5197=>659,5198=>659,5199=>659,5200=>657,5201=>657,5202=>657,
-5204=>657,5205=>657,5206=>657,5207=>829,5208=>800,5209=>829,5210=>800,5211=>829,5212=>800,5213=>835,
-5214=>810,5215=>835,5216=>810,5217=>853,5218=>810,5219=>853,5220=>810,5221=>853,5222=>391,5223=>790,
-5224=>790,5225=>779,5226=>801,5227=>565,5228=>565,5229=>565,5230=>565,5231=>565,5232=>565,5233=>565,
-5234=>565,5235=>565,5236=>773,5237=>693,5238=>733,5239=>734,5240=>733,5241=>734,5242=>773,5243=>693,
-5244=>773,5245=>693,5246=>733,5247=>734,5248=>733,5249=>734,5250=>733,5251=>366,5252=>366,5253=>675,
-5254=>697,5255=>675,5256=>697,5257=>565,5258=>565,5259=>565,5260=>565,5261=>565,5262=>565,5263=>565,
-5264=>565,5265=>565,5266=>773,5267=>693,5268=>733,5269=>734,5270=>733,5271=>734,5272=>773,5273=>693,
-5274=>773,5275=>693,5276=>733,5277=>734,5278=>733,5279=>734,5280=>733,5281=>391,5282=>391,5283=>549,
-5284=>501,5285=>501,5286=>501,5287=>549,5288=>549,5289=>549,5290=>501,5291=>501,5292=>674,5293=>691,
-5294=>671,5295=>687,5296=>671,5297=>687,5298=>674,5299=>691,5300=>674,5301=>691,5302=>671,5303=>687,
-5304=>671,5305=>687,5306=>671,5307=>347,5308=>457,5309=>347,5312=>766,5313=>766,5314=>766,5315=>766,
-5316=>766,5317=>766,5318=>766,5319=>766,5320=>766,5321=>962,5322=>931,5323=>953,5324=>766,5325=>953,
-5326=>766,5327=>766,5328=>540,5329=>407,5330=>540,5331=>766,5332=>766,5333=>766,5334=>766,5335=>766,
-5336=>766,5337=>766,5338=>766,5339=>766,5340=>962,5341=>931,5342=>953,5343=>927,5344=>953,5345=>927,
-5346=>962,5347=>931,5348=>962,5349=>931,5350=>975,5351=>927,5352=>975,5353=>927,5354=>540,5356=>656,
-5357=>542,5358=>542,5359=>542,5360=>542,5361=>542,5362=>542,5363=>542,5364=>542,5365=>542,5366=>751,
-5367=>678,5368=>712,5369=>694,5370=>712,5371=>694,5372=>751,5373=>678,5374=>751,5375=>678,5376=>712,
-5377=>694,5378=>712,5379=>694,5380=>712,5381=>376,5382=>378,5383=>376,5392=>641,5393=>641,5394=>641,
-5395=>802,5396=>802,5397=>802,5398=>802,5399=>818,5400=>785,5401=>818,5402=>785,5403=>818,5404=>785,
-5405=>1026,5406=>989,5407=>1026,5408=>989,5409=>1026,5410=>989,5411=>1026,5412=>989,5413=>576,5414=>564,
-5415=>564,5416=>564,5417=>564,5418=>564,5419=>564,5420=>564,5421=>564,5422=>564,5423=>760,5424=>703,
-5425=>734,5426=>736,5427=>734,5428=>736,5429=>760,5430=>703,5431=>760,5432=>703,5433=>734,5434=>736,
-5435=>734,5436=>736,5437=>734,5438=>376,5440=>350,5441=>436,5442=>824,5443=>824,5444=>776,5445=>824,
-5446=>776,5447=>776,5448=>542,5449=>542,5450=>542,5451=>542,5452=>542,5453=>542,5454=>751,5455=>678,
-5456=>376,5458=>656,5459=>615,5460=>615,5461=>615,5462=>615,5463=>653,5464=>653,5465=>653,5466=>653,
-5467=>831,5468=>906,5469=>457,5470=>659,5471=>659,5472=>659,5473=>659,5474=>659,5475=>659,5476=>657,
-5477=>657,5478=>657,5479=>657,5480=>853,5481=>810,5482=>457,5492=>747,5493=>747,5494=>747,5495=>747,
-5496=>747,5497=>747,5498=>747,5499=>507,5500=>677,5501=>436,5502=>942,5503=>942,5504=>942,5505=>942,
-5506=>942,5507=>942,5508=>942,5509=>743,5514=>747,5515=>747,5516=>747,5517=>747,5518=>1133,5519=>1133,
-5520=>1133,5521=>901,5522=>901,5523=>1133,5524=>1133,5525=>629,5526=>965,5536=>766,5537=>766,5538=>719,
-5539=>719,5540=>719,5541=>719,5542=>540,5543=>579,5544=>579,5545=>579,5546=>579,5547=>579,5548=>579,
-5549=>579,5550=>376,5551=>565,5598=>693,5601=>693,5702=>421,5703=>421,5742=>399,5743=>942,5744=>1178,
-5745=>1469,5746=>1469,5747=>1237,5748=>1237,5749=>1469,5750=>1469,7424=>532,7425=>646,7426=>883,7427=>527,
-7428=>495,7429=>544,7430=>544,7431=>441,7432=>486,7433=>250,7434=>355,7435=>521,7436=>524,7437=>679,
-7438=>584,7439=>550,7440=>495,7441=>615,7442=>615,7443=>615,7444=>920,7446=>550,7447=>550,7448=>472,
-7449=>541,7450=>541,7451=>524,7452=>517,7453=>663,7454=>853,7455=>574,7456=>532,7457=>736,7458=>472,
-7459=>473,7462=>524,7463=>532,7464=>507,7465=>472,7466=>531,7467=>575,7468=>387,7469=>552,7470=>389,
-7472=>436,7473=>358,7474=>358,7475=>439,7476=>426,7477=>167,7478=>167,7479=>372,7480=>315,7481=>489,
-7482=>424,7483=>424,7484=>446,7485=>396,7486=>342,7487=>394,7488=>346,7489=>415,7490=>560,7491=>352,
-7492=>352,7493=>365,7494=>583,7495=>385,7496=>365,7497=>375,7498=>375,7499=>324,7500=>323,7501=>365,
-7502=>161,7503=>383,7504=>561,7505=>368,7506=>372,7507=>333,7508=>372,7509=>372,7510=>385,7511=>265,
-7512=>364,7513=>422,7514=>561,7515=>375,7517=>361,7518=>335,7519=>347,7520=>374,7521=>327,7522=>161,
-7523=>233,7524=>364,7525=>375,7526=>361,7527=>335,7528=>370,7529=>374,7530=>327,7543=>571,7544=>426,
-7547=>334,7557=>250,7579=>365,7580=>333,7581=>333,7582=>372,7583=>324,7584=>267,7585=>209,7586=>365,
-7587=>364,7588=>235,7589=>224,7590=>234,7591=>235,7592=>211,7593=>224,7594=>211,7595=>338,7596=>561,
-7597=>561,7598=>369,7599=>431,7600=>368,7601=>372,7602=>372,7603=>324,7604=>258,7605=>265,7606=>457,
-7607=>376,7608=>325,7609=>365,7610=>375,7611=>330,7612=>393,7613=>330,7614=>353,7615=>372,7620=>0,
-7621=>0,7622=>0,7623=>0,7624=>0,7625=>0,7680=>615,7681=>551,7682=>617,7683=>571,7684=>617,
-7685=>571,7686=>617,7687=>571,7688=>628,7689=>495,7690=>693,7691=>571,7692=>693,7693=>571,7694=>693,
-7695=>571,7696=>693,7697=>571,7698=>693,7699=>571,7700=>568,7701=>554,7702=>568,7703=>554,7704=>568,
-7705=>554,7706=>568,7707=>554,7708=>568,7709=>554,7710=>518,7711=>316,7712=>697,7713=>571,7714=>677,
-7715=>570,7716=>677,7717=>570,7718=>677,7719=>570,7720=>677,7721=>570,7722=>677,7723=>570,7724=>265,
-7725=>250,7726=>265,7727=>250,7728=>590,7729=>521,7730=>590,7731=>521,7732=>590,7733=>521,7734=>501,
-7735=>250,7736=>501,7737=>250,7738=>501,7739=>250,7740=>501,7741=>250,7742=>776,7743=>876,7744=>776,
-7745=>876,7746=>776,7747=>876,7748=>673,7749=>570,7750=>673,7751=>570,7752=>673,7753=>570,7754=>673,
-7755=>570,7756=>708,7757=>550,7758=>708,7759=>550,7760=>708,7761=>550,7762=>708,7763=>550,7764=>542,
-7765=>571,7766=>542,7767=>571,7768=>625,7769=>370,7770=>625,7771=>370,7772=>625,7773=>370,7774=>625,
-7775=>370,7776=>571,7777=>469,7778=>571,7779=>469,7780=>571,7781=>469,7782=>571,7783=>469,7784=>571,
-7785=>469,7786=>549,7787=>353,7788=>549,7789=>353,7790=>549,7791=>353,7792=>549,7793=>353,7794=>659,
-7795=>570,7796=>659,7797=>570,7798=>659,7799=>570,7800=>659,7801=>570,7802=>659,7803=>570,7804=>615,
-7805=>532,7806=>615,7807=>532,7808=>890,7809=>736,7810=>890,7811=>736,7812=>890,7813=>736,7814=>890,
-7815=>736,7816=>890,7817=>736,7818=>616,7819=>532,7820=>616,7821=>532,7822=>549,7823=>532,7824=>616,
-7825=>472,7826=>616,7827=>472,7828=>616,7829=>472,7830=>570,7831=>353,7832=>736,7833=>532,7834=>551,
-7835=>316,7838=>691,7839=>550,7840=>615,7841=>551,7842=>615,7843=>551,7844=>615,7845=>551,7846=>615,
-7847=>551,7848=>615,7849=>551,7850=>615,7851=>551,7852=>615,7853=>551,7854=>615,7855=>551,7856=>615,
-7857=>551,7858=>615,7859=>551,7860=>615,7861=>551,7862=>615,7863=>551,7864=>568,7865=>554,7866=>568,
-7867=>554,7868=>568,7869=>554,7870=>568,7871=>554,7872=>568,7873=>554,7874=>568,7875=>554,7876=>568,
-7877=>554,7878=>568,7879=>554,7880=>265,7881=>250,7882=>265,7883=>250,7884=>708,7885=>550,7886=>708,
-7887=>550,7888=>708,7889=>550,7890=>708,7891=>550,7892=>708,7893=>550,7894=>708,7895=>550,7896=>708,
-7897=>550,7898=>822,7899=>550,7900=>822,7901=>550,7902=>822,7903=>550,7904=>822,7905=>550,7906=>822,
-7907=>550,7908=>659,7909=>570,7910=>659,7911=>570,7912=>754,7913=>570,7914=>754,7915=>570,7916=>754,
-7917=>570,7918=>754,7919=>570,7920=>754,7921=>570,7922=>549,7923=>532,7924=>549,7925=>532,7926=>549,
-7927=>532,7928=>549,7929=>532,7936=>593,7937=>593,7938=>593,7939=>593,7940=>593,7941=>593,7942=>593,
-7943=>593,7944=>615,7945=>615,7946=>790,7947=>790,7948=>692,7949=>721,7950=>637,7951=>668,7952=>486,
-7953=>486,7954=>486,7955=>486,7956=>486,7957=>486,7960=>640,7961=>640,7962=>869,7963=>877,7964=>809,
-7965=>835,7968=>570,7969=>570,7970=>570,7971=>570,7972=>570,7973=>570,7974=>570,7975=>570,7976=>753,
-7977=>751,7978=>977,7979=>980,7980=>924,7981=>945,7982=>840,7983=>852,7984=>304,7985=>304,7986=>304,
-7987=>304,7988=>304,7989=>304,7990=>304,7991=>304,7992=>342,7993=>336,7994=>571,7995=>571,7996=>513,
-7997=>540,7998=>440,7999=>443,8000=>550,8001=>550,8002=>550,8003=>550,8004=>550,8005=>550,8008=>724,
-8009=>763,8010=>985,8011=>989,8012=>844,8013=>873,8016=>521,8017=>521,8018=>521,8019=>521,8020=>521,
-8021=>521,8022=>521,8023=>521,8025=>705,8027=>897,8029=>911,8031=>808,8032=>753,8033=>753,8034=>753,
-8035=>753,8036=>753,8037=>753,8038=>753,8039=>753,8040=>722,8041=>759,8042=>980,8043=>985,8044=>851,
-8045=>875,8046=>829,8047=>857,8048=>593,8049=>593,8050=>486,8051=>493,8052=>570,8053=>589,8054=>304,
-8055=>304,8056=>550,8057=>550,8058=>521,8059=>521,8060=>753,8061=>753,8064=>593,8065=>593,8066=>593,
-8067=>593,8068=>593,8069=>593,8070=>593,8071=>593,8072=>615,8073=>615,8074=>790,8075=>790,8076=>692,
-8077=>721,8078=>637,8079=>668,8080=>570,8081=>570,8082=>570,8083=>570,8084=>570,8085=>570,8086=>570,
-8087=>570,8088=>753,8089=>751,8090=>977,8091=>980,8092=>924,8093=>945,8094=>840,8095=>852,8096=>753,
-8097=>753,8098=>753,8099=>753,8100=>753,8101=>753,8102=>753,8103=>753,8104=>722,8105=>759,8106=>980,
-8107=>985,8108=>851,8109=>875,8110=>829,8111=>857,8112=>593,8113=>593,8114=>593,8115=>593,8116=>593,
-8118=>593,8119=>593,8120=>615,8121=>615,8122=>645,8123=>623,8124=>615,8125=>450,8126=>450,8127=>450,
-8128=>450,8129=>450,8130=>570,8131=>570,8132=>589,8134=>570,8135=>570,8136=>724,8137=>671,8138=>837,
-8139=>784,8140=>677,8141=>450,8142=>450,8143=>450,8144=>304,8145=>304,8146=>304,8147=>304,8150=>304,
-8151=>304,8152=>265,8153=>265,8154=>427,8155=>367,8157=>450,8158=>450,8159=>450,8160=>521,8161=>521,
-8162=>521,8163=>521,8164=>571,8165=>571,8166=>521,8167=>521,8168=>549,8169=>549,8170=>760,8171=>742,
-8172=>616,8173=>450,8174=>450,8175=>450,8178=>753,8179=>753,8180=>753,8182=>753,8183=>753,8184=>847,
-8185=>731,8186=>830,8187=>743,8188=>688,8189=>450,8190=>450,8192=>450,8193=>900,8194=>450,8195=>900,
-8196=>296,8197=>225,8198=>150,8199=>572,8200=>286,8201=>180,8202=>89,8203=>0,8204=>0,8205=>0,
-8206=>0,8207=>0,8208=>325,8209=>325,8210=>572,8213=>900,8214=>450,8215=>450,8219=>286,8223=>466,
-8227=>531,8228=>299,8229=>600,8231=>286,8234=>0,8235=>0,8236=>0,8237=>0,8238=>0,8239=>180,
-8241=>1521,8242=>204,8243=>336,8244=>468,8245=>204,8246=>336,8247=>468,8248=>305,8251=>754,8252=>437,
-8253=>478,8254=>450,8255=>723,8256=>723,8257=>225,8258=>900,8259=>450,8260=>150,8261=>351,8262=>351,
-8263=>830,8264=>659,8265=>659,8266=>447,8267=>572,8268=>450,8269=>450,8270=>450,8271=>303,8272=>723,
-8273=>450,8274=>404,8275=>900,8276=>723,8277=>754,8278=>527,8279=>597,8280=>754,8281=>754,8282=>286,
-8283=>717,8284=>754,8285=>286,8286=>286,8287=>200,8288=>0,8289=>0,8290=>0,8291=>0,8292=>0,
-8298=>0,8299=>0,8300=>0,8301=>0,8302=>0,8303=>0,8304=>360,8305=>161,8308=>360,8309=>360,
-8310=>360,8311=>360,8312=>360,8313=>360,8314=>475,8315=>475,8316=>475,8317=>221,8318=>221,8319=>359,
-8320=>360,8321=>360,8322=>360,8323=>360,8324=>360,8325=>360,8326=>360,8327=>360,8328=>360,8329=>360,
-8330=>475,8331=>475,8332=>475,8333=>221,8334=>221,8336=>352,8337=>375,8338=>372,8339=>399,8340=>375,
-8352=>789,8353=>572,8354=>572,8355=>572,8356=>572,8357=>876,8358=>673,8359=>1143,8360=>966,8361=>890,
-8362=>754,8363=>572,8365=>590,8366=>549,8367=>1145,8368=>572,8369=>572,8370=>572,8371=>572,8372=>696,
-8373=>577,8400=>0,8401=>0,8406=>0,8407=>0,8411=>0,8412=>0,8417=>0,8448=>873,8449=>873,
-8450=>628,8451=>1011,8452=>807,8453=>872,8454=>929,8455=>553,8456=>628,8457=>856,8459=>889,8460=>679,
-8461=>765,8462=>570,8463=>570,8464=>422,8465=>627,8466=>648,8467=>372,8468=>736,8469=>721,8470=>936,
-8471=>900,8472=>627,8473=>631,8474=>708,8475=>718,8476=>732,8477=>712,8478=>807,8479=>615,8480=>917,
-8481=>912,8483=>615,8484=>670,8485=>520,8486=>688,8487=>688,8488=>554,8489=>304,8490=>590,8491=>615,
-8492=>708,8493=>633,8494=>769,8495=>532,8496=>545,8497=>708,8498=>518,8499=>962,8500=>416,8501=>670,
-8502=>606,8503=>419,8504=>580,8505=>342,8506=>833,8507=>1041,8508=>632,8509=>655,8510=>589,8511=>764,
-8512=>729,8513=>697,8514=>501,8515=>501,8516=>549,8517=>737,8518=>637,8519=>554,8520=>316,8521=>316,
-8523=>702,8526=>474,8531=>872,8532=>872,8533=>872,8534=>872,8535=>872,8536=>872,8537=>872,8538=>872,
-8539=>872,8540=>872,8541=>872,8542=>872,8543=>511,8544=>265,8545=>443,8546=>620,8547=>831,8548=>615,
-8549=>830,8550=>1007,8551=>1185,8552=>826,8553=>616,8554=>839,8555=>1018,8556=>501,8557=>628,8558=>693,
-8559=>776,8560=>250,8561=>412,8562=>573,8563=>730,8564=>532,8565=>729,8566=>892,8567=>1053,8568=>737,
-8569=>532,8570=>740,8571=>901,8572=>250,8573=>495,8574=>571,8575=>876,8576=>1121,8577=>693,8578=>1121,
-8579=>633,8580=>494,8592=>754,8593=>754,8594=>754,8595=>754,8596=>754,8597=>754,8598=>754,8599=>754,
-8600=>754,8601=>754,8602=>754,8603=>754,8604=>754,8605=>754,8606=>754,8607=>754,8608=>754,8609=>754,
-8610=>754,8611=>754,8612=>754,8613=>754,8614=>754,8615=>754,8616=>754,8617=>754,8618=>754,8619=>754,
-8620=>754,8621=>754,8622=>754,8623=>754,8624=>754,8625=>754,8626=>754,8627=>754,8628=>754,8629=>754,
-8630=>754,8631=>754,8632=>754,8633=>754,8634=>754,8635=>754,8636=>754,8637=>754,8638=>754,8639=>754,
-8640=>754,8641=>754,8642=>754,8643=>754,8644=>754,8645=>754,8646=>754,8647=>754,8648=>754,8649=>754,
-8650=>754,8651=>754,8652=>754,8653=>754,8654=>754,8655=>754,8656=>754,8657=>754,8658=>754,8659=>754,
-8660=>754,8661=>754,8662=>754,8663=>754,8664=>754,8665=>754,8666=>754,8667=>754,8668=>754,8669=>754,
-8670=>754,8671=>754,8672=>754,8673=>754,8674=>754,8675=>754,8676=>754,8677=>754,8678=>754,8679=>754,
-8680=>754,8681=>754,8682=>754,8683=>754,8684=>754,8685=>754,8686=>754,8687=>754,8688=>754,8689=>754,
-8690=>754,8691=>754,8692=>754,8693=>754,8694=>754,8695=>754,8696=>754,8697=>754,8698=>754,8699=>754,
-8700=>754,8701=>754,8702=>754,8703=>754,8704=>615,8705=>572,8706=>465,8707=>568,8708=>568,8709=>784,
-8710=>602,8711=>602,8712=>784,8713=>784,8714=>646,8715=>784,8716=>784,8717=>646,8718=>572,8719=>681,
-8720=>681,8721=>606,8722=>754,8723=>754,8724=>754,8725=>303,8726=>573,8727=>754,8728=>563,8729=>563,
-8730=>573,8731=>573,8732=>573,8733=>643,8734=>750,8735=>754,8736=>807,8737=>807,8738=>754,8739=>450,
-8740=>450,8741=>450,8742=>450,8743=>659,8744=>659,8745=>659,8746=>659,8747=>469,8748=>710,8749=>951,
-8750=>469,8751=>710,8752=>951,8753=>469,8754=>469,8755=>469,8756=>572,8757=>572,8758=>234,8759=>572,
-8760=>754,8761=>754,8762=>754,8763=>754,8764=>754,8765=>754,8766=>754,8767=>754,8768=>337,8769=>754,
-8770=>754,8771=>754,8772=>754,8773=>754,8774=>754,8775=>754,8776=>754,8777=>754,8778=>754,8779=>754,
-8780=>754,8781=>754,8782=>754,8783=>754,8784=>754,8785=>754,8786=>754,8787=>754,8788=>900,8789=>900,
-8790=>754,8791=>754,8792=>754,8793=>754,8794=>754,8795=>754,8796=>754,8797=>754,8798=>754,8799=>754,
-8800=>754,8801=>754,8802=>754,8803=>754,8804=>754,8805=>754,8806=>754,8807=>754,8808=>754,8809=>754,
-8810=>942,8811=>942,8812=>417,8813=>754,8814=>754,8815=>754,8816=>754,8817=>754,8818=>754,8819=>754,
-8820=>754,8821=>754,8822=>754,8823=>754,8824=>754,8825=>754,8826=>754,8827=>754,8828=>754,8829=>754,
-8830=>754,8831=>754,8832=>754,8833=>754,8834=>754,8835=>754,8836=>754,8837=>754,8838=>754,8839=>754,
-8840=>754,8841=>754,8842=>754,8843=>754,8844=>659,8845=>659,8846=>659,8847=>754,8848=>754,8849=>754,
-8850=>754,8851=>702,8852=>702,8853=>754,8854=>754,8855=>754,8856=>754,8857=>754,8858=>754,8859=>754,
-8860=>754,8861=>754,8862=>754,8863=>754,8864=>754,8865=>754,8866=>784,8867=>784,8868=>784,8869=>784,
-8870=>468,8871=>468,8872=>784,8873=>784,8874=>784,8875=>784,8876=>784,8877=>784,8878=>784,8879=>784,
-8880=>754,8881=>754,8882=>754,8883=>754,8884=>754,8885=>754,8886=>900,8887=>900,8888=>754,8889=>754,
-8890=>468,8891=>659,8892=>659,8893=>659,8894=>754,8895=>754,8896=>738,8897=>738,8898=>738,8899=>738,
-8900=>444,8901=>286,8902=>563,8903=>754,8904=>900,8905=>900,8906=>900,8907=>900,8908=>900,8909=>754,
-8910=>659,8911=>659,8912=>754,8913=>754,8914=>754,8915=>754,8916=>754,8917=>754,8918=>754,8919=>754,
-8920=>1280,8921=>1280,8922=>754,8923=>754,8924=>754,8925=>754,8926=>754,8927=>754,8928=>754,8929=>754,
-8930=>754,8931=>754,8932=>754,8933=>754,8934=>754,8935=>754,8936=>754,8937=>754,8938=>754,8939=>754,
-8940=>754,8941=>754,8942=>900,8943=>900,8944=>900,8945=>900,8946=>900,8947=>784,8948=>646,8949=>784,
-8950=>784,8951=>646,8952=>784,8953=>784,8954=>900,8955=>784,8956=>646,8957=>784,8958=>646,8959=>784,
-8960=>542,8961=>542,8962=>571,8963=>754,8964=>754,8965=>754,8966=>754,8967=>439,8968=>351,8969=>351,
-8970=>351,8971=>351,8972=>728,8973=>728,8974=>728,8975=>728,8976=>754,8977=>461,8984=>900,8985=>754,
-8988=>422,8989=>422,8990=>422,8991=>422,8992=>469,8993=>469,8996=>1037,8997=>1037,8998=>1272,8999=>1037,
-9000=>1299,9003=>1272,9004=>786,9075=>304,9076=>571,9077=>753,9082=>593,9085=>681,9095=>1037,9108=>786,
-9115=>450,9116=>450,9117=>450,9118=>450,9119=>450,9120=>450,9121=>450,9122=>450,9123=>450,9124=>450,
-9125=>450,9126=>450,9127=>675,9128=>675,9129=>675,9130=>675,9131=>675,9132=>675,9133=>675,9134=>469,
-9166=>754,9167=>850,9187=>786,9189=>692,9250=>571,9251=>571,9312=>807,9313=>807,9314=>807,9315=>807,
-9316=>807,9317=>807,9318=>807,9319=>807,9320=>807,9321=>807,9472=>542,9473=>542,9474=>542,9475=>542,
-9476=>542,9477=>542,9478=>542,9479=>542,9480=>542,9481=>542,9482=>542,9483=>542,9484=>542,9485=>542,
-9486=>542,9487=>542,9488=>542,9489=>542,9490=>542,9491=>542,9492=>542,9493=>542,9494=>542,9495=>542,
-9496=>542,9497=>542,9498=>542,9499=>542,9500=>542,9501=>542,9502=>542,9503=>542,9504=>542,9505=>542,
-9506=>542,9507=>542,9508=>542,9509=>542,9510=>542,9511=>542,9512=>542,9513=>542,9514=>542,9515=>542,
-9516=>542,9517=>542,9518=>542,9519=>542,9520=>542,9521=>542,9522=>542,9523=>542,9524=>542,9525=>542,
-9526=>542,9527=>542,9528=>542,9529=>542,9530=>542,9531=>542,9532=>542,9533=>542,9534=>542,9535=>542,
-9536=>542,9537=>542,9538=>542,9539=>542,9540=>542,9541=>542,9542=>542,9543=>542,9544=>542,9545=>542,
-9546=>542,9547=>542,9548=>542,9549=>542,9550=>542,9551=>542,9552=>542,9553=>542,9554=>542,9555=>542,
-9556=>542,9557=>542,9558=>542,9559=>542,9560=>542,9561=>542,9562=>542,9563=>542,9564=>542,9565=>542,
-9566=>542,9567=>542,9568=>542,9569=>542,9570=>542,9571=>542,9572=>542,9573=>542,9574=>542,9575=>542,
-9576=>542,9577=>542,9578=>542,9579=>542,9580=>542,9581=>542,9582=>542,9583=>542,9584=>542,9585=>542,
-9586=>542,9587=>542,9588=>542,9589=>542,9590=>542,9591=>542,9592=>542,9593=>542,9594=>542,9595=>542,
-9596=>542,9597=>542,9598=>542,9599=>542,9600=>692,9601=>692,9602=>692,9603=>692,9604=>692,9605=>692,
-9606=>692,9607=>692,9608=>692,9609=>692,9610=>692,9611=>692,9612=>692,9613=>692,9614=>692,9615=>692,
-9616=>692,9617=>692,9618=>692,9619=>692,9620=>692,9621=>692,9622=>692,9623=>692,9624=>692,9625=>692,
-9626=>692,9627=>692,9628=>692,9629=>692,9630=>692,9631=>692,9632=>850,9633=>850,9634=>850,9635=>850,
-9636=>850,9637=>850,9638=>850,9639=>850,9640=>850,9641=>850,9642=>610,9643=>610,9644=>850,9645=>850,
-9646=>495,9647=>495,9648=>692,9649=>692,9650=>692,9651=>692,9652=>452,9653=>452,9654=>692,9655=>692,
-9656=>452,9657=>452,9658=>692,9659=>692,9660=>692,9661=>692,9662=>452,9663=>452,9664=>692,9665=>692,
-9666=>452,9667=>452,9668=>692,9669=>692,9670=>692,9671=>692,9672=>692,9673=>785,9674=>444,9675=>785,
-9676=>785,9677=>785,9678=>785,9679=>785,9680=>785,9681=>785,9682=>785,9683=>785,9684=>785,9685=>785,
-9686=>474,9687=>474,9688=>712,9689=>873,9690=>873,9691=>873,9692=>348,9693=>348,9694=>348,9695=>348,
-9696=>692,9697=>692,9698=>692,9699=>692,9700=>692,9701=>692,9702=>531,9703=>850,9704=>850,9705=>850,
-9706=>850,9707=>850,9708=>692,9709=>692,9710=>692,9711=>1007,9712=>850,9713=>850,9714=>850,9715=>850,
-9716=>785,9717=>785,9718=>785,9719=>785,9720=>692,9721=>692,9722=>692,9723=>747,9724=>747,9725=>659,
-9726=>659,9727=>692,9728=>807,9729=>900,9730=>807,9731=>807,9732=>807,9733=>807,9734=>807,9735=>515,
-9736=>806,9737=>807,9738=>799,9739=>799,9740=>604,9741=>911,9742=>1121,9743=>1125,9744=>807,9745=>807,
-9746=>807,9747=>479,9748=>807,9749=>807,9750=>807,9751=>807,9752=>807,9753=>807,9754=>807,9755=>807,
-9756=>807,9757=>548,9758=>807,9759=>548,9760=>807,9761=>807,9762=>807,9763=>807,9764=>602,9765=>671,
-9766=>584,9767=>705,9768=>490,9769=>807,9770=>807,9771=>807,9772=>639,9773=>807,9774=>807,9775=>807,
-9776=>800,9777=>800,9778=>800,9779=>800,9780=>800,9781=>800,9782=>800,9783=>800,9784=>807,9785=>807,
-9786=>807,9787=>807,9788=>807,9789=>807,9790=>807,9791=>552,9792=>658,9793=>658,9794=>807,9795=>807,
-9796=>807,9797=>807,9798=>807,9799=>807,9800=>807,9801=>807,9802=>807,9803=>807,9804=>807,9805=>807,
-9806=>807,9807=>807,9808=>807,9809=>807,9810=>807,9811=>807,9812=>807,9813=>807,9814=>807,9815=>807,
-9816=>807,9817=>807,9818=>807,9819=>807,9820=>807,9821=>807,9822=>807,9823=>807,9824=>807,9825=>807,
-9826=>807,9827=>807,9828=>807,9829=>807,9830=>807,9831=>807,9832=>807,9833=>424,9834=>574,9835=>807,
-9836=>807,9837=>424,9838=>321,9839=>435,9840=>673,9841=>689,9842=>807,9843=>807,9844=>807,9845=>807,
-9846=>807,9847=>807,9848=>807,9849=>807,9850=>807,9851=>807,9852=>807,9853=>807,9854=>807,9855=>807,
-9856=>782,9857=>782,9858=>782,9859=>782,9860=>782,9861=>782,9862=>800,9863=>800,9864=>800,9865=>800,
-9866=>800,9867=>800,9868=>800,9869=>800,9870=>800,9871=>800,9872=>675,9873=>675,9874=>800,9875=>734,
-9876=>644,9877=>483,9878=>766,9879=>800,9880=>615,9881=>800,9882=>637,9883=>800,9884=>800,9888=>800,
-9889=>632,9890=>903,9891=>977,9892=>1028,9893=>811,9894=>754,9895=>754,9896=>754,9897=>754,9898=>754,
-9899=>754,9900=>754,9901=>754,9902=>754,9903=>754,9904=>759,9905=>754,9906=>658,9907=>659,9908=>659,
-9909=>659,9910=>765,9911=>659,9912=>659,9985=>754,9986=>754,9987=>754,9988=>754,9990=>754,9991=>754,
-9992=>754,9993=>754,9996=>754,9997=>754,9998=>754,9999=>754,10000=>754,10001=>754,10002=>754,10003=>754,
-10004=>754,10005=>754,10006=>754,10007=>754,10008=>754,10009=>754,10010=>754,10011=>754,10012=>754,10013=>754,
-10014=>754,10015=>754,10016=>754,10017=>754,10018=>754,10019=>754,10020=>754,10021=>754,10022=>754,10023=>754,
-10025=>754,10026=>754,10027=>754,10028=>754,10029=>754,10030=>754,10031=>754,10032=>754,10033=>754,10034=>754,
-10035=>754,10036=>754,10037=>754,10038=>754,10039=>754,10040=>754,10041=>754,10042=>754,10043=>754,10044=>754,
-10045=>754,10046=>754,10047=>754,10048=>754,10049=>754,10050=>754,10051=>754,10052=>754,10053=>754,10054=>754,
-10055=>754,10056=>754,10057=>754,10058=>754,10059=>754,10061=>807,10063=>807,10064=>807,10065=>807,10066=>807,
-10070=>807,10072=>754,10073=>754,10074=>754,10075=>290,10076=>290,10077=>484,10078=>484,10081=>754,10082=>754,
-10083=>754,10084=>754,10085=>754,10086=>754,10087=>754,10088=>754,10089=>754,10090=>754,10091=>754,10092=>754,
-10093=>754,10094=>754,10095=>754,10096=>754,10097=>754,10098=>754,10099=>754,10100=>754,10101=>754,10102=>807,
-10103=>807,10104=>807,10105=>807,10106=>807,10107=>807,10108=>807,10109=>807,10110=>807,10111=>807,10112=>754,
-10113=>754,10114=>754,10115=>754,10116=>754,10117=>754,10118=>754,10119=>754,10120=>754,10121=>754,10122=>754,
-10123=>754,10124=>754,10125=>754,10126=>754,10127=>754,10128=>754,10129=>754,10130=>754,10131=>754,10132=>754,
-10136=>754,10137=>754,10138=>754,10139=>754,10140=>754,10141=>754,10142=>754,10143=>754,10144=>754,10145=>754,
-10146=>754,10147=>754,10148=>754,10149=>754,10150=>754,10151=>754,10152=>754,10153=>754,10154=>754,10155=>754,
-10156=>754,10157=>754,10158=>754,10159=>754,10161=>754,10162=>754,10163=>754,10164=>754,10165=>754,10166=>754,
-10167=>754,10168=>754,10169=>754,10170=>754,10171=>754,10172=>754,10173=>754,10174=>754,10181=>351,10182=>351,
-10208=>444,10214=>445,10215=>445,10216=>351,10217=>351,10218=>500,10219=>500,10224=>754,10225=>754,10226=>754,
-10227=>754,10228=>1042,10229=>1290,10230=>1290,10231=>1290,10232=>1290,10233=>1290,10234=>1290,10235=>1290,10236=>1290,
-10237=>1290,10238=>1290,10239=>1290,10240=>659,10241=>659,10242=>659,10243=>659,10244=>659,10245=>659,10246=>659,
-10247=>659,10248=>659,10249=>659,10250=>659,10251=>659,10252=>659,10253=>659,10254=>659,10255=>659,10256=>659,
-10257=>659,10258=>659,10259=>659,10260=>659,10261=>659,10262=>659,10263=>659,10264=>659,10265=>659,10266=>659,
-10267=>659,10268=>659,10269=>659,10270=>659,10271=>659,10272=>659,10273=>659,10274=>659,10275=>659,10276=>659,
-10277=>659,10278=>659,10279=>659,10280=>659,10281=>659,10282=>659,10283=>659,10284=>659,10285=>659,10286=>659,
-10287=>659,10288=>659,10289=>659,10290=>659,10291=>659,10292=>659,10293=>659,10294=>659,10295=>659,10296=>659,
-10297=>659,10298=>659,10299=>659,10300=>659,10301=>659,10302=>659,10303=>659,10304=>659,10305=>659,10306=>659,
-10307=>659,10308=>659,10309=>659,10310=>659,10311=>659,10312=>659,10313=>659,10314=>659,10315=>659,10316=>659,
-10317=>659,10318=>659,10319=>659,10320=>659,10321=>659,10322=>659,10323=>659,10324=>659,10325=>659,10326=>659,
-10327=>659,10328=>659,10329=>659,10330=>659,10331=>659,10332=>659,10333=>659,10334=>659,10335=>659,10336=>659,
-10337=>659,10338=>659,10339=>659,10340=>659,10341=>659,10342=>659,10343=>659,10344=>659,10345=>659,10346=>659,
-10347=>659,10348=>659,10349=>659,10350=>659,10351=>659,10352=>659,10353=>659,10354=>659,10355=>659,10356=>659,
-10357=>659,10358=>659,10359=>659,10360=>659,10361=>659,10362=>659,10363=>659,10364=>659,10365=>659,10366=>659,
-10367=>659,10368=>659,10369=>659,10370=>659,10371=>659,10372=>659,10373=>659,10374=>659,10375=>659,10376=>659,
-10377=>659,10378=>659,10379=>659,10380=>659,10381=>659,10382=>659,10383=>659,10384=>659,10385=>659,10386=>659,
-10387=>659,10388=>659,10389=>659,10390=>659,10391=>659,10392=>659,10393=>659,10394=>659,10395=>659,10396=>659,
-10397=>659,10398=>659,10399=>659,10400=>659,10401=>659,10402=>659,10403=>659,10404=>659,10405=>659,10406=>659,
-10407=>659,10408=>659,10409=>659,10410=>659,10411=>659,10412=>659,10413=>659,10414=>659,10415=>659,10416=>659,
-10417=>659,10418=>659,10419=>659,10420=>659,10421=>659,10422=>659,10423=>659,10424=>659,10425=>659,10426=>659,
-10427=>659,10428=>659,10429=>659,10430=>659,10431=>659,10432=>659,10433=>659,10434=>659,10435=>659,10436=>659,
-10437=>659,10438=>659,10439=>659,10440=>659,10441=>659,10442=>659,10443=>659,10444=>659,10445=>659,10446=>659,
-10447=>659,10448=>659,10449=>659,10450=>659,10451=>659,10452=>659,10453=>659,10454=>659,10455=>659,10456=>659,
-10457=>659,10458=>659,10459=>659,10460=>659,10461=>659,10462=>659,10463=>659,10464=>659,10465=>659,10466=>659,
-10467=>659,10468=>659,10469=>659,10470=>659,10471=>659,10472=>659,10473=>659,10474=>659,10475=>659,10476=>659,
-10477=>659,10478=>659,10479=>659,10480=>659,10481=>659,10482=>659,10483=>659,10484=>659,10485=>659,10486=>659,
-10487=>659,10488=>659,10489=>659,10490=>659,10491=>659,10492=>659,10493=>659,10494=>659,10495=>659,10502=>754,
-10503=>754,10506=>754,10507=>754,10560=>615,10561=>615,10627=>660,10628=>660,10702=>754,10703=>900,10704=>900,
-10705=>900,10706=>900,10707=>900,10708=>900,10709=>900,10731=>444,10746=>754,10747=>754,10752=>900,10753=>900,
-10754=>900,10764=>1192,10765=>469,10766=>469,10767=>469,10768=>469,10769=>469,10770=>469,10771=>469,10772=>469,
-10773=>469,10774=>469,10775=>469,10776=>469,10777=>469,10778=>469,10779=>469,10780=>469,10799=>754,10877=>754,
-10878=>754,10879=>754,10880=>754,10881=>754,10882=>754,10883=>754,10884=>754,10885=>754,10886=>754,10887=>754,
-10888=>754,10889=>754,10890=>754,10891=>754,10892=>754,10893=>754,10894=>754,10895=>754,10896=>754,10897=>754,
-10898=>754,10899=>754,10900=>754,10901=>754,10902=>754,10903=>754,10904=>754,10905=>754,10906=>754,10907=>754,
-10908=>754,10909=>754,10910=>754,10911=>754,10912=>754,10926=>754,10927=>754,10928=>754,10929=>754,10930=>754,
-10931=>754,10932=>754,10933=>754,10934=>754,10935=>754,10936=>754,10937=>754,10938=>754,11001=>754,11002=>754,
-11008=>754,11009=>754,11010=>754,11011=>754,11012=>754,11013=>754,11014=>754,11015=>754,11016=>754,11017=>754,
-11018=>754,11019=>754,11020=>754,11021=>754,11022=>752,11023=>752,11024=>752,11025=>752,11026=>850,11027=>850,
-11028=>850,11029=>850,11030=>692,11031=>692,11032=>692,11033=>692,11034=>850,11039=>782,11040=>782,11041=>786,
-11042=>786,11043=>786,11044=>1007,11091=>782,11092=>782,11360=>501,11361=>250,11362=>501,11363=>542,11364=>625,
-11365=>551,11366=>353,11367=>677,11368=>570,11369=>590,11370=>521,11371=>616,11372=>472,11373=>703,11374=>776,
-11375=>615,11377=>661,11378=>1015,11379=>865,11380=>532,11381=>589,11382=>511,11383=>593,11385=>373,11386=>550,
-11387=>441,11388=>157,11389=>387,11800=>478,11810=>351,11811=>351,11812=>351,11813=>351,11822=>478,19904=>807,
-19905=>807,19906=>807,19907=>807,19908=>807,19909=>807,19910=>807,19911=>807,19912=>807,19913=>807,19914=>807,
-19915=>807,19916=>807,19917=>807,19918=>807,19919=>807,19920=>807,19921=>807,19922=>807,19923=>807,19924=>807,
-19925=>807,19926=>807,19927=>807,19928=>807,19929=>807,19930=>807,19931=>807,19932=>807,19933=>807,19934=>807,
-19935=>807,19936=>807,19937=>807,19938=>807,19939=>807,19940=>807,19941=>807,19942=>807,19943=>807,19944=>807,
-19945=>807,19946=>807,19947=>807,19948=>807,19949=>807,19950=>807,19951=>807,19952=>807,19953=>807,19954=>807,
-19955=>807,19956=>807,19957=>807,19958=>807,19959=>807,19960=>807,19961=>807,19962=>807,19963=>807,19964=>807,
-19965=>807,19966=>807,19967=>807,42564=>571,42565=>469,42566=>318,42567=>304,42572=>1062,42573=>925,42576=>926,
-42577=>815,42580=>971,42581=>757,42582=>886,42583=>762,42594=>922,42595=>833,42596=>912,42597=>810,42598=>776,
-42599=>907,42600=>708,42601=>550,42602=>770,42603=>641,42604=>1222,42605=>917,42606=>791,42634=>725,42635=>649,
-42636=>549,42637=>524,42644=>617,42645=>570,42760=>444,42761=>444,42762=>444,42763=>444,42764=>444,42765=>444,
-42766=>444,42767=>444,42768=>444,42769=>444,42770=>444,42771=>444,42772=>444,42773=>444,42774=>444,42779=>332,
-42780=>332,42781=>227,42782=>227,42783=>227,42790=>677,42791=>570,42792=>790,42793=>638,42794=>553,42795=>486,
-42800=>441,42801=>469,42802=>1125,42803=>886,42804=>1097,42805=>900,42806=>1039,42807=>896,42808=>874,42809=>736,
-42810=>874,42811=>736,42812=>863,42813=>736,42814=>628,42815=>494,42822=>612,42823=>353,42824=>523,42825=>384,
-42826=>726,42827=>633,42830=>1222,42831=>917,42880=>501,42881=>250,42882=>662,42883=>570,42889=>303,42890=>338,
-42891=>360,42892=>247,43003=>518,43004=>542,43005=>776,43006=>265,43007=>1079,63173=>550,64256=>649,64257=>581,
-64258=>581,64259=>899,64260=>899,64261=>617,64262=>774,64275=>1081,64276=>1081,64277=>1076,64278=>1067,64279=>1376,
-64285=>245,64286=>0,64287=>423,64288=>572,64289=>770,64290=>696,64291=>815,64292=>694,64293=>759,64294=>769,
-64295=>726,64296=>788,64297=>754,64298=>727,64299=>727,64300=>727,64301=>727,64302=>566,64303=>566,64304=>566,
-64305=>547,64306=>403,64307=>534,64308=>576,64309=>245,64310=>336,64311=>900,64312=>583,64313=>302,64314=>532,
-64315=>500,64316=>539,64318=>593,64320=>397,64321=>629,64323=>576,64324=>543,64326=>523,64327=>596,64328=>532,
-64329=>727,64330=>591,64331=>245,64332=>547,64333=>500,64334=>543,64335=>566,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,65056=>0,65057=>0,65058=>0,65059=>0,65529=>0,65530=>0,65531=>0,
-65532=>0,65533=>923);
-$enc='';
-$diff='';
-$file='dejavusanscondensedi.z';
-$ctg='dejavusanscondensedi.ctg.z';
-$originalsize=488440;
-?>
\ No newline at end of file
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusanscondensedi.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusanscondensedi.z
deleted file mode 100644
index cf9052bf..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusanscondensedi.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusansi.ctg.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusansi.ctg.z
deleted file mode 100644
index ac628b3e..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusansi.ctg.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusansi.php b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusansi.php
deleted file mode 100644
index 2ff3c595..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusansi.php
+++ /dev/null
@@ -1,471 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='DejaVuSans-Oblique';
-$desc=array('Ascent'=>928,'Descent'=>-236,'CapHeight'=>-43,'Flags'=>96,'FontBBox'=>'[-1016 -350 1659 1068]','ItalicAngle'=>-11,'StemV'=>70,'MissingWidth'=>600);
-$up=-63;
-$ut=44;
-$dw=600;
-$cw=array(
-0=>600,32=>318,33=>401,34=>460,35=>838,36=>636,37=>950,38=>780,39=>275,40=>390,
-41=>390,42=>500,43=>838,44=>318,45=>361,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=>531,64=>1000,65=>684,66=>686,67=>698,68=>770,69=>632,70=>575,
-71=>775,72=>752,73=>295,74=>295,75=>656,76=>557,77=>863,78=>748,79=>787,80=>603,
-81=>787,82=>695,83=>635,84=>611,85=>732,86=>684,87=>989,88=>685,89=>611,90=>685,
-91=>390,92=>337,93=>390,94=>838,95=>500,96=>500,97=>613,98=>635,99=>550,100=>635,
-101=>615,102=>352,103=>635,104=>634,105=>278,106=>278,107=>579,108=>278,109=>974,110=>634,
-111=>612,112=>635,113=>635,114=>411,115=>521,116=>392,117=>634,118=>592,119=>818,120=>592,
-121=>592,122=>525,123=>636,124=>337,125=>636,126=>838,8364=>636,8218=>318,402=>352,8222=>518,
-8230=>1000,8224=>500,8225=>500,710=>500,8240=>1350,352=>635,8249=>400,338=>1070,381=>685,8216=>318,
-8217=>318,8220=>518,8221=>518,8226=>590,8211=>500,8212=>1000,732=>500,8482=>1000,353=>521,8250=>400,
-339=>1028,382=>525,376=>611,160=>318,161=>401,162=>636,163=>636,164=>636,165=>636,166=>337,
-167=>500,168=>500,169=>1000,170=>471,171=>617,172=>838,173=>361,174=>1000,175=>500,176=>500,
-177=>838,178=>401,179=>401,180=>500,181=>636,182=>636,183=>318,184=>500,185=>401,186=>471,
-187=>617,188=>969,189=>969,190=>969,191=>531,192=>684,193=>684,194=>684,195=>684,196=>684,
-197=>684,198=>974,199=>698,200=>632,201=>632,202=>632,203=>632,204=>295,205=>295,206=>295,
-207=>295,208=>775,209=>748,210=>787,211=>787,212=>787,213=>787,214=>787,215=>838,216=>787,
-217=>732,218=>732,219=>732,220=>732,221=>611,222=>608,223=>630,224=>613,225=>613,226=>613,
-227=>613,228=>613,229=>613,230=>995,231=>550,232=>615,233=>615,234=>615,235=>615,236=>278,
-237=>278,238=>278,239=>278,240=>612,241=>634,242=>612,243=>612,244=>612,245=>612,246=>612,
-247=>838,248=>612,249=>634,250=>634,251=>634,252=>634,253=>592,254=>635,255=>592,256=>684,
-257=>613,258=>684,259=>613,260=>684,261=>613,262=>698,263=>550,264=>698,265=>550,266=>698,
-267=>550,268=>698,269=>550,270=>770,271=>635,272=>775,273=>635,274=>632,275=>615,276=>632,
-277=>615,278=>632,279=>615,280=>632,281=>615,282=>632,283=>615,284=>775,285=>635,286=>775,
-287=>635,288=>775,289=>635,290=>775,291=>635,292=>752,293=>634,294=>916,295=>695,296=>295,
-297=>278,298=>295,299=>278,300=>295,301=>278,302=>295,303=>278,304=>295,305=>278,306=>590,
-307=>556,308=>295,309=>278,310=>656,311=>579,312=>579,313=>557,314=>278,315=>557,316=>278,
-317=>557,318=>278,319=>557,320=>278,321=>562,322=>287,323=>748,324=>634,325=>748,326=>634,
-327=>748,328=>634,329=>813,330=>748,331=>634,332=>787,333=>612,334=>787,335=>612,336=>787,
-337=>612,340=>695,341=>411,342=>695,343=>411,344=>695,345=>411,346=>635,347=>521,348=>635,
-349=>521,350=>635,351=>521,354=>611,355=>392,356=>611,357=>392,358=>611,359=>392,360=>732,
-361=>634,362=>732,363=>634,364=>732,365=>634,366=>732,367=>634,368=>732,369=>634,370=>732,
-371=>634,372=>989,373=>818,374=>611,375=>592,377=>685,378=>525,379=>685,380=>525,383=>352,
-384=>635,385=>735,386=>686,387=>635,388=>686,389=>635,390=>703,391=>698,392=>550,393=>775,
-394=>819,395=>686,396=>635,397=>612,398=>632,399=>787,400=>614,401=>575,403=>775,404=>687,
-405=>984,406=>354,407=>295,408=>746,409=>579,410=>278,411=>592,412=>974,413=>748,414=>634,
-415=>787,416=>913,417=>612,418=>938,419=>737,420=>652,421=>635,422=>695,423=>635,424=>521,
-425=>632,426=>336,427=>392,428=>611,429=>392,430=>611,431=>838,432=>634,433=>764,434=>721,
-435=>744,436=>730,437=>685,438=>525,439=>666,440=>666,441=>578,442=>525,443=>636,444=>666,
-445=>578,446=>510,447=>635,448=>295,449=>492,450=>459,451=>295,452=>1455,453=>1295,454=>1160,
-455=>852,456=>835,457=>556,458=>1043,459=>1026,460=>912,461=>684,462=>613,463=>295,464=>278,
-465=>787,466=>612,467=>732,468=>634,469=>732,470=>634,471=>732,472=>634,473=>732,474=>634,
-475=>732,476=>634,477=>615,478=>684,479=>613,480=>684,481=>613,482=>974,483=>995,484=>775,
-485=>635,486=>775,487=>635,488=>656,489=>579,490=>787,491=>612,492=>787,493=>612,494=>666,
-495=>525,496=>278,497=>1455,498=>1295,499=>1160,500=>775,501=>635,502=>1113,503=>682,504=>748,
-505=>634,506=>684,507=>613,508=>974,509=>995,510=>787,511=>612,512=>684,513=>613,514=>684,
-515=>613,516=>632,517=>615,518=>632,519=>615,520=>295,521=>278,522=>295,523=>278,524=>787,
-525=>612,526=>787,527=>612,528=>695,529=>411,530=>695,531=>411,532=>732,533=>634,534=>732,
-535=>634,536=>635,537=>521,538=>611,539=>392,540=>627,541=>521,542=>752,543=>634,544=>735,
-545=>838,546=>698,547=>610,548=>685,549=>525,550=>684,551=>613,552=>632,553=>615,554=>787,
-555=>612,556=>787,557=>612,558=>787,559=>612,560=>787,561=>612,562=>611,563=>592,564=>475,
-565=>843,566=>477,567=>278,568=>998,569=>998,570=>684,571=>698,572=>550,573=>557,574=>611,
-575=>521,576=>525,577=>603,578=>479,579=>686,580=>732,581=>684,582=>632,583=>615,584=>295,
-585=>278,586=>781,587=>635,588=>695,589=>411,590=>611,591=>592,592=>613,593=>635,594=>635,
-595=>635,596=>550,597=>550,598=>635,599=>727,600=>615,601=>615,602=>844,603=>545,604=>545,
-605=>775,606=>664,607=>326,608=>696,609=>635,610=>629,611=>596,612=>596,613=>634,614=>634,
-615=>634,616=>372,617=>387,618=>372,619=>396,620=>487,621=>278,622=>706,623=>974,624=>974,
-625=>974,626=>646,627=>642,628=>634,629=>612,630=>858,631=>728,632=>660,633=>469,634=>469,
-635=>469,636=>469,637=>469,638=>530,639=>530,640=>602,641=>602,642=>521,643=>336,644=>336,
-645=>461,646=>336,647=>392,648=>392,649=>634,650=>618,651=>598,652=>592,653=>818,654=>592,
-655=>611,656=>525,657=>525,658=>578,659=>578,660=>510,661=>510,662=>510,663=>510,664=>787,
-665=>580,666=>664,667=>708,668=>654,669=>292,670=>667,671=>507,672=>727,673=>510,674=>510,
-675=>1014,676=>1058,677=>1013,678=>824,679=>610,680=>778,681=>848,682=>641,683=>654,684=>515,
-685=>515,686=>570,687=>664,688=>399,689=>399,690=>175,691=>259,692=>295,693=>296,694=>379,
-695=>515,696=>373,697=>278,698=>460,699=>318,700=>318,701=>318,702=>307,703=>307,704=>370,
-705=>370,706=>500,707=>500,708=>500,709=>500,711=>500,712=>275,713=>500,714=>500,715=>500,
-716=>275,717=>500,718=>500,719=>500,720=>337,721=>337,722=>307,723=>307,724=>500,725=>500,
-726=>390,727=>317,728=>500,729=>500,730=>500,731=>500,733=>500,734=>315,735=>500,736=>426,
-737=>166,738=>373,739=>444,740=>370,741=>493,742=>493,743=>493,744=>493,745=>493,748=>500,
-749=>500,750=>518,755=>500,759=>500,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,832=>0,833=>0,
-834=>0,835=>0,836=>0,837=>0,838=>0,839=>0,840=>0,841=>0,842=>0,843=>0,
-844=>0,845=>0,846=>0,847=>0,849=>0,850=>0,851=>0,855=>0,856=>0,858=>0,
-860=>0,861=>0,862=>0,863=>0,864=>0,865=>0,866=>0,880=>654,881=>568,882=>862,
-883=>647,884=>278,885=>278,886=>748,887=>650,890=>500,891=>549,892=>550,893=>549,894=>337,
-900=>500,901=>500,902=>684,903=>318,904=>767,905=>903,906=>435,908=>839,910=>860,911=>905,
-912=>338,913=>684,914=>686,915=>557,916=>684,917=>632,918=>685,919=>752,920=>787,921=>295,
-922=>656,923=>684,924=>863,925=>748,926=>632,927=>787,928=>752,929=>603,931=>632,932=>611,
-933=>611,934=>787,935=>685,936=>787,937=>764,938=>295,939=>611,940=>659,941=>541,942=>634,
-943=>338,944=>579,945=>659,946=>638,947=>592,948=>612,949=>541,950=>544,951=>634,952=>612,
-953=>338,954=>589,955=>592,956=>636,957=>559,958=>558,959=>612,960=>602,961=>635,962=>587,
-963=>634,964=>602,965=>579,966=>660,967=>592,968=>660,969=>837,970=>338,971=>579,972=>612,
-973=>579,974=>837,975=>656,976=>614,977=>619,978=>699,979=>842,980=>699,981=>660,982=>837,
-983=>664,984=>787,985=>612,986=>648,987=>587,988=>575,989=>458,990=>660,991=>660,992=>865,
-993=>627,994=>934,995=>837,996=>758,997=>659,998=>792,999=>615,1000=>687,1001=>607,1002=>768,
-1003=>625,1004=>699,1005=>612,1006=>611,1007=>536,1008=>664,1009=>635,1010=>550,1011=>278,1012=>787,
-1013=>615,1014=>615,1015=>608,1016=>635,1017=>698,1018=>863,1019=>651,1020=>635,1021=>703,1022=>698,
-1023=>703,1024=>632,1025=>632,1026=>786,1027=>557,1028=>698,1029=>635,1030=>295,1031=>295,1032=>295,
-1033=>1094,1034=>1045,1035=>786,1036=>710,1037=>748,1038=>609,1039=>752,1040=>684,1041=>686,1042=>686,
-1043=>557,1044=>781,1045=>632,1046=>1077,1047=>641,1048=>748,1049=>748,1050=>710,1051=>752,1052=>863,
-1053=>752,1054=>787,1055=>752,1056=>603,1057=>698,1058=>611,1059=>609,1060=>861,1061=>685,1062=>776,
-1063=>686,1064=>1069,1065=>1094,1066=>833,1067=>818,1068=>686,1069=>698,1070=>1080,1071=>695,1072=>613,
-1073=>617,1074=>589,1075=>525,1076=>691,1077=>615,1078=>901,1079=>532,1080=>650,1081=>650,1082=>604,
-1083=>639,1084=>754,1085=>654,1086=>612,1087=>654,1088=>635,1089=>550,1090=>583,1091=>592,1092=>855,
-1093=>592,1094=>681,1095=>591,1096=>915,1097=>942,1098=>707,1099=>790,1100=>589,1101=>549,1102=>842,
-1103=>602,1104=>615,1105=>615,1106=>625,1107=>525,1108=>549,1109=>521,1110=>278,1111=>278,1112=>278,
-1113=>902,1114=>898,1115=>652,1116=>604,1117=>650,1118=>592,1119=>654,1120=>934,1121=>837,1122=>771,
-1123=>672,1124=>942,1125=>749,1126=>879,1127=>783,1128=>1160,1129=>1001,1130=>787,1131=>612,1132=>1027,
-1133=>824,1134=>636,1135=>541,1136=>856,1137=>876,1138=>787,1139=>612,1140=>781,1141=>665,1142=>781,
-1143=>665,1144=>992,1145=>904,1146=>953,1147=>758,1148=>1180,1149=>1028,1150=>934,1151=>837,1152=>698,
-1153=>550,1154=>502,1155=>0,1156=>0,1157=>0,1158=>0,1159=>0,1160=>418,1161=>418,1162=>748,
-1163=>657,1164=>686,1165=>589,1166=>603,1167=>635,1168=>610,1169=>525,1170=>675,1171=>556,1172=>557,
-1173=>491,1174=>1077,1175=>901,1176=>641,1177=>532,1178=>710,1179=>604,1180=>710,1181=>604,1182=>710,
-1183=>604,1184=>856,1185=>832,1186=>752,1187=>661,1188=>1014,1189=>877,1190=>1113,1191=>950,1192=>890,
-1193=>707,1194=>698,1195=>550,1196=>611,1197=>529,1198=>611,1199=>592,1200=>611,1201=>592,1202=>685,
-1203=>592,1204=>934,1205=>807,1206=>686,1207=>591,1208=>686,1209=>591,1210=>686,1211=>634,1212=>929,
-1213=>731,1214=>929,1215=>731,1216=>295,1217=>1077,1218=>901,1219=>655,1220=>604,1221=>752,1222=>639,
-1223=>752,1224=>661,1225=>752,1226=>661,1227=>686,1228=>591,1229=>863,1230=>754,1231=>278,1232=>684,
-1233=>613,1234=>684,1235=>613,1236=>974,1237=>995,1238=>632,1239=>615,1240=>787,1241=>615,1242=>787,
-1243=>615,1244=>1077,1245=>901,1246=>641,1247=>532,1248=>666,1249=>578,1250=>748,1251=>650,1252=>748,
-1253=>650,1254=>787,1255=>612,1256=>787,1257=>612,1258=>787,1259=>612,1260=>698,1261=>549,1262=>609,
-1263=>592,1264=>609,1265=>592,1266=>609,1267=>592,1268=>686,1269=>591,1270=>557,1271=>491,1272=>818,
-1273=>790,1274=>675,1275=>556,1276=>685,1277=>592,1278=>685,1279=>592,1280=>686,1281=>589,1282=>1006,
-1283=>897,1284=>975,1285=>869,1286=>679,1287=>588,1288=>1072,1289=>957,1290=>1113,1291=>967,1292=>775,
-1293=>660,1294=>773,1295=>711,1296=>614,1297=>541,1298=>752,1299=>639,1300=>1195,1301=>997,1302=>900,
-1303=>867,1304=>1031,1305=>989,1306=>787,1307=>635,1308=>989,1309=>818,1312=>1113,1313=>942,1314=>1113,
-1315=>949,1316=>793,1317=>683,1329=>867,1330=>732,1331=>882,1332=>882,1333=>732,1334=>644,1335=>682,
-1336=>732,1337=>851,1338=>882,1339=>732,1340=>557,1341=>824,1342=>986,1343=>732,1344=>707,1345=>644,
-1346=>882,1347=>777,1348=>882,1349=>732,1350=>840,1351=>732,1352=>732,1353=>732,1354=>791,1355=>644,
-1356=>882,1357=>732,1358=>882,1359=>635,1360=>732,1361=>732,1362=>799,1363=>861,1364=>790,1365=>787,
-1366=>635,1369=>307,1370=>318,1371=>500,1372=>500,1373=>392,1374=>526,1375=>500,1377=>974,1378=>634,
-1379=>762,1380=>767,1381=>634,1382=>697,1383=>533,1384=>634,1385=>700,1386=>697,1387=>634,1388=>404,
-1389=>894,1390=>641,1391=>634,1392=>634,1393=>635,1394=>702,1395=>634,1396=>659,1397=>278,1398=>760,
-1399=>516,1400=>634,1401=>453,1402=>974,1403=>516,1404=>769,1405=>634,1406=>696,1407=>974,1408=>634,
-1409=>635,1410=>501,1411=>974,1412=>648,1413=>612,1414=>629,1415=>763,1417=>337,1418=>433,1456=>0,
-1457=>0,1458=>0,1459=>0,1460=>0,1461=>0,1462=>0,1463=>0,1464=>0,1465=>0,1466=>0,
-1467=>0,1468=>0,1469=>0,1470=>361,1471=>0,1472=>295,1473=>0,1474=>0,1475=>295,1478=>456,
-1479=>0,1488=>629,1489=>608,1490=>448,1491=>594,1492=>640,1493=>272,1494=>374,1495=>640,1496=>648,
-1497=>272,1498=>592,1499=>556,1500=>599,1501=>640,1502=>659,1503=>272,1504=>441,1505=>700,1506=>563,
-1507=>640,1508=>604,1509=>521,1510=>581,1511=>663,1512=>592,1513=>808,1514=>657,1520=>471,1521=>454,
-1522=>471,1523=>416,1524=>645,3647=>652,3713=>670,3714=>684,3716=>688,3719=>482,3720=>628,3722=>684,
-3725=>688,3732=>642,3733=>642,3734=>672,3735=>655,3737=>641,3738=>592,3739=>592,3740=>745,3741=>767,
-3742=>687,3743=>687,3745=>702,3746=>688,3747=>684,3749=>649,3751=>632,3754=>703,3755=>819,3757=>633,
-3758=>684,3759=>788,3760=>632,3761=>0,3762=>539,3763=>539,3764=>0,3765=>0,3766=>0,3767=>0,
-3768=>0,3769=>0,3771=>0,3772=>0,3773=>663,3776=>360,3777=>679,3778=>460,3779=>547,3780=>491,
-3782=>674,3784=>0,3785=>0,3786=>0,3787=>0,3788=>0,3789=>0,3792=>636,3793=>641,3794=>641,
-3795=>670,3796=>625,3797=>625,3798=>703,3799=>670,3800=>674,3801=>677,3804=>1028,3805=>1028,4256=>840,
-4257=>690,4258=>642,4259=>759,4260=>591,4261=>686,4262=>789,4263=>811,4264=>467,4265=>565,4266=>789,
-4267=>793,4268=>584,4269=>837,4270=>750,4271=>688,4272=>811,4273=>584,4274=>584,4275=>837,4276=>837,
-4277=>646,4278=>604,4279=>584,4280=>596,4281=>584,4282=>721,4283=>795,4284=>584,4285=>566,4286=>584,
-4287=>669,4288=>799,4289=>542,4290=>664,4291=>542,4292=>565,4293=>674,4304=>508,4305=>508,4306=>533,
-4307=>785,4308=>522,4309=>517,4310=>508,4311=>797,4312=>507,4313=>518,4314=>1058,4315=>522,4316=>523,
-4317=>783,4318=>518,4319=>523,4320=>792,4321=>523,4322=>656,4323=>524,4324=>788,4325=>523,4326=>782,
-4327=>523,4328=>522,4329=>522,4330=>566,4331=>523,4332=>523,4333=>489,4334=>522,4335=>498,4336=>517,
-4337=>560,4338=>508,4339=>508,4340=>508,4341=>563,4342=>824,4343=>595,4344=>522,4345=>554,4346=>553,
-4347=>586,4348=>304,5121=>684,5122=>684,5123=>684,5124=>684,5125=>769,5126=>769,5127=>769,5129=>769,
-5130=>769,5131=>769,5132=>835,5133=>834,5134=>835,5135=>834,5136=>835,5137=>834,5138=>967,5139=>1007,
-5140=>967,5141=>1007,5142=>769,5143=>967,5144=>1007,5145=>967,5146=>1007,5147=>769,5149=>256,5150=>543,
-5151=>423,5152=>423,5153=>389,5154=>389,5155=>393,5156=>389,5157=>466,5158=>385,5159=>256,5160=>389,
-5161=>389,5162=>389,5163=>1090,5164=>909,5165=>953,5166=>1117,5167=>684,5168=>684,5169=>684,5170=>684,
-5171=>729,5172=>729,5173=>729,5175=>729,5176=>729,5177=>729,5178=>835,5179=>684,5180=>835,5181=>834,
-5182=>835,5183=>834,5184=>967,5185=>1007,5186=>967,5187=>1007,5188=>967,5189=>1007,5190=>967,5191=>1007,
-5192=>729,5193=>508,5194=>192,5196=>732,5197=>732,5198=>732,5199=>732,5200=>730,5201=>730,5202=>730,
-5204=>730,5205=>730,5206=>730,5207=>921,5208=>889,5209=>921,5210=>889,5211=>921,5212=>889,5213=>928,
-5214=>900,5215=>928,5216=>900,5217=>947,5218=>900,5219=>947,5220=>900,5221=>947,5222=>434,5223=>877,
-5224=>877,5225=>866,5226=>890,5227=>628,5228=>628,5229=>628,5230=>628,5231=>628,5232=>628,5233=>628,
-5234=>628,5235=>628,5236=>860,5237=>771,5238=>815,5239=>816,5240=>815,5241=>816,5242=>860,5243=>771,
-5244=>860,5245=>771,5246=>815,5247=>816,5248=>815,5249=>816,5250=>815,5251=>407,5252=>407,5253=>750,
-5254=>775,5255=>750,5256=>775,5257=>628,5258=>628,5259=>628,5260=>628,5261=>628,5262=>628,5263=>628,
-5264=>628,5265=>628,5266=>860,5267=>771,5268=>815,5269=>816,5270=>815,5271=>816,5272=>860,5273=>771,
-5274=>860,5275=>771,5276=>815,5277=>816,5278=>815,5279=>816,5280=>815,5281=>435,5282=>435,5283=>610,
-5284=>557,5285=>557,5286=>557,5287=>610,5288=>610,5289=>610,5290=>557,5291=>557,5292=>749,5293=>769,
-5294=>746,5295=>764,5296=>746,5297=>764,5298=>749,5299=>769,5300=>749,5301=>769,5302=>746,5303=>764,
-5304=>746,5305=>764,5306=>746,5307=>386,5308=>508,5309=>386,5312=>852,5313=>852,5314=>852,5315=>852,
-5316=>852,5317=>852,5318=>852,5319=>852,5320=>852,5321=>1069,5322=>1035,5323=>1059,5324=>852,5325=>1059,
-5326=>852,5327=>852,5328=>600,5329=>453,5330=>600,5331=>852,5332=>852,5333=>852,5334=>852,5335=>852,
-5336=>852,5337=>852,5338=>852,5339=>852,5340=>1069,5341=>1035,5342=>1059,5343=>1030,5344=>1059,5345=>1030,
-5346=>1069,5347=>1035,5348=>1069,5349=>1035,5350=>1083,5351=>1030,5352=>1083,5353=>1030,5354=>600,5356=>729,
-5357=>603,5358=>603,5359=>603,5360=>603,5361=>603,5362=>603,5363=>603,5364=>603,5365=>603,5366=>834,
-5367=>754,5368=>792,5369=>771,5370=>792,5371=>771,5372=>834,5373=>754,5374=>834,5375=>754,5376=>792,
-5377=>771,5378=>792,5379=>771,5380=>792,5381=>418,5382=>420,5383=>418,5392=>712,5393=>712,5394=>712,
-5395=>892,5396=>892,5397=>892,5398=>892,5399=>910,5400=>872,5401=>910,5402=>872,5403=>910,5404=>872,
-5405=>1140,5406=>1100,5407=>1140,5408=>1100,5409=>1140,5410=>1100,5411=>1140,5412=>1100,5413=>641,5414=>627,
-5415=>627,5416=>627,5417=>627,5418=>627,5419=>627,5420=>627,5421=>627,5422=>627,5423=>844,5424=>781,
-5425=>816,5426=>818,5427=>816,5428=>818,5429=>844,5430=>781,5431=>844,5432=>781,5433=>816,5434=>818,
-5435=>816,5436=>818,5437=>816,5438=>418,5440=>389,5441=>484,5442=>916,5443=>916,5444=>863,5445=>916,
-5446=>863,5447=>863,5448=>603,5449=>603,5450=>603,5451=>603,5452=>603,5453=>603,5454=>834,5455=>754,
-5456=>418,5458=>729,5459=>684,5460=>684,5461=>684,5462=>684,5463=>726,5464=>726,5465=>726,5466=>726,
-5467=>924,5468=>1007,5469=>508,5470=>732,5471=>732,5472=>732,5473=>732,5474=>732,5475=>732,5476=>730,
-5477=>730,5478=>730,5479=>730,5480=>947,5481=>900,5482=>508,5492=>831,5493=>831,5494=>831,5495=>831,
-5496=>831,5497=>831,5498=>831,5499=>563,5500=>752,5501=>484,5502=>1047,5503=>1047,5504=>1047,5505=>1047,
-5506=>1047,5507=>1047,5508=>1047,5509=>825,5514=>831,5515=>831,5516=>831,5517=>831,5518=>1259,5519=>1259,
-5520=>1259,5521=>1002,5522=>1002,5523=>1259,5524=>1259,5525=>700,5526=>1073,5536=>852,5537=>852,5538=>799,
-5539=>799,5540=>799,5541=>799,5542=>600,5543=>643,5544=>643,5545=>643,5546=>643,5547=>643,5548=>643,
-5549=>643,5550=>418,5551=>628,5598=>770,5601=>770,5702=>468,5703=>468,5742=>444,5743=>1047,5744=>1310,
-5745=>1632,5746=>1632,5747=>1375,5748=>1375,5749=>1632,5750=>1632,7424=>592,7425=>717,7426=>982,7427=>586,
-7428=>550,7429=>605,7430=>605,7431=>491,7432=>541,7433=>278,7434=>395,7435=>579,7436=>583,7437=>754,
-7438=>650,7439=>612,7440=>550,7441=>684,7442=>684,7443=>684,7444=>1023,7446=>612,7447=>612,7448=>524,
-7449=>602,7450=>602,7451=>583,7452=>574,7453=>737,7454=>948,7455=>638,7456=>592,7457=>818,7458=>525,
-7459=>526,7462=>583,7463=>592,7464=>564,7465=>524,7466=>590,7467=>639,7468=>431,7469=>613,7470=>432,
-7472=>485,7473=>398,7474=>398,7475=>488,7476=>474,7477=>186,7478=>186,7479=>413,7480=>351,7481=>543,
-7482=>471,7483=>471,7484=>496,7485=>439,7486=>380,7487=>438,7488=>385,7489=>461,7490=>623,7491=>392,
-7492=>392,7493=>405,7494=>648,7495=>428,7496=>405,7497=>417,7498=>417,7499=>360,7500=>359,7501=>405,
-7502=>179,7503=>426,7504=>623,7505=>409,7506=>414,7507=>370,7508=>414,7509=>414,7510=>428,7511=>295,
-7512=>405,7513=>470,7514=>623,7515=>417,7517=>402,7518=>373,7519=>385,7520=>416,7521=>364,7522=>179,
-7523=>259,7524=>405,7525=>417,7526=>402,7527=>373,7528=>412,7529=>416,7530=>364,7543=>635,7544=>474,
-7547=>372,7557=>278,7579=>405,7580=>370,7581=>370,7582=>414,7583=>360,7584=>296,7585=>233,7586=>405,
-7587=>405,7588=>261,7589=>250,7590=>261,7591=>261,7592=>234,7593=>250,7594=>235,7595=>376,7596=>623,
-7597=>623,7598=>411,7599=>479,7600=>409,7601=>414,7602=>414,7603=>360,7604=>287,7605=>295,7606=>508,
-7607=>418,7608=>361,7609=>406,7610=>417,7611=>366,7612=>437,7613=>366,7614=>392,7615=>414,7620=>0,
-7621=>0,7622=>0,7623=>0,7624=>0,7625=>0,7680=>684,7681=>613,7682=>686,7683=>635,7684=>686,
-7685=>635,7686=>686,7687=>635,7688=>698,7689=>550,7690=>770,7691=>635,7692=>770,7693=>635,7694=>770,
-7695=>635,7696=>770,7697=>635,7698=>770,7699=>635,7700=>632,7701=>615,7702=>632,7703=>615,7704=>632,
-7705=>615,7706=>632,7707=>615,7708=>632,7709=>615,7710=>575,7711=>352,7712=>775,7713=>635,7714=>752,
-7715=>634,7716=>752,7717=>634,7718=>752,7719=>634,7720=>752,7721=>634,7722=>752,7723=>634,7724=>295,
-7725=>278,7726=>295,7727=>278,7728=>656,7729=>579,7730=>656,7731=>579,7732=>656,7733=>579,7734=>557,
-7735=>278,7736=>557,7737=>278,7738=>557,7739=>278,7740=>557,7741=>278,7742=>863,7743=>974,7744=>863,
-7745=>974,7746=>863,7747=>974,7748=>748,7749=>634,7750=>748,7751=>634,7752=>748,7753=>634,7754=>748,
-7755=>634,7756=>787,7757=>612,7758=>787,7759=>612,7760=>787,7761=>612,7762=>787,7763=>612,7764=>603,
-7765=>635,7766=>603,7767=>635,7768=>695,7769=>411,7770=>695,7771=>411,7772=>695,7773=>411,7774=>695,
-7775=>411,7776=>635,7777=>521,7778=>635,7779=>521,7780=>635,7781=>521,7782=>635,7783=>521,7784=>635,
-7785=>521,7786=>611,7787=>392,7788=>611,7789=>392,7790=>611,7791=>392,7792=>611,7793=>392,7794=>732,
-7795=>634,7796=>732,7797=>634,7798=>732,7799=>634,7800=>732,7801=>634,7802=>732,7803=>634,7804=>684,
-7805=>592,7806=>684,7807=>592,7808=>989,7809=>818,7810=>989,7811=>818,7812=>989,7813=>818,7814=>989,
-7815=>818,7816=>989,7817=>818,7818=>685,7819=>592,7820=>685,7821=>592,7822=>611,7823=>592,7824=>685,
-7825=>525,7826=>685,7827=>525,7828=>685,7829=>525,7830=>634,7831=>392,7832=>818,7833=>592,7834=>613,
-7835=>352,7838=>769,7839=>612,7840=>684,7841=>613,7842=>684,7843=>613,7844=>684,7845=>613,7846=>684,
-7847=>613,7848=>684,7849=>613,7850=>684,7851=>613,7852=>684,7853=>613,7854=>684,7855=>613,7856=>684,
-7857=>613,7858=>684,7859=>613,7860=>684,7861=>613,7862=>684,7863=>613,7864=>632,7865=>615,7866=>632,
-7867=>615,7868=>632,7869=>615,7870=>632,7871=>615,7872=>632,7873=>615,7874=>632,7875=>615,7876=>632,
-7877=>615,7878=>632,7879=>615,7880=>295,7881=>278,7882=>295,7883=>278,7884=>787,7885=>612,7886=>787,
-7887=>612,7888=>787,7889=>612,7890=>787,7891=>612,7892=>787,7893=>612,7894=>787,7895=>612,7896=>787,
-7897=>612,7898=>913,7899=>612,7900=>913,7901=>612,7902=>913,7903=>612,7904=>913,7905=>612,7906=>913,
-7907=>612,7908=>732,7909=>634,7910=>732,7911=>634,7912=>838,7913=>634,7914=>838,7915=>634,7916=>838,
-7917=>634,7918=>838,7919=>634,7920=>838,7921=>634,7922=>611,7923=>592,7924=>611,7925=>592,7926=>611,
-7927=>592,7928=>611,7929=>592,7936=>659,7937=>659,7938=>659,7939=>659,7940=>659,7941=>659,7942=>659,
-7943=>659,7944=>684,7945=>684,7946=>877,7947=>877,7948=>769,7949=>801,7950=>708,7951=>743,7952=>541,
-7953=>541,7954=>541,7955=>541,7956=>541,7957=>541,7960=>711,7961=>711,7962=>966,7963=>975,7964=>898,
-7965=>928,7968=>634,7969=>634,7970=>634,7971=>634,7972=>634,7973=>634,7974=>634,7975=>634,7976=>837,
-7977=>835,7978=>1086,7979=>1089,7980=>1027,7981=>1051,7982=>934,7983=>947,7984=>338,7985=>338,7986=>338,
-7987=>338,7988=>338,7989=>338,7990=>338,7991=>338,7992=>380,7993=>374,7994=>635,7995=>635,7996=>570,
-7997=>600,7998=>489,7999=>493,8000=>612,8001=>612,8002=>612,8003=>612,8004=>612,8005=>612,8008=>804,
-8009=>848,8010=>1095,8011=>1100,8012=>938,8013=>970,8016=>579,8017=>579,8018=>579,8019=>579,8020=>579,
-8021=>579,8022=>579,8023=>579,8025=>784,8027=>998,8029=>1012,8031=>897,8032=>837,8033=>837,8034=>837,
-8035=>837,8036=>837,8037=>837,8038=>837,8039=>837,8040=>802,8041=>843,8042=>1089,8043=>1095,8044=>946,
-8045=>972,8046=>921,8047=>952,8048=>659,8049=>659,8050=>541,8051=>548,8052=>634,8053=>654,8054=>338,
-8055=>338,8056=>612,8057=>612,8058=>579,8059=>579,8060=>837,8061=>837,8064=>659,8065=>659,8066=>659,
-8067=>659,8068=>659,8069=>659,8070=>659,8071=>659,8072=>684,8073=>684,8074=>877,8075=>877,8076=>769,
-8077=>801,8078=>708,8079=>743,8080=>634,8081=>634,8082=>634,8083=>634,8084=>634,8085=>634,8086=>634,
-8087=>634,8088=>837,8089=>835,8090=>1086,8091=>1089,8092=>1027,8093=>1051,8094=>934,8095=>947,8096=>837,
-8097=>837,8098=>837,8099=>837,8100=>837,8101=>837,8102=>837,8103=>837,8104=>802,8105=>843,8106=>1089,
-8107=>1095,8108=>946,8109=>972,8110=>921,8111=>952,8112=>659,8113=>659,8114=>659,8115=>659,8116=>659,
-8118=>659,8119=>659,8120=>684,8121=>684,8122=>716,8123=>692,8124=>684,8125=>500,8126=>500,8127=>500,
-8128=>500,8129=>500,8130=>634,8131=>634,8132=>654,8134=>634,8135=>634,8136=>805,8137=>746,8138=>931,
-8139=>871,8140=>752,8141=>500,8142=>500,8143=>500,8144=>338,8145=>338,8146=>338,8147=>338,8150=>338,
-8151=>338,8152=>295,8153=>295,8154=>475,8155=>408,8157=>500,8158=>500,8159=>500,8160=>579,8161=>579,
-8162=>579,8163=>579,8164=>635,8165=>635,8166=>579,8167=>579,8168=>611,8169=>611,8170=>845,8171=>825,
-8172=>685,8173=>500,8174=>500,8175=>500,8178=>837,8179=>837,8180=>837,8182=>837,8183=>837,8184=>941,
-8185=>813,8186=>922,8187=>826,8188=>764,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=>361,8209=>361,8210=>636,8213=>1000,8214=>500,8215=>500,8219=>318,8223=>518,
-8227=>590,8228=>333,8229=>667,8231=>318,8234=>0,8235=>0,8236=>0,8237=>0,8238=>0,8239=>200,
-8241=>1690,8242=>227,8243=>374,8244=>520,8245=>227,8246=>374,8247=>520,8248=>339,8251=>838,8252=>485,
-8253=>531,8254=>500,8255=>804,8256=>804,8257=>250,8258=>1000,8259=>500,8260=>167,8261=>390,8262=>390,
-8263=>922,8264=>733,8265=>733,8266=>497,8267=>636,8268=>500,8269=>500,8270=>500,8271=>337,8272=>804,
-8273=>500,8274=>450,8275=>1000,8276=>804,8277=>838,8278=>586,8279=>663,8280=>838,8281=>838,8282=>318,
-8283=>797,8284=>838,8285=>318,8286=>318,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=>179,8308=>401,8309=>401,
-8310=>401,8311=>401,8312=>401,8313=>401,8314=>528,8315=>528,8316=>528,8317=>246,8318=>246,8319=>399,
-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=>392,8337=>417,8338=>414,8339=>444,8340=>417,
-8352=>877,8353=>636,8354=>636,8355=>636,8356=>636,8357=>974,8358=>748,8359=>1271,8360=>1074,8361=>989,
-8362=>838,8363=>636,8365=>656,8366=>611,8367=>1272,8368=>636,8369=>636,8370=>636,8371=>636,8372=>774,
-8373=>641,8400=>0,8401=>0,8406=>0,8407=>0,8411=>0,8412=>0,8417=>0,8448=>970,8449=>970,
-8450=>698,8451=>1123,8452=>896,8453=>969,8454=>1032,8455=>614,8456=>698,8457=>952,8459=>988,8460=>754,
-8461=>850,8462=>634,8463=>634,8464=>470,8465=>697,8466=>720,8467=>413,8468=>818,8469=>801,8470=>1040,
-8471=>1000,8472=>697,8473=>701,8474=>787,8475=>798,8476=>814,8477=>792,8478=>896,8479=>684,8480=>1020,
-8481=>1014,8483=>684,8484=>745,8485=>578,8486=>764,8487=>764,8488=>616,8489=>338,8490=>656,8491=>684,
-8492=>786,8493=>703,8494=>854,8495=>592,8496=>605,8497=>786,8498=>575,8499=>1069,8500=>462,8501=>745,
-8502=>674,8503=>466,8504=>645,8505=>380,8506=>926,8507=>1157,8508=>702,8509=>728,8510=>654,8511=>849,
-8512=>811,8513=>775,8514=>557,8515=>557,8516=>611,8517=>819,8518=>708,8519=>615,8520=>351,8521=>351,
-8523=>780,8526=>526,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=>295,8545=>492,8546=>689,8547=>923,8548=>684,
-8549=>922,8550=>1120,8551=>1317,8552=>917,8553=>685,8554=>933,8555=>1131,8556=>557,8557=>698,8558=>770,
-8559=>863,8560=>278,8561=>458,8562=>637,8563=>812,8564=>592,8565=>811,8566=>991,8567=>1170,8568=>819,
-8569=>592,8570=>822,8571=>1002,8572=>278,8573=>550,8574=>635,8575=>974,8576=>1245,8577=>770,8578=>1245,
-8579=>703,8580=>549,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=>684,8705=>636,8706=>517,8707=>632,8708=>632,8709=>871,
-8710=>669,8711=>669,8712=>871,8713=>871,8714=>718,8715=>871,8716=>871,8717=>718,8718=>636,8719=>757,
-8720=>757,8721=>674,8722=>838,8723=>838,8724=>838,8725=>337,8726=>637,8727=>838,8728=>626,8729=>626,
-8730=>637,8731=>637,8732=>637,8733=>714,8734=>833,8735=>838,8736=>896,8737=>896,8738=>838,8739=>500,
-8740=>500,8741=>500,8742=>500,8743=>732,8744=>732,8745=>732,8746=>732,8747=>521,8748=>789,8749=>1057,
-8750=>521,8751=>789,8752=>1057,8753=>521,8754=>521,8755=>521,8756=>636,8757=>636,8758=>260,8759=>636,
-8760=>838,8761=>838,8762=>838,8763=>838,8764=>838,8765=>838,8766=>838,8767=>838,8768=>375,8769=>838,
-8770=>838,8771=>838,8772=>838,8773=>838,8774=>838,8775=>838,8776=>838,8777=>838,8778=>838,8779=>838,
-8780=>838,8781=>838,8782=>838,8783=>838,8784=>838,8785=>838,8786=>838,8787=>838,8788=>1000,8789=>1000,
-8790=>838,8791=>838,8792=>838,8793=>838,8794=>838,8795=>838,8796=>838,8797=>838,8798=>838,8799=>838,
-8800=>838,8801=>838,8802=>838,8803=>838,8804=>838,8805=>838,8806=>838,8807=>838,8808=>838,8809=>838,
-8810=>1047,8811=>1047,8812=>464,8813=>838,8814=>838,8815=>838,8816=>838,8817=>838,8818=>838,8819=>838,
-8820=>838,8821=>838,8822=>838,8823=>838,8824=>838,8825=>838,8826=>838,8827=>838,8828=>838,8829=>838,
-8830=>838,8831=>838,8832=>838,8833=>838,8834=>838,8835=>838,8836=>838,8837=>838,8838=>838,8839=>838,
-8840=>838,8841=>838,8842=>838,8843=>838,8844=>732,8845=>732,8846=>732,8847=>838,8848=>838,8849=>838,
-8850=>838,8851=>780,8852=>780,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=>871,8867=>871,8868=>871,8869=>871,
-8870=>521,8871=>521,8872=>871,8873=>871,8874=>871,8875=>871,8876=>871,8877=>871,8878=>871,8879=>871,
-8880=>838,8881=>838,8882=>838,8883=>838,8884=>838,8885=>838,8886=>1000,8887=>1000,8888=>838,8889=>838,
-8890=>521,8891=>732,8892=>732,8893=>732,8894=>838,8895=>838,8896=>820,8897=>820,8898=>820,8899=>820,
-8900=>494,8901=>318,8902=>626,8903=>838,8904=>1000,8905=>1000,8906=>1000,8907=>1000,8908=>1000,8909=>838,
-8910=>732,8911=>732,8912=>838,8913=>838,8914=>838,8915=>838,8916=>838,8917=>838,8918=>838,8919=>838,
-8920=>1422,8921=>1422,8922=>838,8923=>838,8924=>838,8925=>838,8926=>838,8927=>838,8928=>838,8929=>838,
-8930=>838,8931=>838,8932=>838,8933=>838,8934=>838,8935=>838,8936=>838,8937=>838,8938=>838,8939=>838,
-8940=>838,8941=>838,8942=>1000,8943=>1000,8944=>1000,8945=>1000,8946=>1000,8947=>871,8948=>718,8949=>871,
-8950=>871,8951=>718,8952=>871,8953=>871,8954=>1000,8955=>871,8956=>718,8957=>871,8958=>718,8959=>871,
-8960=>602,8961=>602,8962=>635,8963=>838,8964=>838,8965=>838,8966=>838,8967=>488,8968=>390,8969=>390,
-8970=>390,8971=>390,8972=>809,8973=>809,8974=>809,8975=>809,8976=>838,8977=>513,8984=>1000,8985=>838,
-8988=>469,8989=>469,8990=>469,8991=>469,8992=>521,8993=>521,8996=>1152,8997=>1152,8998=>1414,8999=>1152,
-9000=>1443,9003=>1414,9004=>873,9075=>338,9076=>635,9077=>837,9082=>659,9085=>757,9095=>1152,9108=>873,
-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,
-9166=>838,9167=>945,9187=>873,9189=>769,9250=>635,9251=>635,9312=>896,9313=>896,9314=>896,9315=>896,
-9316=>896,9317=>896,9318=>896,9319=>896,9320=>896,9321=>896,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=>769,9697=>769,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,9729=>1000,9730=>896,9731=>896,9732=>896,9733=>896,9734=>896,9735=>573,
-9736=>896,9737=>896,9738=>888,9739=>888,9740=>671,9741=>1013,9742=>1246,9743=>1250,9744=>896,9745=>896,
-9746=>896,9747=>532,9748=>896,9749=>896,9750=>896,9751=>896,9752=>896,9753=>896,9754=>896,9755=>896,
-9756=>896,9757=>609,9758=>896,9759=>609,9760=>896,9761=>896,9762=>896,9763=>896,9764=>669,9765=>746,
-9766=>649,9767=>784,9768=>545,9769=>896,9770=>896,9771=>896,9772=>710,9773=>896,9774=>896,9775=>896,
-9776=>890,9777=>890,9778=>890,9779=>890,9780=>890,9781=>890,9782=>890,9783=>890,9784=>896,9785=>896,
-9786=>896,9787=>896,9788=>896,9789=>896,9790=>896,9791=>614,9792=>731,9793=>731,9794=>896,9795=>896,
-9796=>896,9797=>896,9798=>896,9799=>896,9800=>896,9801=>896,9802=>896,9803=>896,9804=>896,9805=>896,
-9806=>896,9807=>896,9808=>896,9809=>896,9810=>896,9811=>896,9812=>896,9813=>896,9814=>896,9815=>896,
-9816=>896,9817=>896,9818=>896,9819=>896,9820=>896,9821=>896,9822=>896,9823=>896,9824=>896,9825=>896,
-9826=>896,9827=>896,9828=>896,9829=>896,9830=>896,9831=>896,9832=>896,9833=>472,9834=>638,9835=>896,
-9836=>896,9837=>472,9838=>357,9839=>484,9840=>748,9841=>766,9842=>896,9843=>896,9844=>896,9845=>896,
-9846=>896,9847=>896,9848=>896,9849=>896,9850=>896,9851=>896,9852=>896,9853=>896,9854=>896,9855=>896,
-9856=>869,9857=>869,9858=>869,9859=>869,9860=>869,9861=>869,9862=>890,9863=>890,9864=>890,9865=>890,
-9866=>890,9867=>890,9868=>890,9869=>890,9870=>890,9871=>890,9872=>750,9873=>750,9874=>890,9875=>816,
-9876=>716,9877=>537,9878=>852,9879=>890,9880=>684,9881=>890,9882=>708,9883=>890,9884=>890,9888=>890,
-9889=>702,9890=>1003,9891=>1085,9892=>1143,9893=>901,9894=>838,9895=>838,9896=>838,9897=>838,9898=>838,
-9899=>838,9900=>838,9901=>838,9902=>838,9903=>838,9904=>844,9905=>838,9906=>731,9907=>732,9908=>732,
-9909=>732,9910=>850,9911=>732,9912=>732,9985=>838,9986=>838,9987=>838,9988=>838,9990=>838,9991=>838,
-9992=>838,9993=>838,9996=>838,9997=>838,9998=>838,9999=>838,10000=>838,10001=>838,10002=>838,10003=>838,
-10004=>838,10005=>838,10006=>838,10007=>838,10008=>838,10009=>838,10010=>838,10011=>838,10012=>838,10013=>838,
-10014=>838,10015=>838,10016=>838,10017=>838,10018=>838,10019=>838,10020=>838,10021=>838,10022=>838,10023=>838,
-10025=>838,10026=>838,10027=>838,10028=>838,10029=>838,10030=>838,10031=>838,10032=>838,10033=>838,10034=>838,
-10035=>838,10036=>838,10037=>838,10038=>838,10039=>838,10040=>838,10041=>838,10042=>838,10043=>838,10044=>838,
-10045=>838,10046=>838,10047=>838,10048=>838,10049=>838,10050=>838,10051=>838,10052=>838,10053=>838,10054=>838,
-10055=>838,10056=>838,10057=>838,10058=>838,10059=>838,10061=>896,10063=>896,10064=>896,10065=>896,10066=>896,
-10070=>896,10072=>838,10073=>838,10074=>838,10075=>322,10076=>322,10077=>538,10078=>538,10081=>838,10082=>838,
-10083=>838,10084=>838,10085=>838,10086=>838,10087=>838,10088=>838,10089=>838,10090=>838,10091=>838,10092=>838,
-10093=>838,10094=>838,10095=>838,10096=>838,10097=>838,10098=>838,10099=>838,10100=>838,10101=>838,10102=>896,
-10103=>896,10104=>896,10105=>896,10106=>896,10107=>896,10108=>896,10109=>896,10110=>896,10111=>896,10112=>838,
-10113=>838,10114=>838,10115=>838,10116=>838,10117=>838,10118=>838,10119=>838,10120=>838,10121=>838,10122=>838,
-10123=>838,10124=>838,10125=>838,10126=>838,10127=>838,10128=>838,10129=>838,10130=>838,10131=>838,10132=>838,
-10136=>838,10137=>838,10138=>838,10139=>838,10140=>838,10141=>838,10142=>838,10143=>838,10144=>838,10145=>838,
-10146=>838,10147=>838,10148=>838,10149=>838,10150=>838,10151=>838,10152=>838,10153=>838,10154=>838,10155=>838,
-10156=>838,10157=>838,10158=>838,10159=>838,10161=>838,10162=>838,10163=>838,10164=>838,10165=>838,10166=>838,
-10167=>838,10168=>838,10169=>838,10170=>838,10171=>838,10172=>838,10173=>838,10174=>838,10181=>390,10182=>390,
-10208=>494,10214=>495,10215=>495,10216=>390,10217=>390,10218=>556,10219=>556,10224=>838,10225=>838,10226=>838,
-10227=>838,10228=>1157,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,10502=>838,
-10503=>838,10506=>838,10507=>838,10560=>683,10561=>683,10627=>734,10628=>734,10702=>838,10703=>1000,10704=>1000,
-10705=>1000,10706=>1000,10707=>1000,10708=>1000,10709=>1000,10731=>494,10746=>838,10747=>838,10752=>1000,10753=>1000,
-10754=>1000,10764=>1325,10765=>521,10766=>521,10767=>521,10768=>521,10769=>521,10770=>521,10771=>521,10772=>521,
-10773=>521,10774=>521,10775=>521,10776=>521,10777=>521,10778=>521,10779=>521,10780=>521,10799=>838,10877=>838,
-10878=>838,10879=>838,10880=>838,10881=>838,10882=>838,10883=>838,10884=>838,10885=>838,10886=>838,10887=>838,
-10888=>838,10889=>838,10890=>838,10891=>838,10892=>838,10893=>838,10894=>838,10895=>838,10896=>838,10897=>838,
-10898=>838,10899=>838,10900=>838,10901=>838,10902=>838,10903=>838,10904=>838,10905=>838,10906=>838,10907=>838,
-10908=>838,10909=>838,10910=>838,10911=>838,10912=>838,10926=>838,10927=>838,10928=>838,10929=>838,10930=>838,
-10931=>838,10932=>838,10933=>838,10934=>838,10935=>838,10936=>838,10937=>838,10938=>838,11001=>838,11002=>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=>836,11023=>836,11024=>836,11025=>836,11026=>945,11027=>945,
-11028=>945,11029=>945,11030=>769,11031=>769,11032=>769,11033=>769,11034=>945,11039=>869,11040=>869,11041=>873,
-11042=>873,11043=>873,11044=>1119,11091=>869,11092=>869,11360=>557,11361=>278,11362=>557,11363=>603,11364=>695,
-11365=>613,11366=>392,11367=>752,11368=>634,11369=>656,11370=>579,11371=>685,11372=>525,11373=>781,11374=>863,
-11375=>684,11377=>734,11378=>1128,11379=>961,11380=>592,11381=>654,11382=>568,11383=>660,11385=>414,11386=>612,
-11387=>491,11388=>175,11389=>431,11800=>531,11810=>390,11811=>390,11812=>390,11813=>390,11822=>531,19904=>896,
-19905=>896,19906=>896,19907=>896,19908=>896,19909=>896,19910=>896,19911=>896,19912=>896,19913=>896,19914=>896,
-19915=>896,19916=>896,19917=>896,19918=>896,19919=>896,19920=>896,19921=>896,19922=>896,19923=>896,19924=>896,
-19925=>896,19926=>896,19927=>896,19928=>896,19929=>896,19930=>896,19931=>896,19932=>896,19933=>896,19934=>896,
-19935=>896,19936=>896,19937=>896,19938=>896,19939=>896,19940=>896,19941=>896,19942=>896,19943=>896,19944=>896,
-19945=>896,19946=>896,19947=>896,19948=>896,19949=>896,19950=>896,19951=>896,19952=>896,19953=>896,19954=>896,
-19955=>896,19956=>896,19957=>896,19958=>896,19959=>896,19960=>896,19961=>896,19962=>896,19963=>896,19964=>896,
-19965=>896,19966=>896,19967=>896,42564=>635,42565=>521,42566=>354,42567=>338,42572=>1180,42573=>1028,42576=>1029,
-42577=>906,42580=>1080,42581=>842,42582=>985,42583=>847,42594=>1024,42595=>925,42596=>1014,42597=>900,42598=>863,
-42599=>1008,42600=>787,42601=>612,42602=>855,42603=>712,42604=>1358,42605=>1019,42606=>879,42634=>805,42635=>722,
-42636=>611,42637=>583,42644=>686,42645=>634,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=>252,42782=>252,42783=>252,42790=>752,42791=>634,42792=>878,42793=>709,42794=>614,42795=>541,
-42800=>491,42801=>521,42802=>1250,42803=>985,42804=>1219,42805=>1000,42806=>1155,42807=>996,42808=>971,42809=>818,
-42810=>971,42811=>818,42812=>959,42813=>818,42814=>698,42815=>549,42822=>680,42823=>392,42824=>582,42825=>427,
-42826=>807,42827=>704,42830=>1358,42831=>1019,42880=>557,42881=>278,42882=>735,42883=>634,42889=>337,42890=>376,
-42891=>401,42892=>275,43003=>575,43004=>603,43005=>863,43006=>295,43007=>1199,63173=>612,64256=>722,64257=>646,
-64258=>646,64259=>1000,64260=>1000,64261=>686,64262=>861,64275=>1202,64276=>1202,64277=>1196,64278=>1186,64279=>1529,
-64285=>272,64286=>0,64287=>471,64288=>636,64289=>856,64290=>774,64291=>906,64292=>771,64293=>843,64294=>855,
-64295=>807,64296=>875,64297=>838,64298=>808,64299=>808,64300=>808,64301=>808,64302=>629,64303=>629,64304=>629,
-64305=>608,64306=>448,64307=>594,64308=>640,64309=>272,64310=>374,64311=>1000,64312=>648,64313=>336,64314=>592,
-64315=>556,64316=>599,64318=>659,64320=>441,64321=>700,64323=>640,64324=>604,64326=>581,64327=>663,64328=>592,
-64329=>808,64330=>657,64331=>272,64332=>608,64333=>556,64334=>604,64335=>629,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,65056=>0,65057=>0,65058=>0,65059=>0,65529=>0,65530=>0,65531=>0,
-65532=>0,65533=>1025);
-$enc='';
-$diff='';
-$file='dejavusansi.z';
-$ctg='dejavusansi.ctg.z';
-$originalsize=523804;
-?>
\ No newline at end of file
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusansi.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusansi.z
deleted file mode 100644
index bb3d034b..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusansi.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusansmono.ctg.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusansmono.ctg.z
deleted file mode 100644
index bc940329..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusansmono.ctg.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusansmono.php b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusansmono.php
deleted file mode 100644
index bc59f60f..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusansmono.php
+++ /dev/null
@@ -1,320 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='DejaVuSansMono';
-$desc=array('Ascent'=>928,'Descent'=>-236,'CapHeight'=>9,'Flags'=>33,'FontBBox'=>'[-558 -375 718 1042]','ItalicAngle'=>0,'StemV'=>70,'MissingWidth'=>602);
-$up=-63;
-$ut=44;
-$dw=602;
-$cw=array(
-0=>602,32=>602,33=>602,34=>602,35=>602,36=>602,37=>602,38=>602,39=>602,40=>602,
-41=>602,42=>602,43=>602,44=>602,45=>602,46=>602,47=>602,48=>602,49=>602,50=>602,
-51=>602,52=>602,53=>602,54=>602,55=>602,56=>602,57=>602,58=>602,59=>602,60=>602,
-61=>602,62=>602,63=>602,64=>602,65=>602,66=>602,67=>602,68=>602,69=>602,70=>602,
-71=>602,72=>602,73=>602,74=>602,75=>602,76=>602,77=>602,78=>602,79=>602,80=>602,
-81=>602,82=>602,83=>602,84=>602,85=>602,86=>602,87=>602,88=>602,89=>602,90=>602,
-91=>602,92=>602,93=>602,94=>602,95=>602,96=>602,97=>602,98=>602,99=>602,100=>602,
-101=>602,102=>602,103=>602,104=>602,105=>602,106=>602,107=>602,108=>602,109=>602,110=>602,
-111=>602,112=>602,113=>602,114=>602,115=>602,116=>602,117=>602,118=>602,119=>602,120=>602,
-121=>602,122=>602,123=>602,124=>602,125=>602,126=>602,8364=>602,8218=>602,402=>602,8222=>602,
-8230=>602,8224=>602,8225=>602,710=>602,8240=>602,352=>602,8249=>602,338=>602,381=>602,8216=>602,
-8217=>602,8220=>602,8221=>602,8226=>602,8211=>602,8212=>602,732=>602,8482=>602,353=>602,8250=>602,
-339=>602,382=>602,376=>602,160=>602,161=>602,162=>602,163=>602,164=>602,165=>602,166=>602,
-167=>602,168=>602,169=>602,170=>602,171=>602,172=>602,173=>602,174=>602,175=>602,176=>602,
-177=>602,178=>602,179=>602,180=>602,181=>602,182=>602,183=>602,184=>602,185=>602,186=>602,
-187=>602,188=>602,189=>602,190=>602,191=>602,192=>602,193=>602,194=>602,195=>602,196=>602,
-197=>602,198=>602,199=>602,200=>602,201=>602,202=>602,203=>602,204=>602,205=>602,206=>602,
-207=>602,208=>602,209=>602,210=>602,211=>602,212=>602,213=>602,214=>602,215=>602,216=>602,
-217=>602,218=>602,219=>602,220=>602,221=>602,222=>602,223=>602,224=>602,225=>602,226=>602,
-227=>602,228=>602,229=>602,230=>602,231=>602,232=>602,233=>602,234=>602,235=>602,236=>602,
-237=>602,238=>602,239=>602,240=>602,241=>602,242=>602,243=>602,244=>602,245=>602,246=>602,
-247=>602,248=>602,249=>602,250=>602,251=>602,252=>602,253=>602,254=>602,255=>602,256=>602,
-257=>602,258=>602,259=>602,260=>602,261=>602,262=>602,263=>602,264=>602,265=>602,266=>602,
-267=>602,268=>602,269=>602,270=>602,271=>602,272=>602,273=>602,274=>602,275=>602,276=>602,
-277=>602,278=>602,279=>602,280=>602,281=>602,282=>602,283=>602,284=>602,285=>602,286=>602,
-287=>602,288=>602,289=>602,290=>602,291=>602,292=>602,293=>602,294=>602,295=>602,296=>602,
-297=>602,298=>602,299=>602,300=>602,301=>602,302=>602,303=>602,304=>602,305=>602,306=>602,
-307=>602,308=>602,309=>602,310=>602,311=>602,312=>602,313=>602,314=>602,315=>602,316=>602,
-317=>602,318=>602,319=>602,320=>602,321=>602,322=>602,323=>602,324=>602,325=>602,326=>602,
-327=>602,328=>602,329=>602,330=>602,331=>602,332=>602,333=>602,334=>602,335=>602,336=>602,
-337=>602,340=>602,341=>602,342=>602,343=>602,344=>602,345=>602,346=>602,347=>602,348=>602,
-349=>602,350=>602,351=>602,354=>602,355=>602,356=>602,357=>602,358=>602,359=>602,360=>602,
-361=>602,362=>602,363=>602,364=>602,365=>602,366=>602,367=>602,368=>602,369=>602,370=>602,
-371=>602,372=>602,373=>602,374=>602,375=>602,377=>602,378=>602,379=>602,380=>602,383=>602,
-384=>602,385=>602,386=>602,387=>602,388=>602,389=>602,390=>602,391=>602,392=>602,393=>602,
-394=>602,395=>602,396=>602,397=>602,398=>602,399=>602,400=>602,401=>602,403=>602,404=>602,
-405=>602,406=>602,407=>602,408=>602,409=>602,410=>602,411=>602,412=>602,413=>602,414=>602,
-415=>602,416=>602,417=>602,418=>602,419=>602,420=>602,421=>602,422=>602,423=>602,424=>602,
-425=>602,426=>602,427=>602,428=>602,429=>602,430=>602,431=>602,432=>602,433=>602,434=>602,
-435=>602,436=>602,437=>602,438=>602,439=>602,440=>602,441=>602,442=>602,443=>602,444=>602,
-445=>602,446=>602,447=>602,448=>602,449=>602,450=>602,451=>602,461=>602,462=>602,463=>602,
-464=>602,465=>602,466=>602,467=>602,468=>602,469=>602,470=>602,471=>602,472=>602,473=>602,
-474=>602,475=>602,476=>602,477=>602,478=>602,479=>602,480=>602,481=>602,482=>602,483=>602,
-486=>602,487=>602,488=>602,489=>602,490=>602,491=>602,492=>602,493=>602,494=>602,495=>602,
-496=>602,500=>602,501=>602,502=>602,504=>602,505=>602,508=>602,509=>602,510=>602,511=>602,
-512=>602,513=>602,514=>602,515=>602,516=>602,517=>602,518=>602,519=>602,520=>602,521=>602,
-522=>602,523=>602,524=>602,525=>602,526=>602,527=>602,528=>602,529=>602,530=>602,531=>602,
-532=>602,533=>602,534=>602,535=>602,536=>602,537=>602,538=>602,539=>602,540=>602,541=>602,
-542=>602,543=>602,544=>602,545=>602,548=>602,549=>602,550=>602,551=>602,552=>602,553=>602,
-554=>602,555=>602,556=>602,557=>602,558=>602,559=>602,560=>602,561=>602,562=>602,563=>602,
-564=>602,565=>602,566=>602,567=>602,568=>602,569=>602,570=>602,571=>602,572=>602,573=>602,
-574=>602,575=>602,576=>602,577=>602,580=>602,581=>602,588=>602,589=>602,592=>602,593=>602,
-594=>602,595=>602,596=>602,597=>602,598=>602,599=>602,600=>602,601=>602,602=>602,603=>602,
-604=>602,605=>602,606=>602,607=>602,608=>602,609=>602,610=>602,611=>602,612=>602,613=>602,
-614=>602,615=>602,616=>602,617=>602,618=>602,619=>602,620=>602,621=>602,622=>602,623=>602,
-624=>602,625=>602,626=>602,627=>602,628=>602,629=>602,630=>602,631=>602,632=>602,633=>602,
-634=>602,635=>602,636=>602,637=>602,638=>602,639=>602,640=>602,641=>602,642=>602,643=>602,
-644=>602,645=>602,646=>602,647=>602,648=>602,649=>602,650=>602,651=>602,652=>602,653=>602,
-654=>602,655=>602,656=>602,657=>602,658=>602,659=>602,660=>602,661=>602,662=>602,663=>602,
-664=>602,665=>602,666=>602,667=>602,668=>602,669=>602,670=>602,671=>602,672=>602,673=>602,
-674=>602,675=>602,676=>602,677=>602,678=>602,679=>602,680=>602,681=>602,682=>602,683=>602,
-684=>602,685=>602,686=>602,687=>602,688=>602,689=>602,690=>602,691=>602,692=>602,693=>602,
-694=>602,695=>602,696=>602,697=>602,699=>602,700=>602,701=>602,702=>602,703=>602,704=>602,
-705=>602,711=>602,712=>602,713=>602,716=>602,717=>602,720=>602,721=>602,722=>602,723=>602,
-726=>602,727=>602,728=>602,729=>602,730=>602,731=>602,733=>602,734=>602,736=>602,737=>602,
-738=>602,739=>602,740=>602,741=>602,742=>602,743=>602,744=>602,745=>602,750=>602,755=>602,
-768=>602,769=>602,770=>602,771=>602,772=>602,773=>602,774=>602,775=>602,776=>602,777=>602,
-778=>602,779=>602,780=>602,781=>602,782=>602,783=>602,784=>602,785=>602,786=>602,787=>602,
-788=>602,789=>602,790=>602,791=>602,792=>602,793=>602,794=>602,795=>602,796=>602,797=>602,
-798=>602,799=>602,800=>602,801=>602,802=>602,803=>602,804=>602,805=>602,806=>602,807=>602,
-808=>602,809=>602,810=>602,811=>602,812=>602,813=>602,814=>602,815=>602,816=>602,817=>602,
-818=>602,819=>602,820=>602,821=>602,822=>602,823=>602,824=>602,825=>602,826=>602,827=>602,
-828=>602,829=>602,830=>602,831=>602,835=>602,856=>602,865=>602,884=>602,885=>602,890=>602,
-894=>602,900=>602,901=>602,902=>602,903=>602,904=>602,905=>602,906=>602,908=>602,910=>602,
-911=>602,912=>602,913=>602,914=>602,915=>602,916=>602,917=>602,918=>602,919=>602,920=>602,
-921=>602,922=>602,923=>602,924=>602,925=>602,926=>602,927=>602,928=>602,929=>602,931=>602,
-932=>602,933=>602,934=>602,935=>602,936=>602,937=>602,938=>602,939=>602,940=>602,941=>602,
-942=>602,943=>602,944=>602,945=>602,946=>602,947=>602,948=>602,949=>602,950=>602,951=>602,
-952=>602,953=>602,954=>602,955=>602,956=>602,957=>602,958=>602,959=>602,960=>602,961=>602,
-962=>602,963=>602,964=>602,965=>602,966=>602,967=>602,968=>602,969=>602,970=>602,971=>602,
-972=>602,973=>602,974=>602,976=>602,977=>602,978=>602,979=>602,980=>602,981=>602,982=>602,
-983=>602,984=>602,985=>602,986=>602,987=>602,988=>602,989=>602,990=>602,991=>602,992=>602,
-993=>602,1008=>602,1009=>602,1010=>602,1011=>602,1012=>602,1013=>602,1014=>602,1015=>602,1016=>602,
-1017=>602,1018=>602,1019=>602,1020=>602,1021=>602,1022=>602,1023=>602,1024=>602,1025=>602,1026=>602,
-1027=>602,1028=>602,1029=>602,1030=>602,1031=>602,1032=>602,1033=>602,1034=>602,1035=>602,1036=>602,
-1037=>602,1038=>602,1039=>602,1040=>602,1041=>602,1042=>602,1043=>602,1044=>602,1045=>602,1046=>602,
-1047=>602,1048=>602,1049=>602,1050=>602,1051=>602,1052=>602,1053=>602,1054=>602,1055=>602,1056=>602,
-1057=>602,1058=>602,1059=>602,1060=>602,1061=>602,1062=>602,1063=>602,1064=>602,1065=>602,1066=>602,
-1067=>602,1068=>602,1069=>602,1070=>602,1071=>602,1072=>602,1073=>602,1074=>602,1075=>602,1076=>602,
-1077=>602,1078=>602,1079=>602,1080=>602,1081=>602,1082=>602,1083=>602,1084=>602,1085=>602,1086=>602,
-1087=>602,1088=>602,1089=>602,1090=>602,1091=>602,1092=>602,1093=>602,1094=>602,1095=>602,1096=>602,
-1097=>602,1098=>602,1099=>602,1100=>602,1101=>602,1102=>602,1103=>602,1104=>602,1105=>602,1106=>602,
-1107=>602,1108=>602,1109=>602,1110=>602,1111=>602,1112=>602,1113=>602,1114=>602,1115=>602,1116=>602,
-1117=>602,1118=>602,1119=>602,1122=>602,1123=>602,1138=>602,1139=>602,1168=>602,1169=>602,1170=>602,
-1171=>602,1172=>602,1173=>602,1174=>602,1175=>602,1176=>602,1177=>602,1178=>602,1179=>602,1186=>602,
-1187=>602,1194=>602,1195=>602,1196=>602,1197=>602,1198=>602,1199=>602,1200=>602,1201=>602,1202=>602,
-1203=>602,1210=>602,1211=>602,1216=>602,1217=>602,1218=>602,1219=>602,1220=>602,1223=>602,1224=>602,
-1227=>602,1228=>602,1231=>602,1232=>602,1233=>602,1234=>602,1235=>602,1236=>602,1237=>602,1238=>602,
-1239=>602,1240=>602,1241=>602,1242=>602,1243=>602,1244=>602,1245=>602,1246=>602,1247=>602,1248=>602,
-1249=>602,1250=>602,1251=>602,1252=>602,1253=>602,1254=>602,1255=>602,1256=>602,1257=>602,1258=>602,
-1259=>602,1260=>602,1261=>602,1262=>602,1263=>602,1264=>602,1265=>602,1266=>602,1267=>602,1268=>602,
-1269=>602,1270=>602,1271=>602,1272=>602,1273=>602,1296=>602,1297=>602,1306=>602,1307=>602,1308=>602,
-1309=>602,1542=>602,1543=>602,1545=>602,1546=>602,1548=>602,1557=>602,1563=>602,1567=>602,1569=>602,
-1570=>602,1571=>602,1572=>602,1573=>602,1574=>602,1575=>602,1576=>602,1577=>602,1578=>602,1579=>602,
-1580=>602,1581=>602,1582=>602,1583=>602,1584=>602,1585=>602,1586=>602,1587=>602,1588=>602,1589=>602,
-1590=>602,1591=>602,1592=>602,1593=>602,1594=>602,1600=>602,1601=>602,1602=>602,1603=>602,1604=>602,
-1605=>602,1606=>602,1607=>602,1608=>602,1609=>602,1610=>602,1611=>602,1612=>602,1613=>602,1614=>602,
-1615=>602,1616=>602,1617=>602,1618=>602,1619=>602,1620=>602,1621=>602,1626=>602,1632=>602,1633=>602,
-1634=>602,1635=>602,1636=>602,1637=>602,1638=>602,1639=>602,1640=>602,1641=>602,1642=>602,1643=>602,
-1644=>602,1645=>602,1652=>602,1657=>602,1658=>602,1659=>602,1662=>602,1663=>602,1664=>602,1667=>602,
-1668=>602,1670=>602,1671=>602,1681=>602,1688=>602,1700=>602,1705=>602,1711=>602,1726=>602,1740=>602,
-1776=>602,1777=>602,1778=>602,1779=>602,1780=>602,1781=>602,1782=>602,1783=>602,1784=>602,1785=>602,
-3713=>602,3714=>602,3716=>602,3719=>602,3720=>602,3722=>602,3725=>602,3732=>602,3733=>602,3734=>602,
-3735=>602,3737=>602,3738=>602,3739=>602,3740=>602,3741=>602,3742=>602,3743=>602,3745=>602,3746=>602,
-3747=>602,3749=>602,3751=>602,3754=>602,3755=>602,3757=>602,3758=>602,3759=>602,3760=>602,3761=>602,
-3762=>602,3763=>602,3764=>602,3765=>602,3766=>602,3767=>602,3768=>602,3769=>602,3771=>602,3772=>602,
-3784=>602,3785=>602,3786=>602,3787=>602,3788=>602,3789=>602,4304=>602,4305=>602,4306=>602,4307=>602,
-4308=>602,4309=>602,4310=>602,4311=>602,4312=>602,4313=>602,4314=>602,4315=>602,4316=>602,4317=>602,
-4318=>602,4319=>602,4320=>602,4321=>602,4322=>602,4323=>602,4324=>602,4325=>602,4326=>602,4327=>602,
-4328=>602,4329=>602,4330=>602,4331=>602,4332=>602,4333=>602,4334=>602,4335=>602,4336=>602,4337=>602,
-4338=>602,4339=>602,4340=>602,4341=>602,4342=>602,4343=>602,4344=>602,4345=>602,4346=>602,4347=>602,
-4348=>602,7426=>602,7432=>602,7433=>602,7444=>602,7446=>602,7447=>602,7453=>602,7454=>602,7455=>602,
-7468=>602,7469=>602,7470=>602,7472=>602,7473=>602,7474=>602,7475=>602,7476=>602,7477=>602,7478=>602,
-7479=>602,7480=>602,7481=>602,7482=>602,7483=>602,7484=>602,7486=>602,7487=>602,7488=>602,7489=>602,
-7490=>602,7491=>602,7492=>602,7493=>602,7494=>602,7495=>602,7496=>602,7497=>602,7498=>602,7499=>602,
-7500=>602,7501=>602,7502=>602,7503=>602,7504=>602,7505=>602,7506=>602,7507=>602,7508=>602,7509=>602,
-7510=>602,7511=>602,7512=>602,7513=>602,7514=>602,7515=>602,7522=>602,7523=>602,7524=>602,7525=>602,
-7543=>602,7544=>602,7547=>602,7557=>602,7579=>602,7580=>602,7581=>602,7582=>602,7583=>602,7584=>602,
-7585=>602,7586=>602,7587=>602,7588=>602,7589=>602,7590=>602,7591=>602,7592=>602,7593=>602,7594=>602,
-7595=>602,7596=>602,7597=>602,7598=>602,7599=>602,7600=>602,7601=>602,7602=>602,7603=>602,7604=>602,
-7605=>602,7606=>602,7607=>602,7609=>602,7610=>602,7611=>602,7612=>602,7613=>602,7614=>602,7615=>602,
-7680=>602,7681=>602,7682=>602,7683=>602,7684=>602,7685=>602,7686=>602,7687=>602,7688=>602,7689=>602,
-7690=>602,7691=>602,7692=>602,7693=>602,7694=>602,7695=>602,7696=>602,7697=>602,7698=>602,7699=>602,
-7704=>602,7705=>602,7706=>602,7707=>602,7708=>602,7709=>602,7710=>602,7711=>602,7712=>602,7713=>602,
-7714=>602,7715=>602,7716=>602,7717=>602,7718=>602,7719=>602,7720=>602,7721=>602,7722=>602,7723=>602,
-7724=>602,7725=>602,7728=>602,7729=>602,7730=>602,7731=>602,7732=>602,7733=>602,7734=>602,7735=>602,
-7736=>602,7737=>602,7738=>602,7739=>602,7740=>602,7741=>602,7742=>602,7743=>602,7744=>602,7745=>602,
-7746=>602,7747=>602,7748=>602,7749=>602,7750=>602,7751=>602,7752=>602,7753=>602,7754=>602,7755=>602,
-7756=>602,7757=>602,7764=>602,7765=>602,7766=>602,7767=>602,7768=>602,7769=>602,7770=>602,7771=>602,
-7772=>602,7773=>602,7774=>602,7775=>602,7776=>602,7777=>602,7778=>602,7779=>602,7784=>602,7785=>602,
-7786=>602,7787=>602,7788=>602,7789=>602,7790=>602,7791=>602,7792=>602,7793=>602,7794=>602,7795=>602,
-7796=>602,7797=>602,7798=>602,7799=>602,7800=>602,7801=>602,7804=>602,7805=>602,7806=>602,7807=>602,
-7808=>602,7809=>602,7810=>602,7811=>602,7812=>602,7813=>602,7814=>602,7815=>602,7816=>602,7817=>602,
-7818=>602,7819=>602,7820=>602,7821=>602,7822=>602,7823=>602,7824=>602,7825=>602,7826=>602,7827=>602,
-7828=>602,7829=>602,7830=>602,7831=>602,7832=>602,7833=>602,7835=>602,7839=>602,7840=>602,7841=>602,
-7852=>602,7853=>602,7856=>602,7857=>602,7862=>602,7863=>602,7864=>602,7865=>602,7868=>602,7869=>602,
-7878=>602,7879=>602,7882=>602,7883=>602,7884=>602,7885=>602,7896=>602,7897=>602,7898=>602,7899=>602,
-7900=>602,7901=>602,7904=>602,7905=>602,7906=>602,7907=>602,7908=>602,7909=>602,7912=>602,7913=>602,
-7914=>602,7915=>602,7918=>602,7919=>602,7920=>602,7921=>602,7922=>602,7923=>602,7924=>602,7925=>602,
-7928=>602,7929=>602,7936=>602,7937=>602,7938=>602,7939=>602,7940=>602,7941=>602,7942=>602,7943=>602,
-7944=>602,7945=>602,7946=>602,7947=>602,7948=>602,7949=>602,7950=>602,7951=>602,7952=>602,7953=>602,
-7954=>602,7955=>602,7956=>602,7957=>602,7960=>602,7961=>602,7962=>602,7963=>602,7964=>602,7965=>602,
-7968=>602,7969=>602,7970=>602,7971=>602,7972=>602,7973=>602,7974=>602,7975=>602,7976=>602,7977=>602,
-7978=>602,7979=>602,7980=>602,7981=>602,7982=>602,7983=>602,7984=>602,7985=>602,7986=>602,7987=>602,
-7988=>602,7989=>602,7990=>602,7991=>602,7992=>602,7993=>602,7994=>602,7995=>602,7996=>602,7997=>602,
-7998=>602,7999=>602,8000=>602,8001=>602,8002=>602,8003=>602,8004=>602,8005=>602,8008=>602,8009=>602,
-8010=>602,8011=>602,8012=>602,8013=>602,8016=>602,8017=>602,8018=>602,8019=>602,8020=>602,8021=>602,
-8022=>602,8023=>602,8025=>602,8027=>602,8029=>602,8031=>602,8032=>602,8033=>602,8034=>602,8035=>602,
-8036=>602,8037=>602,8038=>602,8039=>602,8040=>602,8041=>602,8042=>602,8043=>602,8044=>602,8045=>602,
-8046=>602,8047=>602,8048=>602,8049=>602,8050=>602,8051=>602,8052=>602,8053=>602,8054=>602,8055=>602,
-8056=>602,8057=>602,8058=>602,8059=>602,8060=>602,8061=>602,8064=>602,8065=>602,8066=>602,8067=>602,
-8068=>602,8069=>602,8070=>602,8071=>602,8072=>602,8073=>602,8074=>602,8075=>602,8076=>602,8077=>602,
-8078=>602,8079=>602,8080=>602,8081=>602,8082=>602,8083=>602,8084=>602,8085=>602,8086=>602,8087=>602,
-8088=>602,8089=>602,8090=>602,8091=>602,8092=>602,8093=>602,8094=>602,8095=>602,8096=>602,8097=>602,
-8098=>602,8099=>602,8100=>602,8101=>602,8102=>602,8103=>602,8104=>602,8105=>602,8106=>602,8107=>602,
-8108=>602,8109=>602,8110=>602,8111=>602,8112=>602,8113=>602,8114=>602,8115=>602,8116=>602,8118=>602,
-8119=>602,8120=>602,8121=>602,8122=>602,8123=>602,8124=>602,8125=>602,8126=>602,8127=>602,8128=>602,
-8129=>602,8130=>602,8131=>602,8132=>602,8134=>602,8135=>602,8136=>602,8137=>602,8138=>602,8139=>602,
-8140=>602,8141=>602,8142=>602,8143=>602,8144=>602,8145=>602,8146=>602,8147=>602,8150=>602,8151=>602,
-8152=>602,8153=>602,8154=>602,8155=>602,8157=>602,8158=>602,8159=>602,8160=>602,8161=>602,8162=>602,
-8163=>602,8164=>602,8165=>602,8166=>602,8167=>602,8168=>602,8169=>602,8170=>602,8171=>602,8172=>602,
-8173=>602,8174=>602,8175=>602,8178=>602,8179=>602,8180=>602,8182=>602,8183=>602,8184=>602,8185=>602,
-8186=>602,8187=>602,8188=>602,8189=>602,8190=>602,8192=>602,8193=>602,8194=>602,8195=>602,8196=>602,
-8197=>602,8198=>602,8199=>602,8200=>602,8201=>602,8202=>602,8208=>602,8209=>602,8210=>602,8213=>602,
-8215=>602,8219=>602,8223=>602,8227=>602,8239=>602,8241=>602,8242=>602,8243=>602,8244=>602,8245=>602,
-8246=>602,8247=>602,8252=>602,8253=>602,8254=>602,8261=>602,8262=>602,8263=>602,8264=>602,8265=>602,
-8287=>602,8304=>602,8305=>602,8308=>602,8309=>602,8310=>602,8311=>602,8312=>602,8313=>602,8314=>602,
-8315=>602,8316=>602,8317=>602,8318=>602,8319=>602,8320=>602,8321=>602,8322=>602,8323=>602,8324=>602,
-8325=>602,8326=>602,8327=>602,8328=>602,8329=>602,8330=>602,8331=>602,8332=>602,8333=>602,8334=>602,
-8336=>602,8337=>602,8338=>602,8339=>602,8340=>602,8352=>602,8353=>602,8354=>602,8355=>602,8356=>602,
-8357=>602,8358=>602,8359=>602,8360=>602,8361=>602,8362=>602,8363=>602,8365=>602,8366=>602,8367=>602,
-8368=>602,8369=>602,8370=>602,8371=>602,8372=>602,8373=>602,8450=>602,8453=>602,8461=>602,8462=>602,
-8463=>602,8469=>602,8470=>602,8471=>602,8473=>602,8474=>602,8477=>602,8484=>602,8486=>602,8490=>602,
-8491=>602,8494=>602,8531=>602,8532=>602,8533=>602,8534=>602,8535=>602,8536=>602,8537=>602,8538=>602,
-8539=>602,8540=>602,8541=>602,8542=>602,8543=>602,8592=>602,8593=>602,8594=>602,8595=>602,8596=>602,
-8597=>602,8598=>602,8599=>602,8600=>602,8601=>602,8602=>602,8603=>602,8604=>602,8605=>602,8606=>602,
-8607=>602,8608=>602,8609=>602,8610=>602,8611=>602,8612=>602,8613=>602,8614=>602,8615=>602,8616=>602,
-8617=>602,8618=>602,8619=>602,8620=>602,8621=>602,8622=>602,8623=>602,8624=>602,8625=>602,8626=>602,
-8627=>602,8628=>602,8629=>602,8630=>602,8631=>602,8632=>602,8633=>602,8634=>602,8635=>602,8636=>602,
-8637=>602,8638=>602,8639=>602,8640=>602,8641=>602,8642=>602,8643=>602,8644=>602,8645=>602,8646=>602,
-8647=>602,8648=>602,8649=>602,8650=>602,8651=>602,8652=>602,8653=>602,8654=>602,8655=>602,8656=>602,
-8657=>602,8658=>602,8659=>602,8660=>602,8661=>602,8662=>602,8663=>602,8664=>602,8665=>602,8666=>602,
-8667=>602,8668=>602,8669=>602,8670=>602,8671=>602,8672=>602,8673=>602,8674=>602,8675=>602,8676=>602,
-8677=>602,8678=>602,8679=>602,8680=>602,8681=>602,8682=>602,8683=>602,8684=>602,8685=>602,8686=>602,
-8687=>602,8688=>602,8689=>602,8690=>602,8691=>602,8692=>602,8693=>602,8694=>602,8695=>602,8696=>602,
-8697=>602,8698=>602,8699=>602,8700=>602,8701=>602,8702=>602,8703=>602,8704=>602,8705=>602,8706=>602,
-8707=>602,8708=>602,8709=>602,8710=>602,8711=>602,8712=>602,8713=>602,8714=>602,8715=>602,8716=>602,
-8717=>602,8719=>602,8721=>602,8722=>602,8723=>602,8725=>602,8727=>602,8728=>602,8729=>602,8730=>602,
-8731=>602,8732=>602,8733=>602,8734=>602,8735=>602,8736=>602,8743=>602,8744=>602,8745=>602,8746=>602,
-8747=>602,8748=>602,8749=>602,8760=>602,8761=>602,8762=>602,8763=>602,8764=>602,8765=>602,8769=>602,
-8770=>602,8771=>602,8772=>602,8773=>602,8774=>602,8775=>602,8776=>602,8777=>602,8778=>602,8779=>602,
-8780=>602,8781=>602,8782=>602,8783=>602,8784=>602,8785=>602,8786=>602,8787=>602,8788=>602,8789=>602,
-8790=>602,8791=>602,8792=>602,8793=>602,8794=>602,8795=>602,8796=>602,8797=>602,8798=>602,8799=>602,
-8800=>602,8801=>602,8802=>602,8803=>602,8804=>602,8805=>602,8806=>602,8807=>602,8808=>602,8809=>602,
-8813=>602,8814=>602,8815=>602,8816=>602,8817=>602,8818=>602,8819=>602,8820=>602,8821=>602,8822=>602,
-8823=>602,8824=>602,8825=>602,8826=>602,8827=>602,8828=>602,8829=>602,8830=>602,8831=>602,8832=>602,
-8833=>602,8834=>602,8835=>602,8836=>602,8837=>602,8838=>602,8839=>602,8840=>602,8841=>602,8842=>602,
-8843=>602,8847=>602,8848=>602,8849=>602,8850=>602,8853=>602,8854=>602,8855=>602,8856=>602,8857=>602,
-8858=>602,8859=>602,8860=>602,8861=>602,8862=>602,8863=>602,8864=>602,8865=>602,8901=>602,8902=>602,
-8909=>602,8922=>602,8923=>602,8924=>602,8925=>602,8926=>602,8927=>602,8928=>602,8929=>602,8930=>602,
-8931=>602,8932=>602,8933=>602,8934=>602,8935=>602,8936=>602,8937=>602,8943=>602,8960=>602,8961=>602,
-8962=>602,8963=>602,8964=>602,8965=>602,8966=>602,8968=>602,8969=>602,8970=>602,8971=>602,8972=>602,
-8973=>602,8974=>602,8975=>602,8976=>602,8977=>602,8978=>602,8979=>602,8980=>602,8981=>602,8984=>602,
-8985=>602,8988=>602,8989=>602,8990=>602,8991=>602,8992=>602,8993=>602,8997=>602,8998=>602,8999=>602,
-9000=>602,9003=>602,9013=>602,9015=>602,9016=>602,9017=>602,9018=>602,9019=>602,9020=>602,9021=>602,
-9022=>602,9025=>602,9026=>602,9027=>602,9028=>602,9031=>602,9032=>602,9033=>602,9035=>602,9036=>602,
-9037=>602,9040=>602,9042=>602,9043=>602,9044=>602,9047=>602,9048=>602,9049=>602,9050=>602,9051=>602,
-9052=>602,9054=>602,9055=>602,9056=>602,9059=>602,9060=>602,9061=>602,9064=>602,9065=>602,9067=>602,
-9068=>602,9069=>602,9070=>602,9071=>602,9072=>602,9075=>602,9076=>602,9077=>602,9078=>602,9079=>602,
-9080=>602,9081=>602,9082=>602,9085=>602,9088=>602,9089=>602,9090=>602,9091=>602,9096=>602,9097=>602,
-9098=>602,9099=>602,9109=>602,9115=>602,9116=>602,9117=>602,9118=>602,9119=>602,9120=>602,9121=>602,
-9122=>602,9123=>602,9124=>602,9125=>602,9126=>602,9127=>602,9128=>602,9129=>602,9130=>602,9131=>602,
-9132=>602,9133=>602,9134=>602,9166=>602,9167=>602,9251=>602,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=>602,9601=>602,9602=>602,9603=>602,9604=>602,9605=>602,
-9606=>602,9607=>602,9608=>602,9609=>602,9610=>602,9611=>602,9612=>602,9613=>602,9614=>602,9615=>602,
-9616=>602,9617=>602,9618=>602,9619=>602,9620=>602,9621=>602,9622=>602,9623=>602,9624=>602,9625=>602,
-9626=>602,9627=>602,9628=>602,9629=>602,9630=>602,9631=>602,9632=>602,9633=>602,9634=>602,9635=>602,
-9636=>602,9637=>602,9638=>602,9639=>602,9640=>602,9641=>602,9642=>602,9643=>602,9644=>602,9645=>602,
-9646=>602,9647=>602,9648=>602,9649=>602,9650=>602,9651=>602,9652=>602,9653=>602,9654=>602,9655=>602,
-9656=>602,9657=>602,9658=>602,9659=>602,9660=>602,9661=>602,9662=>602,9663=>602,9664=>602,9665=>602,
-9666=>602,9667=>602,9668=>602,9669=>602,9670=>602,9671=>602,9672=>602,9673=>602,9674=>602,9675=>602,
-9676=>602,9677=>602,9678=>602,9679=>602,9680=>602,9681=>602,9682=>602,9683=>602,9684=>602,9685=>602,
-9686=>602,9687=>602,9688=>602,9689=>602,9690=>602,9691=>602,9692=>602,9693=>602,9694=>602,9695=>602,
-9696=>602,9697=>602,9698=>602,9699=>602,9700=>602,9701=>602,9702=>602,9703=>602,9704=>602,9705=>602,
-9706=>602,9707=>602,9708=>602,9709=>602,9710=>602,9711=>602,9712=>602,9713=>602,9714=>602,9715=>602,
-9716=>602,9717=>602,9718=>602,9719=>602,9720=>602,9721=>602,9722=>602,9723=>602,9724=>602,9725=>602,
-9726=>602,9727=>602,9728=>602,9729=>602,9730=>602,9731=>602,9732=>602,9733=>602,9734=>602,9735=>602,
-9736=>602,9737=>602,9738=>602,9739=>602,9740=>602,9741=>602,9742=>602,9743=>602,9744=>602,9745=>602,
-9746=>602,9747=>602,9748=>602,9749=>602,9750=>602,9751=>602,9752=>602,9753=>602,9754=>602,9755=>602,
-9756=>602,9757=>602,9758=>602,9759=>602,9760=>602,9761=>602,9762=>602,9763=>602,9764=>602,9765=>602,
-9766=>602,9767=>602,9768=>602,9769=>602,9770=>602,9771=>602,9772=>602,9773=>602,9774=>602,9775=>602,
-9784=>602,9785=>602,9786=>602,9787=>602,9788=>602,9789=>602,9790=>602,9791=>602,9792=>602,9793=>602,
-9794=>602,9795=>602,9796=>602,9797=>602,9798=>602,9799=>602,9800=>602,9801=>602,9802=>602,9803=>602,
-9804=>602,9805=>602,9806=>602,9807=>602,9808=>602,9809=>602,9810=>602,9811=>602,9812=>602,9813=>602,
-9814=>602,9815=>602,9816=>602,9817=>602,9818=>602,9819=>602,9820=>602,9821=>602,9822=>602,9823=>602,
-9824=>602,9825=>602,9826=>602,9827=>602,9828=>602,9829=>602,9830=>602,9831=>602,9832=>602,9833=>602,
-9834=>602,9835=>602,9836=>602,9837=>602,9838=>602,9839=>602,9840=>602,9841=>602,9842=>602,9843=>602,
-9844=>602,9845=>602,9846=>602,9847=>602,9848=>602,9849=>602,9850=>602,9851=>602,9852=>602,9853=>602,
-9854=>602,9855=>602,9856=>602,9857=>602,9858=>602,9859=>602,9860=>602,9861=>602,9862=>602,9863=>602,
-9864=>602,9865=>602,9866=>602,9867=>602,9872=>602,9873=>602,9874=>602,9875=>602,9876=>602,9877=>602,
-9878=>602,9879=>602,9880=>602,9881=>602,9882=>602,9883=>602,9884=>602,9888=>602,9889=>602,9904=>602,
-9905=>602,9985=>602,9986=>602,9987=>602,9988=>602,9990=>602,9991=>602,9992=>602,9993=>602,9996=>602,
-9997=>602,9998=>602,9999=>602,10000=>602,10001=>602,10002=>602,10003=>602,10004=>602,10005=>602,10006=>602,
-10007=>602,10008=>602,10009=>602,10010=>602,10011=>602,10012=>602,10013=>602,10014=>602,10015=>602,10016=>602,
-10017=>602,10018=>602,10019=>602,10020=>602,10021=>602,10022=>602,10023=>602,10025=>602,10026=>602,10027=>602,
-10028=>602,10029=>602,10030=>602,10031=>602,10032=>602,10033=>602,10034=>602,10035=>602,10036=>602,10037=>602,
-10038=>602,10039=>602,10040=>602,10041=>602,10042=>602,10043=>602,10044=>602,10045=>602,10046=>602,10047=>602,
-10048=>602,10049=>602,10050=>602,10051=>602,10052=>602,10053=>602,10054=>602,10055=>602,10056=>602,10057=>602,
-10058=>602,10059=>602,10061=>602,10063=>602,10064=>602,10065=>602,10066=>602,10070=>602,10072=>602,10073=>602,
-10074=>602,10075=>602,10076=>602,10077=>602,10078=>602,10081=>602,10082=>602,10083=>602,10084=>602,10085=>602,
-10086=>602,10087=>602,10088=>602,10089=>602,10090=>602,10091=>602,10092=>602,10093=>602,10094=>602,10095=>602,
-10096=>602,10097=>602,10098=>602,10099=>602,10100=>602,10101=>602,10132=>602,10136=>602,10137=>602,10138=>602,
-10139=>602,10140=>602,10141=>602,10142=>602,10143=>602,10144=>602,10145=>602,10146=>602,10147=>602,10148=>602,
-10149=>602,10150=>602,10151=>602,10152=>602,10153=>602,10154=>602,10155=>602,10156=>602,10157=>602,10158=>602,
-10159=>602,10161=>602,10162=>602,10163=>602,10164=>602,10165=>602,10166=>602,10167=>602,10168=>602,10169=>602,
-10170=>602,10171=>602,10172=>602,10173=>602,10174=>602,10181=>602,10182=>602,10208=>602,10216=>602,10217=>602,
-10731=>602,10746=>602,10747=>602,10799=>602,11026=>602,11027=>602,11028=>602,11029=>602,11030=>602,11031=>602,
-11032=>602,11033=>602,11034=>602,11364=>602,11374=>602,11375=>602,11381=>602,11382=>602,11383=>602,11385=>602,
-11386=>602,11388=>602,11389=>602,11800=>602,11810=>602,11811=>602,11812=>602,11813=>602,11822=>602,42760=>602,
-42761=>602,42762=>602,42763=>602,42764=>602,42765=>602,42766=>602,42767=>602,42768=>602,42769=>602,42770=>602,
-42771=>602,42772=>602,42773=>602,42774=>602,42779=>602,42780=>602,42781=>602,42782=>602,42783=>602,42790=>602,
-42791=>602,42889=>602,42890=>602,42891=>602,42892=>602,63173=>602,64257=>602,64258=>602,64338=>602,64339=>602,
-64340=>602,64341=>602,64342=>602,64343=>602,64344=>602,64345=>602,64346=>602,64347=>602,64348=>602,64349=>602,
-64350=>602,64351=>602,64352=>602,64353=>602,64354=>602,64355=>602,64356=>602,64357=>602,64358=>602,64359=>602,
-64360=>602,64361=>602,64362=>602,64363=>602,64364=>602,64365=>602,64366=>602,64367=>602,64368=>602,64369=>602,
-64370=>602,64371=>602,64372=>602,64373=>602,64374=>602,64375=>602,64376=>602,64377=>602,64378=>602,64379=>602,
-64380=>602,64381=>602,64382=>602,64383=>602,64384=>602,64385=>602,64394=>602,64395=>602,64396=>602,64397=>602,
-64398=>602,64399=>602,64400=>602,64401=>602,64402=>602,64403=>602,64404=>602,64405=>602,64414=>602,64415=>602,
-64426=>602,64427=>602,64428=>602,64429=>602,64488=>602,64489=>602,64508=>602,64509=>602,64510=>602,64511=>602,
-65136=>602,65137=>602,65138=>602,65139=>602,65140=>602,65142=>602,65143=>602,65144=>602,65145=>602,65146=>602,
-65147=>602,65148=>602,65149=>602,65150=>602,65151=>602,65152=>602,65153=>602,65154=>602,65155=>602,65156=>602,
-65157=>602,65158=>602,65159=>602,65160=>602,65161=>602,65162=>602,65163=>602,65164=>602,65165=>602,65166=>602,
-65167=>602,65168=>602,65169=>602,65170=>602,65171=>602,65172=>602,65173=>602,65174=>602,65175=>602,65176=>602,
-65177=>602,65178=>602,65179=>602,65180=>602,65181=>602,65182=>602,65183=>602,65184=>602,65185=>602,65186=>602,
-65187=>602,65188=>602,65189=>602,65190=>602,65191=>602,65192=>602,65193=>602,65194=>602,65195=>602,65196=>602,
-65197=>602,65198=>602,65199=>602,65200=>602,65201=>602,65202=>602,65203=>602,65204=>602,65205=>602,65206=>602,
-65207=>602,65208=>602,65209=>602,65210=>602,65211=>602,65212=>602,65213=>602,65214=>602,65215=>602,65216=>602,
-65217=>602,65218=>602,65219=>602,65220=>602,65221=>602,65222=>602,65223=>602,65224=>602,65225=>602,65226=>602,
-65227=>602,65228=>602,65229=>602,65230=>602,65231=>602,65232=>602,65233=>602,65234=>602,65235=>602,65236=>602,
-65237=>602,65238=>602,65239=>602,65240=>602,65241=>602,65242=>602,65243=>602,65244=>602,65245=>602,65246=>602,
-65247=>602,65248=>602,65249=>602,65250=>602,65251=>602,65252=>602,65253=>602,65254=>602,65255=>602,65256=>602,
-65257=>602,65258=>602,65259=>602,65260=>602,65261=>602,65262=>602,65263=>602,65264=>602,65265=>602,65266=>602,
-65267=>602,65268=>602,65269=>602,65270=>602,65271=>602,65272=>602,65273=>602,65274=>602,65275=>602,65276=>602,
-65279=>602,65529=>602,65530=>602,65531=>602,65532=>602,65533=>602);
-$enc='';
-$diff='';
-$file='dejavusansmono.z';
-$ctg='dejavusansmono.ctg.z';
-$originalsize=321524;
-?>
\ No newline at end of file
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusansmono.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusansmono.z
deleted file mode 100644
index 3b9ede1f..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusansmono.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusansmonob.ctg.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusansmonob.ctg.z
deleted file mode 100644
index 0ce0dba4..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusansmonob.ctg.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusansmonob.php b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusansmonob.php
deleted file mode 100644
index 11e5d55b..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusansmonob.php
+++ /dev/null
@@ -1,307 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='DejaVuSansMono-Bold';
-$desc=array('Ascent'=>928,'Descent'=>-236,'CapHeight'=>13,'Flags'=>33,'FontBBox'=>'[-446 -394 731 1052]','ItalicAngle'=>0,'StemV'=>120,'MissingWidth'=>602);
-$up=-63;
-$ut=44;
-$dw=602;
-$cw=array(
-0=>602,32=>602,33=>602,34=>602,35=>602,36=>602,37=>602,38=>602,39=>602,40=>602,
-41=>602,42=>602,43=>602,44=>602,45=>602,46=>602,47=>602,48=>602,49=>602,50=>602,
-51=>602,52=>602,53=>602,54=>602,55=>602,56=>602,57=>602,58=>602,59=>602,60=>602,
-61=>602,62=>602,63=>602,64=>602,65=>602,66=>602,67=>602,68=>602,69=>602,70=>602,
-71=>602,72=>602,73=>602,74=>602,75=>602,76=>602,77=>602,78=>602,79=>602,80=>602,
-81=>602,82=>602,83=>602,84=>602,85=>602,86=>602,87=>602,88=>602,89=>602,90=>602,
-91=>602,92=>602,93=>602,94=>602,95=>602,96=>602,97=>602,98=>602,99=>602,100=>602,
-101=>602,102=>602,103=>602,104=>602,105=>602,106=>602,107=>602,108=>602,109=>602,110=>602,
-111=>602,112=>602,113=>602,114=>602,115=>602,116=>602,117=>602,118=>602,119=>602,120=>602,
-121=>602,122=>602,123=>602,124=>602,125=>602,126=>602,8364=>602,8218=>602,402=>602,8222=>602,
-8230=>602,8224=>602,8225=>602,710=>602,8240=>602,352=>602,8249=>602,338=>602,381=>602,8216=>602,
-8217=>602,8220=>602,8221=>602,8226=>602,8211=>602,8212=>602,732=>602,8482=>602,353=>602,8250=>602,
-339=>602,382=>602,376=>602,160=>602,161=>602,162=>602,163=>602,164=>602,165=>602,166=>602,
-167=>602,168=>602,169=>602,170=>602,171=>602,172=>602,173=>602,174=>602,175=>602,176=>602,
-177=>602,178=>602,179=>602,180=>602,181=>602,182=>602,183=>602,184=>602,185=>602,186=>602,
-187=>602,188=>602,189=>602,190=>602,191=>602,192=>602,193=>602,194=>602,195=>602,196=>602,
-197=>602,198=>602,199=>602,200=>602,201=>602,202=>602,203=>602,204=>602,205=>602,206=>602,
-207=>602,208=>602,209=>602,210=>602,211=>602,212=>602,213=>602,214=>602,215=>602,216=>602,
-217=>602,218=>602,219=>602,220=>602,221=>602,222=>602,223=>602,224=>602,225=>602,226=>602,
-227=>602,228=>602,229=>602,230=>602,231=>602,232=>602,233=>602,234=>602,235=>602,236=>602,
-237=>602,238=>602,239=>602,240=>602,241=>602,242=>602,243=>602,244=>602,245=>602,246=>602,
-247=>602,248=>602,249=>602,250=>602,251=>602,252=>602,253=>602,254=>602,255=>602,256=>602,
-257=>602,258=>602,259=>602,260=>602,261=>602,262=>602,263=>602,264=>602,265=>602,266=>602,
-267=>602,268=>602,269=>602,270=>602,271=>602,272=>602,273=>602,274=>602,275=>602,276=>602,
-277=>602,278=>602,279=>602,280=>602,281=>602,282=>602,283=>602,284=>602,285=>602,286=>602,
-287=>602,288=>602,289=>602,290=>602,291=>602,292=>602,293=>602,294=>602,295=>602,296=>602,
-297=>602,298=>602,299=>602,300=>602,301=>602,302=>602,303=>602,304=>602,305=>602,306=>602,
-307=>602,308=>602,309=>602,310=>602,311=>602,312=>602,313=>602,314=>602,315=>602,316=>602,
-317=>602,318=>602,319=>602,320=>602,321=>602,322=>602,323=>602,324=>602,325=>602,326=>602,
-327=>602,328=>602,329=>602,330=>602,331=>602,332=>602,333=>602,334=>602,335=>602,336=>602,
-337=>602,340=>602,341=>602,342=>602,343=>602,344=>602,345=>602,346=>602,347=>602,348=>602,
-349=>602,350=>602,351=>602,354=>602,355=>602,356=>602,357=>602,358=>602,359=>602,360=>602,
-361=>602,362=>602,363=>602,364=>602,365=>602,366=>602,367=>602,368=>602,369=>602,370=>602,
-371=>602,372=>602,373=>602,374=>602,375=>602,377=>602,378=>602,379=>602,380=>602,383=>602,
-384=>602,385=>602,386=>602,387=>602,388=>602,389=>602,390=>602,391=>602,392=>602,393=>602,
-394=>602,395=>602,396=>602,397=>602,398=>602,399=>602,400=>602,401=>602,403=>602,404=>602,
-405=>602,406=>602,407=>602,408=>602,409=>602,410=>602,411=>602,412=>602,413=>602,414=>602,
-415=>602,416=>602,417=>602,418=>602,419=>602,420=>602,421=>602,422=>602,423=>602,424=>602,
-425=>602,426=>602,427=>602,428=>602,429=>602,430=>602,431=>602,432=>602,433=>602,434=>602,
-435=>602,436=>602,437=>602,438=>602,439=>602,440=>602,441=>602,442=>602,443=>602,444=>602,
-445=>602,446=>602,447=>602,448=>602,449=>602,450=>602,451=>602,461=>602,462=>602,463=>602,
-464=>602,465=>602,466=>602,467=>602,468=>602,469=>602,470=>602,471=>602,472=>602,473=>602,
-474=>602,475=>602,476=>602,477=>602,478=>602,479=>602,480=>602,481=>602,482=>602,483=>602,
-486=>602,487=>602,488=>602,489=>602,490=>602,491=>602,492=>602,493=>602,494=>602,495=>602,
-496=>602,500=>602,501=>602,502=>602,504=>602,505=>602,508=>602,509=>602,510=>602,511=>602,
-512=>602,513=>602,514=>602,515=>602,516=>602,517=>602,518=>602,519=>602,520=>602,521=>602,
-522=>602,523=>602,524=>602,525=>602,526=>602,527=>602,528=>602,529=>602,530=>602,531=>602,
-532=>602,533=>602,534=>602,535=>602,536=>602,537=>602,538=>602,539=>602,540=>602,541=>602,
-542=>602,543=>602,544=>602,545=>602,548=>602,549=>602,550=>602,551=>602,552=>602,553=>602,
-554=>602,555=>602,556=>602,557=>602,558=>602,559=>602,560=>602,561=>602,562=>602,563=>602,
-564=>602,565=>602,566=>602,567=>602,568=>602,569=>602,570=>602,571=>602,572=>602,573=>602,
-574=>602,575=>602,576=>602,577=>602,580=>602,581=>602,588=>602,589=>602,592=>602,593=>602,
-594=>602,595=>602,596=>602,597=>602,598=>602,599=>602,600=>602,601=>602,602=>602,603=>602,
-604=>602,605=>602,606=>602,607=>602,608=>602,609=>602,610=>602,611=>602,612=>602,613=>602,
-614=>602,615=>602,616=>602,617=>602,618=>602,619=>602,620=>602,621=>602,622=>602,623=>602,
-624=>602,625=>602,626=>602,627=>602,628=>602,629=>602,630=>602,631=>602,632=>602,633=>602,
-634=>602,635=>602,636=>602,637=>602,638=>602,639=>602,640=>602,641=>602,642=>602,643=>602,
-644=>602,645=>602,646=>602,647=>602,648=>602,649=>602,650=>602,651=>602,652=>602,653=>602,
-654=>602,655=>602,656=>602,657=>602,658=>602,659=>602,660=>602,661=>602,662=>602,663=>602,
-664=>602,665=>602,666=>602,667=>602,668=>602,669=>602,670=>602,671=>602,672=>602,673=>602,
-674=>602,675=>602,676=>602,677=>602,678=>602,679=>602,680=>602,681=>602,682=>602,683=>602,
-684=>602,685=>602,686=>602,687=>602,688=>602,689=>602,690=>602,691=>602,692=>602,693=>602,
-694=>602,695=>602,696=>602,697=>602,699=>602,700=>602,701=>602,702=>602,703=>602,704=>602,
-705=>602,711=>602,712=>602,713=>602,716=>602,717=>602,720=>602,721=>602,722=>602,723=>602,
-726=>602,727=>602,728=>602,729=>602,730=>602,731=>602,733=>602,734=>602,736=>602,737=>602,
-738=>602,739=>602,740=>602,741=>602,742=>602,743=>602,744=>602,745=>602,750=>602,755=>602,
-768=>602,769=>602,770=>602,771=>602,772=>602,773=>602,774=>602,775=>602,776=>602,777=>602,
-778=>602,779=>602,780=>602,781=>602,782=>602,783=>602,784=>602,785=>602,786=>602,787=>602,
-788=>602,789=>602,790=>602,791=>602,792=>602,793=>602,794=>602,795=>602,796=>602,797=>602,
-798=>602,799=>602,800=>602,801=>602,802=>602,803=>602,804=>602,805=>602,806=>602,807=>602,
-808=>602,809=>602,810=>602,811=>602,812=>602,813=>602,814=>602,815=>602,816=>602,817=>602,
-818=>602,819=>602,820=>602,821=>602,822=>602,823=>602,824=>602,825=>602,826=>602,827=>602,
-828=>602,829=>602,830=>602,831=>602,835=>602,856=>602,865=>602,884=>602,885=>602,890=>602,
-894=>602,900=>602,901=>602,902=>602,903=>602,904=>602,905=>602,906=>602,908=>602,910=>602,
-911=>602,912=>602,913=>602,914=>602,915=>602,916=>602,917=>602,918=>602,919=>602,920=>602,
-921=>602,922=>602,923=>602,924=>602,925=>602,926=>602,927=>602,928=>602,929=>602,931=>602,
-932=>602,933=>602,934=>602,935=>602,936=>602,937=>602,938=>602,939=>602,940=>602,941=>602,
-942=>602,943=>602,944=>602,945=>602,946=>602,947=>602,948=>602,949=>602,950=>602,951=>602,
-952=>602,953=>602,954=>602,955=>602,956=>602,957=>602,958=>602,959=>602,960=>602,961=>602,
-962=>602,963=>602,964=>602,965=>602,966=>602,967=>602,968=>602,969=>602,970=>602,971=>602,
-972=>602,973=>602,974=>602,976=>602,977=>602,978=>602,979=>602,980=>602,981=>602,982=>602,
-983=>602,984=>602,985=>602,986=>602,987=>602,988=>602,989=>602,990=>602,991=>602,992=>602,
-993=>602,1008=>602,1009=>602,1010=>602,1011=>602,1012=>602,1013=>602,1014=>602,1015=>602,1016=>602,
-1017=>602,1018=>602,1019=>602,1020=>602,1021=>602,1022=>602,1023=>602,1024=>602,1025=>602,1026=>602,
-1027=>602,1028=>602,1029=>602,1030=>602,1031=>602,1032=>602,1033=>602,1034=>602,1035=>602,1036=>602,
-1037=>602,1038=>602,1039=>602,1040=>602,1041=>602,1042=>602,1043=>602,1044=>602,1045=>602,1046=>602,
-1047=>602,1048=>602,1049=>602,1050=>602,1051=>602,1052=>602,1053=>602,1054=>602,1055=>602,1056=>602,
-1057=>602,1058=>602,1059=>602,1060=>602,1061=>602,1062=>602,1063=>602,1064=>602,1065=>602,1066=>602,
-1067=>602,1068=>602,1069=>602,1070=>602,1071=>602,1072=>602,1073=>602,1074=>602,1075=>602,1076=>602,
-1077=>602,1078=>602,1079=>602,1080=>602,1081=>602,1082=>602,1083=>602,1084=>602,1085=>602,1086=>602,
-1087=>602,1088=>602,1089=>602,1090=>602,1091=>602,1092=>602,1093=>602,1094=>602,1095=>602,1096=>602,
-1097=>602,1098=>602,1099=>602,1100=>602,1101=>602,1102=>602,1103=>602,1104=>602,1105=>602,1106=>602,
-1107=>602,1108=>602,1109=>602,1110=>602,1111=>602,1112=>602,1113=>602,1114=>602,1115=>602,1116=>602,
-1117=>602,1118=>602,1119=>602,1122=>602,1123=>602,1138=>602,1139=>602,1168=>602,1169=>602,1170=>602,
-1171=>602,1172=>602,1173=>602,1174=>602,1175=>602,1176=>602,1177=>602,1178=>602,1179=>602,1186=>602,
-1187=>602,1194=>602,1195=>602,1196=>602,1197=>602,1198=>602,1199=>602,1200=>602,1201=>602,1202=>602,
-1203=>602,1210=>602,1211=>602,1216=>602,1217=>602,1218=>602,1219=>602,1220=>602,1223=>602,1224=>602,
-1227=>602,1228=>602,1231=>602,1232=>602,1233=>602,1234=>602,1235=>602,1236=>602,1237=>602,1238=>602,
-1239=>602,1240=>602,1241=>602,1242=>602,1243=>602,1244=>602,1245=>602,1246=>602,1247=>602,1248=>602,
-1249=>602,1250=>602,1251=>602,1252=>602,1253=>602,1254=>602,1255=>602,1256=>602,1257=>602,1258=>602,
-1259=>602,1260=>602,1261=>602,1262=>602,1263=>602,1264=>602,1265=>602,1266=>602,1267=>602,1268=>602,
-1269=>602,1270=>602,1271=>602,1272=>602,1273=>602,1296=>602,1297=>602,1306=>602,1307=>602,1308=>602,
-1309=>602,1542=>602,1543=>602,1545=>602,1546=>602,1548=>602,1557=>602,1563=>602,1567=>602,1569=>602,
-1570=>602,1571=>602,1572=>602,1573=>602,1574=>602,1575=>602,1576=>602,1577=>602,1578=>602,1579=>602,
-1580=>602,1581=>602,1582=>602,1583=>602,1584=>602,1585=>602,1586=>602,1587=>602,1588=>602,1589=>602,
-1590=>602,1591=>602,1592=>602,1593=>602,1594=>602,1600=>602,1601=>602,1602=>602,1603=>602,1604=>602,
-1605=>602,1606=>602,1607=>602,1608=>602,1609=>602,1610=>602,1611=>602,1612=>602,1613=>602,1614=>602,
-1615=>602,1616=>602,1617=>602,1618=>602,1619=>602,1620=>602,1621=>602,1626=>602,1632=>602,1633=>602,
-1634=>602,1635=>602,1636=>602,1637=>602,1638=>602,1639=>602,1640=>602,1641=>602,1642=>602,1643=>602,
-1644=>602,1645=>602,1652=>602,1657=>602,1658=>602,1659=>602,1662=>602,1663=>602,1664=>602,1667=>602,
-1668=>602,1670=>602,1671=>602,1681=>602,1688=>602,1700=>602,1705=>602,1711=>602,1726=>602,1740=>602,
-1776=>602,1777=>602,1778=>602,1779=>602,1780=>602,1781=>602,1782=>602,1783=>602,1784=>602,1785=>602,
-3713=>602,3714=>602,3716=>602,3719=>602,3720=>602,3722=>602,3725=>602,3732=>602,3733=>602,3734=>602,
-3735=>602,3737=>602,3738=>602,3739=>602,3740=>602,3741=>602,3742=>602,3743=>602,3745=>602,3746=>602,
-3747=>602,3749=>602,3751=>602,3754=>602,3755=>602,3757=>602,3758=>602,3759=>602,3760=>602,3761=>602,
-3762=>602,3763=>602,3764=>602,3765=>602,3766=>602,3767=>602,3768=>602,3769=>602,3771=>602,3772=>602,
-3784=>602,3785=>602,3786=>602,3787=>602,3788=>602,3789=>602,4304=>602,4305=>602,4306=>602,4307=>602,
-4308=>602,4309=>602,4310=>602,4311=>602,4312=>602,4313=>602,4314=>602,4315=>602,4316=>602,4317=>602,
-4318=>602,4319=>602,4320=>602,4321=>602,4322=>602,4323=>602,4324=>602,4325=>602,4326=>602,4327=>602,
-4328=>602,4329=>602,4330=>602,4331=>602,4332=>602,4333=>602,4334=>602,4335=>602,4336=>602,4337=>602,
-4338=>602,4339=>602,4340=>602,4341=>602,4342=>602,4343=>602,4344=>602,4345=>602,4346=>602,4347=>602,
-4348=>602,7426=>602,7432=>602,7433=>602,7444=>602,7446=>602,7447=>602,7453=>602,7454=>602,7455=>602,
-7468=>602,7469=>602,7470=>602,7472=>602,7473=>602,7474=>602,7475=>602,7476=>602,7477=>602,7478=>602,
-7479=>602,7480=>602,7481=>602,7482=>602,7483=>602,7484=>602,7486=>602,7487=>602,7488=>602,7489=>602,
-7490=>602,7491=>602,7492=>602,7493=>602,7494=>602,7495=>602,7496=>602,7497=>602,7498=>602,7499=>602,
-7500=>602,7501=>602,7502=>602,7503=>602,7504=>602,7505=>602,7506=>602,7507=>602,7508=>602,7509=>602,
-7510=>602,7511=>602,7512=>602,7513=>602,7514=>602,7515=>602,7522=>602,7523=>602,7524=>602,7525=>602,
-7543=>602,7544=>602,7547=>602,7557=>602,7579=>602,7580=>602,7581=>602,7582=>602,7583=>602,7584=>602,
-7585=>602,7586=>602,7587=>602,7588=>602,7589=>602,7590=>602,7591=>602,7592=>602,7593=>602,7594=>602,
-7595=>602,7596=>602,7597=>602,7598=>602,7599=>602,7600=>602,7601=>602,7602=>602,7603=>602,7604=>602,
-7605=>602,7606=>602,7607=>602,7609=>602,7610=>602,7611=>602,7612=>602,7613=>602,7614=>602,7615=>602,
-7680=>602,7681=>602,7682=>602,7683=>602,7684=>602,7685=>602,7686=>602,7687=>602,7688=>602,7689=>602,
-7690=>602,7691=>602,7692=>602,7693=>602,7694=>602,7695=>602,7696=>602,7697=>602,7698=>602,7699=>602,
-7704=>602,7705=>602,7706=>602,7707=>602,7708=>602,7709=>602,7710=>602,7711=>602,7712=>602,7713=>602,
-7714=>602,7715=>602,7716=>602,7717=>602,7718=>602,7719=>602,7720=>602,7721=>602,7722=>602,7723=>602,
-7724=>602,7725=>602,7728=>602,7729=>602,7730=>602,7731=>602,7732=>602,7733=>602,7734=>602,7735=>602,
-7736=>602,7737=>602,7738=>602,7739=>602,7740=>602,7741=>602,7742=>602,7743=>602,7744=>602,7745=>602,
-7746=>602,7747=>602,7748=>602,7749=>602,7750=>602,7751=>602,7752=>602,7753=>602,7754=>602,7755=>602,
-7756=>602,7757=>602,7764=>602,7765=>602,7766=>602,7767=>602,7768=>602,7769=>602,7770=>602,7771=>602,
-7772=>602,7773=>602,7774=>602,7775=>602,7776=>602,7777=>602,7778=>602,7779=>602,7784=>602,7785=>602,
-7786=>602,7787=>602,7788=>602,7789=>602,7790=>602,7791=>602,7792=>602,7793=>602,7794=>602,7795=>602,
-7796=>602,7797=>602,7798=>602,7799=>602,7800=>602,7801=>602,7804=>602,7805=>602,7806=>602,7807=>602,
-7808=>602,7809=>602,7810=>602,7811=>602,7812=>602,7813=>602,7814=>602,7815=>602,7816=>602,7817=>602,
-7818=>602,7819=>602,7820=>602,7821=>602,7822=>602,7823=>602,7824=>602,7825=>602,7826=>602,7827=>602,
-7828=>602,7829=>602,7830=>602,7831=>602,7832=>602,7833=>602,7835=>602,7839=>602,7840=>602,7841=>602,
-7852=>602,7853=>602,7856=>602,7857=>602,7862=>602,7863=>602,7864=>602,7865=>602,7868=>602,7869=>602,
-7878=>602,7879=>602,7882=>602,7883=>602,7884=>602,7885=>602,7896=>602,7897=>602,7898=>602,7899=>602,
-7900=>602,7901=>602,7904=>602,7905=>602,7906=>602,7907=>602,7908=>602,7909=>602,7912=>602,7913=>602,
-7914=>602,7915=>602,7918=>602,7919=>602,7920=>602,7921=>602,7922=>602,7923=>602,7924=>602,7925=>602,
-7928=>602,7929=>602,7936=>602,7937=>602,7938=>602,7939=>602,7940=>602,7941=>602,7942=>602,7943=>602,
-7944=>602,7945=>602,7946=>602,7947=>602,7948=>602,7949=>602,7950=>602,7951=>602,7952=>602,7953=>602,
-7954=>602,7955=>602,7956=>602,7957=>602,7960=>602,7961=>602,7962=>602,7963=>602,7964=>602,7965=>602,
-7968=>602,7969=>602,7970=>602,7971=>602,7972=>602,7973=>602,7974=>602,7975=>602,7976=>602,7977=>602,
-7978=>602,7979=>602,7980=>602,7981=>602,7982=>602,7983=>602,7984=>602,7985=>602,7986=>602,7987=>602,
-7988=>602,7989=>602,7990=>602,7991=>602,7992=>602,7993=>602,7994=>602,7995=>602,7996=>602,7997=>602,
-7998=>602,7999=>602,8000=>602,8001=>602,8002=>602,8003=>602,8004=>602,8005=>602,8008=>602,8009=>602,
-8010=>602,8011=>602,8012=>602,8013=>602,8016=>602,8017=>602,8018=>602,8019=>602,8020=>602,8021=>602,
-8022=>602,8023=>602,8025=>602,8027=>602,8029=>602,8031=>602,8032=>602,8033=>602,8034=>602,8035=>602,
-8036=>602,8037=>602,8038=>602,8039=>602,8040=>602,8041=>602,8042=>602,8043=>602,8044=>602,8045=>602,
-8046=>602,8047=>602,8048=>602,8049=>602,8050=>602,8051=>602,8052=>602,8053=>602,8054=>602,8055=>602,
-8056=>602,8057=>602,8058=>602,8059=>602,8060=>602,8061=>602,8064=>602,8065=>602,8066=>602,8067=>602,
-8068=>602,8069=>602,8070=>602,8071=>602,8072=>602,8073=>602,8074=>602,8075=>602,8076=>602,8077=>602,
-8078=>602,8079=>602,8080=>602,8081=>602,8082=>602,8083=>602,8084=>602,8085=>602,8086=>602,8087=>602,
-8088=>602,8089=>602,8090=>602,8091=>602,8092=>602,8093=>602,8094=>602,8095=>602,8096=>602,8097=>602,
-8098=>602,8099=>602,8100=>602,8101=>602,8102=>602,8103=>602,8104=>602,8105=>602,8106=>602,8107=>602,
-8108=>602,8109=>602,8110=>602,8111=>602,8112=>602,8113=>602,8114=>602,8115=>602,8116=>602,8118=>602,
-8119=>602,8120=>602,8121=>602,8122=>602,8123=>602,8124=>602,8125=>602,8126=>602,8127=>602,8128=>602,
-8129=>602,8130=>602,8131=>602,8132=>602,8134=>602,8135=>602,8136=>602,8137=>602,8138=>602,8139=>602,
-8140=>602,8141=>602,8142=>602,8143=>602,8144=>602,8145=>602,8146=>602,8147=>602,8150=>602,8151=>602,
-8152=>602,8153=>602,8154=>602,8155=>602,8157=>602,8158=>602,8159=>602,8160=>602,8161=>602,8162=>602,
-8163=>602,8164=>602,8165=>602,8166=>602,8167=>602,8168=>602,8169=>602,8170=>602,8171=>602,8172=>602,
-8173=>602,8174=>602,8175=>602,8178=>602,8179=>602,8180=>602,8182=>602,8183=>602,8184=>602,8185=>602,
-8186=>602,8187=>602,8188=>602,8189=>602,8190=>602,8192=>602,8193=>602,8194=>602,8195=>602,8196=>602,
-8197=>602,8198=>602,8199=>602,8200=>602,8201=>602,8202=>602,8208=>602,8209=>602,8210=>602,8213=>602,
-8215=>602,8219=>602,8223=>602,8227=>602,8239=>602,8241=>602,8242=>602,8243=>602,8244=>602,8245=>602,
-8246=>602,8247=>602,8252=>602,8253=>602,8254=>602,8261=>602,8262=>602,8263=>602,8264=>602,8265=>602,
-8287=>602,8304=>602,8305=>602,8308=>602,8309=>602,8310=>602,8311=>602,8312=>602,8313=>602,8314=>602,
-8315=>602,8316=>602,8317=>602,8318=>602,8319=>602,8320=>602,8321=>602,8322=>602,8323=>602,8324=>602,
-8325=>602,8326=>602,8327=>602,8328=>602,8329=>602,8330=>602,8331=>602,8332=>602,8333=>602,8334=>602,
-8336=>602,8337=>602,8338=>602,8339=>602,8340=>602,8352=>602,8353=>602,8354=>602,8355=>602,8356=>602,
-8357=>602,8358=>602,8359=>602,8360=>602,8361=>602,8362=>602,8363=>602,8365=>602,8366=>602,8367=>602,
-8368=>602,8369=>602,8370=>602,8371=>602,8372=>602,8373=>602,8450=>602,8453=>602,8461=>602,8462=>602,
-8463=>602,8469=>602,8470=>602,8471=>602,8473=>602,8474=>602,8477=>602,8484=>602,8486=>602,8490=>602,
-8491=>602,8494=>602,8531=>602,8532=>602,8533=>602,8534=>602,8535=>602,8536=>602,8537=>602,8538=>602,
-8539=>602,8540=>602,8541=>602,8542=>602,8543=>602,8592=>602,8593=>602,8594=>602,8595=>602,8596=>602,
-8597=>602,8598=>602,8599=>602,8600=>602,8601=>602,8602=>602,8603=>602,8604=>602,8605=>602,8606=>602,
-8607=>602,8608=>602,8609=>602,8610=>602,8611=>602,8612=>602,8613=>602,8614=>602,8615=>602,8616=>602,
-8617=>602,8618=>602,8619=>602,8620=>602,8621=>602,8622=>602,8623=>602,8624=>602,8625=>602,8626=>602,
-8627=>602,8628=>602,8629=>602,8630=>602,8631=>602,8632=>602,8633=>602,8634=>602,8635=>602,8636=>602,
-8637=>602,8638=>602,8639=>602,8640=>602,8641=>602,8642=>602,8643=>602,8644=>602,8645=>602,8646=>602,
-8647=>602,8648=>602,8649=>602,8650=>602,8651=>602,8652=>602,8653=>602,8654=>602,8655=>602,8656=>602,
-8657=>602,8658=>602,8659=>602,8660=>602,8661=>602,8662=>602,8663=>602,8664=>602,8665=>602,8666=>602,
-8667=>602,8668=>602,8669=>602,8670=>602,8671=>602,8672=>602,8673=>602,8674=>602,8675=>602,8676=>602,
-8677=>602,8678=>602,8679=>602,8680=>602,8681=>602,8682=>602,8683=>602,8684=>602,8685=>602,8686=>602,
-8687=>602,8688=>602,8689=>602,8690=>602,8691=>602,8692=>602,8693=>602,8694=>602,8695=>602,8696=>602,
-8697=>602,8698=>602,8699=>602,8700=>602,8701=>602,8702=>602,8703=>602,8704=>602,8705=>602,8706=>602,
-8707=>602,8708=>602,8709=>602,8710=>602,8711=>602,8712=>602,8713=>602,8714=>602,8715=>602,8716=>602,
-8717=>602,8719=>602,8721=>602,8722=>602,8723=>602,8725=>602,8727=>602,8728=>602,8729=>602,8730=>602,
-8731=>602,8732=>602,8733=>602,8734=>602,8735=>602,8736=>602,8743=>602,8744=>602,8745=>602,8746=>602,
-8747=>602,8748=>602,8749=>602,8760=>602,8761=>602,8762=>602,8763=>602,8764=>602,8765=>602,8769=>602,
-8770=>602,8771=>602,8772=>602,8773=>602,8774=>602,8775=>602,8776=>602,8777=>602,8778=>602,8779=>602,
-8780=>602,8781=>602,8782=>602,8783=>602,8784=>602,8785=>602,8786=>602,8787=>602,8788=>602,8789=>602,
-8790=>602,8791=>602,8792=>602,8793=>602,8794=>602,8795=>602,8796=>602,8797=>602,8798=>602,8799=>602,
-8800=>602,8801=>602,8802=>602,8803=>602,8804=>602,8805=>602,8806=>602,8807=>602,8808=>602,8809=>602,
-8813=>602,8814=>602,8815=>602,8816=>602,8817=>602,8818=>602,8819=>602,8820=>602,8821=>602,8822=>602,
-8823=>602,8824=>602,8825=>602,8826=>602,8827=>602,8828=>602,8829=>602,8830=>602,8831=>602,8832=>602,
-8833=>602,8834=>602,8835=>602,8836=>602,8837=>602,8838=>602,8839=>602,8840=>602,8841=>602,8842=>602,
-8843=>602,8847=>602,8848=>602,8849=>602,8850=>602,8853=>602,8854=>602,8855=>602,8856=>602,8857=>602,
-8858=>602,8859=>602,8860=>602,8861=>602,8862=>602,8863=>602,8864=>602,8865=>602,8901=>602,8902=>602,
-8909=>602,8922=>602,8923=>602,8924=>602,8925=>602,8926=>602,8927=>602,8928=>602,8929=>602,8930=>602,
-8931=>602,8932=>602,8933=>602,8934=>602,8935=>602,8936=>602,8937=>602,8943=>602,8960=>602,8961=>602,
-8962=>602,8963=>602,8964=>602,8965=>602,8966=>602,8968=>602,8969=>602,8970=>602,8971=>602,8972=>602,
-8973=>602,8974=>602,8975=>602,8976=>602,8977=>602,8978=>602,8979=>602,8980=>602,8981=>602,8984=>602,
-8985=>602,8988=>602,8989=>602,8990=>602,8991=>602,8992=>602,8993=>602,8997=>602,8998=>602,8999=>602,
-9000=>602,9003=>602,9013=>602,9015=>602,9016=>602,9017=>602,9018=>602,9019=>602,9020=>602,9021=>602,
-9022=>602,9025=>602,9026=>602,9027=>602,9028=>602,9031=>602,9032=>602,9033=>602,9035=>602,9036=>602,
-9037=>602,9040=>602,9042=>602,9043=>602,9044=>602,9047=>602,9048=>602,9049=>602,9050=>602,9051=>602,
-9052=>602,9054=>602,9055=>602,9056=>602,9059=>602,9060=>602,9061=>602,9064=>602,9065=>602,9067=>602,
-9068=>602,9069=>602,9070=>602,9071=>602,9072=>602,9075=>602,9076=>602,9077=>602,9078=>602,9079=>602,
-9080=>602,9081=>602,9082=>602,9085=>602,9088=>602,9089=>602,9090=>602,9091=>602,9096=>602,9097=>602,
-9098=>602,9099=>602,9109=>602,9115=>602,9116=>602,9117=>602,9118=>602,9119=>602,9120=>602,9121=>602,
-9122=>602,9123=>602,9124=>602,9125=>602,9126=>602,9127=>602,9128=>602,9129=>602,9130=>602,9131=>602,
-9132=>602,9133=>602,9134=>602,9166=>602,9167=>602,9251=>602,9600=>602,9601=>602,9602=>602,9603=>602,
-9604=>602,9605=>602,9606=>602,9607=>602,9608=>602,9609=>602,9610=>602,9611=>602,9612=>602,9613=>602,
-9614=>602,9615=>602,9616=>602,9617=>602,9618=>602,9619=>602,9620=>602,9621=>602,9622=>602,9623=>602,
-9624=>602,9625=>602,9626=>602,9627=>602,9628=>602,9629=>602,9630=>602,9631=>602,9632=>602,9633=>602,
-9634=>602,9635=>602,9636=>602,9637=>602,9638=>602,9639=>602,9640=>602,9641=>602,9642=>602,9643=>602,
-9644=>602,9645=>602,9646=>602,9647=>602,9648=>602,9649=>602,9650=>602,9651=>602,9652=>602,9653=>602,
-9654=>602,9655=>602,9656=>602,9657=>602,9658=>602,9659=>602,9660=>602,9661=>602,9662=>602,9663=>602,
-9664=>602,9665=>602,9666=>602,9667=>602,9668=>602,9669=>602,9670=>602,9671=>602,9672=>602,9673=>602,
-9674=>602,9675=>602,9676=>602,9677=>602,9678=>602,9679=>602,9680=>602,9681=>602,9682=>602,9683=>602,
-9684=>602,9685=>602,9686=>602,9687=>602,9688=>602,9689=>602,9690=>602,9691=>602,9692=>602,9693=>602,
-9694=>602,9695=>602,9696=>602,9697=>602,9698=>602,9699=>602,9700=>602,9701=>602,9702=>602,9703=>602,
-9704=>602,9705=>602,9706=>602,9707=>602,9708=>602,9709=>602,9710=>602,9711=>602,9712=>602,9713=>602,
-9714=>602,9715=>602,9716=>602,9717=>602,9718=>602,9719=>602,9720=>602,9721=>602,9722=>602,9723=>602,
-9724=>602,9725=>602,9726=>602,9727=>602,9728=>602,9729=>602,9730=>602,9731=>602,9732=>602,9733=>602,
-9734=>602,9735=>602,9736=>602,9737=>602,9738=>602,9739=>602,9740=>602,9741=>602,9742=>602,9743=>602,
-9744=>602,9745=>602,9746=>602,9747=>602,9748=>602,9749=>602,9750=>602,9751=>602,9752=>602,9753=>602,
-9754=>602,9755=>602,9756=>602,9757=>602,9758=>602,9759=>602,9760=>602,9761=>602,9762=>602,9763=>602,
-9764=>602,9765=>602,9766=>602,9767=>602,9768=>602,9769=>602,9770=>602,9771=>602,9772=>602,9773=>602,
-9774=>602,9775=>602,9784=>602,9785=>602,9786=>602,9787=>602,9788=>602,9789=>602,9790=>602,9791=>602,
-9792=>602,9793=>602,9794=>602,9795=>602,9796=>602,9797=>602,9798=>602,9799=>602,9800=>602,9801=>602,
-9802=>602,9803=>602,9804=>602,9805=>602,9806=>602,9807=>602,9808=>602,9809=>602,9810=>602,9811=>602,
-9812=>602,9813=>602,9814=>602,9815=>602,9816=>602,9817=>602,9818=>602,9819=>602,9820=>602,9821=>602,
-9822=>602,9823=>602,9824=>602,9825=>602,9826=>602,9827=>602,9828=>602,9829=>602,9830=>602,9831=>602,
-9832=>602,9833=>602,9834=>602,9835=>602,9836=>602,9837=>602,9838=>602,9839=>602,9840=>602,9841=>602,
-9842=>602,9843=>602,9844=>602,9845=>602,9846=>602,9847=>602,9848=>602,9849=>602,9850=>602,9851=>602,
-9852=>602,9853=>602,9854=>602,9855=>602,9856=>602,9857=>602,9858=>602,9859=>602,9860=>602,9861=>602,
-9862=>602,9863=>602,9864=>602,9865=>602,9866=>602,9867=>602,9872=>602,9873=>602,9874=>602,9875=>602,
-9876=>602,9877=>602,9878=>602,9879=>602,9880=>602,9881=>602,9882=>602,9883=>602,9884=>602,9888=>602,
-9889=>602,9904=>602,9905=>602,9985=>602,9986=>602,9987=>602,9988=>602,9990=>602,9991=>602,9992=>602,
-9993=>602,9996=>602,9997=>602,9998=>602,9999=>602,10000=>602,10001=>602,10002=>602,10003=>602,10004=>602,
-10005=>602,10006=>602,10007=>602,10008=>602,10009=>602,10010=>602,10011=>602,10012=>602,10013=>602,10014=>602,
-10015=>602,10016=>602,10017=>602,10018=>602,10019=>602,10020=>602,10021=>602,10022=>602,10023=>602,10025=>602,
-10026=>602,10027=>602,10028=>602,10029=>602,10030=>602,10031=>602,10032=>602,10033=>602,10034=>602,10035=>602,
-10036=>602,10037=>602,10038=>602,10039=>602,10040=>602,10041=>602,10042=>602,10043=>602,10044=>602,10045=>602,
-10046=>602,10047=>602,10048=>602,10049=>602,10050=>602,10051=>602,10052=>602,10053=>602,10054=>602,10055=>602,
-10056=>602,10057=>602,10058=>602,10059=>602,10061=>602,10063=>602,10064=>602,10065=>602,10066=>602,10070=>602,
-10072=>602,10073=>602,10074=>602,10075=>602,10076=>602,10077=>602,10078=>602,10081=>602,10082=>602,10083=>602,
-10084=>602,10085=>602,10086=>602,10087=>602,10088=>602,10089=>602,10090=>602,10091=>602,10092=>602,10093=>602,
-10094=>602,10095=>602,10096=>602,10097=>602,10098=>602,10099=>602,10100=>602,10101=>602,10132=>602,10136=>602,
-10137=>602,10138=>602,10139=>602,10140=>602,10141=>602,10142=>602,10143=>602,10144=>602,10145=>602,10146=>602,
-10147=>602,10148=>602,10149=>602,10150=>602,10151=>602,10152=>602,10153=>602,10154=>602,10155=>602,10156=>602,
-10157=>602,10158=>602,10159=>602,10161=>602,10162=>602,10163=>602,10164=>602,10165=>602,10166=>602,10167=>602,
-10168=>602,10169=>602,10170=>602,10171=>602,10172=>602,10173=>602,10174=>602,10175=>602,10181=>602,10182=>602,
-10208=>602,10216=>602,10217=>602,10731=>602,10746=>602,10747=>602,10799=>602,11026=>602,11027=>602,11028=>602,
-11029=>602,11030=>602,11031=>602,11032=>602,11033=>602,11034=>602,11364=>602,11374=>602,11375=>602,11381=>602,
-11382=>602,11383=>602,11385=>602,11386=>602,11388=>602,11389=>602,11800=>602,11810=>602,11811=>602,11812=>602,
-11813=>602,11822=>602,42760=>602,42761=>602,42762=>602,42763=>602,42764=>602,42765=>602,42766=>602,42767=>602,
-42768=>602,42769=>602,42770=>602,42771=>602,42772=>602,42773=>602,42774=>602,42779=>602,42780=>602,42781=>602,
-42782=>602,42783=>602,42790=>602,42791=>602,42889=>602,42890=>602,42891=>602,42892=>602,63173=>602,64257=>602,
-64258=>602,64338=>602,64339=>602,64340=>602,64341=>602,64342=>602,64343=>602,64344=>602,64345=>602,64346=>602,
-64347=>602,64348=>602,64349=>602,64350=>602,64351=>602,64352=>602,64353=>602,64354=>602,64355=>602,64356=>602,
-64357=>602,64358=>602,64359=>602,64360=>602,64361=>602,64362=>602,64363=>602,64364=>602,64365=>602,64366=>602,
-64367=>602,64368=>602,64369=>602,64370=>602,64371=>602,64372=>602,64373=>602,64374=>602,64375=>602,64376=>602,
-64377=>602,64378=>602,64379=>602,64380=>602,64381=>602,64382=>602,64383=>602,64384=>602,64385=>602,64394=>602,
-64395=>602,64396=>602,64397=>602,64398=>602,64399=>602,64400=>602,64401=>602,64402=>602,64403=>602,64404=>602,
-64405=>602,64414=>602,64415=>602,64426=>602,64427=>602,64428=>602,64429=>602,64488=>602,64489=>602,64508=>602,
-64509=>602,64510=>602,64511=>602,65136=>602,65137=>602,65138=>602,65139=>602,65140=>602,65142=>602,65143=>602,
-65144=>602,65145=>602,65146=>602,65147=>602,65148=>602,65149=>602,65150=>602,65151=>602,65152=>602,65153=>602,
-65154=>602,65155=>602,65156=>602,65157=>602,65158=>602,65159=>602,65160=>602,65161=>602,65162=>602,65163=>602,
-65164=>602,65165=>602,65166=>602,65167=>602,65168=>602,65169=>602,65170=>602,65171=>602,65172=>602,65173=>602,
-65174=>602,65175=>602,65176=>602,65177=>602,65178=>602,65179=>602,65180=>602,65181=>602,65182=>602,65183=>602,
-65184=>602,65185=>602,65186=>602,65187=>602,65188=>602,65189=>602,65190=>602,65191=>602,65192=>602,65193=>602,
-65194=>602,65195=>602,65196=>602,65197=>602,65198=>602,65199=>602,65200=>602,65201=>602,65202=>602,65203=>602,
-65204=>602,65205=>602,65206=>602,65207=>602,65208=>602,65209=>602,65210=>602,65211=>602,65212=>602,65213=>602,
-65214=>602,65215=>602,65216=>602,65217=>602,65218=>602,65219=>602,65220=>602,65221=>602,65222=>602,65223=>602,
-65224=>602,65225=>602,65226=>602,65227=>602,65228=>602,65229=>602,65230=>602,65231=>602,65232=>602,65233=>602,
-65234=>602,65235=>602,65236=>602,65237=>602,65238=>602,65239=>602,65240=>602,65241=>602,65242=>602,65243=>602,
-65244=>602,65245=>602,65246=>602,65247=>602,65248=>602,65249=>602,65250=>602,65251=>602,65252=>602,65253=>602,
-65254=>602,65255=>602,65256=>602,65257=>602,65258=>602,65259=>602,65260=>602,65261=>602,65262=>602,65263=>602,
-65264=>602,65265=>602,65266=>602,65267=>602,65268=>602,65269=>602,65270=>602,65271=>602,65272=>602,65273=>602,
-65274=>602,65275=>602,65276=>602,65279=>602,65529=>602,65530=>602,65531=>602,65532=>602,65533=>602);
-$enc='';
-$diff='';
-$file='dejavusansmonob.z';
-$ctg='dejavusansmonob.ctg.z';
-$originalsize=301928;
-?>
\ No newline at end of file
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusansmonob.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusansmonob.z
deleted file mode 100644
index e98cacb2..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusansmonob.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusansmonobi.ctg.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusansmonobi.ctg.z
deleted file mode 100644
index 42e7503e..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusansmonobi.ctg.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusansmonobi.php b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusansmonobi.php
deleted file mode 100644
index dabdcda6..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusansmonobi.php
+++ /dev/null
@@ -1,250 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='DejaVuSansMono-BoldOblique';
-$desc=array('Ascent'=>928,'Descent'=>-236,'CapHeight'=>-70,'Flags'=>97,'FontBBox'=>'[-428 -394 808 1053]','ItalicAngle'=>-11,'StemV'=>120,'MissingWidth'=>602);
-$up=-63;
-$ut=44;
-$dw=602;
-$cw=array(
-0=>602,32=>602,33=>602,34=>602,35=>602,36=>602,37=>602,38=>602,39=>602,40=>602,
-41=>602,42=>602,43=>602,44=>602,45=>602,46=>602,47=>602,48=>602,49=>602,50=>602,
-51=>602,52=>602,53=>602,54=>602,55=>602,56=>602,57=>602,58=>602,59=>602,60=>602,
-61=>602,62=>602,63=>602,64=>602,65=>602,66=>602,67=>602,68=>602,69=>602,70=>602,
-71=>602,72=>602,73=>602,74=>602,75=>602,76=>602,77=>602,78=>602,79=>602,80=>602,
-81=>602,82=>602,83=>602,84=>602,85=>602,86=>602,87=>602,88=>602,89=>602,90=>602,
-91=>602,92=>602,93=>602,94=>602,95=>602,96=>602,97=>602,98=>602,99=>602,100=>602,
-101=>602,102=>602,103=>602,104=>602,105=>602,106=>602,107=>602,108=>602,109=>602,110=>602,
-111=>602,112=>602,113=>602,114=>602,115=>602,116=>602,117=>602,118=>602,119=>602,120=>602,
-121=>602,122=>602,123=>602,124=>602,125=>602,126=>602,8364=>602,8218=>602,402=>602,8222=>602,
-8230=>602,8224=>602,8225=>602,710=>602,8240=>602,352=>602,8249=>602,338=>602,381=>602,8216=>602,
-8217=>602,8220=>602,8221=>602,8226=>602,8211=>602,8212=>602,732=>602,8482=>602,353=>602,8250=>602,
-339=>602,382=>602,376=>602,160=>602,161=>602,162=>602,163=>602,164=>602,165=>602,166=>602,
-167=>602,168=>602,169=>602,170=>602,171=>602,172=>602,173=>602,174=>602,175=>602,176=>602,
-177=>602,178=>602,179=>602,180=>602,181=>602,182=>602,183=>602,184=>602,185=>602,186=>602,
-187=>602,188=>602,189=>602,190=>602,191=>602,192=>602,193=>602,194=>602,195=>602,196=>602,
-197=>602,198=>602,199=>602,200=>602,201=>602,202=>602,203=>602,204=>602,205=>602,206=>602,
-207=>602,208=>602,209=>602,210=>602,211=>602,212=>602,213=>602,214=>602,215=>602,216=>602,
-217=>602,218=>602,219=>602,220=>602,221=>602,222=>602,223=>602,224=>602,225=>602,226=>602,
-227=>602,228=>602,229=>602,230=>602,231=>602,232=>602,233=>602,234=>602,235=>602,236=>602,
-237=>602,238=>602,239=>602,240=>602,241=>602,242=>602,243=>602,244=>602,245=>602,246=>602,
-247=>602,248=>602,249=>602,250=>602,251=>602,252=>602,253=>602,254=>602,255=>602,256=>602,
-257=>602,258=>602,259=>602,260=>602,261=>602,262=>602,263=>602,264=>602,265=>602,266=>602,
-267=>602,268=>602,269=>602,270=>602,271=>602,272=>602,273=>602,274=>602,275=>602,276=>602,
-277=>602,278=>602,279=>602,280=>602,281=>602,282=>602,283=>602,284=>602,285=>602,286=>602,
-287=>602,288=>602,289=>602,290=>602,291=>602,292=>602,293=>602,294=>602,295=>602,296=>602,
-297=>602,298=>602,299=>602,300=>602,301=>602,302=>602,303=>602,304=>602,305=>602,306=>602,
-307=>602,308=>602,309=>602,310=>602,311=>602,312=>602,313=>602,314=>602,315=>602,316=>602,
-317=>602,318=>602,319=>602,320=>602,321=>602,322=>602,323=>602,324=>602,325=>602,326=>602,
-327=>602,328=>602,329=>602,330=>602,331=>602,332=>602,333=>602,334=>602,335=>602,336=>602,
-337=>602,340=>602,341=>602,342=>602,343=>602,344=>602,345=>602,346=>602,347=>602,348=>602,
-349=>602,350=>602,351=>602,354=>602,355=>602,356=>602,357=>602,358=>602,359=>602,360=>602,
-361=>602,362=>602,363=>602,364=>602,365=>602,366=>602,367=>602,368=>602,369=>602,370=>602,
-371=>602,372=>602,373=>602,374=>602,375=>602,377=>602,378=>602,379=>602,380=>602,383=>602,
-384=>602,385=>602,386=>602,387=>602,388=>602,389=>602,390=>602,391=>602,392=>602,393=>602,
-394=>602,395=>602,396=>602,397=>602,398=>602,399=>602,400=>602,401=>602,403=>602,404=>602,
-405=>602,406=>602,407=>602,408=>602,409=>602,410=>602,411=>602,412=>602,413=>602,414=>602,
-415=>602,416=>602,417=>602,418=>602,419=>602,420=>602,421=>602,422=>602,423=>602,424=>602,
-425=>602,426=>602,427=>602,428=>602,429=>602,430=>602,431=>602,432=>602,433=>602,434=>602,
-435=>602,436=>602,437=>602,438=>602,439=>602,440=>602,441=>602,442=>602,443=>602,444=>602,
-445=>602,446=>602,447=>602,448=>602,449=>602,450=>602,451=>602,461=>602,462=>602,463=>602,
-464=>602,465=>602,466=>602,467=>602,468=>602,469=>602,470=>602,471=>602,472=>602,473=>602,
-474=>602,475=>602,476=>602,477=>602,478=>602,479=>602,480=>602,481=>602,482=>602,483=>602,
-486=>602,487=>602,488=>602,489=>602,490=>602,491=>602,492=>602,493=>602,494=>602,495=>602,
-500=>602,501=>602,502=>602,504=>602,505=>602,508=>602,509=>602,510=>602,511=>602,512=>602,
-513=>602,514=>602,515=>602,516=>602,517=>602,518=>602,519=>602,520=>602,521=>602,522=>602,
-523=>602,524=>602,525=>602,526=>602,527=>602,528=>602,529=>602,530=>602,531=>602,532=>602,
-533=>602,534=>602,535=>602,536=>602,537=>602,538=>602,539=>602,540=>602,541=>602,542=>602,
-543=>602,545=>602,548=>602,549=>602,550=>602,551=>602,552=>602,553=>602,554=>602,555=>602,
-556=>602,557=>602,558=>602,559=>602,560=>602,561=>602,562=>602,563=>602,564=>602,565=>602,
-566=>602,567=>602,568=>602,569=>602,570=>602,571=>602,572=>602,573=>602,574=>602,575=>602,
-576=>602,577=>602,580=>602,581=>602,588=>602,589=>602,592=>602,593=>602,594=>602,595=>602,
-596=>602,597=>602,598=>602,599=>602,600=>602,601=>602,602=>602,603=>602,604=>602,605=>602,
-606=>602,607=>602,608=>602,609=>602,610=>602,611=>602,612=>602,613=>602,614=>602,615=>602,
-616=>602,617=>602,618=>602,619=>602,620=>602,621=>602,622=>602,623=>602,624=>602,625=>602,
-626=>602,627=>602,628=>602,629=>602,630=>602,631=>602,632=>602,633=>602,634=>602,635=>602,
-636=>602,637=>602,638=>602,639=>602,640=>602,641=>602,642=>602,643=>602,644=>602,645=>602,
-646=>602,647=>602,648=>602,649=>602,650=>602,651=>602,652=>602,653=>602,654=>602,655=>602,
-656=>602,657=>602,658=>602,659=>602,660=>602,661=>602,662=>602,663=>602,664=>602,665=>602,
-666=>602,667=>602,668=>602,669=>602,670=>602,671=>602,672=>602,673=>602,674=>602,675=>602,
-676=>602,677=>602,678=>602,679=>602,680=>602,681=>602,682=>602,683=>602,684=>602,685=>602,
-686=>602,687=>602,688=>602,689=>602,690=>602,691=>602,692=>602,693=>602,694=>602,695=>602,
-696=>602,697=>602,699=>602,700=>602,701=>602,702=>602,703=>602,704=>602,705=>602,711=>602,
-712=>602,713=>602,716=>602,717=>602,720=>602,721=>602,722=>602,723=>602,726=>602,727=>602,
-728=>602,729=>602,730=>602,731=>602,733=>602,734=>602,736=>602,737=>602,738=>602,739=>602,
-740=>602,741=>602,742=>602,743=>602,744=>602,745=>602,750=>602,755=>602,768=>602,769=>602,
-770=>602,771=>602,772=>602,773=>602,774=>602,775=>602,776=>602,777=>602,778=>602,779=>602,
-780=>602,781=>602,782=>602,783=>602,784=>602,785=>602,786=>602,787=>602,788=>602,789=>602,
-790=>602,791=>602,792=>602,793=>602,794=>602,795=>602,796=>602,797=>602,798=>602,799=>602,
-800=>602,801=>602,802=>602,803=>602,804=>602,805=>602,806=>602,807=>602,808=>602,809=>602,
-810=>602,811=>602,812=>602,813=>602,814=>602,815=>602,816=>602,817=>602,818=>602,819=>602,
-820=>602,821=>602,822=>602,823=>602,824=>602,825=>602,826=>602,827=>602,828=>602,829=>602,
-830=>602,831=>602,835=>602,856=>602,865=>602,884=>602,885=>602,890=>602,894=>602,900=>602,
-901=>602,902=>602,903=>602,904=>602,905=>602,906=>602,908=>602,910=>602,911=>602,912=>602,
-913=>602,914=>602,915=>602,916=>602,917=>602,918=>602,919=>602,920=>602,921=>602,922=>602,
-923=>602,924=>602,925=>602,926=>602,927=>602,928=>602,929=>602,931=>602,932=>602,933=>602,
-934=>602,935=>602,936=>602,937=>602,938=>602,939=>602,940=>602,941=>602,942=>602,943=>602,
-944=>602,945=>602,946=>602,947=>602,948=>602,949=>602,950=>602,951=>602,952=>602,953=>602,
-954=>602,955=>602,956=>602,957=>602,958=>602,959=>602,960=>602,961=>602,962=>602,963=>602,
-964=>602,965=>602,966=>602,967=>602,968=>602,969=>602,970=>602,971=>602,972=>602,973=>602,
-974=>602,976=>602,977=>602,978=>602,979=>602,980=>602,981=>602,982=>602,983=>602,984=>602,
-985=>602,986=>602,987=>602,988=>602,989=>602,990=>602,991=>602,992=>602,993=>602,1008=>602,
-1009=>602,1010=>602,1011=>602,1012=>602,1013=>602,1014=>602,1015=>602,1016=>602,1017=>602,1018=>602,
-1019=>602,1020=>602,1021=>602,1022=>602,1023=>602,1024=>602,1025=>602,1026=>602,1027=>602,1028=>602,
-1029=>602,1030=>602,1031=>602,1032=>602,1033=>602,1034=>602,1035=>602,1036=>602,1037=>602,1038=>602,
-1039=>602,1040=>602,1041=>602,1042=>602,1043=>602,1044=>602,1045=>602,1046=>602,1047=>602,1048=>602,
-1049=>602,1050=>602,1051=>602,1052=>602,1053=>602,1054=>602,1055=>602,1056=>602,1057=>602,1058=>602,
-1059=>602,1060=>602,1061=>602,1062=>602,1063=>602,1064=>602,1065=>602,1066=>602,1067=>602,1068=>602,
-1069=>602,1070=>602,1071=>602,1072=>602,1073=>602,1074=>602,1075=>602,1076=>602,1077=>602,1078=>602,
-1079=>602,1080=>602,1081=>602,1082=>602,1083=>602,1084=>602,1085=>602,1086=>602,1087=>602,1088=>602,
-1089=>602,1090=>602,1091=>602,1092=>602,1093=>602,1094=>602,1095=>602,1096=>602,1097=>602,1098=>602,
-1099=>602,1100=>602,1101=>602,1102=>602,1103=>602,1104=>602,1105=>602,1106=>602,1107=>602,1108=>602,
-1109=>602,1110=>602,1111=>602,1112=>602,1113=>602,1114=>602,1115=>602,1116=>602,1117=>602,1118=>602,
-1119=>602,1122=>602,1123=>602,1138=>602,1139=>602,1168=>602,1169=>602,1170=>602,1171=>602,1172=>602,
-1173=>602,1174=>602,1175=>602,1176=>602,1177=>602,1178=>602,1179=>602,1186=>602,1187=>602,1194=>602,
-1195=>602,1196=>602,1197=>602,1198=>602,1199=>602,1200=>602,1201=>602,1202=>602,1203=>602,1210=>602,
-1211=>602,1216=>602,1217=>602,1218=>602,1219=>602,1220=>602,1223=>602,1224=>602,1227=>602,1228=>602,
-1231=>602,1232=>602,1233=>602,1234=>602,1235=>602,1236=>602,1237=>602,1238=>602,1239=>602,1240=>602,
-1241=>602,1242=>602,1243=>602,1244=>602,1245=>602,1246=>602,1247=>602,1248=>602,1249=>602,1250=>602,
-1251=>602,1252=>602,1253=>602,1254=>602,1255=>602,1256=>602,1257=>602,1258=>602,1259=>602,1260=>602,
-1261=>602,1262=>602,1263=>602,1264=>602,1265=>602,1266=>602,1267=>602,1268=>602,1269=>602,1270=>602,
-1271=>602,1272=>602,1273=>602,1296=>602,1297=>602,1306=>602,1307=>602,1308=>602,1309=>602,3713=>602,
-3714=>602,3716=>602,3719=>602,3720=>602,3722=>602,3725=>602,3732=>602,3733=>602,3734=>602,3735=>602,
-3737=>602,3738=>602,3739=>602,3740=>602,3741=>602,3742=>602,3743=>602,3745=>602,3746=>602,3747=>602,
-3749=>602,3751=>602,3754=>602,3755=>602,3757=>602,3758=>602,3759=>602,3760=>602,3761=>602,3762=>602,
-3763=>602,3764=>602,3765=>602,3766=>602,3767=>602,3768=>602,3769=>602,3771=>602,3772=>602,3784=>602,
-3785=>602,3786=>602,3787=>602,3788=>602,3789=>602,4304=>602,4305=>602,4306=>602,4307=>602,4308=>602,
-4309=>602,4310=>602,4311=>602,4312=>602,4313=>602,4314=>602,4315=>602,4316=>602,4317=>602,4318=>602,
-4319=>602,4320=>602,4321=>602,4322=>602,4323=>602,4324=>602,4325=>602,4326=>602,4327=>602,4328=>602,
-4329=>602,4330=>602,4331=>602,4332=>602,4333=>602,4334=>602,4335=>602,4336=>602,4337=>602,4338=>602,
-4339=>602,4340=>602,4341=>602,4342=>602,4343=>602,4344=>602,4345=>602,4346=>602,4347=>602,4348=>602,
-7426=>602,7432=>602,7433=>602,7444=>602,7446=>602,7447=>602,7453=>602,7454=>602,7455=>602,7468=>602,
-7469=>602,7470=>602,7472=>602,7473=>602,7474=>602,7475=>602,7476=>602,7477=>602,7478=>602,7479=>602,
-7480=>602,7481=>602,7482=>602,7483=>602,7484=>602,7486=>602,7487=>602,7488=>602,7489=>602,7490=>602,
-7491=>602,7492=>602,7493=>602,7494=>602,7495=>602,7496=>602,7497=>602,7498=>602,7499=>602,7500=>602,
-7501=>602,7502=>602,7503=>602,7504=>602,7505=>602,7506=>602,7507=>602,7508=>602,7509=>602,7510=>602,
-7511=>602,7512=>602,7513=>602,7514=>602,7515=>602,7522=>602,7523=>602,7524=>602,7525=>602,7543=>602,
-7544=>602,7547=>602,7557=>602,7579=>602,7580=>602,7581=>602,7582=>602,7583=>602,7584=>602,7585=>602,
-7586=>602,7587=>602,7588=>602,7589=>602,7590=>602,7591=>602,7592=>602,7593=>602,7594=>602,7595=>602,
-7596=>602,7597=>602,7598=>602,7599=>602,7600=>602,7601=>602,7602=>602,7603=>602,7604=>602,7605=>602,
-7606=>602,7607=>602,7609=>602,7610=>602,7611=>602,7612=>602,7613=>602,7614=>602,7615=>602,7680=>602,
-7681=>602,7682=>602,7683=>602,7684=>602,7685=>602,7686=>602,7687=>602,7688=>602,7689=>602,7690=>602,
-7691=>602,7692=>602,7693=>602,7694=>602,7695=>602,7696=>602,7697=>602,7698=>602,7699=>602,7704=>602,
-7705=>602,7706=>602,7707=>602,7708=>602,7709=>602,7710=>602,7711=>602,7712=>602,7713=>602,7714=>602,
-7715=>602,7716=>602,7717=>602,7718=>602,7719=>602,7720=>602,7721=>602,7722=>602,7723=>602,7724=>602,
-7725=>602,7728=>602,7729=>602,7730=>602,7731=>602,7732=>602,7733=>602,7734=>602,7735=>602,7736=>602,
-7737=>602,7738=>602,7739=>602,7740=>602,7741=>602,7742=>602,7743=>602,7744=>602,7745=>602,7746=>602,
-7747=>602,7748=>602,7749=>602,7750=>602,7751=>602,7752=>602,7753=>602,7754=>602,7755=>602,7756=>602,
-7757=>602,7764=>602,7765=>602,7766=>602,7767=>602,7768=>602,7769=>602,7770=>602,7771=>602,7772=>602,
-7773=>602,7774=>602,7775=>602,7776=>602,7777=>602,7778=>602,7779=>602,7784=>602,7785=>602,7786=>602,
-7787=>602,7788=>602,7789=>602,7790=>602,7791=>602,7792=>602,7793=>602,7794=>602,7795=>602,7796=>602,
-7797=>602,7798=>602,7799=>602,7800=>602,7801=>602,7804=>602,7805=>602,7806=>602,7807=>602,7808=>602,
-7809=>602,7810=>602,7811=>602,7812=>602,7813=>602,7814=>602,7815=>602,7816=>602,7817=>602,7818=>602,
-7819=>602,7820=>602,7821=>602,7822=>602,7823=>602,7824=>602,7825=>602,7826=>602,7827=>602,7828=>602,
-7829=>602,7830=>602,7831=>602,7832=>602,7833=>602,7835=>602,7839=>602,7840=>602,7841=>602,7852=>602,
-7853=>602,7856=>602,7857=>602,7862=>602,7863=>602,7864=>602,7865=>602,7868=>602,7869=>602,7878=>602,
-7879=>602,7882=>602,7883=>602,7884=>602,7885=>602,7896=>602,7897=>602,7898=>602,7899=>602,7900=>602,
-7901=>602,7904=>602,7905=>602,7906=>602,7907=>602,7908=>602,7909=>602,7912=>602,7913=>602,7914=>602,
-7915=>602,7918=>602,7919=>602,7920=>602,7921=>602,7922=>602,7923=>602,7924=>602,7925=>602,7928=>602,
-7929=>602,7936=>602,7937=>602,7938=>602,7939=>602,7940=>602,7941=>602,7942=>602,7943=>602,7944=>602,
-7945=>602,7946=>602,7947=>602,7948=>602,7949=>602,7950=>602,7951=>602,7952=>602,7953=>602,7954=>602,
-7955=>602,7956=>602,7957=>602,7960=>602,7961=>602,7962=>602,7963=>602,7964=>602,7965=>602,7968=>602,
-7969=>602,7970=>602,7971=>602,7972=>602,7973=>602,7974=>602,7975=>602,7976=>602,7977=>602,7978=>602,
-7979=>602,7980=>602,7981=>602,7982=>602,7983=>602,7984=>602,7985=>602,7986=>602,7987=>602,7988=>602,
-7989=>602,7990=>602,7991=>602,7992=>602,7993=>602,7994=>602,7995=>602,7996=>602,7997=>602,7998=>602,
-7999=>602,8000=>602,8001=>602,8002=>602,8003=>602,8004=>602,8005=>602,8008=>602,8009=>602,8010=>602,
-8011=>602,8012=>602,8013=>602,8016=>602,8017=>602,8018=>602,8019=>602,8020=>602,8021=>602,8022=>602,
-8023=>602,8025=>602,8027=>602,8029=>602,8031=>602,8032=>602,8033=>602,8034=>602,8035=>602,8036=>602,
-8037=>602,8038=>602,8039=>602,8040=>602,8041=>602,8042=>602,8043=>602,8044=>602,8045=>602,8046=>602,
-8047=>602,8048=>602,8049=>602,8050=>602,8051=>602,8052=>602,8053=>602,8054=>602,8055=>602,8056=>602,
-8057=>602,8058=>602,8059=>602,8060=>602,8061=>602,8064=>602,8065=>602,8066=>602,8067=>602,8068=>602,
-8069=>602,8070=>602,8071=>602,8072=>602,8073=>602,8074=>602,8075=>602,8076=>602,8077=>602,8078=>602,
-8079=>602,8080=>602,8081=>602,8082=>602,8083=>602,8084=>602,8085=>602,8086=>602,8087=>602,8088=>602,
-8089=>602,8090=>602,8091=>602,8092=>602,8093=>602,8094=>602,8095=>602,8096=>602,8097=>602,8098=>602,
-8099=>602,8100=>602,8101=>602,8102=>602,8103=>602,8104=>602,8105=>602,8106=>602,8107=>602,8108=>602,
-8109=>602,8110=>602,8111=>602,8112=>602,8113=>602,8114=>602,8115=>602,8116=>602,8118=>602,8119=>602,
-8120=>602,8121=>602,8122=>602,8123=>602,8124=>602,8125=>602,8126=>602,8127=>602,8128=>602,8129=>602,
-8130=>602,8131=>602,8132=>602,8134=>602,8135=>602,8136=>602,8137=>602,8138=>602,8139=>602,8140=>602,
-8141=>602,8142=>602,8143=>602,8144=>602,8145=>602,8146=>602,8147=>602,8150=>602,8151=>602,8152=>602,
-8153=>602,8154=>602,8155=>602,8157=>602,8158=>602,8159=>602,8160=>602,8161=>602,8162=>602,8163=>602,
-8164=>602,8165=>602,8166=>602,8167=>602,8168=>602,8169=>602,8170=>602,8171=>602,8172=>602,8173=>602,
-8174=>602,8175=>602,8178=>602,8179=>602,8180=>602,8182=>602,8183=>602,8184=>602,8185=>602,8186=>602,
-8187=>602,8188=>602,8189=>602,8190=>602,8192=>602,8193=>602,8194=>602,8195=>602,8196=>602,8197=>602,
-8198=>602,8199=>602,8200=>602,8201=>602,8202=>602,8208=>602,8209=>602,8210=>602,8213=>602,8215=>602,
-8219=>602,8223=>602,8227=>602,8239=>602,8241=>602,8242=>602,8243=>602,8244=>602,8245=>602,8246=>602,
-8247=>602,8252=>602,8253=>602,8254=>602,8261=>602,8262=>602,8263=>602,8264=>602,8265=>602,8287=>602,
-8304=>602,8305=>602,8308=>602,8309=>602,8310=>602,8311=>602,8312=>602,8313=>602,8314=>602,8315=>602,
-8316=>602,8317=>602,8318=>602,8319=>602,8320=>602,8321=>602,8322=>602,8323=>602,8324=>602,8325=>602,
-8326=>602,8327=>602,8328=>602,8329=>602,8330=>602,8331=>602,8332=>602,8333=>602,8334=>602,8336=>602,
-8337=>602,8338=>602,8339=>602,8340=>602,8352=>602,8353=>602,8354=>602,8355=>602,8356=>602,8357=>602,
-8358=>602,8359=>602,8360=>602,8361=>602,8362=>602,8363=>602,8365=>602,8366=>602,8367=>602,8368=>602,
-8369=>602,8370=>602,8371=>602,8372=>602,8373=>602,8450=>602,8453=>602,8461=>602,8462=>602,8463=>602,
-8469=>602,8470=>602,8471=>602,8473=>602,8474=>602,8477=>602,8484=>602,8486=>602,8490=>602,8491=>602,
-8494=>602,8531=>602,8532=>602,8533=>602,8534=>602,8535=>602,8536=>602,8537=>602,8538=>602,8539=>602,
-8540=>602,8541=>602,8542=>602,8543=>602,8592=>602,8593=>602,8594=>602,8595=>602,8596=>602,8597=>602,
-8598=>602,8599=>602,8600=>602,8601=>602,8602=>602,8603=>602,8604=>602,8605=>602,8606=>602,8607=>602,
-8608=>602,8609=>602,8610=>602,8611=>602,8612=>602,8613=>602,8614=>602,8615=>602,8616=>602,8617=>602,
-8618=>602,8619=>602,8620=>602,8621=>602,8622=>602,8623=>602,8624=>602,8625=>602,8626=>602,8627=>602,
-8628=>602,8629=>602,8630=>602,8631=>602,8632=>602,8633=>602,8634=>602,8635=>602,8636=>602,8637=>602,
-8638=>602,8639=>602,8640=>602,8641=>602,8642=>602,8643=>602,8644=>602,8645=>602,8646=>602,8647=>602,
-8648=>602,8649=>602,8650=>602,8651=>602,8652=>602,8653=>602,8654=>602,8655=>602,8656=>602,8657=>602,
-8658=>602,8659=>602,8660=>602,8661=>602,8662=>602,8663=>602,8664=>602,8665=>602,8666=>602,8667=>602,
-8668=>602,8669=>602,8670=>602,8671=>602,8672=>602,8673=>602,8674=>602,8675=>602,8676=>602,8677=>602,
-8678=>602,8679=>602,8680=>602,8681=>602,8682=>602,8683=>602,8684=>602,8685=>602,8686=>602,8687=>602,
-8688=>602,8689=>602,8690=>602,8691=>602,8692=>602,8693=>602,8694=>602,8695=>602,8696=>602,8697=>602,
-8698=>602,8699=>602,8700=>602,8701=>602,8702=>602,8703=>602,8704=>602,8705=>602,8706=>602,8707=>602,
-8708=>602,8709=>602,8710=>602,8711=>602,8712=>602,8713=>602,8714=>602,8715=>602,8716=>602,8717=>602,
-8719=>602,8721=>602,8722=>602,8723=>602,8725=>602,8727=>602,8728=>602,8729=>602,8730=>602,8731=>602,
-8732=>602,8733=>602,8734=>602,8735=>602,8736=>602,8743=>602,8744=>602,8745=>602,8746=>602,8747=>602,
-8748=>602,8749=>602,8760=>602,8761=>602,8762=>602,8763=>602,8764=>602,8765=>602,8769=>602,8770=>602,
-8771=>602,8772=>602,8773=>602,8774=>602,8775=>602,8776=>602,8777=>602,8778=>602,8779=>602,8780=>602,
-8781=>602,8782=>602,8783=>602,8784=>602,8785=>602,8786=>602,8787=>602,8788=>602,8789=>602,8790=>602,
-8791=>602,8792=>602,8793=>602,8794=>602,8795=>602,8796=>602,8797=>602,8798=>602,8799=>602,8800=>602,
-8801=>602,8802=>602,8803=>602,8804=>602,8805=>602,8806=>602,8807=>602,8808=>602,8809=>602,8813=>602,
-8814=>602,8815=>602,8816=>602,8817=>602,8818=>602,8819=>602,8820=>602,8821=>602,8822=>602,8823=>602,
-8824=>602,8825=>602,8826=>602,8827=>602,8828=>602,8829=>602,8830=>602,8831=>602,8832=>602,8833=>602,
-8834=>602,8835=>602,8836=>602,8837=>602,8838=>602,8839=>602,8840=>602,8841=>602,8842=>602,8843=>602,
-8847=>602,8848=>602,8849=>602,8850=>602,8853=>602,8854=>602,8855=>602,8856=>602,8857=>602,8858=>602,
-8859=>602,8860=>602,8861=>602,8862=>602,8863=>602,8864=>602,8865=>602,8901=>602,8902=>602,8909=>602,
-8922=>602,8923=>602,8924=>602,8925=>602,8926=>602,8927=>602,8928=>602,8929=>602,8930=>602,8931=>602,
-8932=>602,8933=>602,8934=>602,8935=>602,8936=>602,8937=>602,8943=>602,8960=>602,8961=>602,8962=>602,
-8963=>602,8964=>602,8965=>602,8966=>602,8968=>602,8969=>602,8970=>602,8971=>602,8972=>602,8973=>602,
-8974=>602,8975=>602,8976=>602,8977=>602,8978=>602,8979=>602,8980=>602,8981=>602,8984=>602,8985=>602,
-8988=>602,8989=>602,8990=>602,8991=>602,8992=>602,8993=>602,8997=>602,8998=>602,8999=>602,9000=>602,
-9003=>602,9013=>602,9015=>602,9016=>602,9017=>602,9018=>602,9019=>602,9020=>602,9021=>602,9022=>602,
-9025=>602,9026=>602,9027=>602,9028=>602,9031=>602,9032=>602,9033=>602,9035=>602,9036=>602,9037=>602,
-9040=>602,9042=>602,9043=>602,9044=>602,9047=>602,9048=>602,9049=>602,9050=>602,9051=>602,9052=>602,
-9054=>602,9055=>602,9056=>602,9059=>602,9060=>602,9061=>602,9064=>602,9065=>602,9067=>602,9068=>602,
-9069=>602,9070=>602,9071=>602,9072=>602,9075=>602,9076=>602,9077=>602,9078=>602,9079=>602,9080=>602,
-9081=>602,9082=>602,9085=>602,9088=>602,9089=>602,9090=>602,9091=>602,9096=>602,9097=>602,9098=>602,
-9099=>602,9109=>602,9115=>602,9116=>602,9117=>602,9118=>602,9119=>602,9120=>602,9121=>602,9122=>602,
-9123=>602,9124=>602,9125=>602,9126=>602,9127=>602,9128=>602,9129=>602,9130=>602,9131=>602,9132=>602,
-9133=>602,9134=>602,9166=>602,9167=>602,9251=>602,9600=>602,9601=>602,9602=>602,9603=>602,9604=>602,
-9605=>602,9606=>602,9607=>602,9608=>602,9609=>602,9610=>602,9611=>602,9612=>602,9613=>602,9614=>602,
-9615=>602,9616=>602,9617=>602,9618=>602,9619=>602,9620=>602,9621=>602,9622=>602,9623=>602,9624=>602,
-9625=>602,9626=>602,9627=>602,9628=>602,9629=>602,9630=>602,9631=>602,9632=>602,9633=>602,9634=>602,
-9635=>602,9636=>602,9637=>602,9638=>602,9639=>602,9640=>602,9641=>602,9642=>602,9643=>602,9644=>602,
-9645=>602,9646=>602,9647=>602,9648=>602,9649=>602,9650=>602,9651=>602,9652=>602,9653=>602,9654=>602,
-9655=>602,9656=>602,9657=>602,9658=>602,9659=>602,9660=>602,9661=>602,9662=>602,9663=>602,9664=>602,
-9665=>602,9666=>602,9667=>602,9668=>602,9669=>602,9670=>602,9671=>602,9672=>602,9673=>602,9674=>602,
-9675=>602,9676=>602,9677=>602,9678=>602,9679=>602,9680=>602,9681=>602,9682=>602,9683=>602,9684=>602,
-9685=>602,9686=>602,9687=>602,9688=>602,9689=>602,9690=>602,9691=>602,9692=>602,9693=>602,9694=>602,
-9695=>602,9696=>602,9697=>602,9698=>602,9699=>602,9700=>602,9701=>602,9702=>602,9703=>602,9704=>602,
-9705=>602,9706=>602,9707=>602,9708=>602,9709=>602,9710=>602,9711=>602,9712=>602,9713=>602,9714=>602,
-9715=>602,9716=>602,9717=>602,9718=>602,9719=>602,9720=>602,9721=>602,9722=>602,9723=>602,9724=>602,
-9725=>602,9726=>602,9727=>602,9728=>602,9784=>602,9785=>602,9786=>602,9787=>602,9788=>602,9791=>602,
-9792=>602,9793=>602,9794=>602,9795=>602,9796=>602,9797=>602,9798=>602,9799=>602,9824=>602,9825=>602,
-9826=>602,9827=>602,9828=>602,9829=>602,9830=>602,9831=>602,9833=>602,9834=>602,9835=>602,9836=>602,
-9837=>602,9838=>602,9839=>602,10181=>602,10182=>602,10208=>602,10216=>602,10217=>602,10731=>602,10746=>602,
-10747=>602,10799=>602,11026=>602,11027=>602,11028=>602,11029=>602,11030=>602,11031=>602,11032=>602,11033=>602,
-11034=>602,11364=>602,11374=>602,11375=>602,11381=>602,11382=>602,11383=>602,11385=>602,11386=>602,11388=>602,
-11389=>602,11800=>602,11810=>602,11811=>602,11812=>602,11813=>602,11822=>602,42760=>602,42761=>602,42762=>602,
-42763=>602,42764=>602,42765=>602,42766=>602,42767=>602,42768=>602,42769=>602,42770=>602,42771=>602,42772=>602,
-42773=>602,42774=>602,42779=>602,42780=>602,42781=>602,42782=>602,42783=>602,42790=>602,42791=>602,42889=>602,
-42890=>602,42891=>602,42892=>602,63173=>602,64257=>602,64258=>602,65529=>602,65530=>602,65531=>602,65532=>602,
-65533=>602);
-$enc='';
-$diff='';
-$file='dejavusansmonobi.z';
-$ctg='dejavusansmonobi.ctg.z';
-$originalsize=223408;
-?>
\ No newline at end of file
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusansmonobi.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusansmonobi.z
deleted file mode 100644
index 08c6170b..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusansmonobi.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusansmonoi.ctg.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusansmonoi.ctg.z
deleted file mode 100644
index 7b8bc17d..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusansmonoi.ctg.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusansmonoi.php b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusansmonoi.php
deleted file mode 100644
index a544ef75..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusansmonoi.php
+++ /dev/null
@@ -1,262 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='DejaVuSansMono-Oblique';
-$desc=array('Ascent'=>928,'Descent'=>-236,'CapHeight'=>-62,'Flags'=>97,'FontBBox'=>'[-406 -375 746 1028]','ItalicAngle'=>-11,'StemV'=>70,'MissingWidth'=>602);
-$up=-63;
-$ut=44;
-$dw=602;
-$cw=array(
-0=>602,32=>602,33=>602,34=>602,35=>602,36=>602,37=>602,38=>602,39=>602,40=>602,
-41=>602,42=>602,43=>602,44=>602,45=>602,46=>602,47=>602,48=>602,49=>602,50=>602,
-51=>602,52=>602,53=>602,54=>602,55=>602,56=>602,57=>602,58=>602,59=>602,60=>602,
-61=>602,62=>602,63=>602,64=>602,65=>602,66=>602,67=>602,68=>602,69=>602,70=>602,
-71=>602,72=>602,73=>602,74=>602,75=>602,76=>602,77=>602,78=>602,79=>602,80=>602,
-81=>602,82=>602,83=>602,84=>602,85=>602,86=>602,87=>602,88=>602,89=>602,90=>602,
-91=>602,92=>602,93=>602,94=>602,95=>602,96=>602,97=>602,98=>602,99=>602,100=>602,
-101=>602,102=>602,103=>602,104=>602,105=>602,106=>602,107=>602,108=>602,109=>602,110=>602,
-111=>602,112=>602,113=>602,114=>602,115=>602,116=>602,117=>602,118=>602,119=>602,120=>602,
-121=>602,122=>602,123=>602,124=>602,125=>602,126=>602,8364=>602,8218=>602,402=>602,8222=>602,
-8230=>602,8224=>602,8225=>602,710=>602,8240=>602,352=>602,8249=>602,338=>602,381=>602,8216=>602,
-8217=>602,8220=>602,8221=>602,8226=>602,8211=>602,8212=>602,732=>602,8482=>602,353=>602,8250=>602,
-339=>602,382=>602,376=>602,160=>602,161=>602,162=>602,163=>602,164=>602,165=>602,166=>602,
-167=>602,168=>602,169=>602,170=>602,171=>602,172=>602,173=>602,174=>602,175=>602,176=>602,
-177=>602,178=>602,179=>602,180=>602,181=>602,182=>602,183=>602,184=>602,185=>602,186=>602,
-187=>602,188=>602,189=>602,190=>602,191=>602,192=>602,193=>602,194=>602,195=>602,196=>602,
-197=>602,198=>602,199=>602,200=>602,201=>602,202=>602,203=>602,204=>602,205=>602,206=>602,
-207=>602,208=>602,209=>602,210=>602,211=>602,212=>602,213=>602,214=>602,215=>602,216=>602,
-217=>602,218=>602,219=>602,220=>602,221=>602,222=>602,223=>602,224=>602,225=>602,226=>602,
-227=>602,228=>602,229=>602,230=>602,231=>602,232=>602,233=>602,234=>602,235=>602,236=>602,
-237=>602,238=>602,239=>602,240=>602,241=>602,242=>602,243=>602,244=>602,245=>602,246=>602,
-247=>602,248=>602,249=>602,250=>602,251=>602,252=>602,253=>602,254=>602,255=>602,256=>602,
-257=>602,258=>602,259=>602,260=>602,261=>602,262=>602,263=>602,264=>602,265=>602,266=>602,
-267=>602,268=>602,269=>602,270=>602,271=>602,272=>602,273=>602,274=>602,275=>602,276=>602,
-277=>602,278=>602,279=>602,280=>602,281=>602,282=>602,283=>602,284=>602,285=>602,286=>602,
-287=>602,288=>602,289=>602,290=>602,291=>602,292=>602,293=>602,294=>602,295=>602,296=>602,
-297=>602,298=>602,299=>602,300=>602,301=>602,302=>602,303=>602,304=>602,305=>602,306=>602,
-307=>602,308=>602,309=>602,310=>602,311=>602,312=>602,313=>602,314=>602,315=>602,316=>602,
-317=>602,318=>602,319=>602,320=>602,321=>602,322=>602,323=>602,324=>602,325=>602,326=>602,
-327=>602,328=>602,329=>602,330=>602,331=>602,332=>602,333=>602,334=>602,335=>602,336=>602,
-337=>602,340=>602,341=>602,342=>602,343=>602,344=>602,345=>602,346=>602,347=>602,348=>602,
-349=>602,350=>602,351=>602,354=>602,355=>602,356=>602,357=>602,358=>602,359=>602,360=>602,
-361=>602,362=>602,363=>602,364=>602,365=>602,366=>602,367=>602,368=>602,369=>602,370=>602,
-371=>602,372=>602,373=>602,374=>602,375=>602,377=>602,378=>602,379=>602,380=>602,383=>602,
-384=>602,385=>602,386=>602,387=>602,388=>602,389=>602,390=>602,391=>602,392=>602,393=>602,
-394=>602,395=>602,396=>602,397=>602,398=>602,399=>602,400=>602,401=>602,403=>602,404=>602,
-405=>602,406=>602,407=>602,408=>602,409=>602,410=>602,411=>602,412=>602,413=>602,414=>602,
-415=>602,416=>602,417=>602,418=>602,419=>602,420=>602,421=>602,422=>602,423=>602,424=>602,
-425=>602,426=>602,427=>602,428=>602,429=>602,430=>602,431=>602,432=>602,433=>602,434=>602,
-435=>602,436=>602,437=>602,438=>602,439=>602,440=>602,441=>602,442=>602,443=>602,444=>602,
-445=>602,446=>602,447=>602,448=>602,449=>602,450=>602,451=>602,461=>602,462=>602,463=>602,
-464=>602,465=>602,466=>602,467=>602,468=>602,469=>602,470=>602,471=>602,472=>602,473=>602,
-474=>602,475=>602,476=>602,477=>602,479=>602,480=>602,481=>602,482=>602,483=>602,486=>602,
-487=>602,488=>602,489=>602,490=>602,491=>602,492=>602,493=>602,494=>602,495=>602,500=>602,
-501=>602,502=>602,504=>602,505=>602,508=>602,509=>602,510=>602,511=>602,512=>602,513=>602,
-514=>602,515=>602,516=>602,517=>602,518=>602,519=>602,520=>602,521=>602,522=>602,523=>602,
-524=>602,525=>602,526=>602,527=>602,528=>602,529=>602,530=>602,531=>602,532=>602,533=>602,
-534=>602,535=>602,536=>602,537=>602,538=>602,539=>602,540=>602,541=>602,542=>602,543=>602,
-545=>602,548=>602,549=>602,550=>602,551=>602,552=>602,553=>602,554=>602,555=>602,556=>602,
-557=>602,558=>602,559=>602,560=>602,561=>602,562=>602,563=>602,564=>602,565=>602,566=>602,
-567=>602,568=>602,569=>602,570=>602,571=>602,572=>602,573=>602,574=>602,575=>602,576=>602,
-577=>602,580=>602,581=>602,588=>602,589=>602,592=>602,593=>602,594=>602,595=>602,596=>602,
-597=>602,598=>602,599=>602,600=>602,601=>602,602=>602,603=>602,604=>602,605=>602,606=>602,
-607=>602,608=>602,609=>602,610=>602,611=>602,612=>602,613=>602,614=>602,615=>602,616=>602,
-617=>602,618=>602,619=>602,620=>602,621=>602,622=>602,623=>602,624=>602,625=>602,626=>602,
-627=>602,628=>602,629=>602,630=>602,631=>602,632=>602,633=>602,634=>602,635=>602,636=>602,
-637=>602,638=>602,639=>602,640=>602,641=>602,642=>602,643=>602,644=>602,645=>602,646=>602,
-647=>602,648=>602,649=>602,650=>602,651=>602,652=>602,653=>602,654=>602,655=>602,656=>602,
-657=>602,658=>602,659=>602,660=>602,661=>602,662=>602,663=>602,664=>602,665=>602,666=>602,
-667=>602,668=>602,669=>602,670=>602,671=>602,672=>602,673=>602,674=>602,675=>602,676=>602,
-677=>602,678=>602,679=>602,680=>602,681=>602,682=>602,683=>602,684=>602,685=>602,686=>602,
-687=>602,688=>602,689=>602,690=>602,691=>602,692=>602,693=>602,694=>602,695=>602,696=>602,
-697=>602,699=>602,700=>602,701=>602,702=>602,703=>602,704=>602,705=>602,711=>602,712=>602,
-713=>602,716=>602,717=>602,720=>602,721=>602,722=>602,723=>602,726=>602,727=>602,728=>602,
-729=>602,730=>602,731=>602,733=>602,734=>602,736=>602,737=>602,738=>602,739=>602,740=>602,
-741=>602,742=>602,743=>602,744=>602,745=>602,750=>602,755=>602,768=>602,769=>602,770=>602,
-771=>602,772=>602,773=>602,774=>602,775=>602,776=>602,777=>602,778=>602,779=>602,780=>602,
-781=>602,782=>602,783=>602,784=>602,785=>602,786=>602,787=>602,788=>602,789=>602,790=>602,
-791=>602,792=>602,793=>602,794=>602,795=>602,796=>602,797=>602,798=>602,799=>602,800=>602,
-801=>602,802=>602,803=>602,804=>602,805=>602,806=>602,807=>602,808=>602,809=>602,810=>602,
-811=>602,812=>602,813=>602,814=>602,815=>602,816=>602,817=>602,818=>602,819=>602,820=>602,
-821=>602,822=>602,823=>602,824=>602,825=>602,826=>602,827=>602,828=>602,829=>602,830=>602,
-831=>602,835=>602,856=>602,865=>602,884=>602,885=>602,890=>602,894=>602,900=>602,901=>602,
-902=>602,903=>602,904=>602,905=>602,906=>602,908=>602,910=>602,911=>602,912=>602,913=>602,
-914=>602,915=>602,916=>602,917=>602,918=>602,919=>602,920=>602,921=>602,922=>602,923=>602,
-924=>602,925=>602,926=>602,927=>602,928=>602,929=>602,931=>602,932=>602,933=>602,934=>602,
-935=>602,936=>602,937=>602,938=>602,939=>602,940=>602,941=>602,942=>602,943=>602,944=>602,
-945=>602,946=>602,947=>602,948=>602,949=>602,950=>602,951=>602,952=>602,953=>602,954=>602,
-955=>602,956=>602,957=>602,958=>602,959=>602,960=>602,961=>602,962=>602,963=>602,964=>602,
-965=>602,966=>602,967=>602,968=>602,969=>602,970=>602,971=>602,972=>602,973=>602,974=>602,
-976=>602,977=>602,978=>602,979=>602,980=>602,981=>602,982=>602,983=>602,984=>602,985=>602,
-986=>602,987=>602,988=>602,989=>602,990=>602,991=>602,992=>602,993=>602,1008=>602,1009=>602,
-1010=>602,1011=>602,1012=>602,1013=>602,1014=>602,1015=>602,1016=>602,1017=>602,1018=>602,1019=>602,
-1020=>602,1021=>602,1022=>602,1023=>602,1024=>602,1025=>602,1026=>602,1027=>602,1028=>602,1029=>602,
-1030=>602,1031=>602,1032=>602,1033=>602,1034=>602,1035=>602,1036=>602,1037=>602,1038=>602,1039=>602,
-1040=>602,1041=>602,1042=>602,1043=>602,1044=>602,1045=>602,1046=>602,1047=>602,1048=>602,1049=>602,
-1050=>602,1051=>602,1052=>602,1053=>602,1054=>602,1055=>602,1056=>602,1057=>602,1058=>602,1059=>602,
-1060=>602,1061=>602,1062=>602,1063=>602,1064=>602,1065=>602,1066=>602,1067=>602,1068=>602,1069=>602,
-1070=>602,1071=>602,1072=>602,1073=>602,1074=>602,1075=>602,1076=>602,1077=>602,1078=>602,1079=>602,
-1080=>602,1081=>602,1082=>602,1083=>602,1084=>602,1085=>602,1086=>602,1087=>602,1088=>602,1089=>602,
-1090=>602,1091=>602,1092=>602,1093=>602,1094=>602,1095=>602,1096=>602,1097=>602,1098=>602,1099=>602,
-1100=>602,1101=>602,1102=>602,1103=>602,1104=>602,1105=>602,1106=>602,1107=>602,1108=>602,1109=>602,
-1110=>602,1111=>602,1112=>602,1113=>602,1114=>602,1115=>602,1116=>602,1117=>602,1118=>602,1119=>602,
-1122=>602,1123=>602,1138=>602,1139=>602,1168=>602,1169=>602,1170=>602,1171=>602,1172=>602,1173=>602,
-1174=>602,1175=>602,1176=>602,1177=>602,1178=>602,1179=>602,1186=>602,1187=>602,1194=>602,1195=>602,
-1196=>602,1197=>602,1198=>602,1199=>602,1200=>602,1201=>602,1202=>602,1203=>602,1210=>602,1211=>602,
-1216=>602,1217=>602,1218=>602,1219=>602,1220=>602,1223=>602,1224=>602,1227=>602,1228=>602,1231=>602,
-1232=>602,1233=>602,1234=>602,1235=>602,1236=>602,1237=>602,1238=>602,1239=>602,1240=>602,1241=>602,
-1242=>602,1243=>602,1244=>602,1245=>602,1246=>602,1247=>602,1248=>602,1249=>602,1250=>602,1251=>602,
-1252=>602,1253=>602,1254=>602,1255=>602,1256=>602,1257=>602,1258=>602,1259=>602,1260=>602,1261=>602,
-1262=>602,1263=>602,1264=>602,1265=>602,1266=>602,1267=>602,1268=>602,1269=>602,1270=>602,1271=>602,
-1272=>602,1273=>602,1296=>602,1297=>602,1306=>602,1307=>602,1308=>602,1309=>602,3713=>602,3714=>602,
-3716=>602,3719=>602,3720=>602,3722=>602,3725=>602,3732=>602,3733=>602,3734=>602,3735=>602,3737=>602,
-3738=>602,3739=>602,3740=>602,3741=>602,3742=>602,3743=>602,3745=>602,3746=>602,3747=>602,3749=>602,
-3751=>602,3754=>602,3755=>602,3757=>602,3758=>602,3759=>602,3760=>602,3761=>602,3762=>602,3763=>602,
-3764=>602,3765=>602,3766=>602,3767=>602,3768=>602,3769=>602,3771=>602,3772=>602,3784=>602,3785=>602,
-3786=>602,3787=>602,3788=>602,3789=>602,4304=>602,4305=>602,4306=>602,4307=>602,4308=>602,4309=>602,
-4310=>602,4311=>602,4312=>602,4313=>602,4314=>602,4315=>602,4316=>602,4317=>602,4318=>602,4319=>602,
-4320=>602,4321=>602,4322=>602,4323=>602,4324=>602,4325=>602,4326=>602,4327=>602,4328=>602,4329=>602,
-4330=>602,4331=>602,4332=>602,4333=>602,4334=>602,4335=>602,4336=>602,4337=>602,4338=>602,4339=>602,
-4340=>602,4341=>602,4342=>602,4343=>602,4344=>602,4345=>602,4346=>602,4347=>602,4348=>602,7426=>602,
-7432=>602,7433=>602,7444=>602,7446=>602,7447=>602,7453=>602,7454=>602,7455=>602,7468=>602,7469=>602,
-7470=>602,7472=>602,7473=>602,7474=>602,7475=>602,7476=>602,7477=>602,7478=>602,7479=>602,7480=>602,
-7481=>602,7482=>602,7483=>602,7484=>602,7485=>602,7486=>602,7487=>602,7488=>602,7489=>602,7490=>602,
-7491=>602,7492=>602,7493=>602,7494=>602,7495=>602,7496=>602,7497=>602,7498=>602,7499=>602,7500=>602,
-7501=>602,7502=>602,7503=>602,7504=>602,7505=>602,7506=>602,7507=>602,7508=>602,7509=>602,7510=>602,
-7511=>602,7512=>602,7513=>602,7514=>602,7515=>602,7522=>602,7523=>602,7524=>602,7525=>602,7543=>602,
-7544=>602,7547=>602,7557=>602,7579=>602,7580=>602,7581=>602,7582=>602,7583=>602,7584=>602,7585=>602,
-7586=>602,7587=>602,7588=>602,7589=>602,7590=>602,7591=>602,7592=>602,7593=>602,7594=>602,7595=>602,
-7596=>602,7597=>602,7598=>602,7599=>602,7600=>602,7601=>602,7602=>602,7603=>602,7604=>602,7605=>602,
-7606=>602,7607=>602,7609=>602,7610=>602,7611=>602,7612=>602,7613=>602,7614=>602,7615=>602,7680=>602,
-7681=>602,7682=>602,7683=>602,7684=>602,7685=>602,7686=>602,7687=>602,7688=>602,7689=>602,7690=>602,
-7691=>602,7692=>602,7693=>602,7694=>602,7695=>602,7696=>602,7697=>602,7698=>602,7699=>602,7704=>602,
-7705=>602,7706=>602,7707=>602,7708=>602,7709=>602,7710=>602,7711=>602,7712=>602,7713=>602,7714=>602,
-7715=>602,7716=>602,7717=>602,7718=>602,7719=>602,7720=>602,7721=>602,7722=>602,7723=>602,7724=>602,
-7725=>602,7728=>602,7729=>602,7730=>602,7731=>602,7732=>602,7733=>602,7734=>602,7735=>602,7736=>602,
-7737=>602,7738=>602,7739=>602,7740=>602,7741=>602,7742=>602,7743=>602,7744=>602,7745=>602,7746=>602,
-7747=>602,7748=>602,7749=>602,7750=>602,7751=>602,7752=>602,7753=>602,7754=>602,7755=>602,7756=>602,
-7757=>602,7764=>602,7765=>602,7766=>602,7767=>602,7768=>602,7769=>602,7770=>602,7771=>602,7772=>602,
-7773=>602,7774=>602,7775=>602,7776=>602,7777=>602,7778=>602,7779=>602,7784=>602,7785=>602,7786=>602,
-7787=>602,7788=>602,7789=>602,7790=>602,7791=>602,7792=>602,7793=>602,7794=>602,7795=>602,7796=>602,
-7797=>602,7798=>602,7799=>602,7800=>602,7801=>602,7804=>602,7805=>602,7806=>602,7807=>602,7808=>602,
-7809=>602,7810=>602,7811=>602,7812=>602,7813=>602,7814=>602,7815=>602,7816=>602,7817=>602,7818=>602,
-7819=>602,7820=>602,7821=>602,7822=>602,7823=>602,7824=>602,7825=>602,7826=>602,7827=>602,7828=>602,
-7829=>602,7830=>602,7831=>602,7832=>602,7833=>602,7835=>602,7839=>602,7840=>602,7841=>602,7852=>602,
-7853=>602,7856=>602,7857=>602,7862=>602,7863=>602,7864=>602,7865=>602,7868=>602,7869=>602,7878=>602,
-7879=>602,7882=>602,7883=>602,7884=>602,7885=>602,7896=>602,7897=>602,7898=>602,7899=>602,7900=>602,
-7901=>602,7904=>602,7905=>602,7906=>602,7907=>602,7908=>602,7909=>602,7912=>602,7913=>602,7914=>602,
-7915=>602,7918=>602,7919=>602,7920=>602,7921=>602,7922=>602,7923=>602,7924=>602,7925=>602,7928=>602,
-7929=>602,7936=>602,7937=>602,7938=>602,7939=>602,7940=>602,7941=>602,7942=>602,7943=>602,7944=>602,
-7945=>602,7946=>602,7947=>602,7948=>602,7949=>602,7950=>602,7951=>602,7952=>602,7953=>602,7954=>602,
-7955=>602,7956=>602,7957=>602,7960=>602,7961=>602,7962=>602,7963=>602,7964=>602,7965=>602,7968=>602,
-7969=>602,7970=>602,7971=>602,7972=>602,7973=>602,7974=>602,7975=>602,7976=>602,7977=>602,7978=>602,
-7979=>602,7980=>602,7981=>602,7982=>602,7983=>602,7984=>602,7985=>602,7986=>602,7987=>602,7988=>602,
-7989=>602,7990=>602,7991=>602,7992=>602,7993=>602,7994=>602,7995=>602,7996=>602,7997=>602,7998=>602,
-7999=>602,8000=>602,8001=>602,8002=>602,8003=>602,8004=>602,8005=>602,8008=>602,8009=>602,8010=>602,
-8011=>602,8012=>602,8013=>602,8016=>602,8017=>602,8018=>602,8019=>602,8020=>602,8021=>602,8022=>602,
-8023=>602,8025=>602,8027=>602,8029=>602,8031=>602,8032=>602,8033=>602,8034=>602,8035=>602,8036=>602,
-8037=>602,8038=>602,8039=>602,8040=>602,8041=>602,8042=>602,8043=>602,8044=>602,8045=>602,8046=>602,
-8047=>602,8048=>602,8049=>602,8050=>602,8051=>602,8052=>602,8053=>602,8054=>602,8055=>602,8056=>602,
-8057=>602,8058=>602,8059=>602,8060=>602,8061=>602,8064=>602,8065=>602,8066=>602,8067=>602,8068=>602,
-8069=>602,8070=>602,8071=>602,8072=>602,8073=>602,8074=>602,8075=>602,8076=>602,8077=>602,8078=>602,
-8079=>602,8080=>602,8081=>602,8082=>602,8083=>602,8084=>602,8085=>602,8086=>602,8087=>602,8088=>602,
-8089=>602,8090=>602,8091=>602,8092=>602,8093=>602,8094=>602,8095=>602,8096=>602,8097=>602,8098=>602,
-8099=>602,8100=>602,8101=>602,8102=>602,8103=>602,8104=>602,8105=>602,8106=>602,8107=>602,8108=>602,
-8109=>602,8110=>602,8111=>602,8112=>602,8113=>602,8114=>602,8115=>602,8116=>602,8118=>602,8119=>602,
-8120=>602,8121=>602,8122=>602,8123=>602,8124=>602,8125=>602,8126=>602,8127=>602,8128=>602,8129=>602,
-8130=>602,8131=>602,8132=>602,8134=>602,8135=>602,8136=>602,8137=>602,8138=>602,8139=>602,8140=>602,
-8141=>602,8142=>602,8143=>602,8144=>602,8145=>602,8146=>602,8147=>602,8150=>602,8151=>602,8152=>602,
-8153=>602,8154=>602,8155=>602,8157=>602,8158=>602,8159=>602,8160=>602,8161=>602,8162=>602,8163=>602,
-8164=>602,8165=>602,8166=>602,8167=>602,8168=>602,8169=>602,8170=>602,8171=>602,8172=>602,8173=>602,
-8174=>602,8175=>602,8178=>602,8179=>602,8180=>602,8182=>602,8183=>602,8184=>602,8185=>602,8186=>602,
-8187=>602,8188=>602,8189=>602,8190=>602,8192=>602,8193=>602,8194=>602,8195=>602,8196=>602,8197=>602,
-8198=>602,8199=>602,8200=>602,8201=>602,8202=>602,8208=>602,8209=>602,8210=>602,8213=>602,8215=>602,
-8219=>602,8223=>602,8227=>602,8239=>602,8241=>602,8242=>602,8243=>602,8244=>602,8245=>602,8246=>602,
-8247=>602,8252=>602,8253=>602,8254=>602,8261=>602,8262=>602,8263=>602,8264=>602,8265=>602,8287=>602,
-8304=>602,8305=>602,8308=>602,8309=>602,8310=>602,8311=>602,8312=>602,8313=>602,8314=>602,8315=>602,
-8316=>602,8317=>602,8318=>602,8319=>602,8320=>602,8321=>602,8322=>602,8323=>602,8324=>602,8325=>602,
-8326=>602,8327=>602,8328=>602,8329=>602,8330=>602,8331=>602,8332=>602,8333=>602,8334=>602,8336=>602,
-8337=>602,8338=>602,8339=>602,8340=>602,8352=>602,8353=>602,8354=>602,8355=>602,8356=>602,8357=>602,
-8358=>602,8359=>602,8360=>602,8361=>602,8362=>602,8363=>602,8365=>602,8366=>602,8367=>602,8368=>602,
-8369=>602,8370=>602,8371=>602,8372=>602,8373=>602,8450=>602,8453=>602,8461=>602,8462=>602,8463=>602,
-8469=>602,8470=>602,8471=>602,8473=>602,8474=>602,8477=>602,8484=>602,8486=>602,8490=>602,8491=>602,
-8494=>602,8531=>602,8532=>602,8533=>602,8534=>602,8535=>602,8536=>602,8537=>602,8538=>602,8539=>602,
-8540=>602,8541=>602,8542=>602,8543=>602,8592=>602,8593=>602,8594=>602,8595=>602,8596=>602,8597=>602,
-8598=>602,8599=>602,8600=>602,8601=>602,8602=>602,8603=>602,8604=>602,8605=>602,8606=>602,8607=>602,
-8608=>602,8609=>602,8610=>602,8611=>602,8612=>602,8613=>602,8614=>602,8615=>602,8616=>602,8617=>602,
-8618=>602,8619=>602,8620=>602,8621=>602,8622=>602,8623=>602,8624=>602,8625=>602,8626=>602,8627=>602,
-8628=>602,8629=>602,8630=>602,8631=>602,8632=>602,8633=>602,8634=>602,8635=>602,8636=>602,8637=>602,
-8638=>602,8639=>602,8640=>602,8641=>602,8642=>602,8643=>602,8644=>602,8645=>602,8646=>602,8647=>602,
-8648=>602,8649=>602,8650=>602,8651=>602,8652=>602,8653=>602,8654=>602,8655=>602,8656=>602,8657=>602,
-8658=>602,8659=>602,8660=>602,8661=>602,8662=>602,8663=>602,8664=>602,8665=>602,8666=>602,8667=>602,
-8668=>602,8669=>602,8670=>602,8671=>602,8672=>602,8673=>602,8674=>602,8675=>602,8676=>602,8677=>602,
-8678=>602,8679=>602,8680=>602,8681=>602,8682=>602,8683=>602,8684=>602,8685=>602,8686=>602,8687=>602,
-8688=>602,8689=>602,8690=>602,8691=>602,8692=>602,8693=>602,8694=>602,8695=>602,8696=>602,8697=>602,
-8698=>602,8699=>602,8700=>602,8701=>602,8702=>602,8703=>602,8704=>602,8705=>602,8706=>602,8707=>602,
-8708=>602,8709=>602,8710=>602,8711=>602,8712=>602,8713=>602,8714=>602,8715=>602,8716=>602,8717=>602,
-8719=>602,8721=>602,8722=>602,8723=>602,8725=>602,8727=>602,8728=>602,8729=>602,8730=>602,8731=>602,
-8732=>602,8733=>602,8734=>602,8735=>602,8736=>602,8743=>602,8744=>602,8745=>602,8746=>602,8747=>602,
-8748=>602,8749=>602,8760=>602,8761=>602,8762=>602,8763=>602,8764=>602,8765=>602,8769=>602,8770=>602,
-8771=>602,8772=>602,8773=>602,8774=>602,8775=>602,8776=>602,8777=>602,8778=>602,8779=>602,8780=>602,
-8781=>602,8782=>602,8783=>602,8784=>602,8785=>602,8786=>602,8787=>602,8788=>602,8789=>602,8790=>602,
-8791=>602,8792=>602,8793=>602,8794=>602,8795=>602,8796=>602,8797=>602,8798=>602,8799=>602,8800=>602,
-8801=>602,8802=>602,8803=>602,8804=>602,8805=>602,8806=>602,8807=>602,8808=>602,8809=>602,8813=>602,
-8814=>602,8815=>602,8816=>602,8817=>602,8818=>602,8819=>602,8820=>602,8821=>602,8822=>602,8823=>602,
-8824=>602,8825=>602,8826=>602,8827=>602,8828=>602,8829=>602,8830=>602,8831=>602,8832=>602,8833=>602,
-8834=>602,8835=>602,8836=>602,8837=>602,8838=>602,8839=>602,8840=>602,8841=>602,8842=>602,8843=>602,
-8847=>602,8848=>602,8849=>602,8850=>602,8853=>602,8854=>602,8855=>602,8856=>602,8857=>602,8858=>602,
-8859=>602,8860=>602,8861=>602,8862=>602,8863=>602,8864=>602,8865=>602,8901=>602,8902=>602,8909=>602,
-8922=>602,8923=>602,8924=>602,8925=>602,8926=>602,8927=>602,8928=>602,8929=>602,8930=>602,8931=>602,
-8932=>602,8933=>602,8934=>602,8935=>602,8936=>602,8937=>602,8943=>602,8960=>602,8961=>602,8962=>602,
-8963=>602,8964=>602,8965=>602,8966=>602,8968=>602,8969=>602,8970=>602,8971=>602,8972=>602,8973=>602,
-8974=>602,8975=>602,8976=>602,8977=>602,8978=>602,8979=>602,8980=>602,8981=>602,8984=>602,8985=>602,
-8988=>602,8989=>602,8990=>602,8991=>602,8992=>602,8993=>602,8997=>602,8998=>602,8999=>602,9000=>602,
-9003=>602,9013=>602,9015=>602,9016=>602,9017=>602,9018=>602,9019=>602,9020=>602,9021=>602,9022=>602,
-9025=>602,9026=>602,9027=>602,9028=>602,9031=>602,9032=>602,9033=>602,9035=>602,9036=>602,9037=>602,
-9040=>602,9042=>602,9043=>602,9044=>602,9047=>602,9048=>602,9049=>602,9050=>602,9051=>602,9052=>602,
-9054=>602,9055=>602,9056=>602,9059=>602,9060=>602,9061=>602,9064=>602,9065=>602,9067=>602,9068=>602,
-9069=>602,9070=>602,9071=>602,9072=>602,9075=>602,9076=>602,9077=>602,9078=>602,9079=>602,9080=>602,
-9081=>602,9082=>602,9085=>602,9088=>602,9089=>602,9090=>602,9091=>602,9096=>602,9097=>602,9098=>602,
-9099=>602,9109=>602,9115=>602,9116=>602,9117=>602,9118=>602,9119=>602,9120=>602,9121=>602,9122=>602,
-9123=>602,9124=>602,9125=>602,9126=>602,9127=>602,9128=>602,9129=>602,9130=>602,9131=>602,9132=>602,
-9133=>602,9134=>602,9166=>602,9167=>602,9251=>602,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=>602,9601=>602,9602=>602,9603=>602,9604=>602,9605=>602,9606=>602,
-9607=>602,9608=>602,9609=>602,9610=>602,9611=>602,9612=>602,9613=>602,9614=>602,9615=>602,9616=>602,
-9617=>602,9618=>602,9619=>602,9620=>602,9621=>602,9622=>602,9623=>602,9624=>602,9625=>602,9626=>602,
-9627=>602,9628=>602,9629=>602,9630=>602,9631=>602,9632=>602,9633=>602,9634=>602,9635=>602,9636=>602,
-9637=>602,9638=>602,9639=>602,9640=>602,9641=>602,9642=>602,9643=>602,9644=>602,9645=>602,9646=>602,
-9647=>602,9648=>602,9649=>602,9650=>602,9651=>602,9652=>602,9653=>602,9654=>602,9655=>602,9656=>602,
-9657=>602,9658=>602,9659=>602,9660=>602,9661=>602,9662=>602,9663=>602,9664=>602,9665=>602,9666=>602,
-9667=>602,9668=>602,9669=>602,9670=>602,9671=>602,9672=>602,9673=>602,9674=>602,9675=>602,9676=>602,
-9677=>602,9678=>602,9679=>602,9680=>602,9681=>602,9682=>602,9683=>602,9684=>602,9685=>602,9686=>602,
-9687=>602,9688=>602,9689=>602,9690=>602,9691=>602,9692=>602,9693=>602,9694=>602,9695=>602,9696=>602,
-9697=>602,9698=>602,9699=>602,9700=>602,9701=>602,9702=>602,9703=>602,9704=>602,9705=>602,9706=>602,
-9707=>602,9708=>602,9709=>602,9710=>602,9711=>602,9712=>602,9713=>602,9714=>602,9715=>602,9716=>602,
-9717=>602,9718=>602,9719=>602,9720=>602,9721=>602,9722=>602,9723=>602,9724=>602,9725=>602,9726=>602,
-9727=>602,9728=>602,9784=>602,9785=>602,9786=>602,9787=>602,9788=>602,9791=>602,9792=>602,9793=>602,
-9794=>602,9795=>602,9796=>602,9797=>602,9798=>602,9799=>602,9824=>602,9825=>602,9826=>602,9827=>602,
-9828=>602,9829=>602,9830=>602,9831=>602,9833=>602,9834=>602,9835=>602,9836=>602,9837=>602,9838=>602,
-9839=>602,10181=>602,10182=>602,10208=>602,10216=>602,10217=>602,10731=>602,10746=>602,10747=>602,10799=>602,
-11026=>602,11027=>602,11028=>602,11029=>602,11030=>602,11031=>602,11032=>602,11033=>602,11034=>602,11364=>602,
-11374=>602,11375=>602,11381=>602,11382=>602,11383=>602,11385=>602,11386=>602,11388=>602,11389=>602,11800=>602,
-11810=>602,11811=>602,11812=>602,11813=>602,11822=>602,42760=>602,42761=>602,42762=>602,42763=>602,42764=>602,
-42765=>602,42766=>602,42767=>602,42768=>602,42769=>602,42770=>602,42771=>602,42772=>602,42773=>602,42774=>602,
-42779=>602,42780=>602,42781=>602,42782=>602,42783=>602,42790=>602,42791=>602,42889=>602,42890=>602,42891=>602,
-42892=>602,63173=>602,64257=>602,64258=>602,65529=>602,65530=>602,65531=>602,65532=>602,65533=>602);
-$enc='';
-$diff='';
-$file='dejavusansmonoi.z';
-$ctg='dejavusansmonoi.ctg.z';
-$originalsize=229284;
-?>
\ No newline at end of file
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusansmonoi.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusansmonoi.z
deleted file mode 100644
index fab337c9..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavusansmonoi.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserif.ctg.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserif.ctg.z
deleted file mode 100644
index 6e01b837..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserif.ctg.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserif.php b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserif.php
deleted file mode 100644
index 4e6280d7..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserif.php
+++ /dev/null
@@ -1,313 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='DejaVuSerif';
-$desc=array('Ascent'=>928,'Descent'=>-236,'CapHeight'=>6,'Flags'=>32,'FontBBox'=>'[-770 -347 1679 1242]','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,443=>636,444=>687,445=>564,
-446=>536,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,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,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,581=>722,
-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=>646,
-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,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,884=>278,
-885=>278,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,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,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,7426=>940,7432=>509,7433=>320,7444=>989,7446=>602,
-7447=>602,7453=>737,7454=>948,7455=>948,7468=>455,7469=>630,7470=>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,
-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=>464,7514=>613,7515=>373,
-7522=>201,7523=>347,7524=>399,7525=>373,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,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,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,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,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,7838=>829,7839=>602,
-7840=>722,7841=>596,7842=>722,7843=>596,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,7878=>730,7879=>592,7880=>395,7881=>320,7882=>395,7883=>320,7884=>820,7885=>602,
-7886=>820,7887=>602,7896=>820,7897=>602,7908=>843,7909=>644,7910=>843,7911=>644,7922=>660,7923=>565,
-7924=>660,7925=>565,7926=>660,7927=>565,7928=>660,7929=>565,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,8358=>660,8367=>1057,8369=>706,8372=>780,8373=>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,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,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,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,11364=>753,11367=>872,11368=>644,11369=>747,11370=>606,11371=>695,
-11372=>527,11374=>1024,11375=>722,11381=>740,11382=>556,11383=>700,11385=>501,11386=>602,11388=>264,11389=>455,
-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,42891=>402,42892=>275,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=328908;
-?>
\ No newline at end of file
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserif.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserif.z
deleted file mode 100644
index 00235fa6..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserif.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserifb.ctg.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserifb.ctg.z
deleted file mode 100644
index c1a3ccbf..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserifb.ctg.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserifb.php b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserifb.php
deleted file mode 100644
index 23ea7425..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserifb.php
+++ /dev/null
@@ -1,299 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='DejaVuSerif-Bold';
-$desc=array('Ascent'=>939,'Descent'=>-236,'CapHeight'=>5,'Flags'=>32,'FontBBox'=>'[-836 -389 1796 1235]','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,443=>696,444=>754,445=>568,
-446=>536,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,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,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,581=>776,
-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,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,884=>302,
-885=>302,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,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,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,7426=>940,7432=>509,7433=>320,7444=>989,7446=>667,
-7447=>667,7453=>737,7454=>948,7455=>948,7468=>489,7469=>651,7470=>532,7472=>546,7473=>480,7474=>480,
-7475=>538,7476=>595,7477=>294,7478=>298,7479=>547,7480=>443,7481=>697,7482=>576,7483=>576,7484=>548,
-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=>434,7514=>729,7515=>491,
-7522=>239,7523=>414,7524=>520,7525=>491,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,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,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,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,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,7838=>947,7839=>667,
-7840=>776,7841=>648,7842=>776,7843=>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,7878=>762,7879=>636,7880=>468,7881=>380,7882=>468,7883=>380,7884=>871,7885=>667,
-7886=>871,7887=>667,7896=>871,7897=>667,7908=>872,7909=>727,7910=>872,7911=>727,7922=>714,7923=>581,
-7924=>714,7925=>581,7926=>714,7927=>581,7928=>714,7929=>581,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,8358=>696,8367=>1155,8369=>790,8372=>876,8373=>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,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,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,
-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,11364=>831,
-11367=>945,11368=>727,11369=>869,11370=>693,11371=>730,11372=>568,11374=>1107,11375=>776,11381=>779,11382=>601,
-11383=>905,11385=>571,11386=>667,11388=>313,11389=>489,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,42891=>439,
-42892=>306,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=306532;
-?>
\ No newline at end of file
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserifb.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserifb.z
deleted file mode 100644
index f73e4f3e..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserifb.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserifbi.ctg.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserifbi.ctg.z
deleted file mode 100644
index d237ae7e..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserifbi.ctg.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserifbi.php b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserifbi.php
deleted file mode 100644
index b365b217..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserifbi.php
+++ /dev/null
@@ -1,299 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='DejaVuSerif-BoldItalic';
-$desc=array('Ascent'=>939,'Descent'=>-236,'CapHeight'=>-53,'Flags'=>96,'FontBBox'=>'[-906 -389 1760 1235]','ItalicAngle'=>-11,'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=>932,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=>508,319=>703,320=>557,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=>699,437=>730,438=>568,439=>657,440=>657,441=>657,443=>696,444=>754,445=>568,
-446=>536,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=>362,
-497=>1597,498=>1435,499=>1267,500=>854,501=>699,502=>1221,504=>914,505=>727,506=>776,507=>648,
-508=>1034,509=>932,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,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,581=>776,
-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=>581,653=>861,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=>542,696=>366,697=>302,699=>348,700=>348,701=>348,702=>366,
-703=>366,704=>313,705=>313,711=>500,712=>282,713=>500,716=>282,720=>369,721=>369,722=>366,
-723=>366,726=>392,728=>500,729=>500,730=>500,731=>500,733=>500,734=>417,736=>448,737=>292,
-738=>395,739=>375,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,884=>302,
-885=>302,890=>500,891=>609,892=>609,893=>609,894=>369,900=>500,901=>500,902=>776,903=>348,
-904=>947,905=>1136,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=>945,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,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=>945,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=>722,1074=>657,1075=>563,1076=>695,1077=>636,1078=>1306,1079=>638,1080=>727,1081=>727,
-1082=>677,1083=>732,1084=>951,1085=>729,1086=>667,1087=>727,1088=>699,1089=>609,1090=>1058,1091=>598,
-1092=>902,1093=>596,1094=>803,1095=>715,1096=>1058,1097=>1134,1098=>727,1099=>1018,1100=>660,1101=>645,
-1102=>1001,1103=>796,1104=>636,1105=>636,1106=>719,1107=>563,1108=>609,1109=>563,1110=>380,1111=>380,
-1112=>362,1113=>1014,1114=>1011,1115=>727,1116=>677,1117=>727,1118=>598,1119=>727,1122=>880,1123=>1050,
-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=>563,1172=>854,1173=>705,1174=>1312,1175=>1306,
-1176=>721,1177=>638,1178=>902,1179=>703,1182=>910,1183=>677,1184=>1041,1185=>760,1186=>952,1187=>805,
-1188=>1167,1189=>955,1190=>1324,1191=>1013,1194=>796,1195=>609,1196=>744,1197=>1142,1198=>714,1199=>572,
-1200=>713,1201=>572,1202=>789,1203=>596,1204=>1010,1205=>833,1206=>913,1207=>792,1210=>910,1211=>727,
-1216=>468,1217=>1312,1218=>1306,1219=>869,1220=>693,1223=>945,1224=>732,1227=>984,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=>1306,1246=>721,1247=>638,1248=>657,1249=>568,1250=>945,1251=>727,
-1252=>945,1253=>727,1254=>871,1255=>667,1256=>871,1257=>667,1258=>871,1259=>667,1260=>795,1261=>645,
-1262=>812,1263=>598,1264=>812,1265=>598,1266=>812,1267=>598,1268=>913,1269=>715,1270=>690,1271=>563,
-1272=>1202,1273=>1018,1296=>721,1297=>638,1298=>884,1299=>732,1300=>1248,1301=>1005,1306=>820,1307=>640,
-1308=>1028,1309=>856,4256=>765,4257=>945,4258=>876,4259=>884,4260=>791,4261=>1087,4262=>1024,4263=>1223,
-4264=>653,4265=>828,4266=>1061,4267=>1061,4268=>806,4269=>1145,4270=>979,4271=>912,4272=>1119,4273=>802,
-4274=>766,4275=>1085,4276=>986,4277=>1076,4278=>820,4279=>843,4280=>831,4281=>843,4282=>918,4283=>1086,
-4284=>779,4285=>832,4286=>822,4287=>1121,4288=>1132,4289=>812,4290=>902,4291=>812,4292=>890,4293=>1073,
-4304=>594,4305=>625,4306=>643,4307=>887,4308=>615,4309=>611,4310=>666,4311=>915,4312=>613,4313=>600,
-4314=>1120,4315=>654,4316=>640,4317=>879,4318=>624,4319=>634,4320=>877,4321=>657,4322=>802,4323=>751,
-4324=>869,4325=>639,4326=>912,4327=>622,4328=>647,4329=>640,4330=>729,4331=>641,4332=>639,4333=>629,
-4334=>674,4335=>737,4336=>625,4337=>657,4338=>625,4339=>625,4340=>624,4341=>670,4342=>940,4343=>680,
-4344=>636,4345=>672,4346=>625,4347=>446,4348=>363,7426=>940,7432=>509,7433=>320,7444=>989,7446=>667,
-7447=>667,7453=>737,7454=>948,7455=>948,7468=>489,7469=>651,7470=>532,7472=>546,7473=>480,7474=>480,
-7475=>538,7476=>595,7477=>294,7478=>298,7479=>547,7480=>443,7481=>697,7482=>576,7483=>576,7484=>548,
-7486=>474,7487=>523,7488=>469,7489=>549,7490=>708,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=>434,7514=>729,7515=>491,
-7522=>239,7523=>414,7524=>520,7525=>491,7543=>640,7544=>595,7547=>380,7557=>380,7579=>498,7580=>427,
-7581=>427,7582=>467,7583=>412,7584=>271,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,7609=>489,7610=>366,7611=>357,
-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,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,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,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,7838=>947,7839=>667,
-7840=>776,7841=>648,7842=>776,7843=>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,7878=>762,7879=>636,7880=>468,7881=>380,7882=>468,7883=>380,7884=>871,7885=>667,
-7886=>871,7887=>667,7896=>871,7897=>667,7908=>872,7909=>727,7910=>872,7911=>727,7922=>714,7923=>581,
-7924=>714,7925=>581,7926=>714,7927=>581,7928=>714,7929=>581,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=>1813,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=>458,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=>375,8340=>444,8358=>696,8367=>1155,8369=>790,8372=>876,8373=>696,
-8451=>1198,8457=>1112,8462=>727,8463=>727,8470=>1087,8486=>890,8487=>890,8490=>869,8491=>776,8513=>786,
-8514=>576,8515=>637,8516=>760,8523=>903,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,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,
-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,11364=>831,
-11367=>945,11368=>727,11369=>869,11370=>693,11371=>730,11372=>568,11374=>1107,11375=>776,11381=>779,11382=>576,
-11383=>905,11385=>571,11386=>667,11388=>313,11389=>489,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=>1085,42580=>1287,42581=>1025,42582=>1287,42583=>1029,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,42891=>439,
-42892=>306,62464=>726,62465=>737,62466=>786,62467=>1019,62468=>737,62469=>731,62470=>796,62471=>1058,62472=>737,
-62473=>737,62474=>1329,62475=>754,62476=>753,62477=>1024,62478=>737,62479=>753,62480=>1070,62481=>818,62482=>870,
-62483=>819,62484=>1016,62485=>753,62486=>1008,62487=>752,62488=>760,62489=>753,62490=>800,62491=>753,62492=>760,
-62493=>738,62494=>801,62495=>956,62496=>736,62497=>847,62498=>737,62499=>737,62500=>737,62501=>793,62502=>1033,
-62504=>904,63172=>563,63173=>667,63174=>699,63175=>727,63176=>1058,63185=>500,63188=>500,64256=>827,64257=>727,
-64258=>727,64259=>1108,64260=>1146,64261=>879,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='dejavuserifbi.z';
-$ctg='dejavuserifbi.ctg.z';
-$originalsize=294244;
-?>
\ No newline at end of file
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserifbi.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserifbi.z
deleted file mode 100644
index ab7e8b2f..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserifbi.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserifcondensed.ctg.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserifcondensed.ctg.z
deleted file mode 100644
index 6e01b837..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserifcondensed.ctg.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserifcondensed.php b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserifcondensed.php
deleted file mode 100644
index fb89925f..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserifcondensed.php
+++ /dev/null
@@ -1,313 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='DejaVuSerifCondensed';
-$desc=array('Ascent'=>928,'Descent'=>-236,'CapHeight'=>5,'Flags'=>32,'FontBBox'=>'[-692 -347 1511 1242]','ItalicAngle'=>0,'StemV'=>70,'MissingWidth'=>540);
-$up=-63;
-$ut=44;
-$dw=540;
-$cw=array(
-0=>540,32=>286,33=>361,34=>414,35=>754,36=>572,37=>855,38=>801,39=>247,40=>351,
-41=>351,42=>450,43=>754,44=>286,45=>304,46=>286,47=>303,48=>572,49=>572,50=>572,
-51=>572,52=>572,53=>572,54=>572,55=>572,56=>572,57=>572,58=>303,59=>303,60=>754,
-61=>754,62=>754,63=>482,64=>900,65=>650,66=>661,67=>688,68=>721,69=>657,70=>624,
-71=>719,72=>785,73=>355,74=>360,75=>672,76=>598,77=>921,78=>787,79=>738,80=>605,
-81=>738,82=>677,83=>616,84=>600,85=>758,86=>650,87=>925,88=>641,89=>594,90=>625,
-91=>351,92=>303,93=>351,94=>754,95=>450,96=>450,97=>536,98=>576,99=>504,100=>576,
-101=>532,102=>333,103=>576,104=>580,105=>288,106=>279,107=>545,108=>288,109=>853,110=>580,
-111=>542,112=>576,113=>576,114=>430,115=>461,116=>361,117=>580,118=>508,119=>770,120=>507,
-121=>508,122=>474,123=>572,124=>303,125=>572,126=>754,8364=>572,8218=>286,402=>333,8222=>466,
-8230=>900,8224=>450,8225=>450,710=>450,8240=>1208,352=>616,8249=>360,338=>1023,381=>625,8216=>286,
-8217=>286,8220=>460,8221=>460,8226=>531,8211=>450,8212=>900,732=>450,8482=>900,353=>461,8250=>360,
-339=>890,382=>474,376=>594,160=>286,161=>361,162=>572,163=>572,164=>572,165=>572,166=>303,
-167=>450,168=>450,169=>900,170=>427,171=>550,172=>754,173=>304,174=>900,175=>450,176=>450,
-177=>754,178=>360,179=>360,180=>450,181=>584,182=>572,183=>286,184=>450,185=>360,186=>423,
-187=>550,188=>872,189=>872,190=>872,191=>482,192=>650,193=>650,194=>650,195=>650,196=>650,
-197=>650,198=>901,199=>688,200=>657,201=>657,202=>657,203=>657,204=>355,205=>355,206=>355,
-207=>355,208=>726,209=>787,210=>738,211=>738,212=>738,213=>738,214=>738,215=>754,216=>738,
-217=>758,218=>758,219=>758,220=>758,221=>594,222=>608,223=>601,224=>536,225=>536,226=>536,
-227=>536,228=>536,229=>536,230=>846,231=>504,232=>532,233=>532,234=>532,235=>532,236=>288,
-237=>288,238=>288,239=>288,240=>542,241=>580,242=>542,243=>542,244=>542,245=>542,246=>542,
-247=>754,248=>542,249=>580,250=>580,251=>580,252=>580,253=>508,254=>576,255=>508,256=>650,
-257=>536,258=>650,259=>536,260=>650,261=>536,262=>688,263=>504,264=>688,265=>504,266=>688,
-267=>504,268=>688,269=>504,270=>721,271=>576,272=>726,273=>576,274=>657,275=>532,276=>657,
-277=>532,278=>657,279=>532,280=>657,281=>532,282=>657,283=>532,284=>719,285=>576,286=>719,
-287=>576,288=>719,289=>576,290=>719,291=>576,292=>785,293=>580,294=>785,295=>580,296=>355,
-297=>288,298=>355,299=>288,300=>355,301=>288,302=>355,303=>288,304=>355,305=>288,306=>721,
-307=>479,308=>360,309=>279,310=>672,311=>545,312=>545,313=>598,314=>288,315=>598,316=>288,
-317=>598,318=>288,319=>598,320=>288,321=>602,322=>292,323=>787,324=>580,325=>787,326=>580,
-327=>787,328=>580,329=>779,330=>758,331=>580,332=>738,333=>542,334=>738,335=>542,336=>738,
-337=>542,340=>677,341=>430,342=>677,343=>430,344=>677,345=>430,346=>616,347=>461,348=>616,
-349=>461,350=>616,351=>461,354=>600,355=>361,356=>600,357=>361,358=>600,359=>361,360=>758,
-361=>580,362=>758,363=>580,364=>758,365=>580,366=>758,367=>580,368=>758,369=>580,370=>758,
-371=>580,372=>925,373=>770,374=>594,375=>508,377=>625,378=>474,379=>625,380=>474,383=>333,
-384=>576,385=>661,386=>661,387=>576,388=>661,389=>576,390=>688,391=>688,392=>504,393=>726,
-394=>721,395=>661,396=>576,397=>542,398=>657,399=>738,400=>561,401=>624,403=>719,404=>641,
-405=>839,406=>355,407=>355,408=>672,409=>545,410=>288,411=>570,412=>853,413=>787,414=>580,
-415=>738,416=>738,417=>542,418=>936,419=>726,420=>605,421=>576,422=>677,423=>616,424=>461,
-425=>636,426=>292,427=>361,428=>600,429=>361,430=>600,431=>758,432=>580,433=>746,434=>684,
-435=>664,436=>596,437=>625,438=>474,439=>508,440=>508,441=>508,443=>572,444=>618,445=>508,
-446=>482,448=>265,449=>443,450=>413,451=>265,452=>1347,453=>1195,454=>1050,455=>958,456=>876,
-457=>567,458=>1148,459=>1066,460=>858,461=>650,462=>536,463=>355,464=>288,465=>738,466=>542,
-467=>758,468=>580,469=>758,470=>580,471=>758,472=>580,473=>758,474=>580,475=>758,476=>580,
-477=>532,478=>650,479=>536,480=>650,481=>536,482=>901,483=>846,484=>763,485=>576,486=>719,
-487=>576,488=>672,489=>545,490=>738,491=>542,492=>738,493=>542,494=>508,495=>508,496=>288,
-497=>1347,498=>1195,499=>1050,500=>719,501=>576,502=>1038,504=>787,505=>580,506=>650,507=>536,
-508=>901,509=>846,510=>738,511=>542,512=>650,513=>536,514=>650,515=>536,516=>657,517=>532,
-518=>657,519=>532,520=>355,521=>288,522=>355,523=>288,524=>738,525=>542,526=>738,527=>542,
-528=>677,529=>430,530=>677,531=>430,532=>758,533=>580,534=>758,535=>580,536=>616,537=>461,
-538=>600,539=>361,540=>564,541=>469,542=>785,543=>580,544=>758,545=>732,548=>625,549=>474,
-550=>650,551=>536,552=>657,553=>532,554=>738,555=>542,556=>738,557=>542,558=>738,559=>542,
-560=>738,561=>542,562=>594,563=>508,564=>450,565=>748,566=>444,567=>279,568=>864,569=>864,
-570=>650,571=>688,572=>504,573=>598,574=>600,575=>461,576=>474,577=>525,578=>417,581=>650,
-592=>536,593=>576,594=>576,595=>576,596=>504,597=>504,598=>582,599=>614,600=>532,601=>532,
-602=>759,603=>466,604=>458,605=>695,606=>552,607=>283,608=>615,609=>576,610=>489,611=>641,
-612=>507,613=>580,614=>580,615=>580,616=>288,617=>353,618=>288,619=>342,620=>409,621=>326,
-622=>633,623=>853,624=>853,625=>853,626=>579,627=>624,628=>581,629=>542,630=>711,631=>583,
-632=>542,633=>451,634=>451,635=>496,636=>430,637=>430,638=>407,639=>407,640=>534,641=>534,
-642=>461,643=>244,644=>333,645=>438,646=>292,647=>361,648=>361,649=>580,650=>558,651=>547,
-652=>508,653=>770,654=>508,655=>589,656=>537,657=>504,658=>508,659=>504,660=>482,661=>482,
-662=>482,663=>461,664=>738,665=>506,666=>552,667=>588,668=>600,669=>329,670=>545,671=>581,
-672=>615,673=>482,674=>482,675=>896,676=>930,677=>898,678=>728,679=>538,680=>704,681=>804,
-682=>582,683=>608,684=>538,685=>398,686=>703,687=>690,688=>389,689=>387,690=>237,691=>312,
-692=>312,693=>387,694=>352,695=>527,696=>381,697=>250,699=>286,700=>286,701=>286,702=>276,
-703=>276,704=>252,705=>252,711=>450,712=>247,713=>450,716=>247,720=>303,721=>303,722=>276,
-723=>276,726=>295,728=>450,729=>450,730=>450,731=>450,733=>450,734=>375,736=>402,737=>218,
-738=>303,739=>381,740=>252,741=>444,742=>444,743=>444,744=>444,745=>444,750=>435,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=>666,881=>478,884=>250,
-885=>250,890=>450,891=>504,892=>504,893=>504,894=>303,900=>450,901=>450,902=>650,903=>286,
-904=>810,905=>935,906=>505,908=>751,910=>808,911=>767,912=>353,913=>650,914=>661,915=>624,
-916=>650,917=>657,918=>625,919=>785,920=>738,921=>355,922=>672,923=>650,924=>921,925=>787,
-926=>633,927=>738,928=>785,929=>605,931=>636,932=>600,933=>594,934=>738,935=>641,936=>789,
-937=>746,938=>355,939=>594,940=>607,941=>466,942=>539,943=>353,944=>547,945=>607,946=>520,
-947=>538,948=>542,949=>466,950=>488,951=>539,952=>542,953=>353,954=>563,955=>570,956=>584,
-957=>547,958=>496,959=>542,960=>591,961=>529,962=>504,963=>614,964=>498,965=>547,966=>630,
-967=>545,968=>706,969=>734,970=>353,971=>547,972=>542,973=>547,974=>734,976=>524,977=>643,
-978=>618,979=>787,980=>618,981=>613,982=>734,983=>561,984=>738,985=>542,986=>688,987=>504,
-988=>624,989=>417,990=>531,991=>593,992=>704,993=>519,1008=>561,1009=>529,1010=>504,1011=>279,
-1012=>738,1013=>504,1014=>504,1015=>608,1016=>576,1017=>688,1018=>921,1019=>637,1020=>529,1021=>688,
-1022=>688,1023=>688,1024=>657,1025=>657,1026=>719,1027=>596,1028=>688,1029=>616,1030=>355,1031=>355,
-1032=>360,1033=>976,1034=>1006,1035=>785,1036=>696,1037=>785,1038=>650,1039=>785,1040=>681,1041=>661,
-1042=>661,1043=>596,1044=>731,1045=>657,1046=>1011,1047=>561,1048=>785,1049=>785,1050=>696,1051=>751,
-1052=>921,1053=>785,1054=>738,1055=>785,1056=>605,1057=>688,1058=>600,1059=>650,1060=>747,1061=>641,
-1062=>785,1063=>695,1064=>1027,1065=>1027,1066=>715,1067=>885,1068=>606,1069=>688,1070=>1074,1071=>727,
-1072=>536,1073=>542,1074=>506,1075=>471,1076=>554,1077=>532,1078=>828,1079=>491,1080=>600,1081=>600,
-1082=>563,1083=>571,1084=>700,1085=>600,1086=>542,1087=>600,1088=>576,1089=>504,1090=>498,1091=>529,
-1092=>704,1093=>507,1094=>579,1095=>595,1096=>836,1097=>836,1098=>572,1099=>716,1100=>490,1101=>504,
-1102=>783,1103=>567,1104=>532,1105=>532,1106=>561,1107=>471,1108=>504,1109=>461,1110=>288,1111=>288,
-1112=>279,1113=>759,1114=>774,1115=>580,1116=>563,1117=>600,1118=>529,1119=>590,1122=>686,1123=>542,
-1124=>1016,1125=>750,1130=>1011,1131=>828,1136=>849,1137=>812,1138=>738,1139=>497,1140=>773,1141=>610,
-1164=>636,1165=>490,1168=>604,1169=>476,1170=>596,1171=>471,1172=>655,1173=>552,1174=>1011,1175=>828,
-1176=>572,1177=>483,1178=>696,1179=>545,1182=>696,1183=>563,1184=>801,1185=>645,1186=>785,1187=>577,
-1188=>1025,1189=>767,1190=>1084,1191=>847,1194=>688,1195=>504,1196=>600,1197=>498,1198=>594,1199=>508,
-1200=>594,1201=>508,1202=>641,1203=>507,1204=>856,1205=>659,1206=>674,1207=>621,1210=>674,1211=>580,
-1216=>355,1217=>1011,1218=>828,1219=>672,1220=>545,1223=>785,1224=>600,1227=>674,1228=>600,1231=>288,
-1232=>681,1233=>536,1234=>681,1235=>536,1236=>901,1237=>846,1238=>657,1239=>532,1240=>738,1241=>532,
-1242=>738,1243=>532,1244=>1011,1245=>828,1246=>561,1247=>491,1248=>508,1249=>508,1250=>785,1251=>600,
-1252=>785,1253=>600,1254=>738,1255=>542,1256=>738,1257=>542,1258=>738,1259=>542,1260=>688,1261=>504,
-1262=>650,1263=>529,1264=>650,1265=>529,1266=>650,1267=>529,1268=>695,1269=>595,1270=>596,1271=>471,
-1272=>885,1273=>716,1296=>561,1297=>491,1298=>751,1299=>571,1300=>1078,1301=>827,1306=>738,1307=>576,
-1308=>925,1309=>770,4256=>650,4257=>765,4258=>745,4259=>773,4260=>659,4261=>883,4262=>824,4263=>991,
-4264=>510,4265=>675,4266=>866,4267=>847,4268=>668,4269=>967,4270=>807,4271=>746,4272=>936,4273=>660,
-4274=>602,4275=>914,4276=>843,4277=>917,4278=>658,4279=>659,4280=>659,4281=>660,4282=>791,4283=>843,
-4284=>642,4285=>679,4286=>660,4287=>862,4288=>900,4289=>632,4290=>777,4291=>660,4292=>753,4293=>855,
-4304=>486,4305=>514,4306=>530,4307=>750,4308=>505,4309=>501,4310=>556,4311=>774,4312=>503,4313=>491,
-4314=>959,4315=>527,4316=>527,4317=>743,4318=>513,4319=>522,4320=>741,4321=>546,4322=>673,4323=>628,
-4324=>733,4325=>526,4326=>772,4327=>511,4328=>534,4329=>527,4330=>607,4331=>528,4332=>523,4333=>518,
-4334=>550,4335=>615,4336=>514,4337=>542,4338=>514,4339=>514,4340=>513,4341=>584,4342=>797,4343=>563,
-4344=>523,4345=>557,4346=>514,4347=>393,4348=>318,7426=>846,7432=>458,7433=>288,7444=>890,7446=>542,
-7447=>542,7453=>663,7454=>853,7455=>853,7468=>409,7469=>567,7470=>417,7472=>454,7473=>413,7474=>413,
-7475=>453,7476=>494,7477=>224,7478=>227,7479=>423,7480=>376,7481=>580,7482=>496,7483=>496,7484=>464,
-7486=>381,7487=>426,7488=>378,7489=>478,7490=>583,7491=>347,7492=>347,7493=>360,7494=>556,7495=>360,
-7496=>360,7497=>348,7498=>348,7499=>306,7500=>306,7501=>360,7502=>157,7503=>328,7504=>552,7505=>359,
-7506=>347,7507=>312,7508=>347,7509=>347,7510=>360,7511=>222,7512=>359,7513=>417,7514=>552,7515=>335,
-7522=>181,7523=>312,7524=>359,7525=>335,7543=>576,7544=>494,7547=>334,7557=>288,7579=>360,7580=>312,
-7581=>312,7582=>347,7583=>306,7584=>199,7585=>206,7586=>360,7587=>359,7588=>210,7589=>219,7590=>210,
-7591=>210,7592=>207,7593=>158,7594=>157,7595=>330,7596=>552,7597=>552,7598=>366,7599=>364,7600=>359,
-7601=>347,7602=>347,7603=>295,7604=>190,7605=>222,7606=>359,7607=>350,7609=>338,7610=>335,7611=>297,
-7612=>297,7613=>297,7614=>327,7615=>347,7620=>0,7621=>0,7622=>0,7623=>0,7624=>0,7625=>0,
-7680=>650,7681=>536,7682=>661,7683=>576,7684=>661,7685=>576,7686=>661,7687=>576,7688=>688,7689=>504,
-7690=>721,7691=>576,7692=>721,7693=>576,7694=>721,7695=>576,7696=>721,7697=>576,7698=>721,7699=>576,
-7700=>657,7701=>532,7702=>657,7703=>532,7704=>657,7705=>532,7706=>657,7707=>532,7708=>657,7709=>532,
-7710=>624,7711=>333,7712=>719,7713=>576,7714=>785,7715=>580,7716=>785,7717=>580,7718=>785,7719=>580,
-7720=>785,7721=>580,7722=>785,7723=>580,7724=>355,7725=>288,7728=>672,7729=>545,7730=>672,7731=>545,
-7732=>672,7733=>545,7734=>598,7735=>288,7736=>598,7737=>288,7738=>598,7739=>288,7740=>598,7741=>288,
-7742=>921,7743=>853,7744=>921,7745=>853,7746=>921,7747=>853,7748=>787,7749=>580,7750=>787,7751=>580,
-7752=>787,7753=>580,7754=>787,7755=>580,7756=>738,7757=>542,7760=>738,7761=>542,7762=>738,7763=>542,
-7764=>605,7765=>576,7766=>605,7767=>576,7768=>677,7769=>430,7770=>677,7771=>430,7772=>677,7773=>430,
-7774=>677,7775=>430,7776=>616,7777=>461,7778=>616,7779=>461,7784=>616,7785=>461,7786=>600,7787=>361,
-7788=>600,7789=>361,7790=>600,7791=>361,7792=>600,7793=>361,7794=>758,7795=>580,7796=>758,7797=>580,
-7798=>758,7799=>580,7800=>758,7801=>580,7802=>758,7803=>580,7804=>650,7805=>508,7806=>650,7807=>508,
-7808=>925,7809=>770,7810=>925,7811=>770,7812=>925,7813=>770,7814=>925,7815=>770,7816=>925,7817=>770,
-7818=>641,7819=>507,7820=>641,7821=>507,7822=>594,7823=>508,7824=>625,7825=>474,7826=>625,7827=>474,
-7828=>625,7829=>474,7830=>580,7831=>361,7832=>770,7833=>508,7834=>813,7835=>333,7838=>746,7839=>542,
-7840=>650,7841=>536,7842=>650,7843=>536,7852=>650,7853=>536,7854=>650,7855=>536,7856=>650,7857=>536,
-7858=>650,7859=>536,7860=>650,7861=>536,7862=>650,7863=>536,7864=>657,7865=>532,7866=>657,7867=>532,
-7868=>657,7869=>532,7878=>657,7879=>532,7880=>355,7881=>288,7882=>355,7883=>288,7884=>738,7885=>542,
-7886=>738,7887=>542,7896=>738,7897=>542,7908=>758,7909=>580,7910=>758,7911=>580,7922=>594,7923=>508,
-7924=>594,7925=>508,7926=>594,7927=>508,7928=>594,7929=>508,7936=>607,7937=>607,7938=>607,7939=>607,
-7940=>607,7941=>607,7942=>607,7943=>607,7944=>650,7945=>650,7946=>782,7947=>782,7948=>660,7949=>687,
-7950=>650,7951=>650,7952=>483,7953=>483,7954=>483,7955=>483,7956=>483,7957=>483,7960=>768,7961=>757,
-7962=>960,7963=>969,7964=>907,7965=>931,7968=>539,7969=>539,7970=>539,7971=>539,7972=>539,7973=>539,
-7974=>539,7975=>539,7976=>898,7977=>893,7978=>1090,7979=>1101,7980=>1043,7981=>1064,7982=>988,7983=>985,
-7984=>353,7985=>353,7986=>353,7987=>353,7988=>353,7989=>353,7990=>353,7991=>353,7992=>469,7993=>461,
-7994=>661,7995=>664,7996=>611,7997=>635,7998=>561,7999=>553,8000=>542,8001=>542,8002=>542,8003=>542,
-8004=>542,8005=>542,8008=>738,8009=>773,8010=>1008,8011=>1015,8012=>843,8013=>867,8016=>547,8017=>547,
-8018=>547,8019=>547,8020=>547,8021=>547,8022=>547,8023=>547,8025=>765,8027=>971,8029=>939,8031=>857,
-8032=>734,8033=>734,8034=>734,8035=>734,8036=>734,8037=>734,8038=>734,8039=>734,8040=>746,8041=>783,
-8042=>1018,8043=>1023,8044=>852,8045=>878,8046=>844,8047=>873,8048=>607,8049=>607,8050=>483,8051=>483,
-8052=>539,8053=>539,8054=>353,8055=>353,8056=>542,8057=>542,8058=>547,8059=>547,8060=>734,8061=>734,
-8064=>607,8065=>607,8066=>607,8067=>607,8068=>607,8069=>607,8070=>607,8071=>607,8072=>650,8073=>650,
-8074=>782,8075=>782,8076=>660,8077=>687,8078=>650,8079=>650,8080=>539,8081=>539,8082=>539,8083=>539,
-8084=>539,8085=>539,8086=>539,8087=>539,8088=>898,8089=>893,8090=>1090,8091=>1101,8092=>1043,8093=>1064,
-8094=>988,8095=>985,8096=>734,8097=>734,8098=>734,8099=>734,8100=>734,8101=>734,8102=>734,8103=>734,
-8104=>746,8105=>783,8106=>1018,8107=>1023,8108=>852,8109=>878,8110=>844,8111=>873,8112=>607,8113=>607,
-8114=>607,8115=>607,8116=>607,8118=>607,8119=>607,8120=>650,8121=>650,8122=>650,8123=>650,8124=>650,
-8125=>450,8126=>450,8127=>450,8128=>450,8129=>450,8130=>539,8131=>539,8132=>539,8134=>539,8135=>539,
-8136=>820,8137=>810,8138=>956,8139=>935,8140=>785,8141=>450,8142=>450,8143=>450,8144=>353,8145=>353,
-8146=>353,8147=>353,8150=>353,8151=>353,8152=>355,8153=>355,8154=>529,8155=>505,8157=>450,8158=>450,
-8159=>450,8160=>547,8161=>547,8162=>547,8163=>547,8164=>529,8165=>529,8166=>547,8167=>547,8168=>594,
-8169=>594,8170=>829,8171=>808,8172=>711,8173=>450,8174=>450,8175=>450,8178=>734,8179=>734,8180=>734,
-8182=>734,8183=>734,8184=>865,8185=>751,8186=>886,8187=>767,8188=>746,8189=>450,8190=>450,8192=>450,
-8193=>900,8194=>450,8195=>900,8196=>296,8197=>225,8198=>150,8199=>572,8200=>286,8201=>180,8202=>89,
-8203=>0,8204=>0,8205=>0,8206=>0,8207=>0,8208=>304,8209=>304,8210=>572,8213=>900,8214=>450,
-8215=>450,8219=>286,8223=>460,8227=>531,8228=>300,8229=>600,8234=>0,8235=>0,8236=>0,8237=>0,
-8238=>0,8239=>180,8241=>1560,8242=>204,8243=>336,8244=>468,8245=>204,8246=>336,8247=>468,8248=>305,
-8252=>475,8253=>482,8254=>450,8258=>900,8260=>150,8261=>351,8262=>351,8263=>878,8264=>678,8265=>678,
-8267=>572,8268=>450,8269=>450,8270=>450,8271=>303,8273=>450,8274=>404,8275=>900,8279=>597,8287=>200,
-8288=>0,8289=>0,8290=>0,8291=>0,8292=>0,8298=>0,8299=>0,8300=>0,8301=>0,8302=>0,
-8303=>0,8304=>360,8305=>181,8308=>360,8309=>360,8310=>360,8311=>360,8312=>360,8313=>360,8314=>475,
-8315=>475,8316=>475,8317=>221,8318=>221,8319=>389,8320=>360,8321=>360,8322=>360,8323=>360,8324=>360,
-8325=>360,8326=>360,8327=>360,8328=>360,8329=>360,8330=>475,8331=>475,8332=>475,8333=>221,8334=>221,
-8336=>347,8337=>348,8338=>347,8339=>381,8340=>348,8358=>594,8367=>951,8369=>635,8372=>702,8373=>572,
-8450=>716,8451=>1006,8457=>942,8461=>850,8462=>580,8463=>580,8469=>822,8470=>852,8473=>677,8474=>784,
-8477=>748,8484=>657,8486=>746,8487=>746,8490=>672,8491=>650,8508=>659,8509=>594,8510=>639,8511=>850,
-8512=>642,8513=>697,8514=>501,8515=>501,8516=>549,8517=>780,8518=>629,8519=>572,8520=>342,8521=>325,
-8523=>801,8531=>872,8532=>872,8533=>872,8534=>872,8535=>872,8536=>872,8537=>872,8538=>872,8539=>872,
-8540=>872,8541=>872,8542=>872,8543=>511,8544=>355,8545=>531,8546=>707,8547=>870,8548=>650,8549=>883,
-8550=>1059,8551=>1234,8552=>838,8553=>641,8554=>839,8555=>1015,8556=>598,8557=>688,8558=>721,8559=>921,
-8560=>288,8561=>576,8562=>863,8563=>796,8564=>508,8565=>796,8566=>1084,8567=>1372,8568=>795,8569=>507,
-8570=>795,8571=>1083,8572=>288,8573=>504,8574=>576,8575=>853,8576=>1085,8577=>721,8578=>1085,8579=>688,
-8580=>504,8592=>754,8593=>754,8594=>754,8595=>754,8596=>754,8597=>754,8598=>754,8599=>754,8600=>754,
-8601=>754,8602=>754,8603=>754,8604=>754,8605=>754,8606=>754,8607=>754,8608=>754,8609=>754,8610=>754,
-8611=>754,8612=>754,8613=>754,8614=>754,8615=>754,8616=>754,8617=>754,8618=>754,8619=>754,8620=>754,
-8621=>754,8622=>754,8623=>754,8624=>754,8625=>754,8626=>754,8627=>754,8628=>754,8629=>754,8630=>754,
-8631=>754,8632=>754,8633=>754,8634=>754,8635=>754,8636=>754,8637=>754,8638=>754,8639=>754,8640=>754,
-8641=>754,8642=>754,8643=>754,8644=>754,8645=>754,8646=>754,8647=>754,8648=>754,8649=>754,8650=>754,
-8651=>754,8652=>754,8653=>754,8654=>754,8655=>754,8656=>754,8657=>754,8658=>754,8659=>754,8660=>754,
-8661=>754,8662=>754,8663=>754,8664=>754,8665=>754,8666=>754,8667=>754,8668=>754,8669=>754,8670=>754,
-8671=>754,8672=>754,8673=>754,8674=>754,8675=>754,8676=>754,8677=>754,8678=>754,8679=>754,8680=>754,
-8681=>754,8682=>754,8683=>754,8684=>754,8685=>754,8686=>754,8687=>754,8688=>754,8689=>754,8690=>754,
-8691=>754,8692=>754,8693=>754,8694=>754,8695=>754,8696=>754,8697=>754,8698=>754,8699=>754,8700=>754,
-8701=>754,8702=>754,8703=>754,8704=>543,8706=>465,8707=>488,8708=>488,8710=>628,8711=>628,8712=>666,
-8713=>666,8715=>666,8716=>666,8719=>716,8720=>716,8721=>642,8722=>754,8723=>754,8724=>754,8725=>303,
-8727=>611,8728=>441,8729=>441,8730=>573,8731=>573,8732=>573,8733=>609,8734=>750,8735=>754,8736=>754,
-8739=>262,8740=>431,8741=>416,8742=>570,8743=>659,8744=>659,8745=>754,8746=>754,8747=>469,8748=>766,
-8749=>1063,8760=>754,8761=>754,8762=>754,8763=>754,8764=>754,8765=>754,8770=>754,8771=>754,8776=>754,
-8784=>754,8785=>754,8786=>754,8787=>754,8788=>930,8789=>930,8800=>754,8801=>754,8804=>754,8805=>754,
-8834=>754,8835=>754,8836=>754,8837=>754,8838=>754,8839=>754,8844=>754,8845=>754,8846=>754,8847=>761,
-8848=>761,8849=>761,8850=>761,8851=>754,8852=>754,8853=>754,8854=>754,8855=>754,8856=>754,8857=>754,
-8858=>754,8859=>754,8860=>754,8861=>754,8862=>754,8863=>754,8864=>754,8865=>754,8866=>773,8867=>773,
-8868=>846,8869=>846,8870=>510,8871=>510,8872=>773,8873=>773,8874=>773,8875=>927,8876=>773,8877=>773,
-8878=>773,8879=>927,8901=>308,8962=>687,8968=>351,8969=>351,8970=>351,8971=>351,8976=>754,8977=>461,
-8984=>900,8985=>754,8992=>469,8993=>469,8997=>900,9000=>1299,9085=>827,9134=>469,9167=>850,9251=>687,
-9472=>542,9473=>542,9474=>542,9475=>542,9476=>542,9477=>542,9478=>542,9479=>542,9480=>542,9481=>542,
-9482=>542,9483=>542,9484=>542,9485=>542,9486=>542,9487=>542,9488=>542,9489=>542,9490=>542,9491=>542,
-9492=>542,9493=>542,9494=>542,9495=>542,9496=>542,9497=>542,9498=>542,9499=>542,9500=>542,9501=>542,
-9502=>542,9503=>542,9504=>542,9505=>542,9506=>542,9507=>542,9508=>542,9509=>542,9510=>542,9511=>542,
-9512=>542,9513=>542,9514=>542,9515=>542,9516=>542,9517=>542,9518=>542,9519=>542,9520=>542,9521=>542,
-9522=>542,9523=>542,9524=>542,9525=>542,9526=>542,9527=>542,9528=>542,9529=>542,9530=>542,9531=>542,
-9532=>542,9533=>542,9534=>542,9535=>542,9536=>542,9537=>542,9538=>542,9539=>542,9540=>542,9541=>542,
-9542=>542,9543=>542,9544=>542,9545=>542,9546=>542,9547=>542,9548=>542,9549=>542,9550=>542,9551=>542,
-9552=>542,9553=>542,9554=>542,9555=>542,9556=>542,9557=>542,9558=>542,9559=>542,9560=>542,9561=>542,
-9562=>542,9563=>542,9564=>542,9565=>542,9566=>542,9567=>542,9568=>542,9569=>542,9570=>542,9571=>542,
-9572=>542,9573=>542,9574=>542,9575=>542,9576=>542,9577=>542,9578=>542,9579=>542,9580=>542,9581=>542,
-9582=>542,9583=>542,9584=>542,9585=>542,9586=>542,9587=>542,9588=>542,9589=>542,9590=>542,9591=>542,
-9592=>542,9593=>542,9594=>542,9595=>542,9596=>542,9597=>542,9598=>542,9599=>542,9600=>692,9601=>692,
-9602=>692,9603=>692,9604=>692,9605=>692,9606=>692,9607=>692,9608=>692,9609=>692,9610=>692,9611=>692,
-9612=>692,9613=>692,9614=>692,9615=>692,9616=>692,9617=>692,9618=>692,9619=>692,9620=>692,9621=>692,
-9622=>692,9623=>692,9624=>692,9625=>692,9626=>692,9627=>692,9628=>692,9629=>692,9630=>692,9631=>692,
-9632=>850,9633=>850,9634=>850,9635=>850,9636=>850,9637=>850,9638=>850,9639=>850,9640=>850,9641=>850,
-9642=>610,9643=>610,9644=>850,9645=>850,9646=>495,9647=>495,9648=>692,9649=>692,9650=>692,9651=>692,
-9652=>452,9653=>452,9654=>692,9655=>692,9656=>452,9657=>452,9658=>692,9659=>692,9660=>692,9661=>692,
-9662=>452,9663=>452,9664=>692,9665=>692,9666=>452,9667=>452,9668=>692,9669=>692,9670=>692,9671=>692,
-9672=>692,9673=>785,9674=>444,9675=>785,9676=>785,9677=>785,9678=>785,9679=>785,9680=>785,9681=>785,
-9682=>785,9683=>785,9684=>785,9685=>785,9686=>474,9687=>474,9688=>712,9689=>873,9690=>873,9691=>873,
-9692=>348,9693=>348,9694=>348,9695=>348,9696=>785,9697=>785,9698=>692,9699=>692,9700=>692,9701=>692,
-9702=>531,9703=>850,9704=>850,9705=>850,9706=>850,9707=>850,9708=>692,9709=>692,9710=>692,9711=>1007,
-9712=>850,9713=>850,9714=>850,9715=>850,9716=>785,9717=>785,9718=>785,9719=>785,9720=>692,9721=>692,
-9722=>692,9723=>747,9724=>747,9725=>659,9726=>659,9727=>692,9728=>807,9784=>807,9785=>807,9786=>807,
-9787=>807,9788=>807,9791=>552,9792=>658,9793=>658,9794=>807,9795=>807,9796=>807,9797=>807,9798=>807,
-9799=>807,9824=>807,9825=>807,9826=>807,9827=>807,9828=>807,9829=>807,9830=>807,9831=>807,9833=>424,
-9834=>574,9835=>807,9836=>807,9837=>424,9838=>321,9839=>435,10145=>754,10181=>351,10182=>351,10208=>444,
-10216=>351,10217=>351,10224=>754,10225=>754,10226=>754,10227=>754,10228=>930,10229=>1290,10230=>1290,10231=>1290,
-10232=>1290,10233=>1290,10234=>1290,10235=>1290,10236=>1290,10237=>1290,10238=>1290,10239=>1290,10240=>659,10241=>659,
-10242=>659,10243=>659,10244=>659,10245=>659,10246=>659,10247=>659,10248=>659,10249=>659,10250=>659,10251=>659,
-10252=>659,10253=>659,10254=>659,10255=>659,10256=>659,10257=>659,10258=>659,10259=>659,10260=>659,10261=>659,
-10262=>659,10263=>659,10264=>659,10265=>659,10266=>659,10267=>659,10268=>659,10269=>659,10270=>659,10271=>659,
-10272=>659,10273=>659,10274=>659,10275=>659,10276=>659,10277=>659,10278=>659,10279=>659,10280=>659,10281=>659,
-10282=>659,10283=>659,10284=>659,10285=>659,10286=>659,10287=>659,10288=>659,10289=>659,10290=>659,10291=>659,
-10292=>659,10293=>659,10294=>659,10295=>659,10296=>659,10297=>659,10298=>659,10299=>659,10300=>659,10301=>659,
-10302=>659,10303=>659,10304=>659,10305=>659,10306=>659,10307=>659,10308=>659,10309=>659,10310=>659,10311=>659,
-10312=>659,10313=>659,10314=>659,10315=>659,10316=>659,10317=>659,10318=>659,10319=>659,10320=>659,10321=>659,
-10322=>659,10323=>659,10324=>659,10325=>659,10326=>659,10327=>659,10328=>659,10329=>659,10330=>659,10331=>659,
-10332=>659,10333=>659,10334=>659,10335=>659,10336=>659,10337=>659,10338=>659,10339=>659,10340=>659,10341=>659,
-10342=>659,10343=>659,10344=>659,10345=>659,10346=>659,10347=>659,10348=>659,10349=>659,10350=>659,10351=>659,
-10352=>659,10353=>659,10354=>659,10355=>659,10356=>659,10357=>659,10358=>659,10359=>659,10360=>659,10361=>659,
-10362=>659,10363=>659,10364=>659,10365=>659,10366=>659,10367=>659,10368=>659,10369=>659,10370=>659,10371=>659,
-10372=>659,10373=>659,10374=>659,10375=>659,10376=>659,10377=>659,10378=>659,10379=>659,10380=>659,10381=>659,
-10382=>659,10383=>659,10384=>659,10385=>659,10386=>659,10387=>659,10388=>659,10389=>659,10390=>659,10391=>659,
-10392=>659,10393=>659,10394=>659,10395=>659,10396=>659,10397=>659,10398=>659,10399=>659,10400=>659,10401=>659,
-10402=>659,10403=>659,10404=>659,10405=>659,10406=>659,10407=>659,10408=>659,10409=>659,10410=>659,10411=>659,
-10412=>659,10413=>659,10414=>659,10415=>659,10416=>659,10417=>659,10418=>659,10419=>659,10420=>659,10421=>659,
-10422=>659,10423=>659,10424=>659,10425=>659,10426=>659,10427=>659,10428=>659,10429=>659,10430=>659,10431=>659,
-10432=>659,10433=>659,10434=>659,10435=>659,10436=>659,10437=>659,10438=>659,10439=>659,10440=>659,10441=>659,
-10442=>659,10443=>659,10444=>659,10445=>659,10446=>659,10447=>659,10448=>659,10449=>659,10450=>659,10451=>659,
-10452=>659,10453=>659,10454=>659,10455=>659,10456=>659,10457=>659,10458=>659,10459=>659,10460=>659,10461=>659,
-10462=>659,10463=>659,10464=>659,10465=>659,10466=>659,10467=>659,10468=>659,10469=>659,10470=>659,10471=>659,
-10472=>659,10473=>659,10474=>659,10475=>659,10476=>659,10477=>659,10478=>659,10479=>659,10480=>659,10481=>659,
-10482=>659,10483=>659,10484=>659,10485=>659,10486=>659,10487=>659,10488=>659,10489=>659,10490=>659,10491=>659,
-10492=>659,10493=>659,10494=>659,10495=>659,10496=>754,10497=>754,10498=>754,10499=>754,10500=>754,10501=>754,
-10502=>754,10503=>754,10504=>754,10505=>754,10506=>754,10507=>754,10508=>754,10509=>754,10510=>754,10511=>754,
-10512=>754,10513=>754,10514=>754,10515=>754,10516=>754,10517=>754,10518=>754,10519=>754,10520=>754,10521=>754,
-10522=>754,10523=>754,10524=>754,10525=>754,10526=>754,10527=>754,10528=>754,10529=>754,10530=>754,10531=>754,
-10532=>754,10533=>754,10534=>754,10535=>754,10536=>754,10537=>754,10538=>754,10539=>754,10540=>754,10541=>754,
-10542=>754,10543=>754,10544=>754,10545=>754,10546=>754,10547=>754,10548=>754,10549=>754,10550=>754,10551=>754,
-10552=>754,10553=>754,10554=>754,10555=>754,10556=>754,10557=>754,10558=>754,10559=>754,10560=>754,10561=>754,
-10562=>754,10563=>754,10564=>754,10565=>754,10566=>754,10567=>754,10568=>754,10569=>754,10570=>754,10571=>754,
-10572=>754,10573=>754,10574=>754,10575=>754,10576=>754,10577=>754,10578=>754,10579=>754,10580=>754,10581=>754,
-10582=>754,10583=>754,10584=>754,10585=>754,10586=>754,10587=>754,10588=>754,10589=>754,10590=>754,10591=>754,
-10592=>754,10593=>754,10594=>754,10595=>754,10596=>754,10597=>754,10598=>754,10599=>754,10600=>754,10601=>754,
-10602=>754,10603=>754,10604=>754,10605=>754,10606=>754,10607=>754,10608=>754,10609=>754,10610=>754,10611=>754,
-10612=>754,10613=>754,10614=>754,10615=>883,10616=>754,10617=>754,10618=>886,10619=>754,10620=>754,10621=>754,
-10622=>754,10623=>754,10731=>444,10764=>1361,10765=>469,10766=>469,10799=>754,11008=>754,11009=>754,11010=>754,
-11011=>754,11012=>754,11013=>754,11014=>754,11015=>754,11016=>754,11017=>754,11018=>754,11019=>754,11020=>754,
-11021=>754,11022=>754,11023=>754,11024=>754,11025=>754,11026=>850,11027=>850,11028=>850,11029=>850,11030=>692,
-11031=>692,11032=>692,11033=>692,11034=>850,11364=>677,11367=>785,11368=>580,11369=>672,11370=>545,11371=>625,
-11372=>474,11374=>921,11375=>650,11381=>666,11382=>500,11383=>630,11385=>451,11386=>542,11388=>237,11389=>409,
-11520=>695,11521=>571,11522=>569,11523=>592,11524=>568,11525=>866,11526=>680,11527=>864,11528=>555,11529=>581,
-11530=>866,11531=>568,11532=>581,11533=>866,11534=>580,11535=>779,11536=>865,11537=>580,11538=>580,11539=>863,
-11540=>851,11541=>777,11542=>580,11543=>581,11544=>580,11545=>584,11546=>619,11547=>571,11548=>883,11549=>613,
-11550=>608,11551=>766,11552=>861,11553=>569,11554=>580,11555=>582,11556=>674,11557=>822,11800=>482,11810=>351,
-11811=>351,11812=>351,11813=>351,11822=>482,42564=>616,42565=>461,42566=>355,42567=>353,42576=>994,42577=>799,
-42580=>1074,42581=>783,42582=>1025,42583=>809,42760=>444,42761=>444,42762=>444,42763=>444,42764=>444,42765=>444,
-42766=>444,42767=>444,42768=>444,42769=>444,42770=>444,42771=>444,42772=>444,42773=>444,42774=>444,42779=>332,
-42780=>332,42781=>228,42782=>228,42783=>228,42891=>361,42892=>247,62464=>588,62465=>598,62466=>642,62467=>853,
-62468=>598,62469=>593,62470=>652,62471=>888,62472=>598,62473=>598,62474=>1131,62475=>614,62476=>613,62477=>857,
-62478=>598,62479=>613,62480=>898,62481=>671,62482=>718,62483=>672,62484=>850,62485=>613,62486=>842,62487=>612,
-62488=>619,62489=>613,62490=>655,62491=>613,62492=>619,62493=>599,62494=>656,62495=>795,62496=>598,62497=>635,
-62498=>599,62499=>598,62500=>598,62501=>649,62502=>865,62504=>813,63173=>542,63185=>450,63188=>450,64256=>639,
-64257=>600,64258=>600,64259=>925,64260=>927,64261=>694,64262=>839,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=>923);
-$enc='';
-$diff='';
-$file='dejavuserifcondensed.z';
-$ctg='dejavuserifcondensed.ctg.z';
-$originalsize=295840;
-?>
\ No newline at end of file
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserifcondensed.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserifcondensed.z
deleted file mode 100644
index 8af77724..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserifcondensed.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserifcondensedb.ctg.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserifcondensedb.ctg.z
deleted file mode 100644
index c1a3ccbf..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserifcondensedb.ctg.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserifcondensedb.php b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserifcondensedb.php
deleted file mode 100644
index 46d376b6..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserifcondensedb.php
+++ /dev/null
@@ -1,299 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='DejaVuSerifCondensed-Bold';
-$desc=array('Ascent'=>939,'Descent'=>-236,'CapHeight'=>4,'Flags'=>32,'FontBBox'=>'[-752 -389 1616 1235]','ItalicAngle'=>0,'StemV'=>120,'MissingWidth'=>540);
-$up=-63;
-$ut=44;
-$dw=540;
-$cw=array(
-0=>540,32=>313,33=>395,34=>469,35=>754,36=>626,37=>855,38=>813,39=>275,40=>426,
-41=>426,42=>470,43=>754,44=>313,45=>374,46=>313,47=>329,48=>626,49=>626,50=>626,
-51=>626,52=>626,53=>626,54=>626,55=>626,56=>626,57=>626,58=>332,59=>332,60=>754,
-61=>754,62=>754,63=>527,64=>900,65=>698,66=>760,67=>716,68=>780,69=>686,70=>639,
-71=>769,72=>850,73=>421,74=>426,75=>782,76=>633,77=>996,78=>822,79=>784,80=>677,
-81=>784,82=>748,83=>650,84=>669,85=>785,86=>698,87=>1011,88=>698,89=>642,90=>657,
-91=>426,92=>329,93=>426,94=>754,95=>450,96=>450,97=>583,98=>629,99=>548,100=>629,
-101=>572,102=>387,103=>629,104=>654,105=>342,106=>325,107=>624,108=>342,109=>952,110=>654,
-111=>600,112=>629,113=>629,114=>474,115=>506,116=>416,117=>654,118=>523,119=>774,120=>536,
-121=>523,122=>511,123=>579,124=>327,125=>579,126=>754,8364=>626,8218=>313,402=>387,8222=>518,
-8230=>900,8224=>470,8225=>470,710=>450,8240=>1246,352=>650,8249=>360,338=>1062,381=>657,8216=>313,
-8217=>313,8220=>518,8221=>518,8226=>575,8211=>450,8212=>900,732=>450,8482=>900,353=>506,8250=>360,
-339=>925,382=>511,376=>642,160=>313,161=>395,162=>626,163=>626,164=>572,165=>626,166=>327,
-167=>470,168=>450,169=>900,170=>438,171=>563,172=>754,173=>374,174=>900,175=>450,176=>450,
-177=>754,178=>394,179=>394,180=>450,181=>659,182=>572,183=>313,184=>450,185=>394,186=>450,
-187=>563,188=>938,189=>938,190=>938,191=>527,192=>698,193=>698,194=>698,195=>698,196=>698,
-197=>698,198=>931,199=>716,200=>686,201=>686,202=>686,203=>686,204=>421,205=>421,206=>421,
-207=>421,208=>787,209=>822,210=>784,211=>784,212=>784,213=>784,214=>784,215=>754,216=>784,
-217=>785,218=>785,219=>785,220=>785,221=>642,222=>681,223=>684,224=>583,225=>583,226=>583,
-227=>583,228=>583,229=>583,230=>877,231=>548,232=>572,233=>572,234=>572,235=>572,236=>342,
-237=>342,238=>342,239=>342,240=>600,241=>654,242=>600,243=>600,244=>600,245=>600,246=>600,
-247=>754,248=>600,249=>654,250=>654,251=>654,252=>654,253=>523,254=>629,255=>523,256=>698,
-257=>583,258=>698,259=>583,260=>698,261=>583,262=>716,263=>548,264=>716,265=>548,266=>716,
-267=>548,268=>716,269=>548,270=>780,271=>629,272=>787,273=>629,274=>686,275=>572,276=>686,
-277=>572,278=>686,279=>572,280=>686,281=>572,282=>686,283=>572,284=>769,285=>629,286=>769,
-287=>629,288=>769,289=>629,290=>769,291=>629,292=>850,293=>654,294=>850,295=>654,296=>421,
-297=>342,298=>421,299=>342,300=>421,301=>342,302=>421,303=>342,304=>421,305=>342,306=>848,
-307=>676,308=>426,309=>325,310=>782,311=>624,312=>624,313=>633,314=>342,315=>633,316=>342,
-317=>633,318=>342,319=>633,320=>342,321=>639,322=>346,323=>822,324=>654,325=>822,326=>654,
-327=>822,328=>654,329=>907,330=>785,331=>654,332=>784,333=>600,334=>784,335=>600,336=>784,
-337=>600,340=>748,341=>474,342=>748,343=>474,344=>748,345=>474,346=>650,347=>506,348=>650,
-349=>506,350=>650,351=>506,354=>669,355=>416,356=>669,357=>416,358=>669,359=>416,360=>785,
-361=>654,362=>785,363=>654,364=>785,365=>654,366=>785,367=>654,368=>785,369=>654,370=>785,
-371=>654,372=>1011,373=>774,374=>642,375=>523,377=>657,378=>511,379=>657,380=>511,383=>387,
-384=>629,385=>760,386=>769,387=>629,388=>769,389=>629,390=>716,391=>716,392=>548,393=>787,
-394=>780,395=>769,396=>629,397=>600,398=>686,399=>784,400=>649,401=>639,403=>769,404=>693,
-405=>938,406=>421,407=>421,408=>782,409=>624,410=>342,411=>631,412=>952,413=>822,414=>654,
-415=>784,416=>784,417=>600,418=>1080,419=>849,420=>677,421=>629,422=>748,423=>650,424=>506,
-425=>636,426=>298,427=>416,428=>669,429=>416,430=>669,431=>785,432=>654,433=>801,434=>801,
-435=>642,436=>637,437=>657,438=>511,439=>591,440=>591,441=>591,443=>626,444=>678,445=>511,
-446=>482,448=>265,449=>443,450=>413,451=>265,452=>1437,453=>1292,454=>1140,455=>1059,456=>958,
-457=>667,458=>1248,459=>1148,460=>980,461=>698,462=>583,463=>421,464=>342,465=>784,466=>600,
-467=>785,468=>654,469=>785,470=>654,471=>785,472=>654,473=>785,474=>654,475=>785,476=>654,
-477=>572,478=>698,479=>583,480=>698,481=>583,482=>931,483=>877,484=>806,485=>629,486=>769,
-487=>629,488=>782,489=>624,490=>784,491=>600,492=>784,493=>600,494=>591,495=>511,496=>342,
-497=>1437,498=>1292,499=>1140,500=>769,501=>629,502=>1099,504=>822,505=>654,506=>698,507=>583,
-508=>931,509=>877,510=>784,511=>600,512=>698,513=>583,514=>698,515=>583,516=>686,517=>572,
-518=>686,519=>572,520=>421,521=>342,522=>421,523=>342,524=>784,525=>600,526=>784,527=>600,
-528=>748,529=>474,530=>748,531=>474,532=>785,533=>654,534=>785,535=>654,536=>650,537=>506,
-538=>669,539=>416,540=>621,541=>546,542=>850,543=>654,544=>785,545=>711,548=>657,549=>511,
-550=>698,551=>583,552=>686,553=>572,554=>784,555=>600,556=>784,557=>600,558=>784,559=>600,
-560=>784,561=>600,562=>642,563=>523,564=>516,565=>830,566=>508,567=>325,568=>928,569=>928,
-570=>698,571=>716,572=>548,573=>633,574=>669,575=>506,576=>511,577=>594,578=>492,581=>698,
-592=>583,593=>629,594=>629,595=>629,596=>548,597=>548,598=>629,599=>657,600=>572,601=>572,
-602=>816,603=>547,604=>505,605=>816,606=>647,607=>348,608=>629,609=>629,610=>563,611=>641,
-612=>564,613=>654,614=>654,615=>654,616=>342,617=>342,618=>342,619=>368,620=>462,621=>342,
-622=>716,623=>952,624=>952,625=>952,626=>654,627=>654,628=>641,629=>600,630=>955,631=>674,
-632=>600,633=>514,634=>514,635=>514,636=>474,637=>474,638=>406,639=>438,640=>721,641=>721,
-642=>506,643=>298,644=>387,645=>486,646=>298,647=>443,648=>416,649=>654,650=>611,651=>624,
-652=>577,653=>816,654=>571,655=>654,656=>511,657=>511,658=>511,659=>511,660=>482,661=>482,
-662=>482,663=>490,664=>784,665=>625,666=>647,667=>563,668=>659,669=>345,670=>666,671=>581,
-672=>629,673=>482,674=>482,675=>1005,676=>1061,677=>1005,678=>819,679=>643,680=>817,681=>935,
-682=>711,683=>716,684=>596,685=>398,686=>552,687=>646,688=>469,689=>466,690=>282,691=>372,
-692=>372,693=>432,694=>474,695=>595,696=>436,697=>271,699=>313,700=>313,701=>313,702=>330,
-703=>330,704=>282,705=>282,711=>450,712=>254,713=>450,716=>254,720=>332,721=>332,722=>330,
-723=>330,726=>353,728=>450,729=>450,730=>450,731=>450,733=>450,734=>375,736=>412,737=>263,
-738=>355,739=>427,740=>282,741=>450,742=>450,743=>450,744=>450,745=>450,750=>498,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=>701,881=>519,884=>271,
-885=>271,890=>450,891=>548,892=>548,893=>548,894=>332,900=>450,901=>450,902=>698,903=>313,
-904=>852,905=>1006,906=>595,908=>798,910=>857,911=>820,912=>435,913=>698,914=>760,915=>639,
-916=>698,917=>686,918=>657,919=>850,920=>784,921=>421,922=>782,923=>698,924=>996,925=>822,
-926=>633,927=>784,928=>850,929=>677,931=>636,932=>669,933=>642,934=>784,935=>698,936=>822,
-937=>801,938=>421,939=>642,940=>692,941=>547,942=>654,943=>435,944=>624,945=>692,946=>598,
-947=>594,948=>600,949=>547,950=>533,951=>654,952=>600,953=>435,954=>674,955=>631,956=>659,
-957=>624,958=>533,959=>600,960=>659,961=>598,962=>548,963=>664,964=>605,965=>624,966=>814,
-967=>592,968=>847,969=>857,970=>435,971=>624,972=>600,973=>624,974=>857,976=>600,977=>764,
-978=>687,979=>872,980=>687,981=>847,982=>857,983=>589,984=>784,985=>600,986=>716,987=>548,
-988=>639,989=>475,990=>531,991=>593,992=>716,993=>600,1008=>589,1009=>598,1010=>548,1011=>325,
-1012=>784,1013=>548,1014=>548,1015=>681,1016=>629,1017=>716,1018=>996,1019=>774,1020=>623,1021=>716,
-1022=>716,1023=>716,1024=>686,1025=>686,1026=>811,1027=>621,1028=>716,1029=>650,1030=>421,1031=>421,
-1032=>426,1033=>1081,1034=>1135,1035=>866,1036=>818,1037=>850,1038=>730,1039=>850,1040=>733,1041=>769,
-1042=>760,1043=>621,1044=>800,1045=>686,1046=>1181,1047=>649,1048=>850,1049=>850,1050=>818,1051=>795,
-1052=>996,1053=>850,1054=>784,1055=>850,1056=>677,1057=>716,1058=>669,1059=>730,1060=>854,1061=>698,
-1062=>870,1063=>822,1064=>1141,1065=>1164,1066=>861,1067=>1081,1068=>743,1069=>716,1070=>1158,1071=>793,
-1072=>583,1073=>600,1074=>625,1075=>551,1076=>600,1077=>572,1078=>909,1079=>574,1080=>667,1081=>667,
-1082=>650,1083=>634,1084=>782,1085=>659,1086=>600,1087=>659,1088=>629,1089=>548,1090=>558,1091=>576,
-1092=>812,1093=>536,1094=>665,1095=>659,1096=>967,1097=>974,1098=>690,1099=>902,1100=>611,1101=>548,
-1102=>923,1103=>665,1104=>572,1105=>572,1106=>646,1107=>551,1108=>548,1109=>506,1110=>342,1111=>342,
-1112=>325,1113=>889,1114=>913,1115=>654,1116=>650,1117=>667,1118=>576,1119=>659,1122=>792,1123=>633,
-1124=>1076,1125=>867,1130=>1181,1131=>909,1136=>986,1137=>995,1138=>784,1139=>587,1140=>824,1141=>673,
-1164=>761,1165=>606,1168=>630,1169=>556,1170=>621,1171=>551,1172=>781,1173=>645,1174=>1181,1175=>909,
-1176=>649,1177=>574,1178=>852,1179=>669,1182=>818,1183=>650,1184=>937,1185=>744,1186=>870,1187=>665,
-1188=>1050,1189=>860,1190=>1210,1191=>953,1194=>716,1195=>548,1196=>669,1197=>558,1198=>642,1199=>523,
-1200=>642,1201=>523,1202=>779,1203=>584,1204=>919,1205=>726,1206=>835,1207=>665,1210=>819,1211=>654,
-1216=>421,1217=>1181,1218=>909,1219=>782,1220=>624,1223=>850,1224=>659,1227=>822,1228=>659,1231=>342,
-1232=>733,1233=>583,1234=>733,1235=>583,1236=>931,1237=>877,1238=>686,1239=>572,1240=>784,1241=>572,
-1242=>784,1243=>572,1244=>1181,1245=>909,1246=>649,1247=>574,1248=>591,1249=>511,1250=>850,1251=>667,
-1252=>850,1253=>667,1254=>784,1255=>600,1256=>784,1257=>600,1258=>784,1259=>600,1260=>716,1261=>548,
-1262=>730,1263=>576,1264=>730,1265=>576,1266=>730,1267=>576,1268=>822,1269=>659,1270=>621,1271=>551,
-1272=>1081,1273=>902,1296=>649,1297=>574,1298=>795,1299=>634,1300=>1123,1301=>851,1306=>738,1307=>576,
-1308=>925,1309=>770,4256=>680,4257=>842,4258=>779,4259=>787,4260=>703,4261=>970,4262=>913,4263=>1091,
-4264=>579,4265=>736,4266=>946,4267=>945,4268=>716,4269=>1021,4270=>872,4271=>812,4272=>998,4273=>712,
-4274=>680,4275=>968,4276=>878,4277=>959,4278=>729,4279=>750,4280=>739,4281=>750,4282=>817,4283=>969,
-4284=>692,4285=>739,4286=>731,4287=>1000,4288=>1010,4289=>721,4290=>803,4291=>722,4292=>792,4293=>957,
-4304=>535,4305=>563,4306=>579,4307=>798,4308=>553,4309=>549,4310=>600,4311=>823,4312=>552,4313=>540,
-4314=>1008,4315=>576,4316=>576,4317=>791,4318=>561,4319=>571,4320=>790,4321=>599,4322=>702,4323=>676,
-4324=>782,4325=>575,4326=>820,4327=>559,4328=>583,4329=>576,4330=>656,4331=>577,4332=>567,4333=>566,
-4334=>603,4335=>678,4336=>563,4337=>591,4338=>563,4339=>563,4340=>562,4341=>603,4342=>846,4343=>612,
-4344=>572,4345=>605,4346=>562,4347=>529,4348=>318,7426=>846,7432=>458,7433=>288,7444=>890,7446=>600,
-7447=>600,7453=>663,7454=>853,7455=>853,7468=>439,7469=>586,7470=>479,7472=>491,7473=>432,7474=>432,
-7475=>483,7476=>536,7477=>265,7478=>268,7479=>492,7480=>398,7481=>627,7482=>518,7483=>518,7484=>493,
-7486=>426,7487=>471,7488=>409,7489=>422,7490=>494,7491=>419,7492=>419,7493=>448,7494=>591,7495=>448,
-7496=>448,7497=>400,7498=>400,7499=>370,7500=>370,7501=>448,7502=>270,7503=>471,7504=>655,7505=>426,
-7506=>420,7507=>384,7508=>420,7509=>420,7510=>448,7511=>333,7512=>468,7513=>390,7514=>655,7515=>442,
-7522=>215,7523=>372,7524=>468,7525=>442,7543=>576,7544=>536,7547=>342,7557=>342,7579=>448,7580=>384,
-7581=>384,7582=>420,7583=>370,7584=>345,7585=>335,7586=>448,7587=>470,7588=>270,7589=>276,7590=>270,
-7591=>270,7592=>333,7593=>331,7594=>289,7595=>387,7596=>613,7597=>655,7598=>529,7599=>528,7600=>425,
-7601=>420,7602=>470,7603=>360,7604=>348,7605=>333,7606=>468,7607=>427,7609=>439,7610=>442,7611=>371,
-7612=>474,7613=>371,7614=>407,7615=>420,7620=>0,7621=>0,7622=>0,7623=>0,7624=>0,7625=>0,
-7680=>698,7681=>583,7682=>760,7683=>629,7684=>760,7685=>629,7686=>760,7687=>629,7688=>716,7689=>548,
-7690=>780,7691=>629,7692=>780,7693=>629,7694=>780,7695=>629,7696=>780,7697=>629,7698=>780,7699=>629,
-7700=>686,7701=>572,7702=>686,7703=>572,7704=>686,7705=>572,7706=>686,7707=>572,7708=>686,7709=>572,
-7710=>639,7711=>387,7712=>769,7713=>629,7714=>850,7715=>654,7716=>850,7717=>654,7718=>850,7719=>654,
-7720=>850,7721=>654,7722=>850,7723=>654,7724=>421,7725=>342,7728=>782,7729=>624,7730=>782,7731=>624,
-7732=>782,7733=>624,7734=>633,7735=>342,7736=>633,7737=>342,7738=>633,7739=>342,7740=>633,7741=>342,
-7742=>996,7743=>952,7744=>996,7745=>952,7746=>996,7747=>952,7748=>822,7749=>654,7750=>822,7751=>654,
-7752=>822,7753=>654,7754=>822,7755=>654,7756=>784,7757=>600,7760=>784,7761=>600,7762=>784,7763=>600,
-7764=>677,7765=>629,7766=>677,7767=>629,7768=>748,7769=>474,7770=>748,7771=>474,7772=>748,7773=>474,
-7774=>748,7775=>474,7776=>650,7777=>506,7778=>650,7779=>506,7784=>650,7785=>506,7786=>669,7787=>416,
-7788=>669,7789=>416,7790=>669,7791=>416,7792=>669,7793=>416,7794=>785,7795=>654,7796=>785,7797=>654,
-7798=>785,7799=>654,7800=>785,7801=>654,7802=>785,7803=>654,7804=>698,7805=>523,7806=>698,7807=>523,
-7808=>1011,7809=>774,7810=>1011,7811=>774,7812=>1011,7813=>774,7814=>1011,7815=>774,7816=>1011,7817=>774,
-7818=>698,7819=>536,7820=>698,7821=>536,7822=>642,7823=>523,7824=>657,7825=>511,7826=>657,7827=>511,
-7828=>657,7829=>511,7830=>654,7831=>416,7832=>774,7833=>523,7834=>913,7835=>387,7838=>852,7839=>600,
-7840=>698,7841=>583,7842=>698,7843=>583,7852=>698,7853=>583,7854=>698,7855=>583,7856=>698,7857=>583,
-7858=>698,7859=>583,7860=>698,7861=>583,7862=>698,7863=>583,7864=>686,7865=>572,7866=>686,7867=>572,
-7868=>686,7869=>572,7878=>686,7879=>572,7880=>421,7881=>342,7882=>421,7883=>342,7884=>784,7885=>600,
-7886=>784,7887=>600,7896=>784,7897=>600,7908=>785,7909=>654,7910=>785,7911=>654,7922=>642,7923=>523,
-7924=>642,7925=>523,7926=>642,7927=>523,7928=>642,7929=>523,7936=>692,7937=>692,7938=>692,7939=>692,
-7940=>692,7941=>692,7942=>692,7943=>692,7944=>698,7945=>698,7946=>880,7947=>880,7948=>748,7949=>764,
-7950=>698,7951=>698,7952=>547,7953=>547,7954=>547,7955=>547,7956=>547,7957=>547,7960=>826,7961=>817,
-7962=>1052,7963=>1052,7964=>984,7965=>1007,7968=>654,7969=>654,7970=>654,7971=>654,7972=>654,7973=>654,
-7974=>654,7975=>654,7976=>990,7977=>984,7978=>1222,7979=>1225,7980=>1151,7981=>1177,7982=>1077,7983=>1074,
-7984=>435,7985=>435,7986=>435,7987=>435,7988=>435,7989=>435,7990=>435,7991=>435,7992=>566,7993=>555,
-7994=>790,7995=>792,7996=>719,7997=>748,7998=>650,7999=>642,8000=>600,8001=>600,8002=>600,8003=>600,
-8004=>600,8005=>600,8008=>810,8009=>841,8010=>1116,8011=>1113,8012=>931,8013=>959,8016=>624,8017=>624,
-8018=>624,8019=>624,8020=>624,8021=>624,8022=>624,8023=>624,8025=>830,8027=>1067,8029=>1020,8031=>917,
-8032=>857,8033=>857,8034=>857,8035=>857,8036=>857,8037=>857,8038=>857,8039=>857,8040=>838,8041=>867,
-8042=>1141,8043=>1146,8044=>949,8045=>979,8046=>920,8047=>954,8048=>692,8049=>692,8050=>547,8051=>547,
-8052=>654,8053=>654,8054=>435,8055=>435,8056=>600,8057=>600,8058=>624,8059=>624,8060=>857,8061=>857,
-8064=>692,8065=>692,8066=>692,8067=>692,8068=>692,8069=>692,8070=>692,8071=>692,8072=>698,8073=>698,
-8074=>880,8075=>880,8076=>748,8077=>764,8078=>698,8079=>698,8080=>654,8081=>654,8082=>654,8083=>654,
-8084=>654,8085=>654,8086=>654,8087=>654,8088=>990,8089=>984,8090=>1222,8091=>1225,8092=>1151,8093=>1177,
-8094=>1077,8095=>1074,8096=>857,8097=>857,8098=>857,8099=>857,8100=>857,8101=>857,8102=>857,8103=>857,
-8104=>838,8105=>867,8106=>1141,8107=>1146,8108=>949,8109=>979,8110=>920,8111=>954,8112=>692,8113=>692,
-8114=>692,8115=>692,8116=>692,8118=>692,8119=>692,8120=>698,8121=>698,8122=>729,8123=>698,8124=>698,
-8125=>450,8126=>450,8127=>450,8128=>450,8129=>450,8130=>654,8131=>654,8132=>654,8134=>654,8135=>654,
-8136=>899,8137=>852,8138=>1072,8139=>1006,8140=>850,8141=>450,8142=>450,8143=>450,8144=>435,8145=>435,
-8146=>435,8147=>435,8150=>435,8151=>435,8152=>421,8153=>421,8154=>642,8155=>595,8157=>450,8158=>450,
-8159=>450,8160=>624,8161=>624,8162=>624,8163=>624,8164=>598,8165=>598,8166=>624,8167=>624,8168=>642,
-8169=>642,8170=>917,8171=>857,8172=>819,8173=>450,8174=>450,8175=>450,8178=>857,8179=>857,8180=>857,
-8182=>857,8183=>857,8184=>962,8185=>798,8186=>991,8187=>820,8188=>801,8189=>450,8190=>450,8192=>450,
-8193=>900,8194=>450,8195=>900,8196=>296,8197=>225,8198=>150,8199=>626,8200=>313,8201=>180,8202=>89,
-8203=>0,8204=>0,8205=>0,8206=>0,8207=>0,8208=>374,8209=>374,8210=>626,8213=>900,8214=>450,
-8215=>450,8219=>313,8223=>518,8227=>575,8228=>313,8229=>606,8234=>0,8235=>0,8236=>0,8237=>0,
-8238=>0,8239=>180,8241=>1638,8242=>237,8243=>402,8244=>567,8245=>237,8246=>402,8247=>567,8248=>659,
-8252=>566,8253=>527,8254=>450,8258=>920,8260=>150,8261=>426,8262=>426,8263=>974,8264=>770,8265=>770,
-8267=>572,8268=>450,8269=>450,8270=>470,8271=>332,8273=>470,8274=>500,8275=>900,8279=>731,8287=>200,
-8288=>0,8289=>0,8290=>0,8291=>0,8292=>0,8298=>0,8299=>0,8300=>0,8301=>0,8302=>0,
-8303=>0,8304=>394,8305=>215,8308=>394,8309=>394,8310=>394,8311=>394,8312=>394,8313=>394,8314=>475,
-8315=>475,8316=>475,8317=>268,8318=>268,8319=>467,8320=>394,8321=>394,8322=>394,8323=>394,8324=>394,
-8325=>394,8326=>394,8327=>394,8328=>394,8329=>394,8330=>475,8331=>475,8332=>475,8333=>268,8334=>268,
-8336=>419,8337=>400,8338=>420,8339=>427,8340=>400,8358=>626,8367=>1039,8369=>710,8372=>788,8373=>626,
-8451=>1078,8457=>1001,8462=>654,8463=>654,8470=>978,8486=>801,8487=>801,8490=>782,8491=>698,8513=>697,
-8514=>501,8515=>573,8516=>684,8523=>813,8531=>932,8532=>932,8533=>932,8534=>932,8535=>932,8536=>932,
-8537=>932,8538=>932,8539=>932,8540=>932,8541=>932,8542=>932,8543=>554,8544=>421,8545=>663,8546=>904,
-8547=>984,8548=>698,8549=>1014,8550=>1256,8551=>1498,8552=>962,8553=>698,8554=>970,8555=>1212,8556=>633,
-8557=>716,8558=>780,8559=>996,8560=>342,8561=>684,8562=>1025,8563=>865,8564=>523,8565=>865,8566=>1207,
-8567=>1548,8568=>878,8569=>536,8570=>878,8571=>1220,8572=>342,8573=>548,8574=>629,8575=>952,8576=>1129,
-8577=>780,8578=>1141,8579=>716,8580=>548,8592=>754,8593=>754,8594=>754,8595=>754,8596=>754,8597=>754,
-8598=>754,8599=>754,8600=>754,8601=>754,8602=>754,8603=>754,8604=>754,8605=>754,8606=>754,8607=>754,
-8608=>754,8609=>754,8610=>754,8611=>754,8612=>754,8613=>754,8614=>754,8615=>754,8616=>754,8617=>754,
-8618=>754,8619=>754,8620=>754,8621=>754,8622=>754,8623=>765,8624=>754,8625=>754,8626=>754,8627=>754,
-8628=>754,8629=>754,8630=>754,8631=>754,8632=>754,8633=>754,8634=>754,8635=>754,8636=>754,8637=>754,
-8638=>754,8639=>754,8640=>754,8641=>754,8642=>754,8643=>754,8644=>754,8645=>754,8646=>754,8647=>754,
-8648=>754,8649=>754,8650=>754,8651=>754,8652=>754,8653=>754,8654=>754,8655=>754,8656=>754,8657=>754,
-8658=>754,8659=>754,8660=>754,8661=>754,8662=>754,8663=>754,8664=>754,8665=>754,8666=>754,8667=>754,
-8668=>754,8669=>754,8670=>754,8671=>754,8672=>754,8673=>754,8674=>754,8675=>754,8676=>754,8677=>754,
-8678=>754,8679=>754,8680=>754,8681=>754,8682=>754,8683=>754,8684=>754,8685=>754,8686=>754,8687=>754,
-8688=>754,8689=>754,8690=>754,8691=>754,8692=>754,8693=>754,8694=>754,8695=>754,8696=>754,8697=>754,
-8698=>754,8699=>754,8700=>754,8701=>754,8702=>754,8703=>754,8704=>577,8706=>480,8707=>558,8708=>558,
-8710=>677,8711=>677,8712=>666,8713=>666,8715=>666,8716=>666,8719=>757,8720=>757,8721=>677,8722=>754,
-8723=>754,8724=>754,8725=>329,8727=>622,8728=>466,8729=>466,8730=>591,8731=>591,8732=>591,8733=>604,
-8734=>750,8735=>754,8736=>754,8739=>292,8740=>546,8741=>476,8742=>696,8743=>730,8744=>730,8745=>754,
-8746=>754,8747=>521,8748=>900,8749=>1252,8760=>754,8761=>754,8762=>754,8763=>754,8764=>754,8765=>754,
-8770=>754,8771=>754,8776=>754,8784=>754,8785=>754,8786=>754,8787=>754,8788=>974,8789=>974,8800=>754,
-8801=>754,8804=>754,8805=>754,8834=>754,8835=>754,8836=>754,8837=>754,8838=>754,8839=>754,8844=>754,
-8845=>754,8846=>754,8847=>754,8848=>754,8849=>754,8850=>754,8851=>754,8852=>754,8853=>754,8854=>754,
-8855=>754,8856=>754,8857=>754,8858=>754,8859=>754,8860=>754,8861=>754,8862=>754,8863=>754,8864=>754,
-8865=>754,8866=>795,8867=>795,8868=>864,8869=>864,8870=>554,8871=>554,8872=>795,8873=>795,8874=>795,
-8875=>971,8876=>795,8877=>795,8878=>795,8879=>971,8901=>358,8962=>751,8968=>426,8969=>426,8970=>426,
-8971=>426,8976=>754,8977=>484,8984=>835,8985=>754,8992=>521,8993=>521,8997=>900,9000=>1299,9085=>907,
-9134=>521,9167=>850,9251=>751,9600=>692,9601=>692,9602=>692,9603=>692,9604=>692,9605=>692,9606=>692,
-9607=>692,9608=>692,9609=>692,9610=>692,9611=>692,9612=>692,9613=>692,9614=>692,9615=>692,9616=>692,
-9617=>692,9618=>692,9619=>692,9620=>692,9621=>692,9622=>692,9623=>692,9624=>692,9625=>692,9626=>692,
-9627=>692,9628=>692,9629=>692,9630=>692,9631=>692,9632=>850,9633=>850,9634=>850,9635=>850,9636=>850,
-9637=>850,9638=>850,9639=>850,9640=>850,9641=>850,9642=>610,9643=>610,9644=>850,9645=>850,9646=>495,
-9647=>495,9648=>692,9649=>692,9650=>692,9651=>692,9652=>452,9653=>452,9654=>692,9655=>692,9656=>452,
-9657=>452,9658=>692,9659=>692,9660=>692,9661=>692,9662=>452,9663=>452,9664=>692,9665=>692,9666=>452,
-9667=>452,9668=>692,9669=>692,9670=>692,9671=>692,9672=>692,9673=>785,9674=>444,9675=>785,9676=>785,
-9677=>785,9678=>785,9679=>785,9680=>785,9681=>785,9682=>785,9683=>785,9684=>785,9685=>785,9686=>474,
-9687=>474,9688=>712,9689=>873,9690=>873,9691=>873,9692=>348,9693=>348,9694=>348,9695=>348,9696=>785,
-9697=>785,9698=>692,9699=>692,9700=>692,9701=>692,9702=>531,9703=>850,9704=>850,9705=>850,9706=>850,
-9707=>850,9708=>692,9709=>692,9710=>692,9711=>1007,9712=>850,9713=>850,9714=>850,9715=>850,9716=>785,
-9717=>785,9718=>785,9719=>785,9720=>692,9721=>692,9722=>692,9723=>747,9724=>747,9725=>659,9726=>659,
-9727=>692,9728=>807,9784=>807,9785=>807,9786=>807,9787=>807,9788=>807,9791=>552,9792=>658,9793=>658,
-9794=>807,9795=>807,9796=>807,9797=>807,9798=>807,9799=>807,9824=>807,9825=>807,9826=>807,9827=>807,
-9828=>807,9829=>807,9830=>807,9831=>807,9833=>424,9834=>574,9835=>807,9836=>807,9837=>424,9838=>321,
-9839=>435,10145=>754,10181=>411,10182=>411,10208=>444,10216=>411,10217=>411,10224=>754,10225=>754,10226=>754,
-10227=>754,10228=>930,10229=>1290,10230=>1290,10231=>1290,10232=>1290,10233=>1290,10234=>1290,10235=>1290,10236=>1290,
-10237=>1290,10238=>1290,10239=>1290,10240=>703,10241=>703,10242=>703,10243=>703,10244=>703,10245=>703,10246=>703,
-10247=>703,10248=>703,10249=>703,10250=>703,10251=>703,10252=>703,10253=>703,10254=>703,10255=>703,10256=>703,
-10257=>703,10258=>703,10259=>703,10260=>703,10261=>703,10262=>703,10263=>703,10264=>703,10265=>703,10266=>703,
-10267=>703,10268=>703,10269=>703,10270=>703,10271=>703,10272=>703,10273=>703,10274=>703,10275=>703,10276=>703,
-10277=>703,10278=>703,10279=>703,10280=>703,10281=>703,10282=>703,10283=>703,10284=>703,10285=>703,10286=>703,
-10287=>703,10288=>703,10289=>703,10290=>703,10291=>703,10292=>703,10293=>703,10294=>703,10295=>703,10296=>703,
-10297=>703,10298=>703,10299=>703,10300=>703,10301=>703,10302=>703,10303=>703,10304=>703,10305=>703,10306=>703,
-10307=>703,10308=>703,10309=>703,10310=>703,10311=>703,10312=>703,10313=>703,10314=>703,10315=>703,10316=>703,
-10317=>703,10318=>703,10319=>703,10320=>703,10321=>703,10322=>703,10323=>703,10324=>703,10325=>703,10326=>703,
-10327=>703,10328=>703,10329=>703,10330=>703,10331=>703,10332=>703,10333=>703,10334=>703,10335=>703,10336=>703,
-10337=>703,10338=>703,10339=>703,10340=>703,10341=>703,10342=>703,10343=>703,10344=>703,10345=>703,10346=>703,
-10347=>703,10348=>703,10349=>703,10350=>703,10351=>703,10352=>703,10353=>703,10354=>703,10355=>703,10356=>703,
-10357=>703,10358=>703,10359=>703,10360=>703,10361=>703,10362=>703,10363=>703,10364=>703,10365=>703,10366=>703,
-10367=>703,10368=>703,10369=>703,10370=>703,10371=>703,10372=>703,10373=>703,10374=>703,10375=>703,10376=>703,
-10377=>703,10378=>703,10379=>703,10380=>703,10381=>703,10382=>703,10383=>703,10384=>703,10385=>703,10386=>703,
-10387=>703,10388=>703,10389=>703,10390=>703,10391=>703,10392=>703,10393=>703,10394=>703,10395=>703,10396=>703,
-10397=>703,10398=>703,10399=>703,10400=>703,10401=>703,10402=>703,10403=>703,10404=>703,10405=>703,10406=>703,
-10407=>703,10408=>703,10409=>703,10410=>703,10411=>703,10412=>703,10413=>703,10414=>703,10415=>703,10416=>703,
-10417=>703,10418=>703,10419=>703,10420=>703,10421=>703,10422=>703,10423=>703,10424=>703,10425=>703,10426=>703,
-10427=>703,10428=>703,10429=>703,10430=>703,10431=>703,10432=>703,10433=>703,10434=>703,10435=>703,10436=>703,
-10437=>703,10438=>703,10439=>703,10440=>703,10441=>703,10442=>703,10443=>703,10444=>703,10445=>703,10446=>703,
-10447=>703,10448=>703,10449=>703,10450=>703,10451=>703,10452=>703,10453=>703,10454=>703,10455=>703,10456=>703,
-10457=>703,10458=>703,10459=>703,10460=>703,10461=>703,10462=>703,10463=>703,10464=>703,10465=>703,10466=>703,
-10467=>703,10468=>703,10469=>703,10470=>703,10471=>703,10472=>703,10473=>703,10474=>703,10475=>703,10476=>703,
-10477=>703,10478=>703,10479=>703,10480=>703,10481=>703,10482=>703,10483=>703,10484=>703,10485=>703,10486=>703,
-10487=>703,10488=>703,10489=>703,10490=>703,10491=>703,10492=>703,10493=>703,10494=>703,10495=>703,10496=>754,
-10497=>754,10498=>754,10499=>754,10500=>754,10501=>754,10502=>754,10503=>754,10504=>754,10505=>754,10506=>754,
-10507=>754,10508=>754,10509=>754,10510=>754,10511=>754,10512=>754,10513=>754,10514=>754,10515=>754,10516=>754,
-10517=>754,10518=>754,10519=>754,10520=>754,10521=>754,10522=>754,10523=>754,10524=>754,10525=>754,10526=>754,
-10527=>754,10528=>754,10529=>754,10530=>754,10531=>754,10532=>754,10533=>754,10534=>754,10535=>754,10536=>754,
-10537=>754,10538=>754,10539=>754,10540=>754,10541=>754,10542=>754,10543=>754,10544=>754,10545=>754,10546=>754,
-10547=>754,10548=>754,10549=>754,10550=>754,10551=>754,10552=>754,10553=>754,10554=>754,10555=>754,10556=>754,
-10557=>754,10558=>754,10559=>754,10560=>754,10561=>754,10562=>754,10563=>754,10564=>754,10565=>754,10566=>754,
-10567=>754,10568=>754,10569=>754,10570=>754,10571=>754,10572=>754,10573=>754,10574=>754,10575=>754,10576=>754,
-10577=>754,10578=>754,10579=>754,10580=>754,10581=>754,10582=>754,10583=>754,10584=>754,10585=>754,10586=>754,
-10587=>754,10588=>754,10589=>754,10590=>754,10591=>754,10592=>754,10593=>754,10594=>754,10595=>754,10596=>754,
-10597=>754,10598=>754,10599=>754,10600=>754,10601=>754,10602=>754,10603=>754,10604=>754,10605=>754,10606=>754,
-10607=>754,10608=>754,10609=>754,10610=>754,10611=>754,10612=>754,10613=>754,10614=>754,10615=>929,10616=>754,
-10617=>754,10618=>864,10619=>754,10620=>754,10621=>754,10622=>754,10623=>754,10731=>444,10764=>1604,10765=>549,
-10766=>549,10799=>754,11008=>754,11009=>754,11010=>754,11011=>754,11012=>754,11013=>754,11014=>754,11015=>754,
-11016=>754,11017=>754,11018=>754,11019=>754,11020=>754,11021=>754,11022=>754,11023=>754,11024=>754,11025=>754,
-11026=>850,11027=>850,11028=>850,11029=>850,11030=>692,11031=>692,11032=>692,11033=>692,11034=>850,11364=>748,
-11367=>850,11368=>654,11369=>782,11370=>624,11371=>657,11372=>511,11374=>996,11375=>698,11381=>701,11382=>541,
-11383=>814,11385=>514,11386=>600,11388=>282,11389=>439,11520=>695,11521=>571,11522=>723,11523=>592,11524=>708,
-11525=>866,11526=>680,11527=>864,11528=>555,11529=>581,11530=>866,11531=>567,11532=>581,11533=>866,11534=>761,
-11535=>779,11536=>865,11537=>580,11538=>580,11539=>863,11540=>851,11541=>777,11542=>580,11543=>581,11544=>580,
-11545=>584,11546=>619,11547=>842,11548=>883,11549=>613,11550=>608,11551=>766,11552=>1002,11553=>569,11554=>580,
-11555=>582,11556=>674,11557=>822,11800=>527,11810=>426,11811=>426,11812=>426,11813=>426,11822=>527,42564=>650,
-42565=>506,42566=>421,42567=>342,42576=>1200,42577=>982,42580=>1158,42581=>923,42582=>1158,42583=>935,42760=>450,
-42761=>450,42762=>450,42763=>450,42764=>450,42765=>450,42766=>450,42767=>450,42768=>450,42769=>450,42770=>450,
-42771=>450,42772=>450,42773=>450,42774=>450,42779=>346,42780=>346,42781=>249,42782=>249,42783=>249,42891=>395,
-42892=>275,62464=>634,62465=>645,62466=>688,62467=>898,62468=>645,62469=>639,62470=>698,62471=>934,62472=>645,
-62473=>645,62474=>1178,62475=>660,62476=>659,62477=>903,62478=>645,62479=>659,62480=>945,62481=>717,62482=>765,
-62483=>719,62484=>896,62485=>659,62486=>888,62487=>658,62488=>665,62489=>659,62490=>702,62491=>659,62492=>665,
-62493=>646,62494=>702,62495=>842,62496=>644,62497=>743,62498=>645,62499=>645,62500=>645,62501=>695,62502=>911,
-62504=>813,63173=>600,63185=>450,63188=>450,64256=>738,64257=>654,64258=>654,64259=>1007,64260=>1005,64261=>784,
-64262=>874,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=>1002);
-$enc='';
-$diff='';
-$file='dejavuserifcondensedb.z';
-$ctg='dejavuserifcondensedb.ctg.z';
-$originalsize=282092;
-?>
\ No newline at end of file
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserifcondensedb.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserifcondensedb.z
deleted file mode 100644
index b84198dc..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserifcondensedb.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserifcondensedbi.ctg.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserifcondensedbi.ctg.z
deleted file mode 100644
index d237ae7e..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserifcondensedbi.ctg.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserifcondensedbi.php b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserifcondensedbi.php
deleted file mode 100644
index 5de4f231..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserifcondensedbi.php
+++ /dev/null
@@ -1,299 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='DejaVuSerifCondensed-BoldItalic';
-$desc=array('Ascent'=>939,'Descent'=>-236,'CapHeight'=>-48,'Flags'=>96,'FontBBox'=>'[-815 -389 1584 1235]','ItalicAngle'=>-11,'StemV'=>120,'MissingWidth'=>540);
-$up=-63;
-$ut=44;
-$dw=540;
-$cw=array(
-0=>540,32=>313,33=>395,34=>469,35=>754,36=>626,37=>855,38=>813,39=>275,40=>426,
-41=>426,42=>470,43=>754,44=>313,45=>374,46=>313,47=>329,48=>626,49=>626,50=>626,
-51=>626,52=>626,53=>626,54=>626,55=>626,56=>626,57=>626,58=>332,59=>332,60=>754,
-61=>754,62=>754,63=>527,64=>900,65=>698,66=>760,67=>716,68=>780,69=>686,70=>639,
-71=>769,72=>850,73=>421,74=>426,75=>782,76=>633,77=>996,78=>822,79=>784,80=>677,
-81=>784,82=>748,83=>650,84=>669,85=>785,86=>698,87=>1011,88=>698,89=>642,90=>657,
-91=>426,92=>329,93=>426,94=>754,95=>450,96=>450,97=>583,98=>629,99=>548,100=>629,
-101=>572,102=>387,103=>629,104=>654,105=>342,106=>325,107=>624,108=>342,109=>952,110=>654,
-111=>600,112=>629,113=>629,114=>474,115=>506,116=>416,117=>654,118=>523,119=>774,120=>536,
-121=>523,122=>511,123=>579,124=>327,125=>579,126=>754,8364=>626,8218=>313,402=>387,8222=>518,
-8230=>900,8224=>470,8225=>470,710=>450,8240=>1246,352=>650,8249=>360,338=>1062,381=>657,8216=>313,
-8217=>313,8220=>518,8221=>518,8226=>575,8211=>450,8212=>900,732=>450,8482=>900,353=>506,8250=>360,
-339=>925,382=>511,376=>642,160=>313,161=>395,162=>626,163=>626,164=>572,165=>626,166=>327,
-167=>470,168=>450,169=>900,170=>438,171=>563,172=>754,173=>374,174=>900,175=>450,176=>450,
-177=>754,178=>394,179=>394,180=>450,181=>659,182=>572,183=>313,184=>450,185=>394,186=>450,
-187=>563,188=>938,189=>938,190=>938,191=>527,192=>698,193=>698,194=>698,195=>698,196=>698,
-197=>698,198=>931,199=>716,200=>686,201=>686,202=>686,203=>686,204=>421,205=>421,206=>421,
-207=>421,208=>787,209=>822,210=>784,211=>784,212=>784,213=>784,214=>784,215=>754,216=>784,
-217=>785,218=>785,219=>785,220=>785,221=>642,222=>681,223=>684,224=>583,225=>583,226=>583,
-227=>583,228=>583,229=>583,230=>838,231=>548,232=>572,233=>572,234=>572,235=>572,236=>342,
-237=>342,238=>342,239=>342,240=>600,241=>654,242=>600,243=>600,244=>600,245=>600,246=>600,
-247=>754,248=>600,249=>654,250=>654,251=>654,252=>654,253=>523,254=>629,255=>523,256=>698,
-257=>583,258=>698,259=>583,260=>698,261=>583,262=>716,263=>548,264=>716,265=>548,266=>716,
-267=>548,268=>716,269=>548,270=>780,271=>629,272=>787,273=>629,274=>686,275=>572,276=>686,
-277=>572,278=>686,279=>572,280=>686,281=>572,282=>686,283=>572,284=>769,285=>629,286=>769,
-287=>629,288=>769,289=>629,290=>769,291=>629,292=>850,293=>654,294=>850,295=>654,296=>421,
-297=>342,298=>421,299=>342,300=>421,301=>342,302=>421,303=>342,304=>421,305=>342,306=>848,
-307=>676,308=>426,309=>325,310=>782,311=>624,312=>624,313=>633,314=>342,315=>633,316=>342,
-317=>633,318=>457,319=>633,320=>501,321=>639,322=>346,323=>822,324=>654,325=>822,326=>654,
-327=>822,328=>654,329=>907,330=>785,331=>654,332=>784,333=>600,334=>784,335=>600,336=>784,
-337=>600,340=>748,341=>474,342=>748,343=>474,344=>748,345=>474,346=>650,347=>506,348=>650,
-349=>506,350=>650,351=>506,354=>669,355=>416,356=>669,357=>416,358=>669,359=>416,360=>785,
-361=>654,362=>785,363=>654,364=>785,365=>654,366=>785,367=>654,368=>785,369=>654,370=>785,
-371=>654,372=>1011,373=>774,374=>642,375=>523,377=>657,378=>511,379=>657,380=>511,383=>387,
-384=>629,385=>760,386=>769,387=>629,388=>769,389=>629,390=>716,391=>716,392=>548,393=>787,
-394=>780,395=>769,396=>629,397=>600,398=>686,399=>784,400=>649,401=>639,403=>769,404=>693,
-405=>938,406=>421,407=>421,408=>782,409=>624,410=>342,411=>631,412=>952,413=>822,414=>654,
-415=>784,416=>784,417=>600,418=>1080,419=>849,420=>677,421=>629,422=>748,423=>650,424=>506,
-425=>636,426=>298,427=>416,428=>669,429=>416,430=>669,431=>785,432=>654,433=>801,434=>801,
-435=>642,436=>628,437=>657,438=>511,439=>591,440=>591,441=>591,443=>626,444=>678,445=>511,
-446=>482,448=>265,449=>443,450=>413,451=>265,452=>1437,453=>1292,454=>1140,455=>1059,456=>958,
-457=>667,458=>1248,459=>1148,460=>980,461=>698,462=>583,463=>421,464=>342,465=>784,466=>600,
-467=>785,468=>654,469=>785,470=>654,471=>785,472=>654,473=>785,474=>654,475=>785,476=>654,
-477=>572,478=>698,479=>583,480=>698,481=>583,482=>931,483=>877,484=>806,485=>629,486=>769,
-487=>629,488=>782,489=>624,490=>784,491=>600,492=>784,493=>600,494=>591,495=>511,496=>325,
-497=>1437,498=>1292,499=>1140,500=>769,501=>629,502=>1099,504=>822,505=>654,506=>698,507=>583,
-508=>931,509=>838,510=>784,511=>600,512=>698,513=>583,514=>698,515=>583,516=>686,517=>572,
-518=>686,519=>572,520=>421,521=>342,522=>421,523=>342,524=>784,525=>600,526=>784,527=>600,
-528=>748,529=>474,530=>748,531=>474,532=>785,533=>654,534=>785,535=>654,536=>650,537=>506,
-538=>669,539=>416,540=>621,541=>546,542=>850,543=>654,544=>785,545=>711,548=>657,549=>511,
-550=>698,551=>583,552=>686,553=>572,554=>784,555=>600,556=>784,557=>600,558=>784,559=>600,
-560=>784,561=>600,562=>642,563=>523,564=>516,565=>830,566=>508,567=>325,568=>928,569=>928,
-570=>698,571=>716,572=>548,573=>633,574=>669,575=>506,576=>511,577=>594,578=>492,581=>698,
-592=>583,593=>629,594=>629,595=>629,596=>548,597=>548,598=>629,599=>657,600=>572,601=>572,
-602=>816,603=>547,604=>505,605=>816,606=>647,607=>348,608=>629,609=>629,610=>563,611=>641,
-612=>564,613=>654,614=>654,615=>654,616=>342,617=>342,618=>342,619=>368,620=>462,621=>342,
-622=>716,623=>952,624=>952,625=>952,626=>654,627=>654,628=>641,629=>600,630=>955,631=>674,
-632=>600,633=>514,634=>514,635=>514,636=>474,637=>474,638=>406,639=>438,640=>721,641=>721,
-642=>506,643=>298,644=>387,645=>486,646=>298,647=>443,648=>416,649=>654,650=>611,651=>624,
-652=>523,653=>774,654=>571,655=>654,656=>511,657=>511,658=>511,659=>511,660=>482,661=>482,
-662=>482,663=>490,664=>784,665=>625,666=>647,667=>563,668=>659,669=>345,670=>666,671=>581,
-672=>629,673=>482,674=>482,675=>1005,676=>1061,677=>1005,678=>819,679=>643,680=>817,681=>935,
-682=>711,683=>716,684=>596,685=>398,686=>552,687=>646,688=>469,689=>466,690=>282,691=>372,
-692=>372,693=>432,694=>474,695=>488,696=>329,697=>271,699=>313,700=>313,701=>313,702=>330,
-703=>330,704=>282,705=>282,711=>450,712=>254,713=>450,716=>254,720=>332,721=>332,722=>330,
-723=>330,726=>353,728=>450,729=>450,730=>450,731=>450,733=>450,734=>375,736=>403,737=>263,
-738=>355,739=>338,740=>282,741=>450,742=>450,743=>450,744=>450,745=>450,750=>498,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=>701,881=>519,884=>271,
-885=>271,890=>450,891=>548,892=>548,893=>548,894=>332,900=>450,901=>450,902=>698,903=>313,
-904=>852,905=>1022,906=>595,908=>798,910=>857,911=>820,912=>435,913=>698,914=>760,915=>639,
-916=>698,917=>686,918=>657,919=>850,920=>784,921=>421,922=>782,923=>698,924=>996,925=>822,
-926=>633,927=>784,928=>850,929=>677,931=>636,932=>669,933=>642,934=>784,935=>698,936=>822,
-937=>801,938=>421,939=>642,940=>692,941=>547,942=>654,943=>435,944=>624,945=>692,946=>598,
-947=>594,948=>600,949=>547,950=>533,951=>654,952=>600,953=>435,954=>674,955=>631,956=>659,
-957=>624,958=>533,959=>600,960=>659,961=>598,962=>548,963=>664,964=>605,965=>624,966=>814,
-967=>592,968=>847,969=>857,970=>435,971=>624,972=>600,973=>624,974=>857,976=>600,977=>764,
-978=>687,979=>872,980=>687,981=>847,982=>857,983=>589,984=>784,985=>600,986=>716,987=>548,
-988=>639,989=>475,990=>531,991=>593,992=>716,993=>600,1008=>589,1009=>598,1010=>548,1011=>325,
-1012=>784,1013=>548,1014=>548,1015=>681,1016=>629,1017=>716,1018=>996,1019=>774,1020=>623,1021=>716,
-1022=>716,1023=>716,1024=>686,1025=>686,1026=>811,1027=>621,1028=>716,1029=>650,1030=>421,1031=>421,
-1032=>426,1033=>1081,1034=>1135,1035=>866,1036=>818,1037=>850,1038=>730,1039=>850,1040=>733,1041=>769,
-1042=>760,1043=>621,1044=>800,1045=>686,1046=>1181,1047=>649,1048=>850,1049=>850,1050=>818,1051=>795,
-1052=>996,1053=>850,1054=>784,1055=>850,1056=>677,1057=>716,1058=>669,1059=>730,1060=>854,1061=>698,
-1062=>870,1063=>822,1064=>1141,1065=>1164,1066=>861,1067=>1081,1068=>743,1069=>716,1070=>1158,1071=>793,
-1072=>583,1073=>650,1074=>591,1075=>506,1076=>625,1077=>572,1078=>1175,1079=>574,1080=>654,1081=>654,
-1082=>609,1083=>659,1084=>855,1085=>656,1086=>600,1087=>654,1088=>629,1089=>548,1090=>952,1091=>538,
-1092=>812,1093=>536,1094=>723,1095=>643,1096=>952,1097=>1021,1098=>654,1099=>916,1100=>593,1101=>580,
-1102=>901,1103=>716,1104=>572,1105=>572,1106=>646,1107=>506,1108=>548,1109=>506,1110=>342,1111=>342,
-1112=>325,1113=>913,1114=>910,1115=>654,1116=>609,1117=>654,1118=>538,1119=>654,1122=>792,1123=>945,
-1124=>1076,1125=>867,1130=>1181,1131=>909,1136=>986,1137=>995,1138=>784,1139=>587,1140=>824,1141=>673,
-1164=>761,1165=>606,1168=>630,1169=>556,1170=>621,1171=>506,1172=>768,1173=>634,1174=>1181,1175=>1175,
-1176=>649,1177=>574,1178=>812,1179=>633,1182=>818,1183=>609,1184=>937,1185=>684,1186=>856,1187=>725,
-1188=>1050,1189=>859,1190=>1191,1191=>911,1194=>716,1195=>548,1196=>669,1197=>1028,1198=>642,1199=>515,
-1200=>642,1201=>515,1202=>709,1203=>536,1204=>909,1205=>749,1206=>822,1207=>712,1210=>819,1211=>654,
-1216=>421,1217=>1181,1218=>1175,1219=>782,1220=>624,1223=>850,1224=>659,1227=>885,1228=>659,1231=>342,
-1232=>733,1233=>583,1234=>733,1235=>583,1236=>931,1237=>877,1238=>686,1239=>572,1240=>784,1241=>572,
-1242=>784,1243=>572,1244=>1181,1245=>1175,1246=>649,1247=>574,1248=>591,1249=>511,1250=>850,1251=>654,
-1252=>850,1253=>654,1254=>784,1255=>600,1256=>784,1257=>600,1258=>784,1259=>600,1260=>716,1261=>580,
-1262=>730,1263=>538,1264=>730,1265=>538,1266=>730,1267=>538,1268=>822,1269=>643,1270=>621,1271=>506,
-1272=>1081,1273=>916,1296=>649,1297=>574,1298=>795,1299=>659,1300=>1123,1301=>904,1306=>738,1307=>576,
-1308=>925,1309=>770,4256=>688,4257=>851,4258=>788,4259=>795,4260=>712,4261=>979,4262=>921,4263=>1100,
-4264=>587,4265=>745,4266=>955,4267=>954,4268=>725,4269=>1030,4270=>880,4271=>820,4272=>1007,4273=>721,
-4274=>689,4275=>977,4276=>887,4277=>968,4278=>738,4279=>758,4280=>748,4281=>759,4282=>826,4283=>978,
-4284=>701,4285=>748,4286=>740,4287=>1008,4288=>1019,4289=>730,4290=>812,4291=>730,4292=>801,4293=>965,
-4304=>535,4305=>563,4306=>579,4307=>798,4308=>553,4309=>549,4310=>599,4311=>823,4312=>552,4313=>540,
-4314=>1008,4315=>589,4316=>576,4317=>791,4318=>561,4319=>571,4320=>790,4321=>591,4322=>721,4323=>676,
-4324=>782,4325=>575,4326=>820,4327=>559,4328=>583,4329=>576,4330=>656,4331=>577,4332=>575,4333=>566,
-4334=>606,4335=>663,4336=>563,4337=>591,4338=>563,4339=>563,4340=>562,4341=>603,4342=>846,4343=>612,
-4344=>572,4345=>605,4346=>562,4347=>401,4348=>327,7426=>846,7432=>458,7433=>288,7444=>890,7446=>600,
-7447=>600,7453=>663,7454=>853,7455=>853,7468=>439,7469=>586,7470=>479,7472=>491,7473=>432,7474=>432,
-7475=>483,7476=>536,7477=>265,7478=>268,7479=>492,7480=>398,7481=>627,7482=>518,7483=>518,7484=>493,
-7486=>426,7487=>471,7488=>422,7489=>494,7490=>637,7491=>419,7492=>419,7493=>448,7494=>591,7495=>448,
-7496=>448,7497=>400,7498=>400,7499=>370,7500=>370,7501=>448,7502=>270,7503=>471,7504=>655,7505=>426,
-7506=>420,7507=>384,7508=>420,7509=>420,7510=>448,7511=>333,7512=>468,7513=>390,7514=>655,7515=>442,
-7522=>215,7523=>372,7524=>468,7525=>442,7543=>576,7544=>536,7547=>342,7557=>342,7579=>448,7580=>384,
-7581=>384,7582=>420,7583=>370,7584=>244,7585=>335,7586=>448,7587=>470,7588=>270,7589=>276,7590=>270,
-7591=>270,7592=>333,7593=>331,7594=>289,7595=>387,7596=>613,7597=>655,7598=>529,7599=>528,7600=>425,
-7601=>420,7602=>470,7603=>360,7604=>348,7605=>333,7606=>468,7607=>427,7609=>439,7610=>329,7611=>321,
-7612=>474,7613=>371,7614=>407,7615=>420,7620=>0,7621=>0,7622=>0,7623=>0,7624=>0,7625=>0,
-7680=>698,7681=>583,7682=>760,7683=>629,7684=>760,7685=>629,7686=>760,7687=>629,7688=>716,7689=>548,
-7690=>780,7691=>629,7692=>780,7693=>629,7694=>780,7695=>629,7696=>780,7697=>629,7698=>780,7699=>629,
-7700=>686,7701=>572,7702=>686,7703=>572,7704=>686,7705=>572,7706=>686,7707=>572,7708=>686,7709=>572,
-7710=>639,7711=>387,7712=>769,7713=>629,7714=>850,7715=>654,7716=>850,7717=>654,7718=>850,7719=>654,
-7720=>850,7721=>654,7722=>850,7723=>654,7724=>421,7725=>342,7728=>782,7729=>624,7730=>782,7731=>624,
-7732=>782,7733=>624,7734=>633,7735=>342,7736=>633,7737=>342,7738=>633,7739=>342,7740=>633,7741=>342,
-7742=>996,7743=>952,7744=>996,7745=>952,7746=>996,7747=>952,7748=>822,7749=>654,7750=>822,7751=>654,
-7752=>822,7753=>654,7754=>822,7755=>654,7756=>784,7757=>600,7760=>784,7761=>600,7762=>784,7763=>600,
-7764=>677,7765=>629,7766=>677,7767=>629,7768=>748,7769=>474,7770=>748,7771=>474,7772=>748,7773=>474,
-7774=>748,7775=>474,7776=>650,7777=>506,7778=>650,7779=>506,7784=>650,7785=>506,7786=>669,7787=>416,
-7788=>669,7789=>416,7790=>669,7791=>416,7792=>669,7793=>416,7794=>785,7795=>654,7796=>785,7797=>654,
-7798=>785,7799=>654,7800=>785,7801=>654,7802=>785,7803=>654,7804=>698,7805=>523,7806=>698,7807=>523,
-7808=>1011,7809=>774,7810=>1011,7811=>774,7812=>1011,7813=>774,7814=>1011,7815=>774,7816=>1011,7817=>774,
-7818=>698,7819=>536,7820=>698,7821=>536,7822=>642,7823=>523,7824=>657,7825=>511,7826=>657,7827=>511,
-7828=>657,7829=>511,7830=>654,7831=>416,7832=>774,7833=>523,7834=>913,7835=>387,7838=>852,7839=>600,
-7840=>698,7841=>583,7842=>698,7843=>583,7852=>698,7853=>583,7854=>698,7855=>583,7856=>698,7857=>583,
-7858=>698,7859=>583,7860=>698,7861=>583,7862=>698,7863=>583,7864=>686,7865=>572,7866=>686,7867=>572,
-7868=>686,7869=>572,7878=>686,7879=>572,7880=>421,7881=>342,7882=>421,7883=>342,7884=>784,7885=>600,
-7886=>784,7887=>600,7896=>784,7897=>600,7908=>785,7909=>654,7910=>785,7911=>654,7922=>642,7923=>523,
-7924=>642,7925=>523,7926=>642,7927=>523,7928=>642,7929=>523,7936=>692,7937=>692,7938=>692,7939=>692,
-7940=>692,7941=>692,7942=>692,7943=>692,7944=>698,7945=>698,7946=>880,7947=>880,7948=>748,7949=>764,
-7950=>698,7951=>698,7952=>547,7953=>547,7954=>547,7955=>547,7956=>547,7957=>547,7960=>826,7961=>817,
-7962=>1052,7963=>1052,7964=>984,7965=>1007,7968=>654,7969=>654,7970=>654,7971=>654,7972=>654,7973=>654,
-7974=>654,7975=>654,7976=>990,7977=>984,7978=>1222,7979=>1225,7980=>1151,7981=>1177,7982=>1077,7983=>1074,
-7984=>435,7985=>435,7986=>435,7987=>435,7988=>435,7989=>435,7990=>435,7991=>435,7992=>566,7993=>555,
-7994=>790,7995=>792,7996=>719,7997=>748,7998=>650,7999=>642,8000=>600,8001=>600,8002=>600,8003=>600,
-8004=>600,8005=>600,8008=>810,8009=>841,8010=>1116,8011=>1113,8012=>931,8013=>959,8016=>624,8017=>624,
-8018=>624,8019=>624,8020=>624,8021=>624,8022=>624,8023=>624,8025=>830,8027=>1067,8029=>1020,8031=>917,
-8032=>857,8033=>857,8034=>857,8035=>857,8036=>857,8037=>857,8038=>857,8039=>857,8040=>838,8041=>867,
-8042=>1141,8043=>1146,8044=>949,8045=>979,8046=>920,8047=>954,8048=>692,8049=>692,8050=>547,8051=>547,
-8052=>654,8053=>654,8054=>435,8055=>435,8056=>600,8057=>600,8058=>624,8059=>624,8060=>857,8061=>857,
-8064=>692,8065=>692,8066=>692,8067=>692,8068=>692,8069=>692,8070=>692,8071=>692,8072=>698,8073=>698,
-8074=>880,8075=>880,8076=>748,8077=>764,8078=>698,8079=>698,8080=>654,8081=>654,8082=>654,8083=>654,
-8084=>654,8085=>654,8086=>654,8087=>654,8088=>990,8089=>984,8090=>1222,8091=>1225,8092=>1151,8093=>1177,
-8094=>1077,8095=>1074,8096=>857,8097=>857,8098=>857,8099=>857,8100=>857,8101=>857,8102=>857,8103=>857,
-8104=>838,8105=>867,8106=>1141,8107=>1146,8108=>949,8109=>979,8110=>920,8111=>954,8112=>692,8113=>692,
-8114=>692,8115=>692,8116=>692,8118=>692,8119=>692,8120=>698,8121=>698,8122=>729,8123=>698,8124=>698,
-8125=>450,8126=>450,8127=>450,8128=>450,8129=>450,8130=>654,8131=>654,8132=>654,8134=>654,8135=>654,
-8136=>899,8137=>852,8138=>1072,8139=>1006,8140=>850,8141=>450,8142=>450,8143=>450,8144=>435,8145=>435,
-8146=>435,8147=>435,8150=>435,8151=>435,8152=>421,8153=>421,8154=>642,8155=>595,8157=>450,8158=>450,
-8159=>450,8160=>624,8161=>624,8162=>624,8163=>624,8164=>598,8165=>598,8166=>624,8167=>624,8168=>642,
-8169=>642,8170=>917,8171=>857,8172=>819,8173=>450,8174=>450,8175=>450,8178=>857,8179=>857,8180=>857,
-8182=>857,8183=>857,8184=>962,8185=>798,8186=>991,8187=>820,8188=>801,8189=>450,8190=>450,8192=>450,
-8193=>900,8194=>450,8195=>900,8196=>296,8197=>225,8198=>150,8199=>626,8200=>313,8201=>180,8202=>89,
-8203=>0,8204=>0,8205=>0,8206=>0,8207=>0,8208=>374,8209=>374,8210=>626,8213=>900,8214=>450,
-8215=>450,8219=>313,8223=>518,8227=>575,8228=>313,8229=>606,8234=>0,8235=>0,8236=>0,8237=>0,
-8238=>0,8239=>180,8241=>1631,8242=>237,8243=>402,8244=>567,8245=>237,8246=>402,8247=>567,8248=>659,
-8252=>566,8253=>527,8254=>450,8258=>920,8260=>150,8261=>426,8262=>426,8263=>974,8264=>770,8265=>770,
-8267=>572,8268=>450,8269=>450,8270=>470,8271=>332,8273=>470,8274=>500,8275=>900,8279=>731,8287=>200,
-8288=>0,8289=>0,8290=>0,8291=>0,8292=>0,8298=>0,8299=>0,8300=>0,8301=>0,8302=>0,
-8303=>0,8304=>394,8305=>215,8308=>394,8309=>394,8310=>394,8311=>394,8312=>394,8313=>394,8314=>475,
-8315=>475,8316=>475,8317=>268,8318=>268,8319=>412,8320=>394,8321=>394,8322=>394,8323=>394,8324=>394,
-8325=>394,8326=>394,8327=>394,8328=>394,8329=>394,8330=>475,8331=>475,8332=>475,8333=>268,8334=>268,
-8336=>419,8337=>400,8338=>420,8339=>338,8340=>400,8358=>626,8367=>1039,8369=>710,8372=>788,8373=>626,
-8451=>1078,8457=>1001,8462=>654,8463=>654,8470=>978,8486=>801,8487=>801,8490=>782,8491=>698,8513=>707,
-8514=>518,8515=>573,8516=>684,8523=>813,8531=>932,8532=>932,8533=>932,8534=>932,8535=>932,8536=>932,
-8537=>932,8538=>932,8539=>932,8540=>932,8541=>932,8542=>932,8543=>554,8544=>421,8545=>663,8546=>904,
-8547=>984,8548=>698,8549=>1014,8550=>1256,8551=>1498,8552=>962,8553=>698,8554=>970,8555=>1212,8556=>633,
-8557=>716,8558=>780,8559=>996,8560=>342,8561=>684,8562=>1025,8563=>865,8564=>523,8565=>865,8566=>1207,
-8567=>1548,8568=>878,8569=>536,8570=>878,8571=>1220,8572=>342,8573=>548,8574=>629,8575=>952,8576=>1129,
-8577=>780,8578=>1141,8579=>716,8580=>548,8592=>754,8593=>754,8594=>754,8595=>754,8596=>754,8597=>754,
-8598=>754,8599=>754,8600=>754,8601=>754,8602=>754,8603=>754,8604=>754,8605=>754,8606=>754,8607=>754,
-8608=>754,8609=>754,8610=>754,8611=>754,8612=>754,8613=>754,8614=>754,8615=>754,8616=>754,8617=>754,
-8618=>754,8619=>754,8620=>754,8621=>754,8622=>754,8623=>765,8624=>754,8625=>754,8626=>754,8627=>754,
-8628=>754,8629=>754,8630=>754,8631=>754,8632=>754,8633=>754,8634=>754,8635=>754,8636=>754,8637=>754,
-8638=>754,8639=>754,8640=>754,8641=>754,8642=>754,8643=>754,8644=>754,8645=>754,8646=>754,8647=>754,
-8648=>754,8649=>754,8650=>754,8651=>754,8652=>754,8653=>754,8654=>754,8655=>754,8656=>754,8657=>754,
-8658=>754,8659=>754,8660=>754,8661=>754,8662=>754,8663=>754,8664=>754,8665=>754,8666=>754,8667=>754,
-8668=>754,8669=>754,8670=>754,8671=>754,8672=>754,8673=>754,8674=>754,8675=>754,8676=>754,8677=>754,
-8678=>754,8679=>754,8680=>754,8681=>754,8682=>754,8683=>754,8684=>754,8685=>754,8686=>754,8687=>754,
-8688=>754,8689=>754,8690=>754,8691=>754,8692=>754,8693=>754,8694=>754,8695=>754,8696=>754,8697=>754,
-8698=>754,8699=>754,8700=>754,8701=>754,8702=>754,8703=>754,8704=>577,8706=>480,8707=>558,8708=>558,
-8710=>677,8711=>677,8712=>666,8713=>666,8715=>666,8716=>666,8719=>757,8720=>757,8721=>677,8722=>754,
-8723=>754,8724=>754,8725=>329,8727=>622,8728=>466,8729=>466,8730=>591,8731=>591,8732=>591,8733=>604,
-8734=>750,8735=>754,8736=>754,8739=>292,8740=>546,8741=>476,8742=>696,8743=>730,8744=>730,8745=>754,
-8746=>754,8747=>521,8748=>900,8749=>1252,8760=>754,8761=>754,8762=>754,8763=>754,8764=>754,8765=>754,
-8770=>754,8771=>754,8776=>754,8784=>754,8785=>754,8786=>754,8787=>754,8788=>974,8789=>974,8800=>754,
-8801=>754,8804=>754,8805=>754,8834=>754,8835=>754,8836=>754,8837=>754,8838=>754,8839=>754,8844=>754,
-8845=>754,8846=>754,8847=>754,8848=>754,8849=>754,8850=>754,8851=>754,8852=>754,8853=>754,8854=>754,
-8855=>754,8856=>754,8857=>754,8858=>754,8859=>754,8860=>754,8861=>754,8862=>754,8863=>754,8864=>754,
-8865=>754,8866=>795,8867=>795,8868=>864,8869=>864,8870=>554,8871=>554,8872=>795,8873=>795,8874=>795,
-8875=>971,8876=>795,8877=>795,8878=>795,8879=>971,8901=>358,8962=>751,8968=>426,8969=>426,8970=>426,
-8971=>426,8976=>754,8977=>484,8984=>835,8985=>754,8992=>521,8993=>521,8997=>900,9000=>1299,9085=>907,
-9134=>521,9167=>850,9251=>751,9600=>692,9601=>692,9602=>692,9603=>692,9604=>692,9605=>692,9606=>692,
-9607=>692,9608=>692,9609=>692,9610=>692,9611=>692,9612=>692,9613=>692,9614=>692,9615=>692,9616=>692,
-9617=>692,9618=>692,9619=>692,9620=>692,9621=>692,9622=>692,9623=>692,9624=>692,9625=>692,9626=>692,
-9627=>692,9628=>692,9629=>692,9630=>692,9631=>692,9632=>850,9633=>850,9634=>850,9635=>850,9636=>850,
-9637=>850,9638=>850,9639=>850,9640=>850,9641=>850,9642=>610,9643=>610,9644=>850,9645=>850,9646=>495,
-9647=>495,9648=>692,9649=>692,9650=>692,9651=>692,9652=>452,9653=>452,9654=>692,9655=>692,9656=>452,
-9657=>452,9658=>692,9659=>692,9660=>692,9661=>692,9662=>452,9663=>452,9664=>692,9665=>692,9666=>452,
-9667=>452,9668=>692,9669=>692,9670=>692,9671=>692,9672=>692,9673=>785,9674=>444,9675=>785,9676=>785,
-9677=>785,9678=>785,9679=>785,9680=>785,9681=>785,9682=>785,9683=>785,9684=>785,9685=>785,9686=>474,
-9687=>474,9688=>712,9689=>873,9690=>873,9691=>873,9692=>348,9693=>348,9694=>348,9695=>348,9696=>785,
-9697=>785,9698=>692,9699=>692,9700=>692,9701=>692,9702=>531,9703=>850,9704=>850,9705=>850,9706=>850,
-9707=>850,9708=>692,9709=>692,9710=>692,9711=>1007,9712=>850,9713=>850,9714=>850,9715=>850,9716=>785,
-9717=>785,9718=>785,9719=>785,9720=>692,9721=>692,9722=>692,9723=>747,9724=>747,9725=>659,9726=>659,
-9727=>692,9728=>807,9784=>807,9785=>807,9786=>807,9787=>807,9788=>807,9791=>552,9792=>658,9793=>658,
-9794=>807,9795=>807,9796=>807,9797=>807,9798=>807,9799=>807,9824=>807,9825=>807,9826=>807,9827=>807,
-9828=>807,9829=>807,9830=>807,9831=>807,9833=>424,9834=>574,9835=>807,9836=>807,9837=>424,9838=>321,
-9839=>435,10145=>754,10181=>411,10182=>411,10208=>444,10216=>411,10217=>411,10224=>754,10225=>754,10226=>754,
-10227=>754,10228=>930,10229=>1290,10230=>1290,10231=>1290,10232=>1290,10233=>1290,10234=>1290,10235=>1290,10236=>1290,
-10237=>1290,10238=>1290,10239=>1290,10240=>703,10241=>703,10242=>703,10243=>703,10244=>703,10245=>703,10246=>703,
-10247=>703,10248=>703,10249=>703,10250=>703,10251=>703,10252=>703,10253=>703,10254=>703,10255=>703,10256=>703,
-10257=>703,10258=>703,10259=>703,10260=>703,10261=>703,10262=>703,10263=>703,10264=>703,10265=>703,10266=>703,
-10267=>703,10268=>703,10269=>703,10270=>703,10271=>703,10272=>703,10273=>703,10274=>703,10275=>703,10276=>703,
-10277=>703,10278=>703,10279=>703,10280=>703,10281=>703,10282=>703,10283=>703,10284=>703,10285=>703,10286=>703,
-10287=>703,10288=>703,10289=>703,10290=>703,10291=>703,10292=>703,10293=>703,10294=>703,10295=>703,10296=>703,
-10297=>703,10298=>703,10299=>703,10300=>703,10301=>703,10302=>703,10303=>703,10304=>703,10305=>703,10306=>703,
-10307=>703,10308=>703,10309=>703,10310=>703,10311=>703,10312=>703,10313=>703,10314=>703,10315=>703,10316=>703,
-10317=>703,10318=>703,10319=>703,10320=>703,10321=>703,10322=>703,10323=>703,10324=>703,10325=>703,10326=>703,
-10327=>703,10328=>703,10329=>703,10330=>703,10331=>703,10332=>703,10333=>703,10334=>703,10335=>703,10336=>703,
-10337=>703,10338=>703,10339=>703,10340=>703,10341=>703,10342=>703,10343=>703,10344=>703,10345=>703,10346=>703,
-10347=>703,10348=>703,10349=>703,10350=>703,10351=>703,10352=>703,10353=>703,10354=>703,10355=>703,10356=>703,
-10357=>703,10358=>703,10359=>703,10360=>703,10361=>703,10362=>703,10363=>703,10364=>703,10365=>703,10366=>703,
-10367=>703,10368=>703,10369=>703,10370=>703,10371=>703,10372=>703,10373=>703,10374=>703,10375=>703,10376=>703,
-10377=>703,10378=>703,10379=>703,10380=>703,10381=>703,10382=>703,10383=>703,10384=>703,10385=>703,10386=>703,
-10387=>703,10388=>703,10389=>703,10390=>703,10391=>703,10392=>703,10393=>703,10394=>703,10395=>703,10396=>703,
-10397=>703,10398=>703,10399=>703,10400=>703,10401=>703,10402=>703,10403=>703,10404=>703,10405=>703,10406=>703,
-10407=>703,10408=>703,10409=>703,10410=>703,10411=>703,10412=>703,10413=>703,10414=>703,10415=>703,10416=>703,
-10417=>703,10418=>703,10419=>703,10420=>703,10421=>703,10422=>703,10423=>703,10424=>703,10425=>703,10426=>703,
-10427=>703,10428=>703,10429=>703,10430=>703,10431=>703,10432=>703,10433=>703,10434=>703,10435=>703,10436=>703,
-10437=>703,10438=>703,10439=>703,10440=>703,10441=>703,10442=>703,10443=>703,10444=>703,10445=>703,10446=>703,
-10447=>703,10448=>703,10449=>703,10450=>703,10451=>703,10452=>703,10453=>703,10454=>703,10455=>703,10456=>703,
-10457=>703,10458=>703,10459=>703,10460=>703,10461=>703,10462=>703,10463=>703,10464=>703,10465=>703,10466=>703,
-10467=>703,10468=>703,10469=>703,10470=>703,10471=>703,10472=>703,10473=>703,10474=>703,10475=>703,10476=>703,
-10477=>703,10478=>703,10479=>703,10480=>703,10481=>703,10482=>703,10483=>703,10484=>703,10485=>703,10486=>703,
-10487=>703,10488=>703,10489=>703,10490=>703,10491=>703,10492=>703,10493=>703,10494=>703,10495=>703,10496=>754,
-10497=>754,10498=>754,10499=>754,10500=>754,10501=>754,10502=>754,10503=>754,10504=>754,10505=>754,10506=>754,
-10507=>754,10508=>754,10509=>754,10510=>754,10511=>754,10512=>754,10513=>754,10514=>754,10515=>754,10516=>754,
-10517=>754,10518=>754,10519=>754,10520=>754,10521=>754,10522=>754,10523=>754,10524=>754,10525=>754,10526=>754,
-10527=>754,10528=>754,10529=>754,10530=>754,10531=>754,10532=>754,10533=>754,10534=>754,10535=>754,10536=>754,
-10537=>754,10538=>754,10539=>754,10540=>754,10541=>754,10542=>754,10543=>754,10544=>754,10545=>754,10546=>754,
-10547=>754,10548=>754,10549=>754,10550=>754,10551=>754,10552=>754,10553=>754,10554=>754,10555=>754,10556=>754,
-10557=>754,10558=>754,10559=>754,10560=>754,10561=>754,10562=>754,10563=>754,10564=>754,10565=>754,10566=>754,
-10567=>754,10568=>754,10569=>754,10570=>754,10571=>754,10572=>754,10573=>754,10574=>754,10575=>754,10576=>754,
-10577=>754,10578=>754,10579=>754,10580=>754,10581=>754,10582=>754,10583=>754,10584=>754,10585=>754,10586=>754,
-10587=>754,10588=>754,10589=>754,10590=>754,10591=>754,10592=>754,10593=>754,10594=>754,10595=>754,10596=>754,
-10597=>754,10598=>754,10599=>754,10600=>754,10601=>754,10602=>754,10603=>754,10604=>754,10605=>754,10606=>754,
-10607=>754,10608=>754,10609=>754,10610=>754,10611=>754,10612=>754,10613=>754,10614=>754,10615=>929,10616=>754,
-10617=>754,10618=>864,10619=>754,10620=>754,10621=>754,10622=>754,10623=>754,10731=>444,10764=>1604,10765=>549,
-10766=>549,10799=>754,11008=>754,11009=>754,11010=>754,11011=>754,11012=>754,11013=>754,11014=>754,11015=>754,
-11016=>754,11017=>754,11018=>754,11019=>754,11020=>754,11021=>754,11022=>754,11023=>754,11024=>754,11025=>754,
-11026=>850,11027=>850,11028=>850,11029=>850,11030=>692,11031=>692,11032=>692,11033=>692,11034=>850,11364=>748,
-11367=>850,11368=>654,11369=>782,11370=>624,11371=>657,11372=>511,11374=>996,11375=>698,11381=>701,11382=>519,
-11383=>814,11385=>514,11386=>600,11388=>282,11389=>439,11520=>695,11521=>571,11522=>723,11523=>592,11524=>708,
-11525=>866,11526=>680,11527=>864,11528=>555,11529=>581,11530=>866,11531=>567,11532=>581,11533=>866,11534=>761,
-11535=>779,11536=>865,11537=>580,11538=>580,11539=>863,11540=>851,11541=>777,11542=>580,11543=>581,11544=>580,
-11545=>584,11546=>619,11547=>842,11548=>883,11549=>613,11550=>608,11551=>766,11552=>1002,11553=>569,11554=>580,
-11555=>582,11556=>674,11557=>822,11800=>527,11810=>426,11811=>426,11812=>426,11813=>426,11822=>527,42564=>650,
-42565=>506,42566=>421,42567=>342,42576=>1200,42577=>976,42580=>1158,42581=>923,42582=>1158,42583=>926,42760=>450,
-42761=>450,42762=>450,42763=>450,42764=>450,42765=>450,42766=>450,42767=>450,42768=>450,42769=>450,42770=>450,
-42771=>450,42772=>450,42773=>450,42774=>450,42779=>346,42780=>346,42781=>249,42782=>249,42783=>249,42891=>395,
-42892=>275,62464=>653,62465=>663,62466=>707,62467=>917,62468=>663,62469=>658,62470=>716,62471=>952,62472=>663,
-62473=>663,62474=>1196,62475=>679,62476=>678,62477=>922,62478=>663,62479=>678,62480=>963,62481=>736,62482=>783,
-62483=>737,62484=>914,62485=>677,62486=>907,62487=>677,62488=>684,62489=>678,62490=>720,62491=>678,62492=>684,
-62493=>664,62494=>721,62495=>860,62496=>663,62497=>762,62498=>664,62499=>663,62500=>663,62501=>714,62502=>930,
-62504=>813,63172=>506,63173=>600,63174=>629,63175=>654,63176=>952,63185=>450,63188=>450,64256=>744,64257=>654,
-64258=>654,64259=>998,64260=>1031,64261=>791,64262=>874,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=>1002);
-$enc='';
-$diff='';
-$file='dejavuserifcondensedbi.z';
-$ctg='dejavuserifcondensedbi.ctg.z';
-$originalsize=293472;
-?>
\ No newline at end of file
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserifcondensedbi.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserifcondensedbi.z
deleted file mode 100644
index 9b6be85d..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserifcondensedbi.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserifcondensedi.ctg.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserifcondensedi.ctg.z
deleted file mode 100644
index aa732f80..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserifcondensedi.ctg.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserifcondensedi.php b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserifcondensedi.php
deleted file mode 100644
index e4db2ae7..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserifcondensedi.php
+++ /dev/null
@@ -1,312 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='DejaVuSerifCondensed-Italic';
-$desc=array('Ascent'=>928,'Descent'=>-236,'CapHeight'=>-59,'Flags'=>96,'FontBBox'=>'[-755 -347 1485 1227]','ItalicAngle'=>-11,'StemV'=>70,'MissingWidth'=>540);
-$up=-63;
-$ut=44;
-$dw=540;
-$cw=array(
-0=>540,32=>286,33=>361,34=>414,35=>754,36=>572,37=>855,38=>801,39=>247,40=>351,
-41=>351,42=>450,43=>754,44=>286,45=>304,46=>286,47=>303,48=>572,49=>572,50=>572,
-51=>572,52=>572,53=>572,54=>572,55=>572,56=>572,57=>572,58=>303,59=>303,60=>754,
-61=>754,62=>754,63=>482,64=>900,65=>650,66=>661,67=>688,68=>721,69=>657,70=>624,
-71=>719,72=>785,73=>355,74=>360,75=>672,76=>598,77=>921,78=>787,79=>738,80=>605,
-81=>738,82=>677,83=>616,84=>600,85=>758,86=>650,87=>925,88=>641,89=>594,90=>625,
-91=>351,92=>303,93=>351,94=>754,95=>450,96=>450,97=>536,98=>576,99=>504,100=>576,
-101=>532,102=>333,103=>576,104=>580,105=>288,106=>279,107=>545,108=>288,109=>853,110=>580,
-111=>542,112=>576,113=>576,114=>430,115=>461,116=>361,117=>580,118=>508,119=>770,120=>507,
-121=>508,122=>474,123=>572,124=>303,125=>572,126=>754,8364=>572,8218=>286,402=>333,8222=>466,
-8230=>900,8224=>450,8225=>450,710=>450,8240=>1208,352=>616,8249=>360,338=>1023,381=>625,8216=>286,
-8217=>286,8220=>460,8221=>460,8226=>531,8211=>450,8212=>900,732=>450,8482=>900,353=>461,8250=>360,
-339=>890,382=>474,376=>594,160=>286,161=>361,162=>572,163=>572,164=>572,165=>572,166=>303,
-167=>450,168=>450,169=>900,170=>427,171=>550,172=>754,173=>304,174=>900,175=>450,176=>450,
-177=>754,178=>360,179=>360,180=>450,181=>584,182=>572,183=>286,184=>450,185=>360,186=>423,
-187=>550,188=>872,189=>872,190=>872,191=>482,192=>650,193=>650,194=>650,195=>650,196=>650,
-197=>650,198=>901,199=>688,200=>657,201=>657,202=>657,203=>657,204=>355,205=>355,206=>355,
-207=>355,208=>726,209=>787,210=>738,211=>738,212=>738,213=>738,214=>738,215=>754,216=>738,
-217=>758,218=>758,219=>758,220=>758,221=>594,222=>608,223=>601,224=>536,225=>536,226=>536,
-227=>536,228=>536,229=>536,230=>846,231=>504,232=>532,233=>532,234=>532,235=>532,236=>288,
-237=>288,238=>288,239=>288,240=>542,241=>580,242=>542,243=>542,244=>542,245=>542,246=>542,
-247=>754,248=>542,249=>580,250=>580,251=>580,252=>580,253=>508,254=>576,255=>508,256=>650,
-257=>536,258=>650,259=>536,260=>650,261=>536,262=>688,263=>504,264=>688,265=>504,266=>688,
-267=>504,268=>688,269=>504,270=>721,271=>576,272=>726,273=>576,274=>657,275=>532,276=>657,
-277=>532,278=>657,279=>532,280=>657,281=>532,282=>657,283=>532,284=>719,285=>576,286=>719,
-287=>576,288=>719,289=>576,290=>719,291=>576,292=>785,293=>580,294=>785,295=>580,296=>355,
-297=>288,298=>355,299=>288,300=>355,301=>288,302=>355,303=>288,304=>355,305=>288,306=>721,
-307=>479,308=>360,309=>279,310=>672,311=>545,312=>545,313=>598,314=>288,315=>598,316=>288,
-317=>598,318=>360,319=>604,320=>418,321=>602,322=>292,323=>787,324=>580,325=>787,326=>580,
-327=>787,328=>580,329=>779,330=>758,331=>580,332=>738,333=>542,334=>738,335=>542,336=>738,
-337=>542,340=>677,341=>430,342=>677,343=>430,344=>677,345=>430,346=>616,347=>461,348=>616,
-349=>461,350=>616,351=>461,354=>600,355=>361,356=>600,357=>361,358=>600,359=>361,360=>758,
-361=>580,362=>758,363=>580,364=>758,365=>580,366=>758,367=>580,368=>758,369=>580,370=>758,
-371=>580,372=>925,373=>770,374=>594,375=>508,377=>625,378=>474,379=>625,380=>474,383=>333,
-384=>576,385=>661,386=>661,387=>576,388=>661,389=>576,390=>688,391=>688,392=>504,393=>726,
-394=>721,395=>661,396=>576,397=>542,398=>657,399=>738,400=>561,401=>624,403=>719,404=>641,
-405=>839,406=>355,407=>355,408=>672,409=>545,410=>288,411=>570,412=>853,413=>787,414=>580,
-415=>738,416=>738,417=>542,418=>936,419=>726,420=>605,421=>576,422=>677,423=>616,424=>461,
-425=>636,426=>292,427=>361,428=>600,429=>361,430=>600,431=>758,432=>580,433=>746,434=>684,
-435=>664,436=>670,437=>625,438=>474,439=>508,440=>508,441=>508,443=>572,444=>618,445=>508,
-446=>482,448=>265,449=>443,450=>413,451=>265,452=>1347,453=>1195,454=>1050,455=>958,456=>876,
-457=>567,458=>1148,459=>1066,460=>858,461=>650,462=>536,463=>355,464=>288,465=>738,466=>542,
-467=>758,468=>580,469=>758,470=>580,471=>758,472=>580,473=>758,474=>580,475=>758,476=>580,
-477=>532,478=>650,479=>536,480=>650,481=>536,482=>901,483=>846,484=>763,485=>576,486=>719,
-487=>576,488=>672,489=>545,490=>738,491=>542,492=>738,493=>542,494=>508,495=>508,496=>288,
-497=>1347,498=>1195,499=>1050,500=>719,501=>576,502=>1038,504=>787,505=>580,506=>650,507=>536,
-508=>901,509=>846,510=>738,511=>542,512=>650,513=>536,514=>650,515=>536,516=>657,517=>532,
-518=>657,519=>532,520=>355,521=>288,522=>355,523=>288,524=>738,525=>542,526=>738,527=>542,
-528=>677,529=>430,530=>677,531=>430,532=>758,533=>580,534=>758,535=>580,536=>616,537=>461,
-538=>600,539=>361,540=>564,541=>469,542=>785,543=>580,544=>758,545=>732,548=>625,549=>474,
-550=>650,551=>536,552=>657,553=>532,554=>738,555=>542,556=>738,557=>542,558=>738,559=>542,
-560=>738,561=>542,562=>594,563=>508,564=>450,565=>748,566=>444,567=>279,568=>864,569=>864,
-570=>650,571=>688,572=>504,573=>598,574=>600,575=>461,576=>474,577=>525,578=>417,581=>650,
-592=>536,593=>576,594=>607,595=>576,596=>504,597=>504,598=>582,599=>614,600=>532,601=>532,
-602=>759,603=>483,604=>458,605=>695,606=>552,607=>283,608=>615,609=>576,610=>489,611=>641,
-612=>507,613=>580,614=>580,615=>580,616=>288,617=>353,618=>288,619=>342,620=>409,621=>326,
-622=>633,623=>853,624=>853,625=>853,626=>579,627=>624,628=>581,629=>542,630=>711,631=>583,
-632=>542,633=>451,634=>451,635=>496,636=>430,637=>430,638=>407,639=>407,640=>534,641=>534,
-642=>461,643=>244,644=>333,645=>438,646=>292,647=>361,648=>361,649=>580,650=>558,651=>547,
-652=>508,653=>770,654=>508,655=>589,656=>537,657=>504,658=>508,659=>504,660=>482,661=>482,
-662=>482,663=>461,664=>738,665=>506,666=>552,667=>588,668=>600,669=>329,670=>545,671=>581,
-672=>615,673=>482,674=>482,675=>896,676=>930,677=>898,678=>728,679=>538,680=>704,681=>804,
-682=>582,683=>608,684=>538,685=>398,686=>703,687=>690,688=>389,689=>387,690=>237,691=>312,
-692=>312,693=>387,694=>352,695=>485,696=>320,697=>250,699=>286,700=>286,701=>286,702=>276,
-703=>276,704=>252,705=>252,711=>450,712=>254,713=>450,716=>254,720=>303,721=>303,722=>276,
-723=>276,726=>353,728=>450,729=>450,730=>450,731=>450,733=>450,734=>375,736=>403,737=>218,
-738=>303,739=>319,740=>252,741=>444,742=>444,743=>444,744=>444,745=>444,750=>435,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=>666,881=>478,884=>250,
-885=>250,890=>450,891=>504,892=>504,893=>504,894=>303,900=>450,901=>450,902=>650,903=>286,
-904=>810,905=>935,906=>505,908=>751,910=>808,911=>767,912=>353,913=>650,914=>661,915=>624,
-916=>650,917=>657,918=>625,919=>785,920=>738,921=>355,922=>672,923=>650,924=>921,925=>787,
-926=>633,927=>738,928=>785,929=>605,931=>636,932=>600,933=>594,934=>738,935=>641,936=>789,
-937=>746,938=>355,939=>594,940=>607,941=>483,942=>539,943=>353,944=>547,945=>607,946=>520,
-947=>538,948=>542,949=>483,950=>488,951=>539,952=>542,953=>353,954=>590,955=>570,956=>584,
-957=>547,958=>496,959=>542,960=>591,961=>529,962=>504,963=>614,964=>498,965=>547,966=>630,
-967=>545,968=>706,969=>734,970=>353,971=>547,972=>542,973=>547,974=>734,976=>524,977=>643,
-978=>618,979=>787,980=>618,981=>613,982=>734,983=>561,984=>738,985=>542,986=>688,987=>504,
-988=>624,989=>417,990=>531,991=>593,992=>704,993=>519,1008=>561,1009=>529,1010=>504,1011=>279,
-1012=>738,1013=>504,1014=>504,1015=>608,1016=>576,1017=>688,1018=>921,1019=>637,1020=>529,1021=>688,
-1022=>688,1023=>688,1024=>657,1025=>657,1026=>719,1027=>596,1028=>688,1029=>616,1030=>355,1031=>355,
-1032=>360,1033=>976,1034=>1006,1035=>785,1036=>696,1037=>785,1038=>650,1039=>785,1040=>681,1041=>661,
-1042=>661,1043=>596,1044=>731,1045=>657,1046=>1011,1047=>561,1048=>785,1049=>785,1050=>696,1051=>751,
-1052=>921,1053=>785,1054=>738,1055=>785,1056=>605,1057=>688,1058=>600,1059=>650,1060=>747,1061=>641,
-1062=>785,1063=>695,1064=>1027,1065=>1027,1066=>715,1067=>885,1068=>606,1069=>688,1070=>1074,1071=>727,
-1072=>536,1073=>549,1074=>523,1075=>455,1076=>570,1077=>532,1078=>1023,1079=>491,1080=>580,1081=>580,
-1082=>537,1083=>573,1084=>746,1085=>593,1086=>542,1087=>580,1088=>576,1089=>504,1090=>853,1091=>522,
-1092=>704,1093=>507,1094=>628,1095=>560,1096=>853,1097=>901,1098=>600,1099=>733,1100=>490,1101=>504,
-1102=>792,1103=>596,1104=>532,1105=>532,1106=>561,1107=>455,1108=>504,1109=>461,1110=>288,1111=>288,
-1112=>279,1113=>773,1114=>790,1115=>580,1116=>537,1117=>580,1118=>522,1119=>580,1122=>686,1123=>794,
-1124=>1016,1125=>750,1130=>1011,1131=>828,1136=>849,1137=>812,1138=>738,1139=>497,1140=>773,1141=>610,
-1164=>636,1165=>490,1168=>604,1169=>476,1170=>596,1171=>455,1172=>657,1173=>552,1174=>1011,1175=>1023,
-1176=>561,1177=>491,1178=>696,1179=>544,1182=>696,1183=>537,1184=>803,1185=>602,1186=>785,1187=>641,
-1188=>1025,1189=>771,1190=>1085,1191=>848,1194=>688,1195=>504,1196=>600,1197=>911,1198=>594,1199=>514,
-1200=>594,1201=>514,1202=>641,1203=>566,1204=>842,1205=>659,1206=>674,1207=>609,1210=>674,1211=>580,
-1216=>355,1217=>1011,1218=>1023,1219=>672,1220=>545,1223=>785,1224=>600,1227=>674,1228=>600,1231=>288,
-1232=>681,1233=>536,1234=>681,1235=>536,1236=>901,1237=>846,1238=>657,1239=>532,1240=>738,1241=>532,
-1242=>738,1243=>532,1244=>1011,1245=>1023,1246=>561,1247=>491,1248=>508,1249=>508,1250=>785,1251=>580,
-1252=>785,1253=>580,1254=>738,1255=>542,1256=>738,1257=>542,1258=>738,1259=>542,1260=>688,1261=>504,
-1262=>650,1263=>522,1264=>650,1265=>522,1266=>650,1267=>522,1268=>695,1269=>560,1270=>596,1271=>455,
-1272=>885,1273=>733,1296=>561,1297=>491,1298=>751,1299=>573,1300=>1079,1301=>845,1306=>738,1307=>576,
-1308=>925,1309=>770,4256=>659,4257=>773,4258=>753,4259=>782,4260=>668,4261=>892,4262=>833,4263=>1000,
-4264=>519,4265=>684,4266=>875,4267=>856,4268=>677,4269=>976,4270=>815,4271=>754,4272=>944,4273=>668,
-4274=>611,4275=>922,4276=>852,4277=>926,4278=>667,4279=>668,4280=>668,4281=>668,4282=>800,4283=>852,
-4284=>651,4285=>688,4286=>668,4287=>871,4288=>909,4289=>641,4290=>786,4291=>669,4292=>762,4293=>864,
-4304=>495,4305=>523,4306=>539,4307=>759,4308=>514,4309=>510,4310=>558,4311=>783,4312=>512,4313=>500,
-4314=>968,4315=>536,4316=>536,4317=>751,4318=>521,4319=>531,4320=>750,4321=>546,4322=>682,4323=>631,
-4324=>742,4325=>535,4326=>781,4327=>520,4328=>543,4329=>536,4330=>616,4331=>537,4332=>501,4333=>527,
-4334=>562,4335=>624,4336=>523,4337=>551,4338=>523,4339=>523,4340=>522,4341=>593,4342=>806,4343=>572,
-4344=>532,4345=>565,4346=>522,4347=>410,4348=>335,7426=>846,7432=>458,7433=>288,7444=>890,7446=>542,
-7447=>542,7453=>663,7454=>853,7455=>853,7468=>409,7469=>567,7470=>417,7472=>454,7473=>413,7474=>413,
-7475=>453,7476=>494,7477=>224,7478=>227,7479=>423,7480=>376,7481=>580,7482=>496,7483=>496,7484=>464,
-7486=>381,7487=>426,7488=>378,7489=>478,7490=>583,7491=>347,7492=>347,7493=>360,7494=>556,7495=>360,
-7496=>360,7497=>348,7498=>348,7499=>385,7500=>306,7501=>360,7502=>157,7503=>328,7504=>552,7505=>359,
-7506=>347,7507=>312,7508=>347,7509=>347,7510=>360,7511=>222,7512=>359,7513=>417,7514=>552,7515=>335,
-7522=>181,7523=>312,7524=>359,7525=>335,7543=>576,7544=>494,7547=>334,7557=>288,7579=>439,7580=>317,
-7581=>317,7582=>426,7583=>385,7584=>209,7585=>285,7586=>439,7587=>359,7588=>181,7589=>181,7590=>181,
-7591=>181,7592=>286,7593=>237,7594=>236,7595=>409,7596=>552,7597=>552,7598=>445,7599=>443,7600=>438,
-7601=>347,7602=>426,7603=>374,7604=>269,7605=>301,7606=>359,7607=>429,7609=>417,7610=>320,7611=>298,
-7612=>376,7613=>376,7614=>406,7615=>426,7620=>0,7621=>0,7622=>0,7623=>0,7624=>0,7625=>0,
-7680=>650,7681=>536,7682=>661,7683=>576,7684=>661,7685=>576,7686=>661,7687=>576,7688=>688,7689=>504,
-7690=>721,7691=>576,7692=>721,7693=>576,7694=>721,7695=>576,7696=>721,7697=>576,7698=>721,7699=>576,
-7700=>657,7701=>532,7702=>657,7703=>532,7704=>657,7705=>532,7706=>657,7707=>532,7708=>657,7709=>532,
-7710=>624,7711=>333,7712=>719,7713=>576,7714=>785,7715=>580,7716=>785,7717=>580,7718=>785,7719=>580,
-7720=>785,7721=>580,7722=>785,7723=>580,7724=>355,7725=>288,7728=>672,7729=>545,7730=>672,7731=>545,
-7732=>672,7733=>545,7734=>598,7735=>288,7736=>598,7737=>288,7738=>598,7739=>288,7740=>598,7741=>288,
-7742=>921,7743=>853,7744=>921,7745=>853,7746=>921,7747=>857,7748=>787,7749=>580,7750=>787,7751=>580,
-7752=>787,7753=>580,7754=>787,7755=>580,7756=>738,7757=>542,7760=>738,7761=>542,7762=>738,7763=>542,
-7764=>605,7765=>576,7766=>605,7767=>576,7768=>677,7769=>430,7770=>677,7771=>430,7772=>677,7773=>430,
-7774=>677,7775=>430,7776=>616,7777=>461,7778=>616,7779=>461,7784=>616,7785=>461,7786=>600,7787=>361,
-7788=>600,7789=>361,7790=>600,7791=>361,7792=>600,7793=>361,7794=>758,7795=>580,7796=>758,7797=>580,
-7798=>758,7799=>580,7800=>758,7801=>580,7802=>758,7803=>580,7804=>650,7805=>508,7806=>650,7807=>508,
-7808=>925,7809=>770,7810=>925,7811=>770,7812=>925,7813=>770,7814=>925,7815=>770,7816=>925,7817=>770,
-7818=>641,7819=>507,7820=>641,7821=>507,7822=>594,7823=>508,7824=>625,7825=>474,7826=>625,7827=>474,
-7828=>625,7829=>474,7830=>580,7831=>361,7832=>770,7833=>508,7834=>813,7835=>333,7838=>746,7839=>542,
-7840=>650,7841=>536,7842=>650,7843=>536,7852=>650,7853=>536,7854=>650,7855=>536,7856=>650,7857=>536,
-7858=>650,7859=>536,7860=>650,7861=>536,7862=>650,7863=>536,7864=>657,7865=>532,7866=>657,7867=>532,
-7868=>657,7869=>532,7878=>657,7879=>532,7880=>355,7881=>288,7882=>355,7883=>288,7884=>738,7885=>542,
-7886=>738,7887=>542,7896=>738,7897=>542,7908=>758,7909=>580,7910=>758,7911=>580,7922=>594,7923=>508,
-7924=>594,7925=>508,7926=>594,7927=>508,7928=>594,7929=>508,7936=>607,7937=>607,7938=>607,7939=>607,
-7940=>607,7941=>607,7942=>607,7943=>607,7944=>650,7945=>650,7946=>782,7947=>782,7948=>660,7949=>687,
-7950=>650,7951=>650,7952=>483,7953=>483,7954=>483,7955=>483,7956=>483,7957=>483,7960=>768,7961=>757,
-7962=>960,7963=>969,7964=>907,7965=>931,7968=>539,7969=>539,7970=>539,7971=>539,7972=>539,7973=>539,
-7974=>539,7975=>539,7976=>898,7977=>893,7978=>1090,7979=>1101,7980=>1043,7981=>1064,7982=>988,7983=>985,
-7984=>353,7985=>353,7986=>353,7987=>353,7988=>353,7989=>353,7990=>353,7991=>353,7992=>469,7993=>461,
-7994=>661,7995=>664,7996=>611,7997=>635,7998=>561,7999=>553,8000=>542,8001=>542,8002=>542,8003=>542,
-8004=>542,8005=>542,8008=>738,8009=>773,8010=>1008,8011=>1015,8012=>843,8013=>867,8016=>547,8017=>547,
-8018=>547,8019=>547,8020=>547,8021=>547,8022=>547,8023=>547,8025=>765,8027=>971,8029=>939,8031=>857,
-8032=>734,8033=>734,8034=>734,8035=>734,8036=>734,8037=>734,8038=>734,8039=>734,8040=>746,8041=>783,
-8042=>1018,8043=>1023,8044=>852,8045=>878,8046=>844,8047=>873,8048=>607,8049=>607,8050=>483,8051=>483,
-8052=>539,8053=>539,8054=>353,8055=>353,8056=>542,8057=>542,8058=>547,8059=>547,8060=>734,8061=>734,
-8064=>607,8065=>607,8066=>607,8067=>607,8068=>607,8069=>607,8070=>607,8071=>607,8072=>650,8073=>650,
-8074=>782,8075=>782,8076=>660,8077=>687,8078=>650,8079=>650,8080=>539,8081=>539,8082=>539,8083=>539,
-8084=>539,8085=>539,8086=>539,8087=>539,8088=>898,8089=>893,8090=>1090,8091=>1101,8092=>1043,8093=>1064,
-8094=>988,8095=>985,8096=>734,8097=>734,8098=>734,8099=>734,8100=>734,8101=>734,8102=>734,8103=>734,
-8104=>746,8105=>783,8106=>1018,8107=>1023,8108=>852,8109=>878,8110=>844,8111=>873,8112=>607,8113=>607,
-8114=>607,8115=>607,8116=>607,8118=>607,8119=>607,8120=>650,8121=>650,8122=>650,8123=>650,8124=>650,
-8125=>450,8126=>450,8127=>450,8128=>450,8129=>450,8130=>539,8131=>539,8132=>539,8134=>539,8135=>539,
-8136=>820,8137=>810,8138=>956,8139=>935,8140=>785,8141=>450,8142=>450,8143=>450,8144=>353,8145=>353,
-8146=>353,8147=>353,8150=>353,8151=>353,8152=>355,8153=>355,8154=>529,8155=>505,8157=>450,8158=>450,
-8159=>450,8160=>547,8161=>547,8162=>547,8163=>547,8164=>529,8165=>529,8166=>547,8167=>547,8168=>594,
-8169=>594,8170=>829,8171=>808,8172=>711,8173=>450,8174=>450,8175=>450,8178=>734,8179=>734,8180=>734,
-8182=>734,8183=>734,8184=>865,8185=>751,8186=>886,8187=>767,8188=>746,8189=>450,8190=>450,8192=>450,
-8193=>900,8194=>450,8195=>900,8196=>296,8197=>225,8198=>150,8199=>572,8200=>286,8201=>180,8202=>89,
-8203=>0,8204=>0,8205=>0,8206=>0,8207=>0,8208=>304,8209=>304,8210=>572,8213=>900,8214=>450,
-8215=>450,8219=>286,8223=>460,8227=>531,8228=>301,8229=>600,8234=>0,8235=>0,8236=>0,8237=>0,
-8238=>0,8239=>180,8241=>1560,8242=>204,8243=>336,8244=>468,8245=>204,8246=>336,8247=>468,8248=>305,
-8252=>475,8253=>482,8254=>450,8258=>900,8260=>150,8261=>351,8262=>351,8263=>878,8264=>678,8265=>678,
-8267=>572,8268=>450,8269=>450,8270=>450,8271=>303,8273=>450,8274=>404,8275=>900,8279=>597,8287=>200,
-8288=>0,8289=>0,8290=>0,8291=>0,8292=>0,8298=>0,8299=>0,8300=>0,8301=>0,8302=>0,
-8303=>0,8304=>360,8305=>181,8308=>360,8309=>360,8310=>360,8311=>360,8312=>360,8313=>360,8314=>475,
-8315=>475,8316=>475,8317=>221,8318=>221,8319=>365,8320=>360,8321=>360,8322=>360,8323=>360,8324=>360,
-8325=>360,8326=>360,8327=>360,8328=>360,8329=>360,8330=>475,8331=>475,8332=>475,8333=>221,8334=>221,
-8336=>347,8337=>348,8338=>347,8339=>319,8340=>348,8358=>594,8367=>951,8369=>635,8372=>702,8373=>572,
-8451=>1006,8457=>942,8462=>580,8463=>580,8470=>852,8486=>746,8487=>746,8490=>672,8491=>650,8513=>697,
-8514=>501,8515=>501,8516=>549,8523=>801,8531=>872,8532=>872,8533=>872,8534=>872,8535=>872,8536=>872,
-8537=>872,8538=>872,8539=>872,8540=>872,8541=>872,8542=>872,8543=>511,8544=>355,8545=>531,8546=>707,
-8547=>870,8548=>650,8549=>883,8550=>1059,8551=>1234,8552=>838,8553=>641,8554=>839,8555=>1015,8556=>598,
-8557=>688,8558=>721,8559=>921,8560=>288,8561=>576,8562=>863,8563=>796,8564=>508,8565=>796,8566=>1084,
-8567=>1372,8568=>795,8569=>507,8570=>795,8571=>1083,8572=>288,8573=>504,8574=>576,8575=>853,8576=>1085,
-8577=>721,8578=>1085,8579=>688,8580=>504,8592=>754,8593=>754,8594=>754,8595=>754,8596=>754,8597=>754,
-8598=>754,8599=>754,8600=>754,8601=>754,8602=>754,8603=>754,8604=>754,8605=>754,8606=>754,8607=>754,
-8608=>754,8609=>754,8610=>754,8611=>754,8612=>754,8613=>754,8614=>754,8615=>754,8616=>754,8617=>754,
-8618=>754,8619=>754,8620=>754,8621=>754,8622=>754,8623=>754,8624=>754,8625=>754,8626=>754,8627=>754,
-8628=>754,8629=>754,8630=>754,8631=>754,8632=>754,8633=>754,8634=>754,8635=>754,8636=>754,8637=>754,
-8638=>754,8639=>754,8640=>754,8641=>754,8642=>754,8643=>754,8644=>754,8645=>754,8646=>754,8647=>754,
-8648=>754,8649=>754,8650=>754,8651=>754,8652=>754,8653=>754,8654=>754,8655=>754,8656=>754,8657=>754,
-8658=>754,8659=>754,8660=>754,8661=>754,8662=>754,8663=>754,8664=>754,8665=>754,8666=>754,8667=>754,
-8668=>754,8669=>754,8670=>754,8671=>754,8672=>754,8673=>754,8674=>754,8675=>754,8676=>754,8677=>754,
-8678=>754,8679=>754,8680=>754,8681=>754,8682=>754,8683=>754,8684=>754,8685=>754,8686=>754,8687=>754,
-8688=>754,8689=>754,8690=>754,8691=>754,8692=>754,8693=>754,8694=>754,8695=>754,8696=>754,8697=>754,
-8698=>754,8699=>754,8700=>754,8701=>754,8702=>754,8703=>754,8704=>543,8706=>465,8707=>488,8708=>488,
-8710=>628,8711=>628,8712=>666,8713=>666,8715=>666,8716=>666,8719=>716,8720=>716,8721=>642,8722=>754,
-8723=>754,8724=>754,8725=>303,8727=>611,8728=>441,8729=>441,8730=>573,8731=>573,8732=>573,8733=>609,
-8734=>750,8735=>754,8736=>754,8739=>262,8740=>431,8741=>416,8742=>570,8743=>659,8744=>659,8745=>754,
-8746=>754,8747=>469,8748=>766,8749=>1063,8760=>754,8761=>754,8762=>754,8763=>754,8764=>754,8765=>754,
-8770=>754,8771=>754,8776=>754,8784=>754,8785=>754,8786=>754,8787=>754,8788=>930,8789=>930,8800=>754,
-8801=>754,8804=>754,8805=>754,8834=>754,8835=>754,8836=>754,8837=>754,8838=>754,8839=>754,8844=>754,
-8845=>754,8846=>754,8847=>761,8848=>761,8849=>761,8850=>761,8851=>754,8852=>754,8853=>754,8854=>754,
-8855=>754,8856=>754,8857=>754,8858=>754,8859=>754,8860=>754,8861=>754,8862=>754,8863=>754,8864=>754,
-8865=>754,8866=>773,8867=>773,8868=>846,8869=>846,8870=>510,8871=>510,8872=>773,8873=>773,8874=>773,
-8875=>927,8876=>773,8877=>773,8878=>773,8879=>927,8901=>308,8962=>687,8968=>351,8969=>351,8970=>351,
-8971=>351,8976=>754,8977=>461,8984=>900,8985=>754,8992=>469,8993=>469,8997=>900,9000=>1299,9085=>827,
-9134=>469,9167=>850,9251=>687,9472=>542,9473=>542,9474=>542,9475=>542,9476=>542,9477=>542,9478=>542,
-9479=>542,9480=>542,9481=>542,9482=>542,9483=>542,9484=>542,9485=>542,9486=>542,9487=>542,9488=>542,
-9489=>542,9490=>542,9491=>542,9492=>542,9493=>542,9494=>542,9495=>542,9496=>542,9497=>542,9498=>542,
-9499=>542,9500=>542,9501=>542,9502=>542,9503=>542,9504=>542,9505=>542,9506=>542,9507=>542,9508=>542,
-9509=>542,9510=>542,9511=>542,9512=>542,9513=>542,9514=>542,9515=>542,9516=>542,9517=>542,9518=>542,
-9519=>542,9520=>542,9521=>542,9522=>542,9523=>542,9524=>542,9525=>542,9526=>542,9527=>542,9528=>542,
-9529=>542,9530=>542,9531=>542,9532=>542,9533=>542,9534=>542,9535=>542,9536=>542,9537=>542,9538=>542,
-9539=>542,9540=>542,9541=>542,9542=>542,9543=>542,9544=>542,9545=>542,9546=>542,9547=>542,9548=>542,
-9549=>542,9550=>542,9551=>542,9552=>542,9553=>542,9554=>542,9555=>542,9556=>542,9557=>542,9558=>542,
-9559=>542,9560=>542,9561=>542,9562=>542,9563=>542,9564=>542,9565=>542,9566=>542,9567=>542,9568=>542,
-9569=>542,9570=>542,9571=>542,9572=>542,9573=>542,9574=>542,9575=>542,9576=>542,9577=>542,9578=>542,
-9579=>542,9580=>542,9581=>542,9582=>542,9583=>542,9584=>542,9585=>542,9586=>542,9587=>542,9588=>542,
-9589=>542,9590=>542,9591=>542,9592=>542,9593=>542,9594=>542,9595=>542,9596=>542,9597=>542,9598=>542,
-9599=>542,9600=>692,9601=>692,9602=>692,9603=>692,9604=>692,9605=>692,9606=>692,9607=>692,9608=>692,
-9609=>692,9610=>692,9611=>692,9612=>692,9613=>692,9614=>692,9615=>692,9616=>692,9617=>692,9618=>692,
-9619=>692,9620=>692,9621=>692,9622=>692,9623=>692,9624=>692,9625=>692,9626=>692,9627=>692,9628=>692,
-9629=>692,9630=>692,9631=>692,9632=>850,9633=>850,9634=>850,9635=>850,9636=>850,9637=>850,9638=>850,
-9639=>850,9640=>850,9641=>850,9642=>610,9643=>610,9644=>850,9645=>850,9646=>495,9647=>495,9648=>692,
-9649=>692,9650=>692,9651=>692,9652=>452,9653=>452,9654=>692,9655=>692,9656=>452,9657=>452,9658=>692,
-9659=>692,9660=>692,9661=>692,9662=>452,9663=>452,9664=>692,9665=>692,9666=>452,9667=>452,9668=>692,
-9669=>692,9670=>692,9671=>692,9672=>692,9673=>785,9674=>444,9675=>785,9676=>785,9677=>785,9678=>785,
-9679=>785,9680=>785,9681=>785,9682=>785,9683=>785,9684=>785,9685=>785,9686=>474,9687=>474,9688=>712,
-9689=>873,9690=>873,9691=>873,9692=>348,9693=>348,9694=>348,9695=>348,9696=>785,9697=>785,9698=>692,
-9699=>692,9700=>692,9701=>692,9702=>531,9703=>850,9704=>850,9705=>850,9706=>850,9707=>850,9708=>692,
-9709=>692,9710=>692,9711=>1007,9712=>850,9713=>850,9714=>850,9715=>850,9716=>785,9717=>785,9718=>785,
-9719=>785,9720=>692,9721=>692,9722=>692,9723=>747,9724=>747,9725=>659,9726=>659,9727=>692,9728=>807,
-9784=>807,9785=>807,9786=>807,9787=>807,9788=>807,9791=>552,9792=>658,9793=>658,9794=>807,9795=>807,
-9796=>807,9797=>807,9798=>807,9799=>807,9824=>807,9825=>807,9826=>807,9827=>807,9828=>807,9829=>807,
-9830=>807,9831=>807,9833=>424,9834=>574,9835=>807,9836=>807,9837=>424,9838=>321,9839=>435,10145=>754,
-10181=>351,10182=>351,10208=>444,10216=>351,10217=>351,10224=>754,10225=>754,10226=>754,10227=>754,10228=>930,
-10229=>1290,10230=>1290,10231=>1290,10232=>1290,10233=>1290,10234=>1290,10235=>1290,10236=>1290,10237=>1290,10238=>1290,
-10239=>1290,10240=>659,10241=>659,10242=>659,10243=>659,10244=>659,10245=>659,10246=>659,10247=>659,10248=>659,
-10249=>659,10250=>659,10251=>659,10252=>659,10253=>659,10254=>659,10255=>659,10256=>659,10257=>659,10258=>659,
-10259=>659,10260=>659,10261=>659,10262=>659,10263=>659,10264=>659,10265=>659,10266=>659,10267=>659,10268=>659,
-10269=>659,10270=>659,10271=>659,10272=>659,10273=>659,10274=>659,10275=>659,10276=>659,10277=>659,10278=>659,
-10279=>659,10280=>659,10281=>659,10282=>659,10283=>659,10284=>659,10285=>659,10286=>659,10287=>659,10288=>659,
-10289=>659,10290=>659,10291=>659,10292=>659,10293=>659,10294=>659,10295=>659,10296=>659,10297=>659,10298=>659,
-10299=>659,10300=>659,10301=>659,10302=>659,10303=>659,10304=>659,10305=>659,10306=>659,10307=>659,10308=>659,
-10309=>659,10310=>659,10311=>659,10312=>659,10313=>659,10314=>659,10315=>659,10316=>659,10317=>659,10318=>659,
-10319=>659,10320=>659,10321=>659,10322=>659,10323=>659,10324=>659,10325=>659,10326=>659,10327=>659,10328=>659,
-10329=>659,10330=>659,10331=>659,10332=>659,10333=>659,10334=>659,10335=>659,10336=>659,10337=>659,10338=>659,
-10339=>659,10340=>659,10341=>659,10342=>659,10343=>659,10344=>659,10345=>659,10346=>659,10347=>659,10348=>659,
-10349=>659,10350=>659,10351=>659,10352=>659,10353=>659,10354=>659,10355=>659,10356=>659,10357=>659,10358=>659,
-10359=>659,10360=>659,10361=>659,10362=>659,10363=>659,10364=>659,10365=>659,10366=>659,10367=>659,10368=>659,
-10369=>659,10370=>659,10371=>659,10372=>659,10373=>659,10374=>659,10375=>659,10376=>659,10377=>659,10378=>659,
-10379=>659,10380=>659,10381=>659,10382=>659,10383=>659,10384=>659,10385=>659,10386=>659,10387=>659,10388=>659,
-10389=>659,10390=>659,10391=>659,10392=>659,10393=>659,10394=>659,10395=>659,10396=>659,10397=>659,10398=>659,
-10399=>659,10400=>659,10401=>659,10402=>659,10403=>659,10404=>659,10405=>659,10406=>659,10407=>659,10408=>659,
-10409=>659,10410=>659,10411=>659,10412=>659,10413=>659,10414=>659,10415=>659,10416=>659,10417=>659,10418=>659,
-10419=>659,10420=>659,10421=>659,10422=>659,10423=>659,10424=>659,10425=>659,10426=>659,10427=>659,10428=>659,
-10429=>659,10430=>659,10431=>659,10432=>659,10433=>659,10434=>659,10435=>659,10436=>659,10437=>659,10438=>659,
-10439=>659,10440=>659,10441=>659,10442=>659,10443=>659,10444=>659,10445=>659,10446=>659,10447=>659,10448=>659,
-10449=>659,10450=>659,10451=>659,10452=>659,10453=>659,10454=>659,10455=>659,10456=>659,10457=>659,10458=>659,
-10459=>659,10460=>659,10461=>659,10462=>659,10463=>659,10464=>659,10465=>659,10466=>659,10467=>659,10468=>659,
-10469=>659,10470=>659,10471=>659,10472=>659,10473=>659,10474=>659,10475=>659,10476=>659,10477=>659,10478=>659,
-10479=>659,10480=>659,10481=>659,10482=>659,10483=>659,10484=>659,10485=>659,10486=>659,10487=>659,10488=>659,
-10489=>659,10490=>659,10491=>659,10492=>659,10493=>659,10494=>659,10495=>659,10496=>754,10497=>754,10498=>754,
-10499=>754,10500=>754,10501=>754,10502=>754,10503=>754,10504=>754,10505=>754,10506=>754,10507=>754,10508=>754,
-10509=>754,10510=>754,10511=>754,10512=>754,10513=>754,10514=>754,10515=>754,10516=>754,10517=>754,10518=>754,
-10519=>754,10520=>754,10521=>754,10522=>754,10523=>754,10524=>754,10525=>754,10526=>754,10527=>754,10528=>754,
-10529=>754,10530=>754,10531=>754,10532=>754,10533=>754,10534=>754,10535=>754,10536=>754,10537=>754,10538=>754,
-10539=>754,10540=>754,10541=>754,10542=>754,10543=>754,10544=>754,10545=>754,10546=>754,10547=>754,10548=>754,
-10549=>754,10550=>754,10551=>754,10552=>754,10553=>754,10554=>754,10555=>754,10556=>754,10557=>754,10558=>754,
-10559=>754,10560=>754,10561=>754,10562=>754,10563=>754,10564=>754,10565=>754,10566=>754,10567=>754,10568=>754,
-10569=>754,10570=>754,10571=>754,10572=>754,10573=>754,10574=>754,10575=>754,10576=>754,10577=>754,10578=>754,
-10579=>754,10580=>754,10581=>754,10582=>754,10583=>754,10584=>754,10585=>754,10586=>754,10587=>754,10588=>754,
-10589=>754,10590=>754,10591=>754,10592=>754,10593=>754,10594=>754,10595=>754,10596=>754,10597=>754,10598=>754,
-10599=>754,10600=>754,10601=>754,10602=>754,10603=>754,10604=>754,10605=>754,10606=>754,10607=>754,10608=>754,
-10609=>754,10610=>754,10611=>754,10612=>754,10613=>754,10614=>754,10615=>883,10616=>754,10617=>754,10618=>886,
-10619=>754,10620=>754,10621=>754,10622=>754,10623=>754,10731=>444,10764=>1361,10765=>469,10766=>469,10799=>754,
-11008=>754,11009=>754,11010=>754,11011=>754,11012=>754,11013=>754,11014=>754,11015=>754,11016=>754,11017=>754,
-11018=>754,11019=>754,11020=>754,11021=>754,11022=>754,11023=>754,11024=>754,11025=>754,11026=>850,11027=>850,
-11028=>850,11029=>850,11030=>692,11031=>692,11032=>692,11033=>692,11034=>850,11364=>677,11367=>785,11368=>580,
-11369=>672,11370=>545,11371=>625,11372=>474,11374=>921,11375=>650,11381=>666,11382=>478,11383=>630,11385=>451,
-11386=>542,11388=>237,11389=>409,11520=>695,11521=>571,11522=>569,11523=>592,11524=>568,11525=>866,11526=>680,
-11527=>864,11528=>555,11529=>581,11530=>866,11531=>568,11532=>581,11533=>866,11534=>580,11535=>779,11536=>865,
-11537=>580,11538=>580,11539=>863,11540=>851,11541=>777,11542=>580,11543=>581,11544=>580,11545=>584,11546=>619,
-11547=>571,11548=>883,11549=>613,11550=>608,11551=>766,11552=>861,11553=>569,11554=>580,11555=>582,11556=>674,
-11557=>822,11800=>482,11810=>351,11811=>351,11812=>351,11813=>351,11822=>482,42564=>616,42565=>461,42566=>355,
-42567=>353,42576=>994,42577=>845,42580=>1074,42581=>783,42582=>1025,42583=>787,42760=>444,42761=>444,42762=>444,
-42763=>444,42764=>444,42765=>444,42766=>444,42767=>444,42768=>444,42769=>444,42770=>444,42771=>444,42772=>444,
-42773=>444,42774=>444,42779=>332,42780=>332,42781=>228,42782=>228,42783=>228,42891=>361,42892=>247,62464=>598,
-62465=>607,62466=>651,62467=>861,62468=>607,62469=>602,62470=>661,62471=>896,62472=>607,62473=>607,62474=>1141,
-62475=>624,62476=>623,62477=>866,62478=>607,62479=>623,62480=>908,62481=>681,62482=>728,62483=>682,62484=>859,
-62485=>622,62486=>852,62487=>621,62488=>628,62489=>623,62490=>665,62491=>623,62492=>628,62493=>608,62494=>665,
-62495=>805,62496=>607,62497=>707,62498=>608,62499=>607,62500=>607,62501=>659,62502=>875,62504=>813,63172=>455,
-63173=>542,63174=>576,63175=>580,63176=>853,63185=>450,63188=>450,64256=>637,64257=>600,64258=>600,64259=>847,
-64260=>887,64261=>669,64262=>824,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=>923);
-$enc='';
-$diff='';
-$file='dejavuserifcondensedi.z';
-$ctg='dejavuserifcondensedi.ctg.z';
-$originalsize=301244;
-?>
\ No newline at end of file
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserifcondensedi.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserifcondensedi.z
deleted file mode 100644
index eec24c66..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserifcondensedi.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserifi.ctg.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserifi.ctg.z
deleted file mode 100644
index aa732f80..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserifi.ctg.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserifi.php b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserifi.php
deleted file mode 100644
index cbe9e1d6..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserifi.php
+++ /dev/null
@@ -1,312 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='DejaVuSerif-Italic';
-$desc=array('Ascent'=>928,'Descent'=>-236,'CapHeight'=>-65,'Flags'=>96,'FontBBox'=>'[-839 -347 1650 1227]','ItalicAngle'=>-11,'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=>400,319=>671,320=>465,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=>745,437=>695,438=>527,439=>564,440=>564,441=>564,443=>636,444=>687,445=>564,
-446=>536,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,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,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,581=>722,
-592=>596,593=>640,594=>675,595=>640,596=>560,597=>560,598=>647,599=>683,600=>592,601=>592,
-602=>843,603=>537,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=>646,
-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=>539,696=>355,697=>278,699=>318,700=>318,701=>318,702=>307,
-703=>307,704=>280,705=>281,711=>500,712=>282,713=>500,716=>282,720=>337,721=>337,722=>307,
-723=>307,726=>392,728=>500,729=>500,730=>500,731=>500,733=>500,734=>417,736=>448,737=>243,
-738=>337,739=>355,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,884=>278,
-885=>278,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=>537,942=>599,943=>392,944=>608,945=>675,946=>578,
-947=>598,948=>602,949=>537,950=>542,951=>599,952=>602,953=>392,954=>656,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,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=>610,1074=>582,1075=>505,1076=>634,1077=>592,1078=>1137,1079=>545,1080=>644,1081=>644,
-1082=>597,1083=>637,1084=>829,1085=>659,1086=>602,1087=>644,1088=>640,1089=>560,1090=>948,1091=>580,
-1092=>783,1093=>564,1094=>698,1095=>622,1096=>947,1097=>1001,1098=>667,1099=>814,1100=>544,1101=>560,
-1102=>880,1103=>662,1104=>592,1105=>592,1106=>624,1107=>505,1108=>560,1109=>513,1110=>320,1111=>320,
-1112=>310,1113=>859,1114=>878,1115=>644,1116=>597,1117=>644,1118=>580,1119=>644,1122=>762,1123=>882,
-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=>505,1172=>730,1173=>614,1174=>1124,1175=>1137,
-1176=>623,1177=>545,1178=>774,1179=>604,1182=>774,1183=>597,1184=>892,1185=>669,1186=>872,1187=>712,
-1188=>1139,1189=>857,1190=>1206,1191=>943,1194=>765,1195=>560,1196=>667,1197=>1013,1198=>660,1199=>571,
-1200=>660,1201=>571,1202=>712,1203=>629,1204=>936,1205=>732,1206=>749,1207=>677,1210=>749,1211=>644,
-1216=>395,1217=>1124,1218=>1137,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=>1137,1246=>623,1247=>545,1248=>564,1249=>564,1250=>872,1251=>644,
-1252=>872,1253=>644,1254=>820,1255=>602,1256=>820,1257=>602,1258=>820,1259=>602,1260=>765,1261=>560,
-1262=>723,1263=>580,1264=>723,1265=>580,1266=>723,1267=>580,1268=>773,1269=>622,1270=>662,1271=>505,
-1272=>984,1273=>814,1296=>623,1297=>545,1298=>834,1299=>637,1300=>1199,1301=>939,1306=>820,1307=>640,
-1308=>1028,1309=>856,4256=>732,4257=>860,4258=>837,4259=>869,4260=>743,4261=>991,4262=>925,4263=>1111,
-4264=>576,4265=>760,4266=>972,4267=>951,4268=>753,4269=>1084,4270=>906,4271=>838,4272=>1049,4273=>743,
-4274=>679,4275=>1025,4276=>946,4277=>1029,4278=>741,4279=>743,4280=>742,4281=>743,4282=>889,4283=>946,
-4284=>724,4285=>765,4286=>743,4287=>968,4288=>1010,4289=>712,4290=>874,4291=>744,4292=>847,4293=>960,
-4304=>550,4305=>581,4306=>599,4307=>843,4308=>571,4309=>567,4310=>620,4311=>871,4312=>569,4313=>556,
-4314=>1076,4315=>596,4316=>596,4317=>835,4318=>580,4319=>590,4320=>833,4321=>607,4322=>758,4323=>701,
-4324=>825,4325=>595,4326=>868,4327=>578,4328=>604,4329=>596,4330=>685,4331=>597,4332=>557,4333=>585,
-4334=>625,4335=>693,4336=>582,4337=>613,4338=>581,4339=>582,4340=>580,4341=>659,4342=>896,4343=>636,
-4344=>592,4345=>628,4346=>581,4347=>456,4348=>373,7426=>940,7432=>509,7433=>320,7444=>989,7446=>602,
-7447=>602,7453=>737,7454=>948,7455=>948,7468=>455,7469=>630,7470=>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,
-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=>428,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=>464,7514=>613,7515=>373,
-7522=>201,7523=>347,7524=>399,7525=>373,7543=>640,7544=>549,7547=>372,7557=>320,7579=>488,7580=>353,
-7581=>353,7582=>473,7583=>428,7584=>233,7585=>316,7586=>488,7587=>399,7588=>201,7589=>201,7590=>201,
-7591=>201,7592=>318,7593=>263,7594=>263,7595=>455,7596=>613,7597=>613,7598=>495,7599=>492,7600=>487,
-7601=>385,7602=>473,7603=>416,7604=>299,7605=>334,7606=>399,7607=>477,7609=>464,7610=>355,7611=>332,
-7612=>418,7613=>418,7614=>452,7615=>473,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,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=>953,7748=>875,7749=>644,7750=>875,7751=>644,
-7752=>875,7753=>644,7754=>875,7755=>644,7756=>820,7757=>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,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,7838=>829,7839=>602,
-7840=>722,7841=>596,7842=>722,7843=>596,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,7878=>730,7879=>592,7880=>395,7881=>320,7882=>395,7883=>320,7884=>820,7885=>602,
-7886=>820,7887=>602,7896=>820,7897=>602,7908=>843,7909=>644,7910=>843,7911=>644,7922=>660,7923=>565,
-7924=>660,7925=>565,7926=>660,7927=>565,7928=>660,7929=>565,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=>405,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=>355,8340=>387,8358=>660,8367=>1057,8369=>706,8372=>780,8373=>636,
-8451=>1119,8457=>1047,8462=>644,8463=>644,8470=>946,8486=>829,8487=>829,8490=>747,8491=>722,8513=>775,
-8514=>557,8515=>557,8516=>611,8523=>890,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,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,
-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,11364=>753,11367=>872,11368=>644,
-11369=>747,11370=>606,11371=>695,11372=>527,11374=>1024,11375=>722,11381=>740,11382=>531,11383=>700,11385=>501,
-11386=>602,11388=>264,11389=>455,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=>939,42580=>1193,42581=>871,42582=>1140,42583=>875,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,42891=>402,42892=>275,62464=>664,
-62465=>675,62466=>724,62467=>958,62468=>675,62469=>669,62470=>735,62471=>997,62472=>675,62473=>675,62474=>1268,
-62475=>693,62476=>692,62477=>963,62478=>675,62479=>692,62480=>1009,62481=>756,62482=>809,62483=>758,62484=>955,
-62485=>691,62486=>946,62487=>690,62488=>698,62489=>692,62490=>739,62491=>692,62492=>698,62493=>676,62494=>739,
-62495=>895,62496=>675,62497=>785,62498=>676,62499=>675,62500=>675,62501=>732,62502=>972,62504=>904,63172=>505,
-63173=>602,63174=>640,63175=>644,63176=>947,63185=>500,63188=>500,64256=>708,64257=>667,64258=>667,64259=>941,
-64260=>986,64261=>744,64262=>916,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='dejavuserifi.z';
-$ctg='dejavuserifi.ctg.z';
-$originalsize=301828;
-?>
\ No newline at end of file
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserifi.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserifi.z
deleted file mode 100644
index 3b751b08..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/dejavuserifi.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freefont-20090104/AUTHORS b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freefont-20090104/AUTHORS
deleted file mode 100644
index 4148c935..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freefont-20090104/AUTHORS
+++ /dev/null
@@ -1,208 +0,0 @@
--*- mode:text; coding:utf-8; -*-
-                        GNU FreeFont Authors
-                        ====================
-
-The FreeFont collection is being maintained by
-	Steve White <stevan.white AT googlemail.com>
-The folowing list cites the other contributors that contributed to
-particular ISO 10646 blocks.
-
-* URW++ Design & Development GmbH <http://www.urwpp.de/>
-
-	Basic Latin				(U+0041-U+007A)
-	Latin-1 Supplement                      (U+00C0-U+00FF) (most)
-	Latin Extended-A                        (U+0100-U+017F)
-	Spacing Modifier Letters		(U+02B0-U+02FF)
-	Mathematical Operators			(U+2200-U+22FF) (parts)
-	Block Elements				(U+2580-U+259F)
-	Dingbats				(U+2700-U+27BF)
-
-* Yannis Haralambous <yannis.haralambous AT enst-bretagne.fr> and John
-  Plaice <plaice AT omega.cse.unsw.edu.au>
-
-	Latin Extended-B                        (U+0180-U+024F)
-	IPA Extensions				(U+0250-U+02AF)
-	Greek					(U+0370-U+03FF)
-	Armenian				(U+0530-U+058F)
-	Hebrew					(U+0590-U+05FF)
-	Arabic					(U+0600-U+06FF)
-	Currency Symbols			(U+20A0-U+20CF)
-	Arabic Presentation Forms-A		(U+FB50-U+FDFF)
-	Arabic Presentation Forms-B		(U+FE70-U+FEFF)
-
-* Young U. Ryu <ryoung AT utdallas.edu>
-
-	Arrows					(U+2190-U+21FF)
-	Mathematical Symbols			(U+2200-U+22FF)
-	Mathematical Alphanumeric Symbols       (U+1D400-U+1D7FF)
-
-* Valek Filippov <frob AT df.ru>
-
-	Cyrillic				(U+0400-U+04FF)
-
-* Wadalab Kanji Comittee
-
-	Hiragana				(U+3040-U+309F)
-	Katakana				(U+30A0-U+30FF)
-
-* Angelo Haritsis <ah AT computer.org>
-
-	Greek					(U+0370-U+03FF)
-
-* Yannis Haralambous and Virach Sornlertlamvanich
-
-	Thai					(U+0E00-U+0E7F)
-
-* Shaheed R. Haque <srhaque AT iee.org>
-
-	Bengali					(U+0980-U+09FF)
-
-* Sam Stepanyan <sam AT arminco.com>
-
-	Armenian				(U+0530-U+058F)
-
-* Mohamed Ishan <ishan AT mitf.f2s.com>
-
-	Thaana					(U+0780-U+07BF)
-
-* Sushant Kumar Dash <sushant AT writeme.com>
-
-	Oriya					(U+0B00-U+0B7F)
-
-* Harsh Kumar <harshkumar AT vsnl.com>
-
-	Devanagari				(U+0900-U+097F)
-	Bengali					(U+0980-U+09FF)
-	Gurmukhi				(U+0A00-U+0A7F)
-	Gujarati				(U+0A80-U+0AFF)
-
-* Prasad A. Chodavarapu <chprasad AT hotmail.com>
-
-	Telugu					(U+0C00-U+0C7F)
-
-* Frans Velthuis <velthuis AT rc.rug.nl> and Anshuman Pandey
-  <apandey AT u.washington.edu> 
-
-	Devanagari				(U+0900-U+097F)
-
-* Hardip Singh Pannu <HSPannu AT aol.com>
-
-	Gurmukhi				(U+0A00-U+0A7F)
-
-* Jeroen Hellingman <jehe AT kabelfoon.nl>
-
-	Oriya					(U+0B00-U+0B7F)
-	Malayalam				(U+0D00-U+0D7F)
-
-* Thomas Ridgeway <email needed>
-
-	Tamil					(U+0B80-U+0BFF)
-
-* Berhanu Beyene <1beyene AT informatik.uni-hamburg.de>,
-  Prof. Dr. Manfred Kudlek <kudlek AT informatik.uni-hamburg.de>, Olaf
-  Kummer <kummer AT informatik.uni-hamburg.de>, and Jochen Metzinger <?>
-
-	Ethiopic				(U+1200-U+137F)
-
-* Maxim Iorsh <iorsh AT users.sourceforge.net>
-
-	Hebrew					(U+0590-U+05FF)
-
-* Vyacheslav Dikonov <sdiconov AT mail.ru>
-
-	Syriac					(U+0700-U+074A)
-	Braille					(U+2800-U+28FF)
-
-* Panayotis Katsaloulis <panayotis AT panayotis.com>
-
-	Greek Extended				(U+1F00-U+1FFF)
-
-* M.S. Sridhar <mssridhar AT vsnl.com>
-
-	Devanagari				(U+0900-U+097F)
-	Bengali					(U+0980-U+09FF)
-	Gurmukhi				(U+0A00-U+0A7F)
-	Gujarati				(U+0A80-U+0AFF)
-	Oriya					(U+0B00-U+0B7F)
-	Tamil					(U+0B80-U+0BFF)
-	Telugu					(U+0C00-U+0C7F)
-	Kannada					(U+0C80-U+0CFF)	
-	Malayalam				(U+0D00-U+0D7F)
-
-* DMS Electronics, The Sri Lanka Tipitaka Project, and Noah Levitt
-  <nlevitt AT columbia.edu>
-
-	Sinhala					(U+0D80-U+0DFF)
-        
-* Dan Shurovich Chirkov <dansh AT chirkov.com>
-
-	Cyrillic				(U+0400-U+04FF)
-
-* Abbas Izad <abbasizad AT hotmail.com>
-
-	Arabic					(U+0600-U+06FF)
-	Arabic Presentation Forms-A		(U+FB50-U+FDFF)
-	Arabic Presentation Forms-B		(U+FE70-U+FEFF)
-
-* Denis Jacquerye <moyogo AT gmail.com>
-
-	Latin Extended-B                        (U+0180-U+024F)
-	IPA Extensions				(U+0250-U+02AF)
-
-* K.H. Hussain <hussain AT kfri.org> and R. Chitrajan
-
-	Malayalam				(U+0D00-U+0D7F)
-
-* Solaiman Karim <solaiman AT ekushey.org> and Omi Azad <omi AT ekushey.org>
-
-	Bengali					(U+0980-U+09FF)
-
-* Sonali Sonania <sonalisonania AT gmail.com> and Monika Shah
-  <monikapatira AT gmail.com>
-
-	Devanagari				(U+0900-U+097F)
-	Gujarati				(U+0A80-U+0AFF)
-
-* Pravin Satpute <pravin_ind21 AT hotmail.com>, Bageshri Salvi
-  <sbagrshri AT yahoo.co.in>, Rahul Bhalerao <rahul_pb_india AT
-  yahoo.com> and Sandeep Shedmake <surgs2k47 AT yahoo.co.in>
-
-	Devanagari				(U+0900-U+097F)
-	Gujarati				(U+0A80-U+0AFF)
-	Oriya					(U+0B00-U+0B7F)
-	Malayalam				(U+0D00-U+0D7F)
-	Tamil					(U+0B80-U+0BFF)
-
-* Kulbir Singh Thind
-
-	Gurmukhi				(U+0A00-U+0A7F)
-
-* Gia Shervashidze <giasher AT telenet.ge>
-
-        Georgian				(U+10A0-U+10FF)
-
-* Daniel Johnson
-
-	Cherokee                                (U+13A0-U+13FF)
-
-* George Douros
-
-	Gothic                                  (U+10330-U+1034F)
-	Phoenecian                              (U+10900-U+1091F)
-	Byzantine Musical Symbols               (U+1D000-U+1D0FF)
-	Western Musical Symbols                 (U+1D100-U+1D1DF)
-	Mathematical Alphanumeric Symbols       (U+1D400-U+1D7FF)
-	Mah Jong Tiles                          (U+1F000-U+1F02B)
-	Dominoes                                (U+1F030-U+1F093)
-
-* Steve White <stevan_white AT gmail.com>
-	Coptic                                  (U+2C80-U+2CFF)
-
-* Primož Peterlin <primoz.peterlin AT biofiz.mf.uni-lj.si>
-  maintained FreeFont for several years, and is thanked for all his work.
-
-Please see the CREDITS file for details on who contributed particular
-subsets of the glyphs in font files.
-
---------------------------------------------------------------------------
-$Id: AUTHORS,v 1.18 2009/01/04 15:57:54 Stevan_White Exp $
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freefont-20090104/COPYING b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freefont-20090104/COPYING
deleted file mode 100644
index 94a9ed02..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freefont-20090104/COPYING
+++ /dev/null
@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freefont-20090104/CREDITS b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freefont-20090104/CREDITS
deleted file mode 100644
index 8edb0687..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freefont-20090104/CREDITS
+++ /dev/null
@@ -1,528 +0,0 @@
--*- mode:text; coding:utf-8; -*-
-                         GNU FreeFont Credits
-                         ====================
-
-This file lists contributors and contributions to the GNU FreeFont project.
-
-
-* URW++ Design & Development GmbH <http://www.urwpp.de/>
-
-URW++ donated a set of 35 core PostScript Type 1 fonts to the
-Ghostscript project <http://www.cs.wisc.edu/~ghost/>, to be available
-under the terms of GNU General Public License (GPL).
-
-	Basic Latin				(U+0041-U+007A)
-	Latin-1 Supplement                      (U+00C0-U+00FF)
-	Latin Extended-A                        (U+0100-U+017F)
-	Spacing Modifier Letters		(U+02B0-U+02FF)
-	Mathematical Operators			(U+2200-U+22FF)
-	Block Elements				(U+2580-U+259F)
-	Dingbats				(U+2700-U+27BF)
-
-
-* Yannis Haralambous <yannis.haralambous AT enst-bretagne.fr> and John
-  Plaice <plaice AT omega.cse.unsw.edu.au>
-
-Yannis Haralambous and John Plaice are the authors of Omega typesetting
-system, <http://omega.enstb.org/>. Omega is an extension of TeX.
-Its first release, aims primarily at improving TeX's multilingual abilities.
-In Omega all characters and pointers into data-structures are 16-bit wide,
-instead of 8-bit, thereby eliminating many of the trivial limitations of TeX.
-Omega also allows multiple input and output character sets, and uses
-programmable filters to translate from one encoding to another, to perform
-contextual analysis, etc. Internally, Omega uses the universal 16-bit Unicode
-standard character set, based on ISO-10646. These improvements not only make
-it a lot easier for TeX users to cope with multiple or complex languages,
-like Arabic, Indic, Khmer, Chinese, Japanese or Korean, in one document, but
-will also form the basis for future developments in other areas, such as
-native color support and hypertext features. ... Fonts for UT1 (omlgc family)
-and UT2 (omah family) are under development: these fonts are in PostScript
-format and visually close to Times and Helvetica font families. 
-Omega fonts are available subject to GPL
-
-	Latin Extended-B                        (U+0180-U+024F)
-	IPA Extensions				(U+0250-U+02AF)
-	Greek					(U+0370-U+03FF)
-	Armenian				(U+0530-U+058F)
-	Hebrew					(U+0590-U+05FF)
-	Arabic					(U+0600-U+06FF)
-	Currency Symbols			(U+20A0-U+20CF)
-	Arabic Presentation Forms-A		(U+FB50-U+FDFF)
-	Arabic Presentation Forms-B		(U+FE70-U+FEFF)
-
-Current info: <http://tug.ctan.org/cgi-bin/ctanPackageInformation.py?id=omega>
-
-* Valek Filippov <frob AT df.ru>
-
-Valek Filippov added Cyrillic glyphs and composite Latin Extended A to
-the whole set of the abovementioned URW set of 35 PostScript core fonts,
-<ftp://ftp.gnome.ru/fonts/urw/>. The fonts are available under GPL.
-
-	Latin Extended-A                        (U+0100-U+017F)
-	Cyrillic				(U+0400-U+04FF)
-
-
-* Wadalab Kanji Comittee
-
-Between April 1990 and March 1992, Wadalab Kanji Comittee put together
-a series of scalable font files with Japanese scripts, in four forms:
-Sai Micho, Chu Mincho, Cho Kaku and Saimaru. The font files are
-written in custom file format, while tools for conversion into
-Metafont and PostScript Type 1 are also supplied. The Wadalab Kanji
-Comittee has later been dismissed, and the resulting files can be now
-found on the FTP server of the Depertment of Mathematical Engineering
-and Information Physics, Faculty of Engineering, University of Tokyo
-<ftp://ftp.ipl.t.u-tokyo.ac.jp/Font/>.
-
-	Hiragana				(U+3040-U+309F)
-	Katakana				(U+30A0-U+30FF)
-
-
-* Young U. Ryu <ryoung AT utdallas.edu>
-
-Young Ryu is the author of Txfonts, a set of mathematical symbols
-designed to accompany text typeset in Times or its variants. In the
-documentation, Young adresses the design of mathematical symbols: "The
-Adobe Times fonts are thicker than the CM fonts. Designing math fonts
-for Times based on the rule thickness of Times = , , + , / , < ,
-etc. would result in too thick math symbols, in my opinion. In the TX
-fonts, these glyphs are thinner than those of original Times
-fonts. That is, the rule thickness of these glyphs is around 85% of
-that of the Times fonts, but still thicker than that of the CM fonts."
-TX fonts are are distributed under the GNU public license (GPL). 
-<http://www.ctan.org/tex-archive/fonts/txfonts/>.
-
-	Arrows					(U+2190-U+21FF)
-	Mathematical Symbols			(U+2200-U+22FF)
-
-
-* Angelo Haritsis <ah AT computer.org>
-
-Angelo Haritsis has compiled a set of Greek Type 1 fonts, available on
-<ftp://ftp.hellug.gr/pub/unix/linux/GREEK/fonts/greekXfonts-Type1-1.1.tgz>.
-The glyphs from this source has been used to compose Greek glyphs in
-FreeSans and FreeMono.
-
-Angelo's licence says: "You can enjoy free use of these fonts for
-educational or commercial purposes.  All derived works should include
-this paragraph.  If you want to change something please let me have
-your changes (via email) so that they can go into the next
-version. You can also send comments etc to the above address."
-
-	Greek					(U+0370-U+03FF)
-
-
-* Yannis Haralambous and Virach Sornlertlamvanich
-
-In 1999, Yannis Haralambous and Virach Sornlertlamvanich made a set of
-glyphs covering the Thai national standard Nf3, in both upright and
-slanted shape. The collection of glyphs have been made part of GNU
-intlfonts 1.2 package and is available under the GPL at
-<ftp://ftp.gnu.org/pub/gnu/intlfonts/>.
-
-	Thai					(U+0E00-U+0E7F)
-
-
-* Shaheed R. Haque <srhaque AT iee.org>
-
-Shaheed Haque has developed a basic set of basic Bengali glyphs
-(without ligatures), using ISO10646 encoding. They are available under
-the XFree86 license at <http://www.btinternet.com/~shaheedhaque/>.
-
-Copyright (C) 2001 S.R.Haque <srhaque AT iee.org>.  All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL S.R.HAQUE BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of S.R.Haque shall not be
-used in advertising or otherwise to promote the sale, use or other
-dealings in this Software without prior written authorization from
-S.R.Haque.
-
-	Bengali					(U+0980-U+09FF)
-
-
-* Sam Stepanyan <sam AT arminco.com>
-
-Sam Stepanyan created a set of Armenian sans serif glyphs visually
-compatible with Helvetica or Arial. Available on
-<http://www.editum.com.ar/mashtots/html/fonts/ara.tar.gz>. On
-2002-01-24, Sam writes: "Arial Armenian font is free for
-non-commercial use, so it is OK to use under GPL license."
-
-	Armenian				(U+0530-U+058F)
-
-
-* Mohamed Ishan <ishan AT mitf.f2s.com>
-
-Mohamed Ishan has started a Thaana Unicode Project
-<http://thaana.sourceforge.net/> and among other things created a
-couple of Thaana fonts, available under FDL or BDF license.
-
-	Thaana					(U+0780-U+07BF)
-
-
-* Sushant Kumar Dash <sushant AT writeme.com> (*)
-
-Sushant Dash has created a font in his mother tongue, Oriya. As he
-states on his web page <http://members.tripod.com/~sushantdash/>:
-"Please feel free to foreword this mail to your Oriya friends. No
-copyright law is applied for this font. It is totally free!!! Feel
-free to modify this using any font editing tools. This is designed for
-people like me, who are away from Orissa and want to write letters
-home using Computers, but suffer due to unavailability of Oriya
-fonts.(Or the cost of the available packages are too much)."
-
-	Oriya					(U+0B00-U+0B7F)
-
-
-* Harsh Kumar <harshkumar AT vsnl.com>
-
-Harsh Kumar has started BharatBhasha <http://www.bharatbhasha.net/> -
-an effort to provide "FREE software, Tutorial, Source Codes
-etc. available for working in Hindi, Marathi, Gujarati, Gurmukhi and
-Bangla. You can type text, write Web pages or develop Indian Languages
-Applications on Windows and on Linux. We also offer FREE help to
-users, enthusiasts and software developers for their work in Indian
-languages."
-
-	Devanagari				(U+0900-U+097F)
-	Bengali					(U+0980-U+09FF)
-	Gurmukhi				(U+0A00-U+0A7F)
-	Gujarati				(U+0A80-U+0AFF)
-
-
-* Prasad A. Chodavarapu <chprasad AT hotmail.com>
-
-Prasad A. Chodavarapu created Tikkana, a Telugu font available in Type
-1 and TrueType format on <http://chaitanya.bhaavana.net/fonts/>. 
-Tikkana exceeds the Unicode Telugu range with some composite glyphs.
-Available under the GNU General Public License.
-
-	Telugu					(U+0C00-U+0C7F)
-
-
-* Frans Velthuis <velthuis AT rc.rug.nl> and Anshuman Pandey
-  <apandey AT u.washington.edu>
-
-In 1991, Frans Velthuis from the Groningen University, The
-Netherlands, released a Devanagari font as Metafont source, available
-under the terms of GNU GPL. Later, Anshuman Pandey from the Washington
-University, Seattle, USA, took over the maintenance of font. Fonts can
-be found on CTAN, <ftp://ftp.dante.de/tex-archive/language/devanagari/>. I
-converted the font to Type 1 format using Péter Szabó's TeXtrace
-program <http://www.inf.bme.hu/~pts/textrace/> and removed some
-redundant control points with PfaEdit.
-
-	Devanagari				(U+0900-U+097F)
-
-
-* Hardip Singh Pannu <HSPannu AT aol.com>
-
-In 1991, Hardip Singh Pannu has created a free Gurmukhi TrueType font,
-available as regular, bold, oblique and bold oblique form. Its license
-says "Please remember that these fonts are copyrighted (by me) and are
-for non-profit use only." 
-
-	Gurmukhi				(U+0A00-U+0A7F)
-
-
-* Jeroen Hellingman <jehe AT kabelfoon.nl>
-
-Jeroen Hellingman created a set of Malayalam metafonts in 1994, and a
-set of Oriya metafonts in 1996. Malayalam fonts were created as
-uniform stroke only, while Oriya metafonts exist in both uniform and
-modulated stroke. From private communication: "It is my intention to
-release the fonts under GPL, but not all copies around have this
-notice on them." Metafonts can be found on CTAN,
-<ftp://ftp.dante.de/tex-archive/language/oriya/> and
-<ftp://ftp.dante.de/tex-archive/language/malayalam/>.
-
-	Oriya					(U+0B00-U+0B7F)
-	Malayalam				(U+0D00-U+0D7F)
-
-
-* Thomas Ridgeway <> (*)
-
-Thomas Ridgeway, then at the Humanities And Arts Computing Center,
-Washington University, Seattle, USA, (now defunct), created a Tamil
-metafont in 1990. Anshuman Pandey from the same university took over
-the maintenance of font. Fonts can be found at CTAN,
-<ftp://ftp.dante.de/tex-archive/language/tamil/wntamil/>.
-
-	Tamil					(U+0B80-U+0BFF)
-
-
-* Berhanu Beyene <1beyene AT informatik.uni-hamburg.de>,
-  Prof. Dr. Manfred Kudlek <kudlek AT informatik.uni-hamburg.de>, Olaf
-  Kummer <kummer AT informatik.uni-hamburg.de>, and Jochen Metzinger <?>
-
-Beyene, Kudlek, Kummer and Metzinger from the Theoretical Foundations
-of Computer Science, University of Hamburg, prepared a set of Ethiopic
-metafonts, found on
-<ftp://ftp.dante.de/tex-archive/language/ethiopia/ethiop/>. They also
-maintain home page on the Ethiopic font project,
-<http://www.informatik.uni-hamburg.de/TGI/mitarbeiter/wimis/kummer/ethiop_eng.html>,
-and can be reached at <ethiop AT informatik.uni-hamburg.de>. The current
-version of fonts is 0.7 (1998), and they are released under GNU GPL. I
-converted the fonts to Type 1 format using Péter Szabó's TeXtrace-A
-program <http://www.inf.bme.hu/~pts/textrace/> and removed some
-redundant control points with PfaEdit.
-
-	Ethiopic				(U+1200-U+137F)
-
-
-* Maxim Iorsh <iorsh AT users.sourceforge.net>
-
-In 2002, Maxim Iorsh started the Culmus project, aiming at providing
-Hebrew-speaking Linux and Unix community with a basic collection of
-Hebrew fonts for X Windows. The fonts are visually compatible with
-URW++ Century Schoolbook L, URW++ Nimbus Sans L and URW++ Nimbus Mono
-L families, respectively, and are released under GNU GPL license. See
-also <http://culmus.sourceforge.net/>.
-
-	Hebrew					(U+0590-U+05FF)
-
-
-* Panayotis Katsaloulis <panayotis AT panayotis.com>
-
-Panayotis Katsaloulis helped fixing Greek accents in the Greek
-Extended area.
-
-	Greek Extended				(U+1F00-U+1FFF)
-
-
-* Vyacheslav Dikonov <sdiconov AT mail.ru>
-
-Vyacheslav Dikonov made a Braille unicode font that could be merged
-with the UCS fonts to fill the 2800-28FF range completely. (uniform
-scaling is possible to adapt it to any cell size). He also contributed
-a free syriac font, whose glyphs (about half of them) are borrowed
-from the "Carlo Ator" font freely downloadable from
-<http://www.aacf.asso.fr/>. Vyacheslav also filled in a few missing
-spots in the U+2000-U+27FF area, e.g. the box drawing section, sets of
-subscript and superscript digits and capital Roman numbers.
-
-	Syriac					(U+0700-U+074A)
-	Box Drawing				(U+2500-U+257F)
-	Braille					(U+2800-U+28FF)
-
-
-* M.S. Sridhar <mssridhar AT vsnl.com>
-
-M/S Cyberscape Multimedia Limited, Mumbai, developers of Akruti
-Software for Indian Languages (http://www.akruti.com/), have released
-a set of TTF fonts for nine Indian scripts (Devanagari, Gujarati,
-Telugu, Tamil, Malayalam, Kannada, Bengali, Oriya, and Gurumukhi)
-under the GNU General Public License (GPL). You can download the fonts
-from the Free Software Foundation of India WWW site
-(http://www.gnu.org.in/akruti-fonts/) or from the Akruti website.
-
-For any further information or assistance regarding these fonts,
-please contact mssridhar AT vsnl.com.
-
-	Devanagari				(U+0900-U+097F)
-	Bengali					(U+0980-U+09FF)
-	Gurmukhi				(U+0A00-U+0A7F)
-	Gujarati				(U+0A80-U+0AFF)
-	Oriya					(U+0B00-U+0B7F)
-	Tamil					(U+0B80-U+0BFF)
-	Telugu					(U+0C00-U+0C7F)
-	Kannada					(U+0C80-U+0CFF)	
-	Malayalam				(U+0D00-U+0D7F)
-
-
-* DMS Electronics, The Sri Lanka Tipitaka Project, and Noah Levitt
-  <nlevitt AT columbia.edu>
-
-Noah Levitt found out that the Sinhalese fonts available on the site
-<http://www.metta.lk/fonts/> are released under GNU GPL, or,
-precisely, "Public Domain under GNU Licence
 Produced by DMS
-Electronics for The Sri Lanka Tipitaka Project" (taken from the font
-comment), and took the effort of recoding the font to Unicode.
-
-	Sinhala					(U+0D80-U+0DFF)
-       
-
-* Daniel Shurovich Chirkov <dansh AT chirkov.com>
-
-Dan Chirkov updated the FreeSerif font with the missing Cyrillic
-glyphs needed for conformance to Unicode 3.2. The effort is part of
-the Slavjanskij package for Mac OS X,
-<http://www.versiontracker.com/dyn/moreinfo/macosx/18680>.
-
-	Cyrillic				(U+0400-U+04FF)
-
-
-* Denis Jacquerye <moyogo AT gmail.com>
-
-Denis Jacquerye added new glyphs and corrected existing ones in the
-Latin Extended-B and IPA Extensions ranges.
-
-	Latin Extended-B                        (U+0180-U+024F)
-	IPA Extensions				(U+0250-U+02AF)
-
-
-* K.H. Hussain <hussain AT kfri.org> and R. Chitrajan
-
-`Rachana' in Malayalam means `to write', `to create'. Rachana Akshara Vedi,
-a team of socially committed information technology professionals and
-philologists, has applied developments in computer technology and desktop
-publishing to resurrect the Malayalam language from the disorder,
-fragmentation and degeneration it had suffered since the attempt to adapt
-the Malayalam script for using with a regular mechanical typewriter, which
-took place in 1967-69. K.H. Hussein at the Kerala Forest Research Institute
-has released "Rachana Normal" fonts with approximately 900 glyphs required
-to typeset traditional Malayalam. R. Chitrajan apparently encoded the
-glyphs in the OpenType table.
-
-In 2008, the Malayalam ranges in FreeSerif were updated under the advise 
-and supervision of Hiran Venugopalan of Swathanthra Malayalam Computing,
-to reflect the revised edition Rachana_04.
-
-	Malayalam				(U+0D00-U+0D7F)
-
-
-* Solaiman Karim <solaiman AT ekushey.org>
-
-	Bengali					(U+0980-U+09FF)
-
-Solaiman Karim has developed several OpenType Bangla fonts and
-released them under GNU GPL on <http://www.ekushey.org>.
-
-
-* Sonali Sonania <sonalisonania AT gmail.com> and Monika Shah
-  <monikapatira AT gmail.com>
-
-	Devanagari				(U+0900-U+097F)
-	Gujarati				(U+0A80-U+0AFF)
-
-Glyphs were drawn by Cyberscape Multimedia Ltd., #101,Mahalakshmi
-Mansion 21st Main 22nd "A" Cross Banashankari 2nd stage Banglore
-560070, India. Converted to OTF by IndicTrans Team, Powai, Mumbai,
-lead by Prof. Jitendra Shah. Maintained by Monika Shah and Sonali
-Sonania of janabhaaratii Team, C-DAC, Mumbai. This font is released
-under GPL by Dr. Alka Irani and Prof Jitendra Shah, janabhaaratii
-Team, C-DAC, Mumabi. janabhaaratii is localisation project at C-DAC
-Mumbai (formerly National Centre for Software Technology); funded by
-TDIL, Govt. of India. Contact:monika_shah AT lycos.com,
-sonalisonania AT yahoo.com, jitendras AT vsnl.com, alka AT ncst.ernet.in.
-website: www.janabhaaratii.org.in.
-
-
-* Pravin Satpute <pravin_ind21 AT hotmail.com>, Bageshri Salvi
-  <sbagrshri AT yahoo.co.in>, Rahul Bhalerao <rahul_pb_india AT
-  yahoo.com> and Sandeep Shedmake <surgs2k47 AT yahoo.co.in>
-
-	Devanagari				(U+0900-U+097F)
-	Gujarati				(U+0A80-U+0AFF)
-	Oriya					(U+0B00-U+0B7F)
-	Malayalam				(U+0D00-U+0D7F)
-	Tamil					(U+0B80-U+0BFF)
-
-In December 2005 the team at www.gnowledge.org released a set of two
-Unicode pan-Indic fonts: "Samyak" and "Samyak Sans". "Samyak" font
-belongs to serif style and is an original work of the team; "Samyak
-Sans" font belongs to sans serif style and is actually a compilation
-of already released Indic fonts (Gargi, Padma, Mukti, Utkal, Akruti
-and ThendralUni). Both fonts are based on Unicode standard. You can
-download the font files (released under GNU/GPL License) from
-http://www.gnowledge.org/Gnoware/localization/font.htm
-
-
-* Kulbir Singh Thind
-
-	Gurmukhi				(U+0A00-U+0A7F)
-
-Dr. Kulbir Singh Thind designed a set of Gurmukhi Unicode fonts,
-AnmolUni and AnmolUni-Bold, which are available under the terms of GNU
-Generel Public Licens from the Punjabu Computing Resource Center,
-http://guca.sourceforge.net/typography/fonts/anmoluni/.
-
-
-* Gia Shervashidze <giasher AT telenet.ge>
-
-        Georgian				(U+10A0-U+10FF)
-
-Starting in mid-1990s, Gia Shervashidze designed many
-Unicode-compliant Georgian fonts: Times New Roman Georgian, Arial
-Georgian, Courier New Georgian. His work on Georgian localization can
-be reached at http://www.gia.ge/.
-
-
-* Primož Peterlin <primoz.peterlin AT biofiz.mf.uni-lj.si>
-
-Primož Peterlin filled in missing glyphs here and there (e.g. Latin
-Extended-B and IPA Extensions ranges in the FreeMono familiy), and
-created the following UCS blocks:
-
-	Latin Extended-B                        (U+0180-U+024F)
-	IPA Extensions				(U+0250-U+02AF)
-	Arrows					(U+2190-U+21FF)
-	Box Drawing				(U+2500-U+257F)
-	Block Elements				(U+2580-U+259F)
-	Geometrical Shapes			(U+25A0-U+25FF)
-
-* Mark Williamson
-
-Made the MPH 2 Damase font, from which 
-	Hanunóo                                 (U+1720-U+173F)
-	Buginese                                (U+1A00-U+1A1F)
-	Tai Le                                  (U+1950-U+197F)
-	Ugaritic                                (U+10380-U+1039F)
-	Old Persian                             (U+103A0-U+103DF)
-
-* Jacob Poon
-
-Submitted a very thorough survey of glyph problems and other suggestions.
-
-* Alexey Kryukov
-
-Made the TemporaLCGUni fonts, based on the URW++ fonts, from which at one 
-point FreeSerif Cyrillic, and some of the Greek, was drawn.  He also provided
-valuable direction about Cyrillic and Greek typesetting.
-
-* George Douros
-
-The creator of several fonts focusing on ancient scripts and symbols.
-Many of the glyphs are created by making outlines from scanned images
-of ancient sources.
-
-	Aegean:   Phoenecian
-	Analecta: Gothic                        (U+10330-U+1034F)
-	Musical:  Byzantine & Western                  
-	Unicode:  many Miscellaneous Symbols, Miscellaneous Technical,
-	          supplemental Symbols, and Mathematical Alphanumeric symbols,
-		  Mah Jong, and the outline of the Domino.
-
-* Daniel Johnson
-
-Created by hand a Cherokee range specially for FreeFont to be "in line with
-the classic Cherokee typefaces used in 19th century printing", but also to
-fit well with ranges previously in FreeFont.
-	Cherokee                                (U+13A0-U+13FF)
-
-Notes:
-
-*: The glyph collection looks license-compatible, but its author has
-   not yet replied and agreed on their work being used in part of
-   this glyph collection.
-
---------------------------------------------------------------------------
-$Id: CREDITS,v 1.23 2009/01/04 15:57:54 Stevan_White Exp $
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freefont-20090104/ChangeLog b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freefont-20090104/ChangeLog
deleted file mode 100644
index d5345d02..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freefont-20090104/ChangeLog
+++ /dev/null
@@ -1,4525 +0,0 @@
-$Id: ChangeLog,v 1.254 2009/01/04 16:12:59 Stevan_White Exp $
-2009-01-04 Stevan_White
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd, FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd, FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Added 2009 to copyright dates
-
-	* AUTHORS, CREDITS:
-
-	Removed Glagolitic range author
-
-	* FreeSans.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Added some TrueType names
-
-2009-01-01 Stevan_White
-	* FreeSerif.sfd:
-
-	Removde Glagolitic range, since have not (yet) received OK from author.
-	
-	Added some TrueType Names
-
-2008-12-31 Stevan_White
-	* COPYING:
-
-	Updated license to GPL v3
-
-2008-12-30 Stevan_White
-	* FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Oblique versions of Daniel Johnson's Cherokee.
-
-	* FreeSerifBold.sfd:
-
-	Cherokee Bold range from Daniel Johnson.
-
-2008-12-27 Stevan_White
-	* isMonoMono.py:
-
-	900 EM -> 800
-
-	* FreeMonoBold.sfd, FreeMonoBoldOblique.sfd:
-
-	Made glyphs to lie between -200 and 800 EM
-
-	* isMonoMono.py:
-
-	check that glyphs lie in vertical bounding boxes
-
-	* FreeMono.sfd, FreeSerif.sfd:
-
-	Extensible bracket characters didn't exactly line up.  Fixed.
-	Mono: a couple of glyphs had gotten out of their bounding boxes again.
-
-2008-12-26 Stevan_White
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd, FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Final pre-release cleanup
-
-	* FreeSerif.sfd:
-
-	Buginese vowel u was misnamed
-
-	* FreeMono.sfd:
-
-	Yatcyrillic somehow was a mark character ... fixed
-
-	* FreeSans.sfd, FreeSansOblique.sfd:
-
-	Had to un-link references in
-	        Sans: uni02B2, uni02B5
-		SansOblique: uni0363
-	because validation of the TTF file said the glyph
-		"is drawn in wrong direction"
-	I would have preferred to have understand this...
-
-	* Makefile:
-
-	Added quick test for FontForge version.
-
-	* FreeMonoBold.sfd, FreeMonoBoldOblique.sfd:
-
-	Removed kerning tables (?? what were they doing here anyway??)
-
-	* FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Kerning tables for Thai.
-	Handles one common case: short letter followed by a tall one with
-	an overhang to the left.
-
-2008-12-25 Stevan_White
-	* FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd, FreeSerif.sfd, FreeSerifItalic.sfd:
-
-	More putzing with kerning tables
-
-	* FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd, FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Copied kerning classes
-		Serif -> SerifBold
-		SerifItalic -> SerifBoldItalic
-		Sans -> SansOblique SansBold SansBoldOblique
-	Some associated naming of characters, etc
-
-	* FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd, FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Additions and correction in Spacing Modifier letters and IPA Extensions
-
-2008-12-23 Stevan_White
-	* FreeSerif.sfd:
-
-	Applied patch to Cherokee range
-
-2008-12-20 Stevan_White
-	* FreeSerif.sfd, FreeSerifItalic.sfd:
-
-	Fixed kern classes that end in space (crashes FontForge)
-
-	* FreeSerifItalic.sfd, FreeSerif.sfd:
-
-	kerning
-
-2008-12-19 Stevan_White
-	* FreeSerifItalic.sfd:
-
-	kerning
-
-	* FreeSerif.sfd:
-
-	kerning
-	Some adjustments to Glagolitc spacing, mark positioning
-
-2008-12-18 Stevan_White
-	* FreeSerif.sfd, FreeSerifItalic.sfd:
-
-	kerning
-
-2008-12-17 Stevan_White
-	* FreeSerif.sfd, FreeSerifItalic.sfd:
-
-	kerning
-
-2008-12-11 Stevan_White
-	* FreeSans.sfd, FreeSerif.sfd:
-
-	kerning
-
-2008-12-10 Stevan_White
-	* FreeSans.sfd, FreeSansBold.sfd:
-
-	kerning
-
-	* FreeSans.sfd, FreeSansBold.sfd, FreeSansOblique.sfd, FreeSerif.sfd, FreeSerifBold.sfd:
-
-	kerning
-
-2008-12-09 Stevan_White
-	* FreeSerif.sfd, FreeSerifItalic.sfd:
-
-	kerning
-
-2008-12-08 Stevan_White
-	* FreeSansOblique.sfd:
-
-	Slanted small final sigma.  Remedies
-	bug #24993: U+03C2 "Greek small letter final sigma" not slanted in
-	Free Sans Oblique
-	https://savannah.gnu.org/bugs/index.php?24993
-
-2008-12-07 Stevan_White
-	* FreeSans.sfd, FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	kerning, etc
-
-2008-12-06 Stevan_White
-	* FreeSansOblique.sfd, FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifItalic.sfd:
-
-	kerning
-	Tweek in Sans having to do with addition of Latin Extended
-
-2008-12-05 Stevan_White
-	* FreeSansBold.sfd, FreeSansBoldOblique.sfd:
-
-	Tweeks to Latin Extended Additional
-
-	* FreeSansBoldOblique.sfd:
-
-	Added Latin Extended Additional range
-
-	* FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd:
-
-	Extra space at end of kern class names has bad effect on FornForge
-	script that try to run through kern classes.  Some FontForge call
-	corrupts memory.
-	Got rid of extra space.
-
-2008-12-02 Stevan_White
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd, FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd:
-
-	Replaced U+0387 GREEK ANO TELEIA with top dot of colon.
-	See bug #24987: U+0387 GREEK ANO TELEIA too low
-	https://savannah.gnu.org/bugs/index.php?24987
-
-	* FreeSerif.sfd:
-
-	more kerning in Cyrillic (broke into two tables of classes)
-
-2008-12-01 Stevan_White
-	* FreeSerif.sfd:
-
-	tweeks to kernin
-
-	* FreeSerifBoldItalic.sfd:
-
-	kerning
-
-2008-11-30 Stevan_White
-	* FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Kerning for Latin and Cyrillic fairly complete in Serif faces.
-	Complete in sense that it looks pretty good under Pango for
-		English French German Spanish Polish Czech Latvian
-	But have not done Vietnamese (will require many more entries).
-	I adjust roman and italic, then copy tables by hand to bold and
-	bolditalic.
-	Misgiving: bolditalic is much too crammed
-	Overall, I may have over-kerned.  (A difficult temptation to master.)
-
-	* FreeSerif.sfd, FreeSerifItalic.sfd:
-
-	kerning
-
-	* FreeSans.sfd, FreeSerif.sfd, FreeSerifItalic.sfd:
-
-	kerning
-	In Serif, modified widths of some extended latin glyphs
-
-2008-11-29 Stevan_White
-	* FreeSerif.sfd:
-
-	Broke Latin kerning subtable into four, hoping it will be easier to
-	understand and maintain.
-
-	* FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSerif.sfd,
-	FreeSerifItalic.sfd, FreeSerifBold.sfd, FreeSansOblique.sfd,
-	FreeSans.sfd:
-
-	kerninig
-
-2008-11-28 Stevan_White
-	* FreeSans.sfd, FreeSerif.sfd:
-
-	more kerning;
-	made guillemot narrower
-
-	* FreeSansOblique.sfd, FreeSerif.sfd:
-
-	previous commit was incomplete
-
-	* FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Adjusted width of single quotes (and apostrophe) to be "punctuation width"
-	More fiddling with kerning.
-
-2008-11-27 Stevan_White
-	* FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifItalic.sfd:
-
-	much fiddling with kerning
-
-2008-11-26 Stevan_White
-	* FreeSerifBold.sfd:
-
-	Basic kerning, named main Cyrillic letters
-
-	* FreeSerifItalic.sfd:
-
-	Basic Cyrillic kerning
-
-	* FreeSerif.sfd:
-
-	Tweeks to Cyrillic kerning
-
-	* FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifItalic.sfd, Makefile:
-
-	Much fiddling with kerning, tables, and generating fonts whose kerning
-	tables work with OpenOffice.
-
-2008-11-24 Stevan_White
-	* FreeSerif.sfd:
-
-	regularized padding in Miscellaneous symbols.
-	At least within related ranges tried to make similar.
-	Made to validate
-
-2008-11-23 Stevan_White
-	* FreeSerif.sfd:
-
-	Filled out Miscellaneous Symbols.  Used George Douros' Unicode font.
-	Completed Miscellaneous Symbols, with some drawings from George Douros'
-	Unicode Symbols, and some of mine.
-
-	* FreeMono.sfd, FreeMonoOblique.sfd:
-
-	Replaced Greek Exteded psili and dasia with scaled versions of the
-	"bent quote" mark.  I think it's distinctive enough, but not so silly.
-	
-	Remedies bug #22997: Mono: Greek Extended psili is ugly
-	https://savannah.gnu.org/bugs/?22997
-
-	* FreeSerif.sfd:
-
-	Made some recycling symbols
-
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd, FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd, FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd:
-
-	Finished with Hebrew Pointed letters in all faces.
-
-2008-11-22 Stevan_White
-	* FreeSans.sfd:
-
-	Fiddled with Hebrew Pointed letters
-
-	* FreeSerifItalic.sfd:
-
-	Marks for Vietnamese
-
-	* FreeSerif.sfd, FreeSerifItalic.sfd:
-
-	Letter pe had strange thick middle ear that looked awful.  lamed had ben
-	bumped at some point.  Fixed.  Adjusted some of the points.
-
-2008-11-21 Stevan_White
-	* FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	repairs to Pointed Hebrew
-
-	* FreeSerif.sfd:
-
-	Numeral line positioning marks for Gothic
-
-	* FreeSerifItalic.sfd:
-
-	Added Combining Marks for Symbols (some question about obliqueness of
-	some symbols)
-	Cleaned up some empty glyphs in Pointed Hebrew.
-
-2008-11-20 Stevan_White
-	* FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Provided Hebrew pointed letters, with lookups, for all Serif faces.
-
-2008-11-19 Stevan_White
-	* FreeSerifBoldItalic.sfd:
-
-	renamed Hebrew lookups
-
-	* FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Completed Hebrew in Bold faces.
-
-	* FreeSans.sfd, FreeSansOblique.sfd, FreeSerif.sfd, FreeSerifItalic.sfd:
-
-	More tweeks to Hebrew points
-
-	* FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSerif.sfd, FreeSerifItalic.sfd:
-
-	Adjustments corrections and additions to Hebrew points
-
-2008-11-18 Stevan_White
-	* FreeSansBold.sfd:
-
-	Cleaned out a lot of ridiculous kernings
-
-2008-11-17 Stevan_White
-	* FreeSansBoldOblique.sfd:
-
-	fiddled with Armenian ligatures
-
-	* FreeSansBoldOblique.sfd, FreeSansOblique.sfd:
-
-	Added Armenian (with ligatures) to BoldOblique
-	Fiddled with character spacing
-
-2008-11-16 Stevan_White
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd, FreeSans.sfd, FreeSansOblique.sfd, FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Added U+01f9 and paragraph end marker to Georgian
-	Fiddled with Armenian ligatures
-
-2008-11-15 Stevan_White
-
-	* FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd:
-
-	Another pass at letter spacing in Cyrillic. 
-	Also went through ancient letters.
-	
-	Added Georgian paragraph separator 10FB
-	Added Georgian turned gan 10F9 (because it was easy)
-
-	Re-worked letter spacing through modern Cyrillic range.
-
-	* FreeSans.sfd, FreeSansBold.sfd, FreeSerif.sfd:
-
-	Letter spacing
-
-2008-11-14 Stevan_White
-	* FreeSerif.sfd:
-
-	Added several characters to Cyrillic Extended-B
-
-	* FreeSansBold.sfd, FreeSansBoldOblique.sfd:
-
-	Made Cyrillic hooked e U+04BC-F to look less goofy.
-
-	* FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd:
-
-	Based on assertion on Pechatnyj Dvor's web site, Cyrillic Fita
-	U+0472-3 and "Barred O" U+04E8-9 are different styles the same letter,
-	and the fact that the tilde in the O never looked good in Sans, I
-	made them all barred O's.
-
-	* FreeSerif.sfd:
-
-	Added Cyrillic Yn, yn (U+a65e-f)
-
-	* FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd:
-
-	Synced up Cyrillic and Combining Diacritics ranges,
-	Couple of tweeks in Gujarati to make TT validate
-
-	* FreeSans.sfd, FreeSansOblique.sfd, FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Changes to older Cyrillic letters, in response to further information.
-	Made omegas, omegas with titlo, and OT to all be of the same size and
-	shape in Serif.
-	Un-linked Cyrillic Psi and psi from Greek, made squarer versions.
-	
-	Some more Cyrillic diacritical marks in Sans.  Re-worked U+04bc-f .
-	Experimenting with mark positioning for Cyrillic
-
-2008-11-12 Stevan_White
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd, FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd, FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Strove to make Euro look more like the EC logo design, while making
-	glyph fit better with the design of its face.  Bug #3576: Euro design
-		https://savannah.gnu.org/bugs/?23576
-
-	* FreeSans.sfd, FreeSerif.sfd:
-
-	Adjustments mostly to GPOS tables having to do with Vietnamese marks.
-	The WAZU Vietnamese test page looks pretty good in Sans now.
-	Still not thrilled with below-dot when it appears with a mark over
-	e.g. U+0102. Pango positions one or the other but not both.
-
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd, FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Extensive modification of GPOS lookup tables for mark positioning.
-	I think they're now all functional (except styled Mono faces have none).
-	Also added lots of marks to faces that didn't have them, and also
-	fiddled with Combining Diacritical Marks.
-
-2008-11-10 Stevan_White
-	* FreeSerif.sfd:
-
-	Made one combining mark really combining
-
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd:
-
-	Made a few combining characters to be zero-width in Mono,
-	Added them to other styles.
-
-	* FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Figured out why below marks in Thai weren't working in the lowest
-	letters.  I think Pango and other font renderers ignore 'blwm'. 
-	However, 'mark' works.
-
-	* FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Tweeks to Thai marks
-
-2008-11-09 Stevan_White
-	* FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Several bugfixes in Thai, mostly having to do with mark placement and
-	ligatures.  Implemented ru-saraaa and lu-saraaa with ligatures.
-
-	* FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	added and named dottedcircle (used by Pango to render
-	combining mark base)
-
-	* FreeSerif.sfd:
-
-	Tweeks to Coptic, after viewing more papyrus samples and web pages.
-
-	* FreeSerif.sfd:
-
-	Weight of Coptic small letters made to match that of Latin and Greek ones.
-
-2008-11-08 Stevan_White
-	* FreeSerif.sfd:
-
-	Made Coptic to comply better with
-		http://www.wazu.jp/gallery/Test_Coptic.html
-	Made a flourish at foot of letters with long diagonal.
-
-	More tweeks to Coptic; put in a mark lookup table.
-	
-	Note: for small letters I made scaled references to captials.
-	Results in those letters looking quite light next to the capitals and
-	next to small Latin letters.  Also, there are a few variant forms for
-	capitals (Unicode samples don't show this).  It would be good to
-	re-work
-
-	Added Coptic alphabet in u+2C80-2CB1 and u+03E2-u+03EF, drawn/built by
-	me, based on Unicode samples, TeX font copte, and scans at WikiPedia.
-
-2008-11-07 Stevan_White
-	* FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Further tweeks to dieresis in Greek and Cyrillic
-
-	* FreeSerif.sfd:
-
-	replaced Greek I dieresis with references, tweeked height of dieresis.
-
-2008-11-04 Stevan_White
-	* FreeSerif.sfd:
-
-	Added a few Cyrillic Extended-B letters seen in web pages while looking
-	for Glagolitic text.
-
-	* FreeMono.sfd, FreeMonoOblique.sfd:
-
-	Added a few old Cyrillic characters.
-
-	* FreeSerif.sfd:
-
-	Several corrections and tweeks to Glagolitic.
-	Still missing six slots from Unicode, but don't see them in the TeX
-	fonts.
-	On the other hand, several on-line Glagolitic pages (bibles etc) don't
-	seem to use these.  Maybe it's OK as-is.
-
-2008-11-03 Stevan_White
-	* FreeSerif.sfd:
-
-	Added lowercase range to Glagolitic, as a facile scaling of the
-	uppercase.
-
-	Added letter to Glagolitic, scaled range.
-
-2008-11-02 Stevan_White
-	* FreeSerif.sfd:
-
-	Replaced fraktur bold from Mathematical Alphanumeric Symbols with that
-	from TX Fonts by Young Ryu.
-	One concern: letter k is damaged (in both medium and bold).  I just
-	hacked something up.
-	
-	Added Glagolitic "round type" font (Croation capitols only) from the
-	collection of Croatian fonts for LaTeX by Darko Zubrinić
-	ftp://ftp.dante.de/tex-archive/languages/croatian/
-	http://www.tug.org/TUGboat/Articles/tb17-1/tb50zubr.pdf
-	
-	Several letters are missing besides the small letters.
-
-	* FreeSerifBoldItalic.sfd:
-
-	A couple of Thai references got obliqued twice.
-
-	* FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	By popular demand, removed 'ears' from Greek Upsilon and Psi.
-	Copied resulting glyphs to Serif Mathematical Alphanumeric Symbols.
-
-	* FreeSerif.sfd:
-
-	Some pointwise cleanup of main Tamil range
-
-	Tried some things with lookups.  Didn't make much headway.
-
-2008-11-01 Stevan_White
-	* FreeMono.sfd:
-
-	somehow made a letter with wrong width
-
-	* FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Added similar lookups and ligatures to Thai ranges.
-
-	* FreeSerif.sfd:
-
-	Lookups now work no worse than those for other Thai fonts, at least
-	in Pango.  Still perplexed by behaviour of "Required" lookups.
-
-	For Thai, made ligatures and lookups for yoying and thothan combined
-	with a lower vowel.  These work well.
-	Attempted looksups for saraaa with ru and lu, and for saraam. 
-	Not working.
-
-	Cleaned up a few of the Bengali ligatures
-
-	* FreeSerifBold.sfd:
-
-	Tweek Thai
-
-2008-10-31 Stevan_White
-	* FreeSerif.sfd:
-
-	Fixed ligatures and mark positioning for Hanunóo.
-	Problem with ligatures: Gnome pango doesn't do 'rlig', only 'liga'
-
-	* FreeSerifItalic.sfd:
-
-	Changed lookup table scripts for Devanagari and Bengali.
-	Find Problems -> ATT found several problems showing lookups acting on
-	glyphs that weren't listed in the script ranges, including dev2, bng2
-	(why not deva and beng, I don't know).
-	
-	danda and doubledanda of Devanagari I understand are to be shared among
-	Indic scripts.  So included bng2 and dev2 in the 'aalt' table for those.
-	
-	The 'init' and 'half' tables for Bengali made active for bng2.
-	
-	The 'locl' table for Bengali didn't do anything I could see: It mapped
-	the Devanagari danda to itself, and the doubledanda to itself.  Deleted.
-
-	Cleaned up some kern tables.
-	adjustments of under 5 EM are invisible.  Some others I just didn't like.
-	Some were putting a letter beneath another, with is wrong.
-
-	* FreeSerifBoldItalic.sfd:
-
-	Added Thai
-
-	* FreeSerifBold.sfd, FreeSerifItalic.sfd:
-
-	Changes to mark positioning lookups, esp. in Italic.
-	Widened numerals in Bold
-
-2008-10-27 Stevan_White
-	* FreeSansBoldOblique.sfd, FreeSansOblique.sfd:
-
-	Tweeks regarding Armenian and lookups
-
-	* FreeSansBold.sfd:
-
-	Added Armenian ligatures FB13-FB17 with lookups
-	Also made a historical ligature ('hlig') table for u+0587.
-	
-	Toward bug #15183: missing characters from Armenian range
-	https://savannah.gnu.org/bugs/index.php?15183
-
-	* FreeSansOblique.sfd:
-
-	Added Armenian ligatures, lookups.  Cleaned up contours.
-
-	* FreeSans.sfd:
-
-	Added 5 Armenian ligatures to U+FB13 – FB17, and made corresponding
-	'liga' lookup.  Found there one ligature u+0587 that according to
-		http://en.wikipedia.org/wiki/Armenian_alphabet
-	
-	"in new orthography the և character is not a typographical ligature anymore, and must never be treated as such. It is a distinct letter and has its place in the new alphabetic sequence."
-	So moved this out of the 'liga' lookup and into a new 'hlig' lookup.
-
-2008-10-26 Stevan_White
-	* FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifItalic.sfd:
-
-	Lots of improvements to Thai.
-	Completely revised letter spacing in Italic, and fiddled with combining
-	marks in all.
-	Still aren't working quite right, especially in Italic.
-	Still need to work over digits (in Bold they aren't even bold yet)
-
-	* FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifItalic.sfd:
-
-	Bold Thai : added (painstakingly) constructed glyphs, lookups
-	roman Thai: tweeks
-	Italic Thai: tweeks (Note this still has multiple problems)
-
-2008-10-25 Stevan_White
-	* FreeSerif.sfd:
-
-	WAZU says
-	http://www.wazu.jp/gallery/Fonts_Hanunoo.html
-	
-	MPH 2B Damase doesn't support the consonant-vowel ligatures necessary
-	to render Buhid writing.
-	
-	OK, so I made 'mark' lookups for combining marks and a bunch of
-	ligatures in an 'rlig' lookup.  The latter still not working:
-	don't know why.
-	
-	Made page to match the example of the combining forms at
-	http://www.omniglot.com/writing/hanunoo.htm
-
-2008-10-24 Stevan_White
-	* FreeSerif.sfd:
-
-	Removed some marks from Mathematical Alphanumeric Symbols
-
-	* FreeSerif.sfd:
-
-	Tweeked combining marks for Vietnamese.  Made to satisfy
-		WAZU JAPAN Comprehensive Unicode Test Page for Vietnamese
-		http://www.wazu.jp/gallery/Test_Vietnamese.html
-	Could still use some tweeking...
-
-	* FreeSerif.sfd:
-
-	Added marks for composition of Vietnamese
-
-	* FreeMono.sfd, FreeSerif.sfd:
-
-	Put "below" combining mark on lots of vowels and derivatives,
-	for Vietnamese.
-	Named a bunch of composit Latin, expecting to make substitutions.
-
-2008-10-23 Stevan_White
-	* FreeSerif.sfd:
-
-	Thai spacing alterations based on advice of a native speaker.
-
-2008-10-22 Stevan_White
-	* FreeSerif.sfd:
-
-	re-named Thai lookups according to order
-
-2008-10-21 Stevan_White
-	* FreeSans.sfd:
-
-	Cleanup of glyphs in Gujarati, Devanagari.
-	
-	Note:  Serious problem with Sans GPOS abvm in Devanagari
-	"'abvm' Above Base Mark in Devanagari subtable" "gujr-0"
-	But all the characters that list gujr-0 are in Gujarati.
-	Not sure how this got broken or how to fix it.
-
-	* FreeSerif.sfd:
-
-	Fiddled with Thai mark positioning: passes my tests now OK.
-	Made a few more references in Math Symbols; more regularization of
-	stroke.
-
-	* FreeSerif.sfd:
-
-	Added mark class for Vietnamese "horn"
-	Several references made in General Punctuation, Arrows
-
-	* FreeMono.sfd:
-
-	added some Combining Diacritical Marks
-
-2008-10-20 Stevan_White
-	* FreeSerif.sfd:
-
-	Made some references from serifed Latin capitals to Greek counterparts.
-
-	* FreeSerif.sfd:
-
-	Made a few repeated glyphs into references in Musical Symbols
-
-2008-10-19 Stevan_White
-	* FreeSerif.sfd:
-
-	Moved several glypns from Mathematical Alphanumeric Symbols to
-	Letterlike Symbols.
-	Couple tweeks in Mathematical Symbols.
-
-	* FreeMono.sfd, FreeSerif.sfd:
-
-	Fiddling with Mathematical Symbols.
-	In Serif, trying to make stroke width more consistent.
-
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd, FreeSerif.sfd:
-
-	Added some Greek symbols in Mono and Sans to make a little more regular
-	and correspond better with TeX.
-	Tweek of serif.
-
-	* FreeSansBold.sfd:
-
-	a few more improvements.
-	
-	One problem with the Mathematical Alphanumeric area is, one must
-	remember to change it any time another face is altered...
-
-	* FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSerifBold.sfd:
-
-	Several improvements and additions to Sans faces (mostly in Greek) from
-	experience of pasting into FreeSerif Mathematical Alphanumeric Symbols.
-
-	* FreeSerif.sfd:
-
-	Replaced most of Mathematical Alphanumeric Symbols
-		roman italic bold (latin and greek)
-		gothic italic bold (latin and greek)
-		typewriter
-		and numerals
-	with glyphs from FreeFont.  These were scaled to uniform height.
-	
-	Remains: Blackboard Bold, Fraktur, Calligraphic, Script
-
-	* FreeSerif.sfd:
-
-	Tidied lookup table names for Malayalam
-
-	* FreeSerif.sfd:
-
-	Applied Malayalam patch from Hiran Venugopalan
-
-	* FreeMono.sfd:
-
-	Added/corrected many Mathematical Symbols
-
-	* FreeSansOblique.sfd:
-
-	more IPA
-
-2008-10-18 Stevan_White
-	* FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd:
-
-	Made lots more IPA and Phonetic Extensions
-	Note: fontforge is reporting an error in a few glyphs made by scaling
-	another, that the glyphs are drawn in the wrong direction--only in
-	TrueType though.  Suspect a FontForge bug.
-
-	Added several Combining Diacritical Marks
-
-2008-10-17 Stevan_White
-	* FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd:
-
-	Made several Spacing Modifier Letters, Combining Diacritical Marks,
-	and IPA and Phonetic Extensions
-
-2008-10-16 Stevan_White
-	* FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Added some Superscripts and Subscripts
-
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd:
-
-	Finished off Superscripts and subscripts
-
-	Completed General Punctuation for Mono faces
-
-	Added some General Punctuation
-
-2008-10-15 Stevan_White
-	* FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd:
-
-	more Letterlike Symbols, Currency Symbols
-
-	* FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd:
-
-	Made some Combining Diacritical Marks for Symbols, Letterlike Symbols
-
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd:
-
-	Added some General Punctuation
-
-2008-10-14 Stevan_White
-	* FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd:
-
-	Added double slanted hyphen, made General Punctuaton Supplement like
-	Serif's
-
-	* FreeSansBoldOblique.sfd:
-
-	Filled out Greek Extended
-
-	* FreeMono.sfd, FreeSerifItalic.sfd:
-
-	fixes to last 2 commits
-
-	* FreeSerifItalic.sfd:
-
-	Last character to General Punctuation
-
-	* FreeMono.sfd:
-
-	Built some Enclosed Alphanumerics (1-10)
-
-	* FreeSerif.sfd:
-
-	Copied in Daniel Johnson's changes to Cherokee.
-
-2008-10-12 Stevan_White
-	* FreeSerif.sfd:
-
-	Included Daniel Johnson's Cherokee glyphs.
-
-2008-10-05 Stevan_White
-	* FreeMono.sfd:
-
-	Further corrections to diaresis in Cyrillic -- legibility in small sizes
-
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoOblique.sfd, FreeSerif.sfd:
-
-	Regularized placement of diaresis in Cyrillic
-
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Added same set of glyphs to Cyrillic Supplement
-
-	* FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd:
-
-	Added some of the easier letters from Cyrillic Supplement
-
-2008-10-04 Stevan_White
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeSerifItalic.sfd:
-
-	Finished high Cyrillic range for MonoBold and MonoBoldOblique.
-	(Remaining: historic ranges, Cyrillic extensions)
-	Tweeked others.
-
-	* FreeMonoBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Serif*Italic: Added last Abkhazian letters to Cyrillic
-	MonoBold: tweek
-
-2008-10-03 Stevan_White
-	* FreeMono.sfd, FreeMonoOblique.sfd, FreeSerif.sfd, FreeSerifBoldItalic.sfd:
-
-	Mono: Some additions to historic letters
-
-	* FreeSerif.sfd:
-
-	Added some punctuation and combining numeric marks from
-	Cyrillic Extended B
-
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Various technical tweeks, mostly concerning recent additions.
-	Also did a bit more "Points too close" and "irrelevant control points".
-	Cyrillic millions redesign meant could not maintain use of refrences
-	for it.
-
-	* FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd, FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	More high Cyrillic
-	Included old Cyrillic millions combining mark in Sans, changed design
-	in Serif
-
-2008-10-02 Stevan_White
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd:
-
-	More high Cyrillic
-
-	* FreeMonoOblique.sfd, FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd, FreeSerifBoldItalic.sfd:
-
-	More high Cyrillic glyphs
-
-	* FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	More glyphs in high Cyrillic.  Remains only some whose form I'm unsure
-	of in italic.
-
-	* FreeSerifBoldItalic.sfd:
-
-	More glyphs in higher Cyrillic range
-
-	* FreeSerifItalic.sfd:
-
-	Same process of tightening el, em, ge (but a P.S. to previous commit:
-	also did ya, ze for SerifBold.)
-
-	* FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	BoldItalic:  Tightened up spacing on left of el, em, ge (could go
-	farther, but it is partly a problem with glyph design...
-
-	* FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	More additions to Cyrillic.  Finished SerifBold except for Nivkh
-	additions.
-	Used references on number combining forms.
-
-2008-09-30 Stevan_White
-	* FreeSerif.sfd:
-
-	Added four (obsolete) Chuvash letters to Cyrillic Supplement
-	- completing it.
-
-2008-09-29 Stevan_White
-	* FreeSerif.sfd:
-
-	Greek adjustments
-	Adjusted spacing of kappa slightly
-	Got rid of ears on Psi, following similar request for Upsilon.
-
-2008-09-28 Stevan_White
-	* FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd:
-
-	Adding and fiddling with Spacing Modifiers and Combining Diacriticals
-
-	* FreeSans.sfd, FreeSansOblique.sfd, FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Revisions of several Combining Diacritical marks
-
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd:
-
-	A few Combining Diacriticals and Spacing Modifiers
-
-	MonoBoldOblique: Primarily filling out Spacing Modifier Letters
-	others: little fixes found along the way
-
-2008-09-27 Stevan_White
-	* FreeSerif.sfd:
-
-	Replaced Malayalam range with that from Rachana_04 found on
-	Swathanthra Malayalam Computing project page
-		http://savannah.nongnu.org/projects/smc/
-	Besides scaling and converting to cubic, performed much clean-up of
-	glyphs, added an r2 character, and re-named a bunch of characters.
-
-2008-09-22 Stevan_White
-	* FreeSerif.sfd:
-
-	Filled in as much of Phonetic Extensions as I could without artistic
-	abilities.
-	Note 1D48-9 are not references due to apparent FontForge bug, that says
-	scaled references go in wrong direction.
-
-	* FreeSerif.sfd:
-
-	Cleaup of some Bengali glyphs.
-	Note many of the ligatures remain very very messy.
-
-	* Makefile:
-
-	added more validations
-	made to work with GenerateOpenType
-
-	* FreeSerif.sfd:
-
-	Built two more easy Phonetic Extensions
-
-	* FreeSerif.sfd:
-
-	Built some Phonetic Extensions letters, those with middle tilde
-
-2008-09-21 Stevan_White
-	* FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd:
-
-	Added lots of Spacing Modifier Letters and Combining Diacritical Marks.
-
-	* FreeMono.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd, FreeSans.sfd, FreeSerif.sfd:
-
-	Wrote script to check if glyph encodings were in stated ranges, fixed
-	most discrepancies.
-	
-	There were a bunch of incompletely deleted characters in several faces.
-	
-	Sans: found several other problems in the process
-	# Tamil
-	Four slots labelled 0BDA-D have glyphs, not in Unicode.  also 0BE1
-	I think they are misplaced; added 0010 to each of them
-	
-	# Devanagari
-	Slot labelled U+093B is not in Unicode--can't find glyph: deleted
-	likewise 094F (may have been meant to be 0954)
-	0955, 0973-0976
-	
-	0954 should be a combining mark, but it appears on the wrong side of 0.
-	0971 was just wrong--made into simple dot.
-	0972 is also wrong--made my own Candra A.
-	
-	# Gujarati
-	Slots labelled 0AE4-5 are not in Unicode; seem not to belong at all.
-	Deleted.  2800 is a dup of 2790.  Deleted
-	
-	Serif: phillipine_double u1736 was misplaced
-	
-	A bunch of the Math Alphanumeric symbols are empty in the standard,
-	because they're represented elsewhere.  These should be deleted
-	First need to make style consistent with existing symbols.
-
-	* FreeSerif.sfd:
-
-	Applied patch from Daniel J
-	Remedies bug
-		FreeSerif: Missing glyphs with palatal hook
-		https://savannah.gnu.org/bugs/index.php?24298
-	Adding several letters to Phoenetic Extensions range U+1D80-BF
-
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd:
-
-	Made four characters U+200C-F to be zero-width
-	Remedy to bug #23593: Mono 0-width chars: zero-width or space?
-		https://savannah.gnu.org/bugs/index.php?23593
-
-	* FreeSerif.sfd:
-
-	Made Mahjong tiles to take up less space using references
-	Cleaned up several validation problems
-
-2008-09-19 Stevan_White
-	* FreeSerif.sfd:
-
-	Added several Hebrew Alphabetic Presentation Forms (some easy ones), to
-	make its coverage the same as Serif Bold.
-
-	* FreeSerifBold.sfd:
-
-	Re-encoded.
-	Deleted several glyphs in Hebrew Alphabetic Presentation Forms that
-	didn't correspond valid Unicode
-
-	* FreeMonoBold.sfd, FreeSans.sfd, FreeSerifItalic.sfd:
-
-	Ran script to find mis-numbered glyphs.  Several were simply typos,
-	some offset by one.
-
-	* FreeSansOblique.sfd:
-
-	Numerous cases of glyphs in Private Use area incorrectly assigned
-	Unicode numbers and names.  Gave all -1 for Unicode and named like
-	"slot.XXXX".
-
-	* FreeSerif.sfd:
-
-	Adapted Mahjong Tiles from George Douros' Unicode Symbols font.
-
-	* FreeSerif.sfd:
-
-	Added Domino Tiles.  Domino outline is copied from George Douros'
-	Unicode Symbols, but the rest I preferred to do with references.
-
-2008-09-18 Stevan_White
-	* FreeSerif.sfd:
-
-	Adapted Mathematical Alphanumeric Symbols from George Douros' Unicode
-	Symbols font.
-
-	* FreeMonoBoldOblique.sfd:
-
-	This one got away from me--I don't know what I did.
-	Looks like some small contour edits.
-
-	* FreeSansBoldOblique.sfd:
-
-	Fixed one mis-numberd character in Latin Extended-B
-
-	* FreeSerifBold.sfd, FreeSerifItalic.sfd:
-
-	Fixed several mis-numbered characters.
-
-	* FreeSansBold.sfd:
-
-	SansBold: one Georgian letter with no name, one Zapf Dingbat was
-	unnumbered
-	ATT test shows a bunch of problems with Gurmukhi and 'blwf' table
-	indeed shows those letters at 0x10000+
-	Sans names them like uni0A30_uni0A4D.blwf: they are in range
-	ECC6 to ED06
-	
-	I meant to move this range into Private Use in last release, and
-	missed it.  So now it is moved, into same range as Sans.
-	
-	Both Sans and SansBold in nukt table for Gurmukhi have duplicate
-	entries for uni0A15 uni0A3C.  Deleted dups.
-
-	* FreeMonoOblique.sfd:
-
-	fixed a number of Unassigned Code Points in Greek Extended
-
-	* FreeSansOblique.sfd:
-
-	mis-numbered Combining Diacritics
-
-	* FreeSansOblique.sfd:
-
-	Several chars in Latin Extended hadn't been named.
-	One spurious letter in Letterlike Symbols
-
-2008-09-16 Stevan_White
-	* FreeMono.sfd, FreeSans.sfd, FreeSerif.sfd:
-
-	Lots of additions: unless otherwise noted, they are from George Duros'
-	fonts Analecta, Music, and Unicode (haven't got final confirmation of
-	the eligibility of these glyphs, so this is just for testing.)
-	
-	Added some combining marks, fiddled a bit.  In both Serif & Mono, tried
-	to get a key symbol characters to fit inside the key combining mark
-	
-	Serif
-	Got rid of ears on Upsilon
-	Added:
-	        # Gothic
-		# Western & Byzantine Musical Symbols
-	
-		# Misc Symbols, Misc Technical Symbols (drew many myself)
-		# Supplemental Symbols and Arrows
-	
-	Mono
-	Added:
-		# lotsa Misc Technical Symbols
-		# OCR Symbols
-		# drew many Supplemental Symbols and Arrows, Misc Technical
-	
-	Sans
-	Added	# Phoenecian
-	Made a few Letterlike Symbols; Made Re and Im to be sans-serif.
-
-2008-09-11 Stevan_White
-	* FreeSerif.sfd:
-
-	Removed pointless entries from Latin kern table
-	
-	Tidied points in Sinhala
-
-2008-09-07 Stevan_White
-	* FreeSerif.sfd:
-
-	Tidied up Tamil ligatures EEA8-EEAB to fix TT build warning
-		"MonotonicFindAlong: Never found our spline."
-
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeSans.sfd, FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, Makefile:
-
-	
-	Added APL characters to FreeMono (why?...)
-	
-	Fixed several last-minute problems, including
-	
-	Serif: Tweeked GPOS mark table for Cyrillic
-	Sans: Added a GPOS table for Cyrillic (but several diacritics missing)
-	
-	Serif, Mono: tweeked some bugs in extensible brackets & integrals
-	
-	Serif: Vietnamese o circumflex: accent was a bit high. fixed.
-	
-	MonoBoldOblique OTF build
-		uni213b intersects self
-	
-	Generation of TT fonts complains about several things to stderr,
-	including:
-	
-	SerifBold: "There exists a 'fpgm' code that seems incompatible with FontForge's. Instructions generated will be of lower quality. If legacy hinting is to be scrapped, it is suggested to clear the `fpgm` and repeat autoinstructing. It will be then possible to append user's code to FontForge's 'fpgm', but due to possible future updates, it is extremely advised to use high numbers for user's functions."
-	Probably has been there since I first copied the TT instructions in. 
-	Just repeated the copying process carefully, and the warning went away.
-	
-	Serif:  "FindMatchingHVEdge fell into an impossible position"
-	        fixed a bunch of point too close
-	
-	REMAINING PROBLEM in Serif TT build
-		"MonotonicFindAlong: Never found our spline."
-		        fixed several bad TT matrices-- there are several more
-			fixed many "control points too close" no luck
-
-2008-09-03 Stevan_White
-	* FreeSans.sfd, FreeSansOblique.sfd:
-
-	Added/corrected some Misc. Symbols by copying from Serif.
-	Note this is only a stopgap solution.  Want real sans-serif symbols.
-
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd, FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Added minimal Miscellaneous Symbols: card suites and some musical notes.
-	Note not happy with shapes...some I just drew.  Sans isn't really sans.
-	
-	Fixed one APL symbol in Mono so it verified in OTF version
-
-2008-08-31 Stevan_White
-	* FreeMono.sfd:
-
-	Built set of APL symbols.
-
-2008-08-30 Stevan_White
-	* FreeSans.sfd:
-
-	Un-linked references in uni02B2 and uni02B5, because when validating the
-	TrueType version, FontForge gave an error "is drawn in wrong direction".
-	I suspect a bug in FontForge.  Other similar glyphs make no errors.
-
-	Fixed missing extrema in TrueType.
-	These were the last cases being reported by validate in all the faces.
-
-	* FreeSerifItalic.sfd:
-
-	fixed last missing extrema in TrueType
-
-	* Makefile:
-
-	restructured validation to look in a directory
-
-	* FreeSans.sfd, FreeSansOblique.sfd, FreeSerif.sfd:
-
-	Fixed missing extrema in TrueType versions
-
-2008-08-15 Stevan_White
-	* FreeSans.sfd:
-
-	Same problem with uni0A83 as with bn_llikaar.  Just made zero-width.
-
-2008-08-14 Stevan_White
-	* FreeSans.sfd, FreeSansOblique.sfd:
-
-	Glyph bn_llikaar, U+09E3 BENGALI VOWEL SIGN VOCALIC LL,
-	has right bound positioned far into the negative.  Causes a warning in
-	FontForge when opening OTF version.
-	Comparing with other fonts supporting Bengali, found no others that
-	do this.
-	Serif makes glyph width 0 (which sounds right according to Unicode)
-	and puts glyph wholly to left of 0.  But, I haven't found this letter
-	in text anywhere.  I wonder if it is really used in writing.
-
-	* FreeSans.sfd, FreeSansOblique.sfd, FreeSerif.sfd, FreeSerifItalic.sfd:
-
-	Further TrueType validation fixes. 
-	Sans still has two glyps in wrong direction.
-
-	* FreeSans.sfd, FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Fixed more TrueType problems...all missing extrema in TTF validation
-
-2008-08-13 Stevan_White
-	* FreeSans.sfd, FreeSansOblique.sfd, FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	fixed all the TrueType validation problems of type "intersects itself"
-	and all but two of the "wrong directions", as well as a lot of
-	"missing extrema".  But there remain hundreds of missing extrema in the
-	TrueType version.
-	Also, bn_llikaar in Sans and Oblique still has a problem in OTF version.
-
-	* FreeMono.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd:
-
-	Made .ttf files to validate.  Other faces have many more problems still.
-
-2008-08-12 Stevan_White
-	* FreeMonoOblique.sfd, FreeSerif.sfd, FreeSerifItalic.sfd:
-
-	Continuing to make OTF versions validate.
-	
-	* FreeMonoOblique.sfd:
-		lots of missing points at extrema
-	* FreeSerif.sfd:
-		12 wrong directions, 1 missing extrema
-	* FreeSerifItalic.sfd:
-		many missing points at extrema, 1 self-intersecting
-	
-	What was wrong: in several oblique cases, an already-italic glyph was
-	made more italic, thereby fouling up extrema (although why it passed
-	validation in the SFD I don't know).  Some glyphs were
-	overly-complicated with many near points.  Cleaned up, rounded to int.
-	
-	Remaining problem: OTF FreeSansOblique FreeSans. one Bengali glyph in
-	each whose advance width and htmx don't match.
-	
-	Moral of story: validate the OTF and TTF versions too before a release.
-
-	* FreeSansOblique.sfd:
-
-	Reverse a mistake from last commit: somehow this file was converted to
-	quadratic, or something.
-
-2008-08-11 Stevan_White
-	* FreeMonoBoldOblique.sfd, FreeSans.sfd, FreeSansOblique.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd:
-
-	Found that SFD files that validated produced OpenType files that don't.
-	These represent the easy fixes.  Some were result of conversion to
-	quadratic; some shouldn't have validated in the SFD...
-	
-	* MonoBoldOblique: uni0250 missing pts at extrema [reference glyph rotated...]
-	* Sans:            uni0AC4 wrong direction [simplified, rounded to int]
-	* SansOblique:     uni01EA wrong direction [rounded to int]
-	* SerifBold:       uni023f wrong direction [round to int]
-	* SerifBoldItalic: uni0245 missing pts at extrema [ungrouped ref, added extrema]
-
-2008-08-06 Stevan_White
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoOblique.sfd:
-
-	Re-set font metrics, which were somehow making uneven vertical spacing.
-
-2008-06-22 Steve White
-	* FreeSerifBold.sfd, FreeSerifBoldItalic.sfd:
-
-	Made to validate
-
-	* ranges.py:
-
-	Brought more into line with OpenType
-	Added some ranges
-	Fixed bug with ranges outside of font
-
-	* CREDITS:
-
-	3 new ranges
-
-	* FreeSerif.sfd, FreeSerifItalic.sfd:
-
-	Cyrillic: tweeked accents for consistency, and for readability in small
-	sizes.
-
-	* FreeSerif.sfd:
-
-	Thanna range: tweeking
-
-	Thaana range: Scaled up by about 15%, raised by 100EM, tightened
-	some of the diacritics to get inside 900 to -300 EM limits.
-
-	* FreeSans.sfd:
-
-	Added Old Persian and Ugaritic from MPH2BDamase font.
-
-2008-06-21 Steve White
-	* FreeSerif.sfd:
-
-	Added Tai Le range adapted from MPH2BDamase font.
-
-	* FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd:
-
-	Added some ancient Greek numerals from Tempora to high Unicode area,
-	(partly just to show it can now be done.)
-
-	* FreeSerifItalic.sfd:
-
-	Couple of tweeks putting glyphs above -300EM.
-
-	* FreeSerif.sfd, FreeSerifItalic.sfd:
-
-	Surgery to Thai letter 'tho than', u+0e10, to push it above -300 EM.
-	This makes Thai range completely between 900 and -300 EM.
-
-	* FreeSans.sfd, FreeSansOblique.sfd, FreeSerif.sfd, FreeSerifItalic.sfd:
-
-	Many auxilary characters (esp. for Malayalam, Bengla, and Tamil)
-	representing ligatures and alternative forms without their own Unicode,
-	were moved from
-	ranges above 0xFFFF (which ought to have been slots for other defined
-	Unicode ranges) into the Private Use area.
-	
-	In Serif, I segregated the scripts, in Sans it was hard to see where one
-	began and another ended, so I moved them en masse.
-	
-	Note several problems with wrongly-named characters:
-	I already re-named glyph570 and glyph582.
-	But there are others with names starting with A...
-
-	* FreeSansBold.sfd, FreeSansOblique.sfd:
-
-	Fixed (I hope the last) problem with scripts in lookups
-	Find Problems -> ATT (all selected) finds multiple issues,
-	
-	* FreeSansBold.sfd:
-	In addition to script 'guru', added 'gur2' to the scripts for these
-	lookups
-		'nukt' Nukta forms in Gurmukhi
-		'blwf' Below Base Forms in Gurmukhi
-		'pstf' Post Base Forms in Gurmukhi
-		'blws' Below Base Substitutions in Gurmukhi
-		'abvs' Above Base Substitutions in Gurmukhi
-		'psts' Post Base Substitutions in Gurmukhi
-	
-	* FreeSansOblique.sfd:
-	In addition to script 'beng', added 'bng2' to the scripts for the lookup
-		'half' Half Forms in Bengali
-	
-	Moreover, the lookup
-		'aalt' Access All Alternates in Latin
-	contains only Bengali letters.
-	Re-named as Bengali, made to work on beng, bng2 scripts
-
-2008-06-20 Steve White
-	* FreeSerif.sfd:
-
-	Scaled Sinhala range.
-	Remedies bug #23656: Sinhala letters over-sized
-
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd, FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd, FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Mostly messing with Greek Extended accents again.
-	re-positioned ypogegrammani on advice of Alexey Kryukov
-	Put prosgegrammani beneath main letters in Mono, to make narrower glyphs
-	Implemented more distinction between tonos and acute.
-
-2008-06-19 Steve White
-	* FreeMonoBoldOblique.sfd:
-
-	Completed fit of Mono to 800 to -200 EM.
-
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoOblique.sfd:
-
-	Set Metrics to recommended values
-
-	* FreeMonoOblique.sfd:
-
-	Now Mono Oblique, as well as roman and Bold, are within 800 to -200 EM.
-	Just BoldOblique to go.
-
-	* FreeMono.sfd, FreeMonoBold.sfd:
-
-	More toward fitting to 800 to -200 EM.
-	Basically, reduced Georgian by 92%.
-	Also made an over-all offset, so Georgian is somehow centered (Bold...I
-	guess I already did this in roman).
-	Want to also do an emboldening to make stroke like rest of font, but
-	current FontForge has a nasty crash that loses data on this function.
-
-	* FreeMono.sfd:
-
-	In effort to make fit in 800 to -200 EM,
-	Scaled Georgian by 92%, centered on 600 wide box.
-	Next: Embolden a bit.
-
-2008-06-18 Steve White
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd:
-
-	Toward making all glyphs lie between -200 and 800 EM.
-	Numerous small changes, especially raising descenders of some Hebrew
-	letters.
-	Georgian remains a problem
-
-2008-06-13 Steve White
-	* FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Moved prosgegrammeni up to baseline,
-	(and then moved all references down to baseline)
-
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd, FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd, FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Added Control Picture "blank" to all faces.
-	Switched U+0222-3 from TemporaLGCUni
-
-2008-06-11 Steve White
-	* FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	More fiddling with Greek Extended accents
-
-	* FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Tweeks to accents etc in Greek Extended and Cyrillic
-
-2008-06-10 Steve White
-	* FreeSerifBold.sfd, FreeSerifItalic.sfd:
-
-	Fixed a few big horizontal spacing problems
-
-	* FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Implemented TemporaLCGUni glyphs in Cyrillic ranges.
-	Added a breve_cyrillic for the moustache breve mark.
-
-2008-06-08 Steve White
-	* FreeSerif.sfd:
-
-	Replaced most of Cyrillic range with TemporaLGCUni.
-	Remodelled many of the derived Cyrillic characters after these.
-	Fiddled globally with spacing of small letters.
-	Unclear on diacritics 485-6, unhappy with breve.
-
-	* FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Started implementing TemporaLCGUni in Greek ranges.
-	
-	Replaced 3DC-3E1 from Tempora, because I thought they looked nicer and
-	more like the other existing FreeFont glyphs.
-	Replaced 3DA-B from Tempora, because they look more like Unicode
-	samples, and nicer.
-	Added 03f3-4, 03F7-F.
-	Prefer my own lunate epsilon.
-	Replaced Phi and Omega from Tempora.
-	These plainly fit the other FreeFont glyphs better than the origninals.
-	(How did this happen?)
-	
-	In bold, replaced U+03D7
-	
-	Copied lbbar u+2114
-
-	Small italic greek--replaced most except phi, psi, omega
-	
-	Based on new information, broke the identification of oxia with Latin
-	acute.
-
-2008-06-07 Steve White
-	* FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd:
-
-	Efforts to control heights of characters
-
-2008-06-06 Steve White
-	* FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd:
-
-	Made to validate
-
-2008-06-05 Steve White
-	* FreeSans.sfd:
-
-	Fixed undefined character in kerning classes
-
-2008-06-04 Steve White
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd:
-
-	tweeks and additions to General Punctuation
-
-2008-06-03 Steve White
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd, FreeSansOblique.sfd:
-
-	Completed/tweeked Number Forms
-
-	* FreeMono.sfd, FreeSerif.sfd:
-
-	Added some Miscellaneous Technical symbols
-
-2008-06-02 Steve White
-	* FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd:
-
-	Tweeks...mostly Letterlike
-
-2008-06-01 Steve White
-	* FreeMono.sfd, FreeSerif.sfd:
-
-	Added Box Drawing characters to Serif.
-	Tweeked a glyph in Mono
-
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd, FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd, FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Added several glyphs to Letterlike Characters
-
-2008-05-31 Steve White
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Validation pass
-	
-	SansOblique and SansBoldOblique had validation problem with BlueValues
-		Private Dictionary
-		Elements in BlueValues/OtherBlues array are disordered
-		Elements in BlueValues/OtherBlues array are too close
-		(Change BlueFuzz)
-		StemSnapV does not contain StdVW value.
-	So I ordered the array, and based on other slanted fonts,
-	removed StemSnapV.
-	
-	Note however, I still think the two top Blues lines are too close
-	But I don't even know what the second-to-top line is meant to do.
-
-	* FreeSerif.sfd:
-
-	Added to Block Elements, Geometric Shapes
-	Made to validate
-
-2008-05-29 Steve White
-	* FreeMono.sfd, FreeSans.sfd, FreeSansBold.sfd, FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Looking at special symbols.
-	Drew several Miscellaneous Symbols in Mono and Serif
-	> Completed/corrected planetary symbols, added Dice,
-	some other easy ones
-	> Completed Dingbats in Serif (using URW Dingbats)
-	Added some Block Elements to Serif
-
-2008-05-26 Steve White
-	* FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	More changes stemming from J. Poon's report.
-
-2008-05-25 Steve White
-	* FreeSerif.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Height surgery on SerifBoldItalic.
-	More fiddling with accents in others.
-
-	* FreeSerifItalic.sfd:
-
-	More height surgery.  Only a few left in Benglai and Thai
-
-	* FreeSerifBold.sfd:
-
-	Re-applied surgery to make glyphs between 900 and -300EM
-
-	*** Regression
-	Inadvertently un-linked all references in SerifBold in r1.83.
-	This reverses that error (but also un-does the surgery mentioned there)
-
-	* FreeSerifBold.sfd, FreeSerifItalic.sfd:
-
-	Applied surgery to make Latin letters go under 900EM. 
-	One exception yet...
-
-2008-05-24 Steve White
-	* FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Serif: much fiddling with accents in Latin ranges.
-	Re-thought some glyphs (there are still a few messy ones, especially
-	in bold)
-	Checked horizontal spacing...fixed a number of problems.
-
-2008-05-23 Steve White
-	* FreeSansBold.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd:
-
-	Made Latin Extended-B coverage consistent across Serif; cleaned up some
-	glyphs
-
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoOblique.sfd, FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd, FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd:
-
-	Filled more of General Punctuation in Sans and Serif
-	Made all agree on coverage of Latin Extended Additional
-
-2008-05-22 Steve White
-	* FreeSans.sfd, FreeSansBold.sfd, FreeSansOblique.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd:
-
-	Added Latin Extended Additional to SansOblique.
-	Made Latin Extended Additional coverage consistent across Sans, B, I
-	Made Latin Extended-B coverage same in SerifBold.
-
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeSansBold.sfd:
-
-	Mono* made Latin-B coverage consistent across faces
-
-	* FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd:
-
-	Made set of Latin Extended-B consistent across Sans faces
-
-	* FreeSans.sfd, FreeSansBold.sfd:
-
-	More filling in General Punctuation
-
-	* FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Another bunch of J. Poon's reports
-	also, filling in some Combining Diacriticals, Spacing Modifiers, and
-	General Punctuation in bold faces
-
-2008-05-21 Steve White
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeSans.sfd, FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Mucking about with mark tables in Thai (Serif)
-	Other faces: Making changes from J. Poon's report
-
-2008-05-20 Steve White
-	* CREDITS:
-
-	Mark Williamson
-	Jacob Poon
-
-	* Makefile:
-
-	added tests target
-
-2008-05-18 Steve White
-	* ranges.py:
-
-	Put table explanation back in
-
-	Improved behaviour for high Unicode
-
-	* FreeSans.sfd:
-
-	Revision of kerning
-
-	* FreeSerif.sfd:
-
-	Made Latin kerning a little more reasonable:
-		reduced many excessive kerns (some had letters apparently
-			overlapping, which shouldn't happen)
-		made kerns increment by 5EM for ease of reading
-		got rid of kerns too small to be seen
-
-	* FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd, FreeSerifBold.sfd:
-
-	Made to verify
-
-2008-05-13 Steve White
-	* FreeSerif.sfd:
-
-	Made to validate
-
-	* FreeSerif.sfd:
-
-	Gurmukhi: filled range in Serif, taking glyphs from the original
-	Punjabi font by Hardip Singh Pannu
-	http://members.aol.com/hspannu/punjabi.html   (file pb_win95.exe)
-
-2008-05-12 Steve White
-	* FreeSans.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd:
-
-	Hebrew, basic.  Some faces missing punctuation marks, added.
-
-	* FreeMono.sfd, FreeSans.sfd:
-
-	Armenian: Sans tried to make verticals and horizontals of more uniform
-	width both, finddled with punctuation
-
-	* FreeMonoOblique.sfd:
-
-	made to validate
-
-	* FreeMonoBold.sfd:
-
-	made to validate
-
-	* FreeSans.sfd, FreeSansBold.sfd:
-
-	Armenian in Sans: regularized letter spacing
-
-	* FreeMonoOblique.sfd, FreeSans.sfd, FreeSansBold.sfd:
-
-	Armenian: fill out ranges and clean up
-	SansBold especially had a lot of incorrect references.
-	Now all the ranges with Armenian at least share the same set of
-	characters.
-
-	* FreeMono.sfd:
-
-	Fixed glyph with wrong width.
-
-2008-05-11 Steve White
-	* FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd, FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd, FreeSerifItalic.sfd:
-
-	1) made to validate
-	2) Mono: copied in Spacing Modifier Letters (glyphs not yet named)
-	3) SerifItalic: Filled in General Punctuation
-
-	* FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd:
-
-	Made to validate, and pass all other FontForge tests.
-	Expedient: rounded everything to int
-
-	* FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Made to have the same Greek Symbols,
-	Made to validate
-
-	* FreeSans.sfd, FreeSansBold.sfd:
-
-	Made Greek Symbols as full as rest of Sans.  Changed a name in Sans.
-
-	* FreeMonoOblique.sfd:
-
-	Made Greek as full as other faces
-	Made to validate
-
-	* FreeSansBold.sfd:
-
-	Deleted seven orphaned Arabic characters; looks like somebody started,
-	didn't get very far, putting Arabic in bold.
-
-	Deleted orphaned Arabic glyph from Arabic Presentation forms-B
-
-	* FreeSerifBold.sfd:
-
-	Deleted the single Arabic character: it was clearly there by mistake.
-
-	* FreeSansOblique.sfd:
-
-	Made Greek Symbols as full as rest of Sans
-
-	Tweeks to Armenian
-
-	Comment from previous commit of FreeSans was meant for FreeSansOblique.
-	In FreeSans, only tweeked a few letters during putting more characters
-	in this face.
-	
-	Filled in Spacing Modifier Letters, increased General Punctuation.
-
-	* FreeSans.sfd:
-
-	Filled in Spacing Modifier Letters, increased General Punctuation
-
-	* FreeMono.sfd:
-
-	Made Armenian as full as other roman faces.
-
-	Completed Spacing Modifier Letters
-	Added a couple of Greek Punctuation
-
-	added more Spacing Modifier Letters
-
-2008-05-10 Steve White
-	* FreeSerif.sfd, FreeSerifItalic.sfd:
-
-	Did same process of scaling and sizing for Thai in Sans as in Serif.
-	Added mark tables to Sans.  Improvement, but there are questions...
-
-	* FreeSans.sfd:
-
-	Tidied some Gurmukhi glyphs, validated.
-
-	Deleted ranges for Oriya, Kannada, on account of
-	1) they only contained a subset of the consonant glyphs of the scripts,
-	   few if any vowels, and had no ligature lookups as required
-	2) Kannada was based on the Akurti fonts, which have copyright issues.
-	
-	See
-	bug #23225: Oriya range only partial
-	bug #23224: Kannada range only partial
-
-	* FreeMonoBoldOblique.sfd:
-
-	Made metrics like rest of Mono
-
-2008-05-09 Steve White
-	* ranges.py:
-
-	More info on range intervals
-
-	* FreeSerif.sfd:
-
-	Deleted Telugu range.
-	It didn't represent a complete writing system for the language.
-	
-	See notes at https://savannah.gnu.org/bugs/index.php?23202
-	Serif: Telugu range missing many characters; many wrong
-
-	Got a copy of the original Tikkana font,
-	Copied in remaining consonants and vowels that I could find there.
-	I think one vowel 0C55 is missing according to unicode).
-	Strangely, the Telugu digits are alo missing.
-	In Tikkana, the default "checkmark" structural mark is missing from many
-	consonants, according to Unicode, but is a separate glyph.  I put
-	the checkmark on.
-	This, and scaled up by 150% and cleaned up intersecting glyphs and
-	many unnecessary points.
-
-2008-05-08 Steve White
-	* FreeSerif.sfd:
-
-	Filled out Telugu consonants.
-	Vowels still need to be done
-
-2008-05-07 Steve White
-	* FreeSerif.sfd:
-
-	Operated on Latin glyphs with stacked accents to make them fit under
-	900EM.
-	Scaled Telugu bu 150%.
-
-2008-05-06 Steve White
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeSansBold.sfd, FreeSerif.sfd:
-
-	Corrected further fontforge "find problems"
-	Added some math characters to FreeSerif
-
-2008-05-05 Steve White
-	* FreeSansBold.sfd:
-
-	Made to validate, and fixed bad TT transformations
-
-2008-05-04 Steve White
-	* FreeMono.sfd, FreeSerif.sfd:
-
-	Mainly TeX additions trying to satisfy Markus Kuhn's TeX-as-Unicode page
-
-	* FreeMono.sfd:
-
-	Adjusted heights of extensible brackets
-
-	Fixed problems with extensible brackets, thanks to Markus Kuhn's page
-	http://www.cl.cam.ac.uk/~mgk25/ucs/examples/UTF-8-demo.txt
-
-	* ranges.py:
-
-	fiddled with ranges, doc
-
-	made some ranges more correct?
-
-	fixed some bugs in ranges
-	better error reporting
-
-	Got rid of Unicode 1.1 references
-
-	made to use OpenType table
-
-	* FreeMono.sfd, FreeSans.sfd, FreeSerif.sfd:
-
-	made to validate
-
-2008-05-03 Steve White
-	* FreeMono.sfd, FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd, FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Removed digits from Private Use Area.
-	See bug 23050.
-
-	* FreeMono.sfd, FreeSans.sfd:
-
-	Completed General Punctuation
-
-	* FreeSans.sfd:
-
-	Completed IPA Extensions
-
-	* FreeMono.sfd, FreeSans.sfd, FreeSerif.sfd:
-
-	More work on Superscripts and Subscripts, Spacing Modifiers.
-	Sans is now complete in both.
-	Added Pfennig to Sans and Mono.
-
-	* ranges.py:
-
-	Restructure text output
-	Rearrangement and cosmetic ...except I had broken it.  now fixed
-	Seems to be in a useful form at this point.
-	More docs, date
-
-	* FreeSerif.sfd:
-
-	Added a hand-drawn old German Pfennig to Currency Symbols
-
-	* FreeMono.sfd, FreeSans.sfd, FreeSerif.sfd, FreeSerifItalic.sfd:
-
-	Further additions to General Punctuation, Super and Sub Scripts,
-	Spacing Modifiers, etc.
-
-2008-05-02 Steve White
-	* FreeSans.sfd:
-
-	additions to Spacing Modifiers, IPA
-
-	* FreeSerifItalic.sfd:
-
-	Shortening stacked accents to maintain readability when clipped
-
-2008-05-01 Steve White
-	* FreeSans.sfd:
-
-	Additions to Spacing Modifiers and changes to Combining Diacritics
-
-	* FreeSerif.sfd:
-
-	Made sure all the half rings in Combining Diacriticals and Spacing
-	Modifiers were really half rings  (J. Poon had complained about this)
-
-	Filled out General Punctuation
-	Some work on Spacing Modifiers
-
-	Filled out Mathematical Operators
-		still needs lots of work
-	Made to validate
-
-	Filled out Latin Extended B
-	Added some letters with curls to Latin Extended B
-	More fiddling with Latin Extended B accents
-
-2008-04-30 Steve White
-	* FreeSerif.sfd:
-
-	Added Hanunóo script, with characters based on those in
-	font MPH2BDamase, on request from the maintainer of that font,
-	http://packages.debian.org/sid/ttf-mph-2b-damase
-	
-	Glyphs are simple vector strokes.  Could be a little more uniform.
-
-	Added Buginese script "Lontara", with characters based on those in
-	font MPH2BDamase, on request from the maintainer of that font,
-	http://packages.debian.org/sid/ttf-mph-2b-damase
-	
-	Note the glyphs are pretty rough, clearly a digitization of handwriting.
-	I just cleaned them up, and corrected discrepancies with Unicode,
-	and compared with some pictorial samples of the script I could find.
-
-2008-04-29 Steve White
-	* ranges.py:
-
-	Improved look a lot--still unhappy with some ranges
-	OS/2 seems sometimes bang-on, sometimes unrelated to anything (including
-	fontforge's OS/2 listing)
-
-	* FreeSerif.sfd:
-
-	Much fiddling with Tamil range.
-	First scaled to 78% (avoiding the references)
-	This gets it in the ballpark height-wise.  [A bit taller than the Latin
-	letters, but the stroke is narrower, but then the glyphs are busier.]
-	Then had to re-align combined references, the trickiest being the
-	halants.
-	Checked with other fonts with Tamil text.
-
-2008-04-28 Steve White
-	* FreeSans.sfd, FreeSerif.sfd:
-
-	Cleanup of control points in Arabic and Thaana
-
-	* FreeSerif.sfd:
-
-	Cleanup of missing extrema in Arabic and Thaana
-
-	Many changes to Thai, trying to make the script fit between some lines,
-	so accents won't get clipped, etc.
-	Also, stroke weight was heavier than that of Latin.
-	
-	Scaled whole thing by 93%.
-	Shrank the tallest letters 0E42-4 to get them under 900EM.
-	Shaved off top of maiek.
-	Fiddled with positioning of all accents.
-	Made positioning tables for accents.
-		Note: unclear these are working correctly
-	
-	Fixed a bug having to do with character replacements for characters
-	named 'ng' and 'nj'; these names had been taken on by other characters.
-	
-	Made to validate
-	
-	Unicode positions of two Cyrillic Extended characters were switched.
-	Fiddled with a couple of Cyrillic combining diacritics
-
-2008-04-27 Steve White
-	* FreeSans.sfd:
-
-	bugfix: a left harpoon mysteriously appeared to the left of letter p!
-
-2008-04-26 Steve White
-	* FreeMono.sfd:
-
-	Made to validate
-
-	* FreeSans.sfd:
-
-	Made to validate
-
-	Toward J. Poons report
-	Made 032B more like proper double-arches (and distinct fro 033C seagull)
-	Made 032b more like a seagull
-
-	* FreeSans.sfd, FreeSansBold.sfd:
-
-	Sans: fiddling with widths and terminators of math symbols,
-		toward J. Poon's report
-	R & B: removed u+2741 because it didn't match the Unicode description
-
-	* FreeMono.sfd:
-
-	Extensible parenthesis symbols weight/terminators
-	Toward bug # 23064: https://savannah.gnu.org/bugs/index.php?23064
-	Rounded a bunch of terminators
-
-2008-04-22 Steve White
-	* FreeSerif.sfd:
-
-	Small alignment problem in Greek Extended
-
-	One more tweek to spacing in Cyrillic Extended
-
-	Corrected spacing in Cyrillic Supplement
-
-	Added Cyrillic Supplement letters for
-	Enets, Khanty, Chukchi, Itelmen, Mordvin, Kurdish, Aleut
-
-	Added Cyrillic letters for Nivkh (completing Cyrillic range)
-	More tightening of accents in Latin Extended.
-
-	* FreeSans.sfd:
-
-	Fiddled with math--consequences of changing the "similar" operator
-
-	More tightening of accents
-
-	* FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd, FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Adjustments to h and k with caron and cedilla in Latin A and B
-
-	* FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSerif.sfd, FreeSerifBold.sfd:
-
-	FreeSerifBold: deleted 3 dotted Hebrew letters in Private/Corporate use
-	(E801-3).  They weren't ligatures or in any other lookup, and they
-	weren't present in FreeSerif.
-	
-	* FreeSansBold:
-	Unlinked and deleted F6C3, which called itself commaaccent.
-	Made some new spacing and non-spacing accents to make up for it.
-	
-	* FreeSansBoldOblique: 
-	Made references of many Latin Extended.
-	Also corrected several wrong ones.
-	
-	* Freeserif: 
-	Re-named commaaccent
-
-2008-04-21 Steve White
-	* FreeMono.sfd, FreeSans.sfd, FreeSansBold.sfd, FreeSerif.sfd, FreeSerifBold.sfd:
-
-	Deleted Hiragana and Katakana ranges, as discussed on bugs list.
-	Cleaned up some encoding issues, unnamed glyphs
-
-	* FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Roman: added 'sine' -- not beautiful, but I liked drawing it
-	All: Made special lookup for Dutch ligatures 'IJ' and 'ij'
-
-	* FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd:
-
-	Roman: ffi etc Latin ligatures from 'liga' to 'dlig' (these weren't
-	really ligatures anyway, and only looked very bad when used. 
-	Retain for condensed type.
-	Others: deleted Latin 'liga' table altogether
-	BoldOblique : added j to ij ligature
-
-	Toward J. Poon's Report:
-	Except for issues of terminators not always vertical or horizontal,
-	and a few things that were too hard or I was unsure of.
-
-2008-04-20 Steve White
-	* FreeSerif.sfd:
-
-	Futzing with accents in Latin Extended Additional and Latin Extended-B
-
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd:
-
-	Added primemod character, referenced by Greek number sign
-
-	* FreeMono.sfd, FreeMonoOblique.sfd:
-
-	Following J. Poon's report, disconnected NJ (01CA)
-
-2008-04-19 Steve White
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd:
-
-	First pass throught J. Poon's bug list.
-	See bug reports for details.
-
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd:
-
-	Made underscore slanted in Oblique faces, made all to be width of
-	space character.
-	Towards J. Poon's report.
-	Disturbed that xterm and some other apps put small space between
-	characters when none was called for.
-
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeSans.sfd, FreeSansOblique.sfd:
-
-	Corrections on Currency Symbols
-
-	* FreeMono.sfd, FreeSans.sfd, FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	More corrections, additions to Currency Symbols
-
-	* FreeSans.sfd, FreeSerif.sfd:
-
-	Filled out and corrected Currency Symbols
-
-2008-04-18 Steve White
-	* FreeSans.sfd, FreeSerif.sfd:
-
-	Adjustments to Combining Marks for Symbols
-	Additions to range in Sans, and re-structured its marks table so that
-	"middle" can apply to any range
-
-	* FreeSerif.sfd, FreeSerifItalic.sfd:
-
-	Made reference between combining koronis and lenis of Greek Extended.
-	In Serif, re-worked combining marks lookup tables, added anchors in 
-	Latin, moved so without marks they work in kedit (but now I'm doubting
-	kedit does a reasonable thing...what is a better application for
-	testing this?)
-
-2008-04-16 Steve White
-	* FreeSerifItalic.sfd:
-
-	Adjusting of spacing and accents in Greek
-
-	* FreeMono.sfd, FreeMonoOblique.sfd, FreeSans.sfd, FreeSansOblique.sfd, FreeSerif.sfd:
-
-	Much futzing with Greek letter spacing and accents.
-	Added lenis to FreeMono.
-
-	* FreeMono.sfd, FreeSerif.sfd:
-
-	Adjusted spacing of dots of Greek dieresistonons in Serif
-	Whipped up something for Greek kappascript in Mono (could use revision)
-
-	* FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Raised dots on double-dotted Cyrillic i, to match that of i and j.
-
-2008-04-14 Steve White
-	* FreeMono.sfd:
-
-	Corrected 27e6-7 "white bracket"
-	Note it is probably a FontForge bug these symbols aren't showing up.
-	FontForge thinks they are in Supplemental Arrows, but they should be
-	in Supplemental Math-A
-
-	Named some Greek characters
-
-	* FreeSans.sfd, FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd:
-
-	Spacing of some Cyrillic characters
-
-2008-04-13 Steve White
-	* FreeSerif.sfd:
-
-	Some fiddling with accents
-	'yogh' was too wide
-
-	* FreeSansBold.sfd, FreeSansOblique.sfd:
-
-	Character spacing was chaos--tried to improve.  BoldOblique also needs
-	it.
-
-	* FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd:
-
-	Completed the fix of bug #12798, Greek glyphs with accents to side
-	Much mucking with accents here, and fixed a few things that were just
-	wrong.
-
-2008-04-12 Steve White
-	* FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd:
-
-	Made Mono curly quotes "bent"
-
-	* FreeMono.sfd:
-
-	More fiddling with Greek accents
-	Made quotes "bent"
-
-	* FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Adjustments on Greek diaresistonos etc.
-	Adjustments in Serif on combining marks for symbols
-
-	* FreeSerif.sfd:
-
-	More additions to Combining marks for Symbols
-
-	Additions to Combining marks for Symbols -- now mostly full.
-	Lots of adjustments to middle anchor point in Latin to make big circle
-	(nearly) encircle preceding latter
-
-2008-04-11 Steve White
-	* FreeMono.sfd:
-
-	Bugfix:
-	Had indroduce a glyph of width other than 600, making kterminal not
-	recognize it as a monospace font.
-
-2008-04-10 Steve White
-	* FreeSans.sfd, FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	More messing with accents.
-	Further to bug #12798, Greek glyphs with accents to side
-	Much messing with glyphs in Greek Extended range
-
-2008-04-09 Steve White
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd, FreeSerif.sfd:
-
-	Revisited Latin-1 and Latin-A accents.
-	Glyph B7 was called "periodcentered", but Unicode callse it Mid Dot,
-	and the description doesn't refer to the period.  I made it like the
-	dot accent.  throughout, and referred L-dot to it.
-	
-	Also double-checked "commaaccent" characters (some in Unicode called
-	cedilla, but the Unicode example shows a comma...mystery)
-	
-	Also the funny IPA upside-down f often had two bars, incorrectly.
-	
-	To do:  go through rest of Serif, and Sans
-
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd:
-
-	Completed re-structuring of stacked Latin accents in Mono.
-	Also: lots of associated adjustments of Greek Extended accents.
-	(Trying to at least center extremely wide characters on their box)
-	Repaired some victems of "find overlaps" sweeps
-	Worked on glyphs with apostrope/comma parts
-	Corrected a few wrong glyphs.
-	
-	Trying out a "bent quotes" solution to making primes distinct from
-	quotes.
-
-2008-04-08 Steve White
-	* FreeMonoOblique.sfd:
-
-	Toward reducing overall height
-	Did similar process as for Mono, fixing a few errors along the way.
-	Also the Greek Extended range was very messed up vertical and
-	horizontally.
-	Horizonal spacing of the heavily accented Greek is a real problem in
-	Mono...
-	To do:
-		revisit "commaaccent" characters in all faces: do some have 
-		edillas?
-		some Hebrew glyphs are a little low
-		Georgian generally is way out of bounds
-
-2008-04-07 Steve White
-	* INSTALL:
-
-	Various updates and corrections, tweeked formatting
-
-	* FreeMonoBold.sfd:
-
-	Tweeking of accents
-
-2008-04-06 Steve White
-	* FreeMono.sfd, FreeMonoBold.sfd:
-
-	Re-worked accents in FreeMonoBold.sfd to make Latin ranges lie between
-	800 and -200 EM, as with FreeMono.
-
-	* FreeMono.sfd:
-
-	Latin Extended ranges: Implemented new policy of shortening the letters
-	of the characters with the highest-stacked accents.
-	
-	At this point all the Latin glyphs lie betweeen 800 and -200 EM.
-	
-	Also checked for readability of all the Latin extended letters in xterm.
-	(Issue: it chops letters outside their bounding boxes; many accents had
-	been a bit outside.  Made sure that if they were chopped, they were at
-	least still recognizable.)
-
-2008-04-05 Steve White
-	* FreeMono.sfd:
-
-	Following exchange about Mono on freefont-bugs with Joe Wells, who
-		> doesn't like the curly quote marks
-		> wants combining diacritics to work
-		> wants tight line spacing
-	
-	Trying to reduce font height:
-	> exclamdown was below -200
-	> Throughout Extended Greek, ypogegrammeni were too low.  Shortened
-	glyph, and raised all references.
-	> Lots of messing with Latin Extended ranges to make glyphs mostly
-	fit into 800 height.  Mostly succeeded.  A couple will get chopped.
-	> Messed with "commaaccent" glyphs, which were very low
-	> Cyrillic 04B1 had a tail that was incorrectly low
-	> Much mucking with Georgian range.  Moved up by 95 (read that Georgian
-	is written as though centered between two horizontal lines, rather than
-	as sitting on a baseline)  There are still a few very high glyphs.
-	
-	FontForge U+0122 called Gcommaaccent, glyph looks like that, but
-	Unicode says it's Gcedilla.  Made the ones called cedilla by Unicode
-	to be cedillas
-	
-	Note bug in Unicode: standard for 0122, 0123, 0136, 0137, 013B, 013C,
-	0145, 0146, 0156, 0157 all talk about cedilla, say to make it with
-	cedilla, but example shows comma.
-	
-	By the way:
-	> Got rid of commaaccent and dotlessj in Corporate Use
-	> Replaced shadedark, with little squares now not overlapping.
-	> Corrected IPA symbol 'ts' 02A6, added 02a8, 02a9, 02aa, 02ab, 02ac,
-	  02ad, 02ae, 02af
-	
-	(so many changes...the CVS server was down...)
-
-	* FreeSerif.sfd:
-
-	Re-named arabic and hebrew characters
-	Big adjustment to comma-accents.  Mostly effects Greek Extended.
-	Made such accents to be like comma, rather than like Russian apostrophe
-	(and de-referenced that symbol)
-
-2008-04-04 Steve White
-	* FreeMono.sfd, FreeSerif.sfd:
-
-	Raised dot on superscript i (2071) -- more distinct at small sizes
-
-	* FreeMono.sfd:
-
-	added two IPA symbols
-
-2008-04-02 Steve White
-	* FreeSerif.sfd:
-
-	fixed a few more control points too close
-
-	Fixed names of languages in ligature table for latn "w/i".
-	This fixes a crash when FontForge opened the ttf table
-
-	Motivated by bug crashing FontForge when opening ttf file,
-	started cleanup of useless control points.  Not finished.
-	Got partway through Sinhala
-
-2008-03-31 Steve White
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoOblique.sfd, FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd, FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Fixed various "Find Problems", including glyphs with mixed-up names,
-	and bad TT matrices.  (lots more bad TT matrices remain)
-
-	* FreeSerif.sfd:
-
-	Re-named a bunch of Cyrillic letters
-
-	* FreeSerif.sfd:
-
-	Put above mark on Cyrillic i and double-dot i for Slavonic number forms
-
-2008-03-30 Steve White
-	* FreeSans.sfd:
-
-	Tightened spacing on glyphs of last commit
-
-	* FreeSans.sfd, FreeSerif.sfd:
-
-	Concerning bug  #16120, Include upper case Wynn and upper case Yogh
-	Adapted Herman Miller's Thyromanes letters  01F7 021C 021D for Serif
-	Drew my own versions for Sans.
-
-	* FreeSerif.sfd:
-
-	Added 04F6,7
-
-	* FreeSerif.sfd, FreeSerifItalic.sfd:
-
-	Made more Cyrillic diacritics really combine.
-	Made a mark lookup just for Cyrillic diacritics,
-	Marked most of the unadorned Cyrillic alphabet.
-	
-	Still not clear on correct shapes for some of the marks.
-
-	* FreeMono.sfd, FreeMonoOblique.sfd:
-
-	Tweeks to accents
-
-2008-03-29 Steve White
-	* FreeSans.sfd, FreeSerifItalic.sfd:
-
-	Small adjustments in Cyrillic
-
-	* FreeSerif.sfd:
-
-	Corrected small palochka
-	Made Cyrillic combining hundred-thousands and millions really combine
-	Named some combining diacriticals
-
-	* FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd:
-
-	Mostly adjusted horizontal spacing of mono oblique faces
-
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd, FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	More cleanup of Cyrillic ranges
-	
-	Completely re-did horizontal spacing of SerifItalic and SerifBoldItalic.
-	See bug #17912, poor kerning in Cyrillic oblique...
-	https://savannah.gnu.org/bugs/index.php?17912
-	It looked like chaos to me. 
-	Only so much can be done: the font is flawed.
-	But I think the changes make text readable in these faces.
-	
-	There were dozens of incorrect glyphs in higher-numbered characters.
-	I deleted all those I found.  No glyph is better than a wrong glyph.
-	
-	Futzt with accents, shooting for consistency and readability.
-	
-	A maintenance thing: making correct references (acyrillic vs a,
-	although they may be the same glyph)  I made a lot of headway, but
-	it isn't finished.
-	
-	Likewise, a large fraction of these are compound characters, which can
-	be made with references, resulting in easier maintenance, reduced
-	likelihood of errors, and smaller files.  I replaced many.
-
-	* FreeSerif.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Cyrillic italic
-	Added italic, bolditalic
-		0493, 04a7, 04AD
-	because their form clearly varies in italic.  But was just guessing...
-
-	* FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Cyrillic italic
-	
-	Added italic, bolditalic
-		0493, 04AD
-	because their form clearly varies in italic.
-	But was just guessing as to exact form.
-
-	* FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Overhaul of Cyrillic
-	
-	Italic, BoldItalic
-		added small yat for bug #22588 (note Times New Roman doesn't use
-		alternate form in Italic)
-	
-	All forms of Serif have big problems in Cyrillic.
-	
-	The ugliest is in roman.  The letters, even of the Russian alphabet, are
-	of inconsistent height (awfully, small 0438 (ii) 0446 (tse))
-	and they vary from the height of Latin
-	and they vary from the height of italic and bold.
-	They are a mish-mash of letters from several fonts, of similar (but not
-	quite identical) weight, and similar, (but not quite identical) size.
-	
-	I think the best solution would be to identify the face that best
-	matches Latin, and fill the range with that.  I think this is possible
-	because the rarer letters seem to be better: the common letters are the
-	ones that are wrong.
-	
-	For now, I just increased the sized of 0438 and 0446, and 048a, 048b,
-	also 0459 (lje) 045A (nje) 0464 (dje)
-	
-	Other issues
-
-2008-03-27 Steve White
-	* FreeSerifBoldItalic.sfd:
-
-	Moving all Greek capitals with accent so they don't cover previous
-	letter.  Remedies bug #12798
-
-	* FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Various tweeks to accented Latin letters.
-	Connected O-ogonek correctly
-
-	* FreeSerifItalic.sfd:
-
-	Accents of numerous accented Latin letters got shifted in a previous
-	commit.  This fixes it.
-
-	* FreeSerif.sfd:
-
-	Adjusted combining tack left and right (0318-0319) to be above -300 EM.
-
-	* FreeSans.sfd, FreeSerif.sfd:
-
-	Added some "middle" marks for positioning of diacritics
-
-	* FreeSans.sfd:
-
-	Copied 4 enclosing combining diacriticals from Serif 20DD - 20E0
-
-	* FreeSerif.sfd:
-
-	Adjusted and added some enclosing diacritics 20DD - 20E0
-	In response to Debian bug #472566
-		ttf-freefont: U+20DD COMBINING ENCOLSING CIRCLE doesn't combine
-		http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=472566
-
-2008-03-26 Steve White
-	* FreeSerif.sfd:
-
-	Lowered a few over-high Latin accents
-
-	* FreeSansBold:
-
-		Devangari--only digits 1 and 2, and nothing else.  Deleted
-	
-	* FreeMonoBold, FreeMonoOblique,
-	FreeSerifBold, FreeSeriftalic, FreeSerifBoldItalic,
-	FreeSansOblique, FreeSansBold, FreeSansBoldOblique:
-
-	Got rid of dotlessj, comma in Corporate Use
-	Single Substitution lookup, ccmp table
-	Made proper dotlessj, re-linked j-circumflex
-	
-	Note:
-	FreeSansBold has a commaaccent in Corporate Use, used by several other
-	characers.  Haven't done anything about this.
-
-2008-03-25 Steve White
-	* FreeSerif.sfd:
-
-	Added/corrected glyphs for yeh hamza in Arabic,
-	Added init and medi lookups for yeh hamza.
-
-2008-03-24 Steve White
-	* FreeSerif.sfd:
-
-	Added isolated and final forms for
-	0629	teh marbuta
-	0624	waw hamza
-	0626	yeh hamza
-	0649	alef maksura
-	A previous commit had added lookups that referred to these,
-
-	More fiddling with super/subscripts
-
-	* Makefile, Makefile, GenerateTrueType:
-
-	Scripts and Make targets to generate OpenType fonts and zip file
-
-	* maintenance.txt:
-
-	Added gnupload and info about tagging
-
-2008-03-23  Steve White
-	* FreeSerif.sfd:
-
-	Last of Find Problems -> ATT
-	'mark' Latin lookup: afii10026 is in 'cyrl', also afii10074
-	Upper and lower Cyrillic i.  Just removed mark from both letters.
-
-	'half' Bengali lookup Khanda_Ta is in 'bng2'. Added bng2 to lookup
-	Added TtTable etc
-
-	Clean-up of Points too Close through to end of font.
-	This episode completes the paths/points clean-up of Serif.
-	But note: many ranges, esp. Ethiopic, Japanese, and Indic, have way
-	too many points, resulting in lumpiness.
-
-	At this point, FontForge can convert splines to quadratic, auto-hint,
-	and auto-instrument without segfault.
-
-	* Makefile, sfd/Makefile, tools/GenerateTrueType:
-
-	Alterations to build process: added a Makefile, and made to work
-	on my system.  Now auto-hints before generating TrueType.
-
-2008-03-22  Steve White
-	* sfd/FreeSans.sfd:
-	Lots of additions of math characters.  Should complete for
-	LaTeX 2e, except for extensible brackets.
-
-2008-03-21  Steve White
-	* *.sfd:
-
-	Regularized stacking of accents in Latin Extended Additional
-	Changed name of 00B5 from 'mu' to 'micro',
-		2206 from 'Delta' to 'Delta.math',
-		0308 from 'diaerisis' to 'diaerisiscomb'
-
-	* FreeMono.sfd:
-
-	additions to IPA
-
-	* FreeMonoBoldOblique.sfd:
-
-	Moved dotlessj from Corporate Use,
-	Deleted commaaccent there
-	Fixed mis-named glyphs tcommaaccent, Tcommaaccent
-	Changed name of 030A from 'dieresis' to 'ringcomb'
-
-	* FreeSans.sfd:
-
-	Added some arrows, and a couple of blackboard bold characters
-
-	Several characters in U+F600 Corporate Use range
-	        dotlessj, onefitted, commaaccent
-
-		dotlessj referred to by: jcircumflex, uni01F0:  
-		renamed it to uFFFF, re-linked others by hand
-
-		commaaccent
-			http://diacritics.typo.cz/index.php?id=9
-		should be u+0326 but wasn't linked to anything 
-
-	* FreeSansBold.sfd:
-
-	U+0617 etc: read glyphs "4GWglm". It should be Arabic.  Deleted
-
-	* FreeSansBold.sfd, FreeSansOblique.sfd, FreeSansBoldOblique.sfd:
-
-	Removed bogus glyphs for 200C 200D, ZWJ and ZWNJ
-
-	* FreeSerif.sfd:
-
-	Split lookup for ligatures in latin into two classes;
-	ff, ffl, fl which are appropriate for all languages,
-	and fi, ffi, which are not appropriate in Turkish (due to distinction
-	between short and long i)
-	Needs to be done for other faces.
-
-	Filled set of extensible brackets in Miscellaneous Technical
-
-	Think IPA is now complete.
-	
-2008-03-18  Steve White
-	* FreeSans.sfd:
-
-	clean-up of all path issues and points too close
-
-2008-03-18  Steve White
-	* FreeSans.sfd:
-
-	Something was causing crashing effects in Windows.  Cleanup of
-	problems eventually made it go away.  Now works well.
-
-	Cleaned up many "points too close"
-
-	Cleaned up all ATT problems, of which there were many and various.
-
-	# Incorrectly labelled zero-width joiner used in a ligature
-
-	# Incorrect substitution of dotlessi and dotlessj with i and j was
-	  somehow connected with FontForge crash.  Attemts to remove the
-	  substitution would damage a 'ccmp' table; subsequent changes would
-	  result in FontForge crashing on save, and truncating the sfd file. 
-	  Surgically removed with vi.
-
-	# A couple of Indic lookups had incorrect script DFLT; one had 'latn'.
-
-	# Don't understand why there are scripts named
-		dev2 bng2 grj2 gur2 when there are already deva beng gurj guru
-	  But anyway, lots of 'vatu' 'pres' 'haln' and 'liga' lookups contained
-	  characters in the '2' scripts but were lablled only for the 'non-2' 
-	  ones.  Added the '2' scripts to all these lookups. Suspect a mistake.
-
-	Note: several of these problems are repeated in other Sans faces.
-
-2008-03-16  Steve White
-	* FreeMono.sfd:
-
-	Cleanup of many path problems "points too close"
-
-	Strove to make accents Latin Extended range legible at small sizes
-
-	Named some unnamed characters; removed a duplicate
-
-	At this point, all fonts are passing FontForge Validate.
-
-2008-03-15  Steve White
-	* FreeSerif.sfd:
-
-	CJK punctuation: made some of the very high glyphs smaller (under 900EM)
-	The brackets in Sans were very ugly, and not even Sans-serif.
-	Serif: added extensible square brackets, diddled with integral
-	corrected direction of some added glyphs
-
-	Several bugs having to do with missing glyphs in Tamil range.
-	Also a buggy ligature in Devangari.
-
-	Shortened names of many lookup tables
-
-	Futzt with some combining diacriticals
-
-	Added extensible square brackets.
-
-	* FreeSans.sfd:
-
-	Changed names of a bunch of glyphs with invalid
-	TrueType names, in range 0x1025f+ (not real Unicode).
-	Took pains to retain information contained in the names.
-	Wonder if these glyphs have ever been of any use.
-
-	CJK Punctuation: brackets were hand-drawn and very ugly.  Improved.
-
-	* *.sfd:
-
-	Set OS/2 Metrics back to absolute 900/300.  Offsets are not 
-	interpreted uniformly.
-
-	Cleanup of many path problems up to extrema and self-intersecting
-
-	Ordered PS Blue values.
-
-2008-03-14  Steve White
-	* FreeSerif.sfd:
-
-	Got rid of mixed references and contours
-	Cleanup of many path problems "points too close"
-
-	Started clean-up to satisfy FontForge Validate
-
-	Changed names of three glyphs in the
-	Tamil ligatures range...all clearly bugs. 
-
-	* FreeSans.sfd:
-
-	Added slanted-hyphen
-
-	* *.sfd:
-
-	Unified OS/2 Metrics
-	Added Grid Fit
-
-2008-03-13  Steve White
-	* FreeSans.sfd:
-
-	Rearranged PS BluesValues so they were in increasing order,
-	Made all 20 in width. 
-
-2008-03-12  Steve White
-	* FreeSans.sfd, FreeMono.sfd:
-
-	Added TrueType hinting tables.
-	Fixed glyphs that didn't convert well to quadratics
-	Got rid of mixed contours and refs
-
-	* FreeSerifBold.sfd:
-
-	Cleanup of path problems
-
-2008-03-11  Steve White
-	* FreeMonoOblique.sfd:
-
-	Cleanup of path problems
-
-2008-03-09  Steve White
-	* FreeSerif.sfd:
-
-	Corrected L-dot
-	Further cleanup of path/ref problems
-
-	Found several ligatures that referred to a missing glyph "ZWJ".
-	Took this to mean the "zero width joiner" u+200D
-
-	* *.sfd:
-
-	Changed OS/2 metrics to be absolute 900/300
-
-	* FreeSerifItalic.sfd:
-
-	Added Greek lunate epsilon
-
-	* FreeMono.sfd:
-
-	Many additions in math range
-	Reduced size of binary union, intersection, vee, wedge
-	Corrected empty set
-	Corrected logical 'assert' relations, etc. 22a2-22af
-	Efforts to make Math glyphs legible at small point sizes
-
-	* FreeSans.sfd:
-
-	Added Greek lunate epsilon and rho symbol
-	Unstacked more stacked diacriticals
-
-	Further cleanup of path/reference problems
-
-2008-03-08  Steve White
-	* FreeSans.sfd, FreeSerif.sfd:
-
-	Added some "n-ary" Math operators
-
-	* FreeSerif.sfd:
-
-	Further clean-up of path problems...up to Ethiopic
-	> Started adding and correcting Math operators for LaTeX 2e
-	> Corrected n-ary union, intersection, and spikes to be larger
-	than the binary operators
-	> Made (many of) the operators based on + - = to use those
-	symbols directly (by reference or copying).
-	> Added lunate epsilon
-	> Corrected empty set
-	> Tightened up spacing of some other technical characters
-	> Worked on some more math operators involving =
-	> triangle
-	> Several arrows
-	> Supplemental Arrows-A
-
-	* FreeSans.sfd:
-
-	Clean-up of font paths
-	Open self-intersecting outermost-clockwise missing-extrema
-	also flipped references (unlinked)
-
-	Added Greek lunate epsilon and rho symbol
-
-2008-03-06  Steve White
-	* sfd/FreeSerif.sfd: Shortened and thickened the combining hook mark,
-	U+0309, to make more like Unicode samples.
-	Also see (bug #22499) un-stacked incorrectly stacked accents
-
-2008-03-05  Steve White
-	* sfd/FreeSerif.sfd: vertical lines: combining diacritical marks
-	corrected 0300 030D 0329 0348 (were rendered as straight apostrophes)
-	Spacing Modifier letters added 02C8 02CC 
-		02B9 02Ba prime and double-prime
-	Fixed positioning U+1EC8, 9, I with hook above
-
-2008-03-03  Steve White
-	* sfd/FreeSerif.sfd: TT strings updates.
-		updated Copyright to 2008
-		Added Vendor URL as the Savannah freefont site
-	* sfd/FreeMono.sfd: A standard pangram as the Sample Text for Russian
-		It reads: In the thickets of the South once there was a citrus
-		...--yes, but a fake specimen!
-	* sfd/*.sfd: Set the OS/2 Sup/Sub settings, which by default looked
-		like random trash.
-
-2008-03-02  Steve White
-	* sfd/FreeSerif.sfd: began cleanup of problems given by FontForge
-	"Find Problems" feature.  (bug #22454)
-		
-2008-03-01  Steve White
-	* sfd/FreeSerif.sfd: made Arabic work for text display (bug #22329)
-		Added required contextual replacement tables,
-		Made a few missing characters,
-	* sfd/*.sfd: Removde all back layers from glyphs that had them.
-
-2008-02-27  Steve White
-	* sfd/FreeSans.sfd: filled in Combining Diacriticals
-	* sfd/FreeSerif.sfd: shifted whole Arabic range down by 200EM.
-
-2008-02-26  Steve White
-	* sfd/FreeSerif.sfd: enabled DPOS table.
-
-2008-02-24  Steve White
-	* sfd/*.sfd: Much fiddling with the "combining diacriticals"
-		range 0300-036F.  Made to align with medium-size lowercase
-		preceding character if not using DPOS table.
-
-2008-02-23  Steve White
-	* sfd/FreeSerif.sfd, FreeSans.sfd, FreeMono.sfd: (bug #21784) Filled
-	in set of HTML 4 Character Entities.
-
-	* sfd/FreeSerif.sfd, FreeSans.sfd, FreeMono.sfd: (bug  #18413)
-	undertie too low -- went on to tidy other similar characters in
-	Combining Diacriticals range.
-	
-2008-02-21  Steve White
-	* sfd/*.sfd: Moved capital Greek letters with tonos so tonos doesn't
-	cover preceding letter (bug #12798)
-
-	* sfd/FreeSerif.sfd, FreeSans.sfd: (bug #13370) made extended
-	integrals to line up.
-	
-2008-02-20  Steve White
-	* sfd/*.sfd: started removing glyphs with back layers (printing bug)
-	* sfd/*.sfd: adjusted vulgar fractions (bug #17756)
-	* sfd/*.sfd: adjusted numerical superscripts (bug #20278)
-
-2008-02-18  Steve White
-	* sfd/FreeSerif.sfd: Offset Hiragana and Katakana ranges (bug #22326)
-	* sfd/FreeSerif.sfd: U+30FB, KATAKANA MIDDLE DOT to be full width
-				(bug #18326)
-
-	* sfd/FreeSerif.sfd: Re-promoted
-	        ff ffi ffl fi fl
-		as standard ligatures in Latin.
-
-2008-02-17  Steve White
-	* sfd/*.sfd: committed to FontForge Spline Font Database (SFD) 2
-	format.
-	
-2008-02-10  Steve White
-	* sfd/*.sfd: brought into line with Debian ttf-freefont
-	Deleted a couple of patches, and applied those applied to Debian.
-
-2006-09-20  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* INSTALL: added installation procedure for MacOS X, courtesy
-	Philipp Kempgen.
-
-2006-05-04  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMono.sfd: deleted Russian sample text, which did not
-	conform to UTF-7.
-
-2006-04-15  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerif.sfd: corrected U+10D3.
-
-	* sfd/FreeSans.sfd: ligature U+FB06 (LATIN SMALL LIGATURE S T)
-	changed from mandatory ("liga") to discretionary ("dlig") (bug
-	#16253).
-
-	* sfd/FreeMono.sfd: deleted incomplete glyph U+FB06 (LATIN SMALL
-	LIGATURE S T); deleted U+FB00, U+FB01, U+FB02, U+FB05 as
-	ligatures (bug #16253).
-
-	* sfd/FreeMonoOblique.sfd, sfd/FreeMonoBoldOblique.sfd: added
-	U+FB00; deleted U+FB01, U+FB02 as ligatures (bug #16253).
-
-	* sfd/FreeMonoBold.sfd: deleted U+FB00, U+FB01, U+FB02 as
-	ligatures (bug #16253).
-	
-	* sfd/FreeMono.sfd, sfd/FreeMonoOblique.sfd, sfd/FreeMonoBold.sfd,
-	sfd/FreeMonoBoldOblique.sfd, sfd/FreeSans.sfd,
-	sfd/FreeSansOblique.sfd, sfd/FreeSansBold.sfd,
-	sfd/FreeSansBoldOblique.sfd, sfd/FreeSerif.sfd,
-	sfd/FreeSerifItalic.sfd, sfd/FreeSerifBold.sfd,
-	sfd/FreeSerifBoldItalic.sfd: added Georgian letters, donated by
-	Gia Shervashidze
-
-2006-02-22  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMono.sfd, sfd/FreeMonoOblique.sfd: ligature U+FB4F
-	changed from mandatory ("liga") to discretionary ("dlig"). This is
-	respons to Bug#349657: [bug #15792] Freefont Alef and Lamed
-	combine
-
-2006-02-21  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerifBold.sfd, sfd/FreeSans.sfd,
-	sfd/FreeSansOblique.sfd, sfd/FreeSansBoldOblique.sfd,
-	sfd/FreeSansBold.sfd: ligature U+FB4F changed from mandatory
-	("liga") to discretionary ("dlig"). This is respons to Bug#349657:
-	[bug #15792] Freefont Alef and Lamed combine
-
-	* sfd/FreeSerif.sfd: corrected bug#275759: [bug #15790] FreeSerif
-	glyphs for U+2198/U+2199 were reversed.
-
-2006-02-15  Denis Jacquerye <moyogo@gmail.com>
-	* sfd/FreeMono.sfd, sfd/FreeMonoOblique.sfd, 
-	sfd/FreeMonoBoldOblique.sfd, sfd/FreeMonoBold.sfd: removed ij 
-	and IJ ligatures.
-
-2006-02-10  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerif.sfd: added small Georgian letters (mkhedruli),
-	donated by Gia Shervashidze
-
-	* AUTHORS: Added Gia Shervashidze
-
-	* CREDITS: Added Gia Shervashidze
-
-2006-01-26  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* notes/maintenance.txt: Added information on the Makefile now
-	used; username for FTP login is anonymous.
-
-	* sfd/FreeSansBold.sfd: added U+0569, U+0571, U+0579, U+057B,
-	U+0586. Armenian small letters completed.
-	
-	* sfd/FreeSerif.sfd: added U+0297, U+02AD-02AF. IPA Extensions
-	section is now complete. Copied a dozen of glyphs from Omega IPA
-	to Phonetic Extension section.
-
-2006-01-25  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd: added U+01A, U+01A3, U+01A6, U+01B2, U+01BA,
-	U+01BB, U+01BE, U+01BF.
-	
-	* sfd/FreeSans.sfd: aligned small Armenian letters to x-height in
-	response to bug #15480. Armenian in Free Sans needs a major
-	cleanup.
-
-2006-01-24  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerif.sfd: changed U+0452, U+045B. Cleanup: U+0460,
-	U+0461, U+04Bc, U+04BD, U+0508.
-
-	* sfd/FreeSansOblique.sfd: replaced accented chars in Latin-1 and
-	Latin Extended-B sections with references, where possible.
-
-	* sfd/FreeSerif.sfd: changed U+0285.
-
-2006-01-23  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd: added U+0195, U+01AA, U+0297, U+03D7,
-	U+03F0. Several flipped references replaced by outlines.
-
-	* sfd/FreeSansOblique.sfd: Latin Extended-B section more or less
-	brought in sync with FreeSans.
-
-	* sfd/FreeMonoBoldOblique.sfd: added glyphs from FreeMonoBold in
-	the Latin Extended-B and IPA Extensions sections.
-
-	* sfd/FreeSerifBold.sfd: Added U+0224, U+0225. Changed U+01B7,
-	U+01B8, U+04E0, U+0452, U+045B. Replaced accented characters in
-	the Cyrillic region with references.
-
-2006-01-21  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd: added U+0255, U+0264, U+0277, U+0286,
-	U+029D. Changed U+0261. Deleted spurious glyphs in the control
-	code area.
-
-2006-01-19  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd: replaced Hardip Pannu Singh's Gurmukhi with
-	AnmolUni by Kulbir Singh Thind.
-
-2006-01-17  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSansBold.sfd: Added U+018D, U+0194, U+01B5, U+01B6,
-	U+01BE, U+0262, U+02A2.
-	
-	* sfd/FreeSansBold.sfd: Changed U+0261 in order to distinguish it
-	from U+0067. Changed U+0251, U+0252.
-	
-	* sfd/FreeSerifBold.sfd: Small changes in the Cyrillic
-	section. Added U+0183, U+018C.
-	
-	* sfd/FreeSans.sfd: Added U+2045, U+2046.
-	
-	* sfd/FreeSansBold.sfd: Filled in the Gurkmukhi part with the
-	AnmolUni-Bold by Kulbir Singh Thind. Also some minor corrections
-	in the Cyrillic part.
-
-	* CREDITS: Added Kulbir Singh Thind.
-
-	* AUTHORS: Added Kulbir Singh Thind.
-	
-2006-01-14  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerif.sfd: Thomas Ridgeway's Tamil characters replaced
-	by the ones released by the Samyak font project.
-
-	* CREDITS: Added Pravin Satpute, Bageshri Salvi, Rahul Bhalerao
-	and Sandeep Shedmake
-
-	* AUTHORS: Added Pravin Satpute, Bageshri Salvi, Rahul Bhalerao
-	and Sandeep Shedmake
-
-2006-01-08  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSansBold.sfd, sfd/FreeMonoBoldOblique.sfd: minor changes.
-
-2006-01-05  Denis Jacquerye <moyogo@gmail.com>
-
-	* sfd/FreeMono.sfd, sfd/FreeMonoOblique.sfd, sfd/FreeMonoBold.sfd,
-	sfd/FreeMonoBoldOblique.sfd, sfd/FreeSans.sfd,
-	sfd/FreeSansOblique.sfd, sfd/FreeSansBold.sfd,
-	sfd/FreeSansBoldOblique.sfd, sfd/FreeSerif.sfd,
-	sfd/FreeSerifItalic.sfd, sfd/FreeSerifBold.sfd,
-	sfd/FreeSerifBoldItalic.sfd: added cedi sign U+20B5, Ghanaian
-	currency
-
-2005-12-29  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd: minor cleanup in the Gujarati part.
-
-2005-12-22  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd: Devanagari and Gujarati parts cleared; once
-	again merged with Gargi 1.9 and Padmaa 0.6, this time correctly so
-	that the anchor points survived the merger.
-
-2005-12-16  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd: added U+0577.
-
-2005-12-15  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd: added U+0559, U+055F, U+2024.
-
-	* sfd/FreeSansBold.sfd: added U+056E, U+0573.
-
-2005-12-14  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd: Merged with Gargi 1.9 and Padmaa 0.6,
-	courtesy Monika Shah and Sonali Sonania from C-DAC, Mumbai.
-
-	* CREDITS: Added Monika Shah and Sonali Sonania.
-
-	* AUTHORS: Added Monika Shah and Sonali Sonania.
-	
-2005-12-13  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd - Removed Sinhala glyphs.
-
-	* sfd/FreeSerif.sfd - Added Sinhala glyphs, formerly in FreeSans.
-
-2005-12-09  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerif.sfd: added U+20AF, U+211E. Changed U+20AC (EURO
-	SIGN).
-	
-	* tools/freefont-ttf.spec: Added specification file for building
-	RPM package, courtesy Rok Papez.
-
-	* sfd/FreeSerifBold.sfd: added more glyphs from Txfonts to the
-	Arrows and Mathematical Symbols ranges.
-
-	* sfd/FreeSerifBoldItalic.sfd: added U+03F5 from Txfonts.
-
-2005-12-08  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd: added U+0567, U+056A, U+056C, U+0582.
-	
-	* sfd/FreeSerifBold.sfd: copied Box Drawing range from FreeSans.
-
-	* sfd/FreeSerifBold.sfd: added glyphs from Txfonts to the Arrows
-	and Mathematical Symbols ranges.
-	
-	* sfd/FreeSerif.sfd: added U+2259-225A, U+22BA, U+2308-230B,
-	U+2322-2323. Cyrillic composite characters replaced with
-	references.
-
-2005-12-07  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerifBold.sfd: added U+025A, U+025D, U+026B, U+029B,
-	U+02AE, U+02AF, U+02DE.
-	
-	* sfd/FreeSerifBold.sfd: updated Hebrew part with Drugulin font
-	from the Culmus project.
-
-	* sfd/FreeSerif.sfd: added U+207A-207C, U+208A-208C, U+2215-2216.
-	
-	* sfd/FreeSans.sfd: added U+2320 TOP HALF INTEGRAL, U+23AE
-	INTEGRAL EXTENSION, U+2321 BOTTOM HALF INTEGRAL (bug #13370).
-	
-2005-12-07  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerifBold.sfd: added U+0294-0296, U+02A1-02A2. Started
-	adding "below" anchors. Performed hinting on characters that were
-	not hinted "en masse".
-
-2005-12-06  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd: fixed some more metrics problems in the
-	Extended Greek area; performed hinting on characters that were not
-	hinted "en masse".
-	
-	* Makefile: clean also signature files.
-
-	* sfd/FreeMonoBoldOblique.sfd, sfd/FreeMonoBold.sfd: cosmetic
-	changes; cleaning background of referenced composed characters.
-
-2005-12-05  Panayotis Katsaloulis  <panayotis@panayotis.com>
-
-	* sfd/FreeMono.sfd, sfd/FreeMonoOblique.sfd, sfd/FreeMonoBold.sfd,
-	sfd/FreeMonoBoldOblique.sfd, sfd/FreeSans.sfd,
-	sfd/FreeSansOblique.sfd, sfd/FreeSansBold.sfd,
-	sfd/FreeSansBoldOblique.sfd, sfd/FreeSerif.sfd,
-	sfd/FreeSerifItalic.sfd, sfd/FreeSerifBold.sfd,
-	sfd/FreeSerifBoldItalic.sfd: Some changes to the greek glyphs,
-	mostly having to do with "tonos" (accent)
-
-2005-12-05  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd: minor cosmetic changes.
-
-	* sfd/FreeSans.sfd: adjusted widths of characters in the Extended
-	Greek range; accents are not any more considerably overhanging on
-	the left side. Added U+1EDA-1EE3, U+1EE8-1EF1.
-	
-	* sfd/FreeSans.sfd: continued working on Extended Greek range;
-	metrics still not finished.
-
-2005-12-03  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd: fixed combined Greek accents (bug
-	#12800). Width of characters still need to be adjusted as in
-	FreeSerif.
-
-	* sfd/FreeSerif.sfd: fixed positions of Greek accents (bug #12798).
-
-	* CREDITS: Added Panayotis Katsaloulis.
-
-	* AUTHORS: Added Panayotis Katsaloulis.
-
-	* Makefile: minor changes; now creating also a tarfile with sfds.
-
-2005-12-01  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerifItalic.sfd: added U+0183, U+018C, U+01C0, U+01C1,
-	U+01C3, U+01E0, U+01E1, U+01F8, U+01F9.
-	
-	* Makefile: created a Makefile to assist building.
-
-	* README: an update.
-
-	* COPYING: added GNU General Public License, version 2.
-
-	* tools/GenerateTrueType: wrote a FontForge script for conversion
-	to TrueType.
-
-	* sfd/FreeSerif.sfd: merged with SolaimanLipi Bangla OpenType font
-	from www.ekushey.org, courtesy Solaiman Karim.
-
-	* sfd/FreeSerifItalic.sfd: merged with SolaimanLipi Bangla
-	OpenType font from www.ekushey.org, slanted by 15.5 degrees.
-
-	* sfd/FreeSans.sfd: merged with Rupali Bangla OpenType font from
-	www.ekushey.org
-
-	* sfd/FreeSansOblique.sfd: merged with Rupali Bangla OpenType font from
-	www.ekushey.org, slanted by 12 degrees.
-
-	* CREDITS: added Solaiman Karim
-
-	* AUTHORS: added Solaiman Karim
-
-2005-11-30  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerif.sfd: merged with the Rachana Normal.
-
-	* AUTHORS: added K.H. Hussain and R. Chitrajan
-
-	* CREDITS: added K.H. Hussain and R. Chitrajan
-
-2005-11-23  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd - cleaned some background images.
-
-	* sfd/FreeSans.sfd - added U+01A0-01A1, U+01AF-01B0, U+026E,
-	U+028F, U+0291, U+02A3-02A5, U+031B. Modified U+0198.
-
-2005-11-22  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd - added U+2504-250B.
-
-	* sfd/FreeSans.sfd - added U+2591-25A1, U+25A3-25A5, U+25AA, U+25AC.
-
-	* sfd/FreeSans.sfd, sfd/FreeSansBold.sfd - added U+0263.
-	
-2005-11-21  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMono.sfd - corrected positions of some Greek diacritics
-	on page 0x1F.
-
-	* sfd/FreeMonoOblique.sfd - working on bringing it in sync with
-	FreeMono.sfd.
-
-	* sfd/FreeSerifBoldItalic.sfd - applied the sequence suggested by
-	Werner Lemberg for reducing redundant points. Added a couple of
-	glyphs in the IPA Extensions region.
-
-	* sfd/FreeSansBold.sfd - added U+0574, U+0576. Removed overlaps.
-	
-2005-11-20  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerif.sfd - added U+02AA-02AC, U+02B0-02B2.
-
-2005-11-19  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd - added U+01B7-01B9, U+0196, U+019A, U+01C3,
-	U+0224-0225, U+025E, U+029A, U+2422. Changed U+0184-0185, U+0192,
-	U+01B4, U+0282, U+0284.
-	
-2005-11-18  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerif.sfd - added U+02EE, U+207F.
-
-	* sfd/FreeSans.sfd - started Box Drawing area.
-
-2005-11-17  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerifBold.sfd - added glyphs from the Omega project to
-	Latin Extended-B, IPA Extensions and Greek ranges.
-
-	* sfd/FreeSerifBoldItalic.sfd - added glyphs from the Omega
-	project to Latin Extended-B, IPA Extensions and Greek ranges.
-
-	* sfd/FreeSerifItalic.sfd - added glyphs from the Omega
-	project to Latin Extended-B, IPA Extensions and Greek ranges.
-
-	* sfd/FreeSerifItalic.sfd - added U+018B, U+025C, U+0265, U+026F,
-	U+0279, U+0287, U+028C-028E, U+029E.
-
-	* sfd/FreeSerifBoldItalic.sfd - added U+1EDA-1EE3, U+1EE8-1EF1,
-	U+2190-219B, U+219E-21A8, U+21B9-21BA, U+21C4-21CA, U+21E4-21E5,
-	U+2669-266F. MES-1 compliant.
-	
-	* sfd/FreeMonoOblique.sfd, sfd/FreeMonoBold.sfd,
-	sfd/FreeMonoBoldOblique.sfd, sfd/FreeSansOblique.sfd,
-	sfd/FreeSansBold.sfd, sfd/FreeSansBoldOblique.sfd,
-	sfd/FreeSerifItalic.sfd, sfd/FreeSerifBold.sfd,
-	sfd/FreeSerifBoldItalic.sfd - added U+FFFD.
-
-	* sfd/FreeSerif.sfd - removed overlaps in Latin Extended-B and IPA
-	Extensions ranges.
-	
-2005-11-16  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerifItalic.sfd - applied the sequence suggested by
-        Werner Lemberg for reducing redundant points.
-
-	* sfd/papers/eurotex2003/freefont.tex,
-	sfd/papers/eurotex2003/freefont.bib - Revised version, sent back
-	by Karl Berry on 20050110, that should match the one published in
-	TUGboat.
-
-	* sfd/FreeSerifItalic.sfd - started added accent anchors. Added a
-	handful of Greek letters from Omega font collection.
-
-	* sfd/FreeSerif.sfd - added a handful of letters in the Latin
-	Extended-B and IPA Extension ranges from the Omega font collection.
-
-2005-11-16  Denis Jacquerye <moyogo@gmail.com>
-
-	* sfd/FreeSerif.sfd - moved U+0263 to U+0264; added U+0263
-
-	* sfd/FreeSerifItalic.sfd - fixe U+01EE; added U+01B7-U+01B9
-
-2005-11-16  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd - Made small Greek letters the same height as
-	Latin and Cyrillic ones and replaced them with references, where
-	applicable.
-
-	* sfd/FreeSerif.sfd - replaced Greek letters with references,
-	where applicable. Added U+03D7, U+03F0-03F2.
-
-	* sfd/FreeSerif.sfd - added U+0255, U+025A, U+025D, U+025F,
-	U+0262-0263, U+026B-026C, U+0274, U+0276-0277, U+028F, U+0291,
-	U+029D.
-
-	* sfd/FreeMonoOblique.sfd - applied the sequence suggested by
-	Werner Lemberg for reducing redundant points. Added U+F6BE.
-
-	* sfd/FreeSansOblique.sfd - applied the sequence suggested by
-	Werner Lemberg for reducing redundant points.
-
-	* sfd/FreeSans.sfd - changed U+01A5.
-
-2005-11-16  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd - applied the sequence suggested by Werner
-	Lemberg for reducing redundant points. Replaced accented glyphs in
-	the Latin-1 and Latin Extended-A areas with references. Made
-	capital Greek letters the same height as Latin and Cyrillic ones
-	and replaced them with references, where applicable.
-
-2005-11-15  Denis Jacquerye <moyog@gmail.com>
-
-	* sfd/FreeSans.sfd, sfd/FreeSansBold.sfd, 
-	sfd/FreeSansBoldOblique.sfd, sfd/FreeSansOblique.sfd - fixed 
-	U+026A, it was a dotlessi and therefore like U+0069 when 
-	accented.
-
-2005-11-15  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMonoBold.sfd - corrected Greek tonos (slanted instead of
-	a vertical line).
-
-	* sfd/FreeMonoBoldOblique.sfd - applied the sequence suggested by
-	Werner Lemberg for reducing redundant points. Replaced accented
-	glyphs in the Latin-1 and Latin Extended-A areas with references.
-
-2005-11-14  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMono.sfd, sfd/FreeMonoOblique.sfd, sfd/FreeMonoBold.sfd,
-	sfd/FreeMonoBoldOblique.sfd, sfd/FreeSans.sfd,
-	sfd/FreeSansOblique.sfd, sfd/FreeSansBold.sfd,
-	sfd/FreeSansBoldOblique.sfd, sfd/FreeSerif.sfd,
-	sfd/FreeSerifItalic.sfd, sfd/FreeSerifBold.sfd,
-	sfd/FreeSerifBoldItalic.sfd - Added 2005 in copyright info.
-
-	* sfd/FreeSansBoldOblique.sfd - applied the sequence suggested by
-	Werner Lemberg for reducing redundant points. Replaced accented
-	glyphs in the Latin-1 area with references.
-
-	* sfd/FreeSansBoldOblique.sfd - added U+0180, U+0184, U+0185,
-	U+0195, U+01A0-01A2, U+01AF-01B0, U+025E, U+026E, U+0292,
-	U+0294-0296, U+029A, U+02A1, U+2126-2127, U+2190-219B,
-	U+219E-21A8, U+21C4-21CA, U+2669-266F. MES-1 compliant.
-
-	* sfd/FreeMono.sfd - Replaced accented glyphs in the Greek and
-	Cyrillic areas with references.
-
-	* sfd/FreeMonoBold.sfd - applied the sequence suggested by Werner
-	Lemberg for reducing redundant points. Replaced accented glyphs in
-	the Latin-1 and Latin Extended-A areas with references.
-
-2005-11-14  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerif.sfd - applied the sequence suggested by Werner
-	Lemberg for reducing redundant points.
-              
-	* sfd/FreeSansBold.sfd - added U+219A, U+219B, U+2669-266F.
-
-	* sfd/FreeSerifBold.sfd - added U+2669-266F.
-
-2005-11-12  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSansBold.sfd - added U+0180, U+0181, U+0183, U+0187,
-	U+0188, U+018A, U+018C, U+018D, U+0193, U+019C, U+01A0, U+01A1,
-	U+01AC, U+01AF, U+01B0, U+025C, U+0260, U+026E, U+0277, U+0281,
-	U+0284.
-
-2005-11-11  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSansBold.sfd - added U+195, U+1A6, U+025E, U+026E,
-	U+029A, U+0313, U+0314, U+0342, U+0344, U+0345. Started adding
-	accent anchors.
-
-	* sfd/FreeMono.sfd - applied the sequence for reducing redundant
-	points, suggested by Werner Lemberg.
-
-	* sfd/FreeMono.sfd - corrected Greek letters (using tonos instead
-	of a vertical line). Added U+026E, U+F6BE. Accented characters in
-	Latin 1, Latin Extended A and partly Latin Extended B replaced by
-	references.
-
-	* sfd/FreeSerifBold.sfd - applied the sequence for reducing
-	redundant points, suggested by Werner Lemberg. Added U+01A5,
-	U+02A0, U+2190-219B, U+219E-21A8, U+21B8, U+21B9, U+21C4-21CA,
-	U+21E4, U+21E5.
-	
-2005-11-10  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSansOblique - changed U+0192, U+01A5; added U+01C0-01C3.
-
-	* sfd/FreeSansBold.sfd - replaced glyphs with references in the
-	Cyrillic area. Removed U+04A8, U+04A9. Added U+04C5, U+04C6,
-	U+04C9, U+04CA, U+04CD, U+04CE, U+0535, U+053F, U+0546, U+0565,
-	U+0584, U+0587, U+0589.
-
-2005-11-10  Denis Jacquerye <moyogo@gmail.com>
-
-	* sfd/FreeSans.sfd - added U+028A-U+028B
-
-	* sfd/FreeSansOblique - added U+028A-U+028B, U+0276, 
-	U+0292, U+0294-U+0296, U+0298-U+0299 and U+029B; fixed some 
-	other glyphs
-
-2005-11-10  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerif.sfd - added U+01A6. Simplified outlines in the
-	ASCII range.
-
-	* sfd/FreeSansBold.sfd - added U+00A0, U+00AD, U+0531, U+2126,
-	U+2190-2199, U+219E-21A8, U+21C4-21CA.
-
-	* sfd/FreeSansBold.sfd - applied the sequence for reducing
-	redundant points, suggested by Werner Lemberg. Added automatically
-	constructed accented characters in page 0x1E.
-
-2005-11-09  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerif.sfd - added U+0183, U+018C.	
-	
-	* sfd/FreeSans.sfd - added U+1EA2, U+1EA3, U+1EA8, U+1EA9, U+1EB2,
-	U+1EB3, U+1EBA, U+1EBB, U+1EC2, U+1EC3, U+1EC8, U+1EC9, U+1ECE,
-	U+1ECF, U+1ED4, U+1ED5, U+1EE6, U+1EE7, U+1EF6, U+1EF7, U+220A,
-	U+220B, U+220D, U+2272, U+2273, U+2282, U+2283.
-
-	* sfd/FreeSerifItalic.sfd - changed U+03D5.
-
-	* sfd/FreeSerifBoldItalic.sfd - changed U+03C6; added U+2070,
-	U+2075-2079, U+207F, U+2080, U+2085-2089, U+2155-217F.
-
-	* sfd/FreeSerif.sfd - added U+0184, U+0185, U+018D, U+0195,
-	U+0197, U+019A, U+019B, U+01A0, U+01A1, U+01AC, U+01B5, U+01B6,
-	U+01C0, U+01C1, U+01C3, U+01F6, U+0294-0296, U+1E9A, U+1EDA-1EE3,
-	U+1EE8-1EF1.
-
-2005-11-07  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSansBold.sfd - added U+0562, U+056D. U+0575.
-
-	* sfd/FreeMono.sfd - added U+0589.
-
-2005-11-06  Primoz Peterlin  <peterlin@localhost.localdomain>
-
-	* sfd/FreeSans.sfd - added U+0278, U+03D5, U+2248. Corrected
-	U+2071, U+222E, U+2242, U+2243 in response to bug reports
-	http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=276118
-	http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=276120
-
-	* sfd/FreeMono.sfd - added U+2227, U+2228, U+2262. Corrected
-	U+2299-229D in response to bug report
-	http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=276121
-
-	* sfd/FreeMonoBold.sfd - added U+2010, U+2012 in response to bug
-	report http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=289032
-	Swapped U+03C6 (Greek small letter phi) and U+03D5 (Greek phi
-	symbol) in order to conform to Unicode standard. Simplified glyph
-	shapes in ASCII range. Started adding "above" and "below" anchors.
-	
-2005-11-05  Primoz Peterlin  <peterlin@localhost.localdomain>
-
-	* sfd/FreeSerif.sfd - accented letters in Latin Extended-A
-	replaced by references wherever possible.
-
-	* sfd/FreeSerif.sfd - added U+0180, U+0181, U+0187, U+0188,
-	U+018A, U+0193, U+019C, U+01A4, U+01A5, U+01A7, U+01A8, U+01AF,
-	U+01B0, U+026E, U+0270, U+0278, U+0280, U+0281, U+028B, U+0299,
-	U+029C, U+029F.
-	
-2005-11-03  Primoz Peterlin  <peterlin@localhost.localdomain>
-
-	* sfd/FreeSansBold.sfd - added U+0180, U+0184, U+0185, U+0192,
-	U+019B, U+01A0-01A2, U+01AF, U+01B0, U+01EE, U+01EF, U+0292,
-	U+0294-0296, U+02A1, U+0532, U+054C, U+057C, U+222B. Changed
-	U+014B, U+01A5, U+01B4, U+03BB.
-
-	* sfd/FreeSans.sfd - added U+04C5, U+04C6, U+04C9, U+04CA, U+04D,
-	U+04CE.
-
-	* sfd/FreeSansBold.sfd - cleaner Arabic outlines. Added U+01E4,
-	U+01E5.
-
-2005-11-02  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSansBold.sfd - started Armenian; added U+0538, U+0542,
-	U+0544, U+0548, U+054D, U+054F, U+0550, U+0553, U+0555, U+0561,
-	U+0563, U+0564, U+0566, U+0568 U+056B, U+056F, U+0570, U+0572,
-	U+0578, U+057A, U+057D-057F, U+0580, U+0581, U+0583, U+0585.
-
-	* sfd/FreeMono.sfd - swapped U+03C6 (Greek small letter phi) and
-	U+03D5 (Greek phi symbol) in order to conform to Unicode standard.
-	Added U+04C5, U+04C6, U+04C9, U+04CA, U+04D, U+04CE.
-	
-2005-11-01  Primoz Peterlin  <peterlin@localhost.localdomain>
-
-	* sfd/FreeSansBold.sfd - modified U+019C.
-
-	* sfd/FreeSansBoldOblique.sfd - added U+00A0, U+00AD, U+019C,
-	U+01B7, U+01B8, U+0275, U+0278, U+0298, U+2012, U+2015,
-	U+2070-207F, U+2080-208E, U+2153-217F, U+2213, U+2215.
-
-2005-10-31  Primoz Peterlin  <peterlin@localhost.localdomain>
-
-	* sfd/FreeSerif.sfd - added U+0199, U+01AB, U+0265, U+0282,
-	U+0288, U+028C-028E, U+0290, U+029E, U+02A0.
-
-2005-10-28  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerifBold.sfd - added U+019E, U+01AB, U+01AD, U+01B1,
-	U+0256, U+025F, U+0265, U+0269, U+026F, U+0270, U+0279-027F,
-	U+0282, U+0287, U+0288, U+028C-028E, U+0290.
-
-	* sfd/FreeSerifBold.sfd - added U+2070, U+2075-2079, U+2080,
-	U+2085-2089, U+2153-215E, U+2113-2115, U+2119.
-
-	* sfd/FreeSerifBold.sfd - added U+0199, U+019B, U+01B8, U+01B9,
-	U+01BE, U+01C0, U+0262, U+0274, U+0278, U+0280, U+028F, U+0298,
-	U+0299, U+029C, U+029E, U+029F, U+2012, U+2015, U+2016, U+2129,
-	U+2217.
-	
-2005-10-27  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd - added U+018D, U+0194, U+019B, U+019C, U+01B5,
-	U+01B6, U+0295, U+0296, U+029B, U+02A2, U+0472, U+0473, U+2114,
-	U+2119.
-
-	* sfd/FreeSerifItalic.sfd - minor cleanup in the superscript range
-	(U+2070-2079).
-
-	* sfd/FreeSansBold.sfd - added subscripts and superscripts
-	(U+2070-208F), completed fractions (U+2152-215F) and Roman
-	numerals (U+2160-217F).
-
-	* sfd/FreeSerifBold.sfd - added U+018B, U+018E, U+018F, U+0191,
-	U+019D, U+01A7, U+01A8, U+01AE, U+0253, U+0266, U+0267, U+026A,
-	U+0271-0273, U+0283, U+0285.
-	
-2005-10-26  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd - added "above" anchors to selected Cyrillic
-	characters. Added U+0294, U+02A1.
-
-	* sfd/FreeMono.sfd - added U+2011, U+2012, U+203B, U+204A, U+2071,
-	U+2129, U+2232, U+2233. Changed and/or corrected U+2106, U+211E,
-	U+2126, U+2127, U+2153-215F, U+2202.
-
-	* sfd/FreeMono.sfd - a try to imitate Denis' work on adding
-	anchors by adding "above" anchor to a couple of basic Latin
-	characters.
-
-	* sfd/FreeSansBold.sfd - added U+0278, U+0298. Cleaned up outlines
-	of most Greek letters. 
-
-	* sfd/FreeSansBold.sfd - Added U+2010-2012, U+2015, U+2032,
-	U+203C, U+2047-2049.
-
-	* sfd/FreeSans.sfd - Added U+01C0-01C2, U+0276, U+0292,
-	U+0298. Changed U+0251, U+0294, U+02A1.
-	
-2005-10-25  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerifItalic.sfd - added U+00A0, U+00AD, U+2010-2012,
-	U+2015, U+2126, U+2127, U+2153-215E, U+2160-217F, U+2190-2193,
-	U+2669-266F. FreeSerifItalic is now MES-1 compliant.
-
-	* sfd/FreeSerif.sfd - added U+0191, U+019D, U+01AE, U+027E,
-	U+027F, U+0283, U+0285.
-
-	* sfd/FreeSerif.sfd - added U+019E, U+01AD, U+01B8, U+01B9,
-	U+0253, U+0256, U+0257, U+025C, U+0260, U+0266, U+0267, U+0269,
-	U+026D, U+0271-0273, U+0279-027D.
-	
-	* sfd/FreeSerifBoldItalic.sfd - added U+00A0, U+00AD, U+2010-2012,
-	U+2015, U+2032-2034, U+203C, U+2047-204A, U+2074, U+2081-2084,
-	U+2126, U+2153, U+2154, U+215F, U+2215.  Corrected positions of
-	diacritics on U+0200-0217.
-
-	* sfd/FreeSansOblique.sfd, sfd/FreeSans.sfd, sfd/FreeSansBold.sfd,
-	sfd/FreeSansBoldOblique.sfd, sfd/FreeMonoBoldOblique.sfd,
-	sfd/FreeMonoBold.sfd, sfd/FreeSerifItalic.sfd,
-	sfd/FreeSerifBold.sfd sfd/FreeSerifBoldItalic.sfd - brought in
-	sync with Valek Filipov's urw-fonts-1.0.7pre41.
-
-	* sfd/FreeSansOblique.sfd - added U+00A0, U+2011-2012, U+2015,
-	U+2070, U+2071, U+2074-2079, U+2080-2089, U+2126, U+2153-215F,
-	U+2190-2195, U+2215, U+266A. FreeSansOblique is now MES-1
-	compliant.
-	
-2005-10-24 Denis Jacquerye <moyogo@altern.org>
-	
-	* sfd/FreeSans.sfd, sfd/FreeSansBold.sfd, 
-	sfd/FreeSansOblique.sfd, sfd/FreeSansBoldOblique.sfd - added 
-	ccmp for i and j to be substituted with dotless i or j when 
-	followed by above diacritic
-
-2005-10-24  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd - added U+2011, U+2012, U+2015. FreeSans is now
-	MES-1 conformant.
-
-2005-10-23 Denis Jacquerye <moyogo@gmail.com>
-
-	* sfd/FreeSans.sfd - added above, below, abovemk and belowmk 
-	anchors for diacritics placement to many Basic Latin characters, 
-	some Latin Extented A and B, and some IPA characters; fixed a 
-	couple of precomposed characters to have diacritics at the same 
-	height as similar characters.
-
-2005-10-21  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerif.sfd - added U+02B9, U+02BA, U+02CD, U+2017,
-	U+2036, U+2037, U+203C, U+203E, U+2047-204A.
-
-2005-10-20  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerifBold.sfd - added U+0182, U+0189, U+0192, U+019F,
-	U+01A9, U+01B7, U+01C4-01CC, U+01E0-1E2, U+01F0-01F3, U+F6BE.
-	Corrected position of diacritics on U+0200-0217.
-
-	* sfd/FreeSerif.sfd - added U+00A0, U+00AD, U+0182, U+0189,
-	U+018B, U+018E, U+018F, U+0192, U+019F, U+01A9, U+01B1, U+01B7,
-	U+01DD, U+2010-2013, U+2015. FreeSerif is now MES-1 conformant.
-
-2005-10-19 Denis Jacquerye <moyogo@gmail.com>
-
-	* sfd/FreeSerif.sfd - added U+0268, U+026A, U+0289, U+0292; and 
-	anchor "above" to more base glyphs.
-
-	* sfd/FreeSerifBold.sfd, sfd/FreeSerifItalic.sfd, 
-	sfd/FreeSerifBoldItalic.sfd - added U+0250-0252, U+0258-0259, 
-	U+0261, U+0268, U+026A, U+0279, U+0289
-
-	* sfd/FreeSerifBold.sfd - added anchor "above" to marks 
-	U+0300-0314, and to base glyphs (vowels).
-
-2005-10-18 Denis Jacquerye <moyogo@gmail.com>
-
-	* sfd/FreeSerif.sfd - added anchor "above" to marks U+0300-0314, 
-	and bases vowel of the U+0041-007A range, U+00E6, U+0186, U+0190, 
-	U+0254 and U+025B; fixed Latin-1 Supplement block accented glyphs 
-	to use references.
-
-2005-10-17  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSansBold.sfd - added U+01B7, U+01B8, U+0275.
-
-2005-10-16 Denis Jacquerye <moyogo@gmail.com>
-	* sfd/FreeSans.sfd, sfd/FreeSansOblique.sfd - added some Latin 
-	Extended-B African letters: U+0181, U+018A, U+0197-0198, U+01A4, 
-	U+01AC, U+01B1, U+01B3-01B4;
-
-	* sfd/FreeSansBold.sfd, sfd/FreeSansBoldOblique.sfd - added Latin 
-	Extended-B U+0187, 018E-018F, U+0191, U+0193, U+0197-0199, 
-	U+019D-019F, U+01AB-01AE; correcting width of non-space 
-	Combining Diacrtical Marks; added more glyphs to IPA Extensions 
-	to match non Bold
-	
-	* sfd/FreeSansBoldOblique.sfd - added many accented glyphs to
-	Latin Extended-B
-
-2005-10-15 Denis Jacquerye <moyogo@gmail.com>
-	* sfd/FreeSans.sfd, sfd/FreeSansOblique.sfd - added IPA Extensions
-	U+0262,U+0274,U+0280-0281, U+0299, U+029F, and Spacing Modifier
-	Letters U+02C9-02CB; fixed U+0287,029E height to baseline; added
-	stroke to U+0268
-
-	* sfd/FreeSansOblique.sfd - fixed skew on U+027F
-
-	* sfd/FreeSansBold.sfd, sfd/FreeSansBoldOblique.sfd - added to Latin
-	Extended-B U+01A7-01A8, IPA Extensions U+0251-0253, U+0256-0257,
-	U+0261, U+0265-026A, U+026F-0273, U+0289, U+028C-028E
-
-	* sfd/FreeSansBoldOblique.sfd - added to Latin extended-B U+0189,
-	U+01A8, U+01B1, U+0283, U+02C9 and Spacing Modifiers U+02C9-02CB
-	
-2005-10-14  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSansBold.sfd - Added a couple of composite glyphs,
-	mostly in the IPA and Latin Extended B ranges.
-
-2005-10-13 Denis Jacquerye <moyogo@gmail.com>
-
-	* FreeSans.sfd - removed overlap and simplified U+0187, 0191, 
-	0193, 01A5, 01AE, 0260, 0271, 0272, 0273, 027B; fixed diacritics 
-	placement on U+0200-0217; fixed glyph for U+0283 to correct esh 
-	without stroke; added U+025F and fixed U+025F from it; fixed 
-	height of glyph at U+0285; arranged U+027E,027F to make more 
-	distinguishable from U+0072.
-
-	* FreeSansOblique.sfd - added the corrected or new glyphs from 
-	FreeSans; diacritics on U+200-0217 will need height readjustements.
-
-	* FreeSansBold.sfd, FreeSansBoldOblique.sfd - added U+0186, 0190, 
-	0250, 0254, 0258, 0259, 025B, 025C
-
-2005-10-13  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerif.sfd - Minor changes: U+22A2, U+22A3, U+22A6, U+23AE.
-	Added U+0250, U+0251, U+0258, U+0259, U+0275.
-
-	* sfd/FreeSerifItalic.sfd - Added glyphs U+222B-U+222F, U+2320,
-	U+2321. Fixed diacritics on U+0200-U+0217.
-
-2005-10-12 Denis Jacquerye <moyogo@gmail.com>
-
-	* sfd/FreeSerif.sfd - Corrected diacritics position on 
-	U+01D5-01D9,01DB,01EA-01ED,0200-0217 and U+022A.
-	
-	* sfd/FreeSerif.sfd, sfd/FreeSerifBold.sfd, sfd/FreeSerifItalic.sfd,
-	sfd/FreeSerifBoldItalic.sfd - added U+0186,0190,0254 and U+025B.
-	
-2005-10-11  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerif.sfd - Fixed bug #13399 (glyphs for U+0360 and
-	U+0361 were swapped).
-	
-	* sfd/FreeSerif.sfd - Attempt to correct bug #13370: INTEGRAL
-	EXTENSION does not align with TOP/BOTTOM HALF INTEGRAL; added
-	glyph U+23AE.
-	
-2005-05-16  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMono.sfd - Corrected shapes for Cross of Lorraine and
-	Cross of Jerusalem.
-
-2005-04-07  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSansBold.sfd - Added some combining accents, just to
-	test the a version of FontForge.
-
-2003-12-05  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMono.sfd - Some composite Latin characters rebuilt, as
-	they had accents 600 points to the left due to changes on October
-	2. Some other minor changes in the mathematics area.
-
-2003-10-08  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMonoOblique.sfd, sfd/FreeSerifBoldItalic.sfd,
-	FreeSerifItalic.sfd - applied Josef Segur's corrections from
-	Oct. 5.
-
-2003-10-02  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerif.sfd - Abbas Izad's contributed Arabic/Farsi
-	characters added.
-	
-	* sfd/FreeMono.sfd, sfd/FreeMonoOblique.sfd, sfd/FreeMonoBold.sfd,
-	sfd/FreeMonoBoldOblique.sfd, sfd/FreeSans.sfd,
-	sfd/FreeSansOblique.sfd, sfd/FreeSansBold.sfd,
-	sfd/FreeSansBoldOblique.sfd, sfd/FreeSerif.sfd,
-	sfd/FreeSerifItalic.sfd, sfd/FreeSerifBold.sfd,
-	sfd/FreeSerifBoldItalic.sfd - Combining characters (U+0300 -
-	U+036F) moved left, so that they have negative horizontal values
-	and zero advance width.
-
-2003-09-15  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerifBold.sfd, sfd/FreeSerifItalic.sfd - Started working
-	on super- and subscripts. 
-
-2003-09-12  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd, sfd/FreeSerif.sfd - Added some missing
-	 Hiragana and Katakana characters.
-
-	* sfd/FreeSansBold.sfd - Cleared background characters in Latin
-	Extended-A. Added some automatically constructed characters in
-	Latin Extended-B. Started with superscripts and subscripts.
-
-	* sfd/FreeSans.sfd - Subscript numerals (U+2080-U+2089) completed.
-	
-2003-05-19  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerif.sfd - Thai characters po pla and bo baimai
-	swapped; Thai character fongman corrected; all courtesy Theppitak
-	Karoonboonyanan.
-
-2003-05-17  Panayotis Katsaloulis  <panayotis@panayotis.com>
-
-	* sfd/FreeSerif.sfd, sfd/FreeSerifItalic.sfd,
-	sfd/FreeSerifBold.sfd, sfd/FreeSerifBoldItalic.sfd - Full support
-	of all ancient greek glyphs
-
-2003-05-15  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* tools/KerningNumerals.pl - A Perl script for moving kerning
-	information from ASCII numerals (U+0030...) to characters in the
-	Adobe corporate use area (U+F6xx).
-
-	* sfd/FreeSansBold.sfd, sfd/FreeSansOblique.sfd,
-	sfd/FreeSansBoldOblique.sfd - Created kerned numerals in the Adobe
-	corporate use area (U+F6xx) and moved kerning information from
-	ASCII numerals to the kerned numerals.
-
-2003-05-14  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd - First approximation of super- and subscript
-	numerals and vulgar fractions.
-
-	* sfd/FreeSerif.sfd - Super- and subscript numerals complete,
-	vulgar fractions completed and redone as references rather than
-	outlines.
-
-2003-05-12  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerif.sfd - Clean-up of the Cyrillic letters added on
-	March 27; super- and subscripts, vulgar fractions.
-
-2003-05-09  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMonoBold.sfd - Added a couple of characters to
-	the Latin Extended-B area and the IPA extensions area.
-
-2003-05-08  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerifBoldItalic.sfd - Added a couple of characters to
-	the Latin Extended-B area.
-
-	* sfd/FreeSerif.sfd, sfd/FreeSerifItalic.sfd,
-	sfd/FreeSerifBold.sfd, sfd/FreeSerifBoldItalic.sfd - ASCII
-	numerals now monospaced; kerned numerals moved to Adobe corporate
-	use area
-	(U+F6xx).
-
-2003-05-07  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerif.sfd - Roman numerals now more complete.
-
-	* sfd/FreeSansOblique.sfd, sfd/FreeSansBoldOblique.sfd - Accented
-	characters added in the Latin Extended-B area.
-
-	* sfd/FreeSans.sfd - Greek accents added in the Greek Extended
-	area, characters added in the Latin Extended-B area, Roman
-	numerals added.
-
-	* sfd/FreeMonoOblique.sfd - Kerning pairs removed (what were they
-	doing in a monospaced font, anyway?).
-
-	* sfd/FreeMonoBoldOblique.sfd - Additions in Latin Extended-B and
-	Basic Greek.
-
-	* sfd/FreeMono.sfd, sfd/FreeMonoBold.sfd, sfd/FreeMonoOblique.sfd,
-	sfd/FreeMonoBoldOblique.sfd, sfd/FreeSans.sfd,
-	sfd/FreeSansBold.sfd, sfd/FreeSansOblique.sfd,
-	sfd/FreeSansBoldOblique.sfd - Major cleanup (fixed widths, open
-	paths, path directions (clockwise/counter-clockwise), points
-	rounded to integer values; outlines simplified etc.)
-
-2003-05-06  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* tools/OS2UnicodeRange - A simple script to display OS/2 Unicode
-	range table in TrueType fonts.
-
-	* sfd/FreeSans.sfd, sfd/FreeSansBold.sfd - ASCII numerals now
-	monospaced; kerned numerals moved to Adobe corporate use area
-	(U+F6xx). FreeSans is done, FreeSansBold half-way.
-
-	* sfd/FreeMono.sfd, sfd/FreeMonoOblique.sfd, sfd/FreeMonoBold.sfd,
-	sfd/FreeMonoBoldOblique.sfd, sfd/FreeSans.sfd,
-	sfd/FreeSansOblique.sfd, sfd/FreeSansBold.sfd,
-	sfd/FreeSansBoldOblique.sfd, sfd/FreeSerif.sfd,
-	sfd/FreeSerifItalic.sfd, sfd/FreeSerifBold.sfd,
-	sfd/FreeSerifBoldItalic.sfd - Added 2003 in copyright info.
-
-2003-03-27  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerif.sfd - Cyrillic and Cyrillic Supplement blocks
-	brought to conformance with Unicode 3.2, courtesy Daniel Shurovich
-	Chirkov.
-
-2003-03-19  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd, sfd/FreeSansOblique.sfd - somewhat wider
-	germandbls (U+00DF), due to complaints by Walter Schmidt.
-
-2003-03-18  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd - Added Sinhala glyphs from the Tipitaka
-	project <http://www.metta.lk>, recoded to Unicode by Noah Levitt.
-
-2003-02-19  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd - Minor changes on mathematical operators.
-
-2003-02-18  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMono.sfd - minor cleanup of glyph backgrounds; changed
-	integral signs (U+222B - U+2230)
-
-2003-02-05  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd - added a couple of glyphs in the IPA and
-	African Latin ranges.
-
-2003-01-30  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd, sfd/FreeSansOblique.sfd, sfd/FreeSansBold.sfd,
-	sfd/FreeSansBoldOblique.sfd, sfd/FreeMonoBold.sfd,
-	sfd/FreeMonoBoldOblique.sfd - Corrected Maltese Hbar (U+0126)
-	and/or hbar (U+0127).
-
-2003-01-28  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerifItalic.sfd - Corrected Maltese hbar (U+0127).
-
-2002-12-18  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* tools/ConvertFont - PfaEdit script for converting SFD files to
-	TrueType fonts.
-
-	* sfd/FreeSans.sfd - Added Tamil and Kannada glyphs from the
-	Akruti Indic fonts.
-
-2002-12-17  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd - Added Devanagari and Gujarati glyphs from the
-	Akruti Indic fonts.
-
-	* www/index.html - Added information on Rogier van Dalen's tools.
-
-	* AUTHORS - Added M.S. Sridhar.
-
-	* CREDITS - Correct spelling of Culmus project. Added M.S. Sridhar.
-
-2002-12-06  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMono.sfd - Added Braille glyphs, courtesy Vyacheslav
-	Dikonov.
-
-	* sfd/FreeSans.sfd - Added Unicode Syriac glyphs, courtesy
-	Vyacheslav Dikonov.
-
-2002-10-11  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* www/index.html - Added information on the availability of the
-	Debian GNU/Linux package.
-
-	* sfd/FreeSerif.sfd, sfd/FreeSans.sfd - added some kern pairs
-	beyond Latin-1 area.
-
-	* sfd/FreeSerif.sfd, sfd/FreeSerifItalic.sfd,
-	sfd/FreeSerifBold.sfd, sfd/FreeSerifBoldItalic.sfd - re-introduced
-	all the emtpy glyph slots (changes from Sep 23 made PfaEdit
-	crash). 
-
-2002-09-23  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerif.sfd, sfd/FreeSerifItalic.sfd,
-	sfd/FreeSerifBold.sfd, sfd/FreeSerifBoldItalic.sfd - imported
-	kerning information from the URW++ AFM files
-
-2002-09-11  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMono.sfd, sfd/FreeMonoOblique.sfd, sfd/FreeMonoBold.sfd,
-	sfd/FreeMonoOblique.sfd - updated Hebrew parts to comply with
-	Culmus v0.6.
-
-	* sfd/FreeSans.sfd, sfd/FreeSansOblique.sfd, sfd/FreeSansBold.sfd,
-	sfd/FreeSansOblique.sfd - Added Danilo Segan's Serbian Cyrillic
-	glyphs; updated Hebrew parts to comply with Culmus v0.6.
-
-2002-09-09  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMono.sfd, sfd/FreeMonoOblique.sfd, sfd/FreeMonoBold.sfd,
-	sfd/FreeMonoOblique.sfd, sfd/FreeSans.sfd,
-	sfd/FreeSansOblique.sfd, sfd/FreeSansBold.sfd,
-	sfd/FreeSansOblique.sfd - Updated Cyrillic part to match
-	Filippov's 1.0.7pre14
-
-	* sfd/FreeSansOblique.sfd - added Sam Stepanyan's Armenian glyphs
-	from FreeSans (skewed for 12 degrees).
-
-2002-09-06  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd, sfd/FreeSansOblique.sfd,
-	sfd/FreeSansBold.sfd, sfd/FreeSansOblique.sfd - Added Maxim
-	Iorsh's Hebrew characters.
-
-2002-08-29  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMono.sfd, sfd/FreeMonoOblique.sfd,
-	sfd/FreeMonoBold.sfd, sfd/FreeMonoOblique.sfd - Added Maxim
-	Iorsh's Hebrew characters.
-
-	* AUTHORS, CREDITS - Added Maxim Iorsh as author.
-
-2002-08-28  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* www/index.html - Added information of Microsoft's withdrawal of
-	freely available Unicode TrueType fonts
-
-	* www/resources.html - Added link to Maxim Iorsh's Culmus project.
-	
-2002-07-26  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMono.sfd - Added a couple of characters (Arrows area).
-
-2002-06-11  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMono.sfd - Applied Michalis Kabrianis's patch concerning
-	perispomeni in Greek politoniko.
-
-2002-05-23  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMono.sfd - Applied Michalis Kabrianis's patch concerning
-	psili in Greek politoniko. Also added two working variants of
-	chars in the IPA range.
-
-2002-05-15  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd, sfd/FreeSansBold.sfd, sfd/FreeSerif.sfd,
-	sfd/FreeSerifBold.sfd - Deleted explicit ".notdef" character with
-	no contours.
-
-2002-05-14  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMono.sfd, sfd/FreeMonoOblique.sfd, sfd/FreeMonoBold.sfd,
-	sfd/FreeMonoBoldOblique.sfd, sfd/FreeSans.sfd,
-	sfd/FreeSansOblique.sfd, sfd/FreeSansBold.sfd,
-	sfd/FreeSansBoldOblique.sfd, sfd/FreeSerif.sfd,
-	sfd/FreeSerifItalic.sfd, sfd/FreeSerifBold.sfd,
-	sfd/FreeSerifBoldItalic.sfd - The new version of PfaEdit saves
-	correctly formed Panose and LineGap lines.
-
-	* sfd/FreeSansBoldOblique.sfd - Filled-in the missing TTFWidth and
-	TTFWeight values.
-
-2002-05-09  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd - Added diacritics to the Spacing Modifier
-	Letters and Combining Diacritical Marks areas. Added composed
-	glyphs to the Latin Extended-B area.
-
-2002-05-07  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMono.sfd, sfd/FreeMonoOblique.sfd, sfd/FreeMonoBold.sfd,
-	sfd/FreeMonoBoldOblique.sfd, sfd/FreeSans.sfd,
-	sfd/FreeSansOblique.sfd, sfd/FreeSansBold.sfd,
-	sfd/FreeSansBoldOblique.sfd, sfd/FreeSerif.sfd,
-	sfd/FreeSerifItalic.sfd, sfd/FreeSerifBold.sfd,
-	sfd/FreeSerifBoldItalic.sfd - Updated Panose information with data
-	provided by Josef W. Segur. Updated TTF headers with English and
-	Slovenian text.
-
-2002-04-30  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMonoBold.sfd - Working on Greek small letters. Several
-	minor changes (lower carons etc.)
-
-2002-04-29  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* FreeMonoBoldOblique.sfd - Started adding Greek.
-
-	* sfd/FreeMonoBold.sfd - Added glyphs in the Geometrical Shapes
-	and Miscellaneous Symbols area. Harmonizing Greek with Latin. Done
-	with capitals.
-
-	* sfd/FreeMono.sfd - Deleted the explicit .notdef character. Added
-	one glyph to the Geometrical Shapes area, which is now completed;
-	added three glyphs to the Miscellaneous Symbols area. Harmonizing
-	Greek with Latin. Done with the capitals.
-
-2002-04-26  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd - Adjusted accent positions on several glyphs
-	in the Latin Extended-A area.
-
-2002-04-25  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMonoBold.sfd - Box Drawing area completed. Added a
-	couple of glyphs in the Geometrical Shapes area.
-
-	* sfd/FreeMono.sfd - Small corrections in the Box Drawing area.
-
-2002-04-24  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMono.sfd - Box Drawing area completed.
-
-2002-04-23  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* tools/WGL4.lst - corrected.
-
-	* sfd/FreeMono.sfd, sfd/FreeMonoBold.sfd - Working on Box Drawing
-	area.
-
-2002-04-22  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMono.sfd, sfd/FreeMonoBold.sfd - Working on Latin
-	Extended-B and Greek.
-
-2002-04-19  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerif.sfd - Somewhat cleaner chess figures.
-
-	* tools/MES-2.txt, tools/MES-2.lst - Corrected list (it is not
-	203C-203E, it is 203C and 203E).
-
-	* sfd/FreeMono.sfd, sfd/FreeMonoOblique.sfd, sfd/FreeMonoBold.sfd,
-	sfd/FreeMonoBoldOblique.sfd, sfd/FreeSans.sfd,
-	sfd/FreeSansOblique.sfd, sfd/FreeSansBold.sfd,
-	sfd/FreeSansBoldOblique.sfd, sfd/FreeSerif.sfd,
-	sfd/FreeSerifItalic.sfd, sfd/FreeSerifBold.sfd,
-	sfd/FreeSerifBoldItalic.sfd - Changed "Family Name" from Free to
-	FreeSerif, FreeSans and FreeMono, as appropriate. Changed Font
-	Modifiers from MonoBold etc. to Bold, Italic, Oblique, BoldOblique
-	and BoldItalic.
-
-2002-04-18  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMono.sfd, sfd/FreeMonoOblique.sfd, sfd/FreeMonoBold.sfd,
-	sfd/FreeMonoBoldOblique.sfd - Corrected metrics; now all character
-	widths are set to 600.
-
-2002-04-17  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerif.sfd - Corrected glyphs in the Box Drawing area and
-	Block Elements area, which should extend through the ascender *and
-	descender* height.
-
-	* sfd/FreeMonoBold.sfd - Continued working on harmonizing Greek
-	letters with Latin and Cyrillic.
-
-	* sfd/FreeMonoBold.sfd - Added some box drawing characters.
-
-2002-04-16  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* www/design-notes.html - Updated notes on stroke width for
-	symbols in Free Mono Bold.
-
-	* sfd/FreeMono.sfd - Added a handful of characters in the
-	Miscellaneous Symbols area.
-
-	* sfd/FreeMonoBoldOblique.sfd - Added subscripts, superscripts and
-	vulgar fractions.
-
-	* sfd/FreeMonoBold.sfd - Started harmonizing Greek letters with
-	Latin and Cyrillic.
-
-	* sfd/FreeMonoBold.sfd - Added subscripts, superscripts and vulgar
-	fractions.
-
-2002-04-15  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* www/design-notes.html - Updated notes on super-/subscripts in
-	Free Mono Bold. Separate subsections for Free Mono regular and
-	Free Mono Bold.
-
-2002-04-12  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerif.sfd - Added Ethiopian glyphs, converted from the
-	Metafont sources from TGI, Universität Hamburg (authors Berhanu
-	Beyene, Prof. Dr. Manfred Kudlek, Olaf Kummer, and Jochen
-	Metzinger) using Szabo's TeXtrace and retouched using
-	PfaEdit. Ethiopian metafonts are released under GNU GPL,
-	<http://www.informatik.uni-hamburg.de/TGI/mitarbeiter/wimis/kummer/ethiop_eng.html>.
-
-	* sfd/FreeMonoBold.sfd - Added 40 characters, mostly in the Latin
-	Extended-B and IPA Extensions areas.
-
-2002-04-11  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMono.sfd - Added a handful of characters in the Latin
-	Extended-B, IPA Extensions, Currency Symbols and Miscellaneous
-	Symbols areas.
-
-2002-04-09  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMono.sfd - Correcting accent positioning in the Extended
-	Greek area; adding a couple of characters here and there. Still 20
-	characters short of MES-2 conformance.
-
-2002-04-08  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMono.sfd - Added some characters in the Arrows area;
-	more or less completed Extended Greek area (accents still need to
-	be fine-tuned).
-
-2002-04-05  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMono.sfd - Modern non-Russian Cyrilic mostly completed.
-
-	* sfd/FreeMonoOblique.sfd - Synchronized with FreeMono.
-
-	* sfd/FreeSerif.sfd - Added Thomas Ridgeway's Tamil characters
-	(converted from Metafont and edited somehwat).
-	
-2002-04-04  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMonoOblique.sfd - Armenian letters added.
-
-	* sfd/FreeMonoBold.sfd - Serbian Cyrillic letters dje, tshe, lje
-	and nje corrected.
-
-	* sfd/FreeMono.sfd - Serbian Cyrillic letters dje and tshe
-	corrected. Some other non-Russian Cyrillic letters modified and
-	"welded together".
-
-2002-04-03  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMono.sfd - Added more or less complete Armenian
-	area. The glyphs are a tidied-up version based on the Armenian
-	Courier on the <http://www.cilicia.com/armo8.html>. Now we have
-	1673 characters.
-
-2002-03-28  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMono.sfd - Added some mathematical symbols.
-
-2002-03-26  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd - took H.S. Pannu's Gurmukhi from FreeSerif. It
-	actually fits to FreeSans much better. It seems I'll have to look
-	for another Gurmukhi font with modulated stroke for FreeSerif.
-
-	* sfd/FreeSerifItalic.sfd - replaced existing Hebrew glyphs by
-	those from FreeSerif (slanted for 15.5 degrees).
-
-	* sfd/FreeSerif.sfd - Added dotted Hebrew letters. Changed barred H.
-
-	* sfd/FreeMono.sfd - Completed vulgar fractions; minor changes in
-	Greek; added some mathematical operators.
-
-	* sfd/FreeMonoBold.sfd - added 12 characters to Latin Extended-B
-	and IPA Extensions areas (total 984).
-
-2002-03-25  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMonoBold.sfd - started adding Latin Extended-B and IPA
-	Extensions.
-
-	* sfd/FreeMono.sfd - Minor cosmetic changes; cleaning up Greek
-	(removing redundant control points), added some non-European
-	Cyrillic glyphs as a test.
-
-2002-03-22  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMono.sfd - Some minor modifications; letters in Latin
-	Extended-B area "welded" together.
-
-2002-03-20  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* www/index.html - finally linked the resources and design notes
-	pages.
-
-	* www/design-notes.html - added scaling information for super- and
-	subscript numerals in FreeMono.
-
-2002-03-19  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMono.sfd - the Latin Extended-B and IPA Extension area
-	characters moved from FreeMono and skewed for 12 degrees.
-
-2002-03-18  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMono.sfd - added a dozen or two of new characters, in
-	particular in the Latin Extended-B and IPA Extension area.
-
-2002-03-15  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMono.sfd - added a dozen of two of new characters, in
-	particular in the IPA Extension area.
-
-	* www/design-notes.html - Corrected data for x-height in FreeMono;
-	information on constructing small caps.
-
-2002-03-14  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMono.sfd - added three smiley characters to the
-	Miscallaneous Symbols area.
-
-2002-03-10  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerif.sfd - Anshuman Pandey has only converted Gurmukhi
-	from TrueType to Metafont; the original author of Gurkmukhi font
-	is Hardip Singh Pannu <http://members.aol.com/hspannu/punjabi.html>.
-	Got the permission from him to include the Gurmukhi glyph set.
-
-2002-03-08  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerif.sfd - Added some more glyphs in the Mathematical
-	Symbols area to a total number of 3374.
-
-2002-03-06  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerif.sfd - Added a basic Gurmukhi set.
-
-	* www/design-notes.html - started a page on design notes
-
-	* sfd/FreeMono.sfd - realized that glyphs in the Box Drawing area
-	and Block Elements area should extend through the ascender *and
-	descender* height, and corrected it.
-
-	* sfd/FreeMono.sfd, sfd/FreeMonoOblique.sfd - added some musical
-	glyphs, linking "no-break space" to space, "soft hyphen" to
-	hyphen-minus etc.
-
-2002-03-05  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* tools/WGL4.lst - Added Windows Glyph List 4.0
-
-	* tools/LigatureList.pl - Wrote a Perl script, which lists the
-	GSUB list (ligature list) of a OpenType font.
-
-	* sfd/FreeSerifBold.sfd, sfd/FreeSerifBoldItalic.sfd,
-	sfd/FreeSerifItalic.sfd - auxilliary Hebrew glyphs added. They are
-	too light compared with Latin and will be substituted with better
-	ones.
-
-2002-03-04  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerif.sfd - Added some more glyphs to the Mathematical
-	Operators area (page 0x22).
-
-	* sfd/FreeSerif.sfd - Incomplete and fragmentary support for
-	Devanagari, originating from Harsh Kumar's Shusha fonts was
-	replaced by Frans Velthuis' Devanagari metafont, now maintained by
-	Anshuman Pandey <apandey@u.washington.edu> and available under
-	GPL. Until I figure out how to provide glyph substitution table in
-	OpenType, only the Unicode part is there.
-
-2002-02-28  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* ChangeLog file created
-
-	* sfd/FreeSerif.sfd - Added some Telugu glyphs to page 0x0C,
-	courtesy  Prasad A. Chodavarapu <http://chaitanya.bhaavana.net/fonts/>
-
-	* sfd/FreeSerif.sfd - Added some glyphs to the Miscellaneous
-	Symbols page (0x26).
-	
-2002-02-26  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* mailing lists freefont-announce and freefont-bugs created
-
-2002-02-25  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerif.sfd - Added a couple of glyphs in Mathematics
-	Operators area.
-
-	* sfd/FreeMono.sfd 
-	- Added some more glyphs, in particular in the Mathematical
-	Operators section.
-	- Changed FamilyName to Free, FontName to FreeMono, and Full name
-	to "Free Monospaced".
-
-2002-02-20  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/ directory added containing FreeSerif, FreeSans and FreeMono
-	families.
-
-	* tools/ directory added containing lists with characters required
-	for MES (Multilinguag European Subset) compliance.
-
-	* tools/mes-list-expand.pl created - a Perl script for expanding MES
-	ranges into simple one-char-per-line format
-
-	* tools/CheckConformance.pl created - a Perl script for checking
-	conformance of a font file with a given coded character set
-
-	* homepage <http://www.freesoftware.fsf.org/freefont/> created
-
-2002-02-19  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* freefont (Free UCS Scalable Fonts) project approved on
-	savannah.gnu.org: <http://savannah.gnu.org/projects/freefont/>
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freefont-20090104/INSTALL b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freefont-20090104/INSTALL
deleted file mode 100644
index fbbbe804..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freefont-20090104/INSTALL
+++ /dev/null
@@ -1,86 +0,0 @@
-                          Installing GNU FreeFont
-                          =======================
-
-GNU FreeFont can be used in any modern operating system.
-
-This document explains how to install FreeFont on some common systems.
-
-UNIX/GNU/Linux/BSD Systems
---------------------------
-
-FreeFont works with any system using the free font rasterizer FreeType
-<http://www.freetype.org/>.
-
-* Debian GNU/Linux
-
-Users of Debian GNU/Linux system will probably want to use the Debian package,
-available from the Debian site, 
-
-	<http://packages.debian.org/unstable/x11/ttf-freefont.html>,
-
-or any of its mirrors.
-
-Install them by issuing the command
-	apt-get install ttf-freefont
-
-
-* KDE local installation
-
-Users of KDE can install .ttf files on a per-user basis using the KDE 
-Control Center module "kcmfontinst", which may appear in the menu as
-
-	Settings -> System Administration -> Font Installer
-
-This is especially helpful for developers and testers.
-
-
-* Generic X-windows
-
-	1) Fetch the freefont-ttf.tar.gz package with Free UCS outline fonts
-	   in the TrueType format.
-
-	2) Unpack TrueType fonts into a suitable directory,
-	   e.g. /usr/local/share/fonts/default/TrueType/
-
-	3) If you have chosen any other directory, make sure the directory you
-	   used to install the fonts is listed in the path searched by the X
-	   Font Server by editing the config file in /etc/X11/.
-
-	   In some systems, you list the directory in the item "catalogue="
-	   in the file /etc/X11/fs/config.
-
-	4) Run ttmkfdir in the directory where you unpacked the fonts.
-
-
-Windows 95/98/NT/2000/XP; Vista
--------------------------------
-
-Note that in at least Vista, XP and 2000, the OpenType versions perform much
-better than, and are recommended over, the TrueType ones.
-
-* Vista:
-	1) From the Start menu, open Control Panels
-	2) Drag-n-drop font files onto Fonts control panel
-           You may get a dialog saying
-        	"Windows needs your permission to continue"
-	   a) Click Continue
-
-* 95/98/NT:
-	The font installation is similar to Vista.
-
-	In order to use OpenType, users of Windows 95, 98 and NT 4.0 can
-	install Adobe's 'Type Manager Light'.  It is available for download
-	without cost from Adobe's web site.
-
-	Otherwise, use the TrueType versions.
-
-Mac OS X
---------
-
-Installing on Mac OS X consists of moving the .ttf files to either
-	/Library/Fonts/  or  ~/Library/Fonts/
-depending on whether they should be available to all users on your system
-or just to yourself.
-
---------------------------------------------------------------------------
-$Id: INSTALL,v 1.7 2008/12/26 12:33:31 Stevan_White Exp $
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freefont-20090104/README b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freefont-20090104/README
deleted file mode 100644
index 60e67f20..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freefont-20090104/README
+++ /dev/null
@@ -1,108 +0,0 @@
--*-text-*-
-                          GNU FreeFont
-
-The GNU FreeFont project aims to provide a useful set of free scalable
-(i.e., OpenType) fonts covering as much as possible of the ISO 10646/Unicode
-UCS (Universal Character Set).
-
-Statement of Purpose
---------------------
-
-The practical reason for putting glyphs together in a single font face is
-to conveniently mix symbols and characters from different writing systems,
-without having to switch fonts.
-
-Coverage
---------
-
-FreeFont covers the following character sets
-
-* ISO 8859 parts 1-15
-* CEN MES-3 European Unicode Subset
-  http://www.evertype.com/standards/iso10646/pdf/cwa13873.pdf
-* IBM/Microsoft code pages 437, 850, 852, 1250, 1252 and more
-* Microsoft/Adobe Windows Glyph List 4 (WGL4)
-  http://www.microsoft.com/typography/otspec/WGL4.htm
-* KOI8-R and KOI8-RU
-* DEC VT100 graphics symbols
-* International Phonetic Alphabet
-* Arabic, Hebrew, Armenian, Georgian, Ethiopian and Thai alphabets,
-  including Arabic presentation forms A/B
-* mathematical symbols, including the whole TeX repertoire of symbols
-* APL symbols
-  etc.
-
-Editing
--------
-
-The free outline font editor, George Williams's FontForge
-<http://fontforge.sourceforge.net/> is used for editing the fonts.
-
-Design Issues
--------------
-
-Which font shapes should be made?  Historical style terms like Renaissance
-or Baroque letterforms cannot be applied beyond Latin/Cyrillic/Greek
-scripts to any greater extent than Kufi or Nashki can be applied beyond
-Arabic script; "italic" is really only meaningful for Latin letters. 
-
-However, most modern writing systems have typographic formulations for
-contrasting uniform and modulated character stroke widths, and have some
-history with "oblique", faces.  Since the advent of the typewriter, most
-have developed a typographic style with uniform-width characters.
-
-Accordingly, the FreeFont family has one monospaced - FreeMono - and two
-proportional faces (one with uniform stroke - FreeSans - and one with
-modulated stroke - FreeSerif).
-
-To make text from different writing systems look good side-by-side, each
-FreeFont face is meant to contain characters of similar style and weight.
-
-Licensing
----------
-
-Free UCS scalable fonts is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as published
-by the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-The fonts are distributed in the hope that they will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-for more details.
-
-You should have received a copy of the GNU General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-As a special exception, if you create a document which uses this font, and
-embed this font or unaltered portions of this font into the document, this
-font does not by itself cause the resulting document to be covered by the
-GNU General Public License. This exception does not however invalidate any
-other reasons why the document might be covered by the GNU General Public
-License. If you modify this font, you may extend this exception to your
-version of the font, but you are not obligated to do so.  If you do not
-wish to do so, delete this exception statement from your version.
-
-
-Files and their suffixes
-------------------------
-
-The files with .sfd (Spline Font Database) are in FontForge's native format. 
-Please use these if you plan to modify the font files.
-
-TrueType fonts for immediate consumption are the files with the .ttf
-(TrueType Font) suffix.  These are ready to use in Xwindows based
-systems using FreeType, on Mac OS, and on older Windows systems.
-
-OpenType fonts (with suffix .otf) are for use in Windows Vista. 
-Note that although they can be installed on Linux, but many applications
-in Linux still don't support them.
-
-
---------------------------------------------------------------------------
-Primoz Peterlin, <primoz.peterlin@biofiz.mf.uni-lj.si>
-Steve White <stevan.white@googlemail.com>
-
-Free UCS scalable fonts: http://savannah.gnu.org/projects/freefont/
-$Id: README,v 1.6 2008/12/25 12:51:41 Stevan_White Exp $
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freemono.ctg.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freemono.ctg.z
deleted file mode 100644
index 93b7b3cf..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freemono.ctg.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freemono.php b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freemono.php
deleted file mode 100644
index 123b3bf2..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freemono.php
+++ /dev/null
@@ -1,348 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='FreeMono';
-$desc=array('Ascent'=>800,'Descent'=>-200,'CapHeight'=>40,'Flags'=>32,'FontBBox'=>'[-793 -200 699 800]','ItalicAngle'=>0,'StemV'=>70,'MissingWidth'=>600);
-$up=-125;
-$ut=50;
-$dw=600;
-$cw=array(
-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,8364=>600,8218=>600,402=>600,8222=>600,8230=>600,
-8224=>600,8225=>600,710=>600,8240=>600,352=>600,8249=>600,338=>600,381=>600,8216=>600,8217=>600,
-8220=>600,8221=>600,8226=>600,8211=>600,8212=>600,732=>600,8482=>600,353=>600,8250=>600,339=>600,
-382=>600,376=>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,256=>600,257=>600,
-258=>600,259=>600,260=>600,261=>600,262=>600,263=>600,264=>600,265=>600,266=>600,267=>600,
-268=>600,269=>600,270=>600,271=>600,272=>600,273=>600,274=>600,275=>600,276=>600,277=>600,
-278=>600,279=>600,280=>600,281=>600,282=>600,283=>600,284=>600,285=>600,286=>600,287=>600,
-288=>600,289=>600,290=>600,291=>600,292=>600,293=>600,294=>600,295=>600,296=>600,297=>600,
-298=>600,299=>600,300=>600,301=>600,302=>600,303=>600,304=>600,305=>600,306=>600,307=>600,
-308=>600,309=>600,310=>600,311=>600,312=>600,313=>600,314=>600,315=>600,316=>600,317=>600,
-318=>600,319=>600,320=>600,321=>600,322=>600,323=>600,324=>600,325=>600,326=>600,327=>600,
-328=>600,329=>600,330=>600,331=>600,332=>600,333=>600,334=>600,335=>600,336=>600,337=>600,
-340=>600,341=>600,342=>600,343=>600,344=>600,345=>600,346=>600,347=>600,348=>600,349=>600,
-350=>600,351=>600,354=>600,355=>600,356=>600,357=>600,358=>600,359=>600,360=>600,361=>600,
-362=>600,363=>600,364=>600,365=>600,366=>600,367=>600,368=>600,369=>600,370=>600,371=>600,
-372=>600,373=>600,374=>600,375=>600,377=>600,378=>600,379=>600,380=>600,383=>600,384=>600,
-385=>600,386=>600,387=>600,388=>600,389=>600,390=>600,391=>600,392=>600,393=>600,394=>600,
-395=>600,396=>600,397=>600,398=>600,399=>600,400=>600,401=>600,403=>600,404=>600,405=>600,
-406=>600,407=>600,408=>600,409=>600,410=>600,411=>600,412=>600,413=>600,414=>600,415=>600,
-416=>600,417=>600,418=>600,419=>600,420=>600,421=>600,422=>600,423=>600,424=>600,425=>600,
-426=>600,427=>600,428=>600,429=>600,430=>600,431=>600,432=>600,433=>600,434=>600,435=>600,
-436=>600,437=>600,438=>600,439=>600,440=>600,441=>600,442=>600,443=>600,444=>600,445=>600,
-446=>600,447=>600,448=>600,449=>600,450=>600,451=>600,452=>600,453=>600,454=>600,455=>600,
-456=>600,457=>600,458=>600,459=>600,460=>600,461=>600,462=>600,463=>600,464=>600,465=>600,
-466=>600,467=>600,468=>600,469=>600,470=>600,471=>600,472=>600,473=>600,474=>600,475=>600,
-476=>600,477=>600,478=>600,479=>600,480=>600,481=>600,482=>600,483=>600,484=>600,485=>600,
-486=>600,487=>600,488=>600,489=>600,490=>600,491=>600,492=>600,493=>600,494=>600,495=>600,
-496=>600,497=>600,498=>600,499=>600,500=>600,501=>600,502=>600,503=>600,504=>600,505=>600,
-506=>600,507=>600,508=>600,509=>600,510=>600,511=>600,512=>600,513=>600,514=>600,515=>600,
-516=>600,517=>600,518=>600,519=>600,520=>600,521=>600,522=>600,523=>600,524=>600,525=>600,
-526=>600,527=>600,528=>600,529=>600,530=>600,531=>600,532=>600,533=>600,534=>600,535=>600,
-536=>600,537=>600,538=>600,539=>600,540=>600,541=>600,542=>600,543=>600,548=>600,549=>600,
-550=>600,551=>600,552=>600,553=>600,554=>600,555=>600,556=>600,557=>600,558=>600,559=>600,
-560=>600,561=>600,562=>600,563=>600,567=>600,592=>600,593=>600,594=>600,595=>600,596=>600,
-597=>600,598=>600,599=>600,600=>600,601=>600,602=>600,603=>600,604=>600,605=>600,606=>600,
-607=>600,608=>600,609=>600,610=>600,611=>600,612=>600,613=>600,614=>600,615=>600,616=>600,
-617=>600,618=>600,619=>600,620=>600,621=>600,622=>600,623=>600,624=>600,625=>600,626=>600,
-627=>600,628=>600,629=>600,630=>600,631=>600,632=>600,633=>600,634=>600,635=>600,636=>600,
-637=>600,638=>600,639=>600,640=>600,641=>600,642=>600,643=>600,644=>600,645=>600,646=>600,
-647=>600,648=>600,649=>600,650=>600,651=>600,652=>600,653=>600,654=>600,655=>600,656=>600,
-657=>600,658=>600,659=>600,660=>600,661=>600,662=>600,663=>600,664=>600,665=>600,666=>600,
-667=>600,668=>600,669=>600,670=>600,671=>600,672=>600,673=>600,674=>600,675=>600,676=>600,
-677=>600,678=>600,679=>600,680=>600,681=>600,682=>600,683=>600,684=>600,685=>600,686=>600,
-687=>600,688=>600,689=>600,690=>600,691=>600,692=>600,693=>600,694=>600,695=>600,696=>600,
-697=>600,698=>600,699=>600,700=>600,701=>600,702=>600,703=>600,704=>600,705=>600,706=>600,
-707=>600,708=>600,709=>600,711=>600,712=>600,713=>600,714=>600,715=>600,716=>600,717=>600,
-718=>600,719=>600,720=>600,721=>600,722=>600,723=>600,724=>600,725=>600,726=>600,727=>600,
-728=>600,729=>600,730=>600,731=>600,733=>600,734=>600,735=>600,736=>600,737=>600,738=>600,
-739=>600,740=>600,741=>600,742=>600,743=>600,744=>600,745=>600,746=>600,747=>600,748=>600,
-749=>600,750=>600,751=>600,752=>600,753=>600,754=>600,755=>600,756=>600,757=>600,758=>600,
-759=>600,760=>600,761=>600,762=>600,763=>600,764=>600,765=>600,766=>600,767=>600,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,832=>0,833=>0,834=>0,835=>0,836=>0,837=>0,838=>0,
-839=>0,840=>0,841=>0,843=>0,844=>0,845=>0,848=>0,849=>0,850=>0,851=>0,
-852=>0,853=>0,854=>0,855=>0,856=>0,857=>0,858=>0,884=>600,885=>600,890=>600,
-894=>600,900=>600,901=>600,902=>600,903=>600,904=>600,905=>600,906=>600,908=>600,910=>600,
-911=>600,912=>600,913=>600,914=>600,915=>600,916=>600,917=>600,918=>600,919=>600,920=>600,
-921=>600,922=>600,923=>600,924=>600,925=>600,926=>600,927=>600,928=>600,929=>600,931=>600,
-932=>600,933=>600,934=>600,935=>600,936=>600,937=>600,938=>600,939=>600,940=>600,941=>600,
-942=>600,943=>600,944=>600,945=>600,946=>600,947=>600,948=>600,949=>600,950=>600,951=>600,
-952=>600,953=>600,954=>600,955=>600,956=>600,957=>600,958=>600,959=>600,960=>600,961=>600,
-962=>600,963=>600,964=>600,965=>600,966=>600,967=>600,968=>600,969=>600,970=>600,971=>600,
-972=>600,973=>600,974=>600,976=>600,977=>600,978=>600,979=>600,980=>600,981=>600,982=>600,
-986=>600,987=>600,988=>600,1008=>600,1009=>600,1012=>600,1013=>600,1024=>600,1025=>600,1026=>600,
-1027=>600,1028=>600,1029=>600,1030=>600,1031=>600,1032=>600,1033=>600,1034=>600,1035=>600,1036=>600,
-1037=>600,1038=>600,1039=>600,1040=>600,1041=>600,1042=>600,1043=>600,1044=>600,1045=>600,1046=>600,
-1047=>600,1048=>600,1049=>600,1050=>600,1051=>600,1052=>600,1053=>600,1054=>600,1055=>600,1056=>600,
-1057=>600,1058=>600,1059=>600,1060=>600,1061=>600,1062=>600,1063=>600,1064=>600,1065=>600,1066=>600,
-1067=>600,1068=>600,1069=>600,1070=>600,1071=>600,1072=>600,1073=>600,1074=>600,1075=>600,1076=>600,
-1077=>600,1078=>600,1079=>600,1080=>600,1081=>600,1082=>600,1083=>600,1084=>600,1085=>600,1086=>600,
-1087=>600,1088=>600,1089=>600,1090=>600,1091=>600,1092=>600,1093=>600,1094=>600,1095=>600,1096=>600,
-1097=>600,1098=>600,1099=>600,1100=>600,1101=>600,1102=>600,1103=>600,1104=>600,1105=>600,1106=>600,
-1107=>600,1108=>600,1109=>600,1110=>600,1111=>600,1112=>600,1113=>600,1114=>600,1115=>600,1116=>600,
-1117=>600,1118=>600,1119=>600,1120=>600,1121=>600,1122=>600,1123=>600,1124=>600,1126=>600,1127=>600,
-1128=>600,1130=>600,1131=>600,1132=>600,1133=>600,1136=>600,1137=>600,1138=>600,1140=>600,1141=>600,
-1142=>600,1143=>600,1155=>0,1156=>0,1157=>0,1158=>0,1159=>0,1162=>600,1163=>600,1164=>600,
-1165=>600,1166=>600,1167=>600,1168=>600,1169=>600,1170=>600,1171=>600,1172=>600,1173=>600,1174=>600,
-1175=>600,1176=>600,1177=>600,1178=>600,1179=>600,1180=>600,1181=>600,1182=>600,1183=>600,1184=>600,
-1185=>600,1186=>600,1187=>600,1188=>600,1189=>600,1190=>600,1191=>600,1192=>600,1193=>600,1194=>600,
-1195=>600,1196=>600,1197=>600,1198=>600,1199=>600,1200=>600,1201=>600,1202=>600,1203=>600,1204=>600,
-1205=>600,1206=>600,1207=>600,1208=>600,1209=>600,1210=>600,1211=>600,1212=>600,1213=>600,1214=>600,
-1215=>600,1216=>600,1217=>600,1218=>600,1219=>600,1220=>600,1221=>600,1222=>600,1223=>600,1224=>600,
-1225=>600,1226=>600,1227=>600,1228=>600,1229=>600,1230=>600,1231=>600,1232=>600,1233=>600,1234=>600,
-1235=>600,1236=>600,1237=>600,1238=>600,1239=>600,1240=>600,1241=>600,1242=>600,1243=>600,1244=>600,
-1245=>600,1246=>600,1247=>600,1248=>600,1249=>600,1250=>600,1251=>600,1252=>600,1253=>600,1254=>600,
-1255=>600,1256=>600,1257=>600,1258=>600,1259=>600,1260=>600,1261=>600,1262=>600,1263=>600,1264=>600,
-1265=>600,1266=>600,1267=>600,1268=>600,1269=>600,1270=>600,1271=>600,1272=>600,1273=>600,1296=>600,
-1297=>600,1298=>600,1299=>600,1306=>600,1307=>600,1308=>600,1309=>600,1310=>600,1311=>600,1329=>600,
-1330=>600,1331=>600,1332=>600,1333=>600,1334=>600,1335=>600,1336=>600,1337=>600,1338=>600,1339=>600,
-1340=>600,1341=>600,1342=>600,1343=>600,1344=>600,1345=>600,1346=>600,1347=>600,1348=>600,1349=>600,
-1350=>600,1351=>600,1352=>600,1353=>600,1354=>600,1355=>600,1356=>600,1357=>600,1358=>600,1359=>600,
-1360=>600,1361=>600,1362=>600,1363=>600,1364=>600,1365=>600,1366=>600,1369=>600,1370=>600,1371=>600,
-1372=>600,1373=>600,1374=>600,1375=>600,1377=>600,1378=>600,1379=>600,1380=>600,1381=>600,1382=>600,
-1383=>600,1384=>600,1385=>600,1386=>600,1387=>600,1388=>600,1389=>600,1390=>600,1391=>600,1392=>600,
-1393=>600,1394=>600,1395=>600,1396=>600,1397=>600,1398=>600,1399=>600,1400=>600,1401=>600,1402=>600,
-1403=>600,1404=>600,1405=>600,1406=>600,1407=>600,1408=>600,1409=>600,1410=>600,1411=>600,1412=>600,
-1413=>600,1414=>600,1415=>600,1417=>600,1418=>600,1456=>0,1457=>0,1458=>0,1459=>0,1460=>0,
-1461=>0,1462=>0,1463=>0,1464=>0,1465=>0,1467=>0,1468=>0,1469=>0,1470=>600,1471=>0,
-1472=>600,1473=>0,1474=>0,1475=>600,1476=>0,1488=>600,1489=>600,1490=>600,1491=>600,1492=>600,
-1493=>600,1494=>600,1495=>600,1496=>600,1497=>600,1498=>600,1499=>600,1500=>600,1501=>600,1502=>600,
-1503=>600,1504=>600,1505=>600,1506=>600,1507=>600,1508=>600,1509=>600,1510=>600,1511=>600,1512=>600,
-1513=>600,1514=>600,1520=>600,1521=>600,1522=>600,1523=>600,1524=>600,4304=>600,4305=>600,4306=>600,
-4307=>600,4308=>600,4309=>600,4310=>600,4311=>600,4312=>600,4313=>600,4314=>600,4315=>600,4316=>600,
-4317=>600,4318=>600,4319=>600,4320=>600,4321=>600,4322=>600,4323=>600,4324=>600,4325=>600,4326=>600,
-4327=>600,4328=>600,4329=>600,4330=>600,4331=>600,4332=>600,4333=>600,4334=>600,4335=>600,4336=>600,
-4337=>600,4338=>600,4339=>600,4340=>600,4341=>600,4345=>600,4347=>600,5792=>600,5793=>600,5794=>600,
-5795=>600,5796=>600,5797=>600,5798=>600,5799=>600,5800=>600,5801=>600,5802=>600,5803=>600,5804=>600,
-5805=>600,5806=>600,5807=>600,5808=>600,5809=>600,5810=>600,5811=>600,5812=>600,5813=>600,5814=>600,
-5815=>600,5816=>600,5817=>600,5818=>600,5819=>600,5820=>600,5821=>600,5822=>600,5823=>600,5824=>600,
-5825=>600,5826=>600,5827=>600,5828=>600,5829=>600,5830=>600,5831=>600,5832=>600,5833=>600,5834=>600,
-5835=>600,5836=>600,5837=>600,5838=>600,5839=>600,5840=>600,5841=>600,5842=>600,5843=>600,5844=>600,
-5845=>600,5846=>600,5847=>600,5848=>600,5849=>600,5850=>600,5851=>600,5852=>600,5853=>600,5854=>600,
-5855=>600,5856=>600,5857=>600,5858=>600,5859=>600,5860=>600,5861=>600,5862=>600,5863=>600,5864=>600,
-5865=>600,5866=>600,5867=>600,5868=>600,5869=>600,5870=>600,5871=>600,5872=>600,7680=>600,7681=>600,
-7682=>600,7683=>600,7684=>600,7685=>600,7686=>600,7687=>600,7688=>600,7689=>600,7690=>600,7691=>600,
-7692=>600,7693=>600,7694=>600,7695=>600,7696=>600,7697=>600,7698=>600,7699=>600,7700=>600,7701=>600,
-7702=>600,7703=>600,7704=>600,7705=>600,7706=>600,7707=>600,7708=>600,7709=>600,7710=>600,7711=>600,
-7712=>600,7713=>600,7714=>600,7715=>600,7716=>600,7717=>600,7718=>600,7719=>600,7720=>600,7721=>600,
-7722=>600,7723=>600,7724=>600,7725=>600,7726=>600,7727=>600,7728=>600,7729=>600,7730=>600,7731=>600,
-7732=>600,7733=>600,7734=>600,7735=>600,7736=>600,7737=>600,7738=>600,7739=>600,7740=>600,7741=>600,
-7742=>600,7743=>600,7744=>600,7745=>600,7746=>600,7747=>600,7748=>600,7749=>600,7750=>600,7751=>600,
-7752=>600,7753=>600,7754=>600,7755=>600,7756=>600,7757=>600,7758=>600,7759=>600,7760=>600,7761=>600,
-7762=>600,7763=>600,7764=>600,7765=>600,7766=>600,7767=>600,7768=>600,7769=>600,7770=>600,7771=>600,
-7772=>600,7773=>600,7774=>600,7775=>600,7776=>600,7777=>600,7778=>600,7779=>600,7780=>600,7781=>600,
-7782=>600,7783=>600,7784=>600,7785=>600,7786=>600,7787=>600,7788=>600,7789=>600,7790=>600,7791=>600,
-7792=>600,7793=>600,7794=>600,7795=>600,7796=>600,7797=>600,7798=>600,7799=>600,7800=>600,7801=>600,
-7802=>600,7803=>600,7804=>600,7805=>600,7806=>600,7807=>600,7808=>600,7809=>600,7810=>600,7811=>600,
-7812=>600,7813=>600,7814=>600,7815=>600,7816=>600,7817=>600,7818=>600,7819=>600,7820=>600,7821=>600,
-7822=>600,7823=>600,7824=>600,7825=>600,7826=>600,7827=>600,7828=>600,7829=>600,7830=>600,7831=>600,
-7832=>600,7833=>600,7834=>600,7835=>600,7840=>600,7841=>600,7842=>600,7843=>600,7844=>600,7845=>600,
-7846=>600,7847=>600,7848=>600,7849=>600,7850=>600,7851=>600,7852=>600,7853=>600,7854=>600,7855=>600,
-7856=>600,7857=>600,7858=>600,7859=>600,7860=>600,7861=>600,7862=>600,7863=>600,7864=>600,7865=>600,
-7866=>600,7867=>600,7868=>600,7869=>600,7870=>600,7871=>600,7872=>600,7873=>600,7874=>600,7875=>600,
-7876=>600,7877=>600,7878=>600,7879=>600,7880=>600,7881=>600,7882=>600,7883=>600,7884=>600,7885=>600,
-7886=>600,7887=>600,7888=>600,7889=>600,7890=>600,7891=>600,7892=>600,7893=>600,7894=>600,7895=>600,
-7896=>600,7897=>600,7898=>600,7899=>600,7900=>600,7901=>600,7902=>600,7903=>600,7904=>600,7905=>600,
-7906=>600,7907=>600,7908=>600,7909=>600,7910=>600,7911=>600,7912=>600,7913=>600,7914=>600,7915=>600,
-7916=>600,7917=>600,7918=>600,7919=>600,7920=>600,7921=>600,7922=>600,7923=>600,7924=>600,7925=>600,
-7926=>600,7927=>600,7928=>600,7929=>600,7936=>600,7937=>600,7938=>600,7939=>600,7940=>600,7941=>600,
-7942=>600,7943=>600,7944=>600,7945=>600,7946=>600,7947=>600,7948=>600,7949=>600,7950=>600,7951=>600,
-7952=>600,7953=>600,7954=>600,7955=>600,7956=>600,7957=>600,7960=>600,7961=>600,7962=>600,7963=>600,
-7964=>600,7965=>600,7968=>600,7969=>600,7970=>600,7971=>600,7972=>600,7973=>600,7974=>600,7975=>600,
-7976=>600,7977=>600,7978=>600,7979=>600,7980=>600,7981=>600,7982=>600,7983=>600,7984=>600,7985=>600,
-7986=>600,7987=>600,7988=>600,7989=>600,7990=>600,7991=>600,7992=>600,7993=>600,7994=>600,7995=>600,
-7996=>600,7997=>600,7998=>600,7999=>600,8000=>600,8001=>600,8002=>600,8003=>600,8004=>600,8005=>600,
-8008=>600,8009=>600,8010=>600,8011=>600,8012=>600,8013=>600,8016=>600,8017=>600,8018=>600,8019=>600,
-8020=>600,8021=>600,8022=>600,8023=>600,8025=>600,8027=>600,8029=>600,8031=>600,8032=>600,8033=>600,
-8034=>600,8035=>600,8036=>600,8037=>600,8038=>600,8039=>600,8040=>600,8041=>600,8042=>600,8043=>600,
-8044=>600,8045=>600,8046=>600,8047=>600,8048=>600,8049=>600,8050=>600,8051=>600,8052=>600,8053=>600,
-8054=>600,8055=>600,8056=>600,8057=>600,8058=>600,8059=>600,8060=>600,8061=>600,8064=>600,8065=>600,
-8066=>600,8067=>600,8068=>600,8069=>600,8070=>600,8071=>600,8072=>600,8073=>600,8074=>600,8075=>600,
-8076=>600,8077=>600,8078=>600,8079=>600,8080=>600,8081=>600,8082=>600,8083=>600,8084=>600,8085=>600,
-8086=>600,8087=>600,8088=>600,8089=>600,8090=>600,8091=>600,8092=>600,8093=>600,8094=>600,8095=>600,
-8096=>600,8097=>600,8098=>600,8099=>600,8100=>600,8101=>600,8102=>600,8103=>600,8104=>600,8105=>600,
-8106=>600,8107=>600,8108=>600,8109=>600,8110=>600,8111=>600,8112=>600,8113=>600,8114=>600,8115=>600,
-8116=>600,8118=>600,8119=>600,8120=>600,8121=>600,8122=>600,8123=>600,8124=>600,8125=>600,8126=>600,
-8127=>600,8128=>600,8129=>600,8130=>600,8131=>600,8132=>600,8134=>600,8135=>600,8136=>600,8137=>600,
-8138=>600,8139=>600,8140=>600,8141=>600,8142=>600,8143=>600,8144=>600,8145=>600,8146=>600,8147=>600,
-8150=>600,8151=>600,8152=>600,8153=>600,8154=>600,8155=>600,8157=>600,8158=>600,8159=>600,8160=>600,
-8161=>600,8162=>600,8163=>600,8164=>600,8165=>600,8166=>600,8167=>600,8168=>600,8169=>600,8170=>600,
-8171=>600,8172=>600,8173=>600,8174=>600,8175=>600,8178=>600,8179=>600,8180=>600,8182=>600,8183=>600,
-8184=>600,8185=>600,8186=>600,8187=>600,8188=>600,8189=>600,8190=>600,8192=>600,8193=>600,8194=>600,
-8195=>600,8196=>600,8197=>600,8198=>600,8199=>600,8200=>600,8201=>600,8202=>600,8203=>600,8204=>0,
-8205=>0,8206=>0,8207=>0,8208=>600,8209=>600,8210=>600,8213=>600,8214=>600,8215=>600,8219=>600,
-8223=>600,8227=>600,8228=>600,8229=>600,8231=>600,8232=>600,8233=>600,8234=>600,8235=>600,8236=>600,
-8237=>600,8238=>600,8239=>600,8241=>600,8242=>600,8243=>600,8244=>600,8245=>600,8246=>600,8247=>600,
-8248=>600,8251=>600,8252=>600,8253=>600,8254=>600,8255=>600,8256=>600,8257=>600,8258=>600,8259=>600,
-8260=>600,8261=>600,8262=>600,8263=>600,8264=>600,8265=>600,8266=>600,8267=>600,8268=>600,8269=>600,
-8270=>600,8271=>600,8272=>600,8273=>600,8274=>600,8275=>600,8276=>600,8277=>600,8278=>600,8279=>600,
-8280=>600,8281=>600,8282=>600,8283=>600,8284=>600,8285=>600,8286=>600,8287=>600,8288=>600,8289=>600,
-8290=>600,8291=>600,8292=>600,8298=>600,8299=>600,8300=>600,8301=>600,8302=>600,8303=>600,8304=>600,
-8305=>600,8308=>600,8309=>600,8310=>600,8311=>600,8312=>600,8313=>600,8314=>600,8315=>600,8316=>600,
-8317=>600,8318=>600,8319=>600,8320=>600,8321=>600,8322=>600,8323=>600,8324=>600,8325=>600,8326=>600,
-8327=>600,8328=>600,8329=>600,8330=>600,8331=>600,8332=>600,8333=>600,8334=>600,8336=>600,8337=>600,
-8338=>600,8339=>600,8340=>600,8353=>600,8354=>600,8355=>600,8356=>600,8357=>600,8358=>600,8359=>600,
-8360=>600,8361=>600,8362=>600,8363=>600,8365=>600,8366=>600,8368=>600,8369=>600,8370=>600,8371=>600,
-8372=>600,8373=>600,8400=>0,8401=>0,8402=>0,8406=>0,8407=>0,8411=>0,8412=>0,8413=>0,
-8414=>0,8415=>0,8416=>0,8417=>0,8418=>0,8419=>0,8428=>0,8429=>0,8430=>0,8431=>0,
-8448=>600,8449=>600,8450=>600,8451=>600,8453=>600,8454=>600,8455=>600,8457=>600,8461=>600,8463=>600,
-8464=>600,8465=>600,8466=>600,8467=>600,8468=>600,8469=>600,8470=>600,8471=>600,8472=>600,8473=>600,
-8474=>600,8476=>600,8477=>600,8478=>600,8481=>600,8484=>600,8486=>600,8487=>600,8489=>600,8490=>600,
-8491=>600,8498=>600,8501=>600,8502=>600,8503=>600,8504=>600,8505=>600,8506=>600,8507=>600,8523=>600,
-8526=>600,8531=>600,8532=>600,8533=>600,8534=>600,8535=>600,8536=>600,8537=>600,8538=>600,8539=>600,
-8540=>600,8541=>600,8542=>600,8543=>600,8544=>600,8545=>600,8546=>600,8547=>600,8548=>600,8549=>600,
-8550=>600,8551=>600,8552=>600,8553=>600,8554=>600,8555=>600,8556=>600,8557=>600,8558=>600,8559=>600,
-8560=>600,8561=>600,8562=>600,8563=>600,8564=>600,8565=>600,8566=>600,8567=>600,8568=>600,8569=>600,
-8570=>600,8571=>600,8572=>600,8573=>600,8574=>600,8575=>600,8592=>600,8593=>600,8594=>600,8595=>600,
-8596=>600,8597=>600,8598=>600,8599=>600,8600=>600,8601=>600,8602=>600,8603=>600,8604=>600,8605=>600,
-8606=>600,8607=>600,8608=>600,8609=>600,8610=>600,8611=>600,8612=>600,8613=>600,8614=>600,8615=>600,
-8616=>600,8617=>600,8618=>600,8619=>600,8620=>600,8621=>600,8622=>600,8623=>600,8624=>600,8625=>600,
-8626=>600,8627=>600,8628=>600,8629=>600,8630=>600,8631=>600,8632=>600,8633=>600,8634=>600,8635=>600,
-8636=>600,8637=>600,8638=>600,8639=>600,8640=>600,8641=>600,8642=>600,8643=>600,8644=>600,8645=>600,
-8646=>600,8647=>600,8648=>600,8649=>600,8650=>600,8651=>600,8652=>600,8653=>600,8654=>600,8655=>600,
-8656=>600,8657=>600,8658=>600,8659=>600,8660=>600,8661=>600,8669=>600,8678=>600,8679=>600,8680=>600,
-8681=>600,8691=>600,8704=>600,8705=>600,8706=>600,8707=>600,8708=>600,8709=>600,8710=>600,8711=>600,
-8712=>600,8713=>600,8714=>600,8715=>600,8716=>600,8717=>600,8718=>600,8719=>600,8720=>600,8721=>600,
-8722=>600,8723=>600,8724=>600,8725=>600,8726=>600,8727=>600,8728=>600,8729=>600,8730=>600,8731=>600,
-8732=>600,8733=>600,8734=>600,8735=>600,8736=>600,8737=>600,8738=>600,8739=>600,8740=>600,8741=>600,
-8742=>600,8743=>600,8744=>600,8745=>600,8746=>600,8747=>600,8748=>600,8749=>600,8750=>600,8751=>600,
-8752=>600,8754=>600,8755=>600,8756=>600,8757=>600,8758=>600,8759=>600,8760=>600,8761=>600,8762=>600,
-8763=>600,8764=>600,8765=>600,8768=>600,8769=>600,8770=>600,8771=>600,8772=>600,8773=>600,8774=>600,
-8775=>600,8776=>600,8777=>600,8778=>600,8779=>600,8780=>600,8781=>600,8784=>600,8785=>600,8786=>600,
-8787=>600,8788=>600,8789=>600,8790=>600,8791=>600,8792=>600,8793=>600,8794=>600,8795=>600,8796=>600,
-8797=>600,8798=>600,8799=>600,8800=>600,8801=>600,8802=>600,8803=>600,8804=>600,8805=>600,8806=>600,
-8807=>600,8808=>600,8809=>600,8810=>600,8811=>600,8812=>600,8813=>600,8814=>600,8815=>600,8816=>600,
-8817=>600,8818=>600,8819=>600,8820=>600,8821=>600,8822=>600,8823=>600,8824=>600,8825=>600,8826=>600,
-8827=>600,8828=>600,8829=>600,8830=>600,8831=>600,8832=>600,8833=>600,8834=>600,8835=>600,8836=>600,
-8837=>600,8838=>600,8839=>600,8840=>600,8841=>600,8842=>600,8843=>600,8844=>600,8845=>600,8846=>600,
-8847=>600,8848=>600,8849=>600,8850=>600,8851=>600,8852=>600,8853=>600,8854=>600,8855=>600,8856=>600,
-8857=>600,8858=>600,8859=>600,8860=>600,8861=>600,8862=>600,8863=>600,8866=>600,8867=>600,8868=>600,
-8869=>600,8870=>600,8871=>600,8872=>600,8873=>600,8874=>600,8875=>600,8876=>600,8877=>600,8878=>600,
-8879=>600,8882=>600,8883=>600,8884=>600,8885=>600,8891=>600,8892=>600,8893=>600,8894=>600,8896=>600,
-8897=>600,8898=>600,8899=>600,8900=>600,8901=>600,8902=>600,8903=>600,8904=>600,8909=>600,8910=>600,
-8911=>600,8912=>600,8913=>600,8914=>600,8915=>600,8924=>600,8925=>600,8926=>600,8927=>600,8928=>600,
-8929=>600,8930=>600,8931=>600,8938=>600,8939=>600,8940=>600,8941=>600,8942=>600,8943=>600,8944=>600,
-8945=>600,8960=>600,8962=>600,8963=>600,8964=>600,8965=>600,8966=>600,8968=>600,8969=>600,8970=>600,
-8971=>600,8972=>600,8973=>600,8974=>600,8975=>600,8976=>600,8978=>600,8980=>600,8981=>600,8984=>600,
-8985=>600,8988=>600,8989=>600,8990=>600,8991=>600,8992=>600,8993=>600,8994=>600,8995=>600,8996=>600,
-8997=>600,8998=>600,8999=>600,9001=>600,9002=>600,9003=>600,9004=>600,9014=>600,9015=>600,9016=>600,
-9017=>600,9018=>600,9019=>600,9020=>600,9021=>600,9022=>600,9023=>600,9024=>600,9025=>600,9026=>600,
-9027=>600,9028=>600,9029=>600,9030=>600,9031=>600,9032=>600,9033=>600,9034=>600,9035=>600,9036=>600,
-9037=>600,9038=>600,9039=>600,9040=>600,9041=>600,9042=>600,9043=>600,9044=>600,9045=>600,9046=>600,
-9047=>600,9048=>600,9049=>600,9050=>600,9051=>600,9052=>600,9053=>600,9054=>600,9055=>600,9056=>600,
-9057=>600,9058=>600,9059=>600,9060=>600,9061=>600,9062=>600,9063=>600,9064=>600,9065=>600,9066=>600,
-9067=>600,9068=>600,9069=>600,9070=>600,9071=>600,9072=>600,9073=>600,9074=>600,9075=>600,9076=>600,
-9077=>600,9078=>600,9079=>600,9080=>600,9081=>600,9082=>600,9084=>600,9085=>600,9086=>600,9087=>600,
-9088=>600,9089=>600,9090=>600,9091=>600,9092=>600,9093=>600,9094=>600,9095=>600,9096=>600,9097=>600,
-9098=>600,9099=>600,9100=>600,9101=>600,9102=>600,9103=>600,9104=>600,9105=>600,9106=>600,9107=>600,
-9108=>600,9109=>600,9110=>600,9111=>600,9112=>600,9113=>600,9114=>600,9115=>600,9116=>600,9117=>600,
-9118=>600,9119=>600,9120=>600,9121=>600,9122=>600,9123=>600,9124=>600,9125=>600,9126=>600,9127=>600,
-9128=>600,9129=>600,9130=>600,9131=>600,9132=>600,9133=>600,9134=>600,9135=>600,9136=>600,9137=>600,
-9138=>600,9139=>600,9140=>600,9141=>600,9142=>600,9143=>600,9146=>600,9147=>600,9148=>600,9149=>600,
-9150=>600,9151=>600,9152=>600,9153=>600,9154=>600,9155=>600,9156=>600,9157=>600,9158=>600,9159=>600,
-9160=>600,9161=>600,9162=>600,9163=>600,9164=>600,9165=>600,9166=>600,9167=>600,9178=>600,9179=>600,
-9182=>600,9183=>600,9186=>600,9187=>600,9188=>600,9189=>600,9190=>600,9251=>600,9280=>600,9281=>600,
-9282=>600,9283=>600,9284=>600,9285=>600,9286=>600,9287=>600,9288=>600,9289=>600,9290=>600,9312=>600,
-9313=>600,9314=>600,9315=>600,9316=>600,9317=>600,9318=>600,9319=>600,9320=>600,9321=>600,9472=>600,
-9473=>600,9474=>600,9475=>600,9476=>600,9477=>600,9478=>600,9479=>600,9480=>600,9481=>600,9482=>600,
-9483=>600,9484=>600,9485=>600,9486=>600,9487=>600,9488=>600,9489=>600,9490=>600,9491=>600,9492=>600,
-9493=>600,9494=>600,9495=>600,9496=>600,9497=>600,9498=>600,9499=>600,9500=>600,9501=>600,9502=>600,
-9503=>600,9504=>600,9505=>600,9506=>600,9507=>600,9508=>600,9509=>600,9510=>600,9511=>600,9512=>600,
-9513=>600,9514=>600,9515=>600,9516=>600,9517=>600,9518=>600,9519=>600,9520=>600,9521=>600,9522=>600,
-9523=>600,9524=>600,9525=>600,9526=>600,9527=>600,9528=>600,9529=>600,9530=>600,9531=>600,9532=>600,
-9533=>600,9534=>600,9535=>600,9536=>600,9537=>600,9538=>600,9539=>600,9540=>600,9541=>600,9542=>600,
-9543=>600,9544=>600,9545=>600,9546=>600,9547=>600,9548=>600,9549=>600,9550=>600,9551=>600,9552=>600,
-9553=>600,9554=>600,9555=>600,9556=>600,9557=>600,9558=>600,9559=>600,9560=>600,9561=>600,9562=>600,
-9563=>600,9564=>600,9565=>600,9566=>600,9567=>600,9568=>600,9569=>600,9570=>600,9571=>600,9572=>600,
-9573=>600,9574=>600,9575=>600,9576=>600,9577=>600,9578=>600,9579=>600,9580=>600,9581=>600,9582=>600,
-9583=>600,9584=>600,9585=>600,9586=>600,9587=>600,9588=>600,9589=>600,9590=>600,9591=>600,9592=>600,
-9593=>600,9594=>600,9595=>600,9596=>600,9597=>600,9598=>600,9599=>600,9600=>600,9601=>600,9602=>600,
-9603=>600,9604=>600,9605=>600,9606=>600,9607=>600,9608=>600,9609=>600,9610=>600,9611=>600,9612=>600,
-9613=>600,9614=>600,9615=>600,9616=>600,9617=>600,9618=>600,9619=>600,9620=>600,9621=>600,9622=>600,
-9623=>600,9624=>600,9625=>600,9626=>600,9627=>600,9628=>600,9629=>600,9630=>600,9631=>600,9632=>600,
-9633=>600,9634=>600,9635=>600,9636=>600,9637=>600,9638=>600,9639=>600,9640=>600,9641=>600,9642=>600,
-9643=>600,9644=>600,9645=>600,9646=>600,9647=>600,9648=>600,9649=>600,9650=>600,9651=>600,9652=>600,
-9653=>600,9654=>600,9655=>600,9656=>600,9657=>600,9658=>600,9659=>600,9660=>600,9661=>600,9662=>600,
-9663=>600,9664=>600,9665=>600,9666=>600,9667=>600,9668=>600,9669=>600,9670=>600,9671=>600,9672=>600,
-9673=>600,9674=>600,9675=>600,9676=>600,9677=>600,9678=>600,9679=>600,9680=>600,9681=>600,9682=>600,
-9683=>600,9684=>600,9685=>600,9686=>600,9687=>600,9688=>600,9689=>600,9690=>600,9691=>600,9692=>600,
-9693=>600,9694=>600,9695=>600,9696=>600,9697=>600,9698=>600,9699=>600,9700=>600,9701=>600,9702=>600,
-9703=>600,9704=>600,9705=>600,9706=>600,9707=>600,9708=>600,9709=>600,9710=>600,9711=>600,9712=>600,
-9713=>600,9714=>600,9715=>600,9716=>600,9717=>600,9718=>600,9719=>600,9720=>600,9721=>600,9722=>600,
-9723=>600,9724=>600,9725=>600,9726=>600,9727=>600,9728=>600,9729=>600,9730=>600,9731=>600,9733=>600,
-9734=>600,9735=>600,9736=>600,9737=>600,9744=>600,9745=>600,9746=>600,9754=>600,9755=>600,9756=>600,
-9757=>600,9758=>600,9759=>600,9766=>600,9768=>600,9769=>600,9774=>600,9775=>600,9776=>600,9777=>600,
-9778=>600,9779=>600,9780=>600,9781=>600,9782=>600,9783=>600,9785=>600,9786=>600,9787=>600,9788=>600,
-9789=>600,9790=>600,9791=>600,9792=>600,9793=>600,9794=>600,9795=>600,9796=>600,9797=>600,9798=>600,
-9799=>600,9800=>600,9801=>600,9802=>600,9803=>600,9804=>600,9805=>600,9806=>600,9807=>600,9808=>600,
-9809=>600,9810=>600,9811=>600,9824=>600,9825=>600,9826=>600,9827=>600,9828=>600,9829=>600,9830=>600,
-9831=>600,9833=>600,9834=>600,9835=>600,9836=>600,9837=>600,9838=>600,9839=>600,9856=>600,9857=>600,
-9858=>600,9859=>600,9860=>600,9861=>600,10176=>600,10177=>600,10178=>600,10179=>600,10180=>600,10181=>600,
-10182=>600,10183=>600,10184=>600,10185=>600,10186=>600,10188=>600,10192=>600,10193=>600,10194=>600,10195=>600,
-10196=>600,10197=>600,10198=>600,10199=>600,10212=>600,10213=>600,10214=>600,10215=>600,10216=>600,10217=>600,
-10218=>600,10219=>600,10226=>600,10227=>600,10229=>600,10230=>600,10231=>600,10232=>600,10233=>600,10234=>600,
-10235=>600,10236=>600,10240=>600,10241=>600,10242=>600,10243=>600,10244=>600,10245=>600,10246=>600,10247=>600,
-10248=>600,10249=>600,10250=>600,10251=>600,10252=>600,10253=>600,10254=>600,10255=>600,10256=>600,10257=>600,
-10258=>600,10259=>600,10260=>600,10261=>600,10262=>600,10263=>600,10264=>600,10265=>600,10266=>600,10267=>600,
-10268=>600,10269=>600,10270=>600,10271=>600,10272=>600,10273=>600,10274=>600,10275=>600,10276=>600,10277=>600,
-10278=>600,10279=>600,10280=>600,10281=>600,10282=>600,10283=>600,10284=>600,10285=>600,10286=>600,10287=>600,
-10288=>600,10289=>600,10290=>600,10291=>600,10292=>600,10293=>600,10294=>600,10295=>600,10296=>600,10297=>600,
-10298=>600,10299=>600,10300=>600,10301=>600,10302=>600,10303=>600,10304=>600,10305=>600,10306=>600,10307=>600,
-10308=>600,10309=>600,10310=>600,10311=>600,10312=>600,10313=>600,10314=>600,10315=>600,10316=>600,10317=>600,
-10318=>600,10319=>600,10320=>600,10321=>600,10322=>600,10323=>600,10324=>600,10325=>600,10326=>600,10327=>600,
-10328=>600,10329=>600,10330=>600,10331=>600,10332=>600,10333=>600,10334=>600,10335=>600,10336=>600,10337=>600,
-10338=>600,10339=>600,10340=>600,10341=>600,10342=>600,10343=>600,10344=>600,10345=>600,10346=>600,10347=>600,
-10348=>600,10349=>600,10350=>600,10351=>600,10352=>600,10353=>600,10354=>600,10355=>600,10356=>600,10357=>600,
-10358=>600,10359=>600,10360=>600,10361=>600,10362=>600,10363=>600,10364=>600,10365=>600,10366=>600,10367=>600,
-10368=>600,10369=>600,10370=>600,10371=>600,10372=>600,10373=>600,10374=>600,10375=>600,10376=>600,10377=>600,
-10378=>600,10379=>600,10380=>600,10381=>600,10382=>600,10383=>600,10384=>600,10385=>600,10386=>600,10387=>600,
-10388=>600,10389=>600,10390=>600,10391=>600,10392=>600,10393=>600,10394=>600,10395=>600,10396=>600,10397=>600,
-10398=>600,10399=>600,10400=>600,10401=>600,10402=>600,10403=>600,10404=>600,10405=>600,10406=>600,10407=>600,
-10408=>600,10409=>600,10410=>600,10411=>600,10412=>600,10413=>600,10414=>600,10415=>600,10416=>600,10417=>600,
-10418=>600,10419=>600,10420=>600,10421=>600,10422=>600,10423=>600,10424=>600,10425=>600,10426=>600,10427=>600,
-10428=>600,10429=>600,10430=>600,10431=>600,10432=>600,10433=>600,10434=>600,10435=>600,10436=>600,10437=>600,
-10438=>600,10439=>600,10440=>600,10441=>600,10442=>600,10443=>600,10444=>600,10445=>600,10446=>600,10447=>600,
-10448=>600,10449=>600,10450=>600,10451=>600,10452=>600,10453=>600,10454=>600,10455=>600,10456=>600,10457=>600,
-10458=>600,10459=>600,10460=>600,10461=>600,10462=>600,10463=>600,10464=>600,10465=>600,10466=>600,10467=>600,
-10468=>600,10469=>600,10470=>600,10471=>600,10472=>600,10473=>600,10474=>600,10475=>600,10476=>600,10477=>600,
-10478=>600,10479=>600,10480=>600,10481=>600,10482=>600,10483=>600,10484=>600,10485=>600,10486=>600,10487=>600,
-10488=>600,10489=>600,10490=>600,10491=>600,10492=>600,10493=>600,10494=>600,10495=>600,10752=>600,10753=>600,
-10754=>600,10755=>600,10756=>600,10757=>600,10758=>600,10781=>600,10815=>600,11008=>600,11009=>600,11010=>600,
-11011=>600,11012=>600,11013=>600,11014=>600,11015=>600,11016=>600,11017=>600,11018=>600,11019=>600,11020=>600,
-11021=>600,11026=>600,11027=>600,11028=>600,11029=>600,11030=>600,11031=>600,11032=>600,11033=>600,11035=>600,
-11036=>600,11037=>600,11038=>600,11039=>600,11040=>600,11041=>600,11042=>600,11043=>600,11044=>600,11045=>600,
-11046=>600,11047=>600,11048=>600,11049=>600,11050=>600,11051=>600,11091=>600,11092=>600,64256=>600,64257=>600,
-64258=>600,64259=>600,64260=>600,64261=>600,64285=>600,64286=>600,64287=>600,64288=>600,64289=>600,64290=>600,
-64291=>600,64292=>600,64293=>600,64294=>600,64295=>600,64296=>600,64297=>600,64298=>600,64299=>600,64300=>600,
-64301=>600,64302=>600,64303=>600,64304=>600,64305=>600,64306=>600,64307=>600,64308=>600,64309=>600,64310=>600,
-64312=>600,64313=>600,64314=>600,64315=>600,64316=>600,64318=>600,64320=>600,64321=>600,64323=>600,64324=>600,
-64326=>600,64327=>600,64328=>600,64329=>600,64330=>600,64331=>600,64332=>600,64333=>600,64334=>600,64335=>600,
-65533=>600);
-$enc='';
-$diff='';
-$file='freemono.z';
-$ctg='freemono.ctg.z';
-$originalsize=314348;
-?>
\ No newline at end of file
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freemono.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freemono.z
deleted file mode 100644
index 0353139d..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freemono.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freemonob.ctg.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freemonob.ctg.z
deleted file mode 100644
index 40443bbe..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freemonob.ctg.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freemonob.php b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freemonob.php
deleted file mode 100644
index 3d4cfe40..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freemonob.php
+++ /dev/null
@@ -1,204 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='FreeMonoBold';
-$desc=array('Ascent'=>800,'Descent'=>-200,'CapHeight'=>10,'Flags'=>32,'FontBBox'=>'[-604 -200 754 800]','ItalicAngle'=>0,'StemV'=>120,'MissingWidth'=>600);
-$up=-125;
-$ut=50;
-$dw=600;
-$cw=array(
-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,8364=>600,8218=>600,402=>600,8222=>600,8230=>600,
-8224=>600,8225=>600,710=>600,8240=>600,352=>600,8249=>600,338=>600,381=>600,8216=>600,8217=>600,
-8220=>600,8221=>600,8226=>600,8211=>600,8212=>600,732=>600,8482=>600,353=>600,8250=>600,339=>600,
-382=>600,376=>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,256=>600,257=>600,
-258=>600,259=>600,260=>600,261=>600,262=>600,263=>600,264=>600,265=>600,266=>600,267=>600,
-268=>600,269=>600,270=>600,271=>600,272=>600,273=>600,274=>600,275=>600,276=>600,277=>600,
-278=>600,279=>600,280=>600,281=>600,282=>600,283=>600,284=>600,285=>600,286=>600,287=>600,
-288=>600,289=>600,290=>600,291=>600,292=>600,293=>600,294=>600,295=>600,296=>600,297=>600,
-298=>600,299=>600,300=>600,301=>600,302=>600,303=>600,304=>600,305=>600,306=>600,307=>600,
-308=>600,309=>600,310=>600,311=>600,312=>600,313=>600,314=>600,315=>600,316=>600,317=>600,
-318=>600,319=>600,320=>600,321=>600,322=>600,323=>600,324=>600,325=>600,326=>600,327=>600,
-328=>600,329=>600,330=>600,331=>600,332=>600,333=>600,334=>600,335=>600,336=>600,337=>600,
-340=>600,341=>600,342=>600,343=>600,344=>600,345=>600,346=>600,347=>600,348=>600,349=>600,
-350=>600,351=>600,354=>600,355=>600,356=>600,357=>600,358=>600,359=>600,360=>600,361=>600,
-362=>600,363=>600,364=>600,365=>600,366=>600,367=>600,368=>600,369=>600,370=>600,371=>600,
-372=>600,373=>600,374=>600,375=>600,377=>600,378=>600,379=>600,380=>600,383=>600,384=>600,
-385=>600,386=>600,387=>600,388=>600,389=>600,390=>600,391=>600,392=>600,393=>600,394=>600,
-395=>600,396=>600,397=>600,398=>600,399=>600,400=>600,401=>600,403=>600,404=>600,405=>600,
-406=>600,407=>600,408=>600,409=>600,410=>600,411=>600,412=>600,413=>600,414=>600,415=>600,
-416=>600,417=>600,418=>600,419=>600,420=>600,421=>600,422=>600,423=>600,424=>600,425=>600,
-426=>600,427=>600,428=>600,429=>600,430=>600,431=>600,432=>600,433=>600,434=>600,435=>600,
-436=>600,437=>600,438=>600,439=>600,440=>600,441=>600,442=>600,443=>600,444=>600,445=>600,
-446=>600,447=>600,448=>600,449=>600,450=>600,451=>600,452=>600,453=>600,454=>600,455=>600,
-456=>600,457=>600,458=>600,459=>600,460=>600,461=>600,462=>600,463=>600,464=>600,465=>600,
-466=>600,467=>600,468=>600,469=>600,470=>600,471=>600,472=>600,473=>600,474=>600,475=>600,
-476=>600,477=>600,478=>600,479=>600,480=>600,481=>600,482=>600,483=>600,484=>600,485=>600,
-486=>600,487=>600,488=>600,489=>600,490=>600,491=>600,492=>600,493=>600,494=>600,495=>600,
-496=>600,497=>600,498=>600,499=>600,500=>600,501=>600,502=>600,503=>600,504=>600,505=>600,
-506=>600,507=>600,508=>600,509=>600,510=>600,511=>600,512=>600,513=>600,514=>600,515=>600,
-516=>600,517=>600,518=>600,519=>600,520=>600,521=>600,522=>600,523=>600,524=>600,525=>600,
-526=>600,527=>600,528=>600,529=>600,530=>600,531=>600,532=>600,533=>600,534=>600,535=>600,
-536=>600,537=>600,538=>600,539=>600,540=>600,541=>600,542=>600,543=>600,548=>600,549=>600,
-550=>600,551=>600,552=>600,553=>600,554=>600,555=>600,556=>600,557=>600,558=>600,559=>600,
-560=>600,561=>600,562=>600,563=>600,567=>600,592=>600,593=>600,594=>600,595=>600,596=>600,
-598=>600,599=>600,600=>600,601=>600,603=>600,604=>600,607=>600,608=>600,609=>600,613=>600,
-614=>600,615=>600,616=>600,617=>600,618=>600,619=>600,621=>600,623=>600,624=>600,625=>600,
-626=>600,627=>600,628=>600,629=>600,633=>600,634=>600,635=>600,636=>600,637=>600,638=>600,
-639=>600,640=>600,641=>600,642=>600,643=>600,644=>600,645=>600,647=>600,648=>600,649=>600,
-652=>600,653=>600,654=>600,656=>600,657=>600,658=>600,659=>600,660=>600,661=>600,662=>600,
-663=>600,664=>600,665=>600,666=>600,667=>600,668=>600,669=>600,670=>600,671=>600,672=>600,
-673=>600,674=>600,688=>600,689=>600,690=>600,691=>600,692=>600,693=>600,694=>600,695=>600,
-696=>600,697=>600,698=>600,699=>600,700=>600,701=>600,702=>600,703=>600,704=>600,705=>600,
-706=>600,707=>600,708=>600,709=>600,711=>600,712=>600,713=>600,714=>600,715=>600,716=>600,
-717=>600,718=>600,719=>600,720=>600,721=>600,722=>600,723=>600,724=>600,725=>600,726=>600,
-727=>600,728=>600,729=>600,730=>600,731=>600,733=>600,734=>600,735=>600,736=>600,737=>600,
-738=>600,739=>600,740=>600,741=>600,742=>600,743=>600,744=>600,745=>600,746=>600,747=>600,
-748=>600,749=>600,750=>600,751=>600,752=>600,753=>600,754=>600,755=>600,756=>600,757=>600,
-758=>600,759=>600,760=>600,761=>600,762=>600,763=>600,764=>600,765=>600,766=>600,767=>600,
-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,795=>0,796=>0,800=>0,801=>0,802=>0,803=>0,
-804=>0,805=>0,806=>0,807=>0,808=>0,809=>0,810=>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,826=>0,
-827=>0,831=>0,832=>0,833=>0,834=>0,835=>0,836=>0,838=>0,839=>0,840=>0,
-844=>0,849=>0,850=>0,851=>0,852=>0,853=>0,854=>0,855=>0,884=>600,885=>600,
-890=>600,894=>600,900=>600,901=>600,902=>600,903=>600,904=>600,905=>600,906=>600,908=>600,
-910=>600,911=>600,912=>600,913=>600,914=>600,915=>600,916=>600,917=>600,918=>600,919=>600,
-920=>600,921=>600,922=>600,923=>600,924=>600,925=>600,926=>600,927=>600,928=>600,929=>600,
-931=>600,932=>600,933=>600,934=>600,935=>600,936=>600,937=>600,938=>600,939=>600,940=>600,
-941=>600,942=>600,943=>600,944=>600,945=>600,946=>600,947=>600,948=>600,949=>600,950=>600,
-951=>600,952=>600,953=>600,954=>600,955=>600,956=>600,957=>600,958=>600,959=>600,960=>600,
-961=>600,962=>600,963=>600,964=>600,965=>600,966=>600,967=>600,968=>600,969=>600,970=>600,
-971=>600,972=>600,973=>600,974=>600,976=>600,977=>600,978=>600,979=>600,980=>600,981=>600,
-982=>600,986=>600,987=>600,988=>600,1008=>600,1009=>600,1012=>600,1013=>600,1024=>600,1025=>600,
-1026=>600,1027=>600,1028=>600,1029=>600,1030=>600,1031=>600,1032=>600,1033=>600,1034=>600,1035=>600,
-1036=>600,1037=>600,1038=>600,1039=>600,1040=>600,1041=>600,1042=>600,1043=>600,1044=>600,1045=>600,
-1046=>600,1047=>600,1048=>600,1049=>600,1050=>600,1051=>600,1052=>600,1053=>600,1054=>600,1055=>600,
-1056=>600,1057=>600,1058=>600,1059=>600,1060=>600,1061=>600,1062=>600,1063=>600,1064=>600,1065=>600,
-1066=>600,1067=>600,1068=>600,1069=>600,1070=>600,1071=>600,1072=>600,1073=>600,1074=>600,1075=>600,
-1076=>600,1077=>600,1078=>600,1079=>600,1080=>600,1081=>600,1082=>600,1083=>600,1084=>600,1085=>600,
-1086=>600,1087=>600,1088=>600,1089=>600,1090=>600,1091=>600,1092=>600,1093=>600,1094=>600,1095=>600,
-1096=>600,1097=>600,1098=>600,1099=>600,1100=>600,1101=>600,1102=>600,1103=>600,1104=>600,1105=>600,
-1106=>600,1107=>600,1108=>600,1109=>600,1110=>600,1111=>600,1112=>600,1113=>600,1114=>600,1115=>600,
-1116=>600,1117=>600,1118=>600,1119=>600,1136=>600,1137=>600,1138=>600,1156=>0,1157=>0,1158=>0,
-1162=>600,1163=>600,1164=>600,1165=>600,1166=>600,1167=>600,1168=>600,1169=>600,1170=>600,1171=>600,
-1172=>600,1173=>600,1174=>600,1175=>600,1176=>600,1177=>600,1178=>600,1179=>600,1180=>600,1181=>600,
-1182=>600,1183=>600,1184=>600,1185=>600,1186=>600,1187=>600,1188=>600,1189=>600,1190=>600,1191=>600,
-1192=>600,1193=>600,1194=>600,1195=>600,1196=>600,1197=>600,1198=>600,1199=>600,1200=>600,1201=>600,
-1202=>600,1203=>600,1204=>600,1205=>600,1206=>600,1207=>600,1208=>600,1209=>600,1210=>600,1211=>600,
-1212=>600,1213=>600,1214=>600,1215=>600,1216=>600,1217=>600,1218=>600,1219=>600,1220=>600,1221=>600,
-1222=>600,1223=>600,1224=>600,1225=>600,1226=>600,1227=>600,1228=>600,1229=>600,1230=>600,1231=>600,
-1232=>600,1233=>600,1234=>600,1235=>600,1236=>600,1237=>600,1238=>600,1239=>600,1240=>600,1241=>600,
-1242=>600,1243=>600,1244=>600,1245=>600,1246=>600,1247=>600,1248=>600,1249=>600,1250=>600,1251=>600,
-1252=>600,1253=>600,1254=>600,1255=>600,1256=>600,1257=>600,1258=>600,1259=>600,1260=>600,1261=>600,
-1262=>600,1263=>600,1264=>600,1265=>600,1266=>600,1267=>600,1268=>600,1269=>600,1270=>600,1271=>600,
-1272=>600,1273=>600,1296=>600,1297=>600,1298=>600,1299=>600,1306=>600,1307=>600,1308=>600,1309=>600,
-1310=>600,1311=>600,1456=>0,1457=>0,1458=>0,1459=>0,1460=>0,1461=>0,1462=>0,1463=>0,
-1464=>0,1465=>0,1467=>0,1468=>0,1469=>0,1470=>600,1471=>0,1472=>600,1473=>0,1474=>0,
-1475=>600,1476=>0,1488=>600,1489=>600,1490=>600,1491=>600,1492=>600,1493=>600,1494=>600,1495=>600,
-1496=>600,1497=>600,1498=>600,1499=>600,1500=>600,1501=>600,1502=>600,1503=>600,1504=>600,1505=>600,
-1506=>600,1507=>600,1508=>600,1509=>600,1510=>600,1511=>600,1512=>600,1513=>600,1514=>600,1520=>600,
-1521=>600,1522=>600,1523=>600,1524=>600,4304=>600,4305=>600,4306=>600,4307=>600,4308=>600,4309=>600,
-4310=>600,4311=>600,4312=>600,4313=>600,4314=>600,4315=>600,4316=>600,4317=>600,4318=>600,4319=>600,
-4320=>600,4321=>600,4322=>600,4323=>600,4324=>600,4325=>600,4326=>600,4327=>600,4328=>600,4329=>600,
-4330=>600,4331=>600,4332=>600,4333=>600,4334=>600,4335=>600,4336=>600,4337=>600,4338=>600,4339=>600,
-4340=>600,4341=>600,4345=>600,4347=>600,7680=>600,7681=>600,7682=>600,7683=>600,7684=>600,7685=>600,
-7686=>600,7687=>600,7688=>600,7689=>600,7690=>600,7691=>600,7692=>600,7693=>600,7694=>600,7695=>600,
-7696=>600,7697=>600,7698=>600,7699=>600,7700=>600,7701=>600,7702=>600,7703=>600,7704=>600,7705=>600,
-7706=>600,7707=>600,7708=>600,7709=>600,7710=>600,7711=>600,7712=>600,7713=>600,7714=>600,7715=>600,
-7716=>600,7717=>600,7718=>600,7719=>600,7720=>600,7721=>600,7722=>600,7723=>600,7724=>600,7725=>600,
-7726=>600,7727=>600,7728=>600,7729=>600,7730=>600,7731=>600,7732=>600,7733=>600,7734=>600,7735=>600,
-7736=>600,7737=>600,7738=>600,7739=>600,7740=>600,7741=>600,7742=>600,7743=>600,7744=>600,7745=>600,
-7746=>600,7747=>600,7748=>600,7749=>600,7750=>600,7751=>600,7752=>600,7753=>600,7754=>600,7755=>600,
-7756=>600,7757=>600,7758=>600,7759=>600,7760=>600,7761=>600,7762=>600,7763=>600,7764=>600,7765=>600,
-7766=>600,7767=>600,7768=>600,7769=>600,7770=>600,7771=>600,7772=>600,7773=>600,7774=>600,7775=>600,
-7776=>600,7777=>600,7778=>600,7779=>600,7780=>600,7781=>600,7782=>600,7783=>600,7784=>600,7785=>600,
-7786=>600,7787=>600,7788=>600,7789=>600,7790=>600,7791=>600,7792=>600,7793=>600,7794=>600,7795=>600,
-7796=>600,7797=>600,7798=>600,7799=>600,7800=>600,7801=>600,7802=>600,7803=>600,7804=>600,7805=>600,
-7806=>600,7807=>600,7808=>600,7809=>600,7810=>600,7811=>600,7812=>600,7813=>600,7814=>600,7815=>600,
-7816=>600,7817=>600,7818=>600,7819=>600,7820=>600,7821=>600,7822=>600,7823=>600,7824=>600,7825=>600,
-7826=>600,7827=>600,7828=>600,7829=>600,7830=>600,7831=>600,7832=>600,7833=>600,7834=>600,7835=>600,
-7840=>600,7841=>600,7842=>600,7843=>600,7844=>600,7845=>600,7846=>600,7847=>600,7848=>600,7849=>600,
-7850=>600,7851=>600,7852=>600,7853=>600,7854=>600,7855=>600,7856=>600,7857=>600,7858=>600,7859=>600,
-7860=>600,7861=>600,7862=>600,7863=>600,7864=>600,7865=>600,7866=>600,7867=>600,7868=>600,7869=>600,
-7870=>600,7871=>600,7872=>600,7873=>600,7874=>600,7875=>600,7876=>600,7877=>600,7878=>600,7879=>600,
-7880=>600,7881=>600,7882=>600,7883=>600,7884=>600,7885=>600,7886=>600,7887=>600,7888=>600,7889=>600,
-7890=>600,7891=>600,7892=>600,7893=>600,7894=>600,7895=>600,7896=>600,7897=>600,7898=>600,7899=>600,
-7900=>600,7901=>600,7902=>600,7903=>600,7904=>600,7905=>600,7906=>600,7907=>600,7908=>600,7909=>600,
-7910=>600,7911=>600,7912=>600,7913=>600,7914=>600,7915=>600,7916=>600,7917=>600,7918=>600,7919=>600,
-7920=>600,7921=>600,7922=>600,7923=>600,7924=>600,7925=>600,7926=>600,7927=>600,7928=>600,7929=>600,
-8192=>600,8193=>600,8194=>600,8195=>600,8196=>600,8197=>600,8198=>600,8199=>600,8200=>600,8201=>600,
-8202=>600,8203=>600,8204=>0,8205=>0,8206=>0,8207=>0,8208=>600,8209=>600,8210=>600,8213=>600,
-8214=>600,8215=>600,8219=>600,8223=>600,8227=>600,8228=>600,8229=>600,8231=>600,8232=>600,8233=>600,
-8234=>600,8235=>600,8236=>600,8237=>600,8238=>600,8239=>600,8241=>600,8242=>600,8243=>600,8244=>600,
-8245=>600,8246=>600,8247=>600,8248=>600,8251=>600,8252=>600,8253=>600,8254=>600,8255=>600,8256=>600,
-8257=>600,8258=>600,8259=>600,8260=>600,8261=>600,8262=>600,8263=>600,8264=>600,8265=>600,8266=>600,
-8267=>600,8268=>600,8269=>600,8270=>600,8271=>600,8272=>600,8273=>600,8274=>600,8275=>600,8276=>600,
-8277=>600,8278=>600,8279=>600,8280=>600,8281=>600,8282=>600,8283=>600,8284=>600,8285=>600,8286=>600,
-8287=>600,8288=>600,8289=>600,8290=>600,8291=>600,8292=>600,8298=>600,8299=>600,8300=>600,8301=>600,
-8302=>600,8303=>600,8304=>600,8305=>600,8308=>600,8309=>600,8310=>600,8311=>600,8312=>600,8313=>600,
-8314=>600,8315=>600,8316=>600,8317=>600,8318=>600,8319=>600,8320=>600,8321=>600,8322=>600,8323=>600,
-8324=>600,8325=>600,8326=>600,8327=>600,8328=>600,8329=>600,8330=>600,8331=>600,8332=>600,8333=>600,
-8334=>600,8336=>600,8337=>600,8338=>600,8339=>600,8340=>600,8355=>600,8356=>600,8362=>600,8373=>600,
-8448=>600,8449=>600,8451=>600,8453=>600,8454=>600,8457=>600,8465=>600,8466=>600,8470=>600,8472=>600,
-8476=>600,8481=>600,8486=>600,8487=>600,8489=>600,8490=>600,8491=>600,8498=>600,8501=>600,8502=>600,
-8503=>600,8504=>600,8506=>600,8507=>600,8523=>600,8531=>600,8532=>600,8533=>600,8534=>600,8535=>600,
-8536=>600,8537=>600,8538=>600,8539=>600,8540=>600,8541=>600,8542=>600,8543=>600,8544=>600,8545=>600,
-8546=>600,8547=>600,8548=>600,8549=>600,8550=>600,8553=>600,8556=>600,8557=>600,8558=>600,8559=>600,
-8560=>600,8564=>600,8569=>600,8572=>600,8573=>600,8574=>600,8575=>600,8592=>600,8593=>600,8594=>600,
-8595=>600,8704=>600,8706=>600,8707=>600,8709=>600,8710=>600,8711=>600,8712=>600,8713=>600,8715=>600,
-8716=>600,8721=>600,8722=>600,8723=>600,8725=>600,8730=>600,8733=>600,8734=>600,8735=>600,8756=>600,
-8800=>600,8801=>600,8804=>600,8805=>600,8834=>600,8835=>600,8836=>600,8837=>600,8838=>600,8839=>600,
-8869=>600,8976=>600,9001=>600,9002=>600,9251=>600,9472=>600,9473=>600,9474=>600,9475=>600,9476=>600,
-9477=>600,9478=>600,9479=>600,9480=>600,9481=>600,9482=>600,9483=>600,9484=>600,9485=>600,9486=>600,
-9487=>600,9488=>600,9489=>600,9490=>600,9491=>600,9492=>600,9493=>600,9494=>600,9495=>600,9496=>600,
-9497=>600,9498=>600,9499=>600,9500=>600,9501=>600,9502=>600,9503=>600,9504=>600,9505=>600,9506=>600,
-9507=>600,9508=>600,9509=>600,9510=>600,9511=>600,9512=>600,9513=>600,9514=>600,9515=>600,9516=>600,
-9517=>600,9518=>600,9519=>600,9520=>600,9521=>600,9522=>600,9523=>600,9524=>600,9525=>600,9526=>600,
-9527=>600,9528=>600,9529=>600,9530=>600,9531=>600,9532=>600,9533=>600,9534=>600,9535=>600,9536=>600,
-9537=>600,9538=>600,9539=>600,9540=>600,9541=>600,9542=>600,9543=>600,9544=>600,9545=>600,9546=>600,
-9547=>600,9548=>600,9549=>600,9550=>600,9551=>600,9552=>600,9553=>600,9554=>600,9555=>600,9556=>600,
-9557=>600,9558=>600,9559=>600,9560=>600,9561=>600,9562=>600,9563=>600,9564=>600,9565=>600,9566=>600,
-9567=>600,9568=>600,9569=>600,9570=>600,9571=>600,9572=>600,9573=>600,9574=>600,9575=>600,9576=>600,
-9577=>600,9578=>600,9579=>600,9580=>600,9581=>600,9582=>600,9583=>600,9584=>600,9585=>600,9586=>600,
-9587=>600,9588=>600,9589=>600,9590=>600,9591=>600,9592=>600,9593=>600,9594=>600,9595=>600,9596=>600,
-9597=>600,9598=>600,9599=>600,9600=>600,9601=>600,9602=>600,9603=>600,9604=>600,9605=>600,9606=>600,
-9607=>600,9608=>600,9609=>600,9610=>600,9611=>600,9612=>600,9613=>600,9614=>600,9615=>600,9616=>600,
-9617=>600,9618=>600,9619=>600,9620=>600,9621=>600,9632=>600,9633=>600,9635=>600,9636=>600,9637=>600,
-9638=>600,9639=>600,9640=>600,9641=>600,9642=>600,9643=>600,9644=>600,9645=>600,9646=>600,9647=>600,
-9648=>600,9649=>600,9650=>600,9651=>600,9652=>600,9653=>600,9654=>600,9655=>600,9656=>600,9657=>600,
-9658=>600,9660=>600,9661=>600,9662=>600,9663=>600,9664=>600,9665=>600,9666=>600,9667=>600,9668=>600,
-9669=>600,9670=>600,9671=>600,9673=>600,9674=>600,9675=>600,9677=>600,9679=>600,9680=>600,9681=>600,
-9682=>600,9683=>600,9684=>600,9685=>600,9686=>600,9687=>600,9688=>600,9689=>600,9698=>600,9699=>600,
-9700=>600,9701=>600,9702=>600,9703=>600,9704=>600,9705=>600,9706=>600,9707=>600,9708=>600,9709=>600,
-9710=>600,9712=>600,9713=>600,9714=>600,9715=>600,9716=>600,9717=>600,9718=>600,9719=>600,9735=>600,
-9736=>600,9737=>600,9776=>600,9777=>600,9778=>600,9779=>600,9780=>600,9781=>600,9782=>600,9783=>600,
-9785=>600,9786=>600,9787=>600,9824=>600,9825=>600,9826=>600,9827=>600,9828=>600,9829=>600,9830=>600,
-9831=>600,9833=>600,9834=>600,9835=>600,9836=>600,9837=>600,9838=>600,9839=>600,64256=>600,64257=>600,
-64258=>600,64285=>600,64287=>600,64288=>600,64298=>600,64299=>600,64300=>600,64301=>600,64302=>600,64303=>600,
-64304=>600,64305=>600,64306=>600,64307=>600,64308=>600,64309=>600,64310=>600,64312=>600,64313=>600,64314=>600,
-64315=>600,64316=>600,64318=>600,64320=>600,64321=>600,64323=>600,64324=>600,64326=>600,64327=>600,64328=>600,
-64329=>600,64330=>600,64331=>600,64332=>600,64333=>600,64334=>600,64335=>600,65533=>600);
-$enc='';
-$diff='';
-$file='freemonob.z';
-$ctg='freemonob.ctg.z';
-$originalsize=164212;
-?>
\ No newline at end of file
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freemonob.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freemonob.z
deleted file mode 100644
index 84b1dec7..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freemonob.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freemonobi.ctg.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freemonobi.ctg.z
deleted file mode 100644
index efaebb08..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freemonobi.ctg.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freemonobi.php b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freemonobi.php
deleted file mode 100644
index 05e95d42..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freemonobi.php
+++ /dev/null
@@ -1,153 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='FreeMonoBoldOblique';
-$desc=array('Ascent'=>800,'Descent'=>-200,'CapHeight'=>19,'Flags'=>96,'FontBBox'=>'[-644 -200 833 800]','ItalicAngle'=>-12,'StemV'=>120,'MissingWidth'=>600);
-$up=-125;
-$ut=50;
-$dw=600;
-$cw=array(
-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,8364=>600,8218=>600,402=>600,8222=>600,8230=>600,
-8224=>600,8225=>600,710=>600,8240=>600,352=>600,8249=>600,338=>600,381=>600,8216=>600,8217=>600,
-8220=>600,8221=>600,8226=>600,8211=>600,8212=>600,732=>600,8482=>600,353=>600,8250=>600,339=>600,
-382=>600,376=>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,256=>600,257=>600,
-258=>600,259=>600,260=>600,261=>600,262=>600,263=>600,264=>600,265=>600,266=>600,267=>600,
-268=>600,269=>600,270=>600,271=>600,272=>600,273=>600,274=>600,275=>600,276=>600,277=>600,
-278=>600,279=>600,280=>600,281=>600,282=>600,283=>600,284=>600,285=>600,286=>600,287=>600,
-288=>600,289=>600,290=>600,291=>600,292=>600,293=>600,294=>600,295=>600,296=>600,297=>600,
-298=>600,299=>600,300=>600,301=>600,302=>600,303=>600,304=>600,305=>600,306=>600,307=>600,
-308=>600,309=>600,310=>600,311=>600,312=>600,313=>600,314=>600,315=>600,316=>600,317=>600,
-318=>600,319=>600,320=>600,321=>600,322=>600,323=>600,324=>600,325=>600,326=>600,327=>600,
-328=>600,329=>600,330=>600,331=>600,332=>600,333=>600,334=>600,335=>600,336=>600,337=>600,
-340=>600,341=>600,342=>600,343=>600,344=>600,345=>600,346=>600,347=>600,348=>600,349=>600,
-350=>600,351=>600,354=>600,355=>600,356=>600,357=>600,358=>600,359=>600,360=>600,361=>600,
-362=>600,363=>600,364=>600,365=>600,366=>600,367=>600,368=>600,369=>600,370=>600,371=>600,
-372=>600,373=>600,374=>600,375=>600,377=>600,378=>600,379=>600,380=>600,383=>600,384=>600,
-385=>600,386=>600,387=>600,388=>600,389=>600,390=>600,391=>600,392=>600,393=>600,394=>600,
-395=>600,396=>600,397=>600,398=>600,399=>600,400=>600,401=>600,403=>600,404=>600,405=>600,
-406=>600,407=>600,408=>600,409=>600,410=>600,411=>600,412=>600,413=>600,414=>600,415=>600,
-416=>600,417=>600,418=>600,419=>600,420=>600,421=>600,422=>600,423=>600,424=>600,425=>600,
-426=>600,427=>600,428=>600,429=>600,430=>600,431=>600,432=>600,433=>600,434=>600,435=>600,
-436=>600,437=>600,438=>600,439=>600,440=>600,441=>600,442=>600,443=>600,444=>600,445=>600,
-446=>600,447=>600,448=>600,449=>600,450=>600,451=>600,452=>600,453=>600,454=>600,455=>600,
-456=>600,457=>600,458=>600,459=>600,460=>600,461=>600,462=>600,463=>600,464=>600,465=>600,
-466=>600,467=>600,468=>600,469=>600,470=>600,471=>600,472=>600,473=>600,474=>600,475=>600,
-476=>600,477=>600,478=>600,479=>600,480=>600,481=>600,482=>600,483=>600,484=>600,485=>600,
-486=>600,487=>600,488=>600,489=>600,490=>600,491=>600,492=>600,493=>600,494=>600,495=>600,
-496=>600,497=>600,498=>600,499=>600,500=>600,501=>600,502=>600,503=>600,504=>600,505=>600,
-506=>600,507=>600,508=>600,509=>600,510=>600,511=>600,512=>600,513=>600,514=>600,515=>600,
-516=>600,517=>600,518=>600,519=>600,520=>600,521=>600,522=>600,523=>600,524=>600,525=>600,
-526=>600,527=>600,528=>600,529=>600,530=>600,531=>600,532=>600,533=>600,534=>600,535=>600,
-536=>600,537=>600,538=>600,539=>600,540=>600,541=>600,542=>600,543=>600,548=>600,549=>600,
-550=>600,551=>600,552=>600,553=>600,554=>600,555=>600,556=>600,557=>600,558=>600,559=>600,
-560=>600,561=>600,562=>600,563=>600,567=>600,592=>600,593=>600,594=>600,595=>600,596=>600,
-598=>600,599=>600,600=>600,601=>600,603=>600,604=>600,607=>600,608=>600,609=>600,613=>600,
-614=>600,615=>600,616=>600,617=>600,618=>600,619=>600,621=>600,623=>600,624=>600,625=>600,
-626=>600,627=>600,628=>600,629=>600,633=>600,634=>600,635=>600,636=>600,637=>600,638=>600,
-639=>600,640=>600,641=>600,642=>600,643=>600,644=>600,645=>600,647=>600,648=>600,649=>600,
-652=>600,653=>600,654=>600,656=>600,657=>600,658=>600,659=>600,660=>600,661=>600,662=>600,
-663=>600,664=>600,665=>600,666=>600,667=>600,668=>600,669=>600,670=>600,671=>600,672=>600,
-673=>600,674=>600,697=>600,698=>600,699=>600,700=>600,701=>600,702=>600,703=>600,704=>600,
-705=>600,706=>600,707=>600,708=>600,709=>600,711=>600,712=>600,713=>600,714=>600,715=>600,
-716=>600,717=>600,718=>600,719=>600,720=>600,721=>600,722=>600,723=>600,724=>600,725=>600,
-726=>600,727=>600,728=>600,729=>600,730=>600,731=>600,733=>600,734=>600,735=>600,741=>600,
-742=>600,743=>600,744=>600,745=>600,746=>600,747=>600,748=>600,749=>600,750=>600,751=>600,
-752=>600,753=>600,754=>600,755=>600,756=>600,757=>600,758=>600,759=>600,760=>600,761=>600,
-762=>600,763=>600,764=>600,765=>600,766=>600,767=>600,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,
-795=>0,796=>0,800=>0,801=>0,802=>0,803=>0,804=>0,805=>0,806=>0,807=>0,
-808=>0,809=>0,810=>0,812=>0,813=>0,814=>0,815=>0,816=>0,817=>0,818=>0,
-819=>0,820=>0,821=>0,822=>0,825=>0,826=>0,827=>0,831=>0,832=>0,833=>0,
-834=>0,835=>0,836=>0,838=>0,839=>0,840=>0,844=>0,849=>0,850=>0,851=>0,
-852=>0,853=>0,854=>0,855=>0,884=>600,885=>600,890=>600,894=>600,900=>600,901=>600,
-902=>600,903=>600,904=>600,905=>600,906=>600,908=>600,910=>600,911=>600,912=>600,913=>600,
-914=>600,915=>600,916=>600,917=>600,918=>600,919=>600,920=>600,921=>600,922=>600,923=>600,
-924=>600,925=>600,926=>600,927=>600,928=>600,929=>600,931=>600,932=>600,933=>600,934=>600,
-935=>600,936=>600,937=>600,938=>600,939=>600,940=>600,941=>600,942=>600,943=>600,944=>600,
-945=>600,946=>600,947=>600,948=>600,949=>600,950=>600,951=>600,952=>600,953=>600,954=>600,
-955=>600,956=>600,957=>600,958=>600,959=>600,960=>600,961=>600,962=>600,963=>600,964=>600,
-965=>600,966=>600,967=>600,968=>600,969=>600,970=>600,971=>600,972=>600,973=>600,974=>600,
-976=>600,977=>600,978=>600,979=>600,980=>600,981=>600,982=>600,986=>600,987=>600,988=>600,
-1008=>600,1009=>600,1012=>600,1013=>600,1024=>600,1025=>600,1026=>600,1027=>600,1028=>600,1029=>600,
-1030=>600,1031=>600,1032=>600,1033=>600,1034=>600,1035=>600,1036=>600,1037=>600,1038=>600,1039=>600,
-1040=>600,1041=>600,1042=>600,1043=>600,1044=>600,1045=>600,1046=>600,1047=>600,1048=>600,1049=>600,
-1050=>600,1051=>600,1052=>600,1053=>600,1054=>600,1055=>600,1056=>600,1057=>600,1058=>600,1059=>600,
-1060=>600,1061=>600,1062=>600,1063=>600,1064=>600,1065=>600,1066=>600,1067=>600,1068=>600,1069=>600,
-1070=>600,1071=>600,1072=>600,1073=>600,1074=>600,1075=>600,1076=>600,1077=>600,1078=>600,1079=>600,
-1080=>600,1081=>600,1082=>600,1083=>600,1084=>600,1085=>600,1086=>600,1087=>600,1088=>600,1089=>600,
-1090=>600,1091=>600,1092=>600,1093=>600,1094=>600,1095=>600,1096=>600,1097=>600,1098=>600,1099=>600,
-1100=>600,1101=>600,1102=>600,1103=>600,1104=>600,1105=>600,1106=>600,1107=>600,1108=>600,1109=>600,
-1110=>600,1111=>600,1112=>600,1113=>600,1114=>600,1115=>600,1116=>600,1117=>600,1118=>600,1119=>600,
-1136=>600,1137=>600,1138=>600,1156=>0,1157=>0,1158=>0,1162=>600,1163=>600,1164=>600,1165=>600,
-1166=>600,1167=>600,1168=>600,1169=>600,1170=>600,1171=>600,1172=>600,1173=>600,1174=>600,1175=>600,
-1176=>600,1177=>600,1178=>600,1179=>600,1180=>600,1181=>600,1182=>600,1183=>600,1184=>600,1185=>600,
-1186=>600,1187=>600,1188=>600,1189=>600,1190=>600,1191=>600,1192=>600,1193=>600,1194=>600,1195=>600,
-1196=>600,1197=>600,1198=>600,1199=>600,1200=>600,1201=>600,1202=>600,1203=>600,1204=>600,1205=>600,
-1206=>600,1207=>600,1208=>600,1209=>600,1210=>600,1211=>600,1212=>600,1213=>600,1214=>600,1215=>600,
-1216=>600,1217=>600,1218=>600,1219=>600,1220=>600,1221=>600,1222=>600,1223=>600,1224=>600,1225=>600,
-1226=>600,1227=>600,1228=>600,1229=>600,1230=>600,1231=>600,1232=>600,1233=>600,1234=>600,1235=>600,
-1236=>600,1237=>600,1238=>600,1239=>600,1240=>600,1241=>600,1242=>600,1243=>600,1244=>600,1245=>600,
-1246=>600,1247=>600,1248=>600,1249=>600,1250=>600,1251=>600,1252=>600,1253=>600,1254=>600,1255=>600,
-1256=>600,1257=>600,1258=>600,1259=>600,1260=>600,1261=>600,1262=>600,1263=>600,1264=>600,1265=>600,
-1266=>600,1267=>600,1268=>600,1269=>600,1270=>600,1271=>600,1272=>600,1273=>600,1296=>600,1297=>600,
-1298=>600,1299=>600,1306=>600,1307=>600,1308=>600,1309=>600,1310=>600,1311=>600,1456=>0,1457=>0,
-1458=>0,1459=>0,1460=>0,1461=>0,1462=>0,1463=>0,1464=>0,1465=>0,1467=>0,1468=>0,
-1469=>0,1470=>0,1471=>0,1472=>600,1473=>0,1474=>0,1475=>600,1476=>0,1488=>600,1489=>600,
-1490=>600,1491=>600,1492=>600,1493=>600,1494=>600,1495=>600,1496=>600,1497=>600,1498=>600,1499=>600,
-1500=>600,1501=>600,1502=>600,1503=>600,1504=>600,1505=>600,1506=>600,1507=>600,1508=>600,1509=>600,
-1510=>600,1511=>600,1512=>600,1513=>600,1514=>600,1520=>600,1521=>600,1522=>600,1523=>600,1524=>600,
-4304=>600,4305=>600,4306=>600,4307=>600,4308=>600,4309=>600,4310=>600,4311=>600,4312=>600,4313=>600,
-4314=>600,4315=>600,4316=>600,4317=>600,4318=>600,4319=>600,4320=>600,4321=>600,4322=>600,4323=>600,
-4324=>600,4325=>600,4326=>600,4327=>600,4328=>600,4329=>600,4330=>600,4331=>600,4332=>600,4333=>600,
-4334=>600,4335=>600,4336=>600,4337=>600,4338=>600,4339=>600,4340=>600,4341=>600,4345=>600,4347=>600,
-8192=>600,8193=>600,8194=>600,8195=>600,8196=>600,8197=>600,8198=>600,8199=>600,8200=>600,8201=>600,
-8202=>600,8203=>600,8204=>0,8205=>0,8206=>0,8207=>0,8208=>600,8209=>600,8210=>600,8213=>600,
-8214=>600,8215=>600,8219=>600,8223=>600,8227=>600,8228=>600,8229=>600,8231=>600,8232=>600,8233=>600,
-8234=>600,8235=>600,8236=>600,8237=>600,8238=>600,8239=>600,8241=>600,8242=>600,8243=>600,8244=>600,
-8245=>600,8246=>600,8247=>600,8248=>600,8251=>600,8252=>600,8253=>600,8254=>600,8255=>600,8256=>600,
-8257=>600,8258=>600,8259=>600,8260=>600,8261=>600,8262=>600,8263=>600,8264=>600,8265=>600,8266=>600,
-8267=>600,8268=>600,8269=>600,8270=>600,8271=>600,8272=>600,8273=>600,8274=>600,8275=>600,8276=>600,
-8277=>600,8278=>600,8279=>600,8280=>600,8281=>600,8282=>600,8283=>600,8284=>600,8285=>600,8286=>600,
-8287=>600,8288=>600,8289=>600,8290=>600,8291=>600,8292=>600,8298=>600,8299=>600,8300=>600,8301=>600,
-8302=>600,8303=>600,8304=>600,8305=>600,8308=>600,8309=>600,8310=>600,8311=>600,8312=>600,8313=>600,
-8314=>600,8315=>600,8316=>600,8317=>600,8318=>600,8319=>600,8320=>600,8321=>600,8322=>600,8323=>600,
-8324=>600,8325=>600,8326=>600,8327=>600,8328=>600,8329=>600,8330=>600,8331=>600,8332=>600,8333=>600,
-8334=>600,8336=>600,8337=>600,8338=>600,8339=>600,8340=>600,8362=>600,8373=>600,8448=>600,8449=>600,
-8451=>600,8453=>600,8454=>600,8457=>600,8465=>600,8466=>600,8470=>600,8472=>600,8476=>600,8481=>600,
-8486=>600,8487=>600,8489=>600,8490=>600,8491=>600,8498=>600,8501=>600,8502=>600,8503=>600,8504=>600,
-8506=>600,8507=>600,8523=>600,8531=>600,8532=>600,8533=>600,8534=>600,8535=>600,8536=>600,8537=>600,
-8538=>600,8539=>600,8540=>600,8541=>600,8542=>600,8543=>600,8544=>600,8545=>600,8546=>600,8547=>600,
-8548=>600,8549=>600,8550=>600,8553=>600,8556=>600,8557=>600,8558=>600,8559=>600,8560=>600,8564=>600,
-8569=>600,8572=>600,8573=>600,8574=>600,8575=>600,8592=>600,8593=>600,8594=>600,8595=>600,8704=>600,
-8706=>600,8707=>600,8710=>600,8711=>600,8712=>600,8713=>600,8715=>600,8716=>600,8721=>600,8722=>600,
-8723=>600,8725=>600,8730=>600,8733=>600,8734=>600,8756=>600,8800=>600,8801=>600,8804=>600,8805=>600,
-9251=>600,9674=>600,9824=>600,9825=>600,9826=>600,9827=>600,9828=>600,9829=>600,9830=>600,9831=>600,
-9833=>600,9834=>600,9835=>600,9836=>600,9837=>600,9838=>600,9839=>600,64256=>600,64257=>600,64258=>600,
-64285=>600,64287=>600,64288=>600,64298=>600,64299=>600,64300=>600,64301=>600,64302=>600,64303=>600,64304=>600,
-64305=>600,64306=>600,64307=>600,64308=>600,64309=>600,64310=>600,64312=>600,64313=>600,64314=>600,64315=>600,
-64316=>600,64318=>600,64320=>600,64321=>600,64323=>600,64324=>600,64326=>600,64327=>600,64328=>600,64329=>600,
-64330=>600,64331=>600,64332=>600,64333=>600,64334=>600,64335=>600,65533=>600);
-$enc='';
-$diff='';
-$file='freemonobi.z';
-$ctg='freemonobi.ctg.z';
-$originalsize=145080;
-?>
\ No newline at end of file
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freemonobi.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freemonobi.z
deleted file mode 100644
index b31acfb1..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freemonobi.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freemonoi.ctg.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freemonoi.ctg.z
deleted file mode 100644
index 36e92ec0..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freemonoi.ctg.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freemonoi.php b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freemonoi.php
deleted file mode 100644
index 11cc061b..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freemonoi.php
+++ /dev/null
@@ -1,221 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='FreeMonoOblique';
-$desc=array('Ascent'=>800,'Descent'=>-200,'CapHeight'=>44,'Flags'=>96,'FontBBox'=>'[-644 -200 816 800]','ItalicAngle'=>-12,'StemV'=>70,'MissingWidth'=>600);
-$up=-125;
-$ut=50;
-$dw=600;
-$cw=array(
-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,8364=>600,8218=>600,402=>600,8222=>600,8230=>600,
-8224=>600,8225=>600,710=>600,8240=>600,352=>600,8249=>600,338=>600,381=>600,8216=>600,8217=>600,
-8220=>600,8221=>600,8226=>600,8211=>600,8212=>600,732=>600,8482=>600,353=>600,8250=>600,339=>600,
-382=>600,376=>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,256=>600,257=>600,
-258=>600,259=>600,260=>600,261=>600,262=>600,263=>600,264=>600,265=>600,266=>600,267=>600,
-268=>600,269=>600,270=>600,271=>600,272=>600,273=>600,274=>600,275=>600,276=>600,277=>600,
-278=>600,279=>600,280=>600,281=>600,282=>600,283=>600,284=>600,285=>600,286=>600,287=>600,
-288=>600,289=>600,290=>600,291=>600,292=>600,293=>600,294=>600,295=>600,296=>600,297=>600,
-298=>600,299=>600,300=>600,301=>600,302=>600,303=>600,304=>600,305=>600,306=>600,307=>600,
-308=>600,309=>600,310=>600,311=>600,312=>600,313=>600,314=>600,315=>600,316=>600,317=>600,
-318=>600,319=>600,320=>600,321=>600,322=>600,323=>600,324=>600,325=>600,326=>600,327=>600,
-328=>600,329=>600,330=>600,331=>600,332=>600,333=>600,334=>600,335=>600,336=>600,337=>600,
-340=>600,341=>600,342=>600,343=>600,344=>600,345=>600,346=>600,347=>600,348=>600,349=>600,
-350=>600,351=>600,354=>600,355=>600,356=>600,357=>600,358=>600,359=>600,360=>600,361=>600,
-362=>600,363=>600,364=>600,365=>600,366=>600,367=>600,368=>600,369=>600,370=>600,371=>600,
-372=>600,373=>600,374=>600,375=>600,377=>600,378=>600,379=>600,380=>600,383=>600,384=>600,
-385=>600,386=>600,387=>600,388=>600,389=>600,390=>600,391=>600,392=>600,393=>600,394=>600,
-395=>600,396=>600,397=>600,398=>600,399=>600,400=>600,401=>600,403=>600,404=>600,405=>600,
-406=>600,407=>600,408=>600,409=>600,410=>600,411=>600,412=>600,413=>600,414=>600,415=>600,
-416=>600,417=>600,418=>600,419=>600,420=>600,421=>600,422=>600,423=>600,424=>600,425=>600,
-426=>600,427=>600,428=>600,429=>600,430=>600,431=>600,432=>600,433=>600,434=>600,435=>600,
-436=>600,437=>600,438=>600,439=>600,440=>600,441=>600,442=>600,443=>600,444=>600,445=>600,
-446=>600,447=>600,448=>600,449=>600,450=>600,451=>600,452=>600,453=>600,454=>600,455=>600,
-456=>600,457=>600,458=>600,459=>600,460=>600,461=>600,462=>600,463=>600,464=>600,465=>600,
-466=>600,467=>600,468=>600,469=>600,470=>600,471=>600,472=>600,473=>600,474=>600,475=>600,
-476=>600,477=>600,478=>600,479=>600,480=>600,481=>600,482=>600,483=>600,484=>600,485=>600,
-486=>600,487=>600,488=>600,489=>600,490=>600,491=>600,492=>600,493=>600,494=>600,495=>600,
-496=>600,497=>600,498=>600,499=>600,500=>600,501=>600,502=>600,503=>600,504=>600,505=>600,
-506=>600,507=>600,508=>600,509=>600,510=>600,511=>600,512=>600,513=>600,514=>600,515=>600,
-516=>600,517=>600,518=>600,519=>600,520=>600,521=>600,522=>600,523=>600,524=>600,525=>600,
-526=>600,527=>600,528=>600,529=>600,530=>600,531=>600,532=>600,533=>600,534=>600,535=>600,
-536=>600,537=>600,538=>600,539=>600,540=>600,541=>600,542=>600,543=>600,548=>600,549=>600,
-550=>600,551=>600,552=>600,553=>600,554=>600,555=>600,556=>600,557=>600,558=>600,559=>600,
-560=>600,561=>600,562=>600,563=>600,567=>600,592=>600,593=>600,594=>600,595=>600,596=>600,
-597=>600,598=>600,599=>600,600=>600,601=>600,602=>600,603=>600,604=>600,607=>600,608=>600,
-609=>600,610=>600,611=>600,612=>600,613=>600,614=>600,615=>600,616=>600,617=>600,618=>600,
-619=>600,620=>600,621=>600,622=>600,623=>600,624=>600,625=>600,626=>600,627=>600,628=>600,
-629=>600,630=>600,632=>600,633=>600,634=>600,635=>600,636=>600,637=>600,638=>600,639=>600,
-640=>600,641=>600,642=>600,643=>600,644=>600,645=>600,646=>600,647=>600,648=>600,649=>600,
-651=>600,652=>600,653=>600,654=>600,655=>600,656=>600,657=>600,658=>600,660=>600,661=>600,
-662=>600,663=>600,664=>600,665=>600,667=>600,668=>600,669=>600,670=>600,671=>600,672=>600,
-673=>600,674=>600,679=>600,688=>600,689=>600,690=>600,691=>600,692=>600,693=>600,694=>600,
-695=>600,696=>600,697=>600,698=>600,699=>600,700=>600,701=>600,702=>600,703=>600,704=>600,
-705=>600,706=>600,707=>600,708=>600,709=>600,711=>600,712=>600,713=>600,714=>600,715=>600,
-716=>600,717=>600,718=>600,719=>600,720=>600,721=>600,722=>600,723=>600,724=>600,725=>600,
-726=>600,727=>600,728=>600,729=>600,730=>600,731=>600,733=>600,734=>600,735=>600,736=>600,
-737=>600,738=>600,739=>600,740=>600,741=>600,742=>600,743=>600,744=>600,745=>600,746=>600,
-747=>600,748=>600,749=>600,750=>600,751=>600,752=>600,753=>600,754=>600,755=>600,756=>600,
-757=>600,758=>600,759=>600,760=>600,761=>600,762=>600,763=>600,764=>600,765=>600,766=>600,
-767=>600,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,795=>0,796=>0,800=>0,
-803=>0,804=>0,805=>0,806=>0,807=>0,808=>0,809=>0,810=>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,831=>0,832=>0,833=>0,834=>0,835=>0,836=>0,
-838=>0,839=>0,840=>0,844=>0,849=>0,850=>0,851=>0,852=>0,853=>0,854=>0,
-855=>0,884=>600,885=>600,890=>600,894=>600,900=>600,901=>600,902=>600,903=>600,904=>600,
-905=>600,906=>600,908=>600,910=>600,911=>600,912=>600,913=>600,914=>600,915=>600,916=>600,
-917=>600,918=>600,919=>600,920=>600,921=>600,922=>600,923=>600,924=>600,925=>600,926=>600,
-927=>600,928=>600,929=>600,931=>600,932=>600,933=>600,934=>600,935=>600,936=>600,937=>600,
-938=>600,939=>600,940=>600,941=>600,942=>600,943=>600,944=>600,945=>600,946=>600,947=>600,
-948=>600,949=>600,950=>600,951=>600,952=>600,953=>600,954=>600,955=>600,956=>600,957=>600,
-958=>600,959=>600,960=>600,961=>600,962=>600,963=>600,964=>600,965=>600,966=>600,967=>600,
-968=>600,969=>600,970=>600,971=>600,972=>600,973=>600,974=>600,976=>600,977=>600,978=>600,
-979=>600,980=>600,981=>600,982=>600,986=>600,987=>600,988=>600,1008=>600,1009=>600,1012=>600,
-1013=>600,1024=>600,1025=>600,1026=>600,1027=>600,1028=>600,1029=>600,1030=>600,1031=>600,1032=>600,
-1033=>600,1034=>600,1035=>600,1036=>600,1037=>600,1038=>600,1039=>600,1040=>600,1041=>600,1042=>600,
-1043=>600,1044=>600,1045=>600,1046=>600,1047=>600,1048=>600,1049=>600,1050=>600,1051=>600,1052=>600,
-1053=>600,1054=>600,1055=>600,1056=>600,1057=>600,1058=>600,1059=>600,1060=>600,1061=>600,1062=>600,
-1063=>600,1064=>600,1065=>600,1066=>600,1067=>600,1068=>600,1069=>600,1070=>600,1071=>600,1072=>600,
-1073=>600,1074=>600,1075=>600,1076=>600,1077=>600,1078=>600,1079=>600,1080=>600,1081=>600,1082=>600,
-1083=>600,1084=>600,1085=>600,1086=>600,1087=>600,1088=>600,1089=>600,1090=>600,1091=>600,1092=>600,
-1093=>600,1094=>600,1095=>600,1096=>600,1097=>600,1098=>600,1099=>600,1100=>600,1101=>600,1102=>600,
-1103=>600,1104=>600,1105=>600,1106=>600,1107=>600,1108=>600,1109=>600,1110=>600,1111=>600,1112=>600,
-1113=>600,1114=>600,1115=>600,1116=>600,1117=>600,1118=>600,1119=>600,1120=>600,1121=>600,1122=>600,
-1123=>600,1124=>600,1126=>600,1127=>600,1128=>600,1130=>600,1131=>600,1132=>600,1133=>600,1136=>600,
-1137=>600,1138=>600,1140=>600,1141=>600,1142=>600,1143=>600,1155=>0,1156=>0,1157=>0,1158=>0,
-1159=>0,1162=>600,1163=>600,1164=>600,1165=>600,1166=>600,1167=>600,1168=>600,1169=>600,1170=>600,
-1171=>600,1172=>600,1173=>600,1174=>600,1175=>600,1176=>600,1177=>600,1178=>600,1179=>600,1180=>600,
-1181=>600,1182=>600,1183=>600,1184=>600,1185=>600,1186=>600,1187=>600,1188=>600,1189=>600,1190=>600,
-1191=>600,1192=>600,1193=>600,1194=>600,1195=>600,1196=>600,1197=>600,1198=>600,1199=>600,1200=>600,
-1201=>600,1202=>600,1203=>600,1204=>600,1205=>600,1206=>600,1207=>600,1208=>600,1209=>600,1210=>600,
-1211=>600,1212=>600,1213=>600,1214=>600,1215=>600,1216=>600,1217=>600,1218=>600,1219=>600,1220=>600,
-1221=>600,1222=>600,1223=>600,1224=>600,1225=>600,1226=>600,1227=>600,1228=>600,1229=>600,1230=>600,
-1231=>600,1232=>600,1233=>600,1234=>600,1235=>600,1236=>600,1237=>600,1238=>600,1239=>600,1240=>600,
-1241=>600,1242=>600,1243=>600,1244=>600,1245=>600,1246=>600,1247=>600,1248=>600,1249=>600,1250=>600,
-1251=>600,1252=>600,1253=>600,1254=>600,1255=>600,1256=>600,1257=>600,1258=>600,1259=>600,1260=>600,
-1261=>600,1262=>600,1263=>600,1264=>600,1265=>600,1266=>600,1267=>600,1268=>600,1269=>600,1270=>600,
-1271=>600,1272=>600,1273=>600,1296=>600,1297=>600,1298=>600,1299=>600,1306=>600,1307=>600,1308=>600,
-1309=>600,1310=>600,1311=>600,1329=>600,1330=>600,1331=>600,1332=>600,1333=>600,1334=>600,1335=>600,
-1336=>600,1337=>600,1338=>600,1339=>600,1340=>600,1341=>600,1342=>600,1343=>600,1344=>600,1345=>600,
-1346=>600,1347=>600,1348=>600,1349=>600,1350=>600,1351=>600,1352=>600,1353=>600,1354=>600,1355=>600,
-1356=>600,1357=>600,1358=>600,1359=>600,1360=>600,1361=>600,1362=>600,1363=>600,1364=>600,1365=>600,
-1366=>600,1369=>600,1370=>600,1371=>600,1372=>600,1373=>600,1374=>600,1375=>600,1377=>600,1378=>600,
-1379=>600,1380=>600,1381=>600,1382=>600,1383=>600,1384=>600,1385=>600,1386=>600,1387=>600,1388=>600,
-1389=>600,1390=>600,1391=>600,1392=>600,1393=>600,1394=>600,1395=>600,1396=>600,1397=>600,1398=>600,
-1399=>600,1400=>600,1401=>600,1402=>600,1403=>600,1404=>600,1405=>600,1406=>600,1407=>600,1408=>600,
-1409=>600,1410=>600,1411=>600,1412=>600,1413=>600,1414=>600,1415=>600,1417=>600,1418=>600,1456=>0,
-1457=>0,1458=>0,1459=>0,1460=>0,1461=>0,1462=>0,1463=>0,1464=>0,1465=>0,1467=>0,
-1468=>0,1469=>0,1470=>600,1471=>0,1472=>600,1473=>0,1474=>0,1475=>600,1476=>0,1488=>600,
-1489=>600,1490=>600,1491=>600,1492=>600,1493=>600,1494=>600,1495=>600,1496=>600,1497=>600,1498=>600,
-1499=>600,1500=>600,1501=>600,1502=>600,1503=>600,1504=>600,1505=>600,1506=>600,1507=>600,1508=>600,
-1509=>600,1510=>600,1511=>600,1512=>600,1513=>600,1514=>600,1520=>600,1521=>600,1522=>600,1523=>600,
-1524=>600,4304=>600,4305=>600,4306=>600,4307=>600,4308=>600,4309=>600,4310=>600,4311=>600,4312=>600,
-4313=>600,4314=>600,4315=>600,4316=>600,4317=>600,4318=>600,4319=>600,4320=>600,4321=>600,4322=>600,
-4323=>600,4324=>600,4325=>600,4326=>600,4327=>600,4328=>600,4329=>600,4330=>600,4331=>600,4332=>600,
-4333=>600,4334=>600,4335=>600,4336=>600,4337=>600,4338=>600,4339=>600,4340=>600,4341=>600,4345=>600,
-4347=>600,7680=>600,7681=>600,7682=>600,7683=>600,7684=>600,7685=>600,7686=>600,7687=>600,7688=>600,
-7689=>600,7690=>600,7691=>600,7692=>600,7693=>600,7694=>600,7695=>600,7696=>600,7697=>600,7698=>600,
-7699=>600,7700=>600,7701=>600,7702=>600,7703=>600,7704=>600,7705=>600,7706=>600,7707=>600,7708=>600,
-7709=>600,7710=>600,7711=>600,7712=>600,7713=>600,7714=>600,7715=>600,7716=>600,7717=>600,7718=>600,
-7719=>600,7720=>600,7721=>600,7722=>600,7723=>600,7724=>600,7725=>600,7726=>600,7727=>600,7728=>600,
-7729=>600,7730=>600,7731=>600,7732=>600,7733=>600,7734=>600,7735=>600,7736=>600,7737=>600,7738=>600,
-7739=>600,7740=>600,7741=>600,7742=>600,7743=>600,7744=>600,7745=>600,7746=>600,7747=>600,7748=>600,
-7749=>600,7750=>600,7751=>600,7752=>600,7753=>600,7754=>600,7755=>600,7756=>600,7757=>600,7758=>600,
-7759=>600,7760=>600,7761=>600,7762=>600,7763=>600,7764=>600,7765=>600,7766=>600,7767=>600,7768=>600,
-7769=>600,7770=>600,7771=>600,7772=>600,7773=>600,7774=>600,7775=>600,7776=>600,7777=>600,7778=>600,
-7779=>600,7780=>600,7781=>600,7782=>600,7783=>600,7784=>600,7785=>600,7786=>600,7787=>600,7788=>600,
-7789=>600,7790=>600,7791=>600,7792=>600,7793=>600,7794=>600,7795=>600,7796=>600,7797=>600,7798=>600,
-7799=>600,7800=>600,7801=>600,7802=>600,7803=>600,7804=>600,7805=>600,7806=>600,7807=>600,7808=>600,
-7809=>600,7810=>600,7811=>600,7812=>600,7813=>600,7814=>600,7815=>600,7816=>600,7817=>600,7818=>600,
-7819=>600,7820=>600,7821=>600,7822=>600,7823=>600,7824=>600,7825=>600,7826=>600,7827=>600,7828=>600,
-7829=>600,7830=>600,7831=>600,7832=>600,7833=>600,7834=>600,7835=>600,7840=>600,7841=>600,7842=>600,
-7843=>600,7844=>600,7845=>600,7846=>600,7847=>600,7848=>600,7849=>600,7850=>600,7851=>600,7852=>600,
-7853=>600,7854=>600,7855=>600,7856=>600,7857=>600,7858=>600,7859=>600,7860=>600,7861=>600,7862=>600,
-7863=>600,7864=>600,7865=>600,7866=>600,7867=>600,7868=>600,7869=>600,7870=>600,7871=>600,7872=>600,
-7873=>600,7874=>600,7875=>600,7876=>600,7877=>600,7878=>600,7879=>600,7880=>600,7881=>600,7882=>600,
-7883=>600,7884=>600,7885=>600,7886=>600,7887=>600,7888=>600,7889=>600,7890=>600,7891=>600,7892=>600,
-7893=>600,7894=>600,7895=>600,7896=>600,7897=>600,7898=>600,7899=>600,7900=>600,7901=>600,7902=>600,
-7903=>600,7904=>600,7905=>600,7906=>600,7907=>600,7908=>600,7909=>600,7910=>600,7911=>600,7912=>600,
-7913=>600,7914=>600,7915=>600,7916=>600,7917=>600,7918=>600,7919=>600,7920=>600,7921=>600,7922=>600,
-7923=>600,7924=>600,7925=>600,7926=>600,7927=>600,7928=>600,7929=>600,7936=>600,7937=>600,7938=>600,
-7939=>600,7940=>600,7941=>600,7942=>600,7943=>600,7944=>600,7945=>600,7946=>600,7947=>600,7948=>600,
-7949=>600,7950=>600,7951=>600,7952=>600,7953=>600,7954=>600,7955=>600,7956=>600,7957=>600,7960=>600,
-7961=>600,7962=>600,7963=>600,7964=>600,7965=>600,7968=>600,7969=>600,7970=>600,7971=>600,7972=>600,
-7973=>600,7974=>600,7975=>600,7976=>600,7977=>600,7978=>600,7979=>600,7980=>600,7981=>600,7982=>600,
-7983=>600,7984=>600,7985=>600,7986=>600,7987=>600,7988=>600,7989=>600,7990=>600,7991=>600,7992=>600,
-7993=>600,7994=>600,7995=>600,7996=>600,7997=>600,7998=>600,7999=>600,8000=>600,8001=>600,8002=>600,
-8003=>600,8004=>600,8005=>600,8008=>600,8009=>600,8010=>600,8011=>600,8012=>600,8013=>600,8016=>600,
-8017=>600,8018=>600,8019=>600,8020=>600,8021=>600,8022=>600,8023=>600,8025=>600,8027=>600,8029=>600,
-8031=>600,8032=>600,8033=>600,8034=>600,8035=>600,8036=>600,8037=>600,8038=>600,8039=>600,8040=>600,
-8041=>600,8042=>600,8043=>600,8044=>600,8045=>600,8046=>600,8047=>600,8048=>600,8049=>600,8050=>600,
-8051=>600,8052=>600,8053=>600,8054=>600,8055=>600,8056=>600,8057=>600,8058=>600,8059=>600,8060=>600,
-8061=>600,8064=>600,8065=>600,8066=>600,8067=>600,8068=>600,8069=>600,8070=>600,8071=>600,8072=>600,
-8073=>600,8074=>600,8075=>600,8076=>600,8077=>600,8078=>600,8079=>600,8080=>600,8081=>600,8082=>600,
-8083=>600,8084=>600,8085=>600,8086=>600,8087=>600,8088=>600,8089=>600,8090=>600,8091=>600,8092=>600,
-8093=>600,8094=>600,8095=>600,8096=>600,8097=>600,8098=>600,8099=>600,8100=>600,8101=>600,8102=>600,
-8103=>600,8104=>600,8105=>600,8106=>600,8107=>600,8108=>600,8109=>600,8110=>600,8111=>600,8112=>600,
-8113=>600,8114=>600,8115=>600,8116=>600,8118=>600,8119=>600,8120=>600,8121=>600,8122=>600,8123=>600,
-8124=>600,8125=>600,8126=>600,8127=>600,8128=>600,8129=>600,8130=>600,8131=>600,8132=>600,8134=>600,
-8135=>600,8136=>600,8137=>600,8138=>600,8139=>600,8140=>600,8141=>600,8142=>600,8143=>600,8144=>600,
-8145=>600,8146=>600,8147=>600,8150=>600,8151=>600,8152=>600,8153=>600,8154=>600,8155=>600,8157=>600,
-8158=>600,8159=>600,8160=>600,8161=>600,8162=>600,8163=>600,8164=>600,8165=>600,8166=>600,8167=>600,
-8168=>600,8169=>600,8170=>600,8171=>600,8172=>600,8173=>600,8174=>600,8175=>600,8178=>600,8179=>600,
-8180=>600,8182=>600,8183=>600,8184=>600,8185=>600,8186=>600,8187=>600,8188=>600,8189=>600,8190=>600,
-8192=>600,8193=>600,8194=>600,8195=>600,8196=>600,8197=>600,8198=>600,8199=>600,8200=>600,8201=>600,
-8202=>600,8203=>600,8204=>0,8205=>0,8206=>0,8207=>0,8208=>600,8209=>600,8210=>600,8213=>600,
-8214=>600,8215=>600,8219=>600,8223=>600,8227=>600,8228=>600,8229=>600,8231=>600,8232=>600,8233=>600,
-8234=>600,8235=>600,8236=>600,8237=>600,8238=>600,8239=>600,8241=>600,8242=>600,8243=>600,8244=>600,
-8245=>600,8246=>600,8247=>600,8248=>600,8251=>600,8252=>600,8253=>600,8254=>600,8255=>600,8256=>600,
-8257=>600,8258=>600,8259=>600,8260=>600,8261=>600,8262=>600,8263=>600,8264=>600,8265=>600,8266=>600,
-8267=>600,8268=>600,8269=>600,8270=>600,8271=>600,8272=>600,8273=>600,8274=>600,8275=>600,8276=>600,
-8277=>600,8278=>600,8279=>600,8280=>600,8281=>600,8282=>600,8283=>600,8284=>600,8285=>600,8286=>600,
-8287=>600,8288=>600,8289=>600,8290=>600,8291=>600,8292=>600,8298=>600,8299=>600,8300=>600,8301=>600,
-8302=>600,8303=>600,8304=>600,8305=>600,8308=>600,8309=>600,8310=>600,8311=>600,8312=>600,8313=>600,
-8314=>600,8315=>600,8316=>600,8317=>600,8318=>600,8319=>600,8320=>600,8321=>600,8322=>600,8323=>600,
-8324=>600,8325=>600,8326=>600,8327=>600,8328=>600,8329=>600,8330=>600,8331=>600,8332=>600,8333=>600,
-8334=>600,8336=>600,8337=>600,8338=>600,8339=>600,8340=>600,8355=>600,8356=>600,8359=>600,8362=>600,
-8373=>600,8448=>600,8449=>600,8450=>600,8451=>600,8453=>600,8454=>600,8455=>600,8457=>600,8461=>600,
-8464=>600,8465=>600,8466=>600,8467=>600,8468=>600,8469=>600,8470=>600,8471=>600,8472=>600,8473=>600,
-8474=>600,8476=>600,8477=>600,8478=>600,8481=>600,8484=>600,8486=>600,8487=>600,8489=>600,8490=>600,
-8491=>600,8498=>600,8501=>600,8502=>600,8503=>600,8504=>600,8506=>600,8507=>600,8523=>600,8525=>600,
-8526=>600,8531=>600,8532=>600,8533=>600,8534=>600,8535=>600,8536=>600,8537=>600,8538=>600,8539=>600,
-8540=>600,8541=>600,8542=>600,8543=>600,8544=>600,8545=>600,8546=>600,8547=>600,8548=>600,8549=>600,
-8550=>600,8551=>600,8552=>600,8553=>600,8554=>600,8555=>600,8556=>600,8557=>600,8558=>600,8559=>600,
-8560=>600,8561=>600,8562=>600,8563=>600,8564=>600,8565=>600,8566=>600,8567=>600,8568=>600,8569=>600,
-8570=>600,8571=>600,8572=>600,8573=>600,8574=>600,8575=>600,8592=>600,8593=>600,8594=>600,8595=>600,
-8596=>600,8597=>600,8598=>600,8599=>600,8600=>600,8601=>600,8616=>600,8704=>600,8706=>600,8707=>600,
-8709=>600,8710=>600,8711=>600,8712=>600,8713=>600,8715=>600,8716=>600,8721=>600,8722=>600,8723=>600,
-8725=>600,8729=>600,8730=>600,8733=>600,8734=>600,8745=>600,8746=>600,8747=>600,8756=>600,8764=>600,
-8769=>600,8770=>600,8773=>600,8776=>600,8800=>600,8801=>600,8804=>600,8805=>600,8834=>600,8835=>600,
-8836=>600,8837=>600,8838=>600,8839=>600,9001=>600,9002=>600,9251=>600,9674=>600,9824=>600,9825=>600,
-9826=>600,9827=>600,9828=>600,9829=>600,9830=>600,9831=>600,9833=>600,9834=>600,9835=>600,9836=>600,
-9837=>600,9838=>600,9839=>600,64256=>600,64257=>600,64258=>600,64285=>600,64286=>600,64287=>600,64288=>600,
-64289=>600,64290=>600,64291=>600,64292=>600,64293=>600,64294=>600,64295=>600,64296=>600,64297=>600,64298=>600,
-64299=>600,64300=>600,64301=>600,64302=>600,64303=>600,64304=>600,64305=>600,64306=>600,64307=>600,64308=>600,
-64309=>600,64310=>600,64312=>600,64313=>600,64314=>600,64315=>600,64316=>600,64318=>600,64320=>600,64321=>600,
-64323=>600,64324=>600,64326=>600,64327=>600,64328=>600,64329=>600,64330=>600,64331=>600,64332=>600,64333=>600,
-64334=>600,64335=>600,65533=>600);
-$enc='';
-$diff='';
-$file='freemonoi.z';
-$ctg='freemonoi.ctg.z';
-$originalsize=196732;
-?>
\ No newline at end of file
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freemonoi.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freemonoi.z
deleted file mode 100644
index 93bf7d35..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freemonoi.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freesans.ctg.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freesans.ctg.z
deleted file mode 100644
index b3bf68c3..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freesans.ctg.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freesans.php b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freesans.php
deleted file mode 100644
index d10a3219..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freesans.php
+++ /dev/null
@@ -1,311 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='FreeSans';
-$desc=array('Ascent'=>1000,'Descent'=>-300,'CapHeight'=>22,'Flags'=>32,'FontBBox'=>'[-958 -550 1632 1050]','ItalicAngle'=>0,'StemV'=>70,'MissingWidth'=>600);
-$up=-176;
-$ut=50;
-$dw=600;
-$cw=array(
-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=>277,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,8364=>655,8218=>222,402=>278,8222=>333,8230=>1000,
-8224=>556,8225=>556,710=>333,8240=>1000,352=>667,8249=>250,338=>1000,381=>611,8216=>222,8217=>221,
-8220=>333,8221=>333,8226=>350,8211=>556,8212=>1000,732=>333,8482=>1000,353=>500,8250=>250,339=>944,
-382=>500,376=>667,160=>278,161=>278,162=>556,163=>556,164=>556,165=>556,166=>260,167=>556,
-168=>333,169=>737,170=>370,171=>448,172=>584,173=>333,174=>737,175=>333,176=>606,177=>584,
-178=>350,179=>350,180=>333,181=>556,182=>537,183=>278,184=>333,185=>350,186=>365,187=>448,
-188=>869,189=>869,190=>869,191=>556,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=>666,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=>555,255=>500,256=>667,257=>556,
-258=>667,259=>556,260=>667,261=>556,262=>722,263=>500,264=>722,265=>500,266=>722,267=>500,
-268=>722,269=>500,270=>722,271=>722,272=>722,273=>556,274=>667,275=>556,276=>667,277=>556,
-278=>667,279=>556,280=>667,281=>556,282=>667,283=>556,284=>778,285=>556,286=>778,287=>556,
-288=>778,289=>556,290=>778,291=>556,292=>722,293=>556,294=>722,295=>556,296=>278,297=>278,
-298=>278,299=>278,300=>278,301=>278,302=>278,303=>222,304=>278,305=>278,306=>700,307=>374,
-308=>500,309=>222,310=>667,311=>500,312=>500,313=>556,314=>222,315=>556,316=>222,317=>556,
-318=>387,319=>556,320=>500,321=>556,322=>222,323=>722,324=>556,325=>722,326=>556,327=>722,
-328=>556,329=>722,330=>722,331=>556,332=>778,333=>556,334=>778,335=>556,336=>778,337=>556,
-340=>722,341=>333,342=>722,343=>333,344=>722,345=>333,346=>667,347=>500,348=>667,349=>500,
-350=>667,351=>500,354=>611,355=>278,356=>611,357=>443,358=>611,359=>278,360=>722,361=>556,
-362=>722,363=>556,364=>722,365=>556,366=>722,367=>556,368=>722,369=>556,370=>722,371=>556,
-372=>944,373=>722,374=>667,375=>500,377=>611,378=>500,379=>611,380=>500,383=>278,384=>556,
-385=>854,386=>668,387=>556,388=>667,389=>556,390=>722,391=>722,392=>500,393=>722,394=>899,
-395=>667,396=>556,397=>564,398=>667,399=>722,400=>667,401=>611,403=>778,404=>667,405=>889,
-406=>278,407=>333,408=>667,409=>500,410=>333,411=>560,412=>833,413=>722,414=>556,415=>778,
-416=>788,417=>565,418=>944,419=>722,420=>842,421=>556,422=>666,423=>667,424=>500,425=>611,
-426=>333,427=>278,428=>611,429=>278,430=>611,431=>776,432=>624,433=>778,434=>722,435=>722,
-436=>556,437=>611,438=>500,439=>611,440=>611,441=>500,442=>500,443=>556,446=>556,447=>556,
-448=>260,449=>370,450=>584,451=>278,452=>1311,453=>1208,454=>1056,455=>1056,456=>778,457=>444,
-458=>1158,459=>944,460=>778,461=>667,462=>556,463=>278,464=>278,465=>778,466=>556,467=>722,
-468=>556,469=>722,470=>556,471=>722,472=>556,473=>722,474=>556,475=>722,476=>556,477=>556,
-478=>667,479=>556,480=>667,481=>556,482=>1000,483=>889,484=>778,485=>556,486=>778,487=>556,
-488=>667,489=>500,490=>778,491=>556,492=>778,493=>556,494=>611,495=>500,496=>222,497=>1333,
-498=>1222,499=>1056,500=>778,501=>556,503=>630,504=>722,505=>556,506=>667,507=>556,508=>1000,
-509=>889,510=>778,511=>611,512=>667,513=>556,514=>667,515=>556,516=>667,517=>556,518=>667,
-519=>556,520=>278,521=>278,522=>278,523=>278,524=>778,525=>556,526=>778,527=>556,528=>722,
-529=>333,530=>722,531=>333,532=>722,533=>556,534=>722,535=>556,536=>667,537=>500,538=>611,
-539=>278,540=>521,541=>393,542=>722,543=>556,548=>611,549=>500,550=>667,551=>556,552=>667,
-553=>556,554=>778,555=>556,556=>778,557=>556,558=>778,559=>556,560=>778,561=>556,562=>667,
-563=>500,567=>222,592=>556,593=>556,594=>556,595=>556,596=>500,597=>500,598=>556,599=>556,
-600=>556,601=>556,602=>804,603=>500,604=>499,605=>742,606=>500,607=>222,608=>556,609=>556,
-610=>546,611=>500,612=>556,613=>556,614=>556,615=>556,616=>222,617=>222,618=>278,619=>473,
-620=>427,621=>222,622=>611,623=>833,624=>833,625=>833,626=>556,627=>556,628=>567,629=>556,
-630=>778,631=>722,632=>741,633=>333,634=>333,635=>333,636=>333,637=>333,638=>384,639=>369,
-640=>546,641=>546,642=>500,643=>278,644=>278,645=>278,646=>444,647=>278,648=>278,649=>556,
-650=>626,651=>539,652=>500,653=>722,654=>500,655=>556,656=>500,657=>500,658=>500,659=>552,
-660=>556,661=>556,662=>556,663=>722,664=>778,665=>506,666=>500,667=>546,668=>558,669=>444,
-670=>500,671=>430,672=>556,673=>556,674=>556,675=>944,676=>944,677=>944,678=>689,679=>506,
-680=>764,681=>766,682=>660,683=>577,684=>530,685=>486,686=>565,687=>621,688=>333,689=>333,
-690=>167,691=>236,692=>236,693=>276,694=>359,695=>500,696=>330,697=>278,698=>454,699=>278,
-700=>278,701=>278,702=>333,703=>333,704=>333,705=>333,706=>333,707=>333,708=>333,709=>333,
-711=>333,712=>333,713=>333,714=>333,715=>333,716=>272,717=>333,718=>333,719=>333,720=>333,
-721=>333,722=>333,723=>333,724=>333,725=>333,726=>333,727=>333,728=>333,729=>333,730=>333,
-731=>333,733=>333,734=>333,735=>510,736=>333,737=>186,738=>333,739=>333,740=>334,741=>526,
-742=>526,743=>526,744=>526,745=>526,746=>519,747=>519,748=>333,749=>333,750=>333,751=>333,
-752=>333,753=>333,754=>333,755=>327,756=>261,757=>437,758=>437,759=>333,760=>278,761=>200,
-762=>200,763=>200,764=>200,765=>333,766=>333,767=>333,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,
-832=>0,833=>0,834=>0,835=>0,836=>0,837=>0,838=>0,839=>0,840=>0,841=>0,
-842=>0,843=>0,844=>0,845=>0,846=>0,847=>0,848=>0,849=>0,850=>0,851=>0,
-852=>0,853=>0,854=>0,855=>0,856=>0,857=>0,858=>0,859=>0,860=>0,861=>0,
-862=>0,863=>0,864=>0,865=>0,866=>0,867=>0,868=>0,869=>0,870=>0,871=>0,
-872=>0,873=>0,874=>0,875=>0,876=>0,877=>0,878=>0,879=>0,884=>278,885=>199,
-890=>332,894=>278,900=>333,901=>333,902=>667,903=>275,904=>786,905=>828,906=>369,908=>833,
-910=>845,911=>778,912=>286,913=>667,914=>667,915=>582,916=>778,917=>667,918=>628,919=>722,
-920=>778,921=>278,922=>667,923=>667,924=>833,925=>722,926=>630,927=>778,928=>722,929=>667,
-931=>628,932=>611,933=>667,934=>717,935=>667,936=>745,937=>778,938=>278,939=>667,940=>608,
-941=>528,942=>548,943=>307,944=>538,945=>596,946=>542,947=>531,948=>564,949=>512,950=>455,
-951=>548,952=>525,953=>286,954=>510,955=>551,956=>540,957=>500,958=>470,959=>546,960=>619,
-961=>569,962=>547,963=>620,964=>492,965=>538,966=>741,967=>571,968=>662,969=>740,970=>286,
-971=>538,972=>546,973=>538,974=>740,977=>580,978=>742,979=>845,980=>620,981=>741,982=>740,
-983=>556,1008=>556,1009=>566,1012=>778,1013=>328,1024=>667,1025=>657,1026=>766,1027=>582,1028=>722,
-1029=>667,1030=>278,1031=>278,1032=>500,1033=>1080,1034=>1014,1035=>766,1036=>628,1037=>730,1038=>613,
-1039=>722,1040=>666,1041=>668,1042=>668,1043=>582,1044=>812,1045=>657,1046=>905,1047=>667,1048=>730,
-1049=>730,1050=>632,1051=>674,1052=>846,1053=>721,1054=>796,1055=>721,1056=>654,1057=>722,1058=>611,
-1059=>613,1060=>861,1061=>657,1062=>742,1063=>626,1064=>830,1065=>851,1066=>841,1067=>874,1068=>670,
-1069=>717,1070=>1001,1071=>686,1072=>552,1073=>550,1074=>506,1075=>404,1076=>602,1077=>547,1078=>755,
-1079=>499,1080=>567,1081=>567,1082=>489,1083=>517,1084=>618,1085=>558,1086=>550,1087=>557,1088=>577,
-1089=>520,1090=>444,1091=>468,1092=>865,1093=>466,1094=>578,1095=>498,1096=>692,1097=>712,1098=>664,
-1099=>690,1100=>521,1101=>520,1102=>759,1103=>543,1104=>549,1105=>549,1106=>577,1107=>404,1108=>519,
-1109=>502,1110=>224,1111=>278,1112=>223,1113=>813,1114=>853,1115=>577,1116=>489,1117=>567,1118=>468,
-1119=>558,1120=>942,1121=>693,1136=>762,1137=>662,1138=>800,1139=>550,1148=>942,1149=>693,1150=>942,
-1151=>693,1154=>468,1155=>0,1156=>0,1157=>0,1158=>0,1159=>0,1160=>0,1161=>0,1162=>763,
-1163=>583,1164=>689,1165=>526,1166=>652,1167=>572,1168=>601,1169=>397,1170=>589,1171=>392,1172=>591,
-1173=>475,1174=>927,1175=>830,1176=>661,1177=>493,1178=>658,1179=>510,1180=>675,1181=>519,1182=>684,
-1183=>514,1184=>839,1185=>653,1186=>740,1187=>570,1188=>987,1189=>714,1190=>1058,1191=>808,1192=>722,
-1193=>510,1194=>722,1195=>516,1196=>611,1197=>402,1198=>668,1199=>578,1200=>668,1201=>588,1202=>664,
-1203=>488,1204=>936,1205=>679,1206=>638,1207=>521,1208=>630,1209=>498,1210=>630,1211=>498,1212=>927,
-1213=>699,1214=>919,1215=>703,1216=>254,1217=>905,1218=>755,1219=>668,1220=>512,1221=>696,1222=>524,
-1223=>721,1224=>558,1225=>744,1226=>571,1227=>630,1228=>498,1229=>869,1230=>631,1231=>254,1232=>666,
-1233=>552,1234=>666,1235=>552,1236=>1000,1237=>879,1238=>657,1239=>547,1240=>722,1241=>543,1242=>722,
-1243=>543,1244=>905,1245=>755,1246=>667,1247=>499,1248=>611,1249=>540,1250=>730,1251=>567,1252=>730,
-1253=>567,1254=>796,1255=>550,1256=>800,1257=>550,1258=>800,1259=>550,1260=>717,1261=>520,1262=>613,
-1263=>468,1264=>613,1265=>468,1266=>613,1267=>468,1268=>626,1269=>498,1270=>582,1271=>395,1272=>874,
-1273=>690,1296=>667,1297=>491,1298=>665,1299=>509,1306=>778,1307=>575,1308=>934,1309=>712,1310=>627,
-1311=>489,1329=>720,1330=>696,1331=>750,1332=>725,1333=>699,1334=>751,1335=>446,1336=>703,1337=>790,
-1338=>656,1339=>697,1340=>390,1341=>852,1342=>791,1343=>698,1344=>585,1345=>656,1346=>651,1347=>658,
-1348=>759,1349=>595,1350=>772,1351=>603,1352=>703,1353=>648,1354=>698,1355=>744,1356=>738,1357=>703,
-1358=>739,1359=>660,1360=>693,1361=>623,1362=>385,1363=>788,1364=>632,1365=>775,1366=>714,1369=>333,
-1370=>222,1371=>200,1372=>333,1373=>333,1374=>333,1375=>333,1377=>833,1378=>551,1379=>572,1380=>569,
-1381=>546,1382=>581,1383=>353,1384=>551,1385=>568,1386=>569,1387=>552,1388=>276,1389=>795,1390=>535,
-1391=>553,1392=>537,1393=>512,1394=>568,1395=>552,1396=>531,1397=>249,1398=>527,1399=>405,1400=>551,
-1401=>390,1402=>833,1403=>509,1404=>523,1405=>545,1406=>584,1407=>879,1408=>552,1409=>552,1410=>301,
-1411=>884,1412=>578,1413=>556,1414=>668,1415=>544,1417=>278,1418=>333,1456=>0,1457=>0,1458=>0,
-1459=>0,1460=>0,1461=>0,1462=>0,1463=>0,1464=>0,1465=>0,1467=>0,1468=>0,1469=>0,
-1470=>488,1471=>0,1472=>212,1473=>0,1474=>0,1475=>278,1476=>0,1488=>640,1489=>591,1490=>466,
-1491=>598,1492=>622,1493=>212,1494=>351,1495=>623,1496=>608,1497=>200,1498=>526,1499=>550,1500=>600,
-1501=>623,1502=>621,1503=>212,1504=>378,1505=>607,1506=>587,1507=>575,1508=>568,1509=>540,1510=>590,
-1511=>606,1512=>547,1513=>776,1514=>687,1520=>424,1521=>412,1522=>400,1523=>184,1524=>344,1792=>600,
-1793=>201,1794=>201,1795=>201,1796=>201,1797=>500,1798=>500,1799=>500,1800=>370,1801=>370,1802=>574,
-1803=>574,1804=>645,1805=>574,1807=>0,1808=>452,1809=>452,1810=>574,1811=>645,1812=>645,1813=>509,
-1814=>509,1815=>682,1816=>585,1817=>404,1818=>627,1819=>718,1820=>718,1821=>484,1822=>682,1823=>600,
-1824=>660,1825=>682,1826=>538,1827=>718,1828=>718,1829=>718,1830=>574,1831=>574,1832=>638,1833=>585,
-1834=>509,1835=>682,1836=>682,1840=>0,1841=>0,1842=>0,1843=>0,1844=>0,1845=>0,1846=>0,
-1847=>0,1848=>0,1849=>0,1850=>0,1851=>0,1852=>0,1853=>0,1854=>0,1855=>0,1856=>0,
-1857=>0,1858=>0,1859=>0,1860=>0,1861=>0,1862=>0,1863=>0,1864=>0,1865=>0,1866=>0,
-2305=>6,2306=>0,2307=>305,2308=>717,2309=>717,2310=>829,2311=>463,2312=>463,2313=>581,2314=>803,
-2315=>920,2316=>639,2317=>430,2318=>430,2319=>430,2320=>430,2321=>856,2322=>828,2323=>837,2324=>856,
-2325=>749,2326=>779,2327=>522,2328=>587,2329=>650,2330=>619,2331=>641,2332=>703,2333=>691,2334=>677,
-2335=>568,2336=>529,2337=>611,2338=>536,2339=>607,2340=>564,2341=>659,2342=>500,2343=>591,2344=>521,
-2345=>568,2346=>477,2347=>728,2348=>490,2349=>577,2350=>517,2351=>554,2352=>433,2353=>433,2354=>656,
-2355=>660,2356=>660,2357=>490,2358=>645,2359=>477,2360=>666,2361=>484,2364=>6,2365=>442,2366=>211,
-2367=>211,2368=>211,2369=>6,2370=>3,2371=>6,2372=>0,2373=>6,2374=>84,2375=>6,2376=>6,
-2377=>224,2378=>234,2379=>211,2380=>211,2381=>6,2384=>839,2385=>15,2386=>0,2387=>9,2388=>9,
-2392=>750,2393=>779,2394=>522,2395=>703,2396=>613,2397=>536,2398=>728,2399=>554,2400=>899,2401=>625,
-2402=>625,2403=>625,2404=>674,2405=>674,2406=>575,2407=>575,2408=>575,2409=>575,2410=>575,2411=>575,
-2412=>575,2413=>575,2414=>575,2415=>575,2416=>365,2417=>387,2418=>717,2433=>0,2434=>300,2435=>264,
-2437=>594,2438=>790,2439=>469,2440=>513,2441=>520,2442=>549,2443=>594,2444=>481,2447=>580,2448=>627,
-2451=>540,2452=>613,2453=>570,2454=>467,2455=>471,2456=>428,2457=>483,2458=>408,2459=>509,2460=>591,
-2461=>563,2462=>771,2463=>381,2464=>404,2465=>522,2466=>408,2467=>450,2468=>543,2469=>477,2470=>418,
-2471=>433,2472=>445,2474=>499,2475=>584,2476=>377,2477=>555,2478=>448,2479=>423,2480=>390,2482=>498,
-2486=>498,2487=>425,2488=>495,2489=>440,2492=>22,2493=>440,2494=>193,2495=>189,2496=>180,2497=>0,
-2498=>0,2499=>0,2500=>0,2503=>252,2504=>243,2507=>889,2508=>865,2509=>0,2510=>356,2519=>219,
-2524=>523,2525=>408,2527=>428,2528=>594,2529=>481,2530=>0,2531=>0,2534=>500,2535=>437,2536=>479,
-2537=>530,2538=>497,2539=>500,2540=>482,2541=>503,2542=>517,2543=>481,2544=>377,2545=>377,2546=>429,
-2547=>383,2548=>429,2549=>478,2550=>545,2551=>158,2552=>365,2553=>280,2554=>357,2561=>0,2562=>0,
-2563=>351,2565=>860,2566=>1088,2567=>869,2568=>928,2569=>723,2570=>723,2575=>665,2576=>857,2579=>716,
-2580=>858,2581=>682,2582=>634,2583=>696,2584=>744,2585=>649,2586=>674,2587=>656,2588=>653,2589=>629,
-2590=>639,2591=>641,2592=>657,2593=>650,2594=>653,2595=>651,2596=>640,2597=>634,2598=>662,2599=>630,
-2600=>625,2602=>645,2603=>653,2604=>624,2605=>613,2606=>658,2607=>734,2608=>620,2610=>676,2611=>719,
-2613=>626,2614=>666,2616=>666,2617=>614,2620=>0,2622=>286,2623=>322,2624=>301,2625=>0,2626=>0,
-2631=>0,2632=>0,2635=>0,2636=>0,2637=>0,2649=>636,2650=>762,2651=>652,2652=>653,2654=>656,
-2662=>672,2663=>543,2664=>622,2665=>622,2666=>576,2667=>589,2668=>509,2669=>645,2670=>661,2671=>655,
-2672=>0,2673=>0,2674=>666,2675=>726,2676=>1217,2689=>22,2690=>23,2691=>0,2693=>775,2694=>979,
-2695=>588,2696=>563,2697=>525,2698=>724,2699=>942,2701=>775,2703=>775,2704=>775,2705=>979,2707=>979,
-2708=>979,2709=>610,2710=>706,2711=>623,2712=>610,2713=>601,2714=>614,2715=>642,2716=>684,2717=>634,
-2718=>644,2719=>509,2720=>541,2721=>539,2722=>524,2723=>657,2724=>547,2725=>616,2726=>494,2727=>601,
-2728=>627,2730=>524,2731=>620,2732=>691,2733=>687,2734=>468,2735=>590,2736=>509,2738=>571,2739=>687,
-2741=>526,2742=>620,2743=>575,2744=>620,2745=>549,2748=>53,2749=>415,2750=>241,2751=>186,2752=>217,
-2753=>32,2754=>21,2755=>38,2756=>27,2757=>45,2759=>41,2760=>46,2761=>207,2763=>190,2764=>182,
-2765=>16,2768=>962,2784=>949,2790=>479,2791=>502,2792=>484,2793=>471,2794=>501,2795=>527,2796=>462,
-2797=>524,2798=>454,2799=>495,2801=>752,2946=>479,2947=>893,2949=>1018,2950=>1170,2951=>916,2952=>676,
-2953=>836,2954=>1225,2958=>744,2959=>744,2960=>848,2962=>813,2963=>813,2964=>813,2965=>688,2969=>744,
-2970=>676,2972=>848,2974=>984,2975=>777,2979=>1338,2980=>664,2984=>561,2985=>1029,2986=>607,2990=>697,
-2991=>697,2992=>434,2993=>617,2994=>869,2995=>859,2996=>697,2997=>869,2999=>1145,3000=>1064,3001=>1316,
-3006=>424,3007=>125,3008=>596,3009=>539,3014=>596,3015=>650,3016=>973,3018=>1286,3019=>1286,3020=>1706,
-3021=>333,3031=>859,3050=>778,3051=>881,3052=>876,3053=>648,3057=>744,4256=>587,4257=>620,4258=>642,
-4259=>815,4260=>600,4261=>595,4262=>799,4263=>893,4264=>622,4265=>597,4266=>939,4267=>602,4268=>603,
-4269=>790,4270=>587,4271=>623,4272=>799,4273=>601,4274=>792,4275=>724,4276=>847,4277=>599,4278=>812,
-4279=>603,4280=>653,4281=>590,4282=>754,4283=>596,4284=>653,4285=>651,4286=>596,4287=>888,4288=>593,
-4304=>436,4305=>491,4306=>528,4307=>692,4308=>447,4309=>447,4310=>628,4311=>734,4312=>449,4313=>445,
-4314=>843,4315=>449,4316=>449,4317=>682,4318=>449,4319=>480,4320=>682,4321=>468,4322=>710,4323=>623,
-4324=>697,4325=>447,4326=>702,4327=>447,4328=>470,4329=>440,4330=>632,4331=>449,4332=>470,4333=>536,
-4334=>449,4335=>656,4336=>474,4337=>630,4338=>394,4339=>419,4340=>422,4341=>436,4345=>528,4347=>515,
-7680=>667,7681=>556,7682=>667,7683=>556,7684=>667,7685=>556,7686=>667,7687=>556,7688=>722,7689=>500,
-7690=>722,7691=>556,7692=>722,7693=>556,7694=>722,7695=>556,7696=>722,7697=>556,7698=>722,7699=>556,
-7700=>667,7701=>556,7702=>667,7703=>556,7704=>667,7705=>556,7706=>667,7707=>556,7708=>667,7709=>556,
-7710=>611,7711=>278,7712=>778,7713=>556,7714=>722,7715=>556,7716=>722,7717=>556,7718=>722,7719=>556,
-7720=>722,7721=>556,7722=>722,7723=>556,7724=>278,7725=>222,7726=>278,7727=>278,7728=>667,7729=>500,
-7730=>667,7731=>500,7732=>667,7733=>500,7734=>556,7735=>222,7736=>556,7737=>222,7738=>556,7739=>222,
-7740=>556,7741=>222,7742=>833,7743=>833,7744=>833,7745=>833,7746=>833,7747=>833,7748=>722,7749=>556,
-7750=>722,7751=>556,7752=>722,7753=>556,7754=>722,7755=>556,7756=>778,7757=>556,7758=>778,7759=>556,
-7760=>778,7761=>556,7762=>778,7763=>556,7764=>667,7765=>556,7766=>667,7767=>556,7768=>722,7769=>333,
-7770=>722,7771=>333,7772=>722,7773=>333,7774=>722,7775=>333,7776=>667,7777=>500,7778=>667,7779=>500,
-7780=>667,7781=>500,7782=>667,7783=>500,7784=>667,7785=>500,7786=>611,7787=>278,7788=>611,7789=>278,
-7790=>611,7791=>278,7792=>611,7793=>278,7794=>722,7795=>556,7796=>722,7797=>556,7798=>722,7799=>556,
-7800=>722,7801=>556,7802=>722,7803=>556,7804=>667,7805=>500,7806=>667,7807=>500,7808=>944,7809=>722,
-7810=>944,7811=>722,7812=>944,7813=>722,7814=>944,7815=>722,7816=>944,7817=>722,7818=>667,7819=>500,
-7820=>667,7821=>500,7822=>667,7823=>500,7824=>611,7825=>500,7826=>611,7827=>500,7828=>611,7829=>500,
-7830=>556,7831=>278,7832=>722,7833=>500,7834=>555,7835=>278,7840=>667,7841=>556,7842=>667,7843=>556,
-7844=>667,7845=>556,7846=>667,7847=>556,7848=>667,7849=>556,7850=>667,7851=>556,7852=>667,7853=>556,
-7854=>667,7855=>556,7856=>667,7857=>556,7858=>667,7859=>556,7860=>667,7861=>556,7862=>667,7863=>556,
-7864=>667,7865=>556,7866=>667,7867=>556,7868=>667,7869=>556,7870=>667,7871=>556,7872=>667,7873=>556,
-7874=>667,7875=>556,7876=>667,7877=>556,7878=>667,7879=>556,7880=>278,7881=>278,7882=>278,7883=>222,
-7884=>778,7885=>556,7886=>778,7887=>556,7888=>778,7889=>556,7890=>778,7891=>556,7892=>778,7893=>556,
-7894=>778,7895=>556,7896=>778,7897=>556,7898=>788,7899=>565,7900=>788,7901=>565,7902=>788,7903=>565,
-7904=>788,7905=>565,7906=>788,7907=>565,7908=>722,7909=>556,7910=>722,7911=>556,7912=>776,7913=>624,
-7914=>776,7915=>624,7916=>776,7917=>624,7918=>776,7919=>624,7920=>776,7921=>624,7922=>667,7923=>500,
-7924=>667,7925=>500,7926=>667,7927=>500,7928=>667,7929=>500,7936=>596,7937=>596,7938=>596,7939=>596,
-7940=>596,7941=>596,7942=>596,7943=>596,7944=>667,7945=>667,7946=>742,7947=>756,7948=>692,7949=>699,
-7950=>673,7951=>667,7952=>512,7953=>512,7954=>512,7955=>512,7956=>512,7957=>512,7960=>730,7961=>714,
-7962=>900,7963=>882,7964=>867,7965=>879,7968=>548,7969=>548,7970=>548,7971=>548,7972=>548,7973=>548,
-7974=>548,7975=>548,7976=>772,7977=>778,7978=>945,7979=>947,7980=>943,7981=>946,7982=>853,7983=>853,
-7984=>286,7985=>286,7986=>286,7987=>286,7988=>286,7989=>286,7990=>286,7991=>286,7992=>322,7993=>321,
-7994=>482,7995=>485,7996=>477,7997=>484,7998=>394,7999=>390,8000=>546,8001=>546,8002=>546,8003=>546,
-8004=>546,8005=>546,8008=>775,8009=>784,8010=>990,8011=>987,8012=>887,8013=>897,8016=>538,8017=>538,
-8018=>538,8019=>538,8020=>538,8021=>538,8022=>538,8023=>538,8025=>747,8027=>915,8029=>971,8031=>863,
-8032=>740,8033=>740,8034=>740,8035=>740,8036=>740,8037=>740,8038=>740,8039=>740,8040=>769,8041=>774,
-8042=>972,8043=>970,8044=>879,8045=>918,8046=>901,8047=>901,8048=>596,8049=>596,8050=>512,8051=>512,
-8052=>548,8053=>548,8054=>286,8055=>286,8056=>546,8057=>546,8058=>538,8059=>538,8060=>740,8061=>740,
-8064=>596,8065=>596,8066=>596,8067=>596,8068=>596,8069=>596,8070=>596,8071=>596,8072=>830,8073=>828,
-8074=>916,8075=>916,8076=>853,8077=>860,8078=>835,8079=>827,8080=>548,8081=>548,8082=>548,8083=>548,
-8084=>548,8085=>548,8086=>548,8087=>548,8088=>928,8089=>931,8090=>1104,8091=>1109,8092=>1099,8093=>1102,
-8094=>1009,8095=>1012,8096=>740,8097=>740,8098=>740,8099=>740,8100=>740,8101=>740,8102=>740,8103=>740,
-8104=>934,8105=>934,8106=>1130,8107=>1128,8108=>1045,8109=>1077,8110=>1062,8111=>1065,8112=>596,8113=>596,
-8114=>596,8115=>596,8116=>596,8118=>596,8119=>596,8120=>667,8121=>667,8122=>667,8123=>667,8124=>832,
-8125=>333,8126=>200,8127=>333,8128=>333,8129=>333,8130=>548,8131=>548,8132=>548,8134=>548,8135=>548,
-8136=>833,8137=>776,8138=>944,8139=>896,8140=>875,8141=>400,8142=>400,8143=>333,8144=>286,8145=>286,
-8146=>286,8147=>286,8150=>286,8151=>286,8152=>278,8153=>278,8154=>385,8155=>376,8157=>400,8158=>400,
-8159=>333,8160=>538,8161=>538,8162=>538,8163=>538,8164=>569,8165=>569,8166=>538,8167=>514,8168=>667,
-8169=>667,8170=>817,8171=>827,8172=>741,8173=>393,8174=>393,8175=>333,8178=>740,8179=>740,8180=>740,
-8182=>740,8183=>740,8184=>833,8185=>833,8186=>848,8187=>814,8188=>939,8189=>333,8190=>333,8192=>500,
-8193=>1000,8194=>500,8195=>1000,8196=>333,8197=>250,8198=>167,8199=>556,8200=>278,8201=>200,8202=>100,
-8203=>0,8204=>0,8205=>0,8206=>0,8207=>0,8208=>333,8209=>333,8210=>556,8213=>1000,8214=>312,
-8215=>566,8219=>221,8223=>333,8227=>350,8228=>278,8229=>666,8231=>278,8232=>0,8233=>0,8234=>0,
-8235=>0,8236=>0,8237=>0,8238=>0,8239=>500,8241=>1360,8242=>278,8243=>469,8244=>680,8245=>278,
-8246=>469,8247=>680,8248=>376,8251=>622,8252=>556,8253=>556,8254=>556,8255=>658,8256=>658,8257=>438,
-8258=>840,8259=>400,8260=>167,8261=>334,8262=>334,8263=>1112,8264=>834,8265=>834,8266=>556,8267=>537,
-8268=>537,8269=>537,8270=>389,8271=>278,8272=>658,8273=>389,8274=>634,8275=>500,8276=>658,8277=>787,
-8278=>515,8279=>855,8280=>722,8281=>725,8282=>224,8283=>722,8284=>604,8285=>224,8286=>224,8287=>0,
-8288=>0,8289=>0,8290=>0,8291=>0,8292=>0,8304=>350,8305=>350,8308=>350,8309=>350,8310=>350,
-8311=>350,8312=>350,8313=>350,8314=>350,8315=>350,8316=>350,8317=>350,8318=>350,8319=>350,8320=>350,
-8321=>350,8322=>350,8323=>350,8324=>350,8325=>350,8326=>350,8327=>350,8328=>350,8329=>350,8330=>350,
-8331=>350,8332=>350,8333=>350,8334=>350,8336=>350,8337=>349,8338=>350,8339=>350,8340=>350,8353=>615,
-8354=>601,8355=>611,8356=>556,8357=>833,8358=>682,8359=>1317,8360=>1202,8361=>879,8362=>869,8363=>538,
-8365=>667,8366=>611,8368=>570,8369=>684,8370=>717,8371=>667,8372=>667,8373=>640,8400=>0,8401=>0,
-8402=>0,8403=>0,8406=>0,8407=>0,8411=>0,8412=>0,8413=>0,8414=>0,8415=>0,8416=>0,
-8417=>0,8421=>0,8422=>0,8423=>0,8424=>0,8425=>0,8426=>0,8427=>0,8428=>0,8429=>0,
-8430=>0,8431=>0,8432=>0,8448=>970,8449=>979,8451=>1017,8452=>556,8453=>876,8454=>922,8455=>667,
-8457=>919,8459=>969,8460=>615,8462=>556,8463=>572,8464=>809,8465=>606,8466=>874,8467=>417,8468=>747,
-8470=>934,8471=>737,8472=>600,8475=>850,8476=>699,8480=>1000,8481=>1230,8486=>778,8487=>778,8488=>512,
-8489=>286,8490=>667,8491=>667,8492=>908,8493=>623,8494=>556,8495=>444,8496=>562,8497=>895,8498=>588,
-8499=>1080,8501=>640,8502=>592,8503=>466,8504=>598,8505=>278,8506=>871,8507=>1230,8513=>778,8514=>556,
-8515=>556,8516=>667,8522=>516,8523=>655,8525=>936,8526=>482,8531=>869,8532=>869,8533=>869,8534=>869,
-8535=>869,8536=>869,8537=>869,8538=>869,8539=>869,8540=>869,8541=>869,8542=>869,8543=>869,8544=>278,
-8545=>556,8546=>834,8547=>945,8548=>667,8549=>945,8550=>1223,8551=>1501,8552=>945,8553=>667,8554=>945,
-8555=>1223,8556=>556,8557=>722,8558=>722,8559=>833,8560=>222,8561=>444,8562=>666,8563=>722,8564=>500,
-8565=>722,8566=>944,8567=>1166,8568=>722,8569=>500,8570=>722,8571=>944,8572=>222,8573=>500,8574=>556,
-8575=>833,8592=>987,8593=>603,8594=>987,8595=>603,8596=>1042,8597=>1042,8598=>800,8599=>800,8600=>800,
-8601=>800,8614=>987,8617=>987,8618=>987,8629=>658,8636=>987,8637=>987,8638=>380,8639=>393,8640=>987,
-8641=>987,8642=>380,8643=>379,8652=>987,8656=>987,8657=>603,8658=>987,8659=>603,8660=>1042,8661=>603,
-8669=>1092,8704=>667,8706=>556,8707=>667,8709=>823,8710=>711,8711=>711,8712=>584,8713=>584,8714=>584,
-8715=>584,8716=>584,8717=>713,8719=>823,8720=>823,8721=>804,8722=>584,8723=>584,8724=>584,8725=>510,
-8726=>392,8727=>584,8729=>584,8730=>542,8733=>713,8734=>713,8736=>768,8739=>200,8740=>288,8741=>312,
-8742=>340,8743=>603,8744=>603,8745=>768,8746=>768,8747=>556,8748=>796,8749=>956,8750=>556,8756=>863,
-8764=>584,8765=>584,8766=>573,8768=>244,8769=>584,8770=>584,8771=>584,8772=>584,8773=>584,8774=>584,
-8775=>584,8776=>584,8777=>584,8781=>554,8784=>584,8800=>584,8801=>584,8802=>584,8804=>584,8805=>584,
-8810=>955,8811=>955,8813=>554,8814=>584,8815=>584,8816=>584,8817=>584,8818=>584,8819=>584,8826=>584,
-8827=>584,8828=>584,8829=>584,8832=>584,8833=>584,8834=>584,8835=>584,8836=>584,8837=>584,8838=>584,
-8839=>584,8840=>584,8841=>584,8844=>768,8847=>636,8848=>636,8849=>636,8850=>636,8851=>636,8852=>636,
-8853=>768,8854=>768,8855=>768,8856=>768,8857=>768,8866=>658,8867=>658,8868=>658,8869=>658,8870=>600,
-8871=>608,8882=>636,8883=>636,8884=>636,8885=>636,8896=>744,8897=>744,8898=>764,8899=>764,8901=>278,
-8902=>471,8904=>710,8928=>584,8929=>584,8930=>636,8931=>636,8960=>823,8968=>456,8969=>455,8970=>455,
-8971=>456,8992=>556,8993=>556,8994=>658,8995=>658,9001=>329,9002=>329,9115=>384,9116=>384,9117=>384,
-9118=>384,9119=>384,9120=>384,9121=>388,9122=>388,9123=>388,9124=>388,9125=>388,9126=>388,9134=>556,
-9250=>556,9251=>500,9312=>788,9313=>788,9314=>788,9315=>788,9316=>788,9317=>788,9318=>788,9319=>788,
-9320=>788,9321=>788,9472=>1000,9473=>1000,9474=>1000,9475=>1000,9476=>1000,9477=>1000,9478=>1000,9479=>1000,
-9480=>1000,9481=>1000,9482=>1000,9483=>1000,9484=>1000,9485=>1000,9486=>1000,9487=>1000,9488=>1000,9489=>1000,
-9490=>1000,9491=>1000,9492=>1000,9493=>1000,9494=>1000,9495=>1000,9496=>1000,9497=>1000,9498=>1000,9499=>1000,
-9500=>1000,9501=>1000,9502=>1000,9503=>1000,9504=>1000,9505=>1000,9506=>1000,9507=>1000,9508=>1000,9509=>1000,
-9510=>1000,9511=>1000,9512=>1000,9513=>1000,9514=>1000,9515=>1000,9516=>1000,9517=>1000,9518=>1000,9519=>1000,
-9520=>1000,9521=>1000,9522=>1000,9523=>1000,9524=>1000,9525=>1000,9526=>1000,9527=>1000,9528=>1000,9529=>1000,
-9530=>1000,9531=>1000,9532=>1000,9533=>1000,9534=>1000,9535=>1000,9536=>1000,9537=>1000,9538=>1000,9539=>1000,
-9540=>1000,9541=>1000,9542=>1000,9543=>1000,9544=>1000,9545=>1000,9546=>1000,9547=>1000,9552=>1000,9553=>1000,
-9554=>1000,9555=>1000,9556=>1000,9557=>1000,9558=>1000,9559=>1000,9560=>1000,9561=>1000,9562=>1000,9563=>1000,
-9564=>1000,9565=>1000,9566=>1000,9567=>1000,9568=>1000,9569=>1000,9570=>1000,9571=>1000,9572=>1000,9573=>1000,
-9574=>1000,9575=>1000,9576=>1000,9577=>1000,9578=>1000,9579=>1000,9580=>1000,9600=>1000,9601=>1000,9602=>1000,
-9603=>1000,9604=>1000,9605=>1000,9606=>1000,9607=>1000,9608=>1000,9609=>1000,9610=>1000,9611=>1000,9612=>1000,
-9613=>1000,9614=>1000,9615=>1000,9616=>1000,9617=>1000,9618=>1000,9619=>1000,9620=>1000,9621=>1000,9622=>1000,
-9623=>1000,9624=>1000,9625=>1000,9626=>1000,9627=>1000,9628=>1000,9629=>1000,9630=>1000,9631=>1000,9632=>1000,
-9633=>1000,9635=>1000,9636=>1000,9637=>1000,9642=>1000,9644=>1000,9651=>892,9661=>892,9671=>788,9674=>489,
-9675=>791,9711=>882,9772=>929,9824=>626,9825=>694,9826=>595,9827=>776,9828=>626,9829=>694,9830=>595,
-9831=>776,9833=>333,9834=>555,9835=>722,9836=>722,9837=>415,9838=>377,9839=>402,10048=>1161,10752=>791,
-10753=>791,10754=>791,10755=>764,10756=>764,10761=>584,11799=>333,64256=>495,64257=>460,64258=>465,64259=>652,
-64260=>645,64261=>520,64275=>1004,64276=>1044,64277=>1042,64278=>1037,64279=>1256,64285=>200,64286=>305,64287=>400,
-64288=>587,64289=>890,64290=>848,64291=>872,64292=>800,64293=>850,64294=>873,64295=>797,64296=>937,64297=>584,
-64298=>776,64299=>776,64300=>776,64301=>776,64302=>640,64303=>640,64304=>640,64305=>591,64306=>466,64307=>598,
-64308=>622,64309=>262,64310=>351,64312=>608,64313=>270,64314=>526,64315=>550,64316=>600,64318=>621,64320=>378,
-64321=>607,64323=>575,64324=>568,64326=>590,64327=>606,64328=>547,64329=>776,64330=>687,64331=>212,64332=>591,
-64333=>550,64334=>568,64335=>640,65533=>788);
-$enc='';
-$diff='';
-$file='freesans.z';
-$ctg='freesans.ctg.z';
-$originalsize=568896;
-?>
\ No newline at end of file
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freesans.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freesans.z
deleted file mode 100644
index 2bcdd56f..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freesans.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freesansb.ctg.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freesansb.ctg.z
deleted file mode 100644
index 8c0510dc..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freesansb.ctg.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freesansb.php b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freesansb.php
deleted file mode 100644
index ea53a175..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freesansb.php
+++ /dev/null
@@ -1,236 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='FreeSansBold';
-$desc=array('Ascent'=>1000,'Descent'=>-300,'CapHeight'=>22,'Flags'=>32,'FontBBox'=>'[-967 -1175 1556 1639]','ItalicAngle'=>0,'StemV'=>120,'MissingWidth'=>600);
-$up=-189;
-$ut=69;
-$dw=600;
-$cw=array(
-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,8364=>640,8218=>278,402=>333,8222=>500,8230=>1000,
-8224=>556,8225=>556,710=>333,8240=>1000,352=>667,8249=>333,338=>1000,381=>611,8216=>278,8217=>278,
-8220=>500,8221=>500,8226=>350,8211=>556,8212=>1000,732=>333,8482=>1000,353=>556,8250=>333,339=>944,
-382=>500,376=>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=>606,177=>584,
-178=>351,179=>351,180=>333,181=>611,182=>556,183=>278,184=>333,185=>300,186=>365,187=>556,
-188=>869,189=>869,190=>869,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,256=>722,257=>556,
-258=>722,259=>556,260=>722,261=>556,262=>722,263=>556,264=>722,265=>556,266=>722,267=>556,
-268=>722,269=>556,270=>722,271=>723,272=>722,273=>611,274=>667,275=>556,276=>667,277=>556,
-278=>667,279=>556,280=>667,281=>556,282=>667,283=>556,284=>778,285=>611,286=>778,287=>611,
-288=>778,289=>611,290=>778,291=>611,292=>722,293=>611,294=>722,295=>611,296=>278,297=>278,
-298=>278,299=>278,300=>278,301=>278,302=>278,303=>278,304=>278,305=>278,306=>808,307=>492,
-308=>556,309=>278,310=>722,311=>556,312=>559,313=>611,314=>278,315=>611,316=>278,317=>611,
-318=>362,319=>611,320=>556,321=>611,322=>278,323=>722,324=>611,325=>722,326=>611,327=>722,
-328=>611,329=>611,330=>722,331=>611,332=>778,333=>611,334=>778,335=>611,336=>778,337=>611,
-340=>722,341=>389,342=>722,343=>389,344=>722,345=>389,346=>667,347=>556,348=>667,349=>556,
-350=>667,351=>556,354=>611,355=>333,356=>611,357=>414,358=>611,359=>333,360=>722,361=>611,
-362=>722,363=>611,364=>722,365=>611,366=>722,367=>611,368=>722,369=>611,370=>722,371=>611,
-372=>944,373=>778,374=>667,375=>556,377=>611,378=>500,379=>611,380=>500,383=>333,384=>611,
-385=>963,386=>704,387=>611,388=>687,389=>611,390=>722,391=>752,392=>562,393=>722,394=>968,
-395=>722,396=>611,397=>609,398=>667,399=>778,400=>672,401=>611,403=>778,404=>667,405=>889,
-406=>278,407=>395,408=>778,409=>556,410=>333,411=>620,412=>944,413=>722,414=>611,415=>778,
-416=>791,417=>653,418=>1111,419=>722,420=>914,421=>611,422=>647,423=>667,424=>556,425=>673,
-426=>441,427=>333,428=>742,429=>333,430=>611,431=>769,432=>656,433=>766,434=>722,435=>667,
-436=>620,437=>611,438=>500,439=>556,440=>556,441=>645,442=>569,443=>579,446=>611,447=>608,
-448=>260,449=>370,450=>584,451=>278,452=>1333,453=>1222,454=>1111,455=>1167,456=>889,457=>556,
-458=>1278,459=>1000,460=>889,461=>722,462=>556,463=>278,464=>278,465=>778,466=>611,467=>722,
-468=>611,469=>722,470=>611,471=>722,472=>611,473=>722,474=>611,475=>722,476=>611,477=>556,
-478=>722,479=>556,480=>722,481=>556,482=>1000,483=>889,484=>778,485=>611,486=>778,487=>611,
-488=>722,489=>556,490=>778,491=>611,492=>778,493=>611,494=>556,495=>556,496=>278,497=>1333,
-498=>1222,499=>1111,500=>778,501=>611,503=>630,504=>722,505=>611,506=>722,507=>556,508=>1000,
-509=>889,510=>778,511=>611,512=>722,513=>556,514=>722,515=>556,516=>667,517=>556,518=>667,
-519=>556,520=>278,521=>278,522=>278,523=>278,524=>778,525=>611,526=>778,527=>611,528=>722,
-529=>389,530=>722,531=>389,532=>722,533=>611,534=>722,535=>611,536=>667,537=>556,538=>611,
-539=>333,540=>569,541=>486,542=>722,543=>611,548=>645,549=>500,550=>722,551=>556,552=>667,
-553=>556,554=>778,555=>611,556=>778,557=>611,558=>778,559=>611,560=>778,561=>611,562=>667,
-563=>556,567=>278,592=>556,593=>667,594=>667,595=>611,596=>556,597=>600,598=>611,599=>611,
-600=>556,601=>556,602=>834,603=>541,604=>557,605=>820,606=>570,607=>278,608=>611,609=>611,
-610=>556,611=>556,612=>656,613=>619,614=>611,615=>611,616=>278,617=>344,618=>278,619=>473,
-620=>527,621=>298,622=>778,623=>889,624=>889,625=>889,626=>611,627=>611,628=>615,629=>606,
-630=>878,631=>822,632=>778,633=>389,634=>389,635=>389,636=>389,637=>389,638=>455,639=>455,
-640=>620,641=>620,642=>556,643=>333,644=>278,645=>333,646=>544,647=>328,648=>333,649=>623,
-650=>726,651=>639,652=>556,653=>778,654=>556,655=>556,656=>500,657=>571,658=>556,659=>642,
-660=>611,661=>611,662=>611,664=>611,665=>554,666=>570,667=>616,668=>603,669=>552,670=>556,
-671=>454,672=>611,673=>611,674=>611,684=>522,688=>377,689=>377,690=>202,691=>272,692=>272,
-693=>299,694=>395,695=>534,696=>364,697=>278,698=>454,699=>278,700=>278,701=>278,702=>333,
-703=>333,704=>333,705=>333,706=>333,707=>333,708=>333,709=>333,711=>333,712=>333,713=>333,
-714=>333,715=>333,716=>272,717=>333,718=>333,719=>333,720=>333,721=>333,722=>333,723=>333,
-724=>333,725=>333,726=>333,727=>333,728=>333,729=>333,730=>333,731=>333,733=>333,734=>333,
-735=>510,736=>372,737=>210,738=>363,739=>373,740=>334,741=>526,742=>526,743=>526,744=>526,
-745=>526,746=>519,747=>519,748=>333,749=>333,750=>333,751=>333,752=>333,753=>333,754=>333,
-755=>333,756=>333,757=>437,758=>437,759=>400,760=>333,761=>200,762=>200,763=>200,764=>200,
-765=>333,766=>333,767=>333,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,832=>0,833=>0,834=>0,
-835=>0,836=>0,837=>0,838=>0,839=>0,840=>0,841=>0,842=>0,843=>0,844=>0,
-845=>0,846=>0,847=>0,848=>0,849=>0,850=>0,851=>0,852=>0,853=>0,854=>0,
-855=>0,856=>0,857=>0,858=>0,859=>0,860=>0,861=>0,862=>0,863=>0,864=>0,
-865=>0,866=>0,867=>0,868=>0,869=>0,870=>0,871=>0,872=>0,873=>0,874=>0,
-875=>0,876=>0,877=>0,878=>0,879=>0,884=>379,885=>379,890=>333,894=>333,900=>363,
-901=>333,902=>761,903=>333,904=>864,905=>903,906=>454,908=>796,910=>991,911=>867,912=>315,
-913=>696,914=>640,915=>585,916=>726,917=>589,918=>581,919=>654,920=>783,921=>215,922=>648,
-923=>710,924=>829,925=>683,926=>645,927=>738,928=>726,929=>645,931=>673,932=>674,933=>771,
-934=>773,935=>780,936=>778,937=>766,938=>263,939=>771,940=>660,941=>541,942=>560,943=>356,
-944=>568,945=>632,946=>560,947=>591,948=>609,949=>541,950=>488,951=>608,952=>562,953=>315,
-954=>533,955=>603,956=>582,957=>586,958=>513,959=>611,960=>658,961=>595,962=>590,963=>657,
-964=>557,965=>568,966=>768,967=>632,968=>708,969=>778,970=>315,971=>568,972=>599,973=>568,
-974=>778,977=>580,978=>742,979=>857,980=>620,981=>706,982=>740,983=>556,1008=>556,1009=>566,
-1012=>778,1013=>328,1024=>670,1025=>670,1026=>800,1027=>611,1028=>714,1029=>667,1030=>314,1031=>300,
-1032=>576,1033=>1100,1034=>1114,1035=>806,1036=>740,1037=>757,1038=>711,1039=>754,1040=>707,1041=>704,
-1042=>704,1043=>611,1044=>900,1045=>670,1046=>1076,1047=>667,1048=>757,1049=>757,1050=>740,1051=>729,
-1052=>874,1053=>753,1054=>774,1055=>753,1056=>675,1057=>711,1058=>611,1059=>711,1060=>904,1061=>666,
-1062=>816,1063=>698,1064=>1057,1065=>1157,1066=>837,1067=>980,1068=>675,1069=>711,1070=>1093,1071=>708,
-1072=>552,1073=>593,1074=>554,1075=>423,1076=>685,1077=>573,1078=>782,1079=>557,1080=>615,1081=>615,
-1082=>559,1083=>568,1084=>666,1085=>603,1086=>606,1087=>603,1088=>612,1089=>556,1090=>440,1091=>549,
-1092=>964,1093=>539,1094=>652,1095=>554,1096=>886,1097=>968,1098=>699,1099=>778,1100=>568,1101=>556,
-1102=>848,1103=>586,1104=>573,1105=>573,1106=>606,1107=>423,1108=>556,1109=>555,1110=>260,1111=>278,
-1112=>270,1113=>898,1114=>898,1115=>626,1116=>559,1117=>615,1118=>549,1119=>604,1136=>832,1137=>748,
-1138=>774,1139=>606,1154=>449,1155=>0,1156=>0,1157=>0,1158=>0,1159=>0,1160=>0,1161=>0,
-1162=>832,1163=>675,1164=>678,1165=>611,1166=>675,1167=>612,1168=>636,1169=>440,1170=>622,1171=>449,
-1172=>647,1173=>574,1174=>1096,1175=>803,1176=>683,1177=>555,1178=>759,1179=>573,1180=>730,1181=>554,
-1182=>737,1183=>555,1184=>892,1185=>680,1186=>825,1187=>653,1188=>999,1189=>763,1190=>1105,1191=>925,
-1192=>714,1193=>558,1194=>722,1195=>558,1196=>614,1197=>438,1198=>643,1199=>573,1200=>643,1201=>603,
-1202=>670,1203=>548,1204=>952,1205=>738,1206=>781,1207=>615,1208=>698,1209=>588,1210=>687,1211=>588,
-1212=>993,1213=>761,1214=>965,1215=>759,1216=>314,1217=>1076,1218=>809,1219=>700,1220=>543,1221=>793,
-1222=>634,1223=>753,1224=>603,1225=>819,1226=>663,1227=>706,1228=>588,1229=>935,1230=>720,1231=>314,
-1232=>707,1233=>564,1234=>707,1235=>566,1236=>1004,1237=>898,1238=>670,1239=>573,1240=>722,1241=>573,
-1242=>722,1243=>573,1244=>1076,1245=>782,1246=>667,1247=>557,1248=>556,1249=>552,1250=>757,1251=>615,
-1252=>757,1253=>615,1254=>778,1255=>611,1256=>774,1257=>606,1258=>774,1259=>606,1260=>711,1261=>556,
-1262=>700,1263=>544,1264=>701,1265=>539,1266=>700,1267=>537,1268=>698,1269=>554,1270=>611,1271=>432,
-1272=>980,1273=>778,1296=>672,1297=>546,1298=>729,1299=>577,1306=>778,1307=>612,1308=>944,1309=>776,
-1310=>730,1311=>554,1329=>730,1330=>713,1331=>765,1332=>752,1333=>708,1334=>801,1335=>496,1336=>713,
-1337=>855,1338=>686,1339=>727,1340=>420,1341=>897,1342=>841,1343=>708,1344=>660,1345=>666,1346=>747,
-1347=>698,1348=>757,1349=>630,1350=>747,1351=>651,1352=>743,1353=>657,1354=>728,1355=>799,1356=>752,
-1357=>743,1358=>768,1359=>691,1360=>713,1361=>640,1362=>425,1363=>818,1364=>672,1365=>805,1366=>754,
-1369=>333,1370=>222,1371=>250,1372=>333,1373=>333,1374=>352,1375=>362,1377=>873,1378=>613,1379=>634,
-1380=>636,1381=>593,1382=>639,1383=>417,1384=>613,1385=>658,1386=>711,1387=>609,1388=>318,1389=>836,
-1390=>670,1391=>613,1392=>607,1393=>611,1394=>626,1395=>619,1396=>618,1397=>324,1398=>613,1399=>540,
-1400=>591,1401=>392,1402=>873,1403=>577,1404=>603,1405=>600,1406=>626,1407=>951,1408=>613,1409=>612,
-1410=>348,1411=>951,1412=>616,1413=>606,1414=>763,1415=>626,1417=>333,1418=>398,1456=>0,1457=>0,
-1458=>0,1459=>0,1460=>0,1461=>0,1462=>0,1463=>0,1464=>0,1465=>0,1467=>0,1468=>0,
-1469=>0,1470=>516,1471=>0,1472=>297,1473=>0,1474=>0,1475=>333,1476=>0,1488=>714,1489=>651,
-1490=>557,1491=>638,1492=>682,1493=>297,1494=>443,1495=>682,1496=>670,1497=>284,1498=>590,1499=>595,
-1500=>667,1501=>683,1502=>704,1503=>297,1504=>429,1505=>670,1506=>653,1507=>661,1508=>660,1509=>616,
-1510=>671,1511=>672,1512=>600,1513=>840,1514=>756,1520=>554,1521=>550,1522=>542,1523=>238,1524=>474,
-2561=>0,2562=>122,2563=>313,2565=>897,2566=>1157,2567=>930,2568=>966,2569=>762,2570=>762,2575=>729,
-2576=>904,2579=>773,2580=>903,2581=>726,2582=>672,2583=>741,2584=>790,2585=>702,2586=>723,2587=>693,
-2588=>688,2589=>673,2590=>683,2591=>686,2592=>711,2593=>680,2594=>693,2595=>729,2596=>691,2597=>694,
-2598=>699,2599=>666,2600=>669,2602=>683,2603=>690,2604=>660,2605=>659,2606=>692,2607=>772,2608=>673,
-2610=>731,2611=>814,2613=>663,2614=>704,2616=>702,2617=>650,2620=>0,2622=>307,2623=>304,2624=>306,
-2625=>7,2626=>7,2631=>7,2632=>8,2635=>6,2636=>5,2637=>8,2649=>684,2650=>813,2651=>715,
-2652=>695,2654=>709,2662=>697,2663=>630,2664=>696,2665=>690,2666=>646,2667=>636,2668=>571,2669=>682,
-2670=>718,2671=>730,2672=>9,2673=>162,2674=>722,2675=>760,2676=>1110,4256=>616,4257=>645,4258=>664,
-4259=>839,4260=>627,4261=>630,4262=>827,4263=>928,4264=>639,4265=>630,4266=>951,4267=>606,4268=>608,
-4269=>835,4270=>630,4271=>610,4272=>804,4273=>615,4274=>823,4275=>747,4276=>870,4277=>627,4278=>840,
-4279=>627,4280=>665,4281=>610,4282=>799,4283=>598,4284=>665,4285=>664,4286=>608,4287=>886,4288=>629,
-4304=>463,4305=>516,4306=>564,4307=>706,4308=>459,4309=>476,4310=>623,4311=>711,4312=>494,4313=>476,
-4314=>894,4315=>500,4316=>500,4317=>712,4318=>493,4319=>503,4320=>712,4321=>503,4322=>710,4323=>670,
-4324=>707,4325=>459,4326=>691,4327=>465,4328=>492,4329=>480,4330=>656,4331=>500,4332=>492,4333=>524,
-4334=>500,4335=>688,4336=>510,4337=>739,4338=>450,4339=>479,4340=>502,4341=>501,4345=>564,4347=>515,
-7680=>722,7681=>556,7682=>722,7683=>611,7684=>722,7685=>611,7686=>722,7687=>611,7688=>722,7689=>556,
-7690=>722,7691=>611,7692=>722,7693=>611,7694=>722,7695=>611,7696=>722,7697=>611,7698=>722,7699=>611,
-7700=>667,7701=>556,7702=>667,7703=>556,7704=>667,7705=>556,7706=>667,7707=>556,7708=>667,7709=>556,
-7710=>611,7711=>333,7712=>778,7713=>611,7714=>722,7715=>611,7716=>722,7717=>611,7718=>722,7719=>611,
-7720=>722,7721=>611,7722=>722,7723=>611,7724=>278,7725=>278,7726=>278,7727=>278,7728=>722,7729=>556,
-7730=>722,7731=>556,7732=>722,7733=>556,7734=>611,7735=>278,7736=>611,7737=>278,7738=>611,7739=>278,
-7740=>611,7741=>278,7742=>833,7743=>889,7744=>833,7745=>889,7746=>833,7747=>889,7748=>722,7749=>611,
-7750=>722,7751=>611,7752=>722,7753=>611,7754=>722,7755=>611,7756=>778,7757=>611,7758=>778,7759=>611,
-7760=>778,7761=>611,7762=>778,7763=>611,7764=>667,7765=>611,7766=>667,7767=>611,7768=>722,7769=>389,
-7770=>722,7771=>389,7772=>722,7773=>389,7774=>722,7775=>389,7776=>667,7777=>556,7778=>667,7779=>556,
-7780=>667,7781=>556,7782=>667,7783=>556,7784=>667,7785=>556,7786=>611,7787=>333,7788=>611,7789=>333,
-7790=>611,7791=>333,7792=>611,7793=>333,7794=>722,7795=>611,7796=>722,7797=>611,7798=>722,7799=>611,
-7800=>722,7801=>611,7802=>722,7803=>611,7804=>667,7805=>556,7806=>667,7807=>556,7808=>944,7809=>778,
-7810=>944,7811=>778,7812=>944,7813=>778,7814=>944,7815=>778,7816=>944,7817=>778,7818=>667,7819=>556,
-7820=>667,7821=>556,7822=>667,7823=>556,7824=>611,7825=>500,7826=>611,7827=>500,7828=>611,7829=>500,
-7830=>611,7831=>333,7832=>778,7833=>556,7834=>555,7835=>333,7840=>722,7841=>556,7842=>722,7843=>556,
-7844=>722,7845=>556,7846=>722,7847=>556,7848=>667,7849=>556,7850=>722,7851=>556,7852=>722,7853=>556,
-7854=>722,7855=>556,7856=>722,7857=>556,7858=>722,7859=>556,7860=>722,7861=>556,7862=>722,7863=>556,
-7864=>667,7865=>556,7866=>667,7867=>556,7868=>667,7869=>556,7870=>667,7871=>556,7872=>667,7873=>556,
-7874=>667,7875=>556,7876=>667,7877=>556,7878=>667,7879=>556,7880=>278,7881=>278,7882=>278,7883=>278,
-7884=>778,7885=>611,7886=>778,7887=>611,7888=>778,7889=>611,7890=>778,7891=>611,7892=>778,7893=>611,
-7894=>778,7895=>611,7896=>778,7897=>611,7898=>791,7899=>653,7900=>791,7901=>653,7902=>791,7903=>653,
-7904=>791,7905=>653,7906=>791,7907=>653,7908=>722,7909=>611,7910=>722,7911=>611,7912=>769,7913=>656,
-7914=>769,7915=>656,7916=>769,7917=>656,7918=>769,7919=>656,7920=>769,7921=>656,7922=>667,7923=>556,
-7924=>667,7925=>556,7926=>667,7927=>556,7928=>667,7929=>556,7936=>632,7937=>632,7938=>632,7939=>632,
-7940=>632,7941=>632,7942=>632,7943=>632,7944=>696,7945=>696,7946=>865,7947=>849,7948=>796,7949=>807,
-7950=>730,7951=>750,7952=>541,7953=>541,7954=>541,7955=>541,7956=>541,7957=>541,7960=>758,7961=>760,
-7962=>957,7963=>943,7964=>939,7965=>945,7968=>608,7969=>608,7970=>608,7971=>608,7972=>608,7973=>608,
-7974=>608,7975=>608,7976=>823,7977=>831,7978=>1026,7979=>1017,7980=>1002,7981=>1024,7982=>908,7983=>909,
-7984=>315,7985=>315,7986=>373,7987=>375,7988=>378,7989=>374,7990=>370,7991=>384,7992=>378,7993=>383,
-7994=>596,7995=>579,7996=>572,7997=>576,7998=>474,7999=>459,8000=>610,8001=>610,8002=>610,8003=>610,
-8004=>610,8005=>610,8008=>800,8009=>871,8010=>1084,8011=>1079,8012=>975,8013=>973,8016=>568,8017=>568,
-8018=>568,8019=>568,8020=>568,8021=>568,8022=>568,8023=>568,8025=>906,8027=>1080,8029=>1115,8031=>977,
-8032=>778,8033=>778,8034=>778,8035=>778,8036=>778,8037=>778,8038=>778,8039=>778,8040=>837,8041=>860,
-8042=>1062,8043=>1072,8044=>962,8045=>985,8046=>922,8047=>959,8048=>632,8049=>632,8050=>541,8051=>541,
-8052=>608,8053=>608,8054=>315,8055=>315,8056=>610,8057=>610,8058=>568,8059=>568,8060=>778,8061=>778,
-8064=>632,8065=>632,8066=>632,8067=>632,8068=>632,8069=>632,8070=>632,8071=>632,8072=>909,8073=>906,
-8074=>1061,8075=>1035,8076=>984,8077=>994,8078=>910,8079=>916,8080=>608,8081=>608,8082=>608,8083=>608,
-8084=>608,8085=>608,8086=>608,8087=>608,8088=>1006,8089=>1015,8090=>1204,8091=>1207,8092=>1188,8093=>1209,
-8094=>1096,8095=>1105,8096=>778,8097=>778,8098=>778,8099=>778,8100=>778,8101=>778,8102=>778,8103=>778,
-8104=>1026,8105=>1048,8106=>1251,8107=>1260,8108=>1150,8109=>1177,8110=>1106,8111=>1142,8112=>632,8113=>632,
-8114=>632,8115=>632,8116=>660,8118=>632,8119=>632,8120=>696,8121=>696,8122=>696,8123=>696,8124=>907,
-8125=>278,8126=>346,8127=>278,8128=>278,8129=>333,8130=>608,8131=>608,8132=>560,8134=>608,8135=>608,
-8136=>776,8137=>793,8138=>847,8139=>854,8140=>848,8141=>492,8142=>489,8143=>394,8144=>335,8145=>354,
-8146=>367,8147=>368,8150=>353,8151=>366,8152=>240,8153=>259,8154=>418,8155=>416,8157=>481,8158=>589,
-8159=>333,8160=>568,8161=>568,8162=>568,8163=>568,8164=>595,8165=>595,8166=>568,8167=>568,8168=>771,
-8169=>771,8170=>951,8171=>982,8172=>806,8173=>333,8174=>333,8175=>333,8178=>778,8179=>778,8180=>778,
-8182=>778,8183=>778,8184=>909,8185=>809,8186=>897,8187=>825,8188=>978,8189=>333,8190=>278,8192=>500,
-8193=>1000,8194=>500,8195=>1000,8196=>333,8197=>250,8198=>167,8199=>556,8200=>278,8201=>200,8202=>100,
-8203=>0,8204=>0,8205=>0,8206=>0,8207=>0,8208=>333,8209=>333,8210=>556,8213=>1000,8214=>437,
-8215=>556,8219=>278,8223=>500,8227=>350,8228=>278,8229=>666,8231=>278,8232=>0,8233=>0,8234=>0,
-8235=>0,8236=>0,8237=>0,8238=>0,8239=>500,8241=>1367,8242=>238,8243=>426,8244=>614,8245=>238,
-8246=>379,8247=>571,8248=>450,8251=>622,8252=>666,8253=>614,8254=>556,8255=>658,8256=>658,8257=>438,
-8258=>840,8259=>400,8260=>167,8261=>334,8262=>334,8263=>1222,8264=>944,8265=>944,8266=>556,8267=>537,
-8268=>537,8269=>537,8270=>389,8271=>333,8272=>658,8273=>389,8274=>634,8275=>568,8276=>658,8277=>793,
-8278=>515,8279=>855,8280=>722,8281=>725,8282=>224,8283=>722,8284=>604,8285=>224,8286=>224,8287=>0,
-8288=>0,8289=>0,8290=>0,8291=>0,8292=>0,8304=>351,8305=>351,8308=>351,8309=>351,8310=>351,
-8311=>351,8312=>351,8313=>351,8314=>351,8315=>351,8316=>351,8317=>351,8318=>351,8319=>351,8320=>351,
-8321=>301,8322=>351,8323=>351,8324=>351,8325=>351,8326=>351,8327=>351,8328=>351,8329=>351,8330=>350,
-8331=>350,8332=>350,8333=>350,8334=>350,8355=>611,8356=>591,8357=>889,8358=>727,8360=>1265,8362=>1049,
-8363=>580,8368=>605,8373=>591,8400=>0,8401=>0,8402=>0,8403=>0,8406=>0,8407=>0,8411=>0,
-8412=>0,8413=>0,8414=>0,8415=>0,8416=>0,8417=>0,8421=>0,8422=>0,8423=>0,8424=>0,
-8425=>0,8426=>0,8427=>0,8428=>0,8429=>0,8430=>0,8431=>0,8432=>0,8448=>985,8449=>1007,
-8451=>1034,8453=>981,8454=>1042,8455=>667,8457=>919,8465=>606,8468=>881,8470=>979,8471=>784,8476=>699,
-8480=>1000,8481=>1230,8486=>766,8487=>778,8489=>315,8490=>741,8491=>729,8494=>556,8498=>588,8501=>714,
-8502=>651,8503=>557,8504=>638,8506=>871,8507=>1230,8513=>778,8514=>611,8515=>611,8516=>667,8523=>669,
-8525=>1072,8526=>482,8531=>869,8532=>869,8533=>869,8534=>869,8535=>869,8536=>869,8537=>869,8538=>869,
-8539=>869,8540=>869,8541=>869,8542=>869,8543=>869,8544=>278,8545=>556,8546=>834,8547=>945,8548=>667,
-8549=>945,8550=>1223,8551=>1501,8552=>945,8553=>667,8554=>945,8555=>1223,8556=>611,8557=>722,8558=>722,
-8559=>833,8560=>278,8561=>556,8562=>834,8563=>834,8564=>556,8565=>834,8566=>1112,8567=>1390,8568=>834,
-8569=>556,8570=>834,8571=>1112,8572=>278,8573=>556,8574=>611,8575=>889,8592=>964,8593=>964,8594=>964,
-8595=>964,8596=>964,8597=>964,8598=>964,8599=>964,8600=>964,8601=>964,8602=>964,8603=>964,8606=>964,
-8607=>964,8608=>964,8609=>964,8610=>964,8611=>964,8612=>964,8613=>964,8614=>964,8615=>964,8616=>964,
-8644=>964,8645=>964,8646=>964,8647=>964,8648=>964,8649=>964,8650=>964,8704=>722,8706=>556,8707=>667,
-8710=>729,8711=>729,8721=>856,8722=>584,8725=>869,8730=>594,8747=>608,8800=>548,8804=>584,8805=>584,
-9251=>500,9674=>541,9772=>923,9824=>626,9825=>694,9826=>595,9827=>776,9828=>626,9829=>694,9830=>595,
-9831=>776,9833=>333,9834=>556,9835=>778,9836=>778,9837=>556,9838=>556,9839=>556,10048=>1453,11799=>333,
-64256=>607,64257=>576,64258=>603,64259=>849,64260=>849,64275=>1243,64276=>1226,64277=>1233,64278=>1238,64279=>1448,
-64285=>284,64286=>305,64287=>542,64288=>653,64289=>964,64290=>888,64291=>932,64292=>845,64293=>917,64294=>933,
-64295=>850,64296=>1006,64297=>584,64298=>840,64299=>840,64300=>840,64301=>840,64302=>714,64303=>714,64304=>714,
-64305=>651,64306=>557,64307=>638,64308=>682,64309=>348,64310=>443,64312=>670,64313=>354,64314=>590,64315=>595,
-64316=>667,64318=>704,64320=>429,64321=>670,64323=>661,64324=>660,64326=>671,64327=>672,64328=>600,64329=>840,
-64330=>756,64331=>212,64332=>591,64333=>550,64334=>568,64335=>714,65533=>788);
-$enc='';
-$diff='';
-$file='freesansb.z';
-$ctg='freesansb.ctg.z';
-$originalsize=283180;
-?>
\ No newline at end of file
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freesansb.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freesansb.z
deleted file mode 100644
index 800fed29..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freesansb.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freesansbi.ctg.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freesansbi.ctg.z
deleted file mode 100644
index 9e8a3c72..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freesansbi.ctg.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freesansbi.php b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freesansbi.php
deleted file mode 100644
index 783eb3cd..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freesansbi.php
+++ /dev/null
@@ -1,225 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='FreeSansBoldOblique';
-$desc=array('Ascent'=>1000,'Descent'=>-300,'CapHeight'=>22,'Flags'=>96,'FontBBox'=>'[-769 -1175 1591 1639]','ItalicAngle'=>-12,'StemV'=>120,'MissingWidth'=>600);
-$up=-145;
-$ut=69;
-$dw=600;
-$cw=array(
-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,8364=>640,8218=>278,402=>556,8222=>500,8230=>1000,
-8224=>556,8225=>556,710=>333,8240=>1000,352=>667,8249=>333,338=>1000,381=>611,8216=>278,8217=>278,
-8220=>500,8221=>500,8226=>350,8211=>556,8212=>1000,732=>333,8482=>1000,353=>556,8250=>333,339=>944,
-382=>500,376=>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=>606,177=>584,
-178=>350,179=>350,180=>333,181=>667,182=>556,183=>278,184=>333,185=>248,186=>365,187=>556,
-188=>869,189=>869,190=>869,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,256=>722,257=>556,
-258=>722,259=>556,260=>722,261=>556,262=>722,263=>556,264=>722,265=>556,266=>722,267=>556,
-268=>722,269=>556,270=>722,271=>722,272=>722,273=>611,274=>667,275=>556,276=>667,277=>556,
-278=>667,279=>556,280=>667,281=>556,282=>667,283=>556,284=>778,285=>611,286=>778,287=>611,
-288=>778,289=>611,290=>778,291=>611,292=>722,293=>611,294=>722,295=>611,296=>278,297=>278,
-298=>278,299=>278,300=>278,301=>278,302=>278,303=>268,304=>278,305=>278,306=>796,307=>487,
-308=>556,309=>278,310=>722,311=>556,312=>529,313=>611,314=>278,315=>611,316=>278,317=>611,
-318=>384,319=>611,320=>556,321=>611,322=>278,323=>722,324=>611,325=>722,326=>611,327=>722,
-328=>611,329=>611,330=>722,331=>611,332=>778,333=>611,334=>778,335=>611,336=>778,337=>611,
-340=>722,341=>389,342=>722,343=>389,344=>722,345=>389,346=>667,347=>556,348=>667,349=>556,
-350=>667,351=>556,354=>611,355=>333,356=>611,357=>404,358=>611,359=>404,360=>722,361=>611,
-362=>722,363=>611,364=>722,365=>611,366=>722,367=>611,368=>722,369=>611,370=>722,371=>611,
-372=>944,373=>778,374=>667,375=>556,377=>611,378=>500,379=>611,380=>500,383=>333,384=>611,
-385=>963,386=>722,387=>611,388=>687,389=>611,390=>722,391=>752,392=>562,393=>722,394=>968,
-395=>722,396=>611,397=>609,398=>667,399=>778,400=>672,401=>611,403=>778,404=>667,405=>889,
-406=>278,407=>395,408=>778,409=>556,410=>333,411=>620,412=>889,413=>722,414=>611,415=>778,
-416=>778,417=>611,418=>1111,419=>722,420=>914,421=>611,422=>647,423=>667,424=>556,425=>688,
-426=>441,427=>333,428=>742,429=>333,430=>611,431=>722,432=>611,433=>780,434=>722,435=>667,
-436=>706,437=>611,438=>500,439=>556,440=>556,441=>645,442=>569,443=>579,446=>611,447=>608,
-448=>260,449=>370,450=>584,451=>278,452=>1333,453=>1222,454=>1111,455=>1167,456=>889,457=>556,
-458=>1278,459=>1000,460=>889,461=>722,462=>556,463=>278,464=>278,465=>778,466=>611,467=>722,
-468=>611,469=>722,470=>611,471=>722,472=>611,473=>722,474=>611,475=>722,476=>611,477=>556,
-478=>722,479=>556,480=>722,481=>556,482=>1000,483=>889,484=>811,485=>641,486=>778,487=>611,
-488=>722,489=>556,490=>778,491=>611,492=>778,493=>611,494=>556,495=>556,496=>278,497=>1333,
-498=>1222,499=>1111,500=>778,501=>611,503=>630,504=>722,505=>611,506=>722,507=>556,508=>1000,
-509=>889,510=>778,511=>611,512=>722,513=>556,514=>722,515=>556,516=>667,517=>556,518=>667,
-519=>556,520=>278,521=>278,522=>278,523=>278,524=>778,525=>611,526=>778,527=>611,528=>722,
-529=>389,530=>722,531=>389,532=>722,533=>611,534=>722,535=>611,536=>667,537=>556,538=>611,
-539=>333,540=>569,541=>486,542=>722,543=>611,548=>645,549=>500,550=>722,551=>556,552=>667,
-553=>556,554=>778,555=>611,556=>778,557=>611,558=>778,559=>611,560=>778,561=>611,562=>667,
-563=>556,567=>278,592=>556,593=>611,594=>611,595=>611,596=>556,597=>600,598=>611,599=>611,
-600=>556,601=>556,602=>834,603=>570,604=>546,605=>820,606=>570,607=>278,608=>611,609=>611,
-610=>556,611=>556,612=>656,613=>619,614=>611,615=>611,616=>278,617=>344,618=>278,619=>473,
-620=>527,621=>298,622=>778,623=>889,624=>889,625=>889,626=>611,627=>611,628=>615,629=>590,
-630=>878,631=>822,632=>778,633=>389,634=>389,635=>389,636=>389,637=>389,638=>455,639=>455,
-640=>620,641=>586,642=>556,643=>333,644=>278,645=>333,646=>544,647=>328,648=>333,649=>623,
-650=>726,651=>639,652=>556,653=>778,654=>556,655=>556,656=>500,657=>571,658=>556,659=>642,
-660=>611,661=>611,662=>611,664=>611,665=>572,666=>570,667=>616,668=>603,669=>552,670=>556,
-671=>454,672=>611,673=>611,674=>611,684=>520,688=>500,689=>500,690=>167,691=>333,692=>333,
-693=>333,694=>348,695=>500,696=>345,697=>278,698=>454,699=>278,700=>333,701=>278,702=>333,
-703=>333,704=>333,705=>333,706=>333,707=>333,708=>333,709=>333,711=>333,712=>333,713=>333,
-714=>333,715=>333,716=>272,717=>333,718=>333,719=>333,720=>333,721=>333,722=>333,723=>333,
-724=>333,725=>333,726=>333,727=>333,728=>333,729=>333,730=>333,731=>333,733=>333,734=>333,
-735=>510,736=>333,737=>333,738=>333,739=>357,740=>334,741=>526,742=>526,743=>526,744=>526,
-745=>526,746=>519,747=>519,748=>333,749=>333,750=>333,751=>333,752=>333,753=>333,754=>333,
-755=>333,756=>333,757=>437,758=>437,759=>400,760=>333,761=>200,762=>200,763=>200,764=>200,
-765=>332,766=>333,767=>333,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,832=>0,833=>0,834=>0,
-835=>0,836=>0,837=>0,838=>0,839=>0,840=>0,841=>0,842=>0,843=>0,844=>0,
-845=>0,846=>0,847=>0,848=>0,849=>0,850=>0,851=>0,852=>0,853=>0,854=>0,
-855=>0,856=>0,857=>0,858=>0,859=>0,860=>0,861=>0,862=>0,863=>0,864=>0,
-865=>0,866=>0,867=>0,868=>0,869=>0,870=>0,871=>0,872=>0,873=>0,874=>0,
-875=>0,876=>0,877=>0,878=>0,879=>0,884=>208,885=>247,890=>364,894=>333,900=>239,
-901=>446,902=>688,903=>333,904=>903,905=>962,906=>448,908=>904,910=>991,911=>932,912=>346,
-913=>764,914=>688,915=>642,916=>744,917=>710,918=>688,919=>743,920=>810,921=>296,922=>744,
-923=>744,924=>860,925=>714,926=>690,927=>822,928=>781,929=>698,931=>688,932=>688,933=>744,
-934=>777,935=>783,936=>805,937=>780,938=>296,939=>744,940=>640,941=>530,942=>597,943=>339,
-944=>575,945=>656,946=>576,947=>591,948=>620,949=>570,950=>522,951=>586,952=>586,953=>346,
-954=>576,955=>620,956=>667,957=>564,958=>530,959=>610,960=>721,961=>626,962=>595,963=>676,
-964=>592,965=>575,966=>801,967=>632,968=>722,969=>800,970=>346,971=>575,972=>609,973=>604,
-974=>769,977=>580,978=>742,979=>857,980=>620,981=>778,982=>740,983=>601,1008=>556,1009=>566,
-1012=>778,1013=>328,1024=>667,1025=>667,1026=>790,1027=>617,1028=>731,1029=>667,1030=>278,1031=>278,
-1032=>556,1033=>1110,1034=>1088,1035=>790,1036=>722,1037=>757,1038=>698,1039=>722,1040=>722,1041=>722,
-1042=>722,1043=>617,1044=>876,1045=>667,1046=>1100,1047=>670,1048=>757,1049=>757,1050=>722,1051=>715,
-1052=>874,1053=>753,1054=>778,1055=>753,1056=>680,1057=>722,1058=>611,1059=>698,1060=>909,1061=>657,
-1062=>845,1063=>688,1064=>1132,1065=>1217,1066=>835,1067=>980,1068=>678,1069=>735,1070=>1142,1071=>708,
-1072=>553,1073=>591,1074=>574,1075=>429,1076=>745,1077=>572,1078=>792,1079=>554,1080=>603,1081=>603,
-1082=>559,1083=>583,1084=>664,1085=>603,1086=>588,1087=>603,1088=>605,1089=>549,1090=>440,1091=>541,
-1092=>948,1093=>539,1094=>690,1095=>564,1096=>901,1097=>987,1098=>692,1099=>806,1100=>572,1101=>546,
-1102=>893,1103=>586,1104=>572,1105=>572,1106=>616,1107=>429,1108=>549,1109=>562,1110=>281,1111=>281,
-1112=>282,1113=>888,1114=>897,1115=>606,1116=>559,1117=>603,1118=>541,1119=>603,1136=>830,1137=>761,
-1138=>778,1139=>590,1154=>456,1155=>0,1156=>0,1157=>0,1158=>0,1159=>0,1160=>0,1161=>0,
-1162=>791,1163=>662,1164=>639,1165=>581,1166=>670,1167=>649,1168=>623,1169=>450,1170=>623,1171=>472,
-1172=>674,1173=>528,1174=>1091,1175=>803,1176=>659,1177=>548,1178=>739,1179=>569,1180=>742,1181=>560,
-1182=>737,1183=>559,1184=>900,1185=>679,1186=>808,1187=>673,1188=>1004,1189=>761,1190=>1114,1191=>876,
-1192=>721,1193=>548,1194=>724,1195=>554,1196=>611,1197=>454,1198=>667,1199=>584,1200=>652,1201=>632,
-1202=>667,1203=>550,1204=>951,1205=>748,1206=>759,1207=>630,1208=>669,1209=>580,1210=>672,1211=>576,
-1212=>977,1213=>752,1214=>957,1215=>752,1216=>318,1217=>1087,1218=>792,1219=>726,1220=>530,1221=>782,
-1222=>674,1223=>749,1224=>603,1225=>823,1226=>682,1227=>675,1228=>573,1229=>941,1230=>754,1231=>310,
-1232=>704,1233=>553,1234=>711,1235=>553,1236=>1000,1237=>889,1238=>667,1239=>569,1240=>738,1241=>561,
-1242=>738,1243=>561,1244=>1086,1245=>792,1246=>670,1247=>554,1248=>558,1249=>546,1250=>753,1251=>603,
-1252=>753,1253=>603,1254=>778,1255=>588,1256=>778,1257=>590,1258=>778,1259=>590,1260=>735,1261=>546,
-1262=>698,1263=>541,1264=>698,1265=>541,1266=>698,1267=>541,1268=>686,1269=>564,1270=>617,1271=>475,
-1272=>976,1273=>806,1296=>672,1297=>546,1298=>729,1299=>577,1306=>778,1307=>611,1308=>944,1309=>776,
-1310=>750,1311=>573,1329=>730,1330=>713,1331=>765,1332=>752,1333=>708,1334=>801,1335=>496,1336=>713,
-1337=>855,1338=>686,1339=>727,1340=>420,1341=>897,1342=>841,1343=>708,1344=>660,1345=>666,1346=>747,
-1347=>698,1348=>757,1349=>630,1350=>747,1351=>651,1352=>743,1353=>657,1354=>728,1355=>799,1356=>752,
-1357=>743,1358=>768,1359=>691,1360=>713,1361=>640,1362=>425,1363=>818,1364=>672,1365=>805,1366=>754,
-1369=>333,1370=>222,1371=>250,1372=>333,1373=>333,1374=>352,1375=>362,1377=>873,1378=>613,1379=>634,
-1380=>636,1381=>593,1382=>639,1383=>417,1384=>613,1385=>658,1386=>711,1387=>609,1388=>318,1389=>836,
-1390=>670,1391=>613,1392=>607,1393=>611,1394=>626,1395=>619,1396=>618,1397=>324,1398=>613,1399=>540,
-1400=>591,1401=>392,1402=>873,1403=>577,1404=>603,1405=>600,1406=>626,1407=>951,1408=>613,1409=>612,
-1410=>348,1411=>951,1412=>616,1413=>606,1414=>763,1415=>626,1417=>333,1418=>398,1456=>0,1457=>0,
-1458=>0,1459=>0,1460=>0,1461=>0,1462=>0,1463=>0,1464=>0,1465=>0,1467=>0,1468=>0,
-1469=>0,1470=>516,1471=>0,1472=>297,1473=>0,1474=>0,1475=>333,1476=>0,1488=>714,1489=>651,
-1490=>557,1491=>638,1492=>682,1493=>297,1494=>443,1495=>682,1496=>670,1497=>284,1498=>590,1499=>595,
-1500=>667,1501=>683,1502=>704,1503=>297,1504=>429,1505=>670,1506=>653,1507=>661,1508=>660,1509=>616,
-1510=>671,1511=>672,1512=>600,1513=>840,1514=>756,1520=>554,1521=>550,1522=>542,1523=>238,1524=>474,
-4256=>616,4257=>645,4258=>664,4259=>839,4260=>627,4261=>630,4262=>827,4263=>928,4264=>639,4265=>630,
-4266=>951,4267=>606,4268=>608,4269=>835,4270=>630,4271=>610,4272=>804,4273=>615,4274=>823,4275=>747,
-4276=>870,4277=>627,4278=>840,4279=>627,4280=>665,4281=>610,4282=>799,4283=>598,4284=>665,4285=>664,
-4286=>608,4287=>886,4288=>629,4304=>463,4305=>516,4306=>564,4307=>706,4308=>459,4309=>476,4310=>623,
-4311=>711,4312=>494,4313=>476,4314=>894,4315=>500,4316=>500,4317=>712,4318=>493,4319=>503,4320=>712,
-4321=>503,4322=>710,4323=>670,4324=>707,4325=>459,4326=>691,4327=>465,4328=>492,4329=>480,4330=>656,
-4331=>500,4332=>492,4333=>524,4334=>500,4335=>688,4336=>510,4337=>739,4338=>450,4339=>479,4340=>502,
-4341=>501,4345=>564,4347=>515,7680=>722,7681=>556,7682=>722,7683=>611,7684=>722,7685=>611,7686=>722,
-7687=>611,7688=>722,7689=>556,7690=>722,7691=>611,7692=>722,7693=>611,7694=>722,7695=>611,7696=>722,
-7697=>611,7698=>722,7699=>611,7700=>667,7701=>556,7702=>667,7703=>556,7704=>667,7705=>556,7706=>667,
-7707=>556,7708=>667,7709=>556,7710=>611,7711=>333,7712=>778,7713=>611,7714=>722,7715=>611,7716=>722,
-7717=>611,7718=>722,7719=>611,7720=>722,7721=>611,7722=>722,7723=>611,7724=>278,7725=>278,7726=>278,
-7727=>278,7728=>722,7729=>556,7730=>722,7731=>556,7732=>722,7733=>556,7734=>611,7735=>278,7736=>611,
-7737=>278,7738=>611,7739=>278,7740=>611,7741=>278,7742=>833,7743=>889,7744=>833,7745=>889,7746=>833,
-7747=>889,7748=>722,7749=>611,7750=>722,7751=>611,7752=>722,7753=>611,7754=>722,7755=>611,7756=>778,
-7757=>611,7758=>778,7759=>611,7760=>778,7761=>611,7762=>778,7763=>611,7764=>667,7765=>611,7766=>667,
-7767=>611,7768=>722,7769=>389,7770=>722,7771=>389,7772=>722,7773=>389,7774=>722,7775=>389,7776=>667,
-7777=>556,7778=>667,7779=>556,7780=>667,7781=>556,7782=>667,7783=>556,7784=>667,7785=>556,7786=>611,
-7787=>333,7788=>611,7789=>333,7790=>611,7791=>333,7792=>611,7793=>333,7794=>722,7795=>611,7796=>722,
-7797=>611,7798=>722,7799=>611,7800=>722,7801=>611,7802=>722,7803=>611,7804=>667,7805=>556,7806=>667,
-7807=>556,7808=>944,7809=>778,7810=>944,7811=>778,7812=>944,7813=>778,7814=>944,7815=>778,7816=>944,
-7817=>778,7818=>667,7819=>556,7820=>667,7821=>556,7822=>667,7823=>556,7824=>611,7825=>500,7826=>611,
-7827=>500,7828=>611,7829=>500,7830=>611,7831=>333,7832=>778,7833=>556,7834=>555,7835=>333,7840=>722,
-7841=>556,7842=>722,7843=>556,7844=>722,7845=>556,7846=>722,7847=>556,7848=>722,7849=>556,7850=>722,
-7851=>556,7852=>722,7853=>556,7854=>722,7855=>556,7856=>722,7857=>556,7858=>722,7859=>556,7860=>722,
-7861=>556,7862=>722,7863=>556,7864=>667,7865=>556,7866=>667,7867=>556,7868=>667,7869=>556,7870=>667,
-7871=>556,7872=>667,7873=>556,7874=>667,7875=>556,7876=>667,7877=>556,7878=>667,7879=>556,7880=>278,
-7881=>278,7882=>278,7883=>278,7884=>778,7885=>611,7886=>778,7887=>611,7888=>778,7889=>611,7890=>778,
-7891=>611,7892=>778,7893=>611,7894=>778,7895=>611,7896=>778,7897=>611,7898=>778,7899=>611,7900=>778,
-7901=>611,7902=>778,7903=>611,7904=>778,7905=>611,7906=>778,7907=>611,7908=>722,7909=>611,7910=>722,
-7911=>611,7912=>722,7913=>611,7914=>722,7915=>611,7916=>722,7917=>611,7918=>722,7919=>611,7920=>722,
-7921=>611,7922=>667,7923=>556,7924=>667,7925=>556,7926=>667,7927=>556,7928=>667,7929=>556,7936=>656,
-7937=>656,7938=>656,7939=>656,7940=>656,7941=>656,7942=>656,7943=>656,7944=>764,7945=>764,7946=>916,
-7947=>940,7948=>908,7949=>891,7950=>844,7951=>869,7952=>570,7953=>570,7954=>570,7955=>570,7956=>570,
-7957=>570,7960=>842,7961=>836,7962=>1025,7963=>1051,7964=>1035,7965=>1049,7968=>586,7969=>586,7970=>586,
-7971=>586,7972=>586,7973=>586,7974=>586,7975=>586,7976=>891,7977=>886,7978=>1081,7979=>1108,7980=>1085,
-7981=>1096,7982=>1009,7983=>1023,7984=>346,7985=>346,7986=>346,7987=>346,7988=>346,7989=>346,7990=>346,
-7991=>346,7992=>467,7993=>476,7994=>631,7995=>661,7996=>631,7997=>633,7998=>568,7999=>571,8000=>610,
-8001=>610,8002=>610,8003=>610,8004=>610,8005=>610,8008=>945,8009=>905,8010=>1118,8011=>1121,8012=>1064,
-8013=>1062,8016=>575,8017=>575,8018=>575,8019=>575,8020=>575,8021=>575,8022=>575,8023=>575,8025=>964,
-8027=>1148,8029=>1162,8031=>1081,8032=>800,8033=>800,8034=>800,8035=>800,8036=>800,8037=>800,8038=>800,
-8039=>800,8040=>904,8041=>875,8042=>1092,8043=>1087,8044=>1003,8045=>1002,8046=>1001,8047=>1025,8048=>656,
-8049=>656,8050=>570,8051=>570,8052=>586,8053=>586,8054=>346,8055=>346,8056=>610,8057=>610,8058=>575,
-8059=>575,8060=>800,8061=>800,8064=>656,8065=>656,8066=>656,8067=>656,8068=>656,8069=>656,8070=>656,
-8071=>656,8072=>854,8073=>855,8074=>1006,8075=>1030,8076=>996,8077=>977,8078=>938,8079=>959,8080=>586,
-8081=>586,8082=>586,8083=>586,8084=>586,8085=>586,8086=>586,8087=>586,8088=>960,8089=>960,8090=>1155,
-8091=>1186,8092=>1161,8093=>1171,8094=>1087,8095=>1102,8096=>800,8097=>800,8098=>800,8099=>800,8100=>800,
-8101=>800,8102=>800,8103=>800,8104=>1005,8105=>980,8106=>1201,8107=>1192,8108=>1109,8109=>1108,8110=>1106,
-8111=>1130,8112=>656,8113=>656,8114=>656,8115=>656,8116=>640,8118=>656,8119=>656,8120=>764,8121=>764,
-8122=>764,8123=>764,8124=>854,8125=>278,8126=>201,8127=>147,8128=>278,8129=>333,8130=>586,8131=>586,
-8132=>597,8134=>586,8135=>586,8136=>911,8137=>925,8138=>941,8139=>948,8140=>826,8141=>402,8142=>403,
-8143=>147,8144=>346,8145=>346,8146=>346,8147=>346,8150=>346,8151=>346,8152=>296,8153=>296,8154=>511,
-8155=>521,8157=>434,8158=>433,8159=>333,8160=>575,8161=>575,8162=>575,8163=>575,8164=>626,8165=>626,
-8166=>575,8167=>575,8168=>744,8169=>744,8170=>901,8171=>975,8172=>837,8173=>353,8174=>351,8175=>303,
-8178=>800,8179=>800,8180=>800,8182=>800,8183=>800,8184=>979,8185=>918,8186=>936,8187=>877,8188=>895,
-8189=>333,8190=>159,8192=>500,8193=>1000,8194=>500,8195=>1000,8196=>333,8197=>250,8198=>167,8199=>556,
-8200=>278,8201=>200,8202=>100,8203=>0,8204=>0,8205=>0,8206=>0,8207=>0,8208=>333,8209=>333,
-8210=>556,8213=>1000,8214=>437,8215=>556,8219=>278,8223=>503,8227=>350,8228=>278,8229=>666,8231=>278,
-8232=>0,8233=>0,8234=>0,8235=>0,8236=>0,8237=>0,8238=>0,8239=>500,8241=>1372,8242=>238,
-8243=>426,8244=>614,8245=>238,8246=>379,8247=>571,8248=>450,8251=>622,8252=>666,8253=>617,8254=>556,
-8255=>658,8256=>658,8257=>438,8258=>840,8259=>400,8260=>167,8261=>334,8262=>334,8263=>1222,8264=>944,
-8265=>944,8266=>556,8267=>556,8268=>537,8269=>537,8270=>389,8271=>333,8272=>658,8273=>389,8274=>634,
-8275=>568,8276=>658,8277=>793,8278=>515,8279=>855,8280=>722,8281=>725,8282=>224,8283=>722,8284=>604,
-8285=>224,8286=>224,8287=>0,8288=>0,8289=>0,8290=>0,8291=>0,8292=>0,8304=>351,8305=>351,
-8308=>351,8309=>351,8310=>351,8311=>351,8312=>351,8313=>351,8314=>351,8315=>351,8316=>351,8317=>351,
-8318=>351,8319=>351,8320=>351,8321=>251,8322=>351,8323=>351,8324=>351,8325=>351,8326=>351,8327=>351,
-8328=>351,8329=>351,8330=>350,8331=>350,8332=>350,8333=>350,8334=>350,8355=>611,8356=>576,8357=>833,
-8358=>724,8360=>1286,8362=>1049,8363=>571,8368=>594,8373=>591,8448=>985,8449=>1007,8451=>1020,8453=>981,
-8454=>1042,8455=>667,8457=>930,8465=>606,8468=>883,8470=>1006,8471=>784,8476=>699,8480=>1000,8481=>1230,
-8486=>780,8487=>780,8489=>286,8490=>722,8491=>722,8494=>556,8498=>626,8501=>714,8502=>651,8503=>557,
-8504=>638,8506=>906,8507=>1155,8513=>778,8514=>611,8515=>611,8516=>667,8523=>710,8525=>1072,8526=>500,
-8531=>869,8532=>869,8533=>869,8534=>869,8535=>869,8536=>869,8537=>869,8538=>869,8539=>869,8540=>869,
-8541=>869,8542=>869,8543=>869,8544=>278,8545=>556,8546=>834,8547=>945,8548=>667,8549=>945,8550=>1223,
-8551=>1501,8552=>945,8553=>667,8554=>945,8555=>1223,8556=>611,8557=>722,8558=>722,8559=>833,8560=>278,
-8561=>556,8562=>834,8563=>834,8564=>556,8565=>834,8566=>1112,8567=>1390,8568=>834,8569=>556,8570=>834,
-8571=>1112,8572=>278,8573=>556,8574=>611,8575=>889,8592=>964,8593=>964,8594=>964,8595=>964,8596=>964,
-8597=>964,8598=>964,8599=>964,8600=>964,8601=>964,8602=>964,8603=>964,8606=>964,8607=>964,8608=>964,
-8609=>964,8610=>964,8611=>964,8612=>964,8613=>964,8614=>964,8615=>964,8616=>964,8644=>964,8645=>964,
-8646=>964,8647=>964,8648=>964,8649=>964,8650=>964,8706=>608,8710=>729,8721=>856,8722=>584,8723=>584,
-8725=>1107,8730=>597,8800=>584,8804=>584,8805=>584,9251=>500,9674=>489,9824=>626,9825=>694,9826=>595,
-9827=>776,9828=>626,9829=>694,9830=>595,9831=>776,9833=>333,9834=>556,9835=>778,9836=>778,9837=>556,
-9838=>556,9839=>556,11799=>333,64256=>607,64257=>576,64258=>603,64259=>849,64260=>849,64275=>1243,64276=>1226,
-64277=>1233,64278=>1238,64279=>1448,64285=>284,64286=>305,64287=>542,64288=>653,64289=>964,64290=>888,64291=>932,
-64292=>845,64293=>917,64294=>933,64295=>850,64296=>1006,64297=>584,64298=>840,64299=>840,64300=>840,64301=>840,
-64302=>714,64303=>714,64304=>714,64305=>651,64306=>557,64307=>638,64308=>682,64309=>348,64310=>443,64312=>670,
-64313=>354,64314=>590,64315=>595,64316=>667,64318=>704,64320=>429,64321=>670,64323=>661,64324=>660,64326=>671,
-64327=>672,64328=>600,64329=>840,64330=>756,64331=>212,64332=>591,64333=>550,64334=>568,64335=>714,65533=>788);
-$enc='';
-$diff='';
-$file='freesansbi.z';
-$ctg='freesansbi.ctg.z';
-$originalsize=269952;
-?>
\ No newline at end of file
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freesansbi.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freesansbi.z
deleted file mode 100644
index 62a33225..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freesansbi.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freesansi.ctg.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freesansi.ctg.z
deleted file mode 100644
index fe5d4717..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freesansi.ctg.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freesansi.php b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freesansi.php
deleted file mode 100644
index 5b9c3541..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freesansi.php
+++ /dev/null
@@ -1,239 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='FreeSansOblique';
-$desc=array('Ascent'=>1000,'Descent'=>-300,'CapHeight'=>22,'Flags'=>96,'FontBBox'=>'[-898 -431 1572 1072]','ItalicAngle'=>-12,'StemV'=>70,'MissingWidth'=>600);
-$up=-176;
-$ut=50;
-$dw=600;
-$cw=array(
-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,8364=>655,8218=>222,402=>278,8222=>333,8230=>1000,
-8224=>556,8225=>556,710=>333,8240=>1000,352=>667,8249=>250,338=>1000,381=>611,8216=>222,8217=>222,
-8220=>333,8221=>333,8226=>350,8211=>556,8212=>1000,732=>333,8482=>1000,353=>500,8250=>250,339=>944,
-382=>500,376=>667,160=>278,161=>333,162=>556,163=>556,164=>556,165=>556,166=>260,167=>556,
-168=>333,169=>737,170=>370,171=>444,172=>584,173=>333,174=>737,175=>333,176=>606,177=>584,
-178=>352,179=>352,180=>333,181=>556,182=>537,183=>278,184=>333,185=>250,186=>365,187=>444,
-188=>947,189=>947,190=>947,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,256=>667,257=>556,
-258=>667,259=>556,260=>667,261=>556,262=>722,263=>500,264=>722,265=>500,266=>722,267=>500,
-268=>722,269=>500,270=>722,271=>722,272=>722,273=>556,274=>667,275=>556,276=>667,277=>556,
-278=>667,279=>556,280=>667,281=>556,282=>667,283=>556,284=>778,285=>556,286=>778,287=>556,
-288=>778,289=>556,290=>778,291=>527,292=>722,293=>556,294=>722,295=>556,296=>278,297=>278,
-298=>278,299=>278,300=>278,301=>278,302=>278,303=>222,304=>278,305=>278,306=>742,307=>362,
-308=>500,309=>222,310=>667,311=>500,312=>510,313=>556,314=>222,315=>556,316=>222,317=>556,
-318=>387,319=>556,320=>409,321=>556,322=>222,323=>722,324=>556,325=>722,326=>556,327=>722,
-328=>556,329=>722,330=>722,331=>556,332=>778,333=>556,334=>778,335=>556,336=>778,337=>556,
-340=>722,341=>333,342=>722,343=>333,344=>722,345=>333,346=>667,347=>500,348=>667,349=>500,
-350=>667,351=>500,354=>611,355=>278,356=>611,357=>443,358=>611,359=>278,360=>722,361=>556,
-362=>722,363=>556,364=>722,365=>556,366=>722,367=>556,368=>722,369=>556,370=>722,371=>556,
-372=>944,373=>722,374=>667,375=>500,377=>611,378=>500,379=>611,380=>500,383=>278,384=>556,
-385=>854,386=>667,387=>556,388=>667,389=>556,390=>722,391=>722,392=>500,393=>722,394=>899,
-395=>667,396=>556,397=>566,398=>667,399=>778,400=>667,401=>611,403=>778,404=>667,405=>889,
-406=>278,407=>333,408=>741,409=>500,410=>333,411=>560,412=>833,413=>722,414=>556,415=>778,
-416=>778,417=>556,418=>944,419=>722,420=>842,421=>556,422=>666,423=>667,424=>500,425=>611,
-426=>333,427=>278,428=>611,429=>278,430=>611,431=>722,432=>556,433=>768,434=>722,435=>788,
-436=>616,437=>611,438=>500,439=>611,440=>611,441=>500,442=>500,443=>556,446=>556,447=>556,
-448=>260,449=>520,450=>584,451=>278,452=>1311,453=>1208,454=>1056,455=>1056,456=>778,457=>444,
-458=>1158,459=>944,460=>778,461=>667,462=>556,463=>278,464=>278,465=>778,466=>556,467=>722,
-468=>556,469=>722,470=>556,471=>722,472=>556,473=>722,474=>556,475=>722,476=>556,477=>556,
-478=>667,479=>556,480=>667,481=>556,482=>1000,483=>889,484=>778,485=>556,486=>778,487=>556,
-488=>667,489=>500,490=>778,491=>556,492=>778,493=>556,494=>611,495=>500,496=>222,497=>1333,
-498=>1222,499=>1056,500=>778,501=>556,503=>630,504=>722,505=>556,506=>667,507=>556,508=>1000,
-509=>889,510=>778,511=>611,512=>667,513=>556,514=>667,515=>556,516=>667,517=>556,518=>667,
-519=>556,520=>278,521=>278,522=>278,523=>278,524=>778,525=>556,526=>778,527=>556,528=>722,
-529=>333,530=>722,531=>333,532=>722,533=>556,534=>722,535=>556,536=>667,537=>500,538=>611,
-539=>278,540=>521,541=>393,542=>722,543=>556,548=>611,549=>500,550=>667,551=>556,552=>667,
-553=>556,554=>778,555=>556,556=>778,557=>556,558=>778,559=>556,560=>778,561=>556,562=>667,
-563=>500,567=>222,592=>556,593=>556,594=>659,595=>556,596=>500,597=>500,598=>556,599=>556,
-600=>556,601=>556,602=>804,603=>500,604=>500,605=>742,606=>500,607=>222,608=>556,609=>556,
-610=>546,611=>621,612=>556,613=>556,614=>556,615=>556,616=>222,617=>222,618=>278,619=>473,
-620=>427,621=>222,622=>611,623=>833,624=>833,625=>833,626=>556,627=>556,628=>560,629=>556,
-630=>778,631=>722,632=>728,633=>333,634=>333,635=>393,636=>333,637=>333,638=>384,639=>369,
-640=>546,641=>546,642=>500,643=>278,644=>278,645=>278,646=>444,647=>278,648=>278,649=>556,
-650=>626,651=>539,652=>500,653=>722,654=>500,655=>556,656=>500,657=>500,658=>500,659=>552,
-660=>556,661=>556,662=>556,663=>1000,664=>556,665=>521,666=>500,667=>546,668=>500,669=>444,
-670=>500,671=>430,672=>556,673=>556,674=>556,675=>944,676=>944,677=>944,678=>689,679=>506,
-680=>764,681=>766,682=>660,683=>577,684=>476,685=>486,686=>565,687=>621,688=>500,689=>500,
-690=>167,691=>333,692=>333,693=>393,694=>500,695=>500,696=>330,697=>278,698=>454,699=>278,
-700=>278,701=>278,702=>333,703=>333,704=>333,705=>333,706=>333,707=>333,708=>333,709=>333,
-711=>333,712=>333,713=>333,714=>333,715=>333,716=>333,717=>333,718=>333,719=>333,720=>333,
-721=>333,722=>333,723=>333,724=>333,725=>333,726=>333,727=>333,728=>333,729=>333,730=>333,
-731=>333,733=>333,734=>333,735=>510,736=>333,737=>333,738=>333,739=>333,740=>334,741=>526,
-742=>526,743=>526,744=>526,745=>526,746=>519,747=>519,748=>333,749=>333,750=>333,751=>333,
-752=>383,753=>294,754=>294,755=>327,756=>261,757=>437,758=>437,759=>333,760=>278,761=>200,
-762=>200,763=>200,764=>200,765=>333,766=>333,767=>333,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,
-832=>0,833=>0,834=>0,835=>0,836=>0,837=>0,838=>0,839=>0,840=>0,841=>0,
-842=>0,843=>0,844=>0,845=>0,846=>0,847=>0,848=>0,849=>0,850=>0,851=>0,
-852=>0,853=>0,854=>0,855=>0,856=>0,857=>0,858=>0,859=>0,860=>0,861=>0,
-862=>0,863=>0,864=>0,865=>0,866=>0,867=>0,868=>0,869=>0,870=>0,871=>0,
-872=>0,873=>0,874=>0,875=>0,876=>0,877=>0,878=>0,879=>0,884=>199,885=>199,
-890=>332,894=>278,900=>291,901=>624,902=>659,903=>278,904=>870,905=>870,906=>315,908=>876,
-910=>903,911=>882,912=>333,913=>765,914=>643,915=>589,916=>760,917=>659,918=>682,919=>707,
-920=>769,921=>256,922=>689,923=>765,924=>825,925=>687,926=>649,927=>766,928=>730,929=>649,
-931=>678,932=>655,933=>733,934=>753,935=>783,936=>773,937=>768,938=>285,939=>733,940=>593,
-941=>523,942=>595,943=>271,944=>549,945=>596,946=>534,947=>531,948=>566,949=>523,950=>470,
-951=>557,952=>547,953=>293,954=>516,955=>579,956=>571,957=>518,958=>499,959=>561,960=>636,
-961=>551,962=>564,963=>627,964=>505,965=>549,966=>715,967=>579,968=>662,969=>746,970=>335,
-971=>549,972=>535,973=>503,974=>725,977=>580,978=>742,979=>809,980=>620,981=>728,982=>740,
-983=>556,1008=>556,1009=>566,1012=>778,1013=>328,1024=>657,1025=>657,1026=>781,1027=>590,1028=>709,
-1029=>655,1030=>254,1031=>254,1032=>532,1033=>1002,1034=>1166,1035=>772,1036=>674,1037=>730,1038=>605,
-1039=>721,1040=>667,1041=>665,1042=>665,1043=>590,1044=>807,1045=>657,1046=>914,1047=>653,1048=>730,
-1049=>730,1050=>674,1051=>656,1052=>846,1053=>721,1054=>778,1055=>720,1056=>649,1057=>709,1058=>606,
-1059=>605,1060=>875,1061=>660,1062=>754,1063=>612,1064=>830,1065=>872,1066=>839,1067=>885,1068=>668,
-1069=>708,1070=>1099,1071=>676,1072=>556,1073=>545,1074=>521,1075=>375,1076=>572,1077=>538,1078=>815,
-1079=>488,1080=>557,1081=>557,1082=>519,1083=>508,1084=>618,1085=>558,1086=>533,1087=>557,1088=>569,
-1089=>511,1090=>392,1091=>469,1092=>922,1093=>475,1094=>588,1095=>482,1096=>693,1097=>722,1098=>644,
-1099=>731,1100=>521,1101=>509,1102=>790,1103=>550,1104=>538,1105=>538,1106=>566,1107=>375,1108=>506,
-1109=>488,1110=>224,1111=>272,1112=>226,1113=>793,1114=>849,1115=>576,1116=>519,1117=>557,1118=>469,
-1119=>557,1120=>942,1121=>693,1136=>749,1137=>666,1138=>785,1139=>528,1154=>456,1155=>0,1156=>0,
-1157=>0,1158=>0,1159=>0,1160=>0,1161=>0,1162=>751,1163=>588,1164=>685,1165=>554,1166=>656,
-1167=>606,1168=>598,1169=>396,1170=>611,1171=>409,1172=>592,1173=>448,1174=>921,1175=>826,1176=>657,
-1177=>493,1178=>680,1179=>529,1180=>678,1181=>524,1182=>695,1183=>528,1184=>846,1185=>650,1186=>741,
-1187=>578,1188=>992,1189=>700,1190=>1047,1191=>778,1192=>687,1193=>507,1194=>709,1195=>509,1196=>611,
-1197=>393,1198=>664,1199=>580,1200=>668,1201=>617,1202=>664,1203=>489,1204=>905,1205=>662,1206=>631,
-1207=>498,1208=>597,1209=>472,1210=>597,1211=>471,1212=>927,1213=>716,1214=>927,1215=>716,1216=>254,
-1217=>915,1218=>815,1219=>665,1220=>510,1221=>678,1222=>533,1223=>721,1224=>558,1225=>751,1226=>589,
-1227=>599,1228=>472,1229=>876,1230=>649,1231=>254,1232=>667,1233=>552,1234=>667,1235=>552,1236=>1000,
-1237=>889,1238=>657,1239=>538,1240=>722,1241=>511,1242=>722,1243=>511,1244=>914,1245=>815,1246=>653,
-1247=>488,1248=>611,1249=>546,1250=>730,1251=>557,1252=>730,1253=>557,1254=>774,1255=>529,1256=>785,
-1257=>528,1258=>785,1259=>528,1260=>708,1261=>509,1262=>605,1263=>469,1264=>605,1265=>469,1266=>605,
-1267=>469,1268=>612,1269=>482,1270=>601,1271=>430,1272=>885,1273=>731,1296=>667,1297=>500,1298=>673,
-1299=>557,1306=>778,1307=>556,1308=>944,1309=>722,1310=>667,1311=>510,1329=>722,1330=>705,1331=>774,
-1332=>754,1333=>722,1334=>751,1335=>485,1336=>722,1337=>782,1338=>655,1339=>699,1340=>417,1341=>853,
-1342=>791,1343=>711,1344=>588,1345=>663,1346=>665,1347=>665,1348=>756,1349=>623,1350=>773,1351=>603,
-1352=>722,1353=>648,1354=>722,1355=>751,1356=>750,1357=>722,1358=>748,1359=>667,1360=>699,1361=>623,
-1362=>417,1363=>785,1364=>638,1365=>778,1366=>716,1369=>333,1370=>222,1371=>133,1372=>325,1373=>333,
-1374=>333,1375=>333,1377=>833,1378=>556,1379=>572,1380=>581,1381=>546,1382=>588,1383=>448,1384=>556,
-1385=>568,1386=>582,1387=>552,1388=>301,1389=>799,1390=>556,1391=>554,1392=>533,1393=>548,1394=>552,
-1395=>552,1396=>544,1397=>222,1398=>544,1399=>456,1400=>556,1401=>390,1402=>833,1403=>509,1404=>547,
-1405=>533,1406=>610,1407=>887,1408=>556,1409=>545,1410=>301,1411=>853,1412=>632,1413=>579,1414=>690,
-1415=>545,1417=>278,1418=>367,1456=>0,1457=>0,1458=>0,1459=>0,1460=>0,1461=>0,1462=>0,
-1463=>0,1464=>0,1465=>0,1467=>0,1468=>0,1469=>0,1470=>488,1471=>0,1472=>212,1473=>0,
-1474=>0,1475=>278,1476=>0,1488=>640,1489=>591,1490=>466,1491=>598,1492=>622,1493=>212,1494=>351,
-1495=>623,1496=>608,1497=>200,1498=>526,1499=>550,1500=>600,1501=>623,1502=>621,1503=>212,1504=>378,
-1505=>607,1506=>587,1507=>575,1508=>568,1509=>540,1510=>590,1511=>606,1512=>547,1513=>776,1514=>687,
-1520=>424,1521=>412,1522=>400,1523=>184,1524=>344,2433=>0,2434=>300,2435=>264,2437=>594,2438=>790,
-2439=>469,2440=>513,2441=>520,2442=>549,2443=>594,2444=>481,2447=>580,2448=>627,2451=>540,2452=>613,
-2453=>570,2454=>467,2455=>471,2456=>428,2457=>483,2458=>408,2459=>509,2460=>591,2461=>563,2462=>771,
-2463=>381,2464=>404,2465=>522,2466=>408,2467=>450,2468=>543,2469=>477,2470=>418,2471=>433,2472=>445,
-2474=>499,2475=>584,2476=>377,2477=>555,2478=>448,2479=>423,2480=>390,2482=>498,2486=>498,2487=>425,
-2488=>495,2489=>440,2492=>22,2493=>440,2494=>193,2495=>189,2496=>180,2497=>0,2498=>0,2499=>0,
-2500=>0,2503=>252,2504=>243,2507=>889,2508=>865,2509=>0,2510=>356,2519=>219,2524=>523,2525=>408,
-2527=>428,2528=>594,2529=>481,2530=>0,2531=>0,2534=>500,2535=>437,2536=>479,2537=>530,2538=>497,
-2539=>500,2540=>482,2541=>503,2542=>517,2543=>481,2544=>377,2545=>377,2546=>429,2547=>383,2548=>429,
-2549=>478,2550=>545,2551=>158,2552=>365,2553=>280,2554=>357,4256=>587,4257=>620,4258=>642,4259=>815,
-4260=>600,4261=>595,4262=>799,4263=>893,4264=>622,4265=>597,4266=>939,4267=>602,4268=>603,4269=>790,
-4270=>587,4271=>623,4272=>799,4273=>601,4274=>792,4275=>724,4276=>847,4277=>599,4278=>812,4279=>603,
-4280=>653,4281=>590,4282=>754,4283=>596,4284=>653,4285=>651,4286=>596,4287=>888,4288=>593,4304=>436,
-4305=>491,4306=>528,4307=>692,4308=>447,4309=>447,4310=>628,4311=>734,4312=>449,4313=>445,4314=>843,
-4315=>449,4316=>449,4317=>682,4318=>449,4319=>480,4320=>682,4321=>468,4322=>710,4323=>623,4324=>697,
-4325=>447,4326=>702,4327=>447,4328=>470,4329=>440,4330=>632,4331=>449,4332=>470,4333=>536,4334=>449,
-4335=>656,4336=>474,4337=>630,4338=>394,4339=>419,4340=>422,4341=>436,4345=>528,4347=>515,7680=>667,
-7681=>556,7682=>667,7683=>556,7684=>667,7685=>556,7686=>667,7687=>556,7688=>722,7689=>500,7690=>722,
-7691=>556,7692=>722,7693=>556,7694=>722,7695=>556,7696=>722,7697=>556,7698=>722,7699=>556,7700=>667,
-7701=>556,7702=>667,7703=>556,7704=>667,7705=>556,7706=>667,7707=>556,7708=>667,7709=>556,7710=>611,
-7711=>278,7712=>778,7713=>556,7714=>722,7715=>556,7716=>722,7717=>556,7718=>722,7719=>556,7720=>722,
-7721=>556,7722=>722,7723=>556,7724=>278,7725=>222,7726=>278,7727=>278,7728=>667,7729=>500,7730=>667,
-7731=>500,7732=>667,7733=>500,7734=>556,7735=>222,7736=>556,7737=>222,7738=>556,7739=>222,7740=>556,
-7741=>222,7742=>833,7743=>833,7744=>833,7745=>833,7746=>833,7747=>833,7748=>722,7749=>556,7750=>722,
-7751=>556,7752=>722,7753=>556,7754=>722,7755=>556,7756=>778,7757=>556,7758=>778,7759=>556,7760=>778,
-7761=>556,7762=>778,7763=>556,7764=>667,7765=>556,7766=>667,7767=>556,7768=>722,7769=>333,7770=>722,
-7771=>333,7772=>722,7773=>333,7774=>722,7775=>333,7776=>667,7777=>500,7778=>667,7779=>500,7780=>667,
-7781=>500,7782=>667,7783=>500,7784=>667,7785=>500,7786=>611,7787=>278,7788=>611,7789=>278,7790=>611,
-7791=>278,7792=>611,7793=>278,7794=>722,7795=>556,7796=>722,7797=>556,7798=>722,7799=>556,7800=>722,
-7801=>556,7802=>722,7803=>556,7804=>667,7805=>500,7806=>667,7807=>500,7808=>944,7809=>722,7810=>944,
-7811=>722,7812=>944,7813=>722,7814=>944,7815=>722,7816=>944,7817=>722,7818=>667,7819=>500,7820=>667,
-7821=>500,7822=>667,7823=>500,7824=>611,7825=>500,7826=>611,7827=>500,7828=>611,7829=>500,7830=>556,
-7831=>278,7832=>722,7833=>500,7834=>555,7835=>278,7840=>667,7841=>556,7842=>667,7843=>556,7844=>667,
-7845=>556,7846=>667,7847=>556,7848=>667,7849=>556,7850=>667,7851=>556,7852=>667,7853=>556,7854=>667,
-7855=>556,7856=>667,7857=>556,7858=>667,7859=>556,7860=>667,7861=>556,7862=>667,7863=>556,7864=>667,
-7865=>556,7866=>667,7867=>556,7868=>667,7869=>556,7870=>667,7871=>556,7872=>667,7873=>556,7874=>667,
-7875=>556,7876=>667,7877=>556,7878=>667,7879=>556,7880=>278,7881=>278,7882=>278,7883=>222,7884=>778,
-7885=>556,7886=>778,7887=>556,7888=>778,7889=>556,7890=>778,7891=>556,7892=>778,7893=>556,7894=>778,
-7895=>556,7896=>778,7897=>556,7898=>778,7899=>556,7900=>778,7901=>556,7902=>778,7903=>556,7904=>778,
-7905=>556,7906=>778,7907=>556,7908=>722,7909=>556,7910=>722,7911=>556,7912=>722,7913=>556,7914=>722,
-7915=>556,7916=>722,7917=>556,7918=>722,7919=>556,7920=>722,7921=>556,7922=>667,7923=>500,7924=>667,
-7925=>500,7926=>667,7927=>500,7928=>667,7929=>500,7936=>596,7937=>596,7938=>596,7939=>596,7940=>596,
-7941=>596,7942=>596,7943=>596,7944=>718,7945=>718,7946=>796,7947=>780,7948=>746,7949=>744,7950=>718,
-7951=>718,7952=>523,7953=>523,7954=>523,7955=>523,7956=>523,7957=>523,7960=>759,7961=>751,7962=>962,
-7963=>957,7964=>958,7965=>947,7968=>557,7969=>557,7970=>557,7971=>557,7972=>557,7973=>557,7974=>557,
-7975=>557,7976=>807,7977=>796,7978=>1013,7979=>1002,7980=>1009,7981=>1000,7982=>882,7983=>919,7984=>293,
-7985=>293,7986=>361,7987=>382,7988=>347,7989=>329,7990=>352,7991=>347,7992=>353,7993=>348,7994=>555,
-7995=>557,7996=>557,7997=>545,7998=>435,7999=>448,8000=>561,8001=>561,8002=>561,8003=>561,8004=>561,
-8005=>561,8008=>792,8009=>801,8010=>1031,8011=>1029,8012=>931,8013=>931,8016=>549,8017=>549,8018=>549,
-8019=>549,8020=>549,8021=>549,8022=>549,8023=>549,8025=>838,8027=>1004,8029=>1036,8031=>936,8032=>746,
-8033=>746,8034=>746,8035=>746,8036=>746,8037=>746,8038=>746,8039=>746,8040=>768,8041=>794,8042=>1003,
-8043=>1002,8044=>922,8045=>918,8046=>871,8047=>893,8048=>596,8049=>596,8050=>523,8051=>523,8052=>557,
-8053=>557,8054=>293,8055=>293,8056=>561,8057=>561,8058=>549,8059=>549,8060=>746,8061=>746,8064=>596,
-8065=>596,8066=>596,8067=>596,8068=>596,8069=>596,8070=>596,8071=>596,8072=>859,8073=>861,8074=>948,
-8075=>928,8076=>886,8077=>895,8078=>865,8079=>864,8080=>557,8081=>557,8082=>557,8083=>557,8084=>557,
-8085=>557,8086=>557,8087=>557,8088=>890,8089=>894,8090=>1092,8091=>1084,8092=>1095,8093=>1080,8094=>953,
-8095=>986,8096=>746,8097=>746,8098=>746,8099=>746,8100=>746,8101=>746,8102=>746,8103=>746,8104=>892,
-8105=>907,8106=>1113,8107=>1095,8108=>1034,8109=>1030,8110=>983,8111=>1002,8112=>596,8113=>596,8114=>596,
-8115=>596,8116=>593,8118=>596,8119=>596,8120=>765,8121=>765,8122=>765,8123=>765,8124=>861,8125=>147,
-8126=>201,8127=>147,8128=>278,8129=>333,8130=>557,8131=>557,8132=>595,8134=>557,8135=>557,8136=>835,
-8137=>849,8138=>895,8139=>861,8140=>786,8141=>602,8142=>601,8143=>333,8144=>335,8145=>322,8146=>357,
-8147=>336,8150=>340,8151=>320,8152=>300,8153=>298,8154=>439,8155=>408,8157=>434,8158=>433,8159=>333,
-8160=>549,8161=>549,8162=>549,8163=>549,8164=>551,8165=>551,8166=>549,8167=>549,8168=>733,8169=>733,
-8170=>794,8171=>832,8172=>739,8173=>333,8174=>624,8175=>303,8178=>746,8179=>746,8180=>725,8182=>746,
-8183=>746,8184=>889,8185=>828,8186=>836,8187=>811,8188=>867,8189=>333,8190=>159,8192=>500,8193=>1000,
-8194=>500,8195=>1000,8196=>333,8197=>250,8198=>167,8199=>556,8200=>278,8201=>200,8202=>100,8203=>0,
-8204=>0,8205=>0,8206=>0,8207=>0,8208=>333,8209=>333,8210=>556,8213=>1000,8214=>312,8215=>567,
-8219=>221,8223=>333,8227=>350,8228=>278,8229=>666,8231=>278,8232=>0,8233=>0,8234=>0,8235=>0,
-8236=>0,8237=>0,8238=>0,8239=>500,8241=>1360,8242=>278,8243=>469,8244=>680,8245=>278,8246=>469,
-8247=>680,8248=>376,8251=>622,8252=>556,8253=>556,8254=>556,8255=>658,8256=>658,8257=>438,8258=>840,
-8259=>400,8260=>167,8261=>334,8262=>334,8263=>1112,8264=>834,8265=>834,8266=>556,8267=>537,8268=>537,
-8269=>537,8270=>389,8271=>278,8272=>658,8273=>389,8274=>634,8275=>500,8276=>658,8277=>1000,8278=>515,
-8279=>855,8280=>722,8281=>725,8282=>224,8283=>722,8284=>604,8285=>224,8286=>224,8287=>0,8288=>0,
-8289=>0,8290=>0,8291=>0,8292=>0,8304=>351,8305=>350,8308=>351,8309=>351,8310=>351,8311=>351,
-8312=>351,8313=>351,8314=>350,8315=>350,8316=>350,8317=>350,8318=>350,8319=>350,8320=>351,8321=>251,
-8322=>351,8323=>351,8324=>351,8325=>353,8326=>351,8327=>351,8328=>351,8329=>351,8330=>350,8331=>350,
-8332=>350,8333=>350,8334=>350,8353=>615,8354=>601,8355=>611,8356=>556,8357=>833,8358=>682,8359=>1205,
-8360=>1222,8361=>879,8362=>869,8363=>538,8365=>667,8366=>611,8368=>570,8369=>684,8370=>717,8371=>667,
-8372=>667,8373=>640,8400=>0,8401=>0,8402=>0,8403=>0,8406=>0,8407=>0,8411=>0,8412=>0,
-8413=>0,8414=>0,8415=>0,8416=>0,8417=>0,8421=>0,8422=>0,8423=>0,8424=>0,8425=>0,
-8426=>0,8427=>0,8428=>0,8429=>0,8430=>0,8431=>0,8432=>0,8448=>970,8449=>979,8451=>1019,
-8452=>556,8453=>876,8454=>922,8455=>667,8457=>867,8459=>969,8460=>615,8462=>556,8463=>572,8464=>809,
-8465=>606,8466=>874,8468=>747,8470=>934,8471=>737,8472=>600,8475=>850,8476=>699,8480=>1000,8481=>1220,
-8486=>768,8487=>744,8488=>512,8489=>286,8490=>722,8491=>722,8492=>908,8493=>623,8494=>556,8496=>562,
-8498=>556,8499=>1080,8501=>520,8502=>591,8503=>456,8504=>598,8506=>843,8507=>1220,8513=>778,8514=>556,
-8515=>556,8516=>667,8522=>516,8523=>640,8525=>936,8526=>477,8531=>869,8532=>869,8533=>869,8534=>869,
-8535=>869,8536=>869,8537=>869,8538=>869,8539=>869,8540=>869,8541=>869,8542=>869,8543=>869,8544=>278,
-8545=>556,8546=>834,8547=>945,8548=>667,8549=>945,8550=>1223,8551=>1501,8552=>945,8553=>667,8554=>945,
-8555=>1223,8556=>556,8557=>722,8558=>722,8559=>833,8560=>222,8561=>444,8562=>666,8563=>722,8564=>500,
-8565=>722,8566=>944,8567=>1166,8568=>722,8569=>500,8570=>722,8571=>944,8572=>222,8573=>500,8574=>556,
-8575=>833,8592=>987,8593=>603,8594=>987,8595=>603,8596=>1042,8597=>1042,8706=>556,8710=>712,8721=>804,
-8722=>584,8725=>947,8730=>542,8739=>200,8741=>312,8800=>584,8804=>584,8805=>584,9251=>500,9674=>489,
-9824=>626,9825=>694,9826=>595,9827=>776,9828=>626,9829=>694,9830=>595,9831=>776,9833=>333,9834=>556,
-9835=>722,9836=>722,9837=>415,9838=>377,9839=>402,11799=>333,64256=>494,64257=>471,64258=>474,64259=>659,
-64260=>654,64261=>530,64275=>1027,64276=>1056,64277=>1058,64278=>1073,64279=>1301,64285=>200,64286=>305,64287=>400,
-64288=>587,64289=>890,64290=>848,64291=>872,64292=>800,64293=>850,64294=>873,64295=>797,64296=>937,64297=>584,
-64298=>776,64299=>776,64300=>776,64301=>776,64302=>640,64303=>640,64304=>640,64305=>591,64306=>466,64307=>598,
-64308=>622,64309=>262,64310=>351,64312=>608,64313=>270,64314=>526,64315=>550,64316=>600,64318=>621,64320=>378,
-64321=>607,64323=>575,64324=>568,64326=>590,64327=>606,64328=>547,64329=>776,64330=>687,64331=>212,64332=>591,
-64333=>550,64334=>568,64335=>640,65533=>788);
-$enc='';
-$diff='';
-$file='freesansi.z';
-$ctg='freesansi.ctg.z';
-$originalsize=410728;
-?>
\ No newline at end of file
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freesansi.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freesansi.z
deleted file mode 100644
index d675eb26..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freesansi.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freeserif.ctg.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freeserif.ctg.z
deleted file mode 100644
index 06f25fc8..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freeserif.ctg.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freeserif.php b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freeserif.php
deleted file mode 100644
index aedc3884..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freeserif.php
+++ /dev/null
@@ -1,504 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='FreeSerif';
-$desc=array('Ascent'=>900,'Descent'=>-300,'CapHeight'=>10,'Flags'=>96,'FontBBox'=>'[-879 -1201 1767 2606]','ItalicAngle'=>-33.2,'StemV'=>70,'MissingWidth'=>600);
-$up=-125;
-$ut=50;
-$dw=600;
-$cw=array(
-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,8364=>741,8218=>250,402=>333,8222=>444,8230=>1000,
-8224=>500,8225=>500,710=>333,8240=>1000,352=>556,8249=>250,338=>889,381=>611,8216=>250,8217=>250,
-8220=>444,8221=>444,8226=>350,8211=>500,8212=>1000,732=>333,8482=>980,353=>389,8250=>250,339=>722,
-382=>444,376=>722,160=>250,161=>333,162=>500,163=>500,164=>500,165=>500,166=>200,167=>500,
-168=>333,169=>760,170=>276,171=>444,172=>564,173=>333,174=>760,175=>333,176=>400,177=>564,
-178=>320,179=>320,180=>333,181=>500,182=>453,183=>250,184=>333,185=>320,186=>310,187=>441,
-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=>576,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=>501,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=>496,255=>500,256=>722,257=>444,
-258=>722,259=>444,260=>722,261=>444,262=>667,263=>444,264=>667,265=>444,266=>667,267=>444,
-268=>667,269=>444,270=>722,271=>600,272=>722,273=>500,274=>611,275=>444,276=>611,277=>444,
-278=>611,279=>444,280=>611,281=>444,282=>611,283=>444,284=>722,285=>500,286=>722,287=>500,
-288=>722,289=>500,290=>722,291=>500,292=>722,293=>500,294=>722,295=>548,296=>333,297=>278,
-298=>333,299=>278,300=>333,301=>278,302=>333,303=>278,304=>333,305=>278,306=>703,307=>529,
-308=>389,309=>278,310=>722,311=>500,312=>500,313=>611,314=>278,315=>611,316=>278,317=>611,
-318=>348,319=>611,320=>444,321=>611,322=>278,323=>722,324=>500,325=>722,326=>500,327=>722,
-328=>500,329=>556,330=>722,331=>500,332=>722,333=>500,334=>722,335=>500,336=>722,337=>500,
-340=>667,341=>333,342=>667,343=>333,344=>667,345=>333,346=>556,347=>389,348=>556,349=>389,
-350=>556,351=>389,354=>611,355=>278,356=>611,357=>278,358=>611,359=>278,360=>722,361=>500,
-362=>722,363=>500,364=>722,365=>500,366=>722,367=>500,368=>722,369=>500,370=>722,371=>500,
-372=>944,373=>722,374=>722,375=>500,377=>611,378=>444,379=>611,380=>444,383=>333,384=>500,
-385=>667,386=>576,387=>500,388=>646,389=>500,390=>667,391=>667,392=>444,393=>722,394=>722,
-395=>646,396=>500,397=>534,398=>611,399=>722,400=>518,401=>556,403=>722,404=>665,405=>729,
-406=>333,407=>333,408=>810,409=>500,410=>278,411=>480,412=>944,413=>722,414=>500,415=>726,
-416=>722,417=>516,418=>1043,419=>778,420=>556,421=>500,422=>667,423=>556,424=>389,425=>627,
-426=>592,427=>278,428=>611,429=>278,430=>611,431=>800,432=>518,433=>743,434=>722,435=>822,
-436=>667,437=>611,438=>444,439=>530,440=>556,441=>389,442=>394,443=>500,444=>615,445=>439,
-446=>421,447=>500,448=>200,449=>400,450=>600,451=>333,452=>1333,453=>1166,454=>944,455=>1000,
-456=>889,457=>556,458=>1111,459=>1000,460=>778,461=>722,462=>444,463=>333,464=>278,465=>722,
-466=>500,467=>722,468=>500,469=>722,470=>500,471=>722,472=>500,473=>722,474=>500,475=>722,
-476=>500,477=>444,478=>722,479=>444,480=>722,481=>444,482=>889,483=>667,484=>722,485=>500,
-486=>722,487=>500,488=>722,489=>500,490=>722,491=>500,492=>722,493=>500,494=>530,495=>389,
-496=>278,497=>1333,498=>1166,499=>944,500=>722,501=>500,502=>944,503=>522,504=>722,505=>500,
-506=>722,507=>444,508=>889,509=>667,510=>722,511=>500,512=>722,513=>444,514=>722,515=>444,
-516=>611,517=>444,518=>611,519=>444,520=>333,521=>278,522=>333,523=>278,524=>722,525=>500,
-526=>722,527=>500,528=>667,529=>333,530=>667,531=>333,532=>500,533=>500,534=>722,535=>500,
-536=>556,537=>389,538=>611,539=>278,540=>424,541=>455,542=>722,543=>500,544=>715,545=>588,
-546=>565,547=>468,548=>611,549=>444,550=>722,551=>444,552=>611,553=>444,554=>722,555=>500,
-556=>722,557=>500,558=>722,559=>500,560=>722,561=>500,562=>722,563=>500,564=>407,565=>597,
-566=>379,567=>278,568=>771,569=>760,570=>722,571=>667,572=>444,573=>611,574=>611,575=>389,
-576=>444,577=>444,578=>444,579=>667,580=>722,581=>722,582=>611,583=>444,584=>389,585=>278,
-586=>796,587=>590,588=>667,589=>333,590=>722,591=>500,592=>444,593=>500,594=>507,595=>500,
-596=>444,597=>444,598=>500,599=>500,600=>444,601=>444,602=>722,603=>426,604=>426,605=>674,
-606=>454,607=>278,608=>500,609=>500,610=>484,611=>500,612=>582,613=>500,614=>500,615=>500,
-616=>278,617=>278,618=>278,619=>278,620=>278,621=>278,622=>556,623=>778,624=>778,625=>778,
-626=>500,627=>500,628=>500,629=>491,630=>668,631=>693,632=>640,633=>333,634=>333,635=>333,
-636=>333,637=>333,638=>333,639=>333,640=>446,641=>446,642=>389,643=>333,644=>500,645=>333,
-646=>500,647=>278,648=>278,649=>500,650=>517,651=>514,652=>500,653=>722,654=>500,655=>510,
-656=>524,657=>444,658=>389,659=>456,660=>444,661=>444,662=>444,663=>444,664=>722,665=>468,
-666=>454,667=>665,668=>524,669=>347,670=>500,671=>443,672=>500,673=>444,674=>444,675=>798,
-676=>795,677=>805,678=>554,679=>561,680=>678,681=>722,682=>554,683=>554,684=>500,685=>500,
-686=>611,687=>611,688=>300,689=>300,690=>278,691=>278,692=>278,693=>309,694=>306,695=>432,
-696=>310,697=>250,698=>408,699=>333,700=>333,701=>333,702=>333,703=>333,704=>258,705=>258,
-706=>374,707=>374,708=>383,709=>383,711=>333,712=>250,713=>333,714=>333,715=>333,716=>250,
-717=>333,718=>333,719=>333,720=>278,721=>278,722=>333,723=>333,724=>333,725=>333,726=>333,
-727=>333,728=>333,729=>333,730=>333,731=>333,733=>382,734=>336,735=>352,736=>311,737=>200,
-738=>243,739=>328,740=>300,741=>460,742=>460,743=>460,744=>460,745=>460,746=>477,747=>475,
-748=>339,749=>333,750=>444,751=>383,752=>383,753=>294,754=>294,755=>327,756=>261,757=>437,
-758=>437,759=>333,760=>278,761=>175,762=>175,763=>175,764=>175,765=>337,766=>337,767=>326,
-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,832=>0,833=>0,834=>0,835=>0,836=>0,837=>0,
-838=>0,839=>0,840=>0,841=>0,842=>0,843=>0,844=>0,845=>0,846=>0,847=>0,
-848=>0,849=>0,850=>0,851=>0,852=>0,853=>0,854=>0,855=>0,856=>0,857=>0,
-858=>0,859=>0,860=>0,861=>0,862=>0,863=>0,864=>0,865=>0,866=>0,867=>0,
-868=>0,869=>0,870=>0,871=>0,872=>0,873=>0,874=>0,875=>0,876=>0,877=>0,
-878=>0,879=>0,884=>199,885=>199,890=>332,894=>278,900=>267,901=>333,902=>722,903=>250,
-904=>800,905=>902,906=>507,908=>818,910=>861,911=>871,912=>286,913=>722,914=>667,915=>586,
-916=>660,917=>611,918=>611,919=>722,920=>726,921=>333,922=>722,923=>722,924=>889,925=>722,
-926=>628,927=>722,928=>722,929=>556,931=>627,932=>611,933=>696,934=>742,935=>722,936=>808,
-937=>743,938=>333,939=>718,940=>583,941=>426,942=>536,943=>286,944=>514,945=>583,946=>527,
-947=>480,948=>534,949=>426,950=>466,951=>536,952=>534,953=>286,954=>544,955=>476,956=>536,
-957=>480,958=>514,959=>500,960=>587,961=>528,962=>452,963=>537,964=>420,965=>514,966=>643,
-967=>480,968=>693,969=>693,970=>286,971=>514,972=>500,973=>514,974=>693,976=>534,977=>587,
-978=>620,979=>809,980=>620,981=>640,982=>684,983=>534,984=>556,985=>500,986=>594,987=>426,
-988=>556,989=>445,990=>656,991=>400,992=>722,993=>570,994=>960,995=>673,996=>581,997=>429,
-998=>560,999=>407,1000=>450,1001=>321,1002=>842,1003=>593,1004=>564,1005=>413,1006=>618,1007=>438,
-1008=>534,1009=>534,1010=>485,1011=>278,1012=>726,1013=>361,1014=>361,1015=>576,1016=>542,1017=>667,
-1018=>889,1019=>709,1020=>534,1021=>667,1022=>1000,1023=>1000,1024=>615,1025=>613,1026=>748,1027=>570,
-1028=>659,1029=>487,1030=>329,1031=>329,1032=>381,1033=>943,1034=>985,1035=>827,1036=>669,1037=>723,
-1038=>709,1039=>723,1040=>711,1041=>576,1042=>626,1043=>570,1044=>639,1045=>613,1046=>937,1047=>580,
-1048=>723,1049=>723,1050=>669,1051=>684,1052=>891,1053=>723,1054=>722,1055=>723,1056=>576,1057=>659,
-1058=>608,1059=>709,1060=>750,1061=>714,1062=>728,1063=>682,1064=>984,1065=>988,1066=>725,1067=>863,
-1068=>576,1069=>659,1070=>966,1071=>648,1072=>434,1073=>495,1074=>468,1075=>386,1076=>488,1077=>436,
-1078=>662,1079=>404,1080=>524,1081=>524,1082=>498,1083=>490,1084=>632,1085=>524,1086=>491,1087=>524,
-1088=>500,1089=>422,1090=>422,1091=>471,1092=>694,1093=>482,1094=>522,1095=>506,1096=>756,1097=>754,
-1098=>503,1099=>626,1100=>431,1101=>430,1102=>664,1103=>492,1104=>434,1105=>434,1106=>479,1107=>386,
-1108=>430,1109=>347,1110=>269,1111=>278,1112=>278,1113=>677,1114=>711,1115=>514,1116=>498,1117=>524,
-1118=>471,1119=>524,1120=>978,1121=>664,1122=>718,1123=>506,1124=>939,1125=>647,1126=>912,1127=>643,
-1128=>1248,1129=>894,1130=>948,1131=>662,1132=>1299,1133=>911,1134=>516,1135=>391,1136=>870,1137=>694,
-1138=>726,1139=>491,1140=>780,1141=>550,1142=>780,1143=>550,1144=>1207,1145=>946,1146=>877,1147=>611,
-1148=>978,1149=>664,1150=>978,1151=>664,1152=>594,1153=>428,1154=>232,1155=>0,1156=>0,1157=>0,
-1158=>0,1159=>0,1160=>0,1161=>0,1162=>715,1163=>522,1164=>562,1165=>430,1166=>556,1167=>511,
-1168=>564,1169=>398,1170=>586,1171=>402,1172=>573,1173=>463,1174=>1001,1175=>688,1176=>580,1177=>414,
-1178=>698,1179=>517,1180=>734,1181=>537,1182=>671,1183=>498,1184=>842,1185=>573,1186=>732,1187=>524,
-1188=>926,1189=>652,1190=>1014,1191=>721,1192=>671,1193=>531,1194=>667,1195=>437,1196=>611,1197=>454,
-1198=>722,1199=>563,1200=>722,1201=>562,1202=>783,1203=>517,1204=>967,1205=>693,1206=>691,1207=>510,
-1208=>718,1209=>538,1210=>674,1211=>508,1212=>866,1213=>566,1214=>866,1215=>566,1216=>333,1217=>937,
-1218=>662,1219=>626,1220=>446,1221=>702,1222=>489,1223=>722,1224=>497,1225=>823,1226=>545,1227=>674,
-1228=>504,1229=>889,1230=>630,1231=>333,1232=>711,1233=>434,1234=>711,1235=>434,1236=>889,1237=>644,
-1238=>613,1239=>449,1240=>722,1241=>449,1242=>722,1243=>449,1244=>937,1245=>662,1246=>580,1247=>404,
-1248=>530,1249=>366,1250=>723,1251=>524,1252=>723,1253=>524,1254=>722,1255=>491,1256=>722,1257=>491,
-1258=>722,1259=>491,1260=>659,1261=>430,1262=>709,1263=>471,1264=>709,1265=>471,1266=>709,1267=>471,
-1268=>682,1269=>506,1270=>564,1271=>388,1272=>863,1273=>626,1274=>556,1275=>388,1276=>720,1277=>445,
-1278=>722,1279=>495,1280=>556,1281=>504,1282=>900,1283=>634,1284=>553,1285=>471,1286=>803,1287=>518,
-1288=>964,1289=>637,1290=>968,1291=>682,1292=>722,1293=>433,1294=>710,1295=>504,1296=>532,1297=>409,
-1298=>702,1299=>489,1300=>960,1301=>644,1302=>823,1303=>702,1304=>961,1305=>766,1306=>722,1307=>504,
-1308=>944,1309=>693,1310=>690,1311=>502,1312=>994,1313=>695,1314=>1011,1315=>727,1425=>0,1426=>0,
-1427=>0,1428=>0,1429=>0,1430=>0,1431=>418,1432=>0,1433=>0,1434=>0,1435=>0,1436=>0,
-1437=>0,1438=>0,1439=>0,1440=>0,1441=>0,1442=>0,1443=>0,1444=>0,1445=>0,1446=>0,
-1447=>0,1448=>0,1449=>0,1450=>0,1451=>0,1452=>0,1453=>0,1454=>0,1455=>0,1456=>0,
-1457=>0,1458=>0,1459=>0,1460=>0,1461=>0,1462=>0,1463=>0,1464=>0,1465=>0,1466=>0,
-1467=>0,1468=>0,1469=>0,1470=>440,1471=>0,1472=>126,1473=>0,1474=>0,1475=>418,1476=>0,
-1477=>0,1478=>350,1479=>0,1488=>537,1489=>537,1490=>350,1491=>537,1492=>537,1493=>350,1494=>350,
-1495=>537,1496=>537,1497=>350,1498=>537,1499=>537,1500=>537,1501=>537,1502=>537,1503=>350,1504=>350,
-1505=>537,1506=>537,1507=>537,1508=>537,1509=>537,1510=>537,1511=>537,1512=>537,1513=>537,1514=>537,
-1520=>537,1521=>537,1522=>537,1523=>396,1524=>396,1548=>226,1563=>250,1567=>473,1569=>350,1570=>321,
-1571=>249,1572=>399,1573=>249,1574=>776,1575=>249,1576=>950,1577=>424,1578=>925,1579=>924,1580=>738,
-1581=>748,1582=>701,1583=>397,1584=>399,1585=>328,1586=>331,1587=>951,1588=>949,1589=>949,1590=>949,
-1591=>557,1592=>550,1593=>625,1594=>602,1601=>801,1602=>696,1603=>757,1604=>655,1605=>549,1606=>651,
-1607=>424,1608=>399,1609=>776,1610=>776,1611=>0,1613=>0,1614=>0,1615=>0,1616=>0,1617=>0,
-1618=>0,1619=>0,1620=>0,1621=>0,1632=>297,1633=>254,1634=>427,1635=>497,1636=>440,1637=>465,
-1638=>466,1639=>421,1640=>459,1641=>424,1643=>212,1652=>300,1662=>926,1670=>750,1688=>338,1711=>874,
-1740=>776,1748=>176,1920=>450,1921=>501,1922=>582,1923=>544,1924=>482,1925=>433,1926=>448,1927=>462,
-1928=>474,1929=>471,1930=>469,1931=>537,1932=>499,1933=>514,1934=>471,1935=>572,1936=>880,1937=>440,
-1938=>476,1939=>594,1940=>469,1941=>448,1942=>441,1943=>519,1944=>573,1945=>459,1946=>447,1947=>496,
-1948=>541,1949=>887,1950=>883,1951=>964,1952=>558,1953=>505,1954=>471,1955=>554,1956=>459,1957=>486,
-1958=>36,1959=>36,1960=>43,1961=>45,1962=>43,1963=>45,1964=>45,1965=>45,1966=>45,1967=>45,
-1968=>0,2305=>415,2306=>398,2307=>398,2309=>862,2310=>1042,2311=>553,2312=>553,2313=>597,2314=>848,
-2315=>967,2316=>828,2317=>654,2319=>654,2321=>1042,2323=>1042,2324=>1042,2325=>743,2326=>798,2327=>694,
-2328=>694,2329=>730,2330=>734,2331=>888,2332=>814,2333=>834,2334=>734,2335=>629,2336=>629,2337=>653,
-2338=>609,2339=>694,2340=>654,2341=>694,2342=>588,2343=>694,2344=>654,2345=>654,2346=>615,2347=>788,
-2348=>621,2349=>694,2350=>694,2351=>694,2352=>575,2353=>575,2354=>787,2355=>848,2356=>848,2357=>621,
-2359=>615,2360=>734,2361=>609,2364=>398,2365=>569,2366=>341,2367=>341,2368=>341,2369=>0,2370=>0,
-2371=>0,2372=>0,2373=>415,2375=>615,2376=>615,2377=>341,2379=>341,2380=>341,2381=>0,2384=>1047,
-2392=>743,2393=>798,2394=>694,2395=>814,2396=>653,2397=>609,2398=>788,2400=>967,2401=>828,2402=>0,
-2403=>0,2404=>398,2405=>478,2406=>455,2407=>420,2408=>569,2409=>509,2410=>702,2411=>629,2412=>569,
-2413=>702,2414=>609,2415=>609,2416=>626,2433=>0,2434=>300,2435=>312,2437=>594,2438=>776,2439=>469,
-2440=>513,2441=>535,2442=>561,2443=>604,2444=>481,2447=>580,2448=>604,2451=>540,2452=>620,2453=>570,
-2454=>485,2455=>484,2456=>471,2457=>457,2458=>408,2459=>452,2460=>591,2461=>551,2462=>771,2463=>414,
-2464=>404,2465=>522,2466=>415,2467=>450,2468=>551,2469=>477,2470=>478,2471=>449,2472=>448,2474=>535,
-2475=>611,2476=>443,2477=>534,2478=>492,2479=>474,2480=>442,2482=>542,2486=>507,2487=>467,2488=>523,
-2489=>419,2492=>0,2493=>419,2494=>202,2495=>189,2496=>202,2497=>0,2498=>0,2499=>0,2500=>0,
-2503=>294,2504=>289,2507=>774,2508=>825,2509=>0,2510=>356,2519=>219,2524=>523,2525=>420,2527=>469,
-2528=>604,2529=>481,2530=>0,2531=>0,2534=>500,2535=>437,2536=>479,2537=>507,2538=>497,2539=>500,
-2540=>482,2541=>503,2542=>517,2543=>481,2544=>443,2545=>443,2546=>429,2547=>383,2548=>432,2549=>478,
-2550=>539,2551=>158,2552=>365,2553=>280,2554=>357,2561=>0,2562=>0,2563=>385,2565=>728,2566=>884,
-2567=>656,2568=>656,2569=>580,2570=>580,2575=>482,2576=>728,2579=>580,2580=>728,2581=>534,2582=>518,
-2583=>602,2584=>674,2585=>530,2586=>502,2587=>576,2588=>476,2589=>558,2590=>501,2591=>510,2592=>540,
-2593=>508,2594=>512,2595=>558,2596=>468,2597=>518,2598=>488,2599=>518,2600=>522,2602=>518,2603=>490,
-2604=>546,2605=>500,2606=>530,2607=>654,2608=>522,2610=>710,2611=>710,2613=>498,2614=>530,2616=>530,
-2617=>501,2620=>286,2622=>156,2623=>174,2624=>174,2625=>0,2626=>0,2631=>0,2632=>0,2635=>0,
-2636=>0,2637=>0,2641=>0,2649=>534,2650=>618,2651=>492,2652=>484,2654=>506,2662=>616,2663=>480,
-2664=>560,2665=>480,2666=>468,2667=>492,2668=>514,2669=>538,2670=>572,2671=>560,2672=>0,2673=>0,
-2674=>498,2675=>596,2676=>900,2677=>0,2946=>345,2947=>616,2949=>910,2950=>1072,2951=>848,2952=>591,
-2953=>492,2954=>1123,2958=>602,2959=>602,2960=>691,2962=>753,2963=>753,2964=>1597,2965=>677,2969=>697,
-2970=>607,2972=>691,2974=>871,2975=>589,2979=>1230,2980=>688,2984=>560,2985=>911,2986=>477,2990=>625,
-2991=>672,2992=>452,2993=>553,2994=>651,2995=>804,2996=>645,2997=>740,2999=>865,3000=>870,3001=>1067,
-3006=>452,3007=>176,3008=>293,3009=>404,3010=>601,3014=>690,3015=>503,3016=>839,3018=>1188,3019=>982,
-3020=>1519,3021=>234,3031=>804,3330=>417,3331=>221,3333=>1055,3334=>1195,3335=>792,3336=>1467,3337=>569,
-3338=>1243,3339=>676,3340=>897,3342=>1008,3343=>1004,3344=>1538,3346=>585,3347=>981,3348=>1254,3349=>775,
-3350=>798,3351=>691,3352=>1095,3353=>809,3354=>726,3355=>963,3356=>703,3357=>1244,3358=>1103,3359=>462,
-3360=>531,3361=>983,3362=>1027,3363=>1102,3364=>779,3365=>731,3366=>485,3367=>737,3368=>747,3370=>779,
-3371=>961,3372=>1023,3373=>500,3374=>510,3375=>792,3376=>527,3377=>511,3378=>713,3379=>553,3380=>516,
-3381=>715,3382=>785,3383=>920,3384=>977,3385=>977,3389=>375,3390=>403,3391=>283,3392=>323,3393=>275,
-3394=>258,3395=>378,3396=>378,3398=>542,3399=>478,3400=>1069,3402=>1127,3403=>1038,3404=>676,3405=>89,
-3415=>676,3424=>676,3425=>1006,3430=>559,3431=>659,3432=>674,3433=>933,3434=>671,3435=>699,3436=>703,
-3437=>688,3438=>677,3439=>684,3440=>375,3458=>355,3459=>241,3461=>501,3465=>591,3466=>613,3467=>630,
-3473=>636,3476=>653,3481=>760,3482=>739,3483=>653,3484=>757,3486=>562,3488=>636,3489=>673,3490=>673,
-3492=>984,3493=>984,3495=>636,3496=>653,3497=>653,3498=>653,3499=>1066,3501=>739,3502=>636,3503=>501,
-3504=>653,3505=>739,3507=>501,3508=>673,3509=>636,3510=>653,3511=>739,3512=>636,3513=>653,3514=>673,
-3515=>613,3517=>630,3520=>636,3521=>739,3522=>673,3523=>673,3524=>739,3525=>630,3526=>739,3530=>0,
-3535=>328,3536=>288,3537=>319,3538=>0,3539=>0,3540=>0,3542=>0,3544=>380,3545=>495,3551=>492,
-3585=>532,3586=>472,3587=>534,3588=>532,3589=>544,3590=>583,3591=>417,3592=>488,3593=>604,3594=>472,
-3595=>534,3596=>716,3597=>717,3598=>568,3599=>568,3600=>457,3601=>637,3602=>731,3603=>790,3604=>531,
-3605=>542,3606=>522,3607=>577,3608=>468,3609=>603,3610=>554,3611=>554,3612=>556,3613=>556,3614=>604,
-3615=>604,3616=>568,3617=>542,3618=>496,3619=>442,3620=>530,3621=>512,3622=>568,3623=>478,3624=>543,
-3625=>614,3626=>525,3627=>578,3628=>659,3629=>514,3630=>514,3631=>450,3632=>402,3633=>0,3634=>378,
-3635=>415,3636=>0,3637=>0,3638=>0,3639=>0,3640=>0,3641=>0,3642=>0,3647=>620,3648=>286,
-3649=>521,3650=>447,3651=>426,3652=>424,3653=>333,3654=>453,3655=>0,3656=>0,3657=>0,3658=>0,
-3659=>0,3660=>0,3661=>0,3662=>0,3663=>657,3664=>528,3665=>528,3666=>571,3667=>594,3668=>631,
-3669=>632,3670=>478,3671=>713,3672=>597,3673=>565,3674=>615,3675=>1381,4256=>453,4257=>448,4258=>546,
-4259=>619,4260=>478,4261=>481,4262=>459,4263=>707,4264=>467,4265=>471,4266=>842,4267=>464,4268=>443,
-4269=>707,4270=>460,4271=>465,4272=>686,4273=>440,4274=>550,4275=>561,4276=>580,4277=>467,4278=>630,
-4279=>466,4280=>517,4281=>456,4282=>502,4283=>464,4284=>534,4285=>440,4286=>443,4287=>522,4288=>460,
-4289=>463,4290=>536,4291=>455,4292=>468,4293=>449,4304=>454,4305=>452,4306=>544,4307=>629,4308=>451,
-4309=>452,4310=>452,4311=>702,4312=>451,4313=>452,4314=>820,4315=>451,4316=>453,4317=>695,4318=>449,
-4319=>448,4320=>694,4321=>501,4322=>544,4323=>517,4324=>560,4325=>450,4326=>627,4327=>452,4328=>491,
-4329=>452,4330=>485,4331=>452,4332=>485,4333=>443,4334=>500,4335=>582,4336=>455,4337=>451,4338=>480,
-4339=>414,4340=>453,4341=>418,4345=>528,4347=>410,4608=>583,4609=>770,4610=>560,4611=>525,4612=>525,
-4613=>583,4614=>758,4616=>598,4617=>787,4618=>817,4619=>583,4620=>758,4621=>612,4622=>875,4623=>817,
-4624=>817,4625=>1050,4626=>1050,4627=>817,4628=>1050,4629=>817,4630=>787,4631=>1021,4632=>933,4633=>1137,
-4634=>1067,4635=>980,4636=>1065,4637=>962,4638=>962,4639=>1097,4640=>831,4641=>1021,4642=>851,4643=>735,
-4644=>875,4645=>968,4646=>817,4647=>881,4648=>583,4649=>642,4650=>583,4651=>758,4652=>700,4653=>583,
-4654=>700,4655=>758,4656=>583,4657=>787,4658=>787,4659=>583,4660=>729,4661=>583,4662=>583,4663=>817,
-4664=>642,4665=>817,4666=>846,4667=>642,4668=>758,4669=>744,4670=>642,4671=>817,4672=>700,4673=>700,
-4674=>700,4675=>758,4676=>700,4677=>700,4678=>729,4680=>846,4682=>1079,4683=>700,4684=>700,4685=>1021,
-4688=>700,4689=>700,4690=>700,4691=>758,4692=>700,4693=>758,4694=>729,4696=>846,4698=>1079,4699=>700,
-4700=>700,4701=>1021,4704=>525,4705=>758,4706=>758,4707=>525,4708=>700,4709=>773,4710=>525,4711=>787,
-4712=>525,4713=>758,4714=>758,4715=>525,4716=>700,4717=>773,4718=>525,4719=>525,4720=>729,4721=>729,
-4722=>729,4723=>802,4724=>729,4725=>729,4726=>758,4727=>729,4728=>758,4729=>758,4730=>758,4731=>817,
-4732=>758,4733=>817,4734=>758,4735=>758,4736=>612,4737=>817,4738=>817,4739=>612,4740=>787,4741=>583,
-4742=>875,4744=>962,4746=>992,4747=>700,4748=>758,4749=>904,4752=>408,4753=>583,4754=>525,4755=>554,
-4756=>481,4757=>554,4758=>642,4759=>671,4760=>700,4761=>758,4762=>729,4763=>700,4764=>671,4765=>700,
-4766=>758,4767=>700,4768=>583,4769=>735,4770=>822,4771=>583,4772=>793,4773=>583,4774=>583,4775=>694,
-4776=>554,4777=>729,4778=>773,4779=>554,4780=>700,4781=>554,4782=>554,4784=>992,4786=>1021,4787=>671,
-4788=>787,4789=>904,4792=>729,4793=>904,4794=>948,4795=>729,4796=>875,4797=>729,4798=>729,4800=>1137,
-4802=>1167,4803=>758,4804=>875,4805=>1108,4808=>758,4809=>875,4810=>700,4811=>700,4812=>700,4813=>992,
-4814=>758,4816=>554,4817=>787,4818=>758,4819=>583,4820=>758,4821=>496,4822=>612,4824=>525,4825=>700,
-4826=>700,4827=>525,4828=>685,4829=>729,4830=>510,4831=>729,4832=>962,4833=>962,4834=>962,4835=>962,
-4836=>962,4837=>1021,4838=>962,4839=>962,4840=>467,4841=>525,4842=>671,4843=>612,4844=>612,4845=>671,
-4846=>671,4848=>612,4849=>875,4850=>817,4851=>642,4852=>729,4853=>729,4854=>758,4855=>817,4856=>700,
-4857=>758,4858=>715,4859=>700,4860=>700,4861=>787,4862=>758,4863=>700,4864=>700,4865=>758,4866=>715,
-4867=>700,4868=>700,4869=>787,4870=>758,4871=>700,4872=>467,4873=>671,4874=>671,4875=>612,4876=>612,
-4877=>583,4878=>525,4880=>846,4882=>904,4883=>554,4884=>700,4885=>817,4888=>525,4889=>729,4890=>729,
-4891=>612,4892=>671,4893=>583,4894=>525,4896=>817,4897=>1021,4898=>1021,4899=>817,4900=>992,4901=>758,
-4902=>817,4903=>1021,4904=>1079,4905=>1137,4906=>1137,4907=>1050,4908=>1312,4909=>1050,4910=>1050,4911=>1123,
-4912=>647,4913=>793,4914=>822,4915=>647,4916=>793,4917=>764,4918=>583,4919=>647,4920=>583,4921=>793,
-4922=>822,4923=>583,4924=>793,4925=>764,4926=>583,4927=>793,4928=>540,4929=>758,4930=>583,4931=>467,
-4932=>583,4933=>481,4934=>612,4936=>758,4937=>700,4938=>758,4939=>700,4940=>831,4941=>671,4942=>758,
-4943=>700,4944=>758,4945=>758,4946=>758,4947=>817,4948=>758,4949=>758,4950=>817,4951=>758,4952=>642,
-4953=>980,4954=>758,4961=>233,4962=>583,4963=>408,4964=>408,4965=>525,4966=>525,4967=>233,4968=>700,
-4969=>671,4970=>612,4971=>642,4972=>642,4973=>642,4974=>583,4975=>700,4976=>758,4977=>642,4978=>583,
-4979=>700,4980=>729,4981=>720,4982=>583,4983=>758,4984=>700,4985=>904,4986=>612,4987=>583,4988=>875,
-5024=>711,5025=>678,5026=>604,5027=>667,5028=>796,5029=>301,5030=>516,5031=>544,5032=>457,5033=>716,
-5034=>703,5035=>383,5036=>628,5037=>709,5038=>455,5039=>601,5040=>472,5041=>574,5042=>730,5043=>939,
-5044=>498,5045=>528,5046=>667,5047=>891,5048=>505,5049=>792,5050=>957,5051=>725,5052=>595,5053=>733,
-5054=>698,5055=>638,5056=>720,5057=>732,5058=>624,5059=>638,5060=>565,5061=>903,5062=>655,5063=>681,
-5064=>675,5065=>949,5066=>683,5067=>547,5068=>693,5069=>732,5070=>529,5071=>569,5072=>536,5073=>677,
-5074=>631,5075=>382,5076=>973,5077=>543,5078=>607,5079=>652,5080=>652,5081=>693,5082=>514,5083=>803,
-5084=>658,5085=>597,5086=>627,5087=>659,5088=>679,5089=>706,5090=>563,5091=>618,5092=>767,5093=>776,
-5094=>731,5095=>492,5096=>808,5097=>823,5098=>796,5099=>689,5100=>716,5101=>518,5102=>521,5103=>719,
-5104=>563,5105=>776,5106=>634,5107=>822,5108=>621,5920=>502,5921=>502,5922=>500,5923=>498,5924=>500,
-5925=>502,5926=>502,5927=>502,5928=>500,5929=>503,5930=>502,5931=>502,5932=>500,5933=>500,5934=>500,
-5935=>796,5936=>500,5937=>502,5938=>0,5939=>0,5940=>0,5941=>230,5942=>397,6480=>537,6481=>537,
-6482=>531,6483=>678,6484=>682,6485=>628,6486=>732,6487=>721,6488=>598,6489=>583,6490=>702,6491=>554,
-6492=>683,6493=>554,6494=>710,6495=>695,6496=>523,6497=>678,6498=>589,6499=>272,6500=>506,6501=>515,
-6502=>515,6503=>210,6504=>210,6505=>515,6506=>515,6507=>515,6508=>229,6509=>705,6512=>649,6513=>538,
-6514=>568,6515=>520,6516=>544,6656=>820,6657=>958,6658=>758,6659=>859,6660=>958,6661=>727,6662=>904,
-6663=>940,6664=>850,6665=>905,6666=>838,6667=>961,6668=>1000,6669=>880,6670=>1189,6671=>1246,6672=>1177,
-6673=>757,6674=>1246,6675=>1192,6676=>709,6677=>1192,6678=>1075,6679=>0,6680=>0,6681=>534,6682=>690,
-6683=>0,6686=>697,6687=>500,7424=>484,7425=>595,7426=>667,7427=>446,7428=>446,7429=>483,7430=>483,
-7431=>409,7432=>426,7433=>278,7434=>260,7435=>483,7436=>409,7437=>595,7438=>483,7439=>483,7440=>426,
-7441=>500,7442=>489,7443=>668,7444=>722,7445=>378,7448=>372,7449=>446,7450=>446,7451=>409,7452=>483,
-7453=>488,7454=>660,7455=>500,7456=>483,7457=>632,7458=>409,7459=>355,7462=>392,7463=>483,7464=>483,
-7465=>372,7466=>541,7467=>470,7468=>484,7469=>595,7470=>446,7471=>446,7472=>483,7473=>409,7474=>409,
-7475=>483,7476=>483,7477=>223,7478=>260,7479=>483,7480=>409,7481=>595,7482=>483,7483=>483,7484=>483,
-7485=>378,7486=>372,7487=>446,7488=>409,7489=>483,7490=>632,7491=>297,7492=>297,7493=>335,7494=>446,
-7495=>335,7496=>335,7497=>297,7498=>297,7499=>285,7500=>285,7501=>335,7502=>186,7503=>335,7504=>521,
-7505=>335,7506=>335,7507=>297,7510=>335,7511=>186,7512=>335,7513=>326,7514=>521,7515=>335,7517=>353,
-7518=>321,7519=>357,7520=>430,7521=>321,7522=>186,7523=>223,7524=>335,7525=>335,7526=>353,7527=>321,
-7528=>353,7529=>430,7530=>321,7531=>754,7532=>500,7533=>500,7534=>333,7535=>778,7536=>500,7537=>500,
-7538=>333,7539=>333,7540=>389,7541=>278,7542=>444,7543=>500,7544=>483,7546=>774,7547=>217,7548=>278,
-7549=>500,7550=>483,7551=>514,7552=>500,7553=>500,7554=>333,7555=>676,7556=>525,7557=>278,7558=>802,
-7559=>507,7560=>500,7561=>333,7562=>389,7563=>384,7564=>500,7565=>500,7566=>444,7680=>722,7681=>444,
-7682=>667,7683=>500,7684=>667,7685=>500,7686=>667,7687=>500,7688=>667,7689=>444,7690=>722,7691=>500,
-7692=>722,7693=>500,7694=>722,7695=>500,7696=>720,7697=>500,7698=>722,7699=>500,7700=>611,7701=>444,
-7702=>611,7703=>444,7704=>611,7705=>444,7706=>611,7707=>444,7708=>611,7709=>444,7710=>556,7711=>333,
-7712=>722,7713=>500,7714=>722,7715=>500,7716=>722,7717=>500,7718=>722,7719=>500,7720=>722,7721=>500,
-7722=>722,7723=>500,7724=>333,7725=>278,7726=>333,7727=>278,7728=>722,7729=>500,7730=>722,7731=>500,
-7732=>722,7733=>500,7734=>611,7735=>278,7736=>611,7737=>278,7738=>611,7739=>278,7740=>611,7741=>278,
-7742=>889,7743=>778,7744=>889,7745=>778,7746=>889,7747=>778,7748=>722,7749=>500,7750=>722,7751=>500,
-7752=>722,7753=>500,7754=>722,7755=>500,7756=>722,7757=>500,7758=>722,7759=>500,7760=>722,7761=>500,
-7762=>722,7763=>500,7764=>556,7765=>500,7766=>556,7767=>500,7768=>667,7769=>333,7770=>667,7771=>333,
-7772=>667,7773=>333,7774=>667,7775=>333,7776=>556,7777=>389,7778=>556,7779=>389,7780=>556,7781=>389,
-7782=>556,7783=>389,7784=>556,7785=>389,7786=>611,7787=>278,7788=>611,7789=>278,7790=>611,7791=>278,
-7792=>611,7793=>278,7794=>722,7795=>500,7796=>722,7797=>500,7798=>722,7799=>500,7800=>722,7801=>500,
-7802=>722,7803=>500,7804=>722,7805=>500,7806=>722,7807=>500,7808=>944,7809=>722,7810=>944,7811=>722,
-7812=>944,7813=>722,7814=>944,7815=>722,7816=>944,7817=>722,7818=>722,7819=>500,7820=>722,7821=>500,
-7822=>722,7823=>500,7824=>611,7825=>444,7826=>611,7827=>444,7828=>611,7829=>444,7830=>500,7831=>278,
-7832=>722,7833=>500,7834=>444,7835=>333,7840=>722,7841=>444,7842=>807,7843=>529,7844=>722,7845=>444,
-7846=>722,7847=>444,7848=>722,7849=>454,7850=>722,7851=>444,7852=>722,7853=>444,7854=>722,7855=>444,
-7856=>722,7857=>444,7858=>722,7859=>454,7860=>722,7861=>444,7862=>722,7863=>444,7864=>611,7865=>444,
-7866=>611,7867=>444,7868=>611,7869=>444,7870=>611,7871=>444,7872=>611,7873=>444,7874=>613,7875=>444,
-7876=>611,7877=>444,7878=>611,7879=>444,7880=>333,7881=>278,7882=>333,7883=>278,7884=>722,7885=>500,
-7886=>722,7887=>500,7888=>722,7889=>500,7890=>722,7891=>500,7892=>722,7893=>500,7894=>722,7895=>500,
-7896=>722,7897=>500,7898=>722,7899=>516,7900=>722,7901=>516,7902=>720,7903=>516,7904=>722,7905=>516,
-7906=>722,7907=>516,7908=>722,7909=>500,7910=>717,7911=>500,7912=>800,7913=>518,7914=>800,7915=>518,
-7916=>800,7917=>518,7918=>800,7919=>518,7920=>800,7921=>518,7922=>722,7923=>500,7924=>722,7925=>500,
-7926=>722,7927=>501,7928=>722,7929=>500,7936=>583,7937=>583,7938=>583,7939=>583,7940=>583,7941=>583,
-7942=>583,7943=>583,7944=>722,7945=>722,7946=>813,7947=>817,7948=>763,7949=>765,7950=>720,7951=>722,
-7952=>426,7953=>426,7954=>426,7955=>426,7956=>426,7957=>426,7960=>770,7961=>770,7962=>902,7963=>919,
-7964=>940,7965=>936,7968=>536,7969=>536,7970=>536,7971=>536,7972=>536,7973=>536,7974=>536,7975=>536,
-7976=>847,7977=>859,7978=>986,7979=>1010,7980=>1026,7981=>1029,7982=>918,7983=>921,7984=>286,7985=>286,
-7986=>302,7987=>320,7988=>300,7989=>306,7990=>312,7991=>303,7992=>475,7993=>507,7994=>617,7995=>654,
-7996=>655,7997=>660,7998=>551,7999=>566,8000=>500,8001=>500,8002=>500,8003=>500,8004=>500,8005=>500,
-8008=>816,8009=>825,8010=>969,8011=>995,8012=>938,8013=>955,8016=>514,8017=>514,8018=>514,8019=>514,
-8020=>514,8021=>514,8022=>514,8023=>514,8025=>818,8027=>988,8029=>989,8031=>893,8032=>693,8033=>693,
-8034=>693,8035=>693,8036=>693,8037=>693,8038=>693,8039=>693,8040=>836,8041=>843,8042=>1006,8043=>1024,
-8044=>974,8045=>986,8046=>905,8047=>896,8048=>583,8049=>583,8050=>426,8051=>426,8052=>536,8053=>536,
-8054=>286,8055=>286,8056=>500,8057=>500,8058=>514,8059=>514,8060=>693,8061=>693,8064=>583,8065=>583,
-8066=>583,8067=>583,8068=>583,8069=>583,8070=>583,8071=>583,8072=>888,8073=>889,8074=>984,8075=>991,
-8076=>943,8077=>948,8078=>884,8079=>886,8080=>536,8081=>536,8082=>536,8083=>536,8084=>536,8085=>536,
-8086=>536,8087=>536,8088=>1017,8089=>1026,8090=>1153,8091=>1179,8092=>1195,8093=>1199,8094=>1088,8095=>1088,
-8096=>693,8097=>693,8098=>693,8099=>693,8100=>693,8101=>693,8102=>693,8103=>693,8104=>1034,8105=>1040,
-8106=>1210,8107=>1229,8108=>1176,8109=>1186,8110=>1098,8111=>1090,8112=>583,8113=>583,8114=>583,8115=>583,
-8116=>583,8118=>583,8119=>583,8120=>722,8121=>722,8122=>722,8123=>722,8124=>889,8125=>250,8126=>332,
-8127=>500,8128=>500,8129=>534,8130=>536,8131=>536,8132=>536,8134=>536,8135=>536,8136=>761,8137=>800,
-8138=>829,8139=>893,8140=>883,8141=>500,8142=>500,8143=>500,8144=>286,8145=>286,8146=>286,8147=>286,
-8150=>286,8151=>286,8152=>333,8153=>333,8154=>447,8155=>537,8157=>500,8158=>500,8159=>500,8160=>514,
-8161=>514,8162=>514,8163=>514,8164=>528,8165=>528,8166=>514,8167=>514,8168=>696,8169=>696,8170=>816,
-8171=>828,8172=>721,8173=>333,8174=>333,8175=>500,8178=>693,8179=>693,8180=>693,8182=>693,8183=>693,
-8184=>832,8185=>899,8186=>847,8187=>852,8188=>928,8189=>500,8190=>500,8192=>500,8193=>1000,8194=>500,
-8195=>1000,8196=>333,8197=>250,8198=>167,8199=>500,8200=>250,8201=>200,8202=>100,8203=>0,8204=>0,
-8205=>0,8206=>0,8207=>0,8208=>333,8209=>333,8210=>500,8213=>1000,8214=>293,8215=>478,8219=>250,
-8223=>444,8227=>350,8228=>620,8229=>620,8231=>250,8232=>0,8233=>0,8234=>0,8235=>0,8236=>0,
-8237=>0,8238=>0,8239=>250,8241=>1363,8242=>247,8243=>411,8244=>611,8245=>220,8246=>440,8247=>660,
-8248=>469,8251=>629,8252=>666,8253=>444,8254=>500,8255=>953,8256=>953,8257=>314,8258=>931,8259=>333,
-8260=>167,8261=>383,8262=>383,8263=>888,8264=>777,8265=>777,8266=>500,8267=>453,8268=>453,8269=>450,
-8270=>500,8271=>278,8272=>882,8273=>500,8274=>497,8275=>500,8276=>953,8277=>512,8278=>410,8279=>855,
-8280=>620,8281=>620,8282=>179,8283=>621,8284=>564,8285=>179,8286=>179,8287=>111,8288=>0,8289=>0,
-8290=>0,8291=>0,8292=>0,8304=>320,8305=>300,8308=>320,8309=>320,8310=>320,8311=>320,8312=>320,
-8313=>320,8314=>300,8315=>300,8316=>300,8317=>216,8318=>216,8319=>300,8320=>320,8321=>320,8322=>320,
-8323=>320,8324=>320,8325=>320,8326=>320,8327=>320,8328=>320,8329=>320,8330=>300,8331=>300,8332=>300,
-8333=>216,8334=>216,8336=>320,8337=>320,8338=>320,8339=>320,8340=>320,8352=>698,8353=>667,8354=>667,
-8355=>556,8356=>500,8357=>778,8358=>722,8359=>940,8360=>1026,8361=>813,8362=>869,8363=>512,8365=>722,
-8366=>611,8367=>1340,8368=>489,8369=>601,8370=>619,8371=>722,8372=>556,8373=>611,8400=>0,8401=>0,
-8402=>0,8403=>0,8404=>0,8405=>0,8406=>0,8407=>0,8408=>0,8409=>0,8410=>0,8411=>0,
-8412=>0,8413=>0,8414=>0,8415=>0,8416=>0,8417=>0,8418=>0,8419=>0,8420=>0,8421=>0,
-8422=>0,8423=>0,8424=>0,8425=>0,8426=>0,8427=>0,8428=>0,8429=>0,8430=>0,8431=>0,
-8432=>0,8448=>751,8449=>723,8450=>674,8451=>954,8452=>556,8453=>781,8454=>806,8455=>518,8456=>667,
-8457=>822,8458=>490,8459=>824,8460=>663,8461=>818,8462=>500,8463=>500,8464=>578,8465=>613,8466=>715,
-8467=>417,8468=>778,8469=>751,8470=>880,8471=>760,8472=>832,8473=>589,8474=>729,8475=>892,8476=>711,
-8477=>755,8478=>667,8479=>667,8480=>879,8481=>1156,8483=>722,8484=>659,8485=>389,8486=>743,8487=>757,
-8488=>663,8489=>286,8490=>722,8491=>722,8492=>846,8493=>613,8494=>533,8495=>363,8496=>587,8497=>690,
-8498=>556,8499=>1021,8500=>387,8501=>537,8502=>537,8503=>350,8504=>537,8505=>417,8506=>906,8507=>1155,
-8513=>663,8514=>485,8515=>485,8516=>637,8522=>516,8523=>778,8525=>899,8526=>500,8531=>750,8532=>750,
-8533=>750,8534=>750,8535=>750,8536=>750,8537=>750,8538=>750,8539=>750,8540=>750,8541=>750,8542=>750,
-8543=>750,8544=>333,8545=>630,8546=>927,8547=>1019,8548=>722,8549=>1019,8550=>1316,8551=>1629,8552=>1019,
-8553=>722,8554=>1019,8555=>1316,8556=>611,8557=>667,8558=>722,8559=>889,8560=>278,8561=>556,8562=>834,
-8563=>778,8564=>500,8565=>778,8566=>1056,8567=>1334,8568=>778,8569=>500,8570=>778,8571=>1056,8572=>278,
-8573=>444,8574=>500,8575=>778,8592=>964,8593=>472,8594=>964,8595=>500,8596=>964,8597=>499,8598=>964,
-8599=>964,8600=>964,8601=>964,8602=>964,8603=>964,8604=>1009,8605=>1009,8606=>964,8607=>500,8608=>964,
-8609=>499,8610=>1093,8611=>1093,8612=>1093,8613=>500,8614=>1093,8615=>500,8616=>500,8617=>964,8618=>964,
-8619=>964,8620=>964,8621=>1151,8622=>964,8624=>482,8625=>482,8626=>482,8627=>482,8628=>658,8629=>658,
-8630=>1069,8631=>1069,8634=>939,8635=>939,8636=>964,8637=>964,8638=>499,8639=>499,8640=>964,8641=>964,
-8642=>499,8643=>499,8644=>964,8645=>840,8646=>964,8647=>964,8648=>840,8649=>964,8650=>840,8651=>964,
-8652=>964,8653=>964,8654=>964,8655=>964,8656=>964,8657=>550,8658=>964,8659=>550,8660=>964,8661=>550,
-8662=>1047,8663=>1047,8664=>1047,8665=>1047,8666=>964,8667=>964,8668=>1092,8669=>1092,8672=>964,8674=>964,
-8704=>587,8705=>716,8706=>494,8707=>587,8708=>587,8709=>746,8710=>612,8711=>612,8712=>536,8713=>536,
-8714=>439,8715=>536,8716=>536,8717=>439,8718=>506,8719=>823,8720=>823,8721=>713,8722=>564,8723=>564,
-8724=>564,8725=>636,8726=>636,8727=>471,8728=>497,8729=>497,8730=>549,8731=>549,8732=>549,8733=>636,
-8734=>853,8735=>509,8736=>575,8737=>559,8738=>509,8739=>200,8740=>250,8741=>320,8742=>320,8743=>564,
-8744=>564,8745=>654,8746=>654,8747=>416,8748=>750,8749=>1083,8750=>722,8751=>750,8752=>1083,8753=>697,
-8754=>722,8755=>722,8756=>565,8757=>568,8758=>250,8759=>629,8760=>564,8761=>758,8762=>564,8763=>636,
-8764=>636,8765=>636,8766=>503,8767=>614,8768=>636,8769=>636,8770=>636,8771=>636,8772=>636,8773=>636,
-8774=>636,8775=>636,8776=>636,8777=>636,8778=>636,8779=>636,8780=>636,8781=>636,8782=>636,8783=>636,
-8784=>564,8785=>564,8786=>564,8787=>564,8788=>735,8789=>755,8790=>564,8791=>564,8792=>564,8793=>564,
-8794=>564,8795=>564,8796=>600,8797=>564,8798=>564,8799=>564,8800=>564,8801=>636,8802=>636,8803=>636,
-8804=>636,8805=>636,8806=>636,8807=>636,8808=>636,8809=>636,8810=>900,8811=>899,8812=>410,8813=>636,
-8814=>636,8815=>636,8816=>636,8817=>636,8818=>636,8819=>636,8820=>636,8821=>636,8822=>636,8823=>636,
-8824=>636,8825=>636,8826=>636,8827=>636,8828=>636,8829=>636,8830=>636,8831=>636,8832=>636,8833=>636,
-8834=>636,8835=>636,8836=>636,8837=>636,8838=>636,8839=>636,8840=>636,8841=>636,8842=>636,8843=>636,
-8844=>654,8845=>654,8846=>654,8847=>636,8848=>636,8849=>636,8850=>636,8851=>636,8852=>636,8853=>636,
-8854=>636,8855=>636,8856=>636,8857=>636,8858=>636,8859=>636,8860=>636,8861=>636,8862=>636,8863=>636,
-8864=>636,8865=>636,8866=>600,8867=>600,8868=>712,8869=>712,8870=>466,8871=>466,8872=>595,8873=>588,
-8874=>710,8875=>706,8876=>595,8877=>596,8878=>588,8879=>706,8880=>636,8881=>636,8882=>636,8883=>636,
-8884=>636,8885=>636,8886=>1296,8887=>1296,8888=>966,8889=>564,8890=>626,8891=>564,8892=>564,8893=>566,
-8894=>570,8895=>582,8896=>744,8897=>744,8898=>764,8899=>764,8900=>512,8901=>250,8902=>471,8903=>629,
-8904=>636,8905=>636,8906=>636,8907=>816,8908=>816,8909=>636,8910=>636,8911=>636,8912=>636,8913=>636,
-8914=>654,8915=>654,8916=>654,8917=>636,8918=>564,8919=>564,8920=>1215,8921=>1215,8922=>636,8923=>636,
-8924=>636,8925=>636,8926=>636,8927=>636,8928=>636,8929=>636,8930=>636,8931=>636,8932=>636,8933=>636,
-8934=>636,8935=>636,8936=>636,8937=>636,8938=>636,8939=>636,8940=>636,8941=>636,8942=>250,8943=>1000,
-8944=>1000,8945=>1000,8946=>601,8947=>536,8948=>464,8949=>536,8950=>536,8951=>464,8952=>536,8953=>536,
-8954=>601,8955=>536,8956=>464,8957=>536,8958=>464,8959=>600,8960=>780,8961=>442,8962=>794,8968=>474,
-8969=>474,8970=>474,8971=>474,8976=>564,8977=>503,8978=>791,8979=>791,8980=>593,8981=>560,8982=>563,
-8983=>563,8984=>800,8985=>564,8986=>805,8988=>474,8989=>474,8990=>474,8991=>474,8992=>686,8993=>686,
-8994=>658,8995=>658,8996=>800,9000=>800,9001=>329,9002=>329,9031=>777,9032=>777,9040=>777,9047=>777,
-9054=>777,9088=>800,9089=>800,9090=>800,9091=>800,9094=>800,9095=>800,9096=>800,9097=>800,9098=>800,
-9100=>800,9103=>788,9104=>788,9105=>788,9106=>788,9108=>800,9109=>800,9110=>800,9111=>800,9112=>800,
-9113=>800,9114=>800,9115=>384,9116=>384,9117=>384,9118=>384,9119=>384,9120=>384,9121=>388,9122=>388,
-9123=>388,9124=>388,9125=>388,9126=>388,9127=>494,9128=>494,9129=>494,9130=>494,9131=>494,9132=>494,
-9133=>494,9134=>686,9138=>1287,9139=>1287,9140=>860,9141=>861,9166=>800,9167=>800,9180=>896,9181=>896,
-9182=>903,9183=>904,9184=>910,9185=>910,9186=>761,9187=>910,9189=>942,9190=>817,9251=>500,9312=>788,
-9313=>788,9314=>788,9315=>788,9316=>788,9317=>788,9318=>788,9319=>788,9320=>788,9321=>788,9472=>889,
-9473=>889,9474=>889,9475=>889,9484=>889,9485=>889,9486=>889,9487=>889,9488=>889,9489=>889,9490=>889,
-9491=>889,9492=>889,9493=>889,9494=>889,9495=>889,9496=>889,9497=>889,9498=>889,9499=>889,9500=>889,
-9501=>889,9502=>889,9503=>889,9504=>889,9505=>889,9506=>889,9507=>889,9508=>889,9509=>889,9510=>889,
-9511=>889,9512=>889,9513=>889,9514=>889,9515=>889,9516=>889,9517=>889,9518=>889,9519=>889,9520=>889,
-9521=>889,9522=>889,9523=>889,9524=>889,9525=>889,9526=>889,9527=>889,9528=>889,9529=>889,9530=>889,
-9531=>889,9532=>889,9533=>889,9534=>889,9535=>889,9536=>889,9537=>889,9538=>889,9539=>889,9540=>889,
-9541=>889,9542=>889,9543=>889,9544=>889,9545=>889,9546=>889,9547=>889,9552=>889,9553=>889,9554=>889,
-9555=>889,9556=>889,9557=>889,9558=>889,9559=>889,9560=>889,9561=>889,9562=>889,9563=>889,9564=>889,
-9565=>889,9566=>889,9567=>889,9568=>889,9569=>889,9570=>889,9571=>889,9572=>889,9573=>889,9574=>889,
-9575=>889,9576=>889,9577=>889,9578=>889,9579=>889,9580=>889,9581=>889,9582=>889,9583=>889,9584=>889,
-9585=>889,9586=>889,9587=>889,9588=>889,9589=>889,9590=>889,9591=>889,9592=>889,9593=>889,9594=>889,
-9595=>889,9596=>600,9597=>889,9598=>600,9599=>889,9600=>761,9601=>761,9602=>761,9603=>761,9604=>761,
-9605=>761,9606=>761,9607=>761,9608=>761,9609=>761,9610=>761,9611=>761,9612=>761,9613=>761,9614=>761,
-9615=>761,9616=>761,9617=>1000,9619=>1000,9620=>761,9621=>761,9622=>761,9623=>761,9624=>761,9625=>761,
-9626=>761,9627=>761,9628=>761,9629=>761,9630=>761,9631=>761,9632=>761,9633=>761,9634=>761,9635=>761,
-9636=>761,9637=>761,9638=>761,9639=>761,9640=>761,9641=>761,9642=>532,9643=>532,9644=>761,9645=>761,
-9646=>761,9647=>761,9648=>761,9649=>761,9650=>892,9651=>892,9652=>446,9653=>446,9654=>892,9655=>892,
-9656=>446,9657=>446,9658=>892,9659=>892,9660=>892,9661=>892,9662=>446,9663=>446,9664=>892,9665=>892,
-9666=>446,9667=>446,9668=>892,9669=>892,9670=>788,9671=>788,9672=>788,9673=>791,9674=>494,9675=>791,
-9676=>791,9677=>785,9678=>791,9679=>791,9680=>791,9681=>791,9682=>791,9683=>791,9684=>791,9685=>791,
-9686=>791,9687=>791,9688=>761,9689=>761,9690=>761,9691=>761,9692=>791,9693=>791,9694=>791,9695=>791,
-9696=>791,9697=>791,9698=>761,9699=>761,9700=>761,9701=>761,9702=>791,9703=>761,9704=>761,9705=>761,
-9706=>761,9707=>761,9708=>892,9709=>892,9710=>892,9711=>851,9712=>761,9713=>761,9714=>761,9715=>761,
-9716=>791,9717=>791,9718=>791,9719=>791,9720=>761,9721=>761,9722=>761,9723=>761,9724=>761,9725=>570,
-9726=>570,9727=>761,9728=>800,9729=>800,9730=>748,9731=>800,9732=>800,9733=>811,9734=>816,9735=>468,
-9736=>677,9737=>724,9738=>944,9739=>944,9740=>686,9741=>944,9742=>715,9743=>715,9744=>757,9745=>755,
-9746=>755,9747=>756,9748=>800,9749=>837,9750=>719,9751=>719,9752=>782,9753=>822,9754=>954,9755=>954,
-9756=>933,9757=>489,9758=>933,9759=>489,9760=>517,9761=>660,9762=>724,9763=>732,9764=>886,9765=>577,
-9766=>489,9767=>563,9768=>490,9769=>770,9770=>725,9771=>860,9772=>668,9773=>753,9774=>724,9775=>730,
-9776=>600,9777=>600,9778=>600,9779=>600,9780=>600,9781=>600,9782=>600,9783=>600,9784=>730,9785=>724,
-9786=>724,9787=>724,9788=>799,9789=>659,9790=>659,9791=>495,9792=>495,9793=>495,9794=>686,9795=>661,
-9796=>544,9797=>608,9798=>605,9799=>545,9800=>804,9801=>583,9802=>796,9803=>1006,9804=>825,9805=>1189,
-9806=>1144,9807=>1189,9808=>683,9809=>808,9810=>1146,9811=>797,9812=>758,9813=>757,9814=>758,9815=>758,
-9816=>758,9817=>758,9818=>758,9819=>758,9820=>758,9821=>758,9822=>758,9823=>758,9824=>770,9825=>770,
-9826=>770,9827=>770,9828=>770,9829=>770,9830=>770,9831=>770,9832=>895,9833=>333,9834=>555,9835=>722,
-9836=>722,9837=>415,9838=>377,9839=>402,9840=>642,9841=>655,9842=>869,9843=>905,9844=>905,9845=>905,
-9846=>905,9847=>905,9848=>905,9849=>905,9850=>905,9851=>1016,9852=>1064,9853=>1064,9854=>954,9855=>606,
-9856=>522,9857=>522,9858=>522,9859=>522,9860=>522,9861=>522,9862=>845,9863=>844,9864=>844,9865=>844,
-9866=>748,9867=>748,9868=>748,9869=>748,9870=>748,9871=>748,9872=>726,9873=>726,9874=>963,9875=>770,
-9876=>1038,9877=>388,9878=>997,9879=>787,9880=>508,9881=>809,9882=>1014,9883=>859,9884=>818,9885=>972,
-9888=>1000,9889=>546,9890=>784,9891=>786,9892=>738,9893=>542,9894=>601,9895=>700,9896=>511,9897=>861,
-9898=>611,9899=>611,9900=>544,9901=>782,9902=>1025,9903=>1141,9904=>1000,9905=>513,9906=>510,9907=>642,
-9908=>722,9909=>719,9910=>777,9911=>495,9912=>602,9913=>836,9914=>666,9915=>666,9916=>691,9920=>689,
-9921=>689,9922=>689,9923=>689,9985=>974,9986=>961,9987=>974,9988=>980,9990=>789,9991=>790,9992=>791,
-9993=>690,9996=>549,9997=>855,9998=>911,9999=>933,10000=>911,10001=>945,10002=>974,10003=>755,10004=>846,
-10005=>762,10006=>761,10007=>571,10008=>677,10009=>763,10010=>760,10011=>759,10012=>754,10013=>494,10014=>552,
-10015=>537,10016=>577,10017=>692,10018=>786,10019=>788,10020=>788,10021=>790,10022=>793,10023=>794,10025=>823,
-10026=>789,10027=>841,10028=>823,10029=>833,10030=>816,10031=>831,10032=>923,10033=>744,10034=>723,10035=>749,
-10036=>790,10037=>792,10038=>695,10039=>776,10040=>768,10041=>792,10042=>759,10043=>707,10044=>708,10045=>682,
-10046=>701,10047=>826,10048=>815,10049=>789,10050=>789,10051=>707,10052=>687,10053=>696,10054=>689,10055=>786,
-10056=>787,10057=>713,10058=>791,10059=>785,10061=>873,10063=>762,10064=>762,10065=>759,10066=>759,10070=>784,
-10072=>138,10073=>277,10074=>415,10075=>392,10076=>392,10077=>668,10078=>668,10081=>732,10082=>544,10083=>544,
-10084=>910,10085=>667,10086=>760,10087=>760,10088=>390,10089=>390,10090=>317,10091=>317,10092=>276,10093=>276,
-10094=>509,10095=>509,10096=>410,10097=>410,10098=>234,10099=>234,10100=>334,10101=>334,10102=>788,10103=>788,
-10104=>788,10105=>788,10106=>788,10107=>788,10108=>788,10109=>788,10110=>788,10111=>788,10112=>788,10113=>788,
-10114=>788,10115=>788,10116=>788,10117=>788,10118=>788,10119=>788,10120=>788,10121=>788,10122=>788,10123=>788,
-10124=>788,10125=>788,10126=>788,10127=>788,10128=>788,10129=>788,10130=>788,10131=>788,10132=>894,10136=>748,
-10137=>924,10138=>748,10139=>918,10140=>927,10141=>928,10142=>928,10143=>834,10144=>873,10145=>828,10146=>924,
-10147=>924,10148=>917,10149=>930,10150=>931,10151=>463,10152=>883,10153=>836,10154=>836,10155=>867,10156=>867,
-10157=>696,10158=>696,10159=>874,10161=>874,10162=>760,10163=>946,10164=>771,10165=>865,10166=>771,10167=>888,
-10168=>967,10169=>888,10170=>831,10171=>873,10172=>927,10173=>970,10174=>918,10214=>545,10215=>545,10216=>329,
-10217=>329,10218=>496,10219=>496,10229=>1000,10230=>1000,10231=>1000,10232=>1000,10233=>1000,10234=>1000,10235=>1000,
-10236=>1000,10752=>860,10753=>860,10754=>860,10755=>766,10756=>766,10757=>756,10758=>756,10761=>745,10781=>702,
-10815=>722,11008=>1000,11009=>1000,11010=>1000,11011=>1000,11012=>1222,11013=>1000,11014=>1000,11015=>1000,11016=>1000,
-11017=>1000,11018=>1000,11019=>1000,11020=>1244,11021=>1000,11026=>770,11027=>770,11028=>770,11029=>770,11030=>770,
-11031=>770,11032=>770,11033=>770,11034=>770,11035=>1000,11036=>1000,11037=>283,11038=>283,11039=>846,11040=>846,
-11041=>799,11042=>799,11043=>807,11044=>1000,11045=>461,11046=>461,11047=>461,11048=>461,11049=>360,11050=>360,
-11051=>283,11052=>854,11053=>854,11054=>628,11055=>628,11088=>589,11089=>443,11090=>443,11091=>802,11092=>803,
-11392=>677,11393=>463,11394=>532,11395=>381,11396=>615,11397=>438,11398=>969,11399=>660,11400=>647,11401=>440,
-11402=>593,11403=>402,11404=>573,11405=>407,11406=>698,11407=>512,11408=>726,11409=>493,11410=>267,11411=>201,
-11412=>610,11413=>433,11414=>654,11415=>468,11416=>735,11417=>536,11418=>698,11419=>511,11420=>555,11421=>378,
-11422=>722,11423=>489,11424=>724,11425=>528,11426=>517,11427=>388,11428=>647,11429=>438,11430=>615,11431=>436,
-11432=>651,11433=>462,11434=>762,11435=>538,11436=>654,11437=>461,11438=>635,11439=>461,11440=>964,11441=>677,
-11456=>689,11457=>464,11493=>499,11494=>496,11495=>986,11496=>466,11497=>444,11498=>934,11517=>256,11518=>617,
-11519=>287,11799=>333,42560=>611,42561=>444,42562=>611,42563=>444,42564=>556,42565=>389,42566=>368,42567=>286,
-42572=>1145,42573=>775,42576=>1016,42577=>736,42578=>915,42579=>684,42580=>966,42581=>664,42582=>1042,42583=>648,
-42584=>722,42585=>491,42588=>1042,42589=>648,42590=>780,42591=>550,42594=>911,42595=>633,42596=>957,42597=>635,
-42598=>1139,42599=>777,42607=>0,42608=>0,42609=>0,42610=>0,42611=>519,42620=>0,42622=>510,64256=>589,
-64257=>534,64258=>530,64259=>805,64260=>799,64262=>677,64285=>350,64286=>0,64287=>537,64288=>537,64297=>564,
-64298=>537,64299=>537,64300=>537,64301=>537,64302=>537,64303=>537,64304=>537,64305=>537,64306=>350,64307=>537,
-64308=>537,64309=>350,64310=>350,64312=>537,64313=>350,64314=>537,64315=>537,64316=>537,64318=>537,64320=>350,
-64321=>537,64323=>537,64324=>537,64326=>537,64327=>537,64328=>537,64329=>537,64330=>537,64331=>350,64332=>537,
-64333=>537,64334=>537,64335=>537,64342=>926,64343=>926,64344=>308,64345=>308,64378=>750,64379=>750,64380=>580,
-64381=>580,64394=>338,64395=>338,64402=>874,64403=>874,64404=>329,64405=>329,64508=>776,64509=>700,64510=>304,
-64511=>304,65010=>640,65020=>837,65136=>300,65140=>300,65142=>300,65144=>300,65146=>300,65148=>300,65152=>724,
-65153=>321,65154=>275,65155=>249,65156=>275,65157=>399,65158=>399,65159=>249,65160=>275,65161=>776,65162=>776,
-65163=>301,65164=>264,65165=>249,65166=>275,65167=>950,65168=>950,65169=>293,65170=>293,65171=>424,65172=>622,
-65173=>925,65174=>925,65175=>308,65176=>308,65177=>924,65178=>924,65179=>298,65180=>298,65181=>738,65182=>738,
-65183=>574,65184=>574,65185=>748,65186=>750,65187=>600,65188=>600,65189=>701,65190=>775,65191=>596,65192=>596,
-65193=>397,65194=>397,65195=>399,65196=>399,65197=>328,65198=>328,65199=>331,65200=>331,65201=>951,65202=>951,
-65203=>600,65204=>600,65205=>949,65206=>949,65207=>649,65208=>649,65209=>949,65210=>949,65211=>823,65212=>823,
-65213=>949,65214=>949,65215=>805,65216=>805,65217=>557,65218=>557,65219=>460,65220=>460,65221=>550,65222=>550,
-65223=>455,65224=>550,65225=>625,65226=>575,65227=>674,65228=>550,65229=>602,65230=>577,65231=>578,65232=>577,
-65233=>801,65234=>801,65235=>300,65236=>300,65237=>696,65238=>696,65239=>650,65240=>650,65241=>757,65242=>757,
-65243=>318,65244=>318,65245=>655,65246=>655,65247=>206,65248=>206,65249=>549,65250=>549,65251=>403,65252=>403,
-65253=>651,65254=>651,65255=>323,65256=>323,65257=>424,65258=>622,65259=>525,65260=>476,65261=>399,65262=>399,
-65263=>776,65264=>776,65265=>776,65266=>776,65267=>296,65268=>264,65269=>676,65270=>724,65271=>676,65272=>724,
-65273=>676,65274=>724,65275=>676,65276=>724,65279=>0,65533=>788);
-$enc='';
-$diff='';
-$file='freeserif.z';
-$ctg='freeserif.ctg.z';
-$originalsize=1483772;
-?>
\ No newline at end of file
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freeserif.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freeserif.z
deleted file mode 100644
index 67f60970..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freeserif.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freeserifb.ctg.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freeserifb.ctg.z
deleted file mode 100644
index 77bfed16..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freeserifb.ctg.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freeserifb.php b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freeserifb.php
deleted file mode 100644
index f3b98c58..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freeserifb.php
+++ /dev/null
@@ -1,282 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='FreeSerifBold';
-$desc=array('Ascent'=>900,'Descent'=>-300,'CapHeight'=>16,'Flags'=>32,'FontBBox'=>'[-796 -306 1860 932]','ItalicAngle'=>0,'StemV'=>120,'MissingWidth'=>600);
-$up=-125;
-$ut=50;
-$dw=600;
-$cw=array(
-32=>250,33=>333,34=>555,35=>500,36=>500,37=>1000,38=>833,39=>278,40=>333,41=>333,
-42=>507,43=>676,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=>676,61=>676,
-62=>676,63=>500,64=>930,65=>722,66=>667,67=>722,68=>724,69=>667,70=>611,71=>778,
-72=>774,73=>386,74=>500,75=>764,76=>664,77=>943,78=>722,79=>778,80=>611,81=>778,
-82=>712,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,8364=>761,8218=>250,402=>333,8222=>500,8230=>1000,
-8224=>500,8225=>500,710=>333,8240=>1000,352=>556,8249=>333,338=>1000,381=>667,8216=>250,8217=>250,
-8220=>500,8221=>500,8226=>524,8211=>500,8212=>1000,732=>333,8482=>1000,353=>389,8250=>333,339=>722,
-382=>444,376=>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=>680,173=>333,174=>747,175=>333,176=>400,177=>676,
-178=>300,179=>300,180=>333,181=>556,182=>540,183=>250,184=>333,185=>270,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=>676,216=>778,217=>722,
-218=>722,219=>722,220=>722,221=>722,222=>632,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=>676,
-248=>500,249=>556,250=>556,251=>556,252=>556,253=>500,254=>556,255=>500,256=>722,257=>500,
-258=>722,259=>500,260=>722,261=>500,262=>722,263=>444,264=>722,265=>444,266=>722,267=>444,
-268=>722,269=>444,270=>722,271=>616,272=>722,273=>556,274=>667,275=>444,276=>667,277=>444,
-278=>667,279=>444,280=>667,281=>444,282=>667,283=>444,284=>778,285=>500,286=>778,287=>500,
-288=>778,289=>500,290=>778,291=>500,292=>778,293=>556,294=>778,295=>556,296=>389,297=>278,
-298=>389,299=>278,300=>389,301=>278,302=>389,303=>278,304=>389,305=>278,306=>882,307=>486,
-308=>500,309=>338,310=>778,311=>556,312=>534,313=>667,314=>278,315=>667,316=>278,317=>667,
-318=>398,319=>667,320=>528,321=>667,322=>278,323=>722,324=>556,325=>722,326=>556,327=>722,
-328=>556,329=>556,330=>722,331=>556,332=>778,333=>500,334=>778,335=>500,336=>778,337=>500,
-340=>722,341=>444,342=>722,343=>444,344=>722,345=>444,346=>556,347=>389,348=>556,349=>389,
-350=>556,351=>389,354=>667,355=>333,356=>667,357=>449,358=>667,359=>333,360=>722,361=>556,
-362=>722,363=>556,364=>722,365=>556,366=>722,367=>556,368=>722,369=>556,370=>722,371=>556,
-372=>1000,373=>722,374=>722,375=>500,377=>667,378=>444,379=>667,380=>444,383=>333,384=>556,
-385=>805,386=>648,387=>556,388=>667,389=>556,390=>722,391=>915,392=>605,393=>722,394=>862,
-395=>667,396=>556,397=>550,398=>667,399=>778,400=>631,401=>611,403=>903,404=>776,405=>807,
-406=>327,407=>389,408=>887,409=>556,410=>278,411=>495,412=>1000,413=>864,414=>556,415=>778,
-416=>778,417=>550,418=>1192,419=>795,420=>749,421=>556,422=>748,423=>556,424=>389,425=>650,
-426=>465,427=>333,428=>667,429=>333,430=>667,431=>839,432=>629,433=>811,434=>685,435=>853,
-436=>705,437=>667,438=>444,439=>593,440=>654,441=>508,442=>500,443=>500,444=>654,445=>520,
-446=>444,447=>611,448=>220,449=>418,450=>570,451=>333,452=>1391,453=>1168,454=>1000,455=>1164,
-456=>997,457=>611,458=>1222,459=>1055,460=>889,461=>722,462=>500,463=>386,464=>278,465=>778,
-466=>500,467=>722,468=>556,469=>722,470=>556,471=>722,472=>556,473=>722,474=>556,475=>722,
-476=>556,477=>444,478=>722,479=>500,480=>722,481=>500,482=>1000,483=>722,484=>778,485=>500,
-486=>778,487=>500,488=>764,489=>556,490=>778,491=>500,492=>778,493=>500,494=>593,495=>502,
-496=>338,497=>1391,498=>1168,499=>1000,500=>778,501=>500,502=>995,503=>603,504=>722,505=>556,
-506=>722,507=>500,508=>1000,509=>722,510=>778,511=>500,512=>722,513=>500,514=>722,515=>500,
-516=>667,517=>444,518=>667,519=>444,520=>386,521=>278,522=>386,523=>278,524=>778,525=>500,
-526=>778,527=>500,528=>712,529=>444,530=>712,531=>444,532=>722,533=>556,534=>722,535=>556,
-536=>556,537=>389,538=>667,539=>333,540=>464,541=>455,542=>774,543=>556,544=>731,545=>649,
-546=>568,547=>494,548=>667,549=>444,550=>722,551=>500,552=>667,553=>444,554=>778,555=>500,
-556=>778,557=>500,558=>778,559=>500,560=>778,561=>500,562=>722,563=>500,564=>437,565=>636,
-566=>415,567=>338,568=>776,569=>760,570=>722,571=>722,572=>444,573=>664,574=>667,575=>389,
-576=>451,577=>505,578=>479,579=>686,580=>750,581=>722,582=>667,583=>478,584=>500,585=>333,
-586=>808,587=>608,588=>712,589=>444,590=>757,591=>500,592=>500,593=>523,594=>523,595=>556,
-596=>444,598=>556,599=>556,600=>444,601=>444,602=>611,603=>440,604=>440,605=>611,607=>333,
-608=>500,609=>500,610=>556,613=>556,614=>556,615=>556,616=>278,617=>333,618=>278,619=>278,
-621=>278,622=>667,623=>833,624=>833,625=>833,626=>556,627=>556,628=>556,629=>500,631=>715,
-632=>667,633=>444,634=>444,635=>444,636=>444,637=>444,638=>394,639=>394,640=>556,641=>556,
-642=>389,643=>333,644=>333,645=>433,647=>333,648=>333,649=>500,650=>557,651=>529,652=>500,
-653=>722,654=>500,655=>500,656=>444,658=>502,660=>500,661=>500,662=>500,664=>778,665=>510,
-667=>722,668=>556,670=>556,671=>444,672=>556,673=>500,674=>500,686=>611,687=>722,697=>250,
-698=>408,699=>250,700=>250,701=>250,702=>300,703=>300,706=>333,707=>333,708=>333,709=>333,
-711=>333,712=>333,713=>333,714=>333,715=>333,716=>300,717=>333,718=>333,719=>333,720=>278,
-721=>278,722=>300,723=>300,724=>333,725=>333,726=>333,727=>333,728=>333,729=>333,730=>333,
-731=>333,733=>400,734=>333,735=>352,741=>526,742=>526,743=>526,744=>526,745=>526,746=>519,
-747=>519,748=>333,749=>333,750=>480,751=>333,752=>333,753=>333,754=>333,755=>327,756=>261,
-757=>437,758=>437,759=>400,760=>278,761=>175,762=>175,763=>175,764=>175,765=>333,766=>337,
-767=>432,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,832=>0,833=>0,834=>0,835=>0,836=>0,
-837=>0,838=>0,839=>0,840=>0,841=>0,842=>0,843=>0,844=>0,845=>0,846=>0,
-847=>0,848=>0,849=>0,850=>0,851=>0,852=>0,853=>0,854=>0,855=>0,856=>0,
-857=>0,858=>0,860=>0,861=>0,862=>0,863=>0,864=>0,865=>0,884=>199,885=>199,
-890=>0,894=>333,900=>330,901=>415,902=>722,903=>250,904=>811,905=>938,906=>556,908=>840,
-910=>886,911=>879,912=>330,913=>722,914=>667,915=>611,916=>759,917=>667,918=>667,919=>774,
-920=>778,921=>386,922=>777,923=>722,924=>943,925=>722,926=>650,927=>778,928=>812,929=>611,
-931=>650,932=>667,933=>738,934=>868,935=>722,936=>924,937=>811,938=>386,939=>738,940=>605,
-941=>440,942=>605,943=>330,944=>550,945=>605,946=>550,947=>550,948=>550,949=>440,950=>495,
-951=>605,952=>550,953=>330,954=>608,955=>495,956=>605,957=>495,958=>495,959=>550,960=>605,
-961=>550,962=>440,963=>550,964=>440,965=>550,966=>660,967=>495,968=>715,969=>715,970=>330,
-971=>550,972=>550,973=>550,974=>715,976=>550,977=>605,978=>722,979=>871,980=>722,981=>660,
-982=>715,983=>550,984=>611,985=>550,986=>650,987=>514,988=>611,989=>513,990=>715,991=>439,
-992=>722,993=>605,1008=>550,1009=>550,1010=>477,1011=>333,1012=>778,1013=>424,1014=>424,1015=>632,
-1016=>575,1017=>722,1018=>943,1019=>809,1020=>550,1021=>722,1022=>722,1023=>722,1024=>667,1025=>667,
-1026=>848,1027=>611,1028=>722,1029=>556,1030=>386,1031=>386,1032=>500,1033=>1042,1034=>1032,1035=>912,
-1036=>770,1037=>774,1038=>738,1039=>778,1040=>722,1041=>648,1042=>667,1043=>599,1044=>708,1045=>667,
-1046=>1106,1047=>652,1048=>774,1049=>774,1050=>770,1051=>788,1052=>943,1053=>774,1054=>778,1055=>812,
-1056=>611,1057=>722,1058=>667,1059=>738,1060=>868,1061=>722,1062=>774,1063=>754,1064=>1115,1065=>1115,
-1066=>782,1067=>970,1068=>630,1069=>722,1070=>1114,1071=>729,1072=>500,1073=>500,1074=>510,1075=>430,
-1076=>545,1077=>438,1078=>781,1079=>445,1080=>556,1081=>556,1082=>556,1083=>542,1084=>668,1085=>558,
-1086=>500,1087=>558,1088=>549,1089=>444,1090=>494,1091=>486,1092=>809,1093=>500,1094=>560,1095=>556,
-1096=>818,1097=>820,1098=>612,1099=>756,1100=>512,1101=>496,1102=>770,1103=>546,1104=>438,1105=>444,
-1106=>549,1107=>430,1108=>488,1109=>386,1110=>272,1111=>278,1112=>333,1113=>784,1114=>786,1115=>552,
-1116=>556,1117=>556,1118=>484,1119=>556,1120=>1018,1121=>699,1122=>781,1123=>612,1124=>1033,1125=>778,
-1126=>993,1127=>692,1128=>1371,1129=>975,1130=>1106,1131=>781,1132=>1474,1133=>1066,1134=>650,1135=>424,
-1136=>970,1137=>769,1138=>770,1139=>590,1140=>808,1141=>578,1142=>808,1143=>650,1144=>1284,1145=>973,
-1146=>928,1147=>672,1148=>1018,1149=>693,1150=>1018,1151=>699,1152=>650,1153=>444,1154=>258,1155=>0,
-1156=>0,1157=>0,1158=>0,1159=>0,1160=>0,1161=>0,1162=>774,1163=>558,1164=>630,1165=>512,
-1166=>611,1167=>556,1168=>614,1169=>458,1170=>614,1171=>443,1172=>631,1173=>562,1174=>1155,1175=>828,
-1176=>652,1177=>452,1178=>819,1179=>600,1180=>816,1181=>590,1182=>920,1183=>664,1184=>967,1185=>633,
-1186=>774,1187=>562,1188=>984,1189=>698,1190=>1069,1191=>841,1192=>722,1193=>524,1194=>722,1195=>444,
-1196=>667,1197=>494,1198=>722,1199=>606,1200=>722,1201=>606,1202=>722,1203=>560,1204=>1046,1205=>778,
-1206=>754,1207=>560,1208=>810,1209=>590,1210=>754,1211=>556,1212=>945,1213=>606,1214=>945,1215=>606,
-1216=>386,1217=>1106,1218=>781,1219=>770,1220=>534,1221=>788,1222=>550,1223=>774,1224=>556,1225=>774,
-1226=>558,1227=>778,1228=>556,1229=>943,1230=>677,1231=>386,1232=>722,1233=>500,1234=>722,1235=>500,
-1236=>1000,1237=>722,1238=>667,1239=>444,1240=>778,1241=>444,1242=>778,1243=>444,1244=>1106,1245=>781,
-1246=>652,1247=>445,1248=>654,1249=>389,1250=>774,1251=>556,1252=>774,1253=>556,1254=>778,1255=>500,
-1256=>778,1257=>500,1258=>778,1259=>500,1260=>722,1261=>496,1262=>738,1263=>500,1264=>738,1265=>500,
-1266=>738,1267=>500,1268=>754,1269=>556,1270=>599,1271=>443,1272=>970,1273=>756,1296=>652,1297=>452,
-1298=>788,1299=>550,1306=>778,1307=>556,1308=>1000,1309=>722,1310=>770,1311=>558,1425=>0,1426=>0,
-1427=>0,1428=>0,1429=>0,1430=>0,1431=>0,1432=>0,1433=>0,1434=>0,1435=>0,1436=>0,
-1437=>0,1438=>0,1439=>0,1440=>0,1441=>0,1442=>0,1443=>0,1444=>0,1445=>0,1446=>0,
-1447=>0,1448=>0,1449=>0,1450=>0,1451=>0,1452=>0,1453=>0,1454=>0,1455=>0,1456=>0,
-1457=>0,1458=>0,1459=>0,1460=>0,1461=>0,1462=>0,1463=>0,1464=>0,1465=>0,1466=>0,
-1467=>0,1468=>0,1469=>0,1470=>433,1471=>0,1472=>155,1473=>0,1474=>0,1475=>400,1476=>0,
-1477=>0,1478=>347,1479=>0,1488=>593,1489=>498,1490=>339,1491=>523,1492=>561,1493=>266,1494=>291,
-1495=>559,1496=>576,1497=>266,1498=>496,1499=>501,1500=>510,1501=>542,1502=>581,1503=>273,1504=>347,
-1505=>512,1506=>552,1507=>493,1508=>491,1509=>537,1510=>561,1511=>544,1512=>502,1513=>716,1514=>571,
-1520=>532,1521=>532,1522=>532,1523=>396,1524=>432,3585=>590,3586=>578,3587=>661,3588=>592,3589=>592,
-3590=>699,3591=>447,3592=>534,3593=>692,3594=>578,3595=>659,3596=>899,3597=>804,3598=>633,3599=>637,
-3600=>484,3601=>730,3602=>876,3603=>915,3604=>592,3605=>592,3606=>578,3607=>670,3608=>542,3609=>671,
-3610=>621,3611=>618,3612=>621,3613=>617,3614=>708,3615=>708,3616=>637,3617=>589,3618=>552,3619=>484,
-3620=>590,3621=>569,3622=>637,3623=>526,3624=>599,3625=>802,3626=>579,3627=>668,3628=>778,3629=>560,
-3630=>514,3631=>510,3632=>412,3633=>0,3634=>423,3635=>452,3636=>0,3637=>0,3638=>0,3639=>0,
-3640=>0,3641=>0,3642=>0,3647=>665,3648=>357,3649=>624,3650=>529,3651=>486,3652=>475,3653=>423,
-3654=>500,3655=>0,3656=>0,3657=>0,3658=>0,3659=>0,3660=>0,3661=>0,3662=>0,3663=>657,
-3664=>548,3665=>548,3666=>592,3667=>614,3668=>631,3669=>643,3670=>508,3671=>744,3672=>622,3673=>585,
-3674=>721,3675=>1381,4256=>475,4257=>469,4258=>573,4259=>650,4260=>502,4261=>506,4262=>481,4263=>746,
-4264=>491,4265=>495,4266=>888,4267=>488,4268=>464,4269=>745,4270=>483,4271=>489,4272=>721,4273=>464,
-4274=>578,4275=>590,4276=>611,4277=>491,4278=>663,4279=>489,4280=>544,4281=>479,4282=>527,4283=>488,
-4284=>560,4285=>461,4286=>467,4287=>546,4288=>483,4289=>487,4290=>562,4291=>477,4292=>491,4293=>471,
-4304=>522,4305=>518,4306=>621,4307=>716,4308=>517,4309=>519,4310=>518,4311=>796,4312=>518,4313=>518,
-4314=>934,4315=>517,4316=>519,4317=>787,4318=>515,4319=>514,4320=>788,4321=>573,4322=>620,4323=>593,
-4324=>639,4325=>516,4326=>714,4327=>518,4328=>572,4329=>518,4330=>555,4331=>518,4332=>562,4333=>509,
-4334=>572,4335=>677,4336=>523,4337=>517,4338=>595,4339=>480,4340=>519,4341=>484,4345=>621,4347=>450,
-5024=>718,5025=>768,5026=>633,5027=>878,5028=>1001,5029=>371,5030=>576,5031=>754,5032=>531,5033=>774,
-5034=>692,5035=>499,5036=>668,5037=>829,5038=>575,5039=>681,5040=>485,5041=>607,5042=>885,5043=>974,
-5044=>588,5045=>583,5046=>726,5047=>947,5048=>558,5049=>832,5050=>1096,5051=>780,5052=>595,5053=>869,
-5054=>752,5055=>710,5056=>761,5057=>802,5058=>760,5059=>656,5060=>655,5061=>982,5062=>684,5063=>801,
-5064=>805,5065=>1042,5066=>755,5067=>612,5068=>707,5069=>889,5070=>584,5071=>623,5072=>536,5073=>763,
-5074=>763,5075=>498,5076=>1052,5077=>600,5078=>730,5079=>714,5080=>714,5081=>697,5082=>543,5083=>943,
-5084=>718,5085=>630,5086=>660,5087=>692,5088=>841,5089=>861,5090=>617,5091=>733,5092=>898,5093=>896,
-5094=>781,5095=>612,5096=>830,5097=>948,5098=>886,5099=>757,5100=>796,5101=>578,5102=>601,5103=>797,
-5104=>623,5105=>886,5106=>730,5107=>827,5108=>648,7680=>722,7681=>500,7682=>667,7683=>556,7684=>667,
-7685=>556,7686=>667,7687=>556,7688=>722,7689=>444,7690=>724,7691=>556,7692=>724,7693=>556,7694=>724,
-7695=>556,7696=>724,7697=>556,7698=>724,7699=>556,7700=>667,7701=>444,7702=>667,7703=>444,7704=>667,
-7705=>444,7706=>667,7707=>444,7708=>667,7709=>444,7710=>611,7711=>333,7712=>778,7713=>500,7714=>774,
-7715=>556,7716=>774,7717=>556,7718=>774,7719=>556,7720=>774,7721=>556,7722=>774,7723=>556,7724=>386,
-7725=>278,7726=>389,7727=>278,7728=>764,7729=>556,7730=>764,7731=>556,7732=>764,7733=>556,7734=>664,
-7735=>278,7736=>664,7737=>278,7738=>664,7739=>278,7740=>664,7741=>278,7742=>943,7743=>833,7744=>943,
-7745=>833,7746=>943,7747=>833,7748=>722,7749=>556,7750=>722,7751=>556,7752=>722,7753=>556,7754=>722,
-7755=>556,7756=>778,7757=>500,7758=>778,7759=>500,7760=>778,7761=>500,7762=>778,7763=>500,7764=>611,
-7765=>556,7766=>611,7767=>556,7768=>712,7769=>444,7770=>712,7771=>444,7772=>712,7773=>444,7774=>712,
-7775=>444,7776=>556,7777=>389,7778=>556,7779=>389,7780=>556,7781=>389,7782=>556,7783=>389,7784=>556,
-7785=>389,7786=>667,7787=>333,7788=>667,7789=>333,7790=>667,7791=>333,7792=>667,7793=>333,7794=>722,
-7795=>556,7796=>722,7797=>556,7798=>722,7799=>556,7800=>722,7801=>556,7802=>722,7803=>556,7804=>722,
-7805=>500,7806=>722,7807=>500,7808=>1000,7809=>722,7810=>1000,7811=>722,7812=>1000,7813=>722,7814=>1000,
-7815=>722,7816=>1000,7817=>722,7818=>722,7819=>500,7820=>722,7821=>500,7822=>722,7823=>500,7824=>667,
-7825=>444,7826=>667,7827=>444,7828=>667,7829=>444,7830=>556,7831=>333,7832=>722,7833=>500,7834=>507,
-7835=>333,7840=>722,7841=>500,7842=>722,7843=>500,7844=>722,7845=>500,7846=>722,7847=>500,7848=>722,
-7849=>500,7850=>722,7851=>500,7852=>722,7853=>500,7854=>722,7855=>500,7856=>722,7857=>500,7858=>825,
-7859=>603,7860=>722,7861=>500,7862=>722,7863=>500,7864=>667,7865=>444,7866=>667,7867=>444,7868=>667,
-7869=>444,7870=>667,7871=>444,7872=>667,7873=>444,7874=>667,7875=>444,7876=>667,7877=>444,7878=>667,
-7879=>444,7880=>386,7881=>278,7882=>386,7883=>278,7884=>778,7885=>500,7886=>778,7887=>500,7888=>778,
-7889=>500,7890=>778,7891=>500,7892=>778,7893=>500,7894=>778,7895=>500,7896=>778,7897=>500,7898=>774,
-7899=>550,7900=>774,7901=>550,7902=>774,7903=>549,7904=>778,7905=>550,7906=>778,7907=>550,7908=>722,
-7909=>556,7910=>722,7911=>556,7912=>838,7913=>672,7914=>838,7915=>672,7916=>825,7917=>659,7918=>839,
-7919=>629,7920=>839,7921=>629,7922=>722,7923=>500,7924=>722,7925=>500,7926=>722,7927=>500,7928=>722,
-7929=>500,7936=>605,7937=>605,7938=>605,7939=>605,7940=>605,7941=>605,7942=>605,7943=>605,7944=>722,
-7945=>722,7946=>830,7947=>833,7948=>761,7949=>798,7950=>721,7951=>722,7952=>440,7953=>440,7954=>440,
-7955=>440,7956=>440,7957=>440,7960=>817,7961=>826,7962=>944,7963=>970,7964=>964,7965=>1009,7968=>605,
-7969=>605,7970=>605,7971=>605,7972=>605,7973=>605,7974=>605,7975=>605,7976=>926,7977=>921,7978=>1038,
-7979=>1064,7980=>1092,7981=>1102,7982=>1005,7983=>991,7984=>330,7985=>330,7986=>330,7987=>330,7988=>330,
-7989=>330,7990=>330,7991=>330,7992=>534,7993=>541,7994=>653,7995=>659,7996=>705,7997=>714,7998=>612,
-7999=>614,8000=>550,8001=>550,8002=>550,8003=>550,8004=>550,8005=>550,8008=>885,8009=>886,8010=>1038,
-8011=>1052,8012=>997,8013=>1021,8016=>550,8017=>550,8018=>550,8019=>550,8020=>550,8021=>550,8022=>550,
-8023=>550,8025=>870,8027=>1014,8029=>1043,8031=>944,8032=>715,8033=>715,8034=>715,8035=>715,8036=>715,
-8037=>715,8038=>715,8039=>715,8040=>905,8041=>913,8042=>1066,8043=>1085,8044=>1034,8045=>1044,8046=>980,
-8047=>961,8048=>605,8049=>605,8050=>440,8051=>440,8052=>605,8053=>605,8054=>330,8055=>330,8056=>550,
-8057=>550,8058=>550,8059=>550,8060=>715,8061=>715,8064=>605,8065=>605,8066=>605,8067=>605,8068=>605,
-8069=>605,8070=>605,8071=>605,8072=>886,8073=>887,8074=>985,8075=>993,8076=>937,8077=>956,8078=>874,
-8079=>878,8080=>605,8081=>605,8082=>605,8083=>605,8084=>605,8085=>605,8086=>605,8087=>605,8088=>1096,
-8089=>1092,8090=>1223,8091=>1250,8092=>1270,8093=>1283,8094=>1174,8095=>1162,8096=>715,8097=>715,8098=>715,
-8099=>715,8100=>715,8101=>715,8102=>715,8103=>715,8104=>1057,8105=>1073,8106=>1228,8107=>1251,8108=>1202,
-8109=>1210,8110=>1151,8111=>1131,8112=>605,8113=>605,8114=>605,8115=>605,8116=>605,8118=>605,8119=>605,
-8120=>722,8121=>722,8122=>722,8123=>722,8124=>883,8125=>500,8126=>0,8127=>500,8128=>500,8129=>550,
-8130=>605,8131=>605,8132=>605,8134=>605,8135=>605,8136=>790,8137=>830,8138=>909,8139=>931,8140=>950,
-8141=>500,8142=>500,8143=>500,8144=>330,8145=>330,8146=>330,8147=>330,8150=>330,8151=>330,8152=>386,
-8153=>386,8154=>506,8155=>550,8157=>500,8158=>500,8159=>500,8160=>550,8161=>550,8162=>550,8163=>550,
-8164=>550,8165=>550,8166=>550,8167=>550,8168=>738,8169=>738,8170=>858,8171=>880,8172=>764,8173=>550,
-8174=>550,8175=>500,8178=>715,8179=>715,8180=>715,8182=>715,8183=>715,8184=>884,8185=>857,8186=>927,
-8187=>892,8188=>988,8189=>500,8190=>500,8192=>500,8193=>1000,8194=>500,8195=>1000,8196=>333,8197=>250,
-8198=>167,8199=>500,8200=>250,8201=>200,8202=>100,8203=>0,8204=>0,8205=>0,8206=>0,8207=>0,
-8208=>333,8209=>333,8210=>500,8213=>1000,8214=>333,8215=>478,8219=>250,8223=>500,8227=>560,8228=>250,
-8229=>500,8231=>250,8232=>0,8233=>0,8234=>0,8235=>0,8236=>0,8237=>0,8238=>0,8239=>250,
-8241=>1588,8242=>270,8243=>492,8244=>714,8245=>270,8246=>484,8247=>693,8248=>469,8251=>727,8252=>666,
-8253=>695,8254=>500,8255=>953,8256=>953,8257=>338,8258=>931,8259=>333,8260=>167,8261=>332,8262=>332,
-8263=>1000,8264=>833,8265=>833,8266=>500,8267=>540,8268=>528,8269=>523,8270=>500,8271=>333,8272=>953,
-8273=>500,8274=>497,8275=>576,8276=>953,8277=>785,8278=>450,8279=>881,8280=>620,8281=>620,8282=>179,
-8283=>621,8284=>569,8285=>179,8286=>179,8287=>111,8288=>0,8289=>0,8290=>0,8291=>0,8292=>0,
-8304=>300,8305=>278,8308=>300,8309=>300,8310=>300,8311=>300,8312=>300,8313=>300,8314=>300,8315=>300,
-8316=>300,8317=>216,8318=>216,8319=>318,8320=>300,8321=>274,8322=>300,8323=>300,8324=>300,8325=>300,
-8326=>300,8327=>300,8328=>300,8329=>300,8330=>300,8331=>300,8332=>300,8333=>216,8334=>216,8352=>710,
-8353=>722,8354=>783,8355=>611,8356=>500,8357=>833,8358=>722,8359=>960,8360=>1101,8361=>1000,8362=>889,
-8363=>532,8365=>742,8366=>631,8369=>609,8370=>639,8371=>660,8372=>556,8373=>500,8448=>752,8449=>746,
-8451=>1009,8457=>923,8458=>500,8459=>1035,8462=>556,8463=>556,8464=>792,8465=>737,8466=>800,8467=>427,
-8468=>835,8470=>879,8471=>1048,8472=>666,8475=>747,8476=>955,8478=>722,8479=>722,8480=>891,8481=>1156,
-8483=>722,8486=>811,8487=>811,8489=>333,8490=>764,8491=>722,8492=>806,8494=>551,8497=>723,8498=>611,
-8499=>1203,8501=>593,8502=>498,8503=>339,8504=>523,8506=>906,8507=>1156,8523=>778,8525=>866,8526=>500,
-8531=>750,8532=>750,8533=>750,8534=>750,8535=>750,8536=>750,8537=>750,8538=>750,8539=>750,8540=>750,
-8541=>750,8542=>750,8543=>750,8544=>386,8545=>772,8546=>1158,8547=>1108,8548=>722,8549=>1108,8550=>1494,
-8551=>1880,8552=>1108,8553=>722,8554=>1108,8555=>1494,8556=>664,8557=>722,8558=>724,8559=>943,8560=>278,
-8561=>556,8562=>834,8563=>778,8564=>500,8565=>778,8566=>1056,8567=>1334,8568=>778,8569=>500,8570=>778,
-8571=>1056,8572=>278,8573=>444,8574=>556,8575=>833,8592=>964,8593=>523,8594=>964,8595=>523,8596=>964,
-8597=>964,8598=>964,8599=>964,8600=>964,8601=>964,8602=>964,8603=>964,8604=>1152,8605=>1152,8606=>964,
-8607=>964,8608=>964,8609=>964,8610=>1078,8611=>1078,8612=>964,8613=>964,8614=>964,8615=>964,8616=>964,
-8617=>964,8618=>964,8619=>964,8620=>964,8621=>1168,8622=>964,8624=>622,8625=>622,8630=>1069,8631=>1069,
-8632=>964,8633=>964,8634=>980,8635=>980,8636=>964,8637=>964,8638=>557,8639=>556,8640=>964,8641=>964,
-8642=>557,8643=>556,8644=>964,8645=>964,8646=>964,8647=>964,8648=>964,8649=>964,8650=>964,8651=>964,
-8652=>964,8653=>964,8654=>964,8655=>964,8656=>964,8657=>630,8658=>964,8659=>630,8660=>964,8661=>630,
-8662=>1063,8663=>1063,8664=>1063,8665=>1063,8666=>964,8667=>964,8668=>1100,8669=>1100,8672=>964,8674=>964,
-8676=>964,8677=>964,8704=>627,8705=>716,8706=>558,8707=>627,8708=>627,8709=>500,8710=>612,8711=>719,
-8713=>576,8714=>576,8716=>576,8717=>576,8720=>733,8721=>713,8722=>676,8723=>676,8724=>676,8725=>750,
-8727=>570,8729=>570,8730=>549,8733=>676,8734=>752,8736=>555,8737=>555,8738=>555,8739=>240,8740=>531,
-8741=>478,8742=>705,8743=>694,8744=>694,8745=>694,8746=>694,8747=>323,8756=>629,8757=>629,8761=>947,
-8764=>676,8765=>676,8766=>763,8768=>305,8769=>676,8770=>676,8771=>676,8773=>676,8776=>676,8777=>676,
-8778=>676,8781=>676,8782=>676,8783=>676,8784=>676,8785=>676,8786=>676,8787=>676,8788=>947,8789=>947,
-8790=>676,8791=>676,8796=>676,8800=>570,8801=>676,8802=>676,8804=>570,8805=>570,8806=>676,8807=>676,
-8808=>676,8809=>676,8810=>1047,8811=>1047,8812=>450,8813=>676,8814=>676,8815=>676,8816=>676,8817=>676,
-8818=>676,8819=>676,8820=>676,8821=>676,8822=>676,8823=>676,8824=>676,8825=>676,8826=>676,8827=>676,
-8828=>676,8829=>676,8830=>676,8831=>676,8832=>676,8833=>676,8834=>676,8835=>676,8836=>676,8837=>676,
-8838=>676,8839=>676,8840=>676,8841=>676,8842=>676,8843=>676,8846=>694,8847=>676,8848=>676,8849=>676,
-8850=>676,8851=>694,8852=>694,8853=>738,8854=>738,8855=>738,8856=>738,8857=>738,8858=>738,8859=>738,
-8861=>738,8862=>678,8863=>678,8864=>678,8865=>678,8866=>487,8867=>487,8868=>752,8869=>752,8871=>487,
-8873=>659,8874=>831,8876=>487,8877=>487,8878=>659,8879=>659,8882=>676,8883=>676,8884=>676,8885=>676,
-8886=>1380,8887=>1380,8888=>1027,8890=>626,8891=>694,8892=>694,8893=>694,8900=>512,8903=>676,8904=>759,
-8905=>632,8906=>632,8907=>1000,8908=>1000,8909=>676,8910=>694,8911=>694,8912=>676,8913=>676,8914=>694,
-8915=>694,8916=>694,8918=>676,8919=>676,8920=>1441,8921=>1441,8922=>676,8923=>676,8924=>676,8925=>676,
-8926=>676,8927=>676,8928=>676,8929=>676,8930=>676,8931=>676,8934=>676,8935=>676,8936=>676,8937=>676,
-8938=>676,8939=>676,8940=>676,8941=>676,8960=>737,8968=>411,8969=>411,8970=>411,8971=>411,8976=>680,
-8994=>951,8995=>951,9001=>398,9002=>398,9251=>500,9472=>1000,9473=>1000,9474=>1000,9475=>1000,9476=>1000,
-9477=>1000,9478=>1000,9479=>1000,9480=>1000,9481=>1000,9482=>1000,9483=>1000,9484=>1000,9485=>1000,9486=>1000,
-9487=>1000,9488=>1000,9489=>1000,9490=>1000,9491=>1000,9492=>1000,9493=>1000,9494=>1000,9495=>1000,9496=>1000,
-9497=>1000,9498=>1000,9499=>1000,9500=>1000,9501=>1000,9502=>1000,9503=>1000,9504=>1000,9505=>1000,9506=>1000,
-9507=>1000,9508=>1000,9509=>1000,9510=>1000,9511=>1000,9512=>1000,9513=>1000,9514=>1000,9515=>1000,9516=>1000,
-9517=>1000,9518=>1000,9519=>1000,9520=>1000,9521=>1000,9522=>1000,9523=>1000,9524=>1000,9525=>1000,9526=>1000,
-9527=>1000,9528=>1000,9529=>1000,9530=>1000,9531=>1000,9532=>1000,9533=>1000,9534=>1000,9535=>1000,9536=>1000,
-9537=>1000,9538=>1000,9539=>1000,9540=>1000,9541=>1000,9542=>1000,9543=>1000,9544=>1000,9545=>1000,9546=>1000,
-9547=>1000,9552=>1000,9553=>1000,9554=>1000,9555=>1000,9556=>1000,9557=>1000,9558=>1000,9559=>1000,9560=>1000,
-9561=>1000,9562=>1000,9563=>1000,9564=>1000,9565=>1000,9566=>1000,9567=>1000,9568=>1000,9569=>1000,9570=>1000,
-9571=>1000,9572=>1000,9573=>1000,9574=>1000,9575=>1000,9576=>1000,9577=>1000,9578=>1000,9579=>1000,9580=>1000,
-9600=>1000,9601=>1000,9602=>1000,9603=>1000,9604=>1000,9605=>1000,9606=>1000,9607=>1000,9608=>1000,9609=>1000,
-9610=>1000,9611=>1000,9612=>1000,9613=>1000,9614=>1000,9615=>1000,9616=>1000,9617=>1000,9618=>1000,9620=>1000,
-9621=>1000,9622=>1000,9623=>1000,9624=>1000,9625=>1000,9626=>1000,9627=>1000,9628=>1000,9629=>1000,9630=>1000,
-9631=>1000,9632=>678,9633=>678,9642=>309,9650=>681,9651=>681,9654=>681,9655=>681,9660=>681,9661=>681,
-9664=>681,9665=>681,9670=>580,9671=>580,9674=>494,9675=>738,9676=>732,9679=>738,9702=>524,9711=>851,
-9733=>1003,9734=>1003,9824=>618,9825=>645,9826=>587,9827=>582,9828=>582,9829=>645,9830=>587,9831=>618,
-9833=>333,9834=>556,9835=>778,9836=>778,9837=>556,9838=>556,9839=>556,10214=>561,10215=>561,11799=>333,
-64256=>613,64257=>559,64258=>559,64259=>846,64260=>836,64262=>723,64285=>266,64286=>0,64287=>532,64288=>552,
-64297=>570,64298=>716,64299=>716,64300=>716,64301=>716,64302=>593,64303=>593,64304=>593,64305=>498,64306=>339,
-64307=>523,64308=>561,64309=>266,64310=>291,64312=>576,64313=>266,64314=>496,64315=>501,64316=>510,64318=>581,
-64320=>347,64321=>512,64323=>493,64324=>491,64326=>561,64327=>544,64328=>502,64329=>716,64330=>571,64331=>266,
-64332=>498,64333=>501,64334=>491,64335=>593,65533=>788);
-$enc='';
-$diff='';
-$file='freeserifb.z';
-$ctg='freeserifb.ctg.z';
-$originalsize=467208;
-?>
\ No newline at end of file
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freeserifb.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freeserifb.z
deleted file mode 100644
index 95e31362..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freeserifb.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freeserifbi.ctg.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freeserifbi.ctg.z
deleted file mode 100644
index 86d46ef3..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freeserifbi.ctg.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freeserifbi.php b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freeserifbi.php
deleted file mode 100644
index 79a17352..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freeserifbi.php
+++ /dev/null
@@ -1,238 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='FreeSerifBoldItalic';
-$desc=array('Ascent'=>900,'Descent'=>-300,'CapHeight'=>-24,'Flags'=>96,'FontBBox'=>'[-787 -1120 1867 1571]','ItalicAngle'=>-16.3,'StemV'=>120,'MissingWidth'=>600);
-$up=-125;
-$ut=50;
-$dw=600;
-$cw=array(
-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=>744,69=>670,70=>656,71=>722,
-72=>778,73=>393,74=>500,75=>664,76=>609,77=>896,78=>722,79=>722,80=>614,81=>722,
-82=>672,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,8364=>761,8218=>250,402=>333,8222=>500,8230=>1000,
-8224=>500,8225=>500,710=>333,8240=>1000,352=>556,8249=>333,338=>944,381=>611,8216=>250,8217=>250,
-8220=>500,8221=>500,8226=>350,8211=>500,8212=>1000,732=>333,8482=>1000,353=>389,8250=>333,339=>722,
-382=>389,376=>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=>272,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=>609,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,256=>667,257=>500,
-258=>667,259=>500,260=>667,261=>500,262=>667,263=>444,264=>667,265=>444,266=>667,267=>444,
-268=>667,269=>444,270=>722,271=>616,272=>722,273=>500,274=>667,275=>444,276=>667,277=>444,
-278=>667,279=>444,280=>667,281=>444,282=>667,283=>444,284=>722,285=>500,286=>722,287=>500,
-288=>722,289=>500,290=>722,291=>500,292=>778,293=>556,294=>778,295=>556,296=>389,297=>278,
-298=>389,299=>278,300=>389,301=>278,302=>389,303=>278,304=>389,305=>278,306=>826,307=>547,
-308=>500,309=>278,310=>667,311=>500,312=>534,313=>611,314=>278,315=>611,316=>278,317=>638,
-318=>424,319=>611,320=>424,321=>611,322=>278,323=>722,324=>556,325=>722,326=>556,327=>722,
-328=>556,329=>556,330=>722,331=>547,332=>722,333=>500,334=>722,335=>500,336=>722,337=>500,
-340=>667,341=>389,342=>667,343=>389,344=>667,345=>389,346=>556,347=>389,348=>556,349=>389,
-350=>556,351=>389,354=>611,355=>278,356=>611,357=>308,358=>611,359=>278,360=>722,361=>556,
-362=>722,363=>556,364=>722,365=>556,366=>722,367=>556,368=>722,369=>556,370=>722,371=>556,
-372=>889,373=>667,374=>611,375=>444,377=>611,378=>389,379=>611,380=>389,383=>333,384=>500,
-385=>850,386=>667,387=>575,388=>630,389=>500,390=>722,391=>929,392=>654,393=>722,394=>864,
-395=>684,396=>500,397=>546,398=>670,399=>722,400=>631,401=>769,403=>929,404=>716,405=>745,
-406=>278,407=>389,408=>829,409=>500,410=>278,411=>495,412=>853,413=>919,414=>556,415=>722,
-416=>908,417=>640,418=>1014,419=>778,420=>757,421=>500,422=>611,423=>556,424=>389,425=>730,
-426=>455,427=>349,428=>611,429=>298,430=>611,431=>902,432=>714,433=>811,434=>678,435=>611,
-436=>581,437=>611,438=>389,439=>619,440=>614,441=>461,442=>445,443=>500,444=>614,445=>500,
-446=>389,447=>504,448=>220,449=>418,450=>570,451=>333,452=>1355,453=>1133,454=>889,455=>1109,
-456=>887,457=>556,458=>1222,459=>1000,460=>834,461=>667,462=>500,463=>393,464=>278,465=>722,
-466=>500,467=>722,468=>556,469=>722,470=>556,471=>722,472=>556,473=>722,474=>556,475=>722,
-476=>556,477=>444,478=>667,479=>500,480=>667,481=>500,482=>944,483=>722,484=>722,485=>500,
-486=>722,487=>500,488=>664,489=>500,490=>722,491=>500,492=>722,493=>500,494=>619,495=>513,
-496=>278,497=>1355,498=>1133,499=>889,500=>722,501=>500,502=>944,503=>660,504=>722,505=>556,
-506=>667,507=>500,508=>944,509=>722,510=>722,511=>500,512=>667,513=>500,514=>667,515=>500,
-516=>670,517=>444,518=>670,519=>444,520=>393,521=>278,522=>393,523=>278,524=>722,525=>500,
-526=>722,527=>500,528=>672,529=>389,530=>672,531=>389,532=>722,533=>556,534=>722,535=>556,
-536=>556,537=>389,538=>611,539=>278,540=>424,541=>455,542=>778,543=>556,544=>731,545=>618,
-546=>568,547=>500,548=>667,549=>444,550=>667,551=>500,552=>670,553=>444,554=>722,555=>500,
-556=>722,557=>500,558=>722,559=>500,560=>722,561=>500,562=>611,563=>444,564=>422,565=>621,
-566=>413,567=>278,568=>800,569=>784,570=>644,571=>667,572=>444,573=>664,574=>611,575=>389,
-576=>451,577=>444,578=>444,579=>667,580=>722,581=>722,582=>670,583=>444,584=>500,585=>278,
-586=>808,587=>608,588=>672,589=>389,590=>611,591=>444,592=>500,593=>590,594=>590,595=>500,
-596=>444,599=>668,600=>444,601=>444,603=>430,608=>569,609=>500,613=>556,616=>278,617=>320,
-618=>278,623=>778,629=>500,633=>389,643=>333,648=>278,649=>500,650=>557,651=>492,652=>444,
-653=>667,654=>444,658=>513,670=>500,697=>250,698=>408,699=>250,700=>250,701=>250,702=>300,
-703=>300,706=>333,707=>333,708=>333,709=>333,711=>333,712=>333,713=>333,714=>333,715=>333,
-716=>300,717=>333,718=>333,719=>333,720=>278,721=>278,722=>300,723=>300,724=>333,725=>333,
-726=>333,727=>333,728=>333,729=>333,730=>333,731=>333,733=>333,734=>333,735=>352,741=>526,
-742=>526,743=>526,744=>526,745=>526,746=>519,747=>519,748=>333,749=>333,750=>480,751=>333,
-752=>333,753=>333,754=>333,755=>327,756=>261,757=>437,758=>437,759=>400,760=>278,761=>175,
-762=>175,763=>175,764=>175,765=>0,766=>337,767=>432,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,
-832=>0,833=>0,834=>0,835=>0,836=>0,837=>0,838=>0,839=>0,840=>0,841=>0,
-842=>0,843=>0,844=>0,845=>0,846=>0,847=>0,848=>0,849=>0,850=>0,851=>0,
-852=>0,853=>0,854=>0,855=>0,856=>0,857=>0,858=>0,860=>0,861=>0,862=>0,
-863=>0,864=>0,865=>0,884=>199,885=>199,890=>0,894=>333,900=>330,901=>333,902=>667,
-903=>250,904=>819,905=>955,906=>539,908=>835,910=>961,911=>889,912=>320,913=>667,914=>667,
-915=>637,916=>740,917=>667,918=>611,919=>778,920=>722,921=>389,922=>677,923=>667,924=>889,
-925=>722,926=>650,927=>722,928=>778,929=>611,931=>730,932=>621,933=>722,934=>748,935=>667,
-936=>858,937=>741,938=>389,939=>722,940=>590,941=>430,942=>548,943=>320,944=>536,945=>590,
-946=>536,947=>548,948=>550,949=>430,950=>482,951=>548,952=>525,953=>320,954=>564,955=>510,
-956=>589,957=>522,958=>482,959=>536,960=>629,961=>536,962=>470,963=>536,964=>464,965=>536,
-966=>643,967=>482,968=>715,969=>715,970=>320,971=>536,972=>536,973=>536,974=>715,976=>508,
-977=>589,978=>722,979=>931,980=>722,981=>660,982=>715,983=>536,984=>611,985=>536,986=>620,
-987=>524,988=>667,989=>535,990=>708,991=>428,992=>671,993=>633,1008=>550,1009=>550,1010=>477,
-1011=>278,1012=>722,1013=>411,1014=>411,1015=>609,1016=>500,1017=>667,1018=>896,1019=>769,1020=>536,
-1021=>667,1022=>667,1023=>667,1024=>670,1025=>670,1026=>762,1027=>637,1028=>667,1029=>556,1030=>393,
-1031=>393,1032=>500,1033=>1085,1034=>1049,1035=>747,1036=>736,1037=>778,1038=>746,1039=>778,1040=>667,
-1041=>667,1042=>667,1043=>637,1044=>778,1045=>670,1046=>1044,1047=>650,1048=>778,1049=>778,1050=>736,
-1051=>814,1052=>896,1053=>778,1054=>722,1055=>778,1056=>614,1057=>667,1058=>611,1059=>746,1060=>748,
-1061=>667,1062=>778,1063=>742,1064=>1136,1065=>1135,1066=>779,1067=>984,1068=>664,1069=>732,1070=>1069,
-1071=>779,1072=>500,1073=>508,1074=>486,1075=>414,1076=>486,1077=>444,1078=>982,1079=>476,1080=>556,
-1081=>556,1082=>564,1083=>585,1084=>757,1085=>552,1086=>500,1087=>556,1088=>500,1089=>444,1090=>778,
-1091=>532,1092=>764,1093=>500,1094=>556,1095=>556,1096=>806,1097=>806,1098=>644,1099=>744,1100=>470,
-1101=>488,1102=>757,1103=>586,1104=>444,1105=>444,1106=>524,1107=>414,1108=>488,1109=>389,1110=>278,
-1111=>278,1112=>278,1113=>772,1114=>745,1115=>556,1116=>564,1117=>556,1118=>532,1119=>556,1120=>990,
-1121=>690,1122=>804,1123=>751,1124=>1017,1125=>752,1126=>900,1127=>728,1128=>1236,1129=>927,1130=>1044,
-1131=>826,1132=>1401,1133=>1016,1134=>620,1135=>476,1136=>858,1137=>769,1138=>722,1139=>544,1140=>796,
-1141=>584,1142=>796,1143=>584,1144=>1268,1145=>1023,1146=>895,1147=>612,1148=>990,1149=>690,1150=>990,
-1151=>635,1152=>620,1153=>444,1154=>372,1155=>0,1156=>0,1157=>0,1158=>0,1159=>0,1160=>0,
-1161=>0,1162=>778,1163=>556,1164=>664,1165=>470,1166=>614,1167=>473,1168=>624,1169=>448,1170=>624,
-1171=>448,1172=>733,1173=>485,1174=>1080,1175=>982,1176=>650,1177=>476,1178=>772,1179=>564,1180=>772,
-1181=>590,1182=>738,1183=>499,1184=>862,1185=>718,1186=>778,1187=>552,1188=>976,1189=>682,1190=>1085,
-1191=>787,1192=>667,1193=>480,1194=>667,1195=>444,1196=>534,1197=>778,1198=>611,1199=>640,1200=>611,
-1201=>640,1202=>694,1203=>500,1204=>1004,1205=>518,1206=>742,1207=>556,1208=>742,1209=>556,1210=>716,
-1211=>556,1212=>844,1213=>530,1214=>844,1215=>530,1216=>393,1217=>1044,1218=>982,1219=>736,1220=>534,
-1221=>814,1222=>585,1223=>778,1224=>552,1225=>778,1226=>552,1227=>742,1228=>556,1229=>896,1230=>757,
-1231=>393,1232=>667,1233=>500,1234=>667,1235=>500,1236=>891,1237=>646,1238=>670,1239=>444,1240=>659,
-1241=>372,1242=>619,1243=>372,1244=>1044,1245=>994,1246=>650,1247=>476,1248=>604,1249=>459,1250=>778,
-1251=>539,1252=>778,1253=>539,1254=>722,1255=>500,1256=>722,1257=>500,1258=>722,1259=>500,1260=>732,
-1261=>488,1262=>746,1263=>532,1264=>746,1265=>532,1266=>746,1267=>532,1268=>742,1269=>556,1270=>637,
-1271=>448,1272=>984,1273=>744,1296=>652,1297=>452,1298=>814,1299=>585,1306=>722,1307=>500,1308=>889,
-1309=>656,1310=>736,1311=>564,1425=>0,1426=>0,1427=>0,1428=>0,1429=>0,1430=>0,1431=>0,
-1432=>0,1433=>0,1434=>0,1435=>0,1436=>0,1437=>0,1438=>0,1439=>0,1440=>0,1441=>0,
-1442=>0,1443=>0,1444=>0,1445=>0,1446=>0,1447=>0,1448=>0,1449=>0,1450=>0,1451=>0,
-1452=>0,1453=>0,1454=>0,1455=>0,1456=>0,1457=>0,1458=>0,1459=>0,1460=>0,1461=>0,
-1462=>0,1463=>0,1464=>0,1465=>0,1466=>0,1467=>0,1468=>0,1469=>0,1470=>433,1471=>0,
-1472=>155,1473=>0,1474=>0,1475=>400,1476=>0,1477=>0,1478=>347,1479=>0,1488=>593,1489=>498,
-1490=>339,1491=>523,1492=>561,1493=>266,1494=>291,1495=>559,1496=>576,1497=>266,1498=>496,1499=>501,
-1500=>510,1501=>542,1502=>581,1503=>273,1504=>347,1505=>512,1506=>552,1507=>493,1508=>491,1509=>537,
-1510=>561,1511=>544,1512=>502,1513=>716,1514=>571,1520=>532,1521=>532,1522=>532,1523=>396,1524=>432,
-3585=>590,3586=>578,3587=>661,3588=>592,3589=>592,3590=>699,3591=>447,3592=>534,3593=>692,3594=>578,
-3595=>659,3596=>899,3597=>804,3598=>633,3599=>637,3600=>484,3601=>730,3602=>876,3603=>915,3604=>592,
-3605=>592,3606=>578,3607=>670,3608=>542,3609=>671,3610=>621,3611=>618,3612=>621,3613=>617,3614=>708,
-3615=>708,3616=>637,3617=>589,3618=>552,3619=>484,3620=>590,3621=>569,3622=>637,3623=>526,3624=>599,
-3625=>802,3626=>579,3627=>668,3628=>778,3629=>560,3630=>514,3631=>510,3632=>442,3633=>0,3634=>423,
-3635=>452,3636=>0,3637=>0,3638=>0,3639=>0,3640=>0,3641=>0,3642=>0,3647=>665,3648=>357,
-3649=>624,3650=>529,3651=>486,3652=>475,3653=>423,3654=>500,3655=>0,3656=>0,3657=>0,3658=>0,
-3659=>0,3660=>0,3661=>0,3662=>0,3663=>657,3664=>548,3665=>548,3666=>592,3667=>614,3668=>631,
-3669=>643,3670=>508,3671=>744,3672=>622,3673=>585,3674=>721,3675=>1381,4256=>475,4257=>469,4258=>573,
-4259=>650,4260=>502,4261=>506,4262=>481,4263=>746,4264=>491,4265=>495,4266=>888,4267=>488,4268=>464,
-4269=>745,4270=>483,4271=>489,4272=>721,4273=>464,4274=>578,4275=>590,4276=>611,4277=>491,4278=>663,
-4279=>489,4280=>544,4281=>479,4282=>527,4283=>488,4284=>560,4285=>461,4286=>467,4287=>546,4288=>483,
-4289=>487,4290=>562,4291=>477,4292=>491,4293=>471,4304=>522,4305=>518,4306=>621,4307=>716,4308=>517,
-4309=>519,4310=>518,4311=>796,4312=>518,4313=>518,4314=>934,4315=>517,4316=>519,4317=>787,4318=>515,
-4319=>514,4320=>788,4321=>573,4322=>620,4323=>593,4324=>639,4325=>516,4326=>714,4327=>518,4328=>572,
-4329=>518,4330=>555,4331=>518,4332=>562,4333=>509,4334=>572,4335=>677,4336=>523,4337=>517,4338=>595,
-4339=>480,4340=>519,4341=>484,4345=>621,4347=>410,5024=>718,5025=>768,5026=>633,5027=>878,5028=>1001,
-5029=>371,5030=>576,5031=>754,5032=>531,5033=>774,5034=>692,5035=>499,5036=>668,5037=>829,5038=>575,
-5039=>681,5040=>485,5041=>607,5042=>885,5043=>974,5044=>588,5045=>583,5046=>726,5047=>947,5048=>558,
-5049=>832,5050=>1096,5051=>780,5052=>595,5053=>869,5054=>752,5055=>710,5056=>761,5057=>802,5058=>760,
-5059=>656,5060=>655,5061=>982,5062=>684,5063=>801,5064=>805,5065=>1042,5066=>755,5067=>612,5068=>707,
-5069=>889,5070=>584,5071=>623,5072=>536,5073=>763,5074=>763,5075=>498,5076=>1052,5077=>600,5078=>730,
-5079=>714,5080=>714,5081=>697,5082=>543,5083=>943,5084=>718,5085=>630,5086=>660,5087=>692,5088=>841,
-5089=>861,5090=>617,5091=>733,5092=>898,5093=>896,5094=>781,5095=>612,5096=>830,5097=>948,5098=>886,
-5099=>757,5100=>796,5101=>578,5102=>601,5103=>797,5104=>623,5105=>886,5106=>730,5107=>827,5108=>648,
-7680=>667,7681=>500,7682=>667,7683=>500,7684=>667,7685=>500,7686=>667,7687=>500,7688=>667,7689=>444,
-7690=>744,7691=>500,7692=>744,7693=>500,7694=>744,7695=>500,7696=>744,7697=>500,7698=>744,7699=>500,
-7700=>667,7701=>444,7702=>667,7703=>444,7704=>670,7705=>444,7706=>670,7707=>444,7708=>670,7709=>444,
-7710=>656,7711=>333,7712=>722,7713=>500,7714=>778,7715=>556,7716=>778,7717=>556,7718=>778,7719=>556,
-7720=>778,7721=>556,7722=>778,7723=>556,7724=>393,7725=>278,7726=>389,7727=>278,7728=>664,7729=>500,
-7730=>664,7731=>500,7732=>664,7733=>500,7734=>609,7735=>278,7736=>609,7737=>278,7738=>609,7739=>278,
-7740=>609,7741=>278,7742=>896,7743=>778,7744=>896,7745=>778,7746=>896,7747=>778,7748=>722,7749=>556,
-7750=>722,7751=>556,7752=>722,7753=>556,7754=>722,7755=>556,7756=>722,7757=>500,7758=>722,7759=>500,
-7760=>722,7761=>500,7762=>722,7763=>500,7764=>614,7765=>500,7766=>614,7767=>500,7768=>672,7769=>389,
-7770=>672,7771=>389,7772=>672,7773=>389,7774=>672,7775=>389,7776=>556,7777=>389,7778=>556,7779=>389,
-7780=>556,7781=>389,7782=>556,7783=>389,7784=>556,7785=>389,7786=>611,7787=>278,7788=>611,7789=>278,
-7790=>611,7791=>278,7792=>611,7793=>278,7794=>722,7795=>556,7796=>722,7797=>556,7798=>722,7799=>556,
-7800=>722,7801=>556,7802=>722,7803=>556,7804=>667,7805=>444,7806=>667,7807=>444,7808=>889,7809=>667,
-7810=>889,7811=>667,7812=>889,7813=>667,7814=>889,7815=>667,7816=>889,7817=>667,7818=>667,7819=>500,
-7820=>667,7821=>500,7822=>611,7823=>444,7824=>611,7825=>389,7826=>611,7827=>389,7828=>611,7829=>389,
-7830=>556,7831=>278,7832=>667,7833=>444,7834=>507,7835=>333,7840=>667,7841=>500,7842=>667,7843=>500,
-7844=>667,7845=>500,7846=>667,7847=>500,7848=>667,7849=>500,7850=>667,7851=>500,7852=>667,7853=>500,
-7854=>667,7855=>500,7856=>667,7857=>500,7858=>667,7859=>500,7860=>667,7861=>500,7862=>667,7863=>500,
-7864=>670,7865=>444,7866=>670,7867=>444,7868=>670,7869=>444,7870=>667,7871=>444,7872=>667,7873=>444,
-7874=>667,7875=>444,7876=>667,7877=>444,7878=>670,7879=>444,7880=>393,7881=>278,7882=>393,7883=>278,
-7884=>722,7885=>500,7886=>722,7887=>500,7888=>722,7889=>500,7890=>722,7891=>500,7892=>722,7893=>500,
-7894=>722,7895=>500,7896=>722,7897=>500,7898=>908,7899=>640,7900=>908,7901=>640,7902=>908,7903=>640,
-7904=>908,7905=>640,7906=>908,7907=>640,7908=>722,7909=>556,7910=>722,7911=>556,7912=>902,7913=>714,
-7914=>902,7915=>714,7916=>902,7917=>714,7918=>902,7919=>714,7920=>902,7921=>714,7922=>611,7923=>444,
-7924=>611,7925=>444,7926=>611,7927=>444,7928=>611,7929=>444,7936=>590,7937=>590,7938=>590,7939=>590,
-7940=>590,7941=>590,7942=>590,7943=>590,7944=>724,7945=>753,7946=>891,7947=>912,7948=>822,7949=>853,
-7950=>796,7951=>787,7952=>430,7953=>430,7954=>430,7955=>430,7956=>430,7957=>430,7960=>864,7961=>905,
-7962=>1034,7963=>1038,7964=>1031,7965=>1045,7968=>548,7969=>548,7970=>548,7971=>548,7972=>548,7973=>548,
-7974=>548,7975=>548,7976=>976,7977=>1009,7978=>1132,7979=>1141,7980=>1138,7981=>1154,7982=>1079,7983=>1071,
-7984=>320,7985=>320,7986=>320,7987=>320,7988=>320,7989=>320,7990=>320,7991=>320,7992=>593,7993=>620,
-7994=>746,7995=>762,7996=>742,7997=>773,7998=>691,7999=>683,8000=>536,8001=>536,8002=>536,8003=>536,
-8004=>536,8005=>536,8008=>899,8009=>928,8010=>1086,8011=>1118,8012=>1020,8013=>1028,8016=>536,8017=>536,
-8018=>536,8019=>536,8020=>536,8021=>536,8022=>536,8023=>536,8025=>959,8027=>1085,8029=>1108,8031=>1027,
-8032=>715,8033=>715,8034=>715,8035=>715,8036=>715,8037=>715,8038=>715,8039=>715,8040=>946,8041=>960,
-8042=>1133,8043=>1148,8044=>1059,8045=>1081,8046=>1020,8047=>1016,8048=>590,8049=>590,8050=>430,8051=>430,
-8052=>548,8053=>548,8054=>320,8055=>320,8056=>536,8057=>536,8058=>536,8059=>536,8060=>715,8061=>715,
-8064=>590,8065=>590,8066=>590,8067=>590,8068=>590,8069=>590,8070=>590,8071=>590,8072=>842,8073=>877,
-8074=>1011,8075=>1031,8076=>947,8077=>975,8078=>907,8079=>893,8080=>548,8081=>548,8082=>548,8083=>548,
-8084=>548,8085=>548,8086=>548,8087=>548,8088=>1030,8089=>1066,8090=>1188,8091=>1199,8092=>1196,8093=>1211,
-8094=>1134,8095=>1129,8096=>715,8097=>715,8098=>715,8099=>715,8100=>715,8101=>715,8102=>715,8103=>715,
-8104=>1060,8105=>1076,8106=>1264,8107=>1287,8108=>1179,8109=>1204,8110=>1137,8111=>1135,8112=>590,8113=>590,
-8114=>590,8115=>590,8116=>590,8118=>590,8119=>590,8120=>667,8121=>667,8122=>752,8123=>728,8124=>775,
-8125=>250,8126=>0,8127=>500,8128=>500,8129=>550,8130=>548,8131=>548,8132=>548,8134=>548,8135=>548,
-8136=>884,8137=>859,8138=>982,8139=>968,8140=>839,8141=>500,8142=>500,8143=>500,8144=>320,8145=>320,
-8146=>320,8147=>320,8150=>320,8151=>320,8152=>389,8153=>389,8154=>599,8155=>592,8157=>500,8158=>500,
-8159=>500,8160=>536,8161=>536,8162=>536,8163=>536,8164=>536,8165=>536,8166=>536,8167=>536,8168=>722,
-8169=>722,8170=>1007,8171=>932,8172=>842,8173=>550,8174=>550,8175=>500,8178=>715,8179=>715,8180=>715,
-8182=>715,8183=>715,8184=>971,8185=>853,8186=>1004,8187=>875,8188=>862,8189=>500,8190=>500,8192=>500,
-8193=>1000,8194=>500,8195=>1000,8196=>333,8197=>250,8198=>167,8199=>500,8200=>250,8201=>200,8202=>100,
-8203=>0,8204=>0,8205=>0,8206=>0,8207=>0,8208=>333,8209=>333,8210=>500,8213=>1000,8214=>333,
-8215=>478,8219=>250,8223=>500,8227=>560,8228=>250,8229=>478,8231=>0,8232=>0,8233=>0,8234=>0,
-8235=>0,8236=>0,8237=>0,8238=>250,8239=>0,8241=>1618,8242=>278,8243=>556,8244=>834,8245=>270,
-8246=>468,8247=>630,8248=>469,8251=>727,8252=>778,8253=>733,8254=>500,8255=>953,8256=>953,8257=>338,
-8258=>931,8259=>333,8260=>167,8261=>332,8262=>332,8263=>1000,8264=>889,8265=>889,8266=>500,8267=>453,
-8268=>479,8269=>492,8270=>500,8271=>333,8272=>953,8273=>500,8274=>521,8275=>576,8276=>953,8277=>785,
-8278=>410,8279=>881,8280=>620,8281=>620,8282=>179,8283=>621,8284=>569,8285=>179,8286=>179,8287=>111,
-8288=>0,8289=>0,8290=>0,8291=>0,8292=>0,8304=>300,8305=>219,8308=>300,8309=>300,8310=>300,
-8311=>300,8312=>300,8313=>300,8314=>300,8315=>300,8316=>300,8317=>216,8318=>216,8319=>300,8320=>300,
-8321=>274,8322=>300,8323=>300,8324=>300,8325=>300,8326=>300,8327=>300,8328=>300,8329=>300,8330=>300,
-8331=>300,8332=>300,8333=>216,8334=>216,8352=>667,8353=>667,8354=>667,8355=>667,8356=>500,8357=>742,
-8358=>722,8359=>1008,8360=>953,8361=>889,8362=>889,8363=>532,8365=>742,8366=>631,8369=>609,8370=>639,
-8371=>742,8372=>576,8373=>500,8448=>664,8449=>665,8451=>925,8453=>693,8454=>787,8455=>631,8457=>867,
-8462=>556,8463=>556,8468=>778,8470=>806,8471=>747,8480=>879,8481=>1050,8483=>667,8486=>741,8487=>741,
-8489=>320,8490=>664,8491=>667,8494=>551,8495=>444,8498=>667,8500=>500,8501=>537,8502=>537,8503=>350,
-8504=>537,8506=>942,8507=>1050,8523=>698,8525=>856,8526=>462,8531=>750,8532=>750,8533=>750,8534=>750,
-8535=>750,8536=>750,8537=>750,8538=>750,8539=>750,8540=>750,8541=>750,8542=>750,8543=>750,8544=>393,
-8545=>786,8546=>1179,8547=>1060,8548=>667,8549=>1060,8550=>1453,8551=>1846,8552=>1060,8553=>667,8554=>1060,
-8555=>1453,8556=>609,8557=>667,8558=>744,8559=>896,8560=>278,8561=>556,8562=>834,8563=>722,8564=>444,
-8565=>722,8566=>1000,8567=>1278,8568=>778,8569=>500,8570=>778,8571=>1056,8572=>278,8573=>444,8574=>500,
-8575=>778,8592=>964,8593=>964,8594=>964,8595=>964,8596=>964,8597=>964,8598=>964,8599=>964,8600=>964,
-8601=>964,8602=>964,8603=>964,8606=>964,8607=>964,8608=>964,8609=>964,8610=>964,8611=>964,8612=>964,
-8613=>964,8614=>964,8615=>964,8616=>964,8633=>964,8634=>964,8644=>964,8645=>964,8646=>964,8647=>964,
-8648=>964,8649=>964,8650=>964,8676=>964,8677=>964,8706=>494,8710=>612,8721=>713,8722=>606,8725=>750,
-8730=>549,8734=>752,8800=>570,8804=>570,8805=>570,9251=>500,9674=>494,9676=>732,9824=>618,9825=>645,
-9826=>587,9827=>582,9828=>582,9829=>645,9830=>587,9831=>618,9833=>333,9834=>556,9835=>778,9836=>778,
-9837=>556,9838=>556,9839=>556,11799=>333,64256=>583,64257=>558,64258=>551,64259=>822,64260=>818,64262=>662,
-64285=>266,64286=>0,64287=>532,64288=>552,64297=>570,64298=>716,64299=>716,64300=>716,64301=>716,64302=>593,
-64303=>593,64304=>593,64305=>498,64306=>339,64307=>523,64308=>561,64309=>266,64310=>291,64312=>576,64313=>266,
-64314=>496,64315=>501,64316=>510,64318=>581,64320=>347,64321=>512,64323=>493,64324=>491,64326=>561,64327=>544,
-64328=>502,64329=>716,64330=>571,64331=>266,64332=>498,64333=>501,64334=>491,64335=>593,65533=>788);
-$enc='';
-$diff='';
-$file='freeserifbi.z';
-$ctg='freeserifbi.ctg.z';
-$originalsize=452752;
-?>
\ No newline at end of file
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freeserifbi.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freeserifbi.z
deleted file mode 100644
index 63125cf5..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freeserifbi.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freeserifi.ctg.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freeserifi.ctg.z
deleted file mode 100644
index 1a99cb55..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freeserifi.ctg.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freeserifi.php b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freeserifi.php
deleted file mode 100644
index df824e27..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freeserifi.php
+++ /dev/null
@@ -1,259 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='FreeSerifItalic';
-$desc=array('Ascent'=>900,'Descent'=>-300,'CapHeight'=>-29,'Flags'=>96,'FontBBox'=>'[-879 -434 1673 900]','ItalicAngle'=>-16.5,'StemV'=>70,'MissingWidth'=>600);
-$up=-125;
-$ut=50;
-$dw=600;
-$cw=array(
-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=>604,70=>611,71=>722,
-72=>722,73=>339,74=>444,75=>652,76=>556,77=>828,78=>657,79=>722,80=>603,81=>722,
-82=>616,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,8364=>741,8218=>250,402=>278,8222=>444,8230=>889,
-8224=>500,8225=>500,710=>333,8240=>1000,352=>500,8249=>250,338=>944,381=>556,8216=>250,8217=>250,
-8220=>444,8221=>444,8226=>350,8211=>500,8212=>1000,732=>333,8482=>980,353=>389,8250=>250,339=>667,
-382=>389,376=>556,160=>250,161=>389,162=>500,163=>500,164=>500,165=>500,166=>275,167=>500,
-168=>333,169=>760,170=>276,171=>444,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=>250,186=>310,187=>444,
-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,256=>611,257=>500,
-258=>611,259=>500,260=>611,261=>500,262=>667,263=>444,264=>667,265=>444,266=>667,267=>444,
-268=>667,269=>444,270=>722,271=>500,272=>722,273=>500,274=>611,275=>444,276=>611,277=>444,
-278=>611,279=>444,280=>611,281=>444,282=>611,283=>444,284=>722,285=>500,286=>722,287=>500,
-288=>722,289=>500,290=>722,291=>500,292=>722,293=>500,294=>722,295=>500,296=>333,297=>278,
-298=>333,299=>278,300=>333,301=>278,302=>333,303=>278,304=>333,305=>278,306=>707,307=>553,
-308=>444,309=>278,310=>667,311=>444,312=>444,313=>556,314=>278,315=>556,316=>278,317=>556,
-318=>278,319=>556,320=>278,321=>556,322=>278,323=>667,324=>500,325=>667,326=>500,327=>667,
-328=>500,329=>500,330=>667,331=>500,332=>722,333=>500,334=>722,335=>500,336=>722,337=>500,
-340=>611,341=>389,342=>611,343=>389,344=>611,345=>389,346=>500,347=>389,348=>500,349=>389,
-350=>500,351=>389,354=>556,355=>278,356=>556,357=>278,358=>556,359=>278,360=>722,361=>500,
-362=>722,363=>500,364=>722,365=>500,366=>722,367=>500,368=>722,369=>500,370=>722,371=>500,
-372=>833,373=>667,374=>556,375=>444,377=>556,378=>389,379=>556,380=>389,383=>278,384=>500,
-385=>781,386=>610,387=>551,388=>611,389=>549,390=>667,391=>866,392=>703,393=>722,394=>892,
-395=>682,396=>500,397=>520,398=>611,399=>722,400=>518,401=>611,403=>863,404=>611,405=>728,
-406=>278,407=>333,408=>792,409=>444,410=>278,411=>480,412=>900,413=>779,414=>500,415=>722,
-416=>932,417=>608,418=>908,419=>722,420=>772,421=>500,422=>611,423=>500,424=>389,425=>657,
-426=>461,427=>313,428=>556,429=>335,430=>556,431=>948,432=>721,433=>747,434=>755,435=>636,
-436=>549,437=>556,438=>389,439=>525,440=>556,441=>424,442=>416,443=>500,444=>615,445=>439,
-446=>389,447=>500,448=>275,449=>500,450=>600,451=>333,452=>1278,453=>1111,454=>889,455=>1000,
-456=>834,457=>556,458=>1101,459=>935,460=>778,461=>611,462=>500,463=>339,464=>278,465=>722,
-466=>500,467=>722,468=>500,469=>722,470=>500,471=>722,472=>500,473=>722,474=>500,475=>722,
-476=>500,477=>444,478=>611,479=>500,480=>611,481=>500,482=>889,483=>667,484=>722,485=>500,
-486=>722,487=>500,488=>652,489=>444,490=>730,491=>500,492=>730,493=>500,494=>525,495=>446,
-496=>278,497=>1278,498=>1111,499=>889,500=>817,501=>595,502=>944,503=>607,504=>657,505=>500,
-506=>611,507=>500,508=>889,509=>667,510=>722,511=>500,512=>611,513=>500,514=>611,515=>500,
-516=>604,517=>444,518=>604,519=>444,520=>339,521=>278,522=>339,523=>278,524=>722,525=>500,
-526=>722,527=>500,528=>616,529=>389,530=>616,531=>389,532=>722,533=>500,534=>722,535=>500,
-536=>500,537=>389,538=>556,539=>278,540=>424,541=>455,542=>722,543=>500,544=>781,545=>588,
-546=>568,547=>468,548=>611,549=>444,550=>611,551=>500,552=>604,553=>444,554=>722,555=>500,
-556=>722,557=>500,558=>722,559=>500,560=>722,561=>500,562=>556,563=>444,564=>405,565=>597,
-566=>377,567=>278,568=>775,569=>767,570=>722,571=>667,572=>444,573=>611,574=>611,575=>389,
-576=>444,577=>444,578=>444,579=>667,580=>750,581=>697,582=>611,583=>444,584=>389,585=>278,
-586=>796,587=>590,588=>667,589=>333,590=>722,591=>500,592=>500,593=>564,594=>564,595=>500,
-596=>444,597=>444,598=>500,599=>697,600=>444,601=>444,602=>722,603=>416,604=>426,605=>674,
-606=>454,607=>278,608=>640,609=>500,610=>484,611=>500,612=>582,613=>500,614=>500,615=>500,
-616=>278,617=>278,618=>278,619=>278,620=>278,621=>278,622=>556,623=>722,624=>722,625=>716,
-626=>500,627=>500,628=>500,629=>500,630=>668,631=>693,632=>640,633=>389,634=>389,635=>333,
-636=>389,637=>333,638=>333,639=>333,640=>487,641=>487,642=>389,643=>278,644=>500,645=>333,
-646=>500,647=>278,648=>278,649=>500,650=>517,651=>500,652=>444,653=>667,654=>444,655=>510,
-656=>524,657=>444,658=>446,659=>456,660=>444,661=>444,662=>444,663=>444,664=>722,665=>442,
-666=>454,667=>665,668=>585,669=>347,670=>444,671=>443,672=>500,673=>444,674=>444,675=>798,
-676=>795,677=>805,678=>554,679=>561,680=>678,681=>614,682=>554,683=>554,684=>500,685=>500,
-686=>611,687=>611,688=>300,689=>300,690=>278,691=>278,692=>278,693=>309,694=>306,695=>432,
-696=>310,697=>250,698=>408,699=>333,700=>500,701=>500,702=>333,703=>333,704=>258,705=>258,
-706=>374,707=>374,708=>383,709=>383,711=>333,712=>250,713=>333,714=>333,715=>333,716=>250,
-717=>333,718=>333,719=>333,720=>278,721=>278,722=>333,723=>333,724=>333,725=>333,726=>333,
-727=>333,728=>333,729=>333,730=>333,731=>333,733=>333,734=>336,735=>352,736=>311,737=>200,
-738=>243,739=>328,740=>300,741=>460,742=>460,743=>460,744=>460,745=>460,746=>477,747=>475,
-748=>339,749=>330,750=>444,751=>383,752=>383,753=>294,754=>294,755=>327,756=>261,757=>437,
-758=>437,759=>333,760=>278,761=>175,762=>175,763=>175,764=>175,765=>337,766=>337,767=>326,
-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,832=>0,833=>0,834=>0,835=>0,836=>0,837=>0,
-838=>0,839=>0,840=>0,841=>0,842=>0,843=>0,844=>0,845=>0,846=>0,847=>0,
-848=>0,849=>0,850=>0,851=>0,852=>0,853=>0,854=>0,855=>0,856=>0,857=>0,
-858=>0,859=>0,860=>0,861=>0,862=>0,863=>0,864=>0,865=>0,866=>0,867=>0,
-868=>0,869=>0,870=>0,871=>0,872=>0,873=>0,874=>0,875=>0,876=>0,877=>0,
-878=>0,879=>0,884=>199,885=>199,890=>332,894=>333,900=>257,901=>333,902=>661,903=>250,
-904=>841,905=>950,906=>559,908=>815,910=>877,911=>899,912=>270,913=>661,914=>581,915=>611,
-916=>660,917=>611,918=>606,919=>742,920=>672,921=>333,922=>667,923=>641,924=>833,925=>657,
-926=>678,927=>682,928=>749,929=>611,931=>657,932=>596,933=>676,934=>722,935=>611,936=>812,
-937=>743,938=>333,939=>696,940=>564,941=>416,942=>506,943=>270,944=>504,945=>564,946=>509,
-947=>496,948=>520,949=>416,950=>398,951=>506,952=>533,953=>270,954=>491,955=>488,956=>501,
-957=>486,958=>430,959=>510,960=>608,961=>506,962=>423,963=>524,964=>425,965=>504,966=>618,
-967=>459,968=>693,969=>693,970=>270,971=>504,972=>510,973=>504,974=>693,976=>534,977=>587,
-978=>620,979=>820,980=>620,981=>640,982=>684,983=>504,984=>555,985=>534,986=>548,987=>496,
-988=>610,989=>470,990=>633,991=>410,992=>687,993=>544,1008=>534,1009=>534,1010=>485,1011=>278,
-1012=>722,1013=>280,1014=>280,1015=>610,1016=>500,1017=>704,1018=>832,1019=>703,1020=>533,1021=>704,
-1022=>704,1023=>704,1024=>604,1025=>604,1026=>668,1027=>611,1028=>666,1029=>500,1030=>339,1031=>339,
-1032=>444,1033=>972,1034=>977,1035=>703,1036=>664,1037=>720,1038=>728,1039=>728,1040=>611,1041=>610,
-1042=>611,1043=>611,1044=>682,1045=>604,1046=>976,1047=>592,1048=>720,1049=>720,1050=>664,1051=>719,
-1052=>828,1053=>722,1054=>722,1055=>749,1056=>603,1057=>667,1058=>556,1059=>728,1060=>722,1061=>611,
-1062=>728,1063=>666,1064=>997,1065=>1005,1066=>710,1067=>891,1068=>594,1069=>632,1070=>1024,1071=>696,
-1072=>500,1073=>500,1074=>442,1075=>344,1076=>503,1077=>440,1078=>932,1079=>402,1080=>500,1081=>500,
-1082=>491,1083=>487,1084=>624,1085=>500,1086=>500,1087=>500,1088=>500,1089=>441,1090=>722,1091=>500,
-1092=>741,1093=>444,1094=>500,1095=>500,1096=>750,1097=>750,1098=>545,1099=>683,1100=>433,1101=>432,
-1102=>700,1103=>503,1104=>440,1105=>440,1106=>500,1107=>344,1108=>442,1109=>389,1110=>278,1111=>278,
-1112=>278,1113=>686,1114=>696,1115=>500,1116=>491,1117=>500,1118=>500,1119=>500,1120=>964,1121=>684,
-1122=>708,1123=>690,1124=>975,1125=>646,1126=>800,1127=>628,1128=>1096,1129=>795,1130=>952,1131=>730,
-1132=>1260,1133=>892,1134=>574,1135=>400,1136=>812,1137=>694,1138=>721,1139=>500,1140=>745,1141=>533,
-1142=>745,1143=>533,1144=>1193,1145=>967,1146=>868,1147=>602,1148=>964,1149=>684,1150=>964,1151=>684,
-1152=>548,1153=>443,1154=>320,1155=>0,1156=>0,1157=>0,1158=>0,1159=>0,1160=>0,1161=>0,
-1162=>720,1163=>500,1164=>602,1165=>433,1166=>611,1167=>500,1168=>552,1169=>424,1170=>593,1171=>424,
-1172=>611,1173=>432,1174=>992,1175=>932,1176=>592,1177=>396,1178=>681,1179=>491,1180=>700,1181=>532,
-1182=>664,1183=>491,1184=>776,1185=>690,1186=>729,1187=>500,1188=>908,1189=>660,1190=>1034,1191=>694,
-1192=>667,1193=>531,1194=>666,1195=>443,1196=>556,1197=>775,1198=>556,1199=>574,1200=>555,1201=>574,
-1202=>660,1203=>443,1204=>798,1205=>581,1206=>674,1207=>500,1208=>690,1209=>516,1210=>640,1211=>500,
-1212=>785,1213=>558,1214=>787,1215=>559,1216=>339,1217=>976,1218=>932,1219=>664,1220=>491,1221=>719,
-1222=>487,1223=>722,1224=>500,1225=>722,1226=>500,1227=>666,1228=>500,1229=>828,1230=>624,1231=>339,
-1232=>611,1233=>500,1234=>611,1235=>500,1236=>889,1237=>667,1238=>604,1239=>444,1240=>722,1241=>444,
-1242=>722,1243=>444,1244=>976,1245=>932,1246=>592,1247=>402,1248=>525,1249=>446,1250=>720,1251=>500,
-1252=>720,1253=>500,1254=>722,1255=>500,1256=>722,1257=>500,1258=>722,1259=>500,1260=>632,1261=>432,
-1262=>728,1263=>500,1264=>728,1265=>500,1266=>728,1267=>500,1268=>666,1269=>500,1270=>611,1271=>424,
-1272=>891,1273=>683,1296=>532,1297=>409,1298=>719,1299=>487,1306=>722,1307=>500,1308=>833,1309=>656,
-1310=>664,1311=>491,1425=>0,1426=>0,1427=>0,1428=>0,1429=>0,1430=>0,1431=>418,1432=>0,
-1433=>0,1434=>0,1435=>0,1436=>0,1437=>0,1438=>0,1439=>0,1440=>0,1441=>0,1442=>0,
-1443=>0,1444=>0,1445=>0,1446=>0,1447=>0,1448=>0,1449=>0,1450=>0,1451=>0,1452=>0,
-1453=>0,1454=>0,1455=>0,1456=>0,1457=>0,1458=>0,1459=>0,1460=>0,1461=>0,1462=>0,
-1463=>0,1464=>0,1465=>0,1466=>0,1467=>0,1468=>0,1469=>0,1470=>440,1471=>0,1472=>126,
-1473=>0,1474=>0,1475=>418,1476=>0,1477=>0,1478=>350,1479=>0,1488=>537,1489=>537,1490=>350,
-1491=>537,1492=>537,1493=>350,1494=>350,1495=>537,1496=>537,1497=>350,1498=>537,1499=>537,1500=>537,
-1501=>537,1502=>537,1503=>350,1504=>350,1505=>537,1506=>537,1507=>537,1508=>537,1509=>537,1510=>537,
-1511=>537,1512=>537,1513=>537,1514=>537,1520=>537,1521=>537,1522=>537,1523=>396,1524=>396,2404=>318,
-2405=>446,2433=>0,2434=>300,2435=>312,2437=>594,2438=>776,2439=>469,2440=>513,2441=>535,2442=>561,
-2443=>604,2444=>481,2447=>580,2448=>604,2451=>540,2452=>620,2453=>570,2454=>485,2455=>484,2456=>471,
-2457=>457,2458=>408,2459=>452,2460=>591,2461=>551,2462=>771,2463=>414,2464=>404,2465=>522,2466=>415,
-2467=>450,2468=>551,2469=>477,2470=>478,2471=>449,2472=>448,2474=>535,2475=>611,2476=>443,2477=>534,
-2478=>492,2479=>474,2480=>442,2482=>542,2486=>507,2487=>467,2488=>523,2489=>419,2492=>0,2493=>419,
-2494=>202,2495=>189,2496=>202,2497=>0,2498=>0,2499=>0,2500=>0,2503=>294,2504=>289,2507=>774,
-2508=>825,2509=>0,2510=>356,2519=>219,2524=>523,2525=>420,2527=>469,2528=>604,2529=>481,2530=>0,
-2531=>0,2534=>500,2535=>437,2536=>479,2537=>507,2538=>497,2539=>500,2540=>482,2541=>503,2542=>517,
-2543=>481,2544=>443,2545=>443,2546=>429,2547=>383,2548=>432,2549=>478,2550=>539,2551=>158,2552=>365,
-2553=>280,2554=>357,3585=>512,3586=>453,3587=>512,3588=>519,3589=>529,3590=>561,3591=>411,3592=>437,
-3593=>552,3594=>452,3595=>509,3596=>707,3597=>707,3598=>574,3599=>570,3600=>406,3601=>607,3602=>686,
-3603=>749,3604=>494,3605=>497,3606=>509,3607=>552,3608=>461,3609=>565,3610=>527,3611=>523,3612=>556,
-3613=>551,3614=>570,3615=>570,3616=>571,3617=>531,3618=>493,3619=>433,3620=>513,3621=>491,3622=>571,
-3623=>439,3624=>510,3625=>594,3626=>484,3627=>554,3628=>616,3629=>493,3630=>496,3631=>417,3632=>392,
-3633=>0,3634=>366,3635=>366,3636=>0,3637=>0,3638=>0,3639=>0,3640=>0,3641=>0,3642=>0,
-3647=>662,3648=>297,3649=>544,3650=>298,3651=>329,3652=>328,3653=>326,3654=>488,3655=>0,3656=>0,
-3657=>0,3658=>0,3659=>0,3660=>0,3661=>0,3662=>0,3663=>725,3664=>624,3665=>624,3666=>624,
-3667=>624,3668=>624,3669=>624,3670=>624,3671=>624,3672=>624,3673=>624,3674=>645,3675=>872,4256=>453,
-4257=>448,4258=>546,4259=>619,4260=>478,4261=>481,4262=>459,4263=>707,4264=>467,4265=>471,4266=>842,
-4267=>464,4268=>443,4269=>707,4270=>460,4271=>465,4272=>686,4273=>440,4274=>550,4275=>561,4276=>580,
-4277=>467,4278=>630,4279=>466,4280=>517,4281=>456,4282=>502,4283=>464,4284=>534,4285=>440,4286=>443,
-4287=>522,4288=>460,4289=>463,4290=>536,4291=>455,4292=>468,4293=>449,4304=>454,4305=>452,4306=>544,
-4307=>629,4308=>451,4309=>452,4310=>452,4311=>702,4312=>451,4313=>452,4314=>820,4315=>451,4316=>453,
-4317=>695,4318=>449,4319=>448,4320=>694,4321=>501,4322=>544,4323=>517,4324=>560,4325=>450,4326=>627,
-4327=>452,4328=>491,4329=>452,4330=>485,4331=>452,4332=>485,4333=>443,4334=>500,4335=>582,4336=>455,
-4337=>451,4338=>480,4339=>414,4340=>453,4341=>418,4345=>544,4347=>410,5024=>711,5025=>678,5026=>604,
-5027=>667,5028=>796,5029=>301,5030=>516,5031=>544,5032=>457,5033=>716,5034=>703,5035=>383,5036=>628,
-5037=>709,5038=>455,5039=>601,5040=>472,5041=>574,5042=>730,5043=>939,5044=>498,5045=>528,5046=>667,
-5047=>891,5048=>505,5049=>792,5050=>957,5051=>725,5052=>595,5053=>733,5054=>698,5055=>638,5056=>720,
-5057=>732,5058=>624,5059=>638,5060=>565,5061=>903,5062=>655,5063=>681,5064=>675,5065=>949,5066=>683,
-5067=>547,5068=>693,5069=>732,5070=>529,5071=>569,5072=>536,5073=>677,5074=>631,5075=>382,5076=>973,
-5077=>543,5078=>607,5079=>652,5080=>652,5081=>693,5082=>514,5083=>803,5084=>658,5085=>597,5086=>627,
-5087=>659,5088=>679,5089=>706,5090=>563,5091=>618,5092=>767,5093=>776,5094=>731,5095=>492,5096=>808,
-5097=>823,5098=>796,5099=>689,5100=>716,5101=>518,5102=>521,5103=>719,5104=>563,5105=>776,5106=>634,
-5107=>822,5108=>621,7680=>611,7681=>500,7682=>611,7683=>500,7684=>611,7685=>500,7686=>611,7687=>500,
-7688=>667,7689=>444,7690=>722,7691=>500,7692=>722,7693=>500,7694=>722,7695=>500,7696=>722,7697=>500,
-7698=>722,7699=>500,7700=>611,7701=>444,7702=>611,7703=>444,7704=>604,7705=>444,7706=>604,7707=>444,
-7708=>604,7709=>444,7710=>611,7711=>278,7712=>722,7713=>500,7714=>722,7715=>500,7716=>722,7717=>500,
-7718=>722,7719=>500,7720=>722,7721=>500,7722=>722,7723=>500,7724=>339,7725=>278,7726=>333,7727=>278,
-7728=>652,7729=>444,7730=>652,7731=>444,7732=>652,7733=>444,7734=>556,7735=>278,7736=>556,7737=>278,
-7738=>556,7739=>278,7740=>556,7741=>278,7742=>828,7743=>722,7744=>828,7745=>722,7746=>828,7747=>722,
-7748=>657,7749=>500,7750=>657,7751=>500,7752=>657,7753=>500,7754=>657,7755=>500,7756=>722,7757=>500,
-7758=>722,7759=>500,7760=>722,7761=>500,7762=>722,7763=>500,7764=>603,7765=>500,7766=>603,7767=>500,
-7768=>616,7769=>389,7770=>616,7771=>389,7772=>616,7773=>389,7774=>616,7775=>389,7776=>500,7777=>389,
-7778=>500,7779=>389,7780=>500,7781=>389,7782=>500,7783=>389,7784=>500,7785=>389,7786=>556,7787=>278,
-7788=>556,7789=>278,7790=>556,7791=>278,7792=>556,7793=>278,7794=>722,7795=>500,7796=>722,7797=>500,
-7798=>722,7799=>500,7800=>722,7801=>500,7802=>722,7803=>500,7804=>611,7805=>444,7806=>611,7807=>444,
-7808=>833,7809=>667,7810=>833,7811=>667,7812=>833,7813=>667,7814=>833,7815=>667,7816=>833,7817=>667,
-7818=>611,7819=>444,7820=>611,7821=>444,7822=>556,7823=>444,7824=>556,7825=>389,7826=>556,7827=>389,
-7828=>556,7829=>389,7830=>500,7831=>278,7832=>667,7833=>444,7834=>444,7835=>278,7840=>611,7841=>500,
-7842=>611,7843=>500,7844=>611,7845=>500,7846=>611,7847=>500,7848=>611,7849=>500,7850=>611,7851=>500,
-7852=>611,7853=>500,7854=>611,7855=>500,7856=>611,7857=>500,7858=>611,7859=>500,7860=>611,7861=>500,
-7862=>611,7863=>500,7864=>604,7865=>444,7866=>604,7867=>444,7868=>604,7869=>444,7870=>611,7871=>444,
-7872=>611,7873=>444,7874=>611,7875=>444,7876=>611,7877=>444,7878=>604,7879=>444,7880=>339,7881=>278,
-7882=>339,7883=>278,7884=>722,7885=>500,7886=>722,7887=>500,7888=>722,7889=>500,7890=>722,7891=>500,
-7892=>722,7893=>500,7894=>722,7895=>500,7896=>722,7897=>500,7898=>932,7899=>608,7900=>932,7901=>608,
-7902=>807,7903=>585,7904=>932,7905=>608,7906=>932,7907=>608,7908=>722,7909=>500,7910=>722,7911=>500,
-7912=>948,7913=>721,7914=>948,7915=>721,7916=>807,7917=>585,7918=>948,7919=>721,7920=>948,7921=>721,
-7922=>556,7923=>444,7924=>556,7925=>444,7926=>556,7927=>444,7928=>556,7929=>444,7936=>564,7937=>564,
-7938=>564,7939=>564,7940=>564,7941=>564,7942=>564,7943=>564,7944=>661,7945=>661,7946=>794,7947=>811,
-7948=>792,7949=>803,7950=>661,7951=>648,7952=>416,7953=>416,7954=>416,7955=>416,7956=>416,7957=>416,
-7960=>740,7961=>795,7962=>923,7963=>940,7964=>996,7965=>986,7968=>506,7969=>506,7970=>506,7971=>506,
-7972=>506,7973=>506,7974=>506,7975=>506,7976=>879,7977=>901,7978=>1036,7979=>1035,7980=>1099,7981=>1100,
-7982=>954,7983=>959,7984=>270,7985=>270,7986=>267,7987=>267,7988=>267,7989=>267,7990=>267,7991=>267,
-7992=>490,7993=>529,7994=>655,7995=>654,7996=>705,7997=>713,7998=>570,7999=>573,8000=>558,8001=>510,
-8002=>510,8003=>510,8004=>510,8005=>510,8008=>797,8009=>867,8010=>1026,8011=>1022,8012=>993,8013=>1017,
-8016=>504,8017=>504,8018=>504,8019=>504,8020=>504,8021=>504,8022=>504,8023=>504,8025=>916,8027=>1062,
-8029=>1100,8031=>933,8032=>693,8033=>693,8034=>693,8035=>693,8036=>693,8037=>693,8038=>693,8039=>693,
-8040=>852,8041=>909,8042=>1072,8043=>1072,8044=>1032,8045=>1047,8046=>930,8047=>946,8048=>564,8049=>564,
-8050=>416,8051=>416,8052=>506,8053=>506,8054=>270,8055=>270,8056=>510,8057=>510,8058=>504,8059=>504,
-8060=>693,8061=>693,8064=>564,8065=>564,8066=>564,8067=>564,8068=>564,8069=>564,8070=>564,8071=>564,
-8072=>821,8073=>854,8074=>998,8075=>1011,8076=>992,8077=>1001,8078=>866,8079=>858,8080=>506,8081=>506,
-8082=>506,8083=>506,8084=>506,8085=>506,8086=>506,8087=>506,8088=>999,8089=>1044,8090=>1179,8091=>1165,
-8092=>1227,8093=>1229,8094=>1080,8095=>1085,8096=>693,8097=>693,8098=>693,8099=>693,8100=>693,8101=>693,
-8102=>693,8103=>693,8104=>1037,8105=>1113,8106=>1264,8107=>1264,8108=>1219,8109=>1241,8110=>1120,8111=>1132,
-8112=>564,8113=>564,8114=>564,8115=>564,8116=>564,8118=>564,8119=>564,8120=>661,8121=>661,8122=>661,
-8123=>661,8124=>831,8125=>192,8126=>332,8127=>500,8128=>500,8129=>534,8130=>506,8131=>506,8132=>506,
-8134=>506,8135=>506,8136=>611,8137=>816,8138=>889,8139=>908,8140=>881,8141=>500,8142=>500,8143=>500,
-8144=>270,8145=>270,8146=>270,8147=>270,8150=>270,8151=>270,8152=>333,8153=>333,8154=>497,8155=>521,
-8157=>500,8158=>500,8159=>500,8160=>504,8161=>504,8162=>504,8163=>504,8164=>506,8165=>506,8166=>504,
-8167=>504,8168=>676,8169=>676,8170=>905,8171=>901,8172=>783,8173=>333,8174=>333,8175=>500,8178=>693,
-8179=>693,8180=>693,8182=>693,8183=>693,8184=>907,8185=>833,8186=>963,8187=>875,8188=>952,8189=>500,
-8190=>500,8192=>500,8193=>1000,8194=>500,8195=>1000,8196=>333,8197=>250,8198=>167,8199=>500,8200=>250,
-8201=>200,8202=>100,8203=>0,8204=>0,8205=>0,8206=>0,8207=>0,8208=>333,8209=>333,8210=>500,
-8213=>1000,8214=>293,8215=>465,8219=>250,8223=>444,8227=>350,8228=>250,8229=>500,8231=>250,8232=>0,
-8233=>0,8234=>0,8235=>0,8236=>0,8237=>0,8238=>0,8239=>250,8241=>1601,8242=>247,8243=>411,
-8244=>611,8245=>220,8246=>440,8247=>660,8248=>469,8251=>629,8252=>666,8253=>500,8254=>500,8255=>953,
-8256=>1000,8257=>314,8258=>931,8259=>333,8260=>167,8261=>480,8262=>480,8263=>1000,8264=>833,8265=>833,
-8266=>500,8267=>453,8268=>453,8269=>450,8270=>500,8271=>278,8272=>882,8273=>500,8274=>497,8275=>500,
-8276=>953,8277=>512,8278=>410,8279=>855,8280=>620,8281=>620,8282=>179,8283=>621,8284=>564,8285=>179,
-8286=>179,8287=>111,8288=>0,8289=>0,8290=>0,8291=>0,8292=>0,8304=>300,8305=>235,8308=>300,
-8309=>300,8310=>300,8311=>300,8312=>300,8313=>300,8314=>300,8315=>300,8316=>300,8317=>216,8318=>216,
-8319=>318,8320=>300,8321=>250,8322=>300,8323=>300,8324=>300,8325=>300,8326=>300,8327=>300,8328=>300,
-8329=>300,8330=>300,8331=>300,8332=>300,8333=>216,8334=>216,8352=>698,8353=>667,8354=>667,8355=>611,
-8356=>500,8357=>722,8358=>667,8359=>988,8360=>953,8361=>833,8362=>869,8363=>512,8365=>722,8366=>611,
-8369=>589,8370=>619,8371=>722,8372=>556,8373=>611,8400=>0,8401=>0,8402=>0,8403=>0,8404=>0,
-8405=>0,8406=>0,8407=>0,8408=>0,8409=>0,8410=>0,8411=>0,8412=>0,8413=>0,8414=>0,
-8415=>0,8416=>0,8417=>0,8418=>0,8419=>0,8420=>0,8421=>0,8422=>0,8423=>0,8424=>0,
-8425=>0,8426=>0,8427=>0,8428=>0,8429=>0,8430=>0,8431=>0,8432=>0,8448=>664,8449=>665,
-8451=>954,8453=>693,8454=>787,8457=>822,8462=>500,8463=>500,8468=>777,8470=>823,8471=>760,8478=>616,
-8479=>610,8480=>879,8481=>1156,8483=>611,8486=>743,8487=>743,8489=>286,8490=>722,8491=>722,8494=>533,
-8498=>556,8501=>537,8502=>537,8503=>350,8504=>537,8506=>906,8507=>1155,8523=>778,8525=>856,8526=>500,
-8531=>750,8532=>750,8533=>750,8534=>750,8535=>750,8536=>750,8537=>750,8538=>750,8539=>750,8540=>750,
-8541=>750,8542=>750,8543=>750,8544=>339,8545=>678,8546=>1017,8547=>950,8548=>611,8549=>950,8550=>1289,
-8551=>1628,8552=>950,8553=>611,8554=>950,8555=>1289,8556=>556,8557=>667,8558=>722,8559=>828,8560=>278,
-8561=>556,8562=>834,8563=>722,8564=>444,8565=>722,8566=>1000,8567=>1278,8568=>722,8569=>444,8570=>722,
-8571=>1000,8572=>278,8573=>444,8574=>500,8575=>722,8592=>964,8593=>499,8594=>964,8595=>499,8706=>494,
-8710=>612,8721=>713,8722=>675,8723=>675,8725=>750,8730=>549,8734=>677,8747=>416,8748=>750,8749=>1083,
-8750=>722,8751=>750,8800=>564,8804=>675,8805=>675,8992=>686,8993=>686,9251=>500,9674=>494,9676=>791,
-9824=>626,9825=>694,9826=>595,9827=>776,9828=>626,9829=>694,9830=>595,9831=>776,9833=>333,9834=>555,
-9835=>722,9836=>722,9837=>415,9838=>377,9839=>402,11799=>333,64256=>526,64257=>500,64258=>500,64259=>747,
-64260=>748,64262=>665,64285=>350,64286=>0,64287=>537,64288=>537,64297=>564,64298=>537,64299=>537,64300=>537,
-64301=>537,64302=>537,64303=>537,64304=>537,64305=>537,64306=>350,64307=>537,64308=>537,64309=>350,64310=>350,
-64312=>537,64313=>350,64314=>537,64315=>537,64316=>537,64318=>537,64320=>350,64321=>537,64323=>537,64324=>537,
-64326=>537,64327=>537,64328=>537,64329=>537,64330=>537,64331=>350,64332=>537,64333=>537,64334=>537,64335=>537,
-65533=>788);
-$enc='';
-$diff='';
-$file='freeserifi.z';
-$ctg='freeserifi.ctg.z';
-$originalsize=629968;
-?>
\ No newline at end of file
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freeserifi.z b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freeserifi.z
deleted file mode 100644
index c191bde4..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/freeserifi.z and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/helvetica.php b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/helvetica.php
deleted file mode 100644
index 09ddd5d9..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/helvetica.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);
-?>
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/helveticab.php b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/helveticab.php
deleted file mode 100644
index 0a8565a6..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/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);
-?>
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/helveticabi.php b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/helveticabi.php
deleted file mode 100644
index 0a8565a6..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/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);
-?>
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/helveticai.php b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/helveticai.php
deleted file mode 100644
index 09ddd5d9..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/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);
-?>
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/hysmyeongjostdmedium.php b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/hysmyeongjostdmedium.php
deleted file mode 100644
index 27871135..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/hysmyeongjostdmedium.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-$type='cidfont0';
-$name='HYSMyeongJoStd-Medium-Acro'; // AdobeMyungjoStd-Medium-Acro in acrobat 6
-$displayname = 'MyungJo Medium (Korean)';
-$desc = array(
-	'Ascent' => 880,
-	'Descent' => -120,
-	'CapHeight' => 720,
-	'Flags' => 6,
-	'FontBBox' => '[-28 -148 1001 880]',
-	'ItalicAngle' => 0,
-	'StemV' => 60,
-	'Style' => '<< /Panose <000000000600000000000000> >>',
-);
-$cidinfo = array(
-	'Registry' => 'Adobe',
-	'Ordering' => 'Korea1',
-	'Supplement' => '1',
-);
-$enc = 'UniKS-UCS2-H';
-
-// underline position, needs checking:
-$up = -130;
-$ut = 40;
-
-$dw = 1000;
-$cw = array(
-	32 => 333, 33 => 416, 34 => 416, 35 => 833, 36 => 625, 37 => 916, 38 => 833, 39 => 250, 40 => 500, 41 => 500,
-	42 => 500, 43 => 833, 44 => 291, 45 => 450, 46 => 291, 47 => 375, 48 => 625, 49 => 625, 50 => 625, 51 => 625,
-	52 => 625, 53 => 625, 54 => 625, 55 => 625, 56 => 625, 57 => 625, 58 => 333, 59 => 333, 60 => 833, 61 => 833,
-	62 => 916, 63 => 500, 64 => 1000, 65 => 791, 66 => 708, 67 => 708, 68 => 750, 69 => 708, 70 => 666, 71 => 750,
-	72 => 791, 73 => 375, 74 => 500, 75 => 791, 76 => 666, 77 => 916, 78 => 791, 79 => 750, 80 => 666, 81 => 750,
-	82 => 708, 83 => 666, 84 => 791, 85 => 791, 86 => 750, 87 => 1000, 88 => 708, 89 => 708, 90 => 666, 91 => 500,
-	92 => 375, 93 => 500, 94 => 500, 95 => 500, 96 => 333, 97 => 541, 98 => 583, 99 => 541, 100 => 583, 101 => 583,
-	102 => 375, 103 => 583, 104 => 583, 105 => 291, 106 => 333, 107 => 583, 108 => 291, 109 => 875, 110 => 583, 111 => 583,
-	112 => 583, 113 => 583, 114 => 458, 115 => 541, 116 => 375, 117 => 583, 118 => 583, 119 => 833, 120 => 625, 121 => 625,
-	122 => 500, 123 => 583, 124 => 583, 125 => 583, 126 => 750,
-);
-$_cr = array(
-	//array(97, 97, 500),
-	array(8094, 8190, 500)
-);
-foreach($_cr as $_r) {
-	for($i = $_r[0]; $i <= $_r[1]; $i++) {
-		$cw[$i+31] = $_r[2];
-	}
-}
-?>
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/kozgopromedium.php b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/kozgopromedium.php
deleted file mode 100644
index 59f21c09..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/kozgopromedium.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-$type = 'cidfont0';
-$name = 'KozGoPro-Medium-Acro';
-$displayname = 'Kozuka Gothic Pro (Japanese Sans-Serif)';
-$desc = array(
-	'Ascent' => 880,
-	'Descent' => -120,
-	'CapHeight' => 763,
-	'Flags' => 4,
-	'FontBBox' => '[-149 -374 1254 1008]',
-	'ItalicAngle' => 0,
-	'StemV' => 99,
-	'Style' => '<< /Panose <0000020b0700000000000000> >>',
-	'XHeight' => 549,
-);
-$cidinfo = array(
-	'Registry' => 'Adobe',
-	'Ordering' => 'Japan1',
-	'Supplement' => '4',
-);
-$enc = 'UniJIS-UCS2-H';
-
-// underline position, needs checking:
-$up = -75;
-$ut = 50;
-
-$dw = 1000;
-$cw = array(
-	32 => 224, 33 => 266, 34 => 392, 35 => 551, 36 => 562, 37 => 883, 38 => 677, 39 => 213, 40 => 322, 41 => 322,
-	42 => 470, 43 => 677, 44 => 247, 45 => 343, 46 => 245, 47 => 370, 48 => 562, 49 => 562, 50 => 562, 51 => 562,
-	52 => 562, 53 => 562, 54 => 562, 55 => 562, 56 => 562, 57 => 562, 58 => 245, 59 => 247, 60 => 677, 61 => 677,
-	62 => 677, 63 => 447, 64 => 808, 65 => 661, 66 => 602, 67 => 610, 68 => 708, 69 => 535, 70 => 528, 71 => 689,
-	72 => 703, 73 => 275, 74 => 404, 75 => 602, 76 => 514, 77 => 871, 78 => 708, 79 => 727, 80 => 585, 81 => 727,
-	82 => 595, 83 => 539, 84 => 541, 85 => 696, 86 => 619, 87 => 922, 88 => 612, 89 => 591, 90 => 584, 91 => 322,
-	92 => 562, 93 => 322, 94 => 677, 95 => 568, 96 => 340, 97 => 532, 98 => 612, 99 => 475, 100 => 608, 101 => 543,
-	102 => 332, 103 => 603, 104 => 601, 105 => 265, 106 => 276, 107 => 524, 108 => 264, 109 => 901, 110 => 601, 111 => 590,
-	112 => 612, 113 => 607, 114 => 367, 115 => 433, 116 => 369, 117 => 597, 118 => 527, 119 => 800, 120 => 511, 121 => 518,
-	122 => 468, 123 => 321, 124 => 273, 125 => 321, 126 => 341, 127 => 241, 128 => 362, 129 => 241, 130 => 273, 131 => 677,
-	132 => 266, 133 => 562, 134 => 562, 135 => 456, 136 => 562, 137 => 571, 138 => 562, 139 => 416, 140 => 472, 141 => 283,
-	142 => 283, 143 => 587, 144 => 588, 145 => 568, 146 => 545, 147 => 545, 148 => 247, 149 => 561, 150 => 330, 151 => 239,
-	152 => 418, 153 => 416, 154 => 472, 155 => 1136, 156 => 1288, 157 => 447, 158 => 340, 159 => 340, 160 => 340, 161 => 340,
-	162 => 340, 163 => 340, 164 => 455, 165 => 340, 166 => 340, 167 => 340, 168 => 340, 169 => 1136, 170 => 857, 171 => 384,
-	172 => 519, 173 => 727, 174 => 952, 175 => 398, 176 => 834, 177 => 264, 178 => 275, 179 => 590, 180 => 918, 181 => 605,
-	182 => 677, 183 => 769, 184 => 677, 185 => 473, 186 => 361, 187 => 677, 188 => 347, 189 => 340, 190 => 599, 191 => 284,
-	192 => 845, 193 => 845, 194 => 845, 195 => 661, 196 => 661, 197 => 661, 198 => 661, 199 => 661, 200 => 661, 201 => 610,
-	202 => 535, 203 => 535, 204 => 535, 205 => 535, 206 => 275, 207 => 275, 208 => 275, 209 => 275, 210 => 715, 211 => 708,
-	212 => 727, 213 => 727, 214 => 727, 215 => 727, 216 => 727, 217 => 677, 218 => 696, 219 => 696, 220 => 696, 221 => 696,
-	222 => 591, 223 => 584, 224 => 532, 225 => 532, 226 => 532, 227 => 532, 228 => 532, 229 => 532, 230 => 475, 231 => 543,
-	232 => 543, 233 => 543, 234 => 543, 235 => 264, 236 => 264, 237 => 264, 238 => 264, 239 => 584, 240 => 601, 241 => 590,
-	242 => 590, 243 => 590, 244 => 590, 245 => 590, 246 => 677, 247 => 597, 248 => 597, 249 => 597, 250 => 597, 251 => 518,
-	252 => 612, 253 => 518, 254 => 539, 255 => 591, 256 => 584, 257 => 446, 258 => 433, 259 => 683, 260 => 468, 261 => 562,
-);
-$_cr = array(
-	array(231, 632, 500), // half-width
-	array(8718, 8718, 500),
-	array(9738, 9757, 250), // quarter-width
-	array(9758, 9778, 333), // third-width
-	array(12063, 12087, 500)
-);
-foreach($_cr as $_r) {
-	for($i = $_r[0]; $i <= $_r[1]; $i++) {
-		$cw[$i+31] = $_r[2];
-	}
-}
-?>
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/kozminproregular.php b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/kozminproregular.php
deleted file mode 100644
index 25970a7e..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/kozminproregular.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-$type = 'cidfont0';
-$name = 'KozMinPro-Regular-Acro';
-$displayname = 'Kozuka Mincho Pro (Japanese Serif)';
-$desc = array(
-	'Ascent' => 880,
-	'Descent' => -120,
-	'CapHeight' => 740,
-	'Flags' => 6,
-	'FontBBox' => '[-195 -272 1110 1075]',
-	'ItalicAngle' => 0,
-	'StemV' => 86,
-	'XHeight' => 502,
-);
-$cidinfo = array(
-	'Registry' => 'Adobe',
-	'Ordering' => 'Japan1',
-	'Supplement' => '4',
-);
-$enc = 'UniJIS-UCS2-H';
-
-$up = -75;
-$ut = 50;
-
-$dw = 1000;
-$cw = array(
-	32 => 278, 33 => 299, 34 => 353, 35 => 614, 36 => 614, 37 => 721, 38 => 735, 39 => 216, 40 => 323, 41 => 323,
-	42 => 449, 43 => 529, 44 => 219, 45 => 306, 46 => 219, 47 => 453, 48 => 614, 49 => 614, 50 => 614, 51 => 614,
-	52 => 614, 53 => 614, 54 => 614, 55 => 614, 56 => 614, 57 => 614, 58 => 219, 59 => 219, 60 => 529, 61 => 529,
-	62 => 529, 63 => 486, 64 => 744, 65 => 646, 66 => 604, 67 => 617, 68 => 681, 69 => 567, 70 => 537, 71 => 647,
-	72 => 738, 73 => 320, 74 => 433, 75 => 637, 76 => 566, 77 => 904, 78 => 710, 79 => 716, 80 => 605, 81 => 716,
-	82 => 623, 83 => 517, 84 => 601, 85 => 690, 86 => 668, 87 => 990, 88 => 681, 89 => 634, 90 => 578, 91 => 316,
-	92 => 614, 93 => 316, 94 => 529, 95 => 500, 96 => 387, 97 => 509, 98 => 566, 99 => 478, 100 => 565, 101 => 503,
-	102 => 337, 103 => 549, 104 => 580, 105 => 275, 106 => 266, 107 => 544, 108 => 276, 109 => 854, 110 => 579, 111 => 550,
-	112 => 578, 113 => 566, 114 => 410, 115 => 444, 116 => 340, 117 => 575, 118 => 512, 119 => 760, 120 => 503, 121 => 529,
-	122 => 453, 123 => 326, 124 => 380, 125 => 326, 126 => 387, 127 => 216, 128 => 453, 129 => 216, 130 => 380, 131 => 529,
-	132 => 299, 133 => 614, 134 => 614, 135 => 265, 136 => 614, 137 => 475, 138 => 614, 139 => 353, 140 => 451, 141 => 291,
-	142 => 291, 143 => 588, 144 => 589, 145 => 500, 146 => 476, 147 => 476, 148 => 219, 149 => 494, 150 => 452, 151 => 216,
-	152 => 353, 153 => 353, 154 => 451, 156 => 1075, 157 => 486, 158 => 387, 159 => 387, 160 => 387, 161 => 387,
-	162 => 387,	163 => 387, 164 => 387, 165 => 387, 166 => 387, 167 => 387, 168 => 387, 170 => 880, 171 => 448,
-	172 => 566, 173 => 716,	174 => 903, 175 => 460, 176 => 805, 177 => 275, 178 => 276, 179 => 550, 180 => 886, 181 => 582,
-	182 => 529, 183 => 738,	184 => 529, 185 => 738, 186 => 357, 187 => 529, 188 => 406, 189 => 406, 190 => 575, 191 => 406,
-	192 => 934, 193 => 934,	194 => 934, 195 => 646, 196 => 646, 197 => 646, 198 => 646, 199 => 646, 200 => 646, 201 => 617,
-	202 => 567, 203 => 567, 204 => 567, 205 => 567, 206 => 320, 207 => 320, 208 => 320, 209 => 320, 210 => 681, 211 => 710,
-	212 => 716, 213 => 716, 214 => 716, 215 => 716, 216 => 716, 217 => 529, 218 => 690, 219 => 690, 220 => 690, 221 => 690,
-	222 => 634, 223 => 605, 224 => 509, 225 => 509, 226 => 509, 227 => 509, 228 => 509, 229 => 509, 230 => 478, 231 => 503,
-	232 => 503, 233 => 503, 234 => 503, 235 => 275, 236 => 275, 237 => 275, 238 => 275, 239 => 550, 240 => 579, 241 => 550,
-	242 => 550, 243 => 550, 244 => 550, 245 => 550, 246 => 529, 247 => 575, 248 => 575, 249 => 575, 250 => 575, 251 => 529,
-	252 => 578, 253 => 529, 254 => 517, 255 => 634, 256 => 578, 257 => 445, 258 => 444, 259 => 842, 260 => 453, 261 => 614,
-);
-$_cr = array(
-	array(231, 632, 500), // half-width
-	array(8718, 8718, 500),
-	array(9738, 9757, 250), // quarter-width
-	array(9758, 9778, 333), // third-width
-	array(12063, 12087, 500),
-);
-foreach($_cr as $_r) {
-	for($i = $_r[0]; $i <= $_r[1]; $i++) {
-		$cw[$i+31] = $_r[2];
-	}
-}
-?>
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/msungstdlight.php b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/msungstdlight.php
deleted file mode 100644
index cf97488e..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/msungstdlight.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-$type = 'cidfont0';
-$name = 'MSungStd-Light-Acro';
-$displayname = 'MSung Light (Trad. Chinese)';
-$desc = array(
-	'Ascent' => 880,
-	'Descent' => -120,
-	'CapHeight' => 880,
-	'Flags' => 6,
-	'FontBBox' => '[-160 -249 1015 1071]',
-	'ItalicAngle' => 0,
-	'StemV' => 93,
-);
-$cidinfo = array(
-	'Registry' => 'Adobe',
-	'Ordering' => 'CNS1',
-	'Supplement' => '3',
-);
-$enc = 'UniCNS-UCS2-H';
-
-$up = -130;
-$ut = 40;
-
-$dw = 1000;
-$cw = array(
-	32 => 250, 33 => 250, 34 => 408, 35 => 668, 36 => 490, 37 => 875, 38 => 698, 39 => 250, 40 => 240, 41 => 240,
-	42 => 417, 43 => 667, 44 => 250, 45 => 313, 46 => 250, 47 => 520, 48 => 500, 49 => 500, 50 => 500, 51 => 500,
-	52 => 500, 53 => 500, 54 => 500, 55 => 500, 56 => 500, 57 => 500, 58 => 250, 59 => 250, 60 => 667, 61 => 667,
-	62 => 667, 63 => 396, 64 => 921, 65 => 677, 66 => 615, 67 => 719, 68 => 760, 69 => 625, 70 => 552, 71 => 771,
-	72 => 802, 73 => 354, 74 => 354, 75 => 781, 76 => 604, 77 => 927, 78 => 750, 79 => 823, 80 => 563, 81 => 823,
-	82 => 729, 83 => 542, 84 => 698, 85 => 771, 86 => 729, 87 => 948, 88 => 771, 89 => 677, 90 => 635, 91 => 344,
-	92 => 520, 93 => 344, 94 => 469, 95 => 500, 96 => 250, 97 => 469, 98 => 521, 99 => 427, 100 => 521, 101 => 438,
-	102 => 271, 103 => 469, 104 => 531, 105 => 250, 106 => 250, 107 => 458, 108 => 240, 109 => 802, 110 => 531, 111 => 500,
-	112 => 521, 113 => 521, 114 => 365, 115 => 333, 116 => 292, 117 => 521, 118 => 458, 119 => 677, 120 => 479, 121 => 458,
-	122 => 427, 123 => 480, 124 => 496, 125 => 480, 126 => 667,
-	17601 => 500,
-);
-?>
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/stsongstdlight.php b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/stsongstdlight.php
deleted file mode 100644
index 19fdeb6a..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/stsongstdlight.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-$type = 'cidfont0';
-$name = 'STSongStd-Light-Acro';
-$displayname = 'STSong Light (Simp. Chinese)';
-$desc = array(
-	'Ascent' => 752,
-	'Descent' => -271,
-	'CapHeight' => 737,
-	'Flags' => 6,
-	'FontBBox' => '[-25 -254 1000 880]',
-	'ItalicAngle' => 0,
-	'StemV' => 58,
-	'Style' => '<< /Panose <000000000400000000000000> >>',
-);
-$cidinfo = array(
-	'Registry' => 'Adobe',
-	'Ordering' => 'GB1',
-	'Supplement' => '2',
-);
-$enc = 'UniGB-UCS2-H';
-
-// underline position, needs checking:
-$up = -130;
-$ut = 40;
-
-$dw = 1000;
-$cw = array(
-	32 => 207, 33 => 270, 34 => 342, 35 => 467, 36 => 462, 37 => 797, 38 => 710, 39 => 239, 40 => 374, 41 => 374,
-	42 => 423, 43 => 605, 44 => 238, 45 => 375, 46 => 238, 47 => 334, 48 => 462, 49 => 462, 50 => 462, 51 => 462,
-	52 => 462, 53 => 462, 54 => 462, 55 => 462, 56 => 462, 57 => 462, 58 => 238, 59 => 238, 60 => 605, 61 => 605,
-	62 => 605, 63 => 344, 64 => 748, 65 => 684, 66 => 560, 67 => 695, 68 => 739, 69 => 563, 70 => 511, 71 => 729,
-	72 => 793, 73 => 318, 74 => 312, 75 => 666, 76 => 526, 77 => 896, 78 => 758, 79 => 772, 80 => 544, 81 => 772,
-	82 => 628, 83 => 465, 84 => 607, 85 => 753, 86 => 711, 87 => 972, 88 => 647, 89 => 620, 90 => 607, 91 => 374,
-	92 => 333, 93 => 374, 94 => 606, 95 => 500, 96 => 239, 97 => 417, 98 => 503, 99 => 427, 100 => 529, 101 => 415,
-	102 => 264, 103 => 444, 104 => 518, 105 => 241, 106 => 230, 107 => 495, 108 => 228, 109 => 793, 110 => 527, 111 => 524,
-	112 => 524, 113 => 504, 114 => 338, 115 => 336, 116 => 277, 117 => 517, 118 => 450, 119 => 652, 120 => 466, 121 => 452,
-	122 => 407, 123 => 370, 124 => 258, 125 => 370, 126 => 605,
-);
-?>
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/symbol.php b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/symbol.php
deleted file mode 100644
index 9068a79a..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/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);
-?>
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/times.php b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/times.php
deleted file mode 100644
index 8cae5a7b..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/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);
-?>
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/timesb.php b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/timesb.php
deleted file mode 100644
index 68766ca5..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/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);
-?>
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/timesbi.php b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/timesbi.php
deleted file mode 100644
index e2190e07..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/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);
-?>
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/timesi.php b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/timesi.php
deleted file mode 100644
index 19a59739..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/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);
-?>
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/uni2cid_ac15.php b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/uni2cid_ac15.php
deleted file mode 100644
index 4078b6e6..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/uni2cid_ac15.php
+++ /dev/null
@@ -1,23613 +0,0 @@
-<?php
-// unicode to cid conversion table is from
-// ftp://ftp.oreilly.com/pub/examples/nutshell/cjkv/adobe/
-// cid2code.txt in ag15.tar.Z
-$cidinfo['uni2cid'] = array(
-32=>1,
-33=>2,
-34=>3,
-35=>4,
-36=>5,
-37=>6,
-38=>7,
-39=>8,
-40=>9,
-41=>10,
-42=>11,
-43=>12,
-44=>13,
-45=>14,
-46=>15,
-47=>16,
-48=>17,
-49=>18,
-50=>19,
-51=>20,
-52=>21,
-53=>22,
-54=>23,
-55=>24,
-56=>25,
-57=>26,
-58=>27,
-59=>28,
-60=>29,
-61=>30,
-62=>31,
-63=>32,
-64=>33,
-65=>34,
-66=>35,
-67=>36,
-68=>37,
-69=>38,
-70=>39,
-71=>40,
-72=>41,
-73=>42,
-74=>43,
-75=>44,
-76=>45,
-77=>46,
-78=>47,
-79=>48,
-80=>49,
-81=>50,
-82=>51,
-83=>52,
-84=>53,
-85=>54,
-86=>55,
-87=>56,
-88=>57,
-89=>58,
-90=>59,
-91=>60,
-92=>61,
-93=>62,
-94=>63,
-95=>64,
-96=>65,
-97=>66,
-98=>67,
-99=>68,
-100=>69,
-101=>70,
-102=>71,
-103=>72,
-104=>73,
-105=>74,
-106=>75,
-107=>76,
-108=>77,
-109=>78,
-110=>79,
-111=>80,
-112=>81,
-113=>82,
-114=>83,
-115=>84,
-116=>85,
-117=>86,
-118=>87,
-119=>88,
-120=>89,
-121=>90,
-122=>91,
-123=>92,
-124=>93,
-125=>94,
-126=>95,
-12288=>99,
-65292=>100,
-12289=>101,
-12290=>102,
-65294=>103,
-8226=>104,
-8231=>104,
-65307=>105,
-65306=>106,
-65311=>107,
-65281=>108,
-65072=>109,
-8230=>110,
-8943=>110,
-8229=>111,
-65104=>112,
-65380=>113,
-65105=>113,
-65106=>114,
-183=>115,
-65108=>116,
-65109=>117,
-65110=>118,
-65111=>119,
-65372=>120,
-8211=>121,
-65073=>122,
-8212=>123,
-65288=>128,
-65289=>129,
-65077=>130,
-65078=>131,
-65371=>132,
-65373=>133,
-65079=>134,
-65080=>135,
-12308=>136,
-12309=>137,
-65081=>138,
-65082=>139,
-12304=>140,
-12305=>141,
-65083=>142,
-65084=>143,
-12298=>144,
-12299=>145,
-65085=>146,
-65086=>147,
-12296=>148,
-12297=>149,
-65087=>150,
-65088=>151,
-12300=>152,
-12301=>153,
-65089=>154,
-65090=>155,
-12302=>156,
-12303=>157,
-65091=>158,
-65092=>159,
-65113=>160,
-65114=>161,
-65115=>162,
-65116=>163,
-65117=>164,
-65118=>165,
-8216=>166,
-8217=>167,
-8220=>168,
-8221=>169,
-12317=>170,
-12318=>171,
-8245=>172,
-8242=>173,
-65283=>174,
-65286=>175,
-65290=>176,
-8251=>177,
-167=>178,
-12291=>179,
-9675=>180,
-9679=>181,
-9651=>182,
-9650=>183,
-9678=>184,
-9734=>185,
-9733=>186,
-9671=>187,
-9670=>188,
-9633=>189,
-9632=>190,
-9661=>191,
-9660=>192,
-12963=>193,
-8453=>194,
-175=>195,
-772=>195,
-8254=>195,
-65507=>196,
-65343=>197,
-717=>198,
-65097=>199,
-65098=>200,
-65101=>201,
-65102=>202,
-65099=>203,
-65100=>204,
-65119=>205,
-65120=>206,
-65121=>207,
-65291=>208,
-65293=>209,
-215=>210,
-247=>211,
-177=>212,
-8730=>213,
-65308=>214,
-65310=>215,
-65309=>216,
-8806=>217,
-8807=>218,
-8800=>219,
-8734=>220,
-8786=>221,
-8801=>222,
-65122=>223,
-65123=>224,
-65124=>225,
-65125=>226,
-65126=>227,
-8764=>228,
-65374=>228,
-8745=>229,
-8746=>230,
-8869=>231,
-8736=>232,
-8735=>233,
-8895=>234,
-13266=>235,
-13265=>236,
-8747=>237,
-8750=>238,
-8757=>239,
-8756=>240,
-9792=>241,
-9794=>242,
-8853=>243,
-9793=>243,
-8857=>244,
-9737=>244,
-8593=>245,
-8595=>246,
-8594=>247,
-8592=>248,
-8598=>249,
-8599=>250,
-8601=>251,
-8600=>252,
-8741=>253,
-8739=>254,
-8725=>257,
-65295=>257,
-65128=>258,
-65340=>258,
-65284=>259,
-165=>260,
-65509=>260,
-12306=>261,
-162=>262,
-65504=>262,
-163=>263,
-65505=>263,
-65285=>264,
-65312=>265,
-8451=>266,
-8457=>267,
-65129=>268,
-65130=>269,
-65131=>270,
-13269=>271,
-13212=>272,
-13213=>273,
-13214=>274,
-13262=>275,
-13217=>276,
-13198=>277,
-13199=>278,
-13252=>279,
-176=>280,
-20825=>281,
-58834=>281,
-20827=>282,
-58835=>282,
-20830=>283,
-58837=>283,
-20829=>284,
-58836=>284,
-20833=>285,
-20835=>286,
-21991=>287,
-29929=>288,
-58044=>288,
-31950=>289,
-58191=>289,
-9601=>290,
-9602=>291,
-9603=>292,
-9604=>293,
-9605=>294,
-9606=>295,
-9607=>296,
-9608=>297,
-9615=>298,
-9614=>299,
-9613=>300,
-9612=>301,
-9611=>302,
-9610=>303,
-9609=>304,
-9532=>305,
-9524=>306,
-9516=>307,
-9508=>308,
-9500=>309,
-9620=>310,
-9472=>311,
-9474=>312,
-9621=>313,
-9484=>314,
-9488=>315,
-9492=>316,
-9496=>317,
-9581=>318,
-9582=>319,
-9584=>320,
-9583=>321,
-9552=>322,
-9566=>323,
-9578=>324,
-9569=>325,
-9698=>326,
-9699=>327,
-9701=>328,
-9700=>329,
-9585=>330,
-9586=>331,
-9587=>332,
-65296=>333,
-65297=>334,
-65298=>335,
-65299=>336,
-65300=>337,
-65301=>338,
-65302=>339,
-65303=>340,
-65304=>341,
-65305=>342,
-8544=>343,
-8545=>344,
-8546=>345,
-8547=>346,
-8548=>347,
-8549=>348,
-8550=>349,
-8551=>350,
-8552=>351,
-8553=>352,
-12321=>353,
-12322=>354,
-12323=>355,
-12324=>356,
-12325=>357,
-12326=>358,
-12327=>359,
-12328=>360,
-12329=>361,
-12344=>362,
-21316=>363,
-57443=>363,
-12345=>363,
-12346=>364,
-65313=>365,
-65314=>366,
-65315=>367,
-65316=>368,
-65317=>369,
-65318=>370,
-65319=>371,
-65320=>372,
-65321=>373,
-65322=>374,
-65323=>375,
-65324=>376,
-65325=>377,
-65326=>378,
-65327=>379,
-65328=>380,
-65329=>381,
-65330=>382,
-65331=>383,
-65332=>384,
-65333=>385,
-65334=>386,
-65335=>387,
-65336=>388,
-65337=>389,
-65338=>390,
-65345=>391,
-65346=>392,
-65347=>393,
-65348=>394,
-65349=>395,
-65350=>396,
-65351=>397,
-65352=>398,
-65353=>399,
-65354=>400,
-65355=>401,
-65356=>402,
-65357=>403,
-65358=>404,
-65359=>405,
-65360=>406,
-65361=>407,
-65362=>408,
-65363=>409,
-65364=>410,
-65365=>411,
-65366=>412,
-65367=>413,
-65368=>414,
-65369=>415,
-65370=>416,
-913=>417,
-914=>418,
-915=>419,
-916=>420,
-917=>421,
-918=>422,
-919=>423,
-920=>424,
-921=>425,
-922=>426,
-923=>427,
-924=>428,
-925=>429,
-926=>430,
-927=>431,
-928=>432,
-929=>433,
-931=>434,
-932=>435,
-933=>436,
-934=>437,
-935=>438,
-936=>439,
-937=>440,
-945=>441,
-946=>442,
-947=>443,
-948=>444,
-949=>445,
-950=>446,
-951=>447,
-952=>448,
-953=>449,
-954=>450,
-955=>451,
-956=>452,
-957=>453,
-958=>454,
-959=>455,
-960=>456,
-961=>457,
-963=>458,
-964=>459,
-965=>460,
-966=>461,
-967=>462,
-968=>463,
-969=>464,
-12549=>465,
-12550=>466,
-12551=>467,
-12552=>468,
-12553=>469,
-12554=>470,
-12555=>471,
-12556=>472,
-12557=>473,
-12558=>474,
-12559=>475,
-12560=>476,
-12561=>477,
-12562=>478,
-12563=>479,
-12564=>480,
-12565=>481,
-12566=>482,
-12567=>483,
-12568=>484,
-12569=>485,
-12570=>486,
-12571=>487,
-12572=>488,
-12573=>489,
-12574=>490,
-12575=>491,
-12576=>492,
-12577=>493,
-12578=>494,
-12579=>495,
-12580=>496,
-12581=>497,
-12582=>498,
-12583=>499,
-12584=>500,
-12585=>501,
-729=>502,
-714=>503,
-711=>504,
-780=>504,
-715=>505,
-9312=>506,
-63153=>506,
-9313=>507,
-63154=>507,
-9314=>508,
-63155=>508,
-9315=>509,
-63156=>509,
-9316=>510,
-63157=>510,
-9317=>511,
-63158=>511,
-9318=>512,
-63159=>512,
-9319=>513,
-63160=>513,
-9320=>514,
-63161=>514,
-9321=>515,
-63162=>515,
-9332=>516,
-63163=>516,
-9333=>517,
-63164=>517,
-9334=>518,
-63165=>518,
-9335=>519,
-63166=>519,
-9336=>520,
-63167=>520,
-9337=>521,
-63168=>521,
-9338=>522,
-63169=>522,
-9339=>523,
-63170=>523,
-9340=>524,
-63171=>524,
-9341=>525,
-63172=>525,
-8560=>526,
-63173=>526,
-8561=>527,
-63174=>527,
-8562=>528,
-63175=>528,
-8563=>529,
-63176=>529,
-8564=>530,
-63177=>530,
-8565=>531,
-63178=>531,
-8566=>532,
-63179=>532,
-8567=>533,
-63180=>533,
-8568=>534,
-63181=>534,
-8569=>535,
-63182=>535,
-20008=>536,
-12033=>536,
-20022=>537,
-12034=>537,
-63183=>537,
-20031=>538,
-12035=>538,
-63184=>538,
-12037=>539,
-20101=>539,
-63185=>539,
-12039=>540,
-20128=>540,
-63186=>540,
-20866=>541,
-12044=>541,
-63187=>541,
-20886=>542,
-12045=>542,
-63188=>542,
-20907=>543,
-12046=>543,
-63189=>543,
-12051=>544,
-21241=>544,
-63190=>544,
-12054=>545,
-21304=>545,
-63191=>545,
-12057=>546,
-21353=>546,
-63192=>546,
-12059=>547,
-21430=>547,
-63193=>547,
-12065=>548,
-12066=>548,
-22786=>548,
-22794=>548,
-63194=>548,
-12071=>549,
-23424=>549,
-63195=>549,
-12078=>550,
-24027=>550,
-63196=>550,
-24186=>551,
-12083=>551,
-63197=>551,
-24191=>552,
-12084=>552,
-63198=>552,
-24308=>553,
-12085=>553,
-24400=>554,
-12089=>554,
-63200=>554,
-24417=>555,
-12090=>555,
-63201=>555,
-12097=>556,
-25908=>556,
-63202=>556,
-12102=>557,
-26080=>557,
-30098=>558,
-63204=>558,
-12135=>558,
-30326=>559,
-12136=>559,
-12193=>560,
-36789=>560,
-63206=>560,
-12202=>561,
-38582=>561,
-9216=>562,
-9217=>563,
-9218=>564,
-9219=>565,
-9220=>566,
-9221=>567,
-9222=>568,
-9223=>569,
-9224=>570,
-9225=>571,
-9226=>572,
-9227=>573,
-9228=>574,
-9229=>575,
-9230=>576,
-9231=>577,
-9232=>578,
-9233=>579,
-9234=>580,
-9235=>581,
-9236=>582,
-9237=>583,
-9238=>584,
-9239=>585,
-9240=>586,
-9241=>587,
-9242=>588,
-9243=>589,
-9244=>590,
-9245=>591,
-9246=>592,
-9247=>593,
-9249=>594,
-12032=>595,
-19968=>595,
-12036=>596,
-20057=>596,
-19969=>597,
-19971=>598,
-20035=>599,
-20061=>600,
-20102=>601,
-12038=>602,
-20108=>602,
-20154=>603,
-12040=>603,
-20799=>604,
-12041=>604,
-20837=>605,
-12042=>605,
-20843=>606,
-12043=>606,
-12047=>607,
-20960=>607,
-12049=>608,
-20992=>608,
-20993=>609,
-12050=>610,
-21147=>610,
-12052=>611,
-21269=>611,
-21313=>612,
-12055=>612,
-21340=>613,
-12056=>613,
-12060=>614,
-21448=>614,
-19977=>615,
-19979=>616,
-19976=>617,
-19978=>618,
-20011=>619,
-20024=>620,
-20961=>621,
-20037=>622,
-20040=>623,
-20063=>624,
-20062=>625,
-20110=>626,
-20129=>627,
-20800=>628,
-64012=>628,
-20995=>629,
-21242=>630,
-21315=>631,
-21449=>632,
-12061=>633,
-21475=>633,
-22303=>634,
-12063=>634,
-22763=>635,
-12064=>635,
-22805=>636,
-12067=>636,
-22823=>637,
-12068=>637,
-22899=>638,
-12069=>638,
-12070=>639,
-23376=>639,
-23377=>640,
-23379=>641,
-23544=>642,
-12072=>642,
-23567=>643,
-12073=>643,
-23586=>644,
-12074=>644,
-23608=>645,
-12075=>645,
-12077=>646,
-23665=>646,
-24029=>647,
-24037=>648,
-12079=>648,
-12080=>649,
-24049=>649,
-24050=>650,
-24051=>651,
-24062=>652,
-12081=>652,
-24178=>653,
-12082=>653,
-24318=>654,
-12086=>654,
-24331=>655,
-12087=>655,
-24339=>656,
-12088=>656,
-25165=>657,
-19985=>658,
-19984=>659,
-19981=>660,
-20013=>661,
-20016=>662,
-20025=>663,
-20043=>664,
-23609=>665,
-20104=>666,
-20113=>667,
-20117=>668,
-20114=>669,
-20116=>670,
-20130=>671,
-20161=>672,
-20160=>673,
-20163=>674,
-20166=>675,
-20167=>676,
-20173=>677,
-20170=>678,
-20171=>679,
-20164=>680,
-20803=>681,
-20801=>682,
-20839=>683,
-20845=>684,
-20846=>685,
-20844=>686,
-20887=>687,
-20982=>688,
-20998=>689,
-20999=>690,
-21000=>691,
-21243=>692,
-21246=>693,
-21247=>694,
-21270=>695,
-21305=>696,
-21320=>697,
-21319=>698,
-21317=>699,
-21342=>700,
-21380=>701,
-21451=>702,
-21450=>703,
-21453=>704,
-22764=>705,
-22825=>706,
-22827=>707,
-22826=>708,
-22829=>709,
-23380=>710,
-23569=>711,
-23588=>712,
-23610=>713,
-23663=>714,
-24052=>715,
-24187=>716,
-24319=>717,
-24340=>718,
-24341=>719,
-24515=>720,
-12092=>720,
-25096=>721,
-12093=>721,
-25142=>722,
-12094=>722,
-25163=>723,
-12095=>723,
-25166=>724,
-12096=>725,
-25903=>725,
-25991=>726,
-12098=>726,
-26007=>727,
-12099=>727,
-26020=>728,
-12100=>728,
-26041=>729,
-12101=>729,
-26085=>730,
-12103=>730,
-26352=>731,
-12104=>731,
-26376=>732,
-12105=>732,
-26408=>733,
-12106=>733,
-27424=>734,
-12107=>734,
-27490=>735,
-12108=>735,
-27513=>736,
-12109=>736,
-27595=>737,
-12111=>737,
-27604=>738,
-12112=>738,
-27611=>739,
-12113=>739,
-27663=>740,
-12114=>740,
-27700=>741,
-12116=>741,
-28779=>742,
-12117=>742,
-29226=>743,
-12118=>743,
-29238=>744,
-12119=>744,
-29243=>745,
-12120=>745,
-29255=>746,
-12122=>746,
-29273=>747,
-12123=>747,
-29275=>748,
-12124=>748,
-29356=>749,
-12125=>749,
-29579=>750,
-19993=>751,
-19990=>752,
-19989=>753,
-19988=>754,
-19992=>755,
-20027=>756,
-20045=>757,
-20047=>758,
-20046=>759,
-20197=>760,
-20184=>761,
-20180=>762,
-20181=>763,
-20182=>764,
-20183=>765,
-20195=>766,
-20196=>767,
-20185=>768,
-20190=>769,
-20805=>770,
-20804=>771,
-20873=>772,
-20874=>773,
-20908=>774,
-20985=>775,
-20986=>776,
-20984=>777,
-21002=>778,
-21152=>779,
-21151=>780,
-57435=>781,
-21253=>781,
-21254=>782,
-21271=>783,
-21277=>784,
-20191=>785,
-21322=>786,
-21321=>787,
-21345=>788,
-21344=>789,
-21359=>790,
-21358=>791,
-21435=>792,
-21487=>793,
-21476=>794,
-21491=>795,
-21484=>796,
-21486=>797,
-21481=>798,
-21480=>799,
-21500=>800,
-21496=>801,
-21493=>802,
-21483=>803,
-21478=>804,
-21482=>805,
-21490=>806,
-21489=>807,
-21488=>808,
-21477=>809,
-21485=>810,
-21499=>811,
-22235=>812,
-22234=>813,
-22806=>814,
-22830=>815,
-22833=>816,
-22900=>817,
-22902=>818,
-23381=>819,
-23427=>820,
-23612=>821,
-24040=>822,
-24039=>823,
-24038=>824,
-24066=>825,
-24067=>826,
-24179=>827,
-24188=>828,
-24321=>829,
-24344=>830,
-24343=>831,
-24517=>832,
-25098=>833,
-25171=>834,
-25172=>835,
-25170=>836,
-25169=>837,
-26021=>838,
-26086=>839,
-26414=>840,
-26412=>841,
-26410=>842,
-26411=>843,
-26413=>844,
-27491=>845,
-27597=>846,
-27665=>847,
-27664=>848,
-27704=>849,
-27713=>850,
-27712=>851,
-27710=>852,
-29359=>853,
-29572=>854,
-12126=>854,
-29577=>855,
-12127=>855,
-29916=>856,
-12128=>856,
-29926=>857,
-12129=>857,
-29976=>858,
-12130=>858,
-29983=>859,
-12131=>859,
-12132=>860,
-29992=>860,
-29993=>861,
-12133=>862,
-30000=>862,
-30001=>863,
-30002=>864,
-30003=>865,
-12134=>866,
-30091=>866,
-30333=>867,
-12137=>867,
-30382=>868,
-12138=>868,
-30399=>869,
-12139=>869,
-30446=>870,
-12140=>870,
-30683=>871,
-12141=>871,
-30690=>872,
-12142=>872,
-30707=>873,
-12143=>873,
-31034=>874,
-12144=>874,
-31166=>875,
-12146=>875,
-31348=>876,
-12147=>876,
-31435=>877,
-12148=>877,
-19998=>878,
-19999=>879,
-20050=>880,
-20051=>881,
-20073=>882,
-20121=>883,
-20132=>884,
-20134=>885,
-20133=>886,
-20223=>887,
-20233=>888,
-20249=>889,
-20234=>890,
-20245=>891,
-20237=>892,
-20240=>893,
-20241=>894,
-20239=>895,
-20210=>896,
-20214=>897,
-20219=>898,
-20208=>899,
-20211=>900,
-20221=>901,
-20225=>902,
-20235=>903,
-20809=>904,
-20807=>905,
-20806=>906,
-20808=>907,
-20840=>908,
-20849=>909,
-20877=>910,
-20912=>911,
-21015=>912,
-21009=>913,
-21010=>914,
-21006=>915,
-21014=>916,
-21155=>917,
-21256=>918,
-21281=>919,
-21280=>920,
-21360=>921,
-21361=>922,
-21513=>923,
-21519=>924,
-21516=>925,
-21514=>926,
-21520=>927,
-21505=>928,
-21515=>929,
-21508=>930,
-21521=>931,
-21517=>932,
-21512=>933,
-21507=>934,
-21518=>935,
-21510=>936,
-21522=>937,
-22240=>938,
-22238=>939,
-22237=>940,
-22323=>941,
-22320=>942,
-22312=>943,
-22317=>944,
-22316=>945,
-22319=>946,
-22313=>947,
-22809=>948,
-22810=>949,
-22839=>950,
-22840=>951,
-22916=>952,
-22904=>953,
-22915=>954,
-22909=>955,
-22905=>956,
-22914=>957,
-22913=>958,
-23383=>959,
-23384=>960,
-23431=>961,
-23432=>962,
-23429=>963,
-23433=>964,
-23546=>965,
-23574=>966,
-23673=>967,
-24030=>968,
-24070=>969,
-24182=>970,
-24180=>971,
-24335=>972,
-24347=>973,
-24537=>974,
-24534=>975,
-25102=>976,
-25100=>977,
-25101=>978,
-25104=>979,
-25187=>980,
-25179=>981,
-25176=>982,
-25910=>983,
-26089=>984,
-26088=>985,
-26092=>986,
-26093=>987,
-26354=>988,
-26355=>989,
-26377=>990,
-26429=>991,
-26420=>992,
-26417=>993,
-26421=>994,
-27425=>995,
-27492=>996,
-27515=>997,
-27670=>998,
-27741=>999,
-27735=>1000,
-27737=>1001,
-27743=>1002,
-27744=>1003,
-27728=>1004,
-27733=>1005,
-27745=>1006,
-27739=>1007,
-27725=>1008,
-27726=>1009,
-28784=>1010,
-29279=>1011,
-29277=>1012,
-30334=>1013,
-31481=>1014,
-12149=>1014,
-31859=>1015,
-12150=>1015,
-31992=>1016,
-12151=>1016,
-32566=>1017,
-12152=>1017,
-32650=>1018,
-12154=>1018,
-32701=>1019,
-12155=>1019,
-32769=>1020,
-12156=>1020,
-32771=>1021,
-32780=>1022,
-12157=>1022,
-32786=>1023,
-12158=>1023,
-32819=>1024,
-12159=>1024,
-32895=>1025,
-12160=>1025,
-32905=>1026,
-12161=>1026,
-32907=>1027,
-32908=>1028,
-33251=>1029,
-12162=>1029,
-33258=>1030,
-12163=>1030,
-33267=>1031,
-12164=>1031,
-33276=>1032,
-12165=>1032,
-33292=>1033,
-12166=>1033,
-33307=>1034,
-12167=>1034,
-33311=>1035,
-12168=>1035,
-33390=>1036,
-12169=>1036,
-33394=>1037,
-12170=>1037,
-33406=>1038,
-34411=>1039,
-12173=>1039,
-34880=>1040,
-12174=>1040,
-34892=>1041,
-12175=>1041,
-34915=>1042,
-12176=>1042,
-35199=>1043,
-38433=>1044,
-20018=>1045,
-20136=>1046,
-20301=>1047,
-20303=>1048,
-20295=>1049,
-20311=>1050,
-20318=>1051,
-20276=>1052,
-20315=>1053,
-20309=>1054,
-20272=>1055,
-20304=>1056,
-20305=>1057,
-20285=>1058,
-20282=>1059,
-20280=>1060,
-20291=>1061,
-20308=>1062,
-20284=>1063,
-20294=>1064,
-20323=>1065,
-20316=>1066,
-20320=>1067,
-20271=>1068,
-20302=>1069,
-20278=>1070,
-20313=>1071,
-20317=>1072,
-20296=>1073,
-20314=>1074,
-20812=>1075,
-20811=>1076,
-20813=>1077,
-20853=>1078,
-20918=>1079,
-20919=>1080,
-21029=>1081,
-21028=>1082,
-21033=>1083,
-21034=>1084,
-21032=>1085,
-21163=>1086,
-21161=>1087,
-21162=>1088,
-21164=>1089,
-21283=>1090,
-21363=>1091,
-21365=>1092,
-21533=>1093,
-21549=>1094,
-21534=>1095,
-21566=>1096,
-21542=>1097,
-21582=>1098,
-21543=>1099,
-21574=>1100,
-21571=>1101,
-21555=>1102,
-21576=>1103,
-21570=>1104,
-21531=>1105,
-21545=>1106,
-21578=>1107,
-21561=>1108,
-21563=>1109,
-21560=>1110,
-21550=>1111,
-21557=>1112,
-21558=>1113,
-21536=>1114,
-21564=>1115,
-21568=>1116,
-21553=>1117,
-21547=>1118,
-21535=>1119,
-21548=>1120,
-22250=>1121,
-22256=>1122,
-22244=>1123,
-22251=>1124,
-22346=>1125,
-22353=>1126,
-22336=>1127,
-22349=>1128,
-22343=>1129,
-22350=>1130,
-22334=>1131,
-22352=>1132,
-22351=>1133,
-22331=>1134,
-22767=>1135,
-22846=>1136,
-22941=>1137,
-22930=>1138,
-22952=>1139,
-22942=>1140,
-22947=>1141,
-22937=>1142,
-22934=>1143,
-22925=>1144,
-22948=>1145,
-22931=>1146,
-22922=>1147,
-22949=>1148,
-23389=>1149,
-23388=>1150,
-23386=>1151,
-23387=>1152,
-23436=>1153,
-23435=>1154,
-23439=>1155,
-23596=>1156,
-23616=>1157,
-23617=>1158,
-23615=>1159,
-23614=>1160,
-23696=>1161,
-23697=>1162,
-23700=>1163,
-23692=>1164,
-24043=>1165,
-24076=>1166,
-24207=>1167,
-24199=>1168,
-24202=>1169,
-24311=>1170,
-24324=>1171,
-24351=>1172,
-24420=>1173,
-24418=>1174,
-24439=>1175,
-24441=>1176,
-24536=>1177,
-24524=>1178,
-24535=>1179,
-24525=>1180,
-24561=>1181,
-24555=>1182,
-24568=>1183,
-24554=>1184,
-25106=>1185,
-25105=>1186,
-25220=>1187,
-25239=>1188,
-25238=>1189,
-25216=>1190,
-25206=>1191,
-25225=>1192,
-25197=>1193,
-25226=>1194,
-25212=>1195,
-25214=>1196,
-25209=>1197,
-25203=>1198,
-25234=>1199,
-25199=>1200,
-25240=>1201,
-25198=>1202,
-25237=>1203,
-25235=>1204,
-25233=>1205,
-25222=>1206,
-25913=>1207,
-25915=>1208,
-25912=>1209,
-26097=>1210,
-26356=>1211,
-26463=>1212,
-26446=>1213,
-26447=>1214,
-26448=>1215,
-26449=>1216,
-26460=>1217,
-26454=>1218,
-26462=>1219,
-57801=>1219,
-26441=>1220,
-26438=>1221,
-26464=>1222,
-26451=>1223,
-26455=>1224,
-27493=>1225,
-27599=>1226,
-27714=>1227,
-27742=>1228,
-27801=>1229,
-27777=>1230,
-27784=>1231,
-27785=>1232,
-27781=>1233,
-27803=>1234,
-27754=>1235,
-27770=>1236,
-27792=>1237,
-27760=>1238,
-27788=>1239,
-27752=>1240,
-27798=>1241,
-27794=>1242,
-27773=>1243,
-27779=>1244,
-27762=>1245,
-27774=>1246,
-27764=>1247,
-27782=>1248,
-27766=>1249,
-27789=>1250,
-27796=>1251,
-27800=>1252,
-27778=>1253,
-28790=>1254,
-28796=>1255,
-28797=>1256,
-28792=>1257,
-29282=>1258,
-29281=>1259,
-29280=>1260,
-29380=>1261,
-29378=>1262,
-29590=>1263,
-29996=>1264,
-29995=>1265,
-30007=>1266,
-30008=>1267,
-30338=>1268,
-30447=>1269,
-30691=>1270,
-31169=>1271,
-31168=>1272,
-31167=>1273,
-31350=>1274,
-31995=>1275,
-32597=>1276,
-32918=>1277,
-32915=>1278,
-32925=>1279,
-32920=>1280,
-32923=>1281,
-32922=>1282,
-32946=>1283,
-33391=>1284,
-33426=>1285,
-33419=>1286,
-33421=>1287,
-35211=>1288,
-12178=>1288,
-35282=>1289,
-12179=>1289,
-35328=>1290,
-12180=>1290,
-35895=>1291,
-12181=>1291,
-35910=>1292,
-12182=>1292,
-35925=>1293,
-12183=>1293,
-35997=>1294,
-12185=>1294,
-36196=>1295,
-12186=>1295,
-36208=>1296,
-12187=>1296,
-36275=>1297,
-12188=>1297,
-36523=>1298,
-12189=>1298,
-36554=>1299,
-12190=>1299,
-36763=>1300,
-12191=>1300,
-36784=>1301,
-12192=>1301,
-36802=>1302,
-36806=>1303,
-36805=>1304,
-36804=>1305,
-24033=>1306,
-12194=>1307,
-37009=>1307,
-37026=>1308,
-37034=>1309,
-37030=>1310,
-37027=>1311,
-37193=>1312,
-12195=>1312,
-37318=>1313,
-12196=>1313,
-37324=>1314,
-12197=>1314,
-38450=>1315,
-38446=>1316,
-38449=>1317,
-38442=>1318,
-38444=>1319,
-20006=>1320,
-20054=>1321,
-20083=>1322,
-20107=>1323,
-20123=>1324,
-20126=>1325,
-20139=>1326,
-20140=>1327,
-20335=>1328,
-20381=>1329,
-20365=>1330,
-20339=>1331,
-20351=>1332,
-20332=>1333,
-20379=>1334,
-20363=>1335,
-20358=>1336,
-20355=>1337,
-20336=>1338,
-20341=>1339,
-20360=>1340,
-20329=>1341,
-20347=>1342,
-20374=>1343,
-20350=>1344,
-20367=>1345,
-20369=>1346,
-20346=>1347,
-20820=>1348,
-20818=>1349,
-20821=>1350,
-20841=>1351,
-20855=>1352,
-20854=>1353,
-20856=>1354,
-20925=>1355,
-20989=>1356,
-21051=>1357,
-21048=>1358,
-21047=>1359,
-21050=>1360,
-21040=>1361,
-21038=>1362,
-21046=>1363,
-21057=>1364,
-21182=>1365,
-21179=>1366,
-21330=>1367,
-21332=>1368,
-21331=>1369,
-21329=>1370,
-21350=>1371,
-21367=>1372,
-21368=>1373,
-21369=>1374,
-21462=>1375,
-21460=>1376,
-21463=>1377,
-21619=>1378,
-21621=>1379,
-21654=>1380,
-21624=>1381,
-21653=>1382,
-21632=>1383,
-21627=>1384,
-21623=>1385,
-21636=>1386,
-21650=>1387,
-21638=>1388,
-21628=>1389,
-21648=>1390,
-21617=>1391,
-21622=>1392,
-21644=>1393,
-21658=>1394,
-21602=>1395,
-21608=>1396,
-21643=>1397,
-21629=>1398,
-21646=>1399,
-22266=>1400,
-22403=>1401,
-22391=>1402,
-22378=>1403,
-22377=>1404,
-22369=>1405,
-22374=>1406,
-22372=>1407,
-22396=>1408,
-22812=>1409,
-22857=>1410,
-22855=>1411,
-22856=>1412,
-22852=>1413,
-22868=>1414,
-22974=>1415,
-22971=>1416,
-22996=>1417,
-22969=>1418,
-22958=>1419,
-22993=>1420,
-22982=>1421,
-22992=>1422,
-22989=>1423,
-22987=>1424,
-22995=>1425,
-22986=>1426,
-22959=>1427,
-22963=>1428,
-22994=>1429,
-22981=>1430,
-23391=>1431,
-23396=>1432,
-23395=>1433,
-23447=>1434,
-23450=>1435,
-23448=>1436,
-23452=>1437,
-23449=>1438,
-23451=>1439,
-23578=>1440,
-23624=>1441,
-23621=>1442,
-23622=>1443,
-23735=>1444,
-23713=>1445,
-23736=>1446,
-23721=>1447,
-23723=>1448,
-23729=>1449,
-23731=>1450,
-24088=>1451,
-24090=>1452,
-24086=>1453,
-24085=>1454,
-24091=>1455,
-24081=>1456,
-24184=>1457,
-24218=>1458,
-24215=>1459,
-24220=>1460,
-24213=>1461,
-24214=>1462,
-24310=>1463,
-24358=>1464,
-24359=>1465,
-24361=>1466,
-24448=>1467,
-24449=>1468,
-24447=>1469,
-24444=>1470,
-24541=>1471,
-24544=>1472,
-24573=>1473,
-24565=>1474,
-24575=>1475,
-24591=>1476,
-24596=>1477,
-24623=>1478,
-24629=>1479,
-24598=>1480,
-24618=>1481,
-24597=>1482,
-24609=>1483,
-24615=>1484,
-24617=>1485,
-24619=>1486,
-24603=>1487,
-25110=>1488,
-25109=>1489,
-25151=>1490,
-25150=>1491,
-25152=>1492,
-25215=>1493,
-25289=>1494,
-25292=>1495,
-25284=>1496,
-25279=>1497,
-25282=>1498,
-25273=>1499,
-25298=>1500,
-25307=>1501,
-25259=>1502,
-25299=>1503,
-25300=>1504,
-25291=>1505,
-25288=>1506,
-25256=>1507,
-25277=>1508,
-25276=>1509,
-25296=>1510,
-60582=>1510,
-25305=>1511,
-25287=>1512,
-25293=>1513,
-25269=>1514,
-25306=>1515,
-25265=>1516,
-25304=>1517,
-25302=>1518,
-25303=>1519,
-25286=>1520,
-25260=>1521,
-25294=>1522,
-61010=>1522,
-25918=>1523,
-26023=>1524,
-26044=>1525,
-26106=>1526,
-26132=>1527,
-26131=>1528,
-26124=>1529,
-26118=>1530,
-26114=>1531,
-26126=>1532,
-26112=>1533,
-26127=>1534,
-26133=>1535,
-26122=>1536,
-26119=>1537,
-26381=>1538,
-26379=>1539,
-26477=>1540,
-26507=>1541,
-26517=>1542,
-26481=>1543,
-26524=>1544,
-26483=>1545,
-26487=>1546,
-26503=>1547,
-26525=>1548,
-26519=>1549,
-26479=>1550,
-26480=>1551,
-26495=>1552,
-26505=>1553,
-26494=>1554,
-26512=>1555,
-26485=>1556,
-26522=>1557,
-26515=>1558,
-26492=>1559,
-26474=>1560,
-26482=>1561,
-27427=>1562,
-27494=>1563,
-27495=>1564,
-27519=>1565,
-27667=>1566,
-27675=>1567,
-27875=>1568,
-27880=>1569,
-27891=>1570,
-27825=>1571,
-27852=>1572,
-27877=>1573,
-27827=>1574,
-27837=>1575,
-27838=>1576,
-27836=>1577,
-27874=>1578,
-27819=>1579,
-27861=>1580,
-27859=>1581,
-27832=>1582,
-27844=>1583,
-27833=>1584,
-27841=>1585,
-27822=>1586,
-27863=>1587,
-27845=>1588,
-27889=>1589,
-27839=>1590,
-27835=>1591,
-27873=>1592,
-27867=>1593,
-27850=>1594,
-27820=>1595,
-27887=>1596,
-27868=>1597,
-27862=>1598,
-27872=>1599,
-28821=>1600,
-28814=>1601,
-28818=>1602,
-28810=>1603,
-28825=>1604,
-29228=>1605,
-29229=>1606,
-29240=>1607,
-29256=>1608,
-29287=>1609,
-29289=>1610,
-29376=>1611,
-29390=>1612,
-29401=>1613,
-29399=>1614,
-29392=>1615,
-29609=>1616,
-29608=>1617,
-29599=>1618,
-29611=>1619,
-29605=>1620,
-30013=>1621,
-30109=>1622,
-30105=>1623,
-30106=>1624,
-30340=>1625,
-30402=>1626,
-30450=>1627,
-30452=>1628,
-30693=>1629,
-30717=>1630,
-31038=>1631,
-31040=>1632,
-31041=>1633,
-31177=>1634,
-31176=>1635,
-31354=>1636,
-31353=>1637,
-31482=>1638,
-31998=>1639,
-32596=>1640,
-32652=>1641,
-32651=>1642,
-32773=>1643,
-58236=>1643,
-32954=>1644,
-32933=>1645,
-32930=>1646,
-32945=>1647,
-32929=>1648,
-32939=>1649,
-32937=>1650,
-32948=>1651,
-32938=>1652,
-32943=>1653,
-33253=>1654,
-33278=>1655,
-33293=>1656,
-33459=>1657,
-33437=>1658,
-33433=>1659,
-33453=>1660,
-33469=>1661,
-33439=>1662,
-33465=>1663,
-33457=>1664,
-33452=>1665,
-33445=>1666,
-33455=>1667,
-33464=>1668,
-33443=>1669,
-33456=>1670,
-33470=>1671,
-33463=>1672,
-34382=>1673,
-34417=>1674,
-21021=>1675,
-34920=>1676,
-36555=>1677,
-36814=>1678,
-36820=>1679,
-36817=>1680,
-37045=>1681,
-37048=>1682,
-37041=>1683,
-37046=>1684,
-37319=>1685,
-37329=>1686,
-12198=>1686,
-38263=>1687,
-12199=>1687,
-38272=>1688,
-12200=>1688,
-38428=>1689,
-12201=>1689,
-38464=>1690,
-38463=>1691,
-38459=>1692,
-38468=>1693,
-38466=>1694,
-38585=>1695,
-12203=>1695,
-38632=>1696,
-12204=>1696,
-38738=>1697,
-12206=>1698,
-38750=>1698,
-20127=>1699,
-20141=>1700,
-20142=>1701,
-20449=>1702,
-20405=>1703,
-20399=>1704,
-20415=>1705,
-20448=>1706,
-20433=>1707,
-20431=>1708,
-20445=>1709,
-20419=>1710,
-20406=>1711,
-20440=>1712,
-20447=>1713,
-20426=>1714,
-20439=>1715,
-20398=>1716,
-20432=>1717,
-20420=>1718,
-20418=>1719,
-20442=>1720,
-20430=>1721,
-20446=>1722,
-20407=>1723,
-20823=>1724,
-20882=>1725,
-20881=>1726,
-20896=>1727,
-21070=>1728,
-21059=>1729,
-21066=>1730,
-21069=>1731,
-21068=>1732,
-21067=>1733,
-21063=>1734,
-21191=>1735,
-21193=>1736,
-21187=>1737,
-21185=>1738,
-21261=>1739,
-21335=>1740,
-21371=>1741,
-21402=>1742,
-21467=>1743,
-21676=>1744,
-21696=>1745,
-21672=>1746,
-21710=>1747,
-21705=>1748,
-21688=>1749,
-21670=>1750,
-21683=>1751,
-21703=>1752,
-21698=>1753,
-21693=>1754,
-21674=>1755,
-21697=>1756,
-21700=>1757,
-21704=>1758,
-21679=>1759,
-21675=>1760,
-21681=>1761,
-21691=>1762,
-21673=>1763,
-21671=>1764,
-21695=>1765,
-22271=>1766,
-22402=>1767,
-22411=>1768,
-22432=>1769,
-22435=>1770,
-22434=>1771,
-22478=>1772,
-22446=>1773,
-22419=>1774,
-22869=>1775,
-22865=>1776,
-22863=>1777,
-22862=>1778,
-22864=>1779,
-23004=>1780,
-23000=>1781,
-23039=>1782,
-23011=>1783,
-23016=>1784,
-23043=>1785,
-23013=>1786,
-23018=>1787,
-23002=>1788,
-23014=>1789,
-23041=>1790,
-23035=>1791,
-23401=>1792,
-23459=>1793,
-23462=>1794,
-23460=>1795,
-23458=>1796,
-23461=>1797,
-23553=>1798,
-23630=>1799,
-23631=>1800,
-23629=>1801,
-23627=>1802,
-23769=>1803,
-23762=>1804,
-24055=>1805,
-24093=>1806,
-24101=>1807,
-24095=>1808,
-24189=>1809,
-24224=>1810,
-24230=>1811,
-24314=>1812,
-24328=>1813,
-24365=>1814,
-24421=>1815,
-24456=>1816,
-24453=>1817,
-24458=>1818,
-24459=>1819,
-24455=>1820,
-24460=>1821,
-24457=>1822,
-24594=>1823,
-24605=>1824,
-24608=>1825,
-24613=>1826,
-24590=>1827,
-24616=>1828,
-24653=>1829,
-24688=>1830,
-24680=>1831,
-24674=>1832,
-60712=>1832,
-24646=>1833,
-24643=>1834,
-24684=>1835,
-24683=>1836,
-24682=>1837,
-24676=>1838,
-25153=>1839,
-25308=>1840,
-25366=>1841,
-25353=>1842,
-25340=>1843,
-25325=>1844,
-25345=>1845,
-25326=>1846,
-25341=>1847,
-25351=>1848,
-25329=>1849,
-25335=>1850,
-25327=>1851,
-25324=>1852,
-25342=>1853,
-25332=>1854,
-25361=>1855,
-25346=>1856,
-25919=>1857,
-25925=>1858,
-26027=>1859,
-26045=>1860,
-26082=>1861,
-26149=>1862,
-26157=>1863,
-26144=>1864,
-26151=>1865,
-26159=>1866,
-26143=>1867,
-26152=>1868,
-26161=>1869,
-26148=>1870,
-26359=>1871,
-26623=>1872,
-26579=>1873,
-26609=>1874,
-26580=>1875,
-26576=>1876,
-26604=>1877,
-26550=>1878,
-26543=>1879,
-26613=>1880,
-26601=>1881,
-26607=>1882,
-26564=>1883,
-26577=>1884,
-26548=>1885,
-26586=>1886,
-26597=>1887,
-26552=>1888,
-26575=>1889,
-26590=>1890,
-26611=>1891,
-26544=>1892,
-26585=>1893,
-26594=>1894,
-26589=>1895,
-26578=>1896,
-27498=>1897,
-27523=>1898,
-27526=>1899,
-27573=>1900,
-27602=>1901,
-27607=>1902,
-27679=>1903,
-27849=>1904,
-27915=>1905,
-27954=>1906,
-27946=>1907,
-27969=>1908,
-27941=>1909,
-27916=>1910,
-27953=>1911,
-27934=>1912,
-27927=>1913,
-27963=>1914,
-27965=>1915,
-27966=>1916,
-27958=>1917,
-27931=>1918,
-27893=>1919,
-27961=>1920,
-27943=>1921,
-27960=>1922,
-27945=>1923,
-27950=>1924,
-27957=>1925,
-27918=>1926,
-27947=>1927,
-28843=>1928,
-28858=>1929,
-28851=>1930,
-28844=>1931,
-28847=>1932,
-28845=>1933,
-28856=>1934,
-28846=>1935,
-28836=>1936,
-29232=>1937,
-29298=>1938,
-29295=>1939,
-29300=>1940,
-29417=>1941,
-29408=>1942,
-29409=>1943,
-29623=>1944,
-29642=>1945,
-29627=>1946,
-29618=>1947,
-29645=>1948,
-29632=>1949,
-29619=>1950,
-29978=>1951,
-29997=>1952,
-30031=>1953,
-30028=>1954,
-30030=>1955,
-30027=>1956,
-30123=>1957,
-30116=>1958,
-30117=>1959,
-30114=>1960,
-30115=>1961,
-30328=>1962,
-30342=>1963,
-30343=>1964,
-30344=>1965,
-30408=>1966,
-30406=>1967,
-30403=>1968,
-30405=>1969,
-30465=>1970,
-30457=>1971,
-30456=>1972,
-30473=>1973,
-30475=>1974,
-30462=>1975,
-30460=>1976,
-30471=>1977,
-30684=>1978,
-30722=>1979,
-30740=>1980,
-30732=>1981,
-30733=>1982,
-31046=>1983,
-31049=>1984,
-31048=>1985,
-31047=>1986,
-31161=>1987,
-31162=>1988,
-31185=>1989,
-31186=>1990,
-31179=>1991,
-31359=>1992,
-31361=>1993,
-31487=>1994,
-31485=>1995,
-31869=>1996,
-32002=>1997,
-32005=>1998,
-32000=>1999,
-32009=>2000,
-32007=>2001,
-32004=>2002,
-32006=>2003,
-32568=>2004,
-32654=>2005,
-32703=>2006,
-32784=>2007,
-32781=>2008,
-32785=>2009,
-32822=>2010,
-32982=>2011,
-32997=>2012,
-32986=>2013,
-32963=>2014,
-32964=>2015,
-32972=>2016,
-32993=>2017,
-32987=>2018,
-32974=>2019,
-32990=>2020,
-32996=>2021,
-32989=>2022,
-33268=>2023,
-33314=>2024,
-33511=>2025,
-33539=>2026,
-33541=>2027,
-33507=>2028,
-33499=>2029,
-33510=>2030,
-33540=>2031,
-33509=>2032,
-33538=>2033,
-33545=>2034,
-33490=>2035,
-33495=>2036,
-33521=>2037,
-33537=>2038,
-33500=>2039,
-33492=>2040,
-33489=>2041,
-33502=>2042,
-33491=>2043,
-33503=>2044,
-33519=>2045,
-33542=>2046,
-34384=>2047,
-34425=>2048,
-34427=>2049,
-34426=>2050,
-34893=>2051,
-34923=>2052,
-35201=>2053,
-35284=>2054,
-35336=>2055,
-35330=>2056,
-35331=>2057,
-35998=>2058,
-36000=>2059,
-36212=>2060,
-36211=>2061,
-36276=>2062,
-36557=>2063,
-36556=>2064,
-36848=>2065,
-36838=>2066,
-36834=>2067,
-36842=>2068,
-36837=>2069,
-36845=>2070,
-36843=>2071,
-36836=>2072,
-36840=>2073,
-37066=>2074,
-37070=>2075,
-37057=>2076,
-37059=>2077,
-37195=>2078,
-37194=>2079,
-37325=>2080,
-38274=>2081,
-38480=>2082,
-38475=>2083,
-38476=>2084,
-38477=>2085,
-38754=>2086,
-12207=>2086,
-38761=>2087,
-12208=>2087,
-38859=>2088,
-12209=>2088,
-38893=>2089,
-12210=>2089,
-38899=>2090,
-12211=>2090,
-38913=>2091,
-12212=>2091,
-39080=>2092,
-12213=>2092,
-39131=>2093,
-12214=>2093,
-39135=>2094,
-12215=>2094,
-39318=>2095,
-12216=>2095,
-39321=>2096,
-12217=>2096,
-20056=>2097,
-20147=>2098,
-20492=>2099,
-20493=>2100,
-20515=>2101,
-20463=>2102,
-20518=>2103,
-20517=>2104,
-20472=>2105,
-20521=>2106,
-57375=>2106,
-20502=>2107,
-20486=>2108,
-20540=>2109,
-20511=>2110,
-20506=>2111,
-20498=>2112,
-20497=>2113,
-20474=>2114,
-20480=>2115,
-20500=>2116,
-20520=>2117,
-20465=>2118,
-20513=>2119,
-20491=>2120,
-20505=>2121,
-20504=>2122,
-20467=>2123,
-20462=>2124,
-20525=>2125,
-20522=>2126,
-20478=>2127,
-20523=>2128,
-20489=>2129,
-20860=>2130,
-20900=>2131,
-20901=>2132,
-20898=>2133,
-20941=>2134,
-20940=>2135,
-20934=>2136,
-20939=>2137,
-21078=>2138,
-21084=>2139,
-21076=>2140,
-21083=>2141,
-21085=>2142,
-21290=>2143,
-21375=>2144,
-57459=>2144,
-21407=>2145,
-21405=>2146,
-21471=>2147,
-21736=>2148,
-21776=>2149,
-21761=>2150,
-21815=>2151,
-21756=>2152,
-21733=>2153,
-21746=>2154,
-21766=>2155,
-21754=>2156,
-21780=>2157,
-21737=>2158,
-21741=>2159,
-21729=>2160,
-21769=>2161,
-21742=>2162,
-21738=>2163,
-21734=>2164,
-21799=>2165,
-21767=>2166,
-21757=>2167,
-21775=>2168,
-22275=>2169,
-22276=>2170,
-22466=>2171,
-22484=>2172,
-22475=>2173,
-22467=>2174,
-22537=>2175,
-22799=>2176,
-22871=>2177,
-22872=>2178,
-22874=>2179,
-23057=>2180,
-23064=>2181,
-23068=>2182,
-23071=>2183,
-23067=>2184,
-23059=>2185,
-23020=>2186,
-23072=>2187,
-23075=>2188,
-23081=>2189,
-23077=>2190,
-23052=>2191,
-23049=>2192,
-23403=>2193,
-23640=>2194,
-23472=>2195,
-23475=>2196,
-23478=>2197,
-23476=>2198,
-23470=>2199,
-23477=>2200,
-23481=>2201,
-23480=>2202,
-23556=>2203,
-23633=>2204,
-23637=>2205,
-23632=>2206,
-23789=>2207,
-23805=>2208,
-23803=>2209,
-23786=>2210,
-23784=>2211,
-23792=>2212,
-23798=>2213,
-23809=>2214,
-23796=>2215,
-24046=>2216,
-24109=>2217,
-24107=>2218,
-24235=>2219,
-24237=>2220,
-24231=>2221,
-24369=>2222,
-24466=>2223,
-24465=>2224,
-24464=>2225,
-24665=>2226,
-24675=>2227,
-24677=>2228,
-24656=>2229,
-24661=>2230,
-24685=>2231,
-24681=>2232,
-24687=>2233,
-24708=>2234,
-24735=>2235,
-24730=>2236,
-24717=>2237,
-24724=>2238,
-24716=>2239,
-24709=>2240,
-24726=>2241,
-25159=>2242,
-25331=>2243,
-25352=>2244,
-25343=>2245,
-25422=>2246,
-25406=>2247,
-25391=>2248,
-25429=>2249,
-25410=>2250,
-25414=>2251,
-25423=>2252,
-25417=>2253,
-25402=>2254,
-25424=>2255,
-25405=>2256,
-25386=>2257,
-25387=>2258,
-25384=>2259,
-25421=>2260,
-25420=>2261,
-25928=>2262,
-25929=>2263,
-26009=>2264,
-26049=>2265,
-26053=>2266,
-26178=>2267,
-26185=>2268,
-26191=>2269,
-26179=>2270,
-26194=>2271,
-26188=>2272,
-26181=>2273,
-26177=>2274,
-26360=>2275,
-26388=>2276,
-26389=>2277,
-26391=>2278,
-26657=>2279,
-26680=>2280,
-26696=>2281,
-26694=>2282,
-26707=>2283,
-26681=>2284,
-26690=>2285,
-26708=>2286,
-26665=>2287,
-26803=>2288,
-26647=>2289,
-26700=>2290,
-26705=>2291,
-26685=>2292,
-26612=>2293,
-26704=>2294,
-26688=>2295,
-26684=>2296,
-26691=>2297,
-26666=>2298,
-26693=>2299,
-26643=>2300,
-26648=>2301,
-26689=>2302,
-27530=>2303,
-27529=>2304,
-27575=>2305,
-27683=>2306,
-27687=>2307,
-27688=>2308,
-27686=>2309,
-27684=>2310,
-27888=>2311,
-28010=>2312,
-28053=>2313,
-28040=>2314,
-28039=>2315,
-28006=>2316,
-28024=>2317,
-28023=>2318,
-27993=>2319,
-28051=>2320,
-28012=>2321,
-28041=>2322,
-28014=>2323,
-27994=>2324,
-28020=>2325,
-28009=>2326,
-28044=>2327,
-28042=>2328,
-28025=>2329,
-28037=>2330,
-28005=>2331,
-28052=>2332,
-28874=>2333,
-28888=>2334,
-28900=>2335,
-28889=>2336,
-28872=>2337,
-28879=>2338,
-29241=>2339,
-29305=>2340,
-29436=>2341,
-29433=>2342,
-29437=>2343,
-29432=>2344,
-29431=>2345,
-29574=>2346,
-29677=>2347,
-29705=>2348,
-29678=>2349,
-29664=>2350,
-29674=>2351,
-29662=>2352,
-30036=>2353,
-30045=>2354,
-30044=>2355,
-30042=>2356,
-30041=>2357,
-30142=>2358,
-30149=>2359,
-30151=>2360,
-30130=>2361,
-30131=>2362,
-30141=>2363,
-30140=>2364,
-30137=>2365,
-30146=>2366,
-30136=>2367,
-30347=>2368,
-30384=>2369,
-30410=>2370,
-30413=>2371,
-30414=>2372,
-30505=>2373,
-30495=>2374,
-30496=>2375,
-30504=>2376,
-30697=>2377,
-30768=>2378,
-30759=>2379,
-30776=>2380,
-30749=>2381,
-30772=>2382,
-30775=>2383,
-30757=>2384,
-30765=>2385,
-30752=>2386,
-30751=>2387,
-30770=>2388,
-31061=>2389,
-31056=>2390,
-31072=>2391,
-31071=>2392,
-31062=>2393,
-31070=>2394,
-31069=>2395,
-31063=>2396,
-31066=>2397,
-31204=>2398,
-31203=>2399,
-60418=>2399,
-31207=>2400,
-31199=>2401,
-31206=>2402,
-31209=>2403,
-31192=>2404,
-31364=>2405,
-31368=>2406,
-31449=>2407,
-31494=>2408,
-31505=>2409,
-31881=>2410,
-32033=>2411,
-32023=>2412,
-32011=>2413,
-32010=>2414,
-32032=>2415,
-32034=>2416,
-32020=>2417,
-32016=>2418,
-32021=>2419,
-32026=>2420,
-32028=>2421,
-32013=>2422,
-32025=>2423,
-32027=>2424,
-32570=>2425,
-32607=>2426,
-32660=>2427,
-32709=>2428,
-32705=>2429,
-32774=>2430,
-32772=>2431,
-32792=>2432,
-32789=>2433,
-32793=>2434,
-32791=>2435,
-32829=>2436,
-32831=>2437,
-33009=>2438,
-33026=>2439,
-33008=>2440,
-33029=>2441,
-33005=>2442,
-33012=>2443,
-33030=>2444,
-33016=>2445,
-33011=>2446,
-33032=>2447,
-33021=>2448,
-33034=>2449,
-33020=>2450,
-33007=>2451,
-33261=>2452,
-33260=>2453,
-33280=>2454,
-33296=>2455,
-33322=>2456,
-33323=>2457,
-33320=>2458,
-33324=>2459,
-33467=>2460,
-33579=>2461,
-33618=>2462,
-33620=>2463,
-33610=>2464,
-33592=>2465,
-33616=>2466,
-33609=>2467,
-33589=>2468,
-33588=>2469,
-33615=>2470,
-33586=>2471,
-33593=>2472,
-33590=>2473,
-33559=>2474,
-33600=>2475,
-33585=>2476,
-33576=>2477,
-33603=>2478,
-34388=>2479,
-34442=>2480,
-34474=>2481,
-34451=>2482,
-34468=>2483,
-34473=>2484,
-34444=>2485,
-34467=>2486,
-34460=>2487,
-34928=>2488,
-34935=>2489,
-34945=>2490,
-34946=>2491,
-34941=>2492,
-34937=>2493,
-35352=>2494,
-35344=>2495,
-35342=>2496,
-35340=>2497,
-35349=>2498,
-35338=>2499,
-35351=>2500,
-35347=>2501,
-35350=>2502,
-35343=>2503,
-35345=>2504,
-35912=>2505,
-35962=>2506,
-35961=>2507,
-36001=>2508,
-36002=>2509,
-36215=>2510,
-58442=>2510,
-36524=>2511,
-36562=>2512,
-36564=>2513,
-36559=>2514,
-36785=>2515,
-36865=>2516,
-36870=>2517,
-36855=>2518,
-36864=>2519,
-36858=>2520,
-36852=>2521,
-36867=>2522,
-36861=>2523,
-36869=>2524,
-36856=>2525,
-37013=>2526,
-37089=>2527,
-37085=>2528,
-37090=>2529,
-37202=>2530,
-37197=>2531,
-37196=>2532,
-37336=>2533,
-37341=>2534,
-37335=>2535,
-37340=>2536,
-37337=>2537,
-38275=>2538,
-38498=>2539,
-38499=>2540,
-38497=>2541,
-38491=>2542,
-38493=>2543,
-38500=>2544,
-38488=>2545,
-38494=>2546,
-38587=>2547,
-39138=>2548,
-39340=>2549,
-12218=>2549,
-39592=>2550,
-12219=>2550,
-39640=>2551,
-12220=>2551,
-12222=>2552,
-39717=>2552,
-39730=>2553,
-12224=>2553,
-39740=>2554,
-12225=>2554,
-20094=>2555,
-20602=>2556,
-20605=>2557,
-57382=>2557,
-20572=>2558,
-20551=>2559,
-20547=>2560,
-20556=>2561,
-20570=>2562,
-20553=>2563,
-20581=>2564,
-20598=>2565,
-20558=>2566,
-20565=>2567,
-20597=>2568,
-20596=>2569,
-20599=>2570,
-20559=>2571,
-20495=>2572,
-20591=>2573,
-20589=>2574,
-20828=>2575,
-20885=>2576,
-20976=>2577,
-21098=>2578,
-21103=>2579,
-21202=>2580,
-21209=>2581,
-21208=>2582,
-21205=>2583,
-21264=>2584,
-21263=>2585,
-21273=>2586,
-21311=>2587,
-21312=>2588,
-21310=>2589,
-21443=>2590,
-26364=>2591,
-21830=>2592,
-21866=>2593,
-21862=>2594,
-21828=>2595,
-21854=>2596,
-21857=>2597,
-21827=>2598,
-21834=>2599,
-21809=>2600,
-21846=>2601,
-21839=>2602,
-21845=>2603,
-21807=>2604,
-21860=>2605,
-21816=>2606,
-21806=>2607,
-21852=>2608,
-21804=>2609,
-21859=>2610,
-21811=>2611,
-21825=>2612,
-21847=>2613,
-22280=>2614,
-22283=>2615,
-22281=>2616,
-22495=>2617,
-22533=>2618,
-22538=>2619,
-22534=>2620,
-22496=>2621,
-22500=>2622,
-22522=>2623,
-22530=>2624,
-22581=>2625,
-22519=>2626,
-22521=>2627,
-22816=>2628,
-22882=>2629,
-23094=>2630,
-23105=>2631,
-23113=>2632,
-23142=>2633,
-23146=>2634,
-23104=>2635,
-23100=>2636,
-23138=>2637,
-23130=>2638,
-23110=>2639,
-23114=>2640,
-23408=>2641,
-23495=>2642,
-23493=>2643,
-23492=>2644,
-23490=>2645,
-23487=>2646,
-23494=>2647,
-23561=>2648,
-23560=>2649,
-23559=>2650,
-23648=>2651,
-23644=>2652,
-23645=>2653,
-23815=>2654,
-23814=>2655,
-23822=>2656,
-23835=>2657,
-23830=>2658,
-23842=>2659,
-23825=>2660,
-23849=>2661,
-23828=>2662,
-23833=>2663,
-23844=>2664,
-23847=>2665,
-23831=>2666,
-24034=>2667,
-24120=>2668,
-24118=>2669,
-24115=>2670,
-24119=>2671,
-24247=>2672,
-24248=>2673,
-24246=>2674,
-24245=>2675,
-24254=>2676,
-24373=>2677,
-24375=>2678,
-24407=>2679,
-24428=>2680,
-24425=>2681,
-24427=>2682,
-24471=>2683,
-24473=>2684,
-24478=>2685,
-24472=>2686,
-24481=>2687,
-24480=>2688,
-24476=>2689,
-24703=>2690,
-24739=>2691,
-24713=>2692,
-24736=>2693,
-24744=>2694,
-24779=>2695,
-24756=>2696,
-24806=>2697,
-24765=>2698,
-24773=>2699,
-24763=>2700,
-24757=>2701,
-24796=>2702,
-24764=>2703,
-24792=>2704,
-24789=>2705,
-24774=>2706,
-24799=>2707,
-24760=>2708,
-24794=>2709,
-24775=>2710,
-25114=>2711,
-25115=>2712,
-25160=>2713,
-25504=>2714,
-25511=>2715,
-25458=>2716,
-25494=>2717,
-25506=>2718,
-25509=>2719,
-25463=>2720,
-25447=>2721,
-25496=>2722,
-25514=>2723,
-25457=>2724,
-25513=>2725,
-25481=>2726,
-25475=>2727,
-25499=>2728,
-25451=>2729,
-25512=>2730,
-25476=>2731,
-25480=>2732,
-25497=>2733,
-25505=>2734,
-25516=>2735,
-25490=>2736,
-25487=>2737,
-25472=>2738,
-25467=>2739,
-25449=>2740,
-25448=>2741,
-25466=>2742,
-25949=>2743,
-25942=>2744,
-25937=>2745,
-25945=>2746,
-25943=>2747,
-21855=>2748,
-25935=>2749,
-25944=>2750,
-25941=>2751,
-25940=>2752,
-26012=>2753,
-26011=>2754,
-26028=>2755,
-26063=>2756,
-26059=>2757,
-26060=>2758,
-26062=>2759,
-26205=>2760,
-26202=>2761,
-26212=>2762,
-26216=>2763,
-26214=>2764,
-26206=>2765,
-26361=>2766,
-21207=>2767,
-26395=>2768,
-26753=>2769,
-26799=>2770,
-26786=>2771,
-26771=>2772,
-26805=>2773,
-26751=>2774,
-26742=>2775,
-26801=>2776,
-26791=>2777,
-26775=>2778,
-26800=>2779,
-26755=>2780,
-26820=>2781,
-26797=>2782,
-26758=>2783,
-26757=>2784,
-26772=>2785,
-26781=>2786,
-26792=>2787,
-26783=>2788,
-26785=>2789,
-26754=>2790,
-27442=>2791,
-27578=>2792,
-27627=>2793,
-27628=>2794,
-27691=>2795,
-28046=>2796,
-28092=>2797,
-28147=>2798,
-28121=>2799,
-28082=>2800,
-28129=>2801,
-28108=>2802,
-28132=>2803,
-28155=>2804,
-28154=>2805,
-28165=>2806,
-28103=>2807,
-28107=>2808,
-28079=>2809,
-28113=>2810,
-28078=>2811,
-28126=>2812,
-28153=>2813,
-28088=>2814,
-28151=>2815,
-28149=>2816,
-28101=>2817,
-28114=>2818,
-28186=>2819,
-28085=>2820,
-28122=>2821,
-28139=>2822,
-28120=>2823,
-28138=>2824,
-28145=>2825,
-28142=>2826,
-28136=>2827,
-28102=>2828,
-28100=>2829,
-28074=>2830,
-28140=>2831,
-28095=>2832,
-28134=>2833,
-28921=>2834,
-28937=>2835,
-28938=>2836,
-28925=>2837,
-28911=>2838,
-29245=>2839,
-29309=>2840,
-29313=>2841,
-29468=>2842,
-29467=>2843,
-29462=>2844,
-29459=>2845,
-29465=>2846,
-29575=>2847,
-29701=>2848,
-29706=>2849,
-29699=>2850,
-29702=>2851,
-29694=>2852,
-29709=>2853,
-29920=>2854,
-29942=>2855,
-29943=>2856,
-29980=>2857,
-29986=>2858,
-30053=>2859,
-30054=>2860,
-30050=>2861,
-30064=>2862,
-30095=>2863,
-30164=>2864,
-30165=>2865,
-30133=>2866,
-30154=>2867,
-30157=>2868,
-30350=>2869,
-30420=>2870,
-30418=>2871,
-30427=>2872,
-30519=>2873,
-30526=>2874,
-30524=>2875,
-30518=>2876,
-30520=>2877,
-30522=>2878,
-30827=>2879,
-30787=>2880,
-30798=>2881,
-31077=>2882,
-31080=>2883,
-31085=>2884,
-31227=>2885,
-31378=>2886,
-31381=>2887,
-31520=>2888,
-31528=>2889,
-31515=>2890,
-31532=>2891,
-31526=>2892,
-31513=>2893,
-31518=>2894,
-31534=>2895,
-31890=>2896,
-31895=>2897,
-31893=>2898,
-32070=>2899,
-32067=>2900,
-32113=>2901,
-32046=>2902,
-32057=>2903,
-32060=>2904,
-32064=>2905,
-32048=>2906,
-32051=>2907,
-32068=>2908,
-32047=>2909,
-32066=>2910,
-32050=>2911,
-32049=>2912,
-32573=>2913,
-32670=>2914,
-32666=>2915,
-32716=>2916,
-32718=>2917,
-32722=>2918,
-32796=>2919,
-32842=>2920,
-32838=>2921,
-33071=>2922,
-33046=>2923,
-33059=>2924,
-33067=>2925,
-33065=>2926,
-33072=>2927,
-33060=>2928,
-33282=>2929,
-33333=>2930,
-33335=>2931,
-33334=>2932,
-33337=>2933,
-33678=>2934,
-33694=>2935,
-33688=>2936,
-33656=>2937,
-33698=>2938,
-33686=>2939,
-33725=>2940,
-33707=>2941,
-33682=>2942,
-33674=>2943,
-33683=>2944,
-33673=>2945,
-33696=>2946,
-33655=>2947,
-33659=>2948,
-33660=>2949,
-33670=>2950,
-33703=>2951,
-34389=>2952,
-24426=>2953,
-34503=>2954,
-34496=>2955,
-34486=>2956,
-34500=>2957,
-34485=>2958,
-34502=>2959,
-34507=>2960,
-34481=>2961,
-34479=>2962,
-34505=>2963,
-34899=>2964,
-34974=>2965,
-34952=>2966,
-34987=>2967,
-34962=>2968,
-34966=>2969,
-34957=>2970,
-34955=>2971,
-35219=>2972,
-35215=>2973,
-35370=>2974,
-35357=>2975,
-35363=>2976,
-35365=>2977,
-35377=>2978,
-35373=>2979,
-35359=>2980,
-35355=>2981,
-35362=>2982,
-35913=>2983,
-35930=>2984,
-36009=>2985,
-36012=>2986,
-36011=>2987,
-36008=>2988,
-36010=>2989,
-36007=>2990,
-36199=>2991,
-36198=>2992,
-36286=>2993,
-36282=>2994,
-36571=>2995,
-36575=>2996,
-36889=>2997,
-36877=>2998,
-36890=>2999,
-36887=>3000,
-36899=>3001,
-36895=>3002,
-36893=>3003,
-36880=>3004,
-36885=>3005,
-36894=>3006,
-36896=>3007,
-36879=>3008,
-36898=>3009,
-36886=>3010,
-36891=>3011,
-36884=>3012,
-37096=>3013,
-37101=>3014,
-37117=>3015,
-58488=>3015,
-37207=>3016,
-37326=>3017,
-37365=>3018,
-37350=>3019,
-37347=>3020,
-37351=>3021,
-37357=>3022,
-37353=>3023,
-38281=>3024,
-38506=>3025,
-38517=>3026,
-38515=>3027,
-38520=>3028,
-38512=>3029,
-38516=>3030,
-38518=>3031,
-38519=>3032,
-38508=>3033,
-38592=>3034,
-38634=>3035,
-38633=>3036,
-31456=>3037,
-31455=>3038,
-38914=>3039,
-38915=>3040,
-39770=>3041,
-12226=>3041,
-40165=>3042,
-12227=>3042,
-40565=>3043,
-12228=>3043,
-40575=>3044,
-12229=>3044,
-40613=>3045,
-12230=>3045,
-40635=>3046,
-12231=>3046,
-20642=>3047,
-20621=>3048,
-20613=>3049,
-20633=>3050,
-20625=>3051,
-20608=>3052,
-20630=>3053,
-20632=>3054,
-20634=>3055,
-26368=>3056,
-20977=>3057,
-21106=>3058,
-21108=>3059,
-21109=>3060,
-21097=>3061,
-21214=>3062,
-21213=>3063,
-21211=>3064,
-21338=>3065,
-21413=>3066,
-21883=>3067,
-21888=>3068,
-21927=>3069,
-21884=>3070,
-21898=>3071,
-21917=>3072,
-21912=>3073,
-21890=>3074,
-21916=>3075,
-21930=>3076,
-21908=>3077,
-21895=>3078,
-21899=>3079,
-21891=>3080,
-21939=>3081,
-21934=>3082,
-21919=>3083,
-21822=>3084,
-21938=>3085,
-21914=>3086,
-21947=>3087,
-21932=>3088,
-21937=>3089,
-21886=>3090,
-21897=>3091,
-21931=>3092,
-21913=>3093,
-22285=>3094,
-22575=>3095,
-22570=>3096,
-22580=>3097,
-22564=>3098,
-22576=>3099,
-22577=>3100,
-22561=>3101,
-22557=>3102,
-22560=>3103,
-22777=>3104,
-22778=>3105,
-22880=>3106,
-23159=>3107,
-57587=>3107,
-23194=>3108,
-23167=>3109,
-23186=>3110,
-23195=>3111,
-23207=>3112,
-23411=>3113,
-23409=>3114,
-23506=>3115,
-23500=>3116,
-23507=>3117,
-23504=>3118,
-23562=>3119,
-23563=>3120,
-23601=>3121,
-23884=>3122,
-23888=>3123,
-23860=>3124,
-23879=>3125,
-24061=>3126,
-24133=>3127,
-24125=>3128,
-24128=>3129,
-24131=>3130,
-24190=>3131,
-24266=>3132,
-24257=>3133,
-24258=>3134,
-24260=>3135,
-24380=>3136,
-24429=>3137,
-24489=>3138,
-24490=>3139,
-24488=>3140,
-24785=>3141,
-24801=>3142,
-24754=>3143,
-24758=>3144,
-24800=>3145,
-24860=>3146,
-24867=>3147,
-24826=>3148,
-24853=>3149,
-24816=>3150,
-24827=>3151,
-24820=>3152,
-24936=>3153,
-24817=>3154,
-24846=>3155,
-24822=>3156,
-24841=>3157,
-24832=>3158,
-24850=>3159,
-25119=>3160,
-25161=>3161,
-25507=>3162,
-25484=>3163,
-25551=>3164,
-25536=>3165,
-25577=>3166,
-25545=>3167,
-25542=>3168,
-25549=>3169,
-25554=>3170,
-25571=>3171,
-25552=>3172,
-25569=>3173,
-25558=>3174,
-25581=>3175,
-25582=>3176,
-25462=>3177,
-25588=>3178,
-25578=>3179,
-25563=>3180,
-25682=>3181,
-25562=>3182,
-25593=>3183,
-25950=>3184,
-25958=>3185,
-25954=>3186,
-25955=>3187,
-26001=>3188,
-26000=>3189,
-26031=>3190,
-26222=>3191,
-26224=>3192,
-26228=>3193,
-57786=>3193,
-26230=>3194,
-26223=>3195,
-26257=>3196,
-26234=>3197,
-26238=>3198,
-26231=>3199,
-26366=>3200,
-26367=>3201,
-26399=>3202,
-26397=>3203,
-26874=>3204,
-26837=>3205,
-26848=>3206,
-26840=>3207,
-26839=>3208,
-26885=>3209,
-26847=>3210,
-26869=>3211,
-26862=>3212,
-26855=>3213,
-26873=>3214,
-26834=>3215,
-26866=>3216,
-26851=>3217,
-26827=>3218,
-26829=>3219,
-26893=>3220,
-26898=>3221,
-26894=>3222,
-26825=>3223,
-26842=>3224,
-26990=>3225,
-26875=>3226,
-27454=>3227,
-27450=>3228,
-27453=>3229,
-27544=>3230,
-27542=>3231,
-27580=>3232,
-27631=>3233,
-27694=>3234,
-27695=>3235,
-27692=>3236,
-28207=>3237,
-57904=>3237,
-28216=>3238,
-28244=>3239,
-28193=>3240,
-28210=>3241,
-28263=>3242,
-28234=>3243,
-28192=>3244,
-28197=>3245,
-28195=>3246,
-28187=>3247,
-28251=>3248,
-28248=>3249,
-28196=>3250,
-28246=>3251,
-28270=>3252,
-28205=>3253,
-28198=>3254,
-28271=>3255,
-28212=>3256,
-28237=>3257,
-28218=>3258,
-28204=>3259,
-28227=>3260,
-28189=>3261,
-57901=>3261,
-28222=>3262,
-28363=>3263,
-28297=>3264,
-28185=>3265,
-28238=>3266,
-28259=>3267,
-28228=>3268,
-28274=>3269,
-28265=>3270,
-28255=>3271,
-28953=>3272,
-28954=>3273,
-28966=>3274,
-28976=>3275,
-28961=>3276,
-28982=>3277,
-29038=>3278,
-57958=>3278,
-28956=>3279,
-29260=>3280,
-29316=>3281,
-29312=>3282,
-29494=>3283,
-29477=>3284,
-29492=>3285,
-29481=>3286,
-29754=>3287,
-29738=>3288,
-29747=>3289,
-29730=>3290,
-29733=>3291,
-29749=>3292,
-29750=>3293,
-29748=>3294,
-29743=>3295,
-29723=>3296,
-29734=>3297,
-29736=>3298,
-29989=>3299,
-29990=>3300,
-30059=>3301,
-30058=>3302,
-30178=>3303,
-30171=>3304,
-30179=>3305,
-30169=>3306,
-30168=>3307,
-30174=>3308,
-30176=>3309,
-30331=>3310,
-30332=>3311,
-30358=>3312,
-30355=>3313,
-30388=>3314,
-30428=>3315,
-30543=>3316,
-30701=>3317,
-30813=>3318,
-30828=>3319,
-30831=>3320,
-31245=>3321,
-31240=>3322,
-31243=>3323,
-31237=>3324,
-31232=>3325,
-31384=>3326,
-31383=>3327,
-31382=>3328,
-31461=>3329,
-31459=>3330,
-31561=>3331,
-31574=>3332,
-31558=>3333,
-31568=>3334,
-31570=>3335,
-31572=>3336,
-31565=>3337,
-31563=>3338,
-31567=>3339,
-31569=>3340,
-60510=>3340,
-31903=>3341,
-31909=>3342,
-32094=>3343,
-32080=>3344,
-32104=>3345,
-32085=>3346,
-32043=>3347,
-32110=>3348,
-32114=>3349,
-32097=>3350,
-32102=>3351,
-32098=>3352,
-32112=>3353,
-32115=>3354,
-21892=>3355,
-32724=>3356,
-32725=>3357,
-32779=>3358,
-32850=>3359,
-32901=>3360,
-33109=>3361,
-33108=>3362,
-33099=>3363,
-33105=>3364,
-33102=>3365,
-33081=>3366,
-33094=>3367,
-33086=>3368,
-33100=>3369,
-33107=>3370,
-33140=>3371,
-33298=>3372,
-33308=>3373,
-33769=>3374,
-33795=>3375,
-33784=>3376,
-33805=>3377,
-33760=>3378,
-33733=>3379,
-33803=>3380,
-33729=>3381,
-58309=>3381,
-33775=>3382,
-33777=>3383,
-33780=>3384,
-33879=>3385,
-33802=>3386,
-33776=>3387,
-33804=>3388,
-33740=>3389,
-33789=>3390,
-33778=>3391,
-33738=>3392,
-33848=>3393,
-33806=>3394,
-33796=>3395,
-33756=>3396,
-33799=>3397,
-33748=>3398,
-33759=>3399,
-34395=>3400,
-34527=>3401,
-34521=>3402,
-34541=>3403,
-34516=>3404,
-34523=>3405,
-34532=>3406,
-34512=>3407,
-34526=>3408,
-34903=>3409,
-35009=>3410,
-35010=>3411,
-34993=>3412,
-35203=>3413,
-35222=>3414,
-35387=>3415,
-35424=>3416,
-35413=>3417,
-35422=>3418,
-35388=>3419,
-35393=>3420,
-35412=>3421,
-35419=>3422,
-35408=>3423,
-35398=>3424,
-35380=>3425,
-35386=>3426,
-35382=>3427,
-35414=>3428,
-35937=>3429,
-35970=>3430,
-36015=>3431,
-36028=>3432,
-36019=>3433,
-36029=>3434,
-36033=>3435,
-36027=>3436,
-36032=>3437,
-36020=>3438,
-36023=>3439,
-36022=>3440,
-36031=>3441,
-36024=>3442,
-36234=>3443,
-36229=>3444,
-36225=>3445,
-36302=>3446,
-36317=>3447,
-36299=>3448,
-36314=>3449,
-36305=>3450,
-36300=>3451,
-36315=>3452,
-36294=>3453,
-36603=>3454,
-36600=>3455,
-36604=>3456,
-36764=>3457,
-36910=>3458,
-36917=>3459,
-36913=>3460,
-36920=>3461,
-36914=>3462,
-36918=>3463,
-37122=>3464,
-37109=>3465,
-37129=>3466,
-37118=>3467,
-37219=>3468,
-37221=>3469,
-37327=>3470,
-37396=>3471,
-37397=>3472,
-37411=>3473,
-37385=>3474,
-37406=>3475,
-37389=>3476,
-37392=>3477,
-37383=>3478,
-37393=>3479,
-38292=>3480,
-38287=>3481,
-38283=>3482,
-38289=>3483,
-38291=>3484,
-38290=>3485,
-38286=>3486,
-38538=>3487,
-38542=>3488,
-38539=>3489,
-38525=>3490,
-38533=>3491,
-38534=>3492,
-38541=>3493,
-38514=>3494,
-38532=>3495,
-38593=>3496,
-38597=>3497,
-38596=>3498,
-38598=>3499,
-38599=>3500,
-38639=>3501,
-38642=>3502,
-38860=>3503,
-38917=>3504,
-38918=>3505,
-38920=>3506,
-39143=>3507,
-39146=>3508,
-39151=>3509,
-39145=>3510,
-39154=>3511,
-39149=>3512,
-39342=>3513,
-39341=>3514,
-40643=>3515,
-12232=>3515,
-40653=>3516,
-12233=>3516,
-40657=>3517,
-12234=>3517,
-20098=>3518,
-20653=>3519,
-20661=>3520,
-20658=>3521,
-20659=>3522,
-20677=>3523,
-20670=>3524,
-20652=>3525,
-20663=>3526,
-20667=>3527,
-20655=>3528,
-20679=>3529,
-21119=>3530,
-21111=>3531,
-21117=>3532,
-21215=>3533,
-21222=>3534,
-21220=>3535,
-21218=>3536,
-21219=>3537,
-21295=>3538,
-21983=>3539,
-21992=>3540,
-21971=>3541,
-21990=>3542,
-21966=>3543,
-21980=>3544,
-21959=>3545,
-21969=>3546,
-21987=>3547,
-21988=>3548,
-21999=>3549,
-21978=>3550,
-21985=>3551,
-21957=>3552,
-21958=>3553,
-21989=>3554,
-21961=>3555,
-22290=>3556,
-22291=>3557,
-22622=>3558,
-22609=>3559,
-22616=>3560,
-22615=>3561,
-22618=>3562,
-22612=>3563,
-22635=>3564,
-22604=>3565,
-22637=>3566,
-22602=>3567,
-22626=>3568,
-22610=>3569,
-22603=>3570,
-22887=>3571,
-23233=>3572,
-23241=>3573,
-23244=>3574,
-23230=>3575,
-23229=>3576,
-23228=>3577,
-23219=>3578,
-23234=>3579,
-23218=>3580,
-23913=>3581,
-23919=>3582,
-24140=>3583,
-24185=>3584,
-24265=>3585,
-24264=>3586,
-24338=>3587,
-24409=>3588,
-24492=>3589,
-24494=>3590,
-24858=>3591,
-24847=>3592,
-24904=>3593,
-24863=>3594,
-24819=>3595,
-24859=>3596,
-24825=>3597,
-24833=>3598,
-24840=>3599,
-24910=>3600,
-24908=>3601,
-24900=>3602,
-24909=>3603,
-24894=>3604,
-24884=>3605,
-24871=>3606,
-24845=>3607,
-24838=>3608,
-24887=>3609,
-25121=>3610,
-25122=>3611,
-25619=>3612,
-25662=>3613,
-25630=>3614,
-25642=>3615,
-25645=>3616,
-25661=>3617,
-25644=>3618,
-25615=>3619,
-25628=>3620,
-25620=>3621,
-25613=>3622,
-25654=>3623,
-25622=>3624,
-25623=>3625,
-25606=>3626,
-25964=>3627,
-26015=>3628,
-26032=>3629,
-26263=>3630,
-26249=>3631,
-26247=>3632,
-26248=>3633,
-26262=>3634,
-26244=>3635,
-26264=>3636,
-26253=>3637,
-26371=>3638,
-27028=>3639,
-26989=>3640,
-26970=>3641,
-26999=>3642,
-26976=>3643,
-26964=>3644,
-26997=>3645,
-26928=>3646,
-27010=>3647,
-26954=>3648,
-26984=>3649,
-26987=>3650,
-26974=>3651,
-26963=>3652,
-27001=>3653,
-27014=>3654,
-26973=>3655,
-26979=>3656,
-26971=>3657,
-27463=>3658,
-27506=>3659,
-27584=>3660,
-27583=>3661,
-27603=>3662,
-27645=>3663,
-28322=>3664,
-28335=>3665,
-28371=>3666,
-28342=>3667,
-28354=>3668,
-28304=>3669,
-28317=>3670,
-28359=>3671,
-28357=>3672,
-28325=>3673,
-28312=>3674,
-28348=>3675,
-28346=>3676,
-28331=>3677,
-28369=>3678,
-28310=>3679,
-28316=>3680,
-28356=>3681,
-28372=>3682,
-28330=>3683,
-28327=>3684,
-28340=>3685,
-29006=>3686,
-29017=>3687,
-29033=>3688,
-29028=>3689,
-29001=>3690,
-29031=>3691,
-29020=>3692,
-29036=>3693,
-29030=>3694,
-29004=>3695,
-29029=>3696,
-29022=>3697,
-28998=>3698,
-29032=>3699,
-29014=>3700,
-29242=>3701,
-29266=>3702,
-29495=>3703,
-29509=>3704,
-29503=>3705,
-29502=>3706,
-29807=>3707,
-29786=>3708,
-29781=>3709,
-29791=>3710,
-29790=>3711,
-29761=>3712,
-29759=>3713,
-29785=>3714,
-29787=>3715,
-58019=>3716,
-29788=>3716,
-30070=>3717,
-30072=>3718,
-30208=>3719,
-30192=>3720,
-30209=>3721,
-30194=>3722,
-30193=>3723,
-30202=>3724,
-30207=>3725,
-30196=>3726,
-30195=>3727,
-30430=>3728,
-30431=>3729,
-30555=>3730,
-30571=>3731,
-30566=>3732,
-30558=>3733,
-30563=>3734,
-30585=>3735,
-30570=>3736,
-30572=>3737,
-30556=>3738,
-30565=>3739,
-30568=>3740,
-30562=>3741,
-30702=>3742,
-30862=>3743,
-30896=>3744,
-30871=>3745,
-30872=>3746,
-30860=>3747,
-30857=>3748,
-30844=>3749,
-30865=>3750,
-30867=>3751,
-30847=>3752,
-31098=>3753,
-31103=>3754,
-31105=>3755,
-33836=>3756,
-31165=>3757,
-31260=>3758,
-31258=>3759,
-31264=>3760,
-31252=>3761,
-31263=>3762,
-31262=>3763,
-31391=>3764,
-31392=>3765,
-31607=>3766,
-31680=>3767,
-31584=>3768,
-31598=>3769,
-31591=>3770,
-31921=>3771,
-31923=>3772,
-31925=>3773,
-32147=>3774,
-32121=>3775,
-32145=>3776,
-32129=>3777,
-32143=>3778,
-32091=>3779,
-32622=>3780,
-32617=>3781,
-32618=>3782,
-32626=>3783,
-32681=>3784,
-32680=>3785,
-32676=>3786,
-32854=>3787,
-32856=>3788,
-32902=>3789,
-32900=>3790,
-33137=>3791,
-33136=>3792,
-33144=>3793,
-33125=>3794,
-33134=>3795,
-33139=>3796,
-33131=>3797,
-33145=>3798,
-33146=>3799,
-33126=>3800,
-33285=>3801,
-33351=>3802,
-33922=>3803,
-33911=>3804,
-33853=>3805,
-33841=>3806,
-33909=>3807,
-33894=>3808,
-33899=>3809,
-33865=>3810,
-33900=>3811,
-33883=>3812,
-33852=>3813,
-33845=>3814,
-33889=>3815,
-33891=>3816,
-33897=>3817,
-33901=>3818,
-33862=>3819,
-34398=>3820,
-34396=>3821,
-34399=>3822,
-34553=>3823,
-34579=>3824,
-34568=>3825,
-34567=>3826,
-34560=>3827,
-34558=>3828,
-34555=>3829,
-34562=>3830,
-34563=>3831,
-34566=>3832,
-34570=>3833,
-34905=>3834,
-35039=>3835,
-35028=>3836,
-35033=>3837,
-35036=>3838,
-35032=>3839,
-35037=>3840,
-35041=>3841,
-35018=>3842,
-35029=>3843,
-35026=>3844,
-35228=>3845,
-35299=>3846,
-35435=>3847,
-35442=>3848,
-35443=>3849,
-35430=>3850,
-35433=>3851,
-35440=>3852,
-35463=>3853,
-35452=>3854,
-35427=>3855,
-35488=>3856,
-35441=>3857,
-35461=>3858,
-35437=>3859,
-35426=>3860,
-35438=>3861,
-35436=>3862,
-35449=>3863,
-35451=>3864,
-35390=>3865,
-35432=>3866,
-35938=>3867,
-35978=>3868,
-35977=>3869,
-36042=>3870,
-36039=>3871,
-36040=>3872,
-36036=>3873,
-36018=>3874,
-36035=>3875,
-36034=>3876,
-36037=>3877,
-36321=>3878,
-36319=>3879,
-36328=>3880,
-36335=>3881,
-36339=>3882,
-36346=>3883,
-36330=>3884,
-36324=>3885,
-36326=>3886,
-36530=>3887,
-36611=>3888,
-36617=>3889,
-36606=>3890,
-36618=>3891,
-36767=>3892,
-36786=>3893,
-36939=>3894,
-36938=>3895,
-36947=>3896,
-36930=>3897,
-36948=>3898,
-36924=>3899,
-36949=>3900,
-36944=>3901,
-36935=>3902,
-36943=>3903,
-36942=>3904,
-36941=>3905,
-36945=>3906,
-36926=>3907,
-36929=>3908,
-37138=>3909,
-37143=>3910,
-37228=>3911,
-37226=>3912,
-37225=>3913,
-37321=>3914,
-37431=>3915,
-37463=>3916,
-37432=>3917,
-37437=>3918,
-37440=>3919,
-37438=>3920,
-37467=>3921,
-37451=>3922,
-37476=>3923,
-37457=>3924,
-37428=>3925,
-37449=>3926,
-37453=>3927,
-37445=>3928,
-37433=>3929,
-37439=>3930,
-37466=>3931,
-38296=>3932,
-38552=>3933,
-38548=>3934,
-38549=>3935,
-38605=>3936,
-38603=>3937,
-38601=>3938,
-38602=>3939,
-38647=>3940,
-38651=>3941,
-38649=>3942,
-38646=>3943,
-38742=>3944,
-38772=>3945,
-38774=>3946,
-38928=>3947,
-38929=>3948,
-38931=>3949,
-38922=>3950,
-38930=>3951,
-38924=>3952,
-39164=>3953,
-39156=>3954,
-39165=>3955,
-39166=>3956,
-39347=>3957,
-39345=>3958,
-39348=>3959,
-39649=>3960,
-40169=>3961,
-40578=>3962,
-40718=>3963,
-12237=>3963,
-40723=>3964,
-12238=>3964,
-40736=>3965,
-12239=>3965,
-20711=>3966,
-20718=>3967,
-20709=>3968,
-20694=>3969,
-20717=>3970,
-60903=>3970,
-20698=>3971,
-20693=>3972,
-20687=>3973,
-20689=>3974,
-20721=>3975,
-20686=>3976,
-20713=>3977,
-20834=>3978,
-20979=>3979,
-21123=>3980,
-21122=>3981,
-21297=>3982,
-21421=>3983,
-22014=>3984,
-22016=>3985,
-22043=>3986,
-22039=>3987,
-22013=>3988,
-22036=>3989,
-22022=>3990,
-22025=>3991,
-22029=>3992,
-22030=>3993,
-22007=>3994,
-22038=>3995,
-22047=>3996,
-22024=>3997,
-22032=>3998,
-22006=>3999,
-22296=>4000,
-22294=>4001,
-22645=>4002,
-22654=>4003,
-22659=>4004,
-22675=>4005,
-22666=>4006,
-22649=>4007,
-22661=>4008,
-22653=>4009,
-22781=>4010,
-22821=>4011,
-22818=>4012,
-22820=>4013,
-22890=>4014,
-22889=>4015,
-23265=>4016,
-23270=>4017,
-23273=>4018,
-23255=>4019,
-23254=>4020,
-23256=>4021,
-23267=>4022,
-23413=>4023,
-23518=>4024,
-23527=>4025,
-23521=>4026,
-23525=>4027,
-23526=>4028,
-23528=>4029,
-23522=>4030,
-23524=>4031,
-23519=>4032,
-23565=>4033,
-23650=>4034,
-23940=>4035,
-23943=>4036,
-24155=>4037,
-24163=>4038,
-24149=>4039,
-24151=>4040,
-24148=>4041,
-24275=>4042,
-24278=>4043,
-24330=>4044,
-24390=>4045,
-24432=>4046,
-24505=>4047,
-24903=>4048,
-24895=>4049,
-24907=>4050,
-24951=>4051,
-24930=>4052,
-24931=>4053,
-24927=>4054,
-24922=>4055,
-24920=>4056,
-24949=>4057,
-25130=>4058,
-25735=>4059,
-25688=>4060,
-25684=>4061,
-25764=>4062,
-25720=>4063,
-25695=>4064,
-25722=>4065,
-25681=>4066,
-25703=>4067,
-25652=>4068,
-25709=>4069,
-25723=>4070,
-25970=>4071,
-26017=>4072,
-26071=>4073,
-26070=>4074,
-26274=>4075,
-26280=>4076,
-26269=>4077,
-27036=>4078,
-27048=>4079,
-27029=>4080,
-27073=>4081,
-27054=>4082,
-27091=>4083,
-27083=>4084,
-27035=>4085,
-27063=>4086,
-27067=>4087,
-27051=>4088,
-27060=>4089,
-27088=>4090,
-27085=>4091,
-27053=>4092,
-27084=>4093,
-27046=>4094,
-27075=>4095,
-27043=>4096,
-27465=>4097,
-27468=>4098,
-27699=>4099,
-28467=>4100,
-28436=>4101,
-28414=>4102,
-28435=>4103,
-28404=>4104,
-28457=>4105,
-28478=>4106,
-28448=>4107,
-28460=>4108,
-28431=>4109,
-28418=>4110,
-28450=>4111,
-28415=>4112,
-28399=>4113,
-28422=>4114,
-28465=>4115,
-28472=>4116,
-28466=>4117,
-28451=>4118,
-28437=>4119,
-28459=>4120,
-28463=>4121,
-28552=>4122,
-28458=>4123,
-28396=>4124,
-28417=>4125,
-28402=>4126,
-28364=>4127,
-28407=>4128,
-29076=>4129,
-29081=>4130,
-29053=>4131,
-29066=>4132,
-29060=>4133,
-29074=>4134,
-29246=>4135,
-29330=>4136,
-29334=>4137,
-29508=>4138,
-29520=>4139,
-29796=>4140,
-29795=>4141,
-29802=>4142,
-29808=>4143,
-29805=>4144,
-29956=>4145,
-30097=>4146,
-30247=>4147,
-30221=>4148,
-30219=>4149,
-30217=>4150,
-30227=>4151,
-30433=>4152,
-30435=>4153,
-30596=>4154,
-30589=>4155,
-30591=>4156,
-30561=>4157,
-30913=>4158,
-30879=>4159,
-30887=>4160,
-30899=>4161,
-30889=>4162,
-30883=>4163,
-31118=>4164,
-31119=>4165,
-31117=>4166,
-31278=>4167,
-31281=>4168,
-31402=>4169,
-31401=>4170,
-31469=>4171,
-31471=>4172,
-31649=>4173,
-31637=>4174,
-31627=>4175,
-31605=>4176,
-31639=>4177,
-31645=>4178,
-31636=>4179,
-31631=>4180,
-31672=>4181,
-58170=>4181,
-31623=>4182,
-31620=>4183,
-31929=>4184,
-31933=>4185,
-31934=>4186,
-32187=>4187,
-32176=>4188,
-32156=>4189,
-32189=>4190,
-32190=>4191,
-32160=>4192,
-32202=>4193,
-32180=>4194,
-32178=>4195,
-32177=>4196,
-32186=>4197,
-32162=>4198,
-32191=>4199,
-32181=>4200,
-32184=>4201,
-32173=>4202,
-32210=>4203,
-58202=>4203,
-32199=>4204,
-32172=>4205,
-32624=>4206,
-32736=>4207,
-32737=>4208,
-32735=>4209,
-32862=>4210,
-32858=>4211,
-32903=>4212,
-33104=>4213,
-33152=>4214,
-33167=>4215,
-33160=>4216,
-33162=>4217,
-33151=>4218,
-33154=>4219,
-33255=>4220,
-33274=>4221,
-33287=>4222,
-33300=>4223,
-33310=>4224,
-33355=>4225,
-33993=>4226,
-33983=>4227,
-33990=>4228,
-33988=>4229,
-33945=>4230,
-33950=>4231,
-33970=>4232,
-33948=>4233,
-33995=>4234,
-33976=>4235,
-33984=>4236,
-34003=>4237,
-33936=>4238,
-33980=>4239,
-34001=>4240,
-33994=>4241,
-34623=>4242,
-34588=>4243,
-34619=>4244,
-34594=>4245,
-34597=>4246,
-34612=>4247,
-34584=>4248,
-34645=>4249,
-34615=>4250,
-34601=>4251,
-35059=>4252,
-35074=>4253,
-35060=>4254,
-35065=>4255,
-35064=>4256,
-35069=>4257,
-35048=>4258,
-35098=>4259,
-35055=>4260,
-35494=>4261,
-35468=>4262,
-35486=>4263,
-35491=>4264,
-35469=>4265,
-35489=>4266,
-35475=>4267,
-35492=>4268,
-35498=>4269,
-35493=>4270,
-35496=>4271,
-35480=>4272,
-35473=>4273,
-35482=>4274,
-35495=>4275,
-35946=>4276,
-35981=>4277,
-35980=>4278,
-36051=>4279,
-36049=>4280,
-36050=>4281,
-36203=>4282,
-36249=>4283,
-36245=>4284,
-36348=>4285,
-36628=>4286,
-36626=>4287,
-36629=>4288,
-36627=>4289,
-36771=>4290,
-36960=>4291,
-36952=>4292,
-36956=>4293,
-36963=>4294,
-36953=>4295,
-36958=>4296,
-36962=>4297,
-36957=>4298,
-36955=>4299,
-37145=>4300,
-37144=>4301,
-37150=>4302,
-37237=>4303,
-37240=>4304,
-37239=>4305,
-37236=>4306,
-37496=>4307,
-37548=>4308,
-37504=>4309,
-37509=>4310,
-37528=>4311,
-37526=>4312,
-37499=>4313,
-37523=>4314,
-37532=>4315,
-37544=>4316,
-37500=>4317,
-37521=>4318,
-38305=>4319,
-38312=>4320,
-38313=>4321,
-38307=>4322,
-38309=>4323,
-38308=>4324,
-38553=>4325,
-38556=>4326,
-38555=>4327,
-38604=>4328,
-38610=>4329,
-38656=>4330,
-38780=>4331,
-38789=>4332,
-38902=>4333,
-38935=>4334,
-38936=>4335,
-39087=>4336,
-39089=>4337,
-39171=>4338,
-39173=>4339,
-39180=>4340,
-39177=>4341,
-39361=>4342,
-39599=>4343,
-39600=>4344,
-39654=>4345,
-39745=>4346,
-39746=>4347,
-40180=>4348,
-40182=>4349,
-40179=>4350,
-40636=>4351,
-40763=>4352,
-12240=>4352,
-40778=>4353,
-12241=>4353,
-20740=>4354,
-20736=>4355,
-20731=>4356,
-20725=>4357,
-20729=>4358,
-20738=>4359,
-20744=>4360,
-20745=>4361,
-20741=>4362,
-20956=>4363,
-21127=>4364,
-21128=>4365,
-21129=>4366,
-21133=>4367,
-21130=>4368,
-21232=>4369,
-21426=>4370,
-22062=>4371,
-22075=>4372,
-22073=>4373,
-22066=>4374,
-22079=>4375,
-22068=>4376,
-22057=>4377,
-22099=>4378,
-22094=>4379,
-22103=>4380,
-22132=>4381,
-22070=>4382,
-22063=>4383,
-22064=>4384,
-22656=>4385,
-22687=>4386,
-22686=>4387,
-22707=>4388,
-22684=>4389,
-22702=>4390,
-22697=>4391,
-22694=>4392,
-22893=>4393,
-23305=>4394,
-23291=>4395,
-23307=>4396,
-23285=>4397,
-23308=>4398,
-23304=>4399,
-23534=>4400,
-23532=>4401,
-23529=>4402,
-23531=>4403,
-23652=>4404,
-23653=>4405,
-23965=>4406,
-23956=>4407,
-24162=>4408,
-24159=>4409,
-24161=>4410,
-24290=>4411,
-24282=>4412,
-24287=>4413,
-24285=>4414,
-24291=>4415,
-24288=>4416,
-24392=>4417,
-24433=>4418,
-24503=>4419,
-24501=>4420,
-24950=>4421,
-24935=>4422,
-24942=>4423,
-24925=>4424,
-24917=>4425,
-24962=>4426,
-24956=>4427,
-24944=>4428,
-24939=>4429,
-24958=>4430,
-24999=>4431,
-24976=>4432,
-25003=>4433,
-24974=>4434,
-25004=>4435,
-24986=>4436,
-24996=>4437,
-24980=>4438,
-25006=>4439,
-25134=>4440,
-25705=>4441,
-25711=>4442,
-25721=>4443,
-25758=>4444,
-25778=>4445,
-25736=>4446,
-25744=>4447,
-57745=>4447,
-25776=>4448,
-25765=>4449,
-25747=>4450,
-25749=>4451,
-25769=>4452,
-25746=>4453,
-25774=>4454,
-25773=>4455,
-25771=>4456,
-25754=>4457,
-25772=>4458,
-25753=>4459,
-25762=>4460,
-25779=>4461,
-25973=>4462,
-25975=>4463,
-25976=>4464,
-26286=>4465,
-26283=>4466,
-26292=>4467,
-26289=>4468,
-27171=>4469,
-27167=>4470,
-27112=>4471,
-27137=>4472,
-27166=>4473,
-27161=>4474,
-27133=>4475,
-27169=>4476,
-27155=>4477,
-27146=>4478,
-27123=>4479,
-27138=>4480,
-27141=>4481,
-27117=>4482,
-27153=>4483,
-27472=>4484,
-27470=>4485,
-27556=>4486,
-27589=>4487,
-27590=>4488,
-28479=>4489,
-28540=>4490,
-28548=>4491,
-28497=>4492,
-28518=>4493,
-28500=>4494,
-28550=>4495,
-28525=>4496,
-28507=>4497,
-28536=>4498,
-28526=>4499,
-28558=>4500,
-28538=>4501,
-28528=>4502,
-28516=>4503,
-28567=>4504,
-28504=>4505,
-28373=>4506,
-28527=>4507,
-28512=>4508,
-28511=>4509,
-29087=>4510,
-29100=>4511,
-29105=>4512,
-29096=>4513,
-29270=>4514,
-29339=>4515,
-29518=>4516,
-29527=>4517,
-29801=>4518,
-29835=>4519,
-29827=>4520,
-29822=>4521,
-29824=>4522,
-30079=>4523,
-30240=>4524,
-30249=>4525,
-30239=>4526,
-30244=>4527,
-30246=>4528,
-30241=>4529,
-30242=>4530,
-30362=>4531,
-30394=>4532,
-30436=>4533,
-30606=>4534,
-30599=>4535,
-30604=>4536,
-30609=>4537,
-30603=>4538,
-30923=>4539,
-30917=>4540,
-30906=>4541,
-30922=>4542,
-30910=>4543,
-30933=>4544,
-30908=>4545,
-30928=>4546,
-31295=>4547,
-31292=>4548,
-31296=>4549,
-31293=>4550,
-31287=>4551,
-31291=>4552,
-31407=>4553,
-31406=>4554,
-31661=>4555,
-31665=>4556,
-31684=>4557,
-31668=>4558,
-31686=>4559,
-31687=>4560,
-31681=>4561,
-31648=>4562,
-31692=>4563,
-31946=>4564,
-32224=>4565,
-32244=>4566,
-32239=>4567,
-32251=>4568,
-32216=>4569,
-32236=>4570,
-32221=>4571,
-32232=>4572,
-32227=>4573,
-32218=>4574,
-32222=>4575,
-32233=>4576,
-32158=>4577,
-32217=>4578,
-32242=>4579,
-32249=>4580,
-32629=>4581,
-32631=>4582,
-32687=>4583,
-32745=>4584,
-32806=>4585,
-33179=>4586,
-33180=>4587,
-33181=>4588,
-33184=>4589,
-33178=>4590,
-33176=>4591,
-34071=>4592,
-34109=>4593,
-34074=>4594,
-34030=>4595,
-34092=>4596,
-34093=>4597,
-34067=>4598,
-34065=>4599,
-34083=>4600,
-34081=>4601,
-34068=>4602,
-34028=>4603,
-34085=>4604,
-34047=>4605,
-34054=>4606,
-34690=>4607,
-34676=>4608,
-34678=>4609,
-34656=>4610,
-34662=>4611,
-34680=>4612,
-34664=>4613,
-34649=>4614,
-34647=>4615,
-34636=>4616,
-34643=>4617,
-34907=>4618,
-34909=>4619,
-35088=>4620,
-35079=>4621,
-35090=>4622,
-35091=>4623,
-35093=>4624,
-35082=>4625,
-35516=>4626,
-35538=>4627,
-35527=>4628,
-35524=>4629,
-35477=>4630,
-35531=>4631,
-35576=>4632,
-35506=>4633,
-35529=>4634,
-35522=>4635,
-35519=>4636,
-35504=>4637,
-35542=>4638,
-35533=>4639,
-35510=>4640,
-35513=>4641,
-35547=>4642,
-35916=>4643,
-35918=>4644,
-35948=>4645,
-36064=>4646,
-36062=>4647,
-36070=>4648,
-36068=>4649,
-36076=>4650,
-36077=>4651,
-36066=>4652,
-36067=>4653,
-36060=>4654,
-36074=>4655,
-36065=>4656,
-36205=>4657,
-36255=>4658,
-36259=>4659,
-36395=>4660,
-36368=>4661,
-36381=>4662,
-36386=>4663,
-36367=>4664,
-36393=>4665,
-36383=>4666,
-36385=>4667,
-36382=>4668,
-36538=>4669,
-36637=>4670,
-36635=>4671,
-36639=>4672,
-36649=>4673,
-36646=>4674,
-36650=>4675,
-36636=>4676,
-36638=>4677,
-36645=>4678,
-36969=>4679,
-36974=>4680,
-36968=>4681,
-36973=>4682,
-36983=>4683,
-37168=>4684,
-37165=>4685,
-37159=>4686,
-37169=>4687,
-37255=>4688,
-37257=>4689,
-37259=>4690,
-37251=>4691,
-37573=>4692,
-37563=>4693,
-37559=>4694,
-37610=>4695,
-37604=>4696,
-37569=>4697,
-37555=>4698,
-37564=>4699,
-37586=>4700,
-37575=>4701,
-37616=>4702,
-37554=>4703,
-38317=>4704,
-38321=>4705,
-38660=>4706,
-38662=>4707,
-38663=>4708,
-38665=>4709,
-38752=>4710,
-38797=>4711,
-38795=>4712,
-38799=>4713,
-38945=>4714,
-38955=>4715,
-38940=>4716,
-39091=>4717,
-39178=>4718,
-39187=>4719,
-39186=>4720,
-39192=>4721,
-39389=>4722,
-39376=>4723,
-39391=>4724,
-39387=>4725,
-39377=>4726,
-39381=>4727,
-39378=>4728,
-39385=>4729,
-39607=>4730,
-39662=>4731,
-39663=>4732,
-39719=>4733,
-39749=>4734,
-39748=>4735,
-39799=>4736,
-39791=>4737,
-40198=>4738,
-40201=>4739,
-40195=>4740,
-40617=>4741,
-40638=>4742,
-40654=>4743,
-22696=>4744,
-12242=>4745,
-40786=>4745,
-20754=>4746,
-20760=>4747,
-20756=>4748,
-20752=>4749,
-20757=>4750,
-20864=>4751,
-20906=>4752,
-20957=>4753,
-21137=>4754,
-21139=>4755,
-21235=>4756,
-22105=>4757,
-22123=>4758,
-22137=>4759,
-22121=>4760,
-22116=>4761,
-22136=>4762,
-22122=>4763,
-22120=>4764,
-22117=>4765,
-22129=>4766,
-22127=>4767,
-22124=>4768,
-22114=>4769,
-22134=>4770,
-22721=>4771,
-22718=>4772,
-22727=>4773,
-22725=>4774,
-22894=>4775,
-23325=>4776,
-23348=>4777,
-23416=>4778,
-23536=>4779,
-23566=>4780,
-24394=>4781,
-25010=>4782,
-24977=>4783,
-25001=>4784,
-24970=>4785,
-25037=>4786,
-25014=>4787,
-25022=>4788,
-25034=>4789,
-25032=>4790,
-25136=>4791,
-25797=>4792,
-25793=>4793,
-25803=>4794,
-25787=>4795,
-25788=>4796,
-25818=>4797,
-25796=>4798,
-25799=>4799,
-25794=>4800,
-25805=>4801,
-25791=>4802,
-25810=>4803,
-25812=>4804,
-25790=>4805,
-25972=>4806,
-26310=>4807,
-26313=>4808,
-26297=>4809,
-26308=>4810,
-26311=>4811,
-26296=>4812,
-27197=>4813,
-27192=>4814,
-27194=>4815,
-27225=>4816,
-27243=>4817,
-27224=>4818,
-27193=>4819,
-27204=>4820,
-27234=>4821,
-27233=>4822,
-27211=>4823,
-27207=>4824,
-27189=>4825,
-27231=>4826,
-27208=>4827,
-27481=>4828,
-27511=>4829,
-27653=>4830,
-28610=>4831,
-28593=>4832,
-28577=>4833,
-28611=>4834,
-28580=>4835,
-28609=>4836,
-28583=>4837,
-28595=>4838,
-28608=>4839,
-28601=>4840,
-28598=>4841,
-60318=>4841,
-28582=>4842,
-28576=>4843,
-28596=>4844,
-29118=>4845,
-29129=>4846,
-29136=>4847,
-29138=>4848,
-29128=>4849,
-29141=>4850,
-29113=>4851,
-29134=>4852,
-29145=>4853,
-29148=>4854,
-29123=>4855,
-29124=>4856,
-29544=>4857,
-29852=>4858,
-29859=>4859,
-29848=>4860,
-29855=>4861,
-29854=>4862,
-29922=>4863,
-29964=>4864,
-29965=>4865,
-30260=>4866,
-30264=>4867,
-30266=>4868,
-30439=>4869,
-30437=>4870,
-30624=>4871,
-30622=>4872,
-30623=>4873,
-30629=>4874,
-30952=>4875,
-30938=>4876,
-30956=>4877,
-30951=>4878,
-31142=>4879,
-31309=>4880,
-31310=>4881,
-31302=>4882,
-31308=>4883,
-31307=>4884,
-31418=>4885,
-31705=>4886,
-31761=>4887,
-31689=>4888,
-31716=>4889,
-31707=>4890,
-31713=>4891,
-31721=>4892,
-31718=>4893,
-31957=>4894,
-31958=>4895,
-32266=>4896,
-32273=>4897,
-32264=>4898,
-32283=>4899,
-32291=>4900,
-32286=>4901,
-32285=>4902,
-58211=>4902,
-32265=>4903,
-32272=>4904,
-32633=>4905,
-32690=>4906,
-32752=>4907,
-32753=>4908,
-32750=>4909,
-32808=>4910,
-58239=>4910,
-33203=>4911,
-33193=>4912,
-33192=>4913,
-33275=>4914,
-33288=>4915,
-33368=>4916,
-33369=>4917,
-34122=>4918,
-34137=>4919,
-34120=>4920,
-34152=>4921,
-34153=>4922,
-34115=>4923,
-34121=>4924,
-34157=>4925,
-34154=>4926,
-34142=>4927,
-34691=>4928,
-34719=>4929,
-34718=>4930,
-34722=>4931,
-34701=>4932,
-34913=>4933,
-35114=>4934,
-35122=>4935,
-35109=>4936,
-35115=>4937,
-35105=>4938,
-35242=>4939,
-35238=>4940,
-58391=>4940,
-35558=>4941,
-35578=>4942,
-35563=>4943,
-35569=>4944,
-35584=>4945,
-35548=>4946,
-35559=>4947,
-35566=>4948,
-35582=>4949,
-35585=>4950,
-35586=>4951,
-35575=>4952,
-35565=>4953,
-35571=>4954,
-35574=>4955,
-35580=>4956,
-35947=>4957,
-35949=>4958,
-35987=>4959,
-36084=>4960,
-36420=>4961,
-36401=>4962,
-36404=>4963,
-36418=>4964,
-36409=>4965,
-36405=>4966,
-36667=>4967,
-36655=>4968,
-36664=>4969,
-36659=>4970,
-36776=>4971,
-36774=>4972,
-36981=>4973,
-36980=>4974,
-36984=>4975,
-36978=>4976,
-36988=>4977,
-36986=>4978,
-37172=>4979,
-37266=>4980,
-37664=>4981,
-37686=>4982,
-37624=>4983,
-37683=>4984,
-37679=>4985,
-37666=>4986,
-37628=>4987,
-37675=>4988,
-37636=>4989,
-37658=>4990,
-37648=>4991,
-37670=>4992,
-37665=>4993,
-37653=>4994,
-37678=>4995,
-37657=>4996,
-38331=>4997,
-38567=>4998,
-38568=>4999,
-38570=>5000,
-38613=>5001,
-38670=>5002,
-38673=>5003,
-38678=>5004,
-38669=>5005,
-38675=>5006,
-38671=>5007,
-38747=>5008,
-58565=>5009,
-38748=>5009,
-38758=>5010,
-38808=>5011,
-38960=>5012,
-38968=>5013,
-38971=>5014,
-38967=>5015,
-38957=>5016,
-38969=>5017,
-38948=>5018,
-39184=>5019,
-39208=>5020,
-39198=>5021,
-39195=>5022,
-39201=>5023,
-39194=>5024,
-39405=>5025,
-39394=>5026,
-39409=>5027,
-39608=>5028,
-39612=>5029,
-39675=>5030,
-39661=>5031,
-39720=>5032,
-39825=>5033,
-40213=>5034,
-40227=>5035,
-40230=>5036,
-40232=>5037,
-40210=>5038,
-40219=>5039,
-40664=>5040,
-40660=>5041,
-40845=>5042,
-12243=>5042,
-40860=>5043,
-12244=>5043,
-20778=>5044,
-20767=>5045,
-20769=>5046,
-20786=>5047,
-21237=>5048,
-22158=>5049,
-22144=>5050,
-22160=>5051,
-22149=>5052,
-22151=>5053,
-22159=>5054,
-22741=>5055,
-22739=>5056,
-22737=>5057,
-22734=>5058,
-23344=>5059,
-23338=>5060,
-23332=>5061,
-23418=>5062,
-23607=>5063,
-23656=>5064,
-23996=>5065,
-23994=>5066,
-23997=>5067,
-23992=>5068,
-24171=>5069,
-24396=>5070,
-24509=>5071,
-25033=>5072,
-25026=>5073,
-25031=>5074,
-25062=>5075,
-25035=>5076,
-25138=>5077,
-25140=>5078,
-25806=>5079,
-25802=>5080,
-25816=>5081,
-25824=>5082,
-25840=>5083,
-25830=>5084,
-25836=>5085,
-25841=>5086,
-25826=>5087,
-25837=>5088,
-25986=>5089,
-25987=>5090,
-26329=>5091,
-26326=>5092,
-27264=>5093,
-27284=>5094,
-27268=>5095,
-27298=>5096,
-27292=>5097,
-27355=>5098,
-27299=>5099,
-27262=>5100,
-27287=>5101,
-27280=>5102,
-27296=>5103,
-27484=>5104,
-27566=>5105,
-27610=>5106,
-27656=>5107,
-28632=>5108,
-28657=>5109,
-28639=>5110,
-28640=>5111,
-28635=>5112,
-28644=>5113,
-28651=>5114,
-28655=>5115,
-28544=>5116,
-28652=>5117,
-28641=>5118,
-28649=>5119,
-28629=>5120,
-28654=>5121,
-28656=>5122,
-29159=>5123,
-29151=>5124,
-60361=>5124,
-29166=>5125,
-29158=>5126,
-29157=>5127,
-29165=>5128,
-29164=>5129,
-29172=>5130,
-29152=>5131,
-29237=>5132,
-29254=>5133,
-29552=>5134,
-29554=>5135,
-29865=>5136,
-29872=>5137,
-29862=>5138,
-29864=>5139,
-30278=>5140,
-30274=>5141,
-30284=>5142,
-30442=>5143,
-30643=>5144,
-30634=>5145,
-30640=>5146,
-30636=>5147,
-30631=>5148,
-30637=>5149,
-30703=>5150,
-30967=>5151,
-30970=>5152,
-30964=>5153,
-30959=>5154,
-30977=>5155,
-31143=>5156,
-31146=>5157,
-31319=>5158,
-31423=>5159,
-31751=>5160,
-31757=>5161,
-31742=>5162,
-31735=>5163,
-31756=>5164,
-31712=>5165,
-31968=>5166,
-31964=>5167,
-31966=>5168,
-31970=>5169,
-31967=>5170,
-31961=>5171,
-31965=>5172,
-32302=>5173,
-32318=>5174,
-32326=>5175,
-32311=>5176,
-32306=>5177,
-32323=>5178,
-32299=>5179,
-32317=>5180,
-32305=>5181,
-32325=>5182,
-32321=>5183,
-32308=>5184,
-32313=>5185,
-32328=>5186,
-32309=>5187,
-32319=>5188,
-32303=>5189,
-32580=>5190,
-32755=>5191,
-32764=>5192,
-32881=>5193,
-32882=>5194,
-32880=>5195,
-32879=>5196,
-32883=>5197,
-33222=>5198,
-33219=>5199,
-33210=>5200,
-33218=>5201,
-33216=>5202,
-33215=>5203,
-33213=>5204,
-33225=>5205,
-33214=>5206,
-33256=>5207,
-33289=>5208,
-33393=>5209,
-34218=>5210,
-34180=>5211,
-34174=>5212,
-34204=>5213,
-34193=>5214,
-34196=>5215,
-34223=>5216,
-34203=>5217,
-34183=>5218,
-34216=>5219,
-34186=>5220,
-34214=>5221,
-34407=>5222,
-34752=>5223,
-34769=>5224,
-34739=>5225,
-34770=>5226,
-34758=>5227,
-34731=>5228,
-34747=>5229,
-34746=>5230,
-34760=>5231,
-34763=>5232,
-35131=>5233,
-35126=>5234,
-35140=>5235,
-35128=>5236,
-35133=>5237,
-35244=>5238,
-35598=>5239,
-35607=>5240,
-35609=>5241,
-35611=>5242,
-35594=>5243,
-35616=>5244,
-35613=>5245,
-35588=>5246,
-35600=>5247,
-35905=>5248,
-35903=>5249,
-35955=>5250,
-36090=>5251,
-36093=>5252,
-36092=>5253,
-36088=>5254,
-36091=>5255,
-36264=>5256,
-36425=>5257,
-36427=>5258,
-36424=>5259,
-36426=>5260,
-36676=>5261,
-36670=>5262,
-36674=>5263,
-36677=>5264,
-36671=>5265,
-36991=>5266,
-36989=>5267,
-36996=>5268,
-36993=>5269,
-36994=>5270,
-36992=>5271,
-37177=>5272,
-37283=>5273,
-37278=>5274,
-37276=>5275,
-37709=>5276,
-37762=>5277,
-37672=>5278,
-37749=>5279,
-37706=>5280,
-37733=>5281,
-37707=>5282,
-37656=>5283,
-37758=>5284,
-37740=>5285,
-37723=>5286,
-37744=>5287,
-37722=>5288,
-37716=>5289,
-38346=>5290,
-38347=>5291,
-38348=>5292,
-38344=>5293,
-38342=>5294,
-38577=>5295,
-38584=>5296,
-38614=>5297,
-38684=>5298,
-38686=>5299,
-38816=>5300,
-38867=>5301,
-38982=>5302,
-39094=>5303,
-39221=>5304,
-39425=>5305,
-39423=>5306,
-39854=>5307,
-39851=>5308,
-39850=>5309,
-39853=>5310,
-40251=>5311,
-40255=>5312,
-40587=>5313,
-40655=>5314,
-40670=>5315,
-40668=>5316,
-40669=>5317,
-40667=>5318,
-40766=>5319,
-40779=>5320,
-21474=>5321,
-22165=>5322,
-22190=>5323,
-22745=>5324,
-22744=>5325,
-23352=>5326,
-24413=>5327,
-25059=>5328,
-25139=>5329,
-25844=>5330,
-25842=>5331,
-25854=>5332,
-25862=>5333,
-25850=>5334,
-25851=>5335,
-25847=>5336,
-26039=>5337,
-26332=>5338,
-26406=>5339,
-27315=>5340,
-27308=>5341,
-27331=>5342,
-27323=>5343,
-27320=>5344,
-27330=>5345,
-27310=>5346,
-27311=>5347,
-27487=>5348,
-27512=>5349,
-27567=>5350,
-28681=>5351,
-28683=>5352,
-28670=>5353,
-28678=>5354,
-28666=>5355,
-28689=>5356,
-28687=>5357,
-29179=>5358,
-29180=>5359,
-29182=>5360,
-29176=>5361,
-29559=>5362,
-29557=>5363,
-29863=>5364,
-29887=>5365,
-29973=>5366,
-30294=>5367,
-30296=>5368,
-30290=>5369,
-30653=>5370,
-30655=>5371,
-30651=>5372,
-30652=>5373,
-30990=>5374,
-31150=>5375,
-31329=>5376,
-31330=>5377,
-31328=>5378,
-31428=>5379,
-31429=>5380,
-31787=>5381,
-31783=>5382,
-31786=>5383,
-31774=>5384,
-31779=>5385,
-31777=>5386,
-31975=>5387,
-32340=>5388,
-32341=>5389,
-32350=>5390,
-32346=>5391,
-32353=>5392,
-32338=>5393,
-32345=>5394,
-32584=>5395,
-32761=>5396,
-32763=>5397,
-32887=>5398,
-32886=>5399,
-33229=>5400,
-33231=>5401,
-33290=>5402,
-34255=>5403,
-34217=>5404,
-34253=>5405,
-34256=>5406,
-34249=>5407,
-34224=>5408,
-34234=>5409,
-34233=>5410,
-34799=>5411,
-34796=>5412,
-34802=>5413,
-34784=>5414,
-35206=>5415,
-35250=>5416,
-35316=>5417,
-35624=>5418,
-35641=>5419,
-35628=>5420,
-35627=>5421,
-35920=>5422,
-36101=>5423,
-36441=>5424,
-36451=>5425,
-36454=>5426,
-36452=>5427,
-36447=>5428,
-36437=>5429,
-36544=>5430,
-36681=>5431,
-36685=>5432,
-36999=>5433,
-36995=>5434,
-37000=>5435,
-37291=>5436,
-37292=>5437,
-37328=>5438,
-37780=>5439,
-37770=>5440,
-37782=>5441,
-37794=>5442,
-37811=>5443,
-37806=>5444,
-37804=>5445,
-37808=>5446,
-37784=>5447,
-37786=>5448,
-37783=>5449,
-38356=>5450,
-38358=>5451,
-38352=>5452,
-38357=>5453,
-38626=>5454,
-38620=>5455,
-38617=>5456,
-38619=>5457,
-38622=>5458,
-38692=>5459,
-38819=>5460,
-38822=>5461,
-38829=>5462,
-38905=>5463,
-38989=>5464,
-38991=>5465,
-38988=>5466,
-38990=>5467,
-38995=>5468,
-39098=>5469,
-39230=>5470,
-39231=>5471,
-39229=>5472,
-39214=>5473,
-39333=>5474,
-39438=>5475,
-39617=>5476,
-39683=>5477,
-39686=>5478,
-39759=>5479,
-39758=>5480,
-39757=>5481,
-39882=>5482,
-39881=>5483,
-39933=>5484,
-39880=>5485,
-39872=>5486,
-40273=>5487,
-40285=>5488,
-40288=>5489,
-40672=>5490,
-40725=>5491,
-40748=>5492,
-20787=>5493,
-22181=>5494,
-22184=>5495,
-22750=>5496,
-22751=>5497,
-22754=>5498,
-23541=>5499,
-40848=>5500,
-24300=>5501,
-25074=>5502,
-25079=>5503,
-25078=>5504,
-25077=>5505,
-25856=>5506,
-25871=>5507,
-26336=>5508,
-26333=>5509,
-27365=>5510,
-27357=>5511,
-27354=>5512,
-27347=>5513,
-28699=>5514,
-28703=>5515,
-28712=>5516,
-28698=>5517,
-28701=>5518,
-28693=>5519,
-28696=>5520,
-29190=>5521,
-29197=>5522,
-29272=>5523,
-29346=>5524,
-29560=>5525,
-29562=>5526,
-29885=>5527,
-29898=>5528,
-29923=>5529,
-30087=>5530,
-30086=>5531,
-30303=>5532,
-30305=>5533,
-30663=>5534,
-31001=>5535,
-31153=>5536,
-31339=>5537,
-31337=>5538,
-31806=>5539,
-31807=>5540,
-31800=>5541,
-31805=>5542,
-31799=>5543,
-31808=>5544,
-32363=>5545,
-32365=>5546,
-32377=>5547,
-32361=>5548,
-32362=>5549,
-32371=>5550,
-32645=>5551,
-32694=>5552,
-32697=>5553,
-32696=>5554,
-33240=>5555,
-34281=>5556,
-34269=>5557,
-34282=>5558,
-34261=>5559,
-34276=>5560,
-34277=>5561,
-34295=>5562,
-34811=>5563,
-34821=>5564,
-34829=>5565,
-34809=>5566,
-34814=>5567,
-35168=>5568,
-35167=>5569,
-35158=>5570,
-35166=>5571,
-35649=>5572,
-35676=>5573,
-35672=>5574,
-35657=>5575,
-35674=>5576,
-35662=>5577,
-35663=>5578,
-35654=>5579,
-35673=>5580,
-36104=>5581,
-36106=>5582,
-36476=>5583,
-36466=>5584,
-36487=>5585,
-36470=>5586,
-36460=>5587,
-36474=>5588,
-36468=>5589,
-36692=>5590,
-36686=>5591,
-36781=>5592,
-37002=>5593,
-37003=>5594,
-37297=>5595,
-37294=>5596,
-37857=>5597,
-37841=>5598,
-37855=>5599,
-37827=>5600,
-37832=>5601,
-37852=>5602,
-37853=>5603,
-37846=>5604,
-37858=>5605,
-37837=>5606,
-37848=>5607,
-37860=>5608,
-37847=>5609,
-37864=>5610,
-38364=>5611,
-38580=>5612,
-38627=>5613,
-38698=>5614,
-38695=>5615,
-38753=>5616,
-38876=>5617,
-38907=>5618,
-39006=>5619,
-39000=>5620,
-39003=>5621,
-39100=>5622,
-39237=>5623,
-39241=>5624,
-39446=>5625,
-39449=>5626,
-39693=>5627,
-39912=>5628,
-39911=>5629,
-39894=>5630,
-39899=>5631,
-40329=>5632,
-40289=>5633,
-40306=>5634,
-40298=>5635,
-40300=>5636,
-40594=>5637,
-40599=>5638,
-40595=>5639,
-40628=>5640,
-21240=>5641,
-22199=>5642,
-22198=>5643,
-22196=>5644,
-22204=>5645,
-22756=>5646,
-23360=>5647,
-23363=>5648,
-23421=>5649,
-23542=>5650,
-24009=>5651,
-25080=>5652,
-25082=>5653,
-25880=>5654,
-25876=>5655,
-25881=>5656,
-26342=>5657,
-26407=>5658,
-27372=>5659,
-28734=>5660,
-28720=>5661,
-28722=>5662,
-29200=>5663,
-29563=>5664,
-29903=>5665,
-30306=>5666,
-30309=>5667,
-31014=>5668,
-31018=>5669,
-31020=>5670,
-31019=>5671,
-31431=>5672,
-31478=>5673,
-31820=>5674,
-31811=>5675,
-31821=>5676,
-31983=>5677,
-31984=>5678,
-36782=>5679,
-32381=>5680,
-32380=>5681,
-32386=>5682,
-32588=>5683,
-32768=>5684,
-33242=>5685,
-33382=>5686,
-34299=>5687,
-34297=>5688,
-34321=>5689,
-34298=>5690,
-34310=>5691,
-34315=>5692,
-34311=>5693,
-34314=>5694,
-34836=>5695,
-34837=>5696,
-35172=>5697,
-35258=>5698,
-35320=>5699,
-35696=>5700,
-35692=>5701,
-35686=>5702,
-35695=>5703,
-35679=>5704,
-35691=>5705,
-36111=>5706,
-36109=>5707,
-36489=>5708,
-36481=>5709,
-36485=>5710,
-36482=>5711,
-37300=>5712,
-37323=>5713,
-37912=>5714,
-37891=>5715,
-37885=>5716,
-38369=>5717,
-38704=>5718,
-39108=>5719,
-39250=>5720,
-39249=>5721,
-39336=>5722,
-39467=>5723,
-39472=>5724,
-39479=>5725,
-39477=>5726,
-39955=>5727,
-39949=>5728,
-40569=>5729,
-40629=>5730,
-40680=>5731,
-40751=>5732,
-40799=>5733,
-40803=>5734,
-40801=>5735,
-20791=>5736,
-20792=>5737,
-22209=>5738,
-22208=>5739,
-22210=>5740,
-22804=>5741,
-23660=>5742,
-24013=>5743,
-25084=>5744,
-25086=>5745,
-25885=>5746,
-25884=>5747,
-26005=>5748,
-26345=>5749,
-27387=>5750,
-27396=>5751,
-27386=>5752,
-27570=>5753,
-28748=>5754,
-29211=>5755,
-29351=>5756,
-29910=>5757,
-29908=>5758,
-30313=>5759,
-30675=>5760,
-31824=>5761,
-32399=>5762,
-32396=>5763,
-32700=>5764,
-34327=>5765,
-34349=>5766,
-34330=>5767,
-34851=>5768,
-34850=>5769,
-34849=>5770,
-34847=>5771,
-35178=>5772,
-35180=>5773,
-35261=>5774,
-35700=>5775,
-35703=>5776,
-35709=>5777,
-36115=>5778,
-36490=>5779,
-36493=>5780,
-36491=>5781,
-36703=>5782,
-36783=>5783,
-37306=>5784,
-37934=>5785,
-37939=>5786,
-37941=>5787,
-37946=>5788,
-37944=>5789,
-37938=>5790,
-37931=>5791,
-38370=>5792,
-38712=>5793,
-38713=>5794,
-38706=>5795,
-38911=>5796,
-58586=>5796,
-39015=>5797,
-39013=>5798,
-39255=>5799,
-39493=>5800,
-39491=>5801,
-39488=>5802,
-39486=>5803,
-39631=>5804,
-39764=>5805,
-39761=>5806,
-39981=>5807,
-39973=>5808,
-40367=>5809,
-40372=>5810,
-40386=>5811,
-40376=>5812,
-40605=>5813,
-40687=>5814,
-40729=>5815,
-40796=>5816,
-40806=>5817,
-40807=>5818,
-20796=>5819,
-20795=>5820,
-22216=>5821,
-22218=>5822,
-22217=>5823,
-23423=>5824,
-24020=>5825,
-24018=>5826,
-24398=>5827,
-25087=>5828,
-25892=>5829,
-27402=>5830,
-27489=>5831,
-28753=>5832,
-28760=>5833,
-29568=>5834,
-29924=>5835,
-30090=>5836,
-30318=>5837,
-30316=>5838,
-31155=>5839,
-31840=>5840,
-31839=>5841,
-32894=>5842,
-32893=>5843,
-33247=>5844,
-35186=>5845,
-35183=>5846,
-35324=>5847,
-35712=>5848,
-36118=>5849,
-36119=>5850,
-36497=>5851,
-36499=>5852,
-36705=>5853,
-37192=>5854,
-37956=>5855,
-37969=>5856,
-37970=>5857,
-38717=>5858,
-38718=>5859,
-38851=>5860,
-38849=>5861,
-39019=>5862,
-39253=>5863,
-39509=>5864,
-39501=>5865,
-39634=>5866,
-39706=>5867,
-40009=>5868,
-39985=>5869,
-39998=>5870,
-39995=>5871,
-40403=>5872,
-40407=>5873,
-40756=>5874,
-40812=>5875,
-40810=>5876,
-40852=>5877,
-22220=>5878,
-24022=>5879,
-25088=>5880,
-25891=>5881,
-25899=>5882,
-25898=>5883,
-26348=>5884,
-27408=>5885,
-29914=>5886,
-31434=>5887,
-31844=>5888,
-31843=>5889,
-31845=>5890,
-32403=>5891,
-32406=>5892,
-32404=>5893,
-33250=>5894,
-34360=>5895,
-34367=>5896,
-34865=>5897,
-35722=>5898,
-37008=>5899,
-37007=>5900,
-37987=>5901,
-37984=>5902,
-37988=>5903,
-38760=>5904,
-39023=>5905,
-39260=>5906,
-39514=>5907,
-39515=>5908,
-39511=>5909,
-39635=>5910,
-39636=>5911,
-39633=>5912,
-40020=>5913,
-40023=>5914,
-40022=>5915,
-40421=>5916,
-40607=>5917,
-40692=>5918,
-22225=>5919,
-22761=>5920,
-25900=>5921,
-28766=>5922,
-30321=>5923,
-30322=>5924,
-30679=>5925,
-60226=>5925,
-32592=>5926,
-32648=>5927,
-34870=>5928,
-34873=>5929,
-34914=>5930,
-35731=>5931,
-35730=>5932,
-35734=>5933,
-33399=>5934,
-36123=>5935,
-37312=>5936,
-37994=>5937,
-38722=>5938,
-38728=>5939,
-38724=>5940,
-38854=>5941,
-39024=>5942,
-39519=>5943,
-39714=>5944,
-39768=>5945,
-40031=>5946,
-40441=>5947,
-40442=>5948,
-40572=>5949,
-40573=>5950,
-40711=>5951,
-40823=>5952,
-40818=>5953,
-24307=>5954,
-27414=>5955,
-28771=>5956,
-31852=>5957,
-31854=>5958,
-34875=>5959,
-35264=>5960,
-36513=>5961,
-37313=>5962,
-38002=>5963,
-38000=>5964,
-39025=>5965,
-39262=>5966,
-39638=>5967,
-39715=>5968,
-40652=>5969,
-28772=>5970,
-30682=>5971,
-35738=>5972,
-38007=>5973,
-38857=>5974,
-39522=>5975,
-39525=>5976,
-32412=>5977,
-35740=>5978,
-36522=>5979,
-37317=>5980,
-38013=>5981,
-38014=>5982,
-38012=>5983,
-40055=>5984,
-40056=>5985,
-40695=>5986,
-35924=>5987,
-38015=>5988,
-40474=>5989,
-29224=>5990,
-39530=>5991,
-39729=>5992,
-40475=>5993,
-40478=>5994,
-31858=>5995,
-20034=>5996,
-20060=>5997,
-12048=>5998,
-20981=>5998,
-12053=>5999,
-21274=>5999,
-12058=>6000,
-21378=>6000,
-19975=>6001,
-19980=>6002,
-20039=>6003,
-20109=>6004,
-12062=>6005,
-22231=>6005,
-12076=>6006,
-23662=>6006,
-12091=>6007,
-24435=>6007,
-19983=>6008,
-20871=>6009,
-19982=>6010,
-20014=>6011,
-20115=>6012,
-20162=>6013,
-20169=>6014,
-20168=>6015,
-20888=>6016,
-21244=>6017,
-21356=>6018,
-21433=>6019,
-22304=>6020,
-22787=>6021,
-22828=>6022,
-23568=>6023,
-60417=>6023,
-24063=>6024,
-26081=>6025,
-12110=>6026,
-27571=>6026,
-27596=>6027,
-12115=>6028,
-27668=>6028,
-12121=>6029,
-29247=>6029,
-20017=>6030,
-20028=>6031,
-20200=>6032,
-20188=>6033,
-20201=>6034,
-20193=>6035,
-20189=>6036,
-20186=>6037,
-21004=>6038,
-21001=>6039,
-21276=>6040,
-21324=>6041,
-22306=>6042,
-22307=>6043,
-22807=>6044,
-22831=>6045,
-23425=>6046,
-23428=>6047,
-23570=>6048,
-23611=>6049,
-23668=>6050,
-23667=>6051,
-24068=>6052,
-24192=>6053,
-24194=>6054,
-24521=>6055,
-25097=>6056,
-25168=>6057,
-27669=>6058,
-27702=>6059,
-27715=>6060,
-27711=>6061,
-27707=>6062,
-29358=>6063,
-29360=>6064,
-29578=>6065,
-12145=>6066,
-31160=>6066,
-32906=>6067,
-38430=>6068,
-20238=>6069,
-20248=>6070,
-20268=>6071,
-20213=>6072,
-20244=>6073,
-20209=>6074,
-20224=>6075,
-20215=>6076,
-20232=>6077,
-20253=>6078,
-20226=>6079,
-20229=>6080,
-20258=>6081,
-20243=>6082,
-20228=>6083,
-20212=>6084,
-20242=>6085,
-20913=>6086,
-21011=>6087,
-21008=>6088,
-21158=>6089,
-21282=>6090,
-21279=>6091,
-21325=>6092,
-21386=>6093,
-21511=>6094,
-22241=>6095,
-22239=>6096,
-22318=>6097,
-22314=>6098,
-22324=>6099,
-22844=>6100,
-22912=>6101,
-22908=>6102,
-22917=>6103,
-22907=>6104,
-22910=>6105,
-22903=>6106,
-22911=>6107,
-23382=>6108,
-23573=>6109,
-23589=>6110,
-23676=>6111,
-23674=>6112,
-23675=>6113,
-23678=>6114,
-24031=>6115,
-24181=>6116,
-57646=>6116,
-24196=>6117,
-24322=>6118,
-24346=>6119,
-24436=>6120,
-24533=>6121,
-24532=>6122,
-24527=>6123,
-25180=>6124,
-25182=>6125,
-25188=>6126,
-25185=>6127,
-25190=>6128,
-25186=>6129,
-25177=>6130,
-25184=>6131,
-25178=>6132,
-25189=>6133,
-25911=>6134,
-26095=>6135,
-26094=>6136,
-26430=>6137,
-26425=>6138,
-26424=>6139,
-26427=>6140,
-26426=>6141,
-26431=>6142,
-26428=>6143,
-26419=>6144,
-27672=>6145,
-27718=>6146,
-27730=>6147,
-27740=>6148,
-27727=>6149,
-27722=>6150,
-60796=>6150,
-27732=>6151,
-27723=>6152,
-27724=>6153,
-28785=>6154,
-29278=>6155,
-29364=>6156,
-29365=>6157,
-29582=>6158,
-29994=>6159,
-30335=>6160,
-31349=>6161,
-12153=>6162,
-32593=>6162,
-12171=>6163,
-33400=>6163,
-33404=>6164,
-33408=>6165,
-33405=>6166,
-33407=>6167,
-12172=>6168,
-34381=>6168,
-12177=>6169,
-35198=>6169,
-37017=>6170,
-59347=>6171,
-37015=>6171,
-37016=>6172,
-37019=>6173,
-37012=>6174,
-38434=>6175,
-38436=>6176,
-38432=>6177,
-38435=>6178,
-20310=>6179,
-20283=>6180,
-20322=>6181,
-20297=>6182,
-20307=>6183,
-20324=>6184,
-20286=>6185,
-20327=>6186,
-20306=>6187,
-20319=>6188,
-20289=>6189,
-20312=>6190,
-20269=>6191,
-20275=>6192,
-20287=>6193,
-20321=>6194,
-20879=>6195,
-20921=>6196,
-21020=>6197,
-21022=>6198,
-21025=>6199,
-21165=>6200,
-21166=>6201,
-21257=>6202,
-21347=>6203,
-21362=>6204,
-21390=>6205,
-21391=>6206,
-21552=>6207,
-21559=>6208,
-21546=>6209,
-21588=>6210,
-21573=>6211,
-21529=>6212,
-21532=>6213,
-21541=>6214,
-21528=>6215,
-21565=>6216,
-21583=>6217,
-21569=>6218,
-21544=>6219,
-21540=>6220,
-21575=>6221,
-22254=>6222,
-22247=>6223,
-22245=>6224,
-22337=>6225,
-22341=>6226,
-22348=>6227,
-22345=>6228,
-22347=>6229,
-22354=>6230,
-22790=>6231,
-22848=>6232,
-22950=>6233,
-22936=>6234,
-22944=>6235,
-22935=>6236,
-22926=>6237,
-22946=>6238,
-22928=>6239,
-22927=>6240,
-22951=>6241,
-22945=>6242,
-23438=>6243,
-23442=>6244,
-23592=>6245,
-23594=>6246,
-23693=>6247,
-23695=>6248,
-23688=>6249,
-23691=>6250,
-23689=>6251,
-23698=>6252,
-23690=>6253,
-23686=>6254,
-23699=>6255,
-23701=>6256,
-24032=>6257,
-24074=>6258,
-24078=>6259,
-24203=>6260,
-24201=>6261,
-24204=>6262,
-24200=>6263,
-24205=>6264,
-24325=>6265,
-24349=>6266,
-24440=>6267,
-24438=>6268,
-24530=>6269,
-24529=>6270,
-24528=>6271,
-24557=>6272,
-24552=>6273,
-24558=>6274,
-24563=>6275,
-24545=>6276,
-24548=>6277,
-24547=>6278,
-24570=>6279,
-24559=>6280,
-24567=>6281,
-24571=>6282,
-24576=>6283,
-24564=>6284,
-25146=>6285,
-25219=>6286,
-25228=>6287,
-25230=>6288,
-25231=>6289,
-25236=>6290,
-25223=>6291,
-25201=>6292,
-25211=>6293,
-25210=>6294,
-25200=>6295,
-25217=>6296,
-25224=>6297,
-25207=>6298,
-25213=>6299,
-25202=>6300,
-25204=>6301,
-26096=>6302,
-26100=>6303,
-26099=>6304,
-26098=>6305,
-26101=>6306,
-26437=>6307,
-26439=>6308,
-26457=>6309,
-26453=>6310,
-26444=>6311,
-26440=>6312,
-26461=>6313,
-26445=>6314,
-26458=>6315,
-26443=>6316,
-27600=>6317,
-27673=>6318,
-27674=>6319,
-27768=>6320,
-27751=>6321,
-27755=>6322,
-27780=>6323,
-27787=>6324,
-27791=>6325,
-27761=>6326,
-27759=>6327,
-27753=>6328,
-27802=>6329,
-27757=>6330,
-27783=>6331,
-27797=>6332,
-27804=>6333,
-57900=>6333,
-27750=>6334,
-27763=>6335,
-27749=>6336,
-27771=>6337,
-27790=>6338,
-28788=>6339,
-28794=>6340,
-29283=>6341,
-29375=>6342,
-29373=>6343,
-29379=>6344,
-29382=>6345,
-29377=>6346,
-29370=>6347,
-29381=>6348,
-29589=>6349,
-29591=>6350,
-29587=>6351,
-29588=>6352,
-29586=>6353,
-30010=>6354,
-30009=>6355,
-30100=>6356,
-30101=>6357,
-30337=>6358,
-31037=>6359,
-32820=>6360,
-32917=>6361,
-32921=>6362,
-32912=>6363,
-32914=>6364,
-32924=>6365,
-33424=>6366,
-33423=>6367,
-33413=>6368,
-33422=>6369,
-33425=>6370,
-33427=>6371,
-33418=>6372,
-33411=>6373,
-33412=>6374,
-12184=>6375,
-35960=>6375,
-36809=>6376,
-36799=>6377,
-37023=>6378,
-37025=>6379,
-37029=>6380,
-37022=>6381,
-37031=>6382,
-37024=>6383,
-38448=>6384,
-38440=>6385,
-38447=>6386,
-38445=>6387,
-20019=>6388,
-20376=>6389,
-20348=>6390,
-20357=>6391,
-20349=>6392,
-20352=>6393,
-20359=>6394,
-20342=>6395,
-20340=>6396,
-20361=>6397,
-20356=>6398,
-20343=>6399,
-20300=>6400,
-20375=>6401,
-20330=>6402,
-20378=>6403,
-20345=>6404,
-20353=>6405,
-20344=>6406,
-20368=>6407,
-20380=>6408,
-20372=>6409,
-20382=>6410,
-20370=>6411,
-20354=>6412,
-20373=>6413,
-20331=>6414,
-20334=>6415,
-20894=>6416,
-20924=>6417,
-20926=>6418,
-21045=>6419,
-21042=>6420,
-21043=>6421,
-21062=>6422,
-21041=>6423,
-21180=>6424,
-21258=>6425,
-21259=>6426,
-21308=>6427,
-21394=>6428,
-21396=>6429,
-21639=>6430,
-21631=>6431,
-21633=>6432,
-21649=>6433,
-21634=>6434,
-21640=>6435,
-21611=>6436,
-21626=>6437,
-21630=>6438,
-21605=>6439,
-21612=>6440,
-21620=>6441,
-21606=>6442,
-21645=>6443,
-21615=>6444,
-21601=>6445,
-21600=>6446,
-21656=>6447,
-21603=>6448,
-21607=>6449,
-21604=>6450,
-22263=>6451,
-22265=>6452,
-22383=>6453,
-22386=>6454,
-22381=>6455,
-22379=>6456,
-22385=>6457,
-22384=>6458,
-22390=>6459,
-22400=>6460,
-22389=>6461,
-22395=>6462,
-22387=>6463,
-22388=>6464,
-22370=>6465,
-22376=>6466,
-22397=>6467,
-22796=>6468,
-22853=>6469,
-22965=>6470,
-22970=>6471,
-22991=>6472,
-22990=>6473,
-22962=>6474,
-22988=>6475,
-22977=>6476,
-22966=>6477,
-22972=>6478,
-22979=>6479,
-22998=>6480,
-22961=>6481,
-22973=>6482,
-22976=>6483,
-22984=>6484,
-22964=>6485,
-22983=>6486,
-23394=>6487,
-23397=>6488,
-23443=>6489,
-23445=>6490,
-23620=>6491,
-23623=>6492,
-23726=>6493,
-23716=>6494,
-23712=>6495,
-23733=>6496,
-23727=>6497,
-23720=>6498,
-23724=>6499,
-23711=>6500,
-23715=>6501,
-23725=>6502,
-23714=>6503,
-23722=>6504,
-23719=>6505,
-23709=>6506,
-23717=>6507,
-23734=>6508,
-23728=>6509,
-23718=>6510,
-24087=>6511,
-24084=>6512,
-24089=>6513,
-24360=>6514,
-24354=>6515,
-24355=>6516,
-24356=>6517,
-24404=>6518,
-24450=>6519,
-24446=>6520,
-24445=>6521,
-24542=>6522,
-24549=>6523,
-24621=>6524,
-24614=>6525,
-24601=>6526,
-24626=>6527,
-24587=>6528,
-24628=>6529,
-24586=>6530,
-24599=>6531,
-24627=>6532,
-24602=>6533,
-24606=>6534,
-24620=>6535,
-24610=>6536,
-24589=>6537,
-24592=>6538,
-24622=>6539,
-24595=>6540,
-24593=>6541,
-24588=>6542,
-24585=>6543,
-24604=>6544,
-25108=>6545,
-25149=>6546,
-25261=>6547,
-25268=>6548,
-25297=>6549,
-25278=>6550,
-25258=>6551,
-25270=>6552,
-25290=>6553,
-25262=>6554,
-25267=>6555,
-25263=>6556,
-25275=>6557,
-25257=>6558,
-25264=>6559,
-25272=>6560,
-25917=>6561,
-26024=>6562,
-26043=>6563,
-26121=>6564,
-26108=>6565,
-26116=>6566,
-26130=>6567,
-26120=>6568,
-26107=>6569,
-26115=>6570,
-26123=>6571,
-26125=>6572,
-26117=>6573,
-26109=>6574,
-26129=>6575,
-26128=>6576,
-26358=>6577,
-26378=>6578,
-26501=>6579,
-26476=>6580,
-26510=>6581,
-26514=>6582,
-26486=>6583,
-26491=>6584,
-26520=>6585,
-26502=>6586,
-26500=>6587,
-26484=>6588,
-26509=>6589,
-26508=>6590,
-26490=>6591,
-26527=>6592,
-26513=>6593,
-26521=>6594,
-26499=>6595,
-26493=>6596,
-26497=>6597,
-26488=>6598,
-26489=>6599,
-26516=>6600,
-27429=>6601,
-27520=>6602,
-27518=>6603,
-27614=>6604,
-27677=>6605,
-27795=>6606,
-27884=>6607,
-27883=>6608,
-27886=>6609,
-27865=>6610,
-27830=>6611,
-27860=>6612,
-27821=>6613,
-27879=>6614,
-27831=>6615,
-27856=>6616,
-27842=>6617,
-27834=>6618,
-27843=>6619,
-27846=>6620,
-27885=>6621,
-27890=>6622,
-27858=>6623,
-27869=>6624,
-27828=>6625,
-27786=>6626,
-27805=>6627,
-27776=>6628,
-27870=>6629,
-27840=>6630,
-27952=>6631,
-27853=>6632,
-27847=>6633,
-27824=>6634,
-27897=>6635,
-27855=>6636,
-27881=>6637,
-27857=>6638,
-28820=>6639,
-28824=>6640,
-28805=>6641,
-28819=>6642,
-28806=>6643,
-28804=>6644,
-28817=>6645,
-28822=>6646,
-28802=>6647,
-28826=>6648,
-28803=>6649,
-29290=>6650,
-29398=>6651,
-29387=>6652,
-29400=>6653,
-29385=>6654,
-29404=>6655,
-29394=>6656,
-29396=>6657,
-29402=>6658,
-29388=>6659,
-29393=>6660,
-29604=>6661,
-29601=>6662,
-29613=>6663,
-29606=>6664,
-29602=>6665,
-29600=>6666,
-29612=>6667,
-29597=>6668,
-29917=>6669,
-29928=>6670,
-30015=>6671,
-30016=>6672,
-30014=>6673,
-30092=>6674,
-30104=>6675,
-30383=>6676,
-30451=>6677,
-30449=>6678,
-30448=>6679,
-30453=>6680,
-30712=>6681,
-30716=>6682,
-30713=>6683,
-30715=>6684,
-30714=>6685,
-30711=>6686,
-31042=>6687,
-31039=>6688,
-31173=>6689,
-31352=>6690,
-31355=>6691,
-31483=>6692,
-31861=>6693,
-31997=>6694,
-32821=>6695,
-32911=>6696,
-32942=>6697,
-32931=>6698,
-32952=>6699,
-32949=>6700,
-32941=>6701,
-33312=>6702,
-33440=>6703,
-33472=>6704,
-33451=>6705,
-33434=>6706,
-33432=>6707,
-33435=>6708,
-33461=>6709,
-33447=>6710,
-33454=>6711,
-33468=>6712,
-33438=>6713,
-33466=>6714,
-33460=>6715,
-33448=>6716,
-33441=>6717,
-33449=>6718,
-33474=>6719,
-33444=>6720,
-33475=>6721,
-33462=>6722,
-33442=>6723,
-34416=>6724,
-34415=>6725,
-34413=>6726,
-34414=>6727,
-35926=>6728,
-36818=>6729,
-36811=>6730,
-36819=>6731,
-36813=>6732,
-36822=>6733,
-36821=>6734,
-36823=>6735,
-37042=>6736,
-37044=>6737,
-37039=>6738,
-37043=>6739,
-37040=>6740,
-38457=>6741,
-38461=>6742,
-38460=>6743,
-38458=>6744,
-38467=>6745,
-20429=>6746,
-20421=>6747,
-20435=>6748,
-20402=>6749,
-20425=>6750,
-20427=>6751,
-20417=>6752,
-20436=>6753,
-20444=>6754,
-20441=>6755,
-20411=>6756,
-60346=>6756,
-20403=>6757,
-20443=>6758,
-20423=>6759,
-20438=>6760,
-20410=>6761,
-20416=>6762,
-20409=>6763,
-20460=>6764,
-21060=>6765,
-21065=>6766,
-21184=>6767,
-21186=>6768,
-21309=>6769,
-21372=>6770,
-21399=>6771,
-21398=>6772,
-21401=>6773,
-21400=>6774,
-21690=>6775,
-21665=>6776,
-21677=>6777,
-21669=>6778,
-21711=>6779,
-21699=>6780,
-33549=>6781,
-21687=>6782,
-21678=>6783,
-21718=>6784,
-21686=>6785,
-21701=>6786,
-21702=>6787,
-21664=>6788,
-21616=>6789,
-21692=>6790,
-21666=>6791,
-21694=>6792,
-21618=>6793,
-21726=>6794,
-21680=>6795,
-22453=>6796,
-22430=>6797,
-22431=>6798,
-22436=>6799,
-22412=>6800,
-22423=>6801,
-22429=>6802,
-22427=>6803,
-22420=>6804,
-22424=>6805,
-22415=>6806,
-22425=>6807,
-22437=>6808,
-22426=>6809,
-22421=>6810,
-22772=>6811,
-22797=>6812,
-22867=>6813,
-23009=>6814,
-23006=>6815,
-23022=>6816,
-23040=>6817,
-23025=>6818,
-23005=>6819,
-23034=>6820,
-23037=>6821,
-23036=>6822,
-23030=>6823,
-23012=>6824,
-23026=>6825,
-23031=>6826,
-23003=>6827,
-23017=>6828,
-23027=>6829,
-23029=>6830,
-23008=>6831,
-23038=>6832,
-23028=>6833,
-23021=>6834,
-23464=>6835,
-23628=>6836,
-23760=>6837,
-23768=>6838,
-23756=>6839,
-23767=>6840,
-23755=>6841,
-23771=>6842,
-23774=>6843,
-23770=>6844,
-23753=>6845,
-23751=>6846,
-23754=>6847,
-23766=>6848,
-23763=>6849,
-23764=>6850,
-23759=>6851,
-23752=>6852,
-23750=>6853,
-23758=>6854,
-23775=>6855,
-23800=>6856,
-24057=>6857,
-24097=>6858,
-24098=>6859,
-24099=>6860,
-24096=>6861,
-24100=>6862,
-24240=>6863,
-24228=>6864,
-24226=>6865,
-24219=>6866,
-24227=>6867,
-24229=>6868,
-24327=>6869,
-24366=>6870,
-24406=>6871,
-24454=>6872,
-24631=>6873,
-24633=>6874,
-24660=>6875,
-24690=>6876,
-24670=>6877,
-24645=>6878,
-24659=>6879,
-24647=>6880,
-24649=>6881,
-24667=>6882,
-24652=>6883,
-24640=>6884,
-24642=>6885,
-24671=>6886,
-24612=>6887,
-24644=>6888,
-24664=>6889,
-24678=>6890,
-24686=>6891,
-25154=>6892,
-25155=>6893,
-25295=>6894,
-25357=>6895,
-25355=>6896,
-25333=>6897,
-25358=>6898,
-25347=>6899,
-25323=>6900,
-25337=>6901,
-25359=>6902,
-25356=>6903,
-25336=>6904,
-25334=>6905,
-25344=>6906,
-25363=>6907,
-25364=>6908,
-25338=>6909,
-25365=>6910,
-25339=>6911,
-25328=>6912,
-25921=>6913,
-25923=>6914,
-26026=>6915,
-26047=>6916,
-26166=>6917,
-26145=>6918,
-26162=>6919,
-26165=>6920,
-26140=>6921,
-26150=>6922,
-26146=>6923,
-26163=>6924,
-26155=>6925,
-26170=>6926,
-26141=>6927,
-26164=>6928,
-26169=>6929,
-26158=>6930,
-26383=>6931,
-26384=>6932,
-26561=>6933,
-26610=>6934,
-26568=>6935,
-26554=>6936,
-26588=>6937,
-26555=>6938,
-26616=>6939,
-26584=>6940,
-26560=>6941,
-26551=>6942,
-26565=>6943,
-26603=>6944,
-26596=>6945,
-26591=>6946,
-26549=>6947,
-26573=>6948,
-26547=>6949,
-26615=>6950,
-26614=>6951,
-26606=>6952,
-26595=>6953,
-26562=>6954,
-26553=>6955,
-26574=>6956,
-26599=>6957,
-26608=>6958,
-26546=>6959,
-26620=>6960,
-26566=>6961,
-26605=>6962,
-26572=>6963,
-26542=>6964,
-26598=>6965,
-26587=>6966,
-26618=>6967,
-26569=>6968,
-26570=>6969,
-26563=>6970,
-26602=>6971,
-26571=>6972,
-27432=>6973,
-27522=>6974,
-27524=>6975,
-27574=>6976,
-27606=>6977,
-27608=>6978,
-27616=>6979,
-27680=>6980,
-27681=>6981,
-27944=>6982,
-27956=>6983,
-27949=>6984,
-27935=>6985,
-27964=>6986,
-27967=>6987,
-27922=>6988,
-27914=>6989,
-27866=>6990,
-27955=>6991,
-27908=>6992,
-27929=>6993,
-27962=>6994,
-27930=>6995,
-27921=>6996,
-27904=>6997,
-27933=>6998,
-27970=>6999,
-27905=>7000,
-27928=>7001,
-27959=>7002,
-27907=>7003,
-27919=>7004,
-27968=>7005,
-27911=>7006,
-27936=>7007,
-27948=>7008,
-27912=>7009,
-27938=>7010,
-27913=>7011,
-27920=>7012,
-28855=>7013,
-28831=>7014,
-28862=>7015,
-28849=>7016,
-28848=>7017,
-28833=>7018,
-28852=>7019,
-28853=>7020,
-28841=>7021,
-29249=>7022,
-29257=>7023,
-29258=>7024,
-29292=>7025,
-29296=>7026,
-29299=>7027,
-29294=>7028,
-29386=>7029,
-29412=>7030,
-29416=>7031,
-29419=>7032,
-29407=>7033,
-29418=>7034,
-29414=>7035,
-29411=>7036,
-29573=>7037,
-29644=>7038,
-29634=>7039,
-29640=>7040,
-29637=>7041,
-29625=>7042,
-29622=>7043,
-29621=>7044,
-29620=>7045,
-29675=>7046,
-29631=>7047,
-29639=>7048,
-29630=>7049,
-29635=>7050,
-29638=>7051,
-29624=>7052,
-29643=>7053,
-29932=>7054,
-29934=>7055,
-29998=>7056,
-30023=>7057,
-30024=>7058,
-30119=>7059,
-30122=>7060,
-30329=>7061,
-30404=>7062,
-30472=>7063,
-30467=>7064,
-30468=>7065,
-30469=>7066,
-30474=>7067,
-30455=>7068,
-30459=>7069,
-30458=>7070,
-30695=>7071,
-30696=>7072,
-30726=>7073,
-30737=>7074,
-30738=>7075,
-30725=>7076,
-30736=>7077,
-30735=>7078,
-30734=>7079,
-30729=>7080,
-58095=>7080,
-30723=>7081,
-30739=>7082,
-31050=>7083,
-31052=>7084,
-31051=>7085,
-31045=>7086,
-31044=>7087,
-31189=>7088,
-31181=>7089,
-31183=>7090,
-31190=>7091,
-31182=>7092,
-31360=>7093,
-31358=>7094,
-31441=>7095,
-31488=>7096,
-31489=>7097,
-31866=>7098,
-31864=>7099,
-31865=>7100,
-31871=>7101,
-31872=>7102,
-31873=>7103,
-32003=>7104,
-32008=>7105,
-32001=>7106,
-32600=>7107,
-32657=>7108,
-32653=>7109,
-32702=>7110,
-32775=>7111,
-32782=>7112,
-32783=>7113,
-32788=>7114,
-32823=>7115,
-32984=>7116,
-32967=>7117,
-32992=>7118,
-32977=>7119,
-32968=>7120,
-32962=>7121,
-32976=>7122,
-32965=>7123,
-32995=>7124,
-32985=>7125,
-32988=>7126,
-32970=>7127,
-32981=>7128,
-32969=>7129,
-32975=>7130,
-32983=>7131,
-32998=>7132,
-32973=>7133,
-33279=>7134,
-33313=>7135,
-33428=>7136,
-33497=>7137,
-33534=>7138,
-33529=>7139,
-33543=>7140,
-33512=>7141,
-33536=>7142,
-33493=>7143,
-33594=>7144,
-33515=>7145,
-33494=>7146,
-33524=>7147,
-33516=>7148,
-33505=>7149,
-33522=>7150,
-33525=>7151,
-33548=>7152,
-33531=>7153,
-33526=>7154,
-33520=>7155,
-33514=>7156,
-33508=>7157,
-33504=>7158,
-33530=>7159,
-33523=>7160,
-33517=>7161,
-34423=>7162,
-34420=>7163,
-34428=>7164,
-34419=>7165,
-34881=>7166,
-34894=>7167,
-34919=>7168,
-34922=>7169,
-34921=>7170,
-35283=>7171,
-35332=>7172,
-35335=>7173,
-36210=>7174,
-36835=>7175,
-36833=>7176,
-36846=>7177,
-36832=>7178,
-37105=>7179,
-37053=>7180,
-37055=>7181,
-37077=>7182,
-37061=>7183,
-37054=>7184,
-37063=>7185,
-37067=>7186,
-37064=>7187,
-37332=>7188,
-60294=>7188,
-37331=>7189,
-38484=>7190,
-38479=>7191,
-38481=>7192,
-38483=>7193,
-38474=>7194,
-38478=>7195,
-20510=>7196,
-20485=>7197,
-20487=>7198,
-20499=>7199,
-20514=>7200,
-20528=>7201,
-20507=>7202,
-20469=>7203,
-20468=>7204,
-20531=>7205,
-20535=>7206,
-20524=>7207,
-20470=>7208,
-20471=>7209,
-20503=>7210,
-20508=>7211,
-20512=>7212,
-20519=>7213,
-20533=>7214,
-20527=>7215,
-20529=>7216,
-20494=>7217,
-20826=>7218,
-20884=>7219,
-20883=>7220,
-20938=>7221,
-20932=>7222,
-20933=>7223,
-20936=>7224,
-20942=>7225,
-21089=>7226,
-21082=>7227,
-21074=>7228,
-21086=>7229,
-21087=>7230,
-21077=>7231,
-21090=>7232,
-21197=>7233,
-21262=>7234,
-21406=>7235,
-21798=>7236,
-21730=>7237,
-21783=>7238,
-21778=>7239,
-21735=>7240,
-21747=>7241,
-21732=>7242,
-21786=>7243,
-21759=>7244,
-21764=>7245,
-21768=>7246,
-21739=>7247,
-21777=>7248,
-21765=>7249,
-21745=>7250,
-21770=>7251,
-21755=>7252,
-21751=>7253,
-21752=>7254,
-21728=>7255,
-21774=>7256,
-21763=>7257,
-21771=>7258,
-22273=>7259,
-22274=>7260,
-22476=>7261,
-22578=>7262,
-22485=>7263,
-22482=>7264,
-22458=>7265,
-22470=>7266,
-22461=>7267,
-22460=>7268,
-22456=>7269,
-22454=>7270,
-22463=>7271,
-22471=>7272,
-22480=>7273,
-22457=>7274,
-22465=>7275,
-22798=>7276,
-22858=>7277,
-23065=>7278,
-23062=>7279,
-23085=>7280,
-23086=>7281,
-23061=>7282,
-23055=>7283,
-23063=>7284,
-23050=>7285,
-23070=>7286,
-23091=>7287,
-23404=>7288,
-23463=>7289,
-23469=>7290,
-23468=>7291,
-23555=>7292,
-23638=>7293,
-23636=>7294,
-23788=>7295,
-23807=>7296,
-23790=>7297,
-23793=>7298,
-23799=>7299,
-23808=>7300,
-23801=>7301,
-24105=>7302,
-24104=>7303,
-24232=>7304,
-24238=>7305,
-24234=>7306,
-24236=>7307,
-24371=>7308,
-24368=>7309,
-24423=>7310,
-24669=>7311,
-24666=>7312,
-24679=>7313,
-24641=>7314,
-24738=>7315,
-24712=>7316,
-24704=>7317,
-24722=>7318,
-24705=>7319,
-24733=>7320,
-24707=>7321,
-24725=>7322,
-24731=>7323,
-24727=>7324,
-24711=>7325,
-24732=>7326,
-24718=>7327,
-25113=>7328,
-25158=>7329,
-25330=>7330,
-25360=>7331,
-25430=>7332,
-25388=>7333,
-25412=>7334,
-25413=>7335,
-25398=>7336,
-25411=>7337,
-25572=>7338,
-25401=>7339,
-25419=>7340,
-25418=>7341,
-25404=>7342,
-25385=>7343,
-25409=>7344,
-25396=>7345,
-25432=>7346,
-25428=>7347,
-25433=>7348,
-25389=>7349,
-25415=>7350,
-25395=>7351,
-25434=>7352,
-25425=>7353,
-25400=>7354,
-25431=>7355,
-25408=>7356,
-25416=>7357,
-25930=>7358,
-25926=>7359,
-26054=>7360,
-26051=>7361,
-26052=>7362,
-26050=>7363,
-26186=>7364,
-26207=>7365,
-26183=>7366,
-26193=>7367,
-26386=>7368,
-26387=>7369,
-26655=>7370,
-26650=>7371,
-26697=>7372,
-26674=>7373,
-26675=>7374,
-26683=>7375,
-26699=>7376,
-26703=>7377,
-26646=>7378,
-26673=>7379,
-26652=>7380,
-26677=>7381,
-26667=>7382,
-26669=>7383,
-26671=>7384,
-26702=>7385,
-26692=>7386,
-26676=>7387,
-26653=>7388,
-26642=>7389,
-26644=>7390,
-26662=>7391,
-26664=>7392,
-26670=>7393,
-26701=>7394,
-26682=>7395,
-26661=>7396,
-26656=>7397,
-27436=>7398,
-27439=>7399,
-27437=>7400,
-27441=>7401,
-27444=>7402,
-27501=>7403,
-32898=>7404,
-27528=>7405,
-27622=>7406,
-27620=>7407,
-27624=>7408,
-27619=>7409,
-27618=>7410,
-27623=>7411,
-27685=>7412,
-28026=>7413,
-28003=>7414,
-28004=>7415,
-28022=>7416,
-27917=>7417,
-28001=>7418,
-28050=>7419,
-27992=>7420,
-28002=>7421,
-28013=>7422,
-28015=>7423,
-28049=>7424,
-28045=>7425,
-28143=>7426,
-28031=>7427,
-28038=>7428,
-27998=>7429,
-28007=>7430,
-59078=>7430,
-28000=>7431,
-28055=>7432,
-28016=>7433,
-28028=>7434,
-27999=>7435,
-28034=>7436,
-28056=>7437,
-27951=>7438,
-28008=>7439,
-28043=>7440,
-28030=>7441,
-28032=>7442,
-28036=>7443,
-27926=>7444,
-28035=>7445,
-28027=>7446,
-28029=>7447,
-28021=>7448,
-28048=>7449,
-28892=>7450,
-28883=>7451,
-28881=>7452,
-28893=>7453,
-28875=>7454,
-32569=>7455,
-28898=>7456,
-28887=>7457,
-28882=>7458,
-28894=>7459,
-28896=>7460,
-28884=>7461,
-28877=>7462,
-28869=>7463,
-28870=>7464,
-28871=>7465,
-28890=>7466,
-28878=>7467,
-28897=>7468,
-29250=>7469,
-29304=>7470,
-29303=>7471,
-29302=>7472,
-29440=>7473,
-29434=>7474,
-29428=>7475,
-29438=>7476,
-29430=>7477,
-29427=>7478,
-29435=>7479,
-29441=>7480,
-29651=>7481,
-29657=>7482,
-29669=>7483,
-29654=>7484,
-29628=>7485,
-29671=>7486,
-29667=>7487,
-29673=>7488,
-29660=>7489,
-29650=>7490,
-29659=>7491,
-29652=>7492,
-29661=>7493,
-29658=>7494,
-29655=>7495,
-29656=>7496,
-29672=>7497,
-29918=>7498,
-29919=>7499,
-29940=>7500,
-29941=>7501,
-29985=>7502,
-30043=>7503,
-30047=>7504,
-30128=>7505,
-30145=>7506,
-30139=>7507,
-30148=>7508,
-30144=>7509,
-30143=>7510,
-30134=>7511,
-30138=>7512,
-30346=>7513,
-30409=>7514,
-30493=>7515,
-30491=>7516,
-30480=>7517,
-30483=>7518,
-30482=>7519,
-30499=>7520,
-30481=>7521,
-30485=>7522,
-30489=>7523,
-30490=>7524,
-30498=>7525,
-30503=>7526,
-30755=>7527,
-30764=>7528,
-30754=>7529,
-30773=>7530,
-30767=>7531,
-30760=>7532,
-30766=>7533,
-30763=>7534,
-30753=>7535,
-30761=>7536,
-30771=>7537,
-30762=>7538,
-30769=>7539,
-31060=>7540,
-31067=>7541,
-31055=>7542,
-31068=>7543,
-31059=>7544,
-31058=>7545,
-31057=>7546,
-31211=>7547,
-31212=>7548,
-31200=>7549,
-31214=>7550,
-31213=>7551,
-31210=>7552,
-31196=>7553,
-31198=>7554,
-31197=>7555,
-31366=>7556,
-31369=>7557,
-31365=>7558,
-31371=>7559,
-31372=>7560,
-31370=>7561,
-31367=>7562,
-31448=>7563,
-31504=>7564,
-31492=>7565,
-31507=>7566,
-31493=>7567,
-31503=>7568,
-31496=>7569,
-31498=>7570,
-31502=>7571,
-31497=>7572,
-31506=>7573,
-31876=>7574,
-31889=>7575,
-31882=>7576,
-31884=>7577,
-31880=>7578,
-31885=>7579,
-31877=>7580,
-32030=>7581,
-32029=>7582,
-32017=>7583,
-32014=>7584,
-32024=>7585,
-32022=>7586,
-32019=>7587,
-32031=>7588,
-32018=>7589,
-32015=>7590,
-32012=>7591,
-32604=>7592,
-32609=>7593,
-32606=>7594,
-32608=>7595,
-32605=>7596,
-32603=>7597,
-32662=>7598,
-32658=>7599,
-32707=>7600,
-32706=>7601,
-32704=>7602,
-32790=>7603,
-32830=>7604,
-32825=>7605,
-33018=>7606,
-33010=>7607,
-33017=>7608,
-33013=>7609,
-33025=>7610,
-33019=>7611,
-33024=>7612,
-33281=>7613,
-33327=>7614,
-33317=>7615,
-33587=>7616,
-33581=>7617,
-33604=>7618,
-33561=>7619,
-33617=>7620,
-33573=>7621,
-33622=>7622,
-33599=>7623,
-33601=>7624,
-33574=>7625,
-33564=>7626,
-33570=>7627,
-33602=>7628,
-33614=>7629,
-33563=>7630,
-33578=>7631,
-33544=>7632,
-33596=>7633,
-33613=>7634,
-33558=>7635,
-33572=>7636,
-33568=>7637,
-33591=>7638,
-33583=>7639,
-33577=>7640,
-33607=>7641,
-33605=>7642,
-33612=>7643,
-33619=>7644,
-33566=>7645,
-33580=>7646,
-33611=>7647,
-33575=>7648,
-33608=>7649,
-34387=>7650,
-34386=>7651,
-34466=>7652,
-34472=>7653,
-34454=>7654,
-34445=>7655,
-34449=>7656,
-34462=>7657,
-34439=>7658,
-34455=>7659,
-34438=>7660,
-34443=>7661,
-34458=>7662,
-34437=>7663,
-34469=>7664,
-34457=>7665,
-34465=>7666,
-34471=>7667,
-34453=>7668,
-34456=>7669,
-34446=>7670,
-34461=>7671,
-34448=>7672,
-34452=>7673,
-34883=>7674,
-34884=>7675,
-34925=>7676,
-34933=>7677,
-34934=>7678,
-34930=>7679,
-34944=>7680,
-34929=>7681,
-34943=>7682,
-34927=>7683,
-34947=>7684,
-34942=>7685,
-34932=>7686,
-34940=>7687,
-35346=>7688,
-35911=>7689,
-35927=>7690,
-35963=>7691,
-36004=>7692,
-36003=>7693,
-36214=>7694,
-36216=>7695,
-36277=>7696,
-36279=>7697,
-36278=>7698,
-36561=>7699,
-36563=>7700,
-36862=>7701,
-36853=>7702,
-36866=>7703,
-36863=>7704,
-36859=>7705,
-36868=>7706,
-36860=>7707,
-36854=>7708,
-37078=>7709,
-37088=>7710,
-37081=>7711,
-37082=>7712,
-37091=>7713,
-37087=>7714,
-37093=>7715,
-37080=>7716,
-37083=>7717,
-37079=>7718,
-37084=>7719,
-37092=>7720,
-37200=>7721,
-37198=>7722,
-37199=>7723,
-37333=>7724,
-37346=>7725,
-37338=>7726,
-38492=>7727,
-38495=>7728,
-38588=>7729,
-39139=>7730,
-12221=>7731,
-39647=>7731,
-12223=>7732,
-39727=>7732,
-20095=>7733,
-20592=>7734,
-20586=>7735,
-20577=>7736,
-20574=>7737,
-20576=>7738,
-20563=>7739,
-20555=>7740,
-20573=>7741,
-20594=>7742,
-20552=>7743,
-20557=>7744,
-20545=>7745,
-20571=>7746,
-20554=>7747,
-20578=>7748,
-20501=>7749,
-20549=>7750,
-20575=>7751,
-20585=>7752,
-20587=>7753,
-20579=>7754,
-20580=>7755,
-20550=>7756,
-20544=>7757,
-20590=>7758,
-20595=>7759,
-20567=>7760,
-20561=>7761,
-20944=>7762,
-21099=>7763,
-21101=>7764,
-21100=>7765,
-21102=>7766,
-21206=>7767,
-21203=>7768,
-21293=>7769,
-21404=>7770,
-21877=>7771,
-21878=>7772,
-21820=>7773,
-21837=>7774,
-21840=>7775,
-21812=>7776,
-21802=>7777,
-21841=>7778,
-21858=>7779,
-21814=>7780,
-21813=>7781,
-21808=>7782,
-21842=>7783,
-21829=>7784,
-21772=>7785,
-21810=>7786,
-21861=>7787,
-21838=>7788,
-21817=>7789,
-21832=>7790,
-21805=>7791,
-21819=>7792,
-21824=>7793,
-21835=>7794,
-22282=>7795,
-22279=>7796,
-22523=>7797,
-22548=>7798,
-22498=>7799,
-22518=>7800,
-22492=>7801,
-22516=>7802,
-22528=>7803,
-22509=>7804,
-22525=>7805,
-22536=>7806,
-22520=>7807,
-22539=>7808,
-22515=>7809,
-22479=>7810,
-22535=>7811,
-22510=>7812,
-22499=>7813,
-22514=>7814,
-22501=>7815,
-22508=>7816,
-22497=>7817,
-22542=>7818,
-22524=>7819,
-22544=>7820,
-22503=>7821,
-22529=>7822,
-22540=>7823,
-22513=>7824,
-22505=>7825,
-22512=>7826,
-22541=>7827,
-22532=>7828,
-22876=>7829,
-23136=>7830,
-23128=>7831,
-23125=>7832,
-23143=>7833,
-60437=>7833,
-23134=>7834,
-23096=>7835,
-23093=>7836,
-23149=>7837,
-23120=>7838,
-23135=>7839,
-23141=>7840,
-23148=>7841,
-23123=>7842,
-23140=>7843,
-23127=>7844,
-23107=>7845,
-23133=>7846,
-23122=>7847,
-23108=>7848,
-23131=>7849,
-23112=>7850,
-23182=>7851,
-23102=>7852,
-23117=>7853,
-23097=>7854,
-23116=>7855,
-23152=>7856,
-23145=>7857,
-23111=>7858,
-23121=>7859,
-23126=>7860,
-23106=>7861,
-23132=>7862,
-23410=>7863,
-23406=>7864,
-23489=>7865,
-23488=>7866,
-23641=>7867,
-23838=>7868,
-23819=>7869,
-23837=>7870,
-23834=>7871,
-23840=>7872,
-23820=>7873,
-23848=>7874,
-23821=>7875,
-23846=>7876,
-23845=>7877,
-23823=>7878,
-23856=>7879,
-23826=>7880,
-23843=>7881,
-23839=>7882,
-23854=>7883,
-24126=>7884,
-24116=>7885,
-24241=>7886,
-24244=>7887,
-24249=>7888,
-24242=>7889,
-24243=>7890,
-24374=>7891,
-24376=>7892,
-24475=>7893,
-24470=>7894,
-24479=>7895,
-24714=>7896,
-24720=>7897,
-24710=>7898,
-24766=>7899,
-24752=>7900,
-24762=>7901,
-24787=>7902,
-24788=>7903,
-24783=>7904,
-24804=>7905,
-24793=>7906,
-24797=>7907,
-24776=>7908,
-24753=>7909,
-24795=>7910,
-24759=>7911,
-24778=>7912,
-24767=>7913,
-24771=>7914,
-24781=>7915,
-24768=>7916,
-25394=>7917,
-25445=>7918,
-25482=>7919,
-25474=>7920,
-25469=>7921,
-25533=>7922,
-25502=>7923,
-25517=>7924,
-25501=>7925,
-25495=>7926,
-25515=>7927,
-25486=>7928,
-25455=>7929,
-25479=>7930,
-25488=>7931,
-25454=>7932,
-25519=>7933,
-25461=>7934,
-25500=>7935,
-25453=>7936,
-25518=>7937,
-25468=>7938,
-25508=>7939,
-25403=>7940,
-25503=>7941,
-25464=>7942,
-25477=>7943,
-25473=>7944,
-25489=>7945,
-25485=>7946,
-25456=>7947,
-25939=>7948,
-26061=>7949,
-26213=>7950,
-26209=>7951,
-26203=>7952,
-26201=>7953,
-26204=>7954,
-26210=>7955,
-26392=>7956,
-26745=>7957,
-26759=>7958,
-26768=>7959,
-26780=>7960,
-26733=>7961,
-26734=>7962,
-26798=>7963,
-26795=>7964,
-26966=>7965,
-26735=>7966,
-26787=>7967,
-26796=>7968,
-26793=>7969,
-26741=>7970,
-26740=>7971,
-26802=>7972,
-26767=>7973,
-26743=>7974,
-26770=>7975,
-26748=>7976,
-26731=>7977,
-26738=>7978,
-26794=>7979,
-26752=>7980,
-26737=>7981,
-26750=>7982,
-26779=>7983,
-26774=>7984,
-26763=>7985,
-26784=>7986,
-26761=>7987,
-26788=>7988,
-26744=>7989,
-26747=>7990,
-26769=>7991,
-26764=>7992,
-26762=>7993,
-26749=>7994,
-27446=>7995,
-27443=>7996,
-27447=>7997,
-27448=>7998,
-27537=>7999,
-27535=>8000,
-27533=>8001,
-27534=>8002,
-27532=>8003,
-27690=>8004,
-28096=>8005,
-28075=>8006,
-28084=>8007,
-28083=>8008,
-28276=>8009,
-28076=>8010,
-28137=>8011,
-28130=>8012,
-28087=>8013,
-28150=>8014,
-28116=>8015,
-28160=>8016,
-28104=>8017,
-28128=>8018,
-28127=>8019,
-28118=>8020,
-28094=>8021,
-28133=>8022,
-28124=>8023,
-28125=>8024,
-28123=>8025,
-28148=>8026,
-28106=>8027,
-28093=>8028,
-28141=>8029,
-28144=>8030,
-28090=>8031,
-28117=>8032,
-28098=>8033,
-28111=>8034,
-28105=>8035,
-28112=>8036,
-28146=>8037,
-28115=>8038,
-28157=>8039,
-28119=>8040,
-28109=>8041,
-28131=>8042,
-28091=>8043,
-28922=>8044,
-28941=>8045,
-28919=>8046,
-28951=>8047,
-28916=>8048,
-28940=>8049,
-28912=>8050,
-28932=>8051,
-28915=>8052,
-28944=>8053,
-28924=>8054,
-28927=>8055,
-28934=>8056,
-28947=>8057,
-28928=>8058,
-28920=>8059,
-28918=>8060,
-28939=>8061,
-28930=>8062,
-28942=>8063,
-29310=>8064,
-29307=>8065,
-29308=>8066,
-29311=>8067,
-29469=>8068,
-29463=>8069,
-29447=>8070,
-29457=>8071,
-29464=>8072,
-29450=>8073,
-29448=>8074,
-29439=>8075,
-29455=>8076,
-29470=>8077,
-29576=>8078,
-29686=>8079,
-29688=>8080,
-29685=>8081,
-29700=>8082,
-29697=>8083,
-29693=>8084,
-29703=>8085,
-29696=>8086,
-29690=>8087,
-29692=>8088,
-29695=>8089,
-29708=>8090,
-29707=>8091,
-29684=>8092,
-29704=>8093,
-30052=>8094,
-30051=>8095,
-30158=>8096,
-30162=>8097,
-30159=>8098,
-30155=>8099,
-30156=>8100,
-30161=>8101,
-30160=>8102,
-30351=>8103,
-30345=>8104,
-30419=>8105,
-30521=>8106,
-30511=>8107,
-30509=>8108,
-30513=>8109,
-30514=>8110,
-30516=>8111,
-30515=>8112,
-30525=>8113,
-30501=>8114,
-30523=>8115,
-30517=>8116,
-30792=>8117,
-30802=>8118,
-30793=>8119,
-30797=>8120,
-30794=>8121,
-30796=>8122,
-30758=>8123,
-30789=>8124,
-30800=>8125,
-31076=>8126,
-31079=>8127,
-31081=>8128,
-31082=>8129,
-31075=>8130,
-31083=>8131,
-31073=>8132,
-31163=>8133,
-31226=>8134,
-31224=>8135,
-31222=>8136,
-31223=>8137,
-31375=>8138,
-31380=>8139,
-31376=>8140,
-31541=>8141,
-31547=>8142,
-31540=>8143,
-31525=>8144,
-31536=>8145,
-31522=>8146,
-31524=>8147,
-31539=>8148,
-31512=>8149,
-31530=>8150,
-31517=>8151,
-31537=>8152,
-31531=>8153,
-31533=>8154,
-31535=>8155,
-31538=>8156,
-31544=>8157,
-31514=>8158,
-31523=>8159,
-31892=>8160,
-31896=>8161,
-31894=>8162,
-31907=>8163,
-32053=>8164,
-32061=>8165,
-32056=>8166,
-32054=>8167,
-32058=>8168,
-32069=>8169,
-32044=>8170,
-32041=>8171,
-32065=>8172,
-32071=>8173,
-32062=>8174,
-32063=>8175,
-32074=>8176,
-32059=>8177,
-32040=>8178,
-32611=>8179,
-32661=>8180,
-32668=>8181,
-32669=>8182,
-32667=>8183,
-32714=>8184,
-32715=>8185,
-32717=>8186,
-32720=>8187,
-32721=>8188,
-32711=>8189,
-32719=>8190,
-32713=>8191,
-32799=>8192,
-32798=>8193,
-32795=>8194,
-32839=>8195,
-32835=>8196,
-32840=>8197,
-33048=>8198,
-33061=>8199,
-33049=>8200,
-33051=>8201,
-33069=>8202,
-33055=>8203,
-33068=>8204,
-33054=>8205,
-33057=>8206,
-33045=>8207,
-33063=>8208,
-33053=>8209,
-33058=>8210,
-33297=>8211,
-33336=>8212,
-33331=>8213,
-33338=>8214,
-33332=>8215,
-33330=>8216,
-33396=>8217,
-33680=>8218,
-33699=>8219,
-33704=>8220,
-33677=>8221,
-33658=>8222,
-33651=>8223,
-33700=>8224,
-33652=>8225,
-33679=>8226,
-33665=>8227,
-33685=>8228,
-33689=>8229,
-33653=>8230,
-33684=>8231,
-33705=>8232,
-33661=>8233,
-33667=>8234,
-33676=>8235,
-33693=>8236,
-33691=>8237,
-33706=>8238,
-33675=>8239,
-33662=>8240,
-33701=>8241,
-33711=>8242,
-33672=>8243,
-33687=>8244,
-33712=>8245,
-33663=>8246,
-33702=>8247,
-33671=>8248,
-33710=>8249,
-33654=>8250,
-34393=>8251,
-34390=>8252,
-34495=>8253,
-34487=>8254,
-34498=>8255,
-34497=>8256,
-34501=>8257,
-34490=>8258,
-34480=>8259,
-34504=>8260,
-34489=>8261,
-34483=>8262,
-34488=>8263,
-34508=>8264,
-34484=>8265,
-34491=>8266,
-34492=>8267,
-34499=>8268,
-34493=>8269,
-34494=>8270,
-34898=>8271,
-34953=>8272,
-34965=>8273,
-34984=>8274,
-34978=>8275,
-34986=>8276,
-34970=>8277,
-34961=>8278,
-34977=>8279,
-34975=>8280,
-34968=>8281,
-34983=>8282,
-34969=>8283,
-34971=>8284,
-34967=>8285,
-34980=>8286,
-34988=>8287,
-34956=>8288,
-34963=>8289,
-34958=>8290,
-35202=>8291,
-35286=>8292,
-35289=>8293,
-35285=>8294,
-35376=>8295,
-35367=>8296,
-35372=>8297,
-35358=>8298,
-35897=>8299,
-35899=>8300,
-35932=>8301,
-35933=>8302,
-35965=>8303,
-36005=>8304,
-36221=>8305,
-36219=>8306,
-36217=>8307,
-36284=>8308,
-36290=>8309,
-36281=>8310,
-36287=>8311,
-36289=>8312,
-36568=>8313,
-36574=>8314,
-36573=>8315,
-36572=>8316,
-36567=>8317,
-36576=>8318,
-36577=>8319,
-36900=>8320,
-36875=>8321,
-36881=>8322,
-36892=>8323,
-36876=>8324,
-36897=>8325,
-37103=>8326,
-37098=>8327,
-37104=>8328,
-37108=>8329,
-37106=>8330,
-37107=>8331,
-37076=>8332,
-37099=>8333,
-37100=>8334,
-37097=>8335,
-37206=>8336,
-37208=>8337,
-37210=>8338,
-37203=>8339,
-37205=>8340,
-37356=>8341,
-37364=>8342,
-37361=>8343,
-37363=>8344,
-37368=>8345,
-37348=>8346,
-37369=>8347,
-37354=>8348,
-37355=>8349,
-37367=>8350,
-37352=>8351,
-37358=>8352,
-38266=>8353,
-38278=>8354,
-38280=>8355,
-38524=>8356,
-38509=>8357,
-38507=>8358,
-38513=>8359,
-38511=>8360,
-38591=>8361,
-38762=>8362,
-38916=>8363,
-39141=>8364,
-39319=>8365,
-20635=>8366,
-20629=>8367,
-20628=>8368,
-20638=>8369,
-20619=>8370,
-20643=>8371,
-20611=>8372,
-20620=>8373,
-20622=>8374,
-20637=>8375,
-20584=>8376,
-20636=>8377,
-20626=>8378,
-20610=>8379,
-20615=>8380,
-20831=>8381,
-20948=>8382,
-21266=>8383,
-21265=>8384,
-21412=>8385,
-21415=>8386,
-21905=>8387,
-21928=>8388,
-21925=>8389,
-21933=>8390,
-21879=>8391,
-22085=>8392,
-21922=>8393,
-21907=>8394,
-21896=>8395,
-21903=>8396,
-21941=>8397,
-21889=>8398,
-21923=>8399,
-21906=>8400,
-21924=>8401,
-21885=>8402,
-21900=>8403,
-21926=>8404,
-21887=>8405,
-21909=>8406,
-21921=>8407,
-21902=>8408,
-22284=>8409,
-22569=>8410,
-22583=>8411,
-22553=>8412,
-22558=>8413,
-22567=>8414,
-22563=>8415,
-22568=>8416,
-22517=>8417,
-22600=>8418,
-22565=>8419,
-22556=>8420,
-22555=>8421,
-22579=>8422,
-22591=>8423,
-22582=>8424,
-22574=>8425,
-22585=>8426,
-22584=>8427,
-22573=>8428,
-22572=>8429,
-22587=>8430,
-22881=>8431,
-23215=>8432,
-23188=>8433,
-23199=>8434,
-23162=>8435,
-23202=>8436,
-23198=>8437,
-23160=>8438,
-23206=>8439,
-23164=>8440,
-23205=>8441,
-23212=>8442,
-23189=>8443,
-23214=>8444,
-23095=>8445,
-23172=>8446,
-23178=>8447,
-23191=>8448,
-23171=>8449,
-23179=>8450,
-23209=>8451,
-23163=>8452,
-23165=>8453,
-23180=>8454,
-23196=>8455,
-23183=>8456,
-23187=>8457,
-23197=>8458,
-23530=>8459,
-23501=>8460,
-23499=>8461,
-23508=>8462,
-23505=>8463,
-23498=>8464,
-23502=>8465,
-23564=>8466,
-23600=>8467,
-23863=>8468,
-23875=>8469,
-23915=>8470,
-23873=>8471,
-23883=>8472,
-23871=>8473,
-23861=>8474,
-23889=>8475,
-23886=>8476,
-23893=>8477,
-23859=>8478,
-23866=>8479,
-23890=>8480,
-23869=>8481,
-23857=>8482,
-23897=>8483,
-23874=>8484,
-23865=>8485,
-23881=>8486,
-23864=>8487,
-23868=>8488,
-23858=>8489,
-23862=>8490,
-23872=>8491,
-23877=>8492,
-24132=>8493,
-24129=>8494,
-24408=>8495,
-57673=>8495,
-24486=>8496,
-24485=>8497,
-24491=>8498,
-24777=>8499,
-24761=>8500,
-24780=>8501,
-24802=>8502,
-24782=>8503,
-24772=>8504,
-24852=>8505,
-24818=>8506,
-24842=>8507,
-24854=>8508,
-24837=>8509,
-24821=>8510,
-24851=>8511,
-24824=>8512,
-24828=>8513,
-24830=>8514,
-24769=>8515,
-24835=>8516,
-24856=>8517,
-24861=>8518,
-24848=>8519,
-24831=>8520,
-24836=>8521,
-24843=>8522,
-25162=>8523,
-25492=>8524,
-25521=>8525,
-25520=>8526,
-25550=>8527,
-25573=>8528,
-25576=>8529,
-25583=>8530,
-25539=>8531,
-25757=>8532,
-25587=>8533,
-25546=>8534,
-25568=>8535,
-25590=>8536,
-25557=>8537,
-25586=>8538,
-25589=>8539,
-25697=>8540,
-25567=>8541,
-25534=>8542,
-25565=>8543,
-25564=>8544,
-25540=>8545,
-25560=>8546,
-25555=>8547,
-25538=>8548,
-25543=>8549,
-25548=>8550,
-25547=>8551,
-25544=>8552,
-25584=>8553,
-25559=>8554,
-25561=>8555,
-25906=>8556,
-25959=>8557,
-25962=>8558,
-25956=>8559,
-25948=>8560,
-25960=>8561,
-25957=>8562,
-25996=>8563,
-26013=>8564,
-26014=>8565,
-26030=>8566,
-26064=>8567,
-26066=>8568,
-26236=>8569,
-26220=>8570,
-26235=>8571,
-26240=>8572,
-26225=>8573,
-26233=>8574,
-26218=>8575,
-26226=>8576,
-26369=>8577,
-26892=>8578,
-26835=>8579,
-26884=>8580,
-26844=>8581,
-26922=>8582,
-26860=>8583,
-26858=>8584,
-26865=>8585,
-26895=>8586,
-26838=>8587,
-26871=>8588,
-26859=>8589,
-26852=>8590,
-26870=>8591,
-26899=>8592,
-26896=>8593,
-26867=>8594,
-26849=>8595,
-26887=>8596,
-26828=>8597,
-26888=>8598,
-26992=>8599,
-26804=>8600,
-26897=>8601,
-26863=>8602,
-26822=>8603,
-26900=>8604,
-26872=>8605,
-26832=>8606,
-26877=>8607,
-26876=>8608,
-26856=>8609,
-26891=>8610,
-26890=>8611,
-26903=>8612,
-26830=>8613,
-26824=>8614,
-26845=>8615,
-26846=>8616,
-26854=>8617,
-26868=>8618,
-26833=>8619,
-26886=>8620,
-26836=>8621,
-26857=>8622,
-26901=>8623,
-26917=>8624,
-26823=>8625,
-27449=>8626,
-27451=>8627,
-27455=>8628,
-27452=>8629,
-27540=>8630,
-27543=>8631,
-27545=>8632,
-27541=>8633,
-27581=>8634,
-27632=>8635,
-27634=>8636,
-27635=>8637,
-27696=>8638,
-28156=>8639,
-28230=>8640,
-28231=>8641,
-28191=>8642,
-28233=>8643,
-28296=>8644,
-28220=>8645,
-28221=>8646,
-28229=>8647,
-28258=>8648,
-28203=>8649,
-28223=>8650,
-28225=>8651,
-28253=>8652,
-28275=>8653,
-28188=>8654,
-28211=>8655,
-28235=>8656,
-28224=>8657,
-28241=>8658,
-28219=>8659,
-28163=>8660,
-28206=>8661,
-28254=>8662,
-28264=>8663,
-28252=>8664,
-28257=>8665,
-28209=>8666,
-28200=>8667,
-28256=>8668,
-28273=>8669,
-28267=>8670,
-28217=>8671,
-28194=>8672,
-28208=>8673,
-28243=>8674,
-28261=>8675,
-28199=>8676,
-28280=>8677,
-28260=>8678,
-28279=>8679,
-28245=>8680,
-28281=>8681,
-28242=>8682,
-28262=>8683,
-28213=>8684,
-28214=>8685,
-28250=>8686,
-28960=>8687,
-28958=>8688,
-28975=>8689,
-28923=>8690,
-28974=>8691,
-28977=>8692,
-28963=>8693,
-28965=>8694,
-28962=>8695,
-28978=>8696,
-28959=>8697,
-28968=>8698,
-28986=>8699,
-28955=>8700,
-29259=>8701,
-29274=>8702,
-29320=>8703,
-29321=>8704,
-29318=>8705,
-29317=>8706,
-29323=>8707,
-29458=>8708,
-29451=>8709,
-29488=>8710,
-29474=>8711,
-29489=>8712,
-29491=>8713,
-29479=>8714,
-29490=>8715,
-29485=>8716,
-29478=>8717,
-29475=>8718,
-29493=>8719,
-29452=>8720,
-29742=>8721,
-29740=>8722,
-29744=>8723,
-29739=>8724,
-29718=>8725,
-29722=>8726,
-29729=>8727,
-29741=>8728,
-29745=>8729,
-29732=>8730,
-29731=>8731,
-29725=>8732,
-29737=>8733,
-29728=>8734,
-29746=>8735,
-29947=>8736,
-29999=>8737,
-30063=>8738,
-30060=>8739,
-30183=>8740,
-30170=>8741,
-30177=>8742,
-30182=>8743,
-30173=>8744,
-30175=>8745,
-30180=>8746,
-30167=>8747,
-30357=>8748,
-30354=>8749,
-30426=>8750,
-30534=>8751,
-30535=>8752,
-30532=>8753,
-30541=>8754,
-30533=>8755,
-30538=>8756,
-30542=>8757,
-30539=>8758,
-30540=>8759,
-30686=>8760,
-30700=>8761,
-30816=>8762,
-30820=>8763,
-30821=>8764,
-30812=>8765,
-30829=>8766,
-30833=>8767,
-30826=>8768,
-30830=>8769,
-30832=>8770,
-30825=>8771,
-30824=>8772,
-30814=>8773,
-30818=>8774,
-31092=>8775,
-31091=>8776,
-31090=>8777,
-31088=>8778,
-31234=>8779,
-31242=>8780,
-31235=>8781,
-31244=>8782,
-31236=>8783,
-31385=>8784,
-31462=>8785,
-31460=>8786,
-31562=>8787,
-31559=>8788,
-31556=>8789,
-31560=>8790,
-31564=>8791,
-31566=>8792,
-31552=>8793,
-31576=>8794,
-31557=>8795,
-31906=>8796,
-31902=>8797,
-31912=>8798,
-31905=>8799,
-32088=>8800,
-32111=>8801,
-32099=>8802,
-32083=>8803,
-32086=>8804,
-32103=>8805,
-32106=>8806,
-32079=>8807,
-32109=>8808,
-32092=>8809,
-32107=>8810,
-32082=>8811,
-32084=>8812,
-32105=>8813,
-32081=>8814,
-32095=>8815,
-32078=>8816,
-32574=>8817,
-32575=>8818,
-32613=>8819,
-32614=>8820,
-32674=>8821,
-32672=>8822,
-32673=>8823,
-32727=>8824,
-32849=>8825,
-32847=>8826,
-32848=>8827,
-33022=>8828,
-32980=>8829,
-33091=>8830,
-33098=>8831,
-33106=>8832,
-33103=>8833,
-33095=>8834,
-33085=>8835,
-33101=>8836,
-33082=>8837,
-33254=>8838,
-33262=>8839,
-33271=>8840,
-33272=>8841,
-33273=>8842,
-33284=>8843,
-33340=>8844,
-33341=>8845,
-33343=>8846,
-33397=>8847,
-33595=>8848,
-33743=>8849,
-60382=>8849,
-33785=>8850,
-33827=>8851,
-33728=>8852,
-33768=>8853,
-33810=>8854,
-33767=>8855,
-33764=>8856,
-33788=>8857,
-33782=>8858,
-33808=>8859,
-33734=>8860,
-33736=>8861,
-33771=>8862,
-33763=>8863,
-33727=>8864,
-33793=>8865,
-33757=>8866,
-33765=>8867,
-33752=>8868,
-33791=>8869,
-33761=>8870,
-33739=>8871,
-33742=>8872,
-33750=>8873,
-33781=>8874,
-33737=>8875,
-33801=>8876,
-33807=>8877,
-58332=>8877,
-33758=>8878,
-33809=>8879,
-33798=>8880,
-33730=>8881,
-33779=>8882,
-33749=>8883,
-33786=>8884,
-33735=>8885,
-33745=>8886,
-33770=>8887,
-33811=>8888,
-33690=>8889,
-33731=>8890,
-33772=>8891,
-33774=>8892,
-33732=>8893,
-33787=>8894,
-33751=>8895,
-33762=>8896,
-33819=>8897,
-33755=>8898,
-33790=>8899,
-34520=>8900,
-34530=>8901,
-34534=>8902,
-34515=>8903,
-34531=>8904,
-34522=>8905,
-34538=>8906,
-34525=>8907,
-34539=>8908,
-34524=>8909,
-34540=>8910,
-34537=>8911,
-34519=>8912,
-34536=>8913,
-34513=>8914,
-34888=>8915,
-34902=>8916,
-34901=>8917,
-35002=>8918,
-35031=>8919,
-35001=>8920,
-35000=>8921,
-35008=>8922,
-35006=>8923,
-34998=>8924,
-35004=>8925,
-34999=>8926,
-35005=>8927,
-34994=>8928,
-35073=>8929,
-35017=>8930,
-35221=>8931,
-35224=>8932,
-35223=>8933,
-35293=>8934,
-35290=>8935,
-35291=>8936,
-35406=>8937,
-35405=>8938,
-35385=>8939,
-35417=>8940,
-35392=>8941,
-35415=>8942,
-35416=>8943,
-35396=>8944,
-35397=>8945,
-35410=>8946,
-35400=>8947,
-35409=>8948,
-35402=>8949,
-35404=>8950,
-35407=>8951,
-35935=>8952,
-35969=>8953,
-35968=>8954,
-36026=>8955,
-36030=>8956,
-36016=>8957,
-36025=>8958,
-36021=>8959,
-36228=>8960,
-36224=>8961,
-36233=>8962,
-36312=>8963,
-36307=>8964,
-36301=>8965,
-36295=>8966,
-36310=>8967,
-36316=>8968,
-36303=>8969,
-36309=>8970,
-36313=>8971,
-36296=>8972,
-36311=>8973,
-36293=>8974,
-36591=>8975,
-36599=>8976,
-36602=>8977,
-36601=>8978,
-36582=>8979,
-36590=>8980,
-36581=>8981,
-36597=>8982,
-36583=>8983,
-36584=>8984,
-36598=>8985,
-36587=>8986,
-36593=>8987,
-36588=>8988,
-36596=>8989,
-36585=>8990,
-36909=>8991,
-36916=>8992,
-36911=>8993,
-37126=>8994,
-37164=>8995,
-37124=>8996,
-60367=>8996,
-37119=>8997,
-37116=>8998,
-37128=>8999,
-37113=>9000,
-37115=>9001,
-37121=>9002,
-37120=>9003,
-37127=>9004,
-37125=>9005,
-37123=>9006,
-37217=>9007,
-37220=>9008,
-37215=>9009,
-37218=>9010,
-37216=>9011,
-37377=>9012,
-37386=>9013,
-37413=>9014,
-37379=>9015,
-37402=>9016,
-37414=>9017,
-37391=>9018,
-37388=>9019,
-37376=>9020,
-37394=>9021,
-37375=>9022,
-37373=>9023,
-37382=>9024,
-37380=>9025,
-37415=>9026,
-37378=>9027,
-37404=>9028,
-37412=>9029,
-37401=>9030,
-37399=>9031,
-37381=>9032,
-37398=>9033,
-38267=>9034,
-38285=>9035,
-38284=>9036,
-38288=>9037,
-38535=>9038,
-38526=>9039,
-38536=>9040,
-38537=>9041,
-38531=>9042,
-38528=>9043,
-38594=>9044,
-38600=>9045,
-38595=>9046,
-38641=>9047,
-38640=>9048,
-38764=>9049,
-38768=>9050,
-38766=>9051,
-38919=>9052,
-39081=>9053,
-39147=>9054,
-40166=>9055,
-12235=>9056,
-40697=>9056,
-20099=>9057,
-20100=>9058,
-20150=>9059,
-20669=>9060,
-20671=>9061,
-20678=>9062,
-20654=>9063,
-20676=>9064,
-20682=>9065,
-20660=>9066,
-20680=>9067,
-20674=>9068,
-20656=>9069,
-20673=>9070,
-20666=>9071,
-20657=>9072,
-20683=>9073,
-20681=>9074,
-20662=>9075,
-20664=>9076,
-20951=>9077,
-21114=>9078,
-21112=>9079,
-21115=>9080,
-21116=>9081,
-21955=>9082,
-21979=>9083,
-21964=>9084,
-21968=>9085,
-21963=>9086,
-21962=>9087,
-21981=>9088,
-21952=>9089,
-64013=>9089,
-21972=>9090,
-21956=>9091,
-21993=>9092,
-21951=>9093,
-21970=>9094,
-21901=>9095,
-21967=>9096,
-21973=>9097,
-21986=>9098,
-21974=>9099,
-21960=>9100,
-22002=>9101,
-21965=>9102,
-21977=>9103,
-21954=>9104,
-22292=>9105,
-22611=>9106,
-22632=>9107,
-22628=>9108,
-22607=>9109,
-22605=>9110,
-22601=>9111,
-22639=>9112,
-22613=>9113,
-22606=>9114,
-22621=>9115,
-22617=>9116,
-22629=>9117,
-22619=>9118,
-22589=>9119,
-22627=>9120,
-22641=>9121,
-22780=>9122,
-23239=>9123,
-23236=>9124,
-23243=>9125,
-23226=>9126,
-23224=>9127,
-23217=>9128,
-23221=>9129,
-23216=>9130,
-23231=>9131,
-23240=>9132,
-23227=>9133,
-23238=>9134,
-23223=>9135,
-23232=>9136,
-23242=>9137,
-23220=>9138,
-23222=>9139,
-23245=>9140,
-23225=>9141,
-23184=>9142,
-23510=>9143,
-23512=>9144,
-23513=>9145,
-23583=>9146,
-23603=>9147,
-23921=>9148,
-23907=>9149,
-23882=>9150,
-23909=>9151,
-23922=>9152,
-23916=>9153,
-23902=>9154,
-23912=>9155,
-23911=>9156,
-23906=>9157,
-24048=>9158,
-24143=>9159,
-24142=>9160,
-24138=>9161,
-24141=>9162,
-24139=>9163,
-24261=>9164,
-24268=>9165,
-24262=>9166,
-24267=>9167,
-24263=>9168,
-24384=>9169,
-24495=>9170,
-24493=>9171,
-24823=>9172,
-24905=>9173,
-24906=>9174,
-24875=>9175,
-24901=>9176,
-24886=>9177,
-24882=>9178,
-24878=>9179,
-24902=>9180,
-24879=>9181,
-24911=>9182,
-24873=>9183,
-24896=>9184,
-25120=>9185,
-37224=>9186,
-25123=>9187,
-25125=>9188,
-25124=>9189,
-25541=>9190,
-25585=>9191,
-25579=>9192,
-25616=>9193,
-25618=>9194,
-25609=>9195,
-25632=>9196,
-25636=>9197,
-25651=>9198,
-25667=>9199,
-25631=>9200,
-25621=>9201,
-25624=>9202,
-25657=>9203,
-25655=>9204,
-25634=>9205,
-25635=>9206,
-25612=>9207,
-25638=>9208,
-25648=>9209,
-25640=>9210,
-25665=>9211,
-25653=>9212,
-25647=>9213,
-25610=>9214,
-25626=>9215,
-25664=>9216,
-25637=>9217,
-25639=>9218,
-25611=>9219,
-25575=>9220,
-25627=>9221,
-25646=>9222,
-25633=>9223,
-25614=>9224,
-25967=>9225,
-26002=>9226,
-26067=>9227,
-26246=>9228,
-26252=>9229,
-26261=>9230,
-26256=>9231,
-26251=>9232,
-26250=>9233,
-26265=>9234,
-26260=>9235,
-26232=>9236,
-26400=>9237,
-26982=>9238,
-26975=>9239,
-26936=>9240,
-26958=>9241,
-26978=>9242,
-26993=>9243,
-26943=>9244,
-26949=>9245,
-26986=>9246,
-26937=>9247,
-26946=>9248,
-26967=>9249,
-26969=>9250,
-27002=>9251,
-26952=>9252,
-26953=>9253,
-26933=>9254,
-26988=>9255,
-26931=>9256,
-26941=>9257,
-26981=>9258,
-26864=>9259,
-27000=>9260,
-26932=>9261,
-26985=>9262,
-26944=>9263,
-26991=>9264,
-26948=>9265,
-26998=>9266,
-26968=>9267,
-26945=>9268,
-26996=>9269,
-26956=>9270,
-26939=>9271,
-26955=>9272,
-26935=>9273,
-26972=>9274,
-26959=>9275,
-26961=>9276,
-26930=>9277,
-26962=>9278,
-26927=>9279,
-27003=>9280,
-26940=>9281,
-27462=>9282,
-27461=>9283,
-27459=>9284,
-27458=>9285,
-27464=>9286,
-27457=>9287,
-27547=>9288,
-27643=>9289,
-27644=>9290,
-27641=>9291,
-27639=>9292,
-27640=>9293,
-28315=>9294,
-28374=>9295,
-28360=>9296,
-28303=>9297,
-28352=>9298,
-28319=>9299,
-28307=>9300,
-28308=>9301,
-28320=>9302,
-28337=>9303,
-28345=>9304,
-28358=>9305,
-28370=>9306,
-28349=>9307,
-28353=>9308,
-28318=>9309,
-28361=>9310,
-28343=>9311,
-28336=>9312,
-28365=>9313,
-28326=>9314,
-28367=>9315,
-28338=>9316,
-28350=>9317,
-28355=>9318,
-28380=>9319,
-28376=>9320,
-28313=>9321,
-28306=>9322,
-28302=>9323,
-28301=>9324,
-28324=>9325,
-28321=>9326,
-28351=>9327,
-28339=>9328,
-28368=>9329,
-28362=>9330,
-28311=>9331,
-28334=>9332,
-28323=>9333,
-28999=>9334,
-29012=>9335,
-29010=>9336,
-29027=>9337,
-29024=>9338,
-28993=>9339,
-29021=>9340,
-29026=>9341,
-61080=>9341,
-29042=>9342,
-29048=>9343,
-29034=>9344,
-29025=>9345,
-28994=>9346,
-29016=>9347,
-28995=>9348,
-29003=>9349,
-29040=>9350,
-29023=>9351,
-29008=>9352,
-29011=>9353,
-28996=>9354,
-29005=>9355,
-29018=>9356,
-29263=>9357,
-29325=>9358,
-29324=>9359,
-29329=>9360,
-29328=>9361,
-29326=>9362,
-29500=>9363,
-29506=>9364,
-29499=>9365,
-29498=>9366,
-29504=>9367,
-29514=>9368,
-29513=>9369,
-29764=>9370,
-29770=>9371,
-29771=>9372,
-29778=>9373,
-29777=>9374,
-29783=>9375,
-29760=>9376,
-29775=>9377,
-29776=>9378,
-29774=>9379,
-29762=>9380,
-29766=>9381,
-29773=>9382,
-29780=>9383,
-29921=>9384,
-29951=>9385,
-29950=>9386,
-29949=>9387,
-29981=>9388,
-30073=>9389,
-30071=>9390,
-27011=>9391,
-30191=>9392,
-30223=>9393,
-30211=>9394,
-30199=>9395,
-30206=>9396,
-30204=>9397,
-30201=>9398,
-60782=>9398,
-30200=>9399,
-30224=>9400,
-30203=>9401,
-30198=>9402,
-30189=>9403,
-30197=>9404,
-30205=>9405,
-30361=>9406,
-30389=>9407,
-30429=>9408,
-30549=>9409,
-30559=>9410,
-30560=>9411,
-30546=>9412,
-30550=>9413,
-30554=>9414,
-30569=>9415,
-30567=>9416,
-30548=>9417,
-30553=>9418,
-30573=>9419,
-30688=>9420,
-30855=>9421,
-30874=>9422,
-30868=>9423,
-30863=>9424,
-30852=>9425,
-30869=>9426,
-30853=>9427,
-30854=>9428,
-30881=>9429,
-30851=>9430,
-30841=>9431,
-30873=>9432,
-30848=>9433,
-30870=>9434,
-30843=>9435,
-31100=>9436,
-31106=>9437,
-31101=>9438,
-31097=>9439,
-31249=>9440,
-31256=>9441,
-31257=>9442,
-31250=>9443,
-31255=>9444,
-31253=>9445,
-31266=>9446,
-31251=>9447,
-31259=>9448,
-31248=>9449,
-31395=>9450,
-31394=>9451,
-31390=>9452,
-31467=>9453,
-31590=>9454,
-31588=>9455,
-31597=>9456,
-31604=>9457,
-31593=>9458,
-31602=>9459,
-31589=>9460,
-31603=>9461,
-31601=>9462,
-31600=>9463,
-31585=>9464,
-31608=>9465,
-31606=>9466,
-31587=>9467,
-31922=>9468,
-31924=>9469,
-31919=>9470,
-32136=>9471,
-32134=>9472,
-32128=>9473,
-32141=>9474,
-32127=>9475,
-32133=>9476,
-32122=>9477,
-32142=>9478,
-32123=>9479,
-32131=>9480,
-32124=>9481,
-32140=>9482,
-32148=>9483,
-32132=>9484,
-32125=>9485,
-32146=>9486,
-32621=>9487,
-32619=>9488,
-32615=>9489,
-32616=>9490,
-32620=>9491,
-32678=>9492,
-32677=>9493,
-32679=>9494,
-32731=>9495,
-32732=>9496,
-32801=>9497,
-33124=>9498,
-33120=>9499,
-33143=>9500,
-33116=>9501,
-33129=>9502,
-33115=>9503,
-33122=>9504,
-33138=>9505,
-26401=>9506,
-33118=>9507,
-33142=>9508,
-33127=>9509,
-33135=>9510,
-33092=>9511,
-33121=>9512,
-33309=>9513,
-33353=>9514,
-33348=>9515,
-33344=>9516,
-33346=>9517,
-33349=>9518,
-34033=>9519,
-33855=>9520,
-33878=>9521,
-33910=>9522,
-33913=>9523,
-33935=>9524,
-33933=>9525,
-33893=>9526,
-33873=>9527,
-33856=>9528,
-33926=>9529,
-33895=>9530,
-33840=>9531,
-33869=>9532,
-33917=>9533,
-33882=>9534,
-33881=>9535,
-33908=>9536,
-33907=>9537,
-33885=>9538,
-34055=>9539,
-33886=>9540,
-33847=>9541,
-33850=>9542,
-33844=>9543,
-33914=>9544,
-33859=>9545,
-33912=>9546,
-33842=>9547,
-33861=>9548,
-33833=>9549,
-33753=>9550,
-33867=>9551,
-33839=>9552,
-33858=>9553,
-33837=>9554,
-33887=>9555,
-33904=>9556,
-33849=>9557,
-33870=>9558,
-33868=>9559,
-33874=>9560,
-33903=>9561,
-33989=>9562,
-33934=>9563,
-33851=>9564,
-33863=>9565,
-33846=>9566,
-33843=>9567,
-33896=>9568,
-33918=>9569,
-33860=>9570,
-33835=>9571,
-33888=>9572,
-33876=>9573,
-33902=>9574,
-33872=>9575,
-34571=>9576,
-34564=>9577,
-34551=>9578,
-34572=>9579,
-34554=>9580,
-34518=>9581,
-34549=>9582,
-34637=>9583,
-34552=>9584,
-34574=>9585,
-34569=>9586,
-34561=>9587,
-34550=>9588,
-34573=>9589,
-34565=>9590,
-35030=>9591,
-35019=>9592,
-35021=>9593,
-35022=>9594,
-35038=>9595,
-35035=>9596,
-35034=>9597,
-35020=>9598,
-35024=>9599,
-35205=>9600,
-35227=>9601,
-35295=>9602,
-35301=>9603,
-35300=>9604,
-35297=>9605,
-35296=>9606,
-35298=>9607,
-35292=>9608,
-35302=>9609,
-35446=>9610,
-35462=>9611,
-35455=>9612,
-35425=>9613,
-35391=>9614,
-35447=>9615,
-35458=>9616,
-35460=>9617,
-35445=>9618,
-35459=>9619,
-35457=>9620,
-35444=>9621,
-35450=>9622,
-35900=>9623,
-35915=>9624,
-35914=>9625,
-35941=>9626,
-35940=>9627,
-35942=>9628,
-35974=>9629,
-35972=>9630,
-35973=>9631,
-36044=>9632,
-36200=>9633,
-36201=>9634,
-36241=>9635,
-36236=>9636,
-36238=>9637,
-36239=>9638,
-36237=>9639,
-36243=>9640,
-36244=>9641,
-36240=>9642,
-36242=>9643,
-36336=>9644,
-36320=>9645,
-36332=>9646,
-36337=>9647,
-36334=>9648,
-36304=>9649,
-36329=>9650,
-36323=>9651,
-36322=>9652,
-36327=>9653,
-36338=>9654,
-36331=>9655,
-36340=>9656,
-36614=>9657,
-36607=>9658,
-36609=>9659,
-36608=>9660,
-36613=>9661,
-36615=>9662,
-36616=>9663,
-36610=>9664,
-36619=>9665,
-60507=>9665,
-36946=>9666,
-36927=>9667,
-36932=>9668,
-36937=>9669,
-36925=>9670,
-37136=>9671,
-37133=>9672,
-37135=>9673,
-37137=>9674,
-37142=>9675,
-37140=>9676,
-37131=>9677,
-37134=>9678,
-37230=>9679,
-37231=>9680,
-37448=>9681,
-37458=>9682,
-37424=>9683,
-37434=>9684,
-37478=>9685,
-37427=>9686,
-37477=>9687,
-37470=>9688,
-37507=>9689,
-37422=>9690,
-37450=>9691,
-37446=>9692,
-37485=>9693,
-37484=>9694,
-37455=>9695,
-37472=>9696,
-37479=>9697,
-37487=>9698,
-37430=>9699,
-37473=>9700,
-37488=>9701,
-37425=>9702,
-37460=>9703,
-37475=>9704,
-37456=>9705,
-37490=>9706,
-37454=>9707,
-37459=>9708,
-37452=>9709,
-37462=>9710,
-37426=>9711,
-38303=>9712,
-38300=>9713,
-38302=>9714,
-38299=>9715,
-38546=>9716,
-38547=>9717,
-38545=>9718,
-38551=>9719,
-38606=>9720,
-38650=>9721,
-38653=>9722,
-38648=>9723,
-38645=>9724,
-38771=>9725,
-38775=>9726,
-38776=>9727,
-38770=>9728,
-38927=>9729,
-38925=>9730,
-38926=>9731,
-39084=>9732,
-39158=>9733,
-39161=>9734,
-39343=>9735,
-39346=>9736,
-39344=>9737,
-39349=>9738,
-39597=>9739,
-39595=>9740,
-39771=>9741,
-40170=>9742,
-40173=>9743,
-40167=>9744,
-40576=>9745,
-12236=>9746,
-40701=>9746,
-20710=>9747,
-20692=>9748,
-20695=>9749,
-20712=>9750,
-20723=>9751,
-20699=>9752,
-20714=>9753,
-20701=>9754,
-20708=>9755,
-20691=>9756,
-20716=>9757,
-20720=>9758,
-20719=>9759,
-20707=>9760,
-20704=>9761,
-20952=>9762,
-21120=>9763,
-21121=>9764,
-21225=>9765,
-21227=>9766,
-21296=>9767,
-21420=>9768,
-22055=>9769,
-22037=>9770,
-22028=>9771,
-22034=>9772,
-22012=>9773,
-22031=>9774,
-22044=>9775,
-22017=>9776,
-22035=>9777,
-22018=>9778,
-22010=>9779,
-22045=>9780,
-22020=>9781,
-22015=>9782,
-22009=>9783,
-22665=>9784,
-22652=>9785,
-22672=>9786,
-22680=>9787,
-22662=>9788,
-22657=>9789,
-22655=>9790,
-22644=>9791,
-22667=>9792,
-22650=>9793,
-22663=>9794,
-22673=>9795,
-22670=>9796,
-22646=>9797,
-22658=>9798,
-22664=>9799,
-22651=>9800,
-22676=>9801,
-22671=>9802,
-22782=>9803,
-22891=>9804,
-23260=>9805,
-23278=>9806,
-23269=>9807,
-23253=>9808,
-23274=>9809,
-23258=>9810,
-23277=>9811,
-23275=>9812,
-23283=>9813,
-23266=>9814,
-23264=>9815,
-23259=>9816,
-23276=>9817,
-23262=>9818,
-23261=>9819,
-23257=>9820,
-23272=>9821,
-23263=>9822,
-23415=>9823,
-23520=>9824,
-23523=>9825,
-23651=>9826,
-23938=>9827,
-23936=>9828,
-23933=>9829,
-23942=>9830,
-23930=>9831,
-23937=>9832,
-23927=>9833,
-23946=>9834,
-23945=>9835,
-23944=>9836,
-23934=>9837,
-23932=>9838,
-23949=>9839,
-23929=>9840,
-23935=>9841,
-24152=>9842,
-24153=>9843,
-24147=>9844,
-24280=>9845,
-24273=>9846,
-24279=>9847,
-24270=>9848,
-24284=>9849,
-24277=>9850,
-24281=>9851,
-24274=>9852,
-24276=>9853,
-24388=>9854,
-24387=>9855,
-24431=>9856,
-24502=>9857,
-24876=>9858,
-24872=>9859,
-24897=>9860,
-24926=>9861,
-24945=>9862,
-24947=>9863,
-24914=>9864,
-24915=>9865,
-24946=>9866,
-24940=>9867,
-24960=>9868,
-24948=>9869,
-24916=>9870,
-24954=>9871,
-24923=>9872,
-24933=>9873,
-24891=>9874,
-24938=>9875,
-24929=>9876,
-24918=>9877,
-25129=>9878,
-25127=>9879,
-25131=>9880,
-25643=>9881,
-25677=>9882,
-25691=>9883,
-25693=>9884,
-25716=>9885,
-25718=>9886,
-25714=>9887,
-25715=>9888,
-25725=>9889,
-25717=>9890,
-25702=>9891,
-25766=>9892,
-25678=>9893,
-25730=>9894,
-25694=>9895,
-25692=>9896,
-25675=>9897,
-25683=>9898,
-25696=>9899,
-25680=>9900,
-25727=>9901,
-25663=>9902,
-25708=>9903,
-25707=>9904,
-25689=>9905,
-25701=>9906,
-25719=>9907,
-25971=>9908,
-26016=>9909,
-26273=>9910,
-26272=>9911,
-26271=>9912,
-26373=>9913,
-26372=>9914,
-26402=>9915,
-27057=>9916,
-27062=>9917,
-27081=>9918,
-27040=>9919,
-27086=>9920,
-27030=>9921,
-27056=>9922,
-27052=>9923,
-27068=>9924,
-27025=>9925,
-27033=>9926,
-27022=>9927,
-27047=>9928,
-27021=>9929,
-27049=>9930,
-27070=>9931,
-27055=>9932,
-27071=>9933,
-27076=>9934,
-27069=>9935,
-27044=>9936,
-27092=>9937,
-27065=>9938,
-27082=>9939,
-27034=>9940,
-27087=>9941,
-27059=>9942,
-27027=>9943,
-27050=>9944,
-27041=>9945,
-27038=>9946,
-27097=>9947,
-27031=>9948,
-27024=>9949,
-27074=>9950,
-27061=>9951,
-27045=>9952,
-27078=>9953,
-27466=>9954,
-27469=>9955,
-27467=>9956,
-27550=>9957,
-27551=>9958,
-27552=>9959,
-27587=>9960,
-27588=>9961,
-27646=>9962,
-28366=>9963,
-28405=>9964,
-28401=>9965,
-28419=>9966,
-28453=>9967,
-28408=>9968,
-28471=>9969,
-28411=>9970,
-28462=>9971,
-28425=>9972,
-28494=>9973,
-28441=>9974,
-28442=>9975,
-28455=>9976,
-28440=>9977,
-28475=>9978,
-28434=>9979,
-28397=>9980,
-28426=>9981,
-28470=>9982,
-28531=>9983,
-28409=>9984,
-28398=>9985,
-28461=>9986,
-28480=>9987,
-28464=>9988,
-28476=>9989,
-28469=>9990,
-28395=>9991,
-28423=>9992,
-28430=>9993,
-28483=>9994,
-28421=>9995,
-28413=>9996,
-28406=>9997,
-28473=>9998,
-28444=>9999,
-28412=>10000,
-28474=>10001,
-28447=>10002,
-28429=>10003,
-28446=>10004,
-28424=>10005,
-28449=>10006,
-29063=>10007,
-29072=>10008,
-29065=>10009,
-29056=>10010,
-29061=>10011,
-29058=>10012,
-29071=>10013,
-29051=>10014,
-29062=>10015,
-29057=>10016,
-29079=>10017,
-29252=>10018,
-29267=>10019,
-29335=>10020,
-29333=>10021,
-29331=>10022,
-29507=>10023,
-29517=>10024,
-29521=>10025,
-29516=>10026,
-29794=>10027,
-29811=>10028,
-29809=>10029,
-29813=>10030,
-29810=>10031,
-29799=>10032,
-29806=>10033,
-29952=>10034,
-29954=>10035,
-29955=>10036,
-30077=>10037,
-30096=>10038,
-30230=>10039,
-30216=>10040,
-30220=>10041,
-30229=>10042,
-30225=>10043,
-30218=>10044,
-30228=>10045,
-30392=>10046,
-30593=>10047,
-30588=>10048,
-30597=>10049,
-30594=>10050,
-30574=>10051,
-30592=>10052,
-30575=>10053,
-30590=>10054,
-30595=>10055,
-30898=>10056,
-30890=>10057,
-30900=>10058,
-30893=>10059,
-30888=>10060,
-30846=>10061,
-30891=>10062,
-30878=>10063,
-30885=>10064,
-30880=>10065,
-30892=>10066,
-30882=>10067,
-30884=>10068,
-31128=>10069,
-31114=>10070,
-31115=>10071,
-31126=>10072,
-31125=>10073,
-31124=>10074,
-31123=>10075,
-31127=>10076,
-31112=>10077,
-31122=>10078,
-31120=>10079,
-31275=>10080,
-31306=>10081,
-31280=>10082,
-31279=>10083,
-31272=>10084,
-31270=>10085,
-31400=>10086,
-31403=>10087,
-31404=>10088,
-31470=>10089,
-31624=>10090,
-31644=>10091,
-31626=>10092,
-31633=>10093,
-31632=>10094,
-31638=>10095,
-31629=>10096,
-31628=>10097,
-31643=>10098,
-31630=>10099,
-31621=>10100,
-31640=>10101,
-21124=>10102,
-31641=>10103,
-31652=>10104,
-31618=>10105,
-31931=>10106,
-31935=>10107,
-31932=>10108,
-31930=>10109,
-32167=>10110,
-32183=>10111,
-32194=>10112,
-32163=>10113,
-32170=>10114,
-32193=>10115,
-32192=>10116,
-32197=>10117,
-32157=>10118,
-32206=>10119,
-32196=>10120,
-32198=>10121,
-32203=>10122,
-32204=>10123,
-32175=>10124,
-32185=>10125,
-32150=>10126,
-32188=>10127,
-32159=>10128,
-32166=>10129,
-32174=>10130,
-32169=>10131,
-32161=>10132,
-32201=>10133,
-32627=>10134,
-32738=>10135,
-32739=>10136,
-32741=>10137,
-32734=>10138,
-32804=>10139,
-32861=>10140,
-32860=>10141,
-33161=>10142,
-33158=>10143,
-33155=>10144,
-33159=>10145,
-33165=>10146,
-33164=>10147,
-33163=>10148,
-33301=>10149,
-33943=>10150,
-33956=>10151,
-33953=>10152,
-33951=>10153,
-33978=>10154,
-33998=>10155,
-33986=>10156,
-33964=>10157,
-33966=>10158,
-33963=>10159,
-33977=>10160,
-33972=>10161,
-33985=>10162,
-33997=>10163,
-33962=>10164,
-33946=>10165,
-33969=>10166,
-34000=>10167,
-33949=>10168,
-33959=>10169,
-33979=>10170,
-33954=>10171,
-33940=>10172,
-33991=>10173,
-33996=>10174,
-33947=>10175,
-33961=>10176,
-33967=>10177,
-33960=>10178,
-58327=>10178,
-34006=>10179,
-33944=>10180,
-33974=>10181,
-33999=>10182,
-33952=>10183,
-34007=>10184,
-34004=>10185,
-34002=>10186,
-34011=>10187,
-33968=>10188,
-33937=>10189,
-34401=>10190,
-34611=>10191,
-34595=>10192,
-34600=>10193,
-34667=>10194,
-34624=>10195,
-34606=>10196,
-34590=>10197,
-34593=>10198,
-34585=>10199,
-34587=>10200,
-34627=>10201,
-34604=>10202,
-34625=>10203,
-34622=>10204,
-34630=>10205,
-34592=>10206,
-34610=>10207,
-34602=>10208,
-34605=>10209,
-34620=>10210,
-34578=>10211,
-34618=>10212,
-34609=>10213,
-34613=>10214,
-34626=>10215,
-34598=>10216,
-34599=>10217,
-34616=>10218,
-34596=>10219,
-34586=>10220,
-34608=>10221,
-34577=>10222,
-35063=>10223,
-35047=>10224,
-35057=>10225,
-35058=>10226,
-35066=>10227,
-35070=>10228,
-35054=>10229,
-35068=>10230,
-35062=>10231,
-35067=>10232,
-35056=>10233,
-35052=>10234,
-35051=>10235,
-35229=>10236,
-35233=>10237,
-35231=>10238,
-35230=>10239,
-35305=>10240,
-35307=>10241,
-35304=>10242,
-35499=>10243,
-35481=>10244,
-35467=>10245,
-35474=>10246,
-35471=>10247,
-35478=>10248,
-35901=>10249,
-35944=>10250,
-35945=>10251,
-36053=>10252,
-36047=>10253,
-36055=>10254,
-36246=>10255,
-36361=>10256,
-36354=>10257,
-36351=>10258,
-36365=>10259,
-36349=>10260,
-36362=>10261,
-36355=>10262,
-36359=>10263,
-36358=>10264,
-36357=>10265,
-36350=>10266,
-36352=>10267,
-36356=>10268,
-36624=>10269,
-36625=>10270,
-36622=>10271,
-36621=>10272,
-37155=>10273,
-37148=>10274,
-37152=>10275,
-37154=>10276,
-37151=>10277,
-37149=>10278,
-37146=>10279,
-37156=>10280,
-37153=>10281,
-37147=>10282,
-37242=>10283,
-37234=>10284,
-37241=>10285,
-37235=>10286,
-37541=>10287,
-37540=>10288,
-37494=>10289,
-37531=>10290,
-37498=>10291,
-37536=>10292,
-37524=>10293,
-37546=>10294,
-37517=>10295,
-37542=>10296,
-37530=>10297,
-37547=>10298,
-37497=>10299,
-37527=>10300,
-37503=>10301,
-37539=>10302,
-37614=>10303,
-37518=>10304,
-37506=>10305,
-37525=>10306,
-37538=>10307,
-37501=>10308,
-37512=>10309,
-37537=>10310,
-37514=>10311,
-37510=>10312,
-37516=>10313,
-37529=>10314,
-37543=>10315,
-37502=>10316,
-37511=>10317,
-37545=>10318,
-37533=>10319,
-37515=>10320,
-37421=>10321,
-38558=>10322,
-38561=>10323,
-38655=>10324,
-38744=>10325,
-38781=>10326,
-38778=>10327,
-38782=>10328,
-38787=>10329,
-38784=>10330,
-38786=>10331,
-38779=>10332,
-38788=>10333,
-38785=>10334,
-38783=>10335,
-38862=>10336,
-38861=>10337,
-38934=>10338,
-39085=>10339,
-39086=>10340,
-39170=>10341,
-39168=>10342,
-39175=>10343,
-39325=>10344,
-39324=>10345,
-39363=>10346,
-39353=>10347,
-39355=>10348,
-39354=>10349,
-39362=>10350,
-39357=>10351,
-39367=>10352,
-39601=>10353,
-39651=>10354,
-39655=>10355,
-39742=>10356,
-39743=>10357,
-39776=>10358,
-39777=>10359,
-39775=>10360,
-40177=>10361,
-40178=>10362,
-40181=>10363,
-40615=>10364,
-20735=>10365,
-20739=>10366,
-20784=>10367,
-20728=>10368,
-20742=>10369,
-20743=>10370,
-20726=>10371,
-20734=>10372,
-20747=>10373,
-20748=>10374,
-20733=>10375,
-20746=>10376,
-21131=>10377,
-21132=>10378,
-21233=>10379,
-21231=>10380,
-22088=>10381,
-22082=>10382,
-22092=>10383,
-22069=>10384,
-22081=>10385,
-22090=>10386,
-22089=>10387,
-22086=>10388,
-22104=>10389,
-22106=>10390,
-22080=>10391,
-22067=>10392,
-22077=>10393,
-22060=>10394,
-22078=>10395,
-22072=>10396,
-22058=>10397,
-22074=>10398,
-22298=>10399,
-22699=>10400,
-22685=>10401,
-22705=>10402,
-22688=>10403,
-22691=>10404,
-22703=>10405,
-22700=>10406,
-22693=>10407,
-22689=>10408,
-22783=>10409,
-23295=>10410,
-23284=>10411,
-23293=>10412,
-23287=>10413,
-23286=>10414,
-23299=>10415,
-23288=>10416,
-23298=>10417,
-23289=>10418,
-23297=>10419,
-23303=>10420,
-23301=>10421,
-23311=>10422,
-23655=>10423,
-23961=>10424,
-23959=>10425,
-23967=>10426,
-23954=>10427,
-23970=>10428,
-23955=>10429,
-23957=>10430,
-23968=>10431,
-23964=>10432,
-23969=>10433,
-23962=>10434,
-23966=>10435,
-24169=>10436,
-24157=>10437,
-24160=>10438,
-24156=>10439,
-32243=>10440,
-24283=>10441,
-24286=>10442,
-24289=>10443,
-24393=>10444,
-24498=>10445,
-24971=>10446,
-24963=>10447,
-24953=>10448,
-25009=>10449,
-25008=>10450,
-24994=>10451,
-24969=>10452,
-24987=>10453,
-24979=>10454,
-25007=>10455,
-25005=>10456,
-24991=>10457,
-24978=>10458,
-25002=>10459,
-24993=>10460,
-24973=>10461,
-24934=>10462,
-25011=>10463,
-25133=>10464,
-25710=>10465,
-25712=>10466,
-25750=>10467,
-25760=>10468,
-25733=>10469,
-25751=>10470,
-25756=>10471,
-25743=>10472,
-25739=>10473,
-25738=>10474,
-25740=>10475,
-25763=>10476,
-25759=>10477,
-25704=>10478,
-25777=>10479,
-25752=>10480,
-25974=>10481,
-25978=>10482,
-25977=>10483,
-25979=>10484,
-26034=>10485,
-26035=>10486,
-26293=>10487,
-26288=>10488,
-26281=>10489,
-26290=>10490,
-26295=>10491,
-26282=>10492,
-26287=>10493,
-27136=>10494,
-27142=>10495,
-27159=>10496,
-27109=>10497,
-27128=>10498,
-27157=>10499,
-27121=>10500,
-27108=>10501,
-27168=>10502,
-27135=>10503,
-27116=>10504,
-27106=>10505,
-27163=>10506,
-27165=>10507,
-27134=>10508,
-27175=>10509,
-27122=>10510,
-27118=>10511,
-27156=>10512,
-27127=>10513,
-27111=>10514,
-27200=>10515,
-27144=>10516,
-27110=>10517,
-27131=>10518,
-27149=>10519,
-27132=>10520,
-27115=>10521,
-27145=>10522,
-27140=>10523,
-27160=>10524,
-27173=>10525,
-27151=>10526,
-27126=>10527,
-27174=>10528,
-27143=>10529,
-27124=>10530,
-27158=>10531,
-27473=>10532,
-27557=>10533,
-27555=>10534,
-27554=>10535,
-27558=>10536,
-27649=>10537,
-27648=>10538,
-27647=>10539,
-27650=>10540,
-28481=>10541,
-28454=>10542,
-28542=>10543,
-28551=>10544,
-28614=>10545,
-28562=>10546,
-28557=>10547,
-28553=>10548,
-28556=>10549,
-28514=>10550,
-28495=>10551,
-28549=>10552,
-28506=>10553,
-28566=>10554,
-28534=>10555,
-28524=>10556,
-28546=>10557,
-28501=>10558,
-28530=>10559,
-28498=>10560,
-28496=>10561,
-28503=>10562,
-28564=>10563,
-28563=>10564,
-28509=>10565,
-28416=>10566,
-28513=>10567,
-28523=>10568,
-28541=>10569,
-28519=>10570,
-28560=>10571,
-28499=>10572,
-28555=>10573,
-28521=>10574,
-28543=>10575,
-28565=>10576,
-28515=>10577,
-28535=>10578,
-28522=>10579,
-28539=>10580,
-29106=>10581,
-29103=>10582,
-29083=>10583,
-29104=>10584,
-29088=>10585,
-29082=>10586,
-29097=>10587,
-29109=>10588,
-29085=>10589,
-29093=>10590,
-29086=>10591,
-29092=>10592,
-29089=>10593,
-29098=>10594,
-29084=>10595,
-29095=>10596,
-29107=>10597,
-29336=>10598,
-29338=>10599,
-29528=>10600,
-29522=>10601,
-29534=>10602,
-29535=>10603,
-29536=>10604,
-29533=>10605,
-29531=>10606,
-29537=>10607,
-29530=>10608,
-29529=>10609,
-29538=>10610,
-29831=>10611,
-29833=>10612,
-29834=>10613,
-29830=>10614,
-29825=>10615,
-29821=>10616,
-29829=>10617,
-29832=>10618,
-29820=>10619,
-29817=>10620,
-58868=>10620,
-29960=>10621,
-29959=>10622,
-30078=>10623,
-30245=>10624,
-30238=>10625,
-30233=>10626,
-30237=>10627,
-30236=>10628,
-30243=>10629,
-30234=>10630,
-30248=>10631,
-30235=>10632,
-30364=>10633,
-30365=>10634,
-30366=>10635,
-30363=>10636,
-30605=>10637,
-30607=>10638,
-30601=>10639,
-30600=>10640,
-30925=>10641,
-30907=>10642,
-30927=>10643,
-30924=>10644,
-30929=>10645,
-30926=>10646,
-30932=>10647,
-30920=>10648,
-30915=>10649,
-30916=>10650,
-30921=>10651,
-31130=>10652,
-31137=>10653,
-31136=>10654,
-31132=>10655,
-31138=>10656,
-31131=>10657,
-59175=>10657,
-27510=>10658,
-31289=>10659,
-31410=>10660,
-31412=>10661,
-31411=>10662,
-31671=>10663,
-31691=>10664,
-31678=>10665,
-31660=>10666,
-31694=>10667,
-31663=>10668,
-31673=>10669,
-31690=>10670,
-31669=>10671,
-31941=>10672,
-31944=>10673,
-31948=>10674,
-31947=>10675,
-32247=>10676,
-32219=>10677,
-32234=>10678,
-32231=>10679,
-32215=>10680,
-32225=>10681,
-32259=>10682,
-32250=>10683,
-32230=>10684,
-32246=>10685,
-32241=>10686,
-32240=>10687,
-32238=>10688,
-32223=>10689,
-32630=>10690,
-32684=>10691,
-32688=>10692,
-32685=>10693,
-32749=>10694,
-32747=>10695,
-32746=>10696,
-32748=>10697,
-32742=>10698,
-32744=>10699,
-32868=>10700,
-32871=>10701,
-33187=>10702,
-33183=>10703,
-33182=>10704,
-33173=>10705,
-33186=>10706,
-33177=>10707,
-33175=>10708,
-33302=>10709,
-33359=>10710,
-33363=>10711,
-33362=>10712,
-33360=>10713,
-33358=>10714,
-33361=>10715,
-34084=>10716,
-34107=>10717,
-34063=>10718,
-34048=>10719,
-34089=>10720,
-34062=>10721,
-34057=>10722,
-34061=>10723,
-34079=>10724,
-34058=>10725,
-34087=>10726,
-34076=>10727,
-34043=>10728,
-34091=>10729,
-34042=>10730,
-34056=>10731,
-34060=>10732,
-34036=>10733,
-34090=>10734,
-34034=>10735,
-34069=>10736,
-34039=>10737,
-34027=>10738,
-34035=>10739,
-34044=>10740,
-34066=>10741,
-34026=>10742,
-34025=>10743,
-34070=>10744,
-34046=>10745,
-34088=>10746,
-34077=>10747,
-34094=>10748,
-34050=>10749,
-34045=>10750,
-34078=>10751,
-34038=>10752,
-34097=>10753,
-34086=>10754,
-34023=>10755,
-34024=>10756,
-34032=>10757,
-34031=>10758,
-34041=>10759,
-34072=>10760,
-34080=>10761,
-34096=>10762,
-34059=>10763,
-34073=>10764,
-34095=>10765,
-34402=>10766,
-34646=>10767,
-34659=>10768,
-34660=>10769,
-34679=>10770,
-34785=>10771,
-34675=>10772,
-34648=>10773,
-34644=>10774,
-34651=>10775,
-34642=>10776,
-34657=>10777,
-34650=>10778,
-34641=>10779,
-34654=>10780,
-34669=>10781,
-34666=>10782,
-34640=>10783,
-34638=>10784,
-34655=>10785,
-34653=>10786,
-34671=>10787,
-34668=>10788,
-34682=>10789,
-34670=>10790,
-34652=>10791,
-34661=>10792,
-34639=>10793,
-34683=>10794,
-34677=>10795,
-34658=>10796,
-34663=>10797,
-34665=>10798,
-34906=>10799,
-35077=>10800,
-35084=>10801,
-35092=>10802,
-35083=>10803,
-35095=>10804,
-35096=>10805,
-35097=>10806,
-35078=>10807,
-35094=>10808,
-35089=>10809,
-35086=>10810,
-35081=>10811,
-35234=>10812,
-35236=>10813,
-35235=>10814,
-35309=>10815,
-35312=>10816,
-35308=>10817,
-35535=>10818,
-35526=>10819,
-35512=>10820,
-35539=>10821,
-35537=>10822,
-35540=>10823,
-35541=>10824,
-35515=>10825,
-35543=>10826,
-35518=>10827,
-35520=>10828,
-35525=>10829,
-35544=>10830,
-35523=>10831,
-35514=>10832,
-35517=>10833,
-35545=>10834,
-35902=>10835,
-35917=>10836,
-35983=>10837,
-36069=>10838,
-36063=>10839,
-36057=>10840,
-36072=>10841,
-36058=>10842,
-36061=>10843,
-36071=>10844,
-36256=>10845,
-36252=>10846,
-36257=>10847,
-36251=>10848,
-36384=>10849,
-36387=>10850,
-36389=>10851,
-36388=>10852,
-36398=>10853,
-36373=>10854,
-36379=>10855,
-36374=>10856,
-36369=>10857,
-36377=>10858,
-36390=>10859,
-36391=>10860,
-36372=>10861,
-36370=>10862,
-36376=>10863,
-36371=>10864,
-36380=>10865,
-36375=>10866,
-36378=>10867,
-36652=>10868,
-36644=>10869,
-36632=>10870,
-36634=>10871,
-36640=>10872,
-36643=>10873,
-36630=>10874,
-36631=>10875,
-36979=>10876,
-36976=>10877,
-36975=>10878,
-36967=>10879,
-36971=>10880,
-37167=>10881,
-37163=>10882,
-37161=>10883,
-37162=>10884,
-37170=>10885,
-37158=>10886,
-37166=>10887,
-37253=>10888,
-37254=>10889,
-37258=>10890,
-37249=>10891,
-37250=>10892,
-37252=>10893,
-37248=>10894,
-37584=>10895,
-37571=>10896,
-37572=>10897,
-37568=>10898,
-37593=>10899,
-37558=>10900,
-37583=>10901,
-37617=>10902,
-37599=>10903,
-37592=>10904,
-37609=>10905,
-37591=>10906,
-37597=>10907,
-37580=>10908,
-37615=>10909,
-37570=>10910,
-37608=>10911,
-37578=>10912,
-37576=>10913,
-37582=>10914,
-37606=>10915,
-37581=>10916,
-37589=>10917,
-37577=>10918,
-37600=>10919,
-37598=>10920,
-37607=>10921,
-37585=>10922,
-37587=>10923,
-37557=>10924,
-37601=>10925,
-37669=>10926,
-37574=>10927,
-37556=>10928,
-38268=>10929,
-38316=>10930,
-38315=>10931,
-38318=>10932,
-38320=>10933,
-38564=>10934,
-38562=>10935,
-38611=>10936,
-38661=>10937,
-38664=>10938,
-38658=>10939,
-38746=>10940,
-38794=>10941,
-38798=>10942,
-38792=>10943,
-38864=>10944,
-38863=>10945,
-38942=>10946,
-38941=>10947,
-38950=>10948,
-38953=>10949,
-38952=>10950,
-38944=>10951,
-38939=>10952,
-38951=>10953,
-39090=>10954,
-39176=>10955,
-39162=>10956,
-39185=>10957,
-39188=>10958,
-39190=>10959,
-39191=>10960,
-39189=>10961,
-39388=>10962,
-39373=>10963,
-39375=>10964,
-39379=>10965,
-39380=>10966,
-39374=>10967,
-39369=>10968,
-39382=>10969,
-60270=>10969,
-39384=>10970,
-39371=>10971,
-39383=>10972,
-39372=>10973,
-39603=>10974,
-39660=>10975,
-39659=>10976,
-39667=>10977,
-39666=>10978,
-39665=>10979,
-39750=>10980,
-39747=>10981,
-39783=>10982,
-39796=>10983,
-39793=>10984,
-39782=>10985,
-39798=>10986,
-39797=>10987,
-39792=>10988,
-39784=>10989,
-39780=>10990,
-39788=>10991,
-40188=>10992,
-40186=>10993,
-40189=>10994,
-40191=>10995,
-40183=>10996,
-40199=>10997,
-40192=>10998,
-40185=>10999,
-40187=>11000,
-40200=>11001,
-40197=>11002,
-40196=>11003,
-40579=>11004,
-40659=>11005,
-40719=>11006,
-40720=>11007,
-20764=>11008,
-20755=>11009,
-20759=>11010,
-20762=>11011,
-20753=>11012,
-20958=>11013,
-21300=>11014,
-21473=>11015,
-22128=>11016,
-22112=>11017,
-22126=>11018,
-22131=>11019,
-22118=>11020,
-22115=>11021,
-22125=>11022,
-22130=>11023,
-22110=>11024,
-22135=>11025,
-22300=>11026,
-22299=>11027,
-22728=>11028,
-22717=>11029,
-22729=>11030,
-22719=>11031,
-22714=>11032,
-22722=>11033,
-22716=>11034,
-22726=>11035,
-23319=>11036,
-23321=>11037,
-23323=>11038,
-23329=>11039,
-23316=>11040,
-23315=>11041,
-23312=>11042,
-23318=>11043,
-23336=>11044,
-59539=>11044,
-23322=>11045,
-23328=>11046,
-23326=>11047,
-23535=>11048,
-23980=>11049,
-23985=>11050,
-23977=>11051,
-23975=>11052,
-23989=>11053,
-23984=>11054,
-23982=>11055,
-23978=>11056,
-23976=>11057,
-23986=>11058,
-23981=>11059,
-23983=>11060,
-23988=>11061,
-24167=>11062,
-24168=>11063,
-24166=>11064,
-24175=>11065,
-24297=>11066,
-24295=>11067,
-24294=>11068,
-24296=>11069,
-24293=>11070,
-24395=>11071,
-24508=>11072,
-24507=>11073,
-24989=>11074,
-25000=>11075,
-24982=>11076,
-25029=>11077,
-25012=>11078,
-25030=>11079,
-25025=>11080,
-25036=>11081,
-25018=>11082,
-25023=>11083,
-25016=>11084,
-24972=>11085,
-25815=>11086,
-25814=>11087,
-25808=>11088,
-25807=>11089,
-25801=>11090,
-25789=>11091,
-25737=>11092,
-25795=>11093,
-25819=>11094,
-25843=>11095,
-25817=>11096,
-25907=>11097,
-25983=>11098,
-25980=>11099,
-26018=>11100,
-26312=>11101,
-26302=>11102,
-26304=>11103,
-26314=>11104,
-26315=>11105,
-26319=>11106,
-26301=>11107,
-26299=>11108,
-26298=>11109,
-26316=>11110,
-26403=>11111,
-27188=>11112,
-27238=>11113,
-27209=>11114,
-27239=>11115,
-27186=>11116,
-27240=>11117,
-27198=>11118,
-27229=>11119,
-27245=>11120,
-27254=>11121,
-27227=>11122,
-27217=>11123,
-27176=>11124,
-27226=>11125,
-27195=>11126,
-27199=>11127,
-27201=>11128,
-27242=>11129,
-27236=>11130,
-27216=>11131,
-27215=>11132,
-27220=>11133,
-27247=>11134,
-27241=>11135,
-27232=>11136,
-27196=>11137,
-27230=>11138,
-27222=>11139,
-27221=>11140,
-27213=>11141,
-27214=>11142,
-27206=>11143,
-27477=>11144,
-27476=>11145,
-27478=>11146,
-27559=>11147,
-27562=>11148,
-27563=>11149,
-27592=>11150,
-27591=>11151,
-27652=>11152,
-27651=>11153,
-27654=>11154,
-28589=>11155,
-28619=>11156,
-28579=>11157,
-28615=>11158,
-28604=>11159,
-28622=>11160,
-28616=>11161,
-28510=>11162,
-28612=>11163,
-28605=>11164,
-28574=>11165,
-28618=>11166,
-28584=>11167,
-28676=>11168,
-28581=>11169,
-28590=>11170,
-28602=>11171,
-28588=>11172,
-28586=>11173,
-28623=>11174,
-28607=>11175,
-28600=>11176,
-28578=>11177,
-28617=>11178,
-28587=>11179,
-28621=>11180,
-28591=>11181,
-28594=>11182,
-28592=>11183,
-29125=>11184,
-29122=>11185,
-29119=>11186,
-29112=>11187,
-29142=>11188,
-29120=>11189,
-29121=>11190,
-29131=>11191,
-29140=>11192,
-29130=>11193,
-29127=>11194,
-29135=>11195,
-29117=>11196,
-29144=>11197,
-29116=>11198,
-29126=>11199,
-29146=>11200,
-29147=>11201,
-29341=>11202,
-29342=>11203,
-29545=>11204,
-29542=>11205,
-29543=>11206,
-29548=>11207,
-29541=>11208,
-29547=>11209,
-29546=>11210,
-29823=>11211,
-29850=>11212,
-29856=>11213,
-29844=>11214,
-29842=>11215,
-29845=>11216,
-29857=>11217,
-29963=>11218,
-30080=>11219,
-30255=>11220,
-30253=>11221,
-30257=>11222,
-30269=>11223,
-30259=>11224,
-30268=>11225,
-30261=>11226,
-30258=>11227,
-30256=>11228,
-30395=>11229,
-30438=>11230,
-30618=>11231,
-30621=>11232,
-30625=>11233,
-30620=>11234,
-30619=>11235,
-30626=>11236,
-30627=>11237,
-30613=>11238,
-30617=>11239,
-30615=>11240,
-30941=>11241,
-30953=>11242,
-30949=>11243,
-30954=>11244,
-30942=>11245,
-30947=>11246,
-30939=>11247,
-30945=>11248,
-30946=>11249,
-30957=>11250,
-30943=>11251,
-30944=>11252,
-31140=>11253,
-31300=>11254,
-31304=>11255,
-31303=>11256,
-31414=>11257,
-31416=>11258,
-31413=>11259,
-31409=>11260,
-31415=>11261,
-31710=>11262,
-31715=>11263,
-31719=>11264,
-31709=>11265,
-31701=>11266,
-31717=>11267,
-31706=>11268,
-31720=>11269,
-31737=>11270,
-31700=>11271,
-31722=>11272,
-31714=>11273,
-31708=>11274,
-31723=>11275,
-31704=>11276,
-31711=>11277,
-31954=>11278,
-31956=>11279,
-31959=>11280,
-31952=>11281,
-31953=>11282,
-32274=>11283,
-32289=>11284,
-32279=>11285,
-32268=>11286,
-32287=>11287,
-32288=>11288,
-32275=>11289,
-32270=>11290,
-32284=>11291,
-32277=>11292,
-32282=>11293,
-32290=>11294,
-32267=>11295,
-32271=>11296,
-32278=>11297,
-32269=>11298,
-32276=>11299,
-32293=>11300,
-32292=>11301,
-32579=>11302,
-32635=>11303,
-32636=>11304,
-32634=>11305,
-32689=>11306,
-32751=>11307,
-32810=>11308,
-32809=>11309,
-32876=>11310,
-33201=>11311,
-33190=>11312,
-33198=>11313,
-33209=>11314,
-33205=>11315,
-33195=>11316,
-33200=>11317,
-33196=>11318,
-33204=>11319,
-33202=>11320,
-33207=>11321,
-33191=>11322,
-33266=>11323,
-33365=>11324,
-33366=>11325,
-33367=>11326,
-34134=>11327,
-34117=>11328,
-34155=>11329,
-34125=>11330,
-34131=>11331,
-34145=>11332,
-34136=>11333,
-34112=>11334,
-34118=>11335,
-34148=>11336,
-34113=>11337,
-34146=>11338,
-34116=>11339,
-34129=>11340,
-34119=>11341,
-34147=>11342,
-34110=>11343,
-34139=>11344,
-34161=>11345,
-34126=>11346,
-34158=>11347,
-34165=>11348,
-34133=>11349,
-34151=>11350,
-34144=>11351,
-34188=>11352,
-34150=>11353,
-34141=>11354,
-34132=>11355,
-34149=>11356,
-34156=>11357,
-34403=>11358,
-34405=>11359,
-34404=>11360,
-34724=>11361,
-34715=>11362,
-34703=>11363,
-34711=>11364,
-34707=>11365,
-34706=>11366,
-34696=>11367,
-34689=>11368,
-34710=>11369,
-34712=>11370,
-34681=>11371,
-34695=>11372,
-34723=>11373,
-34693=>11374,
-34704=>11375,
-34705=>11376,
-34717=>11377,
-34692=>11378,
-34708=>11379,
-34716=>11380,
-34714=>11381,
-34697=>11382,
-35102=>11383,
-35110=>11384,
-35120=>11385,
-35117=>11386,
-35118=>11387,
-35111=>11388,
-35121=>11389,
-35106=>11390,
-35113=>11391,
-35107=>11392,
-35119=>11393,
-35116=>11394,
-35103=>11395,
-35313=>11396,
-35552=>11397,
-35554=>11398,
-35570=>11399,
-35572=>11400,
-35573=>11401,
-35549=>11402,
-35604=>11403,
-35556=>11404,
-35551=>11405,
-35568=>11406,
-35528=>11407,
-35550=>11408,
-35553=>11409,
-35560=>11410,
-35583=>11411,
-35567=>11412,
-35579=>11413,
-35985=>11414,
-35986=>11415,
-35984=>11416,
-36085=>11417,
-36078=>11418,
-36081=>11419,
-36080=>11420,
-36083=>11421,
-36204=>11422,
-36206=>11423,
-36261=>11424,
-36263=>11425,
-36403=>11426,
-36414=>11427,
-36408=>11428,
-36416=>11429,
-36421=>11430,
-36406=>11431,
-36412=>11432,
-36413=>11433,
-36417=>11434,
-36400=>11435,
-36415=>11436,
-36541=>11437,
-36662=>11438,
-60329=>11438,
-36654=>11439,
-36661=>11440,
-36658=>11441,
-36665=>11442,
-36663=>11443,
-36660=>11444,
-36982=>11445,
-36985=>11446,
-36987=>11447,
-36998=>11448,
-37114=>11449,
-37171=>11450,
-37173=>11451,
-37174=>11452,
-37267=>11453,
-37264=>11454,
-37265=>11455,
-37261=>11456,
-37263=>11457,
-37671=>11458,
-37662=>11459,
-37640=>11460,
-37663=>11461,
-37638=>11462,
-37647=>11463,
-37754=>11464,
-37688=>11465,
-37692=>11466,
-37659=>11467,
-37667=>11468,
-37650=>11469,
-37633=>11470,
-37702=>11471,
-37677=>11472,
-37646=>11473,
-37645=>11474,
-37579=>11475,
-37661=>11476,
-37626=>11477,
-37651=>11478,
-37625=>11479,
-37623=>11480,
-37684=>11481,
-37634=>11482,
-37668=>11483,
-37631=>11484,
-37673=>11485,
-37689=>11486,
-37685=>11487,
-37674=>11488,
-37652=>11489,
-37644=>11490,
-37643=>11491,
-37630=>11492,
-37641=>11493,
-37632=>11494,
-37627=>11495,
-37654=>11496,
-38332=>11497,
-38349=>11498,
-38334=>11499,
-38329=>11500,
-38330=>11501,
-38326=>11502,
-38335=>11503,
-38325=>11504,
-38333=>11505,
-38569=>11506,
-38612=>11507,
-38667=>11508,
-38674=>11509,
-38672=>11510,
-38809=>11511,
-38807=>11512,
-38804=>11513,
-38896=>11514,
-38904=>11515,
-38965=>11516,
-38959=>11517,
-38962=>11518,
-39204=>11519,
-39199=>11520,
-39207=>11521,
-39209=>11522,
-39326=>11523,
-39406=>11524,
-39404=>11525,
-39397=>11526,
-39396=>11527,
-39408=>11528,
-39395=>11529,
-39402=>11530,
-39401=>11531,
-39399=>11532,
-39609=>11533,
-39615=>11534,
-39604=>11535,
-39611=>11536,
-39670=>11537,
-39674=>11538,
-39673=>11539,
-39671=>11540,
-39731=>11541,
-39808=>11542,
-39813=>11543,
-39815=>11544,
-39804=>11545,
-39806=>11546,
-39803=>11547,
-39810=>11548,
-39827=>11549,
-39826=>11550,
-39824=>11551,
-39802=>11552,
-39829=>11553,
-39805=>11554,
-39816=>11555,
-40229=>11556,
-40215=>11557,
-40224=>11558,
-40222=>11559,
-40212=>11560,
-40233=>11561,
-40221=>11562,
-40216=>11563,
-40226=>11564,
-40208=>11565,
-40217=>11566,
-40223=>11567,
-40584=>11568,
-40582=>11569,
-40583=>11570,
-40622=>11571,
-40621=>11572,
-40661=>11573,
-40662=>11574,
-40698=>11575,
-40722=>11576,
-40765=>11577,
-20774=>11578,
-20773=>11579,
-20770=>11580,
-20772=>11581,
-20768=>11582,
-20777=>11583,
-21236=>11584,
-22163=>11585,
-22156=>11586,
-22157=>11587,
-22150=>11588,
-22148=>11589,
-22147=>11590,
-22142=>11591,
-22146=>11592,
-22143=>11593,
-22145=>11594,
-22742=>11595,
-22740=>11596,
-22735=>11597,
-22738=>11598,
-23341=>11599,
-23333=>11600,
-23346=>11601,
-23331=>11602,
-23340=>11603,
-23335=>11604,
-23334=>11605,
-23343=>11606,
-23342=>11607,
-23419=>11608,
-23537=>11609,
-23538=>11610,
-23991=>11611,
-24172=>11612,
-24170=>11613,
-24510=>11614,
-25027=>11615,
-25013=>11616,
-25020=>11617,
-25063=>11618,
-25056=>11619,
-25061=>11620,
-25060=>11621,
-25064=>11622,
-25054=>11623,
-25839=>11624,
-25833=>11625,
-25827=>11626,
-25835=>11627,
-25828=>11628,
-25832=>11629,
-25985=>11630,
-25984=>11631,
-26038=>11632,
-26074=>11633,
-26322=>11634,
-27277=>11635,
-27286=>11636,
-27265=>11637,
-27301=>11638,
-27273=>11639,
-27295=>11640,
-27291=>11641,
-27297=>11642,
-27294=>11643,
-27271=>11644,
-27283=>11645,
-27278=>11646,
-27285=>11647,
-27267=>11648,
-27304=>11649,
-27300=>11650,
-27281=>11651,
-27263=>11652,
-27302=>11653,
-27290=>11654,
-27269=>11655,
-27276=>11656,
-27282=>11657,
-27483=>11658,
-27565=>11659,
-27657=>11660,
-28620=>11661,
-28585=>11662,
-28660=>11663,
-28628=>11664,
-28643=>11665,
-28636=>11666,
-28653=>11667,
-28647=>11668,
-28646=>11669,
-28638=>11670,
-28658=>11671,
-28637=>11672,
-28642=>11673,
-28648=>11674,
-29153=>11675,
-29169=>11676,
-29160=>11677,
-29170=>11678,
-29156=>11679,
-29168=>11680,
-29154=>11681,
-29555=>11682,
-29550=>11683,
-29551=>11684,
-29847=>11685,
-29874=>11686,
-29867=>11687,
-29840=>11688,
-29866=>11689,
-29869=>11690,
-29873=>11691,
-29861=>11692,
-29871=>11693,
-29968=>11694,
-29969=>11695,
-29970=>11696,
-29967=>11697,
-30084=>11698,
-30275=>11699,
-30280=>11700,
-30281=>11701,
-30279=>11702,
-30372=>11703,
-30441=>11704,
-30645=>11705,
-30635=>11706,
-30642=>11707,
-30647=>11708,
-30646=>11709,
-30644=>11710,
-30641=>11711,
-30632=>11712,
-30704=>11713,
-30963=>11714,
-30973=>11715,
-30978=>11716,
-30971=>11717,
-30972=>11718,
-30975=>11719,
-30962=>11720,
-30981=>11721,
-30969=>11722,
-30974=>11723,
-30980=>11724,
-31147=>11725,
-31144=>11726,
-31324=>11727,
-31323=>11728,
-31318=>11729,
-31320=>11730,
-31316=>11731,
-31322=>11732,
-31422=>11733,
-31424=>11734,
-31425=>11735,
-31749=>11736,
-31759=>11737,
-31730=>11738,
-31744=>11739,
-31743=>11740,
-31739=>11741,
-31758=>11742,
-31732=>11743,
-31755=>11744,
-31731=>11745,
-31746=>11746,
-31753=>11747,
-31747=>11748,
-31745=>11749,
-31736=>11750,
-31741=>11751,
-31750=>11752,
-58176=>11752,
-31728=>11753,
-31729=>11754,
-31760=>11755,
-31754=>11756,
-31976=>11757,
-32301=>11758,
-32316=>11759,
-32322=>11760,
-32307=>11761,
-38984=>11762,
-32312=>11763,
-32298=>11764,
-32329=>11765,
-32320=>11766,
-32327=>11767,
-32297=>11768,
-32332=>11769,
-32304=>11770,
-32315=>11771,
-32310=>11772,
-32324=>11773,
-32314=>11774,
-32581=>11775,
-32639=>11776,
-32638=>11777,
-32637=>11778,
-32756=>11779,
-32754=>11780,
-32812=>11781,
-33211=>11782,
-33220=>11783,
-33228=>11784,
-33226=>11785,
-33221=>11786,
-33223=>11787,
-33212=>11788,
-33257=>11789,
-33371=>11790,
-33370=>11791,
-33372=>11792,
-34179=>11793,
-34176=>11794,
-34191=>11795,
-34215=>11796,
-34197=>11797,
-34208=>11798,
-34187=>11799,
-34211=>11800,
-34171=>11801,
-34212=>11802,
-34202=>11803,
-34206=>11804,
-34167=>11805,
-34172=>11806,
-34185=>11807,
-34209=>11808,
-34170=>11809,
-34168=>11810,
-34135=>11811,
-34190=>11812,
-34198=>11813,
-34182=>11814,
-34189=>11815,
-34201=>11816,
-34205=>11817,
-34177=>11818,
-34210=>11819,
-34178=>11820,
-34184=>11821,
-34181=>11822,
-34169=>11823,
-34166=>11824,
-34200=>11825,
-34192=>11826,
-34207=>11827,
-34408=>11828,
-34750=>11829,
-34730=>11830,
-34733=>11831,
-34757=>11832,
-34736=>11833,
-34732=>11834,
-34745=>11835,
-34741=>11836,
-34748=>11837,
-34734=>11838,
-34761=>11839,
-34755=>11840,
-34754=>11841,
-34764=>11842,
-34743=>11843,
-34735=>11844,
-34756=>11845,
-34762=>11846,
-34740=>11847,
-34742=>11848,
-34751=>11849,
-34744=>11850,
-34749=>11851,
-34782=>11852,
-34738=>11853,
-35125=>11854,
-35123=>11855,
-35132=>11856,
-35134=>11857,
-35137=>11858,
-35154=>11859,
-35127=>11860,
-35138=>11861,
-35245=>11862,
-35247=>11863,
-35246=>11864,
-35314=>11865,
-35315=>11866,
-35614=>11867,
-35608=>11868,
-35606=>11869,
-35601=>11870,
-35589=>11871,
-35595=>11872,
-35618=>11873,
-35599=>11874,
-35602=>11875,
-35605=>11876,
-35591=>11877,
-35597=>11878,
-35592=>11879,
-35590=>11880,
-35612=>11881,
-35603=>11882,
-35610=>11883,
-35919=>11884,
-35952=>11885,
-35954=>11886,
-35953=>11887,
-35951=>11888,
-35989=>11889,
-35988=>11890,
-36089=>11891,
-36207=>11892,
-36430=>11893,
-36429=>11894,
-36435=>11895,
-36432=>11896,
-36428=>11897,
-36423=>11898,
-36675=>11899,
-36672=>11900,
-36997=>11901,
-36990=>11902,
-37176=>11903,
-37274=>11904,
-37282=>11905,
-37275=>11906,
-37273=>11907,
-37279=>11908,
-37281=>11909,
-37277=>11910,
-37280=>11911,
-37793=>11912,
-37763=>11913,
-37807=>11914,
-37732=>11915,
-37718=>11916,
-37703=>11917,
-37756=>11918,
-37720=>11919,
-37724=>11920,
-37750=>11921,
-37705=>11922,
-37712=>11923,
-37713=>11924,
-37728=>11925,
-37741=>11926,
-37775=>11927,
-37708=>11928,
-37738=>11929,
-37753=>11930,
-37719=>11931,
-37717=>11932,
-37714=>11933,
-37711=>11934,
-37745=>11935,
-37751=>11936,
-37755=>11937,
-37729=>11938,
-37726=>11939,
-37731=>11940,
-37735=>11941,
-37710=>11942,
-37721=>11943,
-38343=>11944,
-38336=>11945,
-38345=>11946,
-38339=>11947,
-38341=>11948,
-38327=>11949,
-38574=>11950,
-38576=>11951,
-38572=>11952,
-38688=>11953,
-38687=>11954,
-38680=>11955,
-38685=>11956,
-38681=>11957,
-38810=>11958,
-38817=>11959,
-38812=>11960,
-38814=>11961,
-38813=>11962,
-38869=>11963,
-38868=>11964,
-38897=>11965,
-38977=>11966,
-38980=>11967,
-38986=>11968,
-38985=>11969,
-38981=>11970,
-38979=>11971,
-39205=>11972,
-39211=>11973,
-39212=>11974,
-39210=>11975,
-39219=>11976,
-39218=>11977,
-39215=>11978,
-39213=>11979,
-39217=>11980,
-39216=>11981,
-39320=>11982,
-39331=>11983,
-39329=>11984,
-39426=>11985,
-39418=>11986,
-39412=>11987,
-39415=>11988,
-39417=>11989,
-39416=>11990,
-39414=>11991,
-39419=>11992,
-39421=>11993,
-39422=>11994,
-39420=>11995,
-39427=>11996,
-39614=>11997,
-39678=>11998,
-39677=>11999,
-39681=>12000,
-39676=>12001,
-39752=>12002,
-39834=>12003,
-39848=>12004,
-39838=>12005,
-39835=>12006,
-39846=>12007,
-39841=>12008,
-39845=>12009,
-39844=>12010,
-39814=>12011,
-39842=>12012,
-39840=>12013,
-39855=>12014,
-40243=>12015,
-40257=>12016,
-40295=>12017,
-40246=>12018,
-40238=>12019,
-40239=>12020,
-40241=>12021,
-40248=>12022,
-40240=>12023,
-40261=>12024,
-40258=>12025,
-40259=>12026,
-40254=>12027,
-40247=>12028,
-40256=>12029,
-40253=>12030,
-32757=>12031,
-40237=>12032,
-40586=>12033,
-40585=>12034,
-40589=>12035,
-40624=>12036,
-40648=>12037,
-40666=>12038,
-40699=>12039,
-40703=>12040,
-40740=>12041,
-40739=>12042,
-40738=>12043,
-40788=>12044,
-12245=>12045,
-40864=>12045,
-20785=>12046,
-20781=>12047,
-20782=>12048,
-22168=>12049,
-22172=>12050,
-22167=>12051,
-22170=>12052,
-22173=>12053,
-22169=>12054,
-22896=>12055,
-23356=>12056,
-23657=>12057,
-23658=>12058,
-24000=>12059,
-24173=>12060,
-24174=>12061,
-25048=>12062,
-25055=>12063,
-25069=>12064,
-25070=>12065,
-25073=>12066,
-25066=>12067,
-25072=>12068,
-25067=>12069,
-25046=>12070,
-25065=>12071,
-25855=>12072,
-25860=>12073,
-25853=>12074,
-25848=>12075,
-25857=>12076,
-25859=>12077,
-25852=>12078,
-26004=>12079,
-26075=>12080,
-26330=>12081,
-26331=>12082,
-26328=>12083,
-27333=>12084,
-27321=>12085,
-27325=>12086,
-27361=>12087,
-27334=>12088,
-27322=>12089,
-27318=>12090,
-27319=>12091,
-27335=>12092,
-27316=>12093,
-27309=>12094,
-27486=>12095,
-27593=>12096,
-27659=>12097,
-28679=>12098,
-28684=>12099,
-28685=>12100,
-28673=>12101,
-28677=>12102,
-28692=>12103,
-28686=>12104,
-28671=>12105,
-28672=>12106,
-28667=>12107,
-28710=>12108,
-28668=>12109,
-28663=>12110,
-28682=>12111,
-29185=>12112,
-60224=>12112,
-29183=>12113,
-29177=>12114,
-29187=>12115,
-29181=>12116,
-29558=>12117,
-29880=>12118,
-29888=>12119,
-29877=>12120,
-29889=>12121,
-29886=>12122,
-29878=>12123,
-29883=>12124,
-29890=>12125,
-29972=>12126,
-29971=>12127,
-30300=>12128,
-30308=>12129,
-30297=>12130,
-30288=>12131,
-30291=>12132,
-30295=>12133,
-30298=>12134,
-30374=>12135,
-30397=>12136,
-30444=>12137,
-30658=>12138,
-30650=>12139,
-30988=>12140,
-30995=>12141,
-30996=>12142,
-30985=>12143,
-30992=>12144,
-30994=>12145,
-30993=>12146,
-31149=>12147,
-31148=>12148,
-31327=>12149,
-31772=>12150,
-31785=>12151,
-31769=>12152,
-31776=>12153,
-31775=>12154,
-31789=>12155,
-31773=>12156,
-31782=>12157,
-31784=>12158,
-31778=>12159,
-31781=>12160,
-31792=>12161,
-32348=>12162,
-32336=>12163,
-32342=>12164,
-32355=>12165,
-32344=>12166,
-32354=>12167,
-32351=>12168,
-32337=>12169,
-32352=>12170,
-32343=>12171,
-32339=>12172,
-32693=>12173,
-32691=>12174,
-32759=>12175,
-32760=>12176,
-32885=>12177,
-33233=>12178,
-33234=>12179,
-33232=>12180,
-33375=>12181,
-33374=>12182,
-34228=>12183,
-34246=>12184,
-34240=>12185,
-34243=>12186,
-34242=>12187,
-34227=>12188,
-34229=>12189,
-34237=>12190,
-34247=>12191,
-34244=>12192,
-34239=>12193,
-34251=>12194,
-34254=>12195,
-34248=>12196,
-34245=>12197,
-34225=>12198,
-34230=>12199,
-34258=>12200,
-34340=>12201,
-34232=>12202,
-34231=>12203,
-34238=>12204,
-34409=>12205,
-34791=>12206,
-34790=>12207,
-34786=>12208,
-34779=>12209,
-34795=>12210,
-34794=>12211,
-34789=>12212,
-34783=>12213,
-34803=>12214,
-34788=>12215,
-34772=>12216,
-34780=>12217,
-34771=>12218,
-34797=>12219,
-34776=>12220,
-34787=>12221,
-34775=>12222,
-34777=>12223,
-34817=>12224,
-34804=>12225,
-34792=>12226,
-34781=>12227,
-35155=>12228,
-35147=>12229,
-35151=>12230,
-35148=>12231,
-35142=>12232,
-35152=>12233,
-35153=>12234,
-35145=>12235,
-35626=>12236,
-35623=>12237,
-35619=>12238,
-35635=>12239,
-35632=>12240,
-35637=>12241,
-35655=>12242,
-35631=>12243,
-35644=>12244,
-35646=>12245,
-35633=>12246,
-35621=>12247,
-35639=>12248,
-35622=>12249,
-35638=>12250,
-35630=>12251,
-35620=>12252,
-35643=>12253,
-35645=>12254,
-35642=>12255,
-35906=>12256,
-35957=>12257,
-35993=>12258,
-35992=>12259,
-35991=>12260,
-36094=>12261,
-36100=>12262,
-36098=>12263,
-36096=>12264,
-36444=>12265,
-36450=>12266,
-36448=>12267,
-36439=>12268,
-36438=>12269,
-36446=>12270,
-36453=>12271,
-36455=>12272,
-36443=>12273,
-36442=>12274,
-36449=>12275,
-36445=>12276,
-36457=>12277,
-36436=>12278,
-36678=>12279,
-36679=>12280,
-36680=>12281,
-36683=>12282,
-37160=>12283,
-37178=>12284,
-37179=>12285,
-37182=>12286,
-37288=>12287,
-37285=>12288,
-37287=>12289,
-37295=>12290,
-37290=>12291,
-37813=>12292,
-37772=>12293,
-37778=>12294,
-37815=>12295,
-37787=>12296,
-37789=>12297,
-37769=>12298,
-37799=>12299,
-37774=>12300,
-37802=>12301,
-37790=>12302,
-37798=>12303,
-37781=>12304,
-37768=>12305,
-37785=>12306,
-37791=>12307,
-37760=>12308,
-37773=>12309,
-37809=>12310,
-37777=>12311,
-37810=>12312,
-37796=>12313,
-37800=>12314,
-37812=>12315,
-37795=>12316,
-38354=>12317,
-38355=>12318,
-38353=>12319,
-38579=>12320,
-38615=>12321,
-38618=>12322,
-24002=>12323,
-38623=>12324,
-38616=>12325,
-38621=>12326,
-38691=>12327,
-38690=>12328,
-38693=>12329,
-38828=>12330,
-38830=>12331,
-38824=>12332,
-38827=>12333,
-38820=>12334,
-38826=>12335,
-38818=>12336,
-38821=>12337,
-38871=>12338,
-38873=>12339,
-38870=>12340,
-38872=>12341,
-38906=>12342,
-38992=>12343,
-38993=>12344,
-38994=>12345,
-39096=>12346,
-39233=>12347,
-39228=>12348,
-39226=>12349,
-39439=>12350,
-39435=>12351,
-39433=>12352,
-39437=>12353,
-39428=>12354,
-39441=>12355,
-39434=>12356,
-39429=>12357,
-39431=>12358,
-39430=>12359,
-39616=>12360,
-39644=>12361,
-39688=>12362,
-39684=>12363,
-39685=>12364,
-39721=>12365,
-39733=>12366,
-39754=>12367,
-39756=>12368,
-39755=>12369,
-39879=>12370,
-39878=>12371,
-39875=>12372,
-39871=>12373,
-39873=>12374,
-39861=>12375,
-39864=>12376,
-39891=>12377,
-39862=>12378,
-39876=>12379,
-39865=>12380,
-39869=>12381,
-40284=>12382,
-40275=>12383,
-40271=>12384,
-40266=>12385,
-40283=>12386,
-40267=>12387,
-40281=>12388,
-40278=>12389,
-40268=>12390,
-40279=>12391,
-40274=>12392,
-40276=>12393,
-40287=>12394,
-40280=>12395,
-40282=>12396,
-40590=>12397,
-40588=>12398,
-40671=>12399,
-40705=>12400,
-40704=>12401,
-40726=>12402,
-58693=>12402,
-40741=>12403,
-40747=>12404,
-40746=>12405,
-40745=>12406,
-40744=>12407,
-40780=>12408,
-40789=>12409,
-20788=>12410,
-20789=>12411,
-21142=>12412,
-21239=>12413,
-21428=>12414,
-22187=>12415,
-22189=>12416,
-22182=>12417,
-22183=>12418,
-22186=>12419,
-22188=>12420,
-22746=>12421,
-22749=>12422,
-22747=>12423,
-22802=>12424,
-23357=>12425,
-23358=>12426,
-23359=>12427,
-24003=>12428,
-24176=>12429,
-24511=>12430,
-25083=>12431,
-25863=>12432,
-25872=>12433,
-25869=>12434,
-25865=>12435,
-25868=>12436,
-25870=>12437,
-25988=>12438,
-26078=>12439,
-26077=>12440,
-26334=>12441,
-27367=>12442,
-27360=>12443,
-27340=>12444,
-27345=>12445,
-27353=>12446,
-27339=>12447,
-27359=>12448,
-27356=>12449,
-27344=>12450,
-27371=>12451,
-27343=>12452,
-27341=>12453,
-27358=>12454,
-27488=>12455,
-27568=>12456,
-27660=>12457,
-28697=>12458,
-28711=>12459,
-28704=>12460,
-28694=>12461,
-28715=>12462,
-28705=>12463,
-28706=>12464,
-28707=>12465,
-28713=>12466,
-28695=>12467,
-28708=>12468,
-28700=>12469,
-29196=>12470,
-29194=>12471,
-29191=>12472,
-29186=>12473,
-29189=>12474,
-29349=>12475,
-29350=>12476,
-29348=>12477,
-29347=>12478,
-29345=>12479,
-29899=>12480,
-29893=>12481,
-29879=>12482,
-29891=>12483,
-29974=>12484,
-30304=>12485,
-30665=>12486,
-30666=>12487,
-30660=>12488,
-30705=>12489,
-31005=>12490,
-31003=>12491,
-31009=>12492,
-31004=>12493,
-30999=>12494,
-31006=>12495,
-31152=>12496,
-31335=>12497,
-31336=>12498,
-31795=>12499,
-31804=>12500,
-31801=>12501,
-31788=>12502,
-31803=>12503,
-31980=>12504,
-31978=>12505,
-32374=>12506,
-32373=>12507,
-32376=>12508,
-32368=>12509,
-32375=>12510,
-32367=>12511,
-32378=>12512,
-32370=>12513,
-32372=>12514,
-32360=>12515,
-32587=>12516,
-32586=>12517,
-32643=>12518,
-32646=>12519,
-32695=>12520,
-32765=>12521,
-32766=>12522,
-32888=>12523,
-33239=>12524,
-33237=>12525,
-33291=>12526,
-33380=>12527,
-33377=>12528,
-33379=>12529,
-34283=>12530,
-34289=>12531,
-34285=>12532,
-34265=>12533,
-34273=>12534,
-34280=>12535,
-34266=>12536,
-34263=>12537,
-34284=>12538,
-34290=>12539,
-34296=>12540,
-34264=>12541,
-34271=>12542,
-34275=>12543,
-34268=>12544,
-34257=>12545,
-34288=>12546,
-34278=>12547,
-34287=>12548,
-34270=>12549,
-34274=>12550,
-34816=>12551,
-34810=>12552,
-34819=>12553,
-34806=>12554,
-34807=>12555,
-34825=>12556,
-34828=>12557,
-34827=>12558,
-34822=>12559,
-34812=>12560,
-34824=>12561,
-34815=>12562,
-34826=>12563,
-34818=>12564,
-35170=>12565,
-35162=>12566,
-35163=>12567,
-35159=>12568,
-35169=>12569,
-35164=>12570,
-35160=>12571,
-35165=>12572,
-35161=>12573,
-35208=>12574,
-35255=>12575,
-35254=>12576,
-35318=>12577,
-35664=>12578,
-35656=>12579,
-35658=>12580,
-35648=>12581,
-35667=>12582,
-35670=>12583,
-35668=>12584,
-35659=>12585,
-35669=>12586,
-35665=>12587,
-35650=>12588,
-35666=>12589,
-35671=>12590,
-35907=>12591,
-35959=>12592,
-35958=>12593,
-35994=>12594,
-36102=>12595,
-36103=>12596,
-36105=>12597,
-36268=>12598,
-36266=>12599,
-36269=>12600,
-36267=>12601,
-36461=>12602,
-36472=>12603,
-36467=>12604,
-36458=>12605,
-36463=>12606,
-36475=>12607,
-36546=>12608,
-36690=>12609,
-36689=>12610,
-36687=>12611,
-36688=>12612,
-36691=>12613,
-36788=>12614,
-37184=>12615,
-37183=>12616,
-37296=>12617,
-37293=>12618,
-37854=>12619,
-37831=>12620,
-37839=>12621,
-37826=>12622,
-37850=>12623,
-37840=>12624,
-37881=>12625,
-37868=>12626,
-37836=>12627,
-37849=>12628,
-37801=>12629,
-37862=>12630,
-37834=>12631,
-37844=>12632,
-37870=>12633,
-37859=>12634,
-37845=>12635,
-37828=>12636,
-37838=>12637,
-37824=>12638,
-37842=>12639,
-37797=>12640,
-37863=>12641,
-38269=>12642,
-38362=>12643,
-38363=>12644,
-38625=>12645,
-38697=>12646,
-38699=>12647,
-38700=>12648,
-38696=>12649,
-38694=>12650,
-38835=>12651,
-38839=>12652,
-38838=>12653,
-38877=>12654,
-38878=>12655,
-38879=>12656,
-39004=>12657,
-39001=>12658,
-39005=>12659,
-38999=>12660,
-39103=>12661,
-39101=>12662,
-39099=>12663,
-39102=>12664,
-39240=>12665,
-39239=>12666,
-39235=>12667,
-39334=>12668,
-39335=>12669,
-39450=>12670,
-39445=>12671,
-39461=>12672,
-39453=>12673,
-39460=>12674,
-39451=>12675,
-39458=>12676,
-39456=>12677,
-39463=>12678,
-39459=>12679,
-39454=>12680,
-39452=>12681,
-39444=>12682,
-39618=>12683,
-39691=>12684,
-39690=>12685,
-39694=>12686,
-39692=>12687,
-39735=>12688,
-39914=>12689,
-39915=>12690,
-39904=>12691,
-39902=>12692,
-39908=>12693,
-39910=>12694,
-39906=>12695,
-39920=>12696,
-39892=>12697,
-39895=>12698,
-39916=>12699,
-39900=>12700,
-39897=>12701,
-39909=>12702,
-39893=>12703,
-39905=>12704,
-39898=>12705,
-40311=>12706,
-40321=>12707,
-40330=>12708,
-40324=>12709,
-40328=>12710,
-40305=>12711,
-40320=>12712,
-40312=>12713,
-40326=>12714,
-40331=>12715,
-40332=>12716,
-40317=>12717,
-40299=>12718,
-40308=>12719,
-40309=>12720,
-40304=>12721,
-40297=>12722,
-40325=>12723,
-40307=>12724,
-40315=>12725,
-40322=>12726,
-40303=>12727,
-40313=>12728,
-40319=>12729,
-40327=>12730,
-40296=>12731,
-40596=>12732,
-40593=>12733,
-40640=>12734,
-40700=>12735,
-40749=>12736,
-40768=>12737,
-40769=>12738,
-40781=>12739,
-40790=>12740,
-40791=>12741,
-40792=>12742,
-21303=>12743,
-22194=>12744,
-22197=>12745,
-22195=>12746,
-22755=>12747,
-23365=>12748,
-24006=>12749,
-24007=>12750,
-24302=>12751,
-24303=>12752,
-24512=>12753,
-24513=>12754,
-25081=>12755,
-25879=>12756,
-25878=>12757,
-25877=>12758,
-25875=>12759,
-26079=>12760,
-26344=>12761,
-26339=>12762,
-26340=>12763,
-27379=>12764,
-27376=>12765,
-27370=>12766,
-27368=>12767,
-27385=>12768,
-27377=>12769,
-27374=>12770,
-27375=>12771,
-28732=>12772,
-28725=>12773,
-28719=>12774,
-28727=>12775,
-28724=>12776,
-28721=>12777,
-28738=>12778,
-28728=>12779,
-28735=>12780,
-28730=>12781,
-28729=>12782,
-28714=>12783,
-28736=>12784,
-28731=>12785,
-28723=>12786,
-28737=>12787,
-29203=>12788,
-29204=>12789,
-29352=>12790,
-29565=>12791,
-29564=>12792,
-29882=>12793,
-30379=>12794,
-30378=>12795,
-30398=>12796,
-30445=>12797,
-30668=>12798,
-30670=>12799,
-30671=>12800,
-30669=>12801,
-30706=>12802,
-31013=>12803,
-31011=>12804,
-31015=>12805,
-31016=>12806,
-31012=>12807,
-31017=>12808,
-31154=>12809,
-31342=>12810,
-31340=>12811,
-31341=>12812,
-31479=>12813,
-31817=>12814,
-31816=>12815,
-31818=>12816,
-31815=>12817,
-31813=>12818,
-31982=>12819,
-32379=>12820,
-32382=>12821,
-32385=>12822,
-32384=>12823,
-32698=>12824,
-32767=>12825,
-32889=>12826,
-33243=>12827,
-33241=>12828,
-33384=>12829,
-33385=>12830,
-34338=>12831,
-34303=>12832,
-34305=>12833,
-34302=>12834,
-34331=>12835,
-34304=>12836,
-34294=>12837,
-34308=>12838,
-34313=>12839,
-34309=>12840,
-34316=>12841,
-34301=>12842,
-34841=>12843,
-34832=>12844,
-34833=>12845,
-34839=>12846,
-34835=>12847,
-34838=>12848,
-35171=>12849,
-35174=>12850,
-35257=>12851,
-35319=>12852,
-35680=>12853,
-35690=>12854,
-35677=>12855,
-35688=>12856,
-35683=>12857,
-35685=>12858,
-35687=>12859,
-35693=>12860,
-36270=>12861,
-36486=>12862,
-36488=>12863,
-36484=>12864,
-36697=>12865,
-36694=>12866,
-36695=>12867,
-36693=>12868,
-36696=>12869,
-36698=>12870,
-37005=>12871,
-37187=>12872,
-37185=>12873,
-37303=>12874,
-37301=>12875,
-37298=>12876,
-37299=>12877,
-37899=>12878,
-37907=>12879,
-37883=>12880,
-37920=>12881,
-37903=>12882,
-37908=>12883,
-37886=>12884,
-37909=>12885,
-37904=>12886,
-37928=>12887,
-37913=>12888,
-37901=>12889,
-37877=>12890,
-37888=>12891,
-37879=>12892,
-37895=>12893,
-37902=>12894,
-37910=>12895,
-37906=>12896,
-37882=>12897,
-37897=>12898,
-37880=>12899,
-37948=>12900,
-37898=>12901,
-37887=>12902,
-37884=>12903,
-37900=>12904,
-37878=>12905,
-37905=>12906,
-37894=>12907,
-38366=>12908,
-38368=>12909,
-38367=>12910,
-38702=>12911,
-38703=>12912,
-38841=>12913,
-38843=>12914,
-38909=>12915,
-38910=>12916,
-39008=>12917,
-39010=>12918,
-39011=>12919,
-39007=>12920,
-39105=>12921,
-39106=>12922,
-39248=>12923,
-39246=>12924,
-39257=>12925,
-39244=>12926,
-39243=>12927,
-39251=>12928,
-39474=>12929,
-39476=>12930,
-39473=>12931,
-39468=>12932,
-39466=>12933,
-39478=>12934,
-39465=>12935,
-39470=>12936,
-39480=>12937,
-39469=>12938,
-39623=>12939,
-39626=>12940,
-39622=>12941,
-39696=>12942,
-39698=>12943,
-39697=>12944,
-39947=>12945,
-39944=>12946,
-39927=>12947,
-39941=>12948,
-39954=>12949,
-39928=>12950,
-40000=>12951,
-39943=>12952,
-39950=>12953,
-39942=>12954,
-39959=>12955,
-39956=>12956,
-39945=>12957,
-40351=>12958,
-40345=>12959,
-40356=>12960,
-40349=>12961,
-40338=>12962,
-40344=>12963,
-40336=>12964,
-40347=>12965,
-40352=>12966,
-40340=>12967,
-40348=>12968,
-40362=>12969,
-40343=>12970,
-40353=>12971,
-40346=>12972,
-40354=>12973,
-40360=>12974,
-40350=>12975,
-40355=>12976,
-40383=>12977,
-40361=>12978,
-40342=>12979,
-40358=>12980,
-40359=>12981,
-40601=>12982,
-40603=>12983,
-40602=>12984,
-40677=>12985,
-40676=>12986,
-40679=>12987,
-40678=>12988,
-40752=>12989,
-40750=>12990,
-40795=>12991,
-40800=>12992,
-40798=>12993,
-40797=>12994,
-40793=>12995,
-40849=>12996,
-20794=>12997,
-20793=>12998,
-21144=>12999,
-21143=>13000,
-22211=>13001,
-22205=>13002,
-22206=>13003,
-23368=>13004,
-23367=>13005,
-24011=>13006,
-24015=>13007,
-24305=>13008,
-25085=>13009,
-25883=>13010,
-27394=>13011,
-27388=>13012,
-27395=>13013,
-27384=>13014,
-27392=>13015,
-28739=>13016,
-28740=>13017,
-28746=>13018,
-28744=>13019,
-28745=>13020,
-28741=>13021,
-28742=>13022,
-29213=>13023,
-29210=>13024,
-29209=>13025,
-29566=>13026,
-29975=>13027,
-30314=>13028,
-30672=>13029,
-31021=>13030,
-31025=>13031,
-31023=>13032,
-31828=>13033,
-31827=>13034,
-31986=>13035,
-32394=>13036,
-60229=>13037,
-32391=>13037,
-32392=>13038,
-32395=>13039,
-32390=>13040,
-32397=>13041,
-32589=>13042,
-32699=>13043,
-32816=>13044,
-33245=>13045,
-34328=>13046,
-34346=>13047,
-34342=>13048,
-34335=>13049,
-34339=>13050,
-34332=>13051,
-34329=>13052,
-34343=>13053,
-34350=>13054,
-34337=>13055,
-34336=>13056,
-34345=>13057,
-34334=>13058,
-34341=>13059,
-34857=>13060,
-34845=>13061,
-34843=>13062,
-34848=>13063,
-34852=>13064,
-34844=>13065,
-34859=>13066,
-34890=>13067,
-35181=>13068,
-35177=>13069,
-35182=>13070,
-35179=>13071,
-35322=>13072,
-35705=>13073,
-35704=>13074,
-35653=>13075,
-35706=>13076,
-35707=>13077,
-36112=>13078,
-36116=>13079,
-36271=>13080,
-36494=>13081,
-36492=>13082,
-36702=>13083,
-36699=>13084,
-36701=>13085,
-37190=>13086,
-37188=>13087,
-37189=>13088,
-37305=>13089,
-37951=>13090,
-37947=>13091,
-37942=>13092,
-37929=>13093,
-37949=>13094,
-37936=>13095,
-37945=>13096,
-37930=>13097,
-37943=>13098,
-37932=>13099,
-37952=>13100,
-37937=>13101,
-38373=>13102,
-38372=>13103,
-38371=>13104,
-38709=>13105,
-38714=>13106,
-38847=>13107,
-38881=>13108,
-39012=>13109,
-39113=>13110,
-39110=>13111,
-39104=>13112,
-39256=>13113,
-39254=>13114,
-39481=>13115,
-39485=>13116,
-39494=>13117,
-39492=>13118,
-39490=>13119,
-39489=>13120,
-39482=>13121,
-39487=>13122,
-39629=>13123,
-39701=>13124,
-39703=>13125,
-39704=>13126,
-39702=>13127,
-39738=>13128,
-39762=>13129,
-39979=>13130,
-39965=>13131,
-39964=>13132,
-39980=>13133,
-39971=>13134,
-39976=>13135,
-39977=>13136,
-39972=>13137,
-39969=>13138,
-40375=>13139,
-40374=>13140,
-40380=>13141,
-40385=>13142,
-40391=>13143,
-40394=>13144,
-40399=>13145,
-40382=>13146,
-40389=>13147,
-40387=>13148,
-40379=>13149,
-40373=>13150,
-40398=>13151,
-40377=>13152,
-40378=>13153,
-40364=>13154,
-40392=>13155,
-40369=>13156,
-40365=>13157,
-40396=>13158,
-40371=>13159,
-40397=>13160,
-40370=>13161,
-40570=>13162,
-40604=>13163,
-40683=>13164,
-40686=>13165,
-40685=>13166,
-40731=>13167,
-40728=>13168,
-40730=>13169,
-40753=>13170,
-40782=>13171,
-40805=>13172,
-40804=>13173,
-40850=>13174,
-20153=>13175,
-22214=>13176,
-22213=>13177,
-22219=>13178,
-22897=>13179,
-23371=>13180,
-23372=>13181,
-24021=>13182,
-24017=>13183,
-24306=>13184,
-25889=>13185,
-25888=>13186,
-25894=>13187,
-25890=>13188,
-27403=>13189,
-27400=>13190,
-27401=>13191,
-27661=>13192,
-28757=>13193,
-28758=>13194,
-28759=>13195,
-28754=>13196,
-29214=>13197,
-29215=>13198,
-29353=>13199,
-29567=>13200,
-29912=>13201,
-29909=>13202,
-29913=>13203,
-29911=>13204,
-30317=>13205,
-30381=>13206,
-31029=>13207,
-31156=>13208,
-31344=>13209,
-31345=>13210,
-31831=>13211,
-31836=>13212,
-31833=>13213,
-31835=>13214,
-31834=>13215,
-31988=>13216,
-31985=>13217,
-32401=>13218,
-32591=>13219,
-32647=>13220,
-33246=>13221,
-33387=>13222,
-34356=>13223,
-34357=>13224,
-34355=>13225,
-34348=>13226,
-34354=>13227,
-34358=>13228,
-34860=>13229,
-34856=>13230,
-34854=>13231,
-34858=>13232,
-34853=>13233,
-35185=>13234,
-35263=>13235,
-35262=>13236,
-35323=>13237,
-35710=>13238,
-35716=>13239,
-35714=>13240,
-35718=>13241,
-35717=>13242,
-35711=>13243,
-36117=>13244,
-36501=>13245,
-36500=>13246,
-36506=>13247,
-36498=>13248,
-36496=>13249,
-36502=>13250,
-36503=>13251,
-36704=>13252,
-36706=>13253,
-37191=>13254,
-37964=>13255,
-37968=>13256,
-37962=>13257,
-37963=>13258,
-37967=>13259,
-37959=>13260,
-37957=>13261,
-37960=>13262,
-37961=>13263,
-37958=>13264,
-38719=>13265,
-38883=>13266,
-39018=>13267,
-39017=>13268,
-39115=>13269,
-39252=>13270,
-39259=>13271,
-39502=>13272,
-39507=>13273,
-39508=>13274,
-39500=>13275,
-39503=>13276,
-39496=>13277,
-39498=>13278,
-39497=>13279,
-39506=>13280,
-39504=>13281,
-39632=>13282,
-39705=>13283,
-39723=>13284,
-39739=>13285,
-39766=>13286,
-39765=>13287,
-40006=>13288,
-40008=>13289,
-39999=>13290,
-40004=>13291,
-39993=>13292,
-39987=>13293,
-40001=>13294,
-39996=>13295,
-39991=>13296,
-39988=>13297,
-39986=>13298,
-39997=>13299,
-39990=>13300,
-40411=>13301,
-40402=>13302,
-40414=>13303,
-40410=>13304,
-40395=>13305,
-40400=>13306,
-40412=>13307,
-40401=>13308,
-40415=>13309,
-40425=>13310,
-40409=>13311,
-40408=>13312,
-40406=>13313,
-40437=>13314,
-40405=>13315,
-40413=>13316,
-40630=>13317,
-40688=>13318,
-40757=>13319,
-40755=>13320,
-40754=>13321,
-40770=>13322,
-40811=>13323,
-40853=>13324,
-40866=>13325,
-20797=>13326,
-21145=>13327,
-22760=>13328,
-22759=>13329,
-22898=>13330,
-23373=>13331,
-24024=>13332,
-34863=>13333,
-24399=>13334,
-25089=>13335,
-25091=>13336,
-25092=>13337,
-25897=>13338,
-25893=>13339,
-26006=>13340,
-26347=>13341,
-27409=>13342,
-27410=>13343,
-27407=>13344,
-27594=>13345,
-28763=>13346,
-28762=>13347,
-29218=>13348,
-29570=>13349,
-29569=>13350,
-29571=>13351,
-30320=>13352,
-30676=>13353,
-31847=>13354,
-31846=>13355,
-32405=>13356,
-33388=>13357,
-34362=>13358,
-34368=>13359,
-34361=>13360,
-34364=>13361,
-34353=>13362,
-34363=>13363,
-34366=>13364,
-34864=>13365,
-34866=>13366,
-34862=>13367,
-34867=>13368,
-35190=>13369,
-35188=>13370,
-35187=>13371,
-35326=>13372,
-35724=>13373,
-35726=>13374,
-35723=>13375,
-35720=>13376,
-35909=>13377,
-36121=>13378,
-36504=>13379,
-36708=>13380,
-36707=>13381,
-37308=>13382,
-37986=>13383,
-37973=>13384,
-37981=>13385,
-37975=>13386,
-37982=>13387,
-38852=>13388,
-38853=>13389,
-38912=>13390,
-39510=>13391,
-39513=>13392,
-39710=>13393,
-39711=>13394,
-39712=>13395,
-40018=>13396,
-40024=>13397,
-40016=>13398,
-40010=>13399,
-40013=>13400,
-40011=>13401,
-40021=>13402,
-40025=>13403,
-40012=>13404,
-40014=>13405,
-40443=>13406,
-40439=>13407,
-40431=>13408,
-40419=>13409,
-40427=>13410,
-40440=>13411,
-40420=>13412,
-40438=>13413,
-40417=>13414,
-40430=>13415,
-40422=>13416,
-40434=>13417,
-40432=>13418,
-60370=>13418,
-40418=>13419,
-40428=>13420,
-40436=>13421,
-40435=>13422,
-40424=>13423,
-40429=>13424,
-40642=>13425,
-40656=>13426,
-40690=>13427,
-40691=>13428,
-40710=>13429,
-40732=>13430,
-40760=>13431,
-40759=>13432,
-40758=>13433,
-40771=>13434,
-40783=>13435,
-40817=>13436,
-40816=>13437,
-40814=>13438,
-40815=>13439,
-22227=>13440,
-22221=>13441,
-23374=>13442,
-23661=>13443,
-25901=>13444,
-26349=>13445,
-26350=>13446,
-27411=>13447,
-28767=>13448,
-28769=>13449,
-28765=>13450,
-28768=>13451,
-29219=>13452,
-29915=>13453,
-29925=>13454,
-30677=>13455,
-31032=>13456,
-31159=>13457,
-31158=>13458,
-31850=>13459,
-32407=>13460,
-32649=>13461,
-33389=>13462,
-34371=>13463,
-34872=>13464,
-34871=>13465,
-34869=>13466,
-34891=>13467,
-35732=>13468,
-35733=>13469,
-36510=>13470,
-36511=>13471,
-36512=>13472,
-36509=>13473,
-37310=>13474,
-37309=>13475,
-37314=>13476,
-37995=>13477,
-37992=>13478,
-37993=>13479,
-38629=>13480,
-38726=>13481,
-38723=>13482,
-38727=>13483,
-38855=>13484,
-38885=>13485,
-39518=>13486,
-39637=>13487,
-39769=>13488,
-40035=>13489,
-40039=>13490,
-40038=>13491,
-40034=>13492,
-40030=>13493,
-40032=>13494,
-40450=>13495,
-40446=>13496,
-40455=>13497,
-40451=>13498,
-40454=>13499,
-40453=>13500,
-40448=>13501,
-40449=>13502,
-40457=>13503,
-40447=>13504,
-40445=>13505,
-40452=>13506,
-40608=>13507,
-40734=>13508,
-40774=>13509,
-40820=>13510,
-40821=>13511,
-40822=>13512,
-22228=>13513,
-25902=>13514,
-26040=>13515,
-27416=>13516,
-27417=>13517,
-27415=>13518,
-27418=>13519,
-28770=>13520,
-29222=>13521,
-29354=>13522,
-30680=>13523,
-30681=>13524,
-31033=>13525,
-31849=>13526,
-31851=>13527,
-31990=>13528,
-32410=>13529,
-32408=>13530,
-32411=>13531,
-32409=>13532,
-33248=>13533,
-33249=>13534,
-34374=>13535,
-34375=>13536,
-34376=>13537,
-35193=>13538,
-35194=>13539,
-35196=>13540,
-35195=>13541,
-35327=>13542,
-35736=>13543,
-35737=>13544,
-36517=>13545,
-36516=>13546,
-36515=>13547,
-37998=>13548,
-37997=>13549,
-37999=>13550,
-38001=>13551,
-38003=>13552,
-38729=>13553,
-39026=>13554,
-39263=>13555,
-40040=>13556,
-40046=>13557,
-40045=>13558,
-40459=>13559,
-40461=>13560,
-40464=>13561,
-40463=>13562,
-40466=>13563,
-40465=>13564,
-40609=>13565,
-40693=>13566,
-40713=>13567,
-40775=>13568,
-40824=>13569,
-40827=>13570,
-40826=>13571,
-40825=>13572,
-22302=>13573,
-28774=>13574,
-31855=>13575,
-34876=>13576,
-36274=>13577,
-36518=>13578,
-37315=>13579,
-38004=>13580,
-38008=>13581,
-38006=>13582,
-38005=>13583,
-39520=>13584,
-39726=>13585,
-60830=>13585,
-40052=>13586,
-40051=>13587,
-40049=>13588,
-40053=>13589,
-40468=>13590,
-40467=>13591,
-40694=>13592,
-40714=>13593,
-40868=>13594,
-28776=>13595,
-28773=>13596,
-31991=>13597,
-34410=>13598,
-34878=>13599,
-34877=>13600,
-34879=>13601,
-35742=>13602,
-35996=>13603,
-36521=>13604,
-36553=>13605,
-38731=>13606,
-39027=>13607,
-39028=>13608,
-39116=>13609,
-39265=>13610,
-39339=>13611,
-39524=>13612,
-39526=>13613,
-39527=>13614,
-39716=>13615,
-40469=>13616,
-40471=>13617,
-40776=>13618,
-25095=>13619,
-27422=>13620,
-29223=>13621,
-34380=>13622,
-36520=>13623,
-38018=>13624,
-38016=>13625,
-38017=>13626,
-39529=>13627,
-39528=>13628,
-40473=>13629,
-34379=>13630,
-35743=>13631,
-38019=>13632,
-40057=>13633,
-40631=>13634,
-30325=>13635,
-39531=>13636,
-40058=>13637,
-40477=>13638,
-28777=>13639,
-28778=>13640,
-29225=>13641,
-40612=>13642,
-40830=>13643,
-40777=>13644,
-40856=>13645,
-65049=>13646,
-65075=>13743,
-9588=>13744,
-65076=>13745,
-65103=>13746,
-168=>13747,
-776=>13747,
-63208=>13747,
-710=>13748,
-65342=>13748,
-63209=>13748,
-12541=>13749,
-63210=>13749,
-12542=>13750,
-63211=>13750,
-12445=>13751,
-63212=>13751,
-12446=>13752,
-63213=>13752,
-12293=>13754,
-63216=>13754,
-12294=>13755,
-63217=>13755,
-12295=>13756,
-63218=>13756,
-12540=>13757,
-63219=>13757,
-65339=>13758,
-63220=>13758,
-65341=>13759,
-63221=>13759,
-10045=>13760,
-63222=>13760,
-12353=>13761,
-63223=>13761,
-12354=>13762,
-63224=>13762,
-12355=>13763,
-63225=>13763,
-12356=>13764,
-63226=>13764,
-12357=>13765,
-63227=>13765,
-12358=>13766,
-63228=>13766,
-12359=>13767,
-63229=>13767,
-12360=>13768,
-63230=>13768,
-12361=>13769,
-63231=>13769,
-12362=>13770,
-63232=>13770,
-12363=>13771,
-63233=>13771,
-12364=>13772,
-63234=>13772,
-12365=>13773,
-63235=>13773,
-12366=>13774,
-63236=>13774,
-12367=>13775,
-63237=>13775,
-12368=>13776,
-63238=>13776,
-12369=>13777,
-63239=>13777,
-12370=>13778,
-63240=>13778,
-12371=>13779,
-63241=>13779,
-12372=>13780,
-63242=>13780,
-12373=>13781,
-63243=>13781,
-12374=>13782,
-63244=>13782,
-12375=>13783,
-63245=>13783,
-12376=>13784,
-63246=>13784,
-12377=>13785,
-63247=>13785,
-12378=>13786,
-63248=>13786,
-12379=>13787,
-63249=>13787,
-12380=>13788,
-63250=>13788,
-12381=>13789,
-63251=>13789,
-12382=>13790,
-63252=>13790,
-12383=>13791,
-63253=>13791,
-12384=>13792,
-63254=>13792,
-12385=>13793,
-63255=>13793,
-12386=>13794,
-63256=>13794,
-12387=>13795,
-63257=>13795,
-12388=>13796,
-63258=>13796,
-12389=>13797,
-63259=>13797,
-12390=>13798,
-63260=>13798,
-12391=>13799,
-63261=>13799,
-12392=>13800,
-63262=>13800,
-12393=>13801,
-63263=>13801,
-12394=>13802,
-63264=>13802,
-12395=>13803,
-63265=>13803,
-12396=>13804,
-63266=>13804,
-12397=>13805,
-63267=>13805,
-12398=>13806,
-63268=>13806,
-12399=>13807,
-63269=>13807,
-12400=>13808,
-63270=>13808,
-12401=>13809,
-63271=>13809,
-12402=>13810,
-63272=>13810,
-12403=>13811,
-63273=>13811,
-12404=>13812,
-63274=>13812,
-12405=>13813,
-63275=>13813,
-12406=>13814,
-63276=>13814,
-12407=>13815,
-63277=>13815,
-12408=>13816,
-63278=>13816,
-12409=>13817,
-63279=>13817,
-12410=>13818,
-63280=>13818,
-12411=>13819,
-63281=>13819,
-12412=>13820,
-63282=>13820,
-12413=>13821,
-63283=>13821,
-12414=>13822,
-63284=>13822,
-12415=>13823,
-63285=>13823,
-12416=>13824,
-63286=>13824,
-12417=>13825,
-63287=>13825,
-12418=>13826,
-63288=>13826,
-12419=>13827,
-63289=>13827,
-12420=>13828,
-63290=>13828,
-12421=>13829,
-63291=>13829,
-12422=>13830,
-63292=>13830,
-12423=>13831,
-63293=>13831,
-12424=>13832,
-63294=>13832,
-12425=>13833,
-63295=>13833,
-12426=>13834,
-63296=>13834,
-12427=>13835,
-63297=>13835,
-12428=>13836,
-63298=>13836,
-12429=>13837,
-63299=>13837,
-12430=>13838,
-63300=>13838,
-12431=>13839,
-63301=>13839,
-12432=>13840,
-63302=>13840,
-12433=>13841,
-63303=>13841,
-12434=>13842,
-63304=>13842,
-12435=>13843,
-63305=>13843,
-12449=>13844,
-63306=>13844,
-12450=>13845,
-63307=>13845,
-12451=>13846,
-63308=>13846,
-12452=>13847,
-63309=>13847,
-12453=>13848,
-63310=>13848,
-12454=>13849,
-63311=>13849,
-12455=>13850,
-63312=>13850,
-12456=>13851,
-63313=>13851,
-12457=>13852,
-63314=>13852,
-12458=>13853,
-63315=>13853,
-12459=>13854,
-63316=>13854,
-12460=>13855,
-63317=>13855,
-12461=>13856,
-63318=>13856,
-12462=>13857,
-63319=>13857,
-12463=>13858,
-63320=>13858,
-12464=>13859,
-63321=>13859,
-12465=>13860,
-63322=>13860,
-12466=>13861,
-63323=>13861,
-12467=>13862,
-63324=>13862,
-12468=>13863,
-63325=>13863,
-12469=>13864,
-63326=>13864,
-12470=>13865,
-63327=>13865,
-12471=>13866,
-63328=>13866,
-12472=>13867,
-63329=>13867,
-12473=>13868,
-63330=>13868,
-12474=>13869,
-63331=>13869,
-12475=>13870,
-63332=>13870,
-12476=>13871,
-63333=>13871,
-12477=>13872,
-63334=>13872,
-12478=>13873,
-63335=>13873,
-12479=>13874,
-63336=>13874,
-12480=>13875,
-63337=>13875,
-12481=>13876,
-63338=>13876,
-12482=>13877,
-63339=>13877,
-12483=>13878,
-63340=>13878,
-12484=>13879,
-63341=>13879,
-12485=>13880,
-63342=>13880,
-12486=>13881,
-63343=>13881,
-12487=>13882,
-63344=>13882,
-12488=>13883,
-63345=>13883,
-12489=>13884,
-63346=>13884,
-12490=>13885,
-63347=>13885,
-12491=>13886,
-63348=>13886,
-12492=>13887,
-63349=>13887,
-12493=>13888,
-63350=>13888,
-12494=>13889,
-63351=>13889,
-12495=>13890,
-63352=>13890,
-12496=>13891,
-63353=>13891,
-12497=>13892,
-63354=>13892,
-12498=>13893,
-63355=>13893,
-12499=>13894,
-63356=>13894,
-12500=>13895,
-63357=>13895,
-12501=>13896,
-63358=>13896,
-12502=>13897,
-63359=>13897,
-12503=>13898,
-63360=>13898,
-12504=>13899,
-63361=>13899,
-12505=>13900,
-63362=>13900,
-12506=>13901,
-63363=>13901,
-12507=>13902,
-63364=>13902,
-12508=>13903,
-63365=>13903,
-12509=>13904,
-63366=>13904,
-12510=>13905,
-63367=>13905,
-12511=>13906,
-63368=>13906,
-12512=>13907,
-63369=>13907,
-12513=>13908,
-63370=>13908,
-12514=>13909,
-63371=>13909,
-12515=>13910,
-63372=>13910,
-12516=>13911,
-63373=>13911,
-12517=>13912,
-63374=>13912,
-12518=>13913,
-63375=>13913,
-12519=>13914,
-63376=>13914,
-12520=>13915,
-63377=>13915,
-12521=>13916,
-63378=>13916,
-12522=>13917,
-63379=>13917,
-12523=>13918,
-63380=>13918,
-12524=>13919,
-63381=>13919,
-12525=>13920,
-63382=>13920,
-12526=>13921,
-63383=>13921,
-12527=>13922,
-63384=>13922,
-12528=>13923,
-63385=>13923,
-12529=>13924,
-63386=>13924,
-12530=>13925,
-63387=>13925,
-12531=>13926,
-63388=>13926,
-12532=>13927,
-63389=>13927,
-12533=>13928,
-63390=>13928,
-12534=>13929,
-63391=>13929,
-1040=>13930,
-63392=>13930,
-1041=>13931,
-63393=>13931,
-1042=>13932,
-63394=>13932,
-1043=>13933,
-63395=>13933,
-1044=>13934,
-63396=>13934,
-1045=>13935,
-63397=>13935,
-1025=>13936,
-63398=>13936,
-1046=>13937,
-63399=>13937,
-1047=>13938,
-63400=>13938,
-1048=>13939,
-63401=>13939,
-1049=>13940,
-63402=>13940,
-1050=>13941,
-63403=>13941,
-1051=>13942,
-63404=>13942,
-1052=>13943,
-63405=>13943,
-1053=>13944,
-63406=>13944,
-1054=>13945,
-63407=>13945,
-1055=>13946,
-63408=>13946,
-1056=>13947,
-63409=>13947,
-1057=>13948,
-63410=>13948,
-1058=>13949,
-63411=>13949,
-1059=>13950,
-63412=>13950,
-1060=>13951,
-63413=>13951,
-1061=>13952,
-63414=>13952,
-1062=>13953,
-63415=>13953,
-1063=>13954,
-63416=>13954,
-1064=>13955,
-63417=>13955,
-1065=>13956,
-63418=>13956,
-1066=>13957,
-63419=>13957,
-1067=>13958,
-63420=>13958,
-1068=>13959,
-63421=>13959,
-1069=>13960,
-63422=>13960,
-1070=>13961,
-63423=>13961,
-1071=>13962,
-63424=>13962,
-1072=>13963,
-63425=>13963,
-1073=>13964,
-63426=>13964,
-1074=>13965,
-63427=>13965,
-1075=>13966,
-63428=>13966,
-1076=>13967,
-63429=>13967,
-1077=>13968,
-63430=>13968,
-1105=>13969,
-63431=>13969,
-1078=>13970,
-63432=>13970,
-1079=>13971,
-63433=>13971,
-1080=>13972,
-63434=>13972,
-1081=>13973,
-63435=>13973,
-1082=>13974,
-63436=>13974,
-1083=>13975,
-63437=>13975,
-1084=>13976,
-63438=>13976,
-1085=>13977,
-63439=>13977,
-1086=>13978,
-63440=>13978,
-1087=>13979,
-63441=>13979,
-1088=>13980,
-63442=>13980,
-1089=>13981,
-63443=>13981,
-1090=>13982,
-63444=>13982,
-1091=>13983,
-63445=>13983,
-1092=>13984,
-63446=>13984,
-1093=>13985,
-63447=>13985,
-1094=>13986,
-63448=>13986,
-1095=>13987,
-63449=>13987,
-1096=>13988,
-63450=>13988,
-1097=>13989,
-63451=>13989,
-1098=>13990,
-63452=>13990,
-1099=>13991,
-63453=>13991,
-1100=>13992,
-63454=>13992,
-1101=>13993,
-63455=>13993,
-1102=>13994,
-63456=>13994,
-1103=>13995,
-63457=>13995,
-8679=>13996,
-63458=>13996,
-8632=>13997,
-63459=>13997,
-8633=>13998,
-63460=>13998,
-12751=>13999,
-20033=>13999,
-63461=>13999,
-131276=>14000,
-63462=>14000,
-20058=>14001,
-63463=>14001,
-131210=>14002,
-63464=>14002,
-20994=>14003,
-63465=>14003,
-17553=>14004,
-63466=>14004,
-40880=>14005,
-63467=>14005,
-20872=>14006,
-63468=>14006,
-13853=>14007,
-40881=>14007,
-63469=>14007,
-161287=>14008,
-63470=>14008,
-172=>14049,
-65506=>14049,
-63511=>14049,
-65508=>14050,
-63512=>14050,
-65287=>14051,
-63513=>14051,
-65282=>14052,
-63514=>14052,
-12849=>14053,
-63515=>14053,
-8470=>14054,
-63516=>14054,
-8481=>14055,
-63517=>14055,
-30849=>14056,
-37561=>14057,
-58501=>14057,
-35023=>14058,
-22715=>14059,
-24658=>14060,
-31911=>14061,
-23290=>14062,
-9556=>14063,
-9574=>14064,
-9559=>14065,
-9568=>14066,
-9580=>14067,
-9571=>14068,
-9562=>14069,
-9577=>14070,
-9565=>14071,
-9554=>14072,
-9572=>14073,
-9557=>14074,
-9560=>14078,
-9575=>14079,
-9563=>14080,
-9555=>14081,
-9573=>14082,
-9558=>14083,
-9567=>14084,
-9579=>14085,
-9570=>14086,
-9561=>14087,
-9576=>14088,
-9564=>14089,
-9553=>14090,
-9619=>14096,
-65517=>14096,
-65040=>14099,
-65041=>14100,
-65042=>14101,
-65044=>14103,
-65043=>14104,
-65046=>14105,
-65045=>14106,
-147159=>14123,
-58129=>14123,
-22462=>14124,
-58130=>14124,
-159443=>14125,
-58131=>14125,
-28990=>14126,
-58132=>14126,
-153568=>14127,
-58133=>14127,
-27042=>14128,
-58135=>14128,
-166889=>14129,
-58136=>14129,
-23412=>14130,
-58137=>14130,
-31305=>14131,
-58138=>14131,
-153825=>14132,
-58139=>14132,
-169177=>14133,
-58140=>14133,
-31333=>14134,
-58141=>14134,
-31357=>14135,
-58142=>14135,
-154028=>14136,
-58143=>14136,
-31419=>14137,
-58144=>14137,
-31408=>14138,
-58145=>14138,
-31426=>14139,
-58146=>14139,
-31427=>14140,
-58147=>14140,
-29137=>14141,
-58148=>14141,
-156813=>14142,
-58149=>14142,
-16842=>14143,
-58150=>14143,
-31450=>14144,
-58151=>14144,
-31453=>14145,
-58152=>14145,
-31466=>14146,
-58153=>14146,
-16879=>14147,
-58154=>14147,
-21682=>14148,
-58155=>14148,
-154625=>14149,
-58156=>14149,
-31499=>14150,
-58157=>14150,
-31573=>14151,
-58158=>14151,
-31529=>14152,
-58159=>14152,
-152334=>14153,
-58160=>14153,
-154878=>14154,
-58161=>14154,
-31650=>14155,
-58162=>14155,
-31599=>14156,
-58163=>14156,
-33692=>14157,
-58164=>14157,
-154548=>14158,
-58165=>14158,
-158847=>14159,
-58166=>14159,
-31696=>14160,
-58167=>14160,
-33825=>14161,
-58168=>14161,
-31634=>14162,
-58169=>14162,
-58171=>14164,
-154912=>14164,
-33938=>14166,
-58174=>14166,
-31738=>14167,
-58175=>14167,
-31797=>14169,
-58177=>14169,
-154817=>14170,
-58178=>14170,
-31812=>14171,
-58179=>14171,
-31875=>14172,
-58180=>14172,
-149634=>14173,
-58181=>14173,
-31910=>14174,
-58182=>14174,
-148856=>14175,
-58184=>14175,
-31945=>14176,
-58185=>14176,
-31943=>14177,
-58186=>14177,
-31974=>14178,
-58187=>14178,
-31987=>14180,
-58189=>14180,
-31989=>14181,
-58190=>14181,
-32359=>14182,
-58192=>14182,
-17693=>14183,
-58193=>14183,
-159300=>14184,
-58194=>14184,
-32093=>14185,
-58195=>14185,
-159446=>14186,
-58196=>14186,
-32137=>14187,
-58198=>14187,
-32171=>14188,
-58199=>14188,
-28981=>14189,
-58200=>14189,
-32179=>14190,
-58201=>14190,
-32214=>14191,
-147543=>14192,
-58203=>14192,
-155689=>14193,
-58204=>14193,
-32228=>14194,
-58205=>14194,
-15635=>14195,
-58206=>14195,
-32245=>14196,
-58207=>14196,
-137209=>14197,
-58208=>14197,
-32229=>14198,
-58209=>14198,
-164717=>14199,
-58210=>14199,
-155937=>14201,
-58212=>14201,
-155994=>14202,
-58213=>14202,
-32366=>14203,
-58214=>14203,
-17195=>14205,
-58216=>14205,
-37996=>14206,
-58217=>14206,
-32295=>14207,
-58218=>14207,
-32576=>14208,
-58219=>14208,
-32577=>14209,
-58220=>14209,
-32583=>14210,
-58221=>14210,
-31030=>14211,
-58222=>14211,
-156368=>14212,
-58223=>14212,
-39393=>14213,
-58224=>14213,
-32663=>14214,
-58225=>14214,
-156497=>14215,
-58226=>14215,
-32675=>14216,
-58227=>14216,
-136801=>14217,
-58228=>14217,
-131176=>14218,
-58229=>14218,
-17756=>14219,
-58230=>14219,
-145254=>14220,
-58231=>14220,
-164666=>14221,
-58233=>14221,
-32762=>14222,
-58234=>14222,
-156809=>14223,
-58235=>14223,
-64091=>14224,
-32776=>14225,
-58237=>14225,
-32797=>14226,
-58238=>14226,
-32815=>14228,
-58240=>14228,
-172167=>14229,
-58241=>14229,
-158915=>14230,
-58242=>14230,
-32827=>14231,
-58243=>14231,
-32828=>14232,
-58244=>14232,
-32865=>14233,
-58245=>14233,
-141076=>14234,
-58246=>14234,
-18825=>14235,
-58247=>14235,
-157222=>14236,
-58248=>14236,
-146915=>14237,
-58249=>14237,
-157416=>14238,
-58250=>14238,
-26405=>14239,
-58251=>14239,
-32935=>14240,
-58252=>14240,
-166472=>14241,
-58253=>14241,
-33031=>14242,
-58254=>14242,
-33050=>14243,
-58255=>14243,
-22704=>14244,
-58256=>14244,
-141046=>14245,
-58257=>14245,
-27775=>14246,
-58258=>14246,
-156824=>14247,
-58259=>14247,
-25831=>14248,
-58261=>14248,
-136330=>14249,
-58262=>14249,
-33304=>14250,
-58263=>14250,
-137310=>14251,
-58264=>14251,
-27219=>14252,
-58265=>14252,
-150117=>14253,
-58266=>14253,
-150165=>14254,
-58267=>14254,
-17530=>14255,
-58268=>14255,
-33321=>14256,
-58269=>14256,
-158290=>14257,
-58271=>14257,
-146814=>14258,
-58272=>14258,
-20473=>14259,
-58273=>14259,
-136445=>14260,
-58274=>14260,
-34018=>14261,
-58275=>14261,
-33634=>14262,
-58276=>14262,
-194959=>14263,
-149927=>14264,
-58278=>14264,
-144688=>14265,
-58279=>14265,
-137075=>14266,
-58280=>14266,
-146936=>14267,
-58281=>14267,
-33450=>14268,
-58282=>14268,
-26907=>14269,
-58283=>14269,
-194964=>14270,
-58284=>14270,
-16859=>14271,
-58285=>14271,
-34123=>14272,
-58286=>14272,
-33488=>14273,
-58287=>14273,
-33562=>14274,
-58288=>14274,
-134678=>14275,
-58289=>14275,
-137140=>14276,
-58290=>14276,
-14017=>14277,
-58291=>14277,
-143741=>14278,
-58292=>14278,
-144730=>14279,
-58293=>14279,
-33403=>14280,
-58294=>14280,
-33506=>14281,
-58295=>14281,
-33560=>14282,
-58296=>14282,
-147083=>14283,
-58297=>14283,
-159139=>14284,
-58298=>14284,
-158469=>14285,
-58299=>14285,
-158615=>14286,
-58300=>14286,
-144846=>14287,
-58301=>14287,
-15807=>14288,
-58302=>14288,
-33565=>14289,
-58303=>14289,
-21996=>14290,
-58304=>14290,
-33669=>14291,
-58305=>14291,
-17675=>14292,
-58306=>14292,
-159141=>14293,
-58307=>14293,
-33708=>14294,
-58308=>14294,
-33747=>14296,
-58310=>14296,
-159444=>14297,
-58312=>14297,
-27223=>14298,
-58313=>14298,
-34138=>14299,
-58314=>14299,
-13462=>14300,
-58315=>14300,
-159298=>14301,
-58316=>14301,
-33880=>14302,
-58318=>14302,
-154596=>14303,
-58319=>14303,
-33905=>14304,
-58320=>14304,
-15827=>14305,
-58321=>14305,
-17636=>14306,
-58322=>14306,
-27303=>14307,
-58323=>14307,
-33866=>14308,
-58324=>14308,
-31064=>14309,
-58326=>14309,
-158614=>14311,
-58328=>14311,
-159351=>14312,
-58329=>14312,
-159299=>14313,
-58330=>14313,
-34014=>14314,
-58331=>14314,
-33681=>14316,
-58333=>14316,
-17568=>14317,
-58334=>14317,
-33939=>14318,
-58335=>14318,
-34020=>14319,
-58336=>14319,
-154769=>14320,
-58337=>14320,
-16960=>14321,
-58338=>14321,
-154816=>14322,
-58339=>14322,
-17731=>14323,
-58340=>14323,
-34100=>14324,
-58341=>14324,
-23282=>14325,
-58342=>14325,
-17699=>14326,
-17703=>14327,
-58344=>14327,
-34163=>14328,
-58345=>14328,
-17686=>14329,
-58346=>14329,
-26559=>14330,
-58347=>14330,
-34326=>14331,
-58348=>14331,
-165413=>14332,
-58349=>14332,
-165435=>14333,
-58350=>14333,
-34241=>14334,
-58351=>14334,
-159880=>14335,
-58352=>14335,
-34306=>14336,
-58353=>14336,
-136578=>14337,
-58354=>14337,
-159949=>14338,
-58355=>14338,
-194994=>14339,
-58356=>14339,
-17770=>14340,
-58357=>14340,
-34344=>14341,
-58358=>14341,
-13896=>14342,
-58359=>14342,
-137378=>14343,
-58360=>14343,
-21495=>14344,
-58361=>14344,
-160666=>14345,
-58362=>14345,
-34430=>14346,
-58363=>14346,
-172280=>14348,
-58365=>14348,
-34798=>14349,
-58366=>14349,
-142375=>14350,
-58367=>14350,
-34737=>14351,
-58368=>14351,
-34778=>14352,
-58369=>14352,
-34831=>14353,
-60990=>14353,
-58370=>14353,
-22113=>14354,
-58371=>14354,
-34412=>14355,
-58372=>14355,
-26710=>14356,
-58373=>14356,
-17935=>14357,
-58374=>14357,
-34885=>14358,
-58375=>14358,
-34886=>14359,
-58376=>14359,
-161248=>14360,
-58377=>14360,
-146873=>14361,
-58378=>14361,
-161252=>14362,
-58379=>14362,
-34910=>14363,
-58380=>14363,
-34972=>14364,
-58381=>14364,
-18011=>14365,
-58382=>14365,
-34996=>14366,
-58383=>14366,
-34997=>14367,
-58384=>14367,
-35013=>14368,
-58386=>14368,
-161551=>14369,
-58388=>14369,
-35207=>14370,
-58389=>14370,
-35239=>14374,
-58393=>14374,
-35260=>14375,
-58394=>14375,
-166437=>14376,
-58395=>14376,
-35303=>14377,
-58396=>14377,
-162084=>14378,
-58397=>14378,
-162493=>14379,
-58398=>14379,
-35484=>14380,
-58399=>14380,
-30611=>14381,
-58400=>14381,
-37374=>14382,
-58401=>14382,
-35472=>14383,
-58402=>14383,
-162393=>14384,
-58403=>14384,
-31465=>14385,
-58404=>14385,
-162618=>14386,
-58405=>14386,
-18195=>14387,
-58407=>14387,
-162616=>14388,
-58408=>14388,
-29052=>14389,
-58409=>14389,
-35596=>14390,
-58410=>14390,
-35615=>14391,
-58411=>14391,
-152624=>14392,
-58412=>14392,
-152933=>14393,
-58413=>14393,
-35647=>14394,
-58414=>14394,
-35661=>14396,
-58416=>14396,
-35497=>14397,
-58417=>14397,
-150138=>14398,
-58418=>14398,
-35728=>14399,
-58419=>14399,
-35739=>14400,
-58420=>14400,
-35503=>14401,
-58421=>14401,
-136927=>14402,
-58422=>14402,
-17941=>14403,
-58423=>14403,
-34895=>14404,
-58424=>14404,
-35995=>14405,
-58425=>14405,
-163156=>14406,
-58426=>14406,
-163215=>14407,
-58427=>14407,
-195028=>14408,
-58428=>14408,
-14117=>14409,
-58429=>14409,
-163155=>14410,
-58430=>14410,
-36054=>14411,
-58431=>14411,
-163224=>14412,
-58432=>14412,
-163261=>14413,
-58433=>14413,
-36114=>14414,
-58434=>14414,
-36099=>14415,
-58435=>14415,
-137488=>14416,
-58436=>14416,
-36059=>14417,
-58437=>14417,
-28764=>14418,
-58438=>14418,
-36113=>14419,
-58439=>14419,
-16080=>14420,
-58441=>14420,
-195031=>14421,
-36265=>14422,
-58443=>14422,
-163842=>14423,
-58444=>14423,
-135188=>14424,
-58445=>14424,
-149898=>14425,
-58446=>14425,
-15228=>14426,
-58447=>14426,
-164284=>14427,
-58448=>14427,
-160012=>14428,
-58449=>14428,
-31463=>14429,
-58450=>14429,
-36525=>14430,
-58451=>14430,
-36534=>14431,
-58452=>14431,
-36547=>14432,
-58453=>14432,
-37588=>14433,
-58454=>14433,
-36633=>14434,
-58455=>14434,
-36653=>14435,
-58456=>14435,
-164709=>14436,
-58457=>14436,
-164882=>14437,
-58458=>14437,
-36773=>14438,
-58459=>14438,
-37635=>14439,
-58460=>14439,
-172703=>14440,
-58461=>14440,
-133712=>14441,
-58462=>14441,
-36787=>14442,
-58463=>14442,
-166366=>14444,
-58465=>14444,
-165181=>14445,
-58466=>14445,
-146875=>14446,
-58467=>14446,
-24312=>14447,
-58468=>14447,
-143970=>14448,
-58469=>14448,
-36857=>14449,
-58470=>14449,
-140069=>14451,
-58474=>14451,
-14720=>14452,
-58475=>14452,
-159447=>14453,
-58476=>14453,
-36919=>14454,
-58477=>14454,
-165180=>14455,
-58478=>14455,
-162494=>14456,
-58479=>14456,
-36961=>14457,
-58480=>14457,
-165228=>14458,
-58481=>14458,
-165387=>14459,
-58482=>14459,
-37032=>14460,
-58483=>14460,
-165651=>14461,
-58484=>14461,
-37060=>14462,
-58485=>14462,
-165606=>14463,
-58486=>14463,
-37038=>14464,
-58487=>14464,
-64038=>14465,
-37223=>14466,
-58489=>14466,
-37289=>14467,
-58491=>14467,
-37316=>14468,
-58492=>14468,
-31916=>14469,
-58493=>14469,
-166195=>14470,
-58494=>14470,
-138889=>14471,
-58495=>14471,
-37390=>14472,
-58496=>14472,
-27807=>14473,
-58497=>14473,
-37441=>14474,
-58498=>14474,
-37474=>14475,
-58499=>14475,
-153017=>14476,
-58500=>14476,
-166598=>14477,
-58502=>14477,
-146587=>14478,
-58503=>14478,
-166668=>14479,
-58504=>14479,
-153051=>14480,
-58505=>14480,
-134449=>14481,
-58506=>14481,
-37676=>14482,
-58507=>14482,
-37739=>14483,
-58508=>14483,
-166625=>14484,
-58509=>14484,
-166891=>14485,
-58510=>14485,
-23235=>14486,
-58512=>14486,
-166626=>14487,
-58513=>14487,
-166629=>14488,
-58514=>14488,
-18789=>14489,
-58515=>14489,
-37444=>14490,
-58516=>14490,
-166892=>14491,
-58517=>14491,
-166969=>14492,
-58518=>14492,
-166911=>14493,
-58519=>14493,
-37747=>14494,
-58520=>14494,
-37979=>14495,
-58521=>14495,
-36540=>14496,
-58522=>14496,
-38277=>14497,
-58523=>14497,
-38310=>14498,
-58524=>14498,
-37926=>14499,
-58525=>14499,
-38304=>14500,
-58526=>14500,
-28662=>14501,
-58527=>14501,
-17081=>14502,
-58528=>14502,
-165592=>14503,
-58530=>14503,
-135804=>14504,
-58531=>14504,
-146990=>14505,
-58532=>14505,
-18911=>14506,
-58533=>14506,
-27676=>14507,
-58534=>14507,
-38523=>14508,
-58535=>14508,
-38550=>14509,
-58536=>14509,
-16748=>14510,
-58537=>14510,
-38563=>14511,
-58538=>14511,
-159445=>14512,
-58539=>14512,
-25050=>14513,
-58540=>14513,
-58541=>14514,
-30965=>14515,
-58542=>14515,
-166624=>14516,
-58543=>14516,
-38589=>14517,
-58544=>14517,
-21452=>14518,
-58545=>14518,
-18849=>14519,
-58546=>14519,
-158904=>14520,
-58547=>14520,
-131700=>14521,
-58548=>14521,
-156688=>14522,
-58549=>14522,
-168111=>14523,
-58550=>14523,
-168165=>14524,
-58551=>14524,
-150225=>14525,
-58552=>14525,
-137493=>14526,
-58553=>14526,
-144138=>14527,
-58554=>14527,
-38705=>14528,
-58555=>14528,
-34370=>14529,
-58556=>14529,
-38710=>14530,
-58557=>14530,
-18959=>14531,
-58558=>14531,
-17725=>14532,
-58559=>14532,
-17797=>14533,
-58560=>14533,
-150249=>14534,
-58561=>14534,
-28789=>14535,
-58562=>14535,
-23361=>14536,
-58563=>14536,
-38683=>14537,
-58564=>14537,
-168405=>14539,
-58566=>14539,
-38743=>14540,
-58567=>14540,
-23370=>14541,
-58568=>14541,
-168427=>14542,
-58569=>14542,
-38751=>14543,
-58570=>14543,
-37925=>14544,
-58571=>14544,
-20688=>14545,
-58572=>14545,
-143543=>14546,
-58573=>14546,
-143548=>14547,
-58574=>14547,
-38793=>14548,
-58575=>14548,
-38815=>14549,
-58576=>14549,
-38833=>14550,
-58577=>14550,
-38846=>14551,
-58578=>14551,
-38848=>14552,
-58579=>14552,
-38866=>14553,
-58580=>14553,
-38880=>14554,
-58581=>14554,
-152684=>14555,
-58582=>14555,
-38894=>14556,
-58583=>14556,
-29724=>14557,
-58584=>14557,
-169011=>14558,
-58585=>14558,
-38901=>14560,
-58587=>14560,
-168989=>14561,
-58588=>14561,
-162170=>14562,
-58589=>14562,
-19153=>14563,
-58590=>14563,
-38964=>14564,
-58591=>14564,
-38963=>14565,
-58592=>14565,
-38987=>14566,
-58593=>14566,
-39014=>14567,
-58594=>14567,
-15118=>14568,
-58595=>14568,
-160117=>14569,
-58596=>14569,
-15697=>14570,
-58597=>14570,
-132656=>14571,
-58598=>14571,
-147804=>14572,
-58599=>14572,
-153350=>14573,
-58600=>14573,
-39114=>14574,
-58601=>14574,
-39095=>14575,
-58602=>14575,
-39112=>14576,
-58603=>14576,
-39111=>14577,
-58604=>14577,
-19199=>14578,
-58605=>14578,
-159015=>14579,
-58606=>14579,
-136915=>14580,
-58607=>14580,
-21936=>14581,
-58608=>14581,
-39137=>14582,
-58609=>14582,
-39142=>14583,
-58610=>14583,
-39148=>14584,
-58611=>14584,
-37752=>14585,
-58612=>14585,
-39225=>14586,
-58613=>14586,
-150057=>14587,
-58614=>14587,
-19314=>14588,
-58615=>14588,
-170071=>14589,
-58616=>14589,
-170245=>14590,
-58617=>14590,
-39413=>14591,
-58618=>14591,
-39436=>14592,
-58619=>14592,
-39483=>14593,
-58620=>14593,
-39440=>14594,
-58621=>14594,
-39512=>14595,
-58622=>14595,
-153381=>14596,
-58623=>14596,
-14020=>14597,
-58624=>14597,
-168113=>14598,
-58625=>14598,
-170965=>14599,
-58626=>14599,
-39648=>14600,
-58627=>14600,
-39650=>14601,
-58628=>14601,
-170757=>14602,
-58629=>14602,
-39668=>14603,
-58630=>14603,
-19470=>14604,
-58631=>14604,
-39700=>14605,
-58632=>14605,
-39725=>14606,
-58633=>14606,
-165376=>14607,
-58634=>14607,
-20532=>14608,
-58635=>14608,
-39732=>14609,
-58636=>14609,
-14531=>14610,
-58638=>14610,
-143485=>14611,
-58639=>14611,
-39760=>14612,
-58640=>14612,
-39744=>14613,
-58641=>14613,
-171326=>14614,
-58642=>14614,
-23109=>14615,
-58643=>14615,
-137315=>14616,
-58644=>14616,
-39822=>14617,
-58645=>14617,
-39938=>14618,
-58647=>14618,
-39935=>14619,
-58648=>14619,
-39948=>14620,
-58649=>14620,
-171624=>14621,
-58650=>14621,
-40404=>14622,
-58651=>14622,
-171959=>14623,
-58652=>14623,
-172434=>14624,
-58653=>14624,
-172459=>14625,
-58654=>14625,
-172257=>14626,
-58655=>14626,
-172323=>14627,
-58656=>14627,
-172511=>14628,
-58657=>14628,
-40318=>14629,
-58658=>14629,
-40323=>14630,
-58659=>14630,
-172340=>14631,
-58660=>14631,
-40462=>14632,
-58661=>14632,
-40388=>14633,
-58663=>14633,
-172435=>14634,
-58665=>14634,
-172576=>14635,
-58666=>14635,
-137531=>14636,
-58667=>14636,
-172595=>14637,
-58668=>14637,
-40249=>14638,
-58669=>14638,
-172217=>14639,
-58670=>14639,
-172724=>14640,
-58671=>14640,
-40592=>14641,
-58672=>14641,
-40597=>14642,
-58673=>14642,
-40606=>14643,
-58674=>14643,
-40610=>14644,
-58675=>14644,
-19764=>14645,
-58676=>14645,
-40618=>14646,
-58677=>14646,
-40623=>14647,
-58678=>14647,
-148324=>14648,
-58679=>14648,
-40641=>14649,
-58680=>14649,
-15200=>14650,
-58681=>14650,
-14821=>14651,
-58682=>14651,
-15645=>14652,
-58683=>14652,
-20274=>14653,
-58684=>14653,
-14270=>14654,
-58685=>14654,
-166955=>14655,
-58686=>14655,
-40706=>14656,
-58687=>14656,
-40712=>14657,
-58688=>14657,
-19350=>14658,
-58689=>14658,
-37924=>14659,
-58690=>14659,
-159138=>14660,
-58691=>14660,
-40727=>14661,
-60836=>14661,
-58692=>14661,
-195099=>14662,
-40761=>14663,
-58694=>14663,
-22175=>14664,
-58695=>14664,
-22154=>14665,
-58696=>14665,
-40773=>14666,
-58697=>14666,
-39352=>14667,
-58698=>14667,
-168075=>14668,
-58699=>14668,
-38898=>14669,
-58700=>14669,
-33919=>14670,
-58701=>14670,
-40809=>14672,
-58703=>14672,
-31452=>14673,
-58704=>14673,
-40846=>14674,
-58705=>14674,
-29206=>14675,
-58706=>14675,
-19390=>14676,
-58707=>14676,
-149877=>14677,
-58708=>14677,
-149947=>14678,
-58709=>14678,
-29047=>14679,
-58710=>14679,
-150008=>14680,
-58711=>14680,
-148296=>14681,
-58712=>14681,
-150097=>14682,
-58713=>14682,
-29598=>14683,
-58714=>14683,
-166874=>14684,
-58715=>14684,
-137466=>14685,
-58716=>14685,
-31135=>14686,
-58717=>14686,
-166270=>14687,
-58718=>14687,
-167478=>14688,
-58719=>14688,
-37737=>14689,
-58720=>14689,
-37875=>14690,
-58721=>14690,
-166468=>14691,
-58722=>14691,
-37612=>14692,
-58723=>14692,
-37761=>14693,
-58724=>14693,
-37835=>14694,
-58725=>14694,
-166252=>14695,
-58726=>14695,
-148665=>14696,
-58727=>14696,
-29207=>14697,
-58728=>14697,
-16107=>14698,
-58729=>14698,
-30578=>14699,
-58730=>14699,
-31299=>14700,
-58731=>14700,
-28880=>14701,
-58732=>14701,
-148595=>14702,
-58733=>14702,
-148472=>14703,
-58734=>14703,
-29054=>14704,
-58735=>14704,
-137199=>14705,
-58736=>14705,
-28835=>14706,
-58737=>14706,
-137406=>14707,
-58738=>14707,
-144793=>14708,
-58739=>14708,
-16071=>14709,
-58740=>14709,
-137349=>14710,
-58741=>14710,
-152623=>14711,
-58742=>14711,
-137208=>14712,
-58743=>14712,
-14114=>14713,
-58744=>14713,
-136955=>14714,
-58745=>14714,
-137273=>14715,
-58746=>14715,
-14049=>14716,
-58747=>14716,
-137076=>14717,
-58748=>14717,
-137425=>14718,
-58749=>14718,
-155467=>14719,
-58750=>14719,
-14115=>14720,
-58751=>14720,
-136896=>14721,
-58752=>14721,
-22363=>14722,
-58753=>14722,
-150053=>14723,
-58754=>14723,
-136190=>14724,
-58755=>14724,
-135848=>14725,
-58756=>14725,
-136134=>14726,
-58757=>14726,
-136374=>14727,
-58758=>14727,
-34051=>14728,
-58761=>14728,
-58759=>14728,
-145062=>14729,
-58760=>14729,
-33877=>14731,
-58762=>14731,
-149908=>14732,
-58763=>14732,
-160101=>14733,
-58764=>14733,
-146993=>14734,
-58765=>14734,
-152924=>14735,
-58766=>14735,
-147195=>14736,
-58767=>14736,
-159826=>14737,
-58768=>14737,
-17652=>14738,
-58769=>14738,
-145134=>14739,
-58770=>14739,
-170397=>14740,
-58771=>14740,
-159526=>14741,
-58772=>14741,
-26617=>14742,
-58773=>14742,
-14131=>14743,
-58774=>14743,
-15381=>14744,
-58775=>14744,
-15847=>14745,
-58776=>14745,
-22636=>14746,
-58777=>14746,
-137506=>14747,
-58778=>14747,
-26640=>14748,
-58779=>14748,
-16471=>14749,
-58780=>14749,
-145215=>14750,
-58781=>14750,
-147681=>14751,
-58782=>14751,
-147595=>14752,
-58783=>14752,
-147727=>14753,
-58784=>14753,
-158753=>14754,
-58785=>14754,
-21707=>14755,
-58786=>14755,
-22174=>14756,
-58787=>14756,
-157361=>14757,
-58788=>14757,
-22162=>14758,
-58789=>14758,
-135135=>14759,
-58790=>14759,
-134056=>14760,
-58791=>14760,
-134669=>14761,
-58792=>14761,
-166675=>14763,
-58794=>14763,
-37788=>14764,
-58795=>14764,
-20216=>14765,
-58796=>14765,
-20779=>14766,
-58797=>14766,
-14361=>14767,
-58798=>14767,
-148534=>14768,
-58799=>14768,
-20156=>14769,
-58800=>14769,
-132197=>14770,
-58801=>14770,
-20299=>14772,
-58803=>14772,
-20362=>14773,
-58804=>14773,
-153169=>14774,
-58805=>14774,
-23144=>14775,
-58806=>14775,
-131499=>14776,
-58807=>14776,
-132043=>14777,
-58808=>14777,
-14745=>14778,
-58809=>14778,
-131850=>14779,
-58810=>14779,
-132116=>14780,
-58811=>14780,
-13365=>14781,
-58812=>14781,
-20265=>14782,
-58813=>14782,
-131776=>14783,
-58814=>14783,
-167603=>14784,
-58815=>14784,
-131701=>14785,
-58816=>14785,
-35546=>14786,
-58817=>14786,
-131596=>14787,
-58818=>14787,
-20120=>14788,
-58819=>14788,
-20685=>14789,
-58820=>14789,
-20749=>14790,
-58821=>14790,
-20386=>14791,
-58822=>14791,
-20227=>14792,
-58823=>14792,
-150030=>14793,
-58824=>14793,
-147082=>14794,
-58825=>14794,
-20290=>14795,
-58826=>14795,
-20526=>14796,
-58827=>14796,
-20588=>14797,
-58828=>14797,
-20609=>14798,
-58829=>14798,
-20428=>14799,
-58830=>14799,
-20453=>14800,
-58831=>14800,
-20568=>14801,
-58832=>14801,
-20732=>14802,
-58833=>14802,
-28278=>14803,
-58838=>14803,
-144789=>14804,
-58839=>14804,
-147001=>14805,
-58840=>14805,
-147135=>14806,
-58841=>14806,
-28018=>14807,
-58842=>14807,
-137348=>14808,
-58843=>14808,
-147081=>14809,
-58844=>14809,
-20904=>14810,
-58845=>14810,
-20931=>14811,
-58846=>14811,
-132576=>14812,
-58847=>14812,
-17629=>14813,
-58848=>14813,
-132259=>14814,
-58849=>14814,
-132242=>14815,
-58850=>14815,
-132241=>14816,
-58851=>14816,
-36218=>14817,
-58852=>14817,
-166556=>14818,
-58853=>14818,
-132878=>14819,
-58854=>14819,
-21081=>14820,
-58855=>14820,
-21156=>14821,
-58856=>14821,
-133235=>14822,
-58857=>14822,
-21217=>14823,
-58858=>14823,
-18042=>14825,
-58860=>14825,
-29068=>14826,
-58861=>14826,
-148364=>14827,
-58862=>14827,
-134176=>14828,
-58863=>14828,
-149932=>14829,
-58864=>14829,
-135396=>14830,
-58865=>14830,
-27089=>14831,
-58866=>14831,
-134685=>14832,
-58867=>14832,
-16094=>14834,
-58869=>14834,
-29849=>14835,
-58870=>14835,
-29716=>14836,
-58871=>14836,
-29782=>14837,
-58872=>14837,
-29592=>14838,
-58873=>14838,
-19342=>14839,
-58874=>14839,
-150204=>14840,
-58875=>14840,
-147597=>14841,
-58876=>14841,
-21456=>14842,
-58877=>14842,
-13700=>14843,
-58878=>14843,
-29199=>14844,
-58879=>14844,
-147657=>14845,
-58880=>14845,
-21940=>14846,
-58881=>14846,
-131909=>14847,
-58882=>14847,
-21709=>14848,
-58883=>14848,
-134086=>14849,
-58884=>14849,
-22301=>14850,
-58885=>14850,
-37469=>14851,
-58886=>14851,
-38644=>14852,
-58887=>14852,
-22493=>14853,
-58889=>14853,
-22413=>14854,
-58890=>14854,
-22399=>14855,
-58891=>14855,
-13886=>14856,
-58892=>14856,
-22731=>14857,
-58893=>14857,
-23193=>14858,
-58894=>14858,
-166470=>14859,
-58895=>14859,
-136954=>14860,
-58896=>14860,
-137071=>14861,
-58897=>14861,
-136976=>14862,
-58898=>14862,
-23084=>14863,
-58899=>14863,
-22968=>14864,
-58900=>14864,
-23166=>14865,
-58902=>14865,
-23247=>14866,
-58903=>14866,
-23058=>14867,
-58904=>14867,
-153926=>14868,
-58905=>14868,
-137715=>14869,
-58906=>14869,
-137313=>14870,
-58907=>14870,
-148117=>14871,
-58908=>14871,
-14069=>14872,
-58909=>14872,
-27909=>14873,
-58910=>14873,
-29763=>14874,
-58911=>14874,
-23073=>14875,
-58912=>14875,
-155267=>14876,
-58913=>14876,
-23169=>14877,
-58914=>14877,
-166871=>14878,
-58915=>14878,
-132115=>14879,
-58916=>14879,
-37856=>14880,
-58917=>14880,
-29836=>14881,
-58918=>14881,
-135939=>14882,
-58919=>14882,
-28933=>14883,
-58920=>14883,
-18802=>14884,
-58921=>14884,
-37896=>14885,
-58922=>14885,
-166395=>14886,
-58923=>14886,
-37821=>14887,
-58924=>14887,
-14240=>14888,
-58925=>14888,
-23582=>14889,
-58926=>14889,
-23710=>14890,
-58927=>14890,
-24158=>14891,
-58928=>14891,
-24136=>14892,
-58929=>14892,
-137622=>14893,
-58930=>14893,
-137596=>14894,
-58931=>14894,
-146158=>14895,
-58932=>14895,
-24269=>14896,
-58933=>14896,
-23375=>14897,
-58934=>14897,
-58935=>14898,
-137475=>14898,
-58936=>14899,
-137476=>14899,
-14081=>14900,
-58937=>14900,
-137376=>14901,
-58938=>14901,
-14045=>14902,
-58939=>14902,
-136958=>14903,
-58940=>14903,
-14035=>14904,
-58941=>14904,
-33066=>14905,
-58942=>14905,
-166471=>14906,
-58943=>14906,
-138682=>14907,
-58944=>14907,
-144498=>14908,
-58945=>14908,
-166312=>14909,
-58946=>14909,
-24332=>14910,
-60916=>14910,
-58947=>14910,
-24334=>14911,
-58948=>14911,
-137511=>14912,
-58949=>14912,
-137131=>14913,
-58950=>14913,
-23147=>14914,
-58951=>14914,
-137019=>14915,
-58952=>14915,
-23364=>14916,
-58953=>14916,
-161277=>14917,
-58955=>14917,
-34912=>14918,
-58956=>14918,
-24702=>14919,
-58957=>14919,
-141408=>14920,
-58958=>14920,
-140843=>14921,
-58959=>14921,
-24539=>14922,
-58960=>14922,
-16056=>14923,
-58961=>14923,
-140719=>14924,
-58962=>14924,
-140734=>14925,
-58963=>14925,
-168072=>14926,
-58964=>14926,
-159603=>14927,
-58965=>14927,
-25024=>14928,
-58966=>14928,
-131134=>14929,
-58967=>14929,
-131142=>14930,
-58968=>14930,
-140827=>14931,
-58969=>14931,
-24985=>14932,
-58970=>14932,
-24984=>14933,
-58971=>14933,
-24693=>14934,
-58972=>14934,
-142491=>14935,
-58973=>14935,
-142599=>14936,
-58974=>14936,
-149204=>14937,
-58975=>14937,
-168269=>14938,
-58976=>14938,
-25713=>14939,
-58977=>14939,
-149093=>14940,
-58978=>14940,
-142186=>14941,
-58979=>14941,
-14889=>14942,
-58980=>14942,
-142114=>14943,
-58981=>14943,
-144464=>14944,
-58982=>14944,
-170218=>14945,
-58983=>14945,
-142968=>14946,
-58984=>14946,
-25399=>14947,
-58985=>14947,
-25782=>14948,
-58987=>14948,
-25393=>14949,
-58988=>14949,
-25553=>14950,
-58989=>14950,
-149987=>14951,
-58990=>14951,
-142695=>14952,
-58991=>14952,
-25252=>14953,
-58992=>14953,
-142497=>14954,
-58993=>14954,
-25659=>14955,
-58994=>14955,
-25963=>14956,
-58995=>14956,
-26994=>14957,
-58996=>14957,
-15348=>14958,
-58997=>14958,
-143502=>14959,
-58998=>14959,
-144045=>14960,
-58999=>14960,
-149897=>14961,
-59000=>14961,
-144043=>14962,
-59001=>14962,
-21773=>14963,
-59002=>14963,
-144096=>14964,
-59003=>14964,
-137433=>14965,
-59004=>14965,
-169023=>14966,
-59005=>14966,
-26318=>14967,
-59006=>14967,
-144009=>14968,
-59007=>14968,
-143795=>14969,
-59008=>14969,
-15072=>14970,
-59009=>14970,
-152964=>14971,
-59011=>14971,
-166690=>14972,
-59012=>14972,
-152975=>14973,
-59013=>14973,
-136956=>14974,
-59014=>14974,
-152923=>14975,
-59015=>14975,
-152613=>14976,
-59016=>14976,
-30958=>14977,
-59017=>14977,
-143619=>14978,
-59018=>14978,
-137258=>14979,
-59019=>14979,
-143924=>14980,
-59020=>14980,
-13412=>14981,
-59021=>14981,
-143887=>14982,
-59022=>14982,
-143746=>14983,
-59023=>14983,
-148169=>14984,
-59024=>14984,
-26254=>14985,
-59025=>14985,
-159012=>14986,
-59026=>14986,
-26219=>14987,
-59027=>14987,
-19347=>14988,
-59028=>14988,
-26160=>14989,
-59029=>14989,
-161904=>14990,
-59030=>14990,
-138731=>14991,
-59031=>14991,
-26211=>14992,
-59032=>14992,
-144082=>14993,
-59033=>14993,
-144097=>14994,
-59034=>14994,
-26142=>14995,
-59035=>14995,
-153714=>14996,
-59036=>14996,
-14545=>14997,
-59037=>14997,
-145466=>14998,
-59038=>14998,
-145340=>14999,
-59039=>14999,
-15257=>15000,
-59040=>15000,
-145314=>15001,
-59041=>15001,
-144382=>15002,
-59042=>15002,
-29904=>15003,
-59043=>15003,
-15254=>15004,
-59044=>15004,
-149034=>15005,
-59046=>15005,
-26806=>15006,
-59047=>15006,
-15300=>15008,
-59049=>15008,
-27326=>15009,
-59050=>15009,
-145365=>15010,
-59052=>15010,
-148615=>15011,
-59053=>15011,
-27187=>15012,
-59054=>15012,
-27218=>15013,
-59055=>15013,
-27337=>15014,
-59056=>15014,
-27397=>15015,
-59057=>15015,
-137490=>15016,
-59058=>15016,
-25873=>15017,
-59059=>15017,
-26776=>15018,
-59060=>15018,
-27212=>15019,
-59061=>15019,
-15319=>15020,
-59062=>15020,
-27258=>15021,
-59063=>15021,
-27479=>15022,
-59064=>15022,
-147392=>15023,
-59065=>15023,
-146586=>15024,
-59066=>15024,
-37792=>15025,
-59067=>15025,
-37618=>15026,
-59068=>15026,
-166890=>15027,
-59069=>15027,
-166603=>15028,
-59070=>15028,
-37513=>15029,
-59071=>15029,
-163870=>15030,
-59072=>15030,
-166364=>15031,
-59073=>15031,
-37991=>15032,
-59074=>15032,
-28069=>15033,
-59075=>15033,
-28427=>15034,
-59076=>15034,
-147327=>15036,
-59079=>15036,
-15759=>15037,
-59080=>15037,
-28164=>15038,
-59081=>15038,
-147516=>15039,
-59082=>15039,
-23101=>15040,
-59083=>15040,
-28170=>15041,
-59084=>15041,
-22599=>15042,
-59085=>15042,
-27940=>15043,
-59086=>15043,
-30786=>15044,
-59087=>15044,
-28987=>15045,
-59088=>15045,
-148250=>15046,
-59089=>15046,
-148086=>15047,
-59090=>15047,
-28913=>15048,
-59091=>15048,
-29264=>15049,
-61085=>15049,
-59092=>15049,
-29319=>15050,
-59093=>15050,
-29332=>15051,
-59094=>15051,
-149391=>15052,
-59095=>15052,
-149285=>15053,
-59096=>15053,
-20857=>15054,
-59097=>15054,
-150180=>15055,
-59098=>15055,
-132587=>15056,
-59099=>15056,
-29818=>15057,
-59100=>15057,
-147192=>15058,
-59101=>15058,
-144991=>15059,
-59102=>15059,
-150090=>15060,
-59103=>15060,
-149783=>15061,
-59104=>15061,
-155617=>15062,
-59105=>15062,
-16134=>15063,
-59106=>15063,
-16049=>15064,
-59107=>15064,
-150239=>15065,
-59108=>15065,
-166947=>15066,
-59109=>15066,
-147253=>15067,
-59110=>15067,
-24743=>15068,
-59111=>15068,
-16115=>15069,
-59112=>15069,
-29900=>15070,
-59113=>15070,
-29756=>15071,
-59114=>15071,
-37767=>15072,
-59115=>15072,
-29751=>15073,
-59116=>15073,
-17567=>15074,
-59117=>15074,
-159210=>15075,
-59118=>15075,
-17745=>15076,
-59119=>15076,
-30083=>15077,
-59120=>15077,
-16227=>15078,
-59121=>15078,
-150745=>15079,
-59122=>15079,
-150790=>15080,
-59123=>15080,
-16216=>15081,
-59124=>15081,
-30037=>15082,
-59125=>15082,
-30323=>15083,
-59126=>15083,
-173510=>15084,
-59127=>15084,
-29800=>15086,
-61070=>15086,
-59129=>15086,
-166604=>15087,
-59130=>15087,
-149931=>15088,
-59131=>15088,
-149902=>15089,
-59132=>15089,
-15099=>15090,
-59133=>15090,
-15821=>15091,
-59134=>15091,
-150094=>15092,
-59135=>15092,
-16127=>15093,
-59136=>15093,
-149957=>15094,
-59137=>15094,
-149747=>15095,
-59138=>15095,
-37370=>15096,
-59139=>15096,
-22322=>15097,
-59140=>15097,
-37698=>15098,
-59141=>15098,
-166627=>15099,
-59142=>15099,
-137316=>15100,
-59143=>15100,
-20703=>15101,
-59144=>15101,
-152097=>15102,
-59145=>15102,
-152039=>15103,
-59146=>15103,
-30584=>15104,
-59147=>15104,
-143922=>15105,
-59148=>15105,
-30478=>15106,
-59149=>15106,
-30479=>15107,
-59150=>15107,
-30587=>15108,
-59151=>15108,
-149143=>15109,
-59152=>15109,
-145281=>15110,
-59153=>15110,
-14942=>15111,
-59154=>15111,
-149744=>15112,
-59155=>15112,
-29752=>15113,
-59156=>15113,
-29851=>15114,
-59157=>15114,
-16063=>15115,
-59158=>15115,
-150202=>15116,
-59159=>15116,
-150215=>15117,
-59160=>15117,
-16584=>15118,
-59161=>15118,
-150166=>15119,
-59162=>15119,
-156078=>15120,
-59163=>15120,
-37639=>15121,
-59164=>15121,
-152961=>15122,
-59165=>15122,
-30750=>15123,
-59166=>15123,
-30861=>15124,
-59167=>15124,
-30856=>15125,
-59168=>15125,
-30930=>15126,
-59169=>15126,
-29648=>15127,
-59170=>15127,
-31065=>15128,
-59171=>15128,
-161601=>15129,
-59172=>15129,
-153315=>15130,
-59173=>15130,
-16654=>15131,
-59174=>15131,
-31141=>15134,
-59177=>15134,
-27181=>15135,
-59178=>15135,
-147194=>15136,
-59179=>15136,
-31290=>15137,
-59180=>15137,
-31220=>15138,
-59181=>15138,
-16750=>15139,
-59182=>15139,
-136934=>15140,
-59183=>15140,
-16690=>15141,
-59184=>15141,
-37429=>15142,
-59185=>15142,
-31217=>15143,
-59186=>15143,
-134476=>15144,
-59187=>15144,
-149900=>15145,
-59188=>15145,
-131737=>15146,
-59189=>15146,
-146874=>15147,
-59190=>15147,
-137070=>15148,
-59191=>15148,
-13719=>15149,
-59192=>15149,
-21867=>15150,
-59193=>15150,
-13680=>15151,
-59194=>15151,
-13994=>15152,
-59195=>15152,
-131540=>15153,
-59196=>15153,
-134157=>15154,
-59197=>15154,
-31458=>15155,
-59198=>15155,
-23129=>15156,
-59199=>15156,
-141045=>15157,
-59200=>15157,
-154287=>15158,
-59201=>15158,
-154268=>15159,
-59202=>15159,
-23053=>15160,
-59203=>15160,
-131675=>15161,
-59204=>15161,
-30960=>15162,
-59205=>15162,
-23082=>15163,
-59206=>15163,
-154566=>15164,
-59207=>15164,
-31486=>15165,
-59208=>15165,
-16889=>15166,
-59209=>15166,
-31837=>15167,
-59210=>15167,
-31853=>15168,
-59211=>15168,
-16913=>15169,
-59212=>15169,
-154547=>15170,
-59213=>15170,
-155324=>15171,
-59214=>15171,
-155302=>15172,
-59215=>15172,
-31949=>15173,
-59216=>15173,
-150009=>15174,
-59217=>15174,
-137136=>15175,
-59218=>15175,
-31886=>15176,
-59219=>15176,
-31868=>15177,
-59220=>15177,
-31918=>15178,
-59221=>15178,
-27314=>15179,
-59222=>15179,
-32220=>15180,
-59223=>15180,
-32263=>15181,
-59224=>15181,
-32211=>15182,
-59225=>15182,
-32590=>15183,
-59226=>15183,
-156257=>15184,
-59227=>15184,
-155996=>15185,
-59228=>15185,
-162632=>15186,
-59229=>15186,
-32151=>15187,
-59230=>15187,
-155266=>15188,
-59231=>15188,
-17002=>15189,
-59232=>15189,
-158581=>15190,
-59233=>15190,
-133398=>15191,
-59234=>15191,
-26582=>15192,
-59235=>15192,
-131150=>15193,
-59236=>15193,
-144847=>15194,
-59237=>15194,
-22468=>15195,
-59238=>15195,
-156690=>15196,
-59239=>15196,
-156664=>15197,
-59240=>15197,
-32733=>15198,
-59242=>15198,
-31527=>15199,
-59243=>15199,
-133164=>15200,
-59244=>15200,
-154345=>15201,
-59245=>15201,
-154947=>15202,
-59246=>15202,
-31500=>15203,
-59247=>15203,
-155150=>15204,
-59248=>15204,
-39398=>15205,
-59249=>15205,
-34373=>15206,
-59250=>15206,
-39523=>15207,
-59251=>15207,
-27164=>15208,
-59252=>15208,
-144447=>15209,
-59253=>15209,
-150007=>15210,
-59255=>15210,
-157101=>15211,
-59256=>15211,
-39455=>15212,
-59257=>15212,
-157088=>15213,
-59258=>15213,
-33941=>15214,
-160039=>15215,
-59260=>15215,
-158929=>15216,
-59261=>15216,
-17642=>15217,
-59262=>15217,
-33079=>15218,
-59263=>15218,
-17410=>15219,
-59264=>15219,
-32966=>15220,
-59265=>15220,
-33033=>15221,
-59266=>15221,
-33090=>15222,
-59267=>15222,
-157620=>15223,
-59268=>15223,
-39107=>15224,
-59269=>15224,
-158274=>15225,
-59270=>15225,
-33378=>15226,
-59271=>15226,
-33381=>15227,
-59272=>15227,
-158289=>15228,
-59273=>15228,
-33875=>15229,
-59274=>15229,
-159143=>15230,
-59275=>15230,
-34320=>15231,
-59276=>15231,
-160283=>15232,
-59277=>15232,
-23174=>15233,
-59278=>15233,
-16767=>15234,
-59279=>15234,
-137280=>15235,
-59280=>15235,
-23339=>15236,
-59281=>15236,
-137377=>15237,
-59282=>15237,
-23268=>15238,
-59283=>15238,
-137432=>15239,
-59284=>15239,
-34464=>15240,
-59285=>15240,
-195004=>15241,
-59286=>15241,
-146831=>15242,
-59287=>15242,
-34861=>15243,
-59288=>15243,
-160802=>15244,
-59289=>15244,
-23042=>15245,
-59290=>15245,
-34926=>15246,
-59291=>15246,
-20293=>15247,
-59292=>15247,
-34951=>15248,
-59293=>15248,
-35007=>15249,
-59294=>15249,
-35046=>15250,
-59295=>15250,
-35173=>15251,
-59296=>15251,
-35149=>15252,
-59297=>15252,
-153219=>15253,
-59298=>15253,
-35156=>15254,
-59299=>15254,
-161669=>15255,
-59300=>15255,
-161668=>15256,
-59301=>15256,
-166901=>15257,
-59302=>15257,
-166873=>15258,
-59303=>15258,
-166812=>15259,
-59304=>15259,
-166393=>15260,
-59305=>15260,
-16045=>15261,
-59306=>15261,
-33955=>15262,
-59307=>15262,
-18165=>15263,
-59308=>15263,
-18127=>15264,
-59309=>15264,
-14322=>15265,
-59310=>15265,
-35389=>15266,
-59311=>15266,
-35356=>15267,
-59312=>15267,
-169032=>15268,
-59313=>15268,
-24397=>15269,
-59314=>15269,
-37419=>15270,
-59315=>15270,
-148100=>15271,
-59316=>15271,
-26068=>15272,
-59317=>15272,
-28969=>15273,
-59318=>15273,
-28868=>15274,
-59319=>15274,
-137285=>15275,
-59320=>15275,
-40301=>15276,
-59321=>15276,
-35999=>15277,
-59322=>15277,
-36073=>15278,
-59323=>15278,
-163292=>15279,
-59324=>15279,
-22938=>15280,
-59325=>15280,
-30659=>15281,
-59326=>15281,
-23024=>15282,
-59327=>15282,
-14036=>15283,
-59329=>15283,
-36394=>15284,
-59330=>15284,
-36519=>15285,
-59331=>15285,
-150537=>15286,
-59332=>15286,
-36656=>15287,
-59333=>15287,
-36682=>15288,
-59334=>15288,
-17140=>15289,
-59335=>15289,
-27736=>15290,
-59336=>15290,
-28603=>15291,
-59337=>15291,
-140065=>15292,
-59338=>15292,
-18587=>15293,
-59339=>15293,
-28537=>15294,
-59340=>15294,
-28299=>15295,
-59341=>15295,
-137178=>15296,
-59342=>15296,
-39913=>15297,
-59343=>15297,
-14005=>15298,
-59344=>15298,
-149807=>15299,
-59345=>15299,
-37051=>15300,
-59346=>15300,
-18612=>15301,
-21873=>15302,
-59348=>15302,
-18694=>15303,
-59349=>15303,
-37307=>15304,
-59350=>15304,
-37892=>15305,
-59351=>15305,
-166475=>15306,
-59352=>15306,
-16482=>15307,
-59353=>15307,
-166652=>15308,
-59354=>15308,
-37927=>15309,
-59355=>15309,
-166941=>15310,
-59356=>15310,
-166971=>15311,
-59357=>15311,
-34021=>15312,
-59358=>15312,
-35371=>15313,
-59359=>15313,
-38297=>15314,
-59360=>15314,
-38311=>15315,
-59361=>15315,
-38295=>15316,
-59362=>15316,
-38294=>15317,
-59363=>15317,
-167220=>15318,
-59364=>15318,
-29765=>15319,
-59365=>15319,
-16066=>15320,
-59366=>15320,
-149759=>15321,
-59367=>15321,
-150082=>15322,
-59368=>15322,
-148458=>15323,
-59369=>15323,
-16103=>15324,
-59370=>15324,
-143909=>15325,
-59371=>15325,
-38543=>15326,
-59372=>15326,
-167655=>15327,
-59373=>15327,
-167526=>15328,
-59374=>15328,
-167525=>15329,
-59375=>15329,
-16076=>15330,
-59376=>15330,
-149997=>15331,
-59377=>15331,
-150136=>15332,
-59378=>15332,
-147438=>15333,
-59379=>15333,
-29714=>15334,
-59380=>15334,
-29803=>15335,
-59381=>15335,
-16124=>15336,
-59382=>15336,
-38721=>15337,
-59383=>15337,
-168112=>15338,
-59384=>15338,
-26695=>15339,
-59385=>15339,
-18973=>15340,
-59386=>15340,
-168083=>15341,
-59387=>15341,
-153567=>15342,
-59388=>15342,
-37736=>15344,
-59390=>15344,
-166281=>15345,
-59391=>15345,
-166950=>15346,
-59392=>15346,
-166703=>15347,
-59393=>15347,
-156606=>15348,
-59394=>15348,
-37562=>15349,
-59395=>15349,
-23313=>15350,
-59396=>15350,
-35689=>15351,
-59397=>15351,
-18748=>15352,
-59398=>15352,
-29689=>15353,
-59399=>15353,
-147995=>15354,
-59400=>15354,
-38811=>15355,
-59401=>15355,
-39224=>15357,
-59403=>15357,
-134950=>15358,
-59404=>15358,
-24001=>15359,
-59405=>15359,
-166853=>15360,
-59406=>15360,
-150194=>15361,
-59407=>15361,
-38943=>15362,
-59408=>15362,
-169178=>15363,
-59409=>15363,
-37622=>15364,
-59410=>15364,
-169431=>15365,
-59411=>15365,
-37349=>15366,
-59412=>15366,
-17600=>15367,
-59413=>15367,
-166736=>15368,
-59414=>15368,
-150119=>15369,
-59415=>15369,
-166756=>15370,
-59416=>15370,
-39132=>15371,
-59417=>15371,
-166469=>15372,
-59418=>15372,
-16128=>15373,
-59419=>15373,
-37418=>15374,
-59420=>15374,
-18725=>15375,
-59421=>15375,
-33812=>15376,
-59422=>15376,
-39227=>15377,
-59423=>15377,
-39245=>15378,
-59424=>15378,
-162566=>15379,
-59425=>15379,
-15869=>15380,
-59426=>15380,
-19311=>15382,
-59428=>15382,
-39338=>15383,
-59429=>15383,
-39516=>15384,
-59430=>15384,
-166757=>15385,
-59431=>15385,
-153800=>15386,
-59432=>15386,
-27279=>15387,
-59433=>15387,
-39457=>15388,
-59434=>15388,
-23294=>15389,
-59435=>15389,
-39471=>15390,
-59436=>15390,
-170225=>15391,
-59437=>15391,
-19344=>15392,
-59438=>15392,
-170312=>15393,
-59439=>15393,
-39356=>15394,
-59440=>15394,
-19389=>15395,
-59441=>15395,
-19351=>15396,
-59442=>15396,
-37757=>15397,
-59443=>15397,
-22642=>15398,
-59444=>15398,
-135938=>15399,
-59445=>15399,
-22562=>15400,
-59446=>15400,
-149944=>15401,
-59447=>15401,
-136424=>15402,
-59448=>15402,
-30788=>15403,
-59449=>15403,
-141087=>15404,
-59450=>15404,
-146872=>15405,
-59451=>15405,
-26821=>15406,
-59452=>15406,
-15741=>15407,
-59453=>15407,
-37976=>15408,
-59454=>15408,
-14631=>15409,
-59455=>15409,
-24912=>15410,
-59456=>15410,
-141185=>15411,
-59457=>15411,
-141675=>15412,
-59458=>15412,
-24839=>15413,
-59459=>15413,
-40015=>15414,
-59460=>15414,
-40019=>15415,
-59461=>15415,
-40059=>15416,
-59462=>15416,
-39989=>15417,
-59463=>15417,
-39952=>15418,
-59464=>15418,
-39807=>15419,
-59465=>15419,
-39887=>15420,
-59466=>15420,
-171565=>15421,
-59467=>15421,
-39839=>15422,
-59468=>15422,
-172533=>15423,
-59469=>15423,
-172286=>15424,
-59470=>15424,
-40225=>15425,
-59471=>15425,
-19630=>15426,
-59472=>15426,
-147716=>15427,
-59473=>15427,
-40472=>15428,
-59474=>15428,
-19632=>15429,
-59475=>15429,
-40204=>15430,
-59476=>15430,
-172468=>15431,
-59477=>15431,
-172269=>15432,
-59478=>15432,
-172275=>15433,
-59479=>15433,
-170287=>15434,
-59480=>15434,
-40357=>15435,
-59481=>15435,
-33981=>15436,
-59482=>15436,
-159250=>15437,
-59483=>15437,
-159711=>15438,
-59484=>15438,
-158594=>15439,
-59485=>15439,
-34300=>15440,
-59486=>15440,
-17715=>15441,
-59487=>15441,
-159140=>15442,
-59488=>15442,
-159364=>15443,
-59489=>15443,
-159216=>15444,
-59490=>15444,
-33824=>15445,
-59491=>15445,
-34286=>15446,
-59492=>15446,
-159232=>15447,
-59493=>15447,
-145367=>15448,
-59494=>15448,
-155748=>15449,
-59495=>15449,
-31202=>15450,
-59496=>15450,
-144796=>15451,
-59497=>15451,
-144960=>15452,
-59498=>15452,
-149982=>15453,
-59500=>15453,
-15714=>15454,
-59501=>15454,
-37851=>15455,
-59502=>15455,
-37566=>15456,
-59503=>15456,
-37704=>15457,
-59504=>15457,
-131775=>15458,
-59505=>15458,
-30905=>15459,
-59506=>15459,
-37495=>15460,
-59507=>15460,
-37965=>15461,
-59508=>15461,
-20452=>15462,
-59509=>15462,
-13376=>15463,
-59510=>15463,
-36964=>15464,
-59511=>15464,
-152925=>15465,
-59512=>15465,
-30781=>15466,
-59513=>15466,
-30804=>15467,
-59514=>15467,
-30902=>15468,
-59515=>15468,
-30795=>15469,
-59516=>15469,
-137047=>15470,
-59517=>15470,
-143817=>15471,
-59518=>15471,
-149825=>15472,
-59519=>15472,
-13978=>15473,
-59520=>15473,
-20338=>15474,
-59521=>15474,
-28634=>15475,
-59522=>15475,
-28633=>15476,
-59523=>15476,
-28702=>15478,
-59524=>15478,
-59525=>15478,
-21524=>15479,
-59526=>15479,
-147893=>15480,
-59527=>15480,
-22459=>15481,
-59528=>15481,
-22771=>15482,
-59529=>15482,
-22410=>15483,
-59530=>15483,
-40214=>15484,
-59531=>15484,
-22487=>15485,
-59532=>15485,
-28980=>15486,
-59533=>15486,
-13487=>15487,
-59534=>15487,
-147884=>15488,
-59535=>15488,
-29163=>15489,
-59536=>15489,
-158784=>15490,
-59537=>15490,
-151447=>15491,
-59538=>15491,
-137141=>15493,
-59540=>15493,
-166473=>15494,
-59541=>15494,
-24844=>15495,
-59542=>15495,
-23246=>15496,
-59543=>15496,
-23051=>15497,
-59544=>15497,
-17084=>15498,
-59545=>15498,
-148616=>15499,
-59546=>15499,
-14124=>15500,
-59547=>15500,
-19323=>15501,
-59548=>15501,
-166396=>15502,
-59549=>15502,
-37819=>15503,
-59550=>15503,
-37816=>15504,
-59551=>15504,
-137430=>15505,
-59552=>15505,
-134941=>15506,
-59553=>15506,
-33906=>15507,
-59554=>15507,
-158912=>15508,
-59555=>15508,
-136211=>15509,
-59556=>15509,
-148218=>15510,
-59557=>15510,
-142374=>15511,
-59558=>15511,
-148417=>15512,
-59559=>15512,
-22932=>15513,
-59560=>15513,
-146871=>15514,
-59561=>15514,
-157505=>15515,
-59562=>15515,
-32168=>15516,
-59563=>15516,
-155995=>15517,
-59564=>15517,
-155812=>15518,
-59565=>15518,
-149945=>15519,
-59566=>15519,
-149899=>15520,
-59567=>15520,
-166394=>15521,
-59568=>15521,
-37605=>15522,
-59569=>15522,
-29666=>15523,
-59570=>15523,
-16105=>15524,
-59571=>15524,
-29876=>15525,
-59572=>15525,
-166755=>15526,
-59573=>15526,
-137375=>15527,
-59574=>15527,
-16097=>15528,
-59575=>15528,
-150195=>15529,
-59576=>15529,
-27352=>15530,
-59577=>15530,
-29683=>15531,
-59578=>15531,
-29691=>15532,
-59579=>15532,
-16086=>15533,
-59580=>15533,
-150078=>15534,
-59581=>15534,
-150164=>15535,
-59582=>15535,
-137177=>15536,
-59583=>15536,
-150118=>15537,
-59584=>15537,
-132007=>15538,
-59585=>15538,
-136228=>15539,
-59586=>15539,
-149989=>15540,
-59587=>15540,
-29768=>15541,
-59588=>15541,
-149782=>15542,
-59589=>15542,
-28837=>15543,
-59590=>15543,
-149878=>15544,
-59591=>15544,
-37508=>15545,
-59592=>15545,
-29670=>15546,
-59593=>15546,
-37727=>15547,
-59594=>15547,
-132350=>15548,
-59595=>15548,
-37681=>15549,
-59596=>15549,
-166606=>15550,
-59597=>15550,
-166422=>15551,
-59598=>15551,
-37766=>15552,
-59599=>15552,
-166887=>15553,
-59600=>15553,
-153045=>15554,
-59601=>15554,
-18741=>15555,
-59602=>15555,
-166530=>15556,
-59603=>15556,
-29035=>15557,
-59604=>15557,
-149827=>15558,
-59605=>15558,
-134399=>15559,
-59606=>15559,
-22180=>15560,
-59607=>15560,
-132634=>15561,
-59608=>15561,
-134123=>15562,
-59609=>15562,
-134328=>15563,
-59610=>15563,
-21762=>15564,
-59611=>15564,
-31172=>15565,
-59612=>15565,
-137210=>15566,
-59613=>15566,
-32254=>15567,
-59614=>15567,
-136898=>15568,
-59615=>15568,
-150096=>15569,
-59616=>15569,
-137298=>15570,
-59617=>15570,
-17710=>15571,
-59618=>15571,
-37889=>15572,
-59619=>15572,
-14090=>15573,
-59620=>15573,
-166592=>15574,
-59621=>15574,
-149933=>15575,
-59622=>15575,
-22960=>15576,
-59623=>15576,
-137407=>15577,
-59624=>15577,
-137347=>15578,
-59625=>15578,
-160900=>15579,
-59626=>15579,
-23201=>15580,
-59627=>15580,
-14050=>15581,
-59628=>15581,
-146779=>15582,
-59629=>15582,
-14000=>15583,
-59630=>15583,
-37471=>15584,
-59631=>15584,
-23161=>15585,
-59632=>15585,
-166529=>15586,
-59633=>15586,
-137314=>15587,
-59634=>15587,
-37748=>15588,
-59635=>15588,
-15565=>15589,
-59636=>15589,
-133812=>15590,
-59637=>15590,
-19094=>15591,
-59638=>15591,
-14730=>15592,
-59639=>15592,
-20724=>15593,
-59640=>15593,
-15721=>15594,
-59641=>15594,
-15692=>15595,
-59642=>15595,
-136092=>15596,
-59643=>15596,
-29045=>15597,
-59644=>15597,
-17147=>15598,
-59645=>15598,
-164376=>15599,
-59646=>15599,
-28175=>15600,
-59647=>15600,
-168164=>15601,
-59648=>15601,
-17643=>15602,
-59649=>15602,
-27991=>15603,
-59650=>15603,
-163407=>15604,
-59651=>15604,
-28775=>15605,
-59652=>15605,
-27823=>15606,
-59653=>15606,
-15574=>15607,
-59654=>15607,
-147437=>15608,
-59655=>15608,
-146989=>15609,
-59656=>15609,
-28162=>15610,
-59657=>15610,
-28428=>15611,
-59658=>15611,
-15727=>15612,
-59659=>15612,
-132085=>15613,
-59660=>15613,
-30033=>15614,
-59661=>15614,
-14012=>15615,
-59662=>15615,
-13512=>15616,
-59663=>15616,
-18048=>15617,
-59664=>15617,
-16090=>15618,
-59665=>15618,
-18545=>15619,
-59666=>15619,
-22980=>15620,
-59667=>15620,
-37486=>15621,
-59668=>15621,
-18750=>15622,
-59669=>15622,
-36673=>15623,
-59670=>15623,
-166940=>15624,
-59671=>15624,
-158656=>15625,
-59672=>15625,
-22546=>15626,
-59673=>15626,
-22472=>15627,
-59674=>15627,
-14038=>15628,
-59675=>15628,
-136274=>15629,
-59676=>15629,
-28926=>15630,
-59677=>15630,
-148322=>15631,
-59678=>15631,
-150129=>15632,
-59679=>15632,
-143331=>15633,
-59680=>15633,
-135856=>15634,
-59681=>15634,
-140221=>15635,
-59682=>15635,
-26809=>15636,
-59683=>15636,
-26983=>15637,
-59684=>15637,
-136088=>15638,
-59685=>15638,
-144613=>15639,
-59686=>15639,
-162804=>15640,
-59687=>15640,
-145119=>15641,
-59688=>15641,
-166531=>15642,
-59689=>15642,
-145366=>15643,
-59690=>15643,
-144378=>15644,
-59691=>15644,
-150687=>15645,
-59692=>15645,
-27162=>15646,
-59693=>15646,
-145069=>15647,
-59694=>15647,
-158903=>15648,
-59695=>15648,
-33854=>15649,
-59696=>15649,
-17631=>15650,
-59697=>15650,
-17614=>15651,
-59698=>15651,
-159014=>15652,
-59699=>15652,
-159057=>15653,
-59700=>15653,
-158850=>15654,
-59701=>15654,
-159710=>15655,
-59702=>15655,
-33597=>15658,
-59705=>15658,
-137018=>15659,
-59706=>15659,
-33773=>15660,
-59707=>15660,
-158848=>15661,
-59708=>15661,
-159827=>15662,
-59709=>15662,
-137179=>15663,
-59710=>15663,
-22921=>15664,
-59711=>15664,
-23170=>15665,
-59712=>15665,
-137139=>15666,
-59713=>15666,
-23137=>15667,
-59714=>15667,
-23153=>15668,
-59715=>15668,
-137477=>15669,
-59716=>15669,
-147964=>15670,
-59717=>15670,
-14125=>15671,
-59718=>15671,
-23023=>15672,
-59719=>15672,
-137020=>15673,
-59720=>15673,
-14023=>15674,
-59721=>15674,
-29070=>15675,
-59722=>15675,
-37776=>15676,
-59723=>15676,
-26266=>15677,
-59724=>15677,
-148133=>15678,
-59725=>15678,
-23150=>15679,
-59726=>15679,
-23083=>15680,
-59727=>15680,
-148115=>15681,
-59728=>15681,
-27179=>15682,
-59729=>15682,
-147193=>15683,
-59730=>15683,
-161590=>15684,
-59731=>15684,
-148571=>15685,
-59732=>15685,
-148170=>15686,
-59733=>15686,
-28957=>15687,
-59734=>15687,
-148057=>15688,
-59735=>15688,
-166369=>15689,
-59736=>15689,
-20400=>15690,
-59737=>15690,
-159016=>15691,
-59738=>15691,
-23746=>15692,
-59739=>15692,
-148686=>15693,
-59740=>15693,
-163405=>15694,
-59741=>15694,
-148413=>15695,
-59742=>15695,
-27148=>15696,
-59743=>15696,
-148054=>15697,
-59744=>15697,
-135940=>15698,
-59745=>15698,
-28979=>15700,
-59747=>15700,
-148457=>15701,
-59748=>15701,
-15781=>15702,
-59749=>15702,
-27871=>15703,
-59750=>15703,
-194597=>15704,
-59751=>15704,
-23019=>15705,
-59754=>15705,
-24412=>15706,
-59757=>15706,
-59764=>15707,
-144128=>15707,
-31955=>15708,
-59776=>15708,
-59783=>15709,
-162548=>15709,
-59786=>15710,
-153334=>15710,
-162584=>15711,
-59790=>15711,
-36972=>15712,
-59791=>15712,
-33270=>15713,
-59795=>15713,
-30476=>15714,
-59797=>15714,
-27810=>15715,
-59799=>15715,
-22269=>15716,
-59800=>15716,
-22633=>15717,
-59828=>15717,
-26465=>15718,
-59832=>15718,
-23646=>15719,
-59838=>15719,
-22770=>15720,
-59841=>15720,
-28857=>15721,
-59843=>15721,
-26627=>15722,
-59853=>15722,
-59859=>15723,
-36795=>15723,
-59861=>15724,
-36796=>15724,
-20001=>15725,
-59871=>15725,
-31545=>15726,
-59898=>15726,
-15820=>15727,
-59902=>15727,
-29482=>15728,
-57990=>15728,
-59909=>15728,
-30048=>15729,
-59912=>15729,
-22586=>15730,
-59920=>15730,
-33446=>15731,
-59932=>15731,
-27018=>15732,
-59940=>15732,
-24803=>15733,
-59944=>15733,
-20206=>15734,
-59984=>15734,
-39364=>15735,
-60002=>15735,
-40639=>15736,
-60023=>15736,
-21249=>15737,
-60025=>15737,
-26528=>15738,
-60038=>15738,
-24808=>15739,
-60046=>15739,
-20916=>15740,
-60053=>15740,
-31363=>15741,
-60064=>15741,
-39994=>15742,
-60075=>15742,
-31432=>15743,
-60093=>15743,
-26906=>15744,
-60098=>15744,
-22956=>15745,
-60100=>15745,
-22592=>15746,
-60102=>15746,
-21610=>15747,
-60114=>15747,
-24807=>15748,
-60123=>15748,
-22138=>15749,
-60125=>15749,
-26965=>15750,
-60132=>15750,
-39983=>15751,
-60133=>15751,
-34725=>15752,
-60134=>15752,
-23584=>15753,
-60141=>15753,
-24075=>15754,
-60143=>15754,
-26398=>15755,
-60147=>15755,
-33965=>15756,
-60157=>15756,
-35713=>15757,
-60161=>15757,
-20088=>15758,
-60166=>15758,
-25283=>15759,
-60176=>15759,
-26709=>15760,
-60180=>15760,
-33533=>15762,
-60190=>15762,
-35237=>15763,
-60194=>15763,
-36768=>15764,
-60196=>15764,
-38840=>15765,
-60198=>15765,
-38983=>15766,
-60200=>15766,
-39613=>15767,
-60201=>15767,
-24497=>15768,
-60218=>15768,
-26184=>15769,
-60219=>15769,
-26303=>15770,
-60220=>15770,
-162425=>15771,
-60221=>15771,
-60225=>15773,
-149946=>15773,
-60230=>15776,
-131910=>15776,
-26382=>15777,
-60232=>15777,
-26904=>15778,
-60233=>15778,
-161367=>15779,
-60235=>15779,
-155618=>15780,
-60236=>15780,
-161278=>15781,
-60239=>15781,
-139418=>15782,
-60240=>15782,
-18640=>15783,
-60241=>15783,
-19128=>15784,
-60242=>15784,
-60244=>15785,
-166554=>15785,
-60247=>15786,
-147515=>15786,
-150085=>15787,
-60250=>15787,
-132554=>15788,
-60251=>15788,
-20946=>15789,
-60252=>15789,
-132625=>15790,
-60253=>15790,
-22943=>15791,
-60254=>15791,
-138920=>15792,
-60255=>15792,
-15294=>15793,
-60256=>15793,
-146687=>15794,
-60257=>15794,
-14747=>15795,
-60262=>15795,
-165352=>15796,
-60264=>15796,
-170441=>15797,
-60265=>15797,
-14178=>15798,
-60266=>15798,
-139715=>15799,
-60267=>15799,
-35678=>15800,
-60268=>15800,
-166734=>15801,
-60269=>15801,
-29193=>15803,
-60274=>15803,
-60276=>15804,
-134264=>15804,
-132985=>15805,
-60280=>15805,
-36570=>15806,
-60281=>15806,
-21135=>15807,
-60283=>15807,
-29041=>15808,
-60285=>15808,
-147274=>15809,
-60288=>15809,
-150183=>15810,
-60289=>15810,
-21948=>15811,
-60290=>15811,
-60293=>15812,
-158546=>15812,
-13427=>15813,
-60295=>15813,
-60297=>15814,
-161330=>15814,
-18200=>15815,
-60299=>15815,
-60303=>15816,
-149823=>15816,
-20582=>15817,
-60305=>15817,
-13563=>15818,
-60306=>15818,
-144332=>15819,
-60307=>15819,
-18300=>15821,
-60310=>15821,
-166216=>15822,
-60311=>15822,
-60315=>15823,
-138640=>15823,
-162834=>15825,
-60320=>15825,
-36950=>15826,
-60321=>15826,
-151450=>15827,
-60323=>15827,
-35682=>15828,
-60324=>15828,
-23899=>15829,
-60327=>15829,
-158711=>15830,
-60328=>15830,
-137500=>15832,
-60331=>15832,
-35562=>15833,
-60332=>15833,
-150006=>15834,
-60333=>15834,
-60335=>15835,
-147439=>15835,
-19392=>15836,
-60337=>15836,
-141083=>15837,
-60340=>15837,
-37989=>15838,
-60341=>15838,
-153569=>15839,
-60342=>15839,
-24981=>15840,
-60343=>15840,
-23079=>15841,
-60344=>15841,
-194765=>15842,
-60345=>15842,
-194566=>15843,
-60348=>15844,
-148769=>15844,
-20074=>15845,
-60350=>15845,
-149812=>15846,
-60351=>15846,
-38486=>15847,
-60352=>15847,
-28047=>15848,
-60353=>15848,
-158909=>15849,
-60354=>15849,
-35191=>15850,
-60356=>15850,
-60359=>15851,
-156689=>15851,
-31554=>15853,
-60363=>15853,
-168128=>15854,
-60364=>15854,
-133649=>15855,
-60365=>15855,
-31301=>15857,
-60369=>15857,
-39462=>15858,
-60372=>15858,
-13919=>15859,
-60374=>15859,
-156777=>15860,
-60375=>15860,
-131105=>15861,
-60376=>15861,
-31107=>15862,
-60377=>15862,
-23852=>15863,
-60380=>15863,
-144665=>15864,
-60381=>15864,
-18128=>15866,
-60384=>15866,
-30011=>15867,
-60386=>15867,
-34917=>15868,
-60387=>15868,
-22710=>15869,
-60389=>15869,
-14108=>15870,
-60390=>15870,
-140685=>15871,
-60391=>15871,
-15444=>15872,
-60394=>15872,
-37505=>15873,
-60397=>15873,
-139642=>15874,
-60398=>15874,
-37680=>15875,
-60400=>15875,
-149968=>15876,
-60402=>15876,
-27705=>15877,
-60403=>15877,
-134904=>15878,
-60406=>15878,
-34855=>15879,
-60407=>15879,
-35061=>15880,
-60408=>15880,
-141606=>15881,
-60409=>15881,
-164979=>15882,
-60410=>15882,
-137137=>15883,
-60411=>15883,
-28344=>15884,
-60412=>15884,
-150058=>15885,
-60413=>15885,
-137248=>15886,
-60414=>15886,
-14756=>15887,
-60415=>15887,
-17727=>15890,
-60419=>15890,
-26294=>15891,
-60420=>15891,
-171181=>15892,
-60421=>15892,
-170148=>15893,
-60422=>15893,
-35139=>15894,
-60423=>15894,
-16607=>15895,
-60427=>15895,
-136714=>15896,
-60428=>15896,
-14753=>15897,
-60429=>15897,
-145199=>15898,
-60430=>15898,
-164072=>15899,
-60431=>15899,
-136133=>15900,
-60432=>15900,
-29101=>15901,
-60433=>15901,
-33638=>15902,
-60434=>15902,
-60436=>15903,
-168360=>15903,
-19639=>15905,
-60438=>15905,
-159919=>15906,
-60439=>15906,
-166315=>15907,
-60440=>15907,
-147834=>15908,
-60445=>15908,
-31555=>15909,
-60446=>15909,
-31102=>15910,
-60447=>15910,
-28597=>15911,
-60449=>15911,
-172767=>15912,
-60450=>15912,
-27139=>15913,
-60451=>15913,
-164632=>15914,
-60452=>15914,
-21410=>15915,
-60453=>15915,
-159239=>15916,
-60454=>15916,
-37823=>15917,
-60455=>15917,
-26678=>15918,
-60456=>15918,
-38749=>15919,
-59389=>15919,
-60457=>15919,
-164207=>15920,
-60458=>15920,
-158133=>15921,
-60460=>15921,
-136173=>15922,
-60461=>15922,
-143919=>15923,
-60462=>15923,
-23941=>15924,
-60464=>15924,
-166960=>15925,
-60465=>15925,
-22293=>15926,
-60467=>15926,
-38947=>15927,
-60468=>15927,
-166217=>15928,
-60469=>15928,
-23979=>15929,
-60470=>15929,
-149896=>15930,
-60471=>15930,
-26046=>15931,
-60472=>15931,
-27093=>15932,
-60473=>15932,
-21458=>15933,
-60474=>15933,
-150181=>15934,
-60475=>15934,
-147329=>15935,
-60476=>15935,
-15377=>15936,
-60477=>15936,
-26422=>15937,
-60478=>15937,
-60482=>15938,
-139169=>15938,
-13770=>15939,
-60490=>15939,
-18682=>15940,
-60493=>15940,
-30728=>15942,
-60496=>15942,
-37461=>15943,
-60497=>15943,
-17394=>15944,
-60499=>15944,
-17375=>15945,
-60501=>15945,
-23032=>15946,
-60505=>15946,
-22155=>15948,
-60518=>15948,
-60520=>15949,
-169449=>15949,
-36882=>15950,
-60541=>15950,
-21953=>15951,
-60546=>15951,
-17673=>15952,
-60551=>15952,
-32383=>15953,
-60552=>15953,
-28502=>15954,
-60553=>15954,
-27313=>15955,
-60554=>15955,
-13540=>15956,
-60556=>15956,
-161949=>15957,
-60558=>15957,
-14138=>15958,
-60559=>15958,
-60562=>15960,
-163876=>15960,
-60565=>15961,
-162366=>15961,
-15851=>15962,
-60567=>15962,
-60569=>15963,
-146615=>15963,
-156248=>15964,
-60574=>15964,
-22207=>15965,
-60575=>15965,
-36366=>15966,
-60577=>15966,
-23405=>15967,
-60578=>15967,
-25566=>15968,
-60581=>15968,
-25904=>15970,
-60585=>15970,
-22061=>15971,
-60586=>15971,
-21530=>15972,
-60588=>15972,
-171416=>15973,
-60591=>15973,
-19581=>15974,
-60592=>15974,
-22050=>15975,
-60593=>15975,
-22046=>15976,
-60594=>15976,
-32585=>15977,
-60595=>15977,
-22901=>15978,
-60597=>15978,
-146752=>15979,
-60598=>15979,
-34672=>15980,
-60599=>15980,
-33047=>15981,
-60604=>15981,
-40286=>15982,
-60605=>15982,
-36120=>15983,
-60606=>15983,
-30267=>15984,
-60607=>15984,
-40005=>15985,
-60608=>15985,
-30286=>15986,
-60609=>15986,
-30649=>15987,
-60610=>15987,
-37701=>15988,
-60611=>15988,
-21554=>15989,
-60612=>15989,
-33096=>15990,
-60613=>15990,
-33527=>15991,
-60614=>15991,
-22053=>15992,
-60615=>15992,
-33074=>15993,
-60616=>15993,
-33816=>15994,
-60617=>15994,
-32957=>15995,
-60618=>15995,
-21994=>15996,
-60619=>15996,
-31074=>15997,
-60620=>15997,
-22083=>15998,
-60621=>15998,
-21526=>15999,
-60622=>15999,
-134813=>16000,
-60623=>16000,
-13774=>16001,
-60624=>16001,
-22021=>16002,
-57509=>16002,
-60625=>16002,
-22001=>16003,
-60626=>16003,
-26353=>16004,
-60627=>16004,
-164578=>16005,
-60628=>16005,
-13869=>16006,
-60629=>16006,
-30004=>16007,
-60630=>16007,
-22000=>16008,
-60631=>16008,
-21946=>16009,
-60632=>16009,
-21655=>16010,
-60633=>16010,
-21874=>16011,
-60634=>16011,
-134209=>16012,
-60635=>16012,
-134294=>16013,
-60636=>16013,
-24272=>16014,
-57652=>16014,
-60637=>16014,
-134774=>16015,
-60639=>16015,
-142434=>16016,
-60640=>16016,
-134818=>16017,
-60641=>16017,
-40619=>16018,
-60642=>16018,
-32090=>16019,
-60643=>16019,
-135285=>16021,
-60645=>16021,
-25245=>16022,
-60646=>16022,
-38765=>16023,
-60647=>16023,
-21652=>16024,
-60648=>16024,
-36045=>16025,
-60649=>16025,
-29174=>16026,
-60650=>16026,
-37238=>16027,
-60651=>16027,
-25596=>16028,
-60652=>16028,
-25529=>16029,
-60653=>16029,
-25598=>16030,
-60654=>16030,
-21865=>16031,
-60655=>16031,
-142147=>16032,
-60656=>16032,
-40050=>16033,
-60657=>16033,
-143027=>16034,
-60658=>16034,
-20890=>16035,
-60659=>16035,
-13535=>16036,
-60660=>16036,
-134567=>16037,
-60661=>16037,
-20903=>16038,
-60662=>16038,
-21581=>16039,
-60663=>16039,
-21790=>16040,
-60664=>16040,
-21779=>16041,
-60665=>16041,
-30310=>16042,
-60666=>16042,
-36397=>16043,
-60667=>16043,
-157834=>16044,
-60668=>16044,
-30129=>16045,
-60669=>16045,
-32950=>16046,
-60670=>16046,
-34820=>16047,
-60671=>16047,
-35015=>16049,
-60673=>16049,
-33206=>16050,
-60674=>16050,
-33820=>16051,
-60675=>16051,
-17644=>16052,
-60677=>16052,
-29444=>16053,
-60678=>16053,
-33547=>16054,
-60681=>16054,
-22139=>16055,
-60683=>16055,
-37232=>16056,
-60690=>16056,
-37384=>16057,
-60692=>16057,
-134905=>16058,
-60696=>16058,
-29286=>16059,
-60697=>16059,
-18254=>16060,
-60699=>16060,
-60701=>16061,
-163833=>16061,
-16634=>16062,
-60703=>16062,
-40029=>16063,
-60704=>16063,
-25887=>16064,
-60705=>16064,
-18675=>16065,
-60707=>16065,
-149472=>16066,
-60708=>16066,
-171388=>16067,
-60709=>16067,
-60713=>16069,
-161187=>16069,
-60715=>16070,
-155720=>16071,
-60716=>16071,
-29091=>16072,
-60718=>16072,
-32398=>16073,
-60719=>16073,
-40272=>16074,
-60720=>16074,
-13687=>16075,
-60723=>16075,
-27826=>16076,
-60725=>16076,
-21351=>16077,
-60726=>16077,
-14812=>16078,
-60728=>16078,
-60731=>16079,
-149016=>16079,
-33325=>16080,
-60734=>16080,
-21579=>16081,
-60735=>16081,
-60739=>16082,
-14930=>16083,
-60740=>16083,
-29556=>16084,
-60742=>16084,
-171692=>16085,
-60743=>16085,
-19721=>16086,
-60744=>16086,
-39917=>16087,
-60745=>16087,
-19547=>16089,
-60748=>16089,
-171998=>16090,
-60751=>16090,
-33884=>16091,
-60752=>16091,
-60754=>16092,
-160434=>16092,
-25390=>16093,
-60757=>16093,
-32037=>16094,
-60758=>16094,
-14890=>16095,
-60761=>16095,
-36872=>16096,
-60762=>16096,
-21196=>16097,
-60763=>16097,
-15988=>16098,
-60764=>16098,
-13946=>16099,
-60765=>16099,
-17897=>16100,
-60766=>16100,
-132238=>16101,
-60767=>16101,
-30272=>16102,
-60768=>16102,
-23280=>16103,
-60769=>16103,
-134838=>16104,
-60770=>16104,
-30842=>16105,
-60771=>16105,
-18358=>16106,
-163630=>16106,
-60772=>16106,
-22695=>16107,
-60773=>16107,
-16575=>16108,
-60774=>16108,
-22140=>16109,
-60775=>16109,
-39819=>16110,
-60776=>16110,
-23924=>16111,
-60777=>16111,
-30292=>16112,
-60778=>16112,
-173108=>16113,
-60779=>16113,
-40581=>16114,
-60780=>16114,
-19681=>16115,
-60781=>16115,
-14331=>16117,
-60783=>16117,
-24857=>16118,
-60784=>16118,
-148466=>16119,
-60786=>16119,
-60787=>16120,
-22109=>16121,
-60788=>16121,
-171526=>16122,
-60792=>16122,
-21044=>16123,
-60793=>16123,
-13741=>16124,
-60795=>16124,
-40316=>16126,
-60797=>16126,
-31830=>16127,
-60798=>16127,
-39737=>16128,
-60799=>16128,
-22494=>16129,
-60800=>16129,
-23635=>16130,
-60802=>16130,
-25811=>16131,
-60803=>16131,
-169168=>16132,
-60804=>16132,
-156469=>16133,
-60805=>16133,
-34477=>16134,
-60807=>16134,
-134440=>16135,
-60808=>16135,
-134513=>16136,
-60811=>16136,
-60812=>16137,
-20990=>16138,
-60813=>16138,
-139023=>16139,
-60814=>16139,
-23950=>16140,
-60815=>16140,
-38659=>16141,
-60816=>16141,
-138705=>16142,
-60817=>16142,
-40577=>16143,
-60818=>16143,
-36940=>16144,
-60819=>16144,
-31519=>16145,
-60820=>16145,
-39682=>16146,
-60821=>16146,
-23761=>16147,
-60822=>16147,
-31651=>16148,
-60823=>16148,
-25192=>16149,
-60824=>16149,
-25397=>16150,
-60825=>16150,
-39679=>16151,
-60826=>16151,
-31695=>16152,
-60827=>16152,
-39722=>16153,
-60828=>16153,
-31870=>16154,
-60829=>16154,
-31810=>16156,
-60831=>16156,
-31878=>16157,
-60832=>16157,
-39957=>16158,
-60833=>16158,
-31740=>16159,
-60834=>16159,
-39689=>16160,
-60835=>16160,
-39982=>16162,
-40794=>16163,
-60839=>16163,
-21875=>16164,
-60840=>16164,
-23491=>16165,
-60841=>16165,
-20477=>16166,
-60842=>16166,
-40600=>16167,
-60843=>16167,
-20466=>16168,
-60844=>16168,
-21088=>16169,
-60845=>16169,
-21201=>16170,
-60847=>16170,
-22375=>16171,
-60848=>16171,
-20566=>16172,
-60849=>16172,
-22967=>16173,
-60850=>16173,
-24082=>16174,
-60851=>16174,
-38856=>16175,
-60852=>16175,
-40363=>16176,
-60853=>16176,
-36700=>16177,
-60854=>16177,
-21609=>16178,
-60855=>16178,
-38836=>16179,
-60856=>16179,
-39232=>16180,
-60857=>16180,
-38842=>16181,
-60858=>16181,
-21292=>16182,
-60859=>16182,
-24880=>16183,
-60860=>16183,
-26924=>16184,
-60861=>16184,
-21466=>16185,
-60862=>16185,
-39946=>16186,
-60863=>16186,
-40194=>16187,
-60864=>16187,
-19515=>16188,
-60865=>16188,
-38465=>16189,
-60866=>16189,
-27008=>16190,
-60867=>16190,
-20646=>16191,
-60868=>16191,
-30022=>16192,
-60869=>16192,
-137069=>16193,
-60870=>16193,
-39386=>16194,
-60871=>16194,
-21107=>16195,
-60872=>16195,
-60873=>16196,
-37209=>16197,
-60874=>16197,
-38529=>16198,
-60875=>16198,
-37212=>16199,
-60876=>16199,
-60877=>16200,
-37201=>16201,
-60878=>16201,
-167575=>16202,
-60879=>16202,
-25471=>16203,
-60880=>16203,
-27338=>16204,
-60882=>16204,
-22033=>16205,
-60883=>16205,
-37262=>16206,
-60884=>16206,
-30074=>16207,
-60885=>16207,
-25221=>16208,
-60886=>16208,
-29519=>16209,
-60888=>16209,
-31856=>16210,
-60889=>16210,
-154657=>16211,
-60890=>16211,
-60892=>16212,
-30422=>16213,
-60894=>16213,
-39837=>16214,
-60895=>16214,
-20010=>16215,
-60896=>16215,
-134356=>16216,
-60897=>16216,
-33726=>16217,
-60898=>16217,
-34882=>16218,
-60899=>16218,
-60900=>16219,
-23626=>16220,
-60901=>16220,
-27072=>16221,
-60902=>16221,
-21023=>16224,
-60905=>16224,
-24053=>16225,
-60906=>16225,
-20174=>16226,
-60907=>16226,
-27697=>16227,
-60908=>16227,
-131570=>16228,
-60909=>16228,
-20281=>16229,
-60910=>16229,
-21660=>16230,
-60911=>16230,
-21146=>16232,
-60913=>16232,
-36226=>16233,
-60914=>16233,
-13822=>16234,
-60915=>16234,
-13811=>16236,
-60917=>16236,
-60918=>16237,
-27474=>16238,
-60919=>16238,
-37244=>16239,
-60920=>16239,
-40869=>16240,
-60921=>16240,
-39831=>16241,
-60922=>16241,
-38958=>16242,
-60923=>16242,
-39092=>16243,
-60924=>16243,
-39610=>16244,
-60925=>16244,
-40616=>16245,
-60926=>16245,
-40580=>16246,
-60927=>16246,
-31508=>16247,
-60929=>16247,
-60930=>16248,
-27642=>16249,
-60931=>16249,
-34840=>16250,
-60932=>16250,
-32632=>16251,
-60933=>16251,
-60934=>16252,
-22048=>16253,
-60935=>16253,
-173642=>16254,
-60936=>16254,
-36471=>16255,
-60937=>16255,
-40787=>16256,
-60938=>16256,
-60939=>16257,
-36308=>16258,
-60940=>16258,
-36431=>16259,
-60941=>16259,
-40476=>16260,
-60942=>16260,
-36353=>16261,
-60943=>16261,
-25218=>16262,
-60944=>16262,
-164733=>16263,
-60945=>16263,
-36392=>16264,
-60946=>16264,
-36469=>16265,
-60947=>16265,
-31443=>16266,
-60948=>16266,
-31294=>16267,
-60950=>16267,
-30936=>16268,
-60951=>16268,
-27882=>16269,
-60952=>16269,
-35431=>16270,
-60953=>16270,
-30215=>16271,
-60954=>16271,
-40742=>16272,
-60956=>16272,
-27854=>16273,
-60957=>16273,
-34774=>16274,
-60958=>16274,
-30147=>16275,
-60959=>16275,
-172722=>16276,
-60960=>16276,
-30803=>16277,
-60961=>16277,
-36108=>16278,
-60963=>16278,
-29410=>16279,
-60964=>16279,
-29553=>16280,
-60965=>16280,
-35629=>16281,
-60966=>16281,
-29442=>16282,
-60967=>16282,
-29937=>16283,
-60968=>16283,
-36075=>16284,
-60969=>16284,
-150203=>16285,
-60970=>16285,
-34351=>16286,
-60971=>16286,
-24506=>16287,
-60972=>16287,
-34976=>16288,
-60973=>16288,
-17591=>16289,
-60974=>16289,
-60975=>16290,
-159237=>16291,
-60977=>16291,
-60978=>16292,
-35454=>16293,
-60979=>16293,
-140571=>16294,
-60980=>16294,
-60981=>16295,
-24829=>16296,
-60982=>16296,
-30311=>16297,
-60983=>16297,
-39639=>16298,
-60984=>16298,
-40260=>16299,
-60985=>16299,
-37742=>16300,
-58859=>16300,
-60986=>16300,
-39823=>16301,
-60987=>16301,
-34805=>16302,
-60988=>16302,
-60989=>16303,
-36087=>16305,
-60991=>16305,
-29484=>16306,
-60992=>16306,
-38689=>16307,
-60993=>16307,
-39856=>16308,
-60994=>16308,
-13782=>16309,
-60995=>16309,
-29362=>16310,
-60996=>16310,
-19463=>16311,
-60997=>16311,
-31825=>16312,
-60998=>16312,
-39242=>16313,
-60999=>16313,
-24921=>16314,
-61001=>16314,
-19460=>16315,
-61002=>16315,
-40598=>16316,
-61003=>16316,
-24957=>16317,
-61004=>16317,
-61005=>16318,
-22367=>16319,
-61006=>16319,
-24943=>16320,
-61007=>16320,
-25254=>16321,
-61008=>16321,
-25145=>16322,
-61009=>16322,
-14940=>16324,
-61011=>16324,
-25058=>16325,
-61012=>16325,
-21418=>16326,
-61013=>16326,
-25444=>16327,
-61015=>16327,
-26626=>16328,
-61016=>16328,
-13778=>16329,
-61017=>16329,
-23895=>16330,
-61018=>16330,
-36826=>16331,
-61020=>16331,
-167481=>16332,
-61021=>16332,
-61022=>16333,
-20697=>16334,
-61023=>16334,
-30982=>16335,
-61025=>16335,
-21298=>16336,
-61026=>16336,
-38456=>16337,
-61027=>16337,
-134971=>16338,
-61028=>16338,
-16485=>16339,
-61029=>16339,
-61030=>16340,
-30718=>16341,
-61031=>16341,
-61032=>16342,
-31938=>16343,
-61033=>16343,
-155418=>16344,
-61034=>16344,
-31962=>16345,
-61035=>16345,
-31277=>16346,
-61036=>16346,
-32870=>16347,
-61037=>16347,
-32867=>16348,
-61038=>16348,
-32077=>16349,
-61039=>16349,
-29957=>16350,
-61040=>16350,
-29938=>16351,
-61041=>16351,
-35220=>16352,
-61042=>16352,
-33306=>16353,
-61043=>16353,
-26380=>16354,
-61044=>16354,
-32866=>16355,
-61045=>16355,
-160902=>16356,
-61046=>16356,
-32859=>16357,
-61047=>16357,
-29936=>16358,
-61048=>16358,
-33027=>16359,
-61049=>16359,
-30500=>16360,
-61050=>16360,
-35209=>16361,
-61051=>16361,
-157644=>16362,
-61052=>16362,
-30035=>16363,
-61053=>16363,
-34729=>16364,
-61055=>16364,
-34766=>16365,
-61056=>16365,
-33224=>16366,
-61057=>16366,
-34700=>16367,
-61058=>16367,
-35401=>16368,
-61059=>16368,
-36013=>16369,
-61060=>16369,
-35651=>16370,
-61061=>16370,
-30507=>16371,
-61062=>16371,
-29944=>16372,
-61063=>16372,
-34010=>16373,
-61064=>16373,
-27058=>16374,
-61066=>16374,
-36262=>16375,
-61067=>16375,
-61068=>16376,
-35241=>16377,
-58392=>16377,
-61069=>16377,
-28089=>16379,
-61071=>16379,
-34753=>16380,
-61072=>16380,
-147473=>16381,
-61073=>16381,
-29927=>16382,
-61074=>16382,
-15835=>16383,
-61075=>16383,
-29046=>16384,
-61076=>16384,
-24740=>16385,
-57702=>16385,
-61077=>16385,
-24988=>16386,
-61078=>16386,
-15569=>16387,
-61079=>16387,
-24695=>16389,
-61081=>16389,
-61082=>16390,
-32625=>16391,
-61083=>16391,
-194850=>16392,
-24809=>16393,
-61086=>16393,
-19326=>16394,
-61087=>16394,
-132423=>16395,
-57344=>16395,
-37595=>16396,
-57345=>16396,
-132575=>16397,
-57346=>16397,
-147397=>16398,
-57347=>16398,
-34124=>16399,
-57348=>16399,
-17077=>16400,
-57349=>16400,
-29679=>16401,
-57350=>16401,
-20917=>16402,
-57351=>16402,
-13897=>16403,
-57352=>16403,
-149826=>16404,
-57353=>16404,
-166372=>16405,
-57354=>16405,
-37700=>16406,
-57355=>16406,
-137691=>16407,
-57356=>16407,
-33518=>16408,
-57357=>16408,
-146632=>16409,
-57358=>16409,
-30780=>16410,
-57359=>16410,
-26436=>16411,
-57360=>16411,
-25311=>16412,
-57361=>16412,
-149811=>16413,
-57362=>16413,
-166314=>16414,
-57363=>16414,
-131744=>16415,
-57364=>16415,
-158643=>16416,
-57365=>16416,
-135941=>16417,
-57366=>16417,
-20395=>16418,
-57367=>16418,
-140525=>16419,
-57368=>16419,
-20488=>16420,
-57369=>16420,
-159017=>16421,
-57370=>16421,
-162436=>16422,
-57371=>16422,
-144896=>16423,
-57372=>16423,
-150193=>16424,
-57373=>16424,
-140563=>16425,
-57374=>16425,
-131966=>16427,
-57376=>16427,
-24484=>16428,
-57377=>16428,
-131968=>16429,
-57378=>16429,
-131911=>16430,
-57379=>16430,
-28379=>16431,
-57380=>16431,
-132127=>16432,
-57381=>16432,
-20702=>16433,
-20737=>16434,
-57383=>16434,
-13434=>16435,
-57384=>16435,
-20750=>16436,
-57385=>16436,
-39020=>16437,
-57386=>16437,
-14147=>16438,
-57387=>16438,
-33814=>16439,
-57388=>16439,
-149924=>16440,
-57389=>16440,
-132231=>16441,
-57390=>16441,
-20832=>16442,
-57391=>16442,
-144308=>16443,
-57392=>16443,
-20842=>16444,
-57393=>16444,
-134143=>16445,
-57394=>16445,
-139516=>16446,
-57395=>16446,
-131813=>16447,
-57396=>16447,
-140592=>16448,
-57397=>16448,
-132494=>16449,
-57398=>16449,
-143923=>16450,
-57399=>16450,
-137603=>16451,
-57400=>16451,
-23426=>16452,
-57401=>16452,
-34685=>16453,
-57402=>16453,
-132531=>16454,
-57403=>16454,
-146585=>16455,
-57404=>16455,
-20914=>16456,
-57405=>16456,
-20920=>16457,
-57406=>16457,
-40244=>16458,
-57407=>16458,
-20937=>16459,
-57408=>16459,
-20943=>16460,
-57409=>16460,
-20945=>16461,
-57410=>16461,
-15580=>16462,
-57411=>16462,
-20947=>16463,
-57412=>16463,
-150182=>16464,
-57413=>16464,
-20915=>16465,
-57414=>16465,
-20973=>16468,
-57417=>16468,
-33741=>16469,
-57418=>16469,
-26942=>16470,
-57419=>16470,
-145197=>16471,
-57420=>16471,
-24443=>16472,
-57421=>16472,
-21003=>16473,
-57422=>16473,
-21030=>16474,
-57423=>16474,
-21052=>16475,
-57424=>16475,
-21173=>16476,
-57425=>16476,
-21079=>16477,
-57426=>16477,
-21140=>16478,
-57427=>16478,
-21177=>16479,
-57428=>16479,
-21189=>16480,
-57429=>16480,
-31765=>16481,
-57430=>16481,
-34114=>16482,
-57431=>16482,
-21216=>16483,
-57432=>16483,
-34317=>16484,
-57433=>16484,
-158483=>16485,
-57434=>16485,
-194601=>16486,
-166622=>16487,
-57436=>16487,
-21833=>16488,
-57437=>16488,
-28377=>16489,
-57438=>16489,
-147328=>16490,
-57439=>16490,
-133460=>16491,
-57440=>16491,
-147436=>16492,
-57441=>16492,
-21299=>16493,
-57442=>16493,
-134114=>16495,
-57444=>16495,
-27851=>16496,
-57445=>16496,
-136998=>16497,
-57446=>16497,
-26651=>16498,
-57447=>16498,
-29653=>16499,
-57448=>16499,
-24650=>16500,
-57449=>16500,
-16042=>16501,
-57450=>16501,
-14540=>16502,
-57451=>16502,
-136936=>16503,
-57452=>16503,
-29149=>16504,
-57453=>16504,
-17570=>16505,
-57454=>16505,
-21357=>16506,
-57455=>16506,
-21364=>16507,
-57456=>16507,
-165547=>16508,
-57457=>16508,
-21374=>16509,
-57458=>16509,
-194610=>16510,
-136598=>16511,
-57460=>16511,
-136723=>16512,
-57461=>16512,
-30694=>16513,
-57462=>16513,
-21395=>16514,
-57463=>16514,
-166555=>16515,
-57464=>16515,
-21408=>16516,
-57465=>16516,
-21419=>16517,
-57466=>16517,
-21422=>16518,
-57467=>16518,
-29607=>16519,
-57468=>16519,
-153458=>16520,
-57469=>16520,
-16217=>16521,
-57470=>16521,
-29596=>16522,
-57471=>16522,
-21441=>16523,
-57472=>16523,
-21445=>16524,
-57473=>16524,
-27721=>16525,
-57474=>16525,
-20041=>16526,
-57475=>16526,
-22526=>16527,
-57476=>16527,
-21465=>16528,
-57477=>16528,
-15019=>16529,
-57478=>16529,
-134031=>16530,
-57479=>16530,
-21472=>16531,
-57480=>16531,
-147435=>16532,
-57481=>16532,
-142755=>16533,
-57482=>16533,
-21494=>16534,
-57483=>16534,
-134263=>16535,
-57484=>16535,
-21523=>16536,
-57485=>16536,
-28793=>16537,
-57486=>16537,
-21803=>16538,
-57487=>16538,
-26199=>16539,
-57488=>16539,
-27995=>16540,
-57489=>16540,
-21613=>16541,
-57490=>16541,
-158547=>16542,
-57491=>16542,
-134516=>16543,
-57492=>16543,
-21853=>16544,
-57493=>16544,
-21647=>16545,
-57494=>16545,
-21668=>16546,
-57495=>16546,
-18342=>16547,
-57496=>16547,
-136973=>16548,
-57497=>16548,
-134877=>16549,
-57498=>16549,
-15796=>16550,
-57499=>16550,
-134477=>16551,
-57500=>16551,
-166332=>16552,
-57501=>16552,
-140952=>16553,
-57502=>16553,
-21831=>16554,
-57503=>16554,
-19693=>16555,
-57504=>16555,
-21551=>16556,
-57505=>16556,
-29719=>16557,
-57506=>16557,
-21894=>16558,
-57507=>16558,
-21929=>16559,
-57508=>16559,
-137431=>16561,
-57510=>16561,
-147514=>16562,
-57511=>16562,
-17746=>16563,
-57512=>16563,
-148533=>16564,
-57513=>16564,
-26291=>16565,
-57514=>16565,
-135348=>16566,
-57515=>16566,
-22071=>16567,
-57516=>16567,
-26317=>16568,
-57517=>16568,
-144010=>16569,
-57518=>16569,
-26276=>16570,
-57519=>16570,
-22093=>16572,
-57521=>16572,
-22095=>16573,
-57522=>16573,
-30961=>16574,
-57523=>16574,
-22257=>16575,
-57524=>16575,
-38791=>16576,
-57525=>16576,
-21502=>16577,
-57526=>16577,
-22272=>16578,
-57527=>16578,
-22255=>16579,
-57528=>16579,
-22253=>16580,
-57529=>16580,
-166758=>16581,
-57530=>16581,
-13859=>16582,
-57531=>16582,
-135759=>16583,
-57532=>16583,
-22342=>16584,
-57533=>16584,
-147877=>16585,
-57534=>16585,
-27758=>16586,
-57535=>16586,
-28811=>16587,
-57536=>16587,
-22338=>16588,
-57537=>16588,
-14001=>16589,
-57538=>16589,
-158846=>16590,
-57539=>16590,
-22502=>16591,
-57540=>16591,
-136214=>16592,
-57541=>16592,
-22531=>16593,
-57542=>16593,
-136276=>16594,
-57543=>16594,
-148323=>16595,
-57544=>16595,
-22566=>16596,
-57545=>16596,
-150517=>16597,
-57546=>16597,
-22559=>16598,
-22698=>16599,
-57548=>16599,
-13665=>16600,
-57549=>16600,
-22752=>16601,
-57550=>16601,
-22748=>16602,
-57551=>16602,
-135740=>16603,
-57552=>16603,
-22779=>16604,
-57553=>16604,
-23551=>16605,
-57554=>16605,
-22339=>16606,
-57555=>16606,
-172368=>16607,
-57556=>16607,
-148088=>16608,
-57557=>16608,
-37843=>16609,
-57558=>16609,
-13729=>16610,
-57559=>16610,
-22815=>16611,
-57560=>16611,
-26790=>16612,
-57561=>16612,
-14019=>16613,
-57562=>16613,
-28249=>16614,
-57563=>16614,
-136766=>16615,
-57564=>16615,
-23076=>16616,
-57565=>16616,
-136850=>16618,
-57567=>16618,
-34053=>16619,
-57568=>16619,
-22985=>16620,
-57569=>16620,
-134478=>16621,
-57570=>16621,
-158849=>16622,
-57571=>16622,
-159018=>16623,
-57572=>16623,
-137180=>16624,
-57573=>16624,
-23001=>16625,
-57574=>16625,
-137211=>16626,
-57575=>16626,
-137138=>16627,
-57576=>16627,
-159142=>16628,
-57577=>16628,
-28017=>16629,
-57578=>16629,
-137256=>16630,
-57579=>16630,
-136917=>16631,
-57580=>16631,
-23033=>16632,
-57581=>16632,
-159301=>16633,
-57582=>16633,
-23211=>16634,
-57583=>16634,
-23139=>16635,
-57584=>16635,
-14054=>16636,
-57585=>16636,
-149929=>16637,
-57586=>16637,
-14088=>16639,
-57588=>16639,
-23190=>16640,
-57589=>16640,
-29797=>16641,
-57590=>16641,
-23251=>16642,
-57591=>16642,
-159649=>16643,
-57592=>16643,
-140628=>16644,
-57593=>16644,
-137489=>16645,
-57595=>16645,
-14130=>16646,
-57596=>16646,
-136888=>16647,
-57597=>16647,
-24195=>16648,
-57598=>16648,
-21200=>16649,
-57599=>16649,
-23414=>16650,
-57600=>16650,
-25992=>16651,
-57601=>16651,
-23420=>16652,
-57602=>16652,
-162318=>16653,
-57603=>16653,
-16388=>16654,
-57604=>16654,
-18525=>16655,
-57605=>16655,
-131588=>16656,
-57606=>16656,
-23509=>16657,
-57607=>16657,
-137780=>16658,
-57609=>16658,
-154060=>16659,
-57610=>16659,
-132517=>16660,
-57611=>16660,
-23539=>16661,
-57612=>16661,
-23453=>16662,
-57613=>16662,
-19728=>16663,
-57614=>16663,
-23557=>16664,
-57615=>16664,
-138052=>16665,
-57616=>16665,
-23571=>16666,
-57617=>16666,
-29646=>16667,
-57618=>16667,
-23572=>16668,
-57619=>16668,
-138405=>16669,
-57620=>16669,
-158504=>16670,
-57621=>16670,
-23625=>16671,
-57622=>16671,
-18653=>16672,
-57623=>16672,
-23685=>16673,
-57624=>16673,
-23785=>16674,
-57625=>16674,
-23791=>16675,
-57626=>16675,
-23947=>16676,
-57627=>16676,
-138745=>16677,
-57628=>16677,
-138807=>16678,
-57629=>16678,
-23824=>16679,
-57630=>16679,
-23832=>16680,
-57631=>16680,
-23878=>16681,
-57632=>16681,
-138916=>16682,
-57633=>16682,
-23738=>16683,
-57634=>16683,
-24023=>16684,
-57635=>16684,
-33532=>16685,
-57636=>16685,
-14381=>16686,
-57637=>16686,
-149761=>16687,
-57638=>16687,
-139337=>16688,
-57639=>16688,
-139635=>16689,
-57640=>16689,
-33415=>16690,
-57641=>16690,
-14390=>16691,
-57642=>16691,
-15298=>16692,
-57643=>16692,
-24110=>16693,
-57644=>16693,
-27274=>16694,
-57645=>16694,
-57647=>16696,
-148668=>16697,
-57648=>16697,
-134355=>16698,
-57649=>16698,
-21414=>16699,
-57650=>16699,
-20151=>16700,
-57651=>16700,
-21416=>16702,
-57653=>16702,
-137073=>16703,
-57654=>16703,
-24073=>16704,
-57655=>16704,
-57656=>16705,
-164994=>16706,
-57657=>16706,
-24313=>16707,
-57658=>16707,
-24315=>16708,
-57659=>16708,
-14496=>16709,
-57660=>16709,
-24316=>16710,
-57661=>16710,
-26686=>16711,
-57662=>16711,
-37915=>16712,
-57663=>16712,
-24333=>16713,
-57664=>16713,
-131521=>16714,
-57665=>16714,
-194708=>16715,
-57666=>16715,
-15070=>16716,
-57667=>16716,
-135994=>16717,
-57669=>16717,
-24378=>16718,
-57670=>16718,
-157832=>16719,
-57671=>16719,
-140240=>16720,
-57672=>16720,
-140401=>16721,
-57674=>16721,
-24419=>16722,
-57675=>16722,
-159342=>16723,
-57677=>16723,
-24434=>16724,
-57678=>16724,
-37696=>16725,
-57679=>16725,
-166454=>16726,
-57680=>16726,
-24487=>16727,
-57681=>16727,
-23990=>16728,
-57682=>16728,
-15711=>16729,
-57683=>16729,
-152144=>16730,
-57684=>16730,
-139114=>16731,
-57685=>16731,
-159992=>16732,
-57686=>16732,
-140904=>16733,
-57687=>16733,
-37334=>16734,
-57688=>16734,
-131742=>16735,
-57689=>16735,
-166441=>16736,
-57690=>16736,
-24625=>16737,
-57691=>16737,
-26245=>16738,
-57692=>16738,
-14691=>16739,
-57694=>16739,
-15815=>16740,
-57695=>16740,
-13881=>16741,
-57696=>16741,
-22416=>16742,
-57697=>16742,
-141236=>16743,
-57698=>16743,
-31089=>16744,
-57699=>16744,
-15936=>16745,
-57700=>16745,
-24734=>16746,
-57701=>16746,
-24810=>16748,
-149890=>16749,
-57704=>16749,
-149903=>16750,
-57705=>16750,
-162387=>16751,
-57706=>16751,
-29860=>16752,
-57707=>16752,
-20705=>16753,
-57708=>16753,
-23200=>16754,
-57709=>16754,
-24932=>16755,
-57710=>16755,
-24898=>16756,
-57712=>16756,
-194726=>16757,
-57713=>16757,
-159442=>16758,
-57714=>16758,
-24961=>16759,
-57715=>16759,
-20980=>16760,
-57716=>16760,
-132694=>16761,
-57717=>16761,
-24967=>16762,
-57718=>16762,
-23466=>16763,
-57719=>16763,
-147383=>16764,
-57720=>16764,
-141407=>16765,
-57721=>16765,
-25043=>16766,
-57722=>16766,
-166813=>16767,
-57723=>16767,
-170333=>16768,
-57724=>16768,
-25040=>16769,
-57725=>16769,
-14642=>16770,
-57726=>16770,
-141696=>16771,
-57727=>16771,
-141505=>16772,
-57728=>16772,
-24611=>16773,
-57729=>16773,
-24924=>16774,
-57730=>16774,
-25886=>16775,
-57731=>16775,
-25483=>16776,
-57732=>16776,
-131352=>16777,
-57733=>16777,
-25285=>16778,
-57734=>16778,
-137072=>16779,
-57735=>16779,
-25301=>16780,
-57736=>16780,
-142861=>16781,
-57737=>16781,
-25452=>16782,
-57738=>16782,
-149983=>16783,
-57739=>16783,
-14871=>16784,
-57740=>16784,
-25656=>16785,
-57741=>16785,
-25592=>16786,
-57742=>16786,
-136078=>16787,
-57743=>16787,
-137212=>16788,
-57744=>16788,
-28554=>16789,
-57746=>16789,
-142902=>16790,
-57747=>16790,
-153373=>16792,
-57750=>16792,
-25825=>16793,
-57751=>16793,
-25829=>16794,
-57752=>16794,
-38011=>16795,
-57753=>16795,
-14950=>16796,
-57754=>16796,
-25658=>16797,
-57755=>16797,
-14935=>16798,
-57756=>16798,
-25933=>16799,
-57757=>16799,
-28438=>16800,
-57758=>16800,
-150056=>16801,
-57759=>16801,
-150051=>16802,
-57760=>16802,
-25989=>16803,
-57761=>16803,
-25965=>16804,
-57762=>16804,
-25951=>16805,
-57763=>16805,
-26037=>16807,
-57765=>16807,
-149824=>16808,
-57766=>16808,
-19255=>16809,
-57767=>16809,
-26065=>16810,
-57768=>16810,
-16600=>16811,
-57769=>16811,
-137257=>16812,
-57770=>16812,
-57771=>16813,
-26083=>16814,
-57772=>16814,
-24543=>16815,
-57773=>16815,
-144384=>16816,
-57774=>16816,
-26136=>16817,
-57775=>16817,
-57776=>16818,
-143863=>16818,
-57777=>16819,
-143864=>16819,
-26180=>16820,
-57778=>16820,
-57779=>16821,
-143780=>16821,
-57780=>16822,
-143781=>16822,
-26187=>16823,
-57781=>16823,
-134773=>16824,
-57782=>16824,
-26215=>16825,
-57783=>16825,
-152038=>16826,
-57784=>16826,
-26227=>16827,
-57785=>16827,
-64018=>16828,
-143921=>16829,
-57788=>16829,
-165364=>16830,
-57789=>16830,
-143816=>16831,
-57790=>16831,
-152339=>16832,
-57791=>16832,
-30661=>16833,
-57792=>16833,
-141559=>16834,
-57793=>16834,
-39332=>16835,
-57794=>16835,
-26370=>16836,
-57795=>16836,
-148380=>16837,
-57796=>16837,
-150049=>16838,
-57797=>16838,
-27130=>16839,
-57799=>16839,
-145346=>16840,
-57800=>16840,
-194779=>16841,
-26471=>16842,
-57802=>16842,
-26466=>16843,
-57803=>16843,
-147917=>16844,
-57804=>16844,
-168173=>16845,
-57805=>16845,
-26583=>16846,
-57806=>16846,
-17641=>16847,
-57807=>16847,
-26658=>16848,
-57808=>16848,
-28240=>16849,
-57809=>16849,
-37436=>16850,
-57810=>16850,
-26625=>16851,
-57811=>16851,
-144358=>16852,
-57812=>16852,
-159136=>16853,
-57813=>16853,
-26717=>16854,
-57814=>16854,
-144495=>16855,
-57815=>16855,
-27105=>16856,
-57816=>16856,
-27147=>16857,
-57817=>16857,
-166623=>16858,
-57818=>16858,
-26995=>16859,
-57819=>16859,
-26819=>16860,
-57820=>16860,
-144845=>16861,
-57821=>16861,
-26881=>16862,
-57822=>16862,
-26880=>16863,
-57823=>16863,
-14849=>16864,
-57825=>16864,
-144956=>16865,
-57826=>16865,
-15232=>16866,
-57827=>16866,
-26540=>16867,
-57828=>16867,
-26977=>16868,
-57829=>16868,
-166474=>16869,
-57830=>16869,
-17148=>16870,
-57831=>16870,
-26934=>16871,
-57832=>16871,
-27032=>16872,
-57833=>16872,
-15265=>16873,
-57834=>16873,
-132041=>16874,
-57835=>16874,
-33635=>16875,
-57836=>16875,
-20624=>16876,
-57837=>16876,
-27129=>16877,
-57838=>16877,
-144985=>16878,
-57839=>16878,
-139562=>16879,
-57840=>16879,
-27205=>16880,
-57841=>16880,
-145155=>16881,
-57842=>16881,
-27293=>16882,
-57843=>16882,
-15347=>16883,
-57844=>16883,
-26545=>16884,
-57845=>16884,
-27336=>16885,
-57846=>16885,
-168348=>16886,
-57847=>16886,
-15373=>16887,
-57848=>16887,
-27421=>16888,
-57849=>16888,
-133411=>16889,
-57850=>16889,
-24798=>16890,
-60308=>16890,
-57851=>16890,
-27445=>16891,
-57852=>16891,
-27508=>16892,
-57853=>16892,
-141261=>16893,
-57854=>16893,
-28341=>16894,
-57855=>16894,
-57856=>16895,
-146139=>16895,
-137560=>16897,
-57858=>16897,
-14144=>16898,
-57859=>16898,
-21537=>16899,
-57860=>16899,
-146266=>16900,
-57861=>16900,
-27617=>16901,
-57862=>16901,
-147196=>16902,
-57863=>16902,
-27612=>16903,
-57864=>16903,
-27703=>16904,
-57865=>16904,
-140427=>16905,
-57866=>16905,
-149745=>16906,
-57867=>16906,
-158545=>16907,
-57868=>16907,
-27738=>16908,
-57869=>16908,
-33318=>16909,
-57870=>16909,
-27769=>16910,
-57871=>16910,
-146876=>16911,
-57872=>16911,
-17605=>16912,
-57873=>16912,
-146877=>16913,
-57874=>16913,
-147876=>16914,
-57875=>16914,
-149772=>16915,
-57876=>16915,
-149760=>16916,
-57877=>16916,
-146633=>16917,
-57878=>16917,
-14053=>16918,
-57879=>16918,
-15595=>16919,
-57880=>16919,
-134450=>16920,
-57881=>16920,
-39811=>16921,
-57882=>16921,
-143865=>16922,
-57883=>16922,
-140433=>16923,
-57884=>16923,
-32655=>16924,
-57885=>16924,
-26679=>16925,
-57886=>16925,
-159013=>16926,
-57887=>16926,
-159137=>16927,
-57888=>16927,
-159211=>16928,
-57889=>16928,
-28054=>16929,
-57890=>16929,
-27996=>16930,
-57891=>16930,
-28284=>16931,
-57892=>16931,
-28420=>16932,
-57893=>16932,
-149887=>16933,
-57894=>16933,
-147589=>16934,
-57895=>16934,
-159346=>16935,
-57896=>16935,
-34099=>16936,
-57897=>16936,
-159604=>16937,
-57898=>16937,
-20935=>16938,
-57899=>16938,
-33838=>16941,
-57902=>16941,
-166689=>16942,
-57903=>16942,
-194824=>16943,
-146991=>16944,
-57905=>16944,
-29779=>16945,
-57906=>16945,
-147330=>16946,
-57907=>16946,
-31180=>16947,
-57908=>16947,
-28239=>16948,
-57909=>16948,
-23185=>16949,
-57910=>16949,
-143435=>16950,
-57911=>16950,
-28664=>16951,
-57912=>16951,
-14093=>16952,
-57913=>16952,
-28573=>16953,
-57914=>16953,
-146992=>16954,
-57915=>16954,
-28410=>16955,
-57916=>16955,
-136343=>16956,
-57917=>16956,
-147517=>16957,
-57918=>16957,
-17749=>16958,
-57919=>16958,
-37872=>16959,
-57920=>16959,
-28484=>16960,
-57921=>16960,
-28508=>16961,
-57922=>16961,
-15694=>16962,
-57923=>16962,
-28532=>16963,
-57924=>16963,
-168304=>16964,
-57925=>16964,
-15675=>16965,
-57926=>16965,
-28575=>16966,
-57927=>16966,
-147780=>16967,
-57928=>16967,
-28627=>16968,
-57929=>16968,
-147601=>16969,
-57930=>16969,
-147797=>16970,
-57931=>16970,
-147513=>16971,
-57932=>16971,
-147440=>16972,
-57933=>16972,
-147380=>16973,
-57934=>16973,
-147775=>16974,
-57935=>16974,
-20959=>16975,
-57936=>16975,
-57937=>16976,
-147798=>16976,
-57938=>16977,
-147799=>16977,
-147776=>16978,
-57939=>16978,
-156125=>16979,
-57940=>16979,
-28747=>16980,
-57941=>16980,
-28798=>16981,
-57942=>16981,
-28839=>16982,
-57943=>16982,
-28876=>16984,
-57945=>16984,
-28885=>16985,
-57946=>16985,
-28886=>16986,
-57947=>16986,
-28895=>16987,
-57948=>16987,
-16644=>16988,
-57949=>16988,
-15848=>16989,
-57950=>16989,
-29108=>16990,
-57951=>16990,
-29078=>16991,
-57952=>16991,
-148087=>16992,
-57953=>16992,
-28971=>16993,
-57954=>16993,
-28997=>16994,
-57955=>16994,
-23176=>16995,
-57956=>16995,
-29002=>16996,
-57957=>16996,
-64072=>16997,
-148325=>16998,
-57960=>16998,
-29007=>16999,
-57961=>16999,
-37730=>17000,
-57962=>17000,
-148161=>17001,
-57963=>17001,
-28972=>17002,
-57964=>17002,
-148570=>17003,
-57965=>17003,
-150055=>17004,
-57966=>17004,
-150050=>17005,
-57967=>17005,
-29114=>17006,
-57968=>17006,
-166888=>17007,
-57969=>17007,
-28861=>17008,
-57970=>17008,
-29198=>17009,
-57971=>17009,
-37954=>17010,
-57972=>17010,
-29205=>17011,
-57973=>17011,
-22801=>17012,
-57974=>17012,
-37955=>17013,
-57975=>17013,
-29220=>17014,
-57976=>17014,
-37697=>17015,
-57977=>17015,
-153093=>17016,
-57978=>17016,
-29230=>17017,
-57979=>17017,
-29248=>17018,
-57980=>17018,
-149876=>17019,
-57981=>17019,
-26813=>17020,
-57982=>17020,
-29269=>17021,
-57983=>17021,
-29271=>17022,
-57984=>17022,
-15957=>17023,
-57985=>17023,
-143428=>17024,
-57986=>17024,
-26637=>17025,
-57987=>17025,
-28477=>17026,
-57988=>17026,
-29314=>17027,
-57989=>17027,
-29483=>17029,
-57991=>17029,
-149539=>17030,
-57992=>17030,
-165931=>17031,
-57993=>17031,
-18669=>17032,
-57994=>17032,
-165892=>17033,
-57995=>17033,
-29480=>17034,
-57996=>17034,
-29486=>17035,
-57997=>17035,
-29647=>17036,
-57998=>17036,
-29610=>17037,
-57999=>17037,
-134202=>17038,
-58000=>17038,
-158254=>17039,
-58001=>17039,
-29641=>17040,
-58002=>17040,
-29769=>17041,
-58003=>17041,
-147938=>17042,
-58004=>17042,
-136935=>17043,
-58005=>17043,
-150052=>17044,
-58006=>17044,
-26147=>17045,
-58007=>17045,
-14021=>17046,
-58008=>17046,
-149943=>17047,
-58009=>17047,
-149901=>17048,
-58010=>17048,
-150011=>17049,
-58011=>17049,
-29687=>17050,
-58012=>17050,
-29717=>17051,
-58013=>17051,
-26883=>17052,
-58014=>17052,
-150054=>17053,
-58015=>17053,
-29753=>17054,
-58016=>17054,
-16087=>17055,
-58018=>17055,
-194863=>17056,
-141485=>17057,
-58020=>17057,
-29792=>17058,
-58021=>17058,
-167602=>17059,
-58022=>17059,
-29767=>17060,
-58023=>17060,
-29668=>17061,
-58024=>17061,
-29814=>17062,
-58025=>17062,
-33721=>17063,
-58026=>17063,
-29804=>17064,
-58027=>17064,
-29812=>17065,
-58029=>17065,
-37873=>17066,
-58030=>17066,
-27180=>17067,
-58031=>17067,
-29826=>17068,
-58032=>17068,
-18771=>17069,
-58033=>17069,
-150156=>17070,
-58034=>17070,
-147807=>17071,
-58035=>17071,
-150137=>17072,
-58036=>17072,
-166799=>17073,
-58037=>17073,
-23366=>17074,
-58038=>17074,
-166915=>17075,
-58039=>17075,
-137374=>17076,
-58040=>17076,
-29896=>17077,
-58041=>17077,
-137608=>17078,
-58042=>17078,
-29966=>17079,
-58043=>17079,
-29982=>17080,
-58045=>17080,
-167641=>17081,
-58046=>17081,
-137803=>17082,
-58047=>17082,
-23511=>17083,
-58048=>17083,
-167596=>17084,
-58049=>17084,
-37765=>17085,
-58050=>17085,
-30029=>17086,
-58051=>17086,
-30026=>17087,
-58052=>17087,
-30055=>17088,
-58053=>17088,
-30062=>17089,
-58054=>17089,
-151426=>17090,
-58055=>17090,
-16132=>17091,
-58056=>17091,
-150803=>17092,
-58057=>17092,
-30094=>17093,
-58058=>17093,
-29789=>17094,
-58059=>17094,
-30110=>17095,
-58060=>17095,
-30132=>17096,
-58061=>17096,
-30210=>17097,
-58062=>17097,
-30252=>17098,
-58063=>17098,
-30289=>17099,
-58064=>17099,
-30287=>17100,
-58065=>17100,
-30319=>17101,
-58066=>17101,
-58067=>17102,
-156661=>17103,
-58068=>17103,
-30352=>17104,
-58069=>17104,
-33263=>17105,
-58070=>17105,
-14328=>17106,
-58071=>17106,
-157969=>17107,
-58072=>17107,
-157966=>17108,
-58073=>17108,
-30369=>17109,
-58074=>17109,
-30373=>17110,
-58075=>17110,
-30391=>17111,
-58076=>17111,
-30412=>17112,
-58077=>17112,
-159647=>17113,
-58078=>17113,
-33890=>17114,
-58079=>17114,
-151709=>17115,
-58080=>17115,
-151933=>17116,
-58081=>17116,
-138780=>17117,
-58082=>17117,
-30494=>17118,
-58083=>17118,
-30502=>17119,
-58084=>17119,
-30528=>17120,
-58085=>17120,
-25775=>17121,
-58086=>17121,
-152096=>17122,
-58087=>17122,
-30552=>17123,
-58088=>17123,
-144044=>17124,
-58089=>17124,
-30639=>17125,
-58090=>17125,
-166244=>17126,
-58091=>17126,
-166248=>17127,
-58092=>17127,
-136897=>17128,
-58093=>17128,
-30708=>17129,
-58094=>17129,
-26826=>17131,
-58098=>17131,
-30895=>17132,
-58099=>17132,
-30919=>17133,
-58100=>17133,
-30931=>17134,
-58101=>17134,
-38565=>17135,
-58102=>17135,
-31022=>17136,
-58103=>17136,
-153056=>17137,
-58104=>17137,
-30935=>17138,
-58105=>17138,
-31028=>17139,
-58106=>17139,
-30897=>17140,
-58107=>17140,
-161292=>17141,
-58108=>17141,
-36792=>17142,
-58109=>17142,
-34948=>17143,
-58110=>17143,
-140828=>17144,
-58113=>17144,
-31110=>17145,
-58114=>17145,
-35072=>17146,
-58115=>17146,
-26882=>17147,
-58116=>17147,
-31104=>17148,
-58117=>17148,
-153687=>17149,
-58118=>17149,
-31133=>17150,
-58119=>17150,
-162617=>17151,
-58120=>17151,
-31036=>17152,
-58121=>17152,
-31145=>17153,
-58122=>17153,
-28202=>17154,
-58123=>17154,
-160038=>17155,
-58124=>17155,
-16040=>17156,
-58125=>17156,
-31174=>17157,
-58126=>17157,
-168205=>17158,
-58127=>17158,
-31188=>17159,
-58128=>17159,
-21797=>17161,
-62526=>17161,
-134210=>17163,
-62528=>17163,
-134421=>17164,
-62529=>17164,
-151851=>17165,
-62530=>17165,
-21904=>17166,
-62531=>17166,
-142534=>17167,
-62532=>17167,
-14828=>17168,
-62533=>17168,
-131905=>17169,
-62534=>17169,
-36422=>17170,
-62535=>17170,
-150968=>17171,
-62536=>17171,
-169189=>17172,
-62537=>17172,
-164030=>17174,
-62539=>17174,
-30586=>17175,
-62540=>17175,
-142392=>17176,
-62541=>17176,
-14900=>17177,
-62542=>17177,
-18389=>17178,
-62543=>17178,
-164189=>17179,
-62544=>17179,
-158194=>17180,
-62545=>17180,
-151018=>17181,
-62546=>17181,
-25821=>17182,
-62547=>17182,
-134524=>17183,
-62548=>17183,
-135092=>17184,
-62549=>17184,
-134357=>17185,
-62550=>17185,
-25741=>17187,
-62552=>17187,
-36478=>17188,
-62553=>17188,
-134806=>17189,
-62554=>17189,
-135012=>17191,
-62556=>17191,
-142505=>17192,
-62557=>17192,
-164438=>17193,
-62558=>17193,
-148691=>17194,
-62559=>17194,
-134470=>17196,
-62561=>17196,
-170573=>17197,
-62562=>17197,
-164073=>17198,
-62563=>17198,
-18420=>17199,
-62564=>17199,
-151207=>17200,
-62565=>17200,
-142530=>17201,
-62566=>17201,
-39602=>17202,
-62567=>17202,
-14951=>17203,
-62568=>17203,
-169460=>17204,
-62569=>17204,
-16365=>17205,
-62570=>17205,
-13574=>17206,
-62571=>17206,
-152263=>17207,
-62572=>17207,
-169940=>17208,
-62573=>17208,
-142660=>17210,
-62575=>17210,
-40302=>17211,
-62576=>17211,
-38933=>17212,
-62577=>17212,
-17369=>17214,
-62579=>17214,
-25780=>17216,
-62581=>17216,
-21731=>17217,
-62582=>17217,
-62584=>17219,
-142282=>17219,
-14843=>17221,
-62586=>17221,
-157402=>17223,
-62588=>17223,
-157462=>17224,
-62589=>17224,
-162208=>17225,
-62590=>17225,
-25834=>17226,
-62591=>17226,
-151634=>17227,
-62592=>17227,
-134211=>17228,
-62593=>17228,
-36456=>17229,
-62594=>17229,
-166732=>17231,
-62596=>17231,
-132913=>17232,
-62597=>17232,
-18443=>17234,
-62599=>17234,
-131497=>17235,
-62600=>17235,
-16378=>17236,
-62601=>17236,
-22643=>17237,
-62602=>17237,
-142733=>17238,
-62603=>17238,
-148936=>17240,
-62605=>17240,
-132348=>17241,
-62606=>17241,
-155799=>17242,
-62607=>17242,
-134988=>17243,
-62608=>17243,
-21881=>17245,
-62610=>17245,
-17338=>17247,
-62612=>17247,
-19124=>17249,
-62614=>17249,
-141926=>17250,
-62615=>17250,
-135325=>17251,
-62616=>17251,
-33194=>17252,
-62617=>17252,
-39157=>17253,
-62618=>17253,
-134556=>17254,
-62619=>17254,
-25465=>17255,
-62620=>17255,
-14846=>17256,
-62621=>17256,
-141173=>17257,
-62622=>17257,
-36288=>17258,
-62623=>17258,
-22177=>17259,
-62624=>17259,
-25724=>17260,
-62625=>17260,
-15939=>17261,
-62626=>17261,
-173569=>17263,
-62628=>17263,
-134665=>17264,
-62629=>17264,
-142031=>17265,
-62630=>17265,
-135368=>17268,
-62633=>17268,
-145858=>17269,
-62634=>17269,
-14738=>17270,
-62635=>17270,
-14854=>17271,
-62636=>17271,
-164507=>17272,
-62637=>17272,
-13688=>17273,
-62638=>17273,
-155209=>17274,
-62639=>17274,
-139463=>17275,
-62640=>17275,
-142514=>17278,
-62643=>17278,
-169760=>17279,
-62644=>17279,
-13500=>17280,
-62645=>17280,
-27709=>17281,
-62646=>17281,
-151099=>17282,
-62647=>17282,
-161140=>17285,
-62650=>17285,
-142987=>17286,
-62651=>17286,
-139784=>17287,
-62652=>17287,
-173659=>17288,
-62653=>17288,
-167117=>17289,
-62654=>17289,
-134778=>17290,
-62655=>17290,
-134196=>17291,
-62656=>17291,
-161337=>17292,
-62683=>17292,
-142286=>17293,
-62684=>17293,
-62687=>17294,
-142417=>17294,
-14872=>17295,
-62689=>17295,
-62691=>17296,
-135367=>17296,
-62693=>17297,
-173618=>17297,
-167122=>17298,
-62695=>17298,
-167321=>17299,
-62696=>17299,
-167114=>17300,
-62697=>17300,
-38314=>17301,
-62698=>17301,
-62706=>17303,
-161630=>17303,
-28992=>17304,
-62708=>17304,
-20822=>17306,
-62385=>17306,
-20222=>17307,
-20616=>17308,
-62487=>17308,
-13459=>17310,
-62489=>17310,
-20870=>17311,
-62491=>17311,
-24130=>17312,
-63037=>17312,
-20997=>17313,
-62495=>17313,
-21031=>17314,
-62436=>17314,
-21113=>17315,
-62497=>17315,
-194600=>17316,
-13651=>17317,
-62504=>17317,
-21442=>17318,
-62505=>17318,
-21343=>17319,
-62715=>17319,
-21823=>17321,
-62520=>17321,
-21976=>17323,
-59986=>17323,
-13789=>17324,
-62722=>17324,
-22049=>17325,
-63067=>17325,
-22100=>17327,
-60044=>17327,
-60148=>17328,
-135291=>17328,
-60153=>17330,
-135379=>17330,
-61095=>17332,
-135934=>17332,
-14265=>17335,
-60104=>17335,
-23745=>17336,
-61099=>17336,
-23829=>17337,
-63066=>17337,
-23894=>17338,
-63030=>17338,
-14392=>17339,
-63036=>17339,
-20097=>17340,
-62477=>17340,
-24253=>17341,
-63038=>17341,
-14612=>17342,
-63042=>17342,
-25017=>17343,
-63050=>17343,
-25232=>17344,
-63054=>17344,
-25368=>17345,
-63056=>17345,
-25690=>17346,
-63063=>17346,
-25745=>17347,
-62381=>17347,
-33133=>17348,
-62709=>17348,
-33156=>17349,
-59922=>17349,
-33171=>17350,
-59924=>17350,
-26624=>17351,
-63080=>17351,
-15292=>17352,
-63093=>17352,
-29327=>17353,
-60517=>17353,
-29389=>17354,
-59781=>17354,
-149487=>17355,
-29497=>17356,
-59785=>17356,
-30018=>17357,
-59811=>17357,
-30172=>17358,
-59817=>17358,
-16320=>17359,
-59818=>17359,
-60278=>17360,
-151205=>17360,
-16343=>17361,
-59820=>17361,
-30336=>17363,
-30348=>17364,
-59824=>17364,
-151388=>17364,
-16552=>17365,
-59845=>17365,
-30777=>17366,
-59846=>17366,
-16643=>17367,
-59855=>17367,
-31377=>17368,
-59863=>17368,
-31771=>17369,
-59876=>17369,
-31981=>17370,
-59884=>17370,
-32659=>17371,
-62658=>17371,
-32686=>17372,
-59892=>17372,
-33535=>17374,
-59936=>17374,
-22623=>17375,
-59981=>17375,
-34482=>17376,
-59960=>17376,
-17836=>17377,
-34699=>17378,
-59963=>17378,
-35143=>17379,
-59969=>17379,
-35369=>17381,
-59972=>17381,
-36465=>17383,
-59988=>17383,
-60484=>17384,
-164233=>17384,
-36528=>17385,
-59990=>17385,
-37214=>17387,
-62443=>17387,
-37260=>17388,
-62441=>17388,
-39182=>17389,
-60051=>17389,
-39196=>17390,
-60054=>17390,
-39809=>17393,
-60066=>17393,
-40384=>17394,
-60080=>17394,
-40339=>17395,
-60078=>17395,
-40620=>17396,
-60085=>17396,
-19857=>17397,
-60540=>17397,
-37818=>17399,
-40571=>17400,
-60084=>17400,
-28809=>17401,
-63148=>17401,
-29512=>17402,
-59788=>17402,
-31129=>17404,
-59858=>17404,
-36791=>17405,
-59997=>17405,
-39234=>17407,
-60056=>17407,
-8364=>17601,
-12443=>17606,
-63518=>17606,
-12444=>17607,
-63519=>17607,
-11904=>17608,
-63520=>17608,
-12736=>17609,
-62211=>17609,
-12737=>17610,
-62212=>17610,
-12738=>17611,
-62213=>17611,
-12739=>17612,
-62214=>17612,
-12740=>17613,
-62215=>17613,
-131340=>17614,
-62216=>17614,
-12741=>17615,
-62217=>17615,
-131281=>17616,
-62218=>17616,
-131277=>17617,
-62219=>17617,
-12742=>17618,
-62220=>17618,
-12743=>17619,
-62221=>17619,
-131275=>17620,
-62222=>17620,
-139240=>17621,
-62223=>17621,
-12744=>17622,
-62224=>17622,
-131274=>17623,
-62225=>17623,
-12745=>17624,
-62226=>17624,
-12746=>17625,
-62227=>17625,
-12747=>17626,
-62228=>17626,
-12748=>17627,
-62229=>17627,
-131342=>17628,
-62230=>17628,
-12749=>17629,
-62231=>17629,
-12750=>17630,
-62232=>17630,
-62776=>17631,
-62777=>17632,
-138177=>17633,
-62778=>17633,
-194680=>17634,
-62779=>17634,
-12205=>17635,
-38737=>17635,
-62780=>17635,
-131206=>17636,
-62781=>17636,
-20059=>17637,
-62782=>17637,
-20155=>17638,
-62783=>17638,
-13630=>17639,
-62784=>17639,
-23587=>17640,
-62785=>17640,
-24401=>17641,
-62786=>17641,
-24516=>17642,
-62787=>17642,
-14586=>17643,
-62788=>17643,
-25164=>17644,
-62789=>17644,
-25909=>17645,
-62790=>17645,
-27514=>17646,
-62791=>17646,
-27701=>17647,
-62792=>17647,
-27706=>17648,
-62793=>17648,
-28780=>17649,
-62794=>17649,
-29227=>17650,
-62795=>17650,
-20012=>17651,
-62796=>17651,
-29357=>17652,
-62797=>17652,
-149737=>17653,
-62798=>17653,
-32594=>17654,
-62799=>17654,
-31035=>17655,
-62800=>17655,
-31993=>17656,
-62801=>17656,
-32595=>17657,
-62802=>17657,
-156266=>17658,
-62803=>17658,
-13505=>17659,
-62804=>17659,
-156491=>17660,
-62806=>17660,
-32770=>17661,
-62807=>17661,
-32896=>17662,
-62808=>17662,
-157202=>17663,
-62809=>17663,
-158033=>17664,
-62810=>17664,
-21341=>17665,
-62811=>17665,
-34916=>17666,
-62812=>17666,
-35265=>17667,
-62813=>17667,
-161970=>17668,
-62814=>17668,
-35744=>17669,
-62815=>17669,
-36125=>17670,
-62816=>17670,
-38021=>17671,
-62817=>17671,
-38264=>17672,
-62818=>17672,
-38271=>17673,
-62819=>17673,
-38376=>17674,
-62820=>17674,
-167439=>17675,
-62821=>17675,
-38886=>17676,
-62822=>17676,
-39029=>17677,
-62823=>17677,
-39118=>17678,
-62824=>17678,
-39134=>17679,
-62825=>17679,
-39267=>17680,
-62826=>17680,
-170000=>17681,
-62827=>17681,
-40060=>17682,
-62828=>17682,
-40479=>17683,
-62829=>17683,
-40644=>17684,
-62830=>17684,
-27503=>17685,
-62831=>17685,
-63751=>17686,
-62832=>17686,
-20023=>17687,
-62833=>17687,
-131207=>17688,
-62834=>17688,
-38429=>17689,
-62835=>17689,
-25143=>17690,
-62836=>17690,
-38050=>17691,
-62837=>17691,
-11908=>17692,
-63521=>17692,
-11910=>17693,
-63522=>17693,
-11911=>17694,
-63523=>17694,
-11912=>17695,
-63524=>17695,
-11914=>17696,
-63525=>17696,
-11916=>17697,
-63526=>17697,
-11917=>17698,
-63527=>17698,
-11925=>17699,
-63528=>17699,
-11932=>17700,
-63529=>17700,
-11941=>17701,
-63531=>17701,
-11943=>17702,
-63532=>17702,
-11946=>17703,
-63533=>17703,
-11948=>17704,
-63534=>17704,
-11950=>17705,
-63535=>17705,
-11958=>17706,
-63536=>17706,
-11964=>17707,
-63537=>17707,
-11966=>17708,
-63538=>17708,
-11978=>17709,
-63540=>17709,
-11980=>17710,
-63541=>17710,
-11981=>17711,
-63542=>17711,
-11983=>17712,
-63543=>17712,
-11990=>17713,
-63544=>17713,
-11991=>17714,
-63545=>17714,
-11998=>17715,
-63546=>17715,
-172969=>17716,
-62368=>17716,
-135493=>17717,
-62369=>17717,
-25866=>17718,
-62371=>17718,
-20029=>17719,
-62374=>17719,
-28381=>17720,
-62375=>17720,
-40270=>17721,
-62376=>17721,
-37343=>17722,
-62377=>17722,
-62380=>17723,
-161589=>17723,
-20250=>17724,
-62382=>17724,
-20264=>17725,
-62383=>17725,
-20392=>17726,
-62384=>17726,
-20852=>17727,
-62386=>17727,
-20892=>17728,
-62387=>17728,
-20964=>17729,
-62388=>17729,
-21153=>17730,
-62389=>17730,
-21160=>17731,
-62390=>17731,
-21307=>17732,
-62391=>17732,
-21326=>17733,
-62392=>17733,
-21457=>17734,
-62393=>17734,
-21464=>17735,
-62394=>17735,
-22242=>17736,
-62395=>17736,
-22768=>17737,
-62396=>17737,
-22788=>17738,
-62397=>17738,
-22791=>17739,
-62398=>17739,
-22834=>17740,
-62399=>17740,
-22836=>17741,
-62400=>17741,
-23398=>17742,
-62401=>17742,
-23454=>17743,
-62402=>17743,
-23455=>17744,
-62403=>17744,
-23706=>17745,
-62404=>17745,
-24198=>17746,
-62405=>17746,
-24635=>17747,
-62406=>17747,
-25993=>17748,
-62407=>17748,
-26622=>17749,
-62408=>17749,
-26628=>17750,
-62409=>17750,
-26725=>17751,
-62410=>17751,
-27982=>17752,
-62411=>17752,
-28860=>17753,
-62412=>17753,
-30005=>17754,
-62413=>17754,
-32420=>17755,
-62414=>17755,
-32428=>17756,
-62415=>17756,
-32442=>17757,
-62416=>17757,
-32455=>17758,
-62417=>17758,
-32463=>17759,
-62418=>17759,
-32479=>17760,
-62419=>17760,
-32518=>17761,
-62420=>17761,
-32567=>17762,
-62421=>17762,
-33402=>17763,
-62422=>17763,
-33487=>17764,
-62423=>17764,
-33647=>17765,
-62424=>17765,
-35270=>17766,
-62425=>17766,
-35774=>17767,
-62426=>17767,
-35810=>17768,
-62427=>17768,
-36710=>17769,
-62428=>17769,
-36711=>17770,
-62429=>17770,
-36718=>17771,
-62430=>17771,
-29713=>17772,
-62431=>17772,
-31996=>17773,
-62432=>17773,
-32205=>17774,
-62433=>17774,
-26950=>17775,
-62434=>17775,
-31433=>17776,
-62435=>17776,
-30904=>17777,
-62442=>17777,
-32956=>17778,
-62444=>17778,
-36107=>17779,
-62446=>17779,
-33014=>17780,
-62447=>17780,
-133607=>17781,
-62448=>17781,
-32927=>17782,
-62451=>17782,
-40647=>17783,
-62452=>17783,
-19661=>17784,
-62453=>17784,
-40393=>17785,
-62454=>17785,
-40460=>17786,
-62455=>17786,
-19518=>17787,
-62456=>17787,
-171510=>17788,
-62457=>17788,
-159758=>17789,
-62458=>17789,
-40458=>17790,
-62459=>17790,
-172339=>17791,
-62460=>17791,
-13761=>17792,
-62461=>17792,
-28314=>17793,
-62463=>17793,
-33342=>17794,
-62464=>17794,
-29977=>17795,
-62465=>17795,
-18705=>17796,
-62467=>17796,
-39532=>17797,
-62468=>17797,
-39567=>17798,
-62469=>17798,
-40857=>17799,
-62470=>17799,
-31111=>17800,
-62471=>17800,
-164972=>17801,
-62472=>17801,
-138698=>17802,
-62473=>17802,
-132560=>17803,
-62474=>17803,
-142054=>17804,
-62475=>17804,
-20004=>17805,
-62476=>17805,
-20096=>17806,
-62478=>17806,
-20103=>17807,
-62479=>17807,
-20159=>17808,
-62480=>17808,
-20203=>17809,
-62481=>17809,
-20279=>17810,
-62482=>17810,
-13388=>17811,
-62483=>17811,
-20413=>17812,
-62484=>17812,
-15944=>17813,
-62485=>17813,
-20483=>17814,
-62486=>17814,
-13437=>17815,
-62488=>17815,
-13477=>17816,
-62490=>17816,
-22789=>17817,
-62492=>17817,
-20955=>17818,
-62493=>17818,
-20988=>17819,
-62494=>17819,
-20105=>17820,
-62496=>17820,
-21136=>17821,
-62498=>17821,
-21287=>17822,
-62499=>17822,
-13767=>17823,
-62500=>17823,
-21417=>17824,
-62501=>17824,
-13649=>17825,
-62502=>17825,
-21424=>17826,
-62503=>17826,
-21539=>17827,
-62506=>17827,
-13677=>17828,
-62507=>17828,
-13682=>17829,
-62508=>17829,
-13953=>17830,
-62509=>17830,
-21651=>17831,
-62510=>17831,
-21667=>17832,
-62511=>17832,
-21684=>17833,
-62512=>17833,
-21689=>17834,
-62513=>17834,
-21712=>17835,
-62514=>17835,
-21743=>17836,
-62515=>17836,
-21784=>17837,
-62516=>17837,
-21795=>17838,
-62517=>17838,
-21800=>17839,
-62518=>17839,
-13720=>17840,
-62519=>17840,
-13733=>17841,
-62521=>17841,
-13759=>17842,
-62522=>17842,
-21975=>17843,
-62523=>17843,
-13765=>17844,
-62524=>17844,
-163204=>17845,
-62525=>17845,
-16467=>17846,
-62538=>17846,
-62551=>17847,
-135412=>17847,
-62555=>17848,
-134155=>17848,
-62574=>17849,
-161992=>17849,
-62580=>17850,
-155813=>17850,
-62583=>17851,
-142668=>17851,
-62585=>17852,
-135287=>17852,
-62587=>17853,
-135279=>17853,
-62595=>17854,
-139681=>17854,
-62609=>17855,
-134550=>17855,
-16571=>17856,
-62611=>17856,
-62631=>17857,
-142537=>17857,
-22098=>17858,
-62641=>17858,
-134961=>17859,
-62642=>17859,
-62657=>17860,
-157724=>17860,
-135375=>17861,
-62659=>17861,
-141315=>17862,
-62660=>17862,
-141625=>17863,
-62661=>17863,
-13819=>17864,
-62662=>17864,
-152035=>17865,
-62663=>17865,
-134796=>17866,
-62664=>17866,
-135053=>17867,
-62665=>17867,
-134826=>17868,
-62666=>17868,
-16275=>17869,
-62667=>17869,
-134960=>17870,
-62668=>17870,
-134471=>17871,
-62669=>17871,
-135503=>17872,
-62670=>17872,
-134732=>17873,
-62671=>17873,
-134827=>17874,
-62673=>17874,
-134057=>17875,
-62674=>17875,
-134472=>17876,
-62675=>17876,
-135360=>17877,
-62676=>17877,
-135485=>17878,
-62677=>17878,
-16377=>17879,
-62678=>17879,
-140950=>17880,
-62679=>17880,
-25650=>17881,
-62680=>17881,
-135085=>17882,
-62681=>17882,
-144372=>17883,
-62682=>17883,
-62685=>17884,
-134526=>17884,
-62686=>17885,
-134527=>17885,
-62688=>17886,
-142421=>17886,
-62690=>17887,
-134808=>17887,
-62692=>17888,
-134958=>17888,
-62694=>17889,
-158544=>17889,
-21708=>17890,
-62699=>17890,
-33476=>17891,
-62700=>17891,
-21945=>17892,
-62701=>17892,
-171715=>17893,
-62703=>17893,
-39974=>17894,
-62704=>17894,
-39606=>17895,
-62705=>17895,
-62707=>17896,
-142830=>17896,
-33004=>17897,
-62710=>17897,
-23580=>17898,
-62711=>17898,
-157042=>17899,
-62712=>17899,
-33076=>17900,
-62713=>17900,
-14231=>17901,
-62714=>17901,
-164029=>17902,
-62716=>17902,
-37302=>17903,
-62717=>17903,
-134906=>17904,
-62718=>17904,
-134671=>17905,
-62719=>17905,
-134775=>17906,
-62720=>17906,
-134907=>17907,
-62721=>17907,
-151019=>17908,
-62723=>17908,
-13833=>17909,
-62724=>17909,
-134358=>17910,
-62725=>17910,
-22191=>17911,
-62726=>17911,
-141237=>17912,
-62727=>17912,
-135369=>17913,
-62728=>17913,
-134672=>17914,
-62729=>17914,
-134776=>17915,
-62730=>17915,
-135288=>17916,
-62731=>17916,
-135496=>17917,
-62732=>17917,
-164359=>17918,
-62733=>17918,
-136277=>17919,
-62734=>17919,
-134777=>17920,
-62735=>17920,
-151120=>17921,
-62736=>17921,
-142756=>17922,
-62737=>17922,
-23124=>17923,
-62738=>17923,
-62739=>17924,
-135197=>17924,
-62740=>17925,
-135198=>17925,
-62741=>17926,
-135413=>17926,
-62742=>17927,
-135414=>17927,
-22428=>17928,
-62743=>17928,
-134673=>17929,
-62744=>17929,
-161428=>17930,
-62745=>17930,
-164557=>17931,
-62746=>17931,
-135093=>17932,
-62747=>17932,
-134779=>17933,
-62748=>17933,
-151934=>17934,
-62749=>17934,
-14083=>17935,
-62750=>17935,
-135094=>17936,
-62751=>17936,
-135552=>17937,
-62752=>17937,
-152280=>17938,
-62753=>17938,
-172733=>17939,
-62754=>17939,
-149978=>17940,
-62755=>17940,
-137274=>17941,
-62756=>17941,
-147831=>17942,
-62757=>17942,
-164476=>17943,
-62758=>17943,
-22681=>17944,
-62759=>17944,
-21096=>17945,
-62760=>17945,
-13850=>17946,
-62761=>17946,
-153405=>17947,
-62762=>17947,
-31666=>17948,
-62763=>17948,
-23400=>17949,
-62764=>17949,
-18432=>17950,
-62765=>17950,
-19244=>17951,
-62766=>17951,
-40743=>17952,
-62767=>17952,
-18919=>17953,
-62768=>17953,
-39967=>17954,
-62769=>17954,
-39821=>17955,
-62770=>17955,
-154484=>17956,
-62771=>17956,
-143677=>17957,
-62772=>17957,
-22011=>17958,
-62773=>17958,
-13810=>17959,
-62774=>17959,
-22153=>17960,
-62775=>17960,
-23870=>17961,
-63028=>17961,
-23880=>17962,
-63029=>17962,
-15868=>17963,
-63031=>17963,
-14351=>17964,
-63032=>17964,
-23972=>17965,
-63033=>17965,
-23993=>17966,
-63034=>17966,
-14368=>17967,
-63035=>17967,
-24357=>17968,
-63039=>17968,
-24451=>17969,
-63040=>17969,
-14600=>17970,
-63041=>17970,
-14655=>17971,
-63043=>17971,
-14669=>17972,
-63044=>17972,
-24791=>17973,
-63045=>17973,
-24893=>17974,
-63046=>17974,
-23781=>17975,
-63047=>17975,
-14729=>17976,
-63048=>17976,
-25015=>17977,
-63049=>17977,
-25039=>17978,
-63051=>17978,
-14776=>17979,
-63052=>17979,
-25132=>17980,
-63053=>17980,
-25317=>17981,
-63055=>17981,
-14840=>17982,
-63057=>17982,
-22193=>17983,
-63058=>17983,
-14851=>17984,
-63059=>17984,
-25570=>17985,
-63060=>17985,
-25595=>17986,
-63061=>17986,
-25607=>17987,
-63062=>17987,
-14923=>17988,
-63064=>17988,
-25792=>17989,
-63065=>17989,
-40863=>17990,
-63068=>17990,
-14999=>17991,
-63069=>17991,
-25990=>17992,
-63070=>17992,
-15037=>17993,
-63071=>17993,
-26111=>17994,
-63072=>17994,
-26195=>17995,
-63073=>17995,
-15090=>17996,
-63074=>17996,
-26258=>17997,
-63075=>17997,
-15138=>17998,
-63076=>17998,
-26390=>17999,
-63077=>17999,
-15170=>18000,
-63078=>18000,
-26532=>18001,
-63079=>18001,
-15192=>18002,
-63081=>18002,
-26698=>18003,
-63082=>18003,
-26756=>18004,
-63083=>18004,
-15218=>18005,
-63084=>18005,
-15217=>18006,
-63085=>18006,
-15227=>18007,
-63086=>18007,
-26889=>18008,
-63087=>18008,
-26947=>18009,
-63088=>18009,
-29276=>18010,
-63089=>18010,
-26980=>18011,
-63090=>18011,
-27039=>18012,
-63091=>18012,
-27013=>18013,
-63092=>18013,
-27094=>18014,
-63094=>18014,
-15325=>18015,
-63095=>18015,
-27237=>18016,
-63096=>18016,
-27252=>18017,
-63097=>18017,
-27249=>18018,
-63098=>18018,
-27266=>18019,
-63099=>18019,
-15340=>18020,
-63100=>18020,
-27289=>18021,
-63101=>18021,
-15346=>18022,
-63102=>18022,
-27307=>18023,
-63103=>18023,
-27317=>18024,
-63104=>18024,
-27348=>18025,
-63105=>18025,
-27382=>18026,
-63106=>18026,
-27521=>18027,
-63107=>18027,
-27585=>18028,
-63108=>18028,
-27626=>18029,
-63109=>18029,
-27765=>18030,
-63110=>18030,
-27818=>18031,
-63111=>18031,
-15563=>18032,
-63112=>18032,
-27906=>18033,
-63113=>18033,
-27910=>18034,
-63114=>18034,
-27942=>18035,
-63115=>18035,
-28033=>18036,
-63116=>18036,
-15599=>18037,
-63117=>18037,
-28068=>18038,
-63118=>18038,
-28081=>18039,
-63119=>18039,
-28181=>18040,
-63120=>18040,
-28184=>18041,
-63121=>18041,
-28201=>18042,
-63122=>18042,
-28294=>18043,
-63123=>18043,
-166336=>18044,
-63124=>18044,
-28347=>18045,
-63125=>18045,
-28386=>18046,
-63126=>18046,
-28378=>18047,
-63127=>18047,
-40831=>18048,
-63128=>18048,
-28392=>18049,
-63129=>18049,
-28393=>18050,
-63130=>18050,
-28452=>18051,
-63131=>18051,
-28468=>18052,
-63132=>18052,
-15686=>18053,
-63133=>18053,
-147265=>18054,
-63134=>18054,
-28545=>18055,
-63135=>18055,
-28606=>18056,
-63136=>18056,
-15722=>18057,
-63137=>18057,
-15733=>18058,
-63138=>18058,
-29111=>18059,
-63139=>18059,
-23705=>18060,
-63140=>18060,
-15754=>18061,
-63141=>18061,
-28716=>18062,
-63142=>18062,
-15761=>18063,
-63143=>18063,
-28752=>18064,
-63144=>18064,
-28756=>18065,
-63145=>18065,
-28783=>18066,
-63146=>18066,
-28799=>18067,
-63147=>18067,
-131877=>18068,
-63149=>18068,
-17345=>18069,
-63150=>18069,
-13809=>18070,
-63151=>18070,
-134872=>18071,
-63152=>18071,
-13902=>18072,
-58134=>18072,
-15789=>18073,
-58172=>18073,
-154725=>18074,
-58173=>18074,
-26237=>18075,
-58183=>18075,
-31860=>18076,
-58188=>18076,
-29837=>18077,
-58197=>18077,
-32402=>18078,
-58215=>18078,
-17667=>18079,
-58232=>18079,
-58260=>18080,
-151480=>18080,
-58270=>18081,
-133901=>18081,
-58277=>18082,
-158474=>18082,
-13438=>18083,
-58311=>18083,
-58317=>18084,
-143087=>18084,
-58325=>18085,
-146613=>18085,
-58343=>18086,
-159385=>18086,
-34673=>18087,
-58364=>18087,
-25537=>18088,
-58385=>18088,
-30583=>18089,
-58387=>18089,
-35210=>18090,
-58390=>18090,
-58406=>18091,
-147343=>18091,
-35660=>18092,
-58415=>18092,
-58440=>18093,
-150729=>18093,
-18730=>18094,
-58464=>18094,
-172052=>18095,
-58471=>18095,
-165564=>18096,
-58472=>18096,
-165121=>18097,
-58473=>18097,
-15088=>18098,
-58490=>18098,
-28815=>18099,
-58511=>18099,
-58529=>18100,
-140922=>18100,
-58637=>18101,
-158120=>18101,
-58646=>18102,
-148043=>18102,
-26760=>18103,
-58662=>18103,
-58664=>18104,
-139611=>18104,
-40802=>18105,
-58702=>18105,
-37830=>18106,
-58793=>18106,
-58802=>18107,
-131967=>18107,
-37734=>18108,
-58888=>18108,
-37519=>18109,
-58901=>18109,
-34324=>18110,
-58954=>18110,
-58986=>18111,
-173147=>18111,
-16784=>18112,
-59010=>18112,
-26511=>18113,
-59045=>18113,
-26654=>18114,
-59048=>18114,
-14435=>18115,
-59051=>18115,
-59077=>18116,
-149996=>18116,
-15129=>18117,
-59128=>18117,
-33942=>18118,
-59176=>18118,
-59241=>18119,
-149858=>18119,
-14818=>18120,
-59254=>18120,
-33920=>18121,
-59259=>18121,
-17262=>18122,
-59328=>18122,
-38769=>18123,
-59402=>18123,
-39323=>18124,
-59427=>18124,
-18733=>18125,
-59499=>18125,
-28439=>18126,
-59703=>18126,
-160009=>18127,
-59704=>18127,
-28838=>18128,
-59746=>18128,
-150095=>18129,
-59752=>18129,
-32357=>18130,
-59753=>18130,
-23855=>18131,
-59755=>18131,
-15859=>18132,
-59756=>18132,
-150109=>18133,
-59758=>18133,
-137183=>18134,
-59759=>18134,
-32164=>18135,
-59760=>18135,
-33830=>18136,
-59761=>18136,
-21637=>18137,
-59762=>18137,
-146170=>18138,
-59763=>18138,
-131604=>18139,
-59765=>18139,
-22398=>18140,
-59766=>18140,
-133333=>18141,
-59767=>18141,
-132633=>18142,
-59768=>18142,
-16357=>18143,
-59769=>18143,
-139166=>18144,
-59770=>18144,
-172726=>18145,
-59771=>18145,
-28675=>18146,
-59772=>18146,
-168283=>18147,
-59773=>18147,
-23920=>18148,
-59774=>18148,
-29583=>18149,
-59775=>18149,
-166489=>18150,
-59777=>18150,
-168992=>18151,
-59778=>18151,
-20424=>18152,
-59779=>18152,
-32743=>18153,
-59780=>18153,
-29456=>18154,
-59782=>18154,
-29496=>18155,
-59784=>18155,
-29505=>18156,
-59787=>18156,
-16041=>18157,
-59789=>18157,
-29173=>18158,
-59792=>18158,
-149746=>18159,
-59793=>18159,
-29665=>18160,
-59794=>18160,
-16074=>18161,
-59796=>18161,
-16081=>18162,
-59798=>18162,
-29721=>18163,
-59801=>18163,
-29726=>18164,
-59802=>18164,
-29727=>18165,
-59803=>18165,
-16098=>18166,
-59804=>18166,
-16112=>18167,
-59805=>18167,
-16116=>18168,
-59806=>18168,
-16122=>18169,
-59807=>18169,
-29907=>18170,
-59808=>18170,
-16142=>18171,
-59809=>18171,
-16211=>18172,
-59810=>18172,
-30061=>18173,
-59812=>18173,
-30066=>18174,
-59813=>18174,
-30093=>18175,
-59814=>18175,
-16252=>18176,
-59815=>18176,
-30152=>18177,
-59816=>18177,
-30285=>18178,
-59819=>18178,
-30324=>18179,
-59821=>18179,
-16348=>18180,
-59822=>18180,
-30330=>18181,
-59823=>18181,
-29064=>18182,
-59825=>18182,
-22051=>18183,
-59826=>18183,
-35200=>18184,
-59827=>18184,
-16413=>18185,
-59829=>18185,
-30531=>18186,
-59830=>18186,
-16441=>18187,
-59831=>18187,
-16453=>18188,
-59833=>18188,
-13787=>18189,
-59834=>18189,
-30616=>18190,
-59835=>18190,
-16490=>18191,
-59836=>18191,
-16495=>18192,
-59837=>18192,
-30654=>18193,
-59839=>18193,
-30667=>18194,
-59840=>18194,
-30744=>18195,
-59842=>18195,
-30748=>18196,
-59844=>18196,
-30791=>18197,
-59847=>18197,
-30801=>18198,
-59848=>18198,
-30822=>18199,
-59849=>18199,
-33864=>18200,
-59850=>18200,
-152885=>18201,
-59851=>18201,
-31027=>18202,
-59852=>18202,
-31026=>18203,
-59854=>18203,
-16649=>18204,
-59856=>18204,
-31121=>18205,
-59857=>18205,
-31238=>18206,
-59860=>18206,
-16743=>18207,
-59862=>18207,
-16818=>18208,
-59864=>18208,
-31420=>18209,
-59865=>18209,
-33401=>18210,
-59866=>18210,
-16836=>18211,
-59867=>18211,
-31439=>18212,
-59868=>18212,
-31451=>18213,
-59869=>18213,
-16847=>18214,
-59870=>18214,
-31586=>18215,
-59872=>18215,
-31596=>18216,
-59873=>18216,
-31611=>18217,
-59874=>18217,
-31762=>18218,
-59875=>18218,
-16992=>18219,
-59877=>18219,
-17018=>18220,
-59878=>18220,
-31867=>18221,
-59879=>18221,
-31900=>18222,
-59880=>18222,
-17036=>18223,
-59881=>18223,
-31928=>18224,
-59882=>18224,
-17044=>18225,
-59883=>18225,
-36755=>18226,
-59885=>18226,
-28864=>18227,
-59886=>18227,
-134351=>18228,
-59887=>18228,
-32207=>18229,
-59888=>18229,
-32212=>18230,
-59889=>18230,
-32208=>18231,
-59890=>18231,
-32253=>18232,
-59891=>18232,
-32692=>18233,
-59893=>18233,
-29343=>18234,
-59894=>18234,
-17303=>18235,
-59895=>18235,
-32800=>18236,
-59896=>18236,
-32805=>18237,
-59897=>18237,
-32814=>18238,
-59899=>18238,
-32817=>18239,
-59900=>18239,
-32852=>18240,
-59901=>18240,
-22452=>18241,
-59903=>18241,
-28832=>18242,
-59904=>18242,
-32951=>18243,
-59905=>18243,
-33001=>18244,
-59906=>18244,
-17389=>18245,
-59907=>18245,
-33036=>18246,
-59908=>18246,
-33038=>18247,
-59910=>18247,
-33042=>18248,
-59911=>18248,
-33044=>18249,
-59913=>18249,
-17409=>18250,
-59914=>18250,
-15161=>18251,
-59915=>18251,
-33110=>18252,
-59916=>18252,
-33113=>18253,
-59917=>18253,
-33114=>18254,
-59918=>18254,
-17427=>18255,
-59919=>18255,
-33148=>18256,
-59921=>18256,
-17445=>18257,
-59923=>18257,
-17453=>18258,
-59925=>18258,
-33189=>18259,
-59926=>18259,
-22511=>18260,
-59927=>18260,
-33217=>18261,
-59928=>18261,
-33252=>18262,
-59929=>18262,
-33364=>18263,
-59930=>18263,
-17551=>18264,
-59931=>18264,
-33398=>18265,
-59933=>18265,
-33482=>18266,
-59934=>18266,
-33496=>18267,
-59935=>18267,
-17584=>18268,
-59937=>18268,
-33623=>18269,
-59938=>18269,
-38505=>18270,
-59939=>18270,
-33797=>18271,
-59941=>18271,
-28917=>18272,
-59942=>18272,
-33892=>18273,
-59943=>18273,
-33928=>18274,
-59945=>18274,
-17668=>18275,
-59946=>18275,
-33982=>18276,
-59947=>18276,
-34017=>18277,
-59948=>18277,
-34040=>18278,
-59949=>18278,
-34064=>18279,
-59950=>18279,
-34104=>18280,
-59951=>18280,
-34130=>18281,
-59952=>18281,
-17723=>18282,
-59953=>18282,
-34159=>18283,
-59954=>18283,
-34160=>18284,
-59955=>18284,
-34272=>18285,
-59956=>18285,
-17783=>18286,
-59957=>18286,
-34418=>18287,
-59958=>18287,
-34450=>18288,
-59959=>18288,
-34543=>18289,
-59961=>18289,
-38469=>18290,
-59962=>18290,
-17926=>18291,
-59964=>18291,
-17943=>18292,
-59965=>18292,
-34990=>18293,
-59966=>18293,
-35071=>18294,
-59967=>18294,
-35108=>18295,
-59968=>18295,
-35217=>18296,
-59970=>18296,
-162151=>18297,
-59971=>18297,
-35384=>18298,
-59973=>18298,
-35476=>18299,
-59974=>18299,
-35508=>18300,
-59975=>18300,
-35921=>18301,
-59976=>18301,
-36052=>18302,
-59977=>18302,
-36082=>18303,
-59978=>18303,
-36124=>18304,
-59979=>18304,
-18328=>18305,
-59980=>18305,
-36291=>18306,
-59982=>18306,
-18413=>18307,
-59983=>18307,
-36410=>18308,
-59985=>18308,
-22356=>18309,
-59987=>18309,
-22005=>18310,
-59989=>18310,
-18487=>18311,
-59991=>18311,
-36558=>18312,
-59992=>18312,
-36578=>18313,
-59993=>18313,
-36580=>18314,
-59994=>18314,
-36589=>18315,
-59995=>18315,
-36594=>18316,
-59996=>18316,
-36801=>18317,
-59998=>18317,
-36810=>18318,
-59999=>18318,
-36812=>18319,
-60000=>18319,
-36915=>18320,
-60001=>18320,
-18605=>18321,
-60003=>18321,
-39136=>18322,
-60004=>18322,
-37395=>18323,
-60005=>18323,
-18718=>18324,
-60006=>18324,
-37416=>18325,
-60007=>18325,
-37464=>18326,
-60008=>18326,
-37483=>18327,
-60009=>18327,
-37553=>18328,
-60010=>18328,
-37550=>18329,
-60011=>18329,
-37567=>18330,
-60012=>18330,
-37603=>18331,
-60013=>18331,
-37611=>18332,
-60014=>18332,
-37619=>18333,
-60015=>18333,
-37620=>18334,
-60016=>18334,
-37629=>18335,
-60017=>18335,
-37699=>18336,
-60018=>18336,
-37764=>18337,
-60019=>18337,
-37805=>18338,
-60020=>18338,
-18757=>18339,
-60021=>18339,
-18769=>18340,
-60022=>18340,
-37911=>18341,
-60024=>18341,
-37917=>18342,
-60026=>18342,
-37933=>18343,
-60027=>18343,
-37950=>18344,
-60028=>18344,
-18794=>18345,
-60029=>18345,
-37972=>18346,
-60030=>18346,
-38009=>18347,
-60031=>18347,
-38189=>18348,
-60032=>18348,
-38306=>18349,
-60033=>18349,
-18855=>18350,
-60034=>18350,
-38388=>18351,
-60035=>18351,
-38451=>18352,
-60036=>18352,
-18917=>18353,
-60037=>18353,
-18980=>18354,
-60039=>18354,
-38720=>18355,
-60040=>18355,
-18997=>18356,
-60041=>18356,
-38834=>18357,
-60042=>18357,
-38850=>18358,
-60043=>18358,
-19172=>18359,
-60045=>18359,
-39097=>18360,
-60047=>18360,
-19225=>18361,
-60048=>18361,
-39153=>18362,
-60049=>18362,
-22596=>18363,
-60050=>18363,
-39193=>18364,
-60052=>18364,
-39223=>18365,
-60055=>18365,
-39261=>18366,
-60057=>18366,
-39266=>18367,
-60058=>18367,
-19312=>18368,
-60059=>18368,
-39365=>18369,
-60060=>18369,
-19357=>18370,
-60061=>18370,
-39484=>18371,
-60062=>18371,
-39695=>18372,
-60063=>18372,
-39785=>18373,
-60065=>18373,
-39901=>18374,
-60067=>18374,
-39921=>18375,
-60068=>18375,
-39924=>18376,
-60069=>18376,
-19565=>18377,
-60070=>18377,
-39968=>18378,
-60071=>18378,
-14191=>18379,
-60072=>18379,
-138178=>18380,
-60073=>18380,
-40265=>18381,
-60074=>18381,
-40702=>18382,
-60076=>18382,
-22096=>18383,
-60077=>18383,
-40381=>18384,
-60079=>18384,
-40444=>18385,
-60081=>18385,
-38134=>18386,
-60082=>18386,
-36790=>18387,
-60083=>18387,
-40625=>18388,
-60086=>18388,
-40637=>18389,
-60087=>18389,
-40646=>18390,
-60088=>18390,
-38108=>18391,
-60089=>18391,
-40674=>18392,
-60090=>18392,
-40689=>18393,
-60091=>18393,
-40696=>18394,
-60092=>18394,
-40772=>18395,
-60094=>18395,
-131220=>18396,
-60095=>18396,
-131767=>18397,
-60096=>18397,
-132000=>18398,
-60097=>18398,
-38083=>18399,
-60099=>18399,
-60101=>18400,
-132311=>18400,
-38081=>18401,
-60103=>18401,
-132565=>18402,
-60105=>18402,
-132629=>18403,
-60106=>18403,
-132726=>18404,
-60107=>18404,
-136890=>18405,
-60108=>18405,
-22359=>18406,
-60109=>18406,
-29043=>18407,
-60110=>18407,
-133826=>18408,
-60111=>18408,
-133837=>18409,
-60112=>18409,
-134079=>18410,
-60113=>18410,
-194619=>18411,
-60115=>18411,
-134091=>18412,
-60116=>18412,
-21662=>18413,
-60117=>18413,
-134139=>18414,
-60118=>18414,
-134203=>18415,
-60119=>18415,
-134227=>18416,
-60120=>18416,
-134245=>18417,
-60121=>18417,
-134268=>18418,
-60122=>18418,
-60124=>18419,
-134285=>18419,
-134325=>18420,
-60126=>18420,
-134365=>18421,
-60127=>18421,
-134381=>18422,
-60128=>18422,
-134511=>18423,
-60129=>18423,
-134578=>18424,
-60130=>18424,
-134600=>18425,
-60131=>18425,
-134660=>18426,
-60135=>18426,
-134670=>18427,
-60136=>18427,
-134871=>18428,
-60137=>18428,
-135056=>18429,
-60138=>18429,
-134957=>18430,
-60139=>18430,
-134771=>18431,
-60140=>18431,
-60142=>18432,
-135100=>18432,
-135260=>18433,
-60144=>18433,
-135247=>18434,
-60145=>18434,
-135286=>18435,
-60146=>18435,
-135304=>18436,
-60149=>18436,
-135318=>18437,
-60150=>18437,
-13895=>18438,
-60151=>18438,
-135359=>18439,
-60152=>18439,
-135471=>18440,
-60154=>18440,
-135483=>18441,
-60155=>18441,
-21348=>18442,
-60156=>18442,
-135907=>18443,
-60158=>18443,
-136053=>18444,
-60159=>18444,
-60160=>18445,
-135990=>18445,
-136567=>18446,
-60162=>18446,
-136729=>18447,
-60163=>18447,
-137155=>18448,
-60164=>18448,
-137159=>18449,
-60165=>18449,
-28859=>18450,
-60167=>18450,
-137261=>18451,
-60168=>18451,
-137578=>18452,
-60169=>18452,
-137773=>18453,
-60170=>18453,
-137797=>18454,
-60171=>18454,
-138282=>18455,
-60172=>18455,
-138352=>18456,
-60173=>18456,
-138412=>18457,
-60174=>18457,
-138952=>18458,
-60175=>18458,
-138965=>18459,
-60177=>18459,
-139029=>18460,
-60178=>18460,
-29080=>18461,
-60179=>18461,
-139333=>18462,
-60181=>18462,
-27113=>18463,
-60182=>18463,
-14024=>18464,
-60183=>18464,
-139900=>18465,
-60184=>18465,
-140247=>18466,
-60185=>18466,
-140282=>18467,
-60186=>18467,
-141098=>18468,
-60187=>18468,
-141425=>18469,
-60188=>18469,
-141647=>18470,
-60189=>18470,
-141671=>18471,
-60191=>18471,
-141715=>18472,
-60192=>18472,
-142037=>18473,
-60193=>18473,
-60195=>18474,
-142056=>18474,
-60197=>18475,
-142094=>18475,
-60199=>18476,
-142143=>18476,
-60202=>18477,
-142412=>18477,
-142472=>18478,
-60204=>18478,
-142519=>18479,
-60205=>18479,
-154600=>18480,
-60206=>18480,
-142600=>18481,
-60207=>18481,
-142610=>18482,
-60208=>18482,
-142775=>18483,
-60209=>18483,
-142741=>18484,
-60210=>18484,
-142914=>18485,
-60211=>18485,
-143220=>18486,
-60212=>18486,
-143308=>18487,
-60213=>18487,
-143411=>18488,
-60214=>18488,
-143462=>18489,
-60215=>18489,
-144159=>18490,
-60216=>18490,
-144350=>18491,
-60217=>18491,
-144743=>18492,
-60222=>18492,
-144883=>18493,
-60223=>18493,
-144922=>18494,
-60227=>18494,
-145174=>18495,
-60228=>18495,
-22709=>18496,
-60231=>18496,
-60234=>18497,
-146087=>18497,
-146961=>18498,
-60237=>18498,
-147129=>18499,
-60238=>18499,
-60243=>18500,
-147737=>18500,
-148206=>18501,
-60245=>18501,
-148237=>18502,
-60246=>18502,
-148276=>18503,
-60248=>18503,
-148374=>18504,
-60249=>18504,
-148484=>18505,
-60258=>18505,
-148694=>18506,
-60259=>18506,
-22408=>18507,
-60260=>18507,
-149108=>18508,
-60261=>18508,
-60263=>18509,
-149295=>18509,
-149522=>18510,
-60271=>18510,
-149755=>18511,
-60272=>18511,
-150037=>18512,
-60273=>18512,
-60275=>18513,
-150208=>18513,
-22885=>18514,
-60277=>18514,
-60279=>18515,
-151430=>18515,
-60282=>18516,
-151596=>18516,
-22335=>18517,
-60284=>18517,
-152217=>18518,
-60286=>18518,
-152601=>18519,
-60287=>18519,
-152646=>18520,
-60291=>18520,
-152686=>18521,
-60292=>18521,
-60296=>18522,
-152895=>18522,
-60298=>18523,
-152926=>18523,
-152930=>18524,
-60300=>18524,
-152934=>18525,
-60301=>18525,
-153543=>18526,
-60302=>18526,
-60304=>18527,
-153693=>18527,
-60309=>18528,
-153859=>18528,
-154286=>18529,
-60312=>18529,
-154505=>18530,
-60313=>18530,
-154630=>18531,
-60314=>18531,
-22433=>18532,
-60316=>18532,
-29009=>18533,
-60317=>18533,
-60319=>18534,
-155906=>18534,
-60322=>18535,
-156082=>18535,
-156674=>18536,
-60325=>18536,
-156746=>18537,
-60326=>18537,
-60330=>18538,
-156804=>18538,
-60334=>18539,
-156808=>18539,
-60336=>18540,
-156946=>18540,
-157119=>18541,
-60338=>18541,
-157365=>18542,
-60339=>18542,
-22201=>18543,
-60347=>18543,
-60349=>18544,
-157436=>18544,
-13848=>18545,
-60355=>18545,
-157593=>18546,
-60357=>18546,
-157806=>18547,
-60358=>18547,
-60360=>18548,
-157790=>18548,
-60362=>18549,
-157895=>18549,
-60366=>18550,
-157990=>18550,
-60368=>18551,
-158009=>18551,
-60371=>18552,
-158202=>18552,
-60373=>18553,
-158253=>18553,
-158260=>18554,
-60378=>18554,
-158555=>18555,
-60379=>18555,
-60383=>18556,
-158621=>18556,
-60385=>18557,
-158884=>18557,
-60388=>18558,
-159150=>18558,
-159819=>18559,
-60392=>18559,
-160205=>18560,
-60393=>18560,
-160384=>18561,
-60395=>18561,
-160389=>18562,
-60396=>18562,
-60399=>18563,
-160395=>18563,
-60401=>18564,
-160486=>18564,
-38047=>18565,
-60404=>18565,
-160848=>18566,
-60405=>18566,
-14009=>18567,
-60416=>18567,
-161740=>18568,
-60424=>18568,
-161880=>18569,
-60425=>18569,
-22230=>18570,
-60426=>18570,
-60435=>18571,
-162269=>18571,
-162301=>18572,
-60441=>18572,
-162314=>18573,
-60442=>18573,
-162571=>18574,
-60443=>18574,
-163174=>18575,
-60444=>18575,
-60448=>18576,
-163849=>18576,
-60459=>18577,
-163875=>18577,
-60463=>18578,
-163912=>18578,
-60466=>18579,
-163971=>18579,
-163984=>18580,
-60479=>18580,
-164084=>18581,
-60480=>18581,
-164142=>18582,
-60481=>18582,
-60483=>18583,
-164175=>18583,
-164271=>18584,
-60485=>18584,
-164378=>18585,
-60486=>18585,
-164614=>18586,
-60487=>18586,
-164655=>18587,
-60488=>18587,
-164746=>18588,
-60489=>18588,
-164968=>18589,
-60491=>18589,
-165546=>18590,
-60492=>18590,
-25574=>18591,
-60494=>18591,
-166230=>18592,
-60495=>18592,
-60498=>18593,
-166328=>18593,
-60500=>18594,
-166375=>18594,
-60502=>18595,
-166376=>18595,
-166726=>18596,
-60503=>18596,
-166868=>18597,
-60504=>18597,
-60506=>18598,
-166921=>18598,
-167877=>18599,
-60508=>18599,
-168172=>18600,
-60509=>18600,
-168208=>18601,
-60511=>18601,
-168252=>18602,
-60512=>18602,
-15863=>18603,
-60513=>18603,
-168286=>18604,
-60514=>18604,
-150218=>18605,
-60515=>18605,
-36816=>18606,
-60516=>18606,
-60519=>18607,
-169191=>18607,
-169392=>18608,
-60521=>18608,
-169400=>18609,
-60522=>18609,
-169778=>18610,
-60523=>18610,
-170193=>18611,
-60524=>18611,
-170313=>18612,
-60525=>18612,
-170346=>18613,
-60526=>18613,
-170435=>18614,
-60527=>18614,
-170536=>18615,
-60528=>18615,
-170766=>18616,
-60529=>18616,
-171354=>18617,
-60530=>18617,
-171419=>18618,
-60531=>18618,
-32415=>18619,
-60532=>18619,
-171768=>18620,
-60533=>18620,
-171811=>18621,
-60534=>18621,
-19620=>18622,
-60535=>18622,
-38215=>18623,
-60536=>18623,
-172691=>18624,
-60537=>18624,
-29090=>18625,
-60538=>18625,
-172799=>18626,
-60539=>18626,
-173515=>18627,
-60542=>18627,
-19868=>18628,
-60543=>18628,
-134300=>18629,
-60544=>18629,
-36798=>18630,
-60545=>18630,
-36794=>18631,
-60547=>18631,
-140464=>18632,
-60548=>18632,
-36793=>18633,
-60549=>18633,
-150163=>18634,
-60550=>18634,
-20202=>18635,
-60555=>18635,
-60557=>18636,
-166700=>18636,
-36480=>18637,
-60560=>18637,
-137205=>18638,
-60561=>18638,
-166764=>18639,
-60563=>18639,
-166809=>18640,
-60564=>18640,
-60566=>18641,
-157359=>18641,
-60568=>18642,
-161365=>18642,
-153141=>18643,
-60570=>18643,
-153942=>18644,
-60571=>18644,
-20122=>18645,
-60572=>18645,
-155265=>18646,
-60573=>18646,
-60576=>18647,
-134765=>18647,
-147080=>18648,
-60579=>18648,
-150686=>18649,
-60580=>18649,
-137206=>18650,
-60583=>18650,
-137339=>18651,
-60584=>18651,
-60587=>18652,
-154698=>18652,
-152337=>18653,
-60589=>18653,
-15814=>18654,
-60590=>18654,
-60596=>18655,
-155352=>18655,
-19996=>18656,
-60600=>18656,
-135146=>18657,
-60601=>18657,
-134473=>18658,
-60602=>18658,
-145082=>18659,
-60603=>18659,
-60638=>18660,
-151880=>18660,
-21982=>18661,
-60644=>18661,
-34694=>18662,
-60672=>18662,
-60676=>18663,
-135361=>18663,
-149254=>18664,
-60679=>18664,
-23440=>18665,
-60680=>18665,
-60682=>18666,
-157843=>18666,
-141044=>18667,
-60684=>18667,
-163119=>18668,
-60685=>18668,
-147875=>18669,
-60686=>18669,
-163187=>18670,
-60687=>18670,
-159440=>18671,
-60688=>18671,
-160438=>18672,
-60689=>18672,
-60691=>18673,
-135641=>18673,
-146684=>18674,
-60693=>18674,
-173737=>18675,
-60694=>18675,
-134828=>18676,
-60695=>18676,
-60698=>18677,
-138402=>18677,
-60700=>18678,
-151490=>18678,
-60702=>18679,
-135147=>18679,
-60706=>18680,
-142752=>18680,
-135148=>18681,
-60710=>18681,
-134666=>18682,
-60711=>18682,
-60714=>18683,
-135149=>18683,
-60717=>18684,
-135559=>18684,
-19994=>18685,
-60721=>18685,
-19972=>18686,
-60722=>18686,
-23309=>18687,
-60724=>18687,
-13996=>18688,
-60727=>18688,
-21373=>18689,
-60729=>18689,
-13989=>18690,
-60730=>18690,
-22682=>18691,
-60732=>18691,
-150382=>18692,
-60733=>18692,
-22442=>18693,
-60736=>18693,
-154261=>18694,
-60737=>18694,
-133497=>18695,
-60738=>18695,
-60741=>18696,
-140389=>18696,
-146686=>18697,
-60746=>18697,
-171824=>18698,
-60747=>18698,
-151465=>18699,
-60749=>18699,
-169374=>18700,
-60750=>18700,
-60753=>18701,
-146870=>18701,
-157619=>18702,
-60755=>18702,
-145184=>18703,
-60756=>18703,
-147191=>18704,
-60759=>18704,
-146988=>18705,
-60760=>18705,
-60785=>18706,
-143578=>18706,
-135849=>18707,
-60789=>18707,
-22439=>18708,
-60790=>18708,
-149859=>18709,
-60791=>18709,
-60794=>18710,
-159918=>18710,
-60801=>18711,
-137068=>18711,
-60806=>18712,
-160100=>18712,
-159010=>18713,
-60809=>18713,
-150242=>18714,
-60810=>18714,
-39963=>18715,
-60837=>18715,
-149822=>18716,
-60838=>18716,
-15878=>18717,
-60846=>18717,
-60881=>18718,
-159011=>18718,
-60887=>18719,
-132092=>18719,
-60891=>18720,
-146685=>18720,
-60893=>18721,
-149785=>18721,
-22394=>18722,
-60904=>18722,
-21722=>18723,
-60912=>18723,
-29050=>18724,
-60928=>18724,
-60949=>18725,
-150135=>18725,
-60955=>18726,
-166490=>18726,
-60962=>18727,
-194624=>18727,
-60976=>18728,
-137275=>18728,
-61000=>18729,
-155993=>18729,
-61014=>18730,
-144373=>18730,
-61019=>18731,
-166850=>18731,
-61024=>18732,
-138566=>18732,
-61054=>18733,
-159441=>18733,
-13877=>18734,
-61065=>18734,
-61084=>18735,
-166701=>18735,
-21024=>18736,
-61088=>18736,
-15384=>18737,
-61089=>18737,
-146631=>18738,
-61090=>18738,
-155351=>18739,
-61091=>18739,
-161366=>18740,
-61092=>18740,
-152881=>18741,
-61093=>18741,
-137540=>18742,
-61094=>18742,
-170243=>18743,
-61096=>18743,
-159196=>18744,
-61097=>18744,
-159917=>18745,
-61098=>18745,
-156077=>18746,
-61100=>18746,
-166415=>18747,
-61101=>18747,
-145015=>18748,
-61102=>18748,
-131310=>18749,
-61103=>18749,
-157766=>18750,
-61104=>18750,
-151310=>18751,
-61105=>18751,
-17762=>18752,
-61106=>18752,
-23327=>18753,
-61107=>18753,
-156492=>18754,
-61108=>18754,
-40784=>18755,
-61109=>18755,
-40614=>18756,
-61110=>18756,
-156267=>18757,
-61111=>18757,
-20962=>18758,
-57415=>18758,
-21314=>18759,
-57416=>18759,
-26285=>18760,
-57520=>18760,
-22620=>18761,
-57547=>18761,
-21843=>18762,
-57566=>18762,
-15749=>18763,
-57594=>18763,
-24928=>18764,
-57608=>18764,
-18606=>18765,
-57668=>18765,
-38845=>18766,
-57676=>18766,
-57693=>18767,
-137335=>18767,
-24755=>18768,
-57703=>18768,
-33828=>18769,
-57711=>18769,
-38932=>18770,
-57748=>18770,
-147596=>18771,
-57749=>18771,
-57764=>18772,
-143486=>18772,
-57787=>18773,
-138813=>18773,
-15147=>18774,
-57798=>18774,
-15666=>18775,
-57824=>18775,
-57857=>18776,
-132021=>18776,
-28801=>18777,
-57944=>18777,
-23708=>18778,
-57959=>18778,
-58017=>18779,
-132547=>18779,
-14128=>18780,
-58028=>18780,
-136054=>18781,
-58096=>18781,
-150034=>18782,
-58097=>18782,
-58111=>18783,
-166699=>18783,
-58112=>18784,
-155779=>18784,
-256=>18785,
-62233=>18785,
-193=>18786,
-62234=>18786,
-461=>18787,
-62235=>18787,
-192=>18788,
-62236=>18788,
-274=>18789,
-62237=>18789,
-201=>18790,
-62238=>18790,
-282=>18791,
-62239=>18791,
-200=>18792,
-62240=>18792,
-332=>18793,
-62241=>18793,
-211=>18794,
-62242=>18794,
-465=>18795,
-62243=>18795,
-210=>18796,
-62244=>18796,
-62245=>18797,
-7870=>18798,
-62246=>18798,
-62247=>18799,
-7872=>18800,
-62248=>18800,
-202=>18801,
-62249=>18801,
-257=>18802,
-62250=>18802,
-225=>18803,
-62251=>18803,
-462=>18804,
-62252=>18804,
-224=>18805,
-62253=>18805,
-593=>18806,
-62254=>18806,
-275=>18807,
-62255=>18807,
-233=>18808,
-62256=>18808,
-283=>18809,
-62257=>18809,
-232=>18810,
-62258=>18810,
-299=>18811,
-62259=>18811,
-237=>18812,
-62260=>18812,
-464=>18813,
-62261=>18813,
-236=>18814,
-62262=>18814,
-333=>18815,
-62263=>18815,
-243=>18816,
-62264=>18816,
-466=>18817,
-62265=>18817,
-242=>18818,
-62266=>18818,
-363=>18819,
-62267=>18819,
-250=>18820,
-62268=>18820,
-468=>18821,
-62269=>18821,
-249=>18822,
-62270=>18822,
-470=>18823,
-62271=>18823,
-472=>18824,
-62272=>18824,
-474=>18825,
-62273=>18825,
-476=>18826,
-62274=>18826,
-252=>18827,
-62275=>18827,
-62276=>18828,
-7871=>18829,
-62277=>18829,
-62278=>18830,
-7873=>18831,
-62279=>18831,
-234=>18832,
-62280=>18832,
-609=>18833,
-62281=>18833,
-643=>18834,
-63551=>18834,
-592=>18835,
-63552=>18835,
-603=>18836,
-63553=>18836,
-596=>18837,
-63554=>18837,
-629=>18838,
-63555=>18838,
-339=>18839,
-63556=>18839,
-248=>18840,
-63557=>18840,
-331=>18841,
-63558=>18841,
-650=>18842,
-63559=>18842,
-618=>18843,
-63560=>18843,
-9178=>18844,
-62282=>18844,
-9179=>18845,
-62283=>18845,
-11933=>18846,
-63530=>18846,
-11974=>18847,
-63539=>18847,
-12003=>18848,
-63547=>18848,
-20539=>18849,
-28158=>18850,
-171123=>18851,
-62841=>18851,
-40870=>18852,
-62842=>18852,
-15817=>18853,
-62843=>18853,
-34959=>18854,
-62845=>18855,
-147790=>18855,
-28791=>18856,
-23797=>18857,
-19232=>18858,
-62848=>18858,
-152013=>18859,
-62849=>18859,
-13657=>18860,
-62850=>18860,
-154928=>18861,
-62851=>18861,
-24866=>18862,
-62853=>18863,
-166450=>18863,
-36775=>18864,
-37366=>18865,
-29073=>18866,
-26393=>18867,
-29626=>18868,
-144001=>18869,
-62859=>18869,
-172295=>18870,
-62860=>18870,
-15499=>18871,
-62861=>18871,
-137600=>18872,
-62862=>18872,
-19216=>18873,
-62863=>18873,
-30948=>18874,
-29698=>18875,
-20910=>18876,
-165647=>18877,
-62867=>18877,
-16393=>18878,
-62868=>18878,
-27235=>18879,
-172730=>18880,
-62870=>18880,
-16931=>18881,
-62871=>18881,
-34319=>18882,
-31274=>18883,
-170311=>18884,
-62875=>18884,
-166634=>18885,
-62876=>18885,
-38741=>18886,
-28749=>18887,
-21284=>18888,
-62880=>18889,
-139390=>18889,
-37876=>18890,
-30425=>18891,
-166371=>18892,
-62883=>18892,
-40871=>18893,
-62884=>18893,
-30685=>18894,
-20131=>18895,
-20464=>18896,
-20668=>18897,
-20015=>18898,
-20247=>18899,
-40872=>18900,
-62891=>18900,
-21556=>18901,
-32139=>18902,
-22674=>18903,
-22736=>18904,
-62896=>18905,
-138678=>18905,
-24210=>18906,
-24217=>18907,
-24514=>18908,
-62900=>18909,
-141074=>18909,
-25995=>18910,
-62902=>18911,
-144377=>18911,
-26905=>18912,
-27203=>18913,
-62905=>18914,
-146531=>18914,
-27903=>18915,
-29184=>18916,
-62909=>18917,
-148741=>18917,
-29580=>18918,
-16091=>18919,
-62911=>18919,
-150035=>18920,
-62912=>18920,
-23317=>18921,
-29881=>18922,
-35715=>18923,
-154788=>18924,
-62916=>18924,
-153237=>18925,
-62917=>18925,
-31379=>18926,
-31724=>18927,
-31939=>18928,
-32364=>18929,
-33528=>18930,
-34199=>18931,
-40873=>18932,
-62924=>18932,
-34960=>18933,
-40874=>18934,
-62926=>18934,
-36537=>18935,
-40875=>18936,
-62928=>18936,
-36815=>18937,
-34143=>18938,
-39392=>18939,
-37409=>18940,
-40876=>18941,
-62933=>18941,
-167353=>18942,
-62934=>18942,
-136255=>18943,
-62935=>18943,
-16497=>18944,
-62936=>18944,
-17058=>18945,
-62937=>18945,
-23066=>18946,
-39016=>18947,
-26475=>18948,
-17014=>18949,
-62944=>18949,
-22333=>18950,
-34262=>18951,
-62948=>18952,
-149883=>18952,
-33471=>18953,
-160013=>18954,
-62950=>18954,
-19585=>18955,
-62951=>18955,
-159092=>18956,
-62952=>18956,
-23931=>18957,
-158485=>18958,
-62954=>18958,
-159678=>18959,
-62955=>18959,
-40877=>18960,
-62956=>18960,
-40878=>18961,
-62957=>18961,
-23446=>18962,
-40879=>18963,
-62959=>18963,
-32347=>18964,
-17392=>18965,
-19506=>18966,
-17923=>18967,
-17830=>18968,
-17784=>18969,
-160359=>18970,
-19831=>18971,
-17843=>18972,
-162993=>18973,
-19682=>18974,
-163013=>18975,
-15253=>18976,
-18230=>18977,
-18244=>18978,
-19527=>18979,
-19520=>18980,
-148159=>18981,
-144919=>18982,
-160594=>18983,
-159371=>18984,
-159954=>18985,
-19543=>18986,
-172881=>18987,
-18255=>18988,
-17882=>18989,
-19589=>18990,
-162924=>18991,
-19719=>18992,
-19108=>18993,
-18081=>18994,
-158499=>18995,
-29221=>18996,
-154196=>18997,
-137827=>18998,
-146950=>18999,
-147297=>19000,
-26189=>19001,
-22267=>19002,
-32149=>19003,
-22813=>19004,
-166841=>19005,
-15860=>19006,
-38708=>19007,
-162799=>19008,
-23515=>19009,
-138590=>19010,
-23204=>19011,
-13861=>19012,
-171696=>19013,
-23249=>19014,
-23479=>19015,
-23804=>19016,
-26478=>19017,
-34195=>19018,
-170309=>19019,
-29793=>19020,
-29853=>19021,
-133743=>19022,
-26343=>19023,
-28247=>19024,
-31178=>19025,
-15752=>19026,
-17603=>19027,
-143958=>19028,
-141206=>19029,
-17306=>19030,
-17718=>19031,
-23765=>19032,
-146202=>19033,
-35577=>19034,
-23672=>19035,
-15634=>19036,
-144721=>19037,
-23928=>19038,
-40882=>19039,
-29015=>19040,
-17752=>19041,
-147692=>19042,
-138787=>19043,
-19575=>19044,
-14712=>19045,
-13386=>19046,
-131492=>19047,
-158785=>19048,
-35532=>19049,
-20404=>19050,
-131641=>19051,
-22975=>19052,
-33132=>19053,
-38998=>19054,
-170234=>19055,
-24379=>19056,
-134047=>19057,
-139713=>19058,
-166253=>19059,
-16642=>19060,
-18107=>19061,
-168057=>19062,
-16135=>19063,
-40883=>19064,
-172469=>19065,
-16632=>19066,
-14294=>19067,
-18167=>19068,
-158790=>19069,
-16764=>19070,
-165554=>19071,
-160767=>19072,
-17773=>19073,
-14548=>19074,
-152730=>19075,
-17761=>19076,
-17691=>19077,
-19849=>19078,
-19579=>19079,
-19830=>19080,
-17898=>19081,
-16328=>19082,
-150287=>19083,
-13921=>19084,
-17630=>19085,
-17597=>19086,
-16877=>19087,
-);
-?>
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/uni2cid_ag15.php b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/uni2cid_ag15.php
deleted file mode 100644
index c19acb5d..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/uni2cid_ag15.php
+++ /dev/null
@@ -1,30222 +0,0 @@
-<?php
-// unicode to cid conversion table is from
-// ftp://ftp.oreilly.com/pub/examples/nutshell/cjkv/adobe/
-// cid2code.txt in ag15.tar.Z
-$cidinfo['uni2cid'] = array(
-32=>1,
-33=>2,
-34=>3,
-35=>4,
-36=>5,
-37=>6,
-38=>7,
-39=>8,
-40=>9,
-41=>10,
-42=>11,
-43=>12,
-44=>13,
-45=>14,
-46=>15,
-47=>16,
-48=>17,
-49=>18,
-50=>19,
-51=>20,
-52=>21,
-53=>22,
-54=>23,
-55=>24,
-56=>25,
-57=>26,
-58=>27,
-59=>28,
-60=>29,
-61=>30,
-62=>31,
-63=>32,
-64=>33,
-65=>34,
-66=>35,
-67=>36,
-68=>37,
-69=>38,
-70=>39,
-71=>40,
-72=>41,
-73=>42,
-74=>43,
-75=>44,
-76=>45,
-77=>46,
-78=>47,
-79=>48,
-80=>49,
-81=>50,
-82=>51,
-83=>52,
-84=>53,
-85=>54,
-86=>55,
-87=>56,
-88=>57,
-89=>58,
-90=>59,
-91=>60,
-92=>61,
-93=>62,
-94=>63,
-95=>64,
-96=>65,
-97=>66,
-98=>67,
-99=>68,
-100=>69,
-101=>70,
-102=>71,
-103=>72,
-104=>73,
-105=>74,
-106=>75,
-107=>76,
-108=>77,
-109=>78,
-110=>79,
-111=>80,
-112=>81,
-113=>82,
-114=>83,
-115=>84,
-116=>85,
-117=>86,
-118=>87,
-119=>88,
-120=>89,
-121=>90,
-122=>91,
-123=>92,
-124=>93,
-125=>94,
-126=>95,
-12288=>96,
-12289=>97,
-12290=>98,
-183=>99,
-12539=>99,
-713=>100,
-711=>101,
-168=>102,
-12291=>103,
-12293=>104,
-8212=>105,
-65374=>106,
-8214=>107,
-8230=>108,
-8943=>108,
-8216=>109,
-8217=>110,
-8220=>111,
-8221=>112,
-12308=>113,
-12309=>114,
-12296=>115,
-12297=>116,
-12298=>117,
-12299=>118,
-12300=>119,
-12301=>120,
-12302=>121,
-12303=>122,
-12310=>123,
-12311=>124,
-12304=>125,
-12305=>126,
-177=>127,
-215=>128,
-247=>129,
-8758=>130,
-8743=>131,
-8744=>132,
-8721=>133,
-8719=>134,
-8746=>135,
-8745=>136,
-8712=>137,
-8759=>138,
-8730=>139,
-8869=>140,
-8741=>141,
-8736=>142,
-8978=>143,
-8857=>144,
-8747=>145,
-8750=>146,
-8801=>147,
-8780=>148,
-8776=>149,
-8765=>150,
-8733=>151,
-8800=>152,
-8814=>153,
-8815=>154,
-8804=>155,
-8805=>156,
-8734=>157,
-8757=>158,
-8756=>159,
-9794=>160,
-9792=>161,
-176=>162,
-8242=>163,
-8243=>164,
-8451=>165,
-65284=>166,
-164=>167,
-65504=>168,
-65505=>169,
-8240=>170,
-167=>171,
-8470=>172,
-9734=>173,
-9733=>174,
-9675=>175,
-9679=>176,
-9678=>177,
-9671=>178,
-9670=>179,
-9633=>180,
-9632=>181,
-9651=>182,
-9650=>183,
-8251=>184,
-8594=>185,
-8592=>186,
-8593=>187,
-8595=>188,
-12307=>189,
-9352=>190,
-9353=>191,
-9354=>192,
-9355=>193,
-9356=>194,
-9357=>195,
-9358=>196,
-9359=>197,
-9360=>198,
-9361=>199,
-9362=>200,
-9363=>201,
-9364=>202,
-9365=>203,
-9366=>204,
-9367=>205,
-9368=>206,
-9369=>207,
-9370=>208,
-9371=>209,
-9332=>210,
-9333=>211,
-9334=>212,
-9335=>213,
-9336=>214,
-9337=>215,
-9338=>216,
-9339=>217,
-9340=>218,
-9341=>219,
-9342=>220,
-9343=>221,
-9344=>222,
-9345=>223,
-9346=>224,
-9347=>225,
-9348=>226,
-9349=>227,
-9350=>228,
-9351=>229,
-9312=>230,
-9313=>231,
-9314=>232,
-9315=>233,
-9316=>234,
-9317=>235,
-9318=>236,
-9319=>237,
-9320=>238,
-9321=>239,
-12832=>240,
-12833=>241,
-12834=>242,
-12835=>243,
-12836=>244,
-12837=>245,
-12838=>246,
-12839=>247,
-12840=>248,
-12841=>249,
-8544=>250,
-8545=>251,
-8546=>252,
-8547=>253,
-8548=>254,
-8549=>255,
-8550=>256,
-8551=>257,
-8552=>258,
-8553=>259,
-8554=>260,
-8555=>261,
-65281=>262,
-65282=>263,
-65283=>264,
-65509=>265,
-65285=>266,
-65286=>267,
-65287=>268,
-65288=>269,
-65289=>270,
-65290=>271,
-65291=>272,
-65292=>273,
-65293=>274,
-65294=>275,
-65295=>276,
-65296=>277,
-65297=>278,
-65298=>279,
-65299=>280,
-65300=>281,
-65301=>282,
-65302=>283,
-65303=>284,
-65304=>285,
-65305=>286,
-65306=>287,
-65307=>288,
-65308=>289,
-65309=>290,
-65310=>291,
-65311=>292,
-65312=>293,
-65313=>294,
-65314=>295,
-65315=>296,
-65316=>297,
-65317=>298,
-65318=>299,
-65319=>300,
-65320=>301,
-65321=>302,
-65322=>303,
-65323=>304,
-65324=>305,
-65325=>306,
-65326=>307,
-65327=>308,
-65328=>309,
-65329=>310,
-65330=>311,
-65331=>312,
-65332=>313,
-65333=>314,
-65334=>315,
-65335=>316,
-65336=>317,
-65337=>318,
-65338=>319,
-65339=>320,
-65340=>321,
-65341=>322,
-65342=>323,
-65343=>324,
-65344=>325,
-65345=>326,
-65346=>327,
-65347=>328,
-65348=>329,
-65349=>330,
-65350=>331,
-65351=>332,
-65352=>333,
-65353=>334,
-65354=>335,
-65355=>336,
-65356=>337,
-65357=>338,
-65358=>339,
-65359=>340,
-65360=>341,
-65361=>342,
-65362=>343,
-65363=>344,
-65364=>345,
-65365=>346,
-65366=>347,
-65367=>348,
-65368=>349,
-65369=>350,
-65370=>351,
-65371=>352,
-65372=>353,
-65373=>354,
-65507=>355,
-12353=>356,
-12354=>357,
-12355=>358,
-12356=>359,
-12357=>360,
-12358=>361,
-12359=>362,
-12360=>363,
-12361=>364,
-12362=>365,
-12363=>366,
-12364=>367,
-12365=>368,
-12366=>369,
-12367=>370,
-12368=>371,
-12369=>372,
-12370=>373,
-12371=>374,
-12372=>375,
-12373=>376,
-12374=>377,
-12375=>378,
-12376=>379,
-12377=>380,
-12378=>381,
-12379=>382,
-12380=>383,
-12381=>384,
-12382=>385,
-12383=>386,
-12384=>387,
-12385=>388,
-12386=>389,
-12387=>390,
-12388=>391,
-12389=>392,
-12390=>393,
-12391=>394,
-12392=>395,
-12393=>396,
-12394=>397,
-12395=>398,
-12396=>399,
-12397=>400,
-12398=>401,
-12399=>402,
-12400=>403,
-12401=>404,
-12402=>405,
-12403=>406,
-12404=>407,
-12405=>408,
-12406=>409,
-12407=>410,
-12408=>411,
-12409=>412,
-12410=>413,
-12411=>414,
-12412=>415,
-12413=>416,
-12414=>417,
-12415=>418,
-12416=>419,
-12417=>420,
-12418=>421,
-12419=>422,
-12420=>423,
-12421=>424,
-12422=>425,
-12423=>426,
-12424=>427,
-12425=>428,
-12426=>429,
-12427=>430,
-12428=>431,
-12429=>432,
-12430=>433,
-12431=>434,
-12432=>435,
-12433=>436,
-12434=>437,
-12435=>438,
-12449=>439,
-12450=>440,
-12451=>441,
-12452=>442,
-12453=>443,
-12454=>444,
-12455=>445,
-12456=>446,
-12457=>447,
-12458=>448,
-12459=>449,
-12460=>450,
-12461=>451,
-12462=>452,
-12463=>453,
-12464=>454,
-12465=>455,
-12466=>456,
-12467=>457,
-12468=>458,
-12469=>459,
-12470=>460,
-12471=>461,
-12472=>462,
-12473=>463,
-12474=>464,
-12475=>465,
-12476=>466,
-12477=>467,
-12478=>468,
-12479=>469,
-12480=>470,
-12481=>471,
-12482=>472,
-12483=>473,
-12484=>474,
-12485=>475,
-12486=>476,
-12487=>477,
-12488=>478,
-12489=>479,
-12490=>480,
-12491=>481,
-12492=>482,
-12493=>483,
-12494=>484,
-12495=>485,
-12496=>486,
-12497=>487,
-12498=>488,
-12499=>489,
-12500=>490,
-12501=>491,
-12502=>492,
-12503=>493,
-12504=>494,
-12505=>495,
-12506=>496,
-12507=>497,
-12508=>498,
-12509=>499,
-12510=>500,
-12511=>501,
-12512=>502,
-12513=>503,
-12514=>504,
-12515=>505,
-12516=>506,
-12517=>507,
-12518=>508,
-12519=>509,
-12520=>510,
-12521=>511,
-12522=>512,
-12523=>513,
-12524=>514,
-12525=>515,
-12526=>516,
-12527=>517,
-12528=>518,
-12529=>519,
-12530=>520,
-12531=>521,
-12532=>522,
-12533=>523,
-12534=>524,
-913=>525,
-914=>526,
-915=>527,
-916=>528,
-917=>529,
-918=>530,
-919=>531,
-920=>532,
-921=>533,
-922=>534,
-923=>535,
-924=>536,
-925=>537,
-926=>538,
-927=>539,
-928=>540,
-929=>541,
-931=>542,
-932=>543,
-933=>544,
-934=>545,
-935=>546,
-936=>547,
-937=>548,
-945=>549,
-946=>550,
-947=>551,
-948=>552,
-949=>553,
-950=>554,
-951=>555,
-952=>556,
-953=>557,
-954=>558,
-955=>559,
-956=>560,
-957=>561,
-958=>562,
-959=>563,
-960=>564,
-961=>565,
-963=>566,
-964=>567,
-965=>568,
-966=>569,
-967=>570,
-968=>571,
-969=>572,
-65040=>573,
-59277=>573,
-65042=>574,
-59278=>574,
-65041=>575,
-59279=>575,
-59280=>576,
-65043=>576,
-59281=>577,
-65044=>577,
-59282=>578,
-65045=>578,
-59283=>579,
-65046=>579,
-65077=>580,
-65078=>581,
-65081=>582,
-65082=>583,
-65087=>584,
-65088=>585,
-65085=>586,
-65086=>587,
-65089=>588,
-65090=>589,
-65091=>590,
-65092=>591,
-59284=>592,
-65047=>592,
-59285=>593,
-65048=>593,
-65083=>594,
-65084=>595,
-65079=>596,
-65080=>597,
-65073=>598,
-8285=>599,
-59286=>599,
-65049=>599,
-65075=>600,
-65076=>601,
-1040=>602,
-1041=>603,
-1042=>604,
-1043=>605,
-1044=>606,
-1045=>607,
-1025=>608,
-1046=>609,
-1047=>610,
-1048=>611,
-1049=>612,
-1050=>613,
-1051=>614,
-1052=>615,
-1053=>616,
-1054=>617,
-1055=>618,
-1056=>619,
-1057=>620,
-1058=>621,
-1059=>622,
-1060=>623,
-1061=>624,
-1062=>625,
-1063=>626,
-1064=>627,
-1065=>628,
-1066=>629,
-1067=>630,
-1068=>631,
-1069=>632,
-1070=>633,
-1071=>634,
-1072=>635,
-1073=>636,
-1074=>637,
-1075=>638,
-1076=>639,
-1077=>640,
-1105=>641,
-1078=>642,
-1079=>643,
-1080=>644,
-1081=>645,
-1082=>646,
-1083=>647,
-1084=>648,
-1085=>649,
-1086=>650,
-1087=>651,
-1088=>652,
-1089=>653,
-1090=>654,
-1091=>655,
-1092=>656,
-1093=>657,
-1094=>658,
-1095=>659,
-1096=>660,
-1097=>661,
-1098=>662,
-1099=>663,
-1100=>664,
-1101=>665,
-1102=>666,
-1103=>667,
-257=>668,
-225=>669,
-462=>670,
-224=>671,
-275=>672,
-233=>673,
-283=>674,
-232=>675,
-299=>676,
-237=>677,
-464=>678,
-236=>679,
-333=>680,
-243=>681,
-466=>682,
-242=>683,
-363=>684,
-250=>685,
-468=>686,
-249=>687,
-470=>688,
-472=>689,
-474=>690,
-476=>691,
-252=>692,
-234=>693,
-593=>694,
-7743=>695,
-59335=>695,
-324=>696,
-328=>697,
-505=>698,
-59336=>698,
-609=>699,
-12549=>700,
-12550=>701,
-12551=>702,
-12552=>703,
-12553=>704,
-12554=>705,
-12555=>706,
-12556=>707,
-12557=>708,
-12558=>709,
-12559=>710,
-12560=>711,
-12561=>712,
-12562=>713,
-12563=>714,
-12564=>715,
-12565=>716,
-12566=>717,
-12567=>718,
-12568=>719,
-12569=>720,
-12570=>721,
-12571=>722,
-12572=>723,
-12573=>724,
-12574=>725,
-12575=>726,
-12576=>727,
-12577=>728,
-12578=>729,
-12579=>730,
-12580=>731,
-12581=>732,
-12582=>733,
-12583=>734,
-12584=>735,
-12585=>736,
-9472=>738,
-9473=>739,
-9474=>740,
-9475=>741,
-9476=>742,
-9477=>743,
-9478=>744,
-9479=>745,
-9480=>746,
-9481=>747,
-9482=>748,
-9483=>749,
-9484=>750,
-9485=>751,
-9486=>752,
-9487=>753,
-9488=>754,
-9489=>755,
-9490=>756,
-9491=>757,
-9492=>758,
-9493=>759,
-9494=>760,
-9495=>761,
-9496=>762,
-9497=>763,
-9498=>764,
-9499=>765,
-9500=>766,
-9501=>767,
-9502=>768,
-9503=>769,
-9504=>770,
-9505=>771,
-9506=>772,
-9507=>773,
-9508=>774,
-9509=>775,
-9510=>776,
-9511=>777,
-9512=>778,
-9513=>779,
-9514=>780,
-9515=>781,
-9516=>782,
-9517=>783,
-9518=>784,
-9519=>785,
-9520=>786,
-9521=>787,
-9522=>788,
-9523=>789,
-9524=>790,
-9525=>791,
-9526=>792,
-9527=>793,
-9528=>794,
-9529=>795,
-9530=>796,
-9531=>797,
-9532=>798,
-9533=>799,
-9534=>800,
-9535=>801,
-9536=>802,
-9537=>803,
-9538=>804,
-9539=>805,
-9540=>806,
-9541=>807,
-9542=>808,
-9543=>809,
-9544=>810,
-9545=>811,
-9546=>812,
-9547=>813,
-21834=>940,
-38463=>941,
-22467=>942,
-25384=>943,
-21710=>944,
-21769=>945,
-21696=>946,
-30353=>947,
-30284=>948,
-34108=>949,
-30702=>950,
-33406=>951,
-30861=>952,
-29233=>953,
-38552=>954,
-38797=>955,
-27688=>956,
-23433=>957,
-20474=>958,
-25353=>959,
-26263=>960,
-23736=>961,
-33018=>962,
-26696=>963,
-32942=>964,
-26114=>965,
-30414=>966,
-20985=>967,
-25942=>968,
-29100=>969,
-32753=>970,
-34948=>971,
-20658=>972,
-22885=>973,
-25034=>974,
-28595=>975,
-33453=>976,
-25420=>977,
-25170=>978,
-21485=>979,
-21543=>980,
-31494=>981,
-12043=>982,
-20843=>982,
-30116=>983,
-24052=>984,
-25300=>985,
-36299=>986,
-38774=>987,
-25226=>988,
-32793=>989,
-22365=>990,
-38712=>991,
-32610=>992,
-29240=>993,
-12137=>994,
-30333=>994,
-26575=>995,
-30334=>996,
-25670=>997,
-20336=>998,
-36133=>999,
-25308=>1000,
-31255=>1001,
-26001=>1002,
-29677=>1003,
-25644=>1004,
-25203=>1005,
-33324=>1006,
-39041=>1007,
-26495=>1008,
-29256=>1009,
-25198=>1010,
-25292=>1011,
-20276=>1012,
-29923=>1013,
-21322=>1014,
-21150=>1015,
-32458=>1016,
-37030=>1017,
-24110=>1018,
-26758=>1019,
-27036=>1020,
-33152=>1021,
-32465=>1022,
-26834=>1023,
-30917=>1024,
-34444=>1025,
-38225=>1026,
-20621=>1027,
-35876=>1028,
-33502=>1029,
-32990=>1030,
-21253=>1031,
-35090=>1032,
-21093=>1033,
-34180=>1034,
-38649=>1035,
-20445=>1036,
-22561=>1037,
-39281=>1038,
-23453=>1039,
-25265=>1040,
-25253=>1041,
-26292=>1042,
-35961=>1043,
-40077=>1044,
-29190=>1045,
-26479=>1046,
-30865=>1047,
-24754=>1048,
-21329=>1049,
-21271=>1050,
-36744=>1051,
-32972=>1052,
-36125=>1053,
-38049=>1054,
-20493=>1055,
-29384=>1056,
-22791=>1057,
-24811=>1058,
-28953=>1059,
-34987=>1060,
-22868=>1061,
-33519=>1062,
-26412=>1063,
-31528=>1064,
-23849=>1065,
-32503=>1066,
-29997=>1067,
-27893=>1068,
-36454=>1069,
-36856=>1070,
-36924=>1071,
-12240=>1072,
-40763=>1072,
-12112=>1073,
-27604=>1073,
-37145=>1074,
-31508=>1075,
-24444=>1076,
-30887=>1077,
-34006=>1078,
-34109=>1079,
-27605=>1080,
-27609=>1081,
-27606=>1082,
-24065=>1083,
-24199=>1084,
-30201=>1085,
-38381=>1086,
-25949=>1087,
-24330=>1088,
-24517=>1089,
-36767=>1090,
-22721=>1091,
-33218=>1092,
-36991=>1093,
-38491=>1094,
-38829=>1095,
-36793=>1096,
-32534=>1097,
-36140=>1098,
-25153=>1099,
-20415=>1100,
-21464=>1101,
-21342=>1102,
-36776=>1103,
-36777=>1104,
-36779=>1105,
-36941=>1106,
-26631=>1107,
-24426=>1108,
-33176=>1109,
-34920=>1110,
-40150=>1111,
-24971=>1112,
-21035=>1113,
-30250=>1114,
-24428=>1115,
-25996=>1116,
-28626=>1117,
-28392=>1118,
-23486=>1119,
-25672=>1120,
-20853=>1121,
-20912=>1122,
-26564=>1123,
-19993=>1124,
-31177=>1125,
-39292=>1126,
-28851=>1127,
-30149=>1128,
-24182=>1129,
-29627=>1130,
-33760=>1131,
-25773=>1132,
-25320=>1133,
-38069=>1134,
-27874=>1135,
-21338=>1136,
-21187=>1137,
-25615=>1138,
-38082=>1139,
-31636=>1140,
-20271=>1141,
-24091=>1142,
-33334=>1143,
-33046=>1144,
-33162=>1145,
-28196=>1146,
-27850=>1147,
-39539=>1148,
-25429=>1149,
-12056=>1150,
-21340=>1150,
-21754=>1151,
-34917=>1152,
-22496=>1153,
-19981=>1154,
-24067=>1155,
-27493=>1156,
-31807=>1157,
-37096=>1158,
-24598=>1159,
-25830=>1160,
-29468=>1161,
-35009=>1162,
-26448=>1163,
-25165=>1164,
-36130=>1165,
-30572=>1166,
-36393=>1167,
-37319=>1168,
-24425=>1169,
-33756=>1170,
-34081=>1171,
-39184=>1172,
-21442=>1173,
-34453=>1174,
-27531=>1175,
-24813=>1176,
-24808=>1177,
-28799=>1178,
-33485=>1179,
-33329=>1180,
-20179=>1181,
-27815=>1182,
-34255=>1183,
-25805=>1184,
-31961=>1185,
-27133=>1186,
-26361=>1187,
-33609=>1188,
-21397=>1189,
-31574=>1190,
-20391=>1191,
-20876=>1192,
-27979=>1193,
-23618=>1194,
-36461=>1195,
-25554=>1196,
-21449=>1197,
-33580=>1198,
-33590=>1199,
-26597=>1200,
-30900=>1201,
-25661=>1202,
-23519=>1203,
-23700=>1204,
-24046=>1205,
-35815=>1206,
-25286=>1207,
-26612=>1208,
-35962=>1209,
-25600=>1210,
-25530=>1211,
-34633=>1212,
-39307=>1213,
-35863=>1214,
-32544=>1215,
-38130=>1216,
-20135=>1217,
-38416=>1218,
-39076=>1219,
-26124=>1220,
-29462=>1221,
-22330=>1222,
-23581=>1223,
-24120=>1224,
-38271=>1225,
-20607=>1226,
-32928=>1227,
-12058=>1228,
-21378=>1228,
-25950=>1229,
-30021=>1230,
-21809=>1231,
-20513=>1232,
-36229=>1233,
-25220=>1234,
-38046=>1235,
-26397=>1236,
-22066=>1237,
-28526=>1238,
-24034=>1239,
-21557=>1240,
-28818=>1241,
-36710=>1242,
-25199=>1243,
-25764=>1244,
-25507=>1245,
-24443=>1246,
-28552=>1247,
-37108=>1248,
-12162=>1249,
-33251=>1249,
-12192=>1250,
-36784=>1250,
-23576=>1251,
-26216=>1252,
-24561=>1253,
-27785=>1254,
-38472=>1255,
-36225=>1256,
-34924=>1257,
-25745=>1258,
-31216=>1259,
-22478=>1260,
-27225=>1261,
-25104=>1262,
-21576=>1263,
-20056=>1264,
-31243=>1265,
-24809=>1266,
-28548=>1267,
-35802=>1268,
-25215=>1269,
-36894=>1270,
-39563=>1271,
-31204=>1272,
-21507=>1273,
-30196=>1274,
-25345=>1275,
-21273=>1276,
-27744=>1277,
-36831=>1278,
-24347=>1279,
-39536=>1280,
-32827=>1281,
-40831=>1282,
-20360=>1283,
-23610=>1284,
-12186=>1285,
-36196=>1285,
-32709=>1286,
-26021=>1287,
-28861=>1288,
-20805=>1289,
-20914=>1290,
-12173=>1291,
-34411=>1291,
-23815=>1292,
-23456=>1293,
-25277=>1294,
-37228=>1295,
-30068=>1296,
-36364=>1297,
-31264=>1298,
-24833=>1299,
-31609=>1300,
-20167=>1301,
-32504=>1302,
-30597=>1303,
-19985=>1304,
-33261=>1305,
-21021=>1306,
-20986=>1307,
-27249=>1308,
-21416=>1309,
-36487=>1310,
-38148=>1311,
-38607=>1312,
-28353=>1313,
-38500=>1314,
-26970=>1315,
-30784=>1316,
-20648=>1317,
-30679=>1318,
-25616=>1319,
-35302=>1320,
-22788=>1321,
-25571=>1322,
-24029=>1323,
-31359=>1324,
-26941=>1325,
-20256=>1326,
-33337=>1327,
-21912=>1328,
-20018=>1329,
-30126=>1330,
-31383=>1331,
-24162=>1332,
-24202=>1333,
-38383=>1334,
-21019=>1335,
-21561=>1336,
-28810=>1337,
-25462=>1338,
-38180=>1339,
-22402=>1340,
-26149=>1341,
-26943=>1342,
-37255=>1343,
-21767=>1344,
-28147=>1345,
-32431=>1346,
-34850=>1347,
-25139=>1348,
-32496=>1349,
-30133=>1350,
-33576=>1351,
-30913=>1352,
-38604=>1353,
-36766=>1354,
-24904=>1355,
-29943=>1356,
-35789=>1357,
-27492=>1358,
-21050=>1359,
-36176=>1360,
-27425=>1361,
-32874=>1362,
-33905=>1363,
-22257=>1364,
-21254=>1365,
-20174=>1366,
-19995=>1367,
-20945=>1368,
-31895=>1369,
-37259=>1370,
-31751=>1371,
-20419=>1372,
-36479=>1373,
-31713=>1374,
-31388=>1375,
-25703=>1376,
-23828=>1377,
-20652=>1378,
-33030=>1379,
-30209=>1380,
-31929=>1381,
-28140=>1382,
-32736=>1383,
-26449=>1384,
-23384=>1385,
-12072=>1386,
-23544=>1386,
-30923=>1387,
-25774=>1388,
-25619=>1389,
-25514=>1390,
-25387=>1391,
-38169=>1392,
-25645=>1393,
-36798=>1394,
-31572=>1395,
-30249=>1396,
-25171=>1397,
-12068=>1398,
-22823=>1398,
-21574=>1399,
-12109=>1400,
-27513=>1400,
-20643=>1401,
-25140=>1402,
-24102=>1403,
-27526=>1404,
-20195=>1405,
-36151=>1406,
-34955=>1407,
-24453=>1408,
-36910=>1409,
-24608=>1410,
-32829=>1411,
-25285=>1412,
-20025=>1413,
-21333=>1414,
-37112=>1415,
-25528=>1416,
-32966=>1417,
-26086=>1418,
-27694=>1419,
-20294=>1420,
-24814=>1421,
-28129=>1422,
-35806=>1423,
-24377=>1424,
-34507=>1425,
-24403=>1426,
-25377=>1427,
-20826=>1428,
-33633=>1429,
-26723=>1430,
-12049=>1431,
-20992=>1431,
-25443=>1432,
-36424=>1433,
-20498=>1434,
-23707=>1435,
-31095=>1436,
-23548=>1437,
-21040=>1438,
-31291=>1439,
-24764=>1440,
-36947=>1441,
-30423=>1442,
-24503=>1443,
-24471=>1444,
-30340=>1445,
-36460=>1446,
-28783=>1447,
-30331=>1448,
-31561=>1449,
-30634=>1450,
-20979=>1451,
-37011=>1452,
-22564=>1453,
-20302=>1454,
-28404=>1455,
-36842=>1456,
-25932=>1457,
-31515=>1458,
-29380=>1459,
-28068=>1460,
-32735=>1461,
-23265=>1462,
-25269=>1463,
-24213=>1464,
-22320=>1465,
-33922=>1466,
-31532=>1467,
-24093=>1468,
-24351=>1469,
-36882=>1470,
-32532=>1471,
-39072=>1472,
-25474=>1473,
-28359=>1474,
-30872=>1475,
-28857=>1476,
-20856=>1477,
-38747=>1478,
-22443=>1479,
-30005=>1480,
-20291=>1481,
-30008=>1482,
-24215=>1483,
-24806=>1484,
-22880=>1485,
-28096=>1486,
-27583=>1487,
-30857=>1488,
-21500=>1489,
-38613=>1490,
-20939=>1491,
-20993=>1492,
-25481=>1493,
-21514=>1494,
-38035=>1495,
-35843=>1496,
-36300=>1497,
-29241=>1498,
-30879=>1499,
-34678=>1500,
-36845=>1501,
-35853=>1502,
-21472=>1503,
-19969=>1504,
-30447=>1505,
-21486=>1506,
-38025=>1507,
-39030=>1508,
-12237=>1509,
-40718=>1509,
-38189=>1510,
-23450=>1511,
-35746=>1512,
-20002=>1513,
-19996=>1514,
-20908=>1515,
-33891=>1516,
-25026=>1517,
-21160=>1518,
-26635=>1519,
-20375=>1520,
-24683=>1521,
-20923=>1522,
-27934=>1523,
-20828=>1524,
-25238=>1525,
-12099=>1526,
-26007=>1526,
-38497=>1527,
-12182=>1528,
-35910=>1528,
-36887=>1529,
-30168=>1530,
-37117=>1531,
-30563=>1532,
-27602=>1533,
-29322=>1534,
-29420=>1535,
-35835=>1536,
-22581=>1537,
-30585=>1538,
-36172=>1539,
-26460=>1540,
-38208=>1541,
-32922=>1542,
-24230=>1543,
-28193=>1544,
-22930=>1545,
-31471=>1546,
-30701=>1547,
-38203=>1548,
-27573=>1549,
-26029=>1550,
-32526=>1551,
-22534=>1552,
-20817=>1553,
-38431=>1554,
-23545=>1555,
-22697=>1556,
-21544=>1557,
-36466=>1558,
-25958=>1559,
-39039=>1560,
-22244=>1561,
-38045=>1562,
-30462=>1563,
-36929=>1564,
-25479=>1565,
-21702=>1566,
-22810=>1567,
-22842=>1568,
-22427=>1569,
-36530=>1570,
-26421=>1571,
-36346=>1572,
-33333=>1573,
-21057=>1574,
-24816=>1575,
-22549=>1576,
-34558=>1577,
-23784=>1578,
-40517=>1579,
-20420=>1580,
-39069=>1581,
-35769=>1582,
-23077=>1583,
-24694=>1584,
-21380=>1585,
-25212=>1586,
-36943=>1587,
-37122=>1588,
-39295=>1589,
-24681=>1590,
-12157=>1591,
-32780=>1591,
-12041=>1592,
-20799=>1592,
-12159=>1593,
-32819=>1593,
-23572=>1594,
-39285=>1595,
-27953=>1596,
-12038=>1597,
-20108=>1597,
-36144=>1598,
-21457=>1599,
-32602=>1600,
-31567=>1601,
-20240=>1602,
-20047=>1603,
-38400=>1604,
-27861=>1605,
-29648=>1606,
-34281=>1607,
-24070=>1608,
-30058=>1609,
-32763=>1610,
-27146=>1611,
-30718=>1612,
-38034=>1613,
-32321=>1614,
-20961=>1615,
-28902=>1616,
-21453=>1617,
-36820=>1618,
-33539=>1619,
-36137=>1620,
-29359=>1621,
-39277=>1622,
-27867=>1623,
-22346=>1624,
-33459=>1625,
-12101=>1626,
-26041=>1626,
-32938=>1627,
-25151=>1628,
-38450=>1629,
-22952=>1630,
-20223=>1631,
-35775=>1632,
-32442=>1633,
-25918=>1634,
-33778=>1635,
-12206=>1636,
-38750=>1636,
-21857=>1637,
-39134=>1638,
-32933=>1639,
-21290=>1640,
-35837=>1641,
-21536=>1642,
-32954=>1643,
-24223=>1644,
-27832=>1645,
-36153=>1646,
-33452=>1647,
-37210=>1648,
-21545=>1649,
-27675=>1650,
-20998=>1651,
-32439=>1652,
-22367=>1653,
-28954=>1654,
-27774=>1655,
-31881=>1656,
-22859=>1657,
-20221=>1658,
-24575=>1659,
-24868=>1660,
-31914=>1661,
-20016=>1662,
-23553=>1663,
-26539=>1664,
-34562=>1665,
-23792=>1666,
-38155=>1667,
-39118=>1668,
-30127=>1669,
-28925=>1670,
-36898=>1671,
-20911=>1672,
-32541=>1673,
-35773=>1674,
-22857=>1675,
-20964=>1676,
-20315=>1677,
-21542=>1678,
-22827=>1679,
-25975=>1680,
-32932=>1681,
-23413=>1682,
-25206=>1683,
-25282=>1684,
-36752=>1685,
-24133=>1686,
-27679=>1687,
-31526=>1688,
-20239=>1689,
-20440=>1690,
-26381=>1691,
-28014=>1692,
-28074=>1693,
-31119=>1694,
-34993=>1695,
-24343=>1696,
-29995=>1697,
-25242=>1698,
-36741=>1699,
-20463=>1700,
-37340=>1701,
-26023=>1702,
-33071=>1703,
-33105=>1704,
-24220=>1705,
-33104=>1706,
-36212=>1707,
-21103=>1708,
-35206=>1709,
-36171=>1710,
-22797=>1711,
-20613=>1712,
-20184=>1713,
-12201=>1714,
-38428=>1714,
-12119=>1715,
-29238=>1715,
-33145=>1716,
-36127=>1717,
-23500=>1718,
-35747=>1719,
-38468=>1720,
-22919=>1721,
-32538=>1722,
-21648=>1723,
-22134=>1724,
-22030=>1725,
-35813=>1726,
-25913=>1727,
-27010=>1728,
-38041=>1729,
-30422=>1730,
-28297=>1731,
-12082=>1732,
-24178=>1732,
-12130=>1733,
-29976=>1733,
-26438=>1734,
-26577=>1735,
-31487=>1736,
-32925=>1737,
-36214=>1738,
-24863=>1739,
-31174=>1740,
-25954=>1741,
-36195=>1742,
-20872=>1743,
-21018=>1744,
-38050=>1745,
-32568=>1746,
-32923=>1747,
-32434=>1748,
-23703=>1749,
-28207=>1750,
-26464=>1751,
-31705=>1752,
-30347=>1753,
-12220=>1754,
-39640=>1754,
-33167=>1755,
-32660=>1756,
-31957=>1757,
-25630=>1758,
-38224=>1759,
-31295=>1760,
-21578=>1761,
-21733=>1762,
-27468=>1763,
-25601=>1764,
-12093=>1765,
-25096=>1765,
-40509=>1766,
-33011=>1767,
-30105=>1768,
-21106=>1769,
-12208=>1770,
-38761=>1770,
-33883=>1771,
-26684=>1772,
-34532=>1773,
-38401=>1774,
-38548=>1775,
-38124=>1776,
-20010=>1777,
-21508=>1778,
-32473=>1779,
-26681=>1780,
-36319=>1781,
-32789=>1782,
-26356=>1783,
-24218=>1784,
-32697=>1785,
-22466=>1786,
-32831=>1787,
-26775=>1788,
-12079=>1789,
-24037=>1789,
-25915=>1790,
-21151=>1791,
-24685=>1792,
-40858=>1793,
-20379=>1794,
-36524=>1795,
-20844=>1796,
-23467=>1797,
-12088=>1798,
-24339=>1798,
-24041=>1799,
-27742=>1800,
-25329=>1801,
-36129=>1802,
-20849=>1803,
-38057=>1804,
-21246=>1805,
-27807=>1806,
-33503=>1807,
-29399=>1808,
-22434=>1809,
-26500=>1810,
-36141=>1811,
-22815=>1812,
-36764=>1813,
-33735=>1814,
-21653=>1815,
-31629=>1816,
-20272=>1817,
-27837=>1818,
-23396=>1819,
-22993=>1820,
-12238=>1821,
-40723=>1821,
-21476=>1822,
-34506=>1823,
-12219=>1824,
-39592=>1824,
-12181=>1825,
-35895=>1825,
-32929=>1826,
-25925=>1827,
-39038=>1828,
-22266=>1829,
-38599=>1830,
-21038=>1831,
-12128=>1832,
-29916=>1832,
-21072=>1833,
-23521=>1834,
-25346=>1835,
-35074=>1836,
-20054=>1837,
-25296=>1838,
-24618=>1839,
-26874=>1840,
-20851=>1841,
-23448=>1842,
-20896=>1843,
-35266=>1844,
-31649=>1845,
-39302=>1846,
-32592=>1847,
-24815=>1848,
-28748=>1849,
-36143=>1850,
-20809=>1851,
-12084=>1852,
-24191=>1852,
-36891=>1853,
-29808=>1854,
-35268=>1855,
-22317=>1856,
-30789=>1857,
-24402=>1858,
-40863=>1859,
-38394=>1860,
-36712=>1861,
-12225=>1862,
-39740=>1862,
-35809=>1863,
-30328=>1864,
-26690=>1865,
-26588=>1866,
-36330=>1867,
-36149=>1868,
-21053=>1869,
-36746=>1870,
-28378=>1871,
-26829=>1872,
-38149=>1873,
-37101=>1874,
-22269=>1875,
-26524=>1876,
-35065=>1877,
-36807=>1878,
-21704=>1879,
-39608=>1880,
-23401=>1881,
-28023=>1882,
-27686=>1883,
-20133=>1884,
-23475=>1885,
-39559=>1886,
-37219=>1887,
-25000=>1888,
-37039=>1889,
-38889=>1890,
-21547=>1891,
-28085=>1892,
-23506=>1893,
-20989=>1894,
-21898=>1895,
-32597=>1896,
-32752=>1897,
-25788=>1898,
-25421=>1899,
-26097=>1900,
-25022=>1901,
-24717=>1902,
-28938=>1903,
-27735=>1904,
-27721=>1905,
-22831=>1906,
-26477=>1907,
-33322=>1908,
-22741=>1909,
-22158=>1910,
-35946=>1911,
-27627=>1912,
-37085=>1913,
-22909=>1914,
-32791=>1915,
-21495=>1916,
-28009=>1917,
-21621=>1918,
-21917=>1919,
-33655=>1920,
-33743=>1921,
-26680=>1922,
-12146=>1923,
-31166=>1923,
-21644=>1924,
-20309=>1925,
-21512=>1926,
-30418=>1927,
-35977=>1928,
-38402=>1929,
-27827=>1930,
-28088=>1931,
-36203=>1932,
-35088=>1933,
-40548=>1934,
-36154=>1935,
-22079=>1936,
-12234=>1937,
-40657=>1937,
-30165=>1938,
-24456=>1939,
-29408=>1940,
-24680=>1941,
-21756=>1942,
-20136=>1943,
-27178=>1944,
-34913=>1945,
-24658=>1946,
-36720=>1947,
-21700=>1948,
-28888=>1949,
-34425=>1950,
-40511=>1951,
-27946=>1952,
-23439=>1953,
-24344=>1954,
-32418=>1955,
-21897=>1956,
-20399=>1957,
-29492=>1958,
-21564=>1959,
-21402=>1960,
-20505=>1961,
-21518=>1962,
-21628=>1963,
-20046=>1964,
-24573=>1965,
-29786=>1966,
-22774=>1967,
-33899=>1968,
-32993=>1969,
-34676=>1970,
-29392=>1971,
-31946=>1972,
-28246=>1973,
-24359=>1974,
-34382=>1975,
-21804=>1976,
-25252=>1977,
-20114=>1978,
-27818=>1979,
-25143=>1980,
-33457=>1981,
-21719=>1982,
-21326=>1983,
-29502=>1984,
-28369=>1985,
-30011=>1986,
-21010=>1987,
-21270=>1988,
-35805=>1989,
-27088=>1990,
-24458=>1991,
-24576=>1992,
-28142=>1993,
-22351=>1994,
-27426=>1995,
-29615=>1996,
-26707=>1997,
-36824=>1998,
-32531=>1999,
-25442=>2000,
-24739=>2001,
-21796=>2002,
-30186=>2003,
-35938=>2004,
-28949=>2005,
-28067=>2006,
-23462=>2007,
-24187=>2008,
-33618=>2009,
-24908=>2010,
-40644=>2011,
-30970=>2012,
-34647=>2013,
-31783=>2014,
-30343=>2015,
-20976=>2016,
-24822=>2017,
-29004=>2018,
-26179=>2019,
-24140=>2020,
-24653=>2021,
-35854=>2022,
-28784=>2023,
-25381=>2024,
-36745=>2025,
-24509=>2026,
-24674=>2027,
-34516=>2028,
-22238=>2029,
-27585=>2030,
-24724=>2031,
-24935=>2032,
-21321=>2033,
-24800=>2034,
-26214=>2035,
-36159=>2036,
-31229=>2037,
-20250=>2038,
-28905=>2039,
-27719=>2040,
-35763=>2041,
-35826=>2042,
-32472=>2043,
-33636=>2044,
-26127=>2045,
-23130=>2046,
-39746=>2047,
-27985=>2048,
-28151=>2049,
-35905=>2050,
-27963=>2051,
-20249=>2052,
-12117=>2053,
-28779=>2053,
-33719=>2054,
-25110=>2055,
-24785=>2056,
-38669=>2057,
-36135=>2058,
-31096=>2059,
-20987=>2060,
-22334=>2061,
-22522=>2062,
-26426=>2063,
-30072=>2064,
-31293=>2065,
-31215=>2066,
-31637=>2067,
-32908=>2068,
-39269=>2069,
-36857=>2070,
-28608=>2071,
-35749=>2072,
-40481=>2073,
-23020=>2074,
-32489=>2075,
-32521=>2076,
-21513=>2077,
-26497=>2078,
-26840=>2079,
-36753=>2080,
-31821=>2081,
-38598=>2082,
-21450=>2083,
-24613=>2084,
-30142=>2085,
-27762=>2086,
-21363=>2087,
-23241=>2088,
-32423=>2089,
-25380=>2090,
-12047=>2091,
-20960=>2091,
-33034=>2092,
-12080=>2093,
-24049=>2093,
-34015=>2094,
-25216=>2095,
-20864=>2096,
-23395=>2097,
-20238=>2098,
-31085=>2099,
-21058=>2100,
-24760=>2101,
-27982=>2102,
-23492=>2103,
-23490=>2104,
-35745=>2105,
-35760=>2106,
-26082=>2107,
-24524=>2108,
-38469=>2109,
-22931=>2110,
-32487=>2111,
-32426=>2112,
-22025=>2113,
-26551=>2114,
-22841=>2115,
-20339=>2116,
-23478=>2117,
-21152=>2118,
-33626=>2119,
-39050=>2120,
-36158=>2121,
-30002=>2122,
-38078=>2123,
-20551=>2124,
-31292=>2125,
-20215=>2126,
-26550=>2127,
-39550=>2128,
-23233=>2129,
-27516=>2130,
-30417=>2131,
-22362=>2132,
-23574=>2133,
-31546=>2134,
-38388=>2135,
-29006=>2136,
-20860=>2137,
-32937=>2138,
-33392=>2139,
-22904=>2140,
-32516=>2141,
-33575=>2142,
-26816=>2143,
-26604=>2144,
-30897=>2145,
-30839=>2146,
-25315=>2147,
-25441=>2148,
-31616=>2149,
-20461=>2150,
-21098=>2151,
-20943=>2152,
-33616=>2153,
-27099=>2154,
-37492=>2155,
-36341=>2156,
-36145=>2157,
-35265=>2158,
-38190=>2159,
-31661=>2160,
-20214=>2161,
-20581=>2162,
-33328=>2163,
-21073=>2164,
-39279=>2165,
-28176=>2166,
-28293=>2167,
-28071=>2168,
-24314=>2169,
-20725=>2170,
-23004=>2171,
-23558=>2172,
-27974=>2173,
-27743=>2174,
-30086=>2175,
-33931=>2176,
-26728=>2177,
-22870=>2178,
-35762=>2179,
-21280=>2180,
-37233=>2181,
-38477=>2182,
-34121=>2183,
-26898=>2184,
-30977=>2185,
-28966=>2186,
-33014=>2187,
-20132=>2188,
-37066=>2189,
-27975=>2190,
-39556=>2191,
-23047=>2192,
-22204=>2193,
-25605=>2194,
-38128=>2195,
-30699=>2196,
-20389=>2197,
-33050=>2198,
-29409=>2199,
-12179=>2200,
-35282=>2200,
-39290=>2201,
-32564=>2202,
-32478=>2203,
-21119=>2204,
-25945=>2205,
-37237=>2206,
-36735=>2207,
-36739=>2208,
-21483=>2209,
-31382=>2210,
-25581=>2211,
-25509=>2212,
-30342=>2213,
-31224=>2214,
-34903=>2215,
-38454=>2216,
-25130=>2217,
-21163=>2218,
-33410=>2219,
-26708=>2220,
-26480=>2221,
-25463=>2222,
-30571=>2223,
-31469=>2224,
-27905=>2225,
-32467=>2226,
-35299=>2227,
-22992=>2228,
-25106=>2229,
-34249=>2230,
-33445=>2231,
-30028=>2232,
-20511=>2233,
-20171=>2234,
-30117=>2235,
-35819=>2236,
-23626=>2237,
-12081=>2238,
-24062=>2238,
-31563=>2239,
-12100=>2240,
-26020=>2240,
-12198=>2241,
-37329=>2241,
-20170=>2242,
-27941=>2243,
-35167=>2244,
-32039=>2245,
-38182=>2246,
-20165=>2247,
-35880=>2248,
-36827=>2249,
-38771=>2250,
-26187=>2251,
-31105=>2252,
-36817=>2253,
-28908=>2254,
-28024=>2255,
-23613=>2256,
-21170=>2257,
-33606=>2258,
-20834=>2259,
-33550=>2260,
-30555=>2261,
-26230=>2262,
-40120=>2263,
-20140=>2264,
-24778=>2265,
-31934=>2266,
-31923=>2267,
-32463=>2268,
-20117=>2269,
-35686=>2270,
-26223=>2271,
-39048=>2272,
-38745=>2273,
-22659=>2274,
-25964=>2275,
-38236=>2276,
-24452=>2277,
-30153=>2278,
-38742=>2279,
-31455=>2280,
-31454=>2281,
-20928=>2282,
-28847=>2283,
-31384=>2284,
-25578=>2285,
-31350=>2286,
-32416=>2287,
-29590=>2288,
-12210=>2289,
-38893=>2289,
-20037=>2290,
-28792=>2291,
-20061=>2292,
-37202=>2293,
-21417=>2294,
-25937=>2295,
-26087=>2296,
-12165=>2297,
-33276=>2297,
-33285=>2298,
-21646=>2299,
-23601=>2300,
-30106=>2301,
-38816=>2302,
-25304=>2303,
-29401=>2304,
-30141=>2305,
-23621=>2306,
-39545=>2307,
-33738=>2308,
-23616=>2309,
-21632=>2310,
-30697=>2311,
-20030=>2312,
-27822=>2313,
-32858=>2314,
-25298=>2315,
-25454=>2316,
-24040=>2317,
-20855=>2318,
-36317=>2319,
-36382=>2320,
-38191=>2321,
-20465=>2322,
-21477=>2323,
-24807=>2324,
-28844=>2325,
-21095=>2326,
-25424=>2327,
-40515=>2328,
-23071=>2329,
-20518=>2330,
-30519=>2331,
-21367=>2332,
-32482=>2333,
-25733=>2334,
-25899=>2335,
-25225=>2336,
-25496=>2337,
-20500=>2338,
-29237=>2339,
-35273=>2340,
-20915=>2341,
-35776=>2342,
-32477=>2343,
-22343=>2344,
-33740=>2345,
-38055=>2346,
-20891=>2347,
-21531=>2348,
-23803=>2349,
-20426=>2350,
-31459=>2351,
-27994=>2352,
-37089=>2353,
-39567=>2354,
-21888=>2355,
-21654=>2356,
-21345=>2357,
-21679=>2358,
-24320=>2359,
-25577=>2360,
-26999=>2361,
-20975=>2362,
-24936=>2363,
-21002=>2364,
-22570=>2365,
-21208=>2366,
-22350=>2367,
-30733=>2368,
-30475=>2369,
-24247=>2370,
-24951=>2371,
-31968=>2372,
-25179=>2373,
-25239=>2374,
-20130=>2375,
-28821=>2376,
-32771=>2377,
-25335=>2378,
-28900=>2379,
-38752=>2380,
-22391=>2381,
-33499=>2382,
-26607=>2383,
-26869=>2384,
-30933=>2385,
-39063=>2386,
-31185=>2387,
-22771=>2388,
-21683=>2389,
-21487=>2390,
-28212=>2391,
-20811=>2392,
-21051=>2393,
-23458=>2394,
-35838=>2395,
-32943=>2396,
-21827=>2397,
-22438=>2398,
-24691=>2399,
-22353=>2400,
-21549=>2401,
-31354=>2402,
-24656=>2403,
-23380=>2404,
-25511=>2405,
-25248=>2406,
-12061=>2407,
-21475=>2407,
-25187=>2408,
-23495=>2409,
-26543=>2410,
-21741=>2411,
-31391=>2412,
-33510=>2413,
-37239=>2414,
-24211=>2415,
-35044=>2416,
-22840=>2417,
-22446=>2418,
-25358=>2419,
-36328=>2420,
-33007=>2421,
-22359=>2422,
-31607=>2423,
-20393=>2424,
-24555=>2425,
-23485=>2426,
-27454=>2427,
-21281=>2428,
-31568=>2429,
-29378=>2430,
-26694=>2431,
-30719=>2432,
-30518=>2433,
-26103=>2434,
-20917=>2435,
-20111=>2436,
-30420=>2437,
-23743=>2438,
-31397=>2439,
-33909=>2440,
-22862=>2441,
-39745=>2442,
-20608=>2443,
-39304=>2444,
-24871=>2445,
-28291=>2446,
-22372=>2447,
-26118=>2448,
-25414=>2449,
-22256=>2450,
-25324=>2451,
-25193=>2452,
-24275=>2453,
-38420=>2454,
-22403=>2455,
-25289=>2456,
-21895=>2457,
-34593=>2458,
-33098=>2459,
-36771=>2460,
-21862=>2461,
-33713=>2462,
-26469=>2463,
-36182=>2464,
-34013=>2465,
-23146=>2466,
-26639=>2467,
-25318=>2468,
-31726=>2469,
-38417=>2470,
-20848=>2471,
-28572=>2472,
-35888=>2473,
-25597=>2474,
-35272=>2475,
-25042=>2476,
-32518=>2477,
-28866=>2478,
-28389=>2479,
-29701=>2480,
-27028=>2481,
-29436=>2482,
-24266=>2483,
-37070=>2484,
-26391=>2485,
-28010=>2486,
-25438=>2487,
-21171=>2488,
-29282=>2489,
-12156=>2490,
-32769=>2490,
-20332=>2491,
-23013=>2492,
-37226=>2493,
-28889=>2494,
-28061=>2495,
-21202=>2496,
-20048=>2497,
-38647=>2498,
-38253=>2499,
-34174=>2500,
-30922=>2501,
-32047=>2502,
-20769=>2503,
-22418=>2504,
-25794=>2505,
-32907=>2506,
-31867=>2507,
-27882=>2508,
-26865=>2509,
-26974=>2510,
-20919=>2511,
-21400=>2512,
-26792=>2513,
-29313=>2514,
-40654=>2515,
-31729=>2516,
-29432=>2517,
-31163=>2518,
-28435=>2519,
-29702=>2520,
-26446=>2521,
-12197=>2522,
-37324=>2522,
-40100=>2523,
-31036=>2524,
-33673=>2525,
-33620=>2526,
-21519=>2527,
-26647=>2528,
-20029=>2529,
-21385=>2530,
-21169=>2531,
-30782=>2532,
-21382=>2533,
-21033=>2534,
-20616=>2535,
-20363=>2536,
-20432=>2537,
-30178=>2538,
-12148=>2539,
-31435=>2539,
-31890=>2540,
-27813=>2541,
-12202=>2542,
-38582=>2542,
-12050=>2543,
-21147=>2543,
-29827=>2544,
-21737=>2545,
-20457=>2546,
-32852=>2547,
-33714=>2548,
-36830=>2549,
-38256=>2550,
-24265=>2551,
-24604=>2552,
-28063=>2553,
-24088=>2554,
-25947=>2555,
-33080=>2556,
-38142=>2557,
-24651=>2558,
-28860=>2559,
-32451=>2560,
-31918=>2561,
-20937=>2562,
-63865=>2562,
-26753=>2563,
-31921=>2564,
-33391=>2565,
-20004=>2566,
-36742=>2567,
-37327=>2568,
-26238=>2569,
-20142=>2570,
-35845=>2571,
-25769=>2572,
-32842=>2573,
-20698=>2574,
-30103=>2575,
-29134=>2576,
-23525=>2577,
-36797=>2578,
-28518=>2579,
-20102=>2580,
-25730=>2581,
-38243=>2582,
-24278=>2583,
-26009=>2584,
-21015=>2585,
-35010=>2586,
-28872=>2587,
-21155=>2588,
-29454=>2589,
-29747=>2590,
-26519=>2591,
-30967=>2592,
-38678=>2593,
-20020=>2594,
-37051=>2595,
-40158=>2596,
-28107=>2597,
-20955=>2598,
-36161=>2599,
-21533=>2600,
-25294=>2601,
-29618=>2602,
-33777=>2603,
-38646=>2604,
-40836=>2605,
-38083=>2606,
-20278=>2607,
-32666=>2608,
-20940=>2609,
-28789=>2610,
-38517=>2611,
-23725=>2612,
-39046=>2613,
-21478=>2614,
-20196=>2615,
-28316=>2616,
-29705=>2617,
-27060=>2618,
-30827=>2619,
-39311=>2620,
-30041=>2621,
-21016=>2622,
-30244=>2623,
-27969=>2624,
-26611=>2625,
-20845=>2626,
-40857=>2627,
-32843=>2628,
-21657=>2629,
-31548=>2630,
-31423=>2631,
-38534=>2632,
-22404=>2633,
-25314=>2634,
-38471=>2635,
-27004=>2636,
-23044=>2637,
-25602=>2638,
-31699=>2639,
-28431=>2640,
-38475=>2641,
-33446=>2642,
-21346=>2643,
-39045=>2644,
-24208=>2645,
-28809=>2646,
-25523=>2647,
-21348=>2648,
-34383=>2649,
-40065=>2650,
-40595=>2651,
-30860=>2652,
-38706=>2653,
-36335=>2654,
-36162=>2655,
-12229=>2656,
-40575=>2656,
-28510=>2657,
-31108=>2658,
-24405=>2659,
-38470=>2660,
-25134=>2661,
-39540=>2662,
-21525=>2663,
-38109=>2664,
-20387=>2665,
-26053=>2666,
-23653=>2667,
-23649=>2668,
-32533=>2669,
-34385=>2670,
-27695=>2671,
-24459=>2672,
-29575=>2673,
-28388=>2674,
-32511=>2675,
-23782=>2676,
-25371=>2677,
-23402=>2678,
-28390=>2679,
-21365=>2680,
-20081=>2681,
-25504=>2682,
-30053=>2683,
-25249=>2684,
-36718=>2685,
-20262=>2686,
-20177=>2687,
-27814=>2688,
-32438=>2689,
-35770=>2690,
-33821=>2691,
-34746=>2692,
-32599=>2693,
-36923=>2694,
-38179=>2695,
-31657=>2696,
-39585=>2697,
-35064=>2698,
-33853=>2699,
-27931=>2700,
-39558=>2701,
-32476=>2702,
-22920=>2703,
-12231=>2704,
-40635=>2704,
-29595=>2705,
-30721=>2706,
-34434=>2707,
-39532=>2708,
-39554=>2709,
-22043=>2710,
-21527=>2711,
-22475=>2712,
-20080=>2713,
-40614=>2714,
-21334=>2715,
-36808=>2716,
-33033=>2717,
-30610=>2718,
-39314=>2719,
-34542=>2720,
-28385=>2721,
-34067=>2722,
-26364=>2723,
-24930=>2724,
-28459=>2725,
-35881=>2726,
-33426=>2727,
-33579=>2728,
-30450=>2729,
-27667=>2730,
-24537=>2731,
-33725=>2732,
-29483=>2733,
-33541=>2734,
-38170=>2735,
-12113=>2736,
-27611=>2736,
-12141=>2737,
-30683=>2737,
-38086=>2738,
-21359=>2739,
-33538=>2740,
-20882=>2741,
-24125=>2742,
-35980=>2743,
-36152=>2744,
-20040=>2745,
-29611=>2746,
-26522=>2747,
-26757=>2748,
-37238=>2749,
-38665=>2750,
-29028=>2751,
-27809=>2752,
-30473=>2753,
-23186=>2754,
-38209=>2755,
-27599=>2756,
-32654=>2757,
-26151=>2758,
-23504=>2759,
-22969=>2760,
-23194=>2761,
-38376=>2762,
-38391=>2763,
-20204=>2764,
-33804=>2765,
-33945=>2766,
-27308=>2767,
-30431=>2768,
-38192=>2769,
-29467=>2770,
-26790=>2771,
-23391=>2772,
-30511=>2773,
-37274=>2774,
-38753=>2775,
-31964=>2776,
-36855=>2777,
-35868=>2778,
-24357=>2779,
-12150=>2780,
-31859=>2780,
-31192=>2781,
-35269=>2782,
-27852=>2783,
-34588=>2784,
-23494=>2785,
-24130=>2786,
-26825=>2787,
-30496=>2788,
-32501=>2789,
-20885=>2790,
-20813=>2791,
-21193=>2792,
-23081=>2793,
-32517=>2794,
-12207=>2795,
-38754=>2795,
-33495=>2796,
-25551=>2797,
-30596=>2798,
-34256=>2799,
-31186=>2800,
-28218=>2801,
-24217=>2802,
-22937=>2803,
-34065=>2804,
-28781=>2805,
-27665=>2806,
-25279=>2807,
-12139=>2808,
-30399=>2808,
-25935=>2809,
-24751=>2810,
-38397=>2811,
-26126=>2812,
-34719=>2813,
-40483=>2814,
-38125=>2815,
-21517=>2816,
-21629=>2817,
-35884=>2818,
-25720=>2819,
-25721=>2820,
-34321=>2821,
-27169=>2822,
-33180=>2823,
-30952=>2824,
-25705=>2825,
-39764=>2826,
-25273=>2827,
-26411=>2828,
-33707=>2829,
-22696=>2830,
-40664=>2831,
-27819=>2832,
-28448=>2833,
-23518=>2834,
-38476=>2835,
-35851=>2836,
-29279=>2837,
-26576=>2838,
-25287=>2839,
-29281=>2840,
-20137=>2841,
-22982=>2842,
-27597=>2843,
-22675=>2844,
-26286=>2845,
-24149=>2846,
-21215=>2847,
-24917=>2848,
-12106=>2849,
-26408=>2849,
-12140=>2850,
-30446=>2850,
-30566=>2851,
-29287=>2852,
-31302=>2853,
-25343=>2854,
-21738=>2855,
-21584=>2856,
-38048=>2857,
-37027=>2858,
-23068=>2859,
-32435=>2860,
-27670=>2861,
-20035=>2862,
-22902=>2863,
-32784=>2864,
-22856=>2865,
-21335=>2866,
-30007=>2867,
-38590=>2868,
-22218=>2869,
-25376=>2870,
-33041=>2871,
-24700=>2872,
-38393=>2873,
-28118=>2874,
-21602=>2875,
-39297=>2876,
-20869=>2877,
-23273=>2878,
-33021=>2879,
-22958=>2880,
-38675=>2881,
-20522=>2882,
-27877=>2883,
-23612=>2884,
-25311=>2885,
-20320=>2886,
-21311=>2887,
-33147=>2888,
-36870=>2889,
-28346=>2890,
-34091=>2891,
-25288=>2892,
-24180=>2893,
-30910=>2894,
-25781=>2895,
-25467=>2896,
-24565=>2897,
-23064=>2898,
-37247=>2899,
-40479=>2900,
-23615=>2901,
-25423=>2902,
-32834=>2903,
-23421=>2904,
-21870=>2905,
-38218=>2906,
-38221=>2907,
-28037=>2908,
-24744=>2909,
-26592=>2910,
-29406=>2911,
-20957=>2912,
-23425=>2913,
-25319=>2914,
-27870=>2915,
-12124=>2916,
-29275=>2916,
-25197=>2917,
-38062=>2918,
-32445=>2919,
-33043=>2920,
-27987=>2921,
-20892=>2922,
-24324=>2923,
-22900=>2924,
-21162=>2925,
-24594=>2926,
-12069=>2927,
-22899=>2927,
-26262=>2928,
-34384=>2929,
-30111=>2930,
-25386=>2931,
-25062=>2932,
-31983=>2933,
-35834=>2934,
-21734=>2935,
-27431=>2936,
-40485=>2937,
-27572=>2938,
-34261=>2939,
-21589=>2940,
-20598=>2941,
-27812=>2942,
-21866=>2943,
-36276=>2944,
-29228=>2945,
-24085=>2946,
-24597=>2947,
-29750=>2948,
-25293=>2949,
-25490=>2950,
-29260=>2951,
-24472=>2952,
-28227=>2953,
-27966=>2954,
-25856=>2955,
-28504=>2956,
-30424=>2957,
-30928=>2958,
-30460=>2959,
-30036=>2960,
-21028=>2961,
-21467=>2962,
-20051=>2963,
-24222=>2964,
-26049=>2965,
-32810=>2966,
-32982=>2967,
-25243=>2968,
-21638=>2969,
-21032=>2970,
-28846=>2971,
-34957=>2972,
-36305=>2973,
-27873=>2974,
-21624=>2975,
-32986=>2976,
-22521=>2977,
-35060=>2978,
-36180=>2979,
-38506=>2980,
-37197=>2981,
-20329=>2982,
-27803=>2983,
-21943=>2984,
-30406=>2985,
-30768=>2986,
-25256=>2987,
-28921=>2988,
-28558=>2989,
-24429=>2990,
-34028=>2991,
-26842=>2992,
-30844=>2993,
-31735=>2994,
-33192=>2995,
-26379=>2996,
-40527=>2997,
-25447=>2998,
-30896=>2999,
-22383=>3000,
-30738=>3001,
-38713=>3002,
-25209=>3003,
-25259=>3004,
-21128=>3005,
-29749=>3006,
-27607=>3007,
-21860=>3008,
-33086=>3009,
-30130=>3010,
-12138=>3011,
-30382=>3011,
-21305=>3012,
-30174=>3013,
-20731=>3014,
-23617=>3015,
-35692=>3016,
-31687=>3017,
-20559=>3018,
-12122=>3019,
-29255=>3019,
-39575=>3020,
-39128=>3021,
-28418=>3022,
-29922=>3023,
-31080=>3024,
-25735=>3025,
-30629=>3026,
-25340=>3027,
-39057=>3028,
-36139=>3029,
-21697=>3030,
-32856=>3031,
-20050=>3032,
-22378=>3033,
-33529=>3034,
-33805=>3035,
-24179=>3036,
-20973=>3037,
-29942=>3038,
-35780=>3039,
-23631=>3040,
-22369=>3041,
-27900=>3042,
-39047=>3043,
-23110=>3044,
-30772=>3045,
-39748=>3046,
-36843=>3047,
-31893=>3048,
-21078=>3049,
-25169=>3050,
-38138=>3051,
-20166=>3052,
-33670=>3053,
-33889=>3054,
-33769=>3055,
-33970=>3056,
-22484=>3057,
-26420=>3058,
-22275=>3059,
-26222=>3060,
-28006=>3061,
-35889=>3062,
-26333=>3063,
-28689=>3064,
-26399=>3065,
-27450=>3066,
-26646=>3067,
-25114=>3068,
-22971=>3069,
-19971=>3070,
-20932=>3071,
-28422=>3072,
-26578=>3073,
-27791=>3074,
-20854=>3075,
-26827=>3076,
-22855=>3077,
-27495=>3078,
-30054=>3079,
-23822=>3080,
-33040=>3081,
-40784=>3082,
-26071=>3083,
-31048=>3084,
-31041=>3085,
-39569=>3086,
-36215=>3087,
-23682=>3088,
-20062=>3089,
-20225=>3090,
-21551=>3091,
-22865=>3092,
-30732=>3093,
-22120=>3094,
-12115=>3095,
-27668=>3095,
-36804=>3096,
-24323=>3097,
-27773=>3098,
-27875=>3099,
-35755=>3100,
-25488=>3101,
-24688=>3102,
-27965=>3103,
-29301=>3104,
-25190=>3105,
-38030=>3106,
-38085=>3107,
-21315=>3108,
-36801=>3109,
-31614=>3110,
-20191=>3111,
-35878=>3112,
-20094=>3113,
-40660=>3114,
-38065=>3115,
-38067=>3116,
-21069=>3117,
-28508=>3118,
-36963=>3119,
-27973=>3120,
-35892=>3121,
-22545=>3122,
-23884=>3123,
-12107=>3124,
-27424=>3124,
-27465=>3125,
-26538=>3126,
-21595=>3127,
-33108=>3128,
-32652=>3129,
-22681=>3130,
-34103=>3131,
-24378=>3132,
-25250=>3133,
-27207=>3134,
-38201=>3135,
-25970=>3136,
-24708=>3137,
-26725=>3138,
-30631=>3139,
-20052=>3140,
-20392=>3141,
-24039=>3142,
-38808=>3143,
-25772=>3144,
-32728=>3145,
-23789=>3146,
-20431=>3147,
-31373=>3148,
-20999=>3149,
-33540=>3150,
-19988=>3151,
-24623=>3152,
-31363=>3153,
-38054=>3154,
-20405=>3155,
-20146=>3156,
-31206=>3157,
-29748=>3158,
-21220=>3159,
-33465=>3160,
-25810=>3161,
-31165=>3162,
-23517=>3163,
-27777=>3164,
-38738=>3165,
-36731=>3166,
-27682=>3167,
-20542=>3168,
-21375=>3169,
-28165=>3170,
-25806=>3171,
-26228=>3172,
-27696=>3173,
-24773=>3174,
-39031=>3175,
-35831=>3176,
-24198=>3177,
-29756=>3178,
-31351=>3179,
-31179=>3180,
-19992=>3181,
-37041=>3182,
-29699=>3183,
-27714=>3184,
-22234=>3185,
-37195=>3186,
-27845=>3187,
-36235=>3188,
-21306=>3189,
-34502=>3190,
-26354=>3191,
-36527=>3192,
-23624=>3193,
-39537=>3194,
-28192=>3195,
-21462=>3196,
-23094=>3197,
-40843=>3198,
-36259=>3199,
-21435=>3200,
-22280=>3201,
-39079=>3202,
-26435=>3203,
-37275=>3204,
-27849=>3205,
-20840=>3206,
-30154=>3207,
-25331=>3208,
-12125=>3209,
-29356=>3209,
-21048=>3210,
-21149=>3211,
-32570=>3212,
-28820=>3213,
-30264=>3214,
-21364=>3215,
-40522=>3216,
-27063=>3217,
-30830=>3218,
-38592=>3219,
-35033=>3220,
-32676=>3221,
-28982=>3222,
-29123=>3223,
-20873=>3224,
-26579=>3225,
-29924=>3226,
-22756=>3227,
-25880=>3228,
-22199=>3229,
-35753=>3230,
-39286=>3231,
-25200=>3232,
-32469=>3233,
-24825=>3234,
-28909=>3235,
-22764=>3236,
-20161=>3237,
-12040=>3238,
-20154=>3238,
-24525=>3239,
-38887=>3240,
-20219=>3241,
-35748=>3242,
-20995=>3243,
-22922=>3244,
-32427=>3245,
-25172=>3246,
-20173=>3247,
-12103=>3248,
-26085=>3248,
-25102=>3249,
-33592=>3250,
-33993=>3251,
-33635=>3252,
-34701=>3253,
-29076=>3254,
-28342=>3255,
-23481=>3256,
-32466=>3257,
-20887=>3258,
-25545=>3259,
-26580=>3260,
-12161=>3261,
-32905=>3261,
-33593=>3262,
-34837=>3263,
-20754=>3264,
-23418=>3265,
-22914=>3266,
-36785=>3267,
-20083=>3268,
-27741=>3269,
-12042=>3270,
-20837=>3270,
-35109=>3271,
-36719=>3272,
-38446=>3273,
-34122=>3274,
-29790=>3275,
-38160=>3276,
-38384=>3277,
-28070=>3278,
-33509=>3279,
-24369=>3280,
-25746=>3281,
-27922=>3282,
-33832=>3283,
-33134=>3284,
-40131=>3285,
-22622=>3286,
-36187=>3287,
-19977=>3288,
-21441=>3289,
-20254=>3290,
-25955=>3291,
-26705=>3292,
-21971=>3293,
-20007=>3294,
-25620=>3295,
-39578=>3296,
-25195=>3297,
-23234=>3298,
-29791=>3299,
-12170=>3300,
-33394=>3300,
-28073=>3301,
-26862=>3302,
-20711=>3303,
-33678=>3304,
-30722=>3305,
-26432=>3306,
-21049=>3307,
-27801=>3308,
-32433=>3309,
-20667=>3310,
-21861=>3311,
-29022=>3312,
-31579=>3313,
-26194=>3314,
-29642=>3315,
-33515=>3316,
-26441=>3317,
-12077=>3318,
-23665=>3318,
-21024=>3319,
-29053=>3320,
-34923=>3321,
-38378=>3322,
-38485=>3323,
-25797=>3324,
-36193=>3325,
-33203=>3326,
-21892=>3327,
-27733=>3328,
-25159=>3329,
-32558=>3330,
-22674=>3331,
-20260=>3332,
-21830=>3333,
-36175=>3334,
-26188=>3335,
-19978=>3336,
-23578=>3337,
-35059=>3338,
-26786=>3339,
-25422=>3340,
-31245=>3341,
-28903=>3342,
-33421=>3343,
-21242=>3344,
-38902=>3345,
-23569=>3346,
-21736=>3347,
-37045=>3348,
-32461=>3349,
-22882=>3350,
-36170=>3351,
-34503=>3352,
-12166=>3353,
-33292=>3353,
-33293=>3354,
-36198=>3355,
-25668=>3356,
-23556=>3357,
-24913=>3358,
-28041=>3359,
-31038=>3360,
-35774=>3361,
-30775=>3362,
-30003=>3363,
-21627=>3364,
-20280=>3365,
-12189=>3366,
-36523=>3366,
-28145=>3367,
-23072=>3368,
-32453=>3369,
-31070=>3370,
-27784=>3371,
-23457=>3372,
-23158=>3373,
-29978=>3374,
-32958=>3375,
-24910=>3376,
-28183=>3377,
-22768=>3378,
-12131=>3379,
-29983=>3379,
-29989=>3380,
-29298=>3381,
-21319=>3382,
-32499=>3383,
-30465=>3384,
-30427=>3385,
-21097=>3386,
-32988=>3387,
-22307=>3388,
-24072=>3389,
-22833=>3390,
-29422=>3391,
-26045=>3392,
-28287=>3393,
-35799=>3394,
-12075=>3395,
-23608=>3395,
-34417=>3396,
-12055=>3397,
-21313=>3397,
-12143=>3398,
-30707=>3398,
-25342=>3399,
-26102=>3400,
-20160=>3401,
-12215=>3402,
-39135=>3402,
-34432=>3403,
-23454=>3404,
-35782=>3405,
-21490=>3406,
-12142=>3407,
-30690=>3407,
-20351=>3408,
-23630=>3409,
-39542=>3410,
-22987=>3411,
-24335=>3412,
-12144=>3413,
-31034=>3413,
-12064=>3414,
-22763=>3414,
-19990=>3415,
-26623=>3416,
-20107=>3417,
-25325=>3418,
-35475=>3419,
-36893=>3420,
-21183=>3421,
-26159=>3422,
-21980=>3423,
-22124=>3424,
-36866=>3425,
-20181=>3426,
-20365=>3427,
-37322=>3428,
-39280=>3429,
-12114=>3430,
-27663=>3430,
-24066=>3431,
-24643=>3432,
-23460=>3433,
-35270=>3434,
-35797=>3435,
-25910=>3436,
-12095=>3437,
-25163=>3437,
-12216=>3438,
-39318=>3438,
-23432=>3439,
-23551=>3440,
-25480=>3441,
-21806=>3442,
-21463=>3443,
-30246=>3444,
-20861=>3445,
-34092=>3446,
-26530=>3447,
-26803=>3448,
-27530=>3449,
-25234=>3450,
-36755=>3451,
-21460=>3452,
-33298=>3453,
-28113=>3454,
-30095=>3455,
-20070=>3456,
-36174=>3457,
-23408=>3458,
-29087=>3459,
-34223=>3460,
-26257=>3461,
-26329=>3462,
-32626=>3463,
-34560=>3464,
-12233=>3465,
-40653=>3465,
-12239=>3466,
-40736=>3466,
-23646=>3467,
-26415=>3468,
-36848=>3469,
-26641=>3470,
-26463=>3471,
-25101=>3472,
-31446=>3473,
-22661=>3474,
-24246=>3475,
-25968=>3476,
-28465=>3477,
-24661=>3478,
-21047=>3479,
-32781=>3480,
-25684=>3481,
-34928=>3482,
-29993=>3483,
-24069=>3484,
-26643=>3485,
-25332=>3486,
-38684=>3487,
-21452=>3488,
-29245=>3489,
-35841=>3490,
-12116=>3491,
-27700=>3491,
-30561=>3492,
-31246=>3493,
-21550=>3494,
-30636=>3495,
-39034=>3496,
-33308=>3497,
-35828=>3498,
-30805=>3499,
-26388=>3500,
-28865=>3501,
-26031=>3502,
-25749=>3503,
-22070=>3504,
-24605=>3505,
-31169=>3506,
-21496=>3507,
-19997=>3508,
-27515=>3509,
-32902=>3510,
-23546=>3511,
-21987=>3512,
-22235=>3513,
-20282=>3514,
-20284=>3515,
-39282=>3516,
-24051=>3517,
-26494=>3518,
-32824=>3519,
-24578=>3520,
-39042=>3521,
-36865=>3522,
-23435=>3523,
-35772=>3524,
-35829=>3525,
-25628=>3526,
-33368=>3527,
-25822=>3528,
-22013=>3529,
-33487=>3530,
-37221=>3531,
-20439=>3532,
-32032=>3533,
-36895=>3534,
-31903=>3535,
-20723=>3536,
-22609=>3537,
-28335=>3538,
-23487=>3539,
-35785=>3540,
-32899=>3541,
-37240=>3542,
-33948=>3543,
-31639=>3544,
-34429=>3545,
-38539=>3546,
-38543=>3547,
-32485=>3548,
-39635=>3549,
-30862=>3550,
-23681=>3551,
-31319=>3552,
-36930=>3553,
-38567=>3554,
-31071=>3555,
-23385=>3556,
-25439=>3557,
-31499=>3558,
-34001=>3559,
-26797=>3560,
-21766=>3561,
-32553=>3562,
-29712=>3563,
-32034=>3564,
-38145=>3565,
-25152=>3566,
-22604=>3567,
-20182=>3568,
-23427=>3569,
-22905=>3570,
-22612=>3571,
-29549=>3572,
-25374=>3573,
-36427=>3574,
-36367=>3575,
-32974=>3576,
-33492=>3577,
-25260=>3578,
-21488=>3579,
-27888=>3580,
-37214=>3581,
-22826=>3582,
-24577=>3583,
-27760=>3584,
-22349=>3585,
-25674=>3586,
-36138=>3587,
-30251=>3588,
-28393=>3589,
-22363=>3590,
-27264=>3591,
-30192=>3592,
-28525=>3593,
-35885=>3594,
-35848=>3595,
-22374=>3596,
-27631=>3597,
-34962=>3598,
-30899=>3599,
-25506=>3600,
-21497=>3601,
-28845=>3602,
-27748=>3603,
-22616=>3604,
-25642=>3605,
-22530=>3606,
-26848=>3607,
-33179=>3608,
-21776=>3609,
-31958=>3610,
-20504=>3611,
-36538=>3612,
-28108=>3613,
-36255=>3614,
-28907=>3615,
-25487=>3616,
-28059=>3617,
-28372=>3618,
-32486=>3619,
-33796=>3620,
-26691=>3621,
-36867=>3622,
-28120=>3623,
-38518=>3624,
-35752=>3625,
-22871=>3626,
-29305=>3627,
-34276=>3628,
-33150=>3629,
-30140=>3630,
-35466=>3631,
-26799=>3632,
-21076=>3633,
-36386=>3634,
-38161=>3635,
-25552=>3636,
-39064=>3637,
-36420=>3638,
-21884=>3639,
-20307=>3640,
-26367=>3641,
-22159=>3642,
-24789=>3643,
-28053=>3644,
-21059=>3645,
-23625=>3646,
-22825=>3647,
-28155=>3648,
-22635=>3649,
-12133=>3650,
-30000=>3650,
-29980=>3651,
-24684=>3652,
-33300=>3653,
-33094=>3654,
-25361=>3655,
-26465=>3656,
-36834=>3657,
-30522=>3658,
-36339=>3659,
-36148=>3660,
-38081=>3661,
-24086=>3662,
-21381=>3663,
-21548=>3664,
-28867=>3665,
-27712=>3666,
-24311=>3667,
-20572=>3668,
-20141=>3669,
-24237=>3670,
-25402=>3671,
-33351=>3672,
-36890=>3673,
-26704=>3674,
-37230=>3675,
-30643=>3676,
-21516=>3677,
-38108=>3678,
-24420=>3679,
-31461=>3680,
-26742=>3681,
-25413=>3682,
-31570=>3683,
-32479=>3684,
-30171=>3685,
-20599=>3686,
-25237=>3687,
-22836=>3688,
-36879=>3689,
-20984=>3690,
-31171=>3691,
-31361=>3692,
-22270=>3693,
-24466=>3694,
-36884=>3695,
-28034=>3696,
-23648=>3697,
-12063=>3698,
-22303=>3698,
-21520=>3699,
-20820=>3700,
-28237=>3701,
-22242=>3702,
-25512=>3703,
-39059=>3704,
-33151=>3705,
-34581=>3706,
-35114=>3707,
-36864=>3708,
-21534=>3709,
-23663=>3710,
-33216=>3711,
-25302=>3712,
-25176=>3713,
-33073=>3714,
-40501=>3715,
-38464=>3716,
-39534=>3717,
-39548=>3718,
-26925=>3719,
-22949=>3720,
-25299=>3721,
-21822=>3722,
-25366=>3723,
-21703=>3724,
-34521=>3725,
-27964=>3726,
-23043=>3727,
-12129=>3728,
-29926=>3728,
-34972=>3729,
-27498=>3730,
-22806=>3731,
-35916=>3732,
-24367=>3733,
-28286=>3734,
-29609=>3735,
-39037=>3736,
-20024=>3737,
-28919=>3738,
-23436=>3739,
-30871=>3740,
-25405=>3741,
-26202=>3742,
-30358=>3743,
-24779=>3744,
-23451=>3745,
-23113=>3746,
-19975=>3747,
-33109=>3748,
-27754=>3749,
-29579=>3750,
-20129=>3751,
-26505=>3752,
-12153=>3753,
-32593=>3753,
-24448=>3754,
-26106=>3755,
-26395=>3756,
-24536=>3757,
-22916=>3758,
-23041=>3759,
-24013=>3760,
-24494=>3761,
-21361=>3762,
-38886=>3763,
-36829=>3764,
-26693=>3765,
-22260=>3766,
-21807=>3767,
-24799=>3768,
-20026=>3769,
-28493=>3770,
-32500=>3771,
-33479=>3772,
-33806=>3773,
-22996=>3774,
-20255=>3775,
-20266=>3776,
-23614=>3777,
-32428=>3778,
-26410=>3779,
-34074=>3780,
-21619=>3781,
-30031=>3782,
-32963=>3783,
-21890=>3784,
-39759=>3785,
-20301=>3786,
-28205=>3787,
-35859=>3788,
-23561=>3789,
-24944=>3790,
-21355=>3791,
-30239=>3792,
-28201=>3793,
-34442=>3794,
-12098=>3795,
-25991=>3795,
-38395=>3796,
-32441=>3797,
-21563=>3798,
-31283=>3799,
-32010=>3800,
-38382=>3801,
-21985=>3802,
-32705=>3803,
-29934=>3804,
-25373=>3805,
-34583=>3806,
-28065=>3807,
-31389=>3808,
-25105=>3809,
-26017=>3810,
-21351=>3811,
-25569=>3812,
-27779=>3813,
-24043=>3814,
-21596=>3815,
-38056=>3816,
-20044=>3817,
-27745=>3818,
-35820=>3819,
-23627=>3820,
-12102=>3821,
-26080=>3821,
-33436=>3822,
-26791=>3823,
-21566=>3824,
-21556=>3825,
-12111=>3826,
-27595=>3826,
-27494=>3827,
-20116=>3828,
-25410=>3829,
-21320=>3830,
-33310=>3831,
-20237=>3832,
-20398=>3833,
-22366=>3834,
-25098=>3835,
-38654=>3836,
-26212=>3837,
-29289=>3838,
-21247=>3839,
-21153=>3840,
-24735=>3841,
-35823=>3842,
-26132=>3843,
-29081=>3844,
-26512=>3845,
-35199=>3846,
-30802=>3847,
-30717=>3848,
-26224=>3849,
-22075=>3850,
-21560=>3851,
-38177=>3852,
-29306=>3853,
-31232=>3854,
-24687=>3855,
-24076=>3856,
-24713=>3857,
-33181=>3858,
-12067=>3859,
-22805=>3859,
-24796=>3860,
-29060=>3861,
-28911=>3862,
-28330=>3863,
-27728=>3864,
-29312=>3865,
-27268=>3866,
-34989=>3867,
-24109=>3868,
-20064=>3869,
-23219=>3870,
-21916=>3871,
-38115=>3872,
-27927=>3873,
-31995=>3874,
-38553=>3875,
-25103=>3876,
-32454=>3877,
-30606=>3878,
-34430=>3879,
-21283=>3880,
-38686=>3881,
-36758=>3882,
-26247=>3883,
-23777=>3884,
-20384=>3885,
-29421=>3886,
-19979=>3887,
-21414=>3888,
-22799=>3889,
-21523=>3890,
-25472=>3891,
-38184=>3892,
-20808=>3893,
-20185=>3894,
-40092=>3895,
-32420=>3896,
-21688=>3897,
-36132=>3898,
-34900=>3899,
-33335=>3900,
-38386=>3901,
-28046=>3902,
-24358=>3903,
-23244=>3904,
-26174=>3905,
-38505=>3906,
-29616=>3907,
-29486=>3908,
-21439=>3909,
-33146=>3910,
-39301=>3911,
-32673=>3912,
-23466=>3913,
-38519=>3914,
-38480=>3915,
-32447=>3916,
-30456=>3917,
-21410=>3918,
-38262=>3919,
-12217=>3920,
-39321=>3920,
-31665=>3921,
-35140=>3922,
-28248=>3923,
-20065=>3924,
-32724=>3925,
-31077=>3926,
-35814=>3927,
-24819=>3928,
-21709=>3929,
-20139=>3930,
-39033=>3931,
-24055=>3932,
-27233=>3933,
-20687=>3934,
-21521=>3935,
-35937=>3936,
-33831=>3937,
-30813=>3938,
-38660=>3939,
-21066=>3940,
-21742=>3941,
-22179=>3942,
-38144=>3943,
-28040=>3944,
-23477=>3945,
-28102=>3946,
-26195=>3947,
-12073=>3948,
-23567=>3948,
-23389=>3949,
-26657=>3950,
-32918=>3951,
-21880=>3952,
-31505=>3953,
-25928=>3954,
-26964=>3955,
-20123=>3956,
-27463=>3957,
-34638=>3958,
-38795=>3959,
-21327=>3960,
-25375=>3961,
-25658=>3962,
-37034=>3963,
-26012=>3964,
-32961=>3965,
-35856=>3966,
-20889=>3967,
-26800=>3968,
-21368=>3969,
-34809=>3970,
-25032=>3971,
-27844=>3972,
-27899=>3973,
-35874=>3974,
-23633=>3975,
-34218=>3976,
-33455=>3977,
-38156=>3978,
-27427=>3979,
-12191=>3980,
-36763=>3980,
-26032=>3981,
-24571=>3982,
-12092=>3983,
-24515=>3983,
-20449=>3984,
-34885=>3985,
-26143=>3986,
-33125=>3987,
-29481=>3988,
-24826=>3989,
-20852=>3990,
-21009=>3991,
-22411=>3992,
-24418=>3993,
-37026=>3994,
-12175=>3995,
-34892=>3995,
-37266=>3996,
-24184=>3997,
-26447=>3998,
-24615=>3999,
-22995=>4000,
-20804=>4001,
-20982=>4002,
-33016=>4003,
-21256=>4004,
-27769=>4005,
-38596=>4006,
-29066=>4007,
-20241=>4008,
-20462=>4009,
-32670=>4010,
-26429=>4011,
-21957=>4012,
-38152=>4013,
-31168=>4014,
-34966=>4015,
-32483=>4016,
-22687=>4017,
-25100=>4018,
-38656=>4019,
-34394=>4020,
-22040=>4021,
-39035=>4022,
-24464=>4023,
-35768=>4024,
-33988=>4025,
-37207=>4026,
-21465=>4027,
-26093=>4028,
-24207=>4029,
-30044=>4030,
-24676=>4031,
-32110=>4032,
-23167=>4033,
-32490=>4034,
-32493=>4035,
-36713=>4036,
-21927=>4037,
-23459=>4038,
-24748=>4039,
-26059=>4040,
-12126=>4041,
-29572=>4041,
-36873=>4042,
-30307=>4043,
-30505=>4044,
-32474=>4045,
-38772=>4046,
-34203=>4047,
-23398=>4048,
-12147=>4049,
-31348=>4049,
-38634=>4050,
-12174=>4051,
-34880=>4051,
-21195=>4052,
-29071=>4053,
-24490=>4054,
-26092=>4055,
-35810=>4056,
-23547=>4057,
-39535=>4058,
-24033=>4059,
-27529=>4060,
-27739=>4061,
-35757=>4062,
-35759=>4063,
-36874=>4064,
-36805=>4065,
-21387=>4066,
-25276=>4067,
-40486=>4068,
-40493=>4069,
-21568=>4070,
-20011=>4071,
-33469=>4072,
-12123=>4073,
-29273=>4073,
-34460=>4074,
-23830=>4075,
-34905=>4076,
-28079=>4077,
-38597=>4078,
-21713=>4079,
-20122=>4080,
-35766=>4081,
-28937=>4082,
-21693=>4083,
-38409=>4084,
-28895=>4085,
-28153=>4086,
-30416=>4087,
-20005=>4088,
-30740=>4089,
-34578=>4090,
-23721=>4091,
-24310=>4092,
-12180=>4093,
-35328=>4093,
-39068=>4094,
-38414=>4095,
-28814=>4096,
-27839=>4097,
-22852=>4098,
-25513=>4099,
-30524=>4100,
-34893=>4101,
-28436=>4102,
-33395=>4103,
-22576=>4104,
-29141=>4105,
-21388=>4106,
-30746=>4107,
-38593=>4108,
-21761=>4109,
-24422=>4110,
-28976=>4111,
-23476=>4112,
-35866=>4113,
-39564=>4114,
-27523=>4115,
-22830=>4116,
-40495=>4117,
-31207=>4118,
-26472=>4119,
-25196=>4120,
-20335=>4121,
-30113=>4122,
-12154=>4123,
-32650=>4123,
-27915=>4124,
-38451=>4125,
-27687=>4126,
-20208=>4127,
-30162=>4128,
-20859=>4129,
-26679=>4130,
-28478=>4131,
-36992=>4132,
-33136=>4133,
-22934=>4134,
-29814=>4135,
-25671=>4136,
-23591=>4137,
-36965=>4138,
-31377=>4139,
-35875=>4140,
-23002=>4141,
-21676=>4142,
-33280=>4143,
-33647=>4144,
-35201=>4145,
-32768=>4146,
-26928=>4147,
-22094=>4148,
-32822=>4149,
-29239=>4150,
-37326=>4151,
-20918=>4152,
-20063=>4153,
-39029=>4154,
-25494=>4155,
-19994=>4156,
-21494=>4157,
-26355=>4158,
-33099=>4159,
-22812=>4160,
-28082=>4161,
-12032=>4162,
-19968=>4162,
-22777=>4163,
-21307=>4164,
-25558=>4165,
-38129=>4166,
-20381=>4167,
-20234=>4168,
-12176=>4169,
-34915=>4169,
-39056=>4170,
-22839=>4171,
-36951=>4172,
-31227=>4173,
-20202=>4174,
-33008=>4175,
-30097=>4176,
-27778=>4177,
-23452=>4178,
-23016=>4179,
-24413=>4180,
-26885=>4181,
-34433=>4182,
-20506=>4183,
-24050=>4184,
-12036=>4185,
-20057=>4185,
-30691=>4186,
-20197=>4187,
-33402=>4188,
-25233=>4189,
-26131=>4190,
-12194=>4191,
-37009=>4191,
-23673=>4192,
-20159=>4193,
-24441=>4194,
-33222=>4195,
-36920=>4196,
-32900=>4197,
-30123=>4198,
-20134=>4199,
-35028=>4200,
-24847=>4201,
-27589=>4202,
-24518=>4203,
-20041=>4204,
-30410=>4205,
-28322=>4206,
-35811=>4207,
-35758=>4208,
-35850=>4209,
-35793=>4210,
-24322=>4211,
-32764=>4212,
-32716=>4213,
-32462=>4214,
-33589=>4215,
-33643=>4216,
-22240=>4217,
-27575=>4218,
-12211=>4219,
-38899=>4219,
-38452=>4220,
-23035=>4221,
-21535=>4222,
-38134=>4223,
-28139=>4224,
-23493=>4225,
-39278=>4226,
-23609=>4227,
-24341=>4228,
-38544=>4229,
-21360=>4230,
-33521=>4231,
-27185=>4232,
-23156=>4233,
-40560=>4234,
-24212=>4235,
-32552=>4236,
-33721=>4237,
-33828=>4238,
-33829=>4239,
-33639=>4240,
-34631=>4241,
-36814=>4242,
-36194=>4243,
-30408=>4244,
-24433=>4245,
-39062=>4246,
-30828=>4247,
-26144=>4248,
-21727=>4249,
-25317=>4250,
-20323=>4251,
-33219=>4252,
-30152=>4253,
-24248=>4254,
-38605=>4255,
-36362=>4256,
-34553=>4257,
-21647=>4258,
-27891=>4259,
-28044=>4260,
-27704=>4261,
-24703=>4262,
-21191=>4263,
-12132=>4264,
-29992=>4264,
-24189=>4265,
-20248=>4266,
-24736=>4267,
-24551=>4268,
-23588=>4269,
-30001=>4270,
-37038=>4271,
-38080=>4272,
-29369=>4273,
-27833=>4274,
-28216=>4275,
-12195=>4276,
-37193=>4276,
-26377=>4277,
-21451=>4278,
-21491=>4279,
-20305=>4280,
-37321=>4281,
-35825=>4282,
-12060=>4283,
-21448=>4283,
-24188=>4284,
-36802=>4285,
-28132=>4286,
-20110=>4287,
-30402=>4288,
-27014=>4289,
-34398=>4290,
-24858=>4291,
-33286=>4292,
-20313=>4293,
-20446=>4294,
-36926=>4295,
-40060=>4296,
-24841=>4297,
-28189=>4298,
-28180=>4299,
-38533=>4300,
-20104=>4301,
-23089=>4302,
-12204=>4303,
-38632=>4303,
-19982=>4304,
-23679=>4305,
-31161=>4306,
-23431=>4307,
-35821=>4308,
-12155=>4309,
-32701=>4309,
-12127=>4310,
-29577=>4310,
-22495=>4311,
-33419=>4312,
-37057=>4313,
-21505=>4314,
-36935=>4315,
-21947=>4316,
-23786=>4317,
-24481=>4318,
-24840=>4319,
-27442=>4320,
-29425=>4321,
-32946=>4322,
-35465=>4323,
-28020=>4324,
-23507=>4325,
-35029=>4326,
-39044=>4327,
-35947=>4328,
-39533=>4329,
-40499=>4330,
-28170=>4331,
-20900=>4332,
-20803=>4333,
-22435=>4334,
-34945=>4335,
-21407=>4336,
-25588=>4337,
-36757=>4338,
-22253=>4339,
-21592=>4340,
-22278=>4341,
-29503=>4342,
-28304=>4343,
-32536=>4344,
-36828=>4345,
-33489=>4346,
-24895=>4347,
-24616=>4348,
-38498=>4349,
-12104=>4350,
-26352=>4350,
-32422=>4351,
-36234=>4352,
-36291=>4353,
-38053=>4354,
-23731=>4355,
-31908=>4356,
-12105=>4357,
-26376=>4357,
-24742=>4358,
-38405=>4359,
-32792=>4360,
-20113=>4361,
-37095=>4362,
-21248=>4363,
-38504=>4364,
-20801=>4365,
-36816=>4366,
-34164=>4367,
-37213=>4368,
-26197=>4369,
-38901=>4370,
-23381=>4371,
-21277=>4372,
-30776=>4373,
-26434=>4374,
-26685=>4375,
-21705=>4376,
-28798=>4377,
-23472=>4378,
-36733=>4379,
-20877=>4380,
-22312=>4381,
-21681=>4382,
-25874=>4383,
-26242=>4384,
-36190=>4385,
-36163=>4386,
-33039=>4387,
-33900=>4388,
-36973=>4389,
-31967=>4390,
-20991=>4391,
-34299=>4392,
-26531=>4393,
-26089=>4394,
-28577=>4395,
-34468=>4396,
-36481=>4397,
-22122=>4398,
-36896=>4399,
-30338=>4400,
-28790=>4401,
-29157=>4402,
-36131=>4403,
-25321=>4404,
-21017=>4405,
-27901=>4406,
-36156=>4407,
-24590=>4408,
-22686=>4409,
-24974=>4410,
-26366=>4411,
-36192=>4412,
-25166=>4413,
-21939=>4414,
-28195=>4415,
-26413=>4416,
-36711=>4417,
-38113=>4418,
-38392=>4419,
-30504=>4420,
-26629=>4421,
-27048=>4422,
-21643=>4423,
-20045=>4424,
-28856=>4425,
-35784=>4426,
-25688=>4427,
-25995=>4428,
-23429=>4429,
-31364=>4430,
-20538=>4431,
-23528=>4432,
-30651=>4433,
-27617=>4434,
-35449=>4435,
-31896=>4436,
-27838=>4437,
-30415=>4438,
-26025=>4439,
-36759=>4440,
-23853=>4441,
-23637=>4442,
-34360=>4443,
-26632=>4444,
-21344=>4445,
-25112=>4446,
-31449=>4447,
-28251=>4448,
-32509=>4449,
-27167=>4450,
-31456=>4451,
-24432=>4452,
-28467=>4453,
-24352=>4454,
-25484=>4455,
-28072=>4456,
-26454=>4457,
-19976=>4458,
-24080=>4459,
-36134=>4460,
-20183=>4461,
-32960=>4462,
-30260=>4463,
-38556=>4464,
-25307=>4465,
-26157=>4466,
-25214=>4467,
-27836=>4468,
-36213=>4469,
-29031=>4470,
-32617=>4471,
-20806=>4472,
-32903=>4473,
-21484=>4474,
-36974=>4475,
-25240=>4476,
-21746=>4477,
-34544=>4478,
-36761=>4479,
-32773=>4480,
-38167=>4481,
-34071=>4482,
-36825=>4483,
-27993=>4484,
-29645=>4485,
-26015=>4486,
-30495=>4487,
-29956=>4488,
-30759=>4489,
-33275=>4490,
-36126=>4491,
-38024=>4492,
-20390=>4493,
-26517=>4494,
-30137=>4495,
-35786=>4496,
-38663=>4497,
-25391=>4498,
-38215=>4499,
-38453=>4500,
-33976=>4501,
-25379=>4502,
-30529=>4503,
-24449=>4504,
-29424=>4505,
-20105=>4506,
-24596=>4507,
-25972=>4508,
-25327=>4509,
-27491=>4510,
-25919=>4511,
-24103=>4512,
-30151=>4513,
-37073=>4514,
-35777=>4515,
-33437=>4516,
-26525=>4517,
-12096=>4518,
-25903=>4518,
-21553=>4519,
-34584=>4520,
-30693=>4521,
-32930=>4522,
-33026=>4523,
-27713=>4524,
-20043=>4525,
-32455=>4526,
-32844=>4527,
-30452=>4528,
-26893=>4529,
-27542=>4530,
-25191=>4531,
-20540=>4532,
-20356=>4533,
-22336=>4534,
-25351=>4535,
-12108=>4536,
-27490=>4536,
-36286=>4537,
-21482=>4538,
-26088=>4539,
-32440=>4540,
-24535=>4541,
-25370=>4542,
-25527=>4543,
-12164=>4544,
-33267=>4544,
-33268=>4545,
-32622=>4546,
-24092=>4547,
-23769=>4548,
-21046=>4549,
-26234=>4550,
-31209=>4551,
-31258=>4552,
-36136=>4553,
-28825=>4554,
-30164=>4555,
-28382=>4556,
-27835=>4557,
-31378=>4558,
-20013=>4559,
-30405=>4560,
-24544=>4561,
-38047=>4562,
-34935=>4563,
-32456=>4564,
-31181=>4565,
-32959=>4566,
-37325=>4567,
-20210=>4568,
-20247=>4569,
-12168=>4570,
-33311=>4570,
-21608=>4571,
-24030=>4572,
-27954=>4573,
-35788=>4574,
-31909=>4575,
-36724=>4576,
-32920=>4577,
-24090=>4578,
-21650=>4579,
-30385=>4580,
-23449=>4581,
-26172=>4582,
-39588=>4583,
-29664=>4584,
-26666=>4585,
-34523=>4586,
-26417=>4587,
-29482=>4588,
-35832=>4589,
-35803=>4590,
-36880=>4591,
-12149=>4592,
-31481=>4592,
-28891=>4593,
-29038=>4594,
-25284=>4595,
-30633=>4596,
-22065=>4597,
-20027=>4598,
-33879=>4599,
-26609=>4600,
-21161=>4601,
-34496=>4602,
-36142=>4603,
-38136=>4604,
-31569=>4605,
-20303=>4606,
-27880=>4607,
-31069=>4608,
-39547=>4609,
-25235=>4610,
-12118=>4611,
-29226=>4611,
-25341=>4612,
-19987=>4613,
-30742=>4614,
-36716=>4615,
-25776=>4616,
-36186=>4617,
-31686=>4618,
-26729=>4619,
-24196=>4620,
-35013=>4621,
-22918=>4622,
-25758=>4623,
-22766=>4624,
-29366=>4625,
-26894=>4626,
-38181=>4627,
-36861=>4628,
-36184=>4629,
-22368=>4630,
-32512=>4631,
-35846=>4632,
-20934=>4633,
-25417=>4634,
-25305=>4635,
-21331=>4636,
-26700=>4637,
-29730=>4638,
-33537=>4639,
-37196=>4640,
-21828=>4641,
-30528=>4642,
-28796=>4643,
-27978=>4644,
-20857=>4645,
-21672=>4646,
-36164=>4647,
-23039=>4648,
-28363=>4649,
-28100=>4650,
-23388=>4651,
-32043=>4652,
-20180=>4653,
-31869=>4654,
-28371=>4655,
-12070=>4656,
-23376=>4656,
-12163=>4657,
-33258=>4657,
-28173=>4658,
-23383=>4659,
-39683=>4660,
-26837=>4661,
-36394=>4662,
-23447=>4663,
-32508=>4664,
-24635=>4665,
-32437=>4666,
-37049=>4667,
-12187=>4668,
-36208=>4668,
-22863=>4669,
-25549=>4670,
-31199=>4671,
-12188=>4672,
-36275=>4672,
-21330=>4673,
-26063=>4674,
-31062=>4675,
-35781=>4676,
-38459=>4677,
-32452=>4678,
-38075=>4679,
-32386=>4680,
-22068=>4681,
-37257=>4682,
-26368=>4683,
-32618=>4684,
-23562=>4685,
-36981=>4686,
-26152=>4687,
-24038=>4688,
-20304=>4689,
-26590=>4690,
-20570=>4691,
-20316=>4692,
-22352=>4693,
-24231=>4694,
-20109=>4695,
-19980=>4696,
-20800=>4697,
-64012=>4697,
-19984=>4698,
-24319=>4699,
-21317=>4700,
-19989=>4701,
-20120=>4702,
-19998=>4703,
-12224=>4704,
-39730=>4704,
-23404=>4705,
-22121=>4706,
-12033=>4707,
-20008=>4707,
-31162=>4708,
-12035=>4709,
-20031=>4709,
-12052=>4710,
-21269=>4710,
-20039=>4711,
-22829=>4712,
-12120=>4713,
-29243=>4713,
-21358=>4714,
-27664=>4715,
-22239=>4716,
-32996=>4717,
-39319=>4718,
-27603=>4719,
-30590=>4720,
-40727=>4721,
-12034=>4722,
-20022=>4722,
-20127=>4723,
-40720=>4724,
-20060=>4725,
-20073=>4726,
-20115=>4727,
-33416=>4728,
-23387=>4729,
-21868=>4730,
-22031=>4731,
-20164=>4732,
-21389=>4733,
-21405=>4734,
-21411=>4735,
-21413=>4736,
-21422=>4737,
-38757=>4738,
-36189=>4739,
-12053=>4740,
-21274=>4740,
-21493=>4741,
-21286=>4742,
-21294=>4743,
-21310=>4744,
-36188=>4745,
-21350=>4746,
-21347=>4747,
-20994=>4748,
-21000=>4749,
-21006=>4750,
-21037=>4751,
-21043=>4752,
-21055=>4753,
-21056=>4754,
-21068=>4755,
-21086=>4756,
-21089=>4757,
-21084=>4758,
-33967=>4759,
-21117=>4760,
-21122=>4761,
-21121=>4762,
-21136=>4763,
-21139=>4764,
-12044=>4765,
-20866=>4765,
-32596=>4766,
-20155=>4767,
-20163=>4768,
-20169=>4769,
-20162=>4770,
-20200=>4771,
-20193=>4772,
-20203=>4773,
-20190=>4774,
-20251=>4775,
-20211=>4776,
-20258=>4777,
-20324=>4778,
-20213=>4779,
-20261=>4780,
-20263=>4781,
-20233=>4782,
-20267=>4783,
-20318=>4784,
-20327=>4785,
-25912=>4786,
-20314=>4787,
-20317=>4788,
-20319=>4789,
-20311=>4790,
-20274=>4791,
-20285=>4792,
-20342=>4793,
-20340=>4794,
-20369=>4795,
-20361=>4796,
-20355=>4797,
-20367=>4798,
-20350=>4799,
-20347=>4800,
-20394=>4801,
-20348=>4802,
-20396=>4803,
-20372=>4804,
-20454=>4805,
-20456=>4806,
-20458=>4807,
-20421=>4808,
-20442=>4809,
-20451=>4810,
-20444=>4811,
-20433=>4812,
-20447=>4813,
-20472=>4814,
-20521=>4815,
-20556=>4816,
-20467=>4817,
-20524=>4818,
-20495=>4819,
-20526=>4820,
-20525=>4821,
-20478=>4822,
-20508=>4823,
-20492=>4824,
-20517=>4825,
-20520=>4826,
-20606=>4827,
-20547=>4828,
-20565=>4829,
-20552=>4830,
-20558=>4831,
-20588=>4832,
-20603=>4833,
-20645=>4834,
-20647=>4835,
-20649=>4836,
-20666=>4837,
-20694=>4838,
-20742=>4839,
-20717=>4840,
-20716=>4841,
-20710=>4842,
-20718=>4843,
-20743=>4844,
-20747=>4845,
-20189=>4846,
-27709=>4847,
-20312=>4848,
-20325=>4849,
-20430=>4850,
-12245=>4851,
-40864=>4851,
-27718=>4852,
-31860=>4853,
-20846=>4854,
-24061=>4855,
-40649=>4856,
-39320=>4857,
-20865=>4858,
-22804=>4859,
-12051=>4860,
-21241=>4860,
-21261=>4861,
-35335=>4862,
-21264=>4863,
-20971=>4864,
-22809=>4865,
-20821=>4866,
-12039=>4867,
-20128=>4867,
-20822=>4868,
-20147=>4869,
-34926=>4870,
-34980=>4871,
-20149=>4872,
-33044=>4873,
-35026=>4874,
-31104=>4875,
-23348=>4876,
-34819=>4877,
-32696=>4878,
-12046=>4879,
-20907=>4879,
-20913=>4880,
-20925=>4881,
-20924=>4882,
-20935=>4883,
-12045=>4884,
-20886=>4884,
-20898=>4885,
-20901=>4886,
-35744=>4887,
-35750=>4888,
-35751=>4889,
-35754=>4890,
-35764=>4891,
-35765=>4892,
-35767=>4893,
-35778=>4894,
-35779=>4895,
-35787=>4896,
-35791=>4897,
-35790=>4898,
-35794=>4899,
-35795=>4900,
-35796=>4901,
-35798=>4902,
-35800=>4903,
-35801=>4904,
-35804=>4905,
-35807=>4906,
-35808=>4907,
-35812=>4908,
-35816=>4909,
-35817=>4910,
-35822=>4911,
-35824=>4912,
-35827=>4913,
-35830=>4914,
-35833=>4915,
-35836=>4916,
-35839=>4917,
-35840=>4918,
-35842=>4919,
-35844=>4920,
-35847=>4921,
-35852=>4922,
-35855=>4923,
-35857=>4924,
-35858=>4925,
-35860=>4926,
-35861=>4927,
-35862=>4928,
-35865=>4929,
-35867=>4930,
-35864=>4931,
-35869=>4932,
-35871=>4933,
-35872=>4934,
-35873=>4935,
-35877=>4936,
-35879=>4937,
-35882=>4938,
-35883=>4939,
-35886=>4940,
-35887=>4941,
-35890=>4942,
-35891=>4943,
-35893=>4944,
-35894=>4945,
-12057=>4946,
-21353=>4946,
-21370=>4947,
-38429=>4948,
-38434=>4949,
-38433=>4950,
-38449=>4951,
-38442=>4952,
-38461=>4953,
-38460=>4954,
-38466=>4955,
-38473=>4956,
-38484=>4957,
-38495=>4958,
-38503=>4959,
-38508=>4960,
-38514=>4961,
-38516=>4962,
-38536=>4963,
-38541=>4964,
-38551=>4965,
-38576=>4966,
-37015=>4967,
-37019=>4968,
-37021=>4969,
-37017=>4970,
-37036=>4971,
-37025=>4972,
-37044=>4973,
-37043=>4974,
-37046=>4975,
-37050=>4976,
-37048=>4977,
-37040=>4978,
-37071=>4979,
-37061=>4980,
-37054=>4981,
-37072=>4982,
-37060=>4983,
-37063=>4984,
-37075=>4985,
-37094=>4986,
-37090=>4987,
-37084=>4988,
-37079=>4989,
-37083=>4990,
-37099=>4991,
-37103=>4992,
-37118=>4993,
-37124=>4994,
-37154=>4995,
-37150=>4996,
-37155=>4997,
-37169=>4998,
-37167=>4999,
-37177=>5000,
-37187=>5001,
-37190=>5002,
-21005=>5003,
-22850=>5004,
-21154=>5005,
-21164=>5006,
-21165=>5007,
-21182=>5008,
-21759=>5009,
-21200=>5010,
-21206=>5011,
-21232=>5012,
-21471=>5013,
-29166=>5014,
-30669=>5015,
-12085=>5016,
-24308=>5016,
-12048=>5017,
-20981=>5017,
-20988=>5018,
-12223=>5019,
-39727=>5019,
-12059=>5020,
-21430=>5020,
-24321=>5021,
-30042=>5022,
-24047=>5023,
-22348=>5024,
-22441=>5025,
-22433=>5026,
-22654=>5027,
-22716=>5028,
-22725=>5029,
-22737=>5030,
-22313=>5031,
-22316=>5032,
-22314=>5033,
-22323=>5034,
-22329=>5035,
-22318=>5036,
-22319=>5037,
-22364=>5038,
-22331=>5039,
-22338=>5040,
-22377=>5041,
-22405=>5042,
-22379=>5043,
-22406=>5044,
-22396=>5045,
-22395=>5046,
-22376=>5047,
-22381=>5048,
-22390=>5049,
-22387=>5050,
-22445=>5051,
-22436=>5052,
-22412=>5053,
-22450=>5054,
-22479=>5055,
-22439=>5056,
-22452=>5057,
-22419=>5058,
-22432=>5059,
-22485=>5060,
-22488=>5061,
-22490=>5062,
-22489=>5063,
-22482=>5064,
-22456=>5065,
-22516=>5066,
-22511=>5067,
-22520=>5068,
-22500=>5069,
-22493=>5070,
-22539=>5071,
-22541=>5072,
-22525=>5073,
-22509=>5074,
-22528=>5075,
-22558=>5076,
-22553=>5077,
-22596=>5078,
-22560=>5079,
-22629=>5080,
-22636=>5081,
-22657=>5082,
-22665=>5083,
-22682=>5084,
-22656=>5085,
-39336=>5086,
-40729=>5087,
-25087=>5088,
-33401=>5089,
-33405=>5090,
-33407=>5091,
-33423=>5092,
-33418=>5093,
-33448=>5094,
-33412=>5095,
-33422=>5096,
-33425=>5097,
-33431=>5098,
-33433=>5099,
-33451=>5100,
-33464=>5101,
-33470=>5102,
-33456=>5103,
-33480=>5104,
-33482=>5105,
-33507=>5106,
-33432=>5107,
-33463=>5108,
-33454=>5109,
-33483=>5110,
-33484=>5111,
-33473=>5112,
-33449=>5113,
-33460=>5114,
-33441=>5115,
-33450=>5116,
-33439=>5117,
-33476=>5118,
-33486=>5119,
-33444=>5120,
-33505=>5121,
-33545=>5122,
-33527=>5123,
-33508=>5124,
-33551=>5125,
-33543=>5126,
-33500=>5127,
-33524=>5128,
-33490=>5129,
-33496=>5130,
-33548=>5131,
-33531=>5132,
-33491=>5133,
-33553=>5134,
-33562=>5135,
-33542=>5136,
-33556=>5137,
-33557=>5138,
-33504=>5139,
-33493=>5140,
-33564=>5141,
-33617=>5142,
-33627=>5143,
-33628=>5144,
-33544=>5145,
-33682=>5146,
-33596=>5147,
-33588=>5148,
-33585=>5149,
-33691=>5150,
-33630=>5151,
-33583=>5152,
-33615=>5153,
-33607=>5154,
-33603=>5155,
-33631=>5156,
-33600=>5157,
-33559=>5158,
-33632=>5159,
-33581=>5160,
-33594=>5161,
-33587=>5162,
-33638=>5163,
-33637=>5164,
-33640=>5165,
-33563=>5166,
-33641=>5167,
-33644=>5168,
-33642=>5169,
-33645=>5170,
-33646=>5171,
-33712=>5172,
-33656=>5173,
-33715=>5174,
-33716=>5175,
-33696=>5176,
-33706=>5177,
-33683=>5178,
-33692=>5179,
-33669=>5180,
-33660=>5181,
-33718=>5182,
-33705=>5183,
-33661=>5184,
-33720=>5185,
-33659=>5186,
-33688=>5187,
-33694=>5188,
-33704=>5189,
-33722=>5190,
-33724=>5191,
-33729=>5192,
-33793=>5193,
-33765=>5194,
-33752=>5195,
-22535=>5196,
-33816=>5197,
-33803=>5198,
-33757=>5199,
-33789=>5200,
-33750=>5201,
-33820=>5202,
-33848=>5203,
-33809=>5204,
-33798=>5205,
-33748=>5206,
-33759=>5207,
-33807=>5208,
-33795=>5209,
-33784=>5210,
-33785=>5211,
-33770=>5212,
-33733=>5213,
-33728=>5214,
-33830=>5215,
-33776=>5216,
-33761=>5217,
-33884=>5218,
-33873=>5219,
-33882=>5220,
-33881=>5221,
-33907=>5222,
-33927=>5223,
-33928=>5224,
-33914=>5225,
-33929=>5226,
-33912=>5227,
-33852=>5228,
-33862=>5229,
-33897=>5230,
-33910=>5231,
-33932=>5232,
-33934=>5233,
-33841=>5234,
-33901=>5235,
-33985=>5236,
-33997=>5237,
-34000=>5238,
-34022=>5239,
-33981=>5240,
-34003=>5241,
-33994=>5242,
-33983=>5243,
-33978=>5244,
-34016=>5245,
-33953=>5246,
-33977=>5247,
-33972=>5248,
-33943=>5249,
-34021=>5250,
-34019=>5251,
-34060=>5252,
-29965=>5253,
-34104=>5254,
-34032=>5255,
-34105=>5256,
-34079=>5257,
-34106=>5258,
-34134=>5259,
-34107=>5260,
-34047=>5261,
-34044=>5262,
-34137=>5263,
-34120=>5264,
-34152=>5265,
-34148=>5266,
-34142=>5267,
-34170=>5268,
-30626=>5269,
-34115=>5270,
-34162=>5271,
-34171=>5272,
-34212=>5273,
-34216=>5274,
-34183=>5275,
-34191=>5276,
-34169=>5277,
-34222=>5278,
-34204=>5279,
-34181=>5280,
-34233=>5281,
-34231=>5282,
-34224=>5283,
-34259=>5284,
-34241=>5285,
-34268=>5286,
-34303=>5287,
-34343=>5288,
-34309=>5289,
-34345=>5290,
-34326=>5291,
-34364=>5292,
-12086=>5293,
-24318=>5293,
-24328=>5294,
-22844=>5295,
-22849=>5296,
-32823=>5297,
-22869=>5298,
-22874=>5299,
-22872=>5300,
-21263=>5301,
-12074=>5302,
-23586=>5302,
-23589=>5303,
-23596=>5304,
-23604=>5305,
-25164=>5306,
-25194=>5307,
-25247=>5308,
-25275=>5309,
-25290=>5310,
-25306=>5311,
-25303=>5312,
-25326=>5313,
-25378=>5314,
-25334=>5315,
-25401=>5316,
-25419=>5317,
-25411=>5318,
-25517=>5319,
-25590=>5320,
-25457=>5321,
-25466=>5322,
-25486=>5323,
-25524=>5324,
-25453=>5325,
-25516=>5326,
-25482=>5327,
-25449=>5328,
-25518=>5329,
-25532=>5330,
-25586=>5331,
-25592=>5332,
-25568=>5333,
-25599=>5334,
-25540=>5335,
-25566=>5336,
-25550=>5337,
-25682=>5338,
-25542=>5339,
-25534=>5340,
-25669=>5341,
-25665=>5342,
-25611=>5343,
-25627=>5344,
-25632=>5345,
-25612=>5346,
-25638=>5347,
-25633=>5348,
-25694=>5349,
-25732=>5350,
-25709=>5351,
-25750=>5352,
-25722=>5353,
-25783=>5354,
-25784=>5355,
-25753=>5356,
-25786=>5357,
-25792=>5358,
-25808=>5359,
-25815=>5360,
-25828=>5361,
-25826=>5362,
-25865=>5363,
-25893=>5364,
-25902=>5365,
-12087=>5366,
-24331=>5366,
-24530=>5367,
-29977=>5368,
-24337=>5369,
-21343=>5370,
-21489=>5371,
-21501=>5372,
-21481=>5373,
-21480=>5374,
-21499=>5375,
-21522=>5376,
-21526=>5377,
-21510=>5378,
-21579=>5379,
-21586=>5380,
-21587=>5381,
-21588=>5382,
-21590=>5383,
-21571=>5384,
-21537=>5385,
-21591=>5386,
-21593=>5387,
-21539=>5388,
-21554=>5389,
-21634=>5390,
-21652=>5391,
-21623=>5392,
-21617=>5393,
-21604=>5394,
-21658=>5395,
-21659=>5396,
-21636=>5397,
-21622=>5398,
-21606=>5399,
-21661=>5400,
-21712=>5401,
-21677=>5402,
-21698=>5403,
-21684=>5404,
-21714=>5405,
-21671=>5406,
-21670=>5407,
-21715=>5408,
-21716=>5409,
-21618=>5410,
-21667=>5411,
-21717=>5412,
-21691=>5413,
-21695=>5414,
-21708=>5415,
-21721=>5416,
-21722=>5417,
-21724=>5418,
-21673=>5419,
-21674=>5420,
-21668=>5421,
-21725=>5422,
-21711=>5423,
-21726=>5424,
-21787=>5425,
-21735=>5426,
-21792=>5427,
-21757=>5428,
-21780=>5429,
-21747=>5430,
-21794=>5431,
-21795=>5432,
-21775=>5433,
-21777=>5434,
-21799=>5435,
-21802=>5436,
-21863=>5437,
-21903=>5438,
-21941=>5439,
-21833=>5440,
-21869=>5441,
-21825=>5442,
-21845=>5443,
-21823=>5444,
-21840=>5445,
-21820=>5446,
-21815=>5447,
-21846=>5448,
-21877=>5449,
-21878=>5450,
-21879=>5451,
-21811=>5452,
-21808=>5453,
-21852=>5454,
-21899=>5455,
-21970=>5456,
-21891=>5457,
-21937=>5458,
-21945=>5459,
-21896=>5460,
-21889=>5461,
-21919=>5462,
-21886=>5463,
-21974=>5464,
-21905=>5465,
-21883=>5466,
-21983=>5467,
-21949=>5468,
-21950=>5469,
-21908=>5470,
-21913=>5471,
-21994=>5472,
-22007=>5473,
-21961=>5474,
-22047=>5475,
-21969=>5476,
-21995=>5477,
-21996=>5478,
-21972=>5479,
-21990=>5480,
-21981=>5481,
-21956=>5482,
-21999=>5483,
-21989=>5484,
-22002=>5485,
-22003=>5486,
-21964=>5487,
-21965=>5488,
-21992=>5489,
-22005=>5490,
-21988=>5491,
-36756=>5492,
-22046=>5493,
-22024=>5494,
-22028=>5495,
-22017=>5496,
-22052=>5497,
-22051=>5498,
-22014=>5499,
-22016=>5500,
-22055=>5501,
-22061=>5502,
-22104=>5503,
-22073=>5504,
-22103=>5505,
-22060=>5506,
-22093=>5507,
-22114=>5508,
-22105=>5509,
-22108=>5510,
-22092=>5511,
-22100=>5512,
-22150=>5513,
-22116=>5514,
-22129=>5515,
-22123=>5516,
-22139=>5517,
-22140=>5518,
-22149=>5519,
-22163=>5520,
-22191=>5521,
-22228=>5522,
-12062=>5523,
-22231=>5523,
-22237=>5524,
-22241=>5525,
-22261=>5526,
-22251=>5527,
-22265=>5528,
-22271=>5529,
-22276=>5530,
-22282=>5531,
-22281=>5532,
-22300=>5533,
-24079=>5534,
-24089=>5535,
-24084=>5536,
-24081=>5537,
-24113=>5538,
-24123=>5539,
-24124=>5540,
-24119=>5541,
-24132=>5542,
-24148=>5543,
-24155=>5544,
-24158=>5545,
-24161=>5546,
-23692=>5547,
-23674=>5548,
-23693=>5549,
-23696=>5550,
-23702=>5551,
-23688=>5552,
-23704=>5553,
-23705=>5554,
-23697=>5555,
-23706=>5556,
-23708=>5557,
-23733=>5558,
-23714=>5559,
-23741=>5560,
-23724=>5561,
-23723=>5562,
-23729=>5563,
-23715=>5564,
-23745=>5565,
-23735=>5566,
-23748=>5567,
-23762=>5568,
-23780=>5569,
-23755=>5570,
-23781=>5571,
-23810=>5572,
-23811=>5573,
-23847=>5574,
-23846=>5575,
-23854=>5576,
-23844=>5577,
-23838=>5578,
-23814=>5579,
-23835=>5580,
-23896=>5581,
-23870=>5582,
-23860=>5583,
-23869=>5584,
-23916=>5585,
-23899=>5586,
-23919=>5587,
-23901=>5588,
-23915=>5589,
-23883=>5590,
-23882=>5591,
-23913=>5592,
-23924=>5593,
-23938=>5594,
-23961=>5595,
-23965=>5596,
-35955=>5597,
-23991=>5598,
-24005=>5599,
-12091=>5600,
-24435=>5600,
-24439=>5601,
-24450=>5602,
-24455=>5603,
-24457=>5604,
-24460=>5605,
-24469=>5606,
-24473=>5607,
-24476=>5608,
-24488=>5609,
-24493=>5610,
-24501=>5611,
-24508=>5612,
-34914=>5613,
-12090=>5614,
-24417=>5614,
-29357=>5615,
-29360=>5616,
-29364=>5617,
-29367=>5618,
-29368=>5619,
-29379=>5620,
-29377=>5621,
-29390=>5622,
-29389=>5623,
-29394=>5624,
-29416=>5625,
-29423=>5626,
-29417=>5627,
-29426=>5628,
-29428=>5629,
-29431=>5630,
-29441=>5631,
-29427=>5632,
-29443=>5633,
-29434=>5634,
-29435=>5635,
-29463=>5636,
-29459=>5637,
-29473=>5638,
-29450=>5639,
-29470=>5640,
-29469=>5641,
-29461=>5642,
-29474=>5643,
-29497=>5644,
-29477=>5645,
-29484=>5646,
-29496=>5647,
-29489=>5648,
-29520=>5649,
-29517=>5650,
-29527=>5651,
-29536=>5652,
-29548=>5653,
-29551=>5654,
-29566=>5655,
-12167=>5656,
-33307=>5656,
-22821=>5657,
-39143=>5658,
-22820=>5659,
-12065=>5660,
-22786=>5660,
-39267=>5661,
-39271=>5662,
-39272=>5663,
-39273=>5664,
-39274=>5665,
-39275=>5666,
-39276=>5667,
-39284=>5668,
-39287=>5669,
-39293=>5670,
-39296=>5671,
-39300=>5672,
-39303=>5673,
-39306=>5674,
-39309=>5675,
-39312=>5676,
-39313=>5677,
-39315=>5678,
-39316=>5679,
-39317=>5680,
-24192=>5681,
-24209=>5682,
-24203=>5683,
-24214=>5684,
-24229=>5685,
-24224=>5686,
-24249=>5687,
-24245=>5688,
-24254=>5689,
-24243=>5690,
-36179=>5691,
-24274=>5692,
-24273=>5693,
-24283=>5694,
-24296=>5695,
-24298=>5696,
-33210=>5697,
-24516=>5698,
-24521=>5699,
-24534=>5700,
-24527=>5701,
-24579=>5702,
-24558=>5703,
-24580=>5704,
-24545=>5705,
-24548=>5706,
-24574=>5707,
-24581=>5708,
-24582=>5709,
-24554=>5710,
-24557=>5711,
-24568=>5712,
-24601=>5713,
-24629=>5714,
-24614=>5715,
-24603=>5716,
-24591=>5717,
-24589=>5718,
-24617=>5719,
-24619=>5720,
-24586=>5721,
-24639=>5722,
-24609=>5723,
-24696=>5724,
-24697=>5725,
-24699=>5726,
-24698=>5727,
-24642=>5728,
-24682=>5729,
-24701=>5730,
-24726=>5731,
-24730=>5732,
-24749=>5733,
-24733=>5734,
-24707=>5735,
-24722=>5736,
-24716=>5737,
-24731=>5738,
-24812=>5739,
-24763=>5740,
-24753=>5741,
-24797=>5742,
-24792=>5743,
-24774=>5744,
-24794=>5745,
-24756=>5746,
-24864=>5747,
-24870=>5748,
-24853=>5749,
-24867=>5750,
-24820=>5751,
-24832=>5752,
-24846=>5753,
-24875=>5754,
-24906=>5755,
-24949=>5756,
-25004=>5757,
-24980=>5758,
-24999=>5759,
-25015=>5760,
-25044=>5761,
-25077=>5762,
-24541=>5763,
-38579=>5764,
-38377=>5765,
-38379=>5766,
-38385=>5767,
-38387=>5768,
-38389=>5769,
-38390=>5770,
-38396=>5771,
-38398=>5772,
-38403=>5773,
-38404=>5774,
-38406=>5775,
-38408=>5776,
-38410=>5777,
-38411=>5778,
-38412=>5779,
-38413=>5780,
-38415=>5781,
-38418=>5782,
-38421=>5783,
-38422=>5784,
-38423=>5785,
-38425=>5786,
-38426=>5787,
-20012=>5788,
-12121=>5789,
-29247=>5789,
-25109=>5790,
-27701=>5791,
-27732=>5792,
-27740=>5793,
-27722=>5794,
-27811=>5795,
-27781=>5796,
-27792=>5797,
-27796=>5798,
-27788=>5799,
-27752=>5800,
-27753=>5801,
-27764=>5802,
-27766=>5803,
-27782=>5804,
-27817=>5805,
-27856=>5806,
-27860=>5807,
-27821=>5808,
-27895=>5809,
-27896=>5810,
-27889=>5811,
-27863=>5812,
-27826=>5813,
-27872=>5814,
-27862=>5815,
-27898=>5816,
-27883=>5817,
-27886=>5818,
-27825=>5819,
-27859=>5820,
-27887=>5821,
-27902=>5822,
-27961=>5823,
-27943=>5824,
-27916=>5825,
-27971=>5826,
-27976=>5827,
-27911=>5828,
-27908=>5829,
-27929=>5830,
-27918=>5831,
-27947=>5832,
-27981=>5833,
-27950=>5834,
-27957=>5835,
-27930=>5836,
-27983=>5837,
-27986=>5838,
-27988=>5839,
-27955=>5840,
-28049=>5841,
-28015=>5842,
-28062=>5843,
-28064=>5844,
-27998=>5845,
-28051=>5846,
-28052=>5847,
-27996=>5848,
-28000=>5849,
-28028=>5850,
-28003=>5851,
-28186=>5852,
-28103=>5853,
-28101=>5854,
-28126=>5855,
-28174=>5856,
-28095=>5857,
-28128=>5858,
-28177=>5859,
-28134=>5860,
-28125=>5861,
-28121=>5862,
-28182=>5863,
-28075=>5864,
-28172=>5865,
-28078=>5866,
-28203=>5867,
-28270=>5868,
-28238=>5869,
-28267=>5870,
-28338=>5871,
-28255=>5872,
-28294=>5873,
-28243=>5874,
-28244=>5875,
-28210=>5876,
-28197=>5877,
-28228=>5878,
-28383=>5879,
-28337=>5880,
-28312=>5881,
-28384=>5882,
-28461=>5883,
-28386=>5884,
-28325=>5885,
-28327=>5886,
-28349=>5887,
-28347=>5888,
-28343=>5889,
-28375=>5890,
-28340=>5891,
-28367=>5892,
-28303=>5893,
-28354=>5894,
-28319=>5895,
-28514=>5896,
-28486=>5897,
-28487=>5898,
-28452=>5899,
-28437=>5900,
-28409=>5901,
-28463=>5902,
-28470=>5903,
-28491=>5904,
-28532=>5905,
-28458=>5906,
-28425=>5907,
-28457=>5908,
-28553=>5909,
-28557=>5910,
-28556=>5911,
-28536=>5912,
-28530=>5913,
-28540=>5914,
-28538=>5915,
-28625=>5916,
-28617=>5917,
-28583=>5918,
-28601=>5919,
-28598=>5920,
-28610=>5921,
-28641=>5922,
-28654=>5923,
-28638=>5924,
-28640=>5925,
-28655=>5926,
-28698=>5927,
-28707=>5928,
-28699=>5929,
-28729=>5930,
-28725=>5931,
-28751=>5932,
-28766=>5933,
-12071=>5934,
-23424=>5934,
-23428=>5935,
-23445=>5936,
-23443=>5937,
-23461=>5938,
-23480=>5939,
-29999=>5940,
-39582=>5941,
-25652=>5942,
-23524=>5943,
-23534=>5944,
-35120=>5945,
-23536=>5946,
-36423=>5947,
-35591=>5948,
-36790=>5949,
-36819=>5950,
-36821=>5951,
-36837=>5952,
-36846=>5953,
-36836=>5954,
-36841=>5955,
-36838=>5956,
-36851=>5957,
-36840=>5958,
-36869=>5959,
-36868=>5960,
-36875=>5961,
-36902=>5962,
-36881=>5963,
-36877=>5964,
-36886=>5965,
-36897=>5966,
-36917=>5967,
-36918=>5968,
-36909=>5969,
-36911=>5970,
-36932=>5971,
-36945=>5972,
-36946=>5973,
-36944=>5974,
-36968=>5975,
-36952=>5976,
-36962=>5977,
-36955=>5978,
-26297=>5979,
-36980=>5980,
-36989=>5981,
-36994=>5982,
-37000=>5983,
-36995=>5984,
-37003=>5985,
-12089=>5986,
-24400=>5986,
-24407=>5987,
-24406=>5988,
-24408=>5989,
-23611=>5990,
-21675=>5991,
-23632=>5992,
-23641=>5993,
-23409=>5994,
-23651=>5995,
-23654=>5996,
-32700=>5997,
-24362=>5998,
-24361=>5999,
-24365=>6000,
-33396=>6001,
-24380=>6002,
-39739=>6003,
-12076=>6004,
-23662=>6004,
-22913=>6005,
-22915=>6006,
-22925=>6007,
-22953=>6008,
-22954=>6009,
-22947=>6010,
-22935=>6011,
-22986=>6012,
-22955=>6013,
-22942=>6014,
-22948=>6015,
-22994=>6016,
-22962=>6017,
-22959=>6018,
-22999=>6019,
-22974=>6020,
-23045=>6021,
-23046=>6022,
-23005=>6023,
-23048=>6024,
-23011=>6025,
-23000=>6026,
-23033=>6027,
-23052=>6028,
-23049=>6029,
-23090=>6030,
-23092=>6031,
-23057=>6032,
-23075=>6033,
-23059=>6034,
-23104=>6035,
-23143=>6036,
-23114=>6037,
-23125=>6038,
-23100=>6039,
-23138=>6040,
-23157=>6041,
-33004=>6042,
-23210=>6043,
-23195=>6044,
-23159=>6045,
-23162=>6046,
-23230=>6047,
-23275=>6048,
-23218=>6049,
-23250=>6050,
-23252=>6051,
-23224=>6052,
-23264=>6053,
-23267=>6054,
-23281=>6055,
-23254=>6056,
-23270=>6057,
-23256=>6058,
-23260=>6059,
-23305=>6060,
-23319=>6061,
-23318=>6062,
-23346=>6063,
-23351=>6064,
-23360=>6065,
-23573=>6066,
-23580=>6067,
-23386=>6068,
-23397=>6069,
-23411=>6070,
-23377=>6071,
-23379=>6072,
-23394=>6073,
-39541=>6074,
-39543=>6075,
-39544=>6076,
-39546=>6077,
-39551=>6078,
-39549=>6079,
-39552=>6080,
-39553=>6081,
-39557=>6082,
-39560=>6083,
-39562=>6084,
-39568=>6085,
-39570=>6086,
-39571=>6087,
-39574=>6088,
-39576=>6089,
-39579=>6090,
-39580=>6091,
-39581=>6092,
-39583=>6093,
-39584=>6094,
-39586=>6095,
-39587=>6096,
-39589=>6097,
-39591=>6098,
-32415=>6099,
-32417=>6100,
-32419=>6101,
-32421=>6102,
-32424=>6103,
-32425=>6104,
-32429=>6105,
-32432=>6106,
-32446=>6107,
-32448=>6108,
-32449=>6109,
-32450=>6110,
-32457=>6111,
-32459=>6112,
-32460=>6113,
-32464=>6114,
-32468=>6115,
-32471=>6116,
-32475=>6117,
-32480=>6118,
-32481=>6119,
-32488=>6120,
-32491=>6121,
-32494=>6122,
-32495=>6123,
-32497=>6124,
-32498=>6125,
-32525=>6126,
-32502=>6127,
-32506=>6128,
-32507=>6129,
-32510=>6130,
-32513=>6131,
-32514=>6132,
-32515=>6133,
-32519=>6134,
-32520=>6135,
-32523=>6136,
-32524=>6137,
-32527=>6138,
-32529=>6139,
-32530=>6140,
-32535=>6141,
-32537=>6142,
-32540=>6143,
-32539=>6144,
-32543=>6145,
-32545=>6146,
-32546=>6147,
-32547=>6148,
-32548=>6149,
-32549=>6150,
-32550=>6151,
-32551=>6152,
-32554=>6153,
-32555=>6154,
-32556=>6155,
-32557=>6156,
-32559=>6157,
-32560=>6158,
-32561=>6159,
-32562=>6160,
-32563=>6161,
-32565=>6162,
-12083=>6163,
-24186=>6163,
-30079=>6164,
-12078=>6165,
-24027=>6165,
-30014=>6166,
-37013=>6167,
-29582=>6168,
-29585=>6169,
-29614=>6170,
-29602=>6171,
-29599=>6172,
-29647=>6173,
-29634=>6174,
-29649=>6175,
-29623=>6176,
-29619=>6177,
-29632=>6178,
-29641=>6179,
-29640=>6180,
-29669=>6181,
-29657=>6182,
-39036=>6183,
-29706=>6184,
-29673=>6185,
-29671=>6186,
-29662=>6187,
-29626=>6188,
-29682=>6189,
-29711=>6190,
-29738=>6191,
-29787=>6192,
-29734=>6193,
-29733=>6194,
-29736=>6195,
-29744=>6196,
-29742=>6197,
-29740=>6198,
-29723=>6199,
-29722=>6200,
-29761=>6201,
-29788=>6202,
-29783=>6203,
-29781=>6204,
-29785=>6205,
-29815=>6206,
-29805=>6207,
-29822=>6208,
-29852=>6209,
-29838=>6210,
-29824=>6211,
-29825=>6212,
-29831=>6213,
-29835=>6214,
-29854=>6215,
-29864=>6216,
-29865=>6217,
-29840=>6218,
-29863=>6219,
-29906=>6220,
-29882=>6221,
-38890=>6222,
-38891=>6223,
-38892=>6224,
-26444=>6225,
-26451=>6226,
-26462=>6227,
-26440=>6228,
-26473=>6229,
-26533=>6230,
-26503=>6231,
-26474=>6232,
-26483=>6233,
-26520=>6234,
-26535=>6235,
-26485=>6236,
-26536=>6237,
-26526=>6238,
-26541=>6239,
-26507=>6240,
-26487=>6241,
-26492=>6242,
-26608=>6243,
-26633=>6244,
-26584=>6245,
-26634=>6246,
-26601=>6247,
-26544=>6248,
-26636=>6249,
-26585=>6250,
-26549=>6251,
-26586=>6252,
-26547=>6253,
-26589=>6254,
-26624=>6255,
-26563=>6256,
-26552=>6257,
-26594=>6258,
-26638=>6259,
-26561=>6260,
-26621=>6261,
-26674=>6262,
-26675=>6263,
-26720=>6264,
-26721=>6265,
-26702=>6266,
-26722=>6267,
-26692=>6268,
-26724=>6269,
-26755=>6270,
-26653=>6271,
-26709=>6272,
-26726=>6273,
-26689=>6274,
-26727=>6275,
-26688=>6276,
-26686=>6277,
-26698=>6278,
-26697=>6279,
-26665=>6280,
-26805=>6281,
-26767=>6282,
-26740=>6283,
-26743=>6284,
-26771=>6285,
-26731=>6286,
-26818=>6287,
-26990=>6288,
-26876=>6289,
-26911=>6290,
-26912=>6291,
-26873=>6292,
-26916=>6293,
-26864=>6294,
-26891=>6295,
-26881=>6296,
-26967=>6297,
-26851=>6298,
-26896=>6299,
-26993=>6300,
-26937=>6301,
-26976=>6302,
-26946=>6303,
-26973=>6304,
-27012=>6305,
-26987=>6306,
-27008=>6307,
-27032=>6308,
-27000=>6309,
-26932=>6310,
-27084=>6311,
-27015=>6312,
-27016=>6313,
-27086=>6314,
-27017=>6315,
-26982=>6316,
-26979=>6317,
-27001=>6318,
-27035=>6319,
-27047=>6320,
-27067=>6321,
-27051=>6322,
-27053=>6323,
-27092=>6324,
-27057=>6325,
-27073=>6326,
-27082=>6327,
-27103=>6328,
-27029=>6329,
-27104=>6330,
-27021=>6331,
-27135=>6332,
-27183=>6333,
-27117=>6334,
-27159=>6335,
-27160=>6336,
-27237=>6337,
-27122=>6338,
-27204=>6339,
-27198=>6340,
-27296=>6341,
-27216=>6342,
-27227=>6343,
-27189=>6344,
-27278=>6345,
-27257=>6346,
-27197=>6347,
-27176=>6348,
-27224=>6349,
-27260=>6350,
-27281=>6351,
-27280=>6352,
-27305=>6353,
-27287=>6354,
-27307=>6355,
-29495=>6356,
-29522=>6357,
-27521=>6358,
-27522=>6359,
-27527=>6360,
-27524=>6361,
-27538=>6362,
-27539=>6363,
-27533=>6364,
-27546=>6365,
-27547=>6366,
-27553=>6367,
-27562=>6368,
-36715=>6369,
-36717=>6370,
-36721=>6371,
-36722=>6372,
-36723=>6373,
-36725=>6374,
-36726=>6375,
-36728=>6376,
-36727=>6377,
-36729=>6378,
-36730=>6379,
-36732=>6380,
-36734=>6381,
-36737=>6382,
-36738=>6383,
-36740=>6384,
-36743=>6385,
-36747=>6386,
-36749=>6387,
-36750=>6388,
-36751=>6389,
-36760=>6390,
-36762=>6391,
-36558=>6392,
-25099=>6393,
-25111=>6394,
-25115=>6395,
-25119=>6396,
-25122=>6397,
-25121=>6398,
-25125=>6399,
-25124=>6400,
-25132=>6401,
-33255=>6402,
-29935=>6403,
-29940=>6404,
-29951=>6405,
-29967=>6406,
-29969=>6407,
-29971=>6408,
-12097=>6409,
-25908=>6409,
-26094=>6410,
-26095=>6411,
-26096=>6412,
-26122=>6413,
-26137=>6414,
-26482=>6415,
-26115=>6416,
-26133=>6417,
-26112=>6418,
-28805=>6419,
-26359=>6420,
-26141=>6421,
-26164=>6422,
-26161=>6423,
-26166=>6424,
-26165=>6425,
-32774=>6426,
-26207=>6427,
-26196=>6428,
-26177=>6429,
-26191=>6430,
-26198=>6431,
-26209=>6432,
-26199=>6433,
-26231=>6434,
-26244=>6435,
-26252=>6436,
-26279=>6437,
-26269=>6438,
-26302=>6439,
-26331=>6440,
-26332=>6441,
-26342=>6442,
-26345=>6443,
-36146=>6444,
-36147=>6445,
-36150=>6446,
-36155=>6447,
-36157=>6448,
-36160=>6449,
-36165=>6450,
-36166=>6451,
-36168=>6452,
-36169=>6453,
-36167=>6454,
-36173=>6455,
-36181=>6456,
-36185=>6457,
-35271=>6458,
-35274=>6459,
-35275=>6460,
-35276=>6461,
-35278=>6462,
-35279=>6463,
-35280=>6464,
-35281=>6465,
-29294=>6466,
-29343=>6467,
-29277=>6468,
-29286=>6469,
-29295=>6470,
-29310=>6471,
-29311=>6472,
-29316=>6473,
-29323=>6474,
-29325=>6475,
-29327=>6476,
-29330=>6477,
-25352=>6478,
-25394=>6479,
-25520=>6480,
-25663=>6481,
-25816=>6482,
-32772=>6483,
-27626=>6484,
-27635=>6485,
-27645=>6486,
-27637=>6487,
-27641=>6488,
-27653=>6489,
-27655=>6490,
-27654=>6491,
-27661=>6492,
-27669=>6493,
-27672=>6494,
-27673=>6495,
-27674=>6496,
-27681=>6497,
-27689=>6498,
-27684=>6499,
-27690=>6500,
-27698=>6501,
-25909=>6502,
-25941=>6503,
-25963=>6504,
-29261=>6505,
-29266=>6506,
-29270=>6507,
-29232=>6508,
-34402=>6509,
-21014=>6510,
-32927=>6511,
-32924=>6512,
-32915=>6513,
-32956=>6514,
-26378=>6515,
-32957=>6516,
-32945=>6517,
-32939=>6518,
-32941=>6519,
-32948=>6520,
-32951=>6521,
-32999=>6522,
-33000=>6523,
-33001=>6524,
-33002=>6525,
-32987=>6526,
-32962=>6527,
-32964=>6528,
-32985=>6529,
-32973=>6530,
-32983=>6531,
-26384=>6532,
-32989=>6533,
-33003=>6534,
-33009=>6535,
-33012=>6536,
-33005=>6537,
-33037=>6538,
-33038=>6539,
-33010=>6540,
-33020=>6541,
-26389=>6542,
-33042=>6543,
-35930=>6544,
-33078=>6545,
-33054=>6546,
-33068=>6547,
-33048=>6548,
-33074=>6549,
-33096=>6550,
-33100=>6551,
-33107=>6552,
-33140=>6553,
-33113=>6554,
-33114=>6555,
-33137=>6556,
-33120=>6557,
-33129=>6558,
-33148=>6559,
-33149=>6560,
-33133=>6561,
-33127=>6562,
-22605=>6563,
-23221=>6564,
-33160=>6565,
-33154=>6566,
-33169=>6567,
-28373=>6568,
-33187=>6569,
-33194=>6570,
-33228=>6571,
-26406=>6572,
-33226=>6573,
-33211=>6574,
-33217=>6575,
-33190=>6576,
-27428=>6577,
-27447=>6578,
-27449=>6579,
-27459=>6580,
-27462=>6581,
-27481=>6582,
-39121=>6583,
-39122=>6584,
-39123=>6585,
-39125=>6586,
-39129=>6587,
-39130=>6588,
-12110=>6589,
-27571=>6589,
-24384=>6590,
-27586=>6591,
-35315=>6592,
-26000=>6593,
-40785=>6594,
-26003=>6595,
-26044=>6596,
-26054=>6597,
-26052=>6598,
-26051=>6599,
-26060=>6600,
-26062=>6601,
-26066=>6602,
-26070=>6603,
-28800=>6604,
-28828=>6605,
-28822=>6606,
-28829=>6607,
-28859=>6608,
-28864=>6609,
-28855=>6610,
-28843=>6611,
-28849=>6612,
-28904=>6613,
-28874=>6614,
-28944=>6615,
-28947=>6616,
-28950=>6617,
-28975=>6618,
-28977=>6619,
-29043=>6620,
-29020=>6621,
-29032=>6622,
-28997=>6623,
-29042=>6624,
-29002=>6625,
-29048=>6626,
-29050=>6627,
-29080=>6628,
-29107=>6629,
-29109=>6630,
-29096=>6631,
-29088=>6632,
-29152=>6633,
-29140=>6634,
-29159=>6635,
-29177=>6636,
-29213=>6637,
-29224=>6638,
-28780=>6639,
-28952=>6640,
-29030=>6641,
-29113=>6642,
-25150=>6643,
-25149=>6644,
-25155=>6645,
-25160=>6646,
-25161=>6647,
-31035=>6648,
-31040=>6649,
-31046=>6650,
-31049=>6651,
-31067=>6652,
-31068=>6653,
-31059=>6654,
-31066=>6655,
-31074=>6656,
-31063=>6657,
-31072=>6658,
-31087=>6659,
-31079=>6660,
-31098=>6661,
-31109=>6662,
-31114=>6663,
-31130=>6664,
-31143=>6665,
-31155=>6666,
-24529=>6667,
-24528=>6668,
-24636=>6669,
-24669=>6670,
-24666=>6671,
-24679=>6672,
-24641=>6673,
-24665=>6674,
-24675=>6675,
-24747=>6676,
-24838=>6677,
-24845=>6678,
-24925=>6679,
-25001=>6680,
-24989=>6681,
-25035=>6682,
-25041=>6683,
-25094=>6684,
-32896=>6685,
-12160=>6686,
-32895=>6686,
-27795=>6687,
-27894=>6688,
-28156=>6689,
-30710=>6690,
-30712=>6691,
-30720=>6692,
-30729=>6693,
-30743=>6694,
-30744=>6695,
-30737=>6696,
-26027=>6697,
-30765=>6698,
-30748=>6699,
-30749=>6700,
-30777=>6701,
-30778=>6702,
-30779=>6703,
-30751=>6704,
-30780=>6705,
-30757=>6706,
-30764=>6707,
-30755=>6708,
-30761=>6709,
-30798=>6710,
-30829=>6711,
-30806=>6712,
-30807=>6713,
-30758=>6714,
-30800=>6715,
-30791=>6716,
-30796=>6717,
-30826=>6718,
-30875=>6719,
-30867=>6720,
-30874=>6721,
-30855=>6722,
-30876=>6723,
-30881=>6724,
-30883=>6725,
-30898=>6726,
-30905=>6727,
-30885=>6728,
-30932=>6729,
-30937=>6730,
-30921=>6731,
-30956=>6732,
-30962=>6733,
-30981=>6734,
-30964=>6735,
-30995=>6736,
-31012=>6737,
-31006=>6738,
-31028=>6739,
-40859=>6740,
-12235=>6741,
-40697=>6741,
-40699=>6742,
-40700=>6743,
-30449=>6744,
-30468=>6745,
-30477=>6746,
-30457=>6747,
-30471=>6748,
-30472=>6749,
-30490=>6750,
-30498=>6751,
-30489=>6752,
-30509=>6753,
-30502=>6754,
-30517=>6755,
-30520=>6756,
-30544=>6757,
-30545=>6758,
-30535=>6759,
-30531=>6760,
-30554=>6761,
-30568=>6762,
-30562=>6763,
-30565=>6764,
-30591=>6765,
-30605=>6766,
-30589=>6767,
-30592=>6768,
-30604=>6769,
-30609=>6770,
-30623=>6771,
-30624=>6772,
-30640=>6773,
-30645=>6774,
-30653=>6775,
-30010=>6776,
-30016=>6777,
-30030=>6778,
-30027=>6779,
-30024=>6780,
-30043=>6781,
-30066=>6782,
-30073=>6783,
-30083=>6784,
-32600=>6785,
-32609=>6786,
-32607=>6787,
-35400=>6788,
-32616=>6789,
-32628=>6790,
-32625=>6791,
-32633=>6792,
-32641=>6793,
-32638=>6794,
-30413=>6795,
-30437=>6796,
-34866=>6797,
-38021=>6798,
-38022=>6799,
-38023=>6800,
-38027=>6801,
-38026=>6802,
-38028=>6803,
-38029=>6804,
-38031=>6805,
-38032=>6806,
-38036=>6807,
-38039=>6808,
-38037=>6809,
-38042=>6810,
-38043=>6811,
-38044=>6812,
-38051=>6813,
-38052=>6814,
-38059=>6815,
-38058=>6816,
-38061=>6817,
-38060=>6818,
-38063=>6819,
-38064=>6820,
-38066=>6821,
-38068=>6822,
-38070=>6823,
-38071=>6824,
-38072=>6825,
-38073=>6826,
-38074=>6827,
-38076=>6828,
-38077=>6829,
-38079=>6830,
-38084=>6831,
-38088=>6832,
-38089=>6833,
-38090=>6834,
-38091=>6835,
-38092=>6836,
-38093=>6837,
-38094=>6838,
-38096=>6839,
-38097=>6840,
-38098=>6841,
-38101=>6842,
-38102=>6843,
-38103=>6844,
-38105=>6845,
-38104=>6846,
-38107=>6847,
-38110=>6848,
-38111=>6849,
-38112=>6850,
-38114=>6851,
-38116=>6852,
-38117=>6853,
-38119=>6854,
-38120=>6855,
-38122=>6856,
-38121=>6857,
-38123=>6858,
-38126=>6859,
-38127=>6860,
-38131=>6861,
-38132=>6862,
-38133=>6863,
-38135=>6864,
-38137=>6865,
-38140=>6866,
-38141=>6867,
-38143=>6868,
-38147=>6869,
-38146=>6870,
-38150=>6871,
-38151=>6872,
-38153=>6873,
-38154=>6874,
-38157=>6875,
-38158=>6876,
-38159=>6877,
-38162=>6878,
-38163=>6879,
-38164=>6880,
-38165=>6881,
-38166=>6882,
-38168=>6883,
-38171=>6884,
-38173=>6885,
-38174=>6886,
-38175=>6887,
-38178=>6888,
-38186=>6889,
-38187=>6890,
-38185=>6891,
-38188=>6892,
-38193=>6893,
-38194=>6894,
-38196=>6895,
-38198=>6896,
-38199=>6897,
-38200=>6898,
-38204=>6899,
-38206=>6900,
-38207=>6901,
-38210=>6902,
-38197=>6903,
-38212=>6904,
-38213=>6905,
-38214=>6906,
-38217=>6907,
-38220=>6908,
-38222=>6909,
-38223=>6910,
-38226=>6911,
-38227=>6912,
-38228=>6913,
-38230=>6914,
-38231=>6915,
-38232=>6916,
-38233=>6917,
-38235=>6918,
-38238=>6919,
-38239=>6920,
-38237=>6921,
-38241=>6922,
-38242=>6923,
-38244=>6924,
-38245=>6925,
-38246=>6926,
-38247=>6927,
-38248=>6928,
-38249=>6929,
-38250=>6930,
-38251=>6931,
-38252=>6932,
-38255=>6933,
-38257=>6934,
-38258=>6935,
-38259=>6936,
-38202=>6937,
-30695=>6938,
-30700=>6939,
-38601=>6940,
-31189=>6941,
-31213=>6942,
-31203=>6943,
-31211=>6944,
-31238=>6945,
-23879=>6946,
-31235=>6947,
-31234=>6948,
-31262=>6949,
-31252=>6950,
-31289=>6951,
-31287=>6952,
-31313=>6953,
-40655=>6954,
-39333=>6955,
-31344=>6956,
-30344=>6957,
-30350=>6958,
-30355=>6959,
-30361=>6960,
-30372=>6961,
-29918=>6962,
-29920=>6963,
-29996=>6964,
-40480=>6965,
-40482=>6966,
-40488=>6967,
-40489=>6968,
-40490=>6969,
-40491=>6970,
-40492=>6971,
-40498=>6972,
-40497=>6973,
-40502=>6974,
-40504=>6975,
-40503=>6976,
-40505=>6977,
-40506=>6978,
-40510=>6979,
-40513=>6980,
-40514=>6981,
-40516=>6982,
-40518=>6983,
-40519=>6984,
-40520=>6985,
-40521=>6986,
-40523=>6987,
-40524=>6988,
-40526=>6989,
-40529=>6990,
-40533=>6991,
-40535=>6992,
-40538=>6993,
-40539=>6994,
-40540=>6995,
-40542=>6996,
-40547=>6997,
-40550=>6998,
-40551=>6999,
-40552=>7000,
-40553=>7001,
-40554=>7002,
-40555=>7003,
-40556=>7004,
-40561=>7005,
-40557=>7006,
-40563=>7007,
-12135=>7008,
-30098=>7008,
-30100=>7009,
-30102=>7010,
-30112=>7011,
-30109=>7012,
-30124=>7013,
-30115=>7014,
-30131=>7015,
-30132=>7016,
-30136=>7017,
-30148=>7018,
-30129=>7019,
-30128=>7020,
-30147=>7021,
-30146=>7022,
-30166=>7023,
-30157=>7024,
-30179=>7025,
-30184=>7026,
-30182=>7027,
-30180=>7028,
-30187=>7029,
-30183=>7030,
-30211=>7031,
-30193=>7032,
-30204=>7033,
-30207=>7034,
-30224=>7035,
-30208=>7036,
-30213=>7037,
-30220=>7038,
-30231=>7039,
-30218=>7040,
-30245=>7041,
-30232=>7042,
-30229=>7043,
-30233=>7044,
-30235=>7045,
-30268=>7046,
-30242=>7047,
-30240=>7048,
-30272=>7049,
-30253=>7050,
-30256=>7051,
-30271=>7052,
-30261=>7053,
-30275=>7054,
-30270=>7055,
-30259=>7056,
-30285=>7057,
-30302=>7058,
-30292=>7059,
-30300=>7060,
-30294=>7061,
-30315=>7062,
-30319=>7063,
-32714=>7064,
-31462=>7065,
-31352=>7066,
-31353=>7067,
-31360=>7068,
-31366=>7069,
-31368=>7070,
-31381=>7071,
-31398=>7072,
-31392=>7073,
-31404=>7074,
-31400=>7075,
-31405=>7076,
-31411=>7077,
-34916=>7078,
-34921=>7079,
-34930=>7080,
-34941=>7081,
-34943=>7082,
-34946=>7083,
-34978=>7084,
-35014=>7085,
-34999=>7086,
-35004=>7087,
-35017=>7088,
-35042=>7089,
-35022=>7090,
-35043=>7091,
-35045=>7092,
-35057=>7093,
-35098=>7094,
-35068=>7095,
-35048=>7096,
-35070=>7097,
-35056=>7098,
-35105=>7099,
-35097=>7100,
-35091=>7101,
-35099=>7102,
-35082=>7103,
-35124=>7104,
-35115=>7105,
-35126=>7106,
-35137=>7107,
-35174=>7108,
-35195=>7109,
-12134=>7110,
-30091=>7110,
-32997=>7111,
-30386=>7112,
-30388=>7113,
-30684=>7114,
-12158=>7115,
-32786=>7115,
-32788=>7116,
-32790=>7117,
-32796=>7118,
-32800=>7119,
-32802=>7120,
-32805=>7121,
-32806=>7122,
-32807=>7123,
-32809=>7124,
-32808=>7125,
-32817=>7126,
-32779=>7127,
-32821=>7128,
-32835=>7129,
-32838=>7130,
-32845=>7131,
-32850=>7132,
-32873=>7133,
-32881=>7134,
-35203=>7135,
-39032=>7136,
-39040=>7137,
-39043=>7138,
-39049=>7139,
-39052=>7140,
-39053=>7141,
-39055=>7142,
-39060=>7143,
-39066=>7144,
-39067=>7145,
-39070=>7146,
-39071=>7147,
-39073=>7148,
-39074=>7149,
-39077=>7150,
-39078=>7151,
-12172=>7152,
-34381=>7152,
-34388=>7153,
-34412=>7154,
-34414=>7155,
-34431=>7156,
-34426=>7157,
-34428=>7158,
-34427=>7159,
-34472=>7160,
-34445=>7161,
-34443=>7162,
-34476=>7163,
-34461=>7164,
-34471=>7165,
-34467=>7166,
-34474=>7167,
-34451=>7168,
-34473=>7169,
-34486=>7170,
-34500=>7171,
-34485=>7172,
-34510=>7173,
-34480=>7174,
-34490=>7175,
-34481=>7176,
-34479=>7177,
-34505=>7178,
-34511=>7179,
-34484=>7180,
-34537=>7181,
-34545=>7182,
-34546=>7183,
-34541=>7184,
-34547=>7185,
-34512=>7186,
-34579=>7187,
-34526=>7188,
-34548=>7189,
-34527=>7190,
-34520=>7191,
-34513=>7192,
-34563=>7193,
-34567=>7194,
-34552=>7195,
-34568=>7196,
-34570=>7197,
-34573=>7198,
-34569=>7199,
-34595=>7200,
-34619=>7201,
-34590=>7202,
-34597=>7203,
-34606=>7204,
-34586=>7205,
-34622=>7206,
-34632=>7207,
-34612=>7208,
-34609=>7209,
-34601=>7210,
-34615=>7211,
-34623=>7212,
-34690=>7213,
-34594=>7214,
-34685=>7215,
-34686=>7216,
-34683=>7217,
-34656=>7218,
-34672=>7219,
-34636=>7220,
-34670=>7221,
-34699=>7222,
-34643=>7223,
-34659=>7224,
-34684=>7225,
-34660=>7226,
-34649=>7227,
-34661=>7228,
-34707=>7229,
-34735=>7230,
-34728=>7231,
-34770=>7232,
-34758=>7233,
-34696=>7234,
-34693=>7235,
-34733=>7236,
-34711=>7237,
-34691=>7238,
-34731=>7239,
-34789=>7240,
-34732=>7241,
-34741=>7242,
-34739=>7243,
-34763=>7244,
-34771=>7245,
-34749=>7246,
-34769=>7247,
-34752=>7248,
-34762=>7249,
-34779=>7250,
-34794=>7251,
-34784=>7252,
-34798=>7253,
-34838=>7254,
-34835=>7255,
-34814=>7256,
-34826=>7257,
-34843=>7258,
-34849=>7259,
-34873=>7260,
-34876=>7261,
-12152=>7262,
-32566=>7262,
-32578=>7263,
-32580=>7264,
-32581=>7265,
-33296=>7266,
-31482=>7267,
-31485=>7268,
-31496=>7269,
-31491=>7270,
-31492=>7271,
-31509=>7272,
-31498=>7273,
-31531=>7274,
-31503=>7275,
-31559=>7276,
-31544=>7277,
-31530=>7278,
-31513=>7279,
-31534=>7280,
-31537=>7281,
-31520=>7282,
-31525=>7283,
-31524=>7284,
-31539=>7285,
-31550=>7286,
-31518=>7287,
-31576=>7288,
-31578=>7289,
-31557=>7290,
-31605=>7291,
-31564=>7292,
-31581=>7293,
-31584=>7294,
-31598=>7295,
-31611=>7296,
-31586=>7297,
-31602=>7298,
-31601=>7299,
-31632=>7300,
-31654=>7301,
-31655=>7302,
-31672=>7303,
-31660=>7304,
-31645=>7305,
-31656=>7306,
-31621=>7307,
-31658=>7308,
-31644=>7309,
-31650=>7310,
-31659=>7311,
-31668=>7312,
-31697=>7313,
-31681=>7314,
-31692=>7315,
-31709=>7316,
-31706=>7317,
-31717=>7318,
-31718=>7319,
-31722=>7320,
-31756=>7321,
-31742=>7322,
-31740=>7323,
-31759=>7324,
-31766=>7325,
-31755=>7326,
-31775=>7327,
-31786=>7328,
-31782=>7329,
-31800=>7330,
-31809=>7331,
-31808=>7332,
-33278=>7333,
-33281=>7334,
-33282=>7335,
-33284=>7336,
-33260=>7337,
-34884=>7338,
-33313=>7339,
-33314=>7340,
-33315=>7341,
-33325=>7342,
-33327=>7343,
-33320=>7344,
-33323=>7345,
-33336=>7346,
-33339=>7347,
-33331=>7348,
-33332=>7349,
-33342=>7350,
-33348=>7351,
-33353=>7352,
-33355=>7353,
-33359=>7354,
-33370=>7355,
-33375=>7356,
-33384=>7357,
-34942=>7358,
-34949=>7359,
-34952=>7360,
-35032=>7361,
-35039=>7362,
-35166=>7363,
-32669=>7364,
-32671=>7365,
-32679=>7366,
-32687=>7367,
-32688=>7368,
-32690=>7369,
-31868=>7370,
-25929=>7371,
-31889=>7372,
-31901=>7373,
-31900=>7374,
-31902=>7375,
-31906=>7376,
-31922=>7377,
-31932=>7378,
-31933=>7379,
-31937=>7380,
-31943=>7381,
-31948=>7382,
-31949=>7383,
-31944=>7384,
-31941=>7385,
-31959=>7386,
-31976=>7387,
-12169=>7388,
-33390=>7388,
-26280=>7389,
-32703=>7390,
-32718=>7391,
-32725=>7392,
-32741=>7393,
-32737=>7394,
-32742=>7395,
-32745=>7396,
-32750=>7397,
-32755=>7398,
-12151=>7399,
-31992=>7399,
-32119=>7400,
-32166=>7401,
-32174=>7402,
-32327=>7403,
-32411=>7404,
-40632=>7405,
-40628=>7406,
-36211=>7407,
-36228=>7408,
-36244=>7409,
-36241=>7410,
-36273=>7411,
-36199=>7412,
-36205=>7413,
-35911=>7414,
-35913=>7415,
-37194=>7416,
-37200=>7417,
-37198=>7418,
-37199=>7419,
-37220=>7420,
-37218=>7421,
-37217=>7422,
-37232=>7423,
-37225=>7424,
-37231=>7425,
-37245=>7426,
-37246=>7427,
-37234=>7428,
-37236=>7429,
-37241=>7430,
-37260=>7431,
-37253=>7432,
-37264=>7433,
-37261=>7434,
-37265=>7435,
-37282=>7436,
-37283=>7437,
-37290=>7438,
-37293=>7439,
-37294=>7440,
-37295=>7441,
-37301=>7442,
-37300=>7443,
-37306=>7444,
-12183=>7445,
-35925=>7445,
-40574=>7446,
-36280=>7447,
-36331=>7448,
-36357=>7449,
-36441=>7450,
-36457=>7451,
-36277=>7452,
-36287=>7453,
-36284=>7454,
-36282=>7455,
-36292=>7456,
-36310=>7457,
-36311=>7458,
-36314=>7459,
-36318=>7460,
-36302=>7461,
-36303=>7462,
-36315=>7463,
-36294=>7464,
-36332=>7465,
-36343=>7466,
-36344=>7467,
-36323=>7468,
-36345=>7469,
-36347=>7470,
-36324=>7471,
-36361=>7472,
-36349=>7473,
-36372=>7474,
-36381=>7475,
-36383=>7476,
-36396=>7477,
-36398=>7478,
-36387=>7479,
-36399=>7480,
-36410=>7481,
-36416=>7482,
-36409=>7483,
-36405=>7484,
-36413=>7485,
-36401=>7486,
-36425=>7487,
-36417=>7488,
-36418=>7489,
-36433=>7490,
-36434=>7491,
-36426=>7492,
-36464=>7493,
-36470=>7494,
-36476=>7495,
-36463=>7496,
-36468=>7497,
-36485=>7498,
-36495=>7499,
-36500=>7500,
-36496=>7501,
-36508=>7502,
-36510=>7503,
-12184=>7504,
-35960=>7504,
-35970=>7505,
-35978=>7506,
-35973=>7507,
-35992=>7508,
-35988=>7509,
-26011=>7510,
-35286=>7511,
-35294=>7512,
-35290=>7513,
-35292=>7514,
-35301=>7515,
-35307=>7516,
-35311=>7517,
-35390=>7518,
-35622=>7519,
-38739=>7520,
-38633=>7521,
-38643=>7522,
-38639=>7523,
-38662=>7524,
-38657=>7525,
-38664=>7526,
-38671=>7527,
-38670=>7528,
-38698=>7529,
-38701=>7530,
-38704=>7531,
-38718=>7532,
-40832=>7533,
-40835=>7534,
-40837=>7535,
-40838=>7536,
-40839=>7537,
-40840=>7538,
-40841=>7539,
-40842=>7540,
-40844=>7541,
-40702=>7542,
-40715=>7543,
-40717=>7544,
-12203=>7545,
-38585=>7545,
-38588=>7546,
-38589=>7547,
-38606=>7548,
-38610=>7549,
-30655=>7550,
-38624=>7551,
-37518=>7552,
-37550=>7553,
-37576=>7554,
-37694=>7555,
-37738=>7556,
-37834=>7557,
-37775=>7558,
-37950=>7559,
-37995=>7560,
-40063=>7561,
-40066=>7562,
-40069=>7563,
-40070=>7564,
-40071=>7565,
-40072=>7566,
-31267=>7567,
-40075=>7568,
-40078=>7569,
-40080=>7570,
-40081=>7571,
-40082=>7572,
-40084=>7573,
-40085=>7574,
-40090=>7575,
-40091=>7576,
-40094=>7577,
-40095=>7578,
-40096=>7579,
-40097=>7580,
-40098=>7581,
-40099=>7582,
-40101=>7583,
-40102=>7584,
-40103=>7585,
-40104=>7586,
-40105=>7587,
-40107=>7588,
-40109=>7589,
-40110=>7590,
-40112=>7591,
-40113=>7592,
-40114=>7593,
-40115=>7594,
-40116=>7595,
-40117=>7596,
-40118=>7597,
-40119=>7598,
-40122=>7599,
-40123=>7600,
-40124=>7601,
-40125=>7602,
-40132=>7603,
-40133=>7604,
-40134=>7605,
-40135=>7606,
-40138=>7607,
-40139=>7608,
-40140=>7609,
-40141=>7610,
-40142=>7611,
-40143=>7612,
-40144=>7613,
-40147=>7614,
-40148=>7615,
-40149=>7616,
-40151=>7617,
-40152=>7618,
-40153=>7619,
-40156=>7620,
-40157=>7621,
-40159=>7622,
-40162=>7623,
-38780=>7624,
-38789=>7625,
-38801=>7626,
-38802=>7627,
-38804=>7628,
-38831=>7629,
-38827=>7630,
-38819=>7631,
-38834=>7632,
-38836=>7633,
-39601=>7634,
-39600=>7635,
-39607=>7636,
-40536=>7637,
-39606=>7638,
-39610=>7639,
-39612=>7640,
-39617=>7641,
-39616=>7642,
-39621=>7643,
-39618=>7644,
-39627=>7645,
-39628=>7646,
-39633=>7647,
-39749=>7648,
-39747=>7649,
-39751=>7650,
-39753=>7651,
-39752=>7652,
-39757=>7653,
-39761=>7654,
-39144=>7655,
-39181=>7656,
-39214=>7657,
-39253=>7658,
-39252=>7659,
-12221=>7660,
-39647=>7660,
-39649=>7661,
-39654=>7662,
-39663=>7663,
-39659=>7664,
-39675=>7665,
-39661=>7666,
-39673=>7667,
-39688=>7668,
-39695=>7669,
-39699=>7670,
-39711=>7671,
-39715=>7672,
-40637=>7673,
-40638=>7674,
-32315=>7675,
-40578=>7676,
-40583=>7677,
-40584=>7678,
-40587=>7679,
-40594=>7680,
-37846=>7681,
-40605=>7682,
-40607=>7683,
-40667=>7684,
-40668=>7685,
-40669=>7686,
-40672=>7687,
-40671=>7688,
-40674=>7689,
-40681=>7690,
-40679=>7691,
-40677=>7692,
-40682=>7693,
-40687=>7694,
-40738=>7695,
-40748=>7696,
-40751=>7697,
-40761=>7698,
-40759=>7699,
-40765=>7700,
-40766=>7701,
-40772=>7702,
-12295=>7703,
-
-
-
-
-
-
-
-30362=>7717,
-34297=>7718,
-31001=>7719,
-24859=>7720,
-39599=>7721,
-35158=>7722,
-22761=>7723,
-32631=>7724,
-25850=>7725,
-25943=>7726,
-38930=>7727,
-36774=>7728,
-32070=>7729,
-24171=>7730,
-32129=>7731,
-37770=>7732,
-35607=>7733,
-39165=>7734,
-23542=>7735,
-22577=>7736,
-39825=>7737,
-36649=>7738,
-12185=>7739,
-35997=>7739,
-37575=>7740,
-29437=>7741,
-20633=>7742,
-24970=>7743,
-32179=>7744,
-31558=>7745,
-30050=>7746,
-25987=>7747,
-24163=>7748,
-38281=>7749,
-37002=>7750,
-32232=>7751,
-36022=>7752,
-35722=>7753,
-36783=>7754,
-36782=>7755,
-27161=>7756,
-40009=>7757,
-30303=>7758,
-28693=>7759,
-28657=>7760,
-36051=>7761,
-25839=>7762,
-39173=>7763,
-25765=>7764,
-37474=>7765,
-37457=>7766,
-39361=>7767,
-35036=>7768,
-36001=>7769,
-21443=>7770,
-34870=>7771,
-27544=>7772,
-24922=>7773,
-24920=>7774,
-29158=>7775,
-33980=>7776,
-33369=>7777,
-20489=>7778,
-28356=>7779,
-21408=>7780,
-20596=>7781,
-28204=>7782,
-23652=>7783,
-35435=>7784,
-25881=>7785,
-25723=>7786,
-34796=>7787,
-39262=>7788,
-35730=>7789,
-32399=>7790,
-37855=>7791,
-29987=>7792,
-38369=>7793,
-39019=>7794,
-22580=>7795,
-22039=>7796,
-12199=>7797,
-38263=>7797,
-20767=>7798,
-33144=>7799,
-24288=>7800,
-26274=>7801,
-37396=>7802,
-12190=>7803,
-36554=>7803,
-24505=>7804,
-22645=>7805,
-38515=>7806,
-35183=>7807,
-31281=>7808,
-25074=>7809,
-35488=>7810,
-39425=>7811,
-36978=>7812,
-39347=>7813,
-12242=>7814,
-40786=>7814,
-29118=>7815,
-34909=>7816,
-34802=>7817,
-23541=>7818,
-30087=>7819,
-36490=>7820,
-31820=>7821,
-32162=>7822,
-37276=>7823,
-37604=>7824,
-38619=>7825,
-30990=>7826,
-20786=>7827,
-35320=>7828,
-34389=>7829,
-20659=>7830,
-30241=>7831,
-38358=>7832,
-21109=>7833,
-37656=>7834,
-32020=>7835,
-32189=>7836,
-36781=>7837,
-35422=>7838,
-36060=>7839,
-32880=>7840,
-24478=>7841,
-21474=>7842,
-36517=>7843,
-31428=>7844,
-37679=>7845,
-36948=>7846,
-24118=>7847,
-36024=>7848,
-25812=>7849,
-21934=>7850,
-37170=>7851,
-25763=>7852,
-33213=>7853,
-24986=>7854,
-35477=>7855,
-24392=>7856,
-30070=>7857,
-25803=>7858,
-40680=>7859,
-34153=>7860,
-27284=>7861,
-25623=>7862,
-23798=>7863,
-31153=>7864,
-23566=>7865,
-29128=>7866,
-37159=>7867,
-25973=>7868,
-28364=>7869,
-36958=>7870,
-32224=>7871,
-39003=>7872,
-40670=>7873,
-22666=>7874,
-38651=>7875,
-28593=>7876,
-37347=>7877,
-35519=>7878,
-35548=>7879,
-37336=>7880,
-38914=>7881,
-37664=>7882,
-35330=>7883,
-26481=>7884,
-21205=>7885,
-26847=>7886,
-20941=>7887,
-12222=>7888,
-39717=>7888,
-29346=>7889,
-29544=>7890,
-35712=>7891,
-36077=>7892,
-37709=>7893,
-37723=>7894,
-26039=>7895,
-32222=>7896,
-38538=>7897,
-23565=>7898,
-22136=>7899,
-38931=>7900,
-37389=>7901,
-22890=>7902,
-22702=>7903,
-40285=>7904,
-38989=>7905,
-35355=>7906,
-24801=>7907,
-39187=>7908,
-20818=>7909,
-29246=>7910,
-39180=>7911,
-36019=>7912,
-30332=>7913,
-32624=>7914,
-38309=>7915,
-31020=>7916,
-37353=>7917,
-29033=>7918,
-31684=>7919,
-36009=>7920,
-39151=>7921,
-35370=>7922,
-32033=>7923,
-12214=>7924,
-39131=>7924,
-35513=>7925,
-24290=>7926,
-36027=>7927,
-32027=>7928,
-22707=>7929,
-22894=>7930,
-24996=>7931,
-31966=>7932,
-35920=>7933,
-26963=>7934,
-37586=>7935,
-12213=>7936,
-39080=>7936,
-30219=>7937,
-39342=>7938,
-32299=>7939,
-35575=>7940,
-40179=>7941,
-33178=>7942,
-36667=>7943,
-25771=>7944,
-36628=>7945,
-36070=>7946,
-24489=>7947,
-36000=>7948,
-35331=>7949,
-23142=>7950,
-32283=>7951,
-35442=>7952,
-37411=>7953,
-33995=>7954,
-24185=>7955,
-36245=>7956,
-36123=>7957,
-23713=>7958,
-21083=>7959,
-37628=>7960,
-32177=>7961,
-23831=>7962,
-37804=>7963,
-25841=>7964,
-40255=>7965,
-38307=>7966,
-37499=>7967,
-20491=>7968,
-32102=>7969,
-40852=>7970,
-38799=>7971,
-36002=>7972,
-37390=>7973,
-28317=>7974,
-27083=>7975,
-36092=>7976,
-34865=>7977,
-39015=>7978,
-21102=>7979,
-38364=>7980,
-35264=>7981,
-39208=>7982,
-24931=>7983,
-36011=>7984,
-24291=>7985,
-35215=>7986,
-27512=>7987,
-12244=>7988,
-40860=>7988,
-38312=>7989,
-36556=>7990,
-35437=>7991,
-27331=>7992,
-36020=>7993,
-21130=>7994,
-36645=>7995,
-37707=>7996,
-22283=>7997,
-36942=>7998,
-39405=>7999,
-38867=>8000,
-28450=>8001,
-34399=>8002,
-38305=>8003,
-40372=>8004,
-36032=>8005,
-36703=>8006,
-40251=>8007,
-32005=>8008,
-22778=>8009,
-35703=>8010,
-28396=>8011,
-22057=>8012,
-33775=>8013,
-30059=>8014,
-21123=>8015,
-35441=>8016,
-25079=>8017,
-22750=>8018,
-27489=>8019,
-29872=>8020,
-36996=>8021,
-32233=>8022,
-35594=>8023,
-25582=>8024,
-36637=>8025,
-36036=>8026,
-31330=>8027,
-26371=>8028,
-29172=>8029,
-21295=>8030,
-35569=>8031,
-35496=>8032,
-32362=>8033,
-33911=>8034,
-28222=>8035,
-29554=>8036,
-36008=>8037,
-31117=>8038,
-25802=>8039,
-27231=>8040,
-31309=>8041,
-39249=>8042,
-35663=>8043,
-40388=>8044,
-32318=>8045,
-32221=>8046,
-26997=>8047,
-36655=>8048,
-32026=>8049,
-25824=>8050,
-24190=>8051,
-34186=>8052,
-21137=>8053,
-28639=>8054,
-35336=>8055,
-35352=>8056,
-38555=>8057,
-32380=>8058,
-32000=>8059,
-22846=>8060,
-33698=>8061,
-38960=>8062,
-36040=>8063,
-37440=>8064,
-20729=>8065,
-39381=>8066,
-27570=>8067,
-30435=>8068,
-22533=>8069,
-31627=>8070,
-38291=>8071,
-33393=>8072,
-32216=>8073,
-32365=>8074,
-27298=>8075,
-40572=>8076,
-25536=>8077,
-25791=>8078,
-31777=>8079,
-20745=>8080,
-34214=>8081,
-27323=>8082,
-37970=>8083,
-36368=>8084,
-36068=>8085,
-12178=>8086,
-35211=>8086,
-37749=>8087,
-33382=>8088,
-21133=>8089,
-39198=>8090,
-28472=>8091,
-28666=>8092,
-28567=>8093,
-23559=>8094,
-28479=>8095,
-34083=>8096,
-27123=>8097,
-22892=>8098,
-35611=>8099,
-37292=>8100,
-33184=>8101,
-28550=>8102,
-39509=>8103,
-23308=>8104,
-25898=>8105,
-37496=>8106,
-30703=>8107,
-20709=>8108,
-39171=>8109,
-32371=>8110,
-32094=>8111,
-36686=>8112,
-36611=>8113,
-38542=>8114,
-31680=>8115,
-28500=>8116,
-32080=>8117,
-35489=>8118,
-32202=>8119,
-37670=>8120,
-20677=>8121,
-35641=>8122,
-36914=>8123,
-29180=>8124,
-30433=>8125,
-21185=>8126,
-33686=>8127,
-39912=>8128,
-39514=>8129,
-32147=>8130,
-38968=>8131,
-37857=>8132,
-24465=>8133,
-30169=>8134,
-31478=>8135,
-31998=>8136,
-33290=>8137,
-39378=>8138,
-33289=>8139,
-25818=>8140,
-37624=>8141,
-25084=>8142,
-21127=>8143,
-40273=>8144,
-32121=>8145,
-35258=>8146,
-35363=>8147,
-32118=>8148,
-37406=>8149,
-36557=>8150,
-39423=>8151,
-38283=>8152,
-20977=>8153,
-38982=>8154,
-27579=>8155,
-35506=>8156,
-22718=>8157,
-25031=>8158,
-25715=>8159,
-24235=>8160,
-35122=>8161,
-35463=>8162,
-22602=>8163,
-20744=>8164,
-23532=>8165,
-31014=>8166,
-26336=>8167,
-34407=>8168,
-24011=>8169,
-31418=>8170,
-39243=>8171,
-28528=>8172,
-25844=>8173,
-38346=>8174,
-34847=>8175,
-33240=>8176,
-33802=>8177,
-20358=>8178,
-36084=>8179,
-34253=>8180,
-27396=>8181,
-25876=>8182,
-31811=>8183,
-38348=>8184,
-34349=>8185,
-28734=>8186,
-35733=>8187,
-25900=>8188,
-35261=>8189,
-25078=>8190,
-32412=>8191,
-29211=>8192,
-28651=>8193,
-25736=>8194,
-21214=>8195,
-28551=>8196,
-27138=>8197,
-37939=>8198,
-22744=>8199,
-39006=>8200,
-31852=>8201,
-38626=>8202,
-28757=>8203,
-35023=>8204,
-63975=>8204,
-39881=>8205,
-31150=>8206,
-40599=>8207,
-21426=>8208,
-21237=>8209,
-31019=>8210,
-27511=>8211,
-28701=>8212,
-38584=>8213,
-20486=>8214,
-32879=>8215,
-34030=>8216,
-36899=>8217,
-37934=>8218,
-24976=>8219,
-28451=>8220,
-31806=>8221,
-25986=>8222,
-33225=>8223,
-37832=>8224,
-25088=>8225,
-29001=>8226,
-32244=>8227,
-31975=>8228,
-20841=>8229,
-36635=>8230,
-35538=>8231,
-30274=>8232,
-36988=>8233,
-37904=>8234,
-29557=>8235,
-33256=>8236,
-37168=>8237,
-40023=>8238,
-36035=>8239,
-40801=>8240,
-37428=>8241,
-38728=>8242,
-23994=>8243,
-38936=>8244,
-39230=>8245,
-21129=>8246,
-12243=>8247,
-40845=>8247,
-32894=>8248,
-22184=>8249,
-31840=>8250,
-22751=>8251,
-25871=>8252,
-38580=>8253,
-27155=>8254,
-23105=>8255,
-25695=>8256,
-31757=>8257,
-34310=>8258,
-30439=>8259,
-39025=>8260,
-24300=>8261,
-29200=>8262,
-25796=>8263,
-28407=>8264,
-34396=>8265,
-39791=>8266,
-36034=>8267,
-37682=>8268,
-38520=>8269,
-39522=>8270,
-37569=>8271,
-23650=>8272,
-32311=>8273,
-24942=>8274,
-28670=>8275,
-32209=>8276,
-24018=>8277,
-25891=>8278,
-23423=>8279,
-28772=>8280,
-20098=>8281,
-25476=>8282,
-36650=>8283,
-20523=>8284,
-20374=>8285,
-28138=>8286,
-32184=>8287,
-35542=>8288,
-34367=>8289,
-32645=>8290,
-37007=>8291,
-38012=>8292,
-31854=>8293,
-39486=>8294,
-39409=>8295,
-32097=>8296,
-23229=>8297,
-29802=>8298,
-30908=>8299,
-34718=>8300,
-12218=>8301,
-39340=>8301,
-39393=>8302,
-21966=>8303,
-36023=>8304,
-12230=>8305,
-40613=>8305,
-36067=>8306,
-36993=>8307,
-30622=>8308,
-39237=>8309,
-34875=>8310,
-28415=>8311,
-35646=>8312,
-37672=>8313,
-37466=>8314,
-36031=>8315,
-37762=>8316,
-12200=>8317,
-38272=>8317,
-24758=>8318,
-20497=>8319,
-37683=>8320,
-22818=>8321,
-35598=>8322,
-24396=>8323,
-35219=>8324,
-32191=>8325,
-32236=>8326,
-24287=>8327,
-28357=>8328,
-25003=>8329,
-38313=>8330,
-40180=>8331,
-37528=>8332,
-35628=>8333,
-35584=>8334,
-30045=>8335,
-37385=>8336,
-32013=>8337,
-38627=>8338,
-25747=>8339,
-33126=>8340,
-24817=>8341,
-39719=>8342,
-39186=>8343,
-25836=>8344,
-33193=>8345,
-25862=>8346,
-37312=>8347,
-12227=>8348,
-40165=>8348,
-32886=>8349,
-22169=>8350,
-38007=>8351,
-37811=>8352,
-27320=>8353,
-29552=>8354,
-23527=>8355,
-25840=>8356,
-28632=>8357,
-37397=>8358,
-32016=>8359,
-33215=>8360,
-28611=>8361,
-36786=>8362,
-30247=>8363,
-35582=>8364,
-27472=>8365,
-40407=>8366,
-27590=>8367,
-22036=>8368,
-28442=>8369,
-30436=>8370,
-40848=>8371,
-36064=>8372,
-22132=>8373,
-40300=>8374,
-39449=>8375,
-39108=>8376,
-38971=>8377,
-36007=>8378,
-34315=>8379,
-24977=>8380,
-35413=>8381,
-28497=>8382,
-38935=>8383,
-25778=>8384,
-37610=>8385,
-20693=>8386,
-27192=>8387,
-35676=>8388,
-33229=>8389,
-12241=>8390,
-40778=>8390,
-39438=>8391,
-35912=>8392,
-21843=>8393,
-27683=>8394,
-35350=>8395,
-29309=>8396,
-37370=>8397,
-37467=>8398,
-36983=>8399,
-31805=>8400,
-35609=>8401,
-37666=>8402,
-37463=>8403,
-28154=>8404,
-35700=>8405,
-22649=>8406,
-27085=>8407,
-21958=>8408,
-22715=>8409,
-34196=>8410,
-25654=>8411,
-37740=>8412,
-27211=>8413,
-21932=>8414,
-20689=>8415,
-32761=>8416,
-31429=>8417,
-31434=>8418,
-27453=>8419,
-35242=>8420,
-23522=>8421,
-36629=>8422,
-27691=>8423,
-20670=>8424,
-38915=>8425,
-35531=>8426,
-24950=>8427,
-29898=>8428,
-31406=>8429,
-36264=>8430,
-21312=>8431,
-36544=>8432,
-39493=>8433,
-40818=>8434,
-39028=>8435,
-27402=>8436,
-21240=>8437,
-40306=>8438,
-30906=>8439,
-35731=>8440,
-39250=>8441,
-25854=>8442,
-32350=>8443,
-29105=>8444,
-38860=>8445,
-35469=>8446,
-32009=>8447,
-27054=>8448,
-32104=>8449,
-36575=>8450,
-37613=>8451,
-38287=>8452,
-28516=>8453,
-28753=>8454,
-34217=>8455,
-39955=>8456,
-36093=>8457,
-20632=>8458,
-21930=>8459,
-39479=>8460,
-25475=>8461,
-28544=>8462,
-27578=>8463,
-32023=>8464,
-31721=>8465,
-26348=>8466,
-38275=>8467,
-38493=>8468,
-36109=>8469,
-32341=>8470,
-20663=>8471,
-36062=>8472,
-29138=>8473,
-32057=>8474,
-36050=>8475,
-25448=>8476,
-25885=>8477,
-25086=>8478,
-35373=>8479,
-32051=>8480,
-23529=>8481,
-23352=>8482,
-33102=>8483,
-28402=>8484,
-32882=>8485,
-32361=>8486,
-21213=>8487,
-32854=>8488,
-24107=>8489,
-29509=>8490,
-28629=>8491,
-35433=>8492,
-26178=>8493,
-34645=>8494,
-23526=>8495,
-35672=>8496,
-39387=>8497,
-21218=>8498,
-36969=>8499,
-37323=>8500,
-39166=>8501,
-35222=>8502,
-35430=>8503,
-22781=>8504,
-29560=>8505,
-27166=>8506,
-36664=>8507,
-26360=>8508,
-36118=>8509,
-23660=>8510,
-34899=>8511,
-27193=>8512,
-31466=>8513,
-25976=>8514,
-24101=>8515,
-38617=>8516,
-35504=>8517,
-38918=>8518,
-35500=>8519,
-30889=>8520,
-29197=>8521,
-32114=>8522,
-39164=>8523,
-39686=>8524,
-32883=>8525,
-24939=>8526,
-38924=>8527,
-35359=>8528,
-35494=>8529,
-25851=>8530,
-34311=>8531,
-35380=>8532,
-32901=>8533,
-38614=>8534,
-38568=>8535,
-32143=>8536,
-27506=>8537,
-23403=>8538,
-25613=>8539,
-32302=>8540,
-29795=>8541,
-37782=>8542,
-29562=>8543,
-25787=>8544,
-33274=>8545,
-24907=>8546,
-25892=>8547,
-36010=>8548,
-30321=>8549,
-28760=>8550,
-22727=>8551,
-35674=>8552,
-35527=>8553,
-22022=>8554,
-28271=>8555,
-29145=>8556,
-28644=>8557,
-32295=>8558,
-35342=>8559,
-39472=>8560,
-35588=>8561,
-37563=>8562,
-38988=>8563,
-39636=>8564,
-26781=>8565,
-36028=>8566,
-37941=>8567,
-24307=>8568,
-32893=>8569,
-28916=>8570,
-37509=>8571,
-32113=>8572,
-38957=>8573,
-22294=>8574,
-22615=>8575,
-22296=>8576,
-38973=>8577,
-40213=>8578,
-39345=>8579,
-39389=>8580,
-27234=>8581,
-31402=>8582,
-35178=>8583,
-24398=>8584,
-28771=>8585,
-38929=>8586,
-33836=>8587,
-32178=>8588,
-12209=>8589,
-38859=>8589,
-36949=>8590,
-22285=>8591,
-29234=>8592,
-28656=>8593,
-32173=>8594,
-33894=>8595,
-20553=>8596,
-20702=>8597,
-32239=>8598,
-35586=>8599,
-34907=>8600,
-32862=>8601,
-32011=>8602,
-31337=>8603,
-21839=>8604,
-25790=>8605,
-34680=>8606,
-28198=>8607,
-31401=>8608,
-21978=>8609,
-37794=>8610,
-28879=>8611,
-35491=>8612,
-28961=>8613,
-34154=>8614,
-22626=>8615,
-38695=>8616,
-21209=>8617,
-35492=>8618,
-37675=>8619,
-29351=>8620,
-35186=>8621,
-32722=>8622,
-37521=>8623,
-25138=>8624,
-32048=>8625,
-34662=>8626,
-36676=>8627,
-23805=>8628,
-20448=>8629,
-29433=>8630,
-22151=>8631,
-37697=>8632,
-39854=>8633,
-32406=>8634,
-36066=>8635,
-37532=>8636,
-38289=>8637,
-39023=>8638,
-38570=>8639,
-29694=>8640,
-29563=>8641,
-32291=>8642,
-39201=>8643,
-25010=>8644,
-32171=>8645,
-38002=>8646,
-37129=>8647,
-35443=>8648,
-38911=>8649,
-38917=>8650,
-34157=>8651,
-22210=>8652,
-37559=>8653,
-26313=>8654,
-22063=>8655,
-21332=>8656,
-25406=>8657,
-33029=>8658,
-35559=>8659,
-23531=>8660,
-28681=>8661,
-35613=>8662,
-37573=>8663,
-37313=>8664,
-33288=>8665,
-37561=>8666,
-32137=>8667,
-38920=>8668,
-35377=>8669,
-32210=>8670,
-32396=>8671,
-36562=>8672,
-25080=>8673,
-36984=>8674,
-30316=>8675,
-32098=>8676,
-23416=>8677,
-21211=>8678,
-35426=>8679,
-23563=>8680,
-39348=>8681,
-35347=>8682,
-35338=>8683,
-36956=>8684,
-22739=>8685,
-40201=>8686,
-40232=>8687,
-21854=>8688,
-20126=>8689,
-35357=>8690,
-38329=>8691,
-40573=>8692,
-22196=>8693,
-38996=>8694,
-38331=>8695,
-33399=>8696,
-21421=>8697,
-30831=>8698,
-35578=>8699,
-39511=>8700,
-40230=>8701,
-26954=>8702,
-25562=>8703,
-30221=>8704,
-38525=>8705,
-30306=>8706,
-39178=>8707,
-27171=>8708,
-22575=>8709,
-35617=>8710,
-34277=>8711,
-29242=>8712,
-12212=>8713,
-38913=>8713,
-26989=>8714,
-33865=>8715,
-37291=>8716,
-37541=>8717,
-38948=>8718,
-36986=>8719,
-20736=>8720,
-34811=>8721,
-34269=>8722,
-20740=>8723,
-25014=>8724,
-32681=>8725,
-35427=>8726,
-35696=>8727,
-35516=>8728,
-35695=>8729,
-32377=>8730,
-34093=>8731,
-38512=>8732,
-37504=>8733,
-39154=>8734,
-38577=>8735,
-27387=>8736,
-23344=>8737,
-40441=>8738,
-25033=>8739,
-32403=>8740,
-29801=>8741,
-34722=>8742,
-29151=>8743,
-29074=>8744,
-34821=>8745,
-36111=>8746,
-31310=>8747,
-21938=>8748,
-25793=>8749,
-20653=>8750,
-30320=>8751,
-36404=>8752,
-20778=>8753,
-24962=>8754,
-37109=>8755,
-37438=>8756,
-29494=>8757,
-35480=>8758,
-36671=>8759,
-39192=>8760,
-12226=>8761,
-39770=>8761,
-28417=>8762,
-33287=>8763,
-23996=>8764,
-35486=>8765,
-39729=>8766,
-29508=>8767,
-35709=>8768,
-38928=>8769,
-39341=>8770,
-40219=>8771,
-28149=>8772,
-36677=>8773,
-22290=>8774,
-21729=>8775,
-22291=>8776,
-32227=>8777,
-36960=>8778,
-39000=>8779,
-32004=>8780,
-36493=>8781,
-38000=>8782,
-38322=>8783,
-38642=>8784,
-37142=>8785,
-38549=>8786,
-36939=>8787,
-34292=>8788,
-37270=>8789,
-26248=>8790,
-38620=>8791,
-36617=>8792,
-25890=>8793,
-26283=>8794,
-36106=>8795,
-36124=>8796,
-33247=>8797,
-38015=>8798,
-26839=>8799,
-31432=>8800,
-36012=>8801,
-25799=>8802,
-21063=>8803,
-28580=>8804,
-36042=>8805,
-36104=>8806,
-36555=>8807,
-37720=>8808,
-38296=>8809,
-35408=>8810,
-40779=>8811,
-20661=>8812,
-27656=>8813,
-30430=>8814,
-26028=>8815,
-36670=>8816,
-23940=>8817,
-26855=>8818,
-25136=>8819,
-32187=>8820,
-24373=>8821,
-28466=>8822,
-24115=>8823,
-36076=>8824,
-33081=>8825,
-36249=>8826,
-34756=>8827,
-36685=>8828,
-37754=>8829,
-36889=>8830,
-35998=>8831,
-37341=>8832,
-20597=>8833,
-35386=>8834,
-37806=>8835,
-38499=>8836,
-24128=>8837,
-30309=>8838,
-37165=>8839,
-35657=>8840,
-32340=>8841,
-32887=>8842,
-22519=>8843,
-34937=>8844,
-32025=>8845,
-25711=>8846,
-25842=>8847,
-24159=>8848,
-36074=>8849,
-28399=>8850,
-37912=>8851,
-32066=>8852,
-31278=>8853,
-33131=>8854,
-34886=>8855,
-35589=>8856,
-36600=>8857,
-30394=>8858,
-26205=>8859,
-39519=>8860,
-35576=>8861,
-35461=>8862,
-29165=>8863,
-30682=>8864,
-22225=>8865,
-36015=>8866,
-37956=>8867,
-31689=>8868,
-39376=>8869,
-23560=>8870,
-30938=>8871,
-36681=>8872,
-36090=>8873,
-27137=>8874,
-33674=>8875,
-35037=>8876,
-22941=>8877,
-22767=>8878,
-29376=>8879,
-37648=>8880,
-36101=>8881,
-22684=>8882,
-32180=>8883,
-35524=>8884,
-28310=>8885,
-28609=>8886,
-36039=>8887,
-28460=>8888,
-32156=>8889,
-32317=>8890,
-32305=>8891,
-37138=>8892,
-35419=>8893,
-32068=>8894,
-38013=>8895,
-21959=>8896,
-21401=>8897,
-21428=>8898,
-38760=>8899,
-36107=>8900,
-21293=>8901,
-21297=>8902,
-36094=>8903,
-21060=>8904,
-21132=>8905,
-21108=>8906,
-20660=>8907,
-20480=>8908,
-20630=>8909,
-20757=>8910,
-20738=>8911,
-20756=>8912,
-20796=>8913,
-20791=>8914,
-20712=>8915,
-20674=>8916,
-20795=>8917,
-20752=>8918,
-20794=>8919,
-20681=>8920,
-31988=>8921,
-40652=>8922,
-22213=>8923,
-40172=>8924,
-35131=>8925,
-33248=>8926,
-35329=>8927,
-35344=>8928,
-35340=>8929,
-35349=>8930,
-35635=>8931,
-35406=>8932,
-35365=>8933,
-35393=>8934,
-35382=>8935,
-35398=>8936,
-35412=>8937,
-35416=>8938,
-35410=>8939,
-35462=>8940,
-35460=>8941,
-35455=>8942,
-35440=>8943,
-35452=>8944,
-35445=>8945,
-35436=>8946,
-35438=>8947,
-35533=>8948,
-35554=>8949,
-35425=>8950,
-35482=>8951,
-35493=>8952,
-35473=>8953,
-35474=>8954,
-35535=>8955,
-35537=>8956,
-35529=>8957,
-35547=>8958,
-35543=>8959,
-35522=>8960,
-35510=>8961,
-35574=>8962,
-35563=>8963,
-35604=>8964,
-35585=>8965,
-35556=>8966,
-35565=>8967,
-35580=>8968,
-35571=>8969,
-35558=>8970,
-35566=>8971,
-35550=>8972,
-35624=>8973,
-35740=>8974,
-35606=>8975,
-35610=>8976,
-35600=>8977,
-35627=>8978,
-35629=>8979,
-35670=>8980,
-35673=>8981,
-35662=>8982,
-35742=>8983,
-35691=>8984,
-35734=>8985,
-38488=>8986,
-37178=>8987,
-37140=>8988,
-37172=>8989,
-37087=>8990,
-37174=>8991,
-37126=>8992,
-37192=>8993,
-33467=>8994,
-21233=>8995,
-24048=>8996,
-22538=>8997,
-22745=>8998,
-22754=>8999,
-22752=>9000,
-22746=>9001,
-22497=>9002,
-22607=>9003,
-22550=>9004,
-22610=>9005,
-22557=>9006,
-22628=>9007,
-34188=>9008,
-34131=>9009,
-34294=>9010,
-33703=>9011,
-33799=>9012,
-34031=>9013,
-33511=>9014,
-34338=>9015,
-34086=>9016,
-22603=>9017,
-29026=>9018,
-34136=>9019,
-34045=>9020,
-34126=>9021,
-34184=>9022,
-34234=>9023,
-29334=>9024,
-28366=>9025,
-34113=>9026,
-34254=>9027,
-34130=>9028,
-33984=>9029,
-33874=>9030,
-33892=>9031,
-33940=>9032,
-33845=>9033,
-34207=>9034,
-34133=>9035,
-40367=>9036,
-33939=>9037,
-32264=>9038,
-34118=>9039,
-34146=>9040,
-34078=>9041,
-39488=>9042,
-34362=>9043,
-37795=>9044,
-34167=>9045,
-34334=>9046,
-34298=>9047,
-34308=>9048,
-34282=>9049,
-34330=>9050,
-22889=>9051,
-23607=>9052,
-25451=>9053,
-25718=>9054,
-25759=>9055,
-25681=>9056,
-25692=>9057,
-25779=>9058,
-25860=>9059,
-25878=>9060,
-25847=>9061,
-25852=>9062,
-25883=>9063,
-22064=>9064,
-22072=>9065,
-22216=>9066,
-22182=>9067,
-21764=>9068,
-21692=>9069,
-22144=>9070,
-22109=>9071,
-22112=>9072,
-22069=>9073,
-22006=>9074,
-22118=>9075,
-22130=>9076,
-22156=>9077,
-22117=>9078,
-22044=>9079,
-22062=>9080,
-21993=>9081,
-22038=>9082,
-22208=>9083,
-22029=>9084,
-22195=>9085,
-22209=>9086,
-22127=>9087,
-36705=>9088,
-22198=>9089,
-22165=>9090,
-22279=>9091,
-24131=>9092,
-24172=>9093,
-24152=>9094,
-24151=>9095,
-23943=>9096,
-23796=>9097,
-23888=>9098,
-23852=>9099,
-23975=>9100,
-23968=>9101,
-23959=>9102,
-23821=>9103,
-23992=>9104,
-23937=>9105,
-24020=>9106,
-24480=>9107,
-29559=>9108,
-29505=>9109,
-29546=>9110,
-29499=>9111,
-29547=>9112,
-29568=>9113,
-29564=>9114,
-39136=>9115,
-39219=>9116,
-39145=>9117,
-39228=>9118,
-39146=>9119,
-39147=>9120,
-39149=>9121,
-39156=>9122,
-39177=>9123,
-39185=>9124,
-39195=>9125,
-39223=>9126,
-39231=>9127,
-39235=>9128,
-39240=>9129,
-39241=>9130,
-39242=>9131,
-39244=>9132,
-39266=>9133,
-24289=>9134,
-36065=>9135,
-25082=>9136,
-25006=>9137,
-24938=>9138,
-24894=>9139,
-24757=>9140,
-24884=>9141,
-25036=>9142,
-24927=>9143,
-25064=>9144,
-24827=>9145,
-24887=>9146,
-24818=>9147,
-24947=>9148,
-24860=>9149,
-24978=>9150,
-38274=>9151,
-38278=>9152,
-38344=>9153,
-38286=>9154,
-38292=>9155,
-38284=>9156,
-38373=>9157,
-38317=>9158,
-38315=>9159,
-39726=>9160,
-38316=>9161,
-38334=>9162,
-38326=>9163,
-39721=>9164,
-38335=>9165,
-38333=>9166,
-38332=>9167,
-38339=>9168,
-38347=>9169,
-38356=>9170,
-38352=>9171,
-38357=>9172,
-38366=>9173,
-28739=>9174,
-28505=>9175,
-28711=>9176,
-28696=>9177,
-28668=>9178,
-28039=>9179,
-28025=>9180,
-28254=>9181,
-28590=>9182,
-28687=>9183,
-28408=>9184,
-28527=>9185,
-28150=>9186,
-28543=>9187,
-28678=>9188,
-28576=>9189,
-28683=>9190,
-28775=>9191,
-28740=>9192,
-28677=>9193,
-28535=>9194,
-28704=>9195,
-28703=>9196,
-28722=>9197,
-28712=>9198,
-28765=>9199,
-39467=>9200,
-36999=>9201,
-36885=>9202,
-37008=>9203,
-23656=>9204,
-24371=>9205,
-23285=>9206,
-23255=>9207,
-23296=>9208,
-23149=>9209,
-23304=>9210,
-23372=>9211,
-23207=>9212,
-23291=>9213,
-23307=>9214,
-23329=>9215,
-23338=>9216,
-23321=>9217,
-39380=>9218,
-39391=>9219,
-39385=>9220,
-39478=>9221,
-39515=>9222,
-39377=>9223,
-39384=>9224,
-39501=>9225,
-39498=>9226,
-39394=>9227,
-39530=>9228,
-39439=>9229,
-39437=>9230,
-39429=>9231,
-39490=>9232,
-39469=>9233,
-39446=>9234,
-39489=>9235,
-39470=>9236,
-39480=>9237,
-39491=>9238,
-39492=>9239,
-39503=>9240,
-39525=>9241,
-39524=>9242,
-31993=>9243,
-32006=>9244,
-32002=>9245,
-32007=>9246,
-32008=>9247,
-32394=>9248,
-32028=>9249,
-32021=>9250,
-32019=>9251,
-32058=>9252,
-32050=>9253,
-32049=>9254,
-32272=>9255,
-32060=>9256,
-32064=>9257,
-32063=>9258,
-32093=>9259,
-32078=>9260,
-32115=>9261,
-32134=>9262,
-32131=>9263,
-32136=>9264,
-32190=>9265,
-32186=>9266,
-32203=>9267,
-32212=>9268,
-32196=>9269,
-32158=>9270,
-32172=>9271,
-32185=>9272,
-32163=>9273,
-32176=>9274,
-32199=>9275,
-32217=>9276,
-32215=>9277,
-32249=>9278,
-32242=>9279,
-32354=>9280,
-32230=>9281,
-32246=>9282,
-32241=>9283,
-32267=>9284,
-32225=>9285,
-32265=>9286,
-32285=>9287,
-32287=>9288,
-32286=>9289,
-32301=>9290,
-32266=>9291,
-32273=>9292,
-32381=>9293,
-32313=>9294,
-32309=>9295,
-32306=>9296,
-32326=>9297,
-32325=>9298,
-32392=>9299,
-32346=>9300,
-32338=>9301,
-32366=>9302,
-32382=>9303,
-32368=>9304,
-32367=>9305,
-32408=>9306,
-29859=>9307,
-29771=>9308,
-29903=>9309,
-38922=>9310,
-29885=>9311,
-29759=>9312,
-29833=>9313,
-29862=>9314,
-29908=>9315,
-29914=>9316,
-38873=>9317,
-38878=>9318,
-38876=>9319,
-27050=>9320,
-27370=>9321,
-26776=>9322,
-26838=>9323,
-27141=>9324,
-26783=>9325,
-27355=>9326,
-27379=>9327,
-27368=>9328,
-27359=>9329,
-27273=>9330,
-26895=>9331,
-27208=>9332,
-26984=>9333,
-27071=>9334,
-27194=>9335,
-27292=>9336,
-27410=>9337,
-27422=>9338,
-27357=>9339,
-27111=>9340,
-27407=>9341,
-27414=>9342,
-27372=>9343,
-27354=>9344,
-27384=>9345,
-27315=>9346,
-27367=>9347,
-27299=>9348,
-27347=>9349,
-27358=>9350,
-27556=>9351,
-27550=>9352,
-27566=>9353,
-27563=>9354,
-27567=>9355,
-36564=>9356,
-36571=>9357,
-36594=>9358,
-36603=>9359,
-36708=>9360,
-36601=>9361,
-36604=>9362,
-36587=>9363,
-36580=>9364,
-36706=>9365,
-36602=>9366,
-36606=>9367,
-36618=>9368,
-36615=>9369,
-36613=>9370,
-36626=>9371,
-36646=>9372,
-36638=>9373,
-36639=>9374,
-36636=>9375,
-36659=>9376,
-36678=>9377,
-36692=>9378,
-25108=>9379,
-25127=>9380,
-29964=>9381,
-26311=>9382,
-26308=>9383,
-26249=>9384,
-26326=>9385,
-36033=>9386,
-36016=>9387,
-36026=>9388,
-36029=>9389,
-36100=>9390,
-36018=>9391,
-36037=>9392,
-36112=>9393,
-36049=>9394,
-36058=>9395,
-36053=>9396,
-36075=>9397,
-36071=>9398,
-36091=>9399,
-35224=>9400,
-35244=>9401,
-35233=>9402,
-35263=>9403,
-35238=>9404,
-35247=>9405,
-35250=>9406,
-35255=>9407,
-27647=>9408,
-27660=>9409,
-27692=>9410,
-29272=>9411,
-26407=>9412,
-33110=>9413,
-33242=>9414,
-33051=>9415,
-33214=>9416,
-33121=>9417,
-33231=>9418,
-27487=>9419,
-39086=>9420,
-39087=>9421,
-39094=>9422,
-39100=>9423,
-39110=>9424,
-39112=>9425,
-36674=>9426,
-40783=>9427,
-26005=>9428,
-29036=>9429,
-29010=>9430,
-29079=>9431,
-29121=>9432,
-29148=>9433,
-29182=>9434,
-31152=>9435,
-31118=>9436,
-31146=>9437,
-25055=>9438,
-24932=>9439,
-25059=>9440,
-25095=>9441,
-28585=>9442,
-30959=>9443,
-30893=>9444,
-30824=>9445,
-30904=>9446,
-31018=>9447,
-31025=>9448,
-30820=>9449,
-30973=>9450,
-30951=>9451,
-30947=>9452,
-40853=>9453,
-30616=>9454,
-30558=>9455,
-30652=>9456,
-32646=>9457,
-32648=>9458,
-37330=>9459,
-37331=>9460,
-37332=>9461,
-37337=>9462,
-37335=>9463,
-37333=>9464,
-37367=>9465,
-37351=>9466,
-37348=>9467,
-37702=>9468,
-37365=>9469,
-37369=>9470,
-37384=>9471,
-37414=>9472,
-37445=>9473,
-37393=>9474,
-37392=>9475,
-37377=>9476,
-37415=>9477,
-37380=>9478,
-37413=>9479,
-37376=>9480,
-37434=>9481,
-37478=>9482,
-37431=>9483,
-37427=>9484,
-37461=>9485,
-37437=>9486,
-37432=>9487,
-37470=>9488,
-37484=>9489,
-37485=>9490,
-37439=>9491,
-37984=>9492,
-37424=>9493,
-37449=>9494,
-37448=>9495,
-37453=>9496,
-37422=>9497,
-37433=>9498,
-37944=>9499,
-37548=>9500,
-37536=>9501,
-37498=>9502,
-37546=>9503,
-37614=>9504,
-37583=>9505,
-37891=>9506,
-37603=>9507,
-37946=>9508,
-37553=>9509,
-37542=>9510,
-37799=>9511,
-37526=>9512,
-37580=>9513,
-37545=>9514,
-37877=>9515,
-37523=>9516,
-37503=>9517,
-37801=>9518,
-37530=>9519,
-37658=>9520,
-37547=>9521,
-37507=>9522,
-37899=>9523,
-37544=>9524,
-37539=>9525,
-37906=>9526,
-37688=>9527,
-37617=>9528,
-37847=>9529,
-37605=>9530,
-37616=>9531,
-37615=>9532,
-37608=>9533,
-37564=>9534,
-37597=>9535,
-37622=>9536,
-37926=>9537,
-37927=>9538,
-37571=>9539,
-37599=>9540,
-37606=>9541,
-37650=>9542,
-37638=>9543,
-37737=>9544,
-37659=>9545,
-37696=>9546,
-37633=>9547,
-37653=>9548,
-37678=>9549,
-37699=>9550,
-37639=>9551,
-37640=>9552,
-37663=>9553,
-37657=>9554,
-37733=>9555,
-37703=>9556,
-37750=>9557,
-37716=>9558,
-37732=>9559,
-37802=>9560,
-37744=>9561,
-37764=>9562,
-37860=>9563,
-37848=>9564,
-37928=>9565,
-37767=>9566,
-37836=>9567,
-37784=>9568,
-37816=>9569,
-37823=>9570,
-37798=>9571,
-37808=>9572,
-37813=>9573,
-37964=>9574,
-37858=>9575,
-37852=>9576,
-37853=>9577,
-37837=>9578,
-37854=>9579,
-37827=>9580,
-37831=>9581,
-37841=>9582,
-37908=>9583,
-37917=>9584,
-37879=>9585,
-37989=>9586,
-37907=>9587,
-37997=>9588,
-37920=>9589,
-38009=>9590,
-37881=>9591,
-37913=>9592,
-37962=>9593,
-37938=>9594,
-37951=>9595,
-37972=>9596,
-37987=>9597,
-37758=>9598,
-31329=>9599,
-40169=>9600,
-40182=>9601,
-40199=>9602,
-40198=>9603,
-40227=>9604,
-40327=>9605,
-40469=>9606,
-40221=>9607,
-40223=>9608,
-40421=>9609,
-40239=>9610,
-40409=>9611,
-40240=>9612,
-40258=>9613,
-40478=>9614,
-40275=>9615,
-40477=>9616,
-40288=>9617,
-40274=>9618,
-40435=>9619,
-40284=>9620,
-40289=>9621,
-40339=>9622,
-40298=>9623,
-40303=>9624,
-40329=>9625,
-40344=>9626,
-40346=>9627,
-40384=>9628,
-40357=>9629,
-40361=>9630,
-40386=>9631,
-40380=>9632,
-40474=>9633,
-40403=>9634,
-40410=>9635,
-40431=>9636,
-40422=>9637,
-40434=>9638,
-40440=>9639,
-40460=>9640,
-40442=>9641,
-40475=>9642,
-30308=>9643,
-30296=>9644,
-30311=>9645,
-30210=>9646,
-30278=>9647,
-30279=>9648,
-30281=>9649,
-30238=>9650,
-30267=>9651,
-30317=>9652,
-30318=>9653,
-30313=>9654,
-30322=>9655,
-31431=>9656,
-31414=>9657,
-35168=>9658,
-35123=>9659,
-35165=>9660,
-35143=>9661,
-35128=>9662,
-35172=>9663,
-30392=>9664,
-32814=>9665,
-32812=>9666,
-32889=>9667,
-32885=>9668,
-38919=>9669,
-38926=>9670,
-38927=>9671,
-38945=>9672,
-38940=>9673,
-28481=>9674,
-38950=>9675,
-38967=>9676,
-38990=>9677,
-38995=>9678,
-39027=>9679,
-39010=>9680,
-39001=>9681,
-39013=>9682,
-39020=>9683,
-39024=>9684,
-34787=>9685,
-34822=>9686,
-34566=>9687,
-34851=>9688,
-34806=>9689,
-34554=>9690,
-34799=>9691,
-34692=>9692,
-34832=>9693,
-34760=>9694,
-34833=>9695,
-34747=>9696,
-34766=>9697,
-32588=>9698,
-31716=>9699,
-31591=>9700,
-31849=>9701,
-31731=>9702,
-31744=>9703,
-31691=>9704,
-31836=>9705,
-31774=>9706,
-31787=>9707,
-31779=>9708,
-31850=>9709,
-31839=>9710,
-33380=>9711,
-33387=>9712,
-35018=>9713,
-32677=>9714,
-31986=>9715,
-31990=>9716,
-31965=>9717,
-32310=>9718,
-40617=>9719,
-36274=>9720,
-37317=>9721,
-37315=>9722,
-40570=>9723,
-36489=>9724,
-36428=>9725,
-36498=>9726,
-36474=>9727,
-36437=>9728,
-36506=>9729,
-36491=>9730,
-36499=>9731,
-36497=>9732,
-36513=>9733,
-36451=>9734,
-36522=>9735,
-36518=>9736,
-35316=>9737,
-35318=>9738,
-38746=>9739,
-38722=>9740,
-38717=>9741,
-38724=>9742,
-40788=>9743,
-40799=>9744,
-40793=>9745,
-40800=>9746,
-40796=>9747,
-40806=>9748,
-40812=>9749,
-40810=>9750,
-40823=>9751,
-12236=>9752,
-40701=>9752,
-40703=>9753,
-40713=>9754,
-35726=>9755,
-38014=>9756,
-37864=>9757,
-39799=>9758,
-39796=>9759,
-39809=>9760,
-39811=>9761,
-39822=>9762,
-40056=>9763,
-31308=>9764,
-39826=>9765,
-40031=>9766,
-39824=>9767,
-39853=>9768,
-39834=>9769,
-39850=>9770,
-39838=>9771,
-40045=>9772,
-39851=>9773,
-39837=>9774,
-40024=>9775,
-39873=>9776,
-40058=>9777,
-39985=>9778,
-39993=>9779,
-39971=>9780,
-39991=>9781,
-39872=>9782,
-39882=>9783,
-39879=>9784,
-39933=>9785,
-39894=>9786,
-39914=>9787,
-39915=>9788,
-39905=>9789,
-39908=>9790,
-39911=>9791,
-39901=>9792,
-39906=>9793,
-39920=>9794,
-39899=>9795,
-39924=>9796,
-39892=>9797,
-40029=>9798,
-39944=>9799,
-39952=>9800,
-39949=>9801,
-39954=>9802,
-39945=>9803,
-39935=>9804,
-39968=>9805,
-39986=>9806,
-39981=>9807,
-39976=>9808,
-39973=>9809,
-39977=>9810,
-39987=>9811,
-39998=>9812,
-40008=>9813,
-39995=>9814,
-39989=>9815,
-40005=>9816,
-40022=>9817,
-40020=>9818,
-40018=>9819,
-40039=>9820,
-38851=>9821,
-38845=>9822,
-38857=>9823,
-40379=>9824,
-39631=>9825,
-39638=>9826,
-39637=>9827,
-39768=>9828,
-39758=>9829,
-39255=>9830,
-39260=>9831,
-39714=>9832,
-40695=>9833,
-40690=>9834,
-35180=>9835,
-38342=>9836,
-37686=>9837,
-24390=>9838,
-34068=>9839,
-32404=>9840,
-40803=>9841,
-22137=>9842,
-40725=>9843,
-22081=>9844,
-39662=>9845,
-35079=>9846,
-31296=>9847,
-39091=>9848,
-38308=>9849,
-39693=>9850,
-36852=>9851,
-24409=>9852,
-31339=>9853,
-39138=>9854,
-20642=>9855,
-34193=>9856,
-20760=>9857,
-25458=>9858,
-21067=>9859,
-30543=>9860,
-32397=>9861,
-26310=>9862,
-30637=>9863,
-12228=>9864,
-40565=>9864,
-22217=>9865,
-40692=>9866,
-28635=>9867,
-25054=>9868,
-30663=>9869,
-28720=>9870,
-40629=>9871,
-34890=>9872,
-38370=>9873,
-38854=>9874,
-31844=>9875,
-32308=>9876,
-38822=>9877,
-40623=>9878,
-22220=>9879,
-39089=>9880,
-27311=>9881,
-32590=>9882,
-31984=>9883,
-20418=>9884,
-32363=>9885,
-40569=>9886,
-22190=>9887,
-39706=>9888,
-33903=>9889,
-31142=>9890,
-31858=>9891,
-39634=>9892,
-38587=>9893,
-32251=>9894,
-35069=>9895,
-30787=>9896,
-8560=>9897,
-8561=>9898,
-8562=>9899,
-8563=>9900,
-8564=>9901,
-8565=>9902,
-8566=>9903,
-8567=>9904,
-8568=>9905,
-8569=>9906,
-714=>9907,
-715=>9908,
-729=>9909,
-8211=>9910,
-8213=>9911,
-8229=>9912,
-8245=>9913,
-8453=>9914,
-8457=>9915,
-8598=>9916,
-8599=>9917,
-8600=>9918,
-8601=>9919,
-8725=>9920,
-8735=>9921,
-8739=>9922,
-8786=>9923,
-8806=>9924,
-8807=>9925,
-8895=>9926,
-9552=>9927,
-9553=>9928,
-9554=>9929,
-9555=>9930,
-9556=>9931,
-9557=>9932,
-9558=>9933,
-9559=>9934,
-9560=>9935,
-9561=>9936,
-9562=>9937,
-9563=>9938,
-9564=>9939,
-9565=>9940,
-9566=>9941,
-9567=>9942,
-9568=>9943,
-9569=>9944,
-9570=>9945,
-9571=>9946,
-9572=>9947,
-9573=>9948,
-9574=>9949,
-9575=>9950,
-9576=>9951,
-9577=>9952,
-9578=>9953,
-9579=>9954,
-9580=>9955,
-9581=>9956,
-9582=>9957,
-9583=>9958,
-9584=>9959,
-9585=>9960,
-9586=>9961,
-9587=>9962,
-9601=>9963,
-9602=>9964,
-9603=>9965,
-9604=>9966,
-9605=>9967,
-9606=>9968,
-9607=>9969,
-9608=>9970,
-9609=>9971,
-9610=>9972,
-9611=>9973,
-9612=>9974,
-9613=>9975,
-9614=>9976,
-9615=>9977,
-9619=>9978,
-9620=>9979,
-9621=>9980,
-9660=>9981,
-9661=>9982,
-9698=>9983,
-9699=>9984,
-9700=>9985,
-9701=>9986,
-9737=>9987,
-8853=>9988,
-12306=>9989,
-12317=>9990,
-12318=>9991,
-12321=>9992,
-12322=>9993,
-12323=>9994,
-12324=>9995,
-12325=>9996,
-12326=>9997,
-12327=>9998,
-12328=>9999,
-12329=>10000,
-12963=>10001,
-13198=>10002,
-13199=>10003,
-13212=>10004,
-13213=>10005,
-13214=>10006,
-13217=>10007,
-13252=>10008,
-13262=>10009,
-13265=>10010,
-13266=>10011,
-13269=>10012,
-65072=>10013,
-65506=>10014,
-65508=>10015,
-8481=>10016,
-12849=>10017,
-8208=>10018,
-12540=>10019,
-12443=>10020,
-12444=>10021,
-12541=>10022,
-12542=>10023,
-12294=>10024,
-12445=>10025,
-12446=>10026,
-65097=>10027,
-65098=>10028,
-65099=>10029,
-65100=>10030,
-65101=>10031,
-65102=>10032,
-65103=>10033,
-65104=>10034,
-65105=>10035,
-65106=>10036,
-65108=>10037,
-65109=>10038,
-65110=>10039,
-65111=>10040,
-65113=>10041,
-65114=>10042,
-65115=>10043,
-65116=>10044,
-65117=>10045,
-65118=>10046,
-65119=>10047,
-65120=>10048,
-65121=>10049,
-65122=>10050,
-65123=>10051,
-65124=>10052,
-65125=>10053,
-65126=>10054,
-65128=>10055,
-65129=>10056,
-65130=>10057,
-65131=>10058,
-12350=>10059,
-59367=>10059,
-12272=>10060,
-59368=>10060,
-12273=>10061,
-59369=>10061,
-12274=>10062,
-59370=>10062,
-12275=>10063,
-59371=>10063,
-12276=>10064,
-59372=>10064,
-12277=>10065,
-59373=>10065,
-12278=>10066,
-59374=>10066,
-12279=>10067,
-59375=>10067,
-12280=>10068,
-59376=>10068,
-12281=>10069,
-59377=>10069,
-12282=>10070,
-59378=>10070,
-12283=>10071,
-59379=>10071,
-19970=>10072,
-19972=>10073,
-19973=>10074,
-19974=>10075,
-19983=>10076,
-19986=>10077,
-19991=>10078,
-19999=>10079,
-20000=>10080,
-20001=>10081,
-20003=>10082,
-20006=>10083,
-20009=>10084,
-20014=>10085,
-20015=>10086,
-20017=>10087,
-20019=>10088,
-20021=>10089,
-20023=>10090,
-20028=>10091,
-20032=>10092,
-20033=>10093,
-20034=>10094,
-20036=>10095,
-20038=>10096,
-20042=>10097,
-20049=>10098,
-20053=>10099,
-20055=>10100,
-20058=>10101,
-20059=>10102,
-20066=>10103,
-20067=>10104,
-20068=>10105,
-20069=>10106,
-20071=>10107,
-20072=>10108,
-20074=>10109,
-20075=>10110,
-20076=>10111,
-20077=>10112,
-20078=>10113,
-20079=>10114,
-20082=>10115,
-20084=>10116,
-20085=>10117,
-20086=>10118,
-20087=>10119,
-20088=>10120,
-20089=>10121,
-20090=>10122,
-20091=>10123,
-20092=>10124,
-20093=>10125,
-20095=>10126,
-20096=>10127,
-20097=>10128,
-20099=>10129,
-20100=>10130,
-12037=>10131,
-20101=>10131,
-20103=>10132,
-20106=>10133,
-20112=>10134,
-20118=>10135,
-20119=>10136,
-20121=>10137,
-20124=>10138,
-20125=>10139,
-20131=>10140,
-20138=>10141,
-20143=>10142,
-20144=>10143,
-20145=>10144,
-20148=>10145,
-20150=>10146,
-20151=>10147,
-20152=>10148,
-20153=>10149,
-20156=>10150,
-20157=>10151,
-20158=>10152,
-20168=>10153,
-20172=>10154,
-20175=>10155,
-20176=>10156,
-20178=>10157,
-20186=>10158,
-20187=>10159,
-20188=>10160,
-20192=>10161,
-20194=>10162,
-20198=>10163,
-20199=>10164,
-20201=>10165,
-20205=>10166,
-20206=>10167,
-20207=>10168,
-20209=>10169,
-20212=>10170,
-20216=>10171,
-20217=>10172,
-20218=>10173,
-20220=>10174,
-20222=>10175,
-20224=>10176,
-20226=>10177,
-20227=>10178,
-20228=>10179,
-20229=>10180,
-20230=>10181,
-20231=>10182,
-20232=>10183,
-20235=>10184,
-20236=>10185,
-20242=>10186,
-20243=>10187,
-20244=>10188,
-20245=>10189,
-20246=>10190,
-20252=>10191,
-20253=>10192,
-20257=>10193,
-20259=>10194,
-20264=>10195,
-20265=>10196,
-20268=>10197,
-20269=>10198,
-20270=>10199,
-20273=>10200,
-20275=>10201,
-20277=>10202,
-20279=>10203,
-20281=>10204,
-20283=>10205,
-20286=>10206,
-20287=>10207,
-20288=>10208,
-20289=>10209,
-20290=>10210,
-20292=>10211,
-20293=>10212,
-20295=>10213,
-20296=>10214,
-20297=>10215,
-20298=>10216,
-20299=>10217,
-20300=>10218,
-20306=>10219,
-20308=>10220,
-20310=>10221,
-20321=>10222,
-20322=>10223,
-20326=>10224,
-20328=>10225,
-20330=>10226,
-20331=>10227,
-20333=>10228,
-20334=>10229,
-20337=>10230,
-20338=>10231,
-20341=>10232,
-20343=>10233,
-20344=>10234,
-20345=>10235,
-20346=>10236,
-20349=>10237,
-20352=>10238,
-20353=>10239,
-20354=>10240,
-20357=>10241,
-20359=>10242,
-20362=>10243,
-20364=>10244,
-20366=>10245,
-20368=>10246,
-20370=>10247,
-20371=>10248,
-20373=>10249,
-20376=>10250,
-20377=>10251,
-20378=>10252,
-20380=>10253,
-20382=>10254,
-20383=>10255,
-20385=>10256,
-20386=>10257,
-20388=>10258,
-20395=>10259,
-20397=>10260,
-20400=>10261,
-20401=>10262,
-20402=>10263,
-20403=>10264,
-20404=>10265,
-20406=>10266,
-20407=>10267,
-20408=>10268,
-20409=>10269,
-20410=>10270,
-20411=>10271,
-20412=>10272,
-20413=>10273,
-20414=>10274,
-20416=>10275,
-20417=>10276,
-20422=>10277,
-20423=>10278,
-20424=>10279,
-20425=>10280,
-20427=>10281,
-20428=>10282,
-20429=>10283,
-20434=>10284,
-20435=>10285,
-20436=>10286,
-20437=>10287,
-20438=>10288,
-20441=>10289,
-20443=>10290,
-20450=>10291,
-20452=>10292,
-20453=>10293,
-20455=>10294,
-20459=>10295,
-20460=>10296,
-20464=>10297,
-20466=>10298,
-20468=>10299,
-20469=>10300,
-20470=>10301,
-20471=>10302,
-20473=>10303,
-20475=>10304,
-20476=>10305,
-20477=>10306,
-20479=>10307,
-20481=>10308,
-20482=>10309,
-20483=>10310,
-20484=>10311,
-20485=>10312,
-20487=>10313,
-20488=>10314,
-20490=>10315,
-20494=>10316,
-20496=>10317,
-20499=>10318,
-20501=>10319,
-20502=>10320,
-20503=>10321,
-20507=>10322,
-20509=>10323,
-20510=>10324,
-20512=>10325,
-20514=>10326,
-20515=>10327,
-20516=>10328,
-20519=>10329,
-20527=>10330,
-20528=>10331,
-20529=>10332,
-20530=>10333,
-20531=>10334,
-20532=>10335,
-20533=>10336,
-20534=>10337,
-20535=>10338,
-20536=>10339,
-20537=>10340,
-20539=>10341,
-20541=>10342,
-20543=>10343,
-20544=>10344,
-20545=>10345,
-20546=>10346,
-20548=>10347,
-20549=>10348,
-20550=>10349,
-20554=>10350,
-20555=>10351,
-20557=>10352,
-20560=>10353,
-20561=>10354,
-20562=>10355,
-20563=>10356,
-20564=>10357,
-20566=>10358,
-20567=>10359,
-20568=>10360,
-20569=>10361,
-20571=>10362,
-20573=>10363,
-20574=>10364,
-20575=>10365,
-20576=>10366,
-20577=>10367,
-20578=>10368,
-20579=>10369,
-20580=>10370,
-20582=>10371,
-20583=>10372,
-20584=>10373,
-20585=>10374,
-20586=>10375,
-20587=>10376,
-20589=>10377,
-20590=>10378,
-20591=>10379,
-20592=>10380,
-20593=>10381,
-20594=>10382,
-20595=>10383,
-20600=>10384,
-20601=>10385,
-20602=>10386,
-20604=>10387,
-20605=>10388,
-20609=>10389,
-20610=>10390,
-20611=>10391,
-20612=>10392,
-20614=>10393,
-20615=>10394,
-20617=>10395,
-20618=>10396,
-20619=>10397,
-20620=>10398,
-20622=>10399,
-20623=>10400,
-20624=>10401,
-20625=>10402,
-20626=>10403,
-20627=>10404,
-20628=>10405,
-20629=>10406,
-20631=>10407,
-20634=>10408,
-20635=>10409,
-20636=>10410,
-20637=>10411,
-20638=>10412,
-20639=>10413,
-20640=>10414,
-20641=>10415,
-20644=>10416,
-20646=>10417,
-20650=>10418,
-20651=>10419,
-20654=>10420,
-20655=>10421,
-20656=>10422,
-20657=>10423,
-20662=>10424,
-20664=>10425,
-20665=>10426,
-20668=>10427,
-20669=>10428,
-20671=>10429,
-20672=>10430,
-20673=>10431,
-20675=>10432,
-20676=>10433,
-20678=>10434,
-20679=>10435,
-20680=>10436,
-20682=>10437,
-20683=>10438,
-20684=>10439,
-20685=>10440,
-20686=>10441,
-20688=>10442,
-20690=>10443,
-20691=>10444,
-20692=>10445,
-20695=>10446,
-20696=>10447,
-20697=>10448,
-20699=>10449,
-20700=>10450,
-20701=>10451,
-20703=>10452,
-20704=>10453,
-20705=>10454,
-20706=>10455,
-20707=>10456,
-20708=>10457,
-20713=>10458,
-20714=>10459,
-20715=>10460,
-20719=>10461,
-20720=>10462,
-20721=>10463,
-20722=>10464,
-20724=>10465,
-20726=>10466,
-20727=>10467,
-20728=>10468,
-20730=>10469,
-20732=>10470,
-20733=>10471,
-20734=>10472,
-20735=>10473,
-20737=>10474,
-20739=>10475,
-20741=>10476,
-20746=>10477,
-20748=>10478,
-20749=>10479,
-20750=>10480,
-20751=>10481,
-20753=>10482,
-20755=>10483,
-20758=>10484,
-20759=>10485,
-20761=>10486,
-20762=>10487,
-20763=>10488,
-20764=>10489,
-20765=>10490,
-20766=>10491,
-20768=>10492,
-20770=>10493,
-20771=>10494,
-20772=>10495,
-20773=>10496,
-20774=>10497,
-20775=>10498,
-20776=>10499,
-20777=>10500,
-20779=>10501,
-20780=>10502,
-20781=>10503,
-20782=>10504,
-20783=>10505,
-20784=>10506,
-20785=>10507,
-20787=>10508,
-20788=>10509,
-20789=>10510,
-20790=>10511,
-20792=>10512,
-20793=>10513,
-20797=>10514,
-20798=>10515,
-20802=>10516,
-20807=>10517,
-20810=>10518,
-20812=>10519,
-20814=>10520,
-20815=>10521,
-20816=>10522,
-20819=>10523,
-20823=>10524,
-20824=>10525,
-20825=>10526,
-20827=>10527,
-20829=>10528,
-20830=>10529,
-20831=>10530,
-20832=>10531,
-20833=>10532,
-20835=>10533,
-20836=>10534,
-20838=>10535,
-20839=>10536,
-20842=>10537,
-20847=>10538,
-20850=>10539,
-20858=>10540,
-20862=>10541,
-20863=>10542,
-20867=>10543,
-20868=>10544,
-20870=>10545,
-20871=>10546,
-20874=>10547,
-20875=>10548,
-20878=>10549,
-20879=>10550,
-20880=>10551,
-20881=>10552,
-20883=>10553,
-20884=>10554,
-20888=>10555,
-20890=>10556,
-20893=>10557,
-20894=>10558,
-20895=>10559,
-20897=>10560,
-20899=>10561,
-20902=>10562,
-20903=>10563,
-20904=>10564,
-20905=>10565,
-20906=>10566,
-20909=>10567,
-20910=>10568,
-20916=>10569,
-20920=>10570,
-20921=>10571,
-20922=>10572,
-20926=>10573,
-20927=>10574,
-20929=>10575,
-20930=>10576,
-20931=>10577,
-20933=>10578,
-20936=>10579,
-20938=>10580,
-20942=>10581,
-20944=>10582,
-20946=>10583,
-20947=>10584,
-20948=>10585,
-20949=>10586,
-20950=>10587,
-20951=>10588,
-20952=>10589,
-20953=>10590,
-20954=>10591,
-20956=>10592,
-20958=>10593,
-20959=>10594,
-20962=>10595,
-20963=>10596,
-20965=>10597,
-20966=>10598,
-20967=>10599,
-20968=>10600,
-20969=>10601,
-20970=>10602,
-20972=>10603,
-20974=>10604,
-20978=>10605,
-20980=>10606,
-20983=>10607,
-20990=>10608,
-20996=>10609,
-20997=>10610,
-21001=>10611,
-21003=>10612,
-21004=>10613,
-21007=>10614,
-21008=>10615,
-21011=>10616,
-21012=>10617,
-21013=>10618,
-21020=>10619,
-21022=>10620,
-21023=>10621,
-21025=>10622,
-21026=>10623,
-21027=>10624,
-21029=>10625,
-21030=>10626,
-21031=>10627,
-21034=>10628,
-21036=>10629,
-21039=>10630,
-21041=>10631,
-21042=>10632,
-21044=>10633,
-21045=>10634,
-21052=>10635,
-21054=>10636,
-21061=>10637,
-21062=>10638,
-21064=>10639,
-21065=>10640,
-21070=>10641,
-21071=>10642,
-21074=>10643,
-21075=>10644,
-21077=>10645,
-21079=>10646,
-21080=>10647,
-21081=>10648,
-21082=>10649,
-21085=>10650,
-21087=>10651,
-21088=>10652,
-21090=>10653,
-21091=>10654,
-21092=>10655,
-21094=>10656,
-21096=>10657,
-21099=>10658,
-21100=>10659,
-21101=>10660,
-21104=>10661,
-21105=>10662,
-21107=>10663,
-21110=>10664,
-21111=>10665,
-21112=>10666,
-21113=>10667,
-21114=>10668,
-21115=>10669,
-21116=>10670,
-21118=>10671,
-21120=>10672,
-21124=>10673,
-21125=>10674,
-21126=>10675,
-21131=>10676,
-21134=>10677,
-21135=>10678,
-21138=>10679,
-21140=>10680,
-21141=>10681,
-21142=>10682,
-21143=>10683,
-21144=>10684,
-21145=>10685,
-21146=>10686,
-21148=>10687,
-21156=>10688,
-21157=>10689,
-21158=>10690,
-21159=>10691,
-21166=>10692,
-21167=>10693,
-21168=>10694,
-21172=>10695,
-21173=>10696,
-21174=>10697,
-21175=>10698,
-21176=>10699,
-21177=>10700,
-21178=>10701,
-21179=>10702,
-21180=>10703,
-21181=>10704,
-21184=>10705,
-21186=>10706,
-21188=>10707,
-21189=>10708,
-21190=>10709,
-21192=>10710,
-21194=>10711,
-21196=>10712,
-21197=>10713,
-21198=>10714,
-21199=>10715,
-21201=>10716,
-21203=>10717,
-21204=>10718,
-21207=>10719,
-21210=>10720,
-21212=>10721,
-21216=>10722,
-21217=>10723,
-21219=>10724,
-21221=>10725,
-21222=>10726,
-21223=>10727,
-21224=>10728,
-21225=>10729,
-21226=>10730,
-21227=>10731,
-21228=>10732,
-21229=>10733,
-21230=>10734,
-21231=>10735,
-21234=>10736,
-21235=>10737,
-21236=>10738,
-21238=>10739,
-21239=>10740,
-21243=>10741,
-21244=>10742,
-21245=>10743,
-21249=>10744,
-21250=>10745,
-21251=>10746,
-21252=>10747,
-21255=>10748,
-21257=>10749,
-21258=>10750,
-21259=>10751,
-21260=>10752,
-21262=>10753,
-21265=>10754,
-21266=>10755,
-21267=>10756,
-21268=>10757,
-21272=>10758,
-21275=>10759,
-21276=>10760,
-21278=>10761,
-21279=>10762,
-21282=>10763,
-21284=>10764,
-21285=>10765,
-21287=>10766,
-21288=>10767,
-21289=>10768,
-21291=>10769,
-21292=>10770,
-21296=>10771,
-21298=>10772,
-21299=>10773,
-21300=>10774,
-21301=>10775,
-21302=>10776,
-21303=>10777,
-12054=>10778,
-21304=>10778,
-21308=>10779,
-21309=>10780,
-21314=>10781,
-21316=>10782,
-21318=>10783,
-21323=>10784,
-21324=>10785,
-21325=>10786,
-21328=>10787,
-21336=>10788,
-21337=>10789,
-21339=>10790,
-21341=>10791,
-21349=>10792,
-21352=>10793,
-21354=>10794,
-21356=>10795,
-21357=>10796,
-21362=>10797,
-21366=>10798,
-21369=>10799,
-21371=>10800,
-21372=>10801,
-21373=>10802,
-21374=>10803,
-21376=>10804,
-21377=>10805,
-21379=>10806,
-21383=>10807,
-21384=>10808,
-21386=>10809,
-21390=>10810,
-21391=>10811,
-21392=>10812,
-21393=>10813,
-21394=>10814,
-21395=>10815,
-21396=>10816,
-21398=>10817,
-21399=>10818,
-21403=>10819,
-21404=>10820,
-21406=>10821,
-21409=>10822,
-21412=>10823,
-21415=>10824,
-21418=>10825,
-21419=>10826,
-21420=>10827,
-21423=>10828,
-21424=>10829,
-21425=>10830,
-21427=>10831,
-21429=>10832,
-21431=>10833,
-21432=>10834,
-21433=>10835,
-21434=>10836,
-21436=>10837,
-21437=>10838,
-21438=>10839,
-21440=>10840,
-21444=>10841,
-21445=>10842,
-21446=>10843,
-21447=>10844,
-21454=>10845,
-21455=>10846,
-21456=>10847,
-21458=>10848,
-21459=>10849,
-21461=>10850,
-21466=>10851,
-21468=>10852,
-21469=>10853,
-21470=>10854,
-21473=>10855,
-21479=>10856,
-21492=>10857,
-21498=>10858,
-21502=>10859,
-21503=>10860,
-21504=>10861,
-21506=>10862,
-21509=>10863,
-21511=>10864,
-21515=>10865,
-21524=>10866,
-21528=>10867,
-21529=>10868,
-21530=>10869,
-21532=>10870,
-21538=>10871,
-21540=>10872,
-21541=>10873,
-21546=>10874,
-21552=>10875,
-21555=>10876,
-21558=>10877,
-21559=>10878,
-21562=>10879,
-21565=>10880,
-21567=>10881,
-21569=>10882,
-21570=>10883,
-21572=>10884,
-21573=>10885,
-21575=>10886,
-21577=>10887,
-21580=>10888,
-21581=>10889,
-21582=>10890,
-21583=>10891,
-21585=>10892,
-21594=>10893,
-21597=>10894,
-21598=>10895,
-21599=>10896,
-21600=>10897,
-21601=>10898,
-21603=>10899,
-21605=>10900,
-21607=>10901,
-21609=>10902,
-21610=>10903,
-21611=>10904,
-21612=>10905,
-21613=>10906,
-21614=>10907,
-21615=>10908,
-21616=>10909,
-21620=>10910,
-21625=>10911,
-21626=>10912,
-21630=>10913,
-21631=>10914,
-21633=>10915,
-21635=>10916,
-21637=>10917,
-21639=>10918,
-21640=>10919,
-21641=>10920,
-21642=>10921,
-21645=>10922,
-21649=>10923,
-21651=>10924,
-21655=>10925,
-21656=>10926,
-21660=>10927,
-21662=>10928,
-21663=>10929,
-21664=>10930,
-21665=>10931,
-21666=>10932,
-21669=>10933,
-21678=>10934,
-21680=>10935,
-21682=>10936,
-21685=>10937,
-21686=>10938,
-21687=>10939,
-21689=>10940,
-21690=>10941,
-21694=>10942,
-21699=>10943,
-21701=>10944,
-21706=>10945,
-21707=>10946,
-21718=>10947,
-21720=>10948,
-21723=>10949,
-21728=>10950,
-21730=>10951,
-21731=>10952,
-21732=>10953,
-21739=>10954,
-21740=>10955,
-21743=>10956,
-21744=>10957,
-21745=>10958,
-21748=>10959,
-21749=>10960,
-21750=>10961,
-21751=>10962,
-21752=>10963,
-21753=>10964,
-21755=>10965,
-21758=>10966,
-21760=>10967,
-21762=>10968,
-21763=>10969,
-21765=>10970,
-21768=>10971,
-21770=>10972,
-21771=>10973,
-21772=>10974,
-21773=>10975,
-21774=>10976,
-21778=>10977,
-21779=>10978,
-21781=>10979,
-21782=>10980,
-21783=>10981,
-21784=>10982,
-21785=>10983,
-21786=>10984,
-21788=>10985,
-21789=>10986,
-21790=>10987,
-21791=>10988,
-21793=>10989,
-21797=>10990,
-21798=>10991,
-21800=>10992,
-21801=>10993,
-21803=>10994,
-21805=>10995,
-21810=>10996,
-21812=>10997,
-21813=>10998,
-21814=>10999,
-21816=>11000,
-21817=>11001,
-21818=>11002,
-21819=>11003,
-21821=>11004,
-21824=>11005,
-21826=>11006,
-21829=>11007,
-21831=>11008,
-21832=>11009,
-21835=>11010,
-21836=>11011,
-21837=>11012,
-21838=>11013,
-21841=>11014,
-21842=>11015,
-21844=>11016,
-21847=>11017,
-21848=>11018,
-21849=>11019,
-21850=>11020,
-21851=>11021,
-21853=>11022,
-21855=>11023,
-21856=>11024,
-21858=>11025,
-21859=>11026,
-21864=>11027,
-21865=>11028,
-21867=>11029,
-21871=>11030,
-21872=>11031,
-21873=>11032,
-21874=>11033,
-21875=>11034,
-21876=>11035,
-21881=>11036,
-21882=>11037,
-21885=>11038,
-21887=>11039,
-21893=>11040,
-21894=>11041,
-21900=>11042,
-21901=>11043,
-21902=>11044,
-21904=>11045,
-21906=>11046,
-21907=>11047,
-21909=>11048,
-21910=>11049,
-21911=>11050,
-21914=>11051,
-21915=>11052,
-21918=>11053,
-21920=>11054,
-21921=>11055,
-21922=>11056,
-21923=>11057,
-21924=>11058,
-21925=>11059,
-21926=>11060,
-21928=>11061,
-21929=>11062,
-21931=>11063,
-21933=>11064,
-21935=>11065,
-21936=>11066,
-21940=>11067,
-21942=>11068,
-21944=>11069,
-21946=>11070,
-21948=>11071,
-21951=>11072,
-21952=>11073,
-21953=>11074,
-21954=>11075,
-21955=>11076,
-21960=>11077,
-21962=>11078,
-21963=>11079,
-21967=>11080,
-21968=>11081,
-21973=>11082,
-21975=>11083,
-21976=>11084,
-21977=>11085,
-21979=>11086,
-21982=>11087,
-21984=>11088,
-21986=>11089,
-21991=>11090,
-21997=>11091,
-21998=>11092,
-22000=>11093,
-22001=>11094,
-22004=>11095,
-22008=>11096,
-22009=>11097,
-22010=>11098,
-22011=>11099,
-22012=>11100,
-22015=>11101,
-22018=>11102,
-22019=>11103,
-22020=>11104,
-22021=>11105,
-22023=>11106,
-22026=>11107,
-22027=>11108,
-22032=>11109,
-22033=>11110,
-22034=>11111,
-22035=>11112,
-22037=>11113,
-22041=>11114,
-22042=>11115,
-22045=>11116,
-22048=>11117,
-22049=>11118,
-22050=>11119,
-22053=>11120,
-22054=>11121,
-22056=>11122,
-22058=>11123,
-22059=>11124,
-22067=>11125,
-22071=>11126,
-22074=>11127,
-22076=>11128,
-22077=>11129,
-22078=>11130,
-22080=>11131,
-22082=>11132,
-22083=>11133,
-22084=>11134,
-22085=>11135,
-22086=>11136,
-22087=>11137,
-22088=>11138,
-22089=>11139,
-22090=>11140,
-22091=>11141,
-22095=>11142,
-22096=>11143,
-22097=>11144,
-22098=>11145,
-22099=>11146,
-22101=>11147,
-22102=>11148,
-22106=>11149,
-22107=>11150,
-22110=>11151,
-22111=>11152,
-22113=>11153,
-22115=>11154,
-22119=>11155,
-22125=>11156,
-22126=>11157,
-22128=>11158,
-22131=>11159,
-22133=>11160,
-22135=>11161,
-22138=>11162,
-22141=>11163,
-22142=>11164,
-22143=>11165,
-22145=>11166,
-22146=>11167,
-22147=>11168,
-22148=>11169,
-22152=>11170,
-22153=>11171,
-22154=>11172,
-22155=>11173,
-22157=>11174,
-22160=>11175,
-22161=>11176,
-22162=>11177,
-22164=>11178,
-22166=>11179,
-22167=>11180,
-22168=>11181,
-22170=>11182,
-22171=>11183,
-22172=>11184,
-22173=>11185,
-22174=>11186,
-22175=>11187,
-22176=>11188,
-22177=>11189,
-22178=>11190,
-22180=>11191,
-22181=>11192,
-22183=>11193,
-22185=>11194,
-22186=>11195,
-22187=>11196,
-22188=>11197,
-22189=>11198,
-22192=>11199,
-22193=>11200,
-22194=>11201,
-22197=>11202,
-22200=>11203,
-22201=>11204,
-22202=>11205,
-22203=>11206,
-22205=>11207,
-22206=>11208,
-22207=>11209,
-22211=>11210,
-22212=>11211,
-22214=>11212,
-22215=>11213,
-22219=>11214,
-22221=>11215,
-22222=>11216,
-22223=>11217,
-22224=>11218,
-22226=>11219,
-22227=>11220,
-22229=>11221,
-22230=>11222,
-22232=>11223,
-22233=>11224,
-22236=>11225,
-22243=>11226,
-22245=>11227,
-22246=>11228,
-22247=>11229,
-22248=>11230,
-22249=>11231,
-22250=>11232,
-22252=>11233,
-22254=>11234,
-22255=>11235,
-22258=>11236,
-22259=>11237,
-22262=>11238,
-22263=>11239,
-22264=>11240,
-22267=>11241,
-22268=>11242,
-22272=>11243,
-22273=>11244,
-22274=>11245,
-22277=>11246,
-22284=>11247,
-22286=>11248,
-22287=>11249,
-22288=>11250,
-22289=>11251,
-22292=>11252,
-22293=>11253,
-22295=>11254,
-22297=>11255,
-22298=>11256,
-22299=>11257,
-22301=>11258,
-22302=>11259,
-22304=>11260,
-22305=>11261,
-22306=>11262,
-22308=>11263,
-22309=>11264,
-22310=>11265,
-22311=>11266,
-22315=>11267,
-22321=>11268,
-22322=>11269,
-22324=>11270,
-22325=>11271,
-22326=>11272,
-22327=>11273,
-22328=>11274,
-22332=>11275,
-22333=>11276,
-22335=>11277,
-22337=>11278,
-22339=>11279,
-22340=>11280,
-22341=>11281,
-22342=>11282,
-22344=>11283,
-22345=>11284,
-22347=>11285,
-22354=>11286,
-22355=>11287,
-22356=>11288,
-22357=>11289,
-22358=>11290,
-22360=>11291,
-22361=>11292,
-22370=>11293,
-22371=>11294,
-22373=>11295,
-22375=>11296,
-22380=>11297,
-22382=>11298,
-22384=>11299,
-22385=>11300,
-22386=>11301,
-22388=>11302,
-22389=>11303,
-22392=>11304,
-22393=>11305,
-22394=>11306,
-22397=>11307,
-22398=>11308,
-22399=>11309,
-22400=>11310,
-22401=>11311,
-22407=>11312,
-22408=>11313,
-22409=>11314,
-22410=>11315,
-22413=>11316,
-22414=>11317,
-22415=>11318,
-22416=>11319,
-22417=>11320,
-22420=>11321,
-22421=>11322,
-22422=>11323,
-22423=>11324,
-22424=>11325,
-22425=>11326,
-22426=>11327,
-22428=>11328,
-22429=>11329,
-22430=>11330,
-22431=>11331,
-22437=>11332,
-22440=>11333,
-22442=>11334,
-22444=>11335,
-22447=>11336,
-22448=>11337,
-22449=>11338,
-22451=>11339,
-22453=>11340,
-22454=>11341,
-22455=>11342,
-22457=>11343,
-22458=>11344,
-22459=>11345,
-22460=>11346,
-22461=>11347,
-22462=>11348,
-22463=>11349,
-22464=>11350,
-22465=>11351,
-22468=>11352,
-22469=>11353,
-22470=>11354,
-22471=>11355,
-22472=>11356,
-22473=>11357,
-22474=>11358,
-22476=>11359,
-22477=>11360,
-22480=>11361,
-22481=>11362,
-22483=>11363,
-22486=>11364,
-22487=>11365,
-22491=>11366,
-22492=>11367,
-22494=>11368,
-22498=>11369,
-22499=>11370,
-22501=>11371,
-22502=>11372,
-22503=>11373,
-22504=>11374,
-22505=>11375,
-22506=>11376,
-22507=>11377,
-22508=>11378,
-22510=>11379,
-22512=>11380,
-22513=>11381,
-22514=>11382,
-22515=>11383,
-22517=>11384,
-22518=>11385,
-22523=>11386,
-22524=>11387,
-22526=>11388,
-22527=>11389,
-22529=>11390,
-22531=>11391,
-22532=>11392,
-22536=>11393,
-22537=>11394,
-22540=>11395,
-22542=>11396,
-22543=>11397,
-22544=>11398,
-22546=>11399,
-22547=>11400,
-22548=>11401,
-22551=>11402,
-22552=>11403,
-22554=>11404,
-22555=>11405,
-22556=>11406,
-22559=>11407,
-22562=>11408,
-22563=>11409,
-22565=>11410,
-22566=>11411,
-22567=>11412,
-22568=>11413,
-22569=>11414,
-22571=>11415,
-22572=>11416,
-22573=>11417,
-22574=>11418,
-22578=>11419,
-22579=>11420,
-22582=>11421,
-22583=>11422,
-22584=>11423,
-22585=>11424,
-22586=>11425,
-22587=>11426,
-22588=>11427,
-22589=>11428,
-22590=>11429,
-22591=>11430,
-22592=>11431,
-22593=>11432,
-22594=>11433,
-22595=>11434,
-22597=>11435,
-22598=>11436,
-22599=>11437,
-22600=>11438,
-22601=>11439,
-22606=>11440,
-22608=>11441,
-22611=>11442,
-22613=>11443,
-22614=>11444,
-22617=>11445,
-22618=>11446,
-22619=>11447,
-22620=>11448,
-22621=>11449,
-22623=>11450,
-22624=>11451,
-22625=>11452,
-22627=>11453,
-22630=>11454,
-22631=>11455,
-22632=>11456,
-22633=>11457,
-22634=>11458,
-22637=>11459,
-22638=>11460,
-22639=>11461,
-22640=>11462,
-22641=>11463,
-22642=>11464,
-22643=>11465,
-22644=>11466,
-22646=>11467,
-22647=>11468,
-22648=>11469,
-22650=>11470,
-22651=>11471,
-22652=>11472,
-22653=>11473,
-22655=>11474,
-22658=>11475,
-22660=>11476,
-22662=>11477,
-22663=>11478,
-22664=>11479,
-22667=>11480,
-22668=>11481,
-22669=>11482,
-22670=>11483,
-22671=>11484,
-22672=>11485,
-22673=>11486,
-22676=>11487,
-22677=>11488,
-22678=>11489,
-22679=>11490,
-22680=>11491,
-22683=>11492,
-22685=>11493,
-22688=>11494,
-22689=>11495,
-22690=>11496,
-22691=>11497,
-22692=>11498,
-22693=>11499,
-22694=>11500,
-22695=>11501,
-22698=>11502,
-22699=>11503,
-22700=>11504,
-22701=>11505,
-22703=>11506,
-22704=>11507,
-22705=>11508,
-22706=>11509,
-22708=>11510,
-22709=>11511,
-22710=>11512,
-22711=>11513,
-22712=>11514,
-22713=>11515,
-22714=>11516,
-22717=>11517,
-22719=>11518,
-22720=>11519,
-22722=>11520,
-22723=>11521,
-22724=>11522,
-22726=>11523,
-22728=>11524,
-22729=>11525,
-22730=>11526,
-22731=>11527,
-22732=>11528,
-22733=>11529,
-22734=>11530,
-22735=>11531,
-22736=>11532,
-22738=>11533,
-22740=>11534,
-22742=>11535,
-22743=>11536,
-22747=>11537,
-22748=>11538,
-22749=>11539,
-22753=>11540,
-22755=>11541,
-22757=>11542,
-22758=>11543,
-22759=>11544,
-22760=>11545,
-22762=>11546,
-22765=>11547,
-22769=>11548,
-22770=>11549,
-22772=>11550,
-22773=>11551,
-22775=>11552,
-22776=>11553,
-22779=>11554,
-22780=>11555,
-22782=>11556,
-22783=>11557,
-22784=>11558,
-22785=>11559,
-22787=>11560,
-22789=>11561,
-22790=>11562,
-22792=>11563,
-22793=>11564,
-12066=>11565,
-22794=>11565,
-22795=>11566,
-22796=>11567,
-22798=>11568,
-22800=>11569,
-22801=>11570,
-22802=>11571,
-22803=>11572,
-22807=>11573,
-22808=>11574,
-22811=>11575,
-22813=>11576,
-22814=>11577,
-22816=>11578,
-22817=>11579,
-22819=>11580,
-22822=>11581,
-22824=>11582,
-22828=>11583,
-22832=>11584,
-22834=>11585,
-22835=>11586,
-22837=>11587,
-22838=>11588,
-22843=>11589,
-22845=>11590,
-22847=>11591,
-22848=>11592,
-22851=>11593,
-22853=>11594,
-22854=>11595,
-22858=>11596,
-22860=>11597,
-22861=>11598,
-22864=>11599,
-22866=>11600,
-22867=>11601,
-22873=>11602,
-22875=>11603,
-22876=>11604,
-22877=>11605,
-22878=>11606,
-22879=>11607,
-22881=>11608,
-22883=>11609,
-22884=>11610,
-22886=>11611,
-22887=>11612,
-22888=>11613,
-22891=>11614,
-22893=>11615,
-22895=>11616,
-22896=>11617,
-22897=>11618,
-22898=>11619,
-22901=>11620,
-22903=>11621,
-22906=>11622,
-22907=>11623,
-22908=>11624,
-22910=>11625,
-22911=>11626,
-22912=>11627,
-22917=>11628,
-22921=>11629,
-22923=>11630,
-22924=>11631,
-22926=>11632,
-22927=>11633,
-22928=>11634,
-22929=>11635,
-22932=>11636,
-22933=>11637,
-22936=>11638,
-22938=>11639,
-22939=>11640,
-22940=>11641,
-22943=>11642,
-22944=>11643,
-22945=>11644,
-22946=>11645,
-22950=>11646,
-22951=>11647,
-22956=>11648,
-22957=>11649,
-22960=>11650,
-22961=>11651,
-22963=>11652,
-22964=>11653,
-22965=>11654,
-22966=>11655,
-22967=>11656,
-22968=>11657,
-22970=>11658,
-22972=>11659,
-22973=>11660,
-22975=>11661,
-22976=>11662,
-22977=>11663,
-22978=>11664,
-22979=>11665,
-22980=>11666,
-22981=>11667,
-22983=>11668,
-22984=>11669,
-22985=>11670,
-22988=>11671,
-22989=>11672,
-22990=>11673,
-22991=>11674,
-22997=>11675,
-22998=>11676,
-23001=>11677,
-23003=>11678,
-23006=>11679,
-23007=>11680,
-23008=>11681,
-23009=>11682,
-23010=>11683,
-23012=>11684,
-23014=>11685,
-23015=>11686,
-23017=>11687,
-23018=>11688,
-23019=>11689,
-23021=>11690,
-23022=>11691,
-23023=>11692,
-23024=>11693,
-23025=>11694,
-23026=>11695,
-23027=>11696,
-23028=>11697,
-23029=>11698,
-23030=>11699,
-23031=>11700,
-23032=>11701,
-23034=>11702,
-23036=>11703,
-23037=>11704,
-23038=>11705,
-23040=>11706,
-23042=>11707,
-23050=>11708,
-23051=>11709,
-23053=>11710,
-23054=>11711,
-23055=>11712,
-23056=>11713,
-23058=>11714,
-23060=>11715,
-23061=>11716,
-23062=>11717,
-23063=>11718,
-23065=>11719,
-23066=>11720,
-23067=>11721,
-23069=>11722,
-23070=>11723,
-23073=>11724,
-23074=>11725,
-23076=>11726,
-23078=>11727,
-23079=>11728,
-23080=>11729,
-23082=>11730,
-23083=>11731,
-23084=>11732,
-23085=>11733,
-23086=>11734,
-23087=>11735,
-23088=>11736,
-23091=>11737,
-23093=>11738,
-23095=>11739,
-23096=>11740,
-23097=>11741,
-23098=>11742,
-23099=>11743,
-23101=>11744,
-23102=>11745,
-23103=>11746,
-23106=>11747,
-23107=>11748,
-23108=>11749,
-23109=>11750,
-23111=>11751,
-23112=>11752,
-23115=>11753,
-23116=>11754,
-23117=>11755,
-23118=>11756,
-23119=>11757,
-23120=>11758,
-23121=>11759,
-23122=>11760,
-23123=>11761,
-23124=>11762,
-23126=>11763,
-23127=>11764,
-23128=>11765,
-23129=>11766,
-23131=>11767,
-23132=>11768,
-23133=>11769,
-23134=>11770,
-23135=>11771,
-23136=>11772,
-23137=>11773,
-23139=>11774,
-23140=>11775,
-23141=>11776,
-23144=>11777,
-23145=>11778,
-23147=>11779,
-23148=>11780,
-23150=>11781,
-23151=>11782,
-23152=>11783,
-23153=>11784,
-23154=>11785,
-23155=>11786,
-23160=>11787,
-23161=>11788,
-23163=>11789,
-23164=>11790,
-23165=>11791,
-23166=>11792,
-23168=>11793,
-23169=>11794,
-23170=>11795,
-23171=>11796,
-23172=>11797,
-23173=>11798,
-23174=>11799,
-23175=>11800,
-23176=>11801,
-23177=>11802,
-23178=>11803,
-23179=>11804,
-23180=>11805,
-23181=>11806,
-23182=>11807,
-23183=>11808,
-23184=>11809,
-23185=>11810,
-23187=>11811,
-23188=>11812,
-23189=>11813,
-23190=>11814,
-23191=>11815,
-23192=>11816,
-23193=>11817,
-23196=>11818,
-23197=>11819,
-23198=>11820,
-23199=>11821,
-23200=>11822,
-23201=>11823,
-23202=>11824,
-23203=>11825,
-23204=>11826,
-23205=>11827,
-23206=>11828,
-23208=>11829,
-23209=>11830,
-23211=>11831,
-23212=>11832,
-23213=>11833,
-23214=>11834,
-23215=>11835,
-23216=>11836,
-23217=>11837,
-23220=>11838,
-23222=>11839,
-23223=>11840,
-23225=>11841,
-23226=>11842,
-23227=>11843,
-23228=>11844,
-23231=>11845,
-23232=>11846,
-23235=>11847,
-23236=>11848,
-23237=>11849,
-23238=>11850,
-23239=>11851,
-23240=>11852,
-23242=>11853,
-23243=>11854,
-23245=>11855,
-23246=>11856,
-23247=>11857,
-23248=>11858,
-23249=>11859,
-23251=>11860,
-23253=>11861,
-23257=>11862,
-23258=>11863,
-23259=>11864,
-23261=>11865,
-23262=>11866,
-23263=>11867,
-23266=>11868,
-23268=>11869,
-23269=>11870,
-23271=>11871,
-23272=>11872,
-23274=>11873,
-23276=>11874,
-23277=>11875,
-23278=>11876,
-23279=>11877,
-23280=>11878,
-23282=>11879,
-23283=>11880,
-23284=>11881,
-23286=>11882,
-23287=>11883,
-23288=>11884,
-23289=>11885,
-23290=>11886,
-23292=>11887,
-23293=>11888,
-23294=>11889,
-23295=>11890,
-23297=>11891,
-23298=>11892,
-23299=>11893,
-23300=>11894,
-23301=>11895,
-23302=>11896,
-23303=>11897,
-23306=>11898,
-23309=>11899,
-23310=>11900,
-23311=>11901,
-23312=>11902,
-23313=>11903,
-23314=>11904,
-23315=>11905,
-23316=>11906,
-23317=>11907,
-23320=>11908,
-23322=>11909,
-23323=>11910,
-23324=>11911,
-23325=>11912,
-23326=>11913,
-23327=>11914,
-23328=>11915,
-23330=>11916,
-23331=>11917,
-23332=>11918,
-23333=>11919,
-23334=>11920,
-23335=>11921,
-23336=>11922,
-23337=>11923,
-23339=>11924,
-23340=>11925,
-23341=>11926,
-23342=>11927,
-23343=>11928,
-23345=>11929,
-23347=>11930,
-23349=>11931,
-23350=>11932,
-23353=>11933,
-23354=>11934,
-23355=>11935,
-23356=>11936,
-23357=>11937,
-23358=>11938,
-23359=>11939,
-23361=>11940,
-23362=>11941,
-23363=>11942,
-23364=>11943,
-23365=>11944,
-23366=>11945,
-23367=>11946,
-23368=>11947,
-23369=>11948,
-23370=>11949,
-23371=>11950,
-23373=>11951,
-23374=>11952,
-23375=>11953,
-23378=>11954,
-23382=>11955,
-23390=>11956,
-23392=>11957,
-23393=>11958,
-23399=>11959,
-23400=>11960,
-23405=>11961,
-23406=>11962,
-23407=>11963,
-23410=>11964,
-23412=>11965,
-23414=>11966,
-23415=>11967,
-23417=>11968,
-23419=>11969,
-23420=>11970,
-23422=>11971,
-23426=>11972,
-23430=>11973,
-23434=>11974,
-23437=>11975,
-23438=>11976,
-23440=>11977,
-23441=>11978,
-23442=>11979,
-23444=>11980,
-23446=>11981,
-23455=>11982,
-23463=>11983,
-23464=>11984,
-23465=>11985,
-23468=>11986,
-23469=>11987,
-23470=>11988,
-23471=>11989,
-23473=>11990,
-23474=>11991,
-23479=>11992,
-23482=>11993,
-23483=>11994,
-23484=>11995,
-23488=>11996,
-23489=>11997,
-23491=>11998,
-23496=>11999,
-23497=>12000,
-23498=>12001,
-23499=>12002,
-23501=>12003,
-23502=>12004,
-23503=>12005,
-23505=>12006,
-23508=>12007,
-23509=>12008,
-23510=>12009,
-23511=>12010,
-23512=>12011,
-23513=>12012,
-23514=>12013,
-23515=>12014,
-23516=>12015,
-23520=>12016,
-23523=>12017,
-23530=>12018,
-23533=>12019,
-23535=>12020,
-23537=>12021,
-23538=>12022,
-23539=>12023,
-23540=>12024,
-23543=>12025,
-23549=>12026,
-23550=>12027,
-23552=>12028,
-23554=>12029,
-23555=>12030,
-23557=>12031,
-23564=>12032,
-23568=>12033,
-23570=>12034,
-23571=>12035,
-23575=>12036,
-23577=>12037,
-23579=>12038,
-23582=>12039,
-23583=>12040,
-23584=>12041,
-23585=>12042,
-23587=>12043,
-23590=>12044,
-23592=>12045,
-23593=>12046,
-23594=>12047,
-23595=>12048,
-23597=>12049,
-23598=>12050,
-23599=>12051,
-23600=>12052,
-23602=>12053,
-23603=>12054,
-23605=>12055,
-23606=>12056,
-23619=>12057,
-23620=>12058,
-23622=>12059,
-23623=>12060,
-23628=>12061,
-23629=>12062,
-23634=>12063,
-23635=>12064,
-23636=>12065,
-23638=>12066,
-23639=>12067,
-23640=>12068,
-23642=>12069,
-23643=>12070,
-23644=>12071,
-23645=>12072,
-23647=>12073,
-23655=>12074,
-23657=>12075,
-23658=>12076,
-23659=>12077,
-23661=>12078,
-23664=>12079,
-23666=>12080,
-23667=>12081,
-23668=>12082,
-23669=>12083,
-23670=>12084,
-23671=>12085,
-23672=>12086,
-23675=>12087,
-23676=>12088,
-23677=>12089,
-23678=>12090,
-23680=>12091,
-23683=>12092,
-23684=>12093,
-23685=>12094,
-23686=>12095,
-23687=>12096,
-23689=>12097,
-23690=>12098,
-23691=>12099,
-23694=>12100,
-23695=>12101,
-23698=>12102,
-23699=>12103,
-23701=>12104,
-23709=>12105,
-23710=>12106,
-23711=>12107,
-23712=>12108,
-23716=>12109,
-23717=>12110,
-23718=>12111,
-23719=>12112,
-23720=>12113,
-23722=>12114,
-23726=>12115,
-23727=>12116,
-23728=>12117,
-23730=>12118,
-23732=>12119,
-23734=>12120,
-23737=>12121,
-23738=>12122,
-23739=>12123,
-23740=>12124,
-23742=>12125,
-23744=>12126,
-23746=>12127,
-23747=>12128,
-23749=>12129,
-23750=>12130,
-23751=>12131,
-23752=>12132,
-23753=>12133,
-23754=>12134,
-23756=>12135,
-23757=>12136,
-23758=>12137,
-23759=>12138,
-23760=>12139,
-23761=>12140,
-23763=>12141,
-23764=>12142,
-23765=>12143,
-23766=>12144,
-23767=>12145,
-23768=>12146,
-23770=>12147,
-23771=>12148,
-23772=>12149,
-23773=>12150,
-23774=>12151,
-23775=>12152,
-23776=>12153,
-23778=>12154,
-23779=>12155,
-23783=>12156,
-23785=>12157,
-23787=>12158,
-23788=>12159,
-23790=>12160,
-23791=>12161,
-23793=>12162,
-23794=>12163,
-23795=>12164,
-23797=>12165,
-23799=>12166,
-23800=>12167,
-23801=>12168,
-23802=>12169,
-23804=>12170,
-23806=>12171,
-23807=>12172,
-23808=>12173,
-23809=>12174,
-23812=>12175,
-23813=>12176,
-23816=>12177,
-23817=>12178,
-23818=>12179,
-23819=>12180,
-23820=>12181,
-23823=>12182,
-23824=>12183,
-23825=>12184,
-23826=>12185,
-23827=>12186,
-23829=>12187,
-23832=>12188,
-23833=>12189,
-23834=>12190,
-23836=>12191,
-23837=>12192,
-23839=>12193,
-23840=>12194,
-23841=>12195,
-23842=>12196,
-23843=>12197,
-23845=>12198,
-23848=>12199,
-23850=>12200,
-23851=>12201,
-23855=>12202,
-23856=>12203,
-23857=>12204,
-23858=>12205,
-23859=>12206,
-23861=>12207,
-23862=>12208,
-23863=>12209,
-23864=>12210,
-23865=>12211,
-23866=>12212,
-23867=>12213,
-23868=>12214,
-23871=>12215,
-23872=>12216,
-23873=>12217,
-23874=>12218,
-23875=>12219,
-23876=>12220,
-23877=>12221,
-23878=>12222,
-23880=>12223,
-23881=>12224,
-23885=>12225,
-23886=>12226,
-23887=>12227,
-23889=>12228,
-23890=>12229,
-23891=>12230,
-23892=>12231,
-23893=>12232,
-23894=>12233,
-23895=>12234,
-23897=>12235,
-23898=>12236,
-23900=>12237,
-23902=>12238,
-23903=>12239,
-23904=>12240,
-23905=>12241,
-23906=>12242,
-23907=>12243,
-23908=>12244,
-23909=>12245,
-23910=>12246,
-23911=>12247,
-23912=>12248,
-23914=>12249,
-23917=>12250,
-23918=>12251,
-23920=>12252,
-23921=>12253,
-23922=>12254,
-23923=>12255,
-23925=>12256,
-23926=>12257,
-23927=>12258,
-23928=>12259,
-23929=>12260,
-23930=>12261,
-23931=>12262,
-23932=>12263,
-23933=>12264,
-23934=>12265,
-23935=>12266,
-23936=>12267,
-23939=>12268,
-23941=>12269,
-23942=>12270,
-23944=>12271,
-23945=>12272,
-23946=>12273,
-23947=>12274,
-23948=>12275,
-23949=>12276,
-23950=>12277,
-23951=>12278,
-23952=>12279,
-23953=>12280,
-23954=>12281,
-23955=>12282,
-23956=>12283,
-23957=>12284,
-23958=>12285,
-23960=>12286,
-23962=>12287,
-23963=>12288,
-23964=>12289,
-23966=>12290,
-23967=>12291,
-23969=>12292,
-23970=>12293,
-23971=>12294,
-23972=>12295,
-23973=>12296,
-23974=>12297,
-23976=>12298,
-23977=>12299,
-23978=>12300,
-23979=>12301,
-23980=>12302,
-23981=>12303,
-23982=>12304,
-23983=>12305,
-23984=>12306,
-23985=>12307,
-23986=>12308,
-23987=>12309,
-23988=>12310,
-23989=>12311,
-23990=>12312,
-23993=>12313,
-23995=>12314,
-23997=>12315,
-23998=>12316,
-23999=>12317,
-24000=>12318,
-24001=>12319,
-24002=>12320,
-24003=>12321,
-24004=>12322,
-24006=>12323,
-24007=>12324,
-24008=>12325,
-24009=>12326,
-24010=>12327,
-24012=>12328,
-24014=>12329,
-24015=>12330,
-24016=>12331,
-24017=>12332,
-24019=>12333,
-24021=>12334,
-24022=>12335,
-24023=>12336,
-24024=>12337,
-24025=>12338,
-24026=>12339,
-24028=>12340,
-24031=>12341,
-24032=>12342,
-24035=>12343,
-24036=>12344,
-24042=>12345,
-24044=>12346,
-24045=>12347,
-24053=>12348,
-24054=>12349,
-24056=>12350,
-24057=>12351,
-24058=>12352,
-24059=>12353,
-24060=>12354,
-24063=>12355,
-24064=>12356,
-24068=>12357,
-24071=>12358,
-24073=>12359,
-24074=>12360,
-24075=>12361,
-24077=>12362,
-24078=>12363,
-24082=>12364,
-24083=>12365,
-24087=>12366,
-24094=>12367,
-24095=>12368,
-24096=>12369,
-24097=>12370,
-24098=>12371,
-24099=>12372,
-24100=>12373,
-24104=>12374,
-24105=>12375,
-24106=>12376,
-24108=>12377,
-24111=>12378,
-24112=>12379,
-24114=>12380,
-24116=>12381,
-24117=>12382,
-24121=>12383,
-24122=>12384,
-24126=>12385,
-24127=>12386,
-24129=>12387,
-24134=>12388,
-24135=>12389,
-24136=>12390,
-24137=>12391,
-24138=>12392,
-24139=>12393,
-24141=>12394,
-24142=>12395,
-24143=>12396,
-24144=>12397,
-24145=>12398,
-24146=>12399,
-24147=>12400,
-24150=>12401,
-24153=>12402,
-24154=>12403,
-24156=>12404,
-24157=>12405,
-24160=>12406,
-24164=>12407,
-24165=>12408,
-24166=>12409,
-24167=>12410,
-24168=>12411,
-24169=>12412,
-24170=>12413,
-24173=>12414,
-24174=>12415,
-24175=>12416,
-24176=>12417,
-24177=>12418,
-24181=>12419,
-24183=>12420,
-24193=>12421,
-24194=>12422,
-24195=>12423,
-24197=>12424,
-24200=>12425,
-24201=>12426,
-24204=>12427,
-24205=>12428,
-24206=>12429,
-24210=>12430,
-24216=>12431,
-24219=>12432,
-24221=>12433,
-24225=>12434,
-24226=>12435,
-24227=>12436,
-24228=>12437,
-24232=>12438,
-24233=>12439,
-24234=>12440,
-24236=>12441,
-24238=>12442,
-24239=>12443,
-24240=>12444,
-24241=>12445,
-24242=>12446,
-24244=>12447,
-24250=>12448,
-24251=>12449,
-24252=>12450,
-24253=>12451,
-24255=>12452,
-24256=>12453,
-24257=>12454,
-24258=>12455,
-24259=>12456,
-24260=>12457,
-24261=>12458,
-24262=>12459,
-24263=>12460,
-24264=>12461,
-24267=>12462,
-24268=>12463,
-24269=>12464,
-24270=>12465,
-24271=>12466,
-24272=>12467,
-24276=>12468,
-24277=>12469,
-24279=>12470,
-24280=>12471,
-24281=>12472,
-24282=>12473,
-24284=>12474,
-24285=>12475,
-24286=>12476,
-24292=>12477,
-24293=>12478,
-24294=>12479,
-24295=>12480,
-24297=>12481,
-24299=>12482,
-24301=>12483,
-24302=>12484,
-24303=>12485,
-24304=>12486,
-24305=>12487,
-24306=>12488,
-24309=>12489,
-24312=>12490,
-24313=>12491,
-24315=>12492,
-24316=>12493,
-24317=>12494,
-24325=>12495,
-24326=>12496,
-24327=>12497,
-24329=>12498,
-24332=>12499,
-24333=>12500,
-24334=>12501,
-24336=>12502,
-24338=>12503,
-24340=>12504,
-24342=>12505,
-24345=>12506,
-24346=>12507,
-24348=>12508,
-24349=>12509,
-24350=>12510,
-24353=>12511,
-24354=>12512,
-24355=>12513,
-24356=>12514,
-24360=>12515,
-24363=>12516,
-24364=>12517,
-24366=>12518,
-24368=>12519,
-24370=>12520,
-24372=>12521,
-24374=>12522,
-24375=>12523,
-24376=>12524,
-24379=>12525,
-24381=>12526,
-24382=>12527,
-24383=>12528,
-24385=>12529,
-24386=>12530,
-24387=>12531,
-24388=>12532,
-24389=>12533,
-24391=>12534,
-24393=>12535,
-24394=>12536,
-24395=>12537,
-24397=>12538,
-24399=>12539,
-24401=>12540,
-24404=>12541,
-24410=>12542,
-24411=>12543,
-24412=>12544,
-24414=>12545,
-24415=>12546,
-24416=>12547,
-24419=>12548,
-24421=>12549,
-24423=>12550,
-24424=>12551,
-24427=>12552,
-24430=>12553,
-24431=>12554,
-24434=>12555,
-24436=>12556,
-24437=>12557,
-24438=>12558,
-24440=>12559,
-24442=>12560,
-24445=>12561,
-24446=>12562,
-24447=>12563,
-24451=>12564,
-24454=>12565,
-24461=>12566,
-24462=>12567,
-24463=>12568,
-24467=>12569,
-24468=>12570,
-24470=>12571,
-24474=>12572,
-24475=>12573,
-24477=>12574,
-24479=>12575,
-24482=>12576,
-24483=>12577,
-24484=>12578,
-24485=>12579,
-24486=>12580,
-24487=>12581,
-24491=>12582,
-24492=>12583,
-24495=>12584,
-24496=>12585,
-24497=>12586,
-24498=>12587,
-24499=>12588,
-24500=>12589,
-24502=>12590,
-24504=>12591,
-24506=>12592,
-24507=>12593,
-24510=>12594,
-24511=>12595,
-24512=>12596,
-24513=>12597,
-24514=>12598,
-24519=>12599,
-24520=>12600,
-24522=>12601,
-24523=>12602,
-24526=>12603,
-24531=>12604,
-24532=>12605,
-24533=>12606,
-24538=>12607,
-24539=>12608,
-24540=>12609,
-24542=>12610,
-24543=>12611,
-24546=>12612,
-24547=>12613,
-24549=>12614,
-24550=>12615,
-24552=>12616,
-24553=>12617,
-24556=>12618,
-24559=>12619,
-24560=>12620,
-24562=>12621,
-24563=>12622,
-24564=>12623,
-24566=>12624,
-24567=>12625,
-24569=>12626,
-24570=>12627,
-24572=>12628,
-24583=>12629,
-24584=>12630,
-24585=>12631,
-24587=>12632,
-24588=>12633,
-24592=>12634,
-24593=>12635,
-24595=>12636,
-24599=>12637,
-24600=>12638,
-24602=>12639,
-24606=>12640,
-24607=>12641,
-24610=>12642,
-24611=>12643,
-24612=>12644,
-24620=>12645,
-24621=>12646,
-24622=>12647,
-24624=>12648,
-24625=>12649,
-24626=>12650,
-24627=>12651,
-24628=>12652,
-24630=>12653,
-24631=>12654,
-24632=>12655,
-24633=>12656,
-24634=>12657,
-24637=>12658,
-24638=>12659,
-24640=>12660,
-24644=>12661,
-24645=>12662,
-24646=>12663,
-24647=>12664,
-24648=>12665,
-24649=>12666,
-24650=>12667,
-24652=>12668,
-24654=>12669,
-24655=>12670,
-24657=>12671,
-24659=>12672,
-24660=>12673,
-24662=>12674,
-24663=>12675,
-24664=>12676,
-24667=>12677,
-24668=>12678,
-24670=>12679,
-24671=>12680,
-24672=>12681,
-24673=>12682,
-24677=>12683,
-24678=>12684,
-24686=>12685,
-24689=>12686,
-24690=>12687,
-24692=>12688,
-24693=>12689,
-24695=>12690,
-24702=>12691,
-24704=>12692,
-24705=>12693,
-24706=>12694,
-24709=>12695,
-24710=>12696,
-24711=>12697,
-24712=>12698,
-24714=>12699,
-24715=>12700,
-24718=>12701,
-24719=>12702,
-24720=>12703,
-24721=>12704,
-24723=>12705,
-24725=>12706,
-24727=>12707,
-24728=>12708,
-24729=>12709,
-24732=>12710,
-24734=>12711,
-24737=>12712,
-24738=>12713,
-24740=>12714,
-24741=>12715,
-24743=>12716,
-24745=>12717,
-24746=>12718,
-24750=>12719,
-24752=>12720,
-24755=>12721,
-24759=>12722,
-24761=>12723,
-24762=>12724,
-24765=>12725,
-24766=>12726,
-24767=>12727,
-24768=>12728,
-24769=>12729,
-24770=>12730,
-24771=>12731,
-24772=>12732,
-24775=>12733,
-24776=>12734,
-24777=>12735,
-24780=>12736,
-24781=>12737,
-24782=>12738,
-24783=>12739,
-24784=>12740,
-24786=>12741,
-24787=>12742,
-24788=>12743,
-24790=>12744,
-24791=>12745,
-24793=>12746,
-24795=>12747,
-24798=>12748,
-24802=>12749,
-24803=>12750,
-24804=>12751,
-24805=>12752,
-24810=>12753,
-24821=>12754,
-24823=>12755,
-24824=>12756,
-24828=>12757,
-24829=>12758,
-24830=>12759,
-24831=>12760,
-24834=>12761,
-24835=>12762,
-24836=>12763,
-24837=>12764,
-24839=>12765,
-24842=>12766,
-24843=>12767,
-24844=>12768,
-24848=>12769,
-24849=>12770,
-24850=>12771,
-24851=>12772,
-24852=>12773,
-24854=>12774,
-24855=>12775,
-24856=>12776,
-24857=>12777,
-24861=>12778,
-24862=>12779,
-24865=>12780,
-24866=>12781,
-24869=>12782,
-24872=>12783,
-24873=>12784,
-24874=>12785,
-24876=>12786,
-24877=>12787,
-24878=>12788,
-24879=>12789,
-24880=>12790,
-24881=>12791,
-24882=>12792,
-24883=>12793,
-24885=>12794,
-24886=>12795,
-24888=>12796,
-24889=>12797,
-24890=>12798,
-24891=>12799,
-24892=>12800,
-24893=>12801,
-24896=>12802,
-24897=>12803,
-24898=>12804,
-24899=>12805,
-24900=>12806,
-24901=>12807,
-24902=>12808,
-24903=>12809,
-24905=>12810,
-24909=>12811,
-24911=>12812,
-24912=>12813,
-24914=>12814,
-24915=>12815,
-24916=>12816,
-24918=>12817,
-24919=>12818,
-24921=>12819,
-24923=>12820,
-24924=>12821,
-24926=>12822,
-24928=>12823,
-24929=>12824,
-24933=>12825,
-24934=>12826,
-24937=>12827,
-24940=>12828,
-24941=>12829,
-24943=>12830,
-24945=>12831,
-24946=>12832,
-24948=>12833,
-24952=>12834,
-24953=>12835,
-24954=>12836,
-24955=>12837,
-24956=>12838,
-24957=>12839,
-24958=>12840,
-24959=>12841,
-24960=>12842,
-24961=>12843,
-24963=>12844,
-24964=>12845,
-24965=>12846,
-24966=>12847,
-24967=>12848,
-24968=>12849,
-24969=>12850,
-24972=>12851,
-24973=>12852,
-24975=>12853,
-24979=>12854,
-24981=>12855,
-24982=>12856,
-24983=>12857,
-24984=>12858,
-24985=>12859,
-24987=>12860,
-24988=>12861,
-24990=>12862,
-24991=>12863,
-24992=>12864,
-24993=>12865,
-24994=>12866,
-24995=>12867,
-24997=>12868,
-24998=>12869,
-25002=>12870,
-25005=>12871,
-25007=>12872,
-25008=>12873,
-25009=>12874,
-25011=>12875,
-25012=>12876,
-25013=>12877,
-25016=>12878,
-25017=>12879,
-25018=>12880,
-25019=>12881,
-25020=>12882,
-25021=>12883,
-25023=>12884,
-25024=>12885,
-25025=>12886,
-25027=>12887,
-25028=>12888,
-25029=>12889,
-25030=>12890,
-25037=>12891,
-25038=>12892,
-25039=>12893,
-25040=>12894,
-25043=>12895,
-25045=>12896,
-25046=>12897,
-25047=>12898,
-25048=>12899,
-25049=>12900,
-25050=>12901,
-25051=>12902,
-25052=>12903,
-25053=>12904,
-25056=>12905,
-25057=>12906,
-25058=>12907,
-25060=>12908,
-25061=>12909,
-25063=>12910,
-25065=>12911,
-25066=>12912,
-25067=>12913,
-25068=>12914,
-25069=>12915,
-25070=>12916,
-25071=>12917,
-25072=>12918,
-25073=>12919,
-25075=>12920,
-25076=>12921,
-25081=>12922,
-25083=>12923,
-25085=>12924,
-25089=>12925,
-25090=>12926,
-25091=>12927,
-25092=>12928,
-25093=>12929,
-25097=>12930,
-25107=>12931,
-25113=>12932,
-25116=>12933,
-25117=>12934,
-25118=>12935,
-25120=>12936,
-25123=>12937,
-25126=>12938,
-25128=>12939,
-25129=>12940,
-25131=>12941,
-25133=>12942,
-25135=>12943,
-25137=>12944,
-25141=>12945,
-12094=>12946,
-25142=>12946,
-25144=>12947,
-25145=>12948,
-25146=>12949,
-25147=>12950,
-25148=>12951,
-25154=>12952,
-25156=>12953,
-25157=>12954,
-25158=>12955,
-25162=>12956,
-25167=>12957,
-25168=>12958,
-25173=>12959,
-25174=>12960,
-25175=>12961,
-25177=>12962,
-25178=>12963,
-25180=>12964,
-25181=>12965,
-25182=>12966,
-25183=>12967,
-25184=>12968,
-25185=>12969,
-25186=>12970,
-25188=>12971,
-25189=>12972,
-25192=>12973,
-25201=>12974,
-25202=>12975,
-25204=>12976,
-25205=>12977,
-25207=>12978,
-25208=>12979,
-25210=>12980,
-25211=>12981,
-25213=>12982,
-25217=>12983,
-25218=>12984,
-25219=>12985,
-25221=>12986,
-25222=>12987,
-25223=>12988,
-25224=>12989,
-25227=>12990,
-25228=>12991,
-25229=>12992,
-25230=>12993,
-25231=>12994,
-25232=>12995,
-25236=>12996,
-25241=>12997,
-25244=>12998,
-25245=>12999,
-25246=>13000,
-25251=>13001,
-25254=>13002,
-25255=>13003,
-25257=>13004,
-25258=>13005,
-25261=>13006,
-25262=>13007,
-25263=>13008,
-25264=>13009,
-25266=>13010,
-25267=>13011,
-25268=>13012,
-25270=>13013,
-25271=>13014,
-25272=>13015,
-25274=>13016,
-25278=>13017,
-25280=>13018,
-25281=>13019,
-25283=>13020,
-25291=>13021,
-25295=>13022,
-25297=>13023,
-25301=>13024,
-25309=>13025,
-25310=>13026,
-25312=>13027,
-25313=>13028,
-25316=>13029,
-25322=>13030,
-25323=>13031,
-25328=>13032,
-25330=>13033,
-25333=>13034,
-25336=>13035,
-25337=>13036,
-25338=>13037,
-25339=>13038,
-25344=>13039,
-25347=>13040,
-25348=>13041,
-25349=>13042,
-25350=>13043,
-25354=>13044,
-25355=>13045,
-25356=>13046,
-25357=>13047,
-25359=>13048,
-25360=>13049,
-25362=>13050,
-25363=>13051,
-25364=>13052,
-25365=>13053,
-25367=>13054,
-25368=>13055,
-25369=>13056,
-25372=>13057,
-25382=>13058,
-25383=>13059,
-25385=>13060,
-25388=>13061,
-25389=>13062,
-25390=>13063,
-25392=>13064,
-25393=>13065,
-25395=>13066,
-25396=>13067,
-25397=>13068,
-25398=>13069,
-25399=>13070,
-25400=>13071,
-25403=>13072,
-25404=>13073,
-25407=>13074,
-25408=>13075,
-25409=>13076,
-25412=>13077,
-25415=>13078,
-25416=>13079,
-25418=>13080,
-25425=>13081,
-25426=>13082,
-25427=>13083,
-25428=>13084,
-25430=>13085,
-25431=>13086,
-25432=>13087,
-25433=>13088,
-25434=>13089,
-25435=>13090,
-25436=>13091,
-25437=>13092,
-25440=>13093,
-25444=>13094,
-25445=>13095,
-25446=>13096,
-25450=>13097,
-25452=>13098,
-25455=>13099,
-25456=>13100,
-25459=>13101,
-25460=>13102,
-25461=>13103,
-25464=>13104,
-25465=>13105,
-25468=>13106,
-25469=>13107,
-25470=>13108,
-25471=>13109,
-25473=>13110,
-25477=>13111,
-25478=>13112,
-25483=>13113,
-25485=>13114,
-25489=>13115,
-25491=>13116,
-25492=>13117,
-25493=>13118,
-25495=>13119,
-25497=>13120,
-25498=>13121,
-25499=>13122,
-25500=>13123,
-25501=>13124,
-25502=>13125,
-25503=>13126,
-25505=>13127,
-25508=>13128,
-25510=>13129,
-25515=>13130,
-25519=>13131,
-25521=>13132,
-25522=>13133,
-25525=>13134,
-25526=>13135,
-25529=>13136,
-25531=>13137,
-25533=>13138,
-25535=>13139,
-25537=>13140,
-25538=>13141,
-25539=>13142,
-25541=>13143,
-25543=>13144,
-25544=>13145,
-25546=>13146,
-25547=>13147,
-25548=>13148,
-25553=>13149,
-25555=>13150,
-25556=>13151,
-25557=>13152,
-25559=>13153,
-25560=>13154,
-25561=>13155,
-25563=>13156,
-25564=>13157,
-25565=>13158,
-25567=>13159,
-25570=>13160,
-25572=>13161,
-25573=>13162,
-25574=>13163,
-25575=>13164,
-25576=>13165,
-25579=>13166,
-25580=>13167,
-25583=>13168,
-25584=>13169,
-25585=>13170,
-25587=>13171,
-25589=>13172,
-25591=>13173,
-25593=>13174,
-25594=>13175,
-25595=>13176,
-25596=>13177,
-25598=>13178,
-25603=>13179,
-25604=>13180,
-25606=>13181,
-25607=>13182,
-25608=>13183,
-25609=>13184,
-25610=>13185,
-25614=>13186,
-25617=>13187,
-25618=>13188,
-25621=>13189,
-25622=>13190,
-25624=>13191,
-25625=>13192,
-25626=>13193,
-25629=>13194,
-25631=>13195,
-25634=>13196,
-25635=>13197,
-25636=>13198,
-25637=>13199,
-25639=>13200,
-25640=>13201,
-25641=>13202,
-25643=>13203,
-25646=>13204,
-25647=>13205,
-25648=>13206,
-25649=>13207,
-25650=>13208,
-25651=>13209,
-25653=>13210,
-25655=>13211,
-25656=>13212,
-25657=>13213,
-25659=>13214,
-25660=>13215,
-25662=>13216,
-25664=>13217,
-25666=>13218,
-25667=>13219,
-25673=>13220,
-25675=>13221,
-25676=>13222,
-25677=>13223,
-25678=>13224,
-25679=>13225,
-25680=>13226,
-25683=>13227,
-25685=>13228,
-25686=>13229,
-25687=>13230,
-25689=>13231,
-25690=>13232,
-25691=>13233,
-25693=>13234,
-25696=>13235,
-25697=>13236,
-25698=>13237,
-25699=>13238,
-25700=>13239,
-25701=>13240,
-25702=>13241,
-25704=>13242,
-25706=>13243,
-25707=>13244,
-25708=>13245,
-25710=>13246,
-25712=>13247,
-25713=>13248,
-25714=>13249,
-25716=>13250,
-25717=>13251,
-25719=>13252,
-25724=>13253,
-25725=>13254,
-25726=>13255,
-25727=>13256,
-25728=>13257,
-25729=>13258,
-25731=>13259,
-25734=>13260,
-25737=>13261,
-25738=>13262,
-25739=>13263,
-25740=>13264,
-25741=>13265,
-25742=>13266,
-25743=>13267,
-25744=>13268,
-25748=>13269,
-25751=>13270,
-25752=>13271,
-25754=>13272,
-25755=>13273,
-25756=>13274,
-25757=>13275,
-25760=>13276,
-25761=>13277,
-25762=>13278,
-25766=>13279,
-25767=>13280,
-25768=>13281,
-25770=>13282,
-25775=>13283,
-25777=>13284,
-25780=>13285,
-25782=>13286,
-25785=>13287,
-25789=>13288,
-25795=>13289,
-25798=>13290,
-25800=>13291,
-25801=>13292,
-25804=>13293,
-25807=>13294,
-25809=>13295,
-25811=>13296,
-25813=>13297,
-25814=>13298,
-25817=>13299,
-25819=>13300,
-25820=>13301,
-25821=>13302,
-25823=>13303,
-25825=>13304,
-25827=>13305,
-25829=>13306,
-25831=>13307,
-25832=>13308,
-25833=>13309,
-25834=>13310,
-25835=>13311,
-25837=>13312,
-25838=>13313,
-25843=>13314,
-25845=>13315,
-25846=>13316,
-25848=>13317,
-25849=>13318,
-25853=>13319,
-25855=>13320,
-25857=>13321,
-25858=>13322,
-25859=>13323,
-25861=>13324,
-25863=>13325,
-25864=>13326,
-25866=>13327,
-25867=>13328,
-25868=>13329,
-25869=>13330,
-25870=>13331,
-25872=>13332,
-25873=>13333,
-25875=>13334,
-25877=>13335,
-25879=>13336,
-25882=>13337,
-25884=>13338,
-25886=>13339,
-25887=>13340,
-25888=>13341,
-25889=>13342,
-25894=>13343,
-25895=>13344,
-25896=>13345,
-25897=>13346,
-25901=>13347,
-25904=>13348,
-25905=>13349,
-25906=>13350,
-25907=>13351,
-25911=>13352,
-25914=>13353,
-25916=>13354,
-25917=>13355,
-25920=>13356,
-25921=>13357,
-25922=>13358,
-25923=>13359,
-25924=>13360,
-25926=>13361,
-25927=>13362,
-25930=>13363,
-25931=>13364,
-25933=>13365,
-25934=>13366,
-25936=>13367,
-25938=>13368,
-25939=>13369,
-25940=>13370,
-25944=>13371,
-25946=>13372,
-25948=>13373,
-25951=>13374,
-25952=>13375,
-25953=>13376,
-25956=>13377,
-25957=>13378,
-25959=>13379,
-25960=>13380,
-25961=>13381,
-25962=>13382,
-25965=>13383,
-25966=>13384,
-25967=>13385,
-25969=>13386,
-25971=>13387,
-25974=>13388,
-25977=>13389,
-25978=>13390,
-25979=>13391,
-25980=>13392,
-25981=>13393,
-25982=>13394,
-25983=>13395,
-25984=>13396,
-25985=>13397,
-25988=>13398,
-25989=>13399,
-25990=>13400,
-25992=>13401,
-25993=>13402,
-25994=>13403,
-25997=>13404,
-25998=>13405,
-25999=>13406,
-26002=>13407,
-26004=>13408,
-26006=>13409,
-26008=>13410,
-26010=>13411,
-26013=>13412,
-26014=>13413,
-26016=>13414,
-26018=>13415,
-26019=>13416,
-26022=>13417,
-26024=>13418,
-26026=>13419,
-26030=>13420,
-26033=>13421,
-26034=>13422,
-26035=>13423,
-26036=>13424,
-26037=>13425,
-26038=>13426,
-26040=>13427,
-26042=>13428,
-26043=>13429,
-26046=>13430,
-26047=>13431,
-26048=>13432,
-26050=>13433,
-26055=>13434,
-26056=>13435,
-26057=>13436,
-26058=>13437,
-26061=>13438,
-26064=>13439,
-26065=>13440,
-26067=>13441,
-26068=>13442,
-26069=>13443,
-26072=>13444,
-26073=>13445,
-26074=>13446,
-26075=>13447,
-26076=>13448,
-26077=>13449,
-26078=>13450,
-26079=>13451,
-26081=>13452,
-26083=>13453,
-26084=>13454,
-26090=>13455,
-26091=>13456,
-26098=>13457,
-26099=>13458,
-26100=>13459,
-26101=>13460,
-26104=>13461,
-26105=>13462,
-26107=>13463,
-26108=>13464,
-26109=>13465,
-26110=>13466,
-26111=>13467,
-26113=>13468,
-26116=>13469,
-26117=>13470,
-26119=>13471,
-26120=>13472,
-26121=>13473,
-26123=>13474,
-26125=>13475,
-26128=>13476,
-26129=>13477,
-26130=>13478,
-26134=>13479,
-26135=>13480,
-26136=>13481,
-26138=>13482,
-26139=>13483,
-26140=>13484,
-26142=>13485,
-26145=>13486,
-26146=>13487,
-26147=>13488,
-26148=>13489,
-26150=>13490,
-26153=>13491,
-26154=>13492,
-26155=>13493,
-26156=>13494,
-26158=>13495,
-26160=>13496,
-26162=>13497,
-26163=>13498,
-26167=>13499,
-26168=>13500,
-26169=>13501,
-26170=>13502,
-26171=>13503,
-26173=>13504,
-26175=>13505,
-26176=>13506,
-26180=>13507,
-26181=>13508,
-26182=>13509,
-26183=>13510,
-26184=>13511,
-26185=>13512,
-26186=>13513,
-26189=>13514,
-26190=>13515,
-26192=>13516,
-26193=>13517,
-26200=>13518,
-26201=>13519,
-26203=>13520,
-26204=>13521,
-26206=>13522,
-26208=>13523,
-26210=>13524,
-26211=>13525,
-26213=>13526,
-26215=>13527,
-26217=>13528,
-26218=>13529,
-26219=>13530,
-26220=>13531,
-26221=>13532,
-26225=>13533,
-26226=>13534,
-26227=>13535,
-26229=>13536,
-26232=>13537,
-26233=>13538,
-26235=>13539,
-26236=>13540,
-26237=>13541,
-26239=>13542,
-26240=>13543,
-26241=>13544,
-26243=>13545,
-26245=>13546,
-26246=>13547,
-26250=>13548,
-26251=>13549,
-26253=>13550,
-26254=>13551,
-26255=>13552,
-26256=>13553,
-26258=>13554,
-26259=>13555,
-26260=>13556,
-26261=>13557,
-26264=>13558,
-26265=>13559,
-26266=>13560,
-26267=>13561,
-26268=>13562,
-26270=>13563,
-26271=>13564,
-26272=>13565,
-26273=>13566,
-26275=>13567,
-26276=>13568,
-26277=>13569,
-26278=>13570,
-26281=>13571,
-26282=>13572,
-26284=>13573,
-26285=>13574,
-26287=>13575,
-26288=>13576,
-26289=>13577,
-26290=>13578,
-26291=>13579,
-26293=>13580,
-26294=>13581,
-26295=>13582,
-26296=>13583,
-26298=>13584,
-26299=>13585,
-26300=>13586,
-26301=>13587,
-26303=>13588,
-26304=>13589,
-26305=>13590,
-26306=>13591,
-26307=>13592,
-26309=>13593,
-26312=>13594,
-26314=>13595,
-26315=>13596,
-26316=>13597,
-26317=>13598,
-26318=>13599,
-26319=>13600,
-26320=>13601,
-26321=>13602,
-26322=>13603,
-26323=>13604,
-26324=>13605,
-26325=>13606,
-26327=>13607,
-26328=>13608,
-26330=>13609,
-26334=>13610,
-26335=>13611,
-26337=>13612,
-26338=>13613,
-26339=>13614,
-26340=>13615,
-26341=>13616,
-26343=>13617,
-26344=>13618,
-26346=>13619,
-26347=>13620,
-26349=>13621,
-26350=>13622,
-26351=>13623,
-26353=>13624,
-26357=>13625,
-26358=>13626,
-26362=>13627,
-26363=>13628,
-26365=>13629,
-26369=>13630,
-26370=>13631,
-26372=>13632,
-26373=>13633,
-26374=>13634,
-26375=>13635,
-26380=>13636,
-26382=>13637,
-26383=>13638,
-26385=>13639,
-26386=>13640,
-26387=>13641,
-26390=>13642,
-26392=>13643,
-26393=>13644,
-26394=>13645,
-26396=>13646,
-26398=>13647,
-26400=>13648,
-26401=>13649,
-26402=>13650,
-26403=>13651,
-26404=>13652,
-26405=>13653,
-26409=>13654,
-26414=>13655,
-26416=>13656,
-26418=>13657,
-26419=>13658,
-26422=>13659,
-26423=>13660,
-26424=>13661,
-26425=>13662,
-26427=>13663,
-26428=>13664,
-26430=>13665,
-26431=>13666,
-26433=>13667,
-26436=>13668,
-26437=>13669,
-26439=>13670,
-26442=>13671,
-26443=>13672,
-26445=>13673,
-26450=>13674,
-26452=>13675,
-26453=>13676,
-26455=>13677,
-26456=>13678,
-26457=>13679,
-26458=>13680,
-26459=>13681,
-26461=>13682,
-26466=>13683,
-26467=>13684,
-26468=>13685,
-26470=>13686,
-26471=>13687,
-26475=>13688,
-26476=>13689,
-26478=>13690,
-26484=>13691,
-26486=>13692,
-26488=>13693,
-26489=>13694,
-26490=>13695,
-26491=>13696,
-26493=>13697,
-26496=>13698,
-26498=>13699,
-26499=>13700,
-26501=>13701,
-26502=>13702,
-26504=>13703,
-26506=>13704,
-26508=>13705,
-26509=>13706,
-26510=>13707,
-26511=>13708,
-26513=>13709,
-26514=>13710,
-26515=>13711,
-26516=>13712,
-26518=>13713,
-26521=>13714,
-26523=>13715,
-26527=>13716,
-26528=>13717,
-26529=>13718,
-26532=>13719,
-26534=>13720,
-26537=>13721,
-26540=>13722,
-26542=>13723,
-26545=>13724,
-26546=>13725,
-26548=>13726,
-26553=>13727,
-26554=>13728,
-26555=>13729,
-26556=>13730,
-26557=>13731,
-26558=>13732,
-26559=>13733,
-26560=>13734,
-26562=>13735,
-26565=>13736,
-26566=>13737,
-26567=>13738,
-26568=>13739,
-26569=>13740,
-26570=>13741,
-26571=>13742,
-26572=>13743,
-26573=>13744,
-26574=>13745,
-26581=>13746,
-26582=>13747,
-26583=>13748,
-26587=>13749,
-26591=>13750,
-26593=>13751,
-26595=>13752,
-26596=>13753,
-26598=>13754,
-26599=>13755,
-26600=>13756,
-26602=>13757,
-26603=>13758,
-26605=>13759,
-26606=>13760,
-26610=>13761,
-26613=>13762,
-26614=>13763,
-26615=>13764,
-26616=>13765,
-26617=>13766,
-26618=>13767,
-26619=>13768,
-26620=>13769,
-26622=>13770,
-26625=>13771,
-26626=>13772,
-26627=>13773,
-26628=>13774,
-26630=>13775,
-26637=>13776,
-26640=>13777,
-26642=>13778,
-26644=>13779,
-26645=>13780,
-26648=>13781,
-26649=>13782,
-26650=>13783,
-26651=>13784,
-26652=>13785,
-26654=>13786,
-26655=>13787,
-26656=>13788,
-26658=>13789,
-26659=>13790,
-26660=>13791,
-26661=>13792,
-26662=>13793,
-26663=>13794,
-26664=>13795,
-26667=>13796,
-26668=>13797,
-26669=>13798,
-26670=>13799,
-26671=>13800,
-26672=>13801,
-26673=>13802,
-26676=>13803,
-26677=>13804,
-26678=>13805,
-26682=>13806,
-26683=>13807,
-26687=>13808,
-26695=>13809,
-26699=>13810,
-26701=>13811,
-26703=>13812,
-26706=>13813,
-26710=>13814,
-26711=>13815,
-26712=>13816,
-26713=>13817,
-26714=>13818,
-26715=>13819,
-26716=>13820,
-26717=>13821,
-26718=>13822,
-26719=>13823,
-26730=>13824,
-26732=>13825,
-26733=>13826,
-26734=>13827,
-26735=>13828,
-26736=>13829,
-26737=>13830,
-26738=>13831,
-26739=>13832,
-26741=>13833,
-26744=>13834,
-26745=>13835,
-26746=>13836,
-26747=>13837,
-26748=>13838,
-26749=>13839,
-26750=>13840,
-26751=>13841,
-26752=>13842,
-26754=>13843,
-26756=>13844,
-26759=>13845,
-26760=>13846,
-26761=>13847,
-26762=>13848,
-26763=>13849,
-26764=>13850,
-26765=>13851,
-26766=>13852,
-26768=>13853,
-26769=>13854,
-26770=>13855,
-26772=>13856,
-26773=>13857,
-26774=>13858,
-26777=>13859,
-26778=>13860,
-26779=>13861,
-26780=>13862,
-26782=>13863,
-26784=>13864,
-26785=>13865,
-26787=>13866,
-26788=>13867,
-26789=>13868,
-26793=>13869,
-26794=>13870,
-26795=>13871,
-26796=>13872,
-26798=>13873,
-26801=>13874,
-26802=>13875,
-26804=>13876,
-26806=>13877,
-26807=>13878,
-26808=>13879,
-26809=>13880,
-26810=>13881,
-26811=>13882,
-26812=>13883,
-26813=>13884,
-26814=>13885,
-26815=>13886,
-26817=>13887,
-26819=>13888,
-26820=>13889,
-26821=>13890,
-26822=>13891,
-26823=>13892,
-26824=>13893,
-26826=>13894,
-26828=>13895,
-26830=>13896,
-26831=>13897,
-26832=>13898,
-26833=>13899,
-26835=>13900,
-26836=>13901,
-26841=>13902,
-26843=>13903,
-26844=>13904,
-26845=>13905,
-26846=>13906,
-26849=>13907,
-26850=>13908,
-26852=>13909,
-26853=>13910,
-26854=>13911,
-26856=>13912,
-26857=>13913,
-26858=>13914,
-26859=>13915,
-26860=>13916,
-26861=>13917,
-26863=>13918,
-26866=>13919,
-26867=>13920,
-26868=>13921,
-26870=>13922,
-26871=>13923,
-26872=>13924,
-26875=>13925,
-26877=>13926,
-26878=>13927,
-26879=>13928,
-26880=>13929,
-26882=>13930,
-26883=>13931,
-26884=>13932,
-26886=>13933,
-26887=>13934,
-26888=>13935,
-26889=>13936,
-26890=>13937,
-26892=>13938,
-26897=>13939,
-26899=>13940,
-26900=>13941,
-26901=>13942,
-26902=>13943,
-26903=>13944,
-26904=>13945,
-26905=>13946,
-26906=>13947,
-26907=>13948,
-26908=>13949,
-26909=>13950,
-26910=>13951,
-26913=>13952,
-26914=>13953,
-26915=>13954,
-26917=>13955,
-26918=>13956,
-26919=>13957,
-26920=>13958,
-26921=>13959,
-26922=>13960,
-26923=>13961,
-26924=>13962,
-26926=>13963,
-26927=>13964,
-26929=>13965,
-26930=>13966,
-26931=>13967,
-26933=>13968,
-26934=>13969,
-26935=>13970,
-26936=>13971,
-26938=>13972,
-26939=>13973,
-26940=>13974,
-26942=>13975,
-26944=>13976,
-26945=>13977,
-26947=>13978,
-26948=>13979,
-26949=>13980,
-26950=>13981,
-26951=>13982,
-26952=>13983,
-26953=>13984,
-26955=>13985,
-26956=>13986,
-26957=>13987,
-26958=>13988,
-26959=>13989,
-26960=>13990,
-26961=>13991,
-26962=>13992,
-26965=>13993,
-26966=>13994,
-26968=>13995,
-26969=>13996,
-26971=>13997,
-26972=>13998,
-26975=>13999,
-26977=>14000,
-26978=>14001,
-26980=>14002,
-26981=>14003,
-26983=>14004,
-26985=>14005,
-26986=>14006,
-26988=>14007,
-26991=>14008,
-26992=>14009,
-26994=>14010,
-26995=>14011,
-26996=>14012,
-26998=>14013,
-27002=>14014,
-27003=>14015,
-27005=>14016,
-27006=>14017,
-27007=>14018,
-27009=>14019,
-27011=>14020,
-27013=>14021,
-27018=>14022,
-27019=>14023,
-27020=>14024,
-27022=>14025,
-27023=>14026,
-27024=>14027,
-27025=>14028,
-27026=>14029,
-27027=>14030,
-27030=>14031,
-27031=>14032,
-27033=>14033,
-27034=>14034,
-27037=>14035,
-27038=>14036,
-27039=>14037,
-27040=>14038,
-27041=>14039,
-27042=>14040,
-27043=>14041,
-27044=>14042,
-27045=>14043,
-27046=>14044,
-27049=>14045,
-27052=>14046,
-27055=>14047,
-27056=>14048,
-27058=>14049,
-27059=>14050,
-27061=>14051,
-27062=>14052,
-27064=>14053,
-27065=>14054,
-27066=>14055,
-27068=>14056,
-27069=>14057,
-27070=>14058,
-27072=>14059,
-27074=>14060,
-27075=>14061,
-27076=>14062,
-27077=>14063,
-27078=>14064,
-27079=>14065,
-27080=>14066,
-27081=>14067,
-27087=>14068,
-27089=>14069,
-27090=>14070,
-27091=>14071,
-27093=>14072,
-27094=>14073,
-27095=>14074,
-27096=>14075,
-27097=>14076,
-27098=>14077,
-27100=>14078,
-27101=>14079,
-27102=>14080,
-27105=>14081,
-27106=>14082,
-27107=>14083,
-27108=>14084,
-27109=>14085,
-27110=>14086,
-27112=>14087,
-27113=>14088,
-27114=>14089,
-27115=>14090,
-27116=>14091,
-27118=>14092,
-27119=>14093,
-27120=>14094,
-27121=>14095,
-27124=>14096,
-27125=>14097,
-27126=>14098,
-27127=>14099,
-27128=>14100,
-27129=>14101,
-27130=>14102,
-27131=>14103,
-27132=>14104,
-27134=>14105,
-27136=>14106,
-27139=>14107,
-27140=>14108,
-27142=>14109,
-27143=>14110,
-27144=>14111,
-27145=>14112,
-27147=>14113,
-27148=>14114,
-27149=>14115,
-27150=>14116,
-27151=>14117,
-27152=>14118,
-27153=>14119,
-27154=>14120,
-27156=>14121,
-27157=>14122,
-27158=>14123,
-27162=>14124,
-27163=>14125,
-27164=>14126,
-27165=>14127,
-27168=>14128,
-27170=>14129,
-27172=>14130,
-27173=>14131,
-27174=>14132,
-27175=>14133,
-27177=>14134,
-27179=>14135,
-27180=>14136,
-27181=>14137,
-27182=>14138,
-27184=>14139,
-27186=>14140,
-27187=>14141,
-27188=>14142,
-27190=>14143,
-27191=>14144,
-27195=>14145,
-27196=>14146,
-27199=>14147,
-27200=>14148,
-27201=>14149,
-27202=>14150,
-27203=>14151,
-27205=>14152,
-27206=>14153,
-27209=>14154,
-27210=>14155,
-27212=>14156,
-27213=>14157,
-27214=>14158,
-27215=>14159,
-27217=>14160,
-27218=>14161,
-27219=>14162,
-27220=>14163,
-27221=>14164,
-27222=>14165,
-27223=>14166,
-27226=>14167,
-27228=>14168,
-27229=>14169,
-27230=>14170,
-27232=>14171,
-27235=>14172,
-27236=>14173,
-27238=>14174,
-27239=>14175,
-27240=>14176,
-27241=>14177,
-27242=>14178,
-27243=>14179,
-27244=>14180,
-27245=>14181,
-27246=>14182,
-27247=>14183,
-27248=>14184,
-27250=>14185,
-27251=>14186,
-27252=>14187,
-27253=>14188,
-27254=>14189,
-27255=>14190,
-27256=>14191,
-27258=>14192,
-27259=>14193,
-27261=>14194,
-27262=>14195,
-27263=>14196,
-27265=>14197,
-27266=>14198,
-27267=>14199,
-27269=>14200,
-27270=>14201,
-27271=>14202,
-27272=>14203,
-27274=>14204,
-27275=>14205,
-27276=>14206,
-27277=>14207,
-27279=>14208,
-27282=>14209,
-27283=>14210,
-27285=>14211,
-27286=>14212,
-27288=>14213,
-27289=>14214,
-27290=>14215,
-27291=>14216,
-27293=>14217,
-27294=>14218,
-27295=>14219,
-27297=>14220,
-27300=>14221,
-27301=>14222,
-27302=>14223,
-27303=>14224,
-27304=>14225,
-27306=>14226,
-27309=>14227,
-27310=>14228,
-27312=>14229,
-27313=>14230,
-27314=>14231,
-27316=>14232,
-27317=>14233,
-27318=>14234,
-27319=>14235,
-27321=>14236,
-27322=>14237,
-27324=>14238,
-27325=>14239,
-27326=>14240,
-27327=>14241,
-27328=>14242,
-27329=>14243,
-27330=>14244,
-27332=>14245,
-27333=>14246,
-27334=>14247,
-27335=>14248,
-27336=>14249,
-27337=>14250,
-27338=>14251,
-27339=>14252,
-27340=>14253,
-27341=>14254,
-27342=>14255,
-27343=>14256,
-27344=>14257,
-27345=>14258,
-27346=>14259,
-27348=>14260,
-27349=>14261,
-27350=>14262,
-27351=>14263,
-27352=>14264,
-27353=>14265,
-27356=>14266,
-27360=>14267,
-27361=>14268,
-27362=>14269,
-27363=>14270,
-27364=>14271,
-27365=>14272,
-27366=>14273,
-27369=>14274,
-27371=>14275,
-27373=>14276,
-27374=>14277,
-27375=>14278,
-27376=>14279,
-27377=>14280,
-27378=>14281,
-27380=>14282,
-27381=>14283,
-27382=>14284,
-27383=>14285,
-27385=>14286,
-27386=>14287,
-27388=>14288,
-27389=>14289,
-27390=>14290,
-27391=>14291,
-27392=>14292,
-27393=>14293,
-27394=>14294,
-27395=>14295,
-27397=>14296,
-27398=>14297,
-27399=>14298,
-27400=>14299,
-27401=>14300,
-27403=>14301,
-27404=>14302,
-27405=>14303,
-27406=>14304,
-27408=>14305,
-27409=>14306,
-27411=>14307,
-27412=>14308,
-27413=>14309,
-27415=>14310,
-27416=>14311,
-27417=>14312,
-27418=>14313,
-27419=>14314,
-27420=>14315,
-27421=>14316,
-27423=>14317,
-27429=>14318,
-27430=>14319,
-27432=>14320,
-27433=>14321,
-27434=>14322,
-27435=>14323,
-27436=>14324,
-27437=>14325,
-27438=>14326,
-27439=>14327,
-27440=>14328,
-27441=>14329,
-27443=>14330,
-27444=>14331,
-27445=>14332,
-27446=>14333,
-27448=>14334,
-27451=>14335,
-27452=>14336,
-27455=>14337,
-27456=>14338,
-27457=>14339,
-27458=>14340,
-27460=>14341,
-27461=>14342,
-27464=>14343,
-27466=>14344,
-27467=>14345,
-27469=>14346,
-27470=>14347,
-27471=>14348,
-27473=>14349,
-27474=>14350,
-27475=>14351,
-27476=>14352,
-27477=>14353,
-27478=>14354,
-27479=>14355,
-27480=>14356,
-27482=>14357,
-27483=>14358,
-27484=>14359,
-27485=>14360,
-27486=>14361,
-27488=>14362,
-27496=>14363,
-27497=>14364,
-27499=>14365,
-27500=>14366,
-27501=>14367,
-27502=>14368,
-27503=>14369,
-27504=>14370,
-27505=>14371,
-27507=>14372,
-27508=>14373,
-27509=>14374,
-27510=>14375,
-27514=>14376,
-27517=>14377,
-27518=>14378,
-27519=>14379,
-27520=>14380,
-27525=>14381,
-27528=>14382,
-27532=>14383,
-27534=>14384,
-27535=>14385,
-27536=>14386,
-27537=>14387,
-27540=>14388,
-27541=>14389,
-27543=>14390,
-27545=>14391,
-27548=>14392,
-27549=>14393,
-27551=>14394,
-27552=>14395,
-27554=>14396,
-27555=>14397,
-27557=>14398,
-27558=>14399,
-27559=>14400,
-27560=>14401,
-27561=>14402,
-27564=>14403,
-27565=>14404,
-27568=>14405,
-27569=>14406,
-27574=>14407,
-27576=>14408,
-27577=>14409,
-27580=>14410,
-27581=>14411,
-27582=>14412,
-27584=>14413,
-27587=>14414,
-27588=>14415,
-27591=>14416,
-27592=>14417,
-27593=>14418,
-27594=>14419,
-27596=>14420,
-27598=>14421,
-27600=>14422,
-27601=>14423,
-27608=>14424,
-27610=>14425,
-27612=>14426,
-27613=>14427,
-27614=>14428,
-27615=>14429,
-27616=>14430,
-27618=>14431,
-27619=>14432,
-27620=>14433,
-27621=>14434,
-27622=>14435,
-27623=>14436,
-27624=>14437,
-27625=>14438,
-27628=>14439,
-27629=>14440,
-27630=>14441,
-27632=>14442,
-27633=>14443,
-27634=>14444,
-27636=>14445,
-27638=>14446,
-27639=>14447,
-27640=>14448,
-27642=>14449,
-27643=>14450,
-27644=>14451,
-27646=>14452,
-27648=>14453,
-27649=>14454,
-27650=>14455,
-27651=>14456,
-27652=>14457,
-27657=>14458,
-27658=>14459,
-27659=>14460,
-27662=>14461,
-27666=>14462,
-27671=>14463,
-27676=>14464,
-27677=>14465,
-27678=>14466,
-27680=>14467,
-27685=>14468,
-27693=>14469,
-27697=>14470,
-27699=>14471,
-27702=>14472,
-27703=>14473,
-27705=>14474,
-27706=>14475,
-27707=>14476,
-27708=>14477,
-27710=>14478,
-27711=>14479,
-27715=>14480,
-27716=>14481,
-27717=>14482,
-27720=>14483,
-27723=>14484,
-27724=>14485,
-27725=>14486,
-27726=>14487,
-27727=>14488,
-27729=>14489,
-27730=>14490,
-27731=>14491,
-27734=>14492,
-27736=>14493,
-27737=>14494,
-27738=>14495,
-27746=>14496,
-27747=>14497,
-27749=>14498,
-27750=>14499,
-27751=>14500,
-27755=>14501,
-27756=>14502,
-27757=>14503,
-27758=>14504,
-27759=>14505,
-27761=>14506,
-27763=>14507,
-27765=>14508,
-27767=>14509,
-27768=>14510,
-27770=>14511,
-27771=>14512,
-27772=>14513,
-27775=>14514,
-27776=>14515,
-27780=>14516,
-27783=>14517,
-27786=>14518,
-27787=>14519,
-27789=>14520,
-27790=>14521,
-27793=>14522,
-27794=>14523,
-27797=>14524,
-27798=>14525,
-27799=>14526,
-27800=>14527,
-27802=>14528,
-27804=>14529,
-27805=>14530,
-27806=>14531,
-27808=>14532,
-27810=>14533,
-27816=>14534,
-27820=>14535,
-27823=>14536,
-27824=>14537,
-27828=>14538,
-27829=>14539,
-27830=>14540,
-27831=>14541,
-27834=>14542,
-27840=>14543,
-27841=>14544,
-27842=>14545,
-27843=>14546,
-27846=>14547,
-27847=>14548,
-27848=>14549,
-27851=>14550,
-27853=>14551,
-27854=>14552,
-27855=>14553,
-27857=>14554,
-27858=>14555,
-27864=>14556,
-27865=>14557,
-27866=>14558,
-27868=>14559,
-27869=>14560,
-27871=>14561,
-27876=>14562,
-27878=>14563,
-27879=>14564,
-27881=>14565,
-27884=>14566,
-27885=>14567,
-27890=>14568,
-27892=>14569,
-27897=>14570,
-27903=>14571,
-27904=>14572,
-27906=>14573,
-27907=>14574,
-27909=>14575,
-27910=>14576,
-27912=>14577,
-27913=>14578,
-27914=>14579,
-27917=>14580,
-27919=>14581,
-27920=>14582,
-27921=>14583,
-27923=>14584,
-27924=>14585,
-27925=>14586,
-27926=>14587,
-27928=>14588,
-27932=>14589,
-27933=>14590,
-27935=>14591,
-27936=>14592,
-27937=>14593,
-27938=>14594,
-27939=>14595,
-27940=>14596,
-27942=>14597,
-27944=>14598,
-27945=>14599,
-27948=>14600,
-27949=>14601,
-27951=>14602,
-27952=>14603,
-27956=>14604,
-27958=>14605,
-27959=>14606,
-27960=>14607,
-27962=>14608,
-27967=>14609,
-27968=>14610,
-27970=>14611,
-27972=>14612,
-27977=>14613,
-27980=>14614,
-27984=>14615,
-27989=>14616,
-27990=>14617,
-27991=>14618,
-27992=>14619,
-27995=>14620,
-27997=>14621,
-27999=>14622,
-28001=>14623,
-28002=>14624,
-28004=>14625,
-28005=>14626,
-28007=>14627,
-28008=>14628,
-28011=>14629,
-28012=>14630,
-28013=>14631,
-28016=>14632,
-28017=>14633,
-28018=>14634,
-28019=>14635,
-28021=>14636,
-28022=>14637,
-28026=>14638,
-28027=>14639,
-28029=>14640,
-28030=>14641,
-28031=>14642,
-28032=>14643,
-28033=>14644,
-28035=>14645,
-28036=>14646,
-28038=>14647,
-28042=>14648,
-28043=>14649,
-28045=>14650,
-28047=>14651,
-28048=>14652,
-28050=>14653,
-28054=>14654,
-28055=>14655,
-28056=>14656,
-28057=>14657,
-28058=>14658,
-28060=>14659,
-28066=>14660,
-28069=>14661,
-28076=>14662,
-28077=>14663,
-28080=>14664,
-28081=>14665,
-28083=>14666,
-28084=>14667,
-28086=>14668,
-28087=>14669,
-28089=>14670,
-28090=>14671,
-28091=>14672,
-28092=>14673,
-28093=>14674,
-28094=>14675,
-28097=>14676,
-28098=>14677,
-28099=>14678,
-28104=>14679,
-28105=>14680,
-28106=>14681,
-28109=>14682,
-28110=>14683,
-28111=>14684,
-28112=>14685,
-28114=>14686,
-28115=>14687,
-28116=>14688,
-28117=>14689,
-28119=>14690,
-28122=>14691,
-28123=>14692,
-28124=>14693,
-28127=>14694,
-28130=>14695,
-28131=>14696,
-28133=>14697,
-28135=>14698,
-28136=>14699,
-28137=>14700,
-28141=>14701,
-28143=>14702,
-28144=>14703,
-28146=>14704,
-28148=>14705,
-28152=>14706,
-28157=>14707,
-28158=>14708,
-28159=>14709,
-28160=>14710,
-28161=>14711,
-28162=>14712,
-28163=>14713,
-28164=>14714,
-28166=>14715,
-28167=>14716,
-28168=>14717,
-28169=>14718,
-28171=>14719,
-28175=>14720,
-28178=>14721,
-28179=>14722,
-28181=>14723,
-28184=>14724,
-28185=>14725,
-28187=>14726,
-28188=>14727,
-28190=>14728,
-28191=>14729,
-28194=>14730,
-28199=>14731,
-28200=>14732,
-28202=>14733,
-28206=>14734,
-28208=>14735,
-28209=>14736,
-28211=>14737,
-28213=>14738,
-28214=>14739,
-28215=>14740,
-28217=>14741,
-28219=>14742,
-28220=>14743,
-28221=>14744,
-28223=>14745,
-28224=>14746,
-28225=>14747,
-28226=>14748,
-28229=>14749,
-28230=>14750,
-28231=>14751,
-28232=>14752,
-28233=>14753,
-28234=>14754,
-28235=>14755,
-28236=>14756,
-28239=>14757,
-28240=>14758,
-28241=>14759,
-28242=>14760,
-28245=>14761,
-28247=>14762,
-28249=>14763,
-28250=>14764,
-28252=>14765,
-28253=>14766,
-28256=>14767,
-28257=>14768,
-28258=>14769,
-28259=>14770,
-28260=>14771,
-28261=>14772,
-28262=>14773,
-28263=>14774,
-28264=>14775,
-28265=>14776,
-28266=>14777,
-28268=>14778,
-28269=>14779,
-28272=>14780,
-28273=>14781,
-28274=>14782,
-28275=>14783,
-28276=>14784,
-28277=>14785,
-28278=>14786,
-28279=>14787,
-28280=>14788,
-28281=>14789,
-28282=>14790,
-28283=>14791,
-28284=>14792,
-28285=>14793,
-28288=>14794,
-28289=>14795,
-28290=>14796,
-28292=>14797,
-28295=>14798,
-28296=>14799,
-28298=>14800,
-28299=>14801,
-28300=>14802,
-28301=>14803,
-28302=>14804,
-28305=>14805,
-28306=>14806,
-28307=>14807,
-28308=>14808,
-28309=>14809,
-28311=>14810,
-28313=>14811,
-28314=>14812,
-28315=>14813,
-28318=>14814,
-28320=>14815,
-28321=>14816,
-28323=>14817,
-28324=>14818,
-28326=>14819,
-28328=>14820,
-28329=>14821,
-28331=>14822,
-28332=>14823,
-28333=>14824,
-28334=>14825,
-28336=>14826,
-28339=>14827,
-28341=>14828,
-28344=>14829,
-28345=>14830,
-28348=>14831,
-28350=>14832,
-28351=>14833,
-28352=>14834,
-28355=>14835,
-28358=>14836,
-28360=>14837,
-28361=>14838,
-28362=>14839,
-28365=>14840,
-28368=>14841,
-28370=>14842,
-28374=>14843,
-28376=>14844,
-28377=>14845,
-28379=>14846,
-28380=>14847,
-28381=>14848,
-28387=>14849,
-28391=>14850,
-28394=>14851,
-28395=>14852,
-28397=>14853,
-28398=>14854,
-28400=>14855,
-28401=>14856,
-28403=>14857,
-28405=>14858,
-28406=>14859,
-28410=>14860,
-28411=>14861,
-28412=>14862,
-28413=>14863,
-28414=>14864,
-28416=>14865,
-28419=>14866,
-28420=>14867,
-28421=>14868,
-28423=>14869,
-28424=>14870,
-28426=>14871,
-28427=>14872,
-28428=>14873,
-28429=>14874,
-28430=>14875,
-28432=>14876,
-28433=>14877,
-28434=>14878,
-28438=>14879,
-28439=>14880,
-28440=>14881,
-28441=>14882,
-28443=>14883,
-28444=>14884,
-28445=>14885,
-28446=>14886,
-28447=>14887,
-28449=>14888,
-28453=>14889,
-28454=>14890,
-28455=>14891,
-28456=>14892,
-28462=>14893,
-28464=>14894,
-28468=>14895,
-28469=>14896,
-28471=>14897,
-28473=>14898,
-28474=>14899,
-28475=>14900,
-28476=>14901,
-28477=>14902,
-28480=>14903,
-28482=>14904,
-28483=>14905,
-28484=>14906,
-28485=>14907,
-28488=>14908,
-28489=>14909,
-28490=>14910,
-28492=>14911,
-28494=>14912,
-28495=>14913,
-28496=>14914,
-28498=>14915,
-28499=>14916,
-28501=>14917,
-28502=>14918,
-28503=>14919,
-28506=>14920,
-28507=>14921,
-28509=>14922,
-28511=>14923,
-28512=>14924,
-28513=>14925,
-28515=>14926,
-28517=>14927,
-28519=>14928,
-28520=>14929,
-28521=>14930,
-28522=>14931,
-28523=>14932,
-28524=>14933,
-28529=>14934,
-28531=>14935,
-28533=>14936,
-28534=>14937,
-28537=>14938,
-28539=>14939,
-28541=>14940,
-28542=>14941,
-28545=>14942,
-28546=>14943,
-28547=>14944,
-28549=>14945,
-28554=>14946,
-28555=>14947,
-28559=>14948,
-28560=>14949,
-28561=>14950,
-28562=>14951,
-28563=>14952,
-28564=>14953,
-28565=>14954,
-28566=>14955,
-28568=>14956,
-28569=>14957,
-28570=>14958,
-28571=>14959,
-28573=>14960,
-28574=>14961,
-28575=>14962,
-28578=>14963,
-28579=>14964,
-28581=>14965,
-28582=>14966,
-28584=>14967,
-28586=>14968,
-28587=>14969,
-28588=>14970,
-28589=>14971,
-28591=>14972,
-28592=>14973,
-28594=>14974,
-28596=>14975,
-28597=>14976,
-28599=>14977,
-28600=>14978,
-28602=>14979,
-28603=>14980,
-28604=>14981,
-28605=>14982,
-28606=>14983,
-28607=>14984,
-28612=>14985,
-28613=>14986,
-28614=>14987,
-28615=>14988,
-28616=>14989,
-28618=>14990,
-28619=>14991,
-28620=>14992,
-28621=>14993,
-28622=>14994,
-28623=>14995,
-28624=>14996,
-28627=>14997,
-28628=>14998,
-28630=>14999,
-28631=>15000,
-28633=>15001,
-28634=>15002,
-28636=>15003,
-28637=>15004,
-28642=>15005,
-28643=>15006,
-28645=>15007,
-28646=>15008,
-28647=>15009,
-28648=>15010,
-28649=>15011,
-28650=>15012,
-28652=>15013,
-28653=>15014,
-28658=>15015,
-28659=>15016,
-28660=>15017,
-28661=>15018,
-28662=>15019,
-28663=>15020,
-28664=>15021,
-28665=>15022,
-28667=>15023,
-28669=>15024,
-28671=>15025,
-28672=>15026,
-28673=>15027,
-28674=>15028,
-28675=>15029,
-28676=>15030,
-28679=>15031,
-28680=>15032,
-28682=>15033,
-28684=>15034,
-28685=>15035,
-28686=>15036,
-28688=>15037,
-28690=>15038,
-28691=>15039,
-28692=>15040,
-28694=>15041,
-28695=>15042,
-28697=>15043,
-28700=>15044,
-28702=>15045,
-28705=>15046,
-28706=>15047,
-28708=>15048,
-28709=>15049,
-28710=>15050,
-28713=>15051,
-28714=>15052,
-28715=>15053,
-28716=>15054,
-28717=>15055,
-28718=>15056,
-28719=>15057,
-28721=>15058,
-28723=>15059,
-28724=>15060,
-28726=>15061,
-28727=>15062,
-28728=>15063,
-28730=>15064,
-28731=>15065,
-28732=>15066,
-28733=>15067,
-28735=>15068,
-28736=>15069,
-28737=>15070,
-28738=>15071,
-28741=>15072,
-28742=>15073,
-28743=>15074,
-28744=>15075,
-28745=>15076,
-28746=>15077,
-28747=>15078,
-28749=>15079,
-28750=>15080,
-28752=>15081,
-28754=>15082,
-28755=>15083,
-28756=>15084,
-28758=>15085,
-28759=>15086,
-28761=>15087,
-28762=>15088,
-28763=>15089,
-28764=>15090,
-28767=>15091,
-28768=>15092,
-28769=>15093,
-28770=>15094,
-28773=>15095,
-28774=>15096,
-28776=>15097,
-28777=>15098,
-28778=>15099,
-28782=>15100,
-28785=>15101,
-28786=>15102,
-28787=>15103,
-28788=>15104,
-28791=>15105,
-28793=>15106,
-28794=>15107,
-28795=>15108,
-28797=>15109,
-28801=>15110,
-28802=>15111,
-28803=>15112,
-28804=>15113,
-28806=>15114,
-28807=>15115,
-28808=>15116,
-28811=>15117,
-28812=>15118,
-28813=>15119,
-28815=>15120,
-28816=>15121,
-28817=>15122,
-28819=>15123,
-28823=>15124,
-28824=>15125,
-28826=>15126,
-28827=>15127,
-28830=>15128,
-28831=>15129,
-28832=>15130,
-28833=>15131,
-28834=>15132,
-28835=>15133,
-28836=>15134,
-28837=>15135,
-28838=>15136,
-28839=>15137,
-28840=>15138,
-28841=>15139,
-28842=>15140,
-28848=>15141,
-28850=>15142,
-28852=>15143,
-28853=>15144,
-28854=>15145,
-28858=>15146,
-28862=>15147,
-28863=>15148,
-28868=>15149,
-28869=>15150,
-28870=>15151,
-28871=>15152,
-28873=>15153,
-28875=>15154,
-28876=>15155,
-28877=>15156,
-28878=>15157,
-28880=>15158,
-28881=>15159,
-28882=>15160,
-28883=>15161,
-28884=>15162,
-28885=>15163,
-28886=>15164,
-28887=>15165,
-28890=>15166,
-28892=>15167,
-28893=>15168,
-28894=>15169,
-28896=>15170,
-28897=>15171,
-28898=>15172,
-28899=>15173,
-28901=>15174,
-28906=>15175,
-28910=>15176,
-28912=>15177,
-28913=>15178,
-28914=>15179,
-28915=>15180,
-28917=>15181,
-28918=>15182,
-28920=>15183,
-28922=>15184,
-28923=>15185,
-28924=>15186,
-28926=>15187,
-28927=>15188,
-28928=>15189,
-28929=>15190,
-28930=>15191,
-28931=>15192,
-28932=>15193,
-28933=>15194,
-28934=>15195,
-28935=>15196,
-28936=>15197,
-28939=>15198,
-28940=>15199,
-28941=>15200,
-28942=>15201,
-28943=>15202,
-28945=>15203,
-28946=>15204,
-28948=>15205,
-28951=>15206,
-28955=>15207,
-28956=>15208,
-28957=>15209,
-28958=>15210,
-28959=>15211,
-28960=>15212,
-28962=>15213,
-28963=>15214,
-28964=>15215,
-28965=>15216,
-28967=>15217,
-28968=>15218,
-28969=>15219,
-28970=>15220,
-28971=>15221,
-28972=>15222,
-28973=>15223,
-28974=>15224,
-28978=>15225,
-28979=>15226,
-28980=>15227,
-28981=>15228,
-28983=>15229,
-28984=>15230,
-28985=>15231,
-28986=>15232,
-28987=>15233,
-28988=>15234,
-28989=>15235,
-28990=>15236,
-28991=>15237,
-28992=>15238,
-28993=>15239,
-28994=>15240,
-28995=>15241,
-28996=>15242,
-28998=>15243,
-28999=>15244,
-29000=>15245,
-29003=>15246,
-29005=>15247,
-29007=>15248,
-29008=>15249,
-29009=>15250,
-29011=>15251,
-29012=>15252,
-29013=>15253,
-29014=>15254,
-29015=>15255,
-29016=>15256,
-29017=>15257,
-29018=>15258,
-29019=>15259,
-29021=>15260,
-29023=>15261,
-29024=>15262,
-29025=>15263,
-29027=>15264,
-29029=>15265,
-29034=>15266,
-29035=>15267,
-29037=>15268,
-29039=>15269,
-29040=>15270,
-29041=>15271,
-29044=>15272,
-29045=>15273,
-29046=>15274,
-29047=>15275,
-29049=>15276,
-29051=>15277,
-29052=>15278,
-29054=>15279,
-29055=>15280,
-29056=>15281,
-29057=>15282,
-29058=>15283,
-29059=>15284,
-29061=>15285,
-29062=>15286,
-29063=>15287,
-29064=>15288,
-29065=>15289,
-29067=>15290,
-29068=>15291,
-29069=>15292,
-29070=>15293,
-29072=>15294,
-29073=>15295,
-29075=>15296,
-29077=>15297,
-29078=>15298,
-29082=>15299,
-29083=>15300,
-29084=>15301,
-29085=>15302,
-29086=>15303,
-29089=>15304,
-29090=>15305,
-29091=>15306,
-29092=>15307,
-29093=>15308,
-29094=>15309,
-29095=>15310,
-29097=>15311,
-29098=>15312,
-29099=>15313,
-29101=>15314,
-29102=>15315,
-29103=>15316,
-29104=>15317,
-29106=>15318,
-29108=>15319,
-29110=>15320,
-29111=>15321,
-29112=>15322,
-29114=>15323,
-29115=>15324,
-29116=>15325,
-29117=>15326,
-29119=>15327,
-29120=>15328,
-29122=>15329,
-29124=>15330,
-29125=>15331,
-29126=>15332,
-29127=>15333,
-29129=>15334,
-29130=>15335,
-29131=>15336,
-29132=>15337,
-29133=>15338,
-29135=>15339,
-29136=>15340,
-29137=>15341,
-29139=>15342,
-29142=>15343,
-29143=>15344,
-29144=>15345,
-29146=>15346,
-29147=>15347,
-29149=>15348,
-29150=>15349,
-29153=>15350,
-29154=>15351,
-29155=>15352,
-29156=>15353,
-29160=>15354,
-29161=>15355,
-29162=>15356,
-29163=>15357,
-29164=>15358,
-29167=>15359,
-29168=>15360,
-29169=>15361,
-29170=>15362,
-29171=>15363,
-29173=>15364,
-29174=>15365,
-29175=>15366,
-29176=>15367,
-29178=>15368,
-29179=>15369,
-29181=>15370,
-29183=>15371,
-29184=>15372,
-29185=>15373,
-29186=>15374,
-29187=>15375,
-29188=>15376,
-29189=>15377,
-29191=>15378,
-29192=>15379,
-29193=>15380,
-29194=>15381,
-29195=>15382,
-29196=>15383,
-29198=>15384,
-29199=>15385,
-29201=>15386,
-29202=>15387,
-29203=>15388,
-29204=>15389,
-29205=>15390,
-29206=>15391,
-29207=>15392,
-29208=>15393,
-29209=>15394,
-29210=>15395,
-29212=>15396,
-29214=>15397,
-29215=>15398,
-29216=>15399,
-29217=>15400,
-29218=>15401,
-29219=>15402,
-29220=>15403,
-29221=>15404,
-29222=>15405,
-29223=>15406,
-29225=>15407,
-29227=>15408,
-29229=>15409,
-29230=>15410,
-29231=>15411,
-29235=>15412,
-29236=>15413,
-29244=>15414,
-29248=>15415,
-29249=>15416,
-29250=>15417,
-29251=>15418,
-29252=>15419,
-29253=>15420,
-29254=>15421,
-29257=>15422,
-29258=>15423,
-29259=>15424,
-29262=>15425,
-29263=>15426,
-29264=>15427,
-29265=>15428,
-29267=>15429,
-29268=>15430,
-29269=>15431,
-29271=>15432,
-29274=>15433,
-29276=>15434,
-29278=>15435,
-29280=>15436,
-29283=>15437,
-29284=>15438,
-29285=>15439,
-29288=>15440,
-29290=>15441,
-29291=>15442,
-29292=>15443,
-29293=>15444,
-29296=>15445,
-29297=>15446,
-29299=>15447,
-29300=>15448,
-29302=>15449,
-29303=>15450,
-29304=>15451,
-29307=>15452,
-29308=>15453,
-29314=>15454,
-29315=>15455,
-29317=>15456,
-29318=>15457,
-29319=>15458,
-29320=>15459,
-29321=>15460,
-29324=>15461,
-29326=>15462,
-29328=>15463,
-29329=>15464,
-29331=>15465,
-29332=>15466,
-29333=>15467,
-29335=>15468,
-29336=>15469,
-29337=>15470,
-29338=>15471,
-29339=>15472,
-29340=>15473,
-29341=>15474,
-29342=>15475,
-29344=>15476,
-29345=>15477,
-29347=>15478,
-29348=>15479,
-29349=>15480,
-29350=>15481,
-29352=>15482,
-29353=>15483,
-29354=>15484,
-29355=>15485,
-29358=>15486,
-29361=>15487,
-29362=>15488,
-29363=>15489,
-29365=>15490,
-29370=>15491,
-29371=>15492,
-29372=>15493,
-29373=>15494,
-29374=>15495,
-29375=>15496,
-29381=>15497,
-29382=>15498,
-29383=>15499,
-29385=>15500,
-29386=>15501,
-29387=>15502,
-29388=>15503,
-29391=>15504,
-29393=>15505,
-29395=>15506,
-29396=>15507,
-29397=>15508,
-29398=>15509,
-29400=>15510,
-29402=>15511,
-29403=>15512,
-29404=>15513,
-29405=>15514,
-29407=>15515,
-29410=>15516,
-29411=>15517,
-29412=>15518,
-29413=>15519,
-29414=>15520,
-29415=>15521,
-29418=>15522,
-29419=>15523,
-29429=>15524,
-29430=>15525,
-29438=>15526,
-29439=>15527,
-29440=>15528,
-29442=>15529,
-29444=>15530,
-29445=>15531,
-29446=>15532,
-29447=>15533,
-29448=>15534,
-29449=>15535,
-29451=>15536,
-29452=>15537,
-29453=>15538,
-29455=>15539,
-29456=>15540,
-29457=>15541,
-29458=>15542,
-29460=>15543,
-29464=>15544,
-29465=>15545,
-29466=>15546,
-29471=>15547,
-29472=>15548,
-29475=>15549,
-29476=>15550,
-29478=>15551,
-29479=>15552,
-29480=>15553,
-29485=>15554,
-29487=>15555,
-29488=>15556,
-29490=>15557,
-29491=>15558,
-29493=>15559,
-29498=>15560,
-29500=>15561,
-29501=>15562,
-29504=>15563,
-29506=>15564,
-29507=>15565,
-29510=>15566,
-29511=>15567,
-29512=>15568,
-29513=>15569,
-29514=>15570,
-29515=>15571,
-29516=>15572,
-29518=>15573,
-29519=>15574,
-29521=>15575,
-29523=>15576,
-29524=>15577,
-29525=>15578,
-29526=>15579,
-29528=>15580,
-29529=>15581,
-29530=>15582,
-29531=>15583,
-29532=>15584,
-29533=>15585,
-29534=>15586,
-29535=>15587,
-29537=>15588,
-29538=>15589,
-29539=>15590,
-29540=>15591,
-29541=>15592,
-29542=>15593,
-29543=>15594,
-29545=>15595,
-29550=>15596,
-29553=>15597,
-29555=>15598,
-29556=>15599,
-29558=>15600,
-29561=>15601,
-29565=>15602,
-29567=>15603,
-29569=>15604,
-29570=>15605,
-29571=>15606,
-29573=>15607,
-29574=>15608,
-29576=>15609,
-29578=>15610,
-29580=>15611,
-29581=>15612,
-29583=>15613,
-29584=>15614,
-29586=>15615,
-29587=>15616,
-29588=>15617,
-29589=>15618,
-29591=>15619,
-29592=>15620,
-29593=>15621,
-29594=>15622,
-29596=>15623,
-29597=>15624,
-29598=>15625,
-29600=>15626,
-29601=>15627,
-29603=>15628,
-29604=>15629,
-29605=>15630,
-29606=>15631,
-29607=>15632,
-29608=>15633,
-29610=>15634,
-29612=>15635,
-29613=>15636,
-29617=>15637,
-29620=>15638,
-29621=>15639,
-29622=>15640,
-29624=>15641,
-29625=>15642,
-29628=>15643,
-29629=>15644,
-29630=>15645,
-29631=>15646,
-29633=>15647,
-29635=>15648,
-29636=>15649,
-29637=>15650,
-29638=>15651,
-29639=>15652,
-29643=>15653,
-29644=>15654,
-29646=>15655,
-29650=>15656,
-29651=>15657,
-29652=>15658,
-29653=>15659,
-29654=>15660,
-29655=>15661,
-29656=>15662,
-29658=>15663,
-29659=>15664,
-29660=>15665,
-29661=>15666,
-29663=>15667,
-29665=>15668,
-29666=>15669,
-29667=>15670,
-29668=>15671,
-29670=>15672,
-29672=>15673,
-29674=>15674,
-29675=>15675,
-29676=>15676,
-29678=>15677,
-29679=>15678,
-29680=>15679,
-29681=>15680,
-29683=>15681,
-29684=>15682,
-29685=>15683,
-29686=>15684,
-29687=>15685,
-29688=>15686,
-29689=>15687,
-29690=>15688,
-29691=>15689,
-29692=>15690,
-29693=>15691,
-29695=>15692,
-29696=>15693,
-29697=>15694,
-29698=>15695,
-29700=>15696,
-29703=>15697,
-29704=>15698,
-29707=>15699,
-29708=>15700,
-29709=>15701,
-29710=>15702,
-29713=>15703,
-29714=>15704,
-29715=>15705,
-29716=>15706,
-29717=>15707,
-29718=>15708,
-29719=>15709,
-29720=>15710,
-29721=>15711,
-29724=>15712,
-29725=>15713,
-29726=>15714,
-29727=>15715,
-29728=>15716,
-29729=>15717,
-29731=>15718,
-29732=>15719,
-29735=>15720,
-29737=>15721,
-29739=>15722,
-29741=>15723,
-29743=>15724,
-29745=>15725,
-29746=>15726,
-29751=>15727,
-29752=>15728,
-29753=>15729,
-29754=>15730,
-29755=>15731,
-29757=>15732,
-29758=>15733,
-29760=>15734,
-29762=>15735,
-29763=>15736,
-29764=>15737,
-29765=>15738,
-29766=>15739,
-29767=>15740,
-29768=>15741,
-29769=>15742,
-29770=>15743,
-29772=>15744,
-29773=>15745,
-29774=>15746,
-29775=>15747,
-29776=>15748,
-29777=>15749,
-29778=>15750,
-29779=>15751,
-29780=>15752,
-29782=>15753,
-29784=>15754,
-29789=>15755,
-29792=>15756,
-29793=>15757,
-29794=>15758,
-29796=>15759,
-29797=>15760,
-29798=>15761,
-29799=>15762,
-29800=>15763,
-29803=>15764,
-29804=>15765,
-29806=>15766,
-29807=>15767,
-29809=>15768,
-29810=>15769,
-29811=>15770,
-29812=>15771,
-29813=>15772,
-29816=>15773,
-29817=>15774,
-29818=>15775,
-29819=>15776,
-29820=>15777,
-29821=>15778,
-29823=>15779,
-29826=>15780,
-29828=>15781,
-29829=>15782,
-29830=>15783,
-29832=>15784,
-29834=>15785,
-29836=>15786,
-29837=>15787,
-29839=>15788,
-29841=>15789,
-29842=>15790,
-29843=>15791,
-29844=>15792,
-29845=>15793,
-29846=>15794,
-29847=>15795,
-29848=>15796,
-29849=>15797,
-29850=>15798,
-29851=>15799,
-29853=>15800,
-29855=>15801,
-29856=>15802,
-29857=>15803,
-29858=>15804,
-29860=>15805,
-29861=>15806,
-29866=>15807,
-29867=>15808,
-29868=>15809,
-29869=>15810,
-29870=>15811,
-29871=>15812,
-29873=>15813,
-29874=>15814,
-29875=>15815,
-29876=>15816,
-29877=>15817,
-29878=>15818,
-29879=>15819,
-29880=>15820,
-29881=>15821,
-29883=>15822,
-29884=>15823,
-29886=>15824,
-29887=>15825,
-29888=>15826,
-29889=>15827,
-29890=>15828,
-29891=>15829,
-29892=>15830,
-29893=>15831,
-29894=>15832,
-29895=>15833,
-29896=>15834,
-29897=>15835,
-29899=>15836,
-29900=>15837,
-29901=>15838,
-29902=>15839,
-29904=>15840,
-29905=>15841,
-29907=>15842,
-29909=>15843,
-29910=>15844,
-29911=>15845,
-29912=>15846,
-29913=>15847,
-29915=>15848,
-29917=>15849,
-29919=>15850,
-29921=>15851,
-29925=>15852,
-29927=>15853,
-29928=>15854,
-29929=>15855,
-29930=>15856,
-29931=>15857,
-29932=>15858,
-29933=>15859,
-29936=>15860,
-29937=>15861,
-29938=>15862,
-29939=>15863,
-29941=>15864,
-29944=>15865,
-29945=>15866,
-29946=>15867,
-29947=>15868,
-29948=>15869,
-29949=>15870,
-29950=>15871,
-29952=>15872,
-29953=>15873,
-29954=>15874,
-29955=>15875,
-29957=>15876,
-29958=>15877,
-29959=>15878,
-29960=>15879,
-29961=>15880,
-29962=>15881,
-29963=>15882,
-29966=>15883,
-29968=>15884,
-29970=>15885,
-29972=>15886,
-29973=>15887,
-29974=>15888,
-29975=>15889,
-29979=>15890,
-29981=>15891,
-29982=>15892,
-29984=>15893,
-29985=>15894,
-29986=>15895,
-29988=>15896,
-29990=>15897,
-29991=>15898,
-29994=>15899,
-29998=>15900,
-30004=>15901,
-30006=>15902,
-30009=>15903,
-30012=>15904,
-30013=>15905,
-30015=>15906,
-30017=>15907,
-30018=>15908,
-30019=>15909,
-30020=>15910,
-30022=>15911,
-30023=>15912,
-30025=>15913,
-30026=>15914,
-30029=>15915,
-30032=>15916,
-30033=>15917,
-30034=>15918,
-30035=>15919,
-30037=>15920,
-30038=>15921,
-30039=>15922,
-30040=>15923,
-30046=>15924,
-30047=>15925,
-30048=>15926,
-30049=>15927,
-30051=>15928,
-30052=>15929,
-30055=>15930,
-30056=>15931,
-30057=>15932,
-30060=>15933,
-30061=>15934,
-30062=>15935,
-30063=>15936,
-30064=>15937,
-30065=>15938,
-30067=>15939,
-30069=>15940,
-30071=>15941,
-30074=>15942,
-30075=>15943,
-30076=>15944,
-30077=>15945,
-30078=>15946,
-30080=>15947,
-30081=>15948,
-30082=>15949,
-30084=>15950,
-30085=>15951,
-30088=>15952,
-30089=>15953,
-30090=>15954,
-30092=>15955,
-30093=>15956,
-30094=>15957,
-30096=>15958,
-30099=>15959,
-30101=>15960,
-30104=>15961,
-30107=>15962,
-30108=>15963,
-30110=>15964,
-30114=>15965,
-30118=>15966,
-30119=>15967,
-30120=>15968,
-30121=>15969,
-30122=>15970,
-30125=>15971,
-30134=>15972,
-30135=>15973,
-30138=>15974,
-30139=>15975,
-30143=>15976,
-30144=>15977,
-30145=>15978,
-30150=>15979,
-30155=>15980,
-30156=>15981,
-30158=>15982,
-30159=>15983,
-30160=>15984,
-30161=>15985,
-30163=>15986,
-30167=>15987,
-30170=>15988,
-30172=>15989,
-30173=>15990,
-30175=>15991,
-30176=>15992,
-30177=>15993,
-30181=>15994,
-30185=>15995,
-30188=>15996,
-30189=>15997,
-30190=>15998,
-30191=>15999,
-30194=>16000,
-30195=>16001,
-30197=>16002,
-30198=>16003,
-30199=>16004,
-30200=>16005,
-30202=>16006,
-30203=>16007,
-30205=>16008,
-30206=>16009,
-30212=>16010,
-30214=>16011,
-30215=>16012,
-30216=>16013,
-30217=>16014,
-30222=>16015,
-30223=>16016,
-30225=>16017,
-30226=>16018,
-30227=>16019,
-30228=>16020,
-30230=>16021,
-30234=>16022,
-30236=>16023,
-30237=>16024,
-30243=>16025,
-30248=>16026,
-30252=>16027,
-30254=>16028,
-30255=>16029,
-30257=>16030,
-30258=>16031,
-30262=>16032,
-30263=>16033,
-30265=>16034,
-30266=>16035,
-30269=>16036,
-30273=>16037,
-30276=>16038,
-30277=>16039,
-30280=>16040,
-30282=>16041,
-30283=>16042,
-30286=>16043,
-30287=>16044,
-30288=>16045,
-30289=>16046,
-30290=>16047,
-30291=>16048,
-30293=>16049,
-30295=>16050,
-30297=>16051,
-30298=>16052,
-30299=>16053,
-30301=>16054,
-30304=>16055,
-30305=>16056,
-30310=>16057,
-30312=>16058,
-30314=>16059,
-30323=>16060,
-30324=>16061,
-30325=>16062,
-12136=>16063,
-30326=>16063,
-30327=>16064,
-30329=>16065,
-30330=>16066,
-30335=>16067,
-30336=>16068,
-30337=>16069,
-30339=>16070,
-30341=>16071,
-30345=>16072,
-30346=>16073,
-30348=>16074,
-30349=>16075,
-30351=>16076,
-30352=>16077,
-30354=>16078,
-30356=>16079,
-30357=>16080,
-30359=>16081,
-30360=>16082,
-30363=>16083,
-30364=>16084,
-30365=>16085,
-30366=>16086,
-30367=>16087,
-30368=>16088,
-30369=>16089,
-30370=>16090,
-30371=>16091,
-30373=>16092,
-30374=>16093,
-30375=>16094,
-30376=>16095,
-30377=>16096,
-30378=>16097,
-30379=>16098,
-30380=>16099,
-30381=>16100,
-30383=>16101,
-30384=>16102,
-30387=>16103,
-30389=>16104,
-30390=>16105,
-30391=>16106,
-30393=>16107,
-30395=>16108,
-30396=>16109,
-30397=>16110,
-30398=>16111,
-30400=>16112,
-30401=>16113,
-30403=>16114,
-30404=>16115,
-30407=>16116,
-30409=>16117,
-30411=>16118,
-30412=>16119,
-30419=>16120,
-30421=>16121,
-30425=>16122,
-30426=>16123,
-30428=>16124,
-30429=>16125,
-30432=>16126,
-30434=>16127,
-30438=>16128,
-30440=>16129,
-30441=>16130,
-30442=>16131,
-30443=>16132,
-30444=>16133,
-30445=>16134,
-30448=>16135,
-30451=>16136,
-30453=>16137,
-30454=>16138,
-30455=>16139,
-30458=>16140,
-30459=>16141,
-30461=>16142,
-30463=>16143,
-30464=>16144,
-30466=>16145,
-30467=>16146,
-30469=>16147,
-30470=>16148,
-30474=>16149,
-30476=>16150,
-30478=>16151,
-30479=>16152,
-30480=>16153,
-30481=>16154,
-30482=>16155,
-30483=>16156,
-30484=>16157,
-30485=>16158,
-30486=>16159,
-30487=>16160,
-30488=>16161,
-30491=>16162,
-30492=>16163,
-30493=>16164,
-30494=>16165,
-30497=>16166,
-30499=>16167,
-30500=>16168,
-30501=>16169,
-30503=>16170,
-30506=>16171,
-30507=>16172,
-30508=>16173,
-30510=>16174,
-30512=>16175,
-30513=>16176,
-30514=>16177,
-30515=>16178,
-30516=>16179,
-30521=>16180,
-30523=>16181,
-30525=>16182,
-30526=>16183,
-30527=>16184,
-30530=>16185,
-30532=>16186,
-30533=>16187,
-30534=>16188,
-30536=>16189,
-30537=>16190,
-30538=>16191,
-30539=>16192,
-30540=>16193,
-30541=>16194,
-30542=>16195,
-30546=>16196,
-30547=>16197,
-30548=>16198,
-30549=>16199,
-30550=>16200,
-30551=>16201,
-30552=>16202,
-30553=>16203,
-30556=>16204,
-30557=>16205,
-30559=>16206,
-30560=>16207,
-30564=>16208,
-30567=>16209,
-30569=>16210,
-30570=>16211,
-30573=>16212,
-30574=>16213,
-30575=>16214,
-30576=>16215,
-30577=>16216,
-30578=>16217,
-30579=>16218,
-30580=>16219,
-30581=>16220,
-30582=>16221,
-30583=>16222,
-30584=>16223,
-30586=>16224,
-30587=>16225,
-30588=>16226,
-30593=>16227,
-30594=>16228,
-30595=>16229,
-30598=>16230,
-30599=>16231,
-30600=>16232,
-30601=>16233,
-30602=>16234,
-30603=>16235,
-30607=>16236,
-30608=>16237,
-30611=>16238,
-30612=>16239,
-30613=>16240,
-30614=>16241,
-30615=>16242,
-30617=>16243,
-30618=>16244,
-30619=>16245,
-30620=>16246,
-30621=>16247,
-30625=>16248,
-30627=>16249,
-30628=>16250,
-30630=>16251,
-30632=>16252,
-30635=>16253,
-30638=>16254,
-30639=>16255,
-30641=>16256,
-30642=>16257,
-30644=>16258,
-30646=>16259,
-30647=>16260,
-30648=>16261,
-30649=>16262,
-30650=>16263,
-30654=>16264,
-30656=>16265,
-30657=>16266,
-30658=>16267,
-30659=>16268,
-30660=>16269,
-30661=>16270,
-30662=>16271,
-30664=>16272,
-30665=>16273,
-30666=>16274,
-30667=>16275,
-30668=>16276,
-30670=>16277,
-30671=>16278,
-30672=>16279,
-30673=>16280,
-30674=>16281,
-30675=>16282,
-30676=>16283,
-30677=>16284,
-30678=>16285,
-30680=>16286,
-30681=>16287,
-30685=>16288,
-30686=>16289,
-30687=>16290,
-30688=>16291,
-30689=>16292,
-30692=>16293,
-30694=>16294,
-30696=>16295,
-30698=>16296,
-30704=>16297,
-30705=>16298,
-30706=>16299,
-30708=>16300,
-30709=>16301,
-30711=>16302,
-30713=>16303,
-30714=>16304,
-30715=>16305,
-30716=>16306,
-30723=>16307,
-30724=>16308,
-30725=>16309,
-30726=>16310,
-30727=>16311,
-30728=>16312,
-30730=>16313,
-30731=>16314,
-30734=>16315,
-30735=>16316,
-30736=>16317,
-30739=>16318,
-30741=>16319,
-30745=>16320,
-30747=>16321,
-30750=>16322,
-30752=>16323,
-30753=>16324,
-30754=>16325,
-30756=>16326,
-30760=>16327,
-30762=>16328,
-30763=>16329,
-30766=>16330,
-30767=>16331,
-30769=>16332,
-30770=>16333,
-30771=>16334,
-30773=>16335,
-30774=>16336,
-30781=>16337,
-30783=>16338,
-30785=>16339,
-30786=>16340,
-30788=>16341,
-30790=>16342,
-30792=>16343,
-30793=>16344,
-30794=>16345,
-30795=>16346,
-30797=>16347,
-30799=>16348,
-30801=>16349,
-30803=>16350,
-30804=>16351,
-30808=>16352,
-30809=>16353,
-30810=>16354,
-30811=>16355,
-30812=>16356,
-30814=>16357,
-30815=>16358,
-30816=>16359,
-30817=>16360,
-30818=>16361,
-30819=>16362,
-30821=>16363,
-30822=>16364,
-30823=>16365,
-30825=>16366,
-30832=>16367,
-30833=>16368,
-30834=>16369,
-30835=>16370,
-30836=>16371,
-30837=>16372,
-30838=>16373,
-30840=>16374,
-30841=>16375,
-30842=>16376,
-30843=>16377,
-30845=>16378,
-30846=>16379,
-30847=>16380,
-30848=>16381,
-30849=>16382,
-30850=>16383,
-30851=>16384,
-30852=>16385,
-30853=>16386,
-30854=>16387,
-30856=>16388,
-30858=>16389,
-30859=>16390,
-30863=>16391,
-30864=>16392,
-30866=>16393,
-30868=>16394,
-30869=>16395,
-30870=>16396,
-30873=>16397,
-30877=>16398,
-30878=>16399,
-30880=>16400,
-30882=>16401,
-30884=>16402,
-30886=>16403,
-30888=>16404,
-30890=>16405,
-30891=>16406,
-30892=>16407,
-30894=>16408,
-30895=>16409,
-30901=>16410,
-30902=>16411,
-30903=>16412,
-30907=>16413,
-30909=>16414,
-30911=>16415,
-30912=>16416,
-30914=>16417,
-30915=>16418,
-30916=>16419,
-30918=>16420,
-30919=>16421,
-30920=>16422,
-30924=>16423,
-30925=>16424,
-30926=>16425,
-30927=>16426,
-30929=>16427,
-30930=>16428,
-30931=>16429,
-30934=>16430,
-30935=>16431,
-30936=>16432,
-30939=>16433,
-30940=>16434,
-30941=>16435,
-30942=>16436,
-30943=>16437,
-30944=>16438,
-30945=>16439,
-30946=>16440,
-30948=>16441,
-30949=>16442,
-30950=>16443,
-30953=>16444,
-30954=>16445,
-30955=>16446,
-30957=>16447,
-30958=>16448,
-30960=>16449,
-30961=>16450,
-30963=>16451,
-30965=>16452,
-30966=>16453,
-30968=>16454,
-30969=>16455,
-30971=>16456,
-30972=>16457,
-30974=>16458,
-30975=>16459,
-30976=>16460,
-30978=>16461,
-30979=>16462,
-30980=>16463,
-30982=>16464,
-30983=>16465,
-30984=>16466,
-30985=>16467,
-30986=>16468,
-30987=>16469,
-30988=>16470,
-30989=>16471,
-30991=>16472,
-30992=>16473,
-30993=>16474,
-30994=>16475,
-30996=>16476,
-30997=>16477,
-30998=>16478,
-30999=>16479,
-31000=>16480,
-31002=>16481,
-31003=>16482,
-31004=>16483,
-31005=>16484,
-31007=>16485,
-31008=>16486,
-31009=>16487,
-31010=>16488,
-31011=>16489,
-31013=>16490,
-31015=>16491,
-31016=>16492,
-31017=>16493,
-31021=>16494,
-31022=>16495,
-31023=>16496,
-31024=>16497,
-31026=>16498,
-31027=>16499,
-31029=>16500,
-31030=>16501,
-31031=>16502,
-31032=>16503,
-31033=>16504,
-31037=>16505,
-31039=>16506,
-31042=>16507,
-31043=>16508,
-31044=>16509,
-31045=>16510,
-31047=>16511,
-31050=>16512,
-31051=>16513,
-31052=>16514,
-31053=>16515,
-31054=>16516,
-31055=>16517,
-31056=>16518,
-31057=>16519,
-31058=>16520,
-31060=>16521,
-31061=>16522,
-31064=>16523,
-31065=>16524,
-31073=>16525,
-31075=>16526,
-31076=>16527,
-31078=>16528,
-31081=>16529,
-31082=>16530,
-31083=>16531,
-31084=>16532,
-31086=>16533,
-31088=>16534,
-31089=>16535,
-31090=>16536,
-31091=>16537,
-31092=>16538,
-31093=>16539,
-31094=>16540,
-31097=>16541,
-31099=>16542,
-31100=>16543,
-31101=>16544,
-31102=>16545,
-31103=>16546,
-31106=>16547,
-31107=>16548,
-31110=>16549,
-31111=>16550,
-31112=>16551,
-31113=>16552,
-31115=>16553,
-31116=>16554,
-31120=>16555,
-31121=>16556,
-31122=>16557,
-31123=>16558,
-31124=>16559,
-31125=>16560,
-31126=>16561,
-31127=>16562,
-31128=>16563,
-31129=>16564,
-31131=>16565,
-31132=>16566,
-31133=>16567,
-31134=>16568,
-31135=>16569,
-31136=>16570,
-31137=>16571,
-31138=>16572,
-31139=>16573,
-31140=>16574,
-31141=>16575,
-31144=>16576,
-31145=>16577,
-31147=>16578,
-31148=>16579,
-31149=>16580,
-31151=>16581,
-31154=>16582,
-31156=>16583,
-31157=>16584,
-31158=>16585,
-31159=>16586,
-12145=>16587,
-31160=>16587,
-31164=>16588,
-31167=>16589,
-31170=>16590,
-31172=>16591,
-31173=>16592,
-31175=>16593,
-31176=>16594,
-31178=>16595,
-63893=>16595,
-31180=>16596,
-31182=>16597,
-31183=>16598,
-31184=>16599,
-31187=>16600,
-31188=>16601,
-31190=>16602,
-31191=>16603,
-31193=>16604,
-31194=>16605,
-31195=>16606,
-31196=>16607,
-31197=>16608,
-31198=>16609,
-31200=>16610,
-31201=>16611,
-31202=>16612,
-31205=>16613,
-31208=>16614,
-31210=>16615,
-31212=>16616,
-31214=>16617,
-31217=>16618,
-31218=>16619,
-31219=>16620,
-31220=>16621,
-31221=>16622,
-31222=>16623,
-31223=>16624,
-31225=>16625,
-31226=>16626,
-31228=>16627,
-31230=>16628,
-31231=>16629,
-31233=>16630,
-31236=>16631,
-31237=>16632,
-31239=>16633,
-31240=>16634,
-31241=>16635,
-31242=>16636,
-31244=>16637,
-31247=>16638,
-31248=>16639,
-31249=>16640,
-31250=>16641,
-31251=>16642,
-31253=>16643,
-31254=>16644,
-31256=>16645,
-31257=>16646,
-31259=>16647,
-31260=>16648,
-31261=>16649,
-31263=>16650,
-31265=>16651,
-31266=>16652,
-31268=>16653,
-31269=>16654,
-31270=>16655,
-31271=>16656,
-31272=>16657,
-31273=>16658,
-31274=>16659,
-31275=>16660,
-31276=>16661,
-31277=>16662,
-31279=>16663,
-31280=>16664,
-31282=>16665,
-31284=>16666,
-31285=>16667,
-31286=>16668,
-31288=>16669,
-31290=>16670,
-31294=>16671,
-31297=>16672,
-31298=>16673,
-31299=>16674,
-31300=>16675,
-31301=>16676,
-31303=>16677,
-31304=>16678,
-31305=>16679,
-31306=>16680,
-31307=>16681,
-31311=>16682,
-31312=>16683,
-31314=>16684,
-31315=>16685,
-31316=>16686,
-31317=>16687,
-31318=>16688,
-31320=>16689,
-31321=>16690,
-31322=>16691,
-31323=>16692,
-31324=>16693,
-31325=>16694,
-31326=>16695,
-31327=>16696,
-31328=>16697,
-31331=>16698,
-31332=>16699,
-31333=>16700,
-31334=>16701,
-31335=>16702,
-31336=>16703,
-31338=>16704,
-31340=>16705,
-31341=>16706,
-31342=>16707,
-31343=>16708,
-31345=>16709,
-31346=>16710,
-31347=>16711,
-31349=>16712,
-31355=>16713,
-31356=>16714,
-31357=>16715,
-31358=>16716,
-31362=>16717,
-31365=>16718,
-31367=>16719,
-31369=>16720,
-31370=>16721,
-31371=>16722,
-31372=>16723,
-31374=>16724,
-31375=>16725,
-31376=>16726,
-31379=>16727,
-31380=>16728,
-31385=>16729,
-31386=>16730,
-31387=>16731,
-31390=>16732,
-31393=>16733,
-31394=>16734,
-31395=>16735,
-31396=>16736,
-31399=>16737,
-31403=>16738,
-31407=>16739,
-31408=>16740,
-31409=>16741,
-31410=>16742,
-31412=>16743,
-31413=>16744,
-31415=>16745,
-31416=>16746,
-31417=>16747,
-31419=>16748,
-31420=>16749,
-31421=>16750,
-31422=>16751,
-31424=>16752,
-31425=>16753,
-31426=>16754,
-31427=>16755,
-31430=>16756,
-31433=>16757,
-31436=>16758,
-31437=>16759,
-31438=>16760,
-31439=>16761,
-31440=>16762,
-31441=>16763,
-31442=>16764,
-31443=>16765,
-31444=>16766,
-31445=>16767,
-31447=>16768,
-31448=>16769,
-31450=>16770,
-31451=>16771,
-31452=>16772,
-31453=>16773,
-31457=>16774,
-31458=>16775,
-31460=>16776,
-31463=>16777,
-31464=>16778,
-31465=>16779,
-31467=>16780,
-31468=>16781,
-31470=>16782,
-31472=>16783,
-31473=>16784,
-31474=>16785,
-31475=>16786,
-31476=>16787,
-31477=>16788,
-31479=>16789,
-31480=>16790,
-31483=>16791,
-31484=>16792,
-31486=>16793,
-31488=>16794,
-31489=>16795,
-31490=>16796,
-31493=>16797,
-31495=>16798,
-31497=>16799,
-31500=>16800,
-31501=>16801,
-31502=>16802,
-31504=>16803,
-31506=>16804,
-31507=>16805,
-31510=>16806,
-31511=>16807,
-31512=>16808,
-31514=>16809,
-31516=>16810,
-31517=>16811,
-31519=>16812,
-31521=>16813,
-31522=>16814,
-31523=>16815,
-31527=>16816,
-31529=>16817,
-31533=>16818,
-31535=>16819,
-31536=>16820,
-31538=>16821,
-31540=>16822,
-31541=>16823,
-31542=>16824,
-31543=>16825,
-31545=>16826,
-31547=>16827,
-31549=>16828,
-31551=>16829,
-31552=>16830,
-31553=>16831,
-31554=>16832,
-31555=>16833,
-31556=>16834,
-31560=>16835,
-31562=>16836,
-31565=>16837,
-31566=>16838,
-31571=>16839,
-31573=>16840,
-31575=>16841,
-31577=>16842,
-31580=>16843,
-31582=>16844,
-31583=>16845,
-31585=>16846,
-31587=>16847,
-31588=>16848,
-31589=>16849,
-31590=>16850,
-31592=>16851,
-31593=>16852,
-31594=>16853,
-31595=>16854,
-31596=>16855,
-31597=>16856,
-31599=>16857,
-31600=>16858,
-31603=>16859,
-31604=>16860,
-31606=>16861,
-31608=>16862,
-31610=>16863,
-31612=>16864,
-31613=>16865,
-31615=>16866,
-31617=>16867,
-31618=>16868,
-31619=>16869,
-31620=>16870,
-31622=>16871,
-31623=>16872,
-31624=>16873,
-31625=>16874,
-31626=>16875,
-31628=>16876,
-31630=>16877,
-31631=>16878,
-31633=>16879,
-31634=>16880,
-31635=>16881,
-31638=>16882,
-31640=>16883,
-31641=>16884,
-31642=>16885,
-31643=>16886,
-31646=>16887,
-31647=>16888,
-31648=>16889,
-31651=>16890,
-31652=>16891,
-31653=>16892,
-31662=>16893,
-31663=>16894,
-31664=>16895,
-31666=>16896,
-31667=>16897,
-31669=>16898,
-31670=>16899,
-31671=>16900,
-31673=>16901,
-31674=>16902,
-31675=>16903,
-31676=>16904,
-31677=>16905,
-31678=>16906,
-31679=>16907,
-31682=>16908,
-31683=>16909,
-31685=>16910,
-31688=>16911,
-31690=>16912,
-31693=>16913,
-31694=>16914,
-31695=>16915,
-31696=>16916,
-31698=>16917,
-31700=>16918,
-31701=>16919,
-31702=>16920,
-31703=>16921,
-31704=>16922,
-31707=>16923,
-31708=>16924,
-31710=>16925,
-31711=>16926,
-31712=>16927,
-31714=>16928,
-31715=>16929,
-31719=>16930,
-31720=>16931,
-31723=>16932,
-31724=>16933,
-31725=>16934,
-31727=>16935,
-31728=>16936,
-31730=>16937,
-31732=>16938,
-31733=>16939,
-31734=>16940,
-31736=>16941,
-31737=>16942,
-31738=>16943,
-31739=>16944,
-31741=>16945,
-31743=>16946,
-31745=>16947,
-31746=>16948,
-31747=>16949,
-31748=>16950,
-31749=>16951,
-31750=>16952,
-31752=>16953,
-31753=>16954,
-31754=>16955,
-31758=>16956,
-31760=>16957,
-31761=>16958,
-31762=>16959,
-31763=>16960,
-31764=>16961,
-31765=>16962,
-31767=>16963,
-31768=>16964,
-31769=>16965,
-31770=>16966,
-31771=>16967,
-31772=>16968,
-31773=>16969,
-31776=>16970,
-31778=>16971,
-31780=>16972,
-31781=>16973,
-31784=>16974,
-31785=>16975,
-31788=>16976,
-31789=>16977,
-31790=>16978,
-31791=>16979,
-31792=>16980,
-31793=>16981,
-31794=>16982,
-31795=>16983,
-31796=>16984,
-31797=>16985,
-31798=>16986,
-31799=>16987,
-31801=>16988,
-31802=>16989,
-31803=>16990,
-31804=>16991,
-31810=>16992,
-31812=>16993,
-31813=>16994,
-31814=>16995,
-31815=>16996,
-31816=>16997,
-31817=>16998,
-31818=>16999,
-31819=>17000,
-31822=>17001,
-31823=>17002,
-31824=>17003,
-31825=>17004,
-31826=>17005,
-31827=>17006,
-31828=>17007,
-31829=>17008,
-31830=>17009,
-31831=>17010,
-31832=>17011,
-31833=>17012,
-31834=>17013,
-31835=>17014,
-31837=>17015,
-31838=>17016,
-31841=>17017,
-31842=>17018,
-31843=>17019,
-31845=>17020,
-31846=>17021,
-31847=>17022,
-31848=>17023,
-31851=>17024,
-31853=>17025,
-31855=>17026,
-31856=>17027,
-31857=>17028,
-31861=>17029,
-31862=>17030,
-31863=>17031,
-31864=>17032,
-31865=>17033,
-31866=>17034,
-31870=>17035,
-31871=>17036,
-31872=>17037,
-31873=>17038,
-31874=>17039,
-31875=>17040,
-31876=>17041,
-31877=>17042,
-31878=>17043,
-31879=>17044,
-31880=>17045,
-31882=>17046,
-31883=>17047,
-31884=>17048,
-31885=>17049,
-31886=>17050,
-31887=>17051,
-31888=>17052,
-31891=>17053,
-31892=>17054,
-31894=>17055,
-31897=>17056,
-31898=>17057,
-31899=>17058,
-31904=>17059,
-31905=>17060,
-31907=>17061,
-31910=>17062,
-31911=>17063,
-31912=>17064,
-31913=>17065,
-31915=>17066,
-31916=>17067,
-31917=>17068,
-31919=>17069,
-31920=>17070,
-31924=>17071,
-31925=>17072,
-31926=>17073,
-31927=>17074,
-31928=>17075,
-31930=>17076,
-31931=>17077,
-31935=>17078,
-31936=>17079,
-31938=>17080,
-31939=>17081,
-31940=>17082,
-31942=>17083,
-31945=>17084,
-31947=>17085,
-31950=>17086,
-31951=>17087,
-31952=>17088,
-31953=>17089,
-31954=>17090,
-31955=>17091,
-31956=>17092,
-31960=>17093,
-31962=>17094,
-31963=>17095,
-31969=>17096,
-31970=>17097,
-31971=>17098,
-31972=>17099,
-31973=>17100,
-31974=>17101,
-31977=>17102,
-31978=>17103,
-31979=>17104,
-31980=>17105,
-31981=>17106,
-31982=>17107,
-31985=>17108,
-31987=>17109,
-31989=>17110,
-31991=>17111,
-31994=>17112,
-31996=>17113,
-31997=>17114,
-31999=>17115,
-32001=>17116,
-32003=>17117,
-32012=>17118,
-32014=>17119,
-32015=>17120,
-32017=>17121,
-32018=>17122,
-32022=>17123,
-32024=>17124,
-32029=>17125,
-32030=>17126,
-32031=>17127,
-32035=>17128,
-32036=>17129,
-32037=>17130,
-32038=>17131,
-32040=>17132,
-32041=>17133,
-32042=>17134,
-32044=>17135,
-32045=>17136,
-32046=>17137,
-32052=>17138,
-32053=>17139,
-32054=>17140,
-32055=>17141,
-32056=>17142,
-32059=>17143,
-32061=>17144,
-32062=>17145,
-32065=>17146,
-32067=>17147,
-32069=>17148,
-32071=>17149,
-32072=>17150,
-32073=>17151,
-32074=>17152,
-32075=>17153,
-32076=>17154,
-32077=>17155,
-32079=>17156,
-32081=>17157,
-32082=>17158,
-32083=>17159,
-32084=>17160,
-32085=>17161,
-32086=>17162,
-32087=>17163,
-32088=>17164,
-32089=>17165,
-32090=>17166,
-32091=>17167,
-32092=>17168,
-32095=>17169,
-32096=>17170,
-32099=>17171,
-32100=>17172,
-32101=>17173,
-32103=>17174,
-32105=>17175,
-32106=>17176,
-32107=>17177,
-32108=>17178,
-32109=>17179,
-32111=>17180,
-32112=>17181,
-32116=>17182,
-32117=>17183,
-32120=>17184,
-32122=>17185,
-32123=>17186,
-32124=>17187,
-32125=>17188,
-32126=>17189,
-32127=>17190,
-32128=>17191,
-32130=>17192,
-32132=>17193,
-32133=>17194,
-32135=>17195,
-32138=>17196,
-32139=>17197,
-32140=>17198,
-32141=>17199,
-32142=>17200,
-32144=>17201,
-32145=>17202,
-32146=>17203,
-32148=>17204,
-32149=>17205,
-32150=>17206,
-32151=>17207,
-32152=>17208,
-32153=>17209,
-32154=>17210,
-32155=>17211,
-32157=>17212,
-32159=>17213,
-32160=>17214,
-32161=>17215,
-32164=>17216,
-32165=>17217,
-32167=>17218,
-32168=>17219,
-32169=>17220,
-32170=>17221,
-32175=>17222,
-32181=>17223,
-32182=>17224,
-32183=>17225,
-32188=>17226,
-32192=>17227,
-32193=>17228,
-32194=>17229,
-32195=>17230,
-32197=>17231,
-32198=>17232,
-32200=>17233,
-32201=>17234,
-32204=>17235,
-32205=>17236,
-32206=>17237,
-32207=>17238,
-32208=>17239,
-32211=>17240,
-32213=>17241,
-32214=>17242,
-32218=>17243,
-32219=>17244,
-32220=>17245,
-32223=>17246,
-32226=>17247,
-32228=>17248,
-32229=>17249,
-32231=>17250,
-32234=>17251,
-32235=>17252,
-32237=>17253,
-32238=>17254,
-32240=>17255,
-32243=>17256,
-32245=>17257,
-32247=>17258,
-32248=>17259,
-32250=>17260,
-32252=>17261,
-32253=>17262,
-32254=>17263,
-32255=>17264,
-32256=>17265,
-32257=>17266,
-32258=>17267,
-32259=>17268,
-32260=>17269,
-32261=>17270,
-32262=>17271,
-32263=>17272,
-32268=>17273,
-32269=>17274,
-32270=>17275,
-32271=>17276,
-32274=>17277,
-32275=>17278,
-32276=>17279,
-32277=>17280,
-32278=>17281,
-32279=>17282,
-32280=>17283,
-32281=>17284,
-32282=>17285,
-32284=>17286,
-32288=>17287,
-32289=>17288,
-32290=>17289,
-32292=>17290,
-32293=>17291,
-32294=>17292,
-32296=>17293,
-32297=>17294,
-32298=>17295,
-32300=>17296,
-32303=>17297,
-32304=>17298,
-32307=>17299,
-32312=>17300,
-32314=>17301,
-32316=>17302,
-32319=>17303,
-32320=>17304,
-32322=>17305,
-32323=>17306,
-32324=>17307,
-32328=>17308,
-32329=>17309,
-32330=>17310,
-32331=>17311,
-32332=>17312,
-32333=>17313,
-32334=>17314,
-32335=>17315,
-32336=>17316,
-32337=>17317,
-32339=>17318,
-32342=>17319,
-32343=>17320,
-32344=>17321,
-32345=>17322,
-32347=>17323,
-32348=>17324,
-32349=>17325,
-32351=>17326,
-32352=>17327,
-32353=>17328,
-32355=>17329,
-32356=>17330,
-32357=>17331,
-32358=>17332,
-32359=>17333,
-32360=>17334,
-32364=>17335,
-32369=>17336,
-32370=>17337,
-32372=>17338,
-32373=>17339,
-32374=>17340,
-32375=>17341,
-32376=>17342,
-32378=>17343,
-32379=>17344,
-32383=>17345,
-32384=>17346,
-32385=>17347,
-32387=>17348,
-32388=>17349,
-32389=>17350,
-32390=>17351,
-32391=>17352,
-32393=>17353,
-32395=>17354,
-32398=>17355,
-32400=>17356,
-32401=>17357,
-32402=>17358,
-32405=>17359,
-32407=>17360,
-32409=>17361,
-32410=>17362,
-32413=>17363,
-32414=>17364,
-32430=>17365,
-32436=>17366,
-32443=>17367,
-32444=>17368,
-32470=>17369,
-32484=>17370,
-32492=>17371,
-32505=>17372,
-32522=>17373,
-32528=>17374,
-32542=>17375,
-32567=>17376,
-32569=>17377,
-32571=>17378,
-32572=>17379,
-32573=>17380,
-32574=>17381,
-32575=>17382,
-32576=>17383,
-32577=>17384,
-32579=>17385,
-32582=>17386,
-32583=>17387,
-32584=>17388,
-32585=>17389,
-32586=>17390,
-32587=>17391,
-32589=>17392,
-32591=>17393,
-32594=>17394,
-32595=>17395,
-32598=>17396,
-32601=>17397,
-32603=>17398,
-32604=>17399,
-32605=>17400,
-32606=>17401,
-32608=>17402,
-32611=>17403,
-32612=>17404,
-32613=>17405,
-32614=>17406,
-32615=>17407,
-32619=>17408,
-32620=>17409,
-32621=>17410,
-32623=>17411,
-32627=>17412,
-32629=>17413,
-32630=>17414,
-32632=>17415,
-32634=>17416,
-32635=>17417,
-32636=>17418,
-32637=>17419,
-32639=>17420,
-32640=>17421,
-32642=>17422,
-32643=>17423,
-32644=>17424,
-32647=>17425,
-32649=>17426,
-32651=>17427,
-32653=>17428,
-32655=>17429,
-32656=>17430,
-32657=>17431,
-32658=>17432,
-32659=>17433,
-32661=>17434,
-32662=>17435,
-32663=>17436,
-32664=>17437,
-32665=>17438,
-32667=>17439,
-32668=>17440,
-32672=>17441,
-32674=>17442,
-32675=>17443,
-32678=>17444,
-32680=>17445,
-32682=>17446,
-32683=>17447,
-32684=>17448,
-32685=>17449,
-32686=>17450,
-32689=>17451,
-32691=>17452,
-32692=>17453,
-32693=>17454,
-32694=>17455,
-32695=>17456,
-32698=>17457,
-32699=>17458,
-32702=>17459,
-32704=>17460,
-32706=>17461,
-32707=>17462,
-32708=>17463,
-32710=>17464,
-32711=>17465,
-32712=>17466,
-32713=>17467,
-32715=>17468,
-32717=>17469,
-32719=>17470,
-32720=>17471,
-32721=>17472,
-32723=>17473,
-32726=>17474,
-32727=>17475,
-32729=>17476,
-32730=>17477,
-32731=>17478,
-32732=>17479,
-32733=>17480,
-32734=>17481,
-32738=>17482,
-32739=>17483,
-32740=>17484,
-32743=>17485,
-32744=>17486,
-32746=>17487,
-32747=>17488,
-32748=>17489,
-32749=>17490,
-32751=>17491,
-32754=>17492,
-32756=>17493,
-32757=>17494,
-32758=>17495,
-32759=>17496,
-32760=>17497,
-32762=>17498,
-32765=>17499,
-32766=>17500,
-32767=>17501,
-32770=>17502,
-32775=>17503,
-32776=>17504,
-32777=>17505,
-32778=>17506,
-32782=>17507,
-32783=>17508,
-32785=>17509,
-32787=>17510,
-32794=>17511,
-32795=>17512,
-32797=>17513,
-32798=>17514,
-32799=>17515,
-32801=>17516,
-32803=>17517,
-32804=>17518,
-32811=>17519,
-32813=>17520,
-32815=>17521,
-32816=>17522,
-32818=>17523,
-32820=>17524,
-32825=>17525,
-32826=>17526,
-32828=>17527,
-32830=>17528,
-32832=>17529,
-32833=>17530,
-32836=>17531,
-32837=>17532,
-32839=>17533,
-32840=>17534,
-32841=>17535,
-32846=>17536,
-32847=>17537,
-32848=>17538,
-32849=>17539,
-32851=>17540,
-32853=>17541,
-32855=>17542,
-32857=>17543,
-32859=>17544,
-32860=>17545,
-32861=>17546,
-32863=>17547,
-32864=>17548,
-32865=>17549,
-32866=>17550,
-32867=>17551,
-32868=>17552,
-32869=>17553,
-32870=>17554,
-32871=>17555,
-32872=>17556,
-32875=>17557,
-32876=>17558,
-32877=>17559,
-32878=>17560,
-32884=>17561,
-32888=>17562,
-32890=>17563,
-32891=>17564,
-32892=>17565,
-32897=>17566,
-32898=>17567,
-32904=>17568,
-32906=>17569,
-32909=>17570,
-32910=>17571,
-32911=>17572,
-32912=>17573,
-32913=>17574,
-32914=>17575,
-32916=>17576,
-32917=>17577,
-32919=>17578,
-32921=>17579,
-32926=>17580,
-32931=>17581,
-32934=>17582,
-32935=>17583,
-32936=>17584,
-32940=>17585,
-32944=>17586,
-32947=>17587,
-32949=>17588,
-32950=>17589,
-32952=>17590,
-32953=>17591,
-32955=>17592,
-32965=>17593,
-32967=>17594,
-32968=>17595,
-32969=>17596,
-32970=>17597,
-32971=>17598,
-32975=>17599,
-32976=>17600,
-32977=>17601,
-32978=>17602,
-32979=>17603,
-32980=>17604,
-32981=>17605,
-32984=>17606,
-32991=>17607,
-32992=>17608,
-32994=>17609,
-32995=>17610,
-32998=>17611,
-33006=>17612,
-33013=>17613,
-33015=>17614,
-33017=>17615,
-33019=>17616,
-33022=>17617,
-33023=>17618,
-33024=>17619,
-33025=>17620,
-33027=>17621,
-33028=>17622,
-33031=>17623,
-33032=>17624,
-33035=>17625,
-33036=>17626,
-33045=>17627,
-33047=>17628,
-33049=>17629,
-33052=>17630,
-33053=>17631,
-33055=>17632,
-33056=>17633,
-33057=>17634,
-33058=>17635,
-33059=>17636,
-33060=>17637,
-33061=>17638,
-33062=>17639,
-33063=>17640,
-33064=>17641,
-33065=>17642,
-33066=>17643,
-33067=>17644,
-33069=>17645,
-33070=>17646,
-33072=>17647,
-33075=>17648,
-33076=>17649,
-33077=>17650,
-33079=>17651,
-33082=>17652,
-33083=>17653,
-33084=>17654,
-33085=>17655,
-33087=>17656,
-33088=>17657,
-33089=>17658,
-33090=>17659,
-33091=>17660,
-33092=>17661,
-33093=>17662,
-33095=>17663,
-33097=>17664,
-33101=>17665,
-33103=>17666,
-33106=>17667,
-33111=>17668,
-33112=>17669,
-33115=>17670,
-33116=>17671,
-33117=>17672,
-33118=>17673,
-33119=>17674,
-33122=>17675,
-33123=>17676,
-33124=>17677,
-33128=>17678,
-33130=>17679,
-33132=>17680,
-33135=>17681,
-33138=>17682,
-33139=>17683,
-33141=>17684,
-33142=>17685,
-33143=>17686,
-33153=>17687,
-33155=>17688,
-33156=>17689,
-33157=>17690,
-33158=>17691,
-33159=>17692,
-33161=>17693,
-33163=>17694,
-33164=>17695,
-33165=>17696,
-33166=>17697,
-33168=>17698,
-33170=>17699,
-33171=>17700,
-33172=>17701,
-33173=>17702,
-33174=>17703,
-33175=>17704,
-33177=>17705,
-33182=>17706,
-33183=>17707,
-33185=>17708,
-33186=>17709,
-33188=>17710,
-33189=>17711,
-33191=>17712,
-33195=>17713,
-33196=>17714,
-33197=>17715,
-33198=>17716,
-33199=>17717,
-33200=>17718,
-33201=>17719,
-33202=>17720,
-33204=>17721,
-33205=>17722,
-33206=>17723,
-33207=>17724,
-33208=>17725,
-33209=>17726,
-33212=>17727,
-33220=>17728,
-33221=>17729,
-33223=>17730,
-33224=>17731,
-33227=>17732,
-33230=>17733,
-33232=>17734,
-33233=>17735,
-33234=>17736,
-33235=>17737,
-33236=>17738,
-33237=>17739,
-33238=>17740,
-33239=>17741,
-33241=>17742,
-33243=>17743,
-33244=>17744,
-33245=>17745,
-33246=>17746,
-33249=>17747,
-33250=>17748,
-33252=>17749,
-33253=>17750,
-33254=>17751,
-33257=>17752,
-33259=>17753,
-33262=>17754,
-33263=>17755,
-33264=>17756,
-33265=>17757,
-33266=>17758,
-33269=>17759,
-33270=>17760,
-33271=>17761,
-33272=>17762,
-33273=>17763,
-33277=>17764,
-33279=>17765,
-33283=>17766,
-33291=>17767,
-33294=>17768,
-33295=>17769,
-33297=>17770,
-33299=>17771,
-33301=>17772,
-33302=>17773,
-33303=>17774,
-33304=>17775,
-33305=>17776,
-33306=>17777,
-33309=>17778,
-33312=>17779,
-33316=>17780,
-33317=>17781,
-33318=>17782,
-33319=>17783,
-33321=>17784,
-33326=>17785,
-33330=>17786,
-33338=>17787,
-33340=>17788,
-33341=>17789,
-33343=>17790,
-33344=>17791,
-33345=>17792,
-33346=>17793,
-33347=>17794,
-33349=>17795,
-33350=>17796,
-33352=>17797,
-33354=>17798,
-33356=>17799,
-33357=>17800,
-33358=>17801,
-33360=>17802,
-33361=>17803,
-33362=>17804,
-33363=>17805,
-33364=>17806,
-33365=>17807,
-33366=>17808,
-33367=>17809,
-33371=>17810,
-33372=>17811,
-33373=>17812,
-33374=>17813,
-33376=>17814,
-33377=>17815,
-33378=>17816,
-33379=>17817,
-33381=>17818,
-33383=>17819,
-33385=>17820,
-33386=>17821,
-33388=>17822,
-33389=>17823,
-33397=>17824,
-33398=>17825,
-12171=>17826,
-33400=>17826,
-33403=>17827,
-33404=>17828,
-33408=>17829,
-33409=>17830,
-33411=>17831,
-33413=>17832,
-33414=>17833,
-33415=>17834,
-33417=>17835,
-33420=>17836,
-33424=>17837,
-33427=>17838,
-33428=>17839,
-33429=>17840,
-33430=>17841,
-33434=>17842,
-33435=>17843,
-33438=>17844,
-33440=>17845,
-33442=>17846,
-33443=>17847,
-33447=>17848,
-33458=>17849,
-33461=>17850,
-33462=>17851,
-33466=>17852,
-33468=>17853,
-33471=>17854,
-33472=>17855,
-33474=>17856,
-33475=>17857,
-33477=>17858,
-33478=>17859,
-33481=>17860,
-33488=>17861,
-33494=>17862,
-33497=>17863,
-33498=>17864,
-33501=>17865,
-33506=>17866,
-33512=>17867,
-33513=>17868,
-33514=>17869,
-33516=>17870,
-33517=>17871,
-33518=>17872,
-33520=>17873,
-33522=>17874,
-33523=>17875,
-33525=>17876,
-33526=>17877,
-33528=>17878,
-33530=>17879,
-33532=>17880,
-33533=>17881,
-33534=>17882,
-33535=>17883,
-33536=>17884,
-33546=>17885,
-33547=>17886,
-33549=>17887,
-33552=>17888,
-33554=>17889,
-33555=>17890,
-33558=>17891,
-33560=>17892,
-33561=>17893,
-33565=>17894,
-33566=>17895,
-33567=>17896,
-33568=>17897,
-33569=>17898,
-33570=>17899,
-33571=>17900,
-33572=>17901,
-33573=>17902,
-33574=>17903,
-33577=>17904,
-33578=>17905,
-33582=>17906,
-33584=>17907,
-33586=>17908,
-33591=>17909,
-33595=>17910,
-33597=>17911,
-33598=>17912,
-33599=>17913,
-33601=>17914,
-33602=>17915,
-33604=>17916,
-33605=>17917,
-33608=>17918,
-33610=>17919,
-33611=>17920,
-33612=>17921,
-33613=>17922,
-33614=>17923,
-33619=>17924,
-33621=>17925,
-33622=>17926,
-33623=>17927,
-33624=>17928,
-33625=>17929,
-33629=>17930,
-33634=>17931,
-33648=>17932,
-33649=>17933,
-33650=>17934,
-33651=>17935,
-33652=>17936,
-33653=>17937,
-33654=>17938,
-33657=>17939,
-33658=>17940,
-33662=>17941,
-33663=>17942,
-33664=>17943,
-33665=>17944,
-33666=>17945,
-33667=>17946,
-33668=>17947,
-33671=>17948,
-33672=>17949,
-33675=>17950,
-33676=>17951,
-33677=>17952,
-33679=>17953,
-33680=>17954,
-33681=>17955,
-33684=>17956,
-33685=>17957,
-33687=>17958,
-33689=>17959,
-33690=>17960,
-33693=>17961,
-33695=>17962,
-33697=>17963,
-33699=>17964,
-33700=>17965,
-33701=>17966,
-33702=>17967,
-33708=>17968,
-33709=>17969,
-33710=>17970,
-33711=>17971,
-33717=>17972,
-33723=>17973,
-33726=>17974,
-33727=>17975,
-33730=>17976,
-33731=>17977,
-33732=>17978,
-33734=>17979,
-33736=>17980,
-33737=>17981,
-33739=>17982,
-33741=>17983,
-33742=>17984,
-33744=>17985,
-33745=>17986,
-33746=>17987,
-33747=>17988,
-33749=>17989,
-33751=>17990,
-33753=>17991,
-33754=>17992,
-33755=>17993,
-33758=>17994,
-33762=>17995,
-33763=>17996,
-33764=>17997,
-33766=>17998,
-33767=>17999,
-33768=>18000,
-33771=>18001,
-33772=>18002,
-33773=>18003,
-33774=>18004,
-33779=>18005,
-33780=>18006,
-33781=>18007,
-33782=>18008,
-33783=>18009,
-33786=>18010,
-33787=>18011,
-33788=>18012,
-33790=>18013,
-33791=>18014,
-33792=>18015,
-33794=>18016,
-33797=>18017,
-33800=>18018,
-33801=>18019,
-33808=>18020,
-33810=>18021,
-33811=>18022,
-33812=>18023,
-33813=>18024,
-33814=>18025,
-33815=>18026,
-33817=>18027,
-33818=>18028,
-33819=>18029,
-33822=>18030,
-33823=>18031,
-33824=>18032,
-33825=>18033,
-33826=>18034,
-33827=>18035,
-33833=>18036,
-33834=>18037,
-33835=>18038,
-33837=>18039,
-33838=>18040,
-33839=>18041,
-33840=>18042,
-33842=>18043,
-33843=>18044,
-33844=>18045,
-33846=>18046,
-33847=>18047,
-33849=>18048,
-33850=>18049,
-33851=>18050,
-33854=>18051,
-33855=>18052,
-33856=>18053,
-33857=>18054,
-33858=>18055,
-33859=>18056,
-33860=>18057,
-33861=>18058,
-33863=>18059,
-33864=>18060,
-33866=>18061,
-33867=>18062,
-33868=>18063,
-33869=>18064,
-33870=>18065,
-33871=>18066,
-33872=>18067,
-33875=>18068,
-33876=>18069,
-33877=>18070,
-33878=>18071,
-33880=>18072,
-33885=>18073,
-33886=>18074,
-33887=>18075,
-33888=>18076,
-33890=>18077,
-33893=>18078,
-33895=>18079,
-33896=>18080,
-33898=>18081,
-33902=>18082,
-33904=>18083,
-33906=>18084,
-33908=>18085,
-33913=>18086,
-33915=>18087,
-33916=>18088,
-33917=>18089,
-33918=>18090,
-33919=>18091,
-33920=>18092,
-33921=>18093,
-33923=>18094,
-33924=>18095,
-33925=>18096,
-33926=>18097,
-33930=>18098,
-33933=>18099,
-33935=>18100,
-33936=>18101,
-33937=>18102,
-33938=>18103,
-33941=>18104,
-33942=>18105,
-33944=>18106,
-33946=>18107,
-33947=>18108,
-33949=>18109,
-33950=>18110,
-33951=>18111,
-33952=>18112,
-33954=>18113,
-33955=>18114,
-33956=>18115,
-33957=>18116,
-33958=>18117,
-33959=>18118,
-33960=>18119,
-33961=>18120,
-33962=>18121,
-33963=>18122,
-33964=>18123,
-33965=>18124,
-33966=>18125,
-33968=>18126,
-33969=>18127,
-33971=>18128,
-33973=>18129,
-33974=>18130,
-33975=>18131,
-33979=>18132,
-33982=>18133,
-33986=>18134,
-33987=>18135,
-33989=>18136,
-33990=>18137,
-33991=>18138,
-33992=>18139,
-33996=>18140,
-33998=>18141,
-33999=>18142,
-34002=>18143,
-34004=>18144,
-34005=>18145,
-34007=>18146,
-34008=>18147,
-34009=>18148,
-34010=>18149,
-34011=>18150,
-34012=>18151,
-34014=>18152,
-34017=>18153,
-34018=>18154,
-34020=>18155,
-34023=>18156,
-34024=>18157,
-34025=>18158,
-34026=>18159,
-34027=>18160,
-34029=>18161,
-34033=>18162,
-34034=>18163,
-34035=>18164,
-34036=>18165,
-34037=>18166,
-34038=>18167,
-34039=>18168,
-34040=>18169,
-34041=>18170,
-34042=>18171,
-34043=>18172,
-34046=>18173,
-34048=>18174,
-34049=>18175,
-34050=>18176,
-34051=>18177,
-34052=>18178,
-34053=>18179,
-34054=>18180,
-34055=>18181,
-34056=>18182,
-34057=>18183,
-34058=>18184,
-34059=>18185,
-34061=>18186,
-34062=>18187,
-34063=>18188,
-34064=>18189,
-34066=>18190,
-34069=>18191,
-34070=>18192,
-34072=>18193,
-34073=>18194,
-34075=>18195,
-34076=>18196,
-34077=>18197,
-34080=>18198,
-34082=>18199,
-34084=>18200,
-34085=>18201,
-34087=>18202,
-34088=>18203,
-34089=>18204,
-34090=>18205,
-34094=>18206,
-34095=>18207,
-34096=>18208,
-34097=>18209,
-34098=>18210,
-34099=>18211,
-34100=>18212,
-34101=>18213,
-34102=>18214,
-34110=>18215,
-34111=>18216,
-34112=>18217,
-34114=>18218,
-34116=>18219,
-34117=>18220,
-34119=>18221,
-34123=>18222,
-34124=>18223,
-34125=>18224,
-34127=>18225,
-34128=>18226,
-34129=>18227,
-34132=>18228,
-34135=>18229,
-34138=>18230,
-34139=>18231,
-34140=>18232,
-34141=>18233,
-34143=>18234,
-34144=>18235,
-34145=>18236,
-34147=>18237,
-34149=>18238,
-34150=>18239,
-34151=>18240,
-34155=>18241,
-34156=>18242,
-34158=>18243,
-34159=>18244,
-34160=>18245,
-34161=>18246,
-34163=>18247,
-34165=>18248,
-34166=>18249,
-34168=>18250,
-34172=>18251,
-34173=>18252,
-34175=>18253,
-34176=>18254,
-34177=>18255,
-34178=>18256,
-34179=>18257,
-34182=>18258,
-34185=>18259,
-34187=>18260,
-34189=>18261,
-34190=>18262,
-34192=>18263,
-34194=>18264,
-34195=>18265,
-34197=>18266,
-34198=>18267,
-34199=>18268,
-34200=>18269,
-34201=>18270,
-34202=>18271,
-34205=>18272,
-34206=>18273,
-34208=>18274,
-34209=>18275,
-34210=>18276,
-34211=>18277,
-34213=>18278,
-34215=>18279,
-34219=>18280,
-34220=>18281,
-34221=>18282,
-34225=>18283,
-34226=>18284,
-34227=>18285,
-34228=>18286,
-34229=>18287,
-34230=>18288,
-34232=>18289,
-34235=>18290,
-34236=>18291,
-34237=>18292,
-34238=>18293,
-34239=>18294,
-34240=>18295,
-34242=>18296,
-34243=>18297,
-34244=>18298,
-34245=>18299,
-34246=>18300,
-34247=>18301,
-34248=>18302,
-34250=>18303,
-34251=>18304,
-34252=>18305,
-34257=>18306,
-34258=>18307,
-34260=>18308,
-34262=>18309,
-34263=>18310,
-34264=>18311,
-34265=>18312,
-34266=>18313,
-34267=>18314,
-34270=>18315,
-34271=>18316,
-34272=>18317,
-34273=>18318,
-34274=>18319,
-34275=>18320,
-34278=>18321,
-34279=>18322,
-34280=>18323,
-34283=>18324,
-34284=>18325,
-34285=>18326,
-34286=>18327,
-34287=>18328,
-34288=>18329,
-34289=>18330,
-34290=>18331,
-34291=>18332,
-34293=>18333,
-34295=>18334,
-34296=>18335,
-34300=>18336,
-34301=>18337,
-34302=>18338,
-34304=>18339,
-34305=>18340,
-34306=>18341,
-34307=>18342,
-34312=>18343,
-34313=>18344,
-34314=>18345,
-34316=>18346,
-34317=>18347,
-34318=>18348,
-34319=>18349,
-34320=>18350,
-34322=>18351,
-34323=>18352,
-34324=>18353,
-34325=>18354,
-34327=>18355,
-34328=>18356,
-34329=>18357,
-34331=>18358,
-34332=>18359,
-34333=>18360,
-34335=>18361,
-34336=>18362,
-34337=>18363,
-34339=>18364,
-34340=>18365,
-34341=>18366,
-34342=>18367,
-34344=>18368,
-34346=>18369,
-34347=>18370,
-34348=>18371,
-34350=>18372,
-34351=>18373,
-34352=>18374,
-34353=>18375,
-34354=>18376,
-34355=>18377,
-34356=>18378,
-34357=>18379,
-34358=>18380,
-34359=>18381,
-34361=>18382,
-34363=>18383,
-34365=>18384,
-34366=>18385,
-34368=>18386,
-34369=>18387,
-34370=>18388,
-34371=>18389,
-34372=>18390,
-34373=>18391,
-34374=>18392,
-34375=>18393,
-34376=>18394,
-34377=>18395,
-34378=>18396,
-34379=>18397,
-34380=>18398,
-34386=>18399,
-34387=>18400,
-34390=>18401,
-34391=>18402,
-34392=>18403,
-34393=>18404,
-34395=>18405,
-34397=>18406,
-34400=>18407,
-34401=>18408,
-34403=>18409,
-34404=>18410,
-34405=>18411,
-34406=>18412,
-34408=>18413,
-34409=>18414,
-34410=>18415,
-34413=>18416,
-34415=>18417,
-34416=>18418,
-34418=>18419,
-34419=>18420,
-34420=>18421,
-34421=>18422,
-34422=>18423,
-34423=>18424,
-34424=>18425,
-34435=>18426,
-34436=>18427,
-34437=>18428,
-34438=>18429,
-34439=>18430,
-34440=>18431,
-34441=>18432,
-34446=>18433,
-34447=>18434,
-34448=>18435,
-34449=>18436,
-34450=>18437,
-34452=>18438,
-34454=>18439,
-34455=>18440,
-34456=>18441,
-34457=>18442,
-34458=>18443,
-34459=>18444,
-34462=>18445,
-34463=>18446,
-34464=>18447,
-34465=>18448,
-34466=>18449,
-34469=>18450,
-34470=>18451,
-34475=>18452,
-34477=>18453,
-34478=>18454,
-34482=>18455,
-34483=>18456,
-34487=>18457,
-34488=>18458,
-34489=>18459,
-34491=>18460,
-34492=>18461,
-34493=>18462,
-34494=>18463,
-34495=>18464,
-34497=>18465,
-34498=>18466,
-34499=>18467,
-34501=>18468,
-34504=>18469,
-34508=>18470,
-34509=>18471,
-34514=>18472,
-34515=>18473,
-34517=>18474,
-34518=>18475,
-34519=>18476,
-34522=>18477,
-34524=>18478,
-34525=>18479,
-34528=>18480,
-34529=>18481,
-34530=>18482,
-34531=>18483,
-34533=>18484,
-34534=>18485,
-34535=>18486,
-34536=>18487,
-34538=>18488,
-34539=>18489,
-34540=>18490,
-34543=>18491,
-34549=>18492,
-34550=>18493,
-34551=>18494,
-34555=>18495,
-34556=>18496,
-34557=>18497,
-34559=>18498,
-34561=>18499,
-34564=>18500,
-34565=>18501,
-34571=>18502,
-34572=>18503,
-34574=>18504,
-34575=>18505,
-34576=>18506,
-34577=>18507,
-34580=>18508,
-34582=>18509,
-34585=>18510,
-34587=>18511,
-34589=>18512,
-34591=>18513,
-34592=>18514,
-34596=>18515,
-34598=>18516,
-34599=>18517,
-34600=>18518,
-34602=>18519,
-34603=>18520,
-34604=>18521,
-34605=>18522,
-34607=>18523,
-34608=>18524,
-34610=>18525,
-34611=>18526,
-34613=>18527,
-34614=>18528,
-34616=>18529,
-34617=>18530,
-34618=>18531,
-34620=>18532,
-34621=>18533,
-34624=>18534,
-34625=>18535,
-34626=>18536,
-34627=>18537,
-34628=>18538,
-34629=>18539,
-34630=>18540,
-34634=>18541,
-34635=>18542,
-34637=>18543,
-34639=>18544,
-34640=>18545,
-34641=>18546,
-34642=>18547,
-34644=>18548,
-34646=>18549,
-34648=>18550,
-34650=>18551,
-34651=>18552,
-34652=>18553,
-34653=>18554,
-34654=>18555,
-34655=>18556,
-34657=>18557,
-34658=>18558,
-34663=>18559,
-34664=>18560,
-34665=>18561,
-34666=>18562,
-34667=>18563,
-34668=>18564,
-34669=>18565,
-34671=>18566,
-34673=>18567,
-34674=>18568,
-34675=>18569,
-34677=>18570,
-34679=>18571,
-34681=>18572,
-34682=>18573,
-34687=>18574,
-34688=>18575,
-34689=>18576,
-34694=>18577,
-34695=>18578,
-34697=>18579,
-34698=>18580,
-34700=>18581,
-34702=>18582,
-34703=>18583,
-34704=>18584,
-34705=>18585,
-34706=>18586,
-34708=>18587,
-34709=>18588,
-34710=>18589,
-34712=>18590,
-34713=>18591,
-34714=>18592,
-34715=>18593,
-34716=>18594,
-34717=>18595,
-34720=>18596,
-34721=>18597,
-34723=>18598,
-34724=>18599,
-34725=>18600,
-34726=>18601,
-34727=>18602,
-34729=>18603,
-34730=>18604,
-34734=>18605,
-34736=>18606,
-34737=>18607,
-34738=>18608,
-34740=>18609,
-34742=>18610,
-34743=>18611,
-34744=>18612,
-34745=>18613,
-34748=>18614,
-34750=>18615,
-34751=>18616,
-34753=>18617,
-34754=>18618,
-34755=>18619,
-34757=>18620,
-34759=>18621,
-34761=>18622,
-34764=>18623,
-34765=>18624,
-34767=>18625,
-34768=>18626,
-34772=>18627,
-34773=>18628,
-34774=>18629,
-34775=>18630,
-34776=>18631,
-34777=>18632,
-34778=>18633,
-34780=>18634,
-34781=>18635,
-34782=>18636,
-34783=>18637,
-34785=>18638,
-34786=>18639,
-34788=>18640,
-34790=>18641,
-34791=>18642,
-34792=>18643,
-34793=>18644,
-34795=>18645,
-34797=>18646,
-34800=>18647,
-34801=>18648,
-34803=>18649,
-34804=>18650,
-34805=>18651,
-34807=>18652,
-34808=>18653,
-34810=>18654,
-34812=>18655,
-34813=>18656,
-34815=>18657,
-34816=>18658,
-34817=>18659,
-34818=>18660,
-34820=>18661,
-34823=>18662,
-34824=>18663,
-34825=>18664,
-34827=>18665,
-34828=>18666,
-34829=>18667,
-34830=>18668,
-34831=>18669,
-34834=>18670,
-34836=>18671,
-34839=>18672,
-34840=>18673,
-34841=>18674,
-34842=>18675,
-34844=>18676,
-34845=>18677,
-34846=>18678,
-34848=>18679,
-34852=>18680,
-34853=>18681,
-34854=>18682,
-34855=>18683,
-34856=>18684,
-34857=>18685,
-34858=>18686,
-34859=>18687,
-34860=>18688,
-34861=>18689,
-34862=>18690,
-34863=>18691,
-34864=>18692,
-34867=>18693,
-34868=>18694,
-34869=>18695,
-34871=>18696,
-34872=>18697,
-34874=>18698,
-34877=>18699,
-34878=>18700,
-34879=>18701,
-34881=>18702,
-34882=>18703,
-34883=>18704,
-34887=>18705,
-34888=>18706,
-34889=>18707,
-34891=>18708,
-34894=>18709,
-34895=>18710,
-34896=>18711,
-34897=>18712,
-34898=>18713,
-34901=>18714,
-34902=>18715,
-34904=>18716,
-34906=>18717,
-34908=>18718,
-34910=>18719,
-34911=>18720,
-34912=>18721,
-34918=>18722,
-34919=>18723,
-34922=>18724,
-34925=>18725,
-34927=>18726,
-34929=>18727,
-34931=>18728,
-34932=>18729,
-34933=>18730,
-34934=>18731,
-34936=>18732,
-34938=>18733,
-34939=>18734,
-34940=>18735,
-34944=>18736,
-34947=>18737,
-34950=>18738,
-34951=>18739,
-34953=>18740,
-34954=>18741,
-34956=>18742,
-34958=>18743,
-34959=>18744,
-34960=>18745,
-34961=>18746,
-34963=>18747,
-34964=>18748,
-34965=>18749,
-34967=>18750,
-34968=>18751,
-34969=>18752,
-34970=>18753,
-34971=>18754,
-34973=>18755,
-34974=>18756,
-34975=>18757,
-34976=>18758,
-34977=>18759,
-34979=>18760,
-34981=>18761,
-34982=>18762,
-34983=>18763,
-34984=>18764,
-34985=>18765,
-34986=>18766,
-34988=>18767,
-34990=>18768,
-34991=>18769,
-34992=>18770,
-34994=>18771,
-34995=>18772,
-34996=>18773,
-34997=>18774,
-34998=>18775,
-35000=>18776,
-35001=>18777,
-35002=>18778,
-35003=>18779,
-35005=>18780,
-35006=>18781,
-35007=>18782,
-35008=>18783,
-35011=>18784,
-35012=>18785,
-35015=>18786,
-35016=>18787,
-35019=>18788,
-35020=>18789,
-35021=>18790,
-35024=>18791,
-35025=>18792,
-35027=>18793,
-35030=>18794,
-35031=>18795,
-35034=>18796,
-35035=>18797,
-35038=>18798,
-35040=>18799,
-35041=>18800,
-35046=>18801,
-35047=>18802,
-35049=>18803,
-35050=>18804,
-35051=>18805,
-35052=>18806,
-35053=>18807,
-35054=>18808,
-35055=>18809,
-35058=>18810,
-35061=>18811,
-35062=>18812,
-35063=>18813,
-35066=>18814,
-35067=>18815,
-35071=>18816,
-35072=>18817,
-35073=>18818,
-35075=>18819,
-35076=>18820,
-35077=>18821,
-35078=>18822,
-35080=>18823,
-35081=>18824,
-35083=>18825,
-35084=>18826,
-35085=>18827,
-35086=>18828,
-35087=>18829,
-35089=>18830,
-35092=>18831,
-35093=>18832,
-35094=>18833,
-35095=>18834,
-35096=>18835,
-35100=>18836,
-35101=>18837,
-35102=>18838,
-35103=>18839,
-35104=>18840,
-35106=>18841,
-35107=>18842,
-35108=>18843,
-35110=>18844,
-35111=>18845,
-35112=>18846,
-35113=>18847,
-35116=>18848,
-35117=>18849,
-35118=>18850,
-35119=>18851,
-35121=>18852,
-35125=>18853,
-35127=>18854,
-35129=>18855,
-35130=>18856,
-35132=>18857,
-35133=>18858,
-35134=>18859,
-35135=>18860,
-35136=>18861,
-35138=>18862,
-35139=>18863,
-35141=>18864,
-35142=>18865,
-35144=>18866,
-35145=>18867,
-35146=>18868,
-35147=>18869,
-35148=>18870,
-35149=>18871,
-35150=>18872,
-35151=>18873,
-35152=>18874,
-35153=>18875,
-35154=>18876,
-35155=>18877,
-35156=>18878,
-35157=>18879,
-35159=>18880,
-35160=>18881,
-35161=>18882,
-35162=>18883,
-35163=>18884,
-35164=>18885,
-35169=>18886,
-35170=>18887,
-35171=>18888,
-35173=>18889,
-35175=>18890,
-35176=>18891,
-35177=>18892,
-35179=>18893,
-35181=>18894,
-35182=>18895,
-35184=>18896,
-35185=>18897,
-35187=>18898,
-35188=>18899,
-35189=>18900,
-35190=>18901,
-35191=>18902,
-35192=>18903,
-35193=>18904,
-35194=>18905,
-35196=>18906,
-35197=>18907,
-12177=>18908,
-35198=>18908,
-35200=>18909,
-35202=>18910,
-35204=>18911,
-35205=>18912,
-35207=>18913,
-35208=>18914,
-35209=>18915,
-35210=>18916,
-35212=>18917,
-35213=>18918,
-35214=>18919,
-35216=>18920,
-35217=>18921,
-35218=>18922,
-35220=>18923,
-35221=>18924,
-35223=>18925,
-35225=>18926,
-35226=>18927,
-35227=>18928,
-35228=>18929,
-35229=>18930,
-35230=>18931,
-35231=>18932,
-35232=>18933,
-35234=>18934,
-35235=>18935,
-35236=>18936,
-35237=>18937,
-35239=>18938,
-35240=>18939,
-35241=>18940,
-35243=>18941,
-35245=>18942,
-35246=>18943,
-35248=>18944,
-35249=>18945,
-35251=>18946,
-35252=>18947,
-35253=>18948,
-35254=>18949,
-35256=>18950,
-35257=>18951,
-35259=>18952,
-35260=>18953,
-35262=>18954,
-35267=>18955,
-35277=>18956,
-35283=>18957,
-35284=>18958,
-35285=>18959,
-35287=>18960,
-35288=>18961,
-35289=>18962,
-35291=>18963,
-35293=>18964,
-35295=>18965,
-35296=>18966,
-35297=>18967,
-35298=>18968,
-35300=>18969,
-35303=>18970,
-35304=>18971,
-35305=>18972,
-35306=>18973,
-35308=>18974,
-35309=>18975,
-35310=>18976,
-35312=>18977,
-35313=>18978,
-35314=>18979,
-35317=>18980,
-35319=>18981,
-35321=>18982,
-35322=>18983,
-35323=>18984,
-35324=>18985,
-35325=>18986,
-35326=>18987,
-35327=>18988,
-35332=>18989,
-35333=>18990,
-35334=>18991,
-35337=>18992,
-35339=>18993,
-35341=>18994,
-35343=>18995,
-35345=>18996,
-35346=>18997,
-35348=>18998,
-35351=>18999,
-35353=>19000,
-35354=>19001,
-35356=>19002,
-35358=>19003,
-35360=>19004,
-35361=>19005,
-35362=>19006,
-35364=>19007,
-35366=>19008,
-35367=>19009,
-35368=>19010,
-35369=>19011,
-35371=>19012,
-35372=>19013,
-35374=>19014,
-35375=>19015,
-35376=>19016,
-35378=>19017,
-35379=>19018,
-35381=>19019,
-35383=>19020,
-35384=>19021,
-35385=>19022,
-35387=>19023,
-35388=>19024,
-35389=>19025,
-35391=>19026,
-35392=>19027,
-35394=>19028,
-35395=>19029,
-35396=>19030,
-35397=>19031,
-35399=>19032,
-35401=>19033,
-35402=>19034,
-35403=>19035,
-35404=>19036,
-35405=>19037,
-35407=>19038,
-35409=>19039,
-35411=>19040,
-35414=>19041,
-35415=>19042,
-35417=>19043,
-35418=>19044,
-35420=>19045,
-35421=>19046,
-35423=>19047,
-35424=>19048,
-35428=>19049,
-35429=>19050,
-35431=>19051,
-35432=>19052,
-35434=>19053,
-35439=>19054,
-35444=>19055,
-35446=>19056,
-35447=>19057,
-35448=>19058,
-35450=>19059,
-35451=>19060,
-35453=>19061,
-35454=>19062,
-35456=>19063,
-35457=>19064,
-35458=>19065,
-35459=>19066,
-35464=>19067,
-35467=>19068,
-35468=>19069,
-35470=>19070,
-35471=>19071,
-35472=>19072,
-35476=>19073,
-35478=>19074,
-35479=>19075,
-35481=>19076,
-35483=>19077,
-35484=>19078,
-35485=>19079,
-35487=>19080,
-35490=>19081,
-35495=>19082,
-35497=>19083,
-35498=>19084,
-35499=>19085,
-35501=>19086,
-35502=>19087,
-35503=>19088,
-35505=>19089,
-35507=>19090,
-35508=>19091,
-35509=>19092,
-35511=>19093,
-35512=>19094,
-35514=>19095,
-35515=>19096,
-35517=>19097,
-35518=>19098,
-35520=>19099,
-35521=>19100,
-35523=>19101,
-35525=>19102,
-35526=>19103,
-35528=>19104,
-35530=>19105,
-35532=>19106,
-35534=>19107,
-35536=>19108,
-35539=>19109,
-35540=>19110,
-35541=>19111,
-35544=>19112,
-35545=>19113,
-35546=>19114,
-35549=>19115,
-35551=>19116,
-35552=>19117,
-35553=>19118,
-35555=>19119,
-35557=>19120,
-35560=>19121,
-35561=>19122,
-35562=>19123,
-35564=>19124,
-35567=>19125,
-35568=>19126,
-35570=>19127,
-35572=>19128,
-35573=>19129,
-35577=>19130,
-35579=>19131,
-35581=>19132,
-35583=>19133,
-35587=>19134,
-35590=>19135,
-35592=>19136,
-35593=>19137,
-35595=>19138,
-35596=>19139,
-35597=>19140,
-35599=>19141,
-35601=>19142,
-35602=>19143,
-35603=>19144,
-35605=>19145,
-35608=>19146,
-35612=>19147,
-35614=>19148,
-35615=>19149,
-35616=>19150,
-35618=>19151,
-35619=>19152,
-35620=>19153,
-35621=>19154,
-35623=>19155,
-35625=>19156,
-35626=>19157,
-35630=>19158,
-35631=>19159,
-35632=>19160,
-35633=>19161,
-35634=>19162,
-35636=>19163,
-35637=>19164,
-35638=>19165,
-35639=>19166,
-35640=>19167,
-35642=>19168,
-35643=>19169,
-35644=>19170,
-35645=>19171,
-35647=>19172,
-35648=>19173,
-35649=>19174,
-35650=>19175,
-35651=>19176,
-35652=>19177,
-35653=>19178,
-35654=>19179,
-35655=>19180,
-35656=>19181,
-35658=>19182,
-35659=>19183,
-35660=>19184,
-35661=>19185,
-35664=>19186,
-35665=>19187,
-35666=>19188,
-35667=>19189,
-35668=>19190,
-35669=>19191,
-35671=>19192,
-35675=>19193,
-35677=>19194,
-35678=>19195,
-35679=>19196,
-35680=>19197,
-35681=>19198,
-35682=>19199,
-35683=>19200,
-35684=>19201,
-35685=>19202,
-35687=>19203,
-35688=>19204,
-35689=>19205,
-35690=>19206,
-35693=>19207,
-35694=>19208,
-35697=>19209,
-35698=>19210,
-35699=>19211,
-35701=>19212,
-35702=>19213,
-35704=>19214,
-35705=>19215,
-35706=>19216,
-35707=>19217,
-35708=>19218,
-35710=>19219,
-35711=>19220,
-35713=>19221,
-35714=>19222,
-35715=>19223,
-35716=>19224,
-35717=>19225,
-35718=>19226,
-35719=>19227,
-35720=>19228,
-35721=>19229,
-35723=>19230,
-35724=>19231,
-35725=>19232,
-35727=>19233,
-35728=>19234,
-35729=>19235,
-35732=>19236,
-35735=>19237,
-35736=>19238,
-35737=>19239,
-35738=>19240,
-35739=>19241,
-35741=>19242,
-35743=>19243,
-35756=>19244,
-35761=>19245,
-35771=>19246,
-35783=>19247,
-35792=>19248,
-35818=>19249,
-35849=>19250,
-35870=>19251,
-35896=>19252,
-35897=>19253,
-35898=>19254,
-35899=>19255,
-35900=>19256,
-35901=>19257,
-35902=>19258,
-35903=>19259,
-35904=>19260,
-35906=>19261,
-35907=>19262,
-35908=>19263,
-35909=>19264,
-35914=>19265,
-35915=>19266,
-35917=>19267,
-35918=>19268,
-35919=>19269,
-35921=>19270,
-35922=>19271,
-35923=>19272,
-35924=>19273,
-35926=>19274,
-35927=>19275,
-35928=>19276,
-35929=>19277,
-35931=>19278,
-35932=>19279,
-35933=>19280,
-35934=>19281,
-35935=>19282,
-35936=>19283,
-35939=>19284,
-35940=>19285,
-35941=>19286,
-35942=>19287,
-35943=>19288,
-35944=>19289,
-35945=>19290,
-35948=>19291,
-35949=>19292,
-35950=>19293,
-35951=>19294,
-35952=>19295,
-35953=>19296,
-35954=>19297,
-35956=>19298,
-35957=>19299,
-35958=>19300,
-35959=>19301,
-35963=>19302,
-35964=>19303,
-35965=>19304,
-35966=>19305,
-35967=>19306,
-35968=>19307,
-35969=>19308,
-35971=>19309,
-35972=>19310,
-35974=>19311,
-35975=>19312,
-35976=>19313,
-35979=>19314,
-35981=>19315,
-35982=>19316,
-35983=>19317,
-35984=>19318,
-35985=>19319,
-35986=>19320,
-35987=>19321,
-35989=>19322,
-35990=>19323,
-35991=>19324,
-35993=>19325,
-35994=>19326,
-35995=>19327,
-35996=>19328,
-35999=>19329,
-36003=>19330,
-36004=>19331,
-36005=>19332,
-36006=>19333,
-36013=>19334,
-36014=>19335,
-36017=>19336,
-36021=>19337,
-36025=>19338,
-36030=>19339,
-36038=>19340,
-36041=>19341,
-36043=>19342,
-36044=>19343,
-36045=>19344,
-36046=>19345,
-36047=>19346,
-36048=>19347,
-36052=>19348,
-36054=>19349,
-36055=>19350,
-36056=>19351,
-36057=>19352,
-36059=>19353,
-36061=>19354,
-36063=>19355,
-36069=>19356,
-36072=>19357,
-36073=>19358,
-36078=>19359,
-36079=>19360,
-36080=>19361,
-36081=>19362,
-36082=>19363,
-36083=>19364,
-36085=>19365,
-36086=>19366,
-36087=>19367,
-36088=>19368,
-36089=>19369,
-36095=>19370,
-36096=>19371,
-36097=>19372,
-36098=>19373,
-36099=>19374,
-36102=>19375,
-36103=>19376,
-36105=>19377,
-36108=>19378,
-36110=>19379,
-36113=>19380,
-36114=>19381,
-36115=>19382,
-36116=>19383,
-36117=>19384,
-36119=>19385,
-36120=>19386,
-36121=>19387,
-36122=>19388,
-36128=>19389,
-36177=>19390,
-36178=>19391,
-36183=>19392,
-36191=>19393,
-36197=>19394,
-36200=>19395,
-36201=>19396,
-36202=>19397,
-36204=>19398,
-36206=>19399,
-36207=>19400,
-36209=>19401,
-36210=>19402,
-36216=>19403,
-36217=>19404,
-36218=>19405,
-36219=>19406,
-36220=>19407,
-36221=>19408,
-36222=>19409,
-36223=>19410,
-36224=>19411,
-36226=>19412,
-36227=>19413,
-36230=>19414,
-36231=>19415,
-36232=>19416,
-36233=>19417,
-36236=>19418,
-36237=>19419,
-36238=>19420,
-36239=>19421,
-36240=>19422,
-36242=>19423,
-36243=>19424,
-36246=>19425,
-36247=>19426,
-36248=>19427,
-36250=>19428,
-36251=>19429,
-36252=>19430,
-36253=>19431,
-36254=>19432,
-36256=>19433,
-36257=>19434,
-36258=>19435,
-36260=>19436,
-36261=>19437,
-36262=>19438,
-36263=>19439,
-36265=>19440,
-36266=>19441,
-36267=>19442,
-36268=>19443,
-36269=>19444,
-36270=>19445,
-36271=>19446,
-36272=>19447,
-36278=>19448,
-36279=>19449,
-36281=>19450,
-36283=>19451,
-36285=>19452,
-36288=>19453,
-36289=>19454,
-36290=>19455,
-36293=>19456,
-36295=>19457,
-36296=>19458,
-36297=>19459,
-36298=>19460,
-36301=>19461,
-36304=>19462,
-36306=>19463,
-36307=>19464,
-36308=>19465,
-36309=>19466,
-36312=>19467,
-36313=>19468,
-36316=>19469,
-36320=>19470,
-36321=>19471,
-36322=>19472,
-36325=>19473,
-36326=>19474,
-36327=>19475,
-36329=>19476,
-36333=>19477,
-36334=>19478,
-36336=>19479,
-36337=>19480,
-36338=>19481,
-36340=>19482,
-36342=>19483,
-36348=>19484,
-36350=>19485,
-36351=>19486,
-36352=>19487,
-36353=>19488,
-36354=>19489,
-36355=>19490,
-36356=>19491,
-36358=>19492,
-36359=>19493,
-36360=>19494,
-36363=>19495,
-36365=>19496,
-36366=>19497,
-36369=>19498,
-36370=>19499,
-36371=>19500,
-36373=>19501,
-36374=>19502,
-36375=>19503,
-36376=>19504,
-36377=>19505,
-36378=>19506,
-36379=>19507,
-36380=>19508,
-36384=>19509,
-36385=>19510,
-36388=>19511,
-36389=>19512,
-36390=>19513,
-36391=>19514,
-36392=>19515,
-36395=>19516,
-36397=>19517,
-36400=>19518,
-36402=>19519,
-36403=>19520,
-36406=>19521,
-36407=>19522,
-36408=>19523,
-36411=>19524,
-36412=>19525,
-36414=>19526,
-36415=>19527,
-36419=>19528,
-36421=>19529,
-36422=>19530,
-36429=>19531,
-36430=>19532,
-36431=>19533,
-36432=>19534,
-36435=>19535,
-36436=>19536,
-36438=>19537,
-36439=>19538,
-36440=>19539,
-36442=>19540,
-36443=>19541,
-36444=>19542,
-36445=>19543,
-36446=>19544,
-36447=>19545,
-36448=>19546,
-36449=>19547,
-36450=>19548,
-36452=>19549,
-36453=>19550,
-36455=>19551,
-36456=>19552,
-36458=>19553,
-36459=>19554,
-36462=>19555,
-36465=>19556,
-36467=>19557,
-36469=>19558,
-36471=>19559,
-36472=>19560,
-36473=>19561,
-36475=>19562,
-36477=>19563,
-36478=>19564,
-36480=>19565,
-36482=>19566,
-36483=>19567,
-36484=>19568,
-36486=>19569,
-36488=>19570,
-36492=>19571,
-36494=>19572,
-36501=>19573,
-36502=>19574,
-36503=>19575,
-36504=>19576,
-36505=>19577,
-36507=>19578,
-36509=>19579,
-36511=>19580,
-36512=>19581,
-36514=>19582,
-36515=>19583,
-36516=>19584,
-36519=>19585,
-36520=>19586,
-36521=>19587,
-36525=>19588,
-36526=>19589,
-36528=>19590,
-36529=>19591,
-36531=>19592,
-36532=>19593,
-36533=>19594,
-36534=>19595,
-36535=>19596,
-36536=>19597,
-36537=>19598,
-36539=>19599,
-36540=>19600,
-36541=>19601,
-36542=>19602,
-36543=>19603,
-36545=>19604,
-36546=>19605,
-36547=>19606,
-36548=>19607,
-36549=>19608,
-36550=>19609,
-36551=>19610,
-36552=>19611,
-36553=>19612,
-36559=>19613,
-36560=>19614,
-36561=>19615,
-36563=>19616,
-36565=>19617,
-36566=>19618,
-36567=>19619,
-36568=>19620,
-36569=>19621,
-36570=>19622,
-36572=>19623,
-36573=>19624,
-36574=>19625,
-36576=>19626,
-36577=>19627,
-36578=>19628,
-36579=>19629,
-36581=>19630,
-36582=>19631,
-36583=>19632,
-36584=>19633,
-36585=>19634,
-36586=>19635,
-36588=>19636,
-36589=>19637,
-36590=>19638,
-36591=>19639,
-36592=>19640,
-36593=>19641,
-36595=>19642,
-36596=>19643,
-36597=>19644,
-36598=>19645,
-36599=>19646,
-36605=>19647,
-36607=>19648,
-36608=>19649,
-36609=>19650,
-36610=>19651,
-36612=>19652,
-36614=>19653,
-36616=>19654,
-36619=>19655,
-36620=>19656,
-36621=>19657,
-36622=>19658,
-36623=>19659,
-36624=>19660,
-36625=>19661,
-36627=>19662,
-36630=>19663,
-36631=>19664,
-36632=>19665,
-36633=>19666,
-36634=>19667,
-36640=>19668,
-36641=>19669,
-36642=>19670,
-36643=>19671,
-36644=>19672,
-36647=>19673,
-36648=>19674,
-36651=>19675,
-36652=>19676,
-36653=>19677,
-36654=>19678,
-36656=>19679,
-36657=>19680,
-36658=>19681,
-36660=>19682,
-36661=>19683,
-36662=>19684,
-36663=>19685,
-36665=>19686,
-36666=>19687,
-36668=>19688,
-36669=>19689,
-36672=>19690,
-36673=>19691,
-36675=>19692,
-36679=>19693,
-36680=>19694,
-36682=>19695,
-36683=>19696,
-36684=>19697,
-36687=>19698,
-36688=>19699,
-36689=>19700,
-36690=>19701,
-36691=>19702,
-36693=>19703,
-36694=>19704,
-36695=>19705,
-36696=>19706,
-36697=>19707,
-36698=>19708,
-36699=>19709,
-36700=>19710,
-36701=>19711,
-36702=>19712,
-36704=>19713,
-36707=>19714,
-36709=>19715,
-36714=>19716,
-36736=>19717,
-36748=>19718,
-36754=>19719,
-36765=>19720,
-36768=>19721,
-36769=>19722,
-36770=>19723,
-36772=>19724,
-36773=>19725,
-36775=>19726,
-36778=>19727,
-36780=>19728,
-36787=>19729,
-36788=>19730,
-12193=>19731,
-36789=>19731,
-36791=>19732,
-36792=>19733,
-36794=>19734,
-36795=>19735,
-36796=>19736,
-36799=>19737,
-36800=>19738,
-36803=>19739,
-36806=>19740,
-36809=>19741,
-36810=>19742,
-36811=>19743,
-36812=>19744,
-36813=>19745,
-36815=>19746,
-36818=>19747,
-36822=>19748,
-36823=>19749,
-36826=>19750,
-36832=>19751,
-36833=>19752,
-36835=>19753,
-36839=>19754,
-36844=>19755,
-36847=>19756,
-36849=>19757,
-36850=>19758,
-36853=>19759,
-36854=>19760,
-36858=>19761,
-36859=>19762,
-36860=>19763,
-36862=>19764,
-36863=>19765,
-36871=>19766,
-36872=>19767,
-36876=>19768,
-36878=>19769,
-36883=>19770,
-36888=>19771,
-36892=>19772,
-36900=>19773,
-36901=>19774,
-36903=>19775,
-36904=>19776,
-36905=>19777,
-36906=>19778,
-36907=>19779,
-36908=>19780,
-36912=>19781,
-36913=>19782,
-36915=>19783,
-36916=>19784,
-36919=>19785,
-36921=>19786,
-36922=>19787,
-36925=>19788,
-36927=>19789,
-36928=>19790,
-36931=>19791,
-36933=>19792,
-36934=>19793,
-36936=>19794,
-36937=>19795,
-36938=>19796,
-36940=>19797,
-36950=>19798,
-36953=>19799,
-36954=>19800,
-36957=>19801,
-36959=>19802,
-36961=>19803,
-36964=>19804,
-36966=>19805,
-36967=>19806,
-36970=>19807,
-36971=>19808,
-36972=>19809,
-36975=>19810,
-36976=>19811,
-36977=>19812,
-36979=>19813,
-36982=>19814,
-36985=>19815,
-36987=>19816,
-36990=>19817,
-36997=>19818,
-36998=>19819,
-37001=>19820,
-37004=>19821,
-37005=>19822,
-37006=>19823,
-37010=>19824,
-37012=>19825,
-37014=>19826,
-37016=>19827,
-37018=>19828,
-37020=>19829,
-37022=>19830,
-37023=>19831,
-37024=>19832,
-37028=>19833,
-37029=>19834,
-37031=>19835,
-37032=>19836,
-37033=>19837,
-37035=>19838,
-37037=>19839,
-37042=>19840,
-37047=>19841,
-37052=>19842,
-37053=>19843,
-37055=>19844,
-37056=>19845,
-37058=>19846,
-37059=>19847,
-37062=>19848,
-37064=>19849,
-37065=>19850,
-37067=>19851,
-37068=>19852,
-37069=>19853,
-37074=>19854,
-37076=>19855,
-37077=>19856,
-37078=>19857,
-37080=>19858,
-37081=>19859,
-37082=>19860,
-37086=>19861,
-37088=>19862,
-37091=>19863,
-37092=>19864,
-37093=>19865,
-37097=>19866,
-37098=>19867,
-37100=>19868,
-37102=>19869,
-37104=>19870,
-37105=>19871,
-37106=>19872,
-37107=>19873,
-37110=>19874,
-37111=>19875,
-37113=>19876,
-37114=>19877,
-37115=>19878,
-37116=>19879,
-37119=>19880,
-37120=>19881,
-37121=>19882,
-37123=>19883,
-37125=>19884,
-37127=>19885,
-37128=>19886,
-37130=>19887,
-37131=>19888,
-37132=>19889,
-37133=>19890,
-37134=>19891,
-37135=>19892,
-37136=>19893,
-37137=>19894,
-37139=>19895,
-37141=>19896,
-37143=>19897,
-37144=>19898,
-37146=>19899,
-37147=>19900,
-37148=>19901,
-37149=>19902,
-37151=>19903,
-37152=>19904,
-37153=>19905,
-37156=>19906,
-37157=>19907,
-37158=>19908,
-37160=>19909,
-37161=>19910,
-37162=>19911,
-37163=>19912,
-37164=>19913,
-37166=>19914,
-37171=>19915,
-37173=>19916,
-37175=>19917,
-37176=>19918,
-37179=>19919,
-37180=>19920,
-37181=>19921,
-37182=>19922,
-37183=>19923,
-37184=>19924,
-37185=>19925,
-37186=>19926,
-37188=>19927,
-37189=>19928,
-37191=>19929,
-37201=>19930,
-37203=>19931,
-37204=>19932,
-37205=>19933,
-37206=>19934,
-37208=>19935,
-37209=>19936,
-37211=>19937,
-37212=>19938,
-37215=>19939,
-37216=>19940,
-37222=>19941,
-37223=>19942,
-37224=>19943,
-37227=>19944,
-37229=>19945,
-37235=>19946,
-37242=>19947,
-37243=>19948,
-37244=>19949,
-37248=>19950,
-37249=>19951,
-37250=>19952,
-37251=>19953,
-37252=>19954,
-37254=>19955,
-37256=>19956,
-37258=>19957,
-37262=>19958,
-37263=>19959,
-37267=>19960,
-37268=>19961,
-37269=>19962,
-37271=>19963,
-37272=>19964,
-37273=>19965,
-37277=>19966,
-37278=>19967,
-37279=>19968,
-37280=>19969,
-37281=>19970,
-37284=>19971,
-37285=>19972,
-37286=>19973,
-37287=>19974,
-37288=>19975,
-37289=>19976,
-37296=>19977,
-37297=>19978,
-37298=>19979,
-37299=>19980,
-37302=>19981,
-37303=>19982,
-37304=>19983,
-37305=>19984,
-37307=>19985,
-37308=>19986,
-37309=>19987,
-37310=>19988,
-37311=>19989,
-37314=>19990,
-37316=>19991,
-12196=>19992,
-37318=>19992,
-37320=>19993,
-37328=>19994,
-37334=>19995,
-37338=>19996,
-37339=>19997,
-37342=>19998,
-37343=>19999,
-37344=>20000,
-37345=>20001,
-37346=>20002,
-37349=>20003,
-37350=>20004,
-37352=>20005,
-37354=>20006,
-37355=>20007,
-37356=>20008,
-37357=>20009,
-37358=>20010,
-37359=>20011,
-37360=>20012,
-37361=>20013,
-37362=>20014,
-37363=>20015,
-37364=>20016,
-37366=>20017,
-37368=>20018,
-37371=>20019,
-37372=>20020,
-37373=>20021,
-37374=>20022,
-37375=>20023,
-37378=>20024,
-37379=>20025,
-37381=>20026,
-37382=>20027,
-37383=>20028,
-37386=>20029,
-37387=>20030,
-37388=>20031,
-37391=>20032,
-37394=>20033,
-37395=>20034,
-37398=>20035,
-37399=>20036,
-37400=>20037,
-37401=>20038,
-37402=>20039,
-37403=>20040,
-37404=>20041,
-37405=>20042,
-37407=>20043,
-37408=>20044,
-37409=>20045,
-37410=>20046,
-37412=>20047,
-37416=>20048,
-37417=>20049,
-37418=>20050,
-37419=>20051,
-37420=>20052,
-37421=>20053,
-37423=>20054,
-37425=>20055,
-37426=>20056,
-37429=>20057,
-37430=>20058,
-37435=>20059,
-37436=>20060,
-37441=>20061,
-37442=>20062,
-37443=>20063,
-37444=>20064,
-37446=>20065,
-37447=>20066,
-37450=>20067,
-37451=>20068,
-37452=>20069,
-37454=>20070,
-37455=>20071,
-37456=>20072,
-37458=>20073,
-37459=>20074,
-37460=>20075,
-37462=>20076,
-37464=>20077,
-37465=>20078,
-37468=>20079,
-37469=>20080,
-37471=>20081,
-37472=>20082,
-37473=>20083,
-37475=>20084,
-37476=>20085,
-37477=>20086,
-37479=>20087,
-37480=>20088,
-37481=>20089,
-37482=>20090,
-37483=>20091,
-37486=>20092,
-37487=>20093,
-37488=>20094,
-37489=>20095,
-37490=>20096,
-37491=>20097,
-37493=>20098,
-37494=>20099,
-37495=>20100,
-37497=>20101,
-37500=>20102,
-37501=>20103,
-37502=>20104,
-37505=>20105,
-37506=>20106,
-37508=>20107,
-37510=>20108,
-37511=>20109,
-37512=>20110,
-37513=>20111,
-37514=>20112,
-37515=>20113,
-37516=>20114,
-37517=>20115,
-37519=>20116,
-37520=>20117,
-37522=>20118,
-37524=>20119,
-37525=>20120,
-37527=>20121,
-37529=>20122,
-37531=>20123,
-37533=>20124,
-37534=>20125,
-37535=>20126,
-37537=>20127,
-37538=>20128,
-37540=>20129,
-37543=>20130,
-37549=>20131,
-37551=>20132,
-37552=>20133,
-37554=>20134,
-37555=>20135,
-37556=>20136,
-37557=>20137,
-37558=>20138,
-37560=>20139,
-37562=>20140,
-37565=>20141,
-37566=>20142,
-37567=>20143,
-37568=>20144,
-37570=>20145,
-37572=>20146,
-37574=>20147,
-37577=>20148,
-37578=>20149,
-37579=>20150,
-37581=>20151,
-37582=>20152,
-37584=>20153,
-37585=>20154,
-37587=>20155,
-37588=>20156,
-37589=>20157,
-37590=>20158,
-37591=>20159,
-37592=>20160,
-37593=>20161,
-37594=>20162,
-37595=>20163,
-37596=>20164,
-37598=>20165,
-37600=>20166,
-37601=>20167,
-37602=>20168,
-37607=>20169,
-37609=>20170,
-37611=>20171,
-37612=>20172,
-37618=>20173,
-37619=>20174,
-37620=>20175,
-37621=>20176,
-37623=>20177,
-37625=>20178,
-37626=>20179,
-37627=>20180,
-37629=>20181,
-37630=>20182,
-37631=>20183,
-37632=>20184,
-37634=>20185,
-37635=>20186,
-37636=>20187,
-37637=>20188,
-37641=>20189,
-37642=>20190,
-37643=>20191,
-37644=>20192,
-37645=>20193,
-37646=>20194,
-37647=>20195,
-37649=>20196,
-37651=>20197,
-37652=>20198,
-37654=>20199,
-37655=>20200,
-37660=>20201,
-37661=>20202,
-37662=>20203,
-37665=>20204,
-37667=>20205,
-37668=>20206,
-37669=>20207,
-37671=>20208,
-37673=>20209,
-37674=>20210,
-37676=>20211,
-37677=>20212,
-37680=>20213,
-37681=>20214,
-37684=>20215,
-37685=>20216,
-37687=>20217,
-37689=>20218,
-37690=>20219,
-37691=>20220,
-37692=>20221,
-37693=>20222,
-37695=>20223,
-37698=>20224,
-37700=>20225,
-37701=>20226,
-37704=>20227,
-37705=>20228,
-37706=>20229,
-37708=>20230,
-37710=>20231,
-37711=>20232,
-37712=>20233,
-37713=>20234,
-37714=>20235,
-37715=>20236,
-37717=>20237,
-37718=>20238,
-37719=>20239,
-37721=>20240,
-37722=>20241,
-37724=>20242,
-37725=>20243,
-37726=>20244,
-37727=>20245,
-37728=>20246,
-37729=>20247,
-37730=>20248,
-37731=>20249,
-37734=>20250,
-37735=>20251,
-37736=>20252,
-37739=>20253,
-37741=>20254,
-37742=>20255,
-37743=>20256,
-37745=>20257,
-37746=>20258,
-37747=>20259,
-37748=>20260,
-37751=>20261,
-37752=>20262,
-37753=>20263,
-37755=>20264,
-37756=>20265,
-37757=>20266,
-37759=>20267,
-37760=>20268,
-37761=>20269,
-37763=>20270,
-37765=>20271,
-37766=>20272,
-37768=>20273,
-37769=>20274,
-37771=>20275,
-37772=>20276,
-37773=>20277,
-37774=>20278,
-37776=>20279,
-37777=>20280,
-37778=>20281,
-37779=>20282,
-37780=>20283,
-37781=>20284,
-37783=>20285,
-37785=>20286,
-37786=>20287,
-37787=>20288,
-37788=>20289,
-37789=>20290,
-37790=>20291,
-37791=>20292,
-37792=>20293,
-37793=>20294,
-37796=>20295,
-37797=>20296,
-37800=>20297,
-37803=>20298,
-37805=>20299,
-37807=>20300,
-37809=>20301,
-37810=>20302,
-37812=>20303,
-37814=>20304,
-37815=>20305,
-37817=>20306,
-37818=>20307,
-37819=>20308,
-37820=>20309,
-37821=>20310,
-37822=>20311,
-37824=>20312,
-37825=>20313,
-37826=>20314,
-37828=>20315,
-37829=>20316,
-37830=>20317,
-37833=>20318,
-37835=>20319,
-37838=>20320,
-37839=>20321,
-37840=>20322,
-37842=>20323,
-37843=>20324,
-37844=>20325,
-37845=>20326,
-37849=>20327,
-37850=>20328,
-37851=>20329,
-37856=>20330,
-37859=>20331,
-37861=>20332,
-37862=>20333,
-37863=>20334,
-37865=>20335,
-37866=>20336,
-37867=>20337,
-37868=>20338,
-37869=>20339,
-37870=>20340,
-37871=>20341,
-37872=>20342,
-37873=>20343,
-37874=>20344,
-37875=>20345,
-37876=>20346,
-37878=>20347,
-37880=>20348,
-37882=>20349,
-37883=>20350,
-37884=>20351,
-37885=>20352,
-37886=>20353,
-37887=>20354,
-37888=>20355,
-37889=>20356,
-37890=>20357,
-37892=>20358,
-37893=>20359,
-37894=>20360,
-37895=>20361,
-37896=>20362,
-37897=>20363,
-37898=>20364,
-37900=>20365,
-37901=>20366,
-37902=>20367,
-37903=>20368,
-37905=>20369,
-37909=>20370,
-37910=>20371,
-37911=>20372,
-37914=>20373,
-37915=>20374,
-37916=>20375,
-37918=>20376,
-37919=>20377,
-37921=>20378,
-37922=>20379,
-37923=>20380,
-37924=>20381,
-37925=>20382,
-37929=>20383,
-37930=>20384,
-37931=>20385,
-37932=>20386,
-37933=>20387,
-37935=>20388,
-37936=>20389,
-37937=>20390,
-37940=>20391,
-37942=>20392,
-37943=>20393,
-37945=>20394,
-37947=>20395,
-37948=>20396,
-37949=>20397,
-37952=>20398,
-37953=>20399,
-37954=>20400,
-37955=>20401,
-37957=>20402,
-37958=>20403,
-37959=>20404,
-37960=>20405,
-37961=>20406,
-37963=>20407,
-37965=>20408,
-37966=>20409,
-37967=>20410,
-37968=>20411,
-37969=>20412,
-37971=>20413,
-37973=>20414,
-37974=>20415,
-37975=>20416,
-37976=>20417,
-37977=>20418,
-37978=>20419,
-37979=>20420,
-37980=>20421,
-37981=>20422,
-37982=>20423,
-37983=>20424,
-37985=>20425,
-37986=>20426,
-37988=>20427,
-37990=>20428,
-37991=>20429,
-37992=>20430,
-37993=>20431,
-37994=>20432,
-37996=>20433,
-37998=>20434,
-37999=>20435,
-38001=>20436,
-38003=>20437,
-38004=>20438,
-38005=>20439,
-38006=>20440,
-38008=>20441,
-38010=>20442,
-38011=>20443,
-38016=>20444,
-38017=>20445,
-38018=>20446,
-38019=>20447,
-38020=>20448,
-38033=>20449,
-38038=>20450,
-38040=>20451,
-38087=>20452,
-38095=>20453,
-38099=>20454,
-38100=>20455,
-38106=>20456,
-38118=>20457,
-38139=>20458,
-38172=>20459,
-38176=>20460,
-38183=>20461,
-38195=>20462,
-38205=>20463,
-38211=>20464,
-38216=>20465,
-38219=>20466,
-38229=>20467,
-38234=>20468,
-38240=>20469,
-38254=>20470,
-38260=>20471,
-38261=>20472,
-38264=>20473,
-38265=>20474,
-38266=>20475,
-38267=>20476,
-38268=>20477,
-38269=>20478,
-38270=>20479,
-38273=>20480,
-38276=>20481,
-38277=>20482,
-38279=>20483,
-38280=>20484,
-38282=>20485,
-38285=>20486,
-38288=>20487,
-38290=>20488,
-38293=>20489,
-38294=>20490,
-38295=>20491,
-38297=>20492,
-38298=>20493,
-38299=>20494,
-38300=>20495,
-38301=>20496,
-38302=>20497,
-38303=>20498,
-38304=>20499,
-38306=>20500,
-38310=>20501,
-38311=>20502,
-38314=>20503,
-38318=>20504,
-38319=>20505,
-38320=>20506,
-38321=>20507,
-38323=>20508,
-38324=>20509,
-38325=>20510,
-38327=>20511,
-38328=>20512,
-38330=>20513,
-38336=>20514,
-38337=>20515,
-38338=>20516,
-38340=>20517,
-38341=>20518,
-38343=>20519,
-38345=>20520,
-38349=>20521,
-38350=>20522,
-38351=>20523,
-38353=>20524,
-38354=>20525,
-38355=>20526,
-38359=>20527,
-38360=>20528,
-38361=>20529,
-38362=>20530,
-38363=>20531,
-38365=>20532,
-38367=>20533,
-38368=>20534,
-38371=>20535,
-38372=>20536,
-38374=>20537,
-38375=>20538,
-38380=>20539,
-38399=>20540,
-38407=>20541,
-38419=>20542,
-38424=>20543,
-38427=>20544,
-38430=>20545,
-38432=>20546,
-38435=>20547,
-38436=>20548,
-38437=>20549,
-38438=>20550,
-38439=>20551,
-38440=>20552,
-38441=>20553,
-38443=>20554,
-38444=>20555,
-38445=>20556,
-38447=>20557,
-38448=>20558,
-38455=>20559,
-38456=>20560,
-38457=>20561,
-38458=>20562,
-38462=>20563,
-38465=>20564,
-38467=>20565,
-38474=>20566,
-38478=>20567,
-38479=>20568,
-38481=>20569,
-38482=>20570,
-38483=>20571,
-38486=>20572,
-38487=>20573,
-38489=>20574,
-38490=>20575,
-38492=>20576,
-38494=>20577,
-38496=>20578,
-38501=>20579,
-38502=>20580,
-38507=>20581,
-38509=>20582,
-38510=>20583,
-38511=>20584,
-38513=>20585,
-38521=>20586,
-38522=>20587,
-38523=>20588,
-38524=>20589,
-38526=>20590,
-38527=>20591,
-38528=>20592,
-38529=>20593,
-38530=>20594,
-38531=>20595,
-38532=>20596,
-38535=>20597,
-38537=>20598,
-38540=>20599,
-38545=>20600,
-38546=>20601,
-38547=>20602,
-38550=>20603,
-38554=>20604,
-38557=>20605,
-38558=>20606,
-38559=>20607,
-38560=>20608,
-38561=>20609,
-38562=>20610,
-63985=>20611,
-38563=>20611,
-38564=>20612,
-38565=>20613,
-38566=>20614,
-38569=>20615,
-38571=>20616,
-38572=>20617,
-38573=>20618,
-38574=>20619,
-38575=>20620,
-38578=>20621,
-38581=>20622,
-38583=>20623,
-38586=>20624,
-38591=>20625,
-38594=>20626,
-38595=>20627,
-38600=>20628,
-38602=>20629,
-38603=>20630,
-38608=>20631,
-38609=>20632,
-38611=>20633,
-38612=>20634,
-38615=>20635,
-38616=>20636,
-38618=>20637,
-38621=>20638,
-38622=>20639,
-38623=>20640,
-38625=>20641,
-38628=>20642,
-38629=>20643,
-38630=>20644,
-38631=>20645,
-38635=>20646,
-38636=>20647,
-38637=>20648,
-38638=>20649,
-38640=>20650,
-38641=>20651,
-38644=>20652,
-38645=>20653,
-38648=>20654,
-38650=>20655,
-38652=>20656,
-38653=>20657,
-38655=>20658,
-38658=>20659,
-38659=>20660,
-38661=>20661,
-38666=>20662,
-38667=>20663,
-38668=>20664,
-38672=>20665,
-38673=>20666,
-38674=>20667,
-38676=>20668,
-38677=>20669,
-38679=>20670,
-38680=>20671,
-38681=>20672,
-38682=>20673,
-38683=>20674,
-38685=>20675,
-38687=>20676,
-38688=>20677,
-38689=>20678,
-38690=>20679,
-38691=>20680,
-38692=>20681,
-38693=>20682,
-38694=>20683,
-38696=>20684,
-38697=>20685,
-38699=>20686,
-38700=>20687,
-38702=>20688,
-38703=>20689,
-38705=>20690,
-38707=>20691,
-38708=>20692,
-38709=>20693,
-38710=>20694,
-38711=>20695,
-38714=>20696,
-38715=>20697,
-38716=>20698,
-38719=>20699,
-38720=>20700,
-38721=>20701,
-38723=>20702,
-38725=>20703,
-38726=>20704,
-38727=>20705,
-38729=>20706,
-38730=>20707,
-38731=>20708,
-38732=>20709,
-38733=>20710,
-38734=>20711,
-38735=>20712,
-38736=>20713,
-12205=>20714,
-38737=>20714,
-38740=>20715,
-38741=>20716,
-38743=>20717,
-38744=>20718,
-38748=>20719,
-38749=>20720,
-38751=>20721,
-38755=>20722,
-38756=>20723,
-38758=>20724,
-38759=>20725,
-38762=>20726,
-38763=>20727,
-38764=>20728,
-38765=>20729,
-38766=>20730,
-38767=>20731,
-38768=>20732,
-38769=>20733,
-38770=>20734,
-38773=>20735,
-38775=>20736,
-38776=>20737,
-38777=>20738,
-38778=>20739,
-38779=>20740,
-38781=>20741,
-38782=>20742,
-38783=>20743,
-38784=>20744,
-38785=>20745,
-38786=>20746,
-38787=>20747,
-38788=>20748,
-38790=>20749,
-38791=>20750,
-38792=>20751,
-38793=>20752,
-38794=>20753,
-38796=>20754,
-38798=>20755,
-38800=>20756,
-38803=>20757,
-38805=>20758,
-38806=>20759,
-38807=>20760,
-38809=>20761,
-38810=>20762,
-38811=>20763,
-38812=>20764,
-38813=>20765,
-38814=>20766,
-38815=>20767,
-38817=>20768,
-38818=>20769,
-38820=>20770,
-38821=>20771,
-38823=>20772,
-38824=>20773,
-38825=>20774,
-38826=>20775,
-38828=>20776,
-38830=>20777,
-38832=>20778,
-38833=>20779,
-38835=>20780,
-38837=>20781,
-38838=>20782,
-38839=>20783,
-38840=>20784,
-38841=>20785,
-38842=>20786,
-38843=>20787,
-38844=>20788,
-38846=>20789,
-38847=>20790,
-38848=>20791,
-38849=>20792,
-38850=>20793,
-38852=>20794,
-38853=>20795,
-38855=>20796,
-38856=>20797,
-38858=>20798,
-38861=>20799,
-38862=>20800,
-38863=>20801,
-38864=>20802,
-38865=>20803,
-38866=>20804,
-38868=>20805,
-38869=>20806,
-38870=>20807,
-38871=>20808,
-38872=>20809,
-38874=>20810,
-38875=>20811,
-38877=>20812,
-38879=>20813,
-38880=>20814,
-38881=>20815,
-38882=>20816,
-38883=>20817,
-38884=>20818,
-38885=>20819,
-38888=>20820,
-38894=>20821,
-38895=>20822,
-38896=>20823,
-38897=>20824,
-38898=>20825,
-38900=>20826,
-38903=>20827,
-38904=>20828,
-38905=>20829,
-38906=>20830,
-38907=>20831,
-38908=>20832,
-38909=>20833,
-38910=>20834,
-38912=>20835,
-38916=>20836,
-38921=>20837,
-38923=>20838,
-38925=>20839,
-38932=>20840,
-38933=>20841,
-38934=>20842,
-38937=>20843,
-38938=>20844,
-38939=>20845,
-38941=>20846,
-38942=>20847,
-38943=>20848,
-38944=>20849,
-38946=>20850,
-38947=>20851,
-38949=>20852,
-38951=>20853,
-38952=>20854,
-38953=>20855,
-38954=>20856,
-38955=>20857,
-38956=>20858,
-38958=>20859,
-38959=>20860,
-38961=>20861,
-38962=>20862,
-38963=>20863,
-38964=>20864,
-38965=>20865,
-38966=>20866,
-38969=>20867,
-38970=>20868,
-38972=>20869,
-38974=>20870,
-38975=>20871,
-38976=>20872,
-38977=>20873,
-38978=>20874,
-38979=>20875,
-38980=>20876,
-38981=>20877,
-38983=>20878,
-38984=>20879,
-38985=>20880,
-38986=>20881,
-38987=>20882,
-38991=>20883,
-38992=>20884,
-38993=>20885,
-38994=>20886,
-38997=>20887,
-38998=>20888,
-38999=>20889,
-39002=>20890,
-39004=>20891,
-39005=>20892,
-39007=>20893,
-39008=>20894,
-39009=>20895,
-39011=>20896,
-39012=>20897,
-39014=>20898,
-39016=>20899,
-39017=>20900,
-39018=>20901,
-39021=>20902,
-39022=>20903,
-39026=>20904,
-39051=>20905,
-39054=>20906,
-39058=>20907,
-39061=>20908,
-39065=>20909,
-39075=>20910,
-39081=>20911,
-39082=>20912,
-39083=>20913,
-39084=>20914,
-39085=>20915,
-39088=>20916,
-39090=>20917,
-39092=>20918,
-39093=>20919,
-39095=>20920,
-39096=>20921,
-39097=>20922,
-39098=>20923,
-39099=>20924,
-39101=>20925,
-39102=>20926,
-39103=>20927,
-39104=>20928,
-39105=>20929,
-39106=>20930,
-39107=>20931,
-39109=>20932,
-39111=>20933,
-39113=>20934,
-39114=>20935,
-39115=>20936,
-39116=>20937,
-39117=>20938,
-39119=>20939,
-39120=>20940,
-39124=>20941,
-39126=>20942,
-39127=>20943,
-39132=>20944,
-39133=>20945,
-39137=>20946,
-39139=>20947,
-39140=>20948,
-39141=>20949,
-39142=>20950,
-39148=>20951,
-39150=>20952,
-39152=>20953,
-39153=>20954,
-39155=>20955,
-39157=>20956,
-39158=>20957,
-39159=>20958,
-39160=>20959,
-39161=>20960,
-39162=>20961,
-39163=>20962,
-39167=>20963,
-39168=>20964,
-39169=>20965,
-39170=>20966,
-39172=>20967,
-39174=>20968,
-39175=>20969,
-39176=>20970,
-39179=>20971,
-39182=>20972,
-39183=>20973,
-39188=>20974,
-39189=>20975,
-39190=>20976,
-39191=>20977,
-39193=>20978,
-39194=>20979,
-39196=>20980,
-39197=>20981,
-39199=>20982,
-39200=>20983,
-39202=>20984,
-39203=>20985,
-39204=>20986,
-39205=>20987,
-39206=>20988,
-39207=>20989,
-39209=>20990,
-39210=>20991,
-39211=>20992,
-39212=>20993,
-39213=>20994,
-39215=>20995,
-39216=>20996,
-39217=>20997,
-39218=>20998,
-39220=>20999,
-39221=>21000,
-39222=>21001,
-39224=>21002,
-39225=>21003,
-39226=>21004,
-39227=>21005,
-39229=>21006,
-39232=>21007,
-39233=>21008,
-39234=>21009,
-39236=>21010,
-39238=>21011,
-39239=>21012,
-39245=>21013,
-39246=>21014,
-39247=>21015,
-39248=>21016,
-39251=>21017,
-39254=>21018,
-39256=>21019,
-39257=>21020,
-39258=>21021,
-39259=>21022,
-39261=>21023,
-39263=>21024,
-39264=>21025,
-39265=>21026,
-39268=>21027,
-39270=>21028,
-39283=>21029,
-39288=>21030,
-39289=>21031,
-39291=>21032,
-39294=>21033,
-39298=>21034,
-39299=>21035,
-39305=>21036,
-39308=>21037,
-39310=>21038,
-39322=>21039,
-39323=>21040,
-39324=>21041,
-39325=>21042,
-39326=>21043,
-39327=>21044,
-39328=>21045,
-39329=>21046,
-39330=>21047,
-39331=>21048,
-39332=>21049,
-39334=>21050,
-39335=>21051,
-39337=>21052,
-39338=>21053,
-39339=>21054,
-39343=>21055,
-39344=>21056,
-39346=>21057,
-39349=>21058,
-39350=>21059,
-39351=>21060,
-39352=>21061,
-39353=>21062,
-39354=>21063,
-39355=>21064,
-39356=>21065,
-39357=>21066,
-39358=>21067,
-39359=>21068,
-39360=>21069,
-39362=>21070,
-39363=>21071,
-39364=>21072,
-39365=>21073,
-39366=>21074,
-39367=>21075,
-39368=>21076,
-39369=>21077,
-39370=>21078,
-39371=>21079,
-39372=>21080,
-39373=>21081,
-39374=>21082,
-39375=>21083,
-39379=>21084,
-39382=>21085,
-39383=>21086,
-39386=>21087,
-39388=>21088,
-39390=>21089,
-39392=>21090,
-39395=>21091,
-39396=>21092,
-39397=>21093,
-39398=>21094,
-39399=>21095,
-39400=>21096,
-39401=>21097,
-39402=>21098,
-39403=>21099,
-39404=>21100,
-39406=>21101,
-39407=>21102,
-39408=>21103,
-39410=>21104,
-39411=>21105,
-39412=>21106,
-39413=>21107,
-39414=>21108,
-39415=>21109,
-39416=>21110,
-39417=>21111,
-39418=>21112,
-39419=>21113,
-39420=>21114,
-39421=>21115,
-39422=>21116,
-39424=>21117,
-39426=>21118,
-39427=>21119,
-39428=>21120,
-39430=>21121,
-39431=>21122,
-39432=>21123,
-39433=>21124,
-39434=>21125,
-39435=>21126,
-39436=>21127,
-39440=>21128,
-39441=>21129,
-39442=>21130,
-39443=>21131,
-39444=>21132,
-39445=>21133,
-39447=>21134,
-39448=>21135,
-39450=>21136,
-39451=>21137,
-39452=>21138,
-39453=>21139,
-39454=>21140,
-39455=>21141,
-39456=>21142,
-39457=>21143,
-39458=>21144,
-39459=>21145,
-39460=>21146,
-39461=>21147,
-39462=>21148,
-39463=>21149,
-39464=>21150,
-39465=>21151,
-39466=>21152,
-39468=>21153,
-39471=>21154,
-39473=>21155,
-39474=>21156,
-39475=>21157,
-39476=>21158,
-39477=>21159,
-39481=>21160,
-39482=>21161,
-39483=>21162,
-39484=>21163,
-39485=>21164,
-39487=>21165,
-39494=>21166,
-39495=>21167,
-39496=>21168,
-39497=>21169,
-39499=>21170,
-39500=>21171,
-39502=>21172,
-39504=>21173,
-39505=>21174,
-39506=>21175,
-39507=>21176,
-39508=>21177,
-39510=>21178,
-39512=>21179,
-39513=>21180,
-39516=>21181,
-39517=>21182,
-39518=>21183,
-39520=>21184,
-39521=>21185,
-39523=>21186,
-39526=>21187,
-39527=>21188,
-39528=>21189,
-39529=>21190,
-39531=>21191,
-39538=>21192,
-39555=>21193,
-39561=>21194,
-39565=>21195,
-39566=>21196,
-39572=>21197,
-39573=>21198,
-39577=>21199,
-39590=>21200,
-39593=>21201,
-39594=>21202,
-39595=>21203,
-39596=>21204,
-39597=>21205,
-39598=>21206,
-39602=>21207,
-39603=>21208,
-39604=>21209,
-39605=>21210,
-39609=>21211,
-39611=>21212,
-39613=>21213,
-39614=>21214,
-39615=>21215,
-39619=>21216,
-39620=>21217,
-39622=>21218,
-39623=>21219,
-39624=>21220,
-39625=>21221,
-39626=>21222,
-39629=>21223,
-39630=>21224,
-39632=>21225,
-39639=>21226,
-39641=>21227,
-39642=>21228,
-39643=>21229,
-39644=>21230,
-39645=>21231,
-39646=>21232,
-39648=>21233,
-39650=>21234,
-39651=>21235,
-39652=>21236,
-39653=>21237,
-39655=>21238,
-39656=>21239,
-39657=>21240,
-39658=>21241,
-39660=>21242,
-39664=>21243,
-39665=>21244,
-39666=>21245,
-39667=>21246,
-39668=>21247,
-39669=>21248,
-39670=>21249,
-39671=>21250,
-39672=>21251,
-39674=>21252,
-39676=>21253,
-39677=>21254,
-39678=>21255,
-39679=>21256,
-39680=>21257,
-39681=>21258,
-39682=>21259,
-39684=>21260,
-39685=>21261,
-39687=>21262,
-39689=>21263,
-39690=>21264,
-39691=>21265,
-39692=>21266,
-39694=>21267,
-39696=>21268,
-39697=>21269,
-39698=>21270,
-39700=>21271,
-39701=>21272,
-39702=>21273,
-39703=>21274,
-39704=>21275,
-39705=>21276,
-39707=>21277,
-39708=>21278,
-39709=>21279,
-39710=>21280,
-39712=>21281,
-39713=>21282,
-39716=>21283,
-39718=>21284,
-39720=>21285,
-39722=>21286,
-39723=>21287,
-39724=>21288,
-39725=>21289,
-39728=>21290,
-39731=>21291,
-39732=>21292,
-39733=>21293,
-39734=>21294,
-39735=>21295,
-39736=>21296,
-39737=>21297,
-39738=>21298,
-39741=>21299,
-39742=>21300,
-39743=>21301,
-39744=>21302,
-39750=>21303,
-39754=>21304,
-39755=>21305,
-39756=>21306,
-39760=>21307,
-39762=>21308,
-39763=>21309,
-39765=>21310,
-39766=>21311,
-39767=>21312,
-39769=>21313,
-39771=>21314,
-39772=>21315,
-39773=>21316,
-39774=>21317,
-39775=>21318,
-39776=>21319,
-39777=>21320,
-39778=>21321,
-39779=>21322,
-39780=>21323,
-39781=>21324,
-39782=>21325,
-39783=>21326,
-39784=>21327,
-39785=>21328,
-39786=>21329,
-39787=>21330,
-39788=>21331,
-39789=>21332,
-39790=>21333,
-39792=>21334,
-39793=>21335,
-39794=>21336,
-39795=>21337,
-39797=>21338,
-39798=>21339,
-39800=>21340,
-39801=>21341,
-39802=>21342,
-39803=>21343,
-39804=>21344,
-39805=>21345,
-39806=>21346,
-39807=>21347,
-39808=>21348,
-39810=>21349,
-39812=>21350,
-39813=>21351,
-39814=>21352,
-39815=>21353,
-39816=>21354,
-39817=>21355,
-39818=>21356,
-39819=>21357,
-39820=>21358,
-39821=>21359,
-39823=>21360,
-39827=>21361,
-39828=>21362,
-39829=>21363,
-39830=>21364,
-39831=>21365,
-39832=>21366,
-39833=>21367,
-39835=>21368,
-39836=>21369,
-39839=>21370,
-39840=>21371,
-39841=>21372,
-39842=>21373,
-39843=>21374,
-39844=>21375,
-39845=>21376,
-39846=>21377,
-39847=>21378,
-39848=>21379,
-39849=>21380,
-39852=>21381,
-39855=>21382,
-39856=>21383,
-39857=>21384,
-39858=>21385,
-39859=>21386,
-39860=>21387,
-39861=>21388,
-39862=>21389,
-39863=>21390,
-39864=>21391,
-39865=>21392,
-39866=>21393,
-39867=>21394,
-39868=>21395,
-39869=>21396,
-39870=>21397,
-39871=>21398,
-39874=>21399,
-39875=>21400,
-39876=>21401,
-39877=>21402,
-39878=>21403,
-39880=>21404,
-39883=>21405,
-39884=>21406,
-39885=>21407,
-39886=>21408,
-39887=>21409,
-39888=>21410,
-39889=>21411,
-39890=>21412,
-39891=>21413,
-39893=>21414,
-39895=>21415,
-39896=>21416,
-39897=>21417,
-39898=>21418,
-39900=>21419,
-39902=>21420,
-39903=>21421,
-39904=>21422,
-39907=>21423,
-39909=>21424,
-39910=>21425,
-39913=>21426,
-39916=>21427,
-39917=>21428,
-39918=>21429,
-39919=>21430,
-39921=>21431,
-39922=>21432,
-39923=>21433,
-39925=>21434,
-39926=>21435,
-39927=>21436,
-39928=>21437,
-39929=>21438,
-39930=>21439,
-39931=>21440,
-39932=>21441,
-39934=>21442,
-39936=>21443,
-39937=>21444,
-39938=>21445,
-39939=>21446,
-39940=>21447,
-39941=>21448,
-39942=>21449,
-39943=>21450,
-39946=>21451,
-39947=>21452,
-39948=>21453,
-39950=>21454,
-39951=>21455,
-39953=>21456,
-39956=>21457,
-39957=>21458,
-39958=>21459,
-39959=>21460,
-39960=>21461,
-39961=>21462,
-39962=>21463,
-39963=>21464,
-39964=>21465,
-39965=>21466,
-39966=>21467,
-39967=>21468,
-39969=>21469,
-39970=>21470,
-39972=>21471,
-39974=>21472,
-39975=>21473,
-39978=>21474,
-39979=>21475,
-39980=>21476,
-39982=>21477,
-39983=>21478,
-39984=>21479,
-39988=>21480,
-39990=>21481,
-39992=>21482,
-39994=>21483,
-39996=>21484,
-39997=>21485,
-39999=>21486,
-40000=>21487,
-40001=>21488,
-40002=>21489,
-40003=>21490,
-40004=>21491,
-40006=>21492,
-40007=>21493,
-40010=>21494,
-40011=>21495,
-40012=>21496,
-40013=>21497,
-40014=>21498,
-40015=>21499,
-40016=>21500,
-40017=>21501,
-40019=>21502,
-40021=>21503,
-40025=>21504,
-40026=>21505,
-40027=>21506,
-40028=>21507,
-40030=>21508,
-40032=>21509,
-40033=>21510,
-40034=>21511,
-40035=>21512,
-40036=>21513,
-40037=>21514,
-40038=>21515,
-40040=>21516,
-40041=>21517,
-40042=>21518,
-40043=>21519,
-40044=>21520,
-40046=>21521,
-40047=>21522,
-40048=>21523,
-40049=>21524,
-40050=>21525,
-40051=>21526,
-40052=>21527,
-40053=>21528,
-40054=>21529,
-40055=>21530,
-40057=>21531,
-40059=>21532,
-40061=>21533,
-40062=>21534,
-40064=>21535,
-40067=>21536,
-40068=>21537,
-40073=>21538,
-40074=>21539,
-40076=>21540,
-40079=>21541,
-40083=>21542,
-40086=>21543,
-40087=>21544,
-40088=>21545,
-40089=>21546,
-40093=>21547,
-40106=>21548,
-40108=>21549,
-40111=>21550,
-40121=>21551,
-40126=>21552,
-40127=>21553,
-40128=>21554,
-40129=>21555,
-40130=>21556,
-40136=>21557,
-40137=>21558,
-40145=>21559,
-40146=>21560,
-40154=>21561,
-40155=>21562,
-40160=>21563,
-40161=>21564,
-40163=>21565,
-40164=>21566,
-40166=>21567,
-40167=>21568,
-40168=>21569,
-40170=>21570,
-40171=>21571,
-40173=>21572,
-40174=>21573,
-40175=>21574,
-40176=>21575,
-40177=>21576,
-40178=>21577,
-40181=>21578,
-40183=>21579,
-40184=>21580,
-40185=>21581,
-40186=>21582,
-40187=>21583,
-40188=>21584,
-40189=>21585,
-40190=>21586,
-40191=>21587,
-40192=>21588,
-40193=>21589,
-40194=>21590,
-40195=>21591,
-40196=>21592,
-40197=>21593,
-40200=>21594,
-40202=>21595,
-40203=>21596,
-40204=>21597,
-40205=>21598,
-40206=>21599,
-40207=>21600,
-40208=>21601,
-40209=>21602,
-40210=>21603,
-40211=>21604,
-40212=>21605,
-40214=>21606,
-40215=>21607,
-40216=>21608,
-40217=>21609,
-40218=>21610,
-40220=>21611,
-40222=>21612,
-40224=>21613,
-40225=>21614,
-40226=>21615,
-40228=>21616,
-40229=>21617,
-40231=>21618,
-40233=>21619,
-40234=>21620,
-40235=>21621,
-40236=>21622,
-40237=>21623,
-40238=>21624,
-40241=>21625,
-40242=>21626,
-40243=>21627,
-40244=>21628,
-40245=>21629,
-40246=>21630,
-40247=>21631,
-40248=>21632,
-40249=>21633,
-40250=>21634,
-40252=>21635,
-40253=>21636,
-40254=>21637,
-40256=>21638,
-40257=>21639,
-40259=>21640,
-40260=>21641,
-40261=>21642,
-40262=>21643,
-40263=>21644,
-40264=>21645,
-40265=>21646,
-40266=>21647,
-40267=>21648,
-40268=>21649,
-40269=>21650,
-40270=>21651,
-40271=>21652,
-40272=>21653,
-40276=>21654,
-40277=>21655,
-40278=>21656,
-40279=>21657,
-40280=>21658,
-40281=>21659,
-40282=>21660,
-40283=>21661,
-40286=>21662,
-40287=>21663,
-40290=>21664,
-40291=>21665,
-40292=>21666,
-40293=>21667,
-40294=>21668,
-40295=>21669,
-40296=>21670,
-40297=>21671,
-40299=>21672,
-40301=>21673,
-40302=>21674,
-40304=>21675,
-40305=>21676,
-40307=>21677,
-40308=>21678,
-40309=>21679,
-40310=>21680,
-40311=>21681,
-40312=>21682,
-40313=>21683,
-40314=>21684,
-40315=>21685,
-40316=>21686,
-40317=>21687,
-40318=>21688,
-40319=>21689,
-40320=>21690,
-40321=>21691,
-40322=>21692,
-40323=>21693,
-40324=>21694,
-40325=>21695,
-40326=>21696,
-40328=>21697,
-40330=>21698,
-40331=>21699,
-40332=>21700,
-40333=>21701,
-40334=>21702,
-40335=>21703,
-40336=>21704,
-40337=>21705,
-40338=>21706,
-40340=>21707,
-40341=>21708,
-40342=>21709,
-40343=>21710,
-40345=>21711,
-40347=>21712,
-40348=>21713,
-40349=>21714,
-40350=>21715,
-40351=>21716,
-40352=>21717,
-40353=>21718,
-40354=>21719,
-40355=>21720,
-40356=>21721,
-40358=>21722,
-40359=>21723,
-40360=>21724,
-40362=>21725,
-40363=>21726,
-40364=>21727,
-40365=>21728,
-40366=>21729,
-40368=>21730,
-40369=>21731,
-40370=>21732,
-40371=>21733,
-40373=>21734,
-40374=>21735,
-40375=>21736,
-40376=>21737,
-40377=>21738,
-40378=>21739,
-40381=>21740,
-40382=>21741,
-40383=>21742,
-40385=>21743,
-40387=>21744,
-40389=>21745,
-40390=>21746,
-40391=>21747,
-40392=>21748,
-40393=>21749,
-40394=>21750,
-40395=>21751,
-40396=>21752,
-40397=>21753,
-40398=>21754,
-40399=>21755,
-40400=>21756,
-40401=>21757,
-40402=>21758,
-40404=>21759,
-40405=>21760,
-40406=>21761,
-40408=>21762,
-40411=>21763,
-40412=>21764,
-40413=>21765,
-40414=>21766,
-40415=>21767,
-40416=>21768,
-40417=>21769,
-40418=>21770,
-40419=>21771,
-40420=>21772,
-40423=>21773,
-40424=>21774,
-40425=>21775,
-40426=>21776,
-40427=>21777,
-40428=>21778,
-40429=>21779,
-40430=>21780,
-40432=>21781,
-40433=>21782,
-40436=>21783,
-40437=>21784,
-40438=>21785,
-40439=>21786,
-40443=>21787,
-40444=>21788,
-40445=>21789,
-40446=>21790,
-40447=>21791,
-40448=>21792,
-40449=>21793,
-40450=>21794,
-40451=>21795,
-40452=>21796,
-40453=>21797,
-40454=>21798,
-40455=>21799,
-40456=>21800,
-40457=>21801,
-40458=>21802,
-40459=>21803,
-40461=>21804,
-40462=>21805,
-40463=>21806,
-40464=>21807,
-40465=>21808,
-40466=>21809,
-40467=>21810,
-40468=>21811,
-40470=>21812,
-40471=>21813,
-40472=>21814,
-40473=>21815,
-40476=>21816,
-40484=>21817,
-40487=>21818,
-40494=>21819,
-40496=>21820,
-40500=>21821,
-40507=>21822,
-40508=>21823,
-40512=>21824,
-40525=>21825,
-40528=>21826,
-40530=>21827,
-40531=>21828,
-40532=>21829,
-40534=>21830,
-40537=>21831,
-40541=>21832,
-40543=>21833,
-40544=>21834,
-40545=>21835,
-40546=>21836,
-40549=>21837,
-40558=>21838,
-40559=>21839,
-40562=>21840,
-40564=>21841,
-40566=>21842,
-40567=>21843,
-40568=>21844,
-40571=>21845,
-40576=>21846,
-40577=>21847,
-40579=>21848,
-40580=>21849,
-40581=>21850,
-40582=>21851,
-40585=>21852,
-40586=>21853,
-40588=>21854,
-40589=>21855,
-40590=>21856,
-40591=>21857,
-40592=>21858,
-40593=>21859,
-40596=>21860,
-40597=>21861,
-40598=>21862,
-40600=>21863,
-40601=>21864,
-40602=>21865,
-40603=>21866,
-40604=>21867,
-40606=>21868,
-40608=>21869,
-40609=>21870,
-40610=>21871,
-40611=>21872,
-40612=>21873,
-40615=>21874,
-40616=>21875,
-40618=>21876,
-40619=>21877,
-40620=>21878,
-40621=>21879,
-40622=>21880,
-40624=>21881,
-40625=>21882,
-40626=>21883,
-40627=>21884,
-40630=>21885,
-40631=>21886,
-40633=>21887,
-40634=>21888,
-40636=>21889,
-40639=>21890,
-40640=>21891,
-40641=>21892,
-40642=>21893,
-12232=>21894,
-40643=>21894,
-40645=>21895,
-40646=>21896,
-40647=>21897,
-40648=>21898,
-40650=>21899,
-40651=>21900,
-40656=>21901,
-40658=>21902,
-40659=>21903,
-40661=>21904,
-40662=>21905,
-40663=>21906,
-40665=>21907,
-40666=>21908,
-40673=>21909,
-40675=>21910,
-40676=>21911,
-40678=>21912,
-40683=>21913,
-40684=>21914,
-40685=>21915,
-40686=>21916,
-40688=>21917,
-40689=>21918,
-40691=>21919,
-40693=>21920,
-40694=>21921,
-40696=>21922,
-40698=>21923,
-40704=>21924,
-40705=>21925,
-40706=>21926,
-40707=>21927,
-40708=>21928,
-40709=>21929,
-40710=>21930,
-40711=>21931,
-40712=>21932,
-40714=>21933,
-40716=>21934,
-40719=>21935,
-40721=>21936,
-40722=>21937,
-40724=>21938,
-40726=>21939,
-40728=>21940,
-40730=>21941,
-40731=>21942,
-40732=>21943,
-40733=>21944,
-40734=>21945,
-40735=>21946,
-40737=>21947,
-40739=>21948,
-40740=>21949,
-40741=>21950,
-40742=>21951,
-40743=>21952,
-40744=>21953,
-40745=>21954,
-40746=>21955,
-40747=>21956,
-40749=>21957,
-40750=>21958,
-40752=>21959,
-40753=>21960,
-40754=>21961,
-40755=>21962,
-40756=>21963,
-40757=>21964,
-40758=>21965,
-40760=>21966,
-40762=>21967,
-40764=>21968,
-40767=>21969,
-40768=>21970,
-40769=>21971,
-40770=>21972,
-40771=>21973,
-40773=>21974,
-40774=>21975,
-40775=>21976,
-40776=>21977,
-40777=>21978,
-40780=>21979,
-40781=>21980,
-40782=>21981,
-40787=>21982,
-40789=>21983,
-40790=>21984,
-40791=>21985,
-40792=>21986,
-40794=>21987,
-40795=>21988,
-40797=>21989,
-40798=>21990,
-40802=>21991,
-40804=>21992,
-40805=>21993,
-40807=>21994,
-40808=>21995,
-40809=>21996,
-40811=>21997,
-40813=>21998,
-40814=>21999,
-40815=>22000,
-40816=>22001,
-40817=>22002,
-40819=>22003,
-40820=>22004,
-40821=>22005,
-40822=>22006,
-40824=>22007,
-40825=>22008,
-40826=>22009,
-40827=>22010,
-40828=>22011,
-40829=>22012,
-40830=>22013,
-40833=>22014,
-40834=>22015,
-40846=>22016,
-40847=>22017,
-40849=>22018,
-40850=>22019,
-40851=>22020,
-40854=>22021,
-40855=>22022,
-40856=>22023,
-40861=>22024,
-40862=>22025,
-40865=>22026,
-40866=>22027,
-40867=>22028,
-40868=>22029,
-40869=>22030,
-63788=>22031,
-64013=>22032,
-64014=>22033,
-64015=>22034,
-64017=>22035,
-64019=>22036,
-64020=>22037,
-64024=>22038,
-64031=>22039,
-64032=>22040,
-64033=>22041,
-64035=>22042,
-64036=>22043,
-64039=>22044,
-64040=>22045,
-64041=>22046,
-11905=>22047,
-59413=>22047,
-131207=>22048,
-59414=>22048,
-131209=>22049,
-59415=>22049,
-131276=>22050,
-59416=>22050,
-11908=>22051,
-59417=>22051,
-13427=>22052,
-59418=>22052,
-13383=>22053,
-59419=>22053,
-11912=>22054,
-59420=>22054,
-11915=>22055,
-59421=>22055,
-40884=>22056,
-59422=>22056,
-13726=>22057,
-59423=>22057,
-13850=>22058,
-59424=>22058,
-13838=>22059,
-59425=>22059,
-11916=>22060,
-59426=>22060,
-11927=>22061,
-59427=>22061,
-14702=>22062,
-59428=>22062,
-14616=>22063,
-59429=>22063,
-40885=>22064,
-59430=>22064,
-14799=>22065,
-59431=>22065,
-14815=>22066,
-59432=>22066,
-14963=>22067,
-59433=>22067,
-14800=>22068,
-59434=>22068,
-40886=>22069,
-59435=>22069,
-40887=>22070,
-59436=>22070,
-15182=>22071,
-59437=>22071,
-15470=>22072,
-59438=>22072,
-15584=>22073,
-59439=>22073,
-11943=>22074,
-59440=>22074,
-136663=>22075,
-59441=>22075,
-40888=>22076,
-59442=>22076,
-11946=>22077,
-59443=>22077,
-16470=>22078,
-59444=>22078,
-16735=>22079,
-59445=>22079,
-11950=>22080,
-59446=>22080,
-17207=>22081,
-59447=>22081,
-11955=>22082,
-59448=>22082,
-11958=>22083,
-59449=>22083,
-11959=>22084,
-59450=>22084,
-141711=>22085,
-59451=>22085,
-17329=>22086,
-59452=>22086,
-17324=>22087,
-59453=>22087,
-11963=>22088,
-59454=>22088,
-17373=>22089,
-59455=>22089,
-17622=>22090,
-59456=>22090,
-18017=>22091,
-59457=>22091,
-17996=>22092,
-59458=>22092,
-40889=>22093,
-132361=>22093,
-59459=>22093,
-18211=>22094,
-59460=>22094,
-18217=>22095,
-59461=>22095,
-18300=>22096,
-59462=>22096,
-18317=>22097,
-59463=>22097,
-11978=>22098,
-59464=>22098,
-18759=>22099,
-59465=>22099,
-18810=>22100,
-59466=>22100,
-18813=>22101,
-59467=>22101,
-18818=>22102,
-59468=>22102,
-18819=>22103,
-59469=>22103,
-18821=>22104,
-59470=>22104,
-18822=>22105,
-59471=>22105,
-18847=>22106,
-59472=>22106,
-18843=>22107,
-59473=>22107,
-18871=>22108,
-59474=>22108,
-18870=>22109,
-59475=>22109,
-40890=>22110,
-133533=>22110,
-59476=>22110,
-147966=>22111,
-59477=>22111,
-19619=>22112,
-59478=>22112,
-19615=>22113,
-59479=>22113,
-19616=>22114,
-59480=>22114,
-19617=>22115,
-59481=>22115,
-19575=>22116,
-59482=>22116,
-19618=>22117,
-59483=>22117,
-19731=>22118,
-59484=>22118,
-19732=>22119,
-59485=>22119,
-19733=>22120,
-59486=>22120,
-19734=>22121,
-59487=>22121,
-19735=>22122,
-59488=>22122,
-19736=>22123,
-59489=>22123,
-19737=>22124,
-59490=>22124,
-19886=>22125,
-59491=>22125,
-40891=>22126,
-59492=>22126,
-8364=>22353,
-59244=>22353,
-165=>22354,
-12351=>22357,
-12436=>22375,
-12535=>22390,
-12537=>22391,
-12536=>22392,
-12538=>22393,
-12339=>22395,
-12340=>22396,
-12341=>22397,
-12344=>22398,
-12345=>22399,
-12346=>22400,
-12586=>22401,
-12587=>22402,
-12588=>22403,
-12704=>22404,
-12705=>22405,
-12706=>22406,
-12707=>22407,
-12708=>22408,
-12709=>22409,
-12710=>22410,
-12711=>22411,
-12712=>22412,
-12713=>22413,
-12714=>22414,
-12715=>22415,
-12716=>22416,
-12717=>22417,
-12718=>22418,
-12719=>22419,
-12720=>22420,
-12721=>22421,
-12722=>22422,
-12723=>22423,
-12724=>22424,
-12725=>22425,
-12726=>22426,
-12727=>22427,
-11904=>22428,
-11906=>22429,
-11907=>22430,
-11909=>22431,
-11910=>22432,
-11911=>22433,
-11913=>22434,
-11914=>22435,
-11917=>22436,
-11918=>22437,
-11919=>22438,
-11920=>22439,
-11921=>22440,
-11922=>22441,
-11923=>22442,
-11924=>22443,
-11925=>22444,
-11926=>22445,
-11928=>22446,
-11929=>22447,
-11931=>22448,
-11932=>22449,
-11933=>22450,
-11934=>22451,
-11935=>22452,
-11936=>22453,
-11937=>22454,
-11938=>22455,
-11939=>22456,
-11940=>22457,
-11941=>22458,
-11942=>22459,
-11944=>22460,
-11945=>22461,
-11947=>22462,
-11948=>22463,
-11949=>22464,
-11951=>22465,
-11952=>22466,
-11953=>22467,
-11954=>22468,
-11956=>22469,
-11957=>22470,
-11960=>22471,
-11961=>22472,
-11962=>22473,
-11964=>22474,
-11965=>22475,
-11966=>22476,
-11967=>22477,
-11968=>22478,
-11969=>22479,
-11970=>22480,
-11971=>22481,
-11972=>22482,
-11973=>22483,
-11974=>22484,
-11975=>22485,
-11976=>22486,
-11977=>22487,
-11979=>22488,
-11980=>22489,
-11981=>22490,
-11982=>22491,
-11983=>22492,
-11984=>22493,
-11985=>22494,
-11986=>22495,
-11987=>22496,
-11988=>22497,
-11989=>22498,
-11990=>22499,
-11991=>22500,
-11992=>22501,
-11993=>22502,
-11994=>22503,
-11995=>22504,
-11996=>22505,
-11997=>22506,
-11998=>22507,
-11999=>22508,
-12000=>22509,
-12001=>22510,
-12002=>22511,
-12003=>22512,
-12004=>22513,
-12005=>22514,
-12006=>22515,
-12007=>22516,
-12008=>22517,
-12009=>22518,
-12010=>22519,
-12011=>22520,
-12012=>22521,
-12013=>22522,
-12014=>22523,
-12015=>22524,
-12016=>22525,
-12017=>22526,
-12018=>22527,
-12019=>22528,
-13312=>22529,
-13313=>22530,
-13314=>22531,
-13315=>22532,
-13316=>22533,
-13317=>22534,
-13318=>22535,
-13319=>22536,
-13320=>22537,
-13321=>22538,
-13322=>22539,
-13323=>22540,
-13324=>22541,
-13325=>22542,
-13326=>22543,
-13327=>22544,
-13328=>22545,
-13329=>22546,
-13330=>22547,
-13331=>22548,
-13332=>22549,
-13333=>22550,
-13334=>22551,
-13335=>22552,
-13336=>22553,
-13337=>22554,
-13338=>22555,
-13339=>22556,
-13340=>22557,
-13341=>22558,
-13342=>22559,
-13343=>22560,
-13344=>22561,
-13345=>22562,
-13346=>22563,
-13347=>22564,
-13348=>22565,
-13349=>22566,
-13350=>22567,
-13351=>22568,
-13352=>22569,
-13353=>22570,
-13354=>22571,
-13355=>22572,
-13356=>22573,
-13357=>22574,
-13358=>22575,
-13359=>22576,
-13360=>22577,
-13361=>22578,
-13362=>22579,
-13363=>22580,
-13364=>22581,
-13365=>22582,
-13366=>22583,
-13367=>22584,
-13368=>22585,
-13369=>22586,
-13370=>22587,
-13371=>22588,
-13372=>22589,
-13373=>22590,
-13374=>22591,
-13375=>22592,
-13376=>22593,
-13377=>22594,
-13378=>22595,
-13379=>22596,
-13380=>22597,
-13381=>22598,
-13382=>22599,
-13384=>22600,
-13385=>22601,
-13386=>22602,
-13387=>22603,
-13388=>22604,
-13389=>22605,
-13390=>22606,
-13391=>22607,
-13392=>22608,
-13393=>22609,
-13394=>22610,
-13395=>22611,
-13396=>22612,
-13397=>22613,
-13398=>22614,
-13399=>22615,
-13400=>22616,
-13401=>22617,
-13402=>22618,
-13403=>22619,
-13404=>22620,
-13405=>22621,
-13406=>22622,
-13407=>22623,
-13408=>22624,
-13409=>22625,
-13410=>22626,
-13411=>22627,
-13412=>22628,
-13413=>22629,
-13414=>22630,
-13415=>22631,
-13416=>22632,
-13417=>22633,
-13418=>22634,
-13419=>22635,
-13420=>22636,
-13421=>22637,
-13422=>22638,
-13423=>22639,
-13424=>22640,
-13425=>22641,
-13426=>22642,
-13428=>22643,
-13429=>22644,
-13430=>22645,
-13431=>22646,
-13432=>22647,
-13433=>22648,
-13434=>22649,
-13435=>22650,
-13436=>22651,
-13437=>22652,
-13438=>22653,
-13439=>22654,
-13440=>22655,
-13441=>22656,
-13442=>22657,
-13443=>22658,
-13444=>22659,
-13445=>22660,
-13446=>22661,
-13447=>22662,
-13448=>22663,
-13449=>22664,
-13450=>22665,
-13451=>22666,
-13452=>22667,
-13453=>22668,
-13454=>22669,
-13455=>22670,
-13456=>22671,
-13457=>22672,
-13458=>22673,
-13459=>22674,
-13460=>22675,
-13461=>22676,
-13462=>22677,
-13463=>22678,
-13464=>22679,
-13465=>22680,
-13466=>22681,
-13467=>22682,
-13468=>22683,
-13469=>22684,
-13470=>22685,
-13471=>22686,
-13472=>22687,
-13473=>22688,
-13474=>22689,
-13475=>22690,
-13476=>22691,
-13477=>22692,
-13478=>22693,
-13479=>22694,
-13480=>22695,
-13481=>22696,
-13482=>22697,
-13483=>22698,
-13484=>22699,
-13485=>22700,
-13486=>22701,
-13487=>22702,
-13488=>22703,
-13489=>22704,
-13490=>22705,
-13491=>22706,
-13492=>22707,
-13493=>22708,
-13494=>22709,
-13495=>22710,
-13496=>22711,
-13497=>22712,
-13498=>22713,
-13499=>22714,
-13500=>22715,
-13501=>22716,
-13502=>22717,
-13503=>22718,
-13504=>22719,
-13505=>22720,
-13506=>22721,
-13507=>22722,
-13508=>22723,
-13509=>22724,
-13510=>22725,
-13511=>22726,
-13512=>22727,
-13513=>22728,
-13514=>22729,
-13515=>22730,
-13516=>22731,
-13517=>22732,
-13518=>22733,
-13519=>22734,
-13520=>22735,
-13521=>22736,
-13522=>22737,
-13523=>22738,
-13524=>22739,
-13525=>22740,
-13526=>22741,
-13527=>22742,
-13528=>22743,
-13529=>22744,
-13530=>22745,
-13531=>22746,
-13532=>22747,
-13533=>22748,
-13534=>22749,
-13535=>22750,
-13536=>22751,
-13537=>22752,
-13538=>22753,
-13539=>22754,
-13540=>22755,
-13541=>22756,
-13542=>22757,
-13543=>22758,
-13544=>22759,
-13545=>22760,
-13546=>22761,
-13547=>22762,
-13548=>22763,
-13549=>22764,
-13550=>22765,
-13551=>22766,
-13552=>22767,
-13553=>22768,
-13554=>22769,
-13555=>22770,
-13556=>22771,
-13557=>22772,
-13558=>22773,
-13559=>22774,
-13560=>22775,
-13561=>22776,
-13562=>22777,
-13563=>22778,
-13564=>22779,
-13565=>22780,
-13566=>22781,
-13567=>22782,
-13568=>22783,
-13569=>22784,
-13570=>22785,
-13571=>22786,
-13572=>22787,
-13573=>22788,
-13574=>22789,
-13575=>22790,
-13576=>22791,
-13577=>22792,
-13578=>22793,
-13579=>22794,
-13580=>22795,
-13581=>22796,
-13582=>22797,
-13583=>22798,
-13584=>22799,
-13585=>22800,
-13586=>22801,
-13587=>22802,
-13588=>22803,
-13589=>22804,
-13590=>22805,
-13591=>22806,
-13592=>22807,
-13593=>22808,
-13594=>22809,
-13595=>22810,
-13596=>22811,
-13597=>22812,
-13598=>22813,
-13599=>22814,
-13600=>22815,
-13601=>22816,
-13602=>22817,
-13603=>22818,
-13604=>22819,
-13605=>22820,
-13606=>22821,
-13607=>22822,
-13608=>22823,
-13609=>22824,
-13610=>22825,
-13611=>22826,
-13612=>22827,
-13613=>22828,
-13614=>22829,
-13615=>22830,
-13616=>22831,
-13617=>22832,
-13618=>22833,
-13619=>22834,
-13620=>22835,
-13621=>22836,
-13622=>22837,
-13623=>22838,
-13624=>22839,
-13625=>22840,
-13626=>22841,
-13627=>22842,
-13628=>22843,
-13629=>22844,
-13630=>22845,
-13631=>22846,
-13632=>22847,
-13633=>22848,
-13634=>22849,
-13635=>22850,
-13636=>22851,
-13637=>22852,
-13638=>22853,
-13639=>22854,
-13640=>22855,
-13641=>22856,
-13642=>22857,
-13643=>22858,
-13644=>22859,
-13645=>22860,
-13646=>22861,
-13647=>22862,
-13648=>22863,
-13649=>22864,
-13650=>22865,
-13651=>22866,
-13652=>22867,
-13653=>22868,
-13654=>22869,
-13655=>22870,
-13656=>22871,
-13657=>22872,
-13658=>22873,
-13659=>22874,
-13660=>22875,
-13661=>22876,
-13662=>22877,
-13663=>22878,
-13664=>22879,
-13665=>22880,
-13666=>22881,
-13667=>22882,
-13668=>22883,
-13669=>22884,
-13670=>22885,
-13671=>22886,
-13672=>22887,
-13673=>22888,
-13674=>22889,
-13675=>22890,
-13676=>22891,
-13677=>22892,
-13678=>22893,
-13679=>22894,
-13680=>22895,
-13681=>22896,
-13682=>22897,
-13683=>22898,
-13684=>22899,
-13685=>22900,
-13686=>22901,
-13687=>22902,
-13688=>22903,
-13689=>22904,
-13690=>22905,
-13691=>22906,
-13692=>22907,
-13693=>22908,
-13694=>22909,
-13695=>22910,
-13696=>22911,
-13697=>22912,
-13698=>22913,
-13699=>22914,
-13700=>22915,
-13701=>22916,
-13702=>22917,
-13703=>22918,
-13704=>22919,
-13705=>22920,
-13706=>22921,
-13707=>22922,
-13708=>22923,
-13709=>22924,
-13710=>22925,
-13711=>22926,
-13712=>22927,
-13713=>22928,
-13714=>22929,
-13715=>22930,
-13716=>22931,
-13717=>22932,
-13718=>22933,
-13719=>22934,
-13720=>22935,
-13721=>22936,
-13722=>22937,
-13723=>22938,
-13724=>22939,
-13725=>22940,
-13727=>22941,
-13728=>22942,
-13729=>22943,
-13730=>22944,
-13731=>22945,
-13732=>22946,
-13733=>22947,
-13734=>22948,
-13735=>22949,
-13736=>22950,
-13737=>22951,
-13738=>22952,
-13739=>22953,
-13740=>22954,
-13741=>22955,
-13742=>22956,
-13743=>22957,
-13744=>22958,
-13745=>22959,
-13746=>22960,
-13747=>22961,
-13748=>22962,
-13749=>22963,
-13750=>22964,
-13751=>22965,
-13752=>22966,
-13753=>22967,
-13754=>22968,
-13755=>22969,
-13756=>22970,
-13757=>22971,
-13758=>22972,
-13759=>22973,
-13760=>22974,
-13761=>22975,
-13762=>22976,
-13763=>22977,
-13764=>22978,
-13765=>22979,
-13766=>22980,
-13767=>22981,
-13768=>22982,
-13769=>22983,
-13770=>22984,
-13771=>22985,
-13772=>22986,
-13773=>22987,
-13774=>22988,
-13775=>22989,
-13776=>22990,
-13777=>22991,
-13778=>22992,
-13779=>22993,
-13780=>22994,
-13781=>22995,
-13782=>22996,
-13783=>22997,
-13784=>22998,
-13785=>22999,
-13786=>23000,
-13787=>23001,
-13788=>23002,
-13789=>23003,
-13790=>23004,
-13791=>23005,
-13792=>23006,
-13793=>23007,
-13794=>23008,
-13795=>23009,
-13796=>23010,
-13797=>23011,
-13798=>23012,
-13799=>23013,
-13800=>23014,
-13801=>23015,
-13802=>23016,
-13803=>23017,
-13804=>23018,
-13805=>23019,
-13806=>23020,
-13807=>23021,
-13808=>23022,
-13809=>23023,
-13810=>23024,
-13811=>23025,
-13812=>23026,
-13813=>23027,
-13814=>23028,
-13815=>23029,
-13816=>23030,
-13817=>23031,
-13818=>23032,
-13819=>23033,
-13820=>23034,
-13821=>23035,
-13822=>23036,
-13823=>23037,
-13824=>23038,
-13825=>23039,
-13826=>23040,
-13827=>23041,
-13828=>23042,
-13829=>23043,
-13830=>23044,
-13831=>23045,
-13832=>23046,
-13833=>23047,
-13834=>23048,
-13835=>23049,
-13836=>23050,
-13837=>23051,
-13839=>23052,
-13840=>23053,
-13841=>23054,
-13842=>23055,
-13843=>23056,
-13844=>23057,
-13845=>23058,
-13846=>23059,
-13847=>23060,
-13848=>23061,
-13849=>23062,
-13851=>23063,
-13852=>23064,
-13853=>23065,
-13854=>23066,
-13855=>23067,
-13856=>23068,
-13857=>23069,
-13858=>23070,
-13859=>23071,
-13860=>23072,
-13861=>23073,
-13862=>23074,
-13863=>23075,
-13864=>23076,
-13865=>23077,
-13866=>23078,
-13867=>23079,
-13868=>23080,
-13869=>23081,
-13870=>23082,
-13871=>23083,
-13872=>23084,
-13873=>23085,
-13874=>23086,
-13875=>23087,
-13876=>23088,
-13877=>23089,
-13878=>23090,
-13879=>23091,
-13880=>23092,
-13881=>23093,
-13882=>23094,
-13883=>23095,
-13884=>23096,
-13885=>23097,
-13886=>23098,
-13887=>23099,
-13888=>23100,
-13889=>23101,
-13890=>23102,
-13891=>23103,
-13892=>23104,
-13893=>23105,
-13894=>23106,
-13895=>23107,
-13896=>23108,
-13897=>23109,
-13898=>23110,
-13899=>23111,
-13900=>23112,
-13901=>23113,
-13902=>23114,
-13903=>23115,
-13904=>23116,
-13905=>23117,
-13906=>23118,
-13907=>23119,
-13908=>23120,
-13909=>23121,
-13910=>23122,
-13911=>23123,
-13912=>23124,
-13913=>23125,
-13914=>23126,
-13915=>23127,
-13916=>23128,
-13917=>23129,
-13918=>23130,
-13919=>23131,
-13920=>23132,
-13921=>23133,
-13922=>23134,
-13923=>23135,
-13924=>23136,
-13925=>23137,
-13926=>23138,
-13927=>23139,
-13928=>23140,
-13929=>23141,
-13930=>23142,
-13931=>23143,
-13932=>23144,
-13933=>23145,
-13934=>23146,
-13935=>23147,
-13936=>23148,
-13937=>23149,
-13938=>23150,
-13939=>23151,
-13940=>23152,
-13941=>23153,
-13942=>23154,
-13943=>23155,
-13944=>23156,
-13945=>23157,
-13946=>23158,
-13947=>23159,
-13948=>23160,
-13949=>23161,
-13950=>23162,
-13951=>23163,
-13952=>23164,
-13953=>23165,
-13954=>23166,
-13955=>23167,
-13956=>23168,
-13957=>23169,
-13958=>23170,
-13959=>23171,
-13960=>23172,
-13961=>23173,
-13962=>23174,
-13963=>23175,
-13964=>23176,
-13965=>23177,
-13966=>23178,
-13967=>23179,
-13968=>23180,
-13969=>23181,
-13970=>23182,
-13971=>23183,
-13972=>23184,
-13973=>23185,
-13974=>23186,
-13975=>23187,
-13976=>23188,
-13977=>23189,
-13978=>23190,
-13979=>23191,
-13980=>23192,
-13981=>23193,
-13982=>23194,
-13983=>23195,
-13984=>23196,
-13985=>23197,
-13986=>23198,
-13987=>23199,
-13988=>23200,
-13989=>23201,
-13990=>23202,
-13991=>23203,
-13992=>23204,
-13993=>23205,
-13994=>23206,
-13995=>23207,
-13996=>23208,
-13997=>23209,
-13998=>23210,
-13999=>23211,
-14000=>23212,
-14001=>23213,
-14002=>23214,
-14003=>23215,
-14004=>23216,
-14005=>23217,
-14006=>23218,
-14007=>23219,
-14008=>23220,
-14009=>23221,
-14010=>23222,
-14011=>23223,
-14012=>23224,
-14013=>23225,
-14014=>23226,
-14015=>23227,
-14016=>23228,
-14017=>23229,
-14018=>23230,
-14019=>23231,
-14020=>23232,
-14021=>23233,
-14022=>23234,
-14023=>23235,
-14024=>23236,
-14025=>23237,
-14026=>23238,
-14027=>23239,
-14028=>23240,
-14029=>23241,
-14030=>23242,
-14031=>23243,
-14032=>23244,
-14033=>23245,
-14034=>23246,
-14035=>23247,
-14036=>23248,
-14037=>23249,
-14038=>23250,
-14039=>23251,
-14040=>23252,
-14041=>23253,
-14042=>23254,
-14043=>23255,
-14044=>23256,
-14045=>23257,
-14046=>23258,
-14047=>23259,
-14048=>23260,
-14049=>23261,
-14050=>23262,
-14051=>23263,
-14052=>23264,
-14053=>23265,
-14054=>23266,
-14055=>23267,
-14056=>23268,
-14057=>23269,
-14058=>23270,
-14059=>23271,
-14060=>23272,
-14061=>23273,
-14062=>23274,
-14063=>23275,
-14064=>23276,
-14065=>23277,
-14066=>23278,
-14067=>23279,
-14068=>23280,
-14069=>23281,
-14070=>23282,
-14071=>23283,
-14072=>23284,
-14073=>23285,
-14074=>23286,
-14075=>23287,
-14076=>23288,
-14077=>23289,
-14078=>23290,
-14079=>23291,
-14080=>23292,
-14081=>23293,
-14082=>23294,
-14083=>23295,
-14084=>23296,
-14085=>23297,
-14086=>23298,
-14087=>23299,
-14088=>23300,
-14089=>23301,
-14090=>23302,
-14091=>23303,
-14092=>23304,
-14093=>23305,
-14094=>23306,
-14095=>23307,
-14096=>23308,
-14097=>23309,
-14098=>23310,
-14099=>23311,
-14100=>23312,
-14101=>23313,
-14102=>23314,
-14103=>23315,
-14104=>23316,
-14105=>23317,
-14106=>23318,
-14107=>23319,
-14108=>23320,
-14109=>23321,
-14110=>23322,
-14111=>23323,
-14112=>23324,
-14113=>23325,
-14114=>23326,
-14115=>23327,
-14116=>23328,
-14117=>23329,
-14118=>23330,
-14119=>23331,
-14120=>23332,
-14121=>23333,
-14122=>23334,
-14123=>23335,
-14124=>23336,
-14125=>23337,
-14126=>23338,
-14127=>23339,
-14128=>23340,
-14129=>23341,
-14130=>23342,
-14131=>23343,
-14132=>23344,
-14133=>23345,
-14134=>23346,
-14135=>23347,
-14136=>23348,
-14137=>23349,
-14138=>23350,
-14139=>23351,
-14140=>23352,
-14141=>23353,
-14142=>23354,
-14143=>23355,
-14144=>23356,
-14145=>23357,
-14146=>23358,
-14147=>23359,
-14148=>23360,
-14149=>23361,
-14150=>23362,
-14151=>23363,
-14152=>23364,
-14153=>23365,
-14154=>23366,
-14155=>23367,
-14156=>23368,
-14157=>23369,
-14158=>23370,
-14159=>23371,
-14160=>23372,
-14161=>23373,
-14162=>23374,
-14163=>23375,
-14164=>23376,
-14165=>23377,
-14166=>23378,
-14167=>23379,
-14168=>23380,
-14169=>23381,
-14170=>23382,
-14171=>23383,
-14172=>23384,
-14173=>23385,
-14174=>23386,
-14175=>23387,
-14176=>23388,
-14177=>23389,
-14178=>23390,
-14179=>23391,
-14180=>23392,
-14181=>23393,
-14182=>23394,
-14183=>23395,
-14184=>23396,
-14185=>23397,
-14186=>23398,
-14187=>23399,
-14188=>23400,
-14189=>23401,
-14190=>23402,
-14191=>23403,
-14192=>23404,
-14193=>23405,
-14194=>23406,
-14195=>23407,
-14196=>23408,
-14197=>23409,
-14198=>23410,
-14199=>23411,
-14200=>23412,
-14201=>23413,
-14202=>23414,
-14203=>23415,
-14204=>23416,
-14205=>23417,
-14206=>23418,
-14207=>23419,
-14208=>23420,
-14209=>23421,
-14210=>23422,
-14211=>23423,
-14212=>23424,
-14213=>23425,
-14214=>23426,
-14215=>23427,
-14216=>23428,
-14217=>23429,
-14218=>23430,
-14219=>23431,
-14220=>23432,
-14221=>23433,
-14222=>23434,
-14223=>23435,
-14224=>23436,
-14225=>23437,
-14226=>23438,
-14227=>23439,
-14228=>23440,
-14229=>23441,
-14230=>23442,
-14231=>23443,
-14232=>23444,
-14233=>23445,
-14234=>23446,
-14235=>23447,
-14236=>23448,
-14237=>23449,
-14238=>23450,
-14239=>23451,
-14240=>23452,
-14241=>23453,
-14242=>23454,
-14243=>23455,
-14244=>23456,
-14245=>23457,
-14246=>23458,
-14247=>23459,
-14248=>23460,
-14249=>23461,
-14250=>23462,
-14251=>23463,
-14252=>23464,
-14253=>23465,
-14254=>23466,
-14255=>23467,
-14256=>23468,
-14257=>23469,
-14258=>23470,
-14259=>23471,
-14260=>23472,
-14261=>23473,
-14262=>23474,
-14263=>23475,
-14264=>23476,
-14265=>23477,
-14266=>23478,
-14267=>23479,
-14268=>23480,
-14269=>23481,
-14270=>23482,
-14271=>23483,
-14272=>23484,
-14273=>23485,
-14274=>23486,
-14275=>23487,
-14276=>23488,
-14277=>23489,
-14278=>23490,
-14279=>23491,
-14280=>23492,
-14281=>23493,
-14282=>23494,
-14283=>23495,
-14284=>23496,
-14285=>23497,
-14286=>23498,
-14287=>23499,
-14288=>23500,
-14289=>23501,
-14290=>23502,
-14291=>23503,
-14292=>23504,
-14293=>23505,
-14294=>23506,
-14295=>23507,
-14296=>23508,
-14297=>23509,
-14298=>23510,
-14299=>23511,
-14300=>23512,
-14301=>23513,
-14302=>23514,
-14303=>23515,
-14304=>23516,
-14305=>23517,
-14306=>23518,
-14307=>23519,
-14308=>23520,
-14309=>23521,
-14310=>23522,
-14311=>23523,
-14312=>23524,
-14313=>23525,
-14314=>23526,
-14315=>23527,
-14316=>23528,
-14317=>23529,
-14318=>23530,
-14319=>23531,
-14320=>23532,
-14321=>23533,
-14322=>23534,
-14323=>23535,
-14324=>23536,
-14325=>23537,
-14326=>23538,
-14327=>23539,
-14328=>23540,
-14329=>23541,
-14330=>23542,
-14331=>23543,
-14332=>23544,
-14333=>23545,
-14334=>23546,
-14335=>23547,
-14336=>23548,
-14337=>23549,
-14338=>23550,
-14339=>23551,
-14340=>23552,
-14341=>23553,
-14342=>23554,
-14343=>23555,
-14344=>23556,
-14345=>23557,
-14346=>23558,
-14347=>23559,
-14348=>23560,
-14349=>23561,
-14350=>23562,
-14351=>23563,
-14352=>23564,
-14353=>23565,
-14354=>23566,
-14355=>23567,
-14356=>23568,
-14357=>23569,
-14358=>23570,
-14359=>23571,
-14360=>23572,
-14361=>23573,
-14362=>23574,
-14363=>23575,
-14364=>23576,
-14365=>23577,
-14366=>23578,
-14367=>23579,
-14368=>23580,
-14369=>23581,
-14370=>23582,
-14371=>23583,
-14372=>23584,
-14373=>23585,
-14374=>23586,
-14375=>23587,
-14376=>23588,
-14377=>23589,
-14378=>23590,
-14379=>23591,
-14380=>23592,
-14381=>23593,
-14382=>23594,
-14383=>23595,
-14384=>23596,
-14385=>23597,
-14386=>23598,
-14387=>23599,
-14388=>23600,
-14389=>23601,
-14390=>23602,
-14391=>23603,
-14392=>23604,
-14393=>23605,
-14394=>23606,
-14395=>23607,
-14396=>23608,
-14397=>23609,
-14398=>23610,
-14399=>23611,
-14400=>23612,
-14401=>23613,
-14402=>23614,
-14403=>23615,
-14404=>23616,
-14405=>23617,
-14406=>23618,
-14407=>23619,
-14408=>23620,
-14409=>23621,
-14410=>23622,
-14411=>23623,
-14412=>23624,
-14413=>23625,
-14414=>23626,
-14415=>23627,
-14416=>23628,
-14417=>23629,
-14418=>23630,
-14419=>23631,
-14420=>23632,
-14421=>23633,
-14422=>23634,
-14423=>23635,
-14424=>23636,
-14425=>23637,
-14426=>23638,
-14427=>23639,
-14428=>23640,
-14429=>23641,
-14430=>23642,
-14431=>23643,
-14432=>23644,
-14433=>23645,
-14434=>23646,
-14435=>23647,
-14436=>23648,
-14437=>23649,
-14438=>23650,
-14439=>23651,
-14440=>23652,
-14441=>23653,
-14442=>23654,
-14443=>23655,
-14444=>23656,
-14445=>23657,
-14446=>23658,
-14447=>23659,
-14448=>23660,
-14449=>23661,
-14450=>23662,
-14451=>23663,
-14452=>23664,
-14453=>23665,
-14454=>23666,
-14455=>23667,
-14456=>23668,
-14457=>23669,
-14458=>23670,
-14459=>23671,
-14460=>23672,
-14461=>23673,
-14462=>23674,
-14463=>23675,
-14464=>23676,
-14465=>23677,
-14466=>23678,
-14467=>23679,
-14468=>23680,
-14469=>23681,
-14470=>23682,
-14471=>23683,
-14472=>23684,
-14473=>23685,
-14474=>23686,
-14475=>23687,
-14476=>23688,
-14477=>23689,
-14478=>23690,
-14479=>23691,
-14480=>23692,
-14481=>23693,
-14482=>23694,
-14483=>23695,
-14484=>23696,
-14485=>23697,
-14486=>23698,
-14487=>23699,
-14488=>23700,
-14489=>23701,
-14490=>23702,
-14491=>23703,
-14492=>23704,
-14493=>23705,
-14494=>23706,
-14495=>23707,
-14496=>23708,
-14497=>23709,
-14498=>23710,
-14499=>23711,
-14500=>23712,
-14501=>23713,
-14502=>23714,
-14503=>23715,
-14504=>23716,
-14505=>23717,
-14506=>23718,
-14507=>23719,
-14508=>23720,
-14509=>23721,
-14510=>23722,
-14511=>23723,
-14512=>23724,
-14513=>23725,
-14514=>23726,
-14515=>23727,
-14516=>23728,
-14517=>23729,
-14518=>23730,
-14519=>23731,
-14520=>23732,
-14521=>23733,
-14522=>23734,
-14523=>23735,
-14524=>23736,
-14525=>23737,
-14526=>23738,
-14527=>23739,
-14528=>23740,
-14529=>23741,
-14530=>23742,
-14531=>23743,
-14532=>23744,
-14533=>23745,
-14534=>23746,
-14535=>23747,
-14536=>23748,
-14537=>23749,
-14538=>23750,
-14539=>23751,
-14540=>23752,
-14541=>23753,
-14542=>23754,
-14543=>23755,
-14544=>23756,
-14545=>23757,
-14546=>23758,
-14547=>23759,
-14548=>23760,
-14549=>23761,
-14550=>23762,
-14551=>23763,
-14552=>23764,
-14553=>23765,
-14554=>23766,
-14555=>23767,
-14556=>23768,
-14557=>23769,
-14558=>23770,
-14559=>23771,
-14560=>23772,
-14561=>23773,
-14562=>23774,
-14563=>23775,
-14564=>23776,
-14565=>23777,
-14566=>23778,
-14567=>23779,
-14568=>23780,
-14569=>23781,
-14570=>23782,
-14571=>23783,
-14572=>23784,
-14573=>23785,
-14574=>23786,
-14575=>23787,
-14576=>23788,
-14577=>23789,
-14578=>23790,
-14579=>23791,
-14580=>23792,
-14581=>23793,
-14582=>23794,
-14583=>23795,
-14584=>23796,
-14585=>23797,
-14586=>23798,
-14587=>23799,
-14588=>23800,
-14589=>23801,
-14590=>23802,
-14591=>23803,
-14592=>23804,
-14593=>23805,
-14594=>23806,
-14595=>23807,
-14596=>23808,
-14597=>23809,
-14598=>23810,
-14599=>23811,
-14600=>23812,
-14601=>23813,
-14602=>23814,
-14603=>23815,
-14604=>23816,
-14605=>23817,
-14606=>23818,
-14607=>23819,
-14608=>23820,
-14609=>23821,
-14610=>23822,
-14611=>23823,
-14612=>23824,
-14613=>23825,
-14614=>23826,
-14615=>23827,
-14617=>23828,
-14618=>23829,
-14619=>23830,
-14620=>23831,
-14621=>23832,
-14622=>23833,
-14623=>23834,
-14624=>23835,
-14625=>23836,
-14626=>23837,
-14627=>23838,
-14628=>23839,
-14629=>23840,
-14630=>23841,
-14631=>23842,
-14632=>23843,
-14633=>23844,
-14634=>23845,
-14635=>23846,
-14636=>23847,
-14637=>23848,
-14638=>23849,
-14639=>23850,
-14640=>23851,
-14641=>23852,
-14642=>23853,
-14643=>23854,
-14644=>23855,
-14645=>23856,
-14646=>23857,
-14647=>23858,
-14648=>23859,
-14649=>23860,
-14650=>23861,
-14651=>23862,
-14652=>23863,
-14653=>23864,
-14654=>23865,
-14655=>23866,
-14656=>23867,
-14657=>23868,
-14658=>23869,
-14659=>23870,
-14660=>23871,
-14661=>23872,
-14662=>23873,
-14663=>23874,
-14664=>23875,
-14665=>23876,
-14666=>23877,
-14667=>23878,
-14668=>23879,
-14669=>23880,
-14670=>23881,
-14671=>23882,
-14672=>23883,
-14673=>23884,
-14674=>23885,
-14675=>23886,
-14676=>23887,
-14677=>23888,
-14678=>23889,
-14679=>23890,
-14680=>23891,
-14681=>23892,
-14682=>23893,
-14683=>23894,
-14684=>23895,
-14685=>23896,
-14686=>23897,
-14687=>23898,
-14688=>23899,
-14689=>23900,
-14690=>23901,
-14691=>23902,
-14692=>23903,
-14693=>23904,
-14694=>23905,
-14695=>23906,
-14696=>23907,
-14697=>23908,
-14698=>23909,
-14699=>23910,
-14700=>23911,
-14701=>23912,
-14703=>23913,
-14704=>23914,
-14705=>23915,
-14706=>23916,
-14707=>23917,
-14708=>23918,
-14709=>23919,
-14710=>23920,
-14711=>23921,
-14712=>23922,
-14713=>23923,
-14714=>23924,
-14715=>23925,
-14716=>23926,
-14717=>23927,
-14718=>23928,
-14719=>23929,
-14720=>23930,
-14721=>23931,
-14722=>23932,
-14723=>23933,
-14724=>23934,
-14725=>23935,
-14726=>23936,
-14727=>23937,
-14728=>23938,
-14729=>23939,
-14730=>23940,
-14731=>23941,
-14732=>23942,
-14733=>23943,
-14734=>23944,
-14735=>23945,
-14736=>23946,
-14737=>23947,
-14738=>23948,
-14739=>23949,
-14740=>23950,
-14741=>23951,
-14742=>23952,
-14743=>23953,
-14744=>23954,
-14745=>23955,
-14746=>23956,
-14747=>23957,
-14748=>23958,
-14749=>23959,
-14750=>23960,
-14751=>23961,
-14752=>23962,
-14753=>23963,
-14754=>23964,
-14755=>23965,
-14756=>23966,
-14757=>23967,
-14758=>23968,
-14759=>23969,
-14760=>23970,
-14761=>23971,
-14762=>23972,
-14763=>23973,
-14764=>23974,
-14765=>23975,
-14766=>23976,
-14767=>23977,
-14768=>23978,
-14769=>23979,
-14770=>23980,
-14771=>23981,
-14772=>23982,
-14773=>23983,
-14774=>23984,
-14775=>23985,
-14776=>23986,
-14777=>23987,
-14778=>23988,
-14779=>23989,
-14780=>23990,
-14781=>23991,
-14782=>23992,
-14783=>23993,
-14784=>23994,
-14785=>23995,
-14786=>23996,
-14787=>23997,
-14788=>23998,
-14789=>23999,
-14790=>24000,
-14791=>24001,
-14792=>24002,
-14793=>24003,
-14794=>24004,
-14795=>24005,
-14796=>24006,
-14797=>24007,
-14798=>24008,
-14801=>24009,
-14802=>24010,
-14803=>24011,
-14804=>24012,
-14805=>24013,
-14806=>24014,
-14807=>24015,
-14808=>24016,
-14809=>24017,
-14810=>24018,
-14811=>24019,
-14812=>24020,
-14813=>24021,
-14814=>24022,
-14816=>24023,
-14817=>24024,
-14818=>24025,
-14819=>24026,
-14820=>24027,
-14821=>24028,
-14822=>24029,
-14823=>24030,
-14824=>24031,
-14825=>24032,
-14826=>24033,
-14827=>24034,
-14828=>24035,
-14829=>24036,
-14830=>24037,
-14831=>24038,
-14832=>24039,
-14833=>24040,
-14834=>24041,
-14835=>24042,
-14836=>24043,
-14837=>24044,
-14838=>24045,
-14839=>24046,
-14840=>24047,
-14841=>24048,
-14842=>24049,
-14843=>24050,
-14844=>24051,
-14845=>24052,
-14846=>24053,
-14847=>24054,
-14848=>24055,
-14849=>24056,
-14850=>24057,
-14851=>24058,
-14852=>24059,
-14853=>24060,
-14854=>24061,
-14855=>24062,
-14856=>24063,
-14857=>24064,
-14858=>24065,
-14859=>24066,
-14860=>24067,
-14861=>24068,
-14862=>24069,
-14863=>24070,
-14864=>24071,
-14865=>24072,
-14866=>24073,
-14867=>24074,
-14868=>24075,
-14869=>24076,
-14870=>24077,
-14871=>24078,
-14872=>24079,
-14873=>24080,
-14874=>24081,
-14875=>24082,
-14876=>24083,
-14877=>24084,
-14878=>24085,
-14879=>24086,
-14880=>24087,
-14881=>24088,
-14882=>24089,
-14883=>24090,
-14884=>24091,
-14885=>24092,
-14886=>24093,
-14887=>24094,
-14888=>24095,
-14889=>24096,
-14890=>24097,
-14891=>24098,
-14892=>24099,
-14893=>24100,
-14894=>24101,
-14895=>24102,
-14896=>24103,
-14897=>24104,
-14898=>24105,
-14899=>24106,
-14900=>24107,
-14901=>24108,
-14902=>24109,
-14903=>24110,
-14904=>24111,
-14905=>24112,
-14906=>24113,
-14907=>24114,
-14908=>24115,
-14909=>24116,
-14910=>24117,
-14911=>24118,
-14912=>24119,
-14913=>24120,
-14914=>24121,
-14915=>24122,
-14916=>24123,
-14917=>24124,
-14918=>24125,
-14919=>24126,
-14920=>24127,
-14921=>24128,
-14922=>24129,
-14923=>24130,
-14924=>24131,
-14925=>24132,
-14926=>24133,
-14927=>24134,
-14928=>24135,
-14929=>24136,
-14930=>24137,
-14931=>24138,
-14932=>24139,
-14933=>24140,
-14934=>24141,
-14935=>24142,
-14936=>24143,
-14937=>24144,
-14938=>24145,
-14939=>24146,
-14940=>24147,
-14941=>24148,
-14942=>24149,
-14943=>24150,
-14944=>24151,
-14945=>24152,
-14946=>24153,
-14947=>24154,
-14948=>24155,
-14949=>24156,
-14950=>24157,
-14951=>24158,
-14952=>24159,
-14953=>24160,
-14954=>24161,
-14955=>24162,
-14956=>24163,
-14957=>24164,
-14958=>24165,
-14959=>24166,
-14960=>24167,
-14961=>24168,
-14962=>24169,
-14964=>24170,
-14965=>24171,
-14966=>24172,
-14967=>24173,
-14968=>24174,
-14969=>24175,
-14970=>24176,
-14971=>24177,
-14972=>24178,
-14973=>24179,
-14974=>24180,
-14975=>24181,
-14976=>24182,
-14977=>24183,
-14978=>24184,
-14979=>24185,
-14980=>24186,
-14981=>24187,
-14982=>24188,
-14983=>24189,
-14984=>24190,
-14985=>24191,
-14986=>24192,
-14987=>24193,
-14988=>24194,
-14989=>24195,
-14990=>24196,
-14991=>24197,
-14992=>24198,
-14993=>24199,
-14994=>24200,
-14995=>24201,
-14996=>24202,
-14997=>24203,
-14998=>24204,
-14999=>24205,
-15000=>24206,
-15001=>24207,
-15002=>24208,
-15003=>24209,
-15004=>24210,
-15005=>24211,
-15006=>24212,
-15007=>24213,
-15008=>24214,
-15009=>24215,
-15010=>24216,
-15011=>24217,
-15012=>24218,
-15013=>24219,
-15014=>24220,
-15015=>24221,
-15016=>24222,
-15017=>24223,
-15018=>24224,
-15019=>24225,
-15020=>24226,
-15021=>24227,
-15022=>24228,
-15023=>24229,
-15024=>24230,
-15025=>24231,
-15026=>24232,
-15027=>24233,
-15028=>24234,
-15029=>24235,
-15030=>24236,
-15031=>24237,
-15032=>24238,
-15033=>24239,
-15034=>24240,
-15035=>24241,
-15036=>24242,
-15037=>24243,
-15038=>24244,
-15039=>24245,
-15040=>24246,
-15041=>24247,
-15042=>24248,
-15043=>24249,
-15044=>24250,
-15045=>24251,
-15046=>24252,
-15047=>24253,
-15048=>24254,
-15049=>24255,
-15050=>24256,
-15051=>24257,
-15052=>24258,
-15053=>24259,
-15054=>24260,
-15055=>24261,
-15056=>24262,
-15057=>24263,
-15058=>24264,
-15059=>24265,
-15060=>24266,
-15061=>24267,
-15062=>24268,
-15063=>24269,
-15064=>24270,
-15065=>24271,
-15066=>24272,
-15067=>24273,
-15068=>24274,
-15069=>24275,
-15070=>24276,
-15071=>24277,
-15072=>24278,
-15073=>24279,
-15074=>24280,
-15075=>24281,
-15076=>24282,
-15077=>24283,
-15078=>24284,
-15079=>24285,
-15080=>24286,
-15081=>24287,
-15082=>24288,
-15083=>24289,
-15084=>24290,
-15085=>24291,
-15086=>24292,
-15087=>24293,
-15088=>24294,
-15089=>24295,
-15090=>24296,
-15091=>24297,
-15092=>24298,
-15093=>24299,
-15094=>24300,
-15095=>24301,
-15096=>24302,
-15097=>24303,
-15098=>24304,
-15099=>24305,
-15100=>24306,
-15101=>24307,
-15102=>24308,
-15103=>24309,
-15104=>24310,
-15105=>24311,
-15106=>24312,
-15107=>24313,
-15108=>24314,
-15109=>24315,
-15110=>24316,
-15111=>24317,
-15112=>24318,
-15113=>24319,
-15114=>24320,
-15115=>24321,
-15116=>24322,
-15117=>24323,
-15118=>24324,
-15119=>24325,
-15120=>24326,
-15121=>24327,
-15122=>24328,
-15123=>24329,
-15124=>24330,
-15125=>24331,
-15126=>24332,
-15127=>24333,
-15128=>24334,
-15129=>24335,
-15130=>24336,
-15131=>24337,
-15132=>24338,
-15133=>24339,
-15134=>24340,
-15135=>24341,
-15136=>24342,
-15137=>24343,
-15138=>24344,
-15139=>24345,
-15140=>24346,
-15141=>24347,
-15142=>24348,
-15143=>24349,
-15144=>24350,
-15145=>24351,
-15146=>24352,
-15147=>24353,
-15148=>24354,
-15149=>24355,
-15150=>24356,
-15151=>24357,
-15152=>24358,
-15153=>24359,
-15154=>24360,
-15155=>24361,
-15156=>24362,
-15157=>24363,
-15158=>24364,
-15159=>24365,
-15160=>24366,
-15161=>24367,
-15162=>24368,
-15163=>24369,
-15164=>24370,
-15165=>24371,
-15166=>24372,
-15167=>24373,
-15168=>24374,
-15169=>24375,
-15170=>24376,
-15171=>24377,
-15172=>24378,
-15173=>24379,
-15174=>24380,
-15175=>24381,
-15176=>24382,
-15177=>24383,
-15178=>24384,
-15179=>24385,
-15180=>24386,
-15181=>24387,
-15183=>24388,
-15184=>24389,
-15185=>24390,
-15186=>24391,
-15187=>24392,
-15188=>24393,
-15189=>24394,
-15190=>24395,
-15191=>24396,
-15192=>24397,
-15193=>24398,
-15194=>24399,
-15195=>24400,
-15196=>24401,
-15197=>24402,
-15198=>24403,
-15199=>24404,
-15200=>24405,
-15201=>24406,
-15202=>24407,
-15203=>24408,
-15204=>24409,
-15205=>24410,
-15206=>24411,
-15207=>24412,
-15208=>24413,
-15209=>24414,
-15210=>24415,
-15211=>24416,
-15212=>24417,
-15213=>24418,
-15214=>24419,
-15215=>24420,
-15216=>24421,
-15217=>24422,
-15218=>24423,
-15219=>24424,
-15220=>24425,
-15221=>24426,
-15222=>24427,
-15223=>24428,
-15224=>24429,
-15225=>24430,
-15226=>24431,
-15227=>24432,
-15228=>24433,
-15229=>24434,
-15230=>24435,
-15231=>24436,
-15232=>24437,
-15233=>24438,
-15234=>24439,
-15235=>24440,
-15236=>24441,
-15237=>24442,
-15238=>24443,
-15239=>24444,
-15240=>24445,
-15241=>24446,
-15242=>24447,
-15243=>24448,
-15244=>24449,
-15245=>24450,
-15246=>24451,
-15247=>24452,
-15248=>24453,
-15249=>24454,
-15250=>24455,
-15251=>24456,
-15252=>24457,
-15253=>24458,
-15254=>24459,
-15255=>24460,
-15256=>24461,
-15257=>24462,
-15258=>24463,
-15259=>24464,
-15260=>24465,
-15261=>24466,
-15262=>24467,
-15263=>24468,
-15264=>24469,
-15265=>24470,
-15266=>24471,
-15267=>24472,
-15268=>24473,
-15269=>24474,
-15270=>24475,
-15271=>24476,
-15272=>24477,
-15273=>24478,
-15274=>24479,
-15275=>24480,
-15276=>24481,
-15277=>24482,
-15278=>24483,
-15279=>24484,
-15280=>24485,
-15281=>24486,
-15282=>24487,
-15283=>24488,
-15284=>24489,
-15285=>24490,
-15286=>24491,
-15287=>24492,
-15288=>24493,
-15289=>24494,
-15290=>24495,
-15291=>24496,
-15292=>24497,
-15293=>24498,
-15294=>24499,
-15295=>24500,
-15296=>24501,
-15297=>24502,
-15298=>24503,
-15299=>24504,
-15300=>24505,
-15301=>24506,
-15302=>24507,
-15303=>24508,
-15304=>24509,
-15305=>24510,
-15306=>24511,
-15307=>24512,
-15308=>24513,
-15309=>24514,
-15310=>24515,
-15311=>24516,
-15312=>24517,
-15313=>24518,
-15314=>24519,
-15315=>24520,
-15316=>24521,
-15317=>24522,
-15318=>24523,
-15319=>24524,
-15320=>24525,
-15321=>24526,
-15322=>24527,
-15323=>24528,
-15324=>24529,
-15325=>24530,
-15326=>24531,
-15327=>24532,
-15328=>24533,
-15329=>24534,
-15330=>24535,
-15331=>24536,
-15332=>24537,
-15333=>24538,
-15334=>24539,
-15335=>24540,
-15336=>24541,
-15337=>24542,
-15338=>24543,
-15339=>24544,
-15340=>24545,
-15341=>24546,
-15342=>24547,
-15343=>24548,
-15344=>24549,
-15345=>24550,
-15346=>24551,
-15347=>24552,
-15348=>24553,
-15349=>24554,
-15350=>24555,
-15351=>24556,
-15352=>24557,
-15353=>24558,
-15354=>24559,
-15355=>24560,
-15356=>24561,
-15357=>24562,
-15358=>24563,
-15359=>24564,
-15360=>24565,
-15361=>24566,
-15362=>24567,
-15363=>24568,
-15364=>24569,
-15365=>24570,
-15366=>24571,
-15367=>24572,
-15368=>24573,
-15369=>24574,
-15370=>24575,
-15371=>24576,
-15372=>24577,
-15373=>24578,
-15374=>24579,
-15375=>24580,
-15376=>24581,
-15377=>24582,
-15378=>24583,
-15379=>24584,
-15380=>24585,
-15381=>24586,
-15382=>24587,
-15383=>24588,
-15384=>24589,
-15385=>24590,
-15386=>24591,
-15387=>24592,
-15388=>24593,
-15389=>24594,
-15390=>24595,
-15391=>24596,
-15392=>24597,
-15393=>24598,
-15394=>24599,
-15395=>24600,
-15396=>24601,
-15397=>24602,
-15398=>24603,
-15399=>24604,
-15400=>24605,
-15401=>24606,
-15402=>24607,
-15403=>24608,
-15404=>24609,
-15405=>24610,
-15406=>24611,
-15407=>24612,
-15408=>24613,
-15409=>24614,
-15410=>24615,
-15411=>24616,
-15412=>24617,
-15413=>24618,
-15414=>24619,
-15415=>24620,
-15416=>24621,
-15417=>24622,
-15418=>24623,
-15419=>24624,
-15420=>24625,
-15421=>24626,
-15422=>24627,
-15423=>24628,
-15424=>24629,
-15425=>24630,
-15426=>24631,
-15427=>24632,
-15428=>24633,
-15429=>24634,
-15430=>24635,
-15431=>24636,
-15432=>24637,
-15433=>24638,
-15434=>24639,
-15435=>24640,
-15436=>24641,
-15437=>24642,
-15438=>24643,
-15439=>24644,
-15440=>24645,
-15441=>24646,
-15442=>24647,
-15443=>24648,
-15444=>24649,
-15445=>24650,
-15446=>24651,
-15447=>24652,
-15448=>24653,
-15449=>24654,
-15450=>24655,
-15451=>24656,
-15452=>24657,
-15453=>24658,
-15454=>24659,
-15455=>24660,
-15456=>24661,
-15457=>24662,
-15458=>24663,
-15459=>24664,
-15460=>24665,
-15461=>24666,
-15462=>24667,
-15463=>24668,
-15464=>24669,
-15465=>24670,
-15466=>24671,
-15467=>24672,
-15468=>24673,
-15469=>24674,
-15471=>24675,
-15472=>24676,
-15473=>24677,
-15474=>24678,
-15475=>24679,
-15476=>24680,
-15477=>24681,
-15478=>24682,
-15479=>24683,
-15480=>24684,
-15481=>24685,
-15482=>24686,
-15483=>24687,
-15484=>24688,
-15485=>24689,
-15486=>24690,
-15487=>24691,
-15488=>24692,
-15489=>24693,
-15490=>24694,
-15491=>24695,
-15492=>24696,
-15493=>24697,
-15494=>24698,
-15495=>24699,
-15496=>24700,
-15497=>24701,
-15498=>24702,
-15499=>24703,
-15500=>24704,
-15501=>24705,
-15502=>24706,
-15503=>24707,
-15504=>24708,
-15505=>24709,
-15506=>24710,
-15507=>24711,
-15508=>24712,
-15509=>24713,
-15510=>24714,
-15511=>24715,
-15512=>24716,
-15513=>24717,
-15514=>24718,
-15515=>24719,
-15516=>24720,
-15517=>24721,
-15518=>24722,
-15519=>24723,
-15520=>24724,
-15521=>24725,
-15522=>24726,
-15523=>24727,
-15524=>24728,
-15525=>24729,
-15526=>24730,
-15527=>24731,
-15528=>24732,
-15529=>24733,
-15530=>24734,
-15531=>24735,
-15532=>24736,
-15533=>24737,
-15534=>24738,
-15535=>24739,
-15536=>24740,
-15537=>24741,
-15538=>24742,
-15539=>24743,
-15540=>24744,
-15541=>24745,
-15542=>24746,
-15543=>24747,
-15544=>24748,
-15545=>24749,
-15546=>24750,
-15547=>24751,
-15548=>24752,
-15549=>24753,
-15550=>24754,
-15551=>24755,
-15552=>24756,
-15553=>24757,
-15554=>24758,
-15555=>24759,
-15556=>24760,
-15557=>24761,
-15558=>24762,
-15559=>24763,
-15560=>24764,
-15561=>24765,
-15562=>24766,
-15563=>24767,
-15564=>24768,
-15565=>24769,
-15566=>24770,
-15567=>24771,
-15568=>24772,
-15569=>24773,
-15570=>24774,
-15571=>24775,
-15572=>24776,
-15573=>24777,
-15574=>24778,
-15575=>24779,
-15576=>24780,
-15577=>24781,
-15578=>24782,
-15579=>24783,
-15580=>24784,
-15581=>24785,
-15582=>24786,
-15583=>24787,
-15585=>24788,
-15586=>24789,
-15587=>24790,
-15588=>24791,
-15589=>24792,
-15590=>24793,
-15591=>24794,
-15592=>24795,
-15593=>24796,
-15594=>24797,
-15595=>24798,
-15596=>24799,
-15597=>24800,
-15598=>24801,
-15599=>24802,
-15600=>24803,
-15601=>24804,
-15602=>24805,
-15603=>24806,
-15604=>24807,
-15605=>24808,
-15606=>24809,
-15607=>24810,
-15608=>24811,
-15609=>24812,
-15610=>24813,
-15611=>24814,
-15612=>24815,
-15613=>24816,
-15614=>24817,
-15615=>24818,
-15616=>24819,
-15617=>24820,
-15618=>24821,
-15619=>24822,
-15620=>24823,
-15621=>24824,
-15622=>24825,
-15623=>24826,
-15624=>24827,
-15625=>24828,
-15626=>24829,
-15627=>24830,
-15628=>24831,
-15629=>24832,
-15630=>24833,
-15631=>24834,
-15632=>24835,
-15633=>24836,
-15634=>24837,
-15635=>24838,
-15636=>24839,
-15637=>24840,
-15638=>24841,
-15639=>24842,
-15640=>24843,
-15641=>24844,
-15642=>24845,
-15643=>24846,
-15644=>24847,
-15645=>24848,
-15646=>24849,
-15647=>24850,
-15648=>24851,
-15649=>24852,
-15650=>24853,
-15651=>24854,
-15652=>24855,
-15653=>24856,
-15654=>24857,
-15655=>24858,
-15656=>24859,
-15657=>24860,
-15658=>24861,
-15659=>24862,
-15660=>24863,
-15661=>24864,
-15662=>24865,
-15663=>24866,
-15664=>24867,
-15665=>24868,
-15666=>24869,
-15667=>24870,
-15668=>24871,
-15669=>24872,
-15670=>24873,
-15671=>24874,
-15672=>24875,
-15673=>24876,
-15674=>24877,
-15675=>24878,
-15676=>24879,
-15677=>24880,
-15678=>24881,
-15679=>24882,
-15680=>24883,
-15681=>24884,
-15682=>24885,
-15683=>24886,
-15684=>24887,
-15685=>24888,
-15686=>24889,
-15687=>24890,
-15688=>24891,
-15689=>24892,
-15690=>24893,
-15691=>24894,
-15692=>24895,
-15693=>24896,
-15694=>24897,
-15695=>24898,
-15696=>24899,
-15697=>24900,
-15698=>24901,
-15699=>24902,
-15700=>24903,
-15701=>24904,
-15702=>24905,
-15703=>24906,
-15704=>24907,
-15705=>24908,
-15706=>24909,
-15707=>24910,
-15708=>24911,
-15709=>24912,
-15710=>24913,
-15711=>24914,
-15712=>24915,
-15713=>24916,
-15714=>24917,
-15715=>24918,
-15716=>24919,
-15717=>24920,
-15718=>24921,
-15719=>24922,
-15720=>24923,
-15721=>24924,
-15722=>24925,
-15723=>24926,
-15724=>24927,
-15725=>24928,
-15726=>24929,
-15727=>24930,
-15728=>24931,
-15729=>24932,
-15730=>24933,
-15731=>24934,
-15732=>24935,
-15733=>24936,
-15734=>24937,
-15735=>24938,
-15736=>24939,
-15737=>24940,
-15738=>24941,
-15739=>24942,
-15740=>24943,
-15741=>24944,
-15742=>24945,
-15743=>24946,
-15744=>24947,
-15745=>24948,
-15746=>24949,
-15747=>24950,
-15748=>24951,
-15749=>24952,
-15750=>24953,
-15751=>24954,
-15752=>24955,
-15753=>24956,
-15754=>24957,
-15755=>24958,
-15756=>24959,
-15757=>24960,
-15758=>24961,
-15759=>24962,
-15760=>24963,
-15761=>24964,
-15762=>24965,
-15763=>24966,
-15764=>24967,
-15765=>24968,
-15766=>24969,
-15767=>24970,
-15768=>24971,
-15769=>24972,
-15770=>24973,
-15771=>24974,
-15772=>24975,
-15773=>24976,
-15774=>24977,
-15775=>24978,
-15776=>24979,
-15777=>24980,
-15778=>24981,
-15779=>24982,
-15780=>24983,
-15781=>24984,
-15782=>24985,
-15783=>24986,
-15784=>24987,
-15785=>24988,
-15786=>24989,
-15787=>24990,
-15788=>24991,
-15789=>24992,
-15790=>24993,
-15791=>24994,
-15792=>24995,
-15793=>24996,
-15794=>24997,
-15795=>24998,
-15796=>24999,
-15797=>25000,
-15798=>25001,
-15799=>25002,
-15800=>25003,
-15801=>25004,
-15802=>25005,
-15803=>25006,
-15804=>25007,
-15805=>25008,
-15806=>25009,
-15807=>25010,
-15808=>25011,
-15809=>25012,
-15810=>25013,
-15811=>25014,
-15812=>25015,
-15813=>25016,
-15814=>25017,
-15815=>25018,
-15816=>25019,
-15817=>25020,
-15818=>25021,
-15819=>25022,
-15820=>25023,
-15821=>25024,
-15822=>25025,
-15823=>25026,
-15824=>25027,
-15825=>25028,
-15826=>25029,
-15827=>25030,
-15828=>25031,
-15829=>25032,
-15830=>25033,
-15831=>25034,
-15832=>25035,
-15833=>25036,
-15834=>25037,
-15835=>25038,
-15836=>25039,
-15837=>25040,
-15838=>25041,
-15839=>25042,
-15840=>25043,
-15841=>25044,
-15842=>25045,
-15843=>25046,
-15844=>25047,
-15845=>25048,
-15846=>25049,
-15847=>25050,
-15848=>25051,
-15849=>25052,
-15850=>25053,
-15851=>25054,
-15852=>25055,
-15853=>25056,
-15854=>25057,
-15855=>25058,
-15856=>25059,
-15857=>25060,
-15858=>25061,
-15859=>25062,
-15860=>25063,
-15861=>25064,
-15862=>25065,
-15863=>25066,
-15864=>25067,
-15865=>25068,
-15866=>25069,
-15867=>25070,
-15868=>25071,
-15869=>25072,
-15870=>25073,
-15871=>25074,
-15872=>25075,
-15873=>25076,
-15874=>25077,
-15875=>25078,
-15876=>25079,
-15877=>25080,
-15878=>25081,
-15879=>25082,
-15880=>25083,
-15881=>25084,
-15882=>25085,
-15883=>25086,
-15884=>25087,
-15885=>25088,
-15886=>25089,
-15887=>25090,
-15888=>25091,
-15889=>25092,
-15890=>25093,
-15891=>25094,
-15892=>25095,
-15893=>25096,
-15894=>25097,
-15895=>25098,
-15896=>25099,
-15897=>25100,
-15898=>25101,
-15899=>25102,
-15900=>25103,
-15901=>25104,
-15902=>25105,
-15903=>25106,
-15904=>25107,
-15905=>25108,
-15906=>25109,
-15907=>25110,
-15908=>25111,
-15909=>25112,
-15910=>25113,
-15911=>25114,
-15912=>25115,
-15913=>25116,
-15914=>25117,
-15915=>25118,
-15916=>25119,
-15917=>25120,
-15918=>25121,
-15919=>25122,
-15920=>25123,
-15921=>25124,
-15922=>25125,
-15923=>25126,
-15924=>25127,
-15925=>25128,
-15926=>25129,
-15927=>25130,
-15928=>25131,
-15929=>25132,
-15930=>25133,
-15931=>25134,
-15932=>25135,
-15933=>25136,
-15934=>25137,
-15935=>25138,
-15936=>25139,
-15937=>25140,
-15938=>25141,
-15939=>25142,
-15940=>25143,
-15941=>25144,
-15942=>25145,
-15943=>25146,
-15944=>25147,
-15945=>25148,
-15946=>25149,
-15947=>25150,
-15948=>25151,
-15949=>25152,
-15950=>25153,
-15951=>25154,
-15952=>25155,
-15953=>25156,
-15954=>25157,
-15955=>25158,
-15956=>25159,
-15957=>25160,
-15958=>25161,
-15959=>25162,
-15960=>25163,
-15961=>25164,
-15962=>25165,
-15963=>25166,
-15964=>25167,
-15965=>25168,
-15966=>25169,
-15967=>25170,
-15968=>25171,
-15969=>25172,
-15970=>25173,
-15971=>25174,
-15972=>25175,
-15973=>25176,
-15974=>25177,
-15975=>25178,
-15976=>25179,
-15977=>25180,
-15978=>25181,
-15979=>25182,
-15980=>25183,
-15981=>25184,
-15982=>25185,
-15983=>25186,
-15984=>25187,
-15985=>25188,
-15986=>25189,
-15987=>25190,
-15988=>25191,
-15989=>25192,
-15990=>25193,
-15991=>25194,
-15992=>25195,
-15993=>25196,
-15994=>25197,
-15995=>25198,
-15996=>25199,
-15997=>25200,
-15998=>25201,
-15999=>25202,
-16000=>25203,
-16001=>25204,
-16002=>25205,
-16003=>25206,
-16004=>25207,
-16005=>25208,
-16006=>25209,
-16007=>25210,
-16008=>25211,
-16009=>25212,
-16010=>25213,
-16011=>25214,
-16012=>25215,
-16013=>25216,
-16014=>25217,
-16015=>25218,
-16016=>25219,
-16017=>25220,
-16018=>25221,
-16019=>25222,
-16020=>25223,
-16021=>25224,
-16022=>25225,
-16023=>25226,
-16024=>25227,
-16025=>25228,
-16026=>25229,
-16027=>25230,
-16028=>25231,
-16029=>25232,
-16030=>25233,
-16031=>25234,
-16032=>25235,
-16033=>25236,
-16034=>25237,
-16035=>25238,
-16036=>25239,
-16037=>25240,
-16038=>25241,
-16039=>25242,
-16040=>25243,
-16041=>25244,
-16042=>25245,
-16043=>25246,
-16044=>25247,
-16045=>25248,
-16046=>25249,
-16047=>25250,
-16048=>25251,
-16049=>25252,
-16050=>25253,
-16051=>25254,
-16052=>25255,
-16053=>25256,
-16054=>25257,
-16055=>25258,
-16056=>25259,
-16057=>25260,
-16058=>25261,
-16059=>25262,
-16060=>25263,
-16061=>25264,
-16062=>25265,
-16063=>25266,
-16064=>25267,
-16065=>25268,
-16066=>25269,
-16067=>25270,
-16068=>25271,
-16069=>25272,
-16070=>25273,
-16071=>25274,
-16072=>25275,
-16073=>25276,
-16074=>25277,
-16075=>25278,
-16076=>25279,
-16077=>25280,
-16078=>25281,
-16079=>25282,
-16080=>25283,
-16081=>25284,
-16082=>25285,
-16083=>25286,
-16084=>25287,
-16085=>25288,
-16086=>25289,
-16087=>25290,
-16088=>25291,
-16089=>25292,
-16090=>25293,
-16091=>25294,
-16092=>25295,
-16093=>25296,
-16094=>25297,
-16095=>25298,
-16096=>25299,
-16097=>25300,
-16098=>25301,
-16099=>25302,
-16100=>25303,
-16101=>25304,
-16102=>25305,
-16103=>25306,
-16104=>25307,
-16105=>25308,
-16106=>25309,
-16107=>25310,
-16108=>25311,
-16109=>25312,
-16110=>25313,
-16111=>25314,
-16112=>25315,
-16113=>25316,
-16114=>25317,
-16115=>25318,
-16116=>25319,
-16117=>25320,
-16118=>25321,
-16119=>25322,
-16120=>25323,
-16121=>25324,
-16122=>25325,
-16123=>25326,
-16124=>25327,
-16125=>25328,
-16126=>25329,
-16127=>25330,
-16128=>25331,
-16129=>25332,
-16130=>25333,
-16131=>25334,
-16132=>25335,
-16133=>25336,
-16134=>25337,
-16135=>25338,
-16136=>25339,
-16137=>25340,
-16138=>25341,
-16139=>25342,
-16140=>25343,
-16141=>25344,
-16142=>25345,
-16143=>25346,
-16144=>25347,
-16145=>25348,
-16146=>25349,
-16147=>25350,
-16148=>25351,
-16149=>25352,
-16150=>25353,
-16151=>25354,
-16152=>25355,
-16153=>25356,
-16154=>25357,
-16155=>25358,
-16156=>25359,
-16157=>25360,
-16158=>25361,
-16159=>25362,
-16160=>25363,
-16161=>25364,
-16162=>25365,
-16163=>25366,
-16164=>25367,
-16165=>25368,
-16166=>25369,
-16167=>25370,
-16168=>25371,
-16169=>25372,
-16170=>25373,
-16171=>25374,
-16172=>25375,
-16173=>25376,
-16174=>25377,
-16175=>25378,
-16176=>25379,
-16177=>25380,
-16178=>25381,
-16179=>25382,
-16180=>25383,
-16181=>25384,
-16182=>25385,
-16183=>25386,
-16184=>25387,
-16185=>25388,
-16186=>25389,
-16187=>25390,
-16188=>25391,
-16189=>25392,
-16190=>25393,
-16191=>25394,
-16192=>25395,
-16193=>25396,
-16194=>25397,
-16195=>25398,
-16196=>25399,
-16197=>25400,
-16198=>25401,
-16199=>25402,
-16200=>25403,
-16201=>25404,
-16202=>25405,
-16203=>25406,
-16204=>25407,
-16205=>25408,
-16206=>25409,
-16207=>25410,
-16208=>25411,
-16209=>25412,
-16210=>25413,
-16211=>25414,
-16212=>25415,
-16213=>25416,
-16214=>25417,
-16215=>25418,
-16216=>25419,
-16217=>25420,
-16218=>25421,
-16219=>25422,
-16220=>25423,
-16221=>25424,
-16222=>25425,
-16223=>25426,
-16224=>25427,
-16225=>25428,
-16226=>25429,
-16227=>25430,
-16228=>25431,
-16229=>25432,
-16230=>25433,
-16231=>25434,
-16232=>25435,
-16233=>25436,
-16234=>25437,
-16235=>25438,
-16236=>25439,
-16237=>25440,
-16238=>25441,
-16239=>25442,
-16240=>25443,
-16241=>25444,
-16242=>25445,
-16243=>25446,
-16244=>25447,
-16245=>25448,
-16246=>25449,
-16247=>25450,
-16248=>25451,
-16249=>25452,
-16250=>25453,
-16251=>25454,
-16252=>25455,
-16253=>25456,
-16254=>25457,
-16255=>25458,
-16256=>25459,
-16257=>25460,
-16258=>25461,
-16259=>25462,
-16260=>25463,
-16261=>25464,
-16262=>25465,
-16263=>25466,
-16264=>25467,
-16265=>25468,
-16266=>25469,
-16267=>25470,
-16268=>25471,
-16269=>25472,
-16270=>25473,
-16271=>25474,
-16272=>25475,
-16273=>25476,
-16274=>25477,
-16275=>25478,
-16276=>25479,
-16277=>25480,
-16278=>25481,
-16279=>25482,
-16280=>25483,
-16281=>25484,
-16282=>25485,
-16283=>25486,
-16284=>25487,
-16285=>25488,
-16286=>25489,
-16287=>25490,
-16288=>25491,
-16289=>25492,
-16290=>25493,
-16291=>25494,
-16292=>25495,
-16293=>25496,
-16294=>25497,
-16295=>25498,
-16296=>25499,
-16297=>25500,
-16298=>25501,
-16299=>25502,
-16300=>25503,
-16301=>25504,
-16302=>25505,
-16303=>25506,
-16304=>25507,
-16305=>25508,
-16306=>25509,
-16307=>25510,
-16308=>25511,
-16309=>25512,
-16310=>25513,
-16311=>25514,
-16312=>25515,
-16313=>25516,
-16314=>25517,
-16315=>25518,
-16316=>25519,
-16317=>25520,
-16318=>25521,
-16319=>25522,
-16320=>25523,
-16321=>25524,
-16322=>25525,
-16323=>25526,
-16324=>25527,
-16325=>25528,
-16326=>25529,
-16327=>25530,
-16328=>25531,
-16329=>25532,
-16330=>25533,
-16331=>25534,
-16332=>25535,
-16333=>25536,
-16334=>25537,
-16335=>25538,
-16336=>25539,
-16337=>25540,
-16338=>25541,
-16339=>25542,
-16340=>25543,
-16341=>25544,
-16342=>25545,
-16343=>25546,
-16344=>25547,
-16345=>25548,
-16346=>25549,
-16347=>25550,
-16348=>25551,
-16349=>25552,
-16350=>25553,
-16351=>25554,
-16352=>25555,
-16353=>25556,
-16354=>25557,
-16355=>25558,
-16356=>25559,
-16357=>25560,
-16358=>25561,
-16359=>25562,
-16360=>25563,
-16361=>25564,
-16362=>25565,
-16363=>25566,
-16364=>25567,
-16365=>25568,
-16366=>25569,
-16367=>25570,
-16368=>25571,
-16369=>25572,
-16370=>25573,
-16371=>25574,
-16372=>25575,
-16373=>25576,
-16374=>25577,
-16375=>25578,
-16376=>25579,
-16377=>25580,
-16378=>25581,
-16379=>25582,
-16380=>25583,
-16381=>25584,
-16382=>25585,
-16383=>25586,
-16384=>25587,
-16385=>25588,
-16386=>25589,
-16387=>25590,
-16388=>25591,
-16389=>25592,
-16390=>25593,
-16391=>25594,
-16392=>25595,
-16393=>25596,
-16394=>25597,
-16395=>25598,
-16396=>25599,
-16397=>25600,
-16398=>25601,
-16399=>25602,
-16400=>25603,
-16401=>25604,
-16402=>25605,
-16403=>25606,
-16404=>25607,
-16405=>25608,
-16406=>25609,
-16407=>25610,
-16408=>25611,
-16409=>25612,
-16410=>25613,
-16411=>25614,
-16412=>25615,
-16413=>25616,
-16414=>25617,
-16415=>25618,
-16416=>25619,
-16417=>25620,
-16418=>25621,
-16419=>25622,
-16420=>25623,
-16421=>25624,
-16422=>25625,
-16423=>25626,
-16424=>25627,
-16425=>25628,
-16426=>25629,
-16427=>25630,
-16428=>25631,
-16429=>25632,
-16430=>25633,
-16431=>25634,
-16432=>25635,
-16433=>25636,
-16434=>25637,
-16435=>25638,
-16436=>25639,
-16437=>25640,
-16438=>25641,
-16439=>25642,
-16440=>25643,
-16441=>25644,
-16442=>25645,
-16443=>25646,
-16444=>25647,
-16445=>25648,
-16446=>25649,
-16447=>25650,
-16448=>25651,
-16449=>25652,
-16450=>25653,
-16451=>25654,
-16452=>25655,
-16453=>25656,
-16454=>25657,
-16455=>25658,
-16456=>25659,
-16457=>25660,
-16458=>25661,
-16459=>25662,
-16460=>25663,
-16461=>25664,
-16462=>25665,
-16463=>25666,
-16464=>25667,
-16465=>25668,
-16466=>25669,
-16467=>25670,
-16468=>25671,
-16469=>25672,
-16471=>25673,
-16472=>25674,
-16473=>25675,
-16474=>25676,
-16475=>25677,
-16476=>25678,
-16477=>25679,
-16478=>25680,
-16479=>25681,
-16480=>25682,
-16481=>25683,
-16482=>25684,
-16483=>25685,
-16484=>25686,
-16485=>25687,
-16486=>25688,
-16487=>25689,
-16488=>25690,
-16489=>25691,
-16490=>25692,
-16491=>25693,
-16492=>25694,
-16493=>25695,
-16494=>25696,
-16495=>25697,
-16496=>25698,
-16497=>25699,
-16498=>25700,
-16499=>25701,
-16500=>25702,
-16501=>25703,
-16502=>25704,
-16503=>25705,
-16504=>25706,
-16505=>25707,
-16506=>25708,
-16507=>25709,
-16508=>25710,
-16509=>25711,
-16510=>25712,
-16511=>25713,
-16512=>25714,
-16513=>25715,
-16514=>25716,
-16515=>25717,
-16516=>25718,
-16517=>25719,
-16518=>25720,
-16519=>25721,
-16520=>25722,
-16521=>25723,
-16522=>25724,
-16523=>25725,
-16524=>25726,
-16525=>25727,
-16526=>25728,
-16527=>25729,
-16528=>25730,
-16529=>25731,
-16530=>25732,
-16531=>25733,
-16532=>25734,
-16533=>25735,
-16534=>25736,
-16535=>25737,
-16536=>25738,
-16537=>25739,
-16538=>25740,
-16539=>25741,
-16540=>25742,
-16541=>25743,
-16542=>25744,
-16543=>25745,
-16544=>25746,
-16545=>25747,
-16546=>25748,
-16547=>25749,
-16548=>25750,
-16549=>25751,
-16550=>25752,
-16551=>25753,
-16552=>25754,
-16553=>25755,
-16554=>25756,
-16555=>25757,
-16556=>25758,
-16557=>25759,
-16558=>25760,
-16559=>25761,
-16560=>25762,
-16561=>25763,
-16562=>25764,
-16563=>25765,
-16564=>25766,
-16565=>25767,
-16566=>25768,
-16567=>25769,
-16568=>25770,
-16569=>25771,
-16570=>25772,
-16571=>25773,
-16572=>25774,
-16573=>25775,
-16574=>25776,
-16575=>25777,
-16576=>25778,
-16577=>25779,
-16578=>25780,
-16579=>25781,
-16580=>25782,
-16581=>25783,
-16582=>25784,
-16583=>25785,
-16584=>25786,
-16585=>25787,
-16586=>25788,
-16587=>25789,
-16588=>25790,
-16589=>25791,
-16590=>25792,
-16591=>25793,
-16592=>25794,
-16593=>25795,
-16594=>25796,
-16595=>25797,
-16596=>25798,
-16597=>25799,
-16598=>25800,
-16599=>25801,
-16600=>25802,
-16601=>25803,
-16602=>25804,
-16603=>25805,
-16604=>25806,
-16605=>25807,
-16606=>25808,
-16607=>25809,
-16608=>25810,
-16609=>25811,
-16610=>25812,
-16611=>25813,
-16612=>25814,
-16613=>25815,
-16614=>25816,
-16615=>25817,
-16616=>25818,
-16617=>25819,
-16618=>25820,
-16619=>25821,
-16620=>25822,
-16621=>25823,
-16622=>25824,
-16623=>25825,
-16624=>25826,
-16625=>25827,
-16626=>25828,
-16627=>25829,
-16628=>25830,
-16629=>25831,
-16630=>25832,
-16631=>25833,
-16632=>25834,
-16633=>25835,
-16634=>25836,
-16635=>25837,
-16636=>25838,
-16637=>25839,
-16638=>25840,
-16639=>25841,
-16640=>25842,
-16641=>25843,
-16642=>25844,
-16643=>25845,
-16644=>25846,
-16645=>25847,
-16646=>25848,
-16647=>25849,
-16648=>25850,
-16649=>25851,
-16650=>25852,
-16651=>25853,
-16652=>25854,
-16653=>25855,
-16654=>25856,
-16655=>25857,
-16656=>25858,
-16657=>25859,
-16658=>25860,
-16659=>25861,
-16660=>25862,
-16661=>25863,
-16662=>25864,
-16663=>25865,
-16664=>25866,
-16665=>25867,
-16666=>25868,
-16667=>25869,
-16668=>25870,
-16669=>25871,
-16670=>25872,
-16671=>25873,
-16672=>25874,
-16673=>25875,
-16674=>25876,
-16675=>25877,
-16676=>25878,
-16677=>25879,
-16678=>25880,
-16679=>25881,
-16680=>25882,
-16681=>25883,
-16682=>25884,
-16683=>25885,
-16684=>25886,
-16685=>25887,
-16686=>25888,
-16687=>25889,
-16688=>25890,
-16689=>25891,
-16690=>25892,
-16691=>25893,
-16692=>25894,
-16693=>25895,
-16694=>25896,
-16695=>25897,
-16696=>25898,
-16697=>25899,
-16698=>25900,
-16699=>25901,
-16700=>25902,
-16701=>25903,
-16702=>25904,
-16703=>25905,
-16704=>25906,
-16705=>25907,
-16706=>25908,
-16707=>25909,
-16708=>25910,
-16709=>25911,
-16710=>25912,
-16711=>25913,
-16712=>25914,
-16713=>25915,
-16714=>25916,
-16715=>25917,
-16716=>25918,
-16717=>25919,
-16718=>25920,
-16719=>25921,
-16720=>25922,
-16721=>25923,
-16722=>25924,
-16723=>25925,
-16724=>25926,
-16725=>25927,
-16726=>25928,
-16727=>25929,
-16728=>25930,
-16729=>25931,
-16730=>25932,
-16731=>25933,
-16732=>25934,
-16733=>25935,
-16734=>25936,
-16736=>25937,
-16737=>25938,
-16738=>25939,
-16739=>25940,
-16740=>25941,
-16741=>25942,
-16742=>25943,
-16743=>25944,
-16744=>25945,
-16745=>25946,
-16746=>25947,
-16747=>25948,
-16748=>25949,
-16749=>25950,
-16750=>25951,
-16751=>25952,
-16752=>25953,
-16753=>25954,
-16754=>25955,
-16755=>25956,
-16756=>25957,
-16757=>25958,
-16758=>25959,
-16759=>25960,
-16760=>25961,
-16761=>25962,
-16762=>25963,
-16763=>25964,
-16764=>25965,
-16765=>25966,
-16766=>25967,
-16767=>25968,
-16768=>25969,
-16769=>25970,
-16770=>25971,
-16771=>25972,
-16772=>25973,
-16773=>25974,
-16774=>25975,
-16775=>25976,
-16776=>25977,
-16777=>25978,
-16778=>25979,
-16779=>25980,
-16780=>25981,
-16781=>25982,
-16782=>25983,
-16783=>25984,
-16784=>25985,
-16785=>25986,
-16786=>25987,
-16787=>25988,
-16788=>25989,
-16789=>25990,
-16790=>25991,
-16791=>25992,
-16792=>25993,
-16793=>25994,
-16794=>25995,
-16795=>25996,
-16796=>25997,
-16797=>25998,
-16798=>25999,
-16799=>26000,
-16800=>26001,
-16801=>26002,
-16802=>26003,
-16803=>26004,
-16804=>26005,
-16805=>26006,
-16806=>26007,
-16807=>26008,
-16808=>26009,
-16809=>26010,
-16810=>26011,
-16811=>26012,
-16812=>26013,
-16813=>26014,
-16814=>26015,
-16815=>26016,
-16816=>26017,
-16817=>26018,
-16818=>26019,
-16819=>26020,
-16820=>26021,
-16821=>26022,
-16822=>26023,
-16823=>26024,
-16824=>26025,
-16825=>26026,
-16826=>26027,
-16827=>26028,
-16828=>26029,
-16829=>26030,
-16830=>26031,
-16831=>26032,
-16832=>26033,
-16833=>26034,
-16834=>26035,
-16835=>26036,
-16836=>26037,
-16837=>26038,
-16838=>26039,
-16839=>26040,
-16840=>26041,
-16841=>26042,
-16842=>26043,
-16843=>26044,
-16844=>26045,
-16845=>26046,
-16846=>26047,
-16847=>26048,
-16848=>26049,
-16849=>26050,
-16850=>26051,
-16851=>26052,
-16852=>26053,
-16853=>26054,
-16854=>26055,
-16855=>26056,
-16856=>26057,
-16857=>26058,
-16858=>26059,
-16859=>26060,
-16860=>26061,
-16861=>26062,
-16862=>26063,
-16863=>26064,
-16864=>26065,
-16865=>26066,
-16866=>26067,
-16867=>26068,
-16868=>26069,
-16869=>26070,
-16870=>26071,
-16871=>26072,
-16872=>26073,
-16873=>26074,
-16874=>26075,
-16875=>26076,
-16876=>26077,
-16877=>26078,
-16878=>26079,
-16879=>26080,
-16880=>26081,
-16881=>26082,
-16882=>26083,
-16883=>26084,
-16884=>26085,
-16885=>26086,
-16886=>26087,
-16887=>26088,
-16888=>26089,
-16889=>26090,
-16890=>26091,
-16891=>26092,
-16892=>26093,
-16893=>26094,
-16894=>26095,
-16895=>26096,
-16896=>26097,
-16897=>26098,
-16898=>26099,
-16899=>26100,
-16900=>26101,
-16901=>26102,
-16902=>26103,
-16903=>26104,
-16904=>26105,
-16905=>26106,
-16906=>26107,
-16907=>26108,
-16908=>26109,
-16909=>26110,
-16910=>26111,
-16911=>26112,
-16912=>26113,
-16913=>26114,
-16914=>26115,
-16915=>26116,
-16916=>26117,
-16917=>26118,
-16918=>26119,
-16919=>26120,
-16920=>26121,
-16921=>26122,
-16922=>26123,
-16923=>26124,
-16924=>26125,
-16925=>26126,
-16926=>26127,
-16927=>26128,
-16928=>26129,
-16929=>26130,
-16930=>26131,
-16931=>26132,
-16932=>26133,
-16933=>26134,
-16934=>26135,
-16935=>26136,
-16936=>26137,
-16937=>26138,
-16938=>26139,
-16939=>26140,
-16940=>26141,
-16941=>26142,
-16942=>26143,
-16943=>26144,
-16944=>26145,
-16945=>26146,
-16946=>26147,
-16947=>26148,
-16948=>26149,
-16949=>26150,
-16950=>26151,
-16951=>26152,
-16952=>26153,
-16953=>26154,
-16954=>26155,
-16955=>26156,
-16956=>26157,
-16957=>26158,
-16958=>26159,
-16959=>26160,
-16960=>26161,
-16961=>26162,
-16962=>26163,
-16963=>26164,
-16964=>26165,
-16965=>26166,
-16966=>26167,
-16967=>26168,
-16968=>26169,
-16969=>26170,
-16970=>26171,
-16971=>26172,
-16972=>26173,
-16973=>26174,
-16974=>26175,
-16975=>26176,
-16976=>26177,
-16977=>26178,
-16978=>26179,
-16979=>26180,
-16980=>26181,
-16981=>26182,
-16982=>26183,
-16983=>26184,
-16984=>26185,
-16985=>26186,
-16986=>26187,
-16987=>26188,
-16988=>26189,
-16989=>26190,
-16990=>26191,
-16991=>26192,
-16992=>26193,
-16993=>26194,
-16994=>26195,
-16995=>26196,
-16996=>26197,
-16997=>26198,
-16998=>26199,
-16999=>26200,
-17000=>26201,
-17001=>26202,
-17002=>26203,
-17003=>26204,
-17004=>26205,
-17005=>26206,
-17006=>26207,
-17007=>26208,
-17008=>26209,
-17009=>26210,
-17010=>26211,
-17011=>26212,
-17012=>26213,
-17013=>26214,
-17014=>26215,
-17015=>26216,
-17016=>26217,
-17017=>26218,
-17018=>26219,
-17019=>26220,
-17020=>26221,
-17021=>26222,
-17022=>26223,
-17023=>26224,
-17024=>26225,
-17025=>26226,
-17026=>26227,
-17027=>26228,
-17028=>26229,
-17029=>26230,
-17030=>26231,
-17031=>26232,
-17032=>26233,
-17033=>26234,
-17034=>26235,
-17035=>26236,
-17036=>26237,
-17037=>26238,
-17038=>26239,
-17039=>26240,
-17040=>26241,
-17041=>26242,
-17042=>26243,
-17043=>26244,
-17044=>26245,
-17045=>26246,
-17046=>26247,
-17047=>26248,
-17048=>26249,
-17049=>26250,
-17050=>26251,
-17051=>26252,
-17052=>26253,
-17053=>26254,
-17054=>26255,
-17055=>26256,
-17056=>26257,
-17057=>26258,
-17058=>26259,
-17059=>26260,
-17060=>26261,
-17061=>26262,
-17062=>26263,
-17063=>26264,
-17064=>26265,
-17065=>26266,
-17066=>26267,
-17067=>26268,
-17068=>26269,
-17069=>26270,
-17070=>26271,
-17071=>26272,
-17072=>26273,
-17073=>26274,
-17074=>26275,
-17075=>26276,
-17076=>26277,
-17077=>26278,
-17078=>26279,
-17079=>26280,
-17080=>26281,
-17081=>26282,
-17082=>26283,
-17083=>26284,
-17084=>26285,
-17085=>26286,
-17086=>26287,
-17087=>26288,
-17088=>26289,
-17089=>26290,
-17090=>26291,
-17091=>26292,
-17092=>26293,
-17093=>26294,
-17094=>26295,
-17095=>26296,
-17096=>26297,
-17097=>26298,
-17098=>26299,
-17099=>26300,
-17100=>26301,
-17101=>26302,
-17102=>26303,
-17103=>26304,
-17104=>26305,
-17105=>26306,
-17106=>26307,
-17107=>26308,
-17108=>26309,
-17109=>26310,
-17110=>26311,
-17111=>26312,
-17112=>26313,
-17113=>26314,
-17114=>26315,
-17115=>26316,
-17116=>26317,
-17117=>26318,
-17118=>26319,
-17119=>26320,
-17120=>26321,
-17121=>26322,
-17122=>26323,
-17123=>26324,
-17124=>26325,
-17125=>26326,
-17126=>26327,
-17127=>26328,
-17128=>26329,
-17129=>26330,
-17130=>26331,
-17131=>26332,
-17132=>26333,
-17133=>26334,
-17134=>26335,
-17135=>26336,
-17136=>26337,
-17137=>26338,
-17138=>26339,
-17139=>26340,
-17140=>26341,
-17141=>26342,
-17142=>26343,
-17143=>26344,
-17144=>26345,
-17145=>26346,
-17146=>26347,
-17147=>26348,
-17148=>26349,
-17149=>26350,
-17150=>26351,
-17151=>26352,
-17152=>26353,
-17153=>26354,
-17154=>26355,
-17155=>26356,
-17156=>26357,
-17157=>26358,
-17158=>26359,
-17159=>26360,
-17160=>26361,
-17161=>26362,
-17162=>26363,
-17163=>26364,
-17164=>26365,
-17165=>26366,
-17166=>26367,
-17167=>26368,
-17168=>26369,
-17169=>26370,
-17170=>26371,
-17171=>26372,
-17172=>26373,
-17173=>26374,
-17174=>26375,
-17175=>26376,
-17176=>26377,
-17177=>26378,
-17178=>26379,
-17179=>26380,
-17180=>26381,
-17181=>26382,
-17182=>26383,
-17183=>26384,
-17184=>26385,
-17185=>26386,
-17186=>26387,
-17187=>26388,
-17188=>26389,
-17189=>26390,
-17190=>26391,
-17191=>26392,
-17192=>26393,
-17193=>26394,
-17194=>26395,
-17195=>26396,
-17196=>26397,
-17197=>26398,
-17198=>26399,
-17199=>26400,
-17200=>26401,
-17201=>26402,
-17202=>26403,
-17203=>26404,
-17204=>26405,
-17205=>26406,
-17206=>26407,
-17208=>26408,
-17209=>26409,
-17210=>26410,
-17211=>26411,
-17212=>26412,
-17213=>26413,
-17214=>26414,
-17215=>26415,
-17216=>26416,
-17217=>26417,
-17218=>26418,
-17219=>26419,
-17220=>26420,
-17221=>26421,
-17222=>26422,
-17223=>26423,
-17224=>26424,
-17225=>26425,
-17226=>26426,
-17227=>26427,
-17228=>26428,
-17229=>26429,
-17230=>26430,
-17231=>26431,
-17232=>26432,
-17233=>26433,
-17234=>26434,
-17235=>26435,
-17236=>26436,
-17237=>26437,
-17238=>26438,
-17239=>26439,
-17240=>26440,
-17241=>26441,
-17242=>26442,
-17243=>26443,
-17244=>26444,
-17245=>26445,
-17246=>26446,
-17247=>26447,
-17248=>26448,
-17249=>26449,
-17250=>26450,
-17251=>26451,
-17252=>26452,
-17253=>26453,
-17254=>26454,
-17255=>26455,
-17256=>26456,
-17257=>26457,
-17258=>26458,
-17259=>26459,
-17260=>26460,
-17261=>26461,
-17262=>26462,
-17263=>26463,
-17264=>26464,
-17265=>26465,
-17266=>26466,
-17267=>26467,
-17268=>26468,
-17269=>26469,
-17270=>26470,
-17271=>26471,
-17272=>26472,
-17273=>26473,
-17274=>26474,
-17275=>26475,
-17276=>26476,
-17277=>26477,
-17278=>26478,
-17279=>26479,
-17280=>26480,
-17281=>26481,
-17282=>26482,
-17283=>26483,
-17284=>26484,
-17285=>26485,
-17286=>26486,
-17287=>26487,
-17288=>26488,
-17289=>26489,
-17290=>26490,
-17291=>26491,
-17292=>26492,
-17293=>26493,
-17294=>26494,
-17295=>26495,
-17296=>26496,
-17297=>26497,
-17298=>26498,
-17299=>26499,
-17300=>26500,
-17301=>26501,
-17302=>26502,
-17303=>26503,
-17304=>26504,
-17305=>26505,
-17306=>26506,
-17307=>26507,
-17308=>26508,
-17309=>26509,
-17310=>26510,
-17311=>26511,
-17312=>26512,
-17313=>26513,
-17314=>26514,
-17315=>26515,
-17316=>26516,
-17317=>26517,
-17318=>26518,
-17319=>26519,
-17320=>26520,
-17321=>26521,
-17322=>26522,
-17323=>26523,
-17325=>26524,
-17326=>26525,
-17327=>26526,
-17328=>26527,
-17330=>26528,
-17331=>26529,
-17332=>26530,
-17333=>26531,
-17334=>26532,
-17335=>26533,
-17336=>26534,
-17337=>26535,
-17338=>26536,
-17339=>26537,
-17340=>26538,
-17341=>26539,
-17342=>26540,
-17343=>26541,
-17344=>26542,
-17345=>26543,
-17346=>26544,
-17347=>26545,
-17348=>26546,
-17349=>26547,
-17350=>26548,
-17351=>26549,
-17352=>26550,
-17353=>26551,
-17354=>26552,
-17355=>26553,
-17356=>26554,
-17357=>26555,
-17358=>26556,
-17359=>26557,
-17360=>26558,
-17361=>26559,
-17362=>26560,
-17363=>26561,
-17364=>26562,
-17365=>26563,
-17366=>26564,
-17367=>26565,
-17368=>26566,
-17369=>26567,
-17370=>26568,
-17371=>26569,
-17372=>26570,
-17374=>26571,
-17375=>26572,
-17376=>26573,
-17377=>26574,
-17378=>26575,
-17379=>26576,
-17380=>26577,
-17381=>26578,
-17382=>26579,
-17383=>26580,
-17384=>26581,
-17385=>26582,
-17386=>26583,
-17387=>26584,
-17388=>26585,
-17389=>26586,
-17390=>26587,
-17391=>26588,
-17392=>26589,
-17393=>26590,
-17394=>26591,
-17395=>26592,
-17396=>26593,
-17397=>26594,
-17398=>26595,
-17399=>26596,
-17400=>26597,
-17401=>26598,
-17402=>26599,
-17403=>26600,
-17404=>26601,
-17405=>26602,
-17406=>26603,
-17407=>26604,
-17408=>26605,
-17409=>26606,
-17410=>26607,
-17411=>26608,
-17412=>26609,
-17413=>26610,
-17414=>26611,
-17415=>26612,
-17416=>26613,
-17417=>26614,
-17418=>26615,
-17419=>26616,
-17420=>26617,
-17421=>26618,
-17422=>26619,
-17423=>26620,
-17424=>26621,
-17425=>26622,
-17426=>26623,
-17427=>26624,
-17428=>26625,
-17429=>26626,
-17430=>26627,
-17431=>26628,
-17432=>26629,
-17433=>26630,
-17434=>26631,
-17435=>26632,
-17436=>26633,
-17437=>26634,
-17438=>26635,
-17439=>26636,
-17440=>26637,
-17441=>26638,
-17442=>26639,
-17443=>26640,
-17444=>26641,
-17445=>26642,
-17446=>26643,
-17447=>26644,
-17448=>26645,
-17449=>26646,
-17450=>26647,
-17451=>26648,
-17452=>26649,
-17453=>26650,
-17454=>26651,
-17455=>26652,
-17456=>26653,
-17457=>26654,
-17458=>26655,
-17459=>26656,
-17460=>26657,
-17461=>26658,
-17462=>26659,
-17463=>26660,
-17464=>26661,
-17465=>26662,
-17466=>26663,
-17467=>26664,
-17468=>26665,
-17469=>26666,
-17470=>26667,
-17471=>26668,
-17472=>26669,
-17473=>26670,
-17474=>26671,
-17475=>26672,
-17476=>26673,
-17477=>26674,
-17478=>26675,
-17479=>26676,
-17480=>26677,
-17481=>26678,
-17482=>26679,
-17483=>26680,
-17484=>26681,
-17485=>26682,
-17486=>26683,
-17487=>26684,
-17488=>26685,
-17489=>26686,
-17490=>26687,
-17491=>26688,
-17492=>26689,
-17493=>26690,
-17494=>26691,
-17495=>26692,
-17496=>26693,
-17497=>26694,
-17498=>26695,
-17499=>26696,
-17500=>26697,
-17501=>26698,
-17502=>26699,
-17503=>26700,
-17504=>26701,
-17505=>26702,
-17506=>26703,
-17507=>26704,
-17508=>26705,
-17509=>26706,
-17510=>26707,
-17511=>26708,
-17512=>26709,
-17513=>26710,
-17514=>26711,
-17515=>26712,
-17516=>26713,
-17517=>26714,
-17518=>26715,
-17519=>26716,
-17520=>26717,
-17521=>26718,
-17522=>26719,
-17523=>26720,
-17524=>26721,
-17525=>26722,
-17526=>26723,
-17527=>26724,
-17528=>26725,
-17529=>26726,
-17530=>26727,
-17531=>26728,
-17532=>26729,
-17533=>26730,
-17534=>26731,
-17535=>26732,
-17536=>26733,
-17537=>26734,
-17538=>26735,
-17539=>26736,
-17540=>26737,
-17541=>26738,
-17542=>26739,
-17543=>26740,
-17544=>26741,
-17545=>26742,
-17546=>26743,
-17547=>26744,
-17548=>26745,
-17549=>26746,
-17550=>26747,
-17551=>26748,
-17552=>26749,
-17553=>26750,
-17554=>26751,
-17555=>26752,
-17556=>26753,
-17557=>26754,
-17558=>26755,
-17559=>26756,
-17560=>26757,
-17561=>26758,
-17562=>26759,
-17563=>26760,
-17564=>26761,
-17565=>26762,
-17566=>26763,
-17567=>26764,
-17568=>26765,
-17569=>26766,
-17570=>26767,
-17571=>26768,
-17572=>26769,
-17573=>26770,
-17574=>26771,
-17575=>26772,
-17576=>26773,
-17577=>26774,
-17578=>26775,
-17579=>26776,
-17580=>26777,
-17581=>26778,
-17582=>26779,
-17583=>26780,
-17584=>26781,
-17585=>26782,
-17586=>26783,
-17587=>26784,
-17588=>26785,
-17589=>26786,
-17590=>26787,
-17591=>26788,
-17592=>26789,
-17593=>26790,
-17594=>26791,
-17595=>26792,
-17596=>26793,
-17597=>26794,
-17598=>26795,
-17599=>26796,
-17600=>26797,
-17601=>26798,
-17602=>26799,
-17603=>26800,
-17604=>26801,
-17605=>26802,
-17606=>26803,
-17607=>26804,
-17608=>26805,
-17609=>26806,
-17610=>26807,
-17611=>26808,
-17612=>26809,
-17613=>26810,
-17614=>26811,
-17615=>26812,
-17616=>26813,
-17617=>26814,
-17618=>26815,
-17619=>26816,
-17620=>26817,
-17621=>26818,
-17623=>26819,
-17624=>26820,
-17625=>26821,
-17626=>26822,
-17627=>26823,
-17628=>26824,
-17629=>26825,
-17630=>26826,
-17631=>26827,
-17632=>26828,
-17633=>26829,
-17634=>26830,
-17635=>26831,
-17636=>26832,
-17637=>26833,
-17638=>26834,
-17639=>26835,
-17640=>26836,
-17641=>26837,
-17642=>26838,
-17643=>26839,
-17644=>26840,
-17645=>26841,
-17646=>26842,
-17647=>26843,
-17648=>26844,
-17649=>26845,
-17650=>26846,
-17651=>26847,
-17652=>26848,
-17653=>26849,
-17654=>26850,
-17655=>26851,
-17656=>26852,
-17657=>26853,
-17658=>26854,
-17659=>26855,
-17660=>26856,
-17661=>26857,
-17662=>26858,
-17663=>26859,
-17664=>26860,
-17665=>26861,
-17666=>26862,
-17667=>26863,
-17668=>26864,
-17669=>26865,
-17670=>26866,
-17671=>26867,
-17672=>26868,
-17673=>26869,
-17674=>26870,
-17675=>26871,
-17676=>26872,
-17677=>26873,
-17678=>26874,
-17679=>26875,
-17680=>26876,
-17681=>26877,
-17682=>26878,
-17683=>26879,
-17684=>26880,
-17685=>26881,
-17686=>26882,
-17687=>26883,
-17688=>26884,
-17689=>26885,
-17690=>26886,
-17691=>26887,
-17692=>26888,
-17693=>26889,
-17694=>26890,
-17695=>26891,
-17696=>26892,
-17697=>26893,
-17698=>26894,
-17699=>26895,
-17700=>26896,
-17701=>26897,
-17702=>26898,
-17703=>26899,
-17704=>26900,
-17705=>26901,
-17706=>26902,
-17707=>26903,
-17708=>26904,
-17709=>26905,
-17710=>26906,
-17711=>26907,
-17712=>26908,
-17713=>26909,
-17714=>26910,
-17715=>26911,
-17716=>26912,
-17717=>26913,
-17718=>26914,
-17719=>26915,
-17720=>26916,
-17721=>26917,
-17722=>26918,
-17723=>26919,
-17724=>26920,
-17725=>26921,
-17726=>26922,
-17727=>26923,
-17728=>26924,
-17729=>26925,
-17730=>26926,
-17731=>26927,
-17732=>26928,
-17733=>26929,
-17734=>26930,
-17735=>26931,
-17736=>26932,
-17737=>26933,
-17738=>26934,
-17739=>26935,
-17740=>26936,
-17741=>26937,
-17742=>26938,
-17743=>26939,
-17744=>26940,
-17745=>26941,
-17746=>26942,
-17747=>26943,
-17748=>26944,
-17749=>26945,
-17750=>26946,
-17751=>26947,
-17752=>26948,
-17753=>26949,
-17754=>26950,
-17755=>26951,
-17756=>26952,
-17757=>26953,
-17758=>26954,
-17759=>26955,
-17760=>26956,
-17761=>26957,
-17762=>26958,
-17763=>26959,
-17764=>26960,
-17765=>26961,
-17766=>26962,
-17767=>26963,
-17768=>26964,
-17769=>26965,
-17770=>26966,
-17771=>26967,
-17772=>26968,
-17773=>26969,
-17774=>26970,
-17775=>26971,
-17776=>26972,
-17777=>26973,
-17778=>26974,
-17779=>26975,
-17780=>26976,
-17781=>26977,
-17782=>26978,
-17783=>26979,
-17784=>26980,
-17785=>26981,
-17786=>26982,
-17787=>26983,
-17788=>26984,
-17789=>26985,
-17790=>26986,
-17791=>26987,
-17792=>26988,
-17793=>26989,
-17794=>26990,
-17795=>26991,
-17796=>26992,
-17797=>26993,
-17798=>26994,
-17799=>26995,
-17800=>26996,
-17801=>26997,
-17802=>26998,
-17803=>26999,
-17804=>27000,
-17805=>27001,
-17806=>27002,
-17807=>27003,
-17808=>27004,
-17809=>27005,
-17810=>27006,
-17811=>27007,
-17812=>27008,
-17813=>27009,
-17814=>27010,
-17815=>27011,
-17816=>27012,
-17817=>27013,
-17818=>27014,
-17819=>27015,
-17820=>27016,
-17821=>27017,
-17822=>27018,
-17823=>27019,
-17824=>27020,
-17825=>27021,
-17826=>27022,
-17827=>27023,
-17828=>27024,
-17829=>27025,
-17830=>27026,
-17831=>27027,
-17832=>27028,
-17833=>27029,
-17834=>27030,
-17835=>27031,
-17836=>27032,
-17837=>27033,
-17838=>27034,
-17839=>27035,
-17840=>27036,
-17841=>27037,
-17842=>27038,
-17843=>27039,
-17844=>27040,
-17845=>27041,
-17846=>27042,
-17847=>27043,
-17848=>27044,
-17849=>27045,
-17850=>27046,
-17851=>27047,
-17852=>27048,
-17853=>27049,
-17854=>27050,
-17855=>27051,
-17856=>27052,
-17857=>27053,
-17858=>27054,
-17859=>27055,
-17860=>27056,
-17861=>27057,
-17862=>27058,
-17863=>27059,
-17864=>27060,
-17865=>27061,
-17866=>27062,
-17867=>27063,
-17868=>27064,
-17869=>27065,
-17870=>27066,
-17871=>27067,
-17872=>27068,
-17873=>27069,
-17874=>27070,
-17875=>27071,
-17876=>27072,
-17877=>27073,
-17878=>27074,
-17879=>27075,
-17880=>27076,
-17881=>27077,
-17882=>27078,
-17883=>27079,
-17884=>27080,
-17885=>27081,
-17886=>27082,
-17887=>27083,
-17888=>27084,
-17889=>27085,
-17890=>27086,
-17891=>27087,
-17892=>27088,
-17893=>27089,
-17894=>27090,
-17895=>27091,
-17896=>27092,
-17897=>27093,
-17898=>27094,
-17899=>27095,
-17900=>27096,
-17901=>27097,
-17902=>27098,
-17903=>27099,
-17904=>27100,
-17905=>27101,
-17906=>27102,
-17907=>27103,
-17908=>27104,
-17909=>27105,
-17910=>27106,
-17911=>27107,
-17912=>27108,
-17913=>27109,
-17914=>27110,
-17915=>27111,
-17916=>27112,
-17917=>27113,
-17918=>27114,
-17919=>27115,
-17920=>27116,
-17921=>27117,
-17922=>27118,
-17923=>27119,
-17924=>27120,
-17925=>27121,
-17926=>27122,
-17927=>27123,
-17928=>27124,
-17929=>27125,
-17930=>27126,
-17931=>27127,
-17932=>27128,
-17933=>27129,
-17934=>27130,
-17935=>27131,
-17936=>27132,
-17937=>27133,
-17938=>27134,
-17939=>27135,
-17940=>27136,
-17941=>27137,
-17942=>27138,
-17943=>27139,
-17944=>27140,
-17945=>27141,
-17946=>27142,
-17947=>27143,
-17948=>27144,
-17949=>27145,
-17950=>27146,
-17951=>27147,
-17952=>27148,
-17953=>27149,
-17954=>27150,
-17955=>27151,
-17956=>27152,
-17957=>27153,
-17958=>27154,
-17959=>27155,
-17960=>27156,
-17961=>27157,
-17962=>27158,
-17963=>27159,
-17964=>27160,
-17965=>27161,
-17966=>27162,
-17967=>27163,
-17968=>27164,
-17969=>27165,
-17970=>27166,
-17971=>27167,
-17972=>27168,
-17973=>27169,
-17974=>27170,
-17975=>27171,
-17976=>27172,
-17977=>27173,
-17978=>27174,
-17979=>27175,
-17980=>27176,
-17981=>27177,
-17982=>27178,
-17983=>27179,
-17984=>27180,
-17985=>27181,
-17986=>27182,
-17987=>27183,
-17988=>27184,
-17989=>27185,
-17990=>27186,
-17991=>27187,
-17992=>27188,
-17993=>27189,
-17994=>27190,
-17995=>27191,
-17997=>27192,
-17998=>27193,
-17999=>27194,
-18000=>27195,
-18001=>27196,
-18002=>27197,
-18003=>27198,
-18004=>27199,
-18005=>27200,
-18006=>27201,
-18007=>27202,
-18008=>27203,
-18009=>27204,
-18010=>27205,
-18011=>27206,
-18012=>27207,
-18013=>27208,
-18014=>27209,
-18015=>27210,
-18016=>27211,
-18018=>27212,
-18019=>27213,
-18020=>27214,
-18021=>27215,
-18022=>27216,
-18023=>27217,
-18024=>27218,
-18025=>27219,
-18026=>27220,
-18027=>27221,
-18028=>27222,
-18029=>27223,
-18030=>27224,
-18031=>27225,
-18032=>27226,
-18033=>27227,
-18034=>27228,
-18035=>27229,
-18036=>27230,
-18037=>27231,
-18038=>27232,
-18039=>27233,
-18040=>27234,
-18041=>27235,
-18042=>27236,
-18043=>27237,
-18044=>27238,
-18045=>27239,
-18046=>27240,
-18047=>27241,
-18048=>27242,
-18049=>27243,
-18050=>27244,
-18051=>27245,
-18052=>27246,
-18053=>27247,
-18054=>27248,
-18055=>27249,
-18056=>27250,
-18057=>27251,
-18058=>27252,
-18059=>27253,
-18060=>27254,
-18061=>27255,
-18062=>27256,
-18063=>27257,
-18064=>27258,
-18065=>27259,
-18066=>27260,
-18067=>27261,
-18068=>27262,
-18069=>27263,
-18070=>27264,
-18071=>27265,
-18072=>27266,
-18073=>27267,
-18074=>27268,
-18075=>27269,
-18076=>27270,
-18077=>27271,
-18078=>27272,
-18079=>27273,
-18080=>27274,
-18081=>27275,
-18082=>27276,
-18083=>27277,
-18084=>27278,
-18085=>27279,
-18086=>27280,
-18087=>27281,
-18088=>27282,
-18089=>27283,
-18090=>27284,
-18091=>27285,
-18092=>27286,
-18093=>27287,
-18094=>27288,
-18095=>27289,
-18096=>27290,
-18097=>27291,
-18098=>27292,
-18099=>27293,
-18100=>27294,
-18101=>27295,
-18102=>27296,
-18103=>27297,
-18104=>27298,
-18105=>27299,
-18106=>27300,
-18107=>27301,
-18108=>27302,
-18109=>27303,
-18110=>27304,
-18111=>27305,
-18112=>27306,
-18113=>27307,
-18114=>27308,
-18115=>27309,
-18116=>27310,
-18117=>27311,
-18118=>27312,
-18119=>27313,
-18120=>27314,
-18121=>27315,
-18122=>27316,
-18123=>27317,
-18124=>27318,
-18125=>27319,
-18126=>27320,
-18127=>27321,
-18128=>27322,
-18129=>27323,
-18130=>27324,
-18131=>27325,
-18132=>27326,
-18133=>27327,
-18134=>27328,
-18135=>27329,
-18136=>27330,
-18137=>27331,
-18138=>27332,
-18139=>27333,
-18140=>27334,
-18141=>27335,
-18142=>27336,
-18143=>27337,
-18144=>27338,
-18145=>27339,
-18146=>27340,
-18147=>27341,
-18148=>27342,
-18149=>27343,
-18150=>27344,
-18151=>27345,
-18152=>27346,
-18153=>27347,
-18154=>27348,
-18155=>27349,
-18156=>27350,
-18157=>27351,
-18158=>27352,
-18159=>27353,
-18160=>27354,
-18161=>27355,
-18162=>27356,
-18163=>27357,
-18164=>27358,
-18165=>27359,
-18166=>27360,
-18167=>27361,
-18168=>27362,
-18169=>27363,
-18170=>27364,
-18171=>27365,
-18172=>27366,
-18173=>27367,
-18174=>27368,
-18175=>27369,
-18176=>27370,
-18177=>27371,
-18178=>27372,
-18179=>27373,
-18180=>27374,
-18181=>27375,
-18182=>27376,
-18183=>27377,
-18184=>27378,
-18185=>27379,
-18186=>27380,
-18187=>27381,
-18188=>27382,
-18189=>27383,
-18190=>27384,
-18191=>27385,
-18192=>27386,
-18193=>27387,
-18194=>27388,
-18195=>27389,
-18196=>27390,
-18197=>27391,
-18198=>27392,
-18199=>27393,
-18200=>27394,
-18201=>27395,
-18202=>27396,
-18203=>27397,
-18204=>27398,
-18205=>27399,
-18206=>27400,
-18207=>27401,
-18208=>27402,
-18209=>27403,
-18210=>27404,
-18212=>27405,
-18213=>27406,
-18214=>27407,
-18215=>27408,
-18216=>27409,
-18218=>27410,
-18219=>27411,
-18220=>27412,
-18221=>27413,
-18222=>27414,
-18223=>27415,
-18224=>27416,
-18225=>27417,
-18226=>27418,
-18227=>27419,
-18228=>27420,
-18229=>27421,
-18230=>27422,
-18231=>27423,
-18232=>27424,
-18233=>27425,
-18234=>27426,
-18235=>27427,
-18236=>27428,
-18237=>27429,
-18238=>27430,
-18239=>27431,
-18240=>27432,
-18241=>27433,
-18242=>27434,
-18243=>27435,
-18244=>27436,
-18245=>27437,
-18246=>27438,
-18247=>27439,
-18248=>27440,
-18249=>27441,
-18250=>27442,
-18251=>27443,
-18252=>27444,
-18253=>27445,
-18254=>27446,
-18255=>27447,
-18256=>27448,
-18257=>27449,
-18258=>27450,
-18259=>27451,
-18260=>27452,
-18261=>27453,
-18262=>27454,
-18263=>27455,
-18264=>27456,
-18265=>27457,
-18266=>27458,
-18267=>27459,
-18268=>27460,
-18269=>27461,
-18270=>27462,
-18271=>27463,
-18272=>27464,
-18273=>27465,
-18274=>27466,
-18275=>27467,
-18276=>27468,
-18277=>27469,
-18278=>27470,
-18279=>27471,
-18280=>27472,
-18281=>27473,
-18282=>27474,
-18283=>27475,
-18284=>27476,
-18285=>27477,
-18286=>27478,
-18287=>27479,
-18288=>27480,
-18289=>27481,
-18290=>27482,
-18291=>27483,
-18292=>27484,
-18293=>27485,
-18294=>27486,
-18295=>27487,
-18296=>27488,
-18297=>27489,
-18298=>27490,
-18299=>27491,
-18301=>27492,
-18302=>27493,
-18303=>27494,
-18304=>27495,
-18305=>27496,
-18306=>27497,
-18307=>27498,
-18308=>27499,
-18309=>27500,
-18310=>27501,
-18311=>27502,
-18312=>27503,
-18313=>27504,
-18314=>27505,
-18315=>27506,
-18316=>27507,
-18318=>27508,
-18319=>27509,
-18320=>27510,
-18321=>27511,
-18322=>27512,
-18323=>27513,
-18324=>27514,
-18325=>27515,
-18326=>27516,
-18327=>27517,
-18328=>27518,
-18329=>27519,
-18330=>27520,
-18331=>27521,
-18332=>27522,
-18333=>27523,
-18334=>27524,
-18335=>27525,
-18336=>27526,
-18337=>27527,
-18338=>27528,
-18339=>27529,
-18340=>27530,
-18341=>27531,
-18342=>27532,
-18343=>27533,
-18344=>27534,
-18345=>27535,
-18346=>27536,
-18347=>27537,
-18348=>27538,
-18349=>27539,
-18350=>27540,
-18351=>27541,
-18352=>27542,
-18353=>27543,
-18354=>27544,
-18355=>27545,
-18356=>27546,
-18357=>27547,
-18358=>27548,
-18359=>27549,
-18360=>27550,
-18361=>27551,
-18362=>27552,
-18363=>27553,
-18364=>27554,
-18365=>27555,
-18366=>27556,
-18367=>27557,
-18368=>27558,
-18369=>27559,
-18370=>27560,
-18371=>27561,
-18372=>27562,
-18373=>27563,
-18374=>27564,
-18375=>27565,
-18376=>27566,
-18377=>27567,
-18378=>27568,
-18379=>27569,
-18380=>27570,
-18381=>27571,
-18382=>27572,
-18383=>27573,
-18384=>27574,
-18385=>27575,
-18386=>27576,
-18387=>27577,
-18388=>27578,
-18389=>27579,
-18390=>27580,
-18391=>27581,
-18392=>27582,
-18393=>27583,
-18394=>27584,
-18395=>27585,
-18396=>27586,
-18397=>27587,
-18398=>27588,
-18399=>27589,
-18400=>27590,
-18401=>27591,
-18402=>27592,
-18403=>27593,
-18404=>27594,
-18405=>27595,
-18406=>27596,
-18407=>27597,
-18408=>27598,
-18409=>27599,
-18410=>27600,
-18411=>27601,
-18412=>27602,
-18413=>27603,
-18414=>27604,
-18415=>27605,
-18416=>27606,
-18417=>27607,
-18418=>27608,
-18419=>27609,
-18420=>27610,
-18421=>27611,
-18422=>27612,
-18423=>27613,
-18424=>27614,
-18425=>27615,
-18426=>27616,
-18427=>27617,
-18428=>27618,
-18429=>27619,
-18430=>27620,
-18431=>27621,
-18432=>27622,
-18433=>27623,
-18434=>27624,
-18435=>27625,
-18436=>27626,
-18437=>27627,
-18438=>27628,
-18439=>27629,
-18440=>27630,
-18441=>27631,
-18442=>27632,
-18443=>27633,
-18444=>27634,
-18445=>27635,
-18446=>27636,
-18447=>27637,
-18448=>27638,
-18449=>27639,
-18450=>27640,
-18451=>27641,
-18452=>27642,
-18453=>27643,
-18454=>27644,
-18455=>27645,
-18456=>27646,
-18457=>27647,
-18458=>27648,
-18459=>27649,
-18460=>27650,
-18461=>27651,
-18462=>27652,
-18463=>27653,
-18464=>27654,
-18465=>27655,
-18466=>27656,
-18467=>27657,
-18468=>27658,
-18469=>27659,
-18470=>27660,
-18471=>27661,
-18472=>27662,
-18473=>27663,
-18474=>27664,
-18475=>27665,
-18476=>27666,
-18477=>27667,
-18478=>27668,
-18479=>27669,
-18480=>27670,
-18481=>27671,
-18482=>27672,
-18483=>27673,
-18484=>27674,
-18485=>27675,
-18486=>27676,
-18487=>27677,
-18488=>27678,
-18489=>27679,
-18490=>27680,
-18491=>27681,
-18492=>27682,
-18493=>27683,
-18494=>27684,
-18495=>27685,
-18496=>27686,
-18497=>27687,
-18498=>27688,
-18499=>27689,
-18500=>27690,
-18501=>27691,
-18502=>27692,
-18503=>27693,
-18504=>27694,
-18505=>27695,
-18506=>27696,
-18507=>27697,
-18508=>27698,
-18509=>27699,
-18510=>27700,
-18511=>27701,
-18512=>27702,
-18513=>27703,
-18514=>27704,
-18515=>27705,
-18516=>27706,
-18517=>27707,
-18518=>27708,
-18519=>27709,
-18520=>27710,
-18521=>27711,
-18522=>27712,
-18523=>27713,
-18524=>27714,
-18525=>27715,
-18526=>27716,
-18527=>27717,
-18528=>27718,
-18529=>27719,
-18530=>27720,
-18531=>27721,
-18532=>27722,
-18533=>27723,
-18534=>27724,
-18535=>27725,
-18536=>27726,
-18537=>27727,
-18538=>27728,
-18539=>27729,
-18540=>27730,
-18541=>27731,
-18542=>27732,
-18543=>27733,
-18544=>27734,
-18545=>27735,
-18546=>27736,
-18547=>27737,
-18548=>27738,
-18549=>27739,
-18550=>27740,
-18551=>27741,
-18552=>27742,
-18553=>27743,
-18554=>27744,
-18555=>27745,
-18556=>27746,
-18557=>27747,
-18558=>27748,
-18559=>27749,
-18560=>27750,
-18561=>27751,
-18562=>27752,
-18563=>27753,
-18564=>27754,
-18565=>27755,
-18566=>27756,
-18567=>27757,
-18568=>27758,
-18569=>27759,
-18570=>27760,
-18571=>27761,
-18572=>27762,
-18573=>27763,
-18574=>27764,
-18575=>27765,
-18576=>27766,
-18577=>27767,
-18578=>27768,
-18579=>27769,
-18580=>27770,
-18581=>27771,
-18582=>27772,
-18583=>27773,
-18584=>27774,
-18585=>27775,
-18586=>27776,
-18587=>27777,
-18588=>27778,
-18589=>27779,
-18590=>27780,
-18591=>27781,
-18592=>27782,
-18593=>27783,
-18594=>27784,
-18595=>27785,
-18596=>27786,
-18597=>27787,
-18598=>27788,
-18599=>27789,
-18600=>27790,
-18601=>27791,
-18602=>27792,
-18603=>27793,
-18604=>27794,
-18605=>27795,
-18606=>27796,
-18607=>27797,
-18608=>27798,
-18609=>27799,
-18610=>27800,
-18611=>27801,
-18612=>27802,
-18613=>27803,
-18614=>27804,
-18615=>27805,
-18616=>27806,
-18617=>27807,
-18618=>27808,
-18619=>27809,
-18620=>27810,
-18621=>27811,
-18622=>27812,
-18623=>27813,
-18624=>27814,
-18625=>27815,
-18626=>27816,
-18627=>27817,
-18628=>27818,
-18629=>27819,
-18630=>27820,
-18631=>27821,
-18632=>27822,
-18633=>27823,
-18634=>27824,
-18635=>27825,
-18636=>27826,
-18637=>27827,
-18638=>27828,
-18639=>27829,
-18640=>27830,
-18641=>27831,
-18642=>27832,
-18643=>27833,
-18644=>27834,
-18645=>27835,
-18646=>27836,
-18647=>27837,
-18648=>27838,
-18649=>27839,
-18650=>27840,
-18651=>27841,
-18652=>27842,
-18653=>27843,
-18654=>27844,
-18655=>27845,
-18656=>27846,
-18657=>27847,
-18658=>27848,
-18659=>27849,
-18660=>27850,
-18661=>27851,
-18662=>27852,
-18663=>27853,
-18664=>27854,
-18665=>27855,
-18666=>27856,
-18667=>27857,
-18668=>27858,
-18669=>27859,
-18670=>27860,
-18671=>27861,
-18672=>27862,
-18673=>27863,
-18674=>27864,
-18675=>27865,
-18676=>27866,
-18677=>27867,
-18678=>27868,
-18679=>27869,
-18680=>27870,
-18681=>27871,
-18682=>27872,
-18683=>27873,
-18684=>27874,
-18685=>27875,
-18686=>27876,
-18687=>27877,
-18688=>27878,
-18689=>27879,
-18690=>27880,
-18691=>27881,
-18692=>27882,
-18693=>27883,
-18694=>27884,
-18695=>27885,
-18696=>27886,
-18697=>27887,
-18698=>27888,
-18699=>27889,
-18700=>27890,
-18701=>27891,
-18702=>27892,
-18703=>27893,
-18704=>27894,
-18705=>27895,
-18706=>27896,
-18707=>27897,
-18708=>27898,
-18709=>27899,
-18710=>27900,
-18711=>27901,
-18712=>27902,
-18713=>27903,
-18714=>27904,
-18715=>27905,
-18716=>27906,
-18717=>27907,
-18718=>27908,
-18719=>27909,
-18720=>27910,
-18721=>27911,
-18722=>27912,
-18723=>27913,
-18724=>27914,
-18725=>27915,
-18726=>27916,
-18727=>27917,
-18728=>27918,
-18729=>27919,
-18730=>27920,
-18731=>27921,
-18732=>27922,
-18733=>27923,
-18734=>27924,
-18735=>27925,
-18736=>27926,
-18737=>27927,
-18738=>27928,
-18739=>27929,
-18740=>27930,
-18741=>27931,
-18742=>27932,
-18743=>27933,
-18744=>27934,
-18745=>27935,
-18746=>27936,
-18747=>27937,
-18748=>27938,
-18749=>27939,
-18750=>27940,
-18751=>27941,
-18752=>27942,
-18753=>27943,
-18754=>27944,
-18755=>27945,
-18756=>27946,
-18757=>27947,
-18758=>27948,
-18760=>27949,
-18761=>27950,
-18762=>27951,
-18763=>27952,
-18764=>27953,
-18765=>27954,
-18766=>27955,
-18767=>27956,
-18768=>27957,
-18769=>27958,
-18770=>27959,
-18771=>27960,
-18772=>27961,
-18773=>27962,
-18774=>27963,
-18775=>27964,
-18776=>27965,
-18777=>27966,
-18778=>27967,
-18779=>27968,
-18780=>27969,
-18781=>27970,
-18782=>27971,
-18783=>27972,
-18784=>27973,
-18785=>27974,
-18786=>27975,
-18787=>27976,
-18788=>27977,
-18789=>27978,
-18790=>27979,
-18791=>27980,
-18792=>27981,
-18793=>27982,
-18794=>27983,
-18795=>27984,
-18796=>27985,
-18797=>27986,
-18798=>27987,
-18799=>27988,
-18800=>27989,
-18801=>27990,
-18802=>27991,
-18803=>27992,
-18804=>27993,
-18805=>27994,
-18806=>27995,
-18807=>27996,
-18808=>27997,
-18809=>27998,
-18811=>27999,
-18812=>28000,
-18814=>28001,
-18815=>28002,
-18816=>28003,
-18817=>28004,
-18820=>28005,
-18823=>28006,
-18824=>28007,
-18825=>28008,
-18826=>28009,
-18827=>28010,
-18828=>28011,
-18829=>28012,
-18830=>28013,
-18831=>28014,
-18832=>28015,
-18833=>28016,
-18834=>28017,
-18835=>28018,
-18836=>28019,
-18837=>28020,
-18838=>28021,
-18839=>28022,
-18840=>28023,
-18841=>28024,
-18842=>28025,
-18844=>28026,
-18845=>28027,
-18846=>28028,
-18848=>28029,
-18849=>28030,
-18850=>28031,
-18851=>28032,
-18852=>28033,
-18853=>28034,
-18854=>28035,
-18855=>28036,
-18856=>28037,
-18857=>28038,
-18858=>28039,
-18859=>28040,
-18860=>28041,
-18861=>28042,
-18862=>28043,
-18863=>28044,
-18864=>28045,
-18865=>28046,
-18866=>28047,
-18867=>28048,
-18868=>28049,
-18869=>28050,
-18872=>28051,
-18873=>28052,
-18874=>28053,
-18875=>28054,
-18876=>28055,
-18877=>28056,
-18878=>28057,
-18879=>28058,
-18880=>28059,
-18881=>28060,
-18882=>28061,
-18883=>28062,
-18884=>28063,
-18885=>28064,
-18886=>28065,
-18887=>28066,
-18888=>28067,
-18889=>28068,
-18890=>28069,
-18891=>28070,
-18892=>28071,
-18893=>28072,
-18894=>28073,
-18895=>28074,
-18896=>28075,
-18897=>28076,
-18898=>28077,
-18899=>28078,
-18900=>28079,
-18901=>28080,
-18902=>28081,
-18903=>28082,
-18904=>28083,
-18905=>28084,
-18906=>28085,
-18907=>28086,
-18908=>28087,
-18909=>28088,
-18910=>28089,
-18911=>28090,
-18912=>28091,
-18913=>28092,
-18914=>28093,
-18915=>28094,
-18916=>28095,
-18917=>28096,
-18918=>28097,
-18919=>28098,
-18920=>28099,
-18921=>28100,
-18922=>28101,
-18923=>28102,
-18924=>28103,
-18925=>28104,
-18926=>28105,
-18927=>28106,
-18928=>28107,
-18929=>28108,
-18930=>28109,
-18931=>28110,
-18932=>28111,
-18933=>28112,
-18934=>28113,
-18935=>28114,
-18936=>28115,
-18937=>28116,
-18938=>28117,
-18939=>28118,
-18940=>28119,
-18941=>28120,
-18942=>28121,
-18943=>28122,
-18944=>28123,
-18945=>28124,
-18946=>28125,
-18947=>28126,
-18948=>28127,
-18949=>28128,
-18950=>28129,
-18951=>28130,
-18952=>28131,
-18953=>28132,
-18954=>28133,
-18955=>28134,
-18956=>28135,
-18957=>28136,
-18958=>28137,
-18959=>28138,
-18960=>28139,
-18961=>28140,
-18962=>28141,
-18963=>28142,
-18964=>28143,
-18965=>28144,
-18966=>28145,
-18967=>28146,
-18968=>28147,
-18969=>28148,
-18970=>28149,
-18971=>28150,
-18972=>28151,
-18973=>28152,
-18974=>28153,
-18975=>28154,
-18976=>28155,
-18977=>28156,
-18978=>28157,
-18979=>28158,
-18980=>28159,
-18981=>28160,
-18982=>28161,
-18983=>28162,
-18984=>28163,
-18985=>28164,
-18986=>28165,
-18987=>28166,
-18988=>28167,
-18989=>28168,
-18990=>28169,
-18991=>28170,
-18992=>28171,
-18993=>28172,
-18994=>28173,
-18995=>28174,
-18996=>28175,
-18997=>28176,
-18998=>28177,
-18999=>28178,
-19000=>28179,
-19001=>28180,
-19002=>28181,
-19003=>28182,
-19004=>28183,
-19005=>28184,
-19006=>28185,
-19007=>28186,
-19008=>28187,
-19009=>28188,
-19010=>28189,
-19011=>28190,
-19012=>28191,
-19013=>28192,
-19014=>28193,
-19015=>28194,
-19016=>28195,
-19017=>28196,
-19018=>28197,
-19019=>28198,
-19020=>28199,
-19021=>28200,
-19022=>28201,
-19023=>28202,
-19024=>28203,
-19025=>28204,
-19026=>28205,
-19027=>28206,
-19028=>28207,
-19029=>28208,
-19030=>28209,
-19031=>28210,
-19032=>28211,
-19033=>28212,
-19034=>28213,
-19035=>28214,
-19036=>28215,
-19037=>28216,
-19038=>28217,
-19039=>28218,
-19040=>28219,
-19041=>28220,
-19042=>28221,
-19043=>28222,
-19044=>28223,
-19045=>28224,
-19046=>28225,
-19047=>28226,
-19048=>28227,
-19049=>28228,
-19050=>28229,
-19051=>28230,
-19052=>28231,
-19053=>28232,
-19054=>28233,
-19055=>28234,
-19056=>28235,
-19057=>28236,
-19058=>28237,
-19059=>28238,
-19060=>28239,
-19061=>28240,
-19062=>28241,
-19063=>28242,
-19064=>28243,
-19065=>28244,
-19066=>28245,
-19067=>28246,
-19068=>28247,
-19069=>28248,
-19070=>28249,
-19071=>28250,
-19072=>28251,
-19073=>28252,
-19074=>28253,
-19075=>28254,
-19076=>28255,
-19077=>28256,
-19078=>28257,
-19079=>28258,
-19080=>28259,
-19081=>28260,
-19082=>28261,
-19083=>28262,
-19084=>28263,
-19085=>28264,
-19086=>28265,
-19087=>28266,
-19088=>28267,
-19089=>28268,
-19090=>28269,
-19091=>28270,
-19092=>28271,
-19093=>28272,
-19094=>28273,
-19095=>28274,
-19096=>28275,
-19097=>28276,
-19098=>28277,
-19099=>28278,
-19100=>28279,
-19101=>28280,
-19102=>28281,
-19103=>28282,
-19104=>28283,
-19105=>28284,
-19106=>28285,
-19107=>28286,
-19108=>28287,
-19109=>28288,
-19110=>28289,
-19111=>28290,
-19112=>28291,
-19113=>28292,
-19114=>28293,
-19115=>28294,
-19116=>28295,
-19117=>28296,
-19118=>28297,
-19119=>28298,
-19120=>28299,
-19121=>28300,
-19122=>28301,
-19123=>28302,
-19124=>28303,
-19125=>28304,
-19126=>28305,
-19127=>28306,
-19128=>28307,
-19129=>28308,
-19130=>28309,
-19131=>28310,
-19132=>28311,
-19133=>28312,
-19134=>28313,
-19135=>28314,
-19136=>28315,
-19137=>28316,
-19138=>28317,
-19139=>28318,
-19140=>28319,
-19141=>28320,
-19142=>28321,
-19143=>28322,
-19144=>28323,
-19145=>28324,
-19146=>28325,
-19147=>28326,
-19148=>28327,
-19149=>28328,
-19150=>28329,
-19151=>28330,
-19152=>28331,
-19153=>28332,
-19154=>28333,
-19155=>28334,
-19156=>28335,
-19157=>28336,
-19158=>28337,
-19159=>28338,
-19160=>28339,
-19161=>28340,
-19162=>28341,
-19163=>28342,
-19164=>28343,
-19165=>28344,
-19166=>28345,
-19167=>28346,
-19168=>28347,
-19169=>28348,
-19170=>28349,
-19171=>28350,
-19172=>28351,
-19173=>28352,
-19174=>28353,
-19175=>28354,
-19176=>28355,
-19177=>28356,
-19178=>28357,
-19179=>28358,
-19180=>28359,
-19181=>28360,
-19182=>28361,
-19183=>28362,
-19184=>28363,
-19185=>28364,
-19186=>28365,
-19187=>28366,
-19188=>28367,
-19189=>28368,
-19190=>28369,
-19191=>28370,
-19192=>28371,
-19193=>28372,
-19194=>28373,
-19195=>28374,
-19196=>28375,
-19197=>28376,
-19198=>28377,
-19199=>28378,
-19200=>28379,
-19201=>28380,
-19202=>28381,
-19203=>28382,
-19204=>28383,
-19205=>28384,
-19206=>28385,
-19207=>28386,
-19208=>28387,
-19209=>28388,
-19210=>28389,
-19211=>28390,
-19212=>28391,
-19213=>28392,
-19214=>28393,
-19215=>28394,
-19216=>28395,
-19217=>28396,
-19218=>28397,
-19219=>28398,
-19220=>28399,
-19221=>28400,
-19222=>28401,
-19223=>28402,
-19224=>28403,
-19225=>28404,
-19226=>28405,
-19227=>28406,
-19228=>28407,
-19229=>28408,
-19230=>28409,
-19231=>28410,
-19232=>28411,
-19233=>28412,
-19234=>28413,
-19235=>28414,
-19236=>28415,
-19237=>28416,
-19238=>28417,
-19239=>28418,
-19240=>28419,
-19241=>28420,
-19242=>28421,
-19243=>28422,
-19244=>28423,
-19245=>28424,
-19246=>28425,
-19247=>28426,
-19248=>28427,
-19249=>28428,
-19250=>28429,
-19251=>28430,
-19252=>28431,
-19253=>28432,
-19254=>28433,
-19255=>28434,
-19256=>28435,
-19257=>28436,
-19258=>28437,
-19259=>28438,
-19260=>28439,
-19261=>28440,
-19262=>28441,
-19263=>28442,
-19264=>28443,
-19265=>28444,
-19266=>28445,
-19267=>28446,
-19268=>28447,
-19269=>28448,
-19270=>28449,
-19271=>28450,
-19272=>28451,
-19273=>28452,
-19274=>28453,
-19275=>28454,
-19276=>28455,
-19277=>28456,
-19278=>28457,
-19279=>28458,
-19280=>28459,
-19281=>28460,
-19282=>28461,
-19283=>28462,
-19284=>28463,
-19285=>28464,
-19286=>28465,
-19287=>28466,
-19288=>28467,
-19289=>28468,
-19290=>28469,
-19291=>28470,
-19292=>28471,
-19293=>28472,
-19294=>28473,
-19295=>28474,
-19296=>28475,
-19297=>28476,
-19298=>28477,
-19299=>28478,
-19300=>28479,
-19301=>28480,
-19302=>28481,
-19303=>28482,
-19304=>28483,
-19305=>28484,
-19306=>28485,
-19307=>28486,
-19308=>28487,
-19309=>28488,
-19310=>28489,
-19311=>28490,
-19312=>28491,
-19313=>28492,
-19314=>28493,
-19315=>28494,
-19316=>28495,
-19317=>28496,
-19318=>28497,
-19319=>28498,
-19320=>28499,
-19321=>28500,
-19322=>28501,
-19323=>28502,
-19324=>28503,
-19325=>28504,
-19326=>28505,
-19327=>28506,
-19328=>28507,
-19329=>28508,
-19330=>28509,
-19331=>28510,
-19332=>28511,
-19333=>28512,
-19334=>28513,
-19335=>28514,
-19336=>28515,
-19337=>28516,
-19338=>28517,
-19339=>28518,
-19340=>28519,
-19341=>28520,
-19342=>28521,
-19343=>28522,
-19344=>28523,
-19345=>28524,
-19346=>28525,
-19347=>28526,
-19348=>28527,
-19349=>28528,
-19350=>28529,
-19351=>28530,
-19352=>28531,
-19353=>28532,
-19354=>28533,
-19355=>28534,
-19356=>28535,
-19357=>28536,
-19358=>28537,
-19359=>28538,
-19360=>28539,
-19361=>28540,
-19362=>28541,
-19363=>28542,
-19364=>28543,
-19365=>28544,
-19366=>28545,
-19367=>28546,
-19368=>28547,
-19369=>28548,
-19370=>28549,
-19371=>28550,
-19372=>28551,
-19373=>28552,
-19374=>28553,
-19375=>28554,
-19376=>28555,
-19377=>28556,
-19378=>28557,
-19379=>28558,
-19380=>28559,
-19381=>28560,
-19382=>28561,
-19383=>28562,
-19384=>28563,
-19385=>28564,
-19386=>28565,
-19387=>28566,
-19388=>28567,
-19389=>28568,
-19390=>28569,
-19391=>28570,
-19392=>28571,
-19393=>28572,
-19394=>28573,
-19395=>28574,
-19396=>28575,
-19397=>28576,
-19398=>28577,
-19399=>28578,
-19400=>28579,
-19401=>28580,
-19402=>28581,
-19403=>28582,
-19404=>28583,
-19405=>28584,
-19406=>28585,
-19407=>28586,
-19408=>28587,
-19409=>28588,
-19410=>28589,
-19411=>28590,
-19412=>28591,
-19413=>28592,
-19414=>28593,
-19415=>28594,
-19416=>28595,
-19417=>28596,
-19418=>28597,
-19419=>28598,
-19420=>28599,
-19421=>28600,
-19422=>28601,
-19423=>28602,
-19424=>28603,
-19425=>28604,
-19426=>28605,
-19427=>28606,
-19428=>28607,
-19429=>28608,
-19430=>28609,
-19431=>28610,
-19432=>28611,
-19433=>28612,
-19434=>28613,
-19435=>28614,
-19436=>28615,
-19437=>28616,
-19438=>28617,
-19439=>28618,
-19440=>28619,
-19441=>28620,
-19442=>28621,
-19443=>28622,
-19444=>28623,
-19445=>28624,
-19446=>28625,
-19447=>28626,
-19448=>28627,
-19449=>28628,
-19450=>28629,
-19451=>28630,
-19452=>28631,
-19453=>28632,
-19454=>28633,
-19455=>28634,
-19456=>28635,
-19457=>28636,
-19458=>28637,
-19459=>28638,
-19460=>28639,
-19461=>28640,
-19462=>28641,
-19463=>28642,
-19464=>28643,
-19465=>28644,
-19466=>28645,
-19467=>28646,
-19468=>28647,
-19469=>28648,
-19470=>28649,
-19471=>28650,
-19472=>28651,
-19473=>28652,
-19474=>28653,
-19475=>28654,
-19476=>28655,
-19477=>28656,
-19478=>28657,
-19479=>28658,
-19480=>28659,
-19481=>28660,
-19482=>28661,
-19483=>28662,
-19484=>28663,
-19485=>28664,
-19486=>28665,
-19487=>28666,
-19488=>28667,
-19489=>28668,
-19490=>28669,
-19491=>28670,
-19492=>28671,
-19493=>28672,
-19494=>28673,
-19495=>28674,
-19496=>28675,
-19497=>28676,
-19498=>28677,
-19499=>28678,
-19500=>28679,
-19501=>28680,
-19502=>28681,
-19503=>28682,
-19504=>28683,
-19505=>28684,
-19506=>28685,
-19507=>28686,
-19508=>28687,
-19509=>28688,
-19510=>28689,
-19511=>28690,
-19512=>28691,
-19513=>28692,
-19514=>28693,
-19515=>28694,
-19516=>28695,
-19517=>28696,
-19518=>28697,
-19519=>28698,
-19520=>28699,
-19521=>28700,
-19522=>28701,
-19523=>28702,
-19524=>28703,
-19525=>28704,
-19526=>28705,
-19527=>28706,
-19528=>28707,
-19529=>28708,
-19530=>28709,
-19531=>28710,
-19532=>28711,
-19533=>28712,
-19534=>28713,
-19535=>28714,
-19536=>28715,
-19537=>28716,
-19538=>28717,
-19539=>28718,
-19540=>28719,
-19541=>28720,
-19542=>28721,
-19543=>28722,
-19544=>28723,
-19545=>28724,
-19546=>28725,
-19547=>28726,
-19548=>28727,
-19549=>28728,
-19550=>28729,
-19551=>28730,
-19552=>28731,
-19553=>28732,
-19554=>28733,
-19555=>28734,
-19556=>28735,
-19557=>28736,
-19558=>28737,
-19559=>28738,
-19560=>28739,
-19561=>28740,
-19562=>28741,
-19563=>28742,
-19564=>28743,
-19565=>28744,
-19566=>28745,
-19567=>28746,
-19568=>28747,
-19569=>28748,
-19570=>28749,
-19571=>28750,
-19572=>28751,
-19573=>28752,
-19574=>28753,
-19576=>28754,
-19577=>28755,
-19578=>28756,
-19579=>28757,
-19580=>28758,
-19581=>28759,
-19582=>28760,
-19583=>28761,
-19584=>28762,
-19585=>28763,
-19586=>28764,
-19587=>28765,
-19588=>28766,
-19589=>28767,
-19590=>28768,
-19591=>28769,
-19592=>28770,
-19593=>28771,
-19594=>28772,
-19595=>28773,
-19596=>28774,
-19597=>28775,
-19598=>28776,
-19599=>28777,
-19600=>28778,
-19601=>28779,
-19602=>28780,
-19603=>28781,
-19604=>28782,
-19605=>28783,
-19606=>28784,
-19607=>28785,
-19608=>28786,
-19609=>28787,
-19610=>28788,
-19611=>28789,
-19612=>28790,
-19613=>28791,
-19614=>28792,
-19620=>28793,
-19621=>28794,
-19622=>28795,
-19623=>28796,
-19624=>28797,
-19625=>28798,
-19626=>28799,
-19627=>28800,
-19628=>28801,
-19629=>28802,
-19630=>28803,
-19631=>28804,
-19632=>28805,
-19633=>28806,
-19634=>28807,
-19635=>28808,
-19636=>28809,
-19637=>28810,
-19638=>28811,
-19639=>28812,
-19640=>28813,
-19641=>28814,
-19642=>28815,
-19643=>28816,
-19644=>28817,
-19645=>28818,
-19646=>28819,
-19647=>28820,
-19648=>28821,
-19649=>28822,
-19650=>28823,
-19651=>28824,
-19652=>28825,
-19653=>28826,
-19654=>28827,
-19655=>28828,
-19656=>28829,
-19657=>28830,
-19658=>28831,
-19659=>28832,
-19660=>28833,
-19661=>28834,
-19662=>28835,
-19663=>28836,
-19664=>28837,
-19665=>28838,
-19666=>28839,
-19667=>28840,
-19668=>28841,
-19669=>28842,
-19670=>28843,
-19671=>28844,
-19672=>28845,
-19673=>28846,
-19674=>28847,
-19675=>28848,
-19676=>28849,
-19677=>28850,
-19678=>28851,
-19679=>28852,
-19680=>28853,
-19681=>28854,
-19682=>28855,
-19683=>28856,
-19684=>28857,
-19685=>28858,
-19686=>28859,
-19687=>28860,
-19688=>28861,
-19689=>28862,
-19690=>28863,
-19691=>28864,
-19692=>28865,
-19693=>28866,
-19694=>28867,
-19695=>28868,
-19696=>28869,
-19697=>28870,
-19698=>28871,
-19699=>28872,
-19700=>28873,
-19701=>28874,
-19702=>28875,
-19703=>28876,
-19704=>28877,
-19705=>28878,
-19706=>28879,
-19707=>28880,
-19708=>28881,
-19709=>28882,
-19710=>28883,
-19711=>28884,
-19712=>28885,
-19713=>28886,
-19714=>28887,
-19715=>28888,
-19716=>28889,
-19717=>28890,
-19718=>28891,
-19719=>28892,
-19720=>28893,
-19721=>28894,
-19722=>28895,
-19723=>28896,
-19724=>28897,
-19725=>28898,
-19726=>28899,
-19727=>28900,
-19728=>28901,
-19729=>28902,
-19730=>28903,
-19738=>28904,
-19739=>28905,
-19740=>28906,
-19741=>28907,
-19742=>28908,
-19743=>28909,
-19744=>28910,
-19745=>28911,
-19746=>28912,
-19747=>28913,
-19748=>28914,
-19749=>28915,
-19750=>28916,
-19751=>28917,
-19752=>28918,
-19753=>28919,
-19754=>28920,
-19755=>28921,
-19756=>28922,
-19757=>28923,
-19758=>28924,
-19759=>28925,
-19760=>28926,
-19761=>28927,
-19762=>28928,
-19763=>28929,
-19764=>28930,
-19765=>28931,
-19766=>28932,
-19767=>28933,
-19768=>28934,
-19769=>28935,
-19770=>28936,
-19771=>28937,
-19772=>28938,
-19773=>28939,
-19774=>28940,
-19775=>28941,
-19776=>28942,
-19777=>28943,
-19778=>28944,
-19779=>28945,
-19780=>28946,
-19781=>28947,
-19782=>28948,
-19783=>28949,
-19784=>28950,
-19785=>28951,
-19786=>28952,
-19787=>28953,
-19788=>28954,
-19789=>28955,
-19790=>28956,
-19791=>28957,
-19792=>28958,
-19793=>28959,
-19794=>28960,
-19795=>28961,
-19796=>28962,
-19797=>28963,
-19798=>28964,
-19799=>28965,
-19800=>28966,
-19801=>28967,
-19802=>28968,
-19803=>28969,
-19804=>28970,
-19805=>28971,
-19806=>28972,
-19807=>28973,
-19808=>28974,
-19809=>28975,
-19810=>28976,
-19811=>28977,
-19812=>28978,
-19813=>28979,
-19814=>28980,
-19815=>28981,
-19816=>28982,
-19817=>28983,
-19818=>28984,
-19819=>28985,
-19820=>28986,
-19821=>28987,
-19822=>28988,
-19823=>28989,
-19824=>28990,
-19825=>28991,
-19826=>28992,
-19827=>28993,
-19828=>28994,
-19829=>28995,
-19830=>28996,
-19831=>28997,
-19832=>28998,
-19833=>28999,
-19834=>29000,
-19835=>29001,
-19836=>29002,
-19837=>29003,
-19838=>29004,
-19839=>29005,
-19840=>29006,
-19841=>29007,
-19842=>29008,
-19843=>29009,
-19844=>29010,
-19845=>29011,
-19846=>29012,
-19847=>29013,
-19848=>29014,
-19849=>29015,
-19850=>29016,
-19851=>29017,
-19852=>29018,
-19853=>29019,
-19854=>29020,
-19855=>29021,
-19856=>29022,
-19857=>29023,
-19858=>29024,
-19859=>29025,
-19860=>29026,
-19861=>29027,
-19862=>29028,
-19863=>29029,
-19864=>29030,
-19865=>29031,
-19866=>29032,
-19867=>29033,
-19868=>29034,
-19869=>29035,
-19870=>29036,
-19871=>29037,
-19872=>29038,
-19873=>29039,
-19874=>29040,
-19875=>29041,
-19876=>29042,
-19877=>29043,
-19878=>29044,
-19879=>29045,
-19880=>29046,
-19881=>29047,
-19882=>29048,
-19883=>29049,
-19884=>29050,
-19885=>29051,
-19887=>29052,
-19888=>29053,
-19889=>29054,
-19890=>29055,
-19891=>29056,
-19892=>29057,
-19893=>29058,
-40960=>29064,
-40961=>29065,
-40962=>29066,
-40963=>29067,
-40964=>29068,
-40965=>29069,
-40966=>29070,
-40967=>29071,
-40968=>29072,
-40969=>29073,
-40970=>29074,
-40971=>29075,
-40972=>29076,
-40973=>29077,
-40974=>29078,
-40975=>29079,
-40976=>29080,
-40977=>29081,
-40978=>29082,
-40979=>29083,
-40980=>29084,
-40981=>29085,
-40982=>29086,
-40983=>29087,
-40984=>29088,
-40985=>29089,
-40986=>29090,
-40987=>29091,
-40988=>29092,
-40989=>29093,
-40990=>29094,
-40991=>29095,
-40992=>29096,
-40993=>29097,
-40994=>29098,
-40995=>29099,
-40996=>29100,
-40997=>29101,
-40998=>29102,
-40999=>29103,
-41000=>29104,
-41001=>29105,
-41002=>29106,
-41003=>29107,
-41004=>29108,
-41005=>29109,
-41006=>29110,
-41007=>29111,
-41008=>29112,
-41009=>29113,
-41010=>29114,
-41011=>29115,
-41012=>29116,
-41013=>29117,
-41014=>29118,
-41015=>29119,
-41016=>29120,
-41017=>29121,
-41018=>29122,
-41019=>29123,
-41020=>29124,
-41021=>29125,
-41022=>29126,
-41023=>29127,
-41024=>29128,
-41025=>29129,
-41026=>29130,
-41027=>29131,
-41028=>29132,
-41029=>29133,
-41030=>29134,
-41031=>29135,
-41032=>29136,
-41033=>29137,
-41034=>29138,
-41035=>29139,
-41036=>29140,
-41037=>29141,
-41038=>29142,
-41039=>29143,
-41040=>29144,
-41041=>29145,
-41042=>29146,
-41043=>29147,
-41044=>29148,
-41045=>29149,
-41046=>29150,
-41047=>29151,
-41048=>29152,
-41049=>29153,
-41050=>29154,
-41051=>29155,
-41052=>29156,
-41053=>29157,
-41054=>29158,
-41055=>29159,
-41056=>29160,
-41057=>29161,
-41058=>29162,
-41059=>29163,
-41060=>29164,
-41061=>29165,
-41062=>29166,
-41063=>29167,
-41064=>29168,
-41065=>29169,
-41066=>29170,
-41067=>29171,
-41068=>29172,
-41069=>29173,
-41070=>29174,
-41071=>29175,
-41072=>29176,
-41073=>29177,
-41074=>29178,
-41075=>29179,
-41076=>29180,
-41077=>29181,
-41078=>29182,
-41079=>29183,
-41080=>29184,
-41081=>29185,
-41082=>29186,
-41083=>29187,
-41084=>29188,
-41085=>29189,
-41086=>29190,
-41087=>29191,
-41088=>29192,
-41089=>29193,
-41090=>29194,
-41091=>29195,
-41092=>29196,
-41093=>29197,
-41094=>29198,
-41095=>29199,
-41096=>29200,
-41097=>29201,
-41098=>29202,
-41099=>29203,
-41100=>29204,
-41101=>29205,
-41102=>29206,
-41103=>29207,
-41104=>29208,
-41105=>29209,
-41106=>29210,
-41107=>29211,
-41108=>29212,
-41109=>29213,
-41110=>29214,
-41111=>29215,
-41112=>29216,
-41113=>29217,
-41114=>29218,
-41115=>29219,
-41116=>29220,
-41117=>29221,
-41118=>29222,
-41119=>29223,
-41120=>29224,
-41121=>29225,
-41122=>29226,
-41123=>29227,
-41124=>29228,
-41125=>29229,
-41126=>29230,
-41127=>29231,
-41128=>29232,
-41129=>29233,
-41130=>29234,
-41131=>29235,
-41132=>29236,
-41133=>29237,
-41134=>29238,
-41135=>29239,
-41136=>29240,
-41137=>29241,
-41138=>29242,
-41139=>29243,
-41140=>29244,
-41141=>29245,
-41142=>29246,
-41143=>29247,
-41144=>29248,
-41145=>29249,
-41146=>29250,
-41147=>29251,
-41148=>29252,
-41149=>29253,
-41150=>29254,
-41151=>29255,
-41152=>29256,
-41153=>29257,
-41154=>29258,
-41155=>29259,
-41156=>29260,
-41157=>29261,
-41158=>29262,
-41159=>29263,
-41160=>29264,
-41161=>29265,
-41162=>29266,
-41163=>29267,
-41164=>29268,
-41165=>29269,
-41166=>29270,
-41167=>29271,
-41168=>29272,
-41169=>29273,
-41170=>29274,
-41171=>29275,
-41172=>29276,
-41173=>29277,
-41174=>29278,
-41175=>29279,
-41176=>29280,
-41177=>29281,
-41178=>29282,
-41179=>29283,
-41180=>29284,
-41181=>29285,
-41182=>29286,
-41183=>29287,
-41184=>29288,
-41185=>29289,
-41186=>29290,
-41187=>29291,
-41188=>29292,
-41189=>29293,
-41190=>29294,
-41191=>29295,
-41192=>29296,
-41193=>29297,
-41194=>29298,
-41195=>29299,
-41196=>29300,
-41197=>29301,
-41198=>29302,
-41199=>29303,
-41200=>29304,
-41201=>29305,
-41202=>29306,
-41203=>29307,
-41204=>29308,
-41205=>29309,
-41206=>29310,
-41207=>29311,
-41208=>29312,
-41209=>29313,
-41210=>29314,
-41211=>29315,
-41212=>29316,
-41213=>29317,
-41214=>29318,
-41215=>29319,
-41216=>29320,
-41217=>29321,
-41218=>29322,
-41219=>29323,
-41220=>29324,
-41221=>29325,
-41222=>29326,
-41223=>29327,
-41224=>29328,
-41225=>29329,
-41226=>29330,
-41227=>29331,
-41228=>29332,
-41229=>29333,
-41230=>29334,
-41231=>29335,
-41232=>29336,
-41233=>29337,
-41234=>29338,
-41235=>29339,
-41236=>29340,
-41237=>29341,
-41238=>29342,
-41239=>29343,
-41240=>29344,
-41241=>29345,
-41242=>29346,
-41243=>29347,
-41244=>29348,
-41245=>29349,
-41246=>29350,
-41247=>29351,
-41248=>29352,
-41249=>29353,
-41250=>29354,
-41251=>29355,
-41252=>29356,
-41253=>29357,
-41254=>29358,
-41255=>29359,
-41256=>29360,
-41257=>29361,
-41258=>29362,
-41259=>29363,
-41260=>29364,
-41261=>29365,
-41262=>29366,
-41263=>29367,
-41264=>29368,
-41265=>29369,
-41266=>29370,
-41267=>29371,
-41268=>29372,
-41269=>29373,
-41270=>29374,
-41271=>29375,
-41272=>29376,
-41273=>29377,
-41274=>29378,
-41275=>29379,
-41276=>29380,
-41277=>29381,
-41278=>29382,
-41279=>29383,
-41280=>29384,
-41281=>29385,
-41282=>29386,
-41283=>29387,
-41284=>29388,
-41285=>29389,
-41286=>29390,
-41287=>29391,
-41288=>29392,
-41289=>29393,
-41290=>29394,
-41291=>29395,
-41292=>29396,
-41293=>29397,
-41294=>29398,
-41295=>29399,
-41296=>29400,
-41297=>29401,
-41298=>29402,
-41299=>29403,
-41300=>29404,
-41301=>29405,
-41302=>29406,
-41303=>29407,
-41304=>29408,
-41305=>29409,
-41306=>29410,
-41307=>29411,
-41308=>29412,
-41309=>29413,
-41310=>29414,
-41311=>29415,
-41312=>29416,
-41313=>29417,
-41314=>29418,
-41315=>29419,
-41316=>29420,
-41317=>29421,
-41318=>29422,
-41319=>29423,
-41320=>29424,
-41321=>29425,
-41322=>29426,
-41323=>29427,
-41324=>29428,
-41325=>29429,
-41326=>29430,
-41327=>29431,
-41328=>29432,
-41329=>29433,
-41330=>29434,
-41331=>29435,
-41332=>29436,
-41333=>29437,
-41334=>29438,
-41335=>29439,
-41336=>29440,
-41337=>29441,
-41338=>29442,
-41339=>29443,
-41340=>29444,
-41341=>29445,
-41342=>29446,
-41343=>29447,
-41344=>29448,
-41345=>29449,
-41346=>29450,
-41347=>29451,
-41348=>29452,
-41349=>29453,
-41350=>29454,
-41351=>29455,
-41352=>29456,
-41353=>29457,
-41354=>29458,
-41355=>29459,
-41356=>29460,
-41357=>29461,
-41358=>29462,
-41359=>29463,
-41360=>29464,
-41361=>29465,
-41362=>29466,
-41363=>29467,
-41364=>29468,
-41365=>29469,
-41366=>29470,
-41367=>29471,
-41368=>29472,
-41369=>29473,
-41370=>29474,
-41371=>29475,
-41372=>29476,
-41373=>29477,
-41374=>29478,
-41375=>29479,
-41376=>29480,
-41377=>29481,
-41378=>29482,
-41379=>29483,
-41380=>29484,
-41381=>29485,
-41382=>29486,
-41383=>29487,
-41384=>29488,
-41385=>29489,
-41386=>29490,
-41387=>29491,
-41388=>29492,
-41389=>29493,
-41390=>29494,
-41391=>29495,
-41392=>29496,
-41393=>29497,
-41394=>29498,
-41395=>29499,
-41396=>29500,
-41397=>29501,
-41398=>29502,
-41399=>29503,
-41400=>29504,
-41401=>29505,
-41402=>29506,
-41403=>29507,
-41404=>29508,
-41405=>29509,
-41406=>29510,
-41407=>29511,
-41408=>29512,
-41409=>29513,
-41410=>29514,
-41411=>29515,
-41412=>29516,
-41413=>29517,
-41414=>29518,
-41415=>29519,
-41416=>29520,
-41417=>29521,
-41418=>29522,
-41419=>29523,
-41420=>29524,
-41421=>29525,
-41422=>29526,
-41423=>29527,
-41424=>29528,
-41425=>29529,
-41426=>29530,
-41427=>29531,
-41428=>29532,
-41429=>29533,
-41430=>29534,
-41431=>29535,
-41432=>29536,
-41433=>29537,
-41434=>29538,
-41435=>29539,
-41436=>29540,
-41437=>29541,
-41438=>29542,
-41439=>29543,
-41440=>29544,
-41441=>29545,
-41442=>29546,
-41443=>29547,
-41444=>29548,
-41445=>29549,
-41446=>29550,
-41447=>29551,
-41448=>29552,
-41449=>29553,
-41450=>29554,
-41451=>29555,
-41452=>29556,
-41453=>29557,
-41454=>29558,
-41455=>29559,
-41456=>29560,
-41457=>29561,
-41458=>29562,
-41459=>29563,
-41460=>29564,
-41461=>29565,
-41462=>29566,
-41463=>29567,
-41464=>29568,
-41465=>29569,
-41466=>29570,
-41467=>29571,
-41468=>29572,
-41469=>29573,
-41470=>29574,
-41471=>29575,
-41472=>29576,
-41473=>29577,
-41474=>29578,
-41475=>29579,
-41476=>29580,
-41477=>29581,
-41478=>29582,
-41479=>29583,
-41480=>29584,
-41481=>29585,
-41482=>29586,
-41483=>29587,
-41484=>29588,
-41485=>29589,
-41486=>29590,
-41487=>29591,
-41488=>29592,
-41489=>29593,
-41490=>29594,
-41491=>29595,
-41492=>29596,
-41493=>29597,
-41494=>29598,
-41495=>29599,
-41496=>29600,
-41497=>29601,
-41498=>29602,
-41499=>29603,
-41500=>29604,
-41501=>29605,
-41502=>29606,
-41503=>29607,
-41504=>29608,
-41505=>29609,
-41506=>29610,
-41507=>29611,
-41508=>29612,
-41509=>29613,
-41510=>29614,
-41511=>29615,
-41512=>29616,
-41513=>29617,
-41514=>29618,
-41515=>29619,
-41516=>29620,
-41517=>29621,
-41518=>29622,
-41519=>29623,
-41520=>29624,
-41521=>29625,
-41522=>29626,
-41523=>29627,
-41524=>29628,
-41525=>29629,
-41526=>29630,
-41527=>29631,
-41528=>29632,
-41529=>29633,
-41530=>29634,
-41531=>29635,
-41532=>29636,
-41533=>29637,
-41534=>29638,
-41535=>29639,
-41536=>29640,
-41537=>29641,
-41538=>29642,
-41539=>29643,
-41540=>29644,
-41541=>29645,
-41542=>29646,
-41543=>29647,
-41544=>29648,
-41545=>29649,
-41546=>29650,
-41547=>29651,
-41548=>29652,
-41549=>29653,
-41550=>29654,
-41551=>29655,
-41552=>29656,
-41553=>29657,
-41554=>29658,
-41555=>29659,
-41556=>29660,
-41557=>29661,
-41558=>29662,
-41559=>29663,
-41560=>29664,
-41561=>29665,
-41562=>29666,
-41563=>29667,
-41564=>29668,
-41565=>29669,
-41566=>29670,
-41567=>29671,
-41568=>29672,
-41569=>29673,
-41570=>29674,
-41571=>29675,
-41572=>29676,
-41573=>29677,
-41574=>29678,
-41575=>29679,
-41576=>29680,
-41577=>29681,
-41578=>29682,
-41579=>29683,
-41580=>29684,
-41581=>29685,
-41582=>29686,
-41583=>29687,
-41584=>29688,
-41585=>29689,
-41586=>29690,
-41587=>29691,
-41588=>29692,
-41589=>29693,
-41590=>29694,
-41591=>29695,
-41592=>29696,
-41593=>29697,
-41594=>29698,
-41595=>29699,
-41596=>29700,
-41597=>29701,
-41598=>29702,
-41599=>29703,
-41600=>29704,
-41601=>29705,
-41602=>29706,
-41603=>29707,
-41604=>29708,
-41605=>29709,
-41606=>29710,
-41607=>29711,
-41608=>29712,
-41609=>29713,
-41610=>29714,
-41611=>29715,
-41612=>29716,
-41613=>29717,
-41614=>29718,
-41615=>29719,
-41616=>29720,
-41617=>29721,
-41618=>29722,
-41619=>29723,
-41620=>29724,
-41621=>29725,
-41622=>29726,
-41623=>29727,
-41624=>29728,
-41625=>29729,
-41626=>29730,
-41627=>29731,
-41628=>29732,
-41629=>29733,
-41630=>29734,
-41631=>29735,
-41632=>29736,
-41633=>29737,
-41634=>29738,
-41635=>29739,
-41636=>29740,
-41637=>29741,
-41638=>29742,
-41639=>29743,
-41640=>29744,
-41641=>29745,
-41642=>29746,
-41643=>29747,
-41644=>29748,
-41645=>29749,
-41646=>29750,
-41647=>29751,
-41648=>29752,
-41649=>29753,
-41650=>29754,
-41651=>29755,
-41652=>29756,
-41653=>29757,
-41654=>29758,
-41655=>29759,
-41656=>29760,
-41657=>29761,
-41658=>29762,
-41659=>29763,
-41660=>29764,
-41661=>29765,
-41662=>29766,
-41663=>29767,
-41664=>29768,
-41665=>29769,
-41666=>29770,
-41667=>29771,
-41668=>29772,
-41669=>29773,
-41670=>29774,
-41671=>29775,
-41672=>29776,
-41673=>29777,
-41674=>29778,
-41675=>29779,
-41676=>29780,
-41677=>29781,
-41678=>29782,
-41679=>29783,
-41680=>29784,
-41681=>29785,
-41682=>29786,
-41683=>29787,
-41684=>29788,
-41685=>29789,
-41686=>29790,
-41687=>29791,
-41688=>29792,
-41689=>29793,
-41690=>29794,
-41691=>29795,
-41692=>29796,
-41693=>29797,
-41694=>29798,
-41695=>29799,
-41696=>29800,
-41697=>29801,
-41698=>29802,
-41699=>29803,
-41700=>29804,
-41701=>29805,
-41702=>29806,
-41703=>29807,
-41704=>29808,
-41705=>29809,
-41706=>29810,
-41707=>29811,
-41708=>29812,
-41709=>29813,
-41710=>29814,
-41711=>29815,
-41712=>29816,
-41713=>29817,
-41714=>29818,
-41715=>29819,
-41716=>29820,
-41717=>29821,
-41718=>29822,
-41719=>29823,
-41720=>29824,
-41721=>29825,
-41722=>29826,
-41723=>29827,
-41724=>29828,
-41725=>29829,
-41726=>29830,
-41727=>29831,
-41728=>29832,
-41729=>29833,
-41730=>29834,
-41731=>29835,
-41732=>29836,
-41733=>29837,
-41734=>29838,
-41735=>29839,
-41736=>29840,
-41737=>29841,
-41738=>29842,
-41739=>29843,
-41740=>29844,
-41741=>29845,
-41742=>29846,
-41743=>29847,
-41744=>29848,
-41745=>29849,
-41746=>29850,
-41747=>29851,
-41748=>29852,
-41749=>29853,
-41750=>29854,
-41751=>29855,
-41752=>29856,
-41753=>29857,
-41754=>29858,
-41755=>29859,
-41756=>29860,
-41757=>29861,
-41758=>29862,
-41759=>29863,
-41760=>29864,
-41761=>29865,
-41762=>29866,
-41763=>29867,
-41764=>29868,
-41765=>29869,
-41766=>29870,
-41767=>29871,
-41768=>29872,
-41769=>29873,
-41770=>29874,
-41771=>29875,
-41772=>29876,
-41773=>29877,
-41774=>29878,
-41775=>29879,
-41776=>29880,
-41777=>29881,
-41778=>29882,
-41779=>29883,
-41780=>29884,
-41781=>29885,
-41782=>29886,
-41783=>29887,
-41784=>29888,
-41785=>29889,
-41786=>29890,
-41787=>29891,
-41788=>29892,
-41789=>29893,
-41790=>29894,
-41791=>29895,
-41792=>29896,
-41793=>29897,
-41794=>29898,
-41795=>29899,
-41796=>29900,
-41797=>29901,
-41798=>29902,
-41799=>29903,
-41800=>29904,
-41801=>29905,
-41802=>29906,
-41803=>29907,
-41804=>29908,
-41805=>29909,
-41806=>29910,
-41807=>29911,
-41808=>29912,
-41809=>29913,
-41810=>29914,
-41811=>29915,
-41812=>29916,
-41813=>29917,
-41814=>29918,
-41815=>29919,
-41816=>29920,
-41817=>29921,
-41818=>29922,
-41819=>29923,
-41820=>29924,
-41821=>29925,
-41822=>29926,
-41823=>29927,
-41824=>29928,
-41825=>29929,
-41826=>29930,
-41827=>29931,
-41828=>29932,
-41829=>29933,
-41830=>29934,
-41831=>29935,
-41832=>29936,
-41833=>29937,
-41834=>29938,
-41835=>29939,
-41836=>29940,
-41837=>29941,
-41838=>29942,
-41839=>29943,
-41840=>29944,
-41841=>29945,
-41842=>29946,
-41843=>29947,
-41844=>29948,
-41845=>29949,
-41846=>29950,
-41847=>29951,
-41848=>29952,
-41849=>29953,
-41850=>29954,
-41851=>29955,
-41852=>29956,
-41853=>29957,
-41854=>29958,
-41855=>29959,
-41856=>29960,
-41857=>29961,
-41858=>29962,
-41859=>29963,
-41860=>29964,
-41861=>29965,
-41862=>29966,
-41863=>29967,
-41864=>29968,
-41865=>29969,
-41866=>29970,
-41867=>29971,
-41868=>29972,
-41869=>29973,
-41870=>29974,
-41871=>29975,
-41872=>29976,
-41873=>29977,
-41874=>29978,
-41875=>29979,
-41876=>29980,
-41877=>29981,
-41878=>29982,
-41879=>29983,
-41880=>29984,
-41881=>29985,
-41882=>29986,
-41883=>29987,
-41884=>29988,
-41885=>29989,
-41886=>29990,
-41887=>29991,
-41888=>29992,
-41889=>29993,
-41890=>29994,
-41891=>29995,
-41892=>29996,
-41893=>29997,
-41894=>29998,
-41895=>29999,
-41896=>30000,
-41897=>30001,
-41898=>30002,
-41899=>30003,
-41900=>30004,
-41901=>30005,
-41902=>30006,
-41903=>30007,
-41904=>30008,
-41905=>30009,
-41906=>30010,
-41907=>30011,
-41908=>30012,
-41909=>30013,
-41910=>30014,
-41911=>30015,
-41912=>30016,
-41913=>30017,
-41914=>30018,
-41915=>30019,
-41916=>30020,
-41917=>30021,
-41918=>30022,
-41919=>30023,
-41920=>30024,
-41921=>30025,
-41922=>30026,
-41923=>30027,
-41924=>30028,
-41925=>30029,
-41926=>30030,
-41927=>30031,
-41928=>30032,
-41929=>30033,
-41930=>30034,
-41931=>30035,
-41932=>30036,
-41933=>30037,
-41934=>30038,
-41935=>30039,
-41936=>30040,
-41937=>30041,
-41938=>30042,
-41939=>30043,
-41940=>30044,
-41941=>30045,
-41942=>30046,
-41943=>30047,
-41944=>30048,
-41945=>30049,
-41946=>30050,
-41947=>30051,
-41948=>30052,
-41949=>30053,
-41950=>30054,
-41951=>30055,
-41952=>30056,
-41953=>30057,
-41954=>30058,
-41955=>30059,
-41956=>30060,
-41957=>30061,
-41958=>30062,
-41959=>30063,
-41960=>30064,
-41961=>30065,
-41962=>30066,
-41963=>30067,
-41964=>30068,
-41965=>30069,
-41966=>30070,
-41967=>30071,
-41968=>30072,
-41969=>30073,
-41970=>30074,
-41971=>30075,
-41972=>30076,
-41973=>30077,
-41974=>30078,
-41975=>30079,
-41976=>30080,
-41977=>30081,
-41978=>30082,
-41979=>30083,
-41980=>30084,
-41981=>30085,
-41982=>30086,
-41983=>30087,
-41984=>30088,
-41985=>30089,
-41986=>30090,
-41987=>30091,
-41988=>30092,
-41989=>30093,
-41990=>30094,
-41991=>30095,
-41992=>30096,
-41993=>30097,
-41994=>30098,
-41995=>30099,
-41996=>30100,
-41997=>30101,
-41998=>30102,
-41999=>30103,
-42000=>30104,
-42001=>30105,
-42002=>30106,
-42003=>30107,
-42004=>30108,
-42005=>30109,
-42006=>30110,
-42007=>30111,
-42008=>30112,
-42009=>30113,
-42010=>30114,
-42011=>30115,
-42012=>30116,
-42013=>30117,
-42014=>30118,
-42015=>30119,
-42016=>30120,
-42017=>30121,
-42018=>30122,
-42019=>30123,
-42020=>30124,
-42021=>30125,
-42022=>30126,
-42023=>30127,
-42024=>30128,
-42025=>30129,
-42026=>30130,
-42027=>30131,
-42028=>30132,
-42029=>30133,
-42030=>30134,
-42031=>30135,
-42032=>30136,
-42033=>30137,
-42034=>30138,
-42035=>30139,
-42036=>30140,
-42037=>30141,
-42038=>30142,
-42039=>30143,
-42040=>30144,
-42041=>30145,
-42042=>30146,
-42043=>30147,
-42044=>30148,
-42045=>30149,
-42046=>30150,
-42047=>30151,
-42048=>30152,
-42049=>30153,
-42050=>30154,
-42051=>30155,
-42052=>30156,
-42053=>30157,
-42054=>30158,
-42055=>30159,
-42056=>30160,
-42057=>30161,
-42058=>30162,
-42059=>30163,
-42060=>30164,
-42061=>30165,
-42062=>30166,
-42063=>30167,
-42064=>30168,
-42065=>30169,
-42066=>30170,
-42067=>30171,
-42068=>30172,
-42069=>30173,
-42070=>30174,
-42071=>30175,
-42072=>30176,
-42073=>30177,
-42074=>30178,
-42075=>30179,
-42076=>30180,
-42077=>30181,
-42078=>30182,
-42079=>30183,
-42080=>30184,
-42081=>30185,
-42082=>30186,
-42083=>30187,
-42084=>30188,
-42085=>30189,
-42086=>30190,
-42087=>30191,
-42088=>30192,
-42089=>30193,
-42090=>30194,
-42091=>30195,
-42092=>30196,
-42093=>30197,
-42094=>30198,
-42095=>30199,
-42096=>30200,
-42097=>30201,
-42098=>30202,
-42099=>30203,
-42100=>30204,
-42101=>30205,
-42102=>30206,
-42103=>30207,
-42104=>30208,
-42105=>30209,
-42106=>30210,
-42107=>30211,
-42108=>30212,
-42109=>30213,
-42110=>30214,
-42111=>30215,
-42112=>30216,
-42113=>30217,
-42114=>30218,
-42115=>30219,
-42116=>30220,
-42117=>30221,
-42118=>30222,
-42119=>30223,
-42120=>30224,
-42121=>30225,
-42122=>30226,
-42123=>30227,
-42124=>30228,
-42128=>30229,
-42129=>30230,
-42130=>30231,
-42131=>30232,
-42132=>30233,
-42133=>30234,
-42134=>30235,
-42135=>30236,
-42136=>30237,
-42137=>30238,
-42138=>30239,
-42139=>30240,
-42140=>30241,
-42141=>30242,
-42142=>30243,
-42143=>30244,
-42144=>30245,
-42145=>30246,
-42146=>30247,
-42147=>30248,
-42148=>30249,
-42149=>30250,
-42150=>30251,
-42151=>30252,
-42152=>30253,
-42153=>30254,
-42154=>30255,
-42155=>30256,
-42156=>30257,
-42157=>30258,
-42158=>30259,
-42159=>30260,
-42160=>30261,
-42161=>30262,
-42162=>30263,
-42163=>30264,
-42164=>30265,
-42165=>30266,
-42166=>30267,
-42167=>30268,
-42168=>30269,
-42169=>30270,
-42170=>30271,
-42171=>30272,
-42172=>30273,
-42173=>30274,
-42174=>30275,
-42175=>30276,
-42176=>30277,
-42177=>30278,
-42178=>30279,
-42179=>30280,
-42180=>30281,
-42181=>30282,
-42182=>30283,
-);
-?>
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/uni2cid_aj16.php b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/uni2cid_aj16.php
deleted file mode 100644
index 8396e5e8..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/uni2cid_aj16.php
+++ /dev/null
@@ -1,15705 +0,0 @@
-<?php
-// unicode to cid conversion table is from
-// ftp://ftp.oreilly.com/pub/examples/nutshell/cjkv/adobe/
-// cid2code.txt in aj16.tar.Z
-$cidinfo['uni2cid'] = array(
-160=>1,
-32=>1,
-33=>2,
-34=>3,
-35=>4,
-36=>5,
-37=>6,
-38=>7,
-39=>8,
-40=>9,
-41=>10,
-42=>11,
-43=>12,
-44=>13,
-8209=>14,
-45=>14,
-46=>15,
-47=>16,
-48=>17,
-49=>18,
-50=>19,
-51=>20,
-52=>21,
-53=>22,
-54=>23,
-55=>24,
-56=>25,
-57=>26,
-58=>27,
-59=>28,
-60=>29,
-61=>30,
-62=>31,
-63=>32,
-64=>33,
-65=>34,
-66=>35,
-67=>36,
-68=>37,
-69=>38,
-70=>39,
-71=>40,
-72=>41,
-73=>42,
-74=>43,
-75=>44,
-76=>45,
-77=>46,
-78=>47,
-79=>48,
-80=>49,
-81=>50,
-82=>51,
-83=>52,
-84=>53,
-85=>54,
-86=>55,
-87=>56,
-88=>57,
-89=>58,
-90=>59,
-91=>60,
-165=>61,
-93=>62,
-94=>63,
-818=>64,
-95=>64,
-768=>65,
-96=>65,
-97=>66,
-98=>67,
-99=>68,
-100=>69,
-101=>70,
-102=>71,
-103=>72,
-104=>73,
-105=>74,
-106=>75,
-107=>76,
-108=>77,
-109=>78,
-110=>79,
-111=>80,
-112=>81,
-113=>82,
-114=>83,
-115=>84,
-116=>85,
-117=>86,
-118=>87,
-119=>88,
-120=>89,
-121=>90,
-122=>91,
-123=>92,
-166=>93,
-125=>94,
-732=>95,
-771=>95,
-700=>96,
-8217=>96,
-92=>97,
-699=>98,
-8216=>98,
-124=>99,
-126=>100,
-8764=>100,
-161=>101,
-162=>102,
-163=>103,
-8260=>104,
-402=>105,
-164=>107,
-8220=>108,
-171=>109,
-8249=>110,
-8250=>111,
-64257=>112,
-64258=>113,
-8210=>114,
-8211=>114,
-183=>117,
-8729=>117,
-8226=>119,
-8218=>120,
-8222=>121,
-8221=>122,
-187=>123,
-191=>126,
-769=>127,
-710=>128,
-770=>128,
-175=>129,
-772=>129,
-774=>130,
-775=>131,
-776=>132,
-730=>133,
-778=>133,
-184=>134,
-807=>134,
-779=>135,
-808=>136,
-780=>137,
-822=>138,
-8212=>138,
-198=>139,
-170=>140,
-321=>141,
-216=>142,
-338=>143,
-186=>144,
-230=>145,
-305=>146,
-322=>147,
-248=>148,
-339=>149,
-223=>150,
-173=>151,
-169=>152,
-172=>153,
-174=>154,
-178=>157,
-179=>158,
-181=>159,
-185=>160,
-188=>161,
-189=>162,
-190=>163,
-192=>164,
-193=>165,
-194=>166,
-195=>167,
-196=>168,
-197=>169,
-199=>170,
-200=>171,
-201=>172,
-202=>173,
-203=>174,
-204=>175,
-205=>176,
-206=>177,
-207=>178,
-208=>179,
-209=>180,
-210=>181,
-211=>182,
-212=>183,
-213=>184,
-214=>185,
-217=>187,
-218=>188,
-219=>189,
-220=>190,
-221=>191,
-222=>192,
-224=>193,
-225=>194,
-226=>195,
-227=>196,
-228=>197,
-229=>198,
-231=>199,
-232=>200,
-233=>201,
-234=>202,
-235=>203,
-236=>204,
-237=>205,
-238=>206,
-239=>207,
-240=>208,
-241=>209,
-242=>210,
-243=>211,
-244=>212,
-245=>213,
-246=>214,
-249=>216,
-250=>217,
-251=>218,
-252=>219,
-253=>220,
-254=>221,
-255=>222,
-352=>223,
-376=>224,
-381=>225,
-773=>226,
-8254=>226,
-353=>227,
-8482=>228,
-382=>229,
-8194=>231,
-65512=>323,
-65377=>327,
-65378=>328,
-65379=>329,
-65380=>330,
-65381=>331,
-65382=>332,
-65383=>333,
-65384=>334,
-65385=>335,
-65386=>336,
-65387=>337,
-65388=>338,
-65389=>339,
-65390=>340,
-65391=>341,
-65392=>342,
-65393=>343,
-65394=>344,
-65395=>345,
-65396=>346,
-65397=>347,
-65398=>348,
-65399=>349,
-65400=>350,
-65401=>351,
-65402=>352,
-65403=>353,
-65404=>354,
-65405=>355,
-65406=>356,
-65407=>357,
-65408=>358,
-65409=>359,
-65410=>360,
-65411=>361,
-65412=>362,
-65413=>363,
-65414=>364,
-65415=>365,
-65416=>366,
-65417=>367,
-65418=>368,
-65419=>369,
-65420=>370,
-65421=>371,
-65422=>372,
-65423=>373,
-65424=>374,
-65425=>375,
-65426=>376,
-65427=>377,
-65428=>378,
-65429=>379,
-65430=>380,
-65431=>381,
-65432=>382,
-65433=>383,
-65434=>384,
-65435=>385,
-65436=>386,
-65437=>387,
-65438=>388,
-65439=>389,
-8195=>633,
-12288=>633,
-12289=>634,
-12290=>635,
-65292=>636,
-65294=>637,
-12539=>638,
-65306=>639,
-65307=>640,
-65311=>641,
-65281=>642,
-12443=>643,
-12444=>644,
-180=>645,
-65344=>646,
-168=>647,
-65342=>648,
-65507=>649,
-65343=>650,
-12541=>651,
-12542=>652,
-12445=>653,
-12446=>654,
-12291=>655,
-20189=>656,
-12293=>657,
-12294=>658,
-12295=>659,
-12540=>660,
-8213=>661,
-8208=>662,
-65295=>663,
-65340=>664,
-12316=>665,
-65374=>665,
-8214=>666,
-65372=>667,
-8230=>668,
-8229=>669,
-65288=>674,
-65289=>675,
-12308=>676,
-12309=>677,
-65339=>678,
-65341=>679,
-65371=>680,
-65373=>681,
-12296=>682,
-12297=>683,
-12298=>684,
-12299=>685,
-12300=>686,
-12301=>687,
-12302=>688,
-12303=>689,
-12304=>690,
-12305=>691,
-65291=>692,
-8722=>693,
-65293=>693,
-177=>694,
-215=>695,
-247=>696,
-65309=>697,
-8800=>698,
-65308=>699,
-65310=>700,
-8806=>701,
-8807=>702,
-8734=>703,
-8756=>704,
-9794=>705,
-9792=>706,
-176=>707,
-8242=>708,
-8243=>709,
-8451=>710,
-65509=>711,
-65284=>712,
-65504=>713,
-65505=>714,
-65285=>715,
-65283=>716,
-65286=>717,
-65290=>718,
-65312=>719,
-167=>720,
-9734=>721,
-9733=>722,
-9675=>723,
-9679=>724,
-9678=>725,
-9671=>726,
-9670=>727,
-9633=>728,
-9632=>729,
-9651=>730,
-9650=>731,
-9661=>732,
-9660=>733,
-8251=>734,
-12306=>735,
-8594=>736,
-8592=>737,
-8593=>738,
-8595=>739,
-12307=>740,
-8712=>741,
-8715=>742,
-8838=>743,
-8839=>744,
-8834=>745,
-8835=>746,
-8746=>747,
-8745=>748,
-8743=>749,
-8744=>750,
-65506=>751,
-8658=>752,
-8660=>753,
-8704=>754,
-8707=>755,
-8736=>756,
-8869=>757,
-8978=>758,
-8706=>759,
-8711=>760,
-8801=>761,
-8786=>762,
-8810=>763,
-8811=>764,
-8730=>765,
-8765=>766,
-8733=>767,
-8757=>768,
-8747=>769,
-8748=>770,
-8491=>771,
-8240=>772,
-9839=>773,
-9837=>774,
-9834=>775,
-8224=>776,
-8225=>777,
-182=>778,
-9711=>779,
-65296=>780,
-65297=>781,
-65298=>782,
-65299=>783,
-65300=>784,
-65301=>785,
-65302=>786,
-65303=>787,
-65304=>788,
-65305=>789,
-65313=>790,
-65314=>791,
-65315=>792,
-65316=>793,
-65317=>794,
-65318=>795,
-65319=>796,
-65320=>797,
-65321=>798,
-65322=>799,
-65323=>800,
-65324=>801,
-65325=>802,
-65326=>803,
-65327=>804,
-65328=>805,
-65329=>806,
-65330=>807,
-65331=>808,
-65332=>809,
-65333=>810,
-65334=>811,
-65335=>812,
-65336=>813,
-65337=>814,
-65338=>815,
-65345=>816,
-65346=>817,
-65347=>818,
-65348=>819,
-65349=>820,
-65350=>821,
-65351=>822,
-65352=>823,
-65353=>824,
-65354=>825,
-65355=>826,
-65356=>827,
-65357=>828,
-65358=>829,
-65359=>830,
-65360=>831,
-65361=>832,
-65362=>833,
-65363=>834,
-65364=>835,
-65365=>836,
-65366=>837,
-65367=>838,
-65368=>839,
-65369=>840,
-65370=>841,
-12353=>842,
-12354=>843,
-12355=>844,
-12356=>845,
-12357=>846,
-12358=>847,
-12359=>848,
-12360=>849,
-12361=>850,
-12362=>851,
-12363=>852,
-12364=>853,
-12365=>854,
-12366=>855,
-12367=>856,
-12368=>857,
-12369=>858,
-12370=>859,
-12371=>860,
-12372=>861,
-12373=>862,
-12374=>863,
-12375=>864,
-12376=>865,
-12377=>866,
-12378=>867,
-12379=>868,
-12380=>869,
-12381=>870,
-12382=>871,
-12383=>872,
-12384=>873,
-12385=>874,
-12386=>875,
-12387=>876,
-12388=>877,
-12389=>878,
-12390=>879,
-12391=>880,
-12392=>881,
-12393=>882,
-12394=>883,
-12395=>884,
-12396=>885,
-12397=>886,
-12398=>887,
-12399=>888,
-12400=>889,
-12401=>890,
-12402=>891,
-12403=>892,
-12404=>893,
-12405=>894,
-12406=>895,
-12407=>896,
-12408=>897,
-12409=>898,
-12410=>899,
-12411=>900,
-12412=>901,
-12413=>902,
-12414=>903,
-12415=>904,
-12416=>905,
-12417=>906,
-12418=>907,
-12419=>908,
-12420=>909,
-12421=>910,
-12422=>911,
-12423=>912,
-12424=>913,
-12425=>914,
-12426=>915,
-12427=>916,
-12428=>917,
-12429=>918,
-12430=>919,
-12431=>920,
-12432=>921,
-12433=>922,
-12434=>923,
-12435=>924,
-12449=>925,
-12450=>926,
-12451=>927,
-12452=>928,
-12453=>929,
-12454=>930,
-12455=>931,
-12456=>932,
-12457=>933,
-12458=>934,
-12459=>935,
-12460=>936,
-12461=>937,
-12462=>938,
-12463=>939,
-12464=>940,
-12465=>941,
-12466=>942,
-12467=>943,
-12468=>944,
-12469=>945,
-12470=>946,
-12471=>947,
-12472=>948,
-12473=>949,
-12474=>950,
-12475=>951,
-12476=>952,
-12477=>953,
-12478=>954,
-12479=>955,
-12480=>956,
-12481=>957,
-12482=>958,
-12483=>959,
-12484=>960,
-12485=>961,
-12486=>962,
-12487=>963,
-12488=>964,
-12489=>965,
-12490=>966,
-12491=>967,
-12492=>968,
-12493=>969,
-12494=>970,
-12495=>971,
-12496=>972,
-12497=>973,
-12498=>974,
-12499=>975,
-12500=>976,
-12501=>977,
-12502=>978,
-12503=>979,
-12504=>980,
-12505=>981,
-12506=>982,
-12507=>983,
-12508=>984,
-12509=>985,
-12510=>986,
-12511=>987,
-12512=>988,
-12513=>989,
-12514=>990,
-12515=>991,
-12516=>992,
-12517=>993,
-12518=>994,
-12519=>995,
-12520=>996,
-12521=>997,
-12522=>998,
-12523=>999,
-12524=>1000,
-12525=>1001,
-12526=>1002,
-12527=>1003,
-12528=>1004,
-12529=>1005,
-12530=>1006,
-12531=>1007,
-12532=>1008,
-12533=>1009,
-12534=>1010,
-913=>1011,
-914=>1012,
-915=>1013,
-916=>1014,
-917=>1015,
-918=>1016,
-919=>1017,
-920=>1018,
-921=>1019,
-922=>1020,
-923=>1021,
-924=>1022,
-925=>1023,
-926=>1024,
-927=>1025,
-928=>1026,
-929=>1027,
-931=>1028,
-932=>1029,
-933=>1030,
-934=>1031,
-935=>1032,
-936=>1033,
-937=>1034,
-945=>1035,
-946=>1036,
-947=>1037,
-948=>1038,
-949=>1039,
-950=>1040,
-951=>1041,
-952=>1042,
-953=>1043,
-954=>1044,
-955=>1045,
-956=>1046,
-957=>1047,
-958=>1048,
-959=>1049,
-960=>1050,
-961=>1051,
-963=>1052,
-964=>1053,
-965=>1054,
-966=>1055,
-967=>1056,
-968=>1057,
-969=>1058,
-1040=>1059,
-1041=>1060,
-1042=>1061,
-1043=>1062,
-1044=>1063,
-1045=>1064,
-1025=>1065,
-1046=>1066,
-1047=>1067,
-1048=>1068,
-1049=>1069,
-1050=>1070,
-1051=>1071,
-1052=>1072,
-1053=>1073,
-1054=>1074,
-1055=>1075,
-1056=>1076,
-1057=>1077,
-1058=>1078,
-1059=>1079,
-1060=>1080,
-1061=>1081,
-1062=>1082,
-1063=>1083,
-1064=>1084,
-1065=>1085,
-1066=>1086,
-1067=>1087,
-1068=>1088,
-1069=>1089,
-1070=>1090,
-1071=>1091,
-1072=>1092,
-1073=>1093,
-1074=>1094,
-1075=>1095,
-1076=>1096,
-1077=>1097,
-1105=>1098,
-1078=>1099,
-1079=>1100,
-1080=>1101,
-1081=>1102,
-1082=>1103,
-1083=>1104,
-1084=>1105,
-1085=>1106,
-1086=>1107,
-1087=>1108,
-1088=>1109,
-1089=>1110,
-1090=>1111,
-1091=>1112,
-1092=>1113,
-1093=>1114,
-1094=>1115,
-1095=>1116,
-1096=>1117,
-1097=>1118,
-1098=>1119,
-1099=>1120,
-1100=>1121,
-1101=>1122,
-1102=>1123,
-1103=>1124,
-20124=>1125,
-21782=>1126,
-23043=>1127,
-38463=>1128,
-21696=>1129,
-24859=>1130,
-25384=>1131,
-23030=>1132,
-36898=>1133,
-33909=>1134,
-33564=>1135,
-31312=>1136,
-24746=>1137,
-25569=>1138,
-28197=>1139,
-26093=>1140,
-33894=>1141,
-33446=>1142,
-39925=>1143,
-26771=>1144,
-22311=>1145,
-26017=>1146,
-25201=>1147,
-23451=>1148,
-22992=>1149,
-34427=>1150,
-39156=>1151,
-32098=>1152,
-32190=>1153,
-39822=>1154,
-25110=>1155,
-31903=>1156,
-34999=>1157,
-23433=>1158,
-24245=>1159,
-25353=>1160,
-26263=>1161,
-26696=>1162,
-38343=>1163,
-38797=>1164,
-26447=>1165,
-20197=>1166,
-20234=>1167,
-20301=>1168,
-20381=>1169,
-20553=>1170,
-22258=>1171,
-22839=>1172,
-22996=>1173,
-23041=>1174,
-23561=>1175,
-24799=>1176,
-24847=>1177,
-24944=>1178,
-26131=>1179,
-26885=>1180,
-28858=>1181,
-30031=>1182,
-30064=>1183,
-31227=>1184,
-32173=>1185,
-32239=>1186,
-32963=>1187,
-33806=>1188,
-12176=>1189,
-34915=>1189,
-35586=>1190,
-36949=>1191,
-36986=>1192,
-21307=>1193,
-20117=>1194,
-20133=>1195,
-22495=>1196,
-32946=>1197,
-37057=>1198,
-30959=>1199,
-12032=>1200,
-19968=>1200,
-22769=>1201,
-28322=>1202,
-36920=>1203,
-31282=>1204,
-33576=>1205,
-33419=>1206,
-39983=>1207,
-20801=>1208,
-21360=>1209,
-21693=>1210,
-21729=>1211,
-22240=>1212,
-23035=>1213,
-24341=>1214,
-39154=>1215,
-28139=>1216,
-32996=>1217,
-34093=>1218,
-38498=>1219,
-38512=>1220,
-38560=>1221,
-38907=>1222,
-21515=>1223,
-21491=>1224,
-23431=>1225,
-28879=>1226,
-12155=>1227,
-32701=>1227,
-36802=>1228,
-12204=>1229,
-38632=>1229,
-21359=>1230,
-40284=>1231,
-31418=>1232,
-19985=>1233,
-30867=>1234,
-12165=>1235,
-33276=>1235,
-28198=>1236,
-22040=>1237,
-21764=>1238,
-27421=>1239,
-34074=>1240,
-39995=>1241,
-23013=>1242,
-21417=>1243,
-28006=>1244,
-12128=>1245,
-29916=>1245,
-38287=>1246,
-22082=>1247,
-20113=>1248,
-36939=>1249,
-38642=>1250,
-33615=>1251,
-39180=>1252,
-21473=>1253,
-21942=>1254,
-23344=>1255,
-24433=>1256,
-26144=>1257,
-26355=>1258,
-26628=>1259,
-27704=>1260,
-27891=>1261,
-27945=>1262,
-29787=>1263,
-30408=>1264,
-31310=>1265,
-38964=>1266,
-33521=>1267,
-34907=>1268,
-35424=>1269,
-37613=>1270,
-28082=>1271,
-30123=>1272,
-30410=>1273,
-39365=>1274,
-24742=>1275,
-35585=>1276,
-36234=>1277,
-38322=>1278,
-27022=>1279,
-21421=>1280,
-20870=>1281,
-22290=>1282,
-22576=>1283,
-22852=>1284,
-23476=>1285,
-24310=>1286,
-24616=>1287,
-25513=>1288,
-25588=>1289,
-27839=>1290,
-28436=>1291,
-28814=>1292,
-28948=>1293,
-29017=>1294,
-29141=>1295,
-29503=>1296,
-32257=>1297,
-33398=>1298,
-33489=>1299,
-34199=>1300,
-36960=>1301,
-37467=>1302,
-40219=>1303,
-22633=>1304,
-26044=>1305,
-27738=>1306,
-29989=>1307,
-20985=>1308,
-22830=>1309,
-22885=>1310,
-24448=>1311,
-24540=>1312,
-25276=>1313,
-26106=>1314,
-27178=>1315,
-27431=>1316,
-27572=>1317,
-29579=>1318,
-32705=>1319,
-35158=>1320,
-40236=>1321,
-40206=>1322,
-12009=>1323,
-40644=>1323,
-23713=>1324,
-27798=>1325,
-33659=>1326,
-20740=>1327,
-23627=>1328,
-25014=>1329,
-33222=>1330,
-26742=>1331,
-29281=>1332,
-12036=>1333,
-20057=>1333,
-20474=>1334,
-21368=>1335,
-24681=>1336,
-28201=>1337,
-31311=>1338,
-12211=>1339,
-38899=>1339,
-19979=>1340,
-21270=>1341,
-20206=>1342,
-20309=>1343,
-20285=>1344,
-20385=>1345,
-20339=>1346,
-21152=>1347,
-21487=>1348,
-22025=>1349,
-22799=>1350,
-23233=>1351,
-23478=>1352,
-23521=>1353,
-31185=>1354,
-26247=>1355,
-26524=>1356,
-26550=>1357,
-27468=>1358,
-27827=>1359,
-12117=>1360,
-28779=>1360,
-29634=>1361,
-31117=>1362,
-12146=>1363,
-31166=>1363,
-31292=>1364,
-31623=>1365,
-33457=>1366,
-33499=>1367,
-33540=>1368,
-33655=>1369,
-33775=>1370,
-33747=>1371,
-34662=>1372,
-35506=>1373,
-22057=>1374,
-36008=>1375,
-36838=>1376,
-36942=>1377,
-38686=>1378,
-34442=>1379,
-20420=>1380,
-23784=>1381,
-25105=>1382,
-12123=>1383,
-29273=>1383,
-30011=>1384,
-33253=>1385,
-33469=>1386,
-34558=>1387,
-36032=>1388,
-38597=>1389,
-39187=>1390,
-39381=>1391,
-20171=>1392,
-20250=>1393,
-35299=>1394,
-22238=>1395,
-22602=>1396,
-22730=>1397,
-24315=>1398,
-24555=>1399,
-24618=>1400,
-24724=>1401,
-24674=>1402,
-25040=>1403,
-25106=>1404,
-25296=>1405,
-25913=>1406,
-39745=>1407,
-26214=>1408,
-26800=>1409,
-28023=>1410,
-28784=>1411,
-30028=>1412,
-30342=>1413,
-32117=>1414,
-33445=>1415,
-34809=>1416,
-38283=>1417,
-38542=>1418,
-12185=>1419,
-35997=>1419,
-20977=>1420,
-21182=>1421,
-22806=>1422,
-21683=>1423,
-23475=>1424,
-23830=>1425,
-24936=>1426,
-27010=>1427,
-28079=>1428,
-30861=>1429,
-33995=>1430,
-34903=>1431,
-35442=>1432,
-37799=>1433,
-39608=>1434,
-28012=>1435,
-39336=>1436,
-34521=>1437,
-22435=>1438,
-26623=>1439,
-34510=>1440,
-37390=>1441,
-21123=>1442,
-22151=>1443,
-21508=>1444,
-24275=>1445,
-25313=>1446,
-25785=>1447,
-26684=>1448,
-26680=>1449,
-27579=>1450,
-29554=>1451,
-30906=>1452,
-31339=>1453,
-35226=>1454,
-12179=>1455,
-35282=>1455,
-36203=>1456,
-36611=>1457,
-37101=>1458,
-38307=>1459,
-38548=>1460,
-12208=>1461,
-38761=>1461,
-23398=>1462,
-23731=>1463,
-27005=>1464,
-38989=>1465,
-38990=>1466,
-25499=>1467,
-31520=>1468,
-27179=>1469,
-27263=>1470,
-26806=>1471,
-39949=>1472,
-28511=>1473,
-21106=>1474,
-21917=>1475,
-24688=>1476,
-25324=>1477,
-27963=>1478,
-28167=>1479,
-28369=>1480,
-33883=>1481,
-35088=>1482,
-36676=>1483,
-19988=>1484,
-39993=>1485,
-21494=>1486,
-26907=>1487,
-27194=>1488,
-38788=>1489,
-26666=>1490,
-20828=>1491,
-31427=>1492,
-33970=>1493,
-37340=>1494,
-37772=>1495,
-22107=>1496,
-40232=>1497,
-26658=>1498,
-33541=>1499,
-33841=>1500,
-31909=>1501,
-21000=>1502,
-33477=>1503,
-12129=>1504,
-29926=>1504,
-20094=>1505,
-20355=>1506,
-20896=>1507,
-23506=>1508,
-21002=>1509,
-21208=>1510,
-21223=>1511,
-24059=>1512,
-21914=>1513,
-22570=>1514,
-23014=>1515,
-23436=>1516,
-23448=>1517,
-23515=>1518,
-12082=>1519,
-24178=>1519,
-24185=>1520,
-24739=>1521,
-24863=>1522,
-24931=>1523,
-25022=>1524,
-25563=>1525,
-25954=>1526,
-26577=>1527,
-26707=>1528,
-26874=>1529,
-27454=>1530,
-27475=>1531,
-27735=>1532,
-28450=>1533,
-28567=>1534,
-28485=>1535,
-29872=>1536,
-12130=>1537,
-29976=>1537,
-30435=>1538,
-30475=>1539,
-31487=>1540,
-31649=>1541,
-31777=>1542,
-32233=>1543,
-12152=>1544,
-32566=>1544,
-32752=>1545,
-32925=>1546,
-33382=>1547,
-33694=>1548,
-35251=>1549,
-35532=>1550,
-36011=>1551,
-36996=>1552,
-37969=>1553,
-38291=>1554,
-38289=>1555,
-38306=>1556,
-38501=>1557,
-38867=>1558,
-39208=>1559,
-33304=>1560,
-20024=>1561,
-21547=>1562,
-23736=>1563,
-24012=>1564,
-29609=>1565,
-30284=>1566,
-30524=>1567,
-23721=>1568,
-32747=>1569,
-36107=>1570,
-38593=>1571,
-38929=>1572,
-38996=>1573,
-39000=>1574,
-20225=>1575,
-20238=>1576,
-21361=>1577,
-21916=>1578,
-22120=>1579,
-22522=>1580,
-22855=>1581,
-23305=>1582,
-23492=>1583,
-23696=>1584,
-24076=>1585,
-24190=>1586,
-24524=>1587,
-25582=>1588,
-26426=>1589,
-26071=>1590,
-26082=>1591,
-26399=>1592,
-26827=>1593,
-26820=>1594,
-27231=>1595,
-24112=>1596,
-27589=>1597,
-27671=>1598,
-27773=>1599,
-30079=>1600,
-31048=>1601,
-23395=>1602,
-31232=>1603,
-32000=>1604,
-24509=>1605,
-35215=>1606,
-35352=>1607,
-36020=>1608,
-36215=>1609,
-36556=>1610,
-36637=>1611,
-39138=>1612,
-39438=>1613,
-12004=>1614,
-12225=>1614,
-39740=>1614,
-12018=>1615,
-20096=>1615,
-20605=>1616,
-20736=>1617,
-22931=>1618,
-23452=>1619,
-25135=>1620,
-25216=>1621,
-25836=>1622,
-27450=>1623,
-29344=>1624,
-30097=>1625,
-31047=>1626,
-32681=>1627,
-34811=>1628,
-35516=>1629,
-35696=>1630,
-25516=>1631,
-33738=>1632,
-38816=>1633,
-21513=>1634,
-21507=>1635,
-21931=>1636,
-26708=>1637,
-27224=>1638,
-35440=>1639,
-30759=>1640,
-26485=>1641,
-12233=>1642,
-40653=>1642,
-21364=>1643,
-23458=>1644,
-33050=>1645,
-34384=>1646,
-36870=>1647,
-19992=>1648,
-20037=>1649,
-20167=>1650,
-20241=>1651,
-21450=>1652,
-21560=>1653,
-23470=>1654,
-12088=>1655,
-24339=>1655,
-24613=>1656,
-25937=>1657,
-26429=>1658,
-27714=>1659,
-27762=>1660,
-27875=>1661,
-28792=>1662,
-29699=>1663,
-31350=>1664,
-31406=>1665,
-31496=>1666,
-32026=>1667,
-31998=>1668,
-32102=>1669,
-26087=>1670,
-12124=>1671,
-29275=>1671,
-21435=>1672,
-23621=>1673,
-24040=>1674,
-25298=>1675,
-25312=>1676,
-25369=>1677,
-28192=>1678,
-34394=>1679,
-35377=>1680,
-36317=>1681,
-37624=>1682,
-28417=>1683,
-31142=>1684,
-12226=>1685,
-39770=>1685,
-20136=>1686,
-20139=>1687,
-20140=>1688,
-20379=>1689,
-20384=>1690,
-20689=>1691,
-20807=>1692,
-31478=>1693,
-20849=>1694,
-20982=>1695,
-21332=>1696,
-21281=>1697,
-21375=>1698,
-21483=>1699,
-21932=>1700,
-22659=>1701,
-23777=>1702,
-24375=>1703,
-24394=>1704,
-24623=>1705,
-24656=>1706,
-24685=>1707,
-25375=>1708,
-25945=>1709,
-27211=>1710,
-27841=>1711,
-29378=>1712,
-29421=>1713,
-30703=>1714,
-33016=>1715,
-33029=>1716,
-33288=>1717,
-34126=>1718,
-37111=>1719,
-37857=>1720,
-38911=>1721,
-39255=>1722,
-39514=>1723,
-20208=>1724,
-20957=>1725,
-23597=>1726,
-26241=>1727,
-26989=>1728,
-23616=>1729,
-26354=>1730,
-26997=>1731,
-12127=>1732,
-29577=>1732,
-26704=>1733,
-31873=>1734,
-20677=>1735,
-21220=>1736,
-22343=>1737,
-12081=>1738,
-24062=>1738,
-37670=>1739,
-12100=>1740,
-26020=>1740,
-27427=>1741,
-27453=>1742,
-29748=>1743,
-31105=>1744,
-31165=>1745,
-31563=>1746,
-32202=>1747,
-33465=>1748,
-33740=>1749,
-34943=>1750,
-35167=>1751,
-35641=>1752,
-36817=>1753,
-12198=>1754,
-37329=>1754,
-21535=>1755,
-37504=>1756,
-20061=>1757,
-20534=>1758,
-21477=>1759,
-21306=>1760,
-29399=>1761,
-29590=>1762,
-30697=>1763,
-33510=>1764,
-36527=>1765,
-39366=>1766,
-39368=>1767,
-39378=>1768,
-20855=>1769,
-24858=>1770,
-34398=>1771,
-21936=>1772,
-31354=>1773,
-20598=>1774,
-23507=>1775,
-36935=>1776,
-38533=>1777,
-20018=>1778,
-27355=>1779,
-37351=>1780,
-23633=>1781,
-23624=>1782,
-25496=>1783,
-31391=>1784,
-27795=>1785,
-38772=>1786,
-36705=>1787,
-31402=>1788,
-29066=>1789,
-38536=>1790,
-31874=>1791,
-26647=>1792,
-32368=>1793,
-26705=>1794,
-37740=>1795,
-21234=>1796,
-21531=>1797,
-34219=>1798,
-35347=>1799,
-32676=>1800,
-36557=>1801,
-37089=>1802,
-21350=>1803,
-34952=>1804,
-31041=>1805,
-20418=>1806,
-20670=>1807,
-21009=>1808,
-20804=>1809,
-21843=>1810,
-22317=>1811,
-29674=>1812,
-22411=>1813,
-22865=>1814,
-24418=>1815,
-24452=>1816,
-24693=>1817,
-24950=>1818,
-24935=>1819,
-25001=>1820,
-25522=>1821,
-25658=>1822,
-25964=>1823,
-26223=>1824,
-26690=>1825,
-28179=>1826,
-30054=>1827,
-31293=>1828,
-31995=>1829,
-32076=>1830,
-32153=>1831,
-32331=>1832,
-32619=>1833,
-33550=>1834,
-33610=>1835,
-34509=>1836,
-35336=>1837,
-35427=>1838,
-35686=>1839,
-36605=>1840,
-38938=>1841,
-40335=>1842,
-33464=>1843,
-36814=>1844,
-39912=>1845,
-21127=>1846,
-25119=>1847,
-25731=>1848,
-28608=>1849,
-38553=>1850,
-26689=>1851,
-20625=>1852,
-12107=>1853,
-27424=>1853,
-27770=>1854,
-28500=>1855,
-12147=>1856,
-31348=>1856,
-32080=>1857,
-12174=>1858,
-34880=>1858,
-35363=>1859,
-12105=>1860,
-26376=>1860,
-20214=>1861,
-20537=>1862,
-20518=>1863,
-20581=>1864,
-20860=>1865,
-21048=>1866,
-21091=>1867,
-21927=>1868,
-22287=>1869,
-22533=>1870,
-23244=>1871,
-24314=>1872,
-25010=>1873,
-25080=>1874,
-25331=>1875,
-25458=>1876,
-26908=>1877,
-27177=>1878,
-29309=>1879,
-12125=>1880,
-29356=>1880,
-29486=>1881,
-30740=>1882,
-30831=>1883,
-32121=>1884,
-30476=>1885,
-32937=>1886,
-12178=>1887,
-35211=>1887,
-35609=>1888,
-36066=>1889,
-36562=>1890,
-36963=>1891,
-37749=>1892,
-38522=>1893,
-38997=>1894,
-39443=>1895,
-40568=>1896,
-20803=>1897,
-21407=>1898,
-21427=>1899,
-24187=>1900,
-24358=>1901,
-28187=>1902,
-28304=>1903,
-12126=>1904,
-29572=>1904,
-29694=>1905,
-32067=>1906,
-33335=>1907,
-12180=>1908,
-35328=>1908,
-35578=>1909,
-38480=>1910,
-20046=>1911,
-20491=>1912,
-21476=>1913,
-21628=>1914,
-22266=>1915,
-22993=>1916,
-23396=>1917,
-12080=>1918,
-24049=>1918,
-24235=>1919,
-24359=>1920,
-12094=>1921,
-25144=>1921,
-25925=>1922,
-26543=>1923,
-28246=>1924,
-29392=>1925,
-31946=>1926,
-34996=>1927,
-32929=>1928,
-32993=>1929,
-33776=>1930,
-11969=>1931,
-34382=>1931,
-35463=>1932,
-36328=>1933,
-37431=>1934,
-38599=>1935,
-39015=>1936,
-12238=>1937,
-40723=>1937,
-20116=>1938,
-20114=>1939,
-20237=>1940,
-21320=>1941,
-21577=>1942,
-21566=>1943,
-23087=>1944,
-24460=>1945,
-24481=>1946,
-24735=>1947,
-26791=>1948,
-27278=>1949,
-29786=>1950,
-30849=>1951,
-35486=>1952,
-35492=>1953,
-35703=>1954,
-37264=>1955,
-20062=>1956,
-39881=>1957,
-20132=>1958,
-20348=>1959,
-20399=>1960,
-20505=>1961,
-20502=>1962,
-20809=>1963,
-20844=>1964,
-21151=>1965,
-21177=>1966,
-21246=>1967,
-21402=>1968,
-12061=>1969,
-21475=>1969,
-21521=>1970,
-21518=>1971,
-21897=>1972,
-22353=>1973,
-22434=>1974,
-22909=>1975,
-23380=>1976,
-23389=>1977,
-23439=>1978,
-12079=>1979,
-24037=>1979,
-24039=>1980,
-24055=>1981,
-24184=>1982,
-24195=>1983,
-24218=>1984,
-24247=>1985,
-24344=>1986,
-24658=>1987,
-24908=>1988,
-25239=>1989,
-25304=>1990,
-25511=>1991,
-25915=>1992,
-26114=>1993,
-26179=>1994,
-26356=>1995,
-26477=>1996,
-26657=>1997,
-26775=>1998,
-27083=>1999,
-27743=>2000,
-27946=>2001,
-28009=>2002,
-28207=>2003,
-28317=>2004,
-30002=>2005,
-30343=>2006,
-30828=>2007,
-31295=>2008,
-31968=>2009,
-32005=>2010,
-32024=>2011,
-32094=>2012,
-32177=>2013,
-32789=>2014,
-32771=>2015,
-32943=>2016,
-32945=>2017,
-33108=>2018,
-33167=>2019,
-33322=>2020,
-33618=>2021,
-12175=>2022,
-34892=>2022,
-34913=>2023,
-35611=>2024,
-36002=>2025,
-36092=>2026,
-37066=>2027,
-37237=>2028,
-37489=>2029,
-30783=>2030,
-37628=>2031,
-38308=>2032,
-38477=>2033,
-38917=>2034,
-12217=>2035,
-39321=>2035,
-12220=>2036,
-39640=>2036,
-40251=>2037,
-21083=>2038,
-21163=>2039,
-21495=>2040,
-21512=>2041,
-22741=>2042,
-25335=>2043,
-28640=>2044,
-35946=>2045,
-36703=>2046,
-40633=>2047,
-20811=>2048,
-21051=>2049,
-21578=>2050,
-22269=>2051,
-31296=>2052,
-37239=>2053,
-40288=>2054,
-12234=>2055,
-40658=>2055,
-29508=>2056,
-28425=>2057,
-33136=>2058,
-29969=>2059,
-24573=>2060,
-24794=>2061,
-12219=>2062,
-39592=>2062,
-29403=>2063,
-36796=>2064,
-27492=>2065,
-38915=>2066,
-20170=>2067,
-22256=>2068,
-22372=>2069,
-22718=>2070,
-23130=>2071,
-24680=>2072,
-25031=>2073,
-26127=>2074,
-26118=>2075,
-26681=>2076,
-26801=>2077,
-28151=>2078,
-30165=>2079,
-32058=>2080,
-12169=>2081,
-33390=>2081,
-39746=>2082,
-20123=>2083,
-20304=>2084,
-21449=>2085,
-21766=>2086,
-23919=>2087,
-24038=>2088,
-24046=>2089,
-26619=>2090,
-27801=>2091,
-29811=>2092,
-30722=>2093,
-35408=>2094,
-37782=>2095,
-35039=>2096,
-22352=>2097,
-24231=>2098,
-25387=>2099,
-20661=>2100,
-20652=>2101,
-20877=>2102,
-26368=>2103,
-21705=>2104,
-22622=>2105,
-22971=>2106,
-23472=>2107,
-24425=>2108,
-25165=>2109,
-25505=>2110,
-26685=>2111,
-27507=>2112,
-28168=>2113,
-28797=>2114,
-37319=>2115,
-29312=>2116,
-30741=>2117,
-30758=>2118,
-31085=>2119,
-25998=>2120,
-32048=>2121,
-33756=>2122,
-35009=>2123,
-36617=>2124,
-38555=>2125,
-21092=>2126,
-22312=>2127,
-26448=>2128,
-32618=>2129,
-36001=>2130,
-20916=>2131,
-22338=>2132,
-38442=>2133,
-22586=>2134,
-27018=>2135,
-32948=>2136,
-21682=>2137,
-23822=>2138,
-22524=>2139,
-30869=>2140,
-40442=>2141,
-20316=>2142,
-21066=>2143,
-21643=>2144,
-25662=>2145,
-26152=>2146,
-26388=>2147,
-26613=>2148,
-31364=>2149,
-31574=>2150,
-32034=>2151,
-37679=>2152,
-26716=>2153,
-39853=>2154,
-31545=>2155,
-21273=>2156,
-20874=>2157,
-21047=>2158,
-23519=>2159,
-25334=>2160,
-25774=>2161,
-25830=>2162,
-26413=>2163,
-27578=>2164,
-34217=>2165,
-38609=>2166,
-30352=>2167,
-39894=>2168,
-25420=>2169,
-37638=>2170,
-39851=>2171,
-12139=>2172,
-30399=>2172,
-26194=>2173,
-19977=>2174,
-20632=>2175,
-21442=>2176,
-12077=>2177,
-23665=>2177,
-24808=>2178,
-25746=>2179,
-25955=>2180,
-26719=>2181,
-29158=>2182,
-29642=>2183,
-29987=>2184,
-31639=>2185,
-32386=>2186,
-34453=>2187,
-35715=>2188,
-36059=>2189,
-37240=>2190,
-39184=>2191,
-26028=>2192,
-26283=>2193,
-27531=>2194,
-20181=>2195,
-20180=>2196,
-20282=>2197,
-20351=>2198,
-21050=>2199,
-21496=>2200,
-21490=>2201,
-21987=>2202,
-22235=>2203,
-12064=>2204,
-22763=>2204,
-22987=>2205,
-22985=>2206,
-23039=>2207,
-12070=>2208,
-23376=>2208,
-23629=>2209,
-24066=>2210,
-24107=>2211,
-24535=>2212,
-24605=>2213,
-25351=>2214,
-12096=>2215,
-25903=>2215,
-23388=>2216,
-26031=>2217,
-26045=>2218,
-26088=>2219,
-26525=>2220,
-12108=>2221,
-27490=>2221,
-27515=>2222,
-12114=>2223,
-27663=>2223,
-29509=>2224,
-31049=>2225,
-31169=>2226,
-12151=>2227,
-31992=>2227,
-32025=>2228,
-32043=>2229,
-32930=>2230,
-33026=>2231,
-12164=>2232,
-33267=>2232,
-35222=>2233,
-35422=>2234,
-35433=>2235,
-35430=>2236,
-35468=>2237,
-35566=>2238,
-36039=>2239,
-36060=>2240,
-38604=>2241,
-39164=>2242,
-12013=>2243,
-27503=>2243,
-20107=>2244,
-20284=>2245,
-20365=>2246,
-20816=>2247,
-23383=>2248,
-23546=>2249,
-24904=>2250,
-25345=>2251,
-26178=>2252,
-27425=>2253,
-28363=>2254,
-27835=>2255,
-29246=>2256,
-29885=>2257,
-30164=>2258,
-30913=>2259,
-12144=>2260,
-31034=>2260,
-12157=>2261,
-32780=>2261,
-12159=>2262,
-32819=>2262,
-12163=>2263,
-33258=>2263,
-33940=>2264,
-36766=>2265,
-27728=>2266,
-12229=>2267,
-40575=>2267,
-24335=>2268,
-35672=>2269,
-40235=>2270,
-31482=>2271,
-36600=>2272,
-23437=>2273,
-38635=>2274,
-19971=>2275,
-21489=>2276,
-22519=>2277,
-22833=>2278,
-23241=>2279,
-23460=>2280,
-24713=>2281,
-28287=>2282,
-28422=>2283,
-30142=>2284,
-36074=>2285,
-23455=>2286,
-34048=>2287,
-31712=>2288,
-20594=>2289,
-26612=>2290,
-33437=>2291,
-23649=>2292,
-34122=>2293,
-32286=>2294,
-33294=>2295,
-20889=>2296,
-23556=>2297,
-25448=>2298,
-36198=>2299,
-26012=>2300,
-29038=>2301,
-31038=>2302,
-32023=>2303,
-32773=>2304,
-35613=>2305,
-12190=>2306,
-36554=>2306,
-36974=>2307,
-34503=>2308,
-37034=>2309,
-20511=>2310,
-21242=>2311,
-23610=>2312,
-26451=>2313,
-28796=>2314,
-29237=>2315,
-37196=>2316,
-37320=>2317,
-37675=>2318,
-33509=>2319,
-23490=>2320,
-24369=>2321,
-24825=>2322,
-20027=>2323,
-21462=>2324,
-23432=>2325,
-12095=>2326,
-25163=>2326,
-26417=>2327,
-27530=>2328,
-29417=>2329,
-29664=>2330,
-31278=>2331,
-33131=>2332,
-36259=>2333,
-37202=>2334,
-12216=>2335,
-39318=>2335,
-20754=>2336,
-21463=>2337,
-21610=>2338,
-23551=>2339,
-25480=>2340,
-27193=>2341,
-32172=>2342,
-38656=>2343,
-22234=>2344,
-21454=>2345,
-21608=>2346,
-23447=>2347,
-23601=>2348,
-24030=>2349,
-20462=>2350,
-24833=>2351,
-25342=>2352,
-27954=>2353,
-31168=>2354,
-31179=>2355,
-32066=>2356,
-32333=>2357,
-32722=>2358,
-33261=>2359,
-12168=>2360,
-33311=>2360,
-33936=>2361,
-34886=>2362,
-35186=>2363,
-35728=>2364,
-36468=>2365,
-36655=>2366,
-36913=>2367,
-37195=>2368,
-37228=>2369,
-38598=>2370,
-37276=>2371,
-20160=>2372,
-20303=>2373,
-20805=>2374,
-12055=>2375,
-21313=>2375,
-24467=>2376,
-25102=>2377,
-26580=>2378,
-27713=>2379,
-28171=>2380,
-29539=>2381,
-32294=>2382,
-37325=>2383,
-37507=>2384,
-21460=>2385,
-22809=>2386,
-23487=>2387,
-28113=>2388,
-31069=>2389,
-32302=>2390,
-31899=>2391,
-22654=>2392,
-29087=>2393,
-20986=>2394,
-34899=>2395,
-36848=>2396,
-20426=>2397,
-23803=>2398,
-26149=>2399,
-30636=>2400,
-31459=>2401,
-33308=>2402,
-39423=>2403,
-20934=>2404,
-24490=>2405,
-26092=>2406,
-26991=>2407,
-27529=>2408,
-28147=>2409,
-28310=>2410,
-28516=>2411,
-30462=>2412,
-32020=>2413,
-24033=>2414,
-36981=>2415,
-37255=>2416,
-38918=>2417,
-20966=>2418,
-21021=>2419,
-25152=>2420,
-26257=>2421,
-26329=>2422,
-28186=>2423,
-24246=>2424,
-32210=>2425,
-32626=>2426,
-26360=>2427,
-34223=>2428,
-34295=>2429,
-35576=>2430,
-21161=>2431,
-21465=>2432,
-12069=>2433,
-22899=>2433,
-24207=>2434,
-24464=>2435,
-24661=>2436,
-37604=>2437,
-38500=>2438,
-20663=>2439,
-20767=>2440,
-21213=>2441,
-21280=>2442,
-21319=>2443,
-21484=>2444,
-21736=>2445,
-21830=>2446,
-21809=>2447,
-22039=>2448,
-22888=>2449,
-22974=>2450,
-23100=>2451,
-23477=>2452,
-23558=>2453,
-12073=>2454,
-23567=>2454,
-23569=>2455,
-23578=>2456,
-24196=>2457,
-24202=>2458,
-24288=>2459,
-24432=>2460,
-25215=>2461,
-25220=>2462,
-25307=>2463,
-25484=>2464,
-25463=>2465,
-26119=>2466,
-26124=>2467,
-26157=>2468,
-26230=>2469,
-26494=>2470,
-26786=>2471,
-27167=>2472,
-27189=>2473,
-27836=>2474,
-28040=>2475,
-28169=>2476,
-28248=>2477,
-28988=>2478,
-28966=>2479,
-29031=>2480,
-30151=>2481,
-30465=>2482,
-30813=>2483,
-30977=>2484,
-31077=>2485,
-31216=>2486,
-31456=>2487,
-31505=>2488,
-31911=>2489,
-32057=>2490,
-32918=>2491,
-33750=>2492,
-33931=>2493,
-34121=>2494,
-34909=>2495,
-35059=>2496,
-35359=>2497,
-35388=>2498,
-35412=>2499,
-35443=>2500,
-35937=>2501,
-36062=>2502,
-37284=>2503,
-37478=>2504,
-37758=>2505,
-37912=>2506,
-38556=>2507,
-38808=>2508,
-19978=>2509,
-19976=>2510,
-19998=>2511,
-20055=>2512,
-20887=>2513,
-21104=>2514,
-22478=>2515,
-22580=>2516,
-22732=>2517,
-23330=>2518,
-24120=>2519,
-24773=>2520,
-25854=>2521,
-26465=>2522,
-26454=>2523,
-27972=>2524,
-29366=>2525,
-30067=>2526,
-31331=>2527,
-33976=>2528,
-35698=>2529,
-37304=>2530,
-37664=>2531,
-22065=>2532,
-22516=>2533,
-39166=>2534,
-25325=>2535,
-26893=>2536,
-27542=>2537,
-29165=>2538,
-32340=>2539,
-32887=>2540,
-12170=>2541,
-33394=>2541,
-35302=>2542,
-12215=>2543,
-39135=>2543,
-34645=>2544,
-36785=>2545,
-23611=>2546,
-20280=>2547,
-20449=>2548,
-20405=>2549,
-21767=>2550,
-23072=>2551,
-23517=>2552,
-23529=>2553,
-12092=>2554,
-24515=>2554,
-24910=>2555,
-25391=>2556,
-26032=>2557,
-26187=>2558,
-26862=>2559,
-27035=>2560,
-28024=>2561,
-28145=>2562,
-30003=>2563,
-30137=>2564,
-30495=>2565,
-31070=>2566,
-31206=>2567,
-32051=>2568,
-12162=>2569,
-33251=>2569,
-33455=>2570,
-34218=>2571,
-35242=>2572,
-35386=>2573,
-12189=>2574,
-36523=>2574,
-12191=>2575,
-36763=>2575,
-36914=>2576,
-37341=>2577,
-38663=>2578,
-12040=>2579,
-20154=>2579,
-20161=>2580,
-20995=>2581,
-22645=>2582,
-22764=>2583,
-23563=>2584,
-29978=>2585,
-23613=>2586,
-33102=>2587,
-35338=>2588,
-36805=>2589,
-38499=>2590,
-38765=>2591,
-31525=>2592,
-35535=>2593,
-38920=>2594,
-37218=>2595,
-22259=>2596,
-21416=>2597,
-36887=>2598,
-21561=>2599,
-22402=>2600,
-24101=>2601,
-25512=>2602,
-12116=>2603,
-27700=>2603,
-28810=>2604,
-30561=>2605,
-31883=>2606,
-32736=>2607,
-34928=>2608,
-36930=>2609,
-37204=>2610,
-37648=>2611,
-37656=>2612,
-38543=>2613,
-29790=>2614,
-39620=>2615,
-23815=>2616,
-23913=>2617,
-25968=>2618,
-26530=>2619,
-36264=>2620,
-38619=>2621,
-25454=>2622,
-26441=>2623,
-26905=>2624,
-33733=>2625,
-38935=>2626,
-38592=>2627,
-35070=>2628,
-28548=>2629,
-25722=>2630,
-12072=>2631,
-23544=>2631,
-19990=>2632,
-28716=>2633,
-30045=>2634,
-26159=>2635,
-20932=>2636,
-21046=>2637,
-21218=>2638,
-22995=>2639,
-24449=>2640,
-24615=>2641,
-25104=>2642,
-25919=>2643,
-25972=>2644,
-26143=>2645,
-26228=>2646,
-26866=>2647,
-26646=>2648,
-27491=>2649,
-28165=>2650,
-29298=>2651,
-12131=>2652,
-29983=>2652,
-30427=>2653,
-31934=>2654,
-32854=>2655,
-22768=>2656,
-35069=>2657,
-11972=>2658,
-35199=>2658,
-35488=>2659,
-35475=>2660,
-35531=>2661,
-36893=>2662,
-37266=>2663,
-11992=>2664,
-38738=>2664,
-38745=>2665,
-12011=>2666,
-25993=>2666,
-31246=>2667,
-33030=>2668,
-38587=>2669,
-24109=>2670,
-24796=>2671,
-25114=>2672,
-26021=>2673,
-26132=>2674,
-26512=>2675,
-12143=>2676,
-30707=>2676,
-31309=>2677,
-31821=>2678,
-32318=>2679,
-33034=>2680,
-36012=>2681,
-12186=>2682,
-36196=>2682,
-36321=>2683,
-36447=>2684,
-30889=>2685,
-20999=>2686,
-25305=>2687,
-25509=>2688,
-25666=>2689,
-25240=>2690,
-35373=>2691,
-31363=>2692,
-31680=>2693,
-35500=>2694,
-38634=>2695,
-32118=>2696,
-12166=>2697,
-33292=>2697,
-34633=>2698,
-20185=>2699,
-20808=>2700,
-21315=>2701,
-21344=>2702,
-23459=>2703,
-23554=>2704,
-23574=>2705,
-24029=>2706,
-25126=>2707,
-25159=>2708,
-25776=>2709,
-26643=>2710,
-26676=>2711,
-27849=>2712,
-27973=>2713,
-27927=>2714,
-26579=>2715,
-28508=>2716,
-29006=>2717,
-29053=>2718,
-26059=>2719,
-31359=>2720,
-31661=>2721,
-32218=>2722,
-32330=>2723,
-32680=>2724,
-33146=>2725,
-12167=>2726,
-33307=>2726,
-33337=>2727,
-34214=>2728,
-35438=>2729,
-36046=>2730,
-36341=>2731,
-36984=>2732,
-36983=>2733,
-37549=>2734,
-37521=>2735,
-38275=>2736,
-39854=>2737,
-21069=>2738,
-21892=>2739,
-28472=>2740,
-28982=>2741,
-20840=>2742,
-31109=>2743,
-32341=>2744,
-33203=>2745,
-31950=>2746,
-22092=>2747,
-22609=>2748,
-23720=>2749,
-25514=>2750,
-26366=>2751,
-26365=>2752,
-26970=>2753,
-29401=>2754,
-30095=>2755,
-30094=>2756,
-30990=>2757,
-31062=>2758,
-31199=>2759,
-31895=>2760,
-32032=>2761,
-32068=>2762,
-34311=>2763,
-35380=>2764,
-38459=>2765,
-36961=>2766,
-12239=>2767,
-40736=>2767,
-20711=>2768,
-21109=>2769,
-21452=>2770,
-21474=>2771,
-20489=>2772,
-21930=>2773,
-22766=>2774,
-22863=>2775,
-29245=>2776,
-23435=>2777,
-23652=>2778,
-21277=>2779,
-24803=>2780,
-24819=>2781,
-25436=>2782,
-25475=>2783,
-25407=>2784,
-25531=>2785,
-25805=>2786,
-26089=>2787,
-26361=>2788,
-24035=>2789,
-27085=>2790,
-27133=>2791,
-28437=>2792,
-29157=>2793,
-20105=>2794,
-30185=>2795,
-30456=>2796,
-31379=>2797,
-31967=>2798,
-32207=>2799,
-32156=>2800,
-32865=>2801,
-33609=>2802,
-33624=>2803,
-33900=>2804,
-33980=>2805,
-34299=>2806,
-35013=>2807,
-12187=>2808,
-36208=>2808,
-36865=>2809,
-36973=>2810,
-37783=>2811,
-38684=>2812,
-39442=>2813,
-20687=>2814,
-22679=>2815,
-24974=>2816,
-33235=>2817,
-34101=>2818,
-36104=>2819,
-36896=>2820,
-20419=>2821,
-20596=>2822,
-21063=>2823,
-21363=>2824,
-24687=>2825,
-25417=>2826,
-26463=>2827,
-28204=>2828,
-12188=>2829,
-36275=>2829,
-36895=>2830,
-20439=>2831,
-23646=>2832,
-36042=>2833,
-26063=>2834,
-32154=>2835,
-21330=>2836,
-34966=>2837,
-20854=>2838,
-25539=>2839,
-23384=>2840,
-23403=>2841,
-23562=>2842,
-25613=>2843,
-26449=>2844,
-36956=>2845,
-20182=>2846,
-22810=>2847,
-22826=>2848,
-27760=>2849,
-35409=>2850,
-21822=>2851,
-22549=>2852,
-22949=>2853,
-24816=>2854,
-25171=>2855,
-26561=>2856,
-33333=>2857,
-26965=>2858,
-38464=>2859,
-39364=>2860,
-39464=>2861,
-20307=>2862,
-22534=>2863,
-23550=>2864,
-32784=>2865,
-23729=>2866,
-24111=>2867,
-24453=>2868,
-24608=>2869,
-24907=>2870,
-25140=>2871,
-26367=>2872,
-27888=>2873,
-28382=>2874,
-32974=>2875,
-33151=>2876,
-33492=>2877,
-34955=>2878,
-36024=>2879,
-36864=>2880,
-36910=>2881,
-38538=>2882,
-40667=>2883,
-39899=>2884,
-20195=>2885,
-21488=>2886,
-12068=>2887,
-22823=>2887,
-31532=>2888,
-37261=>2889,
-38988=>2890,
-40441=>2891,
-28381=>2892,
-28711=>2893,
-21331=>2894,
-21828=>2895,
-23429=>2896,
-25176=>2897,
-25246=>2898,
-25299=>2899,
-27810=>2900,
-28655=>2901,
-29730=>2902,
-35351=>2903,
-37944=>2904,
-28609=>2905,
-35582=>2906,
-33592=>2907,
-20967=>2908,
-34552=>2909,
-21482=>2910,
-21481=>2911,
-20294=>2912,
-36948=>2913,
-12192=>2914,
-36784=>2914,
-22890=>2915,
-33073=>2916,
-24061=>2917,
-31466=>2918,
-36799=>2919,
-26842=>2920,
-12181=>2921,
-35895=>2921,
-29432=>2922,
-40008=>2923,
-27197=>2924,
-35504=>2925,
-20025=>2926,
-21336=>2927,
-22022=>2928,
-22374=>2929,
-25285=>2930,
-25506=>2931,
-26086=>2932,
-27470=>2933,
-28129=>2934,
-28251=>2935,
-28845=>2936,
-30701=>2937,
-31471=>2938,
-31658=>2939,
-32187=>2940,
-32829=>2941,
-32966=>2942,
-34507=>2943,
-35477=>2944,
-37723=>2945,
-22243=>2946,
-22727=>2947,
-24382=>2948,
-26029=>2949,
-26262=>2950,
-27264=>2951,
-27573=>2952,
-30007=>2953,
-35527=>2954,
-20516=>2955,
-30693=>2956,
-22320=>2957,
-24347=>2958,
-24677=>2959,
-26234=>2960,
-27744=>2961,
-30196=>2962,
-31258=>2963,
-32622=>2964,
-33268=>2965,
-34584=>2966,
-36933=>2967,
-39347=>2968,
-31689=>2969,
-30044=>2970,
-12149=>2971,
-31481=>2971,
-31569=>2972,
-33988=>2973,
-36880=>2974,
-31209=>2975,
-31378=>2976,
-33590=>2977,
-23265=>2978,
-30528=>2979,
-20013=>2980,
-20210=>2981,
-23449=>2982,
-24544=>2983,
-25277=>2984,
-26172=>2985,
-26609=>2986,
-27880=>2987,
-12173=>2988,
-34411=>2988,
-34935=>2989,
-35387=>2990,
-37198=>2991,
-37619=>2992,
-39376=>2993,
-27159=>2994,
-28710=>2995,
-29482=>2996,
-33511=>2997,
-33879=>2998,
-36015=>2999,
-19969=>3000,
-20806=>3001,
-20939=>3002,
-21899=>3003,
-23541=>3004,
-24086=>3005,
-24115=>3006,
-24193=>3007,
-24340=>3008,
-24373=>3009,
-24427=>3010,
-24500=>3011,
-25074=>3012,
-25361=>3013,
-26274=>3014,
-26397=>3015,
-28526=>3016,
-29266=>3017,
-30010=>3018,
-30522=>3019,
-32884=>3020,
-33081=>3021,
-33144=>3022,
-34678=>3023,
-35519=>3024,
-35548=>3025,
-36229=>3026,
-36339=>3027,
-37530=>3028,
-11985=>3029,
-12199=>3029,
-38263=>3029,
-38914=>3030,
-12227=>3031,
-40165=>3031,
-21189=>3032,
-25431=>3033,
-30452=>3034,
-26389=>3035,
-27784=>3036,
-29645=>3037,
-36035=>3038,
-37806=>3039,
-38515=>3040,
-27941=>3041,
-22684=>3042,
-26894=>3043,
-27084=>3044,
-36861=>3045,
-37786=>3046,
-30171=>3047,
-36890=>3048,
-22618=>3049,
-26626=>3050,
-25524=>3051,
-27131=>3052,
-20291=>3053,
-28460=>3054,
-26584=>3055,
-36795=>3056,
-34086=>3057,
-32180=>3058,
-37716=>3059,
-26943=>3060,
-28528=>3061,
-22378=>3062,
-22775=>3063,
-23340=>3064,
-32044=>3065,
-12118=>3066,
-29226=>3066,
-21514=>3067,
-37347=>3068,
-40372=>3069,
-20141=>3070,
-20302=>3071,
-20572=>3072,
-20597=>3073,
-21059=>3074,
-35998=>3075,
-21576=>3076,
-22564=>3077,
-23450=>3078,
-24093=>3079,
-24213=>3080,
-24237=>3081,
-24311=>3082,
-24351=>3083,
-24716=>3084,
-25269=>3085,
-25402=>3086,
-25552=>3087,
-26799=>3088,
-27712=>3089,
-30855=>3090,
-31118=>3091,
-31243=>3092,
-32224=>3093,
-33351=>3094,
-35330=>3095,
-35558=>3096,
-36420=>3097,
-36883=>3098,
-37048=>3099,
-37165=>3100,
-37336=>3101,
-12237=>3102,
-40718=>3102,
-27877=>3103,
-25688=>3104,
-25826=>3105,
-25973=>3106,
-28404=>3107,
-30340=>3108,
-31515=>3109,
-36969=>3110,
-37841=>3111,
-28346=>3112,
-21746=>3113,
-24505=>3114,
-25764=>3115,
-36685=>3116,
-36845=>3117,
-37444=>3118,
-20856=>3119,
-22635=>3120,
-22825=>3121,
-23637=>3122,
-24215=>3123,
-28155=>3124,
-32399=>3125,
-29980=>3126,
-36028=>3127,
-36578=>3128,
-39003=>3129,
-28857=>3130,
-20253=>3131,
-27583=>3132,
-28593=>3133,
-12133=>3134,
-30000=>3134,
-38651=>3135,
-20814=>3136,
-21520=>3137,
-22581=>3138,
-22615=>3139,
-22956=>3140,
-23648=>3141,
-24466=>3142,
-12099=>3143,
-26007=>3143,
-26460=>3144,
-28193=>3145,
-30331=>3146,
-33759=>3147,
-36077=>3148,
-36884=>3149,
-37117=>3150,
-37709=>3151,
-30757=>3152,
-30778=>3153,
-21162=>3154,
-24230=>3155,
-12063=>3156,
-22303=>3156,
-22900=>3157,
-24594=>3158,
-20498=>3159,
-20826=>3160,
-20908=>3161,
-20941=>3162,
-12049=>3163,
-20992=>3163,
-21776=>3164,
-22612=>3165,
-22616=>3166,
-22871=>3167,
-23445=>3168,
-23798=>3169,
-23947=>3170,
-24764=>3171,
-25237=>3172,
-25645=>3173,
-26481=>3174,
-26691=>3175,
-26812=>3176,
-26847=>3177,
-30423=>3178,
-28120=>3179,
-28271=>3180,
-28059=>3181,
-28783=>3182,
-29128=>3183,
-24403=>3184,
-30168=>3185,
-31095=>3186,
-31561=>3187,
-31572=>3188,
-31570=>3189,
-31958=>3190,
-32113=>3191,
-21040=>3192,
-33891=>3193,
-34153=>3194,
-34276=>3195,
-35342=>3196,
-35588=>3197,
-12182=>3198,
-35910=>3198,
-36367=>3199,
-36867=>3200,
-36879=>3201,
-37913=>3202,
-38518=>3203,
-38957=>3204,
-39472=>3205,
-38360=>3206,
-20685=>3207,
-21205=>3208,
-21516=>3209,
-22530=>3210,
-23566=>3211,
-24999=>3212,
-25758=>3213,
-27934=>3214,
-30643=>3215,
-31461=>3216,
-33012=>3217,
-33796=>3218,
-36947=>3219,
-37509=>3220,
-23776=>3221,
-40199=>3222,
-21311=>3223,
-24471=>3224,
-24499=>3225,
-28060=>3226,
-29305=>3227,
-30563=>3228,
-31167=>3229,
-31716=>3230,
-27602=>3231,
-29420=>3232,
-35501=>3233,
-26627=>3234,
-27233=>3235,
-20984=>3236,
-31361=>3237,
-26932=>3238,
-23626=>3239,
-40182=>3240,
-33515=>3241,
-23493=>3242,
-12195=>3243,
-37193=>3243,
-28702=>3244,
-22136=>3245,
-23663=>3246,
-24775=>3247,
-25958=>3248,
-27788=>3249,
-35930=>3250,
-36929=>3251,
-38931=>3252,
-21585=>3253,
-26311=>3254,
-37389=>3255,
-22856=>3256,
-37027=>3257,
-20869=>3258,
-20045=>3259,
-20970=>3260,
-34201=>3261,
-35598=>3262,
-28760=>3263,
-25466=>3264,
-37707=>3265,
-26978=>3266,
-39348=>3267,
-32260=>3268,
-30071=>3269,
-21335=>3270,
-26976=>3271,
-36575=>3272,
-38627=>3273,
-27741=>3274,
-12038=>3275,
-20108=>3275,
-23612=>3276,
-24336=>3277,
-36841=>3278,
-21250=>3279,
-36049=>3280,
-12161=>3281,
-32905=>3281,
-34425=>3282,
-24319=>3283,
-12103=>3284,
-26085=>3284,
-20083=>3285,
-12042=>3286,
-20837=>3286,
-22914=>3287,
-23615=>3288,
-38894=>3289,
-20219=>3290,
-22922=>3291,
-24525=>3292,
-35469=>3293,
-28641=>3294,
-31152=>3295,
-31074=>3296,
-23527=>3297,
-33905=>3298,
-29483=>3299,
-29105=>3300,
-24180=>3301,
-24565=>3302,
-25467=>3303,
-25754=>3304,
-29123=>3305,
-31896=>3306,
-20035=>3307,
-24316=>3308,
-20043=>3309,
-22492=>3310,
-22178=>3311,
-24745=>3312,
-28611=>3313,
-32013=>3314,
-33021=>3315,
-33075=>3316,
-33215=>3317,
-36786=>3318,
-35223=>3319,
-34468=>3320,
-24052=>3321,
-25226=>3322,
-25773=>3323,
-35207=>3324,
-26487=>3325,
-27874=>3326,
-27966=>3327,
-29750=>3328,
-30772=>3329,
-23110=>3330,
-32629=>3331,
-33453=>3332,
-12218=>3333,
-39340=>3333,
-20467=>3334,
-24259=>3335,
-25309=>3336,
-25490=>3337,
-25943=>3338,
-26479=>3339,
-30403=>3340,
-29260=>3341,
-32972=>3342,
-32954=>3343,
-36649=>3344,
-37197=>3345,
-20493=>3346,
-22521=>3347,
-23186=>3348,
-26757=>3349,
-26995=>3350,
-29028=>3351,
-29437=>3352,
-36023=>3353,
-22770=>3354,
-36064=>3355,
-38506=>3356,
-36889=>3357,
-34687=>3358,
-31204=>3359,
-30695=>3360,
-33833=>3361,
-20271=>3362,
-21093=>3363,
-21338=>3364,
-25293=>3365,
-26575=>3366,
-27850=>3367,
-12137=>3368,
-30333=>3368,
-31636=>3369,
-31893=>3370,
-33334=>3371,
-34180=>3372,
-36843=>3373,
-26333=>3374,
-28448=>3375,
-29190=>3376,
-32283=>3377,
-33707=>3378,
-39361=>3379,
-12008=>3380,
-40614=>3380,
-20989=>3381,
-31665=>3382,
-30834=>3383,
-31672=>3384,
-32903=>3385,
-31560=>3386,
-27368=>3387,
-24161=>3388,
-32908=>3389,
-30033=>3390,
-30048=>3391,
-12043=>3392,
-20843=>3392,
-37474=>3393,
-28300=>3394,
-30330=>3395,
-37271=>3396,
-39658=>3397,
-20240=>3398,
-32624=>3399,
-25244=>3400,
-31567=>3401,
-38309=>3402,
-40169=>3403,
-22138=>3404,
-22617=>3405,
-34532=>3406,
-38588=>3407,
-20276=>3408,
-21028=>3409,
-21322=>3410,
-21453=>3411,
-21467=>3412,
-24070=>3413,
-25644=>3414,
-26001=>3415,
-26495=>3416,
-27710=>3417,
-27726=>3418,
-29256=>3419,
-29359=>3420,
-29677=>3421,
-30036=>3422,
-32321=>3423,
-33324=>3424,
-34281=>3425,
-36009=>3426,
-31684=>3427,
-12196=>3428,
-37318=>3428,
-29033=>3429,
-38930=>3430,
-39151=>3431,
-25405=>3432,
-26217=>3433,
-30058=>3434,
-30436=>3435,
-30928=>3436,
-34115=>3437,
-34542=>3438,
-21290=>3439,
-21329=>3440,
-21542=>3441,
-22915=>3442,
-24199=>3443,
-24444=>3444,
-24754=>3445,
-25161=>3446,
-25209=>3447,
-25259=>3448,
-26000=>3449,
-12112=>3450,
-27604=>3450,
-27852=>3451,
-30130=>3452,
-12138=>3453,
-30382=>3453,
-30865=>3454,
-31192=>3455,
-32203=>3456,
-32631=>3457,
-32933=>3458,
-34987=>3459,
-35513=>3460,
-36027=>3461,
-36991=>3462,
-12206=>3463,
-38750=>3463,
-12214=>3464,
-39131=>3464,
-27147=>3465,
-31800=>3466,
-20633=>3467,
-23614=>3468,
-24494=>3469,
-26503=>3470,
-27608=>3471,
-29749=>3472,
-30473=>3473,
-32654=>3474,
-12240=>3475,
-40763=>3475,
-26570=>3476,
-31255=>3477,
-21305=>3478,
-12134=>3479,
-30091=>3479,
-39661=>3480,
-24422=>3481,
-33181=>3482,
-33777=>3483,
-32920=>3484,
-24380=>3485,
-24517=>3486,
-30050=>3487,
-31558=>3488,
-36924=>3489,
-26727=>3490,
-23019=>3491,
-23195=>3492,
-32016=>3493,
-30334=>3494,
-35628=>3495,
-20469=>3496,
-24426=>3497,
-27161=>3498,
-27703=>3499,
-28418=>3500,
-29922=>3501,
-31080=>3502,
-34920=>3503,
-35413=>3504,
-35961=>3505,
-24287=>3506,
-25551=>3507,
-30149=>3508,
-31186=>3509,
-33495=>3510,
-37672=>3511,
-37618=>3512,
-33948=>3513,
-34541=>3514,
-39981=>3515,
-21697=>3516,
-24428=>3517,
-25996=>3518,
-27996=>3519,
-28693=>3520,
-36007=>3521,
-36051=>3522,
-38971=>3523,
-25935=>3524,
-29942=>3525,
-19981=>3526,
-20184=>3527,
-22496=>3528,
-22827=>3529,
-23142=>3530,
-23500=>3531,
-20904=>3532,
-24067=>3533,
-24220=>3534,
-24598=>3535,
-25206=>3536,
-25975=>3537,
-26023=>3538,
-26222=>3539,
-28014=>3540,
-12119=>3541,
-29238=>3541,
-31526=>3542,
-33104=>3543,
-33178=>3544,
-33433=>3545,
-35676=>3546,
-36000=>3547,
-36070=>3548,
-36212=>3549,
-12201=>3550,
-38428=>3550,
-38468=>3551,
-20398=>3552,
-25771=>3553,
-27494=>3554,
-33310=>3555,
-33889=>3556,
-34154=>3557,
-37096=>3558,
-23553=>3559,
-26963=>3560,
-12213=>3561,
-39080=>3561,
-33914=>3562,
-34135=>3563,
-20239=>3564,
-21103=>3565,
-24489=>3566,
-24133=>3567,
-26381=>3568,
-31119=>3569,
-33145=>3570,
-35079=>3571,
-35206=>3572,
-28149=>3573,
-24343=>3574,
-25173=>3575,
-27832=>3576,
-20175=>3577,
-29289=>3578,
-39826=>3579,
-20998=>3580,
-21563=>3581,
-22132=>3582,
-22707=>3583,
-24996=>3584,
-25198=>3585,
-28954=>3586,
-22894=>3587,
-31881=>3588,
-31966=>3589,
-32027=>3590,
-38640=>3591,
-12098=>3592,
-25991=>3592,
-32862=>3593,
-19993=>3594,
-20341=>3595,
-20853=>3596,
-22592=>3597,
-24163=>3598,
-24179=>3599,
-24330=>3600,
-26564=>3601,
-20006=>3602,
-34109=>3603,
-38281=>3604,
-38491=>3605,
-12150=>3606,
-31859=>3606,
-12212=>3607,
-38913=>3607,
-20731=>3608,
-22721=>3609,
-30294=>3610,
-30887=>3611,
-21029=>3612,
-30629=>3613,
-34065=>3614,
-31622=>3615,
-20559=>3616,
-22793=>3617,
-12122=>3618,
-29255=>3618,
-31687=>3619,
-32232=>3620,
-36794=>3621,
-36820=>3622,
-36941=>3623,
-20415=>3624,
-21193=>3625,
-23081=>3626,
-24321=>3627,
-38829=>3628,
-20445=>3629,
-33303=>3630,
-37610=>3631,
-22275=>3632,
-25429=>3633,
-27497=>3634,
-29995=>3635,
-35036=>3636,
-36628=>3637,
-31298=>3638,
-21215=>3639,
-22675=>3640,
-24917=>3641,
-25098=>3642,
-26286=>3643,
-11935=>3644,
-27597=>3644,
-31807=>3645,
-33769=>3646,
-20515=>3647,
-20472=>3648,
-21253=>3649,
-21574=>3650,
-22577=>3651,
-22857=>3652,
-23453=>3653,
-23792=>3654,
-23791=>3655,
-23849=>3656,
-24214=>3657,
-25265=>3658,
-25447=>3659,
-25918=>3660,
-12101=>3661,
-26041=>3661,
-26379=>3662,
-27861=>3663,
-27873=>3664,
-28921=>3665,
-30770=>3666,
-32299=>3667,
-32990=>3668,
-33459=>3669,
-33804=>3670,
-34028=>3671,
-34562=>3672,
-35090=>3673,
-35370=>3674,
-35914=>3675,
-37030=>3676,
-37586=>3677,
-39165=>3678,
-40179=>3679,
-40300=>3680,
-20047=>3681,
-20129=>3682,
-20621=>3683,
-21078=>3684,
-22346=>3685,
-22952=>3686,
-24125=>3687,
-24536=>3688,
-24537=>3689,
-25151=>3690,
-26292=>3691,
-26395=>3692,
-26576=>3693,
-26834=>3694,
-20882=>3695,
-32033=>3696,
-32938=>3697,
-33192=>3698,
-35584=>3699,
-35980=>3700,
-36031=>3701,
-37502=>3702,
-38450=>3703,
-21536=>3704,
-38956=>3705,
-21271=>3706,
-20693=>3707,
-12056=>3708,
-21340=>3708,
-22696=>3709,
-25778=>3710,
-26420=>3711,
-29287=>3712,
-30566=>3713,
-31302=>3714,
-37350=>3715,
-21187=>3716,
-27809=>3717,
-27526=>3718,
-22528=>3719,
-24140=>3720,
-22868=>3721,
-26412=>3722,
-32763=>3723,
-20961=>3724,
-30406=>3725,
-25705=>3726,
-30952=>3727,
-39764=>3728,
-12231=>3729,
-40635=>3729,
-22475=>3730,
-22969=>3731,
-26151=>3732,
-26522=>3733,
-27598=>3734,
-21737=>3735,
-27097=>3736,
-24149=>3737,
-33180=>3738,
-26517=>3739,
-39850=>3740,
-26622=>3741,
-40018=>3742,
-26717=>3743,
-20134=>3744,
-20451=>3745,
-12060=>3746,
-21448=>3746,
-25273=>3747,
-26411=>3748,
-27819=>3749,
-36804=>3750,
-20397=>3751,
-32365=>3752,
-40639=>3753,
-19975=>3754,
-24930=>3755,
-28288=>3756,
-28459=>3757,
-34067=>3758,
-21619=>3759,
-26410=>3760,
-39749=>3761,
-11922=>3762,
-24051=>3762,
-31637=>3763,
-23724=>3764,
-23494=>3765,
-34588=>3766,
-28234=>3767,
-34001=>3768,
-31252=>3769,
-33032=>3770,
-22937=>3771,
-31885=>3772,
-11936=>3773,
-27665=>3773,
-30496=>3774,
-21209=>3775,
-22818=>3776,
-28961=>3777,
-29279=>3778,
-12141=>3779,
-30683=>3779,
-38695=>3780,
-40289=>3781,
-26891=>3782,
-23167=>3783,
-23064=>3784,
-20901=>3785,
-21517=>3786,
-21629=>3787,
-26126=>3788,
-30431=>3789,
-36855=>3790,
-37528=>3791,
-40180=>3792,
-23018=>3793,
-29277=>3794,
-28357=>3795,
-20813=>3796,
-26825=>3797,
-32191=>3798,
-32236=>3799,
-12207=>3800,
-38754=>3800,
-40634=>3801,
-25720=>3802,
-27169=>3803,
-33538=>3804,
-22916=>3805,
-23391=>3806,
-12113=>3807,
-27611=>3807,
-29467=>3808,
-30450=>3809,
-32178=>3810,
-32791=>3811,
-33945=>3812,
-20786=>3813,
-12106=>3814,
-26408=>3814,
-40665=>3815,
-12140=>3816,
-30446=>3816,
-26466=>3817,
-21247=>3818,
-39173=>3819,
-23588=>3820,
-25147=>3821,
-31870=>3822,
-36016=>3823,
-21839=>3824,
-24758=>3825,
-32011=>3826,
-12200=>3827,
-38272=>3827,
-21249=>3828,
-20063=>3829,
-20918=>3830,
-22812=>3831,
-29242=>3832,
-32822=>3833,
-37326=>3834,
-24357=>3835,
-12142=>3836,
-30690=>3836,
-21380=>3837,
-24441=>3838,
-32004=>3839,
-34220=>3840,
-35379=>3841,
-36493=>3842,
-38742=>3843,
-26611=>3844,
-34222=>3845,
-37971=>3846,
-24841=>3847,
-24840=>3848,
-27833=>3849,
-30290=>3850,
-35565=>3851,
-36664=>3852,
-21807=>3853,
-20305=>3854,
-20778=>3855,
-21191=>3856,
-21451=>3857,
-23461=>3858,
-24189=>3859,
-24736=>3860,
-24962=>3861,
-25558=>3862,
-26377=>3863,
-26586=>3864,
-28263=>3865,
-28044=>3866,
-29494=>3867,
-29495=>3868,
-30001=>3869,
-31056=>3870,
-35029=>3871,
-35480=>3872,
-36938=>3873,
-12194=>3874,
-37009=>3874,
-37109=>3875,
-38596=>3876,
-34701=>3877,
-12067=>3878,
-22805=>3878,
-20104=>3879,
-20313=>3880,
-19982=>3881,
-35465=>3882,
-36671=>3883,
-38928=>3884,
-20653=>3885,
-24188=>3886,
-22934=>3887,
-23481=>3888,
-24248=>3889,
-25562=>3890,
-25594=>3891,
-25793=>3892,
-26332=>3893,
-26954=>3894,
-27096=>3895,
-27915=>3896,
-28342=>3897,
-29076=>3898,
-12132=>3899,
-29992=>3899,
-31407=>3900,
-12154=>3901,
-32650=>3901,
-32768=>3902,
-33865=>3903,
-33993=>3904,
-35201=>3905,
-35617=>3906,
-36362=>3907,
-36965=>3908,
-38525=>3909,
-39178=>3910,
-24958=>3911,
-25233=>3912,
-27442=>3913,
-27779=>3914,
-28020=>3915,
-32716=>3916,
-32764=>3917,
-28096=>3918,
-32645=>3919,
-34746=>3920,
-35064=>3921,
-26469=>3922,
-33713=>3923,
-38972=>3924,
-38647=>3925,
-27931=>3926,
-32097=>3927,
-33853=>3928,
-37226=>3929,
-20081=>3930,
-21365=>3931,
-23888=>3932,
-27396=>3933,
-28651=>3934,
-34253=>3935,
-34349=>3936,
-35239=>3937,
-21033=>3938,
-21519=>3939,
-23653=>3940,
-26446=>3941,
-26792=>3942,
-29702=>3943,
-29827=>3944,
-30178=>3945,
-35023=>3946,
-35041=>3947,
-12197=>3948,
-37324=>3948,
-38626=>3949,
-38520=>3950,
-24459=>3951,
-29575=>3952,
-12148=>3953,
-31435=>3953,
-33870=>3954,
-25504=>3955,
-30053=>3956,
-21129=>3957,
-27969=>3958,
-28316=>3959,
-29705=>3960,
-30041=>3961,
-30827=>3962,
-31890=>3963,
-38534=>3964,
-12015=>3965,
-31452=>3965,
-12243=>3966,
-40845=>3966,
-20406=>3967,
-24942=>3968,
-26053=>3969,
-34396=>3970,
-20102=>3971,
-20142=>3972,
-20698=>3973,
-20001=>3974,
-20940=>3975,
-23534=>3976,
-26009=>3977,
-26753=>3978,
-28092=>3979,
-29471=>3980,
-30274=>3981,
-30637=>3982,
-31260=>3983,
-31975=>3984,
-33391=>3985,
-35538=>3986,
-36988=>3987,
-37327=>3988,
-38517=>3989,
-38936=>3990,
-12050=>3991,
-21147=>3991,
-32209=>3992,
-20523=>3993,
-21400=>3994,
-26519=>3995,
-28107=>3996,
-29136=>3997,
-29747=>3998,
-33256=>3999,
-36650=>4000,
-38563=>4001,
-40023=>4002,
-40607=>4003,
-29792=>4004,
-22593=>4005,
-28057=>4006,
-32047=>4007,
-39006=>4008,
-20196=>4009,
-20278=>4010,
-20363=>4011,
-20919=>4012,
-21169=>4013,
-23994=>4014,
-24604=>4015,
-29618=>4016,
-31036=>4017,
-33491=>4018,
-37428=>4019,
-38583=>4020,
-38646=>4021,
-38666=>4022,
-40599=>4023,
-40802=>4024,
-26278=>4025,
-27508=>4026,
-21015=>4027,
-21155=>4028,
-28872=>4029,
-35010=>4030,
-24265=>4031,
-24651=>4032,
-24976=>4033,
-28451=>4034,
-29001=>4035,
-31806=>4036,
-32244=>4037,
-32879=>4038,
-34030=>4039,
-36899=>4040,
-37676=>4041,
-21570=>4042,
-39791=>4043,
-27347=>4044,
-28809=>4045,
-36034=>4046,
-36335=>4047,
-38706=>4048,
-21172=>4049,
-23105=>4050,
-24266=>4051,
-24324=>4052,
-26391=>4053,
-27004=>4054,
-27028=>4055,
-28010=>4056,
-28431=>4057,
-29282=>4058,
-29436=>4059,
-31725=>4060,
-12156=>4061,
-32769=>4061,
-32894=>4062,
-34635=>4063,
-37070=>4064,
-20845=>4065,
-40595=>4066,
-31108=>4067,
-32907=>4068,
-37682=>4069,
-35542=>4070,
-20525=>4071,
-21644=>4072,
-35441=>4073,
-27498=>4074,
-36036=>4075,
-33031=>4076,
-24785=>4077,
-26528=>4078,
-40434=>4079,
-20121=>4080,
-20120=>4081,
-39952=>4082,
-35435=>4083,
-34241=>4084,
-34152=>4085,
-26880=>4086,
-28286=>4087,
-30871=>4088,
-33109=>4089,
-24332=>4090,
-19984=>4091,
-19989=>4092,
-20010=>4093,
-20017=>4094,
-12034=>4095,
-20022=>4095,
-20028=>4096,
-12035=>4097,
-20031=>4097,
-20034=>4098,
-20054=>4099,
-20056=>4100,
-20098=>4101,
-12037=>4102,
-20101=>4102,
-35947=>4103,
-20106=>4104,
-33298=>4105,
-24333=>4106,
-20110=>4107,
-20126=>4108,
-20127=>4109,
-12039=>4110,
-20128=>4110,
-20130=>4111,
-20144=>4112,
-20147=>4113,
-20150=>4114,
-20174=>4115,
-20173=>4116,
-20164=>4117,
-20166=>4118,
-20162=>4119,
-20183=>4120,
-20190=>4121,
-20205=>4122,
-20191=>4123,
-20215=>4124,
-20233=>4125,
-20314=>4126,
-20272=>4127,
-20315=>4128,
-20317=>4129,
-20311=>4130,
-20295=>4131,
-20342=>4132,
-20360=>4133,
-20367=>4134,
-20376=>4135,
-20347=>4136,
-20329=>4137,
-20336=>4138,
-20369=>4139,
-20335=>4140,
-20358=>4141,
-20374=>4142,
-20760=>4143,
-20436=>4144,
-20447=>4145,
-20430=>4146,
-20440=>4147,
-20443=>4148,
-20433=>4149,
-20442=>4150,
-20432=>4151,
-20452=>4152,
-20453=>4153,
-20506=>4154,
-20520=>4155,
-20500=>4156,
-20522=>4157,
-20517=>4158,
-20485=>4159,
-20252=>4160,
-20470=>4161,
-20513=>4162,
-20521=>4163,
-20524=>4164,
-20478=>4165,
-20463=>4166,
-20497=>4167,
-20486=>4168,
-20547=>4169,
-20551=>4170,
-26371=>4171,
-20565=>4172,
-20560=>4173,
-20552=>4174,
-20570=>4175,
-20566=>4176,
-20588=>4177,
-20600=>4178,
-20608=>4179,
-20634=>4180,
-20613=>4181,
-20660=>4182,
-20658=>4183,
-20681=>4184,
-20682=>4185,
-20659=>4186,
-20674=>4187,
-20694=>4188,
-20702=>4189,
-20709=>4190,
-20717=>4191,
-20707=>4192,
-20718=>4193,
-20729=>4194,
-20725=>4195,
-20745=>4196,
-20737=>4197,
-20738=>4198,
-20758=>4199,
-20757=>4200,
-20756=>4201,
-20762=>4202,
-20769=>4203,
-20794=>4204,
-20791=>4205,
-20796=>4206,
-20795=>4207,
-12041=>4208,
-20799=>4208,
-11918=>4209,
-20800=>4209,
-20818=>4210,
-20812=>4211,
-20820=>4212,
-20834=>4213,
-31480=>4214,
-20841=>4215,
-20842=>4216,
-20846=>4217,
-20864=>4218,
-12044=>4219,
-20866=>4219,
-22232=>4220,
-20876=>4221,
-20873=>4222,
-20879=>4223,
-20881=>4224,
-20883=>4225,
-20885=>4226,
-12045=>4227,
-20886=>4227,
-20900=>4228,
-20902=>4229,
-20898=>4230,
-20905=>4231,
-20906=>4232,
-12046=>4233,
-20907=>4233,
-20915=>4234,
-20913=>4235,
-20914=>4236,
-20912=>4237,
-20917=>4238,
-20925=>4239,
-20933=>4240,
-20937=>4241,
-20955=>4242,
-12047=>4243,
-20960=>4243,
-34389=>4244,
-20969=>4245,
-20973=>4246,
-20976=>4247,
-12048=>4248,
-20981=>4248,
-20990=>4249,
-20996=>4250,
-21003=>4251,
-21012=>4252,
-21006=>4253,
-21031=>4254,
-21034=>4255,
-21038=>4256,
-21043=>4257,
-21049=>4258,
-21071=>4259,
-21060=>4260,
-21067=>4261,
-21068=>4262,
-21086=>4263,
-21076=>4264,
-21098=>4265,
-21108=>4266,
-21097=>4267,
-21107=>4268,
-21119=>4269,
-21117=>4270,
-21133=>4271,
-21140=>4272,
-21138=>4273,
-21105=>4274,
-21128=>4275,
-21137=>4276,
-36776=>4277,
-36775=>4278,
-21164=>4279,
-21165=>4280,
-21180=>4281,
-21173=>4282,
-21185=>4283,
-21197=>4284,
-21207=>4285,
-21214=>4286,
-21219=>4287,
-21222=>4288,
-39149=>4289,
-21216=>4290,
-21235=>4291,
-21237=>4292,
-21240=>4293,
-12051=>4294,
-21241=>4294,
-21254=>4295,
-21256=>4296,
-30008=>4297,
-21261=>4298,
-21264=>4299,
-21263=>4300,
-21269=>4301,
-12052=>4301,
-21274=>4302,
-12053=>4302,
-21283=>4303,
-21295=>4304,
-21297=>4305,
-21299=>4306,
-12054=>4307,
-21304=>4307,
-21312=>4308,
-21318=>4309,
-21317=>4310,
-19991=>4311,
-21321=>4312,
-21325=>4313,
-20950=>4314,
-21342=>4315,
-12057=>4316,
-21353=>4316,
-21358=>4317,
-22808=>4318,
-21371=>4319,
-21367=>4320,
-12058=>4321,
-21378=>4321,
-21398=>4322,
-21408=>4323,
-21414=>4324,
-21413=>4325,
-21422=>4326,
-21424=>4327,
-12059=>4328,
-21430=>4328,
-21443=>4329,
-31762=>4330,
-38617=>4331,
-21471=>4332,
-26364=>4333,
-29166=>4334,
-21486=>4335,
-21480=>4336,
-21485=>4337,
-21498=>4338,
-21505=>4339,
-21565=>4340,
-21568=>4341,
-21548=>4342,
-21549=>4343,
-21564=>4344,
-21550=>4345,
-21558=>4346,
-21545=>4347,
-21533=>4348,
-21582=>4349,
-21647=>4350,
-21621=>4351,
-21646=>4352,
-21599=>4353,
-21617=>4354,
-21623=>4355,
-21616=>4356,
-21650=>4357,
-21627=>4358,
-21632=>4359,
-21622=>4360,
-21636=>4361,
-21648=>4362,
-21638=>4363,
-21703=>4364,
-21666=>4365,
-21688=>4366,
-21669=>4367,
-21676=>4368,
-21700=>4369,
-21704=>4370,
-21672=>4371,
-21675=>4372,
-21698=>4373,
-21668=>4374,
-21694=>4375,
-21692=>4376,
-21720=>4377,
-21733=>4378,
-21734=>4379,
-21775=>4380,
-21780=>4381,
-21757=>4382,
-21742=>4383,
-21741=>4384,
-21754=>4385,
-21730=>4386,
-21817=>4387,
-21824=>4388,
-21859=>4389,
-21836=>4390,
-21806=>4391,
-21852=>4392,
-21829=>4393,
-21846=>4394,
-21847=>4395,
-21816=>4396,
-21811=>4397,
-21853=>4398,
-21913=>4399,
-21888=>4400,
-21679=>4401,
-21898=>4402,
-21919=>4403,
-21883=>4404,
-21886=>4405,
-21912=>4406,
-21918=>4407,
-21934=>4408,
-21884=>4409,
-21891=>4410,
-21929=>4411,
-21895=>4412,
-21928=>4413,
-21978=>4414,
-21957=>4415,
-21983=>4416,
-21956=>4417,
-21980=>4418,
-21988=>4419,
-21972=>4420,
-22036=>4421,
-22007=>4422,
-22038=>4423,
-22014=>4424,
-22013=>4425,
-22043=>4426,
-22009=>4427,
-22094=>4428,
-22096=>4429,
-29151=>4430,
-22068=>4431,
-22070=>4432,
-22066=>4433,
-22072=>4434,
-22123=>4435,
-22116=>4436,
-22063=>4437,
-22124=>4438,
-22122=>4439,
-22150=>4440,
-22144=>4441,
-22154=>4442,
-22176=>4443,
-22164=>4444,
-22159=>4445,
-22181=>4446,
-22190=>4447,
-22198=>4448,
-22196=>4449,
-22210=>4450,
-22204=>4451,
-22209=>4452,
-22211=>4453,
-22208=>4454,
-22216=>4455,
-22222=>4456,
-22225=>4457,
-22227=>4458,
-12062=>4459,
-22231=>4459,
-22254=>4460,
-22265=>4461,
-22272=>4462,
-22271=>4463,
-22276=>4464,
-22281=>4465,
-22280=>4466,
-22283=>4467,
-22285=>4468,
-22291=>4469,
-22296=>4470,
-22294=>4471,
-21959=>4472,
-22300=>4473,
-22310=>4474,
-22327=>4475,
-22328=>4476,
-22350=>4477,
-22331=>4478,
-22336=>4479,
-22351=>4480,
-22377=>4481,
-22464=>4482,
-22408=>4483,
-22369=>4484,
-22399=>4485,
-22409=>4486,
-22419=>4487,
-22432=>4488,
-22451=>4489,
-22436=>4490,
-22442=>4491,
-22448=>4492,
-22467=>4493,
-22470=>4494,
-22484=>4495,
-22482=>4496,
-22483=>4497,
-22538=>4498,
-22486=>4499,
-22499=>4500,
-22539=>4501,
-22553=>4502,
-22557=>4503,
-22642=>4504,
-22561=>4505,
-22626=>4506,
-22603=>4507,
-22640=>4508,
-27584=>4509,
-22610=>4510,
-22589=>4511,
-22649=>4512,
-22661=>4513,
-22713=>4514,
-22687=>4515,
-22699=>4516,
-22714=>4517,
-22750=>4518,
-22715=>4519,
-22712=>4520,
-22702=>4521,
-22725=>4522,
-22739=>4523,
-22737=>4524,
-22743=>4525,
-22745=>4526,
-22744=>4527,
-22757=>4528,
-22748=>4529,
-22756=>4530,
-22751=>4531,
-22767=>4532,
-22778=>4533,
-22777=>4534,
-22779=>4535,
-22780=>4536,
-22781=>4537,
-22786=>4538,
-12065=>4538,
-22794=>4539,
-12066=>4539,
-22800=>4540,
-22811=>4541,
-26790=>4542,
-22821=>4543,
-22828=>4544,
-22829=>4545,
-22834=>4546,
-22840=>4547,
-22846=>4548,
-31442=>4549,
-22869=>4550,
-22864=>4551,
-22862=>4552,
-22874=>4553,
-22872=>4554,
-22882=>4555,
-22880=>4556,
-22887=>4557,
-22892=>4558,
-22889=>4559,
-22904=>4560,
-22913=>4561,
-22941=>4562,
-20318=>4563,
-20395=>4564,
-22947=>4565,
-22962=>4566,
-22982=>4567,
-23016=>4568,
-23004=>4569,
-22925=>4570,
-23001=>4571,
-23002=>4572,
-23077=>4573,
-23071=>4574,
-23057=>4575,
-23068=>4576,
-23049=>4577,
-23066=>4578,
-23104=>4579,
-23148=>4580,
-23113=>4581,
-23093=>4582,
-23094=>4583,
-23138=>4584,
-23146=>4585,
-23194=>4586,
-23228=>4587,
-23230=>4588,
-23243=>4589,
-23234=>4590,
-23229=>4591,
-23267=>4592,
-23255=>4593,
-23270=>4594,
-23273=>4595,
-23254=>4596,
-23290=>4597,
-23291=>4598,
-23308=>4599,
-23307=>4600,
-23318=>4601,
-23346=>4602,
-23248=>4603,
-23338=>4604,
-23350=>4605,
-23358=>4606,
-23363=>4607,
-23365=>4608,
-23360=>4609,
-23377=>4610,
-23381=>4611,
-23386=>4612,
-23387=>4613,
-23397=>4614,
-23401=>4615,
-23408=>4616,
-23411=>4617,
-23413=>4618,
-23416=>4619,
-25992=>4620,
-23418=>4621,
-12071=>4622,
-23424=>4622,
-23427=>4623,
-23462=>4624,
-23480=>4625,
-23491=>4626,
-23495=>4627,
-23497=>4628,
-23508=>4629,
-23504=>4630,
-23524=>4631,
-23526=>4632,
-23522=>4633,
-23518=>4634,
-23525=>4635,
-23531=>4636,
-23536=>4637,
-23542=>4638,
-23539=>4639,
-23557=>4640,
-23559=>4641,
-23560=>4642,
-23565=>4643,
-23571=>4644,
-23584=>4645,
-11920=>4646,
-12074=>4646,
-23586=>4646,
-23592=>4647,
-12075=>4648,
-23608=>4648,
-23609=>4649,
-23617=>4650,
-23622=>4651,
-23630=>4652,
-23635=>4653,
-23632=>4654,
-23631=>4655,
-23409=>4656,
-23660=>4657,
-12076=>4658,
-23662=>4658,
-20066=>4659,
-23670=>4660,
-23673=>4661,
-23692=>4662,
-23697=>4663,
-23700=>4664,
-22939=>4665,
-23723=>4666,
-23739=>4667,
-23734=>4668,
-23740=>4669,
-23735=>4670,
-23749=>4671,
-23742=>4672,
-23751=>4673,
-23769=>4674,
-23785=>4675,
-23805=>4676,
-23802=>4677,
-23789=>4678,
-23948=>4679,
-23786=>4680,
-23819=>4681,
-23829=>4682,
-23831=>4683,
-23900=>4684,
-23839=>4685,
-23835=>4686,
-23825=>4687,
-23828=>4688,
-23842=>4689,
-23834=>4690,
-23833=>4691,
-23832=>4692,
-23884=>4693,
-23890=>4694,
-23886=>4695,
-23883=>4696,
-23916=>4697,
-23923=>4698,
-23926=>4699,
-23943=>4700,
-23940=>4701,
-23938=>4702,
-23970=>4703,
-23965=>4704,
-23980=>4705,
-23982=>4706,
-23997=>4707,
-23952=>4708,
-23991=>4709,
-23996=>4710,
-24009=>4711,
-24013=>4712,
-24019=>4713,
-24018=>4714,
-24022=>4715,
-12078=>4716,
-24027=>4716,
-24043=>4717,
-24050=>4718,
-24053=>4719,
-24075=>4720,
-24090=>4721,
-24089=>4722,
-24081=>4723,
-24091=>4724,
-24118=>4725,
-24119=>4726,
-24132=>4727,
-24131=>4728,
-24128=>4729,
-24142=>4730,
-24151=>4731,
-24148=>4732,
-24159=>4733,
-24162=>4734,
-24164=>4735,
-24135=>4736,
-24181=>4737,
-24182=>4738,
-11923=>4739,
-12083=>4739,
-24186=>4739,
-40636=>4740,
-12084=>4741,
-24191=>4741,
-24224=>4742,
-24257=>4743,
-24258=>4744,
-24264=>4745,
-24272=>4746,
-24271=>4747,
-24278=>4748,
-24291=>4749,
-24285=>4750,
-24282=>4751,
-24283=>4752,
-24290=>4753,
-24289=>4754,
-24296=>4755,
-24297=>4756,
-24300=>4757,
-24305=>4758,
-24307=>4759,
-24304=>4760,
-12085=>4761,
-24308=>4761,
-24312=>4762,
-12086=>4763,
-24318=>4763,
-24323=>4764,
-24329=>4765,
-24413=>4766,
-24412=>4767,
-12087=>4768,
-24331=>4768,
-24337=>4769,
-24342=>4770,
-24361=>4771,
-24365=>4772,
-24376=>4773,
-24385=>4774,
-24392=>4775,
-24396=>4776,
-24398=>4777,
-24367=>4778,
-11924=>4779,
-24401=>4779,
-24406=>4780,
-24407=>4781,
-24409=>4782,
-12090=>4783,
-24417=>4783,
-24429=>4784,
-12091=>4785,
-24435=>4785,
-24439=>4786,
-24451=>4787,
-24450=>4788,
-24447=>4789,
-24458=>4790,
-24456=>4791,
-24465=>4792,
-24455=>4793,
-24478=>4794,
-24473=>4795,
-24472=>4796,
-24480=>4797,
-24488=>4798,
-24493=>4799,
-24508=>4800,
-24534=>4801,
-24571=>4802,
-24548=>4803,
-24568=>4804,
-24561=>4805,
-24541=>4806,
-24755=>4807,
-24575=>4808,
-24609=>4809,
-24672=>4810,
-24601=>4811,
-24592=>4812,
-24617=>4813,
-24590=>4814,
-24625=>4815,
-24603=>4816,
-24597=>4817,
-24619=>4818,
-24614=>4819,
-24591=>4820,
-24634=>4821,
-24666=>4822,
-24641=>4823,
-24682=>4824,
-24695=>4825,
-24671=>4826,
-24650=>4827,
-24646=>4828,
-24653=>4829,
-24675=>4830,
-24643=>4831,
-24676=>4832,
-24642=>4833,
-24684=>4834,
-24683=>4835,
-24665=>4836,
-24705=>4837,
-24717=>4838,
-24807=>4839,
-24707=>4840,
-24730=>4841,
-24708=>4842,
-24731=>4843,
-24726=>4844,
-24727=>4845,
-24722=>4846,
-24743=>4847,
-24715=>4848,
-24801=>4849,
-24760=>4850,
-24800=>4851,
-24787=>4852,
-24756=>4853,
-24560=>4854,
-24765=>4855,
-24774=>4856,
-24757=>4857,
-24792=>4858,
-24909=>4859,
-24853=>4860,
-24838=>4861,
-24822=>4862,
-24823=>4863,
-24832=>4864,
-24820=>4865,
-24826=>4866,
-24835=>4867,
-24865=>4868,
-24827=>4869,
-24817=>4870,
-24845=>4871,
-24846=>4872,
-24903=>4873,
-24894=>4874,
-24872=>4875,
-24871=>4876,
-24906=>4877,
-24895=>4878,
-24892=>4879,
-24876=>4880,
-24884=>4881,
-24893=>4882,
-24898=>4883,
-24900=>4884,
-24947=>4885,
-24951=>4886,
-24920=>4887,
-24921=>4888,
-24922=>4889,
-24939=>4890,
-24948=>4891,
-24943=>4892,
-24933=>4893,
-24945=>4894,
-24927=>4895,
-24925=>4896,
-24915=>4897,
-24949=>4898,
-24985=>4899,
-24982=>4900,
-24967=>4901,
-25004=>4902,
-24980=>4903,
-24986=>4904,
-24970=>4905,
-24977=>4906,
-25003=>4907,
-25006=>4908,
-25036=>4909,
-25034=>4910,
-25033=>4911,
-25079=>4912,
-25032=>4913,
-25027=>4914,
-25030=>4915,
-25018=>4916,
-25035=>4917,
-32633=>4918,
-25037=>4919,
-25062=>4920,
-25059=>4921,
-25078=>4922,
-25082=>4923,
-25076=>4924,
-25087=>4925,
-25085=>4926,
-25084=>4927,
-25086=>4928,
-25088=>4929,
-12093=>4930,
-25096=>4930,
-25097=>4931,
-25101=>4932,
-25100=>4933,
-25108=>4934,
-25115=>4935,
-25118=>4936,
-25121=>4937,
-25130=>4938,
-25134=>4939,
-25136=>4940,
-25138=>4941,
-25139=>4942,
-25153=>4943,
-25166=>4944,
-25182=>4945,
-25187=>4946,
-25179=>4947,
-25184=>4948,
-25192=>4949,
-25212=>4950,
-25218=>4951,
-25225=>4952,
-25214=>4953,
-25234=>4954,
-25235=>4955,
-25238=>4956,
-25300=>4957,
-25219=>4958,
-25236=>4959,
-25303=>4960,
-25297=>4961,
-25275=>4962,
-25295=>4963,
-25343=>4964,
-25286=>4965,
-25812=>4966,
-25288=>4967,
-25308=>4968,
-25292=>4969,
-25290=>4970,
-25282=>4971,
-25287=>4972,
-25243=>4973,
-25289=>4974,
-25356=>4975,
-25326=>4976,
-25329=>4977,
-25383=>4978,
-25346=>4979,
-25352=>4980,
-25327=>4981,
-25333=>4982,
-25424=>4983,
-25406=>4984,
-25421=>4985,
-25628=>4986,
-25423=>4987,
-25494=>4988,
-25486=>4989,
-25472=>4990,
-25515=>4991,
-25462=>4992,
-25507=>4993,
-25487=>4994,
-25481=>4995,
-25503=>4996,
-25525=>4997,
-25451=>4998,
-25449=>4999,
-25534=>5000,
-25577=>5001,
-25536=>5002,
-25542=>5003,
-25571=>5004,
-25545=>5005,
-25554=>5006,
-25590=>5007,
-25540=>5008,
-25622=>5009,
-25652=>5010,
-25606=>5011,
-25619=>5012,
-25638=>5013,
-25654=>5014,
-25885=>5015,
-25623=>5016,
-25640=>5017,
-25615=>5018,
-25703=>5019,
-25711=>5020,
-25718=>5021,
-25678=>5022,
-25898=>5023,
-25749=>5024,
-25747=>5025,
-25765=>5026,
-25769=>5027,
-25736=>5028,
-25788=>5029,
-25818=>5030,
-25810=>5031,
-25797=>5032,
-25799=>5033,
-25787=>5034,
-25816=>5035,
-25794=>5036,
-25841=>5037,
-25831=>5038,
-33289=>5039,
-25824=>5040,
-25825=>5041,
-25260=>5042,
-25827=>5043,
-25839=>5044,
-25900=>5045,
-25846=>5046,
-25844=>5047,
-25842=>5048,
-25850=>5049,
-25856=>5050,
-25853=>5051,
-25880=>5052,
-25884=>5053,
-25861=>5054,
-25892=>5055,
-25891=>5056,
-25899=>5057,
-12097=>5058,
-25908=>5058,
-11929=>5059,
-25909=>5059,
-25911=>5060,
-25910=>5061,
-25912=>5062,
-30027=>5063,
-25928=>5064,
-25942=>5065,
-25941=>5066,
-25933=>5067,
-25944=>5068,
-25950=>5069,
-25949=>5070,
-25970=>5071,
-25976=>5072,
-25986=>5073,
-25987=>5074,
-35722=>5075,
-26011=>5076,
-26015=>5077,
-26027=>5078,
-26039=>5079,
-26051=>5080,
-26054=>5081,
-26049=>5082,
-26052=>5083,
-26060=>5084,
-26066=>5085,
-26075=>5086,
-26073=>5087,
-12102=>5088,
-26080=>5088,
-11931=>5089,
-26081=>5089,
-26097=>5090,
-26482=>5091,
-26122=>5092,
-26115=>5093,
-26107=>5094,
-26483=>5095,
-26165=>5096,
-26166=>5097,
-26164=>5098,
-26140=>5099,
-26191=>5100,
-26180=>5101,
-26185=>5102,
-26177=>5103,
-26206=>5104,
-26205=>5105,
-26212=>5106,
-26215=>5107,
-26216=>5108,
-26207=>5109,
-26210=>5110,
-26224=>5111,
-26243=>5112,
-26248=>5113,
-26254=>5114,
-26249=>5115,
-26244=>5116,
-26264=>5117,
-26269=>5118,
-26305=>5119,
-26297=>5120,
-26313=>5121,
-26302=>5122,
-26300=>5123,
-26308=>5124,
-26296=>5125,
-26326=>5126,
-26330=>5127,
-26336=>5128,
-26175=>5129,
-26342=>5130,
-26345=>5131,
-12104=>5132,
-26352=>5132,
-26357=>5133,
-26359=>5134,
-26383=>5135,
-26390=>5136,
-26398=>5137,
-26406=>5138,
-26407=>5139,
-38712=>5140,
-26414=>5141,
-26431=>5142,
-26422=>5143,
-26433=>5144,
-26424=>5145,
-26423=>5146,
-26438=>5147,
-26462=>5148,
-26464=>5149,
-26457=>5150,
-26467=>5151,
-26468=>5152,
-26505=>5153,
-26480=>5154,
-26537=>5155,
-26492=>5156,
-26474=>5157,
-26508=>5158,
-26507=>5159,
-26534=>5160,
-26529=>5161,
-26501=>5162,
-26551=>5163,
-26607=>5164,
-26548=>5165,
-26604=>5166,
-26547=>5167,
-26601=>5168,
-26552=>5169,
-26596=>5170,
-26590=>5171,
-26589=>5172,
-26594=>5173,
-26606=>5174,
-26553=>5175,
-26574=>5176,
-26566=>5177,
-26599=>5178,
-27292=>5179,
-26654=>5180,
-26694=>5181,
-26665=>5182,
-26688=>5183,
-26701=>5184,
-26674=>5185,
-26702=>5186,
-26803=>5187,
-26667=>5188,
-26713=>5189,
-26723=>5190,
-26743=>5191,
-26751=>5192,
-26783=>5193,
-26767=>5194,
-26797=>5195,
-26772=>5196,
-26781=>5197,
-26779=>5198,
-26755=>5199,
-27310=>5200,
-26809=>5201,
-26740=>5202,
-26805=>5203,
-26784=>5204,
-26810=>5205,
-26895=>5206,
-26765=>5207,
-26750=>5208,
-26881=>5209,
-26826=>5210,
-26888=>5211,
-26840=>5212,
-26914=>5213,
-26918=>5214,
-26849=>5215,
-26892=>5216,
-26829=>5217,
-26836=>5218,
-26855=>5219,
-26837=>5220,
-26934=>5221,
-26898=>5222,
-26884=>5223,
-26839=>5224,
-26851=>5225,
-26917=>5226,
-26873=>5227,
-26848=>5228,
-26863=>5229,
-26920=>5230,
-26922=>5231,
-26906=>5232,
-26915=>5233,
-26913=>5234,
-26822=>5235,
-27001=>5236,
-26999=>5237,
-26972=>5238,
-27000=>5239,
-26987=>5240,
-26964=>5241,
-27006=>5242,
-26990=>5243,
-26937=>5244,
-26996=>5245,
-26941=>5246,
-26969=>5247,
-26928=>5248,
-26977=>5249,
-26974=>5250,
-26973=>5251,
-27009=>5252,
-26986=>5253,
-27058=>5254,
-27054=>5255,
-27088=>5256,
-27071=>5257,
-27073=>5258,
-27091=>5259,
-27070=>5260,
-27086=>5261,
-23528=>5262,
-27082=>5263,
-27101=>5264,
-27067=>5265,
-27075=>5266,
-27047=>5267,
-27182=>5268,
-27025=>5269,
-27040=>5270,
-27036=>5271,
-27029=>5272,
-27060=>5273,
-27102=>5274,
-27112=>5275,
-27138=>5276,
-27163=>5277,
-27135=>5278,
-27402=>5279,
-27129=>5280,
-27122=>5281,
-27111=>5282,
-27141=>5283,
-27057=>5284,
-27166=>5285,
-27117=>5286,
-27156=>5287,
-27115=>5288,
-27146=>5289,
-27154=>5290,
-27329=>5291,
-27171=>5292,
-27155=>5293,
-27204=>5294,
-27148=>5295,
-27250=>5296,
-27190=>5297,
-27256=>5298,
-27207=>5299,
-27234=>5300,
-27225=>5301,
-27238=>5302,
-27208=>5303,
-27192=>5304,
-27170=>5305,
-27280=>5306,
-27277=>5307,
-27296=>5308,
-27268=>5309,
-27298=>5310,
-27299=>5311,
-27287=>5312,
-34327=>5313,
-27323=>5314,
-27331=>5315,
-27330=>5316,
-27320=>5317,
-27315=>5318,
-27308=>5319,
-27358=>5320,
-27345=>5321,
-27359=>5322,
-27306=>5323,
-27354=>5324,
-27370=>5325,
-27387=>5326,
-27397=>5327,
-34326=>5328,
-27386=>5329,
-27410=>5330,
-27414=>5331,
-39729=>5332,
-27423=>5333,
-27448=>5334,
-27447=>5335,
-30428=>5336,
-27449=>5337,
-39150=>5338,
-27463=>5339,
-27459=>5340,
-27465=>5341,
-27472=>5342,
-27481=>5343,
-27476=>5344,
-27483=>5345,
-27487=>5346,
-27489=>5347,
-27512=>5348,
-12109=>5349,
-27513=>5349,
-27519=>5350,
-27520=>5351,
-27524=>5352,
-27523=>5353,
-27533=>5354,
-27544=>5355,
-27541=>5356,
-27550=>5357,
-27556=>5358,
-27562=>5359,
-27563=>5360,
-27567=>5361,
-27570=>5362,
-27569=>5363,
-12110=>5364,
-27571=>5364,
-27575=>5365,
-27580=>5366,
-27590=>5367,
-12111=>5368,
-27595=>5368,
-27603=>5369,
-27615=>5370,
-27628=>5371,
-27627=>5372,
-27635=>5373,
-27631=>5374,
-40638=>5375,
-27656=>5376,
-27667=>5377,
-12115=>5378,
-27668=>5378,
-27675=>5379,
-27684=>5380,
-27683=>5381,
-27742=>5382,
-27733=>5383,
-27746=>5384,
-27754=>5385,
-27778=>5386,
-27789=>5387,
-27802=>5388,
-27777=>5389,
-27803=>5390,
-27774=>5391,
-27752=>5392,
-27763=>5393,
-27794=>5394,
-27792=>5395,
-27844=>5396,
-27889=>5397,
-27859=>5398,
-27837=>5399,
-27863=>5400,
-27845=>5401,
-27869=>5402,
-27822=>5403,
-27825=>5404,
-27838=>5405,
-27834=>5406,
-27867=>5407,
-27887=>5408,
-27865=>5409,
-27882=>5410,
-27935=>5411,
-34893=>5412,
-27958=>5413,
-27947=>5414,
-27965=>5415,
-27960=>5416,
-27929=>5417,
-27957=>5418,
-27955=>5419,
-27922=>5420,
-27916=>5421,
-28003=>5422,
-28051=>5423,
-28004=>5424,
-27994=>5425,
-28025=>5426,
-27993=>5427,
-28046=>5428,
-28053=>5429,
-28644=>5430,
-28037=>5431,
-28153=>5432,
-28181=>5433,
-28170=>5434,
-28085=>5435,
-28103=>5436,
-28134=>5437,
-28088=>5438,
-28102=>5439,
-28140=>5440,
-28126=>5441,
-28108=>5442,
-28136=>5443,
-28114=>5444,
-28101=>5445,
-28154=>5446,
-28121=>5447,
-28132=>5448,
-28117=>5449,
-28138=>5450,
-28142=>5451,
-28205=>5452,
-28270=>5453,
-28206=>5454,
-28185=>5455,
-28274=>5456,
-28255=>5457,
-28222=>5458,
-28195=>5459,
-28267=>5460,
-28203=>5461,
-28278=>5462,
-28237=>5463,
-28191=>5464,
-28227=>5465,
-28218=>5466,
-28238=>5467,
-28196=>5468,
-28415=>5469,
-28189=>5470,
-28216=>5471,
-28290=>5472,
-28330=>5473,
-28312=>5474,
-28361=>5475,
-28343=>5476,
-28371=>5477,
-28349=>5478,
-28335=>5479,
-28356=>5480,
-28338=>5481,
-28372=>5482,
-28373=>5483,
-28303=>5484,
-28325=>5485,
-28354=>5486,
-28319=>5487,
-28481=>5488,
-28433=>5489,
-28748=>5490,
-28396=>5491,
-28408=>5492,
-28414=>5493,
-28479=>5494,
-28402=>5495,
-28465=>5496,
-28399=>5497,
-28466=>5498,
-28364=>5499,
-28478=>5500,
-28435=>5501,
-28407=>5502,
-28550=>5503,
-28538=>5504,
-28536=>5505,
-28545=>5506,
-28544=>5507,
-28527=>5508,
-28507=>5509,
-28659=>5510,
-28525=>5511,
-28546=>5512,
-28540=>5513,
-28504=>5514,
-28558=>5515,
-28561=>5516,
-28610=>5517,
-28518=>5518,
-28595=>5519,
-28579=>5520,
-28577=>5521,
-28580=>5522,
-28601=>5523,
-28614=>5524,
-28586=>5525,
-28639=>5526,
-28629=>5527,
-28652=>5528,
-28628=>5529,
-28632=>5530,
-28657=>5531,
-28654=>5532,
-28635=>5533,
-28681=>5534,
-28683=>5535,
-28666=>5536,
-28689=>5537,
-28673=>5538,
-28687=>5539,
-28670=>5540,
-28699=>5541,
-28698=>5542,
-28532=>5543,
-28701=>5544,
-28696=>5545,
-28703=>5546,
-28720=>5547,
-28734=>5548,
-28722=>5549,
-28753=>5550,
-28771=>5551,
-28825=>5552,
-28818=>5553,
-28847=>5554,
-28913=>5555,
-28844=>5556,
-28856=>5557,
-28851=>5558,
-28846=>5559,
-28895=>5560,
-28875=>5561,
-28893=>5562,
-28889=>5563,
-28937=>5564,
-28925=>5565,
-28956=>5566,
-28953=>5567,
-29029=>5568,
-29013=>5569,
-29064=>5570,
-29030=>5571,
-29026=>5572,
-29004=>5573,
-29014=>5574,
-29036=>5575,
-29071=>5576,
-29179=>5577,
-29060=>5578,
-29077=>5579,
-29096=>5580,
-29100=>5581,
-29143=>5582,
-29113=>5583,
-29118=>5584,
-29138=>5585,
-29129=>5586,
-29140=>5587,
-29134=>5588,
-29152=>5589,
-29164=>5590,
-29159=>5591,
-29173=>5592,
-29180=>5593,
-29177=>5594,
-29183=>5595,
-29197=>5596,
-29200=>5597,
-29211=>5598,
-29224=>5599,
-29229=>5600,
-29228=>5601,
-29232=>5602,
-29234=>5603,
-12120=>5604,
-29243=>5604,
-29244=>5605,
-12121=>5606,
-29247=>5606,
-29248=>5607,
-29254=>5608,
-29259=>5609,
-29272=>5610,
-29300=>5611,
-29310=>5612,
-29314=>5613,
-29313=>5614,
-29319=>5615,
-29330=>5616,
-29334=>5617,
-29346=>5618,
-29351=>5619,
-29369=>5620,
-29362=>5621,
-29379=>5622,
-29382=>5623,
-29380=>5624,
-29390=>5625,
-29394=>5626,
-29410=>5627,
-29408=>5628,
-29409=>5629,
-29433=>5630,
-29431=>5631,
-20495=>5632,
-29463=>5633,
-29450=>5634,
-29468=>5635,
-29462=>5636,
-29469=>5637,
-29492=>5638,
-29487=>5639,
-29481=>5640,
-29477=>5641,
-29502=>5642,
-29518=>5643,
-29519=>5644,
-40664=>5645,
-29527=>5646,
-29546=>5647,
-29544=>5648,
-29552=>5649,
-29560=>5650,
-29557=>5651,
-29563=>5652,
-29562=>5653,
-29640=>5654,
-29619=>5655,
-29646=>5656,
-29627=>5657,
-29632=>5658,
-29669=>5659,
-29678=>5660,
-29662=>5661,
-29858=>5662,
-29701=>5663,
-29807=>5664,
-29733=>5665,
-29688=>5666,
-29746=>5667,
-29754=>5668,
-29781=>5669,
-29759=>5670,
-29791=>5671,
-29785=>5672,
-29761=>5673,
-29788=>5674,
-29801=>5675,
-29808=>5676,
-29795=>5677,
-29802=>5678,
-29814=>5679,
-29822=>5680,
-29835=>5681,
-29854=>5682,
-29863=>5683,
-29898=>5684,
-29903=>5685,
-29908=>5686,
-29681=>5687,
-29920=>5688,
-29923=>5689,
-29927=>5690,
-29929=>5691,
-29934=>5692,
-29938=>5693,
-29936=>5694,
-29937=>5695,
-29944=>5696,
-29943=>5697,
-29956=>5698,
-29955=>5699,
-29957=>5700,
-29964=>5701,
-29966=>5702,
-29965=>5703,
-29973=>5704,
-29971=>5705,
-29982=>5706,
-29990=>5707,
-29996=>5708,
-30012=>5709,
-30020=>5710,
-30029=>5711,
-30026=>5712,
-30025=>5713,
-30043=>5714,
-30022=>5715,
-30042=>5716,
-30057=>5717,
-30052=>5718,
-30055=>5719,
-30059=>5720,
-30061=>5721,
-30072=>5722,
-30070=>5723,
-30086=>5724,
-30087=>5725,
-30068=>5726,
-30090=>5727,
-30089=>5728,
-30082=>5729,
-30100=>5730,
-30106=>5731,
-30109=>5732,
-30117=>5733,
-30115=>5734,
-30146=>5735,
-30131=>5736,
-30147=>5737,
-30133=>5738,
-30141=>5739,
-30136=>5740,
-30140=>5741,
-30129=>5742,
-30157=>5743,
-30154=>5744,
-30162=>5745,
-30169=>5746,
-30179=>5747,
-30174=>5748,
-30206=>5749,
-30207=>5750,
-30204=>5751,
-30209=>5752,
-30192=>5753,
-30202=>5754,
-30194=>5755,
-30195=>5756,
-30219=>5757,
-30221=>5758,
-30217=>5759,
-30239=>5760,
-30247=>5761,
-30240=>5762,
-30241=>5763,
-30242=>5764,
-30244=>5765,
-30260=>5766,
-30256=>5767,
-30267=>5768,
-30279=>5769,
-30280=>5770,
-30278=>5771,
-30300=>5772,
-30296=>5773,
-30305=>5774,
-30306=>5775,
-30312=>5776,
-30313=>5777,
-30314=>5778,
-30311=>5779,
-30316=>5780,
-30320=>5781,
-30322=>5782,
-12136=>5783,
-30326=>5783,
-30328=>5784,
-30332=>5785,
-30336=>5786,
-30339=>5787,
-30344=>5788,
-30347=>5789,
-30350=>5790,
-30358=>5791,
-30355=>5792,
-30361=>5793,
-30362=>5794,
-30384=>5795,
-30388=>5796,
-30392=>5797,
-30393=>5798,
-30394=>5799,
-30402=>5800,
-30413=>5801,
-30422=>5802,
-30418=>5803,
-30430=>5804,
-30433=>5805,
-30437=>5806,
-30439=>5807,
-30442=>5808,
-34351=>5809,
-30459=>5810,
-30472=>5811,
-30471=>5812,
-30468=>5813,
-30505=>5814,
-30500=>5815,
-30494=>5816,
-30501=>5817,
-30502=>5818,
-30491=>5819,
-30519=>5820,
-30520=>5821,
-30535=>5822,
-30554=>5823,
-30568=>5824,
-30571=>5825,
-30555=>5826,
-30565=>5827,
-30591=>5828,
-30590=>5829,
-30585=>5830,
-30606=>5831,
-30603=>5832,
-30609=>5833,
-30624=>5834,
-30622=>5835,
-30640=>5836,
-30646=>5837,
-30649=>5838,
-30655=>5839,
-30652=>5840,
-30653=>5841,
-30651=>5842,
-30663=>5843,
-30669=>5844,
-30679=>5845,
-30682=>5846,
-30684=>5847,
-30691=>5848,
-30702=>5849,
-30716=>5850,
-30732=>5851,
-30738=>5852,
-31014=>5853,
-30752=>5854,
-31018=>5855,
-30789=>5856,
-30862=>5857,
-30836=>5858,
-30854=>5859,
-30844=>5860,
-30874=>5861,
-30860=>5862,
-30883=>5863,
-30901=>5864,
-30890=>5865,
-30895=>5866,
-30929=>5867,
-30918=>5868,
-30923=>5869,
-30932=>5870,
-30910=>5871,
-30908=>5872,
-30917=>5873,
-30922=>5874,
-30956=>5875,
-30951=>5876,
-30938=>5877,
-30973=>5878,
-30964=>5879,
-30983=>5880,
-30994=>5881,
-30993=>5882,
-31001=>5883,
-31020=>5884,
-31019=>5885,
-31040=>5886,
-31072=>5887,
-31063=>5888,
-31071=>5889,
-31066=>5890,
-31061=>5891,
-31059=>5892,
-31098=>5893,
-31103=>5894,
-31114=>5895,
-31133=>5896,
-31143=>5897,
-40779=>5898,
-31146=>5899,
-31150=>5900,
-31155=>5901,
-31161=>5902,
-31162=>5903,
-31177=>5904,
-31189=>5905,
-31207=>5906,
-31212=>5907,
-31201=>5908,
-31203=>5909,
-31240=>5910,
-31245=>5911,
-31256=>5912,
-31257=>5913,
-31264=>5914,
-31263=>5915,
-31104=>5916,
-31281=>5917,
-31291=>5918,
-31294=>5919,
-31287=>5920,
-31299=>5921,
-31319=>5922,
-31305=>5923,
-31329=>5924,
-31330=>5925,
-31337=>5926,
-40861=>5927,
-31344=>5928,
-31353=>5929,
-31357=>5930,
-31368=>5931,
-31383=>5932,
-31381=>5933,
-31384=>5934,
-31382=>5935,
-31401=>5936,
-31432=>5937,
-31408=>5938,
-31414=>5939,
-31429=>5940,
-31428=>5941,
-31423=>5942,
-36995=>5943,
-31431=>5944,
-31434=>5945,
-31437=>5946,
-31439=>5947,
-31445=>5948,
-31443=>5949,
-31449=>5950,
-31450=>5951,
-31453=>5952,
-31457=>5953,
-31458=>5954,
-31462=>5955,
-31469=>5956,
-31472=>5957,
-31490=>5958,
-31503=>5959,
-31498=>5960,
-31494=>5961,
-31539=>5962,
-31512=>5963,
-31513=>5964,
-31518=>5965,
-31541=>5966,
-31528=>5967,
-31542=>5968,
-31568=>5969,
-31610=>5970,
-31492=>5971,
-31565=>5972,
-31499=>5973,
-31564=>5974,
-31557=>5975,
-31605=>5976,
-31589=>5977,
-31604=>5978,
-31591=>5979,
-31600=>5980,
-31601=>5981,
-31596=>5982,
-31598=>5983,
-31645=>5984,
-31640=>5985,
-31647=>5986,
-31629=>5987,
-31644=>5988,
-31642=>5989,
-31627=>5990,
-31634=>5991,
-31631=>5992,
-31581=>5993,
-31641=>5994,
-31691=>5995,
-31681=>5996,
-31692=>5997,
-31695=>5998,
-31668=>5999,
-31686=>6000,
-31709=>6001,
-31721=>6002,
-31761=>6003,
-31764=>6004,
-31718=>6005,
-31717=>6006,
-31840=>6007,
-31744=>6008,
-31751=>6009,
-31763=>6010,
-31731=>6011,
-31735=>6012,
-31767=>6013,
-31757=>6014,
-31734=>6015,
-31779=>6016,
-31783=>6017,
-31786=>6018,
-31775=>6019,
-31799=>6020,
-31787=>6021,
-31805=>6022,
-31820=>6023,
-31811=>6024,
-31828=>6025,
-31823=>6026,
-31808=>6027,
-31824=>6028,
-31832=>6029,
-31839=>6030,
-31844=>6031,
-31830=>6032,
-31845=>6033,
-31852=>6034,
-31861=>6035,
-31875=>6036,
-31888=>6037,
-31908=>6038,
-31917=>6039,
-31906=>6040,
-31915=>6041,
-31905=>6042,
-31912=>6043,
-31923=>6044,
-31922=>6045,
-31921=>6046,
-31918=>6047,
-31929=>6048,
-31933=>6049,
-31936=>6050,
-31941=>6051,
-31938=>6052,
-31960=>6053,
-31954=>6054,
-31964=>6055,
-31970=>6056,
-39739=>6057,
-31983=>6058,
-31986=>6059,
-31988=>6060,
-31990=>6061,
-31994=>6062,
-32006=>6063,
-32002=>6064,
-32028=>6065,
-32021=>6066,
-32010=>6067,
-32069=>6068,
-32075=>6069,
-32046=>6070,
-32050=>6071,
-32063=>6072,
-32053=>6073,
-32070=>6074,
-32115=>6075,
-32086=>6076,
-32078=>6077,
-32114=>6078,
-32104=>6079,
-32110=>6080,
-32079=>6081,
-32099=>6082,
-32147=>6083,
-32137=>6084,
-32091=>6085,
-32143=>6086,
-32125=>6087,
-32155=>6088,
-32186=>6089,
-32174=>6090,
-32163=>6091,
-32181=>6092,
-32199=>6093,
-32189=>6094,
-32171=>6095,
-32317=>6096,
-32162=>6097,
-32175=>6098,
-32220=>6099,
-32184=>6100,
-32159=>6101,
-32176=>6102,
-32216=>6103,
-32221=>6104,
-32228=>6105,
-32222=>6106,
-32251=>6107,
-32242=>6108,
-32225=>6109,
-32261=>6110,
-32266=>6111,
-32291=>6112,
-32289=>6113,
-32274=>6114,
-32305=>6115,
-32287=>6116,
-32265=>6117,
-32267=>6118,
-32290=>6119,
-32326=>6120,
-32358=>6121,
-32315=>6122,
-32309=>6123,
-32313=>6124,
-32323=>6125,
-32311=>6126,
-32306=>6127,
-32314=>6128,
-32359=>6129,
-32349=>6130,
-32342=>6131,
-32350=>6132,
-32345=>6133,
-32346=>6134,
-32377=>6135,
-32362=>6136,
-32361=>6137,
-32380=>6138,
-32379=>6139,
-32387=>6140,
-32213=>6141,
-32381=>6142,
-36782=>6143,
-32383=>6144,
-32392=>6145,
-32393=>6146,
-32396=>6147,
-32402=>6148,
-32400=>6149,
-32403=>6150,
-32404=>6151,
-32406=>6152,
-32398=>6153,
-32411=>6154,
-32412=>6155,
-32568=>6156,
-32570=>6157,
-32581=>6158,
-32588=>6159,
-32589=>6160,
-32590=>6161,
-32592=>6162,
-12153=>6163,
-32593=>6163,
-32597=>6164,
-32596=>6165,
-32600=>6166,
-32607=>6167,
-32608=>6168,
-32616=>6169,
-32617=>6170,
-32615=>6171,
-32632=>6172,
-32642=>6173,
-32646=>6174,
-32643=>6175,
-32648=>6176,
-32647=>6177,
-32652=>6178,
-32660=>6179,
-32670=>6180,
-32669=>6181,
-32666=>6182,
-32675=>6183,
-32687=>6184,
-32690=>6185,
-32697=>6186,
-32686=>6187,
-32694=>6188,
-32696=>6189,
-35697=>6190,
-32709=>6191,
-32710=>6192,
-32714=>6193,
-32725=>6194,
-32724=>6195,
-32737=>6196,
-32742=>6197,
-32745=>6198,
-32755=>6199,
-32761=>6200,
-39132=>6201,
-32774=>6202,
-32772=>6203,
-32779=>6204,
-12158=>6205,
-32786=>6205,
-32792=>6206,
-32793=>6207,
-32796=>6208,
-32801=>6209,
-32808=>6210,
-32831=>6211,
-32827=>6212,
-32842=>6213,
-32838=>6214,
-32850=>6215,
-32856=>6216,
-32858=>6217,
-32863=>6218,
-32866=>6219,
-32872=>6220,
-32883=>6221,
-32882=>6222,
-32880=>6223,
-32886=>6224,
-32889=>6225,
-32893=>6226,
-12160=>6227,
-32895=>6227,
-32900=>6228,
-32902=>6229,
-32901=>6230,
-32923=>6231,
-32915=>6232,
-32922=>6233,
-32941=>6234,
-20880=>6235,
-32940=>6236,
-32987=>6237,
-32997=>6238,
-32985=>6239,
-32989=>6240,
-32964=>6241,
-32986=>6242,
-32982=>6243,
-33033=>6244,
-33007=>6245,
-33009=>6246,
-33051=>6247,
-33065=>6248,
-33059=>6249,
-33071=>6250,
-33099=>6251,
-38539=>6252,
-33094=>6253,
-33086=>6254,
-33107=>6255,
-33105=>6256,
-33020=>6257,
-33137=>6258,
-33134=>6259,
-33125=>6260,
-33126=>6261,
-33140=>6262,
-33155=>6263,
-33160=>6264,
-33162=>6265,
-33152=>6266,
-33154=>6267,
-33184=>6268,
-33173=>6269,
-33188=>6270,
-33187=>6271,
-33119=>6272,
-33171=>6273,
-33193=>6274,
-33200=>6275,
-33205=>6276,
-33214=>6277,
-33208=>6278,
-33213=>6279,
-33216=>6280,
-33218=>6281,
-33210=>6282,
-33225=>6283,
-33229=>6284,
-33233=>6285,
-33241=>6286,
-33240=>6287,
-33224=>6288,
-33242=>6289,
-33247=>6290,
-33248=>6291,
-33255=>6292,
-33274=>6293,
-33275=>6294,
-33278=>6295,
-33281=>6296,
-33282=>6297,
-33285=>6298,
-33287=>6299,
-33290=>6300,
-33293=>6301,
-33296=>6302,
-33302=>6303,
-33321=>6304,
-33323=>6305,
-33336=>6306,
-33331=>6307,
-33344=>6308,
-33369=>6309,
-33368=>6310,
-33373=>6311,
-33370=>6312,
-33375=>6313,
-33380=>6314,
-33378=>6315,
-33384=>6316,
-33386=>6317,
-33387=>6318,
-33326=>6319,
-33393=>6320,
-33399=>6321,
-12171=>6322,
-33400=>6322,
-33406=>6323,
-33421=>6324,
-33426=>6325,
-33451=>6326,
-33439=>6327,
-33467=>6328,
-33452=>6329,
-33505=>6330,
-33507=>6331,
-33503=>6332,
-33490=>6333,
-33524=>6334,
-33523=>6335,
-33530=>6336,
-33683=>6337,
-33539=>6338,
-33531=>6339,
-33529=>6340,
-33502=>6341,
-33542=>6342,
-33500=>6343,
-33545=>6344,
-33497=>6345,
-33589=>6346,
-33588=>6347,
-33558=>6348,
-33586=>6349,
-33585=>6350,
-33600=>6351,
-33593=>6352,
-33616=>6353,
-33605=>6354,
-33583=>6355,
-33579=>6356,
-33559=>6357,
-33560=>6358,
-33669=>6359,
-33690=>6360,
-33706=>6361,
-33695=>6362,
-33698=>6363,
-33686=>6364,
-33571=>6365,
-33678=>6366,
-33671=>6367,
-33674=>6368,
-33660=>6369,
-33717=>6370,
-33651=>6371,
-33653=>6372,
-33696=>6373,
-33673=>6374,
-33704=>6375,
-33780=>6376,
-33811=>6377,
-33771=>6378,
-33742=>6379,
-33789=>6380,
-33795=>6381,
-33752=>6382,
-33803=>6383,
-33729=>6384,
-33783=>6385,
-33799=>6386,
-33760=>6387,
-33778=>6388,
-33805=>6389,
-33826=>6390,
-33824=>6391,
-33725=>6392,
-33848=>6393,
-34054=>6394,
-33787=>6395,
-33901=>6396,
-33834=>6397,
-33852=>6398,
-34138=>6399,
-33924=>6400,
-33911=>6401,
-33899=>6402,
-33965=>6403,
-33902=>6404,
-33922=>6405,
-33897=>6406,
-33862=>6407,
-33836=>6408,
-33903=>6409,
-33913=>6410,
-33845=>6411,
-33994=>6412,
-33890=>6413,
-33977=>6414,
-33983=>6415,
-33951=>6416,
-34009=>6417,
-33997=>6418,
-33979=>6419,
-34010=>6420,
-34000=>6421,
-33985=>6422,
-33990=>6423,
-34006=>6424,
-33953=>6425,
-34081=>6426,
-34047=>6427,
-34036=>6428,
-34071=>6429,
-34072=>6430,
-34092=>6431,
-34079=>6432,
-34069=>6433,
-34068=>6434,
-34044=>6435,
-34112=>6436,
-34147=>6437,
-34136=>6438,
-34120=>6439,
-34113=>6440,
-34306=>6441,
-34123=>6442,
-34133=>6443,
-34176=>6444,
-34212=>6445,
-34184=>6446,
-34193=>6447,
-34186=>6448,
-34216=>6449,
-34157=>6450,
-34196=>6451,
-34203=>6452,
-34282=>6453,
-34183=>6454,
-34204=>6455,
-34167=>6456,
-34174=>6457,
-34192=>6458,
-34249=>6459,
-34234=>6460,
-34255=>6461,
-34233=>6462,
-34256=>6463,
-34261=>6464,
-34269=>6465,
-34277=>6466,
-34268=>6467,
-34297=>6468,
-34314=>6469,
-34323=>6470,
-34315=>6471,
-34302=>6472,
-34298=>6473,
-34310=>6474,
-34338=>6475,
-34330=>6476,
-34352=>6477,
-34367=>6478,
-12172=>6479,
-34381=>6479,
-20053=>6480,
-34388=>6481,
-34399=>6482,
-34407=>6483,
-34417=>6484,
-34451=>6485,
-34467=>6486,
-34473=>6487,
-34474=>6488,
-34443=>6489,
-34444=>6490,
-34486=>6491,
-34479=>6492,
-34500=>6493,
-34502=>6494,
-34480=>6495,
-34505=>6496,
-34851=>6497,
-34475=>6498,
-34516=>6499,
-34526=>6500,
-34537=>6501,
-34540=>6502,
-34527=>6503,
-34523=>6504,
-34543=>6505,
-34578=>6506,
-34566=>6507,
-34568=>6508,
-34560=>6509,
-34563=>6510,
-34555=>6511,
-34577=>6512,
-34569=>6513,
-34573=>6514,
-34553=>6515,
-34570=>6516,
-34612=>6517,
-34623=>6518,
-34615=>6519,
-34619=>6520,
-34597=>6521,
-34601=>6522,
-34586=>6523,
-34656=>6524,
-34655=>6525,
-34680=>6526,
-34636=>6527,
-34638=>6528,
-34676=>6529,
-34647=>6530,
-34664=>6531,
-34670=>6532,
-34649=>6533,
-34643=>6534,
-34659=>6535,
-34666=>6536,
-34821=>6537,
-34722=>6538,
-34719=>6539,
-34690=>6540,
-34735=>6541,
-34763=>6542,
-34749=>6543,
-34752=>6544,
-34768=>6545,
-38614=>6546,
-34731=>6547,
-34756=>6548,
-34739=>6549,
-34759=>6550,
-34758=>6551,
-34747=>6552,
-34799=>6553,
-34802=>6554,
-34784=>6555,
-34831=>6556,
-34829=>6557,
-34814=>6558,
-34806=>6559,
-34807=>6560,
-34830=>6561,
-34770=>6562,
-34833=>6563,
-34838=>6564,
-34837=>6565,
-34850=>6566,
-34849=>6567,
-34865=>6568,
-34870=>6569,
-34873=>6570,
-34855=>6571,
-34875=>6572,
-34884=>6573,
-34882=>6574,
-34898=>6575,
-34905=>6576,
-34910=>6577,
-34914=>6578,
-34923=>6579,
-34945=>6580,
-34942=>6581,
-34974=>6582,
-34933=>6583,
-34941=>6584,
-34997=>6585,
-34930=>6586,
-34946=>6587,
-34967=>6588,
-34962=>6589,
-34990=>6590,
-34969=>6591,
-34978=>6592,
-34957=>6593,
-34980=>6594,
-34992=>6595,
-35007=>6596,
-34993=>6597,
-35011=>6598,
-35012=>6599,
-35028=>6600,
-35032=>6601,
-35033=>6602,
-35037=>6603,
-35065=>6604,
-35074=>6605,
-35068=>6606,
-35060=>6607,
-35048=>6608,
-35058=>6609,
-35076=>6610,
-35084=>6611,
-35082=>6612,
-35091=>6613,
-35139=>6614,
-35102=>6615,
-35109=>6616,
-35114=>6617,
-35115=>6618,
-35137=>6619,
-35140=>6620,
-35131=>6621,
-35126=>6622,
-35128=>6623,
-35148=>6624,
-35101=>6625,
-35168=>6626,
-35166=>6627,
-35174=>6628,
-35172=>6629,
-35181=>6630,
-35178=>6631,
-35183=>6632,
-35188=>6633,
-35191=>6634,
-12177=>6635,
-35198=>6635,
-35203=>6636,
-35208=>6637,
-35210=>6638,
-35219=>6639,
-35224=>6640,
-35233=>6641,
-35241=>6642,
-35238=>6643,
-35244=>6644,
-35247=>6645,
-35250=>6646,
-35258=>6647,
-35261=>6648,
-35263=>6649,
-35264=>6650,
-35290=>6651,
-35292=>6652,
-35293=>6653,
-35303=>6654,
-35316=>6655,
-35320=>6656,
-35331=>6657,
-35350=>6658,
-35344=>6659,
-35340=>6660,
-35355=>6661,
-35357=>6662,
-35365=>6663,
-35382=>6664,
-35393=>6665,
-35419=>6666,
-35410=>6667,
-35398=>6668,
-35400=>6669,
-35452=>6670,
-35437=>6671,
-35436=>6672,
-35426=>6673,
-35461=>6674,
-35458=>6675,
-35460=>6676,
-35496=>6677,
-35489=>6678,
-35473=>6679,
-35493=>6680,
-35494=>6681,
-35482=>6682,
-35491=>6683,
-35524=>6684,
-35533=>6685,
-35522=>6686,
-35546=>6687,
-35563=>6688,
-35571=>6689,
-35559=>6690,
-35556=>6691,
-35569=>6692,
-35604=>6693,
-35552=>6694,
-35554=>6695,
-35575=>6696,
-35550=>6697,
-35547=>6698,
-35596=>6699,
-35591=>6700,
-35610=>6701,
-35553=>6702,
-35606=>6703,
-35600=>6704,
-35607=>6705,
-35616=>6706,
-35635=>6707,
-38827=>6708,
-35622=>6709,
-35627=>6710,
-35646=>6711,
-35624=>6712,
-35649=>6713,
-35660=>6714,
-35663=>6715,
-35662=>6716,
-35657=>6717,
-35670=>6718,
-35675=>6719,
-35674=>6720,
-35691=>6721,
-35679=>6722,
-35692=>6723,
-35695=>6724,
-35700=>6725,
-35709=>6726,
-35712=>6727,
-35724=>6728,
-35726=>6729,
-35730=>6730,
-35731=>6731,
-35734=>6732,
-35737=>6733,
-35738=>6734,
-35898=>6735,
-35905=>6736,
-35903=>6737,
-35912=>6738,
-35916=>6739,
-35918=>6740,
-35920=>6741,
-12183=>6742,
-35925=>6742,
-35938=>6743,
-35948=>6744,
-12184=>6745,
-35960=>6745,
-35962=>6746,
-35970=>6747,
-35977=>6748,
-35973=>6749,
-35978=>6750,
-35981=>6751,
-35982=>6752,
-35988=>6753,
-35964=>6754,
-35992=>6755,
-25117=>6756,
-36013=>6757,
-36010=>6758,
-36029=>6759,
-36018=>6760,
-36019=>6761,
-36014=>6762,
-36022=>6763,
-36040=>6764,
-36033=>6765,
-36068=>6766,
-36067=>6767,
-36058=>6768,
-36093=>6769,
-36090=>6770,
-36091=>6771,
-36100=>6772,
-36101=>6773,
-36106=>6774,
-36103=>6775,
-36111=>6776,
-36109=>6777,
-36112=>6778,
-40782=>6779,
-36115=>6780,
-36045=>6781,
-36116=>6782,
-36118=>6783,
-36199=>6784,
-36205=>6785,
-36209=>6786,
-36211=>6787,
-36225=>6788,
-36249=>6789,
-36290=>6790,
-36286=>6791,
-36282=>6792,
-36303=>6793,
-36314=>6794,
-36310=>6795,
-36300=>6796,
-36315=>6797,
-36299=>6798,
-36330=>6799,
-36331=>6800,
-36319=>6801,
-36323=>6802,
-36348=>6803,
-36360=>6804,
-36361=>6805,
-36351=>6806,
-36381=>6807,
-36382=>6808,
-36368=>6809,
-36383=>6810,
-36418=>6811,
-36405=>6812,
-36400=>6813,
-36404=>6814,
-36426=>6815,
-36423=>6816,
-36425=>6817,
-36428=>6818,
-36432=>6819,
-36424=>6820,
-36441=>6821,
-36452=>6822,
-36448=>6823,
-36394=>6824,
-36451=>6825,
-36437=>6826,
-36470=>6827,
-36466=>6828,
-36476=>6829,
-36481=>6830,
-36487=>6831,
-36485=>6832,
-36484=>6833,
-36491=>6834,
-36490=>6835,
-36499=>6836,
-36497=>6837,
-36500=>6838,
-36505=>6839,
-36522=>6840,
-36513=>6841,
-36524=>6842,
-36528=>6843,
-36550=>6844,
-36529=>6845,
-36542=>6846,
-36549=>6847,
-36552=>6848,
-36555=>6849,
-36571=>6850,
-36579=>6851,
-36604=>6852,
-36603=>6853,
-36587=>6854,
-36606=>6855,
-36618=>6856,
-36613=>6857,
-36629=>6858,
-36626=>6859,
-36633=>6860,
-36627=>6861,
-36636=>6862,
-36639=>6863,
-36635=>6864,
-36620=>6865,
-36646=>6866,
-36659=>6867,
-36667=>6868,
-36665=>6869,
-36677=>6870,
-36674=>6871,
-36670=>6872,
-36684=>6873,
-36681=>6874,
-36678=>6875,
-36686=>6876,
-36695=>6877,
-36700=>6878,
-36706=>6879,
-36707=>6880,
-36708=>6881,
-36764=>6882,
-36767=>6883,
-36771=>6884,
-36781=>6885,
-36783=>6886,
-36791=>6887,
-36826=>6888,
-36837=>6889,
-36834=>6890,
-36842=>6891,
-36847=>6892,
-36999=>6893,
-36852=>6894,
-36869=>6895,
-36857=>6896,
-36858=>6897,
-36881=>6898,
-36885=>6899,
-36897=>6900,
-36877=>6901,
-36894=>6902,
-36886=>6903,
-36875=>6904,
-36903=>6905,
-36918=>6906,
-36917=>6907,
-36921=>6908,
-36856=>6909,
-36943=>6910,
-36944=>6911,
-36945=>6912,
-36946=>6913,
-36878=>6914,
-36937=>6915,
-36926=>6916,
-36950=>6917,
-36952=>6918,
-36958=>6919,
-36968=>6920,
-36975=>6921,
-36982=>6922,
-38568=>6923,
-36978=>6924,
-36994=>6925,
-36989=>6926,
-36993=>6927,
-36992=>6928,
-37002=>6929,
-37001=>6930,
-37007=>6931,
-37032=>6932,
-37039=>6933,
-37041=>6934,
-37045=>6935,
-37090=>6936,
-37092=>6937,
-25160=>6938,
-37083=>6939,
-37122=>6940,
-37138=>6941,
-37145=>6942,
-37170=>6943,
-37168=>6944,
-37194=>6945,
-37206=>6946,
-37208=>6947,
-37219=>6948,
-37221=>6949,
-37225=>6950,
-37235=>6951,
-37234=>6952,
-37259=>6953,
-37257=>6954,
-37250=>6955,
-37282=>6956,
-37291=>6957,
-37295=>6958,
-37290=>6959,
-37301=>6960,
-37300=>6961,
-37306=>6962,
-37312=>6963,
-37313=>6964,
-37321=>6965,
-37323=>6966,
-37328=>6967,
-37334=>6968,
-37343=>6969,
-37345=>6970,
-37339=>6971,
-37372=>6972,
-37365=>6973,
-37366=>6974,
-37406=>6975,
-37375=>6976,
-37396=>6977,
-37420=>6978,
-37397=>6979,
-37393=>6980,
-37470=>6981,
-37463=>6982,
-37445=>6983,
-37449=>6984,
-37476=>6985,
-37448=>6986,
-37525=>6987,
-37439=>6988,
-37451=>6989,
-37456=>6990,
-37532=>6991,
-37526=>6992,
-37523=>6993,
-37531=>6994,
-37466=>6995,
-37583=>6996,
-37561=>6997,
-37559=>6998,
-37609=>6999,
-37647=>7000,
-37626=>7001,
-37700=>7002,
-37678=>7003,
-37657=>7004,
-37666=>7005,
-37658=>7006,
-37667=>7007,
-37690=>7008,
-37685=>7009,
-37691=>7010,
-37724=>7011,
-37728=>7012,
-37756=>7013,
-37742=>7014,
-37718=>7015,
-37808=>7016,
-37804=>7017,
-37805=>7018,
-37780=>7019,
-37817=>7020,
-37846=>7021,
-37847=>7022,
-37864=>7023,
-37861=>7024,
-37848=>7025,
-37827=>7026,
-37853=>7027,
-37840=>7028,
-37832=>7029,
-37860=>7030,
-37914=>7031,
-37908=>7032,
-37907=>7033,
-37891=>7034,
-37895=>7035,
-37904=>7036,
-37942=>7037,
-37931=>7038,
-37941=>7039,
-37921=>7040,
-37946=>7041,
-37953=>7042,
-37970=>7043,
-37956=>7044,
-37979=>7045,
-37984=>7046,
-37986=>7047,
-37982=>7048,
-37994=>7049,
-37417=>7050,
-38000=>7051,
-38005=>7052,
-38007=>7053,
-38013=>7054,
-37978=>7055,
-38012=>7056,
-38014=>7057,
-38017=>7058,
-38015=>7059,
-38274=>7060,
-38279=>7061,
-38282=>7062,
-38292=>7063,
-38294=>7064,
-38296=>7065,
-38297=>7066,
-38304=>7067,
-38312=>7068,
-38311=>7069,
-38317=>7070,
-38332=>7071,
-38331=>7072,
-38329=>7073,
-38334=>7074,
-38346=>7075,
-28662=>7076,
-38339=>7077,
-38349=>7078,
-38348=>7079,
-38357=>7080,
-38356=>7081,
-38358=>7082,
-38364=>7083,
-38369=>7084,
-38373=>7085,
-38370=>7086,
-38433=>7087,
-38440=>7088,
-38446=>7089,
-38447=>7090,
-38466=>7091,
-38476=>7092,
-38479=>7093,
-38475=>7094,
-38519=>7095,
-38492=>7096,
-38494=>7097,
-38493=>7098,
-38495=>7099,
-38502=>7100,
-38514=>7101,
-38508=>7102,
-38541=>7103,
-38552=>7104,
-38549=>7105,
-38551=>7106,
-38570=>7107,
-38567=>7108,
-38577=>7109,
-38578=>7110,
-38576=>7111,
-38580=>7112,
-12202=>7113,
-38582=>7113,
-38584=>7114,
-12203=>7115,
-38585=>7115,
-38606=>7116,
-38603=>7117,
-38601=>7118,
-38605=>7119,
-35149=>7120,
-38620=>7121,
-38669=>7122,
-38613=>7123,
-38649=>7124,
-38660=>7125,
-38662=>7126,
-38664=>7127,
-38675=>7128,
-38670=>7129,
-38673=>7130,
-38671=>7131,
-38678=>7132,
-38681=>7133,
-38692=>7134,
-38698=>7135,
-38704=>7136,
-38713=>7137,
-38717=>7138,
-38718=>7139,
-38724=>7140,
-38726=>7141,
-38728=>7142,
-38722=>7143,
-38729=>7144,
-38748=>7145,
-38752=>7146,
-38756=>7147,
-38758=>7148,
-38760=>7149,
-21202=>7150,
-38763=>7151,
-38769=>7152,
-38777=>7153,
-38789=>7154,
-38780=>7155,
-38785=>7156,
-38778=>7157,
-38790=>7158,
-38795=>7159,
-38799=>7160,
-38800=>7161,
-38812=>7162,
-38824=>7163,
-38822=>7164,
-38819=>7165,
-38835=>7166,
-38836=>7167,
-38851=>7168,
-38854=>7169,
-38856=>7170,
-12209=>7171,
-38859=>7171,
-38876=>7172,
-12210=>7173,
-38893=>7173,
-40783=>7174,
-38898=>7175,
-31455=>7176,
-38902=>7177,
-38901=>7178,
-38927=>7179,
-38924=>7180,
-38968=>7181,
-38948=>7182,
-38945=>7183,
-38967=>7184,
-38973=>7185,
-38982=>7186,
-38991=>7187,
-38987=>7188,
-39019=>7189,
-39023=>7190,
-39024=>7191,
-39025=>7192,
-39028=>7193,
-39027=>7194,
-39082=>7195,
-39087=>7196,
-39089=>7197,
-39094=>7198,
-39108=>7199,
-39107=>7200,
-39110=>7201,
-39145=>7202,
-39147=>7203,
-39171=>7204,
-39177=>7205,
-39186=>7206,
-39188=>7207,
-39192=>7208,
-39201=>7209,
-39197=>7210,
-39198=>7211,
-39204=>7212,
-39200=>7213,
-39212=>7214,
-39214=>7215,
-39229=>7216,
-39230=>7217,
-39234=>7218,
-39241=>7219,
-39237=>7220,
-39248=>7221,
-39243=>7222,
-39249=>7223,
-39250=>7224,
-39244=>7225,
-39253=>7226,
-39319=>7227,
-39320=>7228,
-39333=>7229,
-39341=>7230,
-39342=>7231,
-39356=>7232,
-39391=>7233,
-39387=>7234,
-39389=>7235,
-39384=>7236,
-39377=>7237,
-39405=>7238,
-39406=>7239,
-39409=>7240,
-39410=>7241,
-39419=>7242,
-39416=>7243,
-39425=>7244,
-39439=>7245,
-39429=>7246,
-39394=>7247,
-39449=>7248,
-39467=>7249,
-39479=>7250,
-39493=>7251,
-39490=>7252,
-39488=>7253,
-39491=>7254,
-39486=>7255,
-39509=>7256,
-39501=>7257,
-39515=>7258,
-39511=>7259,
-39519=>7260,
-39522=>7261,
-39525=>7262,
-39524=>7263,
-39529=>7264,
-39531=>7265,
-39530=>7266,
-39597=>7267,
-39600=>7268,
-39612=>7269,
-39616=>7270,
-39631=>7271,
-39633=>7272,
-39635=>7273,
-39636=>7274,
-39646=>7275,
-12221=>7276,
-39647=>7276,
-39650=>7277,
-39651=>7278,
-39654=>7279,
-39663=>7280,
-39659=>7281,
-39662=>7282,
-39668=>7283,
-39665=>7284,
-39671=>7285,
-39675=>7286,
-39686=>7287,
-39704=>7288,
-39706=>7289,
-39711=>7290,
-39714=>7291,
-39715=>7292,
-12222=>7293,
-39717=>7293,
-39719=>7294,
-39720=>7295,
-39721=>7296,
-39722=>7297,
-39726=>7298,
-12223=>7299,
-39727=>7299,
-39730=>7300,
-12224=>7300,
-39748=>7301,
-39747=>7302,
-39759=>7303,
-39757=>7304,
-39758=>7305,
-39761=>7306,
-39768=>7307,
-39796=>7308,
-39827=>7309,
-39811=>7310,
-39825=>7311,
-39830=>7312,
-39831=>7313,
-39839=>7314,
-39840=>7315,
-39848=>7316,
-39860=>7317,
-39872=>7318,
-39882=>7319,
-39865=>7320,
-39878=>7321,
-39887=>7322,
-39889=>7323,
-39890=>7324,
-39907=>7325,
-39906=>7326,
-39908=>7327,
-39892=>7328,
-39905=>7329,
-39994=>7330,
-39922=>7331,
-39921=>7332,
-39920=>7333,
-39957=>7334,
-39956=>7335,
-39945=>7336,
-39955=>7337,
-39948=>7338,
-39942=>7339,
-39944=>7340,
-39954=>7341,
-39946=>7342,
-39940=>7343,
-39982=>7344,
-39963=>7345,
-39973=>7346,
-39972=>7347,
-39969=>7348,
-39984=>7349,
-40007=>7350,
-39986=>7351,
-40006=>7352,
-39998=>7353,
-40026=>7354,
-40032=>7355,
-40039=>7356,
-40054=>7357,
-40056=>7358,
-40167=>7359,
-40172=>7360,
-40176=>7361,
-40201=>7362,
-40200=>7363,
-40171=>7364,
-40195=>7365,
-40198=>7366,
-40234=>7367,
-40230=>7368,
-40367=>7369,
-40227=>7370,
-40223=>7371,
-40260=>7372,
-40213=>7373,
-40210=>7374,
-40257=>7375,
-40255=>7376,
-40254=>7377,
-40262=>7378,
-40264=>7379,
-40285=>7380,
-40286=>7381,
-40292=>7382,
-40273=>7383,
-40272=>7384,
-40281=>7385,
-40306=>7386,
-40329=>7387,
-40327=>7388,
-40363=>7389,
-40303=>7390,
-40314=>7391,
-40346=>7392,
-40356=>7393,
-40361=>7394,
-40370=>7395,
-40388=>7396,
-40385=>7397,
-40379=>7398,
-40376=>7399,
-40378=>7400,
-40390=>7401,
-40399=>7402,
-40386=>7403,
-40409=>7404,
-40403=>7405,
-40440=>7406,
-40422=>7407,
-40429=>7408,
-40431=>7409,
-40445=>7410,
-40474=>7411,
-40475=>7412,
-40478=>7413,
-12228=>7414,
-40565=>7414,
-40569=>7415,
-40573=>7416,
-40577=>7417,
-40584=>7418,
-40587=>7419,
-40588=>7420,
-40594=>7421,
-40597=>7422,
-40593=>7423,
-40605=>7424,
-12230=>7425,
-40613=>7425,
-40617=>7426,
-40632=>7427,
-40618=>7428,
-40621=>7429,
-38753=>7430,
-40652=>7431,
-40654=>7432,
-40655=>7433,
-40656=>7434,
-40660=>7435,
-40668=>7436,
-40670=>7437,
-40669=>7438,
-40672=>7439,
-40677=>7440,
-40680=>7441,
-40687=>7442,
-40692=>7443,
-40694=>7444,
-40695=>7445,
-12235=>7446,
-40697=>7446,
-40699=>7447,
-40700=>7448,
-12236=>7449,
-40701=>7449,
-40711=>7450,
-40712=>7451,
-30391=>7452,
-40725=>7453,
-40737=>7454,
-40748=>7455,
-40766=>7456,
-40778=>7457,
-12241=>7457,
-40786=>7458,
-12242=>7458,
-40788=>7459,
-40803=>7460,
-40799=>7461,
-40800=>7462,
-40801=>7463,
-40806=>7464,
-40807=>7465,
-40812=>7466,
-40810=>7467,
-40823=>7468,
-40818=>7469,
-40822=>7470,
-40853=>7471,
-40860=>7472,
-12244=>7472,
-40864=>7473,
-12245=>7473,
-22575=>7474,
-27079=>7475,
-36953=>7476,
-29796=>7477,
-9472=>7479,
-9473=>7480,
-9474=>7481,
-9475=>7482,
-9476=>7483,
-9477=>7484,
-9478=>7485,
-9479=>7486,
-9480=>7487,
-9481=>7488,
-9482=>7489,
-9483=>7490,
-9484=>7491,
-9485=>7492,
-9486=>7493,
-9487=>7494,
-9488=>7495,
-9489=>7496,
-9490=>7497,
-9491=>7498,
-9492=>7499,
-9493=>7500,
-9494=>7501,
-9495=>7502,
-9496=>7503,
-9497=>7504,
-9498=>7505,
-9499=>7506,
-9500=>7507,
-9501=>7508,
-9502=>7509,
-9503=>7510,
-9504=>7511,
-9505=>7512,
-9506=>7513,
-9507=>7514,
-9508=>7515,
-9509=>7516,
-9510=>7517,
-9511=>7518,
-9512=>7519,
-9513=>7520,
-9514=>7521,
-9515=>7522,
-9516=>7523,
-9517=>7524,
-9518=>7525,
-9519=>7526,
-9520=>7527,
-9521=>7528,
-9522=>7529,
-9523=>7530,
-9524=>7531,
-9525=>7532,
-9526=>7533,
-9527=>7534,
-9528=>7535,
-9529=>7536,
-9530=>7537,
-9531=>7538,
-9532=>7539,
-9533=>7540,
-9534=>7541,
-9535=>7542,
-9536=>7543,
-9537=>7544,
-9538=>7545,
-9539=>7546,
-9540=>7547,
-9541=>7548,
-9542=>7549,
-9543=>7550,
-9544=>7551,
-9545=>7552,
-9546=>7553,
-9547=>7554,
-9312=>7555,
-9313=>7556,
-9314=>7557,
-9315=>7558,
-9316=>7559,
-9317=>7560,
-9318=>7561,
-9319=>7562,
-9320=>7563,
-9321=>7564,
-9322=>7565,
-9323=>7566,
-9324=>7567,
-9325=>7568,
-9326=>7569,
-9327=>7570,
-9328=>7571,
-9329=>7572,
-9330=>7573,
-9331=>7574,
-8544=>7575,
-8545=>7576,
-8546=>7577,
-8547=>7578,
-8548=>7579,
-8549=>7580,
-8550=>7581,
-8551=>7582,
-8552=>7583,
-8553=>7584,
-13129=>7585,
-13076=>7586,
-13133=>7588,
-13095=>7590,
-13110=>7592,
-13137=>7593,
-13069=>7595,
-13094=>7596,
-13099=>7598,
-13130=>7599,
-13212=>7601,
-13213=>7602,
-13214=>7603,
-13198=>7604,
-13199=>7605,
-13252=>7606,
-13217=>7607,
-12317=>7608,
-12319=>7609,
-8470=>7610,
-13261=>7611,
-12964=>7613,
-12965=>7614,
-12966=>7615,
-12967=>7616,
-12968=>7617,
-12849=>7618,
-12850=>7619,
-12857=>7620,
-13182=>7621,
-13181=>7622,
-13180=>7623,
-8750=>7624,
-8721=>7625,
-8735=>7629,
-8895=>7630,
-21854=>7633,
-167133=>7641,
-28976=>7644,
-40407=>7646,
-64054=>7651,
-22169=>7654,
-15694=>7655,
-20448=>7660,
-36544=>7663,
-194797=>7665,
-153716=>7670,
-32363=>7671,
-33606=>7672,
-167670=>7673,
-40572=>7677,
-26171=>7680,
-40628=>7682,
-26629=>7687,
-23650=>7693,
-194780=>7695,
-32353=>7697,
-64070=>7700,
-34083=>7706,
-37292=>7707,
-34796=>7715,
-25620=>7724,
-39506=>7727,
-64074=>7732,
-194692=>7734,
-31774=>7739,
-64016=>7746,
-25681=>7747,
-63980=>7750,
-22625=>7751,
-39002=>7752,
-194679=>7754,
-31153=>7758,
-28678=>7760,
-22218=>7770,
-21085=>7774,
-28497=>7776,
-37297=>7777,
-64106=>7788,
-38960=>7795,
-40629=>7797,
-33802=>7807,
-63939=>7808,
-63890=>7809,
-63891=>7810,
-63897=>7811,
-34847=>7813,
-194575=>7814,
-194771=>7816,
-194584=>7817,
-137754=>7825,
-23643=>7826,
-25890=>7831,
-26618=>7834,
-26766=>7836,
-148432=>7838,
-194848=>7839,
-34110=>7861,
-30562=>7877,
-65041=>7887,
-65042=>7888,
-65075=>7890,
-65073=>7892,
-65074=>7893,
-8285=>7897,
-65049=>7897,
-8282=>7898,
-65072=>7898,
-65077=>7899,
-65078=>7900,
-65081=>7901,
-65082=>7902,
-65095=>7903,
-65096=>7904,
-65079=>7905,
-65080=>7906,
-65087=>7907,
-65088=>7908,
-65085=>7909,
-65086=>7910,
-65089=>7911,
-65090=>7912,
-65091=>7913,
-65092=>7914,
-65083=>7915,
-65084=>7916,
-12436=>7958,
-12437=>7959,
-12438=>7960,
-22099=>7963,
-65508=>8005,
-65287=>8006,
-65282=>8007,
-9665=>8009,
-9655=>8010,
-8681=>8011,
-8679=>8012,
-8678=>8013,
-8680=>8014,
-9634=>8015,
-9831=>8016,
-9825=>8017,
-9828=>8018,
-9826=>8019,
-13216=>8020,
-13218=>8021,
-13220=>8022,
-13221=>8023,
-13207=>8024,
-8467=>8025,
-13208=>8026,
-13235=>8027,
-13234=>8028,
-13233=>8029,
-13232=>8030,
-13189=>8031,
-13190=>8032,
-13191=>8033,
-13259=>8034,
-13200=>8035,
-13268=>8036,
-13206=>8037,
-13090=>8038,
-13078=>8039,
-13080=>8040,
-13077=>8041,
-13059=>8042,
-13091=>8043,
-13143=>8044,
-13122=>8045,
-13113=>8046,
-13115=>8047,
-13056=>8048,
-13105=>8049,
-13127=>8050,
-13086=>8051,
-13098=>8052,
-13183=>8054,
-8481=>8055,
-9742=>8056,
-12342=>8057,
-12320=>8058,
-9352=>8062,
-9353=>8063,
-9354=>8064,
-9355=>8065,
-9356=>8066,
-9357=>8067,
-9358=>8068,
-9359=>8069,
-9360=>8070,
-9332=>8071,
-9333=>8072,
-9334=>8073,
-9335=>8074,
-9336=>8075,
-9337=>8076,
-9338=>8077,
-9339=>8078,
-9340=>8079,
-9341=>8080,
-9342=>8081,
-9343=>8082,
-9344=>8083,
-9345=>8084,
-9346=>8085,
-9347=>8086,
-9348=>8087,
-9349=>8088,
-9350=>8089,
-9351=>8090,
-12881=>8091,
-8560=>8092,
-8561=>8093,
-8562=>8094,
-8563=>8095,
-8564=>8096,
-8565=>8097,
-8566=>8098,
-8567=>8099,
-8568=>8100,
-8569=>8101,
-12882=>8102,
-12883=>8103,
-12884=>8104,
-12885=>8105,
-12886=>8106,
-12887=>8107,
-12888=>8108,
-12889=>8109,
-12890=>8110,
-12891=>8111,
-9372=>8112,
-9373=>8113,
-9374=>8114,
-9375=>8115,
-9376=>8116,
-9377=>8117,
-9378=>8118,
-9379=>8119,
-9380=>8120,
-9381=>8121,
-9382=>8122,
-9383=>8123,
-9384=>8124,
-9385=>8125,
-9386=>8126,
-9387=>8127,
-9388=>8128,
-9389=>8129,
-9390=>8130,
-9391=>8131,
-9392=>8132,
-9393=>8133,
-9394=>8134,
-9395=>8135,
-9396=>8136,
-9397=>8137,
-12867=>8138,
-12861=>8139,
-12863=>8140,
-12852=>8141,
-12856=>8142,
-12851=>8143,
-12860=>8144,
-12866=>8145,
-12862=>8146,
-12854=>8147,
-12853=>8148,
-12859=>8149,
-12864=>8150,
-12858=>8151,
-12976=>8152,
-12973=>8153,
-12969=>8154,
-12975=>8155,
-12948=>8156,
-12970=>8157,
-12952=>8158,
-12971=>8159,
-12946=>8160,
-12945=>8161,
-12947=>8162,
-12972=>8163,
-12974=>8164,
-12950=>8165,
-9131=>8174,
-9132=>8175,
-9133=>8176,
-9127=>8178,
-9128=>8179,
-9129=>8180,
-13260=>8182,
-13061=>8183,
-13215=>8186,
-13219=>8187,
-13222=>8188,
-12958=>8191,
-13192=>8192,
-13193=>8193,
-13256=>8194,
-8749=>8195,
-12848=>8197,
-12842=>8198,
-12843=>8199,
-12844=>8200,
-12845=>8201,
-12846=>8202,
-12847=>8203,
-12855=>8204,
-12865=>8205,
-10145=>8206,
-11013=>8207,
-11014=>8208,
-11015=>8209,
-9673=>8210,
-9824=>8211,
-9829=>8212,
-9827=>8213,
-9830=>8214,
-9728=>8215,
-9729=>8216,
-9730=>8217,
-9731=>8218,
-9758=>8219,
-9756=>8220,
-9757=>8221,
-9759=>8222,
-12953=>8223,
-9450=>8224,
-8554=>8225,
-8555=>8226,
-9601=>8230,
-9602=>8231,
-9603=>8232,
-9604=>8233,
-9605=>8234,
-9606=>8235,
-9607=>8236,
-9608=>8237,
-9615=>8238,
-9614=>8239,
-9613=>8240,
-9612=>8241,
-9611=>8242,
-9610=>8243,
-9609=>8244,
-9620=>8245,
-9621=>8246,
-9581=>8247,
-9582=>8248,
-9584=>8249,
-9583=>8250,
-9552=>8251,
-9566=>8252,
-9578=>8253,
-9569=>8254,
-9698=>8255,
-9699=>8256,
-9701=>8257,
-9700=>8258,
-9585=>8261,
-9586=>8262,
-9587=>8263,
-65040=>8268,
-20956=>8284,
-29081=>8285,
-10102=>8286,
-10103=>8287,
-10104=>8288,
-10105=>8289,
-10106=>8290,
-10107=>8291,
-10108=>8292,
-10109=>8293,
-10110=>8294,
-8570=>8298,
-8571=>8299,
-8575=>8303,
-8458=>8304,
-8457=>8305,
-8507=>8307,
-12292=>8308,
-8646=>8309,
-8644=>8310,
-8645=>8311,
-12535=>8313,
-12536=>8314,
-12537=>8315,
-12538=>8316,
-12957=>8319,
-13179=>8323,
-13107=>8327,
-13134=>8328,
-32394=>8359,
-35100=>8360,
-37704=>8361,
-37512=>8362,
-34012=>8363,
-20425=>8364,
-28859=>8365,
-26161=>8366,
-26824=>8367,
-37625=>8368,
-26363=>8369,
-24389=>8370,
-12033=>8371,
-20008=>8371,
-20193=>8372,
-20220=>8373,
-20224=>8374,
-20227=>8375,
-20281=>8376,
-20310=>8377,
-20370=>8378,
-20362=>8379,
-20378=>8380,
-20372=>8381,
-20429=>8382,
-20544=>8383,
-20514=>8384,
-20479=>8385,
-20510=>8386,
-20550=>8387,
-20592=>8388,
-20546=>8389,
-20628=>8390,
-20724=>8391,
-20696=>8392,
-20810=>8393,
-20836=>8394,
-20893=>8395,
-20926=>8396,
-20972=>8397,
-21013=>8398,
-21148=>8399,
-21158=>8400,
-21184=>8401,
-21211=>8402,
-21248=>8403,
-21284=>8405,
-21362=>8406,
-21395=>8407,
-21426=>8408,
-21469=>8409,
-64014=>8410,
-21660=>8411,
-21642=>8412,
-21673=>8413,
-21759=>8414,
-21894=>8415,
-22361=>8416,
-22373=>8417,
-22444=>8418,
-22472=>8419,
-22471=>8420,
-64015=>8421,
-22686=>8423,
-22706=>8424,
-22795=>8425,
-22867=>8426,
-22875=>8427,
-22877=>8428,
-22883=>8429,
-22948=>8430,
-22970=>8431,
-23382=>8432,
-23488=>8433,
-29999=>8434,
-23512=>8435,
-23582=>8437,
-23718=>8438,
-23738=>8439,
-23797=>8440,
-23847=>8441,
-23891=>8442,
-23874=>8444,
-23917=>8445,
-23992=>8446,
-23993=>8447,
-24016=>8448,
-24353=>8449,
-24372=>8450,
-24423=>8451,
-24503=>8452,
-24542=>8453,
-24669=>8454,
-24709=>8455,
-24714=>8456,
-24798=>8457,
-24789=>8458,
-24864=>8459,
-24818=>8460,
-24849=>8461,
-24887=>8462,
-24880=>8463,
-24984=>8464,
-25107=>8465,
-25254=>8466,
-25589=>8467,
-25696=>8468,
-25757=>8469,
-25806=>8470,
-25934=>8471,
-26112=>8472,
-26133=>8473,
-26121=>8474,
-26158=>8475,
-26148=>8477,
-26213=>8478,
-26199=>8479,
-26201=>8480,
-64018=>8481,
-26227=>8482,
-26265=>8483,
-26272=>8484,
-26290=>8485,
-26303=>8486,
-26362=>8487,
-26382=>8488,
-26470=>8490,
-26555=>8491,
-26706=>8492,
-26560=>8493,
-26692=>8495,
-26831=>8496,
-64019=>8497,
-26984=>8498,
-64020=>8499,
-27032=>8500,
-27106=>8501,
-27184=>8502,
-27243=>8503,
-27206=>8504,
-27251=>8505,
-27262=>8506,
-27362=>8507,
-27364=>8508,
-27606=>8509,
-27711=>8510,
-27740=>8511,
-27782=>8512,
-27759=>8513,
-27866=>8514,
-27908=>8515,
-28039=>8516,
-28015=>8517,
-28054=>8518,
-28076=>8519,
-28111=>8520,
-28152=>8521,
-28146=>8522,
-28156=>8523,
-28217=>8524,
-28252=>8525,
-28199=>8526,
-28220=>8527,
-28351=>8528,
-28552=>8529,
-28597=>8530,
-28661=>8531,
-28677=>8532,
-28679=>8533,
-28712=>8534,
-28805=>8535,
-28843=>8536,
-28943=>8537,
-28932=>8538,
-29020=>8539,
-28998=>8540,
-28999=>8541,
-29121=>8543,
-29182=>8544,
-29361=>8545,
-29374=>8546,
-29476=>8547,
-64022=>8548,
-29559=>8549,
-29629=>8550,
-29641=>8551,
-29654=>8552,
-29667=>8553,
-29650=>8554,
-29703=>8555,
-29685=>8556,
-29734=>8557,
-29738=>8558,
-29737=>8559,
-29742=>8560,
-29833=>8562,
-29855=>8563,
-29953=>8564,
-30063=>8565,
-30338=>8566,
-30364=>8567,
-30366=>8568,
-30363=>8569,
-30374=>8570,
-64023=>8571,
-30534=>8572,
-21167=>8573,
-30753=>8574,
-30798=>8575,
-30820=>8576,
-30842=>8577,
-31024=>8578,
-64024=>8579,
-64025=>8580,
-64026=>8581,
-31124=>8582,
-64027=>8583,
-31131=>8584,
-31441=>8585,
-31463=>8586,
-64028=>8587,
-31467=>8588,
-31646=>8589,
-64029=>8590,
-32072=>8591,
-32183=>8593,
-32160=>8594,
-32214=>8595,
-32338=>8596,
-32583=>8597,
-32673=>8598,
-64030=>8599,
-33537=>8600,
-33634=>8601,
-33663=>8602,
-33735=>8603,
-33782=>8604,
-33864=>8605,
-33972=>8606,
-34131=>8607,
-34137=>8608,
-34155=>8609,
-64031=>8610,
-34224=>8611,
-64032=>8612,
-64033=>8613,
-34823=>8614,
-35061=>8615,
-35346=>8616,
-35383=>8617,
-35449=>8618,
-35495=>8619,
-35518=>8620,
-35551=>8621,
-64034=>8622,
-35574=>8623,
-35667=>8624,
-35711=>8625,
-36080=>8626,
-36084=>8627,
-36114=>8628,
-36214=>8629,
-64035=>8630,
-36559=>8631,
-64037=>8633,
-36967=>8634,
-37086=>8635,
-64038=>8636,
-37141=>8637,
-37159=>8638,
-37338=>8639,
-37335=>8640,
-37342=>8641,
-37357=>8642,
-37358=>8643,
-37348=>8644,
-37349=>8645,
-37382=>8646,
-37392=>8647,
-37386=>8648,
-37434=>8649,
-37440=>8650,
-37436=>8651,
-37454=>8652,
-37465=>8653,
-37457=>8654,
-37433=>8655,
-37479=>8656,
-37543=>8657,
-37495=>8658,
-37496=>8659,
-37607=>8660,
-37591=>8661,
-37593=>8662,
-37584=>8663,
-64039=>8664,
-37589=>8665,
-37600=>8666,
-37587=>8667,
-37669=>8668,
-37665=>8669,
-37627=>8670,
-64040=>8671,
-37662=>8672,
-37631=>8673,
-37661=>8674,
-37634=>8675,
-37744=>8676,
-37719=>8677,
-37796=>8678,
-37830=>8679,
-37854=>8680,
-37880=>8681,
-37937=>8682,
-37957=>8683,
-37960=>8684,
-38290=>8685,
-64041=>8687,
-38557=>8688,
-38575=>8689,
-38707=>8690,
-38715=>8691,
-38723=>8692,
-38733=>8693,
-38735=>8694,
-12205=>8695,
-38737=>8695,
-38999=>8697,
-39013=>8698,
-64042=>8699,
-64043=>8700,
-39207=>8701,
-64044=>8702,
-39326=>8703,
-39502=>8704,
-39641=>8705,
-39644=>8706,
-39797=>8707,
-39794=>8708,
-39823=>8709,
-39857=>8710,
-39867=>8711,
-39936=>8712,
-40304=>8713,
-40299=>8714,
-64045=>8715,
-40473=>8716,
-40657=>8717,
-8364=>9354,
-8486=>9355,
-64256=>9358,
-64259=>9359,
-64260=>9360,
-257=>9361,
-299=>9362,
-363=>9363,
-275=>9364,
-333=>9365,
-256=>9366,
-298=>9367,
-362=>9368,
-274=>9369,
-332=>9370,
-8539=>9371,
-8540=>9372,
-8541=>9373,
-8542=>9374,
-8531=>9375,
-8532=>9376,
-8304=>9377,
-8308=>9378,
-8309=>9379,
-8310=>9380,
-8311=>9381,
-8312=>9382,
-8313=>9383,
-8320=>9384,
-8321=>9385,
-8322=>9386,
-8323=>9387,
-8324=>9388,
-8325=>9389,
-8326=>9390,
-8327=>9391,
-8328=>9392,
-8329=>9393,
-461=>9394,
-282=>9395,
-7868=>9397,
-463=>9398,
-296=>9400,
-465=>9401,
-467=>9403,
-366=>9404,
-360=>9405,
-462=>9406,
-283=>9407,
-7869=>9409,
-464=>9410,
-297=>9412,
-466=>9413,
-468=>9415,
-367=>9416,
-361=>9417,
-593=>9418,
-8049=>9419,
-8048=>9420,
-509=>9421,
-596=>9423,
-601=>9426,
-602=>9429,
-603=>9432,
-8051=>9433,
-8050=>9434,
-567=>9435,
-331=>9436,
-629=>9437,
-652=>9438,
-658=>9441,
-643=>9442,
-720=>9443,
-8534=>9785,
-8535=>9786,
-8536=>9787,
-8537=>9788,
-8538=>9789,
-12832=>10126,
-12833=>10127,
-12834=>10128,
-12835=>10129,
-12836=>10130,
-12837=>10131,
-12838=>10132,
-12839=>10133,
-12840=>10134,
-12841=>10135,
-12892=>10244,
-12893=>10245,
-12894=>10246,
-12895=>10247,
-12977=>10248,
-12978=>10249,
-12979=>10250,
-12980=>10251,
-12981=>10252,
-12982=>10253,
-12983=>10254,
-12984=>10255,
-12985=>10256,
-12986=>10257,
-12987=>10258,
-12988=>10259,
-12989=>10260,
-12990=>10261,
-12991=>10262,
-9424=>10313,
-9425=>10314,
-9426=>10315,
-9427=>10316,
-9428=>10317,
-9429=>10318,
-9430=>10319,
-9431=>10320,
-9432=>10321,
-9433=>10322,
-9434=>10323,
-9435=>10324,
-9436=>10325,
-9437=>10326,
-9438=>10327,
-9439=>10328,
-9440=>10329,
-9441=>10330,
-9442=>10331,
-9443=>10332,
-9444=>10333,
-9445=>10334,
-9446=>10335,
-9447=>10336,
-9448=>10337,
-9449=>10338,
-9398=>10339,
-9399=>10340,
-9400=>10341,
-9401=>10342,
-9402=>10343,
-9403=>10344,
-9404=>10345,
-9405=>10346,
-9406=>10347,
-9407=>10348,
-9408=>10349,
-9409=>10350,
-9410=>10351,
-9411=>10352,
-9412=>10353,
-9413=>10354,
-9414=>10355,
-9415=>10356,
-9416=>10357,
-9417=>10358,
-9418=>10359,
-9419=>10360,
-9420=>10361,
-9421=>10362,
-9422=>10363,
-9423=>10364,
-13008=>10413,
-13009=>10414,
-13010=>10415,
-13011=>10416,
-13012=>10417,
-13013=>10418,
-13014=>10419,
-13015=>10420,
-13016=>10421,
-13017=>10422,
-13018=>10423,
-13019=>10424,
-13020=>10425,
-13021=>10426,
-13022=>10427,
-13023=>10428,
-13024=>10429,
-13025=>10430,
-13026=>10431,
-13027=>10432,
-13028=>10433,
-13029=>10434,
-13030=>10435,
-13031=>10436,
-13032=>10437,
-13033=>10438,
-13034=>10439,
-13035=>10440,
-13036=>10441,
-13037=>10442,
-13038=>10443,
-13039=>10444,
-13040=>10445,
-13041=>10446,
-13042=>10447,
-13043=>10448,
-13044=>10449,
-13045=>10450,
-13046=>10451,
-13047=>10452,
-13048=>10453,
-13049=>10454,
-13050=>10455,
-13051=>10456,
-13052=>10457,
-13053=>10458,
-13054=>10459,
-12928=>10461,
-12929=>10462,
-12930=>10463,
-12931=>10464,
-12932=>10465,
-12933=>10466,
-12934=>10467,
-12935=>10468,
-12936=>10469,
-12937=>10470,
-12944=>10471,
-12938=>10472,
-12939=>10473,
-12940=>10474,
-12941=>10475,
-12942=>10476,
-12943=>10477,
-12959=>10479,
-12960=>10486,
-12961=>10487,
-12955=>10488,
-12954=>10489,
-12963=>10490,
-12962=>10491,
-12951=>10492,
-12956=>10494,
-12949=>10495,
-9676=>10502,
-9471=>10503,
-10111=>10514,
-9451=>10515,
-9452=>10516,
-9453=>10517,
-9454=>10518,
-9455=>10519,
-9456=>10520,
-9457=>10521,
-9458=>10522,
-9459=>10523,
-9460=>10524,
-8414=>11035,
-13274=>11851,
-8448=>11855,
-13250=>11856,
-8453=>11859,
-13169=>11861,
-13197=>11864,
-13211=>11865,
-13271=>11869,
-13272=>11870,
-13057=>11874,
-13058=>11875,
-13060=>11876,
-13062=>11877,
-13064=>11879,
-13063=>11881,
-13066=>11882,
-13065=>11884,
-13067=>11886,
-13068=>11888,
-13070=>11889,
-13071=>11890,
-13072=>11891,
-13073=>11892,
-13074=>11893,
-13075=>11894,
-13079=>11896,
-13081=>11898,
-13082=>11900,
-13083=>11901,
-13084=>11902,
-13085=>11903,
-13087=>11904,
-13088=>11905,
-13089=>11906,
-13092=>11907,
-13093=>11909,
-13096=>11912,
-13097=>11913,
-13101=>11915,
-13102=>11918,
-13103=>11919,
-13104=>11920,
-13106=>11921,
-13108=>11924,
-13109=>11925,
-13116=>11926,
-13111=>11930,
-13112=>11932,
-13114=>11933,
-13117=>11934,
-13121=>11935,
-13118=>11936,
-13119=>11937,
-13120=>11938,
-13123=>11939,
-13124=>11940,
-13125=>11941,
-13126=>11942,
-13128=>11943,
-13131=>11944,
-13132=>11945,
-13135=>11946,
-13136=>11947,
-13138=>11950,
-13140=>11951,
-13139=>11954,
-13141=>11955,
-13142=>11956,
-8501=>12089,
-976=>12090,
-8714=>12091,
-8463=>12092,
-981=>12094,
-987=>12095,
-977=>12096,
-9832=>12098,
-9833=>12099,
-9836=>12100,
-12347=>12106,
-12339=>12108,
-12340=>12109,
-12341=>12110,
-8252=>12111,
-8265=>12112,
-8723=>12118,
-8771=>12120,
-8818=>12121,
-8819=>12122,
-12312=>12129,
-12313=>12130,
-65375=>12131,
-65376=>12132,
-9115=>12143,
-9117=>12144,
-9118=>12145,
-9120=>12146,
-9121=>12151,
-9123=>12152,
-9124=>12153,
-9126=>12154,
-9116=>12167,
-9119=>12167,
-9122=>12167,
-9125=>12167,
-9130=>12167,
-9986=>12176,
-12349=>12179,
-12447=>12181,
-8709=>12184,
-8864=>12185,
-8854=>12186,
-8856=>12187,
-8853=>12188,
-8855=>12189,
-9888=>12192,
-9664=>12194,
-9654=>12195,
-8656=>12200,
-8596=>12201,
-8600=>12202,
-8601=>12203,
-8598=>12204,
-8599=>12205,
-8652=>12206,
-8651=>12207,
-12336=>12218,
-8967=>12219,
-10048=>12228,
-10047=>12229,
-9643=>12237,
-9642=>12239,
-10010=>12241,
-9702=>12254,
-10070=>12259,
-65093=>12639,
-65094=>12640,
-64103=>13320,
-64098=>13321,
-32227=>13322,
-12232=>13323,
-40643=>13323,
-28331=>13324,
-64082=>13325,
-64061=>13326,
-64069=>13327,
-64062=>13328,
-27114=>13329,
-28212=>13330,
-64096=>13331,
-64071=>13332,
-64056=>13333,
-64066=>13334,
-64078=>13335,
-34395=>13336,
-64105=>13337,
-64052=>13338,
-64099=>13339,
-25581=>13340,
-25802=>13341,
-30799=>13342,
-64084=>13343,
-63856=>13344,
-64077=>13345,
-64097=>13346,
-64072=>13347,
-64076=>13348,
-64091=>13349,
-64092=>13350,
-64081=>13351,
-64067=>13352,
-64090=>13353,
-28041=>13354,
-29376=>13355,
-194885=>13357,
-64086=>13358,
-64080=>13359,
-64049=>13360,
-64059=>13361,
-24034=>13362,
-64063=>13363,
-64101=>13364,
-21373=>13365,
-64055=>13366,
-64095=>13367,
-24501=>13368,
-64064=>13369,
-64083=>13371,
-64085=>13373,
-64104=>13374,
-64068=>13375,
-64089=>13376,
-26202=>13377,
-64053=>13378,
-64075=>13379,
-64100=>13380,
-64065=>13381,
-64048=>13382,
-64057=>13384,
-64051=>13385,
-27493=>13386,
-64058=>13387,
-27599=>13388,
-64050=>13389,
-25150=>13390,
-64079=>13391,
-63773=>13392,
-63964=>13393,
-63798=>13394,
-28122=>13395,
-63952=>13396,
-26310=>13397,
-27511=>13398,
-64087=>13399,
-37706=>13400,
-37636=>13402,
-133390=>13523,
-35999=>13644,
-11991=>13645,
-11965=>13646,
-158033=>13646,
-37555=>13652,
-38321=>13653,
-194812=>13656,
-194965=>13670,
-194794=>13679,
-26478=>13681,
-11974=>13682,
-194594=>13684,
-156194=>13691,
-13314=>13698,
-26083=>13701,
-134071=>13706,
-171339=>13717,
-194611=>13719,
-24378=>13720,
-11945=>13729,
-20465=>13731,
-63753=>13739,
-11964=>13747,
-194732=>13750,
-26435=>13751,
-133732=>13755,
-35329=>13756,
-25142=>13757,
-21555=>13760,
-23067=>13761,
-25221=>13765,
-194819=>13768,
-21567=>13775,
-27506=>13785,
-29986=>13790,
-19256=>13791,
-24063=>13794,
-194827=>13801,
-29626=>13802,
-134047=>13803,
-194600=>13807,
-194849=>13809,
-194623=>13815,
-194675=>13832,
-11916=>13833,
-11917=>13834,
-23577=>13835,
-131083=>13839,
-23426=>13840,
-194642=>13841,
-11997=>13847,
-11999=>13848,
-39136=>13848,
-11998=>13849,
-169599=>13849,
-14221=>13850,
-11927=>13852,
-14586=>13852,
-194887=>13854,
-11909=>13856,
-20155=>13856,
-131490=>13857,
-13599=>13865,
-194738=>13867,
-11971=>13870,
-35200=>13870,
-31237=>13875,
-35498=>13880,
-32085=>13882,
-28568=>13884,
-25591=>13892,
-30246=>13893,
-11978=>13898,
-163767=>13898,
-146686=>13904,
-13351=>13910,
-33067=>13913,
-194842=>13916,
-11950=>13922,
-154327=>13922,
-194714=>13928,
-194831=>13932,
-22305=>13952,
-135741=>13953,
-194586=>13954,
-64003=>13956,
-21534=>13964,
-15240=>13965,
-20839=>13966,
-63839=>13971,
-20023=>13981,
-11946=>13995,
-150804=>13995,
-24421=>13996,
-23020=>13997,
-194658=>13998,
-24217=>14000,
-13416=>14047,
-40884=>14048,
-21200=>14056,
-38376=>14061,
-26625=>14066,
-195024=>14068,
-195039=>14069,
-153215=>14075,
-11959=>14078,
-36534=>14083,
-63775=>14084,
-63875=>14088,
-31867=>14094,
-63906=>14095,
-63898=>14097,
-11961=>14099,
-32770=>14099,
-157360=>14100,
-11911=>14105,
-132648=>14105,
-131210=>14108,
-133508=>14109,
-194604=>14109,
-11915=>14110,
-13630=>14110,
-21589=>14115,
-22841=>14117,
-23414=>14120,
-194669=>14121,
-23572=>14122,
-14306=>14123,
-23782=>14124,
-20040=>14126,
-194742=>14129,
-158105=>14134,
-25371=>14135,
-26211=>14138,
-194779=>14140,
-27126=>14143,
-27014=>14144,
-27596=>14148,
-28183=>14150,
-27818=>14153,
-11942=>14157,
-20012=>14157,
-29935=>14160,
-30069=>14161,
-30188=>14162,
-30286=>14163,
-16305=>14164,
-30570=>14165,
-30633=>14166,
-31571=>14173,
-16996=>14176,
-194924=>14180,
-32328=>14183,
-132415=>14188,
-11955=>14189,
-156266=>14189,
-33089=>14194,
-17491=>14195,
-33401=>14197,
-11966=>14197,
-64094=>14198,
-11967=>14198,
-64093=>14199,
-11968=>14199,
-20857=>14201,
-33626=>14202,
-17701=>14206,
-34292=>14208,
-131248=>14209,
-34429=>14214,
-13358=>14216,
-35014=>14217,
-18406=>14224,
-36808=>14233,
-166279=>14253,
-167447=>14256,
-38969=>14259,
-39432=>14266,
-39903=>14271,
-148206=>14282,
-21385=>14288,
-64017=>14290,
-194785=>14291,
-146622=>14293,
-132625=>14294,
-19972=>14296,
-19973=>14297,
-19999=>14298,
-20011=>14299,
-20015=>14300,
-20016=>14301,
-20032=>14302,
-20033=>14303,
-20036=>14304,
-11907=>14305,
-20058=>14305,
-20095=>14306,
-20109=>14307,
-20118=>14308,
-20153=>14309,
-20176=>14310,
-20192=>14311,
-20221=>14312,
-20223=>14313,
-20235=>14314,
-20245=>14315,
-20320=>14316,
-20283=>14317,
-20297=>14318,
-20308=>14319,
-20346=>14320,
-20349=>14321,
-20350=>14322,
-20375=>14323,
-20414=>14324,
-20431=>14325,
-20477=>14326,
-20480=>14327,
-20481=>14328,
-20496=>14329,
-20507=>14330,
-20519=>14331,
-20526=>14332,
-20567=>14333,
-20582=>14334,
-20586=>14335,
-20539=>14336,
-20623=>14337,
-20630=>14338,
-20636=>14339,
-20684=>14340,
-20710=>14341,
-20713=>14342,
-20719=>14343,
-20744=>14344,
-20747=>14345,
-20752=>14346,
-20763=>14347,
-20766=>14348,
-20831=>14349,
-20897=>14350,
-20924=>14351,
-20974=>14353,
-20980=>14354,
-20993=>14355,
-11913=>14356,
-20994=>14356,
-21011=>14357,
-21065=>14358,
-21089=>14359,
-21094=>14360,
-21139=>14361,
-21192=>14362,
-21232=>14363,
-21258=>14364,
-21259=>14365,
-21310=>14366,
-21324=>14367,
-21323=>14368,
-21345=>14369,
-21356=>14370,
-21419=>14371,
-21466=>14372,
-21478=>14373,
-21493=>14374,
-21543=>14375,
-21581=>14376,
-21606=>14377,
-21611=>14378,
-21620=>14379,
-21645=>14380,
-21654=>14381,
-21665=>14382,
-21677=>14383,
-21689=>14384,
-21695=>14385,
-21702=>14386,
-21709=>14387,
-21774=>14388,
-21803=>14389,
-21813=>14390,
-21834=>14391,
-21856=>14392,
-21896=>14394,
-21902=>14395,
-22024=>14396,
-22030=>14397,
-22031=>14398,
-22071=>14399,
-22079=>14400,
-22089=>14401,
-22091=>14402,
-22095=>14403,
-22118=>14404,
-22121=>14405,
-22127=>14406,
-22129=>14407,
-22130=>14408,
-22165=>14409,
-22170=>14410,
-22188=>14411,
-22189=>14412,
-22193=>14413,
-22217=>14414,
-22237=>14415,
-22244=>14416,
-22282=>14417,
-22293=>14418,
-22307=>14419,
-22319=>14420,
-22323=>14421,
-22324=>14422,
-22348=>14423,
-22384=>14424,
-22412=>14425,
-22428=>14426,
-22456=>14427,
-22502=>14428,
-22509=>14429,
-22517=>14430,
-22518=>14431,
-22527=>14432,
-22537=>14433,
-22560=>14434,
-22578=>14435,
-22652=>14436,
-22656=>14437,
-22697=>14438,
-22734=>14439,
-22736=>14440,
-22740=>14441,
-22746=>14442,
-22761=>14443,
-22796=>14444,
-22820=>14445,
-22831=>14446,
-22881=>14447,
-22893=>14448,
-22986=>14449,
-22994=>14450,
-23005=>14451,
-23011=>14452,
-23012=>14453,
-23044=>14454,
-23052=>14455,
-23075=>14456,
-23111=>14457,
-23125=>14458,
-23139=>14459,
-23149=>14460,
-23166=>14461,
-23198=>14462,
-23207=>14463,
-23212=>14464,
-23219=>14465,
-23264=>14466,
-23296=>14467,
-23321=>14468,
-23333=>14469,
-23341=>14470,
-23361=>14471,
-23420=>14472,
-23422=>14473,
-23423=>14474,
-23434=>14475,
-11919=>14476,
-23587=>14476,
-23595=>14477,
-23600=>14478,
-23651=>14479,
-23657=>14480,
-23676=>14481,
-23755=>14482,
-23762=>14483,
-23796=>14484,
-23844=>14485,
-23846=>14486,
-23875=>14487,
-23878=>14488,
-23882=>14489,
-23954=>14490,
-23956=>14491,
-23961=>14492,
-23968=>14493,
-24024=>14494,
-24032=>14495,
-24056=>14496,
-24064=>14497,
-24082=>14498,
-24084=>14499,
-24085=>14500,
-24088=>14501,
-24110=>14502,
-24152=>14503,
-24171=>14504,
-24172=>14505,
-24232=>14506,
-24234=>14507,
-24254=>14508,
-24255=>14509,
-24274=>14511,
-24327=>14512,
-24334=>14513,
-24348=>14514,
-24349=>14515,
-24354=>14516,
-24360=>14517,
-24374=>14518,
-24379=>14519,
-24384=>14520,
-12089=>14521,
-24400=>14521,
-24408=>14522,
-24420=>14523,
-24457=>14524,
-24476=>14525,
-24487=>14526,
-24484=>14527,
-24495=>14528,
-24504=>14529,
-11926=>14530,
-24516=>14530,
-24521=>14531,
-24545=>14532,
-24553=>14533,
-24557=>14534,
-24572=>14535,
-24599=>14536,
-24602=>14537,
-24627=>14538,
-24673=>14539,
-24703=>14540,
-24734=>14541,
-24740=>14542,
-24752=>14543,
-24779=>14544,
-24795=>14545,
-24824=>14546,
-24850=>14547,
-24851=>14548,
-24852=>14549,
-24860=>14550,
-24956=>14551,
-24973=>14552,
-24991=>14553,
-25000=>14554,
-25026=>14555,
-25055=>14556,
-25109=>14557,
-25129=>14558,
-25155=>14559,
-25158=>14560,
-11928=>14561,
-25164=>14561,
-25169=>14562,
-25174=>14563,
-25284=>14564,
-25340=>14565,
-25354=>14566,
-25357=>14567,
-25368=>14568,
-25401=>14569,
-25410=>14570,
-25411=>14571,
-25445=>14572,
-25460=>14573,
-25469=>14574,
-25476=>14575,
-25479=>14576,
-25488=>14577,
-25502=>14578,
-25553=>14579,
-25564=>14580,
-25609=>14581,
-25616=>14582,
-25634=>14583,
-25684=>14584,
-25691=>14585,
-25709=>14586,
-25723=>14587,
-25790=>14588,
-25791=>14589,
-25829=>14590,
-25847=>14591,
-25851=>14592,
-25860=>14593,
-25878=>14594,
-25881=>14595,
-25927=>14596,
-25959=>14597,
-25985=>14598,
-25989=>14599,
-26050=>14600,
-26096=>14601,
-26098=>14602,
-26156=>14603,
-26188=>14604,
-26203=>14605,
-26204=>14606,
-26209=>14607,
-26219=>14608,
-26276=>14610,
-26312=>14611,
-26348=>14612,
-26373=>14613,
-26387=>14614,
-26419=>14615,
-26440=>14616,
-26444=>14617,
-26486=>14618,
-26491=>14619,
-26544=>14620,
-26546=>14621,
-26617=>14622,
-26583=>14623,
-26585=>14624,
-26608=>14625,
-26668=>14626,
-26672=>14627,
-26673=>14628,
-26715=>14629,
-26738=>14630,
-26741=>14631,
-26746=>14632,
-26756=>14633,
-26789=>14634,
-26802=>14635,
-26832=>14636,
-26838=>14637,
-26856=>14638,
-26861=>14639,
-26864=>14640,
-26865=>14641,
-26876=>14642,
-26897=>14643,
-26899=>14644,
-26933=>14645,
-26939=>14646,
-26967=>14647,
-26979=>14648,
-26994=>14649,
-27007=>14650,
-27008=>14651,
-27046=>14652,
-27053=>14653,
-27063=>14654,
-27094=>14655,
-27095=>14656,
-27137=>14657,
-27151=>14658,
-27157=>14659,
-27176=>14660,
-27188=>14661,
-27198=>14662,
-27205=>14663,
-27216=>14664,
-27217=>14665,
-27222=>14666,
-27227=>14667,
-27267=>14668,
-27273=>14669,
-27281=>14670,
-27293=>14671,
-27294=>14672,
-27295=>14673,
-27356=>14674,
-27367=>14675,
-27372=>14676,
-27422=>14677,
-27428=>14678,
-27445=>14679,
-27462=>14680,
-27478=>14681,
-27488=>14682,
-27522=>14683,
-27582=>14684,
-27617=>14685,
-27633=>14686,
-27664=>14687,
-27699=>14688,
-27701=>14689,
-11937=>14689,
-11938=>14690,
-27737=>14691,
-27766=>14692,
-27771=>14693,
-27781=>14694,
-27797=>14695,
-27804=>14696,
-27856=>14697,
-27860=>14698,
-27862=>14699,
-27872=>14700,
-27883=>14701,
-27884=>14702,
-27886=>14703,
-27914=>14704,
-27918=>14705,
-27921=>14706,
-27950=>14707,
-27991=>14708,
-27998=>14709,
-28005=>14710,
-28034=>14711,
-28095=>14712,
-28100=>14713,
-28106=>14714,
-28118=>14715,
-28137=>14716,
-28194=>14717,
-28241=>14718,
-28359=>14719,
-28362=>14720,
-28366=>14721,
-28413=>14722,
-28442=>14723,
-28458=>14724,
-28463=>14725,
-28467=>14726,
-28506=>14727,
-28510=>14728,
-28514=>14729,
-28541=>14730,
-28555=>14731,
-28557=>14732,
-28562=>14733,
-28564=>14734,
-28570=>14735,
-28583=>14736,
-28584=>14737,
-28598=>14738,
-28634=>14739,
-28638=>14740,
-28729=>14742,
-28732=>14743,
-28756=>14745,
-28765=>14746,
-28766=>14747,
-28772=>14748,
-11939=>14749,
-28780=>14749,
-28798=>14750,
-28801=>14751,
-28821=>14752,
-28855=>14753,
-28883=>14754,
-28884=>14755,
-28888=>14756,
-28892=>14757,
-28935=>14758,
-28960=>14759,
-28977=>14760,
-29002=>14761,
-29010=>14762,
-29024=>14763,
-29049=>14764,
-29074=>14765,
-29131=>14767,
-29139=>14768,
-29142=>14769,
-29184=>14770,
-29213=>14771,
-29227=>14772,
-29240=>14773,
-29249=>14774,
-29267=>14775,
-29269=>14776,
-29270=>14777,
-29276=>14778,
-29325=>14779,
-11944=>14780,
-29357=>14780,
-29364=>14781,
-29383=>14782,
-29435=>14783,
-29444=>14784,
-29445=>14785,
-29480=>14786,
-29489=>14787,
-29507=>14788,
-29548=>14789,
-29564=>14790,
-29571=>14791,
-29573=>14792,
-29574=>14793,
-29589=>14794,
-29598=>14795,
-29599=>14796,
-29600=>14797,
-29606=>14798,
-29611=>14799,
-29621=>14800,
-29623=>14801,
-29628=>14802,
-29647=>14803,
-29657=>14804,
-29673=>14805,
-29684=>14806,
-29693=>14807,
-29700=>14808,
-29706=>14809,
-29722=>14810,
-29723=>14811,
-29732=>14812,
-29736=>14813,
-29740=>14814,
-29743=>14815,
-29744=>14816,
-29745=>14817,
-29753=>14818,
-29764=>14819,
-29767=>14820,
-29771=>14821,
-29773=>14822,
-29777=>14823,
-29783=>14824,
-29798=>14825,
-29803=>14826,
-29809=>14827,
-29824=>14828,
-29829=>14829,
-29830=>14830,
-29831=>14831,
-29840=>14832,
-29848=>14833,
-29852=>14834,
-29856=>14835,
-29859=>14836,
-29864=>14837,
-29867=>14838,
-29877=>14839,
-29887=>14840,
-29896=>14841,
-29914=>14842,
-29918=>14843,
-30030=>14844,
-30073=>14845,
-30081=>14846,
-30096=>14847,
-12135=>14848,
-30098=>14848,
-30099=>14849,
-30132=>14850,
-30180=>14851,
-30201=>14852,
-30208=>14853,
-30218=>14854,
-30229=>14855,
-30230=>14856,
-30233=>14857,
-30238=>14858,
-30253=>14859,
-30261=>14860,
-30275=>14861,
-30283=>14862,
-30309=>14863,
-30317=>14864,
-30319=>14865,
-30321=>14866,
-30324=>14867,
-30372=>14868,
-30373=>14869,
-30405=>14870,
-30412=>14871,
-30444=>14872,
-30460=>14873,
-30516=>14874,
-30518=>14875,
-30556=>14876,
-30559=>14877,
-30560=>14878,
-30578=>14879,
-30589=>14880,
-30613=>14881,
-30634=>14882,
-30694=>14883,
-30704=>14884,
-30708=>14885,
-30726=>14886,
-30754=>14887,
-30765=>14888,
-30766=>14889,
-30768=>14890,
-30773=>14891,
-30824=>14892,
-30878=>14893,
-30920=>14894,
-30924=>14895,
-30926=>14896,
-30948=>14897,
-30944=>14898,
-30945=>14899,
-30962=>14900,
-30967=>14901,
-30971=>14902,
-31025=>14903,
-11949=>14905,
-31035=>14905,
-31037=>14906,
-31045=>14907,
-31067=>14908,
-31068=>14909,
-31115=>14910,
-31126=>14911,
-31128=>14912,
-12145=>14913,
-31160=>14913,
-31163=>14914,
-31178=>14915,
-31194=>14916,
-31235=>14917,
-31241=>14918,
-31249=>14919,
-31262=>14920,
-31277=>14921,
-31289=>14922,
-31301=>14923,
-31308=>14924,
-31325=>14925,
-31341=>14927,
-31352=>14928,
-31392=>14929,
-31395=>14930,
-31411=>14931,
-31419=>14932,
-31420=>14933,
-31430=>14934,
-31495=>14935,
-31508=>14936,
-31527=>14937,
-31537=>14938,
-31559=>14939,
-31566=>14940,
-31584=>14941,
-31593=>14942,
-31597=>14943,
-31602=>14944,
-31633=>14945,
-31663=>14946,
-31703=>14947,
-31705=>14948,
-31755=>14949,
-31759=>14950,
-31776=>14951,
-31782=>14952,
-31793=>14953,
-31798=>14954,
-31825=>14955,
-31833=>14956,
-31847=>14957,
-31854=>14958,
-31856=>14959,
-31932=>14960,
-31935=>14961,
-31944=>14962,
-31945=>14963,
-31959=>14964,
-31961=>14965,
-31965=>14966,
-31979=>14967,
-32007=>14968,
-32008=>14969,
-32009=>14970,
-32019=>14971,
-32029=>14972,
-32035=>14973,
-32065=>14974,
-32083=>14975,
-32089=>14976,
-32093=>14977,
-32122=>14978,
-32134=>14979,
-32139=>14980,
-32140=>14981,
-32204=>14982,
-32235=>14983,
-32241=>14984,
-32249=>14985,
-32264=>14986,
-32273=>14987,
-32277=>14988,
-32288=>14989,
-32327=>14990,
-32354=>14991,
-32366=>14992,
-32371=>14993,
-32397=>14994,
-32401=>14995,
-32408=>14996,
-32580=>14997,
-32591=>14998,
-11947=>14999,
-11954=>14999,
-32594=>14999,
-11953=>15000,
-32595=>15000,
-32609=>15001,
-32657=>15002,
-32703=>15003,
-32718=>15004,
-32735=>15005,
-32741=>15006,
-32748=>15007,
-32750=>15008,
-32751=>15009,
-32762=>15010,
-32782=>15011,
-32785=>15012,
-32788=>15013,
-32804=>15014,
-32806=>15015,
-32826=>15016,
-32828=>15017,
-32864=>15018,
-32881=>15019,
-32885=>15020,
-32926=>15021,
-32934=>15022,
-32939=>15023,
-32983=>15024,
-32984=>15025,
-33046=>15026,
-33048=>15027,
-33082=>15028,
-33098=>15029,
-33100=>15030,
-33153=>15031,
-33156=>15032,
-33204=>15033,
-33231=>15034,
-33273=>15035,
-33283=>15036,
-33313=>15037,
-33330=>15038,
-33332=>15039,
-33350=>15040,
-33355=>15041,
-33359=>15042,
-33422=>15043,
-33454=>15044,
-33463=>15045,
-33470=>15046,
-33478=>15047,
-33534=>15048,
-33603=>15049,
-33617=>15050,
-33621=>15051,
-33670=>15052,
-33677=>15053,
-33682=>15054,
-33688=>15055,
-33705=>15056,
-33727=>15057,
-33728=>15058,
-33770=>15059,
-33807=>15060,
-33809=>15061,
-33866=>15062,
-33910=>15063,
-33960=>15064,
-33967=>15065,
-33984=>15066,
-33986=>15067,
-34032=>15068,
-34045=>15069,
-34060=>15070,
-34100=>15071,
-34142=>15072,
-34191=>15073,
-34231=>15074,
-34254=>15075,
-34221=>15076,
-34322=>15077,
-34345=>15078,
-34386=>15079,
-34403=>15080,
-34412=>15081,
-34415=>15082,
-34426=>15083,
-34445=>15084,
-34449=>15085,
-34456=>15086,
-34471=>15087,
-34472=>15088,
-34554=>15089,
-34557=>15090,
-34571=>15091,
-34579=>15092,
-34585=>15093,
-34590=>15094,
-34600=>15095,
-34622=>15096,
-34673=>15097,
-34696=>15098,
-34713=>15099,
-34732=>15100,
-34733=>15101,
-34741=>15102,
-34774=>15103,
-34795=>15104,
-34797=>15105,
-34817=>15106,
-34822=>15108,
-34827=>15109,
-34836=>15110,
-34844=>15111,
-34902=>15112,
-34911=>15113,
-11970=>15114,
-34916=>15114,
-34968=>15115,
-34986=>15116,
-35005=>15117,
-35006=>15118,
-35018=>15119,
-35026=>15120,
-35035=>15121,
-35056=>15122,
-35057=>15123,
-35078=>15124,
-35096=>15125,
-35097=>15126,
-35098=>15127,
-35111=>15128,
-35120=>15129,
-35134=>15130,
-35195=>15131,
-35284=>15132,
-35286=>15133,
-35301=>15134,
-35313=>15135,
-35335=>15136,
-35343=>15137,
-35349=>15138,
-35362=>15139,
-35406=>15140,
-35455=>15141,
-35572=>15142,
-35615=>15143,
-35639=>15144,
-35651=>15145,
-35652=>15146,
-35668=>15147,
-35740=>15148,
-35742=>15149,
-35911=>15150,
-35924=>15151,
-35955=>15152,
-36004=>15153,
-36057=>15154,
-36065=>15155,
-36088=>15156,
-36094=>15157,
-36123=>15158,
-36201=>15159,
-36204=>15160,
-36228=>15161,
-36237=>15162,
-36245=>15163,
-36262=>15164,
-36294=>15165,
-36302=>15166,
-36324=>15167,
-36332=>15168,
-36384=>15169,
-36427=>15170,
-36460=>15171,
-36464=>15172,
-36474=>15173,
-36498=>15174,
-36526=>15175,
-36531=>15176,
-36561=>15177,
-36564=>15178,
-36601=>15179,
-36631=>15180,
-36662=>15181,
-36774=>15182,
-12193=>15183,
-36789=>15183,
-11981=>15184,
-36790=>15184,
-36832=>15186,
-36836=>15187,
-36854=>15188,
-36866=>15189,
-36908=>15190,
-36932=>15191,
-37000=>15192,
-37013=>15193,
-37017=>15194,
-37019=>15195,
-37026=>15196,
-37044=>15197,
-37079=>15198,
-37085=>15199,
-37108=>15200,
-37143=>15201,
-37148=>15202,
-37169=>15203,
-37178=>15204,
-37181=>15205,
-37192=>15206,
-37211=>15207,
-37217=>15208,
-37220=>15209,
-37262=>15210,
-37278=>15211,
-37288=>15212,
-37293=>15213,
-37294=>15214,
-37298=>15215,
-37308=>15216,
-37360=>15217,
-37367=>15218,
-37371=>15219,
-37383=>15220,
-37416=>15221,
-37427=>15222,
-37432=>15223,
-37443=>15224,
-37447=>15225,
-37455=>15226,
-37472=>15227,
-37570=>15228,
-37579=>15229,
-37580=>15230,
-37599=>15231,
-37645=>15232,
-37653=>15233,
-37663=>15234,
-37671=>15235,
-37703=>15236,
-37714=>15237,
-37738=>15239,
-37741=>15240,
-37787=>15241,
-37818=>15242,
-37801=>15243,
-37825=>15244,
-37834=>15245,
-37858=>15246,
-37882=>15247,
-37885=>15248,
-37903=>15249,
-37940=>15250,
-37951=>15251,
-37973=>15252,
-37995=>15253,
-38002=>15254,
-11986=>15255,
-38264=>15255,
-38310=>15256,
-38313=>15257,
-38324=>15259,
-38333=>15260,
-38362=>15261,
-11983=>15262,
-11990=>15262,
-38429=>15262,
-38465=>15263,
-38488=>15264,
-38532=>15265,
-38564=>15266,
-38569=>15267,
-38610=>15268,
-195060=>15269,
-38622=>15270,
-38633=>15271,
-38641=>15272,
-38658=>15273,
-38665=>15274,
-38746=>15275,
-38755=>15276,
-38766=>15277,
-38771=>15278,
-38810=>15279,
-38818=>15280,
-38837=>15281,
-38838=>15282,
-38873=>15283,
-38878=>15284,
-38900=>15285,
-38922=>15286,
-38926=>15287,
-38942=>15288,
-38947=>15289,
-38955=>15290,
-38974=>15291,
-38994=>15292,
-38995=>15293,
-39001=>15294,
-39020=>15295,
-39096=>15296,
-39098=>15297,
-39103=>15298,
-39112=>15299,
-39141=>15300,
-39218=>15301,
-39219=>15302,
-39232=>15303,
-39245=>15304,
-39260=>15305,
-39263=>15306,
-39345=>15307,
-39353=>15308,
-39354=>15309,
-39369=>15310,
-39426=>15311,
-39446=>15312,
-39460=>15313,
-39463=>15314,
-39469=>15315,
-39470=>15316,
-39478=>15317,
-39480=>15318,
-39498=>15319,
-39510=>15320,
-39605=>15321,
-39606=>15322,
-39673=>15323,
-39683=>15324,
-39712=>15325,
-39731=>15326,
-39732=>15327,
-39795=>15328,
-39801=>15329,
-39847=>15330,
-39873=>15331,
-39879=>15332,
-39895=>15333,
-39911=>15334,
-39915=>15335,
-39927=>15336,
-39930=>15337,
-39933=>15338,
-39947=>15339,
-39975=>15340,
-39978=>15341,
-39990=>15342,
-40001=>15343,
-40019=>15344,
-40035=>15345,
-40048=>15346,
-40055=>15347,
-40194=>15348,
-40258=>15349,
-40263=>15350,
-40291=>15351,
-40297=>15352,
-40316=>15353,
-40318=>15354,
-40333=>15355,
-40369=>15356,
-40387=>15357,
-40391=>15358,
-40406=>15359,
-40415=>15360,
-40427=>15361,
-40436=>15362,
-40469=>15363,
-40477=>15364,
-40612=>15365,
-40616=>15366,
-40620=>15367,
-40679=>15368,
-40686=>15369,
-40720=>15370,
-40722=>15371,
-40727=>15372,
-40729=>15373,
-40751=>15374,
-40759=>15375,
-40761=>15376,
-40769=>15377,
-40773=>15378,
-40791=>15379,
-40808=>15380,
-40817=>15381,
-40821=>15382,
-40848=>15383,
-40852=>15384,
-40866=>15385,
-13317=>15387,
-194564=>15388,
-22048=>15389,
-24267=>15390,
-11925=>15391,
-144954=>15393,
-28665=>15395,
-28390=>15396,
-29107=>15397,
-11940=>15398,
-64073=>15398,
-11980=>15403,
-64102=>15403,
-23986=>15405,
-20435=>15407,
-20697=>15408,
-20720=>15409,
-20931=>15410,
-22134=>15411,
-27220=>15412,
-27905=>15413,
-28112=>15414,
-28226=>15415,
-28377=>15416,
-29668=>15417,
-29729=>15418,
-30060=>15419,
-30801=>15420,
-34805=>15421,
-144382=>15422,
-29608=>15423,
-15091=>15424,
-13531=>15425,
-17420=>15426,
-16010=>15427,
-40893=>15429,
-19432=>15430,
-40892=>15431,
-16090=>15432,
-15138=>15433,
-40894=>15434,
-17786=>15435,
-16531=>15436,
-18021=>15438,
-16643=>15439,
-17043=>15440,
-18094=>15441,
-13448=>15442,
-140809=>15443,
-63584=>15444,
-63585=>15445,
-63586=>15446,
-63610=>15447,
-63615=>15448,
-8836=>15472,
-8837=>15473,
-8842=>15474,
-8843=>15475,
-8713=>15476,
-8965=>15478,
-8966=>15479,
-8741=>15489,
-8742=>15490,
-8802=>15505,
-8773=>15507,
-8776=>15508,
-8822=>15509,
-8823=>15510,
-8487=>15515,
-8922=>15725,
-8923=>15726,
-8533=>15727,
-8984=>15728,
-7742=>15729,
-7743=>15730,
-504=>15731,
-505=>15732,
-470=>15733,
-472=>15734,
-474=>15735,
-476=>15736,
-260=>15737,
-728=>15738,
-317=>15739,
-346=>15740,
-350=>15741,
-356=>15742,
-377=>15743,
-379=>15744,
-261=>15745,
-731=>15746,
-318=>15747,
-347=>15748,
-711=>15749,
-351=>15750,
-357=>15751,
-378=>15752,
-733=>15753,
-380=>15754,
-340=>15755,
-258=>15756,
-313=>15757,
-262=>15758,
-268=>15759,
-280=>15760,
-270=>15761,
-323=>15762,
-327=>15763,
-336=>15764,
-344=>15765,
-368=>15766,
-354=>15767,
-341=>15768,
-259=>15769,
-314=>15770,
-263=>15771,
-269=>15772,
-281=>15773,
-271=>15774,
-273=>15775,
-324=>15776,
-328=>15777,
-337=>15778,
-345=>15779,
-369=>15780,
-355=>15781,
-729=>15782,
-264=>15783,
-284=>15784,
-292=>15785,
-308=>15786,
-348=>15787,
-364=>15788,
-265=>15789,
-285=>15790,
-293=>15791,
-309=>15792,
-349=>15793,
-365=>15794,
-625=>15795,
-651=>15796,
-638=>15797,
-620=>15798,
-622=>15799,
-633=>15800,
-648=>15801,
-598=>15802,
-627=>15803,
-637=>15804,
-642=>15805,
-656=>15806,
-635=>15807,
-621=>15808,
-607=>15809,
-626=>15810,
-669=>15811,
-654=>15812,
-609=>15813,
-624=>15814,
-641=>15815,
-295=>15816,
-661=>15817,
-660=>15818,
-614=>15819,
-664=>15820,
-450=>15821,
-595=>15822,
-599=>15823,
-644=>15824,
-608=>15825,
-403=>15826,
-616=>15827,
-649=>15828,
-600=>15829,
-604=>15830,
-606=>15831,
-592=>15832,
-623=>15833,
-650=>15834,
-612=>15835,
-594=>15836,
-653=>15837,
-613=>15838,
-674=>15839,
-673=>15840,
-597=>15841,
-657=>15842,
-634=>15843,
-615=>15844,
-865=>15845,
-712=>15846,
-716=>15847,
-721=>15848,
-8255=>15849,
-783=>15850,
-741=>15851,
-742=>15852,
-743=>15853,
-744=>15854,
-745=>15855,
-805=>15858,
-812=>15859,
-825=>15860,
-796=>15861,
-799=>15862,
-800=>15863,
-829=>15864,
-809=>15865,
-815=>15866,
-734=>15867,
-804=>15868,
-816=>15869,
-828=>15870,
-820=>15871,
-797=>15872,
-798=>15873,
-792=>15874,
-793=>15875,
-810=>15876,
-826=>15877,
-827=>15878,
-794=>15879,
-610=>15883,
-611=>15884,
-618=>15885,
-628=>15886,
-630=>15887,
-632=>15888,
-640=>15889,
-655=>15890,
-665=>15891,
-668=>15892,
-671=>15893,
-688=>15894,
-690=>15895,
-695=>15896,
-705=>15897,
-736=>15898,
-737=>15899,
-8862=>15906,
-12348=>16194,
-12543=>16195,
-12310=>16197,
-12311=>16198,
-9838=>16199,
-9835=>16200,
-10548=>16201,
-10549=>16202,
-10687=>16203,
-12448=>16205,
-10746=>16207,
-10747=>16208,
-962=>16222,
-9461=>16223,
-9462=>16224,
-9463=>16225,
-9464=>16226,
-9465=>16227,
-9466=>16228,
-9467=>16229,
-9468=>16230,
-9469=>16231,
-9470=>16232,
-9750=>16233,
-9751=>16234,
-9649=>16235,
-12784=>16236,
-12785=>16237,
-12786=>16238,
-12787=>16239,
-12788=>16240,
-12789=>16241,
-12790=>16242,
-12791=>16243,
-12792=>16244,
-12793=>16245,
-12794=>16247,
-12795=>16248,
-12796=>16249,
-12797=>16250,
-12798=>16251,
-12799=>16252,
-9150=>16253,
-9151=>16254,
-9152=>16255,
-9153=>16256,
-9154=>16257,
-9155=>16258,
-9156=>16259,
-9157=>16260,
-9158=>16261,
-9159=>16262,
-9160=>16263,
-9161=>16264,
-9162=>16265,
-9163=>16266,
-9164=>16267,
-10003=>16270,
-9251=>16272,
-9166=>16273,
-9680=>16274,
-9681=>16275,
-9682=>16276,
-9683=>16277,
-8263=>16278,
-8264=>16279,
-8273=>16281,
-8258=>16282,
-12688=>16283,
-12689=>16284,
-12690=>16285,
-12691=>16286,
-12692=>16287,
-12693=>16288,
-12694=>16289,
-12695=>16290,
-12696=>16291,
-12697=>16292,
-12698=>16293,
-12699=>16294,
-12700=>16295,
-12701=>16296,
-12702=>16297,
-12703=>16298,
-9136=>16312,
-9137=>16313,
-9842=>16314,
-9843=>16315,
-9844=>16316,
-9845=>16317,
-9846=>16318,
-9847=>16319,
-9848=>16320,
-9849=>16321,
-9850=>16322,
-9851=>16323,
-9852=>16324,
-9853=>16325,
-12441=>16326,
-12442=>16327,
-8413=>16328,
-20296=>16779,
-20319=>16780,
-20330=>16781,
-20332=>16782,
-20494=>16783,
-20504=>16784,
-20545=>16785,
-20722=>16786,
-20688=>16787,
-20742=>16788,
-20739=>16789,
-20789=>16790,
-20821=>16791,
-20823=>16792,
-13493=>16793,
-20938=>16794,
-20962=>16795,
-21079=>16796,
-21196=>16797,
-21206=>16798,
-21243=>16799,
-21276=>16800,
-21347=>16801,
-21405=>16802,
-21522=>16803,
-21631=>16804,
-21640=>16805,
-21840=>16806,
-21889=>16807,
-21933=>16808,
-21966=>16809,
-22075=>16810,
-22174=>16811,
-22185=>16812,
-22195=>16813,
-22391=>16814,
-22396=>16815,
-135963=>16816,
-22479=>16817,
-22500=>16818,
-22628=>16819,
-22665=>16820,
-136302=>16821,
-22738=>16822,
-22752=>16823,
-34369=>16824,
-22923=>16825,
-22930=>16826,
-22979=>16827,
-23059=>16828,
-23143=>16829,
-23159=>16830,
-23172=>16831,
-23236=>16832,
-137405=>16833,
-23421=>16834,
-23443=>16835,
-23570=>16836,
-64060=>16837,
-136884=>16838,
-23674=>16839,
-23695=>16840,
-23711=>16841,
-23715=>16842,
-23722=>16843,
-23760=>16844,
-138804=>16845,
-23821=>16846,
-23879=>16847,
-23937=>16848,
-23972=>16849,
-23975=>16850,
-24011=>16851,
-24158=>16852,
-24313=>16853,
-24320=>16854,
-24322=>16855,
-24355=>16856,
-24381=>16857,
-24404=>16858,
-24445=>16859,
-24589=>16860,
-24596=>16861,
-24600=>16862,
-24629=>16863,
-24647=>16864,
-24733=>16865,
-24788=>16866,
-24797=>16867,
-24875=>16868,
-25020=>16869,
-25017=>16870,
-25122=>16871,
-25178=>16872,
-25199=>16873,
-25302=>16874,
-25468=>16875,
-25573=>16876,
-25721=>16877,
-25796=>16878,
-25808=>16879,
-25897=>16880,
-26013=>16881,
-26170=>16882,
-26146=>16883,
-26155=>16884,
-26160=>16885,
-26163=>16886,
-26184=>16887,
-143812=>16888,
-26231=>16889,
-26232=>16890,
-26253=>16891,
-26299=>16892,
-26331=>16893,
-26344=>16894,
-26439=>16895,
-26497=>16896,
-26515=>16897,
-26520=>16898,
-26523=>16899,
-26620=>16900,
-26653=>16901,
-26787=>16902,
-26890=>16903,
-26953=>16904,
-144836=>16905,
-26946=>16906,
-26980=>16907,
-27045=>16908,
-27087=>16909,
-15286=>16910,
-15299=>16911,
-27113=>16912,
-27125=>16913,
-145215=>16914,
-27195=>16915,
-145251=>16916,
-27284=>16917,
-27301=>16918,
-15375=>16919,
-27419=>16920,
-27436=>16921,
-27495=>16922,
-27561=>16923,
-27565=>16924,
-27607=>16925,
-27647=>16926,
-27653=>16927,
-27764=>16928,
-27800=>16929,
-27899=>16930,
-27846=>16931,
-27953=>16932,
-27961=>16933,
-27967=>16934,
-27992=>16935,
-28052=>16936,
-28074=>16937,
-28123=>16938,
-28125=>16939,
-28228=>16940,
-28254=>16941,
-28337=>16942,
-28353=>16943,
-28432=>16944,
-28505=>16945,
-28513=>16946,
-28542=>16947,
-28556=>16948,
-28576=>16949,
-28604=>16950,
-28615=>16951,
-28618=>16952,
-28656=>16953,
-28750=>16954,
-28789=>16955,
-28836=>16956,
-28900=>16957,
-28971=>16958,
-28958=>16959,
-28974=>16960,
-29009=>16961,
-29032=>16962,
-29061=>16963,
-29063=>16964,
-29114=>16965,
-29124=>16966,
-29205=>16967,
-15935=>16968,
-29339=>16969,
-149489=>16970,
-29479=>16971,
-29520=>16972,
-29542=>16973,
-29602=>16974,
-29739=>16975,
-29766=>16976,
-29794=>16977,
-29805=>16978,
-29862=>16979,
-29865=>16980,
-29897=>16981,
-29951=>16982,
-29975=>16983,
-16242=>16984,
-30158=>16985,
-30210=>16986,
-30216=>16987,
-30308=>16988,
-30337=>16989,
-30365=>16990,
-30378=>16991,
-30390=>16992,
-30414=>16993,
-30420=>16994,
-30438=>16995,
-30449=>16996,
-30474=>16997,
-30489=>16998,
-30541=>16999,
-30542=>17000,
-30586=>17001,
-30592=>17002,
-30612=>17003,
-30688=>17004,
-152718=>17005,
-30787=>17006,
-30830=>17007,
-30896=>17008,
-152846=>17009,
-30893=>17010,
-30976=>17011,
-31004=>17012,
-31022=>17013,
-31028=>17014,
-31046=>17015,
-31097=>17016,
-31176=>17017,
-153457=>17018,
-31188=>17019,
-31198=>17020,
-31211=>17021,
-31213=>17022,
-31365=>17023,
-154052=>17024,
-31438=>17025,
-31485=>17026,
-31506=>17027,
-31533=>17028,
-31547=>17029,
-31599=>17030,
-31745=>17031,
-31795=>17032,
-155041=>17033,
-31853=>17034,
-31865=>17035,
-31887=>17036,
-31892=>17037,
-31904=>17038,
-31957=>17039,
-32049=>17040,
-32092=>17041,
-32131=>17042,
-32166=>17043,
-32194=>17044,
-32296=>17045,
-32663=>17046,
-32731=>17047,
-32821=>17048,
-32823=>17049,
-32970=>17050,
-32992=>17051,
-33011=>17052,
-33120=>17053,
-33127=>17054,
-33128=>17055,
-33133=>17056,
-33211=>17057,
-33226=>17058,
-33239=>17059,
-17499=>17060,
-33376=>17061,
-33396=>17062,
-158463=>17063,
-33441=>17064,
-33443=>17065,
-33444=>17066,
-33449=>17067,
-33471=>17068,
-33493=>17069,
-33533=>17070,
-33536=>17071,
-33570=>17072,
-33581=>17073,
-33594=>17074,
-33607=>17075,
-33661=>17076,
-33703=>17077,
-33743=>17078,
-33745=>17079,
-33761=>17080,
-33793=>17081,
-33798=>17082,
-33887=>17083,
-33904=>17084,
-33907=>17085,
-33925=>17086,
-33950=>17087,
-33978=>17088,
-159296=>17089,
-34098=>17090,
-34078=>17091,
-34095=>17092,
-34148=>17093,
-34170=>17094,
-34188=>17095,
-34210=>17096,
-34251=>17097,
-34285=>17098,
-34303=>17099,
-34308=>17100,
-34309=>17101,
-34320=>17102,
-159988=>17103,
-34328=>17104,
-34360=>17105,
-34391=>17106,
-34402=>17107,
-17821=>17108,
-34421=>17109,
-34488=>17110,
-34556=>17111,
-34695=>17112,
-17898=>17113,
-34826=>17114,
-34832=>17115,
-35022=>17116,
-161412=>17117,
-35122=>17118,
-35129=>17119,
-35136=>17120,
-35220=>17121,
-35318=>17122,
-35399=>17123,
-35421=>17124,
-35425=>17125,
-35445=>17126,
-35536=>17127,
-35654=>17128,
-35673=>17129,
-35689=>17130,
-35741=>17131,
-35913=>17132,
-35944=>17133,
-36271=>17134,
-36305=>17135,
-36311=>17136,
-36387=>17137,
-36413=>17138,
-36475=>17139,
-164471=>17140,
-18500=>17141,
-36602=>17142,
-36638=>17143,
-36653=>17144,
-36692=>17145,
-164813=>17146,
-36840=>17147,
-36846=>17148,
-36872=>17149,
-36909=>17150,
-37015=>17151,
-37043=>17152,
-37054=>17153,
-37060=>17154,
-37061=>17155,
-37063=>17156,
-37103=>17157,
-37140=>17158,
-37142=>17159,
-37154=>17160,
-37155=>17161,
-37167=>17162,
-37172=>17163,
-37251=>17164,
-37361=>17165,
-37705=>17166,
-37732=>17167,
-37733=>17168,
-37795=>17169,
-37855=>17170,
-37892=>17171,
-37939=>17172,
-37962=>17173,
-37987=>17174,
-38001=>17175,
-38286=>17176,
-38303=>17177,
-38316=>17178,
-38326=>17179,
-38347=>17180,
-38352=>17181,
-38355=>17182,
-18864=>17183,
-38366=>17184,
-38565=>17185,
-38639=>17186,
-38734=>17187,
-38805=>17188,
-38830=>17189,
-38842=>17190,
-38849=>17191,
-38857=>17192,
-38875=>17193,
-38998=>17194,
-39143=>17195,
-39256=>17196,
-39427=>17197,
-39617=>17198,
-39619=>17199,
-39630=>17200,
-39638=>17201,
-39682=>17202,
-39688=>17203,
-19479=>17204,
-39725=>17205,
-39774=>17206,
-39782=>17207,
-39812=>17208,
-39818=>17209,
-39838=>17210,
-39886=>17211,
-39909=>17212,
-39928=>17213,
-39971=>17214,
-40015=>17215,
-40016=>17216,
-40037=>17217,
-40221=>17218,
-40222=>17219,
-40259=>17220,
-40274=>17221,
-40330=>17222,
-40342=>17223,
-40384=>17224,
-40364=>17225,
-40380=>17226,
-172432=>17227,
-40423=>17228,
-40455=>17229,
-40606=>17230,
-40623=>17231,
-40855=>17232,
-131209=>17233,
-19970=>17234,
-19983=>17235,
-19986=>17236,
-20009=>17237,
-20014=>17238,
-20039=>17239,
-131234=>17240,
-20049=>17241,
-13318=>17242,
-131236=>17243,
-20073=>17244,
-20125=>17245,
-13356=>17246,
-20156=>17247,
-20163=>17248,
-20168=>17249,
-20203=>17250,
-20186=>17251,
-20209=>17252,
-20213=>17253,
-20246=>17254,
-20324=>17255,
-20279=>17256,
-20286=>17257,
-20312=>17258,
-131603=>17259,
-20343=>17260,
-20344=>17261,
-20354=>17262,
-20357=>17263,
-20454=>17264,
-20402=>17265,
-20421=>17266,
-20427=>17267,
-20434=>17268,
-13418=>17269,
-20466=>17270,
-20499=>17271,
-20508=>17272,
-20558=>17273,
-20563=>17274,
-20579=>17275,
-20643=>17276,
-20616=>17277,
-20626=>17278,
-20627=>17279,
-20629=>17280,
-20650=>17281,
-131883=>17282,
-20657=>17283,
-20666=>17284,
-20667=>17285,
-20676=>17286,
-20679=>17287,
-20723=>17288,
-131969=>17289,
-20686=>17290,
-131953=>17291,
-20692=>17292,
-20705=>17293,
-13458=>17294,
-132089=>17295,
-20759=>17296,
-132170=>17297,
-20832=>17298,
-132361=>17299,
-20851=>17300,
-20867=>17301,
-20875=>17302,
-13500=>17303,
-20888=>17304,
-20899=>17305,
-20909=>17306,
-13511=>17307,
-132566=>17308,
-20979=>17309,
-21010=>17310,
-21014=>17311,
-132943=>17312,
-21077=>17313,
-21084=>17314,
-21100=>17315,
-21111=>17316,
-21124=>17317,
-21122=>17318,
-133127=>17319,
-21144=>17320,
-133178=>17321,
-21156=>17322,
-21178=>17323,
-21179=>17324,
-21194=>17325,
-21201=>17326,
-133305=>17327,
-21239=>17328,
-21301=>17329,
-21314=>17330,
-133500=>17331,
-133533=>17332,
-21351=>17333,
-21370=>17334,
-21412=>17335,
-21428=>17336,
-133843=>17337,
-21431=>17338,
-21440=>17339,
-133917=>17340,
-13661=>17341,
-13662=>17342,
-21461=>17343,
-13667=>17344,
-21492=>17345,
-21540=>17346,
-21544=>17347,
-13678=>17348,
-21571=>17349,
-21602=>17350,
-21612=>17351,
-21653=>17352,
-21664=>17353,
-21670=>17354,
-21678=>17355,
-21687=>17356,
-21690=>17357,
-21699=>17358,
-134469=>17359,
-21740=>17360,
-21743=>17361,
-21745=>17362,
-21747=>17363,
-21760=>17364,
-21761=>17365,
-21769=>17366,
-21820=>17367,
-21825=>17368,
-13734=>17369,
-21831=>17370,
-13736=>17371,
-21860=>17372,
-134625=>17373,
-21885=>17374,
-21890=>17375,
-21905=>17376,
-13765=>17377,
-21970=>17378,
-134805=>17379,
-134765=>17380,
-21951=>17381,
-21961=>17382,
-21964=>17383,
-21969=>17384,
-21981=>17385,
-13786=>17386,
-21986=>17387,
-134756=>17388,
-21993=>17389,
-22056=>17390,
-135007=>17391,
-22023=>17392,
-22032=>17393,
-22064=>17394,
-13812=>17395,
-22077=>17396,
-22080=>17397,
-22087=>17398,
-22110=>17399,
-22112=>17400,
-22125=>17401,
-13829=>17402,
-22152=>17403,
-22156=>17404,
-22173=>17405,
-22184=>17406,
-22194=>17407,
-22213=>17408,
-22221=>17409,
-22239=>17410,
-22248=>17411,
-22262=>17412,
-22263=>17413,
-135681=>17414,
-135765=>17415,
-22313=>17416,
-135803=>17417,
-22341=>17418,
-22342=>17419,
-22349=>17420,
-135796=>17421,
-22376=>17422,
-22383=>17423,
-22387=>17424,
-22388=>17425,
-22389=>17426,
-22395=>17427,
-135908=>17428,
-135895=>17429,
-22426=>17430,
-22429=>17431,
-22430=>17432,
-22440=>17433,
-22487=>17434,
-135933=>17435,
-22476=>17436,
-135990=>17437,
-136004=>17438,
-22494=>17439,
-22512=>17440,
-13898=>17441,
-22520=>17442,
-22523=>17443,
-22525=>17444,
-22532=>17445,
-22558=>17446,
-22567=>17447,
-22585=>17448,
-136132=>17449,
-22601=>17450,
-22604=>17451,
-22631=>17452,
-22666=>17453,
-22667=>17454,
-22669=>17455,
-22671=>17456,
-22672=>17457,
-22676=>17458,
-22685=>17459,
-22698=>17460,
-22705=>17461,
-136301=>17462,
-22723=>17463,
-22733=>17464,
-22754=>17465,
-22771=>17466,
-22772=>17467,
-22789=>17468,
-22790=>17469,
-22797=>17470,
-22804=>17471,
-136663=>17472,
-13969=>17473,
-22845=>17474,
-13977=>17475,
-22854=>17476,
-13974=>17477,
-158761=>17478,
-22879=>17479,
-136775=>17480,
-22901=>17481,
-22902=>17482,
-22908=>17483,
-22943=>17484,
-22958=>17485,
-22972=>17486,
-22984=>17487,
-22989=>17488,
-23006=>17489,
-23015=>17490,
-23022=>17491,
-136966=>17492,
-137026=>17493,
-14031=>17494,
-23053=>17495,
-23063=>17496,
-23079=>17497,
-23085=>17498,
-23141=>17499,
-23162=>17500,
-23179=>17501,
-23196=>17502,
-23199=>17503,
-23200=>17504,
-23202=>17505,
-23217=>17506,
-23221=>17507,
-23226=>17508,
-23231=>17509,
-23258=>17510,
-23260=>17511,
-23269=>17512,
-23280=>17513,
-23278=>17514,
-23285=>17515,
-23304=>17516,
-23319=>17517,
-23348=>17518,
-23372=>17519,
-23378=>17520,
-23400=>17521,
-23407=>17522,
-23425=>17523,
-23428=>17524,
-137667=>17525,
-23446=>17526,
-23468=>17527,
-14177=>17528,
-14178=>17529,
-23502=>17530,
-23510=>17531,
-14188=>17532,
-14187=>17533,
-23537=>17534,
-23549=>17535,
-14197=>17536,
-23555=>17537,
-23593=>17538,
-138326=>17539,
-23647=>17540,
-23655=>17541,
-23656=>17542,
-23664=>17543,
-138541=>17544,
-138565=>17545,
-138616=>17546,
-138594=>17547,
-23688=>17548,
-23690=>17549,
-14273=>17550,
-138657=>17551,
-138652=>17552,
-23712=>17553,
-23714=>17554,
-23719=>17555,
-138642=>17556,
-23725=>17557,
-23733=>17558,
-138679=>17559,
-23753=>17560,
-138720=>17561,
-138803=>17562,
-23814=>17563,
-23824=>17564,
-23851=>17565,
-23837=>17566,
-23840=>17567,
-23857=>17568,
-23865=>17569,
-14312=>17570,
-23905=>17571,
-23914=>17572,
-14324=>17573,
-23920=>17574,
-139038=>17575,
-14333=>17576,
-23944=>17577,
-14336=>17578,
-23959=>17579,
-23984=>17580,
-23988=>17581,
-139126=>17582,
-24017=>17583,
-24023=>17584,
-139258=>17585,
-24036=>17586,
-24041=>17587,
-14383=>17588,
-14390=>17589,
-14400=>17590,
-24095=>17591,
-24126=>17592,
-24137=>17593,
-14428=>17594,
-24150=>17595,
-14433=>17596,
-24173=>17597,
-24174=>17598,
-139643=>17599,
-24229=>17600,
-24236=>17601,
-24249=>17602,
-24262=>17603,
-24281=>17604,
-140062=>17605,
-24317=>17606,
-24328=>17607,
-140205=>17608,
-24350=>17609,
-24391=>17610,
-24419=>17611,
-24434=>17612,
-24446=>17613,
-24463=>17614,
-24482=>17615,
-24519=>17616,
-24523=>17617,
-24530=>17618,
-24531=>17619,
-24532=>17620,
-24546=>17621,
-24558=>17622,
-24559=>17623,
-24563=>17624,
-14615=>17625,
-24610=>17626,
-24612=>17627,
-14618=>17628,
-24652=>17629,
-24725=>17630,
-24744=>17631,
-141043=>17632,
-24753=>17633,
-24766=>17634,
-24776=>17635,
-24793=>17636,
-24814=>17637,
-24821=>17638,
-24848=>17639,
-24857=>17640,
-24862=>17641,
-24890=>17642,
-14703=>17643,
-24897=>17644,
-24902=>17645,
-24928=>17646,
-141403=>17647,
-24978=>17648,
-24979=>17649,
-24983=>17650,
-24997=>17651,
-25005=>17652,
-141483=>17653,
-25045=>17654,
-25053=>17655,
-25077=>17656,
-141711=>17657,
-25123=>17658,
-25170=>17659,
-25185=>17660,
-25188=>17661,
-25211=>17662,
-25197=>17663,
-25203=>17664,
-25241=>17665,
-25301=>17666,
-142008=>17667,
-25341=>17668,
-25347=>17669,
-25360=>17670,
-142159=>17671,
-142160=>17672,
-25394=>17673,
-25397=>17674,
-25403=>17675,
-25404=>17676,
-25409=>17677,
-25412=>17678,
-25422=>17679,
-142150=>17680,
-25433=>17681,
-142365=>17682,
-142246=>17683,
-25452=>17684,
-25497=>17685,
-142372=>17686,
-25492=>17687,
-25533=>17688,
-25556=>17689,
-25557=>17690,
-25568=>17691,
-25579=>17692,
-25580=>17693,
-25586=>17694,
-25630=>17695,
-25637=>17696,
-25641=>17697,
-25647=>17698,
-25690=>17699,
-25693=>17700,
-25715=>17701,
-25725=>17702,
-25735=>17703,
-25745=>17704,
-25759=>17705,
-25803=>17706,
-25804=>17707,
-25813=>17708,
-25815=>17709,
-142817=>17710,
-25828=>17711,
-25855=>17712,
-14958=>17713,
-25871=>17714,
-25876=>17715,
-14963=>17716,
-25886=>17717,
-25906=>17718,
-25924=>17719,
-25940=>17720,
-25963=>17721,
-25978=>17722,
-25988=>17723,
-25994=>17724,
-26034=>17725,
-26037=>17726,
-26040=>17727,
-26047=>17728,
-26057=>17729,
-26068=>17730,
-15062=>17731,
-26105=>17732,
-26108=>17733,
-26116=>17734,
-26120=>17735,
-26145=>17736,
-26154=>17737,
-26181=>17738,
-26193=>17739,
-26190=>17740,
-15082=>17741,
-143811=>17742,
-143861=>17743,
-143798=>17744,
-26218=>17745,
-26220=>17746,
-26221=>17747,
-26235=>17748,
-26240=>17749,
-26256=>17750,
-26258=>17751,
-15118=>17752,
-26285=>17753,
-26289=>17754,
-26293=>17755,
-15130=>17756,
-15132=>17757,
-15063=>17758,
-26369=>17759,
-26386=>17760,
-144242=>17761,
-26393=>17762,
-144339=>17763,
-144338=>17764,
-26445=>17765,
-26452=>17766,
-26461=>17767,
-144336=>17768,
-144356=>17769,
-144341=>17770,
-26484=>17771,
-144346=>17772,
-26514=>17773,
-144351=>17774,
-33635=>17775,
-26640=>17776,
-26563=>17777,
-26568=>17778,
-26578=>17779,
-26587=>17780,
-26615=>17781,
-144458=>17782,
-144465=>17783,
-144459=>17784,
-26648=>17785,
-26655=>17786,
-26669=>17787,
-144485=>17788,
-26675=>17789,
-26683=>17790,
-26686=>17791,
-26693=>17792,
-26697=>17793,
-26700=>17794,
-26709=>17795,
-26711=>17796,
-15223=>17797,
-26731=>17798,
-26734=>17799,
-26748=>17800,
-26754=>17801,
-26768=>17802,
-26774=>17803,
-15213=>17804,
-26776=>17805,
-26777=>17806,
-26778=>17807,
-26780=>17808,
-26794=>17809,
-26795=>17810,
-26804=>17811,
-26811=>17812,
-26875=>17813,
-144612=>17814,
-144730=>17815,
-26819=>17816,
-26821=>17817,
-26828=>17818,
-26841=>17819,
-26852=>17820,
-26853=>17821,
-26860=>17822,
-26871=>17823,
-26883=>17824,
-26887=>17825,
-15239=>17826,
-144788=>17827,
-15245=>17828,
-26950=>17829,
-26985=>17830,
-26988=>17831,
-27002=>17832,
-27026=>17833,
-15268=>17834,
-27030=>17835,
-27056=>17836,
-27066=>17837,
-27068=>17838,
-27072=>17839,
-27089=>17840,
-144953=>17841,
-144967=>17842,
-144952=>17843,
-27107=>17844,
-27118=>17845,
-27119=>17846,
-27123=>17847,
-15309=>17848,
-27124=>17849,
-27134=>17850,
-27153=>17851,
-27162=>17852,
-27165=>17853,
-145180=>17854,
-27186=>17855,
-27187=>17856,
-27199=>17857,
-27209=>17858,
-27258=>17859,
-27214=>17860,
-27218=>17861,
-27236=>17862,
-145164=>17863,
-27275=>17864,
-15344=>17865,
-27297=>17866,
-145252=>17867,
-27307=>17868,
-27325=>17869,
-27334=>17870,
-27348=>17871,
-27344=>17872,
-27357=>17873,
-145407=>17874,
-145383=>17875,
-27377=>17876,
-27378=>17877,
-27379=>17878,
-27389=>17879,
-145444=>17880,
-27403=>17881,
-27407=>17882,
-27408=>17883,
-27409=>17884,
-145469=>17885,
-27415=>17886,
-15398=>17887,
-27439=>17888,
-27466=>17889,
-27480=>17890,
-27500=>17891,
-27509=>17892,
-11934=>17893,
-27514=>17893,
-27521=>17894,
-27547=>17895,
-27566=>17896,
-146072=>17897,
-27581=>17898,
-27591=>17899,
-27592=>17900,
-27593=>17901,
-27610=>17902,
-27622=>17903,
-27623=>17904,
-27630=>17905,
-27650=>17906,
-27658=>17907,
-27662=>17908,
-27702=>17909,
-146559=>17910,
-27725=>17911,
-27739=>17912,
-27757=>17913,
-27780=>17914,
-27785=>17915,
-15555=>17916,
-27796=>17917,
-27799=>17918,
-27821=>17919,
-27842=>17920,
-15570=>17921,
-27868=>17922,
-27881=>17923,
-27885=>17924,
-146688=>17925,
-27904=>17926,
-27940=>17927,
-27942=>17928,
-27943=>17929,
-27751=>17930,
-27951=>17931,
-27964=>17932,
-27995=>17933,
-28000=>17934,
-28016=>17935,
-28032=>17936,
-28033=>17937,
-28042=>17938,
-28045=>17939,
-28049=>17940,
-28056=>17941,
-146752=>17942,
-146938=>17943,
-146937=>17944,
-146899=>17945,
-28075=>17946,
-28078=>17947,
-28084=>17948,
-28098=>17949,
-27956=>17950,
-28104=>17951,
-28110=>17952,
-28127=>17953,
-28150=>17954,
-28214=>17955,
-28190=>17956,
-15633=>17957,
-28210=>17958,
-28232=>17959,
-28233=>17960,
-28235=>17961,
-28236=>17962,
-28239=>17963,
-28243=>17964,
-28244=>17965,
-28247=>17966,
-28259=>17967,
-15646=>17968,
-28307=>17969,
-28327=>17970,
-28340=>17971,
-28355=>17972,
-28469=>17973,
-28395=>17974,
-28409=>17975,
-28411=>17976,
-28426=>17977,
-28428=>17978,
-28440=>17979,
-28453=>17980,
-28470=>17981,
-28476=>17982,
-147326=>17983,
-28498=>17984,
-28503=>17985,
-28512=>17986,
-28520=>17987,
-28560=>17988,
-28566=>17989,
-28606=>17990,
-28575=>17991,
-28581=>17992,
-28591=>17993,
-15716=>17994,
-28616=>17995,
-28617=>17996,
-28649=>17997,
-147606=>17998,
-28668=>17999,
-28672=>18000,
-28682=>18001,
-28707=>18002,
-147715=>18003,
-28730=>18004,
-28739=>18005,
-28743=>18006,
-28747=>18007,
-15770=>18008,
-28773=>18009,
-28777=>18010,
-28782=>18011,
-28790=>18012,
-28806=>18013,
-28823=>18014,
-147910=>18015,
-28831=>18016,
-28849=>18017,
-147966=>18018,
-28908=>18019,
-28874=>18020,
-28881=>18021,
-28931=>18022,
-28934=>18023,
-28936=>18024,
-28940=>18025,
-15808=>18026,
-28975=>18027,
-29008=>18028,
-29011=>18029,
-29022=>18030,
-15828=>18031,
-29078=>18032,
-29056=>18033,
-29083=>18034,
-29088=>18035,
-29090=>18036,
-29102=>18037,
-29103=>18038,
-148412=>18039,
-29145=>18040,
-29148=>18041,
-29191=>18042,
-15877=>18043,
-29236=>18044,
-29241=>18045,
-29250=>18046,
-29271=>18047,
-29283=>18048,
-149033=>18049,
-29294=>18050,
-29295=>18051,
-29304=>18052,
-29311=>18053,
-29326=>18054,
-149157=>18055,
-29358=>18056,
-29360=>18057,
-29377=>18058,
-15968=>18059,
-29388=>18060,
-15974=>18061,
-15976=>18062,
-29427=>18063,
-29434=>18064,
-29447=>18065,
-29458=>18066,
-29464=>18067,
-29465=>18068,
-16003=>18069,
-29497=>18070,
-29484=>18071,
-29491=>18072,
-29501=>18073,
-29522=>18074,
-16020=>18075,
-29547=>18076,
-149654=>18077,
-29550=>18078,
-29551=>18079,
-29553=>18080,
-29569=>18081,
-29578=>18082,
-29588=>18083,
-29592=>18084,
-29596=>18085,
-29605=>18086,
-29625=>18087,
-29631=>18088,
-29637=>18089,
-29643=>18090,
-29665=>18091,
-29671=>18092,
-29689=>18093,
-29715=>18094,
-29690=>18095,
-29697=>18096,
-29779=>18097,
-29760=>18098,
-29763=>18099,
-29778=>18100,
-29789=>18101,
-29825=>18102,
-29832=>18103,
-150093=>18104,
-29842=>18105,
-29847=>18106,
-29849=>18107,
-29857=>18108,
-29861=>18109,
-29866=>18110,
-29881=>18111,
-29883=>18112,
-29882=>18113,
-29910=>18114,
-29912=>18115,
-29931=>18116,
-150358=>18117,
-29946=>18118,
-150383=>18119,
-29984=>18120,
-29988=>18121,
-29994=>18122,
-16215=>18123,
-150550=>18124,
-30013=>18125,
-30014=>18126,
-30016=>18127,
-30024=>18128,
-30032=>18129,
-30034=>18130,
-30066=>18131,
-30065=>18132,
-30074=>18133,
-30077=>18134,
-30078=>18135,
-30092=>18136,
-16245=>18137,
-30114=>18138,
-16247=>18139,
-30128=>18140,
-30135=>18141,
-30143=>18142,
-30144=>18143,
-30150=>18144,
-30159=>18145,
-30163=>18146,
-30173=>18147,
-30175=>18148,
-30176=>18149,
-30183=>18150,
-30190=>18151,
-30193=>18152,
-30211=>18153,
-30232=>18154,
-30215=>18155,
-30223=>18156,
-16302=>18157,
-151054=>18158,
-30227=>18159,
-30235=>18160,
-30236=>18161,
-151095=>18162,
-30245=>18163,
-30248=>18164,
-30268=>18165,
-30259=>18166,
-151146=>18167,
-16329=>18168,
-30273=>18169,
-151179=>18170,
-30281=>18171,
-30293=>18172,
-16343=>18173,
-30318=>18174,
-30357=>18175,
-30369=>18176,
-30368=>18177,
-30375=>18178,
-30376=>18179,
-30383=>18180,
-151626=>18181,
-30409=>18182,
-151637=>18183,
-30440=>18184,
-151842=>18185,
-30487=>18186,
-30490=>18187,
-30509=>18188,
-30517=>18189,
-151977=>18190,
-16441=>18191,
-152037=>18192,
-152013=>18193,
-30552=>18194,
-152094=>18195,
-30588=>18196,
-152140=>18197,
-16472=>18198,
-30618=>18199,
-30623=>18200,
-30626=>18201,
-30628=>18202,
-30686=>18203,
-30687=>18204,
-30692=>18205,
-30698=>18206,
-30700=>18207,
-30715=>18208,
-152622=>18209,
-30725=>18210,
-30729=>18211,
-30733=>18212,
-30745=>18213,
-30764=>18214,
-30791=>18215,
-30826=>18216,
-152793=>18217,
-30858=>18218,
-30868=>18219,
-30884=>18220,
-30877=>18221,
-30879=>18222,
-30907=>18223,
-30933=>18224,
-30950=>18225,
-30969=>18226,
-30970=>18227,
-30974=>18228,
-152999=>18229,
-30992=>18230,
-31003=>18231,
-31013=>18232,
-31050=>18233,
-31064=>18234,
-16645=>18235,
-31079=>18236,
-31090=>18237,
-31125=>18238,
-31137=>18239,
-31145=>18240,
-31156=>18241,
-31170=>18242,
-31175=>18243,
-31180=>18244,
-31181=>18245,
-31190=>18246,
-16712=>18247,
-153513=>18248,
-153524=>18249,
-16719=>18250,
-31242=>18251,
-31253=>18252,
-31259=>18253,
-16739=>18254,
-31288=>18255,
-31303=>18256,
-31318=>18257,
-31321=>18258,
-31324=>18259,
-31327=>18260,
-31335=>18261,
-31338=>18262,
-31349=>18263,
-31362=>18264,
-31370=>18265,
-31376=>18266,
-31404=>18267,
-154068=>18268,
-16820=>18269,
-31417=>18270,
-31422=>18271,
-16831=>18272,
-31436=>18273,
-31464=>18274,
-31476=>18275,
-154340=>18276,
-154339=>18277,
-154353=>18278,
-31549=>18279,
-31530=>18280,
-31534=>18281,
-31535=>18282,
-16870=>18283,
-16883=>18284,
-31615=>18285,
-31553=>18286,
-16878=>18287,
-31573=>18288,
-31609=>18289,
-31588=>18290,
-31590=>18291,
-31603=>18292,
-154546=>18293,
-16903=>18294,
-31632=>18295,
-31643=>18296,
-16910=>18297,
-31669=>18298,
-31676=>18299,
-31685=>18300,
-31690=>18301,
-154699=>18302,
-154724=>18303,
-31700=>18304,
-31702=>18305,
-31706=>18306,
-31722=>18307,
-31728=>18308,
-31747=>18309,
-31758=>18310,
-31813=>18311,
-31818=>18312,
-31831=>18313,
-31838=>18314,
-31841=>18315,
-31849=>18316,
-31855=>18317,
-155182=>18318,
-155222=>18319,
-155237=>18320,
-31910=>18321,
-155234=>18322,
-31926=>18323,
-31927=>18324,
-155352=>18325,
-31940=>18326,
-155330=>18327,
-31949=>18328,
-155368=>18329,
-155427=>18330,
-31974=>18331,
-155484=>18332,
-31989=>18333,
-32003=>18334,
-17094=>18335,
-32018=>18336,
-32030=>18337,
-155616=>18338,
-155604=>18339,
-32061=>18340,
-32062=>18341,
-32064=>18342,
-32071=>18343,
-155660=>18344,
-155643=>18345,
-17110=>18346,
-32090=>18347,
-32106=>18348,
-32112=>18349,
-17117=>18350,
-32127=>18351,
-155671=>18352,
-32136=>18353,
-32151=>18354,
-155744=>18355,
-32157=>18356,
-32167=>18357,
-32170=>18358,
-32182=>18359,
-32192=>18360,
-32215=>18361,
-32217=>18362,
-32230=>18363,
-17154=>18364,
-155885=>18365,
-64088=>18366,
-32272=>18367,
-32279=>18368,
-32285=>18369,
-32295=>18370,
-32300=>18371,
-32325=>18372,
-32373=>18373,
-32382=>18374,
-32390=>18375,
-32391=>18376,
-17195=>18377,
-32410=>18378,
-17219=>18379,
-32572=>18380,
-32571=>18381,
-32574=>18382,
-32579=>18383,
-13505=>18384,
-156272=>18385,
-156294=>18386,
-32611=>18387,
-32612=>18388,
-32621=>18389,
-32637=>18390,
-32638=>18391,
-32656=>18392,
-20859=>18393,
-146702=>18394,
-32662=>18395,
-32668=>18396,
-32685=>18397,
-156674=>18398,
-32707=>18399,
-32719=>18400,
-32739=>18401,
-32754=>18402,
-32778=>18403,
-32776=>18404,
-32790=>18405,
-32812=>18406,
-32816=>18407,
-32835=>18408,
-32870=>18409,
-32891=>18410,
-32921=>18411,
-32924=>18412,
-32932=>18413,
-32935=>18414,
-32952=>18415,
-157310=>18416,
-32965=>18417,
-32981=>18418,
-32998=>18419,
-33037=>18420,
-33013=>18421,
-33019=>18422,
-17390=>18423,
-33077=>18424,
-33054=>18425,
-17392=>18426,
-33060=>18427,
-33063=>18428,
-33068=>18429,
-157469=>18430,
-33085=>18431,
-17416=>18432,
-33129=>18433,
-17431=>18434,
-17436=>18435,
-33157=>18436,
-17442=>18437,
-33176=>18438,
-33202=>18439,
-33217=>18440,
-33219=>18441,
-33238=>18442,
-33243=>18443,
-157917=>18444,
-33252=>18445,
-157930=>18446,
-33260=>18447,
-33277=>18448,
-33279=>18449,
-158063=>18450,
-33284=>18451,
-158173=>18452,
-33305=>18453,
-33314=>18454,
-158238=>18455,
-33340=>18456,
-33353=>18457,
-33349=>18458,
-158296=>18459,
-17526=>18460,
-17530=>18461,
-33367=>18462,
-158348=>18463,
-33372=>18464,
-33379=>18465,
-158391=>18466,
-17553=>18467,
-33405=>18468,
-33407=>18469,
-33411=>18470,
-33418=>18471,
-33427=>18472,
-33447=>18473,
-33448=>18474,
-33458=>18475,
-33460=>18476,
-33466=>18477,
-33468=>18478,
-33506=>18479,
-33512=>18480,
-33527=>18481,
-33543=>18482,
-33544=>18483,
-33548=>18484,
-33620=>18485,
-33563=>18486,
-33565=>18487,
-33584=>18488,
-33596=>18489,
-33604=>18490,
-33623=>18491,
-17598=>18492,
-17620=>18493,
-17587=>18494,
-33684=>18495,
-33685=>18496,
-33691=>18497,
-33693=>18498,
-33737=>18499,
-33744=>18500,
-33748=>18501,
-33757=>18502,
-33765=>18503,
-33785=>18504,
-33813=>18505,
-158835=>18506,
-33815=>18507,
-33849=>18508,
-33871=>18509,
-33873=>18510,
-33874=>18511,
-33881=>18512,
-33882=>18513,
-33884=>18514,
-158941=>18515,
-33893=>18516,
-33912=>18517,
-33916=>18518,
-33921=>18519,
-17677=>18520,
-33943=>18521,
-33958=>18522,
-33982=>18523,
-17672=>18524,
-33998=>18525,
-33999=>18526,
-34003=>18527,
-159333=>18528,
-34023=>18529,
-34026=>18530,
-34031=>18531,
-34033=>18532,
-34042=>18533,
-34075=>18534,
-34084=>18535,
-34085=>18536,
-34091=>18537,
-34127=>18538,
-34159=>18539,
-17731=>18540,
-34129=>18541,
-34145=>18542,
-34146=>18543,
-159636=>18544,
-34171=>18545,
-34173=>18546,
-34175=>18547,
-34177=>18548,
-34182=>18549,
-34195=>18550,
-34205=>18551,
-34207=>18552,
-159736=>18553,
-159734=>18554,
-159735=>18555,
-34236=>18556,
-34247=>18557,
-34250=>18558,
-34264=>18559,
-34265=>18560,
-34271=>18561,
-34273=>18562,
-34278=>18563,
-34294=>18564,
-34304=>18565,
-34321=>18566,
-34334=>18567,
-34337=>18568,
-34340=>18569,
-34343=>18570,
-160013=>18571,
-34361=>18572,
-34364=>18573,
-160057=>18574,
-34368=>18575,
-34387=>18576,
-34390=>18577,
-34423=>18578,
-34439=>18579,
-34441=>18580,
-34460=>18581,
-34461=>18582,
-34481=>18583,
-34483=>18584,
-34497=>18585,
-34499=>18586,
-34513=>18587,
-34517=>18588,
-34519=>18589,
-34531=>18590,
-34534=>18591,
-17848=>18592,
-34565=>18593,
-34567=>18594,
-34574=>18595,
-34576=>18596,
-34591=>18597,
-34593=>18598,
-34595=>18599,
-34609=>18600,
-34618=>18601,
-34624=>18602,
-34627=>18603,
-34641=>18604,
-34648=>18605,
-34660=>18606,
-34661=>18607,
-34674=>18608,
-34684=>18609,
-160731=>18610,
-160730=>18611,
-34727=>18612,
-34697=>18613,
-34699=>18614,
-34707=>18615,
-34720=>18616,
-160766=>18617,
-17893=>18618,
-34750=>18619,
-160784=>18620,
-34753=>18621,
-34766=>18622,
-34783=>18623,
-160841=>18624,
-34787=>18625,
-34789=>18626,
-34790=>18627,
-34794=>18628,
-34835=>18629,
-34856=>18630,
-34862=>18631,
-34866=>18632,
-34876=>18633,
-17935=>18634,
-34890=>18635,
-34904=>18636,
-161301=>18637,
-161300=>18638,
-34921=>18639,
-161329=>18640,
-34927=>18641,
-34976=>18642,
-35004=>18643,
-35008=>18644,
-161427=>18645,
-35025=>18646,
-35027=>18647,
-17985=>18648,
-35073=>18649,
-161550=>18650,
-35127=>18651,
-161571=>18652,
-35138=>18653,
-35141=>18654,
-35145=>18655,
-161618=>18656,
-35170=>18657,
-35209=>18658,
-35216=>18659,
-35231=>18660,
-35248=>18661,
-35255=>18662,
-35288=>18663,
-35307=>18664,
-18081=>18665,
-35315=>18666,
-35325=>18667,
-35327=>18668,
-18095=>18669,
-35345=>18670,
-35348=>18671,
-162181=>18672,
-35361=>18673,
-35381=>18674,
-35390=>18675,
-35397=>18676,
-35405=>18677,
-35416=>18678,
-35502=>18679,
-35472=>18680,
-35511=>18681,
-35543=>18682,
-35580=>18683,
-162436=>18684,
-35594=>18685,
-35589=>18686,
-35597=>18687,
-35612=>18688,
-35629=>18689,
-18188=>18690,
-35665=>18691,
-35678=>18692,
-35702=>18693,
-35713=>18694,
-35723=>18695,
-35732=>18696,
-35733=>18697,
-35897=>18698,
-162739=>18699,
-35901=>18700,
-162750=>18701,
-162759=>18702,
-35909=>18703,
-35919=>18704,
-35927=>18705,
-35945=>18706,
-35949=>18707,
-163000=>18708,
-35987=>18709,
-35986=>18710,
-35993=>18711,
-18276=>18712,
-35995=>18713,
-36054=>18714,
-36053=>18715,
-163232=>18716,
-36081=>18717,
-163344=>18718,
-36105=>18719,
-36110=>18720,
-36296=>18721,
-36313=>18722,
-36364=>18723,
-18429=>18724,
-36349=>18725,
-36358=>18726,
-163978=>18727,
-36372=>18728,
-36374=>18729,
-36385=>18730,
-36386=>18731,
-36391=>18732,
-164027=>18733,
-18454=>18734,
-36406=>18735,
-36409=>18736,
-36436=>18737,
-36450=>18738,
-36461=>18739,
-36463=>18740,
-36504=>18741,
-36510=>18742,
-36533=>18743,
-36539=>18744,
-164482=>18745,
-18510=>18746,
-164595=>18747,
-36608=>18748,
-36616=>18749,
-36651=>18750,
-36672=>18751,
-36682=>18752,
-36696=>18753,
-164876=>18754,
-36772=>18755,
-36788=>18756,
-164949=>18757,
-36801=>18758,
-36806=>18759,
-64036=>18760,
-36810=>18761,
-36813=>18762,
-36819=>18763,
-36821=>18764,
-36849=>18765,
-36853=>18766,
-36859=>18767,
-36876=>18768,
-36919=>18769,
-165227=>18770,
-36931=>18771,
-36957=>18772,
-165320=>18773,
-165321=>18774,
-36997=>18775,
-37004=>18776,
-37008=>18777,
-37025=>18778,
-18613=>18779,
-37040=>18780,
-37046=>18781,
-37059=>18782,
-37064=>18783,
-165591=>18784,
-37084=>18785,
-37087=>18786,
-165626=>18787,
-37110=>18788,
-37106=>18789,
-37120=>18790,
-37099=>18791,
-37118=>18792,
-37119=>18793,
-37124=>18794,
-37126=>18795,
-37144=>18796,
-37150=>18797,
-37175=>18798,
-37177=>18799,
-37190=>18800,
-37191=>18801,
-37207=>18802,
-37209=>18803,
-37236=>18804,
-37241=>18805,
-37253=>18806,
-37299=>18807,
-37302=>18808,
-37315=>18809,
-37316=>18810,
-166217=>18811,
-166214=>18812,
-37356=>18813,
-37377=>18814,
-37398=>18815,
-37399=>18816,
-166251=>18817,
-37442=>18818,
-37450=>18819,
-37462=>18820,
-37473=>18821,
-37477=>18822,
-37480=>18823,
-166280=>18824,
-37500=>18825,
-37501=>18826,
-37503=>18827,
-37513=>18828,
-37517=>18829,
-37527=>18830,
-37529=>18831,
-37535=>18832,
-37547=>18833,
-166330=>18834,
-166331=>18835,
-37554=>18836,
-37567=>18837,
-37568=>18838,
-37574=>18839,
-37582=>18840,
-37605=>18841,
-37649=>18842,
-166430=>18843,
-166441=>18844,
-37623=>18845,
-37673=>18846,
-166513=>18847,
-166467=>18848,
-37713=>18849,
-37722=>18850,
-37739=>18851,
-37745=>18852,
-37747=>18853,
-37793=>18854,
-166553=>18855,
-166605=>18856,
-37768=>18857,
-37771=>18858,
-37775=>18859,
-37790=>18860,
-37877=>18861,
-166628=>18862,
-166621=>18863,
-37873=>18864,
-37831=>18865,
-37852=>18866,
-37863=>18867,
-37897=>18868,
-37910=>18869,
-37911=>18870,
-37883=>18871,
-37938=>18872,
-37947=>18873,
-166849=>18874,
-166895=>18875,
-37997=>18876,
-37999=>18877,
-38265=>18878,
-38278=>18879,
-38284=>18880,
-38285=>18881,
-167184=>18882,
-167281=>18883,
-38344=>18884,
-167419=>18885,
-167455=>18886,
-38444=>18887,
-38451=>18888,
-38452=>18889,
-167478=>18890,
-38460=>18891,
-38497=>18892,
-167561=>18893,
-38530=>18894,
-167659=>18895,
-38554=>18896,
-167730=>18897,
-18919=>18898,
-38579=>18899,
-38586=>18900,
-38589=>18901,
-18938=>18902,
-167928=>18903,
-38616=>18904,
-38618=>18905,
-38621=>18906,
-18948=>18907,
-38676=>18908,
-38691=>18909,
-18985=>18910,
-38710=>18911,
-38721=>18912,
-38727=>18913,
-38743=>18914,
-38747=>18915,
-38762=>18916,
-168608=>18917,
-168625=>18918,
-38806=>18919,
-38814=>18920,
-38833=>18921,
-38834=>18922,
-38846=>18923,
-38860=>18924,
-38865=>18925,
-38868=>18926,
-38872=>18927,
-38881=>18928,
-38897=>18929,
-38916=>18930,
-38925=>18931,
-38932=>18932,
-38934=>18933,
-19132=>18934,
-169104=>18935,
-38962=>18936,
-38963=>18937,
-38949=>18938,
-38983=>18939,
-39014=>18940,
-39083=>18941,
-39085=>18942,
-39088=>18943,
-169423=>18944,
-39095=>18945,
-39099=>18946,
-39100=>18947,
-39106=>18948,
-39111=>18949,
-39115=>18950,
-39137=>18951,
-39139=>18952,
-39146=>18953,
-39152=>18954,
-39153=>18955,
-39155=>18956,
-39176=>18957,
-19259=>18958,
-169712=>18959,
-39190=>18960,
-39191=>18961,
-169753=>18962,
-39194=>18963,
-39195=>18964,
-39196=>18965,
-169808=>18966,
-39217=>18967,
-39226=>18968,
-39227=>18969,
-39228=>18970,
-39233=>18971,
-39238=>18972,
-39246=>18973,
-39264=>18974,
-39331=>18975,
-39334=>18976,
-39357=>18977,
-39359=>18978,
-39363=>18979,
-39380=>18980,
-39385=>18981,
-39390=>18982,
-170182=>18983,
-39408=>18984,
-39417=>18985,
-39420=>18986,
-39434=>18987,
-39441=>18988,
-39450=>18989,
-39456=>18990,
-39473=>18991,
-39492=>18992,
-39500=>18993,
-39512=>18994,
-19394=>18995,
-39599=>18996,
-19402=>18997,
-39607=>18998,
-19410=>18999,
-39609=>19000,
-170610=>19001,
-39622=>19002,
-39632=>19003,
-39634=>19004,
-39637=>19005,
-39648=>19006,
-39653=>19007,
-39657=>19008,
-39692=>19009,
-39696=>19010,
-39698=>19011,
-39702=>19012,
-39708=>19013,
-39723=>19014,
-39741=>19015,
-19488=>19016,
-39755=>19017,
-39779=>19018,
-39781=>19019,
-39787=>19020,
-39788=>19021,
-39798=>19022,
-39799=>19023,
-39846=>19024,
-39852=>19025,
-171483=>19026,
-39858=>19027,
-39864=>19028,
-39870=>19029,
-39923=>19030,
-39896=>19031,
-39901=>19032,
-39914=>19033,
-39919=>19034,
-39918=>19035,
-171541=>19036,
-171658=>19037,
-171593=>19038,
-39958=>19039,
-39960=>19040,
-39961=>19041,
-39962=>19042,
-39965=>19043,
-39970=>19044,
-39977=>19045,
-171716=>19046,
-39985=>19047,
-39991=>19048,
-40005=>19049,
-40028=>19050,
-171753=>19051,
-40009=>19052,
-40010=>19053,
-171739=>19054,
-40020=>19055,
-40024=>19056,
-40027=>19057,
-40029=>19058,
-40031=>19059,
-40041=>19060,
-40042=>19061,
-40043=>19062,
-40045=>19063,
-40046=>19064,
-40050=>19065,
-40053=>19066,
-40058=>19067,
-40166=>19068,
-40178=>19069,
-40203=>19070,
-171982=>19071,
-171991=>19071,
-40209=>19072,
-40215=>19073,
-40216=>19074,
-172079=>19075,
-19652=>19076,
-172058=>19077,
-40242=>19078,
-19665=>19079,
-40266=>19080,
-40287=>19081,
-40290=>19082,
-172281=>19083,
-172162=>19084,
-40307=>19085,
-40310=>19086,
-40311=>19087,
-40324=>19088,
-40345=>19089,
-40353=>19090,
-40383=>19091,
-40373=>19092,
-40377=>19093,
-40381=>19094,
-40393=>19095,
-40410=>19096,
-40416=>19097,
-40419=>19098,
-19719=>19099,
-40458=>19100,
-40450=>19101,
-40461=>19102,
-40476=>19103,
-40571=>19104,
-139800=>19105,
-40576=>19106,
-40581=>19107,
-40603=>19108,
-172940=>19109,
-40637=>19110,
-173111=>19111,
-40671=>19112,
-40703=>19113,
-40706=>19114,
-19831=>19115,
-40707=>19116,
-40762=>19117,
-40765=>19118,
-40774=>19119,
-40787=>19120,
-40789=>19121,
-40792=>19122,
-173553=>19123,
-40797=>19124,
-173570=>19125,
-40809=>19126,
-40813=>19127,
-40816=>19128,
-173746=>19129,
-11948=>19130,
-13844=>19131,
-14509=>19132,
-15820=>19133,
-16348=>19134,
-17854=>19135,
-17936=>19136,
-19326=>19137,
-19512=>19138,
-19681=>19139,
-19980=>19140,
-20003=>19141,
-20004=>19142,
-20089=>19143,
-20211=>19144,
-20236=>19145,
-20249=>19146,
-20267=>19147,
-20270=>19148,
-20273=>19149,
-20356=>19150,
-20382=>19151,
-20407=>19152,
-20484=>19153,
-20492=>19154,
-20556=>19155,
-20575=>19156,
-20578=>19157,
-20599=>19158,
-20622=>19159,
-20638=>19160,
-20642=>19161,
-20675=>19162,
-20712=>19163,
-20721=>19164,
-20734=>19165,
-20743=>19166,
-20748=>19167,
-20749=>19168,
-20750=>19169,
-20787=>19170,
-20792=>19171,
-20852=>19172,
-20868=>19173,
-20920=>19174,
-20922=>19175,
-20936=>19176,
-20943=>19177,
-20945=>19178,
-20947=>19179,
-20948=>19180,
-20952=>19181,
-20959=>19182,
-20997=>19183,
-21030=>19184,
-21032=>19185,
-21035=>19186,
-21041=>19187,
-21042=>19188,
-21045=>19189,
-21052=>19190,
-21082=>19191,
-21088=>19192,
-21102=>19193,
-21112=>19194,
-21113=>19195,
-21130=>19196,
-21132=>19197,
-21217=>19198,
-21225=>19199,
-21233=>19200,
-21251=>19201,
-21265=>19202,
-21279=>19203,
-21293=>19204,
-21298=>19205,
-21309=>19206,
-21349=>19207,
-21357=>19208,
-21369=>19209,
-21374=>19210,
-21396=>19211,
-21401=>19212,
-21418=>19213,
-21423=>19214,
-21434=>19215,
-21441=>19216,
-21444=>19217,
-21445=>19218,
-21472=>19219,
-21523=>19220,
-21546=>19221,
-21553=>19222,
-21556=>19223,
-21557=>19224,
-21580=>19225,
-21671=>19226,
-21674=>19227,
-21681=>19228,
-21691=>19229,
-21710=>19230,
-21738=>19231,
-21756=>19232,
-21765=>19233,
-21768=>19234,
-21781=>19235,
-21799=>19236,
-21802=>19237,
-21814=>19238,
-21841=>19239,
-21862=>19240,
-21903=>19241,
-21906=>19242,
-21908=>19243,
-21924=>19244,
-21938=>19245,
-21955=>19246,
-21958=>19247,
-21971=>19248,
-21979=>19249,
-21996=>19250,
-21998=>19251,
-22001=>19252,
-22006=>19253,
-22008=>19254,
-22021=>19255,
-22029=>19256,
-22033=>19257,
-22034=>19258,
-22060=>19259,
-22069=>19260,
-22073=>19261,
-22093=>19262,
-22100=>19263,
-22149=>19264,
-22175=>19265,
-22182=>19266,
-22199=>19267,
-22220=>19268,
-22223=>19269,
-22233=>19270,
-22241=>19271,
-22251=>19272,
-22253=>19273,
-22257=>19274,
-22279=>19275,
-22284=>19276,
-22298=>19277,
-22299=>19278,
-22301=>19279,
-22316=>19280,
-22318=>19281,
-22333=>19282,
-22334=>19283,
-22367=>19284,
-22379=>19285,
-22381=>19286,
-22394=>19287,
-22403=>19288,
-22423=>19289,
-22446=>19290,
-22485=>19291,
-22503=>19292,
-22541=>19293,
-22566=>19294,
-22605=>19295,
-22607=>19296,
-22623=>19297,
-22637=>19298,
-22655=>19299,
-22657=>19300,
-22680=>19301,
-22716=>19302,
-22815=>19303,
-22819=>19304,
-22873=>19305,
-22905=>19306,
-22935=>19307,
-22959=>19308,
-22963=>19309,
-23007=>19310,
-23025=>19311,
-23032=>19312,
-23218=>19313,
-23224=>19314,
-23274=>19315,
-23286=>19316,
-23323=>19317,
-23325=>19318,
-23329=>19319,
-23352=>19320,
-23479=>19321,
-23511=>19322,
-23520=>19323,
-23583=>19324,
-23594=>19325,
-23596=>19326,
-23606=>19327,
-23641=>19328,
-23644=>19329,
-23661=>19330,
-23773=>19331,
-23809=>19332,
-23860=>19333,
-23869=>19334,
-23897=>19335,
-23934=>19336,
-23939=>19337,
-24007=>19338,
-24057=>19339,
-24104=>19340,
-24114=>19341,
-24117=>19342,
-24155=>19343,
-24168=>19344,
-24170=>19345,
-24183=>19346,
-24192=>19347,
-24203=>19348,
-24243=>19349,
-24253=>19350,
-24273=>19351,
-24276=>19352,
-24277=>19353,
-24397=>19354,
-24492=>19355,
-24554=>19356,
-24583=>19357,
-24649=>19358,
-24660=>19359,
-24679=>19360,
-24763=>19361,
-24772=>19362,
-24829=>19363,
-24842=>19364,
-24854=>19365,
-24874=>19366,
-24886=>19367,
-24926=>19368,
-24932=>19369,
-24955=>19370,
-24957=>19371,
-24959=>19372,
-24989=>19373,
-25016=>19374,
-25052=>19375,
-25058=>19376,
-25061=>19377,
-25064=>19378,
-25092=>19379,
-25095=>19380,
-25137=>19381,
-25145=>19382,
-25149=>19383,
-25210=>19384,
-25232=>19385,
-25256=>19386,
-25306=>19387,
-25332=>19388,
-25366=>19389,
-25386=>19390,
-25398=>19391,
-25414=>19392,
-25419=>19393,
-25427=>19394,
-25457=>19395,
-25461=>19396,
-25471=>19397,
-25474=>19398,
-25482=>19399,
-25518=>19400,
-25519=>19401,
-25578=>19402,
-25592=>19403,
-25593=>19404,
-25618=>19405,
-25624=>19406,
-25632=>19407,
-25636=>19408,
-25642=>19409,
-25653=>19410,
-25661=>19411,
-25663=>19412,
-25682=>19413,
-25695=>19414,
-25716=>19415,
-25744=>19416,
-25752=>19417,
-25753=>19418,
-25772=>19419,
-25779=>19420,
-25837=>19421,
-25840=>19422,
-25883=>19423,
-25887=>19424,
-25902=>19425,
-25929=>19426,
-25952=>19427,
-26002=>19428,
-26005=>19429,
-26036=>19430,
-26046=>19431,
-26056=>19432,
-26062=>19433,
-26064=>19434,
-26079=>19435,
-26238=>19436,
-26251=>19437,
-26252=>19438,
-26291=>19439,
-26304=>19440,
-26319=>19441,
-26405=>19442,
-26421=>19443,
-26453=>19444,
-26496=>19445,
-26511=>19446,
-26513=>19447,
-26532=>19448,
-26545=>19449,
-26549=>19450,
-26558=>19451,
-26664=>19452,
-26758=>19453,
-26859=>19454,
-26869=>19455,
-26903=>19456,
-26931=>19457,
-26936=>19458,
-26971=>19459,
-26981=>19460,
-27048=>19461,
-27051=>19462,
-27055=>19463,
-27109=>19464,
-27121=>19465,
-27210=>19466,
-27221=>19467,
-27239=>19468,
-27249=>19469,
-27311=>19470,
-27336=>19471,
-27337=>19472,
-27395=>19473,
-27451=>19474,
-27455=>19475,
-27517=>19476,
-27518=>19477,
-27568=>19478,
-27639=>19479,
-27641=>19480,
-27652=>19481,
-27657=>19482,
-27661=>19483,
-27692=>19484,
-27722=>19485,
-27730=>19486,
-27732=>19487,
-27769=>19488,
-27820=>19489,
-27828=>19490,
-27858=>19491,
-28001=>19492,
-28028=>19493,
-28089=>19494,
-28144=>19495,
-28229=>19496,
-28275=>19497,
-28283=>19498,
-28285=>19499,
-28297=>19500,
-28348=>19501,
-28378=>19502,
-28379=>19503,
-28454=>19504,
-28457=>19505,
-28464=>19506,
-28551=>19507,
-28573=>19508,
-28590=>19509,
-28599=>19510,
-28685=>19511,
-28704=>19512,
-28745=>19513,
-28824=>19514,
-28848=>19515,
-28885=>19516,
-28886=>19517,
-28997=>19518,
-29106=>19519,
-29172=>19520,
-29207=>19521,
-29215=>19522,
-29251=>19523,
-29263=>19524,
-29264=>19525,
-29274=>19526,
-29280=>19527,
-29288=>19528,
-29303=>19529,
-29316=>19530,
-29385=>19531,
-29413=>19532,
-29428=>19533,
-29442=>19534,
-29451=>19535,
-29470=>19536,
-29474=>19537,
-29498=>19538,
-29499=>19539,
-29517=>19540,
-29528=>19541,
-29543=>19542,
-29810=>19543,
-29871=>19544,
-29919=>19545,
-29924=>19546,
-29940=>19547,
-29947=>19548,
-29974=>19549,
-29985=>19550,
-30015=>19551,
-30046=>19552,
-30105=>19553,
-30116=>19554,
-30145=>19555,
-30148=>19556,
-30156=>19557,
-30167=>19558,
-30172=>19559,
-30177=>19560,
-30191=>19561,
-30212=>19562,
-30220=>19563,
-30237=>19564,
-30258=>19565,
-30264=>19566,
-30277=>19567,
-30282=>19568,
-30303=>19569,
-30381=>19570,
-30397=>19571,
-30425=>19572,
-30443=>19573,
-30448=>19574,
-30457=>19575,
-30464=>19576,
-30478=>19577,
-30498=>19578,
-30504=>19579,
-30511=>19580,
-30521=>19581,
-30526=>19582,
-30533=>19583,
-30538=>19584,
-30543=>19585,
-30558=>19586,
-30564=>19587,
-30567=>19588,
-30572=>19589,
-30596=>19590,
-30604=>19591,
-30605=>19592,
-30614=>19593,
-30631=>19594,
-30639=>19595,
-30647=>19596,
-30654=>19597,
-30665=>19598,
-30673=>19599,
-30681=>19600,
-30705=>19601,
-30775=>19602,
-30812=>19603,
-30846=>19604,
-30872=>19605,
-30881=>19606,
-30897=>19607,
-30899=>19608,
-30921=>19609,
-30931=>19610,
-30988=>19611,
-31007=>19612,
-31015=>19613,
-31016=>19614,
-31039=>19615,
-31042=>19616,
-31060=>19617,
-31083=>19618,
-31100=>19619,
-31147=>19620,
-31172=>19621,
-31210=>19622,
-31234=>19623,
-31244=>19624,
-31280=>19625,
-31290=>19626,
-31300=>19627,
-31360=>19628,
-31366=>19629,
-31380=>19630,
-31413=>19631,
-31421=>19632,
-31486=>19633,
-31531=>19634,
-31607=>19635,
-31648=>19636,
-31660=>19637,
-31664=>19638,
-31720=>19639,
-31730=>19640,
-31736=>19641,
-31740=>19642,
-31742=>19643,
-31753=>19644,
-31784=>19645,
-31791=>19646,
-31810=>19647,
-31826=>19648,
-31827=>19649,
-31835=>19650,
-31836=>19651,
-31837=>19652,
-31858=>19653,
-31869=>19654,
-31879=>19655,
-31902=>19656,
-31930=>19657,
-31943=>19658,
-31955=>19659,
-31962=>19660,
-32060=>19661,
-32077=>19662,
-32130=>19663,
-32133=>19664,
-32141=>19665,
-32145=>19666,
-32158=>19667,
-32179=>19668,
-32185=>19669,
-32208=>19670,
-32229=>19671,
-32245=>19672,
-32246=>19673,
-32303=>19674,
-32310=>19675,
-32324=>19676,
-32367=>19677,
-32376=>19678,
-32385=>19679,
-32573=>19680,
-32603=>19681,
-32605=>19682,
-32613=>19683,
-32625=>19684,
-32639=>19685,
-32640=>19686,
-32651=>19687,
-32674=>19688,
-32765=>19689,
-32766=>19690,
-32767=>19691,
-32775=>19692,
-32781=>19693,
-32798=>19694,
-32825=>19695,
-32904=>19696,
-32910=>19697,
-32975=>19698,
-32980=>19699,
-33005=>19700,
-33008=>19701,
-33015=>19702,
-33018=>19703,
-33022=>19704,
-33027=>19705,
-33047=>19706,
-33072=>19707,
-33111=>19708,
-33135=>19709,
-33139=>19710,
-33163=>19711,
-33168=>19712,
-33179=>19713,
-33182=>19714,
-33227=>19715,
-33237=>19716,
-33245=>19717,
-33246=>19718,
-33249=>19719,
-33263=>19720,
-33270=>19721,
-33280=>19722,
-33291=>19723,
-33299=>19724,
-33300=>19725,
-33306=>19726,
-33338=>19727,
-33348=>19728,
-33389=>19729,
-33412=>19730,
-33417=>19731,
-33425=>19732,
-33450=>19733,
-33456=>19734,
-33488=>19735,
-33514=>19736,
-33519=>19737,
-33526=>19738,
-33622=>19739,
-33656=>19740,
-33784=>19741,
-33788=>19742,
-33880=>19743,
-33939=>19744,
-33969=>19745,
-33981=>19746,
-34043=>19747,
-34118=>19748,
-34134=>19749,
-34141=>19750,
-34181=>19751,
-34200=>19752,
-34370=>19753,
-34374=>19754,
-34496=>19755,
-34580=>19756,
-34594=>19757,
-34606=>19758,
-34617=>19759,
-34653=>19760,
-34683=>19761,
-34700=>19762,
-34702=>19763,
-34711=>19764,
-34712=>19765,
-34718=>19766,
-34723=>19767,
-34734=>19768,
-34751=>19769,
-34761=>19770,
-34778=>19771,
-34840=>19772,
-34843=>19773,
-34861=>19774,
-34874=>19775,
-34885=>19776,
-34891=>19777,
-34894=>19778,
-34901=>19779,
-34906=>19780,
-34926=>19781,
-34970=>19782,
-34971=>19783,
-34972=>19784,
-35021=>19785,
-35040=>19786,
-35055=>19787,
-35086=>19788,
-35087=>19789,
-35110=>19790,
-35125=>19791,
-35162=>19792,
-35164=>19793,
-35179=>19794,
-35184=>19795,
-35196=>19796,
-35237=>19797,
-35253=>19798,
-35260=>19799,
-35285=>19800,
-35401=>19801,
-35415=>19802,
-35431=>19803,
-35454=>19804,
-35462=>19805,
-35478=>19806,
-35510=>19807,
-35529=>19808,
-35537=>19809,
-35549=>19810,
-35564=>19811,
-35573=>19812,
-35590=>19813,
-35599=>19814,
-35601=>19815,
-35653=>19816,
-35666=>19817,
-35693=>19818,
-35704=>19819,
-35708=>19820,
-35710=>19821,
-35717=>19822,
-35743=>19823,
-35915=>19824,
-35923=>19825,
-35963=>19826,
-36026=>19827,
-36037=>19828,
-36041=>19829,
-36050=>19830,
-36076=>19831,
-36085=>19832,
-36087=>19833,
-36097=>19834,
-36099=>19835,
-36119=>19836,
-36124=>19837,
-36206=>19838,
-36241=>19839,
-36255=>19840,
-36267=>19841,
-36274=>19842,
-36309=>19843,
-36327=>19844,
-36337=>19845,
-36338=>19846,
-36340=>19847,
-36353=>19848,
-36363=>19849,
-36390=>19850,
-36401=>19851,
-36416=>19852,
-36417=>19853,
-36429=>19854,
-36431=>19855,
-36444=>19856,
-36449=>19857,
-36457=>19858,
-36465=>19859,
-36469=>19860,
-36471=>19861,
-36489=>19862,
-36496=>19863,
-36501=>19864,
-36506=>19865,
-36519=>19866,
-36521=>19867,
-36525=>19868,
-36584=>19869,
-36592=>19870,
-36615=>19871,
-36632=>19872,
-36645=>19873,
-36647=>19874,
-36652=>19875,
-36661=>19876,
-36666=>19877,
-36675=>19878,
-36679=>19879,
-36689=>19880,
-36693=>19881,
-36768=>19882,
-36769=>19883,
-36770=>19884,
-36773=>19885,
-36868=>19886,
-36891=>19887,
-36911=>19888,
-36940=>19889,
-36955=>19890,
-36976=>19891,
-36980=>19892,
-36985=>19893,
-37003=>19894,
-37016=>19895,
-37024=>19896,
-37042=>19897,
-37053=>19898,
-37065=>19899,
-37104=>19900,
-37125=>19901,
-37157=>19902,
-37210=>19903,
-37223=>19904,
-37242=>19905,
-37258=>19906,
-37265=>19907,
-37269=>19908,
-37296=>19909,
-37307=>19910,
-37309=>19911,
-37314=>19912,
-37317=>19913,
-37376=>19914,
-37385=>19915,
-37411=>19916,
-37494=>19917,
-37518=>19918,
-37551=>19919,
-37563=>19920,
-37564=>19921,
-37569=>19922,
-37571=>19923,
-37573=>19924,
-37576=>19925,
-37652=>19926,
-37683=>19927,
-37686=>19928,
-37720=>19929,
-37759=>19930,
-37762=>19931,
-37770=>19932,
-37819=>19933,
-37836=>19934,
-37862=>19935,
-37881=>19936,
-37890=>19937,
-37901=>19938,
-37902=>19939,
-37934=>19940,
-37964=>19941,
-38280=>19942,
-38305=>19943,
-38335=>19944,
-38342=>19945,
-38345=>19946,
-38353=>19947,
-38354=>19948,
-38368=>19949,
-38372=>19950,
-38374=>19951,
-38436=>19952,
-38449=>19953,
-38456=>19954,
-38461=>19955,
-38484=>19956,
-38516=>19957,
-38523=>19958,
-38527=>19959,
-38529=>19960,
-38531=>19961,
-38537=>19962,
-38550=>19963,
-38574=>19964,
-38659=>19965,
-38683=>19966,
-38689=>19967,
-38690=>19968,
-38696=>19969,
-38705=>19970,
-38759=>19971,
-38774=>19972,
-38781=>19973,
-38783=>19974,
-38809=>19975,
-38815=>19976,
-38828=>19977,
-38841=>19978,
-38861=>19979,
-38880=>19980,
-38895=>19981,
-38919=>19982,
-38950=>19983,
-38958=>19984,
-39010=>19985,
-39011=>19986,
-39092=>19987,
-39109=>19988,
-39170=>19989,
-39185=>19990,
-39189=>19991,
-39221=>19992,
-39240=>19993,
-39252=>19994,
-39262=>19995,
-39393=>19996,
-39436=>19997,
-39440=>19998,
-39459=>19999,
-39489=>20000,
-39505=>20001,
-39613=>20002,
-39614=>20003,
-39681=>20004,
-39689=>20005,
-39691=>20006,
-39693=>20007,
-39694=>20008,
-39705=>20009,
-39733=>20010,
-39752=>20011,
-39765=>20012,
-39784=>20013,
-39808=>20014,
-39814=>20015,
-39824=>20016,
-39837=>20017,
-39856=>20018,
-39871=>20019,
-39880=>20020,
-39935=>20021,
-39938=>20022,
-39964=>20023,
-39989=>20024,
-40004=>20025,
-40022=>20026,
-40033=>20027,
-40040=>20028,
-40240=>20029,
-40253=>20030,
-40298=>20031,
-40315=>20032,
-40421=>20033,
-40425=>20034,
-40435=>20035,
-40570=>20036,
-40578=>20037,
-40579=>20038,
-40580=>20039,
-40624=>20040,
-40676=>20041,
-40688=>20042,
-40690=>20043,
-40713=>20044,
-40719=>20045,
-40724=>20046,
-40731=>20047,
-40738=>20048,
-40742=>20049,
-40746=>20050,
-40747=>20051,
-40756=>20052,
-40794=>20053,
-40815=>20054,
-40862=>20055,
-40869=>20056,
-131317=>20057,
-151044=>20058,
-151538=>20059,
-163187=>20060,
-194581=>20061,
-194630=>20062,
-194713=>20063,
-194726=>20064,
-194789=>20065,
-195038=>20066,
-13790=>20067,
-40895=>20068,
-40896=>20069,
-40897=>20070,
-40898=>20071,
-172722=>20072,
-131416=>20075,
-132529=>20080,
-132844=>20083,
-134488=>20090,
-154060=>20112,
-14756=>20122,
-14776=>20123,
-142914=>20124,
-14940=>20127,
-133064=>20128,
-143339=>20130,
-162228=>20133,
-15044=>20135,
-15051=>20136,
-14981=>20142,
-15347=>20151,
-27384=>20152,
-15665=>20158,
-147531=>20168,
-15936=>20170,
-14497=>20171,
-158878=>20206,
-18207=>20219,
-162876=>20220,
-18462=>20225,
-39709=>20297,
-39724=>20298,
-20482=>20299,
-20958=>20300,
-21255=>20301,
-23532=>20302,
-63784=>20303,
-26142=>20304,
-63785=>20305,
-28746=>20306,
-64021=>20307,
-21857=>20308,
-27706=>20309,
-31328=>20310,
-156492=>20311,
-34819=>20312,
-38315=>20313,
-38741=>20314,
-171581=>20315,
-173594=>20316,
-900=>20317,
-901=>20318,
-272=>20322,
-294=>20323,
-306=>20324,
-319=>20325,
-330=>20326,
-358=>20327,
-307=>20328,
-312=>20329,
-320=>20330,
-329=>20331,
-359=>20332,
-266=>20333,
-278=>20334,
-286=>20335,
-290=>20336,
-288=>20337,
-304=>20338,
-302=>20339,
-310=>20340,
-315=>20342,
-325=>20343,
-342=>20344,
-370=>20345,
-471=>20346,
-475=>20347,
-473=>20348,
-469=>20349,
-372=>20350,
-374=>20351,
-267=>20352,
-279=>20353,
-501=>20354,
-287=>20355,
-289=>20356,
-303=>20357,
-311=>20358,
-316=>20360,
-326=>20361,
-343=>20362,
-371=>20363,
-373=>20364,
-375=>20365,
-8494=>20366,
-8710=>20367,
-8719=>20368,
-8804=>20369,
-8805=>20370,
-9674=>20371,
-902=>20427,
-904=>20428,
-905=>20429,
-906=>20430,
-938=>20431,
-908=>20432,
-910=>20433,
-939=>20434,
-911=>20435,
-940=>20436,
-941=>20437,
-942=>20438,
-943=>20439,
-970=>20440,
-912=>20441,
-972=>20442,
-973=>20443,
-971=>20444,
-944=>20445,
-974=>20446,
-1026=>20447,
-1027=>20448,
-1028=>20449,
-1029=>20450,
-1030=>20451,
-1031=>20452,
-1032=>20453,
-1033=>20454,
-1034=>20455,
-1035=>20456,
-1036=>20457,
-1038=>20458,
-1039=>20459,
-1106=>20460,
-1107=>20461,
-1108=>20462,
-1109=>20463,
-1110=>20464,
-1111=>20465,
-1112=>20466,
-1113=>20467,
-1114=>20468,
-1115=>20469,
-1116=>20470,
-1118=>20471,
-1119=>20472,
-9361=>20587,
-9362=>20588,
-20021=>21075,
-20060=>21076,
-20067=>21077,
-20072=>21078,
-20084=>21079,
-20085=>21080,
-20119=>21081,
-20143=>21082,
-20187=>21083,
-20194=>21084,
-20200=>21085,
-20207=>21086,
-20222=>21087,
-20226=>21088,
-20232=>21089,
-20242=>21090,
-20247=>21091,
-20275=>21092,
-20277=>21093,
-20288=>21094,
-20290=>21095,
-20299=>21096,
-20300=>21097,
-20306=>21098,
-20323=>21099,
-20334=>21100,
-20337=>21101,
-20345=>21102,
-20353=>21103,
-20361=>21104,
-20364=>21105,
-20366=>21106,
-20368=>21107,
-20371=>21108,
-20377=>21109,
-20383=>21110,
-20409=>21111,
-20411=>21112,
-20412=>21113,
-20413=>21114,
-20416=>21115,
-20417=>21116,
-20422=>21117,
-20424=>21118,
-20428=>21119,
-20444=>21120,
-20450=>21121,
-20464=>21122,
-20476=>21123,
-20487=>21124,
-20490=>21125,
-20503=>21126,
-20509=>21127,
-20528=>21128,
-20530=>21129,
-20531=>21130,
-20533=>21131,
-20549=>21132,
-20554=>21133,
-20561=>21134,
-20562=>21135,
-20569=>21136,
-20576=>21137,
-20583=>21138,
-20589=>21139,
-20593=>21140,
-20609=>21141,
-20611=>21142,
-20612=>21143,
-20614=>21144,
-20618=>21145,
-20624=>21146,
-20635=>21147,
-20639=>21148,
-20640=>21149,
-20641=>21150,
-20655=>21151,
-20656=>21152,
-20665=>21153,
-20669=>21154,
-20672=>21155,
-20691=>21156,
-20700=>21157,
-20701=>21158,
-20703=>21159,
-20706=>21160,
-20708=>21161,
-20726=>21162,
-20730=>21163,
-20761=>21165,
-20764=>21166,
-20765=>21167,
-20771=>21168,
-20775=>21169,
-20776=>21170,
-20780=>21171,
-20781=>21172,
-20783=>21173,
-20785=>21174,
-20788=>21175,
-20793=>21176,
-20802=>21177,
-20815=>21178,
-20819=>21179,
-20824=>21180,
-20838=>21181,
-20862=>21182,
-20878=>21183,
-20927=>21184,
-20930=>21185,
-20946=>21186,
-20949=>21187,
-20965=>21188,
-20978=>21189,
-20983=>21190,
-21016=>21191,
-21026=>21192,
-21061=>21193,
-21080=>21194,
-21087=>21195,
-21120=>21196,
-21125=>21197,
-21141=>21198,
-21142=>21199,
-21143=>21200,
-21146=>21201,
-21157=>21202,
-21159=>21203,
-21168=>21204,
-21174=>21205,
-21175=>21206,
-21176=>21207,
-21181=>21208,
-21188=>21209,
-21190=>21210,
-21199=>21211,
-21204=>21212,
-21212=>21213,
-21221=>21214,
-21224=>21215,
-21226=>21216,
-21228=>21217,
-21236=>21218,
-21238=>21219,
-21260=>21220,
-21267=>21221,
-21272=>21222,
-21275=>21223,
-21278=>21224,
-21285=>21225,
-21287=>21226,
-21288=>21227,
-21289=>21228,
-21291=>21229,
-21292=>21230,
-21296=>21231,
-21308=>21232,
-21337=>21233,
-21339=>21234,
-21379=>21236,
-21383=>21237,
-21384=>21238,
-21390=>21239,
-21409=>21240,
-21429=>21241,
-21432=>21242,
-21437=>21243,
-21455=>21244,
-21458=>21245,
-21459=>21246,
-21470=>21247,
-21479=>21249,
-21506=>21250,
-21530=>21251,
-21537=>21252,
-21551=>21253,
-21572=>21254,
-21575=>21255,
-21583=>21256,
-21598=>21257,
-21604=>21258,
-21607=>21259,
-21609=>21260,
-21613=>21261,
-21614=>21262,
-21633=>21263,
-21635=>21264,
-21637=>21265,
-21641=>21266,
-21649=>21267,
-21663=>21268,
-21706=>21269,
-21728=>21270,
-21750=>21271,
-21758=>21272,
-21772=>21273,
-21773=>21274,
-21810=>21275,
-21819=>21276,
-21821=>21277,
-21833=>21278,
-21837=>21279,
-21848=>21280,
-21850=>21281,
-21851=>21282,
-21887=>21283,
-21907=>21284,
-21911=>21285,
-21923=>21286,
-21953=>21287,
-21963=>21288,
-21975=>21289,
-21976=>21290,
-21982=>21291,
-22015=>21292,
-22026=>21294,
-22041=>21295,
-22067=>21296,
-22076=>21297,
-22081=>21298,
-22083=>21299,
-22084=>21300,
-22086=>21301,
-22113=>21302,
-22114=>21303,
-22115=>21304,
-22133=>21305,
-22148=>21306,
-22155=>21307,
-22183=>21308,
-22187=>21309,
-22206=>21310,
-22219=>21311,
-22224=>21312,
-22236=>21313,
-22245=>21314,
-22246=>21315,
-22247=>21316,
-22273=>21317,
-22274=>21318,
-22289=>21319,
-22304=>21320,
-22306=>21321,
-22308=>21322,
-22309=>21323,
-22314=>21324,
-22335=>21325,
-22354=>21326,
-22370=>21327,
-22375=>21328,
-22382=>21329,
-22385=>21330,
-22393=>21331,
-22398=>21332,
-22401=>21333,
-22420=>21334,
-22425=>21335,
-22431=>21336,
-22433=>21337,
-22421=>21338,
-22439=>21339,
-22441=>21340,
-22461=>21341,
-22493=>21342,
-22505=>21343,
-22526=>21344,
-22531=>21345,
-22536=>21346,
-22497=>21347,
-22540=>21348,
-22555=>21349,
-22559=>21350,
-22573=>21351,
-22591=>21352,
-22608=>21353,
-22613=>21354,
-22632=>21355,
-22648=>21356,
-22663=>21357,
-22664=>21358,
-22668=>21359,
-22678=>21360,
-22688=>21361,
-22689=>21362,
-22690=>21363,
-22694=>21364,
-22724=>21365,
-22722=>21366,
-22728=>21367,
-22742=>21368,
-22749=>21369,
-22753=>21370,
-22802=>21372,
-22803=>21373,
-22813=>21374,
-22817=>21375,
-22824=>21376,
-22832=>21377,
-22835=>21378,
-22837=>21379,
-22838=>21380,
-22847=>21381,
-22851=>21382,
-22866=>21383,
-22878=>21384,
-22891=>21385,
-22895=>21386,
-22898=>21387,
-22907=>21388,
-22924=>21389,
-22926=>21390,
-22933=>21391,
-22951=>21392,
-22957=>21393,
-22960=>21394,
-22967=>21395,
-22977=>21396,
-22980=>21397,
-23023=>21398,
-23026=>21399,
-23028=>21400,
-23031=>21401,
-23040=>21402,
-23054=>21403,
-23058=>21404,
-23070=>21405,
-23076=>21406,
-23080=>21407,
-23082=>21408,
-23088=>21409,
-23108=>21410,
-23109=>21411,
-23112=>21412,
-23116=>21413,
-23120=>21414,
-23134=>21415,
-23163=>21416,
-23184=>21417,
-23187=>21418,
-23190=>21419,
-23193=>21420,
-23227=>21421,
-23238=>21422,
-23240=>21423,
-23247=>21424,
-23293=>21425,
-23297=>21426,
-23371=>21427,
-23390=>21428,
-23406=>21429,
-23430=>21430,
-23438=>21431,
-23440=>21432,
-23441=>21433,
-23444=>21434,
-23464=>21435,
-23465=>21436,
-23469=>21437,
-23471=>21438,
-23473=>21439,
-23474=>21440,
-23482=>21441,
-23484=>21442,
-23489=>21443,
-23501=>21444,
-23503=>21445,
-23513=>21446,
-23514=>21447,
-23535=>21448,
-23540=>21449,
-23564=>21450,
-23575=>21451,
-23590=>21452,
-23598=>21453,
-23602=>21454,
-23605=>21455,
-23642=>21456,
-23668=>21457,
-23669=>21458,
-23675=>21459,
-23677=>21460,
-23687=>21461,
-23698=>21462,
-23709=>21463,
-23730=>21464,
-23732=>21465,
-23767=>21466,
-23790=>21467,
-23793=>21468,
-23794=>21469,
-23826=>21470,
-23843=>21471,
-23871=>21472,
-23880=>21473,
-23893=>21474,
-23889=>21475,
-23903=>21476,
-23904=>21477,
-23906=>21478,
-23908=>21479,
-23929=>21480,
-23930=>21481,
-23935=>21482,
-23946=>21483,
-23955=>21484,
-23957=>21485,
-23963=>21486,
-23967=>21487,
-23979=>21488,
-24003=>21489,
-24014=>21490,
-24025=>21491,
-24071=>21492,
-24077=>21493,
-24096=>21494,
-24139=>21495,
-24144=>21496,
-24145=>21497,
-24156=>21498,
-24176=>21499,
-24206=>21500,
-24226=>21501,
-24228=>21502,
-24241=>21503,
-24268=>21504,
-24270=>21505,
-24284=>21506,
-24286=>21507,
-24293=>21508,
-24299=>21509,
-24326=>21510,
-24345=>21511,
-24356=>21512,
-24363=>21513,
-24364=>21514,
-24366=>21515,
-24368=>21516,
-24383=>21517,
-24388=>21518,
-24411=>21519,
-24416=>21520,
-24431=>21521,
-24436=>21522,
-24437=>21523,
-24440=>21524,
-24442=>21525,
-24461=>21526,
-24470=>21527,
-24477=>21528,
-24491=>21529,
-24496=>21530,
-24497=>21531,
-24520=>21532,
-24528=>21533,
-24529=>21534,
-24552=>21535,
-24556=>21536,
-24562=>21537,
-24566=>21538,
-24570=>21539,
-24586=>21540,
-24595=>21541,
-24607=>21542,
-24621=>21543,
-24640=>21544,
-24648=>21545,
-24657=>21546,
-24662=>21547,
-24663=>21548,
-24689=>21549,
-24702=>21550,
-24706=>21551,
-24710=>21552,
-24712=>21553,
-24718=>21554,
-24721=>21555,
-24723=>21556,
-24728=>21557,
-24738=>21559,
-24741=>21560,
-24759=>21561,
-24770=>21562,
-24777=>21563,
-24778=>21564,
-24782=>21565,
-24783=>21566,
-24802=>21567,
-24805=>21568,
-24828=>21569,
-24834=>21570,
-24839=>21571,
-24844=>21572,
-24855=>21573,
-24866=>21574,
-24881=>21575,
-24885=>21576,
-24889=>21577,
-24901=>21578,
-24905=>21579,
-24940=>21580,
-24946=>21581,
-24952=>21582,
-24960=>21583,
-24961=>21584,
-24963=>21585,
-24964=>21586,
-24971=>21587,
-24988=>21588,
-24992=>21589,
-25002=>21590,
-25024=>21591,
-25025=>21592,
-25038=>21593,
-25039=>21594,
-25054=>21595,
-25057=>21596,
-25063=>21597,
-25065=>21598,
-25068=>21599,
-25069=>21600,
-25071=>21601,
-25089=>21602,
-25091=>21603,
-25116=>21604,
-25120=>21605,
-25127=>21606,
-25131=>21607,
-25154=>21608,
-25156=>21609,
-25168=>21610,
-25172=>21611,
-25180=>21612,
-25213=>21613,
-25229=>21614,
-25230=>21615,
-25231=>21616,
-25267=>21617,
-25270=>21618,
-25271=>21619,
-25274=>21620,
-25278=>21621,
-25279=>21622,
-25294=>21623,
-25322=>21624,
-25330=>21625,
-25348=>21626,
-25355=>21627,
-25363=>21628,
-25385=>21629,
-25389=>21630,
-25418=>21631,
-25426=>21632,
-25428=>21633,
-25432=>21634,
-25435=>21635,
-25446=>21636,
-25453=>21637,
-25464=>21638,
-25493=>21639,
-25498=>21640,
-25508=>21641,
-25510=>21642,
-25517=>21643,
-25537=>21644,
-25541=>21645,
-25544=>21646,
-25550=>21647,
-25555=>21648,
-25587=>21649,
-25610=>21650,
-25648=>21651,
-25675=>21652,
-25679=>21653,
-25683=>21654,
-25692=>21655,
-25697=>21656,
-25699=>21657,
-25733=>21658,
-25743=>21659,
-25755=>21660,
-25761=>21661,
-25763=>21662,
-25766=>21663,
-25768=>21664,
-25789=>21665,
-25801=>21666,
-25809=>21667,
-25833=>21668,
-25834=>21669,
-25845=>21670,
-25857=>21671,
-25864=>21672,
-25865=>21673,
-25866=>21674,
-25875=>21675,
-25894=>21676,
-25905=>21677,
-25914=>21678,
-25916=>21679,
-25917=>21680,
-25923=>21681,
-25936=>21682,
-25938=>21683,
-25951=>21684,
-25981=>21685,
-26008=>21686,
-26016=>21687,
-26019=>21688,
-26022=>21689,
-26030=>21690,
-26035=>21691,
-26070=>21692,
-26072=>21693,
-26100=>21695,
-26101=>21696,
-26110=>21697,
-26111=>21698,
-26125=>21699,
-26129=>21700,
-26130=>21701,
-26134=>21702,
-26141=>21703,
-26147=>21704,
-26150=>21705,
-26153=>21706,
-26169=>21707,
-26167=>21708,
-26176=>21709,
-26182=>21710,
-26186=>21711,
-26200=>21712,
-26208=>21713,
-26229=>21714,
-26239=>21715,
-26233=>21716,
-26236=>21717,
-26266=>21718,
-26267=>21719,
-26268=>21720,
-26271=>21721,
-26306=>21723,
-26307=>21724,
-26316=>21725,
-26318=>21726,
-26324=>21727,
-26335=>21728,
-26347=>21729,
-26350=>21730,
-26375=>21731,
-26396=>21732,
-26400=>21733,
-26402=>21734,
-26430=>21735,
-26437=>21736,
-26476=>21737,
-26500=>21738,
-26510=>21739,
-26518=>21740,
-26521=>21741,
-26556=>21742,
-26557=>21743,
-26562=>21744,
-26565=>21745,
-26569=>21746,
-26588=>21747,
-26593=>21748,
-26598=>21749,
-26610=>21750,
-26614=>21751,
-26644=>21752,
-26649=>21753,
-26663=>21754,
-26671=>21755,
-26687=>21756,
-26698=>21757,
-26712=>21758,
-26735=>21759,
-26736=>21760,
-26737=>21761,
-26745=>21762,
-26747=>21763,
-26760=>21764,
-26785=>21765,
-26793=>21766,
-26798=>21767,
-26833=>21768,
-26835=>21769,
-26844=>21770,
-26845=>21771,
-26858=>21772,
-26870=>21773,
-26877=>21774,
-26886=>21775,
-26889=>21776,
-26896=>21777,
-26902=>21778,
-26929=>21779,
-26949=>21780,
-26958=>21781,
-26982=>21782,
-26992=>21783,
-26993=>21784,
-27003=>21785,
-27021=>21786,
-27041=>21787,
-27064=>21788,
-27077=>21789,
-27080=>21790,
-27136=>21792,
-27139=>21793,
-27168=>21794,
-27172=>21795,
-27191=>21796,
-27242=>21798,
-27265=>21799,
-27270=>21800,
-27271=>21801,
-27291=>21802,
-27312=>21803,
-27313=>21804,
-27316=>21805,
-27326=>21806,
-27327=>21807,
-27340=>21808,
-27349=>21809,
-27350=>21810,
-27376=>21811,
-27388=>21812,
-27394=>21813,
-27398=>21814,
-27399=>21815,
-27401=>21816,
-27432=>21817,
-27435=>21818,
-27446=>21819,
-27469=>21820,
-27474=>21821,
-27485=>21822,
-27499=>21823,
-27502=>21824,
-27504=>21825,
-27525=>21826,
-27543=>21827,
-27551=>21828,
-27552=>21829,
-27554=>21830,
-27555=>21831,
-27560=>21832,
-27564=>21833,
-27576=>21834,
-27577=>21835,
-27587=>21836,
-27588=>21837,
-27619=>21838,
-27666=>21839,
-27673=>21840,
-27679=>21841,
-27686=>21842,
-27687=>21843,
-27688=>21844,
-27694=>21845,
-27707=>21846,
-27723=>21847,
-27727=>21848,
-27755=>21849,
-27768=>21850,
-27783=>21851,
-27807=>21852,
-27824=>21853,
-27826=>21854,
-27853=>21855,
-27855=>21856,
-27857=>21857,
-27879=>21858,
-27890=>21859,
-27892=>21860,
-27911=>21861,
-27919=>21862,
-27923=>21863,
-27930=>21864,
-27944=>21865,
-27999=>21866,
-28007=>21867,
-28050=>21868,
-28055=>21869,
-28087=>21870,
-28093=>21871,
-28128=>21872,
-28130=>21873,
-28133=>21874,
-28143=>21875,
-28148=>21876,
-28160=>21877,
-28164=>21878,
-28219=>21879,
-28242=>21880,
-28253=>21881,
-28258=>21882,
-28264=>21883,
-28301=>21884,
-28313=>21885,
-28320=>21886,
-28333=>21887,
-28334=>21888,
-28339=>21889,
-28347=>21890,
-28352=>21891,
-28360=>21892,
-28365=>21893,
-28367=>21894,
-28397=>21895,
-28398=>21896,
-28420=>21897,
-28424=>21898,
-28429=>21899,
-28438=>21900,
-28443=>21901,
-28475=>21902,
-28461=>21903,
-28495=>21904,
-28499=>21905,
-28509=>21906,
-28524=>21907,
-28547=>21908,
-28563=>21909,
-28582=>21910,
-28592=>21911,
-28613=>21912,
-28648=>21913,
-28669=>21914,
-28695=>21915,
-28719=>21916,
-28724=>21917,
-28727=>21918,
-28740=>21919,
-28744=>21920,
-28757=>21921,
-28820=>21922,
-28822=>21923,
-28827=>21924,
-28852=>21925,
-28922=>21926,
-28933=>21927,
-28939=>21928,
-28973=>21929,
-28984=>21930,
-28993=>21931,
-29003=>21932,
-29015=>21934,
-29018=>21935,
-29068=>21936,
-29082=>21937,
-29104=>21938,
-29119=>21939,
-29120=>21940,
-29132=>21941,
-29146=>21942,
-29176=>21943,
-29192=>21944,
-29193=>21945,
-29203=>21946,
-29210=>21947,
-29220=>21948,
-29231=>21949,
-29253=>21950,
-29262=>21951,
-29278=>21952,
-29291=>21953,
-29297=>21954,
-29307=>21955,
-29308=>21956,
-29321=>21957,
-29331=>21958,
-29352=>21959,
-29397=>21960,
-29398=>21961,
-29400=>21962,
-29407=>21963,
-29438=>21964,
-29453=>21965,
-29459=>21966,
-29490=>21967,
-29493=>21968,
-29526=>21969,
-29533=>21970,
-29534=>21971,
-29535=>21972,
-29536=>21973,
-29545=>21974,
-29561=>21975,
-29568=>21976,
-29582=>21977,
-29584=>21978,
-29587=>21979,
-29591=>21980,
-29610=>21981,
-29613=>21982,
-29638=>21983,
-29644=>21984,
-29651=>21985,
-29661=>21986,
-29670=>21987,
-29687=>21988,
-29691=>21989,
-29695=>21990,
-29696=>21991,
-29713=>21992,
-29741=>21993,
-29799=>21994,
-29800=>21995,
-29806=>21996,
-29839=>21997,
-29841=>21998,
-29850=>21999,
-29870=>22000,
-29873=>22001,
-29874=>22002,
-29900=>22003,
-29904=>22004,
-29907=>22005,
-29915=>22007,
-29928=>22008,
-29930=>22009,
-29948=>22011,
-29958=>22012,
-29970=>22013,
-29991=>22014,
-29993=>22015,
-30006=>22016,
-30009=>22017,
-30019=>22018,
-30023=>22019,
-30039=>22020,
-30047=>22021,
-30049=>22022,
-30075=>22023,
-30076=>22024,
-30085=>22025,
-30101=>22026,
-30108=>22027,
-30138=>22028,
-30226=>22029,
-30243=>22030,
-30249=>22031,
-30265=>22032,
-30266=>22033,
-30272=>22034,
-30276=>22035,
-30297=>22036,
-30341=>22037,
-30348=>22038,
-30349=>22039,
-30367=>22040,
-30370=>22041,
-30371=>22042,
-30401=>22043,
-30411=>22044,
-30432=>22046,
-30454=>22047,
-30470=>22048,
-30482=>22049,
-30484=>22050,
-30485=>22051,
-30492=>22052,
-30510=>22053,
-30525=>22054,
-30530=>22055,
-30546=>22056,
-30550=>22057,
-30551=>22058,
-30576=>22059,
-30579=>22060,
-30580=>22061,
-30638=>22064,
-30641=>22065,
-30645=>22066,
-30659=>22067,
-30674=>22068,
-30677=>22069,
-30712=>22070,
-30734=>22071,
-30737=>22072,
-30749=>22073,
-30755=>22074,
-30788=>22075,
-30792=>22076,
-30796=>22077,
-30802=>22078,
-30814=>22079,
-30816=>22080,
-30817=>22081,
-30819=>22082,
-30863=>22083,
-30888=>22084,
-30892=>22085,
-30898=>22086,
-30909=>22087,
-30911=>22088,
-30919=>22089,
-30930=>22090,
-30934=>22091,
-30939=>22092,
-30943=>22093,
-30954=>22094,
-30963=>22095,
-30966=>22096,
-30975=>22097,
-30982=>22098,
-31002=>22099,
-31006=>22100,
-31008=>22101,
-31017=>22102,
-31021=>22103,
-31029=>22104,
-31044=>22105,
-31051=>22106,
-31055=>22107,
-31057=>22108,
-31081=>22109,
-31099=>22110,
-31102=>22111,
-31116=>22112,
-31121=>22113,
-31123=>22114,
-31132=>22115,
-31144=>22116,
-31151=>22117,
-31183=>22118,
-31197=>22119,
-31200=>22120,
-31202=>22121,
-31205=>22122,
-31217=>22123,
-31224=>22124,
-31228=>22125,
-31239=>22126,
-31265=>22127,
-31271=>22128,
-31275=>22129,
-31279=>22130,
-31284=>22131,
-31285=>22132,
-31304=>22133,
-31317=>22134,
-31333=>22135,
-31358=>22136,
-31371=>22137,
-31377=>22138,
-31390=>22139,
-31433=>22140,
-31451=>22141,
-31465=>22142,
-31468=>22143,
-31473=>22144,
-31483=>22145,
-31519=>22146,
-31523=>22147,
-31529=>22148,
-31536=>22149,
-31540=>22150,
-31551=>22151,
-31552=>22152,
-31594=>22153,
-31620=>22154,
-31625=>22155,
-31630=>22156,
-31638=>22157,
-31653=>22158,
-31666=>22159,
-31670=>22160,
-31674=>22161,
-31675=>22162,
-31677=>22163,
-31682=>22164,
-31688=>22165,
-31707=>22166,
-31732=>22167,
-31733=>22168,
-31737=>22169,
-31738=>22170,
-31746=>22171,
-31748=>22172,
-31750=>22173,
-31756=>22174,
-31769=>22175,
-31771=>22176,
-31781=>22177,
-31788=>22178,
-31796=>22179,
-31801=>22180,
-31802=>22181,
-31814=>22182,
-31829=>22183,
-31834=>22184,
-31843=>22185,
-31868=>22187,
-31878=>22188,
-31920=>22189,
-31931=>22190,
-31951=>22191,
-31956=>22192,
-31977=>22193,
-32015=>22194,
-32017=>22195,
-32022=>22196,
-32038=>22197,
-32042=>22198,
-32045=>22199,
-32081=>22200,
-32087=>22201,
-32101=>22202,
-32103=>22203,
-32120=>22204,
-32123=>22205,
-32129=>22206,
-32150=>22207,
-32195=>22208,
-32196=>22209,
-32197=>22210,
-32198=>22211,
-32205=>22212,
-32206=>22213,
-32256=>22214,
-32226=>22215,
-32234=>22216,
-32237=>22217,
-32250=>22218,
-32284=>22219,
-32301=>22220,
-32307=>22221,
-32319=>22222,
-32334=>22223,
-32336=>22224,
-32344=>22225,
-32351=>22226,
-32357=>22227,
-32405=>22228,
-32413=>22229,
-32414=>22230,
-32575=>22231,
-32604=>22232,
-32614=>22233,
-32653=>22235,
-32655=>22236,
-32678=>22237,
-32682=>22238,
-32692=>22239,
-32700=>22240,
-32704=>22241,
-32712=>22242,
-32744=>22243,
-32783=>22244,
-32787=>22245,
-32797=>22246,
-32799=>22247,
-32800=>22248,
-32814=>22249,
-32820=>22250,
-32830=>22251,
-32832=>22252,
-32836=>22253,
-32868=>22254,
-32877=>22255,
-32897=>22256,
-32953=>22257,
-32968=>22258,
-32973=>22259,
-32978=>22260,
-33006=>22261,
-33010=>22262,
-33014=>22263,
-33017=>22264,
-33035=>22265,
-33052=>22266,
-33056=>22267,
-33084=>22268,
-33093=>22269,
-33095=>22270,
-33106=>22271,
-33121=>22272,
-33143=>22273,
-33158=>22274,
-33166=>22275,
-33174=>22276,
-33186=>22277,
-33198=>22278,
-33221=>22279,
-33230=>22280,
-33259=>22281,
-33264=>22282,
-33265=>22283,
-33266=>22284,
-33269=>22285,
-33272=>22286,
-33295=>22288,
-33309=>22289,
-33320=>22290,
-33347=>22291,
-33358=>22292,
-33361=>22293,
-33366=>22294,
-33383=>22295,
-33403=>22296,
-33408=>22297,
-33409=>22298,
-33415=>22299,
-33428=>22300,
-33430=>22301,
-33432=>22302,
-33434=>22303,
-33435=>22304,
-33440=>22305,
-33498=>22306,
-33504=>22307,
-33508=>22308,
-33517=>22309,
-33546=>22310,
-33547=>22311,
-33566=>22312,
-33567=>22313,
-33569=>22314,
-33580=>22315,
-33582=>22316,
-33587=>22317,
-33591=>22318,
-33597=>22319,
-33602=>22320,
-33613=>22321,
-33614=>22322,
-33648=>22323,
-33664=>22324,
-33666=>22325,
-33668=>22326,
-33689=>22327,
-33692=>22328,
-33702=>22329,
-33708=>22330,
-33726=>22331,
-33619=>22332,
-33768=>22333,
-33817=>22334,
-33709=>22335,
-33839=>22336,
-33861=>22337,
-33863=>22338,
-33869=>22339,
-33878=>22340,
-33888=>22342,
-33892=>22343,
-33895=>22344,
-33898=>22345,
-33908=>22346,
-33917=>22347,
-33938=>22348,
-33941=>22349,
-33961=>22350,
-33962=>22351,
-33991=>22352,
-33992=>22353,
-33996=>22354,
-34034=>22355,
-34039=>22356,
-34050=>22357,
-34051=>22358,
-34055=>22359,
-34062=>22360,
-34064=>22361,
-34076=>22362,
-34082=>22363,
-34087=>22364,
-34090=>22365,
-34099=>22366,
-34102=>22367,
-34111=>22368,
-34128=>22369,
-34130=>22370,
-34140=>22371,
-34143=>22373,
-34144=>22374,
-34169=>22375,
-34185=>22376,
-34187=>22377,
-34208=>22378,
-34213=>22379,
-34215=>22380,
-34228=>22381,
-34230=>22382,
-34232=>22383,
-34237=>22384,
-34238=>22385,
-34239=>22386,
-34242=>22387,
-34266=>22388,
-34272=>22389,
-34280=>22390,
-34291=>22391,
-34300=>22392,
-34317=>22393,
-34318=>22394,
-34329=>22395,
-34331=>22396,
-34358=>22397,
-34362=>22398,
-34365=>22399,
-34392=>22400,
-34393=>22401,
-34397=>22402,
-34400=>22403,
-34401=>22404,
-34404=>22405,
-34409=>22406,
-34422=>22407,
-34454=>22408,
-34458=>22409,
-34465=>22410,
-34470=>22411,
-34477=>22412,
-34484=>22413,
-34485=>22414,
-34487=>22415,
-34489=>22416,
-34495=>22417,
-34501=>22418,
-34514=>22419,
-34522=>22420,
-34524=>22421,
-34528=>22422,
-34533=>22423,
-34535=>22424,
-34440=>22425,
-34564=>22426,
-34575=>22427,
-34607=>22428,
-34610=>22429,
-34620=>22430,
-34621=>22431,
-34629=>22432,
-34637=>22433,
-34657=>22434,
-34671=>22435,
-34691=>22436,
-34692=>22437,
-34693=>22438,
-34694=>22439,
-34704=>22440,
-34709=>22441,
-34737=>22443,
-34760=>22444,
-34762=>22445,
-34773=>22446,
-34777=>22447,
-34780=>22448,
-34786=>22449,
-34788=>22450,
-34801=>22451,
-34803=>22452,
-34808=>22453,
-34810=>22454,
-34815=>22455,
-34825=>22456,
-34841=>22457,
-34834=>22458,
-34842=>22459,
-34846=>22460,
-34864=>22461,
-34869=>22462,
-34881=>22463,
-34883=>22464,
-34888=>22465,
-34889=>22466,
-34897=>22468,
-34908=>22469,
-34912=>22470,
-34929=>22471,
-34937=>22472,
-34939=>22473,
-34944=>22474,
-34975=>22475,
-34984=>22476,
-35002=>22477,
-35019=>22478,
-35020=>22479,
-35038=>22480,
-35047=>22481,
-35063=>22482,
-35085=>22483,
-35093=>22484,
-35094=>22485,
-35104=>22486,
-35112=>22487,
-35121=>22488,
-35130=>22489,
-35142=>22490,
-35151=>22491,
-35154=>22492,
-35159=>22493,
-35163=>22494,
-35169=>22495,
-35171=>22496,
-35182=>22497,
-35187=>22498,
-35189=>22499,
-35194=>22500,
-35197=>22501,
-35213=>22502,
-35221=>22503,
-35227=>22504,
-35228=>22505,
-35232=>22506,
-35252=>22507,
-35254=>22508,
-35287=>22509,
-35305=>22510,
-35309=>22511,
-35321=>22512,
-35332=>22513,
-35333=>22514,
-35358=>22515,
-35360=>22516,
-35364=>22517,
-35366=>22518,
-35371=>22519,
-35372=>22520,
-35375=>22521,
-35389=>22522,
-35392=>22523,
-35395=>22524,
-35411=>22525,
-35414=>22526,
-35420=>22527,
-35429=>22528,
-35446=>22529,
-35447=>22530,
-35450=>22531,
-35451=>22532,
-35456=>22533,
-35459=>22534,
-35467=>22535,
-35471=>22536,
-35474=>22537,
-35479=>22538,
-35481=>22539,
-35487=>22540,
-35497=>22541,
-35503=>22542,
-35507=>22543,
-35515=>22544,
-35523=>22545,
-35526=>22546,
-35528=>22547,
-35530=>22548,
-35539=>22549,
-35540=>22550,
-35541=>22551,
-35568=>22552,
-35583=>22553,
-35595=>22554,
-35614=>22555,
-35632=>22556,
-35644=>22557,
-35650=>22558,
-35656=>22559,
-35661=>22560,
-35683=>22561,
-35705=>22562,
-35716=>22563,
-35725=>22564,
-35727=>22565,
-35896=>22566,
-35902=>22567,
-35921=>22568,
-35928=>22569,
-35931=>22570,
-35933=>22571,
-35929=>22572,
-35939=>22573,
-35940=>22574,
-35942=>22575,
-35957=>22576,
-35958=>22577,
-35966=>22578,
-35974=>22579,
-35975=>22580,
-35979=>22581,
-35984=>22582,
-35996=>22584,
-36025=>22585,
-36038=>22586,
-36043=>22587,
-36047=>22588,
-36061=>22589,
-36072=>22590,
-36079=>22591,
-36082=>22592,
-36095=>22593,
-36197=>22594,
-36223=>22595,
-36226=>22596,
-36232=>22597,
-36240=>22598,
-36254=>22599,
-36256=>22600,
-36268=>22601,
-36277=>22602,
-36279=>22603,
-36281=>22604,
-36283=>22605,
-36288=>22606,
-36293=>22607,
-36295=>22608,
-36298=>22609,
-36308=>22610,
-36325=>22611,
-36336=>22612,
-36284=>22613,
-36356=>22614,
-36357=>22615,
-36369=>22616,
-36403=>22617,
-36407=>22618,
-36408=>22619,
-36430=>22620,
-36443=>22621,
-36445=>22622,
-36446=>22623,
-36473=>22624,
-36482=>22625,
-36483=>22626,
-36507=>22627,
-36509=>22628,
-36514=>22629,
-36538=>22630,
-36545=>22631,
-36547=>22632,
-36548=>22633,
-36551=>22634,
-36572=>22635,
-36590=>22636,
-36593=>22637,
-36599=>22638,
-36589=>22639,
-36610=>22640,
-36623=>22641,
-36624=>22642,
-36630=>22643,
-36640=>22644,
-36641=>22645,
-36643=>22646,
-36648=>22647,
-36654=>22648,
-36660=>22649,
-36663=>22650,
-36673=>22651,
-36687=>22652,
-36690=>22653,
-36691=>22654,
-36701=>22655,
-36702=>22656,
-36709=>22657,
-36765=>22658,
-36792=>22659,
-36798=>22660,
-36800=>22661,
-36811=>22662,
-36816=>22663,
-36818=>22664,
-36835=>22665,
-36862=>22666,
-36888=>22667,
-36904=>22668,
-36905=>22669,
-36906=>22670,
-36915=>22671,
-36916=>22672,
-36927=>22673,
-36962=>22674,
-36966=>22675,
-36972=>22676,
-37006=>22677,
-37029=>22678,
-37068=>22679,
-37077=>22680,
-37080=>22681,
-37081=>22682,
-37093=>22683,
-37074=>22684,
-37128=>22685,
-37133=>22686,
-37136=>22687,
-37146=>22688,
-37152=>22689,
-37161=>22690,
-37166=>22691,
-37174=>22692,
-37180=>22693,
-37187=>22694,
-37199=>22695,
-37203=>22696,
-37229=>22697,
-37243=>22698,
-37249=>22699,
-37254=>22700,
-37267=>22701,
-37268=>22702,
-37272=>22703,
-37281=>22704,
-37286=>22705,
-37311=>22706,
-37331=>22707,
-37332=>22708,
-37337=>22709,
-37353=>22710,
-37354=>22711,
-37359=>22712,
-37369=>22713,
-37373=>22714,
-37380=>22715,
-37381=>22716,
-37388=>22717,
-37394=>22718,
-37395=>22719,
-37400=>22720,
-37404=>22721,
-37405=>22722,
-37412=>22723,
-37413=>22724,
-37414=>22725,
-37422=>22726,
-37423=>22727,
-37424=>22728,
-37429=>22729,
-37430=>22730,
-37438=>22731,
-37446=>22732,
-37453=>22733,
-37464=>22734,
-37468=>22735,
-37469=>22736,
-37481=>22737,
-37486=>22738,
-37487=>22739,
-37488=>22740,
-37493=>22741,
-37497=>22742,
-37499=>22743,
-37514=>22744,
-37522=>22745,
-37536=>22746,
-37540=>22747,
-37541=>22748,
-37544=>22749,
-37558=>22750,
-37560=>22751,
-37562=>22752,
-37565=>22753,
-37575=>22754,
-37581=>22755,
-37592=>22756,
-37596=>22757,
-37597=>22758,
-37601=>22759,
-37603=>22760,
-37608=>22761,
-37612=>22762,
-37614=>22763,
-37616=>22764,
-37632=>22765,
-37640=>22766,
-37660=>22767,
-37668=>22768,
-37674=>22769,
-37684=>22770,
-37687=>22771,
-37712=>22772,
-37717=>22773,
-37726=>22774,
-37735=>22775,
-37737=>22776,
-37743=>22777,
-37748=>22778,
-37750=>22779,
-37754=>22780,
-37757=>22781,
-37760=>22782,
-37761=>22783,
-37773=>22784,
-37778=>22785,
-37781=>22786,
-37784=>22787,
-37798=>22789,
-37800=>22790,
-37803=>22791,
-37812=>22792,
-37813=>22793,
-37814=>22794,
-37828=>22795,
-37829=>22796,
-37833=>22797,
-37835=>22798,
-37837=>22799,
-37843=>22800,
-37849=>22801,
-37879=>22802,
-37889=>22803,
-37896=>22804,
-37909=>22805,
-37919=>22806,
-37935=>22807,
-37949=>22808,
-37955=>22809,
-37977=>22810,
-37980=>22811,
-37983=>22812,
-37985=>22813,
-37992=>22814,
-37998=>22815,
-38020=>22816,
-38019=>22817,
-38270=>22818,
-38276=>22819,
-38301=>22820,
-38302=>22821,
-38330=>22822,
-38361=>22823,
-38365=>22824,
-38367=>22825,
-38430=>22826,
-38434=>22827,
-38437=>22828,
-38438=>22829,
-38455=>22830,
-38457=>22831,
-38458=>22832,
-38482=>22833,
-38486=>22834,
-38487=>22835,
-38510=>22836,
-38524=>22837,
-38526=>22838,
-38545=>22839,
-38559=>22840,
-38566=>22841,
-38602=>22842,
-38623=>22844,
-38650=>22845,
-38661=>22846,
-38682=>22847,
-38685=>22848,
-38730=>22850,
-38744=>22851,
-38775=>22852,
-38776=>22853,
-38779=>22854,
-38784=>22855,
-38793=>22856,
-38807=>22857,
-38840=>22858,
-38844=>22859,
-38847=>22860,
-38852=>22861,
-38853=>22862,
-38855=>22863,
-38858=>22864,
-38862=>22865,
-38864=>22866,
-38871=>22867,
-38877=>22868,
-38884=>22869,
-38903=>22870,
-38904=>22871,
-38906=>22872,
-38937=>22873,
-38940=>22874,
-38944=>22875,
-38959=>22876,
-38965=>22877,
-38980=>22878,
-38986=>22879,
-38993=>22880,
-39018=>22881,
-39086=>22882,
-39116=>22883,
-39142=>22884,
-39158=>22885,
-39175=>22886,
-39199=>22887,
-39202=>22888,
-39206=>22889,
-39211=>22890,
-39220=>22891,
-39225=>22892,
-39239=>22893,
-39257=>22894,
-39259=>22895,
-39323=>22896,
-39325=>22897,
-39327=>22898,
-39344=>22899,
-39346=>22900,
-39349=>22901,
-39379=>22902,
-39386=>22903,
-39388=>22904,
-39399=>22905,
-39402=>22906,
-39403=>22907,
-39404=>22908,
-39412=>22909,
-39413=>22910,
-39421=>22911,
-39422=>22912,
-39428=>22913,
-39435=>22914,
-39454=>22915,
-39458=>22916,
-39475=>22917,
-39477=>22918,
-39495=>22919,
-39499=>22921,
-39508=>22922,
-39517=>22923,
-39594=>22924,
-39596=>22925,
-39598=>22926,
-39602=>22927,
-39604=>22928,
-39611=>22929,
-39615=>22930,
-39624=>22931,
-39639=>22932,
-39643=>22933,
-39652=>22934,
-39655=>22935,
-39660=>22936,
-39666=>22937,
-39667=>22938,
-39669=>22939,
-39674=>22940,
-39677=>22941,
-39679=>22942,
-39680=>22943,
-39684=>22944,
-39685=>22945,
-39707=>22946,
-39718=>22947,
-39735=>22949,
-39737=>22950,
-39738=>22951,
-39756=>22952,
-39766=>22953,
-39767=>22954,
-39771=>22955,
-39777=>22956,
-39786=>22957,
-39789=>22958,
-39790=>22959,
-39800=>22960,
-39807=>22961,
-39813=>22962,
-39815=>22963,
-39817=>22964,
-39819=>22965,
-39821=>22966,
-39828=>22967,
-39834=>22968,
-39849=>22969,
-39863=>22970,
-39868=>22971,
-39888=>22972,
-39929=>22973,
-39951=>22974,
-39953=>22975,
-39966=>22976,
-39974=>22977,
-39976=>22978,
-39997=>22979,
-40003=>22980,
-40014=>22981,
-40030=>22982,
-40059=>22983,
-40183=>22984,
-40185=>22985,
-40220=>22986,
-40239=>22987,
-40243=>22988,
-40244=>22989,
-40250=>22990,
-40252=>22991,
-40261=>22992,
-40275=>22993,
-40276=>22994,
-40293=>22995,
-40323=>22996,
-40326=>22997,
-40334=>22998,
-40338=>22999,
-40339=>23000,
-40341=>23001,
-40343=>23002,
-40344=>23003,
-40362=>23004,
-40366=>23005,
-40394=>23007,
-40404=>23008,
-40405=>23009,
-40414=>23010,
-40430=>23011,
-40432=>23012,
-40446=>23013,
-40462=>23014,
-40464=>23015,
-40465=>23016,
-40466=>23017,
-40470=>23018,
-40583=>23019,
-40590=>23020,
-40591=>23021,
-40598=>23022,
-40600=>23023,
-40622=>23024,
-40627=>23025,
-40646=>23026,
-40648=>23027,
-40651=>23028,
-40661=>23029,
-40684=>23030,
-40685=>23031,
-40689=>23032,
-40693=>23033,
-40696=>23034,
-40721=>23035,
-40726=>23036,
-40730=>23037,
-40735=>23038,
-40753=>23039,
-40754=>23040,
-40764=>23041,
-40767=>23042,
-40771=>23043,
-40772=>23044,
-40775=>23045,
-40790=>23046,
-40798=>23047,
-40814=>23048,
-40819=>23049,
-40826=>23050,
-40829=>23051,
-40847=>23052,
-40849=>23053,
-40850=>23054,
-40854=>23055,
-40865=>23056,
-40867=>23057,
-);
-?>
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/uni2cid_ak12.php b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/uni2cid_ak12.php
deleted file mode 100644
index 0a5424c1..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/uni2cid_ak12.php
+++ /dev/null
@@ -1,17530 +0,0 @@
-<?php
-// unicode to cid conversion table is from
-// ftp://ftp.oreilly.com/pub/examples/nutshell/cjkv/adobe/
-// cid2code.txt in ak12.tar.Z
-$cidinfo['uni2cid'] = array(
-32=>1,
-33=>2,
-34=>3,
-35=>4,
-36=>5,
-37=>6,
-38=>7,
-39=>8,
-40=>9,
-41=>10,
-42=>11,
-43=>12,
-44=>13,
-45=>14,
-46=>15,
-47=>16,
-48=>17,
-49=>18,
-50=>19,
-51=>20,
-52=>21,
-53=>22,
-54=>23,
-55=>24,
-56=>25,
-57=>26,
-58=>27,
-59=>28,
-60=>29,
-61=>30,
-62=>31,
-63=>32,
-64=>33,
-65=>34,
-66=>35,
-67=>36,
-68=>37,
-69=>38,
-70=>39,
-71=>40,
-72=>41,
-73=>42,
-74=>43,
-75=>44,
-76=>45,
-77=>46,
-78=>47,
-79=>48,
-80=>49,
-81=>50,
-82=>51,
-83=>52,
-84=>53,
-85=>54,
-86=>55,
-87=>56,
-88=>57,
-89=>58,
-90=>59,
-91=>60,
-92=>61,
-93=>62,
-94=>63,
-95=>64,
-96=>65,
-97=>66,
-98=>67,
-99=>68,
-100=>69,
-101=>70,
-102=>71,
-103=>72,
-104=>73,
-105=>74,
-106=>75,
-107=>76,
-108=>77,
-109=>78,
-110=>79,
-111=>80,
-112=>81,
-113=>82,
-114=>83,
-115=>84,
-116=>85,
-117=>86,
-118=>87,
-119=>88,
-120=>89,
-121=>90,
-122=>91,
-123=>92,
-124=>93,
-125=>94,
-126=>95,
-8361=>96,
-8208=>97,
-169=>98,
-12644=>101,
-12288=>101,
-12289=>102,
-12290=>103,
-183=>104,
-12539=>104,
-8229=>105,
-8943=>106,
-8230=>106,
-168=>107,
-12291=>108,
-8211=>109,
-8212=>110,
-8214=>111,
-65340=>112,
-65374=>113,
-8216=>114,
-8217=>115,
-8220=>116,
-8221=>117,
-12308=>118,
-12309=>119,
-12296=>120,
-12297=>121,
-12298=>122,
-12299=>123,
-12300=>124,
-12301=>125,
-12302=>126,
-12303=>127,
-12304=>128,
-12305=>129,
-177=>130,
-215=>131,
-247=>132,
-8800=>133,
-8804=>134,
-8805=>135,
-8734=>136,
-8756=>137,
-176=>138,
-8242=>139,
-8243=>140,
-8451=>141,
-8491=>142,
-65504=>143,
-65505=>144,
-65509=>145,
-9794=>146,
-9792=>147,
-8736=>148,
-8869=>149,
-8978=>150,
-8706=>151,
-8711=>152,
-8801=>153,
-8786=>154,
-167=>155,
-8251=>156,
-9734=>157,
-9733=>158,
-9675=>159,
-9679=>160,
-9678=>161,
-9671=>162,
-9670=>163,
-9633=>164,
-9632=>165,
-9651=>166,
-9650=>167,
-9661=>168,
-9660=>169,
-8594=>170,
-8592=>171,
-8593=>172,
-8595=>173,
-8596=>174,
-12307=>175,
-171=>176,
-187=>177,
-8730=>178,
-8765=>179,
-8733=>180,
-8757=>181,
-8747=>182,
-8748=>183,
-8712=>184,
-8715=>185,
-8838=>186,
-8839=>187,
-8834=>188,
-8835=>189,
-8746=>190,
-8745=>191,
-8743=>192,
-8744=>193,
-65506=>194,
-8658=>195,
-8660=>196,
-8704=>197,
-8707=>198,
-180=>199,
-732=>200,
-711=>201,
-728=>202,
-733=>203,
-730=>204,
-729=>205,
-184=>206,
-731=>207,
-161=>208,
-191=>209,
-8758=>210,
-8750=>211,
-8721=>212,
-8719=>213,
-164=>214,
-8457=>215,
-8240=>216,
-9665=>217,
-9664=>218,
-9655=>219,
-9654=>220,
-9828=>221,
-9824=>222,
-9825=>223,
-9829=>224,
-9831=>225,
-9827=>226,
-9673=>227,
-9672=>228,
-9635=>229,
-9680=>230,
-9681=>231,
-9618=>232,
-9636=>233,
-9637=>234,
-9640=>235,
-9639=>236,
-9638=>237,
-9641=>238,
-9832=>239,
-9743=>240,
-9742=>241,
-9756=>242,
-9758=>243,
-182=>244,
-8224=>245,
-8225=>246,
-8597=>247,
-8599=>248,
-8601=>249,
-8598=>250,
-8600=>251,
-9837=>252,
-9833=>253,
-9834=>254,
-9836=>255,
-12927=>256,
-12828=>257,
-8470=>258,
-13255=>259,
-8482=>260,
-13250=>261,
-13272=>262,
-8481=>263,
-65281=>264,
-65282=>265,
-65283=>266,
-65284=>267,
-65285=>268,
-65286=>269,
-65287=>270,
-65288=>271,
-65289=>272,
-65290=>273,
-65291=>274,
-65292=>275,
-65293=>276,
-65294=>277,
-65295=>278,
-65296=>279,
-65297=>280,
-65298=>281,
-65299=>282,
-65300=>283,
-65301=>284,
-65302=>285,
-65303=>286,
-65304=>287,
-65305=>288,
-65306=>289,
-65307=>290,
-65308=>291,
-65309=>292,
-65310=>293,
-65311=>294,
-65312=>295,
-65313=>296,
-65314=>297,
-65315=>298,
-65316=>299,
-65317=>300,
-65318=>301,
-65319=>302,
-65320=>303,
-65321=>304,
-65322=>305,
-65323=>306,
-65324=>307,
-65325=>308,
-65326=>309,
-65327=>310,
-65328=>311,
-65329=>312,
-65330=>313,
-65331=>314,
-65332=>315,
-65333=>316,
-65334=>317,
-65335=>318,
-65336=>319,
-65337=>320,
-65338=>321,
-65339=>322,
-65510=>323,
-65341=>324,
-65342=>325,
-65343=>326,
-65344=>327,
-65345=>328,
-65346=>329,
-65347=>330,
-65348=>331,
-65349=>332,
-65350=>333,
-65351=>334,
-65352=>335,
-65353=>336,
-65354=>337,
-65355=>338,
-65356=>339,
-65357=>340,
-65358=>341,
-65359=>342,
-65360=>343,
-65361=>344,
-65362=>345,
-65363=>346,
-65364=>347,
-65365=>348,
-65366=>349,
-65367=>350,
-65368=>351,
-65369=>352,
-65370=>353,
-65371=>354,
-65372=>355,
-65373=>356,
-65507=>357,
-12593=>358,
-12594=>359,
-12595=>360,
-12596=>361,
-12597=>362,
-12598=>363,
-12599=>364,
-12600=>365,
-12601=>366,
-12602=>367,
-12603=>368,
-12604=>369,
-12605=>370,
-12606=>371,
-12607=>372,
-12608=>373,
-12609=>374,
-12610=>375,
-12611=>376,
-12612=>377,
-12613=>378,
-12614=>379,
-12615=>380,
-12616=>381,
-12617=>382,
-12618=>383,
-12619=>384,
-12620=>385,
-12621=>386,
-12622=>387,
-12623=>388,
-12624=>389,
-12625=>390,
-12626=>391,
-12627=>392,
-12628=>393,
-12629=>394,
-12630=>395,
-12631=>396,
-12632=>397,
-12633=>398,
-12634=>399,
-12635=>400,
-12636=>401,
-12637=>402,
-12638=>403,
-12639=>404,
-12640=>405,
-12641=>406,
-12642=>407,
-12643=>408,
-12645=>409,
-12646=>410,
-12647=>411,
-12648=>412,
-12649=>413,
-12650=>414,
-12651=>415,
-12652=>416,
-12653=>417,
-12654=>418,
-12655=>419,
-12656=>420,
-12657=>421,
-12658=>422,
-12659=>423,
-12660=>424,
-12661=>425,
-12662=>426,
-12663=>427,
-12664=>428,
-12665=>429,
-12666=>430,
-12667=>431,
-12668=>432,
-12669=>433,
-12670=>434,
-12671=>435,
-12672=>436,
-12673=>437,
-12674=>438,
-12675=>439,
-12676=>440,
-12677=>441,
-12678=>442,
-12679=>443,
-12680=>444,
-12681=>445,
-12682=>446,
-12683=>447,
-12684=>448,
-12685=>449,
-12686=>450,
-8560=>451,
-8561=>452,
-8562=>453,
-8563=>454,
-8564=>455,
-8565=>456,
-8566=>457,
-8567=>458,
-8568=>459,
-8569=>460,
-8544=>461,
-8545=>462,
-8546=>463,
-8547=>464,
-8548=>465,
-8549=>466,
-8550=>467,
-8551=>468,
-8552=>469,
-8553=>470,
-913=>471,
-914=>472,
-915=>473,
-916=>474,
-917=>475,
-918=>476,
-919=>477,
-920=>478,
-921=>479,
-922=>480,
-923=>481,
-924=>482,
-925=>483,
-926=>484,
-927=>485,
-928=>486,
-929=>487,
-931=>488,
-932=>489,
-933=>490,
-934=>491,
-935=>492,
-936=>493,
-937=>494,
-945=>495,
-946=>496,
-947=>497,
-948=>498,
-949=>499,
-950=>500,
-951=>501,
-952=>502,
-953=>503,
-954=>504,
-955=>505,
-956=>506,
-957=>507,
-958=>508,
-959=>509,
-960=>510,
-961=>511,
-963=>512,
-964=>513,
-965=>514,
-966=>515,
-967=>516,
-968=>517,
-969=>518,
-9472=>519,
-9474=>520,
-9484=>521,
-9488=>522,
-9496=>523,
-9492=>524,
-9500=>525,
-9516=>526,
-9508=>527,
-9524=>528,
-9532=>529,
-9473=>530,
-9475=>531,
-9487=>532,
-9491=>533,
-9499=>534,
-9495=>535,
-9507=>536,
-9523=>537,
-9515=>538,
-9531=>539,
-9547=>540,
-9504=>541,
-9519=>542,
-9512=>543,
-9527=>544,
-9535=>545,
-9501=>546,
-9520=>547,
-9509=>548,
-9528=>549,
-9538=>550,
-9490=>551,
-9489=>552,
-9498=>553,
-9497=>554,
-9494=>555,
-9493=>556,
-9486=>557,
-9485=>558,
-9502=>559,
-9503=>560,
-9505=>561,
-9506=>562,
-9510=>563,
-9511=>564,
-9513=>565,
-9514=>566,
-9517=>567,
-9518=>568,
-9521=>569,
-9522=>570,
-9525=>571,
-9526=>572,
-9529=>573,
-9530=>574,
-9533=>575,
-9534=>576,
-9536=>577,
-9537=>578,
-9539=>579,
-9540=>580,
-9541=>581,
-9542=>582,
-9543=>583,
-9544=>584,
-9545=>585,
-9546=>586,
-13205=>587,
-13206=>588,
-13207=>589,
-8467=>590,
-13208=>591,
-13252=>592,
-13219=>593,
-13220=>594,
-13221=>595,
-13222=>596,
-13209=>597,
-13210=>598,
-13211=>599,
-13212=>600,
-13213=>601,
-13214=>602,
-13215=>603,
-13216=>604,
-13217=>605,
-13218=>606,
-13258=>607,
-13197=>608,
-13198=>609,
-13199=>610,
-13263=>611,
-13192=>612,
-13193=>613,
-13256=>614,
-13223=>615,
-13224=>616,
-13232=>617,
-13233=>618,
-13234=>619,
-13235=>620,
-13236=>621,
-13237=>622,
-13238=>623,
-13239=>624,
-13240=>625,
-13241=>626,
-13184=>627,
-13185=>628,
-13186=>629,
-13187=>630,
-13188=>631,
-13242=>632,
-13243=>633,
-13244=>634,
-13245=>635,
-13246=>636,
-13247=>637,
-13200=>638,
-13201=>639,
-13202=>640,
-13203=>641,
-13204=>642,
-8486=>643,
-13248=>644,
-13249=>645,
-13194=>646,
-13195=>647,
-13196=>648,
-13270=>649,
-13253=>650,
-13229=>651,
-13230=>652,
-13231=>653,
-13275=>654,
-13225=>655,
-13226=>656,
-13227=>657,
-13228=>658,
-13277=>659,
-13264=>660,
-13267=>661,
-13251=>662,
-13257=>663,
-13276=>664,
-13254=>665,
-198=>666,
-208=>667,
-170=>668,
-294=>669,
-306=>670,
-319=>671,
-321=>672,
-216=>673,
-338=>674,
-186=>675,
-222=>676,
-358=>677,
-330=>678,
-12896=>679,
-12897=>680,
-12898=>681,
-12899=>682,
-12900=>683,
-12901=>684,
-12902=>685,
-12903=>686,
-12904=>687,
-12905=>688,
-12906=>689,
-12907=>690,
-12908=>691,
-12909=>692,
-12910=>693,
-12911=>694,
-12912=>695,
-12913=>696,
-12914=>697,
-12915=>698,
-12916=>699,
-12917=>700,
-12918=>701,
-12919=>702,
-12920=>703,
-12921=>704,
-12922=>705,
-12923=>706,
-9424=>707,
-9425=>708,
-9426=>709,
-9427=>710,
-9428=>711,
-9429=>712,
-9430=>713,
-9431=>714,
-9432=>715,
-9433=>716,
-9434=>717,
-9435=>718,
-9436=>719,
-9437=>720,
-9438=>721,
-9439=>722,
-9440=>723,
-9441=>724,
-9442=>725,
-9443=>726,
-9444=>727,
-9445=>728,
-9446=>729,
-9447=>730,
-9448=>731,
-9449=>732,
-9312=>733,
-9313=>734,
-9314=>735,
-9315=>736,
-9316=>737,
-9317=>738,
-9318=>739,
-9319=>740,
-9320=>741,
-9321=>742,
-9322=>743,
-9323=>744,
-9324=>745,
-9325=>746,
-9326=>747,
-189=>748,
-8531=>749,
-8532=>750,
-188=>751,
-190=>752,
-8539=>753,
-8540=>754,
-8541=>755,
-8542=>756,
-230=>757,
-273=>758,
-240=>759,
-295=>760,
-305=>761,
-307=>762,
-312=>763,
-320=>764,
-322=>765,
-248=>766,
-339=>767,
-223=>768,
-254=>769,
-359=>770,
-331=>771,
-329=>772,
-12800=>773,
-12801=>774,
-12802=>775,
-12803=>776,
-12804=>777,
-12805=>778,
-12806=>779,
-12807=>780,
-12808=>781,
-12809=>782,
-12810=>783,
-12811=>784,
-12812=>785,
-12813=>786,
-12814=>787,
-12815=>788,
-12816=>789,
-12817=>790,
-12818=>791,
-12819=>792,
-12820=>793,
-12821=>794,
-12822=>795,
-12823=>796,
-12824=>797,
-12825=>798,
-12826=>799,
-12827=>800,
-9372=>801,
-9373=>802,
-9374=>803,
-9375=>804,
-9376=>805,
-9377=>806,
-9378=>807,
-9379=>808,
-9380=>809,
-9381=>810,
-9382=>811,
-9383=>812,
-9384=>813,
-9385=>814,
-9386=>815,
-9387=>816,
-9388=>817,
-9389=>818,
-9390=>819,
-9391=>820,
-9392=>821,
-9393=>822,
-9394=>823,
-9395=>824,
-9396=>825,
-9397=>826,
-9332=>827,
-9333=>828,
-9334=>829,
-9335=>830,
-9336=>831,
-9337=>832,
-9338=>833,
-9339=>834,
-9340=>835,
-9341=>836,
-9342=>837,
-9343=>838,
-9344=>839,
-9345=>840,
-9346=>841,
-185=>842,
-178=>843,
-179=>844,
-8308=>845,
-8319=>846,
-8321=>847,
-8322=>848,
-8323=>849,
-8324=>850,
-12353=>851,
-12354=>852,
-12355=>853,
-12356=>854,
-12357=>855,
-12358=>856,
-12359=>857,
-12360=>858,
-12361=>859,
-12362=>860,
-12363=>861,
-12364=>862,
-12365=>863,
-12366=>864,
-12367=>865,
-12368=>866,
-12369=>867,
-12370=>868,
-12371=>869,
-12372=>870,
-12373=>871,
-12374=>872,
-12375=>873,
-12376=>874,
-12377=>875,
-12378=>876,
-12379=>877,
-12380=>878,
-12381=>879,
-12382=>880,
-12383=>881,
-12384=>882,
-12385=>883,
-12386=>884,
-12387=>885,
-12388=>886,
-12389=>887,
-12390=>888,
-12391=>889,
-12392=>890,
-12393=>891,
-12394=>892,
-12395=>893,
-12396=>894,
-12397=>895,
-12398=>896,
-12399=>897,
-12400=>898,
-12401=>899,
-12402=>900,
-12403=>901,
-12404=>902,
-12405=>903,
-12406=>904,
-12407=>905,
-12408=>906,
-12409=>907,
-12410=>908,
-12411=>909,
-12412=>910,
-12413=>911,
-12414=>912,
-12415=>913,
-12416=>914,
-12417=>915,
-12418=>916,
-12419=>917,
-12420=>918,
-12421=>919,
-12422=>920,
-12423=>921,
-12424=>922,
-12425=>923,
-12426=>924,
-12427=>925,
-12428=>926,
-12429=>927,
-12430=>928,
-12431=>929,
-12432=>930,
-12433=>931,
-12434=>932,
-12435=>933,
-12449=>934,
-12450=>935,
-12451=>936,
-12452=>937,
-12453=>938,
-12454=>939,
-12455=>940,
-12456=>941,
-12457=>942,
-12458=>943,
-12459=>944,
-12460=>945,
-12461=>946,
-12462=>947,
-12463=>948,
-12464=>949,
-12465=>950,
-12466=>951,
-12467=>952,
-12468=>953,
-12469=>954,
-12470=>955,
-12471=>956,
-12472=>957,
-12473=>958,
-12474=>959,
-12475=>960,
-12476=>961,
-12477=>962,
-12478=>963,
-12479=>964,
-12480=>965,
-12481=>966,
-12482=>967,
-12483=>968,
-12484=>969,
-12485=>970,
-12486=>971,
-12487=>972,
-12488=>973,
-12489=>974,
-12490=>975,
-12491=>976,
-12492=>977,
-12493=>978,
-12494=>979,
-12495=>980,
-12496=>981,
-12497=>982,
-12498=>983,
-12499=>984,
-12500=>985,
-12501=>986,
-12502=>987,
-12503=>988,
-12504=>989,
-12505=>990,
-12506=>991,
-12507=>992,
-12508=>993,
-12509=>994,
-12510=>995,
-12511=>996,
-12512=>997,
-12513=>998,
-12514=>999,
-12515=>1000,
-12516=>1001,
-12517=>1002,
-12518=>1003,
-12519=>1004,
-12520=>1005,
-12521=>1006,
-12522=>1007,
-12523=>1008,
-12524=>1009,
-12525=>1010,
-12526=>1011,
-12527=>1012,
-12528=>1013,
-12529=>1014,
-12530=>1015,
-12531=>1016,
-12532=>1017,
-12533=>1018,
-12534=>1019,
-1040=>1020,
-1041=>1021,
-1042=>1022,
-1043=>1023,
-1044=>1024,
-1045=>1025,
-1025=>1026,
-1046=>1027,
-1047=>1028,
-1048=>1029,
-1049=>1030,
-1050=>1031,
-1051=>1032,
-1052=>1033,
-1053=>1034,
-1054=>1035,
-1055=>1036,
-1056=>1037,
-1057=>1038,
-1058=>1039,
-1059=>1040,
-1060=>1041,
-1061=>1042,
-1062=>1043,
-1063=>1044,
-1064=>1045,
-1065=>1046,
-1066=>1047,
-1067=>1048,
-1068=>1049,
-1069=>1050,
-1070=>1051,
-1071=>1052,
-1072=>1053,
-1073=>1054,
-1074=>1055,
-1075=>1056,
-1076=>1057,
-1077=>1058,
-1105=>1059,
-1078=>1060,
-1079=>1061,
-1080=>1062,
-1081=>1063,
-1082=>1064,
-1083=>1065,
-1084=>1066,
-1085=>1067,
-1086=>1068,
-1087=>1069,
-1088=>1070,
-1089=>1071,
-1090=>1072,
-1091=>1073,
-1092=>1074,
-1093=>1075,
-1094=>1076,
-1095=>1077,
-1096=>1078,
-1097=>1079,
-1098=>1080,
-1099=>1081,
-1100=>1082,
-1101=>1083,
-1102=>1084,
-1103=>1085,
-44032=>1086,
-44033=>1087,
-44036=>1088,
-44039=>1089,
-44040=>1090,
-44041=>1091,
-44042=>1092,
-44048=>1093,
-44049=>1094,
-44050=>1095,
-44051=>1096,
-44052=>1097,
-44053=>1098,
-44054=>1099,
-44055=>1100,
-44057=>1101,
-44058=>1102,
-44059=>1103,
-44060=>1104,
-44061=>1105,
-44064=>1106,
-44068=>1107,
-44076=>1108,
-44077=>1109,
-44079=>1110,
-44080=>1111,
-44081=>1112,
-44088=>1113,
-44089=>1114,
-44092=>1115,
-44096=>1116,
-44107=>1117,
-44109=>1118,
-44116=>1119,
-44120=>1120,
-44124=>1121,
-44144=>1122,
-44145=>1123,
-44148=>1124,
-44151=>1125,
-44152=>1126,
-44154=>1127,
-44160=>1128,
-44161=>1129,
-44163=>1130,
-44164=>1131,
-44165=>1132,
-44166=>1133,
-44169=>1134,
-44170=>1135,
-44171=>1136,
-44172=>1137,
-44176=>1138,
-44180=>1139,
-44188=>1140,
-44189=>1141,
-44191=>1142,
-44192=>1143,
-44193=>1144,
-44200=>1145,
-44201=>1146,
-44202=>1147,
-44204=>1148,
-44207=>1149,
-44208=>1150,
-44216=>1151,
-44217=>1152,
-44219=>1153,
-44220=>1154,
-44221=>1155,
-44225=>1156,
-44228=>1157,
-44232=>1158,
-44236=>1159,
-44245=>1160,
-44247=>1161,
-44256=>1162,
-44257=>1163,
-44260=>1164,
-44263=>1165,
-44264=>1166,
-44266=>1167,
-44268=>1168,
-44271=>1169,
-44272=>1170,
-44273=>1171,
-44275=>1172,
-44277=>1173,
-44278=>1174,
-44284=>1175,
-44285=>1176,
-44288=>1177,
-44292=>1178,
-44294=>1179,
-44300=>1180,
-44301=>1181,
-44303=>1182,
-44305=>1183,
-44312=>1184,
-44316=>1185,
-44320=>1186,
-44329=>1187,
-44332=>1188,
-44333=>1189,
-44340=>1190,
-44341=>1191,
-44344=>1192,
-44348=>1193,
-44356=>1194,
-44357=>1195,
-44359=>1196,
-44361=>1197,
-44368=>1198,
-44372=>1199,
-44376=>1200,
-44385=>1201,
-44387=>1202,
-44396=>1203,
-44397=>1204,
-44400=>1205,
-44403=>1206,
-44404=>1207,
-44405=>1208,
-44406=>1209,
-44411=>1210,
-44412=>1211,
-44413=>1212,
-44415=>1213,
-44417=>1214,
-44418=>1215,
-44424=>1216,
-44425=>1217,
-44428=>1218,
-44432=>1219,
-44444=>1220,
-44445=>1221,
-44452=>1222,
-44471=>1223,
-44480=>1224,
-44481=>1225,
-44484=>1226,
-44488=>1227,
-44496=>1228,
-44497=>1229,
-44499=>1230,
-44508=>1231,
-44512=>1232,
-44516=>1233,
-44536=>1234,
-44537=>1235,
-44540=>1236,
-44543=>1237,
-44544=>1238,
-44545=>1239,
-44552=>1240,
-44553=>1241,
-44555=>1242,
-44557=>1243,
-44564=>1244,
-44592=>1245,
-44593=>1246,
-44596=>1247,
-44599=>1248,
-44600=>1249,
-44602=>1250,
-44608=>1251,
-44609=>1252,
-44611=>1253,
-44613=>1254,
-44614=>1255,
-44618=>1256,
-44620=>1257,
-44621=>1258,
-44622=>1259,
-44624=>1260,
-44628=>1261,
-44630=>1262,
-44636=>1263,
-44637=>1264,
-44639=>1265,
-44640=>1266,
-44641=>1267,
-44645=>1268,
-44648=>1269,
-44649=>1270,
-44652=>1271,
-44656=>1272,
-44664=>1273,
-44665=>1274,
-44667=>1275,
-44668=>1276,
-44669=>1277,
-44676=>1278,
-44677=>1279,
-44684=>1280,
-44732=>1281,
-44733=>1282,
-44734=>1283,
-44736=>1284,
-44740=>1285,
-44748=>1286,
-44749=>1287,
-44751=>1288,
-44752=>1289,
-44753=>1290,
-44760=>1291,
-44761=>1292,
-44764=>1293,
-44776=>1294,
-44779=>1295,
-44781=>1296,
-44788=>1297,
-44792=>1298,
-44796=>1299,
-44807=>1300,
-44808=>1301,
-44813=>1302,
-44816=>1303,
-44844=>1304,
-44845=>1305,
-44848=>1306,
-44850=>1307,
-44852=>1308,
-44860=>1309,
-44861=>1310,
-44863=>1311,
-44865=>1312,
-44866=>1313,
-44867=>1314,
-44872=>1315,
-44873=>1316,
-44880=>1317,
-44892=>1318,
-44893=>1319,
-44900=>1320,
-44901=>1321,
-44921=>1322,
-44928=>1323,
-44932=>1324,
-44936=>1325,
-44944=>1326,
-44945=>1327,
-44949=>1328,
-44956=>1329,
-44984=>1330,
-44985=>1331,
-44988=>1332,
-44992=>1333,
-44999=>1334,
-45000=>1335,
-45001=>1336,
-45003=>1337,
-45005=>1338,
-45006=>1339,
-45012=>1340,
-45020=>1341,
-45032=>1342,
-45033=>1343,
-45040=>1344,
-45041=>1345,
-45044=>1346,
-45048=>1347,
-45056=>1348,
-45057=>1349,
-45060=>1350,
-45068=>1351,
-45072=>1352,
-45076=>1353,
-45084=>1354,
-45085=>1355,
-45096=>1356,
-45124=>1357,
-45125=>1358,
-45128=>1359,
-45130=>1360,
-45132=>1361,
-45134=>1362,
-45139=>1363,
-45140=>1364,
-45141=>1365,
-45143=>1366,
-45145=>1367,
-45149=>1368,
-45180=>1369,
-45181=>1370,
-45184=>1371,
-45188=>1372,
-45196=>1373,
-45197=>1374,
-45199=>1375,
-45201=>1376,
-45208=>1377,
-45209=>1378,
-45210=>1379,
-45212=>1380,
-45215=>1381,
-45216=>1382,
-45217=>1383,
-45218=>1384,
-45224=>1385,
-45225=>1386,
-45227=>1387,
-45228=>1388,
-45229=>1389,
-45230=>1390,
-45231=>1391,
-45233=>1392,
-45235=>1393,
-45236=>1394,
-45237=>1395,
-45240=>1396,
-45244=>1397,
-45252=>1398,
-45253=>1399,
-45255=>1400,
-45256=>1401,
-45257=>1402,
-45264=>1403,
-45265=>1404,
-45268=>1405,
-45272=>1406,
-45280=>1407,
-45285=>1408,
-45320=>1409,
-45321=>1410,
-45323=>1411,
-45324=>1412,
-45328=>1413,
-45330=>1414,
-45331=>1415,
-45336=>1416,
-45337=>1417,
-45339=>1418,
-45340=>1419,
-45341=>1420,
-45347=>1421,
-45348=>1422,
-45349=>1423,
-45352=>1424,
-45356=>1425,
-45364=>1426,
-45365=>1427,
-45367=>1428,
-45368=>1429,
-45369=>1430,
-45376=>1431,
-45377=>1432,
-45380=>1433,
-45384=>1434,
-45392=>1435,
-45393=>1436,
-45396=>1437,
-45397=>1438,
-45400=>1439,
-45404=>1440,
-45408=>1441,
-45432=>1442,
-45433=>1443,
-45436=>1444,
-45440=>1445,
-45442=>1446,
-45448=>1447,
-45449=>1448,
-45451=>1449,
-45453=>1450,
-45458=>1451,
-45459=>1452,
-45460=>1453,
-45464=>1454,
-45468=>1455,
-45480=>1456,
-45516=>1457,
-45520=>1458,
-45524=>1459,
-45532=>1460,
-45533=>1461,
-45535=>1462,
-45544=>1463,
-45545=>1464,
-45548=>1465,
-45552=>1466,
-45561=>1467,
-45563=>1468,
-45565=>1469,
-45572=>1470,
-45573=>1471,
-45576=>1472,
-45579=>1473,
-45580=>1474,
-45588=>1475,
-45589=>1476,
-45591=>1477,
-45593=>1478,
-45600=>1479,
-45620=>1480,
-45628=>1481,
-45656=>1482,
-45660=>1483,
-45664=>1484,
-45672=>1485,
-45673=>1486,
-45684=>1487,
-45685=>1488,
-45692=>1489,
-45700=>1490,
-45701=>1491,
-45705=>1492,
-45712=>1493,
-45713=>1494,
-45716=>1495,
-45720=>1496,
-45721=>1497,
-45722=>1498,
-45728=>1499,
-45729=>1500,
-45731=>1501,
-45733=>1502,
-45734=>1503,
-45738=>1504,
-45740=>1505,
-45744=>1506,
-45748=>1507,
-45768=>1508,
-45769=>1509,
-45772=>1510,
-45776=>1511,
-45778=>1512,
-45784=>1513,
-45785=>1514,
-45787=>1515,
-45789=>1516,
-45794=>1517,
-45796=>1518,
-45797=>1519,
-45798=>1520,
-45800=>1521,
-45803=>1522,
-45804=>1523,
-45805=>1524,
-45806=>1525,
-45807=>1526,
-45811=>1527,
-45812=>1528,
-45813=>1529,
-45815=>1530,
-45816=>1531,
-45817=>1532,
-45818=>1533,
-45819=>1534,
-45823=>1535,
-45824=>1536,
-45825=>1537,
-45828=>1538,
-45832=>1539,
-45840=>1540,
-45841=>1541,
-45843=>1542,
-45844=>1543,
-45845=>1544,
-45852=>1545,
-45908=>1546,
-45909=>1547,
-45910=>1548,
-45912=>1549,
-45915=>1550,
-45916=>1551,
-45918=>1552,
-45919=>1553,
-45924=>1554,
-45925=>1555,
-45927=>1556,
-45929=>1557,
-45931=>1558,
-45934=>1559,
-45936=>1560,
-45937=>1561,
-45940=>1562,
-45944=>1563,
-45952=>1564,
-45953=>1565,
-45955=>1566,
-45956=>1567,
-45957=>1568,
-45964=>1569,
-45968=>1570,
-45972=>1571,
-45984=>1572,
-45985=>1573,
-45992=>1574,
-45996=>1575,
-46020=>1576,
-46021=>1577,
-46024=>1578,
-46027=>1579,
-46028=>1580,
-46030=>1581,
-46032=>1582,
-46036=>1583,
-46037=>1584,
-46039=>1585,
-46041=>1586,
-46043=>1587,
-46045=>1588,
-46048=>1589,
-46052=>1590,
-46056=>1591,
-46076=>1592,
-46096=>1593,
-46104=>1594,
-46108=>1595,
-46112=>1596,
-46120=>1597,
-46121=>1598,
-46123=>1599,
-46132=>1600,
-46160=>1601,
-46161=>1602,
-46164=>1603,
-46168=>1604,
-46176=>1605,
-46177=>1606,
-46179=>1607,
-46181=>1608,
-46188=>1609,
-46208=>1610,
-46216=>1611,
-46237=>1612,
-46244=>1613,
-46248=>1614,
-46252=>1615,
-46261=>1616,
-46263=>1617,
-46265=>1618,
-46272=>1619,
-46276=>1620,
-46280=>1621,
-46288=>1622,
-46293=>1623,
-46300=>1624,
-46301=>1625,
-46304=>1626,
-46307=>1627,
-46308=>1628,
-46310=>1629,
-46316=>1630,
-46317=>1631,
-46319=>1632,
-46321=>1633,
-46328=>1634,
-46356=>1635,
-46357=>1636,
-46360=>1637,
-46363=>1638,
-46364=>1639,
-46372=>1640,
-46373=>1641,
-46375=>1642,
-46376=>1643,
-46377=>1644,
-46378=>1645,
-46384=>1646,
-46385=>1647,
-46388=>1648,
-46392=>1649,
-46400=>1650,
-46401=>1651,
-46403=>1652,
-46404=>1653,
-46405=>1654,
-46411=>1655,
-46412=>1656,
-46413=>1657,
-46416=>1658,
-46420=>1659,
-46428=>1660,
-46429=>1661,
-46431=>1662,
-46432=>1663,
-46433=>1664,
-46496=>1665,
-46497=>1666,
-46500=>1667,
-46504=>1668,
-46506=>1669,
-46507=>1670,
-46512=>1671,
-46513=>1672,
-46515=>1673,
-46516=>1674,
-46517=>1675,
-46523=>1676,
-46524=>1677,
-46525=>1678,
-46528=>1679,
-46532=>1680,
-46540=>1681,
-46541=>1682,
-46543=>1683,
-46544=>1684,
-46545=>1685,
-46552=>1686,
-46572=>1687,
-46608=>1688,
-46609=>1689,
-46612=>1690,
-46616=>1691,
-46629=>1692,
-46636=>1693,
-46644=>1694,
-46664=>1695,
-46692=>1696,
-46696=>1697,
-46748=>1698,
-46749=>1699,
-46752=>1700,
-46756=>1701,
-46763=>1702,
-46764=>1703,
-46769=>1704,
-46804=>1705,
-46832=>1706,
-46836=>1707,
-46840=>1708,
-46848=>1709,
-46849=>1710,
-46853=>1711,
-46888=>1712,
-46889=>1713,
-46892=>1714,
-46895=>1715,
-46896=>1716,
-46904=>1717,
-46905=>1718,
-46907=>1719,
-46916=>1720,
-46920=>1721,
-46924=>1722,
-46932=>1723,
-46933=>1724,
-46944=>1725,
-46948=>1726,
-46952=>1727,
-46960=>1728,
-46961=>1729,
-46963=>1730,
-46965=>1731,
-46972=>1732,
-46973=>1733,
-46976=>1734,
-46980=>1735,
-46988=>1736,
-46989=>1737,
-46991=>1738,
-46992=>1739,
-46993=>1740,
-46994=>1741,
-46998=>1742,
-46999=>1743,
-47000=>1744,
-47001=>1745,
-47004=>1746,
-47008=>1747,
-47016=>1748,
-47017=>1749,
-47019=>1750,
-47020=>1751,
-47021=>1752,
-47028=>1753,
-47029=>1754,
-47032=>1755,
-47047=>1756,
-47049=>1757,
-47084=>1758,
-47085=>1759,
-47088=>1760,
-47092=>1761,
-47100=>1762,
-47101=>1763,
-47103=>1764,
-47104=>1765,
-47105=>1766,
-47111=>1767,
-47112=>1768,
-47113=>1769,
-47116=>1770,
-47120=>1771,
-47128=>1772,
-47129=>1773,
-47131=>1774,
-47133=>1775,
-47140=>1776,
-47141=>1777,
-47144=>1778,
-47148=>1779,
-47156=>1780,
-47157=>1781,
-47159=>1782,
-47160=>1783,
-47161=>1784,
-47168=>1785,
-47172=>1786,
-47185=>1787,
-47187=>1788,
-47196=>1789,
-47197=>1790,
-47200=>1791,
-47204=>1792,
-47212=>1793,
-47213=>1794,
-47215=>1795,
-47217=>1796,
-47224=>1797,
-47228=>1798,
-47245=>1799,
-47272=>1800,
-47280=>1801,
-47284=>1802,
-47288=>1803,
-47296=>1804,
-47297=>1805,
-47299=>1806,
-47301=>1807,
-47308=>1808,
-47312=>1809,
-47316=>1810,
-47325=>1811,
-47327=>1812,
-47329=>1813,
-47336=>1814,
-47337=>1815,
-47340=>1816,
-47344=>1817,
-47352=>1818,
-47353=>1819,
-47355=>1820,
-47357=>1821,
-47364=>1822,
-47384=>1823,
-47392=>1824,
-47420=>1825,
-47421=>1826,
-47424=>1827,
-47428=>1828,
-47436=>1829,
-47439=>1830,
-47441=>1831,
-47448=>1832,
-47449=>1833,
-47452=>1834,
-47456=>1835,
-47464=>1836,
-47465=>1837,
-47467=>1838,
-47469=>1839,
-47476=>1840,
-47477=>1841,
-47480=>1842,
-47484=>1843,
-47492=>1844,
-47493=>1845,
-47495=>1846,
-47497=>1847,
-47498=>1848,
-47501=>1849,
-47502=>1850,
-47532=>1851,
-47533=>1852,
-47536=>1853,
-47540=>1854,
-47548=>1855,
-47549=>1856,
-47551=>1857,
-47553=>1858,
-47560=>1859,
-47561=>1860,
-47564=>1861,
-47566=>1862,
-47567=>1863,
-47568=>1864,
-47569=>1865,
-47570=>1866,
-47576=>1867,
-47577=>1868,
-47579=>1869,
-47581=>1870,
-47582=>1871,
-47585=>1872,
-47587=>1873,
-47588=>1874,
-47589=>1875,
-47592=>1876,
-47596=>1877,
-47604=>1878,
-47605=>1879,
-47607=>1880,
-47608=>1881,
-47609=>1882,
-47610=>1883,
-47616=>1884,
-47617=>1885,
-47624=>1886,
-47637=>1887,
-47672=>1888,
-47673=>1889,
-47676=>1890,
-47680=>1891,
-47682=>1892,
-47688=>1893,
-47689=>1894,
-47691=>1895,
-47693=>1896,
-47694=>1897,
-47699=>1898,
-47700=>1899,
-47701=>1900,
-47704=>1901,
-47708=>1902,
-47716=>1903,
-47717=>1904,
-47719=>1905,
-47720=>1906,
-47721=>1907,
-47728=>1908,
-47729=>1909,
-47732=>1910,
-47736=>1911,
-47747=>1912,
-47748=>1913,
-47749=>1914,
-47751=>1915,
-47756=>1916,
-47784=>1917,
-47785=>1918,
-47787=>1919,
-47788=>1920,
-47792=>1921,
-47794=>1922,
-47800=>1923,
-47801=>1924,
-47803=>1925,
-47805=>1926,
-47812=>1927,
-47816=>1928,
-47832=>1929,
-47833=>1930,
-47868=>1931,
-47872=>1932,
-47876=>1933,
-47885=>1934,
-47887=>1935,
-47889=>1936,
-47896=>1937,
-47900=>1938,
-47904=>1939,
-47913=>1940,
-47915=>1941,
-47924=>1942,
-47925=>1943,
-47926=>1944,
-47928=>1945,
-47931=>1946,
-47932=>1947,
-47933=>1948,
-47934=>1949,
-47940=>1950,
-47941=>1951,
-47943=>1952,
-47945=>1953,
-47949=>1954,
-47951=>1955,
-47952=>1956,
-47956=>1957,
-47960=>1958,
-47969=>1959,
-47971=>1960,
-47980=>1961,
-48008=>1962,
-48012=>1963,
-48016=>1964,
-48036=>1965,
-48040=>1966,
-48044=>1967,
-48052=>1968,
-48055=>1969,
-48064=>1970,
-48068=>1971,
-48072=>1972,
-48080=>1973,
-48083=>1974,
-48120=>1975,
-48121=>1976,
-48124=>1977,
-48127=>1978,
-48128=>1979,
-48130=>1980,
-48136=>1981,
-48137=>1982,
-48139=>1983,
-48140=>1984,
-48141=>1985,
-48143=>1986,
-48145=>1987,
-48148=>1988,
-48149=>1989,
-48150=>1990,
-48151=>1991,
-48152=>1992,
-48155=>1993,
-48156=>1994,
-48157=>1995,
-48158=>1996,
-48159=>1997,
-48164=>1998,
-48165=>1999,
-48167=>2000,
-48169=>2001,
-48173=>2002,
-48176=>2003,
-48177=>2004,
-48180=>2005,
-48184=>2006,
-48192=>2007,
-48193=>2008,
-48195=>2009,
-48196=>2010,
-48197=>2011,
-48201=>2012,
-48204=>2013,
-48205=>2014,
-48208=>2015,
-48221=>2016,
-48260=>2017,
-48261=>2018,
-48264=>2019,
-48267=>2020,
-48268=>2021,
-48270=>2022,
-48276=>2023,
-48277=>2024,
-48279=>2025,
-48281=>2026,
-48282=>2027,
-48288=>2028,
-48289=>2029,
-48292=>2030,
-48295=>2031,
-48296=>2032,
-48304=>2033,
-48305=>2034,
-48307=>2035,
-48308=>2036,
-48309=>2037,
-48316=>2038,
-48317=>2039,
-48320=>2040,
-48324=>2041,
-48333=>2042,
-48335=>2043,
-48336=>2044,
-48337=>2045,
-48341=>2046,
-48344=>2047,
-48348=>2048,
-48372=>2049,
-48373=>2050,
-48374=>2051,
-48376=>2052,
-48380=>2053,
-48388=>2054,
-48389=>2055,
-48391=>2056,
-48393=>2057,
-48400=>2058,
-48404=>2059,
-48420=>2060,
-48428=>2061,
-48448=>2062,
-48456=>2063,
-48457=>2064,
-48460=>2065,
-48464=>2066,
-48472=>2067,
-48473=>2068,
-48484=>2069,
-48488=>2070,
-48512=>2071,
-48513=>2072,
-48516=>2073,
-48519=>2074,
-48520=>2075,
-48521=>2076,
-48522=>2077,
-48528=>2078,
-48529=>2079,
-48531=>2080,
-48533=>2081,
-48537=>2082,
-48538=>2083,
-48540=>2084,
-48548=>2085,
-48560=>2086,
-48568=>2087,
-48596=>2088,
-48597=>2089,
-48600=>2090,
-48604=>2091,
-48617=>2092,
-48624=>2093,
-48628=>2094,
-48632=>2095,
-48640=>2096,
-48643=>2097,
-48645=>2098,
-48652=>2099,
-48653=>2100,
-48656=>2101,
-48660=>2102,
-48668=>2103,
-48669=>2104,
-48671=>2105,
-48708=>2106,
-48709=>2107,
-48712=>2108,
-48716=>2109,
-48718=>2110,
-48724=>2111,
-48725=>2112,
-48727=>2113,
-48729=>2114,
-48730=>2115,
-48731=>2116,
-48736=>2117,
-48737=>2118,
-48740=>2119,
-48744=>2120,
-48746=>2121,
-48752=>2122,
-48753=>2123,
-48755=>2124,
-48756=>2125,
-48757=>2126,
-48763=>2127,
-48764=>2128,
-48765=>2129,
-48768=>2130,
-48772=>2131,
-48780=>2132,
-48781=>2133,
-48783=>2134,
-48784=>2135,
-48785=>2136,
-48792=>2137,
-48793=>2138,
-48808=>2139,
-48848=>2140,
-48849=>2141,
-48852=>2142,
-48855=>2143,
-48856=>2144,
-48864=>2145,
-48867=>2146,
-48868=>2147,
-48869=>2148,
-48876=>2149,
-48897=>2150,
-48904=>2151,
-48905=>2152,
-48920=>2153,
-48921=>2154,
-48923=>2155,
-48924=>2156,
-48925=>2157,
-48960=>2158,
-48961=>2159,
-48964=>2160,
-48968=>2161,
-48976=>2162,
-48977=>2163,
-48981=>2164,
-49044=>2165,
-49072=>2166,
-49093=>2167,
-49100=>2168,
-49101=>2169,
-49104=>2170,
-49108=>2171,
-49116=>2172,
-49119=>2173,
-49121=>2174,
-49212=>2175,
-49233=>2176,
-49240=>2177,
-49244=>2178,
-49248=>2179,
-49256=>2180,
-49257=>2181,
-49296=>2182,
-49297=>2183,
-49300=>2184,
-49304=>2185,
-49312=>2186,
-49313=>2187,
-49315=>2188,
-49317=>2189,
-49324=>2190,
-49325=>2191,
-49327=>2192,
-49328=>2193,
-49331=>2194,
-49332=>2195,
-49333=>2196,
-49334=>2197,
-49340=>2198,
-49341=>2199,
-49343=>2200,
-49344=>2201,
-49345=>2202,
-49349=>2203,
-49352=>2204,
-49353=>2205,
-49356=>2206,
-49360=>2207,
-49368=>2208,
-49369=>2209,
-49371=>2210,
-49372=>2211,
-49373=>2212,
-49380=>2213,
-49381=>2214,
-49384=>2215,
-49388=>2216,
-49396=>2217,
-49397=>2218,
-49399=>2219,
-49401=>2220,
-49408=>2221,
-49412=>2222,
-49416=>2223,
-49424=>2224,
-49429=>2225,
-49436=>2226,
-49437=>2227,
-49438=>2228,
-49439=>2229,
-49440=>2230,
-49443=>2231,
-49444=>2232,
-49446=>2233,
-49447=>2234,
-49452=>2235,
-49453=>2236,
-49455=>2237,
-49456=>2238,
-49457=>2239,
-49462=>2240,
-49464=>2241,
-49465=>2242,
-49468=>2243,
-49472=>2244,
-49480=>2245,
-49481=>2246,
-49483=>2247,
-49484=>2248,
-49485=>2249,
-49492=>2250,
-49493=>2251,
-49496=>2252,
-49500=>2253,
-49508=>2254,
-49509=>2255,
-49511=>2256,
-49512=>2257,
-49513=>2258,
-49520=>2259,
-49524=>2260,
-49528=>2261,
-49541=>2262,
-49548=>2263,
-49549=>2264,
-49550=>2265,
-49552=>2266,
-49556=>2267,
-49558=>2268,
-49564=>2269,
-49565=>2270,
-49567=>2271,
-49569=>2272,
-49573=>2273,
-49576=>2274,
-49577=>2275,
-49580=>2276,
-49584=>2277,
-49597=>2278,
-49604=>2279,
-49608=>2280,
-49612=>2281,
-49620=>2282,
-49623=>2283,
-49624=>2284,
-49632=>2285,
-49636=>2286,
-49640=>2287,
-49648=>2288,
-49649=>2289,
-49651=>2290,
-49660=>2291,
-49661=>2292,
-49664=>2293,
-49668=>2294,
-49676=>2295,
-49677=>2296,
-49679=>2297,
-49681=>2298,
-49688=>2299,
-49689=>2300,
-49692=>2301,
-49695=>2302,
-49696=>2303,
-49704=>2304,
-49705=>2305,
-49707=>2306,
-49709=>2307,
-49711=>2308,
-49713=>2309,
-49714=>2310,
-49716=>2311,
-49736=>2312,
-49744=>2313,
-49745=>2314,
-49748=>2315,
-49752=>2316,
-49760=>2317,
-49765=>2318,
-49772=>2319,
-49773=>2320,
-49776=>2321,
-49780=>2322,
-49788=>2323,
-49789=>2324,
-49791=>2325,
-49793=>2326,
-49800=>2327,
-49801=>2328,
-49808=>2329,
-49816=>2330,
-49819=>2331,
-49821=>2332,
-49828=>2333,
-49829=>2334,
-49832=>2335,
-49836=>2336,
-49837=>2337,
-49844=>2338,
-49845=>2339,
-49847=>2340,
-49849=>2341,
-49884=>2342,
-49885=>2343,
-49888=>2344,
-49891=>2345,
-49892=>2346,
-49899=>2347,
-49900=>2348,
-49901=>2349,
-49903=>2350,
-49905=>2351,
-49910=>2352,
-49912=>2353,
-49913=>2354,
-49915=>2355,
-49916=>2356,
-49920=>2357,
-49928=>2358,
-49929=>2359,
-49932=>2360,
-49933=>2361,
-49939=>2362,
-49940=>2363,
-49941=>2364,
-49944=>2365,
-49948=>2366,
-49956=>2367,
-49957=>2368,
-49960=>2369,
-49961=>2370,
-49989=>2371,
-50024=>2372,
-50025=>2373,
-50028=>2374,
-50032=>2375,
-50034=>2376,
-50040=>2377,
-50041=>2378,
-50044=>2379,
-50045=>2380,
-50052=>2381,
-50056=>2382,
-50060=>2383,
-50112=>2384,
-50136=>2385,
-50137=>2386,
-50140=>2387,
-50143=>2388,
-50144=>2389,
-50146=>2390,
-50152=>2391,
-50153=>2392,
-50157=>2393,
-50164=>2394,
-50165=>2395,
-50168=>2396,
-50184=>2397,
-50192=>2398,
-50212=>2399,
-50220=>2400,
-50224=>2401,
-50228=>2402,
-50236=>2403,
-50237=>2404,
-50248=>2405,
-50276=>2406,
-50277=>2407,
-50280=>2408,
-50284=>2409,
-50292=>2410,
-50293=>2411,
-50297=>2412,
-50304=>2413,
-50324=>2414,
-50332=>2415,
-50360=>2416,
-50364=>2417,
-50409=>2418,
-50416=>2419,
-50417=>2420,
-50420=>2421,
-50424=>2422,
-50426=>2423,
-50431=>2424,
-50432=>2425,
-50433=>2426,
-50444=>2427,
-50448=>2428,
-50452=>2429,
-50460=>2430,
-50472=>2431,
-50473=>2432,
-50476=>2433,
-50480=>2434,
-50488=>2435,
-50489=>2436,
-50491=>2437,
-50493=>2438,
-50500=>2439,
-50501=>2440,
-50504=>2441,
-50505=>2442,
-50506=>2443,
-50508=>2444,
-50509=>2445,
-50510=>2446,
-50515=>2447,
-50516=>2448,
-50517=>2449,
-50519=>2450,
-50520=>2451,
-50521=>2452,
-50525=>2453,
-50526=>2454,
-50528=>2455,
-50529=>2456,
-50532=>2457,
-50536=>2458,
-50544=>2459,
-50545=>2460,
-50547=>2461,
-50548=>2462,
-50549=>2463,
-50556=>2464,
-50557=>2465,
-50560=>2466,
-50564=>2467,
-50567=>2468,
-50572=>2469,
-50573=>2470,
-50575=>2471,
-50577=>2472,
-50581=>2473,
-50583=>2474,
-50584=>2475,
-50588=>2476,
-50592=>2477,
-50601=>2478,
-50612=>2479,
-50613=>2480,
-50616=>2481,
-50617=>2482,
-50619=>2483,
-50620=>2484,
-50621=>2485,
-50622=>2486,
-50628=>2487,
-50629=>2488,
-50630=>2489,
-50631=>2490,
-50632=>2491,
-50633=>2492,
-50634=>2493,
-50636=>2494,
-50638=>2495,
-50640=>2496,
-50641=>2497,
-50644=>2498,
-50648=>2499,
-50656=>2500,
-50657=>2501,
-50659=>2502,
-50661=>2503,
-50668=>2504,
-50669=>2505,
-50670=>2506,
-50672=>2507,
-50676=>2508,
-50678=>2509,
-50679=>2510,
-50684=>2511,
-50685=>2512,
-50686=>2513,
-50687=>2514,
-50688=>2515,
-50689=>2516,
-50693=>2517,
-50694=>2518,
-50695=>2519,
-50696=>2520,
-50700=>2521,
-50704=>2522,
-50712=>2523,
-50713=>2524,
-50715=>2525,
-50716=>2526,
-50724=>2527,
-50725=>2528,
-50728=>2529,
-50732=>2530,
-50733=>2531,
-50734=>2532,
-50736=>2533,
-50739=>2534,
-50740=>2535,
-50741=>2536,
-50743=>2537,
-50745=>2538,
-50747=>2539,
-50752=>2540,
-50753=>2541,
-50756=>2542,
-50760=>2543,
-50768=>2544,
-50769=>2545,
-50771=>2546,
-50772=>2547,
-50773=>2548,
-50780=>2549,
-50781=>2550,
-50784=>2551,
-50796=>2552,
-50799=>2553,
-50801=>2554,
-50808=>2555,
-50809=>2556,
-50812=>2557,
-50816=>2558,
-50824=>2559,
-50825=>2560,
-50827=>2561,
-50829=>2562,
-50836=>2563,
-50837=>2564,
-50840=>2565,
-50844=>2566,
-50852=>2567,
-50853=>2568,
-50855=>2569,
-50857=>2570,
-50864=>2571,
-50865=>2572,
-50868=>2573,
-50872=>2574,
-50873=>2575,
-50874=>2576,
-50880=>2577,
-50881=>2578,
-50883=>2579,
-50885=>2580,
-50892=>2581,
-50893=>2582,
-50896=>2583,
-50900=>2584,
-50908=>2585,
-50909=>2586,
-50912=>2587,
-50913=>2588,
-50920=>2589,
-50921=>2590,
-50924=>2591,
-50928=>2592,
-50936=>2593,
-50937=>2594,
-50941=>2595,
-50948=>2596,
-50949=>2597,
-50952=>2598,
-50956=>2599,
-50964=>2600,
-50965=>2601,
-50967=>2602,
-50969=>2603,
-50976=>2604,
-50977=>2605,
-50980=>2606,
-50984=>2607,
-50992=>2608,
-50993=>2609,
-50995=>2610,
-50997=>2611,
-50999=>2612,
-51004=>2613,
-51005=>2614,
-51008=>2615,
-51012=>2616,
-51018=>2617,
-51020=>2618,
-51021=>2619,
-51023=>2620,
-51025=>2621,
-51026=>2622,
-51027=>2623,
-51028=>2624,
-51029=>2625,
-51030=>2626,
-51031=>2627,
-51032=>2628,
-51036=>2629,
-51040=>2630,
-51048=>2631,
-51051=>2632,
-51060=>2633,
-51061=>2634,
-51064=>2635,
-51068=>2636,
-51069=>2637,
-51070=>2638,
-51075=>2639,
-51076=>2640,
-51077=>2641,
-51079=>2642,
-51080=>2643,
-51081=>2644,
-51082=>2645,
-51086=>2646,
-51088=>2647,
-51089=>2648,
-51092=>2649,
-51094=>2650,
-51095=>2651,
-51096=>2652,
-51098=>2653,
-51104=>2654,
-51105=>2655,
-51107=>2656,
-51108=>2657,
-51109=>2658,
-51110=>2659,
-51116=>2660,
-51117=>2661,
-51120=>2662,
-51124=>2663,
-51132=>2664,
-51133=>2665,
-51135=>2666,
-51136=>2667,
-51137=>2668,
-51144=>2669,
-51145=>2670,
-51148=>2671,
-51150=>2672,
-51152=>2673,
-51160=>2674,
-51165=>2675,
-51172=>2676,
-51176=>2677,
-51180=>2678,
-51200=>2679,
-51201=>2680,
-51204=>2681,
-51208=>2682,
-51210=>2683,
-51216=>2684,
-51217=>2685,
-51219=>2686,
-51221=>2687,
-51222=>2688,
-51228=>2689,
-51229=>2690,
-51232=>2691,
-51236=>2692,
-51244=>2693,
-51245=>2694,
-51247=>2695,
-51249=>2696,
-51256=>2697,
-51260=>2698,
-51264=>2699,
-51272=>2700,
-51273=>2701,
-51276=>2702,
-51277=>2703,
-51284=>2704,
-51312=>2705,
-51313=>2706,
-51316=>2707,
-51320=>2708,
-51322=>2709,
-51328=>2710,
-51329=>2711,
-51331=>2712,
-51333=>2713,
-51334=>2714,
-51335=>2715,
-51339=>2716,
-51340=>2717,
-51341=>2718,
-51348=>2719,
-51357=>2720,
-51359=>2721,
-51361=>2722,
-51368=>2723,
-51388=>2724,
-51389=>2725,
-51396=>2726,
-51400=>2727,
-51404=>2728,
-51412=>2729,
-51413=>2730,
-51415=>2731,
-51417=>2732,
-51424=>2733,
-51425=>2734,
-51428=>2735,
-51445=>2736,
-51452=>2737,
-51453=>2738,
-51456=>2739,
-51460=>2740,
-51461=>2741,
-51462=>2742,
-51468=>2743,
-51469=>2744,
-51471=>2745,
-51473=>2746,
-51480=>2747,
-51500=>2748,
-51508=>2749,
-51536=>2750,
-51537=>2751,
-51540=>2752,
-51544=>2753,
-51552=>2754,
-51553=>2755,
-51555=>2756,
-51564=>2757,
-51568=>2758,
-51572=>2759,
-51580=>2760,
-51592=>2761,
-51593=>2762,
-51596=>2763,
-51600=>2764,
-51608=>2765,
-51609=>2766,
-51611=>2767,
-51613=>2768,
-51648=>2769,
-51649=>2770,
-51652=>2771,
-51655=>2772,
-51656=>2773,
-51658=>2774,
-51664=>2775,
-51665=>2776,
-51667=>2777,
-51669=>2778,
-51670=>2779,
-51673=>2780,
-51674=>2781,
-51676=>2782,
-51677=>2783,
-51680=>2784,
-51682=>2785,
-51684=>2786,
-51687=>2787,
-51692=>2788,
-51693=>2789,
-51695=>2790,
-51696=>2791,
-51697=>2792,
-51704=>2793,
-51705=>2794,
-51708=>2795,
-51712=>2796,
-51720=>2797,
-51721=>2798,
-51723=>2799,
-51724=>2800,
-51725=>2801,
-51732=>2802,
-51736=>2803,
-51753=>2804,
-51788=>2805,
-51789=>2806,
-51792=>2807,
-51796=>2808,
-51804=>2809,
-51805=>2810,
-51807=>2811,
-51808=>2812,
-51809=>2813,
-51816=>2814,
-51837=>2815,
-51844=>2816,
-51864=>2817,
-51900=>2818,
-51901=>2819,
-51904=>2820,
-51908=>2821,
-51916=>2822,
-51917=>2823,
-51919=>2824,
-51921=>2825,
-51923=>2826,
-51928=>2827,
-51929=>2828,
-51936=>2829,
-51948=>2830,
-51956=>2831,
-51976=>2832,
-51984=>2833,
-51988=>2834,
-51992=>2835,
-52000=>2836,
-52001=>2837,
-52033=>2838,
-52040=>2839,
-52041=>2840,
-52044=>2841,
-52048=>2842,
-52056=>2843,
-52057=>2844,
-52061=>2845,
-52068=>2846,
-52088=>2847,
-52089=>2848,
-52124=>2849,
-52152=>2850,
-52180=>2851,
-52196=>2852,
-52199=>2853,
-52201=>2854,
-52236=>2855,
-52237=>2856,
-52240=>2857,
-52244=>2858,
-52252=>2859,
-52253=>2860,
-52257=>2861,
-52258=>2862,
-52263=>2863,
-52264=>2864,
-52265=>2865,
-52268=>2866,
-52270=>2867,
-52272=>2868,
-52280=>2869,
-52281=>2870,
-52283=>2871,
-52284=>2872,
-52285=>2873,
-52286=>2874,
-52292=>2875,
-52293=>2876,
-52296=>2877,
-52300=>2878,
-52308=>2879,
-52309=>2880,
-52311=>2881,
-52312=>2882,
-52313=>2883,
-52320=>2884,
-52324=>2885,
-52326=>2886,
-52328=>2887,
-52336=>2888,
-52341=>2889,
-52376=>2890,
-52377=>2891,
-52380=>2892,
-52384=>2893,
-52392=>2894,
-52393=>2895,
-52395=>2896,
-52396=>2897,
-52397=>2898,
-52404=>2899,
-52405=>2900,
-52408=>2901,
-52412=>2902,
-52420=>2903,
-52421=>2904,
-52423=>2905,
-52425=>2906,
-52432=>2907,
-52436=>2908,
-52452=>2909,
-52460=>2910,
-52464=>2911,
-52481=>2912,
-52488=>2913,
-52489=>2914,
-52492=>2915,
-52496=>2916,
-52504=>2917,
-52505=>2918,
-52507=>2919,
-52509=>2920,
-52516=>2921,
-52520=>2922,
-52524=>2923,
-52537=>2924,
-52572=>2925,
-52576=>2926,
-52580=>2927,
-52588=>2928,
-52589=>2929,
-52591=>2930,
-52593=>2931,
-52600=>2932,
-52616=>2933,
-52628=>2934,
-52629=>2935,
-52632=>2936,
-52636=>2937,
-52644=>2938,
-52645=>2939,
-52647=>2940,
-52649=>2941,
-52656=>2942,
-52676=>2943,
-52684=>2944,
-52688=>2945,
-52712=>2946,
-52716=>2947,
-52720=>2948,
-52728=>2949,
-52729=>2950,
-52731=>2951,
-52733=>2952,
-52740=>2953,
-52744=>2954,
-52748=>2955,
-52756=>2956,
-52761=>2957,
-52768=>2958,
-52769=>2959,
-52772=>2960,
-52776=>2961,
-52784=>2962,
-52785=>2963,
-52787=>2964,
-52789=>2965,
-52824=>2966,
-52825=>2967,
-52828=>2968,
-52831=>2969,
-52832=>2970,
-52833=>2971,
-52840=>2972,
-52841=>2973,
-52843=>2974,
-52845=>2975,
-52852=>2976,
-52853=>2977,
-52856=>2978,
-52860=>2979,
-52868=>2980,
-52869=>2981,
-52871=>2982,
-52873=>2983,
-52880=>2984,
-52881=>2985,
-52884=>2986,
-52888=>2987,
-52896=>2988,
-52897=>2989,
-52899=>2990,
-52900=>2991,
-52901=>2992,
-52908=>2993,
-52909=>2994,
-52929=>2995,
-52964=>2996,
-52965=>2997,
-52968=>2998,
-52971=>2999,
-52972=>3000,
-52980=>3001,
-52981=>3002,
-52983=>3003,
-52984=>3004,
-52985=>3005,
-52992=>3006,
-52993=>3007,
-52996=>3008,
-53000=>3009,
-53008=>3010,
-53009=>3011,
-53011=>3012,
-53013=>3013,
-53020=>3014,
-53024=>3015,
-53028=>3016,
-53036=>3017,
-53037=>3018,
-53039=>3019,
-53040=>3020,
-53041=>3021,
-53048=>3022,
-53076=>3023,
-53077=>3024,
-53080=>3025,
-53084=>3026,
-53092=>3027,
-53093=>3028,
-53095=>3029,
-53097=>3030,
-53104=>3031,
-53105=>3032,
-53108=>3033,
-53112=>3034,
-53120=>3035,
-53125=>3036,
-53132=>3037,
-53153=>3038,
-53160=>3039,
-53168=>3040,
-53188=>3041,
-53216=>3042,
-53217=>3043,
-53220=>3044,
-53224=>3045,
-53232=>3046,
-53233=>3047,
-53235=>3048,
-53237=>3049,
-53244=>3050,
-53248=>3051,
-53252=>3052,
-53265=>3053,
-53272=>3054,
-53293=>3055,
-53300=>3056,
-53301=>3057,
-53304=>3058,
-53308=>3059,
-53316=>3060,
-53317=>3061,
-53319=>3062,
-53321=>3063,
-53328=>3064,
-53332=>3065,
-53336=>3066,
-53344=>3067,
-53356=>3068,
-53357=>3069,
-53360=>3070,
-53364=>3071,
-53372=>3072,
-53373=>3073,
-53377=>3074,
-53412=>3075,
-53413=>3076,
-53416=>3077,
-53420=>3078,
-53428=>3079,
-53429=>3080,
-53431=>3081,
-53433=>3082,
-53440=>3083,
-53441=>3084,
-53444=>3085,
-53448=>3086,
-53449=>3087,
-53456=>3088,
-53457=>3089,
-53459=>3090,
-53460=>3091,
-53461=>3092,
-53468=>3093,
-53469=>3094,
-53472=>3095,
-53476=>3096,
-53484=>3097,
-53485=>3098,
-53487=>3099,
-53488=>3100,
-53489=>3101,
-53496=>3102,
-53517=>3103,
-53552=>3104,
-53553=>3105,
-53556=>3106,
-53560=>3107,
-53562=>3108,
-53568=>3109,
-53569=>3110,
-53571=>3111,
-53572=>3112,
-53573=>3113,
-53580=>3114,
-53581=>3115,
-53584=>3116,
-53588=>3117,
-53596=>3118,
-53597=>3119,
-53599=>3120,
-53601=>3121,
-53608=>3122,
-53612=>3123,
-53628=>3124,
-53636=>3125,
-53640=>3126,
-53664=>3127,
-53665=>3128,
-53668=>3129,
-53672=>3130,
-53680=>3131,
-53681=>3132,
-53683=>3133,
-53685=>3134,
-53690=>3135,
-53692=>3136,
-53696=>3137,
-53720=>3138,
-53748=>3139,
-53752=>3140,
-53767=>3141,
-53769=>3142,
-53776=>3143,
-53804=>3144,
-53805=>3145,
-53808=>3146,
-53812=>3147,
-53820=>3148,
-53821=>3149,
-53823=>3150,
-53825=>3151,
-53832=>3152,
-53852=>3153,
-53860=>3154,
-53888=>3155,
-53889=>3156,
-53892=>3157,
-53896=>3158,
-53904=>3159,
-53905=>3160,
-53909=>3161,
-53916=>3162,
-53920=>3163,
-53924=>3164,
-53932=>3165,
-53937=>3166,
-53944=>3167,
-53945=>3168,
-53948=>3169,
-53951=>3170,
-53952=>3171,
-53954=>3172,
-53960=>3173,
-53961=>3174,
-53963=>3175,
-53972=>3176,
-53976=>3177,
-53980=>3178,
-53988=>3179,
-53989=>3180,
-54000=>3181,
-54001=>3182,
-54004=>3183,
-54008=>3184,
-54016=>3185,
-54017=>3186,
-54019=>3187,
-54021=>3188,
-54028=>3189,
-54029=>3190,
-54030=>3191,
-54032=>3192,
-54036=>3193,
-54038=>3194,
-54044=>3195,
-54045=>3196,
-54047=>3197,
-54048=>3198,
-54049=>3199,
-54053=>3200,
-54056=>3201,
-54057=>3202,
-54060=>3203,
-54064=>3204,
-54072=>3205,
-54073=>3206,
-54075=>3207,
-54076=>3208,
-54077=>3209,
-54084=>3210,
-54085=>3211,
-54140=>3212,
-54141=>3213,
-54144=>3214,
-54148=>3215,
-54156=>3216,
-54157=>3217,
-54159=>3218,
-54160=>3219,
-54161=>3220,
-54168=>3221,
-54169=>3222,
-54172=>3223,
-54176=>3224,
-54184=>3225,
-54185=>3226,
-54187=>3227,
-54189=>3228,
-54196=>3229,
-54200=>3230,
-54204=>3231,
-54212=>3232,
-54213=>3233,
-54216=>3234,
-54217=>3235,
-54224=>3236,
-54232=>3237,
-54241=>3238,
-54243=>3239,
-54252=>3240,
-54253=>3241,
-54256=>3242,
-54260=>3243,
-54268=>3244,
-54269=>3245,
-54271=>3246,
-54273=>3247,
-54280=>3248,
-54301=>3249,
-54336=>3250,
-54340=>3251,
-54364=>3252,
-54368=>3253,
-54372=>3254,
-54381=>3255,
-54383=>3256,
-54392=>3257,
-54393=>3258,
-54396=>3259,
-54399=>3260,
-54400=>3261,
-54402=>3262,
-54408=>3263,
-54409=>3264,
-54411=>3265,
-54413=>3266,
-54420=>3267,
-54441=>3268,
-54476=>3269,
-54480=>3270,
-54484=>3271,
-54492=>3272,
-54495=>3273,
-54504=>3274,
-54508=>3275,
-54512=>3276,
-54520=>3277,
-54523=>3278,
-54525=>3279,
-54532=>3280,
-54536=>3281,
-54540=>3282,
-54548=>3283,
-54549=>3284,
-54551=>3285,
-54588=>3286,
-54589=>3287,
-54592=>3288,
-54596=>3289,
-54604=>3290,
-54605=>3291,
-54607=>3292,
-54609=>3293,
-54616=>3294,
-54617=>3295,
-54620=>3296,
-54624=>3297,
-54629=>3298,
-54632=>3299,
-54633=>3300,
-54635=>3301,
-54637=>3302,
-54644=>3303,
-54645=>3304,
-54648=>3305,
-54652=>3306,
-54660=>3307,
-54661=>3308,
-54663=>3309,
-54664=>3310,
-54665=>3311,
-54672=>3312,
-54693=>3313,
-54728=>3314,
-54729=>3315,
-54732=>3316,
-54736=>3317,
-54738=>3318,
-54744=>3319,
-54745=>3320,
-54747=>3321,
-54749=>3322,
-54756=>3323,
-54757=>3324,
-54760=>3325,
-54764=>3326,
-54772=>3327,
-54773=>3328,
-54775=>3329,
-54777=>3330,
-54784=>3331,
-54785=>3332,
-54788=>3333,
-54792=>3334,
-54800=>3335,
-54801=>3336,
-54803=>3337,
-54804=>3338,
-54805=>3339,
-54812=>3340,
-54816=>3341,
-54820=>3342,
-54829=>3343,
-54840=>3344,
-54841=>3345,
-54844=>3346,
-54848=>3347,
-54853=>3348,
-54856=>3349,
-54857=>3350,
-54859=>3351,
-54861=>3352,
-54865=>3353,
-54868=>3354,
-54869=>3355,
-54872=>3356,
-54876=>3357,
-54887=>3358,
-54889=>3359,
-54896=>3360,
-54897=>3361,
-54900=>3362,
-54915=>3363,
-54917=>3364,
-54924=>3365,
-54925=>3366,
-54928=>3367,
-54932=>3368,
-54941=>3369,
-54943=>3370,
-54945=>3371,
-54952=>3372,
-54956=>3373,
-54960=>3374,
-54969=>3375,
-54971=>3376,
-54980=>3377,
-54981=>3378,
-54984=>3379,
-54988=>3380,
-54993=>3381,
-54996=>3382,
-54999=>3383,
-55001=>3384,
-55008=>3385,
-55012=>3386,
-55016=>3387,
-55024=>3388,
-55029=>3389,
-55036=>3390,
-55037=>3391,
-55040=>3392,
-55044=>3393,
-55057=>3394,
-55064=>3395,
-55065=>3396,
-55068=>3397,
-55072=>3398,
-55080=>3399,
-55081=>3400,
-55083=>3401,
-55085=>3402,
-55092=>3403,
-55093=>3404,
-55096=>3405,
-55100=>3406,
-55108=>3407,
-55111=>3408,
-55113=>3409,
-55120=>3410,
-55121=>3411,
-55124=>3412,
-55126=>3413,
-55127=>3414,
-55128=>3415,
-55129=>3416,
-55136=>3417,
-55137=>3418,
-55139=>3419,
-55141=>3420,
-55145=>3421,
-55148=>3422,
-55152=>3423,
-55156=>3424,
-55164=>3425,
-55165=>3426,
-55169=>3427,
-55176=>3428,
-55177=>3429,
-55180=>3430,
-55184=>3431,
-55192=>3432,
-55193=>3433,
-55195=>3434,
-55197=>3435,
-20285=>3436,
-20339=>3437,
-20551=>3438,
-20729=>3439,
-21152=>3440,
-21487=>3441,
-21621=>3442,
-21733=>3443,
-22025=>3444,
-23233=>3445,
-23478=>3446,
-26247=>3447,
-26550=>3448,
-26551=>3449,
-26607=>3450,
-27468=>3451,
-29634=>3452,
-30146=>3453,
-31292=>3454,
-33499=>3455,
-33540=>3456,
-34903=>3457,
-34952=>3458,
-35382=>3459,
-36040=>3460,
-63747=>3460,
-36303=>3461,
-36603=>3462,
-36838=>3463,
-39381=>3464,
-21051=>3465,
-21364=>3466,
-21508=>3467,
-24682=>3468,
-24932=>3469,
-27580=>3470,
-29647=>3471,
-33050=>3472,
-35258=>3473,
-12179=>3474,
-35282=>3474,
-38307=>3475,
-20355=>3476,
-21002=>3477,
-22718=>3478,
-22904=>3479,
-23014=>3480,
-12082=>3481,
-24178=>3481,
-24185=>3482,
-25031=>3483,
-25536=>3484,
-26438=>3485,
-26604=>3486,
-26751=>3487,
-28567=>3488,
-30286=>3489,
-30475=>3490,
-30965=>3491,
-31240=>3492,
-31487=>3493,
-31777=>3494,
-32925=>3495,
-12169=>3496,
-33390=>3496,
-33393=>3497,
-35563=>3498,
-38291=>3499,
-20075=>3500,
-21917=>3501,
-26359=>3502,
-28212=>3503,
-30883=>3504,
-31469=>3505,
-33883=>3506,
-35088=>3507,
-34638=>3508,
-38824=>3509,
-21208=>3510,
-22350=>3511,
-22570=>3512,
-23884=>3513,
-24863=>3514,
-25022=>3515,
-25121=>3516,
-25954=>3517,
-26577=>3518,
-27204=>3519,
-28187=>3520,
-12130=>3521,
-29976=>3521,
-30131=>3522,
-30435=>3523,
-30640=>3524,
-32058=>3525,
-37039=>3526,
-37969=>3527,
-37970=>3528,
-40853=>3529,
-21283=>3530,
-23724=>3531,
-30002=>3532,
-32987=>3533,
-37440=>3534,
-38296=>3535,
-21083=>3536,
-22536=>3537,
-23004=>3538,
-23713=>3539,
-23831=>3540,
-24247=>3541,
-24378=>3542,
-24394=>3543,
-24951=>3544,
-27743=>3545,
-30074=>3546,
-30086=>3547,
-31968=>3548,
-32115=>3549,
-32177=>3550,
-32652=>3551,
-33108=>3552,
-33313=>3553,
-34193=>3554,
-35137=>3555,
-35611=>3556,
-37628=>3557,
-38477=>3558,
-64009=>3558,
-40007=>3559,
-20171=>3560,
-20215=>3561,
-20491=>3562,
-20977=>3563,
-22607=>3564,
-24887=>3565,
-24894=>3566,
-24936=>3567,
-25913=>3568,
-27114=>3569,
-28433=>3570,
-30117=>3571,
-30342=>3572,
-30422=>3573,
-31623=>3574,
-33445=>3575,
-33995=>3576,
-37799=>3577,
-38283=>3578,
-21888=>3579,
-23458=>3580,
-22353=>3581,
-31923=>3582,
-32697=>3583,
-37301=>3584,
-20520=>3585,
-21435=>3586,
-23621=>3587,
-24040=>3588,
-25298=>3589,
-25454=>3590,
-25818=>3591,
-25831=>3592,
-28192=>3593,
-28844=>3594,
-31067=>3595,
-36317=>3596,
-36382=>3597,
-36989=>3598,
-37445=>3599,
-37624=>3600,
-20094=>3601,
-20214=>3602,
-20581=>3603,
-12081=>3604,
-24062=>3604,
-24314=>3605,
-24838=>3606,
-26967=>3607,
-33137=>3608,
-34388=>3609,
-36423=>3610,
-37749=>3611,
-39467=>3612,
-20062=>3613,
-20625=>3614,
-26480=>3615,
-26688=>3616,
-20745=>3617,
-21133=>3618,
-21138=>3619,
-27298=>3620,
-30652=>3621,
-37392=>3622,
-40660=>3623,
-21163=>3624,
-24623=>3625,
-36850=>3626,
-20552=>3627,
-25001=>3628,
-25581=>3629,
-25802=>3630,
-26684=>3631,
-27268=>3632,
-28608=>3633,
-33160=>3634,
-35233=>3635,
-38548=>3636,
-22533=>3637,
-29309=>3638,
-12125=>3639,
-29356=>3639,
-29956=>3640,
-32121=>3641,
-32365=>3642,
-32937=>3643,
-12178=>3644,
-35211=>3644,
-64010=>3644,
-35700=>3645,
-36963=>3646,
-40273=>3647,
-25225=>3648,
-27770=>3649,
-28500=>3650,
-32080=>3651,
-32570=>3652,
-35363=>3653,
-20860=>3654,
-24906=>3655,
-31645=>3656,
-35609=>3657,
-37463=>3658,
-37772=>3659,
-20140=>3660,
-20435=>3661,
-20510=>3662,
-20670=>3663,
-20742=>3664,
-21185=>3665,
-21197=>3666,
-21375=>3667,
-22384=>3668,
-22659=>3669,
-24218=>3670,
-24465=>3671,
-24950=>3672,
-25004=>3673,
-25806=>3674,
-25964=>3675,
-26223=>3676,
-26299=>3677,
-26356=>3678,
-63745=>3678,
-26775=>3679,
-28039=>3680,
-28805=>3681,
-28913=>3682,
-29855=>3683,
-29861=>3684,
-29898=>3685,
-30169=>3686,
-30828=>3687,
-30956=>3688,
-31455=>3689,
-31478=>3690,
-32069=>3691,
-32147=>3692,
-32789=>3693,
-32831=>3694,
-33051=>3695,
-33686=>3696,
-35686=>3697,
-36629=>3698,
-36885=>3699,
-37857=>3700,
-38915=>3701,
-38968=>3702,
-39514=>3703,
-39912=>3704,
-20418=>3705,
-21843=>3706,
-22586=>3707,
-22865=>3708,
-63753=>3708,
-23395=>3709,
-23622=>3710,
-24760=>3711,
-25106=>3712,
-26690=>3713,
-26800=>3714,
-26856=>3715,
-28330=>3716,
-30028=>3717,
-30328=>3718,
-30926=>3719,
-31293=>3720,
-31995=>3721,
-32363=>3722,
-32380=>3723,
-35336=>3724,
-35489=>3725,
-35903=>3726,
-38542=>3727,
-40388=>3728,
-21476=>3729,
-21481=>3730,
-21578=>3731,
-21617=>3732,
-22266=>3733,
-22993=>3734,
-23396=>3735,
-23611=>3736,
-24235=>3737,
-25335=>3738,
-25911=>3739,
-25925=>3740,
-25970=>3741,
-26272=>3742,
-26543=>3743,
-27073=>3744,
-27837=>3745,
-30204=>3746,
-30352=>3747,
-30590=>3748,
-31295=>3749,
-32660=>3750,
-32771=>3751,
-32929=>3752,
-33167=>3753,
-33510=>3754,
-33533=>3755,
-33776=>3756,
-34241=>3757,
-34865=>3758,
-34996=>3759,
-35493=>3760,
-36764=>3761,
-37678=>3762,
-38599=>3763,
-39015=>3764,
-12220=>3765,
-39640=>3765,
-12238=>3766,
-40723=>3766,
-21741=>3767,
-26011=>3768,
-26354=>3769,
-26767=>3770,
-31296=>3771,
-12181=>3772,
-35895=>3772,
-40288=>3773,
-22256=>3774,
-22372=>3775,
-23825=>3776,
-26118=>3777,
-26801=>3778,
-26829=>3779,
-28414=>3780,
-29736=>3781,
-34974=>3782,
-39908=>3783,
-27752=>3784,
-12219=>3785,
-39592=>3785,
-20379=>3786,
-20844=>3787,
-20849=>3788,
-21151=>3789,
-23380=>3790,
-12079=>3791,
-24037=>3791,
-24656=>3792,
-24685=>3793,
-25329=>3794,
-25511=>3795,
-25915=>3796,
-29657=>3797,
-31354=>3798,
-34467=>3799,
-36002=>3800,
-38799=>3801,
-20018=>3802,
-63749=>3802,
-23521=>3803,
-12093=>3804,
-25096=>3804,
-26524=>3805,
-12128=>3806,
-29916=>3806,
-31185=>3807,
-33747=>3808,
-35463=>3809,
-35506=>3810,
-36328=>3811,
-36942=>3812,
-37707=>3813,
-38982=>3814,
-24275=>3815,
-64011=>3815,
-27112=>3816,
-34303=>3817,
-37101=>3818,
-20896=>3819,
-23448=>3820,
-23532=>3821,
-24931=>3822,
-26874=>3823,
-27454=>3824,
-28748=>3825,
-29743=>3826,
-29912=>3827,
-31649=>3828,
-32592=>3829,
-33733=>3830,
-35264=>3831,
-36011=>3832,
-38364=>3833,
-39208=>3834,
-21038=>3835,
-24669=>3836,
-25324=>3837,
-36866=>3838,
-20362=>3839,
-20809=>3840,
-21281=>3841,
-22745=>3842,
-24291=>3843,
-26336=>3844,
-27960=>3845,
-28826=>3846,
-29378=>3847,
-29654=>3848,
-31568=>3849,
-33009=>3850,
-37979=>3851,
-21350=>3852,
-25499=>3853,
-32619=>3854,
-20054=>3855,
-20608=>3856,
-22602=>3857,
-22750=>3858,
-24618=>3859,
-24871=>3860,
-25296=>3861,
-27088=>3862,
-39745=>3863,
-23439=>3864,
-32024=>3865,
-32945=>3866,
-36703=>3867,
-20132=>3868,
-20689=>3869,
-21676=>3870,
-21932=>3871,
-23308=>3872,
-23968=>3873,
-24039=>3874,
-25898=>3875,
-25934=>3876,
-26657=>3877,
-27211=>3878,
-29409=>3879,
-30350=>3880,
-30703=>3881,
-32094=>3882,
-32761=>3883,
-33184=>3884,
-34126=>3885,
-34527=>3886,
-36611=>3887,
-36686=>3888,
-37066=>3889,
-39171=>3890,
-39509=>3891,
-39851=>3892,
-19992=>3893,
-20037=>3894,
-20061=>3895,
-20167=>3896,
-20465=>3897,
-20855=>3898,
-21246=>3899,
-21312=>3900,
-12061=>3901,
-21475=>3901,
-21477=>3902,
-63750=>3902,
-21646=>3903,
-22036=>3904,
-22389=>3905,
-22434=>3906,
-23495=>3907,
-23943=>3908,
-24272=>3909,
-25084=>3910,
-25304=>3911,
-25937=>3912,
-26552=>3913,
-26601=>3914,
-27083=>3915,
-27472=>3916,
-27590=>3917,
-27628=>3918,
-27714=>3919,
-28317=>3920,
-28792=>3921,
-29399=>3922,
-29590=>3923,
-29699=>3924,
-30655=>3925,
-30697=>3926,
-31350=>3927,
-32127=>3928,
-32777=>3929,
-12165=>3930,
-33276=>3930,
-33285=>3931,
-33290=>3932,
-33503=>3933,
-34914=>3934,
-35635=>3935,
-36092=>3936,
-36544=>3937,
-36881=>3938,
-37041=>3939,
-37476=>3940,
-37558=>3941,
-39378=>3942,
-39493=>3943,
-40169=>3944,
-40407=>3945,
-12244=>3946,
-40860=>3946,
-63751=>3946,
-63752=>3946,
-22283=>3947,
-23616=>3948,
-33738=>3949,
-38816=>3950,
-38827=>3951,
-40628=>3952,
-21531=>3953,
-31384=>3954,
-32676=>3955,
-35033=>3956,
-36557=>3957,
-37089=>3958,
-22528=>3959,
-23624=>3960,
-25496=>3961,
-31391=>3962,
-23470=>3963,
-12088=>3964,
-24339=>3964,
-31353=>3965,
-31406=>3966,
-33422=>3967,
-36524=>3968,
-20518=>3969,
-21048=>3970,
-21240=>3971,
-21367=>3972,
-22280=>3973,
-25331=>3974,
-25458=>3975,
-27402=>3976,
-28099=>3977,
-30519=>3978,
-21413=>3979,
-29527=>3980,
-34152=>3981,
-36470=>3982,
-38357=>3983,
-26426=>3984,
-27331=>3985,
-28528=>3986,
-35437=>3987,
-36556=>3988,
-39243=>3989,
-26231=>3990,
-27512=>3991,
-36020=>3992,
-12225=>3993,
-39740=>3993,
-21483=>3994,
-22317=>3995,
-22862=>3996,
-25542=>3997,
-27131=>3998,
-29674=>3999,
-30789=>4000,
-31418=>4001,
-31429=>4002,
-31998=>4003,
-33909=>4004,
-35215=>4005,
-36211=>4006,
-36917=>4007,
-38312=>4008,
-21243=>4009,
-22343=>4010,
-30023=>4011,
-31584=>4012,
-33740=>4013,
-37406=>4014,
-27224=>4015,
-20811=>4016,
-21067=>4017,
-21127=>4018,
-25119=>4019,
-26840=>4020,
-26997=>4021,
-38553=>4022,
-20677=>4023,
-21156=>4024,
-21220=>4025,
-25027=>4026,
-12100=>4027,
-26020=>4027,
-26681=>4028,
-27135=>4029,
-29822=>4030,
-31563=>4031,
-33465=>4032,
-33771=>4033,
-35250=>4034,
-35641=>4035,
-36817=>4036,
-39241=>4037,
-20170=>4038,
-22935=>4039,
-25810=>4040,
-26129=>4041,
-27278=>4042,
-29748=>4043,
-31105=>4044,
-31165=>4045,
-33449=>4046,
-34942=>4047,
-34943=>4048,
-35167=>4049,
-37670=>4050,
-20235=>4051,
-21450=>4052,
-24613=>4053,
-25201=>4054,
-27762=>4055,
-32026=>4056,
-32102=>4057,
-20120=>4058,
-20834=>4059,
-30684=>4060,
-32943=>4061,
-20225=>4062,
-20238=>4063,
-20854=>4064,
-20864=>4065,
-21980=>4066,
-22120=>4067,
-22331=>4068,
-22522=>4069,
-22524=>4070,
-22804=>4071,
-22855=>4072,
-22931=>4073,
-23492=>4074,
-23696=>4075,
-23822=>4076,
-12080=>4077,
-24049=>4077,
-24190=>4078,
-24524=>4079,
-25216=>4080,
-26071=>4081,
-26083=>4082,
-26398=>4083,
-26399=>4084,
-26462=>4085,
-26827=>4086,
-26820=>4087,
-27231=>4088,
-27450=>4089,
-27683=>4090,
-27773=>4091,
-27778=>4092,
-28103=>4093,
-29592=>4094,
-29734=>4095,
-29738=>4096,
-29826=>4097,
-29859=>4098,
-30072=>4099,
-30079=>4100,
-30849=>4101,
-30959=>4102,
-31041=>4103,
-31047=>4104,
-31048=>4105,
-31098=>4106,
-31637=>4107,
-32000=>4108,
-32186=>4109,
-32648=>4110,
-32774=>4111,
-32813=>4112,
-32908=>4113,
-35352=>4114,
-35663=>4115,
-35912=>4116,
-63744=>4116,
-36215=>4117,
-37665=>4118,
-37668=>4119,
-39138=>4120,
-39249=>4121,
-39438=>4122,
-39439=>4123,
-39525=>4124,
-40594=>4125,
-32202=>4126,
-20342=>4127,
-21513=>4128,
-25326=>4129,
-26708=>4130,
-12198=>4131,
-37329=>4131,
-63754=>4131,
-21931=>4132,
-20794=>4133,
-23068=>4134,
-25062=>4135,
-25295=>4136,
-63835=>4136,
-25343=>4137,
-37027=>4138,
-35582=>4139,
-63837=>4139,
-26262=>4140,
-29014=>4141,
-38627=>4142,
-25423=>4143,
-25466=>4144,
-21335=>4145,
-26511=>4146,
-26976=>4147,
-28275=>4148,
-30007=>4149,
-32013=>4150,
-34930=>4151,
-22218=>4152,
-23064=>4153,
-20035=>4154,
-20839=>4155,
-22856=>4156,
-63756=>4156,
-26608=>4157,
-32784=>4158,
-12069=>4159,
-22899=>4159,
-63873=>4159,
-24180=>4160,
-63886=>4160,
-25754=>4161,
-63889=>4161,
-31178=>4162,
-63893=>4162,
-24565=>4163,
-63907=>4163,
-24684=>4164,
-25288=>4165,
-25467=>4166,
-63908=>4166,
-23527=>4167,
-63839=>4167,
-63914=>4167,
-23511=>4168,
-21162=>4169,
-22900=>4170,
-24361=>4171,
-24594=>4172,
-63840=>4172,
-29785=>4173,
-39377=>4174,
-28611=>4175,
-33215=>4176,
-36786=>4177,
-24817=>4178,
-33126=>4179,
-23615=>4180,
-63933=>4180,
-23273=>4181,
-35365=>4182,
-26491=>4183,
-63944=>4183,
-32016=>4184,
-63951=>4184,
-33021=>4185,
-23612=>4186,
-27877=>4187,
-63971=>4187,
-21311=>4188,
-63979=>4188,
-28346=>4189,
-63980=>4189,
-22810=>4190,
-33590=>4191,
-63998=>4191,
-20025=>4192,
-63838=>4192,
-20150=>4193,
-20294=>4194,
-21934=>4195,
-22296=>4196,
-22727=>4197,
-24406=>4198,
-26039=>4199,
-26086=>4200,
-27264=>4201,
-27573=>4202,
-28237=>4203,
-30701=>4204,
-31471=>4205,
-31774=>4206,
-32222=>4207,
-34507=>4208,
-34962=>4209,
-37170=>4210,
-37723=>4211,
-25787=>4212,
-28606=>4213,
-29562=>4214,
-30136=>4215,
-36948=>4216,
-21846=>4217,
-22349=>4218,
-25018=>4219,
-25812=>4220,
-26311=>4221,
-28129=>4222,
-28251=>4223,
-28525=>4224,
-28601=>4225,
-30192=>4226,
-32835=>4227,
-33213=>4228,
-34113=>4229,
-35203=>4230,
-35527=>4231,
-35674=>4232,
-37663=>4233,
-27795=>4234,
-30035=>4235,
-31572=>4236,
-36367=>4237,
-36957=>4238,
-21776=>4239,
-22530=>4240,
-22616=>4241,
-24162=>4242,
-25095=>4243,
-25758=>4244,
-26848=>4245,
-30070=>4246,
-31958=>4247,
-64003=>4247,
-34739=>4248,
-40680=>4249,
-20195=>4250,
-22408=>4251,
-22382=>4252,
-12068=>4253,
-22823=>4253,
-23565=>4254,
-23729=>4255,
-24118=>4256,
-24453=>4257,
-25140=>4258,
-25825=>4259,
-29619=>4260,
-33274=>4261,
-34955=>4262,
-36024=>4263,
-38538=>4264,
-40667=>4265,
-23429=>4266,
-64004=>4266,
-24503=>4267,
-24755=>4268,
-20498=>4269,
-12049=>4270,
-20992=>4270,
-21040=>4271,
-22294=>4272,
-22581=>4273,
-22615=>4274,
-23566=>4275,
-23648=>4276,
-23798=>4277,
-23947=>4278,
-24230=>4279,
-64001=>4279,
-24466=>4280,
-24764=>4281,
-25361=>4282,
-25481=>4283,
-25623=>4284,
-26691=>4285,
-26873=>4286,
-27330=>4287,
-28120=>4288,
-28193=>4289,
-28372=>4290,
-28644=>4291,
-29182=>4292,
-30428=>4293,
-30585=>4294,
-31153=>4295,
-31291=>4296,
-33796=>4297,
-35241=>4298,
-36077=>4299,
-36339=>4300,
-36424=>4301,
-36867=>4302,
-36884=>4303,
-36947=>4304,
-37117=>4305,
-37709=>4306,
-38518=>4307,
-38876=>4308,
-27602=>4309,
-28678=>4310,
-29272=>4311,
-29346=>4312,
-29544=>4313,
-30563=>4314,
-31167=>4315,
-31716=>4316,
-32411=>4317,
-35712=>4318,
-63834=>4318,
-22697=>4319,
-24775=>4320,
-25958=>4321,
-26109=>4322,
-26302=>4323,
-27788=>4324,
-28958=>4325,
-29129=>4326,
-35930=>4327,
-38931=>4328,
-20077=>4329,
-31361=>4330,
-20189=>4331,
-20908=>4332,
-20941=>4333,
-21205=>4334,
-21516=>4335,
-24999=>4336,
-26481=>4337,
-26704=>4338,
-26847=>4339,
-27934=>4340,
-64005=>4340,
-28540=>4341,
-30140=>4342,
-30643=>4343,
-31461=>4344,
-33012=>4345,
-33891=>4346,
-37509=>4347,
-20828=>4348,
-12099=>4349,
-26007=>4349,
-26460=>4350,
-26515=>4351,
-30168=>4352,
-31431=>4353,
-33651=>4354,
-12182=>4355,
-35910=>4355,
-36887=>4356,
-38957=>4357,
-23663=>4358,
-33216=>4359,
-33434=>4360,
-36929=>4361,
-36975=>4362,
-37389=>4363,
-24471=>4364,
-23965=>4365,
-27225=>4366,
-29128=>4367,
-30331=>4368,
-31561=>4369,
-34276=>4370,
-35588=>4371,
-37159=>4372,
-39472=>4373,
-21895=>4374,
-63755=>4374,
-25078=>4375,
-63757=>4375,
-30313=>4376,
-63758=>4376,
-32645=>4377,
-63759=>4377,
-34367=>4378,
-63760=>4378,
-34746=>4379,
-63761=>4379,
-35064=>4380,
-63762=>4380,
-37007=>4381,
-63763=>4381,
-27931=>4382,
-63765=>4382,
-28889=>4383,
-63766=>4383,
-29662=>4384,
-63767=>4384,
-32097=>4385,
-33853=>4386,
-63768=>4386,
-37226=>4387,
-63769=>4387,
-39409=>4388,
-63770=>4388,
-20098=>4389,
-63771=>4389,
-21365=>4390,
-63772=>4390,
-27396=>4391,
-63773=>4391,
-27410=>4392,
-28734=>4393,
-29211=>4394,
-63774=>4394,
-34349=>4395,
-63775=>4395,
-40478=>4396,
-63776=>4396,
-21068=>4397,
-36771=>4398,
-23888=>4399,
-63777=>4399,
-25829=>4400,
-25900=>4401,
-27414=>4402,
-28651=>4403,
-63778=>4403,
-31811=>4404,
-32412=>4405,
-34253=>4406,
-63779=>4406,
-35172=>4407,
-63780=>4407,
-35261=>4408,
-25289=>4409,
-63781=>4409,
-33240=>4410,
-63782=>4410,
-34847=>4411,
-63783=>4411,
-24266=>4412,
-63784=>4412,
-26391=>4413,
-63785=>4413,
-28010=>4414,
-63786=>4414,
-29436=>4415,
-63787=>4415,
-29701=>4416,
-29807=>4417,
-34690=>4418,
-37086=>4419,
-63788=>4419,
-20358=>4420,
-63789=>4420,
-23821=>4421,
-24480=>4422,
-33802=>4423,
-20919=>4424,
-63790=>4424,
-25504=>4425,
-63861=>4425,
-30053=>4426,
-63862=>4426,
-20142=>4427,
-63863=>4427,
-20486=>4428,
-20841=>4429,
-63864=>4429,
-20937=>4430,
-63865=>4430,
-26753=>4431,
-63866=>4431,
-27153=>4432,
-31918=>4433,
-31921=>4434,
-31975=>4435,
-63867=>4435,
-33391=>4436,
-63868=>4436,
-35538=>4437,
-63869=>4437,
-36635=>4438,
-37327=>4439,
-63870=>4439,
-20406=>4440,
-20791=>4441,
-21237=>4442,
-63871=>4442,
-21570=>4443,
-63872=>4443,
-24300=>4444,
-63874=>4444,
-24942=>4445,
-25150=>4446,
-26053=>4447,
-63875=>4447,
-27354=>4448,
-28670=>4449,
-63876=>4449,
-31018=>4450,
-63877=>4450,
-34268=>4451,
-34851=>4452,
-38317=>4453,
-63878=>4453,
-39522=>4454,
-39530=>4455,
-63879=>4455,
-40599=>4456,
-63880=>4456,
-40654=>4457,
-63881=>4457,
-12050=>4458,
-21147=>4458,
-63882=>4458,
-26310=>4459,
-63883=>4459,
-27511=>4460,
-63884=>4460,
-28701=>4461,
-31019=>4462,
-36706=>4463,
-63885=>4463,
-38722=>4464,
-24976=>4465,
-63887=>4465,
-25088=>4466,
-63888=>4466,
-25891=>4467,
-28451=>4468,
-63890=>4468,
-29001=>4469,
-63891=>4469,
-29833=>4470,
-63892=>4470,
-32244=>4471,
-63894=>4471,
-32879=>4472,
-63895=>4472,
-34030=>4473,
-63897=>4473,
-36646=>4474,
-63896=>4474,
-36899=>4475,
-63898=>4475,
-37706=>4476,
-63899=>4476,
-20925=>4477,
-21015=>4478,
-63900=>4478,
-21155=>4479,
-63901=>4479,
-27916=>4480,
-28872=>4481,
-63903=>4481,
-35010=>4482,
-63904=>4482,
-24265=>4483,
-63906=>4483,
-25986=>4484,
-27566=>4485,
-63909=>4485,
-28610=>4486,
-31806=>4487,
-63910=>4487,
-29557=>4488,
-63911=>4488,
-20196=>4489,
-63912=>4489,
-20278=>4490,
-22265=>4491,
-63913=>4491,
-23738=>4492,
-23994=>4493,
-63915=>4493,
-24604=>4494,
-63916=>4494,
-29618=>4495,
-63917=>4495,
-31533=>4496,
-32666=>4497,
-63919=>4497,
-32718=>4498,
-32838=>4499,
-63920=>4499,
-36894=>4500,
-37428=>4501,
-63921=>4501,
-38646=>4502,
-63922=>4502,
-38728=>4503,
-63923=>4503,
-38936=>4504,
-63924=>4504,
-40801=>4505,
-20363=>4506,
-63925=>4506,
-28583=>4507,
-31150=>4508,
-63926=>4508,
-37300=>4509,
-63927=>4509,
-38583=>4510,
-63928=>4510,
-21214=>4511,
-63791=>4511,
-25736=>4512,
-25796=>4513,
-63792=>4513,
-27347=>4514,
-63793=>4514,
-28510=>4515,
-28696=>4516,
-29200=>4517,
-63794=>4517,
-30439=>4518,
-63795=>4518,
-12156=>4519,
-32769=>4519,
-63796=>4519,
-34310=>4520,
-63797=>4520,
-34396=>4521,
-63798=>4521,
-36335=>4522,
-63799=>4522,
-36613=>4523,
-38706=>4524,
-63800=>4524,
-39791=>4525,
-63801=>4525,
-40442=>4526,
-63802=>4526,
-12228=>4527,
-40565=>4527,
-30860=>4528,
-63803=>4528,
-31103=>4529,
-63804=>4529,
-32160=>4530,
-63805=>4530,
-33737=>4531,
-63806=>4531,
-37636=>4532,
-63807=>4532,
-12229=>4533,
-40575=>4533,
-63808=>4533,
-40595=>4534,
-35542=>4535,
-63809=>4535,
-22751=>4536,
-63810=>4536,
-24324=>4537,
-63811=>4537,
-26407=>4538,
-28711=>4539,
-29903=>4540,
-31840=>4541,
-63812=>4541,
-32894=>4542,
-63813=>4542,
-20769=>4543,
-28712=>4544,
-29282=>4545,
-63814=>4545,
-30922=>4546,
-63815=>4546,
-36034=>4547,
-63816=>4547,
-36058=>4548,
-36084=>4549,
-38647=>4550,
-63817=>4550,
-20102=>4551,
-63930=>4551,
-20698=>4552,
-63931=>4552,
-23534=>4553,
-63932=>4553,
-24278=>4554,
-26009=>4555,
-63934=>4555,
-29134=>4556,
-63936=>4556,
-30274=>4557,
-63937=>4557,
-30637=>4558,
-32842=>4559,
-34044=>4560,
-63938=>4560,
-36988=>4561,
-63939=>4561,
-39719=>4562,
-12243=>4563,
-40845=>4563,
-63940=>4563,
-22744=>4564,
-63818=>4564,
-23105=>4565,
-23650=>4566,
-63819=>4566,
-27155=>4567,
-63820=>4567,
-28122=>4568,
-63821=>4568,
-28431=>4569,
-63822=>4569,
-30267=>4570,
-32047=>4571,
-63823=>4571,
-32311=>4572,
-63824=>4572,
-34078=>4573,
-35128=>4574,
-37860=>4575,
-38475=>4576,
-63825=>4576,
-21129=>4577,
-63943=>4577,
-26066=>4578,
-26611=>4579,
-63945=>4579,
-27060=>4580,
-27969=>4581,
-63946=>4581,
-28316=>4582,
-63947=>4582,
-28687=>4583,
-29705=>4584,
-63948=>4584,
-29792=>4585,
-30041=>4586,
-63949=>4586,
-30244=>4587,
-30827=>4588,
-63950=>4588,
-35628=>4589,
-39006=>4590,
-63952=>4590,
-20845=>4591,
-63953=>4591,
-25134=>4592,
-63954=>4592,
-38520=>4593,
-63955=>4593,
-20374=>4594,
-20523=>4595,
-63956=>4595,
-23833=>4596,
-63957=>4596,
-28138=>4597,
-63958=>4597,
-32184=>4598,
-36650=>4599,
-63959=>4599,
-24459=>4600,
-63960=>4600,
-24900=>4601,
-63961=>4601,
-26647=>4602,
-63962=>4602,
-38534=>4603,
-63964=>4603,
-21202=>4604,
-63826=>4604,
-32907=>4605,
-63827=>4605,
-20956=>4606,
-63828=>4606,
-20940=>4607,
-63829=>4607,
-26974=>4608,
-31260=>4609,
-63830=>4609,
-32190=>4610,
-63831=>4610,
-33777=>4611,
-63832=>4611,
-38517=>4612,
-63833=>4612,
-20442=>4613,
-21033=>4614,
-63965=>4614,
-21400=>4615,
-21519=>4616,
-63966=>4616,
-21774=>4617,
-23653=>4618,
-63967=>4618,
-24743=>4619,
-26446=>4620,
-63969=>4620,
-26792=>4621,
-63970=>4621,
-28012=>4622,
-29313=>4623,
-29432=>4624,
-29702=>4625,
-63972=>4625,
-29827=>4626,
-30178=>4627,
-63973=>4627,
-31852=>4628,
-32633=>4629,
-63974=>4629,
-32696=>4630,
-33673=>4631,
-35023=>4632,
-63975=>4632,
-35041=>4633,
-63976=>4633,
-12197=>4634,
-37324=>4634,
-63977=>4634,
-37328=>4635,
-38626=>4636,
-63978=>4636,
-39881=>4637,
-21533=>4638,
-63981=>4638,
-28542=>4639,
-29136=>4640,
-63982=>4640,
-29848=>4641,
-63983=>4641,
-34298=>4642,
-63984=>4642,
-36522=>4643,
-38563=>4644,
-63985=>4644,
-40023=>4645,
-63986=>4645,
-40607=>4646,
-63987=>4646,
-26519=>4647,
-63988=>4647,
-28107=>4648,
-63989=>4648,
-29747=>4649,
-33256=>4650,
-63990=>4650,
-38678=>4651,
-30764=>4652,
-12148=>4653,
-31435=>4653,
-63991=>4653,
-31520=>4654,
-63992=>4654,
-31890=>4655,
-63993=>4655,
-25705=>4656,
-29802=>4657,
-30194=>4658,
-30908=>4659,
-30952=>4660,
-12218=>4661,
-39340=>4661,
-39764=>4662,
-12231=>4663,
-40635=>4663,
-23518=>4664,
-24149=>4665,
-28448=>4666,
-33180=>4667,
-33707=>4668,
-37000=>4669,
-19975=>4670,
-21325=>4671,
-23081=>4672,
-24018=>4673,
-24398=>4674,
-24930=>4675,
-25405=>4676,
-26217=>4677,
-26364=>4678,
-28415=>4679,
-28459=>4680,
-28771=>4681,
-30622=>4682,
-33836=>4683,
-34067=>4684,
-34875=>4685,
-36627=>4686,
-39237=>4687,
-39995=>4688,
-21788=>4689,
-25273=>4690,
-26411=>4691,
-27819=>4692,
-33545=>4693,
-35178=>4694,
-38778=>4695,
-20129=>4696,
-22916=>4697,
-24536=>4698,
-24537=>4699,
-26395=>4700,
-32178=>4701,
-32596=>4702,
-33426=>4703,
-33579=>4704,
-33725=>4705,
-36638=>4706,
-37017=>4707,
-22475=>4708,
-22969=>4709,
-23186=>4710,
-23504=>4711,
-26151=>4712,
-26522=>4713,
-26757=>4714,
-27599=>4715,
-29028=>4716,
-32629=>4717,
-36023=>4718,
-36067=>4719,
-36993=>4720,
-39749=>4721,
-33032=>4722,
-35978=>4723,
-38476=>4724,
-39488=>4725,
-12230=>4726,
-40613=>4726,
-23391=>4727,
-27667=>4728,
-29467=>4729,
-30450=>4730,
-30431=>4731,
-33804=>4732,
-20906=>4733,
-35219=>4734,
-20813=>4735,
-20885=>4736,
-21193=>4737,
-26825=>4738,
-27796=>4739,
-30468=>4740,
-30496=>4741,
-32191=>4742,
-32236=>4743,
-12207=>4744,
-38754=>4744,
-40629=>4745,
-28357=>4746,
-34065=>4747,
-20901=>4748,
-21517=>4749,
-21629=>4750,
-26126=>4751,
-26269=>4752,
-26919=>4753,
-28319=>4754,
-12139=>4755,
-30399=>4755,
-30609=>4756,
-33559=>4757,
-33986=>4758,
-34719=>4759,
-37225=>4760,
-37528=>4761,
-40180=>4762,
-34946=>4763,
-20398=>4764,
-20882=>4765,
-21215=>4766,
-22982=>4767,
-24125=>4768,
-24917=>4769,
-25720=>4770,
-25721=>4771,
-26286=>4772,
-26576=>4773,
-27169=>4774,
-27597=>4775,
-12113=>4776,
-27611=>4776,
-29279=>4777,
-29281=>4778,
-29761=>4779,
-30520=>4780,
-12141=>4781,
-30683=>4781,
-32791=>4782,
-33468=>4783,
-33541=>4784,
-35584=>4785,
-35624=>4786,
-35980=>4787,
-12106=>4788,
-26408=>4788,
-27792=>4789,
-29287=>4790,
-12140=>4791,
-30446=>4791,
-30566=>4792,
-31302=>4793,
-40361=>4794,
-27519=>4795,
-27794=>4796,
-22818=>4797,
-26406=>4798,
-33945=>4799,
-21359=>4800,
-22675=>4801,
-22937=>4802,
-24287=>4803,
-25551=>4804,
-26164=>4805,
-26483=>4806,
-28218=>4807,
-29483=>4808,
-31447=>4809,
-33495=>4810,
-37672=>4811,
-21209=>4812,
-24043=>4813,
-25006=>4814,
-25035=>4815,
-25098=>4816,
-25287=>4817,
-25771=>4818,
-12102=>4819,
-26080=>4819,
-26969=>4820,
-27494=>4821,
-12111=>4822,
-27595=>4822,
-28961=>4823,
-29687=>4824,
-30045=>4825,
-32326=>4826,
-33310=>4827,
-33538=>4828,
-34154=>4829,
-35491=>4830,
-36031=>4831,
-38695=>4832,
-40289=>4833,
-22696=>4834,
-40664=>4835,
-20497=>4836,
-21006=>4837,
-21563=>4838,
-21839=>4839,
-12098=>4840,
-25991=>4840,
-27766=>4841,
-32010=>4842,
-32011=>4843,
-32862=>4844,
-34442=>4845,
-12200=>4846,
-38272=>4846,
-38639=>4847,
-21247=>4848,
-27797=>4849,
-29289=>4850,
-21619=>4851,
-23194=>4852,
-23614=>4853,
-23883=>4854,
-24396=>4855,
-24494=>4856,
-26410=>4857,
-26806=>4858,
-26979=>4859,
-28220=>4860,
-28228=>4861,
-30473=>4862,
-12150=>4863,
-31859=>4863,
-32654=>4864,
-34183=>4865,
-35598=>4866,
-36855=>4867,
-38753=>4868,
-40692=>4869,
-23735=>4870,
-24758=>4871,
-24845=>4872,
-25003=>4873,
-25935=>4874,
-26107=>4875,
-26108=>4876,
-27665=>4877,
-27887=>4878,
-29599=>4879,
-29641=>4880,
-32225=>4881,
-38292=>4882,
-23494=>4883,
-34588=>4884,
-35600=>4885,
-21085=>4886,
-21338=>4887,
-25293=>4888,
-25615=>4889,
-25778=>4890,
-26420=>4891,
-27192=>4892,
-27850=>4893,
-29632=>4894,
-29854=>4895,
-31636=>4896,
-31893=>4897,
-32283=>4898,
-33162=>4899,
-33334=>4900,
-34180=>4901,
-36843=>4902,
-38649=>4903,
-39361=>4904,
-20276=>4905,
-21322=>4906,
-21453=>4907,
-21467=>4908,
-25292=>4909,
-25644=>4910,
-25856=>4911,
-26001=>4912,
-27075=>4913,
-27886=>4914,
-28504=>4915,
-29677=>4916,
-30036=>4917,
-30242=>4918,
-30436=>4919,
-30460=>4920,
-30928=>4921,
-30971=>4922,
-63844=>4922,
-31020=>4923,
-32070=>4924,
-33324=>4925,
-34784=>4926,
-36820=>4927,
-38930=>4928,
-39151=>4929,
-21187=>4930,
-25300=>4931,
-25765=>4932,
-28196=>4933,
-28497=>4934,
-30332=>4935,
-36299=>4936,
-37297=>4937,
-37474=>4938,
-39662=>4939,
-39747=>4940,
-20515=>4941,
-20621=>4942,
-22346=>4943,
-22952=>4944,
-23592=>4945,
-24135=>4946,
-24439=>4947,
-25151=>4948,
-25918=>4949,
-12101=>4950,
-26041=>4950,
-26049=>4951,
-26121=>4952,
-26507=>4953,
-27036=>4954,
-28354=>4955,
-30917=>4956,
-32033=>4957,
-32938=>4958,
-33152=>4959,
-33323=>4960,
-33459=>4961,
-33953=>4962,
-34444=>4963,
-35370=>4964,
-35607=>4965,
-37030=>4966,
-38450=>4967,
-40848=>4968,
-20493=>4969,
-20467=>4970,
-22521=>4971,
-24472=>4972,
-25308=>4973,
-25490=>4974,
-26479=>4975,
-28227=>4976,
-28953=>4977,
-30403=>4978,
-32972=>4979,
-32986=>4980,
-35060=>4981,
-35061=>4982,
-35097=>4983,
-36064=>4984,
-36649=>4985,
-37197=>4986,
-38506=>4987,
-20271=>4988,
-20336=>4989,
-24091=>4990,
-26575=>4991,
-26658=>4992,
-12137=>4993,
-30333=>4993,
-30334=>4994,
-39748=>4995,
-24161=>4996,
-27146=>4997,
-29033=>4998,
-29140=>4999,
-30058=>5000,
-32321=>5001,
-34115=>5002,
-34281=>5003,
-39132=>5004,
-20240=>5005,
-31567=>5006,
-32624=>5007,
-38309=>5008,
-20961=>5009,
-24070=>5010,
-26805=>5011,
-27710=>5012,
-27726=>5013,
-27867=>5014,
-29359=>5015,
-31684=>5016,
-33539=>5017,
-27861=>5018,
-29754=>5019,
-20731=>5020,
-21128=>5021,
-22721=>5022,
-25816=>5023,
-27287=>5024,
-29863=>5025,
-30294=>5026,
-30887=>5027,
-34327=>5028,
-38370=>5029,
-38713=>5030,
-21342=>5031,
-24321=>5032,
-35722=>5033,
-36776=>5034,
-36783=>5035,
-37002=>5036,
-21029=>5037,
-30629=>5038,
-40009=>5039,
-40712=>5040,
-19993=>5041,
-20482=>5042,
-20853=>5043,
-23643=>5044,
-24183=>5045,
-26142=>5046,
-26170=>5047,
-26564=>5048,
-26821=>5049,
-28851=>5050,
-29953=>5051,
-30149=>5052,
-31177=>5053,
-31453=>5054,
-36647=>5055,
-39200=>5056,
-39432=>5057,
-20445=>5058,
-22561=>5059,
-22577=>5060,
-23542=>5061,
-26222=>5062,
-27493=>5063,
-27921=>5064,
-28282=>5065,
-28541=>5066,
-29668=>5067,
-29995=>5068,
-33769=>5069,
-35036=>5070,
-35091=>5071,
-35676=>5072,
-36628=>5073,
-20239=>5074,
-20693=>5075,
-21264=>5076,
-12056=>5077,
-21340=>5077,
-23443=>5078,
-24489=>5079,
-63846=>5079,
-26381=>5080,
-31119=>5081,
-33145=>5082,
-33583=>5083,
-34068=>5084,
-35079=>5085,
-35206=>5086,
-36665=>5087,
-36667=>5088,
-64007=>5088,
-39333=>5089,
-39954=>5090,
-26412=>5091,
-20086=>5092,
-20472=>5093,
-22857=>5094,
-23553=>5095,
-23791=>5096,
-23792=>5097,
-25447=>5098,
-26834=>5099,
-28925=>5100,
-29090=>5101,
-29739=>5102,
-32299=>5103,
-34028=>5104,
-34562=>5105,
-36898=>5106,
-37586=>5107,
-40179=>5108,
-19981=>5109,
-63847=>5109,
-20184=>5110,
-20463=>5111,
-20613=>5112,
-21078=>5113,
-21103=>5114,
-21542=>5115,
-21648=>5116,
-22496=>5117,
-22827=>5118,
-23142=>5119,
-23386=>5120,
-23413=>5121,
-23500=>5122,
-24220=>5123,
-25206=>5124,
-25975=>5125,
-26023=>5126,
-28014=>5127,
-28325=>5128,
-12119=>5129,
-29238=>5129,
-31526=>5130,
-31807=>5131,
-12152=>5132,
-32566=>5132,
-33104=>5133,
-33105=>5134,
-33178=>5135,
-33344=>5136,
-33433=>5137,
-33705=>5138,
-35331=>5139,
-36000=>5140,
-36070=>5141,
-36091=>5142,
-36212=>5143,
-36282=>5144,
-37096=>5145,
-37340=>5146,
-12201=>5147,
-38428=>5147,
-38468=>5148,
-39385=>5149,
-40167=>5150,
-21271=>5151,
-63843=>5151,
-20998=>5152,
-21545=>5153,
-22132=>5154,
-22707=>5155,
-22868=>5156,
-22894=>5157,
-24575=>5158,
-24996=>5159,
-25198=>5160,
-26128=>5161,
-27774=>5162,
-28954=>5163,
-30406=>5164,
-31881=>5165,
-31966=>5166,
-32027=>5167,
-33452=>5168,
-36033=>5169,
-38640=>5170,
-20315=>5171,
-24343=>5172,
-24447=>5173,
-25282=>5174,
-23849=>5175,
-26379=>5176,
-26842=>5177,
-30844=>5178,
-32323=>5179,
-40300=>5180,
-19989=>5181,
-20633=>5182,
-12052=>5183,
-21269=>5183,
-21290=>5184,
-21329=>5185,
-22915=>5186,
-23138=>5187,
-24199=>5188,
-24754=>5189,
-24970=>5190,
-25161=>5191,
-25209=>5192,
-26000=>5193,
-26503=>5194,
-27047=>5195,
-12112=>5196,
-27604=>5196,
-27606=>5197,
-27607=>5198,
-27608=>5199,
-27832=>5200,
-29749=>5201,
-30202=>5202,
-30738=>5203,
-30865=>5204,
-31189=>5205,
-31192=>5206,
-31875=>5207,
-32203=>5208,
-32737=>5209,
-32933=>5210,
-33086=>5211,
-33218=>5212,
-33778=>5213,
-34586=>5214,
-35048=>5215,
-35513=>5216,
-35692=>5217,
-36027=>5218,
-37145=>5219,
-12206=>5220,
-38750=>5220,
-12214=>5221,
-39131=>5221,
-12240=>5222,
-40763=>5222,
-22188=>5223,
-23338=>5224,
-24428=>5225,
-25996=>5226,
-27315=>5227,
-27567=>5228,
-27996=>5229,
-28657=>5230,
-28693=>5231,
-29277=>5232,
-29613=>5233,
-36007=>5234,
-36051=>5235,
-38971=>5236,
-24977=>5237,
-27703=>5238,
-32856=>5239,
-39425=>5240,
-20045=>5241,
-20107=>5242,
-20123=>5243,
-20181=>5244,
-20282=>5245,
-20284=>5246,
-20351=>5247,
-20447=>5248,
-20735=>5249,
-21490=>5250,
-21496=>5251,
-21766=>5252,
-21987=>5253,
-22235=>5254,
-12064=>5255,
-22763=>5255,
-22882=>5256,
-23057=>5257,
-23531=>5258,
-23546=>5259,
-23556=>5260,
-24051=>5261,
-24107=>5262,
-24473=>5263,
-24605=>5264,
-25448=>5265,
-26012=>5266,
-26031=>5267,
-26614=>5268,
-26619=>5269,
-26797=>5270,
-27515=>5271,
-27801=>5272,
-27863=>5273,
-28195=>5274,
-28681=>5275,
-29509=>5276,
-30722=>5277,
-31038=>5278,
-31040=>5279,
-31072=>5280,
-31169=>5281,
-31721=>5282,
-32023=>5283,
-32114=>5284,
-32902=>5285,
-33293=>5286,
-33678=>5287,
-34001=>5288,
-34503=>5289,
-35039=>5290,
-35408=>5291,
-35422=>5292,
-35613=>5293,
-36060=>5294,
-36198=>5295,
-36781=>5296,
-37034=>5297,
-39164=>5298,
-39391=>5299,
-40605=>5300,
-21066=>5301,
-26388=>5302,
-20632=>5303,
-21034=>5304,
-12077=>5305,
-23665=>5305,
-25955=>5306,
-27733=>5307,
-29642=>5308,
-29987=>5309,
-30109=>5310,
-31639=>5311,
-33948=>5312,
-37240=>5313,
-38704=>5314,
-20087=>5315,
-25746=>5316,
-27578=>5317,
-63856=>5317,
-29022=>5318,
-34217=>5319,
-19977=>5320,
-26441=>5321,
-26862=>5322,
-28183=>5323,
-33439=>5324,
-34072=>5325,
-34923=>5326,
-25591=>5327,
-28545=>5328,
-37394=>5329,
-39087=>5330,
-19978=>5331,
-20663=>5332,
-20687=>5333,
-20767=>5334,
-21830=>5335,
-21930=>5336,
-22039=>5337,
-23360=>5338,
-23577=>5339,
-23776=>5340,
-24120=>5341,
-24202=>5342,
-24224=>5343,
-24258=>5344,
-24819=>5345,
-26705=>5346,
-27233=>5347,
-28248=>5348,
-29245=>5349,
-29248=>5350,
-29376=>5351,
-63994=>5351,
-30456=>5352,
-31077=>5353,
-31665=>5354,
-32724=>5355,
-35059=>5356,
-35316=>5357,
-35443=>5358,
-35937=>5359,
-36062=>5360,
-38684=>5361,
-22622=>5362,
-63852=>5362,
-29885=>5363,
-36093=>5364,
-21959=>5365,
-31329=>5366,
-32034=>5367,
-63850=>5367,
-12170=>5368,
-33394=>5368,
-29298=>5369,
-12131=>5370,
-29983=>5370,
-29989=>5371,
-31513=>5372,
-22661=>5373,
-22779=>5374,
-23996=>5375,
-24207=>5376,
-24246=>5377,
-24464=>5378,
-24661=>5379,
-25234=>5380,
-25471=>5381,
-25933=>5382,
-26257=>5383,
-26329=>5384,
-26360=>5385,
-26646=>5386,
-26866=>5387,
-29312=>5388,
-29790=>5389,
-31598=>5390,
-32110=>5391,
-32214=>5392,
-32626=>5393,
-32997=>5394,
-33298=>5395,
-34223=>5396,
-35199=>5397,
-35475=>5398,
-36893=>5399,
-37604=>5400,
-12233=>5401,
-40653=>5401,
-12239=>5402,
-40736=>5402,
-12067=>5403,
-22805=>5403,
-22893=>5404,
-24109=>5405,
-24796=>5406,
-26132=>5407,
-26227=>5408,
-26512=>5409,
-27728=>5410,
-28101=>5411,
-28511=>5412,
-12143=>5413,
-30707=>5413,
-30889=>5414,
-33990=>5415,
-37323=>5416,
-37675=>5417,
-20185=>5418,
-20682=>5419,
-20808=>5420,
-21892=>5421,
-23307=>5422,
-23459=>5423,
-25159=>5424,
-25982=>5425,
-26059=>5426,
-28210=>5427,
-29053=>5428,
-29697=>5429,
-29764=>5430,
-29831=>5431,
-29887=>5432,
-30316=>5433,
-31146=>5434,
-32218=>5435,
-32341=>5436,
-32680=>5437,
-33146=>5438,
-33203=>5439,
-33337=>5440,
-34330=>5441,
-34796=>5442,
-35445=>5443,
-36323=>5444,
-36984=>5445,
-37521=>5446,
-37925=>5447,
-39245=>5448,
-39854=>5449,
-21352=>5450,
-23633=>5451,
-26964=>5452,
-27844=>5453,
-27945=>5454,
-28203=>5455,
-12166=>5456,
-33292=>5456,
-34203=>5457,
-35131=>5458,
-35373=>5459,
-35498=>5460,
-63855=>5460,
-63905=>5460,
-38634=>5461,
-40807=>5462,
-21089=>5463,
-26297=>5464,
-27570=>5465,
-32406=>5466,
-34814=>5467,
-36109=>5468,
-38275=>5469,
-38493=>5470,
-25885=>5471,
-28041=>5472,
-29166=>5473,
-22478=>5474,
-22995=>5475,
-23468=>5476,
-24615=>5477,
-24826=>5478,
-25104=>5479,
-26143=>5480,
-26207=>5481,
-29481=>5482,
-29689=>5483,
-30427=>5484,
-30465=>5485,
-63853=>5485,
-31596=>5486,
-32854=>5487,
-32882=>5488,
-33125=>5489,
-35488=>5490,
-37266=>5491,
-19990=>5492,
-21218=>5493,
-27506=>5494,
-27927=>5495,
-31237=>5496,
-31545=>5497,
-32048=>5498,
-36016=>5499,
-21484=>5500,
-22063=>5501,
-22609=>5502,
-23477=>5503,
-12073=>5504,
-23567=>5504,
-23569=>5505,
-24034=>5506,
-25152=>5507,
-25475=>5508,
-25620=>5509,
-26157=>5510,
-26803=>5511,
-27836=>5512,
-28040=>5513,
-28335=>5514,
-28703=>5515,
-28836=>5516,
-29138=>5517,
-29990=>5518,
-30095=>5519,
-30094=>5520,
-30233=>5521,
-31505=>5522,
-31712=>5523,
-31787=>5524,
-32032=>5525,
-32057=>5526,
-34092=>5527,
-34157=>5528,
-34311=>5529,
-35380=>5530,
-36877=>5531,
-36961=>5532,
-37045=>5533,
-37559=>5534,
-38902=>5535,
-39479=>5536,
-20439=>5537,
-23660=>5538,
-26463=>5539,
-28049=>5540,
-31903=>5541,
-32396=>5542,
-35606=>5543,
-36118=>5544,
-36895=>5545,
-23403=>5546,
-24061=>5547,
-25613=>5548,
-33984=>5549,
-36956=>5550,
-39137=>5551,
-29575=>5552,
-63841=>5552,
-63963=>5552,
-23435=>5553,
-24730=>5554,
-26494=>5555,
-28126=>5556,
-35359=>5557,
-35494=>5558,
-36865=>5559,
-38924=>5560,
-21047=>5561,
-28753=>5562,
-30862=>5563,
-37782=>5564,
-34928=>5565,
-37335=>5566,
-20462=>5567,
-21463=>5568,
-22013=>5569,
-22234=>5570,
-22402=>5571,
-22781=>5572,
-23234=>5573,
-23432=>5574,
-23723=>5575,
-23744=>5576,
-24101=>5577,
-24833=>5578,
-25101=>5579,
-12095=>5580,
-25163=>5580,
-25480=>5581,
-25628=>5582,
-25910=>5583,
-25976=>5584,
-63849=>5584,
-27193=>5585,
-27530=>5586,
-12116=>5587,
-27700=>5587,
-27929=>5588,
-28465=>5589,
-29159=>5590,
-29417=>5591,
-29560=>5592,
-29703=>5593,
-29874=>5594,
-30246=>5595,
-30561=>5596,
-31168=>5597,
-31319=>5598,
-31466=>5599,
-31929=>5600,
-32143=>5601,
-32172=>5602,
-32353=>5603,
-32670=>5604,
-33065=>5605,
-33585=>5606,
-33936=>5607,
-34010=>5608,
-34282=>5609,
-34966=>5610,
-35504=>5611,
-35728=>5612,
-36664=>5613,
-36930=>5614,
-36995=>5615,
-37228=>5616,
-37526=>5617,
-37561=>5618,
-38539=>5619,
-38567=>5620,
-38568=>5621,
-38614=>5622,
-38656=>5623,
-38920=>5624,
-12216=>5625,
-39318=>5625,
-39635=>5626,
-39706=>5627,
-21460=>5628,
-22654=>5629,
-22809=>5630,
-23408=>5631,
-23487=>5632,
-28113=>5633,
-28506=>5634,
-29087=>5635,
-29729=>5636,
-29881=>5637,
-32901=>5638,
-33789=>5639,
-24033=>5640,
-24455=>5641,
-24490=>5642,
-24642=>5643,
-26092=>5644,
-26642=>5645,
-26991=>5646,
-27219=>5647,
-27529=>5648,
-27957=>5649,
-28147=>5650,
-29667=>5651,
-30462=>5652,
-30636=>5653,
-31565=>5654,
-32020=>5655,
-33059=>5656,
-33308=>5657,
-33600=>5658,
-34036=>5659,
-34147=>5660,
-35426=>5661,
-35524=>5662,
-37255=>5663,
-37662=>5664,
-38918=>5665,
-39348=>5666,
-25100=>5667,
-34899=>5668,
-36848=>5669,
-37477=>5670,
-23815=>5671,
-23847=>5672,
-23913=>5673,
-29791=>5674,
-33181=>5675,
-34664=>5676,
-28629=>5677,
-25342=>5678,
-63859=>5678,
-32722=>5679,
-35126=>5680,
-35186=>5681,
-19998=>5682,
-20056=>5683,
-20711=>5684,
-21213=>5685,
-21319=>5686,
-25215=>5687,
-26119=>5688,
-32361=>5689,
-34821=>5690,
-38494=>5691,
-20365=>5692,
-21273=>5693,
-22070=>5694,
-22987=>5695,
-23204=>5696,
-12075=>5697,
-23608=>5697,
-23630=>5698,
-23629=>5699,
-24066=>5700,
-24337=>5701,
-24643=>5702,
-26045=>5703,
-26159=>5704,
-26178=>5705,
-26558=>5706,
-26612=>5707,
-29468=>5708,
-12142=>5709,
-30690=>5709,
-12144=>5710,
-31034=>5710,
-32709=>5711,
-33940=>5712,
-33997=>5713,
-35222=>5714,
-35430=>5715,
-35433=>5716,
-35553=>5717,
-12183=>5718,
-35925=>5718,
-35962=>5719,
-22516=>5720,
-23508=>5721,
-24335=>5722,
-24687=>5723,
-25325=>5724,
-26893=>5725,
-27542=>5726,
-28252=>5727,
-29060=>5728,
-31698=>5729,
-34645=>5730,
-35672=>5731,
-63996=>5731,
-36606=>5732,
-12215=>5733,
-39135=>5733,
-39166=>5734,
-20280=>5735,
-20353=>5736,
-20449=>5737,
-21627=>5738,
-23072=>5739,
-23480=>5740,
-24892=>5741,
-26032=>5742,
-26216=>5743,
-29180=>5744,
-30003=>5745,
-31070=>5746,
-32051=>5747,
-33102=>5748,
-12162=>5749,
-33251=>5749,
-33688=>5750,
-34218=>5751,
-34254=>5752,
-34563=>5753,
-35338=>5754,
-12189=>5755,
-36523=>5755,
-12191=>5756,
-36763=>5756,
-36805=>5757,
-22833=>5758,
-23460=>5759,
-23526=>5760,
-24713=>5761,
-23529=>5762,
-23563=>5763,
-12092=>5764,
-24515=>5764,
-27777=>5765,
-28145=>5766,
-28683=>5767,
-29978=>5768,
-33455=>5769,
-35574=>5770,
-20160=>5771,
-63997=>5771,
-12055=>5772,
-21313=>5772,
-38617=>5773,
-12114=>5774,
-27663=>5774,
-20126=>5775,
-20420=>5776,
-20818=>5777,
-21854=>5778,
-23077=>5779,
-23784=>5780,
-25105=>5781,
-12123=>5782,
-29273=>5782,
-33469=>5783,
-33706=>5784,
-34558=>5785,
-34905=>5786,
-35357=>5787,
-38463=>5788,
-38597=>5789,
-39187=>5790,
-40201=>5791,
-40285=>5792,
-22538=>5793,
-23731=>5794,
-23997=>5795,
-24132=>5796,
-24801=>5797,
-63929=>5797,
-24853=>5798,
-25569=>5799,
-27138=>5800,
-63764=>5800,
-63836=>5800,
-63935=>5800,
-28197=>5801,
-37122=>5802,
-37716=>5803,
-38990=>5804,
-39952=>5805,
-40823=>5806,
-23433=>5807,
-23736=>5808,
-25353=>5809,
-26191=>5810,
-26696=>5811,
-30524=>5812,
-38593=>5813,
-38797=>5814,
-38996=>5815,
-39839=>5816,
-26017=>5817,
-35585=>5818,
-36555=>5819,
-38332=>5820,
-21813=>5821,
-23721=>5822,
-24022=>5823,
-24245=>5824,
-26263=>5825,
-30284=>5826,
-33780=>5827,
-38343=>5828,
-22739=>5829,
-25276=>5830,
-29390=>5831,
-40232=>5832,
-20208=>5833,
-22830=>5834,
-24591=>5835,
-26171=>5836,
-27523=>5837,
-31207=>5838,
-40230=>5839,
-21395=>5840,
-21696=>5841,
-22467=>5842,
-23830=>5843,
-24859=>5844,
-26326=>5845,
-28079=>5846,
-30861=>5847,
-33406=>5848,
-38552=>5849,
-38724=>5850,
-21380=>5851,
-25212=>5852,
-25494=>5853,
-28082=>5854,
-32266=>5855,
-33099=>5856,
-38989=>5857,
-27387=>5858,
-32588=>5859,
-40367=>5860,
-40474=>5861,
-20063=>5862,
-20539=>5863,
-20918=>5864,
-22812=>5865,
-24825=>5866,
-25590=>5867,
-26928=>5868,
-29242=>5869,
-32822=>5870,
-37326=>5871,
-24369=>5872,
-32004=>5873,
-33509=>5874,
-63860=>5874,
-33903=>5875,
-33979=>5876,
-34277=>5877,
-36493=>5878,
-20335=>5879,
-22756=>5880,
-23363=>5881,
-24665=>5882,
-25562=>5883,
-25880=>5884,
-25965=>5885,
-26264=>5886,
-26954=>5887,
-27171=>5888,
-27915=>5889,
-28673=>5890,
-29036=>5891,
-30162=>5892,
-30221=>5893,
-31155=>5894,
-31344=>5895,
-12154=>5896,
-32650=>5896,
-35140=>5897,
-35731=>5898,
-37312=>5899,
-38525=>5900,
-39178=>5901,
-22276=>5902,
-24481=>5903,
-26044=>5904,
-28417=>5905,
-30208=>5906,
-31142=>5907,
-35486=>5908,
-39341=>5909,
-12226=>5910,
-39770=>5910,
-40812=>5911,
-20740=>5912,
-25014=>5913,
-25233=>5914,
-27277=>5915,
-33222=>5916,
-20547=>5917,
-22576=>5918,
-24422=>5919,
-28937=>5920,
-12180=>5921,
-35328=>5921,
-35578=>5922,
-23420=>5923,
-34326=>5924,
-20474=>5925,
-20796=>5926,
-22196=>5927,
-22852=>5928,
-25513=>5929,
-28153=>5930,
-23978=>5931,
-26989=>5932,
-20870=>5933,
-20104=>5934,
-20313=>5935,
-22914=>5936,
-27487=>5937,
-27741=>5938,
-29877=>5939,
-30998=>5940,
-33287=>5941,
-33349=>5942,
-33593=>5943,
-36671=>5944,
-36701=>5945,
-39192=>5946,
-20134=>5947,
-22495=>5948,
-24441=>5949,
-26131=>5950,
-63968=>5950,
-30123=>5951,
-32377=>5952,
-35695=>5953,
-36870=>5954,
-39515=>5955,
-22181=>5956,
-22567=>5957,
-23032=>5958,
-23071=>5959,
-23476=>5960,
-24310=>5961,
-25424=>5962,
-25403=>5963,
-26941=>5964,
-27783=>5965,
-27839=>5966,
-28046=>5967,
-28051=>5968,
-28149=>5969,
-28436=>5970,
-28895=>5971,
-28982=>5972,
-29017=>5973,
-29123=>5974,
-29141=>5975,
-30799=>5976,
-30831=>5977,
-31605=>5978,
-32227=>5979,
-32303=>5980,
-34893=>5981,
-36575=>5982,
-37467=>5983,
-40182=>5984,
-24709=>5985,
-28037=>5986,
-29105=>5987,
-38321=>5988,
-21421=>5989,
-26579=>5990,
-28814=>5991,
-28976=>5992,
-29744=>5993,
-33398=>5994,
-33490=>5995,
-38331=>5996,
-39653=>5997,
-40573=>5998,
-26308=>5999,
-29121=>6000,
-33865=>6001,
-63854=>6001,
-22603=>6002,
-23992=>6003,
-24433=>6004,
-26144=>6005,
-26254=>6006,
-27001=>6007,
-27054=>6008,
-27704=>6009,
-27891=>6010,
-28214=>6011,
-28481=>6012,
-28634=>6013,
-28699=>6014,
-28719=>6015,
-29008=>6016,
-29151=>6017,
-29552=>6018,
-29787=>6019,
-29908=>6020,
-30408=>6021,
-31310=>6022,
-32403=>6023,
-33521=>6024,
-35424=>6025,
-36814=>6026,
-37704=>6027,
-38681=>6028,
-20034=>6029,
-20522=>6030,
-21000=>6031,
-21473=>6032,
-26355=>6033,
-27757=>6034,
-28618=>6035,
-29450=>6036,
-30591=>6037,
-31330=>6038,
-33454=>6039,
-34269=>6040,
-34306=>6041,
-35028=>6042,
-35427=>6043,
-35709=>6044,
-35947=>6045,
-37555=>6046,
-38675=>6047,
-38928=>6048,
-20116=>6049,
-20237=>6050,
-20425=>6051,
-20658=>6052,
-21320=>6053,
-21566=>6054,
-21555=>6055,
-21978=>6056,
-22626=>6057,
-22714=>6058,
-22887=>6059,
-23067=>6060,
-23524=>6061,
-24735=>6062,
-25034=>6063,
-25942=>6064,
-26111=>6065,
-26212=>6066,
-26791=>6067,
-27738=>6068,
-28595=>6069,
-28879=>6070,
-29100=>6071,
-29522=>6072,
-31613=>6073,
-34568=>6074,
-35492=>6075,
-39986=>6076,
-40711=>6077,
-23627=>6078,
-27779=>6079,
-29508=>6080,
-12127=>6081,
-29577=>6081,
-37434=>6082,
-28331=>6083,
-29797=>6084,
-30239=>6085,
-31337=>6086,
-32277=>6087,
-34314=>6088,
-20800=>6089,
-22725=>6090,
-25793=>6091,
-29934=>6092,
-29973=>6093,
-30320=>6094,
-32705=>6095,
-37013=>6096,
-38605=>6097,
-39252=>6098,
-28198=>6099,
-12129=>6100,
-29926=>6100,
-31401=>6101,
-31402=>6102,
-33253=>6103,
-34521=>6104,
-34680=>6105,
-35355=>6106,
-23113=>6107,
-23436=>6108,
-23451=>6109,
-26785=>6110,
-26880=>6111,
-28003=>6112,
-29609=>6113,
-29715=>6114,
-29740=>6115,
-30871=>6116,
-32233=>6117,
-32747=>6118,
-33048=>6119,
-33109=>6120,
-33694=>6121,
-35916=>6122,
-38446=>6123,
-63942=>6123,
-38929=>6124,
-12104=>6125,
-26352=>6125,
-24448=>6126,
-26106=>6127,
-26505=>6128,
-27754=>6129,
-29579=>6130,
-20525=>6131,
-23043=>6132,
-27498=>6133,
-30702=>6134,
-22806=>6135,
-23916=>6136,
-24013=>6137,
-29477=>6138,
-30031=>6139,
-20709=>6140,
-20985=>6141,
-22575=>6142,
-22829=>6143,
-22934=>6144,
-23002=>6145,
-23525=>6146,
-23970=>6147,
-25303=>6148,
-25622=>6149,
-25747=>6150,
-25854=>6151,
-26332=>6152,
-27208=>6153,
-29183=>6154,
-29796=>6155,
-31368=>6156,
-31407=>6157,
-32327=>6158,
-32350=>6159,
-32768=>6160,
-33136=>6161,
-34799=>6162,
-35201=>6163,
-35616=>6164,
-36953=>6165,
-36992=>6166,
-39250=>6167,
-24958=>6168,
-27442=>6169,
-28020=>6170,
-32287=>6171,
-35109=>6172,
-36785=>6173,
-20433=>6174,
-20653=>6175,
-20887=>6176,
-21191=>6177,
-22471=>6178,
-22665=>6179,
-23481=>6180,
-24248=>6181,
-24898=>6182,
-27029=>6183,
-28044=>6184,
-28263=>6185,
-28342=>6186,
-29076=>6187,
-29794=>6188,
-12132=>6189,
-29992=>6189,
-29996=>6190,
-32883=>6191,
-33592=>6192,
-33993=>6193,
-36362=>6194,
-37780=>6195,
-37854=>6196,
-20110=>6197,
-20305=>6198,
-20598=>6199,
-20778=>6200,
-12060=>6201,
-21448=>6201,
-21451=>6202,
-21491=>6203,
-23431=>6204,
-23507=>6205,
-23588=>6206,
-24858=>6207,
-24962=>6208,
-26100=>6209,
-12124=>6210,
-29275=>6210,
-29591=>6211,
-29760=>6212,
-30402=>6213,
-31056=>6214,
-31121=>6215,
-31161=>6216,
-32006=>6217,
-12155=>6218,
-32701=>6218,
-33419=>6219,
-34261=>6220,
-34398=>6221,
-36802=>6222,
-36935=>6223,
-37109=>6224,
-37354=>6225,
-38533=>6226,
-12204=>6227,
-38632=>6227,
-38633=>6228,
-21206=>6229,
-24423=>6230,
-26093=>6231,
-26161=>6232,
-26671=>6233,
-29020=>6234,
-31286=>6235,
-37057=>6236,
-38922=>6237,
-20113=>6238,
-27218=>6239,
-27550=>6240,
-28560=>6241,
-29065=>6242,
-32792=>6243,
-33464=>6244,
-34131=>6245,
-36939=>6246,
-38549=>6247,
-38642=>6248,
-38907=>6249,
-34074=>6250,
-39729=>6251,
-20112=>6252,
-29066=>6253,
-38596=>6254,
-20803=>6255,
-21407=>6256,
-21729=>6257,
-22291=>6258,
-22290=>6259,
-22435=>6260,
-23195=>6261,
-23236=>6262,
-23491=>6263,
-24616=>6264,
-24895=>6265,
-25588=>6266,
-27781=>6267,
-27961=>6268,
-28274=>6269,
-28304=>6270,
-29232=>6271,
-29503=>6272,
-29783=>6273,
-33489=>6274,
-34945=>6275,
-36677=>6276,
-36960=>6277,
-38498=>6278,
-39000=>6279,
-40219=>6280,
-12105=>6281,
-26376=>6281,
-36234=>6282,
-37470=>6283,
-20301=>6284,
-20553=>6285,
-20702=>6286,
-21361=>6287,
-22285=>6288,
-22996=>6289,
-23041=>6290,
-23561=>6291,
-24944=>6292,
-26256=>6293,
-28205=>6294,
-29234=>6295,
-29771=>6296,
-32239=>6297,
-32963=>6298,
-33806=>6299,
-33894=>6300,
-34111=>6301,
-34655=>6302,
-34907=>6303,
-35096=>6304,
-35586=>6305,
-36949=>6306,
-12209=>6307,
-38859=>6307,
-39759=>6308,
-20083=>6309,
-20369=>6310,
-20754=>6311,
-20842=>6312,
-21807=>6313,
-21929=>6314,
-23418=>6315,
-23461=>6316,
-24188=>6317,
-24189=>6318,
-24254=>6319,
-24736=>6320,
-24799=>6321,
-24840=>6322,
-24841=>6323,
-25540=>6324,
-25912=>6325,
-26377=>6326,
-26580=>6327,
-26586=>6328,
-26977=>6329,
-26978=>6330,
-27833=>6331,
-27943=>6332,
-28216=>6333,
-28641=>6334,
-29494=>6335,
-29495=>6336,
-29788=>6337,
-30001=>6338,
-30290=>6339,
-32173=>6340,
-33278=>6341,
-33848=>6342,
-35029=>6343,
-35480=>6344,
-35547=>6345,
-35565=>6346,
-36400=>6347,
-36418=>6348,
-36938=>6349,
-36926=>6350,
-36986=>6351,
-12195=>6352,
-37193=>6352,
-37321=>6353,
-37742=>6354,
-22537=>6355,
-27603=>6356,
-12161=>6357,
-32905=>6357,
-32946=>6358,
-20801=>6359,
-22891=>6360,
-23609=>6361,
-28516=>6362,
-29607=>6363,
-32996=>6364,
-36103=>6365,
-37399=>6366,
-38287=>6367,
-12160=>6368,
-32895=>6368,
-25102=>6369,
-28700=>6370,
-32104=>6371,
-34701=>6372,
-22432=>6373,
-24681=>6374,
-24903=>6375,
-27575=>6376,
-35518=>6377,
-37504=>6378,
-38577=>6379,
-12036=>6380,
-20057=>6380,
-21535=>6381,
-28139=>6382,
-34093=>6383,
-38512=>6384,
-12211=>6385,
-38899=>6385,
-39150=>6386,
-25558=>6387,
-27875=>6388,
-12194=>6389,
-37009=>6389,
-20957=>6390,
-25033=>6391,
-33210=>6392,
-40441=>6393,
-20381=>6394,
-20506=>6395,
-20736=>6396,
-23452=>6397,
-24847=>6398,
-25087=>6399,
-25836=>6400,
-26885=>6401,
-27589=>6402,
-30097=>6403,
-30691=>6404,
-32681=>6405,
-33380=>6406,
-34191=>6407,
-34811=>6408,
-12176=>6409,
-34915=>6409,
-35516=>6410,
-35696=>6411,
-37291=>6412,
-12038=>6413,
-20108=>6413,
-20197=>6414,
-20234=>6415,
-22839=>6416,
-23016=>6417,
-24050=>6418,
-24347=>6419,
-24411=>6420,
-24609=>6421,
-29246=>6422,
-29669=>6423,
-30064=>6424,
-63842=>6424,
-30157=>6425,
-31227=>6426,
-12157=>6427,
-32780=>6427,
-12159=>6428,
-32819=>6428,
-32900=>6429,
-33505=>6430,
-33617=>6431,
-36029=>6432,
-36019=>6433,
-36999=>6434,
-39156=>6435,
-39180=>6436,
-28727=>6437,
-30410=>6438,
-32714=>6439,
-32716=>6440,
-32764=>6441,
-35610=>6442,
-12040=>6443,
-20154=>6443,
-20161=>6444,
-20995=>6445,
-21360=>6446,
-21693=>6447,
-63902=>6447,
-22240=>6448,
-23035=>6449,
-23493=>6450,
-24341=>6451,
-24525=>6452,
-28270=>6453,
-32106=>6454,
-33589=>6455,
-34451=>6456,
-35469=>6457,
-38765=>6458,
-38775=>6459,
-12032=>6460,
-19968=>6460,
-20314=>6461,
-20350=>6462,
-22777=>6463,
-12103=>6464,
-26085=>6464,
-28322=>6465,
-36920=>6466,
-37808=>6467,
-39353=>6468,
-20219=>6469,
-22764=>6470,
-22922=>6471,
-23001=>6472,
-24641=>6473,
-31252=>6474,
-33615=>6475,
-36035=>6476,
-12042=>6477,
-20837=>6477,
-21316=>6478,
-20173=>6479,
-21097=>6480,
-23381=>6481,
-33471=>6482,
-20180=>6483,
-21050=>6484,
-63999=>6484,
-21672=>6485,
-22985=>6486,
-23039=>6487,
-12070=>6488,
-23376=>6488,
-23383=>6489,
-23388=>6490,
-24675=>6491,
-24904=>6492,
-28363=>6493,
-28825=>6494,
-63995=>6494,
-29038=>6495,
-29574=>6496,
-29943=>6497,
-30133=>6498,
-30913=>6499,
-32043=>6500,
-32773=>6501,
-12163=>6502,
-33258=>6502,
-33576=>6503,
-34071=>6504,
-34249=>6505,
-35566=>6506,
-36039=>6507,
-38604=>6508,
-20316=>6509,
-21242=>6510,
-22204=>6511,
-26027=>6512,
-26152=>6513,
-28796=>6514,
-28856=>6515,
-29237=>6516,
-32189=>6517,
-33421=>6518,
-37196=>6519,
-38592=>6520,
-40306=>6521,
-23409=>6522,
-26855=>6523,
-27544=>6524,
-28538=>6525,
-30430=>6526,
-23697=>6527,
-26283=>6528,
-28507=>6529,
-31668=>6530,
-31786=>6531,
-34870=>6532,
-38620=>6533,
-19976=>6534,
-20183=>6535,
-21280=>6536,
-22580=>6537,
-22715=>6538,
-22767=>6539,
-22892=>6540,
-23559=>6541,
-24115=>6542,
-24196=>6543,
-24373=>6544,
-25484=>6545,
-26290=>6546,
-26454=>6547,
-27167=>6548,
-27299=>6549,
-27404=>6550,
-28479=>6551,
-29254=>6552,
-29520=>6553,
-29835=>6554,
-31456=>6555,
-31911=>6556,
-33144=>6557,
-33247=>6558,
-33255=>6559,
-33674=>6560,
-33900=>6561,
-34083=>6562,
-34196=>6563,
-34255=>6564,
-35037=>6565,
-36115=>6566,
-37292=>6567,
-12199=>6568,
-38263=>6568,
-38556=>6569,
-20877=>6570,
-21705=>6571,
-22312=>6572,
-23472=>6573,
-25165=>6574,
-26448=>6575,
-26685=>6576,
-26771=>6577,
-28221=>6578,
-28371=>6579,
-28797=>6580,
-32289=>6581,
-35009=>6582,
-36001=>6583,
-36617=>6584,
-40779=>6585,
-40782=>6586,
-29229=>6587,
-31631=>6588,
-35533=>6589,
-37658=>6590,
-20295=>6591,
-20302=>6592,
-20786=>6593,
-21632=>6594,
-22992=>6595,
-24213=>6596,
-25269=>6597,
-26485=>6598,
-26990=>6599,
-27159=>6600,
-27822=>6601,
-28186=>6602,
-29401=>6603,
-29482=>6604,
-30141=>6605,
-31672=>6606,
-32053=>6607,
-33511=>6608,
-33785=>6609,
-33879=>6610,
-34295=>6611,
-35419=>6612,
-36015=>6613,
-36487=>6614,
-36889=>6615,
-37048=>6616,
-38606=>6617,
-40799=>6618,
-21219=>6619,
-21514=>6620,
-23265=>6621,
-23490=>6622,
-25688=>6623,
-25973=>6624,
-28404=>6625,
-29380=>6626,
-30340=>6627,
-31309=>6628,
-31515=>6629,
-31821=>6630,
-32318=>6631,
-32735=>6632,
-33659=>6633,
-35627=>6634,
-36042=>6635,
-12186=>6636,
-36196=>6636,
-36321=>6637,
-36447=>6638,
-36842=>6639,
-36857=>6640,
-36969=>6641,
-37841=>6642,
-20291=>6643,
-20346=>6644,
-20659=>6645,
-20840=>6646,
-20856=>6647,
-21069=>6648,
-21098=>6649,
-22625=>6650,
-22652=>6651,
-22880=>6652,
-23560=>6653,
-23637=>6654,
-24283=>6655,
-24731=>6656,
-25136=>6657,
-26643=>6658,
-27583=>6659,
-27656=>6660,
-28593=>6661,
-29006=>6662,
-29728=>6663,
-12133=>6664,
-30000=>6664,
-30008=>6665,
-30033=>6666,
-30322=>6667,
-31564=>6668,
-31627=>6669,
-31661=>6670,
-31686=>6671,
-32399=>6672,
-35438=>6673,
-36670=>6674,
-36681=>6675,
-37439=>6676,
-37523=>6677,
-37666=>6678,
-37931=>6679,
-38651=>6680,
-39002=>6681,
-39019=>6682,
-39198=>6683,
-20999=>6684,
-64000=>6684,
-25130=>6685,
-25240=>6686,
-27993=>6687,
-30308=>6688,
-31434=>6689,
-31680=>6690,
-32118=>6691,
-21344=>6692,
-23742=>6693,
-24215=>6694,
-28472=>6695,
-28857=>6696,
-31896=>6697,
-38673=>6698,
-39822=>6699,
-40670=>6700,
-25509=>6701,
-25722=>6702,
-34678=>6703,
-19969=>6704,
-20117=>6705,
-20141=>6706,
-20572=>6707,
-20597=>6708,
-21576=>6709,
-22979=>6710,
-23450=>6711,
-24128=>6712,
-24237=>6713,
-24311=>6714,
-24449=>6715,
-24773=>6716,
-25402=>6717,
-25919=>6718,
-25972=>6719,
-26060=>6720,
-26230=>6721,
-26232=>6722,
-26622=>6723,
-26984=>6724,
-27273=>6725,
-27491=>6726,
-27712=>6727,
-28096=>6728,
-28136=>6729,
-28191=>6730,
-28254=>6731,
-28702=>6732,
-28833=>6733,
-29582=>6734,
-29693=>6735,
-30010=>6736,
-30555=>6737,
-30855=>6738,
-31118=>6739,
-31243=>6740,
-31357=>6741,
-31934=>6742,
-32142=>6743,
-33351=>6744,
-35330=>6745,
-35562=>6746,
-35998=>6747,
-37165=>6748,
-37194=>6749,
-37336=>6750,
-37478=>6751,
-37580=>6752,
-37664=>6753,
-38662=>6754,
-38742=>6755,
-38748=>6756,
-38914=>6757,
-12237=>6758,
-40718=>6758,
-21046=>6759,
-21137=>6760,
-21884=>6761,
-22564=>6762,
-24093=>6763,
-24351=>6764,
-24716=>6765,
-25552=>6766,
-26799=>6767,
-28639=>6768,
-31085=>6769,
-31532=>6770,
-33229=>6771,
-34234=>6772,
-35069=>6773,
-35576=>6774,
-36420=>6775,
-37261=>6776,
-38500=>6777,
-38555=>6778,
-38717=>6779,
-38988=>6780,
-12241=>6781,
-40778=>6781,
-20430=>6782,
-20806=>6783,
-20939=>6784,
-21161=>6785,
-22066=>6786,
-24340=>6787,
-24427=>6788,
-25514=>6789,
-25805=>6790,
-26089=>6791,
-26177=>6792,
-26362=>6793,
-26361=>6794,
-26397=>6795,
-26781=>6796,
-26839=>6797,
-27133=>6798,
-28437=>6799,
-28526=>6800,
-29031=>6801,
-29157=>6802,
-12118=>6803,
-29226=>6803,
-29866=>6804,
-30522=>6805,
-31062=>6806,
-31066=>6807,
-31199=>6808,
-31264=>6809,
-31381=>6810,
-31895=>6811,
-31967=>6812,
-32068=>6813,
-32368=>6814,
-32903=>6815,
-34299=>6816,
-34468=>6817,
-35412=>6818,
-35519=>6819,
-36249=>6820,
-36481=>6821,
-36896=>6822,
-36973=>6823,
-37347=>6824,
-38459=>6825,
-38613=>6826,
-12227=>6827,
-40165=>6827,
-26063=>6828,
-31751=>6829,
-12188=>6830,
-36275=>6830,
-37827=>6831,
-23384=>6832,
-23562=>6833,
-21330=>6834,
-25305=>6835,
-29469=>6836,
-20519=>6837,
-23447=>6838,
-24478=>6839,
-24752=>6840,
-24939=>6841,
-26837=>6842,
-28121=>6843,
-29742=>6844,
-31278=>6845,
-32066=>6846,
-32156=>6847,
-32305=>6848,
-33131=>6849,
-36394=>6850,
-36405=>6851,
-37758=>6852,
-37912=>6853,
-20304=>6854,
-22352=>6855,
-24038=>6856,
-24231=>6857,
-25387=>6858,
-32618=>6859,
-20027=>6860,
-20303=>6861,
-20367=>6862,
-20570=>6863,
-23005=>6864,
-32964=>6865,
-21610=>6866,
-21608=>6867,
-22014=>6868,
-22863=>6869,
-23449=>6870,
-24030=>6871,
-24282=>6872,
-26205=>6873,
-26417=>6874,
-26609=>6875,
-26666=>6876,
-27880=>6877,
-27954=>6878,
-28234=>6879,
-28557=>6880,
-28855=>6881,
-29664=>6882,
-30087=>6883,
-31820=>6884,
-32002=>6885,
-32044=>6886,
-32162=>6887,
-12168=>6888,
-33311=>6888,
-34523=>6889,
-35387=>6890,
-35461=>6891,
-12187=>6892,
-36208=>6892,
-36490=>6893,
-36659=>6894,
-36913=>6895,
-37198=>6896,
-37202=>6897,
-37956=>6898,
-39376=>6899,
-12149=>6900,
-31481=>6900,
-31909=>6901,
-20426=>6902,
-20737=>6903,
-20934=>6904,
-22472=>6905,
-23535=>6906,
-23803=>6907,
-26201=>6908,
-27197=>6909,
-27994=>6910,
-28310=>6911,
-28652=>6912,
-28940=>6913,
-30063=>6914,
-31459=>6915,
-34850=>6916,
-36897=>6917,
-36981=>6918,
-38603=>6919,
-39423=>6920,
-33537=>6921,
-20013=>6922,
-20210=>6923,
-34886=>6924,
-37325=>6925,
-21373=>6926,
-27355=>6927,
-26987=>6928,
-27713=>6929,
-33914=>6930,
-22686=>6931,
-24974=>6932,
-26366=>6933,
-25327=>6934,
-28893=>6935,
-29969=>6936,
-30151=>6937,
-32338=>6938,
-33976=>6939,
-35657=>6940,
-36104=>6941,
-20043=>6942,
-21482=>6943,
-21675=>6944,
-22320=>6945,
-22336=>6946,
-24535=>6947,
-25345=>6948,
-25351=>6949,
-25711=>6950,
-12096=>6951,
-25903=>6951,
-26088=>6952,
-26234=>6953,
-26525=>6954,
-26547=>6955,
-12108=>6956,
-27490=>6956,
-27744=>6957,
-27802=>6958,
-28460=>6959,
-30693=>6960,
-30757=>6961,
-31049=>6962,
-31063=>6963,
-32025=>6964,
-32930=>6965,
-33026=>6966,
-12164=>6967,
-33267=>6967,
-33437=>6968,
-33463=>6969,
-34584=>6970,
-35468=>6971,
-36100=>6972,
-36286=>6973,
-36978=>6974,
-30452=>6975,
-31257=>6976,
-31287=>6977,
-32340=>6978,
-32887=>6979,
-21767=>6980,
-21972=>6981,
-22645=>6982,
-25391=>6983,
-25634=>6984,
-26185=>6985,
-26187=>6986,
-26733=>6987,
-27035=>6988,
-27524=>6989,
-27941=>6990,
-28337=>6991,
-29645=>6992,
-29800=>6993,
-29857=>6994,
-30043=>6995,
-30137=>6996,
-30433=>6997,
-30494=>6998,
-30603=>6999,
-31206=>7000,
-32265=>7001,
-32285=>7002,
-33275=>7003,
-34095=>7004,
-34967=>7005,
-35386=>7006,
-36049=>7007,
-36587=>7008,
-12192=>7009,
-36784=>7009,
-63857=>7009,
-36914=>7010,
-37805=>7011,
-38499=>7012,
-38515=>7013,
-38663=>7014,
-20356=>7015,
-21489=>7016,
-23018=>7017,
-23241=>7018,
-24089=>7019,
-26702=>7020,
-29894=>7021,
-30142=>7022,
-31209=>7023,
-31378=>7024,
-33187=>7025,
-34541=>7026,
-36074=>7027,
-36300=>7028,
-36845=>7029,
-26015=>7030,
-26389=>7031,
-22519=>7032,
-28503=>7033,
-32221=>7034,
-36655=>7035,
-37878=>7036,
-38598=>7037,
-24501=>7038,
-25074=>7039,
-28548=>7040,
-19988=>7041,
-20376=>7042,
-20511=>7043,
-21449=>7044,
-21983=>7045,
-23919=>7046,
-24046=>7047,
-27425=>7048,
-27492=>7049,
-30923=>7050,
-31642=>7051,
-36425=>7052,
-12190=>7053,
-36554=>7053,
-63746=>7053,
-36974=>7054,
-25417=>7055,
-25662=>7056,
-30528=>7057,
-31364=>7058,
-37679=>7059,
-38015=>7060,
-40810=>7061,
-25776=>7062,
-28591=>7063,
-29158=>7064,
-29864=>7065,
-29914=>7066,
-31428=>7067,
-31762=>7068,
-32386=>7069,
-31922=>7070,
-32408=>7071,
-35738=>7072,
-36106=>7073,
-38013=>7074,
-39184=>7075,
-39244=>7076,
-21049=>7077,
-23519=>7078,
-25830=>7079,
-26413=>7080,
-32046=>7081,
-20717=>7082,
-21443=>7083,
-63851=>7083,
-22649=>7084,
-24920=>7085,
-24921=>7086,
-25082=>7087,
-26028=>7088,
-31449=>7089,
-35730=>7090,
-35734=>7091,
-20489=>7092,
-20513=>7093,
-21109=>7094,
-21809=>7095,
-23100=>7096,
-24288=>7097,
-24432=>7098,
-24884=>7099,
-25950=>7100,
-26124=>7101,
-26166=>7102,
-26274=>7103,
-27085=>7104,
-28356=>7105,
-28466=>7106,
-29462=>7107,
-30241=>7108,
-31379=>7109,
-33081=>7110,
-33369=>7111,
-33750=>7112,
-33980=>7113,
-20661=>7114,
-22512=>7115,
-23488=>7116,
-23528=>7117,
-24425=>7118,
-25505=>7119,
-30758=>7120,
-32181=>7121,
-33756=>7122,
-34081=>7123,
-37319=>7124,
-37365=>7125,
-20874=>7126,
-26613=>7127,
-31574=>7128,
-36012=>7129,
-20932=>7130,
-22971=>7131,
-24765=>7132,
-34389=>7133,
-20508=>7134,
-21076=>7135,
-23610=>7136,
-24957=>7137,
-25114=>7138,
-25299=>7139,
-64002=>7139,
-25842=>7140,
-26021=>7141,
-28364=>7142,
-30240=>7143,
-33034=>7144,
-36448=>7145,
-38495=>7146,
-38587=>7147,
-20191=>7148,
-21315=>7149,
-21912=>7150,
-22825=>7151,
-24029=>7152,
-25797=>7153,
-27849=>7154,
-28154=>7155,
-29588=>7156,
-31359=>7157,
-12167=>7158,
-33307=>7158,
-34214=>7159,
-36068=>7160,
-36368=>7161,
-36983=>7162,
-37351=>7163,
-38369=>7164,
-38433=>7165,
-38854=>7166,
-20984=>7167,
-21746=>7168,
-21894=>7169,
-24505=>7170,
-25764=>7171,
-28552=>7172,
-32180=>7173,
-36639=>7174,
-36685=>7175,
-37941=>7176,
-20681=>7177,
-23574=>7178,
-27838=>7179,
-28155=>7180,
-29979=>7181,
-30651=>7182,
-31805=>7183,
-31844=>7184,
-35449=>7185,
-35522=>7186,
-22558=>7187,
-22974=>7188,
-24086=>7189,
-25463=>7190,
-29266=>7191,
-30090=>7192,
-30571=>7193,
-35548=>7194,
-36028=>7195,
-36626=>7196,
-24307=>7197,
-26228=>7198,
-28152=>7199,
-32893=>7200,
-33729=>7201,
-35531=>7202,
-12205=>7203,
-38737=>7203,
-39894=>7204,
-21059=>7205,
-26367=>7206,
-28053=>7207,
-28399=>7208,
-32224=>7209,
-35558=>7210,
-36910=>7211,
-36958=>7212,
-39636=>7213,
-21021=>7214,
-21119=>7215,
-21736=>7216,
-24980=>7217,
-25220=>7218,
-25307=>7219,
-26786=>7220,
-26898=>7221,
-26970=>7222,
-27189=>7223,
-28818=>7224,
-28966=>7225,
-30813=>7226,
-30977=>7227,
-30990=>7228,
-31186=>7229,
-31245=>7230,
-32918=>7231,
-12171=>7232,
-33400=>7232,
-33493=>7233,
-33609=>7234,
-34121=>7235,
-35970=>7236,
-36229=>7237,
-37218=>7238,
-37259=>7239,
-37294=>7240,
-20419=>7241,
-22225=>7242,
-29165=>7243,
-30679=>7244,
-34560=>7245,
-35320=>7246,
-12072=>7247,
-23544=>7247,
-24534=>7248,
-26449=>7249,
-37032=>7250,
-21474=>7251,
-22618=>7252,
-23541=>7253,
-24740=>7254,
-24961=>7255,
-25696=>7256,
-32317=>7257,
-32880=>7258,
-34085=>7259,
-37507=>7260,
-25774=>7261,
-20652=>7262,
-23828=>7263,
-26368=>7264,
-22684=>7265,
-25277=>7266,
-25512=>7267,
-26894=>7268,
-27000=>7269,
-27166=>7270,
-28267=>7271,
-30394=>7272,
-31179=>7273,
-33467=>7274,
-33833=>7275,
-35535=>7276,
-36264=>7277,
-36861=>7278,
-37138=>7279,
-37195=>7280,
-37276=>7281,
-37648=>7282,
-37656=>7283,
-37786=>7284,
-38619=>7285,
-39478=>7286,
-39949=>7287,
-19985=>7288,
-30044=>7289,
-31069=>7290,
-31482=>7291,
-31569=>7292,
-31689=>7293,
-32302=>7294,
-33988=>7295,
-36441=>7296,
-36468=>7297,
-36600=>7298,
-36880=>7299,
-26149=>7300,
-26943=>7301,
-29763=>7302,
-20986=>7303,
-26414=>7304,
-40668=>7305,
-20805=>7306,
-24544=>7307,
-27798=>7308,
-34802=>7309,
-34909=>7310,
-34935=>7311,
-24756=>7312,
-33205=>7313,
-33795=>7314,
-36101=>7315,
-21462=>7316,
-21561=>7317,
-22068=>7318,
-23094=>7319,
-23601=>7320,
-28810=>7321,
-32736=>7322,
-32858=>7323,
-33030=>7324,
-33261=>7325,
-36259=>7326,
-37257=>7327,
-39519=>7328,
-40434=>7329,
-20596=>7330,
-20164=>7331,
-21408=>7332,
-24827=>7333,
-28204=>7334,
-23652=>7335,
-20360=>7336,
-20516=>7337,
-21988=>7338,
-23769=>7339,
-24159=>7340,
-24677=>7341,
-26772=>7342,
-27835=>7343,
-28100=>7344,
-29118=>7345,
-30164=>7346,
-30196=>7347,
-30305=>7348,
-31258=>7349,
-31305=>7350,
-32199=>7351,
-32251=>7352,
-32622=>7353,
-33268=>7354,
-34473=>7355,
-36636=>7356,
-38601=>7357,
-39347=>7358,
-12242=>7359,
-40786=>7359,
-21063=>7360,
-21189=>7361,
-39149=>7362,
-35242=>7363,
-19971=>7364,
-26578=>7365,
-28422=>7366,
-20405=>7367,
-23522=>7368,
-26517=>7369,
-27784=>7370,
-63858=>7370,
-28024=>7371,
-29723=>7372,
-30759=>7373,
-37341=>7374,
-37756=>7375,
-34756=>7376,
-31204=>7377,
-31281=>7378,
-24555=>7379,
-20182=>7380,
-21668=>7381,
-21822=>7382,
-22702=>7383,
-22949=>7384,
-24816=>7385,
-25171=>7386,
-25302=>7387,
-26422=>7388,
-26965=>7389,
-33333=>7390,
-38464=>7391,
-39345=>7392,
-39389=>7393,
-20524=>7394,
-21331=>7395,
-21828=>7396,
-22396=>7397,
-25176=>7398,
-25826=>7399,
-26219=>7400,
-26589=>7401,
-28609=>7402,
-28655=>7403,
-29730=>7404,
-29752=>7405,
-35351=>7406,
-37944=>7407,
-21585=>7408,
-22022=>7409,
-22374=>7410,
-24392=>7411,
-24986=>7412,
-27470=>7413,
-28760=>7414,
-28845=>7415,
-32187=>7416,
-35477=>7417,
-22890=>7418,
-33067=>7419,
-25506=>7420,
-30472=>7421,
-32829=>7422,
-36010=>7423,
-22612=>7424,
-25645=>7425,
-27067=>7426,
-23445=>7427,
-24081=>7428,
-28271=>7429,
-34153=>7430,
-20812=>7431,
-21488=>7432,
-22826=>7433,
-24608=>7434,
-24907=>7435,
-27526=>7436,
-27760=>7437,
-27888=>7438,
-31518=>7439,
-32974=>7440,
-33492=>7441,
-36294=>7442,
-37040=>7443,
-39089=>7444,
-25799=>7445,
-28580=>7446,
-25745=>7447,
-25860=>7448,
-20814=>7449,
-21520=>7450,
-12063=>7451,
-22303=>7451,
-35342=>7452,
-24927=>7453,
-26742=>7454,
-30171=>7455,
-31570=>7456,
-32113=>7457,
-36890=>7458,
-22534=>7459,
-27084=>7460,
-33151=>7461,
-35114=>7462,
-36864=>7463,
-38969=>7464,
-20600=>7465,
-22871=>7466,
-22956=>7467,
-25237=>7468,
-36879=>7469,
-39722=>7470,
-24925=>7471,
-29305=>7472,
-38358=>7473,
-22369=>7474,
-23110=>7475,
-24052=>7476,
-25226=>7477,
-25773=>7478,
-25850=>7479,
-26487=>7480,
-27874=>7481,
-27966=>7482,
-29228=>7483,
-29750=>7484,
-30772=>7485,
-32631=>7486,
-33453=>7487,
-36315=>7488,
-38935=>7489,
-21028=>7490,
-22338=>7491,
-26495=>7492,
-29256=>7493,
-29923=>7494,
-36009=>7495,
-36774=>7496,
-37393=>7497,
-38442=>7498,
-12043=>7499,
-20843=>7499,
-21485=>7500,
-25420=>7501,
-20329=>7502,
-21764=>7503,
-24726=>7504,
-25943=>7505,
-27803=>7506,
-28031=>7507,
-29260=>7508,
-29437=>7509,
-31255=>7510,
-35207=>7511,
-12185=>7512,
-35997=>7512,
-24429=>7513,
-28558=>7514,
-28921=>7515,
-33192=>7516,
-24846=>7517,
-20415=>7518,
-63845=>7518,
-20559=>7519,
-25153=>7520,
-12122=>7521,
-29255=>7521,
-31687=>7522,
-32232=>7523,
-32745=>7524,
-36941=>7525,
-38829=>7526,
-39449=>7527,
-36022=>7528,
-22378=>7529,
-24179=>7530,
-26544=>7531,
-33805=>7532,
-35413=>7533,
-21536=>7534,
-23318=>7535,
-24163=>7536,
-24290=>7537,
-24330=>7538,
-25987=>7539,
-32954=>7540,
-34109=>7541,
-38281=>7542,
-38491=>7543,
-20296=>7544,
-21253=>7545,
-21261=>7546,
-21263=>7547,
-21638=>7548,
-21754=>7549,
-22275=>7550,
-24067=>7551,
-24598=>7552,
-25243=>7553,
-25265=>7554,
-25429=>7555,
-27873=>7556,
-28006=>7557,
-30129=>7558,
-30770=>7559,
-32990=>7560,
-33071=>7561,
-33502=>7562,
-33889=>7563,
-33970=>7564,
-34957=>7565,
-35090=>7566,
-36875=>7567,
-37610=>7568,
-39165=>7569,
-39825=>7570,
-24133=>7571,
-26292=>7572,
-64006=>7572,
-26333=>7573,
-28689=>7574,
-29190=>7575,
-20469=>7576,
-21117=>7577,
-24426=>7578,
-24915=>7579,
-26451=>7580,
-27161=>7581,
-28418=>7582,
-29922=>7583,
-31080=>7584,
-34920=>7585,
-35961=>7586,
-39111=>7587,
-39108=>7588,
-39491=>7589,
-21697=>7590,
-31263=>7591,
-26963=>7592,
-35575=>7593,
-35914=>7594,
-12213=>7595,
-39080=>7595,
-39342=>7596,
-24444=>7597,
-25259=>7598,
-30130=>7599,
-12138=>7600,
-30382=>7600,
-34987=>7601,
-36991=>7602,
-38466=>7603,
-21305=>7604,
-24380=>7605,
-24517=>7606,
-27852=>7607,
-63848=>7607,
-29644=>7608,
-30050=>7609,
-12134=>7610,
-30091=>7610,
-31558=>7611,
-33534=>7612,
-39325=>7613,
-20047=>7614,
-36924=>7615,
-19979=>7616,
-20309=>7617,
-21414=>7618,
-22799=>7619,
-24264=>7620,
-26160=>7621,
-27827=>7622,
-29781=>7623,
-33655=>7624,
-34662=>7625,
-36032=>7626,
-36944=>7627,
-38686=>7628,
-39957=>7629,
-22737=>7630,
-23416=>7631,
-34384=>7632,
-35604=>7633,
-40372=>7634,
-23506=>7635,
-24680=>7636,
-24717=>7637,
-26097=>7638,
-27735=>7639,
-28450=>7640,
-28579=>7641,
-28698=>7642,
-32597=>7643,
-32752=>7644,
-38289=>7645,
-38290=>7646,
-38480=>7647,
-38867=>7648,
-21106=>7649,
-36676=>7650,
-20989=>7651,
-21547=>7652,
-21688=>7653,
-21859=>7654,
-21898=>7655,
-27323=>7656,
-28085=>7657,
-32216=>7658,
-33382=>7659,
-37532=>7660,
-38519=>7661,
-40569=>7662,
-21512=>7663,
-21704=>7664,
-30418=>7665,
-34532=>7666,
-38308=>7667,
-38356=>7668,
-38492=>7669,
-20130=>7670,
-20233=>7671,
-23022=>7672,
-23270=>7673,
-24055=>7674,
-24658=>7675,
-25239=>7676,
-26477=>7677,
-26689=>7678,
-27782=>7679,
-28207=>7680,
-32568=>7681,
-32923=>7682,
-33322=>7683,
-38917=>7684,
-20133=>7685,
-20565=>7686,
-21683=>7687,
-22419=>7688,
-22874=>7689,
-23401=>7690,
-23475=>7691,
-25032=>7692,
-26999=>7693,
-28023=>7694,
-28707=>7695,
-34809=>7696,
-35299=>7697,
-35442=>7698,
-35559=>7699,
-36994=>7700,
-39405=>7701,
-39608=>7702,
-21182=>7703,
-26680=>7704,
-20502=>7705,
-24184=>7706,
-26447=>7707,
-33607=>7708,
-12175=>7709,
-34892=>7709,
-64008=>7709,
-20139=>7710,
-21521=>7711,
-22190=>7712,
-29670=>7713,
-37141=>7714,
-38911=>7715,
-39177=>7716,
-39255=>7717,
-12217=>7718,
-39321=>7718,
-22099=>7719,
-22687=>7720,
-34395=>7721,
-35377=>7722,
-25010=>7723,
-27382=>7724,
-29563=>7725,
-36562=>7726,
-27463=>7727,
-38570=>7728,
-39511=>7729,
-22869=>7730,
-29184=>7731,
-36203=>7732,
-12208=>7733,
-38761=>7733,
-20436=>7734,
-23796=>7735,
-24358=>7736,
-25080=>7737,
-26203=>7738,
-27883=>7739,
-28843=>7740,
-12126=>7741,
-29572=>7741,
-29625=>7742,
-29694=>7743,
-30505=>7744,
-30541=>7745,
-32067=>7746,
-32098=>7747,
-32291=>7748,
-33335=>7749,
-34898=>7750,
-36066=>7751,
-37449=>7752,
-39023=>7753,
-23377=>7754,
-12147=>7755,
-31348=>7755,
-12174=>7756,
-34880=>7756,
-12212=>7757,
-38913=>7757,
-23244=>7758,
-20448=>7759,
-21332=>7760,
-22846=>7761,
-23805=>7762,
-25406=>7763,
-28025=>7764,
-29433=>7765,
-33029=>7766,
-33031=>7767,
-33698=>7768,
-37583=>7769,
-38960=>7770,
-20136=>7771,
-20804=>7772,
-21009=>7773,
-22411=>7774,
-24418=>7775,
-27842=>7776,
-28366=>7777,
-28677=>7778,
-28752=>7779,
-28847=>7780,
-29074=>7781,
-29673=>7782,
-29801=>7783,
-63918=>7783,
-33610=>7784,
-34722=>7785,
-34913=>7786,
-36872=>7787,
-37026=>7788,
-37795=>7789,
-39336=>7790,
-20846=>7791,
-24407=>7792,
-24800=>7793,
-24935=>7794,
-26291=>7795,
-34137=>7796,
-36426=>7797,
-37295=>7798,
-38795=>7799,
-20046=>7800,
-20114=>7801,
-21628=>7802,
-22741=>7803,
-22778=>7804,
-22909=>7805,
-23733=>7806,
-24359=>7807,
-12094=>7808,
-25142=>7808,
-25160=>7809,
-26122=>7810,
-26215=>7811,
-27627=>7812,
-28009=>7813,
-28111=>7814,
-28246=>7815,
-28408=>7816,
-28564=>7817,
-28640=>7818,
-28649=>7819,
-28765=>7820,
-29392=>7821,
-29733=>7822,
-29786=>7823,
-29920=>7824,
-30355=>7825,
-31068=>7826,
-31946=>7827,
-32286=>7828,
-32993=>7829,
-33446=>7830,
-33899=>7831,
-33983=>7832,
-34382=>7833,
-34399=>7834,
-34676=>7835,
-35703=>7836,
-35946=>7837,
-37804=>7838,
-38912=>7839,
-39013=>7840,
-24785=>7841,
-25110=>7842,
-37239=>7843,
-23130=>7844,
-26127=>7845,
-28151=>7846,
-28222=>7847,
-29759=>7848,
-39746=>7849,
-24573=>7850,
-24794=>7851,
-31503=>7852,
-21700=>7853,
-24344=>7854,
-27742=>7855,
-27859=>7856,
-27946=>7857,
-28888=>7858,
-32005=>7859,
-34425=>7860,
-35340=>7861,
-40251=>7862,
-21270=>7863,
-21644=>7864,
-23301=>7865,
-27194=>7866,
-12117=>7867,
-28779=>7867,
-30069=>7868,
-31117=>7869,
-12146=>7870,
-31166=>7870,
-33457=>7871,
-33775=>7872,
-35441=>7873,
-35649=>7874,
-36008=>7875,
-38772=>7876,
-25844=>7877,
-25899=>7878,
-30906=>7879,
-30907=>7880,
-31339=>7881,
-20024=>7882,
-21914=>7883,
-22864=>7884,
-23462=>7885,
-24187=>7886,
-24739=>7887,
-25563=>7888,
-27489=>7889,
-26213=>7890,
-26707=>7891,
-28185=>7892,
-29029=>7893,
-29872=>7894,
-32008=>7895,
-36996=>7896,
-39529=>7897,
-39973=>7898,
-27963=>7899,
-28369=>7900,
-63748=>7900,
-29502=>7901,
-35905=>7902,
-38346=>7903,
-20976=>7904,
-24140=>7905,
-24488=>7906,
-24653=>7907,
-24822=>7908,
-24880=>7909,
-24908=>7910,
-26179=>7911,
-26180=>7912,
-27045=>7913,
-27841=>7914,
-28255=>7915,
-28361=>7916,
-28514=>7917,
-29004=>7918,
-29852=>7919,
-30343=>7920,
-31681=>7921,
-31783=>7922,
-33618=>7923,
-34647=>7924,
-36945=>7925,
-38541=>7926,
-12232=>7927,
-40643=>7927,
-21295=>7928,
-22238=>7929,
-24315=>7930,
-24458=>7931,
-24674=>7932,
-24724=>7933,
-25079=>7934,
-26214=>7935,
-26371=>7936,
-27292=>7937,
-28142=>7938,
-28590=>7939,
-28784=>7940,
-29546=>7941,
-32362=>7942,
-33214=>7943,
-33588=>7944,
-34516=>7945,
-35496=>7946,
-36036=>7947,
-21123=>7948,
-29554=>7949,
-23446=>7950,
-27243=>7951,
-37892=>7952,
-21742=>7953,
-22150=>7954,
-23389=>7955,
-25928=>7956,
-25989=>7957,
-26313=>7958,
-26783=>7959,
-28045=>7960,
-28102=>7961,
-12120=>7962,
-29243=>7962,
-32948=>7963,
-37237=>7964,
-39501=>7965,
-20399=>7966,
-20505=>7967,
-21402=>7968,
-21518=>7969,
-21564=>7970,
-21897=>7971,
-21957=>7972,
-24127=>7973,
-24460=>7974,
-26429=>7975,
-29030=>7976,
-29661=>7977,
-36869=>7978,
-21211=>7979,
-21235=>7980,
-22628=>7981,
-22734=>7982,
-28932=>7983,
-29071=>7984,
-29179=>7985,
-34224=>7986,
-35347=>7987,
-26248=>7988,
-63941=>7988,
-34216=>7989,
-21927=>7990,
-26244=>7991,
-29002=>7992,
-33841=>7993,
-21321=>7994,
-21913=>7995,
-27585=>7996,
-24409=>7997,
-24509=>7998,
-25582=>7999,
-26249=>8000,
-28999=>8001,
-35569=>8002,
-36637=>8003,
-40638=>8004,
-20241=>8005,
-25658=>8006,
-28875=>8007,
-30054=>8008,
-34407=>8009,
-24676=>8010,
-35662=>8011,
-40440=>8012,
-20807=>8013,
-20982=>8014,
-21256=>8015,
-27958=>8016,
-33016=>8017,
-12234=>8018,
-40657=>8018,
-26133=>8019,
-27427=>8020,
-28824=>8021,
-30165=>8022,
-21507=>8023,
-23673=>8024,
-32007=>8025,
-35350=>8026,
-12107=>8027,
-27424=>8027,
-27453=>8028,
-27462=>8029,
-21560=>8030,
-24688=>8031,
-27965=>8032,
-32725=>8033,
-33288=>8034,
-20694=>8035,
-20958=>8036,
-21916=>8037,
-22123=>8038,
-22221=>8039,
-23020=>8040,
-23305=>8041,
-24076=>8042,
-24985=>8043,
-24984=>8044,
-25137=>8045,
-26206=>8046,
-26342=>8047,
-29081=>8048,
-29113=>8049,
-29114=>8050,
-29351=>8051,
-31143=>8052,
-31232=>8053,
-32690=>8054,
-35440=>8055,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-12310=>8219,
-12311=>8220,
-12312=>8221,
-12313=>8222,
-8223=>8237,
-8219=>8238,
-8314=>8239,
-8315=>8240,
-8316=>8248,
-8317=>8250,
-8318=>8251,
-700=>8275,
-8942=>8320,
-8759=>8321,
-10122=>8342,
-10123=>8343,
-10124=>8344,
-10125=>8345,
-10126=>8346,
-10127=>8347,
-10128=>8348,
-10129=>8349,
-10130=>8350,
-10131=>8351,
-9398=>8388,
-9399=>8389,
-9400=>8390,
-9401=>8391,
-9402=>8392,
-9403=>8393,
-9404=>8394,
-9405=>8395,
-9406=>8396,
-9407=>8397,
-9408=>8398,
-9409=>8399,
-9410=>8400,
-9411=>8401,
-9412=>8402,
-9413=>8403,
-9414=>8404,
-9415=>8405,
-9416=>8406,
-9417=>8407,
-9418=>8408,
-9419=>8409,
-9420=>8410,
-9421=>8411,
-9422=>8412,
-9423=>8413,
-8826=>8475,
-8827=>8476,
-8910=>8477,
-8911=>8478,
-8832=>8479,
-8833=>8480,
-8816=>8481,
-8817=>8482,
-8818=>8483,
-8819=>8484,
-8842=>8486,
-8843=>8488,
-8822=>8489,
-8823=>8490,
-8825=>8491,
-8922=>8492,
-8923=>8493,
-8773=>8499,
-8771=>8500,
-8776=>8501,
-8868=>8503,
-8244=>8582,
-9839=>8594,
-8258=>8599,
-10045=>8604,
-8226=>8607,
-8249=>8612,
-8250=>8613,
-10010=>8630,
-10006=>8631,
-9711=>8633,
-10070=>8637,
-9676=>8639,
-9775=>8664,
-12320=>8671,
-10102=>8673,
-10103=>8674,
-10104=>8675,
-10105=>8676,
-10106=>8677,
-10107=>8678,
-10108=>8679,
-10109=>8680,
-10110=>8681,
-10111=>8682,
-12306=>8700,
-12342=>8701,
-8710=>8715,
-8735=>8717,
-8741=>8719,
-8742=>8720,
-8787=>8722,
-8785=>8723,
-8806=>8724,
-8807=>8725,
-8723=>8726,
-8853=>8727,
-8854=>8728,
-8855=>8729,
-8980=>8731,
-8802=>8734,
-9649=>8736,
-8738=>8738,
-8784=>8739,
-8867=>8742,
-8814=>8745,
-8815=>8746,
-8837=>8747,
-8836=>8748,
-8713=>8749,
-8716=>8750,
-8891=>8751,
-8892=>8752,
-8794=>8753,
-8966=>8754,
-12958=>8761,
-8252=>8763,
-9702=>8775,
-9663=>8779,
-9653=>8780,
-9657=>8781,
-9667=>8782,
-9674=>8787,
-12849=>8788,
-12857=>8789,
-13259=>8790,
-9327=>8791,
-9328=>8792,
-9329=>8793,
-9330=>8794,
-9331=>8795,
-8656=>8814,
-8655=>8815,
-8653=>8816,
-8657=>8854,
-8659=>8855,
-8626=>8864,
-8625=>8865,
-8628=>8867,
-8624=>8868,
-8627=>8869,
-8636=>8884,
-8640=>8885,
-8644=>8896,
-8645=>8897,
-9347=>9042,
-9348=>9043,
-9349=>9044,
-9350=>9045,
-9351=>9046,
-12948=>9080,
-12965=>9096,
-8672=>9190,
-8674=>9191,
-8673=>9192,
-8675=>9193,
-8678=>9198,
-8680=>9199,
-8679=>9200,
-8681=>9201,
-9757=>9222,
-9759=>9223,
-12944=>9300,
-12938=>9301,
-12939=>9302,
-12940=>9303,
-12941=>9304,
-12942=>9305,
-12943=>9306,
-12318=>9322,
-12319=>9323,
-8246=>9324,
-8245=>9326,
-12540=>9330,
-44034=>9333,
-44035=>9334,
-44037=>9335,
-44038=>9336,
-44043=>9337,
-44044=>9338,
-44045=>9339,
-44046=>9340,
-44047=>9341,
-44056=>9342,
-44062=>9343,
-44063=>9344,
-44065=>9345,
-44066=>9346,
-44067=>9347,
-44069=>9348,
-44070=>9349,
-44071=>9350,
-44072=>9351,
-44073=>9352,
-44074=>9353,
-44075=>9354,
-44078=>9355,
-44082=>9356,
-44083=>9357,
-44084=>9358,
-44085=>9359,
-44086=>9360,
-44087=>9361,
-44090=>9362,
-44091=>9363,
-44093=>9364,
-44094=>9365,
-44095=>9366,
-44097=>9367,
-44098=>9368,
-44099=>9369,
-44100=>9370,
-44101=>9371,
-44102=>9372,
-44103=>9373,
-44104=>9374,
-44105=>9375,
-44106=>9376,
-44108=>9377,
-44110=>9378,
-44111=>9379,
-44112=>9380,
-44113=>9381,
-44114=>9382,
-44115=>9383,
-44117=>9384,
-44118=>9385,
-44119=>9386,
-44121=>9387,
-44122=>9388,
-44123=>9389,
-44125=>9390,
-44126=>9391,
-44127=>9392,
-44128=>9393,
-44129=>9394,
-44130=>9395,
-44131=>9396,
-44132=>9397,
-44133=>9398,
-44134=>9399,
-44135=>9400,
-44136=>9401,
-44137=>9402,
-44138=>9403,
-44139=>9404,
-44140=>9405,
-44141=>9406,
-44142=>9407,
-44143=>9408,
-44146=>9409,
-44147=>9410,
-44149=>9411,
-44150=>9412,
-44153=>9413,
-44155=>9414,
-44156=>9415,
-44157=>9416,
-44158=>9417,
-44159=>9418,
-44162=>9419,
-44167=>9420,
-44168=>9421,
-44173=>9422,
-44174=>9423,
-44175=>9424,
-44177=>9425,
-44178=>9426,
-44179=>9427,
-44181=>9428,
-44182=>9429,
-44183=>9430,
-44184=>9431,
-44185=>9432,
-44186=>9433,
-44187=>9434,
-44190=>9435,
-44194=>9436,
-44195=>9437,
-44196=>9438,
-44197=>9439,
-44198=>9440,
-44199=>9441,
-44203=>9442,
-44205=>9443,
-44206=>9444,
-44209=>9445,
-44210=>9446,
-44211=>9447,
-44212=>9448,
-44213=>9449,
-44214=>9450,
-44215=>9451,
-44218=>9452,
-44222=>9453,
-44223=>9454,
-44224=>9455,
-44226=>9456,
-44227=>9457,
-44229=>9458,
-44230=>9459,
-44231=>9460,
-44233=>9461,
-44234=>9462,
-44235=>9463,
-44237=>9464,
-44238=>9465,
-44239=>9466,
-44240=>9467,
-44241=>9468,
-44242=>9469,
-44243=>9470,
-44244=>9471,
-44246=>9472,
-44248=>9473,
-44249=>9474,
-44250=>9475,
-44251=>9476,
-44252=>9477,
-44253=>9478,
-44254=>9479,
-44255=>9480,
-44258=>9481,
-44259=>9482,
-44261=>9483,
-44262=>9484,
-44265=>9485,
-44267=>9486,
-44269=>9487,
-44270=>9488,
-44274=>9489,
-44276=>9490,
-44279=>9491,
-44280=>9492,
-44281=>9493,
-44282=>9494,
-44283=>9495,
-44286=>9496,
-44287=>9497,
-44289=>9498,
-44290=>9499,
-44291=>9500,
-44293=>9501,
-44295=>9502,
-44296=>9503,
-44297=>9504,
-44298=>9505,
-44299=>9506,
-44302=>9507,
-44304=>9508,
-44306=>9509,
-44307=>9510,
-44308=>9511,
-44309=>9512,
-44310=>9513,
-44311=>9514,
-44313=>9515,
-44314=>9516,
-44315=>9517,
-44317=>9518,
-44318=>9519,
-44319=>9520,
-44321=>9521,
-44322=>9522,
-44323=>9523,
-44324=>9524,
-44325=>9525,
-44326=>9526,
-44327=>9527,
-44328=>9528,
-44330=>9529,
-44331=>9530,
-44334=>9531,
-44335=>9532,
-44336=>9533,
-44337=>9534,
-44338=>9535,
-44339=>9536,
-44342=>9537,
-44343=>9538,
-44345=>9539,
-44346=>9540,
-44347=>9541,
-44349=>9542,
-44350=>9543,
-44351=>9544,
-44352=>9545,
-44353=>9546,
-44354=>9547,
-44355=>9548,
-44358=>9549,
-44360=>9550,
-44362=>9551,
-44363=>9552,
-44364=>9553,
-44365=>9554,
-44366=>9555,
-44367=>9556,
-44369=>9557,
-44370=>9558,
-44371=>9559,
-44373=>9560,
-44374=>9561,
-44375=>9562,
-44377=>9563,
-44378=>9564,
-44379=>9565,
-44380=>9566,
-44381=>9567,
-44382=>9568,
-44383=>9569,
-44384=>9570,
-44386=>9571,
-44388=>9572,
-44389=>9573,
-44390=>9574,
-44391=>9575,
-44392=>9576,
-44393=>9577,
-44394=>9578,
-44395=>9579,
-44398=>9580,
-44399=>9581,
-44401=>9582,
-44402=>9583,
-44407=>9584,
-44408=>9585,
-44409=>9586,
-44410=>9587,
-44414=>9588,
-44416=>9589,
-44419=>9590,
-44420=>9591,
-44421=>9592,
-44422=>9593,
-44423=>9594,
-44426=>9595,
-44427=>9596,
-44429=>9597,
-44430=>9598,
-44431=>9599,
-44433=>9600,
-44434=>9601,
-44435=>9602,
-44436=>9603,
-44437=>9604,
-44438=>9605,
-44439=>9606,
-44440=>9607,
-44441=>9608,
-44442=>9609,
-44443=>9610,
-44446=>9611,
-44447=>9612,
-44448=>9613,
-44449=>9614,
-44450=>9615,
-44451=>9616,
-44453=>9617,
-44454=>9618,
-44455=>9619,
-44456=>9620,
-44457=>9621,
-44458=>9622,
-44459=>9623,
-44460=>9624,
-44461=>9625,
-44462=>9626,
-44463=>9627,
-44464=>9628,
-44465=>9629,
-44466=>9630,
-44467=>9631,
-44468=>9632,
-44469=>9633,
-44470=>9634,
-44472=>9635,
-44473=>9636,
-44474=>9637,
-44475=>9638,
-44476=>9639,
-44477=>9640,
-44478=>9641,
-44479=>9642,
-44482=>9643,
-44483=>9644,
-44485=>9645,
-44486=>9646,
-44487=>9647,
-44489=>9648,
-44490=>9649,
-44491=>9650,
-44492=>9651,
-44493=>9652,
-44494=>9653,
-44495=>9654,
-44498=>9655,
-44500=>9656,
-44501=>9657,
-44502=>9658,
-44503=>9659,
-44504=>9660,
-44505=>9661,
-44506=>9662,
-44507=>9663,
-44509=>9664,
-44510=>9665,
-44511=>9666,
-44513=>9667,
-44514=>9668,
-44515=>9669,
-44517=>9670,
-44518=>9671,
-44519=>9672,
-44520=>9673,
-44521=>9674,
-44522=>9675,
-44523=>9676,
-44524=>9677,
-44525=>9678,
-44526=>9679,
-44527=>9680,
-44528=>9681,
-44529=>9682,
-44530=>9683,
-44531=>9684,
-44532=>9685,
-44533=>9686,
-44534=>9687,
-44535=>9688,
-44538=>9689,
-44539=>9690,
-44541=>9691,
-44542=>9692,
-44546=>9693,
-44547=>9694,
-44548=>9695,
-44549=>9696,
-44550=>9697,
-44551=>9698,
-44554=>9699,
-44556=>9700,
-44558=>9701,
-44559=>9702,
-44560=>9703,
-44561=>9704,
-44562=>9705,
-44563=>9706,
-44565=>9707,
-44566=>9708,
-44567=>9709,
-44568=>9710,
-44569=>9711,
-44570=>9712,
-44571=>9713,
-44572=>9714,
-44573=>9715,
-44574=>9716,
-44575=>9717,
-44576=>9718,
-44577=>9719,
-44578=>9720,
-44579=>9721,
-44580=>9722,
-44581=>9723,
-44582=>9724,
-44583=>9725,
-44584=>9726,
-44585=>9727,
-44586=>9728,
-44587=>9729,
-44588=>9730,
-44589=>9731,
-44590=>9732,
-44591=>9733,
-44594=>9734,
-44595=>9735,
-44597=>9736,
-44598=>9737,
-44601=>9738,
-44603=>9739,
-44604=>9740,
-44605=>9741,
-44606=>9742,
-44607=>9743,
-44610=>9744,
-44612=>9745,
-44615=>9746,
-44616=>9747,
-44617=>9748,
-44619=>9749,
-44623=>9750,
-44625=>9751,
-44626=>9752,
-44627=>9753,
-44629=>9754,
-44631=>9755,
-44632=>9756,
-44633=>9757,
-44634=>9758,
-44635=>9759,
-44638=>9760,
-44642=>9761,
-44643=>9762,
-44644=>9763,
-44646=>9764,
-44647=>9765,
-44650=>9766,
-44651=>9767,
-44653=>9768,
-44654=>9769,
-44655=>9770,
-44657=>9771,
-44658=>9772,
-44659=>9773,
-44660=>9774,
-44661=>9775,
-44662=>9776,
-44663=>9777,
-44666=>9778,
-44670=>9779,
-44671=>9780,
-44672=>9781,
-44673=>9782,
-44674=>9783,
-44675=>9784,
-44678=>9785,
-44679=>9786,
-44680=>9787,
-44681=>9788,
-44682=>9789,
-44683=>9790,
-44685=>9791,
-44686=>9792,
-44687=>9793,
-44688=>9794,
-44689=>9795,
-44690=>9796,
-44691=>9797,
-44692=>9798,
-44693=>9799,
-44694=>9800,
-44695=>9801,
-44696=>9802,
-44697=>9803,
-44698=>9804,
-44699=>9805,
-44700=>9806,
-44701=>9807,
-44702=>9808,
-44703=>9809,
-44704=>9810,
-44705=>9811,
-44706=>9812,
-44707=>9813,
-44708=>9814,
-44709=>9815,
-44710=>9816,
-44711=>9817,
-44712=>9818,
-44713=>9819,
-44714=>9820,
-44715=>9821,
-44716=>9822,
-44717=>9823,
-44718=>9824,
-44719=>9825,
-44720=>9826,
-44721=>9827,
-44722=>9828,
-44723=>9829,
-44724=>9830,
-44725=>9831,
-44726=>9832,
-44727=>9833,
-44728=>9834,
-44729=>9835,
-44730=>9836,
-44731=>9837,
-44735=>9838,
-44737=>9839,
-44738=>9840,
-44739=>9841,
-44741=>9842,
-44742=>9843,
-44743=>9844,
-44744=>9845,
-44745=>9846,
-44746=>9847,
-44747=>9848,
-44750=>9849,
-44754=>9850,
-44755=>9851,
-44756=>9852,
-44757=>9853,
-44758=>9854,
-44759=>9855,
-44762=>9856,
-44763=>9857,
-44765=>9858,
-44766=>9859,
-44767=>9860,
-44768=>9861,
-44769=>9862,
-44770=>9863,
-44771=>9864,
-44772=>9865,
-44773=>9866,
-44774=>9867,
-44775=>9868,
-44777=>9869,
-44778=>9870,
-44780=>9871,
-44782=>9872,
-44783=>9873,
-44784=>9874,
-44785=>9875,
-44786=>9876,
-44787=>9877,
-44789=>9878,
-44790=>9879,
-44791=>9880,
-44793=>9881,
-44794=>9882,
-44795=>9883,
-44797=>9884,
-44798=>9885,
-44799=>9886,
-44800=>9887,
-44801=>9888,
-44802=>9889,
-44803=>9890,
-44804=>9891,
-44805=>9892,
-44806=>9893,
-44809=>9894,
-44810=>9895,
-44811=>9896,
-44812=>9897,
-44814=>9898,
-44815=>9899,
-44817=>9900,
-44818=>9901,
-44819=>9902,
-44820=>9903,
-44821=>9904,
-44822=>9905,
-44823=>9906,
-44824=>9907,
-44825=>9908,
-44826=>9909,
-44827=>9910,
-44828=>9911,
-44829=>9912,
-44830=>9913,
-44831=>9914,
-44832=>9915,
-44833=>9916,
-44834=>9917,
-44835=>9918,
-44836=>9919,
-44837=>9920,
-44838=>9921,
-44839=>9922,
-44840=>9923,
-44841=>9924,
-44842=>9925,
-44843=>9926,
-44846=>9927,
-44847=>9928,
-44849=>9929,
-44851=>9930,
-44853=>9931,
-44854=>9932,
-44855=>9933,
-44856=>9934,
-44857=>9935,
-44858=>9936,
-44859=>9937,
-44862=>9938,
-44864=>9939,
-44868=>9940,
-44869=>9941,
-44870=>9942,
-44871=>9943,
-44874=>9944,
-44875=>9945,
-44876=>9946,
-44877=>9947,
-44878=>9948,
-44879=>9949,
-44881=>9950,
-44882=>9951,
-44883=>9952,
-44884=>9953,
-44885=>9954,
-44886=>9955,
-44887=>9956,
-44888=>9957,
-44889=>9958,
-44890=>9959,
-44891=>9960,
-44894=>9961,
-44895=>9962,
-44896=>9963,
-44897=>9964,
-44898=>9965,
-44899=>9966,
-44902=>9967,
-44903=>9968,
-44904=>9969,
-44905=>9970,
-44906=>9971,
-44907=>9972,
-44908=>9973,
-44909=>9974,
-44910=>9975,
-44911=>9976,
-44912=>9977,
-44913=>9978,
-44914=>9979,
-44915=>9980,
-44916=>9981,
-44917=>9982,
-44918=>9983,
-44919=>9984,
-44920=>9985,
-44922=>9986,
-44923=>9987,
-44924=>9988,
-44925=>9989,
-44926=>9990,
-44927=>9991,
-44929=>9992,
-44930=>9993,
-44931=>9994,
-44933=>9995,
-44934=>9996,
-44935=>9997,
-44937=>9998,
-44938=>9999,
-44939=>10000,
-44940=>10001,
-44941=>10002,
-44942=>10003,
-44943=>10004,
-44946=>10005,
-44947=>10006,
-44948=>10007,
-44950=>10008,
-44951=>10009,
-44952=>10010,
-44953=>10011,
-44954=>10012,
-44955=>10013,
-44957=>10014,
-44958=>10015,
-44959=>10016,
-44960=>10017,
-44961=>10018,
-44962=>10019,
-44963=>10020,
-44964=>10021,
-44965=>10022,
-44966=>10023,
-44967=>10024,
-44968=>10025,
-44969=>10026,
-44970=>10027,
-44971=>10028,
-44972=>10029,
-44973=>10030,
-44974=>10031,
-44975=>10032,
-44976=>10033,
-44977=>10034,
-44978=>10035,
-44979=>10036,
-44980=>10037,
-44981=>10038,
-44982=>10039,
-44983=>10040,
-44986=>10041,
-44987=>10042,
-44989=>10043,
-44990=>10044,
-44991=>10045,
-44993=>10046,
-44994=>10047,
-44995=>10048,
-44996=>10049,
-44997=>10050,
-44998=>10051,
-45002=>10052,
-45004=>10053,
-45007=>10054,
-45008=>10055,
-45009=>10056,
-45010=>10057,
-45011=>10058,
-45013=>10059,
-45014=>10060,
-45015=>10061,
-45016=>10062,
-45017=>10063,
-45018=>10064,
-45019=>10065,
-45021=>10066,
-45022=>10067,
-45023=>10068,
-45024=>10069,
-45025=>10070,
-45026=>10071,
-45027=>10072,
-45028=>10073,
-45029=>10074,
-45030=>10075,
-45031=>10076,
-45034=>10077,
-45035=>10078,
-45036=>10079,
-45037=>10080,
-45038=>10081,
-45039=>10082,
-45042=>10083,
-45043=>10084,
-45045=>10085,
-45046=>10086,
-45047=>10087,
-45049=>10088,
-45050=>10089,
-45051=>10090,
-45052=>10091,
-45053=>10092,
-45054=>10093,
-45055=>10094,
-45058=>10095,
-45059=>10096,
-45061=>10097,
-45062=>10098,
-45063=>10099,
-45064=>10100,
-45065=>10101,
-45066=>10102,
-45067=>10103,
-45069=>10104,
-45070=>10105,
-45071=>10106,
-45073=>10107,
-45074=>10108,
-45075=>10109,
-45077=>10110,
-45078=>10111,
-45079=>10112,
-45080=>10113,
-45081=>10114,
-45082=>10115,
-45083=>10116,
-45086=>10117,
-45087=>10118,
-45088=>10119,
-45089=>10120,
-45090=>10121,
-45091=>10122,
-45092=>10123,
-45093=>10124,
-45094=>10125,
-45095=>10126,
-45097=>10127,
-45098=>10128,
-45099=>10129,
-45100=>10130,
-45101=>10131,
-45102=>10132,
-45103=>10133,
-45104=>10134,
-45105=>10135,
-45106=>10136,
-45107=>10137,
-45108=>10138,
-45109=>10139,
-45110=>10140,
-45111=>10141,
-45112=>10142,
-45113=>10143,
-45114=>10144,
-45115=>10145,
-45116=>10146,
-45117=>10147,
-45118=>10148,
-45119=>10149,
-45120=>10150,
-45121=>10151,
-45122=>10152,
-45123=>10153,
-45126=>10154,
-45127=>10155,
-45129=>10156,
-45131=>10157,
-45133=>10158,
-45135=>10159,
-45136=>10160,
-45137=>10161,
-45138=>10162,
-45142=>10163,
-45144=>10164,
-45146=>10165,
-45147=>10166,
-45148=>10167,
-45150=>10168,
-45151=>10169,
-45152=>10170,
-45153=>10171,
-45154=>10172,
-45155=>10173,
-45156=>10174,
-45157=>10175,
-45158=>10176,
-45159=>10177,
-45160=>10178,
-45161=>10179,
-45162=>10180,
-45163=>10181,
-45164=>10182,
-45165=>10183,
-45166=>10184,
-45167=>10185,
-45168=>10186,
-45169=>10187,
-45170=>10188,
-45171=>10189,
-45172=>10190,
-45173=>10191,
-45174=>10192,
-45175=>10193,
-45176=>10194,
-45177=>10195,
-45178=>10196,
-45179=>10197,
-45182=>10198,
-45183=>10199,
-45185=>10200,
-45186=>10201,
-45187=>10202,
-45189=>10203,
-45190=>10204,
-45191=>10205,
-45192=>10206,
-45193=>10207,
-45194=>10208,
-45195=>10209,
-45198=>10210,
-45200=>10211,
-45202=>10212,
-45203=>10213,
-45204=>10214,
-45205=>10215,
-45206=>10216,
-45207=>10217,
-45211=>10218,
-45213=>10219,
-45214=>10220,
-45219=>10221,
-45220=>10222,
-45221=>10223,
-45222=>10224,
-45223=>10225,
-45226=>10226,
-45232=>10227,
-45234=>10228,
-45238=>10229,
-45239=>10230,
-45241=>10231,
-45242=>10232,
-45243=>10233,
-45245=>10234,
-45246=>10235,
-45247=>10236,
-45248=>10237,
-45249=>10238,
-45250=>10239,
-45251=>10240,
-45254=>10241,
-45258=>10242,
-45259=>10243,
-45260=>10244,
-45261=>10245,
-45262=>10246,
-45263=>10247,
-45266=>10248,
-45267=>10249,
-45269=>10250,
-45270=>10251,
-45271=>10252,
-45273=>10253,
-45274=>10254,
-45275=>10255,
-45276=>10256,
-45277=>10257,
-45278=>10258,
-45279=>10259,
-45281=>10260,
-45282=>10261,
-45283=>10262,
-45284=>10263,
-45286=>10264,
-45287=>10265,
-45288=>10266,
-45289=>10267,
-45290=>10268,
-45291=>10269,
-45292=>10270,
-45293=>10271,
-45294=>10272,
-45295=>10273,
-45296=>10274,
-45297=>10275,
-45298=>10276,
-45299=>10277,
-45300=>10278,
-45301=>10279,
-45302=>10280,
-45303=>10281,
-45304=>10282,
-45305=>10283,
-45306=>10284,
-45307=>10285,
-45308=>10286,
-45309=>10287,
-45310=>10288,
-45311=>10289,
-45312=>10290,
-45313=>10291,
-45314=>10292,
-45315=>10293,
-45316=>10294,
-45317=>10295,
-45318=>10296,
-45319=>10297,
-45322=>10298,
-45325=>10299,
-45326=>10300,
-45327=>10301,
-45329=>10302,
-45332=>10303,
-45333=>10304,
-45334=>10305,
-45335=>10306,
-45338=>10307,
-45342=>10308,
-45343=>10309,
-45344=>10310,
-45345=>10311,
-45346=>10312,
-45350=>10313,
-45351=>10314,
-45353=>10315,
-45354=>10316,
-45355=>10317,
-45357=>10318,
-45358=>10319,
-45359=>10320,
-45360=>10321,
-45361=>10322,
-45362=>10323,
-45363=>10324,
-45366=>10325,
-45370=>10326,
-45371=>10327,
-45372=>10328,
-45373=>10329,
-45374=>10330,
-45375=>10331,
-45378=>10332,
-45379=>10333,
-45381=>10334,
-45382=>10335,
-45383=>10336,
-45385=>10337,
-45386=>10338,
-45387=>10339,
-45388=>10340,
-45389=>10341,
-45390=>10342,
-45391=>10343,
-45394=>10344,
-45395=>10345,
-45398=>10346,
-45399=>10347,
-45401=>10348,
-45402=>10349,
-45403=>10350,
-45405=>10351,
-45406=>10352,
-45407=>10353,
-45409=>10354,
-45410=>10355,
-45411=>10356,
-45412=>10357,
-45413=>10358,
-45414=>10359,
-45415=>10360,
-45416=>10361,
-45417=>10362,
-45418=>10363,
-45419=>10364,
-45420=>10365,
-45421=>10366,
-45422=>10367,
-45423=>10368,
-45424=>10369,
-45425=>10370,
-45426=>10371,
-45427=>10372,
-45428=>10373,
-45429=>10374,
-45430=>10375,
-45431=>10376,
-45434=>10377,
-45435=>10378,
-45437=>10379,
-45438=>10380,
-45439=>10381,
-45441=>10382,
-45443=>10383,
-45444=>10384,
-45445=>10385,
-45446=>10386,
-45447=>10387,
-45450=>10388,
-45452=>10389,
-45454=>10390,
-45455=>10391,
-45456=>10392,
-45457=>10393,
-45461=>10394,
-45462=>10395,
-45463=>10396,
-45465=>10397,
-45466=>10398,
-45467=>10399,
-45469=>10400,
-45470=>10401,
-45471=>10402,
-45472=>10403,
-45473=>10404,
-45474=>10405,
-45475=>10406,
-45476=>10407,
-45477=>10408,
-45478=>10409,
-45479=>10410,
-45481=>10411,
-45482=>10412,
-45483=>10413,
-45484=>10414,
-45485=>10415,
-45486=>10416,
-45487=>10417,
-45488=>10418,
-45489=>10419,
-45490=>10420,
-45491=>10421,
-45492=>10422,
-45493=>10423,
-45494=>10424,
-45495=>10425,
-45496=>10426,
-45497=>10427,
-45498=>10428,
-45499=>10429,
-45500=>10430,
-45501=>10431,
-45502=>10432,
-45503=>10433,
-45504=>10434,
-45505=>10435,
-45506=>10436,
-45507=>10437,
-45508=>10438,
-45509=>10439,
-45510=>10440,
-45511=>10441,
-45512=>10442,
-45513=>10443,
-45514=>10444,
-45515=>10445,
-45517=>10446,
-45518=>10447,
-45519=>10448,
-45521=>10449,
-45522=>10450,
-45523=>10451,
-45525=>10452,
-45526=>10453,
-45527=>10454,
-45528=>10455,
-45529=>10456,
-45530=>10457,
-45531=>10458,
-45534=>10459,
-45536=>10460,
-45537=>10461,
-45538=>10462,
-45539=>10463,
-45540=>10464,
-45541=>10465,
-45542=>10466,
-45543=>10467,
-45546=>10468,
-45547=>10469,
-45549=>10470,
-45550=>10471,
-45551=>10472,
-45553=>10473,
-45554=>10474,
-45555=>10475,
-45556=>10476,
-45557=>10477,
-45558=>10478,
-45559=>10479,
-45560=>10480,
-45562=>10481,
-45564=>10482,
-45566=>10483,
-45567=>10484,
-45568=>10485,
-45569=>10486,
-45570=>10487,
-45571=>10488,
-45574=>10489,
-45575=>10490,
-45577=>10491,
-45578=>10492,
-45581=>10493,
-45582=>10494,
-45583=>10495,
-45584=>10496,
-45585=>10497,
-45586=>10498,
-45587=>10499,
-45590=>10500,
-45592=>10501,
-45594=>10502,
-45595=>10503,
-45596=>10504,
-45597=>10505,
-45598=>10506,
-45599=>10507,
-45601=>10508,
-45602=>10509,
-45603=>10510,
-45604=>10511,
-45605=>10512,
-45606=>10513,
-45607=>10514,
-45608=>10515,
-45609=>10516,
-45610=>10517,
-45611=>10518,
-45612=>10519,
-45613=>10520,
-45614=>10521,
-45615=>10522,
-45616=>10523,
-45617=>10524,
-45618=>10525,
-45619=>10526,
-45621=>10527,
-45622=>10528,
-45623=>10529,
-45624=>10530,
-45625=>10531,
-45626=>10532,
-45627=>10533,
-45629=>10534,
-45630=>10535,
-45631=>10536,
-45632=>10537,
-45633=>10538,
-45634=>10539,
-45635=>10540,
-45636=>10541,
-45637=>10542,
-45638=>10543,
-45639=>10544,
-45640=>10545,
-45641=>10546,
-45642=>10547,
-45643=>10548,
-45644=>10549,
-45645=>10550,
-45646=>10551,
-45647=>10552,
-45648=>10553,
-45649=>10554,
-45650=>10555,
-45651=>10556,
-45652=>10557,
-45653=>10558,
-45654=>10559,
-45655=>10560,
-45657=>10561,
-45658=>10562,
-45659=>10563,
-45661=>10564,
-45662=>10565,
-45663=>10566,
-45665=>10567,
-45666=>10568,
-45667=>10569,
-45668=>10570,
-45669=>10571,
-45670=>10572,
-45671=>10573,
-45674=>10574,
-45675=>10575,
-45676=>10576,
-45677=>10577,
-45678=>10578,
-45679=>10579,
-45680=>10580,
-45681=>10581,
-45682=>10582,
-45683=>10583,
-45686=>10584,
-45687=>10585,
-45688=>10586,
-45689=>10587,
-45690=>10588,
-45691=>10589,
-45693=>10590,
-45694=>10591,
-45695=>10592,
-45696=>10593,
-45697=>10594,
-45698=>10595,
-45699=>10596,
-45702=>10597,
-45703=>10598,
-45704=>10599,
-45706=>10600,
-45707=>10601,
-45708=>10602,
-45709=>10603,
-45710=>10604,
-45711=>10605,
-45714=>10606,
-45715=>10607,
-45717=>10608,
-45718=>10609,
-45719=>10610,
-45723=>10611,
-45724=>10612,
-45725=>10613,
-45726=>10614,
-45727=>10615,
-45730=>10616,
-45732=>10617,
-45735=>10618,
-45736=>10619,
-45737=>10620,
-45739=>10621,
-45741=>10622,
-45742=>10623,
-45743=>10624,
-45745=>10625,
-45746=>10626,
-45747=>10627,
-45749=>10628,
-45750=>10629,
-45751=>10630,
-45752=>10631,
-45753=>10632,
-45754=>10633,
-45755=>10634,
-45756=>10635,
-45757=>10636,
-45758=>10637,
-45759=>10638,
-45760=>10639,
-45761=>10640,
-45762=>10641,
-45763=>10642,
-45764=>10643,
-45765=>10644,
-45766=>10645,
-45767=>10646,
-45770=>10647,
-45771=>10648,
-45773=>10649,
-45774=>10650,
-45775=>10651,
-45777=>10652,
-45779=>10653,
-45780=>10654,
-45781=>10655,
-45782=>10656,
-45783=>10657,
-45786=>10658,
-45788=>10659,
-45790=>10660,
-45791=>10661,
-45792=>10662,
-45793=>10663,
-45795=>10664,
-45799=>10665,
-45801=>10666,
-45802=>10667,
-45808=>10668,
-45809=>10669,
-45810=>10670,
-45814=>10671,
-45820=>10672,
-45821=>10673,
-45822=>10674,
-45826=>10675,
-45827=>10676,
-45829=>10677,
-45830=>10678,
-45831=>10679,
-45833=>10680,
-45834=>10681,
-45835=>10682,
-45836=>10683,
-45837=>10684,
-45838=>10685,
-45839=>10686,
-45842=>10687,
-45846=>10688,
-45847=>10689,
-45848=>10690,
-45849=>10691,
-45850=>10692,
-45851=>10693,
-45853=>10694,
-45854=>10695,
-45855=>10696,
-45856=>10697,
-45857=>10698,
-45858=>10699,
-45859=>10700,
-45860=>10701,
-45861=>10702,
-45862=>10703,
-45863=>10704,
-45864=>10705,
-45865=>10706,
-45866=>10707,
-45867=>10708,
-45868=>10709,
-45869=>10710,
-45870=>10711,
-45871=>10712,
-45872=>10713,
-45873=>10714,
-45874=>10715,
-45875=>10716,
-45876=>10717,
-45877=>10718,
-45878=>10719,
-45879=>10720,
-45880=>10721,
-45881=>10722,
-45882=>10723,
-45883=>10724,
-45884=>10725,
-45885=>10726,
-45886=>10727,
-45887=>10728,
-45888=>10729,
-45889=>10730,
-45890=>10731,
-45891=>10732,
-45892=>10733,
-45893=>10734,
-45894=>10735,
-45895=>10736,
-45896=>10737,
-45897=>10738,
-45898=>10739,
-45899=>10740,
-45900=>10741,
-45901=>10742,
-45902=>10743,
-45903=>10744,
-45904=>10745,
-45905=>10746,
-45906=>10747,
-45907=>10748,
-45911=>10749,
-45913=>10750,
-45914=>10751,
-45917=>10752,
-45920=>10753,
-45921=>10754,
-45922=>10755,
-45923=>10756,
-45926=>10757,
-45928=>10758,
-45930=>10759,
-45932=>10760,
-45933=>10761,
-45935=>10762,
-45938=>10763,
-45939=>10764,
-45941=>10765,
-45942=>10766,
-45943=>10767,
-45945=>10768,
-45946=>10769,
-45947=>10770,
-45948=>10771,
-45949=>10772,
-45950=>10773,
-45951=>10774,
-45954=>10775,
-45958=>10776,
-45959=>10777,
-45960=>10778,
-45961=>10779,
-45962=>10780,
-45963=>10781,
-45965=>10782,
-45966=>10783,
-45967=>10784,
-45969=>10785,
-45970=>10786,
-45971=>10787,
-45973=>10788,
-45974=>10789,
-45975=>10790,
-45976=>10791,
-45977=>10792,
-45978=>10793,
-45979=>10794,
-45980=>10795,
-45981=>10796,
-45982=>10797,
-45983=>10798,
-45986=>10799,
-45987=>10800,
-45988=>10801,
-45989=>10802,
-45990=>10803,
-45991=>10804,
-45993=>10805,
-45994=>10806,
-45995=>10807,
-45997=>10808,
-45998=>10809,
-45999=>10810,
-46000=>10811,
-46001=>10812,
-46002=>10813,
-46003=>10814,
-46004=>10815,
-46005=>10816,
-46006=>10817,
-46007=>10818,
-46008=>10819,
-46009=>10820,
-46010=>10821,
-46011=>10822,
-46012=>10823,
-46013=>10824,
-46014=>10825,
-46015=>10826,
-46016=>10827,
-46017=>10828,
-46018=>10829,
-46019=>10830,
-46022=>10831,
-46023=>10832,
-46025=>10833,
-46026=>10834,
-46029=>10835,
-46031=>10836,
-46033=>10837,
-46034=>10838,
-46035=>10839,
-46038=>10840,
-46040=>10841,
-46042=>10842,
-46044=>10843,
-46046=>10844,
-46047=>10845,
-46049=>10846,
-46050=>10847,
-46051=>10848,
-46053=>10849,
-46054=>10850,
-46055=>10851,
-46057=>10852,
-46058=>10853,
-46059=>10854,
-46060=>10855,
-46061=>10856,
-46062=>10857,
-46063=>10858,
-46064=>10859,
-46065=>10860,
-46066=>10861,
-46067=>10862,
-46068=>10863,
-46069=>10864,
-46070=>10865,
-46071=>10866,
-46072=>10867,
-46073=>10868,
-46074=>10869,
-46075=>10870,
-46077=>10871,
-46078=>10872,
-46079=>10873,
-46080=>10874,
-46081=>10875,
-46082=>10876,
-46083=>10877,
-46084=>10878,
-46085=>10879,
-46086=>10880,
-46087=>10881,
-46088=>10882,
-46089=>10883,
-46090=>10884,
-46091=>10885,
-46092=>10886,
-46093=>10887,
-46094=>10888,
-46095=>10889,
-46097=>10890,
-46098=>10891,
-46099=>10892,
-46100=>10893,
-46101=>10894,
-46102=>10895,
-46103=>10896,
-46105=>10897,
-46106=>10898,
-46107=>10899,
-46109=>10900,
-46110=>10901,
-46111=>10902,
-46113=>10903,
-46114=>10904,
-46115=>10905,
-46116=>10906,
-46117=>10907,
-46118=>10908,
-46119=>10909,
-46122=>10910,
-46124=>10911,
-46125=>10912,
-46126=>10913,
-46127=>10914,
-46128=>10915,
-46129=>10916,
-46130=>10917,
-46131=>10918,
-46133=>10919,
-46134=>10920,
-46135=>10921,
-46136=>10922,
-46137=>10923,
-46138=>10924,
-46139=>10925,
-46140=>10926,
-46141=>10927,
-46142=>10928,
-46143=>10929,
-46144=>10930,
-46145=>10931,
-46146=>10932,
-46147=>10933,
-46148=>10934,
-46149=>10935,
-46150=>10936,
-46151=>10937,
-46152=>10938,
-46153=>10939,
-46154=>10940,
-46155=>10941,
-46156=>10942,
-46157=>10943,
-46158=>10944,
-46159=>10945,
-46162=>10946,
-46163=>10947,
-46165=>10948,
-46166=>10949,
-46167=>10950,
-46169=>10951,
-46170=>10952,
-46171=>10953,
-46172=>10954,
-46173=>10955,
-46174=>10956,
-46175=>10957,
-46178=>10958,
-46180=>10959,
-46182=>10960,
-46183=>10961,
-46184=>10962,
-46185=>10963,
-46186=>10964,
-46187=>10965,
-46189=>10966,
-46190=>10967,
-46191=>10968,
-46192=>10969,
-46193=>10970,
-46194=>10971,
-46195=>10972,
-46196=>10973,
-46197=>10974,
-46198=>10975,
-46199=>10976,
-46200=>10977,
-46201=>10978,
-46202=>10979,
-46203=>10980,
-46204=>10981,
-46205=>10982,
-46206=>10983,
-46207=>10984,
-46209=>10985,
-46210=>10986,
-46211=>10987,
-46212=>10988,
-46213=>10989,
-46214=>10990,
-46215=>10991,
-46217=>10992,
-46218=>10993,
-46219=>10994,
-46220=>10995,
-46221=>10996,
-46222=>10997,
-46223=>10998,
-46224=>10999,
-46225=>11000,
-46226=>11001,
-46227=>11002,
-46228=>11003,
-46229=>11004,
-46230=>11005,
-46231=>11006,
-46232=>11007,
-46233=>11008,
-46234=>11009,
-46235=>11010,
-46236=>11011,
-46238=>11012,
-46239=>11013,
-46240=>11014,
-46241=>11015,
-46242=>11016,
-46243=>11017,
-46245=>11018,
-46246=>11019,
-46247=>11020,
-46249=>11021,
-46250=>11022,
-46251=>11023,
-46253=>11024,
-46254=>11025,
-46255=>11026,
-46256=>11027,
-46257=>11028,
-46258=>11029,
-46259=>11030,
-46260=>11031,
-46262=>11032,
-46264=>11033,
-46266=>11034,
-46267=>11035,
-46268=>11036,
-46269=>11037,
-46270=>11038,
-46271=>11039,
-46273=>11040,
-46274=>11041,
-46275=>11042,
-46277=>11043,
-46278=>11044,
-46279=>11045,
-46281=>11046,
-46282=>11047,
-46283=>11048,
-46284=>11049,
-46285=>11050,
-46286=>11051,
-46287=>11052,
-46289=>11053,
-46290=>11054,
-46291=>11055,
-46292=>11056,
-46294=>11057,
-46295=>11058,
-46296=>11059,
-46297=>11060,
-46298=>11061,
-46299=>11062,
-46302=>11063,
-46303=>11064,
-46305=>11065,
-46306=>11066,
-46309=>11067,
-46311=>11068,
-46312=>11069,
-46313=>11070,
-46314=>11071,
-46315=>11072,
-46318=>11073,
-46320=>11074,
-46322=>11075,
-46323=>11076,
-46324=>11077,
-46325=>11078,
-46326=>11079,
-46327=>11080,
-46329=>11081,
-46330=>11082,
-46331=>11083,
-46332=>11084,
-46333=>11085,
-46334=>11086,
-46335=>11087,
-46336=>11088,
-46337=>11089,
-46338=>11090,
-46339=>11091,
-46340=>11092,
-46341=>11093,
-46342=>11094,
-46343=>11095,
-46344=>11096,
-46345=>11097,
-46346=>11098,
-46347=>11099,
-46348=>11100,
-46349=>11101,
-46350=>11102,
-46351=>11103,
-46352=>11104,
-46353=>11105,
-46354=>11106,
-46355=>11107,
-46358=>11108,
-46359=>11109,
-46361=>11110,
-46362=>11111,
-46365=>11112,
-46366=>11113,
-46367=>11114,
-46368=>11115,
-46369=>11116,
-46370=>11117,
-46371=>11118,
-46374=>11119,
-46379=>11120,
-46380=>11121,
-46381=>11122,
-46382=>11123,
-46383=>11124,
-46386=>11125,
-46387=>11126,
-46389=>11127,
-46390=>11128,
-46391=>11129,
-46393=>11130,
-46394=>11131,
-46395=>11132,
-46396=>11133,
-46397=>11134,
-46398=>11135,
-46399=>11136,
-46402=>11137,
-46406=>11138,
-46407=>11139,
-46408=>11140,
-46409=>11141,
-46410=>11142,
-46414=>11143,
-46415=>11144,
-46417=>11145,
-46418=>11146,
-46419=>11147,
-46421=>11148,
-46422=>11149,
-46423=>11150,
-46424=>11151,
-46425=>11152,
-46426=>11153,
-46427=>11154,
-46430=>11155,
-46434=>11156,
-46435=>11157,
-46436=>11158,
-46437=>11159,
-46438=>11160,
-46439=>11161,
-46440=>11162,
-46441=>11163,
-46442=>11164,
-46443=>11165,
-46444=>11166,
-46445=>11167,
-46446=>11168,
-46447=>11169,
-46448=>11170,
-46449=>11171,
-46450=>11172,
-46451=>11173,
-46452=>11174,
-46453=>11175,
-46454=>11176,
-46455=>11177,
-46456=>11178,
-46457=>11179,
-46458=>11180,
-46459=>11181,
-46460=>11182,
-46461=>11183,
-46462=>11184,
-46463=>11185,
-46464=>11186,
-46465=>11187,
-46466=>11188,
-46467=>11189,
-46468=>11190,
-46469=>11191,
-46470=>11192,
-46471=>11193,
-46472=>11194,
-46473=>11195,
-46474=>11196,
-46475=>11197,
-46476=>11198,
-46477=>11199,
-46478=>11200,
-46479=>11201,
-46480=>11202,
-46481=>11203,
-46482=>11204,
-46483=>11205,
-46484=>11206,
-46485=>11207,
-46486=>11208,
-46487=>11209,
-46488=>11210,
-46489=>11211,
-46490=>11212,
-46491=>11213,
-46492=>11214,
-46493=>11215,
-46494=>11216,
-46495=>11217,
-46498=>11218,
-46499=>11219,
-46501=>11220,
-46502=>11221,
-46503=>11222,
-46505=>11223,
-46508=>11224,
-46509=>11225,
-46510=>11226,
-46511=>11227,
-46514=>11228,
-46518=>11229,
-46519=>11230,
-46520=>11231,
-46521=>11232,
-46522=>11233,
-46526=>11234,
-46527=>11235,
-46529=>11236,
-46530=>11237,
-46531=>11238,
-46533=>11239,
-46534=>11240,
-46535=>11241,
-46536=>11242,
-46537=>11243,
-46538=>11244,
-46539=>11245,
-46542=>11246,
-46546=>11247,
-46547=>11248,
-46548=>11249,
-46549=>11250,
-46550=>11251,
-46551=>11252,
-46553=>11253,
-46554=>11254,
-46555=>11255,
-46556=>11256,
-46557=>11257,
-46558=>11258,
-46559=>11259,
-46560=>11260,
-46561=>11261,
-46562=>11262,
-46563=>11263,
-46564=>11264,
-46565=>11265,
-46566=>11266,
-46567=>11267,
-46568=>11268,
-46569=>11269,
-46570=>11270,
-46571=>11271,
-46573=>11272,
-46574=>11273,
-46575=>11274,
-46576=>11275,
-46577=>11276,
-46578=>11277,
-46579=>11278,
-46580=>11279,
-46581=>11280,
-46582=>11281,
-46583=>11282,
-46584=>11283,
-46585=>11284,
-46586=>11285,
-46587=>11286,
-46588=>11287,
-46589=>11288,
-46590=>11289,
-46591=>11290,
-46592=>11291,
-46593=>11292,
-46594=>11293,
-46595=>11294,
-46596=>11295,
-46597=>11296,
-46598=>11297,
-46599=>11298,
-46600=>11299,
-46601=>11300,
-46602=>11301,
-46603=>11302,
-46604=>11303,
-46605=>11304,
-46606=>11305,
-46607=>11306,
-46610=>11307,
-46611=>11308,
-46613=>11309,
-46614=>11310,
-46615=>11311,
-46617=>11312,
-46618=>11313,
-46619=>11314,
-46620=>11315,
-46621=>11316,
-46622=>11317,
-46623=>11318,
-46624=>11319,
-46625=>11320,
-46626=>11321,
-46627=>11322,
-46628=>11323,
-46630=>11324,
-46631=>11325,
-46632=>11326,
-46633=>11327,
-46634=>11328,
-46635=>11329,
-46637=>11330,
-46638=>11331,
-46639=>11332,
-46640=>11333,
-46641=>11334,
-46642=>11335,
-46643=>11336,
-46645=>11337,
-46646=>11338,
-46647=>11339,
-46648=>11340,
-46649=>11341,
-46650=>11342,
-46651=>11343,
-46652=>11344,
-46653=>11345,
-46654=>11346,
-46655=>11347,
-46656=>11348,
-46657=>11349,
-46658=>11350,
-46659=>11351,
-46660=>11352,
-46661=>11353,
-46662=>11354,
-46663=>11355,
-46665=>11356,
-46666=>11357,
-46667=>11358,
-46668=>11359,
-46669=>11360,
-46670=>11361,
-46671=>11362,
-46672=>11363,
-46673=>11364,
-46674=>11365,
-46675=>11366,
-46676=>11367,
-46677=>11368,
-46678=>11369,
-46679=>11370,
-46680=>11371,
-46681=>11372,
-46682=>11373,
-46683=>11374,
-46684=>11375,
-46685=>11376,
-46686=>11377,
-46687=>11378,
-46688=>11379,
-46689=>11380,
-46690=>11381,
-46691=>11382,
-46693=>11383,
-46694=>11384,
-46695=>11385,
-46697=>11386,
-46698=>11387,
-46699=>11388,
-46700=>11389,
-46701=>11390,
-46702=>11391,
-46703=>11392,
-46704=>11393,
-46705=>11394,
-46706=>11395,
-46707=>11396,
-46708=>11397,
-46709=>11398,
-46710=>11399,
-46711=>11400,
-46712=>11401,
-46713=>11402,
-46714=>11403,
-46715=>11404,
-46716=>11405,
-46717=>11406,
-46718=>11407,
-46719=>11408,
-46720=>11409,
-46721=>11410,
-46722=>11411,
-46723=>11412,
-46724=>11413,
-46725=>11414,
-46726=>11415,
-46727=>11416,
-46728=>11417,
-46729=>11418,
-46730=>11419,
-46731=>11420,
-46732=>11421,
-46733=>11422,
-46734=>11423,
-46735=>11424,
-46736=>11425,
-46737=>11426,
-46738=>11427,
-46739=>11428,
-46740=>11429,
-46741=>11430,
-46742=>11431,
-46743=>11432,
-46744=>11433,
-46745=>11434,
-46746=>11435,
-46747=>11436,
-46750=>11437,
-46751=>11438,
-46753=>11439,
-46754=>11440,
-46755=>11441,
-46757=>11442,
-46758=>11443,
-46759=>11444,
-46760=>11445,
-46761=>11446,
-46762=>11447,
-46765=>11448,
-46766=>11449,
-46767=>11450,
-46768=>11451,
-46770=>11452,
-46771=>11453,
-46772=>11454,
-46773=>11455,
-46774=>11456,
-46775=>11457,
-46776=>11458,
-46777=>11459,
-46778=>11460,
-46779=>11461,
-46780=>11462,
-46781=>11463,
-46782=>11464,
-46783=>11465,
-46784=>11466,
-46785=>11467,
-46786=>11468,
-46787=>11469,
-46788=>11470,
-46789=>11471,
-46790=>11472,
-46791=>11473,
-46792=>11474,
-46793=>11475,
-46794=>11476,
-46795=>11477,
-46796=>11478,
-46797=>11479,
-46798=>11480,
-46799=>11481,
-46800=>11482,
-46801=>11483,
-46802=>11484,
-46803=>11485,
-46805=>11486,
-46806=>11487,
-46807=>11488,
-46808=>11489,
-46809=>11490,
-46810=>11491,
-46811=>11492,
-46812=>11493,
-46813=>11494,
-46814=>11495,
-46815=>11496,
-46816=>11497,
-46817=>11498,
-46818=>11499,
-46819=>11500,
-46820=>11501,
-46821=>11502,
-46822=>11503,
-46823=>11504,
-46824=>11505,
-46825=>11506,
-46826=>11507,
-46827=>11508,
-46828=>11509,
-46829=>11510,
-46830=>11511,
-46831=>11512,
-46833=>11513,
-46834=>11514,
-46835=>11515,
-46837=>11516,
-46838=>11517,
-46839=>11518,
-46841=>11519,
-46842=>11520,
-46843=>11521,
-46844=>11522,
-46845=>11523,
-46846=>11524,
-46847=>11525,
-46850=>11526,
-46851=>11527,
-46852=>11528,
-46854=>11529,
-46855=>11530,
-46856=>11531,
-46857=>11532,
-46858=>11533,
-46859=>11534,
-46860=>11535,
-46861=>11536,
-46862=>11537,
-46863=>11538,
-46864=>11539,
-46865=>11540,
-46866=>11541,
-46867=>11542,
-46868=>11543,
-46869=>11544,
-46870=>11545,
-46871=>11546,
-46872=>11547,
-46873=>11548,
-46874=>11549,
-46875=>11550,
-46876=>11551,
-46877=>11552,
-46878=>11553,
-46879=>11554,
-46880=>11555,
-46881=>11556,
-46882=>11557,
-46883=>11558,
-46884=>11559,
-46885=>11560,
-46886=>11561,
-46887=>11562,
-46890=>11563,
-46891=>11564,
-46893=>11565,
-46894=>11566,
-46897=>11567,
-46898=>11568,
-46899=>11569,
-46900=>11570,
-46901=>11571,
-46902=>11572,
-46903=>11573,
-46906=>11574,
-46908=>11575,
-46909=>11576,
-46910=>11577,
-46911=>11578,
-46912=>11579,
-46913=>11580,
-46914=>11581,
-46915=>11582,
-46917=>11583,
-46918=>11584,
-46919=>11585,
-46921=>11586,
-46922=>11587,
-46923=>11588,
-46925=>11589,
-46926=>11590,
-46927=>11591,
-46928=>11592,
-46929=>11593,
-46930=>11594,
-46931=>11595,
-46934=>11596,
-46935=>11597,
-46936=>11598,
-46937=>11599,
-46938=>11600,
-46939=>11601,
-46940=>11602,
-46941=>11603,
-46942=>11604,
-46943=>11605,
-46945=>11606,
-46946=>11607,
-46947=>11608,
-46949=>11609,
-46950=>11610,
-46951=>11611,
-46953=>11612,
-46954=>11613,
-46955=>11614,
-46956=>11615,
-46957=>11616,
-46958=>11617,
-46959=>11618,
-46962=>11619,
-46964=>11620,
-46966=>11621,
-46967=>11622,
-46968=>11623,
-46969=>11624,
-46970=>11625,
-46971=>11626,
-46974=>11627,
-46975=>11628,
-46977=>11629,
-46978=>11630,
-46979=>11631,
-46981=>11632,
-46982=>11633,
-46983=>11634,
-46984=>11635,
-46985=>11636,
-46986=>11637,
-46987=>11638,
-46990=>11639,
-46995=>11640,
-46996=>11641,
-46997=>11642,
-47002=>11643,
-47003=>11644,
-47005=>11645,
-47006=>11646,
-47007=>11647,
-47009=>11648,
-47010=>11649,
-47011=>11650,
-47012=>11651,
-47013=>11652,
-47014=>11653,
-47015=>11654,
-47018=>11655,
-47022=>11656,
-47023=>11657,
-47024=>11658,
-47025=>11659,
-47026=>11660,
-47027=>11661,
-47030=>11662,
-47031=>11663,
-47033=>11664,
-47034=>11665,
-47035=>11666,
-47036=>11667,
-47037=>11668,
-47038=>11669,
-47039=>11670,
-47040=>11671,
-47041=>11672,
-47042=>11673,
-47043=>11674,
-47044=>11675,
-47045=>11676,
-47046=>11677,
-47048=>11678,
-47050=>11679,
-47051=>11680,
-47052=>11681,
-47053=>11682,
-47054=>11683,
-47055=>11684,
-47056=>11685,
-47057=>11686,
-47058=>11687,
-47059=>11688,
-47060=>11689,
-47061=>11690,
-47062=>11691,
-47063=>11692,
-47064=>11693,
-47065=>11694,
-47066=>11695,
-47067=>11696,
-47068=>11697,
-47069=>11698,
-47070=>11699,
-47071=>11700,
-47072=>11701,
-47073=>11702,
-47074=>11703,
-47075=>11704,
-47076=>11705,
-47077=>11706,
-47078=>11707,
-47079=>11708,
-47080=>11709,
-47081=>11710,
-47082=>11711,
-47083=>11712,
-47086=>11713,
-47087=>11714,
-47089=>11715,
-47090=>11716,
-47091=>11717,
-47093=>11718,
-47094=>11719,
-47095=>11720,
-47096=>11721,
-47097=>11722,
-47098=>11723,
-47099=>11724,
-47102=>11725,
-47106=>11726,
-47107=>11727,
-47108=>11728,
-47109=>11729,
-47110=>11730,
-47114=>11731,
-47115=>11732,
-47117=>11733,
-47118=>11734,
-47119=>11735,
-47121=>11736,
-47122=>11737,
-47123=>11738,
-47124=>11739,
-47125=>11740,
-47126=>11741,
-47127=>11742,
-47130=>11743,
-47132=>11744,
-47134=>11745,
-47135=>11746,
-47136=>11747,
-47137=>11748,
-47138=>11749,
-47139=>11750,
-47142=>11751,
-47143=>11752,
-47145=>11753,
-47146=>11754,
-47147=>11755,
-47149=>11756,
-47150=>11757,
-47151=>11758,
-47152=>11759,
-47153=>11760,
-47154=>11761,
-47155=>11762,
-47158=>11763,
-47162=>11764,
-47163=>11765,
-47164=>11766,
-47165=>11767,
-47166=>11768,
-47167=>11769,
-47169=>11770,
-47170=>11771,
-47171=>11772,
-47173=>11773,
-47174=>11774,
-47175=>11775,
-47176=>11776,
-47177=>11777,
-47178=>11778,
-47179=>11779,
-47180=>11780,
-47181=>11781,
-47182=>11782,
-47183=>11783,
-47184=>11784,
-47186=>11785,
-47188=>11786,
-47189=>11787,
-47190=>11788,
-47191=>11789,
-47192=>11790,
-47193=>11791,
-47194=>11792,
-47195=>11793,
-47198=>11794,
-47199=>11795,
-47201=>11796,
-47202=>11797,
-47203=>11798,
-47205=>11799,
-47206=>11800,
-47207=>11801,
-47208=>11802,
-47209=>11803,
-47210=>11804,
-47211=>11805,
-47214=>11806,
-47216=>11807,
-47218=>11808,
-47219=>11809,
-47220=>11810,
-47221=>11811,
-47222=>11812,
-47223=>11813,
-47225=>11814,
-47226=>11815,
-47227=>11816,
-47229=>11817,
-47230=>11818,
-47231=>11819,
-47232=>11820,
-47233=>11821,
-47234=>11822,
-47235=>11823,
-47236=>11824,
-47237=>11825,
-47238=>11826,
-47239=>11827,
-47240=>11828,
-47241=>11829,
-47242=>11830,
-47243=>11831,
-47244=>11832,
-47246=>11833,
-47247=>11834,
-47248=>11835,
-47249=>11836,
-47250=>11837,
-47251=>11838,
-47252=>11839,
-47253=>11840,
-47254=>11841,
-47255=>11842,
-47256=>11843,
-47257=>11844,
-47258=>11845,
-47259=>11846,
-47260=>11847,
-47261=>11848,
-47262=>11849,
-47263=>11850,
-47264=>11851,
-47265=>11852,
-47266=>11853,
-47267=>11854,
-47268=>11855,
-47269=>11856,
-47270=>11857,
-47271=>11858,
-47273=>11859,
-47274=>11860,
-47275=>11861,
-47276=>11862,
-47277=>11863,
-47278=>11864,
-47279=>11865,
-47281=>11866,
-47282=>11867,
-47283=>11868,
-47285=>11869,
-47286=>11870,
-47287=>11871,
-47289=>11872,
-47290=>11873,
-47291=>11874,
-47292=>11875,
-47293=>11876,
-47294=>11877,
-47295=>11878,
-47298=>11879,
-47300=>11880,
-47302=>11881,
-47303=>11882,
-47304=>11883,
-47305=>11884,
-47306=>11885,
-47307=>11886,
-47309=>11887,
-47310=>11888,
-47311=>11889,
-47313=>11890,
-47314=>11891,
-47315=>11892,
-47317=>11893,
-47318=>11894,
-47319=>11895,
-47320=>11896,
-47321=>11897,
-47322=>11898,
-47323=>11899,
-47324=>11900,
-47326=>11901,
-47328=>11902,
-47330=>11903,
-47331=>11904,
-47332=>11905,
-47333=>11906,
-47334=>11907,
-47335=>11908,
-47338=>11909,
-47339=>11910,
-47341=>11911,
-47342=>11912,
-47343=>11913,
-47345=>11914,
-47346=>11915,
-47347=>11916,
-47348=>11917,
-47349=>11918,
-47350=>11919,
-47351=>11920,
-47354=>11921,
-47356=>11922,
-47358=>11923,
-47359=>11924,
-47360=>11925,
-47361=>11926,
-47362=>11927,
-47363=>11928,
-47365=>11929,
-47366=>11930,
-47367=>11931,
-47368=>11932,
-47369=>11933,
-47370=>11934,
-47371=>11935,
-47372=>11936,
-47373=>11937,
-47374=>11938,
-47375=>11939,
-47376=>11940,
-47377=>11941,
-47378=>11942,
-47379=>11943,
-47380=>11944,
-47381=>11945,
-47382=>11946,
-47383=>11947,
-47385=>11948,
-47386=>11949,
-47387=>11950,
-47388=>11951,
-47389=>11952,
-47390=>11953,
-47391=>11954,
-47393=>11955,
-47394=>11956,
-47395=>11957,
-47396=>11958,
-47397=>11959,
-47398=>11960,
-47399=>11961,
-47400=>11962,
-47401=>11963,
-47402=>11964,
-47403=>11965,
-47404=>11966,
-47405=>11967,
-47406=>11968,
-47407=>11969,
-47408=>11970,
-47409=>11971,
-47410=>11972,
-47411=>11973,
-47412=>11974,
-47413=>11975,
-47414=>11976,
-47415=>11977,
-47416=>11978,
-47417=>11979,
-47418=>11980,
-47419=>11981,
-47422=>11982,
-47423=>11983,
-47425=>11984,
-47426=>11985,
-47427=>11986,
-47429=>11987,
-47430=>11988,
-47431=>11989,
-47432=>11990,
-47433=>11991,
-47434=>11992,
-47435=>11993,
-47437=>11994,
-47438=>11995,
-47440=>11996,
-47442=>11997,
-47443=>11998,
-47444=>11999,
-47445=>12000,
-47446=>12001,
-47447=>12002,
-47450=>12003,
-47451=>12004,
-47453=>12005,
-47454=>12006,
-47455=>12007,
-47457=>12008,
-47458=>12009,
-47459=>12010,
-47460=>12011,
-47461=>12012,
-47462=>12013,
-47463=>12014,
-47466=>12015,
-47468=>12016,
-47470=>12017,
-47471=>12018,
-47472=>12019,
-47473=>12020,
-47474=>12021,
-47475=>12022,
-47478=>12023,
-47479=>12024,
-47481=>12025,
-47482=>12026,
-47483=>12027,
-47485=>12028,
-47486=>12029,
-47487=>12030,
-47488=>12031,
-47489=>12032,
-47490=>12033,
-47491=>12034,
-47494=>12035,
-47496=>12036,
-47499=>12037,
-47500=>12038,
-47503=>12039,
-47504=>12040,
-47505=>12041,
-47506=>12042,
-47507=>12043,
-47508=>12044,
-47509=>12045,
-47510=>12046,
-47511=>12047,
-47512=>12048,
-47513=>12049,
-47514=>12050,
-47515=>12051,
-47516=>12052,
-47517=>12053,
-47518=>12054,
-47519=>12055,
-47520=>12056,
-47521=>12057,
-47522=>12058,
-47523=>12059,
-47524=>12060,
-47525=>12061,
-47526=>12062,
-47527=>12063,
-47528=>12064,
-47529=>12065,
-47530=>12066,
-47531=>12067,
-47534=>12068,
-47535=>12069,
-47537=>12070,
-47538=>12071,
-47539=>12072,
-47541=>12073,
-47542=>12074,
-47543=>12075,
-47544=>12076,
-47545=>12077,
-47546=>12078,
-47547=>12079,
-47550=>12080,
-47552=>12081,
-47554=>12082,
-47555=>12083,
-47556=>12084,
-47557=>12085,
-47558=>12086,
-47559=>12087,
-47562=>12088,
-47563=>12089,
-47565=>12090,
-47571=>12091,
-47572=>12092,
-47573=>12093,
-47574=>12094,
-47575=>12095,
-47578=>12096,
-47580=>12097,
-47583=>12098,
-47584=>12099,
-47586=>12100,
-47590=>12101,
-47591=>12102,
-47593=>12103,
-47594=>12104,
-47595=>12105,
-47597=>12106,
-47598=>12107,
-47599=>12108,
-47600=>12109,
-47601=>12110,
-47602=>12111,
-47603=>12112,
-47606=>12113,
-47611=>12114,
-47612=>12115,
-47613=>12116,
-47614=>12117,
-47615=>12118,
-47618=>12119,
-47619=>12120,
-47620=>12121,
-47621=>12122,
-47622=>12123,
-47623=>12124,
-47625=>12125,
-47626=>12126,
-47627=>12127,
-47628=>12128,
-47629=>12129,
-47630=>12130,
-47631=>12131,
-47632=>12132,
-47633=>12133,
-47634=>12134,
-47635=>12135,
-47636=>12136,
-47638=>12137,
-47639=>12138,
-47640=>12139,
-47641=>12140,
-47642=>12141,
-47643=>12142,
-47644=>12143,
-47645=>12144,
-47646=>12145,
-47647=>12146,
-47648=>12147,
-47649=>12148,
-47650=>12149,
-47651=>12150,
-47652=>12151,
-47653=>12152,
-47654=>12153,
-47655=>12154,
-47656=>12155,
-47657=>12156,
-47658=>12157,
-47659=>12158,
-47660=>12159,
-47661=>12160,
-47662=>12161,
-47663=>12162,
-47664=>12163,
-47665=>12164,
-47666=>12165,
-47667=>12166,
-47668=>12167,
-47669=>12168,
-47670=>12169,
-47671=>12170,
-47674=>12171,
-47675=>12172,
-47677=>12173,
-47678=>12174,
-47679=>12175,
-47681=>12176,
-47683=>12177,
-47684=>12178,
-47685=>12179,
-47686=>12180,
-47687=>12181,
-47690=>12182,
-47692=>12183,
-47695=>12184,
-47696=>12185,
-47697=>12186,
-47698=>12187,
-47702=>12188,
-47703=>12189,
-47705=>12190,
-47706=>12191,
-47707=>12192,
-47709=>12193,
-47710=>12194,
-47711=>12195,
-47712=>12196,
-47713=>12197,
-47714=>12198,
-47715=>12199,
-47718=>12200,
-47722=>12201,
-47723=>12202,
-47724=>12203,
-47725=>12204,
-47726=>12205,
-47727=>12206,
-47730=>12207,
-47731=>12208,
-47733=>12209,
-47734=>12210,
-47735=>12211,
-47737=>12212,
-47738=>12213,
-47739=>12214,
-47740=>12215,
-47741=>12216,
-47742=>12217,
-47743=>12218,
-47744=>12219,
-47745=>12220,
-47746=>12221,
-47750=>12222,
-47752=>12223,
-47753=>12224,
-47754=>12225,
-47755=>12226,
-47757=>12227,
-47758=>12228,
-47759=>12229,
-47760=>12230,
-47761=>12231,
-47762=>12232,
-47763=>12233,
-47764=>12234,
-47765=>12235,
-47766=>12236,
-47767=>12237,
-47768=>12238,
-47769=>12239,
-47770=>12240,
-47771=>12241,
-47772=>12242,
-47773=>12243,
-47774=>12244,
-47775=>12245,
-47776=>12246,
-47777=>12247,
-47778=>12248,
-47779=>12249,
-47780=>12250,
-47781=>12251,
-47782=>12252,
-47783=>12253,
-47786=>12254,
-47789=>12255,
-47790=>12256,
-47791=>12257,
-47793=>12258,
-47795=>12259,
-47796=>12260,
-47797=>12261,
-47798=>12262,
-47799=>12263,
-47802=>12264,
-47804=>12265,
-47806=>12266,
-47807=>12267,
-47808=>12268,
-47809=>12269,
-47810=>12270,
-47811=>12271,
-47813=>12272,
-47814=>12273,
-47815=>12274,
-47817=>12275,
-47818=>12276,
-47819=>12277,
-47820=>12278,
-47821=>12279,
-47822=>12280,
-47823=>12281,
-47824=>12282,
-47825=>12283,
-47826=>12284,
-47827=>12285,
-47828=>12286,
-47829=>12287,
-47830=>12288,
-47831=>12289,
-47834=>12290,
-47835=>12291,
-47836=>12292,
-47837=>12293,
-47838=>12294,
-47839=>12295,
-47840=>12296,
-47841=>12297,
-47842=>12298,
-47843=>12299,
-47844=>12300,
-47845=>12301,
-47846=>12302,
-47847=>12303,
-47848=>12304,
-47849=>12305,
-47850=>12306,
-47851=>12307,
-47852=>12308,
-47853=>12309,
-47854=>12310,
-47855=>12311,
-47856=>12312,
-47857=>12313,
-47858=>12314,
-47859=>12315,
-47860=>12316,
-47861=>12317,
-47862=>12318,
-47863=>12319,
-47864=>12320,
-47865=>12321,
-47866=>12322,
-47867=>12323,
-47869=>12324,
-47870=>12325,
-47871=>12326,
-47873=>12327,
-47874=>12328,
-47875=>12329,
-47877=>12330,
-47878=>12331,
-47879=>12332,
-47880=>12333,
-47881=>12334,
-47882=>12335,
-47883=>12336,
-47884=>12337,
-47886=>12338,
-47888=>12339,
-47890=>12340,
-47891=>12341,
-47892=>12342,
-47893=>12343,
-47894=>12344,
-47895=>12345,
-47897=>12346,
-47898=>12347,
-47899=>12348,
-47901=>12349,
-47902=>12350,
-47903=>12351,
-47905=>12352,
-47906=>12353,
-47907=>12354,
-47908=>12355,
-47909=>12356,
-47910=>12357,
-47911=>12358,
-47912=>12359,
-47914=>12360,
-47916=>12361,
-47917=>12362,
-47918=>12363,
-47919=>12364,
-47920=>12365,
-47921=>12366,
-47922=>12367,
-47923=>12368,
-47927=>12369,
-47929=>12370,
-47930=>12371,
-47935=>12372,
-47936=>12373,
-47937=>12374,
-47938=>12375,
-47939=>12376,
-47942=>12377,
-47944=>12378,
-47946=>12379,
-47947=>12380,
-47948=>12381,
-47950=>12382,
-47953=>12383,
-47954=>12384,
-47955=>12385,
-47957=>12386,
-47958=>12387,
-47959=>12388,
-47961=>12389,
-47962=>12390,
-47963=>12391,
-47964=>12392,
-47965=>12393,
-47966=>12394,
-47967=>12395,
-47968=>12396,
-47970=>12397,
-47972=>12398,
-47973=>12399,
-47974=>12400,
-47975=>12401,
-47976=>12402,
-47977=>12403,
-47978=>12404,
-47979=>12405,
-47981=>12406,
-47982=>12407,
-47983=>12408,
-47984=>12409,
-47985=>12410,
-47986=>12411,
-47987=>12412,
-47988=>12413,
-47989=>12414,
-47990=>12415,
-47991=>12416,
-47992=>12417,
-47993=>12418,
-47994=>12419,
-47995=>12420,
-47996=>12421,
-47997=>12422,
-47998=>12423,
-47999=>12424,
-48000=>12425,
-48001=>12426,
-48002=>12427,
-48003=>12428,
-48004=>12429,
-48005=>12430,
-48006=>12431,
-48007=>12432,
-48009=>12433,
-48010=>12434,
-48011=>12435,
-48013=>12436,
-48014=>12437,
-48015=>12438,
-48017=>12439,
-48018=>12440,
-48019=>12441,
-48020=>12442,
-48021=>12443,
-48022=>12444,
-48023=>12445,
-48024=>12446,
-48025=>12447,
-48026=>12448,
-48027=>12449,
-48028=>12450,
-48029=>12451,
-48030=>12452,
-48031=>12453,
-48032=>12454,
-48033=>12455,
-48034=>12456,
-48035=>12457,
-48037=>12458,
-48038=>12459,
-48039=>12460,
-48041=>12461,
-48042=>12462,
-48043=>12463,
-48045=>12464,
-48046=>12465,
-48047=>12466,
-48048=>12467,
-48049=>12468,
-48050=>12469,
-48051=>12470,
-48053=>12471,
-48054=>12472,
-48056=>12473,
-48057=>12474,
-48058=>12475,
-48059=>12476,
-48060=>12477,
-48061=>12478,
-48062=>12479,
-48063=>12480,
-48065=>12481,
-48066=>12482,
-48067=>12483,
-48069=>12484,
-48070=>12485,
-48071=>12486,
-48073=>12487,
-48074=>12488,
-48075=>12489,
-48076=>12490,
-48077=>12491,
-48078=>12492,
-48079=>12493,
-48081=>12494,
-48082=>12495,
-48084=>12496,
-48085=>12497,
-48086=>12498,
-48087=>12499,
-48088=>12500,
-48089=>12501,
-48090=>12502,
-48091=>12503,
-48092=>12504,
-48093=>12505,
-48094=>12506,
-48095=>12507,
-48096=>12508,
-48097=>12509,
-48098=>12510,
-48099=>12511,
-48100=>12512,
-48101=>12513,
-48102=>12514,
-48103=>12515,
-48104=>12516,
-48105=>12517,
-48106=>12518,
-48107=>12519,
-48108=>12520,
-48109=>12521,
-48110=>12522,
-48111=>12523,
-48112=>12524,
-48113=>12525,
-48114=>12526,
-48115=>12527,
-48116=>12528,
-48117=>12529,
-48118=>12530,
-48119=>12531,
-48122=>12532,
-48123=>12533,
-48125=>12534,
-48126=>12535,
-48129=>12536,
-48131=>12537,
-48132=>12538,
-48133=>12539,
-48134=>12540,
-48135=>12541,
-48138=>12542,
-48142=>12543,
-48144=>12544,
-48146=>12545,
-48147=>12546,
-48153=>12547,
-48154=>12548,
-48160=>12549,
-48161=>12550,
-48162=>12551,
-48163=>12552,
-48166=>12553,
-48168=>12554,
-48170=>12555,
-48171=>12556,
-48172=>12557,
-48174=>12558,
-48175=>12559,
-48178=>12560,
-48179=>12561,
-48181=>12562,
-48182=>12563,
-48183=>12564,
-48185=>12565,
-48186=>12566,
-48187=>12567,
-48188=>12568,
-48189=>12569,
-48190=>12570,
-48191=>12571,
-48194=>12572,
-48198=>12573,
-48199=>12574,
-48200=>12575,
-48202=>12576,
-48203=>12577,
-48206=>12578,
-48207=>12579,
-48209=>12580,
-48210=>12581,
-48211=>12582,
-48212=>12583,
-48213=>12584,
-48214=>12585,
-48215=>12586,
-48216=>12587,
-48217=>12588,
-48218=>12589,
-48219=>12590,
-48220=>12591,
-48222=>12592,
-48223=>12593,
-48224=>12594,
-48225=>12595,
-48226=>12596,
-48227=>12597,
-48228=>12598,
-48229=>12599,
-48230=>12600,
-48231=>12601,
-48232=>12602,
-48233=>12603,
-48234=>12604,
-48235=>12605,
-48236=>12606,
-48237=>12607,
-48238=>12608,
-48239=>12609,
-48240=>12610,
-48241=>12611,
-48242=>12612,
-48243=>12613,
-48244=>12614,
-48245=>12615,
-48246=>12616,
-48247=>12617,
-48248=>12618,
-48249=>12619,
-48250=>12620,
-48251=>12621,
-48252=>12622,
-48253=>12623,
-48254=>12624,
-48255=>12625,
-48256=>12626,
-48257=>12627,
-48258=>12628,
-48259=>12629,
-48262=>12630,
-48263=>12631,
-48265=>12632,
-48266=>12633,
-48269=>12634,
-48271=>12635,
-48272=>12636,
-48273=>12637,
-48274=>12638,
-48275=>12639,
-48278=>12640,
-48280=>12641,
-48283=>12642,
-48284=>12643,
-48285=>12644,
-48286=>12645,
-48287=>12646,
-48290=>12647,
-48291=>12648,
-48293=>12649,
-48294=>12650,
-48297=>12651,
-48298=>12652,
-48299=>12653,
-48300=>12654,
-48301=>12655,
-48302=>12656,
-48303=>12657,
-48306=>12658,
-48310=>12659,
-48311=>12660,
-48312=>12661,
-48313=>12662,
-48314=>12663,
-48315=>12664,
-48318=>12665,
-48319=>12666,
-48321=>12667,
-48322=>12668,
-48323=>12669,
-48325=>12670,
-48326=>12671,
-48327=>12672,
-48328=>12673,
-48329=>12674,
-48330=>12675,
-48331=>12676,
-48332=>12677,
-48334=>12678,
-48338=>12679,
-48339=>12680,
-48340=>12681,
-48342=>12682,
-48343=>12683,
-48345=>12684,
-48346=>12685,
-48347=>12686,
-48349=>12687,
-48350=>12688,
-48351=>12689,
-48352=>12690,
-48353=>12691,
-48354=>12692,
-48355=>12693,
-48356=>12694,
-48357=>12695,
-48358=>12696,
-48359=>12697,
-48360=>12698,
-48361=>12699,
-48362=>12700,
-48363=>12701,
-48364=>12702,
-48365=>12703,
-48366=>12704,
-48367=>12705,
-48368=>12706,
-48369=>12707,
-48370=>12708,
-48371=>12709,
-48375=>12710,
-48377=>12711,
-48378=>12712,
-48379=>12713,
-48381=>12714,
-48382=>12715,
-48383=>12716,
-48384=>12717,
-48385=>12718,
-48386=>12719,
-48387=>12720,
-48390=>12721,
-48392=>12722,
-48394=>12723,
-48395=>12724,
-48396=>12725,
-48397=>12726,
-48398=>12727,
-48399=>12728,
-48401=>12729,
-48402=>12730,
-48403=>12731,
-48405=>12732,
-48406=>12733,
-48407=>12734,
-48408=>12735,
-48409=>12736,
-48410=>12737,
-48411=>12738,
-48412=>12739,
-48413=>12740,
-48414=>12741,
-48415=>12742,
-48416=>12743,
-48417=>12744,
-48418=>12745,
-48419=>12746,
-48421=>12747,
-48422=>12748,
-48423=>12749,
-48424=>12750,
-48425=>12751,
-48426=>12752,
-48427=>12753,
-48429=>12754,
-48430=>12755,
-48431=>12756,
-48432=>12757,
-48433=>12758,
-48434=>12759,
-48435=>12760,
-48436=>12761,
-48437=>12762,
-48438=>12763,
-48439=>12764,
-48440=>12765,
-48441=>12766,
-48442=>12767,
-48443=>12768,
-48444=>12769,
-48445=>12770,
-48446=>12771,
-48447=>12772,
-48449=>12773,
-48450=>12774,
-48451=>12775,
-48452=>12776,
-48453=>12777,
-48454=>12778,
-48455=>12779,
-48458=>12780,
-48459=>12781,
-48461=>12782,
-48462=>12783,
-48463=>12784,
-48465=>12785,
-48466=>12786,
-48467=>12787,
-48468=>12788,
-48469=>12789,
-48470=>12790,
-48471=>12791,
-48474=>12792,
-48475=>12793,
-48476=>12794,
-48477=>12795,
-48478=>12796,
-48479=>12797,
-48480=>12798,
-48481=>12799,
-48482=>12800,
-48483=>12801,
-48485=>12802,
-48486=>12803,
-48487=>12804,
-48489=>12805,
-48490=>12806,
-48491=>12807,
-48492=>12808,
-48493=>12809,
-48494=>12810,
-48495=>12811,
-48496=>12812,
-48497=>12813,
-48498=>12814,
-48499=>12815,
-48500=>12816,
-48501=>12817,
-48502=>12818,
-48503=>12819,
-48504=>12820,
-48505=>12821,
-48506=>12822,
-48507=>12823,
-48508=>12824,
-48509=>12825,
-48510=>12826,
-48511=>12827,
-48514=>12828,
-48515=>12829,
-48517=>12830,
-48518=>12831,
-48523=>12832,
-48524=>12833,
-48525=>12834,
-48526=>12835,
-48527=>12836,
-48530=>12837,
-48532=>12838,
-48534=>12839,
-48535=>12840,
-48536=>12841,
-48539=>12842,
-48541=>12843,
-48542=>12844,
-48543=>12845,
-48544=>12846,
-48545=>12847,
-48546=>12848,
-48547=>12849,
-48549=>12850,
-48550=>12851,
-48551=>12852,
-48552=>12853,
-48553=>12854,
-48554=>12855,
-48555=>12856,
-48556=>12857,
-48557=>12858,
-48558=>12859,
-48559=>12860,
-48561=>12861,
-48562=>12862,
-48563=>12863,
-48564=>12864,
-48565=>12865,
-48566=>12866,
-48567=>12867,
-48569=>12868,
-48570=>12869,
-48571=>12870,
-48572=>12871,
-48573=>12872,
-48574=>12873,
-48575=>12874,
-48576=>12875,
-48577=>12876,
-48578=>12877,
-48579=>12878,
-48580=>12879,
-48581=>12880,
-48582=>12881,
-48583=>12882,
-48584=>12883,
-48585=>12884,
-48586=>12885,
-48587=>12886,
-48588=>12887,
-48589=>12888,
-48590=>12889,
-48591=>12890,
-48592=>12891,
-48593=>12892,
-48594=>12893,
-48595=>12894,
-48598=>12895,
-48599=>12896,
-48601=>12897,
-48602=>12898,
-48603=>12899,
-48605=>12900,
-48606=>12901,
-48607=>12902,
-48608=>12903,
-48609=>12904,
-48610=>12905,
-48611=>12906,
-48612=>12907,
-48613=>12908,
-48614=>12909,
-48615=>12910,
-48616=>12911,
-48618=>12912,
-48619=>12913,
-48620=>12914,
-48621=>12915,
-48622=>12916,
-48623=>12917,
-48625=>12918,
-48626=>12919,
-48627=>12920,
-48629=>12921,
-48630=>12922,
-48631=>12923,
-48633=>12924,
-48634=>12925,
-48635=>12926,
-48636=>12927,
-48637=>12928,
-48638=>12929,
-48639=>12930,
-48641=>12931,
-48642=>12932,
-48644=>12933,
-48646=>12934,
-48647=>12935,
-48648=>12936,
-48649=>12937,
-48650=>12938,
-48651=>12939,
-48654=>12940,
-48655=>12941,
-48657=>12942,
-48658=>12943,
-48659=>12944,
-48661=>12945,
-48662=>12946,
-48663=>12947,
-48664=>12948,
-48665=>12949,
-48666=>12950,
-48667=>12951,
-48670=>12952,
-48672=>12953,
-48673=>12954,
-48674=>12955,
-48675=>12956,
-48676=>12957,
-48677=>12958,
-48678=>12959,
-48679=>12960,
-48680=>12961,
-48681=>12962,
-48682=>12963,
-48683=>12964,
-48684=>12965,
-48685=>12966,
-48686=>12967,
-48687=>12968,
-48688=>12969,
-48689=>12970,
-48690=>12971,
-48691=>12972,
-48692=>12973,
-48693=>12974,
-48694=>12975,
-48695=>12976,
-48696=>12977,
-48697=>12978,
-48698=>12979,
-48699=>12980,
-48700=>12981,
-48701=>12982,
-48702=>12983,
-48703=>12984,
-48704=>12985,
-48705=>12986,
-48706=>12987,
-48707=>12988,
-48710=>12989,
-48711=>12990,
-48713=>12991,
-48714=>12992,
-48715=>12993,
-48717=>12994,
-48719=>12995,
-48720=>12996,
-48721=>12997,
-48722=>12998,
-48723=>12999,
-48726=>13000,
-48728=>13001,
-48732=>13002,
-48733=>13003,
-48734=>13004,
-48735=>13005,
-48738=>13006,
-48739=>13007,
-48741=>13008,
-48742=>13009,
-48743=>13010,
-48745=>13011,
-48747=>13012,
-48748=>13013,
-48749=>13014,
-48750=>13015,
-48751=>13016,
-48754=>13017,
-48758=>13018,
-48759=>13019,
-48760=>13020,
-48761=>13021,
-48762=>13022,
-48766=>13023,
-48767=>13024,
-48769=>13025,
-48770=>13026,
-48771=>13027,
-48773=>13028,
-48774=>13029,
-48775=>13030,
-48776=>13031,
-48777=>13032,
-48778=>13033,
-48779=>13034,
-48782=>13035,
-48786=>13036,
-48787=>13037,
-48788=>13038,
-48789=>13039,
-48790=>13040,
-48791=>13041,
-48794=>13042,
-48795=>13043,
-48796=>13044,
-48797=>13045,
-48798=>13046,
-48799=>13047,
-48800=>13048,
-48801=>13049,
-48802=>13050,
-48803=>13051,
-48804=>13052,
-48805=>13053,
-48806=>13054,
-48807=>13055,
-48809=>13056,
-48810=>13057,
-48811=>13058,
-48812=>13059,
-48813=>13060,
-48814=>13061,
-48815=>13062,
-48816=>13063,
-48817=>13064,
-48818=>13065,
-48819=>13066,
-48820=>13067,
-48821=>13068,
-48822=>13069,
-48823=>13070,
-48824=>13071,
-48825=>13072,
-48826=>13073,
-48827=>13074,
-48828=>13075,
-48829=>13076,
-48830=>13077,
-48831=>13078,
-48832=>13079,
-48833=>13080,
-48834=>13081,
-48835=>13082,
-48836=>13083,
-48837=>13084,
-48838=>13085,
-48839=>13086,
-48840=>13087,
-48841=>13088,
-48842=>13089,
-48843=>13090,
-48844=>13091,
-48845=>13092,
-48846=>13093,
-48847=>13094,
-48850=>13095,
-48851=>13096,
-48853=>13097,
-48854=>13098,
-48857=>13099,
-48858=>13100,
-48859=>13101,
-48860=>13102,
-48861=>13103,
-48862=>13104,
-48863=>13105,
-48865=>13106,
-48866=>13107,
-48870=>13108,
-48871=>13109,
-48872=>13110,
-48873=>13111,
-48874=>13112,
-48875=>13113,
-48877=>13114,
-48878=>13115,
-48879=>13116,
-48880=>13117,
-48881=>13118,
-48882=>13119,
-48883=>13120,
-48884=>13121,
-48885=>13122,
-48886=>13123,
-48887=>13124,
-48888=>13125,
-48889=>13126,
-48890=>13127,
-48891=>13128,
-48892=>13129,
-48893=>13130,
-48894=>13131,
-48895=>13132,
-48896=>13133,
-48898=>13134,
-48899=>13135,
-48900=>13136,
-48901=>13137,
-48902=>13138,
-48903=>13139,
-48906=>13140,
-48907=>13141,
-48908=>13142,
-48909=>13143,
-48910=>13144,
-48911=>13145,
-48912=>13146,
-48913=>13147,
-48914=>13148,
-48915=>13149,
-48916=>13150,
-48917=>13151,
-48918=>13152,
-48919=>13153,
-48922=>13154,
-48926=>13155,
-48927=>13156,
-48928=>13157,
-48929=>13158,
-48930=>13159,
-48931=>13160,
-48932=>13161,
-48933=>13162,
-48934=>13163,
-48935=>13164,
-48936=>13165,
-48937=>13166,
-48938=>13167,
-48939=>13168,
-48940=>13169,
-48941=>13170,
-48942=>13171,
-48943=>13172,
-48944=>13173,
-48945=>13174,
-48946=>13175,
-48947=>13176,
-48948=>13177,
-48949=>13178,
-48950=>13179,
-48951=>13180,
-48952=>13181,
-48953=>13182,
-48954=>13183,
-48955=>13184,
-48956=>13185,
-48957=>13186,
-48958=>13187,
-48959=>13188,
-48962=>13189,
-48963=>13190,
-48965=>13191,
-48966=>13192,
-48967=>13193,
-48969=>13194,
-48970=>13195,
-48971=>13196,
-48972=>13197,
-48973=>13198,
-48974=>13199,
-48975=>13200,
-48978=>13201,
-48979=>13202,
-48980=>13203,
-48982=>13204,
-48983=>13205,
-48984=>13206,
-48985=>13207,
-48986=>13208,
-48987=>13209,
-48988=>13210,
-48989=>13211,
-48990=>13212,
-48991=>13213,
-48992=>13214,
-48993=>13215,
-48994=>13216,
-48995=>13217,
-48996=>13218,
-48997=>13219,
-48998=>13220,
-48999=>13221,
-49000=>13222,
-49001=>13223,
-49002=>13224,
-49003=>13225,
-49004=>13226,
-49005=>13227,
-49006=>13228,
-49007=>13229,
-49008=>13230,
-49009=>13231,
-49010=>13232,
-49011=>13233,
-49012=>13234,
-49013=>13235,
-49014=>13236,
-49015=>13237,
-49016=>13238,
-49017=>13239,
-49018=>13240,
-49019=>13241,
-49020=>13242,
-49021=>13243,
-49022=>13244,
-49023=>13245,
-49024=>13246,
-49025=>13247,
-49026=>13248,
-49027=>13249,
-49028=>13250,
-49029=>13251,
-49030=>13252,
-49031=>13253,
-49032=>13254,
-49033=>13255,
-49034=>13256,
-49035=>13257,
-49036=>13258,
-49037=>13259,
-49038=>13260,
-49039=>13261,
-49040=>13262,
-49041=>13263,
-49042=>13264,
-49043=>13265,
-49045=>13266,
-49046=>13267,
-49047=>13268,
-49048=>13269,
-49049=>13270,
-49050=>13271,
-49051=>13272,
-49052=>13273,
-49053=>13274,
-49054=>13275,
-49055=>13276,
-49056=>13277,
-49057=>13278,
-49058=>13279,
-49059=>13280,
-49060=>13281,
-49061=>13282,
-49062=>13283,
-49063=>13284,
-49064=>13285,
-49065=>13286,
-49066=>13287,
-49067=>13288,
-49068=>13289,
-49069=>13290,
-49070=>13291,
-49071=>13292,
-49073=>13293,
-49074=>13294,
-49075=>13295,
-49076=>13296,
-49077=>13297,
-49078=>13298,
-49079=>13299,
-49080=>13300,
-49081=>13301,
-49082=>13302,
-49083=>13303,
-49084=>13304,
-49085=>13305,
-49086=>13306,
-49087=>13307,
-49088=>13308,
-49089=>13309,
-49090=>13310,
-49091=>13311,
-49092=>13312,
-49094=>13313,
-49095=>13314,
-49096=>13315,
-49097=>13316,
-49098=>13317,
-49099=>13318,
-49102=>13319,
-49103=>13320,
-49105=>13321,
-49106=>13322,
-49107=>13323,
-49109=>13324,
-49110=>13325,
-49111=>13326,
-49112=>13327,
-49113=>13328,
-49114=>13329,
-49115=>13330,
-49117=>13331,
-49118=>13332,
-49120=>13333,
-49122=>13334,
-49123=>13335,
-49124=>13336,
-49125=>13337,
-49126=>13338,
-49127=>13339,
-49128=>13340,
-49129=>13341,
-49130=>13342,
-49131=>13343,
-49132=>13344,
-49133=>13345,
-49134=>13346,
-49135=>13347,
-49136=>13348,
-49137=>13349,
-49138=>13350,
-49139=>13351,
-49140=>13352,
-49141=>13353,
-49142=>13354,
-49143=>13355,
-49144=>13356,
-49145=>13357,
-49146=>13358,
-49147=>13359,
-49148=>13360,
-49149=>13361,
-49150=>13362,
-49151=>13363,
-49152=>13364,
-49153=>13365,
-49154=>13366,
-49155=>13367,
-49156=>13368,
-49157=>13369,
-49158=>13370,
-49159=>13371,
-49160=>13372,
-49161=>13373,
-49162=>13374,
-49163=>13375,
-49164=>13376,
-49165=>13377,
-49166=>13378,
-49167=>13379,
-49168=>13380,
-49169=>13381,
-49170=>13382,
-49171=>13383,
-49172=>13384,
-49173=>13385,
-49174=>13386,
-49175=>13387,
-49176=>13388,
-49177=>13389,
-49178=>13390,
-49179=>13391,
-49180=>13392,
-49181=>13393,
-49182=>13394,
-49183=>13395,
-49184=>13396,
-49185=>13397,
-49186=>13398,
-49187=>13399,
-49188=>13400,
-49189=>13401,
-49190=>13402,
-49191=>13403,
-49192=>13404,
-49193=>13405,
-49194=>13406,
-49195=>13407,
-49196=>13408,
-49197=>13409,
-49198=>13410,
-49199=>13411,
-49200=>13412,
-49201=>13413,
-49202=>13414,
-49203=>13415,
-49204=>13416,
-49205=>13417,
-49206=>13418,
-49207=>13419,
-49208=>13420,
-49209=>13421,
-49210=>13422,
-49211=>13423,
-49213=>13424,
-49214=>13425,
-49215=>13426,
-49216=>13427,
-49217=>13428,
-49218=>13429,
-49219=>13430,
-49220=>13431,
-49221=>13432,
-49222=>13433,
-49223=>13434,
-49224=>13435,
-49225=>13436,
-49226=>13437,
-49227=>13438,
-49228=>13439,
-49229=>13440,
-49230=>13441,
-49231=>13442,
-49232=>13443,
-49234=>13444,
-49235=>13445,
-49236=>13446,
-49237=>13447,
-49238=>13448,
-49239=>13449,
-49241=>13450,
-49242=>13451,
-49243=>13452,
-49245=>13453,
-49246=>13454,
-49247=>13455,
-49249=>13456,
-49250=>13457,
-49251=>13458,
-49252=>13459,
-49253=>13460,
-49254=>13461,
-49255=>13462,
-49258=>13463,
-49259=>13464,
-49260=>13465,
-49261=>13466,
-49262=>13467,
-49263=>13468,
-49264=>13469,
-49265=>13470,
-49266=>13471,
-49267=>13472,
-49268=>13473,
-49269=>13474,
-49270=>13475,
-49271=>13476,
-49272=>13477,
-49273=>13478,
-49274=>13479,
-49275=>13480,
-49276=>13481,
-49277=>13482,
-49278=>13483,
-49279=>13484,
-49280=>13485,
-49281=>13486,
-49282=>13487,
-49283=>13488,
-49284=>13489,
-49285=>13490,
-49286=>13491,
-49287=>13492,
-49288=>13493,
-49289=>13494,
-49290=>13495,
-49291=>13496,
-49292=>13497,
-49293=>13498,
-49294=>13499,
-49295=>13500,
-49298=>13501,
-49299=>13502,
-49301=>13503,
-49302=>13504,
-49303=>13505,
-49305=>13506,
-49306=>13507,
-49307=>13508,
-49308=>13509,
-49309=>13510,
-49310=>13511,
-49311=>13512,
-49314=>13513,
-49316=>13514,
-49318=>13515,
-49319=>13516,
-49320=>13517,
-49321=>13518,
-49322=>13519,
-49323=>13520,
-49326=>13521,
-49329=>13522,
-49330=>13523,
-49335=>13524,
-49336=>13525,
-49337=>13526,
-49338=>13527,
-49339=>13528,
-49342=>13529,
-49346=>13530,
-49347=>13531,
-49348=>13532,
-49350=>13533,
-49351=>13534,
-49354=>13535,
-49355=>13536,
-49357=>13537,
-49358=>13538,
-49359=>13539,
-49361=>13540,
-49362=>13541,
-49363=>13542,
-49364=>13543,
-49365=>13544,
-49366=>13545,
-49367=>13546,
-49370=>13547,
-49374=>13548,
-49375=>13549,
-49376=>13550,
-49377=>13551,
-49378=>13552,
-49379=>13553,
-49382=>13554,
-49383=>13555,
-49385=>13556,
-49386=>13557,
-49387=>13558,
-49389=>13559,
-49390=>13560,
-49391=>13561,
-49392=>13562,
-49393=>13563,
-49394=>13564,
-49395=>13565,
-49398=>13566,
-49400=>13567,
-49402=>13568,
-49403=>13569,
-49404=>13570,
-49405=>13571,
-49406=>13572,
-49407=>13573,
-49409=>13574,
-49410=>13575,
-49411=>13576,
-49413=>13577,
-49414=>13578,
-49415=>13579,
-49417=>13580,
-49418=>13581,
-49419=>13582,
-49420=>13583,
-49421=>13584,
-49422=>13585,
-49423=>13586,
-49425=>13587,
-49426=>13588,
-49427=>13589,
-49428=>13590,
-49430=>13591,
-49431=>13592,
-49432=>13593,
-49433=>13594,
-49434=>13595,
-49435=>13596,
-49441=>13597,
-49442=>13598,
-49445=>13599,
-49448=>13600,
-49449=>13601,
-49450=>13602,
-49451=>13603,
-49454=>13604,
-49458=>13605,
-49459=>13606,
-49460=>13607,
-49461=>13608,
-49463=>13609,
-49466=>13610,
-49467=>13611,
-49469=>13612,
-49470=>13613,
-49471=>13614,
-49473=>13615,
-49474=>13616,
-49475=>13617,
-49476=>13618,
-49477=>13619,
-49478=>13620,
-49479=>13621,
-49482=>13622,
-49486=>13623,
-49487=>13624,
-49488=>13625,
-49489=>13626,
-49490=>13627,
-49491=>13628,
-49494=>13629,
-49495=>13630,
-49497=>13631,
-49498=>13632,
-49499=>13633,
-49501=>13634,
-49502=>13635,
-49503=>13636,
-49504=>13637,
-49505=>13638,
-49506=>13639,
-49507=>13640,
-49510=>13641,
-49514=>13642,
-49515=>13643,
-49516=>13644,
-49517=>13645,
-49518=>13646,
-49519=>13647,
-49521=>13648,
-49522=>13649,
-49523=>13650,
-49525=>13651,
-49526=>13652,
-49527=>13653,
-49529=>13654,
-49530=>13655,
-49531=>13656,
-49532=>13657,
-49533=>13658,
-49534=>13659,
-49535=>13660,
-49536=>13661,
-49537=>13662,
-49538=>13663,
-49539=>13664,
-49540=>13665,
-49542=>13666,
-49543=>13667,
-49544=>13668,
-49545=>13669,
-49546=>13670,
-49547=>13671,
-49551=>13672,
-49553=>13673,
-49554=>13674,
-49555=>13675,
-49557=>13676,
-49559=>13677,
-49560=>13678,
-49561=>13679,
-49562=>13680,
-49563=>13681,
-49566=>13682,
-49568=>13683,
-49570=>13684,
-49571=>13685,
-49572=>13686,
-49574=>13687,
-49575=>13688,
-49578=>13689,
-49579=>13690,
-49581=>13691,
-49582=>13692,
-49583=>13693,
-49585=>13694,
-49586=>13695,
-49587=>13696,
-49588=>13697,
-49589=>13698,
-49590=>13699,
-49591=>13700,
-49592=>13701,
-49593=>13702,
-49594=>13703,
-49595=>13704,
-49596=>13705,
-49598=>13706,
-49599=>13707,
-49600=>13708,
-49601=>13709,
-49602=>13710,
-49603=>13711,
-49605=>13712,
-49606=>13713,
-49607=>13714,
-49609=>13715,
-49610=>13716,
-49611=>13717,
-49613=>13718,
-49614=>13719,
-49615=>13720,
-49616=>13721,
-49617=>13722,
-49618=>13723,
-49619=>13724,
-49621=>13725,
-49622=>13726,
-49625=>13727,
-49626=>13728,
-49627=>13729,
-49628=>13730,
-49629=>13731,
-49630=>13732,
-49631=>13733,
-49633=>13734,
-49634=>13735,
-49635=>13736,
-49637=>13737,
-49638=>13738,
-49639=>13739,
-49641=>13740,
-49642=>13741,
-49643=>13742,
-49644=>13743,
-49645=>13744,
-49646=>13745,
-49647=>13746,
-49650=>13747,
-49652=>13748,
-49653=>13749,
-49654=>13750,
-49655=>13751,
-49656=>13752,
-49657=>13753,
-49658=>13754,
-49659=>13755,
-49662=>13756,
-49663=>13757,
-49665=>13758,
-49666=>13759,
-49667=>13760,
-49669=>13761,
-49670=>13762,
-49671=>13763,
-49672=>13764,
-49673=>13765,
-49674=>13766,
-49675=>13767,
-49678=>13768,
-49680=>13769,
-49682=>13770,
-49683=>13771,
-49684=>13772,
-49685=>13773,
-49686=>13774,
-49687=>13775,
-49690=>13776,
-49691=>13777,
-49693=>13778,
-49694=>13779,
-49697=>13780,
-49698=>13781,
-49699=>13782,
-49700=>13783,
-49701=>13784,
-49702=>13785,
-49703=>13786,
-49706=>13787,
-49708=>13788,
-49710=>13789,
-49712=>13790,
-49715=>13791,
-49717=>13792,
-49718=>13793,
-49719=>13794,
-49720=>13795,
-49721=>13796,
-49722=>13797,
-49723=>13798,
-49724=>13799,
-49725=>13800,
-49726=>13801,
-49727=>13802,
-49728=>13803,
-49729=>13804,
-49730=>13805,
-49731=>13806,
-49732=>13807,
-49733=>13808,
-49734=>13809,
-49735=>13810,
-49737=>13811,
-49738=>13812,
-49739=>13813,
-49740=>13814,
-49741=>13815,
-49742=>13816,
-49743=>13817,
-49746=>13818,
-49747=>13819,
-49749=>13820,
-49750=>13821,
-49751=>13822,
-49753=>13823,
-49754=>13824,
-49755=>13825,
-49756=>13826,
-49757=>13827,
-49758=>13828,
-49759=>13829,
-49761=>13830,
-49762=>13831,
-49763=>13832,
-49764=>13833,
-49766=>13834,
-49767=>13835,
-49768=>13836,
-49769=>13837,
-49770=>13838,
-49771=>13839,
-49774=>13840,
-49775=>13841,
-49777=>13842,
-49778=>13843,
-49779=>13844,
-49781=>13845,
-49782=>13846,
-49783=>13847,
-49784=>13848,
-49785=>13849,
-49786=>13850,
-49787=>13851,
-49790=>13852,
-49792=>13853,
-49794=>13854,
-49795=>13855,
-49796=>13856,
-49797=>13857,
-49798=>13858,
-49799=>13859,
-49802=>13860,
-49803=>13861,
-49804=>13862,
-49805=>13863,
-49806=>13864,
-49807=>13865,
-49809=>13866,
-49810=>13867,
-49811=>13868,
-49812=>13869,
-49813=>13870,
-49814=>13871,
-49815=>13872,
-49817=>13873,
-49818=>13874,
-49820=>13875,
-49822=>13876,
-49823=>13877,
-49824=>13878,
-49825=>13879,
-49826=>13880,
-49827=>13881,
-49830=>13882,
-49831=>13883,
-49833=>13884,
-49834=>13885,
-49835=>13886,
-49838=>13887,
-49839=>13888,
-49840=>13889,
-49841=>13890,
-49842=>13891,
-49843=>13892,
-49846=>13893,
-49848=>13894,
-49850=>13895,
-49851=>13896,
-49852=>13897,
-49853=>13898,
-49854=>13899,
-49855=>13900,
-49856=>13901,
-49857=>13902,
-49858=>13903,
-49859=>13904,
-49860=>13905,
-49861=>13906,
-49862=>13907,
-49863=>13908,
-49864=>13909,
-49865=>13910,
-49866=>13911,
-49867=>13912,
-49868=>13913,
-49869=>13914,
-49870=>13915,
-49871=>13916,
-49872=>13917,
-49873=>13918,
-49874=>13919,
-49875=>13920,
-49876=>13921,
-49877=>13922,
-49878=>13923,
-49879=>13924,
-49880=>13925,
-49881=>13926,
-49882=>13927,
-49883=>13928,
-49886=>13929,
-49887=>13930,
-49889=>13931,
-49890=>13932,
-49893=>13933,
-49894=>13934,
-49895=>13935,
-49896=>13936,
-49897=>13937,
-49898=>13938,
-49902=>13939,
-49904=>13940,
-49906=>13941,
-49907=>13942,
-49908=>13943,
-49909=>13944,
-49911=>13945,
-49914=>13946,
-49917=>13947,
-49918=>13948,
-49919=>13949,
-49921=>13950,
-49922=>13951,
-49923=>13952,
-49924=>13953,
-49925=>13954,
-49926=>13955,
-49927=>13956,
-49930=>13957,
-49931=>13958,
-49934=>13959,
-49935=>13960,
-49936=>13961,
-49937=>13962,
-49938=>13963,
-49942=>13964,
-49943=>13965,
-49945=>13966,
-49946=>13967,
-49947=>13968,
-49949=>13969,
-49950=>13970,
-49951=>13971,
-49952=>13972,
-49953=>13973,
-49954=>13974,
-49955=>13975,
-49958=>13976,
-49959=>13977,
-49962=>13978,
-49963=>13979,
-49964=>13980,
-49965=>13981,
-49966=>13982,
-49967=>13983,
-49968=>13984,
-49969=>13985,
-49970=>13986,
-49971=>13987,
-49972=>13988,
-49973=>13989,
-49974=>13990,
-49975=>13991,
-49976=>13992,
-49977=>13993,
-49978=>13994,
-49979=>13995,
-49980=>13996,
-49981=>13997,
-49982=>13998,
-49983=>13999,
-49984=>14000,
-49985=>14001,
-49986=>14002,
-49987=>14003,
-49988=>14004,
-49990=>14005,
-49991=>14006,
-49992=>14007,
-49993=>14008,
-49994=>14009,
-49995=>14010,
-49996=>14011,
-49997=>14012,
-49998=>14013,
-49999=>14014,
-50000=>14015,
-50001=>14016,
-50002=>14017,
-50003=>14018,
-50004=>14019,
-50005=>14020,
-50006=>14021,
-50007=>14022,
-50008=>14023,
-50009=>14024,
-50010=>14025,
-50011=>14026,
-50012=>14027,
-50013=>14028,
-50014=>14029,
-50015=>14030,
-50016=>14031,
-50017=>14032,
-50018=>14033,
-50019=>14034,
-50020=>14035,
-50021=>14036,
-50022=>14037,
-50023=>14038,
-50026=>14039,
-50027=>14040,
-50029=>14041,
-50030=>14042,
-50031=>14043,
-50033=>14044,
-50035=>14045,
-50036=>14046,
-50037=>14047,
-50038=>14048,
-50039=>14049,
-50042=>14050,
-50043=>14051,
-50046=>14052,
-50047=>14053,
-50048=>14054,
-50049=>14055,
-50050=>14056,
-50051=>14057,
-50053=>14058,
-50054=>14059,
-50055=>14060,
-50057=>14061,
-50058=>14062,
-50059=>14063,
-50061=>14064,
-50062=>14065,
-50063=>14066,
-50064=>14067,
-50065=>14068,
-50066=>14069,
-50067=>14070,
-50068=>14071,
-50069=>14072,
-50070=>14073,
-50071=>14074,
-50072=>14075,
-50073=>14076,
-50074=>14077,
-50075=>14078,
-50076=>14079,
-50077=>14080,
-50078=>14081,
-50079=>14082,
-50080=>14083,
-50081=>14084,
-50082=>14085,
-50083=>14086,
-50084=>14087,
-50085=>14088,
-50086=>14089,
-50087=>14090,
-50088=>14091,
-50089=>14092,
-50090=>14093,
-50091=>14094,
-50092=>14095,
-50093=>14096,
-50094=>14097,
-50095=>14098,
-50096=>14099,
-50097=>14100,
-50098=>14101,
-50099=>14102,
-50100=>14103,
-50101=>14104,
-50102=>14105,
-50103=>14106,
-50104=>14107,
-50105=>14108,
-50106=>14109,
-50107=>14110,
-50108=>14111,
-50109=>14112,
-50110=>14113,
-50111=>14114,
-50113=>14115,
-50114=>14116,
-50115=>14117,
-50116=>14118,
-50117=>14119,
-50118=>14120,
-50119=>14121,
-50120=>14122,
-50121=>14123,
-50122=>14124,
-50123=>14125,
-50124=>14126,
-50125=>14127,
-50126=>14128,
-50127=>14129,
-50128=>14130,
-50129=>14131,
-50130=>14132,
-50131=>14133,
-50132=>14134,
-50133=>14135,
-50134=>14136,
-50135=>14137,
-50138=>14138,
-50139=>14139,
-50141=>14140,
-50142=>14141,
-50145=>14142,
-50147=>14143,
-50148=>14144,
-50149=>14145,
-50150=>14146,
-50151=>14147,
-50154=>14148,
-50155=>14149,
-50156=>14150,
-50158=>14151,
-50159=>14152,
-50160=>14153,
-50161=>14154,
-50162=>14155,
-50163=>14156,
-50166=>14157,
-50167=>14158,
-50169=>14159,
-50170=>14160,
-50171=>14161,
-50172=>14162,
-50173=>14163,
-50174=>14164,
-50175=>14165,
-50176=>14166,
-50177=>14167,
-50178=>14168,
-50179=>14169,
-50180=>14170,
-50181=>14171,
-50182=>14172,
-50183=>14173,
-50185=>14174,
-50186=>14175,
-50187=>14176,
-50188=>14177,
-50189=>14178,
-50190=>14179,
-50191=>14180,
-50193=>14181,
-50194=>14182,
-50195=>14183,
-50196=>14184,
-50197=>14185,
-50198=>14186,
-50199=>14187,
-50200=>14188,
-50201=>14189,
-50202=>14190,
-50203=>14191,
-50204=>14192,
-50205=>14193,
-50206=>14194,
-50207=>14195,
-50208=>14196,
-50209=>14197,
-50210=>14198,
-50211=>14199,
-50213=>14200,
-50214=>14201,
-50215=>14202,
-50216=>14203,
-50217=>14204,
-50218=>14205,
-50219=>14206,
-50221=>14207,
-50222=>14208,
-50223=>14209,
-50225=>14210,
-50226=>14211,
-50227=>14212,
-50229=>14213,
-50230=>14214,
-50231=>14215,
-50232=>14216,
-50233=>14217,
-50234=>14218,
-50235=>14219,
-50238=>14220,
-50239=>14221,
-50240=>14222,
-50241=>14223,
-50242=>14224,
-50243=>14225,
-50244=>14226,
-50245=>14227,
-50246=>14228,
-50247=>14229,
-50249=>14230,
-50250=>14231,
-50251=>14232,
-50252=>14233,
-50253=>14234,
-50254=>14235,
-50255=>14236,
-50256=>14237,
-50257=>14238,
-50258=>14239,
-50259=>14240,
-50260=>14241,
-50261=>14242,
-50262=>14243,
-50263=>14244,
-50264=>14245,
-50265=>14246,
-50266=>14247,
-50267=>14248,
-50268=>14249,
-50269=>14250,
-50270=>14251,
-50271=>14252,
-50272=>14253,
-50273=>14254,
-50274=>14255,
-50275=>14256,
-50278=>14257,
-50279=>14258,
-50281=>14259,
-50282=>14260,
-50283=>14261,
-50285=>14262,
-50286=>14263,
-50287=>14264,
-50288=>14265,
-50289=>14266,
-50290=>14267,
-50291=>14268,
-50294=>14269,
-50295=>14270,
-50296=>14271,
-50298=>14272,
-50299=>14273,
-50300=>14274,
-50301=>14275,
-50302=>14276,
-50303=>14277,
-50305=>14278,
-50306=>14279,
-50307=>14280,
-50308=>14281,
-50309=>14282,
-50310=>14283,
-50311=>14284,
-50312=>14285,
-50313=>14286,
-50314=>14287,
-50315=>14288,
-50316=>14289,
-50317=>14290,
-50318=>14291,
-50319=>14292,
-50320=>14293,
-50321=>14294,
-50322=>14295,
-50323=>14296,
-50325=>14297,
-50326=>14298,
-50327=>14299,
-50328=>14300,
-50329=>14301,
-50330=>14302,
-50331=>14303,
-50333=>14304,
-50334=>14305,
-50335=>14306,
-50336=>14307,
-50337=>14308,
-50338=>14309,
-50339=>14310,
-50340=>14311,
-50341=>14312,
-50342=>14313,
-50343=>14314,
-50344=>14315,
-50345=>14316,
-50346=>14317,
-50347=>14318,
-50348=>14319,
-50349=>14320,
-50350=>14321,
-50351=>14322,
-50352=>14323,
-50353=>14324,
-50354=>14325,
-50355=>14326,
-50356=>14327,
-50357=>14328,
-50358=>14329,
-50359=>14330,
-50361=>14331,
-50362=>14332,
-50363=>14333,
-50365=>14334,
-50366=>14335,
-50367=>14336,
-50368=>14337,
-50369=>14338,
-50370=>14339,
-50371=>14340,
-50372=>14341,
-50373=>14342,
-50374=>14343,
-50375=>14344,
-50376=>14345,
-50377=>14346,
-50378=>14347,
-50379=>14348,
-50380=>14349,
-50381=>14350,
-50382=>14351,
-50383=>14352,
-50384=>14353,
-50385=>14354,
-50386=>14355,
-50387=>14356,
-50388=>14357,
-50389=>14358,
-50390=>14359,
-50391=>14360,
-50392=>14361,
-50393=>14362,
-50394=>14363,
-50395=>14364,
-50396=>14365,
-50397=>14366,
-50398=>14367,
-50399=>14368,
-50400=>14369,
-50401=>14370,
-50402=>14371,
-50403=>14372,
-50404=>14373,
-50405=>14374,
-50406=>14375,
-50407=>14376,
-50408=>14377,
-50410=>14378,
-50411=>14379,
-50412=>14380,
-50413=>14381,
-50414=>14382,
-50415=>14383,
-50418=>14384,
-50419=>14385,
-50421=>14386,
-50422=>14387,
-50423=>14388,
-50425=>14389,
-50427=>14390,
-50428=>14391,
-50429=>14392,
-50430=>14393,
-50434=>14394,
-50435=>14395,
-50436=>14396,
-50437=>14397,
-50438=>14398,
-50439=>14399,
-50440=>14400,
-50441=>14401,
-50442=>14402,
-50443=>14403,
-50445=>14404,
-50446=>14405,
-50447=>14406,
-50449=>14407,
-50450=>14408,
-50451=>14409,
-50453=>14410,
-50454=>14411,
-50455=>14412,
-50456=>14413,
-50457=>14414,
-50458=>14415,
-50459=>14416,
-50461=>14417,
-50462=>14418,
-50463=>14419,
-50464=>14420,
-50465=>14421,
-50466=>14422,
-50467=>14423,
-50468=>14424,
-50469=>14425,
-50470=>14426,
-50471=>14427,
-50474=>14428,
-50475=>14429,
-50477=>14430,
-50478=>14431,
-50479=>14432,
-50481=>14433,
-50482=>14434,
-50483=>14435,
-50484=>14436,
-50485=>14437,
-50486=>14438,
-50487=>14439,
-50490=>14440,
-50492=>14441,
-50494=>14442,
-50495=>14443,
-50496=>14444,
-50497=>14445,
-50498=>14446,
-50499=>14447,
-50502=>14448,
-50503=>14449,
-50507=>14450,
-50511=>14451,
-50512=>14452,
-50513=>14453,
-50514=>14454,
-50518=>14455,
-50522=>14456,
-50523=>14457,
-50524=>14458,
-50527=>14459,
-50530=>14460,
-50531=>14461,
-50533=>14462,
-50534=>14463,
-50535=>14464,
-50537=>14465,
-50538=>14466,
-50539=>14467,
-50540=>14468,
-50541=>14469,
-50542=>14470,
-50543=>14471,
-50546=>14472,
-50550=>14473,
-50551=>14474,
-50552=>14475,
-50553=>14476,
-50554=>14477,
-50555=>14478,
-50558=>14479,
-50559=>14480,
-50561=>14481,
-50562=>14482,
-50563=>14483,
-50565=>14484,
-50566=>14485,
-50568=>14486,
-50569=>14487,
-50570=>14488,
-50571=>14489,
-50574=>14490,
-50576=>14491,
-50578=>14492,
-50579=>14493,
-50580=>14494,
-50582=>14495,
-50585=>14496,
-50586=>14497,
-50587=>14498,
-50589=>14499,
-50590=>14500,
-50591=>14501,
-50593=>14502,
-50594=>14503,
-50595=>14504,
-50596=>14505,
-50597=>14506,
-50598=>14507,
-50599=>14508,
-50600=>14509,
-50602=>14510,
-50603=>14511,
-50604=>14512,
-50605=>14513,
-50606=>14514,
-50607=>14515,
-50608=>14516,
-50609=>14517,
-50610=>14518,
-50611=>14519,
-50614=>14520,
-50615=>14521,
-50618=>14522,
-50623=>14523,
-50624=>14524,
-50625=>14525,
-50626=>14526,
-50627=>14527,
-50635=>14528,
-50637=>14529,
-50639=>14530,
-50642=>14531,
-50643=>14532,
-50645=>14533,
-50646=>14534,
-50647=>14535,
-50649=>14536,
-50650=>14537,
-50651=>14538,
-50652=>14539,
-50653=>14540,
-50654=>14541,
-50655=>14542,
-50658=>14543,
-50660=>14544,
-50662=>14545,
-50663=>14546,
-50664=>14547,
-50665=>14548,
-50666=>14549,
-50667=>14550,
-50671=>14551,
-50673=>14552,
-50674=>14553,
-50675=>14554,
-50677=>14555,
-50680=>14556,
-50681=>14557,
-50682=>14558,
-50683=>14559,
-50690=>14560,
-50691=>14561,
-50692=>14562,
-50697=>14563,
-50698=>14564,
-50699=>14565,
-50701=>14566,
-50702=>14567,
-50703=>14568,
-50705=>14569,
-50706=>14570,
-50707=>14571,
-50708=>14572,
-50709=>14573,
-50710=>14574,
-50711=>14575,
-50714=>14576,
-50717=>14577,
-50718=>14578,
-50719=>14579,
-50720=>14580,
-50721=>14581,
-50722=>14582,
-50723=>14583,
-50726=>14584,
-50727=>14585,
-50729=>14586,
-50730=>14587,
-50731=>14588,
-50735=>14589,
-50737=>14590,
-50738=>14591,
-50742=>14592,
-50744=>14593,
-50746=>14594,
-50748=>14595,
-50749=>14596,
-50750=>14597,
-50751=>14598,
-50754=>14599,
-50755=>14600,
-50757=>14601,
-50758=>14602,
-50759=>14603,
-50761=>14604,
-50762=>14605,
-50763=>14606,
-50764=>14607,
-50765=>14608,
-50766=>14609,
-50767=>14610,
-50770=>14611,
-50774=>14612,
-50775=>14613,
-50776=>14614,
-50777=>14615,
-50778=>14616,
-50779=>14617,
-50782=>14618,
-50783=>14619,
-50785=>14620,
-50786=>14621,
-50787=>14622,
-50788=>14623,
-50789=>14624,
-50790=>14625,
-50791=>14626,
-50792=>14627,
-50793=>14628,
-50794=>14629,
-50795=>14630,
-50797=>14631,
-50798=>14632,
-50800=>14633,
-50802=>14634,
-50803=>14635,
-50804=>14636,
-50805=>14637,
-50806=>14638,
-50807=>14639,
-50810=>14640,
-50811=>14641,
-50813=>14642,
-50814=>14643,
-50815=>14644,
-50817=>14645,
-50818=>14646,
-50819=>14647,
-50820=>14648,
-50821=>14649,
-50822=>14650,
-50823=>14651,
-50826=>14652,
-50828=>14653,
-50830=>14654,
-50831=>14655,
-50832=>14656,
-50833=>14657,
-50834=>14658,
-50835=>14659,
-50838=>14660,
-50839=>14661,
-50841=>14662,
-50842=>14663,
-50843=>14664,
-50845=>14665,
-50846=>14666,
-50847=>14667,
-50848=>14668,
-50849=>14669,
-50850=>14670,
-50851=>14671,
-50854=>14672,
-50856=>14673,
-50858=>14674,
-50859=>14675,
-50860=>14676,
-50861=>14677,
-50862=>14678,
-50863=>14679,
-50866=>14680,
-50867=>14681,
-50869=>14682,
-50870=>14683,
-50871=>14684,
-50875=>14685,
-50876=>14686,
-50877=>14687,
-50878=>14688,
-50879=>14689,
-50882=>14690,
-50884=>14691,
-50886=>14692,
-50887=>14693,
-50888=>14694,
-50889=>14695,
-50890=>14696,
-50891=>14697,
-50894=>14698,
-50895=>14699,
-50897=>14700,
-50898=>14701,
-50899=>14702,
-50901=>14703,
-50902=>14704,
-50903=>14705,
-50904=>14706,
-50905=>14707,
-50906=>14708,
-50907=>14709,
-50910=>14710,
-50911=>14711,
-50914=>14712,
-50915=>14713,
-50916=>14714,
-50917=>14715,
-50918=>14716,
-50919=>14717,
-50922=>14718,
-50923=>14719,
-50925=>14720,
-50926=>14721,
-50927=>14722,
-50929=>14723,
-50930=>14724,
-50931=>14725,
-50932=>14726,
-50933=>14727,
-50934=>14728,
-50935=>14729,
-50938=>14730,
-50939=>14731,
-50940=>14732,
-50942=>14733,
-50943=>14734,
-50944=>14735,
-50945=>14736,
-50946=>14737,
-50947=>14738,
-50950=>14739,
-50951=>14740,
-50953=>14741,
-50954=>14742,
-50955=>14743,
-50957=>14744,
-50958=>14745,
-50959=>14746,
-50960=>14747,
-50961=>14748,
-50962=>14749,
-50963=>14750,
-50966=>14751,
-50968=>14752,
-50970=>14753,
-50971=>14754,
-50972=>14755,
-50973=>14756,
-50974=>14757,
-50975=>14758,
-50978=>14759,
-50979=>14760,
-50981=>14761,
-50982=>14762,
-50983=>14763,
-50985=>14764,
-50986=>14765,
-50987=>14766,
-50988=>14767,
-50989=>14768,
-50990=>14769,
-50991=>14770,
-50994=>14771,
-50996=>14772,
-50998=>14773,
-51000=>14774,
-51001=>14775,
-51002=>14776,
-51003=>14777,
-51006=>14778,
-51007=>14779,
-51009=>14780,
-51010=>14781,
-51011=>14782,
-51013=>14783,
-51014=>14784,
-51015=>14785,
-51016=>14786,
-51017=>14787,
-51019=>14788,
-51022=>14789,
-51024=>14790,
-51033=>14791,
-51034=>14792,
-51035=>14793,
-51037=>14794,
-51038=>14795,
-51039=>14796,
-51041=>14797,
-51042=>14798,
-51043=>14799,
-51044=>14800,
-51045=>14801,
-51046=>14802,
-51047=>14803,
-51049=>14804,
-51050=>14805,
-51052=>14806,
-51053=>14807,
-51054=>14808,
-51055=>14809,
-51056=>14810,
-51057=>14811,
-51058=>14812,
-51059=>14813,
-51062=>14814,
-51063=>14815,
-51065=>14816,
-51066=>14817,
-51067=>14818,
-51071=>14819,
-51072=>14820,
-51073=>14821,
-51074=>14822,
-51078=>14823,
-51083=>14824,
-51084=>14825,
-51085=>14826,
-51087=>14827,
-51090=>14828,
-51091=>14829,
-51093=>14830,
-51097=>14831,
-51099=>14832,
-51100=>14833,
-51101=>14834,
-51102=>14835,
-51103=>14836,
-51106=>14837,
-51111=>14838,
-51112=>14839,
-51113=>14840,
-51114=>14841,
-51115=>14842,
-51118=>14843,
-51119=>14844,
-51121=>14845,
-51122=>14846,
-51123=>14847,
-51125=>14848,
-51126=>14849,
-51127=>14850,
-51128=>14851,
-51129=>14852,
-51130=>14853,
-51131=>14854,
-51134=>14855,
-51138=>14856,
-51139=>14857,
-51140=>14858,
-51141=>14859,
-51142=>14860,
-51143=>14861,
-51146=>14862,
-51147=>14863,
-51149=>14864,
-51151=>14865,
-51153=>14866,
-51154=>14867,
-51155=>14868,
-51156=>14869,
-51157=>14870,
-51158=>14871,
-51159=>14872,
-51161=>14873,
-51162=>14874,
-51163=>14875,
-51164=>14876,
-51166=>14877,
-51167=>14878,
-51168=>14879,
-51169=>14880,
-51170=>14881,
-51171=>14882,
-51173=>14883,
-51174=>14884,
-51175=>14885,
-51177=>14886,
-51178=>14887,
-51179=>14888,
-51181=>14889,
-51182=>14890,
-51183=>14891,
-51184=>14892,
-51185=>14893,
-51186=>14894,
-51187=>14895,
-51188=>14896,
-51189=>14897,
-51190=>14898,
-51191=>14899,
-51192=>14900,
-51193=>14901,
-51194=>14902,
-51195=>14903,
-51196=>14904,
-51197=>14905,
-51198=>14906,
-51199=>14907,
-51202=>14908,
-51203=>14909,
-51205=>14910,
-51206=>14911,
-51207=>14912,
-51209=>14913,
-51211=>14914,
-51212=>14915,
-51213=>14916,
-51214=>14917,
-51215=>14918,
-51218=>14919,
-51220=>14920,
-51223=>14921,
-51224=>14922,
-51225=>14923,
-51226=>14924,
-51227=>14925,
-51230=>14926,
-51231=>14927,
-51233=>14928,
-51234=>14929,
-51235=>14930,
-51237=>14931,
-51238=>14932,
-51239=>14933,
-51240=>14934,
-51241=>14935,
-51242=>14936,
-51243=>14937,
-51246=>14938,
-51248=>14939,
-51250=>14940,
-51251=>14941,
-51252=>14942,
-51253=>14943,
-51254=>14944,
-51255=>14945,
-51257=>14946,
-51258=>14947,
-51259=>14948,
-51261=>14949,
-51262=>14950,
-51263=>14951,
-51265=>14952,
-51266=>14953,
-51267=>14954,
-51268=>14955,
-51269=>14956,
-51270=>14957,
-51271=>14958,
-51274=>14959,
-51275=>14960,
-51278=>14961,
-51279=>14962,
-51280=>14963,
-51281=>14964,
-51282=>14965,
-51283=>14966,
-51285=>14967,
-51286=>14968,
-51287=>14969,
-51288=>14970,
-51289=>14971,
-51290=>14972,
-51291=>14973,
-51292=>14974,
-51293=>14975,
-51294=>14976,
-51295=>14977,
-51296=>14978,
-51297=>14979,
-51298=>14980,
-51299=>14981,
-51300=>14982,
-51301=>14983,
-51302=>14984,
-51303=>14985,
-51304=>14986,
-51305=>14987,
-51306=>14988,
-51307=>14989,
-51308=>14990,
-51309=>14991,
-51310=>14992,
-51311=>14993,
-51314=>14994,
-51315=>14995,
-51317=>14996,
-51318=>14997,
-51319=>14998,
-51321=>14999,
-51323=>15000,
-51324=>15001,
-51325=>15002,
-51326=>15003,
-51327=>15004,
-51330=>15005,
-51332=>15006,
-51336=>15007,
-51337=>15008,
-51338=>15009,
-51342=>15010,
-51343=>15011,
-51344=>15012,
-51345=>15013,
-51346=>15014,
-51347=>15015,
-51349=>15016,
-51350=>15017,
-51351=>15018,
-51352=>15019,
-51353=>15020,
-51354=>15021,
-51355=>15022,
-51356=>15023,
-51358=>15024,
-51360=>15025,
-51362=>15026,
-51363=>15027,
-51364=>15028,
-51365=>15029,
-51366=>15030,
-51367=>15031,
-51369=>15032,
-51370=>15033,
-51371=>15034,
-51372=>15035,
-51373=>15036,
-51374=>15037,
-51375=>15038,
-51376=>15039,
-51377=>15040,
-51378=>15041,
-51379=>15042,
-51380=>15043,
-51381=>15044,
-51382=>15045,
-51383=>15046,
-51384=>15047,
-51385=>15048,
-51386=>15049,
-51387=>15050,
-51390=>15051,
-51391=>15052,
-51392=>15053,
-51393=>15054,
-51394=>15055,
-51395=>15056,
-51397=>15057,
-51398=>15058,
-51399=>15059,
-51401=>15060,
-51402=>15061,
-51403=>15062,
-51405=>15063,
-51406=>15064,
-51407=>15065,
-51408=>15066,
-51409=>15067,
-51410=>15068,
-51411=>15069,
-51414=>15070,
-51416=>15071,
-51418=>15072,
-51419=>15073,
-51420=>15074,
-51421=>15075,
-51422=>15076,
-51423=>15077,
-51426=>15078,
-51427=>15079,
-51429=>15080,
-51430=>15081,
-51431=>15082,
-51432=>15083,
-51433=>15084,
-51434=>15085,
-51435=>15086,
-51436=>15087,
-51437=>15088,
-51438=>15089,
-51439=>15090,
-51440=>15091,
-51441=>15092,
-51442=>15093,
-51443=>15094,
-51444=>15095,
-51446=>15096,
-51447=>15097,
-51448=>15098,
-51449=>15099,
-51450=>15100,
-51451=>15101,
-51454=>15102,
-51455=>15103,
-51457=>15104,
-51458=>15105,
-51459=>15106,
-51463=>15107,
-51464=>15108,
-51465=>15109,
-51466=>15110,
-51467=>15111,
-51470=>15112,
-51472=>15113,
-51474=>15114,
-51475=>15115,
-51476=>15116,
-51477=>15117,
-51478=>15118,
-51479=>15119,
-51481=>15120,
-51482=>15121,
-51483=>15122,
-51484=>15123,
-51485=>15124,
-51486=>15125,
-51487=>15126,
-51488=>15127,
-51489=>15128,
-51490=>15129,
-51491=>15130,
-51492=>15131,
-51493=>15132,
-51494=>15133,
-51495=>15134,
-51496=>15135,
-51497=>15136,
-51498=>15137,
-51499=>15138,
-51501=>15139,
-51502=>15140,
-51503=>15141,
-51504=>15142,
-51505=>15143,
-51506=>15144,
-51507=>15145,
-51509=>15146,
-51510=>15147,
-51511=>15148,
-51512=>15149,
-51513=>15150,
-51514=>15151,
-51515=>15152,
-51516=>15153,
-51517=>15154,
-51518=>15155,
-51519=>15156,
-51520=>15157,
-51521=>15158,
-51522=>15159,
-51523=>15160,
-51524=>15161,
-51525=>15162,
-51526=>15163,
-51527=>15164,
-51528=>15165,
-51529=>15166,
-51530=>15167,
-51531=>15168,
-51532=>15169,
-51533=>15170,
-51534=>15171,
-51535=>15172,
-51538=>15173,
-51539=>15174,
-51541=>15175,
-51542=>15176,
-51543=>15177,
-51545=>15178,
-51546=>15179,
-51547=>15180,
-51548=>15181,
-51549=>15182,
-51550=>15183,
-51551=>15184,
-51554=>15185,
-51556=>15186,
-51557=>15187,
-51558=>15188,
-51559=>15189,
-51560=>15190,
-51561=>15191,
-51562=>15192,
-51563=>15193,
-51565=>15194,
-51566=>15195,
-51567=>15196,
-51569=>15197,
-51570=>15198,
-51571=>15199,
-51573=>15200,
-51574=>15201,
-51575=>15202,
-51576=>15203,
-51577=>15204,
-51578=>15205,
-51579=>15206,
-51581=>15207,
-51582=>15208,
-51583=>15209,
-51584=>15210,
-51585=>15211,
-51586=>15212,
-51587=>15213,
-51588=>15214,
-51589=>15215,
-51590=>15216,
-51591=>15217,
-51594=>15218,
-51595=>15219,
-51597=>15220,
-51598=>15221,
-51599=>15222,
-51601=>15223,
-51602=>15224,
-51603=>15225,
-51604=>15226,
-51605=>15227,
-51606=>15228,
-51607=>15229,
-51610=>15230,
-51612=>15231,
-51614=>15232,
-51615=>15233,
-51616=>15234,
-51617=>15235,
-51618=>15236,
-51619=>15237,
-51620=>15238,
-51621=>15239,
-51622=>15240,
-51623=>15241,
-51624=>15242,
-51625=>15243,
-51626=>15244,
-51627=>15245,
-51628=>15246,
-51629=>15247,
-51630=>15248,
-51631=>15249,
-51632=>15250,
-51633=>15251,
-51634=>15252,
-51635=>15253,
-51636=>15254,
-51637=>15255,
-51638=>15256,
-51639=>15257,
-51640=>15258,
-51641=>15259,
-51642=>15260,
-51643=>15261,
-51644=>15262,
-51645=>15263,
-51646=>15264,
-51647=>15265,
-51650=>15266,
-51651=>15267,
-51653=>15268,
-51654=>15269,
-51657=>15270,
-51659=>15271,
-51660=>15272,
-51661=>15273,
-51662=>15274,
-51663=>15275,
-51666=>15276,
-51668=>15277,
-51671=>15278,
-51672=>15279,
-51675=>15280,
-51678=>15281,
-51679=>15282,
-51681=>15283,
-51683=>15284,
-51685=>15285,
-51686=>15286,
-51688=>15287,
-51689=>15288,
-51690=>15289,
-51691=>15290,
-51694=>15291,
-51698=>15292,
-51699=>15293,
-51700=>15294,
-51701=>15295,
-51702=>15296,
-51703=>15297,
-51706=>15298,
-51707=>15299,
-51709=>15300,
-51710=>15301,
-51711=>15302,
-51713=>15303,
-51714=>15304,
-51715=>15305,
-51716=>15306,
-51717=>15307,
-51718=>15308,
-51719=>15309,
-51722=>15310,
-51726=>15311,
-51727=>15312,
-51728=>15313,
-51729=>15314,
-51730=>15315,
-51731=>15316,
-51733=>15317,
-51734=>15318,
-51735=>15319,
-51737=>15320,
-51738=>15321,
-51739=>15322,
-51740=>15323,
-51741=>15324,
-51742=>15325,
-51743=>15326,
-51744=>15327,
-51745=>15328,
-51746=>15329,
-51747=>15330,
-51748=>15331,
-51749=>15332,
-51750=>15333,
-51751=>15334,
-51752=>15335,
-51754=>15336,
-51755=>15337,
-51756=>15338,
-51757=>15339,
-51758=>15340,
-51759=>15341,
-51760=>15342,
-51761=>15343,
-51762=>15344,
-51763=>15345,
-51764=>15346,
-51765=>15347,
-51766=>15348,
-51767=>15349,
-51768=>15350,
-51769=>15351,
-51770=>15352,
-51771=>15353,
-51772=>15354,
-51773=>15355,
-51774=>15356,
-51775=>15357,
-51776=>15358,
-51777=>15359,
-51778=>15360,
-51779=>15361,
-51780=>15362,
-51781=>15363,
-51782=>15364,
-51783=>15365,
-51784=>15366,
-51785=>15367,
-51786=>15368,
-51787=>15369,
-51790=>15370,
-51791=>15371,
-51793=>15372,
-51794=>15373,
-51795=>15374,
-51797=>15375,
-51798=>15376,
-51799=>15377,
-51800=>15378,
-51801=>15379,
-51802=>15380,
-51803=>15381,
-51806=>15382,
-51810=>15383,
-51811=>15384,
-51812=>15385,
-51813=>15386,
-51814=>15387,
-51815=>15388,
-51817=>15389,
-51818=>15390,
-51819=>15391,
-51820=>15392,
-51821=>15393,
-51822=>15394,
-51823=>15395,
-51824=>15396,
-51825=>15397,
-51826=>15398,
-51827=>15399,
-51828=>15400,
-51829=>15401,
-51830=>15402,
-51831=>15403,
-51832=>15404,
-51833=>15405,
-51834=>15406,
-51835=>15407,
-51836=>15408,
-51838=>15409,
-51839=>15410,
-51840=>15411,
-51841=>15412,
-51842=>15413,
-51843=>15414,
-51845=>15415,
-51846=>15416,
-51847=>15417,
-51848=>15418,
-51849=>15419,
-51850=>15420,
-51851=>15421,
-51852=>15422,
-51853=>15423,
-51854=>15424,
-51855=>15425,
-51856=>15426,
-51857=>15427,
-51858=>15428,
-51859=>15429,
-51860=>15430,
-51861=>15431,
-51862=>15432,
-51863=>15433,
-51865=>15434,
-51866=>15435,
-51867=>15436,
-51868=>15437,
-51869=>15438,
-51870=>15439,
-51871=>15440,
-51872=>15441,
-51873=>15442,
-51874=>15443,
-51875=>15444,
-51876=>15445,
-51877=>15446,
-51878=>15447,
-51879=>15448,
-51880=>15449,
-51881=>15450,
-51882=>15451,
-51883=>15452,
-51884=>15453,
-51885=>15454,
-51886=>15455,
-51887=>15456,
-51888=>15457,
-51889=>15458,
-51890=>15459,
-51891=>15460,
-51892=>15461,
-51893=>15462,
-51894=>15463,
-51895=>15464,
-51896=>15465,
-51897=>15466,
-51898=>15467,
-51899=>15468,
-51902=>15469,
-51903=>15470,
-51905=>15471,
-51906=>15472,
-51907=>15473,
-51909=>15474,
-51910=>15475,
-51911=>15476,
-51912=>15477,
-51913=>15478,
-51914=>15479,
-51915=>15480,
-51918=>15481,
-51920=>15482,
-51922=>15483,
-51924=>15484,
-51925=>15485,
-51926=>15486,
-51927=>15487,
-51930=>15488,
-51931=>15489,
-51932=>15490,
-51933=>15491,
-51934=>15492,
-51935=>15493,
-51937=>15494,
-51938=>15495,
-51939=>15496,
-51940=>15497,
-51941=>15498,
-51942=>15499,
-51943=>15500,
-51944=>15501,
-51945=>15502,
-51946=>15503,
-51947=>15504,
-51949=>15505,
-51950=>15506,
-51951=>15507,
-51952=>15508,
-51953=>15509,
-51954=>15510,
-51955=>15511,
-51957=>15512,
-51958=>15513,
-51959=>15514,
-51960=>15515,
-51961=>15516,
-51962=>15517,
-51963=>15518,
-51964=>15519,
-51965=>15520,
-51966=>15521,
-51967=>15522,
-51968=>15523,
-51969=>15524,
-51970=>15525,
-51971=>15526,
-51972=>15527,
-51973=>15528,
-51974=>15529,
-51975=>15530,
-51977=>15531,
-51978=>15532,
-51979=>15533,
-51980=>15534,
-51981=>15535,
-51982=>15536,
-51983=>15537,
-51985=>15538,
-51986=>15539,
-51987=>15540,
-51989=>15541,
-51990=>15542,
-51991=>15543,
-51993=>15544,
-51994=>15545,
-51995=>15546,
-51996=>15547,
-51997=>15548,
-51998=>15549,
-51999=>15550,
-52002=>15551,
-52003=>15552,
-52004=>15553,
-52005=>15554,
-52006=>15555,
-52007=>15556,
-52008=>15557,
-52009=>15558,
-52010=>15559,
-52011=>15560,
-52012=>15561,
-52013=>15562,
-52014=>15563,
-52015=>15564,
-52016=>15565,
-52017=>15566,
-52018=>15567,
-52019=>15568,
-52020=>15569,
-52021=>15570,
-52022=>15571,
-52023=>15572,
-52024=>15573,
-52025=>15574,
-52026=>15575,
-52027=>15576,
-52028=>15577,
-52029=>15578,
-52030=>15579,
-52031=>15580,
-52032=>15581,
-52034=>15582,
-52035=>15583,
-52036=>15584,
-52037=>15585,
-52038=>15586,
-52039=>15587,
-52042=>15588,
-52043=>15589,
-52045=>15590,
-52046=>15591,
-52047=>15592,
-52049=>15593,
-52050=>15594,
-52051=>15595,
-52052=>15596,
-52053=>15597,
-52054=>15598,
-52055=>15599,
-52058=>15600,
-52059=>15601,
-52060=>15602,
-52062=>15603,
-52063=>15604,
-52064=>15605,
-52065=>15606,
-52066=>15607,
-52067=>15608,
-52069=>15609,
-52070=>15610,
-52071=>15611,
-52072=>15612,
-52073=>15613,
-52074=>15614,
-52075=>15615,
-52076=>15616,
-52077=>15617,
-52078=>15618,
-52079=>15619,
-52080=>15620,
-52081=>15621,
-52082=>15622,
-52083=>15623,
-52084=>15624,
-52085=>15625,
-52086=>15626,
-52087=>15627,
-52090=>15628,
-52091=>15629,
-52092=>15630,
-52093=>15631,
-52094=>15632,
-52095=>15633,
-52096=>15634,
-52097=>15635,
-52098=>15636,
-52099=>15637,
-52100=>15638,
-52101=>15639,
-52102=>15640,
-52103=>15641,
-52104=>15642,
-52105=>15643,
-52106=>15644,
-52107=>15645,
-52108=>15646,
-52109=>15647,
-52110=>15648,
-52111=>15649,
-52112=>15650,
-52113=>15651,
-52114=>15652,
-52115=>15653,
-52116=>15654,
-52117=>15655,
-52118=>15656,
-52119=>15657,
-52120=>15658,
-52121=>15659,
-52122=>15660,
-52123=>15661,
-52125=>15662,
-52126=>15663,
-52127=>15664,
-52128=>15665,
-52129=>15666,
-52130=>15667,
-52131=>15668,
-52132=>15669,
-52133=>15670,
-52134=>15671,
-52135=>15672,
-52136=>15673,
-52137=>15674,
-52138=>15675,
-52139=>15676,
-52140=>15677,
-52141=>15678,
-52142=>15679,
-52143=>15680,
-52144=>15681,
-52145=>15682,
-52146=>15683,
-52147=>15684,
-52148=>15685,
-52149=>15686,
-52150=>15687,
-52151=>15688,
-52153=>15689,
-52154=>15690,
-52155=>15691,
-52156=>15692,
-52157=>15693,
-52158=>15694,
-52159=>15695,
-52160=>15696,
-52161=>15697,
-52162=>15698,
-52163=>15699,
-52164=>15700,
-52165=>15701,
-52166=>15702,
-52167=>15703,
-52168=>15704,
-52169=>15705,
-52170=>15706,
-52171=>15707,
-52172=>15708,
-52173=>15709,
-52174=>15710,
-52175=>15711,
-52176=>15712,
-52177=>15713,
-52178=>15714,
-52179=>15715,
-52181=>15716,
-52182=>15717,
-52183=>15718,
-52184=>15719,
-52185=>15720,
-52186=>15721,
-52187=>15722,
-52188=>15723,
-52189=>15724,
-52190=>15725,
-52191=>15726,
-52192=>15727,
-52193=>15728,
-52194=>15729,
-52195=>15730,
-52197=>15731,
-52198=>15732,
-52200=>15733,
-52202=>15734,
-52203=>15735,
-52204=>15736,
-52205=>15737,
-52206=>15738,
-52207=>15739,
-52208=>15740,
-52209=>15741,
-52210=>15742,
-52211=>15743,
-52212=>15744,
-52213=>15745,
-52214=>15746,
-52215=>15747,
-52216=>15748,
-52217=>15749,
-52218=>15750,
-52219=>15751,
-52220=>15752,
-52221=>15753,
-52222=>15754,
-52223=>15755,
-52224=>15756,
-52225=>15757,
-52226=>15758,
-52227=>15759,
-52228=>15760,
-52229=>15761,
-52230=>15762,
-52231=>15763,
-52232=>15764,
-52233=>15765,
-52234=>15766,
-52235=>15767,
-52238=>15768,
-52239=>15769,
-52241=>15770,
-52242=>15771,
-52243=>15772,
-52245=>15773,
-52246=>15774,
-52247=>15775,
-52248=>15776,
-52249=>15777,
-52250=>15778,
-52251=>15779,
-52254=>15780,
-52255=>15781,
-52256=>15782,
-52259=>15783,
-52260=>15784,
-52261=>15785,
-52262=>15786,
-52266=>15787,
-52267=>15788,
-52269=>15789,
-52271=>15790,
-52273=>15791,
-52274=>15792,
-52275=>15793,
-52276=>15794,
-52277=>15795,
-52278=>15796,
-52279=>15797,
-52282=>15798,
-52287=>15799,
-52288=>15800,
-52289=>15801,
-52290=>15802,
-52291=>15803,
-52294=>15804,
-52295=>15805,
-52297=>15806,
-52298=>15807,
-52299=>15808,
-52301=>15809,
-52302=>15810,
-52303=>15811,
-52304=>15812,
-52305=>15813,
-52306=>15814,
-52307=>15815,
-52310=>15816,
-52314=>15817,
-52315=>15818,
-52316=>15819,
-52317=>15820,
-52318=>15821,
-52319=>15822,
-52321=>15823,
-52322=>15824,
-52323=>15825,
-52325=>15826,
-52327=>15827,
-52329=>15828,
-52330=>15829,
-52331=>15830,
-52332=>15831,
-52333=>15832,
-52334=>15833,
-52335=>15834,
-52337=>15835,
-52338=>15836,
-52339=>15837,
-52340=>15838,
-52342=>15839,
-52343=>15840,
-52344=>15841,
-52345=>15842,
-52346=>15843,
-52347=>15844,
-52348=>15845,
-52349=>15846,
-52350=>15847,
-52351=>15848,
-52352=>15849,
-52353=>15850,
-52354=>15851,
-52355=>15852,
-52356=>15853,
-52357=>15854,
-52358=>15855,
-52359=>15856,
-52360=>15857,
-52361=>15858,
-52362=>15859,
-52363=>15860,
-52364=>15861,
-52365=>15862,
-52366=>15863,
-52367=>15864,
-52368=>15865,
-52369=>15866,
-52370=>15867,
-52371=>15868,
-52372=>15869,
-52373=>15870,
-52374=>15871,
-52375=>15872,
-52378=>15873,
-52379=>15874,
-52381=>15875,
-52382=>15876,
-52383=>15877,
-52385=>15878,
-52386=>15879,
-52387=>15880,
-52388=>15881,
-52389=>15882,
-52390=>15883,
-52391=>15884,
-52394=>15885,
-52398=>15886,
-52399=>15887,
-52400=>15888,
-52401=>15889,
-52402=>15890,
-52403=>15891,
-52406=>15892,
-52407=>15893,
-52409=>15894,
-52410=>15895,
-52411=>15896,
-52413=>15897,
-52414=>15898,
-52415=>15899,
-52416=>15900,
-52417=>15901,
-52418=>15902,
-52419=>15903,
-52422=>15904,
-52424=>15905,
-52426=>15906,
-52427=>15907,
-52428=>15908,
-52429=>15909,
-52430=>15910,
-52431=>15911,
-52433=>15912,
-52434=>15913,
-52435=>15914,
-52437=>15915,
-52438=>15916,
-52439=>15917,
-52440=>15918,
-52441=>15919,
-52442=>15920,
-52443=>15921,
-52444=>15922,
-52445=>15923,
-52446=>15924,
-52447=>15925,
-52448=>15926,
-52449=>15927,
-52450=>15928,
-52451=>15929,
-52453=>15930,
-52454=>15931,
-52455=>15932,
-52456=>15933,
-52457=>15934,
-52458=>15935,
-52459=>15936,
-52461=>15937,
-52462=>15938,
-52463=>15939,
-52465=>15940,
-52466=>15941,
-52467=>15942,
-52468=>15943,
-52469=>15944,
-52470=>15945,
-52471=>15946,
-52472=>15947,
-52473=>15948,
-52474=>15949,
-52475=>15950,
-52476=>15951,
-52477=>15952,
-52478=>15953,
-52479=>15954,
-52480=>15955,
-52482=>15956,
-52483=>15957,
-52484=>15958,
-52485=>15959,
-52486=>15960,
-52487=>15961,
-52490=>15962,
-52491=>15963,
-52493=>15964,
-52494=>15965,
-52495=>15966,
-52497=>15967,
-52498=>15968,
-52499=>15969,
-52500=>15970,
-52501=>15971,
-52502=>15972,
-52503=>15973,
-52506=>15974,
-52508=>15975,
-52510=>15976,
-52511=>15977,
-52512=>15978,
-52513=>15979,
-52514=>15980,
-52515=>15981,
-52517=>15982,
-52518=>15983,
-52519=>15984,
-52521=>15985,
-52522=>15986,
-52523=>15987,
-52525=>15988,
-52526=>15989,
-52527=>15990,
-52528=>15991,
-52529=>15992,
-52530=>15993,
-52531=>15994,
-52532=>15995,
-52533=>15996,
-52534=>15997,
-52535=>15998,
-52536=>15999,
-52538=>16000,
-52539=>16001,
-52540=>16002,
-52541=>16003,
-52542=>16004,
-52543=>16005,
-52544=>16006,
-52545=>16007,
-52546=>16008,
-52547=>16009,
-52548=>16010,
-52549=>16011,
-52550=>16012,
-52551=>16013,
-52552=>16014,
-52553=>16015,
-52554=>16016,
-52555=>16017,
-52556=>16018,
-52557=>16019,
-52558=>16020,
-52559=>16021,
-52560=>16022,
-52561=>16023,
-52562=>16024,
-52563=>16025,
-52564=>16026,
-52565=>16027,
-52566=>16028,
-52567=>16029,
-52568=>16030,
-52569=>16031,
-52570=>16032,
-52571=>16033,
-52573=>16034,
-52574=>16035,
-52575=>16036,
-52577=>16037,
-52578=>16038,
-52579=>16039,
-52581=>16040,
-52582=>16041,
-52583=>16042,
-52584=>16043,
-52585=>16044,
-52586=>16045,
-52587=>16046,
-52590=>16047,
-52592=>16048,
-52594=>16049,
-52595=>16050,
-52596=>16051,
-52597=>16052,
-52598=>16053,
-52599=>16054,
-52601=>16055,
-52602=>16056,
-52603=>16057,
-52604=>16058,
-52605=>16059,
-52606=>16060,
-52607=>16061,
-52608=>16062,
-52609=>16063,
-52610=>16064,
-52611=>16065,
-52612=>16066,
-52613=>16067,
-52614=>16068,
-52615=>16069,
-52617=>16070,
-52618=>16071,
-52619=>16072,
-52620=>16073,
-52621=>16074,
-52622=>16075,
-52623=>16076,
-52624=>16077,
-52625=>16078,
-52626=>16079,
-52627=>16080,
-52630=>16081,
-52631=>16082,
-52633=>16083,
-52634=>16084,
-52635=>16085,
-52637=>16086,
-52638=>16087,
-52639=>16088,
-52640=>16089,
-52641=>16090,
-52642=>16091,
-52643=>16092,
-52646=>16093,
-52648=>16094,
-52650=>16095,
-52651=>16096,
-52652=>16097,
-52653=>16098,
-52654=>16099,
-52655=>16100,
-52657=>16101,
-52658=>16102,
-52659=>16103,
-52660=>16104,
-52661=>16105,
-52662=>16106,
-52663=>16107,
-52664=>16108,
-52665=>16109,
-52666=>16110,
-52667=>16111,
-52668=>16112,
-52669=>16113,
-52670=>16114,
-52671=>16115,
-52672=>16116,
-52673=>16117,
-52674=>16118,
-52675=>16119,
-52677=>16120,
-52678=>16121,
-52679=>16122,
-52680=>16123,
-52681=>16124,
-52682=>16125,
-52683=>16126,
-52685=>16127,
-52686=>16128,
-52687=>16129,
-52689=>16130,
-52690=>16131,
-52691=>16132,
-52692=>16133,
-52693=>16134,
-52694=>16135,
-52695=>16136,
-52696=>16137,
-52697=>16138,
-52698=>16139,
-52699=>16140,
-52700=>16141,
-52701=>16142,
-52702=>16143,
-52703=>16144,
-52704=>16145,
-52705=>16146,
-52706=>16147,
-52707=>16148,
-52708=>16149,
-52709=>16150,
-52710=>16151,
-52711=>16152,
-52713=>16153,
-52714=>16154,
-52715=>16155,
-52717=>16156,
-52718=>16157,
-52719=>16158,
-52721=>16159,
-52722=>16160,
-52723=>16161,
-52724=>16162,
-52725=>16163,
-52726=>16164,
-52727=>16165,
-52730=>16166,
-52732=>16167,
-52734=>16168,
-52735=>16169,
-52736=>16170,
-52737=>16171,
-52738=>16172,
-52739=>16173,
-52741=>16174,
-52742=>16175,
-52743=>16176,
-52745=>16177,
-52746=>16178,
-52747=>16179,
-52749=>16180,
-52750=>16181,
-52751=>16182,
-52752=>16183,
-52753=>16184,
-52754=>16185,
-52755=>16186,
-52757=>16187,
-52758=>16188,
-52759=>16189,
-52760=>16190,
-52762=>16191,
-52763=>16192,
-52764=>16193,
-52765=>16194,
-52766=>16195,
-52767=>16196,
-52770=>16197,
-52771=>16198,
-52773=>16199,
-52774=>16200,
-52775=>16201,
-52777=>16202,
-52778=>16203,
-52779=>16204,
-52780=>16205,
-52781=>16206,
-52782=>16207,
-52783=>16208,
-52786=>16209,
-52788=>16210,
-52790=>16211,
-52791=>16212,
-52792=>16213,
-52793=>16214,
-52794=>16215,
-52795=>16216,
-52796=>16217,
-52797=>16218,
-52798=>16219,
-52799=>16220,
-52800=>16221,
-52801=>16222,
-52802=>16223,
-52803=>16224,
-52804=>16225,
-52805=>16226,
-52806=>16227,
-52807=>16228,
-52808=>16229,
-52809=>16230,
-52810=>16231,
-52811=>16232,
-52812=>16233,
-52813=>16234,
-52814=>16235,
-52815=>16236,
-52816=>16237,
-52817=>16238,
-52818=>16239,
-52819=>16240,
-52820=>16241,
-52821=>16242,
-52822=>16243,
-52823=>16244,
-52826=>16245,
-52827=>16246,
-52829=>16247,
-52830=>16248,
-52834=>16249,
-52835=>16250,
-52836=>16251,
-52837=>16252,
-52838=>16253,
-52839=>16254,
-52842=>16255,
-52844=>16256,
-52846=>16257,
-52847=>16258,
-52848=>16259,
-52849=>16260,
-52850=>16261,
-52851=>16262,
-52854=>16263,
-52855=>16264,
-52857=>16265,
-52858=>16266,
-52859=>16267,
-52861=>16268,
-52862=>16269,
-52863=>16270,
-52864=>16271,
-52865=>16272,
-52866=>16273,
-52867=>16274,
-52870=>16275,
-52872=>16276,
-52874=>16277,
-52875=>16278,
-52876=>16279,
-52877=>16280,
-52878=>16281,
-52879=>16282,
-52882=>16283,
-52883=>16284,
-52885=>16285,
-52886=>16286,
-52887=>16287,
-52889=>16288,
-52890=>16289,
-52891=>16290,
-52892=>16291,
-52893=>16292,
-52894=>16293,
-52895=>16294,
-52898=>16295,
-52902=>16296,
-52903=>16297,
-52904=>16298,
-52905=>16299,
-52906=>16300,
-52907=>16301,
-52910=>16302,
-52911=>16303,
-52912=>16304,
-52913=>16305,
-52914=>16306,
-52915=>16307,
-52916=>16308,
-52917=>16309,
-52918=>16310,
-52919=>16311,
-52920=>16312,
-52921=>16313,
-52922=>16314,
-52923=>16315,
-52924=>16316,
-52925=>16317,
-52926=>16318,
-52927=>16319,
-52928=>16320,
-52930=>16321,
-52931=>16322,
-52932=>16323,
-52933=>16324,
-52934=>16325,
-52935=>16326,
-52936=>16327,
-52937=>16328,
-52938=>16329,
-52939=>16330,
-52940=>16331,
-52941=>16332,
-52942=>16333,
-52943=>16334,
-52944=>16335,
-52945=>16336,
-52946=>16337,
-52947=>16338,
-52948=>16339,
-52949=>16340,
-52950=>16341,
-52951=>16342,
-52952=>16343,
-52953=>16344,
-52954=>16345,
-52955=>16346,
-52956=>16347,
-52957=>16348,
-52958=>16349,
-52959=>16350,
-52960=>16351,
-52961=>16352,
-52962=>16353,
-52963=>16354,
-52966=>16355,
-52967=>16356,
-52969=>16357,
-52970=>16358,
-52973=>16359,
-52974=>16360,
-52975=>16361,
-52976=>16362,
-52977=>16363,
-52978=>16364,
-52979=>16365,
-52982=>16366,
-52986=>16367,
-52987=>16368,
-52988=>16369,
-52989=>16370,
-52990=>16371,
-52991=>16372,
-52994=>16373,
-52995=>16374,
-52997=>16375,
-52998=>16376,
-52999=>16377,
-53001=>16378,
-53002=>16379,
-53003=>16380,
-53004=>16381,
-53005=>16382,
-53006=>16383,
-53007=>16384,
-53010=>16385,
-53012=>16386,
-53014=>16387,
-53015=>16388,
-53016=>16389,
-53017=>16390,
-53018=>16391,
-53019=>16392,
-53021=>16393,
-53022=>16394,
-53023=>16395,
-53025=>16396,
-53026=>16397,
-53027=>16398,
-53029=>16399,
-53030=>16400,
-53031=>16401,
-53032=>16402,
-53033=>16403,
-53034=>16404,
-53035=>16405,
-53038=>16406,
-53042=>16407,
-53043=>16408,
-53044=>16409,
-53045=>16410,
-53046=>16411,
-53047=>16412,
-53049=>16413,
-53050=>16414,
-53051=>16415,
-53052=>16416,
-53053=>16417,
-53054=>16418,
-53055=>16419,
-53056=>16420,
-53057=>16421,
-53058=>16422,
-53059=>16423,
-53060=>16424,
-53061=>16425,
-53062=>16426,
-53063=>16427,
-53064=>16428,
-53065=>16429,
-53066=>16430,
-53067=>16431,
-53068=>16432,
-53069=>16433,
-53070=>16434,
-53071=>16435,
-53072=>16436,
-53073=>16437,
-53074=>16438,
-53075=>16439,
-53078=>16440,
-53079=>16441,
-53081=>16442,
-53082=>16443,
-53083=>16444,
-53085=>16445,
-53086=>16446,
-53087=>16447,
-53088=>16448,
-53089=>16449,
-53090=>16450,
-53091=>16451,
-53094=>16452,
-53096=>16453,
-53098=>16454,
-53099=>16455,
-53100=>16456,
-53101=>16457,
-53102=>16458,
-53103=>16459,
-53106=>16460,
-53107=>16461,
-53109=>16462,
-53110=>16463,
-53111=>16464,
-53113=>16465,
-53114=>16466,
-53115=>16467,
-53116=>16468,
-53117=>16469,
-53118=>16470,
-53119=>16471,
-53121=>16472,
-53122=>16473,
-53123=>16474,
-53124=>16475,
-53126=>16476,
-53127=>16477,
-53128=>16478,
-53129=>16479,
-53130=>16480,
-53131=>16481,
-53133=>16482,
-53134=>16483,
-53135=>16484,
-53136=>16485,
-53137=>16486,
-53138=>16487,
-53139=>16488,
-53140=>16489,
-53141=>16490,
-53142=>16491,
-53143=>16492,
-53144=>16493,
-53145=>16494,
-53146=>16495,
-53147=>16496,
-53148=>16497,
-53149=>16498,
-53150=>16499,
-53151=>16500,
-53152=>16501,
-53154=>16502,
-53155=>16503,
-53156=>16504,
-53157=>16505,
-53158=>16506,
-53159=>16507,
-53161=>16508,
-53162=>16509,
-53163=>16510,
-53164=>16511,
-53165=>16512,
-53166=>16513,
-53167=>16514,
-53169=>16515,
-53170=>16516,
-53171=>16517,
-53172=>16518,
-53173=>16519,
-53174=>16520,
-53175=>16521,
-53176=>16522,
-53177=>16523,
-53178=>16524,
-53179=>16525,
-53180=>16526,
-53181=>16527,
-53182=>16528,
-53183=>16529,
-53184=>16530,
-53185=>16531,
-53186=>16532,
-53187=>16533,
-53189=>16534,
-53190=>16535,
-53191=>16536,
-53192=>16537,
-53193=>16538,
-53194=>16539,
-53195=>16540,
-53196=>16541,
-53197=>16542,
-53198=>16543,
-53199=>16544,
-53200=>16545,
-53201=>16546,
-53202=>16547,
-53203=>16548,
-53204=>16549,
-53205=>16550,
-53206=>16551,
-53207=>16552,
-53208=>16553,
-53209=>16554,
-53210=>16555,
-53211=>16556,
-53212=>16557,
-53213=>16558,
-53214=>16559,
-53215=>16560,
-53218=>16561,
-53219=>16562,
-53221=>16563,
-53222=>16564,
-53223=>16565,
-53225=>16566,
-53226=>16567,
-53227=>16568,
-53228=>16569,
-53229=>16570,
-53230=>16571,
-53231=>16572,
-53234=>16573,
-53236=>16574,
-53238=>16575,
-53239=>16576,
-53240=>16577,
-53241=>16578,
-53242=>16579,
-53243=>16580,
-53245=>16581,
-53246=>16582,
-53247=>16583,
-53249=>16584,
-53250=>16585,
-53251=>16586,
-53253=>16587,
-53254=>16588,
-53255=>16589,
-53256=>16590,
-53257=>16591,
-53258=>16592,
-53259=>16593,
-53260=>16594,
-53261=>16595,
-53262=>16596,
-53263=>16597,
-53264=>16598,
-53266=>16599,
-53267=>16600,
-53268=>16601,
-53269=>16602,
-53270=>16603,
-53271=>16604,
-53273=>16605,
-53274=>16606,
-53275=>16607,
-53276=>16608,
-53277=>16609,
-53278=>16610,
-53279=>16611,
-53280=>16612,
-53281=>16613,
-53282=>16614,
-53283=>16615,
-53284=>16616,
-53285=>16617,
-53286=>16618,
-53287=>16619,
-53288=>16620,
-53289=>16621,
-53290=>16622,
-53291=>16623,
-53292=>16624,
-53294=>16625,
-53295=>16626,
-53296=>16627,
-53297=>16628,
-53298=>16629,
-53299=>16630,
-53302=>16631,
-53303=>16632,
-53305=>16633,
-53306=>16634,
-53307=>16635,
-53309=>16636,
-53310=>16637,
-53311=>16638,
-53312=>16639,
-53313=>16640,
-53314=>16641,
-53315=>16642,
-53318=>16643,
-53320=>16644,
-53322=>16645,
-53323=>16646,
-53324=>16647,
-53325=>16648,
-53326=>16649,
-53327=>16650,
-53329=>16651,
-53330=>16652,
-53331=>16653,
-53333=>16654,
-53334=>16655,
-53335=>16656,
-53337=>16657,
-53338=>16658,
-53339=>16659,
-53340=>16660,
-53341=>16661,
-53342=>16662,
-53343=>16663,
-53345=>16664,
-53346=>16665,
-53347=>16666,
-53348=>16667,
-53349=>16668,
-53350=>16669,
-53351=>16670,
-53352=>16671,
-53353=>16672,
-53354=>16673,
-53355=>16674,
-53358=>16675,
-53359=>16676,
-53361=>16677,
-53362=>16678,
-53363=>16679,
-53365=>16680,
-53366=>16681,
-53367=>16682,
-53368=>16683,
-53369=>16684,
-53370=>16685,
-53371=>16686,
-53374=>16687,
-53375=>16688,
-53376=>16689,
-53378=>16690,
-53379=>16691,
-53380=>16692,
-53381=>16693,
-53382=>16694,
-53383=>16695,
-53384=>16696,
-53385=>16697,
-53386=>16698,
-53387=>16699,
-53388=>16700,
-53389=>16701,
-53390=>16702,
-53391=>16703,
-53392=>16704,
-53393=>16705,
-53394=>16706,
-53395=>16707,
-53396=>16708,
-53397=>16709,
-53398=>16710,
-53399=>16711,
-53400=>16712,
-53401=>16713,
-53402=>16714,
-53403=>16715,
-53404=>16716,
-53405=>16717,
-53406=>16718,
-53407=>16719,
-53408=>16720,
-53409=>16721,
-53410=>16722,
-53411=>16723,
-53414=>16724,
-53415=>16725,
-53417=>16726,
-53418=>16727,
-53419=>16728,
-53421=>16729,
-53422=>16730,
-53423=>16731,
-53424=>16732,
-53425=>16733,
-53426=>16734,
-53427=>16735,
-53430=>16736,
-53432=>16737,
-53434=>16738,
-53435=>16739,
-53436=>16740,
-53437=>16741,
-53438=>16742,
-53439=>16743,
-53442=>16744,
-53443=>16745,
-53445=>16746,
-53446=>16747,
-53447=>16748,
-53450=>16749,
-53451=>16750,
-53452=>16751,
-53453=>16752,
-53454=>16753,
-53455=>16754,
-53458=>16755,
-53462=>16756,
-53463=>16757,
-53464=>16758,
-53465=>16759,
-53466=>16760,
-53467=>16761,
-53470=>16762,
-53471=>16763,
-53473=>16764,
-53474=>16765,
-53475=>16766,
-53477=>16767,
-53478=>16768,
-53479=>16769,
-53480=>16770,
-53481=>16771,
-53482=>16772,
-53483=>16773,
-53486=>16774,
-53490=>16775,
-53491=>16776,
-53492=>16777,
-53493=>16778,
-53494=>16779,
-53495=>16780,
-53497=>16781,
-53498=>16782,
-53499=>16783,
-53500=>16784,
-53501=>16785,
-53502=>16786,
-53503=>16787,
-53504=>16788,
-53505=>16789,
-53506=>16790,
-53507=>16791,
-53508=>16792,
-53509=>16793,
-53510=>16794,
-53511=>16795,
-53512=>16796,
-53513=>16797,
-53514=>16798,
-53515=>16799,
-53516=>16800,
-53518=>16801,
-53519=>16802,
-53520=>16803,
-53521=>16804,
-53522=>16805,
-53523=>16806,
-53524=>16807,
-53525=>16808,
-53526=>16809,
-53527=>16810,
-53528=>16811,
-53529=>16812,
-53530=>16813,
-53531=>16814,
-53532=>16815,
-53533=>16816,
-53534=>16817,
-53535=>16818,
-53536=>16819,
-53537=>16820,
-53538=>16821,
-53539=>16822,
-53540=>16823,
-53541=>16824,
-53542=>16825,
-53543=>16826,
-53544=>16827,
-53545=>16828,
-53546=>16829,
-53547=>16830,
-53548=>16831,
-53549=>16832,
-53550=>16833,
-53551=>16834,
-53554=>16835,
-53555=>16836,
-53557=>16837,
-53558=>16838,
-53559=>16839,
-53561=>16840,
-53563=>16841,
-53564=>16842,
-53565=>16843,
-53566=>16844,
-53567=>16845,
-53570=>16846,
-53574=>16847,
-53575=>16848,
-53576=>16849,
-53577=>16850,
-53578=>16851,
-53579=>16852,
-53582=>16853,
-53583=>16854,
-53585=>16855,
-53586=>16856,
-53587=>16857,
-53589=>16858,
-53590=>16859,
-53591=>16860,
-53592=>16861,
-53593=>16862,
-53594=>16863,
-53595=>16864,
-53598=>16865,
-53600=>16866,
-53602=>16867,
-53603=>16868,
-53604=>16869,
-53605=>16870,
-53606=>16871,
-53607=>16872,
-53609=>16873,
-53610=>16874,
-53611=>16875,
-53613=>16876,
-53614=>16877,
-53615=>16878,
-53616=>16879,
-53617=>16880,
-53618=>16881,
-53619=>16882,
-53620=>16883,
-53621=>16884,
-53622=>16885,
-53623=>16886,
-53624=>16887,
-53625=>16888,
-53626=>16889,
-53627=>16890,
-53629=>16891,
-53630=>16892,
-53631=>16893,
-53632=>16894,
-53633=>16895,
-53634=>16896,
-53635=>16897,
-53637=>16898,
-53638=>16899,
-53639=>16900,
-53641=>16901,
-53642=>16902,
-53643=>16903,
-53644=>16904,
-53645=>16905,
-53646=>16906,
-53647=>16907,
-53648=>16908,
-53649=>16909,
-53650=>16910,
-53651=>16911,
-53652=>16912,
-53653=>16913,
-53654=>16914,
-53655=>16915,
-53656=>16916,
-53657=>16917,
-53658=>16918,
-53659=>16919,
-53660=>16920,
-53661=>16921,
-53662=>16922,
-53663=>16923,
-53666=>16924,
-53667=>16925,
-53669=>16926,
-53670=>16927,
-53671=>16928,
-53673=>16929,
-53674=>16930,
-53675=>16931,
-53676=>16932,
-53677=>16933,
-53678=>16934,
-53679=>16935,
-53682=>16936,
-53684=>16937,
-53686=>16938,
-53687=>16939,
-53688=>16940,
-53689=>16941,
-53691=>16942,
-53693=>16943,
-53694=>16944,
-53695=>16945,
-53697=>16946,
-53698=>16947,
-53699=>16948,
-53700=>16949,
-53701=>16950,
-53702=>16951,
-53703=>16952,
-53704=>16953,
-53705=>16954,
-53706=>16955,
-53707=>16956,
-53708=>16957,
-53709=>16958,
-53710=>16959,
-53711=>16960,
-53712=>16961,
-53713=>16962,
-53714=>16963,
-53715=>16964,
-53716=>16965,
-53717=>16966,
-53718=>16967,
-53719=>16968,
-53721=>16969,
-53722=>16970,
-53723=>16971,
-53724=>16972,
-53725=>16973,
-53726=>16974,
-53727=>16975,
-53728=>16976,
-53729=>16977,
-53730=>16978,
-53731=>16979,
-53732=>16980,
-53733=>16981,
-53734=>16982,
-53735=>16983,
-53736=>16984,
-53737=>16985,
-53738=>16986,
-53739=>16987,
-53740=>16988,
-53741=>16989,
-53742=>16990,
-53743=>16991,
-53744=>16992,
-53745=>16993,
-53746=>16994,
-53747=>16995,
-53749=>16996,
-53750=>16997,
-53751=>16998,
-53753=>16999,
-53754=>17000,
-53755=>17001,
-53756=>17002,
-53757=>17003,
-53758=>17004,
-53759=>17005,
-53760=>17006,
-53761=>17007,
-53762=>17008,
-53763=>17009,
-53764=>17010,
-53765=>17011,
-53766=>17012,
-53768=>17013,
-53770=>17014,
-53771=>17015,
-53772=>17016,
-53773=>17017,
-53774=>17018,
-53775=>17019,
-53777=>17020,
-53778=>17021,
-53779=>17022,
-53780=>17023,
-53781=>17024,
-53782=>17025,
-53783=>17026,
-53784=>17027,
-53785=>17028,
-53786=>17029,
-53787=>17030,
-53788=>17031,
-53789=>17032,
-53790=>17033,
-53791=>17034,
-53792=>17035,
-53793=>17036,
-53794=>17037,
-53795=>17038,
-53796=>17039,
-53797=>17040,
-53798=>17041,
-53799=>17042,
-53800=>17043,
-53801=>17044,
-53802=>17045,
-53803=>17046,
-53806=>17047,
-53807=>17048,
-53809=>17049,
-53810=>17050,
-53811=>17051,
-53813=>17052,
-53814=>17053,
-53815=>17054,
-53816=>17055,
-53817=>17056,
-53818=>17057,
-53819=>17058,
-53822=>17059,
-53824=>17060,
-53826=>17061,
-53827=>17062,
-53828=>17063,
-53829=>17064,
-53830=>17065,
-53831=>17066,
-53833=>17067,
-53834=>17068,
-53835=>17069,
-53836=>17070,
-53837=>17071,
-53838=>17072,
-53839=>17073,
-53840=>17074,
-53841=>17075,
-53842=>17076,
-53843=>17077,
-53844=>17078,
-53845=>17079,
-53846=>17080,
-53847=>17081,
-53848=>17082,
-53849=>17083,
-53850=>17084,
-53851=>17085,
-53853=>17086,
-53854=>17087,
-53855=>17088,
-53856=>17089,
-53857=>17090,
-53858=>17091,
-53859=>17092,
-53861=>17093,
-53862=>17094,
-53863=>17095,
-53864=>17096,
-53865=>17097,
-53866=>17098,
-53867=>17099,
-53868=>17100,
-53869=>17101,
-53870=>17102,
-53871=>17103,
-53872=>17104,
-53873=>17105,
-53874=>17106,
-53875=>17107,
-53876=>17108,
-53877=>17109,
-53878=>17110,
-53879=>17111,
-53880=>17112,
-53881=>17113,
-53882=>17114,
-53883=>17115,
-53884=>17116,
-53885=>17117,
-53886=>17118,
-53887=>17119,
-53890=>17120,
-53891=>17121,
-53893=>17122,
-53894=>17123,
-53895=>17124,
-53897=>17125,
-53898=>17126,
-53899=>17127,
-53900=>17128,
-53901=>17129,
-53902=>17130,
-53903=>17131,
-53906=>17132,
-53907=>17133,
-53908=>17134,
-53910=>17135,
-53911=>17136,
-53912=>17137,
-53913=>17138,
-53914=>17139,
-53915=>17140,
-53917=>17141,
-53918=>17142,
-53919=>17143,
-53921=>17144,
-53922=>17145,
-53923=>17146,
-53925=>17147,
-53926=>17148,
-53927=>17149,
-53928=>17150,
-53929=>17151,
-53930=>17152,
-53931=>17153,
-53933=>17154,
-53934=>17155,
-53935=>17156,
-53936=>17157,
-53938=>17158,
-53939=>17159,
-53940=>17160,
-53941=>17161,
-53942=>17162,
-53943=>17163,
-53946=>17164,
-53947=>17165,
-53949=>17166,
-53950=>17167,
-53953=>17168,
-53955=>17169,
-53956=>17170,
-53957=>17171,
-53958=>17172,
-53959=>17173,
-53962=>17174,
-53964=>17175,
-53965=>17176,
-53966=>17177,
-53967=>17178,
-53968=>17179,
-53969=>17180,
-53970=>17181,
-53971=>17182,
-53973=>17183,
-53974=>17184,
-53975=>17185,
-53977=>17186,
-53978=>17187,
-53979=>17188,
-53981=>17189,
-53982=>17190,
-53983=>17191,
-53984=>17192,
-53985=>17193,
-53986=>17194,
-53987=>17195,
-53990=>17196,
-53991=>17197,
-53992=>17198,
-53993=>17199,
-53994=>17200,
-53995=>17201,
-53996=>17202,
-53997=>17203,
-53998=>17204,
-53999=>17205,
-54002=>17206,
-54003=>17207,
-54005=>17208,
-54006=>17209,
-54007=>17210,
-54009=>17211,
-54010=>17212,
-54011=>17213,
-54012=>17214,
-54013=>17215,
-54014=>17216,
-54015=>17217,
-54018=>17218,
-54020=>17219,
-54022=>17220,
-54023=>17221,
-54024=>17222,
-54025=>17223,
-54026=>17224,
-54027=>17225,
-54031=>17226,
-54033=>17227,
-54034=>17228,
-54035=>17229,
-54037=>17230,
-54039=>17231,
-54040=>17232,
-54041=>17233,
-54042=>17234,
-54043=>17235,
-54046=>17236,
-54050=>17237,
-54051=>17238,
-54052=>17239,
-54054=>17240,
-54055=>17241,
-54058=>17242,
-54059=>17243,
-54061=>17244,
-54062=>17245,
-54063=>17246,
-54065=>17247,
-54066=>17248,
-54067=>17249,
-54068=>17250,
-54069=>17251,
-54070=>17252,
-54071=>17253,
-54074=>17254,
-54078=>17255,
-54079=>17256,
-54080=>17257,
-54081=>17258,
-54082=>17259,
-54083=>17260,
-54086=>17261,
-54087=>17262,
-54088=>17263,
-54089=>17264,
-54090=>17265,
-54091=>17266,
-54092=>17267,
-54093=>17268,
-54094=>17269,
-54095=>17270,
-54096=>17271,
-54097=>17272,
-54098=>17273,
-54099=>17274,
-54100=>17275,
-54101=>17276,
-54102=>17277,
-54103=>17278,
-54104=>17279,
-54105=>17280,
-54106=>17281,
-54107=>17282,
-54108=>17283,
-54109=>17284,
-54110=>17285,
-54111=>17286,
-54112=>17287,
-54113=>17288,
-54114=>17289,
-54115=>17290,
-54116=>17291,
-54117=>17292,
-54118=>17293,
-54119=>17294,
-54120=>17295,
-54121=>17296,
-54122=>17297,
-54123=>17298,
-54124=>17299,
-54125=>17300,
-54126=>17301,
-54127=>17302,
-54128=>17303,
-54129=>17304,
-54130=>17305,
-54131=>17306,
-54132=>17307,
-54133=>17308,
-54134=>17309,
-54135=>17310,
-54136=>17311,
-54137=>17312,
-54138=>17313,
-54139=>17314,
-54142=>17315,
-54143=>17316,
-54145=>17317,
-54146=>17318,
-54147=>17319,
-54149=>17320,
-54150=>17321,
-54151=>17322,
-54152=>17323,
-54153=>17324,
-54154=>17325,
-54155=>17326,
-54158=>17327,
-54162=>17328,
-54163=>17329,
-54164=>17330,
-54165=>17331,
-54166=>17332,
-54167=>17333,
-54170=>17334,
-54171=>17335,
-54173=>17336,
-54174=>17337,
-54175=>17338,
-54177=>17339,
-54178=>17340,
-54179=>17341,
-54180=>17342,
-54181=>17343,
-54182=>17344,
-54183=>17345,
-54186=>17346,
-54188=>17347,
-54190=>17348,
-54191=>17349,
-54192=>17350,
-54193=>17351,
-54194=>17352,
-54195=>17353,
-54197=>17354,
-54198=>17355,
-54199=>17356,
-54201=>17357,
-54202=>17358,
-54203=>17359,
-54205=>17360,
-54206=>17361,
-54207=>17362,
-54208=>17363,
-54209=>17364,
-54210=>17365,
-54211=>17366,
-54214=>17367,
-54215=>17368,
-54218=>17369,
-54219=>17370,
-54220=>17371,
-54221=>17372,
-54222=>17373,
-54223=>17374,
-54225=>17375,
-54226=>17376,
-54227=>17377,
-54228=>17378,
-54229=>17379,
-54230=>17380,
-54231=>17381,
-54233=>17382,
-54234=>17383,
-54235=>17384,
-54236=>17385,
-54237=>17386,
-54238=>17387,
-54239=>17388,
-54240=>17389,
-54242=>17390,
-54244=>17391,
-54245=>17392,
-54246=>17393,
-54247=>17394,
-54248=>17395,
-54249=>17396,
-54250=>17397,
-54251=>17398,
-54254=>17399,
-54255=>17400,
-54257=>17401,
-54258=>17402,
-54259=>17403,
-54261=>17404,
-54262=>17405,
-54263=>17406,
-54264=>17407,
-54265=>17408,
-54266=>17409,
-54267=>17410,
-54270=>17411,
-54272=>17412,
-54274=>17413,
-54275=>17414,
-54276=>17415,
-54277=>17416,
-54278=>17417,
-54279=>17418,
-54281=>17419,
-54282=>17420,
-54283=>17421,
-54284=>17422,
-54285=>17423,
-54286=>17424,
-54287=>17425,
-54288=>17426,
-54289=>17427,
-54290=>17428,
-54291=>17429,
-54292=>17430,
-54293=>17431,
-54294=>17432,
-54295=>17433,
-54296=>17434,
-54297=>17435,
-54298=>17436,
-54299=>17437,
-54300=>17438,
-54302=>17439,
-54303=>17440,
-54304=>17441,
-54305=>17442,
-54306=>17443,
-54307=>17444,
-54308=>17445,
-54309=>17446,
-54310=>17447,
-54311=>17448,
-54312=>17449,
-54313=>17450,
-54314=>17451,
-54315=>17452,
-54316=>17453,
-54317=>17454,
-54318=>17455,
-54319=>17456,
-54320=>17457,
-54321=>17458,
-54322=>17459,
-54323=>17460,
-54324=>17461,
-54325=>17462,
-54326=>17463,
-54327=>17464,
-54328=>17465,
-54329=>17466,
-54330=>17467,
-54331=>17468,
-54332=>17469,
-54333=>17470,
-54334=>17471,
-54335=>17472,
-54337=>17473,
-54338=>17474,
-54339=>17475,
-54341=>17476,
-54342=>17477,
-54343=>17478,
-54344=>17479,
-54345=>17480,
-54346=>17481,
-54347=>17482,
-54348=>17483,
-54349=>17484,
-54350=>17485,
-54351=>17486,
-54352=>17487,
-54353=>17488,
-54354=>17489,
-54355=>17490,
-54356=>17491,
-54357=>17492,
-54358=>17493,
-54359=>17494,
-54360=>17495,
-54361=>17496,
-54362=>17497,
-54363=>17498,
-54365=>17499,
-54366=>17500,
-54367=>17501,
-54369=>17502,
-54370=>17503,
-54371=>17504,
-54373=>17505,
-54374=>17506,
-54375=>17507,
-54376=>17508,
-54377=>17509,
-54378=>17510,
-54379=>17511,
-54380=>17512,
-54382=>17513,
-54384=>17514,
-54385=>17515,
-54386=>17516,
-54387=>17517,
-54388=>17518,
-54389=>17519,
-54390=>17520,
-54391=>17521,
-54394=>17522,
-54395=>17523,
-54397=>17524,
-54398=>17525,
-54401=>17526,
-54403=>17527,
-54404=>17528,
-54405=>17529,
-54406=>17530,
-54407=>17531,
-54410=>17532,
-54412=>17533,
-54414=>17534,
-54415=>17535,
-54416=>17536,
-54417=>17537,
-54418=>17538,
-54419=>17539,
-54421=>17540,
-54422=>17541,
-54423=>17542,
-54424=>17543,
-54425=>17544,
-54426=>17545,
-54427=>17546,
-54428=>17547,
-54429=>17548,
-54430=>17549,
-54431=>17550,
-54432=>17551,
-54433=>17552,
-54434=>17553,
-54435=>17554,
-54436=>17555,
-54437=>17556,
-54438=>17557,
-54439=>17558,
-54440=>17559,
-54442=>17560,
-54443=>17561,
-54444=>17562,
-54445=>17563,
-54446=>17564,
-54447=>17565,
-54448=>17566,
-54449=>17567,
-54450=>17568,
-54451=>17569,
-54452=>17570,
-54453=>17571,
-54454=>17572,
-54455=>17573,
-54456=>17574,
-54457=>17575,
-54458=>17576,
-54459=>17577,
-54460=>17578,
-54461=>17579,
-54462=>17580,
-54463=>17581,
-54464=>17582,
-54465=>17583,
-54466=>17584,
-54467=>17585,
-54468=>17586,
-54469=>17587,
-54470=>17588,
-54471=>17589,
-54472=>17590,
-54473=>17591,
-54474=>17592,
-54475=>17593,
-54477=>17594,
-54478=>17595,
-54479=>17596,
-54481=>17597,
-54482=>17598,
-54483=>17599,
-54485=>17600,
-54486=>17601,
-54487=>17602,
-54488=>17603,
-54489=>17604,
-54490=>17605,
-54491=>17606,
-54493=>17607,
-54494=>17608,
-54496=>17609,
-54497=>17610,
-54498=>17611,
-54499=>17612,
-54500=>17613,
-54501=>17614,
-54502=>17615,
-54503=>17616,
-54505=>17617,
-54506=>17618,
-54507=>17619,
-54509=>17620,
-54510=>17621,
-54511=>17622,
-54513=>17623,
-54514=>17624,
-54515=>17625,
-54516=>17626,
-54517=>17627,
-54518=>17628,
-54519=>17629,
-54521=>17630,
-54522=>17631,
-54524=>17632,
-54526=>17633,
-54527=>17634,
-54528=>17635,
-54529=>17636,
-54530=>17637,
-54531=>17638,
-54533=>17639,
-54534=>17640,
-54535=>17641,
-54537=>17642,
-54538=>17643,
-54539=>17644,
-54541=>17645,
-54542=>17646,
-54543=>17647,
-54544=>17648,
-54545=>17649,
-54546=>17650,
-54547=>17651,
-54550=>17652,
-54552=>17653,
-54553=>17654,
-54554=>17655,
-54555=>17656,
-54556=>17657,
-54557=>17658,
-54558=>17659,
-54559=>17660,
-54560=>17661,
-54561=>17662,
-54562=>17663,
-54563=>17664,
-54564=>17665,
-54565=>17666,
-54566=>17667,
-54567=>17668,
-54568=>17669,
-54569=>17670,
-54570=>17671,
-54571=>17672,
-54572=>17673,
-54573=>17674,
-54574=>17675,
-54575=>17676,
-54576=>17677,
-54577=>17678,
-54578=>17679,
-54579=>17680,
-54580=>17681,
-54581=>17682,
-54582=>17683,
-54583=>17684,
-54584=>17685,
-54585=>17686,
-54586=>17687,
-54587=>17688,
-54590=>17689,
-54591=>17690,
-54593=>17691,
-54594=>17692,
-54595=>17693,
-54597=>17694,
-54598=>17695,
-54599=>17696,
-54600=>17697,
-54601=>17698,
-54602=>17699,
-54603=>17700,
-54606=>17701,
-54608=>17702,
-54610=>17703,
-54611=>17704,
-54612=>17705,
-54613=>17706,
-54614=>17707,
-54615=>17708,
-54618=>17709,
-54619=>17710,
-54621=>17711,
-54622=>17712,
-54623=>17713,
-54625=>17714,
-54626=>17715,
-54627=>17716,
-54628=>17717,
-54630=>17718,
-54631=>17719,
-54634=>17720,
-54636=>17721,
-54638=>17722,
-54639=>17723,
-54640=>17724,
-54641=>17725,
-54642=>17726,
-54643=>17727,
-54646=>17728,
-54647=>17729,
-54649=>17730,
-54650=>17731,
-54651=>17732,
-54653=>17733,
-54654=>17734,
-54655=>17735,
-54656=>17736,
-54657=>17737,
-54658=>17738,
-54659=>17739,
-54662=>17740,
-54666=>17741,
-54667=>17742,
-54668=>17743,
-54669=>17744,
-54670=>17745,
-54671=>17746,
-54673=>17747,
-54674=>17748,
-54675=>17749,
-54676=>17750,
-54677=>17751,
-54678=>17752,
-54679=>17753,
-54680=>17754,
-54681=>17755,
-54682=>17756,
-54683=>17757,
-54684=>17758,
-54685=>17759,
-54686=>17760,
-54687=>17761,
-54688=>17762,
-54689=>17763,
-54690=>17764,
-54691=>17765,
-54692=>17766,
-54694=>17767,
-54695=>17768,
-54696=>17769,
-54697=>17770,
-54698=>17771,
-54699=>17772,
-54700=>17773,
-54701=>17774,
-54702=>17775,
-54703=>17776,
-54704=>17777,
-54705=>17778,
-54706=>17779,
-54707=>17780,
-54708=>17781,
-54709=>17782,
-54710=>17783,
-54711=>17784,
-54712=>17785,
-54713=>17786,
-54714=>17787,
-54715=>17788,
-54716=>17789,
-54717=>17790,
-54718=>17791,
-54719=>17792,
-54720=>17793,
-54721=>17794,
-54722=>17795,
-54723=>17796,
-54724=>17797,
-54725=>17798,
-54726=>17799,
-54727=>17800,
-54730=>17801,
-54731=>17802,
-54733=>17803,
-54734=>17804,
-54735=>17805,
-54737=>17806,
-54739=>17807,
-54740=>17808,
-54741=>17809,
-54742=>17810,
-54743=>17811,
-54746=>17812,
-54748=>17813,
-54750=>17814,
-54751=>17815,
-54752=>17816,
-54753=>17817,
-54754=>17818,
-54755=>17819,
-54758=>17820,
-54759=>17821,
-54761=>17822,
-54762=>17823,
-54763=>17824,
-54765=>17825,
-54766=>17826,
-54767=>17827,
-54768=>17828,
-54769=>17829,
-54770=>17830,
-54771=>17831,
-54774=>17832,
-54776=>17833,
-54778=>17834,
-54779=>17835,
-54780=>17836,
-54781=>17837,
-54782=>17838,
-54783=>17839,
-54786=>17840,
-54787=>17841,
-54789=>17842,
-54790=>17843,
-54791=>17844,
-54793=>17845,
-54794=>17846,
-54795=>17847,
-54796=>17848,
-54797=>17849,
-54798=>17850,
-54799=>17851,
-54802=>17852,
-54806=>17853,
-54807=>17854,
-54808=>17855,
-54809=>17856,
-54810=>17857,
-54811=>17858,
-54813=>17859,
-54814=>17860,
-54815=>17861,
-54817=>17862,
-54818=>17863,
-54819=>17864,
-54821=>17865,
-54822=>17866,
-54823=>17867,
-54824=>17868,
-54825=>17869,
-54826=>17870,
-54827=>17871,
-54828=>17872,
-54830=>17873,
-54831=>17874,
-54832=>17875,
-54833=>17876,
-54834=>17877,
-54835=>17878,
-54836=>17879,
-54837=>17880,
-54838=>17881,
-54839=>17882,
-54842=>17883,
-54843=>17884,
-54845=>17885,
-54846=>17886,
-54847=>17887,
-54849=>17888,
-54850=>17889,
-54851=>17890,
-54852=>17891,
-54854=>17892,
-54855=>17893,
-54858=>17894,
-54860=>17895,
-54862=>17896,
-54863=>17897,
-54864=>17898,
-54866=>17899,
-54867=>17900,
-54870=>17901,
-54871=>17902,
-54873=>17903,
-54874=>17904,
-54875=>17905,
-54877=>17906,
-54878=>17907,
-54879=>17908,
-54880=>17909,
-54881=>17910,
-54882=>17911,
-54883=>17912,
-54884=>17913,
-54885=>17914,
-54886=>17915,
-54888=>17916,
-54890=>17917,
-54891=>17918,
-54892=>17919,
-54893=>17920,
-54894=>17921,
-54895=>17922,
-54898=>17923,
-54899=>17924,
-54901=>17925,
-54902=>17926,
-54903=>17927,
-54904=>17928,
-54905=>17929,
-54906=>17930,
-54907=>17931,
-54908=>17932,
-54909=>17933,
-54910=>17934,
-54911=>17935,
-54912=>17936,
-54913=>17937,
-54914=>17938,
-54916=>17939,
-54918=>17940,
-54919=>17941,
-54920=>17942,
-54921=>17943,
-54922=>17944,
-54923=>17945,
-54926=>17946,
-54927=>17947,
-54929=>17948,
-54930=>17949,
-54931=>17950,
-54933=>17951,
-54934=>17952,
-54935=>17953,
-54936=>17954,
-54937=>17955,
-54938=>17956,
-54939=>17957,
-54940=>17958,
-54942=>17959,
-54944=>17960,
-54946=>17961,
-54947=>17962,
-54948=>17963,
-54949=>17964,
-54950=>17965,
-54951=>17966,
-54953=>17967,
-54954=>17968,
-54955=>17969,
-54957=>17970,
-54958=>17971,
-54959=>17972,
-54961=>17973,
-54962=>17974,
-54963=>17975,
-54964=>17976,
-54965=>17977,
-54966=>17978,
-54967=>17979,
-54968=>17980,
-54970=>17981,
-54972=>17982,
-54973=>17983,
-54974=>17984,
-54975=>17985,
-54976=>17986,
-54977=>17987,
-54978=>17988,
-54979=>17989,
-54982=>17990,
-54983=>17991,
-54985=>17992,
-54986=>17993,
-54987=>17994,
-54989=>17995,
-54990=>17996,
-54991=>17997,
-54992=>17998,
-54994=>17999,
-54995=>18000,
-54997=>18001,
-54998=>18002,
-55000=>18003,
-55002=>18004,
-55003=>18005,
-55004=>18006,
-55005=>18007,
-55006=>18008,
-55007=>18009,
-55009=>18010,
-55010=>18011,
-55011=>18012,
-55013=>18013,
-55014=>18014,
-55015=>18015,
-55017=>18016,
-55018=>18017,
-55019=>18018,
-55020=>18019,
-55021=>18020,
-55022=>18021,
-55023=>18022,
-55025=>18023,
-55026=>18024,
-55027=>18025,
-55028=>18026,
-55030=>18027,
-55031=>18028,
-55032=>18029,
-55033=>18030,
-55034=>18031,
-55035=>18032,
-55038=>18033,
-55039=>18034,
-55041=>18035,
-55042=>18036,
-55043=>18037,
-55045=>18038,
-55046=>18039,
-55047=>18040,
-55048=>18041,
-55049=>18042,
-55050=>18043,
-55051=>18044,
-55052=>18045,
-55053=>18046,
-55054=>18047,
-55055=>18048,
-55056=>18049,
-55058=>18050,
-55059=>18051,
-55060=>18052,
-55061=>18053,
-55062=>18054,
-55063=>18055,
-55066=>18056,
-55067=>18057,
-55069=>18058,
-55070=>18059,
-55071=>18060,
-55073=>18061,
-55074=>18062,
-55075=>18063,
-55076=>18064,
-55077=>18065,
-55078=>18066,
-55079=>18067,
-55082=>18068,
-55084=>18069,
-55086=>18070,
-55087=>18071,
-55088=>18072,
-55089=>18073,
-55090=>18074,
-55091=>18075,
-55094=>18076,
-55095=>18077,
-55097=>18078,
-55098=>18079,
-55099=>18080,
-55101=>18081,
-55102=>18082,
-55103=>18083,
-55104=>18084,
-55105=>18085,
-55106=>18086,
-55107=>18087,
-55109=>18088,
-55110=>18089,
-55112=>18090,
-55114=>18091,
-55115=>18092,
-55116=>18093,
-55117=>18094,
-55118=>18095,
-55119=>18096,
-55122=>18097,
-55123=>18098,
-55125=>18099,
-55130=>18100,
-55131=>18101,
-55132=>18102,
-55133=>18103,
-55134=>18104,
-55135=>18105,
-55138=>18106,
-55140=>18107,
-55142=>18108,
-55143=>18109,
-55144=>18110,
-55146=>18111,
-55147=>18112,
-55149=>18113,
-55150=>18114,
-55151=>18115,
-55153=>18116,
-55154=>18117,
-55155=>18118,
-55157=>18119,
-55158=>18120,
-55159=>18121,
-55160=>18122,
-55161=>18123,
-55162=>18124,
-55163=>18125,
-55166=>18126,
-55167=>18127,
-55168=>18128,
-55170=>18129,
-55171=>18130,
-55172=>18131,
-55173=>18132,
-55174=>18133,
-55175=>18134,
-55178=>18135,
-55179=>18136,
-55181=>18137,
-55182=>18138,
-55183=>18139,
-55185=>18140,
-55186=>18141,
-55187=>18142,
-55188=>18143,
-55189=>18144,
-55190=>18145,
-55191=>18146,
-55194=>18147,
-55196=>18148,
-55198=>18149,
-55199=>18150,
-55200=>18151,
-55201=>18152,
-55202=>18153,
-55203=>18154,
-);
-?>
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/README.TXT b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/README.TXT
deleted file mode 100644
index 4b1f5532..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/README.TXT
+++ /dev/null
@@ -1,130 +0,0 @@
-TCPDF Fonts
-
-TCPDF supports TrueTypeUnicode (UTF-8 Unicode), OpenTypeUnicode, TrueType, OpenType, Type1, CID-0 and Core (standard) fonts.
-
-There are two ways to use a new font: embedding it in the PDF or not. When a font is not embedded, it is searched in the system. The advantage is that the PDF file is lighter; on the other hand, if it is not available, a substitution font is used. So it is preferable to ensure that the needed font is installed on the client systems. If the file is to be viewed by a large audience, it is recommended to embed.
-
-The fonts that could be not embedded are only the standard core fonts and CID-0 fonts.
-
-The PDF Core (standard) fonts are:
-
-    * courier : Courier
-    * courierb : Courier Bold
-    * courierbi : Courier Bold Italic
-    * courieri : Courier Italic
-    * helvetica : Helvetica
-    * helveticab : Helvetica Bold
-    * helveticabi : Helvetica Bold Italic
-    * helveticai : Helvetica Italic
-    * symbol : Symbol
-    * times : Times New Roman
-    * timesb : Times New Roman Bold
-    * timesbi : Times New Roman Bold Italic
-    * timesi : Times New Roman Italic
-    * zapfdingbats : Zapf Dingbats
-
-Setting up a font for usage with TCPDF requires the following steps:
-
-   1. Convert all font filenames to lowercase and rename using the following schema:
-          * [basic-font-name-in-lowercase].ttf for regular font
-          * [basic-font-name-in-lowercase]b.ttf for bold variation
-          * [basic-font-name-in-lowercase]i.ttf for oblique variation
-          * [basic-font-name-in-lowercase]bi.ttf for bold oblique variation
-
-   2. Generate the font's metrics file.
-          * For Type1 font files this first step is not necessary because the AFM file is usually shipped with the font. In case you have only a metric file in PFM format, use the pfm2afm utility (fonts/utils/pfm2afm) to get the AFM file. If you own a Type1 font in ASCII format (.pfa), you can convert it to binary format with Type 1 utilities.
-          * For TrueTypeUnicode or TrueType font files, use the the provided ttf2ufm utility (fonts/utils/ttf2ufm):
-
-            $ ttf2ufm -a -F myfont.ttf
-
-          * For OpenTypeUnicode or OpenType font files, use the the provided ttf2ufm utility (fonts/utils/ttf2ufm):
-
-            $ ttf2ufm -a -F myfont.otf
-
-   3. Run makefont.php script.
-          * For TrueTypeUnicode:
-
-            $ php -q makefont.php myfont.ttf myfont.ufm
-
-          * For OpenTypeUnicode:
-
-            $ php -q makefont.php myfont.otf myfont.ufm
-
-          * For TrueType:
-
-            $ php -q makefont.php myfont.ttf myfont.afm
-
-          * For OpenType:
-
-            $ php -q makefont.php myfont.otf myfont.afm
-
-          * For Type1:
-
-            $ php -q makefont.php myfont.pfb myfont.afm
-
-      You may also specify additional parameters:
-
-      MakeFont(string $fontfile, string $fmfile [, boolean $embedded [, $enc="cp1252" [, $patch=array()]]])
-
-          * $fontfile : Path to the .ttf or .pfb file.
-          * $fmfile : Path to the .afm file for Type1 and TrueType or .ufm for TrueTypeUnicode.
-          * $embedded : Set to false to not embed the font, true otherwise (default).
-          * $enc : Name of the encoding table to use. Default value: cp1252. Omit this parameter for TrueType Unicode, OpenType Unicode and symbolic fonts like Symbol or ZapfDingBats. The encoding defines the association between a code (from 0 to 255) and a character. The first 128 are fixed and correspond to ASCII. The encodings are stored in .map files. Those available are:
-                o cp1250 (Central Europe)
-                o cp1251 (Cyrillic)
-                o cp1252 (Western Europe)
-                o cp1253 (Greek)
-                o cp1254 (Turkish)
-                o cp1255 (Hebrew)
-                o cp1257 (Baltic)
-                o cp1258 (Vietnamese)
-                o cp874 (Thai)
-                o iso-8859-1 (Western Europe)
-                o iso-8859-2 (Central Europe)
-                o iso-8859-4 (Baltic)
-                o iso-8859-5 (Cyrillic)
-                o iso-8859-7 (Greek)
-                o iso-8859-9 (Turkish)
-                o iso-8859-11 (Thai)
-                o iso-8859-15 (Western Europe)
-                o iso-8859-16 (Central Europe)
-                o koi8-r (Russian)
-                o koi8-u (Ukrainian)
-            Of course, the font must contain the characters corresponding to the chosen encoding. The encodings which begin with cp are those used by Windows; Linux systems usually use ISO.
-          * $patch : Optional modification of the encoding. Empty by default. This parameter gives the possibility to alter the encoding. Sometimes you may want to add some characters. For instance, ISO-8859-1 does not contain the euro symbol. To add it at position 164, pass array(164=>'Euro').
-
-   4. Edit and copy resulting files by case:
-          * For embedded fonts: copy the resulting .php, .z and .ctg.z (if available) files to the TCPDF fonts directory.
-          * For not-embedding the font, edit the .php file and comment the $file entry.
-          * For CID-0 fonts (not embeddeed) you have to edit the .php file:
-                o change the font type to: $type='cidfont0';
-                o set the default font width by adding the line: $dw=1000;
-                o remove the $enc, $file and $ctg variables definitions
-                o add one of the following blocks of text at the end of the file (depends by the language you are using - see the arialunicid0.php file for a working example):
-                      + // Chinese Simplified
-                        $enc='UniCNS-UTF16-H';
-                        $cidinfo=array('Registry'=>'Adobe', 'Ordering'=>'CNS1','Supplement'=>0);
-                        include(dirname(__FILE__).'/uni2cid_ac16.php');
-
-                      + // Chinese Traditional
-                        $enc='UniGB-UTF16-H';
-                        $cidinfo=array('Registry'=>'Adobe', 'Ordering'=>'GB1','Supplement'=>2);
-                        include(dirname(__FILE__).'/uni2cid_ag15.php');
-
-                      + // Korean
-                        $enc='UniKS-UTF16-H';
-                        $cidinfo=array('Registry'=>'Adobe', 'Ordering'=>'Korea1','Supplement'=>0);
-                        include(dirname(__FILE__).'/uni2cid_ak12.php');
-
-                      + // Japanese
-                        $enc='UniJIS-UTF16-H';
-                        $cidinfo=array('Registry'=>'Adobe', 'Ordering'=>'Japan1','Supplement'=>5);
-                        include(dirname(__FILE__).'/uni2cid_aj16.php');
-
-                o copy the .php file to the TCPDF fonts directory.
-   5. Rename php font files variations using the following schema:
-          * [basic-font-name-in-lowercase].php for regular font
-          * [basic-font-name-in-lowercase]b.php for bold variation
-          * [basic-font-name-in-lowercase]i.php for oblique variation
-          * [basic-font-name-in-lowercase]bi.php for bold oblique variation
-
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/enc/cp1250.map b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/enc/cp1250.map
deleted file mode 100644
index ec110af0..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/enc/cp1250.map
+++ /dev/null
@@ -1,251 +0,0 @@
-!00 U+0000 .notdef
-!01 U+0001 .notdef
-!02 U+0002 .notdef
-!03 U+0003 .notdef
-!04 U+0004 .notdef
-!05 U+0005 .notdef
-!06 U+0006 .notdef
-!07 U+0007 .notdef
-!08 U+0008 .notdef
-!09 U+0009 .notdef
-!0A U+000A .notdef
-!0B U+000B .notdef
-!0C U+000C .notdef
-!0D U+000D .notdef
-!0E U+000E .notdef
-!0F U+000F .notdef
-!10 U+0010 .notdef
-!11 U+0011 .notdef
-!12 U+0012 .notdef
-!13 U+0013 .notdef
-!14 U+0014 .notdef
-!15 U+0015 .notdef
-!16 U+0016 .notdef
-!17 U+0017 .notdef
-!18 U+0018 .notdef
-!19 U+0019 .notdef
-!1A U+001A .notdef
-!1B U+001B .notdef
-!1C U+001C .notdef
-!1D U+001D .notdef
-!1E U+001E .notdef
-!1F U+001F .notdef
-!20 U+0020 space
-!21 U+0021 exclam
-!22 U+0022 quotedbl
-!23 U+0023 numbersign
-!24 U+0024 dollar
-!25 U+0025 percent
-!26 U+0026 ampersand
-!27 U+0027 quotesingle
-!28 U+0028 parenleft
-!29 U+0029 parenright
-!2A U+002A asterisk
-!2B U+002B plus
-!2C U+002C comma
-!2D U+002D hyphen
-!2E U+002E period
-!2F U+002F slash
-!30 U+0030 zero
-!31 U+0031 one
-!32 U+0032 two
-!33 U+0033 three
-!34 U+0034 four
-!35 U+0035 five
-!36 U+0036 six
-!37 U+0037 seven
-!38 U+0038 eight
-!39 U+0039 nine
-!3A U+003A colon
-!3B U+003B semicolon
-!3C U+003C less
-!3D U+003D equal
-!3E U+003E greater
-!3F U+003F question
-!40 U+0040 at
-!41 U+0041 A
-!42 U+0042 B
-!43 U+0043 C
-!44 U+0044 D
-!45 U+0045 E
-!46 U+0046 F
-!47 U+0047 G
-!48 U+0048 H
-!49 U+0049 I
-!4A U+004A J
-!4B U+004B K
-!4C U+004C L
-!4D U+004D M
-!4E U+004E N
-!4F U+004F O
-!50 U+0050 P
-!51 U+0051 Q
-!52 U+0052 R
-!53 U+0053 S
-!54 U+0054 T
-!55 U+0055 U
-!56 U+0056 V
-!57 U+0057 W
-!58 U+0058 X
-!59 U+0059 Y
-!5A U+005A Z
-!5B U+005B bracketleft
-!5C U+005C backslash
-!5D U+005D bracketright
-!5E U+005E asciicircum
-!5F U+005F underscore
-!60 U+0060 grave
-!61 U+0061 a
-!62 U+0062 b
-!63 U+0063 c
-!64 U+0064 d
-!65 U+0065 e
-!66 U+0066 f
-!67 U+0067 g
-!68 U+0068 h
-!69 U+0069 i
-!6A U+006A j
-!6B U+006B k
-!6C U+006C l
-!6D U+006D m
-!6E U+006E n
-!6F U+006F o
-!70 U+0070 p
-!71 U+0071 q
-!72 U+0072 r
-!73 U+0073 s
-!74 U+0074 t
-!75 U+0075 u
-!76 U+0076 v
-!77 U+0077 w
-!78 U+0078 x
-!79 U+0079 y
-!7A U+007A z
-!7B U+007B braceleft
-!7C U+007C bar
-!7D U+007D braceright
-!7E U+007E asciitilde
-!7F U+007F .notdef
-!80 U+20AC Euro
-!82 U+201A quotesinglbase
-!84 U+201E quotedblbase
-!85 U+2026 ellipsis
-!86 U+2020 dagger
-!87 U+2021 daggerdbl
-!89 U+2030 perthousand
-!8A U+0160 Scaron
-!8B U+2039 guilsinglleft
-!8C U+015A Sacute
-!8D U+0164 Tcaron
-!8E U+017D Zcaron
-!8F U+0179 Zacute
-!91 U+2018 quoteleft
-!92 U+2019 quoteright
-!93 U+201C quotedblleft
-!94 U+201D quotedblright
-!95 U+2022 bullet
-!96 U+2013 endash
-!97 U+2014 emdash
-!99 U+2122 trademark
-!9A U+0161 scaron
-!9B U+203A guilsinglright
-!9C U+015B sacute
-!9D U+0165 tcaron
-!9E U+017E zcaron
-!9F U+017A zacute
-!A0 U+00A0 space
-!A1 U+02C7 caron
-!A2 U+02D8 breve
-!A3 U+0141 Lslash
-!A4 U+00A4 currency
-!A5 U+0104 Aogonek
-!A6 U+00A6 brokenbar
-!A7 U+00A7 section
-!A8 U+00A8 dieresis
-!A9 U+00A9 copyright
-!AA U+015E Scedilla
-!AB U+00AB guillemotleft
-!AC U+00AC logicalnot
-!AD U+00AD hyphen
-!AE U+00AE registered
-!AF U+017B Zdotaccent
-!B0 U+00B0 degree
-!B1 U+00B1 plusminus
-!B2 U+02DB ogonek
-!B3 U+0142 lslash
-!B4 U+00B4 acute
-!B5 U+00B5 mu
-!B6 U+00B6 paragraph
-!B7 U+00B7 periodcentered
-!B8 U+00B8 cedilla
-!B9 U+0105 aogonek
-!BA U+015F scedilla
-!BB U+00BB guillemotright
-!BC U+013D Lcaron
-!BD U+02DD hungarumlaut
-!BE U+013E lcaron
-!BF U+017C zdotaccent
-!C0 U+0154 Racute
-!C1 U+00C1 Aacute
-!C2 U+00C2 Acircumflex
-!C3 U+0102 Abreve
-!C4 U+00C4 Adieresis
-!C5 U+0139 Lacute
-!C6 U+0106 Cacute
-!C7 U+00C7 Ccedilla
-!C8 U+010C Ccaron
-!C9 U+00C9 Eacute
-!CA U+0118 Eogonek
-!CB U+00CB Edieresis
-!CC U+011A Ecaron
-!CD U+00CD Iacute
-!CE U+00CE Icircumflex
-!CF U+010E Dcaron
-!D0 U+0110 Dcroat
-!D1 U+0143 Nacute
-!D2 U+0147 Ncaron
-!D3 U+00D3 Oacute
-!D4 U+00D4 Ocircumflex
-!D5 U+0150 Ohungarumlaut
-!D6 U+00D6 Odieresis
-!D7 U+00D7 multiply
-!D8 U+0158 Rcaron
-!D9 U+016E Uring
-!DA U+00DA Uacute
-!DB U+0170 Uhungarumlaut
-!DC U+00DC Udieresis
-!DD U+00DD Yacute
-!DE U+0162 Tcommaaccent
-!DF U+00DF germandbls
-!E0 U+0155 racute
-!E1 U+00E1 aacute
-!E2 U+00E2 acircumflex
-!E3 U+0103 abreve
-!E4 U+00E4 adieresis
-!E5 U+013A lacute
-!E6 U+0107 cacute
-!E7 U+00E7 ccedilla
-!E8 U+010D ccaron
-!E9 U+00E9 eacute
-!EA U+0119 eogonek
-!EB U+00EB edieresis
-!EC U+011B ecaron
-!ED U+00ED iacute
-!EE U+00EE icircumflex
-!EF U+010F dcaron
-!F0 U+0111 dcroat
-!F1 U+0144 nacute
-!F2 U+0148 ncaron
-!F3 U+00F3 oacute
-!F4 U+00F4 ocircumflex
-!F5 U+0151 ohungarumlaut
-!F6 U+00F6 odieresis
-!F7 U+00F7 divide
-!F8 U+0159 rcaron
-!F9 U+016F uring
-!FA U+00FA uacute
-!FB U+0171 uhungarumlaut
-!FC U+00FC udieresis
-!FD U+00FD yacute
-!FE U+0163 tcommaaccent
-!FF U+02D9 dotaccent
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/enc/cp1251.map b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/enc/cp1251.map
deleted file mode 100644
index de6a198d..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/enc/cp1251.map
+++ /dev/null
@@ -1,255 +0,0 @@
-!00 U+0000 .notdef
-!01 U+0001 .notdef
-!02 U+0002 .notdef
-!03 U+0003 .notdef
-!04 U+0004 .notdef
-!05 U+0005 .notdef
-!06 U+0006 .notdef
-!07 U+0007 .notdef
-!08 U+0008 .notdef
-!09 U+0009 .notdef
-!0A U+000A .notdef
-!0B U+000B .notdef
-!0C U+000C .notdef
-!0D U+000D .notdef
-!0E U+000E .notdef
-!0F U+000F .notdef
-!10 U+0010 .notdef
-!11 U+0011 .notdef
-!12 U+0012 .notdef
-!13 U+0013 .notdef
-!14 U+0014 .notdef
-!15 U+0015 .notdef
-!16 U+0016 .notdef
-!17 U+0017 .notdef
-!18 U+0018 .notdef
-!19 U+0019 .notdef
-!1A U+001A .notdef
-!1B U+001B .notdef
-!1C U+001C .notdef
-!1D U+001D .notdef
-!1E U+001E .notdef
-!1F U+001F .notdef
-!20 U+0020 space
-!21 U+0021 exclam
-!22 U+0022 quotedbl
-!23 U+0023 numbersign
-!24 U+0024 dollar
-!25 U+0025 percent
-!26 U+0026 ampersand
-!27 U+0027 quotesingle
-!28 U+0028 parenleft
-!29 U+0029 parenright
-!2A U+002A asterisk
-!2B U+002B plus
-!2C U+002C comma
-!2D U+002D hyphen
-!2E U+002E period
-!2F U+002F slash
-!30 U+0030 zero
-!31 U+0031 one
-!32 U+0032 two
-!33 U+0033 three
-!34 U+0034 four
-!35 U+0035 five
-!36 U+0036 six
-!37 U+0037 seven
-!38 U+0038 eight
-!39 U+0039 nine
-!3A U+003A colon
-!3B U+003B semicolon
-!3C U+003C less
-!3D U+003D equal
-!3E U+003E greater
-!3F U+003F question
-!40 U+0040 at
-!41 U+0041 A
-!42 U+0042 B
-!43 U+0043 C
-!44 U+0044 D
-!45 U+0045 E
-!46 U+0046 F
-!47 U+0047 G
-!48 U+0048 H
-!49 U+0049 I
-!4A U+004A J
-!4B U+004B K
-!4C U+004C L
-!4D U+004D M
-!4E U+004E N
-!4F U+004F O
-!50 U+0050 P
-!51 U+0051 Q
-!52 U+0052 R
-!53 U+0053 S
-!54 U+0054 T
-!55 U+0055 U
-!56 U+0056 V
-!57 U+0057 W
-!58 U+0058 X
-!59 U+0059 Y
-!5A U+005A Z
-!5B U+005B bracketleft
-!5C U+005C backslash
-!5D U+005D bracketright
-!5E U+005E asciicircum
-!5F U+005F underscore
-!60 U+0060 grave
-!61 U+0061 a
-!62 U+0062 b
-!63 U+0063 c
-!64 U+0064 d
-!65 U+0065 e
-!66 U+0066 f
-!67 U+0067 g
-!68 U+0068 h
-!69 U+0069 i
-!6A U+006A j
-!6B U+006B k
-!6C U+006C l
-!6D U+006D m
-!6E U+006E n
-!6F U+006F o
-!70 U+0070 p
-!71 U+0071 q
-!72 U+0072 r
-!73 U+0073 s
-!74 U+0074 t
-!75 U+0075 u
-!76 U+0076 v
-!77 U+0077 w
-!78 U+0078 x
-!79 U+0079 y
-!7A U+007A z
-!7B U+007B braceleft
-!7C U+007C bar
-!7D U+007D braceright
-!7E U+007E asciitilde
-!7F U+007F .notdef
-!80 U+0402 afii10051
-!81 U+0403 afii10052
-!82 U+201A quotesinglbase
-!83 U+0453 afii10100
-!84 U+201E quotedblbase
-!85 U+2026 ellipsis
-!86 U+2020 dagger
-!87 U+2021 daggerdbl
-!88 U+20AC Euro
-!89 U+2030 perthousand
-!8A U+0409 afii10058
-!8B U+2039 guilsinglleft
-!8C U+040A afii10059
-!8D U+040C afii10061
-!8E U+040B afii10060
-!8F U+040F afii10145
-!90 U+0452 afii10099
-!91 U+2018 quoteleft
-!92 U+2019 quoteright
-!93 U+201C quotedblleft
-!94 U+201D quotedblright
-!95 U+2022 bullet
-!96 U+2013 endash
-!97 U+2014 emdash
-!99 U+2122 trademark
-!9A U+0459 afii10106
-!9B U+203A guilsinglright
-!9C U+045A afii10107
-!9D U+045C afii10109
-!9E U+045B afii10108
-!9F U+045F afii10193
-!A0 U+00A0 space
-!A1 U+040E afii10062
-!A2 U+045E afii10110
-!A3 U+0408 afii10057
-!A4 U+00A4 currency
-!A5 U+0490 afii10050
-!A6 U+00A6 brokenbar
-!A7 U+00A7 section
-!A8 U+0401 afii10023
-!A9 U+00A9 copyright
-!AA U+0404 afii10053
-!AB U+00AB guillemotleft
-!AC U+00AC logicalnot
-!AD U+00AD hyphen
-!AE U+00AE registered
-!AF U+0407 afii10056
-!B0 U+00B0 degree
-!B1 U+00B1 plusminus
-!B2 U+0406 afii10055
-!B3 U+0456 afii10103
-!B4 U+0491 afii10098
-!B5 U+00B5 mu
-!B6 U+00B6 paragraph
-!B7 U+00B7 periodcentered
-!B8 U+0451 afii10071
-!B9 U+2116 afii61352
-!BA U+0454 afii10101
-!BB U+00BB guillemotright
-!BC U+0458 afii10105
-!BD U+0405 afii10054
-!BE U+0455 afii10102
-!BF U+0457 afii10104
-!C0 U+0410 afii10017
-!C1 U+0411 afii10018
-!C2 U+0412 afii10019
-!C3 U+0413 afii10020
-!C4 U+0414 afii10021
-!C5 U+0415 afii10022
-!C6 U+0416 afii10024
-!C7 U+0417 afii10025
-!C8 U+0418 afii10026
-!C9 U+0419 afii10027
-!CA U+041A afii10028
-!CB U+041B afii10029
-!CC U+041C afii10030
-!CD U+041D afii10031
-!CE U+041E afii10032
-!CF U+041F afii10033
-!D0 U+0420 afii10034
-!D1 U+0421 afii10035
-!D2 U+0422 afii10036
-!D3 U+0423 afii10037
-!D4 U+0424 afii10038
-!D5 U+0425 afii10039
-!D6 U+0426 afii10040
-!D7 U+0427 afii10041
-!D8 U+0428 afii10042
-!D9 U+0429 afii10043
-!DA U+042A afii10044
-!DB U+042B afii10045
-!DC U+042C afii10046
-!DD U+042D afii10047
-!DE U+042E afii10048
-!DF U+042F afii10049
-!E0 U+0430 afii10065
-!E1 U+0431 afii10066
-!E2 U+0432 afii10067
-!E3 U+0433 afii10068
-!E4 U+0434 afii10069
-!E5 U+0435 afii10070
-!E6 U+0436 afii10072
-!E7 U+0437 afii10073
-!E8 U+0438 afii10074
-!E9 U+0439 afii10075
-!EA U+043A afii10076
-!EB U+043B afii10077
-!EC U+043C afii10078
-!ED U+043D afii10079
-!EE U+043E afii10080
-!EF U+043F afii10081
-!F0 U+0440 afii10082
-!F1 U+0441 afii10083
-!F2 U+0442 afii10084
-!F3 U+0443 afii10085
-!F4 U+0444 afii10086
-!F5 U+0445 afii10087
-!F6 U+0446 afii10088
-!F7 U+0447 afii10089
-!F8 U+0448 afii10090
-!F9 U+0449 afii10091
-!FA U+044A afii10092
-!FB U+044B afii10093
-!FC U+044C afii10094
-!FD U+044D afii10095
-!FE U+044E afii10096
-!FF U+044F afii10097
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/enc/cp1252.map b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/enc/cp1252.map
deleted file mode 100644
index dd490e59..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/enc/cp1252.map
+++ /dev/null
@@ -1,251 +0,0 @@
-!00 U+0000 .notdef
-!01 U+0001 .notdef
-!02 U+0002 .notdef
-!03 U+0003 .notdef
-!04 U+0004 .notdef
-!05 U+0005 .notdef
-!06 U+0006 .notdef
-!07 U+0007 .notdef
-!08 U+0008 .notdef
-!09 U+0009 .notdef
-!0A U+000A .notdef
-!0B U+000B .notdef
-!0C U+000C .notdef
-!0D U+000D .notdef
-!0E U+000E .notdef
-!0F U+000F .notdef
-!10 U+0010 .notdef
-!11 U+0011 .notdef
-!12 U+0012 .notdef
-!13 U+0013 .notdef
-!14 U+0014 .notdef
-!15 U+0015 .notdef
-!16 U+0016 .notdef
-!17 U+0017 .notdef
-!18 U+0018 .notdef
-!19 U+0019 .notdef
-!1A U+001A .notdef
-!1B U+001B .notdef
-!1C U+001C .notdef
-!1D U+001D .notdef
-!1E U+001E .notdef
-!1F U+001F .notdef
-!20 U+0020 space
-!21 U+0021 exclam
-!22 U+0022 quotedbl
-!23 U+0023 numbersign
-!24 U+0024 dollar
-!25 U+0025 percent
-!26 U+0026 ampersand
-!27 U+0027 quotesingle
-!28 U+0028 parenleft
-!29 U+0029 parenright
-!2A U+002A asterisk
-!2B U+002B plus
-!2C U+002C comma
-!2D U+002D hyphen
-!2E U+002E period
-!2F U+002F slash
-!30 U+0030 zero
-!31 U+0031 one
-!32 U+0032 two
-!33 U+0033 three
-!34 U+0034 four
-!35 U+0035 five
-!36 U+0036 six
-!37 U+0037 seven
-!38 U+0038 eight
-!39 U+0039 nine
-!3A U+003A colon
-!3B U+003B semicolon
-!3C U+003C less
-!3D U+003D equal
-!3E U+003E greater
-!3F U+003F question
-!40 U+0040 at
-!41 U+0041 A
-!42 U+0042 B
-!43 U+0043 C
-!44 U+0044 D
-!45 U+0045 E
-!46 U+0046 F
-!47 U+0047 G
-!48 U+0048 H
-!49 U+0049 I
-!4A U+004A J
-!4B U+004B K
-!4C U+004C L
-!4D U+004D M
-!4E U+004E N
-!4F U+004F O
-!50 U+0050 P
-!51 U+0051 Q
-!52 U+0052 R
-!53 U+0053 S
-!54 U+0054 T
-!55 U+0055 U
-!56 U+0056 V
-!57 U+0057 W
-!58 U+0058 X
-!59 U+0059 Y
-!5A U+005A Z
-!5B U+005B bracketleft
-!5C U+005C backslash
-!5D U+005D bracketright
-!5E U+005E asciicircum
-!5F U+005F underscore
-!60 U+0060 grave
-!61 U+0061 a
-!62 U+0062 b
-!63 U+0063 c
-!64 U+0064 d
-!65 U+0065 e
-!66 U+0066 f
-!67 U+0067 g
-!68 U+0068 h
-!69 U+0069 i
-!6A U+006A j
-!6B U+006B k
-!6C U+006C l
-!6D U+006D m
-!6E U+006E n
-!6F U+006F o
-!70 U+0070 p
-!71 U+0071 q
-!72 U+0072 r
-!73 U+0073 s
-!74 U+0074 t
-!75 U+0075 u
-!76 U+0076 v
-!77 U+0077 w
-!78 U+0078 x
-!79 U+0079 y
-!7A U+007A z
-!7B U+007B braceleft
-!7C U+007C bar
-!7D U+007D braceright
-!7E U+007E asciitilde
-!7F U+007F .notdef
-!80 U+20AC Euro
-!82 U+201A quotesinglbase
-!83 U+0192 florin
-!84 U+201E quotedblbase
-!85 U+2026 ellipsis
-!86 U+2020 dagger
-!87 U+2021 daggerdbl
-!88 U+02C6 circumflex
-!89 U+2030 perthousand
-!8A U+0160 Scaron
-!8B U+2039 guilsinglleft
-!8C U+0152 OE
-!8E U+017D Zcaron
-!91 U+2018 quoteleft
-!92 U+2019 quoteright
-!93 U+201C quotedblleft
-!94 U+201D quotedblright
-!95 U+2022 bullet
-!96 U+2013 endash
-!97 U+2014 emdash
-!98 U+02DC tilde
-!99 U+2122 trademark
-!9A U+0161 scaron
-!9B U+203A guilsinglright
-!9C U+0153 oe
-!9E U+017E zcaron
-!9F U+0178 Ydieresis
-!A0 U+00A0 space
-!A1 U+00A1 exclamdown
-!A2 U+00A2 cent
-!A3 U+00A3 sterling
-!A4 U+00A4 currency
-!A5 U+00A5 yen
-!A6 U+00A6 brokenbar
-!A7 U+00A7 section
-!A8 U+00A8 dieresis
-!A9 U+00A9 copyright
-!AA U+00AA ordfeminine
-!AB U+00AB guillemotleft
-!AC U+00AC logicalnot
-!AD U+00AD hyphen
-!AE U+00AE registered
-!AF U+00AF macron
-!B0 U+00B0 degree
-!B1 U+00B1 plusminus
-!B2 U+00B2 twosuperior
-!B3 U+00B3 threesuperior
-!B4 U+00B4 acute
-!B5 U+00B5 mu
-!B6 U+00B6 paragraph
-!B7 U+00B7 periodcentered
-!B8 U+00B8 cedilla
-!B9 U+00B9 onesuperior
-!BA U+00BA ordmasculine
-!BB U+00BB guillemotright
-!BC U+00BC onequarter
-!BD U+00BD onehalf
-!BE U+00BE threequarters
-!BF U+00BF questiondown
-!C0 U+00C0 Agrave
-!C1 U+00C1 Aacute
-!C2 U+00C2 Acircumflex
-!C3 U+00C3 Atilde
-!C4 U+00C4 Adieresis
-!C5 U+00C5 Aring
-!C6 U+00C6 AE
-!C7 U+00C7 Ccedilla
-!C8 U+00C8 Egrave
-!C9 U+00C9 Eacute
-!CA U+00CA Ecircumflex
-!CB U+00CB Edieresis
-!CC U+00CC Igrave
-!CD U+00CD Iacute
-!CE U+00CE Icircumflex
-!CF U+00CF Idieresis
-!D0 U+00D0 Eth
-!D1 U+00D1 Ntilde
-!D2 U+00D2 Ograve
-!D3 U+00D3 Oacute
-!D4 U+00D4 Ocircumflex
-!D5 U+00D5 Otilde
-!D6 U+00D6 Odieresis
-!D7 U+00D7 multiply
-!D8 U+00D8 Oslash
-!D9 U+00D9 Ugrave
-!DA U+00DA Uacute
-!DB U+00DB Ucircumflex
-!DC U+00DC Udieresis
-!DD U+00DD Yacute
-!DE U+00DE Thorn
-!DF U+00DF germandbls
-!E0 U+00E0 agrave
-!E1 U+00E1 aacute
-!E2 U+00E2 acircumflex
-!E3 U+00E3 atilde
-!E4 U+00E4 adieresis
-!E5 U+00E5 aring
-!E6 U+00E6 ae
-!E7 U+00E7 ccedilla
-!E8 U+00E8 egrave
-!E9 U+00E9 eacute
-!EA U+00EA ecircumflex
-!EB U+00EB edieresis
-!EC U+00EC igrave
-!ED U+00ED iacute
-!EE U+00EE icircumflex
-!EF U+00EF idieresis
-!F0 U+00F0 eth
-!F1 U+00F1 ntilde
-!F2 U+00F2 ograve
-!F3 U+00F3 oacute
-!F4 U+00F4 ocircumflex
-!F5 U+00F5 otilde
-!F6 U+00F6 odieresis
-!F7 U+00F7 divide
-!F8 U+00F8 oslash
-!F9 U+00F9 ugrave
-!FA U+00FA uacute
-!FB U+00FB ucircumflex
-!FC U+00FC udieresis
-!FD U+00FD yacute
-!FE U+00FE thorn
-!FF U+00FF ydieresis
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/enc/cp1253.map b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/enc/cp1253.map
deleted file mode 100644
index 4bd826fb..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/enc/cp1253.map
+++ /dev/null
@@ -1,239 +0,0 @@
-!00 U+0000 .notdef
-!01 U+0001 .notdef
-!02 U+0002 .notdef
-!03 U+0003 .notdef
-!04 U+0004 .notdef
-!05 U+0005 .notdef
-!06 U+0006 .notdef
-!07 U+0007 .notdef
-!08 U+0008 .notdef
-!09 U+0009 .notdef
-!0A U+000A .notdef
-!0B U+000B .notdef
-!0C U+000C .notdef
-!0D U+000D .notdef
-!0E U+000E .notdef
-!0F U+000F .notdef
-!10 U+0010 .notdef
-!11 U+0011 .notdef
-!12 U+0012 .notdef
-!13 U+0013 .notdef
-!14 U+0014 .notdef
-!15 U+0015 .notdef
-!16 U+0016 .notdef
-!17 U+0017 .notdef
-!18 U+0018 .notdef
-!19 U+0019 .notdef
-!1A U+001A .notdef
-!1B U+001B .notdef
-!1C U+001C .notdef
-!1D U+001D .notdef
-!1E U+001E .notdef
-!1F U+001F .notdef
-!20 U+0020 space
-!21 U+0021 exclam
-!22 U+0022 quotedbl
-!23 U+0023 numbersign
-!24 U+0024 dollar
-!25 U+0025 percent
-!26 U+0026 ampersand
-!27 U+0027 quotesingle
-!28 U+0028 parenleft
-!29 U+0029 parenright
-!2A U+002A asterisk
-!2B U+002B plus
-!2C U+002C comma
-!2D U+002D hyphen
-!2E U+002E period
-!2F U+002F slash
-!30 U+0030 zero
-!31 U+0031 one
-!32 U+0032 two
-!33 U+0033 three
-!34 U+0034 four
-!35 U+0035 five
-!36 U+0036 six
-!37 U+0037 seven
-!38 U+0038 eight
-!39 U+0039 nine
-!3A U+003A colon
-!3B U+003B semicolon
-!3C U+003C less
-!3D U+003D equal
-!3E U+003E greater
-!3F U+003F question
-!40 U+0040 at
-!41 U+0041 A
-!42 U+0042 B
-!43 U+0043 C
-!44 U+0044 D
-!45 U+0045 E
-!46 U+0046 F
-!47 U+0047 G
-!48 U+0048 H
-!49 U+0049 I
-!4A U+004A J
-!4B U+004B K
-!4C U+004C L
-!4D U+004D M
-!4E U+004E N
-!4F U+004F O
-!50 U+0050 P
-!51 U+0051 Q
-!52 U+0052 R
-!53 U+0053 S
-!54 U+0054 T
-!55 U+0055 U
-!56 U+0056 V
-!57 U+0057 W
-!58 U+0058 X
-!59 U+0059 Y
-!5A U+005A Z
-!5B U+005B bracketleft
-!5C U+005C backslash
-!5D U+005D bracketright
-!5E U+005E asciicircum
-!5F U+005F underscore
-!60 U+0060 grave
-!61 U+0061 a
-!62 U+0062 b
-!63 U+0063 c
-!64 U+0064 d
-!65 U+0065 e
-!66 U+0066 f
-!67 U+0067 g
-!68 U+0068 h
-!69 U+0069 i
-!6A U+006A j
-!6B U+006B k
-!6C U+006C l
-!6D U+006D m
-!6E U+006E n
-!6F U+006F o
-!70 U+0070 p
-!71 U+0071 q
-!72 U+0072 r
-!73 U+0073 s
-!74 U+0074 t
-!75 U+0075 u
-!76 U+0076 v
-!77 U+0077 w
-!78 U+0078 x
-!79 U+0079 y
-!7A U+007A z
-!7B U+007B braceleft
-!7C U+007C bar
-!7D U+007D braceright
-!7E U+007E asciitilde
-!7F U+007F .notdef
-!80 U+20AC Euro
-!82 U+201A quotesinglbase
-!83 U+0192 florin
-!84 U+201E quotedblbase
-!85 U+2026 ellipsis
-!86 U+2020 dagger
-!87 U+2021 daggerdbl
-!89 U+2030 perthousand
-!8B U+2039 guilsinglleft
-!91 U+2018 quoteleft
-!92 U+2019 quoteright
-!93 U+201C quotedblleft
-!94 U+201D quotedblright
-!95 U+2022 bullet
-!96 U+2013 endash
-!97 U+2014 emdash
-!99 U+2122 trademark
-!9B U+203A guilsinglright
-!A0 U+00A0 space
-!A1 U+0385 dieresistonos
-!A2 U+0386 Alphatonos
-!A3 U+00A3 sterling
-!A4 U+00A4 currency
-!A5 U+00A5 yen
-!A6 U+00A6 brokenbar
-!A7 U+00A7 section
-!A8 U+00A8 dieresis
-!A9 U+00A9 copyright
-!AB U+00AB guillemotleft
-!AC U+00AC logicalnot
-!AD U+00AD hyphen
-!AE U+00AE registered
-!AF U+2015 afii00208
-!B0 U+00B0 degree
-!B1 U+00B1 plusminus
-!B2 U+00B2 twosuperior
-!B3 U+00B3 threesuperior
-!B4 U+0384 tonos
-!B5 U+00B5 mu
-!B6 U+00B6 paragraph
-!B7 U+00B7 periodcentered
-!B8 U+0388 Epsilontonos
-!B9 U+0389 Etatonos
-!BA U+038A Iotatonos
-!BB U+00BB guillemotright
-!BC U+038C Omicrontonos
-!BD U+00BD onehalf
-!BE U+038E Upsilontonos
-!BF U+038F Omegatonos
-!C0 U+0390 iotadieresistonos
-!C1 U+0391 Alpha
-!C2 U+0392 Beta
-!C3 U+0393 Gamma
-!C4 U+0394 Delta
-!C5 U+0395 Epsilon
-!C6 U+0396 Zeta
-!C7 U+0397 Eta
-!C8 U+0398 Theta
-!C9 U+0399 Iota
-!CA U+039A Kappa
-!CB U+039B Lambda
-!CC U+039C Mu
-!CD U+039D Nu
-!CE U+039E Xi
-!CF U+039F Omicron
-!D0 U+03A0 Pi
-!D1 U+03A1 Rho
-!D3 U+03A3 Sigma
-!D4 U+03A4 Tau
-!D5 U+03A5 Upsilon
-!D6 U+03A6 Phi
-!D7 U+03A7 Chi
-!D8 U+03A8 Psi
-!D9 U+03A9 Omega
-!DA U+03AA Iotadieresis
-!DB U+03AB Upsilondieresis
-!DC U+03AC alphatonos
-!DD U+03AD epsilontonos
-!DE U+03AE etatonos
-!DF U+03AF iotatonos
-!E0 U+03B0 upsilondieresistonos
-!E1 U+03B1 alpha
-!E2 U+03B2 beta
-!E3 U+03B3 gamma
-!E4 U+03B4 delta
-!E5 U+03B5 epsilon
-!E6 U+03B6 zeta
-!E7 U+03B7 eta
-!E8 U+03B8 theta
-!E9 U+03B9 iota
-!EA U+03BA kappa
-!EB U+03BB lambda
-!EC U+03BC mu
-!ED U+03BD nu
-!EE U+03BE xi
-!EF U+03BF omicron
-!F0 U+03C0 pi
-!F1 U+03C1 rho
-!F2 U+03C2 sigma1
-!F3 U+03C3 sigma
-!F4 U+03C4 tau
-!F5 U+03C5 upsilon
-!F6 U+03C6 phi
-!F7 U+03C7 chi
-!F8 U+03C8 psi
-!F9 U+03C9 omega
-!FA U+03CA iotadieresis
-!FB U+03CB upsilondieresis
-!FC U+03CC omicrontonos
-!FD U+03CD upsilontonos
-!FE U+03CE omegatonos
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/enc/cp1254.map b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/enc/cp1254.map
deleted file mode 100644
index 829473b2..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/enc/cp1254.map
+++ /dev/null
@@ -1,249 +0,0 @@
-!00 U+0000 .notdef
-!01 U+0001 .notdef
-!02 U+0002 .notdef
-!03 U+0003 .notdef
-!04 U+0004 .notdef
-!05 U+0005 .notdef
-!06 U+0006 .notdef
-!07 U+0007 .notdef
-!08 U+0008 .notdef
-!09 U+0009 .notdef
-!0A U+000A .notdef
-!0B U+000B .notdef
-!0C U+000C .notdef
-!0D U+000D .notdef
-!0E U+000E .notdef
-!0F U+000F .notdef
-!10 U+0010 .notdef
-!11 U+0011 .notdef
-!12 U+0012 .notdef
-!13 U+0013 .notdef
-!14 U+0014 .notdef
-!15 U+0015 .notdef
-!16 U+0016 .notdef
-!17 U+0017 .notdef
-!18 U+0018 .notdef
-!19 U+0019 .notdef
-!1A U+001A .notdef
-!1B U+001B .notdef
-!1C U+001C .notdef
-!1D U+001D .notdef
-!1E U+001E .notdef
-!1F U+001F .notdef
-!20 U+0020 space
-!21 U+0021 exclam
-!22 U+0022 quotedbl
-!23 U+0023 numbersign
-!24 U+0024 dollar
-!25 U+0025 percent
-!26 U+0026 ampersand
-!27 U+0027 quotesingle
-!28 U+0028 parenleft
-!29 U+0029 parenright
-!2A U+002A asterisk
-!2B U+002B plus
-!2C U+002C comma
-!2D U+002D hyphen
-!2E U+002E period
-!2F U+002F slash
-!30 U+0030 zero
-!31 U+0031 one
-!32 U+0032 two
-!33 U+0033 three
-!34 U+0034 four
-!35 U+0035 five
-!36 U+0036 six
-!37 U+0037 seven
-!38 U+0038 eight
-!39 U+0039 nine
-!3A U+003A colon
-!3B U+003B semicolon
-!3C U+003C less
-!3D U+003D equal
-!3E U+003E greater
-!3F U+003F question
-!40 U+0040 at
-!41 U+0041 A
-!42 U+0042 B
-!43 U+0043 C
-!44 U+0044 D
-!45 U+0045 E
-!46 U+0046 F
-!47 U+0047 G
-!48 U+0048 H
-!49 U+0049 I
-!4A U+004A J
-!4B U+004B K
-!4C U+004C L
-!4D U+004D M
-!4E U+004E N
-!4F U+004F O
-!50 U+0050 P
-!51 U+0051 Q
-!52 U+0052 R
-!53 U+0053 S
-!54 U+0054 T
-!55 U+0055 U
-!56 U+0056 V
-!57 U+0057 W
-!58 U+0058 X
-!59 U+0059 Y
-!5A U+005A Z
-!5B U+005B bracketleft
-!5C U+005C backslash
-!5D U+005D bracketright
-!5E U+005E asciicircum
-!5F U+005F underscore
-!60 U+0060 grave
-!61 U+0061 a
-!62 U+0062 b
-!63 U+0063 c
-!64 U+0064 d
-!65 U+0065 e
-!66 U+0066 f
-!67 U+0067 g
-!68 U+0068 h
-!69 U+0069 i
-!6A U+006A j
-!6B U+006B k
-!6C U+006C l
-!6D U+006D m
-!6E U+006E n
-!6F U+006F o
-!70 U+0070 p
-!71 U+0071 q
-!72 U+0072 r
-!73 U+0073 s
-!74 U+0074 t
-!75 U+0075 u
-!76 U+0076 v
-!77 U+0077 w
-!78 U+0078 x
-!79 U+0079 y
-!7A U+007A z
-!7B U+007B braceleft
-!7C U+007C bar
-!7D U+007D braceright
-!7E U+007E asciitilde
-!7F U+007F .notdef
-!80 U+20AC Euro
-!82 U+201A quotesinglbase
-!83 U+0192 florin
-!84 U+201E quotedblbase
-!85 U+2026 ellipsis
-!86 U+2020 dagger
-!87 U+2021 daggerdbl
-!88 U+02C6 circumflex
-!89 U+2030 perthousand
-!8A U+0160 Scaron
-!8B U+2039 guilsinglleft
-!8C U+0152 OE
-!91 U+2018 quoteleft
-!92 U+2019 quoteright
-!93 U+201C quotedblleft
-!94 U+201D quotedblright
-!95 U+2022 bullet
-!96 U+2013 endash
-!97 U+2014 emdash
-!98 U+02DC tilde
-!99 U+2122 trademark
-!9A U+0161 scaron
-!9B U+203A guilsinglright
-!9C U+0153 oe
-!9F U+0178 Ydieresis
-!A0 U+00A0 space
-!A1 U+00A1 exclamdown
-!A2 U+00A2 cent
-!A3 U+00A3 sterling
-!A4 U+00A4 currency
-!A5 U+00A5 yen
-!A6 U+00A6 brokenbar
-!A7 U+00A7 section
-!A8 U+00A8 dieresis
-!A9 U+00A9 copyright
-!AA U+00AA ordfeminine
-!AB U+00AB guillemotleft
-!AC U+00AC logicalnot
-!AD U+00AD hyphen
-!AE U+00AE registered
-!AF U+00AF macron
-!B0 U+00B0 degree
-!B1 U+00B1 plusminus
-!B2 U+00B2 twosuperior
-!B3 U+00B3 threesuperior
-!B4 U+00B4 acute
-!B5 U+00B5 mu
-!B6 U+00B6 paragraph
-!B7 U+00B7 periodcentered
-!B8 U+00B8 cedilla
-!B9 U+00B9 onesuperior
-!BA U+00BA ordmasculine
-!BB U+00BB guillemotright
-!BC U+00BC onequarter
-!BD U+00BD onehalf
-!BE U+00BE threequarters
-!BF U+00BF questiondown
-!C0 U+00C0 Agrave
-!C1 U+00C1 Aacute
-!C2 U+00C2 Acircumflex
-!C3 U+00C3 Atilde
-!C4 U+00C4 Adieresis
-!C5 U+00C5 Aring
-!C6 U+00C6 AE
-!C7 U+00C7 Ccedilla
-!C8 U+00C8 Egrave
-!C9 U+00C9 Eacute
-!CA U+00CA Ecircumflex
-!CB U+00CB Edieresis
-!CC U+00CC Igrave
-!CD U+00CD Iacute
-!CE U+00CE Icircumflex
-!CF U+00CF Idieresis
-!D0 U+011E Gbreve
-!D1 U+00D1 Ntilde
-!D2 U+00D2 Ograve
-!D3 U+00D3 Oacute
-!D4 U+00D4 Ocircumflex
-!D5 U+00D5 Otilde
-!D6 U+00D6 Odieresis
-!D7 U+00D7 multiply
-!D8 U+00D8 Oslash
-!D9 U+00D9 Ugrave
-!DA U+00DA Uacute
-!DB U+00DB Ucircumflex
-!DC U+00DC Udieresis
-!DD U+0130 Idotaccent
-!DE U+015E Scedilla
-!DF U+00DF germandbls
-!E0 U+00E0 agrave
-!E1 U+00E1 aacute
-!E2 U+00E2 acircumflex
-!E3 U+00E3 atilde
-!E4 U+00E4 adieresis
-!E5 U+00E5 aring
-!E6 U+00E6 ae
-!E7 U+00E7 ccedilla
-!E8 U+00E8 egrave
-!E9 U+00E9 eacute
-!EA U+00EA ecircumflex
-!EB U+00EB edieresis
-!EC U+00EC igrave
-!ED U+00ED iacute
-!EE U+00EE icircumflex
-!EF U+00EF idieresis
-!F0 U+011F gbreve
-!F1 U+00F1 ntilde
-!F2 U+00F2 ograve
-!F3 U+00F3 oacute
-!F4 U+00F4 ocircumflex
-!F5 U+00F5 otilde
-!F6 U+00F6 odieresis
-!F7 U+00F7 divide
-!F8 U+00F8 oslash
-!F9 U+00F9 ugrave
-!FA U+00FA uacute
-!FB U+00FB ucircumflex
-!FC U+00FC udieresis
-!FD U+0131 dotlessi
-!FE U+015F scedilla
-!FF U+00FF ydieresis
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/enc/cp1255.map b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/enc/cp1255.map
deleted file mode 100644
index 079e10c6..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/enc/cp1255.map
+++ /dev/null
@@ -1,233 +0,0 @@
-!00 U+0000 .notdef
-!01 U+0001 .notdef
-!02 U+0002 .notdef
-!03 U+0003 .notdef
-!04 U+0004 .notdef
-!05 U+0005 .notdef
-!06 U+0006 .notdef
-!07 U+0007 .notdef
-!08 U+0008 .notdef
-!09 U+0009 .notdef
-!0A U+000A .notdef
-!0B U+000B .notdef
-!0C U+000C .notdef
-!0D U+000D .notdef
-!0E U+000E .notdef
-!0F U+000F .notdef
-!10 U+0010 .notdef
-!11 U+0011 .notdef
-!12 U+0012 .notdef
-!13 U+0013 .notdef
-!14 U+0014 .notdef
-!15 U+0015 .notdef
-!16 U+0016 .notdef
-!17 U+0017 .notdef
-!18 U+0018 .notdef
-!19 U+0019 .notdef
-!1A U+001A .notdef
-!1B U+001B .notdef
-!1C U+001C .notdef
-!1D U+001D .notdef
-!1E U+001E .notdef
-!1F U+001F .notdef
-!20 U+0020 space
-!21 U+0021 exclam
-!22 U+0022 quotedbl
-!23 U+0023 numbersign
-!24 U+0024 dollar
-!25 U+0025 percent
-!26 U+0026 ampersand
-!27 U+0027 quotesingle
-!28 U+0028 parenleft
-!29 U+0029 parenright
-!2A U+002A asterisk
-!2B U+002B plus
-!2C U+002C comma
-!2D U+002D hyphen
-!2E U+002E period
-!2F U+002F slash
-!30 U+0030 zero
-!31 U+0031 one
-!32 U+0032 two
-!33 U+0033 three
-!34 U+0034 four
-!35 U+0035 five
-!36 U+0036 six
-!37 U+0037 seven
-!38 U+0038 eight
-!39 U+0039 nine
-!3A U+003A colon
-!3B U+003B semicolon
-!3C U+003C less
-!3D U+003D equal
-!3E U+003E greater
-!3F U+003F question
-!40 U+0040 at
-!41 U+0041 A
-!42 U+0042 B
-!43 U+0043 C
-!44 U+0044 D
-!45 U+0045 E
-!46 U+0046 F
-!47 U+0047 G
-!48 U+0048 H
-!49 U+0049 I
-!4A U+004A J
-!4B U+004B K
-!4C U+004C L
-!4D U+004D M
-!4E U+004E N
-!4F U+004F O
-!50 U+0050 P
-!51 U+0051 Q
-!52 U+0052 R
-!53 U+0053 S
-!54 U+0054 T
-!55 U+0055 U
-!56 U+0056 V
-!57 U+0057 W
-!58 U+0058 X
-!59 U+0059 Y
-!5A U+005A Z
-!5B U+005B bracketleft
-!5C U+005C backslash
-!5D U+005D bracketright
-!5E U+005E asciicircum
-!5F U+005F underscore
-!60 U+0060 grave
-!61 U+0061 a
-!62 U+0062 b
-!63 U+0063 c
-!64 U+0064 d
-!65 U+0065 e
-!66 U+0066 f
-!67 U+0067 g
-!68 U+0068 h
-!69 U+0069 i
-!6A U+006A j
-!6B U+006B k
-!6C U+006C l
-!6D U+006D m
-!6E U+006E n
-!6F U+006F o
-!70 U+0070 p
-!71 U+0071 q
-!72 U+0072 r
-!73 U+0073 s
-!74 U+0074 t
-!75 U+0075 u
-!76 U+0076 v
-!77 U+0077 w
-!78 U+0078 x
-!79 U+0079 y
-!7A U+007A z
-!7B U+007B braceleft
-!7C U+007C bar
-!7D U+007D braceright
-!7E U+007E asciitilde
-!7F U+007F .notdef
-!80 U+20AC Euro
-!82 U+201A quotesinglbase
-!83 U+0192 florin
-!84 U+201E quotedblbase
-!85 U+2026 ellipsis
-!86 U+2020 dagger
-!87 U+2021 daggerdbl
-!88 U+02C6 circumflex
-!89 U+2030 perthousand
-!8B U+2039 guilsinglleft
-!91 U+2018 quoteleft
-!92 U+2019 quoteright
-!93 U+201C quotedblleft
-!94 U+201D quotedblright
-!95 U+2022 bullet
-!96 U+2013 endash
-!97 U+2014 emdash
-!98 U+02DC tilde
-!99 U+2122 trademark
-!9B U+203A guilsinglright
-!A0 U+00A0 space
-!A1 U+00A1 exclamdown
-!A2 U+00A2 cent
-!A3 U+00A3 sterling
-!A4 U+20AA afii57636
-!A5 U+00A5 yen
-!A6 U+00A6 brokenbar
-!A7 U+00A7 section
-!A8 U+00A8 dieresis
-!A9 U+00A9 copyright
-!AA U+00D7 multiply
-!AB U+00AB guillemotleft
-!AC U+00AC logicalnot
-!AD U+00AD sfthyphen
-!AE U+00AE registered
-!AF U+00AF macron
-!B0 U+00B0 degree
-!B1 U+00B1 plusminus
-!B2 U+00B2 twosuperior
-!B3 U+00B3 threesuperior
-!B4 U+00B4 acute
-!B5 U+00B5 mu
-!B6 U+00B6 paragraph
-!B7 U+00B7 middot
-!B8 U+00B8 cedilla
-!B9 U+00B9 onesuperior
-!BA U+00F7 divide
-!BB U+00BB guillemotright
-!BC U+00BC onequarter
-!BD U+00BD onehalf
-!BE U+00BE threequarters
-!BF U+00BF questiondown
-!C0 U+05B0 afii57799
-!C1 U+05B1 afii57801
-!C2 U+05B2 afii57800
-!C3 U+05B3 afii57802
-!C4 U+05B4 afii57793
-!C5 U+05B5 afii57794
-!C6 U+05B6 afii57795
-!C7 U+05B7 afii57798
-!C8 U+05B8 afii57797
-!C9 U+05B9 afii57806
-!CB U+05BB afii57796
-!CC U+05BC afii57807
-!CD U+05BD afii57839
-!CE U+05BE afii57645
-!CF U+05BF afii57841
-!D0 U+05C0 afii57842
-!D1 U+05C1 afii57804
-!D2 U+05C2 afii57803
-!D3 U+05C3 afii57658
-!D4 U+05F0 afii57716
-!D5 U+05F1 afii57717
-!D6 U+05F2 afii57718
-!D7 U+05F3 gereshhebrew
-!D8 U+05F4 gershayimhebrew
-!E0 U+05D0 afii57664
-!E1 U+05D1 afii57665
-!E2 U+05D2 afii57666
-!E3 U+05D3 afii57667
-!E4 U+05D4 afii57668
-!E5 U+05D5 afii57669
-!E6 U+05D6 afii57670
-!E7 U+05D7 afii57671
-!E8 U+05D8 afii57672
-!E9 U+05D9 afii57673
-!EA U+05DA afii57674
-!EB U+05DB afii57675
-!EC U+05DC afii57676
-!ED U+05DD afii57677
-!EE U+05DE afii57678
-!EF U+05DF afii57679
-!F0 U+05E0 afii57680
-!F1 U+05E1 afii57681
-!F2 U+05E2 afii57682
-!F3 U+05E3 afii57683
-!F4 U+05E4 afii57684
-!F5 U+05E5 afii57685
-!F6 U+05E6 afii57686
-!F7 U+05E7 afii57687
-!F8 U+05E8 afii57688
-!F9 U+05E9 afii57689
-!FA U+05EA afii57690
-!FD U+200E afii299
-!FE U+200F afii300
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/enc/cp1257.map b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/enc/cp1257.map
deleted file mode 100644
index 2f2ecfa2..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/enc/cp1257.map
+++ /dev/null
@@ -1,244 +0,0 @@
-!00 U+0000 .notdef
-!01 U+0001 .notdef
-!02 U+0002 .notdef
-!03 U+0003 .notdef
-!04 U+0004 .notdef
-!05 U+0005 .notdef
-!06 U+0006 .notdef
-!07 U+0007 .notdef
-!08 U+0008 .notdef
-!09 U+0009 .notdef
-!0A U+000A .notdef
-!0B U+000B .notdef
-!0C U+000C .notdef
-!0D U+000D .notdef
-!0E U+000E .notdef
-!0F U+000F .notdef
-!10 U+0010 .notdef
-!11 U+0011 .notdef
-!12 U+0012 .notdef
-!13 U+0013 .notdef
-!14 U+0014 .notdef
-!15 U+0015 .notdef
-!16 U+0016 .notdef
-!17 U+0017 .notdef
-!18 U+0018 .notdef
-!19 U+0019 .notdef
-!1A U+001A .notdef
-!1B U+001B .notdef
-!1C U+001C .notdef
-!1D U+001D .notdef
-!1E U+001E .notdef
-!1F U+001F .notdef
-!20 U+0020 space
-!21 U+0021 exclam
-!22 U+0022 quotedbl
-!23 U+0023 numbersign
-!24 U+0024 dollar
-!25 U+0025 percent
-!26 U+0026 ampersand
-!27 U+0027 quotesingle
-!28 U+0028 parenleft
-!29 U+0029 parenright
-!2A U+002A asterisk
-!2B U+002B plus
-!2C U+002C comma
-!2D U+002D hyphen
-!2E U+002E period
-!2F U+002F slash
-!30 U+0030 zero
-!31 U+0031 one
-!32 U+0032 two
-!33 U+0033 three
-!34 U+0034 four
-!35 U+0035 five
-!36 U+0036 six
-!37 U+0037 seven
-!38 U+0038 eight
-!39 U+0039 nine
-!3A U+003A colon
-!3B U+003B semicolon
-!3C U+003C less
-!3D U+003D equal
-!3E U+003E greater
-!3F U+003F question
-!40 U+0040 at
-!41 U+0041 A
-!42 U+0042 B
-!43 U+0043 C
-!44 U+0044 D
-!45 U+0045 E
-!46 U+0046 F
-!47 U+0047 G
-!48 U+0048 H
-!49 U+0049 I
-!4A U+004A J
-!4B U+004B K
-!4C U+004C L
-!4D U+004D M
-!4E U+004E N
-!4F U+004F O
-!50 U+0050 P
-!51 U+0051 Q
-!52 U+0052 R
-!53 U+0053 S
-!54 U+0054 T
-!55 U+0055 U
-!56 U+0056 V
-!57 U+0057 W
-!58 U+0058 X
-!59 U+0059 Y
-!5A U+005A Z
-!5B U+005B bracketleft
-!5C U+005C backslash
-!5D U+005D bracketright
-!5E U+005E asciicircum
-!5F U+005F underscore
-!60 U+0060 grave
-!61 U+0061 a
-!62 U+0062 b
-!63 U+0063 c
-!64 U+0064 d
-!65 U+0065 e
-!66 U+0066 f
-!67 U+0067 g
-!68 U+0068 h
-!69 U+0069 i
-!6A U+006A j
-!6B U+006B k
-!6C U+006C l
-!6D U+006D m
-!6E U+006E n
-!6F U+006F o
-!70 U+0070 p
-!71 U+0071 q
-!72 U+0072 r
-!73 U+0073 s
-!74 U+0074 t
-!75 U+0075 u
-!76 U+0076 v
-!77 U+0077 w
-!78 U+0078 x
-!79 U+0079 y
-!7A U+007A z
-!7B U+007B braceleft
-!7C U+007C bar
-!7D U+007D braceright
-!7E U+007E asciitilde
-!7F U+007F .notdef
-!80 U+20AC Euro
-!82 U+201A quotesinglbase
-!84 U+201E quotedblbase
-!85 U+2026 ellipsis
-!86 U+2020 dagger
-!87 U+2021 daggerdbl
-!89 U+2030 perthousand
-!8B U+2039 guilsinglleft
-!8D U+00A8 dieresis
-!8E U+02C7 caron
-!8F U+00B8 cedilla
-!91 U+2018 quoteleft
-!92 U+2019 quoteright
-!93 U+201C quotedblleft
-!94 U+201D quotedblright
-!95 U+2022 bullet
-!96 U+2013 endash
-!97 U+2014 emdash
-!99 U+2122 trademark
-!9B U+203A guilsinglright
-!9D U+00AF macron
-!9E U+02DB ogonek
-!A0 U+00A0 space
-!A2 U+00A2 cent
-!A3 U+00A3 sterling
-!A4 U+00A4 currency
-!A6 U+00A6 brokenbar
-!A7 U+00A7 section
-!A8 U+00D8 Oslash
-!A9 U+00A9 copyright
-!AA U+0156 Rcommaaccent
-!AB U+00AB guillemotleft
-!AC U+00AC logicalnot
-!AD U+00AD hyphen
-!AE U+00AE registered
-!AF U+00C6 AE
-!B0 U+00B0 degree
-!B1 U+00B1 plusminus
-!B2 U+00B2 twosuperior
-!B3 U+00B3 threesuperior
-!B4 U+00B4 acute
-!B5 U+00B5 mu
-!B6 U+00B6 paragraph
-!B7 U+00B7 periodcentered
-!B8 U+00F8 oslash
-!B9 U+00B9 onesuperior
-!BA U+0157 rcommaaccent
-!BB U+00BB guillemotright
-!BC U+00BC onequarter
-!BD U+00BD onehalf
-!BE U+00BE threequarters
-!BF U+00E6 ae
-!C0 U+0104 Aogonek
-!C1 U+012E Iogonek
-!C2 U+0100 Amacron
-!C3 U+0106 Cacute
-!C4 U+00C4 Adieresis
-!C5 U+00C5 Aring
-!C6 U+0118 Eogonek
-!C7 U+0112 Emacron
-!C8 U+010C Ccaron
-!C9 U+00C9 Eacute
-!CA U+0179 Zacute
-!CB U+0116 Edotaccent
-!CC U+0122 Gcommaaccent
-!CD U+0136 Kcommaaccent
-!CE U+012A Imacron
-!CF U+013B Lcommaaccent
-!D0 U+0160 Scaron
-!D1 U+0143 Nacute
-!D2 U+0145 Ncommaaccent
-!D3 U+00D3 Oacute
-!D4 U+014C Omacron
-!D5 U+00D5 Otilde
-!D6 U+00D6 Odieresis
-!D7 U+00D7 multiply
-!D8 U+0172 Uogonek
-!D9 U+0141 Lslash
-!DA U+015A Sacute
-!DB U+016A Umacron
-!DC U+00DC Udieresis
-!DD U+017B Zdotaccent
-!DE U+017D Zcaron
-!DF U+00DF germandbls
-!E0 U+0105 aogonek
-!E1 U+012F iogonek
-!E2 U+0101 amacron
-!E3 U+0107 cacute
-!E4 U+00E4 adieresis
-!E5 U+00E5 aring
-!E6 U+0119 eogonek
-!E7 U+0113 emacron
-!E8 U+010D ccaron
-!E9 U+00E9 eacute
-!EA U+017A zacute
-!EB U+0117 edotaccent
-!EC U+0123 gcommaaccent
-!ED U+0137 kcommaaccent
-!EE U+012B imacron
-!EF U+013C lcommaaccent
-!F0 U+0161 scaron
-!F1 U+0144 nacute
-!F2 U+0146 ncommaaccent
-!F3 U+00F3 oacute
-!F4 U+014D omacron
-!F5 U+00F5 otilde
-!F6 U+00F6 odieresis
-!F7 U+00F7 divide
-!F8 U+0173 uogonek
-!F9 U+0142 lslash
-!FA U+015B sacute
-!FB U+016B umacron
-!FC U+00FC udieresis
-!FD U+017C zdotaccent
-!FE U+017E zcaron
-!FF U+02D9 dotaccent
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/enc/cp1258.map b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/enc/cp1258.map
deleted file mode 100644
index fed915f7..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/enc/cp1258.map
+++ /dev/null
@@ -1,247 +0,0 @@
-!00 U+0000 .notdef
-!01 U+0001 .notdef
-!02 U+0002 .notdef
-!03 U+0003 .notdef
-!04 U+0004 .notdef
-!05 U+0005 .notdef
-!06 U+0006 .notdef
-!07 U+0007 .notdef
-!08 U+0008 .notdef
-!09 U+0009 .notdef
-!0A U+000A .notdef
-!0B U+000B .notdef
-!0C U+000C .notdef
-!0D U+000D .notdef
-!0E U+000E .notdef
-!0F U+000F .notdef
-!10 U+0010 .notdef
-!11 U+0011 .notdef
-!12 U+0012 .notdef
-!13 U+0013 .notdef
-!14 U+0014 .notdef
-!15 U+0015 .notdef
-!16 U+0016 .notdef
-!17 U+0017 .notdef
-!18 U+0018 .notdef
-!19 U+0019 .notdef
-!1A U+001A .notdef
-!1B U+001B .notdef
-!1C U+001C .notdef
-!1D U+001D .notdef
-!1E U+001E .notdef
-!1F U+001F .notdef
-!20 U+0020 space
-!21 U+0021 exclam
-!22 U+0022 quotedbl
-!23 U+0023 numbersign
-!24 U+0024 dollar
-!25 U+0025 percent
-!26 U+0026 ampersand
-!27 U+0027 quotesingle
-!28 U+0028 parenleft
-!29 U+0029 parenright
-!2A U+002A asterisk
-!2B U+002B plus
-!2C U+002C comma
-!2D U+002D hyphen
-!2E U+002E period
-!2F U+002F slash
-!30 U+0030 zero
-!31 U+0031 one
-!32 U+0032 two
-!33 U+0033 three
-!34 U+0034 four
-!35 U+0035 five
-!36 U+0036 six
-!37 U+0037 seven
-!38 U+0038 eight
-!39 U+0039 nine
-!3A U+003A colon
-!3B U+003B semicolon
-!3C U+003C less
-!3D U+003D equal
-!3E U+003E greater
-!3F U+003F question
-!40 U+0040 at
-!41 U+0041 A
-!42 U+0042 B
-!43 U+0043 C
-!44 U+0044 D
-!45 U+0045 E
-!46 U+0046 F
-!47 U+0047 G
-!48 U+0048 H
-!49 U+0049 I
-!4A U+004A J
-!4B U+004B K
-!4C U+004C L
-!4D U+004D M
-!4E U+004E N
-!4F U+004F O
-!50 U+0050 P
-!51 U+0051 Q
-!52 U+0052 R
-!53 U+0053 S
-!54 U+0054 T
-!55 U+0055 U
-!56 U+0056 V
-!57 U+0057 W
-!58 U+0058 X
-!59 U+0059 Y
-!5A U+005A Z
-!5B U+005B bracketleft
-!5C U+005C backslash
-!5D U+005D bracketright
-!5E U+005E asciicircum
-!5F U+005F underscore
-!60 U+0060 grave
-!61 U+0061 a
-!62 U+0062 b
-!63 U+0063 c
-!64 U+0064 d
-!65 U+0065 e
-!66 U+0066 f
-!67 U+0067 g
-!68 U+0068 h
-!69 U+0069 i
-!6A U+006A j
-!6B U+006B k
-!6C U+006C l
-!6D U+006D m
-!6E U+006E n
-!6F U+006F o
-!70 U+0070 p
-!71 U+0071 q
-!72 U+0072 r
-!73 U+0073 s
-!74 U+0074 t
-!75 U+0075 u
-!76 U+0076 v
-!77 U+0077 w
-!78 U+0078 x
-!79 U+0079 y
-!7A U+007A z
-!7B U+007B braceleft
-!7C U+007C bar
-!7D U+007D braceright
-!7E U+007E asciitilde
-!7F U+007F .notdef
-!80 U+20AC Euro
-!82 U+201A quotesinglbase
-!83 U+0192 florin
-!84 U+201E quotedblbase
-!85 U+2026 ellipsis
-!86 U+2020 dagger
-!87 U+2021 daggerdbl
-!88 U+02C6 circumflex
-!89 U+2030 perthousand
-!8B U+2039 guilsinglleft
-!8C U+0152 OE
-!91 U+2018 quoteleft
-!92 U+2019 quoteright
-!93 U+201C quotedblleft
-!94 U+201D quotedblright
-!95 U+2022 bullet
-!96 U+2013 endash
-!97 U+2014 emdash
-!98 U+02DC tilde
-!99 U+2122 trademark
-!9B U+203A guilsinglright
-!9C U+0153 oe
-!9F U+0178 Ydieresis
-!A0 U+00A0 space
-!A1 U+00A1 exclamdown
-!A2 U+00A2 cent
-!A3 U+00A3 sterling
-!A4 U+00A4 currency
-!A5 U+00A5 yen
-!A6 U+00A6 brokenbar
-!A7 U+00A7 section
-!A8 U+00A8 dieresis
-!A9 U+00A9 copyright
-!AA U+00AA ordfeminine
-!AB U+00AB guillemotleft
-!AC U+00AC logicalnot
-!AD U+00AD hyphen
-!AE U+00AE registered
-!AF U+00AF macron
-!B0 U+00B0 degree
-!B1 U+00B1 plusminus
-!B2 U+00B2 twosuperior
-!B3 U+00B3 threesuperior
-!B4 U+00B4 acute
-!B5 U+00B5 mu
-!B6 U+00B6 paragraph
-!B7 U+00B7 periodcentered
-!B8 U+00B8 cedilla
-!B9 U+00B9 onesuperior
-!BA U+00BA ordmasculine
-!BB U+00BB guillemotright
-!BC U+00BC onequarter
-!BD U+00BD onehalf
-!BE U+00BE threequarters
-!BF U+00BF questiondown
-!C0 U+00C0 Agrave
-!C1 U+00C1 Aacute
-!C2 U+00C2 Acircumflex
-!C3 U+0102 Abreve
-!C4 U+00C4 Adieresis
-!C5 U+00C5 Aring
-!C6 U+00C6 AE
-!C7 U+00C7 Ccedilla
-!C8 U+00C8 Egrave
-!C9 U+00C9 Eacute
-!CA U+00CA Ecircumflex
-!CB U+00CB Edieresis
-!CC U+0300 gravecomb
-!CD U+00CD Iacute
-!CE U+00CE Icircumflex
-!CF U+00CF Idieresis
-!D0 U+0110 Dcroat
-!D1 U+00D1 Ntilde
-!D2 U+0309 hookabovecomb
-!D3 U+00D3 Oacute
-!D4 U+00D4 Ocircumflex
-!D5 U+01A0 Ohorn
-!D6 U+00D6 Odieresis
-!D7 U+00D7 multiply
-!D8 U+00D8 Oslash
-!D9 U+00D9 Ugrave
-!DA U+00DA Uacute
-!DB U+00DB Ucircumflex
-!DC U+00DC Udieresis
-!DD U+01AF Uhorn
-!DE U+0303 tildecomb
-!DF U+00DF germandbls
-!E0 U+00E0 agrave
-!E1 U+00E1 aacute
-!E2 U+00E2 acircumflex
-!E3 U+0103 abreve
-!E4 U+00E4 adieresis
-!E5 U+00E5 aring
-!E6 U+00E6 ae
-!E7 U+00E7 ccedilla
-!E8 U+00E8 egrave
-!E9 U+00E9 eacute
-!EA U+00EA ecircumflex
-!EB U+00EB edieresis
-!EC U+0301 acutecomb
-!ED U+00ED iacute
-!EE U+00EE icircumflex
-!EF U+00EF idieresis
-!F0 U+0111 dcroat
-!F1 U+00F1 ntilde
-!F2 U+0323 dotbelowcomb
-!F3 U+00F3 oacute
-!F4 U+00F4 ocircumflex
-!F5 U+01A1 ohorn
-!F6 U+00F6 odieresis
-!F7 U+00F7 divide
-!F8 U+00F8 oslash
-!F9 U+00F9 ugrave
-!FA U+00FA uacute
-!FB U+00FB ucircumflex
-!FC U+00FC udieresis
-!FD U+01B0 uhorn
-!FE U+20AB dong
-!FF U+00FF ydieresis
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/enc/cp874.map b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/enc/cp874.map
deleted file mode 100644
index 1006e6b1..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/enc/cp874.map
+++ /dev/null
@@ -1,225 +0,0 @@
-!00 U+0000 .notdef
-!01 U+0001 .notdef
-!02 U+0002 .notdef
-!03 U+0003 .notdef
-!04 U+0004 .notdef
-!05 U+0005 .notdef
-!06 U+0006 .notdef
-!07 U+0007 .notdef
-!08 U+0008 .notdef
-!09 U+0009 .notdef
-!0A U+000A .notdef
-!0B U+000B .notdef
-!0C U+000C .notdef
-!0D U+000D .notdef
-!0E U+000E .notdef
-!0F U+000F .notdef
-!10 U+0010 .notdef
-!11 U+0011 .notdef
-!12 U+0012 .notdef
-!13 U+0013 .notdef
-!14 U+0014 .notdef
-!15 U+0015 .notdef
-!16 U+0016 .notdef
-!17 U+0017 .notdef
-!18 U+0018 .notdef
-!19 U+0019 .notdef
-!1A U+001A .notdef
-!1B U+001B .notdef
-!1C U+001C .notdef
-!1D U+001D .notdef
-!1E U+001E .notdef
-!1F U+001F .notdef
-!20 U+0020 space
-!21 U+0021 exclam
-!22 U+0022 quotedbl
-!23 U+0023 numbersign
-!24 U+0024 dollar
-!25 U+0025 percent
-!26 U+0026 ampersand
-!27 U+0027 quotesingle
-!28 U+0028 parenleft
-!29 U+0029 parenright
-!2A U+002A asterisk
-!2B U+002B plus
-!2C U+002C comma
-!2D U+002D hyphen
-!2E U+002E period
-!2F U+002F slash
-!30 U+0030 zero
-!31 U+0031 one
-!32 U+0032 two
-!33 U+0033 three
-!34 U+0034 four
-!35 U+0035 five
-!36 U+0036 six
-!37 U+0037 seven
-!38 U+0038 eight
-!39 U+0039 nine
-!3A U+003A colon
-!3B U+003B semicolon
-!3C U+003C less
-!3D U+003D equal
-!3E U+003E greater
-!3F U+003F question
-!40 U+0040 at
-!41 U+0041 A
-!42 U+0042 B
-!43 U+0043 C
-!44 U+0044 D
-!45 U+0045 E
-!46 U+0046 F
-!47 U+0047 G
-!48 U+0048 H
-!49 U+0049 I
-!4A U+004A J
-!4B U+004B K
-!4C U+004C L
-!4D U+004D M
-!4E U+004E N
-!4F U+004F O
-!50 U+0050 P
-!51 U+0051 Q
-!52 U+0052 R
-!53 U+0053 S
-!54 U+0054 T
-!55 U+0055 U
-!56 U+0056 V
-!57 U+0057 W
-!58 U+0058 X
-!59 U+0059 Y
-!5A U+005A Z
-!5B U+005B bracketleft
-!5C U+005C backslash
-!5D U+005D bracketright
-!5E U+005E asciicircum
-!5F U+005F underscore
-!60 U+0060 grave
-!61 U+0061 a
-!62 U+0062 b
-!63 U+0063 c
-!64 U+0064 d
-!65 U+0065 e
-!66 U+0066 f
-!67 U+0067 g
-!68 U+0068 h
-!69 U+0069 i
-!6A U+006A j
-!6B U+006B k
-!6C U+006C l
-!6D U+006D m
-!6E U+006E n
-!6F U+006F o
-!70 U+0070 p
-!71 U+0071 q
-!72 U+0072 r
-!73 U+0073 s
-!74 U+0074 t
-!75 U+0075 u
-!76 U+0076 v
-!77 U+0077 w
-!78 U+0078 x
-!79 U+0079 y
-!7A U+007A z
-!7B U+007B braceleft
-!7C U+007C bar
-!7D U+007D braceright
-!7E U+007E asciitilde
-!7F U+007F .notdef
-!80 U+20AC Euro
-!85 U+2026 ellipsis
-!91 U+2018 quoteleft
-!92 U+2019 quoteright
-!93 U+201C quotedblleft
-!94 U+201D quotedblright
-!95 U+2022 bullet
-!96 U+2013 endash
-!97 U+2014 emdash
-!A0 U+00A0 space
-!A1 U+0E01 kokaithai
-!A2 U+0E02 khokhaithai
-!A3 U+0E03 khokhuatthai
-!A4 U+0E04 khokhwaithai
-!A5 U+0E05 khokhonthai
-!A6 U+0E06 khorakhangthai
-!A7 U+0E07 ngonguthai
-!A8 U+0E08 chochanthai
-!A9 U+0E09 chochingthai
-!AA U+0E0A chochangthai
-!AB U+0E0B sosothai
-!AC U+0E0C chochoethai
-!AD U+0E0D yoyingthai
-!AE U+0E0E dochadathai
-!AF U+0E0F topatakthai
-!B0 U+0E10 thothanthai
-!B1 U+0E11 thonangmonthothai
-!B2 U+0E12 thophuthaothai
-!B3 U+0E13 nonenthai
-!B4 U+0E14 dodekthai
-!B5 U+0E15 totaothai
-!B6 U+0E16 thothungthai
-!B7 U+0E17 thothahanthai
-!B8 U+0E18 thothongthai
-!B9 U+0E19 nonuthai
-!BA U+0E1A bobaimaithai
-!BB U+0E1B poplathai
-!BC U+0E1C phophungthai
-!BD U+0E1D fofathai
-!BE U+0E1E phophanthai
-!BF U+0E1F fofanthai
-!C0 U+0E20 phosamphaothai
-!C1 U+0E21 momathai
-!C2 U+0E22 yoyakthai
-!C3 U+0E23 roruathai
-!C4 U+0E24 ruthai
-!C5 U+0E25 lolingthai
-!C6 U+0E26 luthai
-!C7 U+0E27 wowaenthai
-!C8 U+0E28 sosalathai
-!C9 U+0E29 sorusithai
-!CA U+0E2A sosuathai
-!CB U+0E2B hohipthai
-!CC U+0E2C lochulathai
-!CD U+0E2D oangthai
-!CE U+0E2E honokhukthai
-!CF U+0E2F paiyannoithai
-!D0 U+0E30 saraathai
-!D1 U+0E31 maihanakatthai
-!D2 U+0E32 saraaathai
-!D3 U+0E33 saraamthai
-!D4 U+0E34 saraithai
-!D5 U+0E35 saraiithai
-!D6 U+0E36 sarauethai
-!D7 U+0E37 saraueethai
-!D8 U+0E38 sarauthai
-!D9 U+0E39 sarauuthai
-!DA U+0E3A phinthuthai
-!DF U+0E3F bahtthai
-!E0 U+0E40 saraethai
-!E1 U+0E41 saraaethai
-!E2 U+0E42 saraothai
-!E3 U+0E43 saraaimaimuanthai
-!E4 U+0E44 saraaimaimalaithai
-!E5 U+0E45 lakkhangyaothai
-!E6 U+0E46 maiyamokthai
-!E7 U+0E47 maitaikhuthai
-!E8 U+0E48 maiekthai
-!E9 U+0E49 maithothai
-!EA U+0E4A maitrithai
-!EB U+0E4B maichattawathai
-!EC U+0E4C thanthakhatthai
-!ED U+0E4D nikhahitthai
-!EE U+0E4E yamakkanthai
-!EF U+0E4F fongmanthai
-!F0 U+0E50 zerothai
-!F1 U+0E51 onethai
-!F2 U+0E52 twothai
-!F3 U+0E53 threethai
-!F4 U+0E54 fourthai
-!F5 U+0E55 fivethai
-!F6 U+0E56 sixthai
-!F7 U+0E57 seventhai
-!F8 U+0E58 eightthai
-!F9 U+0E59 ninethai
-!FA U+0E5A angkhankhuthai
-!FB U+0E5B khomutthai
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/enc/iso-8859-1.map b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/enc/iso-8859-1.map
deleted file mode 100644
index 61740a38..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/enc/iso-8859-1.map
+++ /dev/null
@@ -1,256 +0,0 @@
-!00 U+0000 .notdef
-!01 U+0001 .notdef
-!02 U+0002 .notdef
-!03 U+0003 .notdef
-!04 U+0004 .notdef
-!05 U+0005 .notdef
-!06 U+0006 .notdef
-!07 U+0007 .notdef
-!08 U+0008 .notdef
-!09 U+0009 .notdef
-!0A U+000A .notdef
-!0B U+000B .notdef
-!0C U+000C .notdef
-!0D U+000D .notdef
-!0E U+000E .notdef
-!0F U+000F .notdef
-!10 U+0010 .notdef
-!11 U+0011 .notdef
-!12 U+0012 .notdef
-!13 U+0013 .notdef
-!14 U+0014 .notdef
-!15 U+0015 .notdef
-!16 U+0016 .notdef
-!17 U+0017 .notdef
-!18 U+0018 .notdef
-!19 U+0019 .notdef
-!1A U+001A .notdef
-!1B U+001B .notdef
-!1C U+001C .notdef
-!1D U+001D .notdef
-!1E U+001E .notdef
-!1F U+001F .notdef
-!20 U+0020 space
-!21 U+0021 exclam
-!22 U+0022 quotedbl
-!23 U+0023 numbersign
-!24 U+0024 dollar
-!25 U+0025 percent
-!26 U+0026 ampersand
-!27 U+0027 quotesingle
-!28 U+0028 parenleft
-!29 U+0029 parenright
-!2A U+002A asterisk
-!2B U+002B plus
-!2C U+002C comma
-!2D U+002D hyphen
-!2E U+002E period
-!2F U+002F slash
-!30 U+0030 zero
-!31 U+0031 one
-!32 U+0032 two
-!33 U+0033 three
-!34 U+0034 four
-!35 U+0035 five
-!36 U+0036 six
-!37 U+0037 seven
-!38 U+0038 eight
-!39 U+0039 nine
-!3A U+003A colon
-!3B U+003B semicolon
-!3C U+003C less
-!3D U+003D equal
-!3E U+003E greater
-!3F U+003F question
-!40 U+0040 at
-!41 U+0041 A
-!42 U+0042 B
-!43 U+0043 C
-!44 U+0044 D
-!45 U+0045 E
-!46 U+0046 F
-!47 U+0047 G
-!48 U+0048 H
-!49 U+0049 I
-!4A U+004A J
-!4B U+004B K
-!4C U+004C L
-!4D U+004D M
-!4E U+004E N
-!4F U+004F O
-!50 U+0050 P
-!51 U+0051 Q
-!52 U+0052 R
-!53 U+0053 S
-!54 U+0054 T
-!55 U+0055 U
-!56 U+0056 V
-!57 U+0057 W
-!58 U+0058 X
-!59 U+0059 Y
-!5A U+005A Z
-!5B U+005B bracketleft
-!5C U+005C backslash
-!5D U+005D bracketright
-!5E U+005E asciicircum
-!5F U+005F underscore
-!60 U+0060 grave
-!61 U+0061 a
-!62 U+0062 b
-!63 U+0063 c
-!64 U+0064 d
-!65 U+0065 e
-!66 U+0066 f
-!67 U+0067 g
-!68 U+0068 h
-!69 U+0069 i
-!6A U+006A j
-!6B U+006B k
-!6C U+006C l
-!6D U+006D m
-!6E U+006E n
-!6F U+006F o
-!70 U+0070 p
-!71 U+0071 q
-!72 U+0072 r
-!73 U+0073 s
-!74 U+0074 t
-!75 U+0075 u
-!76 U+0076 v
-!77 U+0077 w
-!78 U+0078 x
-!79 U+0079 y
-!7A U+007A z
-!7B U+007B braceleft
-!7C U+007C bar
-!7D U+007D braceright
-!7E U+007E asciitilde
-!7F U+007F .notdef
-!80 U+0080 .notdef
-!81 U+0081 .notdef
-!82 U+0082 .notdef
-!83 U+0083 .notdef
-!84 U+0084 .notdef
-!85 U+0085 .notdef
-!86 U+0086 .notdef
-!87 U+0087 .notdef
-!88 U+0088 .notdef
-!89 U+0089 .notdef
-!8A U+008A .notdef
-!8B U+008B .notdef
-!8C U+008C .notdef
-!8D U+008D .notdef
-!8E U+008E .notdef
-!8F U+008F .notdef
-!90 U+0090 .notdef
-!91 U+0091 .notdef
-!92 U+0092 .notdef
-!93 U+0093 .notdef
-!94 U+0094 .notdef
-!95 U+0095 .notdef
-!96 U+0096 .notdef
-!97 U+0097 .notdef
-!98 U+0098 .notdef
-!99 U+0099 .notdef
-!9A U+009A .notdef
-!9B U+009B .notdef
-!9C U+009C .notdef
-!9D U+009D .notdef
-!9E U+009E .notdef
-!9F U+009F .notdef
-!A0 U+00A0 space
-!A1 U+00A1 exclamdown
-!A2 U+00A2 cent
-!A3 U+00A3 sterling
-!A4 U+00A4 currency
-!A5 U+00A5 yen
-!A6 U+00A6 brokenbar
-!A7 U+00A7 section
-!A8 U+00A8 dieresis
-!A9 U+00A9 copyright
-!AA U+00AA ordfeminine
-!AB U+00AB guillemotleft
-!AC U+00AC logicalnot
-!AD U+00AD hyphen
-!AE U+00AE registered
-!AF U+00AF macron
-!B0 U+00B0 degree
-!B1 U+00B1 plusminus
-!B2 U+00B2 twosuperior
-!B3 U+00B3 threesuperior
-!B4 U+00B4 acute
-!B5 U+00B5 mu
-!B6 U+00B6 paragraph
-!B7 U+00B7 periodcentered
-!B8 U+00B8 cedilla
-!B9 U+00B9 onesuperior
-!BA U+00BA ordmasculine
-!BB U+00BB guillemotright
-!BC U+00BC onequarter
-!BD U+00BD onehalf
-!BE U+00BE threequarters
-!BF U+00BF questiondown
-!C0 U+00C0 Agrave
-!C1 U+00C1 Aacute
-!C2 U+00C2 Acircumflex
-!C3 U+00C3 Atilde
-!C4 U+00C4 Adieresis
-!C5 U+00C5 Aring
-!C6 U+00C6 AE
-!C7 U+00C7 Ccedilla
-!C8 U+00C8 Egrave
-!C9 U+00C9 Eacute
-!CA U+00CA Ecircumflex
-!CB U+00CB Edieresis
-!CC U+00CC Igrave
-!CD U+00CD Iacute
-!CE U+00CE Icircumflex
-!CF U+00CF Idieresis
-!D0 U+00D0 Eth
-!D1 U+00D1 Ntilde
-!D2 U+00D2 Ograve
-!D3 U+00D3 Oacute
-!D4 U+00D4 Ocircumflex
-!D5 U+00D5 Otilde
-!D6 U+00D6 Odieresis
-!D7 U+00D7 multiply
-!D8 U+00D8 Oslash
-!D9 U+00D9 Ugrave
-!DA U+00DA Uacute
-!DB U+00DB Ucircumflex
-!DC U+00DC Udieresis
-!DD U+00DD Yacute
-!DE U+00DE Thorn
-!DF U+00DF germandbls
-!E0 U+00E0 agrave
-!E1 U+00E1 aacute
-!E2 U+00E2 acircumflex
-!E3 U+00E3 atilde
-!E4 U+00E4 adieresis
-!E5 U+00E5 aring
-!E6 U+00E6 ae
-!E7 U+00E7 ccedilla
-!E8 U+00E8 egrave
-!E9 U+00E9 eacute
-!EA U+00EA ecircumflex
-!EB U+00EB edieresis
-!EC U+00EC igrave
-!ED U+00ED iacute
-!EE U+00EE icircumflex
-!EF U+00EF idieresis
-!F0 U+00F0 eth
-!F1 U+00F1 ntilde
-!F2 U+00F2 ograve
-!F3 U+00F3 oacute
-!F4 U+00F4 ocircumflex
-!F5 U+00F5 otilde
-!F6 U+00F6 odieresis
-!F7 U+00F7 divide
-!F8 U+00F8 oslash
-!F9 U+00F9 ugrave
-!FA U+00FA uacute
-!FB U+00FB ucircumflex
-!FC U+00FC udieresis
-!FD U+00FD yacute
-!FE U+00FE thorn
-!FF U+00FF ydieresis
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/enc/iso-8859-11.map b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/enc/iso-8859-11.map
deleted file mode 100644
index 91688120..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/enc/iso-8859-11.map
+++ /dev/null
@@ -1,248 +0,0 @@
-!00 U+0000 .notdef
-!01 U+0001 .notdef
-!02 U+0002 .notdef
-!03 U+0003 .notdef
-!04 U+0004 .notdef
-!05 U+0005 .notdef
-!06 U+0006 .notdef
-!07 U+0007 .notdef
-!08 U+0008 .notdef
-!09 U+0009 .notdef
-!0A U+000A .notdef
-!0B U+000B .notdef
-!0C U+000C .notdef
-!0D U+000D .notdef
-!0E U+000E .notdef
-!0F U+000F .notdef
-!10 U+0010 .notdef
-!11 U+0011 .notdef
-!12 U+0012 .notdef
-!13 U+0013 .notdef
-!14 U+0014 .notdef
-!15 U+0015 .notdef
-!16 U+0016 .notdef
-!17 U+0017 .notdef
-!18 U+0018 .notdef
-!19 U+0019 .notdef
-!1A U+001A .notdef
-!1B U+001B .notdef
-!1C U+001C .notdef
-!1D U+001D .notdef
-!1E U+001E .notdef
-!1F U+001F .notdef
-!20 U+0020 space
-!21 U+0021 exclam
-!22 U+0022 quotedbl
-!23 U+0023 numbersign
-!24 U+0024 dollar
-!25 U+0025 percent
-!26 U+0026 ampersand
-!27 U+0027 quotesingle
-!28 U+0028 parenleft
-!29 U+0029 parenright
-!2A U+002A asterisk
-!2B U+002B plus
-!2C U+002C comma
-!2D U+002D hyphen
-!2E U+002E period
-!2F U+002F slash
-!30 U+0030 zero
-!31 U+0031 one
-!32 U+0032 two
-!33 U+0033 three
-!34 U+0034 four
-!35 U+0035 five
-!36 U+0036 six
-!37 U+0037 seven
-!38 U+0038 eight
-!39 U+0039 nine
-!3A U+003A colon
-!3B U+003B semicolon
-!3C U+003C less
-!3D U+003D equal
-!3E U+003E greater
-!3F U+003F question
-!40 U+0040 at
-!41 U+0041 A
-!42 U+0042 B
-!43 U+0043 C
-!44 U+0044 D
-!45 U+0045 E
-!46 U+0046 F
-!47 U+0047 G
-!48 U+0048 H
-!49 U+0049 I
-!4A U+004A J
-!4B U+004B K
-!4C U+004C L
-!4D U+004D M
-!4E U+004E N
-!4F U+004F O
-!50 U+0050 P
-!51 U+0051 Q
-!52 U+0052 R
-!53 U+0053 S
-!54 U+0054 T
-!55 U+0055 U
-!56 U+0056 V
-!57 U+0057 W
-!58 U+0058 X
-!59 U+0059 Y
-!5A U+005A Z
-!5B U+005B bracketleft
-!5C U+005C backslash
-!5D U+005D bracketright
-!5E U+005E asciicircum
-!5F U+005F underscore
-!60 U+0060 grave
-!61 U+0061 a
-!62 U+0062 b
-!63 U+0063 c
-!64 U+0064 d
-!65 U+0065 e
-!66 U+0066 f
-!67 U+0067 g
-!68 U+0068 h
-!69 U+0069 i
-!6A U+006A j
-!6B U+006B k
-!6C U+006C l
-!6D U+006D m
-!6E U+006E n
-!6F U+006F o
-!70 U+0070 p
-!71 U+0071 q
-!72 U+0072 r
-!73 U+0073 s
-!74 U+0074 t
-!75 U+0075 u
-!76 U+0076 v
-!77 U+0077 w
-!78 U+0078 x
-!79 U+0079 y
-!7A U+007A z
-!7B U+007B braceleft
-!7C U+007C bar
-!7D U+007D braceright
-!7E U+007E asciitilde
-!7F U+007F .notdef
-!80 U+0080 .notdef
-!81 U+0081 .notdef
-!82 U+0082 .notdef
-!83 U+0083 .notdef
-!84 U+0084 .notdef
-!85 U+0085 .notdef
-!86 U+0086 .notdef
-!87 U+0087 .notdef
-!88 U+0088 .notdef
-!89 U+0089 .notdef
-!8A U+008A .notdef
-!8B U+008B .notdef
-!8C U+008C .notdef
-!8D U+008D .notdef
-!8E U+008E .notdef
-!8F U+008F .notdef
-!90 U+0090 .notdef
-!91 U+0091 .notdef
-!92 U+0092 .notdef
-!93 U+0093 .notdef
-!94 U+0094 .notdef
-!95 U+0095 .notdef
-!96 U+0096 .notdef
-!97 U+0097 .notdef
-!98 U+0098 .notdef
-!99 U+0099 .notdef
-!9A U+009A .notdef
-!9B U+009B .notdef
-!9C U+009C .notdef
-!9D U+009D .notdef
-!9E U+009E .notdef
-!9F U+009F .notdef
-!A0 U+00A0 space
-!A1 U+0E01 kokaithai
-!A2 U+0E02 khokhaithai
-!A3 U+0E03 khokhuatthai
-!A4 U+0E04 khokhwaithai
-!A5 U+0E05 khokhonthai
-!A6 U+0E06 khorakhangthai
-!A7 U+0E07 ngonguthai
-!A8 U+0E08 chochanthai
-!A9 U+0E09 chochingthai
-!AA U+0E0A chochangthai
-!AB U+0E0B sosothai
-!AC U+0E0C chochoethai
-!AD U+0E0D yoyingthai
-!AE U+0E0E dochadathai
-!AF U+0E0F topatakthai
-!B0 U+0E10 thothanthai
-!B1 U+0E11 thonangmonthothai
-!B2 U+0E12 thophuthaothai
-!B3 U+0E13 nonenthai
-!B4 U+0E14 dodekthai
-!B5 U+0E15 totaothai
-!B6 U+0E16 thothungthai
-!B7 U+0E17 thothahanthai
-!B8 U+0E18 thothongthai
-!B9 U+0E19 nonuthai
-!BA U+0E1A bobaimaithai
-!BB U+0E1B poplathai
-!BC U+0E1C phophungthai
-!BD U+0E1D fofathai
-!BE U+0E1E phophanthai
-!BF U+0E1F fofanthai
-!C0 U+0E20 phosamphaothai
-!C1 U+0E21 momathai
-!C2 U+0E22 yoyakthai
-!C3 U+0E23 roruathai
-!C4 U+0E24 ruthai
-!C5 U+0E25 lolingthai
-!C6 U+0E26 luthai
-!C7 U+0E27 wowaenthai
-!C8 U+0E28 sosalathai
-!C9 U+0E29 sorusithai
-!CA U+0E2A sosuathai
-!CB U+0E2B hohipthai
-!CC U+0E2C lochulathai
-!CD U+0E2D oangthai
-!CE U+0E2E honokhukthai
-!CF U+0E2F paiyannoithai
-!D0 U+0E30 saraathai
-!D1 U+0E31 maihanakatthai
-!D2 U+0E32 saraaathai
-!D3 U+0E33 saraamthai
-!D4 U+0E34 saraithai
-!D5 U+0E35 saraiithai
-!D6 U+0E36 sarauethai
-!D7 U+0E37 saraueethai
-!D8 U+0E38 sarauthai
-!D9 U+0E39 sarauuthai
-!DA U+0E3A phinthuthai
-!DF U+0E3F bahtthai
-!E0 U+0E40 saraethai
-!E1 U+0E41 saraaethai
-!E2 U+0E42 saraothai
-!E3 U+0E43 saraaimaimuanthai
-!E4 U+0E44 saraaimaimalaithai
-!E5 U+0E45 lakkhangyaothai
-!E6 U+0E46 maiyamokthai
-!E7 U+0E47 maitaikhuthai
-!E8 U+0E48 maiekthai
-!E9 U+0E49 maithothai
-!EA U+0E4A maitrithai
-!EB U+0E4B maichattawathai
-!EC U+0E4C thanthakhatthai
-!ED U+0E4D nikhahitthai
-!EE U+0E4E yamakkanthai
-!EF U+0E4F fongmanthai
-!F0 U+0E50 zerothai
-!F1 U+0E51 onethai
-!F2 U+0E52 twothai
-!F3 U+0E53 threethai
-!F4 U+0E54 fourthai
-!F5 U+0E55 fivethai
-!F6 U+0E56 sixthai
-!F7 U+0E57 seventhai
-!F8 U+0E58 eightthai
-!F9 U+0E59 ninethai
-!FA U+0E5A angkhankhuthai
-!FB U+0E5B khomutthai
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/enc/iso-8859-15.map b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/enc/iso-8859-15.map
deleted file mode 100644
index 6c2b5712..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/enc/iso-8859-15.map
+++ /dev/null
@@ -1,256 +0,0 @@
-!00 U+0000 .notdef
-!01 U+0001 .notdef
-!02 U+0002 .notdef
-!03 U+0003 .notdef
-!04 U+0004 .notdef
-!05 U+0005 .notdef
-!06 U+0006 .notdef
-!07 U+0007 .notdef
-!08 U+0008 .notdef
-!09 U+0009 .notdef
-!0A U+000A .notdef
-!0B U+000B .notdef
-!0C U+000C .notdef
-!0D U+000D .notdef
-!0E U+000E .notdef
-!0F U+000F .notdef
-!10 U+0010 .notdef
-!11 U+0011 .notdef
-!12 U+0012 .notdef
-!13 U+0013 .notdef
-!14 U+0014 .notdef
-!15 U+0015 .notdef
-!16 U+0016 .notdef
-!17 U+0017 .notdef
-!18 U+0018 .notdef
-!19 U+0019 .notdef
-!1A U+001A .notdef
-!1B U+001B .notdef
-!1C U+001C .notdef
-!1D U+001D .notdef
-!1E U+001E .notdef
-!1F U+001F .notdef
-!20 U+0020 space
-!21 U+0021 exclam
-!22 U+0022 quotedbl
-!23 U+0023 numbersign
-!24 U+0024 dollar
-!25 U+0025 percent
-!26 U+0026 ampersand
-!27 U+0027 quotesingle
-!28 U+0028 parenleft
-!29 U+0029 parenright
-!2A U+002A asterisk
-!2B U+002B plus
-!2C U+002C comma
-!2D U+002D hyphen
-!2E U+002E period
-!2F U+002F slash
-!30 U+0030 zero
-!31 U+0031 one
-!32 U+0032 two
-!33 U+0033 three
-!34 U+0034 four
-!35 U+0035 five
-!36 U+0036 six
-!37 U+0037 seven
-!38 U+0038 eight
-!39 U+0039 nine
-!3A U+003A colon
-!3B U+003B semicolon
-!3C U+003C less
-!3D U+003D equal
-!3E U+003E greater
-!3F U+003F question
-!40 U+0040 at
-!41 U+0041 A
-!42 U+0042 B
-!43 U+0043 C
-!44 U+0044 D
-!45 U+0045 E
-!46 U+0046 F
-!47 U+0047 G
-!48 U+0048 H
-!49 U+0049 I
-!4A U+004A J
-!4B U+004B K
-!4C U+004C L
-!4D U+004D M
-!4E U+004E N
-!4F U+004F O
-!50 U+0050 P
-!51 U+0051 Q
-!52 U+0052 R
-!53 U+0053 S
-!54 U+0054 T
-!55 U+0055 U
-!56 U+0056 V
-!57 U+0057 W
-!58 U+0058 X
-!59 U+0059 Y
-!5A U+005A Z
-!5B U+005B bracketleft
-!5C U+005C backslash
-!5D U+005D bracketright
-!5E U+005E asciicircum
-!5F U+005F underscore
-!60 U+0060 grave
-!61 U+0061 a
-!62 U+0062 b
-!63 U+0063 c
-!64 U+0064 d
-!65 U+0065 e
-!66 U+0066 f
-!67 U+0067 g
-!68 U+0068 h
-!69 U+0069 i
-!6A U+006A j
-!6B U+006B k
-!6C U+006C l
-!6D U+006D m
-!6E U+006E n
-!6F U+006F o
-!70 U+0070 p
-!71 U+0071 q
-!72 U+0072 r
-!73 U+0073 s
-!74 U+0074 t
-!75 U+0075 u
-!76 U+0076 v
-!77 U+0077 w
-!78 U+0078 x
-!79 U+0079 y
-!7A U+007A z
-!7B U+007B braceleft
-!7C U+007C bar
-!7D U+007D braceright
-!7E U+007E asciitilde
-!7F U+007F .notdef
-!80 U+0080 .notdef
-!81 U+0081 .notdef
-!82 U+0082 .notdef
-!83 U+0083 .notdef
-!84 U+0084 .notdef
-!85 U+0085 .notdef
-!86 U+0086 .notdef
-!87 U+0087 .notdef
-!88 U+0088 .notdef
-!89 U+0089 .notdef
-!8A U+008A .notdef
-!8B U+008B .notdef
-!8C U+008C .notdef
-!8D U+008D .notdef
-!8E U+008E .notdef
-!8F U+008F .notdef
-!90 U+0090 .notdef
-!91 U+0091 .notdef
-!92 U+0092 .notdef
-!93 U+0093 .notdef
-!94 U+0094 .notdef
-!95 U+0095 .notdef
-!96 U+0096 .notdef
-!97 U+0097 .notdef
-!98 U+0098 .notdef
-!99 U+0099 .notdef
-!9A U+009A .notdef
-!9B U+009B .notdef
-!9C U+009C .notdef
-!9D U+009D .notdef
-!9E U+009E .notdef
-!9F U+009F .notdef
-!A0 U+00A0 space
-!A1 U+00A1 exclamdown
-!A2 U+00A2 cent
-!A3 U+00A3 sterling
-!A4 U+20AC Euro
-!A5 U+00A5 yen
-!A6 U+0160 Scaron
-!A7 U+00A7 section
-!A8 U+0161 scaron
-!A9 U+00A9 copyright
-!AA U+00AA ordfeminine
-!AB U+00AB guillemotleft
-!AC U+00AC logicalnot
-!AD U+00AD hyphen
-!AE U+00AE registered
-!AF U+00AF macron
-!B0 U+00B0 degree
-!B1 U+00B1 plusminus
-!B2 U+00B2 twosuperior
-!B3 U+00B3 threesuperior
-!B4 U+017D Zcaron
-!B5 U+00B5 mu
-!B6 U+00B6 paragraph
-!B7 U+00B7 periodcentered
-!B8 U+017E zcaron
-!B9 U+00B9 onesuperior
-!BA U+00BA ordmasculine
-!BB U+00BB guillemotright
-!BC U+0152 OE
-!BD U+0153 oe
-!BE U+0178 Ydieresis
-!BF U+00BF questiondown
-!C0 U+00C0 Agrave
-!C1 U+00C1 Aacute
-!C2 U+00C2 Acircumflex
-!C3 U+00C3 Atilde
-!C4 U+00C4 Adieresis
-!C5 U+00C5 Aring
-!C6 U+00C6 AE
-!C7 U+00C7 Ccedilla
-!C8 U+00C8 Egrave
-!C9 U+00C9 Eacute
-!CA U+00CA Ecircumflex
-!CB U+00CB Edieresis
-!CC U+00CC Igrave
-!CD U+00CD Iacute
-!CE U+00CE Icircumflex
-!CF U+00CF Idieresis
-!D0 U+00D0 Eth
-!D1 U+00D1 Ntilde
-!D2 U+00D2 Ograve
-!D3 U+00D3 Oacute
-!D4 U+00D4 Ocircumflex
-!D5 U+00D5 Otilde
-!D6 U+00D6 Odieresis
-!D7 U+00D7 multiply
-!D8 U+00D8 Oslash
-!D9 U+00D9 Ugrave
-!DA U+00DA Uacute
-!DB U+00DB Ucircumflex
-!DC U+00DC Udieresis
-!DD U+00DD Yacute
-!DE U+00DE Thorn
-!DF U+00DF germandbls
-!E0 U+00E0 agrave
-!E1 U+00E1 aacute
-!E2 U+00E2 acircumflex
-!E3 U+00E3 atilde
-!E4 U+00E4 adieresis
-!E5 U+00E5 aring
-!E6 U+00E6 ae
-!E7 U+00E7 ccedilla
-!E8 U+00E8 egrave
-!E9 U+00E9 eacute
-!EA U+00EA ecircumflex
-!EB U+00EB edieresis
-!EC U+00EC igrave
-!ED U+00ED iacute
-!EE U+00EE icircumflex
-!EF U+00EF idieresis
-!F0 U+00F0 eth
-!F1 U+00F1 ntilde
-!F2 U+00F2 ograve
-!F3 U+00F3 oacute
-!F4 U+00F4 ocircumflex
-!F5 U+00F5 otilde
-!F6 U+00F6 odieresis
-!F7 U+00F7 divide
-!F8 U+00F8 oslash
-!F9 U+00F9 ugrave
-!FA U+00FA uacute
-!FB U+00FB ucircumflex
-!FC U+00FC udieresis
-!FD U+00FD yacute
-!FE U+00FE thorn
-!FF U+00FF ydieresis
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/enc/iso-8859-16.map b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/enc/iso-8859-16.map
deleted file mode 100644
index 202c8fe5..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/enc/iso-8859-16.map
+++ /dev/null
@@ -1,256 +0,0 @@
-!00 U+0000 .notdef
-!01 U+0001 .notdef
-!02 U+0002 .notdef
-!03 U+0003 .notdef
-!04 U+0004 .notdef
-!05 U+0005 .notdef
-!06 U+0006 .notdef
-!07 U+0007 .notdef
-!08 U+0008 .notdef
-!09 U+0009 .notdef
-!0A U+000A .notdef
-!0B U+000B .notdef
-!0C U+000C .notdef
-!0D U+000D .notdef
-!0E U+000E .notdef
-!0F U+000F .notdef
-!10 U+0010 .notdef
-!11 U+0011 .notdef
-!12 U+0012 .notdef
-!13 U+0013 .notdef
-!14 U+0014 .notdef
-!15 U+0015 .notdef
-!16 U+0016 .notdef
-!17 U+0017 .notdef
-!18 U+0018 .notdef
-!19 U+0019 .notdef
-!1A U+001A .notdef
-!1B U+001B .notdef
-!1C U+001C .notdef
-!1D U+001D .notdef
-!1E U+001E .notdef
-!1F U+001F .notdef
-!20 U+0020 space
-!21 U+0021 exclam
-!22 U+0022 quotedbl
-!23 U+0023 numbersign
-!24 U+0024 dollar
-!25 U+0025 percent
-!26 U+0026 ampersand
-!27 U+0027 quotesingle
-!28 U+0028 parenleft
-!29 U+0029 parenright
-!2A U+002A asterisk
-!2B U+002B plus
-!2C U+002C comma
-!2D U+002D hyphen
-!2E U+002E period
-!2F U+002F slash
-!30 U+0030 zero
-!31 U+0031 one
-!32 U+0032 two
-!33 U+0033 three
-!34 U+0034 four
-!35 U+0035 five
-!36 U+0036 six
-!37 U+0037 seven
-!38 U+0038 eight
-!39 U+0039 nine
-!3A U+003A colon
-!3B U+003B semicolon
-!3C U+003C less
-!3D U+003D equal
-!3E U+003E greater
-!3F U+003F question
-!40 U+0040 at
-!41 U+0041 A
-!42 U+0042 B
-!43 U+0043 C
-!44 U+0044 D
-!45 U+0045 E
-!46 U+0046 F
-!47 U+0047 G
-!48 U+0048 H
-!49 U+0049 I
-!4A U+004A J
-!4B U+004B K
-!4C U+004C L
-!4D U+004D M
-!4E U+004E N
-!4F U+004F O
-!50 U+0050 P
-!51 U+0051 Q
-!52 U+0052 R
-!53 U+0053 S
-!54 U+0054 T
-!55 U+0055 U
-!56 U+0056 V
-!57 U+0057 W
-!58 U+0058 X
-!59 U+0059 Y
-!5A U+005A Z
-!5B U+005B bracketleft
-!5C U+005C backslash
-!5D U+005D bracketright
-!5E U+005E asciicircum
-!5F U+005F underscore
-!60 U+0060 grave
-!61 U+0061 a
-!62 U+0062 b
-!63 U+0063 c
-!64 U+0064 d
-!65 U+0065 e
-!66 U+0066 f
-!67 U+0067 g
-!68 U+0068 h
-!69 U+0069 i
-!6A U+006A j
-!6B U+006B k
-!6C U+006C l
-!6D U+006D m
-!6E U+006E n
-!6F U+006F o
-!70 U+0070 p
-!71 U+0071 q
-!72 U+0072 r
-!73 U+0073 s
-!74 U+0074 t
-!75 U+0075 u
-!76 U+0076 v
-!77 U+0077 w
-!78 U+0078 x
-!79 U+0079 y
-!7A U+007A z
-!7B U+007B braceleft
-!7C U+007C bar
-!7D U+007D braceright
-!7E U+007E asciitilde
-!7F U+007F .notdef
-!80 U+0080 .notdef
-!81 U+0081 .notdef
-!82 U+0082 .notdef
-!83 U+0083 .notdef
-!84 U+0084 .notdef
-!85 U+0085 .notdef
-!86 U+0086 .notdef
-!87 U+0087 .notdef
-!88 U+0088 .notdef
-!89 U+0089 .notdef
-!8A U+008A .notdef
-!8B U+008B .notdef
-!8C U+008C .notdef
-!8D U+008D .notdef
-!8E U+008E .notdef
-!8F U+008F .notdef
-!90 U+0090 .notdef
-!91 U+0091 .notdef
-!92 U+0092 .notdef
-!93 U+0093 .notdef
-!94 U+0094 .notdef
-!95 U+0095 .notdef
-!96 U+0096 .notdef
-!97 U+0097 .notdef
-!98 U+0098 .notdef
-!99 U+0099 .notdef
-!9A U+009A .notdef
-!9B U+009B .notdef
-!9C U+009C .notdef
-!9D U+009D .notdef
-!9E U+009E .notdef
-!9F U+009F .notdef
-!A0 U+00A0 space
-!A1 U+0104 Aogonek
-!A2 U+0105 aogonek
-!A3 U+0141 Lslash
-!A4 U+20AC Euro
-!A5 U+201E quotedblbase
-!A6 U+0160 Scaron
-!A7 U+00A7 section
-!A8 U+0161 scaron
-!A9 U+00A9 copyright
-!AA U+0218 Scommaaccent
-!AB U+00AB guillemotleft
-!AC U+0179 Zacute
-!AD U+00AD hyphen
-!AE U+017A zacute
-!AF U+017B Zdotaccent
-!B0 U+00B0 degree
-!B1 U+00B1 plusminus
-!B2 U+010C Ccaron
-!B3 U+0142 lslash
-!B4 U+017D Zcaron
-!B5 U+201D quotedblright
-!B6 U+00B6 paragraph
-!B7 U+00B7 periodcentered
-!B8 U+017E zcaron
-!B9 U+010D ccaron
-!BA U+0219 scommaaccent
-!BB U+00BB guillemotright
-!BC U+0152 OE
-!BD U+0153 oe
-!BE U+0178 Ydieresis
-!BF U+017C zdotaccent
-!C0 U+00C0 Agrave
-!C1 U+00C1 Aacute
-!C2 U+00C2 Acircumflex
-!C3 U+0102 Abreve
-!C4 U+00C4 Adieresis
-!C5 U+0106 Cacute
-!C6 U+00C6 AE
-!C7 U+00C7 Ccedilla
-!C8 U+00C8 Egrave
-!C9 U+00C9 Eacute
-!CA U+00CA Ecircumflex
-!CB U+00CB Edieresis
-!CC U+00CC Igrave
-!CD U+00CD Iacute
-!CE U+00CE Icircumflex
-!CF U+00CF Idieresis
-!D0 U+0110 Dcroat
-!D1 U+0143 Nacute
-!D2 U+00D2 Ograve
-!D3 U+00D3 Oacute
-!D4 U+00D4 Ocircumflex
-!D5 U+0150 Ohungarumlaut
-!D6 U+00D6 Odieresis
-!D7 U+015A Sacute
-!D8 U+0170 Uhungarumlaut
-!D9 U+00D9 Ugrave
-!DA U+00DA Uacute
-!DB U+00DB Ucircumflex
-!DC U+00DC Udieresis
-!DD U+0118 Eogonek
-!DE U+021A Tcommaaccent
-!DF U+00DF germandbls
-!E0 U+00E0 agrave
-!E1 U+00E1 aacute
-!E2 U+00E2 acircumflex
-!E3 U+0103 abreve
-!E4 U+00E4 adieresis
-!E5 U+0107 cacute
-!E6 U+00E6 ae
-!E7 U+00E7 ccedilla
-!E8 U+00E8 egrave
-!E9 U+00E9 eacute
-!EA U+00EA ecircumflex
-!EB U+00EB edieresis
-!EC U+00EC igrave
-!ED U+00ED iacute
-!EE U+00EE icircumflex
-!EF U+00EF idieresis
-!F0 U+0111 dcroat
-!F1 U+0144 nacute
-!F2 U+00F2 ograve
-!F3 U+00F3 oacute
-!F4 U+00F4 ocircumflex
-!F5 U+0151 ohungarumlaut
-!F6 U+00F6 odieresis
-!F7 U+015B sacute
-!F8 U+0171 uhungarumlaut
-!F9 U+00F9 ugrave
-!FA U+00FA uacute
-!FB U+00FB ucircumflex
-!FC U+00FC udieresis
-!FD U+0119 eogonek
-!FE U+021B tcommaaccent
-!FF U+00FF ydieresis
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/enc/iso-8859-2.map b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/enc/iso-8859-2.map
deleted file mode 100644
index 65ae09f9..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/enc/iso-8859-2.map
+++ /dev/null
@@ -1,256 +0,0 @@
-!00 U+0000 .notdef
-!01 U+0001 .notdef
-!02 U+0002 .notdef
-!03 U+0003 .notdef
-!04 U+0004 .notdef
-!05 U+0005 .notdef
-!06 U+0006 .notdef
-!07 U+0007 .notdef
-!08 U+0008 .notdef
-!09 U+0009 .notdef
-!0A U+000A .notdef
-!0B U+000B .notdef
-!0C U+000C .notdef
-!0D U+000D .notdef
-!0E U+000E .notdef
-!0F U+000F .notdef
-!10 U+0010 .notdef
-!11 U+0011 .notdef
-!12 U+0012 .notdef
-!13 U+0013 .notdef
-!14 U+0014 .notdef
-!15 U+0015 .notdef
-!16 U+0016 .notdef
-!17 U+0017 .notdef
-!18 U+0018 .notdef
-!19 U+0019 .notdef
-!1A U+001A .notdef
-!1B U+001B .notdef
-!1C U+001C .notdef
-!1D U+001D .notdef
-!1E U+001E .notdef
-!1F U+001F .notdef
-!20 U+0020 space
-!21 U+0021 exclam
-!22 U+0022 quotedbl
-!23 U+0023 numbersign
-!24 U+0024 dollar
-!25 U+0025 percent
-!26 U+0026 ampersand
-!27 U+0027 quotesingle
-!28 U+0028 parenleft
-!29 U+0029 parenright
-!2A U+002A asterisk
-!2B U+002B plus
-!2C U+002C comma
-!2D U+002D hyphen
-!2E U+002E period
-!2F U+002F slash
-!30 U+0030 zero
-!31 U+0031 one
-!32 U+0032 two
-!33 U+0033 three
-!34 U+0034 four
-!35 U+0035 five
-!36 U+0036 six
-!37 U+0037 seven
-!38 U+0038 eight
-!39 U+0039 nine
-!3A U+003A colon
-!3B U+003B semicolon
-!3C U+003C less
-!3D U+003D equal
-!3E U+003E greater
-!3F U+003F question
-!40 U+0040 at
-!41 U+0041 A
-!42 U+0042 B
-!43 U+0043 C
-!44 U+0044 D
-!45 U+0045 E
-!46 U+0046 F
-!47 U+0047 G
-!48 U+0048 H
-!49 U+0049 I
-!4A U+004A J
-!4B U+004B K
-!4C U+004C L
-!4D U+004D M
-!4E U+004E N
-!4F U+004F O
-!50 U+0050 P
-!51 U+0051 Q
-!52 U+0052 R
-!53 U+0053 S
-!54 U+0054 T
-!55 U+0055 U
-!56 U+0056 V
-!57 U+0057 W
-!58 U+0058 X
-!59 U+0059 Y
-!5A U+005A Z
-!5B U+005B bracketleft
-!5C U+005C backslash
-!5D U+005D bracketright
-!5E U+005E asciicircum
-!5F U+005F underscore
-!60 U+0060 grave
-!61 U+0061 a
-!62 U+0062 b
-!63 U+0063 c
-!64 U+0064 d
-!65 U+0065 e
-!66 U+0066 f
-!67 U+0067 g
-!68 U+0068 h
-!69 U+0069 i
-!6A U+006A j
-!6B U+006B k
-!6C U+006C l
-!6D U+006D m
-!6E U+006E n
-!6F U+006F o
-!70 U+0070 p
-!71 U+0071 q
-!72 U+0072 r
-!73 U+0073 s
-!74 U+0074 t
-!75 U+0075 u
-!76 U+0076 v
-!77 U+0077 w
-!78 U+0078 x
-!79 U+0079 y
-!7A U+007A z
-!7B U+007B braceleft
-!7C U+007C bar
-!7D U+007D braceright
-!7E U+007E asciitilde
-!7F U+007F .notdef
-!80 U+0080 .notdef
-!81 U+0081 .notdef
-!82 U+0082 .notdef
-!83 U+0083 .notdef
-!84 U+0084 .notdef
-!85 U+0085 .notdef
-!86 U+0086 .notdef
-!87 U+0087 .notdef
-!88 U+0088 .notdef
-!89 U+0089 .notdef
-!8A U+008A .notdef
-!8B U+008B .notdef
-!8C U+008C .notdef
-!8D U+008D .notdef
-!8E U+008E .notdef
-!8F U+008F .notdef
-!90 U+0090 .notdef
-!91 U+0091 .notdef
-!92 U+0092 .notdef
-!93 U+0093 .notdef
-!94 U+0094 .notdef
-!95 U+0095 .notdef
-!96 U+0096 .notdef
-!97 U+0097 .notdef
-!98 U+0098 .notdef
-!99 U+0099 .notdef
-!9A U+009A .notdef
-!9B U+009B .notdef
-!9C U+009C .notdef
-!9D U+009D .notdef
-!9E U+009E .notdef
-!9F U+009F .notdef
-!A0 U+00A0 space
-!A1 U+0104 Aogonek
-!A2 U+02D8 breve
-!A3 U+0141 Lslash
-!A4 U+00A4 currency
-!A5 U+013D Lcaron
-!A6 U+015A Sacute
-!A7 U+00A7 section
-!A8 U+00A8 dieresis
-!A9 U+0160 Scaron
-!AA U+015E Scedilla
-!AB U+0164 Tcaron
-!AC U+0179 Zacute
-!AD U+00AD hyphen
-!AE U+017D Zcaron
-!AF U+017B Zdotaccent
-!B0 U+00B0 degree
-!B1 U+0105 aogonek
-!B2 U+02DB ogonek
-!B3 U+0142 lslash
-!B4 U+00B4 acute
-!B5 U+013E lcaron
-!B6 U+015B sacute
-!B7 U+02C7 caron
-!B8 U+00B8 cedilla
-!B9 U+0161 scaron
-!BA U+015F scedilla
-!BB U+0165 tcaron
-!BC U+017A zacute
-!BD U+02DD hungarumlaut
-!BE U+017E zcaron
-!BF U+017C zdotaccent
-!C0 U+0154 Racute
-!C1 U+00C1 Aacute
-!C2 U+00C2 Acircumflex
-!C3 U+0102 Abreve
-!C4 U+00C4 Adieresis
-!C5 U+0139 Lacute
-!C6 U+0106 Cacute
-!C7 U+00C7 Ccedilla
-!C8 U+010C Ccaron
-!C9 U+00C9 Eacute
-!CA U+0118 Eogonek
-!CB U+00CB Edieresis
-!CC U+011A Ecaron
-!CD U+00CD Iacute
-!CE U+00CE Icircumflex
-!CF U+010E Dcaron
-!D0 U+0110 Dcroat
-!D1 U+0143 Nacute
-!D2 U+0147 Ncaron
-!D3 U+00D3 Oacute
-!D4 U+00D4 Ocircumflex
-!D5 U+0150 Ohungarumlaut
-!D6 U+00D6 Odieresis
-!D7 U+00D7 multiply
-!D8 U+0158 Rcaron
-!D9 U+016E Uring
-!DA U+00DA Uacute
-!DB U+0170 Uhungarumlaut
-!DC U+00DC Udieresis
-!DD U+00DD Yacute
-!DE U+0162 Tcommaaccent
-!DF U+00DF germandbls
-!E0 U+0155 racute
-!E1 U+00E1 aacute
-!E2 U+00E2 acircumflex
-!E3 U+0103 abreve
-!E4 U+00E4 adieresis
-!E5 U+013A lacute
-!E6 U+0107 cacute
-!E7 U+00E7 ccedilla
-!E8 U+010D ccaron
-!E9 U+00E9 eacute
-!EA U+0119 eogonek
-!EB U+00EB edieresis
-!EC U+011B ecaron
-!ED U+00ED iacute
-!EE U+00EE icircumflex
-!EF U+010F dcaron
-!F0 U+0111 dcroat
-!F1 U+0144 nacute
-!F2 U+0148 ncaron
-!F3 U+00F3 oacute
-!F4 U+00F4 ocircumflex
-!F5 U+0151 ohungarumlaut
-!F6 U+00F6 odieresis
-!F7 U+00F7 divide
-!F8 U+0159 rcaron
-!F9 U+016F uring
-!FA U+00FA uacute
-!FB U+0171 uhungarumlaut
-!FC U+00FC udieresis
-!FD U+00FD yacute
-!FE U+0163 tcommaaccent
-!FF U+02D9 dotaccent
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/enc/iso-8859-4.map b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/enc/iso-8859-4.map
deleted file mode 100644
index a7d87bf3..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/enc/iso-8859-4.map
+++ /dev/null
@@ -1,256 +0,0 @@
-!00 U+0000 .notdef
-!01 U+0001 .notdef
-!02 U+0002 .notdef
-!03 U+0003 .notdef
-!04 U+0004 .notdef
-!05 U+0005 .notdef
-!06 U+0006 .notdef
-!07 U+0007 .notdef
-!08 U+0008 .notdef
-!09 U+0009 .notdef
-!0A U+000A .notdef
-!0B U+000B .notdef
-!0C U+000C .notdef
-!0D U+000D .notdef
-!0E U+000E .notdef
-!0F U+000F .notdef
-!10 U+0010 .notdef
-!11 U+0011 .notdef
-!12 U+0012 .notdef
-!13 U+0013 .notdef
-!14 U+0014 .notdef
-!15 U+0015 .notdef
-!16 U+0016 .notdef
-!17 U+0017 .notdef
-!18 U+0018 .notdef
-!19 U+0019 .notdef
-!1A U+001A .notdef
-!1B U+001B .notdef
-!1C U+001C .notdef
-!1D U+001D .notdef
-!1E U+001E .notdef
-!1F U+001F .notdef
-!20 U+0020 space
-!21 U+0021 exclam
-!22 U+0022 quotedbl
-!23 U+0023 numbersign
-!24 U+0024 dollar
-!25 U+0025 percent
-!26 U+0026 ampersand
-!27 U+0027 quotesingle
-!28 U+0028 parenleft
-!29 U+0029 parenright
-!2A U+002A asterisk
-!2B U+002B plus
-!2C U+002C comma
-!2D U+002D hyphen
-!2E U+002E period
-!2F U+002F slash
-!30 U+0030 zero
-!31 U+0031 one
-!32 U+0032 two
-!33 U+0033 three
-!34 U+0034 four
-!35 U+0035 five
-!36 U+0036 six
-!37 U+0037 seven
-!38 U+0038 eight
-!39 U+0039 nine
-!3A U+003A colon
-!3B U+003B semicolon
-!3C U+003C less
-!3D U+003D equal
-!3E U+003E greater
-!3F U+003F question
-!40 U+0040 at
-!41 U+0041 A
-!42 U+0042 B
-!43 U+0043 C
-!44 U+0044 D
-!45 U+0045 E
-!46 U+0046 F
-!47 U+0047 G
-!48 U+0048 H
-!49 U+0049 I
-!4A U+004A J
-!4B U+004B K
-!4C U+004C L
-!4D U+004D M
-!4E U+004E N
-!4F U+004F O
-!50 U+0050 P
-!51 U+0051 Q
-!52 U+0052 R
-!53 U+0053 S
-!54 U+0054 T
-!55 U+0055 U
-!56 U+0056 V
-!57 U+0057 W
-!58 U+0058 X
-!59 U+0059 Y
-!5A U+005A Z
-!5B U+005B bracketleft
-!5C U+005C backslash
-!5D U+005D bracketright
-!5E U+005E asciicircum
-!5F U+005F underscore
-!60 U+0060 grave
-!61 U+0061 a
-!62 U+0062 b
-!63 U+0063 c
-!64 U+0064 d
-!65 U+0065 e
-!66 U+0066 f
-!67 U+0067 g
-!68 U+0068 h
-!69 U+0069 i
-!6A U+006A j
-!6B U+006B k
-!6C U+006C l
-!6D U+006D m
-!6E U+006E n
-!6F U+006F o
-!70 U+0070 p
-!71 U+0071 q
-!72 U+0072 r
-!73 U+0073 s
-!74 U+0074 t
-!75 U+0075 u
-!76 U+0076 v
-!77 U+0077 w
-!78 U+0078 x
-!79 U+0079 y
-!7A U+007A z
-!7B U+007B braceleft
-!7C U+007C bar
-!7D U+007D braceright
-!7E U+007E asciitilde
-!7F U+007F .notdef
-!80 U+0080 .notdef
-!81 U+0081 .notdef
-!82 U+0082 .notdef
-!83 U+0083 .notdef
-!84 U+0084 .notdef
-!85 U+0085 .notdef
-!86 U+0086 .notdef
-!87 U+0087 .notdef
-!88 U+0088 .notdef
-!89 U+0089 .notdef
-!8A U+008A .notdef
-!8B U+008B .notdef
-!8C U+008C .notdef
-!8D U+008D .notdef
-!8E U+008E .notdef
-!8F U+008F .notdef
-!90 U+0090 .notdef
-!91 U+0091 .notdef
-!92 U+0092 .notdef
-!93 U+0093 .notdef
-!94 U+0094 .notdef
-!95 U+0095 .notdef
-!96 U+0096 .notdef
-!97 U+0097 .notdef
-!98 U+0098 .notdef
-!99 U+0099 .notdef
-!9A U+009A .notdef
-!9B U+009B .notdef
-!9C U+009C .notdef
-!9D U+009D .notdef
-!9E U+009E .notdef
-!9F U+009F .notdef
-!A0 U+00A0 space
-!A1 U+0104 Aogonek
-!A2 U+0138 kgreenlandic
-!A3 U+0156 Rcommaaccent
-!A4 U+00A4 currency
-!A5 U+0128 Itilde
-!A6 U+013B Lcommaaccent
-!A7 U+00A7 section
-!A8 U+00A8 dieresis
-!A9 U+0160 Scaron
-!AA U+0112 Emacron
-!AB U+0122 Gcommaaccent
-!AC U+0166 Tbar
-!AD U+00AD hyphen
-!AE U+017D Zcaron
-!AF U+00AF macron
-!B0 U+00B0 degree
-!B1 U+0105 aogonek
-!B2 U+02DB ogonek
-!B3 U+0157 rcommaaccent
-!B4 U+00B4 acute
-!B5 U+0129 itilde
-!B6 U+013C lcommaaccent
-!B7 U+02C7 caron
-!B8 U+00B8 cedilla
-!B9 U+0161 scaron
-!BA U+0113 emacron
-!BB U+0123 gcommaaccent
-!BC U+0167 tbar
-!BD U+014A Eng
-!BE U+017E zcaron
-!BF U+014B eng
-!C0 U+0100 Amacron
-!C1 U+00C1 Aacute
-!C2 U+00C2 Acircumflex
-!C3 U+00C3 Atilde
-!C4 U+00C4 Adieresis
-!C5 U+00C5 Aring
-!C6 U+00C6 AE
-!C7 U+012E Iogonek
-!C8 U+010C Ccaron
-!C9 U+00C9 Eacute
-!CA U+0118 Eogonek
-!CB U+00CB Edieresis
-!CC U+0116 Edotaccent
-!CD U+00CD Iacute
-!CE U+00CE Icircumflex
-!CF U+012A Imacron
-!D0 U+0110 Dcroat
-!D1 U+0145 Ncommaaccent
-!D2 U+014C Omacron
-!D3 U+0136 Kcommaaccent
-!D4 U+00D4 Ocircumflex
-!D5 U+00D5 Otilde
-!D6 U+00D6 Odieresis
-!D7 U+00D7 multiply
-!D8 U+00D8 Oslash
-!D9 U+0172 Uogonek
-!DA U+00DA Uacute
-!DB U+00DB Ucircumflex
-!DC U+00DC Udieresis
-!DD U+0168 Utilde
-!DE U+016A Umacron
-!DF U+00DF germandbls
-!E0 U+0101 amacron
-!E1 U+00E1 aacute
-!E2 U+00E2 acircumflex
-!E3 U+00E3 atilde
-!E4 U+00E4 adieresis
-!E5 U+00E5 aring
-!E6 U+00E6 ae
-!E7 U+012F iogonek
-!E8 U+010D ccaron
-!E9 U+00E9 eacute
-!EA U+0119 eogonek
-!EB U+00EB edieresis
-!EC U+0117 edotaccent
-!ED U+00ED iacute
-!EE U+00EE icircumflex
-!EF U+012B imacron
-!F0 U+0111 dcroat
-!F1 U+0146 ncommaaccent
-!F2 U+014D omacron
-!F3 U+0137 kcommaaccent
-!F4 U+00F4 ocircumflex
-!F5 U+00F5 otilde
-!F6 U+00F6 odieresis
-!F7 U+00F7 divide
-!F8 U+00F8 oslash
-!F9 U+0173 uogonek
-!FA U+00FA uacute
-!FB U+00FB ucircumflex
-!FC U+00FC udieresis
-!FD U+0169 utilde
-!FE U+016B umacron
-!FF U+02D9 dotaccent
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/enc/iso-8859-5.map b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/enc/iso-8859-5.map
deleted file mode 100644
index f9cd4edc..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/enc/iso-8859-5.map
+++ /dev/null
@@ -1,256 +0,0 @@
-!00 U+0000 .notdef
-!01 U+0001 .notdef
-!02 U+0002 .notdef
-!03 U+0003 .notdef
-!04 U+0004 .notdef
-!05 U+0005 .notdef
-!06 U+0006 .notdef
-!07 U+0007 .notdef
-!08 U+0008 .notdef
-!09 U+0009 .notdef
-!0A U+000A .notdef
-!0B U+000B .notdef
-!0C U+000C .notdef
-!0D U+000D .notdef
-!0E U+000E .notdef
-!0F U+000F .notdef
-!10 U+0010 .notdef
-!11 U+0011 .notdef
-!12 U+0012 .notdef
-!13 U+0013 .notdef
-!14 U+0014 .notdef
-!15 U+0015 .notdef
-!16 U+0016 .notdef
-!17 U+0017 .notdef
-!18 U+0018 .notdef
-!19 U+0019 .notdef
-!1A U+001A .notdef
-!1B U+001B .notdef
-!1C U+001C .notdef
-!1D U+001D .notdef
-!1E U+001E .notdef
-!1F U+001F .notdef
-!20 U+0020 space
-!21 U+0021 exclam
-!22 U+0022 quotedbl
-!23 U+0023 numbersign
-!24 U+0024 dollar
-!25 U+0025 percent
-!26 U+0026 ampersand
-!27 U+0027 quotesingle
-!28 U+0028 parenleft
-!29 U+0029 parenright
-!2A U+002A asterisk
-!2B U+002B plus
-!2C U+002C comma
-!2D U+002D hyphen
-!2E U+002E period
-!2F U+002F slash
-!30 U+0030 zero
-!31 U+0031 one
-!32 U+0032 two
-!33 U+0033 three
-!34 U+0034 four
-!35 U+0035 five
-!36 U+0036 six
-!37 U+0037 seven
-!38 U+0038 eight
-!39 U+0039 nine
-!3A U+003A colon
-!3B U+003B semicolon
-!3C U+003C less
-!3D U+003D equal
-!3E U+003E greater
-!3F U+003F question
-!40 U+0040 at
-!41 U+0041 A
-!42 U+0042 B
-!43 U+0043 C
-!44 U+0044 D
-!45 U+0045 E
-!46 U+0046 F
-!47 U+0047 G
-!48 U+0048 H
-!49 U+0049 I
-!4A U+004A J
-!4B U+004B K
-!4C U+004C L
-!4D U+004D M
-!4E U+004E N
-!4F U+004F O
-!50 U+0050 P
-!51 U+0051 Q
-!52 U+0052 R
-!53 U+0053 S
-!54 U+0054 T
-!55 U+0055 U
-!56 U+0056 V
-!57 U+0057 W
-!58 U+0058 X
-!59 U+0059 Y
-!5A U+005A Z
-!5B U+005B bracketleft
-!5C U+005C backslash
-!5D U+005D bracketright
-!5E U+005E asciicircum
-!5F U+005F underscore
-!60 U+0060 grave
-!61 U+0061 a
-!62 U+0062 b
-!63 U+0063 c
-!64 U+0064 d
-!65 U+0065 e
-!66 U+0066 f
-!67 U+0067 g
-!68 U+0068 h
-!69 U+0069 i
-!6A U+006A j
-!6B U+006B k
-!6C U+006C l
-!6D U+006D m
-!6E U+006E n
-!6F U+006F o
-!70 U+0070 p
-!71 U+0071 q
-!72 U+0072 r
-!73 U+0073 s
-!74 U+0074 t
-!75 U+0075 u
-!76 U+0076 v
-!77 U+0077 w
-!78 U+0078 x
-!79 U+0079 y
-!7A U+007A z
-!7B U+007B braceleft
-!7C U+007C bar
-!7D U+007D braceright
-!7E U+007E asciitilde
-!7F U+007F .notdef
-!80 U+0080 .notdef
-!81 U+0081 .notdef
-!82 U+0082 .notdef
-!83 U+0083 .notdef
-!84 U+0084 .notdef
-!85 U+0085 .notdef
-!86 U+0086 .notdef
-!87 U+0087 .notdef
-!88 U+0088 .notdef
-!89 U+0089 .notdef
-!8A U+008A .notdef
-!8B U+008B .notdef
-!8C U+008C .notdef
-!8D U+008D .notdef
-!8E U+008E .notdef
-!8F U+008F .notdef
-!90 U+0090 .notdef
-!91 U+0091 .notdef
-!92 U+0092 .notdef
-!93 U+0093 .notdef
-!94 U+0094 .notdef
-!95 U+0095 .notdef
-!96 U+0096 .notdef
-!97 U+0097 .notdef
-!98 U+0098 .notdef
-!99 U+0099 .notdef
-!9A U+009A .notdef
-!9B U+009B .notdef
-!9C U+009C .notdef
-!9D U+009D .notdef
-!9E U+009E .notdef
-!9F U+009F .notdef
-!A0 U+00A0 space
-!A1 U+0401 afii10023
-!A2 U+0402 afii10051
-!A3 U+0403 afii10052
-!A4 U+0404 afii10053
-!A5 U+0405 afii10054
-!A6 U+0406 afii10055
-!A7 U+0407 afii10056
-!A8 U+0408 afii10057
-!A9 U+0409 afii10058
-!AA U+040A afii10059
-!AB U+040B afii10060
-!AC U+040C afii10061
-!AD U+00AD hyphen
-!AE U+040E afii10062
-!AF U+040F afii10145
-!B0 U+0410 afii10017
-!B1 U+0411 afii10018
-!B2 U+0412 afii10019
-!B3 U+0413 afii10020
-!B4 U+0414 afii10021
-!B5 U+0415 afii10022
-!B6 U+0416 afii10024
-!B7 U+0417 afii10025
-!B8 U+0418 afii10026
-!B9 U+0419 afii10027
-!BA U+041A afii10028
-!BB U+041B afii10029
-!BC U+041C afii10030
-!BD U+041D afii10031
-!BE U+041E afii10032
-!BF U+041F afii10033
-!C0 U+0420 afii10034
-!C1 U+0421 afii10035
-!C2 U+0422 afii10036
-!C3 U+0423 afii10037
-!C4 U+0424 afii10038
-!C5 U+0425 afii10039
-!C6 U+0426 afii10040
-!C7 U+0427 afii10041
-!C8 U+0428 afii10042
-!C9 U+0429 afii10043
-!CA U+042A afii10044
-!CB U+042B afii10045
-!CC U+042C afii10046
-!CD U+042D afii10047
-!CE U+042E afii10048
-!CF U+042F afii10049
-!D0 U+0430 afii10065
-!D1 U+0431 afii10066
-!D2 U+0432 afii10067
-!D3 U+0433 afii10068
-!D4 U+0434 afii10069
-!D5 U+0435 afii10070
-!D6 U+0436 afii10072
-!D7 U+0437 afii10073
-!D8 U+0438 afii10074
-!D9 U+0439 afii10075
-!DA U+043A afii10076
-!DB U+043B afii10077
-!DC U+043C afii10078
-!DD U+043D afii10079
-!DE U+043E afii10080
-!DF U+043F afii10081
-!E0 U+0440 afii10082
-!E1 U+0441 afii10083
-!E2 U+0442 afii10084
-!E3 U+0443 afii10085
-!E4 U+0444 afii10086
-!E5 U+0445 afii10087
-!E6 U+0446 afii10088
-!E7 U+0447 afii10089
-!E8 U+0448 afii10090
-!E9 U+0449 afii10091
-!EA U+044A afii10092
-!EB U+044B afii10093
-!EC U+044C afii10094
-!ED U+044D afii10095
-!EE U+044E afii10096
-!EF U+044F afii10097
-!F0 U+2116 afii61352
-!F1 U+0451 afii10071
-!F2 U+0452 afii10099
-!F3 U+0453 afii10100
-!F4 U+0454 afii10101
-!F5 U+0455 afii10102
-!F6 U+0456 afii10103
-!F7 U+0457 afii10104
-!F8 U+0458 afii10105
-!F9 U+0459 afii10106
-!FA U+045A afii10107
-!FB U+045B afii10108
-!FC U+045C afii10109
-!FD U+00A7 section
-!FE U+045E afii10110
-!FF U+045F afii10193
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/enc/iso-8859-7.map b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/enc/iso-8859-7.map
deleted file mode 100644
index e163796b..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/enc/iso-8859-7.map
+++ /dev/null
@@ -1,250 +0,0 @@
-!00 U+0000 .notdef
-!01 U+0001 .notdef
-!02 U+0002 .notdef
-!03 U+0003 .notdef
-!04 U+0004 .notdef
-!05 U+0005 .notdef
-!06 U+0006 .notdef
-!07 U+0007 .notdef
-!08 U+0008 .notdef
-!09 U+0009 .notdef
-!0A U+000A .notdef
-!0B U+000B .notdef
-!0C U+000C .notdef
-!0D U+000D .notdef
-!0E U+000E .notdef
-!0F U+000F .notdef
-!10 U+0010 .notdef
-!11 U+0011 .notdef
-!12 U+0012 .notdef
-!13 U+0013 .notdef
-!14 U+0014 .notdef
-!15 U+0015 .notdef
-!16 U+0016 .notdef
-!17 U+0017 .notdef
-!18 U+0018 .notdef
-!19 U+0019 .notdef
-!1A U+001A .notdef
-!1B U+001B .notdef
-!1C U+001C .notdef
-!1D U+001D .notdef
-!1E U+001E .notdef
-!1F U+001F .notdef
-!20 U+0020 space
-!21 U+0021 exclam
-!22 U+0022 quotedbl
-!23 U+0023 numbersign
-!24 U+0024 dollar
-!25 U+0025 percent
-!26 U+0026 ampersand
-!27 U+0027 quotesingle
-!28 U+0028 parenleft
-!29 U+0029 parenright
-!2A U+002A asterisk
-!2B U+002B plus
-!2C U+002C comma
-!2D U+002D hyphen
-!2E U+002E period
-!2F U+002F slash
-!30 U+0030 zero
-!31 U+0031 one
-!32 U+0032 two
-!33 U+0033 three
-!34 U+0034 four
-!35 U+0035 five
-!36 U+0036 six
-!37 U+0037 seven
-!38 U+0038 eight
-!39 U+0039 nine
-!3A U+003A colon
-!3B U+003B semicolon
-!3C U+003C less
-!3D U+003D equal
-!3E U+003E greater
-!3F U+003F question
-!40 U+0040 at
-!41 U+0041 A
-!42 U+0042 B
-!43 U+0043 C
-!44 U+0044 D
-!45 U+0045 E
-!46 U+0046 F
-!47 U+0047 G
-!48 U+0048 H
-!49 U+0049 I
-!4A U+004A J
-!4B U+004B K
-!4C U+004C L
-!4D U+004D M
-!4E U+004E N
-!4F U+004F O
-!50 U+0050 P
-!51 U+0051 Q
-!52 U+0052 R
-!53 U+0053 S
-!54 U+0054 T
-!55 U+0055 U
-!56 U+0056 V
-!57 U+0057 W
-!58 U+0058 X
-!59 U+0059 Y
-!5A U+005A Z
-!5B U+005B bracketleft
-!5C U+005C backslash
-!5D U+005D bracketright
-!5E U+005E asciicircum
-!5F U+005F underscore
-!60 U+0060 grave
-!61 U+0061 a
-!62 U+0062 b
-!63 U+0063 c
-!64 U+0064 d
-!65 U+0065 e
-!66 U+0066 f
-!67 U+0067 g
-!68 U+0068 h
-!69 U+0069 i
-!6A U+006A j
-!6B U+006B k
-!6C U+006C l
-!6D U+006D m
-!6E U+006E n
-!6F U+006F o
-!70 U+0070 p
-!71 U+0071 q
-!72 U+0072 r
-!73 U+0073 s
-!74 U+0074 t
-!75 U+0075 u
-!76 U+0076 v
-!77 U+0077 w
-!78 U+0078 x
-!79 U+0079 y
-!7A U+007A z
-!7B U+007B braceleft
-!7C U+007C bar
-!7D U+007D braceright
-!7E U+007E asciitilde
-!7F U+007F .notdef
-!80 U+0080 .notdef
-!81 U+0081 .notdef
-!82 U+0082 .notdef
-!83 U+0083 .notdef
-!84 U+0084 .notdef
-!85 U+0085 .notdef
-!86 U+0086 .notdef
-!87 U+0087 .notdef
-!88 U+0088 .notdef
-!89 U+0089 .notdef
-!8A U+008A .notdef
-!8B U+008B .notdef
-!8C U+008C .notdef
-!8D U+008D .notdef
-!8E U+008E .notdef
-!8F U+008F .notdef
-!90 U+0090 .notdef
-!91 U+0091 .notdef
-!92 U+0092 .notdef
-!93 U+0093 .notdef
-!94 U+0094 .notdef
-!95 U+0095 .notdef
-!96 U+0096 .notdef
-!97 U+0097 .notdef
-!98 U+0098 .notdef
-!99 U+0099 .notdef
-!9A U+009A .notdef
-!9B U+009B .notdef
-!9C U+009C .notdef
-!9D U+009D .notdef
-!9E U+009E .notdef
-!9F U+009F .notdef
-!A0 U+00A0 space
-!A1 U+2018 quoteleft
-!A2 U+2019 quoteright
-!A3 U+00A3 sterling
-!A6 U+00A6 brokenbar
-!A7 U+00A7 section
-!A8 U+00A8 dieresis
-!A9 U+00A9 copyright
-!AB U+00AB guillemotleft
-!AC U+00AC logicalnot
-!AD U+00AD hyphen
-!AF U+2015 afii00208
-!B0 U+00B0 degree
-!B1 U+00B1 plusminus
-!B2 U+00B2 twosuperior
-!B3 U+00B3 threesuperior
-!B4 U+0384 tonos
-!B5 U+0385 dieresistonos
-!B6 U+0386 Alphatonos
-!B7 U+00B7 periodcentered
-!B8 U+0388 Epsilontonos
-!B9 U+0389 Etatonos
-!BA U+038A Iotatonos
-!BB U+00BB guillemotright
-!BC U+038C Omicrontonos
-!BD U+00BD onehalf
-!BE U+038E Upsilontonos
-!BF U+038F Omegatonos
-!C0 U+0390 iotadieresistonos
-!C1 U+0391 Alpha
-!C2 U+0392 Beta
-!C3 U+0393 Gamma
-!C4 U+0394 Delta
-!C5 U+0395 Epsilon
-!C6 U+0396 Zeta
-!C7 U+0397 Eta
-!C8 U+0398 Theta
-!C9 U+0399 Iota
-!CA U+039A Kappa
-!CB U+039B Lambda
-!CC U+039C Mu
-!CD U+039D Nu
-!CE U+039E Xi
-!CF U+039F Omicron
-!D0 U+03A0 Pi
-!D1 U+03A1 Rho
-!D3 U+03A3 Sigma
-!D4 U+03A4 Tau
-!D5 U+03A5 Upsilon
-!D6 U+03A6 Phi
-!D7 U+03A7 Chi
-!D8 U+03A8 Psi
-!D9 U+03A9 Omega
-!DA U+03AA Iotadieresis
-!DB U+03AB Upsilondieresis
-!DC U+03AC alphatonos
-!DD U+03AD epsilontonos
-!DE U+03AE etatonos
-!DF U+03AF iotatonos
-!E0 U+03B0 upsilondieresistonos
-!E1 U+03B1 alpha
-!E2 U+03B2 beta
-!E3 U+03B3 gamma
-!E4 U+03B4 delta
-!E5 U+03B5 epsilon
-!E6 U+03B6 zeta
-!E7 U+03B7 eta
-!E8 U+03B8 theta
-!E9 U+03B9 iota
-!EA U+03BA kappa
-!EB U+03BB lambda
-!EC U+03BC mu
-!ED U+03BD nu
-!EE U+03BE xi
-!EF U+03BF omicron
-!F0 U+03C0 pi
-!F1 U+03C1 rho
-!F2 U+03C2 sigma1
-!F3 U+03C3 sigma
-!F4 U+03C4 tau
-!F5 U+03C5 upsilon
-!F6 U+03C6 phi
-!F7 U+03C7 chi
-!F8 U+03C8 psi
-!F9 U+03C9 omega
-!FA U+03CA iotadieresis
-!FB U+03CB upsilondieresis
-!FC U+03CC omicrontonos
-!FD U+03CD upsilontonos
-!FE U+03CE omegatonos
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/enc/iso-8859-9.map b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/enc/iso-8859-9.map
deleted file mode 100644
index 48c123ae..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/enc/iso-8859-9.map
+++ /dev/null
@@ -1,256 +0,0 @@
-!00 U+0000 .notdef
-!01 U+0001 .notdef
-!02 U+0002 .notdef
-!03 U+0003 .notdef
-!04 U+0004 .notdef
-!05 U+0005 .notdef
-!06 U+0006 .notdef
-!07 U+0007 .notdef
-!08 U+0008 .notdef
-!09 U+0009 .notdef
-!0A U+000A .notdef
-!0B U+000B .notdef
-!0C U+000C .notdef
-!0D U+000D .notdef
-!0E U+000E .notdef
-!0F U+000F .notdef
-!10 U+0010 .notdef
-!11 U+0011 .notdef
-!12 U+0012 .notdef
-!13 U+0013 .notdef
-!14 U+0014 .notdef
-!15 U+0015 .notdef
-!16 U+0016 .notdef
-!17 U+0017 .notdef
-!18 U+0018 .notdef
-!19 U+0019 .notdef
-!1A U+001A .notdef
-!1B U+001B .notdef
-!1C U+001C .notdef
-!1D U+001D .notdef
-!1E U+001E .notdef
-!1F U+001F .notdef
-!20 U+0020 space
-!21 U+0021 exclam
-!22 U+0022 quotedbl
-!23 U+0023 numbersign
-!24 U+0024 dollar
-!25 U+0025 percent
-!26 U+0026 ampersand
-!27 U+0027 quotesingle
-!28 U+0028 parenleft
-!29 U+0029 parenright
-!2A U+002A asterisk
-!2B U+002B plus
-!2C U+002C comma
-!2D U+002D hyphen
-!2E U+002E period
-!2F U+002F slash
-!30 U+0030 zero
-!31 U+0031 one
-!32 U+0032 two
-!33 U+0033 three
-!34 U+0034 four
-!35 U+0035 five
-!36 U+0036 six
-!37 U+0037 seven
-!38 U+0038 eight
-!39 U+0039 nine
-!3A U+003A colon
-!3B U+003B semicolon
-!3C U+003C less
-!3D U+003D equal
-!3E U+003E greater
-!3F U+003F question
-!40 U+0040 at
-!41 U+0041 A
-!42 U+0042 B
-!43 U+0043 C
-!44 U+0044 D
-!45 U+0045 E
-!46 U+0046 F
-!47 U+0047 G
-!48 U+0048 H
-!49 U+0049 I
-!4A U+004A J
-!4B U+004B K
-!4C U+004C L
-!4D U+004D M
-!4E U+004E N
-!4F U+004F O
-!50 U+0050 P
-!51 U+0051 Q
-!52 U+0052 R
-!53 U+0053 S
-!54 U+0054 T
-!55 U+0055 U
-!56 U+0056 V
-!57 U+0057 W
-!58 U+0058 X
-!59 U+0059 Y
-!5A U+005A Z
-!5B U+005B bracketleft
-!5C U+005C backslash
-!5D U+005D bracketright
-!5E U+005E asciicircum
-!5F U+005F underscore
-!60 U+0060 grave
-!61 U+0061 a
-!62 U+0062 b
-!63 U+0063 c
-!64 U+0064 d
-!65 U+0065 e
-!66 U+0066 f
-!67 U+0067 g
-!68 U+0068 h
-!69 U+0069 i
-!6A U+006A j
-!6B U+006B k
-!6C U+006C l
-!6D U+006D m
-!6E U+006E n
-!6F U+006F o
-!70 U+0070 p
-!71 U+0071 q
-!72 U+0072 r
-!73 U+0073 s
-!74 U+0074 t
-!75 U+0075 u
-!76 U+0076 v
-!77 U+0077 w
-!78 U+0078 x
-!79 U+0079 y
-!7A U+007A z
-!7B U+007B braceleft
-!7C U+007C bar
-!7D U+007D braceright
-!7E U+007E asciitilde
-!7F U+007F .notdef
-!80 U+0080 .notdef
-!81 U+0081 .notdef
-!82 U+0082 .notdef
-!83 U+0083 .notdef
-!84 U+0084 .notdef
-!85 U+0085 .notdef
-!86 U+0086 .notdef
-!87 U+0087 .notdef
-!88 U+0088 .notdef
-!89 U+0089 .notdef
-!8A U+008A .notdef
-!8B U+008B .notdef
-!8C U+008C .notdef
-!8D U+008D .notdef
-!8E U+008E .notdef
-!8F U+008F .notdef
-!90 U+0090 .notdef
-!91 U+0091 .notdef
-!92 U+0092 .notdef
-!93 U+0093 .notdef
-!94 U+0094 .notdef
-!95 U+0095 .notdef
-!96 U+0096 .notdef
-!97 U+0097 .notdef
-!98 U+0098 .notdef
-!99 U+0099 .notdef
-!9A U+009A .notdef
-!9B U+009B .notdef
-!9C U+009C .notdef
-!9D U+009D .notdef
-!9E U+009E .notdef
-!9F U+009F .notdef
-!A0 U+00A0 space
-!A1 U+00A1 exclamdown
-!A2 U+00A2 cent
-!A3 U+00A3 sterling
-!A4 U+00A4 currency
-!A5 U+00A5 yen
-!A6 U+00A6 brokenbar
-!A7 U+00A7 section
-!A8 U+00A8 dieresis
-!A9 U+00A9 copyright
-!AA U+00AA ordfeminine
-!AB U+00AB guillemotleft
-!AC U+00AC logicalnot
-!AD U+00AD hyphen
-!AE U+00AE registered
-!AF U+00AF macron
-!B0 U+00B0 degree
-!B1 U+00B1 plusminus
-!B2 U+00B2 twosuperior
-!B3 U+00B3 threesuperior
-!B4 U+00B4 acute
-!B5 U+00B5 mu
-!B6 U+00B6 paragraph
-!B7 U+00B7 periodcentered
-!B8 U+00B8 cedilla
-!B9 U+00B9 onesuperior
-!BA U+00BA ordmasculine
-!BB U+00BB guillemotright
-!BC U+00BC onequarter
-!BD U+00BD onehalf
-!BE U+00BE threequarters
-!BF U+00BF questiondown
-!C0 U+00C0 Agrave
-!C1 U+00C1 Aacute
-!C2 U+00C2 Acircumflex
-!C3 U+00C3 Atilde
-!C4 U+00C4 Adieresis
-!C5 U+00C5 Aring
-!C6 U+00C6 AE
-!C7 U+00C7 Ccedilla
-!C8 U+00C8 Egrave
-!C9 U+00C9 Eacute
-!CA U+00CA Ecircumflex
-!CB U+00CB Edieresis
-!CC U+00CC Igrave
-!CD U+00CD Iacute
-!CE U+00CE Icircumflex
-!CF U+00CF Idieresis
-!D0 U+011E Gbreve
-!D1 U+00D1 Ntilde
-!D2 U+00D2 Ograve
-!D3 U+00D3 Oacute
-!D4 U+00D4 Ocircumflex
-!D5 U+00D5 Otilde
-!D6 U+00D6 Odieresis
-!D7 U+00D7 multiply
-!D8 U+00D8 Oslash
-!D9 U+00D9 Ugrave
-!DA U+00DA Uacute
-!DB U+00DB Ucircumflex
-!DC U+00DC Udieresis
-!DD U+0130 Idotaccent
-!DE U+015E Scedilla
-!DF U+00DF germandbls
-!E0 U+00E0 agrave
-!E1 U+00E1 aacute
-!E2 U+00E2 acircumflex
-!E3 U+00E3 atilde
-!E4 U+00E4 adieresis
-!E5 U+00E5 aring
-!E6 U+00E6 ae
-!E7 U+00E7 ccedilla
-!E8 U+00E8 egrave
-!E9 U+00E9 eacute
-!EA U+00EA ecircumflex
-!EB U+00EB edieresis
-!EC U+00EC igrave
-!ED U+00ED iacute
-!EE U+00EE icircumflex
-!EF U+00EF idieresis
-!F0 U+011F gbreve
-!F1 U+00F1 ntilde
-!F2 U+00F2 ograve
-!F3 U+00F3 oacute
-!F4 U+00F4 ocircumflex
-!F5 U+00F5 otilde
-!F6 U+00F6 odieresis
-!F7 U+00F7 divide
-!F8 U+00F8 oslash
-!F9 U+00F9 ugrave
-!FA U+00FA uacute
-!FB U+00FB ucircumflex
-!FC U+00FC udieresis
-!FD U+0131 dotlessi
-!FE U+015F scedilla
-!FF U+00FF ydieresis
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/enc/koi8-r.map b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/enc/koi8-r.map
deleted file mode 100644
index 6ad5d05d..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/enc/koi8-r.map
+++ /dev/null
@@ -1,256 +0,0 @@
-!00 U+0000 .notdef
-!01 U+0001 .notdef
-!02 U+0002 .notdef
-!03 U+0003 .notdef
-!04 U+0004 .notdef
-!05 U+0005 .notdef
-!06 U+0006 .notdef
-!07 U+0007 .notdef
-!08 U+0008 .notdef
-!09 U+0009 .notdef
-!0A U+000A .notdef
-!0B U+000B .notdef
-!0C U+000C .notdef
-!0D U+000D .notdef
-!0E U+000E .notdef
-!0F U+000F .notdef
-!10 U+0010 .notdef
-!11 U+0011 .notdef
-!12 U+0012 .notdef
-!13 U+0013 .notdef
-!14 U+0014 .notdef
-!15 U+0015 .notdef
-!16 U+0016 .notdef
-!17 U+0017 .notdef
-!18 U+0018 .notdef
-!19 U+0019 .notdef
-!1A U+001A .notdef
-!1B U+001B .notdef
-!1C U+001C .notdef
-!1D U+001D .notdef
-!1E U+001E .notdef
-!1F U+001F .notdef
-!20 U+0020 space
-!21 U+0021 exclam
-!22 U+0022 quotedbl
-!23 U+0023 numbersign
-!24 U+0024 dollar
-!25 U+0025 percent
-!26 U+0026 ampersand
-!27 U+0027 quotesingle
-!28 U+0028 parenleft
-!29 U+0029 parenright
-!2A U+002A asterisk
-!2B U+002B plus
-!2C U+002C comma
-!2D U+002D hyphen
-!2E U+002E period
-!2F U+002F slash
-!30 U+0030 zero
-!31 U+0031 one
-!32 U+0032 two
-!33 U+0033 three
-!34 U+0034 four
-!35 U+0035 five
-!36 U+0036 six
-!37 U+0037 seven
-!38 U+0038 eight
-!39 U+0039 nine
-!3A U+003A colon
-!3B U+003B semicolon
-!3C U+003C less
-!3D U+003D equal
-!3E U+003E greater
-!3F U+003F question
-!40 U+0040 at
-!41 U+0041 A
-!42 U+0042 B
-!43 U+0043 C
-!44 U+0044 D
-!45 U+0045 E
-!46 U+0046 F
-!47 U+0047 G
-!48 U+0048 H
-!49 U+0049 I
-!4A U+004A J
-!4B U+004B K
-!4C U+004C L
-!4D U+004D M
-!4E U+004E N
-!4F U+004F O
-!50 U+0050 P
-!51 U+0051 Q
-!52 U+0052 R
-!53 U+0053 S
-!54 U+0054 T
-!55 U+0055 U
-!56 U+0056 V
-!57 U+0057 W
-!58 U+0058 X
-!59 U+0059 Y
-!5A U+005A Z
-!5B U+005B bracketleft
-!5C U+005C backslash
-!5D U+005D bracketright
-!5E U+005E asciicircum
-!5F U+005F underscore
-!60 U+0060 grave
-!61 U+0061 a
-!62 U+0062 b
-!63 U+0063 c
-!64 U+0064 d
-!65 U+0065 e
-!66 U+0066 f
-!67 U+0067 g
-!68 U+0068 h
-!69 U+0069 i
-!6A U+006A j
-!6B U+006B k
-!6C U+006C l
-!6D U+006D m
-!6E U+006E n
-!6F U+006F o
-!70 U+0070 p
-!71 U+0071 q
-!72 U+0072 r
-!73 U+0073 s
-!74 U+0074 t
-!75 U+0075 u
-!76 U+0076 v
-!77 U+0077 w
-!78 U+0078 x
-!79 U+0079 y
-!7A U+007A z
-!7B U+007B braceleft
-!7C U+007C bar
-!7D U+007D braceright
-!7E U+007E asciitilde
-!7F U+007F .notdef
-!80 U+2500 SF100000
-!81 U+2502 SF110000
-!82 U+250C SF010000
-!83 U+2510 SF030000
-!84 U+2514 SF020000
-!85 U+2518 SF040000
-!86 U+251C SF080000
-!87 U+2524 SF090000
-!88 U+252C SF060000
-!89 U+2534 SF070000
-!8A U+253C SF050000
-!8B U+2580 upblock
-!8C U+2584 dnblock
-!8D U+2588 block
-!8E U+258C lfblock
-!8F U+2590 rtblock
-!90 U+2591 ltshade
-!91 U+2592 shade
-!92 U+2593 dkshade
-!93 U+2320 integraltp
-!94 U+25A0 filledbox
-!95 U+2219 periodcentered
-!96 U+221A radical
-!97 U+2248 approxequal
-!98 U+2264 lessequal
-!99 U+2265 greaterequal
-!9A U+00A0 space
-!9B U+2321 integralbt
-!9C U+00B0 degree
-!9D U+00B2 twosuperior
-!9E U+00B7 periodcentered
-!9F U+00F7 divide
-!A0 U+2550 SF430000
-!A1 U+2551 SF240000
-!A2 U+2552 SF510000
-!A3 U+0451 afii10071
-!A4 U+2553 SF520000
-!A5 U+2554 SF390000
-!A6 U+2555 SF220000
-!A7 U+2556 SF210000
-!A8 U+2557 SF250000
-!A9 U+2558 SF500000
-!AA U+2559 SF490000
-!AB U+255A SF380000
-!AC U+255B SF280000
-!AD U+255C SF270000
-!AE U+255D SF260000
-!AF U+255E SF360000
-!B0 U+255F SF370000
-!B1 U+2560 SF420000
-!B2 U+2561 SF190000
-!B3 U+0401 afii10023
-!B4 U+2562 SF200000
-!B5 U+2563 SF230000
-!B6 U+2564 SF470000
-!B7 U+2565 SF480000
-!B8 U+2566 SF410000
-!B9 U+2567 SF450000
-!BA U+2568 SF460000
-!BB U+2569 SF400000
-!BC U+256A SF540000
-!BD U+256B SF530000
-!BE U+256C SF440000
-!BF U+00A9 copyright
-!C0 U+044E afii10096
-!C1 U+0430 afii10065
-!C2 U+0431 afii10066
-!C3 U+0446 afii10088
-!C4 U+0434 afii10069
-!C5 U+0435 afii10070
-!C6 U+0444 afii10086
-!C7 U+0433 afii10068
-!C8 U+0445 afii10087
-!C9 U+0438 afii10074
-!CA U+0439 afii10075
-!CB U+043A afii10076
-!CC U+043B afii10077
-!CD U+043C afii10078
-!CE U+043D afii10079
-!CF U+043E afii10080
-!D0 U+043F afii10081
-!D1 U+044F afii10097
-!D2 U+0440 afii10082
-!D3 U+0441 afii10083
-!D4 U+0442 afii10084
-!D5 U+0443 afii10085
-!D6 U+0436 afii10072
-!D7 U+0432 afii10067
-!D8 U+044C afii10094
-!D9 U+044B afii10093
-!DA U+0437 afii10073
-!DB U+0448 afii10090
-!DC U+044D afii10095
-!DD U+0449 afii10091
-!DE U+0447 afii10089
-!DF U+044A afii10092
-!E0 U+042E afii10048
-!E1 U+0410 afii10017
-!E2 U+0411 afii10018
-!E3 U+0426 afii10040
-!E4 U+0414 afii10021
-!E5 U+0415 afii10022
-!E6 U+0424 afii10038
-!E7 U+0413 afii10020
-!E8 U+0425 afii10039
-!E9 U+0418 afii10026
-!EA U+0419 afii10027
-!EB U+041A afii10028
-!EC U+041B afii10029
-!ED U+041C afii10030
-!EE U+041D afii10031
-!EF U+041E afii10032
-!F0 U+041F afii10033
-!F1 U+042F afii10049
-!F2 U+0420 afii10034
-!F3 U+0421 afii10035
-!F4 U+0422 afii10036
-!F5 U+0423 afii10037
-!F6 U+0416 afii10024
-!F7 U+0412 afii10019
-!F8 U+042C afii10046
-!F9 U+042B afii10045
-!FA U+0417 afii10025
-!FB U+0428 afii10042
-!FC U+042D afii10047
-!FD U+0429 afii10043
-!FE U+0427 afii10041
-!FF U+042A afii10044
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/enc/koi8-u.map b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/enc/koi8-u.map
deleted file mode 100644
index 40a7e4fd..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/enc/koi8-u.map
+++ /dev/null
@@ -1,256 +0,0 @@
-!00 U+0000 .notdef
-!01 U+0001 .notdef
-!02 U+0002 .notdef
-!03 U+0003 .notdef
-!04 U+0004 .notdef
-!05 U+0005 .notdef
-!06 U+0006 .notdef
-!07 U+0007 .notdef
-!08 U+0008 .notdef
-!09 U+0009 .notdef
-!0A U+000A .notdef
-!0B U+000B .notdef
-!0C U+000C .notdef
-!0D U+000D .notdef
-!0E U+000E .notdef
-!0F U+000F .notdef
-!10 U+0010 .notdef
-!11 U+0011 .notdef
-!12 U+0012 .notdef
-!13 U+0013 .notdef
-!14 U+0014 .notdef
-!15 U+0015 .notdef
-!16 U+0016 .notdef
-!17 U+0017 .notdef
-!18 U+0018 .notdef
-!19 U+0019 .notdef
-!1A U+001A .notdef
-!1B U+001B .notdef
-!1C U+001C .notdef
-!1D U+001D .notdef
-!1E U+001E .notdef
-!1F U+001F .notdef
-!20 U+0020 space
-!21 U+0021 exclam
-!22 U+0022 quotedbl
-!23 U+0023 numbersign
-!24 U+0024 dollar
-!25 U+0025 percent
-!26 U+0026 ampersand
-!27 U+0027 quotesingle
-!28 U+0028 parenleft
-!29 U+0029 parenright
-!2A U+002A asterisk
-!2B U+002B plus
-!2C U+002C comma
-!2D U+002D hyphen
-!2E U+002E period
-!2F U+002F slash
-!30 U+0030 zero
-!31 U+0031 one
-!32 U+0032 two
-!33 U+0033 three
-!34 U+0034 four
-!35 U+0035 five
-!36 U+0036 six
-!37 U+0037 seven
-!38 U+0038 eight
-!39 U+0039 nine
-!3A U+003A colon
-!3B U+003B semicolon
-!3C U+003C less
-!3D U+003D equal
-!3E U+003E greater
-!3F U+003F question
-!40 U+0040 at
-!41 U+0041 A
-!42 U+0042 B
-!43 U+0043 C
-!44 U+0044 D
-!45 U+0045 E
-!46 U+0046 F
-!47 U+0047 G
-!48 U+0048 H
-!49 U+0049 I
-!4A U+004A J
-!4B U+004B K
-!4C U+004C L
-!4D U+004D M
-!4E U+004E N
-!4F U+004F O
-!50 U+0050 P
-!51 U+0051 Q
-!52 U+0052 R
-!53 U+0053 S
-!54 U+0054 T
-!55 U+0055 U
-!56 U+0056 V
-!57 U+0057 W
-!58 U+0058 X
-!59 U+0059 Y
-!5A U+005A Z
-!5B U+005B bracketleft
-!5C U+005C backslash
-!5D U+005D bracketright
-!5E U+005E asciicircum
-!5F U+005F underscore
-!60 U+0060 grave
-!61 U+0061 a
-!62 U+0062 b
-!63 U+0063 c
-!64 U+0064 d
-!65 U+0065 e
-!66 U+0066 f
-!67 U+0067 g
-!68 U+0068 h
-!69 U+0069 i
-!6A U+006A j
-!6B U+006B k
-!6C U+006C l
-!6D U+006D m
-!6E U+006E n
-!6F U+006F o
-!70 U+0070 p
-!71 U+0071 q
-!72 U+0072 r
-!73 U+0073 s
-!74 U+0074 t
-!75 U+0075 u
-!76 U+0076 v
-!77 U+0077 w
-!78 U+0078 x
-!79 U+0079 y
-!7A U+007A z
-!7B U+007B braceleft
-!7C U+007C bar
-!7D U+007D braceright
-!7E U+007E asciitilde
-!7F U+007F .notdef
-!80 U+2500 SF100000
-!81 U+2502 SF110000
-!82 U+250C SF010000
-!83 U+2510 SF030000
-!84 U+2514 SF020000
-!85 U+2518 SF040000
-!86 U+251C SF080000
-!87 U+2524 SF090000
-!88 U+252C SF060000
-!89 U+2534 SF070000
-!8A U+253C SF050000
-!8B U+2580 upblock
-!8C U+2584 dnblock
-!8D U+2588 block
-!8E U+258C lfblock
-!8F U+2590 rtblock
-!90 U+2591 ltshade
-!91 U+2592 shade
-!92 U+2593 dkshade
-!93 U+2320 integraltp
-!94 U+25A0 filledbox
-!95 U+2022 bullet
-!96 U+221A radical
-!97 U+2248 approxequal
-!98 U+2264 lessequal
-!99 U+2265 greaterequal
-!9A U+00A0 space
-!9B U+2321 integralbt
-!9C U+00B0 degree
-!9D U+00B2 twosuperior
-!9E U+00B7 periodcentered
-!9F U+00F7 divide
-!A0 U+2550 SF430000
-!A1 U+2551 SF240000
-!A2 U+2552 SF510000
-!A3 U+0451 afii10071
-!A4 U+0454 afii10101
-!A5 U+2554 SF390000
-!A6 U+0456 afii10103
-!A7 U+0457 afii10104
-!A8 U+2557 SF250000
-!A9 U+2558 SF500000
-!AA U+2559 SF490000
-!AB U+255A SF380000
-!AC U+255B SF280000
-!AD U+0491 afii10098
-!AE U+255D SF260000
-!AF U+255E SF360000
-!B0 U+255F SF370000
-!B1 U+2560 SF420000
-!B2 U+2561 SF190000
-!B3 U+0401 afii10023
-!B4 U+0404 afii10053
-!B5 U+2563 SF230000
-!B6 U+0406 afii10055
-!B7 U+0407 afii10056
-!B8 U+2566 SF410000
-!B9 U+2567 SF450000
-!BA U+2568 SF460000
-!BB U+2569 SF400000
-!BC U+256A SF540000
-!BD U+0490 afii10050
-!BE U+256C SF440000
-!BF U+00A9 copyright
-!C0 U+044E afii10096
-!C1 U+0430 afii10065
-!C2 U+0431 afii10066
-!C3 U+0446 afii10088
-!C4 U+0434 afii10069
-!C5 U+0435 afii10070
-!C6 U+0444 afii10086
-!C7 U+0433 afii10068
-!C8 U+0445 afii10087
-!C9 U+0438 afii10074
-!CA U+0439 afii10075
-!CB U+043A afii10076
-!CC U+043B afii10077
-!CD U+043C afii10078
-!CE U+043D afii10079
-!CF U+043E afii10080
-!D0 U+043F afii10081
-!D1 U+044F afii10097
-!D2 U+0440 afii10082
-!D3 U+0441 afii10083
-!D4 U+0442 afii10084
-!D5 U+0443 afii10085
-!D6 U+0436 afii10072
-!D7 U+0432 afii10067
-!D8 U+044C afii10094
-!D9 U+044B afii10093
-!DA U+0437 afii10073
-!DB U+0448 afii10090
-!DC U+044D afii10095
-!DD U+0449 afii10091
-!DE U+0447 afii10089
-!DF U+044A afii10092
-!E0 U+042E afii10048
-!E1 U+0410 afii10017
-!E2 U+0411 afii10018
-!E3 U+0426 afii10040
-!E4 U+0414 afii10021
-!E5 U+0415 afii10022
-!E6 U+0424 afii10038
-!E7 U+0413 afii10020
-!E8 U+0425 afii10039
-!E9 U+0418 afii10026
-!EA U+0419 afii10027
-!EB U+041A afii10028
-!EC U+041B afii10029
-!ED U+041C afii10030
-!EE U+041D afii10031
-!EF U+041E afii10032
-!F0 U+041F afii10033
-!F1 U+042F afii10049
-!F2 U+0420 afii10034
-!F3 U+0421 afii10035
-!F4 U+0422 afii10036
-!F5 U+0423 afii10037
-!F6 U+0416 afii10024
-!F7 U+0412 afii10019
-!F8 U+042C afii10046
-!F9 U+042B afii10045
-!FA U+0417 afii10025
-!FB U+0428 afii10042
-!FC U+042D afii10047
-!FD U+0429 afii10043
-!FE U+0427 afii10041
-!FF U+042A afii10044
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/freetype6.dll b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/freetype6.dll
deleted file mode 100644
index 53878a03..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/freetype6.dll and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/makeallttffonts.php b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/makeallttffonts.php
deleted file mode 100644
index 0228d976..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/makeallttffonts.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-//============================================================+
-// File name   : makeallttffonts.php
-// Begin       : 2008-12-07
-// Last Update : 2008-12-07
-//
-// Description : Process all TTF files on current directory to 
-//               build TCPDF compatible font files.
-//
-// Author: Nicola Asuni
-//
-// (c) Copyright:
-//               Nicola Asuni
-//               Tecnick.com S.r.l.
-//               Via della Pace, 11
-//               09044 Quartucciu (CA)
-//               ITALY
-//               www.tecnick.com
-//               info@tecnick.com
-//
-// License: 
-//    Copyright (C) 2004-2009  Nicola Asuni - Tecnick.com S.r.l.
-//    
-//    This program is free software: you can redistribute it and/or modify
-//    it under the terms of the GNU General Public License as published by
-//    the Free Software Foundation, either version 3 of the License, or
-//    (at your option) any later version.
-//    
-//    This program is distributed in the hope that it will be useful,
-//    but WITHOUT ANY WARRANTY; without even the implied warranty of
-//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//    GNU General Public License for more details.
-//    
-//    You should have received a copy of the GNU General Public License
-//    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//     
-//    Additionally, you can't remove the original TCExam logo, copyrights statements
-//    and links to Tecnick.com and TCExam websites.
-//    
-//    See LICENSE.TXT file for more information.
-//============================================================+
-
-/**
- * Process all TTF files on current directory to build TCPDF compatible font files.
- * @package com.tecnick.tcpdf
- * @author Nicola Asuni
- * @copyright Copyright &copy; 2004-2009, Nicola Asuni - Tecnick.com S.r.l. - ITALY - www.tecnick.com - info@tecnick.com
- * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License
- * @link www.tecnick.com
- * @since 2008-12-07
- */
-
-/**
- */
-
-// read directory for files (only graphics files).
-$handle = opendir('.');
-while($file = readdir($handle)) {
-	$path_parts = pathinfo($file);
-	$file_ext = strtolower($path_parts['extension']);
-	if ($file_ext == 'ttf') {
-		exec('./ttf2ufm -a -F '.$path_parts['basename'].'');
-		exec('php -q makefont.php '.$path_parts['basename'].' '.$path_parts['filename'].'.ufm');
-	}
-}
-closedir($handle);
-
-//============================================================+
-// END OF FILE                                                 
-//============================================================+
-?>
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/makefont.php b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/makefont.php
deleted file mode 100644
index ca669688..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/makefont.php
+++ /dev/null
@@ -1,610 +0,0 @@
-<?php
-//============================================================+
-// File name   : makefont.php
-// Begin       : 2004-12-31
-// Last Update : 2010-03-19
-// Version     : 1.2.006
-// License     : GNU LGPL (http://www.gnu.org/copyleft/lesser.html)
-// 	----------------------------------------------------------------------------
-// 	Copyright (C) 2008  Nicola Asuni - Tecnick.com S.r.l.
-// 	
-// 	This program is free software: you can redistribute it and/or modify
-// 	it under the terms of the GNU Lesser General Public License as published by
-// 	the Free Software Foundation, either version 2.1 of the License, or
-// 	(at your option) any later version.
-// 	
-// 	This program is distributed in the hope that it will be useful,
-// 	but WITHOUT ANY WARRANTY; without even the implied warranty of
-// 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// 	GNU Lesser General Public License for more details.
-// 	
-// 	You should have received a copy of the GNU Lesser General Public License
-// 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-// 	
-// 	See LICENSE.TXT file for more information.
-//  ----------------------------------------------------------------------------
-//
-// Description : Utility to generate font definition files fot TCPDF
-//
-// Authors: Nicola Asuni, Olivier Plathey, Steven Wittens
-//
-// (c) Copyright:
-//               Nicola Asuni
-//               Tecnick.com S.r.l.
-//               Via della Pace, 11
-//               09044 Quartucciu (CA)
-//               ITALY
-//               www.tecnick.com
-//               info@tecnick.com
-//============================================================+
-
-/**
- * Utility to generate font definition files fot TCPDF.
- * @author Nicola Asuni, Olivier Plathey, Steven Wittens
- * @copyright 2004-2008 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
- * @package com.tecnick.tcpdf
- * @link http://www.tcpdf.org
- * @license http://www.gnu.org/copyleft/lesser.html LGPL
-*/
-
-/**
- * 
- * @param string $fontfile path to font file (TTF, OTF or PFB).
- * @param string $fmfile font metrics file (UFM or AFM).
- * @param boolean $embedded Set to false to not embed the font, true otherwise (default).
- * @param string $enc Name of the encoding table to use. Omit this parameter for TrueType Unicode, OpenType Unicode and symbolic fonts like Symbol or ZapfDingBats.
- * @param array $patch Optional modification of the encoding
- */
-function MakeFont($fontfile, $fmfile, $embedded=true, $enc='cp1252', $patch=array()) {
-	//Generate a font definition file
-	set_magic_quotes_runtime(0);
-	ini_set('auto_detect_line_endings', '1');
-	if (!file_exists($fontfile)) {
-		die('Error: file not found: '.$fontfile);
-	}
-	if (!file_exists($fmfile)) {
-		die('Error: file not found: '.$fmfile);
-	}
-	$cidtogidmap = '';
-	$map = array();
-	$diff = '';
-	$dw = 0; // default width
-	$ffext = strtolower(substr($fontfile, -3));
-	$fmext = strtolower(substr($fmfile, -3));
-	if ($fmext == 'afm') {
-		if (($ffext == 'ttf') OR ($ffext == 'otf')) {
-			$type = 'TrueType';
-		} elseif ($ffext == 'pfb') {
-			$type = 'Type1';
-		} else {
-			die('Error: unrecognized font file extension: '.$ffext);
-		}
-		if ($enc) {
-			$map = ReadMap($enc);
-			foreach ($patch as $cc => $gn) {
-				$map[$cc] = $gn;
-			}
-		}
-		$fm = ReadAFM($fmfile, $map);
-		if (isset($widths['.notdef'])) {
-			$dw = $widths['.notdef'];
-		}
-		if ($enc) {
-			$diff = MakeFontEncoding($map);
-		}
-		$fd = MakeFontDescriptor($fm, empty($map));
-	} elseif ($fmext == 'ufm') {
-		$enc = '';
-		if (($ffext == 'ttf') OR ($ffext == 'otf')) {
-			$type = 'TrueTypeUnicode';
-		} else {
-			die('Error: not a TrueType font: '.$ffext);
-		}
-		$fm = ReadUFM($fmfile, $cidtogidmap);
-		$dw = $fm['MissingWidth'];
-		$fd = MakeFontDescriptor($fm, false);
-	}
-	//Start generation
-	$s = '<?php'."\n";
-	$s .= '$type=\''.$type."';\n";
-	$s .= '$name=\''.$fm['FontName']."';\n";
-	$s .= '$desc='.$fd.";\n";
-	if (!isset($fm['UnderlinePosition'])) {
-		$fm['UnderlinePosition'] = -100;
-	}
-	if (!isset($fm['UnderlineThickness'])) {
-		$fm['UnderlineThickness'] = 50;
-	}
-	$s .= '$up='.$fm['UnderlinePosition'].";\n";
-	$s .= '$ut='.$fm['UnderlineThickness'].";\n";
-	if ($dw <= 0) {
-		if (isset($fm['Widths'][32]) AND ($fm['Widths'][32] > 0)) {
-			// assign default space width
-			$dw = $fm['Widths'][32];
-		} else {
-			$dw = 600;
-		}
-	}
-	$s .= '$dw='.$dw.";\n";
-	$w = MakeWidthArray($fm);
-	$s .= '$cw='.$w.";\n";
-	$s .= '$enc=\''.$enc."';\n";
-	$s .= '$diff=\''.$diff."';\n";
-	$basename = substr(basename($fmfile), 0, -4);
-	if ($embedded) {
-		//Embedded font
-		if (($type == 'TrueType') OR ($type == 'TrueTypeUnicode')) {
-			CheckTTF($fontfile);
-		}
-		$f = fopen($fontfile,'rb');
-		if (!$f) {
-			die('Error: Unable to open '.$fontfile);
-		}
-		$file = fread($f, filesize($fontfile));
-		fclose($f);
-		if ($type == 'Type1') {
-			//Find first two sections and discard third one
-			$header = (ord($file{0}) == 128);
-			if ($header) {
-				//Strip first binary header
-				$file = substr($file, 6);
-			}
-			$pos = strpos($file, 'eexec');
-			if (!$pos) {
-				die('Error: font file does not seem to be valid Type1');
-			}
-			$size1 = $pos + 6;
-			if ($header AND (ord($file{$size1}) == 128)) {
-				//Strip second binary header
-				$file = substr($file, 0, $size1).substr($file, $size1+6);
-			}
-			$pos = strpos($file, '00000000');
-			if (!$pos) {
-				die('Error: font file does not seem to be valid Type1');
-			}
-			$size2 = $pos - $size1;
-			$file = substr($file, 0, ($size1 + $size2));
-		}
-		$basename = strtolower($basename);
-		if (function_exists('gzcompress')) {
-			$cmp = $basename.'.z';
-			SaveToFile($cmp, gzcompress($file, 9), 'b');
-			$s .= '$file=\''.$cmp."';\n";
-			print "Font file compressed (".$cmp.")\n";
-			if (!empty($cidtogidmap)) {
-				$cmp = $basename.'.ctg.z';
-				SaveToFile($cmp, gzcompress($cidtogidmap, 9), 'b');
-				print "CIDToGIDMap created and compressed (".$cmp.")\n";
-				$s .= '$ctg=\''.$cmp."';\n";
-			}
-		} else {
-			$s .= '$file=\''.basename($fontfile)."';\n";
-			print "Notice: font file could not be compressed (zlib extension not available)\n";
-			if (!empty($cidtogidmap)) {
-				$cmp = $basename.'.ctg';
-				$f = fopen($cmp, 'wb');
-				fwrite($f, $cidtogidmap);
-				fclose($f);
-				print "CIDToGIDMap created (".$cmp.")\n";
-				$s .= '$ctg=\''.$cmp."';\n";
-			}
-		}
-		if($type == 'Type1') {
-			$s .= '$size1='.$size1.";\n";
-			$s .= '$size2='.$size2.";\n";
-		} else {
-			$s.='$originalsize='.filesize($fontfile).";\n";
-		}
-	} else {
-		//Not embedded font
-		$s .= '$file='."'';\n";
-	}
-	$s .= "?>";
-	SaveToFile($basename.'.php',$s);
-	print "Font definition file generated (".$basename.".php)\n";
-}
-
-/**
- * Read the specified encoding map.
- * @param string $enc map name (see /enc/ folder for valid names).
- */
-function ReadMap($enc) {
-	//Read a map file
-	$file = dirname(__FILE__).'/enc/'.strtolower($enc).'.map';
-	$a = file($file);
-	if (empty($a)) {
-		die('Error: encoding not found: '.$enc);
-	}
-	$cc2gn = array();
-	foreach ($a as $l) {
-		if ($l{0} == '!') {
-			$e = preg_split('/[ \\t]+/',rtrim($l));
-			$cc = hexdec(substr($e[0],1));
-			$gn = $e[2];
-			$cc2gn[$cc] = $gn;
-		}
-	}
-	for($i = 0; $i <= 255; $i++) {
-		if(!isset($cc2gn[$i])) {
-			$cc2gn[$i] = '.notdef';
-		}
-	}
-	return $cc2gn;
-}
-
-/**
- * Read UFM file
- */
-function ReadUFM($file, &$cidtogidmap) {
-	//Prepare empty CIDToGIDMap
-	$cidtogidmap = str_pad('', (256 * 256 * 2), "\x00");
-	//Read a font metric file
-	$a = file($file);
-	if (empty($a)) {
-		die('File not found');
-	}
-	$widths = array();
-	$fm = array();
-	foreach($a as $l) {
-		$e = explode(' ',chop($l));
-		if(count($e) < 2) {
-			continue;
-		}
-		$code = $e[0];
-		$param = $e[1];
-		if($code == 'U') {
-			// U 827 ; WX 0 ; N squaresubnosp ; G 675 ;
-			//Character metrics
-			$cc = (int)$e[1];
-			if ($cc != -1) {
-			$gn = $e[7];
-			$w = $e[4];
-			$glyph = $e[10];
-			$widths[$cc] = $w;
-			if($cc == ord('X')) {
-				$fm['CapXHeight'] = $e[13];
-			}
-			// Set GID
-			if (($cc >= 0) AND ($cc < 0xFFFF) AND $glyph) {
-				$cidtogidmap{($cc * 2)} = chr($glyph >> 8);
-				$cidtogidmap{(($cc * 2) + 1)} = chr($glyph & 0xFF);
-			}
-		}
-		if((isset($gn) AND ($gn == '.notdef')) AND (!isset($fm['MissingWidth']))) {
-			$fm['MissingWidth'] = $w;
-		}
-		} elseif($code == 'FontName') {
-			$fm['FontName'] = $param;
-		} elseif($code == 'Weight') {
-			$fm['Weight'] = $param;
-		} elseif($code == 'ItalicAngle') {
-			$fm['ItalicAngle'] = (double)$param;
-		} elseif($code == 'Ascender') {
-			$fm['Ascender'] = (int)$param;
-		} elseif($code == 'Descender') {
-			$fm['Descender'] = (int)$param;
-		} elseif($code == 'UnderlineThickness') {
-			$fm['UnderlineThickness'] = (int)$param;
-		} elseif($code == 'UnderlinePosition') {
-			$fm['UnderlinePosition'] = (int)$param;
-		} elseif($code == 'IsFixedPitch') {
-			$fm['IsFixedPitch'] = ($param == 'true');
-		} elseif($code == 'FontBBox') {
-			$fm['FontBBox'] = array($e[1], $e[2], $e[3], $e[4]);
-		} elseif($code == 'CapHeight') {
-			$fm['CapHeight'] = (int)$param;
-		} elseif($code == 'StdVW') {
-			$fm['StdVW'] = (int)$param;
-		}
-	}
-	if(!isset($fm['MissingWidth'])) {
-		$fm['MissingWidth'] = 600;
-	}
-	if(!isset($fm['FontName'])) {
-		die('FontName not found');
-	}
-	$fm['Widths'] = $widths;
-	return $fm;
-}
-
-/**
- * Read AFM file
- */
-function ReadAFM($file,&$map) {
-	//Read a font metric file
-	$a = file($file);
-	if(empty($a)) {
-		die('File not found');
-	}
-	$widths = array();
-	$fm = array();
-	$fix = array(
-		'Edot'=>'Edotaccent',
-		'edot'=>'edotaccent',
-		'Idot'=>'Idotaccent',
-		'Zdot'=>'Zdotaccent',
-		'zdot'=>'zdotaccent',
-		'Odblacute' => 'Ohungarumlaut',
-		'odblacute' => 'ohungarumlaut',
-		'Udblacute'=>'Uhungarumlaut',
-		'udblacute'=>'uhungarumlaut',
-		'Gcedilla'=>'Gcommaaccent'
-		,'gcedilla'=>'gcommaaccent',
-		'Kcedilla'=>'Kcommaaccent',
-		'kcedilla'=>'kcommaaccent',
-		'Lcedilla'=>'Lcommaaccent',
-		'lcedilla'=>'lcommaaccent',
-		'Ncedilla'=>'Ncommaaccent',
-		'ncedilla'=>'ncommaaccent',
-		'Rcedilla'=>'Rcommaaccent',
-		'rcedilla'=>'rcommaaccent',
-		'Scedilla'=>'Scommaaccent',
-		'scedilla'=>'scommaaccent',
-		'Tcedilla'=>'Tcommaaccent',
-		'tcedilla'=>'tcommaaccent',
-		'Dslash'=>'Dcroat',
-		'dslash'=>'dcroat',
-		'Dmacron'=>'Dcroat',
-		'dmacron'=>'dcroat',
-		'combininggraveaccent'=>'gravecomb',
-		'combininghookabove'=>'hookabovecomb',
-		'combiningtildeaccent'=>'tildecomb',
-		'combiningacuteaccent'=>'acutecomb',
-		'combiningdotbelow'=>'dotbelowcomb',
-		'dongsign'=>'dong'
-		);
-	foreach($a as $l) {
-		$e = explode(' ', rtrim($l));
-		if (count($e) < 2) {
-			continue;
-		}
-		$code = $e[0];
-		$param = $e[1];
-		if ($code == 'C') {
-			//Character metrics
-			$cc = (int)$e[1];
-			$w = $e[4];
-			$gn = $e[7];
-			if (substr($gn, -4) == '20AC') {
-				$gn = 'Euro';
-			}
-			if (isset($fix[$gn])) {
-				//Fix incorrect glyph name
-				foreach ($map as $c => $n) {
-					if ($n == $fix[$gn]) {
-						$map[$c] = $gn;
-					}
-				}
-			}
-			if (empty($map)) {
-				//Symbolic font: use built-in encoding
-				$widths[$cc] = $w;
-			} else {
-				$widths[$gn] = $w;
-				if($gn == 'X') {
-					$fm['CapXHeight'] = $e[13];
-				}
-			}
-			if($gn == '.notdef') {
-				$fm['MissingWidth'] = $w;
-			}
-		} elseif($code == 'FontName') {
-			$fm['FontName'] = $param;
-		} elseif($code == 'Weight') {
-			$fm['Weight'] = $param;
-		} elseif($code == 'ItalicAngle') {
-			$fm['ItalicAngle'] = (double)$param;
-		} elseif($code == 'Ascender') {
-			$fm['Ascender'] = (int)$param;
-		} elseif($code == 'Descender') {
-			$fm['Descender'] = (int)$param;
-		} elseif($code == 'UnderlineThickness') {
-			$fm['UnderlineThickness'] = (int)$param;
-		} elseif($code == 'UnderlinePosition') {
-			$fm['UnderlinePosition'] = (int)$param;
-		} elseif($code == 'IsFixedPitch') {
-			$fm['IsFixedPitch'] = ($param == 'true');
-		} elseif($code == 'FontBBox') {
-			$fm['FontBBox'] = array($e[1], $e[2], $e[3], $e[4]);
-		} elseif($code == 'CapHeight') {
-			$fm['CapHeight'] = (int)$param;
-		} elseif($code == 'StdVW') {
-			$fm['StdVW'] = (int)$param;
-		}
-	}
-	if (!isset($fm['FontName'])) {
-		die('FontName not found');
-	}
-	if (!empty($map)) {
-		if (!isset($widths['.notdef'])) {
-			$widths['.notdef'] = 600;
-		}
-		if (!isset($widths['Delta']) AND isset($widths['increment'])) {
-			$widths['Delta'] = $widths['increment'];
-		}
-		//Order widths according to map
-		for ($i = 0; $i <= 255; $i++) {
-			if (!isset($widths[$map[$i]])) {
-				print "Warning: character ".$map[$i]." is missing\n";
-				$widths[$i] = $widths['.notdef'];
-			} else {
-				$widths[$i] = $widths[$map[$i]];
-			}
-		}
-	}
-	$fm['Widths'] = $widths;
-	return $fm;
-}
-
-function MakeFontDescriptor($fm, $symbolic=false) {
-	//Ascent
-	$asc = (isset($fm['Ascender']) ? $fm['Ascender'] : 1000);
-	$fd = "array('Ascent'=>".$asc;
-	//Descent
-	$desc = (isset($fm['Descender']) ? $fm['Descender'] : -200);
-	$fd .= ",'Descent'=>".$desc;
-	//CapHeight
-	if (isset($fm['CapHeight'])) {
-		$ch = $fm['CapHeight'];
-	} elseif (isset($fm['CapXHeight'])) {
-		$ch = $fm['CapXHeight'];
-	} else {
-		$ch = $asc;
-	}
-	$fd .= ",'CapHeight'=>".$ch;
-	//Flags
-	$flags = 0;
-	if (isset($fm['IsFixedPitch']) AND $fm['IsFixedPitch']) {
-		$flags += 1<<0;
-	}
-	if ($symbolic) {
-		$flags += 1<<2;
-	} else {
-		$flags += 1<<5;
-	}
-	if (isset($fm['ItalicAngle']) AND ($fm['ItalicAngle'] != 0)) {
-		$flags += 1<<6;
-	}
-	$fd .= ",'Flags'=>".$flags;
-	//FontBBox
-	if (isset($fm['FontBBox'])) {
-		$fbb = $fm['FontBBox'];
-	} else {
-		$fbb = array(0, ($desc - 100), 1000, ($asc + 100));
-	}
-	$fd .= ",'FontBBox'=>'[".$fbb[0].' '.$fbb[1].' '.$fbb[2].' '.$fbb[3]."]'";
-	//ItalicAngle
-	$ia = (isset($fm['ItalicAngle']) ? $fm['ItalicAngle'] : 0);
-	$fd .= ",'ItalicAngle'=>".$ia;
-	//StemV
-	if (isset($fm['StdVW'])) {
-		$stemv = $fm['StdVW'];
-	} elseif (isset($fm['Weight']) AND preg_match('/(bold|black)/i', $fm['Weight'])) {
-		$stemv = 120;
-	} else {
-		$stemv = 70;
-	}
-	$fd .= ",'StemV'=>".$stemv;
-	//MissingWidth
-	if(isset($fm['MissingWidth'])) {
-		$fd .= ",'MissingWidth'=>".$fm['MissingWidth'];
-	}
-	$fd .= ')';
-	return $fd;
-}
-
-function MakeWidthArray($fm) {
-	//Make character width array
-	$s = 'array(';
-	$cw = $fm['Widths'];
-	$els = array();
-	$c = 0;
-	foreach ($cw as $i => $w) {
-		if (is_numeric($i)) {
-			$els[] = (((($c++)%10) == 0) ? "\n" : '').$i.'=>'.$w;
-		}
-	}
-	$s .= implode(',', $els);
-	$s .= ')';
-	return $s;
-}
-
-function MakeFontEncoding($map) {
-	//Build differences from reference encoding
-	$ref = ReadMap('cp1252');
-	$s = '';
-	$last = 0;
-	for ($i = 32; $i <= 255; $i++) {
-		if ($map[$i] != $ref[$i]) {
-			if ($i != $last+1) {
-				$s .= $i.' ';
-			}
-			$last = $i;
-			$s .= '/'.$map[$i].' ';
-		}
-	}
-	return rtrim($s);
-}
-
-function SaveToFile($file, $s, $mode='t') {
-	$f = fopen($file, 'w'.$mode);
-	if(!$f) {
-		die('Can\'t write to file '.$file);
-	}
-	fwrite($f, $s, strlen($s));
-	fclose($f);
-}
-
-function ReadShort($f) {
-	$a = unpack('n1n', fread($f, 2));
-	return $a['n'];
-}
-
-function ReadLong($f) {
-	$a = unpack('N1N', fread($f, 4));
-	return $a['N'];
-}
-
-function CheckTTF($file) {
-	//Check if font license allows embedding
-	$f = fopen($file, 'rb');
-	if (!$f) {
-		die('Error: unable to open '.$file);
-	}
-	//Extract number of tables
-	fseek($f, 4, SEEK_CUR);
-	$nb = ReadShort($f);
-	fseek($f, 6, SEEK_CUR);
-	//Seek OS/2 table
-	$found = false;
-	for ($i = 0; $i < $nb; $i++) {
-		if (fread($f, 4) == 'OS/2') {
-			$found = true;
-			break;
-		}
-		fseek($f, 12, SEEK_CUR);
-	}
-	if (!$found) {
-		fclose($f);
-		return;
-	}
-	fseek($f, 4, SEEK_CUR);
-	$offset = ReadLong($f);
-	fseek($f, $offset, SEEK_SET);
-	//Extract fsType flags
-	fseek($f, 8, SEEK_CUR);
-	$fsType = ReadShort($f);
-	$rl = ($fsType & 0x02) != 0;
-	$pp = ($fsType & 0x04) != 0;
-	$e = ($fsType & 0x08) != 0;
-	fclose($f);
-	if($rl AND (!$pp) AND (!$e)) {
-		print "Warning: font license does not allow embedding\n";
-	}
-}
-
-$arg = $GLOBALS['argv'];
-if (count($arg) >= 3) {
-	ob_start();
-	array_shift($arg);
-	if (sizeof($arg) == 3) {
-		$arg[3] = $arg[2];
-		$arg[2] = true;
-	} else {
-		if (!isset($arg[2])) {
-			$arg[2] = true;
-		}
-		if (!isset($arg[3])) {
-			$arg[3] = 'cp1252';
-		}
-	}
-	if (!isset($arg[4])) {
-		$arg[4] = array();
-	}
-	MakeFont($arg[0], $arg[1], $arg[2], $arg[3], $arg[4]);
-	$t = ob_get_clean();
-	print preg_replace('!<BR( /)?>!i', "\n", $t);
-} else {
-	print "Usage: makefont.php <ttf/otf/pfb file> <afm/ufm file> <encoding> <patch>\n";
-}
-?>
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/pfm2afm b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/pfm2afm
deleted file mode 100644
index e9a03f68..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/pfm2afm and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/pfm2afm.exe b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/pfm2afm.exe
deleted file mode 100644
index 25c21fa1..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/pfm2afm.exe and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/src/pfm2afm-src.tar.gz b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/src/pfm2afm-src.tar.gz
deleted file mode 100644
index 72abae50..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/src/pfm2afm-src.tar.gz and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/src/readme.txt b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/src/readme.txt
deleted file mode 100644
index f351cd9a..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/src/readme.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-To embed TrueType and OpenType font files, you need to extract the
-font metrics from the font files and build the required tables using
-the utility TTF2UFM.
-
-TTF2UFM is a modified version of Mark Heath's TTF 2 PT1 converter 
-(http://ttf2pt1.sourceforge.net/) by Steven Wittens <steven@acko.net> 
-(http://www.acko.net/blog/ufpdf). That version has been further
-modified by Ulrich Telle for use with the wxWidgets component
-wxPdfDocument.
-
-Following changes where made:
-
-1) Generated AFM files contain the glyph number for each character.
-2) Generated UFM files contain the bounding box for each character.
-3) OpenType support has been activated for the Windows binary,
-   and the generated AFM/UFM files contain the associated
-   original Unicode codes for each character.
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/src/ttf2ufm-src.tar.gz b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/src/ttf2ufm-src.tar.gz
deleted file mode 100644
index 2aeca608..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/src/ttf2ufm-src.tar.gz and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/ttf2ufm b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/ttf2ufm
deleted file mode 100644
index 58bca723..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/ttf2ufm and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/ttf2ufm.exe b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/ttf2ufm.exe
deleted file mode 100644
index 07751055..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/ttf2ufm.exe and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/zlib1.dll b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/zlib1.dll
deleted file mode 100644
index 31996cd3..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/utils/zlib1.dll and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/zapfdingbats.php b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/zapfdingbats.php
deleted file mode 100644
index d3b7c56c..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/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);
-?>
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/zarbold.php b/html2pdf_v4.03/_tcpdf_5.0.002/fonts/zarbold.php
deleted file mode 100644
index 41b9aae1..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/fonts/zarbold.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/* 		Mohammad Ali Golkar
-		m.a.golkar@gmail.com
-		http://www.30minonline.com
-		LICENSE : GPLv2	*/
-$type='TrueTypeUnicode';
-$name='ZarBold';
-$desc=array('Ascent'=>733,'Descent'=>-317,'CapHeight'=>733,'Flags'=>32,'FontBBox'=>'[-126 -535 1164 1046]','ItalicAngle'=>0,'StemV'=>120,'MissingWidth'=>600);
-$up=-356;
-$ut=49;
-$dw=600;
-$cw=array(
-	0=>0,32=>227,33=>235,34=>282,35=>667,36=>458,37=>493,38=>635,39=>156,40=>303,41=>303,42=>489,43=>489,44=>237,45=>489,46=>231,47=>277,
-	48=>552,49=>552,50=>552,51=>552,52=>552,53=>552,54=>552,55=>552,56=>552,57=>552,58=>231,59=>237,60=>667,61=>489,62=>667,63=>448,
-	64=>917,65=>604,66=>542,67=>615,68=>708,69=>479,70=>427,71=>667,72=>688,73=>302,74=>292,75=>583,76=>469,77=>885,78=>677,79=>729,
-	80=>479,81=>729,82=>542,83=>448,84=>521,85=>677,86=>615,87=>969,88=>604,89=>583,90=>594,91=>208,92=>510,93=>208,94=>469,95=>500,
-	96=>333,97=>469,98=>510,99=>448,100=>521,101=>438,102=>313,103=>500,104=>552,105=>271,106=>260,107=>500,108=>271,109=>802,110=>552,111=>490,
-	112=>531,113=>521,114=>396,115=>365,116=>292,117=>552,118=>479,119=>750,120=>521,121=>469,122=>448,123=>479,124=>510,125=>479,126=>667,8218=>240,
-	402=>531,8222=>458,8230=>1000,8224=>438,8225=>438,710=>333,8240=>1010,352=>448,8249=>250,338=>865,8216=>240,8217=>240,8220=>317,8221=>317,8226=>281,8211=>500,
-	8212=>1000,8482=>906,353=>365,8250=>250,339=>823,376=>583,160=>244,161=>317,162=>448,163=>583,164=>500,165=>583,166=>200,167=>417,168=>333,169=>765,
-	170=>313,171=>417,172=>667,173=>564,174=>765,175=>333,176=>375,177=>462,178=>354,179=>354,180=>333,181=>510,182=>438,183=>198,184=>333,185=>354,
-	186=>323,187=>417,188=>854,189=>854,190=>854,191=>448,192=>604,711=>333,215=>462,224=>469,226=>469,231=>448,232=>438,233=>438,234=>438,235=>438,
-	238=>271,239=>271,244=>490,305=>271,247=>483,249=>552,251=>552,252=>552,255=>469,9249=>781,1548=>237,1563=>237,1567=>340,1569=>426,1570=>416,1571=>238,
-	1572=>429,1573=>260,1574=>817,1575=>238,1576=>853,1577=>439,1578=>853,1579=>853,1580=>720,1581=>720,1582=>720,1583=>485,1584=>485,1585=>423,1586=>423,1587=>1016,
-	1588=>1016,1589=>1128,1590=>1128,1591=>794,1592=>794,1593=>685,1594=>685,1600=>371,1601=>840,1602=>696,1603=>1148,1604=>744,1605=>514,1606=>686,1607=>439,1608=>429,
-	1609=>817,1610=>817,1611=>0,1612=>0,1613=>0,1614=>0,1615=>0,1616=>0,1617=>0,1618=>0,1632=>479,1633=>479,1634=>479,1635=>479,1636=>479,1637=>479,
-	1638=>479,1639=>479,1640=>479,1641=>483,1642=>493,1645=>563,1648=>227,1649=>363,1652=>227,1662=>853,1670=>720,1688=>423,1700=>840,1705=>1148,1711=>1149,1740=>817,
-	1749=>439,1764=>227,1776=>479,1777=>479,1778=>479,1779=>479,1780=>479,1781=>479,1782=>479,1783=>479,1784=>479,1785=>483,8204=>22,8205=>22,8206=>22,8207=>22,
-	59424=>227,59425=>227,59426=>227,59427=>227,59428=>227,59429=>227,59430=>227,59431=>227,59432=>227,59433=>227,59434=>227,59435=>227,59436=>227,59416=>227,59437=>227,59442=>227,
-	59443=>227,59444=>227,59445=>227,59446=>227,64336=>363,64337=>263,64342=>853,64343=>967,64344=>267,64345=>271,64362=>840,64363=>959,64364=>305,64365=>341,64378=>720,64379=>725,
-	64380=>630,64381=>652,64394=>423,64395=>450,64398=>1148,64399=>1089,64400=>522,64401=>461,64402=>1149,64403=>1084,64404=>525,64405=>462,64508=>817,64509=>784,64606=>227,64607=>227,
-	64608=>227,64609=>227,64610=>227,64754=>371,64755=>371,64756=>371,64828=>331,64829=>276,64830=>303,64831=>303,65010=>866,65136=>227,65137=>371,65138=>227,65140=>227,65142=>227,
-	65143=>371,65144=>227,65145=>371,65146=>227,65147=>371,65148=>227,65149=>371,65150=>227,65151=>371,65152=>426,65153=>416,65154=>354,65155=>238,65156=>282,65157=>429,65158=>507,
-	65159=>260,65160=>286,65161=>817,65162=>784,65163=>190,65164=>276,65165=>238,65166=>263,65167=>853,65168=>967,65169=>186,65170=>271,65171=>439,65172=>452,65173=>853,65174=>967,
-	65175=>256,65176=>271,65177=>853,65178=>967,65179=>267,65180=>271,65181=>720,65182=>725,65183=>630,65184=>652,65185=>720,65186=>725,65187=>630,65188=>652,65189=>720,65190=>725,
-	65191=>630,65192=>652,65193=>485,65194=>608,65195=>485,65196=>608,65197=>423,65198=>450,65199=>423,65200=>450,65201=>1016,65202=>1041,65203=>498,65204=>475,65205=>1016,65206=>1041,
-	65207=>498,65208=>475,65209=>1128,65210=>1150,65211=>633,65212=>655,65213=>1128,65214=>1150,65215=>633,65216=>655,65217=>794,65218=>814,65219=>566,65220=>588,65221=>794,65222=>814,
-	65223=>566,65224=>588,65225=>685,65226=>655,65227=>414,65228=>330,65229=>685,65230=>655,65231=>414,65232=>330,65233=>840,65234=>959,65235=>305,65236=>341,65237=>696,65238=>780,
-	65239=>305,65240=>341,65241=>1148,65242=>1089,65243=>522,65244=>461,65245=>744,65246=>741,65247=>202,65248=>259,65249=>514,65250=>585,65251=>345,65252=>477,65253=>686,65254=>764,
-	65255=>186,65256=>271,65257=>439,65258=>452,65259=>501,65260=>381,65261=>429,65262=>507,65263=>817,65264=>784,65265=>817,65266=>784,64510=>265,64511=>271,65269=>610,65270=>652,
-	65271=>539,65272=>611,65273=>539,65274=>611,65275=>539,65276=>611,65279=>0,64486=>408,64487=>408);
-$enc='';
-$diff='';
-$file='zarbold.z';
-$ctg='zarbold.ctg.z';
-$originalsize=73296;
-?>
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/htmlcolors.php b/html2pdf_v4.03/_tcpdf_5.0.002/htmlcolors.php
deleted file mode 100644
index dd59fe2c..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/htmlcolors.php
+++ /dev/null
@@ -1,210 +0,0 @@
-<?php
-//============================================================+
-// File name   : htmlcolors.php
-// Begin       : 2002-04-09
-// Last Update : 2010-04-20
-// Version     : 1.0.004
-// License     : GNU LGPL (http://www.gnu.org/copyleft/lesser.html)
-// 	----------------------------------------------------------------------------
-//  Copyright (C) 2002-2009  Nicola Asuni - Tecnick.com S.r.l.
-// 	
-// 	This program is free software: you can redistribute it and/or modify
-// 	it under the terms of the GNU Lesser General Public License as published by
-// 	the Free Software Foundation, either version 2.1 of the License, or
-// 	(at your option) any later version.
-// 	
-// 	This program is distributed in the hope that it will be useful,
-// 	but WITHOUT ANY WARRANTY; without even the implied warranty of
-// 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// 	GNU Lesser General Public License for more details.
-// 	
-// 	You should have received a copy of the GNU Lesser General Public License
-// 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-// 	
-// 	See LICENSE.TXT file for more information.
-//  ----------------------------------------------------------------------------
-//
-// Description : Array of WEB safe colors
-//
-// Author: Nicola Asuni
-//
-// (c) Copyright:
-//               Nicola Asuni
-//               Tecnick.com S.r.l.
-//               Via della Pace, 11
-//               09044 Quartucciu (CA)
-//               ITALY
-//               www.tecnick.com
-//               info@tecnick.com
-//============================================================+
-
-/**
- * Array of WEB safe colors.
- * @author Nicola Asuni
- * @copyright 2004-2009 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
- * @package com.tecnick.tcpdf
- * @link http://www.tcpdf.org
- * @license http://www.gnu.org/copyleft/lesser.html LGPL
- * @since 2.9.000 (2008-03-26)
-*/
-
-/**
- * Array of WEB safe colors
- */
-global $webcolor;
-$webcolor = array (
-'aliceblue' => 'f0f8ff',
-'antiquewhite' => 'faebd7',
-'aqua' => '00ffff',
-'aquamarine' => '7fffd4',
-'azure' => 'f0ffff',
-'beige' => 'f5f5dc',
-'bisque' => 'ffe4c4',
-'black' => '000000',
-'blanchedalmond' => 'ffebcd',
-'blue' => '0000ff',
-'blueviolet' => '8a2be2',
-'brown' => 'a52a2a',
-'burlywood' => 'deb887',
-'cadetblue' => '5f9ea0',
-'chartreuse' => '7fff00',
-'chocolate' => 'd2691e',
-'coral' => 'ff7f50',
-'cornflowerblue' => '6495ed',
-'cornsilk' => 'fff8dc',
-'crimson' => 'dc143c',
-'cyan' => '00ffff',
-'darkblue' => '00008b',
-'darkcyan' => '008b8b',
-'darkgoldenrod' => 'b8860b',
-'dkgray' => 'a9a9a9',
-'darkgray' => 'a9a9a9',
-'darkgrey' => 'a9a9a9',
-'darkgreen' => '006400',
-'darkkhaki' => 'bdb76b',
-'darkmagenta' => '8b008b',
-'darkolivegreen' => '556b2f',
-'darkorange' => 'ff8c00',
-'darkorchid' => '9932cc',
-'darkred' => '8b0000',
-'darksalmon' => 'e9967a',
-'darkseagreen' => '8fbc8f',
-'darkslateblue' => '483d8b',
-'darkslategray' => '2f4f4f',
-'darkslategrey' => '2f4f4f',
-'darkturquoise' => '00ced1',
-'darkviolet' => '9400d3',
-'deeppink' => 'ff1493',
-'deepskyblue' => '00bfff',
-'dimgray' => '696969',
-'dimgrey' => '696969',
-'dodgerblue' => '1e90ff',
-'firebrick' => 'b22222',
-'floralwhite' => 'fffaf0',
-'forestgreen' => '228b22',
-'fuchsia' => 'ff00ff',
-'gainsboro' => 'dcdcdc',
-'ghostwhite' => 'f8f8ff',
-'gold' => 'ffd700',
-'goldenrod' => 'daa520',
-'gray' => '808080',
-'grey' => '808080',
-'green' => '008000',
-'greenyellow' => 'adff2f',
-'honeydew' => 'f0fff0',
-'hotpink' => 'ff69b4',
-'indianred' => 'cd5c5c',
-'indigo' => '4b0082',
-'ivory' => 'fffff0',
-'khaki' => 'f0e68c',
-'lavender' => 'e6e6fa',
-'lavenderblush' => 'fff0f5',
-'lawngreen' => '7cfc00',
-'lemonchiffon' => 'fffacd',
-'lightblue' => 'add8e6',
-'lightcoral' => 'f08080',
-'lightcyan' => 'e0ffff',
-'lightgoldenrodyellow' => 'fafad2',
-'ltgray' => 'd3d3d3',
-'lightgray' => 'd3d3d3',
-'lightgrey' => 'd3d3d3',
-'lightgreen' => '90ee90',
-'lightpink' => 'ffb6c1',
-'lightsalmon' => 'ffa07a',
-'lightseagreen' => '20b2aa',
-'lightskyblue' => '87cefa',
-'lightslategray' => '778899',
-'lightslategrey' => '778899',
-'lightsteelblue' => 'b0c4de',
-'lightyellow' => 'ffffe0',
-'lime' => '00ff00',
-'limegreen' => '32cd32',
-'linen' => 'faf0e6',
-'magenta' => 'ff00ff',
-'maroon' => '800000',
-'mediumaquamarine' => '66cdaa',
-'mediumblue' => '0000cd',
-'mediumorchid' => 'ba55d3',
-'mediumpurple' => '9370d8',
-'mediumseagreen' => '3cb371',
-'mediumslateblue' => '7b68ee',
-'mediumspringgreen' => '00fa9a',
-'mediumturquoise' => '48d1cc',
-'mediumvioletred' => 'c71585',
-'midnightblue' => '191970',
-'mintcream' => 'f5fffa',
-'mistyrose' => 'ffe4e1',
-'moccasin' => 'ffe4b5',
-'navajowhite' => 'ffdead',
-'navy' => '000080',
-'oldlace' => 'fdf5e6',
-'olive' => '808000',
-'olivedrab' => '6b8e23',
-'orange' => 'ffa500',
-'orangered' => 'ff4500',
-'orchid' => 'da70d6',
-'palegoldenrod' => 'eee8aa',
-'palegreen' => '98fb98',
-'paleturquoise' => 'afeeee',
-'palevioletred' => 'd87093',
-'papayawhip' => 'ffefd5',
-'peachpuff' => 'ffdab9',
-'peru' => 'cd853f',
-'pink' => 'ffc0cb',
-'plum' => 'dda0dd',
-'powderblue' => 'b0e0e6',
-'purple' => '800080',
-'red' => 'ff0000',
-'rosybrown' => 'bc8f8f',
-'royalblue' => '4169e1',
-'saddlebrown' => '8b4513',
-'salmon' => 'fa8072',
-'sandybrown' => 'f4a460',
-'seagreen' => '2e8b57',
-'seashell' => 'fff5ee',
-'sienna' => 'a0522d',
-'silver' => 'c0c0c0',
-'skyblue' => '87ceeb',
-'slateblue' => '6a5acd',
-'slategray' => '708090',
-'slategrey' => '708090',
-'snow' => 'fffafa',
-'springgreen' => '00ff7f',
-'steelblue' => '4682b4',
-'tan' => 'd2b48c',
-'teal' => '008080',
-'thistle' => 'd8bfd8',
-'tomato' => 'ff6347',
-'turquoise' => '40e0d0',
-'violet' => 'ee82ee',
-'wheat' => 'f5deb3',
-'white' => 'ffffff',
-'whitesmoke' => 'f5f5f5',
-'yellow' => 'ffff00',
-'yellowgreen' => '9acd32'
-);
-
-//============================================================+
-// END OF FILE                                                 
-//============================================================+
-?>
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/images/read_me.txt b/html2pdf_v4.03/_tcpdf_5.0.002/images/read_me.txt
deleted file mode 100644
index 31cc6a2c..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/images/read_me.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-download the TCPDF package to have this resources.
-
-it has been removed because of the size of the package of HTML2PDF... 
\ No newline at end of file
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/qrcode.php b/html2pdf_v4.03/_tcpdf_5.0.002/qrcode.php
deleted file mode 100644
index 5879ff42..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/qrcode.php
+++ /dev/null
@@ -1,2875 +0,0 @@
-<?php
-//============================================================+
-// File name   : qrcode.php
-// Begin       : 2010-03-22
-// Last Update : 2010-03-30
-// Version     : 1.0.003
-// License     : GNU LGPL v.3 (http://www.gnu.org/copyleft/lesser.html)
-// 	----------------------------------------------------------------------------
-//
-// 	This library is free software; you can redistribute it and/or
-// 	modify it under the terms of the GNU Lesser General Public
-// 	License as published by the Free Software Foundation; either
-// 	version 3 of the License, or any later version.
-//
-// 	This library is distributed in the hope that it will be useful,
-// 	but WITHOUT ANY WARRANTY; without even the implied warranty of
-// 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// 	Lesser General Public License for more details.
-//
-// 	You should have received a copy of the GNU Lesser General Public
-// 	License along with this library; if not, write to the Free Software
-// 	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-//  or browse http://www.gnu.org/copyleft/lesser.html
-//
-//  ----------------------------------------------------------------------------
-//
-// DESCRIPTION :
-//
-// Class to create QR-code arrays for TCPDF class.
-// QR Code symbol is a 2D barcode that can be scanned by
-// handy terminals such as a mobile phone with CCD.
-// The capacity of QR Code is up to 7000 digits or 4000
-// characters, and has high robustness.
-// This class supports QR Code model 2, described in
-// JIS (Japanese Industrial Standards) X0510:2004
-// or ISO/IEC 18004.
-// Currently the following features are not supported:
-// ECI and FNC1 mode, Micro QR Code, QR Code model 1,
-// Structured mode.
-//
-// This class is derived from the following projects:
-// ---------------------------------------------------------
-// "PHP QR Code encoder"
-// License: GNU-LGPLv3
-// Copyright (C) 2010 by Dominik Dzienia <deltalab at poczta dot fm>
-// http://phpqrcode.sourceforge.net/
-// https://sourceforge.net/projects/phpqrcode/
-//
-// The "PHP QR Code encoder" is based on
-// "C libqrencode library" (ver. 3.1.1)
-// License: GNU-LGPL 2.1
-// Copyright (C) 2006-2010 by Kentaro Fukuchi
-// http://megaui.net/fukuchi/works/qrencode/index.en.html
-//
-// Reed-Solomon code encoder is written by Phil Karn, KA9Q.
-// Copyright (C) 2002-2006 Phil Karn, KA9Q
-//
-// QR Code is registered trademark of DENSO WAVE INCORPORATED
-// http://www.denso-wave.com/qrcode/index-e.html
-// ---------------------------------------------------------
-//
-// Author: Nicola Asuni
-//
-// (c) Copyright 2010:
-//               Nicola Asuni
-//               Tecnick.com S.r.l.
-//               Via della Pace, 11
-//               09044 Quartucciu (CA)
-//               ITALY
-//               www.tecnick.com
-//               info@tecnick.com
-//============================================================+
-
-/**
- * Class to create QR-code arrays for TCPDF class.
- * QR Code symbol is a 2D barcode that can be scanned by handy terminals such as a mobile phone with CCD.
- * The capacity of QR Code is up to 7000 digits or 4000 characters, and has high robustness.
- * This class supports QR Code model 2, described in JIS (Japanese Industrial Standards) X0510:2004 or ISO/IEC 18004.
- * Currently the following features are not supported: ECI and FNC1 mode, Micro QR Code, QR Code model 1, Structured mode.
- *
- * This class is derived from "PHP QR Code encoder" by Dominik Dzienia (http://phpqrcode.sourceforge.net/) based on "libqrencode C library 3.1.1." by Kentaro Fukuchi (http://megaui.net/fukuchi/works/qrencode/index.en.html), contains Reed-Solomon code written by Phil Karn, KA9Q. QR Code is registered trademark of DENSO WAVE INCORPORATED (http://www.denso-wave.com/qrcode/index-e.html).
- * Please read comments on this class source file for full copyright and license information.
- *
- * @package com.tecnick.tcpdf
- * @abstract Class for generating QR-code array for TCPDF.
- * @author Nicola Asuni
- * @copyright 2010 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
- * @link http://www.tcpdf.org
- * @license http://www.gnu.org/copyleft/lesser.html LGPL
- * @version 1.0.003
- */
-
-// definitions
-if (!defined('QRCODEDEFS')) {
-
-	/**
-	 * Indicate that definitions for this class are set
-	 */
-	define('QRCODEDEFS', true);
-
-	// -----------------------------------------------------
-
-	// Encoding modes (characters which can be encoded in QRcode)
-
-	/**
-	 * Encoding mode
-	 */
-	define('QR_MODE_NL', -1);
-
-	/**
-	 * Encoding mode numeric (0-9). 3 characters are encoded to 10bit length. In theory, 7089 characters or less can be stored in a QRcode.
-	 */
-	define('QR_MODE_NM', 0);
-
-	/**
-	 * Encoding mode alphanumeric (0-9A-Z $%*+-./:) 45characters. 2 characters are encoded to 11bit length. In theory, 4296 characters or less can be stored in a QRcode.
-	 */
-	define('QR_MODE_AN', 1);
-
-	/**
-	 * Encoding mode 8bit byte data. In theory, 2953 characters or less can be stored in a QRcode.
-	 */
-	define('QR_MODE_8B', 2);
-
-	/**
-	 * Encoding mode KANJI. A KANJI character (multibyte character) is encoded to 13bit length. In theory, 1817 characters or less can be stored in a QRcode.
-	 */
-	define('QR_MODE_KJ', 3);
-
-	/**
-	 * Encoding mode STRUCTURED (currently unsupported)
-	 */
-	define('QR_MODE_ST', 4);
-
-	// -----------------------------------------------------
-
-	// Levels of error correction.
-	// QRcode has a function of an error correcting for miss reading that white is black.
-	// Error correcting is defined in 4 level as below.
-
-	/**
-	 * Error correction level L : About 7% or less errors can be corrected.
-	 */
-	define('QR_ECLEVEL_L', 0);
-
-	/**
-	 * Error correction level M : About 15% or less errors can be corrected.
-	 */
-	define('QR_ECLEVEL_M', 1);
-
-	/**
-	 * Error correction level Q : About 25% or less errors can be corrected.
-	 */
-	define('QR_ECLEVEL_Q', 2);
-
-	/**
-	 * Error correction level H : About 30% or less errors can be corrected.
-	 */
-	define('QR_ECLEVEL_H', 3);
-
-	// -----------------------------------------------------
-
-	// Version. Size of QRcode is defined as version.
-	// Version is from 1 to 40.
-	// Version 1 is 21*21 matrix. And 4 modules increases whenever 1 version increases.
-	// So version 40 is 177*177 matrix.
-
-	/**
-	 * Maximum QR Code version.
-	 */
-	define('QRSPEC_VERSION_MAX', 40);
-
-	/**
-	 * Maximum matrix size for maximum version (version 40 is 177*177 matrix).
-	 */
-    define('QRSPEC_WIDTH_MAX', 177);
-
-	// -----------------------------------------------------
-
-	/**
-	 * Matrix index to get width from $capacity array.
-	 */
-    define('QRCAP_WIDTH',    0);
-
-    /**
-	 * Matrix index to get number of words from $capacity array.
-	 */
-    define('QRCAP_WORDS',    1);
-
-    /**
-	 * Matrix index to get remainder from $capacity array.
-	 */
-    define('QRCAP_REMINDER', 2);
-
-    /**
-	 * Matrix index to get error correction level from $capacity array.
-	 */
-    define('QRCAP_EC',       3);
-
-	// -----------------------------------------------------
-
-	// Structure (currently usupported)
-
-	/**
-	 * Number of header bits for structured mode
-	 */
-    define('STRUCTURE_HEADER_BITS',  20);
-
-    /**
-	 * Max number of symbols for structured mode
-	 */
-    define('MAX_STRUCTURED_SYMBOLS', 16);
-
-	// -----------------------------------------------------
-
-    // Masks
-
-    /**
-	 * Down point base value for case 1 mask pattern (concatenation of same color in a line or a column)
-	 */
-    define('N1',  3);
-
-    /**
-	 * Down point base value for case 2 mask pattern (module block of same color)
-	 */
-	define('N2',  3);
-
-    /**
-	 * Down point base value for case 3 mask pattern (1:1:3:1:1(dark:bright:dark:bright:dark)pattern in a line or a column)
-	 */
-	define('N3', 40);
-
-    /**
-	 * Down point base value for case 4 mask pattern (ration of dark modules in whole)
-	 */
-	define('N4', 10);
-
-	// -----------------------------------------------------
-
-	// Optimization settings
-
-	/**
-	 * if true, estimates best mask (spec. default, but extremally slow; set to false to significant performance boost but (propably) worst quality code
-	 */
-	define('QR_FIND_BEST_MASK', true);
-
-	/**
-	 * if false, checks all masks available, otherwise value tells count of masks need to be checked, mask id are got randomly
-	 */
-	define('QR_FIND_FROM_RANDOM', 2);
-
-	/**
-	 * when QR_FIND_BEST_MASK === false
-	 */
-	define('QR_DEFAULT_MASK', 2);
-
-	// -----------------------------------------------------
-
-} // end of definitions
-
-// #*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#
-
-if (!class_exists('QRcode', false)) {
-
-	// for compaibility with PHP4
-	if (!function_exists('str_split')) {
-    	/**
-    	 * Convert a string to an array (needed for PHP4 compatibility)
-    	 * @param string $string The input string.
-    	 * @param int $split_length Maximum length of the chunk.
-    	 * @return  If the optional split_length  parameter is specified, the returned array will be broken down into chunks with each being split_length  in length, otherwise each chunk will be one character in length. FALSE is returned if split_length is less than 1. If the split_length length exceeds the length of string , the entire string is returned as the first (and only) array element.
-    	 */
-		function str_split($string, $split_length=1) {
-			if ((strlen($string) > $split_length) OR (!$split_length)) {
-				do {
-					$c = strlen($string);
-					$parts[] = substr($string, 0, $split_length);
-					$string = substr($string, $split_length);
-				} while ($string !== false);
-			} else {
-				$parts = array($string);
-			}
-			return $parts;
-		}
-	}
-
-	// #####################################################
-
-	/**
-	 * Class to create QR-code arrays for TCPDF class.
-	 * QR Code symbol is a 2D barcode that can be scanned by handy terminals such as a mobile phone with CCD.
-	 * The capacity of QR Code is up to 7000 digits or 4000 characters, and has high robustness.
-	 * This class supports QR Code model 2, described in JIS (Japanese Industrial Standards) X0510:2004 or ISO/IEC 18004.
-	 * Currently the following features are not supported: ECI and FNC1 mode, Micro QR Code, QR Code model 1, Structured mode.
-	 *
-	 * This class is derived from "PHP QR Code encoder" by Dominik Dzienia (http://phpqrcode.sourceforge.net/) based on "libqrencode C library 3.1.1." by Kentaro Fukuchi (http://megaui.net/fukuchi/works/qrencode/index.en.html), contains Reed-Solomon code written by Phil Karn, KA9Q. QR Code is registered trademark of DENSO WAVE INCORPORATED (http://www.denso-wave.com/qrcode/index-e.html).
-	 * Please read comments on this class source file for full copyright and license information.
-	 *
-	 * @name QRcode
-	 * @package com.tecnick.tcpdf
-	 * @abstract Class for generating QR-code array for TCPDF.
-	 * @author Nicola Asuni
-	 * @copyright 2010 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
-	 * @link http://www.tcpdf.org
-	 * @license http://www.gnu.org/copyleft/lesser.html LGPL
-	 * @version 1.0.002
-	 */
-	class QRcode {
-
-		/**
-		 * @var barcode array to be returned which is readable by TCPDF
-		 * @access protected
-		 */
-		protected $barcode_array = array();
-
-		/**
-		 * @var QR code version. Size of QRcode is defined as version. Version is from 1 to 40. Version 1 is 21*21 matrix. And 4 modules increases whenever 1 version increases. So version 40 is 177*177 matrix.
-		 * @access protected
-		 */
-		protected $version = 0;
-
-		/**
-		 * @var Levels of error correction. See definitions for possible values.
-		 * @access protected
-		 */
-		protected $level = QR_ECLEVEL_L;
-
-		/**
-		 * @var Encoding mode
-		 * @access protected
-		 */
-		protected $hint = QR_MODE_8B;
-
-		/**
-		 * @var if true the input string will be converted to uppercase
-		 * @access protected
-		 */
-		protected $casesensitive = true;
-
-		/**
-		 * @var structured QR code (not supported yet)
-		 * @access protected
-		 */
-		protected $structured = 0;
-
-		/**
-		 * @var mask data
-		 * @access protected
-		 */
-		protected $data;
-
-		// FrameFiller
-
-		/**
-		 * @var width
-		 * @access protected
-		 */
-		protected $width;
-
-		/**
-		 * @var frame
-		 * @access protected
-		 */
-		protected $frame;
-
-		/**
-		 * @var X position of bit
-		 * @access protected
-		 */
-		protected $x;
-
-		/**
-		 * @var Y position of bit
-		 * @access protected
-		 */
-		protected $y;
-
-		/**
-		 * @var direction
-		 * @access protected
-		 */
-		protected $dir;
-
-		/**
-		 * @var single bit
-		 * @access protected
-		 */
-		protected $bit;
-
-		// ---- QRrawcode ----
-
-		/**
-		 * @var data code
-		 * @access protected
-		 */
-		protected $datacode = array();
-
-		/**
-		 * @var error correction code
-		 * @access protected
-		 */
-		protected $ecccode = array();
-
-		/**
-		 * @var blocks
-		 * @access protected
-		 */
-		protected $blocks;
-
-		/**
-		 * @var Reed-Solomon blocks
-		 * @access protected
-		 */
-		protected $rsblocks = array(); //of RSblock
-
-		/**
-		 * @var counter
-		 * @access protected
-		 */
-		protected $count;
-
-		/**
-		 * @var data length
-		 * @access protected
-		 */
-		protected $dataLength;
-
-		/**
-		 * @var error correction length
-		 * @access protected
-		 */
-		protected $eccLength;
-
-		/**
-		 * @var b1
-		 * @access protected
-		 */
-		protected $b1;
-
-		// ---- QRmask ----
-
-		/**
-		 * @var run length
-		 * @access protected
-		 */
-		protected $runLength = array();
-
-		// ---- QRsplit ----
-
-		/**
-		 * @var input data string
-		 * @access protected
-		 */
-		protected $dataStr = '';
-
-		/**
-		 * @var input items
-		 * @access protected
-		 */
-		protected $items;
-
-		// Reed-Solomon items
-
-		/**
-		 * @var Reed-Solomon items
-		 * @access protected
-		 */
-		protected $rsitems = array();
-
-		/**
-		 * @var array of frames
-		 * @access protected
-		 */
-		protected $frames = array();
-
-		/**
-		 * @var alphabet-numeric convesion table
-		 * @access protected
-		 */
-		protected $anTable = array(
-			-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, //
-			-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, //
-			36, -1, -1, -1, 37, 38, -1, -1, -1, -1, 39, 40, -1, 41, 42, 43, //
-			 0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 44, -1, -1, -1, -1, -1, //
-			-1, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, //
-			25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, -1, -1, -1, -1, -1, //
-			-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, //
-			-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1  //
-			);
-
-		/**
-		 * @var array Table of the capacity of symbols
-		 * See Table 1 (pp.13) and Table 12-16 (pp.30-36), JIS X0510:2004.
-		 * @access protected
-		 */
-		protected $capacity = array(
-			array(  0,    0, 0, array(   0,    0,    0,    0)), //
-			array( 21,   26, 0, array(   7,   10,   13,   17)), //  1
-			array( 25,   44, 7, array(  10,   16,   22,   28)), //
-			array( 29,   70, 7, array(  15,   26,   36,   44)), //
-			array( 33,  100, 7, array(  20,   36,   52,   64)), //
-			array( 37,  134, 7, array(  26,   48,   72,   88)), //  5
-			array( 41,  172, 7, array(  36,   64,   96,  112)), //
-			array( 45,  196, 0, array(  40,   72,  108,  130)), //
-			array( 49,  242, 0, array(  48,   88,  132,  156)), //
-			array( 53,  292, 0, array(  60,  110,  160,  192)), //
-			array( 57,  346, 0, array(  72,  130,  192,  224)), // 10
-			array( 61,  404, 0, array(  80,  150,  224,  264)), //
-			array( 65,  466, 0, array(  96,  176,  260,  308)), //
-			array( 69,  532, 0, array( 104,  198,  288,  352)), //
-			array( 73,  581, 3, array( 120,  216,  320,  384)), //
-			array( 77,  655, 3, array( 132,  240,  360,  432)), // 15
-			array( 81,  733, 3, array( 144,  280,  408,  480)), //
-			array( 85,  815, 3, array( 168,  308,  448,  532)), //
-			array( 89,  901, 3, array( 180,  338,  504,  588)), //
-			array( 93,  991, 3, array( 196,  364,  546,  650)), //
-			array( 97, 1085, 3, array( 224,  416,  600,  700)), // 20
-			array(101, 1156, 4, array( 224,  442,  644,  750)), //
-			array(105, 1258, 4, array( 252,  476,  690,  816)), //
-			array(109, 1364, 4, array( 270,  504,  750,  900)), //
-			array(113, 1474, 4, array( 300,  560,  810,  960)), //
-			array(117, 1588, 4, array( 312,  588,  870, 1050)), // 25
-			array(121, 1706, 4, array( 336,  644,  952, 1110)), //
-			array(125, 1828, 4, array( 360,  700, 1020, 1200)), //
-			array(129, 1921, 3, array( 390,  728, 1050, 1260)), //
-			array(133, 2051, 3, array( 420,  784, 1140, 1350)), //
-			array(137, 2185, 3, array( 450,  812, 1200, 1440)), // 30
-			array(141, 2323, 3, array( 480,  868, 1290, 1530)), //
-			array(145, 2465, 3, array( 510,  924, 1350, 1620)), //
-			array(149, 2611, 3, array( 540,  980, 1440, 1710)), //
-			array(153, 2761, 3, array( 570, 1036, 1530, 1800)), //
-			array(157, 2876, 0, array( 570, 1064, 1590, 1890)), // 35
-			array(161, 3034, 0, array( 600, 1120, 1680, 1980)), //
-			array(165, 3196, 0, array( 630, 1204, 1770, 2100)), //
-			array(169, 3362, 0, array( 660, 1260, 1860, 2220)), //
-			array(173, 3532, 0, array( 720, 1316, 1950, 2310)), //
-			array(177, 3706, 0, array( 750, 1372, 2040, 2430))  // 40
-		);
-
-		/**
-		 * @var array Length indicator
-		 * @access protected
-		 */
-		protected $lengthTableBits = array(
-			array(10, 12, 14),
-			array( 9, 11, 13),
-			array( 8, 16, 16),
-			array( 8, 10, 12)
-		);
-
-		/**
-		 * @var array Table of the error correction code (Reed-Solomon block)
-		 * See Table 12-16 (pp.30-36), JIS X0510:2004.
-		 * @access protected
-		 */
-		protected $eccTable = array(
-			array(array( 0,  0), array( 0,  0), array( 0,  0), array( 0,  0)), //
-			array(array( 1,  0), array( 1,  0), array( 1,  0), array( 1,  0)), //  1
-			array(array( 1,  0), array( 1,  0), array( 1,  0), array( 1,  0)), //
-			array(array( 1,  0), array( 1,  0), array( 2,  0), array( 2,  0)), //
-			array(array( 1,  0), array( 2,  0), array( 2,  0), array( 4,  0)), //
-			array(array( 1,  0), array( 2,  0), array( 2,  2), array( 2,  2)), //  5
-			array(array( 2,  0), array( 4,  0), array( 4,  0), array( 4,  0)), //
-			array(array( 2,  0), array( 4,  0), array( 2,  4), array( 4,  1)), //
-			array(array( 2,  0), array( 2,  2), array( 4,  2), array( 4,  2)), //
-			array(array( 2,  0), array( 3,  2), array( 4,  4), array( 4,  4)), //
-			array(array( 2,  2), array( 4,  1), array( 6,  2), array( 6,  2)), // 10
-			array(array( 4,  0), array( 1,  4), array( 4,  4), array( 3,  8)), //
-			array(array( 2,  2), array( 6,  2), array( 4,  6), array( 7,  4)), //
-			array(array( 4,  0), array( 8,  1), array( 8,  4), array(12,  4)), //
-			array(array( 3,  1), array( 4,  5), array(11,  5), array(11,  5)), //
-			array(array( 5,  1), array( 5,  5), array( 5,  7), array(11,  7)), // 15
-			array(array( 5,  1), array( 7,  3), array(15,  2), array( 3, 13)), //
-			array(array( 1,  5), array(10,  1), array( 1, 15), array( 2, 17)), //
-			array(array( 5,  1), array( 9,  4), array(17,  1), array( 2, 19)), //
-			array(array( 3,  4), array( 3, 11), array(17,  4), array( 9, 16)), //
-			array(array( 3,  5), array( 3, 13), array(15,  5), array(15, 10)), // 20
-			array(array( 4,  4), array(17,  0), array(17,  6), array(19,  6)), //
-			array(array( 2,  7), array(17,  0), array( 7, 16), array(34,  0)), //
-			array(array( 4,  5), array( 4, 14), array(11, 14), array(16, 14)), //
-			array(array( 6,  4), array( 6, 14), array(11, 16), array(30,  2)), //
-			array(array( 8,  4), array( 8, 13), array( 7, 22), array(22, 13)), // 25
-			array(array(10,  2), array(19,  4), array(28,  6), array(33,  4)), //
-			array(array( 8,  4), array(22,  3), array( 8, 26), array(12, 28)), //
-			array(array( 3, 10), array( 3, 23), array( 4, 31), array(11, 31)), //
-			array(array( 7,  7), array(21,  7), array( 1, 37), array(19, 26)), //
-			array(array( 5, 10), array(19, 10), array(15, 25), array(23, 25)), // 30
-			array(array(13,  3), array( 2, 29), array(42,  1), array(23, 28)), //
-			array(array(17,  0), array(10, 23), array(10, 35), array(19, 35)), //
-			array(array(17,  1), array(14, 21), array(29, 19), array(11, 46)), //
-			array(array(13,  6), array(14, 23), array(44,  7), array(59,  1)), //
-			array(array(12,  7), array(12, 26), array(39, 14), array(22, 41)), // 35
-			array(array( 6, 14), array( 6, 34), array(46, 10), array( 2, 64)), //
-			array(array(17,  4), array(29, 14), array(49, 10), array(24, 46)), //
-			array(array( 4, 18), array(13, 32), array(48, 14), array(42, 32)), //
-			array(array(20,  4), array(40,  7), array(43, 22), array(10, 67)), //
-			array(array(19,  6), array(18, 31), array(34, 34), array(20, 61))  // 40
-		);
-
-		/**
-		 * @var array Positions of alignment patterns.
-		 * This array includes only the second and the third position of the alignment patterns. Rest of them can be calculated from the distance between them.
-		 * See Table 1 in Appendix E (pp.71) of JIS X0510:2004.
-		 * @access protected
-		 */
-		protected $alignmentPattern = array(
-			array( 0,  0),
-			array( 0,  0), array(18,  0), array(22,  0), array(26,  0), array(30,  0), //  1- 5
-			array(34,  0), array(22, 38), array(24, 42), array(26, 46), array(28, 50), //  6-10
-			array(30, 54), array(32, 58), array(34, 62), array(26, 46), array(26, 48), // 11-15
-			array(26, 50), array(30, 54), array(30, 56), array(30, 58), array(34, 62), // 16-20
-			array(28, 50), array(26, 50), array(30, 54), array(28, 54), array(32, 58), // 21-25
-			array(30, 58), array(34, 62), array(26, 50), array(30, 54), array(26, 52), // 26-30
-			array(30, 56), array(34, 60), array(30, 58), array(34, 62), array(30, 54), // 31-35
-			array(24, 50), array(28, 54), array(32, 58), array(26, 54), array(30, 58)  // 35-40
-		);
-
-		/**
-		 * @var array Version information pattern (BCH coded).
-		 * See Table 1 in Appendix D (pp.68) of JIS X0510:2004.
-		 * size: [QRSPEC_VERSION_MAX - 6]
-		 * @access protected
-		 */
-		protected $versionPattern = array(
-			0x07c94, 0x085bc, 0x09a99, 0x0a4d3, 0x0bbf6, 0x0c762, 0x0d847, 0x0e60d, //
-			0x0f928, 0x10b78, 0x1145d, 0x12a17, 0x13532, 0x149a6, 0x15683, 0x168c9, //
-			0x177ec, 0x18ec4, 0x191e1, 0x1afab, 0x1b08e, 0x1cc1a, 0x1d33f, 0x1ed75, //
-			0x1f250, 0x209d5, 0x216f0, 0x228ba, 0x2379f, 0x24b0b, 0x2542e, 0x26a64, //
-			0x27541, 0x28c69
-		);
-
-		/**
-		 * @var array Format information
-		 * @access protected
-		 */
-		protected $formatInfo = array(
-			array(0x77c4, 0x72f3, 0x7daa, 0x789d, 0x662f, 0x6318, 0x6c41, 0x6976), //
-			array(0x5412, 0x5125, 0x5e7c, 0x5b4b, 0x45f9, 0x40ce, 0x4f97, 0x4aa0), //
-			array(0x355f, 0x3068, 0x3f31, 0x3a06, 0x24b4, 0x2183, 0x2eda, 0x2bed), //
-			array(0x1689, 0x13be, 0x1ce7, 0x19d0, 0x0762, 0x0255, 0x0d0c, 0x083b)  //
-		);
-
-
-		// -------------------------------------------------
-		// -------------------------------------------------
-
-
-		/**
-		 * This is the class constructor.
-		 * Creates a QRcode object
-		 * @param string $code code to represent using QRcode
-		 * @param string $eclevel error level: <ul><li>L : About 7% or less errors can be corrected.</li><li>M : About 15% or less errors can be corrected.</li><li>Q : About 25% or less errors can be corrected.</li><li>H : About 30% or less errors can be corrected.</li></ul>
-		 * @access public
-		 * @since 1.0.000
-		 */
-		public function __construct($code, $eclevel = 'L') {
-			$barcode_array = array();
-			if ((is_null($code)) OR ($code == '\0') OR ($code == '')) {
-				return false;
-			}
-			// set error correction level
-			$this->level = array_search($eclevel, array('L', 'M', 'Q', 'H'));
-			if ($this->level === false) {
-				$this->level = QR_ECLEVEL_L;
-			}
-			if (($this->hint != QR_MODE_8B) AND ($this->hint != QR_MODE_KJ)) {
-				return false;
-			}
-			if (($this->version < 0) OR ($this->version > QRSPEC_VERSION_MAX)) {
-				return false;
-			}
-			$this->items = array();
-			$this->encodeString($code);
-			$qrTab = $this->binarize($this->data);
-			$size = count($qrTab);
-			$barcode_array['num_rows'] = $size;
-			$barcode_array['num_cols'] = $size;
-			$barcode_array['bcode'] = array();
-			foreach ($qrTab as $line) {
-				$arrAdd = array();
-				foreach (str_split($line) as $char) {
-					$arrAdd[] = ($char=='1')?1:0;
-				}
-				$barcode_array['bcode'][] = $arrAdd;
-			}
-			$this->barcode_array = $barcode_array;
-		}
-
-		/**
-		 * Returns a barcode array which is readable by TCPDF
-		 * @return array barcode array readable by TCPDF;
-		 * @access public
-		 */
-		public function getBarcodeArray() {
-			return $this->barcode_array;
-		}
-
-		/**
-		 * Convert the frame in binary form
-		 * @param array $frame array to binarize
-		 * @return array frame in binary form
-		 */
-		protected function binarize($frame) {
-			$len = count($frame);
-			// the frame is square (width = height)
-			foreach ($frame as &$frameLine) {
-				for ($i=0; $i<$len; $i++) {
-					$frameLine[$i] = (ord($frameLine[$i])&1)?'1':'0';
-				}
-			}
-			return $frame;
-		}
-
-		/**
-		 * Encode the input string to QR code
-		 * @param string $string input string to encode
-		 */
-		protected function encodeString($string) {
-			$this->dataStr = $string;
-			if (!$this->casesensitive) {
-				$this->toUpper();
-			}
-			$ret = $this->splitString();
-			if ($ret < 0) {
-				return NULL;
-			}
-			$this->encodeMask(-1);
-		}
-
-		/**
-		 * Encode mask
-		 * @param int $mask masking mode
-		 */
-		protected function encodeMask($mask) {
-			$spec = array(0, 0, 0, 0, 0);
-			$this->datacode = $this->getByteStream($this->items);
-			if (is_null($this->datacode)) {
-				return NULL;
-			}
-			$spec = $this->getEccSpec($this->version, $this->level, $spec);
-			$this->b1 = $this->rsBlockNum1($spec);
-			$this->dataLength = $this->rsDataLength($spec);
-			$this->eccLength = $this->rsEccLength($spec);
-			$this->ecccode = array_fill(0, $this->eccLength, 0);
-			$this->blocks = $this->rsBlockNum($spec);
-			$ret = $this->init($spec);
-			if ($ret < 0) {
-				return NULL;
-			}
-			$this->count = 0;
-			$this->width = $this->getWidth($this->version);
-			$this->frame = $this->newFrame($this->version);
-			$this->x = $this->width - 1;
-			$this->y = $this->width - 1;
-			$this->dir = -1;
-			$this->bit = -1;
-			// inteleaved data and ecc codes
-			for ($i=0; $i < ($this->dataLength + $this->eccLength); $i++) {
-				$code = $this->getCode();
-				$bit = 0x80;
-				for ($j=0; $j<8; $j++) {
-					$addr = $this->getNextPosition();
-					$this->setFrameAt($addr, 0x02 | (($bit & $code) != 0));
-					$bit = $bit >> 1;
-				}
-			}
-			// remainder bits
-			$j = $this->getRemainder($this->version);
-			for ($i=0; $i<$j; $i++) {
-				$addr = $this->getNextPosition();
-				$this->setFrameAt($addr, 0x02);
-			}
-			// masking
-			$this->runLength = array_fill(0, QRSPEC_WIDTH_MAX + 1, 0);
-			if ($mask < 0) {
-				if (QR_FIND_BEST_MASK) {
-					$masked = $this->mask($this->width, $this->frame, $this->level);
-				} else {
-					$masked = $this->makeMask($this->width, $this->frame, (intval(QR_DEFAULT_MASK) % 8), $this->level);
-				}
-			} else {
-				$masked = $this->makeMask($this->width, $this->frame, $mask, $this->level);
-			}
-			if ($masked == NULL) {
-				return NULL;
-			}
-			$this->data = $masked;
-		}
-
-		// - - - - - - - - - - - - - - - - - - - - - - - - -
-
-		// FrameFiller
-
-		/**
-		 * Set frame value at specified position
-		 * @param array $at x,y position
-		 * @param int $val value of the character to set
-		 */
-		protected function setFrameAt($at, $val) {
-			$this->frame[$at['y']][$at['x']] = chr($val);
-		}
-
-		/**
-		 * Get frame value at specified position
-		 * @param array $at x,y position
-		 * @return value at specified position
-		 */
-		protected function getFrameAt($at) {
-			return ord($this->frame[$at['y']][$at['x']]);
-		}
-
-		/**
-		 * Return the next frame position
-		 * @return array of x,y coordinates
-		 */
-		protected function getNextPosition() {
-			do {
-				if ($this->bit == -1) {
-					$this->bit = 0;
-					return array('x'=>$this->x, 'y'=>$this->y);
-				}
-				$x = $this->x;
-				$y = $this->y;
-				$w = $this->width;
-				if ($this->bit == 0) {
-					$x--;
-					$this->bit++;
-				} else {
-					$x++;
-					$y += $this->dir;
-					$this->bit--;
-				}
-				if ($this->dir < 0) {
-					if ($y < 0) {
-						$y = 0;
-						$x -= 2;
-						$this->dir = 1;
-						if ($x == 6) {
-							$x--;
-							$y = 9;
-						}
-					}
-				} else {
-					if ($y == $w) {
-						$y = $w - 1;
-						$x -= 2;
-						$this->dir = -1;
-						if ($x == 6) {
-							$x--;
-							$y -= 8;
-						}
-					}
-				}
-				if (($x < 0) OR ($y < 0)) {
-					return NULL;
-				}
-				$this->x = $x;
-				$this->y = $y;
-			} while(ord($this->frame[$y][$x]) & 0x80);
-			return array('x'=>$x, 'y'=>$y);
-		}
-
-		// - - - - - - - - - - - - - - - - - - - - - - - - -
-
-		// QRrawcode
-
-		/**
-		 * Initialize code.
-		 * @param array $spec array of ECC specification
-		 * @return 0 in case of success, -1 in case of error
-		 */
-		protected function init($spec) {
-			$dl = $this->rsDataCodes1($spec);
-			$el = $this->rsEccCodes1($spec);
-			$rs = $this->init_rs(8, 0x11d, 0, 1, $el, 255 - $dl - $el);
-			$blockNo = 0;
-			$dataPos = 0;
-			$eccPos = 0;
-			$endfor = $this->rsBlockNum1($spec);
-			for ($i=0; $i < $endfor; ++$i) {
-				$ecc = array_slice($this->ecccode, $eccPos);
-				$this->rsblocks[$blockNo] = array();
-				$this->rsblocks[$blockNo]['dataLength'] = $dl;
-				$this->rsblocks[$blockNo]['data'] = array_slice($this->datacode, $dataPos);
-				$this->rsblocks[$blockNo]['eccLength'] = $el;
-				$ecc = $this->encode_rs_char($rs, $this->rsblocks[$blockNo]['data'], $ecc);
-				$this->rsblocks[$blockNo]['ecc'] = $ecc;
-				$this->ecccode = array_merge(array_slice($this->ecccode,0, $eccPos), $ecc);
-				$dataPos += $dl;
-				$eccPos += $el;
-				$blockNo++;
-			}
-			if ($this->rsBlockNum2($spec) == 0) {
-				return 0;
-			}
-			$dl = $this->rsDataCodes2($spec);
-			$el = $this->rsEccCodes2($spec);
-			$rs = $this->init_rs(8, 0x11d, 0, 1, $el, 255 - $dl - $el);
-			if ($rs == NULL) {
-				return -1;
-			}
-			$endfor = $this->rsBlockNum2($spec);
-			for ($i=0; $i < $endfor; ++$i) {
-				$ecc = array_slice($this->ecccode, $eccPos);
-				$this->rsblocks[$blockNo] = array();
-				$this->rsblocks[$blockNo]['dataLength'] = $dl;
-				$this->rsblocks[$blockNo]['data'] = array_slice($this->datacode, $dataPos);
-				$this->rsblocks[$blockNo]['eccLength'] = $el;
-				$ecc = $this->encode_rs_char($rs, $this->rsblocks[$blockNo]['data'], $ecc);
-				$this->rsblocks[$blockNo]['ecc'] = $ecc;
-				$this->ecccode = array_merge(array_slice($this->ecccode, 0, $eccPos), $ecc);
-				$dataPos += $dl;
-				$eccPos += $el;
-				$blockNo++;
-			}
-			return 0;
-		}
-
-		/**
-		 * Return Reed-Solomon block code.
-		 * @return array rsblocks
-		 */
-		protected function getCode() {
-			if ($this->count < $this->dataLength) {
-				$row = $this->count % $this->blocks;
-				$col = $this->count / $this->blocks;
-				if ($col >= $this->rsblocks[0]['dataLength']) {
-					$row += $this->b1;
-				}
-				$ret = $this->rsblocks[$row]['data'][$col];
-			} elseif ($this->count < $this->dataLength + $this->eccLength) {
-				$row = ($this->count - $this->dataLength) % $this->blocks;
-				$col = ($this->count - $this->dataLength) / $this->blocks;
-				$ret = $this->rsblocks[$row]['ecc'][$col];
-			} else {
-				return 0;
-			}
-			$this->count++;
-			return $ret;
-		}
-
-		// - - - - - - - - - - - - - - - - - - - - - - - - -
-
-		// QRmask
-
-		/**
-		 * Write Format Information on frame and returns the number of black bits
-		 * @param int $width frame width
-		 * @param array $frame frame
-		 * @param array $mask masking mode
-		 * @param int $level error correction level
-		 * @return int blacks
-		 */
-		 protected function writeFormatInformation($width, &$frame, $mask, $level) {
-			$blacks = 0;
-			$format =  $this->getFormatInfo($mask, $level);
-			for ($i=0; $i<8; ++$i) {
-				if ($format & 1) {
-					$blacks += 2;
-					$v = 0x85;
-				} else {
-					$v = 0x84;
-				}
-				$frame[8][$width - 1 - $i] = chr($v);
-				if ($i < 6) {
-					$frame[$i][8] = chr($v);
-				} else {
-					$frame[$i + 1][8] = chr($v);
-				}
-				$format = $format >> 1;
-			}
-			for ($i=0; $i<7; ++$i) {
-			if ($format & 1) {
-				$blacks += 2;
-				$v = 0x85;
-			} else {
-				$v = 0x84;
-			}
-			$frame[$width - 7 + $i][8] = chr($v);
-			if ($i == 0) {
-				$frame[8][7] = chr($v);
-			} else {
-				$frame[8][6 - $i] = chr($v);
-			}
-			$format = $format >> 1;
-			}
-			return $blacks;
-		}
-
-		/**
-		 * mask0
-		 * @param int $x X position
-		 * @param int $y Y position
-		 * @return int mask
-		 */
-		 protected function mask0($x, $y) {
-			return ($x + $y) & 1;
-		}
-
-		/**
-		 * mask1
-		 * @param int $x X position
-		 * @param int $y Y position
-		 * @return int mask
-		 */
-		 protected function mask1($x, $y) {
-			return ($y & 1);
-		}
-
-		/**
-		 * mask2
-		 * @param int $x X position
-		 * @param int $y Y position
-		 * @return int mask
-		 */
-		 protected function mask2($x, $y) {
-			return ($x % 3);
-		}
-
-		/**
-		 * mask3
-		 * @param int $x X position
-		 * @param int $y Y position
-		 * @return int mask
-		 */
-		 protected function mask3($x, $y) {
-			return ($x + $y) % 3;
-		}
-
-		/**
-		 * mask4
-		 * @param int $x X position
-		 * @param int $y Y position
-		 * @return int mask
-		 */
-		 protected function mask4($x, $y) {
-			return (((int)($y / 2)) + ((int)($x / 3))) & 1;
-		}
-
-		/**
-		 * mask5
-		 * @param int $x X position
-		 * @param int $y Y position
-		 * @return int mask
-		 */
-		 protected function mask5($x, $y) {
-			return (($x * $y) & 1) + ($x * $y) % 3;
-		}
-
-		/**
-		 * mask6
-		 * @param int $x X position
-		 * @param int $y Y position
-		 * @return int mask
-		 */
-		 protected function mask6($x, $y) {
-			return ((($x * $y) & 1) + ($x * $y) % 3) & 1;
-		}
-
-		/**
-		 * mask7
-		 * @param int $x X position
-		 * @param int $y Y position
-		 * @return int mask
-		 */
-		 protected function mask7($x, $y) {
-			return ((($x * $y) % 3) + (($x + $y) & 1)) & 1;
-		}
-
-		/**
-		 * Return bitmask
-		 * @param int $maskNo mask number
-		 * @param int $width width
-		 * @param array $frame frame
-		 * @return array bitmask
-		 */
-		protected function generateMaskNo($maskNo, $width, $frame) {
-			$bitMask = array_fill(0, $width, array_fill(0, $width, 0));
-			for ($y=0; $y<$width; ++$y) {
-				for ($x=0; $x<$width; ++$x) {
-					if (ord($frame[$y][$x]) & 0x80) {
-						$bitMask[$y][$x] = 0;
-					} else {
-						$maskFunc = call_user_func(array($this, 'mask'.$maskNo), $x, $y);
-						$bitMask[$y][$x] = ($maskFunc == 0)?1:0;
-					}
-				}
-			}
-			return $bitMask;
-		}
-
-		/**
-		 * makeMaskNo
-		 * @param int $maskNo
-		 * @param int $width
-		 * @param int $s
-		 * @param int $d
-		 * @param boolean $maskGenOnly
-		 * @return int b
-		 */
-		 protected function makeMaskNo($maskNo, $width, $s, &$d, $maskGenOnly=false) {
-			$b = 0;
-			$bitMask = array();
-			$bitMask = $this->generateMaskNo($maskNo, $width, $s, $d);
-			if ($maskGenOnly) {
-				return;
-			}
-			$d = $s;
-			for ($y=0; $y<$width; ++$y) {
-				for ($x=0; $x<$width; ++$x) {
-					if ($bitMask[$y][$x] == 1) {
-						$d[$y][$x] = chr(ord($s[$y][$x]) ^ (int)$bitMask[$y][$x]);
-					}
-					$b += (int)(ord($d[$y][$x]) & 1);
-				}
-			}
-			return $b;
-		}
-
-		/**
-		 * makeMask
-		 * @param int $width
-		 * @param array $frame
-		 * @param int $maskNo
-		 * @param int $level
-		 * @return array mask
-		 */
-		 protected function makeMask($width, $frame, $maskNo, $level) {
-			$masked = array_fill(0, $width, str_repeat("\0", $width));
-			$this->makeMaskNo($maskNo, $width, $frame, $masked);
-			$this->writeFormatInformation($width, $masked, $maskNo, $level);
-			return $masked;
-		}
-
-		/**
-		 * calcN1N3
-		 * @param int $length
-		 * @return int demerit
-		 */
-		 protected function calcN1N3($length) {
-			$demerit = 0;
-			for ($i=0; $i<$length; ++$i) {
-				if ($this->runLength[$i] >= 5) {
-					$demerit += (N1 + ($this->runLength[$i] - 5));
-				}
-				if ($i & 1) {
-					if (($i >= 3) AND ($i < ($length-2)) AND ($this->runLength[$i] % 3 == 0)) {
-						$fact = (int)($this->runLength[$i] / 3);
-						if (($this->runLength[$i-2] == $fact)
-							AND ($this->runLength[$i-1] == $fact)
-							AND ($this->runLength[$i+1] == $fact)
-							AND ($this->runLength[$i+2] == $fact)) {
-							if (($this->runLength[$i-3] < 0) OR ($this->runLength[$i-3] >= (4 * $fact))) {
-								$demerit += N3;
-							} elseif ((($i+3) >= $length) OR ($this->runLength[$i+3] >= (4 * $fact))) {
-								$demerit += N3;
-							}
-						}
-					}
-				}
-			}
-			return $demerit;
-		}
-
-		/**
-		 * evaluateSymbol
-		 * @param int $width
-		 * @param array $frame
-		 * @return int demerit
-		 */
-		 protected function evaluateSymbol($width, $frame) {
-			$head = 0;
-			$demerit = 0;
-			for ($y=0; $y<$width; ++$y) {
-				$head = 0;
-				$this->runLength[0] = 1;
-				$frameY = $frame[$y];
-				if ($y > 0) {
-					$frameYM = $frame[$y-1];
-				}
-				for ($x=0; $x<$width; ++$x) {
-					if (($x > 0) AND ($y > 0)) {
-						$b22 = ord($frameY[$x]) & ord($frameY[$x-1]) & ord($frameYM[$x]) & ord($frameYM[$x-1]);
-						$w22 = ord($frameY[$x]) | ord($frameY[$x-1]) | ord($frameYM[$x]) | ord($frameYM[$x-1]);
-						if (($b22 | ($w22 ^ 1)) & 1) {
-							$demerit += N2;
-						}
-					}
-					if (($x == 0) AND (ord($frameY[$x]) & 1)) {
-						$this->runLength[0] = -1;
-						$head = 1;
-						$this->runLength[$head] = 1;
-					} elseif ($x > 0) {
-						if ((ord($frameY[$x]) ^ ord($frameY[$x-1])) & 1) {
-							$head++;
-							$this->runLength[$head] = 1;
-						} else {
-							$this->runLength[$head]++;
-						}
-					}
-				}
-				$demerit += $this->calcN1N3($head+1);
-			}
-			for ($x=0; $x<$width; ++$x) {
-				$head = 0;
-				$this->runLength[0] = 1;
-				for ($y=0; $y<$width; ++$y) {
-					if (($y == 0) AND (ord($frame[$y][$x]) & 1)) {
-						$this->runLength[0] = -1;
-						$head = 1;
-						$this->runLength[$head] = 1;
-					} elseif ($y > 0) {
-						if ((ord($frame[$y][$x]) ^ ord($frame[$y-1][$x])) & 1) {
-							$head++;
-							$this->runLength[$head] = 1;
-						} else {
-							$this->runLength[$head]++;
-						}
-					}
-				}
-				$demerit += $this->calcN1N3($head+1);
-			}
-			return $demerit;
-		}
-
-		/**
-		 * mask
-		 * @param int $width
-		 * @param array $frame
-		 * @param int $level
-		 * @return array best mask
-		 */
-		 protected function mask($width, $frame, $level) {
-			$minDemerit = PHP_INT_MAX;
-			$bestMaskNum = 0;
-			$bestMask = array();
-			$checked_masks = array(0, 1, 2, 3, 4, 5, 6, 7);
-			if (QR_FIND_FROM_RANDOM !== false) {
-				$howManuOut = 8 - (QR_FIND_FROM_RANDOM % 9);
-				for ($i = 0; $i <  $howManuOut; ++$i) {
-					$remPos = rand (0, count($checked_masks)-1);
-					unset($checked_masks[$remPos]);
-					$checked_masks = array_values($checked_masks);
-				}
-			}
-			$bestMask = $frame;
-			foreach ($checked_masks as $i) {
-				$mask = array_fill(0, $width, str_repeat("\0", $width));
-				$demerit = 0;
-				$blacks = 0;
-				$blacks  = $this->makeMaskNo($i, $width, $frame, $mask);
-				$blacks += $this->writeFormatInformation($width, $mask, $i, $level);
-				$blacks  = (int)(100 * $blacks / ($width * $width));
-				$demerit = (int)((int)(abs($blacks - 50) / 5) * N4);
-				$demerit += $this->evaluateSymbol($width, $mask);
-				if ($demerit < $minDemerit) {
-					$minDemerit = $demerit;
-					$bestMask = $mask;
-					$bestMaskNum = $i;
-				}
-			}
-			return $bestMask;
-		}
-
-		// - - - - - - - - - - - - - - - - - - - - - - - - -
-
-		// QRsplit
-
-		/**
-		 * Return true if the character at specified position is a number
-		 * @param string $str string
-		 * @param int $pos characted position
-		 * @return boolean true of false
-		 */
-		 protected function isdigitat($str, $pos) {
-			if ($pos >= strlen($str)) {
-				return false;
-			}
-			return ((ord($str[$pos]) >= ord('0'))&&(ord($str[$pos]) <= ord('9')));
-		}
-
-		/**
-		 * Return true if the character at specified position is an alphanumeric character
-		 * @param string $str string
-		 * @param int $pos characted position
-		 * @return boolean true of false
-		 */
-		 protected function isalnumat($str, $pos) {
-			if ($pos >= strlen($str)) {
-				return false;
-			}
-			return ($this->lookAnTable(ord($str[$pos])) >= 0);
-		}
-
-		/**
-		 * identifyMode
-		 * @param int $pos
-		 * @return int mode
-		 */
-		 protected function identifyMode($pos) {
-			if ($pos >= strlen($this->dataStr)) {
-				return QR_MODE_NL;
-			}
-			$c = $this->dataStr[$pos];
-			if ($this->isdigitat($this->dataStr, $pos)) {
-				return QR_MODE_NM;
-			} elseif ($this->isalnumat($this->dataStr, $pos)) {
-				return QR_MODE_AN;
-			} elseif ($this->hint == QR_MODE_KJ) {
-				if ($pos+1 < strlen($this->dataStr)) {
-					$d = $this->dataStr[$pos+1];
-					$word = (ord($c) << 8) | ord($d);
-					if (($word >= 0x8140 && $word <= 0x9ffc) OR ($word >= 0xe040 && $word <= 0xebbf)) {
-						return QR_MODE_KJ;
-					}
-				}
-			}
-			return QR_MODE_8B;
-		}
-
-		/**
-		 * eatNum
-		 * @return int run
-		 */
-		 protected function eatNum() {
-			$ln = $this->lengthIndicator(QR_MODE_NM, $this->version);
-			$p = 0;
-			while($this->isdigitat($this->dataStr, $p)) {
-				$p++;
-			}
-			$run = $p;
-			$mode = $this->identifyMode($p);
-			if ($mode == QR_MODE_8B) {
-				$dif = $this->estimateBitsModeNum($run) + 4 + $ln
-				+ $this->estimateBitsMode8(1)         // + 4 + l8
-				- $this->estimateBitsMode8($run + 1); // - 4 - l8
-				if ($dif > 0) {
-					return $this->eat8();
-				}
-			}
-			if ($mode == QR_MODE_AN) {
-				$dif = $this->estimateBitsModeNum($run) + 4 + $ln
-				+ $this->estimateBitsModeAn(1)        // + 4 + la
-				- $this->estimateBitsModeAn($run + 1);// - 4 - la
-				if ($dif > 0) {
-					return $this->eatAn();
-				}
-			}
-			$this->items = $this->appendNewInputItem($this->items, QR_MODE_NM, $run, str_split($this->dataStr));
-			return $run;
-		}
-
-		/**
-		 * eatAn
-		 * @return int run
-		 */
-		 protected function eatAn() {
-			$la = $this->lengthIndicator(QR_MODE_AN,  $this->version);
-			$ln = $this->lengthIndicator(QR_MODE_NM, $this->version);
-			$p = 0;
-			while($this->isalnumat($this->dataStr, $p)) {
-				if ($this->isdigitat($this->dataStr, $p)) {
-					$q = $p;
-					while($this->isdigitat($this->dataStr, $q)) {
-						$q++;
-					}
-					$dif = $this->estimateBitsModeAn($p) // + 4 + la
-					+ $this->estimateBitsModeNum($q - $p) + 4 + $ln
-					- $this->estimateBitsModeAn($q); // - 4 - la
-					if ($dif < 0) {
-						break;
-					} else {
-						$p = $q;
-					}
-				} else {
-					$p++;
-				}
-			}
-			$run = $p;
-			if (!$this->isalnumat($this->dataStr, $p)) {
-				$dif = $this->estimateBitsModeAn($run) + 4 + $la
-				+ $this->estimateBitsMode8(1) // + 4 + l8
-				- $this->estimateBitsMode8($run + 1); // - 4 - l8
-				if ($dif > 0) {
-					return $this->eat8();
-				}
-			}
-			$this->items = $this->appendNewInputItem($this->items, QR_MODE_AN, $run, str_split($this->dataStr));
-			return $run;
-		}
-
-		/**
-		 * eatKanji
-		 * @return int run
-		 */
-		 protected function eatKanji() {
-			$p = 0;
-			while($this->identifyMode($p) == QR_MODE_KJ) {
-				$p += 2;
-			}
-			$this->items = $this->appendNewInputItem($this->items, QR_MODE_KJ, $p, str_split($this->dataStr));
-			return $run;
-		}
-
-		/**
-		 * eat8
-		 * @return int run
-		 */
-		 protected function eat8() {
-			$la = $this->lengthIndicator(QR_MODE_AN, $this->version);
-			$ln = $this->lengthIndicator(QR_MODE_NM, $this->version);
-			$p = 1;
-			$dataStrLen = strlen($this->dataStr);
-			while($p < $dataStrLen) {
-				$mode = $this->identifyMode($p);
-				if ($mode == QR_MODE_KJ) {
-					break;
-				}
-				if ($mode == QR_MODE_NM) {
-					$q = $p;
-					while($this->isdigitat($this->dataStr, $q)) {
-						$q++;
-					}
-					$dif = $this->estimateBitsMode8($p) // + 4 + l8
-					+ $this->estimateBitsModeNum($q - $p) + 4 + $ln
-					- $this->estimateBitsMode8($q); // - 4 - l8
-					if ($dif < 0) {
-						break;
-					} else {
-						$p = $q;
-					}
-				} elseif ($mode == QR_MODE_AN) {
-					$q = $p;
-					while($this->isalnumat($this->dataStr, $q)) {
-						$q++;
-					}
-					$dif = $this->estimateBitsMode8($p)  // + 4 + l8
-					+ $this->estimateBitsModeAn($q - $p) + 4 + $la
-					- $this->estimateBitsMode8($q); // - 4 - l8
-					if ($dif < 0) {
-						break;
-					} else {
-						$p = $q;
-					}
-				} else {
-					$p++;
-				}
-			}
-			$run = $p;
-			$this->items = $this->appendNewInputItem($this->items, QR_MODE_8B, $run, str_split($this->dataStr));
-			return $run;
-		}
-
-		/**
-		 * splitString
-		 */
-		 protected function splitString() {
-			while (strlen($this->dataStr) > 0) {
-				if ($this->dataStr == '') {
-					return 0;
-				}
-				$mode = $this->identifyMode(0);
-				switch ($mode) {
-					case QR_MODE_NM: {
-						$length = $this->eatNum();
-						break;
-					}
-					case QR_MODE_AN: {
-						$length = $this->eatAn();
-						break;
-					}
-					case QR_MODE_KJ: {
-						if ($hint == QR_MODE_KJ) {
-							$length = $this->eatKanji();
-						} else {
-							$length = $this->eat8();
-						}
-						break;
-					}
-					default: {
-						$length = $this->eat8();
-						break;
-					}
-				}
-				if ($length == 0) {
-					return 0;
-				}
-				if ($length < 0) {
-					return -1;
-				}
-				$this->dataStr = substr($this->dataStr, $length);
-			}
-		}
-
-		/**
-		 * toUpper
-		 */
-		 protected function toUpper() {
-			$stringLen = strlen($this->dataStr);
-			$p = 0;
-			while ($p < $stringLen) {
-				$mode = $this->identifyMode(substr($this->dataStr, $p), $this->hint);
-				if ($mode == QR_MODE_KJ) {
-					$p += 2;
-				} else {
-					if ((ord($this->dataStr[$p]) >= ord('a')) AND (ord($this->dataStr[$p]) <= ord('z'))) {
-						$this->dataStr[$p] = chr(ord($this->dataStr[$p]) - 32);
-					}
-					$p++;
-				}
-			}
-			return $this->dataStr;
-		}
-
-		// - - - - - - - - - - - - - - - - - - - - - - - - -
-
-		// QRinputItem
-
-		/**
-		 * newInputItem
-		 * @param int $mode
-		 * @param int $size
-		 * @param array $data
-		 * @param array $bstream
-		 * @return array input item
-		 */
-		 protected function newInputItem($mode, $size, $data, $bstream=null) {
-			$setData = array_slice($data, 0, $size);
-			if (count($setData) < $size) {
-				$setData = array_merge($setData, array_fill(0, ($size - count($setData)), 0));
-			}
-			if (!$this->check($mode, $size, $setData)) {
-				return NULL;
-			}
-			$inputitem = array();
-			$inputitem['mode'] = $mode;
-			$inputitem['size'] = $size;
-			$inputitem['data'] = $setData;
-			$inputitem['bstream'] = $bstream;
-			return $inputitem;
-		}
-
-		/**
-		 * encodeModeNum
-		 * @param array $inputitem
-		 * @param int $version
-		 * @return array input item
-		 */
-		 protected function encodeModeNum($inputitem, $version) {
-			$words = (int)($inputitem['size'] / 3);
-			$inputitem['bstream'] = array();
-			$val = 0x1;
-			$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 4, $val);
-			$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], $this->lengthIndicator(QR_MODE_NM, $version), $inputitem['size']);
-			for ($i=0; $i < $words; ++$i) {
-				$val  = (ord($inputitem['data'][$i*3  ]) - ord('0')) * 100;
-				$val += (ord($inputitem['data'][$i*3+1]) - ord('0')) * 10;
-				$val += (ord($inputitem['data'][$i*3+2]) - ord('0'));
-				$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 10, $val);
-			}
-			if ($inputitem['size'] - $words * 3 == 1) {
-				$val = ord($inputitem['data'][$words*3]) - ord('0');
-				$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 4, $val);
-			} elseif (($inputitem['size'] - ($words * 3)) == 2) {
-				$val  = (ord($inputitem['data'][$words*3  ]) - ord('0')) * 10;
-				$val += (ord($inputitem['data'][$words*3+1]) - ord('0'));
-				$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 7, $val);
-			}
-			return $inputitem;
-		}
-
-		/**
-		 * encodeModeAn
-		 * @param array $inputitem
-		 * @param int $version
-		 * @return array input item
-		 */
-		 protected function encodeModeAn($inputitem, $version) {
-			$words = (int)($inputitem['size'] / 2);
-			$inputitem['bstream'] = array();
-			$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 4, 0x02);
-			$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], $this->lengthIndicator(QR_MODE_AN, $version), $inputitem['size']); //DEBUG
-			for ($i=0; $i < $words; ++$i) {
-				$val  = (int)$this->lookAnTable(ord($inputitem['data'][$i*2  ])) * 45;
-				$val += (int)$this->lookAnTable(ord($inputitem['data'][$i*2+1]));
-				$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 11, $val);
-			}
-			if ($inputitem['size'] & 1) {
-				$val = $this->lookAnTable(ord($inputitem['data'][($words * 2)]));
-				$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 6, $val);
-			}
-			return $inputitem;
-		}
-
-		/**
-		 * encodeMode8
-		 * @param array $inputitem
-		 * @param int $version
-		 * @return array input item
-		 */
-		 protected function encodeMode8($inputitem, $version) {
-			$inputitem['bstream'] = array();
-			$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 4, 0x4);
-			$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], $this->lengthIndicator(QR_MODE_8B, $version), $inputitem['size']);
-			for ($i=0; $i < $inputitem['size']; ++$i) {
-				$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 8, ord($inputitem['data'][$i]));
-			}
-			return $inputitem;
-		}
-
-		/**
-		 * encodeModeKanji
-		 * @param array $inputitem
-		 * @param int $version
-		 * @return array input item
-		 */
-		 protected function encodeModeKanji($inputitem, $version) {
-			$inputitem['bstream'] = array();
-			$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 4, 0x8);
-			$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], $this->lengthIndicator(QR_MODE_KJ, $version), (int)($inputitem['size'] / 2));
-			for ($i=0; $i<$inputitem['size']; $i+=2) {
-				$val = (ord($inputitem['data'][$i]) << 8) | ord($inputitem['data'][$i+1]);
-				if ($val <= 0x9ffc) {
-					$val -= 0x8140;
-				} else {
-					$val -= 0xc140;
-				}
-				$h = ($val >> 8) * 0xc0;
-				$val = ($val & 0xff) + $h;
-				$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 13, $val);
-			}
-			return $inputitem;
-		}
-
-		/**
-		 * encodeModeStructure
-		 * @param array $inputitem
-		 * @return array input item
-		 */
-		 protected function encodeModeStructure($inputitem) {
-			$inputitem['bstream'] = array();
-			$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 4, 0x03);
-			$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 4, ord($inputitem['data'][1]) - 1);
-			$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 4, ord($inputitem['data'][0]) - 1);
-			$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 8, ord($inputitem['data'][2]));
-			return $inputitem;
-		}
-
-		/**
-		 * encodeBitStream
-		 * @param array $inputitem
-		 * @param int $version
-		 * @return array input item
-		 */
-		 protected function encodeBitStream($inputitem, $version) {
-			$inputitem['bstream'] = array();
-			$words = $this->maximumWords($inputitem['mode'], $version);
-			if ($inputitem['size'] > $words) {
-				$st1 = $this->newInputItem($inputitem['mode'], $words, $inputitem['data']);
-				$st2 = $this->newInputItem($inputitem['mode'], $inputitem['size'] - $words, array_slice($inputitem['data'], $words));
-				$st1 = $this->encodeBitStream($st1, $version);
-				$st2 = $this->encodeBitStream($st2, $version);
-				$inputitem['bstream'] = array();
-				$inputitem['bstream'] = $this->appendBitstream($inputitem['bstream'], $st1['bstream']);
-				$inputitem['bstream'] = $this->appendBitstream($inputitem['bstream'], $st2['bstream']);
-			} else {
-				switch($inputitem['mode']) {
-					case QR_MODE_NM: {
-						$inputitem = $this->encodeModeNum($inputitem, $version);
-						break;
-					}
-					case QR_MODE_AN: {
-						$inputitem = $this->encodeModeAn($inputitem, $version);
-						break;
-					}
-					case QR_MODE_8B: {
-						$inputitem = $this->encodeMode8($inputitem, $version);
-						break;
-					}
-					case QR_MODE_KJ: {
-						$inputitem = $this->encodeModeKanji($inputitem, $version);
-						break;
-					}
-					case QR_MODE_ST: {
-						$inputitem = $this->encodeModeStructure($inputitem);
-						break;
-					}
-					default: {
-						break;
-					}
-				}
-			}
-			return $inputitem;
-		}
-
-		// - - - - - - - - - - - - - - - - - - - - - - - - -
-
-		// QRinput
-
-		/**
-		 * Append data to an input object.
-		 * The data is copied and appended to the input object.
-		 * @param array items input items
-		 * @param int $mode encoding mode.
-		 * @param int $size size of data (byte).
-		 * @param array $data array of input data.
-		 * @return items
-		 *
-		 */
-		protected function appendNewInputItem($items, $mode, $size, $data) {
-			$items[] = $this->newInputItem($mode, $size, $data);
-			return $items;
-		}
-
-		/**
-		 * insertStructuredAppendHeader
-		 * @param array $items
-		 * @param int $size
-		 * @param int $index
-		 * @param int $parity
-		 * @return array items
-		 */
-		 protected function insertStructuredAppendHeader($items, $size, $index, $parity) {
-			if ($size > MAX_STRUCTURED_SYMBOLS) {
-				return -1;
-			}
-			if (($index <= 0) OR ($index > MAX_STRUCTURED_SYMBOLS)) {
-				return -1;
-			}
-			$buf = array($size, $index, $parity);
-			$entry = $this->newInputItem(QR_MODE_ST, 3, buf);
-			array_unshift($items, $entry);
-			return $items;
-		}
-
-		/**
-		 * calcParity
-		 * @param array $items
-		 * @return int parity
-		 */
-		 protected function calcParity($items) {
-			$parity = 0;
-			foreach ($items as $item) {
-				if ($item['mode'] != QR_MODE_ST) {
-					for ($i=$item['size']-1; $i>=0; --$i) {
-						$parity ^= $item['data'][$i];
-					}
-				}
-			}
-			return $parity;
-		}
-
-		/**
-		 * checkModeNum
-		 * @param int $size
-		 * @param array $data
-		 * @return boolean true or false
-		 */
-		 protected function checkModeNum($size, $data) {
-			for ($i=0; $i<$size; ++$i) {
-				if ((ord($data[$i]) < ord('0')) OR (ord($data[$i]) > ord('9'))){
-					return false;
-				}
-			}
-			return true;
-		}
-
-		/**
-		 * estimateBitsModeNum
-		 * @param int $size
-		 * @return int number of bits
-		 */
-		 protected function estimateBitsModeNum($size) {
-			$w = (int)$size / 3;
-			$bits = $w * 10;
-			switch($size - $w * 3) {
-				case 1: {
-					$bits += 4;
-					break;
-				}
-				case 2: {
-					$bits += 7;
-					break;
-				}
-				default: {
-					break;
-				}
-			}
-			return $bits;
-		}
-
-		/**
-		 * Look up the alphabet-numeric convesion table (see JIS X0510:2004, pp.19).
-		 * @param int $c character value
-		 * @return value
-		 */
-		protected function lookAnTable($c) {
-			return (($c > 127)?-1:$this->anTable[$c]);
-		}
-
-		/**
-		 * checkModeAn
-		 * @param int $size
-		 * @param array $data
-		 * @return boolean true or false
-		 */
-		 protected function checkModeAn($size, $data) {
-			for ($i=0; $i<$size; ++$i) {
-				if ($this->lookAnTable(ord($data[$i])) == -1) {
-					return false;
-				}
-			}
-			return true;
-		}
-
-		/**
-		 * estimateBitsModeAn
-		 * @param int $size
-		 * @return int number of bits
-		 */
-		 protected function estimateBitsModeAn($size) {
-			$w = (int)($size / 2);
-			$bits = $w * 11;
-			if ($size & 1) {
-				$bits += 6;
-			}
-			return $bits;
-		}
-
-		/**
-		 * estimateBitsMode8
-		 * @param int $size
-		 * @return int number of bits
-		 */
-		 protected function estimateBitsMode8($size) {
-			return $size * 8;
-		}
-
-		/**
-		 * estimateBitsModeKanji
-		 * @param int $size
-		 * @return int number of bits
-		 */
-		 protected function estimateBitsModeKanji($size) {
-			return (int)(($size / 2) * 13);
-		}
-
-		/**
-		 * checkModeKanji
-		 * @param int $size
-		 * @param array $data
-		 * @return boolean true or false
-		 */
-		 protected function checkModeKanji($size, $data) {
-			if ($size & 1) {
-				return false;
-			}
-			for ($i=0; $i<$size; $i+=2) {
-				$val = (ord($data[$i]) << 8) | ord($data[$i+1]);
-				if (($val < 0x8140) OR (($val > 0x9ffc) AND ($val < 0xe040)) OR ($val > 0xebbf)) {
-					return false;
-				}
-			}
-			return true;
-		}
-
-		/**
-		 * Validate the input data.
-		 * @param int $mode encoding mode.
-		 * @param int $size size of data (byte).
-		 * @param array data data to validate
-		 * @return boolean true in case of valid data, false otherwise
-		 */
-		protected function check($mode, $size, $data) {
-			if ($size <= 0) {
-				return false;
-			}
-			switch($mode) {
-				case QR_MODE_NM: {
-					return $this->checkModeNum($size, $data);
-				}
-				case QR_MODE_AN: {
-					return $this->checkModeAn($size, $data);
-				}
-				case QR_MODE_KJ: {
-					return $this->checkModeKanji($size, $data);
-				}
-				case QR_MODE_8B: {
-					return true;
-				}
-				case QR_MODE_ST: {
-					return true;
-				}
-				default: {
-					break;
-				}
-			}
-			return false;
-		}
-
-		/**
-		 * estimateBitStreamSize
-		 * @param array $items
-		 * @param int $version
-		 * @return int bits
-		 */
-		 protected function estimateBitStreamSize($items, $version) {
-			$bits = 0;
-			if ($version == 0) {
-				$version = 1;
-			}
-			foreach ($items as $item) {
-				switch($item['mode']) {
-					case QR_MODE_NM: {
-						$bits = $this->estimateBitsModeNum($item['size']);
-						break;
-					}
-					case QR_MODE_AN: {
-						$bits = $this->estimateBitsModeAn($item['size']);
-						break;
-					}
-					case QR_MODE_8B: {
-						$bits = $this->estimateBitsMode8($item['size']);
-						break;
-					}
-					case QR_MODE_KJ: {
-						$bits = $this->estimateBitsModeKanji($item['size']);
-						break;
-					}
-					case QR_MODE_ST: {
-						return STRUCTURE_HEADER_BITS;
-					}
-					default: {
-						return 0;
-					}
-				}
-				$l = $this->lengthIndicator($item['mode'], $version);
-				$m = 1 << $l;
-				$num = (int)(($item['size'] + $m - 1) / $m);
-				$bits += $num * (4 + $l);
-			}
-			return $bits;
-		}
-
-		/**
-		 * estimateVersion
-		 * @param array $items
-		 * @return int version
-		 */
-		 protected function estimateVersion($items) {
-			$version = 0;
-			$prev = 0;
-			do {
-				$prev = $version;
-				$bits = $this->estimateBitStreamSize($items, $prev);
-				$version = $this->getMinimumVersion((int)(($bits + 7) / 8), $this->level);
-				if ($version < 0) {
-					return -1;
-				}
-			} while ($version > $prev);
-			return $version;
-		}
-
-		/**
-		 * lengthOfCode
-		 * @param int $mode
-		 * @param int $version
-		 * @param int $bits
-		 * @return int size
-		 */
-		 protected function lengthOfCode($mode, $version, $bits) {
-			$payload = $bits - 4 - $this->lengthIndicator($mode, $version);
-			switch($mode) {
-				case QR_MODE_NM: {
-					$chunks = (int)($payload / 10);
-					$remain = $payload - $chunks * 10;
-					$size = $chunks * 3;
-					if ($remain >= 7) {
-						$size += 2;
-					} elseif ($remain >= 4) {
-						$size += 1;
-					}
-					break;
-				}
-				case QR_MODE_AN: {
-					$chunks = (int)($payload / 11);
-					$remain = $payload - $chunks * 11;
-					$size = $chunks * 2;
-					if ($remain >= 6) {
-						++$size;
-					}
-					break;
-				}
-				case QR_MODE_8B: {
-					$size = (int)($payload / 8);
-					break;
-				}
-				case QR_MODE_KJ: {
-					$size = (int)(($payload / 13) * 2);
-					break;
-				}
-				case QR_MODE_ST: {
-					$size = (int)($payload / 8);
-					break;
-				}
-				default: {
-					$size = 0;
-					break;
-				}
-			}
-			$maxsize = $this->maximumWords($mode, $version);
-			if ($size < 0) {
-				$size = 0;
-			}
-			if ($size > $maxsize) {
-				$size = $maxsize;
-			}
-			return $size;
-		}
-
-		/**
-		 * createBitStream
-		 * @param array $items
-		 * @return array of items and total bits
-		 */
-		 protected function createBitStream($items) {
-			$total = 0;
-			foreach ($items as $key => $item) {
-				$items[$key] = $this->encodeBitStream($item, $this->version);
-				$bits = count($items[$key]['bstream']);
-				$total += $bits;
-			}
-			return array($items, $total);
-		}
-
-		/**
-		 * convertData
-		 * @param array $items
-		 * @return array items
-		 */
-		 protected function convertData($items) {
-			$ver = $this->estimateVersion($items);
-			if ($ver > $this->version) {
-				$this->version = $ver;
-			}
-			for (;;) {
-				$cbs = $this->createBitStream($items);
-				$items = $cbs[0];
-				$bits = $cbs[1];
-				if ($bits < 0) {
-					return -1;
-				}
-				$ver = $this->getMinimumVersion((int)(($bits + 7) / 8), $this->level);
-				if ($ver < 0) {
-					return -1;
-				} elseif ($ver > $this->version) {
-					$this->version = $ver;
-				} else {
-					break;
-				}
-			}
-			return $items;
-		}
-
-		/**
-		 * Append Padding Bit to bitstream
-		 * @param array $bstream
-		 * @return array bitstream
-		 */
-		 protected function appendPaddingBit($bstream) {
-			$bits = count($bstream);
-			$maxwords = $this->getDataLength($this->version, $this->level);
-			$maxbits = $maxwords * 8;
-			if ($maxbits == $bits) {
-				return 0;
-			}
-			if ($maxbits - $bits < 5) {
-				return $this->appendNum($bstream, $maxbits - $bits, 0);
-			}
-			$bits += 4;
-			$words = (int)(($bits + 7) / 8);
-			$padding = array();
-			$padding = $this->appendNum($padding, $words * 8 - $bits + 4, 0);
-			$padlen = $maxwords - $words;
-			if ($padlen > 0) {
-				$padbuf = array();
-				for ($i=0; $i<$padlen; ++$i) {
-					$padbuf[$i] = ($i&1)?0x11:0xec;
-				}
-				$padding = $this->appendBytes($padding, $padlen, $padbuf);
-			}
-			return $this->appendBitstream($bstream, $padding);
-		}
-
-		/**
-		 * mergeBitStream
-		 * @param array $bstream
-		 * @return array bitstream
-		 */
-		 protected function mergeBitStream($items) {
-			$items = $this->convertData($items);
-			$bstream = array();
-			foreach ($items as $item) {
-				$bstream = $this->appendBitstream($bstream, $item['bstream']);
-			}
-			return $bstream;
-		}
-
-		/**
-		 * Returns a stream of bits.
-		 * @param int $items
-		 * @return array padded merged byte stream
-		 */
-		protected function getBitStream($items) {
-			$bstream = $this->mergeBitStream($items);
-			return $this->appendPaddingBit($bstream);
-		}
-
-		/**
-		 * Pack all bit streams padding bits into a byte array.
-		 * @param int $items
-		 * @return array padded merged byte stream
-		 */
-		protected function getByteStream($items) {
-			$bstream = $this->getBitStream($items);
-			return $this->bitstreamToByte($bstream);
-		}
-
-		// - - - - - - - - - - - - - - - - - - - - - - - - -
-
-		// QRbitstream
-
-		/**
-		 * Return an array with zeros
-		 * @param int $setLength array size
-		 * @return array
-		 */
-		 protected function allocate($setLength) {
-			return array_fill(0, $setLength, 0);
-		}
-
-		/**
-		 * Return new bitstream from number
-		 * @param int $bits number of bits
-		 * @param int $num number
-		 * @return array bitstream
-		 */
-		 protected function newFromNum($bits, $num) {
-			$bstream = $this->allocate($bits);
-			$mask = 1 << ($bits - 1);
-			for ($i=0; $i<$bits; ++$i) {
-				if ($num & $mask) {
-					$bstream[$i] = 1;
-				} else {
-					$bstream[$i] = 0;
-				}
-				$mask = $mask >> 1;
-			}
-			return $bstream;
-		}
-
-		/**
-		 * Return new bitstream from bytes
-		 * @param int $size size
-		 * @param array $data bytes
-		 * @return array bitstream
-		 */
-		 protected function newFromBytes($size, $data) {
-			$bstream = $this->allocate($size * 8);
-			$p=0;
-			for ($i=0; $i<$size; ++$i) {
-				$mask = 0x80;
-				for ($j=0; $j<8; ++$j) {
-					if ($data[$i] & $mask) {
-						$bstream[$p] = 1;
-					} else {
-						$bstream[$p] = 0;
-					}
-					$p++;
-					$mask = $mask >> 1;
-				}
-			}
-			return $bstream;
-		}
-
-		/**
-		 * Append one bitstream to another
-		 * @param array $bitstream original bitstream
-		 * @param array $append bitstream to append
-		 * @return array bitstream
-		 */
-		 protected function appendBitstream($bitstream, $append) {
-			if ((!is_array($append)) OR (count($append) == 0)) {
-				return $bitstream;
-			}
-			if (count($bitstream) == 0) {
-				return $append;
-			}
-			return array_values(array_merge($bitstream, $append));
-		}
-
-		/**
-		 * Append one bitstream created from number to another
-		 * @param array $bitstream original bitstream
-		 * @param int $bits number of bits
-		 * @param int $num number
-		 * @return array bitstream
-		 */
-		 protected function appendNum($bitstream, $bits, $num) {
-			if ($bits == 0) {
-				return 0;
-			}
-			$b = $this->newFromNum($bits, $num);
-			return $this->appendBitstream($bitstream, $b);
-		}
-
-		/**
-		 * Append one bitstream created from bytes to another
-		 * @param array $bitstream original bitstream
-		 * @param int $size size
-		 * @param array $data bytes
-		 * @return array bitstream
-		 */
-		 protected function appendBytes($bitstream, $size, $data) {
-			if ($size == 0) {
-				return 0;
-			}
-			$b = $this->newFromBytes($size, $data);
-			return $this->appendBitstream($bitstream, $b);
-		}
-
-		/**
-		 * Convert bitstream to bytes
-		 * @param array $bitstream original bitstream
-		 * @return array of bytes
-		 */
-		 protected function bitstreamToByte($bstream) {
-			$size = count($bstream);
-			if ($size == 0) {
-				return array();
-			}
-			$data = array_fill(0, (int)(($size + 7) / 8), 0);
-			$bytes = (int)($size / 8);
-			$p = 0;
-			for ($i=0; $i<$bytes; $i++) {
-				$v = 0;
-				for ($j=0; $j<8; $j++) {
-					$v = $v << 1;
-					$v |= $bstream[$p];
-					$p++;
-				}
-				$data[$i] = $v;
-			}
-			if ($size & 7) {
-				$v = 0;
-				for ($j=0; $j<($size & 7); $j++) {
-					$v = $v << 1;
-					$v |= $bstream[$p];
-					$p++;
-				}
-				$data[$bytes] = $v;
-			}
-			return $data;
-		}
-
-		// - - - - - - - - - - - - - - - - - - - - - - - - -
-
-		// QRspec
-
-		/**
-		 * Replace a value on the array at the specified position
-		 * @param array $srctab
-		 * @param int $x X position
-		 * @param int $y Y position
-		 * @param string $repl value to replace
-		 * @param int $replLen length of the repl string
-		 * @return array srctab
-		 */
-		 protected function qrstrset($srctab, $x, $y, $repl, $replLen=false) {
-			$srctab[$y] = substr_replace($srctab[$y], ($replLen !== false)?substr($repl,0,$replLen):$repl, $x, ($replLen !== false)?$replLen:strlen($repl));
-			return $srctab;
-		}
-
-		/**
-		 * Return maximum data code length (bytes) for the version.
-		 * @param int $version version
-		 * @param int $level error correction level
-		 * @return int maximum size (bytes)
-		 */
-		protected function getDataLength($version, $level) {
-			return $this->capacity[$version][QRCAP_WORDS] - $this->capacity[$version][QRCAP_EC][$level];
-		}
-
-		/**
-		 * Return maximum error correction code length (bytes) for the version.
-		 * @param int $version version
-		 * @param int $level error correction level
-		 * @return int ECC size (bytes)
-		 */
-		protected function getECCLength($version, $level){
-			return $this->capacity[$version][QRCAP_EC][$level];
-		}
-
-		/**
-		 * Return the width of the symbol for the version.
-		 * @param int $version version
-		 * @return int width
-		 */
-		protected function getWidth($version) {
-			return $this->capacity[$version][QRCAP_WIDTH];
-		}
-
-		/**
-		 * Return the numer of remainder bits.
-		 * @param int $version version
-		 * @return int number of remainder bits
-		 */
-		protected function getRemainder($version) {
-			return $this->capacity[$version][QRCAP_REMINDER];
-		}
-
-		/**
-		 * Return a version number that satisfies the input code length.
-		 * @param int $size input code length (byte)
-		 * @param int $level error correction level
-		 * @return int version number
-		 */
-		protected function getMinimumVersion($size, $level) {
-			for ($i=1; $i <= QRSPEC_VERSION_MAX; ++$i) {
-				$words  = $this->capacity[$i][QRCAP_WORDS] - $this->capacity[$i][QRCAP_EC][$level];
-				if ($words >= $size) {
-					return $i;
-				}
-			}
-			return -1;
-		}
-
-		/**
-		 * Return the size of length indicator for the mode and version.
-		 * @param int $mode encoding mode
-		 * @param int $version version
-		 * @return int the size of the appropriate length indicator (bits).
-		 */
-		protected function lengthIndicator($mode, $version) {
-			if ($mode == QR_MODE_ST) {
-				return 0;
-			}
-			if ($version <= 9) {
-				$l = 0;
-			} elseif ($version <= 26) {
-				$l = 1;
-			} else {
-				$l = 2;
-			}
-			return $this->lengthTableBits[$mode][$l];
-		}
-
-		/**
-		 * Return the maximum length for the mode and version.
-		 * @param int $mode encoding mode
-		 * @param int $version version
-		 * @return int the maximum length (bytes)
-		 */
-		protected function maximumWords($mode, $version) {
-			if ($mode == QR_MODE_ST) {
-				return 3;
-			}
-			if ($version <= 9) {
-				$l = 0;
-			} else if ($version <= 26) {
-				$l = 1;
-			} else {
-				$l = 2;
-			}
-			$bits = $this->lengthTableBits[$mode][$l];
-			$words = (1 << $bits) - 1;
-			if ($mode == QR_MODE_KJ) {
-				$words *= 2; // the number of bytes is required
-			}
-			return $words;
-		}
-
-		/**
-		 * Return an array of ECC specification.
-		 * @param int $version version
-		 * @param int $level error correction level
-		 * @param array $spec an array of ECC specification contains as following: {# of type1 blocks, # of data code, # of ecc code, # of type2 blocks, # of data code}
-		 * @return array spec
-		 */
-		protected function getEccSpec($version, $level, $spec) {
-			if (count($spec) < 5) {
-				$spec = array(0, 0, 0, 0, 0);
-			}
-			$b1 = $this->eccTable[$version][$level][0];
-			$b2 = $this->eccTable[$version][$level][1];
-			$data = $this->getDataLength($version, $level);
-			$ecc = $this->getECCLength($version, $level);
-			if ($b2 == 0) {
-				$spec[0] = $b1;
-				$spec[1] = (int)($data / $b1);
-				$spec[2] = (int)($ecc / $b1);
-				$spec[3] = 0;
-				$spec[4] = 0;
-			} else {
-				$spec[0] = $b1;
-				$spec[1] = (int)($data / ($b1 + $b2));
-				$spec[2] = (int)($ecc  / ($b1 + $b2));
-				$spec[3] = $b2;
-				$spec[4] = $spec[1] + 1;
-			}
-			return $spec;
-		}
-
-		/**
-		 * Put an alignment marker.
-		 * @param array $frame frame
-		 * @param int $width width
-		 * @param int $ox X center coordinate of the pattern
-		 * @param int $oy Y center coordinate of the pattern
-		 * @return array frame
-		 */
-		protected function putAlignmentMarker($frame, $ox, $oy) {
-			$finder = array(
-				"\xa1\xa1\xa1\xa1\xa1",
-				"\xa1\xa0\xa0\xa0\xa1",
-				"\xa1\xa0\xa1\xa0\xa1",
-				"\xa1\xa0\xa0\xa0\xa1",
-				"\xa1\xa1\xa1\xa1\xa1"
-				);
-			$yStart = $oy - 2;
-			$xStart = $ox - 2;
-			for ($y=0; $y < 5; $y++) {
-				$frame = $this->qrstrset($frame, $xStart, $yStart+$y, $finder[$y]);
-			}
-			return $frame;
-		}
-
-		/**
-		 * Put an alignment pattern.
-		 * @param int $version version
-		 * @param array $fram frame
-		 * @param int $width width
-		 * @return array frame
-		 */
-		 protected function putAlignmentPattern($version, $frame, $width) {
-			if ($version < 2) {
-				return $frame;
-			}
-			$d = $this->alignmentPattern[$version][1] - $this->alignmentPattern[$version][0];
-			if ($d < 0) {
-				$w = 2;
-			} else {
-				$w = (int)(($width - $this->alignmentPattern[$version][0]) / $d + 2);
-			}
-			if ($w * $w - 3 == 1) {
-				$x = $this->alignmentPattern[$version][0];
-				$y = $this->alignmentPattern[$version][0];
-				$frame = $this->putAlignmentMarker($frame, $x, $y);
-				return $frame;
-			}
-			$cx = $this->alignmentPattern[$version][0];
-			$wo = $w - 1;
-			for ($x=1; $x < $wo; ++$x) {
-				$frame = $this->putAlignmentMarker($frame, 6, $cx);
-				$frame = $this->putAlignmentMarker($frame, $cx,  6);
-				$cx += $d;
-			}
-			$cy = $this->alignmentPattern[$version][0];
-			for ($y=0; $y < $wo; ++$y) {
-				$cx = $this->alignmentPattern[$version][0];
-				for ($x=0; $x < $wo; ++$x) {
-					$frame = $this->putAlignmentMarker($frame, $cx, $cy);
-					$cx += $d;
-				}
-				$cy += $d;
-			}
-			return $frame;
-		}
-
-		/**
-		 * Return BCH encoded version information pattern that is used for the symbol of version 7 or greater. Use lower 18 bits.
-		 * @param int $version version
-		 * @return BCH encoded version information pattern
-		 */
-		protected function getVersionPattern($version) {
-			if (($version < 7) OR ($version > QRSPEC_VERSION_MAX)) {
-				return 0;
-			}
-			return $this->versionPattern[($version - 7)];
-		}
-
-		/**
-		 * Return BCH encoded format information pattern.
-		 * @param array $mask
-		 * @param int $level error correction level
-		 * @return BCH encoded format information pattern
-		 */
-		protected function getFormatInfo($mask, $level) {
-			if (($mask < 0) OR ($mask > 7)) {
-				return 0;
-			}
-			if (($level < 0) OR ($level > 3)) {
-				return 0;
-			}
-			return $this->formatInfo[$level][$mask];
-		}
-
-		/**
-		 * Put a finder pattern.
-		 * @param array $frame frame
-		 * @param int $width width
-		 * @param int $ox X center coordinate of the pattern
-		 * @param int $oy Y center coordinate of the pattern
-		 * @return array frame
-		 */
-		protected function putFinderPattern($frame, $ox, $oy) {
-			$finder = array(
-			"\xc1\xc1\xc1\xc1\xc1\xc1\xc1",
-			"\xc1\xc0\xc0\xc0\xc0\xc0\xc1",
-			"\xc1\xc0\xc1\xc1\xc1\xc0\xc1",
-			"\xc1\xc0\xc1\xc1\xc1\xc0\xc1",
-			"\xc1\xc0\xc1\xc1\xc1\xc0\xc1",
-			"\xc1\xc0\xc0\xc0\xc0\xc0\xc1",
-			"\xc1\xc1\xc1\xc1\xc1\xc1\xc1"
-			);
-			for ($y=0; $y < 7; $y++) {
-				$frame = $this->qrstrset($frame, $ox, ($oy + $y), $finder[$y]);
-			}
-			return $frame;
-		}
-
-		/**
-		 * Return a copy of initialized frame.
-		 * @param int $version version
-		 * @return Array of unsigned char.
-		 */
-		protected function createFrame($version) {
-			$width = $this->capacity[$version][QRCAP_WIDTH];
-			$frameLine = str_repeat ("\0", $width);
-			$frame = array_fill(0, $width, $frameLine);
-			// Finder pattern
-			$frame = $this->putFinderPattern($frame, 0, 0);
-			$frame = $this->putFinderPattern($frame, $width - 7, 0);
-			$frame = $this->putFinderPattern($frame, 0, $width - 7);
-			// Separator
-			$yOffset = $width - 7;
-			for ($y=0; $y < 7; ++$y) {
-				$frame[$y][7] = "\xc0";
-				$frame[$y][$width - 8] = "\xc0";
-				$frame[$yOffset][7] = "\xc0";
-				++$yOffset;
-			}
-			$setPattern = str_repeat("\xc0", 8);
-			$frame = $this->qrstrset($frame, 0, 7, $setPattern);
-			$frame = $this->qrstrset($frame, $width-8, 7, $setPattern);
-			$frame = $this->qrstrset($frame, 0, $width - 8, $setPattern);
-			// Format info
-			$setPattern = str_repeat("\x84", 9);
-			$frame = $this->qrstrset($frame, 0, 8, $setPattern);
-			$frame = $this->qrstrset($frame, $width - 8, 8, $setPattern, 8);
-			$yOffset = $width - 8;
-			for ($y=0; $y < 8; ++$y,++$yOffset) {
-				$frame[$y][8] = "\x84";
-				$frame[$yOffset][8] = "\x84";
-			}
-			// Timing pattern
-			$wo = $width - 15;
-			for ($i=1; $i < $wo; ++$i) {
-				$frame[6][7+$i] = chr(0x90 | ($i & 1));
-				$frame[7+$i][6] = chr(0x90 | ($i & 1));
-			}
-			// Alignment pattern
-			$frame = $this->putAlignmentPattern($version, $frame, $width);
-			// Version information
-			if ($version >= 7) {
-				$vinf = $this->getVersionPattern($version);
-				$v = $vinf;
-				for ($x=0; $x<6; ++$x) {
-					for ($y=0; $y<3; ++$y) {
-						$frame[($width - 11)+$y][$x] = chr(0x88 | ($v & 1));
-						$v = $v >> 1;
-					}
-				}
-				$v = $vinf;
-				for ($y=0; $y<6; ++$y) {
-					for ($x=0; $x<3; ++$x) {
-						$frame[$y][$x+($width - 11)] = chr(0x88 | ($v & 1));
-						$v = $v >> 1;
-					}
-				}
-			}
-			// and a little bit...
-			$frame[$width - 8][8] = "\x81";
-			return $frame;
-		}
-
-		/**
-		 * Set new frame for the specified version.
-		 * @param int $version version
-		 * @return Array of unsigned char.
-		 */
-		protected function newFrame($version) {
-			if (($version < 1) OR ($version > QRSPEC_VERSION_MAX)) {
-				return NULL;
-			}
-			if (!isset($this->frames[$version])) {
-				$this->frames[$version] = $this->createFrame($version);
-			}
-			if (is_null($this->frames[$version])) {
-				return NULL;
-			}
-			return $this->frames[$version];
-		}
-
-		/**
-		 * Return block number 0
-		 * @param array $spec
-		 * @return int value
-		 */
-		 protected function rsBlockNum($spec) {
-			return ($spec[0] + $spec[3]);
-		}
-
-		/**
-		* Return block number 1
-		 * @param array $spec
-		 * @return int value
-		 */
-		 protected function rsBlockNum1($spec) {
-			return $spec[0];
-		}
-
-		/**
-		 * Return data codes 1
-		 * @param array $spec
-		 * @return int value
-		 */
-		 protected function rsDataCodes1($spec) {
-			return $spec[1];
-		}
-
-		/**
-		 * Return ecc codes 1
-		 * @param array $spec
-		 * @return int value
-		 */
-		 protected function rsEccCodes1($spec) {
-			return $spec[2];
-		}
-
-		/**
-		 * Return block number 2
-		 * @param array $spec
-		 * @return int value
-		 */
-		 protected function rsBlockNum2($spec) {
-			return $spec[3];
-		}
-
-		/**
-		 * Return data codes 2
-		 * @param array $spec
-		 * @return int value
-		 */
-		 protected function rsDataCodes2($spec) {
-			return $spec[4];
-		}
-
-		/**
-		 * Return ecc codes 2
-		 * @param array $spec
-		 * @return int value
-		 */
-		 protected function rsEccCodes2($spec) {
-			return $spec[2];
-		}
-
-		/**
-		 * Return data length
-		 * @param array $spec
-		 * @return int value
-		 */
-		 protected function rsDataLength($spec) {
-			return ($spec[0] * $spec[1]) + ($spec[3] * $spec[4]);
-		}
-
-		/**
-		 * Return ecc length
-		 * @param array $spec
-		 * @return int value
-		 */
-		 protected function rsEccLength($spec) {
-			return ($spec[0] + $spec[3]) * $spec[2];
-		}
-
-		// - - - - - - - - - - - - - - - - - - - - - - - - -
-
-		// QRrs
-
-		/**
-		 * Initialize a Reed-Solomon codec and add it to existing rsitems
-		 * @param int $symsize symbol size, bits
-		 * @param int $gfpoly  Field generator polynomial coefficients
-		 * @param int $fcr  first root of RS code generator polynomial, index form
-		 * @param int $prim  primitive element to generate polynomial roots
-		 * @param int $nroots RS code generator polynomial degree (number of roots)
-		 * @param int $pad  padding bytes at front of shortened block
-		 * @return array Array of RS values:<ul><li>mm = Bits per symbol;</li><li>nn = Symbols per block;</li><li>alpha_to = log lookup table array;</li><li>index_of = Antilog lookup table array;</li><li>genpoly = Generator polynomial array;</li><li>nroots = Number of generator;</li><li>roots = number of parity symbols;</li><li>fcr = First consecutive root, index form;</li><li>prim = Primitive element, index form;</li><li>iprim = prim-th root of 1, index form;</li><li>pad = Padding bytes in shortened block;</li><li>gfpoly</ul>.
-		 */
-		 protected function init_rs($symsize, $gfpoly, $fcr, $prim, $nroots, $pad) {
-			foreach ($this->rsitems as $rs) {
-				if (($rs['pad'] != $pad) OR ($rs['nroots'] != $nroots) OR ($rs['mm'] != $symsize)
-					OR ($rs['gfpoly'] != $gfpoly) OR ($rs['fcr'] != $fcr) OR ($rs['prim'] != $prim)) {
-					continue;
-				}
-				return $rs;
-			}
-			$rs = $this->init_rs_char($symsize, $gfpoly, $fcr, $prim, $nroots, $pad);
-			array_unshift($this->rsitems, $rs);
-			return $rs;
-		}
-
-		// - - - - - - - - - - - - - - - - - - - - - - - - -
-
-		// QRrsItem
-
-		/**
-		 * modnn
-		 * @param array RS values
-		 * @param int $x X position
-		 * @return int X osition
-		 */
-		 protected function modnn($rs, $x) {
-			while ($x >= $rs['nn']) {
-				$x -= $rs['nn'];
-				$x = ($x >> $rs['mm']) + ($x & $rs['nn']);
-			}
-			return $x;
-		}
-
-		/**
-		 * Initialize a Reed-Solomon codec and returns an array of values.
-		 * @param int $symsize symbol size, bits
-		 * @param int $gfpoly  Field generator polynomial coefficients
-		 * @param int $fcr  first root of RS code generator polynomial, index form
-		 * @param int $prim  primitive element to generate polynomial roots
-		 * @param int $nroots RS code generator polynomial degree (number of roots)
-		 * @param int $pad  padding bytes at front of shortened block
-		 * @return array Array of RS values:<ul><li>mm = Bits per symbol;</li><li>nn = Symbols per block;</li><li>alpha_to = log lookup table array;</li><li>index_of = Antilog lookup table array;</li><li>genpoly = Generator polynomial array;</li><li>nroots = Number of generator;</li><li>roots = number of parity symbols;</li><li>fcr = First consecutive root, index form;</li><li>prim = Primitive element, index form;</li><li>iprim = prim-th root of 1, index form;</li><li>pad = Padding bytes in shortened block;</li><li>gfpoly</ul>.
-		 */
-		protected function init_rs_char($symsize, $gfpoly, $fcr, $prim, $nroots, $pad) {
-			// Based on Reed solomon encoder by Phil Karn, KA9Q (GNU-LGPLv2)
-			$rs = null;
-			// Check parameter ranges
-			if (($symsize < 0) OR ($symsize > 8)) {
-				return $rs;
-			}
-			if (($fcr < 0) OR ($fcr >= (1<<$symsize))) {
-				return $rs;
-			}
-			if (($prim <= 0) OR ($prim >= (1<<$symsize))) {
-				return $rs;
-			}
-			if (($nroots < 0) OR ($nroots >= (1<<$symsize))) {
-				return $rs;
-			}
-			if (($pad < 0) OR ($pad >= ((1<<$symsize) -1 - $nroots))) {
-				return $rs;
-			}
-			$rs = array();
-			$rs['mm'] = $symsize;
-			$rs['nn'] = (1 << $symsize) - 1;
-			$rs['pad'] = $pad;
-			$rs['alpha_to'] = array_fill(0, ($rs['nn'] + 1), 0);
-			$rs['index_of'] = array_fill(0, ($rs['nn'] + 1), 0);
-			// PHP style macro replacement ;)
-			$NN =& $rs['nn'];
-			$A0 =& $NN;
-			// Generate Galois field lookup tables
-			$rs['index_of'][0] = $A0; // log(zero) = -inf
-			$rs['alpha_to'][$A0] = 0; // alpha**-inf = 0
-			$sr = 1;
-			for ($i=0; $i<$rs['nn']; ++$i) {
-				$rs['index_of'][$sr] = $i;
-				$rs['alpha_to'][$i] = $sr;
-				$sr <<= 1;
-				if ($sr & (1 << $symsize)) {
-					$sr ^= $gfpoly;
-				}
-				$sr &= $rs['nn'];
-			}
-			if ($sr != 1) {
-				// field generator polynomial is not primitive!
-				return NULL;
-			}
-			// Form RS code generator polynomial from its roots
-			$rs['genpoly'] = array_fill(0, ($nroots + 1), 0);
-			$rs['fcr'] = $fcr;
-			$rs['prim'] = $prim;
-			$rs['nroots'] = $nroots;
-			$rs['gfpoly'] = $gfpoly;
-			// Find prim-th root of 1, used in decoding
-			for ($iprim=1; ($iprim % $prim) != 0; $iprim += $rs['nn']) {
-				; // intentional empty-body loop!
-			}
-			$rs['iprim'] = (int)($iprim / $prim);
-			$rs['genpoly'][0] = 1;
-
-
-			for ($i = 0,$root=$fcr*$prim; $i < $nroots; $i++, $root += $prim) {
-				$rs['genpoly'][$i+1] = 1;
-				// Multiply rs->genpoly[] by  @**(root + x)
-				for ($j = $i; $j > 0; --$j) {
-					if ($rs['genpoly'][$j] != 0) {
-						$rs['genpoly'][$j] = $rs['genpoly'][$j-1] ^ $rs['alpha_to'][$this->modnn($rs, $rs['index_of'][$rs['genpoly'][$j]] + $root)];
-					} else {
-						$rs['genpoly'][$j] = $rs['genpoly'][$j-1];
-					}
-				}
-				// rs->genpoly[0] can never be zero
-				$rs['genpoly'][0] = $rs['alpha_to'][$this->modnn($rs, $rs['index_of'][$rs['genpoly'][0]] + $root)];
-			}
-			// convert rs->genpoly[] to index form for quicker encoding
-			for ($i = 0; $i <= $nroots; ++$i) {
-				$rs['genpoly'][$i] = $rs['index_of'][$rs['genpoly'][$i]];
-			}
-			return $rs;
-		}
-
-		/**
-		 * Encode a Reed-Solomon codec and returns the parity array
-		 * @param array $rs RS values
-		 * @param array $data data
-		 * @param array $parity parity
-		 * @return parity array
-		 */
-		 protected function encode_rs_char($rs, $data, $parity) {
-			$MM       =& $rs['mm']; // bits per symbol
-			$NN       =& $rs['nn']; // the total number of symbols in a RS block
-			$ALPHA_TO =& $rs['alpha_to']; // the address of an array of NN elements to convert Galois field elements in index (log) form to polynomial form
-			$INDEX_OF =& $rs['index_of']; // the address of an array of NN elements to convert Galois field elements in polynomial form to index (log) form
-			$GENPOLY  =& $rs['genpoly']; // an array of NROOTS+1 elements containing the generator polynomial in index form
-			$NROOTS   =& $rs['nroots']; // the number of roots in the RS code generator polynomial, which is the same as the number of parity symbols in a block
-			$FCR      =& $rs['fcr']; // first consecutive root, index form
-			$PRIM     =& $rs['prim']; // primitive element, index form
-			$IPRIM    =& $rs['iprim']; // prim-th root of 1, index form
-			$PAD      =& $rs['pad']; // the number of pad symbols in a block
-			$A0       =& $NN;
-			$parity = array_fill(0, $NROOTS, 0);
-			for ($i=0; $i < ($NN - $NROOTS - $PAD); $i++) {
-				$feedback = $INDEX_OF[$data[$i] ^ $parity[0]];
-				if ($feedback != $A0) {
-					// feedback term is non-zero
-					// This line is unnecessary when GENPOLY[NROOTS] is unity, as it must
-					// always be for the polynomials constructed by init_rs()
-					$feedback = $this->modnn($rs, $NN - $GENPOLY[$NROOTS] + $feedback);
-					for ($j=1; $j < $NROOTS; ++$j) {
-					$parity[$j] ^= $ALPHA_TO[$this->modnn($rs, $feedback + $GENPOLY[($NROOTS - $j)])];
-					}
-				}
-				// Shift
-				array_shift($parity);
-				if ($feedback != $A0) {
-					array_push($parity, $ALPHA_TO[$this->modnn($rs, $feedback + $GENPOLY[0])]);
-				} else {
-					array_push($parity, 0);
-				}
-			}
-			return $parity;
-		}
-
-	} // end QRcode class
-
-} // END OF "class_exists QRcode"
-?>
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/tcpdf.crt b/html2pdf_v4.03/_tcpdf_5.0.002/tcpdf.crt
deleted file mode 100644
index f0491391..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/tcpdf.crt
+++ /dev/null
@@ -1,40 +0,0 @@
-Bag Attributes
-    localKeyID: 7B AB 1B 7A BE 4C 85 C0 1A A6 DC 59 3F 79 48 C3 93 38 68 9C 
-subject=/CN=TCPDF DEMO/O=TCPDF/OU=DEMO/emailAddress=you@example.com/C=IT
-issuer=/CN=TCPDF DEMO/O=TCPDF/OU=DEMO/emailAddress=you@example.com/C=IT
------BEGIN CERTIFICATE-----
-MIIC1TCCAj6gAwIBAgIKkehOL/XGkB5cjjANBgkqhkiG9w0BAQUFADBhMRMwEQYD
-VQQDEwpUQ1BERiBERU1PMQ4wDAYDVQQKEwVUQ1BERjENMAsGA1UECxMEREVNTzEe
-MBwGCSqGSIb3DQEJARYPeW91QGV4YW1wbGUuY29tMQswCQYDVQQGEwJJVDAeFw0w
-OTA4MjExMjU0NDhaFw0xNDA4MjExMjU0NDhaMGExEzARBgNVBAMTClRDUERGIERF
-TU8xDjAMBgNVBAoTBVRDUERGMQ0wCwYDVQQLEwRERU1PMR4wHAYJKoZIhvcNAQkB
-Fg95b3VAZXhhbXBsZS5jb20xCzAJBgNVBAYTAklUMIGfMA0GCSqGSIb3DQEBAQUA
-A4GNADCBiQKBgQDAqIL0uGKmTR98Lxx2vEEE1OGKkMXFo0JViitALe7Onhxxqx0H
-XMUDKF5mvEVu1rcvh7/oAnAfrCuEpL/up3u1mQCgBE7WXBnFFE/AE3jCksh9OkS0
-Z0Xj9woN5bzxRDsGoPiOu/4xzk5qSEXt8jf2Ep90QuNkqLIRT4swAzpDbwIDAQAB
-o4GTMIGQMDcGA1UdEgQwMC6gEQYDVQQDDApUQ1BERiBERU1PoAwGA1UECgwFVENQ
-REagCwYDVQQLDARERU1PMDcGA1UdEQQwMC6gEQYDVQQDDApUQ1BERiBERU1PoAwG
-A1UECgwFVENQREagCwYDVQQLDARERU1PMA8GCSqGSIb3LwEBCgQCBQAwCwYDVR0P
-BAQDAgSQMA0GCSqGSIb3DQEBBQUAA4GBAEhTQfqX3ZNdHmpTLDbIj22RHXii2roE
-OavCbu9WsHoWpva0qSd+yIoD594VHvYAd29sfzDfiN+7W0aiZfDhq5jpaSQMVlN8
-RGYMupbHY/+a9Gz1wqxnR84mlTtIkZVRYAhsfPwy6M1BEjdMqfdh9h40JIdkdjtb
-8faTCfXPePWQ
------END CERTIFICATE-----
-Bag Attributes
-    localKeyID: 7B AB 1B 7A BE 4C 85 C0 1A A6 DC 59 3F 79 48 C3 93 38 68 9C 
-Key Attributes: <No Attributes>
------BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQDAqIL0uGKmTR98Lxx2vEEE1OGKkMXFo0JViitALe7Onhxxqx0H
-XMUDKF5mvEVu1rcvh7/oAnAfrCuEpL/up3u1mQCgBE7WXBnFFE/AE3jCksh9OkS0
-Z0Xj9woN5bzxRDsGoPiOu/4xzk5qSEXt8jf2Ep90QuNkqLIRT4swAzpDbwIDAQAB
-AoGAXc+wNMmz/5Z+RlIKYia44klmqbplEx+0JULqXI4BQsrqvs67i+I4bJkznoL+
-rEIRYSuQ3sCRKFsFtckjTGpxadnxkB+uwGKc6pZChv99BFX6HFR4hgBlT/BBRAQA
-hMDlM2JIRr4S4SMVXR7MHwGMUf9mUeanGLR3ZWtU3aXJrIECQQD7OaYUVYNEEnM9
-uXyjm22CuHyqyEf5gb13sK0uQty67547yJTMUQZd/sQc9KGwhzBbhrob2LO2jAhh
-S+f+NSRnAkEAxFHm3fMI5RgXmswxlGm4QW07a/Ueo7ZJG6xjTkFXluJhd+XHswRD
-dQIO3zG9nGjNUoeMrPhXhPvKqFc2F9RDuQJAQBEGin74N77gxqfr4ik79y8nE8J5
-oGZ2s/RJZdfFRKLg3mwbjjNHhWb4Ck5UgZkoOt8TzRApXG8/n9hktE5HFwJBALur
-M5AueO1Pl5kB489lNJ9OxUQRYUXMxpxuscuoCQwSwmv0O2+0/qtG2WKhUQnI4aYo
-L+FV0YwtivBb1jj3T/kCQQDIWOxq8eRowdaMzvJpRUHFgMcf1AVZExKyrugwYOWd
-KNsDxC4KaQOsPt8iT/Ulo4g/MJC0HolCOhWibKmR9Ayl
------END RSA PRIVATE KEY-----
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/tcpdf.fdf b/html2pdf_v4.03/_tcpdf_5.0.002/tcpdf.fdf
deleted file mode 100644
index a8f7c35d..00000000
Binary files a/html2pdf_v4.03/_tcpdf_5.0.002/tcpdf.fdf and /dev/null differ
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/tcpdf.php b/html2pdf_v4.03/_tcpdf_5.0.002/tcpdf.php
deleted file mode 100644
index 48aafcaa..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/tcpdf.php
+++ /dev/null
@@ -1,19818 +0,0 @@
-<?php
-//============================================================+
-// File name   : tcpdf.php
-// Begin       : 2002-08-03
-// Last Update : 2010-05-06
-// Author      : Nicola Asuni - info@tecnick.com - http://www.tcpdf.org
-// Version     : 5.0.002
-// License     : GNU LGPL (http://www.gnu.org/copyleft/lesser.html)
-// 	----------------------------------------------------------------------------
-//  Copyright (C) 2002-2010  Nicola Asuni - Tecnick.com S.r.l.
-//
-// 	This program is free software: you can redistribute it and/or modify
-// 	it under the terms of the GNU Lesser General Public License as published by
-// 	the Free Software Foundation, either version 2.1 of the License, or
-// 	(at your option) any later version.
-//
-// 	This program is distributed in the hope that it will be useful,
-// 	but WITHOUT ANY WARRANTY; without even the implied warranty of
-// 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// 	GNU Lesser General Public License for more details.
-//
-// 	You should have received a copy of the GNU Lesser General Public License
-// 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-// 	See LICENSE.TXT file for more information.
-//  ----------------------------------------------------------------------------
-//
-// Description : This is a PHP class for generating PDF documents without
-//               requiring external extensions.
-//
-// NOTE:
-// This class was originally derived in 2002 from the Public
-// Domain FPDF class by Olivier Plathey (http://www.fpdf.org),
-// but now is almost entirely rewritten.
-//
-// Main features:
-//  * no external libraries are required for the basic functions;
-//  * all ISO page formats, custom page formats, custom margins and units of measure;
-//  * UTF-8 Unicode and Right-To-Left languages;
-//  * TrueTypeUnicode, OpenTypeUnicode, TrueType, OpenType, Type1 and CID-0 fonts;
-//  * methods to publish some XHTML code, Javascript and Forms;
-//  * images, graphic (geometric figures) and transformation methods;
-//  * supports JPEG, PNG and SVG images natively, all images supported by GD (GD, GD2, GD2PART, GIF, JPEG, PNG, BMP, XBM, XPM) and all images supported via ImagMagick (http://www.imagemagick.org/www/formats.html)
-//  * 1D and 2D barcodes: CODE 39, ANSI MH10.8M-1983, USD-3, 3 of 9, CODE 93, USS-93, Standard 2 of 5, Interleaved 2 of 5, CODE 128 A/B/C, 2 and 5 Digits UPC-Based Extention, EAN 8, EAN 13, UPC-A, UPC-E, MSI, POSTNET, PLANET, RMS4CC (Royal Mail 4-state Customer Code), CBC (Customer Bar Code), KIX (Klant index - Customer index), Intelligent Mail Barcode, Onecode, USPS-B-3200, CODABAR, CODE 11, PHARMACODE, PHARMACODE TWO-TRACKS, QR-Code;
-//  * Grayscale, RGB, CMYK, Spot Colors and Transparencies;
-//  * automatic page header and footer management;
-//  * document encryption and digital signature certifications;
-//  * transactions to UNDO commands;
-//  * PDF annotations, including links, text and file attachments;
-//  * text rendering modes (fill, stroke and clipping);
-//  * multiple columns mode;
-//  * bookmarks and table of content;
-//  * text hyphenation;
-//  * automatic page break, line break and text alignments including justification;
-//  * automatic page numbering and page groups;
-//  * move and delete pages;
-//  * page compression (requires php-zlib extension);
-//
-// -----------------------------------------------------------
-// THANKS TO:
-//
-// Olivier Plathey (http://www.fpdf.org) for original FPDF.
-// Efthimios Mavrogeorgiadis (emavro@yahoo.com) for suggestions on RTL language support.
-// Klemen Vodopivec (http://www.fpdf.de/downloads/addons/37/) for Encryption algorithm.
-// Warren Sherliker (wsherliker@gmail.com) for better image handling.
-// dullus for text Justification.
-// Bob Vincent (pillarsdotnet@users.sourceforge.net) for <li> value attribute.
-// Patrick Benny for text stretch suggestion on Cell().
-// Johannes G�ntert for JavaScript support.
-// Denis Van Nuffelen for Dynamic Form.
-// Jacek Czekaj for multibyte justification
-// Anthony Ferrara for the reintroduction of legacy image methods.
-// Sourceforge user 1707880 (hucste) for line-trough mode.
-// Larry Stanbery for page groups.
-// Martin Hall-May for transparency.
-// Aaron C. Spike for Polycurve method.
-// Mohamad Ali Golkar, Saleh AlMatrafe, Charles Abbott for Arabic and Persian support.
-// Moritz Wagner and Andreas Wurmser for graphic functions.
-// Andrew Whitehead for core fonts support.
-// Esteban Jo�l Mar�n for OpenType font conversion.
-// Teus Hagen for several suggestions and fixes.
-// Yukihiro Nakadaira for CID-0 CJK fonts fixes.
-// Kosmas Papachristos for some CSS improvements.
-// Marcel Partap for some fixes.
-// Won Kyu Park for several suggestions, fixes and patches.
-// Dominik Dzienia for QR-code support.
-// Laurent Minguet for some suggestions.
-// Anyone that has reported a bug or sent a suggestion.
-//============================================================+
-
-/**
- * This is a PHP class for generating PDF documents without requiring external extensions.<br>
- * TCPDF project (http://www.tcpdf.org) was originally derived in 2002 from the Public Domain FPDF class by Olivier Plathey (http://www.fpdf.org), but now is almost entirely rewritten.<br>
- * <h3>TCPDF main features are:</h3>
- * <ul>
- * <li>no external libraries are required for the basic functions;</li>
- * <li>all ISO page formats, custom page formats, custom margins and units of measure;</li>
- * <li>UTF-8 Unicode and Right-To-Left languages;</li>
- * <li>TrueTypeUnicode, OpenTypeUnicode, TrueType, OpenType, Type1 and CID-0 fonts;</li>
- * <li>methods to publish some XHTML code, Javascript and Forms;</li>
- * <li>images, graphic (geometric figures) and transformation methods;
- * <li>supports JPEG, PNG and SVG images natively, all images supported by GD (GD, GD2, GD2PART, GIF, JPEG, PNG, BMP, XBM, XPM) and all images supported via ImagMagick (http://www.imagemagick.org/www/formats.html)</li>
- * <li>1D and 2D barcodes: CODE 39, ANSI MH10.8M-1983, USD-3, 3 of 9, CODE 93, USS-93, Standard 2 of 5, Interleaved 2 of 5, CODE 128 A/B/C, 2 and 5 Digits UPC-Based Extention, EAN 8, EAN 13, UPC-A, UPC-E, MSI, POSTNET, PLANET, RMS4CC (Royal Mail 4-state Customer Code), CBC (Customer Bar Code), KIX (Klant index - Customer index), Intelligent Mail Barcode, Onecode, USPS-B-3200, CODABAR, CODE 11, PHARMACODE, PHARMACODE TWO-TRACKS, QR-Code;</li>
- * <li>Grayscale, RGB, CMYK, Spot Colors and Transparencies;</li>
- * <li>automatic page header and footer management;</li>
- * <li>document encryption and digital signature certifications;</li>
- * <li>transactions to UNDO commands;</li>
- * <li>PDF annotations, including links, text and file attachments;</li>
- * <li>text rendering modes (fill, stroke and clipping);</li>
- * <li>multiple columns mode;</li>
- * <li>bookmarks and table of content;</li>
- * <li>text hyphenation;</li>
- * <li>automatic page break, line break and text alignments including justification;</li>
- * <li>automatic page numbering and page groups;</li>
- * <li>move and delete pages;</li>
- * <li>page compression (requires php-zlib extension);</li>
- * </ul>
- * Tools to encode your unicode fonts are on fonts/utils directory.</p>
- * @package com.tecnick.tcpdf
- * @abstract Class for generating PDF files on-the-fly without requiring external extensions.
- * @author Nicola Asuni
- * @copyright 2002-2010 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
- * @link http://www.tcpdf.org
- * @license http://www.gnu.org/copyleft/lesser.html LGPL
- * @version 5.0.002
- */
-
-/**
- * main configuration file
- */
-require_once(dirname(__FILE__).'/config/tcpdf_config.php');
-
-// includes some support files
-
-/**
- * unicode data
- */
-require_once(dirname(__FILE__).'/unicode_data.php');
-
-/**
- * html colors table
- */
-require_once(dirname(__FILE__).'/htmlcolors.php');
-
-if (!class_exists('TCPDF', false)) {
-	/**
-	 * define default PDF document producer
-	 */
-	define('PDF_PRODUCER', 'TCPDF 5.0.002 (http://www.tcpdf.org)');
-
-	/**
-	* This is a PHP class for generating PDF documents without requiring external extensions.<br>
-	* TCPDF project (http://www.tcpdf.org) has been originally derived in 2002 from the Public Domain FPDF class by Olivier Plathey (http://www.fpdf.org), but now is almost entirely rewritten.<br>
-	* @name TCPDF
-	* @package com.tecnick.tcpdf
-	* @version 5.0.002
-	* @author Nicola Asuni - info@tecnick.com
-	* @link http://www.tcpdf.org
-	* @license http://www.gnu.org/copyleft/lesser.html LGPL
-	*/
-	class TCPDF {
-
-		// protected or Protected properties
-
-		/**
-		 * @var current page number
-		 * @access protected
-		 */
-		protected $page;
-
-		/**
-		 * @var current object number
-		 * @access protected
-		 */
-		protected $n;
-
-		/**
-		 * @var array of object offsets
-		 * @access protected
-		 */
-		protected $offsets;
-
-		/**
-		 * @var buffer holding in-memory PDF
-		 * @access protected
-		 */
-		protected $buffer;
-
-		/**
-		 * @var array containing pages
-		 * @access protected
-		 */
-		protected $pages = array();
-
-		/**
-		 * @var current document state
-		 * @access protected
-		 */
-		protected $state;
-
-		/**
-		 * @var compression flag
-		 * @access protected
-		 */
-		protected $compress;
-
-		/**
-		 * @var current page orientation (P = Portrait, L = Landscape)
-		 * @access protected
-		 */
-		protected $CurOrientation;
-
-		/**
-		 * @var array that stores page dimensions and graphic status.<ul><li>$this->pagedim[$this->page]['w'] => page_width_in_points</li><li>$this->pagedim[$this->page]['h'] => height in points</li><li>$this->pagedim[$this->page]['wk'] => page_width_in_points</li><li>$this->pagedim[$this->page]['hk'] => height</li><li>$this->pagedim[$this->page]['tm'] => top_margin</li><li>$this->pagedim[$this->page]['bm'] => bottom_margin</li><li>$this->pagedim[$this->page]['lm'] => left_margin</li><li>$this->pagedim[$this->page]['rm'] => right_margin</li><li>$this->pagedim[$this->page]['pb'] => auto_page_break</li><li>$this->pagedim[$this->page]['or'] => page_orientation</li><li>$this->pagedim[$this->page]['olm'] => original_left_margin</li><li>$this->pagedim[$this->page]['orm'] => original_right_margin</li></ul>
-		 * @access protected
-		 */
-		protected $pagedim = array();
-
-		/**
-		 * @var scale factor (number of points in user unit)
-		 * @access protected
-		 */
-		protected $k;
-
-		/**
-		 * @var width of page format in points
-		 * @access protected
-		 */
-		protected $fwPt;
-
-		/**
-		 * @var height of page format in points
-		 * @access protected
-		 */
-		protected $fhPt;
-
-		/**
-		 * @var current width of page in points
-		 * @access protected
-		 */
-		protected $wPt;
-
-		/**
-		 * @var current height of page in points
-		 * @access protected
-		 */
-		protected $hPt;
-
-		/**
-		 * @var current width of page in user unit
-		 * @access protected
-		 */
-		protected $w;
-
-		/**
-		 * @var current height of page in user unit
-		 * @access protected
-		 */
-		protected $h;
-
-		/**
-		 * @var left margin
-		 * @access protected
-		 */
-		protected $lMargin;
-
-		/**
-		 * @var top margin
-		 * @access protected
-		 */
-		protected $tMargin;
-
-		/**
-		 * @var right margin
-		 * @access protected
-		 */
-		protected $rMargin;
-
-		/**
-		 * @var page break margin
-		 * @access protected
-		 */
-		protected $bMargin;
-
-		/**
-		 * @var cell internal padding
-		 * @access protected
-		 */
-		//protected
-		public $cMargin;
-
-		/**
-		 * @var cell internal padding (previous value)
-		 * @access protected
-		 */
-		protected $oldcMargin;
-
-		/**
-		 * @var current horizontal position in user unit for cell positioning
-		 * @access protected
-		 */
-		protected $x;
-
-		/**
-		 * @var current vertical position in user unit for cell positioning
-		 * @access protected
-		 */
-		protected $y;
-
-		/**
-		 * @var height of last cell printed
-		 * @access protected
-		 */
-		protected $lasth;
-
-		/**
-		 * @var line width in user unit
-		 * @access protected
-		 */
-		protected $LineWidth;
-
-		/**
-		 * @var array of standard font names
-		 * @access protected
-		 */
-		protected $CoreFonts;
-
-		/**
-		 * @var array of used fonts
-		 * @access protected
-		 */
-		protected $fonts = array();
-
-		/**
-		 * @var array of font files
-		 * @access protected
-		 */
-		protected $FontFiles = array();
-
-		/**
-		 * @var array of encoding differences
-		 * @access protected
-		 */
-		protected $diffs = array();
-
-		/**
-		 * @var array of used images
-		 * @access protected
-		 */
-		protected $images = array();
-
-		/**
-		 * @var array of Annotations in pages
-		 * @access protected
-		 */
-		protected $PageAnnots = array();
-
-		/**
-		 * @var array of internal links
-		 * @access protected
-		 */
-		protected $links = array();
-
-		/**
-		 * @var current font family
-		 * @access protected
-		 */
-		protected $FontFamily;
-
-		/**
-		 * @var current font style
-		 * @access protected
-		 */
-		protected $FontStyle;
-
-		/**
-		 * @var current font ascent (distance between font top and baseline)
-		 * @access protected
-		 * @since 2.8.000 (2007-03-29)
-		 */
-		protected $FontAscent;
-
-		/**
-		 * @var current font descent (distance between font bottom and baseline)
-		 * @access protected
-		 * @since 2.8.000 (2007-03-29)
-		 */
-		protected $FontDescent;
-
-		/**
-		 * @var underlining flag
-		 * @access protected
-		 */
-		protected $underline;
-
-		/**
-		 * @var overlining flag
-		 * @access protected
-		 */
-		protected $overline;
-
-		/**
-		 * @var current font info
-		 * @access protected
-		 */
-		protected $CurrentFont;
-
-		/**
-		 * @var current font size in points
-		 * @access protected
-		 */
-		protected $FontSizePt;
-
-		/**
-		 * @var current font size in user unit
-		 * @access protected
-		 */
-		protected $FontSize;
-
-		/**
-		 * @var commands for drawing color
-		 * @access protected
-		 */
-		protected $DrawColor;
-
-		/**
-		 * @var commands for filling color
-		 * @access protected
-		 */
-		protected $FillColor;
-
-		/**
-		 * @var commands for text color
-		 * @access protected
-		 */
-		protected $TextColor;
-
-		/**
-		 * @var indicates whether fill and text colors are different
-		 * @access protected
-		 */
-		protected $ColorFlag;
-
-		/**
-		 * @var automatic page breaking
-		 * @access protected
-		 */
-		protected $AutoPageBreak;
-
-		/**
-		 * @var threshold used to trigger page breaks
-		 * @access protected
-		 */
-		protected $PageBreakTrigger;
-
-		/**
-		 * @var flag set when processing footer
-		 * @access protected
-		 */
-		protected $InFooter = false;
-
-		/**
-		 * @var zoom display mode
-		 * @access protected
-		 */
-		protected $ZoomMode;
-
-		/**
-		 * @var layout display mode
-		 * @access protected
-		 */
-		protected $LayoutMode;
-
-		/**
-		 * @var title
-		 * @access protected
-		 */
-		protected $title = '';
-
-		/**
-		 * @var subject
-		 * @access protected
-		 */
-		protected $subject = '';
-
-		/**
-		 * @var author
-		 * @access protected
-		 */
-		protected $author = '';
-
-		/**
-		 * @var keywords
-		 * @access protected
-		 */
-		protected $keywords = '';
-
-		/**
-		 * @var creator
-		 * @access protected
-		 */
-		protected $creator = '';
-
-		/**
-		 * @var alias for total number of pages
-		 * @access protected
-		 */
-		protected $AliasNbPages = '{nb}';
-
-		/**
-		 * @var alias for page number
-		 * @access protected
-		 */
-		protected $AliasNumPage = '{pnb}';
-
-		/**
-		 * @var right-bottom corner X coordinate of inserted image
-		 * @since 2002-07-31
-		 * @author Nicola Asuni
-		 * @access protected
-		 */
-		protected $img_rb_x;
-
-		/**
-		 * @var right-bottom corner Y coordinate of inserted image
-		 * @since 2002-07-31
-		 * @author Nicola Asuni
-		 * @access protected
-		 */
-		protected $img_rb_y;
-
-		/**
-		 * @var adjusting factor to convert pixels to user units.
-		 * @since 2004-06-14
-		 * @author Nicola Asuni
-		 * @access protected
-		 */
-		protected $imgscale = 1;
-
-		/**
-		 * @var boolean set to true when the input text is unicode (require unicode fonts)
-		 * @since 2005-01-02
-		 * @author Nicola Asuni
-		 * @access protected
-		 */
-		protected $isunicode = false;
-
-		/**
-		 * @var PDF version
-		 * @since 1.5.3
-		 * @access protected
-		 */
-		protected $PDFVersion = '1.7';
-
-		/**
-		 * @var Minimum distance between header and top page margin.
-		 * @access protected
-		 */
-		protected $header_margin;
-
-		/**
-		 * @var Minimum distance between footer and bottom page margin.
-		 * @access protected
-		 */
-		protected $footer_margin;
-
-		/**
-		 * @var original left margin value
-		 * @access protected
-		 * @since 1.53.0.TC013
-		 */
-		protected $original_lMargin;
-
-		/**
-		 * @var original right margin value
-		 * @access protected
-		 * @since 1.53.0.TC013
-		 */
-		protected $original_rMargin;
-
-		/**
-		 * @var Header font.
-		 * @access protected
-		 */
-		protected $header_font;
-
-		/**
-		 * @var Footer font.
-		 * @access protected
-		 */
-		protected $footer_font;
-
-		/**
-		 * @var Language templates.
-		 * @access protected
-		 */
-		protected $l;
-
-		/**
-		 * @var Barcode to print on page footer (only if set).
-		 * @access protected
-		 */
-		protected $barcode = false;
-
-		/**
-		 * @var If true prints header
-		 * @access protected
-		 */
-		protected $print_header = true;
-
-		/**
-		 * @var If true prints footer.
-		 * @access protected
-		 */
-		protected $print_footer = true;
-
-		/**
-		 * @var Header image logo.
-		 * @access protected
-		 */
-		protected $header_logo = '';
-
-		/**
-		 * @var Header image logo width in mm.
-		 * @access protected
-		 */
-		protected $header_logo_width = 30;
-
-		/**
-		 * @var String to print as title on document header.
-		 * @access protected
-		 */
-		protected $header_title = '';
-
-		/**
-		 * @var String to print on document header.
-		 * @access protected
-		 */
-		protected $header_string = '';
-
-		/**
-		 * @var Default number of columns for html table.
-		 * @access protected
-		 */
-		protected $default_table_columns = 4;
-
-
-		// variables for html parser
-
-		/**
-		 * @var HTML PARSER: array to store current link and rendering styles.
-		 * @access protected
-		 */
-		protected $HREF = array();
-
-		/**
-		 * @var store a list of available fonts on filesystem.
-		 * @access protected
-		 */
-		protected $fontlist = array();
-
-		/**
-		 * @var current foreground color
-		 * @access protected
-		 */
-		protected $fgcolor;
-
-		/**
-		 * @var HTML PARSER: array of boolean values, true in case of ordered list (OL), false otherwise.
-		 * @access protected
-		 */
-		protected $listordered = array();
-
-		/**
-		 * @var HTML PARSER: array count list items on nested lists.
-		 * @access protected
-		 */
-		protected $listcount = array();
-
-		/**
-		 * @var HTML PARSER: current list nesting level.
-		 * @access protected
-		 */
-		protected $listnum = 0;
-
-		/**
-		 * @var HTML PARSER: indent amount for lists.
-		 * @access protected
-		 */
-		protected $listindent = 0;
-
-		/**
-		 * @var HTML PARSER: current list indententation level.
-		 * @access protected
-		 */
-		protected $listindentlevel = 0;
-
-		/**
-		 * @var current background color
-		 * @access protected
-		 */
-		protected $bgcolor;
-
-		/**
-		 * @var Store temporary font size in points.
-		 * @access protected
-		 */
-		protected $tempfontsize = 10;
-
-		/**
-		 * @var spacer for LI tags.
-		 * @access protected
-		 */
-		protected $lispacer = '';
-
-		/**
-		 * @var default encoding
-		 * @access protected
-		 * @since 1.53.0.TC010
-		 */
-		protected $encoding = 'UTF-8';
-
-		/**
-		 * @var PHP internal encoding
-		 * @access protected
-		 * @since 1.53.0.TC016
-		 */
-		protected $internal_encoding;
-
-		/**
-		 * @var indicates if the document language is Right-To-Left
-		 * @access protected
-		 * @since 2.0.000
-		 */
-		protected $rtl = false;
-
-		/**
-		 * @var used to force RTL or LTR string inversion
-		 * @access protected
-		 * @since 2.0.000
-		 */
-		protected $tmprtl = false;
-
-		// --- Variables used for document encryption:
-
-		/**
-		 * Indicates whether document is protected
-		 * @access protected
-		 * @since 2.0.000 (2008-01-02)
-		 */
-		protected $encrypted;
-
-		/**
-		 * U entry in pdf document
-		 * @access protected
-		 * @since 2.0.000 (2008-01-02)
-		 */
-		protected $Uvalue;
-
-		/**
-		 * O entry in pdf document
-		 * @access protected
-		 * @since 2.0.000 (2008-01-02)
-		 */
-		protected $Ovalue;
-
-		/**
-		 * P entry in pdf document
-		 * @access protected
-		 * @since 2.0.000 (2008-01-02)
-		 */
-		protected $Pvalue;
-
-		/**
-		 * encryption object id
-		 * @access protected
-		 * @since 2.0.000 (2008-01-02)
-		 */
-		protected $enc_obj_id;
-
-		/**
-		 * last RC4 key encrypted (cached for optimisation)
-		 * @access protected
-		 * @since 2.0.000 (2008-01-02)
-		 */
-		protected $last_rc4_key;
-
-		/**
-		 * last RC4 computed key
-		 * @access protected
-		 * @since 2.0.000 (2008-01-02)
-		 */
-		protected $last_rc4_key_c;
-
-		/**
-		 * RC4 padding
-		 * @access protected
-		 */
-		protected $padding = "\x28\xBF\x4E\x5E\x4E\x75\x8A\x41\x64\x00\x4E\x56\xFF\xFA\x01\x08\x2E\x2E\x00\xB6\xD0\x68\x3E\x80\x2F\x0C\xA9\xFE\x64\x53\x69\x7A";
-
-		/**
-		 * RC4 encryption key
-		 * @access protected
-		 */
-		protected $encryption_key;
-
-		// --- bookmark ---
-
-		/**
-		 * Outlines for bookmark
-		 * @access protected
-		 * @since 2.1.002 (2008-02-12)
-		 */
-		protected $outlines = array();
-
-		/**
-		 * Outline root for bookmark
-		 * @access protected
-		 * @since 2.1.002 (2008-02-12)
-		 */
-		protected $OutlineRoot;
-
-
-		// --- javascript and form ---
-
-		/**
-		 * javascript code
-		 * @access protected
-		 * @since 2.1.002 (2008-02-12)
-		 */
-		protected $javascript = '';
-
-		/**
-		 * javascript counter
-		 * @access protected
-		 * @since 2.1.002 (2008-02-12)
-		 */
-		protected $n_js;
-
-		/**
-		 * line trough state
-		 * @access protected
-		 * @since 2.8.000 (2008-03-19)
-		 */
-		protected $linethrough;
-
-		// --- Variables used for User's Rights ---
-		// See PDF reference chapter 8.7 Digital Signatures
-
-		/**
-		 * If true enables user's rights on PDF reader
-		 * @access protected
-		 * @since 2.9.000 (2008-03-26)
-		 */
-		protected $ur;
-
-		/**
-		 * Names specifying additional document-wide usage rights for the document.
-		 * @access protected
-		 * @since 2.9.000 (2008-03-26)
-		 */
-		protected $ur_document;
-
-		/**
-		 * Names specifying additional annotation-related usage rights for the document.
-		 * @access protected
-		 * @since 2.9.000 (2008-03-26)
-		 */
-		protected $ur_annots;
-
-		/**
-		 * Names specifying additional form-field-related usage rights for the document.
-		 * @access protected
-		 * @since 2.9.000 (2008-03-26)
-		 */
-		protected $ur_form;
-
-		/**
-		 * Names specifying additional signature-related usage rights for the document.
-		 * @access protected
-		 * @since 2.9.000 (2008-03-26)
-		 */
-		protected $ur_signature;
-
-		/**
-		 * Dot Per Inch Document Resolution (do not change)
-		 * @access protected
-		 * @since 3.0.000 (2008-03-27)
-		 */
-		protected $dpi = 72;
-
-		/**
-		 * Array of page numbers were a new page group was started
-		 * @access protected
-		 * @since 3.0.000 (2008-03-27)
-		 */
-		protected $newpagegroup = array();
-
-		/**
-		 * Contains the number of pages of the groups
-		 * @access protected
-		 * @since 3.0.000 (2008-03-27)
-		 */
-		protected $pagegroups;
-
-		/**
-		 * Contains the alias of the current page group
-		 * @access protected
-		 * @since 3.0.000 (2008-03-27)
-		 */
-		protected $currpagegroup;
-
-		/**
-		 * Restrict the rendering of some elements to screen or printout.
-		 * @access protected
-		 * @since 3.0.000 (2008-03-27)
-		 */
-		protected $visibility = 'all';
-
-		/**
-		 * Print visibility.
-		 * @access protected
-		 * @since 3.0.000 (2008-03-27)
-		 */
-		protected $n_ocg_print;
-
-		/**
-		 * View visibility.
-		 * @access protected
-		 * @since 3.0.000 (2008-03-27)
-		 */
-		protected $n_ocg_view;
-
-		/**
-		 * Array of transparency objects and parameters.
-		 * @access protected
-		 * @since 3.0.000 (2008-03-27)
-		 */
-		protected $extgstates;
-
-		/**
-		 * Set the default JPEG compression quality (1-100)
-		 * @access protected
-		 * @since 3.0.000 (2008-03-27)
-		 */
-		protected $jpeg_quality;
-
-		/**
-		 * Default cell height ratio.
-		 * @access protected
-		 * @since 3.0.014 (2008-05-23)
-		 */
-		protected $cell_height_ratio = K_CELL_HEIGHT_RATIO;
-
-		/**
-		 * PDF viewer preferences.
-		 * @access protected
-		 * @since 3.1.000 (2008-06-09)
-		 */
-		protected $viewer_preferences;
-
-		/**
-		 * A name object specifying how the document should be displayed when opened.
-		 * @access protected
-		 * @since 3.1.000 (2008-06-09)
-		 */
-		protected $PageMode;
-
-		/**
-		 * Array for storing gradient information.
-		 * @access protected
-		 * @since 3.1.000 (2008-06-09)
-		 */
-		protected $gradients = array();
-
-		/**
-		 * Array used to store positions inside the pages buffer.
-		 * keys are the page numbers
-		 * @access protected
-		 * @since 3.2.000 (2008-06-26)
-		 */
-		protected $intmrk = array();
-
-		/**
-		 * Array used to store content positions inside the pages buffer.
-		 * keys are the page numbers
-		 * @access protected
-		 * @since 4.6.021 (2009-07-20)
-		 */
-		protected $cntmrk = array();
-
-		/**
-		 * Array used to store footer positions of each page.
-		 * @access protected
-		 * @since 3.2.000 (2008-07-01)
-		 */
-		protected $footerpos = array();
-
-
-		/**
-		 * Array used to store footer length of each page.
-		 * @access protected
-		 * @since 4.0.014 (2008-07-29)
-		 */
-		protected $footerlen = array();
-
-		/**
-		 * True if a newline is created.
-		 * @access protected
-		 * @since 3.2.000 (2008-07-01)
-		 */
-		protected $newline = true;
-
-		/**
-		 * End position of the latest inserted line
-		 * @access protected
-		 * @since 3.2.000 (2008-07-01)
-		 */
-		protected $endlinex = 0;
-
-		/**
-		 * PDF string for last line width
-		 * @access protected
-		 * @since 4.0.006 (2008-07-16)
-		 */
-		protected $linestyleWidth = '';
-
-		/**
-		 * PDF string for last line width
-		 * @access protected
-		 * @since 4.0.006 (2008-07-16)
-		 */
-		protected $linestyleCap = '0 J';
-
-		/**
-		 * PDF string for last line width
-		 * @access protected
-		 * @since 4.0.006 (2008-07-16)
-		 */
-		protected $linestyleJoin = '0 j';
-
-		/**
-		 * PDF string for last line width
-		 * @access protected
-		 * @since 4.0.006 (2008-07-16)
-		 */
-		protected $linestyleDash = '[] 0 d';
-
-		/**
-		 * True if marked-content sequence is open
-		 * @access protected
-		 * @since 4.0.013 (2008-07-28)
-		 */
-		protected $openMarkedContent = false;
-
-		/**
-		 * Count the latest inserted vertical spaces on HTML
-		 * @access protected
-		 * @since 4.0.021 (2008-08-24)
-		 */
-		protected $htmlvspace = 0;
-
-		/**
-		 * Array of Spot colors
-		 * @access protected
-		 * @since 4.0.024 (2008-09-12)
-		 */
-		protected $spot_colors = array();
-
-		/**
-		 * Symbol used for HTML unordered list items
-		 * @access protected
-		 * @since 4.0.028 (2008-09-26)
-		 */
-		protected $lisymbol = '';
-
-		/**
-		 * String used to mark the beginning and end of EPS image blocks
-		 * @access protected
-		 * @since 4.1.000 (2008-10-18)
-		 */
-		protected $epsmarker = 'x#!#EPS#!#x';
-
-		/**
-		 * Array of transformation matrix
-		 * @access protected
-		 * @since 4.2.000 (2008-10-29)
-		 */
-		protected $transfmatrix = array();
-
-		/**
-		 * Current key for transformation matrix
-		 * @access protected
-		 * @since 4.8.005 (2009-09-17)
-		 */
-		protected $transfmatrix_key = 0;
-
-		/**
-		 * Booklet mode for double-sided pages
-		 * @access protected
-		 * @since 4.2.000 (2008-10-29)
-		 */
-		protected $booklet = false;
-
-		/**
-		 * Epsilon value used for float calculations
-		 * @access protected
-		 * @since 4.2.000 (2008-10-29)
-		 */
-		protected $feps = 0.005;
-
-		/**
-		 * Array used for custom vertical spaces for HTML tags
-		 * @access protected
-		 * @since 4.2.001 (2008-10-30)
-		 */
-		protected $tagvspaces = array();
-
-		/**
-		 * @var HTML PARSER: custom indent amount for lists.
-		 * Negative value means disabled.
-		 * @access protected
-		 * @since 4.2.007 (2008-11-12)
-		 */
-		protected $customlistindent = -1;
-
-		/**
-		 * @var if true keeps the border open for the cell sides that cross the page.
-		 * @access protected
-		 * @since 4.2.010 (2008-11-14)
-		 */
-		protected $opencell = true;
-
-		/**
-		 * @var array of files to embedd
-		 * @access protected
-		 * @since 4.4.000 (2008-12-07)
-		 */
-		protected $embeddedfiles = array();
-
-		/**
-		 * @var boolean true when inside html pre tag
-		 * @access protected
-		 * @since 4.4.001 (2008-12-08)
-		 */
-		protected $premode = false;
-
-		/**
-		 * Array used to store positions of graphics transformation blocks inside the page buffer.
-		 * keys are the page numbers
-		 * @access protected
-		 * @since 4.4.002 (2008-12-09)
-		 */
-		protected $transfmrk = array();
-
-		/**
-		 * Default color for html links
-		 * @access protected
-		 * @since 4.4.003 (2008-12-09)
-		 */
-		protected $htmlLinkColorArray = array(0, 0, 255);
-
-		/**
-		 * Default font style to add to html links
-		 * @access protected
-		 * @since 4.4.003 (2008-12-09)
-		 */
-		protected $htmlLinkFontStyle = 'U';
-
-		/**
-		 * Counts the number of pages.
-		 * @access protected
-		 * @since 4.5.000 (2008-12-31)
-		 */
-		protected $numpages = 0;
-
-		/**
-		 * Array containing page lengths in bytes.
-		 * @access protected
-		 * @since 4.5.000 (2008-12-31)
-		 */
-		protected $pagelen = array();
-
-		/**
-		 * Counts the number of pages.
-		 * @access protected
-		 * @since 4.5.000 (2008-12-31)
-		 */
-		protected $numimages = 0;
-
-		/**
-		 * Store the image keys.
-		 * @access protected
-		 * @since 4.5.000 (2008-12-31)
-		 */
-		protected $imagekeys = array();
-
-		/**
-		 * Length of the buffer in bytes.
-		 * @access protected
-		 * @since 4.5.000 (2008-12-31)
-		 */
-		protected $bufferlen = 0;
-
-		/**
-		 * If true enables disk caching.
-		 * @access protected
-		 * @since 4.5.000 (2008-12-31)
-		 */
-		protected $diskcache = false;
-
-		/**
-		 * Counts the number of fonts.
-		 * @access protected
-		 * @since 4.5.000 (2009-01-02)
-		 */
-		protected $numfonts = 0;
-
-		/**
-		 * Store the font keys.
-		 * @access protected
-		 * @since 4.5.000 (2009-01-02)
-		 */
-		protected $fontkeys = array();
-
-		/**
-		 * Store the font object IDs.
-		 * @access protected
-		 * @since 4.8.001 (2009-09-09)
-		 */
-		protected $font_obj_ids = array();
-
-		/**
-		 * Store the fage status (true when opened, false when closed).
-		 * @access protected
-		 * @since 4.5.000 (2009-01-02)
-		 */
-		protected $pageopen = array();
-
-		/**
-		 * Default monospaced font
-		 * @access protected
-		 * @since 4.5.025 (2009-03-10)
-		 */
-		protected $default_monospaced_font = 'courier';
-
-		/**
-		 * Used to store a cloned copy of the current class object
-		 * @access protected
-		 * @since 4.5.029 (2009-03-19)
-		 */
-		protected $objcopy;
-
-		/**
-		 * Array used to store the lengths of cache files
-		 * @access protected
-		 * @since 4.5.029 (2009-03-19)
-		 */
-		protected $cache_file_length = array();
-
-		/**
-		 * Table header content to be repeated on each new page
-		 * @access protected
-		 * @since 4.5.030 (2009-03-20)
-		 */
-		protected $thead = '';
-
-		/**
-		 * Margins used for table header.
-		 * @access protected
-		 * @since 4.5.030 (2009-03-20)
-		 */
-		protected $theadMargins = array();
-
-		/**
-		 * Cache array for UTF8StringToArray() method.
-		 * @access protected
-		 * @since 4.5.037 (2009-04-07)
-		 */
-		protected $cache_UTF8StringToArray = array();
-
-		/**
-		 * Maximum size of cache array used for UTF8StringToArray() method.
-		 * @access protected
-		 * @since 4.5.037 (2009-04-07)
-		 */
-		protected $cache_maxsize_UTF8StringToArray = 8;
-
-		/**
-		 * Current size of cache array used for UTF8StringToArray() method.
-		 * @access protected
-		 * @since 4.5.037 (2009-04-07)
-		 */
-		protected $cache_size_UTF8StringToArray = 0;
-
-		/**
-		 * If true enables document signing
-		 * @access protected
-		 * @since 4.6.005 (2009-04-24)
-		 */
-		protected $sign = false;
-
-		/**
-		 * Signature data
-		 * @access protected
-		 * @since 4.6.005 (2009-04-24)
-		 */
-		protected $signature_data = array();
-
-		/**
-		 * Signature max length
-		 * @access protected
-		 * @since 4.6.005 (2009-04-24)
-		 */
-		protected $signature_max_length = 11742;
-
-		/**
-		 * Regular expression used to find blank characters used for word-wrapping.
-		 * @access protected
-		 * @since 4.6.006 (2009-04-28)
-		 */
-		protected $re_spaces = '/[\s]/';
-
-		/**
-		 * Signature object ID
-		 * @access protected
-		 * @since 4.6.022 (2009-06-23)
-		 */
-		protected $sig_obj_id = 0;
-
-		/**
-		 * ByteRange placemark used during signature process.
-		 * @access protected
-		 * @since 4.6.028 (2009-08-25)
-		 */
-		protected $byterange_string = '/ByteRange[0 ********** ********** **********]';
-
-		/**
-		 * Placemark used during signature process.
-		 * @access protected
-		 * @since 4.6.028 (2009-08-25)
-		 */
-		protected $sig_annot_ref = '***SIGANNREF*** 0 R';
-
-		/**
-		 * ID of page objects
-		 * @access protected
-		 * @since 4.7.000 (2009-08-29)
-		 */
-		protected $page_obj_id = array();
-
-		/**
-		 * Start ID for embedded file objects
-		 * @access protected
-		 * @since 4.7.000 (2009-08-29)
-		 */
-		protected $embedded_start_obj_id = 100000;
-
-		/**
-		 * Start ID for annotation objects
-		 * @access protected
-		 * @since 4.7.000 (2009-08-29)
-		 */
-		protected $annots_start_obj_id = 200000;
-
-		/**
-		 * Max ID of annotation object
-		 * @access protected
-		 * @since 4.7.000 (2009-08-29)
-		 */
-		protected $annot_obj_id = 200000;
-
-		/**
-		 * Current ID of annotation object
-		 * @access protected
-		 * @since 4.8.003 (2009-09-15)
-		 */
-		protected $curr_annot_obj_id = 200000;
-
-		/**
-		 * List of form annotations IDs
-		 * @access protected
-		 * @since 4.8.000 (2009-09-07)
-		 */
-		protected $form_obj_id = array();
-
-		/**
-		 * Deafult Javascript field properties. Possible values are described on official Javascript for Acrobat API reference. Annotation options can be directly specified using the 'aopt' entry.
-		 * @access protected
-		 * @since 4.8.000 (2009-09-07)
-		 */
-		protected $default_form_prop = array('lineWidth'=>1, 'borderStyle'=>'solid', 'fillColor'=>array(255, 255, 255), 'strokeColor'=>array(128, 128, 128));
-
-		/**
-		 * Javascript objects array
-		 * @access protected
-		 * @since 4.8.000 (2009-09-07)
-		 */
-		protected $js_objects = array();
-
-		/**
-		 * Start ID for javascript objects
-		 * @access protected
-		 * @since 4.8.000 (2009-09-07)
-		 */
-		protected $js_start_obj_id = 300000;
-
-		/**
-		 * Current ID of javascript object
-		 * @access protected
-		 * @since 4.8.000 (2009-09-07)
-		 */
-		protected $js_obj_id = 300000;
-
-		/**
-		 * Current form action (used during XHTML rendering)
-		 * @access protected
-		 * @since 4.8.000 (2009-09-07)
-		 */
-		protected $form_action = '';
-
-		/**
-		 * Current form encryption type (used during XHTML rendering)
-		 * @access protected
-		 * @since 4.8.000 (2009-09-07)
-		 */
-		protected $form_enctype = 'application/x-www-form-urlencoded';
-
-		/**
-		 * Current method to submit forms.
-		 * @access protected
-		 * @since 4.8.000 (2009-09-07)
-		 */
-		protected $form_mode = 'post';
-
-		/**
-		 * Start ID for appearance streams XObjects
-		 * @access protected
-		 * @since 4.8.001 (2009-09-09)
-		 */
-		protected $apxo_start_obj_id = 400000;
-
-		/**
-		 * Current ID of appearance streams XObjects
-		 * @access protected
-		 * @since 4.8.001 (2009-09-09)
-		 */
-		protected $apxo_obj_id = 400000;
-
-		/**
-		 * List of fonts used on form fields (fontname => fontkey).
-		 * @access protected
-		 * @since 4.8.001 (2009-09-09)
-		 */
-		protected $annotation_fonts = array();
-
-		/**
-		 * List of radio buttons parent objects.
-		 * @access protected
-		 * @since 4.8.001 (2009-09-09)
-		 */
-		protected $radiobutton_groups = array();
-
-		/**
-		 * List of radio group objects IDs
-		 * @access protected
-		 * @since 4.8.001 (2009-09-09)
-		 */
-		protected $radio_groups = array();
-
-		/**
-		 * Text indentation value (used for text-indent CSS attribute)
-		 * @access protected
-		 * @since 4.8.006 (2009-09-23)
-		 */
-		protected $textindent = 0;
-
-		/**
-		 * Store page number when startTransaction() is called.
-		 * @access protected
-		 * @since 4.8.006 (2009-09-23)
-		 */
-		protected $start_transaction_page = 0;
-
-		/**
-		 * Store Y position when startTransaction() is called.
-		 * @access protected
-		 * @since 4.9.001 (2010-03-28)
-		 */
-		protected $start_transaction_y = 0;
-
-		/**
-		 * True when we are printing the thead section on a new page
-		 * @access protected
-		 * @since 4.8.027 (2010-01-25)
-		 */
-		protected $inthead = false;
-
-		/**
-		 * Array of column measures (width, space, starting Y position)
-		 * @access protected
-		 * @since 4.9.001 (2010-03-28)
-		 */
-		protected $columns = array();
-
-		/**
-		 * Number of colums
-		 * @access protected
-		 * @since 4.9.001 (2010-03-28)
-		 */
-		protected $num_columns = 0;
-
-		/**
-		 * Current column number
-		 * @access protected
-		 * @since 4.9.001 (2010-03-28)
-		 */
-		protected $current_column = 0;
-
-		/**
-		 * Starting page for columns
-		 * @access protected
-		 * @since 4.9.001 (2010-03-28)
-		 */
-		protected $column_start_page = 0;
-
-		/**
-		 * Text rendering mode: 0 = Fill text; 1 = Stroke text; 2 = Fill, then stroke text; 3 = Neither fill nor stroke text (invisible); 4 = Fill text and add to path for clipping; 5 = Stroke text and add to path for clipping; 6 = Fill, then stroke text and add to path for clipping; 7 = Add text to path for clipping.
-		 * @access protected
-		 * @since 4.9.008 (2010-04-03)
-		 */
-		protected $textrendermode = 0;
-
-		/**
-		 * Text stroke width in doc units
-		 * @access protected
-		 * @since 4.9.008 (2010-04-03)
-		 */
-		protected $textstrokewidth = 0;
-
-		/**
-		 * @var current stroke color
-		 * @access protected
-		 * @since 4.9.008 (2010-04-03)
-		 */
-		protected $strokecolor;
-
-		/**
-		 * @var default unit of measure for document
-		 * @access protected
-		 * @since 5.0.000 (2010-04-22)
-		 */
-		protected $pdfunit = 'mm';
-
-		/**
-		 * @var true when we are on TOC (Table Of Content) page
-		 * @access protected
-		 */
-		protected $tocpage = false;
-
-		/**
-		 * @var If true convert vector images (SVG, EPS) to raster image using GD or ImageMagick library.
-		 * @access protected
-		 * @since 5.0.000 (2010-04-26)
-		 */
-		protected $rasterize_vector_images = false;
-
-		/**
-		 * @var directory used for the last SVG image
-		 * @access protected
-		 * @since 5.0.000 (2010-05-05)
-		 */
-		protected $svgdir = '';
-
-		/**
-		 * @var Deafult unit of measure for SVG
-		 * @access protected
-		 * @since 5.0.000 (2010-05-02)
-		 */
-		protected $svgunit = 'px';
-
-		/**
-		 * @var array of SVG gradients
-		 * @access protected
-		 * @since 5.0.000 (2010-05-02)
-		 */
-		protected $svggradients = array();
-
-		/**
-		 * @var ID of last SVG gradient
-		 * @access protected
-		 * @since 5.0.000 (2010-05-02)
-		 */
-		protected $svggradientid = 0;
-
-		/**
-		 * @var true when in SVG defs group
-		 * @access protected
-		 * @since 5.0.000 (2010-05-02)
-		 */
-		protected $svgdefsmode = false;
-
-		/**
-		 * @var array of SVG defs
-		 * @access protected
-		 * @since 5.0.000 (2010-05-02)
-		 */
-		protected $svgdefs = array();
-
-		/**
-		 * @var true when in SVG clipPath tag
-		 * @access protected
-		 * @since 5.0.000 (2010-04-26)
-		 */
-		protected $svgclipmode = false;
-
-		/**
-		 * @var array of SVG clipPath commands
-		 * @access protected
-		 * @since 5.0.000 (2010-05-02)
-		 */
-		protected $svgclippaths = array();
-
-		/**
-		 * @var ID of last SVG clipPath
-		 * @access protected
-		 * @since 5.0.000 (2010-05-02)
-		 */
-		protected $svgclipid = 0;
-
-		/**
-		 * @var svg text
-		 * @access protected
-		 * @since 5.0.000 (2010-05-02)
-		 */
-		protected $svgtext = '';
-
-		/**
-		 * @var array of hinheritable SVG properties
-		 * @access protected
-		 * @since 5.0.000 (2010-05-02)
-		 */
-		protected $svginheritprop = array('clip-rule', 'color', 'color-interpolation', 'color-interpolation-filters', 'color-profile', 'color-rendering', 'cursor', 'direction', 'fill', 'fill-opacity', 'fill-rule', 'font', 'font-family', 'font-size', 'font-size-adjust', 'font-stretch', 'font-style', 'font-variant', 'font-weight', 'glyph-orientation-horizontal', 'glyph-orientation-vertical', 'image-rendering', 'kerning', 'letter-spacing', 'marker', 'marker-end', 'marker-mid', 'marker-start', 'pointer-events', 'shape-rendering', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'text-anchor', 'text-rendering', 'visibility', 'word-spacing', 'writing-mode');
-
-		/**
-		 * @var array of SVG properties
-		 * @access protected
-		 * @since 5.0.000 (2010-05-02)
-		 */
-		protected $svgstyles = array(array(
-			'alignment-baseline' => 'auto',
-			'baseline-shift' => 'baseline',
-			'clip' => 'auto',
-			'clip-path' => 'none',
-			'clip-rule' => 'nonzero',
-			'color' => 'black',
-			'color-interpolation' => 'sRGB',
-			'color-interpolation-filters' => 'linearRGB',
-			'color-profile' => 'auto',
-			'color-rendering' => 'auto',
-			'cursor' => 'auto',
-			'direction' => 'ltr',
-			'display' => 'inline',
-			'dominant-baseline' => 'auto',
-			'enable-background' => 'accumulate',
-			'fill' => 'black',
-			'fill-opacity' => 1,
-			'fill-rule' => 'nonzero',
-			'filter' => 'none',
-			'flood-color' => 'black',
-			'flood-opacity' => 1,
-			'font' => '',
-			'font-family' => 'helvetica',
-			'font-size' => 'medium',
-			'font-size-adjust' => 'none',
-			'font-stretch' => 'normal',
-			'font-style' => 'normal',
-			'font-variant' => 'normal',
-			'font-weight' => 'normal',
-			'glyph-orientation-horizontal' => '0deg',
-			'glyph-orientation-vertical' => 'auto',
-			'image-rendering' => 'auto',
-			'kerning' => 'auto',
-			'letter-spacing' => 'normal',
-			'lighting-color' => 'white',
-			'marker' => '',
-			'marker-end' => 'none',
-			'marker-mid' => 'none',
-			'marker-start' => 'none',
-			'mask' => 'none',
-			'opacity' => 1,
-			'overflow' => 'auto',
-			'pointer-events' => 'visiblePainted',
-			'shape-rendering' => 'auto',
-			'stop-color' => 'black',
-			'stop-opacity' => 1,
-			'stroke' => 'none',
-			'stroke-dasharray' => 'none',
-			'stroke-dashoffset' => 0,
-			'stroke-linecap' => 'butt',
-			'stroke-linejoin' => 'miter',
-			'stroke-miterlimit' => 4,
-			'stroke-opacity' => 1,
-			'stroke-width' => 1,
-			'text-anchor' => 'start',
-			'text-decoration' => 'none',
-			'text-rendering' => 'auto',
-			'unicode-bidi' => 'normal',
-			'visibility' => 'visible',
-			'word-spacing' => 'normal',
-			'writing-mode' => 'lr-tb',
-			'text-color' => 'black',
-			'transfmatrix' => array(1, 0, 0, 1, 0, 0)
-			));
-
-		//------------------------------------------------------------
-		// METHODS
-		//------------------------------------------------------------
-
-		/**
-		 * This is the class constructor.
-		 * It allows to set up the page format, the orientation and
-		 * the measure unit used in all the methods (except for the font sizes).
-		 * @since 1.0
-		 * @param string $orientation page orientation. Possible values are (case insensitive):<ul><li>P or Portrait (default)</li><li>L or Landscape</li></ul>
-		 * @param string $unit User measure unit. Possible values are:<ul><li>pt: point</li><li>mm: millimeter (default)</li><li>cm: centimeter</li><li>in: inch</li></ul><br />A point equals 1/72 of inch, that is to say about 0.35 mm (an inch being 2.54 cm). This is a very common unit in typography; font sizes are expressed in that unit.
-		 * @param mixed $format The format used for pages. It can be either one of the following values (case insensitive) or a custom format in the form of a two-element array containing the width and the height (expressed in the unit given by unit).<ul><li>4A0</li><li>2A0</li><li>A0</li><li>A1</li><li>A2</li><li>A3</li><li>A4 (default)</li><li>A5</li><li>A6</li><li>A7</li><li>A8</li><li>A9</li><li>A10</li><li>B0</li><li>B1</li><li>B2</li><li>B3</li><li>B4</li><li>B5</li><li>B6</li><li>B7</li><li>B8</li><li>B9</li><li>B10</li><li>C0</li><li>C1</li><li>C2</li><li>C3</li><li>C4</li><li>C5</li><li>C6</li><li>C7</li><li>C8</li><li>C9</li><li>C10</li><li>RA0</li><li>RA1</li><li>RA2</li><li>RA3</li><li>RA4</li><li>SRA0</li><li>SRA1</li><li>SRA2</li><li>SRA3</li><li>SRA4</li><li>LETTER</li><li>LEGAL</li><li>EXECUTIVE</li><li>FOLIO</li></ul>
-		 * @param boolean $unicode TRUE means that the input text is unicode (default = true)
-		 * @param boolean $diskcache if TRUE reduce the RAM memory usage by caching temporary data on filesystem (slower).
-		 * @param String $encoding charset encoding; default is UTF-8
-		 * @access public
-		 */
-		public function __construct($orientation='P', $unit='mm', $format='A4', $unicode=true, $encoding='UTF-8', $diskcache=false) {
-			/* Set internal character encoding to ASCII */
-			if (function_exists('mb_internal_encoding') AND mb_internal_encoding()) {
-				$this->internal_encoding = mb_internal_encoding();
-				mb_internal_encoding('ASCII');
-			}
-			// set disk caching
-			$this->diskcache = $diskcache ? true : false;
-			// set language direction
-			$this->rtl = false;
-			$this->tmprtl = false;
-			//Some checks
-			$this->_dochecks();
-			//Initialization of properties
-			$this->isunicode = $unicode;
-			$this->page = 0;
-			$this->transfmrk[0] = array();
-			$this->pagedim = array();
-			$this->n = 2;
-			$this->buffer = '';
-			$this->pages = array();
-			$this->state = 0;
-			$this->fonts = array();
-			$this->FontFiles = array();
-			$this->diffs = array();
-			$this->images = array();
-			$this->links = array();
-			$this->gradients = array();
-			$this->InFooter = false;
-			$this->lasth = 0;
-			$this->FontFamily = 'helvetica';
-			$this->FontStyle = '';
-			$this->FontSizePt = 12;
-			$this->underline = false;
-			$this->overline = false;
-			$this->linethrough = false;
-			$this->DrawColor = '0 G';
-			$this->FillColor = '0 g';
-			$this->TextColor = '0 g';
-			$this->ColorFlag = false;
-			// encryption values
-			$this->encrypted = false;
-			$this->last_rc4_key = '';
-			$this->padding = "\x28\xBF\x4E\x5E\x4E\x75\x8A\x41\x64\x00\x4E\x56\xFF\xFA\x01\x08\x2E\x2E\x00\xB6\xD0\x68\x3E\x80\x2F\x0C\xA9\xFE\x64\x53\x69\x7A";
-			//Standard Unicode fonts
-			$this->CoreFonts = array(
-				'courier'=>'Courier',
-				'courierB'=>'Courier-Bold',
-				'courierI'=>'Courier-Oblique',
-				'courierBI'=>'Courier-BoldOblique',
-				'helvetica'=>'Helvetica',
-				'helveticaB'=>'Helvetica-Bold',
-				'helveticaI'=>'Helvetica-Oblique',
-				'helveticaBI'=>'Helvetica-BoldOblique',
-				'times'=>'Times-Roman',
-				'timesB'=>'Times-Bold',
-				'timesI'=>'Times-Italic',
-				'timesBI'=>'Times-BoldItalic',
-				'symbol'=>'Symbol',
-				'zapfdingbats'=>'ZapfDingbats'
-			);
-			//Set scale factor
-			$this->setPageUnit($unit);
-			// set page format and orientation
-			$this->setPageFormat($format, $orientation);
-			//Page margins (1 cm)
-			$margin = 28.35 / $this->k;
-			$this->SetMargins($margin, $margin);
-			//Interior cell margin
-			$this->cMargin = $margin / 10;
-			//Line width (0.2 mm)
-			$this->LineWidth = 0.57 / $this->k;
-			$this->linestyleWidth = sprintf('%.2F w', ($this->LineWidth * $this->k));
-			$this->linestyleCap = '0 J';
-			$this->linestyleJoin = '0 j';
-			$this->linestyleDash = '[] 0 d';
-			//Automatic page break
-			$this->SetAutoPageBreak(true, (2 * $margin));
-			//Full width display mode
-			$this->SetDisplayMode('fullwidth');
-			//Compression
-			$this->SetCompression(true);
-			//Set default PDF version number
-			$this->PDFVersion = '1.7';
-			$this->encoding = $encoding;
-			$this->HREF = array();
-			$this->getFontsList();
-			$this->fgcolor = array('R' => 0, 'G' => 0, 'B' => 0);
-			$this->strokecolor = array('R' => 0, 'G' => 0, 'B' => 0);
-			$this->bgcolor = array('R' => 255, 'G' => 255, 'B' => 255);
-			$this->extgstates = array();
-			// user's rights
-			$this->sign = false;
-			$this->ur = false;
-			$this->ur_document = '/FullSave';
-			$this->ur_annots = '/Create/Delete/Modify/Copy/Import/Export';
-			$this->ur_form = '/Add/Delete/FillIn/Import/Export/SubmitStandalone/SpawnTemplate';
-			$this->ur_signature = '/Modify';
-			// set default JPEG quality
-			$this->jpeg_quality = 75;
-			// initialize some settings
-			$this->utf8Bidi(array(''), '');
-			// set default font
-			$this->SetFont($this->FontFamily, $this->FontStyle, $this->FontSizePt);
-			// check if PCRE Unicode support is enabled
-			if ($this->isunicode AND (@preg_match('/\pL/u', 'a') == 1)) {
-				// PCRE unicode support is turned ON
-				// \p{Z} or \p{Separator}: any kind of Unicode whitespace or invisible separator.
-				// \p{Lo} or \p{Other_Letter}: a Unicode letter or ideograph that does not have lowercase and uppercase variants.
-				// \p{Lo} is needed because Chinese characters are packed next to each other without spaces in between.
-				//$this->re_spaces = '/[\s\p{Z}\p{Lo}]/u';
-				$this->re_spaces = '/[\s\p{Z}]/u';
-			} else {
-				// PCRE unicode support is turned OFF
-				$this->re_spaces = '/[\s]/';
-			}
-			$this->annot_obj_id = $this->annots_start_obj_id;
-			$this->curr_annot_obj_id = $this->annots_start_obj_id;
-			$this->apxo_obj_id = $this->apxo_start_obj_id;
-			$this->js_obj_id = $this->js_start_obj_id;
-			$this->default_form_prop = array('lineWidth'=>1, 'borderStyle'=>'solid', 'fillColor'=>array(255, 255, 255), 'strokeColor'=>array(128, 128, 128));
-		}
-
-		/**
-		 * Default destructor.
-		 * @access public
-		 * @since 1.53.0.TC016
-		 */
-		public function __destruct() {
-			// restore internal encoding
-			if (isset($this->internal_encoding) AND !empty($this->internal_encoding)) {
-				mb_internal_encoding($this->internal_encoding);
-			}
-			// unset all class variables
-			$this->_destroy(true);
-		}
-
-		/**
-		 * Set the units of measure for the document.
-		 * @param string $unit User measure unit. Possible values are:<ul><li>pt: point</li><li>mm: millimeter (default)</li><li>cm: centimeter</li><li>in: inch</li></ul><br />A point equals 1/72 of inch, that is to say about 0.35 mm (an inch being 2.54 cm). This is a very common unit in typography; font sizes are expressed in that unit.
-		 * @access public
-		 * @since 3.0.015 (2008-06-06)
-		 */
-		public function setPageUnit($unit) {
-			$unit = strtolower($unit);
-			//Set scale factor
-			switch ($unit) {
-				// points
-				case 'px':
-				case 'pt': {
-					$this->k = 1;
-					break;
-				}
-				// millimeters
-				case 'mm': {
-					$this->k = $this->dpi / 25.4;
-					break;
-				}
-				// centimeters
-				case 'cm': {
-					$this->k = $this->dpi / 2.54;
-					break;
-				}
-				// inches
-				case 'in': {
-					$this->k = $this->dpi;
-					break;
-				}
-				// unsupported unit
-				default : {
-					$this->Error('Incorrect unit: '.$unit);
-					break;
-				}
-			}
-			$this->pdfunit = $unit;
-			if (isset($this->CurOrientation)) {
-					$this->setPageOrientation($this->CurOrientation);
-			}
-		}
-
-		/**
-		 * Set the page format
-		 * @param mixed $format The format used for pages. It can be either one of the following values (case insensitive) or a custom format in the form of a two-element array containing the width and the height (expressed in the unit given by unit).<ul><li>4A0</li><li>2A0</li><li>A0</li><li>A1</li><li>A2</li><li>A3</li><li>A4 (default)</li><li>A5</li><li>A6</li><li>A7</li><li>A8</li><li>A9</li><li>A10</li><li>B0</li><li>B1</li><li>B2</li><li>B3</li><li>B4</li><li>B5</li><li>B6</li><li>B7</li><li>B8</li><li>B9</li><li>B10</li><li>C0</li><li>C1</li><li>C2</li><li>C3</li><li>C4</li><li>C5</li><li>C6</li><li>C7</li><li>C8</li><li>C9</li><li>C10</li><li>RA0</li><li>RA1</li><li>RA2</li><li>RA3</li><li>RA4</li><li>SRA0</li><li>SRA1</li><li>SRA2</li><li>SRA3</li><li>SRA4</li><li>LETTER</li><li>LEGAL</li><li>EXECUTIVE</li><li>FOLIO</li></ul>
-		 * @param string $orientation page orientation. Possible values are (case insensitive):<ul><li>P or PORTRAIT (default)</li><li>L or LANDSCAPE</li></ul>
-		 * @access public
-		 * @since 3.0.015 (2008-06-06)
-		 */
-		public function setPageFormat($format, $orientation='P') {
-			//Page format
-			if (is_string($format)) {
-				// Page formats (45 standard ISO paper formats and 4 american common formats).
-				// Paper cordinates are calculated in this way: (inches * 72) where (1 inch = 2.54 cm)
-				switch (strtoupper($format)) {
-					case '4A0': {$format = array(4767.87,6740.79); break;}
-					case '2A0': {$format = array(3370.39,4767.87); break;}
-					case 'A0': {$format = array(2383.94,3370.39); break;}
-					case 'A1': {$format = array(1683.78,2383.94); break;}
-					case 'A2': {$format = array(1190.55,1683.78); break;}
-					case 'A3': {$format = array(841.89,1190.55); break;}
-					case 'A4': default: {$format = array(595.28,841.89); break;}
-					case 'A5': {$format = array(419.53,595.28); break;}
-					case 'A6': {$format = array(297.64,419.53); break;}
-					case 'A7': {$format = array(209.76,297.64); break;}
-					case 'A8': {$format = array(147.40,209.76); break;}
-					case 'A9': {$format = array(104.88,147.40); break;}
-					case 'A10': {$format = array(73.70,104.88); break;}
-					case 'B0': {$format = array(2834.65,4008.19); break;}
-					case 'B1': {$format = array(2004.09,2834.65); break;}
-					case 'B2': {$format = array(1417.32,2004.09); break;}
-					case 'B3': {$format = array(1000.63,1417.32); break;}
-					case 'B4': {$format = array(708.66,1000.63); break;}
-					case 'B5': {$format = array(498.90,708.66); break;}
-					case 'B6': {$format = array(354.33,498.90); break;}
-					case 'B7': {$format = array(249.45,354.33); break;}
-					case 'B8': {$format = array(175.75,249.45); break;}
-					case 'B9': {$format = array(124.72,175.75); break;}
-					case 'B10': {$format = array(87.87,124.72); break;}
-					case 'C0': {$format = array(2599.37,3676.54); break;}
-					case 'C1': {$format = array(1836.85,2599.37); break;}
-					case 'C2': {$format = array(1298.27,1836.85); break;}
-					case 'C3': {$format = array(918.43,1298.27); break;}
-					case 'C4': {$format = array(649.13,918.43); break;}
-					case 'C5': {$format = array(459.21,649.13); break;}
-					case 'C6': {$format = array(323.15,459.21); break;}
-					case 'C7': {$format = array(229.61,323.15); break;}
-					case 'C8': {$format = array(161.57,229.61); break;}
-					case 'C9': {$format = array(113.39,161.57); break;}
-					case 'C10': {$format = array(79.37,113.39); break;}
-					case 'RA0': {$format = array(2437.80,3458.27); break;}
-					case 'RA1': {$format = array(1729.13,2437.80); break;}
-					case 'RA2': {$format = array(1218.90,1729.13); break;}
-					case 'RA3': {$format = array(864.57,1218.90); break;}
-					case 'RA4': {$format = array(609.45,864.57); break;}
-					case 'SRA0': {$format = array(2551.18,3628.35); break;}
-					case 'SRA1': {$format = array(1814.17,2551.18); break;}
-					case 'SRA2': {$format = array(1275.59,1814.17); break;}
-					case 'SRA3': {$format = array(907.09,1275.59); break;}
-					case 'SRA4': {$format = array(637.80,907.09); break;}
-					case 'LETTER': {$format = array(612.00,792.00); break;}
-					case 'LEGAL': {$format = array(612.00,1008.00); break;}
-					case 'EXECUTIVE': {$format = array(521.86,756.00); break;}
-					case 'FOLIO': {$format = array(612.00,936.00); break;}
-				}
-				$this->fwPt = $format[0];
-				$this->fhPt = $format[1];
-			} else {
-				$this->fwPt = $format[0] * $this->k;
-				$this->fhPt = $format[1] * $this->k;
-			}
-			$this->setPageOrientation($orientation);
-		}
-
-		/**
-		 * Set page orientation.
-		 * @param string $orientation page orientation. Possible values are (case insensitive):<ul><li>P or PORTRAIT (default)</li><li>L or LANDSCAPE</li></ul>
-		 * @param boolean $autopagebreak Boolean indicating if auto-page-break mode should be on or off.
-		 * @param float $bottommargin bottom margin of the page.
-		 * @access public
-		 * @since 3.0.015 (2008-06-06)
-		 */
-		public function setPageOrientation($orientation, $autopagebreak='', $bottommargin='') {
-			if ($this->fwPt > $this->fhPt) {
-				// landscape
-				$default_orientation = 'L';
-			} else {
-				// portrait
-				$default_orientation = 'P';
-			}
-			$valid_orientations = array('P', 'L');
-			if (empty($orientation)) {
-				$orientation = $default_orientation;
-			} else {
-				$orientation = $orientation{0};
-				$orientation = strtoupper($orientation);
-			}
-			if (in_array($orientation, $valid_orientations) AND ($orientation != $default_orientation)) {
-				$this->CurOrientation = $orientation;
-				$this->wPt = $this->fhPt;
-				$this->hPt = $this->fwPt;
-			} else {
-				$this->CurOrientation = $default_orientation;
-				$this->wPt = $this->fwPt;
-				$this->hPt = $this->fhPt;
-			}
-			$this->w = $this->wPt / $this->k;
-			$this->h = $this->hPt / $this->k;
-			if ($this->empty_string($autopagebreak)) {
-				if (isset($this->AutoPageBreak)) {
-					$autopagebreak = $this->AutoPageBreak;
-				} else {
-					$autopagebreak = true;
-				}
-			}
-			if ($this->empty_string($bottommargin)) {
-				if (isset($this->bMargin)) {
-					$bottommargin = $this->bMargin;
-				} else {
-					// default value = 2 cm
-					$bottommargin = 2 * 28.35 / $this->k;
-				}
-			}
-			$this->SetAutoPageBreak($autopagebreak, $bottommargin);
-			// store page dimensions
-			$this->pagedim[$this->page] = array('w' => $this->wPt, 'h' => $this->hPt, 'wk' => $this->w, 'hk' => $this->h, 'tm' => $this->tMargin, 'bm' => $bottommargin, 'lm' => $this->lMargin, 'rm' => $this->rMargin, 'pb' => $autopagebreak, 'or' => $this->CurOrientation, 'olm' => $this->original_lMargin, 'orm' => $this->original_rMargin);
-		}
-
-		/**
-		 * Set regular expression to detect withespaces or word separators.
-		 * @param string $re regular expression (leave empty for default).
-		 * @access public
-		 * @since 4.6.016 (2009-06-15)
-		 */
-		public function setSpacesRE($re='/[\s]/') {
-			// if PCRE unicode support is turned ON:
-			// 	\p{Z} or \p{Separator}: any kind of Unicode whitespace or invisible separator.
-			// 	\p{Lo} or \p{Other_Letter}: a Unicode letter or ideograph that does not have lowercase and uppercase variants.
-			// 	\p{Lo} is needed because Chinese characters are packed next to each other without spaces in between.
-			$this->re_spaces = $re;
-		}
-
-		/**
-		 * Enable or disable Right-To-Left language mode
-		 * @param Boolean $enable if true enable Right-To-Left language mode.
-		 * @param Boolean $resetx if true reset the X position on direction change.
-		 * @access public
-		 * @since 2.0.000 (2008-01-03)
-		 */
-		public function setRTL($enable, $resetx=true) {
-			$enable = $enable ? true : false;
-			$resetx = ($resetx AND ($enable != $this->rtl));
-			$this->rtl = $enable;
-			$this->tmprtl = false;
-			if ($resetx) {
-				$this->Ln(0);
-			}
-		}
-
-		/**
-		 * Return the RTL status
-		 * @return boolean
-		 * @access public
-		 * @since 4.0.012 (2008-07-24)
-		 */
-		public function getRTL() {
-			return $this->rtl;
-		}
-
-		/**
-		 * Force temporary RTL language direction
-		 * @param mixed $mode can be false, 'L' for LTR or 'R' for RTL
-		 * @access public
-		 * @since 2.1.000 (2008-01-09)
-		 */
-		public function setTempRTL($mode) {
-			$newmode = false;
-			switch ($mode) {
-				case 'ltr':
-				case 'LTR':
-				case 'L': {
-					if ($this->rtl) {
-						$newmode = 'L';
-					}
-					break;
-				}
-				case 'rtl':
-				case 'RTL':
-				case 'R': {
-					if (!$this->rtl) {
-						$newmode = 'R';
-					}
-					break;
-				}
-				case false:
-				default: {
-					$newmode = false;
-					break;
-				}
-			}
-			$this->tmprtl = $newmode;
-		}
-
-		/**
-		 * Return the current temporary RTL status
-		 * @return boolean
-		 * @access public
-		 * @since 4.8.014 (2009-11-04)
-		 */
-		public function isRTLTextDir() {
-			return ($this->rtl OR ($this->tmprtl == 'R'));
-		}
-
-		/**
-		 * Set the last cell height.
-		 * @param float $h cell height.
-		 * @author Nicola Asuni
-		 * @access public
-		 * @since 1.53.0.TC034
-		 */
-		public function setLastH($h) {
-			$this->lasth = $h;
-		}
-
-		/**
-		 * Get the last cell height.
-		 * @return last cell height
-		 * @access public
-		 * @since 4.0.017 (2008-08-05)
-		 */
-		public function getLastH() {
-			return $this->lasth;
-		}
-
-		/**
-		 * Set the adjusting factor to convert pixels to user units.
-		 * @param float $scale adjusting factor to convert pixels to user units.
-		 * @author Nicola Asuni
-		 * @access public
-		 * @since 1.5.2
-		 */
-		public function setImageScale($scale) {
-			$this->imgscale = $scale;
-		}
-
-		/**
-		 * Returns the adjusting factor to convert pixels to user units.
-		 * @return float adjusting factor to convert pixels to user units.
-		 * @author Nicola Asuni
-		 * @access public
-		 * @since 1.5.2
-		 */
-		public function getImageScale() {
-			return $this->imgscale;
-		}
-
-		/**
-		 * Returns an array of page dimensions:
-		 * <ul><li>$this->pagedim[$this->page]['w'] => page_width_in_points</li><li>$this->pagedim[$this->page]['h'] => height in points</li><li>$this->pagedim[$this->page]['wk'] => page_width_in_points</li><li>$this->pagedim[$this->page]['hk'] => height</li><li>$this->pagedim[$this->page]['tm'] => top_margin</li><li>$this->pagedim[$this->page]['bm'] => bottom_margin</li><li>$this->pagedim[$this->page]['lm'] => left_margin</li><li>$this->pagedim[$this->page]['rm'] => right_margin</li><li>$this->pagedim[$this->page]['pb'] => auto_page_break</li><li>$this->pagedim[$this->page]['or'] => page_orientation</li><li>$this->pagedim[$this->page]['olm'] => original_left_margin</li><li>$this->pagedim[$this->page]['orm'] => original_right_margin</li></ul>
-		 * @param int $pagenum page number (empty = current page)
-		 * @return array of page dimensions.
-		 * @author Nicola Asuni
-		 * @access public
-		 * @since 4.5.027 (2009-03-16)
-		 */
-		public function getPageDimensions($pagenum='') {
-			if (empty($pagenum)) {
-				$pagenum = $this->page;
-			}
-			return $this->pagedim[$pagenum];
-		}
-
-		/**
-		 * Returns the page width in units.
-		 * @param int $pagenum page number (empty = current page)
-		 * @return int page width.
-		 * @author Nicola Asuni
-		 * @access public
-		 * @since 1.5.2
-		 * @see getPageDimensions()
-		 */
-		public function getPageWidth($pagenum='') {
-			if (empty($pagenum)) {
-				return $this->w;
-			}
-			return $this->pagedim[$pagenum]['w'];
-		}
-
-		/**
-		 * Returns the page height in units.
-		 * @param int $pagenum page number (empty = current page)
-		 * @return int page height.
-		 * @author Nicola Asuni
-		 * @access public
-		 * @since 1.5.2
-		 * @see getPageDimensions()
-		 */
-		public function getPageHeight($pagenum='') {
-			if (empty($pagenum)) {
-				return $this->h;
-			}
-			return $this->pagedim[$pagenum]['h'];
-		}
-
-		/**
-		 * Returns the page break margin.
-		 * @param int $pagenum page number (empty = current page)
-		 * @return int page break margin.
-		 * @author Nicola Asuni
-		 * @access public
-		 * @since 1.5.2
-		 * @see getPageDimensions()
-		 */
-		public function getBreakMargin($pagenum='') {
-			if (empty($pagenum)) {
-				return $this->bMargin;
-			}
-			return $this->pagedim[$pagenum]['bm'];
-		}
-
-		/**
-		 * Returns the scale factor (number of points in user unit).
-		 * @return int scale factor.
-		 * @author Nicola Asuni
-		 * @access public
-		 * @since 1.5.2
-		 */
-		public function getScaleFactor() {
-			return $this->k;
-		}
-
-		/**
-		 * Defines the left, top and right margins.
-		 * @param float $left Left margin.
-		 * @param float $top Top margin.
-		 * @param float $right Right margin. Default value is the left one.
-		 * @param boolean $keepmargins if true overwrites the default page margins
-		 * @access public
-		 * @since 1.0
-		 * @see SetLeftMargin(), SetTopMargin(), SetRightMargin(), SetAutoPageBreak()
-		 */
-		public function SetMargins($left, $top, $right=-1, $keepmargins=false) {
-			//Set left, top and right margins
-			$this->lMargin = $left;
-			$this->tMargin = $top;
-			if ($right == -1) {
-				$right = $left;
-			}
-			$this->rMargin = $right;
-			if ($keepmargins) {
-				// overwrite original values
-				$this->original_lMargin = $this->lMargin;
-				$this->original_rMargin = $this->rMargin;
-			}
-		}
-
-		/**
-		 * Defines the left margin. The method can be called before creating the first page. If the current abscissa gets out of page, it is brought back to the margin.
-		 * @param float $margin The margin.
-		 * @access public
-		 * @since 1.4
-		 * @see SetTopMargin(), SetRightMargin(), SetAutoPageBreak(), SetMargins()
-		 */
-		public function SetLeftMargin($margin) {
-			//Set left margin
-			$this->lMargin=$margin;
-			if (($this->page > 0) AND ($this->x < $margin)) {
-				$this->x = $margin;
-			}
-		}
-
-		/**
-		 * Defines the top margin. The method can be called before creating the first page.
-		 * @param float $margin The margin.
-		 * @access public
-		 * @since 1.5
-		 * @see SetLeftMargin(), SetRightMargin(), SetAutoPageBreak(), SetMargins()
-		 */
-		public function SetTopMargin($margin) {
-			//Set top margin
-			$this->tMargin=$margin;
-			if (($this->page > 0) AND ($this->y < $margin)) {
-				$this->y = $margin;
-			}
-		}
-
-		/**
-		 * Defines the right margin. The method can be called before creating the first page.
-		 * @param float $margin The margin.
-		 * @access public
-		 * @since 1.5
-		 * @see SetLeftMargin(), SetTopMargin(), SetAutoPageBreak(), SetMargins()
-		 */
-		public function SetRightMargin($margin) {
-			$this->rMargin=$margin;
-			if (($this->page > 0) AND ($this->x > ($this->w - $margin))) {
-				$this->x = $this->w - $margin;
-			}
-		}
-
-		/**
-		 * Set the internal Cell padding.
-		 * @param float $pad internal padding.
-		 * @access public
-		 * @since 2.1.000 (2008-01-09)
-		 * @see Cell(), SetLeftMargin(), SetTopMargin(), SetAutoPageBreak(), SetMargins()
-		 */
-		public function SetCellPadding($pad) {
-			$this->cMargin = $pad;
-		}
-
-		/**
-		 * Enables or disables the automatic page breaking mode. When enabling, the second parameter is the distance from the bottom of the page that defines the triggering limit. By default, the mode is on and the margin is 2 cm.
-		 * @param boolean $auto Boolean indicating if mode should be on or off.
-		 * @param float $margin Distance from the bottom of the page.
-		 * @access public
-		 * @since 1.0
-		 * @see Cell(), MultiCell(), AcceptPageBreak()
-		 */
-		public function SetAutoPageBreak($auto, $margin=0) {
-			//Set auto page break mode and triggering margin
-			$this->AutoPageBreak = $auto;
-			$this->bMargin = $margin;
-			$this->PageBreakTrigger = $this->h - $margin;
-		}
-
-		/**
-		 * Defines the way the document is to be displayed by the viewer.
-		 * @param mixed $zoom The zoom to use. It can be one of the following string values or a number indicating the zooming factor to use. <ul><li>fullpage: displays the entire page on screen </li><li>fullwidth: uses maximum width of window</li><li>real: uses real size (equivalent to 100% zoom)</li><li>default: uses viewer default mode</li></ul>
-		 * @param string $layout The page layout. Possible values are:<ul><li>SinglePage Display one page at a time</li><li>OneColumn Display the pages in one column</li><li>TwoColumnLeft Display the pages in two columns, with odd-numbered pages on the left</li><li>TwoColumnRight Display the pages in two columns, with odd-numbered pages on the right</li><li>TwoPageLeft (PDF 1.5) Display the pages two at a time, with odd-numbered pages on the left</li><li>TwoPageRight (PDF 1.5) Display the pages two at a time, with odd-numbered pages on the right</li></ul>
-		 * @param string $mode A name object specifying how the document should be displayed when opened:<ul><li>UseNone Neither document outline nor thumbnail images visible</li><li>UseOutlines Document outline visible</li><li>UseThumbs Thumbnail images visible</li><li>FullScreen Full-screen mode, with no menu bar, window controls, or any other window visible</li><li>UseOC (PDF 1.5) Optional content group panel visible</li><li>UseAttachments (PDF 1.6) Attachments panel visible</li></ul>
-		 * @access public
-		 * @since 1.2
-		 */
-		public function SetDisplayMode($zoom, $layout='SinglePage', $mode='UseNone') {
-			//Set display mode in viewer
-			if (($zoom == 'fullpage') OR ($zoom == 'fullwidth') OR ($zoom == 'real') OR ($zoom == 'default') OR (!is_string($zoom))) {
-				$this->ZoomMode = $zoom;
-			} else {
-				$this->Error('Incorrect zoom display mode: '.$zoom);
-			}
-			switch ($layout) {
-				case 'default':
-				case 'single':
-				case 'SinglePage': {
-					$this->LayoutMode = 'SinglePage';
-					break;
-				}
-				case 'continuous':
-				case 'OneColumn': {
-					$this->LayoutMode = 'OneColumn';
-					break;
-				}
-				case 'two':
-				case 'TwoColumnLeft': {
-					$this->LayoutMode = 'TwoColumnLeft';
-					break;
-				}
-				case 'TwoColumnRight': {
-					$this->LayoutMode = 'TwoColumnRight';
-					break;
-				}
-				case 'TwoPageLeft': {
-					$this->LayoutMode = 'TwoPageLeft';
-					break;
-				}
-				case 'TwoPageRight': {
-					$this->LayoutMode = 'TwoPageRight';
-					break;
-				}
-				default: {
-					$this->LayoutMode = 'SinglePage';
-				}
-			}
-			switch ($mode) {
-				case 'UseNone': {
-					$this->PageMode = 'UseNone';
-					break;
-				}
-				case 'UseOutlines': {
-					$this->PageMode = 'UseOutlines';
-					break;
-				}
-				case 'UseThumbs': {
-					$this->PageMode = 'UseThumbs';
-					break;
-				}
-				case 'FullScreen': {
-					$this->PageMode = 'FullScreen';
-					break;
-				}
-				case 'UseOC': {
-					$this->PageMode = 'UseOC';
-					break;
-				}
-				case '': {
-					$this->PageMode = 'UseAttachments';
-					break;
-				}
-				default: {
-					$this->PageMode = 'UseNone';
-				}
-			}
-		}
-
-		/**
-		 * Activates or deactivates page compression. When activated, the internal representation of each page is compressed, which leads to a compression ratio of about 2 for the resulting document. Compression is on by default.
-		 * Note: the Zlib extension is required for this feature. If not present, compression will be turned off.
-		 * @param boolean $compress Boolean indicating if compression must be enabled.
-		 * @access public
-		 * @since 1.4
-		 */
-		public function SetCompression($compress) {
-			//Set page compression
-			if (function_exists('gzcompress')) {
-				$this->compress = $compress;
-			} else {
-				$this->compress = false;
-			}
-		}
-
-		/**
-		 * Defines the title of the document.
-		 * @param string $title The title.
-		 * @access public
-		 * @since 1.2
-		 * @see SetAuthor(), SetCreator(), SetKeywords(), SetSubject()
-		 */
-		public function SetTitle($title) {
-			//Title of document
-			$this->title = $title;
-		}
-
-		/**
-		 * Defines the subject of the document.
-		 * @param string $subject The subject.
-		 * @access public
-		 * @since 1.2
-		 * @see SetAuthor(), SetCreator(), SetKeywords(), SetTitle()
-		 */
-		public function SetSubject($subject) {
-			//Subject of document
-			$this->subject = $subject;
-		}
-
-		/**
-		 * Defines the author of the document.
-		 * @param string $author The name of the author.
-		 * @access public
-		 * @since 1.2
-		 * @see SetCreator(), SetKeywords(), SetSubject(), SetTitle()
-		 */
-		public function SetAuthor($author) {
-			//Author of document
-			$this->author = $author;
-		}
-
-		/**
-		 * Associates keywords with the document, generally in the form 'keyword1 keyword2 ...'.
-		 * @param string $keywords The list of keywords.
-		 * @access public
-		 * @since 1.2
-		 * @see SetAuthor(), SetCreator(), SetSubject(), SetTitle()
-		 */
-		public function SetKeywords($keywords) {
-			//Keywords of document
-			$this->keywords = $keywords;
-		}
-
-		/**
-		 * Defines the creator of the document. This is typically the name of the application that generates the PDF.
-		 * @param string $creator The name of the creator.
-		 * @access public
-		 * @since 1.2
-		 * @see SetAuthor(), SetKeywords(), SetSubject(), SetTitle()
-		 */
-		public function SetCreator($creator) {
-			//Creator of document
-			$this->creator = $creator;
-		}
-
-		/**
-		 * This method is automatically called in case of fatal error; it simply outputs the message and halts the execution. An inherited class may override it to customize the error handling but should always halt the script, or the resulting document would probably be invalid.
-		 * 2004-06-11 :: Nicola Asuni : changed bold tag with strong
-		 * @param string $msg The error message
-		 * @access public
-		 * @since 1.0
-		 */
-		public function Error($msg) {
-			// unset all class variables
-			$this->_destroy(true);
-			// exit program and print error
-			die('<strong>TCPDF ERROR: </strong>'.$msg);
-		}
-
-		/**
-		 * This method begins the generation of the PDF document.
-		 * It is not necessary to call it explicitly because AddPage() does it automatically.
-		 * Note: no page is created by this method
-		 * @access public
-		 * @since 1.0
-		 * @see AddPage(), Close()
-		 */
-		public function Open() {
-			//Begin document
-			$this->state = 1;
-		}
-
-		/**
-		 * Terminates the PDF document.
-		 * It is not necessary to call this method explicitly because Output() does it automatically.
-		 * If the document contains no page, AddPage() is called to prevent from getting an invalid document.
-		 * @access public
-		 * @since 1.0
-		 * @see Open(), Output()
-		 */
-		public function Close() {
-			if ($this->state == 3) {
-				return;
-			}
-			if ($this->page == 0) {
-				$this->AddPage();
-			}
-			// close page
-			$this->endPage();
-			// close document
-			$this->_enddoc();
-			// unset all class variables (except critical ones)
-			$this->_destroy(false);
-		}
-
-		/**
-		 * Move pointer at the specified document page and update page dimensions.
-		 * @param int $pnum page number (1 ... numpages)
-		 * @param boolean $resetmargins if true reset left, right, top margins and Y position.
-		 * @access public
-		 * @since 2.1.000 (2008-01-07)
-		 * @see getPage(), lastpage(), getNumPages()
-		 */
-		public function setPage($pnum, $resetmargins=false) {
-			if ($pnum == $this->page) {
-				return;
-			}
-			if (($pnum > 0) AND ($pnum <= $this->numpages)) {
-				$this->state = 2;
-				// save current graphic settings
-				//$gvars = $this->getGraphicVars();
-				$oldpage = $this->page;
-				$this->page = $pnum;
-				$this->wPt = $this->pagedim[$this->page]['w'];
-				$this->hPt = $this->pagedim[$this->page]['h'];
-				$this->w = $this->wPt / $this->k;
-				$this->h = $this->hPt / $this->k;
-				$this->tMargin = $this->pagedim[$this->page]['tm'];
-				$this->bMargin = $this->pagedim[$this->page]['bm'];
-				$this->original_lMargin = $this->pagedim[$this->page]['olm'];
-				$this->original_rMargin = $this->pagedim[$this->page]['orm'];
-				$this->AutoPageBreak = $this->pagedim[$this->page]['pb'];
-				$this->CurOrientation = $this->pagedim[$this->page]['or'];
-				$this->SetAutoPageBreak($this->AutoPageBreak, $this->bMargin);
-				// restore graphic settings
-				//$this->setGraphicVars($gvars);
-				if ($resetmargins) {
-					$this->lMargin = $this->pagedim[$this->page]['olm'];
-					$this->rMargin = $this->pagedim[$this->page]['orm'];
-					$this->SetY($this->tMargin);
-				} else {
-					// account for booklet mode
-					if ($this->pagedim[$this->page]['olm'] != $this->pagedim[$oldpage]['olm']) {
-						$deltam = $this->pagedim[$this->page]['olm'] - $this->pagedim[$this->page]['orm'];
-						$this->lMargin += $deltam;
-						$this->rMargin -= $deltam;
-					}
-				}
-			} else {
-				$this->Error('Wrong page number on setPage() function.');
-			}
-		}
-
-		/**
-		 * Reset pointer to the last document page.
-		 * @param boolean $resetmargins if true reset left, right, top margins and Y position.
-		 * @access public
-		 * @since 2.0.000 (2008-01-04)
-		 * @see setPage(), getPage(), getNumPages()
-		 */
-		public function lastPage($resetmargins=false) {
-			$this->setPage($this->getNumPages(), $resetmargins);
-		}
-
-		/**
-		 * Get current document page number.
-		 * @return int page number
-		 * @access public
-		 * @since 2.1.000 (2008-01-07)
-		 * @see setPage(), lastpage(), getNumPages()
-		 */
-		public function getPage() {
-			return $this->page;
-		}
-
-
-		/**
-		 * Get the total number of insered pages.
-		 * @return int number of pages
-		 * @access public
-		 * @since 2.1.000 (2008-01-07)
-		 * @see setPage(), getPage(), lastpage()
-		 */
-		public function getNumPages() {
-			return $this->numpages;
-		}
-
-		/**
-		 * Adds a new TOC (Table Of Content) page to the document.
-		 * @param string $orientation page orientation.
-		 * @param boolean $keepmargins if true overwrites the default page margins with the current margins
-		 * @access public
-		 * @since 5.0.001 (2010-05-06)
-		 * @see AddPage(), startPage(), endPage(), endTOCPage()
-		 */
-		public function addTOCPage($orientation='', $format='', $keepmargins=false) {
-			$this->AddPage($orientation, $format, $keepmargins, true);
-		}
-
-		/**
-		 * Terminate the current TOC (Table Of Content) page
-		 * @access public
-		 * @since 5.0.001 (2010-05-06)
-		 * @see AddPage(), startPage(), endPage(), addTOCPage()
-		 */
-		public function endTOCPage() {
-			$this->endPage(true);
-		}
-
-		/**
-		 * Adds a new page to the document. If a page is already present, the Footer() method is called first to output the footer (if enabled). Then the page is added, the current position set to the top-left corner according to the left and top margins (or top-right if in RTL mode), and Header() is called to display the header (if enabled).
-		 * The origin of the coordinate system is at the top-left corner (or top-right for RTL) and increasing ordinates go downwards.
-		 * @param string $orientation page orientation. Possible values are (case insensitive):<ul><li>P or PORTRAIT (default)</li><li>L or LANDSCAPE</li></ul>
-		 * @param mixed $format The format used for pages. It can be either one of the following values (case insensitive) or a custom format in the form of a two-element array containing the width and the height (expressed in the unit given by unit).<ul><li>4A0</li><li>2A0</li><li>A0</li><li>A1</li><li>A2</li><li>A3</li><li>A4 (default)</li><li>A5</li><li>A6</li><li>A7</li><li>A8</li><li>A9</li><li>A10</li><li>B0</li><li>B1</li><li>B2</li><li>B3</li><li>B4</li><li>B5</li><li>B6</li><li>B7</li><li>B8</li><li>B9</li><li>B10</li><li>C0</li><li>C1</li><li>C2</li><li>C3</li><li>C4</li><li>C5</li><li>C6</li><li>C7</li><li>C8</li><li>C9</li><li>C10</li><li>RA0</li><li>RA1</li><li>RA2</li><li>RA3</li><li>RA4</li><li>SRA0</li><li>SRA1</li><li>SRA2</li><li>SRA3</li><li>SRA4</li><li>LETTER</li><li>LEGAL</li><li>EXECUTIVE</li><li>FOLIO</li></ul>
-		 * @param boolean $keepmargins if true overwrites the default page margins with the current margins
-		 * @param boolean $tocpage if true set the tocpage state to true (the added page will be used to display Table Of Content).
-		 * @access public
-		 * @since 1.0
-		 * @see startPage(), endPage(), addTOCPage(), endTOCPage()
-		 */
-		public function AddPage($orientation='', $format='', $keepmargins=false, $tocpage=false) {
-			if (!isset($this->original_lMargin) OR $keepmargins) {
-				$this->original_lMargin = $this->lMargin;
-			}
-			if (!isset($this->original_rMargin) OR $keepmargins) {
-				$this->original_rMargin = $this->rMargin;
-			}
-			// terminate previous page
-			$this->endPage();
-			// start new page
-			$this->startPage($orientation, $format, $tocpage);
-		}
-
-		/**
-		 * Terminate the current page
-		 * @param boolean $tocpage if true set the tocpage state to false (end the page used to display Table Of Content).
-		 * @access public
-		 * @since 4.2.010 (2008-11-14)
-		 * @see AddPage(), startPage(), addTOCPage(), endTOCPage()
-		 */
-		public function endPage($tocpage=false) {
-			// check if page is already closed
-			if (($this->page == 0) OR ($this->numpages > $this->page) OR (!$this->pageopen[$this->page])) {
-				return;
-			}
-			$this->InFooter = true;
-			// print page footer
-			$this->setFooter();
-			// close page
-			$this->_endpage();
-			// mark page as closed
-			$this->pageopen[$this->page] = false;
-			$this->InFooter = false;
-			if ($tocpage) {
-				$this->tocpage = false;
-			}
-		}
-
-		/**
-		 * Starts a new page to the document. The page must be closed using the endPage() function.
-		 * The origin of the coordinate system is at the top-left corner and increasing ordinates go downwards.
-		 * @param string $orientation page orientation. Possible values are (case insensitive):<ul><li>P or PORTRAIT (default)</li><li>L or LANDSCAPE</li></ul>
-		 * @param mixed $format The format used for pages. It can be either one of the following values (case insensitive) or a custom format in the form of a two-element array containing the width and the height (expressed in the unit given by unit).<ul><li>4A0</li><li>2A0</li><li>A0</li><li>A1</li><li>A2</li><li>A3</li><li>A4 (default)</li><li>A5</li><li>A6</li><li>A7</li><li>A8</li><li>A9</li><li>A10</li><li>B0</li><li>B1</li><li>B2</li><li>B3</li><li>B4</li><li>B5</li><li>B6</li><li>B7</li><li>B8</li><li>B9</li><li>B10</li><li>C0</li><li>C1</li><li>C2</li><li>C3</li><li>C4</li><li>C5</li><li>C6</li><li>C7</li><li>C8</li><li>C9</li><li>C10</li><li>RA0</li><li>RA1</li><li>RA2</li><li>RA3</li><li>RA4</li><li>SRA0</li><li>SRA1</li><li>SRA2</li><li>SRA3</li><li>SRA4</li><li>LETTER</li><li>LEGAL</li><li>EXECUTIVE</li><li>FOLIO</li></ul>
-		 * @param boolean $tocpage if true set the tocpage state to true (the added page will be used to display Table of Content).
-		 * @access public
-		 * @since 4.2.010 (2008-11-14)
-		 * @see AddPage(), endPage(), addTOCPage(), endTOCPage()
-		 */
-		public function startPage($orientation='', $format='', $tocpage=false) {
-			if ($tocpage) {
-				$this->tocpage = true;
-			}
-			if ($this->numpages > $this->page) {
-				// this page has been already added
-				$this->setPage($this->page + 1);
-				$this->SetY($this->tMargin);
-				return;
-			}
-			// start a new page
-			if ($this->state == 0) {
-				$this->Open();
-			}
-			++$this->numpages;
-			$this->swapMargins($this->booklet);
-			// save current graphic settings
-			$gvars = $this->getGraphicVars();
-			// start new page
-			$this->_beginpage($orientation, $format);
-			// mark page as open
-			$this->pageopen[$this->page] = true;
-			// restore graphic settings
-			$this->setGraphicVars($gvars);
-			// mark this point
-			$this->setPageMark();
-			// print page header
-			$this->setHeader();
-			// restore graphic settings
-			$this->setGraphicVars($gvars);
-			// mark this point
-			$this->setPageMark();
-			// print table header (if any)
-			$this->setTableHeader();
-		}
-
-		/**
-	 	 * Set start-writing mark on current page stream used to put borders and fills.
-	 	 * Borders and fills are always created after content and inserted on the position marked by this method.
-	 	 * This function must be called after calling Image() function for a background image.
-	 	 * Background images must be always inserted before calling Multicell() or WriteHTMLCell() or WriteHTML() functions.
-	 	 * @access public
-	 	 * @since 4.0.016 (2008-07-30)
-		 */
-		public function setPageMark() {
-			$this->intmrk[$this->page] = $this->pagelen[$this->page];
-			$this->setContentMark();
-		}
-
-		/**
-	 	 * Set start-writing mark on selected page.
-	 	 * Borders and fills are always created after content and inserted on the position marked by this method.
-	 	 * @param int $page page number (default is the current page)
-	 	 * @access protected
-	 	 * @since 4.6.021 (2009-07-20)
-		 */
-		protected function setContentMark($page=0) {
-			if ($page <= 0) {
-				$page = $this->page;
-			}
-			if (isset($this->footerlen[$page])) {
-				$this->cntmrk[$page] = $this->pagelen[$page] - $this->footerlen[$page];
-			} else {
-				$this->cntmrk[$page] = $this->pagelen[$page];
-			}
-		}
-
-		/**
-	 	 * Set header data.
-		 * @param string $ln header image logo
-		 * @param string $lw header image logo width in mm
-		 * @param string $ht string to print as title on document header
-		 * @param string $hs string to print on document header
-		 * @access public
-		 */
-		public function setHeaderData($ln='', $lw=0, $ht='', $hs='') {
-			$this->header_logo = $ln;
-			$this->header_logo_width = $lw;
-			$this->header_title = $ht;
-			$this->header_string = $hs;
-		}
-
-		/**
-	 	 * Returns header data:
-	 	 * <ul><li>$ret['logo'] = logo image</li><li>$ret['logo_width'] = width of the image logo in user units</li><li>$ret['title'] = header title</li><li>$ret['string'] = header description string</li></ul>
-		 * @return array()
-		 * @access public
-		 * @since 4.0.012 (2008-07-24)
-		 */
-		public function getHeaderData() {
-			$ret = array();
-			$ret['logo'] = $this->header_logo;
-			$ret['logo_width'] = $this->header_logo_width;
-			$ret['title'] = $this->header_title;
-			$ret['string'] = $this->header_string;
-			return $ret;
-		}
-
-		/**
-	 	 * Set header margin.
-		 * (minimum distance between header and top page margin)
-		 * @param int $hm distance in user units
-		 * @access public
-		 */
-		public function setHeaderMargin($hm=10) {
-			$this->header_margin = $hm;
-		}
-
-		/**
-	 	 * Returns header margin in user units.
-		 * @return float
-		 * @since 4.0.012 (2008-07-24)
-		 * @access public
-		 */
-		public function getHeaderMargin() {
-			return $this->header_margin;
-		}
-
-		/**
-	 	 * Set footer margin.
-		 * (minimum distance between footer and bottom page margin)
-		 * @param int $fm distance in user units
-		 * @access public
-		 */
-		public function setFooterMargin($fm=10) {
-			$this->footer_margin = $fm;
-		}
-
-		/**
-	 	 * Returns footer margin in user units.
-		 * @return float
-		 * @since 4.0.012 (2008-07-24)
-		 * @access public
-		 */
-		public function getFooterMargin() {
-			return $this->footer_margin;
-		}
-		/**
-	 	 * Set a flag to print page header.
-		 * @param boolean $val set to true to print the page header (default), false otherwise.
-		 * @access public
-		 */
-		public function setPrintHeader($val=true) {
-			$this->print_header = $val;
-		}
-
-		/**
-	 	 * Set a flag to print page footer.
-		 * @param boolean $value set to true to print the page footer (default), false otherwise.
-		 * @access public
-		 */
-		public function setPrintFooter($val=true) {
-			$this->print_footer = $val;
-		}
-
-		/**
-	 	 * Return the right-bottom (or left-bottom for RTL) corner X coordinate of last inserted image
-		 * @return float
-		 * @access public
-		 */
-		public function getImageRBX() {
-			return $this->img_rb_x;
-		}
-
-		/**
-	 	 * Return the right-bottom (or left-bottom for RTL) corner Y coordinate of last inserted image
-		 * @return float
-		 * @access public
-		 */
-		public function getImageRBY() {
-			return $this->img_rb_y;
-		}
-
-		/**
-	 	 * This method is used to render the page header.
-	 	 * It is automatically called by AddPage() and could be overwritten in your own inherited class.
-		 * @access public
-		 */
-		public function Header() {
-			$ormargins = $this->getOriginalMargins();
-			$headerfont = $this->getHeaderFont();
-			$headerdata = $this->getHeaderData();
-			if (($headerdata['logo']) AND ($headerdata['logo'] != K_BLANK_IMAGE)) {
-				$this->Image(K_PATH_IMAGES.$headerdata['logo'], $this->GetX(), $this->getHeaderMargin(), $headerdata['logo_width']);
-				$imgy = $this->getImageRBY();
-			} else {
-				$imgy = $this->GetY();
-			}
-			$cell_height = round(($this->getCellHeightRatio() * $headerfont[2]) / $this->getScaleFactor(), 2);
-			// set starting margin for text data cell
-			if ($this->getRTL()) {
-				$header_x = $ormargins['right'] + ($headerdata['logo_width'] * 1.1);
-			} else {
-				$header_x = $ormargins['left'] + ($headerdata['logo_width'] * 1.1);
-			}
-			$this->SetTextColor(0, 0, 0);
-			// header title
-			$this->SetFont($headerfont[0], 'B', $headerfont[2] + 1);
-			$this->SetX($header_x);
-			$this->Cell(0, $cell_height, $headerdata['title'], 0, 1, '', 0, '', 0);
-			// header string
-			$this->SetFont($headerfont[0], $headerfont[1], $headerfont[2]);
-			$this->SetX($header_x);
-			$this->MultiCell(0, $cell_height, $headerdata['string'], 0, '', 0, 1, '', '', true, 0, false);
-			// print an ending header line
-			$this->SetLineStyle(array('width' => 0.85 / $this->getScaleFactor(), 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)));
-			$this->SetY((2.835 / $this->getScaleFactor()) + max($imgy, $this->GetY()));
-			if ($this->getRTL()) {
-				$this->SetX($ormargins['right']);
-			} else {
-				$this->SetX($ormargins['left']);
-			}
-			$this->Cell(0, 0, '', 'T', 0, 'C');
-		}
-
-		/**
-	 	 * This method is used to render the page footer.
-	 	 * It is automatically called by AddPage() and could be overwritten in your own inherited class.
-		 * @access public
-		 */
-		public function Footer() {
-			$cur_y = $this->GetY();
-			$ormargins = $this->getOriginalMargins();
-			$this->SetTextColor(0, 0, 0);
-			//set style for cell border
-			$line_width = 0.85 / $this->getScaleFactor();
-			$this->SetLineStyle(array('width' => $line_width, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)));
-			//print document barcode
-			$barcode = $this->getBarcode();
-			if (!empty($barcode)) {
-				$this->Ln($line_width);
-				$barcode_width = round(($this->getPageWidth() - $ormargins['left'] - $ormargins['right'])/3);
-				$this->write1DBarcode($barcode, 'C128B', $this->GetX(), $cur_y + $line_width, $barcode_width, (($this->getFooterMargin() / 3) - $line_width), 0.3, '', '');
-			}
-			if (empty($this->pagegroups)) {
-				$pagenumtxt = $this->l['w_page'].' '.$this->getAliasNumPage().' / '.$this->getAliasNbPages();
-			} else {
-				$pagenumtxt = $this->l['w_page'].' '.$this->getPageNumGroupAlias().' / '.$this->getPageGroupAlias();
-			}
-			$this->SetY($cur_y);
-			//Print page number
-			if ($this->getRTL()) {
-				$this->SetX($ormargins['right']);
-				$this->Cell(0, 0, $pagenumtxt, 'T', 0, 'L');
-			} else {
-				$this->SetX($ormargins['left']);
-				$this->Cell(0, 0, $pagenumtxt, 'T', 0, 'R');
-			}
-		}
-
-		/**
-	 	 * This method is used to render the page header.
-	 	 * @access protected
-	 	 * @since 4.0.012 (2008-07-24)
-		 */
-		protected function setHeader() {
-			if ($this->print_header) {
-				$temp_thead = $this->thead;
-    			$temp_theadMargins = $this->theadMargins;
-				$lasth = $this->lasth;
-				$this->_out('q');
-				$this->rMargin = $this->original_rMargin;
-				$this->lMargin = $this->original_lMargin;
-				$this->cMargin = 0;
-				//set current position
-				if ($this->rtl) {
-					$this->SetXY($this->original_rMargin, $this->header_margin);
-				} else {
-					$this->SetXY($this->original_lMargin, $this->header_margin);
-				}
-				$this->SetFont($this->header_font[0], $this->header_font[1], $this->header_font[2]);
-				$this->Header();
-				//restore position
-				if ($this->rtl) {
-					$this->SetXY($this->original_rMargin, $this->tMargin);
-				} else {
-					$this->SetXY($this->original_lMargin, $this->tMargin);
-				}
-				$this->_out('Q');
-				$this->lasth = $lasth;
-				$this->thead = $temp_thead;
-				$this->theadMargins = $temp_theadMargins;
-				$this->newline = false;
-			}
-		}
-
-		/**
-	 	 * This method is used to render the page footer.
-	 	 * @access protected
-	 	 * @since 4.0.012 (2008-07-24)
-		 */
-		protected function setFooter() {
-			//Page footer
-			// save current graphic settings
-			$gvars = $this->getGraphicVars();
-			// mark this point
-			$this->footerpos[$this->page] = $this->pagelen[$this->page];
-			$this->_out("\n");
-			if ($this->print_footer) {
-				$temp_thead = $this->thead;
-    			$temp_theadMargins = $this->theadMargins;
-				$lasth = $this->lasth;
-				$this->_out('q');
-				$this->rMargin = $this->original_rMargin;
-				$this->lMargin = $this->original_lMargin;
-				$this->cMargin = 0;
-				//set current position
-				$footer_y = $this->h - $this->footer_margin;
-				if ($this->rtl) {
-					$this->SetXY($this->original_rMargin, $footer_y);
-				} else {
-					$this->SetXY($this->original_lMargin, $footer_y);
-				}
-				$this->SetFont($this->footer_font[0], $this->footer_font[1], $this->footer_font[2]);
-				$this->Footer();
-				//restore position
-				if ($this->rtl) {
-					$this->SetXY($this->original_rMargin, $this->tMargin);
-				} else {
-					$this->SetXY($this->original_lMargin, $this->tMargin);
-				}
-				$this->_out('Q');
-				$this->lasth = $lasth;
-				$this->thead = $temp_thead;
-				$this->theadMargins = $temp_theadMargins;
-			}
-			// restore graphic settings
-			$this->setGraphicVars($gvars);
-			// calculate footer length
-			$this->footerlen[$this->page] = $this->pagelen[$this->page] - $this->footerpos[$this->page] + 1;
-		}
-
-		/**
-	 	 * This method is used to render the table header on new page (if any).
-	 	 * @access protected
-	 	 * @since 4.5.030 (2009-03-25)
-		 */
-		protected function setTableHeader() {
-			if ($this->num_columns > 1) {
-				// multi column mode
-				return;
-			}
-			if (isset($this->theadMargins['top'])) {
-				// restore the original top-margin
-				$this->tMargin = $this->theadMargins['top'];
-				$this->pagedim[$this->page]['tm'] = $this->tMargin;
-				$this->y = $this->tMargin;
-			}
-			if (!$this->empty_string($this->thead) AND (!$this->inthead)) {
-				// set margins
-				$prev_lMargin = $this->lMargin;
-				$prev_rMargin = $this->rMargin;
-				$this->lMargin = $this->pagedim[$this->page]['olm'];
-				$this->rMargin = $this->pagedim[$this->page]['orm'];
-				$this->cMargin = $this->theadMargins['cmargin'];
-				if ($this->rtl) {
-					$this->x = $this->w - $this->rMargin;
-				} else {
-					$this->x = $this->lMargin;
-				}
-				// print table header
-				$this->writeHTML($this->thead, false, false, false, false, '');
-				// set new top margin to skip the table headers
-				if (!isset($this->theadMargins['top'])) {
-					$this->theadMargins['top'] = $this->tMargin;
-				}
-				$this->tMargin = $this->y;
-				$this->pagedim[$this->page]['tm'] = $this->tMargin;
-				$this->lasth = 0;
-				$this->lMargin = $prev_lMargin;
-				$this->rMargin = $prev_rMargin;
-			}
-		}
-
-		/**
-		 * Returns the current page number.
-		 * @return int page number
-		 * @access public
-		 * @since 1.0
-		 * @see AliasNbPages(), getAliasNbPages()
-		 */
-		public function PageNo() {
-			return $this->page;
-		}
-
-		/**
-		 * Defines a new spot color.
-		 * It can be expressed in RGB components or gray scale.
-		 * The method can be called before the first page is created and the value is retained from page to page.
-		 * @param int $c Cyan color for CMYK. Value between 0 and 255
-		 * @param int $m Magenta color for CMYK. Value between 0 and 255
-		 * @param int $y Yellow color for CMYK. Value between 0 and 255
-		 * @param int $k Key (Black) color for CMYK. Value between 0 and 255
-		 * @access public
-		 * @since 4.0.024 (2008-09-12)
-		 * @see SetDrawSpotColor(), SetFillSpotColor(), SetTextSpotColor()
-		 */
-		public function AddSpotColor($name, $c, $m, $y, $k) {
-			if (!isset($this->spot_colors[$name])) {
-				$i = 1 + count($this->spot_colors);
-				$this->spot_colors[$name] = array('i' => $i, 'c' => $c, 'm' => $m, 'y' => $y, 'k' => $k);
-			}
-		}
-
-		/**
-		 * Defines the color used for all drawing operations (lines, rectangles and cell borders).
-		 * It can be expressed in RGB components or gray scale.
-		 * The method can be called before the first page is created and the value is retained from page to page.
-		 * @param array $color array of colors
-		 * @access public
-		 * @since 3.1.000 (2008-06-11)
-		 * @see SetDrawColor()
-		 */
-		public function SetDrawColorArray($color) {
-			if (isset($color)) {
-				$color = array_values($color);
-				$r = isset($color[0]) ? $color[0] : -1;
-				$g = isset($color[1]) ? $color[1] : -1;
-				$b = isset($color[2]) ? $color[2] : -1;
-				$k = isset($color[3]) ? $color[3] : -1;
-				if ($r >= 0) {
-					$this->SetDrawColor($r, $g, $b, $k);
-				}
-			}
-		}
-
-		/**
-		 * Defines the color used for all drawing operations (lines, rectangles and cell borders). It can be expressed in RGB components or gray scale. The method can be called before the first page is created and the value is retained from page to page.
-		 * @param int $col1 Gray level for single color, or Red color for RGB, or Cyan color for CMYK. Value between 0 and 255
-		 * @param int $col2 Green color for RGB, or Magenta color for CMYK. Value between 0 and 255
-		 * @param int $col3 Blue color for RGB, or Yellow color for CMYK. Value between 0 and 255
-		 * @param int $col4 Key (Black) color for CMYK. Value between 0 and 255
-		 * @access public
-		 * @since 1.3
-		 * @see SetDrawColorArray(), SetFillColor(), SetTextColor(), Line(), Rect(), Cell(), MultiCell()
-		 */
-		public function SetDrawColor($col1=0, $col2=-1, $col3=-1, $col4=-1) {
-			// set default values
-			if (!is_numeric($col1)) {
-				$col1 = 0;
-			}
-			if (!is_numeric($col2)) {
-				$col2 = -1;
-			}
-			if (!is_numeric($col3)) {
-				$col3 = -1;
-			}
-			if (!is_numeric($col4)) {
-				$col4 = -1;
-			}
-			//Set color for all stroking operations
-			if (($col2 == -1) AND ($col3 == -1) AND ($col4 == -1)) {
-				// Grey scale
-				$this->DrawColor = sprintf('%.3F G', $col1/255);
-				$this->strokecolor = array('G' => $col1);
-			} elseif ($col4 == -1) {
-				// RGB
-				$this->DrawColor = sprintf('%.3F %.3F %.3F RG', $col1/255, $col2/255, $col3/255);
-				$this->strokecolor = array('R' => $col1, 'G' => $col2, 'B' => $col3);
-			} else {
-				// CMYK
-				$this->DrawColor = sprintf('%.3F %.3F %.3F %.3F K', $col1/100, $col2/100, $col3/100, $col4/100);
-				$this->strokecolor = array('C' => $col1, 'M' => $col2, 'Y' => $col3, 'K' => $col4);
-			}
-			if ($this->page > 0) {
-				$this->_out($this->DrawColor);
-			}
-		}
-
-		/**
-		 * Defines the spot color used for all drawing operations (lines, rectangles and cell borders).
-		 * @param string $name name of the spot color
-		 * @param int $tint the intensity of the color (from 0 to 100 ; 100 = full intensity by default).
-		 * @access public
-		 * @since 4.0.024 (2008-09-12)
-		 * @see AddSpotColor(), SetFillSpotColor(), SetTextSpotColor()
-		 */
-		public function SetDrawSpotColor($name, $tint=100) {
-			if (!isset($this->spot_colors[$name])) {
-				$this->Error('Undefined spot color: '.$name);
-			}
-			$this->DrawColor = sprintf('/CS%d CS %.3F SCN', $this->spot_colors[$name]['i'], $tint/100);
-			if ($this->page > 0) {
-				$this->_out($this->DrawColor);
-			}
-		}
-
-		/**
-		 * Defines the color used for all filling operations (filled rectangles and cell backgrounds).
-		 * It can be expressed in RGB components or gray scale.
-		 * The method can be called before the first page is created and the value is retained from page to page.
-		 * @param array $color array of colors
-		 * @access public
-		 * @since 3.1.000 (2008-6-11)
-		 * @see SetFillColor()
-		 */
-		public function SetFillColorArray($color) {
-			if (isset($color)) {
-				$color = array_values($color);
-				$r = isset($color[0]) ? $color[0] : -1;
-				$g = isset($color[1]) ? $color[1] : -1;
-				$b = isset($color[2]) ? $color[2] : -1;
-				$k = isset($color[3]) ? $color[3] : -1;
-				if ($r >= 0) {
-					$this->SetFillColor($r, $g, $b, $k);
-				}
-			}
-		}
-
-		/**
-		 * Defines the color used for all filling operations (filled rectangles and cell backgrounds). It can be expressed in RGB components or gray scale. The method can be called before the first page is created and the value is retained from page to page.
-		 * @param int $col1 Gray level for single color, or Red color for RGB, or Cyan color for CMYK. Value between 0 and 255
-		 * @param int $col2 Green color for RGB, or Magenta color for CMYK. Value between 0 and 255
-		 * @param int $col3 Blue color for RGB, or Yellow color for CMYK. Value between 0 and 255
-		 * @param int $col4 Key (Black) color for CMYK. Value between 0 and 255
-		 * @access public
-		 * @since 1.3
-		 * @see SetFillColorArray(), SetDrawColor(), SetTextColor(), Rect(), Cell(), MultiCell()
-		 */
-		public function SetFillColor($col1=0, $col2=-1, $col3=-1, $col4=-1) {
-			// set default values
-			if (!is_numeric($col1)) {
-				$col1 = 0;
-			}
-			if (!is_numeric($col2)) {
-				$col2 = -1;
-			}
-			if (!is_numeric($col3)) {
-				$col3 = -1;
-			}
-			if (!is_numeric($col4)) {
-				$col4 = -1;
-			}
-			//Set color for all filling operations
-			if (($col2 == -1) AND ($col3 == -1) AND ($col4 == -1)) {
-				// Grey scale
-				$this->FillColor = sprintf('%.3F g', $col1/255);
-				$this->bgcolor = array('G' => $col1);
-			} elseif ($col4 == -1) {
-				// RGB
-				$this->FillColor = sprintf('%.3F %.3F %.3F rg', $col1/255, $col2/255, $col3/255);
-				$this->bgcolor = array('R' => $col1, 'G' => $col2, 'B' => $col3);
-			} else {
-				// CMYK
-				$this->FillColor = sprintf('%.3F %.3F %.3F %.3F k', $col1/100, $col2/100, $col3/100, $col4/100);
-				$this->bgcolor = array('C' => $col1, 'M' => $col2, 'Y' => $col3, 'K' => $col4);
-			}
-			$this->ColorFlag = ($this->FillColor != $this->TextColor);
-			if ($this->page > 0) {
-				$this->_out($this->FillColor);
-			}
-		}
-
-		/**
-		 * Defines the spot color used for all filling operations (filled rectangles and cell backgrounds).
-		 * @param string $name name of the spot color
-		 * @param int $tint the intensity of the color (from 0 to 100 ; 100 = full intensity by default).
-		 * @access public
-		 * @since 4.0.024 (2008-09-12)
-		 * @see AddSpotColor(), SetDrawSpotColor(), SetTextSpotColor()
-		 */
-		public function SetFillSpotColor($name, $tint=100) {
-			if (!isset($this->spot_colors[$name])) {
-				$this->Error('Undefined spot color: '.$name);
-			}
-			$this->FillColor = sprintf('/CS%d cs %.3F scn', $this->spot_colors[$name]['i'], $tint/100);
-			$this->ColorFlag = ($this->FillColor != $this->TextColor);
-			if ($this->page > 0) {
-				$this->_out($this->FillColor);
-			}
-		}
-
-		/**
-		 * Defines the color used for text. It can be expressed in RGB components or gray scale.
-		 * The method can be called before the first page is created and the value is retained from page to page.
-		 * @param array $color array of colors
-		 * @access public
-		 * @since 3.1.000 (2008-6-11)
-		 * @see SetFillColor()
-		 */
-		public function SetTextColorArray($color) {
-			if (isset($color)) {
-				$color = array_values($color);
-				$r = isset($color[0]) ? $color[0] : -1;
-				$g = isset($color[1]) ? $color[1] : -1;
-				$b = isset($color[2]) ? $color[2] : -1;
-				$k = isset($color[3]) ? $color[3] : -1;
-				if ($r >= 0) {
-					$this->SetTextColor($r, $g, $b, $k);
-				}
-			}
-		}
-
-		/**
-		 * Defines the color used for text. It can be expressed in RGB components or gray scale. The method can be called before the first page is created and the value is retained from page to page.
-		 * @param int $col1 Gray level for single color, or Red color for RGB, or Cyan color for CMYK. Value between 0 and 255
-		 * @param int $col2 Green color for RGB, or Magenta color for CMYK. Value between 0 and 255
-		 * @param int $col3 Blue color for RGB, or Yellow color for CMYK. Value between 0 and 255
-		 * @param int $col4 Key (Black) color for CMYK. Value between 0 and 255
-		 * @access public
-		 * @since 1.3
-		 * @see SetTextColorArray(), SetDrawColor(), SetFillColor(), Text(), Cell(), MultiCell()
-		 */
-		public function SetTextColor($col1=0, $col2=-1, $col3=-1, $col4=-1) {
-			// set default values
-			if (!is_numeric($col1)) {
-				$col1 = 0;
-			}
-			if (!is_numeric($col2)) {
-				$col2 = -1;
-			}
-			if (!is_numeric($col3)) {
-				$col3 = -1;
-			}
-			if (!is_numeric($col4)) {
-				$col4 = -1;
-			}
-			//Set color for text
-			if (($col2 == -1) AND ($col3 == -1) AND ($col4 == -1)) {
-				// Grey scale
-				$this->TextColor = sprintf('%.3F g', $col1/255);
-				$this->fgcolor = array('G' => $col1);
-			} elseif ($col4 == -1) {
-				// RGB
-				$this->TextColor = sprintf('%.3F %.3F %.3F rg', $col1/255, $col2/255, $col3/255);
-				$this->fgcolor = array('R' => $col1, 'G' => $col2, 'B' => $col3);
-			} else {
-				// CMYK
-				$this->TextColor = sprintf('%.3F %.3F %.3F %.3F k', $col1/100, $col2/100, $col3/100, $col4/100);
-				$this->fgcolor = array('C' => $col1, 'M' => $col2, 'Y' => $col3, 'K' => $col4);
-			}
-			$this->ColorFlag = ($this->FillColor != $this->TextColor);
-		}
-
-		/**
-		 * Defines the spot color used for text.
-		 * @param string $name name of the spot color
-		 * @param int $tint the intensity of the color (from 0 to 100 ; 100 = full intensity by default).
-		 * @access public
-		 * @since 4.0.024 (2008-09-12)
-		 * @see AddSpotColor(), SetDrawSpotColor(), SetFillSpotColor()
-		 */
-		public function SetTextSpotColor($name, $tint=100) {
-			if (!isset($this->spot_colors[$name])) {
-				$this->Error('Undefined spot color: '.$name);
-			}
-			$this->TextColor = sprintf('/CS%d cs %.3F scn', $this->spot_colors[$name]['i'], $tint/100);
-			$this->ColorFlag = ($this->FillColor != $this->TextColor);
-			if ($this->page > 0) {
-				$this->_out($this->TextColor);
-			}
-		}
-
-		/**
-		 * Returns the length of a string in user unit. A font must be selected.<br>
-		 * @param string $s The string whose length is to be computed
-		 * @param string $fontname Family font. It can be either a name defined by AddFont() or one of the standard families. It is also possible to pass an empty string, in that case, the current family is retained.
-		 * @param string $fontstyle Font style. Possible values are (case insensitive):<ul><li>empty string: regular</li><li>B: bold</li><li>I: italic</li><li>U: underline</li><li>D: line-trough</li><li>O: overline</li></ul> or any combination. The default value is regular.
-		 * @param float $fontsize Font size in points. The default value is the current size.
-		 * @param boolean $getarray if true returns an array of characters widths, if false returns the total length.
-		 * @return mixed int total string length or array of characted widths
-		 * @author Nicola Asuni
-		 * @access public
-		 * @since 1.2
-		 */
-		public function GetStringWidth($s, $fontname='', $fontstyle='', $fontsize=0, $getarray=false) {
-			return $this->GetArrStringWidth($this->utf8Bidi($this->UTF8StringToArray($s), $s, $this->tmprtl), $fontname, $fontstyle, $fontsize, $getarray);
-		}
-
-		/**
-		 * Returns the string length of an array of chars in user unit or an array of characters widths. A font must be selected.<br>
-		 * @param string $sa The array of chars whose total length is to be computed
-		 * @param string $fontname Family font. It can be either a name defined by AddFont() or one of the standard families. It is also possible to pass an empty string, in that case, the current family is retained.
-		 * @param string $fontstyle Font style. Possible values are (case insensitive):<ul><li>empty string: regular</li><li>B: bold</li><li>I: italic</li><li>U: underline</li><li>D: line trough</li><li>O: overline</li></ul> or any combination. The default value is regular.
-		 * @param float $fontsize Font size in points. The default value is the current size.
-		 * @param boolean $getarray if true returns an array of characters widths, if false returns the total length.
-		 * @return mixed int total string length or array of characted widths
-		 * @author Nicola Asuni
-		 * @access public
-		 * @since 2.4.000 (2008-03-06)
-		 */
-		public function GetArrStringWidth($sa, $fontname='', $fontstyle='', $fontsize=0, $getarray=false) {
-			// store current values
-			if (!$this->empty_string($fontname)) {
-				$prev_FontFamily = $this->FontFamily;
-				$prev_FontStyle = $this->FontStyle;
-				$prev_FontSizePt = $this->FontSizePt;
-				$this->SetFont($fontname, $fontstyle, $fontsize);
-			}
-			// convert UTF-8 array to Latin1 if required
-			$sa = $this->UTF8ArrToLatin1($sa);
-			$w = 0; // total width
-			$wa = array(); // array of characters widths
-			foreach ($sa as $char) {
-				// character width
-				$cw = $this->GetCharWidth($char);
-				$wa[] = $cw;
-				$w += $cw;
-			}
-			// restore previous values
-			if (!$this->empty_string($fontname)) {
-				$this->SetFont($prev_FontFamily, $prev_FontStyle, $prev_FontSizePt);
-			}
-			if ($getarray) {
-				return $wa;
-			}
-			return $w;
-		}
-
-		/**
-		 * Returns the length of the char in user unit for the current font.
-		 * @param int $char The char code whose length is to be returned
-		 * @return int char width
-		 * @author Nicola Asuni
-		 * @access public
-		 * @since 2.4.000 (2008-03-06)
-		 */
-		public function GetCharWidth($char) {
-			if ($char == 173) {
-				// SHY character will not be printed
-				return (0);
-			}
-			$cw = &$this->CurrentFont['cw'];
-			if (isset($cw[$char])) {
-				$w = $cw[$char];
-			} elseif (isset($this->CurrentFont['dw'])) {
-				// default width
-				$w = $this->CurrentFont['dw'];
-			} elseif (isset($cw[32])) {
-				// default width
-				$w = $cw[32];
-			} else {
-				$w = 600;
-			}
-			return ($w * $this->FontSize / 1000);
-		}
-
-		/**
-		 * Returns the numbero of characters in a string.
-		 * @param string $s The input string.
-		 * @return int number of characters
-		 * @access public
-		 * @since 2.0.0001 (2008-01-07)
-		 */
-		public function GetNumChars($s) {
-			if (($this->CurrentFont['type'] == 'TrueTypeUnicode') OR ($this->CurrentFont['type'] == 'cidfont0')) {
-				return count($this->UTF8StringToArray($s));
-			}
-			return strlen($s);
-		}
-
-		/**
-		 * Fill the list of available fonts ($this->fontlist).
-		 * @access protected
-		 * @since 4.0.013 (2008-07-28)
-		 */
-		protected function getFontsList() {
-			$fontsdir = opendir($this->_getfontpath());
-			while (($file = readdir($fontsdir)) !== false) {
-				if (substr($file, -4) == '.php') {
-					array_push($this->fontlist, strtolower(basename($file, '.php')));
-				}
-			}
-			closedir($fontsdir);
-		}
-
-		/**
-		 * Imports a TrueType, Type1, core, or CID0 font and makes it available.
-		 * It is necessary to generate a font definition file first (read /fonts/utils/README.TXT).
-		 * The definition file (and the font file itself when embedding) must be present either in the current directory or in the one indicated by K_PATH_FONTS if the constant is defined. If it could not be found, the error "Could not include font definition file" is generated.
-		 * @param string $family Font family. The name can be chosen arbitrarily. If it is a standard family name, it will override the corresponding font.
-		 * @param string $style Font style. Possible values are (case insensitive):<ul><li>empty string: regular (default)</li><li>B: bold</li><li>I: italic</li><li>BI or IB: bold italic</li></ul>
-		 * @param string $fontfile The font definition file. By default, the name is built from the family and style, in lower case with no spaces.
-		 * @return array containing the font data, or false in case of error.
-		 * @access public
-		 * @since 1.5
-		 * @see SetFont()
-		 */
-		public function AddFont($family, $style='', $fontfile='') {
-			if ($this->empty_string($family)) {
-				if (!$this->empty_string($this->FontFamily)) {
-					$family = $this->FontFamily;
-				} else {
-					$this->Error('Empty font family');
-				}
-			}
-			$family = strtolower($family);
-			if ((!$this->isunicode) AND ($family == 'arial')) {
-				$family = 'helvetica';
-			}
-			if (($family == 'symbol') OR ($family == 'zapfdingbats')) {
-				$style = '';
-			}
-			$tempstyle = strtoupper($style);
-			$style = '';
-			// underline
-			if (strpos($tempstyle, 'U') !== false) {
-				$this->underline = true;
-			} else {
-				$this->underline = false;
-			}
-			// line-through (deleted)
-			if (strpos($tempstyle, 'D') !== false) {
-				$this->linethrough = true;
-			} else {
-				$this->linethrough = false;
-			}
-			// overline
-			if (strpos($tempstyle, 'O') !== false) {
-				$this->overline = true;
-			} else {
-				$this->overline = false;
-			}
-			// bold
-			if (strpos($tempstyle, 'B') !== false) {
-				$style .= 'B';
-			}
-			// oblique
-			if (strpos($tempstyle, 'I') !== false) {
-				$style .= 'I';
-			}
-			$bistyle = $style;
-			$fontkey = $family.$style;
-			$font_style = $style.($this->underline ? 'U' : '').($this->linethrough ? 'D' : '').($this->overline ? 'O' : '');
-			$fontdata = array('fontkey' => $fontkey, 'family' => $family, 'style' => $font_style);
-			// check if the font has been already added
-			if ($this->getFontBuffer($fontkey) !== false) {
-				return $fontdata;
-			}
-			if (isset($type)) {
-				unset($type);
-			}
-			if (isset($cw)) {
-				unset($cw);
-			}
-			// get specified font directory (if any)
-			$fontdir = false;
-			if (!$this->empty_string($fontfile)) {
-				$fontdir = dirname($fontfile);
-				if ($this->empty_string($fontdir) OR ($fontdir == '.')) {
-					$fontdir = '';
-				} else {
-					$fontdir .= '/';
-				}
-			}
-			// search and include font file
-			if ($this->empty_string($fontfile) OR (!file_exists($fontfile))) {
-				// build a standard filenames for specified font
-				$fontfile1 = str_replace(' ', '', $family).strtolower($style).'.php';
-				$fontfile2 = str_replace(' ', '', $family).'.php';
-				// search files on various directories
-				if (($fontdir !== false) AND file_exists($fontdir.$fontfile1)) {
-					$fontfile = $fontdir.$fontfile1;
-				} elseif (file_exists($this->_getfontpath().$fontfile1)) {
-					$fontfile = $this->_getfontpath().$fontfile1;
-				} elseif (file_exists($fontfile1)) {
-					$fontfile = $fontfile1;
-				} elseif (($fontdir !== false) AND file_exists($fontdir.$fontfile2)) {
-					$fontfile = $fontdir.$fontfile2;
-				} elseif (file_exists($this->_getfontpath().$fontfile2)) {
-					$fontfile = $this->_getfontpath().$fontfile2;
-				} else {
-					$fontfile = $fontfile2;
-				}
-			}
-			// include font file
-			if (file_exists($fontfile)) {
-				include($fontfile);
-			} else {
-				$this->Error('Could not include font definition file: '.$family.'');
-			}
-			// check font parameters
-			if ((!isset($type)) OR (!isset($cw))) {
-				$this->Error('The font definition file has a bad format: '.$fontfile.'');
-			}
-			// SET default parameters
-			if (!isset($file) OR $this->empty_string($file)) {
-				$file = '';
-			}
-			if (!isset($enc) OR $this->empty_string($enc)) {
-				$enc = '';
-			}
-			if (!isset($cidinfo) OR $this->empty_string($cidinfo)) {
-				$cidinfo = array('Registry'=>'Adobe','Ordering'=>'Identity','Supplement'=>0);
-				$cidinfo['uni2cid'] = array();
-			}
-			if (!isset($ctg) OR $this->empty_string($ctg)) {
-				$ctg = '';
-			}
-			if (!isset($desc) OR $this->empty_string($desc)) {
-				$desc = array();
-			}
-			if (!isset($up) OR $this->empty_string($up)) {
-				$up = -100;
-			}
-			if (!isset($ut) OR $this->empty_string($ut)) {
-				$ut = 50;
-			}
-			if (!isset($cw) OR $this->empty_string($cw)) {
-				$cw = array();
-			}
-			if (!isset($dw) OR $this->empty_string($dw)) {
-				// set default width
-				if (isset($desc['MissingWidth']) AND ($desc['MissingWidth'] > 0)) {
-					$dw = $desc['MissingWidth'];
-				} elseif (isset($cw[32])) {
-					$dw = $cw[32];
-				} else {
-					$dw = 600;
-				}
-			}
-			++$this->numfonts;
-			if ($type == 'cidfont0') {
-				// register CID font (all styles at once)
-				$styles = array('' => '', 'B' => ',Bold', 'I' => ',Italic', 'BI' => ',BoldItalic');
-				$sname = $name.$styles[$bistyle];
-				// artificial bold
-				if (strpos($bistyle, 'B') !== false) {
-					if (isset($desc['StemV'])) {
-						$desc['StemV'] *= 2;
-					} else {
-						$desc['StemV'] = 120;
-					}
-				}
-				// artificial italic
-				if (strpos($bistyle, 'I') !== false) {
-					if (isset($desc['ItalicAngle'])) {
-						$desc['ItalicAngle'] -= 11;
-					} else {
-						$desc['ItalicAngle'] = -11;
-					}
-				}
-			} elseif ($type == 'core') {
-				$name = $this->CoreFonts[$fontkey];
-			} elseif (($type == 'TrueType') OR ($type == 'Type1')) {
-				// ...
-			} elseif ($type == 'TrueTypeUnicode') {
-				$enc = 'Identity-H';
-			} else {
-				$this->Error('Unknow font type: '.$type.'');
-			}
-			$this->setFontBuffer($fontkey, array('i' => $this->numfonts, 'type' => $type, 'name' => $name, 'desc' => $desc, 'up' => $up, 'ut' => $ut, 'cw' => $cw, 'dw' => $dw, 'enc' => $enc, 'cidinfo' => $cidinfo, 'file' => $file, 'ctg' => $ctg));
-			if (isset($diff) AND (!empty($diff))) {
-				//Search existing encodings
-				$d = 0;
-				$nb = count($this->diffs);
-				for ($i=1; $i <= $nb; ++$i) {
-					if ($this->diffs[$i] == $diff) {
-						$d = $i;
-						break;
-					}
-				}
-				if ($d == 0) {
-					$d = $nb + 1;
-					$this->diffs[$d] = $diff;
-				}
-				$this->setFontSubBuffer($fontkey, 'diff', $d);
-			}
-			if (!$this->empty_string($file)) {
-				if ((strcasecmp($type,'TrueType') == 0) OR (strcasecmp($type, 'TrueTypeUnicode') == 0)) {
-					$this->FontFiles[$file] = array('length1' => $originalsize, 'fontdir' => $fontdir);
-				} elseif ($type != 'core') {
-					$this->FontFiles[$file] = array('length1' => $size1, 'length2' => $size2, 'fontdir' => $fontdir);
-				}
-			}
-			return $fontdata;
-		}
-
-		/**
-		 * Sets the font used to print character strings.
-		 * The font can be either a standard one or a font added via the AddFont() method. Standard fonts use Windows encoding cp1252 (Western Europe).
-		 * The method can be called before the first page is created and the font is retained from page to page.
-		 * If you just wish to change the current font size, it is simpler to call SetFontSize().
-		 * Note: for the standard fonts, the font metric files must be accessible. There are three possibilities for this:<ul><li>They are in the current directory (the one where the running script lies)</li><li>They are in one of the directories defined by the include_path parameter</li><li>They are in the directory defined by the K_PATH_FONTS constant</li></ul><br />
-		 * @param string $family Family font. It can be either a name defined by AddFont() or one of the standard Type1 families (case insensitive):<ul><li>times (Times-Roman)</li><li>timesb (Times-Bold)</li><li>timesi (Times-Italic)</li><li>timesbi (Times-BoldItalic)</li><li>helvetica (Helvetica)</li><li>helveticab (Helvetica-Bold)</li><li>helveticai (Helvetica-Oblique)</li><li>helveticabi (Helvetica-BoldOblique)</li><li>courier (Courier)</li><li>courierb (Courier-Bold)</li><li>courieri (Courier-Oblique)</li><li>courierbi (Courier-BoldOblique)</li><li>symbol (Symbol)</li><li>zapfdingbats (ZapfDingbats)</li></ul> It is also possible to pass an empty string. In that case, the current family is retained.
-		 * @param string $style Font style. Possible values are (case insensitive):<ul><li>empty string: regular</li><li>B: bold</li><li>I: italic</li><li>U: underline</li><li>D: line trough</li><li>O: overline</li></ul> or any combination. The default value is regular. Bold and italic styles do not apply to Symbol and ZapfDingbats basic fonts or other fonts when not defined.
-		 * @param float $size Font size in points. The default value is the current size. If no size has been specified since the beginning of the document, the value taken is 12
-		 * @param string $fontfile The font definition file. By default, the name is built from the family and style, in lower case with no spaces.
-		 * @access public
-		 * @since 1.0
-		 * @see AddFont(), SetFontSize()
-		 */
-		public function SetFont($family, $style='', $size=0, $fontfile='') {
-			//Select a font; size given in points
-			if ($size == 0) {
-				$size = $this->FontSizePt;
-			}
-			// try to add font (if not already added)
-			$fontdata = $this->AddFont($family, $style, $fontfile);
-			$this->FontFamily = $fontdata['family'];
-			$this->FontStyle = $fontdata['style'];
-			$this->CurrentFont = $this->getFontBuffer($fontdata['fontkey']);
-			$this->SetFontSize($size);
-		}
-
-		/**
-		 * Defines the size of the current font.
-		 * @param float $size The size (in points)
-		 * @access public
-		 * @since 1.0
-		 * @see SetFont()
-		 */
-		public function SetFontSize($size) {
-			//Set font size in points
-			$this->FontSizePt = $size;
-			$this->FontSize = $size / $this->k;
-			if (isset($this->CurrentFont['desc']['Ascent']) AND ($this->CurrentFont['desc']['Ascent'] > 0)) {
-				$this->FontAscent = $this->CurrentFont['desc']['Ascent'] * $this->FontSize / 1000;
-			} else {
-				$this->FontAscent = 0.85 * $this->FontSize;
-			}
-			if (isset($this->CurrentFont['desc']['Descent']) AND ($this->CurrentFont['desc']['Descent'] <= 0)) {
-				$this->FontDescent = - $this->CurrentFont['desc']['Descent'] * $this->FontSize / 1000;
-			} else {
-				$this->FontDescent = 0.15 * $this->FontSize;
-			}
-			if (($this->page > 0) AND (isset($this->CurrentFont['i']))) {
-				$this->_out(sprintf('BT /F%d %.2F Tf ET', $this->CurrentFont['i'], $this->FontSizePt));
-			}
-		}
-
-		/**
-		 * Return the font descent value
-		 * @param string $font font name
-		 * @param string $style font style
-		 * @param float $size The size (in points)
-		 * @return int font descent
-		 * @access public
-		 * @since 4.9.003 (2010-03-30)
-		 */
-		public function getFontDescent($font, $style='', $size=0) {
-			//Set font size in points
-			$sizek = $size / $this->k;
-			$fontdata = $this->AddFont($font, $style);
-			if (isset($fontdata['desc']['Descent']) AND ($fontdata['desc']['Descent'] <= 0)) {
-				$descent = - $fontdata['desc']['Descent'] * $sizek / 1000;
-			} else {
-				$descent = 0.15 * $sizek;
-			}
-			return $descent;
-		}
-
-		/**
-		 * Return the font ascent value
-		 * @param string $font font name
-		 * @param string $style font style
-		 * @param float $size The size (in points)
-		 * @return int font ascent
-		 * @access public
-		 * @since 4.9.003 (2010-03-30)
-		 */
-		public function getFontAscent($font, $style='', $size=0) {
-			//Set font size in points
-			$sizek = $size / $this->k;
-			$fontdata = $this->AddFont($font, $style);
-			if (isset($fontdata['desc']['Ascent']) AND ($fontdata['desc']['Ascent'] > 0)) {
-				$ascent = $fontdata['desc']['Ascent'] * $sizek / 1000;
-			} else {
-				$ascent = 0.85 * $sizek;
-			}
-			return $ascent;
-		}
-
-		/**
-		 * Defines the default monospaced font.
-		 * @param string $font Font name.
-		 * @access public
-		 * @since 4.5.025
-		 */
-		public function SetDefaultMonospacedFont($font) {
-			$this->default_monospaced_font = $font;
-		}
-
-		/**
-		 * Creates a new internal link and returns its identifier. An internal link is a clickable area which directs to another place within the document.<br />
-		 * The identifier can then be passed to Cell(), Write(), Image() or Link(). The destination is defined with SetLink().
-		 * @access public
-		 * @since 1.5
-		 * @see Cell(), Write(), Image(), Link(), SetLink()
-		 */
-		public function AddLink() {
-			//Create a new internal link
-			$n = count($this->links) + 1;
-			$this->links[$n] = array(0, 0);
-			return $n;
-		}
-
-		/**
-		 * Defines the page and position a link points to.
-		 * @param int $link The link identifier returned by AddLink()
-		 * @param float $y Ordinate of target position; -1 indicates the current position. The default value is 0 (top of page)
-		 * @param int $page Number of target page; -1 indicates the current page. This is the default value
-		 * @access public
-		 * @since 1.5
-		 * @see AddLink()
-		 */
-		public function SetLink($link, $y=0, $page=-1) {
-			if ($y == -1) {
-				$y = $this->y;
-			}
-			if ($page == -1) {
-				$page = $this->page;
-			}
-			$this->links[$link] = array($page, $y);
-		}
-
-		/**
-		 * Puts a link on a rectangular area of the page.
-		 * Text or image links are generally put via Cell(), Write() or Image(), but this method can be useful for instance to define a clickable area inside an image.
-		 * @param float $x Abscissa of the upper-left corner of the rectangle
-		 * @param float $y Ordinate of the upper-left corner of the rectangle
-		 * @param float $w Width of the rectangle
-		 * @param float $h Height of the rectangle
-		 * @param mixed $link URL or identifier returned by AddLink()
-		 * @param int $spaces number of spaces on the text to link
-		 * @access public
-		 * @since 1.5
-		 * @see AddLink(), Annotation(), Cell(), Write(), Image()
-		 */
-		public function Link($x, $y, $w, $h, $link, $spaces=0) {
-			$this->Annotation($x, $y, $w, $h, $link, array('Subtype'=>'Link'), $spaces);
-		}
-
-		/**
-		 * Puts a markup annotation on a rectangular area of the page.
-		 * !!!!THE ANNOTATION SUPPORT IS NOT YET FULLY IMPLEMENTED !!!!
-		 * @param float $x Abscissa of the upper-left corner of the rectangle
-		 * @param float $y Ordinate of the upper-left corner of the rectangle
-		 * @param float $w Width of the rectangle
-		 * @param float $h Height of the rectangle
-		 * @param string $text annotation text or alternate content
-		 * @param array $opt array of options (see section 8.4 of PDF reference 1.7).
-		 * @param int $spaces number of spaces on the text to link
-		 * @access public
-		 * @since 4.0.018 (2008-08-06)
-		 */
-		public function Annotation($x, $y, $w, $h, $text, $opt=array('Subtype'=>'Text'), $spaces=0) {
-			if ($x === '') {
-				$x = $this->x;
-			}
-			if ($y === '') {
-				$y = $this->y;
-			}
-			// recalculate coordinates to account for graphic transformations
-			if (isset($this->transfmatrix)) {
-				for ($i=$this->transfmatrix_key; $i > 0; --$i) {
-					$maxid = count($this->transfmatrix[$i]) - 1;
-					for ($j=$maxid; $j >= 0; --$j) {
-						$ctm = $this->transfmatrix[$i][$j];
-						if (isset($ctm['a'])) {
-							$x = $x * $this->k;
-							$y = ($this->h - $y) * $this->k;
-							$w = $w * $this->k;
-							$h = $h * $this->k;
-							// top left
-							$xt = $x;
-							$yt = $y;
-							$x1 = ($ctm['a'] * $xt) + ($ctm['c'] * $yt) + $ctm['e'];
-							$y1 = ($ctm['b'] * $xt) + ($ctm['d'] * $yt) + $ctm['f'];
-							// top right
-							$xt = $x + $w;
-							$yt = $y;
-							$x2 = ($ctm['a'] * $xt) + ($ctm['c'] * $yt) + $ctm['e'];
-							$y2 = ($ctm['b'] * $xt) + ($ctm['d'] * $yt) + $ctm['f'];
-							// bottom left
-							$xt = $x;
-							$yt = $y - $h;
-							$x3 = ($ctm['a'] * $xt) + ($ctm['c'] * $yt) + $ctm['e'];
-							$y3 = ($ctm['b'] * $xt) + ($ctm['d'] * $yt) + $ctm['f'];
-							// bottom right
-							$xt = $x + $w;
-							$yt = $y - $h;
-							$x4 = ($ctm['a'] * $xt) + ($ctm['c'] * $yt) + $ctm['e'];
-							$y4 = ($ctm['b'] * $xt) + ($ctm['d'] * $yt) + $ctm['f'];
-							// new coordinates (rectangle area)
-							$x = min($x1, $x2, $x3, $x4);
-							$y = max($y1, $y2, $y3, $y4);
-							$w = (max($x1, $x2, $x3, $x4) - $x) / $this->k;
-							$h = ($y - min($y1, $y2, $y3, $y4)) / $this->k;
-							$x = $x / $this->k;
-							$y = $this->h - ($y / $this->k);
-						}
-					}
-				}
-			}
-			if ($this->page <= 0) {
-				$page = 1;
-			} else {
-				$page = $this->page;
-			}
-			if (!isset($this->PageAnnots[$page])) {
-				$this->PageAnnots[$page] = array();
-			}
-			$this->PageAnnots[$page][] = array('x' => $x, 'y' => $y, 'w' => $w, 'h' => $h, 'txt' => $text, 'opt' => $opt, 'numspaces' => $spaces);
-			if ((($opt['Subtype'] == 'FileAttachment') OR ($opt['Subtype'] == 'Sound')) AND (!$this->empty_string($opt['FS'])) AND file_exists($opt['FS']) AND (!isset($this->embeddedfiles[basename($opt['FS'])]))) {
-				$this->embeddedfiles[basename($opt['FS'])] = array('file' => $opt['FS'], 'n' => (count($this->embeddedfiles) + $this->embedded_start_obj_id));
-			}
-			// Add widgets annotation's icons
-			if (isset($opt['mk']['i']) AND file_exists($opt['mk']['i'])) {
-				$this->Image($opt['mk']['i'], '', '', 10, 10, '', '', '', false, 300, '', false, false, 0, false, true);
-			}
-			if (isset($opt['mk']['ri']) AND file_exists($opt['mk']['ri'])) {
-				$this->Image($opt['mk']['ri'], '', '', 0, 0, '', '', '', false, 300, '', false, false, 0, false, true);
-			}
-			if (isset($opt['mk']['ix']) AND file_exists($opt['mk']['ix'])) {
-				$this->Image($opt['mk']['ix'], '', '', 0, 0, '', '', '', false, 300, '', false, false, 0, false, true);
-			}
-			++$this->annot_obj_id;
-		}
-
-		/**
-		 * Embedd the attached files.
-		 * @since 4.4.000 (2008-12-07)
-		 * @access protected
-		 * @see Annotation()
-		 */
-		protected function _putEmbeddedFiles() {
-			reset($this->embeddedfiles);
-			foreach ($this->embeddedfiles as $filename => $filedata) {
-				$data = file_get_contents($filedata['file']);
-				$filter = '';
-				if ($this->compress) {
-					$data = gzcompress($data);
-					$filter = ' /Filter /FlateDecode';
-				}
-				$this->offsets[$filedata['n']] = $this->bufferlen;
-				$out = $filedata['n'].' 0 obj';
-				$out .= ' <</Type /EmbeddedFile'.$filter.' /Length '.strlen($data).' >>';
-				$out .= ' '.$this->_getstream($data, $filedata['n']);
-				$out .= ' endobj';
-				$this->_out($out);
-			}
-		}
-
-		/**
-		 * Prints a text cell at the specified position.
-		 * The origin is on the left of the first charcter, on the baseline.
-		 * This method allows to place a string precisely on the page.
-		 * @param float $x Abscissa of the cell origin
-		 * @param float $y Ordinate of the cell origin
-		 * @param string $txt String to print
-		 * @param int $fstroke outline size in user units (false = disable)
-		 * @param boolean $fclip if true activate clipping mode (you must call StartTransform() before this function and StopTransform() to stop the clipping tranformation).
-		 * @param boolean $ffill if true fills the text
-		 * @param mixed $border Indicates if borders must be drawn around the cell. The value can be either a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul>or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul>
-		 * @param int $ln Indicates where the current position should go after the call. Possible values are:<ul><li>0: to the right (or left for RTL languages)</li><li>1: to the beginning of the next line</li><li>2: below</li></ul>Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value: 0.
-		 * @param string $align Allows to center or align the text. Possible values are:<ul><li>L or empty string: left align (default value)</li><li>C: center</li><li>R: right align</li><li>J: justify</li></ul>
-		 * @param int $fill Indicates if the cell background must be painted (1) or transparent (0). Default value: 0.
-		 * @param mixed $link URL or identifier returned by AddLink().
-		 * @param int $stretch stretch carachter mode: <ul><li>0 = disabled</li><li>1 = horizontal scaling only if necessary</li><li>2 = forced horizontal scaling</li><li>3 = character spacing only if necessary</li><li>4 = forced character spacing</li></ul>
-		 * @param boolean $ignore_min_height if true ignore automatic minimum height value.
-		 * @param string $calign cell vertical alignment relative to the specified Y value. Possible values are:<ul><li>T : cell top</li><li>A : font top</li><li>L : font baseline</li><li>D : font bottom</li><li>B : cell bottom</li></ul>
-		 * @param string $valign text vertical alignment inside the cell. Possible values are:<ul><li>T : top</li><li>C : center</li><li>B : bottom</li></ul>
-		 * @param boolean $rtloff if true uses the page top-left corner as origin of axis for $x and $y initial position.
-		 * @access public
-		 * @since 1.0
-		 * @see Cell(), Write(), MultiCell(), WriteHTML(), WriteHTMLCell()
-		 */
-		public function Text($x, $y, $txt, $fstroke=false, $fclip=false, $ffill=true, $border=0, $ln=0, $align='', $fill=0, $link='', $stretch=0, $ignore_min_height=false, $calign='T', $valign='M', $rtloff=false) {
-			$textrendermode = $this->textrendermode;
-			$textstrokewidth = $this->textstrokewidth;
-			$this->setTextRenderingMode($fstroke, $ffill, $fclip);
-			$this->SetXY($x, $y, $rtloff);
-			$this->Cell(0, 0, $txt, $border, $ln, $align, $fill, $link, $stretch, $ignore_min_height, $calign, $valign);
-			// restore previous rendering mode
-			$this->textrendermode = $textrendermode;
-			$this->textstrokewidth = $textstrokewidth;
-		}
-
-		/**
-		 * Whenever a page break condition is met, the method is called, and the break is issued or not depending on the returned value.
-		 * The default implementation returns a value according to the mode selected by SetAutoPageBreak().<br />
-		 * This method is called automatically and should not be called directly by the application.
-		 * @return boolean
-		 * @access public
-		 * @since 1.4
-		 * @see SetAutoPageBreak()
-		 */
-		public function AcceptPageBreak() {
-			if ($this->num_columns > 1) {
-				// multi column mode
-				if($this->current_column < ($this->num_columns - 1)) {
-					// go to next column
-					$this->selectColumn($this->current_column + 1);
-				} else {
-					// add a new page
-					$this->AddPage();
-					// set first column
-					$this->selectColumn(0);
-				}
-				// avoid page breaking from checkPageBreak()
-				return false;
-			}
-			return $this->AutoPageBreak;
-		}
-
-		/**
-		 * Add page if needed.
-		 * @param float $h Cell height. Default value: 0.
-		 * @param mixed $y starting y position, leave empty for current position.
-		 * @param boolean $addpage if true add a page, otherwise only return the true/false state
-		 * @return boolean true in case of page break, false otherwise.
-		 * @since 3.2.000 (2008-07-01)
-		 * @access protected
-		 */
-		protected function checkPageBreak($h=0, $y='', $addpage=true) {
-			if ($this->empty_string($y)) {
-				$y = $this->y;
-			}
-			if ((($y + $h) > $this->PageBreakTrigger) AND (!$this->InFooter) AND ($this->AcceptPageBreak())) {
-				if ($addpage) {
-					//Automatic page break
-					$x = $this->x;
-					$this->AddPage($this->CurOrientation);
-					$this->y = $this->tMargin;
-					$oldpage = $this->page - 1;
-					if ($this->rtl) {
-						if ($this->pagedim[$this->page]['orm'] != $this->pagedim[$oldpage]['orm']) {
-							$this->x = $x - ($this->pagedim[$this->page]['orm'] - $this->pagedim[$oldpage]['orm']);
-						} else {
-							$this->x = $x;
-						}
-					} else {
-						if ($this->pagedim[$this->page]['olm'] != $this->pagedim[$oldpage]['olm']) {
-							$this->x = $x + ($this->pagedim[$this->page]['olm'] - $this->pagedim[$oldpage]['olm']);
-						} else {
-							$this->x = $x;
-						}
-					}
-				}
-				return true;
-			}
-			return false;
-		}
-
-		/**
-		 * Prints a cell (rectangular area) with optional borders, background color and character string. The upper-left corner of the cell corresponds to the current position. The text can be aligned or centered. After the call, the current position moves to the right or to the next line. It is possible to put a link on the text.<br />
-		 * If automatic page breaking is enabled and the cell goes beyond the limit, a page break is done before outputting.
-		 * @param float $w Cell width. If 0, the cell extends up to the right margin.
-		 * @param float $h Cell height. Default value: 0.
-		 * @param string $txt String to print. Default value: empty string.
-		 * @param mixed $border Indicates if borders must be drawn around the cell. The value can be either a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul>or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul>
-		 * @param int $ln Indicates where the current position should go after the call. Possible values are:<ul><li>0: to the right (or left for RTL languages)</li><li>1: to the beginning of the next line</li><li>2: below</li></ul>
-		Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value: 0.
-		 * @param string $align Allows to center or align the text. Possible values are:<ul><li>L or empty string: left align (default value)</li><li>C: center</li><li>R: right align</li><li>J: justify</li></ul>
-		 * @param int $fill Indicates if the cell background must be painted (1) or transparent (0). Default value: 0.
-		 * @param mixed $link URL or identifier returned by AddLink().
-		 * @param int $stretch stretch carachter mode: <ul><li>0 = disabled</li><li>1 = horizontal scaling only if necessary</li><li>2 = forced horizontal scaling</li><li>3 = character spacing only if necessary</li><li>4 = forced character spacing</li></ul>
-		 * @param boolean $ignore_min_height if true ignore automatic minimum height value.
-		 * @param string $calign cell vertical alignment relative to the specified Y value. Possible values are:<ul><li>T : cell top</li><li>C : center</li><li>B : cell bottom</li><li>A : font top</li><li>L : font baseline</li><li>D : font bottom</li></ul>
-		 * @param string $valign text vertical alignment inside the cell. Possible values are:<ul><li>T : top</li><li>C : center</li><li>B : bottom</li></ul>
-		 * @access public
-		 * @since 1.0
-		 * @see SetFont(), SetDrawColor(), SetFillColor(), SetTextColor(), SetLineWidth(), AddLink(), Ln(), MultiCell(), Write(), SetAutoPageBreak()
-		 */
-		public function Cell($w, $h=0, $txt='', $border=0, $ln=0, $align='', $fill=0, $link='', $stretch=0, $ignore_min_height=false, $calign='T', $valign='M') {
-			if (!$ignore_min_height) {
-				$min_cell_height = $this->FontSize * $this->cell_height_ratio;
-				if ($h < $min_cell_height) {
-					$h = $min_cell_height;
-				}
-			}
-			$this->checkPageBreak($h);
-			$this->_out($this->getCellCode($w, $h, $txt, $border, $ln, $align, $fill, $link, $stretch, $ignore_min_height, $calign, $valign));
-		}
-
-		/**
-		 * Removes SHY characters from text.
-		 * @param string $txt input string
-		 * @return string without SHY characters.
-		 * @access public
-		 * @since (4.5.019) 2009-02-28
-		 */
-		public function removeSHY($txt='') {
-			/*
-			* Unicode Data
-			* Name : SOFT HYPHEN, commonly abbreviated as SHY
-			* HTML Entity (decimal): &#173;
-			* HTML Entity (hex): &#xad;
-			* HTML Entity (named): &shy;
-			* How to type in Microsoft Windows: [Alt +00AD] or [Alt 0173]
-			* UTF-8 (hex): 0xC2 0xAD (c2ad)
-			* UTF-8 character: chr(194).chr(173)
-			*/
-			$txt = preg_replace('/([\\xc2]{1}[\\xad]{1})/', '', $txt);
-			if (!$this->isunicode) {
-				$txt = preg_replace('/([\\xad]{1})/', '', $txt);
-			}
-			return $txt;
-		}
-
-		/**
-		 * Returns the PDF string code to print a cell (rectangular area) with optional borders, background color and character string. The upper-left corner of the cell corresponds to the current position. The text can be aligned or centered. After the call, the current position moves to the right or to the next line. It is possible to put a link on the text.<br />
-		 * If automatic page breaking is enabled and the cell goes beyond the limit, a page break is done before outputting.
-		 * @param float $w Cell width. If 0, the cell extends up to the right margin.
-		 * @param float $h Cell height. Default value: 0.
-		 * @param string $txt String to print. Default value: empty string.
-		 * @param mixed $border Indicates if borders must be drawn around the cell. The value can be either a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul>or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul>
-		 * @param int $ln Indicates where the current position should go after the call. Possible values are:<ul><li>0: to the right (or left for RTL languages)</li><li>1: to the beginning of the next line</li><li>2: below</li></ul>Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value: 0.
-		 * @param string $align Allows to center or align the text. Possible values are:<ul><li>L or empty string: left align (default value)</li><li>C: center</li><li>R: right align</li><li>J: justify</li></ul>
-		 * @param int $fill Indicates if the cell background must be painted (1) or transparent (0). Default value: 0.
-		 * @param mixed $link URL or identifier returned by AddLink().
-		 * @param int $stretch stretch carachter mode: <ul><li>0 = disabled</li><li>1 = horizontal scaling only if necessary</li><li>2 = forced horizontal scaling</li><li>3 = character spacing only if necessary</li><li>4 = forced character spacing</li></ul>
-		 * @param boolean $ignore_min_height if true ignore automatic minimum height value.
-		 * @param string $calign cell vertical alignment relative to the specified Y value. Possible values are:<ul><li>T : cell top</li><li>C : center</li><li>B : cell bottom</li><li>A : font top</li><li>L : font baseline</li><li>D : font bottom</li></ul>
-		 * @param string $valign text vertical alignment inside the cell. Possible values are:<ul><li>T : top</li><li>C : center</li><li>B : bottom</li></ul>
-		 * @access protected
-		 * @since 1.0
-		 * @see Cell()
-		 */
-		protected function getCellCode($w, $h=0, $txt='', $border=0, $ln=0, $align='', $fill=0, $link='', $stretch=0, $ignore_min_height=false, $calign='T', $valign='M') {
-			$txt = $this->removeSHY($txt);
-			$rs = ''; //string to be returned
-			if (!$ignore_min_height) {
-				$min_cell_height = $this->FontSize * $this->cell_height_ratio;
-				if ($h < $min_cell_height) {
-					$h = $min_cell_height;
-				}
-			}
-			$k = $this->k;
-			$x = $this->x;
-			$y = $this->y;
-			// cell vertical alignment
-			switch ($calign) {
-				case 'A': {
-					// font top
-					switch ($valign) {
-						case 'T': {
-							// top
-							$y -= ($this->LineWidth / 2);
-							break;
-						}
-						case 'B': {
-							// bottom
-							$y -= ($h - $this->FontAscent - $this->FontDescent - ($this->LineWidth / 2));
-							break;
-						}
-						default:
-						case 'M': {
-							// center
-							$y -= (($h - $this->FontAscent - $this->FontDescent) / 2);
-							break;
-						}
-					}
-					break;
-				}
-				case 'L': {
-					// font baseline
-					switch ($valign) {
-						case 'T': {
-							// top
-							$y -= ($this->FontAscent + ($this->LineWidth / 2));
-							break;
-						}
-						case 'B': {
-							// bottom
-							$y -= ($h - $this->FontDescent - ($this->LineWidth / 2));
-							break;
-						}
-						default:
-						case 'M': {
-							// center
-							$y -= (($h + $this->FontAscent - $this->FontDescent) / 2);
-							break;
-						}
-					}
-					break;
-				}
-				case 'D': {
-					// font bottom
-					switch ($valign) {
-						case 'T': {
-							// top
-							$y -= ($this->FontAscent + $this->FontDescent + ($this->LineWidth / 2));
-							break;
-						}
-						case 'B': {
-							// bottom
-							$y -= ($h - ($this->LineWidth / 2));
-							break;
-						}
-						default:
-						case 'M': {
-							// center
-							$y -= (($h + $this->FontAscent + $this->FontDescent) / 2);
-							break;
-						}
-					}
-					break;
-				}
-				case 'B': {
-					// cell bottom
-					$y -= $h;
-					break;
-				}
-				case 'C': {
-					// cell center
-					$y -= ($h / 2);
-					break;
-				}
-				default:
-				case 'T': {
-					// cell top
-					break;
-				}
-			}
-			// text vertical alignment
-			switch ($valign) {
-				case 'T': {
-					// top
-					$basefonty = $y + $this->FontAscent + ($this->LineWidth / 2);
-					break;
-				}
-				case 'B': {
-					// bottom
-					$basefonty = $y + $h - $this->FontDescent - ($this->LineWidth / 2);
-					break;
-				}
-				default:
-				case 'M': {
-					// center
-					$basefonty = $y + (($h + $this->FontAscent - $this->FontDescent) / 2);
-					break;
-				}
-			}
-			if ($this->empty_string($w) OR ($w <= 0)) {
-				if ($this->rtl) {
-					$w = $x - $this->lMargin;
-				} else {
-					$w = $this->w - $this->rMargin - $x;
-				}
-			}
-			$s = '';
-			// fill and borders
-			if (($fill == 1) OR ($border == 1)) {
-				if ($fill == 1) {
-					$op = ($border == 1) ? 'B' : 'f';
-				} else {
-					$op = 'S';
-				}
-				if ($this->rtl) {
-					$xk = (($this->x  - $w) * $k);
-				} else {
-					$xk = ($this->x * $k);
-				}
-				$s .= sprintf('%.2F %.2F %.2F %.2F re %s ', $xk, (($this->h - $y) * $k), ($w * $k), (-$h * $k), $op);
-			}
-			if (is_string($border)) {
-				$lm = ($this->LineWidth / 2);
-				if (strpos($border,'L') !== false) {
-					if ($this->rtl) {
-						$xk = ($x - $w) * $k;
-					} else {
-						$xk = $x * $k;
-					}
-					$s .= sprintf('%.2F %.2F m %.2F %.2F l S ', $xk, (($this->h - $y + $lm) * $k), $xk, (($this->h - ($y + $h + $lm)) * $k));
-				}
-				if (strpos($border,'T') !== false) {
-					if ($this->rtl) {
-						$xk = ($x - $w + $lm) * $k;
-						$xwk = ($x - $lm) * $k;
-					} else {
-						$xk = ($x - $lm) * $k;
-						$xwk = ($x + $w + $lm) * $k;
-					}
-					$s .= sprintf('%.2F %.2F m %.2F %.2F l S ', $xk, (($this->h - $y) * $k), $xwk, (($this->h - $y) * $k));
-				}
-				if (strpos($border,'R') !== false) {
-					if ($this->rtl) {
-						$xk = $x * $k;
-					} else {
-						$xk = ($x + $w) * $k;
-					}
-					$s .= sprintf('%.2F %.2F m %.2F %.2F l S ', $xk, (($this->h - $y + $lm) * $k), $xk, (($this->h - ($y + $h + $lm))* $k));
-				}
-				if (strpos($border,'B') !== false) {
-					if ($this->rtl) {
-						$xk = ($x - $w + $lm) * $k;
-						$xwk = ($x - $lm) * $k;
-					} else {
-						$xk = ($x - $lm) * $k;
-						$xwk = ($x + $w + $lm) * $k;
-					}
-					$s .= sprintf('%.2F %.2F m %.2F %.2F l S ', $xk, (($this->h - ($y + $h)) * $k), $xwk, (($this->h - ($y + $h)) * $k));
-				}
-			}
-			if ($txt != '') {
-				$txt2 = $txt;
-				if ($this->isunicode) {
-					if (($this->CurrentFont['type'] == 'core') OR ($this->CurrentFont['type'] == 'TrueType') OR ($this->CurrentFont['type'] == 'Type1')) {
-						$txt2 = $this->UTF8ToLatin1($txt2);
-					} else {
-						$unicode = $this->UTF8StringToArray($txt); // array of UTF-8 unicode values
-						$unicode = $this->utf8Bidi($unicode, '', $this->tmprtl);
-						if (defined('K_THAI_TOPCHARS') AND (K_THAI_TOPCHARS == true)) {
-							// ---- Fix for bug #2977340 "Incorrect Thai characters position arrangement" ----
-							// NOTE: this doesn't work with HTML justification
-							// Symbols that could overlap on the font top (only works in LTR)
-							$topchar = array(3611, 3613, 3615, 3650, 3651, 3652); // chars that extends on top
-							$topsym = array(3633, 3636, 3637, 3638, 3639, 3655, 3656, 3657, 3658, 3659, 3660, 3661, 3662); // symbols with top position
-							$numchars = count($unicode); // number of chars
-							$unik = 0;
-							$uniblock = array();
-							$uniblock[$unik] = array();
-							$uniblock[$unik][] = $unicode[0];
-							// resolve overlapping conflicts by splitting the string in several parts
-							for ($i = 1; $i < $numchars; ++$i) {
-								// check if symbols overlaps at top
-								if (in_array($unicode[$i], $topsym) AND (in_array($unicode[($i - 1)], $topsym) OR in_array($unicode[($i - 1)], $topchar))) {
-									// move symbols to another array
-									++$unik;
-									$uniblock[$unik] = array();
-									$uniblock[$unik][] = $unicode[$i];
-									++$unik;
-									$uniblock[$unik] = array();
-									$unicode[$i] = 8203; // Unicode Character 'ZERO WIDTH SPACE' (U+200B)
-								} else {
-									$uniblock[$unik][] = $unicode[$i];
-								}
-							}
-							// ---- END OF Fix for bug #2977340
-						}
-						$txt2 = $this->arrUTF8ToUTF16BE($unicode, false);
-					}
-				}
-				$txt2 = $this->_escape($txt2);
-				// text length
-				$txwidth = $this->GetStringWidth($txt);
-				$width = $txwidth;
-				// ratio between cell length and text length
-				if ($width <= 0) {
-					$ratio = 1;
-				} else {
-					$ratio = ($w - (2 * $this->cMargin)) / $width;
-				}
-				// stretch text if required
-				if (($stretch > 0) AND (($ratio < 1) OR (($ratio > 1) AND (($stretch % 2) == 0)))) {
-					if ($stretch > 2) {
-						// spacing
-						//Calculate character spacing in points
-						$char_space = (($w - $width - (2 * $this->cMargin)) * $this->k) / max($this->GetNumChars($txt)-1,1);
-						//Set character spacing
-						$rs .= sprintf('BT %.2F Tc ET ', $char_space);
-					} else {
-						// scaling
-						//Calculate horizontal scaling
-						$horiz_scale = $ratio * 100.0;
-						//Set horizontal scaling
-						$rs .= sprintf('BT %.2F Tz ET ', $horiz_scale);
-					}
-					$align = '';
-					$width = $w - (2 * $this->cMargin);
-				} else {
-					$stretch == 0;
-				}
-				if ($this->ColorFlag) {
-					$s .= 'q '.$this->TextColor.' ';
-				}
-				// rendering mode
-				$s .= sprintf('BT %d Tr %.2F w ET ', $this->textrendermode, $this->textstrokewidth);
-				// count number of spaces
-				$ns = substr_count($txt, ' ');
-				// Justification
-				$spacewidth = 0;
-				if (($align == 'J') AND ($ns > 0)) {
-					if (($this->CurrentFont['type'] == 'TrueTypeUnicode') OR ($this->CurrentFont['type'] == 'cidfont0')) {
-							// get string width without spaces
-							$width = $this->GetStringWidth(str_replace(' ', '', $txt));
-							// calculate average space width
-							$spacewidth = -1000 * ($w - $width - (2 * $this->cMargin)) / ($ns?$ns:1) / $this->FontSize;
-							// set word position to be used with TJ operator
-							$txt2 = str_replace(chr(0).chr(32), ') '.sprintf('%.3F', $spacewidth).' (', $txt2);
-							$unicode_justification = true;
-					} else {
-						// get string width
-						$width = $txwidth;
-						$spacewidth = (($w - $width - (2 * $this->cMargin)) / ($ns?$ns:1)) * $this->k;
-						// set word spacing
-						$rs .= sprintf('BT %.3F Tw ET ', $spacewidth);
-					}
-					$width = $w - (2 * $this->cMargin);
-				}
-				// replace carriage return characters
-				$txt2 = str_replace("\r", ' ', $txt2);
-				switch ($align) {
-					case 'C': {
-						$dx = ($w - $width) / 2;
-						break;
-					}
-					case 'R': {
-						if ($this->rtl) {
-							$dx = $this->cMargin;
-						} else {
-							$dx = $w - $width - $this->cMargin;
-						}
-						break;
-					}
-					case 'L': {
-						if ($this->rtl) {
-							$dx = $w - $width - $this->cMargin;
-						} else {
-							$dx = $this->cMargin;
-						}
-						break;
-					}
-					case 'J':
-					default: {
-						$dx = $this->cMargin;
-						break;
-					}
-				}
-				if ($this->rtl) {
-					$xdx = $this->x - $dx - $width;
-				} else {
-					$xdx = $this->x + $dx;
-				}
-				$xdk = $xdx * $k;
-				// print text
-				$s .= sprintf('BT %.2F %.2F Td [(%s)] TJ ET', $xdk, (($this->h - $basefonty) * $k), $txt2);
-				if (isset($uniblock)) {
-					// print overlapping characters as separate string
-					$xshift = 0; // horizontal shift
-					$ty = (($this->h - $basefonty + (0.2 * $this->FontSize)) * $k);
-					$spw = (($w - $txwidth - (2 * $this->cMargin)) / ($ns?$ns:1));
-					foreach ($uniblock as $uk => $uniarr) {
-						if (($uk % 2) == 0) {
-							// x space to skip
-							if ($spacewidth != 0) {
-								// justification shift
-								$xshift += (count(array_keys($uniarr, 32)) * $spw);
-							}
-							$xshift += $this->GetArrStringWidth($uniarr); // + shift justification
-						} else {
-							// character to print
-							$topchr = $this->arrUTF8ToUTF16BE($uniarr, false);
-							$topchr = $this->_escape($topchr);
-							$s .= sprintf(' BT %.2F %.2F Td [(%s)] TJ ET', ($xdk + ($xshift * $k)), $ty, $topchr);
-						}
-					}
-				}
-				if ($this->underline)  {
-					$s .= ' '.$this->_dounderlinew($xdx, $basefonty, $width);
-				}
-				if ($this->linethrough) {
-					$s .= ' '.$this->_dolinethroughw($xdx, $basefonty, $width);
-				}
-				if ($this->overline)  {
-					$s .= ' '.$this->_dooverlinew($xdx, $basefonty, $width);
-				}
-				if ($this->ColorFlag) {
-					$s .= ' Q';
-				}
-				if ($link) {
-					$this->Link($xdx, $y + (($h - $this->FontSize)/2), $width, $this->FontSize, $link, $ns);
-				}
-			}
-			// output cell
-			if ($s) {
-				// output cell
-				$rs .= $s;
-				// reset text stretching
-				if ($stretch > 2) {
-					//Reset character horizontal spacing
-					$rs .= ' BT 0 Tc ET';
-				} elseif ($stretch > 0) {
-					//Reset character horizontal scaling
-					$rs .= ' BT 100 Tz ET';
-				}
-			}
-			// reset word spacing
-			if (!(($this->CurrentFont['type'] == 'TrueTypeUnicode') OR ($this->CurrentFont['type'] == 'cidfont0')) AND ($align == 'J')) {
-				$rs .= ' BT 0 Tw ET';
-			}
-			$this->lasth = $h;
-			if ($ln > 0) {
-				//Go to the beginning of the next line
-				$this->y = $y + $h;
-				if ($ln == 1) {
-					if ($this->rtl) {
-						$this->x = $this->w - $this->rMargin;
-					} else {
-						$this->x = $this->lMargin;
-					}
-				}
-			} else {
-				// go left or right by case
-				if ($this->rtl) {
-					$this->x -= $w;
-				} else {
-					$this->x += $w;
-				}
-			}
-			$gstyles = ''.$this->linestyleWidth.' '.$this->linestyleCap.' '.$this->linestyleJoin.' '.$this->linestyleDash.' '.$this->DrawColor.' '.$this->FillColor."\n";
-			$rs = $gstyles.$rs;
-			return $rs;
-		}
-
-		/**
-		 * This method allows printing text with line breaks.
-		 * They can be automatic (as soon as the text reaches the right border of the cell) or explicit (via the \n character). As many cells as necessary are output, one below the other.<br />
-		 * Text can be aligned, centered or justified. The cell block can be framed and the background painted.
-		 * @param float $w Width of cells. If 0, they extend up to the right margin of the page.
-		 * @param float $h Cell minimum height. The cell extends automatically if needed.
-		 * @param string $txt String to print
-		 * @param mixed $border Indicates if borders must be drawn around the cell block. The value can be either a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul>or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul>
-		 * @param string $align Allows to center or align the text. Possible values are:<ul><li>L or empty string: left align</li><li>C: center</li><li>R: right align</li><li>J: justification (default value when $ishtml=false)</li></ul>
-		 * @param int $fill Indicates if the cell background must be painted (1) or transparent (0). Default value: 0.
-		 * @param int $ln Indicates where the current position should go after the call. Possible values are:<ul><li>0: to the right</li><li>1: to the beginning of the next line [DEFAULT]</li><li>2: below</li></ul>
-		 * @param float $x x position in user units
-		 * @param float $y y position in user units
-		 * @param boolean $reseth if true reset the last cell height (default true).
-		 * @param int $stretch stretch carachter mode: <ul><li>0 = disabled</li><li>1 = horizontal scaling only if necessary</li><li>2 = forced horizontal scaling</li><li>3 = character spacing only if necessary</li><li>4 = forced character spacing</li></ul>
-		 * @param boolean $ishtml set to true if $txt is HTML content (default = false).
-		 * @param boolean $autopadding if true, uses internal padding and automatically adjust it to account for line width.
-		 * @param float $maxh maximum height. It should be >= $h and less then remaining space to the bottom of the page, or 0 for disable this feature. This feature works only when $ishtml=false.
-		 * @return int Return the number of cells or 1 for html mode.
-		 * @access public
-		 * @since 1.3
-		 * @see SetFont(), SetDrawColor(), SetFillColor(), SetTextColor(), SetLineWidth(), Cell(), Write(), SetAutoPageBreak()
-		 */
-		public function MultiCell($w, $h, $txt, $border=0, $align='J', $fill=0, $ln=1, $x='', $y='', $reseth=true, $stretch=0, $ishtml=false, $autopadding=true, $maxh=0) {
-			if ($this->empty_string($this->lasth) OR $reseth) {
-				//set row height
-				$this->lasth = $this->FontSize * $this->cell_height_ratio;
-			}
-			if (!$this->empty_string($y)) {
-				$this->SetY($y);
-			} else {
-				$y = $this->GetY();
-			}
-			// check for page break
-			$this->checkPageBreak($h);
-			$y = $this->GetY();
-			// get current page number
-			$startpage = $this->page;
-			if (!$this->empty_string($x)) {
-				$this->SetX($x);
-			} else {
-				$x = $this->GetX();
-			}
-			if ($this->empty_string($w) OR ($w <= 0)) {
-				if ($this->rtl) {
-					$w = $this->x - $this->lMargin;
-				} else {
-					$w = $this->w - $this->rMargin - $this->x;
-				}
-			}
-			// store original margin values
-			$lMargin = $this->lMargin;
-			$rMargin = $this->rMargin;
-			if ($this->rtl) {
-				$this->SetRightMargin($this->w - $this->x);
-				$this->SetLeftMargin($this->x - $w);
-			} else {
-				$this->SetLeftMargin($this->x);
-				$this->SetRightMargin($this->w - $this->x - $w);
-			}
-			$starty = $this->y;
-			if ($autopadding) {
-				// Adjust internal padding
-				if ($this->cMargin < ($this->LineWidth / 2)) {
-					$this->cMargin = ($this->LineWidth / 2);
-				}
-				// Add top space if needed
-				if (($this->lasth - $this->FontSize) < $this->LineWidth) {
-					$this->y += $this->LineWidth / 2;
-				}
-				// add top padding
-				$this->y += $this->cMargin;
-			}
-			if ($ishtml) {
-				// ******* Write HTML text
-				$this->writeHTML($txt, true, 0, $reseth, true, $align);
-				$nl = 1;
-			} else {
-				// ******* Write text
-				$nl = $this->Write($this->lasth, $txt, '', 0, $align, true, $stretch, false, true, $maxh);
-			}
-			if ($autopadding) {
-				// add bottom padding
-				$this->y += $this->cMargin;
-				// Add bottom space if needed
-				if (($this->lasth - $this->FontSize) < $this->LineWidth) {
-					$this->y += $this->LineWidth / 2;
-				}
-			}
-			// Get end-of-text Y position
-			$currentY = $this->y;
-			// get latest page number
-			$endpage = $this->page;
-			// check if a new page has been created
-			if ($endpage > $startpage) {
-				// design borders around HTML cells.
-				for ($page=$startpage; $page <= $endpage; ++$page) {
-					$this->setPage($page);
-					if ($page == $startpage) {
-						$this->y = $starty; // put cursor at the beginning of cell on the first page
-						$h = $this->getPageHeight() - $starty - $this->getBreakMargin();
-						$cborder = $this->getBorderMode($border, $position='start');
-					} elseif ($page == $endpage) {
-						$this->y = $this->tMargin; // put cursor at the beginning of last page
-						$h = $currentY - $this->tMargin;
-						$cborder = $this->getBorderMode($border, $position='end');
-					} else {
-						$this->y = $this->tMargin; // put cursor at the beginning of the current page
-						$h = $this->getPageHeight() - $this->tMargin - $this->getBreakMargin();
-						$cborder = $this->getBorderMode($border, $position='middle');
-					}
-					$nx = $x;
-					// account for margin changes
-					if ($page > $startpage) {
-						if (($this->rtl) AND ($this->pagedim[$page]['orm'] != $this->pagedim[$startpage]['orm'])) {
-							$nx = $x + ($this->pagedim[$page]['orm'] - $this->pagedim[$startpage]['orm']);
-						} elseif ((!$this->rtl) AND ($this->pagedim[$page]['olm'] != $this->pagedim[$startpage]['olm'])) {
-							$nx = $x + ($this->pagedim[$page]['olm'] - $this->pagedim[$startpage]['olm']);
-						}
-					}
-					$this->SetX($nx);
-					$ccode = $this->getCellCode($w, $h, '', $cborder, 1, '', $fill, '', 0, false);
-					if ($cborder OR $fill) {
-						$pagebuff = $this->getPageBuffer($this->page);
-						$pstart = substr($pagebuff, 0, $this->intmrk[$this->page]);
-						$pend = substr($pagebuff, $this->intmrk[$this->page]);
-						$this->setPageBuffer($this->page, $pstart.$ccode."\n".$pend);
-						$this->intmrk[$this->page] += strlen($ccode."\n");
-					}
-				}
-			} else {
-				$h = max($h, ($currentY - $y));
-				// put cursor at the beginning of text
-				$this->SetY($y);
-				$this->SetX($x);
-				// design a cell around the text
-				$ccode = $this->getCellCode($w, $h, '', $border, 1, '', $fill, '', 0, true);
-				if ($border OR $fill) {
-					if (end($this->transfmrk[$this->page]) !== false) {
-						$pagemarkkey = key($this->transfmrk[$this->page]);
-						$pagemark = &$this->transfmrk[$this->page][$pagemarkkey];
-					} elseif ($this->InFooter) {
-						$pagemark = &$this->footerpos[$this->page];
-					} else {
-						$pagemark = &$this->intmrk[$this->page];
-					}
-					$pagebuff = $this->getPageBuffer($this->page);
-					$pstart = substr($pagebuff, 0, $pagemark);
-					$pend = substr($pagebuff, $pagemark);
-					$this->setPageBuffer($this->page, $pstart.$ccode."\n".$pend);
-					$pagemark += strlen($ccode."\n");
-				}
-			}
-			// Get end-of-cell Y position
-			$currentY = $this->GetY();
-			// restore original margin values
-			$this->SetLeftMargin($lMargin);
-			$this->SetRightMargin($rMargin);
-			if ($ln > 0) {
-				//Go to the beginning of the next line
-				$this->SetY($currentY);
-				if ($ln == 2) {
-					$this->SetX($x + $w);
-				}
-			} else {
-				// go left or right by case
-				$this->setPage($startpage);
-				$this->y = $y;
-				$this->SetX($x + $w);
-			}
-			$this->setContentMark();
-			return $nl;
-		}
-
-		/**
-		 * Get the border mode accounting for multicell position (opens bottom side of multicell crossing pages)
-		 * @param mixed $border Indicates if borders must be drawn around the cell block. The value can be either a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul>or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul>
-		 * @param string multicell position: 'start', 'middle', 'end'
-		 * @return border mode
-		 * @access protected
-		 * @since 4.4.002 (2008-12-09)
-		 */
-		protected function getBorderMode($border, $position='start') {
-			if ((!$this->opencell) AND ($border == 1)) {
-				return 1;
-			}
-			$cborder = '';
-			switch ($position) {
-				case 'start': {
-					if ($border == 1) {
-						$cborder = 'LTR';
-					} else {
-						if (!(false === strpos($border, 'L'))) {
-							$cborder .= 'L';
-						}
-						if (!(false === strpos($border, 'T'))) {
-							$cborder .= 'T';
-						}
-						if (!(false === strpos($border, 'R'))) {
-							$cborder .= 'R';
-						}
-						if ((!$this->opencell) AND (!(false === strpos($border, 'B')))) {
-							$cborder .= 'B';
-						}
-					}
-					break;
-				}
-				case 'middle': {
-					if ($border == 1) {
-						$cborder = 'LR';
-					} else {
-						if (!(false === strpos($border, 'L'))) {
-							$cborder .= 'L';
-						}
-						if ((!$this->opencell) AND (!(false === strpos($border, 'T')))) {
-							$cborder .= 'T';
-						}
-						if (!(false === strpos($border, 'R'))) {
-							$cborder .= 'R';
-						}
-						if ((!$this->opencell) AND (!(false === strpos($border, 'B')))) {
-							$cborder .= 'B';
-						}
-					}
-					break;
-				}
-				case 'end': {
-					if ($border == 1) {
-						$cborder = 'LRB';
-					} else {
-						if (!(false === strpos($border, 'L'))) {
-							$cborder .= 'L';
-						}
-						if ((!$this->opencell) AND (!(false === strpos($border, 'T')))) {
-							$cborder .= 'T';
-						}
-						if (!(false === strpos($border, 'R'))) {
-							$cborder .= 'R';
-						}
-						if (!(false === strpos($border, 'B'))) {
-							$cborder .= 'B';
-						}
-					}
-					break;
-				}
-				default: {
-					$cborder = $border;
-					break;
-				}
-			}
-			return $cborder;
-		}
-
-		/**
-		 * This method returns the estimated number of lines required to print the text (not the real number just a quick estimation).
-		 * If you want o know the exact number of lines you have to use the following technique:
-		 * <pre>
-		 *  // store current object
-		 *  $pdf->startTransaction();
-		 *  // get the number of lines for multicell
-		 *  $lines = $pdf->MultiCell($w, 0, $txt, 0, 'L', 0, 0, '', '', true, 0, false, true, 0);
-		 *  // restore previous object
-		 *  $pdf = $pdf->rollbackTransaction();
-		 * </pre>
-		 * @param string $txt text to print
-		 * @param float $w width of cell. If 0, they extend up to the right margin of the page.
-		 * @return int Return the estimated number of lines.
-		 * @access public
-		 * @since 4.5.011
-		 */
-		public function getNumLines($txt, $w=0) {
-			$lines = 0;
-			if ($this->empty_string($w) OR ($w <= 0)) {
-				if ($this->rtl) {
-					$w = $this->x - $this->lMargin;
-				} else {
-					$w = $this->w - $this->rMargin - $this->x;
-				}
-			}
-			// max column width
-			$wmax = $w - (2 * $this->cMargin);
-			// remove carriage returns
-			$txt = str_replace("\r", '', $txt);
-			// remove last newline (if any)
-			if (substr($txt,-1) == "\n") {
-				$txt = substr($txt, 0, -1);
-			}
-			// divide text in blocks
-			$txtblocks = explode("\n", $txt);
-			// for each text block
-			foreach ($txtblocks as $block) {
-				// estimate the number of lines
-				$lines += $this->empty_string($block) ? 1 : (ceil($this->GetStringWidth($block) / $wmax));
-			}
-			// return the number of lines
-			return $lines;
-		}
-
-		/**
-		 * This method prints text from the current position.<br />
-		 * @param float $h Line height
-		 * @param string $txt String to print
-		 * @param mixed $link URL or identifier returned by AddLink()
-		 * @param int $fill Indicates if the background must be painted (1) or transparent (0). Default value: 0.
-		 * @param string $align Allows to center or align the text. Possible values are:<ul><li>L or empty string: left align (default value)</li><li>C: center</li><li>R: right align</li><li>J: justify</li></ul>
-		 * @param boolean $ln if true set cursor at the bottom of the line, otherwise set cursor at the top of the line.
-		 * @param int $stretch stretch carachter mode: <ul><li>0 = disabled</li><li>1 = horizontal scaling only if necessary</li><li>2 = forced horizontal scaling</li><li>3 = character spacing only if necessary</li><li>4 = forced character spacing</li></ul>
-		 * @param boolean $firstline if true prints only the first line and return the remaining string.
-		 * @param boolean $firstblock if true the string is the starting of a line.
-		 * @param float $maxh maximum height. The remaining unprinted text will be returned. It should be >= $h and less then remaining space to the bottom of the page, or 0 for disable this feature.
-		 * @return mixed Return the number of cells or the remaining string if $firstline = true.
-		 * @access public
-		 * @since 1.5
-		 */
-		public function Write($h, $txt, $link='', $fill=0, $align='', $ln=false, $stretch=0, $firstline=false, $firstblock=false, $maxh=0) {
-			if (strlen($txt) == 0) {
-				$txt = ' ';
-			}
-			// remove carriage returns
-			$s = str_replace("\r", '', $txt);
-			// check if string contains arabic text
-			if (preg_match(K_RE_PATTERN_ARABIC, $s)) {
-				$arabic = true;
-			} else {
-				$arabic = false;
-			}
-			// check if string contains RTL text
-			if ($arabic OR ($this->tmprtl == 'R') OR preg_match(K_RE_PATTERN_RTL, $txt)) {
-				$rtlmode = true;
-			} else {
-				$rtlmode = false;
-			}
-			// get a char width
-			$chrwidth = $this->GetCharWidth('.');
-			// get array of unicode values
-			$chars = $this->UTF8StringToArray($s);
-			// get array of chars
-			$uchars = $this->UTF8ArrayToUniArray($chars);
-			// get the number of characters
-			$nb = count($chars);
-			// replacement for SHY character (minus symbol)
-			$shy_replacement = 45;
-			$shy_replacement_char = $this->unichr($shy_replacement);
-			// widht for SHY replacement
-			$shy_replacement_width = $this->GetCharWidth($shy_replacement);
-			// store current position
-			$prevx = $this->x;
-			$prevy = $this->y;
-			// max Y
-			$maxy = $this->y + $maxh - $h - (2 * $this->cMargin);
-			// calculate remaining line width ($w)
-			if ($this->rtl) {
-				$w = $this->x - $this->lMargin;
-			} else {
-				$w = $this->w - $this->rMargin - $this->x;
-			}
-			// max column width
-			$wmax = $w - (2 * $this->cMargin);
-			if ((!$firstline) AND (($chrwidth > $wmax) OR ($this->GetCharWidth($chars[0]) > $wmax))) {
-				// a single character do not fit on column
-				return '';
-			}
-			$i = 0; // character position
-			$j = 0; // current starting position
-			$sep = -1; // position of the last blank space
-			$shy = false; // true if the last blank is a soft hypen (SHY)
-			$l = 0; // current string length
-			$nl = 0; //number of lines
-			$linebreak = false;
-			$pc = 0; // previous character
-			// for each character
-			while ($i < $nb) {
-				if (($maxh > 0) AND ($this->y >= $maxy) ) {
-					break;
-				}
-				//Get the current character
-				$c = $chars[$i];
-				if ($c == 10) { // 10 = "\n" = new line
-					//Explicit line break
-					if ($align == 'J') {
-						if ($this->rtl) {
-							$talign = 'R';
-						} else {
-							$talign = 'L';
-						}
-					} else {
-						$talign = $align;
-					}
-					$tmpstr = $this->UniArrSubString($uchars, $j, $i);
-					if ($firstline) {
-						$startx = $this->x;
-						$tmparr = array_slice($chars, $j, ($i - $j));
-						if ($rtlmode) {
-							$tmparr = $this->utf8Bidi($tmparr, $tmpstr, $this->tmprtl);
-						}
-						$linew = $this->GetArrStringWidth($tmparr);
-						unset($tmparr);
-						if ($this->rtl) {
-							$this->endlinex = $startx - $linew;
-						} else {
-							$this->endlinex = $startx + $linew;
-						}
-						$w = $linew;
-						$tmpcmargin = $this->cMargin;
-						if ($maxh == 0) {
-							$this->cMargin = 0;
-						}
-					}
-					if ($firstblock AND $this->isRTLTextDir()) {
-						$tmpstr = rtrim($tmpstr);
-					}
-					$this->Cell($w, $h, $tmpstr, 0, 1, $talign, $fill, $link, $stretch);
-					unset($tmpstr);
-					if ($firstline) {
-						$this->cMargin = $tmpcmargin;
-						return ($this->UniArrSubString($uchars, $i));
-					}
-					++$nl;
-					$j = $i + 1;
-					$l = 0;
-					$sep = -1;
-					$shy = false;
-					// account for margin changes
-					if ((($this->y + $this->lasth) > $this->PageBreakTrigger) AND (!$this->InFooter)) {
-						// AcceptPageBreak() may be overriden on extended classed to include margin changes
-						$this->AcceptPageBreak();
-					}
-					$w = $this->getRemainingWidth();
-					$wmax = $w - (2 * $this->cMargin);
-				} else {
-					// 160 is the non-breaking space.
-					// 173 is SHY (Soft Hypen).
-					// \p{Z} or \p{Separator}: any kind of Unicode whitespace or invisible separator.
-					// \p{Lo} or \p{Other_Letter}: a Unicode letter or ideograph that does not have lowercase and uppercase variants.
-					// \p{Lo} is needed because Chinese characters are packed next to each other without spaces in between.
-					if (($c != 160) AND (($c == 173) OR preg_match($this->re_spaces, $this->unichr($c)))) {
-						// update last blank space position
-						$sep = $i;
-						// check if is a SHY
-						if ($c == 173) {
-							$shy = true;
-							if ($pc == 45) {
-								$tmp_shy_replacement_width = 0;
-								$tmp_shy_replacement_char = '';
-							} else {
-								$tmp_shy_replacement_width = $shy_replacement_width;
-								$tmp_shy_replacement_char = $shy_replacement_char;
-							}
-						} else {
-							$shy = false;
-						}
-					}
-					// update string length
-					if ((($this->CurrentFont['type'] == 'TrueTypeUnicode') OR ($this->CurrentFont['type'] == 'cidfont0')) AND ($arabic)) {
-						// with bidirectional algorithm some chars may be changed affecting the line length
-						// *** very slow ***
-						$l = $this->GetArrStringWidth($this->utf8Bidi(array_slice($chars, $j, ($i - $j)), '', $this->tmprtl));
-					} else {
-						$l += $this->GetCharWidth($c);
-					}
-					if (($l > $wmax) OR (($c == 173) AND (($l + $tmp_shy_replacement_width) > $wmax)) ) {
-						// we have reached the end of column
-						if ($sep == -1) {
-							// check if the line was already started
-							if (($this->rtl AND ($this->x <= ($this->w - $this->rMargin - $chrwidth)))
-								OR ((!$this->rtl) AND ($this->x >= ($this->lMargin + $chrwidth)))) {
-								// print a void cell and go to next line
-								$this->Cell($w, $h, '', 0, 1);
-								$linebreak = true;
-								if ($firstline) {
-									return ($this->UniArrSubString($uchars, $j));
-								}
-							} else {
-								// truncate the word because do not fit on column
-								$tmpstr = $this->UniArrSubString($uchars, $j, $i);
-								if ($firstline) {
-									$startx = $this->x;
-									$tmparr = array_slice($chars, $j, ($i - $j));
-									if ($rtlmode) {
-										$tmparr = $this->utf8Bidi($tmparr, $tmpstr, $this->tmprtl);
-									}
-									$linew = $this->GetArrStringWidth($tmparr);
-									unset($tmparr);
-									if ($this->rtl) {
-										$this->endlinex = $startx - $linew;
-									} else {
-										$this->endlinex = $startx + $linew;
-									}
-									$w = $linew;
-									$tmpcmargin = $this->cMargin;
-									if ($maxh == 0) {
-										$this->cMargin = 0;
-									}
-								}
-								if ($firstblock AND $this->isRTLTextDir()) {
-									$tmpstr = rtrim($tmpstr);
-								}
-								$this->Cell($w, $h, $tmpstr, 0, 1, $align, $fill, $link, $stretch);
-								unset($tmpstr);
-								if ($firstline) {
-									$this->cMargin = $tmpcmargin;
-									return ($this->UniArrSubString($uchars, $i));
-								}
-								$j = $i;
-								--$i;
-							}
-						} else {
-							// word wrapping
-							if ($this->rtl AND (!$firstblock)) {
-								$endspace = 1;
-							} else {
-								$endspace = 0;
-							}
-							if ($shy) {
-								// add hypen (minus symbol) at the end of the line
-								$shy_width = $tmp_shy_replacement_width;
-								if ($this->rtl) {
-									$shy_char_left = $tmp_shy_replacement_char;
-									$shy_char_right = '';
-								} else {
-									$shy_char_left = '';
-									$shy_char_right = $tmp_shy_replacement_char;
-								}
-							} else {
-								$shy_width = 0;
-								$shy_char_left = '';
-								$shy_char_right = '';
-							}
-							$tmpstr = $this->UniArrSubString($uchars, $j, ($sep + $endspace));
-							if ($firstline) {
-								$startx = $this->x;
-								$tmparr = array_slice($chars, $j, (($sep + $endspace) - $j));
-								if ($rtlmode) {
-									$tmparr = $this->utf8Bidi($tmparr, $tmpstr, $this->tmprtl);
-								}
-								$linew = $this->GetArrStringWidth($tmparr);
-								unset($tmparr);
-								if ($this->rtl) {
-									$this->endlinex = $startx - $linew - $shy_width;
-								} else {
-									$this->endlinex = $startx + $linew + $shy_width;
-								}
-								$w = $linew;
-								$tmpcmargin = $this->cMargin;
-								if ($maxh == 0) {
-									$this->cMargin = 0;
-								}
-							}
-							// print the line
-							if ($firstblock AND $this->isRTLTextDir()) {
-								$tmpstr = rtrim($tmpstr);
-							}
-							$this->Cell($w, $h, $shy_char_left.$tmpstr.$shy_char_right, 0, 1, $align, $fill, $link, $stretch);
-							unset($tmpstr);
-							if ($firstline) {
-								// return the remaining text
-								$this->cMargin = $tmpcmargin;
-								return ($this->UniArrSubString($uchars, ($sep + $endspace)));
-							}
-							$i = $sep;
-							$sep = -1;
-							$shy = false;
-							$j = ($i+1);
-						}
-						// account for margin changes
-						if ((($this->y + $this->lasth) > $this->PageBreakTrigger) AND (!$this->InFooter)) {
-							// AcceptPageBreak() may be overriden on extended classed to include margin changes
-							$this->AcceptPageBreak();
-						}
-						$w = $this->getRemainingWidth();
-						$wmax = $w - (2 * $this->cMargin);
-						if ($linebreak) {
-							$linebreak = false;
-						} else {
-							++$nl;
-							$l = 0;
-						}
-					}
-				}
-				// save last character
-				$pc = $c;
-				++$i;
-			} // end while i < nb
-			// print last substring (if any)
-			if ($l > 0) {
-				switch ($align) {
-					case 'J':
-					case 'C': {
-						$w = $w;
-						break;
-					}
-					case 'L': {
-						if ($this->rtl) {
-							$w = $w;
-						} else {
-							$w = $l;
-						}
-						break;
-					}
-					case 'R': {
-						if ($this->rtl) {
-							$w = $l;
-						} else {
-							$w = $w;
-						}
-						break;
-					}
-					default: {
-						$w = $l;
-						break;
-					}
-				}
-				$tmpstr = $this->UniArrSubString($uchars, $j, $nb);
-				if ($firstline) {
-					$startx = $this->x;
-					$tmparr = array_slice($chars, $j, ($nb - $j));
-					if ($rtlmode) {
-						$tmparr = $this->utf8Bidi($tmparr, $tmpstr, $this->tmprtl);
-					}
-					$linew = $this->GetArrStringWidth($tmparr);
-					unset($tmparr);
-					if ($this->rtl) {
-						$this->endlinex = $startx - $linew;
-					} else {
-						$this->endlinex = $startx + $linew;
-					}
-					$w = $linew;
-					$tmpcmargin = $this->cMargin;
-					if ($maxh == 0) {
-						$this->cMargin = 0;
-					}
-				}
-				if ($firstblock AND $this->isRTLTextDir()) {
-					$tmpstr = rtrim($tmpstr);
-				}
-				$this->Cell($w, $h, $tmpstr, 0, $ln, $align, $fill, $link, $stretch);
-				unset($tmpstr);
-				if ($firstline) {
-					$this->cMargin = $tmpcmargin;
-					return ($this->UniArrSubString($uchars, $nb));
-				}
-				++$nl;
-			}
-			if ($firstline) {
-				return '';
-			}
-			return $nl;
-		}
-
-		/**
-		 * Returns the remaining width between the current position and margins.
-		 * @return int Return the remaining width
-		 * @access protected
-		 */
-		protected function getRemainingWidth() {
-			if ($this->rtl) {
-				return ($this->x - $this->lMargin);
-			} else {
-				return ($this->w - $this->rMargin - $this->x);
-			}
-		}
-
-	 	/**
-		 * Extract a slice of the $strarr array and return it as string.
-		 * @param string $strarr The input array of characters.
-		 * @param int $start the starting element of $strarr.
-		 * @param int $end first element that will not be returned.
-		 * @return Return part of a string
-		 * @access public
-		 */
-		public function UTF8ArrSubString($strarr, $start='', $end='') {
-			if (strlen($start) == 0) {
-				$start = 0;
-			}
-			if (strlen($end) == 0) {
-				$end = count($strarr);
-			}
-			$string = '';
-			for ($i=$start; $i < $end; ++$i) {
-				$string .= $this->unichr($strarr[$i]);
-			}
-			return $string;
-		}
-
-	 	/**
-		 * Extract a slice of the $uniarr array and return it as string.
-		 * @param string $uniarr The input array of characters.
-		 * @param int $start the starting element of $strarr.
-		 * @param int $end first element that will not be returned.
-		 * @return Return part of a string
-		 * @access public
-		 * @since 4.5.037 (2009-04-07)
-		 */
-		public function UniArrSubString($uniarr, $start='', $end='') {
-			if (strlen($start) == 0) {
-				$start = 0;
-			}
-			if (strlen($end) == 0) {
-				$end = count($uniarr);
-			}
-			$string = '';
-			for ($i=$start; $i < $end; ++$i) {
-				$string .= $uniarr[$i];
-			}
-			return $string;
-		}
-
-	 	/**
-		 * Convert an array of UTF8 values to array of unicode characters
-		 * @param string $ta The input array of UTF8 values.
-		 * @return Return array of unicode characters
-		 * @access public
-		 * @since 4.5.037 (2009-04-07)
-		 */
-		public function UTF8ArrayToUniArray($ta) {
-			return array_map(array($this, 'unichr'), $ta);
-		}
-
-		/**
-		 * Returns the unicode caracter specified by UTF-8 value
-		 * @param int $c UTF-8 value
-		 * @return Returns the specified character.
-		 * @author Miguel Perez, Nicola Asuni
-		 * @access public
-		 * @since 2.3.000 (2008-03-05)
-		 */
-		public function unichr($c) {
-			if (!$this->isunicode) {
-				return chr($c);
-			} elseif ($c <= 0x7F) {
-				// one byte
-				return chr($c);
-			} elseif ($c <= 0x7FF) {
-				// two bytes
-				return chr(0xC0 | $c >> 6).chr(0x80 | $c & 0x3F);
-			} elseif ($c <= 0xFFFF) {
-				// three bytes
-				return chr(0xE0 | $c >> 12).chr(0x80 | $c >> 6 & 0x3F).chr(0x80 | $c & 0x3F);
-			} elseif ($c <= 0x10FFFF) {
-				// four bytes
-				return chr(0xF0 | $c >> 18).chr(0x80 | $c >> 12 & 0x3F).chr(0x80 | $c >> 6 & 0x3F).chr(0x80 | $c & 0x3F);
-			} else {
-				return '';
-			}
-		}
-
-		/**
-		 * Return the image type given the file name or array returned by getimagesize() function.
-		 * @param string $imgfile image file name
-		 * @param array $iminfo array of image information returned by getimagesize() function.
-		 * @return string image type
-		 * @since 4.8.017 (2009-11-27)
-		 */
-		public function getImageFileType($imgfile, $iminfo=array()) {
-			if (isset($iminfo['mime']) AND !empty($iminfo['mime'])) {
-				$mime = explode('/', $iminfo['mime']);
-				if ((count($mime) > 1) AND ($mime[0] == 'image') AND (!empty($mime[1]))) {
-					return trim($mime[1]);
-				}
-			}
-			$type = '';
-			$fileinfo = pathinfo($imgfile);
-			if (isset($fileinfo['extension']) AND (!$this->empty_string($fileinfo['extension']))) {
-				$type = strtolower(trim($fileinfo['extension']));
-			}
-			if ($type == 'jpg') {
-				$type = 'jpeg';
-			}
-			return $type;
-		}
-
-		/**
-		 * Puts an image in the page.
-		 * The upper-left corner must be given.
-		 * The dimensions can be specified in different ways:<ul>
-		 * <li>explicit width and height (expressed in user unit)</li>
-		 * <li>one explicit dimension, the other being calculated automatically in order to keep the original proportions</li>
-		 * <li>no explicit dimension, in which case the image is put at 72 dpi</li></ul>
-		 * Supported formats are JPEG and PNG images whitout GD library and all images supported by GD: GD, GD2, GD2PART, GIF, JPEG, PNG, BMP, XBM, XPM;
-		 * The format can be specified explicitly or inferred from the file extension.<br />
-		 * It is possible to put a link on the image.<br />
-		 * Remark: if an image is used several times, only one copy will be embedded in the file.<br />
-		 * @param string $file Name of the file containing the image.
-		 * @param float $x Abscissa of the upper-left corner.
-		 * @param float $y Ordinate of the upper-left corner.
-		 * @param float $w Width of the image in the page. If not specified or equal to zero, it is automatically calculated.
-		 * @param float $h Height of the image in the page. If not specified or equal to zero, it is automatically calculated.
-		 * @param string $type Image format. Possible values are (case insensitive): JPEG and PNG (whitout GD library) and all images supported by GD: GD, GD2, GD2PART, GIF, JPEG, PNG, BMP, XBM, XPM;. If not specified, the type is inferred from the file extension.
-		 * @param mixed $link URL or identifier returned by AddLink().
-		 * @param string $align Indicates the alignment of the pointer next to image insertion relative to image height. The value can be:<ul><li>T: top-right for LTR or top-left for RTL</li><li>M: middle-right for LTR or middle-left for RTL</li><li>B: bottom-right for LTR or bottom-left for RTL</li><li>N: next line</li></ul>
-		 * @param mixed $resize If true resize (reduce) the image to fit $w and $h (requires GD or ImageMagick library); if false do not resize; if 2 force resize in all cases (upscaling and downscaling).
-		 * @param int $dpi dot-per-inch resolution used on resize
-		 * @param string $palign Allows to center or align the image on the current line. Possible values are:<ul><li>L : left align</li><li>C : center</li><li>R : right align</li><li>'' : empty string : left for LTR or right for RTL</li></ul>
-		 * @param boolean $ismask true if this image is a mask, false otherwise
-		 * @param mixed $imgmask image object returned by this function or false
-		 * @param mixed $border Indicates if borders must be drawn around the image. The value can be either a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul>or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul>
-		 * @param boolean $fitbox If true scale image dimensions proportionally to fit within the ($w, $h) box.
-		 * @param boolean $hidden if true do not display the image.
-		 * @param boolean $fitonpage if true the image is resized to not exceed page dimensions.
-		 * @return image information
-		 * @access public
-		 * @since 1.1
-		 */
-		public function Image($file, $x='', $y='', $w=0, $h=0, $type='', $link='', $align='', $resize=false, $dpi=300, $palign='', $ismask=false, $imgmask=false, $border=0, $fitbox=false, $hidden=false, $fitonpage=false) {
-			if ($x === '') {
-				$x = $this->x;
-			}
-			if ($y === '') {
-				$y = $this->y;
-			}
-			// get image dimensions
-			$imsize = @getimagesize($file);
-			if ($imsize === FALSE) {
-				// encode spaces on filename
-				$file = str_replace(' ', '%20', $file);
-				$imsize = @getimagesize($file);
-				if ($imsize === FALSE) {
-					if (($w > 0) AND ($h > 0)) {
-						$pw = $this->getHTMLUnitToUnits($w, 0, $this->pdfunit, true) * $this->imgscale * $this->k;
-						$ph = $this->getHTMLUnitToUnits($h, 0, $this->pdfunit, true) * $this->imgscale * $this->k;
-						$imsize = array($pw, $ph);
-					} else {
-						$this->Error('[Image] Unable to get image width and height: '.$file);
-					}
-				}
-			}
-			// get original image width and height in pixels
-			list($pixw, $pixh) = $imsize;
-			// calculate image width and height on document
-			if (($w <= 0) AND ($h <= 0)) {
-				// convert image size to document unit
-				$w = $this->pixelsToUnits($pixw);
-				$h = $this->pixelsToUnits($pixh);
-			} elseif ($w <= 0) {
-				$w = $h * $pixw / $pixh;
-			} elseif ($h <= 0) {
-				$h = $w * $pixh / $pixw;
-			} elseif ($fitbox AND ($w > 0) AND ($h > 0)) {
-				// scale image dimensions proportionally to fit within the ($w, $h) box
-				if ((($w * $pixh) / ($h * $pixw)) < 1) {
-					$h = $w * $pixh / $pixw;
-				} else {
-					$w = $h * $pixw / $pixh;
-				}
-			}
-			// Check whether we need a new page first as this does not fit
-			$prev_x = $this->x;
-			if ($this->checkPageBreak($h, $y)) {
-				$y = $this->y;
-				if ($this->rtl) {
-					$x += ($prev_x - $this->x);
-				} else {
-					$x += ($this->x - $prev_x);
-				}
-			}
-			// resize image to be contained on a single page
-			if ($fitonpage) {
-				$ratio_wh = $w / $h;
-				if (($y + $h) > $this->PageBreakTrigger) {
-					$h = $this->PageBreakTrigger - $y;
-					$w = $h * $ratio_wh;
-				}
-				if (($x + $w) > ($this->w - $this->rMargin)) {
-					$w = $this->w - $this->rMargin - $x;
-					$h = $w / $ratio_wh;
-				}
-			}
-			// calculate new minimum dimensions in pixels
-			$neww = round($w * $this->k * $dpi / $this->dpi);
-			$newh = round($h * $this->k * $dpi / $this->dpi);
-			// check if resize is necessary (resize is used only to reduce the image)
-			$newsize = ($neww * $newh);
-			$pixsize = ($pixw * $pixh);
-			if (intval($resize) == 2) {
-				$resize = true;
-			} elseif ($newsize >= $pixsize) {
-				$resize = false;
-			}
-			// check if image has been already added on document
-			$newimage = true;
-			if (in_array($file, $this->imagekeys)) {
-				$newimage = false;
-				// get existing image data
-				$info = $this->getImageBuffer($file);
-				// check if the newer image is larger
-				$oldsize = ($info['w'] * $info['h']);
-				if ((($oldsize < $newsize) AND ($resize)) OR (($oldsize < $pixsize) AND (!$resize))) {
-					$newimage = true;
-				}
-			}
-			if ($newimage) {
-				//First use of image, get info
-				if ($type == '') {
-					$type = $this->getImageFileType($file, $imsize);
-				}
-				$mqr = $this->get_mqr();
-				$this->set_mqr(false);
-				// Specific image handlers
-				$mtd = '_parse'.$type;
-				// GD image handler function
-				$gdfunction = 'imagecreatefrom'.$type;
-				$info = false;
-				if ((method_exists($this, $mtd)) AND (!($resize AND function_exists($gdfunction)))) {
-					// TCPDF image functions
-					$info = $this->$mtd($file);
-					if ($info == 'pngalpha') {
-						return $this->ImagePngAlpha($file, $x, $y, $w, $h, 'PNG', $link, $align, $resize, $dpi, $palign);
-					}
-				}
-				if (!$info) {
-					if (function_exists($gdfunction)) {
-						// GD library
-						$img = $gdfunction($file);
-						if ($resize) {
-							$imgr = imagecreatetruecolor($neww, $newh);
-							if (($type == 'gif') OR ($type == 'png')) {
-								$imgr = $this->_setGDImageTransparency($imgr, $img);
-							}
-							imagecopyresampled($imgr, $img, 0, 0, 0, 0, $neww, $newh, $pixw, $pixh);
-							if (($type == 'gif') OR ($type == 'png')) {
-								$info = $this->_toPNG($imgr);
-							} else {
-								$info = $this->_toJPEG($imgr);
-							}
-						} else {
-							if (($type == 'gif') OR ($type == 'png')) {
-								$info = $this->_toPNG($img);
-							} else {
-								$info = $this->_toJPEG($img);
-							}
-						}
-					} elseif (extension_loaded('imagick')) {
-						// ImageMagick library
-						$img = new Imagick();
-						if ($type == 'SVG') {
-							// get SBG file content
-							$svgimg = file_get_contents($file);
-							// get width and height
-							$regs = array();
-							if (preg_match('/<svg([^\>]*)>/si', $svgimg, $regs)) {
-								$tmp = array();
-								if (preg_match('/[\s]+width[\s]*=[\s]*"([^"]*)"/si', $regs[1], $tmp)) {
-									$ow = $this->getHTMLUnitToUnits($tmp[1], 1, $this->svgunit, false) * $dpi / 72;
-									$svgimg = preg_replace('/[\s]+width[\s]*=[\s]*"[^"]*"/si', ' width="'.$ow.$this->pdfunit.'"', $svgimg);
-								}
-								$tmp = array();
-								if (preg_match('/[\s]+height[\s]*=[\s]*"([^"]*)"/si', $regs[1], $tmp)) {
-									$oh = $this->getHTMLUnitToUnits($tmp[1], 1, $this->svgunit, false) * $dpi / 72;
-									$svgimg = preg_replace('/[\s]+height[\s]*=[\s]*"[^"]*"/si', ' height="'.$oh.$this->pdfunit.'"', $svgimg);
-								}
-								$tmp = array();
-								if (!preg_match('/[\s]+viewBox[\s]*=[\s]*"[\s]*([0-9\.]+)[\s]+([0-9\.]+)[\s]+([0-9\.]+)[\s]+([0-9\.]+)[\s]*"/si', $regs[1], $tmp)) {
-									$vbw = $ow * (72 / $dpi) * $this->imgscale * $this->k;
-									$vbh = $oh * (72 / $dpi) * $this->imgscale * $this->k;
-									$svgimg = preg_replace('/<svg/si', '<svg viewBox="0 0 '.$vbw.' '.$vbh.'"', $svgimg);
-								}
-							}
-							$img->readImageBlob($svgimg);
-						} else {
-							$img->readImage($file);
-						}
-						if ($resize) {
-							$img->resizeImage($neww, $newh, 10, 1, false);
-						}
-						$img->setCompressionQuality($this->jpeg_quality);
-						$img->setImageFormat('jpeg');
-						$tempname = tempnam(K_PATH_CACHE, 'jpg_');
-						$img->writeImage($tempname);
-						$info = $this->_parsejpeg($tempname);
-						unlink($tempname);
-						$img->destroy();
-					} else {
-						return;
-					}
-				}
-				if ($info === false) {
-					//If false, we cannot process image
-					return;
-				}
-				$this->set_mqr($mqr);
-				if ($ismask) {
-					// force grayscale
-					$info['cs'] = 'DeviceGray';
-				}
-				$info['i'] = $this->numimages;
-				if (!in_array($file, $this->imagekeys)) {
-					++$info['i'];
-				}
-				if ($imgmask !== false) {
-					$info['masked'] = $imgmask;
-				}
-				// add image to document
-				$this->setImageBuffer($file, $info);
-			}
-			// set alignment
-			$this->img_rb_y = $y + $h;
-			// set alignment
-			if ($this->rtl) {
-				if ($palign == 'L') {
-					$ximg = $this->lMargin;
-				} elseif ($palign == 'C') {
-					$ximg = ($this->w - $w) / 2;
-				} elseif ($palign == 'R') {
-					$ximg = $this->w - $this->rMargin - $w;
-				} else {
-					$ximg = $this->w - $x - $w;
-				}
-				$this->img_rb_x = $ximg;
-			} else {
-				if ($palign == 'L') {
-					$ximg = $this->lMargin;
-				} elseif ($palign == 'C') {
-					$ximg = ($this->w - $w) / 2;
-				} elseif ($palign == 'R') {
-					$ximg = $this->w - $this->rMargin - $w;
-				} else {
-					$ximg = $x;
-				}
-				$this->img_rb_x = $ximg + $w;
-			}
-			if ($ismask OR $hidden) {
-				// image is not displayed
-				return $info['i'];
-			}
-			$xkimg = $ximg * $this->k;
-			$this->_out(sprintf('q %.2F 0 0 %.2F %.2F %.2F cm /I%d Do Q', ($w * $this->k), ($h * $this->k), $xkimg, (($this->h - ($y + $h)) * $this->k), $info['i']));
-			if (!empty($border)) {
-				$bx = $x;
-				$by = $y;
-				$this->x = $ximg;
-				if ($this->rtl) {
-					$this->x += $w;
-				}
-				$this->y = $y;
-				$this->Cell($w, $h, '', $border, 0, '', 0, '', 0);
-				$this->x = $bx;
-				$this->y = $by;
-			}
-			if ($link) {
-				$this->Link($ximg, $y, $w, $h, $link, 0);
-			}
-			// set pointer to align the successive text/objects
-			switch($align) {
-				case 'T': {
-					$this->y = $y;
-					$this->x = $this->img_rb_x;
-					break;
-				}
-				case 'M': {
-					$this->y = $y + round($h/2);
-					$this->x = $this->img_rb_x;
-					break;
-				}
-				case 'B': {
-					$this->y = $this->img_rb_y;
-					$this->x = $this->img_rb_x;
-					break;
-				}
-				case 'N': {
-					$this->SetY($this->img_rb_y);
-					break;
-				}
-				default:{
-					break;
-				}
-			}
-			$this->endlinex = $this->img_rb_x;
-			return $info['i'];
-		}
-
-		/**
-		 * Sets the current active configuration setting of magic_quotes_runtime (if the set_magic_quotes_runtime function exist)
-		 * @param boolean $mqr FALSE for off, TRUE for on.
-		 * @since 4.6.025 (2009-08-17)
-		 */
-		public function set_mqr($mqr) {
-			if(!defined('PHP_VERSION_ID')) {
-				$version = PHP_VERSION;
-				define('PHP_VERSION_ID', (($version{0} * 10000) + ($version{2} * 100) + $version{4}));
-			}
-			if (PHP_VERSION_ID < 50300) {
-				@set_magic_quotes_runtime($mqr);
-			}
-		}
-
-		/**
-		 * Gets the current active configuration setting of magic_quotes_runtime (if the get_magic_quotes_runtime function exist)
-		 * @return Returns 0 if magic quotes runtime is off or get_magic_quotes_runtime doesn't exist, 1 otherwise.
-		 * @since 4.6.025 (2009-08-17)
-		 */
-		public function get_mqr() {
-			if(!defined('PHP_VERSION_ID')) {
-				$version = PHP_VERSION;
-				define('PHP_VERSION_ID', (($version{0} * 10000) + ($version{2} * 100) + $version{4}));
-			}
-			if (PHP_VERSION_ID < 50300) {
-				return @get_magic_quotes_runtime();
-			}
-			return 0;
-		}
-
-		/**
-		 * Convert the loaded image to a JPEG and then return a structure for the PDF creator.
-		 * This function requires GD library and write access to the directory defined on K_PATH_CACHE constant.
-		 * @param string $file Image file name.
-		 * @param image $image Image object.
-		 * return image JPEG image object.
-		 * @access protected
-		 */
-		protected function _toJPEG($image) {
-			$tempname = tempnam(K_PATH_CACHE, 'jpg_');
-			imagejpeg($image, $tempname, $this->jpeg_quality);
-			imagedestroy($image);
-			$retvars = $this->_parsejpeg($tempname);
-			// tidy up by removing temporary image
-			unlink($tempname);
-			return $retvars;
-		}
-
-		/**
-		 * Convert the loaded image to a PNG and then return a structure for the PDF creator.
-		 * This function requires GD library and write access to the directory defined on K_PATH_CACHE constant.
-		 * @param string $file Image file name.
-		 * @param image $image Image object.
-		 * return image PNG image object.
-		 * @access protected
-		 * @since 4.9.016 (2010-04-20)
-		 */
-		protected function _toPNG($image) {
-			$tempname = tempnam(K_PATH_CACHE, 'jpg_');
-			imagepng($image, $tempname);
-			imagedestroy($image);
-			$retvars = $this->_parsepng($tempname);
-			// tidy up by removing temporary image
-			unlink($tempname);
-			return $retvars;
-		}
-
-		/**
-		 * Set the transparency for the given GD image.
-		 * @param image $new_image GD image object
-		 * @param image $image GD image object.
-		 * return GD image object.
-		 * @access protected
-		 * @since 4.9.016 (2010-04-20)
-		 */
-		protected function _setGDImageTransparency($new_image, $image) {
-			// transparency index
-			$tid = imagecolortransparent($image);
-			// default transparency color
-			$tcol = array('red' => 255, 'green' => 255, 'blue' => 255);
-			if ($tid >= 0) {
-				// get the colors for the transparency index
-				$tcol = imagecolorsforindex($image, $tid);
-			}
-			$tid = imagecolorallocate($new_image, $tcol['red'], $tcol['green'], $tcol['blue']);
-			imagefill($new_image, 0, 0, $tid);
-			imagecolortransparent($new_image, $tid);
-			return $new_image;
-		}
-
-		/**
-		 * Extract info from a JPEG file without using the GD library.
-		 * @param string $file image file to parse
-		 * @return array structure containing the image data
-		 * @access protected
-		 */
-		protected function _parsejpeg($file) {
-			$a = getimagesize($file);
-			if (empty($a)) {
-				$this->Error('Missing or incorrect image file: '.$file);
-			}
-			if ($a[2] != 2) {
-				$this->Error('Not a JPEG file: '.$file);
-			}
-			if ((!isset($a['channels'])) OR ($a['channels'] == 3)) {
-				$colspace = 'DeviceRGB';
-			} elseif ($a['channels'] == 4) {
-				$colspace = 'DeviceCMYK';
-			} else {
-				$colspace = 'DeviceGray';
-			}
-			$bpc = isset($a['bits']) ? $a['bits'] : 8;
-			$data = file_get_contents($file);
-			return array('w' => $a[0], 'h' => $a[1], 'cs' => $colspace, 'bpc' => $bpc, 'f' => 'DCTDecode', 'data' => $data);
-		}
-
-		/**
-		 * Extract info from a PNG file without using the GD library.
-		 * @param string $file image file to parse
-		 * @return array structure containing the image data
-		 * @access protected
-		 */
-		protected function _parsepng($file) {
-			$f = fopen($file, 'rb');
-			if ($f === false) {
-				$this->Error('Can\'t open image file: '.$file);
-			}
-			//Check signature
-			if (fread($f, 8) != chr(137).'PNG'.chr(13).chr(10).chr(26).chr(10)) {
-				$this->Error('Not a PNG file: '.$file);
-			}
-			//Read header chunk
-			fread($f, 4);
-			if (fread($f, 4) != 'IHDR') {
-				$this->Error('Incorrect PNG file: '.$file);
-			}
-			$w = $this->_freadint($f);
-			$h = $this->_freadint($f);
-			$bpc = ord(fread($f, 1));
-			if ($bpc > 8) {
-				//$this->Error('16-bit depth not supported: '.$file);
-				fclose($f);
-				return false;
-			}
-			$ct = ord(fread($f, 1));
-			if ($ct == 0) {
-				$colspace = 'DeviceGray';
-			} elseif ($ct == 2) {
-				$colspace = 'DeviceRGB';
-			} elseif ($ct == 3) {
-				$colspace = 'Indexed';
-			} else {
-				// alpha channel
-				fclose($f);
-				return 'pngalpha';
-			}
-			if (ord(fread($f, 1)) != 0) {
-				//$this->Error('Unknown compression method: '.$file);
-				fclose($f);
-				return false;
-			}
-			if (ord(fread($f, 1)) != 0) {
-				//$this->Error('Unknown filter method: '.$file);
-				fclose($f);
-				return false;
-			}
-			if (ord(fread($f, 1)) != 0) {
-				//$this->Error('Interlacing not supported: '.$file);
-				fclose($f);
-				return false;
-			}
-			fread($f, 4);
-			$parms = '/DecodeParms <</Predictor 15 /Colors '.($ct==2 ? 3 : 1).' /BitsPerComponent '.$bpc.' /Columns '.$w.'>>';
-			//Scan chunks looking for palette, transparency and image data
-			$pal = '';
-			$trns = '';
-			$data = '';
-			do {
-				$n = $this->_freadint($f);
-				$type = fread($f, 4);
-				if ($type == 'PLTE') {
-					//Read palette
-					$pal = $this->rfread($f, $n);
-					fread($f, 4);
-				} elseif ($type == 'tRNS') {
-					//Read transparency info
-					$t = $this->rfread($f, $n);
-					if ($ct == 0) {
-						$trns = array(ord(substr($t, 1, 1)));
-					} elseif ($ct == 2) {
-						$trns = array(ord(substr($t, 1, 1)), ord(substr($t, 3, 1)), ord(substr($t, 5, 1)));
-					} else {
-						$pos = strpos($t, chr(0));
-						if ($pos !== false) {
-							$trns = array($pos);
-						}
-					}
-					fread($f, 4);
-				} elseif ($type == 'IDAT') {
-					//Read image data block
-					$data .= $this->rfread($f, $n);
-					fread($f, 4);
-				} elseif ($type == 'IEND') {
-					break;
-				} else {
-					$this->rfread($f, $n + 4);
-				}
-			} while ($n);
-			if (($colspace == 'Indexed') AND (empty($pal))) {
-				//$this->Error('Missing palette in '.$file);
-				fclose($f);
-				return false;
-			}
-			fclose($f);
-			return array('w' => $w, 'h' => $h, 'cs' => $colspace, 'bpc' => $bpc, 'f' => 'FlateDecode', 'parms' => $parms, 'pal' => $pal, 'trns' => $trns, 'data' => $data);
-		}
-
-		/**
-		 * Binary-safe and URL-safe file read.
-		 * Reads up to length  bytes from the file pointer referenced by handle. Reading stops as soon as one of the following conditions is met: length bytes have been read; EOF (end of file) is reached.
-		 * @param resource $handle
-		 * @param int $length
-		 * @return Returns the read string or FALSE in case of error.
-		 * @author Nicola Asuni
-		 * @access protected
-		 * @since 4.5.027 (2009-03-16)
-		 */
-		protected function rfread($handle, $length) {
-			$data = fread($handle, $length);
-			if ($data === false) {
-				return false;
-			}
-			$rest = $length - strlen($data);
-			if ($rest > 0) {
-				$data .= $this->rfread($handle, $rest);
-			}
-			return $data;
-		}
-
-		/**
-		 * Extract info from a PNG image with alpha channel using the GD library.
-		 * @param string $file Name of the file containing the image.
-		 * @param float $x Abscissa of the upper-left corner.
-		 * @param float $y Ordinate of the upper-left corner.
-		 * @param float $w Width of the image in the page. If not specified or equal to zero, it is automatically calculated.
-		 * @param float $h Height of the image in the page. If not specified or equal to zero, it is automatically calculated.
-		 * @param string $type Image format. Possible values are (case insensitive): JPEG and PNG (whitout GD library) and all images supported by GD: GD, GD2, GD2PART, GIF, JPEG, PNG, BMP, XBM, XPM;. If not specified, the type is inferred from the file extension.
-		 * @param mixed $link URL or identifier returned by AddLink().
-		 * @param string $align Indicates the alignment of the pointer next to image insertion relative to image height. The value can be:<ul><li>T: top-right for LTR or top-left for RTL</li><li>M: middle-right for LTR or middle-left for RTL</li><li>B: bottom-right for LTR or bottom-left for RTL</li><li>N: next line</li></ul>
-		 * @param boolean $resize If true resize (reduce) the image to fit $w and $h (requires GD library).
-		 * @param int $dpi dot-per-inch resolution used on resize
-		 * @param string $palign Allows to center or align the image on the current line. Possible values are:<ul><li>L : left align</li><li>C : center</li><li>R : right align</li><li>'' : empty string : left for LTR or right for RTL</li></ul>
-		 * @author Valentin Schmidt, Nicola Asuni
-		 * @access protected
-		 * @since 4.3.007 (2008-12-04)
-		 * @see Image()
-		 */
-		protected function ImagePngAlpha($file, $x='', $y='', $w=0, $h=0, $type='', $link='', $align='', $resize=false, $dpi=300, $palign='') {
-			// get image size
-			list($wpx, $hpx) = getimagesize($file);
-			// generate images
-			$img = imagecreatefrompng($file);
-			$imgalpha = imagecreate($wpx, $hpx);
-			// generate gray scale pallete
-			for ($c = 0; $c < 256; ++$c) {
-				ImageColorAllocate($imgalpha, $c, $c, $c);
-			}
-			// extract alpha channel
-			for ($xpx = 0; $xpx < $wpx; ++$xpx) {
-				for ($ypx = 0; $ypx < $hpx; ++$ypx) {
-					$colorindex = imagecolorat($img, $xpx, $ypx);
-					$col = imagecolorsforindex($img, $colorindex);
-					imagesetpixel($imgalpha, $xpx, $ypx, $this->getGDgamma((127 - $col['alpha']) * 255 / 127));
-				}
-			}
-			// create temp alpha file
-			$tempfile_alpha = tempnam(K_PATH_CACHE, 'mska_');
-			imagepng($imgalpha, $tempfile_alpha);
-			imagedestroy($imgalpha);
-			// extract image without alpha channel
-			$imgplain = imagecreatetruecolor($wpx, $hpx);
-			imagecopy($imgplain, $img, 0, 0, 0, 0, $wpx, $hpx);
-			// create temp image file
-			$tempfile_plain = tempnam(K_PATH_CACHE, 'mskp_');
-			imagepng($imgplain, $tempfile_plain);
-			imagedestroy($imgplain);
-			// embed mask image
-			$imgmask = $this->Image($tempfile_alpha, $x, $y, $w, $h, 'PNG', '', '', $resize, $dpi, '', true, false);
-			// embed image, masked with previously embedded mask
-			$this->Image($tempfile_plain, $x, $y, $w, $h, $type, $link, $align, $resize, $dpi, $palign, false, $imgmask);
-			// remove temp files
-			unlink($tempfile_alpha);
-			unlink($tempfile_plain);
-		}
-
-		/**
-		 * Correct the gamma value to be used with GD library
-		 * @param float $v the gamma value to be corrected
-		 * @access protected
-		 * @since 4.3.007 (2008-12-04)
-		 */
-		protected function getGDgamma($v) {
-			return (pow(($v / 255), 2.2) * 255);
-		}
-
-		/**
-		 * Performs a line break.
-		 * The current abscissa goes back to the left margin and the ordinate increases by the amount passed in parameter.
-		 * @param float $h The height of the break. By default, the value equals the height of the last printed cell.
-		 * @param boolean $cell if true add a cMargin to the x coordinate
-		 * @access public
-		 * @since 1.0
-		 * @see Cell()
-		 */
-		public function Ln($h='', $cell=false) {
-			if (($this->num_columns > 0) AND ($this->y == $this->columns[$this->current_column]['y']) AND isset($this->columns[$this->current_column]['x']) AND ($this->x == $this->columns[$this->current_column]['x'])) {
-				// revove vertical space from the top of the column
-				return;
-			}
-			if ($cell) {
-				$cellmargin = $this->cMargin;
-			} else {
-				$cellmargin = 0;
-			}
-			if ($this->rtl) {
-				$this->x = $this->w - $this->rMargin - $cellmargin;
-			} else {
-				$this->x = $this->lMargin + $cellmargin;
-			}
-			if (is_string($h)) {
-				$this->y += $this->lasth;
-			} else {
-				$this->y += $h;
-			}
-			$this->newline = true;
-		}
-
-		/**
-		 * Returns the relative X value of current position.
-		 * The value is relative to the left border for LTR languages and to the right border for RTL languages.
-		 * @return float
-		 * @access public
-		 * @since 1.2
-		 * @see SetX(), GetY(), SetY()
-		 */
-		public function GetX() {
-			//Get x position
-			if ($this->rtl) {
-				return ($this->w - $this->x);
-			} else {
-				return $this->x;
-			}
-		}
-
-		/**
-		 * Returns the absolute X value of current position.
-		 * @return float
-		 * @access public
-		 * @since 1.2
-		 * @see SetX(), GetY(), SetY()
-		 */
-		public function GetAbsX() {
-			return $this->x;
-		}
-
-		/**
-		 * Returns the ordinate of the current position.
-		 * @return float
-		 * @access public
-		 * @since 1.0
-		 * @see SetY(), GetX(), SetX()
-		 */
-		public function GetY() {
-			return $this->y;
-		}
-
-		/**
-		 * Defines the abscissa of the current position.
-		 * If the passed value is negative, it is relative to the right of the page (or left if language is RTL).
-		 * @param float $x The value of the abscissa.
-		 * @param boolean $rtloff if true always uses the page top-left corner as origin of axis.
-		 * @access public
-		 * @since 1.2
-		 * @see GetX(), GetY(), SetY(), SetXY()
-		 */
-		public function SetX($x, $rtloff=false) {
-			if (!$rtloff AND $this->rtl) {
-				if ($x >= 0) {
-					$this->x = $this->w - $x;
-				} else {
-					$this->x = abs($x);
-				}
-			} else {
-				if ($x >= 0) {
-					$this->x = $x;
-				} else {
-					$this->x = $this->w + $x;
-				}
-			}
-			if ($this->x < 0) {
-				$this->x = 0;
-			}
-			if ($this->x > $this->w) {
-				$this->x = $this->w;
-			}
-		}
-
-		/**
-		 * Moves the current abscissa back to the left margin and sets the ordinate.
-		 * If the passed value is negative, it is relative to the bottom of the page.
-		 * @param float $y The value of the ordinate.
-		 * @param bool $resetx if true (default) reset the X position.
-		 * @param boolean $rtloff if true always uses the page top-left corner as origin of axis.
-		 * @access public
-		 * @since 1.0
-		 * @see GetX(), GetY(), SetY(), SetXY()
-		 */
-		public function SetY($y, $resetx=true, $rtloff=false) {
-			if ($resetx) {
-				//reset x
-				if (!$rtloff AND $this->rtl) {
-					$this->x = $this->w - $this->rMargin;
-				} else {
-					$this->x = $this->lMargin;
-				}
-			}
-			if ($y >= 0) {
-				$this->y = $y;
-			} else {
-				$this->y = $this->h + $y;
-			}
-			if ($this->y < 0) {
-				$this->y = 0;
-			}
-			if ($this->y > $this->h) {
-				$this->y = $this->h;
-			}
-		}
-
-		/**
-		 * Defines the abscissa and ordinate of the current position.
-		 * If the passed values are negative, they are relative respectively to the right and bottom of the page.
-		 * @param float $x The value of the abscissa.
-		 * @param float $y The value of the ordinate.
-		 * @param boolean $rtloff if true always uses the page top-left corner as origin of axis.
-		 * @access public
-		 * @since 1.2
-		 * @see SetX(), SetY()
-		 */
-		public function SetXY($x, $y, $rtloff=false) {
-			$this->SetY($y, false, $rtloff);
-			$this->SetX($x, $rtloff);
-		}
-
-		/**
-		 * Send the document to a given destination: string, local file or browser.
-		 * In the last case, the plug-in may be used (if present) or a download ("Save as" dialog box) may be forced.<br />
-		 * The method first calls Close() if necessary to terminate the document.
-		 * @param string $name The name of the file when saved. Note that special characters are removed and blanks characters are replaced with the underscore character.
-		 * @param string $dest Destination where to send the document. It can take one of the following values:<ul><li>I: send the file inline to the browser (default). The plug-in is used if available. The name given by name is used when one selects the "Save as" option on the link generating the PDF.</li><li>D: send to the browser and force a file download with the name given by name.</li><li>F: save to a local server file with the name given by name.</li><li>S: return the document as a string. name is ignored.</li><li>FI: equivalent to F + I option</li><li>FD: equivalent to F + D option</li></ul>
-		 * @access public
-		 * @since 1.0
-		 * @see Close()
-		 */
-		public function Output($name='doc.pdf', $dest='I') {
-			//Output PDF to some destination
-			//Finish document if necessary
-			$this->lastpage();
-			if ($this->state < 3) {
-				$this->Close();
-			}
-			//Normalize parameters
-			if (is_bool($dest)) {
-				$dest = $dest ? 'D' : 'F';
-			}
-			$dest = strtoupper($dest);
-			if ($dest != 'F') {
-				$name = preg_replace('/[\s]+/', '_', $name);
-				$name = preg_replace('/[^a-zA-Z0-9_\.-]/', '', $name);
-			}
-			if ($this->sign) {
-				// *** apply digital signature to the document ***
-				// get the document content
-				$pdfdoc = $this->getBuffer();
-				// remove last newline
-				$pdfdoc = substr($pdfdoc, 0, -1);
-				// Remove the original buffer
-				if (isset($this->diskcache) AND $this->diskcache) {
-					// remove buffer file from cache
-					unlink($this->buffer);
-				}
-				unset($this->buffer);
-				// remove filler space
-				$byterange_string_len = strlen($this->byterange_string);
-				// define the ByteRange
-				$byte_range = array();
-				$byte_range[0] = 0;
-				$byte_range[1] = strpos($pdfdoc, $this->byterange_string) + $byterange_string_len + 10;
-				$byte_range[2] = $byte_range[1] + $this->signature_max_length + 2;
-				$byte_range[3] = strlen($pdfdoc) - $byte_range[2];
-				$pdfdoc = substr($pdfdoc, 0, $byte_range[1]).substr($pdfdoc, $byte_range[2]);
-				// replace the ByteRange
-				$byterange = sprintf('/ByteRange[0 %u %u %u]', $byte_range[1], $byte_range[2], $byte_range[3]);
-				$byterange .= str_repeat(' ', ($byterange_string_len - strlen($byterange)));
-				$pdfdoc = str_replace($this->byterange_string, $byterange, $pdfdoc);
-				// write the document to a temporary folder
-				$tempdoc = tempnam(K_PATH_CACHE, 'tmppdf_');
-				$f = fopen($tempdoc, 'wb');
-				if (!$f) {
-					$this->Error('Unable to create temporary file: '.$tempdoc);
-				}
-				$pdfdoc_length = strlen($pdfdoc);
-				fwrite($f, $pdfdoc, $pdfdoc_length);
-				fclose($f);
-				// get digital signature via openssl library
-				$tempsign = tempnam(K_PATH_CACHE, 'tmpsig_');
-				if (empty($this->signature_data['extracerts'])) {
-					openssl_pkcs7_sign($tempdoc, $tempsign, $this->signature_data['signcert'], array($this->signature_data['privkey'], $this->signature_data['password']), array(), PKCS7_BINARY | PKCS7_DETACHED);
-				} else {
-					openssl_pkcs7_sign($tempdoc, $tempsign, $this->signature_data['signcert'], array($this->signature_data['privkey'], $this->signature_data['password']), array(), PKCS7_BINARY | PKCS7_DETACHED, $this->signature_data['extracerts']);
-				}
-				unlink($tempdoc);
-				// read signature
-				$signature = file_get_contents($tempsign, false, null, $pdfdoc_length);
-				unlink($tempsign);
-				// extract signature
-				$signature = substr($signature, (strpos($signature, "%%EOF\n\n------") + 13));
-				$tmparr = explode("\n\n", $signature);
-				$signature = $tmparr[1];
-				unset($tmparr);
-				// decode signature
-				$signature = base64_decode(trim($signature));
-				// convert signature to hex
-				$signature = current(unpack('H*', $signature));
-				$signature = str_pad($signature, $this->signature_max_length, '0');
-				// Add signature to the document
-				$pdfdoc = substr($pdfdoc, 0, $byte_range[1]).'<'.$signature.'>'.substr($pdfdoc, ($byte_range[1]));
-				$this->diskcache = false;
-				$this->buffer = &$pdfdoc;
-				$this->bufferlen = strlen($pdfdoc);
-			}
-			switch($dest) {
-				case 'I': {
-					// Send PDF to the standard output
-					if (ob_get_contents()) {
-						$this->Error('Some data has already been output, can\'t send PDF file');
-					}
-					if (php_sapi_name() != 'cli') {
-						//We send to a browser
-						header('Content-Type: application/pdf');
-						if (headers_sent()) {
-							$this->Error('Some data has already been output to browser, can\'t send PDF file');
-						}
-						header('Cache-Control: public, must-revalidate, max-age=0'); // HTTP/1.1
-						header('Pragma: public');
-						header('Expires: Sat, 26 Jul 1997 05:00:00 GMT'); // Date in the past
-						header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
-						header('Content-Length: '.$this->bufferlen);
-						header('Content-Disposition: inline; filename="'.basename($name).'";');
-					}
-					echo $this->getBuffer();
-					break;
-				}
-				case 'D': {
-					// Download PDF as file
-					if (ob_get_contents()) {
-						$this->Error('Some data has already been output, can\'t send PDF file');
-					}
-					header('Content-Description: File Transfer');
-					if (headers_sent()) {
-						$this->Error('Some data has already been output to browser, can\'t send PDF file');
-					}
-					header('Cache-Control: public, must-revalidate, max-age=0'); // HTTP/1.1
-					header('Pragma: public');
-					header('Expires: Sat, 26 Jul 1997 05:00:00 GMT'); // Date in the past
-					header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
-					// force download dialog
-					header('Content-Type: application/force-download');
-					header('Content-Type: application/octet-stream', false);
-					header('Content-Type: application/download', false);
-					header('Content-Type: application/pdf', false);
-					// use the Content-Disposition header to supply a recommended filename
-					header('Content-Disposition: attachment; filename="'.basename($name).'";');
-					header('Content-Transfer-Encoding: binary');
-					header('Content-Length: '.$this->bufferlen);
-					echo $this->getBuffer();
-					break;
-				}
-				case 'F':
-				case 'FI':
-				case 'FD': {
-					// Save PDF to a local file
-					if ($this->diskcache) {
-						copy($this->buffer, $name);
-					} else {
-						$f = fopen($name, 'wb');
-						if (!$f) {
-							$this->Error('Unable to create output file: '.$name);
-						}
-						fwrite($f, $this->getBuffer(), $this->bufferlen);
-						fclose($f);
-					}
-					if ($dest == 'FI') {
-						// send headers to browser
-						header('Content-Type: application/pdf');
-						header('Cache-Control: public, must-revalidate, max-age=0'); // HTTP/1.1
-						header('Pragma: public');
-						header('Expires: Sat, 26 Jul 1997 05:00:00 GMT'); // Date in the past
-						header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
-						header('Content-Length: '.filesize($name));
-						header('Content-Disposition: inline; filename="'.basename($name).'";');
-						// send document to the browser
-						echo file_get_contents($name);
-					} elseif ($dest == 'FD') {
-						// send headers to browser
-						if (ob_get_contents()) {
-							$this->Error('Some data has already been output, can\'t send PDF file');
-						}
-						header('Content-Description: File Transfer');
-						if (headers_sent()) {
-							$this->Error('Some data has already been output to browser, can\'t send PDF file');
-						}
-						header('Cache-Control: public, must-revalidate, max-age=0'); // HTTP/1.1
-						header('Pragma: public');
-						header('Expires: Sat, 26 Jul 1997 05:00:00 GMT'); // Date in the past
-						header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
-						// force download dialog
-						header('Content-Type: application/force-download');
-						header('Content-Type: application/octet-stream', false);
-						header('Content-Type: application/download', false);
-						header('Content-Type: application/pdf', false);
-						// use the Content-Disposition header to supply a recommended filename
-						header('Content-Disposition: attachment; filename="'.basename($name).'";');
-						header('Content-Transfer-Encoding: binary');
-						header('Content-Length: '.filesize($name));
-						// send document to the browser
-						echo file_get_contents($name);
-					}
-					break;
-				}
-				case 'S': {
-					// Returns PDF as a string
-					return $this->getBuffer();
-				}
-				default: {
-					$this->Error('Incorrect output destination: '.$dest);
-				}
-			}
-			return '';
-		}
-
-		/**
-		 * Unset all class variables except the following critical variables: internal_encoding, state, bufferlen, buffer and diskcache.
-		 * @param boolean $destroyall if true destroys all class variables, otherwise preserves critical variables.
-		 * @param boolean $preserve_objcopy if true preserves the objcopy variable
-		 * @access public
-		 * @since 4.5.016 (2009-02-24)
-		 */
-		public function _destroy($destroyall=false, $preserve_objcopy=false) {
-			if ($destroyall AND isset($this->diskcache) AND $this->diskcache AND (!$preserve_objcopy) AND (!$this->empty_string($this->buffer))) {
-				// remove buffer file from cache
-				unlink($this->buffer);
-			}
-			foreach (array_keys(get_object_vars($this)) as $val) {
-				if ($destroyall OR (
-					($val != 'internal_encoding')
-					AND ($val != 'state')
-					AND ($val != 'bufferlen')
-					AND ($val != 'buffer')
-					AND ($val != 'diskcache')
-					AND ($val != 'sign')
-					AND ($val != 'signature_data')
-					AND ($val != 'signature_max_length')
-					AND ($val != 'byterange_string')
-					)) {
-					if ((!$preserve_objcopy OR ($val != 'objcopy')) AND isset($this->$val)) {
-						unset($this->$val);
-					}
-				}
-			}
-		}
-
-		/**
-		 * Check for locale-related bug
-		 * @access protected
-		 */
-		protected function _dochecks() {
-			//Check for locale-related bug
-			if (1.1 == 1) {
-				$this->Error('Don\'t alter the locale before including class file');
-			}
-			//Check for decimal separator
-			if (sprintf('%.1F', 1.0) != '1.0') {
-				setlocale(LC_NUMERIC, 'C');
-			}
-		}
-
-		/**
-		 * Return fonts path
-		 * @return string
-		 * @access protected
-		 */
-		protected function _getfontpath() {
-			if (!defined('K_PATH_FONTS') AND is_dir(dirname(__FILE__).'/fonts')) {
-				define('K_PATH_FONTS', dirname(__FILE__).'/fonts/');
-			}
-			return defined('K_PATH_FONTS') ? K_PATH_FONTS : '';
-		}
-
-		/**
-		 * Output pages.
-		 * @access protected
-		 */
-		protected function _putpages() {
-			$nb = $this->numpages;
-			if (!empty($this->AliasNbPages)) {
-				$nbs = $this->formatPageNumber($nb);
-				$nbu = $this->UTF8ToUTF16BE($nbs, false); // replacement for unicode font
-				$alias_a = $this->_escape($this->AliasNbPages);
-				$alias_au = $this->_escape('{'.$this->AliasNbPages.'}');
-				if ($this->isunicode) {
-					$alias_b = $this->_escape($this->UTF8ToLatin1($this->AliasNbPages));
-					$alias_bu = $this->_escape($this->UTF8ToLatin1('{'.$this->AliasNbPages.'}'));
-					$alias_c = $this->_escape($this->utf8StrRev($this->AliasNbPages, false, $this->tmprtl));
-					$alias_cu = $this->_escape($this->utf8StrRev('{'.$this->AliasNbPages.'}', false, $this->tmprtl));
-				}
-			}
-			if (!empty($this->AliasNumPage)) {
-				$alias_pa = $this->_escape($this->AliasNumPage);
-				$alias_pau = $this->_escape('{'.$this->AliasNumPage.'}');
-				if ($this->isunicode) {
-					$alias_pb = $this->_escape($this->UTF8ToLatin1($this->AliasNumPage));
-					$alias_pbu = $this->_escape($this->UTF8ToLatin1('{'.$this->AliasNumPage.'}'));
-					$alias_pc = $this->_escape($this->utf8StrRev($this->AliasNumPage, false, $this->tmprtl));
-					$alias_pcu = $this->_escape($this->utf8StrRev('{'.$this->AliasNumPage.'}', false, $this->tmprtl));
-				}
-			}
-			$pagegroupnum = 0;
-			$filter = ($this->compress) ? '/Filter /FlateDecode ' : '';
-			for ($n=1; $n <= $nb; ++$n) {
-				$temppage = $this->getPageBuffer($n);
-				if (!empty($this->pagegroups)) {
-					if(isset($this->newpagegroup[$n])) {
-						$pagegroupnum = 0;
-					}
-					++$pagegroupnum;
-					foreach ($this->pagegroups as $k => $v) {
-						// replace total pages group numbers
-						$vs = $this->formatPageNumber($v);
-						$vu = $this->UTF8ToUTF16BE($vs, false);
-						$alias_ga = $this->_escape($k);
-						$alias_gau = $this->_escape('{'.$k.'}');
-						if ($this->isunicode) {
-							$alias_gb = $this->_escape($this->UTF8ToLatin1($k));
-							$alias_gbu = $this->_escape($this->UTF8ToLatin1('{'.$k.'}'));
-							$alias_gc = $this->_escape($this->utf8StrRev($k, false, $this->tmprtl));
-							$alias_gcu = $this->_escape($this->utf8StrRev('{'.$k.'}', false, $this->tmprtl));
-						}
-						$temppage = str_replace($alias_gau, $vu, $temppage);
-						if ($this->isunicode) {
-							$temppage = str_replace($alias_gbu, $vu, $temppage);
-							$temppage = str_replace($alias_gcu, $vu, $temppage);
-							$temppage = str_replace($alias_gb, $vs, $temppage);
-							$temppage = str_replace($alias_gc, $vs, $temppage);
-						}
-						$temppage = str_replace($alias_ga, $vs, $temppage);
-						// replace page group numbers
-						$pvs = $this->formatPageNumber($pagegroupnum);
-						$pvu = $this->UTF8ToUTF16BE($pvs, false);
-						$pk = str_replace('{nb', '{pnb', $k);
-						$alias_pga = $this->_escape($pk);
-						$alias_pgau = $this->_escape('{'.$pk.'}');
-						if ($this->isunicode) {
-							$alias_pgb = $this->_escape($this->UTF8ToLatin1($pk));
-							$alias_pgbu = $this->_escape($this->UTF8ToLatin1('{'.$pk.'}'));
-							$alias_pgc = $this->_escape($this->utf8StrRev($pk, false, $this->tmprtl));
-							$alias_pgcu = $this->_escape($this->utf8StrRev('{'.$pk.'}', false, $this->tmprtl));
-						}
-						$temppage = str_replace($alias_pgau, $pvu, $temppage);
-						if ($this->isunicode) {
-							$temppage = str_replace($alias_pgbu, $pvu, $temppage);
-							$temppage = str_replace($alias_pgcu, $pvu, $temppage);
-							$temppage = str_replace($alias_pgb, $pvs, $temppage);
-							$temppage = str_replace($alias_pgc, $pvs, $temppage);
-						}
-						$temppage = str_replace($alias_pga, $pvs, $temppage);
-					}
-				}
-				if (!empty($this->AliasNbPages)) {
-					// replace total pages number
-					$temppage = str_replace($alias_au, $nbu, $temppage);
-					if ($this->isunicode) {
-						$temppage = str_replace($alias_bu, $nbu, $temppage);
-						$temppage = str_replace($alias_cu, $nbu, $temppage);
-						$temppage = str_replace($alias_b, $nbs, $temppage);
-						$temppage = str_replace($alias_c, $nbs, $temppage);
-					}
-					$temppage = str_replace($alias_a, $nbs, $temppage);
-				}
-				if (!empty($this->AliasNumPage)) {
-					// replace page number
-					$pnbs = $this->formatPageNumber($n);
-					$pnbu = $this->UTF8ToUTF16BE($pnbs, false); // replacement for unicode font
-					$temppage = str_replace($alias_pau, $pnbu, $temppage);
-					if ($this->isunicode) {
-						$temppage = str_replace($alias_pbu, $pnbu, $temppage);
-						$temppage = str_replace($alias_pcu, $pnbu, $temppage);
-						$temppage = str_replace($alias_pb, $pnbs, $temppage);
-						$temppage = str_replace($alias_pc, $pnbs, $temppage);
-					}
-					$temppage = str_replace($alias_pa, $pnbs, $temppage);
-				}
-				$temppage = str_replace($this->epsmarker, '', $temppage);
-				//Page
-				$this->page_obj_id[$n] = $this->_newobj();
-				$out = '<</Type /Page';
-				$out .= ' /Parent 1 0 R';
-				$out .= ' '.sprintf('/MediaBox [0 0 %.2F %.2F]', $this->pagedim[$n]['w'], $this->pagedim[$n]['h']);
-				$out .= ' /Group << /Type /Group /S /Transparency /CS /DeviceRGB >>';
-				$out .= ' /Resources 2 0 R';
-				$this->_out($out);
-				$this->_putannotsrefs($n);
-				$this->_out('/Contents '.($this->n + 1).' 0 R>> endobj');
-				//Page content
-				$p = ($this->compress) ? gzcompress($temppage) : $temppage;
-				$this->_newobj();
-				$this->_out('<<'.$filter.'/Length '.strlen($p).'>> '.$this->_getstream($p).' endobj');
-				if ($this->diskcache) {
-					// remove temporary files
-					unlink($this->pages[$n]);
-				}
-			}
-			//Pages root
-			$this->offsets[1] = $this->bufferlen;
-			$out = '1 0 obj <</Type /Pages  /Kids [';
-			foreach($this->page_obj_id as $page_obj) {
-				$out .= ' '.$page_obj.' 0 R';
-			}
-			$out .= ' ] /Count '.$nb.' >>  endobj';
-			$this->_out($out);
-		}
-
-		/**
-		 * Output references to page annotations
-		 * @param int $n page number
-		 * @access protected
-		 * @author Nicola Asuni
-		 * @since 4.7.000 (2008-08-29)
-		 */
-		protected function _putannotsrefs($n) {
-			if (!(isset($this->PageAnnots[$n]) OR ($this->sign AND isset($this->signature_data['cert_type'])))) {
-				return;
-			}
-			$out = '/Annots [';
-			if (isset($this->PageAnnots[$n])) {
-				$num_annots = count($this->PageAnnots[$n]);
-				for ($i = 0; $i < $num_annots; ++$i) {
-					++$this->curr_annot_obj_id;
-					if (!in_array($this->curr_annot_obj_id, $this->radio_groups)) {
-						$out .= ' '.$this->curr_annot_obj_id.' 0 R';
-					} else {
-						++$num_annots;
-					}
-				}
-			}
-			if (($n==1) AND $this->sign AND isset($this->signature_data['cert_type'])) {
-				// set reference for signature object
-				$out .= ' '.$this->sig_annot_ref;
-			}
-			$out .= ' ]';
-			$this->_out($out);
-		}
-
-		/**
-		 * Output annotations objects for all pages.
-		 * !!! THIS METHOD IS NOT YET COMPLETED !!!
-		 * See section 12.5 of PDF 32000_2008 reference.
-		 * @access protected
-		 * @author Nicola Asuni
-		 * @since 4.0.018 (2008-08-06)
-		 */
-		protected function _putannotsobjs() {
-			// reset object counter
-			$this->annot_obj_id = $this->annots_start_obj_id;
-			for ($n=1; $n <= $this->numpages; ++$n) {
-				if (isset($this->PageAnnots[$n])) {
-					// set page annotations
-					foreach ($this->PageAnnots[$n] as $key => $pl) {
-						// create annotation object for grouping radiobuttons
-						if (isset($this->radiobutton_groups[$n][$pl['txt']]) AND is_array($this->radiobutton_groups[$n][$pl['txt']])) {
-							$annots = '<<';
-							$annots .= ' /Type /Annot';
-							$annots .= ' /Subtype /Widget';
-							$annots .= ' /T '.$this->_dataannobjstring($pl['txt']);
-							$annots .= ' /FT /Btn';
-							$annots .= ' /Ff 49152';
-							$annots .= ' /Kids [';
-							foreach ($this->radiobutton_groups[$n][$pl['txt']] as $data) {
-								$annots .= ' '.$data['kid'].' 0 R';
-								if ($data['def'] !== 'Off') {
-									$defval = $data['def'];
-								}
-							}
-							$annots .= ' ]';
-							if (isset($defval)) {
-								$annots .= ' /V /'.$defval;
-							}
-							$annots .= ' >>';
-							++$this->annot_obj_id;
-							$this->offsets[$this->annot_obj_id] = $this->bufferlen;
-							$this->_out($this->annot_obj_id.' 0 obj '.$annots.' endobj');
-							$this->form_obj_id[] = $this->annot_obj_id;
-							// store object id to be used on Parent entry of Kids
-							$this->radiobutton_groups[$n][$pl['txt']] = $this->annot_obj_id;
-						}
-						$formfield = false;
-						$pl['opt'] = array_change_key_case($pl['opt'], CASE_LOWER);
-						$a = $pl['x'] * $this->k;
-						$b = $this->pagedim[$n]['h'] - (($pl['y'] + $pl['h'])  * $this->k);
-						$c = $pl['w'] * $this->k;
-						$d = $pl['h'] * $this->k;
-						$rect = sprintf('%.2F %.2F %.2F %.2F', $a, $b, $a+$c, $b+$d);
-						// create new annotation object
-						$annots = '<</Type /Annot';
-						$annots .= ' /Subtype /'.$pl['opt']['subtype'];
-						$annots .= ' /Rect ['.$rect.']';
-						$ft = array('Btn', 'Tx', 'Ch', 'Sig');
-						if (isset($pl['opt']['ft']) AND in_array($pl['opt']['ft'], $ft)) {
-							$annots .= ' /FT /'.$pl['opt']['ft'];
-							$formfield = true;
-						}
-						$annots .= ' /Contents '.$this->_textannobjstring($pl['txt']);
-						$annots .= ' /P '.$this->page_obj_id[$n].' 0 R';
-						$annots .= ' /NM '.$this->_dataannobjstring(sprintf('%04u-%04u', $n, $key));
-						$annots .= ' /M '.$this->_datestring();
-						if (isset($pl['opt']['f'])) {
-							$val = 0;
-							if (is_array($pl['opt']['f'])) {
-								foreach ($pl['opt']['f'] as $f) {
-									switch (strtolower($f)) {
-										case 'invisible': {
-											$val += 1 << 0;
-											break;
-										}
-										case 'hidden': {
-											$val += 1 << 1;
-											break;
-										}
-										case 'print': {
-											$val += 1 << 2;
-											break;
-										}
-										case 'nozoom': {
-											$val += 1 << 3;
-											break;
-										}
-										case 'norotate': {
-											$val += 1 << 4;
-											break;
-										}
-										case 'noview': {
-											$val += 1 << 5;
-											break;
-										}
-										case 'readonly': {
-											$val += 1 << 6;
-											break;
-										}
-										case 'locked': {
-											$val += 1 << 8;
-											break;
-										}
-										case 'togglenoview': {
-											$val += 1 << 9;
-											break;
-										}
-										case 'lockedcontents': {
-											$val += 1 << 10;
-											break;
-										}
-										default: {
-											break;
-										}
-									}
-								}
-							} else {
-								$val = intval($pl['opt']['f']);
-							}
-							$annots .= ' /F '.intval($val);
-						}
-						if (isset($pl['opt']['as']) AND is_string($pl['opt']['as'])) {
-							$annots .= ' /AS /'.$pl['opt']['as'];
-						}
-						if (isset($pl['opt']['ap'])) {
-							// appearance stream
-							$annots .= ' /AP <<';
-							if (is_array($pl['opt']['ap'])) {
-								foreach ($pl['opt']['ap'] as $apmode => $apdef) {
-									// $apmode can be: n = normal; r = rollover; d = down;
-									$annots .= ' /'.strtoupper($apmode);
-									if (is_array($apdef)) {
-										$annots .= ' <<';
-										foreach ($apdef as $apstate => $stream) {
-											// reference to XObject that define the appearance for this mode-state
-											$apsobjid = $this->_putAPXObject($c, $d, $stream);
-											$annots .= ' /'.$apstate.' '.$apsobjid.' 0 R';
-										}
-										$annots .= ' >>';
-									} else {
-										// reference to XObject that define the appearance for this mode
-										$apsobjid = $this->_putAPXObject($c, $d, $apdef);
-										$annots .= ' '.$apsobjid.' 0 R';
-									}
-								}
-							} else {
-								$annots .= $pl['opt']['ap'];
-							}
-							$annots .= ' >>';
-						}
-						if (isset($pl['opt']['bs']) AND (is_array($pl['opt']['bs']))) {
-							$annots .= ' /BS <<';
-							$annots .= ' /Type /Border';
-							if (isset($pl['opt']['bs']['w'])) {
-								$annots .= ' /W '.intval($pl['opt']['bs']['w']);
-							}
-							$bstyles = array('S', 'D', 'B', 'I', 'U');
-							if (isset($pl['opt']['bs']['s']) AND in_array($pl['opt']['bs']['s'], $bstyles)) {
-								$annots .= ' /S /'.$pl['opt']['bs']['s'];
-							}
-							if (isset($pl['opt']['bs']['d']) AND (is_array($pl['opt']['bs']['d']))) {
-								$annots .= ' /D [';
-								foreach ($pl['opt']['bs']['d'] as $cord) {
-									$annots .= ' '.intval($cord);
-								}
-								$annots .= ']';
-							}
-							$annots .= ' >>';
-						} else {
-							$annots .= ' /Border [';
-							if (isset($pl['opt']['border']) AND (count($pl['opt']['border']) >= 3)) {
-								$annots .= intval($pl['opt']['border'][0]).' ';
-								$annots .= intval($pl['opt']['border'][1]).' ';
-								$annots .= intval($pl['opt']['border'][2]);
-								if (isset($pl['opt']['border'][3]) AND is_array($pl['opt']['border'][3])) {
-									$annots .= ' [';
-									foreach ($pl['opt']['border'][3] as $dash) {
-										$annots .= intval($dash).' ';
-									}
-									$annots .= ']';
-								}
-							} else {
-								$annots .= '0 0 0';
-							}
-							$annots .= ']';
-						}
-						if (isset($pl['opt']['be']) AND (is_array($pl['opt']['be']))) {
-							$annots .= ' /BE <<';
-							$bstyles = array('S', 'C');
-							if (isset($pl['opt']['be']['s']) AND in_array($pl['opt']['be']['s'], $markups)) {
-								$annots .= ' /S /'.$pl['opt']['bs']['s'];
-							} else {
-								$annots .= ' /S /S';
-							}
-							if (isset($pl['opt']['be']['i']) AND ($pl['opt']['be']['i'] >= 0) AND ($pl['opt']['be']['i'] <= 2)) {
-								$annots .= ' /I '.sprintf(' %.4F', $pl['opt']['be']['i']);
-							}
-							$annots .= '>>';
-						}
-						if (isset($pl['opt']['c']) AND (is_array($pl['opt']['c'])) AND !empty($pl['opt']['c'])) {
-							$annots .= ' /C [';
-							foreach ($pl['opt']['c'] as $col) {
-								$col = intval($col);
-								$color = $col <= 0 ? 0 : ($col >= 255 ? 1 : $col / 255);
-								$annots .= sprintf(' %.4F', $color);
-							}
-							$annots .= ']';
-						}
-						//$annots .= ' /StructParent ';
-						//$annots .= ' /OC ';
-						$markups = array('text', 'freetext', 'line', 'square', 'circle', 'polygon', 'polyline', 'highlight', 'underline', 'squiggly', 'strikeout', 'stamp', 'caret', 'ink', 'fileattachment', 'sound');
-						if (in_array(strtolower($pl['opt']['subtype']), $markups)) {
-							// this is a markup type
-							if (isset($pl['opt']['t']) AND is_string($pl['opt']['t'])) {
-								$annots .= ' /T '.$this->_textannobjstring($pl['opt']['t']);
-							}
-							//$annots .= ' /Popup ';
-							if (isset($pl['opt']['ca'])) {
-								$annots .= ' /CA '.sprintf('%.4F', floatval($pl['opt']['ca']));
-							}
-							if (isset($pl['opt']['rc'])) {
-								$annots .= ' /RC '.$this->_textannobjstring($pl['opt']['rc']);
-							}
-							$annots .= ' /CreationDate '.$this->_datestring();
-							//$annots .= ' /IRT ';
-							if (isset($pl['opt']['subj'])) {
-								$annots .= ' /Subj '.$this->_textannobjstring($pl['opt']['subj']);
-							}
-							//$annots .= ' /RT ';
-							//$annots .= ' /IT ';
-							//$annots .= ' /ExData ';
-						}
-						$lineendings = array('Square', 'Circle', 'Diamond', 'OpenArrow', 'ClosedArrow', 'None', 'Butt', 'ROpenArrow', 'RClosedArrow', 'Slash');
-						switch (strtolower($pl['opt']['subtype'])) {
-							case 'text': {
-								if (isset($pl['opt']['open'])) {
-									$annots .= ' /Open '. (strtolower($pl['opt']['open']) == 'true' ? 'true' : 'false');
-								}
-								$iconsapp = array('Comment', 'Help', 'Insert', 'Key', 'NewParagraph', 'Note', 'Paragraph');
-								if (isset($pl['opt']['name']) AND in_array($pl['opt']['name'], $iconsapp)) {
-									$annots .= ' /Name /'.$pl['opt']['name'];
-								} else {
-									$annots .= ' /Name /Note';
-								}
-								$statemodels = array('Marked', 'Review');
-								if (isset($pl['opt']['statemodel']) AND in_array($pl['opt']['statemodel'], $statemodels)) {
-									$annots .= ' /StateModel /'.$pl['opt']['statemodel'];
-								} else {
-									$pl['opt']['statemodel'] = 'Marked';
-									$annots .= ' /StateModel /'.$pl['opt']['statemodel'];
-								}
-								if ($pl['opt']['statemodel'] == 'Marked') {
-									$states = array('Accepted', 'Unmarked');
-								} else {
-									$states = array('Accepted', 'Rejected', 'Cancelled', 'Completed', 'None');
-								}
-								if (isset($pl['opt']['state']) AND in_array($pl['opt']['state'], $states)) {
-									$annots .= ' /State /'.$pl['opt']['state'];
-								} else {
-									if ($pl['opt']['statemodel'] == 'Marked') {
-										$annots .= ' /State /Unmarked';
-									} else {
-										$annots .= ' /State /None';
-									}
-								}
-								break;
-							}
-							case 'link': {
-								if(is_string($pl['txt'])) {
-									// external URI link
-									$annots .= ' /A <</S /URI /URI '.$this->_dataannobjstring($this->unhtmlentities($pl['txt'])).'>>';
-								} else {
-									// internal link
-									$l = $this->links[$pl['txt']];
-									$annots .= sprintf(' /Dest [%d 0 R /XYZ 0 %.2F null]', (1 + (2 * $l[0])), ($this->pagedim[$l[0]]['h'] - ($l[1] * $this->k)));
-								}
-								$hmodes = array('N', 'I', 'O', 'P');
-								if (isset($pl['opt']['h']) AND in_array($pl['opt']['h'], $hmodes)) {
-									$annots .= ' /H /'.$pl['opt']['h'];
-								} else {
-									$annots .= ' /H /I';
-								}
-								//$annots .= ' /PA ';
-								//$annots .= ' /Quadpoints ';
-								break;
-							}
-							case 'freetext': {
-								if (isset($pl['opt']['da']) AND !empty($pl['opt']['da'])) {
-									$annots .= ' /DA ('.$pl['opt']['da'].')';
-								}
-								if (isset($pl['opt']['q']) AND ($pl['opt']['q'] >= 0) AND ($pl['opt']['q'] <= 2)) {
-									$annots .= ' /Q '.intval($pl['opt']['q']);
-								}
-								if (isset($pl['opt']['rc'])) {
-									$annots .= ' /RC '.$this->_textannobjstring($pl['opt']['rc']);
-								}
-								if (isset($pl['opt']['ds'])) {
-									$annots .= ' /DS '.$this->_textannobjstring($pl['opt']['ds']);
-								}
-								if (isset($pl['opt']['cl']) AND is_array($pl['opt']['cl'])) {
-									$annots .= ' /CL [';
-									foreach ($pl['opt']['cl'] as $cl) {
-										$annots .= sprintf('%.4F ', $cl * $this->k);
-									}
-									$annots .= ']';
-								}
-								$tfit = array('FreeText', 'FreeTextCallout', 'FreeTextTypeWriter');
-								if (isset($pl['opt']['it']) AND in_array($pl['opt']['it'], $tfit)) {
-									$annots .= ' /IT '.$pl['opt']['it'];
-								}
-								if (isset($pl['opt']['rd']) AND is_array($pl['opt']['rd'])) {
-									$l = $pl['opt']['rd'][0] * $this->k;
-									$r = $pl['opt']['rd'][1] * $this->k;
-									$t = $pl['opt']['rd'][2] * $this->k;
-									$b = $pl['opt']['rd'][3] * $this->k;
-									$annots .= ' /RD ['.sprintf('%.2F %.2F %.2F %.2F', $l, $r, $t, $b).']';
-								}
-								if (isset($pl['opt']['le']) AND in_array($pl['opt']['le'], $lineendings)) {
-									$annots .= ' /LE /'.$pl['opt']['le'];
-								}
-								break;
-							}
-							case 'line': {
-								break;
-							}
-							case 'square': {
-								break;
-							}
-							case 'circle': {
-								break;
-							}
-							case 'polygon': {
-								break;
-							}
-							case 'polyline': {
-								break;
-							}
-							case 'highlight': {
-								break;
-							}
-							case 'underline': {
-								break;
-							}
-							case 'squiggly': {
-								break;
-							}
-							case 'strikeout': {
-								break;
-							}
-							case 'stamp': {
-								break;
-							}
-							case 'caret': {
-								break;
-							}
-							case 'ink': {
-								break;
-							}
-							case 'popup': {
-								break;
-							}
-							case 'fileattachment': {
-								if (!isset($pl['opt']['fs'])) {
-									break;
-								}
-								$filename = basename($pl['opt']['fs']);
-								if (isset($this->embeddedfiles[$filename]['n'])) {
-									$annots .= ' /FS <</Type /Filespec /F '.$this->_dataannobjstring($filename).' /EF <</F '.$this->embeddedfiles[$filename]['n'].' 0 R>> >>';
-									$iconsapp = array('Graph', 'Paperclip', 'PushPin', 'Tag');
-									if (isset($pl['opt']['name']) AND in_array($pl['opt']['name'], $iconsapp)) {
-										$annots .= ' /Name /'.$pl['opt']['name'];
-									} else {
-										$annots .= ' /Name /PushPin';
-									}
-								}
-								break;
-							}
-							case 'sound': {
-								if (!isset($pl['opt']['fs'])) {
-									break;
-								}
-								$filename = basename($pl['opt']['fs']);
-								if (isset($this->embeddedfiles[$filename]['n'])) {
-									// ... TO BE COMPLETED ...
-									// /R /C /B /E /CO /CP
-									$annots .= ' /Sound <</Type /Filespec /F '.$this->_dataannobjstring($filename).' /EF <</F '.$this->embeddedfiles[$filename]['n'].' 0 R>> >>';
-									$iconsapp = array('Speaker', 'Mic');
-									if (isset($pl['opt']['name']) AND in_array($pl['opt']['name'], $iconsapp)) {
-										$annots .= ' /Name /'.$pl['opt']['name'];
-									} else {
-										$annots .= ' /Name /Speaker';
-									}
-								}
-								break;
-							}
-							case 'movie': {
-								break;
-							}
-							case 'widget': {
-								$hmode = array('N', 'I', 'O', 'P', 'T');
-								if (isset($pl['opt']['h']) AND in_array($pl['opt']['h'], $hmode)) {
-									$annots .= ' /H /'.$pl['opt']['h'];
-								}
-							 	if (isset($pl['opt']['mk']) AND (is_array($pl['opt']['mk'])) AND !empty($pl['opt']['mk'])) {
-							 		$annots .= ' /MK <<';
-							 		if (isset($pl['opt']['mk']['r'])) {
-							 			$annots .= ' /R '.$pl['opt']['mk']['r'];
-							 		}
-							 		if (isset($pl['opt']['mk']['bc']) AND (is_array($pl['opt']['mk']['bc']))) {
-							 			$annots .= ' /BC [';
-							 			foreach($pl['opt']['mk']['bc'] AS $col) {
-							 				$col = intval($col);
-											$color = $col <= 0 ? 0 : ($col >= 255 ? 1 : $col / 255);
-							 				$annots .= sprintf(' %.2F', $color);
-							 			}
-							 			$annots .= ']';
-							 		}
-							 		if (isset($pl['opt']['mk']['bg']) AND (is_array($pl['opt']['mk']['bg']))) {
-							 			$annots .= ' /BG [';
-							 			foreach($pl['opt']['mk']['bg'] AS $col) {
-							 				$col = intval($col);
-											$color = $col <= 0 ? 0 : ($col >= 255 ? 1 : $col / 255);
-							 				$annots .= sprintf(' %.2F', $color);
-							 			}
-							 			$annots .= ']';
-							 		}
-							 		if (isset($pl['opt']['mk']['ca'])) {
-							 			$annots .= ' /CA '.$pl['opt']['mk']['ca'].'';
-							 		}
-							 		if (isset($pl['opt']['mk']['rc'])) {
-							 			$annots .= ' /RC '.$pl['opt']['mk']['ca'].'';
-							 		}
-							 		if (isset($pl['opt']['mk']['ac'])) {
-							 			$annots .= ' /AC '.$pl['opt']['mk']['ca'].'';
-							 		}
-							 		if (isset($pl['opt']['mk']['i'])) {
-							 			$info = $this->getImageBuffer($pl['opt']['mk']['i']);
-							 			if ($info !== false) {
-							 				$annots .= ' /I '.$info['n'].' 0 R';
-							 			}
-							 		}
-							 		if (isset($pl['opt']['mk']['ri'])) {
-							 			$info = $this->getImageBuffer($pl['opt']['mk']['ri']);
-							 			if ($info !== false) {
-							 				$annots .= ' /RI '.$info['n'].' 0 R';
-							 			}
-							 		}
-							 		if (isset($pl['opt']['mk']['ix'])) {
-							 			$info = $this->getImageBuffer($pl['opt']['mk']['ix']);
-							 			if ($info !== false) {
-							 				$annots .= ' /IX '.$info['n'].' 0 R';
-							 			}
-							 		}
-							 		if (isset($pl['opt']['mk']['if']) AND (is_array($pl['opt']['mk']['if'])) AND !empty($pl['opt']['mk']['if'])) {
-							 			$annots .= ' /IF <<';
-							 			$if_sw = array('A', 'B', 'S', 'N');
-										if (isset($pl['opt']['mk']['if']['sw']) AND in_array($pl['opt']['mk']['if']['sw'], $if_sw)) {
-											$annots .= ' /SW /'.$pl['opt']['mk']['if']['sw'];
-										}
-							 			$if_s = array('A', 'P');
-										if (isset($pl['opt']['mk']['if']['s']) AND in_array($pl['opt']['mk']['if']['s'], $if_s)) {
-											$annots .= ' /S /'.$pl['opt']['mk']['if']['s'];
-										}
-										if (isset($pl['opt']['mk']['if']['a']) AND (is_array($pl['opt']['mk']['if']['a'])) AND !empty($pl['opt']['mk']['if']['a'])) {
-											$annots .= sprintf(' /A [%.2F  %.2F]', $pl['opt']['mk']['if']['a'][0], $pl['opt']['mk']['if']['a'][1]);
-										}
-										if (isset($pl['opt']['mk']['if']['fb']) AND ($pl['opt']['mk']['if']['fb'])) {
-											$annots .= ' /FB true';
-										}
-							 			$annots .= '>>';
-							 		}
-							 		if (isset($pl['opt']['mk']['tp']) AND ($pl['opt']['mk']['tp'] >= 0) AND ($pl['opt']['mk']['tp'] <= 6)) {
-							 			$annots .= ' /TP '.intval($pl['opt']['mk']['tp']);
-							 		} else {
-							 			$annots .= ' /TP 0';
-							 		}
-							 		$annots .= '>>';
-							 	} // end MK
-							 	// --- Entries for field dictionaries ---
-							 	if (isset($this->radiobutton_groups[$n][$pl['txt']])) {
-							 		// set parent
-							 		$annots .= ' /Parent '.$this->radiobutton_groups[$n][$pl['txt']].' 0 R';
-							 	}
-							 	if (isset($pl['opt']['t']) AND is_string($pl['opt']['t'])) {
-									$annots .= ' /T '.$this->_dataannobjstring($pl['opt']['t']);
-								}
-								if (isset($pl['opt']['tu']) AND is_string($pl['opt']['tu'])) {
-									$annots .= ' /TU '.$this->_dataannobjstring($pl['opt']['tu']);
-								}
-								if (isset($pl['opt']['tm']) AND is_string($pl['opt']['tm'])) {
-									$annots .= ' /TM '.$this->_dataannobjstring($pl['opt']['tm']);
-								}
-								if (isset($pl['opt']['ff'])) {
-									if (is_array($pl['opt']['ff'])) {
-										// array of bit settings
-										$flag = 0;
-										foreach($pl['opt']['ff'] as $val) {
-											$flag += 1 << ($val - 1);
-										}
-									} else {
-										$flag = intval($pl['opt']['ff']);
-									}
-									$annots .= ' /Ff '.$flag;
-								}
-								if (isset($pl['opt']['maxlen'])) {
-									$annots .= ' /MaxLen '.intval($pl['opt']['maxlen']);
-								}
-								if (isset($pl['opt']['v'])) {
-									$annots .= ' /V';
-									if (is_array($pl['opt']['v'])) {
-										foreach ($pl['opt']['v'] AS $optval) {
-											if (is_float($optval)) {
-												$optval = sprintf('%.2F', $optval);
-											}
-											$annots .= ' '.$optval;
-										}
-									} else {
-										$annots .= ' '.$this->_textannobjstring($pl['opt']['v']);
-									}
-								}
-								if (isset($pl['opt']['dv'])) {
-									$annots .= ' /DV';
-									if (is_array($pl['opt']['dv'])) {
-										foreach ($pl['opt']['dv'] AS $optval) {
-											if (is_float($optval)) {
-												$optval = sprintf('%.2F', $optval);
-											}
-											$annots .= ' '.$optval;
-										}
-									} else {
-										$annots .= ' '.$this->_textannobjstring($pl['opt']['dv']);
-									}
-								}
-								if (isset($pl['opt']['rv'])) {
-									$annots .= ' /RV';
-									if (is_array($pl['opt']['rv'])) {
-										foreach ($pl['opt']['rv'] AS $optval) {
-											if (is_float($optval)) {
-												$optval = sprintf('%.2F', $optval);
-											}
-											$annots .= ' '.$optval;
-										}
-									} else {
-										$annots .= ' '.$this->_textannobjstring($pl['opt']['rv']);
-									}
-								}
-								if (isset($pl['opt']['a']) AND !empty($pl['opt']['a'])) {
-									$annots .= ' /A << '.$pl['opt']['a'].' >>';
-								}
-								if (isset($pl['opt']['aa']) AND !empty($pl['opt']['aa'])) {
-									$annots .= ' /AA << '.$pl['opt']['aa'].' >>';
-								}
-								if (isset($pl['opt']['da']) AND !empty($pl['opt']['da'])) {
-									$annots .= ' /DA ('.$pl['opt']['da'].')';
-								}
-								if (isset($pl['opt']['q']) AND ($pl['opt']['q'] >= 0) AND ($pl['opt']['q'] <= 2)) {
-									$annots .= ' /Q '.intval($pl['opt']['q']);
-								}
-								if (isset($pl['opt']['opt']) AND (is_array($pl['opt']['opt'])) AND !empty($pl['opt']['opt'])) {
-						 			$annots .= ' /Opt [';
-						 			foreach($pl['opt']['opt'] AS $copt) {
-						 				if (is_array($copt)) {
-						 					$annots .= ' ['.$this->_textannobjstring($copt[0]).' '.$this->_textannobjstring($copt[1]).']';
-						 				} else {
-						 					$annots .= ' '.$this->_textannobjstring($copt);
-						 				}
-						 			}
-						 			$annots .= ']';
-						 		}
-						 		if (isset($pl['opt']['ti'])) {
-						 			$annots .= ' /TI '.intval($pl['opt']['ti']);
-						 		}
-						 		if (isset($pl['opt']['i']) AND (is_array($pl['opt']['i'])) AND !empty($pl['opt']['i'])) {
-						 			$annots .= ' /I [';
-						 			foreach($pl['opt']['i'] AS $copt) {
-						 				$annots .= intval($copt).' ';
-						 			}
-						 			$annots .= ']';
-						 		}
-								break;
-							}
-							case 'screen': {
-								break;
-							}
-							case 'printermark': {
-								break;
-							}
-							case 'trapnet': {
-								break;
-							}
-							case 'watermark': {
-								break;
-							}
-							case '3d': {
-								break;
-							}
-							default: {
-								break;
-							}
-						}
-						$annots .= '>>';
-						// create new annotation object
-						++$this->annot_obj_id;
-						$this->offsets[$this->annot_obj_id] = $this->bufferlen;
-						$this->_out($this->annot_obj_id.' 0 obj '.$annots.' endobj');
-						if ($formfield AND ! isset($this->radiobutton_groups[$n][$pl['txt']])) {
-							// store reference of form object
-							$this->form_obj_id[] = $this->annot_obj_id;
-						}
-					}
-				}
-			} // end for each page
-		}
-
-		/**
-		 * Put appearance streams XObject used to define annotation's appearance states
-		 * @param int $w annotation width
-		 * @param int $h annotation height
-		 * @param string $stream appearance stream
-		 * @return int object ID
-		 * @access protected
-		 * @since 4.8.001 (2009-09-09)
-		 */
-		protected function _putAPXObject($w=0, $h=0, $stream='') {
-			$stream = trim($stream);
-			++$this->apxo_obj_id;
-			$this->offsets[$this->apxo_obj_id] = $this->bufferlen;
-			$out = $this->apxo_obj_id.' 0 obj';
-			$out .= ' <<';
-			$out .= ' /Type /XObject';
-			$out .= ' /Subtype /Form';
-			$out .= ' /FormType 1';
-			if ($this->compress) {
-				$stream = gzcompress($stream);
-				$out .= ' /Filter /FlateDecode';
-			}
-			$rect = sprintf('%.2F %.2F', $w, $h);
-			$out .= ' /BBox [0 0 '.$rect.']';
-			$out .= ' /Matrix [1 0 0 1 0 0]';
-			$out .= ' /Resources <</ProcSet [/PDF]>>';
-			$out .= ' /Length '.strlen($stream);
-			$out .= ' >>';
-			$out .= ' '.$this->_getstream($stream);
-			$out .= ' endobj';
-			$this->_out($out);
-			return $this->apxo_obj_id;
-		}
-
-		/**
-		 * Output fonts.
-		 * @access protected
-		 */
-		protected function _putfonts() {
-			$nf = $this->n;
-			foreach ($this->diffs as $diff) {
-				//Encodings
-				$this->_newobj();
-				$this->_out('<</Type /Encoding /BaseEncoding /WinAnsiEncoding /Differences ['.$diff.']>> endobj');
-			}
-			$mqr = $this->get_mqr();
-			$this->set_mqr(false);
-			foreach ($this->FontFiles as $file => $info) {
-				// search and get font file to embedd
-				$fontdir = $info['fontdir'];
-				$file = strtolower($file);
-				$fontfile = '';
-				// search files on various directories
-				if (($fontdir !== false) AND file_exists($fontdir.$file)) {
-					$fontfile = $fontdir.$file;
-				} elseif (file_exists($this->_getfontpath().$file)) {
-					$fontfile = $this->_getfontpath().$file;
-				} elseif (file_exists($file)) {
-					$fontfile = $file;
-				}
-				if (!$this->empty_string($fontfile)) {
-					$font = file_get_contents($fontfile);
-					$compressed = (substr($file, -2) == '.z');
-					if ((!$compressed) AND (isset($info['length2']))) {
-						$header = (ord($font{0}) == 128);
-						if ($header) {
-							//Strip first binary header
-							$font = substr($font, 6);
-						}
-						if ($header AND (ord($font{$info['length1']}) == 128)) {
-							//Strip second binary header
-							$font = substr($font, 0, $info['length1']).substr($font, ($info['length1'] + 6));
-						}
-					}
-					$this->_newobj();
-					$this->FontFiles[$file]['n'] = $this->n;
-					$out = '<</Length '.strlen($font);
-					if ($compressed) {
-						$out .= ' /Filter /FlateDecode';
-					}
-					$out .= ' /Length1 '.$info['length1'];
-					if (isset($info['length2'])) {
-						$out .= ' /Length2 '.$info['length2'].' /Length3 0';
-					}
-					$out .= ' >>';
-					$out .= ' '.$this->_getstream($font);
-					$out .= ' endobj';
-					$this->_out($out);
-				}
-			}
-			$this->set_mqr($mqr);
-			foreach ($this->fontkeys as $k) {
-				//Font objects
-				$this->setFontSubBuffer($k, 'n', $this->n + 1);
-				$font = $this->getFontBuffer($k);
-				$type = $font['type'];
-				$name = $font['name'];
-				if ($type == 'core') {
-					//Standard font
-					$obj_id = $this->_newobj();
-					$out = '<</Type /Font';
-					$out .= ' /Subtype /Type1';
-					$out .= ' /BaseFont /'.$name;
-					$out .= ' /Name /F'.$font['i'];
-					if ((strtolower($name) != 'symbol') AND (strtolower($name) != 'zapfdingbats')) {
-						$out .= ' /Encoding /WinAnsiEncoding';
-					}
-					if (strtolower($name) == 'helvetica') {
-						// add default font for annotations
-						$this->annotation_fonts['helvetica'] = $k;
-					}
-					$out .= ' >> endobj';
-					$this->_out($out);
-				} elseif (($type == 'Type1') OR ($type == 'TrueType')) {
-					//Additional Type1 or TrueType font
-					$obj_id = $this->_newobj();
-					$out = '<</Type /Font';
-					$out .= ' /Subtype /'.$type;
-					$out .= ' /BaseFont /'.$name;
-					$out .= ' /Name /F'.$font['i'];
-					$out .= ' /FirstChar 32 /LastChar 255';
-					$out .= ' /Widths '.($this->n + 1).' 0 R';
-					$out .= ' /FontDescriptor '.($this->n + 2).' 0 R';
-					if ($font['enc']) {
-						if (isset($font['diff'])) {
-							$out .= ' /Encoding '.($nf + $font['diff']).' 0 R';
-						} else {
-							$out .= ' /Encoding /WinAnsiEncoding';
-						}
-					}
-					$out .= ' >> endobj';
-					$this->_out($out);
-					// Widths
-					$this->_newobj();
-					$cw = &$font['cw'];
-					$s = '[';
-					for ($i = 32; $i < 256; ++$i) {
-						$s .= $cw[$i].' ';
-					}
-					$this->_out($s.'] endobj');
-					//Descriptor
-					$this->_newobj();
-					$s = '<</Type /FontDescriptor /FontName /'.$name;
-					foreach ($font['desc'] as $fdk => $fdv) {
-						if(is_float($fdv)) {
-							$fdv = sprintf('%.3F', $fdv);
-						}
-						$s .= ' /'.$fdk.' '.$fdv.'';
-					}
-					if (!$this->empty_string($font['file'])) {
-						$s .= ' /FontFile'.($type == 'Type1' ? '' : '2').' '.$this->FontFiles[$font['file']]['n'].' 0 R';
-					}
-					$this->_out($s.'>> endobj');
-				} else {
-					//Allow for additional types
-					$mtd = '_put'.strtolower($type);
-					if (!method_exists($this, $mtd)) {
-						$this->Error('Unsupported font type: '.$type);
-					}
-					$obj_id = $this->$mtd($font);
-				}
-				// store object ID for current font
-				$this->font_obj_ids[$k] = $obj_id;
-			}
-		}
-
-		/**
-		 * Outputs font widths
-		 * @parameter array $font font data
-		 * @parameter int $cidoffset offset for CID values
-		 * @return PDF command string for font widths
-		 * @author Nicola Asuni
-		 * @access protected
-		 * @since 4.4.000 (2008-12-07)
-		 */
-		protected function _putfontwidths($font, $cidoffset=0) {
-			ksort($font['cw']);
-			$rangeid = 0;
-			$range = array();
-			$prevcid = -2;
-			$prevwidth = -1;
-			$interval = false;
-			// for each character
-			foreach ($font['cw'] as $cid => $width) {
-				$cid -= $cidoffset;
-				if ($width != $font['dw']) {
-					if ($cid == ($prevcid + 1)) {
-						// consecutive CID
-						if ($width == $prevwidth) {
-							if ($width == $range[$rangeid][0]) {
-								$range[$rangeid][] = $width;
-							} else {
-								array_pop($range[$rangeid]);
-								// new range
-								$rangeid = $prevcid;
-								$range[$rangeid] = array();
-								$range[$rangeid][] = $prevwidth;
-								$range[$rangeid][] = $width;
-							}
-							$interval = true;
-							$range[$rangeid]['interval'] = true;
-						} else {
-							if ($interval) {
-								// new range
-								$rangeid = $cid;
-								$range[$rangeid] = array();
-								$range[$rangeid][] = $width;
-							} else {
-								$range[$rangeid][] = $width;
-							}
-							$interval = false;
-						}
-					} else {
-						// new range
-						$rangeid = $cid;
-						$range[$rangeid] = array();
-						$range[$rangeid][] = $width;
-						$interval = false;
-					}
-					$prevcid = $cid;
-					$prevwidth = $width;
-				}
-			}
-			// optimize ranges
-			$prevk = -1;
-			$nextk = -1;
-			$prevint = false;
-			foreach ($range as $k => $ws) {
-				$cws = count($ws);
-				if (($k == $nextk) AND (!$prevint) AND ((!isset($ws['interval'])) OR ($cws < 4))) {
-					if (isset($range[$k]['interval'])) {
-						unset($range[$k]['interval']);
-					}
-					$range[$prevk] = array_merge($range[$prevk], $range[$k]);
-					unset($range[$k]);
-				} else {
-					$prevk = $k;
-				}
-				$nextk = $k + $cws;
-				if (isset($ws['interval'])) {
-					if ($cws > 3) {
-						$prevint = true;
-					} else {
-						$prevint = false;
-					}
-					unset($range[$k]['interval']);
-					--$nextk;
-				} else {
-					$prevint = false;
-				}
-			}
-			// output data
-			$w = '';
-			foreach ($range as $k => $ws) {
-				if (count(array_count_values($ws)) == 1) {
-					// interval mode is more compact
-					$w .= ' '.$k.' '.($k + count($ws) - 1).' '.$ws[0];
-				} else {
-					// range mode
-					$w .= ' '.$k.' [ '.implode(' ', $ws).' ]';
-				}
-			}
-			return '/W ['.$w.' ]';
-		}
-
-		/**
-		 * Adds unicode fonts.<br>
-		 * Based on PDF Reference 1.3 (section 5)
-		 * @parameter array $font font data
-		 * @return int font object ID
-		 * @access protected
-		 * @author Nicola Asuni
-		 * @since 1.52.0.TC005 (2005-01-05)
-		 */
-		protected function _puttruetypeunicode($font) {
-			// Type0 Font
-			// A composite font composed of other fonts, organized hierarchically
-			$obj_id = $this->_newobj();
-			$out = '<</Type /Font';
-			$out .= ' /Subtype /Type0';
-			$out .= ' /BaseFont /'.$font['name'].'';
-			$out .= ' /Name /F'.$font['i'];
-			$out .= ' /Encoding /'.$font['enc'];
-			$out .= ' /ToUnicode /Identity-H';
-			$out .= ' /DescendantFonts ['.($this->n + 1).' 0 R]';
-			$out .= ' >>';
-			$out .= ' endobj';
-			$this->_out($out);
-			// CIDFontType2
-			// A CIDFont whose glyph descriptions are based on TrueType font technology
-			$this->_newobj();
-			$out = '<</Type /Font';
-			$out .= ' /Subtype /CIDFontType2';
-			$out .= ' /BaseFont /'.$font['name'];
-			// A dictionary containing entries that define the character collection of the CIDFont.
-			$cidinfo = '/Registry '.$this->_datastring($font['cidinfo']['Registry']);
-			$cidinfo .= ' /Ordering '.$this->_datastring($font['cidinfo']['Ordering']);
-			$cidinfo .= ' /Supplement '.$font['cidinfo']['Supplement'];
-			$out .= ' /CIDSystemInfo <<'.$cidinfo.'>>';
-			$out .= ' /FontDescriptor '.($this->n + 1).' 0 R';
-			$out .= ' /DW '.$font['dw']; // default width
-			$out .= "\n".$this->_putfontwidths($font, 0);
-			$out .= ' /CIDToGIDMap '.($this->n + 2).' 0 R >> endobj';
-			$this->_out($out);
-			// Font descriptor
-			// A font descriptor describing the CIDFont default metrics other than its glyph widths
-			$this->_newobj();
-			$out = '<</Type /FontDescriptor';
-			$out .= ' /FontName /'.$font['name'];
-			foreach ($font['desc'] as $key => $value) {
-				if(is_float($value)) {
-					$value = sprintf('%.3F', $value);
-				}
-				$out .= ' /'.$key.' '.$value;
-			}
-			$fontdir = false;
-			if (!$this->empty_string($font['file'])) {
-				// A stream containing a TrueType font
-				$out .= ' /FontFile2 '.$this->FontFiles[$font['file']]['n'].' 0 R';
-				$fontdir = $this->FontFiles[$font['file']]['fontdir'];
-			}
-			$out .= ' >> endobj';
-			$this->_out($out);
-			if (isset($font['ctg']) AND (!$this->empty_string($font['ctg']))) {
-				$this->_newobj();
-				// Embed CIDToGIDMap
-				// A specification of the mapping from CIDs to glyph indices
-				// search and get CTG font file to embedd
-				$ctgfile = strtolower($font['ctg']);
-				// search and get ctg font file to embedd
-				$fontfile = '';
-				// search files on various directories
-				if (($fontdir !== false) AND file_exists($fontdir.$ctgfile)) {
-					$fontfile = $fontdir.$ctgfile;
-				} elseif (file_exists($this->_getfontpath().$ctgfile)) {
-					$fontfile = $this->_getfontpath().$ctgfile;
-				} elseif (file_exists($ctgfile)) {
-					$fontfile = $ctgfile;
-				}
-				if ($this->empty_string($fontfile)) {
-					$this->Error('Font file not found: '.$ctgfile);
-				}
-				$size = filesize($fontfile);
-				$out = '<</Length '.$size.'';
-				if (substr($fontfile, -2) == '.z') { // check file extension
-					// Decompresses data encoded using the public-domain
-					// zlib/deflate compression method, reproducing the
-					// original text or binary data
-					$out .= ' /Filter /FlateDecode';
-				}
-				$out .= ' >>';
-				$out .= ' '.$this->_getstream(file_get_contents($fontfile));
-				$out .= ' endobj';
-				$this->_out($out);
-			}
-			return $obj_id;
-		}
-
-		/**
-		 * Output CID-0 fonts.
-		 * A Type 0 CIDFont contains glyph descriptions based on the Adobe Type 1 font format
-		 * @param array $font font data
-		 * @return int font object ID
-		 * @access protected
-		 * @author Andrew Whitehead, Nicola Asuni, Yukihiro Nakadaira
-		 * @since 3.2.000 (2008-06-23)
-		 */
-		protected function _putcidfont0($font) {
-			$cidoffset = 0;
-			if (!isset($font['cw'][1])) {
-				$cidoffset = 31;
-			}
-			if (isset($font['cidinfo']['uni2cid'])) {
-				// convert unicode to cid.
-				$uni2cid = $font['cidinfo']['uni2cid'];
-				$cw = array();
-				foreach ($font['cw'] as $uni => $width) {
-					if (isset($uni2cid[$uni])) {
-						$cw[($uni2cid[$uni] + $cidoffset)] = $width;
-					} elseif ($uni < 256) {
-						$cw[$uni] = $width;
-					} // else unknown character
-				}
-				$font = array_merge($font, array('cw' => $cw));
-			}
-			$name = $font['name'];
-			$enc = $font['enc'];
-			if ($enc) {
-				$longname = $name.'-'.$enc;
-			} else {
-				$longname = $name;
-			}
-			$obj_id = $this->_newobj();
-			$out = '<</Type /Font';
-			$out .= ' /Subtype /Type0';
-			$out .= ' /BaseFont /'.$longname;
-			$out .= ' /Name /F'.$font['i'];
-			if ($enc) {
-				$out .= ' /Encoding /'.$enc;
-			}
-			$out .= ' /DescendantFonts ['.($this->n + 1).' 0 R]';
-			$out .= ' >> endobj';
-			$this->_out($out);
-			$this->_newobj();
-			$out = '<</Type /Font';
-			$out .= ' /Subtype /CIDFontType0';
-			$out .= ' /BaseFont /'.$name;
-			$cidinfo = '/Registry '.$this->_datastring($font['cidinfo']['Registry']);
-			$cidinfo .= ' /Ordering '.$this->_datastring($font['cidinfo']['Ordering']);
-			$cidinfo .= ' /Supplement '.$font['cidinfo']['Supplement'];
-			$out .= ' /CIDSystemInfo <<'.$cidinfo.'>>';
-			$out .= ' /FontDescriptor '.($this->n + 1).' 0 R';
-			$out .= ' /DW '.$font['dw'];
-			$out .= "\n".$this->_putfontwidths($font, $cidoffset);
-			$out .= ' >> endobj';
-			$this->_out($out);
-			$this->_newobj();
-			$s = '<</Type /FontDescriptor /FontName /'.$name;
-			foreach ($font['desc'] as $k => $v) {
-				if ($k != 'Style') {
-					if(is_float($v)) {
-						$v = sprintf('%.3F', $v);
-					}
-					$s .= ' /'.$k.' '.$v.'';
-				}
-			}
-			$this->_out($s.'>> endobj');
-			return $obj_id;
-		}
-
-		/**
-		 * Output images.
-		 * @access protected
-		 */
-		protected function _putimages() {
-			$filter = ($this->compress) ? '/Filter /FlateDecode ' : '';
-			foreach ($this->imagekeys as $file) {
-				$info = $this->getImageBuffer($file);
-				$this->_newobj();
-				$this->setImageSubBuffer($file, 'n', $this->n);
-				$out = '<</Type /XObject';
-				$out .= ' /Subtype /Image';
-				$out .= ' /Width '.$info['w'];
-				$out .= ' /Height '.$info['h'];
-				if (array_key_exists('masked', $info)) {
-					$out .= ' /SMask '.($this->n - 1).' 0 R';
-				}
-				if ($info['cs'] == 'Indexed') {
-					$out .= ' /ColorSpace [/Indexed /DeviceRGB '.((strlen($info['pal']) / 3) - 1).' '.($this->n + 1).' 0 R]';
-				} else {
-					$out .= ' /ColorSpace /'.$info['cs'];
-					if ($info['cs'] == 'DeviceCMYK') {
-						$out .= ' /Decode [1 0 1 0 1 0 1 0]';
-					}
-				}
-				$out .= ' /BitsPerComponent '.$info['bpc'];
-				if (isset($info['f'])) {
-					$out .= ' /Filter /'.$info['f'];
-				}
-				if (isset($info['parms'])) {
-					$out .= ' '.$info['parms'];
-				}
-				if (isset($info['trns']) AND is_array($info['trns'])) {
-					$trns='';
-					$count_info = count($info['trns']);
-					for ($i=0; $i < $count_info; ++$i) {
-						$trns .= $info['trns'][$i].' '.$info['trns'][$i].' ';
-					}
-					$out .= ' /Mask ['.$trns.']';
-				}
-				$out .= ' /Length '.strlen($info['data']).' >>';
-				$out .= ' '.$this->_getstream($info['data']);
-				$out .= ' endobj';
-				$this->_out($out);
-				//Palette
-				if ($info['cs'] == 'Indexed') {
-					$this->_newobj();
-					$pal = ($this->compress) ? gzcompress($info['pal']) : $info['pal'];
-					$this->_out('<<'.$filter.'/Length '.strlen($pal).'>> '.$this->_getstream($pal).' endobj');
-				}
-			}
-		}
-
-		/**
-		 * Output Spot Colors Resources.
-		 * @access protected
-		 * @since 4.0.024 (2008-09-12)
-		 */
-		protected function _putspotcolors() {
-			foreach ($this->spot_colors as $name => $color) {
-				$this->_newobj();
-				$this->spot_colors[$name]['n'] = $this->n;
-				$out = '[/Separation /'.str_replace(' ', '#20', $name);
-				$out .= ' /DeviceCMYK <<';
-				$out .= ' /Range [0 1 0 1 0 1 0 1] /C0 [0 0 0 0]';
-				$out .= ' '.sprintf('/C1 [%.4F %.4F %.4F %.4F] ', $color['c']/100, $color['m']/100, $color['y']/100, $color['k']/100);
-				$out .= ' /FunctionType 2 /Domain [0 1] /N 1>>]';
-				$out .= ' endobj';
-				$this->_out($out);
-			}
-		}
-
-		/**
-		 * Output Resources Dictionary.
-		 * @access protected
-		 */
-		protected function _putresourcedict() {
-			$out = '2 0 obj';
-			$out .= ' << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]';
-			$out .= ' /Font <<';
-			foreach ($this->fontkeys as $fontkey) {
-				$font = $this->getFontBuffer($fontkey);
-				$out .= ' /F'.$font['i'].' '.$font['n'].' 0 R';
-			}
-			$out .= ' >>';
-			$out .= ' /XObject <<';
-			foreach ($this->imagekeys as $file) {
-				$info = $this->getImageBuffer($file);
-				$out .= ' /I'.$info['i'].' '.$info['n'].' 0 R';
-			}
-			$out .= ' >>';
-			// visibility
-			$out .= ' /Properties <</OC1 '.$this->n_ocg_print.' 0 R /OC2 '.$this->n_ocg_view.' 0 R>>';
-			// transparency
-			$out .= ' /ExtGState <<';
-			foreach ($this->extgstates as $k => $extgstate) {
-				if (isset($extgstate['name'])) {
-					$out .= ' /'.$extgstate['name'];
-				} else {
-					$out .= ' /GS'.$k;
-				}
-				$out .= ' '.$extgstate['n'].' 0 R';
-			}
-			$out .= ' >>';
-			// gradient patterns
-			if (isset($this->gradients) AND (count($this->gradients) > 0)) {
-				$out .= ' /Pattern <<';
-				foreach ($this->gradients as $id => $grad) {
-					$out .= ' /p'.$id.' '.$grad['pattern'].' 0 R';
-				}
-				$out .= ' >>';
-			}
-			// gradient shadings
-			if (isset($this->gradients) AND (count($this->gradients) > 0)) {
-				$out .= ' /Shading <<';
-				foreach ($this->gradients as $id => $grad) {
-					$out .= ' /Sh'.$id.' '.$grad['id'].' 0 R';
-				}
-				$out .= ' >>';
-			}
-			// spot colors
-			if (isset($this->spot_colors) AND (count($this->spot_colors) > 0)) {
-				$out .= ' /ColorSpace <<';
-				foreach ($this->spot_colors as $color) {
-					$out .= ' /CS'.$color['i'].' '.$color['n'].' 0 R';
-				}
-				$out .= ' >>';
-			}
-			$out .= ' >> endobj';
-			$this->_out($out);
-		}
-
-		/**
-		 * Output Resources.
-		 * @access protected
-		 */
-		protected function _putresources() {
-			$this->_putextgstates();
-			$this->_putocg();
-			$this->_putfonts();
-			$this->_putimages();
-			$this->_putspotcolors();
-			$this->_putshaders();
-			//Resource dictionary
-			$this->offsets[2] = $this->bufferlen;
-			$this->_putresourcedict();
-			$this->_putbookmarks();
-			$this->_putEmbeddedFiles();
-			$this->_putannotsobjs();
-			$this->_putjavascript();
-			// encryption
-			$this->_putencryption();
-		}
-
-		/**
-		 * Adds some Metadata information (Document Information Dictionary)
-		 * (see Chapter 14.3.3 Document Information Dictionary of PDF32000_2008.pdf Reference)
-		 * @access protected
-		 */
-		protected function _putinfo() {
-			$this->_newobj();
-			$out = '<<';
-			if (!$this->empty_string($this->title)) {
-				// The document's title.
-				$out .= ' /Title '.$this->_textstring($this->title);
-			}
-			if (!$this->empty_string($this->author)) {
-				// The name of the person who created the document.
-				$out .= ' /Author '.$this->_textstring($this->author);
-			}
-			if (!$this->empty_string($this->subject)) {
-				// The subject of the document.
-				$out .= ' /Subject '.$this->_textstring($this->subject);
-			}
-			if (!$this->empty_string($this->keywords)) {
-				// Keywords associated with the document.
-				$out .= ' /Keywords '.$this->_textstring($this->keywords.' TCP'.'DF');
-			}
-			if (!$this->empty_string($this->creator)) {
-				// If the document was converted to PDF from another format, the name of the conforming product that created the original document from which it was converted.
-				$out .= ' /Creator '.$this->_textstring($this->creator);
-			}
-			if (defined('PDF_PRODUCER')) {
-				// If the document was converted to PDF from another format, the name of the conforming product that converted it to PDF.
-				$out .= ' /Producer '.$this->_textstring(PDF_PRODUCER.' (TCP'.'DF)');
-			} else {
-				// default producer
-				$out .= ' /Producer '.$this->_textstring('TCP'.'DF');
-			}
-			// The date and time the document was created, in human-readable form
-			$out .= ' /CreationDate '.$this->_datestring();
-			// The date and time the document was most recently modified, in human-readable form
-			$out .= ' /ModDate '.$this->_datestring();
-			// A name object indicating whether the document has been modified to include trapping information
-			//$out .= ' /Trapped /False');
-			$out .= ' >> endobj';
-			$this->_out($out);
-		}
-
-		/**
-		 * Output Catalog.
-		 * @access protected
-		 */
-		protected function _putcatalog() {
-			$this->_newobj();
-			$out = '<< /Type /Catalog';
-			$out .= ' /Pages 1 0 R';
-			if ($this->ZoomMode == 'fullpage') {
-				$out .= ' /OpenAction [3 0 R /Fit]';
-			} elseif ($this->ZoomMode == 'fullwidth') {
-				$out .= ' /OpenAction [3 0 R /FitH null]';
-			} elseif ($this->ZoomMode == 'real') {
-				$out .= ' /OpenAction [3 0 R /XYZ null null 1]';
-			} elseif (!is_string($this->ZoomMode)) {
-				$out .= ' /OpenAction [3 0 R /XYZ null null '.($this->ZoomMode / 100).']';
-			}
-			if (isset($this->LayoutMode) AND (!$this->empty_string($this->LayoutMode))) {
-				$out .= ' /PageLayout /'.$this->LayoutMode;
-			}
-			if (isset($this->PageMode) AND (!$this->empty_string($this->PageMode))) {
-				$out .= ' /PageMode /'.$this->PageMode;
-			}
-			if (isset($this->l['a_meta_language'])) {
-				$out .= ' /Lang /'.$this->l['a_meta_language'];
-			}
-			$out .= ' /Names <<';
-			if ((!empty($this->javascript)) OR (!empty($this->js_objects))) {
-				$out .= ' /JavaScript '.($this->n_js).' 0 R';
-			}
-			$out .= ' >>';
-			if (count($this->outlines) > 0) {
-				$out .= ' /Outlines '.$this->OutlineRoot.' 0 R';
-				$out .= ' /PageMode /UseOutlines';
-			}
-			$out .= ' '.$this->_putviewerpreferences();
-			$p = $this->n_ocg_print.' 0 R';
-			$v = $this->n_ocg_view.' 0 R';
-			$as = '<</Event /Print /OCGs ['.$p.' '.$v.'] /Category [/Print]>> <</Event /View /OCGs ['.$p.' '.$v.'] /Category [/View]>>';
-			$out .= ' /OCProperties <</OCGs ['.$p.' '.$v.'] /D <</ON ['.$p.'] /OFF ['.$v.'] /AS ['.$as.']>>>>';
-			// AcroForm
-			if (!empty($this->form_obj_id) OR ($this->sign AND isset($this->signature_data['cert_type']))) {
-				$out .= ' /AcroForm<<';
-				$objrefs = '';
-				if ($this->sign AND isset($this->signature_data['cert_type'])) {
-					$objrefs .= $this->sig_obj_id.' 0 R';
-				}
-				if (!empty($this->form_obj_id)) {
-					foreach($this->form_obj_id as $objid) {
-						$objrefs .= ' '.$objid.' 0 R';
-					}
-				}
-				$out .= ' /Fields ['.$objrefs.']';
-				$out .= ' /NeedAppearances '.(empty($this->form_obj_id)?'false':'true');
-				if ($this->sign AND isset($this->signature_data['cert_type'])) {
-					$out .= ' /SigFlags 3';
-				}
-				//$out .= ' /CO ';
-				if (isset($this->annotation_fonts) AND !empty($this->annotation_fonts)) {
-					$out .= ' /DR <<';
-					$out .= ' /Font <<';
-					foreach ($this->annotation_fonts as $font => $fontkey) {
-						$out .= ' /F'.($fontkey + 1).' '.$this->font_obj_ids[$font].' 0 R';
-					}
-					$out .= ' >> >>';
-				}
-				$out .= ' /DA (/F'.(array_search('helvetica', $this->fontkeys) + 1).' 0 Tf 0 g)';
-				$out .= ' /Q '.(($this->rtl)?'2':'0');
-				//$out .= ' /XFA ';
-				$out .= ' >>';
-				// signatures
-				if ($this->sign AND isset($this->signature_data['cert_type'])) {
-					if ($this->signature_data['cert_type'] > 0) {
-						$out .= ' /Perms<</DocMDP '.($this->sig_obj_id + 1).' 0 R>>';
-					} else {
-						$out .= ' /Perms<</UR3 '.($this->sig_obj_id + 1).' 0 R>>';
-					}
-				}
-			}
-			$out .= ' >> endobj';
-			$this->_out($out);
-		}
-
-		/**
-		 * Output viewer preferences.
-		 * @return string for viewer preferences
-		 * @author Nicola asuni
-		 * @since 3.1.000 (2008-06-09)
-		 * @access protected
-		 */
-		protected function _putviewerpreferences() {
-			$out = '/ViewerPreferences <<';
-			if ($this->rtl) {
-				$out .= ' /Direction /R2L';
-			} else {
-				$out .= ' /Direction /L2R';
-			}
-			if (isset($this->viewer_preferences['HideToolbar']) AND ($this->viewer_preferences['HideToolbar'])) {
-				$out .= ' /HideToolbar true';
-			}
-			if (isset($this->viewer_preferences['HideMenubar']) AND ($this->viewer_preferences['HideMenubar'])) {
-				$out .= ' /HideMenubar true';
-			}
-			if (isset($this->viewer_preferences['HideWindowUI']) AND ($this->viewer_preferences['HideWindowUI'])) {
-				$out .= ' /HideWindowUI true';
-			}
-			if (isset($this->viewer_preferences['FitWindow']) AND ($this->viewer_preferences['FitWindow'])) {
-				$out .= ' /FitWindow true';
-			}
-			if (isset($this->viewer_preferences['CenterWindow']) AND ($this->viewer_preferences['CenterWindow'])) {
-				$out .= ' /CenterWindow true';
-			}
-			if (isset($this->viewer_preferences['DisplayDocTitle']) AND ($this->viewer_preferences['DisplayDocTitle'])) {
-				$out .= ' /DisplayDocTitle true';
-			}
-			if (isset($this->viewer_preferences['NonFullScreenPageMode'])) {
-				$out .= ' /NonFullScreenPageMode /'.$this->viewer_preferences['NonFullScreenPageMode'];
-			}
-			if (isset($this->viewer_preferences['ViewArea'])) {
-				$out .= ' /ViewArea /'.$this->viewer_preferences['ViewArea'];
-			}
-			if (isset($this->viewer_preferences['ViewClip'])) {
-				$out .= ' /ViewClip /'.$this->viewer_preferences['ViewClip'];
-			}
-			if (isset($this->viewer_preferences['PrintArea'])) {
-				$out .= ' /PrintArea /'.$this->viewer_preferences['PrintArea'];
-			}
-			if (isset($this->viewer_preferences['PrintClip'])) {
-				$out .= ' /PrintClip /'.$this->viewer_preferences['PrintClip'];
-			}
-			if (isset($this->viewer_preferences['PrintScaling'])) {
-				$out .= ' /PrintScaling /'.$this->viewer_preferences['PrintScaling'];
-			}
-			if (isset($this->viewer_preferences['Duplex']) AND (!$this->empty_string($this->viewer_preferences['Duplex']))) {
-				$out .= ' /Duplex /'.$this->viewer_preferences['Duplex'];
-			}
-			if (isset($this->viewer_preferences['PickTrayByPDFSize'])) {
-				if ($this->viewer_preferences['PickTrayByPDFSize']) {
-					$out .= ' /PickTrayByPDFSize true';
-				} else {
-					$out .= ' /PickTrayByPDFSize false';
-				}
-			}
-			if (isset($this->viewer_preferences['PrintPageRange'])) {
-				$PrintPageRangeNum = '';
-				foreach ($this->viewer_preferences['PrintPageRange'] as $k => $v) {
-					$PrintPageRangeNum .= ' '.($v - 1).'';
-				}
-				$out .= ' /PrintPageRange ['.substr($PrintPageRangeNum,1).']';
-			}
-			if (isset($this->viewer_preferences['NumCopies'])) {
-				$out .= ' /NumCopies '.intval($this->viewer_preferences['NumCopies']);
-			}
-			$out .= ' >>';
-			return $out;
-		}
-
-		/**
-		 * Output trailer.
-		 * @access protected
-		 */
-		protected function _puttrailer() {
-			$out = 'trailer <<';
-			$out .= ' /Size '.($this->n + 1);
-			$out .= ' /Root '.$this->n.' 0 R';
-			$out .= ' /Info '.($this->n - 1).' 0 R';
-			if ($this->encrypted) {
-				$out .= ' /Encrypt '.$this->enc_obj_id.' 0 R';
-				$out .= ' /ID [()()]';
-			}
-			$out .= ' >>';
-			$this->_out($out);
-		}
-
-		/**
-		 * Output PDF header.
-		 * @access protected
-		 */
-		protected function _putheader() {
-			$this->_out('%PDF-'.$this->PDFVersion);
-		}
-
-		/**
-		 * Output end of document (EOF).
-		 * @access protected
-		 */
-		protected function _enddoc() {
-			$this->state = 1;
-			$this->_putheader();
-			$this->_putpages();
-			$this->_putresources();
-			// Signature
-			if ($this->sign AND isset($this->signature_data['cert_type'])) {
-				// widget annotation for signature
-				$this->sig_obj_id = $this->_newobj();
-				// --- replace signature ID on the first page ---
-				// get the document content
-				$pdfdoc = $this->getBuffer();
-				// Remove the original buffer
-				if (isset($this->diskcache) AND $this->diskcache) {
-					// remove buffer file from cache
-					unlink($this->buffer);
-				}
-				unset($this->buffer);
-				$signature_widget_ref = sprintf('%u 0 R', $this->sig_obj_id);
-				$signature_widget_ref .= str_repeat(' ', (strlen($this->sig_annot_ref) - strlen($signature_widget_ref)));
-				$pdfdoc = str_replace($this->sig_annot_ref, $signature_widget_ref, $pdfdoc);
-				$this->diskcache = false;
-				$this->buffer = &$pdfdoc;
-				$this->bufferlen = strlen($pdfdoc);
-				// ---
-				$out = '<< /Type /Annot /Subtype /Widget /Rect [0 0 0 0]';
-				$out .= ' /P 3 0 R'; // link to first page object
-				$out .= ' /FT /Sig';
-				$out .= ' /T '.$this->_textstring('Signature');
-				$out .= ' /Ff 0';
-				$out .= ' /V '.($this->sig_obj_id + 1).' 0 R';
-				$out .= ' >> endobj';
-				$this->_out($out);
-				// signature
-				$this->_putsignature();
-			}
-			// Info
-			$this->_putinfo();
-			// Catalog
-			$this->_putcatalog();
-			// Cross-ref
-			$o = $this->bufferlen;
-			$this->_out('xref');
-			$this->_out('0 '.($this->n + 1));
-			$this->_out('0000000000 65535 f ');
-			for ($i=1; $i <= $this->n; ++$i) {
-				$this->_out(sprintf('%010d 00000 n ', $this->offsets[$i]));
-			}
-			// Embedded Files
-			if (isset($this->embeddedfiles) AND count($this->embeddedfiles) > 0) {
-				$this->_out($this->embedded_start_obj_id.' '.count($this->embeddedfiles));
-				foreach ($this->embeddedfiles as $filename => $filedata) {
-					$this->_out(sprintf('%010d 00000 n ', $this->offsets[$filedata['n']]));
-				}
-			}
-			// Annotation Objects
-			if ($this->annot_obj_id > $this->annots_start_obj_id) {
-				$this->_out(($this->annots_start_obj_id + 1).' '.($this->annot_obj_id - $this->annots_start_obj_id));
-				for ($i = ($this->annots_start_obj_id + 1); $i <= $this->annot_obj_id; ++$i) {
-					$this->_out(sprintf('%010d 00000 n ', $this->offsets[$i]));
-				}
-			}
-			// Javascript Objects
-			if ($this->js_obj_id > $this->js_start_obj_id) {
-				$this->_out(($this->js_start_obj_id + 1).' '.($this->js_obj_id - $this->js_start_obj_id));
-				for ($i = ($this->js_start_obj_id + 1); $i <= $this->js_obj_id; ++$i) {
-					$this->_out(sprintf('%010d 00000 n ', $this->offsets[$i]));
-				}
-			}
-			// Appearance streams XObjects
-			if ($this->apxo_obj_id > $this->apxo_start_obj_id) {
-				$this->_out(($this->apxo_start_obj_id + 1).' '.($this->apxo_obj_id - $this->apxo_start_obj_id));
-				for ($i = ($this->apxo_start_obj_id + 1); $i <= $this->apxo_obj_id; ++$i) {
-					$this->_out(sprintf('%010d 00000 n ', $this->offsets[$i]));
-				}
-			}
-			//Trailer
-			$this->_puttrailer();
-			$this->_out('startxref');
-			$this->_out($o);
-			$this->_out('%%EOF');
-			$this->state = 3; // end-of-doc
-			if ($this->diskcache) {
-				// remove temporary files used for images
-				foreach ($this->imagekeys as $key) {
-					// remove temporary files
-					unlink($this->images[$key]);
-				}
-				foreach ($this->fontkeys as $key) {
-					// remove temporary files
-					unlink($this->fonts[$key]);
-				}
-			}
-		}
-
-		/**
-		 * Initialize a new page.
-		 * @param string $orientation page orientation. Possible values are (case insensitive):<ul><li>P or PORTRAIT (default)</li><li>L or LANDSCAPE</li></ul>
-		 * @param mixed $format The format used for pages. It can be either one of the following values (case insensitive) or a custom format in the form of a two-element array containing the width and the height (expressed in the unit given by unit).<ul><li>4A0</li><li>2A0</li><li>A0</li><li>A1</li><li>A2</li><li>A3</li><li>A4 (default)</li><li>A5</li><li>A6</li><li>A7</li><li>A8</li><li>A9</li><li>A10</li><li>B0</li><li>B1</li><li>B2</li><li>B3</li><li>B4</li><li>B5</li><li>B6</li><li>B7</li><li>B8</li><li>B9</li><li>B10</li><li>C0</li><li>C1</li><li>C2</li><li>C3</li><li>C4</li><li>C5</li><li>C6</li><li>C7</li><li>C8</li><li>C9</li><li>C10</li><li>RA0</li><li>RA1</li><li>RA2</li><li>RA3</li><li>RA4</li><li>SRA0</li><li>SRA1</li><li>SRA2</li><li>SRA3</li><li>SRA4</li><li>LETTER</li><li>LEGAL</li><li>EXECUTIVE</li><li>FOLIO</li></ul>
-		 * @access protected
-		 */
-		protected function _beginpage($orientation='', $format='') {
-			++$this->page;
-			$this->setPageBuffer($this->page, '');
-			// initialize array for graphics tranformation positions inside a page buffer
-			$this->transfmrk[$this->page] = array();
-			$this->state = 2;
-			if ($this->empty_string($orientation)) {
-				if (isset($this->CurOrientation)) {
-					$orientation = $this->CurOrientation;
-				} else {
-					$orientation = 'P';
-				}
-			}
-			if ($this->empty_string($format)) {
-				$this->setPageOrientation($orientation);
-			} else {
-				$this->setPageFormat($format, $orientation);
-			}
-			if ($this->rtl) {
-				$this->x = $this->w - $this->rMargin;
-			} else {
-				$this->x = $this->lMargin;
-			}
-			$this->y = $this->tMargin;
-			if (isset($this->newpagegroup[$this->page])) {
-				// start a new group
-				$n = sizeof($this->pagegroups) + 1;
-				$alias = '{nb'.$n.'}';
-				$this->pagegroups[$alias] = 1;
-				$this->currpagegroup = $alias;
-			} elseif ($this->currpagegroup) {
-				++$this->pagegroups[$this->currpagegroup];
-			}
-		}
-
-		/**
-		 * Mark end of page.
-		 * @access protected
-		 */
-		protected function _endpage() {
-			$this->setVisibility('all');
-			$this->state = 1;
-		}
-
-		/**
-		 * Begin a new object and return the object number.
-		 * @return int object number
-		 * @access protected
-		 */
-		protected function _newobj() {
-			++$this->n;
-			$this->offsets[$this->n] = $this->bufferlen;
-			$this->_out($this->n.' 0 obj');
-			return $this->n;
-		}
-
-		/**
-		 * Underline text.
-		 * @param int $x X coordinate
-		 * @param int $y Y coordinate
-		 * @param string $txt text to underline
-		 * @access protected
-		 */
-		protected function _dounderline($x, $y, $txt) {
-			$w = $this->GetStringWidth($txt);
-			return $this->_dounderlinew($x, $y, $w);
-		}
-
-		/**
-		 * Underline for rectangular text area.
-		 * @param int $x X coordinate
-		 * @param int $y Y coordinate
-		 * @param int $w width to underline
-		 * @access protected
-		 * @since 4.8.008 (2009-09-29)
-		 */
-		protected function _dounderlinew($x, $y, $w) {
-			$linew = - $this->CurrentFont['ut'] / 1000 * $this->FontSizePt;
-			return sprintf('%.2F %.2F %.2F %.2F re f', $x * $this->k, ($this->h - $y + ($linew / 2)) * $this->k, $w * $this->k, $linew);
-		}
-
-		/**
-		 * Line through text.
-		 * @param int $x X coordinate
-		 * @param int $y Y coordinate
-		 * @param string $txt text to linethrough
-		 * @access protected
-		 */
-		protected function _dolinethrough($x, $y, $txt) {
-			$w = $this->GetStringWidth($txt);
-			return $this->_dolinethroughw($x, $y, $w);
-		}
-
-		/**
-		 * Line through for rectangular text area.
-		 * @param int $x X coordinate
-		 * @param int $y Y coordinate
-		 * @param string $txt text to linethrough
-		 * @access protected
-		 * @since 4.9.008 (2009-09-29)
-		 */
-		protected function _dolinethroughw($x, $y, $w) {
-			$linew = - $this->CurrentFont['ut'] / 1000 * $this->FontSizePt;
-			return sprintf('%.2F %.2F %.2F %.2F re f', $x * $this->k, ($this->h - $y + ($this->FontSize / 3) + ($linew / 2)) * $this->k, $w * $this->k, $linew);
-		}
-
-		/**
-		 * Overline text.
-		 * @param int $x X coordinate
-		 * @param int $y Y coordinate
-		 * @param string $txt text to overline
-		 * @access protected
-		 * @since 4.9.015 (2010-04-19)
-		 */
-		protected function _dooverline($x, $y, $txt) {
-			$w = $this->GetStringWidth($txt);
-			return $this->_dooverlinew($x, $y, $w);
-		}
-
-		/**
-		 * Overline for rectangular text area.
-		 * @param int $x X coordinate
-		 * @param int $y Y coordinate
-		 * @param int $w width to overline
-		 * @access protected
-		 * @since 4.9.015 (2010-04-19)
-		 */
-		protected function _dooverlinew($x, $y, $w) {
-			$linew = - $this->CurrentFont['ut'] / 1000 * $this->FontSizePt;
-			return sprintf('%.2F %.2F %.2F %.2F re f', $x * $this->k, ($this->h - $y + $this->FontAscent - ($linew / 2)) * $this->k, $w * $this->k, $linew);
-
-		}
-
-		/**
-		 * Read a 4-byte integer from file.
-		 * @param string $f file name.
-		 * @return 4-byte integer
-		 * @access protected
-		 */
-		protected function _freadint($f) {
-			$a = unpack('Ni', fread($f, 4));
-			return $a['i'];
-		}
-
-		/**
-		 * Add "\" before "\", "(" and ")"
-		 * @param string $s string to escape.
-		 * @return string escaped string.
-		 * @access protected
-		 */
-		protected function _escape($s) {
-			// the chr(13) substitution fixes the Bugs item #1421290.
-			return strtr($s, array(')' => '\\)', '(' => '\\(', '\\' => '\\\\', chr(13) => '\r'));
-		}
-
-		/**
-		 * Format a data string for meta information
-		 * @param string $s data string to escape.
-		 * @return string escaped string.
-		 * @access protected
-		 */
-		protected function _datastring($s) {
-			if ($this->encrypted) {
-				$s = $this->_RC4($this->_objectkey($this->n), $s);
-			}
-			return '('. $this->_escape($s).')';
-		}
-
-		/**
-		 * Format a data string for annotation objects
-		 * @param string $s data string to escape.
-		 * @return string escaped string.
-		 * @access protected
-		 */
-		protected function _dataannobjstring($s) {
-			if ($this->encrypted) {
-				$s = $this->_RC4($this->_objectkey($this->annot_obj_id + 1), $s);
-			}
-			return '('. $this->_escape($s).')';
-		}
-
-		/**
-		 * Returns a formatted date for meta information
-		 * @return string escaped date string.
-		 * @access protected
-		 * @since 4.6.028 (2009-08-25)
-		 */
-		protected function _datestring() {
-			$current_time = substr_replace(date('YmdHisO'), '\'', (0 - 2), 0).'\'';
-			return $this->_datastring('D:'.$current_time);
-		}
-
-		/**
-		 * Format a text string for meta information
-		 * @param string $s string to escape.
-		 * @return string escaped string.
-		 * @access protected
-		 */
-		protected function _textstring($s) {
-			if ($this->isunicode) {
-				//Convert string to UTF-16BE
-				$s = $this->UTF8ToUTF16BE($s, true);
-			}
-			return $this->_datastring($s);
-		}
-
-		/**
-		 * Format a UTF-8 text string for meta information on annotations
-		 * @param string $s string to escape.
-		 * @return string escaped string.
-		 * @access protected
-		 */
-		protected function _textannobjstring($s) {
-			if ($this->isunicode) {
-				//Convert string to UTF-16BE
-				$s = $this->UTF8ToUTF16BE($s, true);
-			}
-			return $this->_dataannobjstring($s);
-		}
-
-		/**
-		 * Format a text string
-		 * @param string $s string to escape.
-		 * @return string escaped string.
-		 * @access protected
-		 */
-		protected function _escapetext($s) {
-			if ($this->isunicode) {
-				if (($this->CurrentFont['type'] == 'core') OR ($this->CurrentFont['type'] == 'TrueType') OR ($this->CurrentFont['type'] == 'Type1')) {
-					$s = $this->UTF8ToLatin1($s);
-				} else {
-					//Convert string to UTF-16BE and reverse RTL language
-					$s = $this->utf8StrRev($s, false, $this->tmprtl);
-				}
-			}
-			return $this->_escape($s);
-		}
-
-		/**
-		 * Format output stream.
-		 * @param string $s string to output.
-		 * @param int $n object reference for encryption mode
-		 * @access protected
-		 */
-		protected function _getstream($s, $n=0) {
-			if ($this->encrypted) {
-				if ($n <= 0) {
-					// default to current object
-					$n = $this->n;
-				}
-				$s = $this->_RC4($this->_objectkey($n), $s);
-			}
-			return "stream\n".$s."\nendstream";
-		}
-
-		/**
-		 * Output a stream.
-		 * @param string $s string to output.
-		 * @param int $n object reference for encryption mode
-		 * @access protected
-		 */
-		protected function _putstream($s, $n=0) {
-			$this->_out($this->_getstream($s, $n));
-		}
-
-		/**
-		 * Output a string to the document.
-		 * @param string $s string to output.
-		 * @access protected
-		 */
-		protected function _out($s) {
-			if ($this->state == 2) {
-				if ((!$this->InFooter) AND isset($this->footerlen[$this->page]) AND ($this->footerlen[$this->page] > 0)) {
-					// puts data before page footer
-					$pagebuff = $this->getPageBuffer($this->page);
-					$page = substr($pagebuff, 0, -$this->footerlen[$this->page]);
-					$footer = substr($pagebuff, -$this->footerlen[$this->page]);
-					$this->setPageBuffer($this->page, $page.$s."\n".$footer);
-					// update footer position
-					$this->footerpos[$this->page] += strlen($s."\n");
-				} else {
-					$this->setPageBuffer($this->page, $s."\n", true);
-				}
-			} else {
-				$this->setBuffer($s."\n");
-			}
-		}
-
-		/**
-		 * Converts UTF-8 strings to codepoints array.<br>
-		 * Invalid byte sequences will be replaced with 0xFFFD (replacement character)<br>
-		 * Based on: http://www.faqs.org/rfcs/rfc3629.html
-		 * <pre>
-		 *    Char. number range  |        UTF-8 octet sequence
-		 *       (hexadecimal)    |              (binary)
-		 *    --------------------+-----------------------------------------------
-		 *    0000 0000-0000 007F | 0xxxxxxx
-		 *    0000 0080-0000 07FF | 110xxxxx 10xxxxxx
-		 *    0000 0800-0000 FFFF | 1110xxxx 10xxxxxx 10xxxxxx
-		 *    0001 0000-0010 FFFF | 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
-		 *    ---------------------------------------------------------------------
-		 *
-		 *   ABFN notation:
-		 *   ---------------------------------------------------------------------
-		 *   UTF8-octets = *( UTF8-char )
-		 *   UTF8-char   = UTF8-1 / UTF8-2 / UTF8-3 / UTF8-4
-		 *   UTF8-1      = %x00-7F
-		 *   UTF8-2      = %xC2-DF UTF8-tail
-		 *
-		 *   UTF8-3      = %xE0 %xA0-BF UTF8-tail / %xE1-EC 2( UTF8-tail ) /
-		 *                 %xED %x80-9F UTF8-tail / %xEE-EF 2( UTF8-tail )
-		 *   UTF8-4      = %xF0 %x90-BF 2( UTF8-tail ) / %xF1-F3 3( UTF8-tail ) /
-		 *                 %xF4 %x80-8F 2( UTF8-tail )
-		 *   UTF8-tail   = %x80-BF
-		 *   ---------------------------------------------------------------------
-		 * </pre>
-		 * @param string $str string to process.
-		 * @return array containing codepoints (UTF-8 characters values)
-		 * @access protected
-		 * @author Nicola Asuni
-		 * @since 1.53.0.TC005 (2005-01-05)
-		 */
-		protected function UTF8StringToArray($str) {
-			if (isset($this->cache_UTF8StringToArray['_'.$str])) {
-				// return cached value
-				return($this->cache_UTF8StringToArray['_'.$str]);
-			}
-			// check cache size
-			if ($this->cache_size_UTF8StringToArray >= $this->cache_maxsize_UTF8StringToArray) {
-				// remove first element
-				array_shift($this->cache_UTF8StringToArray);
-			}
-			++$this->cache_size_UTF8StringToArray;
-			if (!$this->isunicode) {
-				// split string into array of equivalent codes
-				$strarr = array();
-				$strlen = strlen($str);
-				for ($i=0; $i < $strlen; ++$i) {
-					$strarr[] = ord($str{$i});
-				}
-				// insert new value on cache
-				$this->cache_UTF8StringToArray['_'.$str] = $strarr;
-				return $strarr;
-			}
-			$unicode = array(); // array containing unicode values
-			$bytes  = array(); // array containing single character byte sequences
-			$numbytes  = 1; // number of octetc needed to represent the UTF-8 character
-			$str .= ''; // force $str to be a string
-			$length = strlen($str);
-			for ($i = 0; $i < $length; ++$i) {
-				$char = ord($str{$i}); // get one string character at time
-				if (count($bytes) == 0) { // get starting octect
-					if ($char <= 0x7F) {
-						$unicode[] = $char; // use the character "as is" because is ASCII
-						$numbytes = 1;
-					} elseif (($char >> 0x05) == 0x06) { // 2 bytes character (0x06 = 110 BIN)
-						$bytes[] = ($char - 0xC0) << 0x06;
-						$numbytes = 2;
-					} elseif (($char >> 0x04) == 0x0E) { // 3 bytes character (0x0E = 1110 BIN)
-						$bytes[] = ($char - 0xE0) << 0x0C;
-						$numbytes = 3;
-					} elseif (($char >> 0x03) == 0x1E) { // 4 bytes character (0x1E = 11110 BIN)
-						$bytes[] = ($char - 0xF0) << 0x12;
-						$numbytes = 4;
-					} else {
-						// use replacement character for other invalid sequences
-						$unicode[] = 0xFFFD;
-						$bytes = array();
-						$numbytes = 1;
-					}
-				} elseif (($char >> 0x06) == 0x02) { // bytes 2, 3 and 4 must start with 0x02 = 10 BIN
-					$bytes[] = $char - 0x80;
-					if (count($bytes) == $numbytes) {
-						// compose UTF-8 bytes to a single unicode value
-						$char = $bytes[0];
-						for ($j = 1; $j < $numbytes; ++$j) {
-							$char += ($bytes[$j] << (($numbytes - $j - 1) * 0x06));
-						}
-						if ((($char >= 0xD800) AND ($char <= 0xDFFF)) OR ($char >= 0x10FFFF)) {
-							/* The definition of UTF-8 prohibits encoding character numbers between
-							U+D800 and U+DFFF, which are reserved for use with the UTF-16
-							encoding form (as surrogate pairs) and do not directly represent
-							characters. */
-							$unicode[] = 0xFFFD; // use replacement character
-						} else {
-							$unicode[] = $char; // add char to array
-						}
-						// reset data for next char
-						$bytes = array();
-						$numbytes = 1;
-					}
-				} else {
-					// use replacement character for other invalid sequences
-					$unicode[] = 0xFFFD;
-					$bytes = array();
-					$numbytes = 1;
-				}
-			}
-			// insert new value on cache
-			$this->cache_UTF8StringToArray['_'.$str] = $unicode;
-			return $unicode;
-		}
-
-		/**
-		 * Converts UTF-8 strings to UTF16-BE.<br>
-		 * @param string $str string to process.
-		 * @param boolean $setbom if true set the Byte Order Mark (BOM = 0xFEFF)
-		 * @return string
-		 * @access protected
-		 * @author Nicola Asuni
-		 * @since 1.53.0.TC005 (2005-01-05)
-		 * @uses UTF8StringToArray(), arrUTF8ToUTF16BE()
-		 */
-		protected function UTF8ToUTF16BE($str, $setbom=true) {
-			if (!$this->isunicode) {
-				return $str; // string is not in unicode
-			}
-			$unicode = $this->UTF8StringToArray($str); // array containing UTF-8 unicode values
-			return $this->arrUTF8ToUTF16BE($unicode, $setbom);
-		}
-
-		/**
-		 * Converts UTF-8 strings to Latin1 when using the standard 14 core fonts.<br>
-		 * @param string $str string to process.
-		 * @return string
-		 * @author Andrew Whitehead, Nicola Asuni
-		 * @access protected
-		 * @since 3.2.000 (2008-06-23)
-		 */
-		protected function UTF8ToLatin1($str) {
-			global $utf8tolatin;
-			if (!$this->isunicode) {
-				return $str; // string is not in unicode
-			}
-			$outstr = ''; // string to be returned
-			$unicode = $this->UTF8StringToArray($str); // array containing UTF-8 unicode values
-			foreach ($unicode as $char) {
-				if ($char < 256) {
-					$outstr .= chr($char);
-				} elseif (array_key_exists($char, $utf8tolatin)) {
-					// map from UTF-8
-					$outstr .= chr($utf8tolatin[$char]);
-				} elseif ($char == 0xFFFD) {
-					// skip
-				} else {
-					$outstr .= '?';
-				}
-			}
-			return $outstr;
-		}
-
-		/**
-		 * Converts UTF-8 characters array to array of Latin1 characters<br>
-		 * @param array $unicode array containing UTF-8 unicode values
-		 * @return array
-		 * @author Nicola Asuni
-		 * @access protected
-		 * @since 4.8.023 (2010-01-15)
-		 */
-		protected function UTF8ArrToLatin1($unicode) {
-			global $utf8tolatin;
-			if ((!$this->isunicode) OR ($this->CurrentFont['type'] == 'TrueTypeUnicode') OR ($this->CurrentFont['type'] == 'cidfont0')) {
-				return $unicode; // string is not in unicode
-			}
-			$outarr = array(); // array to be returned
-			foreach ($unicode as $char) {
-				if ($char < 256) {
-					$outarr[] = $char;
-				} elseif (array_key_exists($char, $utf8tolatin)) {
-					// map from UTF-8
-					$outarr[] = $utf8tolatin[$char];
-				} elseif ($char == 0xFFFD) {
-					// skip
-				} else {
-					$outarr[] = 63; // '?' character
-				}
-			}
-			return $outarr;
-		}
-
-		/**
-		 * Converts array of UTF-8 characters to UTF16-BE string.<br>
-		 * Based on: http://www.faqs.org/rfcs/rfc2781.html
-	 	 * <pre>
-		 *   Encoding UTF-16:
-		 *
- 		 *   Encoding of a single character from an ISO 10646 character value to
-		 *    UTF-16 proceeds as follows. Let U be the character number, no greater
-		 *    than 0x10FFFF.
-		 *
-		 *    1) If U < 0x10000, encode U as a 16-bit unsigned integer and
-		 *       terminate.
-		 *
-		 *    2) Let U' = U - 0x10000. Because U is less than or equal to 0x10FFFF,
-		 *       U' must be less than or equal to 0xFFFFF. That is, U' can be
-		 *       represented in 20 bits.
-		 *
-		 *    3) Initialize two 16-bit unsigned integers, W1 and W2, to 0xD800 and
-		 *       0xDC00, respectively. These integers each have 10 bits free to
-		 *       encode the character value, for a total of 20 bits.
-		 *
-		 *    4) Assign the 10 high-order bits of the 20-bit U' to the 10 low-order
-		 *       bits of W1 and the 10 low-order bits of U' to the 10 low-order
-		 *       bits of W2. Terminate.
-		 *
-		 *    Graphically, steps 2 through 4 look like:
-		 *    U' = yyyyyyyyyyxxxxxxxxxx
-		 *    W1 = 110110yyyyyyyyyy
-		 *    W2 = 110111xxxxxxxxxx
-		 * </pre>
-		 * @param array $unicode array containing UTF-8 unicode values
-		 * @param boolean $setbom if true set the Byte Order Mark (BOM = 0xFEFF)
-		 * @return string
-		 * @access protected
-		 * @author Nicola Asuni
-		 * @since 2.1.000 (2008-01-08)
-		 * @see UTF8ToUTF16BE()
-		 */
-		protected function arrUTF8ToUTF16BE($unicode, $setbom=true) {
-			$outstr = ''; // string to be returned
-			if ($setbom) {
-				$outstr .= "\xFE\xFF"; // Byte Order Mark (BOM)
-			}
-			foreach ($unicode as $char) {
-				if ($char == 0xFFFD) {
-					$outstr .= "\xFF\xFD"; // replacement character
-				} elseif ($char < 0x10000) {
-					$outstr .= chr($char >> 0x08);
-					$outstr .= chr($char & 0xFF);
-				} else {
-					$char -= 0x10000;
-					$w1 = 0xD800 | ($char >> 0x10);
-					$w2 = 0xDC00 | ($char & 0x3FF);
-					$outstr .= chr($w1 >> 0x08);
-					$outstr .= chr($w1 & 0xFF);
-					$outstr .= chr($w2 >> 0x08);
-					$outstr .= chr($w2 & 0xFF);
-				}
-			}
-			return $outstr;
-		}
-		// ====================================================
-
-		/**
-	 	 * Set header font.
-		 * @param array $font font
-		 * @access public
-		 * @since 1.1
-		 */
-		public function setHeaderFont($font) {
-			$this->header_font = $font;
-		}
-
-		/**
-	 	 * Get header font.
-	 	 * @return array()
-		 * @access public
-		 * @since 4.0.012 (2008-07-24)
-		 */
-		public function getHeaderFont() {
-			return $this->header_font;
-		}
-
-		/**
-	 	 * Set footer font.
-		 * @param array $font font
-		 * @access public
-		 * @since 1.1
-		 */
-		public function setFooterFont($font) {
-			$this->footer_font = $font;
-		}
-
-		/**
-	 	 * Get Footer font.
-	 	 * @return array()
-		 * @access public
-		 * @since 4.0.012 (2008-07-24)
-		 */
-		public function getFooterFont() {
-			return $this->footer_font;
-		}
-
-		/**
-	 	 * Set language array.
-		 * @param array $language
-		 * @access public
-		 * @since 1.1
-		 */
-		public function setLanguageArray($language) {
-			$this->l = $language;
-			if (isset($this->l['a_meta_dir'])) {
-				$this->rtl = $this->l['a_meta_dir']=='rtl' ? true : false;
-			} else {
-				$this->rtl = false;
-			}
-		}
-
-		/**
-		 * Returns the PDF data.
-		 * @access public
-		 */
-		public function getPDFData() {
-			if ($this->state < 3) {
-				$this->Close();
-			}
-			return $this->buffer;
-		}
-
-		/**
-		 * Output anchor link.
-		 * @param string $url link URL or internal link (i.e.: &lt;a href="#23"&gt;link to page 23&lt;/a&gt;)
-		 * @param string $name link name
-		 * @param int $fill Indicates if the cell background must be painted (1) or transparent (0). Default value: 0.
-		 * @param boolean $firstline if true prints only the first line and return the remaining string.
-		 * @param array $color array of RGB text color
-		 * @param string $style font style (U, D, B, I)
-		 * @param boolean $firstblock if true the string is the starting of a line.
-		 * @return the number of cells used or the remaining text if $firstline = true;
-		 * @access public
-		 */
-		public function addHtmlLink($url, $name, $fill=0, $firstline=false, $color='', $style=-1, $firstblock=false) {
-			if (!$this->empty_string($url) AND ($url{0} == '#')) {
-				// convert url to internal link
-				$page = intval(substr($url, 1));
-				$url = $this->AddLink();
-				$this->SetLink($url, 0, $page);
-			}
-			// store current settings
-			$prevcolor = $this->fgcolor;
-			$prevstyle = $this->FontStyle;
-			if (empty($color)) {
-				$this->SetTextColorArray($this->htmlLinkColorArray);
-			} else {
-				$this->SetTextColorArray($color);
-			}
-			if ($style == -1) {
-				$this->SetFont('', $this->FontStyle.$this->htmlLinkFontStyle);
-			} else {
-				$this->SetFont('', $this->FontStyle.$style);
-			}
-			$ret = $this->Write($this->lasth, $name, $url, $fill, '', false, 0, $firstline, $firstblock, 0);
-			// restore settings
-			$this->SetFont('', $prevstyle);
-			$this->SetTextColorArray($prevcolor);
-			return $ret;
-		}
-
-		/**
-		 * Returns an associative array (keys: R,G,B) from an html color name or a six-digit or three-digit hexadecimal color representation (i.e. #3FE5AA or #7FF).
-		 * @param string $color html color
-		 * @return array RGB color or false in case of error.
-		 * @access public
-		 */
-		public function convertHTMLColorToDec($color='#FFFFFF') {
-			global $webcolor;
-			$returncolor = false;
-			$color = preg_replace('/[\s]*/', '', $color); // remove extra spaces
-			$color = strtolower($color);
-			if (($dotpos = strpos($color, '.')) !== false) {
-				// remove class parent (i.e.: color.red)
-				$color = substr($color, ($dotpos + 1));
-			}
-			if (strlen($color) == 0) {
-				return false;
-			}
-			if (substr($color, 0, 3) == 'rgb') {
-				$codes = substr($color, 4);
-				$codes = str_replace(')', '', $codes);
-				$returncolor = explode(',', $codes, 3);
-				return $returncolor;
-			}
-			if (substr($color, 0, 1) != '#') {
-				// decode color name
-				if (isset($webcolor[$color])) {
-					$color_code = $webcolor[$color];
-				} else {
-					return false;
-				}
-			} else {
-				$color_code = substr($color, 1);
-			}
-			switch (strlen($color_code)) {
-				case 3: {
-					// three-digit hexadecimal representation
-					$r = substr($color_code, 0, 1);
-					$g = substr($color_code, 1, 1);
-					$b = substr($color_code, 2, 1);
-					$returncolor['R'] = hexdec($r.$r);
-					$returncolor['G'] = hexdec($g.$g);
-					$returncolor['B'] = hexdec($b.$b);
-					break;
-				}
-				case 6: {
-					// six-digit hexadecimal representation
-					$returncolor['R'] = hexdec(substr($color_code, 0, 2));
-					$returncolor['G'] = hexdec(substr($color_code, 2, 2));
-					$returncolor['B'] = hexdec(substr($color_code, 4, 2));
-					break;
-				}
-			}
-			return $returncolor;
-		}
-
-		/**
-		 * Converts pixels to User's Units.
-		 * @param int $px pixels
-		 * @return float value in user's unit
-		 * @access public
-		 * @see setImageScale(), getImageScale()
-		 */
-		public function pixelsToUnits($px) {
-			return ($px / ($this->imgscale * $this->k));
-		}
-
-		/**
-		 * Reverse function for htmlentities.
-		 * Convert entities in UTF-8.
-		 * @param $text_to_convert Text to convert.
-		 * @return string converted
-		 * @access public
-		 */
-		public function unhtmlentities($text_to_convert) {
-			return html_entity_decode($text_to_convert, ENT_QUOTES, $this->encoding);
-		}
-
-		// ENCRYPTION METHODS ----------------------------------
-		// SINCE 2.0.000 (2008-01-02)
-
-		/**
-		 * Compute encryption key depending on object number where the encrypted data is stored
-		 * @param int $n object number
-		 * @access protected
-		 * @since 2.0.000 (2008-01-02)
-		 */
-		protected function _objectkey($n) {
-			return substr($this->_md5_16($this->encryption_key.pack('VXxx', $n)), 0, 10);
-		}
-
-		/**
-		 * Put encryption on PDF document.
-		 * @access protected
-		 * @since 2.0.000 (2008-01-02)
-		 */
-		protected function _putencryption() {
-			if (!$this->encrypted) {
-				return;
-			}
-			$this->_newobj();
-			$this->enc_obj_id = $this->n;
-			$out = '<< /Filter /Standard /V 1 /R 2';
-			$out .= ' /O ('.$this->_escape($this->Ovalue).')';
-			$out .= ' /U ('.$this->_escape($this->Uvalue).')';
-			$out .= ' /P '.$this->Pvalue;
-			$out .= ' >> endobj';
-			$this->_out($out);
-		}
-
-		/**
-		 * Returns the input text exrypted using RC4 algorithm and the specified key.
-		 * RC4 is the standard encryption algorithm used in PDF format
-		 * @param string $key encryption key
-		 * @param String $text input text to be encrypted
-		 * @return String encrypted text
-		 * @access protected
-		 * @since 2.0.000 (2008-01-02)
-		 * @author Klemen Vodopivec
-		 */
-		protected function _RC4($key, $text) {
-			if ($this->last_rc4_key != $key) {
-				$k = str_repeat($key, ((256 / strlen($key)) + 1));
-				$rc4 = range(0, 255);
-				$j = 0;
-				for ($i = 0; $i < 256; ++$i) {
-					$t = $rc4[$i];
-					$j = ($j + $t + ord($k{$i})) % 256;
-					$rc4[$i] = $rc4[$j];
-					$rc4[$j] = $t;
-				}
-				$this->last_rc4_key = $key;
-				$this->last_rc4_key_c = $rc4;
-			} else {
-				$rc4 = $this->last_rc4_key_c;
-			}
-			$len = strlen($text);
-			$a = 0;
-			$b = 0;
-			$out = '';
-			for ($i = 0; $i < $len; ++$i) {
-				$a = ($a + 1) % 256;
-				$t = $rc4[$a];
-				$b = ($b + $t) % 256;
-				$rc4[$a] = $rc4[$b];
-				$rc4[$b] = $t;
-				$k = $rc4[($rc4[$a] + $rc4[$b]) % 256];
-				$out .= chr(ord($text{$i}) ^ $k);
-			}
-			return $out;
-		}
-
-		/**
-		 * Encrypts a string using MD5 and returns it's value as a binary string.
-		 * @param string $str input string
-		 * @return String MD5 encrypted binary string
-		 * @access protected
-		 * @since 2.0.000 (2008-01-02)
-		 * @author Klemen Vodopivec
-		 */
-		protected function _md5_16($str) {
-			return pack('H*', md5($str));
-		}
-
-		/**
-		 * Compute O value (used for RC4 encryption)
-		 * @param String $user_pass user password
-		 * @param String $owner_pass user password
-		 * @return String O value
-		 * @access protected
-		 * @since 2.0.000 (2008-01-02)
-		 * @author Klemen Vodopivec
-		 */
-		protected function _Ovalue($user_pass, $owner_pass) {
-			$tmp = $this->_md5_16($owner_pass);
-			$owner_RC4_key = substr($tmp, 0, 5);
-			return $this->_RC4($owner_RC4_key, $user_pass);
-		}
-
-		/**
-		 * Compute U value (used for RC4 encryption)
-		 * @return String U value
-		 * @access protected
-		 * @since 2.0.000 (2008-01-02)
-		 * @author Klemen Vodopivec
-		 */
-		protected function _Uvalue() {
-			return $this->_RC4($this->encryption_key, $this->padding);
-		}
-
-		/**
-		 * Compute encryption key
-		 * @param String $user_pass user password
-		 * @param String $owner_pass user password
-		 * @param String $protection protection type
-		 * @access protected
-		 * @since 2.0.000 (2008-01-02)
-		 * @author Klemen Vodopivec
-		 */
-		protected function _generateencryptionkey($user_pass, $owner_pass, $protection) {
-			// Pad passwords
-			$user_pass = substr($user_pass.$this->padding, 0, 32);
-			$owner_pass = substr($owner_pass.$this->padding, 0, 32);
-			// Compute O value
-			$this->Ovalue = $this->_Ovalue($user_pass, $owner_pass);
-			// Compute encyption key
-			$tmp = $this->_md5_16($user_pass.$this->Ovalue.chr($protection)."\xFF\xFF\xFF");
-			$this->encryption_key = substr($tmp, 0, 5);
-			// Compute U value
-			$this->Uvalue = $this->_Uvalue();
-			// Compute P value
-			$this->Pvalue = -(($protection^255) + 1);
-		}
-
-		/**
-		 * Set document protection
-		 * The permission array is composed of values taken from the following ones:
-		 * - copy: copy text and images to the clipboard
-		 * - print: print the document
-		 * - modify: modify it (except for annotations and forms)
-		 * - annot-forms: add annotations and forms
-		 * Remark: the protection against modification is for people who have the full Acrobat product.
-		 * If you don't set any password, the document will open as usual. If you set a user password, the PDF viewer will ask for it before displaying the document. The master password, if different from the user one, can be used to get full access.
-		 * Note: protecting a document requires to encrypt it, which increases the processing time a lot. This can cause a PHP time-out in some cases, especially if the document contains images or fonts.
-		 * @param Array $permissions the set of permissions. Empty by default (only viewing is allowed). (print, modify, copy, annot-forms)
-		 * @param String $user_pass user password. Empty by default.
-		 * @param String $owner_pass owner password. If not specified, a random value is used.
-		 * @access public
-		 * @since 2.0.000 (2008-01-02)
-		 * @author Klemen Vodopivec
-		 */
-		public function SetProtection($permissions=array(), $user_pass='', $owner_pass=null) {
-			$options = array('print' => 4, 'modify' => 8, 'copy' => 16, 'annot-forms' => 32);
-			$protection = 192;
-			foreach ($permissions as $permission) {
-				if (!isset($options[$permission])) {
-					$this->Error('Incorrect permission: '.$permission);
-				}
-				$protection += $options[$permission];
-			}
-			if ($owner_pass === null) {
-				$owner_pass = uniqid(rand());
-			}
-			$this->encrypted = true;
-			$this->_generateencryptionkey($user_pass, $owner_pass, $protection);
-		}
-
-		// END OF ENCRYPTION FUNCTIONS -------------------------
-
-		// START TRANSFORMATIONS SECTION -----------------------
-
-		/**
-		 * Starts a 2D tranformation saving current graphic state.
-		 * This function must be called before scaling, mirroring, translation, rotation and skewing.
-		 * Use StartTransform() before, and StopTransform() after the transformations to restore the normal behavior.
-		 * @access public
-		 * @since 2.1.000 (2008-01-07)
-		 * @see StartTransform(), StopTransform()
-		 */
-		public function StartTransform() {
-			$this->_out('q');
-			$this->transfmrk[$this->page][] = $this->pagelen[$this->page];
-			++$this->transfmatrix_key;
-			$this->transfmatrix[$this->transfmatrix_key] = array();
-		}
-
-		/**
-		 * Stops a 2D tranformation restoring previous graphic state.
-		 * This function must be called after scaling, mirroring, translation, rotation and skewing.
-		 * Use StartTransform() before, and StopTransform() after the transformations to restore the normal behavior.
-		 * @access public
-		 * @since 2.1.000 (2008-01-07)
-		 * @see StartTransform(), StopTransform()
-		 */
-		public function StopTransform() {
-			$this->_out('Q');
-			if (isset($this->transfmatrix[$this->transfmatrix_key])) {
-				array_pop($this->transfmatrix[$this->transfmatrix_key]);
-				--$this->transfmatrix_key;
-			}
-			array_pop($this->transfmrk[$this->page]);
-		}
-		/**
-		 * Horizontal Scaling.
-		 * @param float $s_x scaling factor for width as percent. 0 is not allowed.
-		 * @param int $x abscissa of the scaling center. Default is current x position
-		 * @param int $y ordinate of the scaling center. Default is current y position
-		 * @access public
-		 * @since 2.1.000 (2008-01-07)
-		 * @see StartTransform(), StopTransform()
-		 */
-		public function ScaleX($s_x, $x='', $y='') {
-			$this->Scale($s_x, 100, $x, $y);
-		}
-
-		/**
-		 * Vertical Scaling.
-		 * @param float $s_y scaling factor for height as percent. 0 is not allowed.
-		 * @param int $x abscissa of the scaling center. Default is current x position
-		 * @param int $y ordinate of the scaling center. Default is current y position
-		 * @access public
-		 * @since 2.1.000 (2008-01-07)
-		 * @see StartTransform(), StopTransform()
-		 */
-		public function ScaleY($s_y, $x='', $y='') {
-			$this->Scale(100, $s_y, $x, $y);
-		}
-
-		/**
-		 * Vertical and horizontal proportional Scaling.
-		 * @param float $s scaling factor for width and height as percent. 0 is not allowed.
-		 * @param int $x abscissa of the scaling center. Default is current x position
-		 * @param int $y ordinate of the scaling center. Default is current y position
-		 * @access public
-		 * @since 2.1.000 (2008-01-07)
-		 * @see StartTransform(), StopTransform()
-		 */
-		public function ScaleXY($s, $x='', $y='') {
-			$this->Scale($s, $s, $x, $y);
-		}
-
-		/**
-		 * Vertical and horizontal non-proportional Scaling.
-		 * @param float $s_x scaling factor for width as percent. 0 is not allowed.
-		 * @param float $s_y scaling factor for height as percent. 0 is not allowed.
-		 * @param int $x abscissa of the scaling center. Default is current x position
-		 * @param int $y ordinate of the scaling center. Default is current y position
-		 * @access public
-		 * @since 2.1.000 (2008-01-07)
-		 * @see StartTransform(), StopTransform()
-		 */
-		public function Scale($s_x, $s_y, $x='', $y='') {
-			if ($x === '') {
-				$x = $this->x;
-			}
-			if ($y === '') {
-				$y = $this->y;
-			}
-			if (($s_x == 0) OR ($s_y == 0)) {
-				$this->Error('Please do not use values equal to zero for scaling');
-			}
-			$y = ($this->h - $y) * $this->k;
-			$x *= $this->k;
-			//calculate elements of transformation matrix
-			$s_x /= 100;
-			$s_y /= 100;
-			$tm[0] = $s_x;
-			$tm[1] = 0;
-			$tm[2] = 0;
-			$tm[3] = $s_y;
-			$tm[4] = $x * (1 - $s_x);
-			$tm[5] = $y * (1 - $s_y);
-			//scale the coordinate system
-			$this->Transform($tm);
-		}
-
-		/**
-		 * Horizontal Mirroring.
-		 * @param int $x abscissa of the point. Default is current x position
-		 * @access public
-		 * @since 2.1.000 (2008-01-07)
-		 * @see StartTransform(), StopTransform()
-		 */
-		public function MirrorH($x='') {
-			$this->Scale(-100, 100, $x);
-		}
-
-		/**
-		 * Verical Mirroring.
-		 * @param int $y ordinate of the point. Default is current y position
-		 * @access public
-		 * @since 2.1.000 (2008-01-07)
-		 * @see StartTransform(), StopTransform()
-		 */
-		public function MirrorV($y='') {
-			$this->Scale(100, -100, '', $y);
-		}
-
-		/**
-		 * Point reflection mirroring.
-		 * @param int $x abscissa of the point. Default is current x position
-		 * @param int $y ordinate of the point. Default is current y position
-		 * @access public
-		 * @since 2.1.000 (2008-01-07)
-		 * @see StartTransform(), StopTransform()
-		 */
-		public function MirrorP($x='',$y='') {
-			$this->Scale(-100, -100, $x, $y);
-		}
-
-		/**
-		 * Reflection against a straight line through point (x, y) with the gradient angle (angle).
-		 * @param float $angle gradient angle of the straight line. Default is 0 (horizontal line).
-		 * @param int $x abscissa of the point. Default is current x position
-		 * @param int $y ordinate of the point. Default is current y position
-		 * @access public
-		 * @since 2.1.000 (2008-01-07)
-		 * @see StartTransform(), StopTransform()
-		 */
-		public function MirrorL($angle=0, $x='',$y='') {
-			$this->Scale(-100, 100, $x, $y);
-			$this->Rotate(-2*($angle-90), $x, $y);
-		}
-
-		/**
-		 * Translate graphic object horizontally.
-		 * @param int $t_x movement to the right (or left for RTL)
-		 * @access public
-		 * @since 2.1.000 (2008-01-07)
-		 * @see StartTransform(), StopTransform()
-		 */
-		public function TranslateX($t_x) {
-			$this->Translate($t_x, 0);
-		}
-
-		/**
-		 * Translate graphic object vertically.
-		 * @param int $t_y movement to the bottom
-		 * @access public
-		 * @since 2.1.000 (2008-01-07)
-		 * @see StartTransform(), StopTransform()
-		 */
-		public function TranslateY($t_y) {
-			$this->Translate(0, $t_y);
-		}
-
-		/**
-		 * Translate graphic object horizontally and vertically.
-		 * @param int $t_x movement to the right
-		 * @param int $t_y movement to the bottom
-		 * @access public
-		 * @since 2.1.000 (2008-01-07)
-		 * @see StartTransform(), StopTransform()
-		 */
-		public function Translate($t_x, $t_y) {
-			//calculate elements of transformation matrix
-			$tm[0] = 1;
-			$tm[1] = 0;
-			$tm[2] = 0;
-			$tm[3] = 1;
-			$tm[4] = $t_x * $this->k;
-			$tm[5] = -$t_y * $this->k;
-			//translate the coordinate system
-			$this->Transform($tm);
-		}
-
-		/**
-		 * Rotate object.
-		 * @param float $angle angle in degrees for counter-clockwise rotation
-		 * @param int $x abscissa of the rotation center. Default is current x position
-		 * @param int $y ordinate of the rotation center. Default is current y position
-		 * @access public
-		 * @since 2.1.000 (2008-01-07)
-		 * @see StartTransform(), StopTransform()
-		 */
-		public function Rotate($angle, $x='', $y='') {
-			if ($x === '') {
-				$x = $this->x;
-			}
-			if ($y === '') {
-				$y = $this->y;
-			}
-			$y = ($this->h - $y) * $this->k;
-			$x *= $this->k;
-			//calculate elements of transformation matrix
-			$tm[0] = cos(deg2rad($angle));
-			$tm[1] = sin(deg2rad($angle));
-			$tm[2] = -$tm[1];
-			$tm[3] = $tm[0];
-			$tm[4] = $x + ($tm[1] * $y) - ($tm[0] * $x);
-			$tm[5] = $y - ($tm[0] * $y) - ($tm[1] * $x);
-			//rotate the coordinate system around ($x,$y)
-			$this->Transform($tm);
-		}
-
-		/**
-		 * Skew horizontally.
-		 * @param float $angle_x angle in degrees between -90 (skew to the left) and 90 (skew to the right)
-		 * @param int $x abscissa of the skewing center. default is current x position
-		 * @param int $y ordinate of the skewing center. default is current y position
-		 * @access public
-		 * @since 2.1.000 (2008-01-07)
-		 * @see StartTransform(), StopTransform()
-		 */
-		public function SkewX($angle_x, $x='', $y='') {
-			$this->Skew($angle_x, 0, $x, $y);
-		}
-
-		/**
-		 * Skew vertically.
-		 * @param float $angle_y angle in degrees between -90 (skew to the bottom) and 90 (skew to the top)
-		 * @param int $x abscissa of the skewing center. default is current x position
-		 * @param int $y ordinate of the skewing center. default is current y position
-		 * @access public
-		 * @since 2.1.000 (2008-01-07)
-		 * @see StartTransform(), StopTransform()
-		 */
-		public function SkewY($angle_y, $x='', $y='') {
-			$this->Skew(0, $angle_y, $x, $y);
-		}
-
-		/**
-		 * Skew.
-		 * @param float $angle_x angle in degrees between -90 (skew to the left) and 90 (skew to the right)
-		 * @param float $angle_y angle in degrees between -90 (skew to the bottom) and 90 (skew to the top)
-		 * @param int $x abscissa of the skewing center. default is current x position
-		 * @param int $y ordinate of the skewing center. default is current y position
-		 * @access public
-		 * @since 2.1.000 (2008-01-07)
-		 * @see StartTransform(), StopTransform()
-		 */
-		public function Skew($angle_x, $angle_y, $x='', $y='') {
-			if ($x === '') {
-				$x = $this->x;
-			}
-			if ($y === '') {
-				$y = $this->y;
-			}
-			if (($angle_x <= -90) OR ($angle_x >= 90) OR ($angle_y <= -90) OR ($angle_y >= 90)) {
-				$this->Error('Please use values between -90 and +90 degrees for Skewing.');
-			}
-			$x *= $this->k;
-			$y = ($this->h - $y) * $this->k;
-			//calculate elements of transformation matrix
-			$tm[0] = 1;
-			$tm[1] = tan(deg2rad($angle_y));
-			$tm[2] = tan(deg2rad($angle_x));
-			$tm[3] = 1;
-			$tm[4] = -$tm[2] * $y;
-			$tm[5] = -$tm[1] * $x;
-			//skew the coordinate system
-			$this->Transform($tm);
-		}
-
-		/**
-		 * Apply graphic transformations.
-		 * @param array $tm transformation matrix
-		 * @access protected
-		 * @since 2.1.000 (2008-01-07)
-		 * @see StartTransform(), StopTransform()
-		 */
-		protected function Transform($tm) {
-			$this->_out(sprintf('%.3F %.3F %.3F %.3F %.3F %.3F cm', $tm[0], $tm[1], $tm[2], $tm[3], $tm[4], $tm[5]));
-			// add tranformation matrix
-			$this->transfmatrix[$this->transfmatrix_key][] = array('a' => $tm[0], 'b' => $tm[1], 'c' => $tm[2], 'd' => $tm[3], 'e' => $tm[4], 'f' => $tm[5]);
-			// update tranformation mark
-			if (end($this->transfmrk[$this->page]) !== false) {
-				$key = key($this->transfmrk[$this->page]);
-				$this->transfmrk[$this->page][$key] = $this->pagelen[$this->page];
-			}
-		}
-
-		// END TRANSFORMATIONS SECTION -------------------------
-
-
-		// START GRAPHIC FUNCTIONS SECTION ---------------------
-		// The following section is based on the code provided by David Hernandez Sanz
-
-		/**
-		 * Defines the line width. By default, the value equals 0.2 mm. The method can be called before the first page is created and the value is retained from page to page.
-		 * @param float $width The width.
-		 * @access public
-		 * @since 1.0
-		 * @see Line(), Rect(), Cell(), MultiCell()
-		 */
-		public function SetLineWidth($width) {
-			//Set line width
-			$this->LineWidth = $width;
-			$this->linestyleWidth = sprintf('%.2F w', ($width * $this->k));
-			if ($this->page > 0) {
-				$this->_out($this->linestyleWidth);
-			}
-		}
-
-		/**
-		 * Returns the current the line width.
-		 * @return int Line width
-		 * @access public
-		 * @since 2.1.000 (2008-01-07)
-		 * @see Line(), SetLineWidth()
-		 */
-		public function GetLineWidth() {
-			return $this->LineWidth;
-		}
-
-		/**
-		 * Set line style.
-		 * @param array $style Line style. Array with keys among the following:
-		 * <ul>
-		 *	 <li>width (float): Width of the line in user units.</li>
-		 *	 <li>cap (string): Type of cap to put on the line. Possible values are:
-		 * butt, round, square. The difference between "square" and "butt" is that
-		 * "square" projects a flat end past the end of the line.</li>
-		 *	 <li>join (string): Type of join. Possible values are: miter, round,
-		 * bevel.</li>
-		 *	 <li>dash (mixed): Dash pattern. Is 0 (without dash) or string with
-		 * series of length values, which are the lengths of the on and off dashes.
-		 * For example: "2" represents 2 on, 2 off, 2 on, 2 off, ...; "2,1" is 2 on,
-		 * 1 off, 2 on, 1 off, ...</li>
-		 *	 <li>phase (integer): Modifier on the dash pattern which is used to shift
-		 * the point at which the pattern starts.</li>
-		 *	 <li>color (array): Draw color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K).</li>
-		 * </ul>
-		 * @access public
-		 * @since 2.1.000 (2008-01-08)
-		 */
-		public function SetLineStyle($style) {
-			if (!is_array($style)) {
-				return;
-			}
-			extract($style);
-			if (isset($width)) {
-				$width_prev = $this->LineWidth;
-				$this->SetLineWidth($width);
-				$this->LineWidth = $width_prev;
-			}
-			if (isset($cap)) {
-				$ca = array('butt' => 0, 'round'=> 1, 'square' => 2);
-				if (isset($ca[$cap])) {
-					$this->linestyleCap = $ca[$cap].' J';
-					$this->_out($this->linestyleCap);
-				}
-			}
-			if (isset($join)) {
-				$ja = array('miter' => 0, 'round' => 1, 'bevel' => 2);
-				if (isset($ja[$join])) {
-					$this->linestyleJoin = $ja[$join].' j';
-					$this->_out($this->linestyleJoin);
-				}
-			}
-			if (isset($dash)) {
-				$dash_string = '';
-				if ($dash) {
-					if (preg_match('/^.+,/', $dash) > 0) {
-						$tab = explode(',', $dash);
-					} else {
-						$tab = array($dash);
-					}
-					$dash_string = '';
-					foreach ($tab as $i => $v) {
-						if ($i) {
-							$dash_string .= ' ';
-						}
-						$dash_string .= sprintf('%.2F', $v);
-					}
-				}
-				if (!isset($phase) OR !$dash) {
-					$phase = 0;
-				}
-				$this->linestyleDash = sprintf('[%s] %.2F d', $dash_string, $phase);
-				$this->_out($this->linestyleDash);
-			}
-			if (isset($color)) {
-				$this->SetDrawColorArray($color);
-			}
-		}
-
-		/**
-		 * Begin a new subpath by moving the current point to coordinates (x, y), omitting any connecting line segment.
-		 * @param float $x Abscissa of point.
-		 * @param float $y Ordinate of point.
-		 * @access protected
-		 * @since 2.1.000 (2008-01-08)
-		 */
-		protected function _outPoint($x, $y) {
-			$this->_out(sprintf('%.2F %.2F m', $x * $this->k, ($this->h - $y) * $this->k));
-		}
-
-		/**
-		 * Append a straight line segment from the current point to the point (x, y).
-		 * The new current point shall be (x, y).
-		 * @param float $x Abscissa of end point.
-		 * @param float $y Ordinate of end point.
-		 * @access protected
-		 * @since 2.1.000 (2008-01-08)
-		 */
-		protected function _outLine($x, $y) {
-			$this->_out(sprintf('%.2F %.2F l', $x * $this->k, ($this->h - $y) * $this->k));
-		}
-
-		/**
-		 * Append a rectangle to the current path as a complete subpath, with lower-left corner (x, y) and dimensions widthand height in user space.
-		 * @param float $x Abscissa of upper-left corner (or upper-right corner for RTL language).
-		 * @param float $y Ordinate of upper-left corner (or upper-right corner for RTL language).
-		 * @param float $w Width.
-		 * @param float $h Height.
-		 * @param string $op options
-		 * @access protected
-		 * @since 2.1.000 (2008-01-08)
-		 */
-		protected function _outRect($x, $y, $w, $h, $op) {
-			$this->_out(sprintf('%.2F %.2F %.2F %.2F re %s', $x * $this->k, ($this->h - $y) * $this->k, $w * $this->k, -$h * $this->k, $op));
-		}
-
-		/**
-		 * Append a cubic B�zier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using (x1, y1) and (x2, y2) as the B�zier control points.
-		 * The new current point shall be (x3, y3).
-		 * @param float $x1 Abscissa of control point 1.
-		 * @param float $y1 Ordinate of control point 1.
-		 * @param float $x2 Abscissa of control point 2.
-		 * @param float $y2 Ordinate of control point 2.
-		 * @param float $x3 Abscissa of end point.
-		 * @param float $y3 Ordinate of end point.
-		 * @access protected
-		 * @since 2.1.000 (2008-01-08)
-		 */
-		protected function _outCurve($x1, $y1, $x2, $y2, $x3, $y3) {
-			$this->_out(sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c', $x1 * $this->k, ($this->h - $y1) * $this->k, $x2 * $this->k, ($this->h - $y2) * $this->k, $x3 * $this->k, ($this->h - $y3) * $this->k));
-		}
-
-		/**
-		 * Append a cubic B�zier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using the current point and (x2, y2) as the B�zier control points.
-		 * The new current point shall be (x3, y3).
-		 * @param float $x2 Abscissa of control point 2.
-		 * @param float $y2 Ordinate of control point 2.
-		 * @param float $x3 Abscissa of end point.
-		 * @param float $y3 Ordinate of end point.
-		 * @access protected
-		 * @since 4.9.019 (2010-04-26)
-		 */
-		protected function _outCurveV($x2, $y2, $x3, $y3) {
-			$this->_out(sprintf('%.2F %.2F %.2F %.2F v', $x2 * $this->k, ($this->h - $y2) * $this->k, $x3 * $this->k, ($this->h - $y3) * $this->k));
-		}
-
-		/**
-		 * Append a cubic B�zier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using (x1, y1) and (x3, y3) as the B�zier control points.
-		 * The new current point shall be (x3, y3).
-		 * @param float $x1 Abscissa of control point 1.
-		 * @param float $y1 Ordinate of control point 1.
-		 * @param float $x2 Abscissa of control point 2.
-		 * @param float $y2 Ordinate of control point 2.
-		 * @param float $x3 Abscissa of end point.
-		 * @param float $y3 Ordinate of end point.
-		 * @access protected
-		 * @since 2.1.000 (2008-01-08)
-		 */
-		protected function _outCurveY($x1, $y1, $x3, $y3) {
-			$this->_out(sprintf('%.2F %.2F %.2F %.2F y', $x1 * $this->k, ($this->h - $y1) * $this->k, $x3 * $this->k, ($this->h - $y3) * $this->k));
-		}
-
-		/**
-		 * Draws a line between two points.
-		 * @param float $x1 Abscissa of first point.
-		 * @param float $y1 Ordinate of first point.
-		 * @param float $x2 Abscissa of second point.
-		 * @param float $y2 Ordinate of second point.
-		 * @param array $style Line style. Array like for {@link SetLineStyle SetLineStyle}. Default value: default line style (empty array).
-		 * @access public
-		 * @since 1.0
-		 * @see SetLineWidth(), SetDrawColor(), SetLineStyle()
-		 */
-		public function Line($x1, $y1, $x2, $y2, $style=array()) {
-			if (is_array($style)) {
-				$this->SetLineStyle($style);
-			}
-			$this->_outPoint($x1, $y1);
-			$this->_outLine($x2, $y2);
-			$this->_out('S');
-		}
-
-		/**
-		 * Draws a rectangle.
-		 * @param float $x Abscissa of upper-left corner (or upper-right corner for RTL language).
-		 * @param float $y Ordinate of upper-left corner (or upper-right corner for RTL language).
-		 * @param float $w Width.
-		 * @param float $h Height.
-		 * @param string $style Style of rendering. See the getPathPaintOperator() function for more information.
-		 * @param array $border_style Border style of rectangle. Array with keys among the following:
-		 * <ul>
-		 *	 <li>all: Line style of all borders. Array like for {@link SetLineStyle SetLineStyle}.</li>
-		 *	 <li>L, T, R, B or combinations: Line style of left, top, right or bottom border. Array like for {@link SetLineStyle SetLineStyle}.</li>
-		 * </ul>
-		 * If a key is not present or is null, not draws the border. Default value: default line style (empty array).
-		 * @param array $border_style Border style of rectangle. Array like for {@link SetLineStyle SetLineStyle}. Default value: default line style (empty array).
-		 * @param array $fill_color Fill color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K). Default value: default color (empty array).
-		 * @access public
-		 * @since 1.0
-		 * @see SetLineStyle()
-		 */
-		public function Rect($x, $y, $w, $h, $style='', $border_style=array(), $fill_color=array()) {
-			if (!(false === strpos($style, 'F')) AND !empty($fill_color)) {
-				$this->SetFillColorArray($fill_color);
-			}
-			$op = $this->getPathPaintOperator($style);
-			if ((!$border_style) OR (isset($border_style['all']))) {
-				if (isset($border_style['all']) AND $border_style['all']) {
-					$this->SetLineStyle($border_style['all']);
-					$border_style = array();
-				}
-			}
-			$this->_outRect($x, $y, $w, $h, $op);
-
-			if ($border_style) {
-				$border_style2 = array();
-				foreach ($border_style as $line => $value) {
-					$length = strlen($line);
-					for ($i = 0; $i < $length; ++$i) {
-						$border_style2[$line[$i]] = $value;
-					}
-				}
-				$border_style = $border_style2;
-				if (isset($border_style['L']) AND $border_style['L']) {
-					$this->Line($x, $y, $x, $y + $h, $border_style['L']);
-				}
-				if (isset($border_style['T']) AND $border_style['T']) {
-					$this->Line($x, $y, $x + $w, $y, $border_style['T']);
-				}
-				if (isset($border_style['R']) AND $border_style['R']) {
-					$this->Line($x + $w, $y, $x + $w, $y + $h, $border_style['R']);
-				}
-				if (isset($border_style['B']) AND $border_style['B']) {
-					$this->Line($x, $y + $h, $x + $w, $y + $h, $border_style['B']);
-				}
-			}
-		}
-
-		/**
-		 * Draws a Bezier curve.
-		 * The Bezier curve is a tangent to the line between the control points at
-		 * either end of the curve.
-		 * @param float $x0 Abscissa of start point.
-		 * @param float $y0 Ordinate of start point.
-		 * @param float $x1 Abscissa of control point 1.
-		 * @param float $y1 Ordinate of control point 1.
-		 * @param float $x2 Abscissa of control point 2.
-		 * @param float $y2 Ordinate of control point 2.
-		 * @param float $x3 Abscissa of end point.
-		 * @param float $y3 Ordinate of end point.
-		 * @param string $style Style of rendering. See the getPathPaintOperator() function for more information.
-		 * @param array $line_style Line style of curve. Array like for {@link SetLineStyle SetLineStyle}. Default value: default line style (empty array).
-		 * @param array $fill_color Fill color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K). Default value: default color (empty array).
-		 * @access public
-		 * @see SetLineStyle()
-		 * @since 2.1.000 (2008-01-08)
-		 */
-		public function Curve($x0, $y0, $x1, $y1, $x2, $y2, $x3, $y3, $style='', $line_style=array(), $fill_color=array()) {
-			if (!(false === strpos($style, 'F')) AND isset($fill_color)) {
-				$this->SetFillColorArray($fill_color);
-			}
-			$op = $this->getPathPaintOperator($style);
-			if ($line_style) {
-				$this->SetLineStyle($line_style);
-			}
-			$this->_outPoint($x0, $y0);
-			$this->_outCurve($x1, $y1, $x2, $y2, $x3, $y3);
-			$this->_out($op);
-		}
-
-		/**
-		 * Draws a poly-Bezier curve.
-		 * Each Bezier curve segment is a tangent to the line between the control points at
-		 * either end of the curve.
-		 * @param float $x0 Abscissa of start point.
-		 * @param float $y0 Ordinate of start point.
-		 * @param float $segments An array of bezier descriptions. Format: array(x1, y1, x2, y2, x3, y3).
-		 * @param string $style Style of rendering. See the getPathPaintOperator() function for more information.
-		 * @param array $line_style Line style of curve. Array like for {@link SetLineStyle SetLineStyle}. Default value: default line style (empty array).
-		 * @param array $fill_color Fill color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K). Default value: default color (empty array).
-		 * @access public
-		 * @see SetLineStyle()
-		 * @since 3.0008 (2008-05-12)
-		 */
-		public function Polycurve($x0, $y0, $segments, $style='', $line_style=array(), $fill_color=array()) {
-			if (!(false === strpos($style, 'F')) AND isset($fill_color)) {
-				$this->SetFillColorArray($fill_color);
-			}
-			$op = $this->getPathPaintOperator($style);
-			if ($op == 'f') {
-				$line_style = array();
-			}
-			if ($line_style) {
-				$this->SetLineStyle($line_style);
-			}
-			$this->_outPoint($x0, $y0);
-			foreach ($segments as $segment) {
-				list($x1, $y1, $x2, $y2, $x3, $y3) = $segment;
-				$this->_outCurve($x1, $y1, $x2, $y2, $x3, $y3);
-			}
-			$this->_out($op);
-		}
-
-		/**
-		 * Draws an ellipse.
-		 * An ellipse is formed from n Bezier curves.
-		 * @param float $x0 Abscissa of center point.
-		 * @param float $y0 Ordinate of center point.
-		 * @param float $rx Horizontal radius.
-		 * @param float $ry Vertical radius (if ry = 0 then is a circle, see {@link Circle Circle}). Default value: 0.
-		 * @param float $angle: Angle oriented (anti-clockwise). Default value: 0.
-		 * @param float $astart: Angle start of draw line. Default value: 0.
-		 * @param float $afinish: Angle finish of draw line. Default value: 360.
-		 * @param string $style Style of rendering. See the getPathPaintOperator() function for more information.
-		 * @param array $line_style Line style of ellipse. Array like for {@link SetLineStyle SetLineStyle}. Default value: default line style (empty array).
-		 * @param array $fill_color Fill color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K). Default value: default color (empty array).
-		 * @param integer $nc Number of curves used to draw a 90 degrees portion of ellipse.
-		 * @author Nicola Asuni
-		 * @access public
-		 * @since 2.1.000 (2008-01-08)
-		 */
-		public function Ellipse($x0, $y0, $rx, $ry='', $angle=0, $astart=0, $afinish=360, $style='', $line_style=array(), $fill_color=array(), $nc=2) {
-			if ($this->empty_string($ry) OR ($ry == 0)) {
-				$ry = $rx;
-			}
-			if (!(false === strpos($style, 'F')) AND isset($fill_color)) {
-				$this->SetFillColorArray($fill_color);
-			}
-			$op = $this->getPathPaintOperator($style);
-			if ($op == 'f') {
-				$line_style = array();
-			}
-			if ($line_style) {
-				$this->SetLineStyle($line_style);
-			}
-			$this->_outellipticalarc($x0, $y0, $rx, $ry, $angle, $astart, $afinish, false, $nc);
-			$this->_out($op);
-		}
-
-		/**
-		 * Append an elliptical arc to the current path.
-		 * An ellipse is formed from n Bezier curves.
-		 * @param float $xc Abscissa of center point.
-		 * @param float $yc Ordinate of center point.
-		 * @param float $rx Horizontal radius.
-		 * @param float $ry Vertical radius (if ry = 0 then is a circle, see {@link Circle Circle}). Default value: 0.
-		 * @param float $xang: Angle between the X-axis and the major axis of the ellipse. Default value: 0.
-		 * @param float $angs: Angle start of draw line. Default value: 0.
-		 * @param float $angf: Angle finish of draw line. Default value: 360.
-		 * @param boolean $pie if true do not mark the border point (used to draw pie sectors).
-		 * @param integer $nc Number of curves used to draw a 90 degrees portion of ellipse.
-		 * @author Nicola Asuni
-		 * @access protected
-		 * @since 4.9.019 (2010-04-26)
-		 */
-		protected function _outellipticalarc($xc, $yc, $rx, $ry, $xang=0, $angs=0, $angf=360, $pie=false, $nc=2) {
-			$k = $this->k;
-			if ($nc < 2) {
-				$nc = 2;
-			}
-			if ($pie) {
-				// center of the arc
-				$this->_outPoint($xc, $yc);
-			}
-			$xang = deg2rad((float) $xang);
-			$angs = deg2rad((float) $angs);
-			$angf = deg2rad((float) $angf);
-			$as = atan2((sin($angs) / $ry), (cos($angs) / $rx));
-			$af = atan2((sin($angf) / $ry), (cos($angf) / $rx));
-			if ($as < 0) {
-				$as += (2 * M_PI);
-			}
-			if ($af < 0) {
-				$af += (2 * M_PI);
-			}
-			if ($as > $af) {
-				// reverse rotation go clockwise
-				$as -= (2 * M_PI);
-			}
-			$total_angle = ($af - $as);
-			if ($nc < 2) {
-				$nc = 2;
-			}
-			// total arcs to draw
-			$nc *= (2 * abs($total_angle) / M_PI);
-			$nc = round($nc) + 1;
-			// angle of each arc
-			$arcang = $total_angle / $nc;
-			// center point in PDF coordiantes
-			$x0 = $xc;
-			$y0 = ($this->h - $yc);
-			// starting angle
-			$ang = $as;
-			$alpha = sin($arcang) * ((sqrt(4 + (3 * pow(tan(($arcang) / 2), 2))) - 1) / 3);
-			$cos_xang = cos($xang);
-			$sin_xang = sin($xang);
-			$cos_ang = cos($ang);
-			$sin_ang = sin($ang);
-			// first arc point
-			$px1 = $x0 + ($rx * $cos_xang * $cos_ang) - ($ry * $sin_xang * $sin_ang);
-			$py1 = $y0 + ($rx * $sin_xang * $cos_ang) + ($ry * $cos_xang * $sin_ang);
-			// first Bezier control point
-			$qx1 = ($alpha * ((-$rx * $cos_xang * $sin_ang) - ($ry * $sin_xang * $cos_ang)));
-			$qy1 = ($alpha * ((-$rx * $sin_xang * $sin_ang) + ($ry * $cos_xang * $cos_ang)));
-			if ($pie) {
-				$this->_outLine($px1, $this->h - $py1);
-			} else {
-				$this->_outPoint($px1, $this->h - $py1);
-			}
-			// draw arcs
-			for ($i = 1; $i <= $nc; ++$i) {
-				// starting angle
-				$ang = $as + ($i * $arcang);
-				$cos_xang = cos($xang);
-				$sin_xang = sin($xang);
-				$cos_ang = cos($ang);
-				$sin_ang = sin($ang);
-				// second arc point
-				$px2 = $x0 + ($rx * $cos_xang * $cos_ang) - ($ry * $sin_xang * $sin_ang);
-				$py2 = $y0 + ($rx * $sin_xang * $cos_ang) + ($ry * $cos_xang * $sin_ang);
-				// second Bezier control point
-				$qx2 = ($alpha * ((-$rx * $cos_xang * $sin_ang) - ($ry * $sin_xang * $cos_ang)));
-				$qy2 = ($alpha * ((-$rx * $sin_xang * $sin_ang) + ($ry * $cos_xang * $cos_ang)));
-				// draw arc
-				$this->_outCurve(($px1 + $qx1), ($this->h - ($py1 + $qy1)), ($px2 - $qx2), ($this->h - ($py2 - $qy2)), $px2, ($this->h - $py2));
-				// move to next point
-				$px1 = $px2;
-				$py1 = $py2;
-				$qx1 = $qx2;
-				$qy1 = $qy2;
-			}
-			if ($pie) {
-				$this->_outLine($xc, $yc);
-			}
-		}
-
-
-		/**
-		 * Draws a circle.
-		 * A circle is formed from n Bezier curves.
-		 * @param float $x0 Abscissa of center point.
-		 * @param float $y0 Ordinate of center point.
-		 * @param float $r Radius.
-		 * @param float $angstr: Angle start of draw line. Default value: 0.
-		 * @param float $angend: Angle finish of draw line. Default value: 360.
-		 * @param string $style Style of rendering. See the getPathPaintOperator() function for more information.
-		 * @param array $line_style Line style of circle. Array like for {@link SetLineStyle SetLineStyle}. Default value: default line style (empty array).
-		 * @param array $fill_color Fill color. Format: array(red, green, blue). Default value: default color (empty array).
-		 * @param integer $nc Number of curves used to draw a 90 degrees portion of circle.
-		 * @access public
-		 * @since 2.1.000 (2008-01-08)
-		 */
-		public function Circle($x0, $y0, $r, $angstr=0, $angend=360, $style='', $line_style=array(), $fill_color=array(), $nc=2) {
-			$this->Ellipse($x0, $y0, $r, $r, 0, $angstr, $angend, $style, $line_style, $fill_color, $nc);
-		}
-
-		/**
-		 * Draws a polygonal line
-		 * @param array $p Points 0 to ($np - 1). Array with values (x0, y0, x1, y1,..., x(np-1), y(np - 1))
-		 * @param string $style Style of rendering. See the getPathPaintOperator() function for more information.
-		 * @param array $line_style Line style of polygon. Array with keys among the following:
-		 * <ul>
-		 *	 <li>all: Line style of all lines. Array like for {@link SetLineStyle SetLineStyle}.</li>
-		 *	 <li>0 to ($np - 1): Line style of each line. Array like for {@link SetLineStyle SetLineStyle}.</li>
-		 * </ul>
-		 * If a key is not present or is null, not draws the line. Default value is default line style (empty array).
-		 * @param array $fill_color Fill color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K). Default value: default color (empty array).
-		 * @param boolean $closed if true the polygon is closes, otherwise will remain open
-		 * @access public
-		 * @since 4.8.003 (2009-09-15)
-		 */
-		public function PolyLine($p, $style='', $line_style=array(), $fill_color=array()) {
-			$this->Polygon($p, $style, $line_style, $fill_color, false);
-		}
-
-		/**
-		 * Draws a polygon.
-		 * @param array $p Points 0 to ($np - 1). Array with values (x0, y0, x1, y1,..., x(np-1), y(np - 1))
-		 * @param string $style Style of rendering. See the getPathPaintOperator() function for more information.
-		 * @param array $line_style Line style of polygon. Array with keys among the following:
-		 * <ul>
-		 *	 <li>all: Line style of all lines. Array like for {@link SetLineStyle SetLineStyle}.</li>
-		 *	 <li>0 to ($np - 1): Line style of each line. Array like for {@link SetLineStyle SetLineStyle}.</li>
-		 * </ul>
-		 * If a key is not present or is null, not draws the line. Default value is default line style (empty array).
-		 * @param array $fill_color Fill color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K). Default value: default color (empty array).
-		 * @param boolean $closed if true the polygon is closes, otherwise will remain open
-		 * @access public
-		 * @since 2.1.000 (2008-01-08)
-		 */
-		public function Polygon($p, $style='', $line_style=array(), $fill_color=array(), $closed=true) {
-			$nc = count($p); // number of coordinates
-			$np = $nc / 2; // number of points
-			if ($closed) {
-				// close polygon by adding the first 2 points at the end (one line)
-				for ($i = 0; $i < 4; ++$i) {
-					$p[$nc + $i] = $p[$i];
-				}
-				// copy style for the last added line
-				if (isset($line_style[0])) {
-					$line_style[$np] = $line_style[0];
-				}
-				$nc += 4;
-			}
-			if (!(false === strpos($style, 'F')) AND isset($fill_color)) {
-				$this->SetFillColorArray($fill_color);
-			}
-			$op = $this->getPathPaintOperator($style);
-			if ($op == 'f') {
-				$line_style = array();
-			}
-			$draw = true;
-			if ($line_style) {
-				if (isset($line_style['all'])) {
-					$this->SetLineStyle($line_style['all']);
-				} else {
-					$draw = false;
-					if ($op == 'B') {
-						// draw fill
-						$op = 'f';
-						$this->_outPoint($p[0], $p[1]);
-						for ($i = 2; $i < $nc; $i = $i + 2) {
-							$this->_outLine($p[$i], $p[$i + 1]);
-						}
-						$this->_out($op);
-					}
-					// draw outline
-					$this->_outPoint($p[0], $p[1]);
-					for ($i = 2; $i < $nc; $i = $i + 2) {
-						$line_num = ($i / 2) - 1;
-						if (isset($line_style[$line_num])) {
-							if ($line_style[$line_num] != 0) {
-								if (is_array($line_style[$line_num])) {
-									$this->_out('S');
-									$this->SetLineStyle($line_style[$line_num]);
-									$this->_outPoint($p[$i - 2], $p[$i - 1]);
-									$this->_outLine($p[$i], $p[$i + 1]);
-									$this->_out('S');
-									$this->_outPoint($p[$i], $p[$i + 1]);
-								} else {
-									$this->_outLine($p[$i], $p[$i + 1]);
-								}
-							}
-						} else {
-							$this->_outLine($p[$i], $p[$i + 1]);
-						}
-					}
-					$this->_out($op);
-				}
-			}
-			if ($draw) {
-				$this->_outPoint($p[0], $p[1]);
-				for ($i = 2; $i < $nc; $i = $i + 2) {
-					$this->_outLine($p[$i], $p[$i + 1]);
-				}
-				$this->_out($op);
-			}
-		}
-
-		/**
-		 * Draws a regular polygon.
-		 * @param float $x0 Abscissa of center point.
-		 * @param float $y0 Ordinate of center point.
-		 * @param float $r: Radius of inscribed circle.
-		 * @param integer $ns Number of sides.
-		 * @param float $angle Angle oriented (anti-clockwise). Default value: 0.
-		 * @param boolean $draw_circle Draw inscribed circle or not. Default value: false.
-		 * @param string $style Style of rendering. See the getPathPaintOperator() function for more information.
-		 * @param array $line_style Line style of polygon sides. Array with keys among the following:
-		 * <ul>
-		 *	 <li>all: Line style of all sides. Array like for {@link SetLineStyle SetLineStyle}.</li>
-		 *	 <li>0 to ($ns - 1): Line style of each side. Array like for {@link SetLineStyle SetLineStyle}.</li>
-		 * </ul>
-		 * If a key is not present or is null, not draws the side. Default value is default line style (empty array).
-		 * @param array $fill_color Fill color. Format: array(red, green, blue). Default value: default color (empty array).
-		 * @param string $circle_style Style of rendering of inscribed circle (if draws). Possible values are:
-		 * <ul>
-		 *	 <li>D or empty string: Draw (default).</li>
-		 *	 <li>F: Fill.</li>
-		 *	 <li>DF or FD: Draw and fill.</li>
-		 *	 <li>CNZ: Clipping mode (using the even-odd rule to determine which regions lie inside the clipping path).</li>
-		 *	 <li>CEO: Clipping mode (using the nonzero winding number rule to determine which regions lie inside the clipping path).</li>
-		 * </ul>
-		 * @param array $circle_outLine_style Line style of inscribed circle (if draws). Array like for {@link SetLineStyle SetLineStyle}. Default value: default line style (empty array).
-		 * @param array $circle_fill_color Fill color of inscribed circle (if draws). Format: array(red, green, blue). Default value: default color (empty array).
-		 * @access public
-		 * @since 2.1.000 (2008-01-08)
-		 */
-		public function RegularPolygon($x0, $y0, $r, $ns, $angle=0, $draw_circle=false, $style='', $line_style=array(), $fill_color=array(), $circle_style='', $circle_outLine_style=array(), $circle_fill_color=array()) {
-			if (3 > $ns) {
-				$ns = 3;
-			}
-			if ($draw_circle) {
-				$this->Circle($x0, $y0, $r, 0, 360, $circle_style, $circle_outLine_style, $circle_fill_color);
-			}
-			$p = array();
-			for ($i = 0; $i < $ns; ++$i) {
-				$a = $angle + ($i * 360 / $ns);
-				$a_rad = deg2rad((float) $a);
-				$p[] = $x0 + ($r * sin($a_rad));
-				$p[] = $y0 + ($r * cos($a_rad));
-			}
-			$this->Polygon($p, $style, $line_style, $fill_color);
-		}
-
-		/**
-		 * Draws a star polygon
-		 * @param float $x0 Abscissa of center point.
-		 * @param float $y0 Ordinate of center point.
-		 * @param float $r Radius of inscribed circle.
-		 * @param integer $nv Number of vertices.
-		 * @param integer $ng Number of gap (if ($ng % $nv = 1) then is a regular polygon).
-		 * @param float $angle: Angle oriented (anti-clockwise). Default value: 0.
-		 * @param boolean $draw_circle: Draw inscribed circle or not. Default value is false.
-		 * @param string $style Style of rendering. See the getPathPaintOperator() function for more information.
-		 * @param array $line_style Line style of polygon sides. Array with keys among the following:
-		 * <ul>
-		 *	 <li>all: Line style of all sides. Array like for
-		 * {@link SetLineStyle SetLineStyle}.</li>
-		 *	 <li>0 to (n - 1): Line style of each side. Array like for {@link SetLineStyle SetLineStyle}.</li>
-		 * </ul>
-		 * If a key is not present or is null, not draws the side. Default value is default line style (empty array).
-		 * @param array $fill_color Fill color. Format: array(red, green, blue). Default value: default color (empty array).
-		 * @param string $circle_style Style of rendering of inscribed circle (if draws). Possible values are:
-		 * <ul>
-		 *	 <li>D or empty string: Draw (default).</li>
-		 *	 <li>F: Fill.</li>
-		 *	 <li>DF or FD: Draw and fill.</li>
-		 *	 <li>CNZ: Clipping mode (using the even-odd rule to determine which regions lie inside the clipping path).</li>
-		 *	 <li>CEO: Clipping mode (using the nonzero winding number rule to determine which regions lie inside the clipping path).</li>
-		 * </ul>
-		 * @param array $circle_outLine_style Line style of inscribed circle (if draws). Array like for {@link SetLineStyle SetLineStyle}. Default value: default line style (empty array).
-		 * @param array $circle_fill_color Fill color of inscribed circle (if draws). Format: array(red, green, blue). Default value: default color (empty array).
-		 * @access public
-		 * @since 2.1.000 (2008-01-08)
-		 */
-		public function StarPolygon($x0, $y0, $r, $nv, $ng, $angle=0, $draw_circle=false, $style='', $line_style=array(), $fill_color=array(), $circle_style='', $circle_outLine_style=array(), $circle_fill_color=array()) {
-			if ($nv < 2) {
-				$nv = 2;
-			}
-			if ($draw_circle) {
-				$this->Circle($x0, $y0, $r, 0, 360, $circle_style, $circle_outLine_style, $circle_fill_color);
-			}
-			$p2 = array();
-			$visited = array();
-			for ($i = 0; $i < $nv; ++$i) {
-				$a = $angle + ($i * 360 / $nv);
-				$a_rad = deg2rad((float) $a);
-				$p2[] = $x0 + ($r * sin($a_rad));
-				$p2[] = $y0 + ($r * cos($a_rad));
-				$visited[] = false;
-			}
-			$p = array();
-			$i = 0;
-			do {
-				$p[] = $p2[$i * 2];
-				$p[] = $p2[($i * 2) + 1];
-				$visited[$i] = true;
-				$i += $ng;
-				$i %= $nv;
-			} while (!$visited[$i]);
-			$this->Polygon($p, $style, $line_style, $fill_color);
-		}
-
-		/**
-		 * Draws a rounded rectangle.
-		 * @param float $x Abscissa of upper-left corner.
-		 * @param float $y Ordinate of upper-left corner.
-		 * @param float $w Width.
-		 * @param float $h Height.
-		 * @param float $r the radius of the circle used to round off the corners of the rectangle.
-		 * @param string $round_corner Draws rounded corner or not. String with a 0 (not rounded i-corner) or 1 (rounded i-corner) in i-position. Positions are, in order and begin to 0: top left, top right, bottom right and bottom left. Default value: all rounded corner ("1111").
-		 * @param string $style Style of rendering. See the getPathPaintOperator() function for more information.
-		 * @param array $border_style Border style of rectangle. Array like for {@link SetLineStyle SetLineStyle}. Default value: default line style (empty array).
-		 * @param array $fill_color Fill color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K). Default value: default color (empty array).
-		 * @access public
-		 * @since 2.1.000 (2008-01-08)
-		 */
-		public function RoundedRect($x, $y, $w, $h, $r, $round_corner='1111', $style='', $border_style=array(), $fill_color=array()) {
-			$this->RoundedRectXY($x, $y, $w, $h, $r, $r, $round_corner, $style, $border_style, $fill_color);
-		}
-
-		/**
-		 * Draws a rounded rectangle.
-		 * @param float $x Abscissa of upper-left corner.
-		 * @param float $y Ordinate of upper-left corner.
-		 * @param float $w Width.
-		 * @param float $h Height.
-		 * @param float $rx the x-axis radius of the ellipse used to round off the corners of the rectangle.
-		 * @param float $ry the y-axis radius of the ellipse used to round off the corners of the rectangle.
-		 * @param string $round_corner Draws rounded corner or not. String with a 0 (not rounded i-corner) or 1 (rounded i-corner) in i-position. Positions are, in order and begin to 0: top left, top right, bottom right and bottom left. Default value: all rounded corner ("1111").
-		 * @param string $style Style of rendering. See the getPathPaintOperator() function for more information.
-		 * @param array $border_style Border style of rectangle. Array like for {@link SetLineStyle SetLineStyle}. Default value: default line style (empty array).
-		 * @param array $fill_color Fill color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K). Default value: default color (empty array).
-		 * @access public
-		 * @since 4.9.019 (2010-04-22)
-		 */
-		public function RoundedRectXY($x, $y, $w, $h, $rx, $ry, $round_corner='1111', $style='', $border_style=array(), $fill_color=array()) {
-			if (($round_corner == '0000') OR (($rx == $ry) AND ($rx == 0))) {
-				// Not rounded
-				$this->Rect($x, $y, $w, $h, $style, $border_style, $fill_color);
-				return;
-			}
-			// Rounded
-			if (!(false === strpos($style, 'F')) AND isset($fill_color)) {
-				$this->SetFillColorArray($fill_color);
-			}
-			$op = $this->getPathPaintOperator($style);
-			if ($op == 'f') {
-				$border_style = array();
-			}
-			if ($border_style) {
-				$this->SetLineStyle($border_style);
-			}
-			$MyArc = 4 / 3 * (sqrt(2) - 1);
-			$this->_outPoint($x + $rx, $y);
-			$xc = $x + $w - $rx;
-			$yc = $y + $ry;
-			$this->_outLine($xc, $y);
-			if ($round_corner[0]) {
-				$this->_outCurve($xc + ($rx * $MyArc), $yc - $ry, $xc + $rx, $yc - ($ry * $MyArc), $xc + $rx, $yc);
-			} else {
-				$this->_outLine($x + $w, $y);
-			}
-			$xc = $x + $w - $rx;
-			$yc = $y + $h - $ry;
-			$this->_outLine($x + $w, $yc);
-			if ($round_corner[1]) {
-				$this->_outCurve($xc + $rx, $yc + ($ry * $MyArc), $xc + ($rx * $MyArc), $yc + $ry, $xc, $yc + $ry);
-			} else {
-				$this->_outLine($x + $w, $y + $h);
-			}
-			$xc = $x + $rx;
-			$yc = $y + $h - $ry;
-			$this->_outLine($xc, $y + $h);
-			if ($round_corner[2]) {
-				$this->_outCurve($xc - ($rx * $MyArc), $yc + $ry, $xc - $rx, $yc + ($ry * $MyArc), $xc - $rx, $yc);
-			} else {
-				$this->_outLine($x, $y + $h);
-			}
-			$xc = $x + $rx;
-			$yc = $y + $ry;
-			$this->_outLine($x, $yc);
-			if ($round_corner[3]) {
-				$this->_outCurve($xc - $rx, $yc - ($ry * $MyArc), $xc - ($rx * $MyArc), $yc - $ry, $xc, $yc - $ry);
-			} else {
-				$this->_outLine($x, $y);
-				$this->_outLine($x + $rx, $y);
-			}
-			$this->_out($op);
-		}
-
-		/**
-		 * Draws a grahic arrow.
-		 * @parameter float $x0 Abscissa of first point.
-		 * @parameter float $y0 Ordinate of first point.
-		 * @parameter float $x0 Abscissa of second point.
-		 * @parameter float $y1 Ordinate of second point.
-		 * @parameter int $head_style (0 = draw only arrowhead arms, 1 = draw closed arrowhead, but no fill, 2 = closed and filled arrowhead, 3 = filled arrowhead)
-		 * @parameter float $arm_size length of arrowhead arms
-		 * @parameter int $arm_angle angle between an arm and the shaft
-		 * @author Piotr Galecki, Nicola Asuni, Andy Meier
-		 * @since 4.6.018 (2009-07-10)
-		 */
-		public function Arrow($x0, $y0, $x1, $y1, $head_style=0, $arm_size=5, $arm_angle=15) {
-			// getting arrow direction angle
-			// 0 deg angle is when both arms go along X axis. angle grows clockwise.
-			$dir_angle = atan2(($y0 - $y1), ($x0 - $x1));
-			if ($dir_angle < 0) {
-				$dir_angle += (2 * M_PI);
-			}
-			$arm_angle = deg2rad($arm_angle);
-			$sx1 = $x1;
-			$sy1 = $y1;
-			if ($head_style > 0) {
-				// calculate the stopping point for the arrow shaft
-				$sx1 = $x1 + (($arm_size - $this->LineWidth) * cos($dir_angle));
-				$sy1 = $y1 + (($arm_size - $this->LineWidth) * sin($dir_angle));
-			}
-			// main arrow line / shaft
-			$this->Line($x0, $y0, $sx1, $sy1);
-			// left arrowhead arm tip
-			$x2L = $x1 + ($arm_size * cos($dir_angle + $arm_angle));
-			$y2L = $y1 + ($arm_size * sin($dir_angle + $arm_angle));
-			// right arrowhead arm tip
-			$x2R = $x1 + ($arm_size * cos($dir_angle - $arm_angle));
-			$y2R = $y1 + ($arm_size * sin($dir_angle - $arm_angle));
-			$mode = 'D';
-			$style = array();
-			switch ($head_style) {
-				case 0: {
-					// draw only arrowhead arms
-					$mode = 'D';
-					$style = array(1, 1, 0);
-					break;
-				}
-				case 1: {
-					// draw closed arrowhead, but no fill
-					$mode = 'D';
-					break;
-				}
-				case 2: {
-					// closed and filled arrowhead
-					$mode = 'DF';
-					break;
-				}
-				case 3: {
-					// filled arrowhead
-					$mode = 'F';
-					break;
-				}
-			}
-			$this->Polygon(array($x2L, $y2L, $x1, $y1, $x2R, $y2R), $mode, $style, array());
-		}
-
-		// END GRAPHIC FUNCTIONS SECTION -----------------------
-
-		// BIDIRECTIONAL TEXT SECTION --------------------------
-
-		/**
-		 * Reverse the RLT substrings using the Bidirectional Algorithm (http://unicode.org/reports/tr9/).
-		 * @param string $str string to manipulate.
-		 * @param bool $setbom  if true set the Byte Order Mark (BOM = 0xFEFF)
-		 * @param bool $forcertl if true forces RTL text direction
-		 * @return string
-		 * @access protected
-		 * @author Nicola Asuni
-		 * @since 2.1.000 (2008-01-08)
-		 */
-		protected function utf8StrRev($str, $setbom=false, $forcertl=false) {
-			return $this->utf8StrArrRev($this->UTF8StringToArray($str), $str, $setbom, $forcertl);
-		}
-
-		/**
-		 * Reverse the RLT substrings array using the Bidirectional Algorithm (http://unicode.org/reports/tr9/).
-		 * @param array $arr array of unicode values.
-		 * @param string $str string to manipulate (or empty value).
-		 * @param bool $setbom  if true set the Byte Order Mark (BOM = 0xFEFF)
-		 * @param bool $forcertl if true forces RTL text direction
-		 * @return string
-		 * @access protected
-		 * @author Nicola Asuni
-		 * @since 4.9.000 (2010-03-27)
-		 */
-		protected function utf8StrArrRev($arr, $str='', $setbom=false, $forcertl=false) {
-			return $this->arrUTF8ToUTF16BE($this->utf8Bidi($arr, $str, $forcertl), $setbom);
-		}
-
-		/**
-		 * Reverse the RLT substrings using the Bidirectional Algorithm (http://unicode.org/reports/tr9/).
-		 * @param array $ta array of characters composing the string.
-		 * @param string $str string to process
-		 * @param bool $forcertl if 'R' forces RTL, if 'L' forces LTR
-		 * @return array of unicode chars
-		 * @author Nicola Asuni
-		 * @access protected
-		 * @since 2.4.000 (2008-03-06)
-		 */
-		protected function utf8Bidi($ta, $str='', $forcertl=false) {
-			global $unicode, $unicode_mirror, $unicode_arlet, $laa_array, $diacritics;
-			// paragraph embedding level
-			$pel = 0;
-			// max level
-			$maxlevel = 0;
-			if ($this->empty_string($str)) {
-				// create string from array
-				$str = $this->UTF8ArrSubString($ta);
-			}
-			// check if string contains arabic text
-			if (preg_match(K_RE_PATTERN_ARABIC, $str)) {
-				$arabic = true;
-			} else {
-				$arabic = false;
-			}
-			// check if string contains RTL text
-			if (!($forcertl OR $arabic OR preg_match(K_RE_PATTERN_RTL, $str))) {
-				return $ta;
-			}
-
-			// get number of chars
-			$numchars = count($ta);
-
-			if ($forcertl == 'R') {
-				$pel = 1;
-			} elseif ($forcertl == 'L') {
-				$pel = 0;
-			} else {
-				// P2. In each paragraph, find the first character of type L, AL, or R.
-				// P3. If a character is found in P2 and it is of type AL or R, then set the paragraph embedding level to one; otherwise, set it to zero.
-				for ($i=0; $i < $numchars; ++$i) {
-					$type = $unicode[$ta[$i]];
-					if ($type == 'L') {
-						$pel = 0;
-						break;
-					} elseif (($type == 'AL') OR ($type == 'R')) {
-						$pel = 1;
-						break;
-					}
-				}
-			}
-
-			// Current Embedding Level
-			$cel = $pel;
-			// directional override status
-			$dos = 'N';
-			$remember = array();
-			// start-of-level-run
-			$sor = $pel % 2 ? 'R' : 'L';
-			$eor = $sor;
-
-			// Array of characters data
-			$chardata = Array();
-
-			// X1. Begin by setting the current embedding level to the paragraph embedding level. Set the directional override status to neutral. Process each character iteratively, applying rules X2 through X9. Only embedding levels from 0 to 61 are valid in this phase.
-			// 	In the resolution of levels in rules I1 and I2, the maximum embedding level of 62 can be reached.
-			for ($i=0; $i < $numchars; ++$i) {
-				if ($ta[$i] == K_RLE) {
-					// X2. With each RLE, compute the least greater odd embedding level.
-					//	a. If this new level would be valid, then this embedding code is valid. Remember (push) the current embedding level and override status. Reset the current level to this new level, and reset the override status to neutral.
-					//	b. If the new level would not be valid, then this code is invalid. Do not change the current level or override status.
-					$next_level = $cel + ($cel % 2) + 1;
-					if ($next_level < 62) {
-						$remember[] = array('num' => K_RLE, 'cel' => $cel, 'dos' => $dos);
-						$cel = $next_level;
-						$dos = 'N';
-						$sor = $eor;
-						$eor = $cel % 2 ? 'R' : 'L';
-					}
-				} elseif ($ta[$i] == K_LRE) {
-					// X3. With each LRE, compute the least greater even embedding level.
-					//	a. If this new level would be valid, then this embedding code is valid. Remember (push) the current embedding level and override status. Reset the current level to this new level, and reset the override status to neutral.
-					//	b. If the new level would not be valid, then this code is invalid. Do not change the current level or override status.
-					$next_level = $cel + 2 - ($cel % 2);
-					if ( $next_level < 62 ) {
-						$remember[] = array('num' => K_LRE, 'cel' => $cel, 'dos' => $dos);
-						$cel = $next_level;
-						$dos = 'N';
-						$sor = $eor;
-						$eor = $cel % 2 ? 'R' : 'L';
-					}
-				} elseif ($ta[$i] == K_RLO) {
-					// X4. With each RLO, compute the least greater odd embedding level.
-					//	a. If this new level would be valid, then this embedding code is valid. Remember (push) the current embedding level and override status. Reset the current level to this new level, and reset the override status to right-to-left.
-					//	b. If the new level would not be valid, then this code is invalid. Do not change the current level or override status.
-					$next_level = $cel + ($cel % 2) + 1;
-					if ($next_level < 62) {
-						$remember[] = array('num' => K_RLO, 'cel' => $cel, 'dos' => $dos);
-						$cel = $next_level;
-						$dos = 'R';
-						$sor = $eor;
-						$eor = $cel % 2 ? 'R' : 'L';
-					}
-				} elseif ($ta[$i] == K_LRO) {
-					// X5. With each LRO, compute the least greater even embedding level.
-					//	a. If this new level would be valid, then this embedding code is valid. Remember (push) the current embedding level and override status. Reset the current level to this new level, and reset the override status to left-to-right.
-					//	b. If the new level would not be valid, then this code is invalid. Do not change the current level or override status.
-					$next_level = $cel + 2 - ($cel % 2);
-					if ( $next_level < 62 ) {
-						$remember[] = array('num' => K_LRO, 'cel' => $cel, 'dos' => $dos);
-						$cel = $next_level;
-						$dos = 'L';
-						$sor = $eor;
-						$eor = $cel % 2 ? 'R' : 'L';
-					}
-				} elseif ($ta[$i] == K_PDF) {
-					// X7. With each PDF, determine the matching embedding or override code. If there was a valid matching code, restore (pop) the last remembered (pushed) embedding level and directional override.
-					if (count($remember)) {
-						$last = count($remember ) - 1;
-						if (($remember[$last]['num'] == K_RLE) OR
-							($remember[$last]['num'] == K_LRE) OR
-							($remember[$last]['num'] == K_RLO) OR
-							($remember[$last]['num'] == K_LRO)) {
-							$match = array_pop($remember);
-							$cel = $match['cel'];
-							$dos = $match['dos'];
-							$sor = $eor;
-							$eor = ($cel > $match['cel'] ? $cel : $match['cel']) % 2 ? 'R' : 'L';
-						}
-					}
-				} elseif (($ta[$i] != K_RLE) AND
-								 ($ta[$i] != K_LRE) AND
-								 ($ta[$i] != K_RLO) AND
-								 ($ta[$i] != K_LRO) AND
-								 ($ta[$i] != K_PDF)) {
-					// X6. For all types besides RLE, LRE, RLO, LRO, and PDF:
-					//	a. Set the level of the current character to the current embedding level.
-					//	b. Whenever the directional override status is not neutral, reset the current character type to the directional override status.
-					if ($dos != 'N') {
-						$chardir = $dos;
-					} else {
-						if (isset($unicode[$ta[$i]])) {
-							$chardir = $unicode[$ta[$i]];
-						} else {
-							$chardir = 'L';
-						}
-					}
-					// stores string characters and other information
-					$chardata[] = array('char' => $ta[$i], 'level' => $cel, 'type' => $chardir, 'sor' => $sor, 'eor' => $eor);
-				}
-			} // end for each char
-
-			// X8. All explicit directional embeddings and overrides are completely terminated at the end of each paragraph. Paragraph separators are not included in the embedding.
-			// X9. Remove all RLE, LRE, RLO, LRO, PDF, and BN codes.
-			// X10. The remaining rules are applied to each run of characters at the same level. For each run, determine the start-of-level-run (sor) and end-of-level-run (eor) type, either L or R. This depends on the higher of the two levels on either side of the boundary (at the start or end of the paragraph, the level of the 'other' run is the base embedding level). If the higher level is odd, the type is R; otherwise, it is L.
-
-			// 3.3.3 Resolving Weak Types
-			// Weak types are now resolved one level run at a time. At level run boundaries where the type of the character on the other side of the boundary is required, the type assigned to sor or eor is used.
-			// Nonspacing marks are now resolved based on the previous characters.
-			$numchars = count($chardata);
-
-			// W1. Examine each nonspacing mark (NSM) in the level run, and change the type of the NSM to the type of the previous character. If the NSM is at the start of the level run, it will get the type of sor.
-			$prevlevel = -1; // track level changes
-			$levcount = 0; // counts consecutive chars at the same level
-			for ($i=0; $i < $numchars; ++$i) {
-				if ($chardata[$i]['type'] == 'NSM') {
-					if ($levcount) {
-						$chardata[$i]['type'] = $chardata[$i]['sor'];
-					} elseif ($i > 0) {
-						$chardata[$i]['type'] = $chardata[($i-1)]['type'];
-					}
-				}
-				if ($chardata[$i]['level'] != $prevlevel) {
-					$levcount = 0;
-				} else {
-					++$levcount;
-				}
-				$prevlevel = $chardata[$i]['level'];
-			}
-
-			// W2. Search backward from each instance of a European number until the first strong type (R, L, AL, or sor) is found. If an AL is found, change the type of the European number to Arabic number.
-			$prevlevel = -1;
-			$levcount = 0;
-			for ($i=0; $i < $numchars; ++$i) {
-				if ($chardata[$i]['char'] == 'EN') {
-					for ($j=$levcount; $j >= 0; $j--) {
-						if ($chardata[$j]['type'] == 'AL') {
-							$chardata[$i]['type'] = 'AN';
-						} elseif (($chardata[$j]['type'] == 'L') OR ($chardata[$j]['type'] == 'R')) {
-							break;
-						}
-					}
-				}
-				if ($chardata[$i]['level'] != $prevlevel) {
-					$levcount = 0;
-				} else {
-					++$levcount;
-				}
-				$prevlevel = $chardata[$i]['level'];
-			}
-
-			// W3. Change all ALs to R.
-			for ($i=0; $i < $numchars; ++$i) {
-				if ($chardata[$i]['type'] == 'AL') {
-					$chardata[$i]['type'] = 'R';
-				}
-			}
-
-			// W4. A single European separator between two European numbers changes to a European number. A single common separator between two numbers of the same type changes to that type.
-			$prevlevel = -1;
-			$levcount = 0;
-			for ($i=0; $i < $numchars; ++$i) {
-				if (($levcount > 0) AND (($i+1) < $numchars) AND ($chardata[($i+1)]['level'] == $prevlevel)) {
-					if (($chardata[$i]['type'] == 'ES') AND ($chardata[($i-1)]['type'] == 'EN') AND ($chardata[($i+1)]['type'] == 'EN')) {
-						$chardata[$i]['type'] = 'EN';
-					} elseif (($chardata[$i]['type'] == 'CS') AND ($chardata[($i-1)]['type'] == 'EN') AND ($chardata[($i+1)]['type'] == 'EN')) {
-						$chardata[$i]['type'] = 'EN';
-					} elseif (($chardata[$i]['type'] == 'CS') AND ($chardata[($i-1)]['type'] == 'AN') AND ($chardata[($i+1)]['type'] == 'AN')) {
-						$chardata[$i]['type'] = 'AN';
-					}
-				}
-				if ($chardata[$i]['level'] != $prevlevel) {
-					$levcount = 0;
-				} else {
-					++$levcount;
-				}
-				$prevlevel = $chardata[$i]['level'];
-			}
-
-			// W5. A sequence of European terminators adjacent to European numbers changes to all European numbers.
-			$prevlevel = -1;
-			$levcount = 0;
-			for ($i=0; $i < $numchars; ++$i) {
-				if ($chardata[$i]['type'] == 'ET') {
-					if (($levcount > 0) AND ($chardata[($i-1)]['type'] == 'EN')) {
-						$chardata[$i]['type'] = 'EN';
-					} else {
-						$j = $i+1;
-						while (($j < $numchars) AND ($chardata[$j]['level'] == $prevlevel)) {
-							if ($chardata[$j]['type'] == 'EN') {
-								$chardata[$i]['type'] = 'EN';
-								break;
-							} elseif ($chardata[$j]['type'] != 'ET') {
-								break;
-							}
-							++$j;
-						}
-					}
-				}
-				if ($chardata[$i]['level'] != $prevlevel) {
-					$levcount = 0;
-				} else {
-					++$levcount;
-				}
-				$prevlevel = $chardata[$i]['level'];
-			}
-
-			// W6. Otherwise, separators and terminators change to Other Neutral.
-			$prevlevel = -1;
-			$levcount = 0;
-			for ($i=0; $i < $numchars; ++$i) {
-				if (($chardata[$i]['type'] == 'ET') OR ($chardata[$i]['type'] == 'ES') OR ($chardata[$i]['type'] == 'CS')) {
-					$chardata[$i]['type'] = 'ON';
-				}
-				if ($chardata[$i]['level'] != $prevlevel) {
-					$levcount = 0;
-				} else {
-					++$levcount;
-				}
-				$prevlevel = $chardata[$i]['level'];
-			}
-
-			//W7. Search backward from each instance of a European number until the first strong type (R, L, or sor) is found. If an L is found, then change the type of the European number to L.
-			$prevlevel = -1;
-			$levcount = 0;
-			for ($i=0; $i < $numchars; ++$i) {
-				if ($chardata[$i]['char'] == 'EN') {
-					for ($j=$levcount; $j >= 0; $j--) {
-						if ($chardata[$j]['type'] == 'L') {
-							$chardata[$i]['type'] = 'L';
-						} elseif ($chardata[$j]['type'] == 'R') {
-							break;
-						}
-					}
-				}
-				if ($chardata[$i]['level'] != $prevlevel) {
-					$levcount = 0;
-				} else {
-					++$levcount;
-				}
-				$prevlevel = $chardata[$i]['level'];
-			}
-
-			// N1. A sequence of neutrals takes the direction of the surrounding strong text if the text on both sides has the same direction. European and Arabic numbers act as if they were R in terms of their influence on neutrals. Start-of-level-run (sor) and end-of-level-run (eor) are used at level run boundaries.
-			$prevlevel = -1;
-			$levcount = 0;
-			for ($i=0; $i < $numchars; ++$i) {
-				if (($levcount > 0) AND (($i+1) < $numchars) AND ($chardata[($i+1)]['level'] == $prevlevel)) {
-					if (($chardata[$i]['type'] == 'N') AND ($chardata[($i-1)]['type'] == 'L') AND ($chardata[($i+1)]['type'] == 'L')) {
-						$chardata[$i]['type'] = 'L';
-					} elseif (($chardata[$i]['type'] == 'N') AND
-					 (($chardata[($i-1)]['type'] == 'R') OR ($chardata[($i-1)]['type'] == 'EN') OR ($chardata[($i-1)]['type'] == 'AN')) AND
-					 (($chardata[($i+1)]['type'] == 'R') OR ($chardata[($i+1)]['type'] == 'EN') OR ($chardata[($i+1)]['type'] == 'AN'))) {
-						$chardata[$i]['type'] = 'R';
-					} elseif ($chardata[$i]['type'] == 'N') {
-						// N2. Any remaining neutrals take the embedding direction
-						$chardata[$i]['type'] = $chardata[$i]['sor'];
-					}
-				} elseif (($levcount == 0) AND (($i+1) < $numchars) AND ($chardata[($i+1)]['level'] == $prevlevel)) {
-					// first char
-					if (($chardata[$i]['type'] == 'N') AND ($chardata[$i]['sor'] == 'L') AND ($chardata[($i+1)]['type'] == 'L')) {
-						$chardata[$i]['type'] = 'L';
-					} elseif (($chardata[$i]['type'] == 'N') AND
-					 (($chardata[$i]['sor'] == 'R') OR ($chardata[$i]['sor'] == 'EN') OR ($chardata[$i]['sor'] == 'AN')) AND
-					 (($chardata[($i+1)]['type'] == 'R') OR ($chardata[($i+1)]['type'] == 'EN') OR ($chardata[($i+1)]['type'] == 'AN'))) {
-						$chardata[$i]['type'] = 'R';
-					} elseif ($chardata[$i]['type'] == 'N') {
-						// N2. Any remaining neutrals take the embedding direction
-						$chardata[$i]['type'] = $chardata[$i]['sor'];
-					}
-				} elseif (($levcount > 0) AND ((($i+1) == $numchars) OR (($i+1) < $numchars) AND ($chardata[($i+1)]['level'] != $prevlevel))) {
-					//last char
-					if (($chardata[$i]['type'] == 'N') AND ($chardata[($i-1)]['type'] == 'L') AND ($chardata[$i]['eor'] == 'L')) {
-						$chardata[$i]['type'] = 'L';
-					} elseif (($chardata[$i]['type'] == 'N') AND
-					 (($chardata[($i-1)]['type'] == 'R') OR ($chardata[($i-1)]['type'] == 'EN') OR ($chardata[($i-1)]['type'] == 'AN')) AND
-					 (($chardata[$i]['eor'] == 'R') OR ($chardata[$i]['eor'] == 'EN') OR ($chardata[$i]['eor'] == 'AN'))) {
-						$chardata[$i]['type'] = 'R';
-					} elseif ($chardata[$i]['type'] == 'N') {
-						// N2. Any remaining neutrals take the embedding direction
-						$chardata[$i]['type'] = $chardata[$i]['sor'];
-					}
-				} elseif ($chardata[$i]['type'] == 'N') {
-					// N2. Any remaining neutrals take the embedding direction
-					$chardata[$i]['type'] = $chardata[$i]['sor'];
-				}
-				if ($chardata[$i]['level'] != $prevlevel) {
-					$levcount = 0;
-				} else {
-					++$levcount;
-				}
-				$prevlevel = $chardata[$i]['level'];
-			}
-
-			// I1. For all characters with an even (left-to-right) embedding direction, those of type R go up one level and those of type AN or EN go up two levels.
-			// I2. For all characters with an odd (right-to-left) embedding direction, those of type L, EN or AN go up one level.
-			for ($i=0; $i < $numchars; ++$i) {
-				$odd = $chardata[$i]['level'] % 2;
-				if ($odd) {
-					if (($chardata[$i]['type'] == 'L') OR ($chardata[$i]['type'] == 'AN') OR ($chardata[$i]['type'] == 'EN')) {
-						$chardata[$i]['level'] += 1;
-					}
-				} else {
-					if ($chardata[$i]['type'] == 'R') {
-						$chardata[$i]['level'] += 1;
-					} elseif (($chardata[$i]['type'] == 'AN') OR ($chardata[$i]['type'] == 'EN')) {
-						$chardata[$i]['level'] += 2;
-					}
-				}
-				$maxlevel = max($chardata[$i]['level'],$maxlevel);
-			}
-
-			// L1. On each line, reset the embedding level of the following characters to the paragraph embedding level:
-			//	1. Segment separators,
-			//	2. Paragraph separators,
-			//	3. Any sequence of whitespace characters preceding a segment separator or paragraph separator, and
-			//	4. Any sequence of white space characters at the end of the line.
-			for ($i=0; $i < $numchars; ++$i) {
-				if (($chardata[$i]['type'] == 'B') OR ($chardata[$i]['type'] == 'S')) {
-					$chardata[$i]['level'] = $pel;
-				} elseif ($chardata[$i]['type'] == 'WS') {
-					$j = $i+1;
-					while ($j < $numchars) {
-						if ((($chardata[$j]['type'] == 'B') OR ($chardata[$j]['type'] == 'S')) OR
-							(($j == ($numchars-1)) AND ($chardata[$j]['type'] == 'WS'))) {
-							$chardata[$i]['level'] = $pel;
-							break;
-						} elseif ($chardata[$j]['type'] != 'WS') {
-							break;
-						}
-						++$j;
-					}
-				}
-			}
-
-			// Arabic Shaping
-			// Cursively connected scripts, such as Arabic or Syriac, require the selection of positional character shapes that depend on adjacent characters. Shaping is logically applied after the Bidirectional Algorithm is used and is limited to characters within the same directional run.
-			if ($arabic) {
-				$endedletter = array(1569,1570,1571,1572,1573,1575,1577,1583,1584,1585,1586,1608,1688);
-				$alfletter = array(1570,1571,1573,1575);
-				$chardata2 = $chardata;
-				$laaletter = false;
-				$charAL = array();
-				$x = 0;
-				for ($i=0; $i < $numchars; ++$i) {
-					if (($unicode[$chardata[$i]['char']] == 'AL') OR ($chardata[$i]['char'] == 32) OR ($chardata[$i]['char'] == 8204)) {
-						$charAL[$x] = $chardata[$i];
-						$charAL[$x]['i'] = $i;
-						$chardata[$i]['x'] = $x;
-						++$x;
-					}
-				}
-				$numAL = $x;
-				for ($i=0; $i < $numchars; ++$i) {
-					$thischar = $chardata[$i];
-					if ($i > 0) {
-						$prevchar = $chardata[($i-1)];
-					} else {
-						$prevchar = false;
-					}
-					if (($i+1) < $numchars) {
-						$nextchar = $chardata[($i+1)];
-					} else {
-						$nextchar = false;
-					}
-					if ($unicode[$thischar['char']] == 'AL') {
-						$x = $thischar['x'];
-						if ($x > 0) {
-							$prevchar = $charAL[($x-1)];
-						} else {
-							$prevchar = false;
-						}
-						if (($x+1) < $numAL) {
-							$nextchar = $charAL[($x+1)];
-						} else {
-							$nextchar = false;
-						}
-						// if laa letter
-						if (($prevchar !== false) AND ($prevchar['char'] == 1604) AND (in_array($thischar['char'], $alfletter))) {
-							$arabicarr = $laa_array;
-							$laaletter = true;
-							if ($x > 1) {
-								$prevchar = $charAL[($x-2)];
-							} else {
-								$prevchar = false;
-							}
-						} else {
-							$arabicarr = $unicode_arlet;
-							$laaletter = false;
-						}
-						if (($prevchar !== false) AND ($nextchar !== false) AND
-							(($unicode[$prevchar['char']] == 'AL') OR ($unicode[$prevchar['char']] == 'NSM')) AND
-							(($unicode[$nextchar['char']] == 'AL') OR ($unicode[$nextchar['char']] == 'NSM')) AND
-							($prevchar['type'] == $thischar['type']) AND
-							($nextchar['type'] == $thischar['type']) AND
-							($nextchar['char'] != 1567)) {
-							if (in_array($prevchar['char'], $endedletter)) {
-								if (isset($arabicarr[$thischar['char']][2])) {
-									// initial
-									$chardata2[$i]['char'] = $arabicarr[$thischar['char']][2];
-								}
-							} else {
-								if (isset($arabicarr[$thischar['char']][3])) {
-									// medial
-									$chardata2[$i]['char'] = $arabicarr[$thischar['char']][3];
-								}
-							}
-						} elseif (($nextchar !== false) AND
-							(($unicode[$nextchar['char']] == 'AL') OR ($unicode[$nextchar['char']] == 'NSM')) AND
-							($nextchar['type'] == $thischar['type']) AND
-							($nextchar['char'] != 1567)) {
-							if (isset($arabicarr[$chardata[$i]['char']][2])) {
-								// initial
-								$chardata2[$i]['char'] = $arabicarr[$thischar['char']][2];
-							}
-						} elseif ((($prevchar !== false) AND
-							(($unicode[$prevchar['char']] == 'AL') OR ($unicode[$prevchar['char']] == 'NSM')) AND
-							($prevchar['type'] == $thischar['type'])) OR
-							(($nextchar !== false) AND ($nextchar['char'] == 1567))) {
-							// final
-							if (($i > 1) AND ($thischar['char'] == 1607) AND
-								($chardata[$i-1]['char'] == 1604) AND
-								($chardata[$i-2]['char'] == 1604)) {
-								//Allah Word
-								// mark characters to delete with false
-								$chardata2[$i-2]['char'] = false;
-								$chardata2[$i-1]['char'] = false;
-								$chardata2[$i]['char'] = 65010;
-							} else {
-								if (($prevchar !== false) AND in_array($prevchar['char'], $endedletter)) {
-									if (isset($arabicarr[$thischar['char']][0])) {
-										// isolated
-										$chardata2[$i]['char'] = $arabicarr[$thischar['char']][0];
-									}
-								} else {
-									if (isset($arabicarr[$thischar['char']][1])) {
-										// final
-										$chardata2[$i]['char'] = $arabicarr[$thischar['char']][1];
-									}
-								}
-							}
-						} elseif (isset($arabicarr[$thischar['char']][0])) {
-							// isolated
-							$chardata2[$i]['char'] = $arabicarr[$thischar['char']][0];
-						}
-						// if laa letter
-						if ($laaletter) {
-							// mark characters to delete with false
-							$chardata2[($charAL[($x-1)]['i'])]['char'] = false;
-						}
-					} // end if AL (Arabic Letter)
-				} // end for each char
-				/*
-				 * Combining characters that can occur with Arabic Shadda (0651 HEX, 1617 DEC) are replaced.
-				 * Putting the combining mark and shadda in the same glyph allows us to avoid the two marks overlapping each other in an illegible manner.
-				 */
-				$cw = &$this->CurrentFont['cw'];
-				for ($i = 0; $i < ($numchars-1); ++$i) {
-					if (($chardata2[$i]['char'] == 1617) AND (isset($diacritics[($chardata2[$i+1]['char'])]))) {
-						// check if the subtitution font is defined on current font
-						if (isset($cw[($diacritics[($chardata2[$i+1]['char'])])])) {
-							$chardata2[$i]['char'] = false;
-							$chardata2[$i+1]['char'] = $diacritics[($chardata2[$i+1]['char'])];
-						}
-					}
-				}
-				// remove marked characters
-				foreach ($chardata2 as $key => $value) {
-					if ($value['char'] === false) {
-						unset($chardata2[$key]);
-					}
-				}
-				$chardata = array_values($chardata2);
-				$numchars = count($chardata);
-				unset($chardata2);
-				unset($arabicarr);
-				unset($laaletter);
-				unset($charAL);
-			}
-
-			// L2. From the highest level found in the text to the lowest odd level on each line, including intermediate levels not actually present in the text, reverse any contiguous sequence of characters that are at that level or higher.
-			for ($j=$maxlevel; $j > 0; $j--) {
-				$ordarray = Array();
-				$revarr = Array();
-				$onlevel = false;
-				for ($i=0; $i < $numchars; ++$i) {
-					if ($chardata[$i]['level'] >= $j) {
-						$onlevel = true;
-						if (isset($unicode_mirror[$chardata[$i]['char']])) {
-							// L4. A character is depicted by a mirrored glyph if and only if (a) the resolved directionality of that character is R, and (b) the Bidi_Mirrored property value of that character is true.
-							$chardata[$i]['char'] = $unicode_mirror[$chardata[$i]['char']];
-						}
-						$revarr[] = $chardata[$i];
-					} else {
-						if ($onlevel) {
-							$revarr = array_reverse($revarr);
-							$ordarray = array_merge($ordarray, $revarr);
-							$revarr = Array();
-							$onlevel = false;
-						}
-						$ordarray[] = $chardata[$i];
-					}
-				}
-				if ($onlevel) {
-					$revarr = array_reverse($revarr);
-					$ordarray = array_merge($ordarray, $revarr);
-				}
-				$chardata = $ordarray;
-			}
-
-			$ordarray = array();
-			for ($i=0; $i < $numchars; ++$i) {
-				$ordarray[] = $chardata[$i]['char'];
-			}
-
-			return $ordarray;
-		}
-
-		// END OF BIDIRECTIONAL TEXT SECTION -------------------
-
-		/**
-		 * Adds a bookmark.
-		 * @param string $txt bookmark description.
-		 * @param int $level bookmark level (minimum value is 0).
-		 * @param float $y Ordinate of the boorkmark position (default = -1 = current position).
-		 * @param int $page target page number (leave empty for current page).
-		 * @access public
-		 * @author Olivier Plathey, Nicola Asuni
-		 * @since 2.1.002 (2008-02-12)
-		 */
-		public function Bookmark($txt, $level=0, $y=-1, $page='') {
-			if ($level < 0) {
-				$level = 0;
-			}
-			if (isset($this->outlines[0])) {
-				$lastoutline = end($this->outlines);
-				$maxlevel = $lastoutline['l'] + 1;
-			} else {
-				$maxlevel = 0;
-			}
-			if ($level > $maxlevel) {
-				$level = $maxlevel;
-			}
-			if ($y == -1) {
-				$y = $this->GetY();
-			}
-			if (empty($page)) {
-				$page = $this->PageNo();
-			}
-			$this->outlines[] = array('t' => $txt, 'l' => $level, 'y' => $y, 'p' => $page);
-		}
-
-		/**
-		 * Create a bookmark PDF string.
-		 * @access protected
-		 * @author Olivier Plathey, Nicola Asuni
-		 * @since 2.1.002 (2008-02-12)
-		 */
-		protected function _putbookmarks() {
-			$nb = count($this->outlines);
-			if ($nb == 0) {
-				return;
-			}
-			// get sorting columns
-			$outline_p = array();
-			$outline_y = array();
-			foreach ($this->outlines as $key => $row) {
-				$outline_p[$key]  = $row['p'];
-				$outline_k[$key] = $key;
-			}
-			// sort outlines by page and original position
-			array_multisort($outline_p, SORT_NUMERIC, SORT_ASC, $outline_k, SORT_NUMERIC, SORT_ASC, $this->outlines);
-			$lru = array();
-			$level = 0;
-			foreach ($this->outlines as $i => $o) {
-				if ($o['l'] > 0) {
-					$parent = $lru[($o['l'] - 1)];
-					//Set parent and last pointers
-					$this->outlines[$i]['parent'] = $parent;
-					$this->outlines[$parent]['last'] = $i;
-					if ($o['l'] > $level) {
-						//Level increasing: set first pointer
-						$this->outlines[$parent]['first'] = $i;
-					}
-				} else {
-					$this->outlines[$i]['parent'] = $nb;
-				}
-				if (($o['l'] <= $level) AND ($i > 0)) {
-					//Set prev and next pointers
-					$prev = $lru[$o['l']];
-					$this->outlines[$prev]['next'] = $i;
-					$this->outlines[$i]['prev'] = $prev;
-				}
-				$lru[$o['l']] = $i;
-				$level = $o['l'];
-			}
-			//Outline items
-			$n = $this->n + 1;
-			foreach ($this->outlines as $i => $o) {
-				$this->_newobj();
-				// covert HTML title to string
-				$nltags = '/<br[\s]?\/>|<\/(blockquote|dd|dl|div|dt|h1|h2|h3|h4|h5|h6|hr|li|ol|p|pre|ul|tcpdf|table|tr|td)>/si';
-				$title = preg_replace($nltags, "\n", $o['t']);
-				$title = preg_replace("/[\r]+/si", '', $title);
-				$title = preg_replace("/[\n]+/si", "\n", $title);
-				$title = strip_tags(trim($title));
-				$out = '<</Title '.$this->_textstring($title);
-				$out .= ' /Parent '.($n + $o['parent']).' 0 R';
-				if (isset($o['prev'])) {
-					$out .= ' /Prev '.($n + $o['prev']).' 0 R';
-				}
-				if (isset($o['next'])) {
-					$out .= ' /Next '.($n + $o['next']).' 0 R';
-				}
-				if (isset($o['first'])) {
-					$out .= ' /First '.($n + $o['first']).' 0 R';
-				}
-				if (isset($o['last'])) {
-					$out .= ' /Last '.($n + $o['last']).' 0 R';
-				}
-				$out .= ' '.sprintf('/Dest [%d 0 R /XYZ 0 %.2F null]', (1 + (2 * $o['p'])), ($this->pagedim[$o['p']]['h'] - ($o['y'] * $this->k)));
-				$out .= ' /Count 0 >> endobj';
-				$this->_out($out);
-			}
-			//Outline root
-			$this->_newobj();
-			$this->OutlineRoot = $this->n;
-			$this->_out('<< /Type /Outlines /First '.$n.' 0 R /Last '.($n + $lru[0]).' 0 R >> endobj');
-		}
-
-		// --- JAVASCRIPT ------------------------------------------------------
-
-		/**
-		 * Adds a javascript
-		 * @param string $script Javascript code
-		 * @access public
-		 * @author Johannes G�ntert, Nicola Asuni
-		 * @since 2.1.002 (2008-02-12)
-		 */
-		public function IncludeJS($script) {
-			$this->javascript .= $script;
-		}
-
-		/**
-		 * Adds a javascript object and return object ID
-		 * @param string $script Javascript code
-		 * @param boolean $onload if true executes this object when opening the document
-		 * @return int internal object ID
-		 * @access public
-		 * @author Nicola Asuni
-		 * @since 4.8.000 (2009-09-07)
-		 */
-		public function addJavascriptObject($script, $onload=false) {
-			++$this->js_obj_id;
-			$this->js_objects[$this->js_obj_id] = array('js' => $script, 'onload' => $onload);
-			return $this->js_obj_id;
-		}
-
-		/**
-		 * Create a javascript PDF string.
-		 * @access protected
-		 * @author Johannes G�ntert, Nicola Asuni
-		 * @since 2.1.002 (2008-02-12)
-		 */
-		protected function _putjavascript() {
-			if (empty($this->javascript) AND empty($this->js_objects)) {
-				return;
-			}
-			if (strpos($this->javascript, 'this.addField') > 0) {
-				if (!$this->ur) {
-					//$this->setUserRights();
-				}
-				// the following two lines are used to avoid form fields duplication after saving
-				// The addField method only works on Acrobat Writer, unless the document is signed with Adobe private key (UR3)
-				$jsa = sprintf("ftcpdfdocsaved=this.addField('%s','%s',%d,[%.2F,%.2F,%.2F,%.2F]);", 'tcpdfdocsaved', 'text', 0, 0, 1, 0, 1);
-				$jsb = "getField('tcpdfdocsaved').value='saved';";
-				$this->javascript = $jsa."\n".$this->javascript."\n".$jsb;
-			}
-			$this->n_js = $this->_newobj();
-			$out = ' << /Names [';
-			if (!empty($this->javascript)) {
-				$out .= ' (EmbeddedJS) '.($this->n + 1).' 0 R';
-			}
-			if (!empty($this->js_objects)) {
-				foreach ($this->js_objects as $key => $val) {
-					if ($val['onload']) {
-						$out .= ' (JS'.$key.') '.$key.' 0 R';
-					}
-				}
-			}
-			$out .= ' ] >> endobj';
-			$this->_out($out);
-			// default Javascript object
-			if (!empty($this->javascript)) {
-				$this->_newobj();
-				$out = '<< /S /JavaScript';
-				$out .= ' /JS '.$this->_textstring($this->javascript);
-				$out .= ' >> endobj';
-				$this->_out($out);
-			}
-			// additional Javascript objects
-			if (!empty($this->js_objects)) {
-				foreach ($this->js_objects as $key => $val) {
-					$this->offsets[$key] = $this->bufferlen;
-					$out = $key.' 0 obj'."\n".' << /S /JavaScript /JS '.$this->_textstring($val['js']).' >> endobj';
-					$this->_out($out);
-				}
-			}
-		}
-
-		/**
-		 * Convert color to javascript color.
-		 * @param string $color color name or #RRGGBB
-		 * @access protected
-		 * @author Denis Van Nuffelen, Nicola Asuni
-		 * @since 2.1.002 (2008-02-12)
-		 */
-		protected function _JScolor($color) {
-			static $aColors = array('transparent', 'black', 'white', 'red', 'green', 'blue', 'cyan', 'magenta', 'yellow', 'dkGray', 'gray', 'ltGray');
-			if (substr($color,0,1) == '#') {
-				return sprintf("['RGB',%.3F,%.3F,%.3F]", hexdec(substr($color,1,2))/255, hexdec(substr($color,3,2))/255, hexdec(substr($color,5,2))/255);
-			}
-			if (!in_array($color,$aColors)) {
-				$this->Error('Invalid color: '.$color);
-			}
-			return 'color.'.$color;
-		}
-
-		/**
-		 * Adds a javascript form field.
-		 * @param string $type field type
-		 * @param string $name field name
-		 * @param int $x horizontal position
-		 * @param int $y vertical position
-		 * @param int $w width
-		 * @param int $h height
-		 * @param array $prop javascript field properties. Possible values are described on official Javascript for Acrobat API reference.
-		 * @access protected
-		 * @author Denis Van Nuffelen, Nicola Asuni
-		 * @since 2.1.002 (2008-02-12)
-		 */
-		protected function _addfield($type, $name, $x, $y, $w, $h, $prop) {
-			if ($this->rtl) {
-				$x = $x - $w;
-			}
-			// the followind avoid fields duplication after saving the document
-			$this->javascript .= "if(getField('tcpdfdocsaved').value != 'saved') {";
-			$k = $this->k;
-			$this->javascript .= sprintf("f".$name."=this.addField('%s','%s',%d,[%.2F,%.2F,%.2F,%.2F]);", $name, $type, $this->PageNo()-1, $x*$k, ($this->h-$y)*$k+1, ($x+$w)*$k, ($this->h-$y-$h)*$k+1)."\n";
-			$this->javascript .= 'f'.$name.'.textSize='.$this->FontSizePt.";\n";
-			while (list($key, $val) = each($prop)) {
-				if (strcmp(substr($key, -5), 'Color') == 0) {
-					$val = $this->_JScolor($val);
-				} else {
-					$val = "'".$val."'";
-				}
-				$this->javascript .= 'f'.$name.'.'.$key.'='.$val.";\n";
-			}
-			if ($this->rtl) {
-				$this->x -= $w;
-			} else {
-				$this->x += $w;
-			}
-			$this->javascript .= '}';
-		}
-
-		// --- FORM FIELDS -----------------------------------------------------
-
-		/**
-		 * Convert JavaScript form fields properties array to Annotation Properties array.
-		 * @param array $prop javascript field properties. Possible values are described on official Javascript for Acrobat API reference.
-		 * @return array of annotation properties
-		 * @access protected
-		 * @author Nicola Asuni
-		 * @since 4.8.000 (2009-09-06)
-		 */
-		protected function getAnnotOptFromJSProp($prop) {
-			if (isset($prop['aopt']) AND is_array($prop['aopt'])) {
-				// the annotation options area lready defined
-				return $prop['aopt'];
-			}
-			$opt = array(); // value to be returned
-			// alignment: Controls how the text is laid out within the text field.
-			if (isset($prop['alignment'])) {
-				switch ($prop['alignment']) {
-					case 'left': {
-						$opt['q'] = 0;
-						break;
-					}
-					case 'center': {
-						$opt['q'] = 1;
-						break;
-					}
-					case 'right': {
-						$opt['q'] = 2;
-						break;
-					}
-					default: {
-						$opt['q'] = ($this->rtl)?2:0;
-						break;
-					}
-				}
-			}
-			// lineWidth: Specifies the thickness of the border when stroking the perimeter of a field's rectangle.
-			if (isset($prop['lineWidth'])) {
-				$linewidth = intval($prop['lineWidth']);
-			} else {
-				$linewidth = 1;
-			}
-			// borderStyle: The border style for a field.
-			if (isset($prop['borderStyle'])) {
-				switch ($prop['borderStyle']) {
-					case 'border.d':
-					case 'dashed': {
-						$opt['border'] = array(0, 0, $linewidth, array(3, 2));
-						$opt['bs'] = array('w'=>$linewidth, 's'=>'D', 'd'=>array(3, 2));
-						break;
-					}
-					case 'border.b':
-					case 'beveled': {
-						$opt['border'] = array(0, 0, $linewidth);
-						$opt['bs'] = array('w'=>$linewidth, 's'=>'B');
-						break;
-					}
-					case 'border.i':
-					case 'inset': {
-						$opt['border'] = array(0, 0, $linewidth);
-						$opt['bs'] = array('w'=>$linewidth, 's'=>'I');
-						break;
-					}
-					case 'border.u':
-					case 'underline': {
-						$opt['border'] = array(0, 0, $linewidth);
-						$opt['bs'] = array('w'=>$linewidth, 's'=>'U');
-						break;
-					}
-					default:
-					case 'border.s':
-					case 'solid': {
-						$opt['border'] = array(0, 0, $linewidth);
-						$opt['bs'] = array('w'=>$linewidth, 's'=>'S');
-						break;
-					}
-				}
-			}
-			if (isset($prop['border']) AND is_array($prop['border'])) {
-				$opt['border'] = $prop['border'];
-			}
-			if (!isset($opt['mk'])) {
-				$opt['mk'] = array();
-			}
-			if (!isset($opt['mk']['if'])) {
-				$opt['mk']['if'] = array();
-			}
-			$opt['mk']['if']['a'] = array(0.5, 0.5);
-			// buttonAlignX: Controls how space is distributed from the left of the button face with respect to the icon.
-			if (isset($prop['buttonAlignX'])) {
-				$opt['mk']['if']['a'][0] = $prop['buttonAlignX'];
-			}
-			// buttonAlignY: Controls how unused space is distributed from the bottom of the button face with respect to the icon.
-			if (isset($prop['buttonAlignY'])) {
-				$opt['mk']['if']['a'][1] = $prop['buttonAlignY'];
-			}
-			// buttonFitBounds: If true, the extent to which the icon may be scaled is set to the bounds of the button field.
-			if (isset($prop['buttonFitBounds']) AND ($prop['buttonFitBounds'] == 'true')) {
-				$opt['mk']['if']['fb'] = true;
-			}
-			// buttonScaleHow: Controls how the icon is scaled (if necessary) to fit inside the button face.
-			if (isset($prop['buttonScaleHow'])) {
-				switch ($prop['buttonScaleHow']) {
-					case 'scaleHow.proportional': {
-						$opt['mk']['if']['s'] = 'P';
-						break;
-					}
-					case 'scaleHow.anamorphic': {
-						$opt['mk']['if']['s'] = 'A';
-						break;
-					}
-				}
-			}
-			// buttonScaleWhen: Controls when an icon is scaled to fit inside the button face.
-			if (isset($prop['buttonScaleWhen'])) {
-				switch ($prop['buttonScaleWhen']) {
-					case 'scaleWhen.always': {
-						$opt['mk']['if']['sw'] = 'A';
-						break;
-					}
-					case 'scaleWhen.never': {
-						$opt['mk']['if']['sw'] = 'N';
-						break;
-					}
-					case 'scaleWhen.tooBig': {
-						$opt['mk']['if']['sw'] = 'B';
-						break;
-					}
-					case 'scaleWhen.tooSmall': {
-						$opt['mk']['if']['sw'] = 'S';
-						break;
-					}
-				}
-			}
-			// buttonPosition: Controls how the text and the icon of the button are positioned with respect to each other within the button face.
-			if (isset($prop['buttonPosition'])) {
-				switch ($prop['buttonPosition']) {
-					case 0:
-					case 'position.textOnly': {
-						$opt['mk']['tp'] = 0;
-						break;
-					}
-					case 1:
-					case 'position.iconOnly': {
-						$opt['mk']['tp'] = 1;
-						break;
-					}
-					case 2:
-					case 'position.iconTextV': {
-						$opt['mk']['tp'] = 2;
-						break;
-					}
-					case 3:
-					case 'position.textIconV': {
-						$opt['mk']['tp'] = 3;
-						break;
-					}
-					case 4:
-					case 'position.iconTextH': {
-						$opt['mk']['tp'] = 4;
-						break;
-					}
-					case 5:
-					case 'position.textIconH': {
-						$opt['mk']['tp'] = 5;
-						break;
-					}
-					case 6:
-					case 'position.overlay': {
-						$opt['mk']['tp'] = 6;
-						break;
-					}
-				}
-			}
-			// fillColor: Specifies the background color for a field.
-			if (isset($prop['fillColor'])) {
-				if (is_array($prop['fillColor'])) {
-					$opt['mk']['bg'] = $prop['fillColor'];
-				} else {
-					$opt['mk']['bg'] = $this->convertHTMLColorToDec($prop['fillColor']);
-				}
-			}
-			// strokeColor: Specifies the stroke color for a field that is used to stroke the rectangle of the field with a line as large as the line width.
-			if (isset($prop['strokeColor'])) {
-				if (is_array($prop['strokeColor'])) {
-					$opt['mk']['bc'] = $prop['strokeColor'];
-				} else {
-					$opt['mk']['bc'] = $this->convertHTMLColorToDec($prop['strokeColor']);
-				}
-			}
-			// rotation: The rotation of a widget in counterclockwise increments.
-			if (isset($prop['rotation'])) {
-				$opt['mk']['r'] = $prop['rotation'];
-			}
-			// charLimit: Limits the number of characters that a user can type into a text field.
-			if (isset($prop['charLimit'])) {
-				$opt['maxlen'] = intval($prop['charLimit']);
-			}
-			if (!isset($ff)) {
-				$ff = 0;
-			}
-			// readonly: The read-only characteristic of a field. If a field is read-only, the user can see the field but cannot change it.
-			if (isset($prop['readonly']) AND ($prop['readonly'] == 'true')) {
-				$ff += 1 << 0;
-			}
-			// required: Specifies whether a field requires a value.
-			if (isset($prop['required']) AND ($prop['required'] == 'true')) {
-				$ff += 1 << 1;
-			}
-			// multiline: Controls how text is wrapped within the field.
-			if (isset($prop['multiline']) AND ($prop['multiline'] == 'true')) {
-				$ff += 1 << 12;
-			}
-			// password: Specifies whether the field should display asterisks when data is entered in the field.
-			if (isset($prop['password']) AND ($prop['password'] == 'true')) {
-				$ff += 1 << 13;
-			}
-			// NoToggleToOff: If set, exactly one radio button shall be selected at all times; selecting the currently selected button has no effect.
-			if (isset($prop['NoToggleToOff']) AND ($prop['NoToggleToOff'] == 'true')) {
-				$ff += 1 << 14;
-			}
-			// Radio: If set, the field is a set of radio buttons.
-			if (isset($prop['Radio']) AND ($prop['Radio'] == 'true')) {
-				$ff += 1 << 15;
-			}
-			// Pushbutton: If set, the field is a pushbutton that does not retain a permanent value.
-			if (isset($prop['Pushbutton']) AND ($prop['Pushbutton'] == 'true')) {
-				$ff += 1 << 16;
-			}
-			// Combo: If set, the field is a combo box; if clear, the field is a list box.
-			if (isset($prop['Combo']) AND ($prop['Combo'] == 'true')) {
-				$ff += 1 << 17;
-			}
-			// editable: Controls whether a combo box is editable.
-			if (isset($prop['editable']) AND ($prop['editable'] == 'true')) {
-				$ff += 1 << 18;
-			}
-			// Sort: If set, the field's option items shall be sorted alphabetically.
-			if (isset($prop['Sort']) AND ($prop['Sort'] == 'true')) {
-				$ff += 1 << 19;
-			}
-			// fileSelect: If true, sets the file-select flag in the Options tab of the text field (Field is Used for File Selection).
-			if (isset($prop['fileSelect']) AND ($prop['fileSelect'] == 'true')) {
-				$ff += 1 << 20;
-			}
-			// multipleSelection: If true, indicates that a list box allows a multiple selection of items.
-			if (isset($prop['multipleSelection']) AND ($prop['multipleSelection'] == 'true')) {
-				$ff += 1 << 21;
-			}
-			// doNotSpellCheck: If true, spell checking is not performed on this editable text field.
-			if (isset($prop['doNotSpellCheck']) AND ($prop['doNotSpellCheck'] == 'true')) {
-				$ff += 1 << 22;
-			}
-			// doNotScroll: If true, the text field does not scroll and the user, therefore, is limited by the rectangular region designed for the field.
-			if (isset($prop['doNotScroll']) AND ($prop['doNotScroll'] == 'true')) {
-				$ff += 1 << 23;
-			}
-			// comb: If set to true, the field background is drawn as series of boxes (one for each character in the value of the field) and each character of the content is drawn within those boxes. The number of boxes drawn is determined from the charLimit property. It applies only to text fields. The setter will also raise if any of the following field properties are also set multiline, password, and fileSelect. A side-effect of setting this property is that the doNotScroll property is also set.
-			if (isset($prop['comb']) AND ($prop['comb'] == 'true')) {
-				$ff += 1 << 24;
-			}
-			// radiosInUnison: If false, even if a group of radio buttons have the same name and export value, they behave in a mutually exclusive fashion, like HTML radio buttons.
-			if (isset($prop['radiosInUnison']) AND ($prop['radiosInUnison'] == 'true')) {
-				$ff += 1 << 25;
-			}
-			// richText: If true, the field allows rich text formatting.
-			if (isset($prop['richText']) AND ($prop['richText'] == 'true')) {
-				$ff += 1 << 25;
-			}
-			// commitOnSelChange: Controls whether a field value is committed after a selection change.
-			if (isset($prop['commitOnSelChange']) AND ($prop['commitOnSelChange'] == 'true')) {
-				$ff += 1 << 26;
-			}
-			$opt['ff'] = $ff;
-			// defaultValue: The default value of a field - that is, the value that the field is set to when the form is reset.
-			if (isset($prop['defaultValue'])) {
-				$opt['dv'] = $prop['defaultValue'];
-			}
-			$f = 4; // default value for annotation flags
-			// readonly: The read-only characteristic of a field. If a field is read-only, the user can see the field but cannot change it.
-			if (isset($prop['readonly']) AND ($prop['readonly'] == 'true')) {
-				$f += 1 << 6;
-			}
-			// display: Controls whether the field is hidden or visible on screen and in print.
-			if (isset($prop['display'])) {
-				if ($prop['display'] == 'display.visible') {
-					//
-				} elseif ($prop['display'] == 'display.hidden') {
-					$f += 1 << 1;
-				} elseif ($prop['display'] == 'display.noPrint') {
-					$f -= 1 << 2;
-				} elseif ($prop['display'] == 'display.noView') {
-					$f += 1 << 5;
-				}
-			}
-			$opt['f'] = $f;
-			// currentValueIndices: Reads and writes single or multiple values of a list box or combo box.
-			if (isset($prop['currentValueIndices']) AND is_array($prop['currentValueIndices'])) {
-				$opt['i'] = $prop['currentValueIndices'];
-			}
-			// value: The value of the field data that the user has entered.
-			if (isset($prop['value'])) {
-				if (is_array($prop['value'])) {
-					$opt['opt'] = array();
-					foreach ($prop['value'] AS $key => $optval) {
-						// exportValues: An array of strings representing the export values for the field.
-						if (isset($prop['exportValues'][$key])) {
-							$opt['opt'][$key] = array($prop['exportValues'][$key], $prop['value'][$key]);
-						} else {
-							$opt['opt'][$key] = $prop['value'][$key];
-						}
-					}
-				} else {
-					$opt['v'] = $prop['value'];
-				}
-			}
-			// richValue: This property specifies the text contents and formatting of a rich text field.
-			if (isset($prop['richValue'])) {
-				$opt['rv'] = $prop['richValue'];
-			}
-			// submitName: If nonempty, used during form submission instead of name. Only applicable if submitting in HTML format (that is, URL-encoded).
-			if (isset($prop['submitName'])) {
-				$opt['tm'] = $prop['submitName'];
-			}
-			// name: Fully qualified field name.
-			if (isset($prop['name'])) {
-				$opt['t'] = $prop['name'];
-			}
-			// userName: The user name (short description string) of the field.
-			if (isset($prop['userName'])) {
-				$opt['tu'] = $prop['userName'];
-			}
-			// highlight: Defines how a button reacts when a user clicks it.
-			if (isset($prop['highlight'])) {
-				switch ($prop['highlight']) {
-					case 'none':
-					case 'highlight.n': {
-						$opt['h'] = 'N';
-						break;
-					}
-					case 'invert':
-					case 'highlight.i': {
-						$opt['h'] = 'i';
-						break;
-					}
-					case 'push':
-					case 'highlight.p': {
-						$opt['h'] = 'P';
-						break;
-					}
-					case 'outline':
-					case 'highlight.o': {
-						$opt['h'] = 'O';
-						break;
-					}
-				}
-			}
-			// Unsupported options:
-			// - calcOrderIndex: Changes the calculation order of fields in the document.
-			// - delay: Delays the redrawing of a field's appearance.
-			// - defaultStyle: This property defines the default style attributes for the form field.
-			// - style: Allows the user to set the glyph style of a check box or radio button.
-			// - textColor, textFont, textSize
-			return $opt;
-		}
-
-		/**
-		 * Set default properties for form fields.
-		 * @param array $prop javascript field properties. Possible values are described on official Javascript for Acrobat API reference.
-		 * @access public
-		 * @author Nicola Asuni
-		 * @since 4.8.000 (2009-09-06)
-		 */
-		public function setFormDefaultProp($prop=array()) {
-			$this->default_form_prop = $prop;
-		}
-
-		/**
-		 * Return the default properties for form fields.
-		 * @return array $prop javascript field properties. Possible values are described on official Javascript for Acrobat API reference.
-		 * @access public
-		 * @author Nicola Asuni
-		 * @since 4.8.000 (2009-09-06)
-		 */
-		public function getFormDefaultProp() {
-			return $this->default_form_prop;
-		}
-
-		/**
-		 * Creates a text field
-		 * @param string $name field name
-		 * @param float $w Width of the rectangle
-		 * @param float $h Height of the rectangle
-		 * @param array $prop javascript field properties. Possible values are described on official Javascript for Acrobat API reference.
-		 * @param array $opt annotation parameters. Possible values are described on official PDF32000_2008 reference.
-		 * @param float $x Abscissa of the upper-left corner of the rectangle
-		 * @param float $y Ordinate of the upper-left corner of the rectangle
-		 * @param boolean $js if true put the field using JavaScript (requires Acrobat Writer to be rendered).
-		 * @access public
-		 * @author Nicola Asuni
-		 * @since 4.8.000 (2009-09-07)
-		 */
-		public function TextField($name, $w, $h, $prop=array(), $opt=array(), $x='', $y='', $js=false) {
-			if ($x === '') {
-				$x = $this->x;
-			}
-			if ($y === '') {
-				$y = $this->y;
-			}
-			if ($js) {
-				$this->_addfield('text', $name, $x, $y, $w, $h, $prop);
-				return;
-			}
-			// get default style
-			$prop = array_merge($this->getFormDefaultProp(), $prop);
-			// get annotation data
-			$popt = $this->getAnnotOptFromJSProp($prop);
-			// set default appearance stream
-			$font = $this->FontFamily;
-			$fontkey = array_search($font, $this->fontkeys);
-			if (!in_array($fontkey, $this->annotation_fonts)) {
-				$this->annotation_fonts[$font] = $fontkey;
-			}
-			$fontstyle = sprintf('/F%d %.2F Tf %s', ($fontkey + 1), $this->FontSizePt, $this->TextColor);
-			$popt['da'] = $fontstyle;
-			$popt['ap'] = array();
-			$popt['ap']['n'] = 'q BT '.$fontstyle.' ET Q';
-			// merge options
-			$opt = array_merge($popt, $opt);
-			// remove some conflicting options
-			unset($opt['bs']);
-			// set remaining annotation data
-			$opt['Subtype'] = 'Widget';
-			$opt['ft'] = 'Tx';
-			$opt['t'] = $name;
-			/*
-			Additional annotation's parameters (check _putannotsobj() method):
-			//$opt['f']
-			//$opt['ap']
-			//$opt['as']
-			//$opt['bs']
-			//$opt['be']
-			//$opt['c']
-			//$opt['border']
-			//$opt['h']
-			//$opt['mk']
-			//$opt['mk']['r']
-			//$opt['mk']['bc']
-			//$opt['mk']['bg']
-			//$opt['mk']['ca']
-			//$opt['mk']['rc']
-			//$opt['mk']['ac']
-			//$opt['mk']['i']
-			//$opt['mk']['ri']
-			//$opt['mk']['ix']
-			//$opt['mk']['if']
-			//$opt['mk']['if']['sw']
-			//$opt['mk']['if']['s']
-			//$opt['mk']['if']['a']
-			//$opt['mk']['if']['fb']
-			//$opt['mk']['tp']
-			//$opt['tu']
-			//$opt['tm']
-			//$opt['ff']
-			//$opt['v']
-			//$opt['dv']
-			//$opt['a']
-			//$opt['aa']
-			//$opt['q']
-			*/
-			$this->Annotation($x, $y, $w, $h, $name, $opt, 0);
-			if ($this->rtl) {
-				$this->x -= $w;
-			} else {
-				$this->x += $w;
-			}
-		}
-
-		/**
-		 * Creates a RadioButton field
-		 * @param string $name field name
-		 * @param int $w width
-		 * @param array $prop javascript field properties. Possible values are described on official Javascript for Acrobat API reference.
-		 * @param array $opt annotation parameters. Possible values are described on official PDF32000_2008 reference.
-		 * @param string $onvalue value to be returned if selected.
-		 * @param boolean $checked define the initial state.
-		 * @param float $x Abscissa of the upper-left corner of the rectangle
-		 * @param float $y Ordinate of the upper-left corner of the rectangle
-		 * @param boolean $js if true put the field using JavaScript (requires Acrobat Writer to be rendered).
-		 * @access public
-		 * @author Nicola Asuni
-		 * @since 4.8.000 (2009-09-07)
-		 */
-		public function RadioButton($name, $w, $prop=array(), $opt=array(), $onvalue='On', $checked=false, $x='', $y='', $js=false) {
-			if ($x === '') {
-				$x = $this->x;
-			}
-			if ($y === '') {
-				$y = $this->y;
-			}
-			if ($js) {
-				$this->_addfield('radiobutton', $name, $x, $y, $w, $w, $prop);
-				return;
-			}
-			if ($this->empty_string($onvalue)) {
-				$onvalue = 'On';
-			}
-			if ($checked) {
-				$defval = $onvalue;
-			} else {
-				$defval = 'Off';
-			}
-			// set data for parent group
-			if (!isset($this->radiobutton_groups[$this->page])) {
-				$this->radiobutton_groups[$this->page] = array();
-			}
-			if (!isset($this->radiobutton_groups[$this->page][$name])) {
-				$this->radiobutton_groups[$this->page][$name] = array();
-				++$this->annot_obj_id;
-				$this->radio_groups[] = $this->annot_obj_id;
-			}
-			// save object ID to be added on Kids entry on parent object
-			$this->radiobutton_groups[$this->page][$name][] = array('kid' => ($this->annot_obj_id + 1), 'def' => $defval);
-			// get default style
-			$prop = array_merge($this->getFormDefaultProp(), $prop);
-			$prop['NoToggleToOff'] = 'true';
-			$prop['Radio'] = 'true';
-			$prop['borderStyle'] = 'inset';
-			// get annotation data
-			$popt = $this->getAnnotOptFromJSProp($prop);
-			// set additional default values
-			$font = 'zapfdingbats';
-			$this->AddFont($font);
-			$fontkey = array_search($font, $this->fontkeys);
-			if (!in_array($fontkey, $this->annotation_fonts)) {
-				$this->annotation_fonts[$font] = $fontkey;
-			}
-			$fontstyle = sprintf('/F%d %.2F Tf %s', ($fontkey + 1), $this->FontSizePt, $this->TextColor);
-			$popt['da'] = $fontstyle;
-			$popt['ap'] = array();
-			$popt['ap']['n'] = array();
-			$popt['ap']['n'][$onvalue] = 'q BT '.$fontstyle.' 0 0 Td (8) Tj ET Q';
-			$popt['ap']['n']['Off'] = 'q BT '.$fontstyle.' 0 0 Td (8) Tj ET Q';
-			if (!isset($popt['mk'])) {
-				$popt['mk'] = array();
-			}
-			$popt['mk']['ca'] = '(l)';
-			// merge options
-			$opt = array_merge($popt, $opt);
-			// set remaining annotation data
-			$opt['Subtype'] = 'Widget';
-			$opt['ft'] = 'Btn';
-			if ($checked) {
-				$opt['v'] = array('/'.$onvalue);
-				$opt['as'] = $onvalue;
-			} else {
-				$opt['as'] = 'Off';
-			}
-			$this->Annotation($x, $y, $w, $w, $name, $opt, 0);
-			if ($this->rtl) {
-				$this->x -= $w;
-			} else {
-				$this->x += $w;
-			}
-		}
-
-		/**
-		 * Creates a List-box field
-		 * @param string $name field name
-		 * @param int $w width
-		 * @param int $h height
-		 * @param array $values array containing the list of values.
-		 * @param array $prop javascript field properties. Possible values are described on official Javascript for Acrobat API reference.
-		 * @param array $opt annotation parameters. Possible values are described on official PDF32000_2008 reference.
-		 * @param float $x Abscissa of the upper-left corner of the rectangle
-		 * @param float $y Ordinate of the upper-left corner of the rectangle
-		 * @param boolean $js if true put the field using JavaScript (requires Acrobat Writer to be rendered).
-		 * @access public
-		 * @author Nicola Asuni
-		 * @since 4.8.000 (2009-09-07)
-		 */
-		public function ListBox($name, $w, $h, $values, $prop=array(), $opt=array(), $x='', $y='', $js=false) {
-			if ($x === '') {
-				$x = $this->x;
-			}
-			if ($y === '') {
-				$y = $this->y;
-			}
-			if ($js) {
-				$this->_addfield('listbox', $name, $x, $y, $w, $h, $prop);
-				$s = '';
-				foreach ($values as $value) {
-					$s .= "'".addslashes($value)."',";
-				}
-				$this->javascript .= 'f'.$name.'.setItems(['.substr($s, 0, -1)."]);\n";
-				return;
-			}
-			// get default style
-			$prop = array_merge($this->getFormDefaultProp(), $prop);
-			// get annotation data
-			$popt = $this->getAnnotOptFromJSProp($prop);
-			// set additional default values
-			$font = $this->FontFamily;
-			$fontkey = array_search($font, $this->fontkeys);
-			if (!in_array($fontkey, $this->annotation_fonts)) {
-				$this->annotation_fonts[$font] = $fontkey;
-			}
-			$fontstyle = sprintf('/F%d %.2F Tf %s', ($fontkey + 1), $this->FontSizePt, $this->TextColor);
-			$popt['da'] = $fontstyle;
-			$popt['ap'] = array();
-			$popt['ap']['n'] = 'q BT '.$fontstyle.' ET Q';
-			// merge options
-			$opt = array_merge($popt, $opt);
-			// set remaining annotation data
-			$opt['Subtype'] = 'Widget';
-			$opt['ft'] = 'Ch';
-			$opt['t'] = $name;
-			$opt['opt'] = $values;
-			$this->Annotation($x, $y, $w, $h, $name, $opt, 0);
-			if ($this->rtl) {
-				$this->x -= $w;
-			} else {
-				$this->x += $w;
-			}
-		}
-
-		/**
-		 * Creates a Combo-box field
-		 * @param string $name field name
-		 * @param int $w width
-		 * @param int $h height
-		 * @param array $values array containing the list of values.
-		 * @param array $prop javascript field properties. Possible values are described on official Javascript for Acrobat API reference.
-		 * @param array $opt annotation parameters. Possible values are described on official PDF32000_2008 reference.
-		 * @param float $x Abscissa of the upper-left corner of the rectangle
-		 * @param float $y Ordinate of the upper-left corner of the rectangle
-		 * @param boolean $js if true put the field using JavaScript (requires Acrobat Writer to be rendered).
-		 * @access public
-		 * @author Nicola Asuni
-		 * @since 4.8.000 (2009-09-07)
-		 */
-		public function ComboBox($name, $w, $h, $values, $prop=array(), $opt=array(), $x='', $y='', $js=false) {
-			if ($x === '') {
-				$x = $this->x;
-			}
-			if ($y === '') {
-				$y = $this->y;
-			}
-			if ($js) {
-				$this->_addfield('combobox', $name, $x, $y, $w, $h, $prop);
-				$s = '';
-				foreach ($values as $value) {
-					$s .= "'".addslashes($value)."',";
-				}
-				$this->javascript .= 'f'.$name.'.setItems(['.substr($s, 0, -1)."]);\n";
-				return;
-			}
-			// get default style
-			$prop = array_merge($this->getFormDefaultProp(), $prop);
-			$prop['Combo'] = true;
-			// get annotation data
-			$popt = $this->getAnnotOptFromJSProp($prop);
-			// set additional default options
-			$font = $this->FontFamily;
-			$fontkey = array_search($font, $this->fontkeys);
-			if (!in_array($fontkey, $this->annotation_fonts)) {
-				$this->annotation_fonts[$font] = $fontkey;
-			}
-			$fontstyle = sprintf('/F%d %.2F Tf %s', ($fontkey + 1), $this->FontSizePt, $this->TextColor);
-			$popt['da'] = $fontstyle;
-			$popt['ap'] = array();
-			$popt['ap']['n'] = 'q BT '.$fontstyle.' ET Q';
-			// merge options
-			$opt = array_merge($popt, $opt);
-			// set remaining annotation data
-			$opt['Subtype'] = 'Widget';
-			$opt['ft'] = 'Ch';
-			$opt['t'] = $name;
-			$opt['opt'] = $values;
-			$this->Annotation($x, $y, $w, $h, $name, $opt, 0);
-			if ($this->rtl) {
-				$this->x -= $w;
-			} else {
-				$this->x += $w;
-			}
-		}
-
-		/**
-		 * Creates a CheckBox field
-		 * @param string $name field name
-		 * @param int $w width
-		 * @param boolean $checked define the initial state.
-		 * @param array $prop javascript field properties. Possible values are described on official Javascript for Acrobat API reference.
-		 * @param array $opt annotation parameters. Possible values are described on official PDF32000_2008 reference.
-		 * @param string $onvalue value to be returned if selected.
-		 * @param float $x Abscissa of the upper-left corner of the rectangle
-		 * @param float $y Ordinate of the upper-left corner of the rectangle
-		 * @param boolean $js if true put the field using JavaScript (requires Acrobat Writer to be rendered).
-		 * @access public
-		 * @author Nicola Asuni
-		 * @since 4.8.000 (2009-09-07)
-		 */
-		public function CheckBox($name, $w, $checked=false, $prop=array(), $opt=array(), $onvalue='Yes', $x='', $y='', $js=false) {
-			if ($x === '') {
-				$x = $this->x;
-			}
-			if ($y === '') {
-				$y = $this->y;
-			}
-			if ($js) {
-				$this->_addfield('checkbox', $name, $x, $y, $w, $w, $prop);
-				return;
-			}
-			if (!isset($prop['value'])) {
-				$prop['value'] = array('Yes');
-			}
-			// get default style
-			$prop = array_merge($this->getFormDefaultProp(), $prop);
-			$prop['borderStyle'] = 'inset';
-			// get annotation data
-			$popt = $this->getAnnotOptFromJSProp($prop);
-			// set additional default options
-			$font = 'zapfdingbats';
-			$this->AddFont($font);
-			$fontkey = array_search($font, $this->fontkeys);
-			if (!in_array($fontkey, $this->annotation_fonts)) {
-				$this->annotation_fonts[$font] = $fontkey;
-			}
-			$fontstyle = sprintf('/F%d %.2F Tf %s', ($fontkey + 1), $this->FontSizePt, $this->TextColor);
-			$popt['da'] = $fontstyle;
-			$popt['ap'] = array();
-			$popt['ap']['n'] = array();
-			$popt['ap']['n']['Yes'] = 'q BT '.$fontstyle.' 0 0 Td (8) Tj ET Q';
-			$popt['ap']['n']['Off'] = 'q BT '.$fontstyle.' 0 0 Td (8) Tj ET Q';
-			// merge options
-			$opt = array_merge($popt, $opt);
-			// set remaining annotation data
-			$opt['Subtype'] = 'Widget';
-			$opt['ft'] = 'Btn';
-			$opt['t'] = $name;
-			$opt['opt'] = array($onvalue);
-			if ($checked) {
-				$opt['v'] = array('/0');
-				$opt['as'] = 'Yes';
-			} else {
-				$opt['v'] = array('/Off');
-				$opt['as'] = 'Off';
-			}
-			$this->Annotation($x, $y, $w, $w, $name, $opt, 0);
-			if ($this->rtl) {
-				$this->x -= $w;
-			} else {
-				$this->x += $w;
-			}
-		}
-
-		/**
-		 * Creates a button field
-		 * @param string $name field name
-		 * @param int $w width
-		 * @param int $h height
-		 * @param string $caption caption.
-		 * @param mixed $action action triggered by pressing the button. Use a string to specify a javascript action. Use an array to specify a form action options as on section 12.7.5 of PDF32000_2008.
-		 * @param array $prop javascript field properties. Possible values are described on official Javascript for Acrobat API reference.
-		 * @param array $opt annotation parameters. Possible values are described on official PDF32000_2008 reference.
-		 * @param float $x Abscissa of the upper-left corner of the rectangle
-		 * @param float $y Ordinate of the upper-left corner of the rectangle
-		 * @param boolean $js if true put the field using JavaScript (requires Acrobat Writer to be rendered).
-		 * @access public
-		 * @author Nicola Asuni
-		 * @since 4.8.000 (2009-09-07)
-		 */
-		public function Button($name, $w, $h, $caption, $action, $prop=array(), $opt=array(), $x='', $y='', $js=false) {
-			if ($x === '') {
-				$x = $this->x;
-			}
-			if ($y === '') {
-				$y = $this->y;
-			}
-			if ($js) {
-				$this->_addfield('button', $name, $this->x, $this->y, $w, $h, $prop);
-				$this->javascript .= 'f'.$name.".buttonSetCaption('".addslashes($caption)."');\n";
-				$this->javascript .= 'f'.$name.".setAction('MouseUp','".addslashes($action)."');\n";
-				$this->javascript .= 'f'.$name.".highlight='push';\n";
-				$this->javascript .= 'f'.$name.".print=false;\n";
-				return;
-			}
-			// get default style
-			$prop = array_merge($this->getFormDefaultProp(), $prop);
-			$prop['Pushbutton'] = 'true';
-			$prop['highlight'] = 'push';
-			$prop['display'] = 'display.noPrint';
-			// get annotation data
-			$popt = $this->getAnnotOptFromJSProp($prop);
-			// set additional default options
-			if (!isset($popt['mk'])) {
-				$popt['mk'] = array();
-			}
-			$popt['mk']['ca'] = $this->_textstring($caption);
-			$popt['mk']['rc'] = $this->_textstring($caption);
-			$popt['mk']['ac'] = $this->_textstring($caption);
-			$font = $this->FontFamily;
-			$fontkey = array_search($font, $this->fontkeys);
-			if (!in_array($fontkey, $this->annotation_fonts)) {
-				$this->annotation_fonts[$font] = $fontkey;
-			}
-			$fontstyle = sprintf('/F%d %.2F Tf %s', ($fontkey + 1), $this->FontSizePt, $this->TextColor);
-			$popt['da'] = $fontstyle;
-			$popt['ap'] = array();
-			$popt['ap']['n'] = 'q BT '.$fontstyle.' ET Q';
-			// merge options
-			$opt = array_merge($popt, $opt);
-			// set remaining annotation data
-			$opt['Subtype'] = 'Widget';
-			$opt['ft'] = 'Btn';
-			$opt['t'] = $caption;
-			$opt['v'] = $name;
-			if (!empty($action)) {
-				if (is_array($action)) {
-					// form action options as on section 12.7.5 of PDF32000_2008.
-					$opt['aa'] = '/D <<';
-					$bmode = array('SubmitForm', 'ResetForm', 'ImportData');
-					foreach ($action AS $key => $val) {
-						if (($key == 'S') AND in_array($val, $bmode)) {
-							$opt['aa'] .= ' /S /'.$val;
-						} elseif (($key == 'F') AND (!empty($val))) {
-							$opt['aa'] .= ' /F '.$this->_datastring($val);
-						} elseif (($key == 'Fields') AND is_array($val) AND !empty($val)) {
-							$opt['aa'] .= ' /Fields [';
-							foreach ($val AS $field) {
-								$opt['aa'] .= ' '.$this->_textstring($field);
-							}
-							$opt['aa'] .= ']';
-						} elseif (($key == 'Flags')) {
-							$ff = 0;
-							if (is_array($val)) {
-								foreach ($val AS $flag) {
-									switch ($flag) {
-										case 'Include/Exclude': {
-											$ff += 1 << 0;
-											break;
-										}
-										case 'IncludeNoValueFields': {
-											$ff += 1 << 1;
-											break;
-										}
-										case 'ExportFormat': {
-											$ff += 1 << 2;
-											break;
-										}
-										case 'GetMethod': {
-											$ff += 1 << 3;
-											break;
-										}
-										case 'SubmitCoordinates': {
-											$ff += 1 << 4;
-											break;
-										}
-										case 'XFDF': {
-											$ff += 1 << 5;
-											break;
-										}
-										case 'IncludeAppendSaves': {
-											$ff += 1 << 6;
-											break;
-										}
-										case 'IncludeAnnotations': {
-											$ff += 1 << 7;
-											break;
-										}
-										case 'SubmitPDF': {
-											$ff += 1 << 8;
-											break;
-										}
-										case 'CanonicalFormat': {
-											$ff += 1 << 9;
-											break;
-										}
-										case 'ExclNonUserAnnots': {
-											$ff += 1 << 10;
-											break;
-										}
-										case 'ExclFKey': {
-											$ff += 1 << 11;
-											break;
-										}
-										case 'EmbedForm': {
-											$ff += 1 << 13;
-											break;
-										}
-									}
-								}
-							} else {
-								$ff = intval($val);
-							}
-							$opt['aa'] .= ' /Flags '.$ff;
-						}
-					}
-					$opt['aa'] .= ' >>';
-				} else {
-					// Javascript action or raw action command
-					$js_obj_id = $this->addJavascriptObject($action);
-					$opt['aa'] = '/D '.$js_obj_id.' 0 R';
-				}
-			}
-			$this->Annotation($x, $y, $w, $h, $name, $opt, 0);
-			if ($this->rtl) {
-				$this->x -= $w;
-			} else {
-				$this->x += $w;
-			}
-		}
-
-		// --- END FORMS FIELDS ------------------------------------------------
-
-		/**
-		 * Add certification signature (DocMDP or UR3)
-		 * You can set only one signature type
-		 * @access protected
-		 * @author Nicola Asuni
-		 * @since 4.6.008 (2009-05-07)
-		 */
-		protected function _putsignature() {
-			if ((!$this->sign) OR (!isset($this->signature_data['cert_type']))) {
-				return;
-			}
-			$this->_newobj();
-			$out = ' << /Type /Sig';
-			$out .= ' /Filter /Adobe.PPKLite';
-			$out .= ' /SubFilter /adbe.pkcs7.detached';
-			$out .= ' '.$this->byterange_string;
-			$out .= ' /Contents<>'.str_repeat(' ', $this->signature_max_length);
-			$out .= ' /Reference';
-			$out .= ' [';
-			$out .= ' << /Type /SigRef';
-			if ($this->signature_data['cert_type'] > 0) {
-				$out .= ' /TransformMethod /DocMDP';
-				$out .= ' /TransformParams';
-				$out .= ' <<';
-				$out .= ' /Type /TransformParams';
-				$out .= ' /V /1.2';
-				$out .= ' /P '.$this->signature_data['cert_type'];
-			} else {
-				$out .= ' /TransformMethod /UR3';
-				$out .= ' /TransformParams';
-				$out .= ' << /Type /TransformParams';
-				$out .= ' /V /2.2';
-				if (!$this->empty_string($this->ur_document)) {
-					$out .= ' /Document['.$this->ur_document.']';
-				}
-				if (!$this->empty_string($this->ur_annots)) {
-					$out .= ' /Annots['.$this->ur_annots.']';
-				}
-				if (!$this->empty_string($this->ur_form)) {
-					$out .= ' /Form['.$this->ur_form.']';
-				}
-				if (!$this->empty_string($this->ur_signature)) {
-					$out .= ' /Signature['.$this->ur_signature.']';
-				}
-			}
-			$out .= ' >> >> ]';
-			if (isset($this->signature_data['info']['Name']) AND !$this->empty_string($this->signature_data['info']['Name'])) {
-				$out .= ' /Name '.$this->_textstring($this->signature_data['info']['Name']);
-			}
-			if (isset($this->signature_data['info']['Location']) AND !$this->empty_string($this->signature_data['info']['Location'])) {
-				$out .= ' /Location '.$this->_textstring($this->signature_data['info']['Location']);
-			}
-			if (isset($this->signature_data['info']['Reason']) AND !$this->empty_string($this->signature_data['info']['Reason'])) {
-				$out .= ' /Reason '.$this->_textstring($this->signature_data['info']['Reason']);
-			}
-			if (isset($this->signature_data['info']['ContactInfo']) AND !$this->empty_string($this->signature_data['info']['ContactInfo'])) {
-				$out .= ' /ContactInfo '.$this->_textstring($this->signature_data['info']['ContactInfo']);
-			}
-			$out .= ' /M '.$this->_datestring();
-			$out .= ' >> endobj';
-			$this->_out($out);
-		}
-
-		/**
-		 * Set User's Rights for PDF Reader
-		 * WARNING: This works only using the Adobe private key with the setSignature() method!.
-		 * Check the PDF Reference 8.7.1 Transform Methods,
-		 * Table 8.105 Entries in the UR transform parameters dictionary
-		 * @param boolean $enable if true enable user's rights on PDF reader
-		 * @param string $document Names specifying additional document-wide usage rights for the document. The only defined value is "/FullSave", which permits a user to save the document along with modified form and/or annotation data.
-		 * @param string $annots Names specifying additional annotation-related usage rights for the document. Valid names in PDF 1.5 and later are /Create/Delete/Modify/Copy/Import/Export, which permit the user to perform the named operation on annotations.
-		 * @param string $form Names specifying additional form-field-related usage rights for the document. Valid names are: /Add/Delete/FillIn/Import/Export/SubmitStandalone/SpawnTemplate
-		 * @param string $signature Names specifying additional signature-related usage rights for the document. The only defined value is /Modify, which permits a user to apply a digital signature to an existing signature form field or clear a signed signature form field.
-		 * @access public
-		 * @author Nicola Asuni
-		 * @since 2.9.000 (2008-03-26)
-		 */
-		public function setUserRights(
-				$enable=true,
-				$document='/FullSave',
-				$annots='/Create/Delete/Modify/Copy/Import/Export',
-				$form='/Add/Delete/FillIn/Import/Export/SubmitStandalone/SpawnTemplate',
-				$signature='/Modify') {
-			$this->ur = $enable;
-			$this->ur_document = $document;
-			$this->ur_annots = $annots;
-			$this->ur_form = $form;
-			$this->ur_signature = $signature;
-			if (!$this->sign) {
-				// This signature only works using the Adobe Private key that is unavailable!
-				$this->setSignature('', '', '', '', 0, array());
-			}
-		}
-
-		/**
-		 * Enable document signature (requires the OpenSSL Library).
-		 * The digital signature improve document authenticity and integrity and allows o enable extra features on Acrobat Reader.
-		 * @param mixed $signing_cert signing certificate (string or filename prefixed with 'file://')
-		 * @param mixed $private_key private key (string or filename prefixed with 'file://')
-		 * @param string $private_key_password password
-		 * @param string $extracerts specifies the name of a file containing a bunch of extra certificates to include in the signature which can for example be used to help the recipient to verify the certificate that you used.
-		 * @param int $cert_type The access permissions granted for this document. Valid values shall be: 1 = No changes to the document shall be permitted; any change to the document shall invalidate the signature; 2 = Permitted changes shall be filling in forms, instantiating page templates, and signing; other changes shall invalidate the signature; 3 = Permitted changes shall be the same as for 2, as well as annotation creation, deletion, and modification; other changes shall invalidate the signature.
-		 * @param array $info array of option information: Name, Location, Reason, ContactInfo.
-		 * @access public
-		 * @author Nicola Asuni
-		 * @since 4.6.005 (2009-04-24)
-		 */
-		public function setSignature($signing_cert='', $private_key='', $private_key_password='', $extracerts='', $cert_type=2, $info=array()) {
-			// to create self-signed signature: openssl req -x509 -nodes -days 365000 -newkey rsa:1024 -keyout tcpdf.crt -out tcpdf.crt
-			// to convert pfx certificate to pem: openssl
-			//     OpenSSL> pkcs12 -in <cert.pfx> -out <cert.crt> -nodes
-			$this->sign = true;
-			$this->signature_data = array();
-			if (strlen($signing_cert) == 0) {
-				$signing_cert = 'file://'.dirname(__FILE__).'/tcpdf.crt';
-				$private_key_password = 'tcpdfdemo';
-			}
-			if (strlen($private_key) == 0) {
-				$private_key = $signing_cert;
-			}
-			$this->signature_data['signcert'] = $signing_cert;
-			$this->signature_data['privkey'] = $private_key;
-			$this->signature_data['password'] = $private_key_password;
-			$this->signature_data['extracerts'] = $extracerts;
-			$this->signature_data['cert_type'] = $cert_type;
-			$this->signature_data['info'] = $info;
-		}
-
-		/**
-		 * Create a new page group.
-		 * NOTE: call this function before calling AddPage()
-		 * @param int $page starting group page (leave empty for next page).
-		 * @access public
-		 * @since 3.0.000 (2008-03-27)
-		 */
-		public function startPageGroup($page='') {
-			if (empty($page)) {
-				$page = $this->page + 1;
-			}
-			$this->newpagegroup[$page] = true;
-		}
-
-		/**
-		 * Defines an alias for the total number of pages.
-		 * It will be substituted as the document is closed.
-		 * @param string $alias The alias.
-		 * @access public
-		 * @since 1.4
-		 * @see getAliasNbPages(), PageNo(), Footer()
-		 */
-		public function AliasNbPages($alias='{nb}') {
-			$this->AliasNbPages = $alias;
-		}
-
-		/**
-		 * Returns the string alias used for the total number of pages.
-         * If the current font is unicode type, the returned string is surrounded by additional curly braces.
-		 * @return string
-		 * @access public
-		 * @since 4.0.018 (2008-08-08)
-		 * @see AliasNbPages(), PageNo(), Footer()
-		 */
-		public function getAliasNbPages() {
-			if (($this->CurrentFont['type'] == 'TrueTypeUnicode') OR ($this->CurrentFont['type'] == 'cidfont0')) {
-				return '{'.$this->AliasNbPages.'}';
-            }
-			return $this->AliasNbPages;
-		}
-
-		/**
-		 * Defines an alias for the page number.
-		 * It will be substituted as the document is closed.
-		 * @param string $alias The alias.
-		 * @access public
-		 * @since 4.5.000 (2009-01-02)
-		 * @see getAliasNbPages(), PageNo(), Footer()
-		 */
-		public function AliasNumPage($alias='{pnb}') {
-			//Define an alias for total number of pages
-			$this->AliasNumPage = $alias;
-		}
-
-		/**
-		 * Returns the string alias used for the page number.
-         * If the current font is unicode type, the returned string is surrounded by additional curly braces.
-		 * @return string
-		 * @access public
-		 * @since 4.5.000 (2009-01-02)
-		 * @see AliasNbPages(), PageNo(), Footer()
-		 */
-		public function getAliasNumPage() {
-			if (($this->CurrentFont['type'] == 'TrueTypeUnicode') OR ($this->CurrentFont['type'] == 'cidfont0')) {
-				return '{'.$this->AliasNumPage.'}';
-            }
-			return $this->AliasNumPage;
-		}
-
-		/**
-		 * Return the current page in the group.
-		 * @return current page in the group
-		 * @access public
-		 * @since 3.0.000 (2008-03-27)
-		 */
-		public function getGroupPageNo() {
-			return $this->pagegroups[$this->currpagegroup];
-		}
-
-		/**
-		 * Returns the current group page number formatted as a string.
-		 * @access public
-		 * @since 4.3.003 (2008-11-18)
-		 * @see PaneNo(), formatPageNumber()
-		 */
-		public function getGroupPageNoFormatted() {
-			return $this->formatPageNumber($this->getGroupPageNo());
-        }
-
-		/**
-		 * Return the alias of the current page group
-         * If the current font is unicode type, the returned string is surrounded by additional curly braces.
-		 * (will be replaced by the total number of pages in this group).
-		 * @return alias of the current page group
-		 * @access public
-		 * @since 3.0.000 (2008-03-27)
-		 */
-		public function getPageGroupAlias() {
-			if (($this->CurrentFont['type'] == 'TrueTypeUnicode') OR ($this->CurrentFont['type'] == 'cidfont0')) {
-				return '{'.$this->currpagegroup.'}';
-            }
-			return $this->currpagegroup;
-		}
-
-		/**
-		 * Return the alias for the page number on the current page group
-         * If the current font is unicode type, the returned string is surrounded by additional curly braces.
-		 * (will be replaced by the total number of pages in this group).
-		 * @return alias of the current page group
-		 * @access public
-		 * @since 4.5.000 (2009-01-02)
-		 */
-		public function getPageNumGroupAlias() {
-			if (($this->CurrentFont['type'] == 'TrueTypeUnicode') OR ($this->CurrentFont['type'] == 'cidfont0')) {
-				return '{'.str_replace('{nb', '{pnb', $this->currpagegroup).'}';
-            }
-			return str_replace('{nb', '{pnb', $this->currpagegroup);
-		}
-
-		/**
-		 * Format the page numbers.
-		 * This method can be overriden for custom formats.
-		 * @param int $num page number
-		 * @access protected
-		 * @since 4.2.005 (2008-11-06)
-		 */
-		protected function formatPageNumber($num) {
-			return number_format((float)$num, 0, '', '.');
-		}
-
-		/**
-		 * Format the page numbers on the Table Of Content.
-		 * This method can be overriden for custom formats.
-		 * @param int $num page number
-		 * @access protected
-		 * @since 4.5.001 (2009-01-04)
-		 * @see addTOC(), addHTMLTOC()
-		 */
-		protected function formatTOCPageNumber($num) {
-			return number_format((float)$num, 0, '', '.');
-		}
-
-        /**
-		 * Returns the current page number formatted as a string.
-		 * @access public
-		 * @since 4.2.005 (2008-11-06)
-		 * @see PaneNo(), formatPageNumber()
-		 */
-		public function PageNoFormatted() {
-			return $this->formatPageNumber($this->PageNo());
-        }
-
-        /**
-		 * Put visibility settings.
-		 * @access protected
-		 * @since 3.0.000 (2008-03-27)
-		 */
-		protected function _putocg() {
-			$this->_newobj();
-			$this->n_ocg_print = $this->n;
-			$this->_out('<< /Type /OCG /Name '.$this->_textstring('print').' /Usage << /Print <</PrintState /ON>> /View <</ViewState /OFF>> >> >> endobj');
-			$this->_newobj();
-			$this->n_ocg_view = $this->n;
-			$this->_out('<< /Type /OCG /Name '.$this->_textstring('view').' /Usage << /Print <</PrintState /OFF>> /View <</ViewState /ON>> >> >> endobj');
-		}
-
-		/**
-		 * Set the visibility of the successive elements.
-		 * This can be useful, for instance, to put a background
-		 * image or color that will show on screen but won't print.
-		 * @param string $v visibility mode. Legal values are: all, print, screen.
-		 * @access public
-		 * @since 3.0.000 (2008-03-27)
-		 */
-		public function setVisibility($v) {
-			if ($this->openMarkedContent) {
-				// close existing open marked-content
-				$this->_out('EMC');
-				$this->openMarkedContent = false;
-			}
-			switch($v) {
-				case 'print': {
-					$this->_out('/OC /OC1 BDC');
-					$this->openMarkedContent = true;
-					break;
-				}
-				case 'screen': {
-					$this->_out('/OC /OC2 BDC');
-					$this->openMarkedContent = true;
-					break;
-				}
-				case 'all': {
-					$this->_out('');
-					break;
-				}
-				default: {
-					$this->Error('Incorrect visibility: '.$v);
-					break;
-				}
-			}
-			$this->visibility = $v;
-		}
-
-		/**
-		 * Add transparency parameters to the current extgstate
-		 * @param array $params parameters
-		 * @return the number of extgstates
-		 * @access protected
-		 * @since 3.0.000 (2008-03-27)
-		 */
-		protected function addExtGState($parms) {
-			$n = count($this->extgstates) + 1;
-			// check if this ExtGState already exist
-			for ($i = 1; $i < $n; ++$i) {
-				if ($this->extgstates[$i]['parms'] == $parms) {
-					// return reference to existing ExtGState
-					return $i;
-				}
-			}
-			$this->extgstates[$n]['parms'] = $parms;
-			return $n;
-		}
-
-		/**
-		 * Add an extgstate
-		 * @param array $gs extgstate
-		 * @access protected
-		 * @since 3.0.000 (2008-03-27)
-		 */
-		protected function setExtGState($gs) {
-			$this->_out(sprintf('/GS%d gs', $gs));
-		}
-
-		/**
-		 * Put extgstates for object transparency
-		 * @param array $gs extgstate
-		 * @access protected
-		 * @since 3.0.000 (2008-03-27)
-		 */
-		protected function _putextgstates() {
-			$ne = count($this->extgstates);
-			for ($i = 1; $i <= $ne; ++$i) {
-				$this->_newobj();
-				$this->extgstates[$i]['n'] = $this->n;
-				$out = '<< /Type /ExtGState';
-				foreach ($this->extgstates[$i]['parms'] as $k => $v) {
-					if (is_float($v)) {
-						$v = sprintf('%.2F', $v);
-					}
-					$out .= ' /'.$k.' '.$v;
-				}
-				$out .= ' >> endobj';
-				$this->_out($out);
-			}
-		}
-
-		/**
-		 * Set alpha for stroking (CA) and non-stroking (ca) operations.
-		 * @param float $alpha real value from 0 (transparent) to 1 (opaque)
-		 * @param string $bm blend mode, one of the following: Normal, Multiply, Screen, Overlay, Darken, Lighten, ColorDodge, ColorBurn, HardLight, SoftLight, Difference, Exclusion, Hue, Saturation, Color, Luminosity
-		 * @access public
-		 * @since 3.0.000 (2008-03-27)
-		 */
-		public function setAlpha($alpha, $bm='Normal') {
-			$gs = $this->addExtGState(array('ca' => $alpha, 'CA' => $alpha, 'BM' => '/'.$bm, 'AIS' => 'false'));
-			$this->setExtGState($gs);
-		}
-
-		/**
-		 * Set the default JPEG compression quality (1-100)
-		 * @param int $quality JPEG quality, integer between 1 and 100
-		 * @access public
-		 * @since 3.0.000 (2008-03-27)
-		 */
-		public function setJPEGQuality($quality) {
-			if (($quality < 1) OR ($quality > 100)) {
-				$quality = 75;
-			}
-			$this->jpeg_quality = intval($quality);
-		}
-
-		/**
-		 * Set the default number of columns in a row for HTML tables.
-		 * @param int $cols number of columns
-		 * @access public
-		 * @since 3.0.014 (2008-06-04)
-		 */
-		public function setDefaultTableColumns($cols=4) {
-			$this->default_table_columns = intval($cols);
-		}
-
-		/**
-		 * Set the height of the cell (line height) respect the font height.
-		 * @param int $h cell proportion respect font height (typical value = 1.25).
-		 * @access public
-		 * @since 3.0.014 (2008-06-04)
-		 */
-		public function setCellHeightRatio($h) {
-			$this->cell_height_ratio = $h;
-		}
-
-		/**
-		 * return the height of cell repect font height.
-		 * @access public
-		 * @since 4.0.012 (2008-07-24)
-		 */
-		public function getCellHeightRatio() {
-			return $this->cell_height_ratio;
-		}
-
-		/**
-		 * Set the PDF version (check PDF reference for valid values).
-		 * Default value is 1.t
-		 * @access public
-		 * @since 3.1.000 (2008-06-09)
-		 */
-		public function setPDFVersion($version='1.7') {
-			$this->PDFVersion = $version;
-		}
-
-		/**
-		 * Set the viewer preferences dictionary controlling the way the document is to be presented on the screen or in print.
-		 * (see Section 8.1 of PDF reference, "Viewer Preferences").
-		 * <ul><li>HideToolbar boolean (Optional) A flag specifying whether to hide the viewer application's tool bars when the document is active. Default value: false.</li><li>HideMenubar boolean (Optional) A flag specifying whether to hide the viewer application's menu bar when the document is active. Default value: false.</li><li>HideWindowUI boolean (Optional) A flag specifying whether to hide user interface elements in the document's window (such as scroll bars and navigation controls), leaving only the document's contents displayed. Default value: false.</li><li>FitWindow boolean (Optional) A flag specifying whether to resize the document's window to fit the size of the first displayed page. Default value: false.</li><li>CenterWindow boolean (Optional) A flag specifying whether to position the document's window in the center of the screen. Default value: false.</li><li>DisplayDocTitle boolean (Optional; PDF 1.4) A flag specifying whether the window's title bar should display the document title taken from the Title entry of the document information dictionary (see Section 10.2.1, "Document Information Dictionary"). If false, the title bar should instead display the name of the PDF file containing the document. Default value: false.</li><li>NonFullScreenPageMode name (Optional) The document's page mode, specifying how to display the document on exiting full-screen mode:<ul><li>UseNone Neither document outline nor thumbnail images visible</li><li>UseOutlines Document outline visible</li><li>UseThumbs Thumbnail images visible</li><li>UseOC Optional content group panel visible</li></ul>This entry is meaningful only if the value of the PageMode entry in the catalog dictionary (see Section 3.6.1, "Document Catalog") is FullScreen; it is ignored otherwise. Default value: UseNone.</li><li>ViewArea name (Optional; PDF 1.4) The name of the page boundary representing the area of a page to be displayed when viewing the document on the screen. Valid values are (see Section 10.10.1, "Page Boundaries").:<ul><li>MediaBox</li><li>CropBox (default)</li><li>BleedBox</li><li>TrimBox</li><li>ArtBox</li></ul></li><li>ViewClip name (Optional; PDF 1.4) The name of the page boundary to which the contents of a page are to be clipped when viewing the document on the screen. Valid values are (see Section 10.10.1, "Page Boundaries").:<ul><li>MediaBox</li><li>CropBox (default)</li><li>BleedBox</li><li>TrimBox</li><li>ArtBox</li></ul></li><li>PrintArea name (Optional; PDF 1.4) The name of the page boundary representing the area of a page to be rendered when printing the document. Valid values are (see Section 10.10.1, "Page Boundaries").:<ul><li>MediaBox</li><li>CropBox (default)</li><li>BleedBox</li><li>TrimBox</li><li>ArtBox</li></ul></li><li>PrintClip name (Optional; PDF 1.4) The name of the page boundary to which the contents of a page are to be clipped when printing the document. Valid values are (see Section 10.10.1, "Page Boundaries").:<ul><li>MediaBox</li><li>CropBox (default)</li><li>BleedBox</li><li>TrimBox</li><li>ArtBox</li></ul></li><li>PrintScaling name (Optional; PDF 1.6) The page scaling option to be selected when a print dialog is displayed for this document. Valid values are: <ul><li>None, which indicates that the print dialog should reflect no page scaling</li><li>AppDefault (default), which indicates that applications should use the current print scaling</li></ul></li><li>Duplex name (Optional; PDF 1.7) The paper handling option to use when printing the file from the print dialog. The following values are valid:<ul><li>Simplex - Print single-sided</li><li>DuplexFlipShortEdge - Duplex and flip on the short edge of the sheet</li><li>DuplexFlipLongEdge - Duplex and flip on the long edge of the sheet</li></ul>Default value: none</li><li>PickTrayByPDFSize boolean (Optional; PDF 1.7) A flag specifying whether the PDF page size is used to select the input paper tray. This setting influences only the preset values used to populate the print dialog presented by a PDF viewer application. If PickTrayByPDFSize is true, the check box in the print dialog associated with input paper tray is checked. Note: This setting has no effect on Mac OS systems, which do not provide the ability to pick the input tray by size.</li><li>PrintPageRange array (Optional; PDF 1.7) The page numbers used to initialize the print dialog box when the file is printed. The first page of the PDF file is denoted by 1. Each pair consists of the first and last pages in the sub-range. An odd number of integers causes this entry to be ignored. Negative numbers cause the entire array to be ignored. Default value: as defined by PDF viewer application</li><li>NumCopies integer (Optional; PDF 1.7) The number of copies to be printed when the print dialog is opened for this file. Supported values are the integers 2 through 5. Values outside this range are ignored. Default value: as defined by PDF viewer application, but typically 1</li></ul>
-		 * @param array $preferences array of options.
-		 * @author Nicola Asuni
-		 * @access public
-		 * @since 3.1.000 (2008-06-09)
-		 */
-		public function setViewerPreferences($preferences) {
-			$this->viewer_preferences = $preferences;
-		}
-
-		/**
-		 * Paints color transition registration bars
-		 * @param float $x abscissa of the top left corner of the rectangle.
-		 * @param float $y ordinate of the top left corner of the rectangle.
-		 * @param float $w width of the rectangle.
-		 * @param float $h height of the rectangle.
-		 * @param boolean $transition if true prints tcolor transitions to white.
-		 * @param boolean $vertical if true prints bar vertically.
-		 * @param string $colors colors to print, one letter per color separated by comma (for example 'A,W,R,G,B,C,M,Y,K'): A=black, W=white, R=red, G=green, B=blue, C=cyan, M=magenta, Y=yellow, K=black.
-		 * @author Nicola Asuni
-		 * @since 4.9.000 (2010-03-26)
-		 * @access public
-		 */
-		public function colorRegistrationBar($x, $y, $w, $h, $transition=true, $vertical=false, $colors='A,R,G,B,C,M,Y,K') {
-			$bars = explode(',', $colors);
-			$numbars = count($bars); // number of bars to print
-			// set bar measures
-			if ($vertical) {
-				$coords = array(0, 0, 0, 1);
-				$wb = $w / $numbars; // bar width
-				$hb = $h; // bar height
-				$xd = $wb; // delta x
-				$yd = 0; // delta y
-			} else {
-				$coords = array(1, 0, 0, 0);
-				$wb = $w; // bar width
-				$hb = $h / $numbars; // bar height
-				$xd = 0; // delta x
-				$yd = $hb; // delta y
-			}
-			$xb = $x;
-			$yb = $y;
-			foreach ($bars as $col) {
-				switch ($col) {
-					// set transition colors
-					case 'A': { // BLACK
-						$col_a = array(255);
-						$col_b = array(0);
-						break;
-					}
-					case 'W': { // WHITE
-						$col_a = array(0);
-						$col_b = array(255);
-						break;
-					}
-					case 'R': { // R
-						$col_a = array(255,255,255);
-						$col_b = array(255,0,0);
-						break;
-					}
-					case 'G': { // G
-						$col_a = array(255,255,255);
-						$col_b = array(0,255,0);
-						break;
-					}
-					case 'B': { // B
-						$col_a = array(255,255,255);
-						$col_b = array(0,0,255);
-						break;
-					}
-					case 'C': { // C
-						$col_a = array(0,0,0,0);
-						$col_b = array(100,0,0,0);
-						break;
-					}
-					case 'M': { // M
-						$col_a = array(0,0,0,0);
-						$col_b = array(0,100,0,0);
-						break;
-					}
-					case 'Y': { // Y
-						$col_a = array(0,0,0,0);
-						$col_b = array(0,0,100,0);
-						break;
-					}
-					case 'K': { // K
-						$col_a = array(0,0,0,0);
-						$col_b = array(0,0,0,100);
-						break;
-					}
-					default: { // GRAY
-						$col_a = array(255);
-						$col_b = array(0);
-						break;
-					}
-				}
-				if ($transition) {
-					// color gradient
-					$this->LinearGradient($xb, $yb, $wb, $hb, $col_a, $col_b, $coords);
-				} else {
-					// color rectangle
-					$this->SetFillColorArray($col_b);
-					$this->Rect($xb, $yb, $wb, $hb, 'F', array());
-				}
-				$xb += $xd;
-				$yb += $yd;
-			}
-		}
-
-		/**
-		 * Paints crop mark
-		 * @param float $x abscissa of the crop mark center.
-		 * @param float $y ordinate of the crop mark center.
-		 * @param float $w width of the crop mark.
-		 * @param float $h height of the crop mark.
-		 * @param string $type type of crop mark, one sybol per type separated by comma: A = top left, B = top right, C = bottom left, D = bottom right.
-		 * @param array $color crop mark color (default black).
-		 * @author Nicola Asuni
-		 * @since 4.9.000 (2010-03-26)
-		 * @access public
-		 */
-		public function cropMark($x, $y, $w, $h, $type='A,B,C,D', $color=array(0,0,0)) {
-			$this->SetLineStyle(array('width' => (0.5 / $this->k), 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => $color));
-			$crops = explode(',', $type);
-			$numcrops = count($crops); // number of crop marks to print
-			$dw = $w / 4; // horizontal space to leave before the intersection point
-			$dh = $h / 4; // vertical space to leave before the intersection point
-			foreach ($crops as $crop) {
-				switch ($crop) {
-					case 'A': {
-						$x1 = $x;
-						$y1 = $y - $h;
-						$x2 = $x;
-						$y2 = $y - $dh;
-						$x3 = $x - $w;
-						$y3 = $y;
-						$x4 = $x - $dw;
-						$y4 = $y;
-						break;
-					}
-					case 'B': {
-						$x1 = $x;
-						$y1 = $y - $h;
-						$x2 = $x;
-						$y2 = $y - $dh;
-						$x3 = $x + $dw;
-						$y3 = $y;
-						$x4 = $x + $w;
-						$y4 = $y;
-						break;
-					}
-					case 'C': {
-						$x1 = $x - $w;
-						$y1 = $y;
-						$x2 = $x - $dw;
-						$y2 = $y;
-						$x3 = $x;
-						$y3 = $y + $dh;
-						$x4 = $x;
-						$y4 = $y + $h;
-						break;
-					}
-					case 'D': {
-						$x1 = $x + $dw;
-						$y1 = $y;
-						$x2 = $x + $w;
-						$y2 = $y;
-						$x3 = $x;
-						$y3 = $y + $dh;
-						$x4 = $x;
-						$y4 = $y + $h;
-						break;
-					}
-				}
-				$this->Line($x1, $y1, $x2, $y2);
-				$this->Line($x3, $y3, $x4, $y4);
-			}
-		}
-
-		/**
-		 * Paints a registration mark
-		 * @param float $x abscissa of the registration mark center.
-		 * @param float $y ordinate of the registration mark center.
-		 * @param float $r radius of the crop mark.
-		 * @param boolean $double if true print two concentric crop marks.
-		 * @param array $cola crop mark color (default black).
-		 * @param array $colb second crop mark color.
-		 * @author Nicola Asuni
-		 * @since 4.9.000 (2010-03-26)
-		 * @access public
-		 */
-		public function registrationMark($x, $y, $r, $double=false, $cola=array(0,0,0), $colb=array(255,255,255)) {
-			$line_style = array('width' => (0.5 / $this->k), 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => $cola);
-			$this->SetFillColorArray($cola);
-			$this->PieSector($x, $y, $r, 90, 180, 'F');
-			$this->PieSector($x, $y, $r, 270, 360, 'F');
-			$this->Circle($x, $y, $r, 0, 360, 'C', $line_style, array(), 8);
-			if ($double) {
-				$r2 = $r * 0.5;
-				$this->SetFillColorArray($colb);
-				$this->PieSector($x, $y, $r2, 90, 180, 'F');
-				$this->PieSector($x, $y, $r2, 270, 360, 'F');
-				$this->SetFillColorArray($cola);
-				$this->PieSector($x, $y, $r2, 0, 90, 'F');
-				$this->PieSector($x, $y, $r2, 180, 270, 'F');
-				$this->Circle($x, $y, $r2, 0, 360, 'C', $line_style, array(), 8);
-			}
-		}
-
-		/**
-		 * Paints a linear colour gradient.
-		 * @param float $x abscissa of the top left corner of the rectangle.
-		 * @param float $y ordinate of the top left corner of the rectangle.
-		 * @param float $w width of the rectangle.
-		 * @param float $h height of the rectangle.
-		 * @param array $col1 first color (Grayscale, RGB or CMYK components).
-		 * @param array $col2 second color (Grayscale, RGB or CMYK components).
-		 * @param array $coords array of the form (x1, y1, x2, y2) which defines the gradient vector (see linear_gradient_coords.jpg). The default value is from left to right (x1=0, y1=0, x2=1, y2=0).
-		 * @author Andreas W�rmser, Nicola Asuni
-		 * @since 3.1.000 (2008-06-09)
-		 * @access public
-		 */
-		public function LinearGradient($x, $y, $w, $h, $col1=array(), $col2=array(), $coords=array(0,0,1,0)) {
-			$this->Clip($x, $y, $w, $h);
-			$this->Gradient(2, $coords, array(array('color' => $col1, 'offset' => 0, 'exponent' => 1), array('color' => $col2, 'offset' => 1, 'exponent' => 1)), array(), false);
-		}
-
-		/**
-		 * Paints a radial colour gradient.
-		 * @param float $x abscissa of the top left corner of the rectangle.
-		 * @param float $y ordinate of the top left corner of the rectangle.
-		 * @param float $w width of the rectangle.
-		 * @param float $h height of the rectangle.
-		 * @param array $col1 first color (Grayscale, RGB or CMYK components).
-		 * @param array $col2 second color (Grayscale, RGB or CMYK components).
-		 * @param array $coords array of the form (fx, fy, cx, cy, r) where (fx, fy) is the starting point of the gradient with color1, (cx, cy) is the center of the circle with color2, and r is the radius of the circle (see radial_gradient_coords.jpg). (fx, fy) should be inside the circle, otherwise some areas will not be defined.
-		 * @author Andreas W�rmser, Nicola Asuni
-		 * @since 3.1.000 (2008-06-09)
-		 * @access public
-		 */
-		public function RadialGradient($x, $y, $w, $h, $col1=array(), $col2=array(), $coords=array(0.5,0.5,0.5,0.5,1)) {
-			$this->Clip($x, $y, $w, $h);
-			$this->Gradient(3, $coords, array(array('color' => $col1, 'offset' => 0, 'exponent' => 1), array('color' => $col2, 'offset' => 1, 'exponent' => 1)), array(), false);
-		}
-
-		/**
-		 * Paints a coons patch mesh.
-		 * @param float $x abscissa of the top left corner of the rectangle.
-		 * @param float $y ordinate of the top left corner of the rectangle.
-		 * @param float $w width of the rectangle.
-		 * @param float $h height of the rectangle.
-		 * @param array $col1 first color (lower left corner) (RGB components).
-		 * @param array $col2 second color (lower right corner) (RGB components).
-		 * @param array $col3 third color (upper right corner) (RGB components).
-		 * @param array $col4 fourth color (upper left corner) (RGB components).
-		 * @param array $coords <ul><li>for one patch mesh: array(float x1, float y1, .... float x12, float y12): 12 pairs of coordinates (normally from 0 to 1) which specify the Bezier control points that define the patch. First pair is the lower left edge point, next is its right control point (control point 2). Then the other points are defined in the order: control point 1, edge point, control point 2 going counter-clockwise around the patch. Last (x12, y12) is the first edge point's left control point (control point 1).</li><li>for two or more patch meshes: array[number of patches]: arrays with the following keys for each patch: f: where to put that patch (0 = first patch, 1, 2, 3 = right, top and left of precedent patch - I didn't figure this out completely - just try and error ;-) points: 12 pairs of coordinates of the Bezier control points as above for the first patch, 8 pairs of coordinates for the following patches, ignoring the coordinates already defined by the precedent patch (I also didn't figure out the order of these - also: try and see what's happening) colors: must be 4 colors for the first patch, 2 colors for the following patches</li></ul>
-		 * @param array $coords_min minimum value used by the coordinates. If a coordinate's value is smaller than this it will be cut to coords_min. default: 0
-		 * @param array $coords_max maximum value used by the coordinates. If a coordinate's value is greater than this it will be cut to coords_max. default: 1
-		 * @param boolean $antialias A flag indicating whether to filter the shading function to prevent aliasing artifacts.
-		 * @author Andreas W�rmser, Nicola Asuni
-		 * @since 3.1.000 (2008-06-09)
-		 * @access public
-		 */
-		public function CoonsPatchMesh($x, $y, $w, $h, $col1=array(), $col2=array(), $col3=array(), $col4=array(), $coords=array(0.00,0.0,0.33,0.00,0.67,0.00,1.00,0.00,1.00,0.33,1.00,0.67,1.00,1.00,0.67,1.00,0.33,1.00,0.00,1.00,0.00,0.67,0.00,0.33), $coords_min=0, $coords_max=1, $antialias=false) {
-			$this->Clip($x, $y, $w, $h);
-			$n = count($this->gradients) + 1;
-			$this->gradients[$n] = array();
-			$this->gradients[$n]['type'] = 6; //coons patch mesh
-			$this->gradients[$n]['coords'] = array();
-			$this->gradients[$n]['antialias'] = $antialias;
-			$this->gradients[$n]['colors'] = array();
-			$this->gradients[$n]['transparency'] = false;
-			//check the coords array if it is the simple array or the multi patch array
-			if (!isset($coords[0]['f'])) {
-				//simple array -> convert to multi patch array
-				if (!isset($col1[1])) {
-					$col1[1] = $col1[2] = $col1[0];
-				}
-				if (!isset($col2[1])) {
-					$col2[1] = $col2[2] = $col2[0];
-				}
-				if (!isset($col3[1])) {
-					$col3[1] = $col3[2] = $col3[0];
-				}
-				if (!isset($col4[1])) {
-					$col4[1] = $col4[2] = $col4[0];
-				}
-				$patch_array[0]['f'] = 0;
-				$patch_array[0]['points'] = $coords;
-				$patch_array[0]['colors'][0]['r'] = $col1[0];
-				$patch_array[0]['colors'][0]['g'] = $col1[1];
-				$patch_array[0]['colors'][0]['b'] = $col1[2];
-				$patch_array[0]['colors'][1]['r'] = $col2[0];
-				$patch_array[0]['colors'][1]['g'] = $col2[1];
-				$patch_array[0]['colors'][1]['b'] = $col2[2];
-				$patch_array[0]['colors'][2]['r'] = $col3[0];
-				$patch_array[0]['colors'][2]['g'] = $col3[1];
-				$patch_array[0]['colors'][2]['b'] = $col3[2];
-				$patch_array[0]['colors'][3]['r'] = $col4[0];
-				$patch_array[0]['colors'][3]['g'] = $col4[1];
-				$patch_array[0]['colors'][3]['b'] = $col4[2];
-			} else {
-				//multi patch array
-				$patch_array = $coords;
-			}
-			$bpcd = 65535; //16 bits per coordinate
-			//build the data stream
-			$this->gradients[$n]['stream'] = '';
-			$count_patch = count($patch_array);
-			for ($i=0; $i < $count_patch; ++$i) {
-				$this->gradients[$n]['stream'] .= chr($patch_array[$i]['f']); //start with the edge flag as 8 bit
-				$count_points = count($patch_array[$i]['points']);
-				for ($j=0; $j < $count_points; ++$j) {
-					//each point as 16 bit
-					$patch_array[$i]['points'][$j] = (($patch_array[$i]['points'][$j] - $coords_min) / ($coords_max - $coords_min)) * $bpcd;
-					if ($patch_array[$i]['points'][$j] < 0) {
-						$patch_array[$i]['points'][$j] = 0;
-					}
-					if ($patch_array[$i]['points'][$j] > $bpcd) {
-						$patch_array[$i]['points'][$j] = $bpcd;
-					}
-					$this->gradients[$n]['stream'] .= chr(floor($patch_array[$i]['points'][$j] / 256));
-					$this->gradients[$n]['stream'] .= chr(floor($patch_array[$i]['points'][$j] % 256));
-				}
-				$count_cols = count($patch_array[$i]['colors']);
-				for ($j=0; $j < $count_cols; ++$j) {
-					//each color component as 8 bit
-					$this->gradients[$n]['stream'] .= chr($patch_array[$i]['colors'][$j]['r']);
-					$this->gradients[$n]['stream'] .= chr($patch_array[$i]['colors'][$j]['g']);
-					$this->gradients[$n]['stream'] .= chr($patch_array[$i]['colors'][$j]['b']);
-				}
-			}
-			//paint the gradient
-			$this->_out('/Sh'.$n.' sh');
-			//restore previous Graphic State
-			$this->_out('Q');
-		}
-
-		/**
-		 * Set a rectangular clipping area.
-		 * @param float $x abscissa of the top left corner of the rectangle (or top right corner for RTL mode).
-		 * @param float $y ordinate of the top left corner of the rectangle.
-		 * @param float $w width of the rectangle.
-		 * @param float $h height of the rectangle.
-		 * @author Andreas W�rmser, Nicola Asuni
-		 * @since 3.1.000 (2008-06-09)
-		 * @access protected
-		 */
-		protected function Clip($x, $y, $w, $h) {
-			if ($this->rtl) {
-				$x = $this->w - $x - $w;
-			}
-			//save current Graphic State
-			$s = 'q';
-			//set clipping area
-			$s .= sprintf(' %.2F %.2F %.2F %.2F re W n', $x*$this->k, ($this->h-$y)*$this->k, $w*$this->k, -$h*$this->k);
-			//set up transformation matrix for gradient
-			$s .= sprintf(' %.3F 0 0 %.3F %.3F %.3F cm', $w*$this->k, $h*$this->k, $x*$this->k, ($this->h-($y+$h))*$this->k);
-			$this->_out($s);
-		}
-
-		/**
-		 * Output gradient.
-		 * @param int $type type of gradient (1 Function-based shading; 2 Axial shading; 3 Radial shading; 4 Free-form Gouraud-shaded triangle mesh; 5 Lattice-form Gouraud-shaded triangle mesh; 6 Coons patch mesh; 7 Tensor-product patch mesh). (Not all types are currently supported)
-		 * @param array $coords array of coordinates.
-		 * @param array $stops array gradient color components: color = array of GRAY, RGB or CMYK color components; offset = (0 to 1) represents a location along the gradient vector; exponent = exponent of the exponential interpolation function (default = 1).
-		 * @param array $background An array of colour components appropriate to the colour space, specifying a single background colour value.
-		 * @param boolean $antialias A flag indicating whether to filter the shading function to prevent aliasing artifacts.
-		 * @author Nicola Asuni
-		 * @since 3.1.000 (2008-06-09)
-		 * @access public
-		 */
-		public function Gradient($type, $coords, $stops, $background=array(), $antialias=false) {
-			$n = count($this->gradients) + 1;
-			$this->gradients[$n] = array();
-			$this->gradients[$n]['type'] = $type;
-			$this->gradients[$n]['coords'] = $coords;
-			$this->gradients[$n]['antialias'] = $antialias;
-			$this->gradients[$n]['colors'] = array();
-			$this->gradients[$n]['transparency'] = false;
-			// color space
-			$numcolspace = count($stops[0]['color']);
-			$bcolor = array_values($background);
-			switch($numcolspace) {
-				case 4: { // CMYK
-					$this->gradients[$n]['colspace'] = 'DeviceCMYK';
-					if (!empty($background)) {
-						$this->gradients[$n]['background'] = sprintf('%.3F %.3F %.3F %.3F', $bcolor[0]/100, $bcolor[1]/100, $bcolor[2]/100, $bcolor[3]/100);
-					}
-					break;
-				}
-				case 3: { // RGB
-					$this->gradients[$n]['colspace'] = 'DeviceRGB';
-					if (!empty($background)) {
-						$this->gradients[$n]['background'] = sprintf('%.3F %.3F %.3F', $bcolor[0]/255, $bcolor[1]/255, $bcolor[2]/255);
-					}
-					break;
-				}
-				case 1: { // Gray scale
-					$this->gradients[$n]['colspace'] = 'DeviceGray';
-					if (!empty($background)) {
-						$this->gradients[$n]['background'] = sprintf('%.3F', $bcolor[0]/255);
-					}
-					break;
-				}
-			}
-			$num_stops = count($stops);
-			$last_stop_id = $num_stops - 1;
-			foreach ($stops as $key => $stop) {
-				$this->gradients[$n]['colors'][$key] = array();
-				// offset represents a location along the gradient vector
-				if (isset($stop['offset'])) {
-					$this->gradients[$n]['colors'][$key]['offset'] = $stop['offset'];
-				} else {
-					if ($key == 0) {
-						$this->gradients[$n]['colors'][$key]['offset'] = 0;
-					} elseif ($key == $last_stop_id) {
-						$this->gradients[$n]['colors'][$key]['offset'] = 1;
-					} else {
-						$offsetstep = (1 - $this->gradients[$n]['colors'][($key - 1)]['offset']) / ($num_stops - $key);
-						$this->gradients[$n]['colors'][$key]['offset'] = $this->gradients[$n]['colors'][($key - 1)]['offset'] + $offsetstep;
-					}
-				}
-				if (isset($stop['opacity'])) {
-					$this->gradients[$n]['colors'][$key]['opacity'] = $stop['opacity'];
-					if ($stop['opacity'] < 1) {
-						$this->gradients[$n]['transparency'] = true;
-					}
-				} else {
-					$this->gradients[$n]['colors'][$key]['opacity'] = 1;
-				}
-				// exponent for the exponential interpolation function
-				if (isset($stop['exponent'])) {
-					$this->gradients[$n]['colors'][$key]['exponent'] = $stop['exponent'];
-				} else {
-					$this->gradients[$n]['colors'][$key]['exponent'] = 1;
-				}
-				// set colors
-				$color = array_values($stop['color']);
-				switch($numcolspace) {
-					case 4: { // CMYK
-						$this->gradients[$n]['colors'][$key]['color'] = sprintf('%.3F %.3F %.3F %.3F', $color[0]/100, $color[1]/100, $color[2]/100, $color[3]/100);
-						break;
-					}
-					case 3: { // RGB
-						$this->gradients[$n]['colors'][$key]['color'] = sprintf('%.3F %.3F %.3F', $color[0]/255, $color[1]/255, $color[2]/255);
-						break;
-					}
-					case 1: { // Gray scale
-						$this->gradients[$n]['colors'][$key]['color'] = sprintf('%.3F', $color[0]/255);
-						break;
-					}
-				}
-			}
-			if ($this->gradients[$n]['transparency']) {
-				// paint luminosity gradient
-				$this->_out('/TGS'.$n.' gs');
-			}
-			//paint the gradient
-			$this->_out('/Sh'.$n.' sh');
-			//restore previous Graphic State
-			$this->_out('Q');
-		}
-
-		/**
-		 * Output gradient shaders.
-		 * @author Nicola Asuni
-		 * @since 3.1.000 (2008-06-09)
-		 * @access protected
-		 */
-		function _putshaders() {
-			$idt = count($this->gradients); //index for transparency gradients
-			foreach ($this->gradients as $id => $grad) {
-				if (($grad['type'] == 2) OR ($grad['type'] == 3)) {
-					$this->_newobj();
-					$fc = $this->n;
-					$out = '<<';
-					$out .= ' /FunctionType 3';
-					$out .= ' /Domain [0 1]';
-					$functions = '';
-					$bounds = '';
-					$encode = '';
-					$i = 1;
-					$num_cols = count($grad['colors']);
-					$lastcols = $num_cols - 1;
-					for ($i = 1; $i < $num_cols; ++$i) {
-						$functions .= ($fc + $i).' 0 R ';
-						if ($i < $lastcols) {
-							$bounds .= sprintf('%.3F ', $grad['colors'][$i]['offset']);
-						}
-						$encode .= '0 1 ';
-					}
-					$out .= ' /Functions ['.trim($functions).']';
-					$out .= ' /Bounds ['.trim($bounds).']';
-					$out .= ' /Encode ['.trim($encode).']';
-					$out .= ' >>';
-					$out .= ' endobj';
-					$this->_out($out);
-					for ($i = 1; $i < $num_cols; ++$i) {
-						$this->_newobj();
-						$out = '<<';
-						$out .= ' /FunctionType 2';
-						$out .= ' /Domain [0 1]';
-						$out .= ' /C0 ['.$grad['colors'][($i - 1)]['color'].']';
-						$out .= ' /C1 ['.$grad['colors'][$i]['color'].']';
-						$out .= ' /N '.$grad['colors'][$i]['exponent'];
-						$out .= ' >>';
-						$out .= ' endobj';
-						$this->_out($out);
-					}
-					// set transparency fuctions
-					if ($grad['transparency']) {
-						$this->_newobj();
-						$ft = $this->n;
-						$out = '<<';
-						$out .= ' /FunctionType 3';
-						$out .= ' /Domain [0 1]';
-						$functions = '';
-						$i = 1;
-						$num_cols = count($grad['colors']);
-						for ($i = 1; $i < $num_cols; ++$i) {
-							$functions .= ($ft + $i).' 0 R ';
-						}
-						$out .= ' /Functions ['.trim($functions).']';
-						$out .= ' /Bounds ['.trim($bounds).']';
-						$out .= ' /Encode ['.trim($encode).']';
-						$out .= ' >>';
-						$out .= ' endobj';
-						$this->_out($out);
-						for ($i = 1; $i < $num_cols; ++$i) {
-							$this->_newobj();
-							$out = '<<';
-							$out .= ' /FunctionType 2';
-							$out .= ' /Domain [0 1]';
-							$out .= ' /C0 ['.$grad['colors'][($i - 1)]['opacity'].']';
-							$out .= ' /C1 ['.$grad['colors'][$i]['opacity'].']';
-							$out .= ' /N '.$grad['colors'][$i]['exponent'];
-							$out .= ' >>';
-							$out .= ' endobj';
-							$this->_out($out);
-						}
-					}
-				}
-				// set shading object
-				$this->_newobj();
-				$out = '<< /ShadingType '.$grad['type'];
-				if (isset($grad['colspace'])) {
-					$out .= ' /ColorSpace /'.$grad['colspace'];
-				} else {
-					$out .= ' /ColorSpace /DeviceRGB';
-				}
-				if (isset($grad['background']) AND !empty($grad['background'])) {
-					$out .= ' /Background ['.$grad['background'].']';
-				}
-				if (isset($grad['antialias']) AND ($grad['antialias'] === true)) {
-					$out .= ' /AntiAlias true';
-				}
-				if ($grad['type'] == 2) {
-					$out .= ' '.sprintf('/Coords [%.3F %.3F %.3F %.3F]', $grad['coords'][0], $grad['coords'][1], $grad['coords'][2], $grad['coords'][3]);
-					$out .= ' /Domain [0 1]';
-					$out .= ' /Function '.$fc.' 0 R';
-					$out .= ' /Extend [true true]';
-					$out .= ' >>';
-				} elseif ($grad['type'] == 3) {
-					//x0, y0, r0, x1, y1, r1
-					//at this this time radius of inner circle is 0
-					$out .= ' '.sprintf('/Coords [%.3F %.3F 0 %.3F %.3F %.3F]', $grad['coords'][0], $grad['coords'][1], $grad['coords'][2], $grad['coords'][3], $grad['coords'][4]);
-					$out .= ' /Domain [0 1]';
-					$out .= ' /Function '.$fc.' 0 R';
-					$out .= ' /Extend [true true]';
-					$out .= ' >>';
-				} elseif ($grad['type'] == 6) {
-					$out .= ' /BitsPerCoordinate 16';
-					$out .= ' /BitsPerComponent 8';
-					$out .= ' /Decode[0 1 0 1 0 1 0 1 0 1]';
-					$out .= ' /BitsPerFlag 8';
-					$out .= ' /Length '.strlen($grad['stream']);
-					$out .= ' >>';
-					$out .= ' '.$this->_getstream($grad['stream']);
-				}
-				$out .= ' endobj';
-				$this->_out($out);
-				if ($grad['transparency']) {
-					$shading_transparency = preg_replace('/\/ColorSpace \/[^\s]+/si', '/ColorSpace /DeviceGray', $out);
-					$shading_transparency = preg_replace('/\/Function [0-9]+ /si', '/Function '.$ft.' ', $shading_transparency);
-				}
-				$this->gradients[$id]['id'] = $this->n;
-				// set pattern object
-				$this->_newobj();
-				$out = '<< /Type /Pattern /PatternType 2';
-				$out .= ' /Shading '.$this->gradients[$id]['id'].' 0 R';
-				$out .= ' >> endobj';
-				$this->_out($out);
-				$this->gradients[$id]['pattern'] = $this->n;
-				// set shading and pattern for transparency mask
-				if ($grad['transparency']) {
-					// luminosity pattern
-					$idgs = $id + $idt;
-					$this->_newobj();
-					$this->_out($shading_transparency);
-					$this->gradients[$idgs]['id'] = $this->n;
-					$this->_newobj();
-					$out = '<< /Type /Pattern /PatternType 2';
-					$out .= ' /Shading '.$this->gradients[$idgs]['id'].' 0 R';
-					$out .= ' >> endobj';
-					$this->_out($out);
-					$this->gradients[$idgs]['pattern'] = $this->n;
-					// luminosity XObject
-					$this->_newobj();
-					$filter = ($this->compress)?' /Filter /FlateDecode':'';
-					$out = '<< /Type /XObject /Subtype /Form /FormType 1'.$filter;
-					$stream = 'q /a0 gs /Pattern cs /p'.$idgs.' scn 0 0 '.$this->wPt.' '.$this->hPt.' re f Q';
-					$out .= ' /Length '.strlen($stream);
-					$out .= ' /BBox [0 0 '.$this->wPt.' '.$this->hPt.']';
-					$out .= ' /Group << /Type /Group /S /Transparency /CS /DeviceGray >>';
-					$out .= ' /Resources <<';
-					$out .= ' /ExtGState << /a0 << /ca 1 /CA 1 >> >>';
-					$out .= ' /Pattern << /p'.$idgs.' '.$this->gradients[$idgs]['pattern'].' 0 R >>';
-					$out .= ' >>';
-					$out .= ' >> ';
-					$out .= $this->_getstream($stream);
-					$out .= ' endobj';
-					$this->_out($out);
-					// SMask
-					$this->_newobj();
-					$out = '<< /Type /Mask /S /Luminosity /G '.($this->n - 1).' 0 R >> endobj';
-					$this->_out($out);
-					// ExtGState
-					$this->_newobj();
-					$out = '<< /Type /ExtGState /SMask '.($this->n - 1).' 0 R /AIS false >> endobj';
-					$this->_out($out);
-					$this->extgstates[] = array('n' => $this->n, 'name' => 'TGS'.$id);
-				}
-			}
-		}
-
-		/**
-		 * Draw the sector of a circle.
-		 * It can be used for instance to render pie charts.
-		 * @param float $xc abscissa of the center.
-		 * @param float $yc ordinate of the center.
-		 * @param float $r radius.
-		 * @param float $a start angle (in degrees).
-		 * @param float $b end angle (in degrees).
-		 * @param string $style Style of rendering. See the getPathPaintOperator() function for more information.
-		 * @param float $cw: indicates whether to go clockwise (default: true).
-		 * @param float $o: origin of angles (0 for 3 o'clock, 90 for noon, 180 for 9 o'clock, 270 for 6 o'clock). Default: 90.
-		 * @author Maxime Delorme, Nicola Asuni
-		 * @since 3.1.000 (2008-06-09)
-		 * @access public
-		 */
-		public function PieSector($xc, $yc, $r, $a, $b, $style='FD', $cw=true, $o=90) {
-			$this->PieSectorXY($xc, $yc, $r, $r, $a, $b, $style, $cw, $o);
-		}
-
-		/**
-		 * Draw the sector of an ellipse.
-		 * It can be used for instance to render pie charts.
-		 * @param float $xc abscissa of the center.
-		 * @param float $yc ordinate of the center.
-		 * @param float $rx the x-axis radius.
-		 * @param float $ry the y-axis radius.
-		 * @param float $a start angle (in degrees).
-		 * @param float $b end angle (in degrees).
-		 * @param string $style Style of rendering. See the getPathPaintOperator() function for more information.
-		 * @param float $cw: indicates whether to go clockwise.
-		 * @param float $o: origin of angles (0 for 3 o'clock, 90 for noon, 180 for 9 o'clock, 270 for 6 o'clock).
-		 * @param integer $nc Number of curves used to draw a 90 degrees portion of arc.
-		 * @author Maxime Delorme, Nicola Asuni
-		 * @since 3.1.000 (2008-06-09)
-		 * @access public
-		 */
-		public function PieSectorXY($xc, $yc, $rx, $ry, $a, $b, $style='FD', $cw=false, $o=0, $nc=2) {
-			if ($this->rtl) {
-				$xc = $this->w - $xc;
-			}
-			$op = $this->getPathPaintOperator($style);
-			if ($op == 'f') {
-				$line_style = array();
-			}
-			if ($cw) {
-				$d = $b;
-				$b = 360 - $a + $o;
-				$a = 360 - $d + $o;
-			} else {
-				$b += $o;
-				$a += $o;
-			}
-			$this->_outellipticalarc($xc, $yc, $rx, $ry, 0, $a, $b, true, $nc);
-			$this->_out($op);
-		}
-
-		/**
-		 * Embed vector-based Adobe Illustrator (AI) or AI-compatible EPS files.
-		 * NOTE: EPS is not yet fully implemented, use the setRasterizeVectorImages() method to enable/disable rasterization of SVG images using ImageMagick library.
-		 * Only vector drawing is supported, not text or bitmap.
-		 * Although the script was successfully tested with various AI format versions, best results are probably achieved with files that were exported in the AI3 format (tested with Illustrator CS2, Freehand MX and Photoshop CS2).
-		 * @param string $file Name of the file containing the image.
-		 * @param float $x Abscissa of the upper-left corner.
-		 * @param float $y Ordinate of the upper-left corner.
-		 * @param float $w Width of the image in the page. If not specified or equal to zero, it is automatically calculated.
-		 * @param float $h Height of the image in the page. If not specified or equal to zero, it is automatically calculated.
-		 * @param mixed $link URL or identifier returned by AddLink().
-		 * @param boolean useBoundingBox specifies whether to position the bounding box (true) or the complete canvas (false) at location (x,y). Default value is true.
-		 * @param string $align Indicates the alignment of the pointer next to image insertion relative to image height. The value can be:<ul><li>T: top-right for LTR or top-left for RTL</li><li>M: middle-right for LTR or middle-left for RTL</li><li>B: bottom-right for LTR or bottom-left for RTL</li><li>N: next line</li></ul>
-		 * @param string $palign Allows to center or align the image on the current line. Possible values are:<ul><li>L : left align</li><li>C : center</li><li>R : right align</li><li>'' : empty string : left for LTR or right for RTL</li></ul>
-		 * @param mixed $border Indicates if borders must be drawn around the image. The value can be either a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul>or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul>
-		 * @param boolean $fitonpage if true the image is resized to not exceed page dimensions.
-		 * @author Valentin Schmidt, Nicola Asuni
-		 * @since 3.1.000 (2008-06-09)
-		 * @access public
-		 */
-		public function ImageEps($file, $x='', $y='', $w=0, $h=0, $link='', $useBoundingBox=true, $align='', $palign='', $border=0, $fitonpage=false) {
-			if ($this->rasterize_vector_images) {
-				// convert SVG to raster image using GD or ImageMagick libraries
-				return $this->Image($file, $x, $y, $w, $h, 'EPS', $link, $align, true, 300, $palign, false, false, $border, false, false, $fitonpage);
-			}
-			if ($x === '') {
-				$x = $this->x;
-			}
-			if ($y === '') {
-				$y = $this->y;
-			}
-			$k = $this->k;
-			$data = file_get_contents($file);
-			if ($data === false) {
-				$this->Error('EPS file not found: '.$file);
-			}
-			$regs = array();
-			// EPS/AI compatibility check (only checks files created by Adobe Illustrator!)
-			preg_match("/%%Creator:([^\r\n]+)/", $data, $regs); # find Creator
-			if (count($regs) > 1) {
-				$version_str = trim($regs[1]); # e.g. "Adobe Illustrator(R) 8.0"
-				if (strpos($version_str, 'Adobe Illustrator') !== false) {
-					$versexp = explode(' ', $version_str);
-					$version = (float)array_pop($versexp);
-					if ($version >= 9) {
-						$this->Error('This version of Adobe Illustrator file is not supported: '.$file);
-					}
-				}
-			}
-			// strip binary bytes in front of PS-header
-			$start = strpos($data, '%!PS-Adobe');
-			if ($start > 0) {
-				$data = substr($data, $start);
-			}
-			// find BoundingBox params
-			preg_match("/%%BoundingBox:([^\r\n]+)/", $data, $regs);
-			if (count($regs) > 1) {
-				list($x1, $y1, $x2, $y2) = explode(' ', trim($regs[1]));
-			} else {
-				$this->Error('No BoundingBox found in EPS file: '.$file);
-			}
-			$start = strpos($data, '%%EndSetup');
-			if ($start === false) {
-				$start = strpos($data, '%%EndProlog');
-			}
-			if ($start === false) {
-				$start = strpos($data, '%%BoundingBox');
-			}
-			$data = substr($data, $start);
-			$end = strpos($data, '%%PageTrailer');
-			if ($end===false) {
-				$end = strpos($data, 'showpage');
-			}
-			if ($end) {
-				$data = substr($data, 0, $end);
-			}
-			// calculate image width and height on document
-			if (($w <= 0) AND ($h <= 0)) {
-				$w = ($x2 - $x1) / $k;
-				$h = ($y2 - $y1) / $k;
-			} elseif ($w <= 0) {
-				$w = ($x2-$x1) / $k * ($h / (($y2 - $y1) / $k));
-			} elseif ($h <= 0) {
-				$h = ($y2 - $y1) / $k * ($w / (($x2 - $x1) / $k));
-			}
-			// Check whether we need a new page first as this does not fit
-			$prev_x = $this->x;
-			if ($this->checkPageBreak($h, $y)) {
-				$y = $this->y;
-				if ($this->rtl) {
-					$x += ($prev_x - $this->x);
-				} else {
-					$x += ($this->x - $prev_x);
-				}
-			}
-			// resize image to be contained on a single page
-			if ($fitonpage) {
-				$ratio_wh = $w / $h;
-				if (($y + $h) > $this->PageBreakTrigger) {
-					$h = $this->PageBreakTrigger - $y;
-					$w = $h * $ratio_wh;
-				}
-				if (($x + $w) > ($this->w - $this->rMargin)) {
-					$w = $this->w - $this->rMargin - $x;
-					$h = $w / $ratio_wh;
-				}
-			}
-			// set scaling factors
-			$scale_x = $w / (($x2 - $x1) / $k);
-			$scale_y = $h / (($y2 - $y1) / $k);
-			// set alignment
-			$this->img_rb_y = $y + $h;
-			// set alignment
-			if ($this->rtl) {
-				if ($palign == 'L') {
-					$ximg = $this->lMargin;
-				} elseif ($palign == 'C') {
-					$ximg = ($this->w - $w) / 2;
-				} elseif ($palign == 'R') {
-					$ximg = $this->w - $this->rMargin - $w;
-				} else {
-					$ximg = $this->w - $x - $w;
-				}
-				$this->img_rb_x = $ximg;
-			} else {
-				if ($palign == 'L') {
-					$ximg = $this->lMargin;
-				} elseif ($palign == 'C') {
-					$ximg = ($this->w - $w) / 2;
-				} elseif ($palign == 'R') {
-					$ximg = $this->w - $this->rMargin - $w;
-				} else {
-					$ximg = $x;
-				}
-				$this->img_rb_x = $ximg + $w;
-			}
-			if ($useBoundingBox) {
-				$dx = $ximg * $k - $x1;
-				$dy = $y * $k - $y1;
-			} else {
-				$dx = $ximg * $k;
-				$dy = $y * $k;
-			}
-			// save the current graphic state
-			$this->_out('q'.$this->epsmarker);
-			// translate
-			$this->_out(sprintf('%.3F %.3F %.3F %.3F %.3F %.3F cm', 1, 0, 0, 1, $dx, $dy + ($this->hPt - (2 * $y * $k) - ($y2 - $y1))));
-			// scale
-			if (isset($scale_x)) {
-				$this->_out(sprintf('%.3F %.3F %.3F %.3F %.3F %.3F cm', $scale_x, 0, 0, $scale_y, $x1 * (1 - $scale_x), $y2 * (1 - $scale_y)));
-			}
-			// handle pc/unix/mac line endings
-			preg_match('/[\r\n]+/s', $data, $regs);
-			$lines = explode($regs[0], $data);
-			$u=0;
-			$cnt = count($lines);
-			for ($i=0; $i < $cnt; ++$i) {
-				$line = $lines[$i];
-				if (($line == '') OR ($line{0} == '%')) {
-					continue;
-				}
-				$len = strlen($line);
-				$chunks = explode(' ', $line);
-				$cmd = array_pop($chunks);
-				// RGB
-				if (($cmd == 'Xa') OR ($cmd == 'XA')) {
-					$b = array_pop($chunks);
-					$g = array_pop($chunks);
-					$r = array_pop($chunks);
-					$this->_out(''.$r.' '.$g.' '.$b.' '.($cmd=='Xa'?'rg':'RG')); //substr($line, 0, -2).'rg' -> in EPS (AI8): c m y k r g b rg!
-					continue;
-				}
-				switch ($cmd) {
-					case 'm':
-					case 'l':
-					case 'v':
-					case 'y':
-					case 'c':
-					case 'k':
-					case 'K':
-					case 'g':
-					case 'G':
-					case 's':
-					case 'S':
-					case 'J':
-					case 'j':
-					case 'w':
-					case 'M':
-					case 'd':
-					case 'n': {
-						$this->_out($line);
-						break;
-					}
-					case 'x': {// custom fill color
-						list($c,$m,$y,$k) = $chunks;
-						$this->_out(''.$c.' '.$m.' '.$y.' '.$k.' k');
-						break;
-					}
-					case 'X': { // custom stroke color
-						list($c,$m,$y,$k) = $chunks;
-						$this->_out(''.$c.' '.$m.' '.$y.' '.$k.' K');
-						break;
-					}
-					case 'Y':
-					case 'N':
-					case 'V':
-					case 'L':
-					case 'C': {
-						$line{$len-1} = strtolower($cmd);
-						$this->_out($line);
-						break;
-					}
-					case 'b':
-					case 'B': {
-						$this->_out($cmd . '*');
-						break;
-					}
-					case 'f':
-					case 'F': {
-						if ($u > 0) {
-							$isU = false;
-							$max = min($i+5, $cnt);
-							for ($j=$i+1; $j < $max; ++$j) {
-								$isU = ($isU OR (($lines[$j] == 'U') OR ($lines[$j] == '*U')));
-							}
-							if ($isU) {
-								$this->_out('f*');
-							}
-						} else {
-							$this->_out('f*');
-						}
-						break;
-					}
-					case '*u': {
-						++$u;
-						break;
-					}
-					case '*U': {
-						--$u;
-						break;
-					}
-				}
-			}
-			// restore previous graphic state
-			$this->_out($this->epsmarker.'Q');
-			if (!empty($border)) {
-				$bx = $x;
-				$by = $y;
-				$this->x = $ximg;
-				if ($this->rtl) {
-					$this->x += $w;
-				}
-				$this->y = $y;
-				$this->Cell($w, $h, '', $border, 0, '', 0, '', 0);
-				$this->x = $bx;
-				$this->y = $by;
-			}
-			if ($link) {
-				$this->Link($ximg, $y, $w, $h, $link, 0);
-			}
-			// set pointer to align the successive text/objects
-			switch($align) {
-				case 'T':{
-					$this->y = $y;
-					$this->x = $this->img_rb_x;
-					break;
-				}
-				case 'M':{
-					$this->y = $y + round($h/2);
-					$this->x = $this->img_rb_x;
-					break;
-				}
-				case 'B':{
-					$this->y = $this->img_rb_y;
-					$this->x = $this->img_rb_x;
-					break;
-				}
-				case 'N':{
-					$this->SetY($this->img_rb_y);
-					break;
-				}
-				default:{
-					break;
-				}
-			}
-			$this->endlinex = $this->img_rb_x;
-		}
-
-		/**
-	 	 * Set document barcode.
-		 * @param string $bc barcode
-		 * @access public
-		 */
-		public function setBarcode($bc='') {
-			$this->barcode = $bc;
-		}
-
-		/**
-	 	 * Get current barcode.
-		 * @return string
-		 * @access public
-		 * @since 4.0.012 (2008-07-24)
-		 */
-		public function getBarcode() {
-			return $this->barcode;
-		}
-
-		/**
-	 	 * Print a Linear Barcode.
-	 	 * @param string $code code to print
-	 	 * @param string $type type of barcode (see barcodes.php for supported formats).
-		 * @param int $x x position in user units
-		 * @param int $y y position in user units
-		 * @param int $w width in user units
-		 * @param int $h height in user units
-		 * @param float $xres width of the smallest bar in user units
-		 * @param array $style array of options:<ul><li>string $style['position'] barcode position inside the specified width: L = left (default for LTR); C = center; R = right (default for RTL); S = stretch</li><li>boolean $style['border'] if true prints a border around the barcode</li><li>int $style['padding'] padding to leave around the barcode in user units (set to 'auto' for automatic padding)</li><li>array $style['fgcolor'] color array for bars and text</li><li>mixed $style['bgcolor'] color array for background or false for transparent</li><li>boolean $style["text"] boolean if true prints text below the barcode</li><li>string $style['font'] font name for text</li><li>int $style['fontsize'] font size for text</li><li>int $style['stretchtext']: 0 = disabled; 1 = horizontal scaling only if necessary; 2 = forced horizontal scaling; 3 = character spacing only if necessary; 4 = forced character spacing</li></ul>
-		 * @param string $align Indicates the alignment of the pointer next to barcode insertion relative to barcode height. The value can be:<ul><li>T: top-right for LTR or top-left for RTL</li><li>M: middle-right for LTR or middle-left for RTL</li><li>B: bottom-right for LTR or bottom-left for RTL</li><li>N: next line</li></ul>
-		 * @author Nicola Asuni
-		 * @since 3.1.000 (2008-06-09)
-		 * @access public
-		 */
-		public function write1DBarcode($code, $type, $x='', $y='', $w='', $h='', $xres=0.4, $style='', $align='') {
-			if ($this->empty_string($code)) {
-				return;
-			}
-			require_once(dirname(__FILE__).'/barcodes.php');
-			// save current graphic settings
-			$gvars = $this->getGraphicVars();
-			// create new barcode object
-			$barcodeobj = new TCPDFBarcode($code, $type);
-			$arrcode = $barcodeobj->getBarcodeArray();
-			if ($arrcode === false) {
-				$this->Error('Error in 1D barcode string');
-			}
-			// set default values
-			if (!isset($style['position'])) {
-				if ($this->rtl) {
-					$style['position'] = 'R';
-				} else {
-					$style['position'] = 'L';
-				}
-			}
-			if (!isset($style['fgcolor'])) {
-				$style['fgcolor'] = array(0,0,0); // default black
-			}
-			if (!isset($style['bgcolor'])) {
-				$style['bgcolor'] = false; // default transparent
-			}
-			if (!isset($style['border'])) {
-				$style['border'] = false;
-			}
-			$fontsize = 0;
-			if (!isset($style['text'])) {
-				$style['text'] = false;
-			}
-			if ($style['text'] AND isset($style['font'])) {
-				if (isset($style['fontsize'])) {
-					$fontsize = $style['fontsize'];
-				}
-				$this->SetFont($style['font'], '', $fontsize);
-			}
-			if (!isset($style['stretchtext'])) {
-				$style['stretchtext'] = 4;
-			}
-			// set foreground color
-			$this->SetDrawColorArray($style['fgcolor']);
-			$this->SetTextColorArray($style['fgcolor']);
-			if ($this->empty_string($w) OR ($w <= 0)) {
-				if ($this->rtl) {
-					$w = $this->x - $this->lMargin;
-				} else {
-					$w = $this->w - $this->rMargin - $this->x;
-				}
-			}
-			if ($this->empty_string($x)) {
-				$x = $this->GetX();
-			}
-			if ($this->rtl) {
-				$x = $this->w - $x;
-			}
-			if ($this->empty_string($y)) {
-				$y = $this->GetY();
-			}
-			if ($this->empty_string($xres)) {
-				$xres = 0.4;
-			}
-			if ($this->empty_string($h) OR ($h <= 0)) {
-				$h = $w / 3;
-			}
-			// padding
-			if (!isset($style['padding'])) {
-				$style['padding'] = 0;
-			} elseif ($style['padding'] === 'auto') {
-				$style['padding'] = $h / 4;
-			}
-			$fbw = ($arrcode['maxw'] * $xres) + (2 * $style['padding']);
-			$extraspace = ($this->cell_height_ratio * $fontsize / $this->k) + (2 * $style['padding']);
-			$prev_x = $this->x;
-			// maximum bar height
-			$barh = $h;
-			$h += $extraspace;
-			if ($this->checkPageBreak($h, $y)) {
-				$y = $this->GetY() + $this->cMargin;
-				if ($this->rtl) {
-					$x += ($prev_x - $this->x);
-				} else {
-					$x += ($this->x - $prev_x);
-				}
-			}
-			switch ($style['position']) {
-				case 'L': { // left
-					if ($this->rtl) {
-						$xpos = $x - $w;
-					} else {
-						$xpos = $x;
-					}
-					break;
-				}
-				case 'C': { // center
-					$xdiff = (($w - $fbw) / 2);
-					if ($this->rtl) {
-						$xpos = $x - $w + $xdiff;
-					} else {
-						$xpos = $x + $xdiff;
-					}
-					break;
-				}
-				case 'R': { // right
-					if ($this->rtl) {
-						$xpos = $x - $fbw;
-					} else {
-						$xpos = $x + $w - $fbw;
-					}
-					break;
-				}
-				case 'S': { // stretch
-					$fbw = $w;
-					$xres = ($w - (2 * $style['padding'])) / $arrcode['maxw'];
-					if ($this->rtl) {
-						$xpos = $x - $w;
-					} else {
-						$xpos = $x;
-					}
-					break;
-				}
-			}
-			$xpos_rect = $xpos;
-			$xpos = $xpos_rect + $style['padding'];
-			$xpos_text = $xpos;
-			// barcode is always printed in LTR direction
-			$tempRTL = $this->rtl;
-			$this->rtl = false;
-			// print background color
-			if ($style['bgcolor']) {
-				$this->Rect($xpos_rect, $y, $fbw, $h, $style['border'] ? 'DF' : 'F', '', $style['bgcolor']);
-			} elseif ($style['border']) {
-				$this->Rect($xpos_rect, $y, $fbw, $h, 'D');
-			}
-			// print bars
-			if ($arrcode !== false) {
-				foreach ($arrcode['bcode'] as $k => $v) {
-					$bw = ($v['w'] * $xres);
-					if ($v['t']) {
-						// draw a vertical bar
-						$ypos = $y + $style['padding'] + ($v['p'] * $barh / $arrcode['maxh']);
-						$this->Rect($xpos, $ypos, $bw, ($v['h'] * $barh  / $arrcode['maxh']), 'F', array(), $style['fgcolor']);
-					}
-					$xpos += $bw;
-				}
-			}
-			// print text
-			if ($style['text']) {
-				// print text
-				$this->x = $xpos_text;
-				$this->y = $y + $style['padding'] + $barh;
-				$this->Cell(($arrcode['maxw'] * $xres), ($this->cell_height_ratio * $fontsize / $this->k), $code, 0, 0, 'C', 0, '', $style['stretchtext']);
-			}
-			// restore original direction
-			$this->rtl = $tempRTL;
-			// restore previous settings
-			$this->setGraphicVars($gvars);
-			// set bottomcoordinates
-			$this->img_rb_y = $y + $h;
-			if ($this->rtl) {
-				// set left side coordinate
-				$this->img_rb_x = ($this->w - $x - $w);
-			} else {
-				// set right side coordinate
-				$this->img_rb_x = $x + $w;
-			}
-			// set pointer to align the successive text/objects
-			switch($align) {
-				case 'T':{
-					$this->y = $y;
-					$this->x = $this->img_rb_x;
-					break;
-				}
-				case 'M':{
-					$this->y = $y + round($h/2);
-					$this->x = $this->img_rb_x;
-					break;
-				}
-				case 'B':{
-					$this->y = $this->img_rb_y;
-					$this->x = $this->img_rb_x;
-					break;
-				}
-				case 'N':{
-					$this->SetY($this->img_rb_y);
-					break;
-				}
-				default:{
-					break;
-				}
-			}
-		}
-
-		/**
-	 	 * This function is DEPRECATED, please use the new write1DBarcode() function.
-		 * @param int $x x position in user units
-		 * @param int $y y position in user units
-		 * @param int $w width in user units
-		 * @param int $h height position in user units
-		 * @param string $type type of barcode (I25, C128A, C128B, C128C, C39)
-		 * @param string $style barcode style
-		 * @param string $font font for text
-		 * @param int $xres x resolution
-		 * @param string $code code to print
-		 * @deprecated deprecated since version 3.1.000 (2008-06-10)
-		 * @access public
-		 * @see write1DBarcode()
-		 */
-		public function writeBarcode($x, $y, $w, $h, $type, $style, $font, $xres, $code) {
-			// convert old settings for the new write1DBarcode() function.
-			$xres = 1 / $xres;
-			$newstyle = array(
-				'position' => 'L',
-				'border' => false,
-				'padding' => 0,
-				'fgcolor' => array(0,0,0),
-				'bgcolor' => false,
-				'text' => true,
-				'font' => $font,
-				'fontsize' => 8,
-				'stretchtext' => 4
-			);
-			if ($style & 1) {
-				$newstyle['border'] = true;
-			}
-			if ($style & 2) {
-				$newstyle['bgcolor'] = false;
-			}
-			if ($style & 4) {
-				$newstyle['position'] = 'C';
-			} elseif ($style & 8) {
-				$newstyle['position'] = 'L';
-			} elseif ($style & 16) {
-				$newstyle['position'] = 'R';
-			}
-			if ($style & 128) {
-				$newstyle['text'] = true;
-			}
-			if ($style & 256) {
-				$newstyle['stretchtext'] = 4;
-			}
-			$this->write1DBarcode($code, $type, $x, $y, $w, $h, $xres, $newstyle, '');
-		}
-
-		/**
-	 	 * Print 2D Barcode.
-	 	 * @param string $code code to print
-	 	 * @param string $type type of barcode (see 2dbarcodes.php for supported formats).
-		 * @param int $x x position in user units
-		 * @param int $y y position in user units
-		 * @param int $w width in user units
-		 * @param int $h height in user units
-		 * @param array $style array of options:<ul><li>boolean $style['border'] if true prints a border around the barcode</li><li>int $style['padding'] padding to leave around the barcode in user units (set to 'auto' for automatic padding)</li><li>array $style['fgcolor'] color array for bars and text</li><li>mixed $style['bgcolor'] color array for background or false for transparent</li></ul>
-		 * @param string $align Indicates the alignment of the pointer next to barcode insertion relative to barcode height. The value can be:<ul><li>T: top-right for LTR or top-left for RTL</li><li>M: middle-right for LTR or middle-left for RTL</li><li>B: bottom-right for LTR or bottom-left for RTL</li><li>N: next line</li></ul>
-		 * @author Nicola Asuni
-		 * @since 4.5.037 (2009-04-07)
-		 * @access public
-		 */
-		public function write2DBarcode($code, $type, $x='', $y='', $w='', $h='', $style='', $align='') {
-			if ($this->empty_string($code)) {
-				return;
-			}
-			require_once(dirname(__FILE__).'/2dbarcodes.php');
-			// save current graphic settings
-			$gvars = $this->getGraphicVars();
-			// create new barcode object
-			$barcodeobj = new TCPDF2DBarcode($code, $type);
-			$arrcode = $barcodeobj->getBarcodeArray();
-			if ($arrcode === false) {
-				$this->Error('Error in 2D barcode string');
-			}
-			// set default values
-			if (!isset($style['fgcolor'])) {
-				$style['fgcolor'] = array(0,0,0); // default black
-			}
-			if (!isset($style['bgcolor'])) {
-				$style['bgcolor'] = false; // default transparent
-			}
-			if (!isset($style['border'])) {
-				$style['border'] = false;
-			}
-			// set foreground color
-			$this->SetDrawColorArray($style['fgcolor']);
-			if ($this->empty_string($x)) {
-				$x = $this->GetX();
-			}
-			if ($this->rtl) {
-				$x = $this->w - $x;
-			}
-			if ($this->empty_string($y)) {
-				$y = $this->GetY();
-			}
-			if ($this->empty_string($w) OR ($w <= 0)) {
-				if ($this->rtl) {
-					$w = $x - $this->lMargin;
-				} else {
-					$w = $this->w - $this->rMargin - $x;
-				}
-			}
-			if ($this->empty_string($h) OR ($h <= 0)) {
-				// 2d barcodes are square by default
-				$h = $w;
-			}
-			$prev_x = $this->x;
-			if ($this->checkPageBreak($h, $y)) {
-				$y = $this->GetY() + $this->cMargin;
-				if ($this->rtl) {
-					$x += ($prev_x - $this->x);
-				} else {
-					$x += ($this->x - $prev_x);
-				}
-			}
-			// padding
-			if (!isset($style['padding'])) {
-				$style['padding'] = 0;
-			} elseif ($style['padding'] === 'auto') {
-				$style['padding'] = 4 * $w / (8 + $arrcode['num_cols']);
-			}
-			// calculate barcode size (excluding padding)
-			$bw = $w - (2 * $style['padding']);
-			$bh = $h - (2 * $style['padding']);
-			// calculate starting coordinates
-			if ($this->rtl) {
-				$xpos = $x - $w;
-			} else {
-				$xpos = $x;
-			}
-			$xpos += $style['padding'];
-			$ypos = $y + $style['padding'];
-			// barcode is always printed in LTR direction
-			$tempRTL = $this->rtl;
-			$this->rtl = false;
-			// print background color
-			if ($style['bgcolor']) {
-				$this->Rect($x, $y, $w, $h, $style['border'] ? 'DF' : 'F', '', $style['bgcolor']);
-			} elseif ($style['border']) {
-				$this->Rect($x, $y, $w, $h, 'D');
-			}
-			// print barcode cells
-			if ($arrcode !== false) {
-				$rows = $arrcode['num_rows'];
-				$cols = $arrcode['num_cols'];
-				// calculate dimension of single barcode cell
-				$cw = $bw / $cols;
-				$ch = $bh / $rows;
-				// for each row
-				for ($r = 0; $r < $rows; ++$r) {
-					$xr = $xpos;
-					// for each column
-					for ($c = 0; $c < $cols; ++$c) {
-						if ($arrcode['bcode'][$r][$c] == 1) {
-							// draw a single barcode cell
-							$this->Rect($xr, $ypos, $cw, $ch, 'F', array(), $style['fgcolor']);
-						}
-						$xr += $cw;
-					}
-					$ypos += $ch;
-				}
-			}
-			// restore original direction
-			$this->rtl = $tempRTL;
-			// restore previous settings
-			$this->setGraphicVars($gvars);
-			// set bottomcoordinates
-			$this->img_rb_y = $y + $h;
-			if ($this->rtl) {
-				// set left side coordinate
-				$this->img_rb_x = ($this->w - $x - $w);
-			} else {
-				// set right side coordinate
-				$this->img_rb_x = $x + $w;
-			}
-			// set pointer to align the successive text/objects
-			switch($align) {
-				case 'T':{
-					$this->y = $y;
-					$this->x = $this->img_rb_x;
-					break;
-				}
-				case 'M':{
-					$this->y = $y + round($h/2);
-					$this->x = $this->img_rb_x;
-					break;
-				}
-				case 'B':{
-					$this->y = $this->img_rb_y;
-					$this->x = $this->img_rb_x;
-					break;
-				}
-				case 'N':{
-					$this->SetY($this->img_rb_y);
-					break;
-				}
-				default:{
-					break;
-				}
-			}
-		}
-
-		/**
-		 * Returns an array containing current margins:
-		 * <ul>
-				<li>$ret['left'] = left  margin</li>
-				<li>$ret['right'] = right margin</li>
-				<li>$ret['top'] = top margin</li>
-				<li>$ret['bottom'] = bottom margin</li>
-				<li>$ret['header'] = header margin</li>
-				<li>$ret['footer'] = footer margin</li>
-				<li>$ret['cell'] = cell margin</li>
-		 * </ul>
-		 * @return array containing all margins measures
-		 * @access public
-		 * @since 3.2.000 (2008-06-23)
-		 */
-		public function getMargins() {
-			$ret = array(
-				'left' => $this->lMargin,
-				'right' => $this->rMargin,
-				'top' => $this->tMargin,
-				'bottom' => $this->bMargin,
-				'header' => $this->header_margin,
-				'footer' => $this->footer_margin,
-				'cell' => $this->cMargin,
-			);
-			return $ret;
-		}
-
-		/**
-		 * Returns an array containing original margins:
-		 * <ul>
-				<li>$ret['left'] = left  margin</li>
-				<li>$ret['right'] = right margin</li>
-		 * </ul>
-		 * @return array containing all margins measures
-		 * @access public
-		 * @since 4.0.012 (2008-07-24)
-		 */
-		public function getOriginalMargins() {
-			$ret = array(
-				'left' => $this->original_lMargin,
-				'right' => $this->original_rMargin
-			);
-			return $ret;
-		}
-
-		/**
-		 * Returns the current font size.
-		 * @return current font size
-		 * @access public
-		 * @since 3.2.000 (2008-06-23)
-		 */
-		public function getFontSize() {
-			return $this->FontSize;
-		}
-
-		/**
-		 * Returns the current font size in points unit.
-		 * @return current font size in points unit
-		 * @access public
-		 * @since 3.2.000 (2008-06-23)
-		 */
-		public function getFontSizePt() {
-			return $this->FontSizePt;
-		}
-
-		/**
-		 * Returns the current font family name.
-		 * @return string current font family name
-		 * @access public
-		 * @since 4.3.008 (2008-12-05)
-		 */
-		public function getFontFamily() {
-			return $this->FontFamily;
-		}
-
-		/**
-		 * Returns the current font style.
-		 * @return string current font style
-		 * @access public
-		 * @since 4.3.008 (2008-12-05)
-		 */
-		public function getFontStyle() {
-			return $this->FontStyle;
-		}
-
-		/**
-		 * Prints a cell (rectangular area) with optional borders, background color and html text string.
-		 * The upper-left corner of the cell corresponds to the current position. After the call, the current position moves to the right or to the next line.<br />
-		 * If automatic page breaking is enabled and the cell goes beyond the limit, a page break is done before outputting.
-		 * @param float $w Cell width. If 0, the cell extends up to the right margin.
-		 * @param float $h Cell minimum height. The cell extends automatically if needed.
-		 * @param float $x upper-left corner X coordinate
-		 * @param float $y upper-left corner Y coordinate
-		 * @param string $html html text to print. Default value: empty string.
-		 * @param mixed $border Indicates if borders must be drawn around the cell. The value can be either a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul>or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul>
-		 * @param int $ln Indicates where the current position should go after the call. Possible values are:<ul><li>0: to the right (or left for RTL language)</li><li>1: to the beginning of the next line</li><li>2: below</li></ul>
-	Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value: 0.
-		 * @param int $fill Indicates if the cell background must be painted (1) or transparent (0). Default value: 0.
-		 * @param boolean $reseth if true reset the last cell height (default true).
-		 * @param string $align Allows to center or align the text. Possible values are:<ul><li>L : left align</li><li>C : center</li><li>R : right align</li><li>'' : empty string : left for LTR or right for RTL</li></ul>
-		 * @param boolean $autopadding if true, uses internal padding and automatically adjust it to account for line width.
-		 * @access public
-		 * @uses MultiCell()
-		 * @see Multicell(), writeHTML()
-		 */
-		public function writeHTMLCell($w, $h, $x, $y, $html='', $border=0, $ln=0, $fill=0, $reseth=true, $align='', $autopadding=true) {
-			return $this->MultiCell($w, $h, $html, $border, $align, $fill, $ln, $x, $y, $reseth, 0, true, $autopadding, 0);
-		}
-
-		/**
-	 	 * Returns the HTML DOM array.
-	 	 * <ul><li>$dom[$key]['tag'] = true if tag, false otherwise;</li><li>$dom[$key]['value'] = tag name or text;</li><li>$dom[$key]['opening'] = true if opening tag, false otherwise;</li><li>$dom[$key]['attribute'] = array of attributes (attribute name is the key);</li><li>$dom[$key]['style'] = array of style attributes (attribute name is the key);</li><li>$dom[$key]['parent'] = id of parent element;</li><li>$dom[$key]['fontname'] = font family name;</li><li>$dom[$key]['fontstyle'] = font style;</li><li>$dom[$key]['fontsize'] = font size in points;</li><li>$dom[$key]['bgcolor'] = RGB array of background color;</li><li>$dom[$key]['fgcolor'] = RGB array of foreground color;</li><li>$dom[$key]['width'] = width in pixels;</li><li>$dom[$key]['height'] = height in pixels;</li><li>$dom[$key]['align'] = text alignment;</li><li>$dom[$key]['cols'] = number of colums in table;</li><li>$dom[$key]['rows'] = number of rows in table;</li></ul>
-		 * @param string $html html code
-		 * @return array
-		 * @access protected
-		 * @since 3.2.000 (2008-06-20)
-		 */
-		protected function getHtmlDomArray($html) {
-			// define block tags
-			$blocktags = array('blockquote','br','dd','dl','div','dt','h1','h2','h3','h4','h5','h6','hr','li','ol','p','pre','ul','tcpdf','table','tr','td');
-			// remove all unsupported tags (the line below lists all supported tags)
-			$html = strip_tags($html, '<marker/><a><b><blockquote><body><br><br/><dd><del><div><dl><dt><em><font><form><h1><h2><h3><h4><h5><h6><hr><i><img><input><label><li><ol><option><p><pre><select><small><span><strong><sub><sup><table><tablehead><tcpdf><td><textarea><th><thead><tr><tt><u><ul>');
-			//replace some blank characters
-			$html = preg_replace('/<pre/', '<xre', $html); // preserve pre tag
-			$html = preg_replace('/<(table|tr|td|th|tcpdf|blockquote|dd|div|dl|dt|form|h1|h2|h3|h4|h5|h6|br|hr|li|ol|ul|p)([^\>]*)>[\n\r\t]+/', '<\\1\\2>', $html);
-			$html = preg_replace('@(\r\n|\r)@', "\n", $html);
-			$repTable = array("\t" => ' ', "\0" => ' ', "\x0B" => ' ', "\\" => "\\\\");
-			$html = strtr($html, $repTable);
-			$offset = 0;
-			while (($offset < strlen($html)) AND ($pos = strpos($html, '</pre>', $offset)) !== false) {
-				$html_a = substr($html, 0, $offset);
-				$html_b = substr($html, $offset, ($pos - $offset + 6));
-				while (preg_match("'<xre([^\>]*)>(.*?)\n(.*?)</pre>'si", $html_b)) {
-					// preserve newlines on <pre> tag
-					$html_b = preg_replace("'<xre([^\>]*)>(.*?)\n(.*?)</pre>'si", "<xre\\1>\\2<br />\\3</pre>", $html_b);
-				}
-				$html = $html_a.$html_b.substr($html, $pos + 6);
-				$offset = strlen($html_a.$html_b);
-			}
-			$offset = 0;
-			while (($offset < strlen($html)) AND ($pos = strpos($html, '</textarea>', $offset)) !== false) {
-				$html_a = substr($html, 0, $offset);
-				$html_b = substr($html, $offset, ($pos - $offset + 11));
-				while (preg_match("'<textarea([^\>]*)>(.*?)\n(.*?)</textarea>'si", $html_b)) {
-					// preserve newlines on <textarea> tag
-					$html_b = preg_replace("'<textarea([^\>]*)>(.*?)\n(.*?)</textarea>'si", "<textarea\\1>\\2<TBR>\\3</textarea>", $html_b);
-					$html_b = preg_replace("'<textarea([^\>]*)>(.*?)[\"](.*?)</textarea>'si", "<textarea\\1>\\2''\\3</textarea>", $html_b);
-				}
-				$html = $html_a.$html_b.substr($html, $pos + 11);
-				$offset = strlen($html_a.$html_b);
-			}
-			$html = preg_replace("'([\s]*)<option'si", "<option", $html);
-			$html = preg_replace("'</option>([\s]*)'si", "</option>", $html);
-			$offset = 0;
-			while (($offset < strlen($html)) AND ($pos = strpos($html, '</option>', $offset)) !== false) {
-				$html_a = substr($html, 0, $offset);
-				$html_b = substr($html, $offset, ($pos - $offset + 9));
-				while (preg_match("'<option([^\>]*)>(.*?)</option>'si", $html_b)) {
-					$html_b = preg_replace("'<option([\s]+)value=\"([^\"]*)\"([^\>]*)>(.*?)</option>'si", "\\2\t\\4\r", $html_b);
-					$html_b = preg_replace("'<option([^\>]*)>(.*?)</option>'si", "\\2\r", $html_b);
-				}
-				$html = $html_a.$html_b.substr($html, $pos + 9);
-				$offset = strlen($html_a.$html_b);
-			}
-			$html = preg_replace("'<select([^\>]*)>'si", "<select\\1 opt=\"", $html);
-			$html = preg_replace("'([\s]+)</select>'si", "\" />", $html);
-			$html = str_replace("\n", ' ', $html);
-			// restore textarea newlines
-			$html = str_replace('<TBR>', "\n", $html);
-			// remove extra spaces from code
-			$html = preg_replace('/[\s]+<\/(table|tr|td|th|ul|ol|li|dl|dt|dd)>/', '</\\1>', $html);
-			$html = preg_replace('/[\s]+<(tr|td|th|ul|ol|li|dl|dt|dd|br)/', '<\\1', $html);
-			$html = preg_replace('/<\/(table|tr|td|th|blockquote|dd|dt|dl|div|dt|h1|h2|h3|h4|h5|h6|hr|li|ol|ul|p)>[\s]+</', '</\\1><', $html);
-			$html = preg_replace('/<\/(td|th)>/', '<marker style="font-size:0"/></\\1>', $html);
-			$html = preg_replace('/<\/table>([\s]*)<marker style="font-size:0"\/>/', '</table>', $html);
-			$html = preg_replace('/[\s]*<img/', ' <img', $html);
-			$html = preg_replace('/<img([^\>]*)>/xi', '<img\\1><span><marker style="font-size:0"/></span>', $html);
-			$html = preg_replace('/<xre/', '<pre', $html); // restore pre tag
-			$html = preg_replace('/<textarea([^\>]*)>/xi', '<textarea\\1 value="', $html);
-			$html = preg_replace('/<\/textarea>/', '" />', $html);
-			// trim string
-			$html = preg_replace('/^[\s]+/', '', $html);
-			$html = preg_replace('/[\s]+$/', '', $html);
-			// pattern for generic tag
-			$tagpattern = '/(<[^>]+>)/';
-			// explodes the string
-			$a = preg_split($tagpattern, $html, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
-			// count elements
-			$maxel = count($a);
-			$elkey = 0;
-			$key = 0;
-			// create an array of elements
-			$dom = array();
-			$dom[$key] = array();
-			// set first void element
-			$dom[$key]['tag'] = false;
-			$dom[$key]['block'] = false;
-			$dom[$key]['value'] = '';
-			$dom[$key]['parent'] = 0;
-			$dom[$key]['fontname'] = $this->FontFamily;
-			$dom[$key]['fontstyle'] = $this->FontStyle;
-			$dom[$key]['fontsize'] = $this->FontSizePt;
-			$dom[$key]['stroke'] = $this->textstrokewidth;
-			$dom[$key]['fill'] = (($this->textrendermode % 2) == 0);
-			$dom[$key]['clip'] = ($this->textrendermode > 3);
-			$dom[$key]['line-height'] = $this->cell_height_ratio;
-			$dom[$key]['bgcolor'] = false;
-			$dom[$key]['fgcolor'] = $this->fgcolor;
-			$dom[$key]['strokecolor'] = $this->strokecolor;
-			$dom[$key]['align'] = '';
-			$dom[$key]['listtype'] = '';
-			$dom[$key]['text-indent'] = 0;
-			$thead = false; // true when we are inside the THEAD tag
-			++$key;
-			$level = array();
-			array_push($level, 0); // root
-			while ($elkey < $maxel) {
-				$dom[$key] = array();
-				$element = $a[$elkey];
-				$dom[$key]['elkey'] = $elkey;
-				if (preg_match($tagpattern, $element)) {
-					// html tag
-					$element = substr($element, 1, -1);
-					// get tag name
-					preg_match('/[\/]?([a-zA-Z0-9]*)/', $element, $tag);
-					$tagname = strtolower($tag[1]);
-					// check if we are inside a table header
-					if ($tagname == 'thead') {
-						if ($element{0} == '/') {
-							$thead = false;
-						} else {
-							$thead = true;
-						}
-						++$elkey;
-						continue;
-					}
-					$dom[$key]['tag'] = true;
-					$dom[$key]['value'] = $tagname;
-					if (in_array($dom[$key]['value'], $blocktags)) {
-						$dom[$key]['block'] = true;
-					} else {
-						$dom[$key]['block'] = false;
-					}
-					if ($element{0} == '/') {
-						// *** closing html tag
-						$dom[$key]['opening'] = false;
-						$dom[$key]['parent'] = end($level);
-						array_pop($level);
-						$dom[$key]['fontname'] = $dom[($dom[($dom[$key]['parent'])]['parent'])]['fontname'];
-						$dom[$key]['fontstyle'] = $dom[($dom[($dom[$key]['parent'])]['parent'])]['fontstyle'];
-						$dom[$key]['fontsize'] = $dom[($dom[($dom[$key]['parent'])]['parent'])]['fontsize'];
-						$dom[$key]['stroke'] = $dom[($dom[($dom[$key]['parent'])]['parent'])]['stroke'];
-						$dom[$key]['fill'] = $dom[($dom[($dom[$key]['parent'])]['parent'])]['fill'];
-						$dom[$key]['clip'] = $dom[($dom[($dom[$key]['parent'])]['parent'])]['clip'];
-						$dom[$key]['line-height'] = $dom[($dom[($dom[$key]['parent'])]['parent'])]['line-height'];
-						$dom[$key]['bgcolor'] = $dom[($dom[($dom[$key]['parent'])]['parent'])]['bgcolor'];
-						$dom[$key]['fgcolor'] = $dom[($dom[($dom[$key]['parent'])]['parent'])]['fgcolor'];
-						$dom[$key]['strokecolor'] = $dom[($dom[($dom[$key]['parent'])]['parent'])]['strokecolor'];
-						$dom[$key]['align'] = $dom[($dom[($dom[$key]['parent'])]['parent'])]['align'];
-						if (isset($dom[($dom[($dom[$key]['parent'])]['parent'])]['listtype'])) {
-							$dom[$key]['listtype'] = $dom[($dom[($dom[$key]['parent'])]['parent'])]['listtype'];
-						}
-						// set the number of columns in table tag
-						if (($dom[$key]['value'] == 'tr') AND (!isset($dom[($dom[($dom[$key]['parent'])]['parent'])]['cols']))) {
-							$dom[($dom[($dom[$key]['parent'])]['parent'])]['cols'] = $dom[($dom[$key]['parent'])]['cols'];
-						}
-						if (($dom[$key]['value'] == 'td') OR ($dom[$key]['value'] == 'th')) {
-							$dom[($dom[$key]['parent'])]['content'] = '';
-							for ($i = ($dom[$key]['parent'] + 1); $i < $key; ++$i) {
-								$dom[($dom[$key]['parent'])]['content'] .= $a[$dom[$i]['elkey']];
-							}
-							$key = $i;
-							// mark nested tables
-							$dom[($dom[$key]['parent'])]['content'] = str_replace('<table', '<table nested="true"', $dom[($dom[$key]['parent'])]['content']);
-							// remove thead sections from nested tables
-							$dom[($dom[$key]['parent'])]['content'] = str_replace('<thead>', '', $dom[($dom[$key]['parent'])]['content']);
-							$dom[($dom[$key]['parent'])]['content'] = str_replace('</thead>', '', $dom[($dom[$key]['parent'])]['content']);
-						}
-						// store header rows on a new table
-						if (($dom[$key]['value'] == 'tr') AND ($dom[($dom[$key]['parent'])]['thead'] === true)) {
-							if ($this->empty_string($dom[($dom[($dom[$key]['parent'])]['parent'])]['thead'])) {
-								$dom[($dom[($dom[$key]['parent'])]['parent'])]['thead'] = $a[$dom[($dom[($dom[$key]['parent'])]['parent'])]['elkey']];
-							}
-							for ($i = $dom[$key]['parent']; $i <= $key; ++$i) {
-								$dom[($dom[($dom[$key]['parent'])]['parent'])]['thead'] .= $a[$dom[$i]['elkey']];
-							}
-							if (!isset($dom[($dom[$key]['parent'])]['attribute'])) {
-								$dom[($dom[$key]['parent'])]['attribute'] = array();
-							}
-							// header elements must be always contained in a single page
-							$dom[($dom[$key]['parent'])]['attribute']['nobr'] = 'true';
-						}
-						if (($dom[$key]['value'] == 'table') AND (!$this->empty_string($dom[($dom[$key]['parent'])]['thead']))) {
-							// remove the nobr attributes from the table header
-							$dom[($dom[$key]['parent'])]['thead'] = str_replace(' nobr="true"', '', $dom[($dom[$key]['parent'])]['thead']);
-							$dom[($dom[$key]['parent'])]['thead'] .= '</tablehead>';
-						}
-					} else {
-						// *** opening html tag
-						$dom[$key]['opening'] = true;
-						$dom[$key]['parent'] = end($level);
-						if (substr($element, -1, 1) != '/') {
-							// not self-closing tag
-							array_push($level, $key);
-							$dom[$key]['self'] = false;
-						} else {
-							$dom[$key]['self'] = true;
-						}
-						// copy some values from parent
-						$parentkey = 0;
-						if ($key > 0) {
-							$parentkey = $dom[$key]['parent'];
-							$dom[$key]['fontname'] = $dom[$parentkey]['fontname'];
-							$dom[$key]['fontstyle'] = $dom[$parentkey]['fontstyle'];
-							$dom[$key]['fontsize'] = $dom[$parentkey]['fontsize'];
-							$dom[$key]['stroke'] = $dom[$parentkey]['stroke'];
-							$dom[$key]['fill'] = $dom[$parentkey]['fill'];
-							$dom[$key]['clip'] = $dom[$parentkey]['clip'];
-							$dom[$key]['line-height'] = $dom[$parentkey]['line-height'];
-							$dom[$key]['bgcolor'] = $dom[$parentkey]['bgcolor'];
-							$dom[$key]['fgcolor'] = $dom[$parentkey]['fgcolor'];
-							$dom[$key]['strokecolor'] = $dom[$parentkey]['strokecolor'];
-							$dom[$key]['align'] = $dom[$parentkey]['align'];
-							$dom[$key]['listtype'] = $dom[$parentkey]['listtype'];
-							$dom[$key]['text-indent'] = $dom[$parentkey]['text-indent'];
-						}
-						// get attributes
-						preg_match_all('/([^=\s]*)=["]?([^"]*)["]?/', $element, $attr_array, PREG_PATTERN_ORDER);
-						$dom[$key]['attribute'] = array(); // reset attribute array
-						while (list($id, $name) = each($attr_array[1])) {
-							$dom[$key]['attribute'][strtolower($name)] = $attr_array[2][$id];
-						}
-						// split style attributes
-						if (isset($dom[$key]['attribute']['style'])) {
-							// get style attributes
-							preg_match_all('/([^;:\s]*):([^;]*)/', $dom[$key]['attribute']['style'], $style_array, PREG_PATTERN_ORDER);
-							$dom[$key]['style'] = array(); // reset style attribute array
-							while (list($id, $name) = each($style_array[1])) {
-								$dom[$key]['style'][strtolower($name)] = trim($style_array[2][$id]);
-							}
-							// --- get some style attributes ---
-							if (isset($dom[$key]['style']['font-family'])) {
-								// font family
-								if (isset($dom[$key]['style']['font-family'])) {
-									$fontslist = preg_split('/[,]/', strtolower($dom[$key]['style']['font-family']));
-									foreach ($fontslist as $font) {
-										$font = trim(strtolower($font));
-										if (in_array($font, $this->fontlist) OR in_array($font, $this->fontkeys)) {
-											$dom[$key]['fontname'] = $font;
-											break;
-										}
-									}
-								}
-							}
-							// list-style-type
-							if (isset($dom[$key]['style']['list-style-type'])) {
-								$dom[$key]['listtype'] = trim(strtolower($dom[$key]['style']['list-style-type']));
-								if ($dom[$key]['listtype'] == 'inherit') {
-									$dom[$key]['listtype'] = $dom[$parentkey]['listtype'];
-								}
-							}
-							// text-indent
-							if (isset($dom[$key]['style']['text-indent'])) {
-								$dom[$key]['text-indent'] = $this->getHTMLUnitToUnits($dom[$key]['style']['text-indent']);
-								if ($dom[$key]['text-indent'] == 'inherit') {
-									$dom[$key]['text-indent'] = $dom[$parentkey]['text-indent'];
-								}
-							}
-							// font size
-							if (isset($dom[$key]['style']['font-size'])) {
-								$fsize = trim($dom[$key]['style']['font-size']);
-								switch ($fsize) {
-									// absolute-size
-									case 'xx-small': {
-										$dom[$key]['fontsize'] = $dom[0]['fontsize'] - 4;
-										break;
-									}
-									case 'x-small': {
-										$dom[$key]['fontsize'] = $dom[0]['fontsize'] - 3;
-										break;
-									}
-									case 'small': {
-										$dom[$key]['fontsize'] = $dom[0]['fontsize'] - 2;
-										break;
-									}
-									case 'medium': {
-										$dom[$key]['fontsize'] = $dom[0]['fontsize'];
-										break;
-									}
-									case 'large': {
-										$dom[$key]['fontsize'] = $dom[0]['fontsize'] + 2;
-										break;
-									}
-									case 'x-large': {
-										$dom[$key]['fontsize'] = $dom[0]['fontsize'] + 4;
-										break;
-									}
-									case 'xx-large': {
-										$dom[$key]['fontsize'] = $dom[0]['fontsize'] + 6;
-										break;
-									}
-									// relative-size
-									case 'smaller': {
-										$dom[$key]['fontsize'] = $dom[$parentkey]['fontsize'] - 3;
-										break;
-									}
-									case 'larger': {
-										$dom[$key]['fontsize'] = $dom[$parentkey]['fontsize'] + 3;
-										break;
-									}
-									default: {
-										$dom[$key]['fontsize'] = $this->getHTMLUnitToUnits($fsize, $dom[$parentkey]['fontsize'], 'pt', true);
-									}
-								}
-							}
-							// line-height
-							if (isset($dom[$key]['style']['line-height'])) {
-								$lineheight = trim($dom[$key]['style']['line-height']);
-								switch ($lineheight) {
-									// A normal line height. This is default
-									case 'normal': {
-										$dom[$key]['line-height'] = $dom[0]['line-height'];
-										break;
-									}
-									default: {
-										if (is_numeric($lineheight)) {
-											$lineheight = $lineheight * 100;
-										}
-										$dom[$key]['line-height'] = $this->getHTMLUnitToUnits($lineheight, 1, '%', true);
-									}
-								}
-							}
-							// font style
-							if (isset($dom[$key]['style']['font-weight']) AND (strtolower($dom[$key]['style']['font-weight']{0}) == 'b')) {
-								$dom[$key]['fontstyle'] .= 'B';
-							}
-							if (isset($dom[$key]['style']['font-style']) AND (strtolower($dom[$key]['style']['font-style']{0}) == 'i')) {
-								$dom[$key]['fontstyle'] .= 'I';
-							}
-							// font color
-							if (isset($dom[$key]['style']['color']) AND (!$this->empty_string($dom[$key]['style']['color']))) {
-								$dom[$key]['fgcolor'] = $this->convertHTMLColorToDec($dom[$key]['style']['color']);
-							}
-							// background color
-							if (isset($dom[$key]['style']['background-color']) AND (!$this->empty_string($dom[$key]['style']['background-color']))) {
-								$dom[$key]['bgcolor'] = $this->convertHTMLColorToDec($dom[$key]['style']['background-color']);
-							}
-							// text-decoration
-							if (isset($dom[$key]['style']['text-decoration'])) {
-								$decors = explode(' ', strtolower($dom[$key]['style']['text-decoration']));
-								foreach ($decors as $dec) {
-									$dec = trim($dec);
-									if (!$this->empty_string($dec)) {
-										if ($dec{0} == 'u') {
-											// underline
-											$dom[$key]['fontstyle'] .= 'U';
-										} elseif ($dec{0} == 'l') {
-											// line-trough
-											$dom[$key]['fontstyle'] .= 'D';
-										} elseif ($dec{0} == 'o') {
-											// overline
-											$dom[$key]['fontstyle'] .= 'O';
-										}
-									}
-								}
-							}
-							// check for width attribute
-							if (isset($dom[$key]['style']['width'])) {
-								$dom[$key]['width'] = $dom[$key]['style']['width'];
-							}
-							// check for height attribute
-							if (isset($dom[$key]['style']['height'])) {
-								$dom[$key]['height'] = $dom[$key]['style']['height'];
-							}
-							// check for text alignment
-							if (isset($dom[$key]['style']['text-align'])) {
-								$dom[$key]['align'] = strtoupper($dom[$key]['style']['text-align']{0});
-							}
-							// check for border attribute
-							if (isset($dom[$key]['style']['border'])) {
-								$dom[$key]['attribute']['border'] = $dom[$key]['style']['border'];
-							}
-							// page-break-inside
-							if (isset($dom[$key]['style']['page-break-inside']) AND ($dom[$key]['style']['page-break-inside'] == 'avoid')) {
-								$dom[$key]['attribute']['nobr'] = 'true';
-							}
-							// page-break-before
-							if (isset($dom[$key]['style']['page-break-before'])) {
-								if ($dom[$key]['style']['page-break-before'] == 'always') {
-									$dom[$key]['attribute']['pagebreak'] = 'true';
-								} elseif ($dom[$key]['style']['page-break-before'] == 'left') {
-									$dom[$key]['attribute']['pagebreak'] = 'left';
-								} elseif ($dom[$key]['style']['page-break-before'] == 'right') {
-									$dom[$key]['attribute']['pagebreak'] = 'right';
-								}
-							}
-							// page-break-after
-							if (isset($dom[$key]['style']['page-break-after'])) {
-								if ($dom[$key]['style']['page-break-after'] == 'always') {
-									$dom[$key]['attribute']['pagebreakafter'] = 'true';
-								} elseif ($dom[$key]['style']['page-break-after'] == 'left') {
-									$dom[$key]['attribute']['pagebreakafter'] = 'left';
-								} elseif ($dom[$key]['style']['page-break-after'] == 'right') {
-									$dom[$key]['attribute']['pagebreakafter'] = 'right';
-								}
-							}
-						}
-						// check for font tag
-						if ($dom[$key]['value'] == 'font') {
-							// font family
-							if (isset($dom[$key]['attribute']['face'])) {
-								$fontslist = preg_split('/[,]/', strtolower($dom[$key]['attribute']['face']));
-								foreach ($fontslist as $font) {
-									$font = trim(strtolower($font));
-									if (in_array($font, $this->fontlist) OR in_array($font, $this->fontkeys)) {
-										$dom[$key]['fontname'] = $font;
-										break;
-									}
-								}
-							}
-							// font size
-							if (isset($dom[$key]['attribute']['size'])) {
-								if ($key > 0) {
-									if ($dom[$key]['attribute']['size']{0} == '+') {
-										$dom[$key]['fontsize'] = $dom[($dom[$key]['parent'])]['fontsize'] + intval(substr($dom[$key]['attribute']['size'], 1));
-									} elseif ($dom[$key]['attribute']['size']{0} == '-') {
-										$dom[$key]['fontsize'] = $dom[($dom[$key]['parent'])]['fontsize'] - intval(substr($dom[$key]['attribute']['size'], 1));
-									} else {
-										$dom[$key]['fontsize'] = intval($dom[$key]['attribute']['size']);
-									}
-								} else {
-									$dom[$key]['fontsize'] = intval($dom[$key]['attribute']['size']);
-								}
-							}
-						}
-						// force natural alignment for lists
-						if ((($dom[$key]['value'] == 'ul') OR ($dom[$key]['value'] == 'ol') OR ($dom[$key]['value'] == 'dl'))
-							AND (!isset($dom[$key]['align']) OR $this->empty_string($dom[$key]['align']) OR ($dom[$key]['align'] != 'J'))) {
-							if ($this->rtl) {
-								$dom[$key]['align'] = 'R';
-							} else {
-								$dom[$key]['align'] = 'L';
-							}
-						}
-						if (($dom[$key]['value'] == 'small') OR ($dom[$key]['value'] == 'sup') OR ($dom[$key]['value'] == 'sub')) {
-							$dom[$key]['fontsize'] = $dom[$key]['fontsize'] * K_SMALL_RATIO;
-						}
-						if (($dom[$key]['value'] == 'strong') OR ($dom[$key]['value'] == 'b')) {
-							$dom[$key]['fontstyle'] .= 'B';
-						}
-						if (($dom[$key]['value'] == 'em') OR ($dom[$key]['value'] == 'i')) {
-							$dom[$key]['fontstyle'] .= 'I';
-						}
-						if ($dom[$key]['value'] == 'u') {
-							$dom[$key]['fontstyle'] .= 'U';
-						}
-						if ($dom[$key]['value'] == 'del') {
-							$dom[$key]['fontstyle'] .= 'D';
-						}
-						if (($dom[$key]['value'] == 'pre') OR ($dom[$key]['value'] == 'tt')) {
-							$dom[$key]['fontname'] = $this->default_monospaced_font;
-						}
-						if (($dom[$key]['value']{0} == 'h') AND (intval($dom[$key]['value']{1}) > 0) AND (intval($dom[$key]['value']{1}) < 7)) {
-							$headsize = (4 - intval($dom[$key]['value']{1})) * 2;
-							$dom[$key]['fontsize'] = $dom[0]['fontsize'] + $headsize;
-							$dom[$key]['fontstyle'] .= 'B';
-						}
-						if (($dom[$key]['value'] == 'table')) {
-							$dom[$key]['rows'] = 0; // number of rows
-							$dom[$key]['trids'] = array(); // IDs of TR elements
-							$dom[$key]['thead'] = ''; // table header rows
-						}
-						if (($dom[$key]['value'] == 'tr')) {
-							$dom[$key]['cols'] = 0;
-							if ($thead) {
-								$dom[$key]['thead'] = true;
-								// rows on thead block are printed as a separate table
-							} else {
-								$dom[$key]['thead'] = false;
-								// store the number of rows on table element
-								++$dom[($dom[$key]['parent'])]['rows'];
-								// store the TR elements IDs on table element
-								array_push($dom[($dom[$key]['parent'])]['trids'], $key);
-							}
-						}
-						if (($dom[$key]['value'] == 'th') OR ($dom[$key]['value'] == 'td')) {
-							if (isset($dom[$key]['attribute']['colspan'])) {
-								$colspan = intval($dom[$key]['attribute']['colspan']);
-							} else {
-								$colspan = 1;
-							}
-							$dom[$key]['attribute']['colspan'] = $colspan;
-							$dom[($dom[$key]['parent'])]['cols'] += $colspan;
-						}
-						// set foreground color attribute
-						if (isset($dom[$key]['attribute']['color']) AND (!$this->empty_string($dom[$key]['attribute']['color']))) {
-							$dom[$key]['fgcolor'] = $this->convertHTMLColorToDec($dom[$key]['attribute']['color']);
-						}
-						// set background color attribute
-						if (isset($dom[$key]['attribute']['bgcolor']) AND (!$this->empty_string($dom[$key]['attribute']['bgcolor']))) {
-							$dom[$key]['bgcolor'] = $this->convertHTMLColorToDec($dom[$key]['attribute']['bgcolor']);
-						}
-						// set stroke color attribute
-						if (isset($dom[$key]['attribute']['strokecolor']) AND (!$this->empty_string($dom[$key]['attribute']['strokecolor']))) {
-							$dom[$key]['strokecolor'] = $this->convertHTMLColorToDec($dom[$key]['attribute']['strokecolor']);
-						}
-						// check for width attribute
-						if (isset($dom[$key]['attribute']['width'])) {
-							$dom[$key]['width'] = $dom[$key]['attribute']['width'];
-						}
-						// check for height attribute
-						if (isset($dom[$key]['attribute']['height'])) {
-							$dom[$key]['height'] = $dom[$key]['attribute']['height'];
-						}
-						// check for text alignment
-						if (isset($dom[$key]['attribute']['align']) AND (!$this->empty_string($dom[$key]['attribute']['align'])) AND ($dom[$key]['value'] !== 'img')) {
-							$dom[$key]['align'] = strtoupper($dom[$key]['attribute']['align']{0});
-						}
-						// check for text rendering mode (the following attributes do not exist in HTML)
-						if (isset($dom[$key]['attribute']['stroke'])) {
-							// font stroke width
-							$dom[$key]['stroke'] = $this->getHTMLUnitToUnits($dom[$key]['attribute']['stroke'], $dom[$key]['fontsize'], 'pt', true);
-						}
-						if (isset($dom[$key]['attribute']['fill'])) {
-							// font fill
-							if ($dom[$key]['attribute']['fill'] == 'true') {
-								$dom[$key]['fill'] = true;
-							} else {
-								$dom[$key]['fill'] = false;
-							}
-						}
-						if (isset($dom[$key]['attribute']['clip'])) {
-							// clipping mode
-							if ($dom[$key]['attribute']['clip'] == 'true') {
-								$dom[$key]['clip'] = true;
-							} else {
-								$dom[$key]['clip'] = false;
-							}
-						}
-					} // end opening tag
-				} else {
-					// text
-					$dom[$key]['tag'] = false;
-					$dom[$key]['block'] = false;
-					$dom[$key]['value'] = stripslashes($this->unhtmlentities($element));
-					$dom[$key]['parent'] = end($level);
-				}
-				++$elkey;
-				++$key;
-			}
-			return $dom;
-		}
-
-		/**
-		 * Returns the string used to find spaces
-		 * @return string
-		 * @access protected
-		 * @author Nicola Asuni
-		 * @since 4.8.024 (2010-01-15)
-		 */
-		protected function getSpaceString() {
-			$spacestr = chr(32);
-			if (($this->CurrentFont['type'] == 'TrueTypeUnicode') OR ($this->CurrentFont['type'] == 'cidfont0')) {
-				$spacestr = chr(0).chr(32);
-			}
-			return $spacestr;
-		}
-
-		/**
-		 * Allows to preserve some HTML formatting (limited support).<br />
-		 * IMPORTANT: The HTML must be well formatted - try to clean-up it using an application like HTML-Tidy before submitting.
-		 * Supported tags are: a, b, blockquote, br, dd, del, div, dl, dt, em, font, h1, h2, h3, h4, h5, h6, hr, i, img, li, ol, p, pre, small, span, strong, sub, sup, table, tcpdf, td, th, thead, tr, tt, u, ul
-		 * @param string $html text to display
-		 * @param boolean $ln if true add a new line after text (default = true)
-		 * @param int $fill Indicates if the background must be painted (true) or transparent (false).
-		 * @param boolean $reseth if true reset the last cell height (default false).
-		 * @param boolean $cell if true add the default cMargin space to each Write (default false).
-		 * @param string $align Allows to center or align the text. Possible values are:<ul><li>L : left align</li><li>C : center</li><li>R : right align</li><li>'' : empty string : left for LTR or right for RTL</li></ul>
-		 * @access public
-		 */
-		public function writeHTML($html, $ln=true, $fill=false, $reseth=false, $cell=false, $align='') {
-			$gvars = $this->getGraphicVars();
-			// store current values
-			$prevPage = $this->page;
-			$prevlMargin = $this->lMargin;
-			$prevrMargin = $this->rMargin;
-			$curfontname = $this->FontFamily;
-			$curfontstyle = $this->FontStyle;
-			$curfontsize = $this->FontSizePt;
-			$curfontascent = $this->getFontAscent($curfontname, $curfontstyle, $curfontsize);
-			$curfontdescent = $this->getFontDescent($curfontname, $curfontstyle, $curfontsize);
-			$this->newline = true;
-			$startlinepage = $this->page;
-			$minstartliney = $this->y;
-			$maxbottomliney = 0;
-			$startlinex = $this->x;
-			$startliney = $this->y;
-			$yshift = 0;
-			$newline = true;
-			$loop = 0;
-			$curpos = 0;
-			$this_method_vars = array();
-			$undo = false;
-			$fontaligned = false;
-			$this->premode = false;
-			if (isset($this->PageAnnots[$this->page])) {
-				$pask = count($this->PageAnnots[$this->page]);
-			} else {
-				$pask = 0;
-			}
-			if (!$this->InFooter) {
-				if (isset($this->footerlen[$this->page])) {
-					$this->footerpos[$this->page] = $this->pagelen[$this->page] - $this->footerlen[$this->page];
-				} else {
-					$this->footerpos[$this->page] = $this->pagelen[$this->page];
-				}
-				$startlinepos = $this->footerpos[$this->page];
-			} else {
-				$startlinepos = $this->pagelen[$this->page];
-			}
-			$lalign = $align;
-			$plalign = $align;
-			if ($this->rtl) {
-				$w = $this->x - $this->lMargin;
-			} else {
-				$w = $this->w - $this->rMargin - $this->x;
-			}
-			$w -= (2 * $this->cMargin);
-			if ($cell) {
-				if ($this->rtl) {
-					$this->x -= $this->cMargin;
-				} else {
-					$this->x += $this->cMargin;
-				}
-			}
-			if ($this->customlistindent >= 0) {
-				$this->listindent = $this->customlistindent;
-			} else {
-				$this->listindent = $this->GetStringWidth('0000');
-			}
-			$this->listindentlevel = 0;
-			// save previous states
-			$prev_cell_height_ratio = $this->cell_height_ratio;
-			$prev_listnum = $this->listnum;
-			$prev_listordered = $this->listordered;
-			$prev_listcount = $this->listcount;
-			$prev_lispacer = $this->lispacer;
-			$this->listnum = 0;
-			$this->listordered = array();
-			$this->listcount = array();
-			$this->lispacer = '';
-			if (($this->empty_string($this->lasth)) OR ($reseth)) {
-				//set row height
-				$this->lasth = $this->FontSize * $this->cell_height_ratio;
-			}
-			$dom = $this->getHtmlDomArray($html);
-			$maxel = count($dom);
-			$key = 0;
-			while ($key < $maxel) {
-				if ($dom[$key]['tag'] AND isset($dom[$key]['attribute']['pagebreak'])) {
-					// check for pagebreak
-					if (($dom[$key]['attribute']['pagebreak'] == 'true') OR ($dom[$key]['attribute']['pagebreak'] == 'left') OR ($dom[$key]['attribute']['pagebreak'] == 'right')) {
-						// add a page (or trig AcceptPageBreak() for multicolumn mode)
-						$this->checkPageBreak($this->PageBreakTrigger + 1);
-					}
-					if ((($dom[$key]['attribute']['pagebreak'] == 'left') AND (((!$this->rtl) AND (($this->page % 2) == 0)) OR (($this->rtl) AND (($this->page % 2) != 0))))
-						OR (($dom[$key]['attribute']['pagebreak'] == 'right') AND (((!$this->rtl) AND (($this->page % 2) != 0)) OR (($this->rtl) AND (($this->page % 2) == 0))))) {
-						// add a page (or trig AcceptPageBreak() for multicolumn mode)
-						$this->checkPageBreak($this->PageBreakTrigger + 1);
-					}
-				}
-				if ($dom[$key]['tag'] AND $dom[$key]['opening'] AND isset($dom[$key]['attribute']['nobr']) AND ($dom[$key]['attribute']['nobr'] == 'true')) {
-					if (isset($dom[($dom[$key]['parent'])]['attribute']['nobr']) AND ($dom[($dom[$key]['parent'])]['attribute']['nobr'] == 'true')) {
-						$dom[$key]['attribute']['nobr'] = false;
-					} else {
-						// store current object
-						$this->startTransaction();
-						// save this method vars
-						$this_method_vars['html'] = $html;
-						$this_method_vars['ln'] = $ln;
-						$this_method_vars['fill'] = $fill;
-						$this_method_vars['reseth'] = $reseth;
-						$this_method_vars['cell'] = $cell;
-						$this_method_vars['align'] = $align;
-						$this_method_vars['gvars'] = $gvars;
-						$this_method_vars['prevPage'] = $prevPage;
-						$this_method_vars['prevlMargin'] = $prevlMargin;
-						$this_method_vars['prevrMargin'] = $prevrMargin;
-						$this_method_vars['curfontname'] = $curfontname;
-						$this_method_vars['curfontstyle'] = $curfontstyle;
-						$this_method_vars['curfontsize'] = $curfontsize;
-						$this_method_vars['curfontascent'] = $curfontascent;
-						$this_method_vars['curfontdescent'] = $curfontdescent;
-						$this_method_vars['minstartliney'] = $minstartliney;
-						$this_method_vars['maxbottomliney'] = $maxbottomliney;
-						$this_method_vars['yshift'] = $yshift;
-						$this_method_vars['startlinepage'] = $startlinepage;
-						$this_method_vars['startlinepos'] = $startlinepos;
-						$this_method_vars['startlinex'] = $startlinex;
-						$this_method_vars['startliney'] = $startliney;
-						$this_method_vars['newline'] = $newline;
-						$this_method_vars['loop'] = $loop;
-						$this_method_vars['curpos'] = $curpos;
-						$this_method_vars['pask'] = $pask;
-						$this_method_vars['lalign'] = $lalign;
-						$this_method_vars['plalign'] = $plalign;
-						$this_method_vars['w'] = $w;
-						$this_method_vars['prev_cell_height_ratio'] = $prev_cell_height_ratio;
-						$this_method_vars['prev_listnum'] = $prev_listnum;
-						$this_method_vars['prev_listordered'] = $prev_listordered;
-						$this_method_vars['prev_listcount'] = $prev_listcount;
-						$this_method_vars['prev_lispacer'] = $prev_lispacer;
-						$this_method_vars['fontaligned'] = $fontaligned;
-						$this_method_vars['key'] = $key;
-						$this_method_vars['dom'] = $dom;
-					}
-				}
-				// print THEAD block
-				if (($dom[$key]['value'] == 'tr') AND isset($dom[$key]['thead']) AND $dom[$key]['thead']) {
-					if (isset($dom[$key]['parent']) AND isset($dom[$dom[$key]['parent']]['thead']) AND !$this->empty_string($dom[$dom[$key]['parent']]['thead'])) {
-						$this->inthead = true;
-						// print table header (thead)
-						$this->writeHTML($this->thead, false, false, false, false, '');
-						if (($this->start_transaction_page == ($this->numpages - 1)) OR ($this->y < $this->start_transaction_y) OR ($this->checkPageBreak($this->lasth, '', false))) {
-							// restore previous object
-							$this->rollbackTransaction(true);
-							// restore previous values
-							foreach ($this_method_vars as $vkey => $vval) {
-								$$vkey = $vval;
-							}
-							// add a page (or trig AcceptPageBreak() for multicolumn mode)
-							$pre_y = $this->y;
-							if ((!$this->checkPageBreak($this->PageBreakTrigger + 1)) AND ($this->y < $pre_y)) {
-								// fix for multicolumn mode
-								$startliney = $this->y;
-							}
-							$this->start_transaction_page = $this->page;
-							$this->start_transaction_y = $this->y;
-						}
-					}
-					// move $key index forward to skip THEAD block
-					while ( ($key < $maxel) AND (!(
-						($dom[$key]['tag'] AND $dom[$key]['opening'] AND ($dom[$key]['value'] == 'tr') AND (!isset($dom[$key]['thead']) OR !$dom[$key]['thead']))
-						OR ($dom[$key]['tag'] AND (!$dom[$key]['opening']) AND ($dom[$key]['value'] == 'table'))) )) {
-						++$key;
-					}
-				}
-				if ($dom[$key]['tag'] OR ($key == 0)) {
-					if (isset($dom[$key]['line-height'])) {
-						// set line height
-						$this->cell_height_ratio = $dom[$key]['line-height'];
-						$this->lasth = $this->FontSize * $this->cell_height_ratio;
-					}
-					if ((($dom[$key]['value'] == 'table') OR ($dom[$key]['value'] == 'tr')) AND (isset($dom[$key]['align']))) {
-						$dom[$key]['align'] = ($this->rtl) ? 'R' : 'L';
-					}
-					// vertically align image in line
-					if ((!$this->newline) AND ($dom[$key]['value'] == 'img') AND (isset($dom[$key]['attribute']['height'])) AND ($dom[$key]['attribute']['height'] > 0)) {
-						// get image height
-						$imgh = $this->getHTMLUnitToUnits($dom[$key]['attribute']['height'], $this->lasth, 'px');
-						// check for automatic line break
-						$autolinebreak = false;
-						if (isset($dom[$key]['attribute']['width']) AND ($dom[$key]['attribute']['width'] > 0)) {
-							$imgw = $this->getHTMLUnitToUnits($dom[$key]['attribute']['width'], 1, 'px', false);
-							if (($this->rtl AND (($this->x - $imgw) < ($this->lMargin + $this->cMargin)))
-								OR (!$this->rtl AND (($this->x + $imgw) > ($this->w - $this->rMargin - $this->cMargin)))) {
-								// add automatic line break
-								$autolinebreak = true;
-								$this->Ln('', $cell);
-								// go back to evaluate this line break
-								--$key;
-							}
-						}
-						if (!$autolinebreak) {
-							if (!$this->InFooter) {
-								$pre_y = $this->y;
-								// check for page break
-								if ((!$this->checkPageBreak($imgh)) AND ($this->y < $pre_y)) {
-									// fix for multicolumn mode
-									$startliney = $this->y;
-								}
-							}
-							if ($this->page > $startlinepage) {
-								// fix line splitted over two pages
-								if (isset($this->footerlen[$startlinepage])) {
-									$curpos = $this->pagelen[$startlinepage] - $this->footerlen[$startlinepage];
-								}
-								// line to be moved one page forward
-								$pagebuff = $this->getPageBuffer($startlinepage);
-								$linebeg = substr($pagebuff, $startlinepos, ($curpos - $startlinepos));
-								$tstart = substr($pagebuff, 0, $startlinepos);
-								$tend = substr($this->getPageBuffer($startlinepage), $curpos);
-								// remove line from previous page
-								$this->setPageBuffer($startlinepage, $tstart.''.$tend);
-								$pagebuff = $this->getPageBuffer($this->page);
-								$tstart = substr($pagebuff, 0, $this->cntmrk[$this->page]);
-								$tend = substr($pagebuff, $this->cntmrk[$this->page]);
-								// add line start to current page
-								$yshift = $minstartliney - $this->y;
-								if ($fontaligned) {
-									$yshift += ($curfontsize / $this->k);
-								}
-								$try = sprintf('1 0 0 1 0 %.3F cm', ($yshift * $this->k));
-								$this->setPageBuffer($this->page, $tstart."\nq\n".$try."\n".$linebeg."\nQ\n".$tend);
-								// shift the annotations and links
-								if (isset($this->PageAnnots[$this->page])) {
-									$next_pask = count($this->PageAnnots[$this->page]);
-								} else {
-									$next_pask = 0;
-								}
-								if (isset($this->PageAnnots[$startlinepage])) {
-									foreach ($this->PageAnnots[$startlinepage] as $pak => $pac) {
-										if ($pak >= $pask) {
-											$this->PageAnnots[$this->page][] = $pac;
-											unset($this->PageAnnots[$startlinepage][$pak]);
-											$npak = count($this->PageAnnots[$this->page]) - 1;
-											$this->PageAnnots[$this->page][$npak]['y'] -= $yshift;
-										}
-									}
-								}
-								$pask = $next_pask;
-								$startlinepos = $this->cntmrk[$this->page];
-								$startlinepage = $this->page;
-								$startliney = $this->y;
-							}
-							$this->y += ((($curfontsize * $this->cell_height_ratio / $this->k) + $curfontascent - $curfontdescent) / 2) - $imgh;
-							$minstartliney = min($this->y, $minstartliney);
-							$maxbottomliney = ($startliney + ($this->FontSize * $this->cell_height_ratio));
-						}
-					} elseif (isset($dom[$key]['fontname']) OR isset($dom[$key]['fontstyle']) OR isset($dom[$key]['fontsize'])) {
-						// account for different font size
-						$pfontname = $curfontname;
-						$pfontstyle = $curfontstyle;
-						$pfontsize = $curfontsize;
-						$fontname = isset($dom[$key]['fontname']) ? $dom[$key]['fontname'] : $curfontname;
-						$fontstyle = isset($dom[$key]['fontstyle']) ? $dom[$key]['fontstyle'] : $curfontstyle;
-						$fontsize = isset($dom[$key]['fontsize']) ? $dom[$key]['fontsize'] : $curfontsize;
-						$fontascent = $this->getFontAscent($fontname, $fontstyle, $fontsize);
-						$fontdescent = $this->getFontDescent($fontname, $fontstyle, $fontsize);
-						if (($fontname != $curfontname) OR ($fontstyle != $curfontstyle) OR ($fontsize != $curfontsize)) {
-							if (is_numeric($fontsize) AND ($fontsize >= 0)
-								AND is_numeric($curfontsize) AND ($curfontsize >= 0)
-								AND ($fontsize != $curfontsize) AND (!$this->newline)
-								AND ($key < ($maxel - 1))
-								) {
-								if ((!$this->newline) AND ($this->page > $startlinepage)) {
-									// fix lines splitted over two pages
-									if (isset($this->footerlen[$startlinepage])) {
-										$curpos = $this->pagelen[$startlinepage] - $this->footerlen[$startlinepage];
-									}
-									// line to be moved one page forward
-									$pagebuff = $this->getPageBuffer($startlinepage);
-									$linebeg = substr($pagebuff, $startlinepos, ($curpos - $startlinepos));
-									$tstart = substr($pagebuff, 0, $startlinepos);
-									$tend = substr($this->getPageBuffer($startlinepage), $curpos);
-									// remove line start from previous page
-									$this->setPageBuffer($startlinepage, $tstart.''.$tend);
-									$pagebuff = $this->getPageBuffer($this->page);
-									$tstart = substr($pagebuff, 0, $this->cntmrk[$this->page]);
-									$tend = substr($pagebuff, $this->cntmrk[$this->page]);
-									// add line start to current page
-									$yshift = $minstartliney - $this->y;
-									$try = sprintf('1 0 0 1 0 %.3F cm', ($yshift * $this->k));
-									$this->setPageBuffer($this->page, $tstart."\nq\n".$try."\n".$linebeg."\nQ\n".$tend);
-									// shift the annotations and links
-									if (isset($this->PageAnnots[$this->page])) {
-										$next_pask = count($this->PageAnnots[$this->page]);
-									} else {
-										$next_pask = 0;
-									}
-									if (isset($this->PageAnnots[$startlinepage])) {
-										foreach ($this->PageAnnots[$startlinepage] as $pak => $pac) {
-											if ($pak >= $pask) {
-												$this->PageAnnots[$this->page][] = $pac;
-												unset($this->PageAnnots[$startlinepage][$pak]);
-												$npak = count($this->PageAnnots[$this->page]) - 1;
-												$this->PageAnnots[$this->page][$npak]['y'] -= $yshift;
-											}
-										}
-									}
-									$pask = $next_pask;
-									$startlinepos = $this->cntmrk[$this->page];
-									$startlinepage = $this->page;
-									$startliney = $this->y;
-								}
-								if (!$dom[$key]['block']) {
-									$this->y += ((($curfontsize - $fontsize) * $this->cell_height_ratio / $this->k) + $curfontascent - $fontascent - $curfontdescent + $fontdescent) / 2;
-									$minstartliney = min($this->y, $minstartliney);
-									$maxbottomliney = max(($this->y + (($fontsize * $this->cell_height_ratio) / $this->k)), $maxbottomliney);
-								}
-								$fontaligned = true;
-							}
-							$this->SetFont($fontname, $fontstyle, $fontsize);
-							$this->lasth = $this->FontSize * $this->cell_height_ratio;
-							$curfontname = $fontname;
-							$curfontstyle = $fontstyle;
-							$curfontsize = $fontsize;
-							$curfontascent = $fontascent;
-							$curfontdescent = $fontdescent;
-						}
-					}
-					// set text rendering mode
-					$textstroke = isset($dom[$key]['stroke']) ? $dom[$key]['stroke'] : $this->textstrokewidth;
-					$textfill = isset($dom[$key]['fill']) ? $dom[$key]['fill'] : (($this->textrendermode % 2) == 0);
-					$textclip = isset($dom[$key]['clip']) ? $dom[$key]['clip'] : ($this->textrendermode > 3);
-					$this->setTextRenderingMode($textstroke, $textfill, $textclip);
-					if (($plalign == 'J') AND $dom[$key]['block']) {
-						$plalign = '';
-					}
-					// get current position on page buffer
-					$curpos = $this->pagelen[$startlinepage];
-					if (isset($dom[$key]['bgcolor']) AND ($dom[$key]['bgcolor'] !== false)) {
-						$this->SetFillColorArray($dom[$key]['bgcolor']);
-						$wfill = true;
-					} else {
-						$wfill = $fill | false;
-					}
-					if (isset($dom[$key]['fgcolor']) AND ($dom[$key]['fgcolor'] !== false)) {
-						$this->SetTextColorArray($dom[$key]['fgcolor']);
-					}
-					if (isset($dom[$key]['strokecolor']) AND ($dom[$key]['strokecolor'] !== false)) {
-						$this->SetDrawColorArray($dom[$key]['strokecolor']);
-					}
-					if (isset($dom[$key]['align'])) {
-						$lalign = $dom[$key]['align'];
-					}
-					if ($this->empty_string($lalign)) {
-						$lalign = $align;
-					}
-				}
-				// align lines
-				if ($this->newline AND (strlen($dom[$key]['value']) > 0) AND ($dom[$key]['value'] != 'td') AND ($dom[$key]['value'] != 'th')) {
-					$newline = true;
-					$fontaligned = false;
-					// we are at the beginning of a new line
-					if (isset($startlinex)) {
-						$yshift = $minstartliney - $startliney;
-						if (($yshift > 0) OR ($this->page > $startlinepage)) {
-							$yshift = 0;
-						}
-						$t_x = 0;
-						// the last line must be shifted to be aligned as requested
-						$linew = abs($this->endlinex - $startlinex);
-						$pstart = substr($this->getPageBuffer($startlinepage), 0, $startlinepos);
-						if (isset($opentagpos) AND isset($this->footerlen[$startlinepage]) AND (!$this->InFooter)) {
-							$this->footerpos[$startlinepage] = $this->pagelen[$startlinepage] - $this->footerlen[$startlinepage];
-							$midpos = min($opentagpos, $this->footerpos[$startlinepage]);
-						} elseif (isset($opentagpos)) {
-							$midpos = $opentagpos;
-						} elseif (isset($this->footerlen[$startlinepage]) AND (!$this->InFooter)) {
-							$this->footerpos[$startlinepage] = $this->pagelen[$startlinepage] - $this->footerlen[$startlinepage];
-							$midpos = $this->footerpos[$startlinepage];
-						} else {
-							$midpos = 0;
-						}
-						if ($midpos > 0) {
-							$pmid = substr($this->getPageBuffer($startlinepage), $startlinepos, ($midpos - $startlinepos));
-							$pend = substr($this->getPageBuffer($startlinepage), $midpos);
-						} else {
-							$pmid = substr($this->getPageBuffer($startlinepage), $startlinepos);
-							$pend = '';
-						}
-						if ((isset($plalign) AND ((($plalign == 'C') OR ($plalign == 'J') OR (($plalign == 'R') AND (!$this->rtl)) OR (($plalign == 'L') AND ($this->rtl))))) OR ($yshift < 0)) {
-							// calculate shifting amount
-							$tw = $w;
-							if (($plalign == 'J') AND $this->isRTLTextDir() AND ($this->num_columns > 1)) {
-								$tw += $this->cMargin;
-							}
-							if ($this->lMargin != $prevlMargin) {
-								$tw += ($prevlMargin - $this->lMargin);
-							}
-							if ($this->rMargin != $prevrMargin) {
-								$tw += ($prevrMargin - $this->rMargin);
-							}
-							$one_space_width = $this->GetStringWidth(chr(32));
-							$mdiff = abs($tw - $linew);
-							if ($plalign == 'C') {
-								if ($this->rtl) {
-									$t_x = -($mdiff / 2);
-								} else {
-									$t_x = ($mdiff / 2);
-								}
-							} elseif (($plalign == 'R') AND (!$this->rtl)) {
-								// right alignment on LTR document
-								if (intval($this->revstrpos($pmid, ')]')) == (intval($this->revstrpos($pmid, ' )]')) + 1)) {
-									// remove last space (if any)
-									$linew -= $one_space_width;
-									$mdiff = abs($tw - $linew);
-								}
-								$t_x = $mdiff;
-							} elseif (($plalign == 'L') AND ($this->rtl)) {
-								// left alignment on RTL document
-								if (($this->revstrpos($pmid, '[(') > 0) AND ((intval($this->revstrpos($pmid, '[( ')) == intval($this->revstrpos($pmid, '[('))) OR (intval($this->revstrpos($pmid, '[('.chr(0).chr(32))) == intval($this->revstrpos($pmid, '[('))))) {
-									// remove first space (if any)
-									$linew -= $one_space_width;
-								}
-								if ((strpos($pmid, '[(') > 0) AND (intval(strpos($pmid, '[(')) == (intval($this->revstrpos($pmid, '[('))))) {
-									// remove last space (if any)
-									$linew -= $one_space_width;
-									if (($this->CurrentFont['type'] == 'TrueTypeUnicode') OR ($this->CurrentFont['type'] == 'cidfont0')) {
-										$linew -= $one_space_width;
-									}
-								}
-								$mdiff = abs($tw - $linew);
-								$t_x = -$mdiff;
-							} elseif (($plalign == 'J') AND ($plalign == $lalign)) {
-								// Justification
-								if ($this->isRTLTextDir()) {
-									$t_x = $this->lMargin - $this->endlinex + $this->cMargin;
-								}
-								$no = 0; // spaces without trim
-								$ns = 0; // spaces with trim
-								$pmidtemp = $pmid;
-								// escape special characters
-								$pmidtemp = preg_replace('/[\\\][\(]/x', '\\#!#OP#!#', $pmidtemp);
-								$pmidtemp = preg_replace('/[\\\][\)]/x', '\\#!#CP#!#', $pmidtemp);
-								// search spaces
-								if (preg_match_all('/\[\(([^\)]*)\)\]/x', $pmidtemp, $lnstring, PREG_PATTERN_ORDER)) {
-									$spacestr = $this->getSpaceString();
-									$maxkk = count($lnstring[1]) - 1;
-									for ($kk=0; $kk <= $maxkk; ++$kk) {
-										// restore special characters
-										$lnstring[1][$kk] = str_replace('#!#OP#!#', '(', $lnstring[1][$kk]);
-										$lnstring[1][$kk] = str_replace('#!#CP#!#', ')', $lnstring[1][$kk]);
-										if ($kk == $maxkk) {
-											if ($this->isRTLTextDir()) {
-												$tvalue = ltrim($lnstring[1][$kk]);
-											} else {
-												$tvalue = rtrim($lnstring[1][$kk]);
-											}
-										} else {
-											$tvalue = $lnstring[1][$kk];
-										}
-										// store number of spaces on the strings
-										$lnstring[2][$kk] = substr_count($lnstring[1][$kk], $spacestr);
-										$lnstring[3][$kk] = substr_count($tvalue, $spacestr);
-										// count total spaces on line
-										$no += $lnstring[2][$kk];
-										$ns += $lnstring[3][$kk];
-										$lnstring[4][$kk] = $no;
-										$lnstring[5][$kk] = $ns;
-									}
-									if ($this->isRTLTextDir()) {
-										$t_x = $this->lMargin - $this->endlinex + $this->cMargin - (($no - $ns) * $one_space_width);
-									}
-									// calculate additional space to add to each space
-									$spacelen = $one_space_width;
-									$spacewidth = ((($tw - $linew) + (($no - $ns) * $spacelen)) / ($ns?$ns:1)) * $this->k;
-									$spacewidthu = -1000 * (($tw - $linew) + ($no * $spacelen)) / ($ns?$ns:1) / $this->FontSize;
-									$nsmax = $ns;
-									$ns = 0;
-									reset($lnstring);
-									$offset = 0;
-									$strcount = 0;
-									$prev_epsposbeg = 0;
-									$textpos = 0;
-									if ($this->isRTLTextDir()) {
-										$textpos = $this->wPt;
-									}
-									global $spacew;
-									while (preg_match('/([0-9\.\+\-]*)[\s](Td|cm|m|l|c|re)[\s]/x', $pmid, $strpiece, PREG_OFFSET_CAPTURE, $offset) == 1) {
-										// check if we are inside a string section '[( ... )]'
-										$stroffset = strpos($pmid, '[(', $offset);
-										if (($stroffset !== false) AND ($stroffset <= $strpiece[2][1])) {
-											// set offset to the end of string section
-											$offset = strpos($pmid, ')]', $stroffset);
-											while (($offset !== false) AND ($pmid{($offset - 1)} == '\\')) {
-												$offset = strpos($pmid, ')]', ($offset + 1));
-											}
-											if ($offset === false) {
-												$this->Error('HTML Justification: malformed PDF code.');
-											}
-											continue;
-										}
-										if ($this->isRTLTextDir()) {
-											$spacew = ($spacewidth * ($nsmax - $ns));
-										} else {
-											$spacew = ($spacewidth * $ns);
-										}
-										$offset = $strpiece[2][1] + strlen($strpiece[2][0]);
-										$epsposbeg = strpos($pmid, 'q'.$this->epsmarker, $offset);
-										$epsposend = strpos($pmid, $this->epsmarker.'Q', $offset) + strlen($this->epsmarker.'Q');
-										if ((($epsposbeg > 0) AND ($epsposend > 0) AND ($offset > $epsposbeg) AND ($offset < $epsposend))
-											OR (($epsposbeg === false) AND ($epsposend > 0) AND ($offset < $epsposend))) {
-											// shift EPS images
-											$trx = sprintf('1 0 0 1 %.3F 0 cm', $spacew);
-											$epsposbeg = strpos($pmid, 'q'.$this->epsmarker, ($prev_epsposbeg - 6));
-											$pmid_b = substr($pmid, 0, $epsposbeg);
-											$pmid_m = substr($pmid, $epsposbeg, ($epsposend - $epsposbeg));
-											$pmid_e = substr($pmid, $epsposend);
-											$pmid = $pmid_b."\nq\n".$trx."\n".$pmid_m."\nQ\n".$pmid_e;
-											$offset = $epsposend;
-											continue;
-
-										}
-										$prev_epsposbeg = $epsposbeg;
-										$currentxpos = 0;
-										// shift blocks of code
-										switch ($strpiece[2][0]) {
-											case 'Td':
-											case 'cm':
-											case 'm':
-											case 'l': {
-												// get current X position
-												preg_match('/([0-9\.\+\-]*)[\s]('.$strpiece[1][0].')[\s]('.$strpiece[2][0].')([\s]*)/x', $pmid, $xmatches);
-												$currentxpos = $xmatches[1];
-												$textpos = $currentxpos;
-												if (($strcount <= $maxkk) AND ($strpiece[2][0] == 'Td')) {
-													if ($strcount == $maxkk) {
-														if ($this->isRTLTextDir()) {
-															$tvalue = $lnstring[1][$strcount];
-														} else {
-															$tvalue = rtrim($lnstring[1][$strcount]);
-														}
-													} else {
-														$tvalue = $lnstring[1][$strcount];
-													}
-													$ns += substr_count($tvalue, $spacestr);
-													++$strcount;
-												}
-												if ($this->isRTLTextDir()) {
-													$spacew = ($spacewidth * ($nsmax - $ns));
-												}
-												// justify block
-												$pmid = preg_replace_callback('/([0-9\.\+\-]*)[\s]('.$strpiece[1][0].')[\s]('.$strpiece[2][0].')([\s]*)/x',
-													create_function('$matches', 'global $spacew;
-													$newx = sprintf("%.2F",(floatval($matches[1]) + $spacew));
-													return "".$newx." ".$matches[2]." x*#!#*x".$matches[3].$matches[4];'), $pmid, 1);
-												break;
-											}
-											case 're': {
-												// justify block
-												preg_match('/([0-9\.\+\-]*)[\s]([0-9\.\+\-]*)[\s]([0-9\.\+\-]*)[\s]('.$strpiece[1][0].')[\s](re)([\s]*)/x', $pmid, $xmatches);
-												$currentxpos = $xmatches[1];
-												global $x_diff, $w_diff;
-												$x_diff = 0;
-												$w_diff = 0;
-												if ($this->isRTLTextDir()) { // RTL
-													if ($currentxpos < $textpos) {
-														$x_diff = ($spacewidth * ($nsmax - $lnstring[5][$strcount]));
-														$w_diff = ($spacewidth * $lnstring[3][$strcount]);
-													} else {
-														if ($strcount > 0) {
-															$x_diff = ($spacewidth * ($nsmax - $lnstring[5][($strcount - 1)]));
-															$w_diff = ($spacewidth * $lnstring[3][($strcount - 1)]);
-														}
-													}
-												} else { // LTR
-													if ($currentxpos > $textpos) {
-														if ($strcount > 0) {
-															$x_diff = ($spacewidth * $lnstring[4][($strcount - 1)]);
-														}
-														$w_diff = ($spacewidth * $lnstring[3][$strcount]);
-													} else {
-														if ($strcount > 1) {
-															$x_diff = ($spacewidth * $lnstring[4][($strcount - 2)]);
-														}
-														if ($strcount > 0) {
-															$w_diff = ($spacewidth * $lnstring[3][($strcount - 1)]);
-														}
-													}
-												}
-												$pmid = preg_replace_callback('/('.$xmatches[1].')[\s]('.$xmatches[2].')[\s]('.$xmatches[3].')[\s]('.$strpiece[1][0].')[\s](re)([\s]*)/x',
-													create_function('$matches', 'global $x_diff, $w_diff;
-													$newx = sprintf("%.2F",(floatval($matches[1]) + $x_diff));
-													$neww = sprintf("%.2F",(floatval($matches[3]) + $w_diff));
-													return "".$newx." ".$matches[2]." ".$neww." ".$matches[4]." x*#!#*x".$matches[5].$matches[6];'), $pmid, 1);
-												break;
-											}
-											case 'c': {
-												// get current X position
-												preg_match('/([0-9\.\+\-]*)[\s]([0-9\.\+\-]*)[\s]([0-9\.\+\-]*)[\s]([0-9\.\+\-]*)[\s]([0-9\.\+\-]*)[\s]('.$strpiece[1][0].')[\s](c)([\s]*)/x', $pmid, $xmatches);
-												$currentxpos = $xmatches[1];
-												// justify block
-												$pmid = preg_replace_callback('/('.$xmatches[1].')[\s]('.$xmatches[2].')[\s]('.$xmatches[3].')[\s]('.$xmatches[4].')[\s]('.$xmatches[5].')[\s]('.$strpiece[1][0].')[\s](c)([\s]*)/x',
-													create_function('$matches', 'global $spacew;
-													$newx1 = sprintf("%.3F",(floatval($matches[1]) + $spacew));
-													$newx2 = sprintf("%.3F",(floatval($matches[3]) + $spacew));
-													$newx3 = sprintf("%.3F",(floatval($matches[5]) + $spacew));
-													return "".$newx1." ".$matches[2]." ".$newx2." ".$matches[4]." ".$newx3." ".$matches[6]." x*#!#*x".$matches[7].$matches[8];'), $pmid, 1);
-												break;
-											}
-										}
-										// shift the annotations and links
-										if (isset($this->PageAnnots[$this->page])) {
-											$cxpos = ($currentxpos / $this->k);
-											$lmpos = ($this->lMargin + $this->cMargin + $this->feps);
-											foreach ($this->PageAnnots[$this->page] as $pak => $pac) {
-												if (($pac['y'] >= $minstartliney) AND (($pac['x'] * $this->k) >= ($currentxpos - $this->feps)) AND (($pac['x'] * $this->k) <= ($currentxpos + $this->feps))) {
-													if ($cxpos > $lmpos) {
-														$this->PageAnnots[$this->page][$pak]['x'] += (($spacew - $one_space_width) / $this->k);
-														$this->PageAnnots[$this->page][$pak]['w'] += (($spacewidth * $pac['numspaces']) / $this->k);
-													} else {
-														$this->PageAnnots[$this->page][$pak]['w'] += ((($spacewidth * $pac['numspaces']) - $one_space_width) / $this->k);
-													}
-													break;
-												}
-											}
-										}
-									} // end of while
-									// remove markers
-									$pmid = str_replace('x*#!#*x', '', $pmid);
-									if (($this->CurrentFont['type'] == 'TrueTypeUnicode') OR ($this->CurrentFont['type'] == 'cidfont0')) {
-										// multibyte characters
-										$spacew = $spacewidthu;
-										$pmidtemp = $pmid;
-										// escape special characters
-										$pmidtemp = preg_replace('/[\\\][\(]/x', '\\#!#OP#!#', $pmidtemp);
-										$pmidtemp = preg_replace('/[\\\][\)]/x', '\\#!#CP#!#', $pmidtemp);
-										$pmid = preg_replace_callback("/\[\(([^\)]*)\)\]/x",
-													create_function('$matches', 'global $spacew;
-													$matches[1] = str_replace("#!#OP#!#", "(", $matches[1]);
-													$matches[1] = str_replace("#!#CP#!#", ")", $matches[1]);
-													return "[(".str_replace(chr(0).chr(32), ") ".sprintf("%.3F", $spacew)." (", $matches[1]).")]";'), $pmidtemp);
-										$this->setPageBuffer($startlinepage, $pstart."\n".$pmid."\n".$pend);
-										$endlinepos = strlen($pstart."\n".$pmid."\n");
-									} else {
-										// non-unicode (single-byte characters)
-										$rs = sprintf('%.3F Tw', $spacewidth);
-										$pmid = preg_replace("/\[\(/x", $rs.' [(', $pmid);
-										$this->setPageBuffer($startlinepage, $pstart."\n".$pmid."\nBT 0 Tw ET\n".$pend);
-										$endlinepos = strlen($pstart."\n".$pmid."\nBT 0 Tw ET\n");
-									}
-								}
-							} // end of J
-						} // end if $startlinex
-						if (($t_x != 0) OR ($yshift < 0)) {
-							// shift the line
-							$trx = sprintf('1 0 0 1 %.3F %.3F cm', ($t_x * $this->k), ($yshift * $this->k));
-							$this->setPageBuffer($startlinepage, $pstart."\nq\n".$trx."\n".$pmid."\nQ\n".$pend);
-							$endlinepos = strlen($pstart."\nq\n".$trx."\n".$pmid."\nQ\n");
-							// shift the annotations and links
-							if (isset($this->PageAnnots[$this->page])) {
-								foreach ($this->PageAnnots[$this->page] as $pak => $pac) {
-									if ($pak >= $pask) {
-										$this->PageAnnots[$this->page][$pak]['x'] += $t_x;
-										$this->PageAnnots[$this->page][$pak]['y'] -= $yshift;
-									}
-								}
-							}
-							$this->y -= $yshift;
-						}
-					}
-					$this->newline = false;
-					$pbrk = $this->checkPageBreak($this->lasth);
-					$startlinex = $this->x;
-					$startliney = $this->y;
-					$minstartliney = $startliney;
-					$maxbottomliney = ($this->y + (($fontsize * $this->cell_height_ratio) / $this->k));
-					$startlinepage = $this->page;
-					if (isset($endlinepos) AND (!$pbrk)) {
-						$startlinepos = $endlinepos;
-					} else {
-						if (!$this->InFooter) {
-							if (isset($this->footerlen[$this->page])) {
-								$this->footerpos[$this->page] = $this->pagelen[$this->page] - $this->footerlen[$this->page];
-							} else {
-								$this->footerpos[$this->page] = $this->pagelen[$this->page];
-							}
-							$startlinepos = $this->footerpos[$this->page];
-						} else {
-							$startlinepos = $this->pagelen[$this->page];
-						}
-					}
-					unset($endlinepos);
-					$plalign = $lalign;
-					if (isset($this->PageAnnots[$this->page])) {
-						$pask = count($this->PageAnnots[$this->page]);
-					} else {
-						$pask = 0;
-					}
-					$this->SetFont($fontname, $fontstyle, $fontsize);
-					if ($wfill) {
-						$this->SetFillColorArray($this->bgcolor);
-					}
-				} // end newline
-				if (isset($opentagpos)) {
-					unset($opentagpos);
-				}
-				if ($dom[$key]['tag']) {
-					if ($dom[$key]['opening']) {
-						// get text indentation (if any)
-						if (isset($dom[$key]['text-indent']) AND $dom[$key]['block']) {
-							$this->textindent = $dom[$key]['text-indent'];
-							$this->newline = true;
-						}
-						if ($dom[$key]['value'] == 'table') {
-							// available page width
-							if ($this->rtl) {
-								$wtmp = $this->x - $this->lMargin;
-							} else {
-								$wtmp = $this->w - $this->rMargin - $this->x;
-							}
-							if (isset($dom[$key]['attribute']['nested']) AND ($dom[$key]['attribute']['nested'] == 'true')) {
-								// add margin for nested tables
-								$wtmp -= $this->cMargin;
-							}
-							// table width
-							if (isset($dom[$key]['width'])) {
-								$table_width = $this->getHTMLUnitToUnits($dom[$key]['width'], $wtmp, 'px');
-							} else {
-								$table_width = $wtmp;
-							}
-						}
-						if (($dom[$key]['value'] == 'td') OR ($dom[$key]['value'] == 'th')) {
-							$trid = $dom[$key]['parent'];
-							$table_el = $dom[$trid]['parent'];
-							if (!isset($dom[$table_el]['cols'])) {
-								$dom[$table_el]['cols'] = $dom[$trid]['cols'];
-							}
-							$oldmargin = $this->cMargin;
-							if (isset($dom[($dom[$trid]['parent'])]['attribute']['cellpadding'])) {
-								$currentcmargin = $this->getHTMLUnitToUnits($dom[($dom[$trid]['parent'])]['attribute']['cellpadding'], 1, 'px');
-							} else {
-								$currentcmargin = 0;
-							}
-							$this->cMargin = $currentcmargin;
-							if (isset($dom[($dom[$trid]['parent'])]['attribute']['cellspacing'])) {
-								$cellspacing = $this->getHTMLUnitToUnits($dom[($dom[$trid]['parent'])]['attribute']['cellspacing'], 1, 'px');
-							} else {
-								$cellspacing = 0;
-							}
-							if ($this->rtl) {
-								$cellspacingx = -$cellspacing;
-							} else {
-								$cellspacingx = $cellspacing;
-							}
-							$colspan = $dom[$key]['attribute']['colspan'];
-							$table_columns_width = ($table_width - ($cellspacing * ($dom[$table_el]['cols'] - 1)));
-							$wtmp = ($colspan * ($table_columns_width / $dom[$table_el]['cols'])) + (($colspan - 1) * $cellspacing);
-							if (isset($dom[$key]['width'])) {
-								$cellw = $this->getHTMLUnitToUnits($dom[$key]['width'], $table_columns_width, 'px');
-							} else {
-								$cellw = $wtmp;
-							}
-							if (isset($dom[$key]['height'])) {
-								// minimum cell height
-								$cellh = $this->getHTMLUnitToUnits($dom[$key]['height'], 0, 'px');
-							} else {
-								$cellh = 0;
-							}
-							if (isset($dom[$key]['content'])) {
-								$cell_content = $dom[$key]['content'];
-							} else {
-								$cell_content = '&nbsp;';
-							}
-							$tagtype = $dom[$key]['value'];
-							$parentid = $key;
-							while (($key < $maxel) AND (!(($dom[$key]['tag']) AND (!$dom[$key]['opening']) AND ($dom[$key]['value'] == $tagtype) AND ($dom[$key]['parent'] == $parentid)))) {
-								// move $key index forward
-								++$key;
-							}
-							if (!isset($dom[$trid]['startpage'])) {
-								$dom[$trid]['startpage'] = $this->page;
-							} else {
-								$this->setPage($dom[$trid]['startpage']);
-							}
-							if (!isset($dom[$trid]['starty'])) {
-								$dom[$trid]['starty'] = $this->y;
-							} else {
-								$this->y = $dom[$trid]['starty'];
-							}
-							if (!isset($dom[$trid]['startx'])) {
-								$dom[$trid]['startx'] = $this->x;
-							} else {
-								$this->x += ($cellspacingx / 2);
-							}
-							if (isset($dom[$parentid]['attribute']['rowspan'])) {
-								$rowspan = intval($dom[$parentid]['attribute']['rowspan']);
-							} else {
-								$rowspan = 1;
-							}
-							// skip row-spanned cells started on the previous rows
-							if (isset($dom[$table_el]['rowspans'])) {
-								$rsk = 0;
-								$rskmax = count($dom[$table_el]['rowspans']);
-								while ($rsk < $rskmax) {
-									$trwsp = $dom[$table_el]['rowspans'][$rsk];
-									$rsstartx = $trwsp['startx'];
-									$rsendx = $trwsp['endx'];
-									// account for margin changes
-									if ($trwsp['startpage'] < $this->page) {
-										if (($this->rtl) AND ($this->pagedim[$this->page]['orm'] != $this->pagedim[$trwsp['startpage']]['orm'])) {
-											$dl = ($this->pagedim[$this->page]['orm'] - $this->pagedim[$trwsp['startpage']]['orm']);
-											$rsstartx -= $dl;
-											$rsendx -= $dl;
-										} elseif ((!$this->rtl) AND ($this->pagedim[$this->page]['olm'] != $this->pagedim[$trwsp['startpage']]['olm'])) {
-											$dl = ($this->pagedim[$this->page]['olm'] - $this->pagedim[$trwsp['startpage']]['olm']);
-											$rsstartx += $dl;
-											$rsendx += $dl;
-										}
-									}
-									if  (($trwsp['rowspan'] > 0)
-										AND ($rsstartx > ($this->x - $cellspacing - $currentcmargin - $this->feps))
-										AND ($rsstartx < ($this->x + $cellspacing + $currentcmargin + $this->feps))
-										AND (($trwsp['starty'] < ($this->y - $this->feps)) OR ($trwsp['startpage'] < $this->page))) {
-										// set the starting X position of the current cell
-										$this->x = $rsendx + $cellspacingx;
-										if (($trwsp['rowspan'] == 1)
-											AND (isset($dom[$trid]['endy']))
-											AND (isset($dom[$trid]['endpage']))
-											AND ($trwsp['endpage'] == $dom[$trid]['endpage'])) {
-											// set ending Y position for row
-											$dom[$table_el]['rowspans'][$rsk]['endy'] = max($dom[$trid]['endy'], $trwsp['endy']);
-											$dom[$trid]['endy'] = $dom[$table_el]['rowspans'][$rsk]['endy'];
-										}
-										$rsk = 0;
-									} else {
-										++$rsk;
-									}
-								}
-							}
-							// add rowspan information to table element
-							if ($rowspan > 1) {
-								$trsid = array_push($dom[$table_el]['rowspans'], array('trid' => $trid, 'rowspan' => $rowspan, 'mrowspan' => $rowspan, 'colspan' => $colspan, 'startpage' => $this->page, 'startx' => $this->x, 'starty' => $this->y));
-							}
-							$cellid = array_push($dom[$trid]['cellpos'], array('startx' => $this->x));
-							if ($rowspan > 1) {
-								$dom[$trid]['cellpos'][($cellid - 1)]['rowspanid'] = ($trsid - 1);
-							}
-							// push background colors
-							if (isset($dom[$parentid]['bgcolor']) AND ($dom[$parentid]['bgcolor'] !== false)) {
-								$dom[$trid]['cellpos'][($cellid - 1)]['bgcolor'] = $dom[$parentid]['bgcolor'];
-							}
-							$prevLastH = $this->lasth;
-							// ****** write the cell content ******
-							$this->MultiCell($cellw, $cellh, $cell_content, false, $lalign, false, 2, '', '', true, 0, true);
-							$this->lasth = $prevLastH;
-							$this->cMargin = $oldmargin;
-							$dom[$trid]['cellpos'][($cellid - 1)]['endx'] = $this->x;
-							// update the end of row position
-							if ($rowspan <= 1) {
-								if (isset($dom[$trid]['endy'])) {
-									if ($this->page == $dom[$trid]['endpage']) {
-										$dom[$trid]['endy'] = max($this->y, $dom[$trid]['endy']);
-									} elseif ($this->page > $dom[$trid]['endpage']) {
-										$dom[$trid]['endy'] = $this->y;
-									}
-								} else {
-									$dom[$trid]['endy'] = $this->y;
-								}
-								if (isset($dom[$trid]['endpage'])) {
-									$dom[$trid]['endpage'] = max($this->page, $dom[$trid]['endpage']);
-								} else {
-									$dom[$trid]['endpage'] = $this->page;
-								}
-							} else {
-								// account for row-spanned cells
-								$dom[$table_el]['rowspans'][($trsid - 1)]['endx'] = $this->x;
-								$dom[$table_el]['rowspans'][($trsid - 1)]['endy'] = $this->y;
-								$dom[$table_el]['rowspans'][($trsid - 1)]['endpage'] = $this->page;
-							}
-							if (isset($dom[$table_el]['rowspans'])) {
-								// update endy and endpage on rowspanned cells
-								foreach ($dom[$table_el]['rowspans'] as $k => $trwsp) {
-									if ($trwsp['rowspan'] > 0) {
-										if (isset($dom[$trid]['endpage'])) {
-											if ($trwsp['endpage'] == $dom[$trid]['endpage']) {
-												$dom[$table_el]['rowspans'][$k]['endy'] = max($dom[$trid]['endy'], $trwsp['endy']);
-											} elseif ($trwsp['endpage'] < $dom[$trid]['endpage']) {
-												$dom[$table_el]['rowspans'][$k]['endy'] = $dom[$trid]['endy'];
-												$dom[$table_el]['rowspans'][$k]['endpage'] = $dom[$trid]['endpage'];
-											} else {
-												$dom[$trid]['endy'] = $this->pagedim[$dom[$trid]['endpage']]['hk'] - $this->pagedim[$dom[$trid]['endpage']]['bm'];
-											}
-										}
-									}
-								}
-							}
-							$this->x += ($cellspacingx / 2);
-						} else {
-							// opening tag (or self-closing tag)
-							if (!isset($opentagpos)) {
-								if (!$this->InFooter) {
-									if (isset($this->footerlen[$this->page])) {
-										$this->footerpos[$this->page] = $this->pagelen[$this->page] - $this->footerlen[$this->page];
-									} else {
-										$this->footerpos[$this->page] = $this->pagelen[$this->page];
-									}
-									$opentagpos = $this->footerpos[$this->page];
-								}
-							}
-							$this->openHTMLTagHandler($dom, $key, $cell);
-						}
-					} else {
-						// closing tag
-						$this->closeHTMLTagHandler($dom, $key, $cell, $maxbottomliney);
-					}
-				} elseif (strlen($dom[$key]['value']) > 0) {
-					// print list-item
-					if (!$this->empty_string($this->lispacer)) {
-						$this->SetFont($pfontname, $pfontstyle, $pfontsize);
-						$this->lasth = $this->FontSize * $this->cell_height_ratio;
-						$minstartliney = $this->y;
-						$maxbottomliney = ($startliney + ($this->FontSize * $this->cell_height_ratio));
-						$this->putHtmlListBullet($this->listnum, $this->lispacer, $pfontsize);
-						$this->SetFont($curfontname, $curfontstyle, $curfontsize);
-						$this->lasth = $this->FontSize * $this->cell_height_ratio;
-						if (is_numeric($pfontsize) AND ($pfontsize > 0) AND is_numeric($curfontsize) AND ($curfontsize > 0) AND ($pfontsize != $curfontsize)) {
-							$pfontascent = $this->getFontAscent($pfontname, $pfontstyle, $pfontsize);
-							$pfontdescent = $this->getFontDescent($pfontname, $pfontstyle, $pfontsize);
-							$this->y += ((($pfontsize - $curfontsize) * $this->cell_height_ratio / $this->k) + $pfontascent - $curfontascent - $pfontdescent + $curfontdescent) / 2;
-							$minstartliney = min($this->y, $minstartliney);
-							$maxbottomliney = max(($this->y + (($pfontsize * $this->cell_height_ratio) / $this->k)), $maxbottomliney);
-						}
-					}
-					// text
-					$this->htmlvspace = 0;
-					if ((!$this->premode) AND $this->isRTLTextDir()) {
-						// reverse spaces order
-						$len1 = strlen($dom[$key]['value']);
-						$lsp = $len1 - strlen(ltrim($dom[$key]['value']));
-						$rsp = $len1 - strlen(rtrim($dom[$key]['value']));
-						$tmpstr = '';
-						if ($rsp > 0) {
-							$tmpstr .= substr($dom[$key]['value'], -$rsp);
-						}
-						$tmpstr .= trim($dom[$key]['value']);
-						if ($lsp > 0) {
-							$tmpstr .= substr($dom[$key]['value'], 0, $lsp);
-						}
-						$dom[$key]['value'] = $tmpstr;
-					}
-					if ($newline) {
-						if (!$this->premode) {
-							$prelen = strlen($dom[$key]['value']);
-							if ($this->isRTLTextDir()) {
-								$dom[$key]['value'] = rtrim($dom[$key]['value']).chr(0);
-							} else {
-								$dom[$key]['value'] = ltrim($dom[$key]['value']);
-							}
-							$postlen = strlen($dom[$key]['value']);
-							if (($postlen == 0) AND ($prelen > 0)) {
-								$dom[$key]['trimmed_space'] = true;
-							}
-						}
-						$newline = false;
-						$firstblock = true;
-					} else {
-						$firstblock = false;
-					}
-					$strrest = '';
-					if ($this->rtl) {
-						$this->x -= $this->textindent;
-					} else {
-						$this->x += $this->textindent;
-					}
-					if (!empty($this->HREF) AND (isset($this->HREF['url']))) {
-						// HTML <a> Link
-						$strrest = $this->addHtmlLink($this->HREF['url'], $dom[$key]['value'], $wfill, true, $this->HREF['color'], $this->HREF['style'], true);
-					} else {
-						// ****** write only until the end of the line and get the rest ******
-						$strrest = $this->Write($this->lasth, $dom[$key]['value'], '', $wfill, '', false, 0, true, $firstblock, 0);
-					}
-					$this->textindent = 0;
-
-					if (strlen($strrest) > 0) {
-						// store the remaining string on the previous $key position
-						$this->newline = true;
-						if ($cell) {
-							if ($this->rtl) {
-								$this->x -= $this->cMargin;
-							} else {
-								$this->x += $this->cMargin;
-							}
-						}
-						if ($strrest == $dom[$key]['value']) {
-							// used to avoid infinite loop
-							++$loop;
-						} else {
-							$loop = 0;
-						}
-						if (!empty($this->HREF) AND (isset($this->HREF['url']))) {
-							$dom[$key]['value'] = trim($strrest);
-						} elseif ($this->premode) {
-							$dom[$key]['value'] = $strrest;
-						} elseif ($this->isRTLTextDir()) {
-							$dom[$key]['value'] = rtrim($strrest);
-						} else {
-							$dom[$key]['value'] = ltrim($strrest);
-						}
-						if ($loop < 3) {
-							--$key;
-						}
-					} else {
-						$loop = 0;
-					}
-				}
-				++$key;
-				if (isset($dom[$key]['tag']) AND $dom[$key]['tag'] AND (!isset($dom[$key]['opening']) OR !$dom[$key]['opening']) AND isset($dom[($dom[$key]['parent'])]['attribute']['nobr']) AND ($dom[($dom[$key]['parent'])]['attribute']['nobr'] == 'true')) {
-					if ( (!$undo) AND (($this->start_transaction_page == ($this->numpages - 1)) OR ($this->y < $this->start_transaction_y))) {
-						// restore previous object
-						$this->rollbackTransaction(true);
-						// restore previous values
-						foreach ($this_method_vars as $vkey => $vval) {
-							$$vkey = $vval;
-						}
-						// add a page (or trig AcceptPageBreak() for multicolumn mode)
-						$pre_y = $this->y;
-						if ((!$this->checkPageBreak($this->PageBreakTrigger + 1)) AND ($this->y < $pre_y)) {
-							$startliney = $this->y;
-						}
-						$undo = true; // avoid infinite loop
-					} else {
-						$undo = false;
-					}
-				}
-			} // end for each $key
-			// align the last line
-			if (isset($startlinex)) {
-				$yshift = $minstartliney - $startliney;
-				if (($yshift > 0) OR ($this->page > $startlinepage)) {
-					$yshift = 0;
-				}
-				$t_x = 0;
-				// the last line must be shifted to be aligned as requested
-				$linew = abs($this->endlinex - $startlinex);
-				$pstart = substr($this->getPageBuffer($startlinepage), 0, $startlinepos);
-				if (isset($opentagpos) AND isset($this->footerlen[$startlinepage]) AND (!$this->InFooter)) {
-					$this->footerpos[$startlinepage] = $this->pagelen[$startlinepage] - $this->footerlen[$startlinepage];
-					$midpos = min($opentagpos, $this->footerpos[$startlinepage]);
-				} elseif (isset($opentagpos)) {
-					$midpos = $opentagpos;
-				} elseif (isset($this->footerlen[$startlinepage]) AND (!$this->InFooter)) {
-					$this->footerpos[$startlinepage] = $this->pagelen[$startlinepage] - $this->footerlen[$startlinepage];
-					$midpos = $this->footerpos[$startlinepage];
-				} else {
-					$midpos = 0;
-				}
-				if ($midpos > 0) {
-					$pmid = substr($this->getPageBuffer($startlinepage), $startlinepos, ($midpos - $startlinepos));
-					$pend = substr($this->getPageBuffer($startlinepage), $midpos);
-				} else {
-					$pmid = substr($this->getPageBuffer($startlinepage), $startlinepos);
-					$pend = '';
-				}
-				if ((isset($plalign) AND ((($plalign == 'C') OR (($plalign == 'R') AND (!$this->rtl)) OR (($plalign == 'L') AND ($this->rtl))))) OR ($yshift < 0)) {
-					// calculate shifting amount
-					$tw = $w;
-					if ($this->lMargin != $prevlMargin) {
-						$tw += ($prevlMargin - $this->lMargin);
-					}
-					if ($this->rMargin != $prevrMargin) {
-						$tw += ($prevrMargin - $this->rMargin);
-					}
-					$one_space_width = $this->GetStringWidth(chr(32));
-					$mdiff = abs($tw - $linew);
-					if ($plalign == 'C') {
-						if ($this->rtl) {
-							$t_x = -($mdiff / 2);
-						} else {
-							$t_x = ($mdiff / 2);
-						}
-					} elseif (($plalign == 'R') AND (!$this->rtl)) {
-						// right alignment on LTR document
-						if (intval($this->revstrpos($pmid, ')]')) == (intval($this->revstrpos($pmid, ' )]')) + 1)) {
-							// remove last space (if any)
-							$linew -= $one_space_width;
-							$mdiff = abs($tw - $linew);
-						}
-						$t_x = $mdiff;
-					} elseif (($plalign == 'L') AND ($this->rtl)) {
-						// left alignment on RTL document
-						if (($this->revstrpos($pmid, '[(') > 0) AND ((intval($this->revstrpos($pmid, '[( ')) == intval($this->revstrpos($pmid, '[('))) OR (intval($this->revstrpos($pmid, '[('.chr(0).chr(32))) == intval($this->revstrpos($pmid, '[('))))) {
-							// remove first space (if any)
-							$linew -= $one_space_width;
-						}
-						if ((strpos($pmid, '[(') > 0) AND (intval(strpos($pmid, '[(')) == (intval($this->revstrpos($pmid, '[('))))) {
-							// remove last space (if any)
-							$linew -= $one_space_width;
-							if (($this->CurrentFont['type'] == 'TrueTypeUnicode') OR ($this->CurrentFont['type'] == 'cidfont0')) {
-								$linew -= $one_space_width;
-							}
-						}
-						$mdiff = abs($tw - $linew);
-						$t_x = -$mdiff;
-					}
-				} // end if startlinex
-				if (($t_x != 0) OR ($yshift < 0)) {
-					// shift the line
-					$trx = sprintf('1 0 0 1 %.3F %.3F cm', ($t_x * $this->k), ($yshift * $this->k));
-					$this->setPageBuffer($startlinepage, $pstart."\nq\n".$trx."\n".$pmid."\nQ\n".$pend);
-					$endlinepos = strlen($pstart."\nq\n".$trx."\n".$pmid."\nQ\n");
-					// shift the annotations and links
-					if (isset($this->PageAnnots[$this->page])) {
-						foreach ($this->PageAnnots[$this->page] as $pak => $pac) {
-							if ($pak >= $pask) {
-								$this->PageAnnots[$this->page][$pak]['x'] += $t_x;
-								$this->PageAnnots[$this->page][$pak]['y'] -= $yshift;
-							}
-						}
-					}
-					$this->y -= $yshift;
-				}
-			}
-			if ($ln AND (!($cell AND ($dom[$key-1]['value'] == 'table')))) {
-				$this->Ln($this->lasth);
-				if ($this->y < $maxbottomliney) {
-					$this->y = $maxbottomliney;
-				}
-			}
-			// restore previous values
-			$this->setGraphicVars($gvars);
-			if ($this->page > $prevPage) {
-				$this->lMargin = $this->pagedim[$this->page]['olm'];
-				$this->rMargin = $this->pagedim[$this->page]['orm'];
-			}
-			// restore previous list state
-			$this->cell_height_ratio = $prev_cell_height_ratio;
-			$this->listnum = $prev_listnum;
-			$this->listordered = $prev_listordered;
-			$this->listcount = $prev_listcount;
-			$this->lispacer = $prev_lispacer;
-			unset($dom);
-		}
-
-		/**
-		 * Process opening tags.
-		 * @param array $dom html dom array
-		 * @param int $key current element id
-		 * @param boolean $cell if true add the default cMargin space to each new line (default false).
-		 * @access protected
-		 */
-		protected function openHTMLTagHandler(&$dom, $key, $cell) {
-			$tag = $dom[$key];
-			$parent = $dom[($dom[$key]['parent'])];
-			$firstorlast = ($key == 1);
-			// check for text direction attribute
-			if (isset($tag['attribute']['dir'])) {
-				$this->setTempRTL($tag['attribute']['dir']);
-			} else {
-				$this->tmprtl = false;
-			}
-			if ($tag['block']) {
-				$hbz = 0; // distance from y to line bottom
-				$hb = 0; // vertical space between block tags
-				// calculate vertical space for block tags
-				if (isset($this->tagvspaces[$tag['value']][0]['h']) AND ($this->tagvspaces[$tag['value']][0]['h'] >= 0)) {
-					$cur_h = $this->tagvspaces[$tag['value']][0]['h'];
-				} elseif (isset($tag['fontsize'])) {
-					$cur_h = ($tag['fontsize'] / $this->k) * $this->cell_height_ratio;
-				} else {
-					$cur_h = $this->FontSize * $this->cell_height_ratio;
-				}
-				if (isset($this->tagvspaces[$tag['value']][0]['n'])) {
-					$n = $this->tagvspaces[$tag['value']][0]['n'];
-				} elseif (preg_match('/[h][0-9]/', $tag['value']) > 0) {
-					$n = 0.6;
-				} else {
-					$n = 1;
-				}
-				$hb = ($n * $cur_h);
-				if (($this->htmlvspace <= 0) AND ($n > 0)) {
-					if (isset($parent['fontsize'])) {
-						$hbz = (($parent['fontsize'] / $this->k) * $this->cell_height_ratio);
-					} else {
-						$hbz = $this->FontSize * $this->cell_height_ratio;
-					}
-				}
-			}
-			//Opening tag
-			switch($tag['value']) {
-				case 'table': {
-					$cp = 0;
-					$cs = 0;
-					$dom[$key]['rowspans'] = array();
-					if (!isset($dom[$key]['attribute']['nested']) OR ($dom[$key]['attribute']['nested'] != 'true')) {
-						// set table header
-						if (!$this->empty_string($dom[$key]['thead'])) {
-							// set table header
-							$this->thead = $dom[$key]['thead'];
-							if (!isset($this->theadMargins) OR (empty($this->theadMargins))) {
-								$this->theadMargins = array();
-								$this->theadMargins['cmargin'] = $this->cMargin;
-							}
-						}
-					}
-					if (isset($tag['attribute']['cellpadding'])) {
-						$cp = $this->getHTMLUnitToUnits($tag['attribute']['cellpadding'], 1, 'px');
-						$this->oldcMargin = $this->cMargin;
-						$this->cMargin = $cp;
-					}
-					if (isset($tag['attribute']['cellspacing'])) {
-						$cs = $this->getHTMLUnitToUnits($tag['attribute']['cellspacing'], 1, 'px');
-					}
-					if ($this->checkPageBreak(((2 * $cp) + (2 * $cs) + $this->lasth), '', false)) {
-						$this->inthead = true;
-						// add a page (or trig AcceptPageBreak() for multicolumn mode)
-						$this->checkPageBreak($this->PageBreakTrigger + 1);
-					}
-					break;
-				}
-				case 'tr': {
-					// array of columns positions
-					$dom[$key]['cellpos'] = array();
-					break;
-				}
-				case 'hr': {
-					$wtmp = $this->w - $this->lMargin - $this->rMargin;
-					if ((isset($tag['attribute']['width'])) AND ($tag['attribute']['width'] != '')) {
-						$hrWidth = $this->getHTMLUnitToUnits($tag['attribute']['width'], $wtmp, 'px');
-					} else {
-						$hrWidth = $wtmp;
-					}
-					if ((isset($tag['height'])) AND ($tag['height'] != '')) {
-						$hrHeight = $this->getHTMLUnitToUnits($tag['height'], 1, 'px');
-					} else {
-						$hrHeight = $this->GetLineWidth();
-					}
-					$this->addHTMLVertSpace($hbz, ($hrHeight / 2), $cell, $firstorlast);
-					$x = $this->GetX();
-					$y = $this->GetY();
-					$prevlinewidth = $this->GetLineWidth();
-					$this->SetLineWidth($hrHeight);
-					$this->Line($x, $y, $x + $hrWidth, $y);
-					$this->SetLineWidth($prevlinewidth);
-					$this->addHTMLVertSpace(($hrHeight / 2), 0, $cell, !isset($dom[($key + 1)]));
-					break;
-				}
-				case 'a': {
-					if (array_key_exists('href', $tag['attribute'])) {
-						$this->HREF['url'] = $tag['attribute']['href'];
-					}
-					$this->HREF['color'] = $this->htmlLinkColorArray;
-					$this->HREF['style'] = $this->htmlLinkFontStyle;
-					if (array_key_exists('style', $tag['attribute'])) {
-						// get style attributes
-						preg_match_all('/([^;:\s]*):([^;]*)/', $tag['attribute']['style'], $style_array, PREG_PATTERN_ORDER);
-						$astyle = array();
-						while (list($id, $name) = each($style_array[1])) {
-							$name = strtolower($name);
-							$astyle[$name] = trim($style_array[2][$id]);
-						}
-						if (isset($astyle['color'])) {
-							$this->HREF['color'] = $this->convertHTMLColorToDec($astyle['color']);
-						}
-						if (isset($astyle['text-decoration'])) {
-							$this->HREF['style'] = '';
-							$decors = explode(' ', strtolower($astyle['text-decoration']));
-							foreach ($decors as $dec) {
-								$dec = trim($dec);
-								if (!$this->empty_string($dec)) {
-									if ($dec{0} == 'u') {
-										// underline
-										$this->HREF['style'] .= 'U';
-									} elseif ($dec{0} == 'l') {
-										// line-trough
-										$this->HREF['style'] .= 'D';
-									} elseif ($dec{0} == 'o') {
-										// overline
-										$this->HREF['style'] .= 'O';
-									}
-								}
-							}
-						}
-					}
-					break;
-				}
-				case 'img': {
-					if (isset($tag['attribute']['src'])) {
-						// replace relative path with real server path
-						if (($tag['attribute']['src'][0] == '/') AND ($_SERVER['DOCUMENT_ROOT'] != '/')) {
-							$findroot = strpos($tag['attribute']['src'], $_SERVER['DOCUMENT_ROOT']);
-							if (($findroot === false) OR ($findroot > 1)) {
-								$tag['attribute']['src'] = $_SERVER['DOCUMENT_ROOT'].$tag['attribute']['src'];
-							}
-						}
-						$tag['attribute']['src'] = urldecode($tag['attribute']['src']);
-						$type = $this->getImageFileType($tag['attribute']['src']);
-						$testscrtype = @parse_url($tag['attribute']['src']);
-						if (!isset($testscrtype['query']) OR empty($testscrtype['query'])) {
-							// convert URL to server path
-							$tag['attribute']['src'] = str_replace(K_PATH_URL, K_PATH_MAIN, $tag['attribute']['src']);
-						}
-						if (!isset($tag['attribute']['width'])) {
-							$tag['attribute']['width'] = 0;
-						}
-						if (!isset($tag['attribute']['height'])) {
-							$tag['attribute']['height'] = 0;
-						}
-						//if (!isset($tag['attribute']['align'])) {
-							// the only alignment supported is "bottom"
-							// further development is required for other modes.
-							$tag['attribute']['align'] = 'bottom';
-						//}
-						switch($tag['attribute']['align']) {
-							case 'top': {
-								$align = 'T';
-								break;
-							}
-							case 'middle': {
-								$align = 'M';
-								break;
-							}
-							case 'bottom': {
-								$align = 'B';
-								break;
-							}
-							default: {
-								$align = 'B';
-								break;
-							}
-						}
-						$prevy = $this->y;
-						$xpos = $this->GetX();
-						// eliminate marker spaces
-						if (isset($dom[($key - 1)])) {
-							if (($dom[($key - 1)]['value'] == ' ') OR (isset($dom[($key - 1)]['trimmed_space']))) {
-								$xpos -= $this->GetStringWidth(chr(32));
-							} elseif ($this->rtl AND $dom[($key - 1)]['value'] == '  ') {
-								$xpos -= (2 * $this->GetStringWidth(chr(32)));
-							}
-						}
-						$imglink = '';
-						if (isset($this->HREF['url']) AND !$this->empty_string($this->HREF['url'])) {
-							$imglink = $this->HREF['url'];
-							if ($imglink{0} == '#') {
-								// convert url to internal link
-								$page = intval(substr($imglink, 1));
-								$imglink = $this->AddLink();
-								$this->SetLink($imglink, 0, $page);
-							}
-						}
-						$border = 0;
-						if (isset($tag['attribute']['border']) AND !empty($tag['attribute']['border'])) {
-							// currently only support 1 (frame) or a combination of 'LTRB'
-							$border = $tag['attribute']['border'];
-						}
-						$iw = '';
-						if (isset($tag['attribute']['width'])) {
-							$iw = $this->getHTMLUnitToUnits($tag['attribute']['width'], 1, 'px', false);
-						}
-						$ih = '';
-						if (isset($tag['attribute']['height'])) {
-							$ih = $this->getHTMLUnitToUnits($tag['attribute']['height'], 1, 'px', false);
-						}
-						if (($type == 'eps') OR ($type == 'ai')) {
-							$this->ImageEps($tag['attribute']['src'], $xpos, $this->y, $iw, $ih, $imglink, true, $align, '', $border, true);
-						} elseif ($type == 'svg') {
-							$this->ImageSVG($tag['attribute']['src'], $xpos, $this->y, $iw, $ih, $imglink, $align, '', $border, true);
-						} else  {
-							$this->Image($tag['attribute']['src'], $xpos, $this->y, $iw, $ih, '', $imglink, $align, false, 300, '', false, false, $border, false, false, true);
-						}
-						switch($align) {
-							case 'T': {
-								$this->y = $prevy;
-								break;
-							}
-							case 'M': {
-								$this->y = (($this->img_rb_y + $prevy - ($tag['fontsize'] / $this->k)) / 2) ;
-								break;
-							}
-							case 'B': {
-								$this->y = $this->img_rb_y - ($tag['fontsize'] / $this->k);
-								break;
-							}
-						}
-					}
-					break;
-				}
-				case 'dl': {
-					++$this->listnum;
-					if ($this->listnum == 1) {
-						$this->addHTMLVertSpace($hbz, $hb, $cell, $firstorlast);
-					} else {
-						$this->addHTMLVertSpace(0, 0, $cell, $firstorlast);
-					}
-					break;
-				}
-				case 'dt': {
-					$this->addHTMLVertSpace($hbz, 0, $cell, $firstorlast);
-					break;
-				}
-				case 'dd': {
-					if ($this->rtl) {
-						$this->rMargin += $this->listindent;
-					} else {
-						$this->lMargin += $this->listindent;
-					}
-					++$this->listindentlevel;
-					$this->addHTMLVertSpace($hbz, 0, $cell, $firstorlast);
-					break;
-				}
-				case 'ul':
-				case 'ol': {
-					++$this->listnum;
-					if ($tag['value'] == 'ol') {
-						$this->listordered[$this->listnum] = true;
-					} else {
-						$this->listordered[$this->listnum] = false;
-					}
-					if (isset($tag['attribute']['start'])) {
-						$this->listcount[$this->listnum] = intval($tag['attribute']['start']) - 1;
-					} else {
-						$this->listcount[$this->listnum] = 0;
-					}
-					if ($this->rtl) {
-						$this->rMargin += $this->listindent;
-					} else {
-						$this->lMargin += $this->listindent;
-					}
-					++$this->listindentlevel;
-					if ($this->listnum == 1) {
-						$this->addHTMLVertSpace($hbz, $hb, $cell, $firstorlast);
-					} else {
-						$this->addHTMLVertSpace(0, 0, $cell, $firstorlast);
-					}
-					break;
-				}
-				case 'li': {
-					$this->addHTMLVertSpace($hbz, 0, $cell, $firstorlast);
-					if ($this->listordered[$this->listnum]) {
-						// ordered item
-						if (isset($parent['attribute']['type']) AND !$this->empty_string($parent['attribute']['type'])) {
-							$this->lispacer = $parent['attribute']['type'];
-						} elseif (isset($parent['listtype']) AND !$this->empty_string($parent['listtype'])) {
-							$this->lispacer = $parent['listtype'];
-						} elseif (isset($this->lisymbol) AND !$this->empty_string($this->lisymbol)) {
-							$this->lispacer = $this->lisymbol;
-						} else {
-							$this->lispacer = '#';
-						}
-						++$this->listcount[$this->listnum];
-						if (isset($tag['attribute']['value'])) {
-							$this->listcount[$this->listnum] = intval($tag['attribute']['value']);
-						}
-					} else {
-						// unordered item
-						if (isset($parent['attribute']['type']) AND !$this->empty_string($parent['attribute']['type'])) {
-							$this->lispacer = $parent['attribute']['type'];
-						} elseif (isset($parent['listtype']) AND !$this->empty_string($parent['listtype'])) {
-							$this->lispacer = $parent['listtype'];
-						} elseif (isset($this->lisymbol) AND !$this->empty_string($this->lisymbol)) {
-							$this->lispacer = $this->lisymbol;
-						} else {
-							$this->lispacer = '!';
-						}
-					}
-					break;
-				}
-				case 'blockquote': {
-					if ($this->rtl) {
-						$this->rMargin += $this->listindent;
-					} else {
-						$this->lMargin += $this->listindent;
-					}
-					++$this->listindentlevel;
-					$this->addHTMLVertSpace($hbz, $hb, $cell, $firstorlast);
-					break;
-				}
-				case 'br': {
-					$this->addHTMLVertSpace($hbz, 0, $cell, $firstorlast);
-					break;
-				}
-				case 'div': {
-					$this->addHTMLVertSpace($hbz, 0, $cell, $firstorlast);
-					break;
-				}
-				case 'p': {
-					$this->addHTMLVertSpace($hbz, $hb, $cell, $firstorlast);
-					break;
-				}
-				case 'pre': {
-					$this->addHTMLVertSpace($hbz, $hb, $cell, $firstorlast);
-					$this->premode = true;
-					break;
-				}
-				case 'sup': {
-					$this->SetXY($this->GetX(), $this->GetY() - ((0.7 * $this->FontSizePt) / $this->k));
-					break;
-				}
-				case 'sub': {
-					$this->SetXY($this->GetX(), $this->GetY() + ((0.3 * $this->FontSizePt) / $this->k));
-					break;
-				}
-				case 'h1':
-				case 'h2':
-				case 'h3':
-				case 'h4':
-				case 'h5':
-				case 'h6': {
-					$this->addHTMLVertSpace($hbz, $hb, $cell, $firstorlast);
-					break;
-				}
-				// Form fields (since 4.8.000 - 2009-09-07)
-				case 'form': {
-					if (isset($tag['attribute']['action'])) {
-						$this->form_action = $tag['attribute']['action'];
-					} else {
-						$this->form_action = K_PATH_URL.$_SERVER['SCRIPT_NAME'];
-					}
-					if (isset($tag['attribute']['enctype'])) {
-						$this->form_enctype = $tag['attribute']['enctype'];
-					} else {
-						$this->form_enctype = 'application/x-www-form-urlencoded';
-					}
-					if (isset($tag['attribute']['method'])) {
-						$this->form_mode = $tag['attribute']['method'];
-					} else {
-						$this->form_mode = 'post';
-					}
-					break;
-				}
-				case 'input': {
-					if (isset($tag['attribute']['name']) AND !$this->empty_string($tag['attribute']['name'])) {
-						$name = $tag['attribute']['name'];
-					} else {
-						break;
-					}
-					$prop = array();
-					$opt = array();
-					if (isset($tag['attribute']['value']) AND !$this->empty_string($tag['attribute']['value'])) {
-						$value = $tag['attribute']['value'];
-					}
-					if (isset($tag['attribute']['maxlength']) AND !$this->empty_string($tag['attribute']['maxlength'])) {
-						$opt['maxlen'] = intval($tag['attribute']['value']);
-					}
-					$h = $this->FontSize * $this->cell_height_ratio;
-					if (isset($tag['attribute']['size']) AND !$this->empty_string($tag['attribute']['size'])) {
-						$w = intval($tag['attribute']['size']) * $this->GetStringWidth(chr(32)) * 2;
-					} else {
-						$w = $h;
-					}
-					if (isset($tag['attribute']['checked']) AND (($tag['attribute']['checked'] == 'checked') OR ($tag['attribute']['checked'] == 'true'))) {
-						$checked = true;
-					} else {
-						$checked = false;
-					}
-					switch ($tag['attribute']['type']) {
-						case 'text': {
-							if (isset($value)) {
-								$opt['v'] = $value;
-							}
-							$this->TextField($name, $w, $h, $prop, $opt, '', '', false);
-							break;
-						}
-						case 'password': {
-							if (isset($value)) {
-								$opt['v'] = $value;
-							}
-							$prop['password'] = 'true';
-							$this->TextField($name, $w, $h, $prop, $opt, '', '', false);
-							break;
-						}
-						case 'checkbox': {
-							$this->CheckBox($name, $w, $checked, $prop, $opt, $value, '', '', false);
-							break;
-						}
-						case 'radio': {
-							$this->RadioButton($name, $w, $prop, $opt, $value, $checked, '', '', false);
-							break;
-						}
-						case 'submit': {
-							$w = $this->GetStringWidth($value) * 1.5;
-							$h *= 1.6;
-							$prop = array('lineWidth'=>1, 'borderStyle'=>'beveled', 'fillColor'=>array(196, 196, 196), 'strokeColor'=>array(255, 255, 255));
-							$action = array();
-							$action['S'] = 'SubmitForm';
-							$action['F'] = $this->form_action;
-							if ($this->form_enctype != 'FDF') {
-								$action['Flags'] = array('ExportFormat');
-							}
-							if ($this->form_mode == 'get') {
-								$action['Flags'] = array('GetMethod');
-							}
-							$this->Button($name, $w, $h, $value, $action, $prop, $opt, '', '', false);
-							break;
-						}
-						case 'reset': {
-							$w = $this->GetStringWidth($value) * 1.5;
-							$h *= 1.6;
-							$prop = array('lineWidth'=>1, 'borderStyle'=>'beveled', 'fillColor'=>array(196, 196, 196), 'strokeColor'=>array(255, 255, 255));
-							$this->Button($name, $w, $h, $value, array('S'=>'ResetForm'), $prop, $opt, '', '', false);
-							break;
-						}
-						case 'file': {
-							$prop['fileSelect'] = 'true';
-							$this->TextField($name, $w, $h, $prop, $opt, '', '', false);
-							if (!isset($value)) {
-								$value = '*';
-							}
-							$w = $this->GetStringWidth($value) * 2;
-							$h *= 1.2;
-							$prop = array('lineWidth'=>1, 'borderStyle'=>'beveled', 'fillColor'=>array(196, 196, 196), 'strokeColor'=>array(255, 255, 255));
-							$jsaction = 'var f=this.getField(\''.$name.'\'); f.browseForFileToSubmit();';
-							$this->Button('FB_'.$name, $w, $h, $value, $jsaction, $prop, $opt, '', '', false);
-							break;
-						}
-						case 'hidden': {
-							if (isset($value)) {
-								$opt['v'] = $value;
-							}
-							$opt['f'] = array('invisible', 'hidden');
-							$this->TextField($name, 0, 0, $prop, $opt, '', '', false);
-							break;
-						}
-						case 'image': {
-							// THIS TYPE MUST BE FIXED
-							if (isset($tag['attribute']['src']) AND !$this->empty_string($tag['attribute']['src'])) {
-								$img = $tag['attribute']['src'];
-							} else {
-								break;
-							}
-							$value = 'img';
-							//$opt['mk'] = array('i'=>$img, 'tp'=>1, 'if'=>array('sw'=>'A', 's'=>'A', 'fb'=>false));
-							if (isset($tag['attribute']['onclick']) AND !empty($tag['attribute']['onclick'])) {
-								$jsaction = $tag['attribute']['onclick'];
-							} else {
-								$jsaction = '';
-							}
-							$this->Button($name, $w, $h, $value, $jsaction, $prop, $opt, '', '', false);
-							break;
-						}
-						case 'button': {
-							$w = $this->GetStringWidth($value) * 1.5;
-							$h *= 1.6;
-							$prop = array('lineWidth'=>1, 'borderStyle'=>'beveled', 'fillColor'=>array(196, 196, 196), 'strokeColor'=>array(255, 255, 255));
-							if (isset($tag['attribute']['onclick']) AND !empty($tag['attribute']['onclick'])) {
-								$jsaction = $tag['attribute']['onclick'];
-							} else {
-								$jsaction = '';
-							}
-							$this->Button($name, $w, $h, $value, $jsaction, $prop, $opt, '', '', false);
-							break;
-						}
-					}
-					break;
-				}
-				case 'textarea': {
-					$prop = array();
-					$opt = array();
-					if (isset($tag['attribute']['name']) AND !$this->empty_string($tag['attribute']['name'])) {
-						$name = $tag['attribute']['name'];
-					} else {
-						break;
-					}
-					if (isset($tag['attribute']['value']) AND !$this->empty_string($tag['attribute']['value'])) {
-						$opt['v'] = $tag['attribute']['value'];
-					}
-					if (isset($tag['attribute']['cols']) AND !$this->empty_string($tag['attribute']['cols'])) {
-						$w = intval($tag['attribute']['cols']) * $this->GetStringWidth(chr(32)) * 2;
-					} else {
-						$w = 40;
-					}
-					if (isset($tag['attribute']['rows']) AND !$this->empty_string($tag['attribute']['rows'])) {
-						$h = intval($tag['attribute']['rows']) * $this->FontSize * $this->cell_height_ratio;
-					} else {
-						$h = 10;
-					}
-					$prop['multiline'] = 'true';
-					$this->TextField($name, $w, $h, $prop, $opt, '', '', false);
-					break;
-				}
-				case 'select': {
-					$h = $this->FontSize * $this->cell_height_ratio;
-					if (isset($tag['attribute']['size']) AND !$this->empty_string($tag['attribute']['size'])) {
-						$h *= ($tag['attribute']['size'] + 1);
-					}
-					$prop = array();
-					$opt = array();
-					if (isset($tag['attribute']['name']) AND !$this->empty_string($tag['attribute']['name'])) {
-						$name = $tag['attribute']['name'];
-					} else {
-						break;
-					}
-					$w = 0;
-					if (isset($tag['attribute']['opt']) AND !$this->empty_string($tag['attribute']['opt'])) {
-						$options = explode ("\r", $tag['attribute']['opt']);
-						$values = array();
-						foreach ($options as $val) {
-							if (strpos($val, "\t") !== false) {
-								$opts = explode("\t", $val);
-								$values[] = $opts;
-								$w = max($w, $this->GetStringWidth($opts[1]));
-							} else {
-								$values[] = $val;
-								$w = max($w, $this->GetStringWidth($val));
-							}
-						}
-					} else {
-						break;
-					}
-					$w *= 2;
-					if (isset($tag['attribute']['multiple']) AND ($tag['attribute']['multiple']='multiple')) {
-						$prop['multipleSelection'] = 'true';
-						$this->ListBox($name, $w, $h, $values, $prop, $opt, '', '', false);
-					} else {
-						$this->ComboBox($name, $w, $h, $values, $prop, $opt, '', '', false);
-					}
-					break;
-				}
-				case 'tcpdf': {
-					if (defined('K_TCPDF_CALLS_IN_HTML') AND (K_TCPDF_CALLS_IN_HTML === true)) {
-						// Special tag used to call TCPDF methods
-						if (isset($tag['attribute']['method'])) {
-							$tcpdf_method = $tag['attribute']['method'];
-							if (method_exists($this, $tcpdf_method)) {
-								if (isset($tag['attribute']['params']) AND (!empty($tag['attribute']['params']))) {
-									$params = unserialize(urldecode($tag['attribute']['params']));
-									call_user_func_array(array($this, $tcpdf_method), $params);
-								} else {
-									$this->$tcpdf_method();
-								}
-								$this->newline = true;
-							}
-						}
-					}
-					break;
-				}
-				default: {
-					break;
-				}
-			}
-			if ($dom[$key]['self'] AND isset($dom[$key]['attribute']['pagebreakafter'])) {
-				$pba = $dom[$key]['attribute']['pagebreakafter'];
-				// check for pagebreak
-				if (($pba == 'true') OR ($pba == 'left') OR ($pba == 'right')) {
-					// add a page (or trig AcceptPageBreak() for multicolumn mode)
-					$this->checkPageBreak($this->PageBreakTrigger + 1);
-				}
-				if ((($pba == 'left') AND (((!$this->rtl) AND (($this->page % 2) == 0)) OR (($this->rtl) AND (($this->page % 2) != 0))))
-					OR (($pba == 'right') AND (((!$this->rtl) AND (($this->page % 2) != 0)) OR (($this->rtl) AND (($this->page % 2) == 0))))) {
-					// add a page (or trig AcceptPageBreak() for multicolumn mode)
-					$this->checkPageBreak($this->PageBreakTrigger + 1);
-				}
-			}
-		}
-
-		/**
-		 * Process closing tags.
-		 * @param array $dom html dom array
-		 * @param int $key current element id
-		 * @param boolean $cell if true add the default cMargin space to each new line (default false).
-		 * @param int $maxbottomliney maximum y value of current line
-		 * @access protected
-		 */
-		protected function closeHTMLTagHandler(&$dom, $key, $cell, $maxbottomliney=0) {
-			$tag = $dom[$key];
-			$parent = $dom[($dom[$key]['parent'])];
-			$firstorlast = ((!isset($dom[($key + 1)])) OR ((!isset($dom[($key + 2)])) AND ($dom[($key + 1)]['value'] == 'marker')));
-			$in_table_head = false;
-			if ($tag['block']) {
-				$hbz = 0; // distance from y to line bottom
-				$hb = 0; // vertical space between block tags
-				// calculate vertical space for block tags
-				if (isset($this->tagvspaces[$tag['value']][1]['h']) AND ($this->tagvspaces[$tag['value']][1]['h'] >= 0)) {
-					$pre_h = $this->tagvspaces[$tag['value']][1]['h'];
-				} elseif (isset($parent['fontsize'])) {
-					$pre_h = (($parent['fontsize'] / $this->k) * $this->cell_height_ratio);
-				} else {
-					$pre_h = $this->FontSize * $this->cell_height_ratio;
-				}
-				if (isset($this->tagvspaces[$tag['value']][1]['n'])) {
-					$n = $this->tagvspaces[$tag['value']][1]['n'];
-				} elseif (preg_match('/[h][0-9]/', $tag['value']) > 0) {
-					$n = 0.6;
-				} else {
-					$n = 1;
-				}
-				$hb = ($n * $pre_h);
-				if ($this->y < $maxbottomliney) {
-					$hbz = ($maxbottomliney - $this->y);
-				}
-			}
-			//Closing tag
-			switch($tag['value']) {
-				case 'tr': {
-					$table_el = $dom[($dom[$key]['parent'])]['parent'];
-					if (!isset($parent['endy'])) {
-						$dom[($dom[$key]['parent'])]['endy'] = $this->y;
-						$parent['endy'] = $this->y;
-					}
-					if (!isset($parent['endpage'])) {
-						$dom[($dom[$key]['parent'])]['endpage'] = $this->page;
-						$parent['endpage'] = $this->page;
-					}
-					// update row-spanned cells
-					if (isset($dom[$table_el]['rowspans'])) {
-						foreach ($dom[$table_el]['rowspans'] as $k => $trwsp) {
-							$dom[$table_el]['rowspans'][$k]['rowspan'] -= 1;
-							if ($dom[$table_el]['rowspans'][$k]['rowspan'] == 0) {
-								if ($dom[$table_el]['rowspans'][$k]['endpage'] == $parent['endpage']) {
-									$dom[($dom[$key]['parent'])]['endy'] = max($dom[$table_el]['rowspans'][$k]['endy'], $parent['endy']);
-								} elseif ($dom[$table_el]['rowspans'][$k]['endpage'] > $parent['endpage']) {
-									$dom[($dom[$key]['parent'])]['endy'] = $dom[$table_el]['rowspans'][$k]['endy'];
-									$dom[($dom[$key]['parent'])]['endpage'] = $dom[$table_el]['rowspans'][$k]['endpage'];
-								}
-							}
-						}
-						// report new endy and endpage to the rowspanned cells
-						foreach ($dom[$table_el]['rowspans'] as $k => $trwsp) {
-							if ($dom[$table_el]['rowspans'][$k]['rowspan'] == 0) {
-								$dom[$table_el]['rowspans'][$k]['endpage'] = max($dom[$table_el]['rowspans'][$k]['endpage'], $dom[($dom[$key]['parent'])]['endpage']);
-								$dom[($dom[$key]['parent'])]['endpage'] = $dom[$table_el]['rowspans'][$k]['endpage'];
-								$dom[$table_el]['rowspans'][$k]['endy'] = max($dom[$table_el]['rowspans'][$k]['endy'], $dom[($dom[$key]['parent'])]['endy']);
-								$dom[($dom[$key]['parent'])]['endy'] = $dom[$table_el]['rowspans'][$k]['endy'];
-							}
-						}
-						// update remaining rowspanned cells
-						foreach ($dom[$table_el]['rowspans'] as $k => $trwsp) {
-							if ($dom[$table_el]['rowspans'][$k]['rowspan'] == 0) {
-								$dom[$table_el]['rowspans'][$k]['endpage'] = $dom[($dom[$key]['parent'])]['endpage'];
-								$dom[$table_el]['rowspans'][$k]['endy'] = $dom[($dom[$key]['parent'])]['endy'];
-							}
-						}
-					}
-					if (($this->num_columns > 1) AND ($dom[($dom[$key]['parent'])]['endy'] >= ($this->PageBreakTrigger - $this->lasth)) AND ($this->y < $dom[($dom[$key]['parent'])]['endy'])) {
-						$this->Ln(0, $cell);
-					} else {
-						$this->setPage($dom[($dom[$key]['parent'])]['endpage']);
-						$this->y = $dom[($dom[$key]['parent'])]['endy'];
-						if (isset($dom[$table_el]['attribute']['cellspacing'])) {
-							$cellspacing = $this->getHTMLUnitToUnits($dom[$table_el]['attribute']['cellspacing'], 1, 'px');
-							$this->y += $cellspacing;
-						}
-						$this->Ln(0, $cell);
-						$this->x = $parent['startx'];
-						// account for booklet mode
-						if ($this->page > $parent['startpage']) {
-							if (($this->rtl) AND ($this->pagedim[$this->page]['orm'] != $this->pagedim[$parent['startpage']]['orm'])) {
-								$this->x -= ($this->pagedim[$this->page]['orm'] - $this->pagedim[$parent['startpage']]['orm']);
-							} elseif ((!$this->rtl) AND ($this->pagedim[$this->page]['olm'] != $this->pagedim[$parent['startpage']]['olm'])) {
-								$this->x += ($this->pagedim[$this->page]['olm'] - $this->pagedim[$parent['startpage']]['olm']);
-							}
-						}
-					}
-					break;
-				}
-				case 'tablehead':
-					// closing tag used for the thead part
-					$in_table_head = true;
-					$this->inthead = false;
-				case 'table': {
-					$table_el = $parent;
-					// draw borders
-					if ((isset($table_el['attribute']['border']) AND ($table_el['attribute']['border'] > 0))
-						OR (isset($table_el['style']['border']) AND ($table_el['style']['border'] > 0))) {
-							$border = 1;
-					} else {
-						$border = 0;
-					}
-					// fix bottom line alignment of last line before page break
-					foreach ($dom[($dom[$key]['parent'])]['trids'] as $j => $trkey) {
-						// update row-spanned cells
-						if (isset($dom[($dom[$key]['parent'])]['rowspans'])) {
-							foreach ($dom[($dom[$key]['parent'])]['rowspans'] as $k => $trwsp) {
-								if ($trwsp['trid'] == $trkey) {
-									$dom[($dom[$key]['parent'])]['rowspans'][$k]['mrowspan'] -= 1;
-								}
-								if (isset($prevtrkey) AND ($trwsp['trid'] == $prevtrkey) AND ($trwsp['mrowspan'] >= 0)) {
-									$dom[($dom[$key]['parent'])]['rowspans'][$k]['trid'] = $trkey;
-								}
-							}
-						}
-						if (isset($prevtrkey) AND ($dom[$trkey]['startpage'] > $dom[$prevtrkey]['endpage'])) {
-							$pgendy = $this->pagedim[$dom[$prevtrkey]['endpage']]['hk'] - $this->pagedim[$dom[$prevtrkey]['endpage']]['bm'];
-							$dom[$prevtrkey]['endy'] = $pgendy;
-							// update row-spanned cells
-							if (isset($dom[($dom[$key]['parent'])]['rowspans'])) {
-								foreach ($dom[($dom[$key]['parent'])]['rowspans'] as $k => $trwsp) {
-									if (($trwsp['trid'] == $trkey) AND ($trwsp['mrowspan'] > 1) AND ($trwsp['endpage'] == $dom[$prevtrkey]['endpage'])) {
-										$dom[($dom[$key]['parent'])]['rowspans'][$k]['endy'] = $pgendy;
-										$dom[($dom[$key]['parent'])]['rowspans'][$k]['mrowspan'] = -1;
-									}
-								}
-							}
-						}
-						$prevtrkey = $trkey;
-						$table_el = $dom[($dom[$key]['parent'])];
-					}
-					// for each row
-					foreach ($table_el['trids'] as $j => $trkey) {
-						$parent = $dom[$trkey];
-						// for each cell on the row
-						foreach ($parent['cellpos'] as $k => $cellpos) {
-							if (isset($cellpos['rowspanid']) AND ($cellpos['rowspanid'] >= 0)) {
-								$cellpos['startx'] = $table_el['rowspans'][($cellpos['rowspanid'])]['startx'];
-								$cellpos['endx'] = $table_el['rowspans'][($cellpos['rowspanid'])]['endx'];
-								$endy = $table_el['rowspans'][($cellpos['rowspanid'])]['endy'];
-								$startpage = $table_el['rowspans'][($cellpos['rowspanid'])]['startpage'];
-								$endpage = $table_el['rowspans'][($cellpos['rowspanid'])]['endpage'];
-							} else {
-								$endy = $parent['endy'];
-								$startpage = $parent['startpage'];
-								$endpage = $parent['endpage'];
-							}
-							if ($endpage > $startpage) {
-								// design borders around HTML cells.
-								for ($page=$startpage; $page <= $endpage; ++$page) {
-									$this->setPage($page);
-									if ($page == $startpage) {
-										$this->y = $parent['starty']; // put cursor at the beginning of row on the first page
-										$ch = $this->getPageHeight() - $parent['starty'] - $this->getBreakMargin();
-										$cborder = $this->getBorderMode($border, $position='start');
-									} elseif ($page == $endpage) {
-										$this->y = $this->tMargin; // put cursor at the beginning of last page
-										$ch = $endy - $this->tMargin;
-										$cborder = $this->getBorderMode($border, $position='end');
-									} else {
-										$this->y = $this->tMargin; // put cursor at the beginning of the current page
-										$ch = $this->getPageHeight() - $this->tMargin - $this->getBreakMargin();
-										$cborder = $this->getBorderMode($border, $position='middle');
-									}
-									if (isset($cellpos['bgcolor']) AND ($cellpos['bgcolor']) !== false) {
-										$this->SetFillColorArray($cellpos['bgcolor']);
-										$fill = true;
-									} else {
-										$fill = false;
-									}
-									$cw = abs($cellpos['endx'] - $cellpos['startx']);
-									$this->x = $cellpos['startx'];
-									// account for margin changes
-									if ($page > $startpage) {
-										if (($this->rtl) AND ($this->pagedim[$page]['orm'] != $this->pagedim[$startpage]['orm'])) {
-											$this->x -= ($this->pagedim[$page]['orm'] - $this->pagedim[$startpage]['orm']);
-										} elseif ((!$this->rtl) AND ($this->pagedim[$page]['lm'] != $this->pagedim[$startpage]['olm'])) {
-											$this->x += ($this->pagedim[$page]['olm'] - $this->pagedim[$startpage]['olm']);
-										}
-									}
-									// design a cell around the text
-									$ccode = $this->FillColor."\n".$this->getCellCode($cw, $ch, '', $cborder, 1, '', $fill, '', 0, true);
-									if ($cborder OR $fill) {
-										$pagebuff = $this->getPageBuffer($this->page);
-										$pstart = substr($pagebuff, 0, $this->intmrk[$this->page]);
-										$pend = substr($pagebuff, $this->intmrk[$this->page]);
-										$this->setPageBuffer($this->page, $pstart.$ccode."\n".$pend);
-										$this->intmrk[$this->page] += strlen($ccode."\n");
-									}
-								}
-							} else {
-								$this->setPage($startpage);
-								if (isset($cellpos['bgcolor']) AND ($cellpos['bgcolor']) !== false) {
-									$this->SetFillColorArray($cellpos['bgcolor']);
-									$fill = true;
-								} else {
-									$fill = false;
-								}
-								$this->x = $cellpos['startx'];
-								$this->y = $parent['starty'];
-								$cw = abs($cellpos['endx'] - $cellpos['startx']);
-								$ch = $endy - $parent['starty'];
-								// design a cell around the text
-								$ccode = $this->FillColor."\n".$this->getCellCode($cw, $ch, '', $border, 1, '', $fill, '', 0, true);
-								if ($border OR $fill) {
-									if (end($this->transfmrk[$this->page]) !== false) {
-										$pagemarkkey = key($this->transfmrk[$this->page]);
-										$pagemark = &$this->transfmrk[$this->page][$pagemarkkey];
-									} elseif ($this->InFooter) {
-										$pagemark = &$this->footerpos[$this->page];
-									} else {
-										$pagemark = &$this->intmrk[$this->page];
-									}
-									$pagebuff = $this->getPageBuffer($this->page);
-									$pstart = substr($pagebuff, 0, $pagemark);
-									$pend = substr($pagebuff, $pagemark);
-									$this->setPageBuffer($this->page, $pstart.$ccode."\n".$pend);
-									$pagemark += strlen($ccode."\n");
-								}
-							}
-						}
-						if (isset($table_el['attribute']['cellspacing'])) {
-							$cellspacing = $this->getHTMLUnitToUnits($table_el['attribute']['cellspacing'], 1, 'px');
-							$this->y += $cellspacing;
-						}
-						$this->Ln(0, $cell);
-						$this->x = $parent['startx'];
-						if ($endpage > $startpage) {
-							if (($this->rtl) AND ($this->pagedim[$endpage]['orm'] != $this->pagedim[$startpage]['orm'])) {
-								$this->x += ($this->pagedim[$endpage]['orm'] - $this->pagedim[$startpage]['orm']);
-							} elseif ((!$this->rtl) AND ($this->pagedim[$endpage]['olm'] != $this->pagedim[$startpage]['olm'])) {
-								$this->x += ($this->pagedim[$endpage]['olm'] - $this->pagedim[$startpage]['olm']);
-							}
-						}
-					}
-					if (!$in_table_head) {
-						// we are not inside a thead section
-						if (isset($parent['cellpadding'])) {
-							$this->cMargin = $this->oldcMargin;
-						}
-						$this->lasth = $this->FontSize * $this->cell_height_ratio;
-						if (isset($this->theadMargins['top'])) {
-							if (($this->theadMargins['top'] == $this->tMargin) AND ($this->page == ($this->numpages - 1))) {
-								// remove last page containing only THEAD
-								$this->deletePage($this->numpages);
-							}
-							// restore top margin
-							$this->tMargin = $this->theadMargins['top'];
-							$this->pagedim[$this->page]['tm'] = $this->tMargin;
-						}
-						if (!isset($table_el['attribute']['nested']) OR ($table_el['attribute']['nested'] != 'true')) {
-							// reset main table header
-							$this->thead = '';
-							$this->theadMargins = array();
-						}
-					}
-					break;
-				}
-				case 'a': {
-					$this->HREF = '';
-					break;
-				}
-				case 'sup': {
-					$this->SetXY($this->GetX(), $this->GetY() + ((0.7 * $parent['fontsize']) / $this->k));
-					break;
-				}
-				case 'sub': {
-					$this->SetXY($this->GetX(), $this->GetY() - ((0.3 * $parent['fontsize'])/$this->k));
-					break;
-				}
-				case 'div': {
-					$this->addHTMLVertSpace($hbz, 0, $cell, $firstorlast);
-					break;
-				}
-				case 'blockquote': {
-					if ($this->rtl) {
-						$this->rMargin -= $this->listindent;
-					} else {
-						$this->lMargin -= $this->listindent;
-					}
-					--$this->listindentlevel;
-					$this->addHTMLVertSpace($hbz, $hb, $cell, $firstorlast);
-					break;
-				}
-				case 'p': {
-					$this->addHTMLVertSpace($hbz, $hb, $cell, $firstorlast);
-					break;
-				}
-				case 'pre': {
-					$this->addHTMLVertSpace($hbz, $hb, $cell, $firstorlast);
-					$this->premode = false;
-					break;
-				}
-				case 'dl': {
-					--$this->listnum;
-					if ($this->listnum <= 0) {
-						$this->listnum = 0;
-						$this->addHTMLVertSpace($hbz, $hb, $cell, $firstorlast);
-					} else {
-						$this->addHTMLVertSpace(0, 0, $cell, $firstorlast);
-					}
-					$this->lasth = $this->FontSize * $this->cell_height_ratio;
-					break;
-				}
-				case 'dt': {
-					$this->lispacer = '';
-					$this->addHTMLVertSpace(0, 0, $cell, $firstorlast);
-					break;
-				}
-				case 'dd': {
-					$this->lispacer = '';
-					if ($this->rtl) {
-						$this->rMargin -= $this->listindent;
-					} else {
-						$this->lMargin -= $this->listindent;
-					}
-					--$this->listindentlevel;
-					$this->addHTMLVertSpace(0, 0, $cell, $firstorlast);
-					break;
-				}
-				case 'ul':
-				case 'ol': {
-					--$this->listnum;
-					$this->lispacer = '';
-					if ($this->rtl) {
-						$this->rMargin -= $this->listindent;
-					} else {
-						$this->lMargin -= $this->listindent;
-					}
-					--$this->listindentlevel;
-					if ($this->listnum <= 0) {
-						$this->listnum = 0;
-						$this->addHTMLVertSpace($hbz, $hb, $cell, $firstorlast);
-					} else {
-						$this->addHTMLVertSpace(0, 0, $cell, $firstorlast);
-					}
-					$this->lasth = $this->FontSize * $this->cell_height_ratio;
-					break;
-				}
-				case 'li': {
-					$this->lispacer = '';
-					$this->addHTMLVertSpace(0, 0, $cell, $firstorlast);
-					break;
-				}
-				case 'h1':
-				case 'h2':
-				case 'h3':
-				case 'h4':
-				case 'h5':
-				case 'h6': {
-					$this->addHTMLVertSpace($hbz, $hb, $cell, $firstorlast);
-					break;
-				}
-				// Form fields (since 4.8.000 - 2009-09-07)
-				case 'form': {
-					$this->form_action = '';
-					$this->form_enctype = 'application/x-www-form-urlencoded';
-					break;
-				}
-				default : {
-					break;
-				}
-			}
-			if (isset($dom[($dom[$key]['parent'])]['attribute']['pagebreakafter'])) {
-				$pba = $dom[($dom[$key]['parent'])]['attribute']['pagebreakafter'];
-				// check for pagebreak
-				if (($pba == 'true') OR ($pba == 'left') OR ($pba == 'right')) {
-					// add a page (or trig AcceptPageBreak() for multicolumn mode)
-					$this->checkPageBreak($this->PageBreakTrigger + 1);
-				}
-				if ((($pba == 'left') AND (((!$this->rtl) AND (($this->page % 2) == 0)) OR (($this->rtl) AND (($this->page % 2) != 0))))
-					OR (($pba == 'right') AND (((!$this->rtl) AND (($this->page % 2) != 0)) OR (($this->rtl) AND (($this->page % 2) == 0))))) {
-					// add a page (or trig AcceptPageBreak() for multicolumn mode)
-					$this->checkPageBreak($this->PageBreakTrigger + 1);
-				}
-			}
-			$this->tmprtl = false;
-		}
-
-		/**
-		 * Add vertical spaces if needed.
-		 * @param string $hbz Distance between current y and line bottom.
-		 * @param string $hb The height of the break.
-		 * @param boolean $cell if true add the default cMargin space to each new line (default false).
-		 * @param boolean $firstorlast if true do not print additional empty lines.
-		 * @access protected
-		 */
-		protected function addHTMLVertSpace($hbz=0, $hb=0, $cell=false, $firstorlast=false) {
-			if ($firstorlast) {
-				$this->Ln(0, $cell);
-				$this->htmlvspace = 0;
-				return;
-			}
-			if ($hb < $this->htmlvspace) {
-				$hd = 0;
-			} else {
-				$hd = $hb - $this->htmlvspace;
-				$this->htmlvspace = $hb;
-			}
-			$this->Ln(($hbz + $hd), $cell);
-		}
-
-		/**
-		 * Set the default bullet to be used as LI bullet symbol
-		 * @param string $symbol character or string to be used (legal values are: '' = automatic, '!' = auto bullet, '#' = auto numbering, 'disc', 'disc', 'circle', 'square', '1', 'decimal', 'decimal-leading-zero', 'i', 'lower-roman', 'I', 'upper-roman', 'a', 'lower-alpha', 'lower-latin', 'A', 'upper-alpha', 'upper-latin', 'lower-greek')
-		 * @access public
-		 * @since 4.0.028 (2008-09-26)
-		 */
-		public function setLIsymbol($symbol='!') {
-			$symbol = strtolower($symbol);
-			switch ($symbol) {
-				case '!' :
-				case '#' :
-				case 'disc' :
-				case 'circle' :
-				case 'square' :
-				case '1':
-				case 'decimal':
-				case 'decimal-leading-zero':
-				case 'i':
-				case 'lower-roman':
-				case 'I':
-				case 'upper-roman':
-				case 'a':
-				case 'lower-alpha':
-				case 'lower-latin':
-				case 'A':
-				case 'upper-alpha':
-				case 'upper-latin':
-				case 'lower-greek': {
-					$this->lisymbol = $symbol;
-					break;
-				}
-				default : {
-					$this->lisymbol = '';
-				}
-			}
-		}
-
-		/**
-		 * Set the booklet mode for double-sided pages.
-		 * @param boolean $booklet true set the booklet mode on, fals eotherwise.
-		 * @param float $inner Inner page margin.
-		 * @param float $outer Outer page margin.
-		 * @access public
-		 * @since 4.2.000 (2008-10-29)
-		 */
-		public function SetBooklet($booklet=true, $inner=-1, $outer=-1) {
-			$this->booklet = $booklet;
-			if ($inner >= 0) {
-				$this->lMargin = $inner;
-			}
-			if ($outer >= 0) {
-				$this->rMargin = $outer;
-			}
-		}
-
-		/**
-		 * Swap the left and right margins.
-		 * @param boolean $reverse if true swap left and right margins.
-		 * @access protected
-		 * @since 4.2.000 (2008-10-29)
-		 */
-		protected function swapMargins($reverse=true) {
-			if ($reverse) {
-				// swap left and right margins
-				$mtemp = $this->original_lMargin;
-				$this->original_lMargin = $this->original_rMargin;
-				$this->original_rMargin = $mtemp;
-				$deltam = $this->original_lMargin - $this->original_rMargin;
-				$this->lMargin += $deltam;
-				$this->rMargin -= $deltam;
-			}
-		}
-
-		/**
-		 * Set the vertical spaces for HTML tags.
-		 * The array must have the following structure (example):
-		 * $tagvs = array('h1' => array(0 => array('h' => '', 'n' => 2), 1 => array('h' => 1.3, 'n' => 1)));
-		 * The first array level contains the tag names,
-		 * the second level contains 0 for opening tags or 1 for closing tags,
-		 * the third level contains the vertical space unit (h) and the number spaces to add (n).
-		 * If the h parameter is not specified, default values are used.
-		 * @param array $tagvs array of tags and relative vertical spaces.
-		 * @access public
-		 * @since 4.2.001 (2008-10-30)
-		 */
-		public function setHtmlVSpace($tagvs) {
-			$this->tagvspaces = $tagvs;
-		}
-
-        /**
-		 * Set custom width for list indentation.
-		 * @param float $width width of the indentation. Use negative value to disable it.
-		 * @access public
-		 * @since 4.2.007 (2008-11-12)
-		 */
-		public function setListIndentWidth($width) {
-			return $this->customlistindent = floatval($width);
-        }
-
-        /**
-		 * Set the top/bottom cell sides to be open or closed when the cell cross the page.
-		 * @param boolean $isopen if true keeps the top/bottom border open for the cell sides that cross the page.
-		 * @access public
-		 * @since 4.2.010 (2008-11-14)
-		 */
-		public function setOpenCell($isopen) {
-			$this->opencell = $isopen;
-        }
-
-        /**
-		 * Set the color and font style for HTML links.
-		 * @param array $color RGB array of colors
-		 * @param string $fontstyle additional font styles to add
-		 * @access public
-		 * @since 4.4.003 (2008-12-09)
-		 */
-		public function setHtmlLinksStyle($color=array(0,0,255), $fontstyle='U') {
-			$this->htmlLinkColorArray = $color;
-			$this->htmlLinkFontStyle = $fontstyle;
-        }
-
-        /**
-		 * Convert HTML string containing value and unit of measure to user's units or points.
-		 * @param string $htmlval string containing values and unit
-		 * @param string $refsize reference value in points
-		 * @param string $defaultunit default unit (can be one of the following: %, em, ex, px, in, mm, pc, pt).
-		 * @param boolean $point if true returns points, otherwise returns value in user's units
-		 * @return float value in user's unit or point if $points=true
-		 * @access public
-		 * @since 4.4.004 (2008-12-10)
-		 */
-        public function getHTMLUnitToUnits($htmlval, $refsize=1, $defaultunit='px', $points=false) {
-			$supportedunits = array('%', 'em', 'ex', 'px', 'in', 'cm', 'mm', 'pc', 'pt');
-			$retval = 0;
-			$value = 0;
-			$unit = 'px';
-			$k = $this->k;
-			if ($points) {
-				$k = 1;
-			}
-			if (in_array($defaultunit, $supportedunits)) {
-				$unit = $defaultunit;
-			}
-			if (is_numeric($htmlval)) {
-				$value = floatval($htmlval);
-			} elseif (preg_match('/([0-9\.\-\+]+)/', $htmlval, $mnum)) {
-				$value = floatval($mnum[1]);
-				if (preg_match('/([a-z%]+)/', $htmlval, $munit)) {
-					if (in_array($munit[1], $supportedunits)) {
-						$unit = $munit[1];
-					}
-				}
-			}
-			switch ($unit) {
-				// percentage
-				case '%': {
-					$retval = (($value * $refsize) / 100);
-					break;
-				}
-				// relative-size
-				case 'em': {
-					$retval = ($value * $refsize);
-					break;
-				}
-				case 'ex': {
-					$retval = $value * ($refsize / 2);
-					break;
-				}
-				// absolute-size
-				case 'in': {
-					$retval = ($value * $this->dpi) / $k;
-					break;
-				}
-				case 'cm': {
-					$retval = ($value / 2.54 * $this->dpi) / $k;
-					break;
-				}
-				case 'mm': {
-					$retval = ($value / 25.4 * $this->dpi) / $k;
-					break;
-				}
-				case 'pc': {
-					// one pica is 12 points
-					$retval = ($value * 12) / $k;
-					break;
-				}
-				case 'pt': {
-					$retval = $value / $k;
-					break;
-				}
-				case 'px': {
-					$retval = $this->pixelsToUnits($value);
-					break;
-				}
-			}
-			return $retval;
-		}
-
-		/**
-		 * Returns the Roman representation of an integer number
-		 * @param int number to convert
-		 * @return string roman representation of the specified number
-		 * @access public
-		 * @since 4.4.004 (2008-12-10)
-		 */
-		public function intToRoman($number) {
-			$roman = '';
-			while ($number >= 1000) {
-				$roman .= 'M';
-				$number -= 1000;
-			}
-			while ($number >= 900) {
-				$roman .= 'CM';
-				$number -= 900;
-			}
-			while ($number >= 500) {
-				$roman .= 'D';
-				$number -= 500;
-			}
-			while ($number >= 400) {
-				$roman .= 'CD';
-				$number -= 400;
-			}
-			while ($number >= 100) {
-				$roman .= 'C';
-				$number -= 100;
-			}
-			while ($number >= 90) {
-				$roman .= 'XC';
-				$number -= 90;
-			}
-			while ($number >= 50) {
-				$roman .= 'L';
-				$number -= 50;
-			}
-			while ($number >= 40) {
-				$roman .= 'XL';
-				$number -= 40;
-			}
-			while ($number >= 10) {
-				$roman .= 'X';
-				$number -= 10;
-			}
-			while ($number >= 9) {
-				$roman .= 'IX';
-				$number -= 9;
-			}
-			while ($number >= 5) {
-				$roman .= 'V';
-				$number -= 5;
-			}
-			while ($number >= 4) {
-				$roman .= 'IV';
-				$number -= 4;
-			}
-			while ($number >= 1) {
-				$roman .= 'I';
-				--$number;
-			}
-			return $roman;
-		}
-
-		/**
-		 * Output an HTML list bullet or ordered item symbol
-		 * @param int $listdepth list nesting level
-		 * @param string $listtype type of list
-		 * @param float $size current font size
-		 * @access protected
-		 * @since 4.4.004 (2008-12-10)
-		 */
-		protected function putHtmlListBullet($listdepth, $listtype='', $size=10) {
-			$size /= $this->k;
-			$fill = '';
-			$color = $this->fgcolor;
-			$width = 0;
-			$textitem = '';
-			$tmpx = $this->x;
-			$lspace = $this->GetStringWidth('  ');
-			if ($listtype == '!') {
-				// set default list type for unordered list
-				$deftypes = array('disc', 'circle', 'square');
-				$listtype = $deftypes[($listdepth - 1) % 3];
-			} elseif ($listtype == '#') {
-				// set default list type for ordered list
-				$listtype = 'decimal';
-			}
-        	switch ($listtype) {
-        		// unordered types
-				case 'none': {
-					break;
-				}
-				case 'disc': {
-					$fill = 'F';
-				}
-				case 'circle': {
-					$fill .= 'D';
-					$r = $size / 6;
-					$lspace += (2 * $r);
-					if ($this->rtl) {
-						$this->x += $lspace;
-					} else {
-						$this->x -= $lspace;
-					}
-					$this->Circle(($this->x + $r), ($this->y + ($this->lasth / 2)), $r, 0, 360, $fill, array('color'=>$color), $color, 8);
-					break;
-				}
-				case 'square': {
-					$l = $size / 3;
-					$lspace += $l;
-					if ($this->rtl) {;
-						$this->x += $lspace;
-					} else {
-						$this->x -= $lspace;
-					}
-					$this->Rect($this->x, ($this->y + (($this->lasth - $l)/ 2)), $l, $l, 'F', array(), $color);
-					break;
-				}
-				// ordered types
-				// $this->listcount[$this->listnum];
-				// $textitem
-				case '1':
-				case 'decimal': {
-					$textitem = $this->listcount[$this->listnum];
-					break;
-				}
-				case 'decimal-leading-zero': {
-					$textitem = sprintf('%02d', $this->listcount[$this->listnum]);
-					break;
-				}
-				case 'i':
-				case 'lower-roman': {
-					$textitem = strtolower($this->intToRoman($this->listcount[$this->listnum]));
-					break;
-				}
-				case 'I':
-				case 'upper-roman': {
-					$textitem = $this->intToRoman($this->listcount[$this->listnum]);
-					break;
-				}
-				case 'a':
-				case 'lower-alpha':
-				case 'lower-latin': {
-					$textitem = chr(97 + $this->listcount[$this->listnum] - 1);
-					break;
-				}
-				case 'A':
-				case 'upper-alpha':
-				case 'upper-latin': {
-					$textitem = chr(65 + $this->listcount[$this->listnum] - 1);
-					break;
-				}
-				case 'lower-greek': {
-					$textitem = $this->unichr(945 + $this->listcount[$this->listnum] - 1);
-					break;
-				}
-				/*
-				// Types to be implemented (special handling)
-				case 'hebrew': {
-					break;
-				}
-				case 'armenian': {
-					break;
-				}
-				case 'georgian': {
-					break;
-				}
-				case 'cjk-ideographic': {
-					break;
-				}
-				case 'hiragana': {
-					break;
-				}
-				case 'katakana': {
-					break;
-				}
-				case 'hiragana-iroha': {
-					break;
-				}
-				case 'katakana-iroha': {
-					break;
-				}
-				*/
-				default: {
-					$textitem = $this->listcount[$this->listnum];
-				}
-			}
-			if (!$this->empty_string($textitem)) {
-				// print ordered item
-				if ($this->rtl) {
-					$textitem = '.'.$textitem;
-				} else {
-					$textitem = $textitem.'.';
-				}
-				$lspace += $this->GetStringWidth($textitem);
-				if ($this->rtl) {
-					$this->x += $lspace;
-				} else {
-					$this->x -= $lspace;
-				}
-				$this->Write($this->lasth, $textitem, '', false, '', false, 0, false);
-			}
-			$this->x = $tmpx;
-			$this->lispacer = '';
-		}
-
-        /**
-		 * Returns current graphic variables as array.
-		 * @return array graphic variables
-		 * @access protected
-		 * @since 4.2.010 (2008-11-14)
-		 */
-		protected function getGraphicVars() {
-			$grapvars = array(
-				'FontFamily' => $this->FontFamily,
-				'FontStyle' => $this->FontStyle,
-				'FontSizePt' => $this->FontSizePt,
-				'rMargin' => $this->rMargin,
-				'lMargin' => $this->lMargin,
-				'cMargin' => $this->cMargin,
-				'LineWidth' => $this->LineWidth,
-				'linestyleWidth' => $this->linestyleWidth,
-				'linestyleCap' => $this->linestyleCap,
-				'linestyleJoin' => $this->linestyleJoin,
-				'linestyleDash' => $this->linestyleDash,
-				'textrendermode' => $this->textrendermode,
-				'textstrokewidth' => $this->textstrokewidth,
-				'DrawColor' => $this->DrawColor,
-				'FillColor' => $this->FillColor,
-				'TextColor' => $this->TextColor,
-				'ColorFlag' => $this->ColorFlag,
-				'bgcolor' => $this->bgcolor,
-				'fgcolor' => $this->fgcolor,
-				'htmlvspace' => $this->htmlvspace,
-				'lasth' => $this->lasth
-				);
-			return $grapvars;
-		}
-
-        /**
-		 * Set graphic variables.
-		 * @param $gvars array graphic variables
-		 * @access protected
-		 * @since 4.2.010 (2008-11-14)
-		 */
-		protected function setGraphicVars($gvars) {
-			$this->FontFamily = $gvars['FontFamily'];
-			$this->FontStyle = $gvars['FontStyle'];
-			$this->FontSizePt = $gvars['FontSizePt'];
-			$this->rMargin = $gvars['rMargin'];
-			$this->lMargin = $gvars['lMargin'];
-			$this->cMargin = $gvars['cMargin'];
-			$this->LineWidth = $gvars['LineWidth'];
-			$this->linestyleWidth = $gvars['linestyleWidth'];
-			$this->linestyleCap = $gvars['linestyleCap'];
-			$this->linestyleJoin = $gvars['linestyleJoin'];
-			$this->linestyleDash = $gvars['linestyleDash'];
-			$this->textrendermode = $gvars['textrendermode'];
-			$this->textstrokewidth = $gvars['textstrokewidth'];
-			$this->DrawColor = $gvars['DrawColor'];
-			$this->FillColor = $gvars['FillColor'];
-			$this->TextColor = $gvars['TextColor'];
-			$this->ColorFlag = $gvars['ColorFlag'];
-			$this->bgcolor = $gvars['bgcolor'];
-			$this->fgcolor = $gvars['fgcolor'];
-			$this->htmlvspace = $gvars['htmlvspace'];
-			//$this->lasth = $gvars['lasth'];
-			$this->_out(''.$this->linestyleWidth.' '.$this->linestyleCap.' '.$this->linestyleJoin.' '.$this->linestyleDash.' '.$this->DrawColor.' '.$this->FillColor.'');
-			if (!$this->empty_string($this->FontFamily)) {
-				$this->SetFont($this->FontFamily, $this->FontStyle, $this->FontSizePt);
-			}
-		}
-
-		/**
-		 * Returns a temporary filename for caching object on filesystem.
-		 * @param string $prefix prefix to add to filename
-		 * return string filename.
-		 * @access protected
-		 * @since 4.5.000 (2008-12-31)
-		 */
-		protected function getObjFilename($name) {
-			return tempnam(K_PATH_CACHE, $name.'_');
-		}
-
-        /**
-		 * Writes data to a temporary file on filesystem.
-		 * @param string $file file name
-		 * @param mixed $data data to write on file
-		 * @param boolean $append if true append data, false replace.
-		 * @access protected
-		 * @since 4.5.000 (2008-12-31)
-		 */
-		protected function writeDiskCache($filename, $data, $append=false) {
-			if ($append) {
-				$fmode = 'ab+';
-			} else {
-				$fmode = 'wb+';
-			}
-			$f = @fopen($filename, $fmode);
-			if (!$f) {
-				$this->Error('Unable to write cache file: '.$filename);
-			} else {
-				fwrite($f, $data);
-				fclose($f);
-			}
-			// update file length (needed for transactions)
-			if (!isset($this->cache_file_length['_'.$filename])) {
-				$this->cache_file_length['_'.$filename] = strlen($data);
-			} else {
-				$this->cache_file_length['_'.$filename] += strlen($data);
-			}
-		}
-
-        /**
-		 * Read data from a temporary file on filesystem.
-		 * @param string $file file name
-		 * @return mixed retrieved data
-		 * @access protected
-		 * @since 4.5.000 (2008-12-31)
-		 */
-		protected function readDiskCache($filename) {
-			return file_get_contents($filename);
-		}
-
-		/**
-		 * Set buffer content (always append data).
-		 * @param string $data data
-		 * @access protected
-		 * @since 4.5.000 (2009-01-02)
-		 */
-		protected function setBuffer($data) {
-			$this->bufferlen += strlen($data);
-			if ($this->diskcache) {
-				if (!isset($this->buffer) OR $this->empty_string($this->buffer)) {
-					$this->buffer = $this->getObjFilename('buffer');
-				}
-				$this->writeDiskCache($this->buffer, $data, true);
-			} else {
-				$this->buffer .= $data;
-			}
-		}
-
-        /**
-		 * Get buffer content.
-		 * @return string buffer content
-		 * @access protected
-		 * @since 4.5.000 (2009-01-02)
-		 */
-		protected function getBuffer() {
-			if ($this->diskcache) {
-				return $this->readDiskCache($this->buffer);
-			} else {
-				return $this->buffer;
-			}
-		}
-
-        /**
-		 * Set page buffer content.
-		 * @param int $page page number
-		 * @param string $data page data
-		 * @param boolean $append if true append data, false replace.
-		 * @access protected
-		 * @since 4.5.000 (2008-12-31)
-		 */
-		protected function setPageBuffer($page, $data, $append=false) {
-			if ($this->diskcache) {
-				if (!isset($this->pages[$page])) {
-					$this->pages[$page] = $this->getObjFilename('page'.$page);
-				}
-				$this->writeDiskCache($this->pages[$page], $data, $append);
-			} else {
-				if ($append) {
-					$this->pages[$page] .= $data;
-				} else {
-					$this->pages[$page] = $data;
-				}
-			}
-			if ($append AND isset($this->pagelen[$page])) {
-				$this->pagelen[$page] += strlen($data);
-			} else {
-				$this->pagelen[$page] = strlen($data);
-			}
-		}
-
-        /**
-		 * Get page buffer content.
-		 * @param int $page page number
-		 * @return string page buffer content or false in case of error
-		 * @access protected
-		 * @since 4.5.000 (2008-12-31)
-		 */
-		protected function getPageBuffer($page) {
-			if ($this->diskcache) {
-				return $this->readDiskCache($this->pages[$page]);
-			} elseif (isset($this->pages[$page])) {
-				return $this->pages[$page];
-			}
-			return false;
-		}
-
-        /**
-		 * Set image buffer content.
-		 * @param string $image image key
-		 * @param array $data image data
-		 * @access protected
-		 * @since 4.5.000 (2008-12-31)
-		 */
-		protected function setImageBuffer($image, $data) {
-			if ($this->diskcache) {
-				if (!isset($this->images[$image])) {
-					$this->images[$image] = $this->getObjFilename('image'.$image);
-				}
-				$this->writeDiskCache($this->images[$image], serialize($data));
-			} else {
-				$this->images[$image] = $data;
-			}
-			if (!in_array($image, $this->imagekeys)) {
-				$this->imagekeys[] = $image;
-				++$this->numimages;
-			}
-		}
-
-        /**
-		 * Set image buffer content for a specified sub-key.
-		 * @param string $image image key
-		 * @param string $key image sub-key
-		 * @param array $data image data
-		 * @access protected
-		 * @since 4.5.000 (2008-12-31)
-		 */
-		protected function setImageSubBuffer($image, $key, $data) {
-			if (!isset($this->images[$image])) {
-				$this->setImageBuffer($image, array());
-			}
-			if ($this->diskcache) {
-				$tmpimg = $this->getImageBuffer($image);
-				$tmpimg[$key] = $data;
-				$this->writeDiskCache($this->images[$image], serialize($tmpimg));
-			} else {
-				$this->images[$image][$key] = $data;
-			}
-		}
-
-        /**
-		 * Get image buffer content.
-		 * @param string $image image key
-		 * @return string image buffer content or false in case of error
-		 * @access protected
-		 * @since 4.5.000 (2008-12-31)
-		 */
-		protected function getImageBuffer($image) {
-			if ($this->diskcache AND isset($this->images[$image])) {
-				return unserialize($this->readDiskCache($this->images[$image]));
-			} elseif (isset($this->images[$image])) {
-				return $this->images[$image];
-			}
-			return false;
-		}
-
-		/**
-		 * Set font buffer content.
-		 * @param string $font font key
-		 * @param array $data font data
-		 * @access protected
-		 * @since 4.5.000 (2009-01-02)
-		 */
-		protected function setFontBuffer($font, $data) {
-			if ($this->diskcache) {
-				if (!isset($this->fonts[$font])) {
-					$this->fonts[$font] = $this->getObjFilename('font');
-				}
-				$this->writeDiskCache($this->fonts[$font], serialize($data));
-			} else {
-				$this->fonts[$font] = $data;
-			}
-			if (!in_array($font, $this->fontkeys)) {
-				$this->fontkeys[] = $font;
-			}
-		}
-
-        /**
-		 * Set font buffer content.
-		 * @param string $font font key
-		 * @param string $key font sub-key
-		 * @param array $data font data
-		 * @access protected
-		 * @since 4.5.000 (2009-01-02)
-		 */
-		protected function setFontSubBuffer($font, $key, $data) {
-			if (!isset($this->fonts[$font])) {
-				$this->setFontBuffer($font, array());
-			}
-			if ($this->diskcache) {
-				$tmpfont = $this->getFontBuffer($font);
-				$tmpfont[$key] = $data;
-				$this->writeDiskCache($this->fonts[$font], serialize($tmpfont));
-			} else {
-				$this->fonts[$font][$key] = $data;
-			}
-		}
-
-        /**
-		 * Get font buffer content.
-		 * @param string $font font key
-		 * @return string font buffer content or false in case of error
-		 * @access protected
-		 * @since 4.5.000 (2009-01-02)
-		 */
-		protected function getFontBuffer($font) {
-			if ($this->diskcache AND isset($this->fonts[$font])) {
-				return unserialize($this->readDiskCache($this->fonts[$font]));
-			} elseif (isset($this->fonts[$font])) {
-				return $this->fonts[$font];
-			}
-			return false;
-		}
-
-		/**
-		 * Move a page to a previous position.
-		 * @param int $frompage number of the source page
-		 * @param int $topage number of the destination page (must be less than $frompage)
-		 * @return true in case of success, false in case of error.
-		 * @access public
-		 * @since 4.5.000 (2009-01-02)
-		 */
-		public function movePage($frompage, $topage) {
-			if (($frompage > $this->numpages) OR ($frompage <= $topage)) {
-				return false;
-			}
-			if ($frompage == $this->page) {
-				// close the page before moving it
-				$this->endPage();
-			}
-			// move all page-related states
-			$tmppage = $this->pages[$frompage];
-			$tmppagedim = $this->pagedim[$frompage];
-			$tmppagelen = $this->pagelen[$frompage];
-			$tmpintmrk = $this->intmrk[$frompage];
-			if (isset($this->footerpos[$frompage])) {
-				$tmpfooterpos = $this->footerpos[$frompage];
-			}
-			if (isset($this->footerlen[$frompage])) {
-				$tmpfooterlen = $this->footerlen[$frompage];
-			}
-			if (isset($this->transfmrk[$frompage])) {
-				$tmptransfmrk = $this->transfmrk[$frompage];
-			}
-			if (isset($this->PageAnnots[$frompage])) {
-				$tmpannots = $this->PageAnnots[$frompage];
-			}
-			if (isset($this->newpagegroup[$frompage])) {
-				$tmpnewpagegroup = $this->newpagegroup[$frompage];
-			}
-			for ($i = $frompage; $i > $topage; --$i) {
-				$j = $i - 1;
-				// shift pages down
-				$this->pages[$i] = $this->pages[$j];
-				$this->pagedim[$i] = $this->pagedim[$j];
-				$this->pagelen[$i] = $this->pagelen[$j];
-				$this->intmrk[$i] = $this->intmrk[$j];
-				if (isset($this->footerpos[$j])) {
-					$this->footerpos[$i] = $this->footerpos[$j];
-				} elseif (isset($this->footerpos[$i])) {
-					unset($this->footerpos[$i]);
-				}
-				if (isset($this->footerlen[$j])) {
-					$this->footerlen[$i] = $this->footerlen[$j];
-				} elseif (isset($this->footerlen[$i])) {
-					unset($this->footerlen[$i]);
-				}
-				if (isset($this->transfmrk[$j])) {
-					$this->transfmrk[$i] = $this->transfmrk[$j];
-				} elseif (isset($this->transfmrk[$i])) {
-					unset($this->transfmrk[$i]);
-				}
-				if (isset($this->PageAnnots[$j])) {
-					$this->PageAnnots[$i] = $this->PageAnnots[$j];
-				} elseif (isset($this->PageAnnots[$i])) {
-					unset($this->PageAnnots[$i]);
-				}
-				if (isset($this->newpagegroup[$j])) {
-					$this->newpagegroup[$i] = $this->newpagegroup[$j];
-				} elseif (isset($this->newpagegroup[$i])) {
-					unset($this->newpagegroup[$i]);
-				}
-			}
-			$this->pages[$topage] = $tmppage;
-			$this->pagedim[$topage] = $tmppagedim;
-			$this->pagelen[$topage] = $tmppagelen;
-			$this->intmrk[$topage] = $tmpintmrk;
-			if (isset($tmpfooterpos)) {
-				$this->footerpos[$topage] = $tmpfooterpos;
-			} elseif (isset($this->footerpos[$topage])) {
-				unset($this->footerpos[$topage]);
-			}
-			if (isset($tmpfooterlen)) {
-				$this->footerlen[$topage] = $tmpfooterlen;
-			} elseif (isset($this->footerlen[$topage])) {
-				unset($this->footerlen[$topage]);
-			}
-			if (isset($tmptransfmrk)) {
-				$this->transfmrk[$topage] = $tmptransfmrk;
-			} elseif (isset($this->transfmrk[$topage])) {
-				unset($this->transfmrk[$topage]);
-			}
-			if (isset($tmpannots)) {
-				$this->PageAnnots[$topage] = $tmpannots;
-			} elseif (isset($this->PageAnnots[$topage])) {
-				unset($this->PageAnnots[$topage]);
-			}
-			if (isset($tmpnewpagegroup)) {
-				$this->newpagegroup[$topage] = $tmpnewpagegroup;
-			} elseif (isset($this->newpagegroup[$topage])) {
-				unset($this->newpagegroup[$topage]);
-			}
-			// adjust outlines
-			$tmpoutlines = $this->outlines;
-			foreach ($tmpoutlines as $key => $outline) {
-				if (($outline['p'] >= $topage) AND ($outline['p'] < $frompage)) {
-					$this->outlines[$key]['p'] = $outline['p'] + 1;
-				} elseif ($outline['p'] == $frompage) {
-					$this->outlines[$key]['p'] = $topage;
-				}
-			}
-			// adjust links
-			$tmplinks = $this->links;
-			foreach ($tmplinks as $key => $link) {
-				if (($link[0] >= $topage) AND ($link[0] < $frompage)) {
-					$this->links[$key][0] = $link[0] + 1;
-				} elseif ($link[0] == $frompage) {
-					$this->links[$key][0] = $topage;
-				}
-			}
-			// adjust javascript
-			$tmpjavascript = $this->javascript;
-			global $jfrompage, $jtopage;
-			$jfrompage = $frompage;
-			$jtopage = $topage;
-			$this->javascript = preg_replace_callback('/this\.addField\(\'([^\']*)\',\'([^\']*)\',([0-9]+)/',
-				create_function('$matches', 'global $jfrompage, $jtopage;
-				$pagenum = intval($matches[3]) + 1;
-				if (($pagenum >= $jtopage) AND ($pagenum < $jfrompage)) {
-					$newpage = ($pagenum + 1);
-				} elseif ($pagenum == $jfrompage) {
-					$newpage = $jtopage;
-				} else {
-					$newpage = $pagenum;
-				}
-				--$newpage;
-				return "this.addField(\'".$matches[1]."\',\'".$matches[2]."\',".$newpage."";'), $tmpjavascript);
-			// return to last page
-			$this->lastPage(true);
-			return true;
-		}
-
-        /**
-		 * Remove the specified page.
-		 * @param int $page page to remove
-		 * @return true in case of success, false in case of error.
-		 * @access public
-		 * @since 4.6.004 (2009-04-23)
-		 */
-		public function deletePage($page) {
-			if ($page > $this->numpages) {
-				return false;
-			}
-			// delete current page
-			unset($this->pages[$page]);
-			unset($this->pagedim[$page]);
-			unset($this->pagelen[$page]);
-			unset($this->intmrk[$page]);
-			if (isset($this->footerpos[$page])) {
-				unset($this->footerpos[$page]);
-			}
-			if (isset($this->footerlen[$page])) {
-				unset($this->footerlen[$page]);
-			}
-			if (isset($this->transfmrk[$page])) {
-				unset($this->transfmrk[$page]);
-			}
-			if (isset($this->PageAnnots[$page])) {
-				unset($this->PageAnnots[$page]);
-			}
-			if (isset($this->newpagegroup[$page])) {
-				unset($this->newpagegroup[$page]);
-			}
-			if (isset($this->pageopen[$page])) {
-				unset($this->pageopen[$page]);
-			}
-			// update remaining pages
-			for ($i = $page; $i < $this->numpages; ++$i) {
-				$j = $i + 1;
-				// shift pages
-				$this->pages[$i] = $this->pages[$j];
-				$this->pagedim[$i] = $this->pagedim[$j];
-				$this->pagelen[$i] = $this->pagelen[$j];
-				$this->intmrk[$i] = $this->intmrk[$j];
-				if (isset($this->footerpos[$j])) {
-					$this->footerpos[$i] = $this->footerpos[$j];
-				} elseif (isset($this->footerpos[$i])) {
-					unset($this->footerpos[$i]);
-				}
-				if (isset($this->footerlen[$j])) {
-					$this->footerlen[$i] = $this->footerlen[$j];
-				} elseif (isset($this->footerlen[$i])) {
-					unset($this->footerlen[$i]);
-				}
-				if (isset($this->transfmrk[$j])) {
-					$this->transfmrk[$i] = $this->transfmrk[$j];
-				} elseif (isset($this->transfmrk[$i])) {
-					unset($this->transfmrk[$i]);
-				}
-				if (isset($this->PageAnnots[$j])) {
-					$this->PageAnnots[$i] = $this->PageAnnots[$j];
-				} elseif (isset($this->PageAnnots[$i])) {
-					unset($this->PageAnnots[$i]);
-				}
-				if (isset($this->newpagegroup[$j])) {
-					$this->newpagegroup[$i] = $this->newpagegroup[$j];
-				} elseif (isset($this->newpagegroup[$i])) {
-					unset($this->newpagegroup[$i]);
-				}
-				if (isset($this->pageopen[$j])) {
-					$this->pageopen[$i] = $this->pageopen[$j];
-				} elseif (isset($this->pageopen[$i])) {
-					unset($this->pageopen[$i]);
-				}
-			}
-			// remove last page
-			unset($this->pages[$this->numpages]);
-			unset($this->pagedim[$this->numpages]);
-			unset($this->pagelen[$this->numpages]);
-			unset($this->intmrk[$this->numpages]);
-			if (isset($this->footerpos[$this->numpages])) {
-				unset($this->footerpos[$this->numpages]);
-			}
-			if (isset($this->footerlen[$this->numpages])) {
-				unset($this->footerlen[$this->numpages]);
-			}
-			if (isset($this->transfmrk[$this->numpages])) {
-				unset($this->transfmrk[$this->numpages]);
-			}
-			if (isset($this->PageAnnots[$this->numpages])) {
-				unset($this->PageAnnots[$this->numpages]);
-			}
-			if (isset($this->newpagegroup[$this->numpages])) {
-				unset($this->newpagegroup[$this->numpages]);
-			}
-			if (isset($this->pageopen[$this->numpages])) {
-				unset($this->pageopen[$this->numpages]);
-			}
-			--$this->numpages;
-			$this->page = $this->numpages;
-			// adjust outlines
-			$tmpoutlines = $this->outlines;
-			foreach ($tmpoutlines as $key => $outline) {
-				if ($outline['p'] > $page) {
-					$this->outlines[$key]['p'] = $outline['p'] - 1;
-				} elseif ($outline['p'] == $page) {
-					unset($this->outlines[$key]);
-				}
-			}
-			// adjust links
-			$tmplinks = $this->links;
-			foreach ($tmplinks as $key => $link) {
-				if ($link[0] > $page) {
-					$this->links[$key][0] = $link[0] - 1;
-				} elseif ($link[0] == $page) {
-					unset($this->links[$key]);
-				}
-			}
-			// adjust javascript
-			$tmpjavascript = $this->javascript;
-			global $jpage;
-			$jpage = $page;
-			$this->javascript = preg_replace_callback('/this\.addField\(\'([^\']*)\',\'([^\']*)\',([0-9]+)/',
-				create_function('$matches', 'global $jpage;
-				$pagenum = intval($matches[3]) + 1;
-				if ($pagenum >= $jpage) {
-					$newpage = ($pagenum - 1);
-				} elseif ($pagenum == $jpage) {
-					$newpage = 1;
-				} else {
-					$newpage = $pagenum;
-				}
-				--$newpage;
-				return "this.addField(\'".$matches[1]."\',\'".$matches[2]."\',".$newpage."";'), $tmpjavascript);
-			// return to last page
-			$this->lastPage(true);
-			return true;
-		}
-
-		/**
-		 * Clone the specified page to a new page.
-		 * @param int $page number of page to copy (0 = current page)
-		 * @return true in case of success, false in case of error.
-		 * @access public
-		 * @since 4.9.015 (2010-04-20)
-		 */
-		public function copyPage($page=0) {
-			if ($page == 0) {
-				// default value
-				$page = $this->page;
-			}
-			if ($page > $this->numpages) {
-				return false;
-			}
-			if ($page == $this->page) {
-				// close the page before cloning it
-				$this->endPage();
-			}
-			// copy all page-related states
-			++$this->numpages;
-			$this->page = $this->numpages;
-			$this->pages[$this->page] = $this->pages[$page];
-			$this->pagedim[$this->page] = $this->pagedim[$page];
-			$this->pagelen[$this->page] = $this->pagelen[$page];
-			$this->intmrk[$this->page] = $this->intmrk[$page];
-			$this->pageopen[$this->page] = false;
-			if (isset($this->footerpos[$page])) {
-				$this->footerpos[$this->page] = $this->footerpos[$page];
-			}
-			if (isset($this->footerlen[$page])) {
-				$this->footerlen[$this->page] = $this->footerlen[$page];
-			}
-			if (isset($this->transfmrk[$page])) {
-				$this->transfmrk[$this->page] = $this->transfmrk[$page];
-			}
-			if (isset($this->PageAnnots[$page])) {
-				$this->PageAnnots[$this->page] = $this->PageAnnots[$page];
-			}
-			if (isset($this->newpagegroup[$page])) {
-				$this->newpagegroup[$this->page] = $this->newpagegroup[$page];
-			}
-			// copy outlines
-			$tmpoutlines = $this->outlines;
-			foreach ($tmpoutlines as $key => $outline) {
-				if ($outline['p'] == $page) {
-					$this->outlines[] = array('t' => $outline['t'], 'l' => $outline['l'], 'y' => $outline['y'], 'p' => $this->page);
-				}
-			}
-			// copy links
-			$tmplinks = $this->links;
-			foreach ($tmplinks as $key => $link) {
-				if ($link[0] == $page) {
-					$this->links[] = array($this->page, $link[1]);
-				}
-			}
-			// return to last page
-			$this->lastPage(true);
-			return true;
-		}
-
-		/**
-		 * Output a Table of Content Index (TOC).
-		 * Before calling this method you have to open the page using the addTOCPage() method.
-		 * After calling this method you have to call endTOCPage() to close the TOC page.
-		 * You can override this method to achieve different styles.
-		 * @param int $page page number where this TOC should be inserted (leave empty for current page).
-		 * @param string $numbersfont set the font for page numbers (please use monospaced font for better alignment).
-		 * @param string $filler string used to fill the space between text and page number.
-		 * @param string $toc_name name to use for TOC bookmark.
-		 * @access public
-		 * @author Nicola Asuni
-		 * @since 4.5.000 (2009-01-02)
-		 * @see addTOCPage(), endTOCPage(), addHTMLTOC()
-		 */
-		public function addTOC($page='', $numbersfont='', $filler='.', $toc_name='TOC') {
-			$fontsize = $this->FontSizePt;
-			$fontfamily = $this->FontFamily;
-			$fontstyle = $this->FontStyle;
-			$w = $this->w - $this->lMargin - $this->rMargin;
-			$spacer = $this->GetStringWidth(chr(32)) * 4;
-			$page_first = $this->getPage();
-			$lmargin = $this->lMargin;
-			$rmargin = $this->rMargin;
-			$x_start = $this->GetX();
-			if ($this->empty_string($numbersfont)) {
-				$numbersfont = $this->default_monospaced_font;
-			}
-			if ($this->empty_string($filler)) {
-				$filler = ' ';
-			}
-			if ($this->empty_string($page)) {
-				$gap = ' ';
-			} else {
-				$gap = '';
-			}
-			foreach ($this->outlines as $key => $outline) {
-				if ($this->rtl) {
-					$aligntext = 'R';
-					$alignnum = 'L';
-				} else {
-					$aligntext = 'L';
-					$alignnum = 'R';
-				}
-				if ($outline['l'] == 0) {
-					$this->SetFont($fontfamily, $fontstyle.'B', $fontsize);
-				} else {
-					$this->SetFont($fontfamily, $fontstyle, $fontsize - $outline['l']);
-				}
-				$indent = ($spacer * $outline['l']);
-				if ($this->rtl) {
-					$this->rMargin += $indent;
-					$this->x -= $indent;
-				} else {
-					$this->lMargin += $indent;
-					$this->x += $indent;
-				}
-				$link = $this->AddLink();
-				$this->SetLink($link, 0, $outline['p']);
-				// write the text
-				$this->Write(0, $outline['t'], $link, 0, $aligntext, false, 0, false, false, 0);
-				$this->SetFont($numbersfont, $fontstyle, $fontsize);
-				if ($this->empty_string($page)) {
-					$pagenum = $outline['p'];
-				} else {
-					// placemark to be replaced with the correct number
-					$pagenum = '{#'.($outline['p']).'}';
-					if (($this->CurrentFont['type'] == 'TrueTypeUnicode') OR ($this->CurrentFont['type'] == 'cidfont0')) {
-						$pagenum = '{'.$pagenum.'}';
-					}
-				}
-				$numwidth = $this->GetStringWidth($pagenum);
-				if ($this->rtl) {
-					$tw = $this->x - $this->lMargin;
-				} else {
-					$tw = $this->w - $this->rMargin - $this->x;
-				}
-				$fw = $tw - $numwidth - $this->GetStringWidth(chr(32));
-				$numfills = floor($fw / $this->GetStringWidth($filler));
-				if ($numfills > 0) {
-					$rowfill = str_repeat($filler, $numfills);
-				} else {
-					$rowfill = '';
-				}
-				if ($this->rtl) {
-					$pagenum = $pagenum.$gap.$rowfill.' ';
-				} else {
-					$pagenum = ' '.$rowfill.$gap.$pagenum;
-				}
-				// write the number
-				$this->Cell($tw, 0, $pagenum, 0, 1, $alignnum, 0, $link, 0);
-				$this->SetX($x_start);
-				$this->lMargin = $lmargin;
-				$this->rMargin = $rmargin;
-			}
-			$page_last = $this->getPage();
-			$numpages = $page_last - $page_first + 1;
-			if (!$this->empty_string($page)) {
-				for ($p = $page_first; $p <= $page_last; ++$p) {
-					// get page data
-					$temppage = $this->getPageBuffer($p);
-					for ($n = 1; $n <= $this->numpages; ++$n) {
-						// update page numbers
-						$k = '{#'.$n.'}';
-						$ku = '{'.$k.'}';
-						$alias_a = $this->_escape($k);
-						$alias_au = $this->_escape('{'.$k.'}');
-						if ($this->isunicode) {
-							$alias_b = $this->_escape($this->UTF8ToLatin1($k));
-							$alias_bu = $this->_escape($this->UTF8ToLatin1($ku));
-							$alias_c = $this->_escape($this->utf8StrRev($k, false, $this->tmprtl));
-							$alias_cu = $this->_escape($this->utf8StrRev($ku, false, $this->tmprtl));
-						}
-						if ($n >= $page) {
-							$np = $n + $numpages;
-						} else {
-							$np = $n;
-						}
-						$ns = $this->formatTOCPageNumber($np);
-						$nu = $ns;
-						$sdiff = strlen($k) - strlen($ns) - 1;
-						$sdiffu = strlen($ku) - strlen($ns) - 1;
-						$sfill = str_repeat($filler, $sdiff);
-						$sfillu = str_repeat($filler, $sdiffu);
-						if ($this->rtl) {
-							$ns = $ns.' '.$sfill;
-							$nu = $nu.' '.$sfillu;
-						} else {
-							$ns = $sfill.' '.$ns;
-							$nu = $sfillu.' '.$nu;
-						}
-						$nu = $this->UTF8ToUTF16BE($nu, false);
-						$temppage = str_replace($alias_au, $nu, $temppage);
-						if ($this->isunicode) {
-							$temppage = str_replace($alias_bu, $nu, $temppage);
-							$temppage = str_replace($alias_cu, $nu, $temppage);
-							$temppage = str_replace($alias_b, $ns, $temppage);
-							$temppage = str_replace($alias_c, $ns, $temppage);
-						}
-						$temppage = str_replace($alias_a, $ns, $temppage);
-					}
-					// save changes
-					$this->setPageBuffer($p, $temppage);
-				}
-				// move pages
-				$this->Bookmark($toc_name, 0, 0, $page_first);
-				for ($i = 0; $i < $numpages; ++$i) {
-					$this->movePage($page_last, $page);
-				}
-			}
-		}
-
-		/**
-		 * Output a Table Of Content Index (TOC) using HTML templates.
-		 * Before calling this method you have to open the page using the addTOCPage() method.
-		 * After calling this method you have to call endTOCPage() to close the TOC page.
-		 * @param int $page page number where this TOC should be inserted (leave empty for current page).
-		 * @param string $toc_name name to use for TOC bookmark.
-		 * @param array $templates array of html templates. Use: #TOC_DESCRIPTION# for bookmark title, #TOC_PAGE_NUMBER# for page number.
-		 * @parma boolean $correct_align if true correct the number alignment (numbers must be in monospaced font like courier and right aligned on LTR, or left aligned on RTL)
-		 * @access public
-		 * @author Nicola Asuni
-		 * @since 5.0.001 (2010-05-06)
-		 * @see addTOCPage(), endTOCPage(), addTOC()
-		 */
-		public function addHTMLTOC($page='', $toc_name='TOC', $templates=array(), $correct_align=true) {
-			$prev_htmlLinkColorArray = $this->htmlLinkColorArray;
-			$prev_htmlLinkFontStyle = $this->htmlLinkFontStyle;
-			// set new style for link
-			$this->htmlLinkColorArray = array();
-			$this->htmlLinkFontStyle = '';
-			$page_first = $this->getPage();
-			foreach ($this->outlines as $key => $outline) {
-				if ($this->empty_string($page)) {
-					$pagenum = $outline['p'];
-				} else {
-					// placemark to be replaced with the correct number
-					$pagenum = '{#'.($outline['p']).'}';
-					if (($this->CurrentFont['type'] == 'TrueTypeUnicode') OR ($this->CurrentFont['type'] == 'cidfont0')) {
-						$pagenum = '{'.$pagenum.'}';
-					}
-				}
-				// get HTML template
-				$row = $templates[$outline['l']];
-				// replace templates with current values
-				$row = str_replace('#TOC_DESCRIPTION#', $outline['t'], $row);
-				$row = str_replace('#TOC_PAGE_NUMBER#', $pagenum, $row);
-				// add link to page
-				$row = '<a href="#'.$outline['p'].'">'.$row.'</a>';
-				// write bookmark entry
-				$this->writeHTML($row, false, false, true, false, '');
-			}
-			// restore link styles
-			$this->htmlLinkColorArray = $prev_htmlLinkColorArray;
-			$this->htmlLinkFontStyle = $prev_htmlLinkFontStyle;
-			// move TOC page and replace numbers
-			$page_last = $this->getPage();
-			$numpages = $page_last - $page_first + 1;
-			if (!$this->empty_string($page)) {
-				for ($p = $page_first; $p <= $page_last; ++$p) {
-					// get page data
-					$temppage = $this->getPageBuffer($p);
-					for ($n = 1; $n <= $this->numpages; ++$n) {
-						// update page numbers
-						$k = '{#'.$n.'}';
-						$ku = '{'.$k.'}';
-						$alias_a = $this->_escape($k);
-						$alias_au = $this->_escape('{'.$k.'}');
-						if ($this->isunicode) {
-							$alias_b = $this->_escape($this->UTF8ToLatin1($k));
-							$alias_bu = $this->_escape($this->UTF8ToLatin1($ku));
-							$alias_c = $this->_escape($this->utf8StrRev($k, false, $this->tmprtl));
-							$alias_cu = $this->_escape($this->utf8StrRev($ku, false, $this->tmprtl));
-						}
-						if ($n >= $page) {
-							$np = $n + $numpages;
-						} else {
-							$np = $n;
-						}
-						$ns = $this->formatTOCPageNumber($np);
-						$nu = $ns;
-						if ($correct_align) {
-							$sdiff = strlen($k) - strlen($ns);
-							$sdiffu = strlen($ku) - strlen($ns);
-							$sfill = str_repeat(' ', $sdiff);
-							$sfillu = str_repeat(' ', $sdiffu);
-							if ($this->rtl) {
-								$ns = $ns.$sfill;
-								$nu = $nu.$sfillu;
-							} else {
-								$ns = $sfill.$ns;
-								$nu = $sfillu.$nu;
-							}
-						}
-						$nu = $this->UTF8ToUTF16BE($nu, false);
-						$temppage = str_replace($alias_au, $nu, $temppage);
-						if ($this->isunicode) {
-							$temppage = str_replace($alias_bu, $nu, $temppage);
-							$temppage = str_replace($alias_cu, $nu, $temppage);
-							$temppage = str_replace($alias_b, $ns, $temppage);
-							$temppage = str_replace($alias_c, $ns, $temppage);
-						}
-						$temppage = str_replace($alias_a, $ns, $temppage);
-					}
-					// save changes
-					$this->setPageBuffer($p, $temppage);
-				}
-				// move pages
-				$this->Bookmark($toc_name, 0, 0, $page_first);
-				for ($i = 0; $i < $numpages; ++$i) {
-					$this->movePage($page_last, $page);
-				}
-			}
-		}
-
-		/**
-		 * Stores a copy of the current TCPDF object used for undo operation.
-		 * @access public
-		 * @since 4.5.029 (2009-03-19)
-		 */
-		public function startTransaction() {
-			if (isset($this->objcopy)) {
-				// remove previous copy
-				$this->commitTransaction();
-			}
-			// record current page number and Y position
-			$this->start_transaction_page = $this->page;
-			$this->start_transaction_y = $this->y;
-			// clone current object
-			$this->objcopy = $this->objclone($this);
-		}
-
-		/**
-		 * Delete the copy of the current TCPDF object used for undo operation.
-		 * @access public
-		 * @since 4.5.029 (2009-03-19)
-		 */
-		public function commitTransaction() {
-			if (isset($this->objcopy)) {
-				$this->objcopy->_destroy(true, true);
-				unset($this->objcopy);
-			}
-		}
-
-		/**
-		 * This method allows to undo the latest transaction by returning the latest saved TCPDF object with startTransaction().
-		 * @param boolean $self if true restores current class object to previous state without the need of reassignment via the returned value.
-		 * @return TCPDF object.
-		 * @access public
-		 * @since 4.5.029 (2009-03-19)
-		 */
-		public function rollbackTransaction($self=false) {
-			if (isset($this->objcopy)) {
-				if (isset($this->objcopy->diskcache) AND $this->objcopy->diskcache) {
-					// truncate files to previous values
-					foreach ($this->objcopy->cache_file_length as $file => $length) {
-						$file = substr($file, 1);
-						$handle = fopen($file, 'r+');
-						ftruncate($handle, $length);
-					}
-				}
-				$this->_destroy(true, true);
-				if ($self) {
-					$objvars = get_object_vars($this->objcopy);
-					foreach ($objvars as $key => $value) {
-						$this->$key = $value;
-					}
-				}
-				return $this->objcopy;
-			}
-			return $this;
-		}
-
-		/**
-		 * Creates a copy of a class object
-		 * @param object $object class object to be cloned
-		 * @return cloned object
-		 * @access public
-		 * @since 4.5.029 (2009-03-19)
-		 */
-		public function objclone($object) {
-			return @clone($object);
-		}
-
-		/**
-		 * Determine whether a string is empty.
-		 * @param string $str string to be checked
-		 * @return boolean true if string is empty
-		 * @access public
-		 * @since 4.5.044 (2009-04-16)
-		 */
-		public function empty_string($str) {
-			return (is_null($str) OR (is_string($str) AND (strlen($str) == 0)));
-		}
-
-		/**
-		 * Find position of last occurrence of a substring in a string
-		 * @param string $haystack The string to search in.
-		 * @param string $needle substring to search.
-		 * @param int $offset May be specified to begin searching an arbitrary number of characters into the string.
-		 * @return Returns the position where the needle exists. Returns FALSE if the needle was not found.
-		 * @access public
-		 * @since 4.8.038 (2010-03-13)
-		 */
-		public function revstrpos($haystack, $needle, $offset = 0) {
-			$length = strlen($haystack);
-			$offset = ($offset > 0)?($length - $offset):abs($offset);
-			$pos = strpos(strrev($haystack), strrev($needle), $offset);
-			return ($pos === false)?false:($length - $pos - strlen($needle));
-		}
-
-		// --- MULTI COLUMNS METHODS -----------------------
-
-		/**
-		 * Set multiple columns of the same size
-		 * @param int $numcols number of columns (set to zero to disable columns mode)
-		 * @param int $width column width
-		 * @param int $y column starting Y position (leave empty for current Y position)
-		 * @access public
-	 	 * @since 4.9.001 (2010-03-28)
-		 */
-		public function setEqualColumns($numcols=0, $width=0, $y='') {
-			$this->columns = array();
-			if ($numcols < 2) {
-				$numcols = 0;
-				$this->columns = array();
-			} else {
-				// maximum column width
-				$maxwidth = ($this->w - $this->original_lMargin - $this->original_rMargin) / $numcols;
-				if ($width > $maxwidth) {
-					$width = $maxwidth;
-				}
-				if ($this->empty_string($y)) {
-					$y = $this->y;
-				}
-				// space between columns
-				$space = (($this->w - $this->original_lMargin - $this->original_rMargin - ($numcols * $width)) / ($numcols - 1));
-				// fill the columns array (with, space, starting Y position)
-				for ($i = 0; $i < $numcols; ++$i) {
-					$this->columns[$i] = array('w' => $width, 's' => $space, 'y' => $y);
-				}
-			}
-			$this->num_columns = $numcols;
-			$this->current_column = 0;
-			$this->column_start_page = $this->page;
-		}
-
-		/**
-		 * Set columns array.
-		 * Each column is represented by and array with the following keys: (w = width, s = space between columns, y = column top position).
-		 * @param array $columns
-		 * @access public
-	 	 * @since 4.9.001 (2010-03-28)
-		 */
-		public function setColumnsArray($columns) {
-			$this->columns = $columns;
-			$this->num_columns = count($columns);
-			$this->current_column = 0;
-			$this->column_start_page = $this->page;
-		}
-
-		/**
-		 * Set position at a given column
-		 * @param int $col column number (from 0 to getNumberOfColumns()-1); empty string = current column.
-		 * @access public
-	 	 * @since 4.9.001 (2010-03-28)
-		 */
-		public function selectColumn($col='') {
-			if (is_string($col)) {
-				$col = $this->current_column;
-			} elseif($col >= $this->num_columns) {
-				$col = 0;
-			}
-			if ($this->num_columns > 1) {
-				if ($col != $this->current_column) {
-					// move pointer at column top on the first page
-					if ($this->column_start_page == $this->page) {
-						$this->y = $this->columns[$col]['y'];
-					} else {
-						$this->y = $this->tMargin;
-					}
-				}
-				// set X position of the current column by case
-				$listindent = ($this->listindentlevel * $this->listindent);
-				if ($this->rtl) {
-					$x = $this->w - $this->original_rMargin - ($col * ($this->columns[$col]['w'] + $this->columns[$col]['s']));
-					$this->SetRightMargin($this->w - $x + $listindent);
-					$this->SetLeftMargin($x - $this->columns[$col]['w']);
-					$this->x = $x - $listindent;
-				} else {
-					$x = $this->original_lMargin + ($col * ($this->columns[$col]['w'] + $this->columns[$col]['s']));
-					$this->SetLeftMargin($x + $listindent);
-					$this->SetRightMargin($this->w - $x - $this->columns[$col]['w']);
-					$this->x = $x + $listindent;
-				}
-				$this->columns[$col]['x'] = $x;
-			}
-			$this->current_column = $col;
-			// fix for HTML mode
-			$this->newline = true;
-			// print HTML table header (if any)
-			if (!$this->empty_string($this->thead) AND (!$this->inthead)) {
-				// print table header
-				$this->writeHTML($this->thead, false, false, false, false, '');
-			}
-		}
-
-		/**
-		 * Serialize an array of parameters to be used with TCPDF tag in HTML code.
-		 * @param array $pararray parameters array
-		 * @return sting containing serialized data
-		 * @access public
-	 	 * @since 4.9.006 (2010-04-02)
-		 */
-		public function serializeTCPDFtagParameters($pararray) {
-			return urlencode(serialize($pararray));
-		}
-
-		/**
-		 * Set Text rendering mode.
-		 * @param int $stroke outline size in user units (0 = disable).
-		 * @param boolean $fill if true fills the text (default).
-		 * @param boolean $clip if true activate clipping mode
-		 * @access public
-		 * @since 4.9.008 (2009-04-02)
-		 */
-		public function setTextRenderingMode($stroke=0, $fill=true, $clip=false) {
-			// Ref.: PDF 32000-1:2008 - 9.3.6 Text Rendering Mode
-			// convert text rendering parameters
-			if ($stroke < 0) {
-				$stroke = 0;
-			}
-			if ($fill === true) {
-				if ($stroke > 0) {
-					if ($clip === true) {
-						// Fill, then stroke text and add to path for clipping
-						$textrendermode = 6;
-					} else {
-						// Fill, then stroke text
-						$textrendermode = 2;
-					}
-					$textstrokewidth = $stroke;
-				} else {
-					if ($clip === true) {
-						// Fill text and add to path for clipping
-						$textrendermode = 4;
-					} else {
-						// Fill text
-						$textrendermode = 0;
-					}
-				}
-			} else {
-				if ($stroke > 0) {
-					if ($clip === true) {
-						// Stroke text and add to path for clipping
-						$textrendermode = 5;
-					} else {
-						// Stroke text
-						$textrendermode = 1;
-					}
-					$textstrokewidth = $stroke;
-				} else {
-					if ($clip === true) {
-						// Add text to path for clipping
-						$textrendermode = 7;
-					} else {
-						// Neither fill nor stroke text (invisible)
-						$textrendermode = 3;
-					}
-				}
-			}
-			$this->textrendermode = $textrendermode;
-			$this->textstrokewidth = $stroke * $this->k;
-		}
-
-		/**
-		 * Returns an array of chars containing soft hyphens.
-		 * @param array $word array of chars
-		 * @param array $patterns Array of hypenation patterns.
-		 * @param array $dictionary Array of words to be returned without applying the hyphenation algoritm.
-		 * @param int $leftmin Minimum number of character to leave on the left of the word without applying the hyphens.
-		 * @param int $rightmin Minimum number of character to leave on the right of the word without applying the hyphens.
-		 * @param int $charmin Minimum word lenght to apply the hyphenation algoritm.
-		 * @param int $charmax Maximum lenght of broken piece of word.
-		 * @return array text with soft hyphens
-		 * @author Nicola Asuni
-		 * @since 4.9.012 (2010-04-12)
-		 * @access protected
-		 */
-		protected function hyphenateWord($word, $patterns, $dictionary=array(), $leftmin=1, $rightmin=2, $charmin=1, $charmax=8) {
-			$hyphenword = array(); // hyphens positions
-			$numchars = count($word);
-			if ($numchars <= $charmin) {
-				return $word;
-			}
-			$word_string = $this->UTF8ArrSubString($word);
-			// some words will be returned as-is
-			$pattern = '/^([a-zA-Z0-9_\.\-]+)@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([a-zA-Z0-9\-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$/';
-			if (preg_match($pattern, $word_string) > 0) {
-				// email
-				return $word;
-			}
-			$pattern = '/(([a-zA-Z0-9\-]+\.)?)((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([a-zA-Z0-9\-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$/';
-			if (preg_match($pattern, $word_string) > 0) {
-				// URL
-				return $word;
-			}
-			if (isset($dictionary[$word_string])) {
-				return $this->UTF8StringToArray($dictionary[$word_string]);
-			}
-			// suround word with '_' characters
-			$tmpword = array_merge(array(95), $word, array(95));
-			$tmpnumchars = $numchars + 2;
-			$maxpos = $tmpnumchars - $charmin;
-			for ($pos = 0; $pos < $maxpos; ++$pos) {
-				$imax = min(($tmpnumchars - $pos), $charmax);
-				for ($i = $charmin; $i <= $imax; ++$i) {
-					$subword = strtolower($this->UTF8ArrSubString($tmpword, $pos, $pos + $i));
-					if (isset($patterns[$subword])) {
-						$pattern = $this->UTF8StringToArray($patterns[$subword]);
-						$pattern_length = count($pattern);
-						$digits = 1;
-						for ($j = 0; $j < $pattern_length; ++$j) {
-							// check if $pattern[$j] is a number
-							if (($pattern[$j] >= 48) AND ($pattern[$j] <= 57)) {
-								if ($j == 0) {
-									$zero = $pos - 1;
-								} else {
-									$zero = $pos + $j - $digits;
-								}
-								if (!isset($hyphenword[$zero]) OR ($hyphenword[$zero] != $pattern[$j])) {
-									$hyphenword[$zero] = $this->unichr($pattern[$j]);
-								}
-								++$digits;
-							}
-						}
-					}
-				}
-			}
-			$inserted = 0;
-			$maxpos = $numchars - $rightmin;
-			for($i = $leftmin; $i <= $maxpos; ++$i) {
-				if(isset($hyphenword[$i]) AND (($hyphenword[$i] % 2) != 0)) {
-					// 173 = soft hyphen character
-					array_splice($word, $i + $inserted, 0, 173);
-					++$inserted;
-				}
-			}
-			return $word;
-		}
-
-		/**
-		 * Returns an array of hyphenation patterns.
-		 * @param string $file TEX file containing hypenation patterns. TEX pattrns can be downloaded from http://www.ctan.org/tex-archive/language/hyph-utf8/tex/generic/hyph-utf8/patterns/
-		 * @return array of hyphenation patterns
-		 * @author Nicola Asuni
-		 * @since 4.9.012 (2010-04-12)
-		 * @access public
-		 */
-		public function getHyphenPatternsFromTEX($file) {
-			// TEX patterns are available at:
-			// http://www.ctan.org/tex-archive/language/hyph-utf8/tex/generic/hyph-utf8/patterns/
-			$data = file_get_contents($file);
-			$patterns = array();
-			// remove comments
-			$data = preg_replace('/\%[^\n]*/', '', $data);
-			// extract the patterns part
-			preg_match('/\\\\patterns\{([^\}]*)\}/i', $data, $matches);
-			$data = trim(substr($matches[0], 10, -1));
-			// extract each pattern
-			$patterns_array = preg_split('/[\s]+/', $data);
-			// create new language array of patterns
-			$patterns = array();
-			foreach($patterns_array as $val) {
-				if (!$this->empty_string($val)) {
-					$val = trim($val);
-					$val = str_replace('\'', '\\\'', $val);
-					$key = preg_replace('/[0-9]+/', '', $val);
-					$patterns[$key] = $val;
-				}
-			}
-			return $patterns;
-		}
-
-		/**
-		 * Returns text with soft hyphens.
-		 * @param string $text text to process
-		 * @param mixed $patterns Array of hypenation patterns or a TEX file containing hypenation patterns. TEX patterns can be downloaded from http://www.ctan.org/tex-archive/language/hyph-utf8/tex/generic/hyph-utf8/patterns/
-		 * @param array $dictionary Array of words to be returned without applying the hyphenation algoritm.
-		 * @param int $leftmin Minimum number of character to leave on the left of the word without applying the hyphens.
-		 * @param int $rightmin Minimum number of character to leave on the right of the word without applying the hyphens.
-		 * @param int $charmin Minimum word lenght to apply the hyphenation algoritm.
-		 * @param int $charmax Maximum lenght of broken piece of word.
-		 * @return array text with soft hyphens
-		 * @author Nicola Asuni
-		 * @since 4.9.012 (2010-04-12)
-		 * @access public
-		 */
-		public function hyphenateText($text, $patterns, $dictionary=array(), $leftmin=1, $rightmin=2, $charmin=1, $charmax=8) {
-			global $unicode;
-			$text = $this->unhtmlentities($text);
-			$word = array(); // last word
-			$txtarr = array(); // text to be returned
-			$intag = false; // true if we are inside an HTML tag
-			if (!is_array($patterns)) {
-				$patterns = $this->getHyphenPatternsFromTEX($patterns);
-			}
-			// get array of characters
-			$unichars = $this->UTF8StringToArray($text);
-			// for each char
-			foreach ($unichars as $char) {
-				if ((!$intag) AND $unicode[$char] == 'L') {
-					// letter character
-					$word[] = $char;
-				} else {
-					// other type of character
-					if (!$this->empty_string($word)) {
-						// hypenate the word
-						$txtarr = array_merge($txtarr, $this->hyphenateWord($word, $patterns, $dictionary, $leftmin, $rightmin, $charmin, $charmax));
-						$word = array();
-					}
-					$txtarr[] = $char;
-					if (chr($char) == '<') {
-						// we are inside an HTML tag
-						$intag = true;
-					} elseif ($intag AND (chr($char) == '>')) {
-						// end of HTML tag
-						$intag = false;
-					}
-				}
-			}
-			if (!$this->empty_string($word)) {
-				// hypenate the word
-				$txtarr = array_merge($txtarr, $this->hyphenateWord($word, $patterns, $dictionary, $leftmin, $rightmin, $charmin, $charmax));
-			}
-			// convert char array to string and return
-			return $this->UTF8ArrSubString($txtarr);
-		}
-
-		/**
-		 * Enable/disable rasterization of SVG images using ImageMagick library.
-		 * @param boolean $mode if true enable rasterization, false otherwise.
-		 * @access public
-		 * @since 5.0.000 (2010-04-27)
-		 */
-		public function setRasterizeVectorImages($mode) {
-			$this->rasterize_vector_images = $mode;
-		}
-
-		/**
-		 * Get the Path-Painting Operators.
-		 * @param string $style Style of rendering. Possible values are:
-		 * <ul>
-		 *   <li>S or D: Stroke the path.</li>
-		 *   <li>s or d: Close and stroke the path.</li>
-		 *   <li>f or F: Fill the path, using the nonzero winding number rule to determine the region to fill.</li>
-		 *   <li>f* or F*: Fill the path, using the even-odd rule to determine the region to fill.</li>
-		 *   <li>B or FD or DF: Fill and then stroke the path, using the nonzero winding number rule to determine the region to fill.</li>
-		 *   <li>B* or F*D or DF*: Fill and then stroke the path, using the even-odd rule to determine the region to fill.</li>
-		 *   <li>b or fd or df: Close, fill, and then stroke the path, using the nonzero winding number rule to determine the region to fill.</li>
-		 *   <li>b or f*d or df*: Close, fill, and then stroke the path, using the even-odd rule to determine the region to fill.</li>
-		 *   <li>CNZ: Clipping mode using the even-odd rule to determine which regions lie inside the clipping path.</li>
-		 *   <li>CEO: Clipping mode using the nonzero winding number rule to determine which regions lie inside the clipping path</li>
-		 *   <li>n: End the path object without filling or stroking it.</li>
-		 * </ul>
-		 * @param string $default default style
-		 * @param boolean $mode if true enable rasterization, false otherwise.
-		 * @author Nicola Asuni
-		 * @access protected
-		 * @since 5.0.000 (2010-04-30)
-		 */
-		protected function getPathPaintOperator($style, $default='S') {
-			$op = '';
-			switch($style) {
-				case 'S':
-				case 'D': {
-					$op = 'S';
-					break;
-				}
-				case 's':
-				case 'd': {
-					$op = 's';
-					break;
-				}
-				case 'f':
-				case 'F': {
-					$op = 'f';
-					break;
-				}
-				case 'f*':
-				case 'F*': {
-					$op = 'f*';
-					break;
-				}
-				case 'B':
-				case 'FD':
-				case 'DF': {
-					$op = 'B';
-					break;
-				}
-				case 'B*':
-				case 'F*D':
-				case 'DF*': {
-					$op = 'B*';
-					break;
-				}
-				case 'b':
-				case 'fd':
-				case 'df': {
-					$op = 'b';
-					break;
-				}
-				case 'b*':
-				case 'f*d':
-				case 'df*': {
-					$op = 'b*';
-					break;
-				}
-				case 'CNZ': {
-					$op = 'W n';
-					break;
-				}
-				case 'CEO': {
-					$op = 'W* n';
-					break;
-				}
-				case 'n': {
-					$op = 'n';
-					break;
-				}
-				default: {
-					if (!empty($default)) {
-						$op = $this->getPathPaintOperator($default, '');
-					} else {
-						$op = '';
-					}
-				}
-			}
-			return $op;
-		}
-
-		// -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-		// SVG METHODS
-		// -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-
-		/**
-		 * Embedd a Scalable Vector Graphics (SVG) image.
-		 * NOTE: SVG standard is not yet fully implemented, use the setRasterizeVectorImages() method to enable/disable rasterization of SVG images using ImageMagick library.
-		 * @param string $file Name of the SVG file.
-		 * @param float $x Abscissa of the upper-left corner.
-		 * @param float $y Ordinate of the upper-left corner.
-		 * @param float $w Width of the image in the page. If not specified or equal to zero, it is automatically calculated.
-		 * @param float $h Height of the image in the page. If not specified or equal to zero, it is automatically calculated.
-		 * @param mixed $link URL or identifier returned by AddLink().
-		 * @param string $align Indicates the alignment of the pointer next to image insertion relative to image height. The value can be:<ul><li>T: top-right for LTR or top-left for RTL</li><li>M: middle-right for LTR or middle-left for RTL</li><li>B: bottom-right for LTR or bottom-left for RTL</li><li>N: next line</li></ul>
-		 * @param string $palign Allows to center or align the image on the current line. Possible values are:<ul><li>L : left align</li><li>C : center</li><li>R : right align</li><li>'' : empty string : left for LTR or right for RTL</li></ul>
-		 * @param mixed $border Indicates if borders must be drawn around the image. The value can be either a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul>or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul>
-		 * @param boolean $fitonpage if true the image is resized to not exceed page dimensions.
-		 * @author Nicola Asuni
-		 * @since 5.0.000 (2010-05-02)
-		 * @access public
-		 */
-		public function ImageSVG($file, $x='', $y='', $w=0, $h=0, $link='', $align='', $palign='', $border=0, $fitonpage=false) {
-			if ($this->rasterize_vector_images) {
-				// convert SVG to raster image using GD or ImageMagick libraries
-				return $this->Image($file, $x, $y, $w, $h, 'SVG', $link, $align, true, 300, $palign, false, false, $border, false, false, false);
-			}
-			$this->svgdir = dirname($file);
-			$svgdata = file_get_contents($file);
-			if ($svgdata === false) {
-				$this->Error('SVG file not found: '.$file);
-			}
-			if ($x === '') {
-				$x = $this->x;
-			}
-			if ($y === '') {
-				$y = $this->y;
-			}
-			$k = $this->k;
-			$ox = 0;
-			$oy = 0;
-			$ow = $w;
-			$oh = $h;
-			$aspect_ratio_align = 'xMidYMid';
-			$aspect_ratio_ms = 'meet';
-			$regs = array();
-			// get original image width and height
-			preg_match('/<svg([^\>]*)>/si', $svgdata, $regs);
-			if (isset($regs[1]) AND !empty($regs[1])) {
-				$tmp = array();
-				if (preg_match('/[\s]+x[\s]*=[\s]*"([^"]*)"/si', $regs[1], $tmp)) {
-					$ox = $this->getHTMLUnitToUnits($tmp[1], 0, $this->svgunit, false);
-				}
-				$tmp = array();
-				if (preg_match('/[\s]+y[\s]*=[\s]*"([^"]*)"/si', $regs[1], $tmp)) {
-					$oy = $this->getHTMLUnitToUnits($tmp[1], 0, $this->svgunit, false);
-				}
-				$tmp = array();
-				if (preg_match('/[\s]+width[\s]*=[\s]*"([^"]*)"/si', $regs[1], $tmp)) {
-					$ow = $this->getHTMLUnitToUnits($tmp[1], 1, $this->svgunit, false);
-				}
-				$tmp = array();
-				if (preg_match('/[\s]+height[\s]*=[\s]*"([^"]*)"/si', $regs[1], $tmp)) {
-					$oh = $this->getHTMLUnitToUnits($tmp[1], 1, $this->svgunit, false);
-				}
-				$tmp = array();
-				$view_box = array();
-				if (preg_match('/[\s]+viewBox[\s]*=[\s]*"[\s]*([0-9\.\-]+)[\s]+([0-9\.\-]+)[\s]+([0-9\.]+)[\s]+([0-9\.]+)[\s]*"/si', $regs[1], $tmp)) {
-					if (count($tmp) == 5) {
-						array_shift($tmp);
-						foreach ($tmp as $key => $val) {
-							$view_box[$key] = $this->getHTMLUnitToUnits($val, 0, $this->svgunit, false);
-						}
-						$ox = $view_box[0];
-						$oy = $view_box[1];
-					}
-					// get aspect ratio
-					$tmp = array();
-					if (preg_match('/[\s]+preserveAspectRatio[\s]*=[\s]*"([^"]*)"/si', $regs[1], $tmp)) {
-						$aspect_ratio = preg_split("/[\s]+/si", $tmp[1]);
-						switch (count($aspect_ratio)) {
-							case 3: {
-								$aspect_ratio_align = $aspect_ratio[1];
-								$aspect_ratio_ms = $aspect_ratio[2];
-								break;
-							}
-							case 2: {
-								$aspect_ratio_align = $aspect_ratio[0];
-								$aspect_ratio_ms = $aspect_ratio[1];
-								break;
-							}
-							case 1: {
-								$aspect_ratio_align = $aspect_ratio[0];
-								$aspect_ratio_ms = 'meet';
-								break;
-							}
-						}
-					}
-				}
-			}
-			// calculate image width and height on document
-			if (($w <= 0) AND ($h <= 0)) {
-				// convert image size to document unit
-				$w = $ow;
-				$h = $oh;
-			} elseif ($w <= 0) {
-				$w = $h * $ow / $oh;
-			} elseif ($h <= 0) {
-				$h = $w * $oh / $ow;
-			}
-			// Check whether we need a new page first as this does not fit
-			$prev_x = $this->x;
-			if ($this->checkPageBreak($h, $y)) {
-				$y = $this->y;
-				if ($this->rtl) {
-					$x += ($prev_x - $this->x);
-				} else {
-					$x += ($this->x - $prev_x);
-				}
-			}
-			// resize image to be contained on a single page
-			if ($fitonpage) {
-				$ratio_wh = $w / $h;
-				if (($y + $h) > $this->PageBreakTrigger) {
-					$h = $this->PageBreakTrigger - $y;
-					$w = $h * $ratio_wh;
-				}
-				if (($x + $w) > ($this->w - $this->rMargin)) {
-					$w = $this->w - $this->rMargin - $x;
-					$h = $w / $ratio_wh;
-				}
-			}
-			// set alignment
-			$this->img_rb_y = $y + $h;
-			// set alignment
-			if ($this->rtl) {
-				if ($palign == 'L') {
-					$ximg = $this->lMargin;
-				} elseif ($palign == 'C') {
-					$ximg = ($this->w - $w) / 2;
-				} elseif ($palign == 'R') {
-					$ximg = $this->w - $this->rMargin - $w;
-				} else {
-					$ximg = $this->w - $x - $w;
-				}
-				$this->img_rb_x = $ximg;
-			} else {
-				if ($palign == 'L') {
-					$ximg = $this->lMargin;
-				} elseif ($palign == 'C') {
-					$ximg = ($this->w - $w) / 2;
-				} elseif ($palign == 'R') {
-					$ximg = $this->w - $this->rMargin - $w;
-				} else {
-					$ximg = $x;
-				}
-				$this->img_rb_x = $ximg + $w;
-			}
-			// store current graphic vars
-			$gvars = $this->getGraphicVars();
-			// store SVG position and scale factors
-			$svgoffset_x = ($ximg - $ox) * $this->k;
-			$svgoffset_y = -($y - $oy) * $this->k;
-			if (isset($view_box[2]) AND ($view_box[2] > 0) AND ($view_box[3] > 0)) {
-				$ow = $view_box[2];
-				$oh = $view_box[3];
-			}
-			$svgscale_x = $w / $ow;
-			$svgscale_y = $h / $oh;
-			// scaling and alignment
-			if ($aspect_ratio_align != 'none') {
-				// store current scaling values
-				$svgscale_old_x = $svgscale_x;
-				$svgscale_old_y = $svgscale_y;
-				// force uniform scaling
-				if ($aspect_ratio_ms == 'slice') {
-					// the entire viewport is covered by the viewBox
-					if ($svgscale_x > $svgscale_y) {
-						$svgscale_y = $svgscale_x;
-					} elseif ($svgscale_x < $svgscale_y) {
-						$svgscale_x = $svgscale_y;
-					}
-				} else { // meet
-					// the entire viewBox is visible within the viewport
-					if ($svgscale_x < $svgscale_y) {
-						$svgscale_y = $svgscale_x;
-					} elseif ($svgscale_x > $svgscale_y) {
-						$svgscale_x = $svgscale_y;
-					}
-				}
-				// correct X alignment
-				switch (substr($aspect_ratio_align, 1, 3)) {
-					case 'Min': {
-						// do nothing
-						break;
-					}
-					case 'Max': {
-						$svgoffset_x += (($w * $this->k) - ($ow * $this->k * $svgscale_x));
-						break;
-					}
-					default:
-					case 'Mid': {
-						$svgoffset_x += ((($w * $this->k) - ($ow * $this->k * $svgscale_x)) / 2);
-						break;
-					}
-				}
-				// correct Y alignment
-				switch (substr($aspect_ratio_align, 5)) {
-					case 'Min': {
-						// do nothing
-						break;
-					}
-					case 'Max': {
-						$svgoffset_y -= (($h * $this->k) - ($oh * $this->k * $svgscale_y));
-						break;
-					}
-					default:
-					case 'Mid': {
-						$svgoffset_y -= ((($h * $this->k) - ($oh * $this->k * $svgscale_y)) / 2);
-						break;
-					}
-				}
-			}
-			// save the current graphic state
-			$this->_out('q'.$this->epsmarker);
-			// set initial clipping mask
-			$this->Rect($x, $y, $w, $h, 'CNZ', array(), array());
-			// scale and translate
-			$e = $ox * $this->k * (1 - $svgscale_x);
-			$f = ($this->h - $oy) * $this->k * (1 - $svgscale_y);
-			$this->_out(sprintf('%.3F %.3F %.3F %.3F %.3F %.3F cm', $svgscale_x, 0, 0, $svgscale_y, $e + $svgoffset_x, $f + $svgoffset_y));
-			// creates a new XML parser to be used by the other XML functions
-			$this->parser = xml_parser_create('UTF-8');
-			// the following function allows to use parser inside object
-			xml_set_object($this->parser, $this);
-			// disable case-folding for this XML parser
-			xml_parser_set_option($this->parser, XML_OPTION_CASE_FOLDING, 0);
-			// sets the element handler functions for the XML parser
-			xml_set_element_handler($this->parser, 'startSVGElementHandler', 'endSVGElementHandler');
-			// sets the character data handler function for the XML parser
-			xml_set_character_data_handler($this->parser, 'segSVGContentHandler');
-			// start parsing an XML document
-			if(!xml_parse($this->parser, $svgdata)) {
-				$error_message = sprintf("SVG Error: %s at line %d", xml_error_string(xml_get_error_code($this->parser)), xml_get_current_line_number($this->parser));
-				$this->Error($error_message);
-			}
-			// free this XML parser
-			xml_parser_free($this->parser);
-			// restore previous graphic state
-			$this->_out($this->epsmarker.'Q');
-			// restore  graphic vars
-			$this->setGraphicVars($gvars);
-			if (!empty($border)) {
-				$bx = $x;
-				$by = $y;
-				$this->x = $ximg;
-				if ($this->rtl) {
-					$this->x += $w;
-				}
-				$this->y = $y;
-				$this->Cell($w, $h, '', $border, 0, '', 0, '', 0);
-				$this->x = $bx;
-				$this->y = $by;
-			}
-			if ($link) {
-				$this->Link($ximg, $y, $w, $h, $link, 0);
-			}
-			// set pointer to align the successive text/objects
-			switch($align) {
-				case 'T':{
-					$this->y = $y;
-					$this->x = $this->img_rb_x;
-					break;
-				}
-				case 'M':{
-					$this->y = $y + round($h/2);
-					$this->x = $this->img_rb_x;
-					break;
-				}
-				case 'B':{
-					$this->y = $this->img_rb_y;
-					$this->x = $this->img_rb_x;
-					break;
-				}
-				case 'N':{
-					$this->SetY($this->img_rb_y);
-					break;
-				}
-				default:{
-					break;
-				}
-			}
-			$this->endlinex = $this->img_rb_x;
-		}
-
-		/**
-		 * Get the tranformation matrix from SVG transform attribute
-		 * @param string transformation
-		 * @return array of transformations
-		 * @author Nicola Asuni
-		 * @since 5.0.000 (2010-05-02)
-		 * @access protected
-		 */
-		protected function getSVGTransformMatrix($attribute) {
-			// identity matrix
-			$tm = array(1, 0, 0, 1, 0, 0);
-			$continue = true;
-			while ($continue) {
-				$continue = false;
-				// matrix
-				$regs = array();
-				if (preg_match('/matrix\(([a-z0-9\-\.]+)[\,\s]+([a-z0-9\-\.]+)[\,\s]+([a-z0-9\-\.]+)[\,\s]+([a-z0-9\-\.]+)[\,\s]+([a-z0-9\-\.]+)[\,\s]+([a-z0-9\-\.]+)\)/si', $attribute, $regs)) {
-					$attribute = str_replace($regs[0], '', $attribute);
-					$continue = true;
-					$a = $regs[1];
-					$b = $regs[2];
-					$c = $regs[3];
-					$d = $regs[4];
-					$e = $regs[5];
-					$f = $regs[6];
-					$tm = $this->getTransformationMatrixProduct($tm, array($a, $b, $c, $d, $e, $f));
-				}
-				// translate x
-				$regs = array();
-				if (preg_match('/translate\(([a-z0-9\-\.]+)\)/si', $attribute, $regs)) {
-					$attribute = str_replace($regs[0], 'translate('.$regs[1].',0)', $attribute);
-					$continue = true;
-				}
-				// translate x,y
-				$regs = array();
-				if (preg_match('/translate\(([a-z0-9\-\.]+)[\,\s]+([a-z0-9\-\.]+)\)/si', $attribute, $regs)) {
-					$attribute = str_replace($regs[0], '', $attribute);
-					$continue = true;
-					$e = $regs[1];
-					$f = $regs[2];
-					$tm = $this->getTransformationMatrixProduct($tm, array(1, 0, 0, 1, $e, $f));
-				}
-				// scale x
-				$regs = array();
-				if (preg_match('/scale\(([a-z0-9\-\.]+)\)/si', $attribute, $regs)) {
-					$attribute = str_replace($regs[0], 'scale('.$regs[1].','.$regs[1].')', $attribute);
-					$continue = true;
-				}
-				// scale x,y
-				$regs = array();
-				if (preg_match('/scale\(([a-z0-9\-\.]+)[\,\s]+([a-z0-9\-\.]+)\)/si', $attribute, $regs)) {
-					$attribute = str_replace($regs[0], '', $attribute);
-					$continue = true;
-					$a = $regs[1];
-					if (isset($regs[2]) AND (strlen(trim($regs[2])) > 0)) {
-						$d = $regs[2];
-					} else {
-						$d = $a;
-					}
-					$tm = $this->getTransformationMatrixProduct($tm, array($a, 0, 0, $d, 0, 0));
-				}
-				// rotate ang
-				$regs = array();
-				if (preg_match('/rotate\(([a-z0-9\-\.]+)\)/si', $attribute, $regs)) {
-					$attribute = str_replace($regs[0], 'rotate('.$regs[1].',0,0)', $attribute);
-					$continue = true;
-				}
-				// rotate ang,x,y
-				$regs = array();
-				if (preg_match('/rotate\(([0-9\-\.]+)[\,\s]+([a-z0-9\-\.]+)[\,\s]+([a-z0-9\-\.]+)\)/si', $attribute, $regs)) {
-					$attribute = str_replace($regs[0], '', $attribute);
-					$continue = true;
-					$ang = deg2rad($regs[1]);
-					$a = cos($ang);
-					$b = sin($ang);
-					$c = -$b;
-					$d = $a;
-					$x = $regs[2];
-					$y = $regs[3];
-					$e = ($x * (1 - $a)) - ($y * $c);
-					$f = ($y * (1 - $d)) - ($x * $b);
-					$tm = $this->getTransformationMatrixProduct($tm, array($a, $b, $c, $d, $e, $f));
-				}
-				// skewX
-				$regs = array();
-				if (preg_match('/skewX\(([0-9\-\.]+)\)/si', $attribute, $regs)) {
-					$attribute = str_replace($regs[0], '', $attribute);
-					$continue = true;
-					$c = tan(deg2rad($regs[1]));
-					$tm = $this->getTransformationMatrixProduct($tm, array(1, 0, $c, 1, 0, 0));
-				}
-				// skewY
-				$regs = array();
-				if (preg_match('/skewY\(([0-9\-\.]+)\)/si', $attribute, $regs)) {
-					$attribute = str_replace($regs[0], '', $attribute);
-					$continue = true;
-					$b = tan(deg2rad($regs[1]));
-					$tm = $this->getTransformationMatrixProduct($tm, array(1, $b, 0, 1, 0, 0));
-				}
-			}
-			return $tm;
-		}
-
-		/**
-		 * Get the product of two SVG tranformation matrices
-		 * @param array $ta first SVG tranformation matrix
-		 * @param array $tb second SVG tranformation matrix
-		 * @return transformation array
-		 * @author Nicola Asuni
-		 * @since 5.0.000 (2010-05-02)
-		 * @access protected
-		 */
-		protected function getTransformationMatrixProduct($ta, $tb)  {
-			$tm = array();
-			$tm[0] = ($ta[0] * $tb[0]) + ($ta[2] * $tb[1]);
-			$tm[1] = ($ta[1] * $tb[0]) + ($ta[3] * $tb[1]);
-			$tm[2] = ($ta[0] * $tb[2]) + ($ta[2] * $tb[3]);
-			$tm[3] = ($ta[1] * $tb[2]) + ($ta[3] * $tb[3]);
-			$tm[4] = ($ta[0] * $tb[4]) + ($ta[2] * $tb[5]) + $ta[4];
-			$tm[5] = ($ta[1] * $tb[4]) + ($ta[3] * $tb[5]) + $ta[5];
-			return $tm;
-		}
-
-		/**
-		 * Convert SVG transformation matrix to PDF.
-		 * @param array $tm original SVG transformation matrix
-		 * @return array transformation matrix
-		 * @access protected
-		 * @since 5.0.000 (2010-05-02)
-		 */
-		protected function convertSVGtMatrix($tm) {
-			$a = $tm[0];
-			$b = -$tm[1];
-			$c = -$tm[2];
-			$d = $tm[3];
-			$e = $this->getHTMLUnitToUnits($tm[4], 1, $this->svgunit, false) * $this->k;
-			$f = -$this->getHTMLUnitToUnits($tm[5], 1, $this->svgunit, false) * $this->k;
-			$x = 0;
-			$y = $this->h * $this->k;
-			$e = ($x * (1 - $a)) - ($y * $c) + $e;
-			$f = ($y * (1 - $d)) - ($x * $b) + $f;
-			return array($a, $b, $c, $d, $e, $f);
-		}
-
-		/**
-		 * Apply SVG graphic transformation matrix.
-		 * @param array $tm original SVG transformation matrix
-		 * @access protected
-		 * @since 5.0.000 (2010-05-02)
-		 */
-		protected function SVGTransform($tm) {
-			$this->Transform($this->convertSVGtMatrix($tm));
-		}
-
-		/**
-		 * Apply the requested SVG styles (*** TO BE COMPLETED ***)
-		 * @param array $svgstyle array of SVG styles to apply
-		 * @param array $prevsvgstyle array of previous SVG style
-		 * @param int $x X origin of the bounding box
-		 * @param int $y Y origin of the bounding box
-		 * @param int $w width of the bounding box
-		 * @param int $h height of the bounding box
-		 * @param string $clip_function clip function
-		 * @param array $clip_params array of parameters for clipping function
-		 * @return object style
-		 * @author Nicola Asuni
-		 * @since 5.0.000 (2010-05-02)
-		 * @access protected
-		 */
-		protected function setSVGStyles($svgstyle, $prevsvgstyle, $x=0, $y=0, $w=1, $h=1, $clip_function='', $clip_params=array())  {
-			$objstyle = '';
-			if(!isset($svgstyle['opacity'])) {
-				return $objstyle;
-			}
-			// clip-path
-			$regs = array();
-			if (preg_match('/url\([\s]*\#([^\)]*)\)/si', $svgstyle['clip-path'], $regs)) {
-				$clip_path = $this->svgclippaths[$regs[1]];
-				foreach ($clip_path as $cp) {
-					$this->startSVGElementHandler('clip-path', $cp['name'], $cp['attribs']);
-				}
-			}
-			//$this->SetAlpha(1); // reset alpha
-			// opacity
-			if ($svgstyle['opacity'] != 1) {
-				$this->SetAlpha($svgstyle['opacity']);
-			}
-			// color
-			$fill_color = $this->convertHTMLColorToDec($svgstyle['color']);
-			$this->SetFillColorArray($fill_color);
-			// text color
-			$text_color = $this->convertHTMLColorToDec($svgstyle['text-color']);
-			$this->SetTextColorArray($text_color);
-			// clip
-			if (preg_match('/rect\(([a-z0-9\-\.]*)[\s]*([a-z0-9\-\.]*)[\s]*([a-z0-9\-\.]*)[\s]*([a-z0-9\-\.]*)\)/si', $svgstyle['clip'], $regs)) {
-				$top = (isset($regs[1])?$this->getHTMLUnitToUnits($regs[1], 0, $this->svgunit, false):0);
-				$right = (isset($regs[2])?$this->getHTMLUnitToUnits($regs[2], 0, $this->svgunit, false):0);
-				$bottom = (isset($regs[3])?$this->getHTMLUnitToUnits($regs[3], 0, $this->svgunit, false):0);
-				$left = (isset($regs[4])?$this->getHTMLUnitToUnits($regs[4], 0, $this->svgunit, false):0);
-				$cx = $x + $left;
-				$cy = $y + $top;
-				$cw = $w - $left - $right;
-				$ch = $h - $top - $bottom;
-				if ($svgstyle['clip-rule'] == 'evenodd') {
-					$clip_rule = 'CNZ';
-				} else {
-					$clip_rule = 'CEO';
-				}
-				$this->Rect($cx, $cy, $cw, $ch, $clip_rule, array(), array());
-			}
-			// fill
-			$regs = array();
-			if (preg_match('/url\([\s]*\#([^\)]*)\)/si', $svgstyle['fill'], $regs)) {
-				// gradient
-				$gradient = $this->svggradients[$regs[1]];
-				if (isset($gradient['xref'])) {
-					// reference to another gradient definition
-					$newgradient = $this->svggradients[$gradient['xref']];
-					$newgradient['coords'] = $gradient['coords'];
-					$newgradient['mode'] = $gradient['mode'];
-					$newgradient['gradientUnits'] = $gradient['gradientUnits'];
-					if (isset($gradient['gradientTransform'])) {
-						$newgradient['gradientTransform'] = $gradient['gradientTransform'];
-					}
-					$gradient = $newgradient;
-				}
-				//save current Graphic State
-				$this->_out('q');
-				//set clipping area
-				if (!empty($clip_function) AND method_exists($this, $clip_function)) {
-					$bbox = call_user_func_array(array($this, $clip_function), $clip_params);
-					if (is_array($bbox) AND (count($bbox) == 4)) {
-						list($x, $y, $w, $h) = $bbox;
-					}
-				}
-				if ($gradient['mode'] == 'measure') {
-					if (isset($gradient['gradientTransform']) AND !empty($gradient['gradientTransform'])) {
-						$gtm = $gradient['gradientTransform'];
-						// apply transformation matrix
-						$xa = ($gtm[0] * $gradient['coords'][0]) + ($gtm[2] * $gradient['coords'][1]) + $gtm[4];
-						$ya = ($gtm[1] * $gradient['coords'][0]) + ($gtm[3] * $gradient['coords'][1]) + $gtm[5];
-						$xb = ($gtm[0] * $gradient['coords'][2]) + ($gtm[2] * $gradient['coords'][3]) + $gtm[4];
-						$yb = ($gtm[1] * $gradient['coords'][2]) + ($gtm[3] * $gradient['coords'][3]) + $gtm[5];
-						if (isset($gradient['coords'][4])) {
-							$gradient['coords'][4] = sqrt(pow(($gtm[0] * $gradient['coords'][4]), 2) + pow(($gtm[1] * $gradient['coords'][4]), 2));
-						}
-						$gradient['coords'][0] = $xa;
-						$gradient['coords'][1] = $ya;
-						$gradient['coords'][2] = $xb;
-						$gradient['coords'][3] = $yb;
-
-					}
-					// convert SVG coordinates to user units
-					$gradient['coords'][0] = $this->getHTMLUnitToUnits($gradient['coords'][0], 0, $this->svgunit, false);
-					$gradient['coords'][1] = $this->getHTMLUnitToUnits($gradient['coords'][1], 0, $this->svgunit, false);
-					$gradient['coords'][2] = $this->getHTMLUnitToUnits($gradient['coords'][2], 0, $this->svgunit, false);
-					$gradient['coords'][3] = $this->getHTMLUnitToUnits($gradient['coords'][3], 0, $this->svgunit, false);
-					if (isset($gradient['coords'][4])) {
-						$gradient['coords'][4] = $this->getHTMLUnitToUnits($gradient['coords'][4], 0, $this->svgunit, false);
-					}
-					// shift units
-					if ($gradient['gradientUnits'] == 'objectBoundingBox') {
-						// convert to SVG coordinate system
-						$gradient['coords'][0] += $x;
-						$gradient['coords'][1] += $y;
-						$gradient['coords'][2] += $x;
-						$gradient['coords'][3] += $y;
-					}
-					// calculate percentages
-					$gradient['coords'][0] = ($gradient['coords'][0] - $x) / $w;
-					$gradient['coords'][1] = ($gradient['coords'][1] - $y) / $h;
-					$gradient['coords'][2] = ($gradient['coords'][2] - $x) / $w;
-					$gradient['coords'][3] = ($gradient['coords'][3] - $y) / $h;
-					if (isset($gradient['coords'][4])) {
-						$gradient['coords'][4] /= $w;
-					}
-					// fix values
-					foreach($gradient['coords'] as $key => $val) {
-						if ($val < 0) {
-							$gradient['coords'][$key] = 0;
-						} elseif ($val > 1) {
-							$gradient['coords'][$key] = 1;
-						}
-					}
-					if (($gradient['type'] == 2) AND ($gradient['coords'][0] == $gradient['coords'][2]) AND ($gradient['coords'][1] == $gradient['coords'][3])) {
-						// single color (no shading)
-						$gradient['coords'][0] = 1;
-						$gradient['coords'][1] = 0;
-						$gradient['coords'][2] = 0.999;
-						$gradient['coords'][3] = 0;
-					}
-				}
-				// swap Y coordinates
-				$tmp = $gradient['coords'][1];
-				$gradient['coords'][1] = $gradient['coords'][3];
-				$gradient['coords'][3] = $tmp;
-				// set transformation map for gradient
-				if (($gradient['type'] == 3) AND ($gradient['mode'] == 'measure')) {
-					// gradient is always circular
-					$cy = $this->h - $y - ($gradient['coords'][1] * ($w + $h));
-					$this->_out(sprintf('%.3F 0 0 %.3F %.3F %.3F cm', $w*$this->k, $w*$this->k, $x*$this->k, $cy*$this->k));
-				} else {
-					$this->_out(sprintf('%.3F 0 0 %.3F %.3F %.3F cm', $w*$this->k, $h*$this->k, $x*$this->k, ($this->h-($y+$h))*$this->k));
-				}
-				if (count($gradient['stops']) > 1) {
-					$this->Gradient($gradient['type'], $gradient['coords'], $gradient['stops'], array(), false);
-				}
-			} elseif ($svgstyle['fill'] != 'none') {
-				$fill_color = $this->convertHTMLColorToDec($svgstyle['fill']);
-				if ($svgstyle['fill-opacity'] != 1) {
-					$this->SetAlpha($svgstyle['fill-opacity']);
-				}
-				$this->SetFillColorArray($fill_color);
-				if ($svgstyle['fill-rule'] == 'evenodd') {
-					$objstyle .= 'F*';
-				} else {
-					$objstyle .= 'F';
-				}
-			}
-			// stroke
-			if ($svgstyle['stroke'] != 'none') {
-				$stroke_style = array(
-					'color' => $this->convertHTMLColorToDec($svgstyle['stroke']),
-					'width' => $this->getHTMLUnitToUnits($svgstyle['stroke-width'], 0, $this->svgunit, false),
-					'cap' => $svgstyle['stroke-linecap'],
-					'join' => $svgstyle['stroke-linejoin']
-					);
-				if (isset($svgstyle['stroke-dasharray']) AND !empty($svgstyle['stroke-dasharray']) AND ($svgstyle['stroke-dasharray'] != 'none')) {
-					$stroke_style['dash'] = $svgstyle['stroke-dasharray'];
-				}
-				$this->SetLineStyle($stroke_style);
-				$objstyle .= 'D';
-			}
-			// font
-			$regs = array();
-			if (!empty($svgstyle['font'])) {
-				if (preg_match('/font-family[\s]*:[\s]*([^\s\;\"]*)/si', $svgstyle['font'], $regs)) {
-					$font_family = trim($regs[1]);
-				} else {
-					$font_family = $svgstyle['font-family'];
-				}
-				if (preg_match('/font-size[\s]*:[\s]*([^\s\;\"]*)/si', $svgstyle['font'], $regs)) {
-					$font_size = trim($regs[1]);
-				} else {
-					$font_size = $svgstyle['font-size'];
-				}
-				if (preg_match('/font-style[\s]*:[\s]*([^\s\;\"]*)/si', $svgstyle['font'], $regs)) {
-					$font_style = trim($regs[1]);
-				} else {
-					$font_style = $svgstyle['font-style'];
-				}
-				if (preg_match('/font-weight[\s]*:[\s]*([^\s\;\"]*)/si', $svgstyle['font'], $regs)) {
-					$font_weight = trim($regs[1]);
-				} else {
-					$font_weight = $svgstyle['font-weight'];
-				}
-			} else {
-				$font_family = $svgstyle['font-family'];
-				$font_size = $svgstyle['font-size'];
-				$font_style = $svgstyle['font-style'];
-				$font_weight = $svgstyle['font-weight'];
-			}
-			$font_size = $this->getHTMLUnitToUnits($font_size, $prevsvgstyle['font-size'], $this->svgunit, false) * $this->k;
-			switch ($font_style) {
-				case 'italic': {
-					$font_style = 'I';
-					break;
-				}
-				case 'oblique': {
-					$font_style = 'I';
-					break;
-				}
-				default:
-				case 'normal': {
-					$font_style = '';
-					break;
-				}
-			}
-			switch ($font_weight) {
-				case 'bold':
-				case 'bolder': {
-					$font_style .= 'B';
-					break;
-				}
-			}
-			switch ($svgstyle['text-decoration']) {
-				case 'underline': {
-					$font_style .= 'U';
-					break;
-				}
-				case 'overline': {
-					$font_style .= 'O';
-					break;
-				}
-				case 'line-through': {
-					$font_style .= 'D';
-					break;
-				}
-				default:
-				case 'none': {
-					break;
-				}
-			}
-			$this->SetFont($font_family, $font_style, $font_size);
-			return $objstyle;
-		}
-
-		/**
-		 * Draws an SVG path
-		 * @param string $d attribute d of the path SVG element
-		 * @param string $style Style of rendering. Possible values are:
-		 * <ul>
-		 *	 <li>D or empty string: Draw (default).</li>
-		 *	 <li>F: Fill.</li>
-		 *	 <li>F*: Fill using the even-odd rule to determine which regions lie inside the clipping path.</li>
-		 *	 <li>DF or FD: Draw and fill.</li>
-		 *	 <li>DF* or FD*: Draw and fill using the even-odd rule to determine which regions lie inside the clipping path.</li>
-		 *	 <li>CNZ: Clipping mode (using the even-odd rule to determine which regions lie inside the clipping path).</li>
-		 *	 <li>CEO: Clipping mode (using the nonzero winding number rule to determine which regions lie inside the clipping path).</li>
-		 * </ul>
-		 * @return array of container box measures (x, y, w, h)
-		 * @author Nicola Asuni
-		 * @since 5.0.000 (2010-05-02)
-		 * @access protected
-		 */
-		protected function SVGPath($d, $style='') {
-			// set fill/stroke style
-			$op = $this->getPathPaintOperator($style, '');
-			if (empty($op)) {
-				return;
-			}
-			$paths = array();
-			preg_match_all('/([a-zA-Z])[\s]*([^a-zA-Z\"]*)/si', $d, $paths, PREG_SET_ORDER);
-			$x = 0;
-			$y = 0;
-			$x1 = 0;
-			$y1 = 0;
-			$x2 = 0;
-			$y2 = 0;
-			$xmin = 2147483647;
-			$xmax = 0;
-			$ymin = 2147483647;
-			$ymax = 0;
-			$relcoord = false;
-			// draw curve pieces
-			foreach ($paths as $key => $val) {
-				// get curve type
-				$cmd = trim($val[1]);
-				if (strtolower($cmd) == $cmd) {
-					// use relative coordinated instead of absolute
-					$relcoord = true;
-					$xoffset = $x;
-					$yoffset = $y;
-				} else {
-					$relcoord = false;
-					$xoffset = 0;
-					$yoffset = 0;
-				}
-				$params = array();
-				if (isset($val[2])) {
-					// get curve parameters
-					$rawparams = preg_split('/([\,\s]+)/si', trim($val[2]));
-					$params = array();
-					foreach ($rawparams as $ck => $cp) {
-						$params[$ck] = $this->getHTMLUnitToUnits($cp, 0, $this->svgunit, false);
-					}
-				}
-				switch (strtoupper($cmd)) {
-					case 'M': { // moveto
-						foreach ($params as $ck => $cp) {
-							if (($ck % 2) == 0) {
-								$x = $cp + $xoffset;
-							} else {
-								$y = $cp + $yoffset;
-								if ($ck == 1) {
-									$this->_outPoint($x, $y);
-								} else {
-									$this->_outLine($x, $y);
-								}
-								$xmin = min($xmin, $x);
-								$ymin = min($ymin, $y);
-								$xmax = max($xmax, $x);
-								$ymax = max($ymax, $y);
-								if ($relcoord) {
-									$xoffset = $x;
-									$yoffset = $y;
-								}
-							}
-						}
-						break;
-					}
-					case 'L': { // lineto
-						foreach ($params as $ck => $cp) {
-							if (($ck % 2) == 0) {
-								$x = $cp + $xoffset;
-							} else {
-								$y = $cp + $yoffset;
-								$this->_outLine($x, $y);
-								$xmin = min($xmin, $x);
-								$ymin = min($ymin, $y);
-								$xmax = max($xmax, $x);
-								$ymax = max($ymax, $y);
-								if ($relcoord) {
-									$xoffset = $x;
-									$yoffset = $y;
-								}
-							}
-						}
-						break;
-					}
-					case 'H': { // horizontal lineto
-						foreach ($params as $ck => $cp) {
-							$x = $cp + $xoffset;
-							$this->_outLine($x, $y);
-							$xmin = min($xmin, $x);
-							$xmax = max($xmax, $x);
-							if ($relcoord) {
-								$xoffset = $x;
-							}
-						}
-						break;
-					}
-					case 'V': { // vertical lineto
-						foreach ($params as $ck => $cp) {
-							$y = $cp + $yoffset;
-							$this->_outLine($x, $y);
-							$ymin = min($ymin, $y);
-							$ymax = max($ymax, $y);
-							if ($relcoord) {
-								$yoffset = $y;
-							}
-						}
-						break;
-					}
-					case 'C': { // curveto
-						foreach ($params as $ck => $cp) {
-							$params[$ck] = $cp;
-							if ((($ck + 1) % 6) == 0) {
-								$x1 = $params[($ck - 5)] + $xoffset;
-								$y1 = $params[($ck - 4)] + $yoffset;
-								$x2 = $params[($ck - 3)] + $xoffset;
-								$y2 = $params[($ck - 2)] + $yoffset;
-								$x = $params[($ck - 1)] + $xoffset;
-								$y = $params[($ck)] + $yoffset;
-								$this->_outCurve($x1, $y1, $x2, $y2, $x, $y);
-								$xmin = min($xmin, $x, $x1, $x2);
-								$ymin = min($ymin, $y, $y1, $y2);
-								$xmax = max($xmax, $x, $x1, $x2);
-								$ymax = max($ymax, $y, $y1, $y2);
-								if ($relcoord) {
-									$xoffset = $x;
-									$yoffset = $y;
-								}
-							}
-						}
-						break;
-					}
-					case 'S': { // shorthand/smooth curveto
-						foreach ($params as $ck => $cp) {
-							$params[$ck] = $cp;
-							if ((($ck + 1) % 4) == 0) {
-								if (($key > 0) AND ((strtoupper($paths[($key - 1)][1]) == 'C') OR (strtoupper($paths[($key - 1)][1]) == 'S'))) {
-									$x1 = (2 * $x) - $x2;
-									$y1 = (2 * $y) - $y2;
-								} else {
-									$x1 = $x;
-									$y1 = $y;
-								}
-								$x2 = $params[($ck - 3)] + $xoffset;
-								$y2 = $params[($ck - 2)] + $yoffset;
-								$x = $params[($ck - 1)] + $xoffset;
-								$y = $params[($ck)] + $yoffset;
-								$this->_outCurve($x1, $y1, $x2, $y2, $x, $y);
-								$xmin = min($xmin, $x, $x1, $x2);
-								$ymin = min($ymin, $y, $y1, $y2);
-								$xmax = max($xmax, $x, $x1, $x2);
-								$ymax = max($ymax, $y, $y1, $y2);
-								if ($relcoord) {
-									$xoffset = $x;
-									$yoffset = $y;
-								}
-							}
-						}
-						break;
-					}
-					case 'Q': { // quadratic B�zier curveto
-						foreach ($params as $ck => $cp) {
-							$params[$ck] = $cp;
-							if ((($ck + 1) % 4) == 0) {
-								// convert quadratic points to cubic points
-								$x1 = $params[($ck - 3)] + $xoffset;
-								$y1 = $params[($ck - 2)] + $yoffset;
-								$xa = ($x + (2 * $x1)) / 3;
-								$ya = ($y + (2 * $y1)) / 3;
-								$x = $params[($ck - 1)] + $xoffset;
-								$y = $params[($ck)] + $yoffset;
-								$xb = ($x + (2 * $x1)) / 3;
-								$yb = ($y + (2 * $y1)) / 3;
-								$this->_outCurve($xa, $ya, $xb, $yb, $x, $y);
-								$xmin = min($xmin, $x, $xa, $xb);
-								$ymin = min($ymin, $y, $ya, $yb);
-								$xmax = max($xmax, $x, $xa, $xb);
-								$ymax = max($ymax, $y, $ya, $yb);
-								if ($relcoord) {
-									$xoffset = $x;
-									$yoffset = $y;
-								}
-							}
-						}
-						break;
-					}
-					case 'T': { // shorthand/smooth quadratic B�zier curveto
-						foreach ($params as $ck => $cp) {
-							$params[$ck] = $cp;
-							if (($ck % 2) != 0) {
-								if (($key > 0) AND ((strtoupper($paths[($key - 1)][1]) == 'Q') OR (strtoupper($paths[($key - 1)][1]) == 'T'))) {
-									$x1 = (2 * $x) - $x1;
-									$y1 = (2 * $y) - $y1;
-								} else {
-									$x1 = $x;
-									$y1 = $y;
-								}
-								// convert quadratic points to cubic points
-								$xa = ($x + (2 * $x1)) / 3;
-								$ya = ($y + (2 * $y1)) / 3;
-								$x = $params[($ck - 1)] + $xoffset;
-								$y = $params[($ck)] + $yoffset;
-								$xb = ($x + (2 * $x1)) / 3;
-								$yb = ($y + (2 * $y1)) / 3;
-								$this->_outCurve($xa, $ya, $xb, $yb, $x, $y);
-								$xmin = min($xmin, $x, $x1, $x2);
-								$ymin = min($ymin, $y, $y1, $y2);
-								$xmax = max($xmax, $x, $x1, $x2);
-								$ymax = max($ymax, $y, $y1, $y2);
-								if ($relcoord) {
-									$xoffset = $x;
-									$yoffset = $y;
-								}
-							}
-						}
-						break;
-					}
-					case 'A': { // elliptical arc
-						foreach ($params as $ck => $cp) {
-							$params[$ck] = $cp;
-							if ((($ck + 1) % 7) == 0) {
-								$x0 = $x;
-								$y0 = $y;
-								$rx = abs($params[($ck - 6)]);
-								$ry = abs($params[($ck - 5)]);
-								$ang = -$rawparams[($ck - 4)];
-								$angle = deg2rad($ang);
-								$fa = $rawparams[($ck - 3)]; // large-arc-flag
-								$fs = $rawparams[($ck - 2)]; // sweep-flag
-								$x = $params[($ck - 1)] + $xoffset;
-								$y = $params[$ck] + $yoffset;
-								$cos_ang = cos($angle);
-								$sin_ang = sin($angle);
-								$a = ($x0 - $x) / 2;
-								$b = ($y0 - $y) / 2;
-								$xa = ($a * $cos_ang) - ($b * $sin_ang);
-								$ya = ($a * $sin_ang) + ($b * $cos_ang);
-								$rx2 = $rx * $rx;
-								$ry2 = $ry * $ry;
-								$xa2 = $xa * $xa;
-								$ya2 = $ya * $ya;
-								$delta = ($xa2 / $rx2) + ($ya2 / $ry2);
-								if ($delta > 1) {
-									$rx *= sqrt($delta);
-									$ry *= sqrt($delta);
-									$rx2 = $rx * $rx;
-									$ry2 = $ry * $ry;
-								}
-								$numerator = (($rx2 * $ry2) - ($rx2 * $ya2) - ($ry2 * $xa2));
-								if ($numerator < 0) {
-									$root = 0;
-								} else {
-									$root = sqrt($numerator / (($rx2 * $ya2) + ($ry2 * $xa2)));
-								}
-								if ($fa == $fs) {
-									$root *= -1;
-								}
-								$cax = $root * (($rx * $ya) / $ry);
-								$cay = -$root * (($ry * $xa) / $rx);
-								// coordinates of ellipse center
-								$cx = ($cax * $cos_ang) - ($cay * $sin_ang) + (($x0 + $x) / 2);
-								$cy = ($cax * $sin_ang) + ($cay * $cos_ang) + (($y0 + $y) / 2);
-								// get angles
-								$angs = $this->getVectorsAngle(1, 0, (($xa - $cax) / $rx), (($cay - $ya) / $ry));
-								$dang = $this->getVectorsAngle((($xa - $cax) / $rx), (($ya - $cay) / $ry), ((-$xa - $cax) / $rx), ((-$ya - $cay) / $ry));
-								if (($fs == 0) AND ($dang > 0)) {
-									$dang -= (2 * M_PI);
-								} elseif (($fs == 1) AND ($dang < 0)) {
-									$dang += (2 * M_PI);
-								}
-								$angf = $angs - $dang;
-								if (($fs == 1) AND ($angs > $angf)) {
-									$tmp = $angs;
-									$angs = $angf;
-									$angf = $tmp;
-								}
-								$angs = rad2deg($angs);
-								$angf = rad2deg($angf);
-								$pie = false;
-								if ((isset($paths[($key + 1)][1])) AND (trim($paths[($key + 1)][1]) == 'z')) {
-									$pie = true;
-								}
-								$this->_outellipticalarc($cx, $cy, $rx, $ry, $ang, $angs, $angf, $pie, 2);
-								$this->_outPoint($x, $y);
-								$xmin = min($xmin, $x);
-								$ymin = min($ymin, $y);
-								$xmax = max($xmax, $x);
-								$ymax = max($ymax, $y);
-								if ($relcoord) {
-									$xoffset = $x;
-									$yoffset = $y;
-								}
-							}
-						}
-						break;
-					}
-					case 'Z': {
-						$this->_out('h');
-						break;
-					}
-				}
-			} // end foreach
-			if (!empty($op)) {
-				$this->_out($op);
-			}
-			return array($xmin, $ymin, ($xmax - $xmin), ($ymax - $ymin));
-		}
-
-		/**
-		 * Returns the angle in  radiants between two vectors
-		 * @param int $x1 X coordiante of first vector point
-		 * @param int $y1 Y coordiante of first vector point
-		 * @param int $x2 X coordiante of second vector point
-		 * @param int $y2 Y coordiante of second vector point
-		 * @author Nicola Asuni
-		 * @since 5.0.000 (2010-05-04)
-		 * @access protected
-		 */
-		protected function getVectorsAngle($x1, $y1, $x2, $y2) {
-			$dprod = ($x1 * $x2) + ($y1 * $y2);
-			$dist1 = sqrt(($x1 * $x1) + ($y1 * $y1));
-			$dist2 = sqrt(($x2 * $x2) + ($y2 * $y2));
-			$angle = acos($dprod / ($dist1 * $dist2));
-			if (is_nan($angle)) {
-				$angle = M_PI;
-			}
-			if ((($x1 * $y2) - ($x2 * $y1)) < 0) {
-				$angle *= -1;
-			}
-			return $angle;
-		}
-
-		/**
-		 * Sets the opening SVG element handler function for the XML parser. (*** TO BE COMPLETED ***)
-		 * @param resource $parser The first parameter, parser, is a reference to the XML parser calling the handler.
-		 * @param string $name The second parameter, name, contains the name of the element for which this handler is called. If case-folding is in effect for this parser, the element name will be in uppercase letters. 
-		 * @param array $attribs The third parameter, attribs, contains an associative array with the element's attributes (if any). The keys of this array are the attribute names, the values are the attribute values. Attribute names are case-folded on the same criteria as element names. Attribute values are not case-folded. The original order of the attributes can be retrieved by walking through attribs the normal way, using each(). The first key in the array was the first attribute, and so on. 
-		 * @author Nicola Asuni
-		 * @since 5.0.000 (2010-05-02)
-		 * @access protected
-		 */
-		protected function startSVGElementHandler($parser, $name, $attribs) {
-			// check if we are in clip mode
-			if ($this->svgclipmode) {
-				$this->svgclippaths[$this->svgclipid][] = array('name' => $name, 'attribs' => $attribs);
-				return;
-			}
-			if ($this->svgdefsmode AND !in_array($name, array('clipPath', 'linearGradient', 'radialGradient', 'stop'))) {
-				$this->svgdefs[$attribs['id']] = array('name' => $name, 'attribs' => $attribs);
-				return;
-			}
-			$clipping = false;
-			if ($parser == 'clip-path') {
-				// set clipping mode
-				$clipping = true;
-			}
-			// get styling properties
-			$prev_svgstyle = $this->svgstyles[(count($this->svgstyles) - 1)]; // previous style
-			$svgstyle = array(); // current style
-			if (isset($attribs['style'])) {
-				$attribs['style'] = ';'.$attribs['style'];
-			}
-			foreach ($prev_svgstyle as $key => $val) {
-				if (isset($attribs[$key])) {
-					if ($attribs[$key] == 'inherit') {
-						$svgstyle[$key] = $val;
-					} else {
-						$svgstyle[$key] = $attribs[$key];
-					}
-				} elseif (isset($attribs['style'])) {
-					// CSS style syntax
-					$attrval = array();
-					if (preg_match('/[;\"\s]{1}'.$key.'[\s]*:[\s]*([^;\"\s]*)/si', $attribs['style'], $attrval) AND isset($attrval[1])) {
-						if ($attrval[1] == 'inherit') {
-							$svgstyle[$key] = $val;
-						} else {
-							$svgstyle[$key] = $attrval[1];
-						}
-					} else {
-						// default value
-						$svgstyle[$key] = $this->svgstyles[0][$key];
-					}
-				} else {
-					if (in_array($key, $this->svginheritprop)) {
-						// inherit previous value
-						$svgstyle[$key] = $val;
-					} else {
-						// default value
-						$svgstyle[$key] = $this->svgstyles[0][$key];
-					}
-				}
-			}
-			// transformation matrix
-			$tm = $this->svgstyles[(count($this->svgstyles) - 1)]['transfmatrix'];
-			if (isset($attribs['transform']) AND !empty($attribs['transform'])) {
-				$tm = $this->getTransformationMatrixProduct($tm, $this->getSVGTransformMatrix($attribs['transform']));
-			}
-			$svgstyle['transfmatrix'] = $tm;
-			// process tag
-			switch($name) {
-				case 'defs': {
-					$this->svgdefsmode = true;
-					break;
-				}
-				// clipPath
-				case 'clipPath': {
-					$this->svgclipmode = true;
-					$this->svgclipid = $attribs['id'];
-					$this->svgclippaths[$this->svgclipid] = array();
-					break;
-				}
-				case 'svg': {
-					// start of SVG object
-					break;
-				}
-				case 'g': {
-					// group together related graphics elements
-					array_push($this->svgstyles, $svgstyle);
-					$this->StartTransform();
-					$this->setSVGStyles($svgstyle, $prev_svgstyle);
-					break;
-				}
-				case 'linearGradient': {
-					$this->svggradientid = $attribs['id'];
-					$this->svggradients[$this->svggradientid] = array();
-					$this->svggradients[$this->svggradientid]['type'] = 2;
-					$this->svggradients[$this->svggradientid]['stops'] = array();
-					if (isset($attribs['gradientUnits'])) {
-						$this->svggradients[$this->svggradientid]['gradientUnits'] = $attribs['gradientUnits'];
-					} else {
-						$this->svggradients[$this->svggradientid]['gradientUnits'] = 'objectBoundingBox';
-					}
-					//$attribs['spreadMethod']
-					$x1 = (isset($attribs['x1'])?$attribs['x1']:0);
-					$y1 = (isset($attribs['y1'])?$attribs['y1']:0);
-					$x2 = (isset($attribs['x2'])?$attribs['x2']:1);
-					$y2 = (isset($attribs['y2'])?$attribs['y2']:0);
-					if (isset($attribs['x1']) AND (substr($attribs['x1'], -1) != '%')) {
-						$this->svggradients[$this->svggradientid]['mode'] = 'measure';
-					} else {
-						$this->svggradients[$this->svggradientid]['mode'] = 'percentage';
-					}
-					if (isset($attribs['gradientTransform'])) {
-						$this->svggradients[$this->svggradientid]['gradientTransform'] = $this->getSVGTransformMatrix($attribs['gradientTransform']);
-					}
-					$this->svggradients[$this->svggradientid]['coords'] = array($x1, $y1, $x2, $y2);
-					if (isset($attribs['xlink:href']) AND !empty($attribs['xlink:href'])) {
-						// gradient is defined on another place
-						$this->svggradients[$this->svggradientid]['xref'] = substr($attribs['xlink:href'], 1);
-					}
-					break;
-				}
-				case 'radialGradient': {
-					$this->svggradientid = $attribs['id'];
-					$this->svggradients[$this->svggradientid] = array();
-					$this->svggradients[$this->svggradientid]['type'] = 3;
-					$this->svggradients[$this->svggradientid]['stops'] = array();
-					if (isset($attribs['gradientUnits'])) {
-						$this->svggradients[$this->svggradientid]['gradientUnits'] = $attribs['gradientUnits'];
-					} else {
-						$this->svggradients[$this->svggradientid]['gradientUnits'] = 'objectBoundingBox';
-					}
-					//$attribs['spreadMethod']
-					$cx = (isset($attribs['cx'])?$attribs['cx']:0.5);
-					$cy = (isset($attribs['cy'])?$attribs['cy']:0.5);
-					$fx = (isset($attribs['fx'])?$attribs['fx']:$cx);
-					$fy = (isset($attribs['fy'])?$attribs['fy']:$cy);
-					$r = (isset($attribs['r'])?$attribs['r']:0.5);
-					if (isset($attribs['cx']) AND (substr($attribs['cx'], -1) != '%')) {
-						$this->svggradients[$this->svggradientid]['mode'] = 'measure';
-					} else {
-						$this->svggradients[$this->svggradientid]['mode'] = 'percentage';
-					}
-					if (isset($attribs['gradientTransform'])) {
-						$this->svggradients[$this->svggradientid]['gradientTransform'] = $this->getSVGTransformMatrix($attribs['gradientTransform']);
-					}
-					$this->svggradients[$this->svggradientid]['coords'] = array($cx, $cy, $fx, $fy, $r);
-					if (isset($attribs['xlink:href']) AND !empty($attribs['xlink:href'])) {
-						// gradient is defined on another place
-						$this->svggradients[$this->svggradientid]['xref'] = substr($attribs['xlink:href'], 1);
-					}
-					break;
-				}
-				case 'stop': {
-					// gradient stops
-					if (substr($attribs['offset'], -1) == '%') {
-						$offset = floatval(substr($attribs['offset'], -1)) / 100;
-					} else {
-						$offset = floatval($attribs['offset']);
-						if ($offset > 1) {
-							$offset /= 100;
-						}
-					}
-					$stop_color = isset($svgstyle['stop-color'])?$this->convertHTMLColorToDec($svgstyle['stop-color']):'black';
-					$opacity = isset($svgstyle['stop-opacity'])?$svgstyle['stop-opacity']:1;
-					$this->svggradients[$this->svggradientid]['stops'][] = array('offset' => $offset, 'color' => $stop_color, 'opacity' => $opacity);
-					break;
-				}
-				// paths
-				case 'path': {
-					$d = trim($attribs['d']);
-					if ($clipping) {
-						$this->SVGTransform($tm);
-						$this->SVGPath($d, 'CNZ');
-					} else {
-						$this->StartTransform();
-						$this->SVGTransform($tm);
-						$obstyle = $this->setSVGStyles($svgstyle, $prev_svgstyle, 0, 0, 1, 1, 'SVGPath', array($d, 'CNZ'));
-						if (!empty($obstyle)) {
-							$this->SVGPath($d, $obstyle);
-						}
-						$this->StopTransform();
-					}
-					break;
-				}
-				// shapes
-				case 'rect': {
-					$x = (isset($attribs['x'])?$this->getHTMLUnitToUnits($attribs['x'], 0, $this->svgunit, false):0);
-					$y = (isset($attribs['y'])?$this->getHTMLUnitToUnits($attribs['y'], 0, $this->svgunit, false):0);
-					$w = (isset($attribs['width'])?$this->getHTMLUnitToUnits($attribs['width'], 0, $this->svgunit, false):0);
-					$h = (isset($attribs['height'])?$this->getHTMLUnitToUnits($attribs['height'], 0, $this->svgunit, false):0);
-					$rx = (isset($attribs['rx'])?$this->getHTMLUnitToUnits($attribs['rx'], 0, $this->svgunit, false):0);
-					$ry = (isset($attribs['ry'])?$this->getHTMLUnitToUnits($attribs['ry'], 0, $this->svgunit, false):$rx);
-					if ($clipping) {
-						$this->SVGTransform($tm);
-						$this->RoundedRectXY($x, $y, $w, $h, $rx, $ry, '1111', 'CNZ', array(), array());
-					} else {
-						$this->StartTransform();
-						$this->SVGTransform($tm);
-						$obstyle = $this->setSVGStyles($svgstyle, $prev_svgstyle, $x, $y, $w, $h, 'RoundedRectXY', array($x, $y, $w, $h, $rx, $ry, '1111', 'CNZ'));
-						if (!empty($obstyle)) {
-							$this->RoundedRectXY($x, $y, $w, $h, $rx, $ry, '1111', $obstyle, array(), array());
-						}
-						$this->StopTransform();
-					}
-					break;
-				}
-				case 'circle': {
-					$cx = (isset($attribs['cx'])?$this->getHTMLUnitToUnits($attribs['cx'], 0, $this->svgunit, false):0);
-					$cy = (isset($attribs['cy'])?$this->getHTMLUnitToUnits($attribs['cy'], 0, $this->svgunit, false):0);
-					$r = (isset($attribs['r'])?$this->getHTMLUnitToUnits($attribs['r'], 0, $this->svgunit, false):0);
-					$x = $cx - $r;
-					$y = $cy - $r;
-					$w = 2 * $r;
-					$h = $w;
-					if ($clipping) {
-						$this->SVGTransform($tm);
-						$this->Circle($cx, $cy, $r, 0, 360, 'CNZ', array(), array(), 8);
-					} else {
-						$this->StartTransform();
-						$this->SVGTransform($tm);
-						$obstyle = $this->setSVGStyles($svgstyle, $prev_svgstyle, $x, $y, $w, $h, 'Circle', array($cx, $cy, $r, 0, 360, 'CNZ'));
-						if (!empty($obstyle)) {
-							$this->Circle($cx, $cy, $r, 0, 360, $obstyle, array(), array(), 8);
-						}
-						$this->StopTransform();
-					}
-					break;
-				}
-				case 'ellipse': {
-					$cx = (isset($attribs['cx'])?$this->getHTMLUnitToUnits($attribs['cx'], 0, $this->svgunit, false):0);
-					$cy = (isset($attribs['cy'])?$this->getHTMLUnitToUnits($attribs['cy'], 0, $this->svgunit, false):0);
-					$rx = (isset($attribs['rx'])?$this->getHTMLUnitToUnits($attribs['rx'], 0, $this->svgunit, false):0);
-					$ry = (isset($attribs['ry'])?$this->getHTMLUnitToUnits($attribs['ry'], 0, $this->svgunit, false):0);
-					$x = $cx - $rx;
-					$y = $cy - $ry;
-					$w = 2 * $rx;
-					$h = 2 * $ry;
-					if ($clipping) {
-						$this->SVGTransform($tm);
-						$this->Ellipse($cx, $cy, $rx, $ry, 0, 0, 360, 'CNZ', array(), array(), 8);
-					} else {
-						$this->StartTransform();
-						$this->SVGTransform($tm);
-						$obstyle = $this->setSVGStyles($svgstyle, $prev_svgstyle, $x, $y, $w, $h, 'Ellipse', array($cx, $cy, $rx, $ry, 0, 0, 360, 'CNZ'));
-						if (!empty($obstyle)) {
-							$this->Ellipse($cx, $cy, $rx, $ry, 0, 0, 360, $obstyle, array(), array(), 8);
-						}
-						$this->StopTransform();
-					}
-					break;
-				}
-				case 'line': {
-					$x1 = (isset($attribs['x1'])?$this->getHTMLUnitToUnits($attribs['x1'], 0, $this->svgunit, false):0);
-					$y1 = (isset($attribs['y1'])?$this->getHTMLUnitToUnits($attribs['y1'], 0, $this->svgunit, false):0);
-					$x2 = (isset($attribs['x2'])?$this->getHTMLUnitToUnits($attribs['x2'], 0, $this->svgunit, false):0);
-					$y2 = (isset($attribs['y2'])?$this->getHTMLUnitToUnits($attribs['y2'], 0, $this->svgunit, false):0);
-					$x = $x1;
-					$y = $y1;
-					$w = abs($x2 - $x1);
-					$h = abs($y2 - $y1);
-					if (!$clipping) {
-						$this->StartTransform();
-						$this->SVGTransform($tm);
-						$obstyle = $this->setSVGStyles($svgstyle, $prev_svgstyle, $x, $y, $w, $h, 'Line', array($x1, $y1, $x2, $y2));
-						$this->Line($x1, $y1, $x2, $y2);
-						$this->StopTransform();
-					}
-					break;
-				}
-				case 'polyline':
-				case 'polygon': {
-					$points = (isset($attribs['points'])?$attribs['points']:'0 0');
-					$points = trim($points);
-					// note that point may use a complex syntax not covered here
-					$points = preg_split('/[\,\s]+/si', $points);
-					if (count($points) < 4) {
-						break;
-					}
-					$p = array();
-					$xmin = 2147483647;
-					$xmax = 0;
-					$ymin = 2147483647;
-					$ymax = 0;
-					foreach ($points as $key => $val) {
-						$p[$key] = $this->getHTMLUnitToUnits($val, 0, $this->svgunit, false);
-						if (($key % 2) == 0) {
-							// X coordinate
-							$xmin = min($xmin, $p[$key]);
-							$xmax = max($xmax, $p[$key]);
-						} else {
-							// Y coordinate
-							$ymin = min($ymin, $p[$key]);
-							$ymax = max($ymax, $p[$key]);
-						}
-					}
-					$x = $xmin;
-					$y = $ymin;
-					$w = ($xmax - $xmin);
-					$h = ($ymax - $ymin);
-					if ($name == 'polyline') {
-						$this->StartTransform();
-						$this->SVGTransform($tm);
-						$obstyle = $this->setSVGStyles($svgstyle, $prev_svgstyle, $x, $y, $w, $h, 'PolyLine', array($p, 'CNZ'));
-						$this->PolyLine($p, 'D', array(), array());
-						$this->StopTransform();
-					} else { // polygon
-						if ($clipping) {
-							$this->SVGTransform($tm);
-							$this->Polygon($p, 'CNZ', array(), array(), true);
-						} else {
-							$this->StartTransform();
-							$this->SVGTransform($tm);
-							$obstyle = $this->setSVGStyles($svgstyle, $prev_svgstyle, $x, $y, $w, $h, 'Polygon', array($p, 'CNZ'));
-							if (!empty($obstyle)) {
-								$this->Polygon($p, $obstyle, array(), array(), true);
-							}
-							$this->StopTransform();
-						}
-					}
-					break;
-				}
-				// image
-				case 'image': {
-					if (!isset($attribs['xlink:href']) OR empty($attribs['xlink:href'])) {
-						break;
-					}
-					$x = (isset($attribs['x'])?$this->getHTMLUnitToUnits($attribs['x'], 0, $this->svgunit, false):0);
-					$y = (isset($attribs['y'])?$this->getHTMLUnitToUnits($attribs['y'], 0, $this->svgunit, false):0);
-					$w = (isset($attribs['width'])?$this->getHTMLUnitToUnits($attribs['width'], 0, $this->svgunit, false):0);
-					$h = (isset($attribs['height'])?$this->getHTMLUnitToUnits($attribs['height'], 0, $this->svgunit, false):0);
-					$img = $attribs['xlink:href'];
-					if (!$clipping) {
-						$this->StartTransform();
-						$this->SVGTransform($tm);
-						$obstyle = $this->setSVGStyles($svgstyle, $prev_svgstyle, $x, $y, $w, $h);
-						// fix image path
-						if (!$this->empty_string($this->svgdir) AND (($img{0} == '.') OR (basename($img) == $img))) {
-							// replace relative path with full server path
-							$img = $this->svgdir.'/'.$img;
-						}
-						if (($img{0} == '/') AND ($_SERVER['DOCUMENT_ROOT'] != '/')) {
-							$findroot = strpos($img, $_SERVER['DOCUMENT_ROOT']);
-							if (($findroot === false) OR ($findroot > 1)) {
-								// replace relative path with full server path
-								$img = $_SERVER['DOCUMENT_ROOT'].$img;
-							}
-						}
-						$img = urldecode($img);
-						$testscrtype = @parse_url($img);
-						if (!isset($testscrtype['query']) OR empty($testscrtype['query'])) {
-							// convert URL to server path
-							$img = str_replace(K_PATH_URL, K_PATH_MAIN, $img);
-						}
-						$this->Image($img, $x, $y, $w, $h);
-						$this->StopTransform();
-					}
-					break;
-				}
-				// text
-				case 'text':
-				case 'tspan': {
-					// only basic support - advanced features must be implemented
-					$x = (isset($attribs['x'])?$this->getHTMLUnitToUnits($attribs['x'], 0, $this->svgunit, false):0);
-					$y = (isset($attribs['y'])?$this->getHTMLUnitToUnits($attribs['y'], 0, $this->svgunit, false):0);
-					$svgstyle['text-color'] = $svgstyle['fill'];
-					$this->svgtext = '';
-					$this->StartTransform();
-					$this->SVGTransform($tm);
-					$obstyle = $this->setSVGStyles($svgstyle, $prev_svgstyle, $x, $y, 1, 1);
-					$this->SetXY($x, $y, true);
-					break;
-				}
-				// use
-				case 'use': {
-					if (isset($attribs['xlink:href'])) {
-						$use = $this->svgdefs[substr($attribs['xlink:href'], 1)];
-						if (isset($attribs['xlink:href'])) {
-							unset($attribs['xlink:href']);
-						}
-						if (isset($attribs['id'])) {
-							unset($attribs['id']);
-						}
-						$attribs = array_merge($use['attribs'], $attribs);
-						$this->startSVGElementHandler($parser, $use['name'], $use['attribs']);
-					}
-					break;
-				}
-				default: {
-					break;
-				}
-			}
-		}
-
-		/**
-		 * Sets the closing SVG element handler function for the XML parser.
-		 * @param resource $parser The first parameter, parser, is a reference to the XML parser calling the handler.
-		 * @param string $name The second parameter, name, contains the name of the element for which this handler is called. If case-folding is in effect for this parser, the element name will be in uppercase letters. 
-		 * @author Nicola Asuni
-		 * @since 5.0.000 (2010-05-02)
-		 * @access protected
-		 */
-		protected function endSVGElementHandler($parser, $name) {
-			switch($name) {
-				case 'defs': {
-					$this->svgdefsmode = false;
-					break;
-				}
-				// clipPath
-				case 'clipPath': {
-					$this->svgclipmode = false;
-					break;
-				}
-				case 'g': {
-					// ungroup: remove last style from array
-					array_pop($this->svgstyles);
-					$this->StopTransform();
-					break;
-				}
-				case 'text':
-				case 'tspan': {
-					// print text
-					$this->Cell(0, 0, trim($this->svgtext), 0, 0, '', 0, '', 0, false, 'L', 'T');
-					$this->StopTransform();
-					break;
-				}
-				default: {
-					break;
-				}
-			}
-		}
-
-		/**
-		 * Sets the character data handler function for the XML parser.
-		 * @param resource $parser The first parameter, parser, is a reference to the XML parser calling the handler.
-		 * @param string $data The second parameter, data, contains the character data as a string. 
-		 * @author Nicola Asuni
-		 * @since 5.0.000 (2010-05-02)
-		 * @access protected
-		 */
-		protected function segSVGContentHandler($parser, $data) {
-			$this->svgtext .= $data;
-		}
-
-	} // END OF TCPDF CLASS
-}
-//============================================================+
-// END OF FILE
-//============================================================+
-?>
diff --git a/html2pdf_v4.03/_tcpdf_5.0.002/unicode_data.php b/html2pdf_v4.03/_tcpdf_5.0.002/unicode_data.php
deleted file mode 100644
index ed863a2a..00000000
--- a/html2pdf_v4.03/_tcpdf_5.0.002/unicode_data.php
+++ /dev/null
@@ -1,18360 +0,0 @@
-<?php
-//============================================================+
-// File name   : unicode_data.php
-// Begin       : 2008-01-01
-// Last Update : 2009-08-17
-// License     : GNU LGPL (http://www.gnu.org/copyleft/lesser.html)
-// 	----------------------------------------------------------------------------
-//  Copyright (C) 2002-2009  Nicola Asuni - Tecnick.com S.r.l.
-// 	
-// 	This program is free software: you can redistribute it and/or modify
-// 	it under the terms of the GNU Lesser General Public License as published by
-// 	the Free Software Foundation, either version 2.1 of the License, or
-// 	(at your option) any later version.
-// 	
-// 	This program is distributed in the hope that it will be useful,
-// 	but WITHOUT ANY WARRANTY; without even the implied warranty of
-// 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// 	GNU Lesser General Public License for more details.
-// 	
-// 	You should have received a copy of the GNU Lesser General Public License
-// 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-// 	
-// 	See LICENSE.TXT file for more information.
-//  ----------------------------------------------------------------------------
-//
-// Description : Unicode Include file for TCPDF.
-//
-// Author: Nicola Asuni
-//
-// (c) Copyright:
-//               Nicola Asuni
-//               Tecnick.com s.r.l.
-//               Via Della Pace, 11
-//               09044 Quartucciu (CA)
-//               ITALY
-//               www.tecnick.com
-//               info@tecnick.com
-//============================================================+
-// THANKS TO
-// Efthimios Mavrogeorgiadis
-// Saleh AlMatrafe
-
-/**
- * Unicode Include file for TCPDF.
- * @author Nicola Asuni
- * @copyright 2004-2009 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
- * @package com.tecnick.tcpdf
- * @link http://www.tcpdf.org
- * @license http://www.gnu.org/copyleft/lesser.html LGPL
- * @since 2.1.000 (2008-01-08)
-*/
-
-/**
-* Left-to-Right Mark
-*/
-define('K_LRM', 8206);
-/**
-* Right-to-Left Mark
-*/
-define('K_RLM', 8207);
-/**
-* Left-to-Right Embedding
-*/
-define('K_LRE', 8234);
-/**
-* Right-to-Left Embedding
-*/
-define('K_RLE', 8235);
-/**
-* Pop Directional Format
-*/
-define('K_PDF', 8236);
-/**
-* Left-to-Right Override
-*/
-define('K_LRO', 8237);
-/**
-* Right-to-Left Override
-*/
-define('K_RLO', 8238);
-
-/*
- * Pattern to test RTL (Righ-To-Left) strings using regular expressions.
- */
-define('K_RE_PATTERN_RTL', "/(
-	  \xD6\xBE                                             # R
-	| \xD7[\x80\x83\x86\x90-\xAA\xB0-\xB4]                 # R
-	| \xDF[\x80-\xAA\xB4\xB5\xBA]                          # R
-	| \xE2\x80\x8F                                         # R
-	| \xEF\xAC[\x9D\x9F\xA0-\xA8\xAA-\xB6\xB8-\xBC\xBE]    # R
-	| \xEF\xAD[\x80\x81\x83\x84\x86-\x8F]                  # R
-	| \xF0\x90\xA0[\x80-\x85\x88\x8A-\xB5\xB7\xB8\xBC\xBF] # R
-	| \xF0\x90\xA4[\x80-\x99]                              # R
-	| \xF0\x90\xA8[\x80\x90-\x93\x95-\x97\x99-\xB3]        # R
-	| \xF0\x90\xA9[\x80-\x87\x90-\x98]                     # R
-	| \xE2\x80[\xAB\xAE]                                   # RLE & RLO
-	)/x");
-
-/*
- * Pattern to test Arabic strings using regular expressions.
- * source: http://www.w3.org/International/questions/qa-forms-utf-8
- */
-define("K_RE_PATTERN_ARABIC", "/(
-		  \xD8[\x80-\x83\x8B\x8D\x9B\x9E\x9F\xA1-\xBA]  # AL
-		| \xD9[\x80-\x8A\xAD-\xAF\xB1-\xBF]             # AL
-		| \xDA[\x80-\xBF]                               # AL
-		| \xDB[\x80-\x95\x9D\xA5\xA6\xAE\xAF\xBA-\xBF]  # AL
-		| \xDC[\x80-\x8D\x90\x92-\xAF]                  # AL
-		| \xDD[\x8D-\xAD]                               # AL
-		| \xDE[\x80-\xA5\xB1]                           # AL
-		| \xEF\xAD[\x90-\xBF]                           # AL
-		| \xEF\xAE[\x80-\xB1]                           # AL
-		| \xEF\xAF[\x93-\xBF]                           # AL
-		| \xEF[\xB0-\xB3][\x80-\xBF]                    # AL
-		| \xEF\xB4[\x80-\xBD]                           # AL
-		| \xEF\xB5[\x90-\xBF]                           # AL
-		| \xEF\xB6[\x80-\x8F\x92-\xBF]                  # AL
-		| \xEF\xB7[\x80-\x87\xB0-\xBC]                  # AL
-		| \xEF\xB9[\xB0-\xB4\xB6-\xBF]                  # AL
-		| \xEF\xBA[\x80-\xBF]                           # AL
-		| \xEF\xBB[\x80-\xBC]                           # AL
-		| \xD9[\xA0-\xA9\xAB\xAC]                       # AN
-		)/x");
-
-/**
- * Array of unicode types
- */
-global $unicode;
-$unicode = array(
-0=>'BN',
-1=>'BN',
-2=>'BN',
-3=>'BN',
-4=>'BN',
-5=>'BN',
-6=>'BN',
-7=>'BN',
-8=>'BN',
-9=>'S',
-10=>'B',
-11=>'S',
-12=>'WS',
-13=>'B',
-14=>'BN',
-15=>'BN',
-16=>'BN',
-17=>'BN',
-18=>'BN',
-19=>'BN',
-20=>'BN',
-21=>'BN',
-22=>'BN',
-23=>'BN',
-24=>'BN',
-25=>'BN',
-26=>'BN',
-27=>'BN',
-28=>'B',
-29=>'B',
-30=>'B',
-31=>'S',
-32=>'WS',
-33=>'ON',
-34=>'ON',
-35=>'ET',
-36=>'ET',
-37=>'ET',
-38=>'ON',
-39=>'ON',
-40=>'ON',
-41=>'ON',
-42=>'ON',
-43=>'ES',
-44=>'CS',
-45=>'ES',
-46=>'CS',
-47=>'CS',
-48=>'EN',
-49=>'EN',
-50=>'EN',
-51=>'EN',
-52=>'EN',
-53=>'EN',
-54=>'EN',
-55=>'EN',
-56=>'EN',
-57=>'EN',
-58=>'CS',
-59=>'ON',
-60=>'ON',
-61=>'ON',
-62=>'ON',
-63=>'ON',
-64=>'ON',
-65=>'L',
-66=>'L',
-67=>'L',
-68=>'L',
-69=>'L',
-70=>'L',
-71=>'L',
-72=>'L',
-73=>'L',
-74=>'L',
-75=>'L',
-76=>'L',
-77=>'L',
-78=>'L',
-79=>'L',
-80=>'L',
-81=>'L',
-82=>'L',
-83=>'L',
-84=>'L',
-85=>'L',
-86=>'L',
-87=>'L',
-88=>'L',
-89=>'L',
-90=>'L',
-91=>'ON',
-92=>'ON',
-93=>'ON',
-94=>'ON',
-95=>'ON',
-96=>'ON',
-97=>'L',
-98=>'L',
-99=>'L',
-100=>'L',
-101=>'L',
-102=>'L',
-103=>'L',
-104=>'L',
-105=>'L',
-106=>'L',
-107=>'L',
-108=>'L',
-109=>'L',
-110=>'L',
-111=>'L',
-112=>'L',
-113=>'L',
-114=>'L',
-115=>'L',
-116=>'L',
-117=>'L',
-118=>'L',
-119=>'L',
-120=>'L',
-121=>'L',
-122=>'L',
-123=>'ON',
-124=>'ON',
-125=>'ON',
-126=>'ON',
-127=>'BN',
-128=>'BN',
-129=>'BN',
-130=>'BN',
-131=>'BN',
-132=>'BN',
-133=>'B',
-134=>'BN',
-135=>'BN',
-136=>'BN',
-137=>'BN',
-138=>'BN',
-139=>'BN',
-140=>'BN',
-141=>'BN',
-142=>'BN',
-143=>'BN',
-144=>'BN',
-145=>'BN',
-146=>'BN',
-147=>'BN',
-148=>'BN',
-149=>'BN',
-150=>'BN',
-151=>'BN',
-152=>'BN',
-153=>'BN',
-154=>'BN',
-155=>'BN',
-156=>'BN',
-157=>'BN',
-158=>'BN',
-159=>'BN',
-160=>'CS',
-161=>'ON',
-162=>'ET',
-163=>'ET',
-164=>'ET',
-165=>'ET',
-166=>'ON',
-167=>'ON',
-168=>'ON',
-169=>'ON',
-170=>'L',
-171=>'ON',
-172=>'ON',
-173=>'BN',
-174=>'ON',
-175=>'ON',
-176=>'ET',
-177=>'ET',
-178=>'EN',
-179=>'EN',
-180=>'ON',
-181=>'L',
-182=>'ON',
-183=>'ON',
-184=>'ON',
-185=>'EN',
-186=>'L',
-187=>'ON',
-188=>'ON',
-189=>'ON',
-190=>'ON',
-191=>'ON',
-192=>'L',
-193=>'L',
-194=>'L',
-195=>'L',
-196=>'L',
-197=>'L',
-198=>'L',
-199=>'L',
-200=>'L',
-201=>'L',
-202=>'L',
-203=>'L',
-204=>'L',
-205=>'L',
-206=>'L',
-207=>'L',
-208=>'L',
-209=>'L',
-210=>'L',
-211=>'L',
-212=>'L',
-213=>'L',
-214=>'L',
-215=>'ON',
-216=>'L',
-217=>'L',
-218=>'L',
-219=>'L',
-220=>'L',
-221=>'L',
-222=>'L',
-223=>'L',
-224=>'L',
-225=>'L',
-226=>'L',
-227=>'L',
-228=>'L',
-229=>'L',
-230=>'L',
-231=>'L',
-232=>'L',
-233=>'L',
-234=>'L',
-235=>'L',
-236=>'L',
-237=>'L',
-238=>'L',
-239=>'L',
-240=>'L',
-241=>'L',
-242=>'L',
-243=>'L',
-244=>'L',
-245=>'L',
-246=>'L',
-247=>'ON',
-248=>'L',
-249=>'L',
-250=>'L',
-251=>'L',
-252=>'L',
-253=>'L',
-254=>'L',
-255=>'L',
-256=>'L',
-257=>'L',
-258=>'L',
-259=>'L',
-260=>'L',
-261=>'L',
-262=>'L',
-263=>'L',
-264=>'L',
-265=>'L',
-266=>'L',
-267=>'L',
-268=>'L',
-269=>'L',
-270=>'L',
-271=>'L',
-272=>'L',
-273=>'L',
-274=>'L',
-275=>'L',
-276=>'L',
-277=>'L',
-278=>'L',
-279=>'L',
-280=>'L',
-281=>'L',
-282=>'L',
-283=>'L',
-284=>'L',
-285=>'L',
-286=>'L',
-287=>'L',
-288=>'L',
-289=>'L',
-290=>'L',
-291=>'L',
-292=>'L',
-293=>'L',
-294=>'L',
-295=>'L',
-296=>'L',
-297=>'L',
-298=>'L',
-299=>'L',
-300=>'L',
-301=>'L',
-302=>'L',
-303=>'L',
-304=>'L',
-305=>'L',
-306=>'L',
-307=>'L',
-308=>'L',
-309=>'L',
-310=>'L',
-311=>'L',
-312=>'L',
-313=>'L',
-314=>'L',
-315=>'L',
-316=>'L',
-317=>'L',
-318=>'L',
-319=>'L',
-320=>'L',
-321=>'L',
-322=>'L',
-323=>'L',
-324=>'L',
-325=>'L',
-326=>'L',
-327=>'L',
-328=>'L',
-329=>'L',
-330=>'L',
-331=>'L',
-332=>'L',
-333=>'L',
-334=>'L',
-335=>'L',
-336=>'L',
-337=>'L',
-338=>'L',
-339=>'L',
-340=>'L',
-341=>'L',
-342=>'L',
-343=>'L',
-344=>'L',
-345=>'L',
-346=>'L',
-347=>'L',
-348=>'L',
-349=>'L',
-350=>'L',
-351=>'L',
-352=>'L',
-353=>'L',
-354=>'L',
-355=>'L',
-356=>'L',
-357=>'L',
-358=>'L',
-359=>'L',
-360=>'L',
-361=>'L',
-362=>'L',
-363=>'L',
-364=>'L',
-365=>'L',
-366=>'L',
-367=>'L',
-368=>'L',
-369=>'L',
-370=>'L',
-371=>'L',
-372=>'L',
-373=>'L',
-374=>'L',
-375=>'L',
-376=>'L',
-377=>'L',
-378=>'L',
-379=>'L',
-380=>'L',
-381=>'L',
-382=>'L',
-383=>'L',
-384=>'L',
-385=>'L',
-386=>'L',
-387=>'L',
-388=>'L',
-389=>'L',
-390=>'L',
-391=>'L',
-392=>'L',
-393=>'L',
-394=>'L',
-395=>'L',
-396=>'L',
-397=>'L',
-398=>'L',
-399=>'L',
-400=>'L',
-401=>'L',
-402=>'L',
-403=>'L',
-404=>'L',
-405=>'L',
-406=>'L',
-407=>'L',
-408=>'L',
-409=>'L',
-410=>'L',
-411=>'L',
-412=>'L',
-413=>'L',
-414=>'L',
-415=>'L',
-416=>'L',
-417=>'L',
-418=>'L',
-419=>'L',
-420=>'L',
-421=>'L',
-422=>'L',
-423=>'L',
-424=>'L',
-425=>'L',
-426=>'L',
-427=>'L',
-428=>'L',
-429=>'L',
-430=>'L',
-431=>'L',
-432=>'L',
-433=>'L',
-434=>'L',
-435=>'L',
-436=>'L',
-437=>'L',
-438=>'L',
-439=>'L',
-440=>'L',
-441=>'L',
-442=>'L',
-443=>'L',
-444=>'L',
-445=>'L',
-446=>'L',
-447=>'L',
-448=>'L',
-449=>'L',
-450=>'L',
-451=>'L',
-452=>'L',
-453=>'L',
-454=>'L',
-455=>'L',
-456=>'L',
-457=>'L',
-458=>'L',
-459=>'L',
-460=>'L',
-461=>'L',
-462=>'L',
-463=>'L',
-464=>'L',
-465=>'L',
-466=>'L',
-467=>'L',
-468=>'L',
-469=>'L',
-470=>'L',
-471=>'L',
-472=>'L',
-473=>'L',
-474=>'L',
-475=>'L',
-476=>'L',
-477=>'L',
-478=>'L',
-479=>'L',
-480=>'L',
-481=>'L',
-482=>'L',
-483=>'L',
-484=>'L',
-485=>'L',
-486=>'L',
-487=>'L',
-488=>'L',
-489=>'L',
-490=>'L',
-491=>'L',
-492=>'L',
-493=>'L',
-494=>'L',
-495=>'L',
-496=>'L',
-497=>'L',
-498=>'L',
-499=>'L',
-500=>'L',
-501=>'L',
-502=>'L',
-503=>'L',
-504=>'L',
-505=>'L',
-506=>'L',
-507=>'L',
-508=>'L',
-509=>'L',
-510=>'L',
-511=>'L',
-512=>'L',
-513=>'L',
-514=>'L',
-515=>'L',
-516=>'L',
-517=>'L',
-518=>'L',
-519=>'L',
-520=>'L',
-521=>'L',
-522=>'L',
-523=>'L',
-524=>'L',
-525=>'L',
-526=>'L',
-527=>'L',
-528=>'L',
-529=>'L',
-530=>'L',
-531=>'L',
-532=>'L',
-533=>'L',
-534=>'L',
-535=>'L',
-536=>'L',
-537=>'L',
-538=>'L',
-539=>'L',
-540=>'L',
-541=>'L',
-542=>'L',
-543=>'L',
-544=>'L',
-545=>'L',
-546=>'L',
-547=>'L',
-548=>'L',
-549=>'L',
-550=>'L',
-551=>'L',
-552=>'L',
-553=>'L',
-554=>'L',
-555=>'L',
-556=>'L',
-557=>'L',
-558=>'L',
-559=>'L',
-560=>'L',
-561=>'L',
-562=>'L',
-563=>'L',
-564=>'L',
-565=>'L',
-566=>'L',
-567=>'L',
-568=>'L',
-569=>'L',
-570=>'L',
-571=>'L',
-572=>'L',
-573=>'L',
-574=>'L',
-575=>'L',
-576=>'L',
-577=>'L',
-578=>'L',
-579=>'L',
-580=>'L',
-581=>'L',
-582=>'L',
-583=>'L',
-584=>'L',
-585=>'L',
-586=>'L',
-587=>'L',
-588=>'L',
-589=>'L',
-590=>'L',
-591=>'L',
-592=>'L',
-593=>'L',
-594=>'L',
-595=>'L',
-596=>'L',
-597=>'L',
-598=>'L',
-599=>'L',
-600=>'L',
-601=>'L',
-602=>'L',
-603=>'L',
-604=>'L',
-605=>'L',
-606=>'L',
-607=>'L',
-608=>'L',
-609=>'L',
-610=>'L',
-611=>'L',
-612=>'L',
-613=>'L',
-614=>'L',
-615=>'L',
-616=>'L',
-617=>'L',
-618=>'L',
-619=>'L',
-620=>'L',
-621=>'L',
-622=>'L',
-623=>'L',
-624=>'L',
-625=>'L',
-626=>'L',
-627=>'L',
-628=>'L',
-629=>'L',
-630=>'L',
-631=>'L',
-632=>'L',
-633=>'L',
-634=>'L',
-635=>'L',
-636=>'L',
-637=>'L',
-638=>'L',
-639=>'L',
-640=>'L',
-641=>'L',
-642=>'L',
-643=>'L',
-644=>'L',
-645=>'L',
-646=>'L',
-647=>'L',
-648=>'L',
-649=>'L',
-650=>'L',
-651=>'L',
-652=>'L',
-653=>'L',
-654=>'L',
-655=>'L',
-656=>'L',
-657=>'L',
-658=>'L',
-659=>'L',
-660=>'L',
-661=>'L',
-662=>'L',
-663=>'L',
-664=>'L',
-665=>'L',
-666=>'L',
-667=>'L',
-668=>'L',
-669=>'L',
-670=>'L',
-671=>'L',
-672=>'L',
-673=>'L',
-674=>'L',
-675=>'L',
-676=>'L',
-677=>'L',
-678=>'L',
-679=>'L',
-680=>'L',
-681=>'L',
-682=>'L',
-683=>'L',
-684=>'L',
-685=>'L',
-686=>'L',
-687=>'L',
-688=>'L',
-689=>'L',
-690=>'L',
-691=>'L',
-692=>'L',
-693=>'L',
-694=>'L',
-695=>'L',
-696=>'L',
-697=>'ON',
-698=>'ON',
-699=>'L',
-700=>'L',
-701=>'L',
-702=>'L',
-703=>'L',
-704=>'L',
-705=>'L',
-706=>'ON',
-707=>'ON',
-708=>'ON',
-709=>'ON',
-710=>'ON',
-711=>'ON',
-712=>'ON',
-713=>'ON',
-714=>'ON',
-715=>'ON',
-716=>'ON',
-717=>'ON',
-718=>'ON',
-719=>'ON',
-720=>'L',
-721=>'L',
-722=>'ON',
-723=>'ON',
-724=>'ON',
-725=>'ON',
-726=>'ON',
-727=>'ON',
-728=>'ON',
-729=>'ON',
-730=>'ON',
-731=>'ON',
-732=>'ON',
-733=>'ON',
-734=>'ON',
-735=>'ON',
-736=>'L',
-737=>'L',
-738=>'L',
-739=>'L',
-740=>'L',
-741=>'ON',
-742=>'ON',
-743=>'ON',
-744=>'ON',
-745=>'ON',
-746=>'ON',
-747=>'ON',
-748=>'ON',
-749=>'ON',
-750=>'L',
-751=>'ON',
-752=>'ON',
-753=>'ON',
-754=>'ON',
-755=>'ON',
-756=>'ON',
-757=>'ON',
-758=>'ON',
-759=>'ON',
-760=>'ON',
-761=>'ON',
-762=>'ON',
-763=>'ON',
-764=>'ON',
-765=>'ON',
-766=>'ON',
-767=>'ON',
-768=>'NSM',
-769=>'NSM',
-770=>'NSM',
-771=>'NSM',
-772=>'NSM',
-773=>'NSM',
-774=>'NSM',
-775=>'NSM',
-776=>'NSM',
-777=>'NSM',
-778=>'NSM',
-779=>'NSM',
-780=>'NSM',
-781=>'NSM',
-782=>'NSM',
-783=>'NSM',
-784=>'NSM',
-785=>'NSM',
-786=>'NSM',
-787=>'NSM',
-788=>'NSM',
-789=>'NSM',
-790=>'NSM',
-791=>'NSM',
-792=>'NSM',
-793=>'NSM',
-794=>'NSM',
-795=>'NSM',
-796=>'NSM',
-797=>'NSM',
-798=>'NSM',
-799=>'NSM',
-800=>'NSM',
-801=>'NSM',
-802=>'NSM',
-803=>'NSM',
-804=>'NSM',
-805=>'NSM',
-806=>'NSM',
-807=>'NSM',
-808=>'NSM',
-809=>'NSM',
-810=>'NSM',
-811=>'NSM',
-812=>'NSM',
-813=>'NSM',
-814=>'NSM',
-815=>'NSM',
-816=>'NSM',
-817=>'NSM',
-818=>'NSM',
-819=>'NSM',
-820=>'NSM',
-821=>'NSM',
-822=>'NSM',
-823=>'NSM',
-824=>'NSM',
-825=>'NSM',
-826=>'NSM',
-827=>'NSM',
-828=>'NSM',
-829=>'NSM',
-830=>'NSM',
-831=>'NSM',
-832=>'NSM',
-833=>'NSM',
-834=>'NSM',
-835=>'NSM',
-836=>'NSM',
-837=>'NSM',
-838=>'NSM',
-839=>'NSM',
-840=>'NSM',
-841=>'NSM',
-842=>'NSM',
-843=>'NSM',
-844=>'NSM',
-845=>'NSM',
-846=>'NSM',
-847=>'NSM',
-848=>'NSM',
-849=>'NSM',
-850=>'NSM',
-851=>'NSM',
-852=>'NSM',
-853=>'NSM',
-854=>'NSM',
-855=>'NSM',
-856=>'NSM',
-857=>'NSM',
-858=>'NSM',
-859=>'NSM',
-860=>'NSM',
-861=>'NSM',
-862=>'NSM',
-863=>'NSM',
-864=>'NSM',
-865=>'NSM',
-866=>'NSM',
-867=>'NSM',
-868=>'NSM',
-869=>'NSM',
-870=>'NSM',
-871=>'NSM',
-872=>'NSM',
-873=>'NSM',
-874=>'NSM',
-875=>'NSM',
-876=>'NSM',
-877=>'NSM',
-878=>'NSM',
-879=>'NSM',
-884=>'ON',
-885=>'ON',
-890=>'L',
-891=>'L',
-892=>'L',
-893=>'L',
-894=>'ON',
-900=>'ON',
-901=>'ON',
-902=>'L',
-903=>'ON',
-904=>'L',
-905=>'L',
-906=>'L',
-908=>'L',
-910=>'L',
-911=>'L',
-912=>'L',
-913=>'L',
-914=>'L',
-915=>'L',
-916=>'L',
-917=>'L',
-918=>'L',
-919=>'L',
-920=>'L',
-921=>'L',
-922=>'L',
-923=>'L',
-924=>'L',
-925=>'L',
-926=>'L',
-927=>'L',
-928=>'L',
-929=>'L',
-931=>'L',
-932=>'L',
-933=>'L',
-934=>'L',
-935=>'L',
-936=>'L',
-937=>'L',
-938=>'L',
-939=>'L',
-940=>'L',
-941=>'L',
-942=>'L',
-943=>'L',
-944=>'L',
-945=>'L',
-946=>'L',
-947=>'L',
-948=>'L',
-949=>'L',
-950=>'L',
-951=>'L',
-952=>'L',
-953=>'L',
-954=>'L',
-955=>'L',
-956=>'L',
-957=>'L',
-958=>'L',
-959=>'L',
-960=>'L',
-961=>'L',
-962=>'L',
-963=>'L',
-964=>'L',
-965=>'L',
-966=>'L',
-967=>'L',
-968=>'L',
-969=>'L',
-970=>'L',
-971=>'L',
-972=>'L',
-973=>'L',
-974=>'L',
-976=>'L',
-977=>'L',
-978=>'L',
-979=>'L',
-980=>'L',
-981=>'L',
-982=>'L',
-983=>'L',
-984=>'L',
-985=>'L',
-986=>'L',
-987=>'L',
-988=>'L',
-989=>'L',
-990=>'L',
-991=>'L',
-992=>'L',
-993=>'L',
-994=>'L',
-995=>'L',
-996=>'L',
-997=>'L',
-998=>'L',
-999=>'L',
-1000=>'L',
-1001=>'L',
-1002=>'L',
-1003=>'L',
-1004=>'L',
-1005=>'L',
-1006=>'L',
-1007=>'L',
-1008=>'L',
-1009=>'L',
-1010=>'L',
-1011=>'L',
-1012=>'L',
-1013=>'L',
-1014=>'ON',
-1015=>'L',
-1016=>'L',
-1017=>'L',
-1018=>'L',
-1019=>'L',
-1020=>'L',
-1021=>'L',
-1022=>'L',
-1023=>'L',
-1024=>'L',
-1025=>'L',
-1026=>'L',
-1027=>'L',
-1028=>'L',
-1029=>'L',
-1030=>'L',
-1031=>'L',
-1032=>'L',
-1033=>'L',
-1034=>'L',
-1035=>'L',
-1036=>'L',
-1037=>'L',
-1038=>'L',
-1039=>'L',
-1040=>'L',
-1041=>'L',
-1042=>'L',
-1043=>'L',
-1044=>'L',
-1045=>'L',
-1046=>'L',
-1047=>'L',
-1048=>'L',
-1049=>'L',
-1050=>'L',
-1051=>'L',
-1052=>'L',
-1053=>'L',
-1054=>'L',
-1055=>'L',
-1056=>'L',
-1057=>'L',
-1058=>'L',
-1059=>'L',
-1060=>'L',
-1061=>'L',
-1062=>'L',
-1063=>'L',
-1064=>'L',
-1065=>'L',
-1066=>'L',
-1067=>'L',
-1068=>'L',
-1069=>'L',
-1070=>'L',
-1071=>'L',
-1072=>'L',
-1073=>'L',
-1074=>'L',
-1075=>'L',
-1076=>'L',
-1077=>'L',
-1078=>'L',
-1079=>'L',
-1080=>'L',
-1081=>'L',
-1082=>'L',
-1083=>'L',
-1084=>'L',
-1085=>'L',
-1086=>'L',
-1087=>'L',
-1088=>'L',
-1089=>'L',
-1090=>'L',
-1091=>'L',
-1092=>'L',
-1093=>'L',
-1094=>'L',
-1095=>'L',
-1096=>'L',
-1097=>'L',
-1098=>'L',
-1099=>'L',
-1100=>'L',
-1101=>'L',
-1102=>'L',
-1103=>'L',
-1104=>'L',
-1105=>'L',
-1106=>'L',
-1107=>'L',
-1108=>'L',
-1109=>'L',
-1110=>'L',
-1111=>'L',
-1112=>'L',
-1113=>'L',
-1114=>'L',
-1115=>'L',
-1116=>'L',
-1117=>'L',
-1118=>'L',
-1119=>'L',
-1120=>'L',
-1121=>'L',
-1122=>'L',
-1123=>'L',
-1124=>'L',
-1125=>'L',
-1126=>'L',
-1127=>'L',
-1128=>'L',
-1129=>'L',
-1130=>'L',
-1131=>'L',
-1132=>'L',
-1133=>'L',
-1134=>'L',
-1135=>'L',
-1136=>'L',
-1137=>'L',
-1138=>'L',
-1139=>'L',
-1140=>'L',
-1141=>'L',
-1142=>'L',
-1143=>'L',
-1144=>'L',
-1145=>'L',
-1146=>'L',
-1147=>'L',
-1148=>'L',
-1149=>'L',
-1150=>'L',
-1151=>'L',
-1152=>'L',
-1153=>'L',
-1154=>'L',
-1155=>'NSM',
-1156=>'NSM',
-1157=>'NSM',
-1158=>'NSM',
-1160=>'NSM',
-1161=>'NSM',
-1162=>'L',
-1163=>'L',
-1164=>'L',
-1165=>'L',
-1166=>'L',
-1167=>'L',
-1168=>'L',
-1169=>'L',
-1170=>'L',
-1171=>'L',
-1172=>'L',
-1173=>'L',
-1174=>'L',
-1175=>'L',
-1176=>'L',
-1177=>'L',
-1178=>'L',
-1179=>'L',
-1180=>'L',
-1181=>'L',
-1182=>'L',
-1183=>'L',
-1184=>'L',
-1185=>'L',
-1186=>'L',
-1187=>'L',
-1188=>'L',
-1189=>'L',
-1190=>'L',
-1191=>'L',
-1192=>'L',
-1193=>'L',
-1194=>'L',
-1195=>'L',
-1196=>'L',
-1197=>'L',
-1198=>'L',
-1199=>'L',
-1200=>'L',
-1201=>'L',
-1202=>'L',
-1203=>'L',
-1204=>'L',
-1205=>'L',
-1206=>'L',
-1207=>'L',
-1208=>'L',
-1209=>'L',
-1210=>'L',
-1211=>'L',
-1212=>'L',
-1213=>'L',
-1214=>'L',
-1215=>'L',
-1216=>'L',
-1217=>'L',
-1218=>'L',
-1219=>'L',
-1220=>'L',
-1221=>'L',
-1222=>'L',
-1223=>'L',
-1224=>'L',
-1225=>'L',
-1226=>'L',
-1227=>'L',
-1228=>'L',
-1229=>'L',
-1230=>'L',
-1231=>'L',
-1232=>'L',
-1233=>'L',
-1234=>'L',
-1235=>'L',
-1236=>'L',
-1237=>'L',
-1238=>'L',
-1239=>'L',
-1240=>'L',
-1241=>'L',
-1242=>'L',
-1243=>'L',
-1244=>'L',
-1245=>'L',
-1246=>'L',
-1247=>'L',
-1248=>'L',
-1249=>'L',
-1250=>'L',
-1251=>'L',
-1252=>'L',
-1253=>'L',
-1254=>'L',
-1255=>'L',
-1256=>'L',
-1257=>'L',
-1258=>'L',
-1259=>'L',
-1260=>'L',
-1261=>'L',
-1262=>'L',
-1263=>'L',
-1264=>'L',
-1265=>'L',
-1266=>'L',
-1267=>'L',
-1268=>'L',
-1269=>'L',
-1270=>'L',
-1271=>'L',
-1272=>'L',
-1273=>'L',
-1274=>'L',
-1275=>'L',
-1276=>'L',
-1277=>'L',
-1278=>'L',
-1279=>'L',
-1280=>'L',
-1281=>'L',
-1282=>'L',
-1283=>'L',
-1284=>'L',
-1285=>'L',
-1286=>'L',
-1287=>'L',
-1288=>'L',
-1289=>'L',
-1290=>'L',
-1291=>'L',
-1292=>'L',
-1293=>'L',
-1294=>'L',
-1295=>'L',
-1296=>'L',
-1297=>'L',
-1298=>'L',
-1299=>'L',
-1329=>'L',
-1330=>'L',
-1331=>'L',
-1332=>'L',
-1333=>'L',
-1334=>'L',
-1335=>'L',
-1336=>'L',
-1337=>'L',
-1338=>'L',
-1339=>'L',
-1340=>'L',
-1341=>'L',
-1342=>'L',
-1343=>'L',
-1344=>'L',
-1345=>'L',
-1346=>'L',
-1347=>'L',
-1348=>'L',
-1349=>'L',
-1350=>'L',
-1351=>'L',
-1352=>'L',
-1353=>'L',
-1354=>'L',
-1355=>'L',
-1356=>'L',
-1357=>'L',
-1358=>'L',
-1359=>'L',
-1360=>'L',
-1361=>'L',
-1362=>'L',
-1363=>'L',
-1364=>'L',
-1365=>'L',
-1366=>'L',
-1369=>'L',
-1370=>'L',
-1371=>'L',
-1372=>'L',
-1373=>'L',
-1374=>'L',
-1375=>'L',
-1377=>'L',
-1378=>'L',
-1379=>'L',
-1380=>'L',
-1381=>'L',
-1382=>'L',
-1383=>'L',
-1384=>'L',
-1385=>'L',
-1386=>'L',
-1387=>'L',
-1388=>'L',
-1389=>'L',
-1390=>'L',
-1391=>'L',
-1392=>'L',
-1393=>'L',
-1394=>'L',
-1395=>'L',
-1396=>'L',
-1397=>'L',
-1398=>'L',
-1399=>'L',
-1400=>'L',
-1401=>'L',
-1402=>'L',
-1403=>'L',
-1404=>'L',
-1405=>'L',
-1406=>'L',
-1407=>'L',
-1408=>'L',
-1409=>'L',
-1410=>'L',
-1411=>'L',
-1412=>'L',
-1413=>'L',
-1414=>'L',
-1415=>'L',
-1417=>'L',
-1418=>'ON',
-1425=>'NSM',
-1426=>'NSM',
-1427=>'NSM',
-1428=>'NSM',
-1429=>'NSM',
-1430=>'NSM',
-1431=>'NSM',
-1432=>'NSM',
-1433=>'NSM',
-1434=>'NSM',
-1435=>'NSM',
-1436=>'NSM',
-1437=>'NSM',
-1438=>'NSM',
-1439=>'NSM',
-1440=>'NSM',
-1441=>'NSM',
-1442=>'NSM',
-1443=>'NSM',
-1444=>'NSM',
-1445=>'NSM',
-1446=>'NSM',
-1447=>'NSM',
-1448=>'NSM',
-1449=>'NSM',
-1450=>'NSM',
-1451=>'NSM',
-1452=>'NSM',
-1453=>'NSM',
-1454=>'NSM',
-1455=>'NSM',
-1456=>'NSM',
-1457=>'NSM',
-1458=>'NSM',
-1459=>'NSM',
-1460=>'NSM',
-1461=>'NSM',
-1462=>'NSM',
-1463=>'NSM',
-1464=>'NSM',
-1465=>'NSM',
-1466=>'NSM',
-1467=>'NSM',
-1468=>'NSM',
-1469=>'NSM',
-1470=>'R',
-1471=>'NSM',
-1472=>'R',
-1473=>'NSM',
-1474=>'NSM',
-1475=>'R',
-1476=>'NSM',
-1477=>'NSM',
-1478=>'R',
-1479=>'NSM',
-1488=>'R',
-1489=>'R',
-1490=>'R',
-1491=>'R',
-1492=>'R',
-1493=>'R',
-1494=>'R',
-1495=>'R',
-1496=>'R',
-1497=>'R',
-1498=>'R',
-1499=>'R',
-1500=>'R',
-1501=>'R',
-1502=>'R',
-1503=>'R',
-1504=>'R',
-1505=>'R',
-1506=>'R',
-1507=>'R',
-1508=>'R',
-1509=>'R',
-1510=>'R',
-1511=>'R',
-1512=>'R',
-1513=>'R',
-1514=>'R',
-1520=>'R',
-1521=>'R',
-1522=>'R',
-1523=>'R',
-1524=>'R',
-1536=>'AL',
-1537=>'AL',
-1538=>'AL',
-1539=>'AL',
-1547=>'AL',
-1548=>'CS',
-1549=>'AL',
-1550=>'ON',
-1551=>'ON',
-1552=>'NSM',
-1553=>'NSM',
-1554=>'NSM',
-1555=>'NSM',
-1556=>'NSM',
-1557=>'NSM',
-1563=>'AL',
-1566=>'AL',
-1567=>'AL',
-1569=>'AL',
-1570=>'AL',
-1571=>'AL',
-1572=>'AL',
-1573=>'AL',
-1574=>'AL',
-1575=>'AL',
-1576=>'AL',
-1577=>'AL',
-1578=>'AL',
-1579=>'AL',
-1580=>'AL',
-1581=>'AL',
-1582=>'AL',
-1583=>'AL',
-1584=>'AL',
-1585=>'AL',
-1586=>'AL',
-1587=>'AL',
-1588=>'AL',
-1589=>'AL',
-1590=>'AL',
-1591=>'AL',
-1592=>'AL',
-1593=>'AL',
-1594=>'AL',
-1600=>'AL',
-1601=>'AL',
-1602=>'AL',
-1603=>'AL',
-1604=>'AL',
-1605=>'AL',
-1606=>'AL',
-1607=>'AL',
-1608=>'AL',
-1609=>'AL',
-1610=>'AL',
-1611=>'NSM',
-1612=>'NSM',
-1613=>'NSM',
-1614=>'NSM',
-1615=>'NSM',
-1616=>'NSM',
-1617=>'NSM',
-1618=>'NSM',
-1619=>'NSM',
-1620=>'NSM',
-1621=>'NSM',
-1622=>'NSM',
-1623=>'NSM',
-1624=>'NSM',
-1625=>'NSM',
-1626=>'NSM',
-1627=>'NSM',
-1628=>'NSM',
-1629=>'NSM',
-1630=>'NSM',
-1632=>'AN',
-1633=>'AN',
-1634=>'AN',
-1635=>'AN',
-1636=>'AN',
-1637=>'AN',
-1638=>'AN',
-1639=>'AN',
-1640=>'AN',
-1641=>'AN',
-1642=>'ET',
-1643=>'AN',
-1644=>'AN',
-1645=>'AL',
-1646=>'AL',
-1647=>'AL',
-1648=>'NSM',
-1649=>'AL',
-1650=>'AL',
-1651=>'AL',
-1652=>'AL',
-1653=>'AL',
-1654=>'AL',
-1655=>'AL',
-1656=>'AL',
-1657=>'AL',
-1658=>'AL',
-1659=>'AL',
-1660=>'AL',
-1661=>'AL',
-1662=>'AL',
-1663=>'AL',
-1664=>'AL',
-1665=>'AL',
-1666=>'AL',
-1667=>'AL',
-1668=>'AL',
-1669=>'AL',
-1670=>'AL',
-1671=>'AL',
-1672=>'AL',
-1673=>'AL',
-1674=>'AL',
-1675=>'AL',
-1676=>'AL',
-1677=>'AL',
-1678=>'AL',
-1679=>'AL',
-1680=>'AL',
-1681=>'AL',
-1682=>'AL',
-1683=>'AL',
-1684=>'AL',
-1685=>'AL',
-1686=>'AL',
-1687=>'AL',
-1688=>'AL',
-1689=>'AL',
-1690=>'AL',
-1691=>'AL',
-1692=>'AL',
-1693=>'AL',
-1694=>'AL',
-1695=>'AL',
-1696=>'AL',
-1697=>'AL',
-1698=>'AL',
-1699=>'AL',
-1700=>'AL',
-1701=>'AL',
-1702=>'AL',
-1703=>'AL',
-1704=>'AL',
-1705=>'AL',
-1706=>'AL',
-1707=>'AL',
-1708=>'AL',
-1709=>'AL',
-1710=>'AL',
-1711=>'AL',
-1712=>'AL',
-1713=>'AL',
-1714=>'AL',
-1715=>'AL',
-1716=>'AL',
-1717=>'AL',
-1718=>'AL',
-1719=>'AL',
-1720=>'AL',
-1721=>'AL',
-1722=>'AL',
-1723=>'AL',
-1724=>'AL',
-1725=>'AL',
-1726=>'AL',
-1727=>'AL',
-1728=>'AL',
-1729=>'AL',
-1730=>'AL',
-1731=>'AL',
-1732=>'AL',
-1733=>'AL',
-1734=>'AL',
-1735=>'AL',
-1736=>'AL',
-1737=>'AL',
-1738=>'AL',
-1739=>'AL',
-1740=>'AL',
-1741=>'AL',
-1742=>'AL',
-1743=>'AL',
-1744=>'AL',
-1745=>'AL',
-1746=>'AL',
-1747=>'AL',
-1748=>'AL',
-1749=>'AL',
-1750=>'NSM',
-1751=>'NSM',
-1752=>'NSM',
-1753=>'NSM',
-1754=>'NSM',
-1755=>'NSM',
-1756=>'NSM',
-1757=>'AL',
-1758=>'NSM',
-1759=>'NSM',
-1760=>'NSM',
-1761=>'NSM',
-1762=>'NSM',
-1763=>'NSM',
-1764=>'NSM',
-1765=>'AL',
-1766=>'AL',
-1767=>'NSM',
-1768=>'NSM',
-1769=>'ON',
-1770=>'NSM',
-1771=>'NSM',
-1772=>'NSM',
-1773=>'NSM',
-1774=>'AL',
-1775=>'AL',
-1776=>'EN',
-1777=>'EN',
-1778=>'EN',
-1779=>'EN',
-1780=>'EN',
-1781=>'EN',
-1782=>'EN',
-1783=>'EN',
-1784=>'EN',
-1785=>'EN',
-1786=>'AL',
-1787=>'AL',
-1788=>'AL',
-1789=>'AL',
-1790=>'AL',
-1791=>'AL',
-1792=>'AL',
-1793=>'AL',
-1794=>'AL',
-1795=>'AL',
-1796=>'AL',
-1797=>'AL',
-1798=>'AL',
-1799=>'AL',
-1800=>'AL',
-1801=>'AL',
-1802=>'AL',
-1803=>'AL',
-1804=>'AL',
-1805=>'AL',
-1807=>'BN',
-1808=>'AL',
-1809=>'NSM',
-1810=>'AL',
-1811=>'AL',
-1812=>'AL',
-1813=>'AL',
-1814=>'AL',
-1815=>'AL',
-1816=>'AL',
-1817=>'AL',
-1818=>'AL',
-1819=>'AL',
-1820=>'AL',
-1821=>'AL',
-1822=>'AL',
-1823=>'AL',
-1824=>'AL',
-1825=>'AL',
-1826=>'AL',
-1827=>'AL',
-1828=>'AL',
-1829=>'AL',
-1830=>'AL',
-1831=>'AL',
-1832=>'AL',
-1833=>'AL',
-1834=>'AL',
-1835=>'AL',
-1836=>'AL',
-1837=>'AL',
-1838=>'AL',
-1839=>'AL',
-1840=>'NSM',
-1841=>'NSM',
-1842=>'NSM',
-1843=>'NSM',
-1844=>'NSM',
-1845=>'NSM',
-1846=>'NSM',
-1847=>'NSM',
-1848=>'NSM',
-1849=>'NSM',
-1850=>'NSM',
-1851=>'NSM',
-1852=>'NSM',
-1853=>'NSM',
-1854=>'NSM',
-1855=>'NSM',
-1856=>'NSM',
-1857=>'NSM',
-1858=>'NSM',
-1859=>'NSM',
-1860=>'NSM',
-1861=>'NSM',
-1862=>'NSM',
-1863=>'NSM',
-1864=>'NSM',
-1865=>'NSM',
-1866=>'NSM',
-1869=>'AL',
-1870=>'AL',
-1871=>'AL',
-1872=>'AL',
-1873=>'AL',
-1874=>'AL',
-1875=>'AL',
-1876=>'AL',
-1877=>'AL',
-1878=>'AL',
-1879=>'AL',
-1880=>'AL',
-1881=>'AL',
-1882=>'AL',
-1883=>'AL',
-1884=>'AL',
-1885=>'AL',
-1886=>'AL',
-1887=>'AL',
-1888=>'AL',
-1889=>'AL',
-1890=>'AL',
-1891=>'AL',
-1892=>'AL',
-1893=>'AL',
-1894=>'AL',
-1895=>'AL',
-1896=>'AL',
-1897=>'AL',
-1898=>'AL',
-1899=>'AL',
-1900=>'AL',
-1901=>'AL',
-1920=>'AL',
-1921=>'AL',
-1922=>'AL',
-1923=>'AL',
-1924=>'AL',
-1925=>'AL',
-1926=>'AL',
-1927=>'AL',
-1928=>'AL',
-1929=>'AL',
-1930=>'AL',
-1931=>'AL',
-1932=>'AL',
-1933=>'AL',
-1934=>'AL',
-1935=>'AL',
-1936=>'AL',
-1937=>'AL',
-1938=>'AL',
-1939=>'AL',
-1940=>'AL',
-1941=>'AL',
-1942=>'AL',
-1943=>'AL',
-1944=>'AL',
-1945=>'AL',
-1946=>'AL',
-1947=>'AL',
-1948=>'AL',
-1949=>'AL',
-1950=>'AL',
-1951=>'AL',
-1952=>'AL',
-1953=>'AL',
-1954=>'AL',
-1955=>'AL',
-1956=>'AL',
-1957=>'AL',
-1958=>'NSM',
-1959=>'NSM',
-1960=>'NSM',
-1961=>'NSM',
-1962=>'NSM',
-1963=>'NSM',
-1964=>'NSM',
-1965=>'NSM',
-1966=>'NSM',
-1967=>'NSM',
-1968=>'NSM',
-1969=>'AL',
-1984=>'R',
-1985=>'R',
-1986=>'R',
-1987=>'R',
-1988=>'R',
-1989=>'R',
-1990=>'R',
-1991=>'R',
-1992=>'R',
-1993=>'R',
-1994=>'R',
-1995=>'R',
-1996=>'R',
-1997=>'R',
-1998=>'R',
-1999=>'R',
-2000=>'R',
-2001=>'R',
-2002=>'R',
-2003=>'R',
-2004=>'R',
-2005=>'R',
-2006=>'R',
-2007=>'R',
-2008=>'R',
-2009=>'R',
-2010=>'R',
-2011=>'R',
-2012=>'R',
-2013=>'R',
-2014=>'R',
-2015=>'R',
-2016=>'R',
-2017=>'R',
-2018=>'R',
-2019=>'R',
-2020=>'R',
-2021=>'R',
-2022=>'R',
-2023=>'R',
-2024=>'R',
-2025=>'R',
-2026=>'R',
-2027=>'NSM',
-2028=>'NSM',
-2029=>'NSM',
-2030=>'NSM',
-2031=>'NSM',
-2032=>'NSM',
-2033=>'NSM',
-2034=>'NSM',
-2035=>'NSM',
-2036=>'R',
-2037=>'R',
-2038=>'ON',
-2039=>'ON',
-2040=>'ON',
-2041=>'ON',
-2042=>'R',
-2305=>'NSM',
-2306=>'NSM',
-2307=>'L',
-2308=>'L',
-2309=>'L',
-2310=>'L',
-2311=>'L',
-2312=>'L',
-2313=>'L',
-2314=>'L',
-2315=>'L',
-2316=>'L',
-2317=>'L',
-2318=>'L',
-2319=>'L',
-2320=>'L',
-2321=>'L',
-2322=>'L',
-2323=>'L',
-2324=>'L',
-2325=>'L',
-2326=>'L',
-2327=>'L',
-2328=>'L',
-2329=>'L',
-2330=>'L',
-2331=>'L',
-2332=>'L',
-2333=>'L',
-2334=>'L',
-2335=>'L',
-2336=>'L',
-2337=>'L',
-2338=>'L',
-2339=>'L',
-2340=>'L',
-2341=>'L',
-2342=>'L',
-2343=>'L',
-2344=>'L',
-2345=>'L',
-2346=>'L',
-2347=>'L',
-2348=>'L',
-2349=>'L',
-2350=>'L',
-2351=>'L',
-2352=>'L',
-2353=>'L',
-2354=>'L',
-2355=>'L',
-2356=>'L',
-2357=>'L',
-2358=>'L',
-2359=>'L',
-2360=>'L',
-2361=>'L',
-2364=>'NSM',
-2365=>'L',
-2366=>'L',
-2367=>'L',
-2368=>'L',
-2369=>'NSM',
-2370=>'NSM',
-2371=>'NSM',
-2372=>'NSM',
-2373=>'NSM',
-2374=>'NSM',
-2375=>'NSM',
-2376=>'NSM',
-2377=>'L',
-2378=>'L',
-2379=>'L',
-2380=>'L',
-2381=>'NSM',
-2384=>'L',
-2385=>'NSM',
-2386=>'NSM',
-2387=>'NSM',
-2388=>'NSM',
-2392=>'L',
-2393=>'L',
-2394=>'L',
-2395=>'L',
-2396=>'L',
-2397=>'L',
-2398=>'L',
-2399=>'L',
-2400=>'L',
-2401=>'L',
-2402=>'NSM',
-2403=>'NSM',
-2404=>'L',
-2405=>'L',
-2406=>'L',
-2407=>'L',
-2408=>'L',
-2409=>'L',
-2410=>'L',
-2411=>'L',
-2412=>'L',
-2413=>'L',
-2414=>'L',
-2415=>'L',
-2416=>'L',
-2427=>'L',
-2428=>'L',
-2429=>'L',
-2430=>'L',
-2431=>'L',
-2433=>'NSM',
-2434=>'L',
-2435=>'L',
-2437=>'L',
-2438=>'L',
-2439=>'L',
-2440=>'L',
-2441=>'L',
-2442=>'L',
-2443=>'L',
-2444=>'L',
-2447=>'L',
-2448=>'L',
-2451=>'L',
-2452=>'L',
-2453=>'L',
-2454=>'L',
-2455=>'L',
-2456=>'L',
-2457=>'L',
-2458=>'L',
-2459=>'L',
-2460=>'L',
-2461=>'L',
-2462=>'L',
-2463=>'L',
-2464=>'L',
-2465=>'L',
-2466=>'L',
-2467=>'L',
-2468=>'L',
-2469=>'L',
-2470=>'L',
-2471=>'L',
-2472=>'L',
-2474=>'L',
-2475=>'L',
-2476=>'L',
-2477=>'L',
-2478=>'L',
-2479=>'L',
-2480=>'L',
-2482=>'L',
-2486=>'L',
-2487=>'L',
-2488=>'L',
-2489=>'L',
-2492=>'NSM',
-2493=>'L',
-2494=>'L',
-2495=>'L',
-2496=>'L',
-2497=>'NSM',
-2498=>'NSM',
-2499=>'NSM',
-2500=>'NSM',
-2503=>'L',
-2504=>'L',
-2507=>'L',
-2508=>'L',
-2509=>'NSM',
-2510=>'L',
-2519=>'L',
-2524=>'L',
-2525=>'L',
-2527=>'L',
-2528=>'L',
-2529=>'L',
-2530=>'NSM',
-2531=>'NSM',
-2534=>'L',
-2535=>'L',
-2536=>'L',
-2537=>'L',
-2538=>'L',
-2539=>'L',
-2540=>'L',
-2541=>'L',
-2542=>'L',
-2543=>'L',
-2544=>'L',
-2545=>'L',
-2546=>'ET',
-2547=>'ET',
-2548=>'L',
-2549=>'L',
-2550=>'L',
-2551=>'L',
-2552=>'L',
-2553=>'L',
-2554=>'L',
-2561=>'NSM',
-2562=>'NSM',
-2563=>'L',
-2565=>'L',
-2566=>'L',
-2567=>'L',
-2568=>'L',
-2569=>'L',
-2570=>'L',
-2575=>'L',
-2576=>'L',
-2579=>'L',
-2580=>'L',
-2581=>'L',
-2582=>'L',
-2583=>'L',
-2584=>'L',
-2585=>'L',
-2586=>'L',
-2587=>'L',
-2588=>'L',
-2589=>'L',
-2590=>'L',
-2591=>'L',
-2592=>'L',
-2593=>'L',
-2594=>'L',
-2595=>'L',
-2596=>'L',
-2597=>'L',
-2598=>'L',
-2599=>'L',
-2600=>'L',
-2602=>'L',
-2603=>'L',
-2604=>'L',
-2605=>'L',
-2606=>'L',
-2607=>'L',
-2608=>'L',
-2610=>'L',
-2611=>'L',
-2613=>'L',
-2614=>'L',
-2616=>'L',
-2617=>'L',
-2620=>'NSM',
-2622=>'L',
-2623=>'L',
-2624=>'L',
-2625=>'NSM',
-2626=>'NSM',
-2631=>'NSM',
-2632=>'NSM',
-2635=>'NSM',
-2636=>'NSM',
-2637=>'NSM',
-2649=>'L',
-2650=>'L',
-2651=>'L',
-2652=>'L',
-2654=>'L',
-2662=>'L',
-2663=>'L',
-2664=>'L',
-2665=>'L',
-2666=>'L',
-2667=>'L',
-2668=>'L',
-2669=>'L',
-2670=>'L',
-2671=>'L',
-2672=>'NSM',
-2673=>'NSM',
-2674=>'L',
-2675=>'L',
-2676=>'L',
-2689=>'NSM',
-2690=>'NSM',
-2691=>'L',
-2693=>'L',
-2694=>'L',
-2695=>'L',
-2696=>'L',
-2697=>'L',
-2698=>'L',
-2699=>'L',
-2700=>'L',
-2701=>'L',
-2703=>'L',
-2704=>'L',
-2705=>'L',
-2707=>'L',
-2708=>'L',
-2709=>'L',
-2710=>'L',
-2711=>'L',
-2712=>'L',
-2713=>'L',
-2714=>'L',
-2715=>'L',
-2716=>'L',
-2717=>'L',
-2718=>'L',
-2719=>'L',
-2720=>'L',
-2721=>'L',
-2722=>'L',
-2723=>'L',
-2724=>'L',
-2725=>'L',
-2726=>'L',
-2727=>'L',
-2728=>'L',
-2730=>'L',
-2731=>'L',
-2732=>'L',
-2733=>'L',
-2734=>'L',
-2735=>'L',
-2736=>'L',
-2738=>'L',
-2739=>'L',
-2741=>'L',
-2742=>'L',
-2743=>'L',
-2744=>'L',
-2745=>'L',
-2748=>'NSM',
-2749=>'L',
-2750=>'L',
-2751=>'L',
-2752=>'L',
-2753=>'NSM',
-2754=>'NSM',
-2755=>'NSM',
-2756=>'NSM',
-2757=>'NSM',
-2759=>'NSM',
-2760=>'NSM',
-2761=>'L',
-2763=>'L',
-2764=>'L',
-2765=>'NSM',
-2768=>'L',
-2784=>'L',
-2785=>'L',
-2786=>'NSM',
-2787=>'NSM',
-2790=>'L',
-2791=>'L',
-2792=>'L',
-2793=>'L',
-2794=>'L',
-2795=>'L',
-2796=>'L',
-2797=>'L',
-2798=>'L',
-2799=>'L',
-2801=>'ET',
-2817=>'NSM',
-2818=>'L',
-2819=>'L',
-2821=>'L',
-2822=>'L',
-2823=>'L',
-2824=>'L',
-2825=>'L',
-2826=>'L',
-2827=>'L',
-2828=>'L',
-2831=>'L',
-2832=>'L',
-2835=>'L',
-2836=>'L',
-2837=>'L',
-2838=>'L',
-2839=>'L',
-2840=>'L',
-2841=>'L',
-2842=>'L',
-2843=>'L',
-2844=>'L',
-2845=>'L',
-2846=>'L',
-2847=>'L',
-2848=>'L',
-2849=>'L',
-2850=>'L',
-2851=>'L',
-2852=>'L',
-2853=>'L',
-2854=>'L',
-2855=>'L',
-2856=>'L',
-2858=>'L',
-2859=>'L',
-2860=>'L',
-2861=>'L',
-2862=>'L',
-2863=>'L',
-2864=>'L',
-2866=>'L',
-2867=>'L',
-2869=>'L',
-2870=>'L',
-2871=>'L',
-2872=>'L',
-2873=>'L',
-2876=>'NSM',
-2877=>'L',
-2878=>'L',
-2879=>'NSM',
-2880=>'L',
-2881=>'NSM',
-2882=>'NSM',
-2883=>'NSM',
-2887=>'L',
-2888=>'L',
-2891=>'L',
-2892=>'L',
-2893=>'NSM',
-2902=>'NSM',
-2903=>'L',
-2908=>'L',
-2909=>'L',
-2911=>'L',
-2912=>'L',
-2913=>'L',
-2918=>'L',
-2919=>'L',
-2920=>'L',
-2921=>'L',
-2922=>'L',
-2923=>'L',
-2924=>'L',
-2925=>'L',
-2926=>'L',
-2927=>'L',
-2928=>'L',
-2929=>'L',
-2946=>'NSM',
-2947=>'L',
-2949=>'L',
-2950=>'L',
-2951=>'L',
-2952=>'L',
-2953=>'L',
-2954=>'L',
-2958=>'L',
-2959=>'L',
-2960=>'L',
-2962=>'L',
-2963=>'L',
-2964=>'L',
-2965=>'L',
-2969=>'L',
-2970=>'L',
-2972=>'L',
-2974=>'L',
-2975=>'L',
-2979=>'L',
-2980=>'L',
-2984=>'L',
-2985=>'L',
-2986=>'L',
-2990=>'L',
-2991=>'L',
-2992=>'L',
-2993=>'L',
-2994=>'L',
-2995=>'L',
-2996=>'L',
-2997=>'L',
-2998=>'L',
-2999=>'L',
-3000=>'L',
-3001=>'L',
-3006=>'L',
-3007=>'L',
-3008=>'NSM',
-3009=>'L',
-3010=>'L',
-3014=>'L',
-3015=>'L',
-3016=>'L',
-3018=>'L',
-3019=>'L',
-3020=>'L',
-3021=>'NSM',
-3031=>'L',
-3046=>'L',
-3047=>'L',
-3048=>'L',
-3049=>'L',
-3050=>'L',
-3051=>'L',
-3052=>'L',
-3053=>'L',
-3054=>'L',
-3055=>'L',
-3056=>'L',
-3057=>'L',
-3058=>'L',
-3059=>'ON',
-3060=>'ON',
-3061=>'ON',
-3062=>'ON',
-3063=>'ON',
-3064=>'ON',
-3065=>'ET',
-3066=>'ON',
-3073=>'L',
-3074=>'L',
-3075=>'L',
-3077=>'L',
-3078=>'L',
-3079=>'L',
-3080=>'L',
-3081=>'L',
-3082=>'L',
-3083=>'L',
-3084=>'L',
-3086=>'L',
-3087=>'L',
-3088=>'L',
-3090=>'L',
-3091=>'L',
-3092=>'L',
-3093=>'L',
-3094=>'L',
-3095=>'L',
-3096=>'L',
-3097=>'L',
-3098=>'L',
-3099=>'L',
-3100=>'L',
-3101=>'L',
-3102=>'L',
-3103=>'L',
-3104=>'L',
-3105=>'L',
-3106=>'L',
-3107=>'L',
-3108=>'L',
-3109=>'L',
-3110=>'L',
-3111=>'L',
-3112=>'L',
-3114=>'L',
-3115=>'L',
-3116=>'L',
-3117=>'L',
-3118=>'L',
-3119=>'L',
-3120=>'L',
-3121=>'L',
-3122=>'L',
-3123=>'L',
-3125=>'L',
-3126=>'L',
-3127=>'L',
-3128=>'L',
-3129=>'L',
-3134=>'NSM',
-3135=>'NSM',
-3136=>'NSM',
-3137=>'L',
-3138=>'L',
-3139=>'L',
-3140=>'L',
-3142=>'NSM',
-3143=>'NSM',
-3144=>'NSM',
-3146=>'NSM',
-3147=>'NSM',
-3148=>'NSM',
-3149=>'NSM',
-3157=>'NSM',
-3158=>'NSM',
-3168=>'L',
-3169=>'L',
-3174=>'L',
-3175=>'L',
-3176=>'L',
-3177=>'L',
-3178=>'L',
-3179=>'L',
-3180=>'L',
-3181=>'L',
-3182=>'L',
-3183=>'L',
-3202=>'L',
-3203=>'L',
-3205=>'L',
-3206=>'L',
-3207=>'L',
-3208=>'L',
-3209=>'L',
-3210=>'L',
-3211=>'L',
-3212=>'L',
-3214=>'L',
-3215=>'L',
-3216=>'L',
-3218=>'L',
-3219=>'L',
-3220=>'L',
-3221=>'L',
-3222=>'L',
-3223=>'L',
-3224=>'L',
-3225=>'L',
-3226=>'L',
-3227=>'L',
-3228=>'L',
-3229=>'L',
-3230=>'L',
-3231=>'L',
-3232=>'L',
-3233=>'L',
-3234=>'L',
-3235=>'L',
-3236=>'L',
-3237=>'L',
-3238=>'L',
-3239=>'L',
-3240=>'L',
-3242=>'L',
-3243=>'L',
-3244=>'L',
-3245=>'L',
-3246=>'L',
-3247=>'L',
-3248=>'L',
-3249=>'L',
-3250=>'L',
-3251=>'L',
-3253=>'L',
-3254=>'L',
-3255=>'L',
-3256=>'L',
-3257=>'L',
-3260=>'NSM',
-3261=>'L',
-3262=>'L',
-3263=>'L',
-3264=>'L',
-3265=>'L',
-3266=>'L',
-3267=>'L',
-3268=>'L',
-3270=>'L',
-3271=>'L',
-3272=>'L',
-3274=>'L',
-3275=>'L',
-3276=>'NSM',
-3277=>'NSM',
-3285=>'L',
-3286=>'L',
-3294=>'L',
-3296=>'L',
-3297=>'L',
-3298=>'NSM',
-3299=>'NSM',
-3302=>'L',
-3303=>'L',
-3304=>'L',
-3305=>'L',
-3306=>'L',
-3307=>'L',
-3308=>'L',
-3309=>'L',
-3310=>'L',
-3311=>'L',
-3313=>'ON',
-3314=>'ON',
-3330=>'L',
-3331=>'L',
-3333=>'L',
-3334=>'L',
-3335=>'L',
-3336=>'L',
-3337=>'L',
-3338=>'L',
-3339=>'L',
-3340=>'L',
-3342=>'L',
-3343=>'L',
-3344=>'L',
-3346=>'L',
-3347=>'L',
-3348=>'L',
-3349=>'L',
-3350=>'L',
-3351=>'L',
-3352=>'L',
-3353=>'L',
-3354=>'L',
-3355=>'L',
-3356=>'L',
-3357=>'L',
-3358=>'L',
-3359=>'L',
-3360=>'L',
-3361=>'L',
-3362=>'L',
-3363=>'L',
-3364=>'L',
-3365=>'L',
-3366=>'L',
-3367=>'L',
-3368=>'L',
-3370=>'L',
-3371=>'L',
-3372=>'L',
-3373=>'L',
-3374=>'L',
-3375=>'L',
-3376=>'L',
-3377=>'L',
-3378=>'L',
-3379=>'L',
-3380=>'L',
-3381=>'L',
-3382=>'L',
-3383=>'L',
-3384=>'L',
-3385=>'L',
-3390=>'L',
-3391=>'L',
-3392=>'L',
-3393=>'NSM',
-3394=>'NSM',
-3395=>'NSM',
-3398=>'L',
-3399=>'L',
-3400=>'L',
-3402=>'L',
-3403=>'L',
-3404=>'L',
-3405=>'NSM',
-3415=>'L',
-3424=>'L',
-3425=>'L',
-3430=>'L',
-3431=>'L',
-3432=>'L',
-3433=>'L',
-3434=>'L',
-3435=>'L',
-3436=>'L',
-3437=>'L',
-3438=>'L',
-3439=>'L',
-3458=>'L',
-3459=>'L',
-3461=>'L',
-3462=>'L',
-3463=>'L',
-3464=>'L',
-3465=>'L',
-3466=>'L',
-3467=>'L',
-3468=>'L',
-3469=>'L',
-3470=>'L',
-3471=>'L',
-3472=>'L',
-3473=>'L',
-3474=>'L',
-3475=>'L',
-3476=>'L',
-3477=>'L',
-3478=>'L',
-3482=>'L',
-3483=>'L',
-3484=>'L',
-3485=>'L',
-3486=>'L',
-3487=>'L',
-3488=>'L',
-3489=>'L',
-3490=>'L',
-3491=>'L',
-3492=>'L',
-3493=>'L',
-3494=>'L',
-3495=>'L',
-3496=>'L',
-3497=>'L',
-3498=>'L',
-3499=>'L',
-3500=>'L',
-3501=>'L',
-3502=>'L',
-3503=>'L',
-3504=>'L',
-3505=>'L',
-3507=>'L',
-3508=>'L',
-3509=>'L',
-3510=>'L',
-3511=>'L',
-3512=>'L',
-3513=>'L',
-3514=>'L',
-3515=>'L',
-3517=>'L',
-3520=>'L',
-3521=>'L',
-3522=>'L',
-3523=>'L',
-3524=>'L',
-3525=>'L',
-3526=>'L',
-3530=>'NSM',
-3535=>'L',
-3536=>'L',
-3537=>'L',
-3538=>'NSM',
-3539=>'NSM',
-3540=>'NSM',
-3542=>'NSM',
-3544=>'L',
-3545=>'L',
-3546=>'L',
-3547=>'L',
-3548=>'L',
-3549=>'L',
-3550=>'L',
-3551=>'L',
-3570=>'L',
-3571=>'L',
-3572=>'L',
-3585=>'L',
-3586=>'L',
-3587=>'L',
-3588=>'L',
-3589=>'L',
-3590=>'L',
-3591=>'L',
-3592=>'L',
-3593=>'L',
-3594=>'L',
-3595=>'L',
-3596=>'L',
-3597=>'L',
-3598=>'L',
-3599=>'L',
-3600=>'L',
-3601=>'L',
-3602=>'L',
-3603=>'L',
-3604=>'L',
-3605=>'L',
-3606=>'L',
-3607=>'L',
-3608=>'L',
-3609=>'L',
-3610=>'L',
-3611=>'L',
-3612=>'L',
-3613=>'L',
-3614=>'L',
-3615=>'L',
-3616=>'L',
-3617=>'L',
-3618=>'L',
-3619=>'L',
-3620=>'L',
-3621=>'L',
-3622=>'L',
-3623=>'L',
-3624=>'L',
-3625=>'L',
-3626=>'L',
-3627=>'L',
-3628=>'L',
-3629=>'L',
-3630=>'L',
-3631=>'L',
-3632=>'L',
-3633=>'NSM',
-3634=>'L',
-3635=>'L',
-3636=>'NSM',
-3637=>'NSM',
-3638=>'NSM',
-3639=>'NSM',
-3640=>'NSM',
-3641=>'NSM',
-3642=>'NSM',
-3647=>'ET',
-3648=>'L',
-3649=>'L',
-3650=>'L',
-3651=>'L',
-3652=>'L',
-3653=>'L',
-3654=>'L',
-3655=>'NSM',
-3656=>'NSM',
-3657=>'NSM',
-3658=>'NSM',
-3659=>'NSM',
-3660=>'NSM',
-3661=>'NSM',
-3662=>'NSM',
-3663=>'L',
-3664=>'L',
-3665=>'L',
-3666=>'L',
-3667=>'L',
-3668=>'L',
-3669=>'L',
-3670=>'L',
-3671=>'L',
-3672=>'L',
-3673=>'L',
-3674=>'L',
-3675=>'L',
-3713=>'L',
-3714=>'L',
-3716=>'L',
-3719=>'L',
-3720=>'L',
-3722=>'L',
-3725=>'L',
-3732=>'L',
-3733=>'L',
-3734=>'L',
-3735=>'L',
-3737=>'L',
-3738=>'L',
-3739=>'L',
-3740=>'L',
-3741=>'L',
-3742=>'L',
-3743=>'L',
-3745=>'L',
-3746=>'L',
-3747=>'L',
-3749=>'L',
-3751=>'L',
-3754=>'L',
-3755=>'L',
-3757=>'L',
-3758=>'L',
-3759=>'L',
-3760=>'L',
-3761=>'NSM',
-3762=>'L',
-3763=>'L',
-3764=>'NSM',
-3765=>'NSM',
-3766=>'NSM',
-3767=>'NSM',
-3768=>'NSM',
-3769=>'NSM',
-3771=>'NSM',
-3772=>'NSM',
-3773=>'L',
-3776=>'L',
-3777=>'L',
-3778=>'L',
-3779=>'L',
-3780=>'L',
-3782=>'L',
-3784=>'NSM',
-3785=>'NSM',
-3786=>'NSM',
-3787=>'NSM',
-3788=>'NSM',
-3789=>'NSM',
-3792=>'L',
-3793=>'L',
-3794=>'L',
-3795=>'L',
-3796=>'L',
-3797=>'L',
-3798=>'L',
-3799=>'L',
-3800=>'L',
-3801=>'L',
-3804=>'L',
-3805=>'L',
-3840=>'L',
-3841=>'L',
-3842=>'L',
-3843=>'L',
-3844=>'L',
-3845=>'L',
-3846=>'L',
-3847=>'L',
-3848=>'L',
-3849=>'L',
-3850=>'L',
-3851=>'L',
-3852=>'L',
-3853=>'L',
-3854=>'L',
-3855=>'L',
-3856=>'L',
-3857=>'L',
-3858=>'L',
-3859=>'L',
-3860=>'L',
-3861=>'L',
-3862=>'L',
-3863=>'L',
-3864=>'NSM',
-3865=>'NSM',
-3866=>'L',
-3867=>'L',
-3868=>'L',
-3869=>'L',
-3870=>'L',
-3871=>'L',
-3872=>'L',
-3873=>'L',
-3874=>'L',
-3875=>'L',
-3876=>'L',
-3877=>'L',
-3878=>'L',
-3879=>'L',
-3880=>'L',
-3881=>'L',
-3882=>'L',
-3883=>'L',
-3884=>'L',
-3885=>'L',
-3886=>'L',
-3887=>'L',
-3888=>'L',
-3889=>'L',
-3890=>'L',
-3891=>'L',
-3892=>'L',
-3893=>'NSM',
-3894=>'L',
-3895=>'NSM',
-3896=>'L',
-3897=>'NSM',
-3898=>'ON',
-3899=>'ON',
-3900=>'ON',
-3901=>'ON',
-3902=>'L',
-3903=>'L',
-3904=>'L',
-3905=>'L',
-3906=>'L',
-3907=>'L',
-3908=>'L',
-3909=>'L',
-3910=>'L',
-3911=>'L',
-3913=>'L',
-3914=>'L',
-3915=>'L',
-3916=>'L',
-3917=>'L',
-3918=>'L',
-3919=>'L',
-3920=>'L',
-3921=>'L',
-3922=>'L',
-3923=>'L',
-3924=>'L',
-3925=>'L',
-3926=>'L',
-3927=>'L',
-3928=>'L',
-3929=>'L',
-3930=>'L',
-3931=>'L',
-3932=>'L',
-3933=>'L',
-3934=>'L',
-3935=>'L',
-3936=>'L',
-3937=>'L',
-3938=>'L',
-3939=>'L',
-3940=>'L',
-3941=>'L',
-3942=>'L',
-3943=>'L',
-3944=>'L',
-3945=>'L',
-3946=>'L',
-3953=>'NSM',
-3954=>'NSM',
-3955=>'NSM',
-3956=>'NSM',
-3957=>'NSM',
-3958=>'NSM',
-3959=>'NSM',
-3960=>'NSM',
-3961=>'NSM',
-3962=>'NSM',
-3963=>'NSM',
-3964=>'NSM',
-3965=>'NSM',
-3966=>'NSM',
-3967=>'L',
-3968=>'NSM',
-3969=>'NSM',
-3970=>'NSM',
-3971=>'NSM',
-3972=>'NSM',
-3973=>'L',
-3974=>'NSM',
-3975=>'NSM',
-3976=>'L',
-3977=>'L',
-3978=>'L',
-3979=>'L',
-3984=>'NSM',
-3985=>'NSM',
-3986=>'NSM',
-3987=>'NSM',
-3988=>'NSM',
-3989=>'NSM',
-3990=>'NSM',
-3991=>'NSM',
-3993=>'NSM',
-3994=>'NSM',
-3995=>'NSM',
-3996=>'NSM',
-3997=>'NSM',
-3998=>'NSM',
-3999=>'NSM',
-4000=>'NSM',
-4001=>'NSM',
-4002=>'NSM',
-4003=>'NSM',
-4004=>'NSM',
-4005=>'NSM',
-4006=>'NSM',
-4007=>'NSM',
-4008=>'NSM',
-4009=>'NSM',
-4010=>'NSM',
-4011=>'NSM',
-4012=>'NSM',
-4013=>'NSM',
-4014=>'NSM',
-4015=>'NSM',
-4016=>'NSM',
-4017=>'NSM',
-4018=>'NSM',
-4019=>'NSM',
-4020=>'NSM',
-4021=>'NSM',
-4022=>'NSM',
-4023=>'NSM',
-4024=>'NSM',
-4025=>'NSM',
-4026=>'NSM',
-4027=>'NSM',
-4028=>'NSM',
-4030=>'L',
-4031=>'L',
-4032=>'L',
-4033=>'L',
-4034=>'L',
-4035=>'L',
-4036=>'L',
-4037=>'L',
-4038=>'NSM',
-4039=>'L',
-4040=>'L',
-4041=>'L',
-4042=>'L',
-4043=>'L',
-4044=>'L',
-4047=>'L',
-4048=>'L',
-4049=>'L',
-4096=>'L',
-4097=>'L',
-4098=>'L',
-4099=>'L',
-4100=>'L',
-4101=>'L',
-4102=>'L',
-4103=>'L',
-4104=>'L',
-4105=>'L',
-4106=>'L',
-4107=>'L',
-4108=>'L',
-4109=>'L',
-4110=>'L',
-4111=>'L',
-4112=>'L',
-4113=>'L',
-4114=>'L',
-4115=>'L',
-4116=>'L',
-4117=>'L',
-4118=>'L',
-4119=>'L',
-4120=>'L',
-4121=>'L',
-4122=>'L',
-4123=>'L',
-4124=>'L',
-4125=>'L',
-4126=>'L',
-4127=>'L',
-4128=>'L',
-4129=>'L',
-4131=>'L',
-4132=>'L',
-4133=>'L',
-4134=>'L',
-4135=>'L',
-4137=>'L',
-4138=>'L',
-4140=>'L',
-4141=>'NSM',
-4142=>'NSM',
-4143=>'NSM',
-4144=>'NSM',
-4145=>'L',
-4146=>'NSM',
-4150=>'NSM',
-4151=>'NSM',
-4152=>'L',
-4153=>'NSM',
-4160=>'L',
-4161=>'L',
-4162=>'L',
-4163=>'L',
-4164=>'L',
-4165=>'L',
-4166=>'L',
-4167=>'L',
-4168=>'L',
-4169=>'L',
-4170=>'L',
-4171=>'L',
-4172=>'L',
-4173=>'L',
-4174=>'L',
-4175=>'L',
-4176=>'L',
-4177=>'L',
-4178=>'L',
-4179=>'L',
-4180=>'L',
-4181=>'L',
-4182=>'L',
-4183=>'L',
-4184=>'NSM',
-4185=>'NSM',
-4256=>'L',
-4257=>'L',
-4258=>'L',
-4259=>'L',
-4260=>'L',
-4261=>'L',
-4262=>'L',
-4263=>'L',
-4264=>'L',
-4265=>'L',
-4266=>'L',
-4267=>'L',
-4268=>'L',
-4269=>'L',
-4270=>'L',
-4271=>'L',
-4272=>'L',
-4273=>'L',
-4274=>'L',
-4275=>'L',
-4276=>'L',
-4277=>'L',
-4278=>'L',
-4279=>'L',
-4280=>'L',
-4281=>'L',
-4282=>'L',
-4283=>'L',
-4284=>'L',
-4285=>'L',
-4286=>'L',
-4287=>'L',
-4288=>'L',
-4289=>'L',
-4290=>'L',
-4291=>'L',
-4292=>'L',
-4293=>'L',
-4304=>'L',
-4305=>'L',
-4306=>'L',
-4307=>'L',
-4308=>'L',
-4309=>'L',
-4310=>'L',
-4311=>'L',
-4312=>'L',
-4313=>'L',
-4314=>'L',
-4315=>'L',
-4316=>'L',
-4317=>'L',
-4318=>'L',
-4319=>'L',
-4320=>'L',
-4321=>'L',
-4322=>'L',
-4323=>'L',
-4324=>'L',
-4325=>'L',
-4326=>'L',
-4327=>'L',
-4328=>'L',
-4329=>'L',
-4330=>'L',
-4331=>'L',
-4332=>'L',
-4333=>'L',
-4334=>'L',
-4335=>'L',
-4336=>'L',
-4337=>'L',
-4338=>'L',
-4339=>'L',
-4340=>'L',
-4341=>'L',
-4342=>'L',
-4343=>'L',
-4344=>'L',
-4345=>'L',
-4346=>'L',
-4347=>'L',
-4348=>'L',
-4352=>'L',
-4353=>'L',
-4354=>'L',
-4355=>'L',
-4356=>'L',
-4357=>'L',
-4358=>'L',
-4359=>'L',
-4360=>'L',
-4361=>'L',
-4362=>'L',
-4363=>'L',
-4364=>'L',
-4365=>'L',
-4366=>'L',
-4367=>'L',
-4368=>'L',
-4369=>'L',
-4370=>'L',
-4371=>'L',
-4372=>'L',
-4373=>'L',
-4374=>'L',
-4375=>'L',
-4376=>'L',
-4377=>'L',
-4378=>'L',
-4379=>'L',
-4380=>'L',
-4381=>'L',
-4382=>'L',
-4383=>'L',
-4384=>'L',
-4385=>'L',
-4386=>'L',
-4387=>'L',
-4388=>'L',
-4389=>'L',
-4390=>'L',
-4391=>'L',
-4392=>'L',
-4393=>'L',
-4394=>'L',
-4395=>'L',
-4396=>'L',
-4397=>'L',
-4398=>'L',
-4399=>'L',
-4400=>'L',
-4401=>'L',
-4402=>'L',
-4403=>'L',
-4404=>'L',
-4405=>'L',
-4406=>'L',
-4407=>'L',
-4408=>'L',
-4409=>'L',
-4410=>'L',
-4411=>'L',
-4412=>'L',
-4413=>'L',
-4414=>'L',
-4415=>'L',
-4416=>'L',
-4417=>'L',
-4418=>'L',
-4419=>'L',
-4420=>'L',
-4421=>'L',
-4422=>'L',
-4423=>'L',
-4424=>'L',
-4425=>'L',
-4426=>'L',
-4427=>'L',
-4428=>'L',
-4429=>'L',
-4430=>'L',
-4431=>'L',
-4432=>'L',
-4433=>'L',
-4434=>'L',
-4435=>'L',
-4436=>'L',
-4437=>'L',
-4438=>'L',
-4439=>'L',
-4440=>'L',
-4441=>'L',
-4447=>'L',
-4448=>'L',
-4449=>'L',
-4450=>'L',
-4451=>'L',
-4452=>'L',
-4453=>'L',
-4454=>'L',
-4455=>'L',
-4456=>'L',
-4457=>'L',
-4458=>'L',
-4459=>'L',
-4460=>'L',
-4461=>'L',
-4462=>'L',
-4463=>'L',
-4464=>'L',
-4465=>'L',
-4466=>'L',
-4467=>'L',
-4468=>'L',
-4469=>'L',
-4470=>'L',
-4471=>'L',
-4472=>'L',
-4473=>'L',
-4474=>'L',
-4475=>'L',
-4476=>'L',
-4477=>'L',
-4478=>'L',
-4479=>'L',
-4480=>'L',
-4481=>'L',
-4482=>'L',
-4483=>'L',
-4484=>'L',
-4485=>'L',
-4486=>'L',
-4487=>'L',
-4488=>'L',
-4489=>'L',
-4490=>'L',
-4491=>'L',
-4492=>'L',
-4493=>'L',
-4494=>'L',
-4495=>'L',
-4496=>'L',
-4497=>'L',
-4498=>'L',
-4499=>'L',
-4500=>'L',
-4501=>'L',
-4502=>'L',
-4503=>'L',
-4504=>'L',
-4505=>'L',
-4506=>'L',
-4507=>'L',
-4508=>'L',
-4509=>'L',
-4510=>'L',
-4511=>'L',
-4512=>'L',
-4513=>'L',
-4514=>'L',
-4520=>'L',
-4521=>'L',
-4522=>'L',
-4523=>'L',
-4524=>'L',
-4525=>'L',
-4526=>'L',
-4527=>'L',
-4528=>'L',
-4529=>'L',
-4530=>'L',
-4531=>'L',
-4532=>'L',
-4533=>'L',
-4534=>'L',
-4535=>'L',
-4536=>'L',
-4537=>'L',
-4538=>'L',
-4539=>'L',
-4540=>'L',
-4541=>'L',
-4542=>'L',
-4543=>'L',
-4544=>'L',
-4545=>'L',
-4546=>'L',
-4547=>'L',
-4548=>'L',
-4549=>'L',
-4550=>'L',
-4551=>'L',
-4552=>'L',
-4553=>'L',
-4554=>'L',
-4555=>'L',
-4556=>'L',
-4557=>'L',
-4558=>'L',
-4559=>'L',
-4560=>'L',
-4561=>'L',
-4562=>'L',
-4563=>'L',
-4564=>'L',
-4565=>'L',
-4566=>'L',
-4567=>'L',
-4568=>'L',
-4569=>'L',
-4570=>'L',
-4571=>'L',
-4572=>'L',
-4573=>'L',
-4574=>'L',
-4575=>'L',
-4576=>'L',
-4577=>'L',
-4578=>'L',
-4579=>'L',
-4580=>'L',
-4581=>'L',
-4582=>'L',
-4583=>'L',
-4584=>'L',
-4585=>'L',
-4586=>'L',
-4587=>'L',
-4588=>'L',
-4589=>'L',
-4590=>'L',
-4591=>'L',
-4592=>'L',
-4593=>'L',
-4594=>'L',
-4595=>'L',
-4596=>'L',
-4597=>'L',
-4598=>'L',
-4599=>'L',
-4600=>'L',
-4601=>'L',
-4608=>'L',
-4609=>'L',
-4610=>'L',
-4611=>'L',
-4612=>'L',
-4613=>'L',
-4614=>'L',
-4615=>'L',
-4616=>'L',
-4617=>'L',
-4618=>'L',
-4619=>'L',
-4620=>'L',
-4621=>'L',
-4622=>'L',
-4623=>'L',
-4624=>'L',
-4625=>'L',
-4626=>'L',
-4627=>'L',
-4628=>'L',
-4629=>'L',
-4630=>'L',
-4631=>'L',
-4632=>'L',
-4633=>'L',
-4634=>'L',
-4635=>'L',
-4636=>'L',
-4637=>'L',
-4638=>'L',
-4639=>'L',
-4640=>'L',
-4641=>'L',
-4642=>'L',
-4643=>'L',
-4644=>'L',
-4645=>'L',
-4646=>'L',
-4647=>'L',
-4648=>'L',
-4649=>'L',
-4650=>'L',
-4651=>'L',
-4652=>'L',
-4653=>'L',
-4654=>'L',
-4655=>'L',
-4656=>'L',
-4657=>'L',
-4658=>'L',
-4659=>'L',
-4660=>'L',
-4661=>'L',
-4662=>'L',
-4663=>'L',
-4664=>'L',
-4665=>'L',
-4666=>'L',
-4667=>'L',
-4668=>'L',
-4669=>'L',
-4670=>'L',
-4671=>'L',
-4672=>'L',
-4673=>'L',
-4674=>'L',
-4675=>'L',
-4676=>'L',
-4677=>'L',
-4678=>'L',
-4679=>'L',
-4680=>'L',
-4682=>'L',
-4683=>'L',
-4684=>'L',
-4685=>'L',
-4688=>'L',
-4689=>'L',
-4690=>'L',
-4691=>'L',
-4692=>'L',
-4693=>'L',
-4694=>'L',
-4696=>'L',
-4698=>'L',
-4699=>'L',
-4700=>'L',
-4701=>'L',
-4704=>'L',
-4705=>'L',
-4706=>'L',
-4707=>'L',
-4708=>'L',
-4709=>'L',
-4710=>'L',
-4711=>'L',
-4712=>'L',
-4713=>'L',
-4714=>'L',
-4715=>'L',
-4716=>'L',
-4717=>'L',
-4718=>'L',
-4719=>'L',
-4720=>'L',
-4721=>'L',
-4722=>'L',
-4723=>'L',
-4724=>'L',
-4725=>'L',
-4726=>'L',
-4727=>'L',
-4728=>'L',
-4729=>'L',
-4730=>'L',
-4731=>'L',
-4732=>'L',
-4733=>'L',
-4734=>'L',
-4735=>'L',
-4736=>'L',
-4737=>'L',
-4738=>'L',
-4739=>'L',
-4740=>'L',
-4741=>'L',
-4742=>'L',
-4743=>'L',
-4744=>'L',
-4746=>'L',
-4747=>'L',
-4748=>'L',
-4749=>'L',
-4752=>'L',
-4753=>'L',
-4754=>'L',
-4755=>'L',
-4756=>'L',
-4757=>'L',
-4758=>'L',
-4759=>'L',
-4760=>'L',
-4761=>'L',
-4762=>'L',
-4763=>'L',
-4764=>'L',
-4765=>'L',
-4766=>'L',
-4767=>'L',
-4768=>'L',
-4769=>'L',
-4770=>'L',
-4771=>'L',
-4772=>'L',
-4773=>'L',
-4774=>'L',
-4775=>'L',
-4776=>'L',
-4777=>'L',
-4778=>'L',
-4779=>'L',
-4780=>'L',
-4781=>'L',
-4782=>'L',
-4783=>'L',
-4784=>'L',
-4786=>'L',
-4787=>'L',
-4788=>'L',
-4789=>'L',
-4792=>'L',
-4793=>'L',
-4794=>'L',
-4795=>'L',
-4796=>'L',
-4797=>'L',
-4798=>'L',
-4800=>'L',
-4802=>'L',
-4803=>'L',
-4804=>'L',
-4805=>'L',
-4808=>'L',
-4809=>'L',
-4810=>'L',
-4811=>'L',
-4812=>'L',
-4813=>'L',
-4814=>'L',
-4815=>'L',
-4816=>'L',
-4817=>'L',
-4818=>'L',
-4819=>'L',
-4820=>'L',
-4821=>'L',
-4822=>'L',
-4824=>'L',
-4825=>'L',
-4826=>'L',
-4827=>'L',
-4828=>'L',
-4829=>'L',
-4830=>'L',
-4831=>'L',
-4832=>'L',
-4833=>'L',
-4834=>'L',
-4835=>'L',
-4836=>'L',
-4837=>'L',
-4838=>'L',
-4839=>'L',
-4840=>'L',
-4841=>'L',
-4842=>'L',
-4843=>'L',
-4844=>'L',
-4845=>'L',
-4846=>'L',
-4847=>'L',
-4848=>'L',
-4849=>'L',
-4850=>'L',
-4851=>'L',
-4852=>'L',
-4853=>'L',
-4854=>'L',
-4855=>'L',
-4856=>'L',
-4857=>'L',
-4858=>'L',
-4859=>'L',
-4860=>'L',
-4861=>'L',
-4862=>'L',
-4863=>'L',
-4864=>'L',
-4865=>'L',
-4866=>'L',
-4867=>'L',
-4868=>'L',
-4869=>'L',
-4870=>'L',
-4871=>'L',
-4872=>'L',
-4873=>'L',
-4874=>'L',
-4875=>'L',
-4876=>'L',
-4877=>'L',
-4878=>'L',
-4879=>'L',
-4880=>'L',
-4882=>'L',
-4883=>'L',
-4884=>'L',
-4885=>'L',
-4888=>'L',
-4889=>'L',
-4890=>'L',
-4891=>'L',
-4892=>'L',
-4893=>'L',
-4894=>'L',
-4895=>'L',
-4896=>'L',
-4897=>'L',
-4898=>'L',
-4899=>'L',
-4900=>'L',
-4901=>'L',
-4902=>'L',
-4903=>'L',
-4904=>'L',
-4905=>'L',
-4906=>'L',
-4907=>'L',
-4908=>'L',
-4909=>'L',
-4910=>'L',
-4911=>'L',
-4912=>'L',
-4913=>'L',
-4914=>'L',
-4915=>'L',
-4916=>'L',
-4917=>'L',
-4918=>'L',
-4919=>'L',
-4920=>'L',
-4921=>'L',
-4922=>'L',
-4923=>'L',
-4924=>'L',
-4925=>'L',
-4926=>'L',
-4927=>'L',
-4928=>'L',
-4929=>'L',
-4930=>'L',
-4931=>'L',
-4932=>'L',
-4933=>'L',
-4934=>'L',
-4935=>'L',
-4936=>'L',
-4937=>'L',
-4938=>'L',
-4939=>'L',
-4940=>'L',
-4941=>'L',
-4942=>'L',
-4943=>'L',
-4944=>'L',
-4945=>'L',
-4946=>'L',
-4947=>'L',
-4948=>'L',
-4949=>'L',
-4950=>'L',
-4951=>'L',
-4952=>'L',
-4953=>'L',
-4954=>'L',
-4959=>'NSM',
-4960=>'L',
-4961=>'L',
-4962=>'L',
-4963=>'L',
-4964=>'L',
-4965=>'L',
-4966=>'L',
-4967=>'L',
-4968=>'L',
-4969=>'L',
-4970=>'L',
-4971=>'L',
-4972=>'L',
-4973=>'L',
-4974=>'L',
-4975=>'L',
-4976=>'L',
-4977=>'L',
-4978=>'L',
-4979=>'L',
-4980=>'L',
-4981=>'L',
-4982=>'L',
-4983=>'L',
-4984=>'L',
-4985=>'L',
-4986=>'L',
-4987=>'L',
-4988=>'L',
-4992=>'L',
-4993=>'L',
-4994=>'L',
-4995=>'L',
-4996=>'L',
-4997=>'L',
-4998=>'L',
-4999=>'L',
-5000=>'L',
-5001=>'L',
-5002=>'L',
-5003=>'L',
-5004=>'L',
-5005=>'L',
-5006=>'L',
-5007=>'L',
-5008=>'ON',
-5009=>'ON',
-5010=>'ON',
-5011=>'ON',
-5012=>'ON',
-5013=>'ON',
-5014=>'ON',
-5015=>'ON',
-5016=>'ON',
-5017=>'ON',
-5024=>'L',
-5025=>'L',
-5026=>'L',
-5027=>'L',
-5028=>'L',
-5029=>'L',
-5030=>'L',
-5031=>'L',
-5032=>'L',
-5033=>'L',
-5034=>'L',
-5035=>'L',
-5036=>'L',
-5037=>'L',
-5038=>'L',
-5039=>'L',
-5040=>'L',
-5041=>'L',
-5042=>'L',
-5043=>'L',
-5044=>'L',
-5045=>'L',
-5046=>'L',
-5047=>'L',
-5048=>'L',
-5049=>'L',
-5050=>'L',
-5051=>'L',
-5052=>'L',
-5053=>'L',
-5054=>'L',
-5055=>'L',
-5056=>'L',
-5057=>'L',
-5058=>'L',
-5059=>'L',
-5060=>'L',
-5061=>'L',
-5062=>'L',
-5063=>'L',
-5064=>'L',
-5065=>'L',
-5066=>'L',
-5067=>'L',
-5068=>'L',
-5069=>'L',
-5070=>'L',
-5071=>'L',
-5072=>'L',
-5073=>'L',
-5074=>'L',
-5075=>'L',
-5076=>'L',
-5077=>'L',
-5078=>'L',
-5079=>'L',
-5080=>'L',
-5081=>'L',
-5082=>'L',
-5083=>'L',
-5084=>'L',
-5085=>'L',
-5086=>'L',
-5087=>'L',
-5088=>'L',
-5089=>'L',
-5090=>'L',
-5091=>'L',
-5092=>'L',
-5093=>'L',
-5094=>'L',
-5095=>'L',
-5096=>'L',
-5097=>'L',
-5098=>'L',
-5099=>'L',
-5100=>'L',
-5101=>'L',
-5102=>'L',
-5103=>'L',
-5104=>'L',
-5105=>'L',
-5106=>'L',
-5107=>'L',
-5108=>'L',
-5121=>'L',
-5122=>'L',
-5123=>'L',
-5124=>'L',
-5125=>'L',
-5126=>'L',
-5127=>'L',
-5128=>'L',
-5129=>'L',
-5130=>'L',
-5131=>'L',
-5132=>'L',
-5133=>'L',
-5134=>'L',
-5135=>'L',
-5136=>'L',
-5137=>'L',
-5138=>'L',
-5139=>'L',
-5140=>'L',
-5141=>'L',
-5142=>'L',
-5143=>'L',
-5144=>'L',
-5145=>'L',
-5146=>'L',
-5147=>'L',
-5148=>'L',
-5149=>'L',
-5150=>'L',
-5151=>'L',
-5152=>'L',
-5153=>'L',
-5154=>'L',
-5155=>'L',
-5156=>'L',
-5157=>'L',
-5158=>'L',
-5159=>'L',
-5160=>'L',
-5161=>'L',
-5162=>'L',
-5163=>'L',
-5164=>'L',
-5165=>'L',
-5166=>'L',
-5167=>'L',
-5168=>'L',
-5169=>'L',
-5170=>'L',
-5171=>'L',
-5172=>'L',
-5173=>'L',
-5174=>'L',
-5175=>'L',
-5176=>'L',
-5177=>'L',
-5178=>'L',
-5179=>'L',
-5180=>'L',
-5181=>'L',
-5182=>'L',
-5183=>'L',
-5184=>'L',
-5185=>'L',
-5186=>'L',
-5187=>'L',
-5188=>'L',
-5189=>'L',
-5190=>'L',
-5191=>'L',
-5192=>'L',
-5193=>'L',
-5194=>'L',
-5195=>'L',
-5196=>'L',
-5197=>'L',
-5198=>'L',
-5199=>'L',
-5200=>'L',
-5201=>'L',
-5202=>'L',
-5203=>'L',
-5204=>'L',
-5205=>'L',
-5206=>'L',
-5207=>'L',
-5208=>'L',
-5209=>'L',
-5210=>'L',
-5211=>'L',
-5212=>'L',
-5213=>'L',
-5214=>'L',
-5215=>'L',
-5216=>'L',
-5217=>'L',
-5218=>'L',
-5219=>'L',
-5220=>'L',
-5221=>'L',
-5222=>'L',
-5223=>'L',
-5224=>'L',
-5225=>'L',
-5226=>'L',
-5227=>'L',
-5228=>'L',
-5229=>'L',
-5230=>'L',
-5231=>'L',
-5232=>'L',
-5233=>'L',
-5234=>'L',
-5235=>'L',
-5236=>'L',
-5237=>'L',
-5238=>'L',
-5239=>'L',
-5240=>'L',
-5241=>'L',
-5242=>'L',
-5243=>'L',
-5244=>'L',
-5245=>'L',
-5246=>'L',
-5247=>'L',
-5248=>'L',
-5249=>'L',
-5250=>'L',
-5251=>'L',
-5252=>'L',
-5253=>'L',
-5254=>'L',
-5255=>'L',
-5256=>'L',
-5257=>'L',
-5258=>'L',
-5259=>'L',
-5260=>'L',
-5261=>'L',
-5262=>'L',
-5263=>'L',
-5264=>'L',
-5265=>'L',
-5266=>'L',
-5267=>'L',
-5268=>'L',
-5269=>'L',
-5270=>'L',
-5271=>'L',
-5272=>'L',
-5273=>'L',
-5274=>'L',
-5275=>'L',
-5276=>'L',
-5277=>'L',
-5278=>'L',
-5279=>'L',
-5280=>'L',
-5281=>'L',
-5282=>'L',
-5283=>'L',
-5284=>'L',
-5285=>'L',
-5286=>'L',
-5287=>'L',
-5288=>'L',
-5289=>'L',
-5290=>'L',
-5291=>'L',
-5292=>'L',
-5293=>'L',
-5294=>'L',
-5295=>'L',
-5296=>'L',
-5297=>'L',
-5298=>'L',
-5299=>'L',
-5300=>'L',
-5301=>'L',
-5302=>'L',
-5303=>'L',
-5304=>'L',
-5305=>'L',
-5306=>'L',
-5307=>'L',
-5308=>'L',
-5309=>'L',
-5310=>'L',
-5311=>'L',
-5312=>'L',
-5313=>'L',
-5314=>'L',
-5315=>'L',
-5316=>'L',
-5317=>'L',
-5318=>'L',
-5319=>'L',
-5320=>'L',
-5321=>'L',
-5322=>'L',
-5323=>'L',
-5324=>'L',
-5325=>'L',
-5326=>'L',
-5327=>'L',
-5328=>'L',
-5329=>'L',
-5330=>'L',
-5331=>'L',
-5332=>'L',
-5333=>'L',
-5334=>'L',
-5335=>'L',
-5336=>'L',
-5337=>'L',
-5338=>'L',
-5339=>'L',
-5340=>'L',
-5341=>'L',
-5342=>'L',
-5343=>'L',
-5344=>'L',
-5345=>'L',
-5346=>'L',
-5347=>'L',
-5348=>'L',
-5349=>'L',
-5350=>'L',
-5351=>'L',
-5352=>'L',
-5353=>'L',
-5354=>'L',
-5355=>'L',
-5356=>'L',
-5357=>'L',
-5358=>'L',
-5359=>'L',
-5360=>'L',
-5361=>'L',
-5362=>'L',
-5363=>'L',
-5364=>'L',
-5365=>'L',
-5366=>'L',
-5367=>'L',
-5368=>'L',
-5369=>'L',
-5370=>'L',
-5371=>'L',
-5372=>'L',
-5373=>'L',
-5374=>'L',
-5375=>'L',
-5376=>'L',
-5377=>'L',
-5378=>'L',
-5379=>'L',
-5380=>'L',
-5381=>'L',
-5382=>'L',
-5383=>'L',
-5384=>'L',
-5385=>'L',
-5386=>'L',
-5387=>'L',
-5388=>'L',
-5389=>'L',
-5390=>'L',
-5391=>'L',
-5392=>'L',
-5393=>'L',
-5394=>'L',
-5395=>'L',
-5396=>'L',
-5397=>'L',
-5398=>'L',
-5399=>'L',
-5400=>'L',
-5401=>'L',
-5402=>'L',
-5403=>'L',
-5404=>'L',
-5405=>'L',
-5406=>'L',
-5407=>'L',
-5408=>'L',
-5409=>'L',
-5410=>'L',
-5411=>'L',
-5412=>'L',
-5413=>'L',
-5414=>'L',
-5415=>'L',
-5416=>'L',
-5417=>'L',
-5418=>'L',
-5419=>'L',
-5420=>'L',
-5421=>'L',
-5422=>'L',
-5423=>'L',
-5424=>'L',
-5425=>'L',
-5426=>'L',
-5427=>'L',
-5428=>'L',
-5429=>'L',
-5430=>'L',
-5431=>'L',
-5432=>'L',
-5433=>'L',
-5434=>'L',
-5435=>'L',
-5436=>'L',
-5437=>'L',
-5438=>'L',
-5439=>'L',
-5440=>'L',
-5441=>'L',
-5442=>'L',
-5443=>'L',
-5444=>'L',
-5445=>'L',
-5446=>'L',
-5447=>'L',
-5448=>'L',
-5449=>'L',
-5450=>'L',
-5451=>'L',
-5452=>'L',
-5453=>'L',
-5454=>'L',
-5455=>'L',
-5456=>'L',
-5457=>'L',
-5458=>'L',
-5459=>'L',
-5460=>'L',
-5461=>'L',
-5462=>'L',
-5463=>'L',
-5464=>'L',
-5465=>'L',
-5466=>'L',
-5467=>'L',
-5468=>'L',
-5469=>'L',
-5470=>'L',
-5471=>'L',
-5472=>'L',
-5473=>'L',
-5474=>'L',
-5475=>'L',
-5476=>'L',
-5477=>'L',
-5478=>'L',
-5479=>'L',
-5480=>'L',
-5481=>'L',
-5482=>'L',
-5483=>'L',
-5484=>'L',
-5485=>'L',
-5486=>'L',
-5487=>'L',
-5488=>'L',
-5489=>'L',
-5490=>'L',
-5491=>'L',
-5492=>'L',
-5493=>'L',
-5494=>'L',
-5495=>'L',
-5496=>'L',
-5497=>'L',
-5498=>'L',
-5499=>'L',
-5500=>'L',
-5501=>'L',
-5502=>'L',
-5503=>'L',
-5504=>'L',
-5505=>'L',
-5506=>'L',
-5507=>'L',
-5508=>'L',
-5509=>'L',
-5510=>'L',
-5511=>'L',
-5512=>'L',
-5513=>'L',
-5514=>'L',
-5515=>'L',
-5516=>'L',
-5517=>'L',
-5518=>'L',
-5519=>'L',
-5520=>'L',
-5521=>'L',
-5522=>'L',
-5523=>'L',
-5524=>'L',
-5525=>'L',
-5526=>'L',
-5527=>'L',
-5528=>'L',
-5529=>'L',
-5530=>'L',
-5531=>'L',
-5532=>'L',
-5533=>'L',
-5534=>'L',
-5535=>'L',
-5536=>'L',
-5537=>'L',
-5538=>'L',
-5539=>'L',
-5540=>'L',
-5541=>'L',
-5542=>'L',
-5543=>'L',
-5544=>'L',
-5545=>'L',
-5546=>'L',
-5547=>'L',
-5548=>'L',
-5549=>'L',
-5550=>'L',
-5551=>'L',
-5552=>'L',
-5553=>'L',
-5554=>'L',
-5555=>'L',
-5556=>'L',
-5557=>'L',
-5558=>'L',
-5559=>'L',
-5560=>'L',
-5561=>'L',
-5562=>'L',
-5563=>'L',
-5564=>'L',
-5565=>'L',
-5566=>'L',
-5567=>'L',
-5568=>'L',
-5569=>'L',
-5570=>'L',
-5571=>'L',
-5572=>'L',
-5573=>'L',
-5574=>'L',
-5575=>'L',
-5576=>'L',
-5577=>'L',
-5578=>'L',
-5579=>'L',
-5580=>'L',
-5581=>'L',
-5582=>'L',
-5583=>'L',
-5584=>'L',
-5585=>'L',
-5586=>'L',
-5587=>'L',
-5588=>'L',
-5589=>'L',
-5590=>'L',
-5591=>'L',
-5592=>'L',
-5593=>'L',
-5594=>'L',
-5595=>'L',
-5596=>'L',
-5597=>'L',
-5598=>'L',
-5599=>'L',
-5600=>'L',
-5601=>'L',
-5602=>'L',
-5603=>'L',
-5604=>'L',
-5605=>'L',
-5606=>'L',
-5607=>'L',
-5608=>'L',
-5609=>'L',
-5610=>'L',
-5611=>'L',
-5612=>'L',
-5613=>'L',
-5614=>'L',
-5615=>'L',
-5616=>'L',
-5617=>'L',
-5618=>'L',
-5619=>'L',
-5620=>'L',
-5621=>'L',
-5622=>'L',
-5623=>'L',
-5624=>'L',
-5625=>'L',
-5626=>'L',
-5627=>'L',
-5628=>'L',
-5629=>'L',
-5630=>'L',
-5631=>'L',
-5632=>'L',
-5633=>'L',
-5634=>'L',
-5635=>'L',
-5636=>'L',
-5637=>'L',
-5638=>'L',
-5639=>'L',
-5640=>'L',
-5641=>'L',
-5642=>'L',
-5643=>'L',
-5644=>'L',
-5645=>'L',
-5646=>'L',
-5647=>'L',
-5648=>'L',
-5649=>'L',
-5650=>'L',
-5651=>'L',
-5652=>'L',
-5653=>'L',
-5654=>'L',
-5655=>'L',
-5656=>'L',
-5657=>'L',
-5658=>'L',
-5659=>'L',
-5660=>'L',
-5661=>'L',
-5662=>'L',
-5663=>'L',
-5664=>'L',
-5665=>'L',
-5666=>'L',
-5667=>'L',
-5668=>'L',
-5669=>'L',
-5670=>'L',
-5671=>'L',
-5672=>'L',
-5673=>'L',
-5674=>'L',
-5675=>'L',
-5676=>'L',
-5677=>'L',
-5678=>'L',
-5679=>'L',
-5680=>'L',
-5681=>'L',
-5682=>'L',
-5683=>'L',
-5684=>'L',
-5685=>'L',
-5686=>'L',
-5687=>'L',
-5688=>'L',
-5689=>'L',
-5690=>'L',
-5691=>'L',
-5692=>'L',
-5693=>'L',
-5694=>'L',
-5695=>'L',
-5696=>'L',
-5697=>'L',
-5698=>'L',
-5699=>'L',
-5700=>'L',
-5701=>'L',
-5702=>'L',
-5703=>'L',
-5704=>'L',
-5705=>'L',
-5706=>'L',
-5707=>'L',
-5708=>'L',
-5709=>'L',
-5710=>'L',
-5711=>'L',
-5712=>'L',
-5713=>'L',
-5714=>'L',
-5715=>'L',
-5716=>'L',
-5717=>'L',
-5718=>'L',
-5719=>'L',
-5720=>'L',
-5721=>'L',
-5722=>'L',
-5723=>'L',
-5724=>'L',
-5725=>'L',
-5726=>'L',
-5727=>'L',
-5728=>'L',
-5729=>'L',
-5730=>'L',
-5731=>'L',
-5732=>'L',
-5733=>'L',
-5734=>'L',
-5735=>'L',
-5736=>'L',
-5737=>'L',
-5738=>'L',
-5739=>'L',
-5740=>'L',
-5741=>'L',
-5742=>'L',
-5743=>'L',
-5744=>'L',
-5745=>'L',
-5746=>'L',
-5747=>'L',
-5748=>'L',
-5749=>'L',
-5750=>'L',
-5760=>'WS',
-5761=>'L',
-5762=>'L',
-5763=>'L',
-5764=>'L',
-5765=>'L',
-5766=>'L',
-5767=>'L',
-5768=>'L',
-5769=>'L',
-5770=>'L',
-5771=>'L',
-5772=>'L',
-5773=>'L',
-5774=>'L',
-5775=>'L',
-5776=>'L',
-5777=>'L',
-5778=>'L',
-5779=>'L',
-5780=>'L',
-5781=>'L',
-5782=>'L',
-5783=>'L',
-5784=>'L',
-5785=>'L',
-5786=>'L',
-5787=>'ON',
-5788=>'ON',
-5792=>'L',
-5793=>'L',
-5794=>'L',
-5795=>'L',
-5796=>'L',
-5797=>'L',
-5798=>'L',
-5799=>'L',
-5800=>'L',
-5801=>'L',
-5802=>'L',
-5803=>'L',
-5804=>'L',
-5805=>'L',
-5806=>'L',
-5807=>'L',
-5808=>'L',
-5809=>'L',
-5810=>'L',
-5811=>'L',
-5812=>'L',
-5813=>'L',
-5814=>'L',
-5815=>'L',
-5816=>'L',
-5817=>'L',
-5818=>'L',
-5819=>'L',
-5820=>'L',
-5821=>'L',
-5822=>'L',
-5823=>'L',
-5824=>'L',
-5825=>'L',
-5826=>'L',
-5827=>'L',
-5828=>'L',
-5829=>'L',
-5830=>'L',
-5831=>'L',
-5832=>'L',
-5833=>'L',
-5834=>'L',
-5835=>'L',
-5836=>'L',
-5837=>'L',
-5838=>'L',
-5839=>'L',
-5840=>'L',
-5841=>'L',
-5842=>'L',
-5843=>'L',
-5844=>'L',
-5845=>'L',
-5846=>'L',
-5847=>'L',
-5848=>'L',
-5849=>'L',
-5850=>'L',
-5851=>'L',
-5852=>'L',
-5853=>'L',
-5854=>'L',
-5855=>'L',
-5856=>'L',
-5857=>'L',
-5858=>'L',
-5859=>'L',
-5860=>'L',
-5861=>'L',
-5862=>'L',
-5863=>'L',
-5864=>'L',
-5865=>'L',
-5866=>'L',
-5867=>'L',
-5868=>'L',
-5869=>'L',
-5870=>'L',
-5871=>'L',
-5872=>'L',
-5888=>'L',
-5889=>'L',
-5890=>'L',
-5891=>'L',
-5892=>'L',
-5893=>'L',
-5894=>'L',
-5895=>'L',
-5896=>'L',
-5897=>'L',
-5898=>'L',
-5899=>'L',
-5900=>'L',
-5902=>'L',
-5903=>'L',
-5904=>'L',
-5905=>'L',
-5906=>'NSM',
-5907=>'NSM',
-5908=>'NSM',
-5920=>'L',
-5921=>'L',
-5922=>'L',
-5923=>'L',
-5924=>'L',
-5925=>'L',
-5926=>'L',
-5927=>'L',
-5928=>'L',
-5929=>'L',
-5930=>'L',
-5931=>'L',
-5932=>'L',
-5933=>'L',
-5934=>'L',
-5935=>'L',
-5936=>'L',
-5937=>'L',
-5938=>'NSM',
-5939=>'NSM',
-5940=>'NSM',
-5941=>'L',
-5942=>'L',
-5952=>'L',
-5953=>'L',
-5954=>'L',
-5955=>'L',
-5956=>'L',
-5957=>'L',
-5958=>'L',
-5959=>'L',
-5960=>'L',
-5961=>'L',
-5962=>'L',
-5963=>'L',
-5964=>'L',
-5965=>'L',
-5966=>'L',
-5967=>'L',
-5968=>'L',
-5969=>'L',
-5970=>'NSM',
-5971=>'NSM',
-5984=>'L',
-5985=>'L',
-5986=>'L',
-5987=>'L',
-5988=>'L',
-5989=>'L',
-5990=>'L',
-5991=>'L',
-5992=>'L',
-5993=>'L',
-5994=>'L',
-5995=>'L',
-5996=>'L',
-5998=>'L',
-5999=>'L',
-6000=>'L',
-6002=>'NSM',
-6003=>'NSM',
-6016=>'L',
-6017=>'L',
-6018=>'L',
-6019=>'L',
-6020=>'L',
-6021=>'L',
-6022=>'L',
-6023=>'L',
-6024=>'L',
-6025=>'L',
-6026=>'L',
-6027=>'L',
-6028=>'L',
-6029=>'L',
-6030=>'L',
-6031=>'L',
-6032=>'L',
-6033=>'L',
-6034=>'L',
-6035=>'L',
-6036=>'L',
-6037=>'L',
-6038=>'L',
-6039=>'L',
-6040=>'L',
-6041=>'L',
-6042=>'L',
-6043=>'L',
-6044=>'L',
-6045=>'L',
-6046=>'L',
-6047=>'L',
-6048=>'L',
-6049=>'L',
-6050=>'L',
-6051=>'L',
-6052=>'L',
-6053=>'L',
-6054=>'L',
-6055=>'L',
-6056=>'L',
-6057=>'L',
-6058=>'L',
-6059=>'L',
-6060=>'L',
-6061=>'L',
-6062=>'L',
-6063=>'L',
-6064=>'L',
-6065=>'L',
-6066=>'L',
-6067=>'L',
-6068=>'L',
-6069=>'L',
-6070=>'L',
-6071=>'NSM',
-6072=>'NSM',
-6073=>'NSM',
-6074=>'NSM',
-6075=>'NSM',
-6076=>'NSM',
-6077=>'NSM',
-6078=>'L',
-6079=>'L',
-6080=>'L',
-6081=>'L',
-6082=>'L',
-6083=>'L',
-6084=>'L',
-6085=>'L',
-6086=>'NSM',
-6087=>'L',
-6088=>'L',
-6089=>'NSM',
-6090=>'NSM',
-6091=>'NSM',
-6092=>'NSM',
-6093=>'NSM',
-6094=>'NSM',
-6095=>'NSM',
-6096=>'NSM',
-6097=>'NSM',
-6098=>'NSM',
-6099=>'NSM',
-6100=>'L',
-6101=>'L',
-6102=>'L',
-6103=>'L',
-6104=>'L',
-6105=>'L',
-6106=>'L',
-6107=>'ET',
-6108=>'L',
-6109=>'NSM',
-6112=>'L',
-6113=>'L',
-6114=>'L',
-6115=>'L',
-6116=>'L',
-6117=>'L',
-6118=>'L',
-6119=>'L',
-6120=>'L',
-6121=>'L',
-6128=>'ON',
-6129=>'ON',
-6130=>'ON',
-6131=>'ON',
-6132=>'ON',
-6133=>'ON',
-6134=>'ON',
-6135=>'ON',
-6136=>'ON',
-6137=>'ON',
-6144=>'ON',
-6145=>'ON',
-6146=>'ON',
-6147=>'ON',
-6148=>'ON',
-6149=>'ON',
-6150=>'ON',
-6151=>'ON',
-6152=>'ON',
-6153=>'ON',
-6154=>'ON',
-6155=>'NSM',
-6156=>'NSM',
-6157=>'NSM',
-6158=>'WS',
-6160=>'L',
-6161=>'L',
-6162=>'L',
-6163=>'L',
-6164=>'L',
-6165=>'L',
-6166=>'L',
-6167=>'L',
-6168=>'L',
-6169=>'L',
-6176=>'L',
-6177=>'L',
-6178=>'L',
-6179=>'L',
-6180=>'L',
-6181=>'L',
-6182=>'L',
-6183=>'L',
-6184=>'L',
-6185=>'L',
-6186=>'L',
-6187=>'L',
-6188=>'L',
-6189=>'L',
-6190=>'L',
-6191=>'L',
-6192=>'L',
-6193=>'L',
-6194=>'L',
-6195=>'L',
-6196=>'L',
-6197=>'L',
-6198=>'L',
-6199=>'L',
-6200=>'L',
-6201=>'L',
-6202=>'L',
-6203=>'L',
-6204=>'L',
-6205=>'L',
-6206=>'L',
-6207=>'L',
-6208=>'L',
-6209=>'L',
-6210=>'L',
-6211=>'L',
-6212=>'L',
-6213=>'L',
-6214=>'L',
-6215=>'L',
-6216=>'L',
-6217=>'L',
-6218=>'L',
-6219=>'L',
-6220=>'L',
-6221=>'L',
-6222=>'L',
-6223=>'L',
-6224=>'L',
-6225=>'L',
-6226=>'L',
-6227=>'L',
-6228=>'L',
-6229=>'L',
-6230=>'L',
-6231=>'L',
-6232=>'L',
-6233=>'L',
-6234=>'L',
-6235=>'L',
-6236=>'L',
-6237=>'L',
-6238=>'L',
-6239=>'L',
-6240=>'L',
-6241=>'L',
-6242=>'L',
-6243=>'L',
-6244=>'L',
-6245=>'L',
-6246=>'L',
-6247=>'L',
-6248=>'L',
-6249=>'L',
-6250=>'L',
-6251=>'L',
-6252=>'L',
-6253=>'L',
-6254=>'L',
-6255=>'L',
-6256=>'L',
-6257=>'L',
-6258=>'L',
-6259=>'L',
-6260=>'L',
-6261=>'L',
-6262=>'L',
-6263=>'L',
-6272=>'L',
-6273=>'L',
-6274=>'L',
-6275=>'L',
-6276=>'L',
-6277=>'L',
-6278=>'L',
-6279=>'L',
-6280=>'L',
-6281=>'L',
-6282=>'L',
-6283=>'L',
-6284=>'L',
-6285=>'L',
-6286=>'L',
-6287=>'L',
-6288=>'L',
-6289=>'L',
-6290=>'L',
-6291=>'L',
-6292=>'L',
-6293=>'L',
-6294=>'L',
-6295=>'L',
-6296=>'L',
-6297=>'L',
-6298=>'L',
-6299=>'L',
-6300=>'L',
-6301=>'L',
-6302=>'L',
-6303=>'L',
-6304=>'L',
-6305=>'L',
-6306=>'L',
-6307=>'L',
-6308=>'L',
-6309=>'L',
-6310=>'L',
-6311=>'L',
-6312=>'L',
-6313=>'NSM',
-6400=>'L',
-6401=>'L',
-6402=>'L',
-6403=>'L',
-6404=>'L',
-6405=>'L',
-6406=>'L',
-6407=>'L',
-6408=>'L',
-6409=>'L',
-6410=>'L',
-6411=>'L',
-6412=>'L',
-6413=>'L',
-6414=>'L',
-6415=>'L',
-6416=>'L',
-6417=>'L',
-6418=>'L',
-6419=>'L',
-6420=>'L',
-6421=>'L',
-6422=>'L',
-6423=>'L',
-6424=>'L',
-6425=>'L',
-6426=>'L',
-6427=>'L',
-6428=>'L',
-6432=>'NSM',
-6433=>'NSM',
-6434=>'NSM',
-6435=>'L',
-6436=>'L',
-6437=>'L',
-6438=>'L',
-6439=>'NSM',
-6440=>'NSM',
-6441=>'NSM',
-6442=>'NSM',
-6443=>'NSM',
-6448=>'L',
-6449=>'L',
-6450=>'NSM',
-6451=>'L',
-6452=>'L',
-6453=>'L',
-6454=>'L',
-6455=>'L',
-6456=>'L',
-6457=>'NSM',
-6458=>'NSM',
-6459=>'NSM',
-6464=>'ON',
-6468=>'ON',
-6469=>'ON',
-6470=>'L',
-6471=>'L',
-6472=>'L',
-6473=>'L',
-6474=>'L',
-6475=>'L',
-6476=>'L',
-6477=>'L',
-6478=>'L',
-6479=>'L',
-6480=>'L',
-6481=>'L',
-6482=>'L',
-6483=>'L',
-6484=>'L',
-6485=>'L',
-6486=>'L',
-6487=>'L',
-6488=>'L',
-6489=>'L',
-6490=>'L',
-6491=>'L',
-6492=>'L',
-6493=>'L',
-6494=>'L',
-6495=>'L',
-6496=>'L',
-6497=>'L',
-6498=>'L',
-6499=>'L',
-6500=>'L',
-6501=>'L',
-6502=>'L',
-6503=>'L',
-6504=>'L',
-6505=>'L',
-6506=>'L',
-6507=>'L',
-6508=>'L',
-6509=>'L',
-6512=>'L',
-6513=>'L',
-6514=>'L',
-6515=>'L',
-6516=>'L',
-6528=>'L',
-6529=>'L',
-6530=>'L',
-6531=>'L',
-6532=>'L',
-6533=>'L',
-6534=>'L',
-6535=>'L',
-6536=>'L',
-6537=>'L',
-6538=>'L',
-6539=>'L',
-6540=>'L',
-6541=>'L',
-6542=>'L',
-6543=>'L',
-6544=>'L',
-6545=>'L',
-6546=>'L',
-6547=>'L',
-6548=>'L',
-6549=>'L',
-6550=>'L',
-6551=>'L',
-6552=>'L',
-6553=>'L',
-6554=>'L',
-6555=>'L',
-6556=>'L',
-6557=>'L',
-6558=>'L',
-6559=>'L',
-6560=>'L',
-6561=>'L',
-6562=>'L',
-6563=>'L',
-6564=>'L',
-6565=>'L',
-6566=>'L',
-6567=>'L',
-6568=>'L',
-6569=>'L',
-6576=>'L',
-6577=>'L',
-6578=>'L',
-6579=>'L',
-6580=>'L',
-6581=>'L',
-6582=>'L',
-6583=>'L',
-6584=>'L',
-6585=>'L',
-6586=>'L',
-6587=>'L',
-6588=>'L',
-6589=>'L',
-6590=>'L',
-6591=>'L',
-6592=>'L',
-6593=>'L',
-6594=>'L',
-6595=>'L',
-6596=>'L',
-6597=>'L',
-6598=>'L',
-6599=>'L',
-6600=>'L',
-6601=>'L',
-6608=>'L',
-6609=>'L',
-6610=>'L',
-6611=>'L',
-6612=>'L',
-6613=>'L',
-6614=>'L',
-6615=>'L',
-6616=>'L',
-6617=>'L',
-6622=>'ON',
-6623=>'ON',
-6624=>'ON',
-6625=>'ON',
-6626=>'ON',
-6627=>'ON',
-6628=>'ON',
-6629=>'ON',
-6630=>'ON',
-6631=>'ON',
-6632=>'ON',
-6633=>'ON',
-6634=>'ON',
-6635=>'ON',
-6636=>'ON',
-6637=>'ON',
-6638=>'ON',
-6639=>'ON',
-6640=>'ON',
-6641=>'ON',
-6642=>'ON',
-6643=>'ON',
-6644=>'ON',
-6645=>'ON',
-6646=>'ON',
-6647=>'ON',
-6648=>'ON',
-6649=>'ON',
-6650=>'ON',
-6651=>'ON',
-6652=>'ON',
-6653=>'ON',
-6654=>'ON',
-6655=>'ON',
-6656=>'L',
-6657=>'L',
-6658=>'L',
-6659=>'L',
-6660=>'L',
-6661=>'L',
-6662=>'L',
-6663=>'L',
-6664=>'L',
-6665=>'L',
-6666=>'L',
-6667=>'L',
-6668=>'L',
-6669=>'L',
-6670=>'L',
-6671=>'L',
-6672=>'L',
-6673=>'L',
-6674=>'L',
-6675=>'L',
-6676=>'L',
-6677=>'L',
-6678=>'L',
-6679=>'NSM',
-6680=>'NSM',
-6681=>'L',
-6682=>'L',
-6683=>'L',
-6686=>'L',
-6687=>'L',
-6912=>'NSM',
-6913=>'NSM',
-6914=>'NSM',
-6915=>'NSM',
-6916=>'L',
-6917=>'L',
-6918=>'L',
-6919=>'L',
-6920=>'L',
-6921=>'L',
-6922=>'L',
-6923=>'L',
-6924=>'L',
-6925=>'L',
-6926=>'L',
-6927=>'L',
-6928=>'L',
-6929=>'L',
-6930=>'L',
-6931=>'L',
-6932=>'L',
-6933=>'L',
-6934=>'L',
-6935=>'L',
-6936=>'L',
-6937=>'L',
-6938=>'L',
-6939=>'L',
-6940=>'L',
-6941=>'L',
-6942=>'L',
-6943=>'L',
-6944=>'L',
-6945=>'L',
-6946=>'L',
-6947=>'L',
-6948=>'L',
-6949=>'L',
-6950=>'L',
-6951=>'L',
-6952=>'L',
-6953=>'L',
-6954=>'L',
-6955=>'L',
-6956=>'L',
-6957=>'L',
-6958=>'L',
-6959=>'L',
-6960=>'L',
-6961=>'L',
-6962=>'L',
-6963=>'L',
-6964=>'NSM',
-6965=>'L',
-6966=>'NSM',
-6967=>'NSM',
-6968=>'NSM',
-6969=>'NSM',
-6970=>'NSM',
-6971=>'L',
-6972=>'NSM',
-6973=>'L',
-6974=>'L',
-6975=>'L',
-6976=>'L',
-6977=>'L',
-6978=>'NSM',
-6979=>'L',
-6980=>'L',
-6981=>'L',
-6982=>'L',
-6983=>'L',
-6984=>'L',
-6985=>'L',
-6986=>'L',
-6987=>'L',
-6992=>'L',
-6993=>'L',
-6994=>'L',
-6995=>'L',
-6996=>'L',
-6997=>'L',
-6998=>'L',
-6999=>'L',
-7000=>'L',
-7001=>'L',
-7002=>'L',
-7003=>'L',
-7004=>'L',
-7005=>'L',
-7006=>'L',
-7007=>'L',
-7008=>'L',
-7009=>'L',
-7010=>'L',
-7011=>'L',
-7012=>'L',
-7013=>'L',
-7014=>'L',
-7015=>'L',
-7016=>'L',
-7017=>'L',
-7018=>'L',
-7019=>'NSM',
-7020=>'NSM',
-7021=>'NSM',
-7022=>'NSM',
-7023=>'NSM',
-7024=>'NSM',
-7025=>'NSM',
-7026=>'NSM',
-7027=>'NSM',
-7028=>'L',
-7029=>'L',
-7030=>'L',
-7031=>'L',
-7032=>'L',
-7033=>'L',
-7034=>'L',
-7035=>'L',
-7036=>'L',
-7424=>'L',
-7425=>'L',
-7426=>'L',
-7427=>'L',
-7428=>'L',
-7429=>'L',
-7430=>'L',
-7431=>'L',
-7432=>'L',
-7433=>'L',
-7434=>'L',
-7435=>'L',
-7436=>'L',
-7437=>'L',
-7438=>'L',
-7439=>'L',
-7440=>'L',
-7441=>'L',
-7442=>'L',
-7443=>'L',
-7444=>'L',
-7445=>'L',
-7446=>'L',
-7447=>'L',
-7448=>'L',
-7449=>'L',
-7450=>'L',
-7451=>'L',
-7452=>'L',
-7453=>'L',
-7454=>'L',
-7455=>'L',
-7456=>'L',
-7457=>'L',
-7458=>'L',
-7459=>'L',
-7460=>'L',
-7461=>'L',
-7462=>'L',
-7463=>'L',
-7464=>'L',
-7465=>'L',
-7466=>'L',
-7467=>'L',
-7468=>'L',
-7469=>'L',
-7470=>'L',
-7471=>'L',
-7472=>'L',
-7473=>'L',
-7474=>'L',
-7475=>'L',
-7476=>'L',
-7477=>'L',
-7478=>'L',
-7479=>'L',
-7480=>'L',
-7481=>'L',
-7482=>'L',
-7483=>'L',
-7484=>'L',
-7485=>'L',
-7486=>'L',
-7487=>'L',
-7488=>'L',
-7489=>'L',
-7490=>'L',
-7491=>'L',
-7492=>'L',
-7493=>'L',
-7494=>'L',
-7495=>'L',
-7496=>'L',
-7497=>'L',
-7498=>'L',
-7499=>'L',
-7500=>'L',
-7501=>'L',
-7502=>'L',
-7503=>'L',
-7504=>'L',
-7505=>'L',
-7506=>'L',
-7507=>'L',
-7508=>'L',
-7509=>'L',
-7510=>'L',
-7511=>'L',
-7512=>'L',
-7513=>'L',
-7514=>'L',
-7515=>'L',
-7516=>'L',
-7517=>'L',
-7518=>'L',
-7519=>'L',
-7520=>'L',
-7521=>'L',
-7522=>'L',
-7523=>'L',
-7524=>'L',
-7525=>'L',
-7526=>'L',
-7527=>'L',
-7528=>'L',
-7529=>'L',
-7530=>'L',
-7531=>'L',
-7532=>'L',
-7533=>'L',
-7534=>'L',
-7535=>'L',
-7536=>'L',
-7537=>'L',
-7538=>'L',
-7539=>'L',
-7540=>'L',
-7541=>'L',
-7542=>'L',
-7543=>'L',
-7544=>'L',
-7545=>'L',
-7546=>'L',
-7547=>'L',
-7548=>'L',
-7549=>'L',
-7550=>'L',
-7551=>'L',
-7552=>'L',
-7553=>'L',
-7554=>'L',
-7555=>'L',
-7556=>'L',
-7557=>'L',
-7558=>'L',
-7559=>'L',
-7560=>'L',
-7561=>'L',
-7562=>'L',
-7563=>'L',
-7564=>'L',
-7565=>'L',
-7566=>'L',
-7567=>'L',
-7568=>'L',
-7569=>'L',
-7570=>'L',
-7571=>'L',
-7572=>'L',
-7573=>'L',
-7574=>'L',
-7575=>'L',
-7576=>'L',
-7577=>'L',
-7578=>'L',
-7579=>'L',
-7580=>'L',
-7581=>'L',
-7582=>'L',
-7583=>'L',
-7584=>'L',
-7585=>'L',
-7586=>'L',
-7587=>'L',
-7588=>'L',
-7589=>'L',
-7590=>'L',
-7591=>'L',
-7592=>'L',
-7593=>'L',
-7594=>'L',
-7595=>'L',
-7596=>'L',
-7597=>'L',
-7598=>'L',
-7599=>'L',
-7600=>'L',
-7601=>'L',
-7602=>'L',
-7603=>'L',
-7604=>'L',
-7605=>'L',
-7606=>'L',
-7607=>'L',
-7608=>'L',
-7609=>'L',
-7610=>'L',
-7611=>'L',
-7612=>'L',
-7613=>'L',
-7614=>'L',
-7615=>'L',
-7616=>'NSM',
-7617=>'NSM',
-7618=>'NSM',
-7619=>'NSM',
-7620=>'NSM',
-7621=>'NSM',
-7622=>'NSM',
-7623=>'NSM',
-7624=>'NSM',
-7625=>'NSM',
-7626=>'NSM',
-7678=>'NSM',
-7679=>'NSM',
-7680=>'L',
-7681=>'L',
-7682=>'L',
-7683=>'L',
-7684=>'L',
-7685=>'L',
-7686=>'L',
-7687=>'L',
-7688=>'L',
-7689=>'L',
-7690=>'L',
-7691=>'L',
-7692=>'L',
-7693=>'L',
-7694=>'L',
-7695=>'L',
-7696=>'L',
-7697=>'L',
-7698=>'L',
-7699=>'L',
-7700=>'L',
-7701=>'L',
-7702=>'L',
-7703=>'L',
-7704=>'L',
-7705=>'L',
-7706=>'L',
-7707=>'L',
-7708=>'L',
-7709=>'L',
-7710=>'L',
-7711=>'L',
-7712=>'L',
-7713=>'L',
-7714=>'L',
-7715=>'L',
-7716=>'L',
-7717=>'L',
-7718=>'L',
-7719=>'L',
-7720=>'L',
-7721=>'L',
-7722=>'L',
-7723=>'L',
-7724=>'L',
-7725=>'L',
-7726=>'L',
-7727=>'L',
-7728=>'L',
-7729=>'L',
-7730=>'L',
-7731=>'L',
-7732=>'L',
-7733=>'L',
-7734=>'L',
-7735=>'L',
-7736=>'L',
-7737=>'L',
-7738=>'L',
-7739=>'L',
-7740=>'L',
-7741=>'L',
-7742=>'L',
-7743=>'L',
-7744=>'L',
-7745=>'L',
-7746=>'L',
-7747=>'L',
-7748=>'L',
-7749=>'L',
-7750=>'L',
-7751=>'L',
-7752=>'L',
-7753=>'L',
-7754=>'L',
-7755=>'L',
-7756=>'L',
-7757=>'L',
-7758=>'L',
-7759=>'L',
-7760=>'L',
-7761=>'L',
-7762=>'L',
-7763=>'L',
-7764=>'L',
-7765=>'L',
-7766=>'L',
-7767=>'L',
-7768=>'L',
-7769=>'L',
-7770=>'L',
-7771=>'L',
-7772=>'L',
-7773=>'L',
-7774=>'L',
-7775=>'L',
-7776=>'L',
-7777=>'L',
-7778=>'L',
-7779=>'L',
-7780=>'L',
-7781=>'L',
-7782=>'L',
-7783=>'L',
-7784=>'L',
-7785=>'L',
-7786=>'L',
-7787=>'L',
-7788=>'L',
-7789=>'L',
-7790=>'L',
-7791=>'L',
-7792=>'L',
-7793=>'L',
-7794=>'L',
-7795=>'L',
-7796=>'L',
-7797=>'L',
-7798=>'L',
-7799=>'L',
-7800=>'L',
-7801=>'L',
-7802=>'L',
-7803=>'L',
-7804=>'L',
-7805=>'L',
-7806=>'L',
-7807=>'L',
-7808=>'L',
-7809=>'L',
-7810=>'L',
-7811=>'L',
-7812=>'L',
-7813=>'L',
-7814=>'L',
-7815=>'L',
-7816=>'L',
-7817=>'L',
-7818=>'L',
-7819=>'L',
-7820=>'L',
-7821=>'L',
-7822=>'L',
-7823=>'L',
-7824=>'L',
-7825=>'L',
-7826=>'L',
-7827=>'L',
-7828=>'L',
-7829=>'L',
-7830=>'L',
-7831=>'L',
-7832=>'L',
-7833=>'L',
-7834=>'L',
-7835=>'L',
-7840=>'L',
-7841=>'L',
-7842=>'L',
-7843=>'L',
-7844=>'L',
-7845=>'L',
-7846=>'L',
-7847=>'L',
-7848=>'L',
-7849=>'L',
-7850=>'L',
-7851=>'L',
-7852=>'L',
-7853=>'L',
-7854=>'L',
-7855=>'L',
-7856=>'L',
-7857=>'L',
-7858=>'L',
-7859=>'L',
-7860=>'L',
-7861=>'L',
-7862=>'L',
-7863=>'L',
-7864=>'L',
-7865=>'L',
-7866=>'L',
-7867=>'L',
-7868=>'L',
-7869=>'L',
-7870=>'L',
-7871=>'L',
-7872=>'L',
-7873=>'L',
-7874=>'L',
-7875=>'L',
-7876=>'L',
-7877=>'L',
-7878=>'L',
-7879=>'L',
-7880=>'L',
-7881=>'L',
-7882=>'L',
-7883=>'L',
-7884=>'L',
-7885=>'L',
-7886=>'L',
-7887=>'L',
-7888=>'L',
-7889=>'L',
-7890=>'L',
-7891=>'L',
-7892=>'L',
-7893=>'L',
-7894=>'L',
-7895=>'L',
-7896=>'L',
-7897=>'L',
-7898=>'L',
-7899=>'L',
-7900=>'L',
-7901=>'L',
-7902=>'L',
-7903=>'L',
-7904=>'L',
-7905=>'L',
-7906=>'L',
-7907=>'L',
-7908=>'L',
-7909=>'L',
-7910=>'L',
-7911=>'L',
-7912=>'L',
-7913=>'L',
-7914=>'L',
-7915=>'L',
-7916=>'L',
-7917=>'L',
-7918=>'L',
-7919=>'L',
-7920=>'L',
-7921=>'L',
-7922=>'L',
-7923=>'L',
-7924=>'L',
-7925=>'L',
-7926=>'L',
-7927=>'L',
-7928=>'L',
-7929=>'L',
-7936=>'L',
-7937=>'L',
-7938=>'L',
-7939=>'L',
-7940=>'L',
-7941=>'L',
-7942=>'L',
-7943=>'L',
-7944=>'L',
-7945=>'L',
-7946=>'L',
-7947=>'L',
-7948=>'L',
-7949=>'L',
-7950=>'L',
-7951=>'L',
-7952=>'L',
-7953=>'L',
-7954=>'L',
-7955=>'L',
-7956=>'L',
-7957=>'L',
-7960=>'L',
-7961=>'L',
-7962=>'L',
-7963=>'L',
-7964=>'L',
-7965=>'L',
-7968=>'L',
-7969=>'L',
-7970=>'L',
-7971=>'L',
-7972=>'L',
-7973=>'L',
-7974=>'L',
-7975=>'L',
-7976=>'L',
-7977=>'L',
-7978=>'L',
-7979=>'L',
-7980=>'L',
-7981=>'L',
-7982=>'L',
-7983=>'L',
-7984=>'L',
-7985=>'L',
-7986=>'L',
-7987=>'L',
-7988=>'L',
-7989=>'L',
-7990=>'L',
-7991=>'L',
-7992=>'L',
-7993=>'L',
-7994=>'L',
-7995=>'L',
-7996=>'L',
-7997=>'L',
-7998=>'L',
-7999=>'L',
-8000=>'L',
-8001=>'L',
-8002=>'L',
-8003=>'L',
-8004=>'L',
-8005=>'L',
-8008=>'L',
-8009=>'L',
-8010=>'L',
-8011=>'L',
-8012=>'L',
-8013=>'L',
-8016=>'L',
-8017=>'L',
-8018=>'L',
-8019=>'L',
-8020=>'L',
-8021=>'L',
-8022=>'L',
-8023=>'L',
-8025=>'L',
-8027=>'L',
-8029=>'L',
-8031=>'L',
-8032=>'L',
-8033=>'L',
-8034=>'L',
-8035=>'L',
-8036=>'L',
-8037=>'L',
-8038=>'L',
-8039=>'L',
-8040=>'L',
-8041=>'L',
-8042=>'L',
-8043=>'L',
-8044=>'L',
-8045=>'L',
-8046=>'L',
-8047=>'L',
-8048=>'L',
-8049=>'L',
-8050=>'L',
-8051=>'L',
-8052=>'L',
-8053=>'L',
-8054=>'L',
-8055=>'L',
-8056=>'L',
-8057=>'L',
-8058=>'L',
-8059=>'L',
-8060=>'L',
-8061=>'L',
-8064=>'L',
-8065=>'L',
-8066=>'L',
-8067=>'L',
-8068=>'L',
-8069=>'L',
-8070=>'L',
-8071=>'L',
-8072=>'L',
-8073=>'L',
-8074=>'L',
-8075=>'L',
-8076=>'L',
-8077=>'L',
-8078=>'L',
-8079=>'L',
-8080=>'L',
-8081=>'L',
-8082=>'L',
-8083=>'L',
-8084=>'L',
-8085=>'L',
-8086=>'L',
-8087=>'L',
-8088=>'L',
-8089=>'L',
-8090=>'L',
-8091=>'L',
-8092=>'L',
-8093=>'L',
-8094=>'L',
-8095=>'L',
-8096=>'L',
-8097=>'L',
-8098=>'L',
-8099=>'L',
-8100=>'L',
-8101=>'L',
-8102=>'L',
-8103=>'L',
-8104=>'L',
-8105=>'L',
-8106=>'L',
-8107=>'L',
-8108=>'L',
-8109=>'L',
-8110=>'L',
-8111=>'L',
-8112=>'L',
-8113=>'L',
-8114=>'L',
-8115=>'L',
-8116=>'L',
-8118=>'L',
-8119=>'L',
-8120=>'L',
-8121=>'L',
-8122=>'L',
-8123=>'L',
-8124=>'L',
-8125=>'ON',
-8126=>'L',
-8127=>'ON',
-8128=>'ON',
-8129=>'ON',
-8130=>'L',
-8131=>'L',
-8132=>'L',
-8134=>'L',
-8135=>'L',
-8136=>'L',
-8137=>'L',
-8138=>'L',
-8139=>'L',
-8140=>'L',
-8141=>'ON',
-8142=>'ON',
-8143=>'ON',
-8144=>'L',
-8145=>'L',
-8146=>'L',
-8147=>'L',
-8150=>'L',
-8151=>'L',
-8152=>'L',
-8153=>'L',
-8154=>'L',
-8155=>'L',
-8157=>'ON',
-8158=>'ON',
-8159=>'ON',
-8160=>'L',
-8161=>'L',
-8162=>'L',
-8163=>'L',
-8164=>'L',
-8165=>'L',
-8166=>'L',
-8167=>'L',
-8168=>'L',
-8169=>'L',
-8170=>'L',
-8171=>'L',
-8172=>'L',
-8173=>'ON',
-8174=>'ON',
-8175=>'ON',
-8178=>'L',
-8179=>'L',
-8180=>'L',
-8182=>'L',
-8183=>'L',
-8184=>'L',
-8185=>'L',
-8186=>'L',
-8187=>'L',
-8188=>'L',
-8189=>'ON',
-8190=>'ON',
-8192=>'WS',
-8193=>'WS',
-8194=>'WS',
-8195=>'WS',
-8196=>'WS',
-8197=>'WS',
-8198=>'WS',
-8199=>'WS',
-8200=>'WS',
-8201=>'WS',
-8202=>'WS',
-8203=>'BN',
-8204=>'BN',
-8205=>'BN',
-8206=>'L',
-8207=>'R',
-8208=>'ON',
-8209=>'ON',
-8210=>'ON',
-8211=>'ON',
-8212=>'ON',
-8213=>'ON',
-8214=>'ON',
-8215=>'ON',
-8216=>'ON',
-8217=>'ON',
-8218=>'ON',
-8219=>'ON',
-8220=>'ON',
-8221=>'ON',
-8222=>'ON',
-8223=>'ON',
-8224=>'ON',
-8225=>'ON',
-8226=>'ON',
-8227=>'ON',
-8228=>'ON',
-8229=>'ON',
-8230=>'ON',
-8231=>'ON',
-8232=>'WS',
-8233=>'B',
-8234=>'LRE',
-8235=>'RLE',
-8236=>'PDF',
-8237=>'LRO',
-8238=>'RLO',
-8239=>'CS',
-8240=>'ET',
-8241=>'ET',
-8242=>'ET',
-8243=>'ET',
-8244=>'ET',
-8245=>'ON',
-8246=>'ON',
-8247=>'ON',
-8248=>'ON',
-8249=>'ON',
-8250=>'ON',
-8251=>'ON',
-8252=>'ON',
-8253=>'ON',
-8254=>'ON',
-8255=>'ON',
-8256=>'ON',
-8257=>'ON',
-8258=>'ON',
-8259=>'ON',
-8260=>'CS',
-8261=>'ON',
-8262=>'ON',
-8263=>'ON',
-8264=>'ON',
-8265=>'ON',
-8266=>'ON',
-8267=>'ON',
-8268=>'ON',
-8269=>'ON',
-8270=>'ON',
-8271=>'ON',
-8272=>'ON',
-8273=>'ON',
-8274=>'ON',
-8275=>'ON',
-8276=>'ON',
-8277=>'ON',
-8278=>'ON',
-8279=>'ON',
-8280=>'ON',
-8281=>'ON',
-8282=>'ON',
-8283=>'ON',
-8284=>'ON',
-8285=>'ON',
-8286=>'ON',
-8287=>'WS',
-8288=>'BN',
-8289=>'BN',
-8290=>'BN',
-8291=>'BN',
-8298=>'BN',
-8299=>'BN',
-8300=>'BN',
-8301=>'BN',
-8302=>'BN',
-8303=>'BN',
-8304=>'EN',
-8305=>'L',
-8308=>'EN',
-8309=>'EN',
-8310=>'EN',
-8311=>'EN',
-8312=>'EN',
-8313=>'EN',
-8314=>'ES',
-8315=>'ES',
-8316=>'ON',
-8317=>'ON',
-8318=>'ON',
-8319=>'L',
-8320=>'EN',
-8321=>'EN',
-8322=>'EN',
-8323=>'EN',
-8324=>'EN',
-8325=>'EN',
-8326=>'EN',
-8327=>'EN',
-8328=>'EN',
-8329=>'EN',
-8330=>'ES',
-8331=>'ES',
-8332=>'ON',
-8333=>'ON',
-8334=>'ON',
-8336=>'L',
-8337=>'L',
-8338=>'L',
-8339=>'L',
-8340=>'L',
-8352=>'ET',
-8353=>'ET',
-8354=>'ET',
-8355=>'ET',
-8356=>'ET',
-8357=>'ET',
-8358=>'ET',
-8359=>'ET',
-8360=>'ET',
-8361=>'ET',
-8362=>'ET',
-8363=>'ET',
-8364=>'ET',
-8365=>'ET',
-8366=>'ET',
-8367=>'ET',
-8368=>'ET',
-8369=>'ET',
-8370=>'ET',
-8371=>'ET',
-8372=>'ET',
-8373=>'ET',
-8400=>'NSM',
-8401=>'NSM',
-8402=>'NSM',
-8403=>'NSM',
-8404=>'NSM',
-8405=>'NSM',
-8406=>'NSM',
-8407=>'NSM',
-8408=>'NSM',
-8409=>'NSM',
-8410=>'NSM',
-8411=>'NSM',
-8412=>'NSM',
-8413=>'NSM',
-8414=>'NSM',
-8415=>'NSM',
-8416=>'NSM',
-8417=>'NSM',
-8418=>'NSM',
-8419=>'NSM',
-8420=>'NSM',
-8421=>'NSM',
-8422=>'NSM',
-8423=>'NSM',
-8424=>'NSM',
-8425=>'NSM',
-8426=>'NSM',
-8427=>'NSM',
-8428=>'NSM',
-8429=>'NSM',
-8430=>'NSM',
-8431=>'NSM',
-8448=>'ON',
-8449=>'ON',
-8450=>'L',
-8451=>'ON',
-8452=>'ON',
-8453=>'ON',
-8454=>'ON',
-8455=>'L',
-8456=>'ON',
-8457=>'ON',
-8458=>'L',
-8459=>'L',
-8460=>'L',
-8461=>'L',
-8462=>'L',
-8463=>'L',
-8464=>'L',
-8465=>'L',
-8466=>'L',
-8467=>'L',
-8468=>'ON',
-8469=>'L',
-8470=>'ON',
-8471=>'ON',
-8472=>'ON',
-8473=>'L',
-8474=>'L',
-8475=>'L',
-8476=>'L',
-8477=>'L',
-8478=>'ON',
-8479=>'ON',
-8480=>'ON',
-8481=>'ON',
-8482=>'ON',
-8483=>'ON',
-8484=>'L',
-8485=>'ON',
-8486=>'L',
-8487=>'ON',
-8488=>'L',
-8489=>'ON',
-8490=>'L',
-8491=>'L',
-8492=>'L',
-8493=>'L',
-8494=>'ET',
-8495=>'L',
-8496=>'L',
-8497=>'L',
-8498=>'L',
-8499=>'L',
-8500=>'L',
-8501=>'L',
-8502=>'L',
-8503=>'L',
-8504=>'L',
-8505=>'L',
-8506=>'ON',
-8507=>'ON',
-8508=>'L',
-8509=>'L',
-8510=>'L',
-8511=>'L',
-8512=>'ON',
-8513=>'ON',
-8514=>'ON',
-8515=>'ON',
-8516=>'ON',
-8517=>'L',
-8518=>'L',
-8519=>'L',
-8520=>'L',
-8521=>'L',
-8522=>'ON',
-8523=>'ON',
-8524=>'ON',
-8525=>'ON',
-8526=>'L',
-8531=>'ON',
-8532=>'ON',
-8533=>'ON',
-8534=>'ON',
-8535=>'ON',
-8536=>'ON',
-8537=>'ON',
-8538=>'ON',
-8539=>'ON',
-8540=>'ON',
-8541=>'ON',
-8542=>'ON',
-8543=>'ON',
-8544=>'L',
-8545=>'L',
-8546=>'L',
-8547=>'L',
-8548=>'L',
-8549=>'L',
-8550=>'L',
-8551=>'L',
-8552=>'L',
-8553=>'L',
-8554=>'L',
-8555=>'L',
-8556=>'L',
-8557=>'L',
-8558=>'L',
-8559=>'L',
-8560=>'L',
-8561=>'L',
-8562=>'L',
-8563=>'L',
-8564=>'L',
-8565=>'L',
-8566=>'L',
-8567=>'L',
-8568=>'L',
-8569=>'L',
-8570=>'L',
-8571=>'L',
-8572=>'L',
-8573=>'L',
-8574=>'L',
-8575=>'L',
-8576=>'L',
-8577=>'L',
-8578=>'L',
-8579=>'L',
-8580=>'L',
-8592=>'ON',
-8593=>'ON',
-8594=>'ON',
-8595=>'ON',
-8596=>'ON',
-8597=>'ON',
-8598=>'ON',
-8599=>'ON',
-8600=>'ON',
-8601=>'ON',
-8602=>'ON',
-8603=>'ON',
-8604=>'ON',
-8605=>'ON',
-8606=>'ON',
-8607=>'ON',
-8608=>'ON',
-8609=>'ON',
-8610=>'ON',
-8611=>'ON',
-8612=>'ON',
-8613=>'ON',
-8614=>'ON',
-8615=>'ON',
-8616=>'ON',
-8617=>'ON',
-8618=>'ON',
-8619=>'ON',
-8620=>'ON',
-8621=>'ON',
-8622=>'ON',
-8623=>'ON',
-8624=>'ON',
-8625=>'ON',
-8626=>'ON',
-8627=>'ON',
-8628=>'ON',
-8629=>'ON',
-8630=>'ON',
-8631=>'ON',
-8632=>'ON',
-8633=>'ON',
-8634=>'ON',
-8635=>'ON',
-8636=>'ON',
-8637=>'ON',
-8638=>'ON',
-8639=>'ON',
-8640=>'ON',
-8641=>'ON',
-8642=>'ON',
-8643=>'ON',
-8644=>'ON',
-8645=>'ON',
-8646=>'ON',
-8647=>'ON',
-8648=>'ON',
-8649=>'ON',
-8650=>'ON',
-8651=>'ON',
-8652=>'ON',
-8653=>'ON',
-8654=>'ON',
-8655=>'ON',
-8656=>'ON',
-8657=>'ON',
-8658=>'ON',
-8659=>'ON',
-8660=>'ON',
-8661=>'ON',
-8662=>'ON',
-8663=>'ON',
-8664=>'ON',
-8665=>'ON',
-8666=>'ON',
-8667=>'ON',
-8668=>'ON',
-8669=>'ON',
-8670=>'ON',
-8671=>'ON',
-8672=>'ON',
-8673=>'ON',
-8674=>'ON',
-8675=>'ON',
-8676=>'ON',
-8677=>'ON',
-8678=>'ON',
-8679=>'ON',
-8680=>'ON',
-8681=>'ON',
-8682=>'ON',
-8683=>'ON',
-8684=>'ON',
-8685=>'ON',
-8686=>'ON',
-8687=>'ON',
-8688=>'ON',
-8689=>'ON',
-8690=>'ON',
-8691=>'ON',
-8692=>'ON',
-8693=>'ON',
-8694=>'ON',
-8695=>'ON',
-8696=>'ON',
-8697=>'ON',
-8698=>'ON',
-8699=>'ON',
-8700=>'ON',
-8701=>'ON',
-8702=>'ON',
-8703=>'ON',
-8704=>'ON',
-8705=>'ON',
-8706=>'ON',
-8707=>'ON',
-8708=>'ON',
-8709=>'ON',
-8710=>'ON',
-8711=>'ON',
-8712=>'ON',
-8713=>'ON',
-8714=>'ON',
-8715=>'ON',
-8716=>'ON',
-8717=>'ON',
-8718=>'ON',
-8719=>'ON',
-8720=>'ON',
-8721=>'ON',
-8722=>'ES',
-8723=>'ET',
-8724=>'ON',
-8725=>'ON',
-8726=>'ON',
-8727=>'ON',
-8728=>'ON',
-8729=>'ON',
-8730=>'ON',
-8731=>'ON',
-8732=>'ON',
-8733=>'ON',
-8734=>'ON',
-8735=>'ON',
-8736=>'ON',
-8737=>'ON',
-8738=>'ON',
-8739=>'ON',
-8740=>'ON',
-8741=>'ON',
-8742=>'ON',
-8743=>'ON',
-8744=>'ON',
-8745=>'ON',
-8746=>'ON',
-8747=>'ON',
-8748=>'ON',
-8749=>'ON',
-8750=>'ON',
-8751=>'ON',
-8752=>'ON',
-8753=>'ON',
-8754=>'ON',
-8755=>'ON',
-8756=>'ON',
-8757=>'ON',
-8758=>'ON',
-8759=>'ON',
-8760=>'ON',
-8761=>'ON',
-8762=>'ON',
-8763=>'ON',
-8764=>'ON',
-8765=>'ON',
-8766=>'ON',
-8767=>'ON',
-8768=>'ON',
-8769=>'ON',
-8770=>'ON',
-8771=>'ON',
-8772=>'ON',
-8773=>'ON',
-8774=>'ON',
-8775=>'ON',
-8776=>'ON',
-8777=>'ON',
-8778=>'ON',
-8779=>'ON',
-8780=>'ON',
-8781=>'ON',
-8782=>'ON',
-8783=>'ON',
-8784=>'ON',
-8785=>'ON',
-8786=>'ON',
-8787=>'ON',
-8788=>'ON',
-8789=>'ON',
-8790=>'ON',
-8791=>'ON',
-8792=>'ON',
-8793=>'ON',
-8794=>'ON',
-8795=>'ON',
-8796=>'ON',
-8797=>'ON',
-8798=>'ON',
-8799=>'ON',
-8800=>'ON',
-8801=>'ON',
-8802=>'ON',
-8803=>'ON',
-8804=>'ON',
-8805=>'ON',
-8806=>'ON',
-8807=>'ON',
-8808=>'ON',
-8809=>'ON',
-8810=>'ON',
-8811=>'ON',
-8812=>'ON',
-8813=>'ON',
-8814=>'ON',
-8815=>'ON',
-8816=>'ON',
-8817=>'ON',
-8818=>'ON',
-8819=>'ON',
-8820=>'ON',
-8821=>'ON',
-8822=>'ON',
-8823=>'ON',
-8824=>'ON',
-8825=>'ON',
-8826=>'ON',
-8827=>'ON',
-8828=>'ON',
-8829=>'ON',
-8830=>'ON',
-8831=>'ON',
-8832=>'ON',
-8833=>'ON',
-8834=>'ON',
-8835=>'ON',
-8836=>'ON',
-8837=>'ON',
-8838=>'ON',
-8839=>'ON',
-8840=>'ON',
-8841=>'ON',
-8842=>'ON',
-8843=>'ON',
-8844=>'ON',
-8845=>'ON',
-8846=>'ON',
-8847=>'ON',
-8848=>'ON',
-8849=>'ON',
-8850=>'ON',
-8851=>'ON',
-8852=>'ON',
-8853=>'ON',
-8854=>'ON',
-8855=>'ON',
-8856=>'ON',
-8857=>'ON',
-8858=>'ON',
-8859=>'ON',
-8860=>'ON',
-8861=>'ON',
-8862=>'ON',
-8863=>'ON',
-8864=>'ON',
-8865=>'ON',
-8866=>'ON',
-8867=>'ON',
-8868=>'ON',
-8869=>'ON',
-8870=>'ON',
-8871=>'ON',
-8872=>'ON',
-8873=>'ON',
-8874=>'ON',
-8875=>'ON',
-8876=>'ON',
-8877=>'ON',
-8878=>'ON',
-8879=>'ON',
-8880=>'ON',
-8881=>'ON',
-8882=>'ON',
-8883=>'ON',
-8884=>'ON',
-8885=>'ON',
-8886=>'ON',
-8887=>'ON',
-8888=>'ON',
-8889=>'ON',
-8890=>'ON',
-8891=>'ON',
-8892=>'ON',
-8893=>'ON',
-8894=>'ON',
-8895=>'ON',
-8896=>'ON',
-8897=>'ON',
-8898=>'ON',
-8899=>'ON',
-8900=>'ON',
-8901=>'ON',
-8902=>'ON',
-8903=>'ON',
-8904=>'ON',
-8905=>'ON',
-8906=>'ON',
-8907=>'ON',
-8908=>'ON',
-8909=>'ON',
-8910=>'ON',
-8911=>'ON',
-8912=>'ON',
-8913=>'ON',
-8914=>'ON',
-8915=>'ON',
-8916=>'ON',
-8917=>'ON',
-8918=>'ON',
-8919=>'ON',
-8920=>'ON',
-8921=>'ON',
-8922=>'ON',
-8923=>'ON',
-8924=>'ON',
-8925=>'ON',
-8926=>'ON',
-8927=>'ON',
-8928=>'ON',
-8929=>'ON',
-8930=>'ON',
-8931=>'ON',
-8932=>'ON',
-8933=>'ON',
-8934=>'ON',
-8935=>'ON',
-8936=>'ON',
-8937=>'ON',
-8938=>'ON',
-8939=>'ON',
-8940=>'ON',
-8941=>'ON',
-8942=>'ON',
-8943=>'ON',
-8944=>'ON',
-8945=>'ON',
-8946=>'ON',
-8947=>'ON',
-8948=>'ON',
-8949=>'ON',
-8950=>'ON',
-8951=>'ON',
-8952=>'ON',
-8953=>'ON',
-8954=>'ON',
-8955=>'ON',
-8956=>'ON',
-8957=>'ON',
-8958=>'ON',
-8959=>'ON',
-8960=>'ON',
-8961=>'ON',
-8962=>'ON',
-8963=>'ON',
-8964=>'ON',
-8965=>'ON',
-8966=>'ON',
-8967=>'ON',
-8968=>'ON',
-8969=>'ON',
-8970=>'ON',
-8971=>'ON',
-8972=>'ON',
-8973=>'ON',
-8974=>'ON',
-8975=>'ON',
-8976=>'ON',
-8977=>'ON',
-8978=>'ON',
-8979=>'ON',
-8980=>'ON',
-8981=>'ON',
-8982=>'ON',
-8983=>'ON',
-8984=>'ON',
-8985=>'ON',
-8986=>'ON',
-8987=>'ON',
-8988=>'ON',
-8989=>'ON',
-8990=>'ON',
-8991=>'ON',
-8992=>'ON',
-8993=>'ON',
-8994=>'ON',
-8995=>'ON',
-8996=>'ON',
-8997=>'ON',
-8998=>'ON',
-8999=>'ON',
-9000=>'ON',
-9001=>'ON',
-9002=>'ON',
-9003=>'ON',
-9004=>'ON',
-9005=>'ON',
-9006=>'ON',
-9007=>'ON',
-9008=>'ON',
-9009=>'ON',
-9010=>'ON',
-9011=>'ON',
-9012=>'ON',
-9013=>'ON',
-9014=>'L',
-9015=>'L',
-9016=>'L',
-9017=>'L',
-9018=>'L',
-9019=>'L',
-9020=>'L',
-9021=>'L',
-9022=>'L',
-9023=>'L',
-9024=>'L',
-9025=>'L',
-9026=>'L',
-9027=>'L',
-9028=>'L',
-9029=>'L',
-9030=>'L',
-9031=>'L',
-9032=>'L',
-9033=>'L',
-9034=>'L',
-9035=>'L',
-9036=>'L',
-9037=>'L',
-9038=>'L',
-9039=>'L',
-9040=>'L',
-9041=>'L',
-9042=>'L',
-9043=>'L',
-9044=>'L',
-9045=>'L',
-9046=>'L',
-9047=>'L',
-9048=>'L',
-9049=>'L',
-9050=>'L',
-9051=>'L',
-9052=>'L',
-9053=>'L',
-9054=>'L',
-9055=>'L',
-9056=>'L',
-9057=>'L',
-9058=>'L',
-9059=>'L',
-9060=>'L',
-9061=>'L',
-9062=>'L',
-9063=>'L',
-9064=>'L',
-9065=>'L',
-9066=>'L',
-9067=>'L',
-9068=>'L',
-9069=>'L',
-9070=>'L',
-9071=>'L',
-9072=>'L',
-9073=>'L',
-9074=>'L',
-9075=>'L',
-9076=>'L',
-9077=>'L',
-9078=>'L',
-9079=>'L',
-9080=>'L',
-9081=>'L',
-9082=>'L',
-9083=>'ON',
-9084=>'ON',
-9085=>'ON',
-9086=>'ON',
-9087=>'ON',
-9088=>'ON',
-9089=>'ON',
-9090=>'ON',
-9091=>'ON',
-9092=>'ON',
-9093=>'ON',
-9094=>'ON',
-9095=>'ON',
-9096=>'ON',
-9097=>'ON',
-9098=>'ON',
-9099=>'ON',
-9100=>'ON',
-9101=>'ON',
-9102=>'ON',
-9103=>'ON',
-9104=>'ON',
-9105=>'ON',
-9106=>'ON',
-9107=>'ON',
-9108=>'ON',
-9109=>'L',
-9110=>'ON',
-9111=>'ON',
-9112=>'ON',
-9113=>'ON',
-9114=>'ON',
-9115=>'ON',
-9116=>'ON',
-9117=>'ON',
-9118=>'ON',
-9119=>'ON',
-9120=>'ON',
-9121=>'ON',
-9122=>'ON',
-9123=>'ON',
-9124=>'ON',
-9125=>'ON',
-9126=>'ON',
-9127=>'ON',
-9128=>'ON',
-9129=>'ON',
-9130=>'ON',
-9131=>'ON',
-9132=>'ON',
-9133=>'ON',
-9134=>'ON',
-9135=>'ON',
-9136=>'ON',
-9137=>'ON',
-9138=>'ON',
-9139=>'ON',
-9140=>'ON',
-9141=>'ON',
-9142=>'ON',
-9143=>'ON',
-9144=>'ON',
-9145=>'ON',
-9146=>'ON',
-9147=>'ON',
-9148=>'ON',
-9149=>'ON',
-9150=>'ON',
-9151=>'ON',
-9152=>'ON',
-9153=>'ON',
-9154=>'ON',
-9155=>'ON',
-9156=>'ON',
-9157=>'ON',
-9158=>'ON',
-9159=>'ON',
-9160=>'ON',
-9161=>'ON',
-9162=>'ON',
-9163=>'ON',
-9164=>'ON',
-9165=>'ON',
-9166=>'ON',
-9167=>'ON',
-9168=>'ON',
-9169=>'ON',
-9170=>'ON',
-9171=>'ON',
-9172=>'ON',
-9173=>'ON',
-9174=>'ON',
-9175=>'ON',
-9176=>'ON',
-9177=>'ON',
-9178=>'ON',
-9179=>'ON',
-9180=>'ON',
-9181=>'ON',
-9182=>'ON',
-9183=>'ON',
-9184=>'ON',
-9185=>'ON',
-9186=>'ON',
-9187=>'ON',
-9188=>'ON',
-9189=>'ON',
-9190=>'ON',
-9191=>'ON',
-9216=>'ON',
-9217=>'ON',
-9218=>'ON',
-9219=>'ON',
-9220=>'ON',
-9221=>'ON',
-9222=>'ON',
-9223=>'ON',
-9224=>'ON',
-9225=>'ON',
-9226=>'ON',
-9227=>'ON',
-9228=>'ON',
-9229=>'ON',
-9230=>'ON',
-9231=>'ON',
-9232=>'ON',
-9233=>'ON',
-9234=>'ON',
-9235=>'ON',
-9236=>'ON',
-9237=>'ON',
-9238=>'ON',
-9239=>'ON',
-9240=>'ON',
-9241=>'ON',
-9242=>'ON',
-9243=>'ON',
-9244=>'ON',
-9245=>'ON',
-9246=>'ON',
-9247=>'ON',
-9248=>'ON',
-9249=>'ON',
-9250=>'ON',
-9251=>'ON',
-9252=>'ON',
-9253=>'ON',
-9254=>'ON',
-9280=>'ON',
-9281=>'ON',
-9282=>'ON',
-9283=>'ON',
-9284=>'ON',
-9285=>'ON',
-9286=>'ON',
-9287=>'ON',
-9288=>'ON',
-9289=>'ON',
-9290=>'ON',
-9312=>'ON',
-9313=>'ON',
-9314=>'ON',
-9315=>'ON',
-9316=>'ON',
-9317=>'ON',
-9318=>'ON',
-9319=>'ON',
-9320=>'ON',
-9321=>'ON',
-9322=>'ON',
-9323=>'ON',
-9324=>'ON',
-9325=>'ON',
-9326=>'ON',
-9327=>'ON',
-9328=>'ON',
-9329=>'ON',
-9330=>'ON',
-9331=>'ON',
-9332=>'ON',
-9333=>'ON',
-9334=>'ON',
-9335=>'ON',
-9336=>'ON',
-9337=>'ON',
-9338=>'ON',
-9339=>'ON',
-9340=>'ON',
-9341=>'ON',
-9342=>'ON',
-9343=>'ON',
-9344=>'ON',
-9345=>'ON',
-9346=>'ON',
-9347=>'ON',
-9348=>'ON',
-9349=>'ON',
-9350=>'ON',
-9351=>'ON',
-9352=>'EN',
-9353=>'EN',
-9354=>'EN',
-9355=>'EN',
-9356=>'EN',
-9357=>'EN',
-9358=>'EN',
-9359=>'EN',
-9360=>'EN',
-9361=>'EN',
-9362=>'EN',
-9363=>'EN',
-9364=>'EN',
-9365=>'EN',
-9366=>'EN',
-9367=>'EN',
-9368=>'EN',
-9369=>'EN',
-9370=>'EN',
-9371=>'EN',
-9372=>'L',
-9373=>'L',
-9374=>'L',
-9375=>'L',
-9376=>'L',
-9377=>'L',
-9378=>'L',
-9379=>'L',
-9380=>'L',
-9381=>'L',
-9382=>'L',
-9383=>'L',
-9384=>'L',
-9385=>'L',
-9386=>'L',
-9387=>'L',
-9388=>'L',
-9389=>'L',
-9390=>'L',
-9391=>'L',
-9392=>'L',
-9393=>'L',
-9394=>'L',
-9395=>'L',
-9396=>'L',
-9397=>'L',
-9398=>'L',
-9399=>'L',
-9400=>'L',
-9401=>'L',
-9402=>'L',
-9403=>'L',
-9404=>'L',
-9405=>'L',
-9406=>'L',
-9407=>'L',
-9408=>'L',
-9409=>'L',
-9410=>'L',
-9411=>'L',
-9412=>'L',
-9413=>'L',
-9414=>'L',
-9415=>'L',
-9416=>'L',
-9417=>'L',
-9418=>'L',
-9419=>'L',
-9420=>'L',
-9421=>'L',
-9422=>'L',
-9423=>'L',
-9424=>'L',
-9425=>'L',
-9426=>'L',
-9427=>'L',
-9428=>'L',
-9429=>'L',
-9430=>'L',
-9431=>'L',
-9432=>'L',
-9433=>'L',
-9434=>'L',
-9435=>'L',
-9436=>'L',
-9437=>'L',
-9438=>'L',
-9439=>'L',
-9440=>'L',
-9441=>'L',
-9442=>'L',
-9443=>'L',
-9444=>'L',
-9445=>'L',
-9446=>'L',
-9447=>'L',
-9448=>'L',
-9449=>'L',
-9450=>'ON',
-9451=>'ON',
-9452=>'ON',
-9453=>'ON',
-9454=>'ON',
-9455=>'ON',
-9456=>'ON',
-9457=>'ON',
-9458=>'ON',
-9459=>'ON',
-9460=>'ON',
-9461=>'ON',
-9462=>'ON',
-9463=>'ON',
-9464=>'ON',
-9465=>'ON',
-9466=>'ON',
-9467=>'ON',
-9468=>'ON',
-9469=>'ON',
-9470=>'ON',
-9471=>'ON',
-9472=>'ON',
-9473=>'ON',
-9474=>'ON',
-9475=>'ON',
-9476=>'ON',
-9477=>'ON',
-9478=>'ON',
-9479=>'ON',
-9480=>'ON',
-9481=>'ON',
-9482=>'ON',
-9483=>'ON',
-9484=>'ON',
-9485=>'ON',
-9486=>'ON',
-9487=>'ON',
-9488=>'ON',
-9489=>'ON',
-9490=>'ON',
-9491=>'ON',
-9492=>'ON',
-9493=>'ON',
-9494=>'ON',
-9495=>'ON',
-9496=>'ON',
-9497=>'ON',
-9498=>'ON',
-9499=>'ON',
-9500=>'ON',
-9501=>'ON',
-9502=>'ON',
-9503=>'ON',
-9504=>'ON',
-9505=>'ON',
-9506=>'ON',
-9507=>'ON',
-9508=>'ON',
-9509=>'ON',
-9510=>'ON',
-9511=>'ON',
-9512=>'ON',
-9513=>'ON',
-9514=>'ON',
-9515=>'ON',
-9516=>'ON',
-9517=>'ON',
-9518=>'ON',
-9519=>'ON',
-9520=>'ON',
-9521=>'ON',
-9522=>'ON',
-9523=>'ON',
-9524=>'ON',
-9525=>'ON',
-9526=>'ON',
-9527=>'ON',
-9528=>'ON',
-9529=>'ON',
-9530=>'ON',
-9531=>'ON',
-9532=>'ON',
-9533=>'ON',
-9534=>'ON',
-9535=>'ON',
-9536=>'ON',
-9537=>'ON',
-9538=>'ON',
-9539=>'ON',
-9540=>'ON',
-9541=>'ON',
-9542=>'ON',
-9543=>'ON',
-9544=>'ON',
-9545=>'ON',
-9546=>'ON',
-9547=>'ON',
-9548=>'ON',
-9549=>'ON',
-9550=>'ON',
-9551=>'ON',
-9552=>'ON',
-9553=>'ON',
-9554=>'ON',
-9555=>'ON',
-9556=>'ON',
-9557=>'ON',
-9558=>'ON',
-9559=>'ON',
-9560=>'ON',
-9561=>'ON',
-9562=>'ON',
-9563=>'ON',
-9564=>'ON',
-9565=>'ON',
-9566=>'ON',
-9567=>'ON',
-9568=>'ON',
-9569=>'ON',
-9570=>'ON',
-9571=>'ON',
-9572=>'ON',
-9573=>'ON',
-9574=>'ON',
-9575=>'ON',
-9576=>'ON',
-9577=>'ON',
-9578=>'ON',
-9579=>'ON',
-9580=>'ON',
-9581=>'ON',
-9582=>'ON',
-9583=>'ON',
-9584=>'ON',
-9585=>'ON',
-9586=>'ON',
-9587=>'ON',
-9588=>'ON',
-9589=>'ON',
-9590=>'ON',
-9591=>'ON',
-9592=>'ON',
-9593=>'ON',
-9594=>'ON',
-9595=>'ON',
-9596=>'ON',
-9597=>'ON',
-9598=>'ON',
-9599=>'ON',
-9600=>'ON',
-9601=>'ON',
-9602=>'ON',
-9603=>'ON',
-9604=>'ON',
-9605=>'ON',
-9606=>'ON',
-9607=>'ON',
-9608=>'ON',
-9609=>'ON',
-9610=>'ON',
-9611=>'ON',
-9612=>'ON',
-9613=>'ON',
-9614=>'ON',
-9615=>'ON',
-9616=>'ON',
-9617=>'ON',
-9618=>'ON',
-9619=>'ON',
-9620=>'ON',
-9621=>'ON',
-9622=>'ON',
-9623=>'ON',
-9624=>'ON',
-9625=>'ON',
-9626=>'ON',
-9627=>'ON',
-9628=>'ON',
-9629=>'ON',
-9630=>'ON',
-9631=>'ON',
-9632=>'ON',
-9633=>'ON',
-9634=>'ON',
-9635=>'ON',
-9636=>'ON',
-9637=>'ON',
-9638=>'ON',
-9639=>'ON',
-9640=>'ON',
-9641=>'ON',
-9642=>'ON',
-9643=>'ON',
-9644=>'ON',
-9645=>'ON',
-9646=>'ON',
-9647=>'ON',
-9648=>'ON',
-9649=>'ON',
-9650=>'ON',
-9651=>'ON',
-9652=>'ON',
-9653=>'ON',
-9654=>'ON',
-9655=>'ON',
-9656=>'ON',
-9657=>'ON',
-9658=>'ON',
-9659=>'ON',
-9660=>'ON',
-9661=>'ON',
-9662=>'ON',
-9663=>'ON',
-9664=>'ON',
-9665=>'ON',
-9666=>'ON',
-9667=>'ON',
-9668=>'ON',
-9669=>'ON',
-9670=>'ON',
-9671=>'ON',
-9672=>'ON',
-9673=>'ON',
-9674=>'ON',
-9675=>'ON',
-9676=>'ON',
-9677=>'ON',
-9678=>'ON',
-9679=>'ON',
-9680=>'ON',
-9681=>'ON',
-9682=>'ON',
-9683=>'ON',
-9684=>'ON',
-9685=>'ON',
-9686=>'ON',
-9687=>'ON',
-9688=>'ON',
-9689=>'ON',
-9690=>'ON',
-9691=>'ON',
-9692=>'ON',
-9693=>'ON',
-9694=>'ON',
-9695=>'ON',
-9696=>'ON',
-9697=>'ON',
-9698=>'ON',
-9699=>'ON',
-9700=>'ON',
-9701=>'ON',
-9702=>'ON',
-9703=>'ON',
-9704=>'ON',
-9705=>'ON',
-9706=>'ON',
-9707=>'ON',
-9708=>'ON',
-9709=>'ON',
-9710=>'ON',
-9711=>'ON',
-9712=>'ON',
-9713=>'ON',
-9714=>'ON',
-9715=>'ON',
-9716=>'ON',
-9717=>'ON',
-9718=>'ON',
-9719=>'ON',
-9720=>'ON',
-9721=>'ON',
-9722=>'ON',
-9723=>'ON',
-9724=>'ON',
-9725=>'ON',
-9726=>'ON',
-9727=>'ON',
-9728=>'ON',
-9729=>'ON',
-9730=>'ON',
-9731=>'ON',
-9732=>'ON',
-9733=>'ON',
-9734=>'ON',
-9735=>'ON',
-9736=>'ON',
-9737=>'ON',
-9738=>'ON',
-9739=>'ON',
-9740=>'ON',
-9741=>'ON',
-9742=>'ON',
-9743=>'ON',
-9744=>'ON',
-9745=>'ON',
-9746=>'ON',
-9747=>'ON',
-9748=>'ON',
-9749=>'ON',
-9750=>'ON',
-9751=>'ON',
-9752=>'ON',
-9753=>'ON',
-9754=>'ON',
-9755=>'ON',
-9756=>'ON',
-9757=>'ON',
-9758=>'ON',
-9759=>'ON',
-9760=>'ON',
-9761=>'ON',
-9762=>'ON',
-9763=>'ON',
-9764=>'ON',
-9765=>'ON',
-9766=>'ON',
-9767=>'ON',
-9768=>'ON',
-9769=>'ON',
-9770=>'ON',
-9771=>'ON',
-9772=>'ON',
-9773=>'ON',
-9774=>'ON',
-9775=>'ON',
-9776=>'ON',
-9777=>'ON',
-9778=>'ON',
-9779=>'ON',
-9780=>'ON',
-9781=>'ON',
-9782=>'ON',
-9783=>'ON',
-9784=>'ON',
-9785=>'ON',
-9786=>'ON',
-9787=>'ON',
-9788=>'ON',
-9789=>'ON',
-9790=>'ON',
-9791=>'ON',
-9792=>'ON',
-9793=>'ON',
-9794=>'ON',
-9795=>'ON',
-9796=>'ON',
-9797=>'ON',
-9798=>'ON',
-9799=>'ON',
-9800=>'ON',
-9801=>'ON',
-9802=>'ON',
-9803=>'ON',
-9804=>'ON',
-9805=>'ON',
-9806=>'ON',
-9807=>'ON',
-9808=>'ON',
-9809=>'ON',
-9810=>'ON',
-9811=>'ON',
-9812=>'ON',
-9813=>'ON',
-9814=>'ON',
-9815=>'ON',
-9816=>'ON',
-9817=>'ON',
-9818=>'ON',
-9819=>'ON',
-9820=>'ON',
-9821=>'ON',
-9822=>'ON',
-9823=>'ON',
-9824=>'ON',
-9825=>'ON',
-9826=>'ON',
-9827=>'ON',
-9828=>'ON',
-9829=>'ON',
-9830=>'ON',
-9831=>'ON',
-9832=>'ON',
-9833=>'ON',
-9834=>'ON',
-9835=>'ON',
-9836=>'ON',
-9837=>'ON',
-9838=>'ON',
-9839=>'ON',
-9840=>'ON',
-9841=>'ON',
-9842=>'ON',
-9843=>'ON',
-9844=>'ON',
-9845=>'ON',
-9846=>'ON',
-9847=>'ON',
-9848=>'ON',
-9849=>'ON',
-9850=>'ON',
-9851=>'ON',
-9852=>'ON',
-9853=>'ON',
-9854=>'ON',
-9855=>'ON',
-9856=>'ON',
-9857=>'ON',
-9858=>'ON',
-9859=>'ON',
-9860=>'ON',
-9861=>'ON',
-9862=>'ON',
-9863=>'ON',
-9864=>'ON',
-9865=>'ON',
-9866=>'ON',
-9867=>'ON',
-9868=>'ON',
-9869=>'ON',
-9870=>'ON',
-9871=>'ON',
-9872=>'ON',
-9873=>'ON',
-9874=>'ON',
-9875=>'ON',
-9876=>'ON',
-9877=>'ON',
-9878=>'ON',
-9879=>'ON',
-9880=>'ON',
-9881=>'ON',
-9882=>'ON',
-9883=>'ON',
-9884=>'ON',
-9888=>'ON',
-9889=>'ON',
-9890=>'ON',
-9891=>'ON',
-9892=>'ON',
-9893=>'ON',
-9894=>'ON',
-9895=>'ON',
-9896=>'ON',
-9897=>'ON',
-9898=>'ON',
-9899=>'ON',
-9900=>'L',
-9901=>'ON',
-9902=>'ON',
-9903=>'ON',
-9904=>'ON',
-9905=>'ON',
-9906=>'ON',
-9985=>'ON',
-9986=>'ON',
-9987=>'ON',
-9988=>'ON',
-9990=>'ON',
-9991=>'ON',
-9992=>'ON',
-9993=>'ON',
-9996=>'ON',
-9997=>'ON',
-9998=>'ON',
-9999=>'ON',
-10000=>'ON',
-10001=>'ON',
-10002=>'ON',
-10003=>'ON',
-10004=>'ON',
-10005=>'ON',
-10006=>'ON',
-10007=>'ON',
-10008=>'ON',
-10009=>'ON',
-10010=>'ON',
-10011=>'ON',
-10012=>'ON',
-10013=>'ON',
-10014=>'ON',
-10015=>'ON',
-10016=>'ON',
-10017=>'ON',
-10018=>'ON',
-10019=>'ON',
-10020=>'ON',
-10021=>'ON',
-10022=>'ON',
-10023=>'ON',
-10025=>'ON',
-10026=>'ON',
-10027=>'ON',
-10028=>'ON',
-10029=>'ON',
-10030=>'ON',
-10031=>'ON',
-10032=>'ON',
-10033=>'ON',
-10034=>'ON',
-10035=>'ON',
-10036=>'ON',
-10037=>'ON',
-10038=>'ON',
-10039=>'ON',
-10040=>'ON',
-10041=>'ON',
-10042=>'ON',
-10043=>'ON',
-10044=>'ON',
-10045=>'ON',
-10046=>'ON',
-10047=>'ON',
-10048=>'ON',
-10049=>'ON',
-10050=>'ON',
-10051=>'ON',
-10052=>'ON',
-10053=>'ON',
-10054=>'ON',
-10055=>'ON',
-10056=>'ON',
-10057=>'ON',
-10058=>'ON',
-10059=>'ON',
-10061=>'ON',
-10063=>'ON',
-10064=>'ON',
-10065=>'ON',
-10066=>'ON',
-10070=>'ON',
-10072=>'ON',
-10073=>'ON',
-10074=>'ON',
-10075=>'ON',
-10076=>'ON',
-10077=>'ON',
-10078=>'ON',
-10081=>'ON',
-10082=>'ON',
-10083=>'ON',
-10084=>'ON',
-10085=>'ON',
-10086=>'ON',
-10087=>'ON',
-10088=>'ON',
-10089=>'ON',
-10090=>'ON',
-10091=>'ON',
-10092=>'ON',
-10093=>'ON',
-10094=>'ON',
-10095=>'ON',
-10096=>'ON',
-10097=>'ON',
-10098=>'ON',
-10099=>'ON',
-10100=>'ON',
-10101=>'ON',
-10102=>'ON',
-10103=>'ON',
-10104=>'ON',
-10105=>'ON',
-10106=>'ON',
-10107=>'ON',
-10108=>'ON',
-10109=>'ON',
-10110=>'ON',
-10111=>'ON',
-10112=>'ON',
-10113=>'ON',
-10114=>'ON',
-10115=>'ON',
-10116=>'ON',
-10117=>'ON',
-10118=>'ON',
-10119=>'ON',
-10120=>'ON',
-10121=>'ON',
-10122=>'ON',
-10123=>'ON',
-10124=>'ON',
-10125=>'ON',
-10126=>'ON',
-10127=>'ON',
-10128=>'ON',
-10129=>'ON',
-10130=>'ON',
-10131=>'ON',
-10132=>'ON',
-10136=>'ON',
-10137=>'ON',
-10138=>'ON',
-10139=>'ON',
-10140=>'ON',
-10141=>'ON',
-10142=>'ON',
-10143=>'ON',
-10144=>'ON',
-10145=>'ON',
-10146=>'ON',
-10147=>'ON',
-10148=>'ON',
-10149=>'ON',
-10150=>'ON',
-10151=>'ON',
-10152=>'ON',
-10153=>'ON',
-10154=>'ON',
-10155=>'ON',
-10156=>'ON',
-10157=>'ON',
-10158=>'ON',
-10159=>'ON',
-10161=>'ON',
-10162=>'ON',
-10163=>'ON',
-10164=>'ON',
-10165=>'ON',
-10166=>'ON',
-10167=>'ON',
-10168=>'ON',
-10169=>'ON',
-10170=>'ON',
-10171=>'ON',
-10172=>'ON',
-10173=>'ON',
-10174=>'ON',
-10176=>'ON',
-10177=>'ON',
-10178=>'ON',
-10179=>'ON',
-10180=>'ON',
-10181=>'ON',
-10182=>'ON',
-10183=>'ON',
-10184=>'ON',
-10185=>'ON',
-10186=>'ON',
-10192=>'ON',
-10193=>'ON',
-10194=>'ON',
-10195=>'ON',
-10196=>'ON',
-10197=>'ON',
-10198=>'ON',
-10199=>'ON',
-10200=>'ON',
-10201=>'ON',
-10202=>'ON',
-10203=>'ON',
-10204=>'ON',
-10205=>'ON',
-10206=>'ON',
-10207=>'ON',
-10208=>'ON',
-10209=>'ON',
-10210=>'ON',
-10211=>'ON',
-10212=>'ON',
-10213=>'ON',
-10214=>'ON',
-10215=>'ON',
-10216=>'ON',
-10217=>'ON',
-10218=>'ON',
-10219=>'ON',
-10224=>'ON',
-10225=>'ON',
-10226=>'ON',
-10227=>'ON',
-10228=>'ON',
-10229=>'ON',
-10230=>'ON',
-10231=>'ON',
-10232=>'ON',
-10233=>'ON',
-10234=>'ON',
-10235=>'ON',
-10236=>'ON',
-10237=>'ON',
-10238=>'ON',
-10239=>'ON',
-10240=>'L',
-10241=>'L',
-10242=>'L',
-10243=>'L',
-10244=>'L',
-10245=>'L',
-10246=>'L',
-10247=>'L',
-10248=>'L',
-10249=>'L',
-10250=>'L',
-10251=>'L',
-10252=>'L',
-10253=>'L',
-10254=>'L',
-10255=>'L',
-10256=>'L',
-10257=>'L',
-10258=>'L',
-10259=>'L',
-10260=>'L',
-10261=>'L',
-10262=>'L',
-10263=>'L',
-10264=>'L',
-10265=>'L',
-10266=>'L',
-10267=>'L',
-10268=>'L',
-10269=>'L',
-10270=>'L',
-10271=>'L',
-10272=>'L',
-10273=>'L',
-10274=>'L',
-10275=>'L',
-10276=>'L',
-10277=>'L',
-10278=>'L',
-10279=>'L',
-10280=>'L',
-10281=>'L',
-10282=>'L',
-10283=>'L',
-10284=>'L',
-10285=>'L',
-10286=>'L',
-10287=>'L',
-10288=>'L',
-10289=>'L',
-10290=>'L',
-10291=>'L',
-10292=>'L',
-10293=>'L',
-10294=>'L',
-10295=>'L',
-10296=>'L',
-10297=>'L',
-10298=>'L',
-10299=>'L',
-10300=>'L',
-10301=>'L',
-10302=>'L',
-10303=>'L',
-10304=>'L',
-10305=>'L',
-10306=>'L',
-10307=>'L',
-10308=>'L',
-10309=>'L',
-10310=>'L',
-10311=>'L',
-10312=>'L',
-10313=>'L',
-10314=>'L',
-10315=>'L',
-10316=>'L',
-10317=>'L',
-10318=>'L',
-10319=>'L',
-10320=>'L',
-10321=>'L',
-10322=>'L',
-10323=>'L',
-10324=>'L',
-10325=>'L',
-10326=>'L',
-10327=>'L',
-10328=>'L',
-10329=>'L',
-10330=>'L',
-10331=>'L',
-10332=>'L',
-10333=>'L',
-10334=>'L',
-10335=>'L',
-10336=>'L',
-10337=>'L',
-10338=>'L',
-10339=>'L',
-10340=>'L',
-10341=>'L',
-10342=>'L',
-10343=>'L',
-10344=>'L',
-10345=>'L',
-10346=>'L',
-10347=>'L',
-10348=>'L',
-10349=>'L',
-10350=>'L',
-10351=>'L',
-10352=>'L',
-10353=>'L',
-10354=>'L',
-10355=>'L',
-10356=>'L',
-10357=>'L',
-10358=>'L',
-10359=>'L',
-10360=>'L',
-10361=>'L',
-10362=>'L',
-10363=>'L',
-10364=>'L',
-10365=>'L',
-10366=>'L',
-10367=>'L',
-10368=>'L',
-10369=>'L',
-10370=>'L',
-10371=>'L',
-10372=>'L',
-10373=>'L',
-10374=>'L',
-10375=>'L',
-10376=>'L',
-10377=>'L',
-10378=>'L',
-10379=>'L',
-10380=>'L',
-10381=>'L',
-10382=>'L',
-10383=>'L',
-10384=>'L',
-10385=>'L',
-10386=>'L',
-10387=>'L',
-10388=>'L',
-10389=>'L',
-10390=>'L',
-10391=>'L',
-10392=>'L',
-10393=>'L',
-10394=>'L',
-10395=>'L',
-10396=>'L',
-10397=>'L',
-10398=>'L',
-10399=>'L',
-10400=>'L',
-10401=>'L',
-10402=>'L',
-10403=>'L',
-10404=>'L',
-10405=>'L',
-10406=>'L',
-10407=>'L',
-10408=>'L',
-10409=>'L',
-10410=>'L',
-10411=>'L',
-10412=>'L',
-10413=>'L',
-10414=>'L',
-10415=>'L',
-10416=>'L',
-10417=>'L',
-10418=>'L',
-10419=>'L',
-10420=>'L',
-10421=>'L',
-10422=>'L',
-10423=>'L',
-10424=>'L',
-10425=>'L',
-10426=>'L',
-10427=>'L',
-10428=>'L',
-10429=>'L',
-10430=>'L',
-10431=>'L',
-10432=>'L',
-10433=>'L',
-10434=>'L',
-10435=>'L',
-10436=>'L',
-10437=>'L',
-10438=>'L',
-10439=>'L',
-10440=>'L',
-10441=>'L',
-10442=>'L',
-10443=>'L',
-10444=>'L',
-10445=>'L',
-10446=>'L',
-10447=>'L',
-10448=>'L',
-10449=>'L',
-10450=>'L',
-10451=>'L',
-10452=>'L',
-10453=>'L',
-10454=>'L',
-10455=>'L',
-10456=>'L',
-10457=>'L',
-10458=>'L',
-10459=>'L',
-10460=>'L',
-10461=>'L',
-10462=>'L',
-10463=>'L',
-10464=>'L',
-10465=>'L',
-10466=>'L',
-10467=>'L',
-10468=>'L',
-10469=>'L',
-10470=>'L',
-10471=>'L',
-10472=>'L',
-10473=>'L',
-10474=>'L',
-10475=>'L',
-10476=>'L',
-10477=>'L',
-10478=>'L',
-10479=>'L',
-10480=>'L',
-10481=>'L',
-10482=>'L',
-10483=>'L',
-10484=>'L',
-10485=>'L',
-10486=>'L',
-10487=>'L',
-10488=>'L',
-10489=>'L',
-10490=>'L',
-10491=>'L',
-10492=>'L',
-10493=>'L',
-10494=>'L',
-10495=>'L',
-10496=>'ON',
-10497=>'ON',
-10498=>'ON',
-10499=>'ON',
-10500=>'ON',
-10501=>'ON',
-10502=>'ON',
-10503=>'ON',
-10504=>'ON',
-10505=>'ON',
-10506=>'ON',
-10507=>'ON',
-10508=>'ON',
-10509=>'ON',
-10510=>'ON',
-10511=>'ON',
-10512=>'ON',
-10513=>'ON',
-10514=>'ON',
-10515=>'ON',
-10516=>'ON',
-10517=>'ON',
-10518=>'ON',
-10519=>'ON',
-10520=>'ON',
-10521=>'ON',
-10522=>'ON',
-10523=>'ON',
-10524=>'ON',
-10525=>'ON',
-10526=>'ON',
-10527=>'ON',
-10528=>'ON',
-10529=>'ON',
-10530=>'ON',
-10531=>'ON',
-10532=>'ON',
-10533=>'ON',
-10534=>'ON',
-10535=>'ON',
-10536=>'ON',
-10537=>'ON',
-10538=>'ON',
-10539=>'ON',
-10540=>'ON',
-10541=>'ON',
-10542=>'ON',
-10543=>'ON',
-10544=>'ON',
-10545=>'ON',
-10546=>'ON',
-10547=>'ON',
-10548=>'ON',
-10549=>'ON',
-10550=>'ON',
-10551=>'ON',
-10552=>'ON',
-10553=>'ON',
-10554=>'ON',
-10555=>'ON',
-10556=>'ON',
-10557=>'ON',
-10558=>'ON',
-10559=>'ON',
-10560=>'ON',
-10561=>'ON',
-10562=>'ON',
-10563=>'ON',
-10564=>'ON',
-10565=>'ON',
-10566=>'ON',
-10567=>'ON',
-10568=>'ON',
-10569=>'ON',
-10570=>'ON',
-10571=>'ON',
-10572=>'ON',
-10573=>'ON',
-10574=>'ON',
-10575=>'ON',
-10576=>'ON',
-10577=>'ON',
-10578=>'ON',
-10579=>'ON',
-10580=>'ON',
-10581=>'ON',
-10582=>'ON',
-10583=>'ON',
-10584=>'ON',
-10585=>'ON',
-10586=>'ON',
-10587=>'ON',
-10588=>'ON',
-10589=>'ON',
-10590=>'ON',
-10591=>'ON',
-10592=>'ON',
-10593=>'ON',
-10594=>'ON',
-10595=>'ON',
-10596=>'ON',
-10597=>'ON',
-10598=>'ON',
-10599=>'ON',
-10600=>'ON',
-10601=>'ON',
-10602=>'ON',
-10603=>'ON',
-10604=>'ON',
-10605=>'ON',
-10606=>'ON',
-10607=>'ON',
-10608=>'ON',
-10609=>'ON',
-10610=>'ON',
-10611=>'ON',
-10612=>'ON',
-10613=>'ON',
-10614=>'ON',
-10615=>'ON',
-10616=>'ON',
-10617=>'ON',
-10618=>'ON',
-10619=>'ON',
-10620=>'ON',
-10621=>'ON',
-10622=>'ON',
-10623=>'ON',
-10624=>'ON',
-10625=>'ON',
-10626=>'ON',
-10627=>'ON',
-10628=>'ON',
-10629=>'ON',
-10630=>'ON',
-10631=>'ON',
-10632=>'ON',
-10633=>'ON',
-10634=>'ON',
-10635=>'ON',
-10636=>'ON',
-10637=>'ON',
-10638=>'ON',
-10639=>'ON',
-10640=>'ON',
-10641=>'ON',
-10642=>'ON',
-10643=>'ON',
-10644=>'ON',
-10645=>'ON',
-10646=>'ON',
-10647=>'ON',
-10648=>'ON',
-10649=>'ON',
-10650=>'ON',
-10651=>'ON',
-10652=>'ON',
-10653=>'ON',
-10654=>'ON',
-10655=>'ON',
-10656=>'ON',
-10657=>'ON',
-10658=>'ON',
-10659=>'ON',
-10660=>'ON',
-10661=>'ON',
-10662=>'ON',
-10663=>'ON',
-10664=>'ON',
-10665=>'ON',
-10666=>'ON',
-10667=>'ON',
-10668=>'ON',
-10669=>'ON',
-10670=>'ON',
-10671=>'ON',
-10672=>'ON',
-10673=>'ON',
-10674=>'ON',
-10675=>'ON',
-10676=>'ON',
-10677=>'ON',
-10678=>'ON',
-10679=>'ON',
-10680=>'ON',
-10681=>'ON',
-10682=>'ON',
-10683=>'ON',
-10684=>'ON',
-10685=>'ON',
-10686=>'ON',
-10687=>'ON',
-10688=>'ON',
-10689=>'ON',
-10690=>'ON',
-10691=>'ON',
-10692=>'ON',
-10693=>'ON',
-10694=>'ON',
-10695=>'ON',
-10696=>'ON',
-10697=>'ON',
-10698=>'ON',
-10699=>'ON',
-10700=>'ON',
-10701=>'ON',
-10702=>'ON',
-10703=>'ON',
-10704=>'ON',
-10705=>'ON',
-10706=>'ON',
-10707=>'ON',
-10708=>'ON',
-10709=>'ON',
-10710=>'ON',
-10711=>'ON',
-10712=>'ON',
-10713=>'ON',
-10714=>'ON',
-10715=>'ON',
-10716=>'ON',
-10717=>'ON',
-10718=>'ON',
-10719=>'ON',
-10720=>'ON',
-10721=>'ON',
-10722=>'ON',
-10723=>'ON',
-10724=>'ON',
-10725=>'ON',
-10726=>'ON',
-10727=>'ON',
-10728=>'ON',
-10729=>'ON',
-10730=>'ON',
-10731=>'ON',
-10732=>'ON',
-10733=>'ON',
-10734=>'ON',
-10735=>'ON',
-10736=>'ON',
-10737=>'ON',
-10738=>'ON',
-10739=>'ON',
-10740=>'ON',
-10741=>'ON',
-10742=>'ON',
-10743=>'ON',
-10744=>'ON',
-10745=>'ON',
-10746=>'ON',
-10747=>'ON',
-10748=>'ON',
-10749=>'ON',
-10750=>'ON',
-10751=>'ON',
-10752=>'ON',
-10753=>'ON',
-10754=>'ON',
-10755=>'ON',
-10756=>'ON',
-10757=>'ON',
-10758=>'ON',
-10759=>'ON',
-10760=>'ON',
-10761=>'ON',
-10762=>'ON',
-10763=>'ON',
-10764=>'ON',
-10765=>'ON',
-10766=>'ON',
-10767=>'ON',
-10768=>'ON',
-10769=>'ON',
-10770=>'ON',
-10771=>'ON',
-10772=>'ON',
-10773=>'ON',
-10774=>'ON',
-10775=>'ON',
-10776=>'ON',
-10777=>'ON',
-10778=>'ON',
-10779=>'ON',
-10780=>'ON',
-10781=>'ON',
-10782=>'ON',
-10783=>'ON',
-10784=>'ON',
-10785=>'ON',
-10786=>'ON',
-10787=>'ON',
-10788=>'ON',
-10789=>'ON',
-10790=>'ON',
-10791=>'ON',
-10792=>'ON',
-10793=>'ON',
-10794=>'ON',
-10795=>'ON',
-10796=>'ON',
-10797=>'ON',
-10798=>'ON',
-10799=>'ON',
-10800=>'ON',
-10801=>'ON',
-10802=>'ON',
-10803=>'ON',
-10804=>'ON',
-10805=>'ON',
-10806=>'ON',
-10807=>'ON',
-10808=>'ON',
-10809=>'ON',
-10810=>'ON',
-10811=>'ON',
-10812=>'ON',
-10813=>'ON',
-10814=>'ON',
-10815=>'ON',
-10816=>'ON',
-10817=>'ON',
-10818=>'ON',
-10819=>'ON',
-10820=>'ON',
-10821=>'ON',
-10822=>'ON',
-10823=>'ON',
-10824=>'ON',
-10825=>'ON',
-10826=>'ON',
-10827=>'ON',
-10828=>'ON',
-10829=>'ON',
-10830=>'ON',
-10831=>'ON',
-10832=>'ON',
-10833=>'ON',
-10834=>'ON',
-10835=>'ON',
-10836=>'ON',
-10837=>'ON',
-10838=>'ON',
-10839=>'ON',
-10840=>'ON',
-10841=>'ON',
-10842=>'ON',
-10843=>'ON',
-10844=>'ON',
-10845=>'ON',
-10846=>'ON',
-10847=>'ON',
-10848=>'ON',
-10849=>'ON',
-10850=>'ON',
-10851=>'ON',
-10852=>'ON',
-10853=>'ON',
-10854=>'ON',
-10855=>'ON',
-10856=>'ON',
-10857=>'ON',
-10858=>'ON',
-10859=>'ON',
-10860=>'ON',
-10861=>'ON',
-10862=>'ON',
-10863=>'ON',
-10864=>'ON',
-10865=>'ON',
-10866=>'ON',
-10867=>'ON',
-10868=>'ON',
-10869=>'ON',
-10870=>'ON',
-10871=>'ON',
-10872=>'ON',
-10873=>'ON',
-10874=>'ON',
-10875=>'ON',
-10876=>'ON',
-10877=>'ON',
-10878=>'ON',
-10879=>'ON',
-10880=>'ON',
-10881=>'ON',
-10882=>'ON',
-10883=>'ON',
-10884=>'ON',
-10885=>'ON',
-10886=>'ON',
-10887=>'ON',
-10888=>'ON',
-10889=>'ON',
-10890=>'ON',
-10891=>'ON',
-10892=>'ON',
-10893=>'ON',
-10894=>'ON',
-10895=>'ON',
-10896=>'ON',
-10897=>'ON',
-10898=>'ON',
-10899=>'ON',
-10900=>'ON',
-10901=>'ON',
-10902=>'ON',
-10903=>'ON',
-10904=>'ON',
-10905=>'ON',
-10906=>'ON',
-10907=>'ON',
-10908=>'ON',
-10909=>'ON',
-10910=>'ON',
-10911=>'ON',
-10912=>'ON',
-10913=>'ON',
-10914=>'ON',
-10915=>'ON',
-10916=>'ON',
-10917=>'ON',
-10918=>'ON',
-10919=>'ON',
-10920=>'ON',
-10921=>'ON',
-10922=>'ON',
-10923=>'ON',
-10924=>'ON',
-10925=>'ON',
-10926=>'ON',
-10927=>'ON',
-10928=>'ON',
-10929=>'ON',
-10930=>'ON',
-10931=>'ON',
-10932=>'ON',
-10933=>'ON',
-10934=>'ON',
-10935=>'ON',
-10936=>'ON',
-10937=>'ON',
-10938=>'ON',
-10939=>'ON',
-10940=>'ON',
-10941=>'ON',
-10942=>'ON',
-10943=>'ON',
-10944=>'ON',
-10945=>'ON',
-10946=>'ON',
-10947=>'ON',
-10948=>'ON',
-10949=>'ON',
-10950=>'ON',
-10951=>'ON',
-10952=>'ON',
-10953=>'ON',
-10954=>'ON',
-10955=>'ON',
-10956=>'ON',
-10957=>'ON',
-10958=>'ON',
-10959=>'ON',
-10960=>'ON',
-10961=>'ON',
-10962=>'ON',
-10963=>'ON',
-10964=>'ON',
-10965=>'ON',
-10966=>'ON',
-10967=>'ON',
-10968=>'ON',
-10969=>'ON',
-10970=>'ON',
-10971=>'ON',
-10972=>'ON',
-10973=>'ON',
-10974=>'ON',
-10975=>'ON',
-10976=>'ON',
-10977=>'ON',
-10978=>'ON',
-10979=>'ON',
-10980=>'ON',
-10981=>'ON',
-10982=>'ON',
-10983=>'ON',
-10984=>'ON',
-10985=>'ON',
-10986=>'ON',
-10987=>'ON',
-10988=>'ON',
-10989=>'ON',
-10990=>'ON',
-10991=>'ON',
-10992=>'ON',
-10993=>'ON',
-10994=>'ON',
-10995=>'ON',
-10996=>'ON',
-10997=>'ON',
-10998=>'ON',
-10999=>'ON',
-11000=>'ON',
-11001=>'ON',
-11002=>'ON',
-11003=>'ON',
-11004=>'ON',
-11005=>'ON',
-11006=>'ON',
-11007=>'ON',
-11008=>'ON',
-11009=>'ON',
-11010=>'ON',
-11011=>'ON',
-11012=>'ON',
-11013=>'ON',
-11014=>'ON',
-11015=>'ON',
-11016=>'ON',
-11017=>'ON',
-11018=>'ON',
-11019=>'ON',
-11020=>'ON',
-11021=>'ON',
-11022=>'ON',
-11023=>'ON',
-11024=>'ON',
-11025=>'ON',
-11026=>'ON',
-11027=>'ON',
-11028=>'ON',
-11029=>'ON',
-11030=>'ON',
-11031=>'ON',
-11032=>'ON',
-11033=>'ON',
-11034=>'ON',
-11040=>'ON',
-11041=>'ON',
-11042=>'ON',
-11043=>'ON',
-11264=>'L',
-11265=>'L',
-11266=>'L',
-11267=>'L',
-11268=>'L',
-11269=>'L',
-11270=>'L',
-11271=>'L',
-11272=>'L',
-11273=>'L',
-11274=>'L',
-11275=>'L',
-11276=>'L',
-11277=>'L',
-11278=>'L',
-11279=>'L',
-11280=>'L',
-11281=>'L',
-11282=>'L',
-11283=>'L',
-11284=>'L',
-11285=>'L',
-11286=>'L',
-11287=>'L',
-11288=>'L',
-11289=>'L',
-11290=>'L',
-11291=>'L',
-11292=>'L',
-11293=>'L',
-11294=>'L',
-11295=>'L',
-11296=>'L',
-11297=>'L',
-11298=>'L',
-11299=>'L',
-11300=>'L',
-11301=>'L',
-11302=>'L',
-11303=>'L',
-11304=>'L',
-11305=>'L',
-11306=>'L',
-11307=>'L',
-11308=>'L',
-11309=>'L',
-11310=>'L',
-11312=>'L',
-11313=>'L',
-11314=>'L',
-11315=>'L',
-11316=>'L',
-11317=>'L',
-11318=>'L',
-11319=>'L',
-11320=>'L',
-11321=>'L',
-11322=>'L',
-11323=>'L',
-11324=>'L',
-11325=>'L',
-11326=>'L',
-11327=>'L',
-11328=>'L',
-11329=>'L',
-11330=>'L',
-11331=>'L',
-11332=>'L',
-11333=>'L',
-11334=>'L',
-11335=>'L',
-11336=>'L',
-11337=>'L',
-11338=>'L',
-11339=>'L',
-11340=>'L',
-11341=>'L',
-11342=>'L',
-11343=>'L',
-11344=>'L',
-11345=>'L',
-11346=>'L',
-11347=>'L',
-11348=>'L',
-11349=>'L',
-11350=>'L',
-11351=>'L',
-11352=>'L',
-11353=>'L',
-11354=>'L',
-11355=>'L',
-11356=>'L',
-11357=>'L',
-11358=>'L',
-11360=>'L',
-11361=>'L',
-11362=>'L',
-11363=>'L',
-11364=>'L',
-11365=>'L',
-11366=>'L',
-11367=>'L',
-11368=>'L',
-11369=>'L',
-11370=>'L',
-11371=>'L',
-11372=>'L',
-11380=>'L',
-11381=>'L',
-11382=>'L',
-11383=>'L',
-11392=>'L',
-11393=>'L',
-11394=>'L',
-11395=>'L',
-11396=>'L',
-11397=>'L',
-11398=>'L',
-11399=>'L',
-11400=>'L',
-11401=>'L',
-11402=>'L',
-11403=>'L',
-11404=>'L',
-11405=>'L',
-11406=>'L',
-11407=>'L',
-11408=>'L',
-11409=>'L',
-11410=>'L',
-11411=>'L',
-11412=>'L',
-11413=>'L',
-11414=>'L',
-11415=>'L',
-11416=>'L',
-11417=>'L',
-11418=>'L',
-11419=>'L',
-11420=>'L',
-11421=>'L',
-11422=>'L',
-11423=>'L',
-11424=>'L',
-11425=>'L',
-11426=>'L',
-11427=>'L',
-11428=>'L',
-11429=>'L',
-11430=>'L',
-11431=>'L',
-11432=>'L',
-11433=>'L',
-11434=>'L',
-11435=>'L',
-11436=>'L',
-11437=>'L',
-11438=>'L',
-11439=>'L',
-11440=>'L',
-11441=>'L',
-11442=>'L',
-11443=>'L',
-11444=>'L',
-11445=>'L',
-11446=>'L',
-11447=>'L',
-11448=>'L',
-11449=>'L',
-11450=>'L',
-11451=>'L',
-11452=>'L',
-11453=>'L',
-11454=>'L',
-11455=>'L',
-11456=>'L',
-11457=>'L',
-11458=>'L',
-11459=>'L',
-11460=>'L',
-11461=>'L',
-11462=>'L',
-11463=>'L',
-11464=>'L',
-11465=>'L',
-11466=>'L',
-11467=>'L',
-11468=>'L',
-11469=>'L',
-11470=>'L',
-11471=>'L',
-11472=>'L',
-11473=>'L',
-11474=>'L',
-11475=>'L',
-11476=>'L',
-11477=>'L',
-11478=>'L',
-11479=>'L',
-11480=>'L',
-11481=>'L',
-11482=>'L',
-11483=>'L',
-11484=>'L',
-11485=>'L',
-11486=>'L',
-11487=>'L',
-11488=>'L',
-11489=>'L',
-11490=>'L',
-11491=>'L',
-11492=>'L',
-11493=>'ON',
-11494=>'ON',
-11495=>'ON',
-11496=>'ON',
-11497=>'ON',
-11498=>'ON',
-11513=>'ON',
-11514=>'ON',
-11515=>'ON',
-11516=>'ON',
-11517=>'ON',
-11518=>'ON',
-11519=>'ON',
-11520=>'L',
-11521=>'L',
-11522=>'L',
-11523=>'L',
-11524=>'L',
-11525=>'L',
-11526=>'L',
-11527=>'L',
-11528=>'L',
-11529=>'L',
-11530=>'L',
-11531=>'L',
-11532=>'L',
-11533=>'L',
-11534=>'L',
-11535=>'L',
-11536=>'L',
-11537=>'L',
-11538=>'L',
-11539=>'L',
-11540=>'L',
-11541=>'L',
-11542=>'L',
-11543=>'L',
-11544=>'L',
-11545=>'L',
-11546=>'L',
-11547=>'L',
-11548=>'L',
-11549=>'L',
-11550=>'L',
-11551=>'L',
-11552=>'L',
-11553=>'L',
-11554=>'L',
-11555=>'L',
-11556=>'L',
-11557=>'L',
-11568=>'L',
-11569=>'L',
-11570=>'L',
-11571=>'L',
-11572=>'L',
-11573=>'L',
-11574=>'L',
-11575=>'L',
-11576=>'L',
-11577=>'L',
-11578=>'L',
-11579=>'L',
-11580=>'L',
-11581=>'L',
-11582=>'L',
-11583=>'L',
-11584=>'L',
-11585=>'L',
-11586=>'L',
-11587=>'L',
-11588=>'L',
-11589=>'L',
-11590=>'L',
-11591=>'L',
-11592=>'L',
-11593=>'L',
-11594=>'L',
-11595=>'L',
-11596=>'L',
-11597=>'L',
-11598=>'L',
-11599=>'L',
-11600=>'L',
-11601=>'L',
-11602=>'L',
-11603=>'L',
-11604=>'L',
-11605=>'L',
-11606=>'L',
-11607=>'L',
-11608=>'L',
-11609=>'L',
-11610=>'L',
-11611=>'L',
-11612=>'L',
-11613=>'L',
-11614=>'L',
-11615=>'L',
-11616=>'L',
-11617=>'L',
-11618=>'L',
-11619=>'L',
-11620=>'L',
-11621=>'L',
-11631=>'L',
-11648=>'L',
-11649=>'L',
-11650=>'L',
-11651=>'L',
-11652=>'L',
-11653=>'L',
-11654=>'L',
-11655=>'L',
-11656=>'L',
-11657=>'L',
-11658=>'L',
-11659=>'L',
-11660=>'L',
-11661=>'L',
-11662=>'L',
-11663=>'L',
-11664=>'L',
-11665=>'L',
-11666=>'L',
-11667=>'L',
-11668=>'L',
-11669=>'L',
-11670=>'L',
-11680=>'L',
-11681=>'L',
-11682=>'L',
-11683=>'L',
-11684=>'L',
-11685=>'L',
-11686=>'L',
-11688=>'L',
-11689=>'L',
-11690=>'L',
-11691=>'L',
-11692=>'L',
-11693=>'L',
-11694=>'L',
-11696=>'L',
-11697=>'L',
-11698=>'L',
-11699=>'L',
-11700=>'L',
-11701=>'L',
-11702=>'L',
-11704=>'L',
-11705=>'L',
-11706=>'L',
-11707=>'L',
-11708=>'L',
-11709=>'L',
-11710=>'L',
-11712=>'L',
-11713=>'L',
-11714=>'L',
-11715=>'L',
-11716=>'L',
-11717=>'L',
-11718=>'L',
-11720=>'L',
-11721=>'L',
-11722=>'L',
-11723=>'L',
-11724=>'L',
-11725=>'L',
-11726=>'L',
-11728=>'L',
-11729=>'L',
-11730=>'L',
-11731=>'L',
-11732=>'L',
-11733=>'L',
-11734=>'L',
-11736=>'L',
-11737=>'L',
-11738=>'L',
-11739=>'L',
-11740=>'L',
-11741=>'L',
-11742=>'L',
-11776=>'ON',
-11777=>'ON',
-11778=>'ON',
-11779=>'ON',
-11780=>'ON',
-11781=>'ON',
-11782=>'ON',
-11783=>'ON',
-11784=>'ON',
-11785=>'ON',
-11786=>'ON',
-11787=>'ON',
-11788=>'ON',
-11789=>'ON',
-11790=>'ON',
-11791=>'ON',
-11792=>'ON',
-11793=>'ON',
-11794=>'ON',
-11795=>'ON',
-11796=>'ON',
-11797=>'ON',
-11798=>'ON',
-11799=>'ON',
-11804=>'ON',
-11805=>'ON',
-11904=>'ON',
-11905=>'ON',
-11906=>'ON',
-11907=>'ON',
-11908=>'ON',
-11909=>'ON',
-11910=>'ON',
-11911=>'ON',
-11912=>'ON',
-11913=>'ON',
-11914=>'ON',
-11915=>'ON',
-11916=>'ON',
-11917=>'ON',
-11918=>'ON',
-11919=>'ON',
-11920=>'ON',
-11921=>'ON',
-11922=>'ON',
-11923=>'ON',
-11924=>'ON',
-11925=>'ON',
-11926=>'ON',
-11927=>'ON',
-11928=>'ON',
-11929=>'ON',
-11931=>'ON',
-11932=>'ON',
-11933=>'ON',
-11934=>'ON',
-11935=>'ON',
-11936=>'ON',
-11937=>'ON',
-11938=>'ON',
-11939=>'ON',
-11940=>'ON',
-11941=>'ON',
-11942=>'ON',
-11943=>'ON',
-11944=>'ON',
-11945=>'ON',
-11946=>'ON',
-11947=>'ON',
-11948=>'ON',
-11949=>'ON',
-11950=>'ON',
-11951=>'ON',
-11952=>'ON',
-11953=>'ON',
-11954=>'ON',
-11955=>'ON',
-11956=>'ON',
-11957=>'ON',
-11958=>'ON',
-11959=>'ON',
-11960=>'ON',
-11961=>'ON',
-11962=>'ON',
-11963=>'ON',
-11964=>'ON',
-11965=>'ON',
-11966=>'ON',
-11967=>'ON',
-11968=>'ON',
-11969=>'ON',
-11970=>'ON',
-11971=>'ON',
-11972=>'ON',
-11973=>'ON',
-11974=>'ON',
-11975=>'ON',
-11976=>'ON',
-11977=>'ON',
-11978=>'ON',
-11979=>'ON',
-11980=>'ON',
-11981=>'ON',
-11982=>'ON',
-11983=>'ON',
-11984=>'ON',
-11985=>'ON',
-11986=>'ON',
-11987=>'ON',
-11988=>'ON',
-11989=>'ON',
-11990=>'ON',
-11991=>'ON',
-11992=>'ON',
-11993=>'ON',
-11994=>'ON',
-11995=>'ON',
-11996=>'ON',
-11997=>'ON',
-11998=>'ON',
-11999=>'ON',
-12000=>'ON',
-12001=>'ON',
-12002=>'ON',
-12003=>'ON',
-12004=>'ON',
-12005=>'ON',
-12006=>'ON',
-12007=>'ON',
-12008=>'ON',
-12009=>'ON',
-12010=>'ON',
-12011=>'ON',
-12012=>'ON',
-12013=>'ON',
-12014=>'ON',
-12015=>'ON',
-12016=>'ON',
-12017=>'ON',
-12018=>'ON',
-12019=>'ON',
-12032=>'ON',
-12033=>'ON',
-12034=>'ON',
-12035=>'ON',
-12036=>'ON',
-12037=>'ON',
-12038=>'ON',
-12039=>'ON',
-12040=>'ON',
-12041=>'ON',
-12042=>'ON',
-12043=>'ON',
-12044=>'ON',
-12045=>'ON',
-12046=>'ON',
-12047=>'ON',
-12048=>'ON',
-12049=>'ON',
-12050=>'ON',
-12051=>'ON',
-12052=>'ON',
-12053=>'ON',
-12054=>'ON',
-12055=>'ON',
-12056=>'ON',
-12057=>'ON',
-12058=>'ON',
-12059=>'ON',
-12060=>'ON',
-12061=>'ON',
-12062=>'ON',
-12063=>'ON',
-12064=>'ON',
-12065=>'ON',
-12066=>'ON',
-12067=>'ON',
-12068=>'ON',
-12069=>'ON',
-12070=>'ON',
-12071=>'ON',
-12072=>'ON',
-12073=>'ON',
-12074=>'ON',
-12075=>'ON',
-12076=>'ON',
-12077=>'ON',
-12078=>'ON',
-12079=>'ON',
-12080=>'ON',
-12081=>'ON',
-12082=>'ON',
-12083=>'ON',
-12084=>'ON',
-12085=>'ON',
-12086=>'ON',
-12087=>'ON',
-12088=>'ON',
-12089=>'ON',
-12090=>'ON',
-12091=>'ON',
-12092=>'ON',
-12093=>'ON',
-12094=>'ON',
-12095=>'ON',
-12096=>'ON',
-12097=>'ON',
-12098=>'ON',
-12099=>'ON',
-12100=>'ON',
-12101=>'ON',
-12102=>'ON',
-12103=>'ON',
-12104=>'ON',
-12105=>'ON',
-12106=>'ON',
-12107=>'ON',
-12108=>'ON',
-12109=>'ON',
-12110=>'ON',
-12111=>'ON',
-12112=>'ON',
-12113=>'ON',
-12114=>'ON',
-12115=>'ON',
-12116=>'ON',
-12117=>'ON',
-12118=>'ON',
-12119=>'ON',
-12120=>'ON',
-12121=>'ON',
-12122=>'ON',
-12123=>'ON',
-12124=>'ON',
-12125=>'ON',
-12126=>'ON',
-12127=>'ON',
-12128=>'ON',
-12129=>'ON',
-12130=>'ON',
-12131=>'ON',
-12132=>'ON',
-12133=>'ON',
-12134=>'ON',
-12135=>'ON',
-12136=>'ON',
-12137=>'ON',
-12138=>'ON',
-12139=>'ON',
-12140=>'ON',
-12141=>'ON',
-12142=>'ON',
-12143=>'ON',
-12144=>'ON',
-12145=>'ON',
-12146=>'ON',
-12147=>'ON',
-12148=>'ON',
-12149=>'ON',
-12150=>'ON',
-12151=>'ON',
-12152=>'ON',
-12153=>'ON',
-12154=>'ON',
-12155=>'ON',
-12156=>'ON',
-12157=>'ON',
-12158=>'ON',
-12159=>'ON',
-12160=>'ON',
-12161=>'ON',
-12162=>'ON',
-12163=>'ON',
-12164=>'ON',
-12165=>'ON',
-12166=>'ON',
-12167=>'ON',
-12168=>'ON',
-12169=>'ON',
-12170=>'ON',
-12171=>'ON',
-12172=>'ON',
-12173=>'ON',
-12174=>'ON',
-12175=>'ON',
-12176=>'ON',
-12177=>'ON',
-12178=>'ON',
-12179=>'ON',
-12180=>'ON',
-12181=>'ON',
-12182=>'ON',
-12183=>'ON',
-12184=>'ON',
-12185=>'ON',
-12186=>'ON',
-12187=>'ON',
-12188=>'ON',
-12189=>'ON',
-12190=>'ON',
-12191=>'ON',
-12192=>'ON',
-12193=>'ON',
-12194=>'ON',
-12195=>'ON',
-12196=>'ON',
-12197=>'ON',
-12198=>'ON',
-12199=>'ON',
-12200=>'ON',
-12201=>'ON',
-12202=>'ON',
-12203=>'ON',
-12204=>'ON',
-12205=>'ON',
-12206=>'ON',
-12207=>'ON',
-12208=>'ON',
-12209=>'ON',
-12210=>'ON',
-12211=>'ON',
-12212=>'ON',
-12213=>'ON',
-12214=>'ON',
-12215=>'ON',
-12216=>'ON',
-12217=>'ON',
-12218=>'ON',
-12219=>'ON',
-12220=>'ON',
-12221=>'ON',
-12222=>'ON',
-12223=>'ON',
-12224=>'ON',
-12225=>'ON',
-12226=>'ON',
-12227=>'ON',
-12228=>'ON',
-12229=>'ON',
-12230=>'ON',
-12231=>'ON',
-12232=>'ON',
-12233=>'ON',
-12234=>'ON',
-12235=>'ON',
-12236=>'ON',
-12237=>'ON',
-12238=>'ON',
-12239=>'ON',
-12240=>'ON',
-12241=>'ON',
-12242=>'ON',
-12243=>'ON',
-12244=>'ON',
-12245=>'ON',
-12272=>'ON',
-12273=>'ON',
-12274=>'ON',
-12275=>'ON',
-12276=>'ON',
-12277=>'ON',
-12278=>'ON',
-12279=>'ON',
-12280=>'ON',
-12281=>'ON',
-12282=>'ON',
-12283=>'ON',
-12288=>'WS',
-12289=>'ON',
-12290=>'ON',
-12291=>'ON',
-12292=>'ON',
-12293=>'L',
-12294=>'L',
-12295=>'L',
-12296=>'ON',
-12297=>'ON',
-12298=>'ON',
-12299=>'ON',
-12300=>'ON',
-12301=>'ON',
-12302=>'ON',
-12303=>'ON',
-12304=>'ON',
-12305=>'ON',
-12306=>'ON',
-12307=>'ON',
-12308=>'ON',
-12309=>'ON',
-12310=>'ON',
-12311=>'ON',
-12312=>'ON',
-12313=>'ON',
-12314=>'ON',
-12315=>'ON',
-12316=>'ON',
-12317=>'ON',
-12318=>'ON',
-12319=>'ON',
-12320=>'ON',
-12321=>'L',
-12322=>'L',
-12323=>'L',
-12324=>'L',
-12325=>'L',
-12326=>'L',
-12327=>'L',
-12328=>'L',
-12329=>'L',
-12330=>'NSM',
-12331=>'NSM',
-12332=>'NSM',
-12333=>'NSM',
-12334=>'NSM',
-12335=>'NSM',
-12336=>'ON',
-12337=>'L',
-12338=>'L',
-12339=>'L',
-12340=>'L',
-12341=>'L',
-12342=>'ON',
-12343=>'ON',
-12344=>'L',
-12345=>'L',
-12346=>'L',
-12347=>'L',
-12348=>'L',
-12349=>'ON',
-12350=>'ON',
-12351=>'ON',
-12353=>'L',
-12354=>'L',
-12355=>'L',
-12356=>'L',
-12357=>'L',
-12358=>'L',
-12359=>'L',
-12360=>'L',
-12361=>'L',
-12362=>'L',
-12363=>'L',
-12364=>'L',
-12365=>'L',
-12366=>'L',
-12367=>'L',
-12368=>'L',
-12369=>'L',
-12370=>'L',
-12371=>'L',
-12372=>'L',
-12373=>'L',
-12374=>'L',
-12375=>'L',
-12376=>'L',
-12377=>'L',
-12378=>'L',
-12379=>'L',
-12380=>'L',
-12381=>'L',
-12382=>'L',
-12383=>'L',
-12384=>'L',
-12385=>'L',
-12386=>'L',
-12387=>'L',
-12388=>'L',
-12389=>'L',
-12390=>'L',
-12391=>'L',
-12392=>'L',
-12393=>'L',
-12394=>'L',
-12395=>'L',
-12396=>'L',
-12397=>'L',
-12398=>'L',
-12399=>'L',
-12400=>'L',
-12401=>'L',
-12402=>'L',
-12403=>'L',
-12404=>'L',
-12405=>'L',
-12406=>'L',
-12407=>'L',
-12408=>'L',
-12409=>'L',
-12410=>'L',
-12411=>'L',
-12412=>'L',
-12413=>'L',
-12414=>'L',
-12415=>'L',
-12416=>'L',
-12417=>'L',
-12418=>'L',
-12419=>'L',
-12420=>'L',
-12421=>'L',
-12422=>'L',
-12423=>'L',
-12424=>'L',
-12425=>'L',
-12426=>'L',
-12427=>'L',
-12428=>'L',
-12429=>'L',
-12430=>'L',
-12431=>'L',
-12432=>'L',
-12433=>'L',
-12434=>'L',
-12435=>'L',
-12436=>'L',
-12437=>'L',
-12438=>'L',
-12441=>'NSM',
-12442=>'NSM',
-12443=>'ON',
-12444=>'ON',
-12445=>'L',
-12446=>'L',
-12447=>'L',
-12448=>'ON',
-12449=>'L',
-12450=>'L',
-12451=>'L',
-12452=>'L',
-12453=>'L',
-12454=>'L',
-12455=>'L',
-12456=>'L',
-12457=>'L',
-12458=>'L',
-12459=>'L',
-12460=>'L',
-12461=>'L',
-12462=>'L',
-12463=>'L',
-12464=>'L',
-12465=>'L',
-12466=>'L',
-12467=>'L',
-12468=>'L',
-12469=>'L',
-12470=>'L',
-12471=>'L',
-12472=>'L',
-12473=>'L',
-12474=>'L',
-12475=>'L',
-12476=>'L',
-12477=>'L',
-12478=>'L',
-12479=>'L',
-12480=>'L',
-12481=>'L',
-12482=>'L',
-12483=>'L',
-12484=>'L',
-12485=>'L',
-12486=>'L',
-12487=>'L',
-12488=>'L',
-12489=>'L',
-12490=>'L',
-12491=>'L',
-12492=>'L',
-12493=>'L',
-12494=>'L',
-12495=>'L',
-12496=>'L',
-12497=>'L',
-12498=>'L',
-12499=>'L',
-12500=>'L',
-12501=>'L',
-12502=>'L',
-12503=>'L',
-12504=>'L',
-12505=>'L',
-12506=>'L',
-12507=>'L',
-12508=>'L',
-12509=>'L',
-12510=>'L',
-12511=>'L',
-12512=>'L',
-12513=>'L',
-12514=>'L',
-12515=>'L',
-12516=>'L',
-12517=>'L',
-12518=>'L',
-12519=>'L',
-12520=>'L',
-12521=>'L',
-12522=>'L',
-12523=>'L',
-12524=>'L',
-12525=>'L',
-12526=>'L',
-12527=>'L',
-12528=>'L',
-12529=>'L',
-12530=>'L',
-12531=>'L',
-12532=>'L',
-12533=>'L',
-12534=>'L',
-12535=>'L',
-12536=>'L',
-12537=>'L',
-12538=>'L',
-12539=>'ON',
-12540=>'L',
-12541=>'L',
-12542=>'L',
-12543=>'L',
-12549=>'L',
-12550=>'L',
-12551=>'L',
-12552=>'L',
-12553=>'L',
-12554=>'L',
-12555=>'L',
-12556=>'L',
-12557=>'L',
-12558=>'L',
-12559=>'L',
-12560=>'L',
-12561=>'L',
-12562=>'L',
-12563=>'L',
-12564=>'L',
-12565=>'L',
-12566=>'L',
-12567=>'L',
-12568=>'L',
-12569=>'L',
-12570=>'L',
-12571=>'L',
-12572=>'L',
-12573=>'L',
-12574=>'L',
-12575=>'L',
-12576=>'L',
-12577=>'L',
-12578=>'L',
-12579=>'L',
-12580=>'L',
-12581=>'L',
-12582=>'L',
-12583=>'L',
-12584=>'L',
-12585=>'L',
-12586=>'L',
-12587=>'L',
-12588=>'L',
-12593=>'L',
-12594=>'L',
-12595=>'L',
-12596=>'L',
-12597=>'L',
-12598=>'L',
-12599=>'L',
-12600=>'L',
-12601=>'L',
-12602=>'L',
-12603=>'L',
-12604=>'L',
-12605=>'L',
-12606=>'L',
-12607=>'L',
-12608=>'L',
-12609=>'L',
-12610=>'L',
-12611=>'L',
-12612=>'L',
-12613=>'L',
-12614=>'L',
-12615=>'L',
-12616=>'L',
-12617=>'L',
-12618=>'L',
-12619=>'L',
-12620=>'L',
-12621=>'L',
-12622=>'L',
-12623=>'L',
-12624=>'L',
-12625=>'L',
-12626=>'L',
-12627=>'L',
-12628=>'L',
-12629=>'L',
-12630=>'L',
-12631=>'L',
-12632=>'L',
-12633=>'L',
-12634=>'L',
-12635=>'L',
-12636=>'L',
-12637=>'L',
-12638=>'L',
-12639=>'L',
-12640=>'L',
-12641=>'L',
-12642=>'L',
-12643=>'L',
-12644=>'L',
-12645=>'L',
-12646=>'L',
-12647=>'L',
-12648=>'L',
-12649=>'L',
-12650=>'L',
-12651=>'L',
-12652=>'L',
-12653=>'L',
-12654=>'L',
-12655=>'L',
-12656=>'L',
-12657=>'L',
-12658=>'L',
-12659=>'L',
-12660=>'L',
-12661=>'L',
-12662=>'L',
-12663=>'L',
-12664=>'L',
-12665=>'L',
-12666=>'L',
-12667=>'L',
-12668=>'L',
-12669=>'L',
-12670=>'L',
-12671=>'L',
-12672=>'L',
-12673=>'L',
-12674=>'L',
-12675=>'L',
-12676=>'L',
-12677=>'L',
-12678=>'L',
-12679=>'L',
-12680=>'L',
-12681=>'L',
-12682=>'L',
-12683=>'L',
-12684=>'L',
-12685=>'L',
-12686=>'L',
-12688=>'L',
-12689=>'L',
-12690=>'L',
-12691=>'L',
-12692=>'L',
-12693=>'L',
-12694=>'L',
-12695=>'L',
-12696=>'L',
-12697=>'L',
-12698=>'L',
-12699=>'L',
-12700=>'L',
-12701=>'L',
-12702=>'L',
-12703=>'L',
-12704=>'L',
-12705=>'L',
-12706=>'L',
-12707=>'L',
-12708=>'L',
-12709=>'L',
-12710=>'L',
-12711=>'L',
-12712=>'L',
-12713=>'L',
-12714=>'L',
-12715=>'L',
-12716=>'L',
-12717=>'L',
-12718=>'L',
-12719=>'L',
-12720=>'L',
-12721=>'L',
-12722=>'L',
-12723=>'L',
-12724=>'L',
-12725=>'L',
-12726=>'L',
-12727=>'L',
-12736=>'ON',
-12737=>'ON',
-12738=>'ON',
-12739=>'ON',
-12740=>'ON',
-12741=>'ON',
-12742=>'ON',
-12743=>'ON',
-12744=>'ON',
-12745=>'ON',
-12746=>'ON',
-12747=>'ON',
-12748=>'ON',
-12749=>'ON',
-12750=>'ON',
-12751=>'ON',
-12784=>'L',
-12785=>'L',
-12786=>'L',
-12787=>'L',
-12788=>'L',
-12789=>'L',
-12790=>'L',
-12791=>'L',
-12792=>'L',
-12793=>'L',
-12794=>'L',
-12795=>'L',
-12796=>'L',
-12797=>'L',
-12798=>'L',
-12799=>'L',
-12800=>'L',
-12801=>'L',
-12802=>'L',
-12803=>'L',
-12804=>'L',
-12805=>'L',
-12806=>'L',
-12807=>'L',
-12808=>'L',
-12809=>'L',
-12810=>'L',
-12811=>'L',
-12812=>'L',
-12813=>'L',
-12814=>'L',
-12815=>'L',
-12816=>'L',
-12817=>'L',
-12818=>'L',
-12819=>'L',
-12820=>'L',
-12821=>'L',
-12822=>'L',
-12823=>'L',
-12824=>'L',
-12825=>'L',
-12826=>'L',
-12827=>'L',
-12828=>'L',
-12829=>'ON',
-12830=>'ON',
-12832=>'L',
-12833=>'L',
-12834=>'L',
-12835=>'L',
-12836=>'L',
-12837=>'L',
-12838=>'L',
-12839=>'L',
-12840=>'L',
-12841=>'L',
-12842=>'L',
-12843=>'L',
-12844=>'L',
-12845=>'L',
-12846=>'L',
-12847=>'L',
-12848=>'L',
-12849=>'L',
-12850=>'L',
-12851=>'L',
-12852=>'L',
-12853=>'L',
-12854=>'L',
-12855=>'L',
-12856=>'L',
-12857=>'L',
-12858=>'L',
-12859=>'L',
-12860=>'L',
-12861=>'L',
-12862=>'L',
-12863=>'L',
-12864=>'L',
-12865=>'L',
-12866=>'L',
-12867=>'L',
-12880=>'ON',
-12881=>'ON',
-12882=>'ON',
-12883=>'ON',
-12884=>'ON',
-12885=>'ON',
-12886=>'ON',
-12887=>'ON',
-12888=>'ON',
-12889=>'ON',
-12890=>'ON',
-12891=>'ON',
-12892=>'ON',
-12893=>'ON',
-12894=>'ON',
-12895=>'ON',
-12896=>'L',
-12897=>'L',
-12898=>'L',
-12899=>'L',
-12900=>'L',
-12901=>'L',
-12902=>'L',
-12903=>'L',
-12904=>'L',
-12905=>'L',
-12906=>'L',
-12907=>'L',
-12908=>'L',
-12909=>'L',
-12910=>'L',
-12911=>'L',
-12912=>'L',
-12913=>'L',
-12914=>'L',
-12915=>'L',
-12916=>'L',
-12917=>'L',
-12918=>'L',
-12919=>'L',
-12920=>'L',
-12921=>'L',
-12922=>'L',
-12923=>'L',
-12924=>'ON',
-12925=>'ON',
-12926=>'ON',
-12927=>'L',
-12928=>'L',
-12929=>'L',
-12930=>'L',
-12931=>'L',
-12932=>'L',
-12933=>'L',
-12934=>'L',
-12935=>'L',
-12936=>'L',
-12937=>'L',
-12938=>'L',
-12939=>'L',
-12940=>'L',
-12941=>'L',
-12942=>'L',
-12943=>'L',
-12944=>'L',
-12945=>'L',
-12946=>'L',
-12947=>'L',
-12948=>'L',
-12949=>'L',
-12950=>'L',
-12951=>'L',
-12952=>'L',
-12953=>'L',
-12954=>'L',
-12955=>'L',
-12956=>'L',
-12957=>'L',
-12958=>'L',
-12959=>'L',
-12960=>'L',
-12961=>'L',
-12962=>'L',
-12963=>'L',
-12964=>'L',
-12965=>'L',
-12966=>'L',
-12967=>'L',
-12968=>'L',
-12969=>'L',
-12970=>'L',
-12971=>'L',
-12972=>'L',
-12973=>'L',
-12974=>'L',
-12975=>'L',
-12976=>'L',
-12977=>'ON',
-12978=>'ON',
-12979=>'ON',
-12980=>'ON',
-12981=>'ON',
-12982=>'ON',
-12983=>'ON',
-12984=>'ON',
-12985=>'ON',
-12986=>'ON',
-12987=>'ON',
-12988=>'ON',
-12989=>'ON',
-12990=>'ON',
-12991=>'ON',
-12992=>'L',
-12993=>'L',
-12994=>'L',
-12995=>'L',
-12996=>'L',
-12997=>'L',
-12998=>'L',
-12999=>'L',
-13000=>'L',
-13001=>'L',
-13002=>'L',
-13003=>'L',
-13004=>'ON',
-13005=>'ON',
-13006=>'ON',
-13007=>'ON',
-13008=>'L',
-13009=>'L',
-13010=>'L',
-13011=>'L',
-13012=>'L',
-13013=>'L',
-13014=>'L',
-13015=>'L',
-13016=>'L',
-13017=>'L',
-13018=>'L',
-13019=>'L',
-13020=>'L',
-13021=>'L',
-13022=>'L',
-13023=>'L',
-13024=>'L',
-13025=>'L',
-13026=>'L',
-13027=>'L',
-13028=>'L',
-13029=>'L',
-13030=>'L',
-13031=>'L',
-13032=>'L',
-13033=>'L',
-13034=>'L',
-13035=>'L',
-13036=>'L',
-13037=>'L',
-13038=>'L',
-13039=>'L',
-13040=>'L',
-13041=>'L',
-13042=>'L',
-13043=>'L',
-13044=>'L',
-13045=>'L',
-13046=>'L',
-13047=>'L',
-13048=>'L',
-13049=>'L',
-13050=>'L',
-13051=>'L',
-13052=>'L',
-13053=>'L',
-13054=>'L',
-13056=>'L',
-13057=>'L',
-13058=>'L',
-13059=>'L',
-13060=>'L',
-13061=>'L',
-13062=>'L',
-13063=>'L',
-13064=>'L',
-13065=>'L',
-13066=>'L',
-13067=>'L',
-13068=>'L',
-13069=>'L',
-13070=>'L',
-13071=>'L',
-13072=>'L',
-13073=>'L',
-13074=>'L',
-13075=>'L',
-13076=>'L',
-13077=>'L',
-13078=>'L',
-13079=>'L',
-13080=>'L',
-13081=>'L',
-13082=>'L',
-13083=>'L',
-13084=>'L',
-13085=>'L',
-13086=>'L',
-13087=>'L',
-13088=>'L',
-13089=>'L',
-13090=>'L',
-13091=>'L',
-13092=>'L',
-13093=>'L',
-13094=>'L',
-13095=>'L',
-13096=>'L',
-13097=>'L',
-13098=>'L',
-13099=>'L',
-13100=>'L',
-13101=>'L',
-13102=>'L',
-13103=>'L',
-13104=>'L',
-13105=>'L',
-13106=>'L',
-13107=>'L',
-13108=>'L',
-13109=>'L',
-13110=>'L',
-13111=>'L',
-13112=>'L',
-13113=>'L',
-13114=>'L',
-13115=>'L',
-13116=>'L',
-13117=>'L',
-13118=>'L',
-13119=>'L',
-13120=>'L',
-13121=>'L',
-13122=>'L',
-13123=>'L',
-13124=>'L',
-13125=>'L',
-13126=>'L',
-13127=>'L',
-13128=>'L',
-13129=>'L',
-13130=>'L',
-13131=>'L',
-13132=>'L',
-13133=>'L',
-13134=>'L',
-13135=>'L',
-13136=>'L',
-13137=>'L',
-13138=>'L',
-13139=>'L',
-13140=>'L',
-13141=>'L',
-13142=>'L',
-13143=>'L',
-13144=>'L',
-13145=>'L',
-13146=>'L',
-13147=>'L',
-13148=>'L',
-13149=>'L',
-13150=>'L',
-13151=>'L',
-13152=>'L',
-13153=>'L',
-13154=>'L',
-13155=>'L',
-13156=>'L',
-13157=>'L',
-13158=>'L',
-13159=>'L',
-13160=>'L',
-13161=>'L',
-13162=>'L',
-13163=>'L',
-13164=>'L',
-13165=>'L',
-13166=>'L',
-13167=>'L',
-13168=>'L',
-13169=>'L',
-13170=>'L',
-13171=>'L',
-13172=>'L',
-13173=>'L',
-13174=>'L',
-13175=>'ON',
-13176=>'ON',
-13177=>'ON',
-13178=>'ON',
-13179=>'L',
-13180=>'L',
-13181=>'L',
-13182=>'L',
-13183=>'L',
-13184=>'L',
-13185=>'L',
-13186=>'L',
-13187=>'L',
-13188=>'L',
-13189=>'L',
-13190=>'L',
-13191=>'L',
-13192=>'L',
-13193=>'L',
-13194=>'L',
-13195=>'L',
-13196=>'L',
-13197=>'L',
-13198=>'L',
-13199=>'L',
-13200=>'L',
-13201=>'L',
-13202=>'L',
-13203=>'L',
-13204=>'L',
-13205=>'L',
-13206=>'L',
-13207=>'L',
-13208=>'L',
-13209=>'L',
-13210=>'L',
-13211=>'L',
-13212=>'L',
-13213=>'L',
-13214=>'L',
-13215=>'L',
-13216=>'L',
-13217=>'L',
-13218=>'L',
-13219=>'L',
-13220=>'L',
-13221=>'L',
-13222=>'L',
-13223=>'L',
-13224=>'L',
-13225=>'L',
-13226=>'L',
-13227=>'L',
-13228=>'L',
-13229=>'L',
-13230=>'L',
-13231=>'L',
-13232=>'L',
-13233=>'L',
-13234=>'L',
-13235=>'L',
-13236=>'L',
-13237=>'L',
-13238=>'L',
-13239=>'L',
-13240=>'L',
-13241=>'L',
-13242=>'L',
-13243=>'L',
-13244=>'L',
-13245=>'L',
-13246=>'L',
-13247=>'L',
-13248=>'L',
-13249=>'L',
-13250=>'L',
-13251=>'L',
-13252=>'L',
-13253=>'L',
-13254=>'L',
-13255=>'L',
-13256=>'L',
-13257=>'L',
-13258=>'L',
-13259=>'L',
-13260=>'L',
-13261=>'L',
-13262=>'L',
-13263=>'L',
-13264=>'L',
-13265=>'L',
-13266=>'L',
-13267=>'L',
-13268=>'L',
-13269=>'L',
-13270=>'L',
-13271=>'L',
-13272=>'L',
-13273=>'L',
-13274=>'L',
-13275=>'L',
-13276=>'L',
-13277=>'L',
-13278=>'ON',
-13279=>'ON',
-13280=>'L',
-13281=>'L',
-13282=>'L',
-13283=>'L',
-13284=>'L',
-13285=>'L',
-13286=>'L',
-13287=>'L',
-13288=>'L',
-13289=>'L',
-13290=>'L',
-13291=>'L',
-13292=>'L',
-13293=>'L',
-13294=>'L',
-13295=>'L',
-13296=>'L',
-13297=>'L',
-13298=>'L',
-13299=>'L',
-13300=>'L',
-13301=>'L',
-13302=>'L',
-13303=>'L',
-13304=>'L',
-13305=>'L',
-13306=>'L',
-13307=>'L',
-13308=>'L',
-13309=>'L',
-13310=>'L',
-13311=>'ON',
-13312=>'L',
-19893=>'L',
-19904=>'ON',
-19905=>'ON',
-19906=>'ON',
-19907=>'ON',
-19908=>'ON',
-19909=>'ON',
-19910=>'ON',
-19911=>'ON',
-19912=>'ON',
-19913=>'ON',
-19914=>'ON',
-19915=>'ON',
-19916=>'ON',
-19917=>'ON',
-19918=>'ON',
-19919=>'ON',
-19920=>'ON',
-19921=>'ON',
-19922=>'ON',
-19923=>'ON',
-19924=>'ON',
-19925=>'ON',
-19926=>'ON',
-19927=>'ON',
-19928=>'ON',
-19929=>'ON',
-19930=>'ON',
-19931=>'ON',
-19932=>'ON',
-19933=>'ON',
-19934=>'ON',
-19935=>'ON',
-19936=>'ON',
-19937=>'ON',
-19938=>'ON',
-19939=>'ON',
-19940=>'ON',
-19941=>'ON',
-19942=>'ON',
-19943=>'ON',
-19944=>'ON',
-19945=>'ON',
-19946=>'ON',
-19947=>'ON',
-19948=>'ON',
-19949=>'ON',
-19950=>'ON',
-19951=>'ON',
-19952=>'ON',
-19953=>'ON',
-19954=>'ON',
-19955=>'ON',
-19956=>'ON',
-19957=>'ON',
-19958=>'ON',
-19959=>'ON',
-19960=>'ON',
-19961=>'ON',
-19962=>'ON',
-19963=>'ON',
-19964=>'ON',
-19965=>'ON',
-19966=>'ON',
-19967=>'ON',
-19968=>'L',
-40891=>'L',
-40960=>'L',
-40961=>'L',
-40962=>'L',
-40963=>'L',
-40964=>'L',
-40965=>'L',
-40966=>'L',
-40967=>'L',
-40968=>'L',
-40969=>'L',
-40970=>'L',
-40971=>'L',
-40972=>'L',
-40973=>'L',
-40974=>'L',
-40975=>'L',
-40976=>'L',
-40977=>'L',
-40978=>'L',
-40979=>'L',
-40980=>'L',
-40981=>'L',
-40982=>'L',
-40983=>'L',
-40984=>'L',
-40985=>'L',
-40986=>'L',
-40987=>'L',
-40988=>'L',
-40989=>'L',
-40990=>'L',
-40991=>'L',
-40992=>'L',
-40993=>'L',
-40994=>'L',
-40995=>'L',
-40996=>'L',
-40997=>'L',
-40998=>'L',
-40999=>'L',
-41000=>'L',
-41001=>'L',
-41002=>'L',
-41003=>'L',
-41004=>'L',
-41005=>'L',
-41006=>'L',
-41007=>'L',
-41008=>'L',
-41009=>'L',
-41010=>'L',
-41011=>'L',
-41012=>'L',
-41013=>'L',
-41014=>'L',
-41015=>'L',
-41016=>'L',
-41017=>'L',
-41018=>'L',
-41019=>'L',
-41020=>'L',
-41021=>'L',
-41022=>'L',
-41023=>'L',
-41024=>'L',
-41025=>'L',
-41026=>'L',
-41027=>'L',
-41028=>'L',
-41029=>'L',
-41030=>'L',
-41031=>'L',
-41032=>'L',
-41033=>'L',
-41034=>'L',
-41035=>'L',
-41036=>'L',
-41037=>'L',
-41038=>'L',
-41039=>'L',
-41040=>'L',
-41041=>'L',
-41042=>'L',
-41043=>'L',
-41044=>'L',
-41045=>'L',
-41046=>'L',
-41047=>'L',
-41048=>'L',
-41049=>'L',
-41050=>'L',
-41051=>'L',
-41052=>'L',
-41053=>'L',
-41054=>'L',
-41055=>'L',
-41056=>'L',
-41057=>'L',
-41058=>'L',
-41059=>'L',
-41060=>'L',
-41061=>'L',
-41062=>'L',
-41063=>'L',
-41064=>'L',
-41065=>'L',
-41066=>'L',
-41067=>'L',
-41068=>'L',
-41069=>'L',
-41070=>'L',
-41071=>'L',
-41072=>'L',
-41073=>'L',
-41074=>'L',
-41075=>'L',
-41076=>'L',
-41077=>'L',
-41078=>'L',
-41079=>'L',
-41080=>'L',
-41081=>'L',
-41082=>'L',
-41083=>'L',
-41084=>'L',
-41085=>'L',
-41086=>'L',
-41087=>'L',
-41088=>'L',
-41089=>'L',
-41090=>'L',
-41091=>'L',
-41092=>'L',
-41093=>'L',
-41094=>'L',
-41095=>'L',
-41096=>'L',
-41097=>'L',
-41098=>'L',
-41099=>'L',
-41100=>'L',
-41101=>'L',
-41102=>'L',
-41103=>'L',
-41104=>'L',
-41105=>'L',
-41106=>'L',
-41107=>'L',
-41108=>'L',
-41109=>'L',
-41110=>'L',
-41111=>'L',
-41112=>'L',
-41113=>'L',
-41114=>'L',
-41115=>'L',
-41116=>'L',
-41117=>'L',
-41118=>'L',
-41119=>'L',
-41120=>'L',
-41121=>'L',
-41122=>'L',
-41123=>'L',
-41124=>'L',
-41125=>'L',
-41126=>'L',
-41127=>'L',
-41128=>'L',
-41129=>'L',
-41130=>'L',
-41131=>'L',
-41132=>'L',
-41133=>'L',
-41134=>'L',
-41135=>'L',
-41136=>'L',
-41137=>'L',
-41138=>'L',
-41139=>'L',
-41140=>'L',
-41141=>'L',
-41142=>'L',
-41143=>'L',
-41144=>'L',
-41145=>'L',
-41146=>'L',
-41147=>'L',
-41148=>'L',
-41149=>'L',
-41150=>'L',
-41151=>'L',
-41152=>'L',
-41153=>'L',
-41154=>'L',
-41155=>'L',
-41156=>'L',
-41157=>'L',
-41158=>'L',
-41159=>'L',
-41160=>'L',
-41161=>'L',
-41162=>'L',
-41163=>'L',
-41164=>'L',
-41165=>'L',
-41166=>'L',
-41167=>'L',
-41168=>'L',
-41169=>'L',
-41170=>'L',
-41171=>'L',
-41172=>'L',
-41173=>'L',
-41174=>'L',
-41175=>'L',
-41176=>'L',
-41177=>'L',
-41178=>'L',
-41179=>'L',
-41180=>'L',
-41181=>'L',
-41182=>'L',
-41183=>'L',
-41184=>'L',
-41185=>'L',
-41186=>'L',
-41187=>'L',
-41188=>'L',
-41189=>'L',
-41190=>'L',
-41191=>'L',
-41192=>'L',
-41193=>'L',
-41194=>'L',
-41195=>'L',
-41196=>'L',
-41197=>'L',
-41198=>'L',
-41199=>'L',
-41200=>'L',
-41201=>'L',
-41202=>'L',
-41203=>'L',
-41204=>'L',
-41205=>'L',
-41206=>'L',
-41207=>'L',
-41208=>'L',
-41209=>'L',
-41210=>'L',
-41211=>'L',
-41212=>'L',
-41213=>'L',
-41214=>'L',
-41215=>'L',
-41216=>'L',
-41217=>'L',
-41218=>'L',
-41219=>'L',
-41220=>'L',
-41221=>'L',
-41222=>'L',
-41223=>'L',
-41224=>'L',
-41225=>'L',
-41226=>'L',
-41227=>'L',
-41228=>'L',
-41229=>'L',
-41230=>'L',
-41231=>'L',
-41232=>'L',
-41233=>'L',
-41234=>'L',
-41235=>'L',
-41236=>'L',
-41237=>'L',
-41238=>'L',
-41239=>'L',
-41240=>'L',
-41241=>'L',
-41242=>'L',
-41243=>'L',
-41244=>'L',
-41245=>'L',
-41246=>'L',
-41247=>'L',
-41248=>'L',
-41249=>'L',
-41250=>'L',
-41251=>'L',
-41252=>'L',
-41253=>'L',
-41254=>'L',
-41255=>'L',
-41256=>'L',
-41257=>'L',
-41258=>'L',
-41259=>'L',
-41260=>'L',
-41261=>'L',
-41262=>'L',
-41263=>'L',
-41264=>'L',
-41265=>'L',
-41266=>'L',
-41267=>'L',
-41268=>'L',
-41269=>'L',
-41270=>'L',
-41271=>'L',
-41272=>'L',
-41273=>'L',
-41274=>'L',
-41275=>'L',
-41276=>'L',
-41277=>'L',
-41278=>'L',
-41279=>'L',
-41280=>'L',
-41281=>'L',
-41282=>'L',
-41283=>'L',
-41284=>'L',
-41285=>'L',
-41286=>'L',
-41287=>'L',
-41288=>'L',
-41289=>'L',
-41290=>'L',
-41291=>'L',
-41292=>'L',
-41293=>'L',
-41294=>'L',
-41295=>'L',
-41296=>'L',
-41297=>'L',
-41298=>'L',
-41299=>'L',
-41300=>'L',
-41301=>'L',
-41302=>'L',
-41303=>'L',
-41304=>'L',
-41305=>'L',
-41306=>'L',
-41307=>'L',
-41308=>'L',
-41309=>'L',
-41310=>'L',
-41311=>'L',
-41312=>'L',
-41313=>'L',
-41314=>'L',
-41315=>'L',
-41316=>'L',
-41317=>'L',
-41318=>'L',
-41319=>'L',
-41320=>'L',
-41321=>'L',
-41322=>'L',
-41323=>'L',
-41324=>'L',
-41325=>'L',
-41326=>'L',
-41327=>'L',
-41328=>'L',
-41329=>'L',
-41330=>'L',
-41331=>'L',
-41332=>'L',
-41333=>'L',
-41334=>'L',
-41335=>'L',
-41336=>'L',
-41337=>'L',
-41338=>'L',
-41339=>'L',
-41340=>'L',
-41341=>'L',
-41342=>'L',
-41343=>'L',
-41344=>'L',
-41345=>'L',
-41346=>'L',
-41347=>'L',
-41348=>'L',
-41349=>'L',
-41350=>'L',
-41351=>'L',
-41352=>'L',
-41353=>'L',
-41354=>'L',
-41355=>'L',
-41356=>'L',
-41357=>'L',
-41358=>'L',
-41359=>'L',
-41360=>'L',
-41361=>'L',
-41362=>'L',
-41363=>'L',
-41364=>'L',
-41365=>'L',
-41366=>'L',
-41367=>'L',
-41368=>'L',
-41369=>'L',
-41370=>'L',
-41371=>'L',
-41372=>'L',
-41373=>'L',
-41374=>'L',
-41375=>'L',
-41376=>'L',
-41377=>'L',
-41378=>'L',
-41379=>'L',
-41380=>'L',
-41381=>'L',
-41382=>'L',
-41383=>'L',
-41384=>'L',
-41385=>'L',
-41386=>'L',
-41387=>'L',
-41388=>'L',
-41389=>'L',
-41390=>'L',
-41391=>'L',
-41392=>'L',
-41393=>'L',
-41394=>'L',
-41395=>'L',
-41396=>'L',
-41397=>'L',
-41398=>'L',
-41399=>'L',
-41400=>'L',
-41401=>'L',
-41402=>'L',
-41403=>'L',
-41404=>'L',
-41405=>'L',
-41406=>'L',
-41407=>'L',
-41408=>'L',
-41409=>'L',
-41410=>'L',
-41411=>'L',
-41412=>'L',
-41413=>'L',
-41414=>'L',
-41415=>'L',
-41416=>'L',
-41417=>'L',
-41418=>'L',
-41419=>'L',
-41420=>'L',
-41421=>'L',
-41422=>'L',
-41423=>'L',
-41424=>'L',
-41425=>'L',
-41426=>'L',
-41427=>'L',
-41428=>'L',
-41429=>'L',
-41430=>'L',
-41431=>'L',
-41432=>'L',
-41433=>'L',
-41434=>'L',
-41435=>'L',
-41436=>'L',
-41437=>'L',
-41438=>'L',
-41439=>'L',
-41440=>'L',
-41441=>'L',
-41442=>'L',
-41443=>'L',
-41444=>'L',
-41445=>'L',
-41446=>'L',
-41447=>'L',
-41448=>'L',
-41449=>'L',
-41450=>'L',
-41451=>'L',
-41452=>'L',
-41453=>'L',
-41454=>'L',
-41455=>'L',
-41456=>'L',
-41457=>'L',
-41458=>'L',
-41459=>'L',
-41460=>'L',
-41461=>'L',
-41462=>'L',
-41463=>'L',
-41464=>'L',
-41465=>'L',
-41466=>'L',
-41467=>'L',
-41468=>'L',
-41469=>'L',
-41470=>'L',
-41471=>'L',
-41472=>'L',
-41473=>'L',
-41474=>'L',
-41475=>'L',
-41476=>'L',
-41477=>'L',
-41478=>'L',
-41479=>'L',
-41480=>'L',
-41481=>'L',
-41482=>'L',
-41483=>'L',
-41484=>'L',
-41485=>'L',
-41486=>'L',
-41487=>'L',
-41488=>'L',
-41489=>'L',
-41490=>'L',
-41491=>'L',
-41492=>'L',
-41493=>'L',
-41494=>'L',
-41495=>'L',
-41496=>'L',
-41497=>'L',
-41498=>'L',
-41499=>'L',
-41500=>'L',
-41501=>'L',
-41502=>'L',
-41503=>'L',
-41504=>'L',
-41505=>'L',
-41506=>'L',
-41507=>'L',
-41508=>'L',
-41509=>'L',
-41510=>'L',
-41511=>'L',
-41512=>'L',
-41513=>'L',
-41514=>'L',
-41515=>'L',
-41516=>'L',
-41517=>'L',
-41518=>'L',
-41519=>'L',
-41520=>'L',
-41521=>'L',
-41522=>'L',
-41523=>'L',
-41524=>'L',
-41525=>'L',
-41526=>'L',
-41527=>'L',
-41528=>'L',
-41529=>'L',
-41530=>'L',
-41531=>'L',
-41532=>'L',
-41533=>'L',
-41534=>'L',
-41535=>'L',
-41536=>'L',
-41537=>'L',
-41538=>'L',
-41539=>'L',
-41540=>'L',
-41541=>'L',
-41542=>'L',
-41543=>'L',
-41544=>'L',
-41545=>'L',
-41546=>'L',
-41547=>'L',
-41548=>'L',
-41549=>'L',
-41550=>'L',
-41551=>'L',
-41552=>'L',
-41553=>'L',
-41554=>'L',
-41555=>'L',
-41556=>'L',
-41557=>'L',
-41558=>'L',
-41559=>'L',
-41560=>'L',
-41561=>'L',
-41562=>'L',
-41563=>'L',
-41564=>'L',
-41565=>'L',
-41566=>'L',
-41567=>'L',
-41568=>'L',
-41569=>'L',
-41570=>'L',
-41571=>'L',
-41572=>'L',
-41573=>'L',
-41574=>'L',
-41575=>'L',
-41576=>'L',
-41577=>'L',
-41578=>'L',
-41579=>'L',
-41580=>'L',
-41581=>'L',
-41582=>'L',
-41583=>'L',
-41584=>'L',
-41585=>'L',
-41586=>'L',
-41587=>'L',
-41588=>'L',
-41589=>'L',
-41590=>'L',
-41591=>'L',
-41592=>'L',
-41593=>'L',
-41594=>'L',
-41595=>'L',
-41596=>'L',
-41597=>'L',
-41598=>'L',
-41599=>'L',
-41600=>'L',
-41601=>'L',
-41602=>'L',
-41603=>'L',
-41604=>'L',
-41605=>'L',
-41606=>'L',
-41607=>'L',
-41608=>'L',
-41609=>'L',
-41610=>'L',
-41611=>'L',
-41612=>'L',
-41613=>'L',
-41614=>'L',
-41615=>'L',
-41616=>'L',
-41617=>'L',
-41618=>'L',
-41619=>'L',
-41620=>'L',
-41621=>'L',
-41622=>'L',
-41623=>'L',
-41624=>'L',
-41625=>'L',
-41626=>'L',
-41627=>'L',
-41628=>'L',
-41629=>'L',
-41630=>'L',
-41631=>'L',
-41632=>'L',
-41633=>'L',
-41634=>'L',
-41635=>'L',
-41636=>'L',
-41637=>'L',
-41638=>'L',
-41639=>'L',
-41640=>'L',
-41641=>'L',
-41642=>'L',
-41643=>'L',
-41644=>'L',
-41645=>'L',
-41646=>'L',
-41647=>'L',
-41648=>'L',
-41649=>'L',
-41650=>'L',
-41651=>'L',
-41652=>'L',
-41653=>'L',
-41654=>'L',
-41655=>'L',
-41656=>'L',
-41657=>'L',
-41658=>'L',
-41659=>'L',
-41660=>'L',
-41661=>'L',
-41662=>'L',
-41663=>'L',
-41664=>'L',
-41665=>'L',
-41666=>'L',
-41667=>'L',
-41668=>'L',
-41669=>'L',
-41670=>'L',
-41671=>'L',
-41672=>'L',
-41673=>'L',
-41674=>'L',
-41675=>'L',
-41676=>'L',
-41677=>'L',
-41678=>'L',
-41679=>'L',
-41680=>'L',
-41681=>'L',
-41682=>'L',
-41683=>'L',
-41684=>'L',
-41685=>'L',
-41686=>'L',
-41687=>'L',
-41688=>'L',
-41689=>'L',
-41690=>'L',
-41691=>'L',
-41692=>'L',
-41693=>'L',
-41694=>'L',
-41695=>'L',
-41696=>'L',
-41697=>'L',
-41698=>'L',
-41699=>'L',
-41700=>'L',
-41701=>'L',
-41702=>'L',
-41703=>'L',
-41704=>'L',
-41705=>'L',
-41706=>'L',
-41707=>'L',
-41708=>'L',
-41709=>'L',
-41710=>'L',
-41711=>'L',
-41712=>'L',
-41713=>'L',
-41714=>'L',
-41715=>'L',
-41716=>'L',
-41717=>'L',
-41718=>'L',
-41719=>'L',
-41720=>'L',
-41721=>'L',
-41722=>'L',
-41723=>'L',
-41724=>'L',
-41725=>'L',
-41726=>'L',
-41727=>'L',
-41728=>'L',
-41729=>'L',
-41730=>'L',
-41731=>'L',
-41732=>'L',
-41733=>'L',
-41734=>'L',
-41735=>'L',
-41736=>'L',
-41737=>'L',
-41738=>'L',
-41739=>'L',
-41740=>'L',
-41741=>'L',
-41742=>'L',
-41743=>'L',
-41744=>'L',
-41745=>'L',
-41746=>'L',
-41747=>'L',
-41748=>'L',
-41749=>'L',
-41750=>'L',
-41751=>'L',
-41752=>'L',
-41753=>'L',
-41754=>'L',
-41755=>'L',
-41756=>'L',
-41757=>'L',
-41758=>'L',
-41759=>'L',
-41760=>'L',
-41761=>'L',
-41762=>'L',
-41763=>'L',
-41764=>'L',
-41765=>'L',
-41766=>'L',
-41767=>'L',
-41768=>'L',
-41769=>'L',
-41770=>'L',
-41771=>'L',
-41772=>'L',
-41773=>'L',
-41774=>'L',
-41775=>'L',
-41776=>'L',
-41777=>'L',
-41778=>'L',
-41779=>'L',
-41780=>'L',
-41781=>'L',
-41782=>'L',
-41783=>'L',
-41784=>'L',
-41785=>'L',
-41786=>'L',
-41787=>'L',
-41788=>'L',
-41789=>'L',
-41790=>'L',
-41791=>'L',
-41792=>'L',
-41793=>'L',
-41794=>'L',
-41795=>'L',
-41796=>'L',
-41797=>'L',
-41798=>'L',
-41799=>'L',
-41800=>'L',
-41801=>'L',
-41802=>'L',
-41803=>'L',
-41804=>'L',
-41805=>'L',
-41806=>'L',
-41807=>'L',
-41808=>'L',
-41809=>'L',
-41810=>'L',
-41811=>'L',
-41812=>'L',
-41813=>'L',
-41814=>'L',
-41815=>'L',
-41816=>'L',
-41817=>'L',
-41818=>'L',
-41819=>'L',
-41820=>'L',
-41821=>'L',
-41822=>'L',
-41823=>'L',
-41824=>'L',
-41825=>'L',
-41826=>'L',
-41827=>'L',
-41828=>'L',
-41829=>'L',
-41830=>'L',
-41831=>'L',
-41832=>'L',
-41833=>'L',
-41834=>'L',
-41835=>'L',
-41836=>'L',
-41837=>'L',
-41838=>'L',
-41839=>'L',
-41840=>'L',
-41841=>'L',
-41842=>'L',
-41843=>'L',
-41844=>'L',
-41845=>'L',
-41846=>'L',
-41847=>'L',
-41848=>'L',
-41849=>'L',
-41850=>'L',
-41851=>'L',
-41852=>'L',
-41853=>'L',
-41854=>'L',
-41855=>'L',
-41856=>'L',
-41857=>'L',
-41858=>'L',
-41859=>'L',
-41860=>'L',
-41861=>'L',
-41862=>'L',
-41863=>'L',
-41864=>'L',
-41865=>'L',
-41866=>'L',
-41867=>'L',
-41868=>'L',
-41869=>'L',
-41870=>'L',
-41871=>'L',
-41872=>'L',
-41873=>'L',
-41874=>'L',
-41875=>'L',
-41876=>'L',
-41877=>'L',
-41878=>'L',
-41879=>'L',
-41880=>'L',
-41881=>'L',
-41882=>'L',
-41883=>'L',
-41884=>'L',
-41885=>'L',
-41886=>'L',
-41887=>'L',
-41888=>'L',
-41889=>'L',
-41890=>'L',
-41891=>'L',
-41892=>'L',
-41893=>'L',
-41894=>'L',
-41895=>'L',
-41896=>'L',
-41897=>'L',
-41898=>'L',
-41899=>'L',
-41900=>'L',
-41901=>'L',
-41902=>'L',
-41903=>'L',
-41904=>'L',
-41905=>'L',
-41906=>'L',
-41907=>'L',
-41908=>'L',
-41909=>'L',
-41910=>'L',
-41911=>'L',
-41912=>'L',
-41913=>'L',
-41914=>'L',
-41915=>'L',
-41916=>'L',
-41917=>'L',
-41918=>'L',
-41919=>'L',
-41920=>'L',
-41921=>'L',
-41922=>'L',
-41923=>'L',
-41924=>'L',
-41925=>'L',
-41926=>'L',
-41927=>'L',
-41928=>'L',
-41929=>'L',
-41930=>'L',
-41931=>'L',
-41932=>'L',
-41933=>'L',
-41934=>'L',
-41935=>'L',
-41936=>'L',
-41937=>'L',
-41938=>'L',
-41939=>'L',
-41940=>'L',
-41941=>'L',
-41942=>'L',
-41943=>'L',
-41944=>'L',
-41945=>'L',
-41946=>'L',
-41947=>'L',
-41948=>'L',
-41949=>'L',
-41950=>'L',
-41951=>'L',
-41952=>'L',
-41953=>'L',
-41954=>'L',
-41955=>'L',
-41956=>'L',
-41957=>'L',
-41958=>'L',
-41959=>'L',
-41960=>'L',
-41961=>'L',
-41962=>'L',
-41963=>'L',
-41964=>'L',
-41965=>'L',
-41966=>'L',
-41967=>'L',
-41968=>'L',
-41969=>'L',
-41970=>'L',
-41971=>'L',
-41972=>'L',
-41973=>'L',
-41974=>'L',
-41975=>'L',
-41976=>'L',
-41977=>'L',
-41978=>'L',
-41979=>'L',
-41980=>'L',
-41981=>'L',
-41982=>'L',
-41983=>'L',
-41984=>'L',
-41985=>'L',
-41986=>'L',
-41987=>'L',
-41988=>'L',
-41989=>'L',
-41990=>'L',
-41991=>'L',
-41992=>'L',
-41993=>'L',
-41994=>'L',
-41995=>'L',
-41996=>'L',
-41997=>'L',
-41998=>'L',
-41999=>'L',
-42000=>'L',
-42001=>'L',
-42002=>'L',
-42003=>'L',
-42004=>'L',
-42005=>'L',
-42006=>'L',
-42007=>'L',
-42008=>'L',
-42009=>'L',
-42010=>'L',
-42011=>'L',
-42012=>'L',
-42013=>'L',
-42014=>'L',
-42015=>'L',
-42016=>'L',
-42017=>'L',
-42018=>'L',
-42019=>'L',
-42020=>'L',
-42021=>'L',
-42022=>'L',
-42023=>'L',
-42024=>'L',
-42025=>'L',
-42026=>'L',
-42027=>'L',
-42028=>'L',
-42029=>'L',
-42030=>'L',
-42031=>'L',
-42032=>'L',
-42033=>'L',
-42034=>'L',
-42035=>'L',
-42036=>'L',
-42037=>'L',
-42038=>'L',
-42039=>'L',
-42040=>'L',
-42041=>'L',
-42042=>'L',
-42043=>'L',
-42044=>'L',
-42045=>'L',
-42046=>'L',
-42047=>'L',
-42048=>'L',
-42049=>'L',
-42050=>'L',
-42051=>'L',
-42052=>'L',
-42053=>'L',
-42054=>'L',
-42055=>'L',
-42056=>'L',
-42057=>'L',
-42058=>'L',
-42059=>'L',
-42060=>'L',
-42061=>'L',
-42062=>'L',
-42063=>'L',
-42064=>'L',
-42065=>'L',
-42066=>'L',
-42067=>'L',
-42068=>'L',
-42069=>'L',
-42070=>'L',
-42071=>'L',
-42072=>'L',
-42073=>'L',
-42074=>'L',
-42075=>'L',
-42076=>'L',
-42077=>'L',
-42078=>'L',
-42079=>'L',
-42080=>'L',
-42081=>'L',
-42082=>'L',
-42083=>'L',
-42084=>'L',
-42085=>'L',
-42086=>'L',
-42087=>'L',
-42088=>'L',
-42089=>'L',
-42090=>'L',
-42091=>'L',
-42092=>'L',
-42093=>'L',
-42094=>'L',
-42095=>'L',
-42096=>'L',
-42097=>'L',
-42098=>'L',
-42099=>'L',
-42100=>'L',
-42101=>'L',
-42102=>'L',
-42103=>'L',
-42104=>'L',
-42105=>'L',
-42106=>'L',
-42107=>'L',
-42108=>'L',
-42109=>'L',
-42110=>'L',
-42111=>'L',
-42112=>'L',
-42113=>'L',
-42114=>'L',
-42115=>'L',
-42116=>'L',
-42117=>'L',
-42118=>'L',
-42119=>'L',
-42120=>'L',
-42121=>'L',
-42122=>'L',
-42123=>'L',
-42124=>'L',
-42128=>'ON',
-42129=>'ON',
-42130=>'ON',
-42131=>'ON',
-42132=>'ON',
-42133=>'ON',
-42134=>'ON',
-42135=>'ON',
-42136=>'ON',
-42137=>'ON',
-42138=>'ON',
-42139=>'ON',
-42140=>'ON',
-42141=>'ON',
-42142=>'ON',
-42143=>'ON',
-42144=>'ON',
-42145=>'ON',
-42146=>'ON',
-42147=>'ON',
-42148=>'ON',
-42149=>'ON',
-42150=>'ON',
-42151=>'ON',
-42152=>'ON',
-42153=>'ON',
-42154=>'ON',
-42155=>'ON',
-42156=>'ON',
-42157=>'ON',
-42158=>'ON',
-42159=>'ON',
-42160=>'ON',
-42161=>'ON',
-42162=>'ON',
-42163=>'ON',
-42164=>'ON',
-42165=>'ON',
-42166=>'ON',
-42167=>'ON',
-42168=>'ON',
-42169=>'ON',
-42170=>'ON',
-42171=>'ON',
-42172=>'ON',
-42173=>'ON',
-42174=>'ON',
-42175=>'ON',
-42176=>'ON',
-42177=>'ON',
-42178=>'ON',
-42179=>'ON',
-42180=>'ON',
-42181=>'ON',
-42182=>'ON',
-42752=>'ON',
-42753=>'ON',
-42754=>'ON',
-42755=>'ON',
-42756=>'ON',
-42757=>'ON',
-42758=>'ON',
-42759=>'ON',
-42760=>'ON',
-42761=>'ON',
-42762=>'ON',
-42763=>'ON',
-42764=>'ON',
-42765=>'ON',
-42766=>'ON',
-42767=>'ON',
-42768=>'ON',
-42769=>'ON',
-42770=>'ON',
-42771=>'ON',
-42772=>'ON',
-42773=>'ON',
-42774=>'ON',
-42775=>'ON',
-42776=>'ON',
-42777=>'ON',
-42778=>'ON',
-42784=>'ON',
-42785=>'ON',
-43008=>'L',
-43009=>'L',
-43010=>'NSM',
-43011=>'L',
-43012=>'L',
-43013=>'L',
-43014=>'NSM',
-43015=>'L',
-43016=>'L',
-43017=>'L',
-43018=>'L',
-43019=>'NSM',
-43020=>'L',
-43021=>'L',
-43022=>'L',
-43023=>'L',
-43024=>'L',
-43025=>'L',
-43026=>'L',
-43027=>'L',
-43028=>'L',
-43029=>'L',
-43030=>'L',
-43031=>'L',
-43032=>'L',
-43033=>'L',
-43034=>'L',
-43035=>'L',
-43036=>'L',
-43037=>'L',
-43038=>'L',
-43039=>'L',
-43040=>'L',
-43041=>'L',
-43042=>'L',
-43043=>'L',
-43044=>'L',
-43045=>'NSM',
-43046=>'NSM',
-43047=>'L',
-43048=>'ON',
-43049=>'ON',
-43050=>'ON',
-43051=>'ON',
-43072=>'L',
-43073=>'L',
-43074=>'L',
-43075=>'L',
-43076=>'L',
-43077=>'L',
-43078=>'L',
-43079=>'L',
-43080=>'L',
-43081=>'L',
-43082=>'L',
-43083=>'L',
-43084=>'L',
-43085=>'L',
-43086=>'L',
-43087=>'L',
-43088=>'L',
-43089=>'L',
-43090=>'L',
-43091=>'L',
-43092=>'L',
-43093=>'L',
-43094=>'L',
-43095=>'L',
-43096=>'L',
-43097=>'L',
-43098=>'L',
-43099=>'L',
-43100=>'L',
-43101=>'L',
-43102=>'L',
-43103=>'L',
-43104=>'L',
-43105=>'L',
-43106=>'L',
-43107=>'L',
-43108=>'L',
-43109=>'L',
-43110=>'L',
-43111=>'L',
-43112=>'L',
-43113=>'L',
-43114=>'L',
-43115=>'L',
-43116=>'L',
-43117=>'L',
-43118=>'L',
-43119=>'L',
-43120=>'L',
-43121=>'L',
-43122=>'L',
-43123=>'L',
-43124=>'ON',
-43125=>'ON',
-43126=>'ON',
-43127=>'ON',
-44032=>'L',
-55203=>'L',
-55296=>'L',
-56191=>'L',
-56192=>'L',
-56319=>'L',
-56320=>'L',
-57343=>'L',
-57344=>'L',
-63743=>'L',
-63744=>'L',
-63745=>'L',
-63746=>'L',
-63747=>'L',
-63748=>'L',
-63749=>'L',
-63750=>'L',
-63751=>'L',
-63752=>'L',
-63753=>'L',
-63754=>'L',
-63755=>'L',
-63756=>'L',
-63757=>'L',
-63758=>'L',
-63759=>'L',
-63760=>'L',
-63761=>'L',
-63762=>'L',
-63763=>'L',
-63764=>'L',
-63765=>'L',
-63766=>'L',
-63767=>'L',
-63768=>'L',
-63769=>'L',
-63770=>'L',
-63771=>'L',
-63772=>'L',
-63773=>'L',
-63774=>'L',
-63775=>'L',
-63776=>'L',
-63777=>'L',
-63778=>'L',
-63779=>'L',
-63780=>'L',
-63781=>'L',
-63782=>'L',
-63783=>'L',
-63784=>'L',
-63785=>'L',
-63786=>'L',
-63787=>'L',
-63788=>'L',
-63789=>'L',
-63790=>'L',
-63791=>'L',
-63792=>'L',
-63793=>'L',
-63794=>'L',
-63795=>'L',
-63796=>'L',
-63797=>'L',
-63798=>'L',
-63799=>'L',
-63800=>'L',
-63801=>'L',
-63802=>'L',
-63803=>'L',
-63804=>'L',
-63805=>'L',
-63806=>'L',
-63807=>'L',
-63808=>'L',
-63809=>'L',
-63810=>'L',
-63811=>'L',
-63812=>'L',
-63813=>'L',
-63814=>'L',
-63815=>'L',
-63816=>'L',
-63817=>'L',
-63818=>'L',
-63819=>'L',
-63820=>'L',
-63821=>'L',
-63822=>'L',
-63823=>'L',
-63824=>'L',
-63825=>'L',
-63826=>'L',
-63827=>'L',
-63828=>'L',
-63829=>'L',
-63830=>'L',
-63831=>'L',
-63832=>'L',
-63833=>'L',
-63834=>'L',
-63835=>'L',
-63836=>'L',
-63837=>'L',
-63838=>'L',
-63839=>'L',
-63840=>'L',
-63841=>'L',
-63842=>'L',
-63843=>'L',
-63844=>'L',
-63845=>'L',
-63846=>'L',
-63847=>'L',
-63848=>'L',
-63849=>'L',
-63850=>'L',
-63851=>'L',
-63852=>'L',
-63853=>'L',
-63854=>'L',
-63855=>'L',
-63856=>'L',
-63857=>'L',
-63858=>'L',
-63859=>'L',
-63860=>'L',
-63861=>'L',
-63862=>'L',
-63863=>'L',
-63864=>'L',
-63865=>'L',
-63866=>'L',
-63867=>'L',
-63868=>'L',
-63869=>'L',
-63870=>'L',
-63871=>'L',
-63872=>'L',
-63873=>'L',
-63874=>'L',
-63875=>'L',
-63876=>'L',
-63877=>'L',
-63878=>'L',
-63879=>'L',
-63880=>'L',
-63881=>'L',
-63882=>'L',
-63883=>'L',
-63884=>'L',
-63885=>'L',
-63886=>'L',
-63887=>'L',
-63888=>'L',
-63889=>'L',
-63890=>'L',
-63891=>'L',
-63892=>'L',
-63893=>'L',
-63894=>'L',
-63895=>'L',
-63896=>'L',
-63897=>'L',
-63898=>'L',
-63899=>'L',
-63900=>'L',
-63901=>'L',
-63902=>'L',
-63903=>'L',
-63904=>'L',
-63905=>'L',
-63906=>'L',
-63907=>'L',
-63908=>'L',
-63909=>'L',
-63910=>'L',
-63911=>'L',
-63912=>'L',
-63913=>'L',
-63914=>'L',
-63915=>'L',
-63916=>'L',
-63917=>'L',
-63918=>'L',
-63919=>'L',
-63920=>'L',
-63921=>'L',
-63922=>'L',
-63923=>'L',
-63924=>'L',
-63925=>'L',
-63926=>'L',
-63927=>'L',
-63928=>'L',
-63929=>'L',
-63930=>'L',
-63931=>'L',
-63932=>'L',
-63933=>'L',
-63934=>'L',
-63935=>'L',
-63936=>'L',
-63937=>'L',
-63938=>'L',
-63939=>'L',
-63940=>'L',
-63941=>'L',
-63942=>'L',
-63943=>'L',
-63944=>'L',
-63945=>'L',
-63946=>'L',
-63947=>'L',
-63948=>'L',
-63949=>'L',
-63950=>'L',
-63951=>'L',
-63952=>'L',
-63953=>'L',
-63954=>'L',
-63955=>'L',
-63956=>'L',
-63957=>'L',
-63958=>'L',
-63959=>'L',
-63960=>'L',
-63961=>'L',
-63962=>'L',
-63963=>'L',
-63964=>'L',
-63965=>'L',
-63966=>'L',
-63967=>'L',
-63968=>'L',
-63969=>'L',
-63970=>'L',
-63971=>'L',
-63972=>'L',
-63973=>'L',
-63974=>'L',
-63975=>'L',
-63976=>'L',
-63977=>'L',
-63978=>'L',
-63979=>'L',
-63980=>'L',
-63981=>'L',
-63982=>'L',
-63983=>'L',
-63984=>'L',
-63985=>'L',
-63986=>'L',
-63987=>'L',
-63988=>'L',
-63989=>'L',
-63990=>'L',
-63991=>'L',
-63992=>'L',
-63993=>'L',
-63994=>'L',
-63995=>'L',
-63996=>'L',
-63997=>'L',
-63998=>'L',
-63999=>'L',
-64000=>'L',
-64001=>'L',
-64002=>'L',
-64003=>'L',
-64004=>'L',
-64005=>'L',
-64006=>'L',
-64007=>'L',
-64008=>'L',
-64009=>'L',
-64010=>'L',
-64011=>'L',
-64012=>'L',
-64013=>'L',
-64014=>'L',
-64015=>'L',
-64016=>'L',
-64017=>'L',
-64018=>'L',
-64019=>'L',
-64020=>'L',
-64021=>'L',
-64022=>'L',
-64023=>'L',
-64024=>'L',
-64025=>'L',
-64026=>'L',
-64027=>'L',
-64028=>'L',
-64029=>'L',
-64030=>'L',
-64031=>'L',
-64032=>'L',
-64033=>'L',
-64034=>'L',
-64035=>'L',
-64036=>'L',
-64037=>'L',
-64038=>'L',
-64039=>'L',
-64040=>'L',
-64041=>'L',
-64042=>'L',
-64043=>'L',
-64044=>'L',
-64045=>'L',
-64048=>'L',
-64049=>'L',
-64050=>'L',
-64051=>'L',
-64052=>'L',
-64053=>'L',
-64054=>'L',
-64055=>'L',
-64056=>'L',
-64057=>'L',
-64058=>'L',
-64059=>'L',
-64060=>'L',
-64061=>'L',
-64062=>'L',
-64063=>'L',
-64064=>'L',
-64065=>'L',
-64066=>'L',
-64067=>'L',
-64068=>'L',
-64069=>'L',
-64070=>'L',
-64071=>'L',
-64072=>'L',
-64073=>'L',
-64074=>'L',
-64075=>'L',
-64076=>'L',
-64077=>'L',
-64078=>'L',
-64079=>'L',
-64080=>'L',
-64081=>'L',
-64082=>'L',
-64083=>'L',
-64084=>'L',
-64085=>'L',
-64086=>'L',
-64087=>'L',
-64088=>'L',
-64089=>'L',
-64090=>'L',
-64091=>'L',
-64092=>'L',
-64093=>'L',
-64094=>'L',
-64095=>'L',
-64096=>'L',
-64097=>'L',
-64098=>'L',
-64099=>'L',
-64100=>'L',
-64101=>'L',
-64102=>'L',
-64103=>'L',
-64104=>'L',
-64105=>'L',
-64106=>'L',
-64112=>'L',
-64113=>'L',
-64114=>'L',
-64115=>'L',
-64116=>'L',
-64117=>'L',
-64118=>'L',
-64119=>'L',
-64120=>'L',
-64121=>'L',
-64122=>'L',
-64123=>'L',
-64124=>'L',
-64125=>'L',
-64126=>'L',
-64127=>'L',
-64128=>'L',
-64129=>'L',
-64130=>'L',
-64131=>'L',
-64132=>'L',
-64133=>'L',
-64134=>'L',
-64135=>'L',
-64136=>'L',
-64137=>'L',
-64138=>'L',
-64139=>'L',
-64140=>'L',
-64141=>'L',
-64142=>'L',
-64143=>'L',
-64144=>'L',
-64145=>'L',
-64146=>'L',
-64147=>'L',
-64148=>'L',
-64149=>'L',
-64150=>'L',
-64151=>'L',
-64152=>'L',
-64153=>'L',
-64154=>'L',
-64155=>'L',
-64156=>'L',
-64157=>'L',
-64158=>'L',
-64159=>'L',
-64160=>'L',
-64161=>'L',
-64162=>'L',
-64163=>'L',
-64164=>'L',
-64165=>'L',
-64166=>'L',
-64167=>'L',
-64168=>'L',
-64169=>'L',
-64170=>'L',
-64171=>'L',
-64172=>'L',
-64173=>'L',
-64174=>'L',
-64175=>'L',
-64176=>'L',
-64177=>'L',
-64178=>'L',
-64179=>'L',
-64180=>'L',
-64181=>'L',
-64182=>'L',
-64183=>'L',
-64184=>'L',
-64185=>'L',
-64186=>'L',
-64187=>'L',
-64188=>'L',
-64189=>'L',
-64190=>'L',
-64191=>'L',
-64192=>'L',
-64193=>'L',
-64194=>'L',
-64195=>'L',
-64196=>'L',
-64197=>'L',
-64198=>'L',
-64199=>'L',
-64200=>'L',
-64201=>'L',
-64202=>'L',
-64203=>'L',
-64204=>'L',
-64205=>'L',
-64206=>'L',
-64207=>'L',
-64208=>'L',
-64209=>'L',
-64210=>'L',
-64211=>'L',
-64212=>'L',
-64213=>'L',
-64214=>'L',
-64215=>'L',
-64216=>'L',
-64217=>'L',
-64256=>'L',
-64257=>'L',
-64258=>'L',
-64259=>'L',
-64260=>'L',
-64261=>'L',
-64262=>'L',
-64275=>'L',
-64276=>'L',
-64277=>'L',
-64278=>'L',
-64279=>'L',
-64285=>'R',
-64286=>'NSM',
-64287=>'R',
-64288=>'R',
-64289=>'R',
-64290=>'R',
-64291=>'R',
-64292=>'R',
-64293=>'R',
-64294=>'R',
-64295=>'R',
-64296=>'R',
-64297=>'ES',
-64298=>'R',
-64299=>'R',
-64300=>'R',
-64301=>'R',
-64302=>'R',
-64303=>'R',
-64304=>'R',
-64305=>'R',
-64306=>'R',
-64307=>'R',
-64308=>'R',
-64309=>'R',
-64310=>'R',
-64312=>'R',
-64313=>'R',
-64314=>'R',
-64315=>'R',
-64316=>'R',
-64318=>'R',
-64320=>'R',
-64321=>'R',
-64323=>'R',
-64324=>'R',
-64326=>'R',
-64327=>'R',
-64328=>'R',
-64329=>'R',
-64330=>'R',
-64331=>'R',
-64332=>'R',
-64333=>'R',
-64334=>'R',
-64335=>'R',
-64336=>'AL',
-64337=>'AL',
-64338=>'AL',
-64339=>'AL',
-64340=>'AL',
-64341=>'AL',
-64342=>'AL',
-64343=>'AL',
-64344=>'AL',
-64345=>'AL',
-64346=>'AL',
-64347=>'AL',
-64348=>'AL',
-64349=>'AL',
-64350=>'AL',
-64351=>'AL',
-64352=>'AL',
-64353=>'AL',
-64354=>'AL',
-64355=>'AL',
-64356=>'AL',
-64357=>'AL',
-64358=>'AL',
-64359=>'AL',
-64360=>'AL',
-64361=>'AL',
-64362=>'AL',
-64363=>'AL',
-64364=>'AL',
-64365=>'AL',
-64366=>'AL',
-64367=>'AL',
-64368=>'AL',
-64369=>'AL',
-64370=>'AL',
-64371=>'AL',
-64372=>'AL',
-64373=>'AL',
-64374=>'AL',
-64375=>'AL',
-64376=>'AL',
-64377=>'AL',
-64378=>'AL',
-64379=>'AL',
-64380=>'AL',
-64381=>'AL',
-64382=>'AL',
-64383=>'AL',
-64384=>'AL',
-64385=>'AL',
-64386=>'AL',
-64387=>'AL',
-64388=>'AL',
-64389=>'AL',
-64390=>'AL',
-64391=>'AL',
-64392=>'AL',
-64393=>'AL',
-64394=>'AL',
-64395=>'AL',
-64396=>'AL',
-64397=>'AL',
-64398=>'AL',
-64399=>'AL',
-64400=>'AL',
-64401=>'AL',
-64402=>'AL',
-64403=>'AL',
-64404=>'AL',
-64405=>'AL',
-64406=>'AL',
-64407=>'AL',
-64408=>'AL',
-64409=>'AL',
-64410=>'AL',
-64411=>'AL',
-64412=>'AL',
-64413=>'AL',
-64414=>'AL',
-64415=>'AL',
-64416=>'AL',
-64417=>'AL',
-64418=>'AL',
-64419=>'AL',
-64420=>'AL',
-64421=>'AL',
-64422=>'AL',
-64423=>'AL',
-64424=>'AL',
-64425=>'AL',
-64426=>'AL',
-64427=>'AL',
-64428=>'AL',
-64429=>'AL',
-64430=>'AL',
-64431=>'AL',
-64432=>'AL',
-64433=>'AL',
-64467=>'AL',
-64468=>'AL',
-64469=>'AL',
-64470=>'AL',
-64471=>'AL',
-64472=>'AL',
-64473=>'AL',
-64474=>'AL',
-64475=>'AL',
-64476=>'AL',
-64477=>'AL',
-64478=>'AL',
-64479=>'AL',
-64480=>'AL',
-64481=>'AL',
-64482=>'AL',
-64483=>'AL',
-64484=>'AL',
-64485=>'AL',
-64486=>'AL',
-64487=>'AL',
-64488=>'AL',
-64489=>'AL',
-64490=>'AL',
-64491=>'AL',
-64492=>'AL',
-64493=>'AL',
-64494=>'AL',
-64495=>'AL',
-64496=>'AL',
-64497=>'AL',
-64498=>'AL',
-64499=>'AL',
-64500=>'AL',
-64501=>'AL',
-64502=>'AL',
-64503=>'AL',
-64504=>'AL',
-64505=>'AL',
-64506=>'AL',
-64507=>'AL',
-64508=>'AL',
-64509=>'AL',
-64510=>'AL',
-64511=>'AL',
-64512=>'AL',
-64513=>'AL',
-64514=>'AL',
-64515=>'AL',
-64516=>'AL',
-64517=>'AL',
-64518=>'AL',
-64519=>'AL',
-64520=>'AL',
-64521=>'AL',
-64522=>'AL',
-64523=>'AL',
-64524=>'AL',
-64525=>'AL',
-64526=>'AL',
-64527=>'AL',
-64528=>'AL',
-64529=>'AL',
-64530=>'AL',
-64531=>'AL',
-64532=>'AL',
-64533=>'AL',
-64534=>'AL',
-64535=>'AL',
-64536=>'AL',
-64537=>'AL',
-64538=>'AL',
-64539=>'AL',
-64540=>'AL',
-64541=>'AL',
-64542=>'AL',
-64543=>'AL',
-64544=>'AL',
-64545=>'AL',
-64546=>'AL',
-64547=>'AL',
-64548=>'AL',
-64549=>'AL',
-64550=>'AL',
-64551=>'AL',
-64552=>'AL',
-64553=>'AL',
-64554=>'AL',
-64555=>'AL',
-64556=>'AL',
-64557=>'AL',
-64558=>'AL',
-64559=>'AL',
-64560=>'AL',
-64561=>'AL',
-64562=>'AL',
-64563=>'AL',
-64564=>'AL',
-64565=>'AL',
-64566=>'AL',
-64567=>'AL',
-64568=>'AL',
-64569=>'AL',
-64570=>'AL',
-64571=>'AL',
-64572=>'AL',
-64573=>'AL',
-64574=>'AL',
-64575=>'AL',
-64576=>'AL',
-64577=>'AL',
-64578=>'AL',
-64579=>'AL',
-64580=>'AL',
-64581=>'AL',
-64582=>'AL',
-64583=>'AL',
-64584=>'AL',
-64585=>'AL',
-64586=>'AL',
-64587=>'AL',
-64588=>'AL',
-64589=>'AL',
-64590=>'AL',
-64591=>'AL',
-64592=>'AL',
-64593=>'AL',
-64594=>'AL',
-64595=>'AL',
-64596=>'AL',
-64597=>'AL',
-64598=>'AL',
-64599=>'AL',
-64600=>'AL',
-64601=>'AL',
-64602=>'AL',
-64603=>'AL',
-64604=>'AL',
-64605=>'AL',
-64606=>'AL',
-64607=>'AL',
-64608=>'AL',
-64609=>'AL',
-64610=>'AL',
-64611=>'AL',
-64612=>'AL',
-64613=>'AL',
-64614=>'AL',
-64615=>'AL',
-64616=>'AL',
-64617=>'AL',
-64618=>'AL',
-64619=>'AL',
-64620=>'AL',
-64621=>'AL',
-64622=>'AL',
-64623=>'AL',
-64624=>'AL',
-64625=>'AL',
-64626=>'AL',
-64627=>'AL',
-64628=>'AL',
-64629=>'AL',
-64630=>'AL',
-64631=>'AL',
-64632=>'AL',
-64633=>'AL',
-64634=>'AL',
-64635=>'AL',
-64636=>'AL',
-64637=>'AL',
-64638=>'AL',
-64639=>'AL',
-64640=>'AL',
-64641=>'AL',
-64642=>'AL',
-64643=>'AL',
-64644=>'AL',
-64645=>'AL',
-64646=>'AL',
-64647=>'AL',
-64648=>'AL',
-64649=>'AL',
-64650=>'AL',
-64651=>'AL',
-64652=>'AL',
-64653=>'AL',
-64654=>'AL',
-64655=>'AL',
-64656=>'AL',
-64657=>'AL',
-64658=>'AL',
-64659=>'AL',
-64660=>'AL',
-64661=>'AL',
-64662=>'AL',
-64663=>'AL',
-64664=>'AL',
-64665=>'AL',
-64666=>'AL',
-64667=>'AL',
-64668=>'AL',
-64669=>'AL',
-64670=>'AL',
-64671=>'AL',
-64672=>'AL',
-64673=>'AL',
-64674=>'AL',
-64675=>'AL',
-64676=>'AL',
-64677=>'AL',
-64678=>'AL',
-64679=>'AL',
-64680=>'AL',
-64681=>'AL',
-64682=>'AL',
-64683=>'AL',
-64684=>'AL',
-64685=>'AL',
-64686=>'AL',
-64687=>'AL',
-64688=>'AL',
-64689=>'AL',
-64690=>'AL',
-64691=>'AL',
-64692=>'AL',
-64693=>'AL',
-64694=>'AL',
-64695=>'AL',
-64696=>'AL',
-64697=>'AL',
-64698=>'AL',
-64699=>'AL',
-64700=>'AL',
-64701=>'AL',
-64702=>'AL',
-64703=>'AL',
-64704=>'AL',
-64705=>'AL',
-64706=>'AL',
-64707=>'AL',
-64708=>'AL',
-64709=>'AL',
-64710=>'AL',
-64711=>'AL',
-64712=>'AL',
-64713=>'AL',
-64714=>'AL',
-64715=>'AL',
-64716=>'AL',
-64717=>'AL',
-64718=>'AL',
-64719=>'AL',
-64720=>'AL',
-64721=>'AL',
-64722=>'AL',
-64723=>'AL',
-64724=>'AL',
-64725=>'AL',
-64726=>'AL',
-64727=>'AL',
-64728=>'AL',
-64729=>'AL',
-64730=>'AL',
-64731=>'AL',
-64732=>'AL',
-64733=>'AL',
-64734=>'AL',
-64735=>'AL',
-64736=>'AL',
-64737=>'AL',
-64738=>'AL',
-64739=>'AL',
-64740=>'AL',
-64741=>'AL',
-64742=>'AL',
-64743=>'AL',
-64744=>'AL',
-64745=>'AL',
-64746=>'AL',
-64747=>'AL',
-64748=>'AL',
-64749=>'AL',
-64750=>'AL',
-64751=>'AL',
-64752=>'AL',
-64753=>'AL',
-64754=>'AL',
-64755=>'AL',
-64756=>'AL',
-64757=>'AL',
-64758=>'AL',
-64759=>'AL',
-64760=>'AL',
-64761=>'AL',
-64762=>'AL',
-64763=>'AL',
-64764=>'AL',
-64765=>'AL',
-64766=>'AL',
-64767=>'AL',
-64768=>'AL',
-64769=>'AL',
-64770=>'AL',
-64771=>'AL',
-64772=>'AL',
-64773=>'AL',
-64774=>'AL',
-64775=>'AL',
-64776=>'AL',
-64777=>'AL',
-64778=>'AL',
-64779=>'AL',
-64780=>'AL',
-64781=>'AL',
-64782=>'AL',
-64783=>'AL',
-64784=>'AL',
-64785=>'AL',
-64786=>'AL',
-64787=>'AL',
-64788=>'AL',
-64789=>'AL',
-64790=>'AL',
-64791=>'AL',
-64792=>'AL',
-64793=>'AL',
-64794=>'AL',
-64795=>'AL',
-64796=>'AL',
-64797=>'AL',
-64798=>'AL',
-64799=>'AL',
-64800=>'AL',
-64801=>'AL',
-64802=>'AL',
-64803=>'AL',
-64804=>'AL',
-64805=>'AL',
-64806=>'AL',
-64807=>'AL',
-64808=>'AL',
-64809=>'AL',
-64810=>'AL',
-64811=>'AL',
-64812=>'AL',
-64813=>'AL',
-64814=>'AL',
-64815=>'AL',
-64816=>'AL',
-64817=>'AL',
-64818=>'AL',
-64819=>'AL',
-64820=>'AL',
-64821=>'AL',
-64822=>'AL',
-64823=>'AL',
-64824=>'AL',
-64825=>'AL',
-64826=>'AL',
-64827=>'AL',
-64828=>'AL',
-64829=>'AL',
-64830=>'ON',
-64831=>'ON',
-64848=>'AL',
-64849=>'AL',
-64850=>'AL',
-64851=>'AL',
-64852=>'AL',
-64853=>'AL',
-64854=>'AL',
-64855=>'AL',
-64856=>'AL',
-64857=>'AL',
-64858=>'AL',
-64859=>'AL',
-64860=>'AL',
-64861=>'AL',
-64862=>'AL',
-64863=>'AL',
-64864=>'AL',
-64865=>'AL',
-64866=>'AL',
-64867=>'AL',
-64868=>'AL',
-64869=>'AL',
-64870=>'AL',
-64871=>'AL',
-64872=>'AL',
-64873=>'AL',
-64874=>'AL',
-64875=>'AL',
-64876=>'AL',
-64877=>'AL',
-64878=>'AL',
-64879=>'AL',
-64880=>'AL',
-64881=>'AL',
-64882=>'AL',
-64883=>'AL',
-64884=>'AL',
-64885=>'AL',
-64886=>'AL',
-64887=>'AL',
-64888=>'AL',
-64889=>'AL',
-64890=>'AL',
-64891=>'AL',
-64892=>'AL',
-64893=>'AL',
-64894=>'AL',
-64895=>'AL',
-64896=>'AL',
-64897=>'AL',
-64898=>'AL',
-64899=>'AL',
-64900=>'AL',
-64901=>'AL',
-64902=>'AL',
-64903=>'AL',
-64904=>'AL',
-64905=>'AL',
-64906=>'AL',
-64907=>'AL',
-64908=>'AL',
-64909=>'AL',
-64910=>'AL',
-64911=>'AL',
-64914=>'AL',
-64915=>'AL',
-64916=>'AL',
-64917=>'AL',
-64918=>'AL',
-64919=>'AL',
-64920=>'AL',
-64921=>'AL',
-64922=>'AL',
-64923=>'AL',
-64924=>'AL',
-64925=>'AL',
-64926=>'AL',
-64927=>'AL',
-64928=>'AL',
-64929=>'AL',
-64930=>'AL',
-64931=>'AL',
-64932=>'AL',
-64933=>'AL',
-64934=>'AL',
-64935=>'AL',
-64936=>'AL',
-64937=>'AL',
-64938=>'AL',
-64939=>'AL',
-64940=>'AL',
-64941=>'AL',
-64942=>'AL',
-64943=>'AL',
-64944=>'AL',
-64945=>'AL',
-64946=>'AL',
-64947=>'AL',
-64948=>'AL',
-64949=>'AL',
-64950=>'AL',
-64951=>'AL',
-64952=>'AL',
-64953=>'AL',
-64954=>'AL',
-64955=>'AL',
-64956=>'AL',
-64957=>'AL',
-64958=>'AL',
-64959=>'AL',
-64960=>'AL',
-64961=>'AL',
-64962=>'AL',
-64963=>'AL',
-64964=>'AL',
-64965=>'AL',
-64966=>'AL',
-64967=>'AL',
-65008=>'AL',
-65009=>'AL',
-65010=>'AL',
-65011=>'AL',
-65012=>'AL',
-65013=>'AL',
-65014=>'AL',
-65015=>'AL',
-65016=>'AL',
-65017=>'AL',
-65018=>'AL',
-65019=>'AL',
-65020=>'AL',
-65021=>'ON',
-65024=>'NSM',
-65025=>'NSM',
-65026=>'NSM',
-65027=>'NSM',
-65028=>'NSM',
-65029=>'NSM',
-65030=>'NSM',
-65031=>'NSM',
-65032=>'NSM',
-65033=>'NSM',
-65034=>'NSM',
-65035=>'NSM',
-65036=>'NSM',
-65037=>'NSM',
-65038=>'NSM',
-65039=>'NSM',
-65040=>'ON',
-65041=>'ON',
-65042=>'ON',
-65043=>'ON',
-65044=>'ON',
-65045=>'ON',
-65046=>'ON',
-65047=>'ON',
-65048=>'ON',
-65049=>'ON',
-65056=>'NSM',
-65057=>'NSM',
-65058=>'NSM',
-65059=>'NSM',
-65072=>'ON',
-65073=>'ON',
-65074=>'ON',
-65075=>'ON',
-65076=>'ON',
-65077=>'ON',
-65078=>'ON',
-65079=>'ON',
-65080=>'ON',
-65081=>'ON',
-65082=>'ON',
-65083=>'ON',
-65084=>'ON',
-65085=>'ON',
-65086=>'ON',
-65087=>'ON',
-65088=>'ON',
-65089=>'ON',
-65090=>'ON',
-65091=>'ON',
-65092=>'ON',
-65093=>'ON',
-65094=>'ON',
-65095=>'ON',
-65096=>'ON',
-65097=>'ON',
-65098=>'ON',
-65099=>'ON',
-65100=>'ON',
-65101=>'ON',
-65102=>'ON',
-65103=>'ON',
-65104=>'CS',
-65105=>'ON',
-65106=>'CS',
-65108=>'ON',
-65109=>'CS',
-65110=>'ON',
-65111=>'ON',
-65112=>'ON',
-65113=>'ON',
-65114=>'ON',
-65115=>'ON',
-65116=>'ON',
-65117=>'ON',
-65118=>'ON',
-65119=>'ET',
-65120=>'ON',
-65121=>'ON',
-65122=>'ES',
-65123=>'ES',
-65124=>'ON',
-65125=>'ON',
-65126=>'ON',
-65128=>'ON',
-65129=>'ET',
-65130=>'ET',
-65131=>'ON',
-65136=>'AL',
-65137=>'AL',
-65138=>'AL',
-65139=>'AL',
-65140=>'AL',
-65142=>'AL',
-65143=>'AL',
-65144=>'AL',
-65145=>'AL',
-65146=>'AL',
-65147=>'AL',
-65148=>'AL',
-65149=>'AL',
-65150=>'AL',
-65151=>'AL',
-65152=>'AL',
-65153=>'AL',
-65154=>'AL',
-65155=>'AL',
-65156=>'AL',
-65157=>'AL',
-65158=>'AL',
-65159=>'AL',
-65160=>'AL',
-65161=>'AL',
-65162=>'AL',
-65163=>'AL',
-65164=>'AL',
-65165=>'AL',
-65166=>'AL',
-65167=>'AL',
-65168=>'AL',
-65169=>'AL',
-65170=>'AL',
-65171=>'AL',
-65172=>'AL',
-65173=>'AL',
-65174=>'AL',
-65175=>'AL',
-65176=>'AL',
-65177=>'AL',
-65178=>'AL',
-65179=>'AL',
-65180=>'AL',
-65181=>'AL',
-65182=>'AL',
-65183=>'AL',
-65184=>'AL',
-65185=>'AL',
-65186=>'AL',
-65187=>'AL',
-65188=>'AL',
-65189=>'AL',
-65190=>'AL',
-65191=>'AL',
-65192=>'AL',
-65193=>'AL',
-65194=>'AL',
-65195=>'AL',
-65196=>'AL',
-65197=>'AL',
-65198=>'AL',
-65199=>'AL',
-65200=>'AL',
-65201=>'AL',
-65202=>'AL',
-65203=>'AL',
-65204=>'AL',
-65205=>'AL',
-65206=>'AL',
-65207=>'AL',
-65208=>'AL',
-65209=>'AL',
-65210=>'AL',
-65211=>'AL',
-65212=>'AL',
-65213=>'AL',
-65214=>'AL',
-65215=>'AL',
-65216=>'AL',
-65217=>'AL',
-65218=>'AL',
-65219=>'AL',
-65220=>'AL',
-65221=>'AL',
-65222=>'AL',
-65223=>'AL',
-65224=>'AL',
-65225=>'AL',
-65226=>'AL',
-65227=>'AL',
-65228=>'AL',
-65229=>'AL',
-65230=>'AL',
-65231=>'AL',
-65232=>'AL',
-65233=>'AL',
-65234=>'AL',
-65235=>'AL',
-65236=>'AL',
-65237=>'AL',
-65238=>'AL',
-65239=>'AL',
-65240=>'AL',
-65241=>'AL',
-65242=>'AL',
-65243=>'AL',
-65244=>'AL',
-65245=>'AL',
-65246=>'AL',
-65247=>'AL',
-65248=>'AL',
-65249=>'AL',
-65250=>'AL',
-65251=>'AL',
-65252=>'AL',
-65253=>'AL',
-65254=>'AL',
-65255=>'AL',
-65256=>'AL',
-65257=>'AL',
-65258=>'AL',
-65259=>'AL',
-65260=>'AL',
-65261=>'AL',
-65262=>'AL',
-65263=>'AL',
-65264=>'AL',
-65265=>'AL',
-65266=>'AL',
-65267=>'AL',
-65268=>'AL',
-65269=>'AL',
-65270=>'AL',
-65271=>'AL',
-65272=>'AL',
-65273=>'AL',
-65274=>'AL',
-65275=>'AL',
-65276=>'AL',
-65279=>'BN',
-65281=>'ON',
-65282=>'ON',
-65283=>'ET',
-65284=>'ET',
-65285=>'ET',
-65286=>'ON',
-65287=>'ON',
-65288=>'ON',
-65289=>'ON',
-65290=>'ON',
-65291=>'ES',
-65292=>'CS',
-65293=>'ES',
-65294=>'CS',
-65295=>'CS',
-65296=>'EN',
-65297=>'EN',
-65298=>'EN',
-65299=>'EN',
-65300=>'EN',
-65301=>'EN',
-65302=>'EN',
-65303=>'EN',
-65304=>'EN',
-65305=>'EN',
-65306=>'CS',
-65307=>'ON',
-65308=>'ON',
-65309=>'ON',
-65310=>'ON',
-65311=>'ON',
-65312=>'ON',
-65313=>'L',
-65314=>'L',
-65315=>'L',
-65316=>'L',
-65317=>'L',
-65318=>'L',
-65319=>'L',
-65320=>'L',
-65321=>'L',
-65322=>'L',
-65323=>'L',
-65324=>'L',
-65325=>'L',
-65326=>'L',
-65327=>'L',
-65328=>'L',
-65329=>'L',
-65330=>'L',
-65331=>'L',
-65332=>'L',
-65333=>'L',
-65334=>'L',
-65335=>'L',
-65336=>'L',
-65337=>'L',
-65338=>'L',
-65339=>'ON',
-65340=>'ON',
-65341=>'ON',
-65342=>'ON',
-65343=>'ON',
-65344=>'ON',
-65345=>'L',
-65346=>'L',
-65347=>'L',
-65348=>'L',
-65349=>'L',
-65350=>'L',
-65351=>'L',
-65352=>'L',
-65353=>'L',
-65354=>'L',
-65355=>'L',
-65356=>'L',
-65357=>'L',
-65358=>'L',
-65359=>'L',
-65360=>'L',
-65361=>'L',
-65362=>'L',
-65363=>'L',
-65364=>'L',
-65365=>'L',
-65366=>'L',
-65367=>'L',
-65368=>'L',
-65369=>'L',
-65370=>'L',
-65371=>'ON',
-65372=>'ON',
-65373=>'ON',
-65374=>'ON',
-65375=>'ON',
-65376=>'ON',
-65377=>'ON',
-65378=>'ON',
-65379=>'ON',
-65380=>'ON',
-65381=>'ON',
-65382=>'L',
-65383=>'L',
-65384=>'L',
-65385=>'L',
-65386=>'L',
-65387=>'L',
-65388=>'L',
-65389=>'L',
-65390=>'L',
-65391=>'L',
-65392=>'L',
-65393=>'L',
-65394=>'L',
-65395=>'L',
-65396=>'L',
-65397=>'L',
-65398=>'L',
-65399=>'L',
-65400=>'L',
-65401=>'L',
-65402=>'L',
-65403=>'L',
-65404=>'L',
-65405=>'L',
-65406=>'L',
-65407=>'L',
-65408=>'L',
-65409=>'L',
-65410=>'L',
-65411=>'L',
-65412=>'L',
-65413=>'L',
-65414=>'L',
-65415=>'L',
-65416=>'L',
-65417=>'L',
-65418=>'L',
-65419=>'L',
-65420=>'L',
-65421=>'L',
-65422=>'L',
-65423=>'L',
-65424=>'L',
-65425=>'L',
-65426=>'L',
-65427=>'L',
-65428=>'L',
-65429=>'L',
-65430=>'L',
-65431=>'L',
-65432=>'L',
-65433=>'L',
-65434=>'L',
-65435=>'L',
-65436=>'L',
-65437=>'L',
-65438=>'L',
-65439=>'L',
-65440=>'L',
-65441=>'L',
-65442=>'L',
-65443=>'L',
-65444=>'L',
-65445=>'L',
-65446=>'L',
-65447=>'L',
-65448=>'L',
-65449=>'L',
-65450=>'L',
-65451=>'L',
-65452=>'L',
-65453=>'L',
-65454=>'L',
-65455=>'L',
-65456=>'L',
-65457=>'L',
-65458=>'L',
-65459=>'L',
-65460=>'L',
-65461=>'L',
-65462=>'L',
-65463=>'L',
-65464=>'L',
-65465=>'L',
-65466=>'L',
-65467=>'L',
-65468=>'L',
-65469=>'L',
-65470=>'L',
-65474=>'L',
-65475=>'L',
-65476=>'L',
-65477=>'L',
-65478=>'L',
-65479=>'L',
-65482=>'L',
-65483=>'L',
-65484=>'L',
-65485=>'L',
-65486=>'L',
-65487=>'L',
-65490=>'L',
-65491=>'L',
-65492=>'L',
-65493=>'L',
-65494=>'L',
-65495=>'L',
-65498=>'L',
-65499=>'L',
-65500=>'L',
-65504=>'ET',
-65505=>'ET',
-65506=>'ON',
-65507=>'ON',
-65508=>'ON',
-65509=>'ET',
-65510=>'ET',
-65512=>'ON',
-65513=>'ON',
-65514=>'ON',
-65515=>'ON',
-65516=>'ON',
-65517=>'ON',
-65518=>'ON',
-65529=>'ON',
-65530=>'ON',
-65531=>'ON',
-65532=>'ON',
-65533=>'ON',
-65536=>'L',
-65537=>'L',
-65538=>'L',
-65539=>'L',
-65540=>'L',
-65541=>'L',
-65542=>'L',
-65543=>'L',
-65544=>'L',
-65545=>'L',
-65546=>'L',
-65547=>'L',
-65549=>'L',
-65550=>'L',
-65551=>'L',
-65552=>'L',
-65553=>'L',
-65554=>'L',
-65555=>'L',
-65556=>'L',
-65557=>'L',
-65558=>'L',
-65559=>'L',
-65560=>'L',
-65561=>'L',
-65562=>'L',
-65563=>'L',
-65564=>'L',
-65565=>'L',
-65566=>'L',
-65567=>'L',
-65568=>'L',
-65569=>'L',
-65570=>'L',
-65571=>'L',
-65572=>'L',
-65573=>'L',
-65574=>'L',
-65576=>'L',
-65577=>'L',
-65578=>'L',
-65579=>'L',
-65580=>'L',
-65581=>'L',
-65582=>'L',
-65583=>'L',
-65584=>'L',
-65585=>'L',
-65586=>'L',
-65587=>'L',
-65588=>'L',
-65589=>'L',
-65590=>'L',
-65591=>'L',
-65592=>'L',
-65593=>'L',
-65594=>'L',
-65596=>'L',
-65597=>'L',
-65599=>'L',
-65600=>'L',
-65601=>'L',
-65602=>'L',
-65603=>'L',
-65604=>'L',
-65605=>'L',
-65606=>'L',
-65607=>'L',
-65608=>'L',
-65609=>'L',
-65610=>'L',
-65611=>'L',
-65612=>'L',
-65613=>'L',
-65616=>'L',
-65617=>'L',
-65618=>'L',
-65619=>'L',
-65620=>'L',
-65621=>'L',
-65622=>'L',
-65623=>'L',
-65624=>'L',
-65625=>'L',
-65626=>'L',
-65627=>'L',
-65628=>'L',
-65629=>'L',
-65664=>'L',
-65665=>'L',
-65666=>'L',
-65667=>'L',
-65668=>'L',
-65669=>'L',
-65670=>'L',
-65671=>'L',
-65672=>'L',
-65673=>'L',
-65674=>'L',
-65675=>'L',
-65676=>'L',
-65677=>'L',
-65678=>'L',
-65679=>'L',
-65680=>'L',
-65681=>'L',
-65682=>'L',
-65683=>'L',
-65684=>'L',
-65685=>'L',
-65686=>'L',
-65687=>'L',
-65688=>'L',
-65689=>'L',
-65690=>'L',
-65691=>'L',
-65692=>'L',
-65693=>'L',
-65694=>'L',
-65695=>'L',
-65696=>'L',
-65697=>'L',
-65698=>'L',
-65699=>'L',
-65700=>'L',
-65701=>'L',
-65702=>'L',
-65703=>'L',
-65704=>'L',
-65705=>'L',
-65706=>'L',
-65707=>'L',
-65708=>'L',
-65709=>'L',
-65710=>'L',
-65711=>'L',
-65712=>'L',
-65713=>'L',
-65714=>'L',
-65715=>'L',
-65716=>'L',
-65717=>'L',
-65718=>'L',
-65719=>'L',
-65720=>'L',
-65721=>'L',
-65722=>'L',
-65723=>'L',
-65724=>'L',
-65725=>'L',
-65726=>'L',
-65727=>'L',
-65728=>'L',
-65729=>'L',
-65730=>'L',
-65731=>'L',
-65732=>'L',
-65733=>'L',
-65734=>'L',
-65735=>'L',
-65736=>'L',
-65737=>'L',
-65738=>'L',
-65739=>'L',
-65740=>'L',
-65741=>'L',
-65742=>'L',
-65743=>'L',
-65744=>'L',
-65745=>'L',
-65746=>'L',
-65747=>'L',
-65748=>'L',
-65749=>'L',
-65750=>'L',
-65751=>'L',
-65752=>'L',
-65753=>'L',
-65754=>'L',
-65755=>'L',
-65756=>'L',
-65757=>'L',
-65758=>'L',
-65759=>'L',
-65760=>'L',
-65761=>'L',
-65762=>'L',
-65763=>'L',
-65764=>'L',
-65765=>'L',
-65766=>'L',
-65767=>'L',
-65768=>'L',
-65769=>'L',
-65770=>'L',
-65771=>'L',
-65772=>'L',
-65773=>'L',
-65774=>'L',
-65775=>'L',
-65776=>'L',
-65777=>'L',
-65778=>'L',
-65779=>'L',
-65780=>'L',
-65781=>'L',
-65782=>'L',
-65783=>'L',
-65784=>'L',
-65785=>'L',
-65786=>'L',
-65792=>'L',
-65793=>'ON',
-65794=>'L',
-65799=>'L',
-65800=>'L',
-65801=>'L',
-65802=>'L',
-65803=>'L',
-65804=>'L',
-65805=>'L',
-65806=>'L',
-65807=>'L',
-65808=>'L',
-65809=>'L',
-65810=>'L',
-65811=>'L',
-65812=>'L',
-65813=>'L',
-65814=>'L',
-65815=>'L',
-65816=>'L',
-65817=>'L',
-65818=>'L',
-65819=>'L',
-65820=>'L',
-65821=>'L',
-65822=>'L',
-65823=>'L',
-65824=>'L',
-65825=>'L',
-65826=>'L',
-65827=>'L',
-65828=>'L',
-65829=>'L',
-65830=>'L',
-65831=>'L',
-65832=>'L',
-65833=>'L',
-65834=>'L',
-65835=>'L',
-65836=>'L',
-65837=>'L',
-65838=>'L',
-65839=>'L',
-65840=>'L',
-65841=>'L',
-65842=>'L',
-65843=>'L',
-65847=>'L',
-65848=>'L',
-65849=>'L',
-65850=>'L',
-65851=>'L',
-65852=>'L',
-65853=>'L',
-65854=>'L',
-65855=>'L',
-65856=>'ON',
-65857=>'ON',
-65858=>'ON',
-65859=>'ON',
-65860=>'ON',
-65861=>'ON',
-65862=>'ON',
-65863=>'ON',
-65864=>'ON',
-65865=>'ON',
-65866=>'ON',
-65867=>'ON',
-65868=>'ON',
-65869=>'ON',
-65870=>'ON',
-65871=>'ON',
-65872=>'ON',
-65873=>'ON',
-65874=>'ON',
-65875=>'ON',
-65876=>'ON',
-65877=>'ON',
-65878=>'ON',
-65879=>'ON',
-65880=>'ON',
-65881=>'ON',
-65882=>'ON',
-65883=>'ON',
-65884=>'ON',
-65885=>'ON',
-65886=>'ON',
-65887=>'ON',
-65888=>'ON',
-65889=>'ON',
-65890=>'ON',
-65891=>'ON',
-65892=>'ON',
-65893=>'ON',
-65894=>'ON',
-65895=>'ON',
-65896=>'ON',
-65897=>'ON',
-65898=>'ON',
-65899=>'ON',
-65900=>'ON',
-65901=>'ON',
-65902=>'ON',
-65903=>'ON',
-65904=>'ON',
-65905=>'ON',
-65906=>'ON',
-65907=>'ON',
-65908=>'ON',
-65909=>'ON',
-65910=>'ON',
-65911=>'ON',
-65912=>'ON',
-65913=>'ON',
-65914=>'ON',
-65915=>'ON',
-65916=>'ON',
-65917=>'ON',
-65918=>'ON',
-65919=>'ON',
-65920=>'ON',
-65921=>'ON',
-65922=>'ON',
-65923=>'ON',
-65924=>'ON',
-65925=>'ON',
-65926=>'ON',
-65927=>'ON',
-65928=>'ON',
-65929=>'ON',
-65930=>'ON',
-66304=>'L',
-66305=>'L',
-66306=>'L',
-66307=>'L',
-66308=>'L',
-66309=>'L',
-66310=>'L',
-66311=>'L',
-66312=>'L',
-66313=>'L',
-66314=>'L',
-66315=>'L',
-66316=>'L',
-66317=>'L',
-66318=>'L',
-66319=>'L',
-66320=>'L',
-66321=>'L',
-66322=>'L',
-66323=>'L',
-66324=>'L',
-66325=>'L',
-66326=>'L',
-66327=>'L',
-66328=>'L',
-66329=>'L',
-66330=>'L',
-66331=>'L',
-66332=>'L',
-66333=>'L',
-66334=>'L',
-66336=>'L',
-66337=>'L',
-66338=>'L',
-66339=>'L',
-66352=>'L',
-66353=>'L',
-66354=>'L',
-66355=>'L',
-66356=>'L',
-66357=>'L',
-66358=>'L',
-66359=>'L',
-66360=>'L',
-66361=>'L',
-66362=>'L',
-66363=>'L',
-66364=>'L',
-66365=>'L',
-66366=>'L',
-66367=>'L',
-66368=>'L',
-66369=>'L',
-66370=>'L',
-66371=>'L',
-66372=>'L',
-66373=>'L',
-66374=>'L',
-66375=>'L',
-66376=>'L',
-66377=>'L',
-66378=>'L',
-66432=>'L',
-66433=>'L',
-66434=>'L',
-66435=>'L',
-66436=>'L',
-66437=>'L',
-66438=>'L',
-66439=>'L',
-66440=>'L',
-66441=>'L',
-66442=>'L',
-66443=>'L',
-66444=>'L',
-66445=>'L',
-66446=>'L',
-66447=>'L',
-66448=>'L',
-66449=>'L',
-66450=>'L',
-66451=>'L',
-66452=>'L',
-66453=>'L',
-66454=>'L',
-66455=>'L',
-66456=>'L',
-66457=>'L',
-66458=>'L',
-66459=>'L',
-66460=>'L',
-66461=>'L',
-66463=>'L',
-66464=>'L',
-66465=>'L',
-66466=>'L',
-66467=>'L',
-66468=>'L',
-66469=>'L',
-66470=>'L',
-66471=>'L',
-66472=>'L',
-66473=>'L',
-66474=>'L',
-66475=>'L',
-66476=>'L',
-66477=>'L',
-66478=>'L',
-66479=>'L',
-66480=>'L',
-66481=>'L',
-66482=>'L',
-66483=>'L',
-66484=>'L',
-66485=>'L',
-66486=>'L',
-66487=>'L',
-66488=>'L',
-66489=>'L',
-66490=>'L',
-66491=>'L',
-66492=>'L',
-66493=>'L',
-66494=>'L',
-66495=>'L',
-66496=>'L',
-66497=>'L',
-66498=>'L',
-66499=>'L',
-66504=>'L',
-66505=>'L',
-66506=>'L',
-66507=>'L',
-66508=>'L',
-66509=>'L',
-66510=>'L',
-66511=>'L',
-66512=>'L',
-66513=>'L',
-66514=>'L',
-66515=>'L',
-66516=>'L',
-66517=>'L',
-66560=>'L',
-66561=>'L',
-66562=>'L',
-66563=>'L',
-66564=>'L',
-66565=>'L',
-66566=>'L',
-66567=>'L',
-66568=>'L',
-66569=>'L',
-66570=>'L',
-66571=>'L',
-66572=>'L',
-66573=>'L',
-66574=>'L',
-66575=>'L',
-66576=>'L',
-66577=>'L',
-66578=>'L',
-66579=>'L',
-66580=>'L',
-66581=>'L',
-66582=>'L',
-66583=>'L',
-66584=>'L',
-66585=>'L',
-66586=>'L',
-66587=>'L',
-66588=>'L',
-66589=>'L',
-66590=>'L',
-66591=>'L',
-66592=>'L',
-66593=>'L',
-66594=>'L',
-66595=>'L',
-66596=>'L',
-66597=>'L',
-66598=>'L',
-66599=>'L',
-66600=>'L',
-66601=>'L',
-66602=>'L',
-66603=>'L',
-66604=>'L',
-66605=>'L',
-66606=>'L',
-66607=>'L',
-66608=>'L',
-66609=>'L',
-66610=>'L',
-66611=>'L',
-66612=>'L',
-66613=>'L',
-66614=>'L',
-66615=>'L',
-66616=>'L',
-66617=>'L',
-66618=>'L',
-66619=>'L',
-66620=>'L',
-66621=>'L',
-66622=>'L',
-66623=>'L',
-66624=>'L',
-66625=>'L',
-66626=>'L',
-66627=>'L',
-66628=>'L',
-66629=>'L',
-66630=>'L',
-66631=>'L',
-66632=>'L',
-66633=>'L',
-66634=>'L',
-66635=>'L',
-66636=>'L',
-66637=>'L',
-66638=>'L',
-66639=>'L',
-66640=>'L',
-66641=>'L',
-66642=>'L',
-66643=>'L',
-66644=>'L',
-66645=>'L',
-66646=>'L',
-66647=>'L',
-66648=>'L',
-66649=>'L',
-66650=>'L',
-66651=>'L',
-66652=>'L',
-66653=>'L',
-66654=>'L',
-66655=>'L',
-66656=>'L',
-66657=>'L',
-66658=>'L',
-66659=>'L',
-66660=>'L',
-66661=>'L',
-66662=>'L',
-66663=>'L',
-66664=>'L',
-66665=>'L',
-66666=>'L',
-66667=>'L',
-66668=>'L',
-66669=>'L',
-66670=>'L',
-66671=>'L',
-66672=>'L',
-66673=>'L',
-66674=>'L',
-66675=>'L',
-66676=>'L',
-66677=>'L',
-66678=>'L',
-66679=>'L',
-66680=>'L',
-66681=>'L',
-66682=>'L',
-66683=>'L',
-66684=>'L',
-66685=>'L',
-66686=>'L',
-66687=>'L',
-66688=>'L',
-66689=>'L',
-66690=>'L',
-66691=>'L',
-66692=>'L',
-66693=>'L',
-66694=>'L',
-66695=>'L',
-66696=>'L',
-66697=>'L',
-66698=>'L',
-66699=>'L',
-66700=>'L',
-66701=>'L',
-66702=>'L',
-66703=>'L',
-66704=>'L',
-66705=>'L',
-66706=>'L',
-66707=>'L',
-66708=>'L',
-66709=>'L',
-66710=>'L',
-66711=>'L',
-66712=>'L',
-66713=>'L',
-66714=>'L',
-66715=>'L',
-66716=>'L',
-66717=>'L',
-66720=>'L',
-66721=>'L',
-66722=>'L',
-66723=>'L',
-66724=>'L',
-66725=>'L',
-66726=>'L',
-66727=>'L',
-66728=>'L',
-66729=>'L',
-67584=>'R',
-67585=>'R',
-67586=>'R',
-67587=>'R',
-67588=>'R',
-67589=>'R',
-67592=>'R',
-67594=>'R',
-67595=>'R',
-67596=>'R',
-67597=>'R',
-67598=>'R',
-67599=>'R',
-67600=>'R',
-67601=>'R',
-67602=>'R',
-67603=>'R',
-67604=>'R',
-67605=>'R',
-67606=>'R',
-67607=>'R',
-67608=>'R',
-67609=>'R',
-67610=>'R',
-67611=>'R',
-67612=>'R',
-67613=>'R',
-67614=>'R',
-67615=>'R',
-67616=>'R',
-67617=>'R',
-67618=>'R',
-67619=>'R',
-67620=>'R',
-67621=>'R',
-67622=>'R',
-67623=>'R',
-67624=>'R',
-67625=>'R',
-67626=>'R',
-67627=>'R',
-67628=>'R',
-67629=>'R',
-67630=>'R',
-67631=>'R',
-67632=>'R',
-67633=>'R',
-67634=>'R',
-67635=>'R',
-67636=>'R',
-67637=>'R',
-67639=>'R',
-67640=>'R',
-67644=>'R',
-67647=>'R',
-67840=>'R',
-67841=>'R',
-67842=>'R',
-67843=>'R',
-67844=>'R',
-67845=>'R',
-67846=>'R',
-67847=>'R',
-67848=>'R',
-67849=>'R',
-67850=>'R',
-67851=>'R',
-67852=>'R',
-67853=>'R',
-67854=>'R',
-67855=>'R',
-67856=>'R',
-67857=>'R',
-67858=>'R',
-67859=>'R',
-67860=>'R',
-67861=>'R',
-67862=>'R',
-67863=>'R',
-67864=>'R',
-67865=>'R',
-67871=>'ON',
-68096=>'R',
-68097=>'NSM',
-68098=>'NSM',
-68099=>'NSM',
-68101=>'NSM',
-68102=>'NSM',
-68108=>'NSM',
-68109=>'NSM',
-68110=>'NSM',
-68111=>'NSM',
-68112=>'R',
-68113=>'R',
-68114=>'R',
-68115=>'R',
-68117=>'R',
-68118=>'R',
-68119=>'R',
-68121=>'R',
-68122=>'R',
-68123=>'R',
-68124=>'R',
-68125=>'R',
-68126=>'R',
-68127=>'R',
-68128=>'R',
-68129=>'R',
-68130=>'R',
-68131=>'R',
-68132=>'R',
-68133=>'R',
-68134=>'R',
-68135=>'R',
-68136=>'R',
-68137=>'R',
-68138=>'R',
-68139=>'R',
-68140=>'R',
-68141=>'R',
-68142=>'R',
-68143=>'R',
-68144=>'R',
-68145=>'R',
-68146=>'R',
-68147=>'R',
-68152=>'NSM',
-68153=>'NSM',
-68154=>'NSM',
-68159=>'NSM',
-68160=>'R',
-68161=>'R',
-68162=>'R',
-68163=>'R',
-68164=>'R',
-68165=>'R',
-68166=>'R',
-68167=>'R',
-68176=>'R',
-68177=>'R',
-68178=>'R',
-68179=>'R',
-68180=>'R',
-68181=>'R',
-68182=>'R',
-68183=>'R',
-68184=>'R',
-73728=>'L',
-73729=>'L',
-73730=>'L',
-73731=>'L',
-73732=>'L',
-73733=>'L',
-73734=>'L',
-73735=>'L',
-73736=>'L',
-73737=>'L',
-73738=>'L',
-73739=>'L',
-73740=>'L',
-73741=>'L',
-73742=>'L',
-73743=>'L',
-73744=>'L',
-73745=>'L',
-73746=>'L',
-73747=>'L',
-73748=>'L',
-73749=>'L',
-73750=>'L',
-73751=>'L',
-73752=>'L',
-73753=>'L',
-73754=>'L',
-73755=>'L',
-73756=>'L',
-73757=>'L',
-73758=>'L',
-73759=>'L',
-73760=>'L',
-73761=>'L',
-73762=>'L',
-73763=>'L',
-73764=>'L',
-73765=>'L',
-73766=>'L',
-73767=>'L',
-73768=>'L',
-73769=>'L',
-73770=>'L',
-73771=>'L',
-73772=>'L',
-73773=>'L',
-73774=>'L',
-73775=>'L',
-73776=>'L',
-73777=>'L',
-73778=>'L',
-73779=>'L',
-73780=>'L',
-73781=>'L',
-73782=>'L',
-73783=>'L',
-73784=>'L',
-73785=>'L',
-73786=>'L',
-73787=>'L',
-73788=>'L',
-73789=>'L',
-73790=>'L',
-73791=>'L',
-73792=>'L',
-73793=>'L',
-73794=>'L',
-73795=>'L',
-73796=>'L',
-73797=>'L',
-73798=>'L',
-73799=>'L',
-73800=>'L',
-73801=>'L',
-73802=>'L',
-73803=>'L',
-73804=>'L',
-73805=>'L',
-73806=>'L',
-73807=>'L',
-73808=>'L',
-73809=>'L',
-73810=>'L',
-73811=>'L',
-73812=>'L',
-73813=>'L',
-73814=>'L',
-73815=>'L',
-73816=>'L',
-73817=>'L',
-73818=>'L',
-73819=>'L',
-73820=>'L',
-73821=>'L',
-73822=>'L',
-73823=>'L',
-73824=>'L',
-73825=>'L',
-73826=>'L',
-73827=>'L',
-73828=>'L',
-73829=>'L',
-73830=>'L',
-73831=>'L',
-73832=>'L',
-73833=>'L',
-73834=>'L',
-73835=>'L',
-73836=>'L',
-73837=>'L',
-73838=>'L',
-73839=>'L',
-73840=>'L',
-73841=>'L',
-73842=>'L',
-73843=>'L',
-73844=>'L',
-73845=>'L',
-73846=>'L',
-73847=>'L',
-73848=>'L',
-73849=>'L',
-73850=>'L',
-73851=>'L',
-73852=>'L',
-73853=>'L',
-73854=>'L',
-73855=>'L',
-73856=>'L',
-73857=>'L',
-73858=>'L',
-73859=>'L',
-73860=>'L',
-73861=>'L',
-73862=>'L',
-73863=>'L',
-73864=>'L',
-73865=>'L',
-73866=>'L',
-73867=>'L',
-73868=>'L',
-73869=>'L',
-73870=>'L',
-73871=>'L',
-73872=>'L',
-73873=>'L',
-73874=>'L',
-73875=>'L',
-73876=>'L',
-73877=>'L',
-73878=>'L',
-73879=>'L',
-73880=>'L',
-73881=>'L',
-73882=>'L',
-73883=>'L',
-73884=>'L',
-73885=>'L',
-73886=>'L',
-73887=>'L',
-73888=>'L',
-73889=>'L',
-73890=>'L',
-73891=>'L',
-73892=>'L',
-73893=>'L',
-73894=>'L',
-73895=>'L',
-73896=>'L',
-73897=>'L',
-73898=>'L',
-73899=>'L',
-73900=>'L',
-73901=>'L',
-73902=>'L',
-73903=>'L',
-73904=>'L',
-73905=>'L',
-73906=>'L',
-73907=>'L',
-73908=>'L',
-73909=>'L',
-73910=>'L',
-73911=>'L',
-73912=>'L',
-73913=>'L',
-73914=>'L',
-73915=>'L',
-73916=>'L',
-73917=>'L',
-73918=>'L',
-73919=>'L',
-73920=>'L',
-73921=>'L',
-73922=>'L',
-73923=>'L',
-73924=>'L',
-73925=>'L',
-73926=>'L',
-73927=>'L',
-73928=>'L',
-73929=>'L',
-73930=>'L',
-73931=>'L',
-73932=>'L',
-73933=>'L',
-73934=>'L',
-73935=>'L',
-73936=>'L',
-73937=>'L',
-73938=>'L',
-73939=>'L',
-73940=>'L',
-73941=>'L',
-73942=>'L',
-73943=>'L',
-73944=>'L',
-73945=>'L',
-73946=>'L',
-73947=>'L',
-73948=>'L',
-73949=>'L',
-73950=>'L',
-73951=>'L',
-73952=>'L',
-73953=>'L',
-73954=>'L',
-73955=>'L',
-73956=>'L',
-73957=>'L',
-73958=>'L',
-73959=>'L',
-73960=>'L',
-73961=>'L',
-73962=>'L',
-73963=>'L',
-73964=>'L',
-73965=>'L',
-73966=>'L',
-73967=>'L',
-73968=>'L',
-73969=>'L',
-73970=>'L',
-73971=>'L',
-73972=>'L',
-73973=>'L',
-73974=>'L',
-73975=>'L',
-73976=>'L',
-73977=>'L',
-73978=>'L',
-73979=>'L',
-73980=>'L',
-73981=>'L',
-73982=>'L',
-73983=>'L',
-73984=>'L',
-73985=>'L',
-73986=>'L',
-73987=>'L',
-73988=>'L',
-73989=>'L',
-73990=>'L',
-73991=>'L',
-73992=>'L',
-73993=>'L',
-73994=>'L',
-73995=>'L',
-73996=>'L',
-73997=>'L',
-73998=>'L',
-73999=>'L',
-74000=>'L',
-74001=>'L',
-74002=>'L',
-74003=>'L',
-74004=>'L',
-74005=>'L',
-74006=>'L',
-74007=>'L',
-74008=>'L',
-74009=>'L',
-74010=>'L',
-74011=>'L',
-74012=>'L',
-74013=>'L',
-74014=>'L',
-74015=>'L',
-74016=>'L',
-74017=>'L',
-74018=>'L',
-74019=>'L',
-74020=>'L',
-74021=>'L',
-74022=>'L',
-74023=>'L',
-74024=>'L',
-74025=>'L',
-74026=>'L',
-74027=>'L',
-74028=>'L',
-74029=>'L',
-74030=>'L',
-74031=>'L',
-74032=>'L',
-74033=>'L',
-74034=>'L',
-74035=>'L',
-74036=>'L',
-74037=>'L',
-74038=>'L',
-74039=>'L',
-74040=>'L',
-74041=>'L',
-74042=>'L',
-74043=>'L',
-74044=>'L',
-74045=>'L',
-74046=>'L',
-74047=>'L',
-74048=>'L',
-74049=>'L',
-74050=>'L',
-74051=>'L',
-74052=>'L',
-74053=>'L',
-74054=>'L',
-74055=>'L',
-74056=>'L',
-74057=>'L',
-74058=>'L',
-74059=>'L',
-74060=>'L',
-74061=>'L',
-74062=>'L',
-74063=>'L',
-74064=>'L',
-74065=>'L',
-74066=>'L',
-74067=>'L',
-74068=>'L',
-74069=>'L',
-74070=>'L',
-74071=>'L',
-74072=>'L',
-74073=>'L',
-74074=>'L',
-74075=>'L',
-74076=>'L',
-74077=>'L',
-74078=>'L',
-74079=>'L',
-74080=>'L',
-74081=>'L',
-74082=>'L',
-74083=>'L',
-74084=>'L',
-74085=>'L',
-74086=>'L',
-74087=>'L',
-74088=>'L',
-74089=>'L',
-74090=>'L',
-74091=>'L',
-74092=>'L',
-74093=>'L',
-74094=>'L',
-74095=>'L',
-74096=>'L',
-74097=>'L',
-74098=>'L',
-74099=>'L',
-74100=>'L',
-74101=>'L',
-74102=>'L',
-74103=>'L',
-74104=>'L',
-74105=>'L',
-74106=>'L',
-74107=>'L',
-74108=>'L',
-74109=>'L',
-74110=>'L',
-74111=>'L',
-74112=>'L',
-74113=>'L',
-74114=>'L',
-74115=>'L',
-74116=>'L',
-74117=>'L',
-74118=>'L',
-74119=>'L',
-74120=>'L',
-74121=>'L',
-74122=>'L',
-74123=>'L',
-74124=>'L',
-74125=>'L',
-74126=>'L',
-74127=>'L',
-74128=>'L',
-74129=>'L',
-74130=>'L',
-74131=>'L',
-74132=>'L',
-74133=>'L',
-74134=>'L',
-74135=>'L',
-74136=>'L',
-74137=>'L',
-74138=>'L',
-74139=>'L',
-74140=>'L',
-74141=>'L',
-74142=>'L',
-74143=>'L',
-74144=>'L',
-74145=>'L',
-74146=>'L',
-74147=>'L',
-74148=>'L',
-74149=>'L',
-74150=>'L',
-74151=>'L',
-74152=>'L',
-74153=>'L',
-74154=>'L',
-74155=>'L',
-74156=>'L',
-74157=>'L',
-74158=>'L',
-74159=>'L',
-74160=>'L',
-74161=>'L',
-74162=>'L',
-74163=>'L',
-74164=>'L',
-74165=>'L',
-74166=>'L',
-74167=>'L',
-74168=>'L',
-74169=>'L',
-74170=>'L',
-74171=>'L',
-74172=>'L',
-74173=>'L',
-74174=>'L',
-74175=>'L',
-74176=>'L',
-74177=>'L',
-74178=>'L',
-74179=>'L',
-74180=>'L',
-74181=>'L',
-74182=>'L',
-74183=>'L',
-74184=>'L',
-74185=>'L',
-74186=>'L',
-74187=>'L',
-74188=>'L',
-74189=>'L',
-74190=>'L',
-74191=>'L',
-74192=>'L',
-74193=>'L',
-74194=>'L',
-74195=>'L',
-74196=>'L',
-74197=>'L',
-74198=>'L',
-74199=>'L',
-74200=>'L',
-74201=>'L',
-74202=>'L',
-74203=>'L',
-74204=>'L',
-74205=>'L',
-74206=>'L',
-74207=>'L',
-74208=>'L',
-74209=>'L',
-74210=>'L',
-74211=>'L',
-74212=>'L',
-74213=>'L',
-74214=>'L',
-74215=>'L',
-74216=>'L',
-74217=>'L',
-74218=>'L',
-74219=>'L',
-74220=>'L',
-74221=>'L',
-74222=>'L',
-74223=>'L',
-74224=>'L',
-74225=>'L',
-74226=>'L',
-74227=>'L',
-74228=>'L',
-74229=>'L',
-74230=>'L',
-74231=>'L',
-74232=>'L',
-74233=>'L',
-74234=>'L',
-74235=>'L',
-74236=>'L',
-74237=>'L',
-74238=>'L',
-74239=>'L',
-74240=>'L',
-74241=>'L',
-74242=>'L',
-74243=>'L',
-74244=>'L',
-74245=>'L',
-74246=>'L',
-74247=>'L',
-74248=>'L',
-74249=>'L',
-74250=>'L',
-74251=>'L',
-74252=>'L',
-74253=>'L',
-74254=>'L',
-74255=>'L',
-74256=>'L',
-74257=>'L',
-74258=>'L',
-74259=>'L',
-74260=>'L',
-74261=>'L',
-74262=>'L',
-74263=>'L',
-74264=>'L',
-74265=>'L',
-74266=>'L',
-74267=>'L',
-74268=>'L',
-74269=>'L',
-74270=>'L',
-74271=>'L',
-74272=>'L',
-74273=>'L',
-74274=>'L',
-74275=>'L',
-74276=>'L',
-74277=>'L',
-74278=>'L',
-74279=>'L',
-74280=>'L',
-74281=>'L',
-74282=>'L',
-74283=>'L',
-74284=>'L',
-74285=>'L',
-74286=>'L',
-74287=>'L',
-74288=>'L',
-74289=>'L',
-74290=>'L',
-74291=>'L',
-74292=>'L',
-74293=>'L',
-74294=>'L',
-74295=>'L',
-74296=>'L',
-74297=>'L',
-74298=>'L',
-74299=>'L',
-74300=>'L',
-74301=>'L',
-74302=>'L',
-74303=>'L',
-74304=>'L',
-74305=>'L',
-74306=>'L',
-74307=>'L',
-74308=>'L',
-74309=>'L',
-74310=>'L',
-74311=>'L',
-74312=>'L',
-74313=>'L',
-74314=>'L',
-74315=>'L',
-74316=>'L',
-74317=>'L',
-74318=>'L',
-74319=>'L',
-74320=>'L',
-74321=>'L',
-74322=>'L',
-74323=>'L',
-74324=>'L',
-74325=>'L',
-74326=>'L',
-74327=>'L',
-74328=>'L',
-74329=>'L',
-74330=>'L',
-74331=>'L',
-74332=>'L',
-74333=>'L',
-74334=>'L',
-74335=>'L',
-74336=>'L',
-74337=>'L',
-74338=>'L',
-74339=>'L',
-74340=>'L',
-74341=>'L',
-74342=>'L',
-74343=>'L',
-74344=>'L',
-74345=>'L',
-74346=>'L',
-74347=>'L',
-74348=>'L',
-74349=>'L',
-74350=>'L',
-74351=>'L',
-74352=>'L',
-74353=>'L',
-74354=>'L',
-74355=>'L',
-74356=>'L',
-74357=>'L',
-74358=>'L',
-74359=>'L',
-74360=>'L',
-74361=>'L',
-74362=>'L',
-74363=>'L',
-74364=>'L',
-74365=>'L',
-74366=>'L',
-74367=>'L',
-74368=>'L',
-74369=>'L',
-74370=>'L',
-74371=>'L',
-74372=>'L',
-74373=>'L',
-74374=>'L',
-74375=>'L',
-74376=>'L',
-74377=>'L',
-74378=>'L',
-74379=>'L',
-74380=>'L',
-74381=>'L',
-74382=>'L',
-74383=>'L',
-74384=>'L',
-74385=>'L',
-74386=>'L',
-74387=>'L',
-74388=>'L',
-74389=>'L',
-74390=>'L',
-74391=>'L',
-74392=>'L',
-74393=>'L',
-74394=>'L',
-74395=>'L',
-74396=>'L',
-74397=>'L',
-74398=>'L',
-74399=>'L',
-74400=>'L',
-74401=>'L',
-74402=>'L',
-74403=>'L',
-74404=>'L',
-74405=>'L',
-74406=>'L',
-74407=>'L',
-74408=>'L',
-74409=>'L',
-74410=>'L',
-74411=>'L',
-74412=>'L',
-74413=>'L',
-74414=>'L',
-74415=>'L',
-74416=>'L',
-74417=>'L',
-74418=>'L',
-74419=>'L',
-74420=>'L',
-74421=>'L',
-74422=>'L',
-74423=>'L',
-74424=>'L',
-74425=>'L',
-74426=>'L',
-74427=>'L',
-74428=>'L',
-74429=>'L',
-74430=>'L',
-74431=>'L',
-74432=>'L',
-74433=>'L',
-74434=>'L',
-74435=>'L',
-74436=>'L',
-74437=>'L',
-74438=>'L',
-74439=>'L',
-74440=>'L',
-74441=>'L',
-74442=>'L',
-74443=>'L',
-74444=>'L',
-74445=>'L',
-74446=>'L',
-74447=>'L',
-74448=>'L',
-74449=>'L',
-74450=>'L',
-74451=>'L',
-74452=>'L',
-74453=>'L',
-74454=>'L',
-74455=>'L',
-74456=>'L',
-74457=>'L',
-74458=>'L',
-74459=>'L',
-74460=>'L',
-74461=>'L',
-74462=>'L',
-74463=>'L',
-74464=>'L',
-74465=>'L',
-74466=>'L',
-74467=>'L',
-74468=>'L',
-74469=>'L',
-74470=>'L',
-74471=>'L',
-74472=>'L',
-74473=>'L',
-74474=>'L',
-74475=>'L',
-74476=>'L',
-74477=>'L',
-74478=>'L',
-74479=>'L',
-74480=>'L',
-74481=>'L',
-74482=>'L',
-74483=>'L',
-74484=>'L',
-74485=>'L',
-74486=>'L',
-74487=>'L',
-74488=>'L',
-74489=>'L',
-74490=>'L',
-74491=>'L',
-74492=>'L',
-74493=>'L',
-74494=>'L',
-74495=>'L',
-74496=>'L',
-74497=>'L',
-74498=>'L',
-74499=>'L',
-74500=>'L',
-74501=>'L',
-74502=>'L',
-74503=>'L',
-74504=>'L',
-74505=>'L',
-74506=>'L',
-74507=>'L',
-74508=>'L',
-74509=>'L',
-74510=>'L',
-74511=>'L',
-74512=>'L',
-74513=>'L',
-74514=>'L',
-74515=>'L',
-74516=>'L',
-74517=>'L',
-74518=>'L',
-74519=>'L',
-74520=>'L',
-74521=>'L',
-74522=>'L',
-74523=>'L',
-74524=>'L',
-74525=>'L',
-74526=>'L',
-74527=>'L',
-74528=>'L',
-74529=>'L',
-74530=>'L',
-74531=>'L',
-74532=>'L',
-74533=>'L',
-74534=>'L',
-74535=>'L',
-74536=>'L',
-74537=>'L',
-74538=>'L',
-74539=>'L',
-74540=>'L',
-74541=>'L',
-74542=>'L',
-74543=>'L',
-74544=>'L',
-74545=>'L',
-74546=>'L',
-74547=>'L',
-74548=>'L',
-74549=>'L',
-74550=>'L',
-74551=>'L',
-74552=>'L',
-74553=>'L',
-74554=>'L',
-74555=>'L',
-74556=>'L',
-74557=>'L',
-74558=>'L',
-74559=>'L',
-74560=>'L',
-74561=>'L',
-74562=>'L',
-74563=>'L',
-74564=>'L',
-74565=>'L',
-74566=>'L',
-74567=>'L',
-74568=>'L',
-74569=>'L',
-74570=>'L',
-74571=>'L',
-74572=>'L',
-74573=>'L',
-74574=>'L',
-74575=>'L',
-74576=>'L',
-74577=>'L',
-74578=>'L',
-74579=>'L',
-74580=>'L',
-74581=>'L',
-74582=>'L',
-74583=>'L',
-74584=>'L',
-74585=>'L',
-74586=>'L',
-74587=>'L',
-74588=>'L',
-74589=>'L',
-74590=>'L',
-74591=>'L',
-74592=>'L',
-74593=>'L',
-74594=>'L',
-74595=>'L',
-74596=>'L',
-74597=>'L',
-74598=>'L',
-74599=>'L',
-74600=>'L',
-74601=>'L',
-74602=>'L',
-74603=>'L',
-74604=>'L',
-74605=>'L',
-74606=>'L',
-74752=>'L',
-74753=>'L',
-74754=>'L',
-74755=>'L',
-74756=>'L',
-74757=>'L',
-74758=>'L',
-74759=>'L',
-74760=>'L',
-74761=>'L',
-74762=>'L',
-74763=>'L',
-74764=>'L',
-74765=>'L',
-74766=>'L',
-74767=>'L',
-74768=>'L',
-74769=>'L',
-74770=>'L',
-74771=>'L',
-74772=>'L',
-74773=>'L',
-74774=>'L',
-74775=>'L',
-74776=>'L',
-74777=>'L',
-74778=>'L',
-74779=>'L',
-74780=>'L',
-74781=>'L',
-74782=>'L',
-74783=>'L',
-74784=>'L',
-74785=>'L',
-74786=>'L',
-74787=>'L',
-74788=>'L',
-74789=>'L',
-74790=>'L',
-74791=>'L',
-74792=>'L',
-74793=>'L',
-74794=>'L',
-74795=>'L',
-74796=>'L',
-74797=>'L',
-74798=>'L',
-74799=>'L',
-74800=>'L',
-74801=>'L',
-74802=>'L',
-74803=>'L',
-74804=>'L',
-74805=>'L',
-74806=>'L',
-74807=>'L',
-74808=>'L',
-74809=>'L',
-74810=>'L',
-74811=>'L',
-74812=>'L',
-74813=>'L',
-74814=>'L',
-74815=>'L',
-74816=>'L',
-74817=>'L',
-74818=>'L',
-74819=>'L',
-74820=>'L',
-74821=>'L',
-74822=>'L',
-74823=>'L',
-74824=>'L',
-74825=>'L',
-74826=>'L',
-74827=>'L',
-74828=>'L',
-74829=>'L',
-74830=>'L',
-74831=>'L',
-74832=>'L',
-74833=>'L',
-74834=>'L',
-74835=>'L',
-74836=>'L',
-74837=>'L',
-74838=>'L',
-74839=>'L',
-74840=>'L',
-74841=>'L',
-74842=>'L',
-74843=>'L',
-74844=>'L',
-74845=>'L',
-74846=>'L',
-74847=>'L',
-74848=>'L',
-74849=>'L',
-74850=>'L',
-74864=>'L',
-74865=>'L',
-74866=>'L',
-74867=>'L',
-118784=>'L',
-118785=>'L',
-118786=>'L',
-118787=>'L',
-118788=>'L',
-118789=>'L',
-118790=>'L',
-118791=>'L',
-118792=>'L',
-118793=>'L',
-118794=>'L',
-118795=>'L',
-118796=>'L',
-118797=>'L',
-118798=>'L',
-118799=>'L',
-118800=>'L',
-118801=>'L',
-118802=>'L',
-118803=>'L',
-118804=>'L',
-118805=>'L',
-118806=>'L',
-118807=>'L',
-118808=>'L',
-118809=>'L',
-118810=>'L',
-118811=>'L',
-118812=>'L',
-118813=>'L',
-118814=>'L',
-118815=>'L',
-118816=>'L',
-118817=>'L',
-118818=>'L',
-118819=>'L',
-118820=>'L',
-118821=>'L',
-118822=>'L',
-118823=>'L',
-118824=>'L',
-118825=>'L',
-118826=>'L',
-118827=>'L',
-118828=>'L',
-118829=>'L',
-118830=>'L',
-118831=>'L',
-118832=>'L',
-118833=>'L',
-118834=>'L',
-118835=>'L',
-118836=>'L',
-118837=>'L',
-118838=>'L',
-118839=>'L',
-118840=>'L',
-118841=>'L',
-118842=>'L',
-118843=>'L',
-118844=>'L',
-118845=>'L',
-118846=>'L',
-118847=>'L',
-118848=>'L',
-118849=>'L',
-118850=>'L',
-118851=>'L',
-118852=>'L',
-118853=>'L',
-118854=>'L',
-118855=>'L',
-118856=>'L',
-118857=>'L',
-118858=>'L',
-118859=>'L',
-118860=>'L',
-118861=>'L',
-118862=>'L',
-118863=>'L',
-118864=>'L',
-118865=>'L',
-118866=>'L',
-118867=>'L',
-118868=>'L',
-118869=>'L',
-118870=>'L',
-118871=>'L',
-118872=>'L',
-118873=>'L',
-118874=>'L',
-118875=>'L',
-118876=>'L',
-118877=>'L',
-118878=>'L',
-118879=>'L',
-118880=>'L',
-118881=>'L',
-118882=>'L',
-118883=>'L',
-118884=>'L',
-118885=>'L',
-118886=>'L',
-118887=>'L',
-118888=>'L',
-118889=>'L',
-118890=>'L',
-118891=>'L',
-118892=>'L',
-118893=>'L',
-118894=>'L',
-118895=>'L',
-118896=>'L',
-118897=>'L',
-118898=>'L',
-118899=>'L',
-118900=>'L',
-118901=>'L',
-118902=>'L',
-118903=>'L',
-118904=>'L',
-118905=>'L',
-118906=>'L',
-118907=>'L',
-118908=>'L',
-118909=>'L',
-118910=>'L',
-118911=>'L',
-118912=>'L',
-118913=>'L',
-118914=>'L',
-118915=>'L',
-118916=>'L',
-118917=>'L',
-118918=>'L',
-118919=>'L',
-118920=>'L',
-118921=>'L',
-118922=>'L',
-118923=>'L',
-118924=>'L',
-118925=>'L',
-118926=>'L',
-118927=>'L',
-118928=>'L',
-118929=>'L',
-118930=>'L',
-118931=>'L',
-118932=>'L',
-118933=>'L',
-118934=>'L',
-118935=>'L',
-118936=>'L',
-118937=>'L',
-118938=>'L',
-118939=>'L',
-118940=>'L',
-118941=>'L',
-118942=>'L',
-118943=>'L',
-118944=>'L',
-118945=>'L',
-118946=>'L',
-118947=>'L',
-118948=>'L',
-118949=>'L',
-118950=>'L',
-118951=>'L',
-118952=>'L',
-118953=>'L',
-118954=>'L',
-118955=>'L',
-118956=>'L',
-118957=>'L',
-118958=>'L',
-118959=>'L',
-118960=>'L',
-118961=>'L',
-118962=>'L',
-118963=>'L',
-118964=>'L',
-118965=>'L',
-118966=>'L',
-118967=>'L',
-118968=>'L',
-118969=>'L',
-118970=>'L',
-118971=>'L',
-118972=>'L',
-118973=>'L',
-118974=>'L',
-118975=>'L',
-118976=>'L',
-118977=>'L',
-118978=>'L',
-118979=>'L',
-118980=>'L',
-118981=>'L',
-118982=>'L',
-118983=>'L',
-118984=>'L',
-118985=>'L',
-118986=>'L',
-118987=>'L',
-118988=>'L',
-118989=>'L',
-118990=>'L',
-118991=>'L',
-118992=>'L',
-118993=>'L',
-118994=>'L',
-118995=>'L',
-118996=>'L',
-118997=>'L',
-118998=>'L',
-118999=>'L',
-119000=>'L',
-119001=>'L',
-119002=>'L',
-119003=>'L',
-119004=>'L',
-119005=>'L',
-119006=>'L',
-119007=>'L',
-119008=>'L',
-119009=>'L',
-119010=>'L',
-119011=>'L',
-119012=>'L',
-119013=>'L',
-119014=>'L',
-119015=>'L',
-119016=>'L',
-119017=>'L',
-119018=>'L',
-119019=>'L',
-119020=>'L',
-119021=>'L',
-119022=>'L',
-119023=>'L',
-119024=>'L',
-119025=>'L',
-119026=>'L',
-119027=>'L',
-119028=>'L',
-119029=>'L',
-119040=>'L',
-119041=>'L',
-119042=>'L',
-119043=>'L',
-119044=>'L',
-119045=>'L',
-119046=>'L',
-119047=>'L',
-119048=>'L',
-119049=>'L',
-119050=>'L',
-119051=>'L',
-119052=>'L',
-119053=>'L',
-119054=>'L',
-119055=>'L',
-119056=>'L',
-119057=>'L',
-119058=>'L',
-119059=>'L',
-119060=>'L',
-119061=>'L',
-119062=>'L',
-119063=>'L',
-119064=>'L',
-119065=>'L',
-119066=>'L',
-119067=>'L',
-119068=>'L',
-119069=>'L',
-119070=>'L',
-119071=>'L',
-119072=>'L',
-119073=>'L',
-119074=>'L',
-119075=>'L',
-119076=>'L',
-119077=>'L',
-119078=>'L',
-119082=>'L',
-119083=>'L',
-119084=>'L',
-119085=>'L',
-119086=>'L',
-119087=>'L',
-119088=>'L',
-119089=>'L',
-119090=>'L',
-119091=>'L',
-119092=>'L',
-119093=>'L',
-119094=>'L',
-119095=>'L',
-119096=>'L',
-119097=>'L',
-119098=>'L',
-119099=>'L',
-119100=>'L',
-119101=>'L',
-119102=>'L',
-119103=>'L',
-119104=>'L',
-119105=>'L',
-119106=>'L',
-119107=>'L',
-119108=>'L',
-119109=>'L',
-119110=>'L',
-119111=>'L',
-119112=>'L',
-119113=>'L',
-119114=>'L',
-119115=>'L',
-119116=>'L',
-119117=>'L',
-119118=>'L',
-119119=>'L',
-119120=>'L',
-119121=>'L',
-119122=>'L',
-119123=>'L',
-119124=>'L',
-119125=>'L',
-119126=>'L',
-119127=>'L',
-119128=>'L',
-119129=>'L',
-119130=>'L',
-119131=>'L',
-119132=>'L',
-119133=>'L',
-119134=>'L',
-119135=>'L',
-119136=>'L',
-119137=>'L',
-119138=>'L',
-119139=>'L',
-119140=>'L',
-119141=>'L',
-119142=>'L',
-119143=>'NSM',
-119144=>'NSM',
-119145=>'NSM',
-119146=>'L',
-119147=>'L',
-119148=>'L',
-119149=>'L',
-119150=>'L',
-119151=>'L',
-119152=>'L',
-119153=>'L',
-119154=>'L',
-119155=>'BN',
-119156=>'BN',
-119157=>'BN',
-119158=>'BN',
-119159=>'BN',
-119160=>'BN',
-119161=>'BN',
-119162=>'BN',
-119163=>'NSM',
-119164=>'NSM',
-119165=>'NSM',
-119166=>'NSM',
-119167=>'NSM',
-119168=>'NSM',
-119169=>'NSM',
-119170=>'NSM',
-119171=>'L',
-119172=>'L',
-119173=>'NSM',
-119174=>'NSM',
-119175=>'NSM',
-119176=>'NSM',
-119177=>'NSM',
-119178=>'NSM',
-119179=>'NSM',
-119180=>'L',
-119181=>'L',
-119182=>'L',
-119183=>'L',
-119184=>'L',
-119185=>'L',
-119186=>'L',
-119187=>'L',
-119188=>'L',
-119189=>'L',
-119190=>'L',
-119191=>'L',
-119192=>'L',
-119193=>'L',
-119194=>'L',
-119195=>'L',
-119196=>'L',
-119197=>'L',
-119198=>'L',
-119199=>'L',
-119200=>'L',
-119201=>'L',
-119202=>'L',
-119203=>'L',
-119204=>'L',
-119205=>'L',
-119206=>'L',
-119207=>'L',
-119208=>'L',
-119209=>'L',
-119210=>'NSM',
-119211=>'NSM',
-119212=>'NSM',
-119213=>'NSM',
-119214=>'L',
-119215=>'L',
-119216=>'L',
-119217=>'L',
-119218=>'L',
-119219=>'L',
-119220=>'L',
-119221=>'L',
-119222=>'L',
-119223=>'L',
-119224=>'L',
-119225=>'L',
-119226=>'L',
-119227=>'L',
-119228=>'L',
-119229=>'L',
-119230=>'L',
-119231=>'L',
-119232=>'L',
-119233=>'L',
-119234=>'L',
-119235=>'L',
-119236=>'L',
-119237=>'L',
-119238=>'L',
-119239=>'L',
-119240=>'L',
-119241=>'L',
-119242=>'L',
-119243=>'L',
-119244=>'L',
-119245=>'L',
-119246=>'L',
-119247=>'L',
-119248=>'L',
-119249=>'L',
-119250=>'L',
-119251=>'L',
-119252=>'L',
-119253=>'L',
-119254=>'L',
-119255=>'L',
-119256=>'L',
-119257=>'L',
-119258=>'L',
-119259=>'L',
-119260=>'L',
-119261=>'L',
-119296=>'ON',
-119297=>'ON',
-119298=>'ON',
-119299=>'ON',
-119300=>'ON',
-119301=>'ON',
-119302=>'ON',
-119303=>'ON',
-119304=>'ON',
-119305=>'ON',
-119306=>'ON',
-119307=>'ON',
-119308=>'ON',
-119309=>'ON',
-119310=>'ON',
-119311=>'ON',
-119312=>'ON',
-119313=>'ON',
-119314=>'ON',
-119315=>'ON',
-119316=>'ON',
-119317=>'ON',
-119318=>'ON',
-119319=>'ON',
-119320=>'ON',
-119321=>'ON',
-119322=>'ON',
-119323=>'ON',
-119324=>'ON',
-119325=>'ON',
-119326=>'ON',
-119327=>'ON',
-119328=>'ON',
-119329=>'ON',
-119330=>'ON',
-119331=>'ON',
-119332=>'ON',
-119333=>'ON',
-119334=>'ON',
-119335=>'ON',
-119336=>'ON',
-119337=>'ON',
-119338=>'ON',
-119339=>'ON',
-119340=>'ON',
-119341=>'ON',
-119342=>'ON',
-119343=>'ON',
-119344=>'ON',
-119345=>'ON',
-119346=>'ON',
-119347=>'ON',
-119348=>'ON',
-119349=>'ON',
-119350=>'ON',
-119351=>'ON',
-119352=>'ON',
-119353=>'ON',
-119354=>'ON',
-119355=>'ON',
-119356=>'ON',
-119357=>'ON',
-119358=>'ON',
-119359=>'ON',
-119360=>'ON',
-119361=>'ON',
-119362=>'NSM',
-119363=>'NSM',
-119364=>'NSM',
-119365=>'ON',
-119552=>'ON',
-119553=>'ON',
-119554=>'ON',
-119555=>'ON',
-119556=>'ON',
-119557=>'ON',
-119558=>'ON',
-119559=>'ON',
-119560=>'ON',
-119561=>'ON',
-119562=>'ON',
-119563=>'ON',
-119564=>'ON',
-119565=>'ON',
-119566=>'ON',
-119567=>'ON',
-119568=>'ON',
-119569=>'ON',
-119570=>'ON',
-119571=>'ON',
-119572=>'ON',
-119573=>'ON',
-119574=>'ON',
-119575=>'ON',
-119576=>'ON',
-119577=>'ON',
-119578=>'ON',
-119579=>'ON',
-119580=>'ON',
-119581=>'ON',
-119582=>'ON',
-119583=>'ON',
-119584=>'ON',
-119585=>'ON',
-119586=>'ON',
-119587=>'ON',
-119588=>'ON',
-119589=>'ON',
-119590=>'ON',
-119591=>'ON',
-119592=>'ON',
-119593=>'ON',
-119594=>'ON',
-119595=>'ON',
-119596=>'ON',
-119597=>'ON',
-119598=>'ON',
-119599=>'ON',
-119600=>'ON',
-119601=>'ON',
-119602=>'ON',
-119603=>'ON',
-119604=>'ON',
-119605=>'ON',
-119606=>'ON',
-119607=>'ON',
-119608=>'ON',
-119609=>'ON',
-119610=>'ON',
-119611=>'ON',
-119612=>'ON',
-119613=>'ON',
-119614=>'ON',
-119615=>'ON',
-119616=>'ON',
-119617=>'ON',
-119618=>'ON',
-119619=>'ON',
-119620=>'ON',
-119621=>'ON',
-119622=>'ON',
-119623=>'ON',
-119624=>'ON',
-119625=>'ON',
-119626=>'ON',
-119627=>'ON',
-119628=>'ON',
-119629=>'ON',
-119630=>'ON',
-119631=>'ON',
-119632=>'ON',
-119633=>'ON',
-119634=>'ON',
-119635=>'ON',
-119636=>'ON',
-119637=>'ON',
-119638=>'ON',
-119648=>'L',
-119649=>'L',
-119650=>'L',
-119651=>'L',
-119652=>'L',
-119653=>'L',
-119654=>'L',
-119655=>'L',
-119656=>'L',
-119657=>'L',
-119658=>'L',
-119659=>'L',
-119660=>'L',
-119661=>'L',
-119662=>'L',
-119663=>'L',
-119664=>'L',
-119665=>'L',
-119808=>'L',
-119809=>'L',
-119810=>'L',
-119811=>'L',
-119812=>'L',
-119813=>'L',
-119814=>'L',
-119815=>'L',
-119816=>'L',
-119817=>'L',
-119818=>'L',
-119819=>'L',
-119820=>'L',
-119821=>'L',
-119822=>'L',
-119823=>'L',
-119824=>'L',
-119825=>'L',
-119826=>'L',
-119827=>'L',
-119828=>'L',
-119829=>'L',
-119830=>'L',
-119831=>'L',
-119832=>'L',
-119833=>'L',
-119834=>'L',
-119835=>'L',
-119836=>'L',
-119837=>'L',
-119838=>'L',
-119839=>'L',
-119840=>'L',
-119841=>'L',
-119842=>'L',
-119843=>'L',
-119844=>'L',
-119845=>'L',
-119846=>'L',
-119847=>'L',
-119848=>'L',
-119849=>'L',
-119850=>'L',
-119851=>'L',
-119852=>'L',
-119853=>'L',
-119854=>'L',
-119855=>'L',
-119856=>'L',
-119857=>'L',
-119858=>'L',
-119859=>'L',
-119860=>'L',
-119861=>'L',
-119862=>'L',
-119863=>'L',
-119864=>'L',
-119865=>'L',
-119866=>'L',
-119867=>'L',
-119868=>'L',
-119869=>'L',
-119870=>'L',
-119871=>'L',
-119872=>'L',
-119873=>'L',
-119874=>'L',
-119875=>'L',
-119876=>'L',
-119877=>'L',
-119878=>'L',
-119879=>'L',
-119880=>'L',
-119881=>'L',
-119882=>'L',
-119883=>'L',
-119884=>'L',
-119885=>'L',
-119886=>'L',
-119887=>'L',
-119888=>'L',
-119889=>'L',
-119890=>'L',
-119891=>'L',
-119892=>'L',
-119894=>'L',
-119895=>'L',
-119896=>'L',
-119897=>'L',
-119898=>'L',
-119899=>'L',
-119900=>'L',
-119901=>'L',
-119902=>'L',
-119903=>'L',
-119904=>'L',
-119905=>'L',
-119906=>'L',
-119907=>'L',
-119908=>'L',
-119909=>'L',
-119910=>'L',
-119911=>'L',
-119912=>'L',
-119913=>'L',
-119914=>'L',
-119915=>'L',
-119916=>'L',
-119917=>'L',
-119918=>'L',
-119919=>'L',
-119920=>'L',
-119921=>'L',
-119922=>'L',
-119923=>'L',
-119924=>'L',
-119925=>'L',
-119926=>'L',
-119927=>'L',
-119928=>'L',
-119929=>'L',
-119930=>'L',
-119931=>'L',
-119932=>'L',
-119933=>'L',
-119934=>'L',
-119935=>'L',
-119936=>'L',
-119937=>'L',
-119938=>'L',
-119939=>'L',
-119940=>'L',
-119941=>'L',
-119942=>'L',
-119943=>'L',
-119944=>'L',
-119945=>'L',
-119946=>'L',
-119947=>'L',
-119948=>'L',
-119949=>'L',
-119950=>'L',
-119951=>'L',
-119952=>'L',
-119953=>'L',
-119954=>'L',
-119955=>'L',
-119956=>'L',
-119957=>'L',
-119958=>'L',
-119959=>'L',
-119960=>'L',
-119961=>'L',
-119962=>'L',
-119963=>'L',
-119964=>'L',
-119966=>'L',
-119967=>'L',
-119970=>'L',
-119973=>'L',
-119974=>'L',
-119977=>'L',
-119978=>'L',
-119979=>'L',
-119980=>'L',
-119982=>'L',
-119983=>'L',
-119984=>'L',
-119985=>'L',
-119986=>'L',
-119987=>'L',
-119988=>'L',
-119989=>'L',
-119990=>'L',
-119991=>'L',
-119992=>'L',
-119993=>'L',
-119995=>'L',
-119997=>'L',
-119998=>'L',
-119999=>'L',
-120000=>'L',
-120001=>'L',
-120002=>'L',
-120003=>'L',
-120005=>'L',
-120006=>'L',
-120007=>'L',
-120008=>'L',
-120009=>'L',
-120010=>'L',
-120011=>'L',
-120012=>'L',
-120013=>'L',
-120014=>'L',
-120015=>'L',
-120016=>'L',
-120017=>'L',
-120018=>'L',
-120019=>'L',
-120020=>'L',
-120021=>'L',
-120022=>'L',
-120023=>'L',
-120024=>'L',
-120025=>'L',
-120026=>'L',
-120027=>'L',
-120028=>'L',
-120029=>'L',
-120030=>'L',
-120031=>'L',
-120032=>'L',
-120033=>'L',
-120034=>'L',
-120035=>'L',
-120036=>'L',
-120037=>'L',
-120038=>'L',
-120039=>'L',
-120040=>'L',
-120041=>'L',
-120042=>'L',
-120043=>'L',
-120044=>'L',
-120045=>'L',
-120046=>'L',
-120047=>'L',
-120048=>'L',
-120049=>'L',
-120050=>'L',
-120051=>'L',
-120052=>'L',
-120053=>'L',
-120054=>'L',
-120055=>'L',
-120056=>'L',
-120057=>'L',
-120058=>'L',
-120059=>'L',
-120060=>'L',
-120061=>'L',
-120062=>'L',
-120063=>'L',
-120064=>'L',
-120065=>'L',
-120066=>'L',
-120067=>'L',
-120068=>'L',
-120069=>'L',
-120071=>'L',
-120072=>'L',
-120073=>'L',
-120074=>'L',
-120077=>'L',
-120078=>'L',
-120079=>'L',
-120080=>'L',
-120081=>'L',
-120082=>'L',
-120083=>'L',
-120084=>'L',
-120086=>'L',
-120087=>'L',
-120088=>'L',
-120089=>'L',
-120090=>'L',
-120091=>'L',
-120092=>'L',
-120094=>'L',
-120095=>'L',
-120096=>'L',
-120097=>'L',
-120098=>'L',
-120099=>'L',
-120100=>'L',
-120101=>'L',
-120102=>'L',
-120103=>'L',
-120104=>'L',
-120105=>'L',
-120106=>'L',
-120107=>'L',
-120108=>'L',
-120109=>'L',
-120110=>'L',
-120111=>'L',
-120112=>'L',
-120113=>'L',
-120114=>'L',
-120115=>'L',
-120116=>'L',
-120117=>'L',
-120118=>'L',
-120119=>'L',
-120120=>'L',
-120121=>'L',
-120123=>'L',
-120124=>'L',
-120125=>'L',
-120126=>'L',
-120128=>'L',
-120129=>'L',
-120130=>'L',
-120131=>'L',
-120132=>'L',
-120134=>'L',
-120138=>'L',
-120139=>'L',
-120140=>'L',
-120141=>'L',
-120142=>'L',
-120143=>'L',
-120144=>'L',
-120146=>'L',
-120147=>'L',
-120148=>'L',
-120149=>'L',
-120150=>'L',
-120151=>'L',
-120152=>'L',
-120153=>'L',
-120154=>'L',
-120155=>'L',
-120156=>'L',
-120157=>'L',
-120158=>'L',
-120159=>'L',
-120160=>'L',
-120161=>'L',
-120162=>'L',
-120163=>'L',
-120164=>'L',
-120165=>'L',
-120166=>'L',
-120167=>'L',
-120168=>'L',
-120169=>'L',
-120170=>'L',
-120171=>'L',
-120172=>'L',
-120173=>'L',
-120174=>'L',
-120175=>'L',
-120176=>'L',
-120177=>'L',
-120178=>'L',
-120179=>'L',
-120180=>'L',
-120181=>'L',
-120182=>'L',
-120183=>'L',
-120184=>'L',
-120185=>'L',
-120186=>'L',
-120187=>'L',
-120188=>'L',
-120189=>'L',
-120190=>'L',
-120191=>'L',
-120192=>'L',
-120193=>'L',
-120194=>'L',
-120195=>'L',
-120196=>'L',
-120197=>'L',
-120198=>'L',
-120199=>'L',
-120200=>'L',
-120201=>'L',
-120202=>'L',
-120203=>'L',
-120204=>'L',
-120205=>'L',
-120206=>'L',
-120207=>'L',
-120208=>'L',
-120209=>'L',
-120210=>'L',
-120211=>'L',
-120212=>'L',
-120213=>'L',
-120214=>'L',
-120215=>'L',
-120216=>'L',
-120217=>'L',
-120218=>'L',
-120219=>'L',
-120220=>'L',
-120221=>'L',
-120222=>'L',
-120223=>'L',
-120224=>'L',
-120225=>'L',
-120226=>'L',
-120227=>'L',
-120228=>'L',
-120229=>'L',
-120230=>'L',
-120231=>'L',
-120232=>'L',
-120233=>'L',
-120234=>'L',
-120235=>'L',
-120236=>'L',
-120237=>'L',
-120238=>'L',
-120239=>'L',
-120240=>'L',
-120241=>'L',
-120242=>'L',
-120243=>'L',
-120244=>'L',
-120245=>'L',
-120246=>'L',
-120247=>'L',
-120248=>'L',
-120249=>'L',
-120250=>'L',
-120251=>'L',
-120252=>'L',
-120253=>'L',
-120254=>'L',
-120255=>'L',
-120256=>'L',
-120257=>'L',
-120258=>'L',
-120259=>'L',
-120260=>'L',
-120261=>'L',
-120262=>'L',
-120263=>'L',
-120264=>'L',
-120265=>'L',
-120266=>'L',
-120267=>'L',
-120268=>'L',
-120269=>'L',
-120270=>'L',
-120271=>'L',
-120272=>'L',
-120273=>'L',
-120274=>'L',
-120275=>'L',
-120276=>'L',
-120277=>'L',
-120278=>'L',
-120279=>'L',
-120280=>'L',
-120281=>'L',
-120282=>'L',
-120283=>'L',
-120284=>'L',
-120285=>'L',
-120286=>'L',
-120287=>'L',
-120288=>'L',
-120289=>'L',
-120290=>'L',
-120291=>'L',
-120292=>'L',
-120293=>'L',
-120294=>'L',
-120295=>'L',
-120296=>'L',
-120297=>'L',
-120298=>'L',
-120299=>'L',
-120300=>'L',
-120301=>'L',
-120302=>'L',
-120303=>'L',
-120304=>'L',
-120305=>'L',
-120306=>'L',
-120307=>'L',
-120308=>'L',
-120309=>'L',
-120310=>'L',
-120311=>'L',
-120312=>'L',
-120313=>'L',
-120314=>'L',
-120315=>'L',
-120316=>'L',
-120317=>'L',
-120318=>'L',
-120319=>'L',
-120320=>'L',
-120321=>'L',
-120322=>'L',
-120323=>'L',
-120324=>'L',
-120325=>'L',
-120326=>'L',
-120327=>'L',
-120328=>'L',
-120329=>'L',
-120330=>'L',
-120331=>'L',
-120332=>'L',
-120333=>'L',
-120334=>'L',
-120335=>'L',
-120336=>'L',
-120337=>'L',
-120338=>'L',
-120339=>'L',
-120340=>'L',
-120341=>'L',
-120342=>'L',
-120343=>'L',
-120344=>'L',
-120345=>'L',
-120346=>'L',
-120347=>'L',
-120348=>'L',
-120349=>'L',
-120350=>'L',
-120351=>'L',
-120352=>'L',
-120353=>'L',
-120354=>'L',
-120355=>'L',
-120356=>'L',
-120357=>'L',
-120358=>'L',
-120359=>'L',
-120360=>'L',
-120361=>'L',
-120362=>'L',
-120363=>'L',
-120364=>'L',
-120365=>'L',
-120366=>'L',
-120367=>'L',
-120368=>'L',
-120369=>'L',
-120370=>'L',
-120371=>'L',
-120372=>'L',
-120373=>'L',
-120374=>'L',
-120375=>'L',
-120376=>'L',
-120377=>'L',
-120378=>'L',
-120379=>'L',
-120380=>'L',
-120381=>'L',
-120382=>'L',
-120383=>'L',
-120384=>'L',
-120385=>'L',
-120386=>'L',
-120387=>'L',
-120388=>'L',
-120389=>'L',
-120390=>'L',
-120391=>'L',
-120392=>'L',
-120393=>'L',
-120394=>'L',
-120395=>'L',
-120396=>'L',
-120397=>'L',
-120398=>'L',
-120399=>'L',
-120400=>'L',
-120401=>'L',
-120402=>'L',
-120403=>'L',
-120404=>'L',
-120405=>'L',
-120406=>'L',
-120407=>'L',
-120408=>'L',
-120409=>'L',
-120410=>'L',
-120411=>'L',
-120412=>'L',
-120413=>'L',
-120414=>'L',
-120415=>'L',
-120416=>'L',
-120417=>'L',
-120418=>'L',
-120419=>'L',
-120420=>'L',
-120421=>'L',
-120422=>'L',
-120423=>'L',
-120424=>'L',
-120425=>'L',
-120426=>'L',
-120427=>'L',
-120428=>'L',
-120429=>'L',
-120430=>'L',
-120431=>'L',
-120432=>'L',
-120433=>'L',
-120434=>'L',
-120435=>'L',
-120436=>'L',
-120437=>'L',
-120438=>'L',
-120439=>'L',
-120440=>'L',
-120441=>'L',
-120442=>'L',
-120443=>'L',
-120444=>'L',
-120445=>'L',
-120446=>'L',
-120447=>'L',
-120448=>'L',
-120449=>'L',
-120450=>'L',
-120451=>'L',
-120452=>'L',
-120453=>'L',
-120454=>'L',
-120455=>'L',
-120456=>'L',
-120457=>'L',
-120458=>'L',
-120459=>'L',
-120460=>'L',
-120461=>'L',
-120462=>'L',
-120463=>'L',
-120464=>'L',
-120465=>'L',
-120466=>'L',
-120467=>'L',
-120468=>'L',
-120469=>'L',
-120470=>'L',
-120471=>'L',
-120472=>'L',
-120473=>'L',
-120474=>'L',
-120475=>'L',
-120476=>'L',
-120477=>'L',
-120478=>'L',
-120479=>'L',
-120480=>'L',
-120481=>'L',
-120482=>'L',
-120483=>'L',
-120484=>'L',
-120485=>'L',
-120488=>'L',
-120489=>'L',
-120490=>'L',
-120491=>'L',
-120492=>'L',
-120493=>'L',
-120494=>'L',
-120495=>'L',
-120496=>'L',
-120497=>'L',
-120498=>'L',
-120499=>'L',
-120500=>'L',
-120501=>'L',
-120502=>'L',
-120503=>'L',
-120504=>'L',
-120505=>'L',
-120506=>'L',
-120507=>'L',
-120508=>'L',
-120509=>'L',
-120510=>'L',
-120511=>'L',
-120512=>'L',
-120513=>'L',
-120514=>'L',
-120515=>'L',
-120516=>'L',
-120517=>'L',
-120518=>'L',
-120519=>'L',
-120520=>'L',
-120521=>'L',
-120522=>'L',
-120523=>'L',
-120524=>'L',
-120525=>'L',
-120526=>'L',
-120527=>'L',
-120528=>'L',
-120529=>'L',
-120530=>'L',
-120531=>'L',
-120532=>'L',
-120533=>'L',
-120534=>'L',
-120535=>'L',
-120536=>'L',
-120537=>'L',
-120538=>'L',
-120539=>'L',
-120540=>'L',
-120541=>'L',
-120542=>'L',
-120543=>'L',
-120544=>'L',
-120545=>'L',
-120546=>'L',
-120547=>'L',
-120548=>'L',
-120549=>'L',
-120550=>'L',
-120551=>'L',
-120552=>'L',
-120553=>'L',
-120554=>'L',
-120555=>'L',
-120556=>'L',
-120557=>'L',
-120558=>'L',
-120559=>'L',
-120560=>'L',
-120561=>'L',
-120562=>'L',
-120563=>'L',
-120564=>'L',
-120565=>'L',
-120566=>'L',
-120567=>'L',
-120568=>'L',
-120569=>'L',
-120570=>'L',
-120571=>'L',
-120572=>'L',
-120573=>'L',
-120574=>'L',
-120575=>'L',
-120576=>'L',
-120577=>'L',
-120578=>'L',
-120579=>'L',
-120580=>'L',
-120581=>'L',
-120582=>'L',
-120583=>'L',
-120584=>'L',
-120585=>'L',
-120586=>'L',
-120587=>'L',
-120588=>'L',
-120589=>'L',
-120590=>'L',
-120591=>'L',
-120592=>'L',
-120593=>'L',
-120594=>'L',
-120595=>'L',
-120596=>'L',
-120597=>'L',
-120598=>'L',
-120599=>'L',
-120600=>'L',
-120601=>'L',
-120602=>'L',
-120603=>'L',
-120604=>'L',
-120605=>'L',
-120606=>'L',
-120607=>'L',
-120608=>'L',
-120609=>'L',
-120610=>'L',
-120611=>'L',
-120612=>'L',
-120613=>'L',
-120614=>'L',
-120615=>'L',
-120616=>'L',
-120617=>'L',
-120618=>'L',
-120619=>'L',
-120620=>'L',
-120621=>'L',
-120622=>'L',
-120623=>'L',
-120624=>'L',
-120625=>'L',
-120626=>'L',
-120627=>'L',
-120628=>'L',
-120629=>'L',
-120630=>'L',
-120631=>'L',
-120632=>'L',
-120633=>'L',
-120634=>'L',
-120635=>'L',
-120636=>'L',
-120637=>'L',
-120638=>'L',
-120639=>'L',
-120640=>'L',
-120641=>'L',
-120642=>'L',
-120643=>'L',
-120644=>'L',
-120645=>'L',
-120646=>'L',
-120647=>'L',
-120648=>'L',
-120649=>'L',
-120650=>'L',
-120651=>'L',
-120652=>'L',
-120653=>'L',
-120654=>'L',
-120655=>'L',
-120656=>'L',
-120657=>'L',
-120658=>'L',
-120659=>'L',
-120660=>'L',
-120661=>'L',
-120662=>'L',
-120663=>'L',
-120664=>'L',
-120665=>'L',
-120666=>'L',
-120667=>'L',
-120668=>'L',
-120669=>'L',
-120670=>'L',
-120671=>'L',
-120672=>'L',
-120673=>'L',
-120674=>'L',
-120675=>'L',
-120676=>'L',
-120677=>'L',
-120678=>'L',
-120679=>'L',
-120680=>'L',
-120681=>'L',
-120682=>'L',
-120683=>'L',
-120684=>'L',
-120685=>'L',
-120686=>'L',
-120687=>'L',
-120688=>'L',
-120689=>'L',
-120690=>'L',
-120691=>'L',
-120692=>'L',
-120693=>'L',
-120694=>'L',
-120695=>'L',
-120696=>'L',
-120697=>'L',
-120698=>'L',
-120699=>'L',
-120700=>'L',
-120701=>'L',
-120702=>'L',
-120703=>'L',
-120704=>'L',
-120705=>'L',
-120706=>'L',
-120707=>'L',
-120708=>'L',
-120709=>'L',
-120710=>'L',
-120711=>'L',
-120712=>'L',
-120713=>'L',
-120714=>'L',
-120715=>'L',
-120716=>'L',
-120717=>'L',
-120718=>'L',
-120719=>'L',
-120720=>'L',
-120721=>'L',
-120722=>'L',
-120723=>'L',
-120724=>'L',
-120725=>'L',
-120726=>'L',
-120727=>'L',
-120728=>'L',
-120729=>'L',
-120730=>'L',
-120731=>'L',
-120732=>'L',
-120733=>'L',
-120734=>'L',
-120735=>'L',
-120736=>'L',
-120737=>'L',
-120738=>'L',
-120739=>'L',
-120740=>'L',
-120741=>'L',
-120742=>'L',
-120743=>'L',
-120744=>'L',
-120745=>'L',
-120746=>'L',
-120747=>'L',
-120748=>'L',
-120749=>'L',
-120750=>'L',
-120751=>'L',
-120752=>'L',
-120753=>'L',
-120754=>'L',
-120755=>'L',
-120756=>'L',
-120757=>'L',
-120758=>'L',
-120759=>'L',
-120760=>'L',
-120761=>'L',
-120762=>'L',
-120763=>'L',
-120764=>'L',
-120765=>'L',
-120766=>'L',
-120767=>'L',
-120768=>'L',
-120769=>'L',
-120770=>'L',
-120771=>'L',
-120772=>'L',
-120773=>'L',
-120774=>'L',
-120775=>'L',
-120776=>'L',
-120777=>'L',
-120778=>'L',
-120779=>'L',
-120782=>'EN',
-120783=>'EN',
-120784=>'EN',
-120785=>'EN',
-120786=>'EN',
-120787=>'EN',
-120788=>'EN',
-120789=>'EN',
-120790=>'EN',
-120791=>'EN',
-120792=>'EN',
-120793=>'EN',
-120794=>'EN',
-120795=>'EN',
-120796=>'EN',
-120797=>'EN',
-120798=>'EN',
-120799=>'EN',
-120800=>'EN',
-120801=>'EN',
-120802=>'EN',
-120803=>'EN',
-120804=>'EN',
-120805=>'EN',
-120806=>'EN',
-120807=>'EN',
-120808=>'EN',
-120809=>'EN',
-120810=>'EN',
-120811=>'EN',
-120812=>'EN',
-120813=>'EN',
-120814=>'EN',
-120815=>'EN',
-120816=>'EN',
-120817=>'EN',
-120818=>'EN',
-120819=>'EN',
-120820=>'EN',
-120821=>'EN',
-120822=>'EN',
-120823=>'EN',
-120824=>'EN',
-120825=>'EN',
-120826=>'EN',
-120827=>'EN',
-120828=>'EN',
-120829=>'EN',
-120830=>'EN',
-120831=>'EN',
-131072=>'L',
-173782=>'L',
-194560=>'L',
-194561=>'L',
-194562=>'L',
-194563=>'L',
-194564=>'L',
-194565=>'L',
-194566=>'L',
-194567=>'L',
-194568=>'L',
-194569=>'L',
-194570=>'L',
-194571=>'L',
-194572=>'L',
-194573=>'L',
-194574=>'L',
-194575=>'L',
-194576=>'L',
-194577=>'L',
-194578=>'L',
-194579=>'L',
-194580=>'L',
-194581=>'L',
-194582=>'L',
-194583=>'L',
-194584=>'L',
-194585=>'L',
-194586=>'L',
-194587=>'L',
-194588=>'L',
-194589=>'L',
-194590=>'L',
-194591=>'L',
-194592=>'L',
-194593=>'L',
-194594=>'L',
-194595=>'L',
-194596=>'L',
-194597=>'L',
-194598=>'L',
-194599=>'L',
-194600=>'L',
-194601=>'L',
-194602=>'L',
-194603=>'L',
-194604=>'L',
-194605=>'L',
-194606=>'L',
-194607=>'L',
-194608=>'L',
-194609=>'L',
-194610=>'L',
-194611=>'L',
-194612=>'L',
-194613=>'L',
-194614=>'L',
-194615=>'L',
-194616=>'L',
-194617=>'L',
-194618=>'L',
-194619=>'L',
-194620=>'L',
-194621=>'L',
-194622=>'L',
-194623=>'L',
-194624=>'L',
-194625=>'L',
-194626=>'L',
-194627=>'L',
-194628=>'L',
-194629=>'L',
-194630=>'L',
-194631=>'L',
-194632=>'L',
-194633=>'L',
-194634=>'L',
-194635=>'L',
-194636=>'L',
-194637=>'L',
-194638=>'L',
-194639=>'L',
-194640=>'L',
-194641=>'L',
-194642=>'L',
-194643=>'L',
-194644=>'L',
-194645=>'L',
-194646=>'L',
-194647=>'L',
-194648=>'L',
-194649=>'L',
-194650=>'L',
-194651=>'L',
-194652=>'L',
-194653=>'L',
-194654=>'L',
-194655=>'L',
-194656=>'L',
-194657=>'L',
-194658=>'L',
-194659=>'L',
-194660=>'L',
-194661=>'L',
-194662=>'L',
-194663=>'L',
-194664=>'L',
-194665=>'L',
-194666=>'L',
-194667=>'L',
-194668=>'L',
-194669=>'L',
-194670=>'L',
-194671=>'L',
-194672=>'L',
-194673=>'L',
-194674=>'L',
-194675=>'L',
-194676=>'L',
-194677=>'L',
-194678=>'L',
-194679=>'L',
-194680=>'L',
-194681=>'L',
-194682=>'L',
-194683=>'L',
-194684=>'L',
-194685=>'L',
-194686=>'L',
-194687=>'L',
-194688=>'L',
-194689=>'L',
-194690=>'L',
-194691=>'L',
-194692=>'L',
-194693=>'L',
-194694=>'L',
-194695=>'L',
-194696=>'L',
-194697=>'L',
-194698=>'L',
-194699=>'L',
-194700=>'L',
-194701=>'L',
-194702=>'L',
-194703=>'L',
-194704=>'L',
-194705=>'L',
-194706=>'L',
-194707=>'L',
-194708=>'L',
-194709=>'L',
-194710=>'L',
-194711=>'L',
-194712=>'L',
-194713=>'L',
-194714=>'L',
-194715=>'L',
-194716=>'L',
-194717=>'L',
-194718=>'L',
-194719=>'L',
-194720=>'L',
-194721=>'L',
-194722=>'L',
-194723=>'L',
-194724=>'L',
-194725=>'L',
-194726=>'L',
-194727=>'L',
-194728=>'L',
-194729=>'L',
-194730=>'L',
-194731=>'L',
-194732=>'L',
-194733=>'L',
-194734=>'L',
-194735=>'L',
-194736=>'L',
-194737=>'L',
-194738=>'L',
-194739=>'L',
-194740=>'L',
-194741=>'L',
-194742=>'L',
-194743=>'L',
-194744=>'L',
-194745=>'L',
-194746=>'L',
-194747=>'L',
-194748=>'L',
-194749=>'L',
-194750=>'L',
-194751=>'L',
-194752=>'L',
-194753=>'L',
-194754=>'L',
-194755=>'L',
-194756=>'L',
-194757=>'L',
-194758=>'L',
-194759=>'L',
-194760=>'L',
-194761=>'L',
-194762=>'L',
-194763=>'L',
-194764=>'L',
-194765=>'L',
-194766=>'L',
-194767=>'L',
-194768=>'L',
-194769=>'L',
-194770=>'L',
-194771=>'L',
-194772=>'L',
-194773=>'L',
-194774=>'L',
-194775=>'L',
-194776=>'L',
-194777=>'L',
-194778=>'L',
-194779=>'L',
-194780=>'L',
-194781=>'L',
-194782=>'L',
-194783=>'L',
-194784=>'L',
-194785=>'L',
-194786=>'L',
-194787=>'L',
-194788=>'L',
-194789=>'L',
-194790=>'L',
-194791=>'L',
-194792=>'L',
-194793=>'L',
-194794=>'L',
-194795=>'L',
-194796=>'L',
-194797=>'L',
-194798=>'L',
-194799=>'L',
-194800=>'L',
-194801=>'L',
-194802=>'L',
-194803=>'L',
-194804=>'L',
-194805=>'L',
-194806=>'L',
-194807=>'L',
-194808=>'L',
-194809=>'L',
-194810=>'L',
-194811=>'L',
-194812=>'L',
-194813=>'L',
-194814=>'L',
-194815=>'L',
-194816=>'L',
-194817=>'L',
-194818=>'L',
-194819=>'L',
-194820=>'L',
-194821=>'L',
-194822=>'L',
-194823=>'L',
-194824=>'L',
-194825=>'L',
-194826=>'L',
-194827=>'L',
-194828=>'L',
-194829=>'L',
-194830=>'L',
-194831=>'L',
-194832=>'L',
-194833=>'L',
-194834=>'L',
-194835=>'L',
-194836=>'L',
-194837=>'L',
-194838=>'L',
-194839=>'L',
-194840=>'L',
-194841=>'L',
-194842=>'L',
-194843=>'L',
-194844=>'L',
-194845=>'L',
-194846=>'L',
-194847=>'L',
-194848=>'L',
-194849=>'L',
-194850=>'L',
-194851=>'L',
-194852=>'L',
-194853=>'L',
-194854=>'L',
-194855=>'L',
-194856=>'L',
-194857=>'L',
-194858=>'L',
-194859=>'L',
-194860=>'L',
-194861=>'L',
-194862=>'L',
-194863=>'L',
-194864=>'L',
-194865=>'L',
-194866=>'L',
-194867=>'L',
-194868=>'L',
-194869=>'L',
-194870=>'L',
-194871=>'L',
-194872=>'L',
-194873=>'L',
-194874=>'L',
-194875=>'L',
-194876=>'L',
-194877=>'L',
-194878=>'L',
-194879=>'L',
-194880=>'L',
-194881=>'L',
-194882=>'L',
-194883=>'L',
-194884=>'L',
-194885=>'L',
-194886=>'L',
-194887=>'L',
-194888=>'L',
-194889=>'L',
-194890=>'L',
-194891=>'L',
-194892=>'L',
-194893=>'L',
-194894=>'L',
-194895=>'L',
-194896=>'L',
-194897=>'L',
-194898=>'L',
-194899=>'L',
-194900=>'L',
-194901=>'L',
-194902=>'L',
-194903=>'L',
-194904=>'L',
-194905=>'L',
-194906=>'L',
-194907=>'L',
-194908=>'L',
-194909=>'L',
-194910=>'L',
-194911=>'L',
-194912=>'L',
-194913=>'L',
-194914=>'L',
-194915=>'L',
-194916=>'L',
-194917=>'L',
-194918=>'L',
-194919=>'L',
-194920=>'L',
-194921=>'L',
-194922=>'L',
-194923=>'L',
-194924=>'L',
-194925=>'L',
-194926=>'L',
-194927=>'L',
-194928=>'L',
-194929=>'L',
-194930=>'L',
-194931=>'L',
-194932=>'L',
-194933=>'L',
-194934=>'L',
-194935=>'L',
-194936=>'L',
-194937=>'L',
-194938=>'L',
-194939=>'L',
-194940=>'L',
-194941=>'L',
-194942=>'L',
-194943=>'L',
-194944=>'L',
-194945=>'L',
-194946=>'L',
-194947=>'L',
-194948=>'L',
-194949=>'L',
-194950=>'L',
-194951=>'L',
-194952=>'L',
-194953=>'L',
-194954=>'L',
-194955=>'L',
-194956=>'L',
-194957=>'L',
-194958=>'L',
-194959=>'L',
-194960=>'L',
-194961=>'L',
-194962=>'L',
-194963=>'L',
-194964=>'L',
-194965=>'L',
-194966=>'L',
-194967=>'L',
-194968=>'L',
-194969=>'L',
-194970=>'L',
-194971=>'L',
-194972=>'L',
-194973=>'L',
-194974=>'L',
-194975=>'L',
-194976=>'L',
-194977=>'L',
-194978=>'L',
-194979=>'L',
-194980=>'L',
-194981=>'L',
-194982=>'L',
-194983=>'L',
-194984=>'L',
-194985=>'L',
-194986=>'L',
-194987=>'L',
-194988=>'L',
-194989=>'L',
-194990=>'L',
-194991=>'L',
-194992=>'L',
-194993=>'L',
-194994=>'L',
-194995=>'L',
-194996=>'L',
-194997=>'L',
-194998=>'L',
-194999=>'L',
-195000=>'L',
-195001=>'L',
-195002=>'L',
-195003=>'L',
-195004=>'L',
-195005=>'L',
-195006=>'L',
-195007=>'L',
-195008=>'L',
-195009=>'L',
-195010=>'L',
-195011=>'L',
-195012=>'L',
-195013=>'L',
-195014=>'L',
-195015=>'L',
-195016=>'L',
-195017=>'L',
-195018=>'L',
-195019=>'L',
-195020=>'L',
-195021=>'L',
-195022=>'L',
-195023=>'L',
-195024=>'L',
-195025=>'L',
-195026=>'L',
-195027=>'L',
-195028=>'L',
-195029=>'L',
-195030=>'L',
-195031=>'L',
-195032=>'L',
-195033=>'L',
-195034=>'L',
-195035=>'L',
-195036=>'L',
-195037=>'L',
-195038=>'L',
-195039=>'L',
-195040=>'L',
-195041=>'L',
-195042=>'L',
-195043=>'L',
-195044=>'L',
-195045=>'L',
-195046=>'L',
-195047=>'L',
-195048=>'L',
-195049=>'L',
-195050=>'L',
-195051=>'L',
-195052=>'L',
-195053=>'L',
-195054=>'L',
-195055=>'L',
-195056=>'L',
-195057=>'L',
-195058=>'L',
-195059=>'L',
-195060=>'L',
-195061=>'L',
-195062=>'L',
-195063=>'L',
-195064=>'L',
-195065=>'L',
-195066=>'L',
-195067=>'L',
-195068=>'L',
-195069=>'L',
-195070=>'L',
-195071=>'L',
-195072=>'L',
-195073=>'L',
-195074=>'L',
-195075=>'L',
-195076=>'L',
-195077=>'L',
-195078=>'L',
-195079=>'L',
-195080=>'L',
-195081=>'L',
-195082=>'L',
-195083=>'L',
-195084=>'L',
-195085=>'L',
-195086=>'L',
-195087=>'L',
-195088=>'L',
-195089=>'L',
-195090=>'L',
-195091=>'L',
-195092=>'L',
-195093=>'L',
-195094=>'L',
-195095=>'L',
-195096=>'L',
-195097=>'L',
-195098=>'L',
-195099=>'L',
-195100=>'L',
-195101=>'L',
-917505=>'BN',
-917536=>'BN',
-917537=>'BN',
-917538=>'BN',
-917539=>'BN',
-917540=>'BN',
-917541=>'BN',
-917542=>'BN',
-917543=>'BN',
-917544=>'BN',
-917545=>'BN',
-917546=>'BN',
-917547=>'BN',
-917548=>'BN',
-917549=>'BN',
-917550=>'BN',
-917551=>'BN',
-917552=>'BN',
-917553=>'BN',
-917554=>'BN',
-917555=>'BN',
-917556=>'BN',
-917557=>'BN',
-917558=>'BN',
-917559=>'BN',
-917560=>'BN',
-917561=>'BN',
-917562=>'BN',
-917563=>'BN',
-917564=>'BN',
-917565=>'BN',
-917566=>'BN',
-917567=>'BN',
-917568=>'BN',
-917569=>'BN',
-917570=>'BN',
-917571=>'BN',
-917572=>'BN',
-917573=>'BN',
-917574=>'BN',
-917575=>'BN',
-917576=>'BN',
-917577=>'BN',
-917578=>'BN',
-917579=>'BN',
-917580=>'BN',
-917581=>'BN',
-917582=>'BN',
-917583=>'BN',
-917584=>'BN',
-917585=>'BN',
-917586=>'BN',
-917587=>'BN',
-917588=>'BN',
-917589=>'BN',
-917590=>'BN',
-917591=>'BN',
-917592=>'BN',
-917593=>'BN',
-917594=>'BN',
-917595=>'BN',
-917596=>'BN',
-917597=>'BN',
-917598=>'BN',
-917599=>'BN',
-917600=>'BN',
-917601=>'BN',
-917602=>'BN',
-917603=>'BN',
-917604=>'BN',
-917605=>'BN',
-917606=>'BN',
-917607=>'BN',
-917608=>'BN',
-917609=>'BN',
-917610=>'BN',
-917611=>'BN',
-917612=>'BN',
-917613=>'BN',
-917614=>'BN',
-917615=>'BN',
-917616=>'BN',
-917617=>'BN',
-917618=>'BN',
-917619=>'BN',
-917620=>'BN',
-917621=>'BN',
-917622=>'BN',
-917623=>'BN',
-917624=>'BN',
-917625=>'BN',
-917626=>'BN',
-917627=>'BN',
-917628=>'BN',
-917629=>'BN',
-917630=>'BN',
-917631=>'BN',
-917760=>'NSM',
-917761=>'NSM',
-917762=>'NSM',
-917763=>'NSM',
-917764=>'NSM',
-917765=>'NSM',
-917766=>'NSM',
-917767=>'NSM',
-917768=>'NSM',
-917769=>'NSM',
-917770=>'NSM',
-917771=>'NSM',
-917772=>'NSM',
-917773=>'NSM',
-917774=>'NSM',
-917775=>'NSM',
-917776=>'NSM',
-917777=>'NSM',
-917778=>'NSM',
-917779=>'NSM',
-917780=>'NSM',
-917781=>'NSM',
-917782=>'NSM',
-917783=>'NSM',
-917784=>'NSM',
-917785=>'NSM',
-917786=>'NSM',
-917787=>'NSM',
-917788=>'NSM',
-917789=>'NSM',
-917790=>'NSM',
-917791=>'NSM',
-917792=>'NSM',
-917793=>'NSM',
-917794=>'NSM',
-917795=>'NSM',
-917796=>'NSM',
-917797=>'NSM',
-917798=>'NSM',
-917799=>'NSM',
-917800=>'NSM',
-917801=>'NSM',
-917802=>'NSM',
-917803=>'NSM',
-917804=>'NSM',
-917805=>'NSM',
-917806=>'NSM',
-917807=>'NSM',
-917808=>'NSM',
-917809=>'NSM',
-917810=>'NSM',
-917811=>'NSM',
-917812=>'NSM',
-917813=>'NSM',
-917814=>'NSM',
-917815=>'NSM',
-917816=>'NSM',
-917817=>'NSM',
-917818=>'NSM',
-917819=>'NSM',
-917820=>'NSM',
-917821=>'NSM',
-917822=>'NSM',
-917823=>'NSM',
-917824=>'NSM',
-917825=>'NSM',
-917826=>'NSM',
-917827=>'NSM',
-917828=>'NSM',
-917829=>'NSM',
-917830=>'NSM',
-917831=>'NSM',
-917832=>'NSM',
-917833=>'NSM',
-917834=>'NSM',
-917835=>'NSM',
-917836=>'NSM',
-917837=>'NSM',
-917838=>'NSM',
-917839=>'NSM',
-917840=>'NSM',
-917841=>'NSM',
-917842=>'NSM',
-917843=>'NSM',
-917844=>'NSM',
-917845=>'NSM',
-917846=>'NSM',
-917847=>'NSM',
-917848=>'NSM',
-917849=>'NSM',
-917850=>'NSM',
-917851=>'NSM',
-917852=>'NSM',
-917853=>'NSM',
-917854=>'NSM',
-917855=>'NSM',
-917856=>'NSM',
-917857=>'NSM',
-917858=>'NSM',
-917859=>'NSM',
-917860=>'NSM',
-917861=>'NSM',
-917862=>'NSM',
-917863=>'NSM',
-917864=>'NSM',
-917865=>'NSM',
-917866=>'NSM',
-917867=>'NSM',
-917868=>'NSM',
-917869=>'NSM',
-917870=>'NSM',
-917871=>'NSM',
-917872=>'NSM',
-917873=>'NSM',
-917874=>'NSM',
-917875=>'NSM',
-917876=>'NSM',
-917877=>'NSM',
-917878=>'NSM',
-917879=>'NSM',
-917880=>'NSM',
-917881=>'NSM',
-917882=>'NSM',
-917883=>'NSM',
-917884=>'NSM',
-917885=>'NSM',
-917886=>'NSM',
-917887=>'NSM',
-917888=>'NSM',
-917889=>'NSM',
-917890=>'NSM',
-917891=>'NSM',
-917892=>'NSM',
-917893=>'NSM',
-917894=>'NSM',
-917895=>'NSM',
-917896=>'NSM',
-917897=>'NSM',
-917898=>'NSM',
-917899=>'NSM',
-917900=>'NSM',
-917901=>'NSM',
-917902=>'NSM',
-917903=>'NSM',
-917904=>'NSM',
-917905=>'NSM',
-917906=>'NSM',
-917907=>'NSM',
-917908=>'NSM',
-917909=>'NSM',
-917910=>'NSM',
-917911=>'NSM',
-917912=>'NSM',
-917913=>'NSM',
-917914=>'NSM',
-917915=>'NSM',
-917916=>'NSM',
-917917=>'NSM',
-917918=>'NSM',
-917919=>'NSM',
-917920=>'NSM',
-917921=>'NSM',
-917922=>'NSM',
-917923=>'NSM',
-917924=>'NSM',
-917925=>'NSM',
-917926=>'NSM',
-917927=>'NSM',
-917928=>'NSM',
-917929=>'NSM',
-917930=>'NSM',
-917931=>'NSM',
-917932=>'NSM',
-917933=>'NSM',
-917934=>'NSM',
-917935=>'NSM',
-917936=>'NSM',
-917937=>'NSM',
-917938=>'NSM',
-917939=>'NSM',
-917940=>'NSM',
-917941=>'NSM',
-917942=>'NSM',
-917943=>'NSM',
-917944=>'NSM',
-917945=>'NSM',
-917946=>'NSM',
-917947=>'NSM',
-917948=>'NSM',
-917949=>'NSM',
-917950=>'NSM',
-917951=>'NSM',
-917952=>'NSM',
-917953=>'NSM',
-917954=>'NSM',
-917955=>'NSM',
-917956=>'NSM',
-917957=>'NSM',
-917958=>'NSM',
-917959=>'NSM',
-917960=>'NSM',
-917961=>'NSM',
-917962=>'NSM',
-917963=>'NSM',
-917964=>'NSM',
-917965=>'NSM',
-917966=>'NSM',
-917967=>'NSM',
-917968=>'NSM',
-917969=>'NSM',
-917970=>'NSM',
-917971=>'NSM',
-917972=>'NSM',
-917973=>'NSM',
-917974=>'NSM',
-917975=>'NSM',
-917976=>'NSM',
-917977=>'NSM',
-917978=>'NSM',
-917979=>'NSM',
-917980=>'NSM',
-917981=>'NSM',
-917982=>'NSM',
-917983=>'NSM',
-917984=>'NSM',
-917985=>'NSM',
-917986=>'NSM',
-917987=>'NSM',
-917988=>'NSM',
-917989=>'NSM',
-917990=>'NSM',
-917991=>'NSM',
-917992=>'NSM',
-917993=>'NSM',
-917994=>'NSM',
-917995=>'NSM',
-917996=>'NSM',
-917997=>'NSM',
-917998=>'NSM',
-917999=>'NSM',
-983040=>'L',
-1048573=>'L',
-1048576=>'L',
-1114109=>'L'
-);
-
-/**
- * Mirror unicode characters.
- * For information on bidi mirroring, see UAX #9: Bidirectional Algorithm, 
- * at http://www.unicode.org/unicode/reports/tr9/
- */
-global $unicode_mirror;
-$unicode_mirror = array (
-0x0028=>0x0029,
-0x0029=>0x0028,
-0x003C=>0x003E,
-0x003E=>0x003C,
-0x005B=>0x005D,
-0x005D=>0x005B,
-0x007B=>0x007D,
-0x007D=>0x007B,
-0x00AB=>0x00BB,
-0x00BB=>0x00AB,
-0x0F3A=>0x0F3B,
-0x0F3B=>0x0F3A,
-0x0F3C=>0x0F3D,
-0x0F3D=>0x0F3C,
-0x169B=>0x169C,
-0x169C=>0x169B,
-0x2018=>0x2019,
-0x2019=>0x2018,
-0x201C=>0x201D,
-0x201D=>0x201C,
-0x2039=>0x203A,
-0x203A=>0x2039,
-0x2045=>0x2046,
-0x2046=>0x2045,
-0x207D=>0x207E,
-0x207E=>0x207D,
-0x208D=>0x208E,
-0x208E=>0x208D,
-0x2208=>0x220B,
-0x2209=>0x220C,
-0x220A=>0x220D,
-0x220B=>0x2208,
-0x220C=>0x2209,
-0x220D=>0x220A,
-0x2215=>0x29F5,
-0x223C=>0x223D,
-0x223D=>0x223C,
-0x2243=>0x22CD,
-0x2252=>0x2253,
-0x2253=>0x2252,
-0x2254=>0x2255,
-0x2255=>0x2254,
-0x2264=>0x2265,
-0x2265=>0x2264,
-0x2266=>0x2267,
-0x2267=>0x2266,
-0x2268=>0x2269,
-0x2269=>0x2268,
-0x226A=>0x226B,
-0x226B=>0x226A,
-0x226E=>0x226F,
-0x226F=>0x226E,
-0x2270=>0x2271,
-0x2271=>0x2270,
-0x2272=>0x2273,
-0x2273=>0x2272,
-0x2274=>0x2275,
-0x2275=>0x2274,
-0x2276=>0x2277,
-0x2277=>0x2276,
-0x2278=>0x2279,
-0x2279=>0x2278,
-0x227A=>0x227B,
-0x227B=>0x227A,
-0x227C=>0x227D,
-0x227D=>0x227C,
-0x227E=>0x227F,
-0x227F=>0x227E,
-0x2280=>0x2281,
-0x2281=>0x2280,
-0x2282=>0x2283,
-0x2283=>0x2282,
-0x2284=>0x2285,
-0x2285=>0x2284,
-0x2286=>0x2287,
-0x2287=>0x2286,
-0x2288=>0x2289,
-0x2289=>0x2288,
-0x228A=>0x228B,
-0x228B=>0x228A,
-0x228F=>0x2290,
-0x2290=>0x228F,
-0x2291=>0x2292,
-0x2292=>0x2291,
-0x2298=>0x29B8,
-0x22A2=>0x22A3,
-0x22A3=>0x22A2,
-0x22A6=>0x2ADE,
-0x22A8=>0x2AE4,
-0x22A9=>0x2AE3,
-0x22AB=>0x2AE5,
-0x22B0=>0x22B1,
-0x22B1=>0x22B0,
-0x22B2=>0x22B3,
-0x22B3=>0x22B2,
-0x22B4=>0x22B5,
-0x22B5=>0x22B4,
-0x22B6=>0x22B7,
-0x22B7=>0x22B6,
-0x22C9=>0x22CA,
-0x22CA=>0x22C9,
-0x22CB=>0x22CC,
-0x22CC=>0x22CB,
-0x22CD=>0x2243,
-0x22D0=>0x22D1,
-0x22D1=>0x22D0,
-0x22D6=>0x22D7,
-0x22D7=>0x22D6,
-0x22D8=>0x22D9,
-0x22D9=>0x22D8,
-0x22DA=>0x22DB,
-0x22DB=>0x22DA,
-0x22DC=>0x22DD,
-0x22DD=>0x22DC,
-0x22DE=>0x22DF,
-0x22DF=>0x22DE,
-0x22E0=>0x22E1,
-0x22E1=>0x22E0,
-0x22E2=>0x22E3,
-0x22E3=>0x22E2,
-0x22E4=>0x22E5,
-0x22E5=>0x22E4,
-0x22E6=>0x22E7,
-0x22E7=>0x22E6,
-0x22E8=>0x22E9,
-0x22E9=>0x22E8,
-0x22EA=>0x22EB,
-0x22EB=>0x22EA,
-0x22EC=>0x22ED,
-0x22ED=>0x22EC,
-0x22F0=>0x22F1,
-0x22F1=>0x22F0,
-0x22F2=>0x22FA,
-0x22F3=>0x22FB,
-0x22F4=>0x22FC,
-0x22F6=>0x22FD,
-0x22F7=>0x22FE,
-0x22FA=>0x22F2,
-0x22FB=>0x22F3,
-0x22FC=>0x22F4,
-0x22FD=>0x22F6,
-0x22FE=>0x22F7,
-0x2308=>0x2309,
-0x2309=>0x2308,
-0x230A=>0x230B,
-0x230B=>0x230A,
-0x2329=>0x232A,
-0x232A=>0x2329,
-0x2768=>0x2769,
-0x2769=>0x2768,
-0x276A=>0x276B,
-0x276B=>0x276A,
-0x276C=>0x276D,
-0x276D=>0x276C,
-0x276E=>0x276F,
-0x276F=>0x276E,
-0x2770=>0x2771,
-0x2771=>0x2770,
-0x2772=>0x2773,
-0x2773=>0x2772,
-0x2774=>0x2775,
-0x2775=>0x2774,
-0x27C3=>0x27C4,
-0x27C4=>0x27C3,
-0x27C5=>0x27C6,
-0x27C6=>0x27C5,
-0x27D5=>0x27D6,
-0x27D6=>0x27D5,
-0x27DD=>0x27DE,
-0x27DE=>0x27DD,
-0x27E2=>0x27E3,
-0x27E3=>0x27E2,
-0x27E4=>0x27E5,
-0x27E5=>0x27E4,
-0x27E6=>0x27E7,
-0x27E7=>0x27E6,
-0x27E8=>0x27E9,
-0x27E9=>0x27E8,
-0x27EA=>0x27EB,
-0x27EB=>0x27EA,
-0x2983=>0x2984,
-0x2984=>0x2983,
-0x2985=>0x2986,
-0x2986=>0x2985,
-0x2987=>0x2988,
-0x2988=>0x2987,
-0x2989=>0x298A,
-0x298A=>0x2989,
-0x298B=>0x298C,
-0x298C=>0x298B,
-0x298D=>0x2990,
-0x298E=>0x298F,
-0x298F=>0x298E,
-0x2990=>0x298D,
-0x2991=>0x2992,
-0x2992=>0x2991,
-0x2993=>0x2994,
-0x2994=>0x2993,
-0x2995=>0x2996,
-0x2996=>0x2995,
-0x2997=>0x2998,
-0x2998=>0x2997,
-0x29B8=>0x2298,
-0x29C0=>0x29C1,
-0x29C1=>0x29C0,
-0x29C4=>0x29C5,
-0x29C5=>0x29C4,
-0x29CF=>0x29D0,
-0x29D0=>0x29CF,
-0x29D1=>0x29D2,
-0x29D2=>0x29D1,
-0x29D4=>0x29D5,
-0x29D5=>0x29D4,
-0x29D8=>0x29D9,
-0x29D9=>0x29D8,
-0x29DA=>0x29DB,
-0x29DB=>0x29DA,
-0x29F5=>0x2215,
-0x29F8=>0x29F9,
-0x29F9=>0x29F8,
-0x29FC=>0x29FD,
-0x29FD=>0x29FC,
-0x2A2B=>0x2A2C,
-0x2A2C=>0x2A2B,
-0x2A2D=>0x2A2E,
-0x2A2E=>0x2A2D,
-0x2A34=>0x2A35,
-0x2A35=>0x2A34,
-0x2A3C=>0x2A3D,
-0x2A3D=>0x2A3C,
-0x2A64=>0x2A65,
-0x2A65=>0x2A64,
-0x2A79=>0x2A7A,
-0x2A7A=>0x2A79,
-0x2A7D=>0x2A7E,
-0x2A7E=>0x2A7D,
-0x2A7F=>0x2A80,
-0x2A80=>0x2A7F,
-0x2A81=>0x2A82,
-0x2A82=>0x2A81,
-0x2A83=>0x2A84,
-0x2A84=>0x2A83,
-0x2A8B=>0x2A8C,
-0x2A8C=>0x2A8B,
-0x2A91=>0x2A92,
-0x2A92=>0x2A91,
-0x2A93=>0x2A94,
-0x2A94=>0x2A93,
-0x2A95=>0x2A96,
-0x2A96=>0x2A95,
-0x2A97=>0x2A98,
-0x2A98=>0x2A97,
-0x2A99=>0x2A9A,
-0x2A9A=>0x2A99,
-0x2A9B=>0x2A9C,
-0x2A9C=>0x2A9B,
-0x2AA1=>0x2AA2,
-0x2AA2=>0x2AA1,
-0x2AA6=>0x2AA7,
-0x2AA7=>0x2AA6,
-0x2AA8=>0x2AA9,
-0x2AA9=>0x2AA8,
-0x2AAA=>0x2AAB,
-0x2AAB=>0x2AAA,
-0x2AAC=>0x2AAD,
-0x2AAD=>0x2AAC,
-0x2AAF=>0x2AB0,
-0x2AB0=>0x2AAF,
-0x2AB3=>0x2AB4,
-0x2AB4=>0x2AB3,
-0x2ABB=>0x2ABC,
-0x2ABC=>0x2ABB,
-0x2ABD=>0x2ABE,
-0x2ABE=>0x2ABD,
-0x2ABF=>0x2AC0,
-0x2AC0=>0x2ABF,
-0x2AC1=>0x2AC2,
-0x2AC2=>0x2AC1,
-0x2AC3=>0x2AC4,
-0x2AC4=>0x2AC3,
-0x2AC5=>0x2AC6,
-0x2AC6=>0x2AC5,
-0x2ACD=>0x2ACE,
-0x2ACE=>0x2ACD,
-0x2ACF=>0x2AD0,
-0x2AD0=>0x2ACF,
-0x2AD1=>0x2AD2,
-0x2AD2=>0x2AD1,
-0x2AD3=>0x2AD4,
-0x2AD4=>0x2AD3,
-0x2AD5=>0x2AD6,
-0x2AD6=>0x2AD5,
-0x2ADE=>0x22A6,
-0x2AE3=>0x22A9,
-0x2AE4=>0x22A8,
-0x2AE5=>0x22AB,
-0x2AEC=>0x2AED,
-0x2AED=>0x2AEC,
-0x2AF7=>0x2AF8,
-0x2AF8=>0x2AF7,
-0x2AF9=>0x2AFA,
-0x2AFA=>0x2AF9,
-0x2E02=>0x2E03,
-0x2E03=>0x2E02,
-0x2E04=>0x2E05,
-0x2E05=>0x2E04,
-0x2E09=>0x2E0A,
-0x2E0A=>0x2E09,
-0x2E0C=>0x2E0D,
-0x2E0D=>0x2E0C,
-0x2E1C=>0x2E1D,
-0x2E1D=>0x2E1C,
-0x3008=>0x3009,
-0x3009=>0x3008,
-0x300A=>0x300B,
-0x300B=>0x300A,
-0x300C=>0x300D,
-0x300D=>0x300C,
-0x300E=>0x300F,
-0x300F=>0x300E,
-0x3010=>0x3011,
-0x3011=>0x3010,
-0x3014=>0x3015,
-0x3015=>0x3014,
-0x3016=>0x3017,
-0x3017=>0x3016,
-0x3018=>0x3019,
-0x3019=>0x3018,
-0x301A=>0x301B,
-0x301B=>0x301A,
-0x301D=>0x301E,
-0x301E=>0x301D,
-0xFE59=>0xFE5A,
-0xFE5A=>0xFE59,
-0xFE5B=>0xFE5C,
-0xFE5C=>0xFE5B,
-0xFE5D=>0xFE5E,
-0xFE5E=>0xFE5D,
-0xFE64=>0xFE65,
-0xFE65=>0xFE64,
-0xFF08=>0xFF09,
-0xFF09=>0xFF08,
-0xFF1C=>0xFF1E,
-0xFF1E=>0xFF1C,
-0xFF3B=>0xFF3D,
-0xFF3D=>0xFF3B,
-0xFF5B=>0xFF5D,
-0xFF5D=>0xFF5B,
-0xFF5F=>0xFF60,
-0xFF60=>0xFF5F,
-0xFF62=>0xFF63,
-0xFF63=>0xFF62);
-
-/**
- * Arabic shape subtitutions
- * char code=>isolated, final, initial, medial
- */
-global $unicode_arlet;
-$unicode_arlet = array(
-1569=>array(65152),
-1570=>array(65153, 65154, 65153, 65154),
-1571=>array(65155, 65156, 65155, 65156),
-1572=>array(65157, 65158),
-1573=>array(65159, 65160, 65159, 65160),
-1574=>array(65161, 65162, 65163, 65164),
-1575=>array(65165, 65166, 65165, 65166),
-1576=>array(65167, 65168, 65169, 65170),
-1577=>array(65171, 65172),
-1578=>array(65173, 65174, 65175, 65176),
-1579=>array(65177, 65178, 65179, 65180),
-1580=>array(65181, 65182, 65183, 65184),
-1581=>array(65185, 65186, 65187, 65188),
-1582=>array(65189, 65190, 65191, 65192),
-1583=>array(65193, 65194, 65193, 65194),
-1584=>array(65195, 65196, 65195, 65196),
-1585=>array(65197, 65198, 65197, 65198),
-1586=>array(65199, 65200, 65199, 65200),
-1587=>array(65201, 65202, 65203, 65204),
-1588=>array(65205, 65206, 65207, 65208),
-1589=>array(65209, 65210, 65211, 65212),
-1590=>array(65213, 65214, 65215, 65216),
-1591=>array(65217, 65218, 65219, 65220),
-1592=>array(65221, 65222, 65223, 65224),
-1593=>array(65225, 65226, 65227, 65228),
-1594=>array(65229, 65230, 65231, 65232),
-1601=>array(65233, 65234, 65235, 65236),
-1602=>array(65237, 65238, 65239, 65240),
-1603=>array(65241, 65242, 65243, 65244),
-1604=>array(65245, 65246, 65247, 65248),
-1605=>array(65249, 65250, 65251, 65252),
-1606=>array(65253, 65254, 65255, 65256),
-1607=>array(65257, 65258, 65259, 65260),
-1608=>array(65261, 65262, 65261, 65262),
-1609=>array(65263, 65264, 64488, 64489),
-1610=>array(65265, 65266, 65267, 65268),
-1649=>array(64336, 64337),
-1655=>array(64477),
-1657=>array(64358, 64359, 64360, 64361),
-1658=>array(64350, 64351, 64352, 64353),
-1659=>array(64338, 64339, 64340, 64341),
-1662=>array(64342, 64343, 64344, 64345),
-1663=>array(64354, 64355, 64356, 64357),
-1664=>array(64346, 64347, 64348, 64349),
-1667=>array(64374, 64375, 64376, 64377),
-1668=>array(64370, 64371, 64372, 64373),
-1670=>array(64378, 64379, 64380, 64381),
-1671=>array(64382, 64383, 64384, 64385),
-1672=>array(64392, 64393),
-1676=>array(64388, 64389),
-1677=>array(64386, 64387),
-1678=>array(64390, 64391),
-1681=>array(64396, 64397),
-1688=>array(64394, 64395, 64394, 64395),
-1700=>array(64362, 64363, 64364, 64365),
-1702=>array(64366, 64367, 64368, 64369),
-1705=>array(64398, 64399, 64400, 64401),
-1709=>array(64467, 64468, 64469, 64470),
-1711=>array(64402, 64403, 64404, 64405),
-1713=>array(64410, 64411, 64412, 64413),
-1715=>array(64406, 64407, 64408, 64409),
-1722=>array(64414, 64415),
-1723=>array(64416, 64417, 64418, 64419),
-1726=>array(64426, 64427, 64428, 64429),
-1728=>array(64420, 64421),
-1729=>array(64422, 64423, 64424, 64425),
-1733=>array(64480, 64481),
-1734=>array(64473, 64474),
-1735=>array(64471, 64472),
-1736=>array(64475, 64476),
-1737=>array(64482, 64483),
-1739=>array(64478, 64479),
-1740=>array(64508, 64509, 64510, 64511),
-1744=>array(64484, 64485, 64486, 64487),
-1746=>array(64430, 64431),
-1747=>array(64432, 64433)
-);
-
-/**
- * Arabic laa letter
- * char code=>isolated, final, initial, medial
- */
-global $laa_array;
-$laa_array = array (
-1570 =>array(65269, 65270, 65269, 65270),
-1571 =>array(65271, 65272, 65271, 65272),
-1573 =>array(65273, 65274, 65273, 65274),
-1575 =>array(65275, 65276, 65275, 65276)
-);
-
-/**
- * Array of character substitutions for sequences of two diacritics symbols starting with SHADDA (0651 HEX, 1617 DEC).
- * Combining characters that can occur with Shadda (U0651) are placed in UE586-UE594. 
- * Putting the combining mark and shadda in the same glyph allows us to avoid the two marks overlapping each other in an illegible manner.
- * second NSM char code=>substitution char
- */
-global $diacritics;
-$diacritics = array (
-1612=>64606, # Shadda + Dammatan
-1613=>64607, # Shadda + Kasratan
-1614=>64608, # Shadda + Fatha
-1615=>64609, # Shadda + Damma
-1616=>64610  # Shadda + Kasra
-);
-
-/**
- * Array of character substitutions from UTF-8 unicode to latin1
- */
-global $utf8tolatin;
-$utf8tolatin = array (
-8364=>128, # Euro1
-338=>140,  # OE
-352=>138,  # Scaron
-376=>159,  # Ydieresis
-381=>142,  # Zcaron2
-8226=>149, # bullet3
-710=>136,  # circumflex
-8224=>134, # dagger
-8225=>135, # daggerdbl
-8230=>133, # ellipsis
-8212=>151, # emdash
-8211=>150, # endash
-402=>131,  # florin
-8249=>139, # guilsinglleft
-8250=>155, # guilsinglright
-339=>156,  # oe
-8240=>137, # perthousand
-8222=>132, # quotedblbase
-8220=>147, # quotedblleft
-8221=>148, # quotedblright
-8216=>145, # quoteleft
-8217=>146, # quoteright
-8218=>130, # quotesinglbase
-353=>154,  # scaron
-732=>152,  # tilde
-8482=>153, # trademark
-382=>158   # zcaron2
-);
-
-//============================================================+
-// END OF FILE
-//============================================================+
-?>
diff --git a/html2pdf_v4.03/examples/about.php b/html2pdf_v4.03/examples/about.php
deleted file mode 100644
index bc8d4cb2..00000000
--- a/html2pdf_v4.03/examples/about.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * HTML2PDF Librairy - example
- *
- * HTML => PDF convertor
- * distributed under the LGPL License
- *
- * @author      Laurent MINGUET <webmaster@html2pdf.fr>
- *
- * isset($_GET['vuehtml']) is not mandatory
- * it allow to display the result in the HTML format
- */
-    require_once(dirname(__FILE__).'/../htdocs2pdf.class.php');
-
-    // get the HTML
-     ob_start();
-     include(dirname('__FILE__').'/res/about.php');
-    $content = ob_get_clean();
-
-    try
-    {
-        // init HTML2PDF
-        $html2pdf = new HTML2PDF('P', 'A4', 'fr', true, 'UTF-8', array(0, 0, 0, 0));
-
-        // display the full page
-        $html2pdf->pdf->SetDisplayMode('fullpage');
-
-        // convert
-        $html2pdf->writeHTML($content, isset($_GET['vuehtml']));
-
-        // add the automatic index
-        $html2pdf->createIndex('Sommaire', 30, 12, false, true, 2);
-
-        // send the PDF
-        $html2pdf->Output('about.pdf');
-    }
-    catch(HTML2PDF_exception $e) {
-        echo $e;
-        exit;
-    }
diff --git a/html2pdf_v4.03/examples/bookmark.php b/html2pdf_v4.03/examples/bookmark.php
deleted file mode 100644
index 99800ab5..00000000
--- a/html2pdf_v4.03/examples/bookmark.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-/**
- * HTML2PDF Librairy - example
- *
- * HTML => PDF convertor
- * distributed under the LGPL License
- *
- * @author      Laurent MINGUET <webmaster@html2pdf.fr>
- *
- * isset($_GET['vuehtml']) is not mandatory
- * it allow to display the result in the HTML format
- */
-
-ob_start();
-?>
-<style type="text/css">
-<!--
-    table.page_header {width: 100%; border: none; background-color: #DDDDFF; border-bottom: solid 1mm #AAAADD; padding: 2mm }
-    table.page_footer {width: 100%; border: none; background-color: #DDDDFF; border-top: solid 1mm #AAAADD; padding: 2mm}
-    h1 {color: #000033}
-    h2 {color: #000055}
-    h3 {color: #000077}
-
-    div.niveau
-    {
-        padding-left: 5mm;
-    }
--->
-</style>
-<page backtop="14mm" backbottom="14mm" backleft="10mm" backright="10mm" style="font-size: 12pt">
-    <page_header>
-        <table class="page_header">
-            <tr>
-                <td style="width: 100%; text-align: left">
-                    Exemple d'utilisation des bookmarks
-                </td>
-            </tr>
-        </table>
-    </page_header>
-    <page_footer>
-        <table class="page_footer">
-            <tr>
-                <td style="width: 100%; text-align: right">
-                    page [[page_cu]]/[[page_nb]]
-                </td>
-            </tr>
-        </table>
-    </page_footer>
-    <bookmark title="Sommaire" level="0" ></bookmark>
-</page>
-<page pageset="old">
-    <bookmark title="Chapitre 1" level="0" ></bookmark><h1>Chapitre 1</h1>
-    <div class="niveau">
-        Contenu du chapitre 1
-    </div>
-</page>
-<page pageset="old">
-    <bookmark title="Chapitre 2" level="0" ></bookmark><h1>Chapitre 2</h1>
-    <div class="niveau">
-        intro au chapitre 2
-        <bookmark title="Chapitre 2.1" level="1" ></bookmark><h2>Chapitre 2.1</h2>
-        <div class="niveau">
-            Contenu du chapitre 2.1
-        </div>
-        <bookmark title="Chapitre 2.2" level="1" ></bookmark><h2>Chapitre 2.2</h2>
-        <div class="niveau">
-            Contenu du chapitre 2.2
-        </div>
-        <bookmark title="Chapitre 2.3" level="1" ></bookmark><h2>Chapitre 2.3</h2>
-        <div class="niveau">
-            Contenu du chapitre 2.3
-        </div>
-    </div>
-</page>
-<page pageset="old">
-    <bookmark title="Chapitre 3" level="0" ></bookmark><h1>Chapitre 3</h1>
-    <div class="niveau">
-        intro au chapitre 3
-        <bookmark title="Chapitre 3.1" level="1" ></bookmark><h2>Chapitre 3.1</h2>
-        <div class="niveau">
-            Contenu du chapitre 3.1
-        </div>
-        <bookmark title="Chapitre 3.2" level="1" ></bookmark><h2>Chapitre 3.2</h2>
-        <div class="niveau">
-            intro au chapitre 3.2
-            <bookmark title="Chapitre 3.2.1" level="2" ></bookmark><h3>Chapitre 3.2.1</h3>
-            <div class="niveau">
-                Contenu du chapitre 3.2.1
-            </div>
-            <bookmark title="Chapitre 3.2.2" level="2" ></bookmark><h3>Chapitre 3.2.2</h3>
-            <div class="niveau">
-                Contenu du chapitre 3.2.2
-            </div>
-        </div>
-    </div>
-</page>
-<?php
-    $content = ob_get_clean();
-
-    require_once(dirname(__FILE__).'/../htdocs2pdf.class.php');
-    try
-    {
-        $html2pdf = new HTML2PDF('P', 'A4', 'fr', true, 'UTF-8', 0);
-        $html2pdf->writeHTML($content, isset($_GET['vuehtml']));
-        $html2pdf->createIndex('Sommaire', 25, 12, false, true, 1);
-        $html2pdf->Output('bookmark.pdf');
-    }
-    catch(HTML2PDF_exception $e) {
-        echo $e;
-        exit;
-    }
diff --git a/html2pdf_v4.03/examples/exemple00.php b/html2pdf_v4.03/examples/exemple00.php
deleted file mode 100644
index 5e106ed0..00000000
--- a/html2pdf_v4.03/examples/exemple00.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * HTML2PDF Librairy - example
- *
- * HTML => PDF convertor
- * distributed under the LGPL License
- *
- * @author      Laurent MINGUET <webmaster@html2pdf.fr>
- *
- * isset($_GET['vuehtml']) is not mandatory
- * it allow to display the result in the HTML format
- */
-
-    // get the HTML
-    ob_start();
-    include(dirname(__FILE__).'/res/exemple00.php');
-    $content = ob_get_clean();
-
-    // convert in PDF
-    require_once(dirname(__FILE__).'/../htdocs2pdf.class.php');
-    try
-    {
-        $html2pdf = new HTML2PDF('P', 'A4', 'fr');
-//      $html2pdf->setModeDebug();
-        $html2pdf->setDefaultFont('Arial');
-        $html2pdf->writeHTML($content, isset($_GET['vuehtml']));
-        $html2pdf->Output('exemple00.pdf');
-    }
-    catch(HTML2PDF_exception $e) {
-        echo $e;
-        exit;
-    }
diff --git a/html2pdf_v4.03/examples/exemple01.php b/html2pdf_v4.03/examples/exemple01.php
deleted file mode 100644
index 82617526..00000000
--- a/html2pdf_v4.03/examples/exemple01.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * HTML2PDF Librairy - example
- *
- * HTML => PDF convertor
- * distributed under the LGPL License
- *
- * @author      Laurent MINGUET <webmaster@html2pdf.fr>
- *
- * isset($_GET['vuehtml']) is not mandatory
- * it allow to display the result in the HTML format
- */
-
-    // get the HTML
-    ob_start();
-    include(dirname(__FILE__).'/res/exemple01.php');
-    $content = ob_get_clean();
-
-    // convert in PDF
-    require_once(dirname(__FILE__).'/../htdocs2pdf.class.php');
-    try
-    {
-        $html2pdf = new HTML2PDF('P', 'A4', 'fr');
-        $html2pdf->writeHTML($content, isset($_GET['vuehtml']));
-        $html2pdf->Output('exemple01.pdf');
-    }
-    catch(HTML2PDF_exception $e) {
-        echo $e;
-        exit;
-    }
diff --git a/html2pdf_v4.03/examples/exemple02.php b/html2pdf_v4.03/examples/exemple02.php
deleted file mode 100644
index 16792244..00000000
--- a/html2pdf_v4.03/examples/exemple02.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * HTML2PDF Librairy - example
- *
- * HTML => PDF convertor
- * distributed under the LGPL License
- *
- * @author      Laurent MINGUET <webmaster@html2pdf.fr>
- *
- * isset($_GET['vuehtml']) is not mandatory
- * it allow to display the result in the HTML format
- */
-
-    // get the HTML
-    ob_start();
-    include(dirname(__FILE__).'/res/exemple02.php');
-    $content = ob_get_clean();
-
-    // convert in PDF
-    require_once(dirname(__FILE__).'/../htdocs2pdf.class.php');
-    try
-    {
-        $html2pdf = new HTML2PDF('P', 'A4', 'fr', true, 'UTF-8', array(15, 5, 15, 5));
-        $html2pdf->pdf->SetDisplayMode('fullpage');
-        $html2pdf->writeHTML($content, isset($_GET['vuehtml']));
-        $html2pdf->Output('exemple02.pdf');
-    }
-    catch(HTML2PDF_exception $e) {
-        echo $e;
-        exit;
-    }
-
diff --git a/html2pdf_v4.03/examples/exemple03.php b/html2pdf_v4.03/examples/exemple03.php
deleted file mode 100644
index 089720dd..00000000
--- a/html2pdf_v4.03/examples/exemple03.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * HTML2PDF Librairy - example
- *
- * HTML => PDF convertor
- * distributed under the LGPL License
- *
- * @author      Laurent MINGUET <webmaster@html2pdf.fr>
- *
- * isset($_GET['vuehtml']) is not mandatory
- * it allow to display the result in the HTML format
- */
-
-    // get the HTML
-    ob_start();
-    include(dirname(__FILE__).'/res/exemple03.php');
-    $content = ob_get_clean();
-
-    // convert to PDF
-    require_once(dirname(__FILE__).'/../htdocs2pdf.class.php');
-    try
-    {
-        $html2pdf = new HTML2PDF('P', 'A4', 'fr', true, 'UTF-8', 3);
-        $html2pdf->pdf->SetDisplayMode('fullpage');
-        $html2pdf->writeHTML($content, isset($_GET['vuehtml']));
-        $html2pdf->Output('exemple03.pdf');
-    }
-    catch(HTML2PDF_exception $e) {
-        echo $e;
-        exit;
-    }
diff --git a/html2pdf_v4.03/examples/exemple04.php b/html2pdf_v4.03/examples/exemple04.php
deleted file mode 100644
index 9ea7fdc6..00000000
--- a/html2pdf_v4.03/examples/exemple04.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * HTML2PDF Librairy - example
- *
- * HTML => PDF convertor
- * distributed under the LGPL License
- *
- * @author      Laurent MINGUET <webmaster@html2pdf.fr>
- *
- * isset($_GET['vuehtml']) is not mandatory
- * it allow to display the result in the HTML format
- */
-
-    // get the HTML
-    ob_start();
-    include(dirname(__FILE__).'/res/exemple04.php');
-    $content = ob_get_clean();
-
-    // convert to PDF
-    require_once(dirname(__FILE__).'/../htdocs2pdf.class.php');
-    try
-    {
-        $html2pdf = new HTML2PDF('P', 'A4', 'fr');
-        $html2pdf->pdf->SetDisplayMode('fullpage');
-        $html2pdf->writeHTML($content, isset($_GET['vuehtml']));
-        $html2pdf->Output('exemple04.pdf');
-    }
-    catch(HTML2PDF_exception $e) {
-        echo $e;
-        exit;
-    }
diff --git a/html2pdf_v4.03/examples/exemple05.php b/html2pdf_v4.03/examples/exemple05.php
deleted file mode 100644
index 28be37a7..00000000
--- a/html2pdf_v4.03/examples/exemple05.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * HTML2PDF Librairy - example
- *
- * HTML => PDF convertor
- * distributed under the LGPL License
- *
- * @author      Laurent MINGUET <webmaster@html2pdf.fr>
- *
- * isset($_GET['vuehtml']) is not mandatory
- * it allow to display the result in the HTML format
- */
-
-    // get the HTML
-    ob_start();
-    include(dirname(__FILE__).'/res/exemple05.php');
-    $content = ob_get_clean();
-
-    // convert to PDF
-    require_once(dirname(__FILE__).'/../htdocs2pdf.class.php');
-    try
-    {
-        $html2pdf = new HTML2PDF('P', 'A4', 'fr');
-        $html2pdf->pdf->SetDisplayMode('fullpage');
-        $html2pdf->writeHTML($content, isset($_GET['vuehtml']));
-        $html2pdf->Output('exemple05.pdf');
-    }
-    catch(HTML2PDF_exception $e) {
-        echo $e;
-        exit;
-    }
diff --git a/html2pdf_v4.03/examples/exemple06.php b/html2pdf_v4.03/examples/exemple06.php
deleted file mode 100644
index 435d8a07..00000000
--- a/html2pdf_v4.03/examples/exemple06.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * HTML2PDF Librairy - example
- *
- * HTML => PDF convertor
- * distributed under the LGPL License
- *
- * @author      Laurent MINGUET <webmaster@html2pdf.fr>
- *
- * isset($_GET['vuehtml']) is not mandatory
- * it allow to display the result in the HTML format
- */
-
-    // get the HTML
-    ob_start();
-    include(dirname(__FILE__).'/res/exemple06.php');
-    $content = ob_get_clean();
-
-    // convert to PDF
-    require_once(dirname(__FILE__).'/../htdocs2pdf.class.php');
-    try
-    {
-        $html2pdf = new HTML2PDF('P', 'A4', 'fr');
-        $html2pdf->writeHTML($content, isset($_GET['vuehtml']));
-        $html2pdf->Output('exemple06.pdf');
-    }
-    catch(HTML2PDF_exception $e) {
-        echo $e;
-        exit;
-    }
diff --git a/html2pdf_v4.03/examples/exemple07.php b/html2pdf_v4.03/examples/exemple07.php
deleted file mode 100644
index ac74d001..00000000
--- a/html2pdf_v4.03/examples/exemple07.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * HTML2PDF Librairy - example
- *
- * HTML => PDF convertor
- * distributed under the LGPL License
- *
- * @author      Laurent MINGUET <webmaster@html2pdf.fr>
- *
- * isset($_GET['vuehtml']) is not mandatory
- * it allow to display the result in the HTML format
- */
-
-    // get the HTML
-    ob_start();
-    include(dirname(__FILE__).'/res/exemple07a.php');
-    include(dirname(__FILE__).'/res/exemple07b.php');
-    $content = ob_get_clean();
-
-    // convert to PDF
-    require_once(dirname(__FILE__).'/../htdocs2pdf.class.php');
-    try
-    {
-        $html2pdf = new HTML2PDF('P', 'A4', 'fr');
-        $html2pdf->pdf->SetDisplayMode('fullpage');
-//      $html2pdf->pdf->SetProtection(array('print'), 'spipu');
-        $html2pdf->writeHTML($content, isset($_GET['vuehtml']));
-        $html2pdf->Output('exemple07.pdf');
-    }
-    catch(HTML2PDF_exception $e) {
-        echo $e;
-        exit;
-    }
diff --git a/html2pdf_v4.03/examples/exemple08.php b/html2pdf_v4.03/examples/exemple08.php
deleted file mode 100644
index 22dd4df1..00000000
--- a/html2pdf_v4.03/examples/exemple08.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * HTML2PDF Librairy - example
- *
- * HTML => PDF convertor
- * distributed under the LGPL License
- *
- * @author      Laurent MINGUET <webmaster@html2pdf.fr>
- *
- * isset($_GET['vuehtml']) is not mandatory
- * it allow to display the result in the HTML format
- */
-
-    // get the HTML
-    ob_start();
-    include(dirname(__FILE__).'/res/exemple08.php');
-    $content = ob_get_clean();
-
-    // convert to PDF
-    require_once(dirname(__FILE__).'/../htdocs2pdf.class.php');
-    try
-    {
-        $html2pdf = new HTML2PDF('P', 'A4', 'fr', true, 'UTF-8', 0);
-        $html2pdf->writeHTML($content, isset($_GET['vuehtml']));
-        $html2pdf->Output('exemple08.pdf');
-    }
-    catch(HTML2PDF_exception $e) {
-        echo $e;
-        exit;
-    }
diff --git a/html2pdf_v4.03/examples/exemple09.php b/html2pdf_v4.03/examples/exemple09.php
deleted file mode 100644
index afb80c97..00000000
--- a/html2pdf_v4.03/examples/exemple09.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-/**
- * HTML2PDF Librairy - example
- *
- * HTML => PDF convertor
- * distributed under the LGPL License
- *
- * @author      Laurent MINGUET <webmaster@html2pdf.fr>
- *
- */
-
-$generate = isset($_GET['make_pdf']);
-$nom = isset($_GET['nom']) ? $_GET['nom'] : 'inconnu';
-
-$nom = substr(preg_replace('/[^a-zA-Z0-9]/isU', '', $nom), 0, 26);
-
-if ($generate) {
-    ob_start();
-} else {
-?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/../htdocs4/loose.dtd">
-<html>
-    <head>
-        <meta http-equiv="Content-Type" content="te../htdocs; charset=UTF-8" >
-        <title>Exemple d'auto génération de PDF</title>
-    </head>
-    <body>
-<?php
-}
-
-$url = dirname($_SERVER['REQUEST_URI']).'/res/exemple09.png.php?px=5&amp;py=20';
-if (substr($url, 0, 7)!=='http://') {
-    $url = 'http://'.$_SERVER['HTTP_HOST'].$url;
-}
-?>
-<br>
-Ceci est un exemple de génération de PDF via un bouton :)<br>
-<br>
-<img src="<?php echo $url; ?>" alt="image_php" ><br>
-<br>
-<?php
-    if ($generate) {
-?>
-Bonjour <b><?php echo $nom; ?></b>, ton nom peut s'écrire : <br>
-<barcode type="C39" value="<?php echo strtoupper($nom); ?>" style="color: #770000" ></barcode><hr>
-<br>
-<?php
-    }
-?>
-<br>
-<?php
-    if ($generate) {
-        $content = ob_get_clean();
-        require_once(dirname(__FILE__).'/../htdocs2pdf.class.php');
-        try
-        {
-            $html2pdf = new HTML2PDF('P', 'A4', 'fr');
-            $html2pdf->writeHTML($content);
-            $html2pdf->Output('exemple09.pdf');
-            exit;
-        }
-        catch(HTML2PDF_exception $e) {
-            echo $e;
-            exit;
-        }
-    }
-?>
-        <form method="get" action="">
-            <input type="hidden" name="make_pdf" value="">
-            Ton nom : <input type="text" name="nom" value=""> -
-            <input type="submit" value="Generer le PDF" >
-        </form>
-    </body>
-</html>
\ No newline at end of file
diff --git a/html2pdf_v4.03/examples/exemple10.php b/html2pdf_v4.03/examples/exemple10.php
deleted file mode 100644
index a3918c93..00000000
--- a/html2pdf_v4.03/examples/exemple10.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * HTML2PDF Librairy - example
- *
- * HTML => PDF convertor
- * distributed under the LGPL License
- *
- * @author      Laurent MINGUET <webmaster@html2pdf.fr>
- *
- * isset($_GET['vuehtml']) is not mandatory
- * it allow to display the result in the HTML format
- */
-
-    ob_start();
-    include(dirname(__FILE__).'/res/exemple10.php');
-    $content = ob_get_clean();
-
-    require_once(dirname(__FILE__).'/../htdocs2pdf.class.php');
-    try
-    {
-        $html2pdf = new HTML2PDF('P', 'A4', 'fr');
-        $html2pdf->writeHTML($content, isset($_GET['vuehtml']));
-        $html2pdf->Output('exemple10.pdf');
-    }
-    catch(HTML2PDF_exception $e) {
-        echo $e;
-        exit;
-    }
\ No newline at end of file
diff --git a/html2pdf_v4.03/examples/exemple11.php b/html2pdf_v4.03/examples/exemple11.php
deleted file mode 100644
index f8d5b102..00000000
--- a/html2pdf_v4.03/examples/exemple11.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * HTML2PDF Librairy - example
- *
- * HTML => PDF convertor
- * distributed under the LGPL License
- *
- * @author      Laurent MINGUET <webmaster@html2pdf.fr>
- *
- * isset($_GET['vuehtml']) is not mandatory
- * it allow to display the result in the HTML format
- */
-
-    // get the HTML
-    ob_start();
-    include(dirname(__FILE__).'/res/exemple11.php');
-    $content = ob_get_clean();
-
-    // convert to PDF
-    require_once(dirname(__FILE__).'/../htdocs2pdf.class.php');
-    try
-    {
-        $html2pdf = new HTML2PDF('P', 'A4', 'fr');
-        $html2pdf->setTestTdInOnePage(false);
-        $html2pdf->writeHTML($content, isset($_GET['vuehtml']));
-        $html2pdf->Output('exemple11.pdf');
-    }
-    catch(HTML2PDF_exception $e) {
-        echo $e;
-        exit;
-    }
diff --git a/html2pdf_v4.03/examples/exemple12.php b/html2pdf_v4.03/examples/exemple12.php
deleted file mode 100644
index fed472a6..00000000
--- a/html2pdf_v4.03/examples/exemple12.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * HTML2PDF Librairy - example
- *
- * HTML => PDF convertor
- * distributed under the LGPL License
- *
- * @author      Laurent MINGUET <webmaster@html2pdf.fr>
- *
- * isset($_GET['vuehtml']) is not mandatory
- * it allow to display the result in the HTML format
- */
-
-    // get the HTML
-    ob_start();
-    include(dirname(__FILE__).'/res/exemple12.php');
-    $content = ob_get_clean();
-
-    // convert to PDF
-    require_once(dirname(__FILE__).'/../htdocs2pdf.class.php');
-    try
-    {
-        $html2pdf = new HTML2PDF('P', 'A4', 'fr');
-        $html2pdf->writeHTML($content, isset($_GET['vuehtml']));
-        $html2pdf->Output('exemple12.pdf');
-    }
-    catch(HTML2PDF_exception $e) {
-        echo $e;
-        exit;
-    }
diff --git a/html2pdf_v4.03/examples/exemple13.php b/html2pdf_v4.03/examples/exemple13.php
deleted file mode 100644
index 4ffcd84d..00000000
--- a/html2pdf_v4.03/examples/exemple13.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * HTML2PDF Librairy - example
- *
- * HTML => PDF convertor
- * distributed under the LGPL License
- *
- * @author      Laurent MINGUET <webmaster@html2pdf.fr>
- *
- * isset($_GET['vuehtml']) is not mandatory
- * it allow to display the result in the HTML format
- */
-
-    // get the HTML
-    ob_start();
-    include(dirname(__FILE__).'/res/exemple13.php');
-    $content = ob_get_clean();
-
-    // convert to PDF
-    require_once(dirname(__FILE__).'/../htdocs2pdf.class.php');
-    try
-    {
-        $html2pdf = new HTML2PDF('P', 'A4', 'fr');
-        $html2pdf->writeHTML($content, isset($_GET['vuehtml']));
-        $html2pdf->Output('exemple13.pdf');
-    }
-    catch(HTML2PDF_exception $e) {
-        echo $e;
-        exit;
-    }
diff --git a/html2pdf_v4.03/examples/forms.php b/html2pdf_v4.03/examples/forms.php
deleted file mode 100644
index 94b71d91..00000000
--- a/html2pdf_v4.03/examples/forms.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * HTML2PDF Librairy - example
- *
- * HTML => PDF convertor
- * distributed under the LGPL License
- *
- * @author      Laurent MINGUET <webmaster@html2pdf.fr>
- *
- * isset($_GET['vuehtml']) is not mandatory
- * it allow to display the result in the HTML format
- */
-
-    // for display the post information
-    if (isset($_POST['test'])) {
-        echo '<pre>';
-        echo htmlentities(print_r($_POST, true));
-        echo '</pre>';
-        exit;
-    }
-
-    // get the HTML
-    ob_start();
-    include(dirname(__FILE__).'/res/forms.php');
-    $content = ob_get_clean();
-
-    // convert to PDF
-    require_once(dirname(__FILE__).'/../htdocs2pdf.class.php');
-    try
-    {
-        $html2pdf = new HTML2PDF('P', 'A4', 'fr');
-        $html2pdf->pdf->SetDisplayMode('fullpage');
-        $html2pdf->writeHTML($content, isset($_GET['vuehtml']));
-        $html2pdf->Output('forms.pdf');
-    }
-    catch(HTML2PDF_exception $e) {
-        echo $e;
-        exit;
-    }
diff --git a/html2pdf_v4.03/examples/groups.php b/html2pdf_v4.03/examples/groups.php
deleted file mode 100644
index 113d4394..00000000
--- a/html2pdf_v4.03/examples/groups.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-/**
- * HTML2PDF Librairy - example
- *
- * HTML => PDF convertor
- * distributed under the LGPL License
- *
- * @author      Laurent MINGUET <webmaster@html2pdf.fr>
- *
- * isset($_GET['vuehtml']) is not mandatory
- * it allow to display the result in the HTML format
- */
-
-ob_start();
-?>
-<style type="text/css">
-<!--
-    table.page_header {width: 100%; border: none; background-color: #DDDDFF; border-bottom: solid 1mm #AAAADD; padding: 2mm }
-    table.page_footer {width: 100%; border: none; background-color: #DDDDFF; border-top: solid 1mm #AAAADD; padding: 2mm}
--->
-</style>
-<page backtop="14mm" backbottom="14mm" backleft="10mm" backright="10mm" pagegroup="new">
-    <page_header>
-        <table class="page_header">
-            <tr>
-                <td style="width: 100%; text-align: left">
-                    Exemple d'utilisation des groupes de pages
-                </td>
-            </tr>
-        </table>
-    </page_header>
-    <page_footer>
-        <table class="page_footer">
-            <tr>
-                <td style="width: 100%; text-align: right">
-                    page [[page_cu]]/[[page_nb]]
-                </td>
-            </tr>
-        </table>
-    </page_footer>
-    Ceci est la page 1 du groupe 1
-</page>
-<page pageset="old">
-    Ceci est la page 2 du groupe 1
-</page>
-<page pageset="old">
-    Ceci est la page 3 du groupe 1
-</page>
-<?php for ($k=2; $k<5; $k++): ?>
-<page pageset="old" pagegroup="new">
-    Ceci est la page 1 du groupe <?php echo $k; ?>
-</page>
-<page pageset="old">
-    Ceci est la page 2 du groupe <?php echo $k; ?>
-</page>
-<?php endfor; ?>
-<?php
-    $content = ob_get_clean();
-
-    require_once(dirname(__FILE__).'/../htdocs2pdf.class.php');
-    try
-    {
-        $html2pdf = new HTML2PDF('P', 'A4', 'fr', true, 'UTF-8', 0);
-        $html2pdf->pdf->SetDisplayMode('fullpage');
-        $html2pdf->writeHTML($content, isset($_GET['vuehtml']));
-        $html2pdf->Output('groups.pdf');
-    }
-    catch(HTML2PDF_exception $e) {
-        echo $e;
-        exit;
-    }
diff --git a/html2pdf_v4.03/examples/js1.php b/html2pdf_v4.03/examples/js1.php
deleted file mode 100644
index a99beaff..00000000
--- a/html2pdf_v4.03/examples/js1.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * HTML2PDF Librairy - example
- *
- * HTML => PDF convertor
- * distributed under the LGPL License
- *
- * @author      Laurent MINGUET <webmaster@html2pdf.fr>
- *
- * isset($_GET['vuehtml']) is not mandatory
- * it allow to display the result in the HTML format
- */
-
-    // get the HTML
-    ob_start();
-?>
-<page>
-    <h1>Test de JavaScript 1</h1><br>
-    <br>
-    Normalement la fenetre d'impression devrait apparaitre automatiquement
-</page>
-<?php
-    $content = ob_get_clean();
-
-    // convert to PDF
-    require_once(dirname(__FILE__).'/../htdocs2pdf.class.php');
-    try
-    {
-        $html2pdf = new HTML2PDF('P', 'A4', 'fr');
-        $html2pdf->pdf->IncludeJS("print(true);");
-        $html2pdf->writeHTML($content, isset($_GET['vuehtml']));
-        $html2pdf->Output('js1.pdf');
-    }
-    catch(HTML2PDF_exception $e) {
-        echo $e;
-        exit;
-    }
diff --git a/html2pdf_v4.03/examples/js2.php b/html2pdf_v4.03/examples/js2.php
deleted file mode 100644
index 26b881f8..00000000
--- a/html2pdf_v4.03/examples/js2.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * HTML2PDF Librairy - example
- *
- * HTML => PDF convertor
- * distributed under the LGPL License
- *
- * @author      Laurent MINGUET <webmaster@html2pdf.fr>
- *
- * isset($_GET['vuehtml']) is not mandatory
- * it allow to display the result in the HTML format
- */
-
-    // get the HTML
-     ob_start();
-?>
-<page>
-    <h1>Test de JavaScript 2</h1><br>
-    <br>
-    Normalement une alerte devrait apparaitre, indiquant "coucou"
-</page>
-<?php
-    $content = ob_get_clean();
-
-    // convert to PDF
-    require_once(dirname(__FILE__).'/../htdocs2pdf.class.php');
-    try
-    {
-        $html2pdf = new HTML2PDF('P', 'A4', 'fr');
-        $html2pdf->pdf->IncludeJS("app.alert('coucou');");
-        $html2pdf->writeHTML($content, isset($_GET['vuehtml']));
-        $html2pdf->Output('js2.pdf');
-    }
-    catch(HTML2PDF_exception $e) {
-        echo $e;
-        exit;
-    }
diff --git a/html2pdf_v4.03/examples/js3.php b/html2pdf_v4.03/examples/js3.php
deleted file mode 100644
index 4d483923..00000000
--- a/html2pdf_v4.03/examples/js3.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/**
- * HTML2PDF Librairy - example
- *
- * HTML => PDF convertor
- * distributed under the LGPL License
- *
- * @author      Laurent MINGUET <webmaster@html2pdf.fr>
- *
- * isset($_GET['vuehtml']) is not mandatory
- * it allow to display the result in the HTML format
- */
-
-    // get the HTML
-     ob_start();
-?>
-<page>
-    <h1>Test de JavaScript 3</h1><br>
-    <br>
-    Normalement une valeur devrait vous être demandée, puis affichée
-</page>
-<?php
-    $content = ob_get_clean();
-
-    // PDF script to execute
-    $script = "
-var rep = app.response('Donnez votre nom');
-app.alert('Vous vous appelez '+rep);
-";
-
-    // convert to PDF
-    require_once(dirname(__FILE__).'/../htdocs2pdf.class.php');
-    try
-    {
-        $html2pdf = new HTML2PDF('P', 'A4', 'fr');
-        $html2pdf->pdf->IncludeJS($script);
-        $html2pdf->writeHTML($content, isset($_GET['vuehtml']));
-        $html2pdf->Output('js3.pdf');
-    }
-    catch(HTML2PDF_exception $e) {
-        echo $e;
-        exit;
-    }
diff --git a/html2pdf_v4.03/examples/qrcode.php b/html2pdf_v4.03/examples/qrcode.php
deleted file mode 100644
index da274954..00000000
--- a/html2pdf_v4.03/examples/qrcode.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/**
- * HTML2PDF Librairy - example
- *
- * HTML => PDF convertor
- * distributed under the LGPL License
- *
- * @author      Laurent MINGUET <webmaster@html2pdf.fr>
- *
- * isset($_GET['vuehtml']) is not mandatory
- * it allow to display the result in the HTML format
- */
-
-    // get the HTML
-     ob_start();
-     $msg = "Le site de html2pdf\r\nhttp../htdocs2pdf.fr/";
-?>
-<page backtop="10mm" >
-    <page_header>
-        <table style="width: 100%; border: solid 1px black;">
-            <tr>
-                <td style="text-align: left;    width: 50%">html2pdf</td>
-                <td style="text-align: right;    width: 50%">Exemples de QRcode</td>
-            </tr>
-        </table>
-    </page_header>
-    <h1>Exemples de QRcode</h1>
-    <h3>Message avec Correction d'erreur L, M, Q, H (valeur par défaut : H)</h3>
-    <qrcode value="<?php echo $msg; ?>" ec="L" style="width: 30mm;"></qrcode>
-    <qrcode value="<?php echo $msg; ?>" ec="M" style="width: 30mm;"></qrcode>
-    <qrcode value="<?php echo $msg; ?>" ec="Q" style="width: 30mm;"></qrcode>
-    <qrcode value="<?php echo $msg; ?>" ec="H" style="width: 30mm;"></qrcode>
-    <br>
-    <h3>Message avec différentes largeurs</h3>
-    <qrcode value="<?php echo $msg; ?>" style="width: 20mm;"></qrcode>
-    <qrcode value="<?php echo $msg; ?>" style="width: 30mm;"></qrcode>
-    <qrcode value="<?php echo $msg; ?>" style="width: 40mm;"></qrcode>
-    <qrcode value="<?php echo $msg; ?>" style="width: 50mm;"></qrcode>
-    <br>
-    <h3>Message de différentes couleurs</h3>
-    <qrcode value="<?php echo $msg; ?>" style="width: 40mm; background-color: white; color: black;"></qrcode>
-    <qrcode value="<?php echo $msg; ?>" style="width: 40mm; background-color: yellow; color: red"></qrcode>
-    <qrcode value="<?php echo $msg; ?>" style="width: 40mm; background-color: #FFCCFF; color: #003300"></qrcode>
-    <qrcode value="<?php echo $msg; ?>" style="width: 40mm; background-color: #CCFFFF; color: #003333"></qrcode>
-    <br>
-    <h3>Message sans border</h3>
-    <qrcode value="<?php echo $msg; ?>" style="border: none; width: 40mm;"></qrcode>
-    <br>
-</page>
-<?php
-     $content = ob_get_clean();
-
-    // convert to PDF
-    require_once(dirname(__FILE__).'/../htdocs2pdf.class.php');
-    try
-    {
-        $html2pdf = new HTML2PDF('P', 'A4', 'fr');
-        $html2pdf->pdf->SetDisplayMode('fullpage');
-        $html2pdf->writeHTML($content, isset($_GET['vuehtml']));
-        $html2pdf->Output('qrcode.pdf');
-    }
-    catch(HTML2PDF_exception $e) {
-        echo $e;
-        exit;
-    }
diff --git a/html2pdf_v4.03/examples/radius.php b/html2pdf_v4.03/examples/radius.php
deleted file mode 100644
index 3b78c591..00000000
--- a/html2pdf_v4.03/examples/radius.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
- * HTML2PDF Librairy - example
- *
- * HTML => PDF convertor
- * distributed under the LGPL License
- *
- * @author      Laurent MINGUET <webmaster@html2pdf.fr>
- *
- * isset($_GET['vuehtml']) is not mandatory
- * it allow to display the result in the HTML format
- */
-    // get the HTML
-     ob_start();
-?>
-<style type="text/css">
-<!--
-.div { background: #CCDDCC; color: #002200; text-align: center; width: 70mm; height: 20mm; margin: 2mm; }
-.div1 { border: solid 2mm black; border-radius: 5mm;              -moz-border-radius: 5mm;              }
-.div2 { border: solid 2mm black; border-radius: 3mm 10mm 0mm 3mm; -moz-border-radius: 3mm 10mm 0mm 3mm; }
-.div3 { border: solid 2mm black; border-radius: 10mm / 7mm;       -moz-border-radius: 10mm / 7mm;       }
-.div4 { border: solid 6mm black; border-radius: 5mm / 10mm;       -moz-border-radius: 5mm / 10mm;       }
-.div5 { border: solid 5mm black; border-top: none; border-bottom: none; border-radius: 5mm; -moz-border-radius: 5mm; }
-.div6 { border: solid 5mm black; border-left: none; border-right: none; border-radius: 5mm; -moz-border-radius: 5mm; }
-.div7 { border: solid 5mm black; border-left: none; border-top: none; border-radius: 5mm;   -moz-border-radius: 5mm; }
-.div8 { border-radius: 8mm; -moz-border-radius: 8mm; border-left: solid 2mm #660000; border-top: solid 1mm #006600; border-right: solid 2mm #000066; border-bottom: solid 4mm #004444;}
--->
-</style>
-<page>
-    <div class="div div1">Exemple de div</div>
-    <div class="div div2">Exemple de div</div>
-    <div class="div div3">Exemple de div</div>
-    <div class="div div4">Exemple de div</div>
-    <div class="div div5">Exemple de div</div>
-    <div class="div div6">Exemple de div</div>
-    <div class="div div7">Exemple de div</div>
-    <div class="div div8">Exemple de div</div>
-</page>
-<?php
-     $content = ob_get_clean();
-
-    // convert to PDF
-    require_once(dirname(__FILE__).'/../htdocs2pdf.class.php');
-    try
-    {
-        $html2pdf = new HTML2PDF('P', 'A4', 'fr');
-        $html2pdf->writeHTML($content, isset($_GET['vuehtml']));
-        $html2pdf->Output('radius.pdf');
-    }
-    catch(HTML2PDF_exception $e) {
-        echo $e;
-        exit;
-    }
diff --git a/html2pdf_v4.03/examples/regle.php b/html2pdf_v4.03/examples/regle.php
deleted file mode 100644
index 3a0bd8af..00000000
--- a/html2pdf_v4.03/examples/regle.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/**
- * HTML2PDF Librairy - example
- *
- * HTML => PDF convertor
- * distributed under the LGPL License
- *
- * @author      Laurent MINGUET <webmaster@html2pdf.fr>
- *
- * isset($_GET['vuehtml']) is not mandatory
- * it allow to display the result in the HTML format
- */
-
-    // get the HTML
-     ob_start();
-?>
-<style type="text/css">
-<!--
-    table
-    {
-        padding: 0;
-        margin: 0;
-        border: none;
-        border-right: solid 0.2mm black;
-    }
-    td
-    {
-        padding: 0;
-        margin: 0;
-        border: none;
-    }
-
-    img
-    {
-        width: 10mm;
-    }
--->
-</style>
-<page>
-<table cellpadding="0" cellspacing="0"><tr>
-<?php for($k=0; $k<28; $k++) echo '<td><img src="./res/regle.png" alt="" ><br>'.$k.'</td>'; ?>
-</tr></table>
-</page>
-<?php
-     $content = ob_get_clean();
-
-    // convert to PDF
-    require_once(dirname(__FILE__).'/../htdocs2pdf.class.php');
-    try
-    {
-        $html2pdf = new HTML2PDF('L', 'A4', 'fr', true, 'UTF-8', 10);
-        $html2pdf->pdf->SetDisplayMode('fullpage');
-        $html2pdf->writeHTML($content, isset($_GET['vuehtml']));
-        $html2pdf->Output('regle.pdf');
-    }
-    catch(HTML2PDF_exception $e) {
-        echo $e;
-        exit;
-    }
diff --git a/html2pdf_v4.03/examples/res/about.php b/html2pdf_v4.03/examples/res/about.php
deleted file mode 100644
index d35eceaa..00000000
--- a/html2pdf_v4.03/examples/res/about.php
+++ /dev/null
@@ -1,241 +0,0 @@
-<style type="text/css">
-<!--
-    table.page_header {width: 100%; border: none; background-color: #DDDDFF; border-bottom: solid 1mm #AAAADD; padding: 2mm }
-    table.page_footer {width: 100%; border: none; background-color: #DDDDFF; border-top: solid 1mm #AAAADD; padding: 2mm}
-    div.note {border: solid 1mm #DDDDDD;background-color: #EEEEEE; padding: 2mm; border-radius: 2mm; width: 100%; }
-    ul.main { width: 95%; list-style-type: square; }
-    ul.main li { padding-bottom: 2mm; }
-    h1 { text-align: center; font-size: 20mm}
-    h3 { text-align: center; font-size: 14mm}
--->
-</style>
-<page backtop="14mm" backbottom="14mm" backleft="10mm" backright="10mm" style="font-size: 12pt">
-    <page_header>
-        <table class="page_header">
-            <tr>
-                <td style="width: 50%; text-align: left">
-                    A propos de ...
-                </td>
-                <td style="width: 50%; text-align: right">
-                    HTML2PDF v<?php echo __CLASS_HTML2PDF__; ?>
-                </td>
-            </tr>
-        </table>
-    </page_header>
-    <page_footer>
-        <table class="page_footer">
-            <tr>
-                <td style="width: 33%; text-align: left;">
-                    http://html2pdf.fr/
-                </td>
-                <td style="width: 34%; text-align: center">
-                    page [[page_cu]]/[[page_nb]]
-                </td>
-                <td style="width: 33%; text-align: right">
-                    &copy;Spipu 2008-2011
-                </td>
-            </tr>
-        </table>
-    </page_footer>
-    <bookmark title="Présentation" level="0" ></bookmark>
-    <br><br><br><br><br><br><br><br>
-    <h1>HTML2PDF</h1>
-    <h3>v<?php echo __CLASS_HTML2PDF__; ?></h3><br>
-    <br><br><br><br><br>
-    <div style="text-align: center; width: 100%;">
-        <br>
-        <img src="./res/logo.png" alt="Logo HTML2PDF" style="width: 150mm">
-        <br>
-    </div>
-    <br><br><br><br><br>
-    <div class="note">
-        HTML2PDF est un convertisseur de code HTML vers PDF écrit en PHP5, utilisant la librairie <a href="http://tcpdf.org">TCPDF.</a><br>
-        <br>
-        Il permet la conversion d'HTML et d'xHTML valide au format PDF, et est distribué sous licence LGPL.<br>
-        <br>
-        Cette librairie a été conçue pour gérer principalement les TABLE imbriquées afin de générer des factures, bon de livraison, et autres documents officiels.<br>
-        <br>
-        Vous pouvez télécharger la dernière version de HTML2PDF ici : <a href="http://html2pdf.fr/">http://html2pdf.fr/</a>.<br>
-    </div>
-</page>
-<page pageset="old">
-    <bookmark title="Sommaire" level="0" ></bookmark>
-    <!-- here will be the automatic index -->
-</page>
-<page pageset="old">
-    <bookmark title="Compatibilité" level="0" ></bookmark>
-    <bookmark title="Balises HTML" level="1" ></bookmark>
-    <bookmark title="Balises classiques" level="2" ></bookmark>
-    <div class="note">
-        La liste des balises HTML utilisables est la suivante :<br>
-    </div>
-    <br>
-    <ul class="main">
-        <li>&lt;a&gt; : Ceci est un lien vers <a href="http://html2pdf.fr">le site de HTML2PDF</a></li>
-        <li>&lt;b&gt;, &lt;strong&gt; : Ecrire en <b>gras</b>.</li>
-        <li>&lt;big&gt; : Ecrire plus <big>gros</big>.</li>
-        <li>&lt;br&gt; : Permet d'aller à la ligne</li>
-        <li>&lt;cite&gt; : <cite>Ceci est une citation</cite></li>
-        <li>&lt;code&gt;, &lt;pre&gt;</li>
-        <li>&lt;div&gt; :&nbsp;<div style="border: solid 1px #AADDAA; background: #DDFFDD; text-align: center; width: 50mm">exemple de DIV</div></li>
-        <li>&lt;em&gt;, &lt;i&gt;, &lt;samp&gt; : Ecrire en <em>italique</em>.</li>
-        <li>&lt;font&gt;, &lt;span&gt; : <font style="color: #000066; font-family: times">Exemple d'utilisation</font></li>
-        <li>&lt;h1&gt;, &lt;h2&gt;, &lt;h3&gt;, &lt;h4&gt;, &lt;h5&gt;, &lt;h6&gt;</li>
-        <li>&lt;hr&gt; : barre horizontale</li>
-        <li>&lt;img&gt; : <img src="./res/tcpdf_logo.jpg" style="width: 10mm"></li>
-        <li>&lt;p&gt; : Ecrire dans un paragraphe</li>
-        <li>&lt;s&gt; : Texte <s>barré</s></li>
-        <li>&lt;small&gt; : Ecrire plus <small>petit</small>.</li>
-        <li>&lt;style&gt;</li>
-        <li>&lt;sup&gt; : Exemple<sup>haut</sup>.</li>
-        <li>&lt;sub&gt; : Exemple<sub>bas</sub>.</li>
-        <li>&lt;u&gt; : Texte <u>souligné</u></li>
-        <li>&lt;table&gt;, &lt;td&gt;, &lt;th&gt;, &lt;tr&gt;, &lt;thead&gt;, &lt;tbody&gt;, &lt;tfoot&gt;, &lt;col&gt; </li>
-        <li>&lt;ol&gt;, &lt;ul&gt;, &lt;li&gt;</li>
-        <li>&lt;form&gt;, &lt;input&gt;, &lt;textarea&gt;, &lt;select&gt;, &lt;option&gt;</li>
-        <li>&lt;fieldset&gt;, &lt;legend&gt;</li>
-        <li>&lt;del&gt;, &lt;ins&gt;</li>
-        <li>&lt;draw&gt;, &lt;line&gt;, &lt;rect&gt;, &lt;circle&gt;, &lt;ellipse&gt;, &lt;polygone&gt;, &lt;polyline&gt;, &lt;path&gt;</li>
-    </ul>
-    <bookmark title="Balises spécifiques" level="2" ></bookmark>
-    <div class="note">
-        Les balises spécifiques suivantes ont été ajoutées :<br>
-    </div>
-    <br>
-    <ul class="main" >
-        <li>&lt;page&gt;</li>
-        <li>&lt;page_header&gt;</li>
-        <li>&lt;page_footer&gt;</li>
-        <li>&lt;nobreak&gt;</li>
-        <li>&lt;barcode&gt;</li>
-        <li>&lt;bookmark&gt;</li>
-        <li>&lt;qrcode&gt;</li>
-    </ul>
-</page>
-<page pageset="old">
-    <bookmark title="Styles CSS" level="1" ></bookmark>
-    <div class="note">
-        La liste des styles CSS utilisables est la suivante :<br>
-    </div>
-    <br>
-    <table style="width: 100%">
-        <tr style="vertical-align: top">
-            <td style="width: 50%">
-                <ul class="main">
-                    <li>color</li>
-                    <li>font-family</li>
-                    <li>font-weight</li>
-                    <li>font-style</li>
-                    <li>font-size</li>
-                    <li>text-decoration</li>
-                    <li>text-indent</li>
-                    <li>text-align</li>
-                    <li>text-transform</li>
-                    <li>vertical-align</li>
-                    <li>width</li>
-                    <li>height</li>
-                    <li>line-height</li>
-                    <li>padding</li>
-                    <li>padding-top</li>
-                    <li>padding-right</li>
-                    <li>padding-bottom</li>
-                    <li>padding-left</li>
-                    <li>margin</li>
-                    <li>margin-top</li>
-                    <li>margin-right</li>
-                    <li>margin-bottom</li>
-                    <li>margin-left</li>
-                    <li>position</li>
-                    <li>top</li>
-                    <li>bottom</li>
-                    <li>left</li>
-                    <li>right</li>
-                    <li>float</li>
-                    <li>rotate</li>
-                    <li>background</li>
-                    <li>background-color</li>
-                    <li>background-image</li>
-                    <li>background-position</li>
-                    <li>background-repeat</li>
-                </ul>
-            </td>
-            <td style="width: 50%">
-                <ul class="main">
-                    <li>border</li>
-                    <li>border-style</li>
-                    <li>border-color</li>
-                    <li>border-width</li>
-                    <li>border-collapse</li>
-                    <li>border-top</li>
-                    <li>border-top-style</li>
-                    <li>border-top-color</li>
-                    <li>border-top-width</li>
-                    <li>border-right</li>
-                    <li>border-right-style</li>
-                    <li>border-right-color</li>
-                    <li>border-right-width</li>
-                    <li>border-bottom</li>
-                    <li>border-bottom-style</li>
-                    <li>border-bottom-color</li>
-                    <li>border-bottom-width</li>
-                    <li>border-left</li>
-                    <li>border-left-style</li>
-                    <li>border-left-color</li>
-                    <li>border-left-width</li>
-                    <li>border-radius</li>
-                    <li>border-top-left-radius</li>
-                    <li>border-top-right-radius</li>
-                    <li>border-bottom-left-radius</li>
-                    <li>border-bottom-right-radius</li>
-                    <li>list-style</li>
-                    <li>list-style-type</li>
-                    <li>list-style-image</li>
-                </ul>
-            </td>
-        </tr>
-    </table>
-</page>
-<page pageset="old">
-    <bookmark title="Propriétés" level="1" ></bookmark>
-    <div class="note">
-        La liste des propriétés utilisables est la suivante :<br>
-    </div>
-    <br>
-    <table style="width: 100%">
-        <tr style="vertical-align: top">
-            <td style="width: 50%">
-                <ul class="main">
-                    <li>cellpadding</li>
-                    <li>cellspacing</li>
-                    <li>colspan</li>
-                    <li>rowspan</li>
-                    <li>width</li>
-                    <li>height</li>
-                </ul>
-            </td>
-            <td style="width: 50%">
-                <ul class="main">
-                    <li>align</li>
-                    <li>valign</li>
-                    <li>bgcolor</li>
-                    <li>bordercolor</li>
-                    <li>border</li>
-                    <li>type</li>
-                    <li>value</li>
-                </ul>
-            </td>
-        </tr>
-    </table>
-    <bookmark title="Limitations" level="0" ></bookmark>
-    <div class="note">
-        Cette librairie comporte des limitations :<br>
-    </div>
-    <br>
-    <ul class="main">
-        <li>Les float ne sont gérés que pour la balise IMG.</li>
-        <li>Elle ne permet généralement pas la conversion directe d'une page HTML en PDF, ni la conversion du résultat d'un WYSIWYG en PDF.</li>
-        <li>Cette librairie est là pour faciliter la génération de documents PDF, pas pour convertir n'importe quelle page HTML.</li>
-        <li>Les formulaires ne marchent pas avec tous les viewers PDFs...</li>
-        <li>Lisez bien le wiki : <a href="http://wiki.spipu.net/doku.php?id=html2pdf:Accueil">http://wiki.spipu.net/doku.php?id=html2pdf:Accueil</a>.</li>
-    </ul>
-</page>
\ No newline at end of file
diff --git a/html2pdf_v4.03/examples/res/bas_page.png b/html2pdf_v4.03/examples/res/bas_page.png
deleted file mode 100644
index 16d532ff..00000000
Binary files a/html2pdf_v4.03/examples/res/bas_page.png and /dev/null differ
diff --git a/html2pdf_v4.03/examples/res/exemple00.php b/html2pdf_v4.03/examples/res/exemple00.php
deleted file mode 100644
index 76bd3b9c..00000000
--- a/html2pdf_v4.03/examples/res/exemple00.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<style type="text/Css">
-<!--
-.test1
-{
-    border: solid 1px #FF0000;
-    background: #FFFFFF;
-    border-collapse: collapse;
-}
--->
-</style>
-<page style="font-size: 14px">
-    <span style="font-weight: bold; font-size: 18pt; color: #FF0000; font-family: Times">Bonjour, voici quelques exemples<br></span>
-    <br>
-    Retours à la ligne autorisés : &lt;br&gt;, &lt;br &gt;, &lt;br/&gt;, &lt;br /&gt; <br />
-    <br>
-    Barre horizontale &lt;hr&gt;<hr style="height: 4mm; background: #AA5500; border: solid 1mm #0055AA">
-    Exemple de lien : <a href="http://html2pdf.fr/" >le site HTML2PDF</a><br>
-    <br>
-    Image : <img src="./res/logo.gif" alt="Logo" width=150 /><br>
-    <br>
-    Alignement horizontal des DIVs et TABLEs<br />
-    <table style="text-align: center; border: solid 2px red; background: #FFEEEE;width: 40%" align="center"><tr><td style="width: 100%">Test 1</td></tr></table><br />
-    <table style="text-align: center; border: solid 2px red; background: #FFEEEE;width: 40%; margin: auto"><tr><td style="width: 100%">Test 2</td></tr></table><br />
-    <div style="text-align: center; border: solid 2px red; background: #FFEEEE;width: 40%; margin: auto">Test 3</div><br />
-    test de tableau imbriqué :<br>
-    <table border="1" bordercolor="#007" bgcolor="#AAAAAA" align="center">
-        <tr>
-            <td border="1">
-                <table style="border: solid 1px #FF0000; background: #FFFFFF; width: 100%; text-align: center">
-                    <tr>
-                        <th style="border: solid 1px #007700;width: 50%">C1 € «</th>
-                        <td style="border: solid 1px #007700;width: 50%">C2 € «</td>
-                    </tr>
-                    <tr>
-                        <td style="border: solid 1px #007700;width: 50%">D1 &euro; &laquo;</td>
-                        <th style="border: solid 1px #007700;width: 50%">D2 &euro; &laquo;</th>
-                    </tr>
-                </table>
-            </td>
-            <td border="1">A2</td>
-            <td border="1">AAAAAAAA</td>
-        </tr>
-        <tr>
-            <td border="1">B1</td>
-            <td border="1" rowspan="2">
-                <table class="test1">
-                    <tr>
-                        <td style="border: solid 2px #007700">E1</td>
-                        <td style="border: solid 2px #000077; padding: 2mm">
-                            <table style="border: solid 1px #445500">
-                                <tr>
-                                    <td>
-                                        <img src="./res/logo.gif" alt="Logo" width=100 />
-                                    </td>
-                                </tr>
-                            </table>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td style="border: solid 2px #770000">F1</td>
-                        <td style="border: solid 2px #007777">F2</td>
-                    </tr>
-                </table>
-            </td>
-            <td border="1"><barcode type="EAN13" value="45" style="width: 30mm; height: 6mm; font-size: 4mm"></barcode></td>
-        </tr>
-        <tr>
-            <td border="1"><barcode type="C39" value="HTML2PDF" label="none" style="width: 35mm; height: 8mm"></barcode></td>
-            <td border="1">A2</td>
-        </tr>
-    </table>
-    <br>
-    Exemple avec border et padding : <br>
-    <table style="border: solid 5mm #770000; padding: 5mm;" cellspacing="0" >
-        <tr>
-            <td style="border: solid 3mm #007700; padding: 2mm;"><img src="./res/off.png" alt="" style="width: 20mm"></td>
-        </tr>
-    </table>
-    <img src="./res/off.png" style="width: 10mm;"><img src="./res/off.png" style="width: 10mm;"><img src="./res/off.png" style="width: 10mm;"><img src="./res/off.png" style="width: 10mm;"><img src="./res/off.png" style="width: 10mm;"><br>
-    <br>
-    <table style="border: solid 1px #440000; width: 150px"  cellspacing="0"><tr><td style="width: 100%">Largeur : 150px</td></tr></table><br>
-    <table style="border: solid 1px #440000; width: 150pt"  cellspacing="0"><tr><td style="width: 100%">Largeur : 150pt</td></tr></table><br>
-    <table style="border: solid 1px #440000; width: 100mm"  cellspacing="0"><tr><td style="width: 100%">Largeur : 100mm</td></tr></table><br>
-    <table style="border: solid 1px #440000; width: 5in"    cellspacing="0"><tr><td style="width: 100%">Largeur : 5in</td></tr></table><br>
-    <table style="border: solid 1px #440000; width: 80%"    cellspacing="0"><tr><td style="width: 100%">Largeur : 80% </td></tr></table><br>
-</page>
\ No newline at end of file
diff --git a/html2pdf_v4.03/examples/res/exemple01.php b/html2pdf_v4.03/examples/res/exemple01.php
deleted file mode 100644
index 49cb76b4..00000000
--- a/html2pdf_v4.03/examples/res/exemple01.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<style type="text/css">
-<!--
-table.morpion
-{
-    border:        dashed 1px #444444;
-}
-
-table.morpion td
-{
-    font-size:    15pt;
-    font-weight:  bold;
-    border:       solid 1px #000000;
-    padding:      1px;
-    text-align:   center;
-    width:        25px;
-}
-
-table.morpion td.j1 { color: #0A0; }
-table.morpion td.j2 { color: #A00; }
-
--->
-</style>
-<page style="font-size: 10pt">
-    <span style="font-weight: bold; font-size: 20pt; color: #F00">Bonjour, voici quelques exemples</span><br>
-    Bonjour, ceci est un test <b>de gras</b>, <i>d'italic</i>, <b><i>et des 2 ensembles</i></b>.<br>
-    <br>
-    <span style="background: red; color: white;">Ceci est un message important</span><br>
-    <br>
-    <small>Texte écrit avec small</small>, Texte écrit normalement, <big>Texte écrit avec big</big><br>
-    <span style="font-size: 20px">A<sub>test d'<b>indice</b></sub> et N<sup>test d'<b>exposant</b></sup>,
-        test<sub>test<sub>test</sub></sub>,
-        test<sup>test<sup>test</sup></sup>,
-        test<sub>test<sup>test</sup></sub>.
-    </span><br>
-    <br>
-    <table align="center" style="border-radius: 6mm; border-top: solid 3mm #000077; border-right: solid 2mm #007700; border-bottom: solid 1mm #770000;    border-left: solid 2mm #007777;    background: #DDDDAA;" ><tr><td style="width: 100mm; height: 20mm; text-align: center; ">Coucou ! ceci est un border solid avec un radius !!! </td></tr></table>
-    <br>
-    <table align="center" style="border-radius: 6mm; border: none; background: #DDDDAA;" ><tr><td style="width: 100mm; height: 20mm; text-align: center; ">Coucou ! ceci est un background avec un radius !!! </td></tr></table>
-    <br>
-    <table align="center" style="border: solid 1px #000000;"><tr><td style="border-top: solid 4mm #000077;  border-right: solid 3mm #007700;  border-bottom: solid 2mm #770000;  border-left: solid  1mm #007777; padding: 2mm 4mm 6mm 8mm; width: 100mm; background: #FFDDDD">Coucou ! ceci est un border solid</td></tr></table><br>
-    <table align="center" style="border: solid 1px #000000;"><tr><td style="border-top: dotted 4mm #000077; border-right: dotted 3mm #007700; border-bottom: dotted 2mm #770000; border-left: dotted 1mm #007777; padding: 2mm 4mm 6mm 8mm; width: 100mm; background: #FFDDDD">Coucou ! ceci est un border dotted</td></tr></table><br>
-    <table align="center" style="border: solid 1px #000000;"><tr><td style="border-top: dashed 4mm #000077; border-right: dashed 3mm #007700; border-bottom: dashed 2mm #770000; border-left: dashed 1mm #007777; padding: 2mm 4mm 6mm 8mm; width: 100mm; background: #FFDDDD">Coucou ! ceci est un border dashed</td></tr></table><br>
-    <table align="center" style="border: solid 1px #000000;"><tr><td style="border-top: double 4mm #000077; border-right: double 3mm #007700; border-bottom: double 2mm #770000; border-left: double 1mm #007777; padding: 2mm 4mm 6mm 8mm; width: 100mm; background: #FFDDDD">Coucou ! ceci est un border double</td></tr></table><br>
-<?php $back = 'background-image: url(./res/off.png); background-position: left top; background-repeat: repeat; '; ?>
-    <table style="background: #FFAAAA; color: #000022; border: 3px solid #555555;">
-        <tr>
-            <td style="width: 40mm; border: solid 1px #000000; <?php echo $back; ?>color: #003300">Case A1</td>
-            <td style="width: 50mm; border: solid 1px #000000; <?php echo $back; ?>font-weight: bold;">Case A2</td>
-            <td style="width: 60mm; border: solid 1px #000000; <?php echo $back; ?>font-size: 20px;">Case A3</td>
-        </tr>
-        <tr>
-            <td style="border: solid 1px #000000; text-align: left;   <?php echo $back; ?>vertical-align: top; ">Case B1</td>
-            <td style="border: solid 1px #000000; text-align: center; <?php echo $back; ?>vertical-align: middle; height: 20mm">Case B2<hr style="color: #22AA22">test de hr</td>
-            <td style="border: solid 1px #000000; text-align: right;  <?php echo $back; ?>vertical-align: bottom; border-radius: 3mm; ">Case B3</td>
-        </tr>
-    </table>
-    <br>
-    <table style="border: solid 2px #550000; background: #000022 url(./res/logo.png) center center no-repeat; color: #FFFFFF;">
-        <tr >
-            <td style="border: solid 1px #AAAAAA;">Case A1<BR>avec tests diverses</td>
-            <td style="border: solid 1px #AAAAAA;">Case A2</td>
-            <td style="border: solid 1px #AAAAAA;">Case A3 classic</td>
-        </tr>
-        <tr>
-            <td style="border: solid 1px #AAAAAA;">Case B1<br>toto</td>
-            <td style="border: solid 1px #AAAAAA;background: #FF0000">Case B2</td>
-            <td style="border: solid 1px #AAAAAA;">Case B3</td>
-        </tr>
-    </table>
-    <br>
-    <table class="morpion" cellspacing="5px">
-        <tr>
-            <td class="j1">X</td>
-            <td class="j2">O</td>
-            <td class="j1">X</td>
-        </tr>
-        <tr>
-            <td class="j2">O</td>
-            <td class="j1">X</td>
-            <td ></td>
-        </tr>
-        <tr>
-            <td class="j2">O</td>
-            <td></td>
-            <td class="j1">X</td>
-        </tr>
-    </table>
-    <br>
-    <table style="border: dotted 1mm #FFFFFF; background: #AAAAFF">
-        <tr>
-            <td style="width: 42mm; text-align: center;font-size: 5mm">
-                Ceci est un test
-            </td>
-        </tr>
-    </table>
-</page>
\ No newline at end of file
diff --git a/html2pdf_v4.03/examples/res/exemple02.php b/html2pdf_v4.03/examples/res/exemple02.php
deleted file mode 100644
index 8b3ee14a..00000000
--- a/html2pdf_v4.03/examples/res/exemple02.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-$content = 'A Test overflow<br>A Test overflow<br>A Test overflow<br>
-<img src="./res/logo.gif" alt="logo" style="width: XXXmm"><br>
-B Test overflow<br>B Test overflow<br>B Test overflow<br>
-<img src="./res/logo.gif" alt="logo" style="width: XXXmm"><br>
-C Test overflow<br>C Test overflow<br>C Test overflow<br>';
-?>
-<style type="text/css">
-<!--
-div.zone
-{
-    border: solid 2mm #66AACC;
-    border-radius: 3mm;
-    padding: 1mm;
-    background-color: #FFEEEE;
-    color: #440000;
-}
-div.zone_over
-{
-    width: 30mm;
-    height: 35mm;
-    overflow: hidden;
-}
-
--->
-</style>
-<page style="font-size: 10pt">
-    <span style="font-size: 16pt ; font-weight: bold">Démonstration des images</span><br>
-    <br>
-    <b>Dans un tableau :</b><br>
-    <table style="width: 50%;border: solid 3px #5544DD" align="center">
-        <tr>
-            <td style="width: 30%; text-align: left; ">Text à gauche<br>avec retour à<br>la ligne</td>
-            <td style="width: 40%; text-align: center;"><img src="./res/logo.gif" alt="" ><br><i>légende</i></td>
-            <td style="width: 30%; text-align: right; ">Texte à droite</td>
-        </tr>
-    </table>
-    <br>
-    Texte <span style="text-decoration: underline">souligné</span>,
-    texte <span style="text-decoration: overline">surligné</span>,
-    texte <span style="text-decoration: line-through">barré</span>,
-    texte <span style="text-decoration: underline overline line-through">avec les trois</span>.<br>
-    <br>
-    <b>Dans un texte :</b><br>
-    texte à la suite d'une image, <img src="./res/logo.gif" alt="" style="height: 10mm">
-    texte à la suite d'une image, répétitif car besoin d'un retour à la ligne
-    texte à la suite d'une image, répétitif car besoin d'un retour à la ligne
-    texte à la suite d'une image, répétitif car besoin d'un retour à la ligne
-    texte à la suite d'une image, répétitif car besoin d'un retour à la ligne<br>
-    <br>
-    <br>
-    Test différentes tailles texte
-    <span style="font-size: 18pt;">Test Size</span>
-    <span style="font-size: 16pt;">Test Size</span>
-    <span style="font-size: 14pt;">Test Size</span>
-    <span style="font-size: 12pt;">Test Size</span>
-    Test différentes tailles texte, répétitif car besoin d'un retour à la ligne
-    Test différentes tailles texte, répétitif car besoin d'un retour à la ligne
-    Test différentes tailles texte, répétitif car besoin d'un retour à la ligne
-    Test différentes tailles texte, répétitif car besoin d'un retour à la ligne
-    <br>
-    <br>
-    <b>Exemple de couleur : </b><br>
-    <span style="color: RGB(255, 0, 0)">Texte de couleur</span><br>
-    <span style="color: RGB(0., 1., 0.)">Texte de couleur</span><br>
-    <span style="color: RGB(0, 0, 100%)">Texte de couleur</span><br>
-    <span style="color: CMYK(255, 0, 0, 0)">Texte de couleur</span><br>
-    <span style="color: CMYK(0., 1., 0., 0.)">Texte de couleur</span><br>
-    <span style="color: CMYK(0, 0, 100%, 0)">Texte de couleur</span><br>
-    <span style="color: CMYK(0, 0, 0, 255)">Texte de couleur</span><br>
-    <br>
-    <table>
-        <tr style="vertical-align: top">
-            <td>
-                <u>Exemple 0 :</u><br><br>
-                <div class="zone" ><?php echo str_replace('XXX', '40', $content); ?></div>
-                sans overflow
-            </td>
-            <td>
-                <u>Exemple 1 :</u><br><br>
-                <div class="zone zone_over" style="text-align: left; vertical-align: top; "><?php echo str_replace('XXX', '40', $content); ?></div>
-                hidden left top
-            </td>
-            <td>
-                <u>Exemple 2 :</u><br><br>
-                <div class="zone zone_over" style="text-align: center; vertical-align: middle;"><?php echo str_replace('XXX', '40', $content); ?></div>
-                hidden center middle
-            </td>
-            <td>
-                <u>Exemple 3 :</u><br><br>
-                <div class="zone zone_over" style="text-align: right; vertical-align: bottom;"><?php echo str_replace('XXX', '40', $content); ?></div>
-                hidden right bottom
-            </td>
-        </tr>
-        <tr style="vertical-align: top">
-            <td>
-                <u>Exemple 0 :</u><br><br>
-                <div class="zone" ><?php echo str_replace('XXX', '20', $content); ?></div>
-                sans overflow
-            </td>
-            <td>
-                <u>Exemple 1 :</u><br><br>
-                <div class="zone zone_over" style="text-align: left; vertical-align: top; "><?php echo str_replace('XXX', '20', $content); ?></div>
-                hidden left top
-            </td>
-            <td>
-                <u>Exemple 2 :</u><br><br>
-                <div class="zone zone_over" style="text-align: center; vertical-align: middle;"><?php echo str_replace('XXX', '20', $content); ?></div>
-                hidden center middle
-            </td>
-            <td>
-                <u>Exemple 3 :</u><br><br>
-                <div class="zone zone_over" style="text-align: right; vertical-align: bottom;"><?php echo str_replace('XXX', '20', $content); ?></div>
-                hidden right bottom
-            </td>
-        </tr>
-    </table>
-</page>
\ No newline at end of file
diff --git a/html2pdf_v4.03/examples/res/exemple03.php b/html2pdf_v4.03/examples/res/exemple03.php
deleted file mode 100644
index 1ff72fbe..00000000
--- a/html2pdf_v4.03/examples/res/exemple03.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<page backtop="10mm" backbottom="10mm" backleft="20mm" backright="20mm">
-    <page_header>
-        <table style="width: 100%; border: solid 1px black;">
-            <tr>
-                <td style="text-align: left;    width: 33%">html2pdf</td>
-                <td style="text-align: center;    width: 34%">Test d'header</td>
-                <td style="text-align: right;    width: 33%"><?php echo date('d/m/Y'); ?></td>
-            </tr>
-        </table>
-    </page_header>
-    <page_footer>
-        <table style="width: 100%; border: solid 1px black;">
-            <tr>
-                <td style="text-align: left;    width: 50%">html2pdf.fr</td>
-                <td style="text-align: right;    width: 50%">page [[page_cu]]/[[page_nb]]</td>
-            </tr>
-        </table>
-    </page_footer>
-    <span style="font-size: 20px; font-weight: bold">Démonstration des retour à la ligne automatique, ainsi que des sauts de page automatique</span><br>
-    <br>
-    <br>
-    <table style="width: 80%;border: solid 1px #5544DD; border-collapse: collapse" align="center">
-        <thead>
-            <tr>
-                <th style="width: 30%; text-align: left; border: solid 1px #337722; background: #CCFFCC">Header 1</th>
-                <th style="width: 30%; text-align: left; border: solid 1px #337722; background: #CCFFCC">Header 2</th>
-            </tr>
-        </thead>
-        <tbody>
-<?php
-    for ($k=0; $k<13; $k++) {
-?>
-            <tr>
-                <td style="width: 30%; text-align: left; border: solid 1px #55DD44">
-                    test de texte assez long pour engendrer des retours à la ligne automatique...
-                    a b c d e f g h i j k l m n o p q r s t u v w x y z
-                    a b c d e f g h i j k l m n o p q r s t u v w x y z
-                </td>
-                <td style="width: 70%; text-align: left; border: solid 1px #55DD44">
-                    test de texte assez long pour engendrer des retours à la ligne automatique...
-                    a b c d e f g h i j k l m n o p q r s t u v w x y z
-                    a b c d e f g h i j k l m n o p q r s t u v w x y z
-
-                </td>
-            </tr>
-<?php
-    }
-?>
-        </tbody>
-        <tfoot>
-            <tr>
-                <th style="width: 30%; text-align: left; border: solid 1px #337722; background: #CCFFCC">Footer 1</th>
-                <th style="width: 30%; text-align: left; border: solid 1px #337722; background: #CCFFCC">Footer 2</th>
-            </tr>
-        </tfoot>
-    </table>
-    <br>
-    Ca marche !!!<br>
-    refaisons un test : <br>
-    <table style="width: 80%;border: solid 1px #5544DD">
-<?php
-    for ($k=0; $k<12; $k++) {
-?>
-        <tr>
-            <td style="width: 30%; text-align: left; border: solid 1px #55DD44">
-                test de texte assez long pour engendrer des retours à la ligne automatique...
-                a b c d e f g h i j k l m n o p q r s t u v w x y z
-                a b c d e f g h i j k l m n o p q r s t u v w x y z
-            </td>
-            <td style="width: 70%; text-align: left; border: solid 1px #55DD44">
-                test de texte assez long pour engendrer des retours à la ligne automatique...
-                a b c d e f g h i j k l m n o p q r s t u v w x y z
-                a b c d e f g h i j k l m n o p q r s t u v w x y z
-
-            </td>
-        </tr>
-<?php
-    }
-?>
-    </table>
-    <br>
-    Ca marche toujours !<br>
-    De plus, vous pouvez faire des sauts de page manuellement en utilisant les balises &lt;page&gt; &lt;/page&gt;, comme ici par exemple :
-</page>
-<page pageset="old">
-    Nouvelle page !!!!
-</page>
\ No newline at end of file
diff --git a/html2pdf_v4.03/examples/res/exemple04.php b/html2pdf_v4.03/examples/res/exemple04.php
deleted file mode 100644
index 1a0e4a56..00000000
--- a/html2pdf_v4.03/examples/res/exemple04.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<style type="text/css">
-<!--
-div.special { margin: auto; width:95%; border:1px solid #000000; padding: 2px; }
-div.special table { width:100%; border:1px solid #000000; font-size:10px; border-collapse:collapse; }
-.topLeftRight     { border-top:1px solid #000; border-left:1px solid #000; border-right:1px solid #000;}
-.topLeftBottom    { border-top:1px solid #000; border-left:1px solid #000; border-bottom:1px solid #000; }
-.topLeft          { border-top:1px solid #000; border-left:1px solid #000; }
-.bottomLeft       { border-bottom:1px solid #000; border-left:1px solid #000; }
-.topRight         { border-top:1px solid #000; border-right:1px solid #000; }
-.bottomRight      { border-bottom:1px solid #000; border-right:1px solid #000; }
-.topRightBottom   { border-top:1px solid #000; border-bottom:1px solid #000; border-right:1px solid #000; }
--->
-</style>
-<page style="font-size: 16px" >
-    Vous pouvez choisir le format et l'orientation de votre document, en utilisant ceci :<br>
-    <br>
-    &lt;page orientation="portrait" format="A5" &gt; <i>A5 en portrait</i> &lt;/page&gt; <br>
-    <br>
-    &lt;page orientation="paysage" format="100x200" &gt; <i>100mm x 200mm en paysage</i> &lt;/page&gt;<br>
-    <br>
-    En voici un petit exemple !
-</page>
-<page orientation="paysage" style="font-size: 18px">
-    Ceci est une page en paysage<br>
-    <table style="width: 100%; border: solid 1px #FFFFFF;">
-        <tr>
-            <td style="width: 30%; border: solid 1px #FF0000;">AAA</td>
-            <td style="width: 40%; border: solid 1px #00FF00;">BBB</td>
-            <td style="width: 30%; border: solid 1px #0000FF;">CCC</td>
-        </tr>
-        <tr>
-            <td style="width: 30%; border: solid 1px #FF0000;">AAA</td>
-            <td style="width: 40%; border: solid 1px #00FF00;">BBB</td>
-            <td style="width: 30%; border: solid 1px #0000FF;">CCC</td>
-        </tr>
-        <tr>
-            <td style="width: 30%; border: solid 1px #FF0000;">AAA</td>
-            <td style="width: 40%; border: solid 1px #00FF00;">BBB</td>
-            <td style="width: 30%; border: solid 1px #0000FF;">CCC</td>
-        </tr>
-    </table>
-    <div style="width: 70%; border: solid 1mm #770000; margin: 1mm; padding: 2mm; font-size: 4mm; line-height: normal; text-align: justify">
-        <img src="./res/logo.gif" alt="logo html2pdf" style="float: left; width: 60mm; margin: 2mm;">
-        Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed elementum, nibh eu ultricies scelerisque, est lorem dignissim elit, quis tempus tortor eros non ipsum. Mauris convallis augue ac sapien. In scelerisque dignissim elit. Donec consequat semper lectus. Sed in quam. Nunc molestie hendrerit ipsum. Curabitur elit risus, rhoncus ut, mattis a, convallis eu, neque. Morbi luctus est sit amet nunc. In nisl. Donec magna libero, aliquet eu, vestibulum ut, mollis sed, felis.
-        Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed elementum, nibh eu ultricies scelerisque, est lorem dignissim elit, quis tempus tortor eros non ipsum. Mauris convallis augue ac sapien. In scelerisque dignissim elit. Donec consequat semper lectus. Sed in quam. Nunc molestie hendrerit ipsum. Curabitur elit risus, rhoncus ut, mattis a, convallis eu, neque. Morbi luctus est sit amet nunc. In nisl. Donec magna libero, aliquet eu, vestibulum ut, mollis sed, felis.
-    </div>
-    <div style="width: 70%; border: solid 1mm #770000; margin: 1mm; padding: 2mm; font-size: 4mm; line-height: 150%;text-align: right;">
-        <img src="./res/logo.gif" alt="logo html2pdf" style="float: right; width: 60mm; margin: 2mm; ">
-        Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed elementum, nibh eu ultricies scelerisque, est lorem dignissim elit, quis tempus tortor eros non ipsum. Mauris convallis augue ac sapien. In scelerisque dignissim elit. Donec consequat semper lectus. Sed in quam. Nunc molestie hendrerit ipsum. Curabitur elit risus, rhoncus ut, mattis a, convallis eu, neque. Morbi luctus est sit amet nunc. In nisl. Donec magna libero, aliquet eu, vestibulum ut, mollis sed, felis.
-    </div>
-    <fieldset style="width: 70%; border: solid 1mm #770000; margin: 1mm; padding: 2mm; padding-top: 0mm; font-size: 4mm; line-height: normal; background: #FFFFFF;">
-        <legend style=" background: #FFFFFF; padding: 1; border: solid 1px #440000;">Ceci est un exemple de fieldset</legend>
-        <img src="./res/logo.gif" alt="logo html2pdf" style="float: left; width: 60mm; margin: 2mm; ">
-        Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed elementum, nibh eu ultricies scelerisque, est lorem dignissim elit, quis tempus tortor eros non ipsum. Mauris convallis augue ac sapien. In scelerisque dignissim elit. Donec consequat semper lectus. Sed in quam. Nunc molestie hendrerit ipsum. Curabitur elit risus, rhoncus ut, mattis a, convallis eu, neque. Morbi luctus est sit amet nunc. In nisl. Donec magna libero, aliquet eu, vestibulum ut, mollis sed, felis.
-        Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed elementum, nibh eu ultricies scelerisque, est lorem dignissim elit, quis tempus tortor eros non ipsum. Mauris convallis augue ac sapien. In scelerisque dignissim elit. Donec consequat semper lectus. Sed in quam. Nunc molestie hendrerit ipsum. Curabitur elit risus, rhoncus ut, mattis a, convallis eu, neque. Morbi luctus est sit amet nunc. In nisl. Donec magna libero, aliquet eu, vestibulum ut, mollis sed, felis.
-    </fieldset>
-</page>
-<page orientation="portrait" format="150x200" style="font-size: 18px">
-    Ceci est une page en portrait de 150mm x 200mm<br>
-    <table style="width: 100%; border: solid 1px #FFFFFF;">
-        <tr>
-            <td style="width: 30%; border: solid 1px #FF0000;">AAA</td>
-            <td style="width: 40%; border: solid 1px #00FF00;">BBB</td>
-            <td style="width: 30%; border: solid 1px #0000FF;">CCC</td>
-        </tr>
-        <tr>
-            <td style="width: 30%; border: solid 1px #FF0000;">AAA</td>
-            <td style="width: 40%; border: solid 1px #00FF00;">BBB</td>
-            <td style="width: 30%; border: solid 1px #0000FF;">CCC</td>
-        </tr>
-        <tr>
-            <td style="width: 30%; border: solid 1px #FF0000;">AAA</td>
-            <td style="width: 40%; border: solid 1px #00FF00;">BBB</td>
-            <td style="width: 30%; border: solid 1px #0000FF;">CCC</td>
-        </tr>
-    </table>
-    <br>
-    <div class="special">
-        <table>
-            <tr>
-                <td colspan="2" class="topLeftRight" style="width: 100%; text-align:left;border-bottom:1px dashed #000000">blabla blabla</td>
-            </tr>
-            <tr>
-                <td class="bottomLeft" style="width:70%;border-right:1px dashed #000000;text-align:left;">blabla blabla</td>
-                <td class="bottomRight" style="width: 30%; text-align:left;vertical-align:top;">Date :<br /> Signature :</td>
-            </tr>
-        </table>
-    </div>
-</page>
\ No newline at end of file
diff --git a/html2pdf_v4.03/examples/res/exemple05.php b/html2pdf_v4.03/examples/res/exemple05.php
deleted file mode 100644
index d92548ed..00000000
--- a/html2pdf_v4.03/examples/res/exemple05.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<style type="text/css">
-<!--
-table
-{
-    width:  100%;
-    border: solid 1px #5544DD;
-}
-
-th
-{
-    text-align: center;
-    border: solid 1px #113300;
-    background: #EEFFEE;
-}
-
-td
-{
-    text-align: left;
-    border: solid 1px #55DD44;
-}
-
-td.col1
-{
-    border: solid 1px red;
-    text-align: right;
-}
-
--->
-</style>
-<span style="font-size: 20px; font-weight: bold">Démonstration des retour à la ligne automatique, ainsi que des sauts de page automatique<br></span>
-<br>
-<br>
-<table>
-    <col style="width: 5%" class="col1">
-    <col style="width: 25%">
-    <col style="width: 30%">
-    <col style="width: 40%">
-    <thead>
-        <tr>
-            <th rowspan="2">n°</th>
-            <th colspan="3" style="font-size: 16px;">
-                Titre du tableau
-            </th>
-        </tr>
-        <tr>
-            <th>Colonne 1</th>
-            <th>Colonne 2</th>
-            <th>Colonne 3</th>
-        </tr>
-    </thead>
-<?php
-    for ($k=0; $k<50; $k++) {
-?>
-    <tr>
-        <td><?php echo $k; ?></td>
-        <td>test de texte assez long pour engendrer des retours à la ligne automatique...</td>
-        <td>test de texte assez long pour engendrer des retours à la ligne automatique...</td>
-        <td>test de texte assez long pour engendrer des retours à la ligne automatique...</td>
-    </tr>
-<?php
-    }
-?>
-    <tfoot>
-        <tr>
-            <th colspan="4" style="font-size: 16px;">
-                bas du tableau
-            </th>
-        </tr>
-    </tfoot>
-</table>
-Cool non ?<br>
\ No newline at end of file
diff --git a/html2pdf_v4.03/examples/res/exemple06.css b/html2pdf_v4.03/examples/res/exemple06.css
deleted file mode 100644
index 7825066f..00000000
--- a/html2pdf_v4.03/examples/res/exemple06.css
+++ /dev/null
@@ -1,12 +0,0 @@
-.titre
-{
-    text-decoration: underline;
-}
-
-*    {color: #FF0000; }
-H1   {color: #AA0055; }
-H2   {color: #990066; }
-H3   {color: #880077; }
-H4   {color: #770088; }
-H5   {color: #660099; }
-H6   {color: #5500AA; }
\ No newline at end of file
diff --git a/html2pdf_v4.03/examples/res/exemple06.php b/html2pdf_v4.03/examples/res/exemple06.php
deleted file mode 100644
index a904e444..00000000
--- a/html2pdf_v4.03/examples/res/exemple06.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<link type="text/css" href="./res/exemple06.css" rel="stylesheet" >
-<style type="text/css">
-<!--
-/* commentaire dans un css */
-table, td { border: solid 1px #000000; color: #0000AA; }
-td.col1   { color: #00AA00; }
-
-/* autre commentaire */
-table.liste         { border: solid 2px #FF0000; }
-table.liste td      { background: #DDDDDD; }
-table.liste td.col1 { color: #FF0000; }
--->
-</style>
-<page>
-    <table>
-        <tr>
-            <td>Ceci est un</td>
-            <td class="col1">test de style</td>
-        </tr>
-    </table>
-    <br>
-    <table class="liste">
-        <tr>
-            <td>Ceci est un</td>
-            <td class="col1">test de style</td>
-        </tr>
-    </table>
-    <br>
-    <H1>Essai de titre en H1</H1>
-    <H2>Essai de titre en H2</H2>
-    <H3>Essai de titre en H3</H3>
-    <H4>Essai de titre en H4</H4>
-    <H5>Essai de titre en H5</H5>
-    <H6>Essai de titre en H6</H6>
-    <H6 class="titre">Essai de titre en H6</H6>
-    <H5 class="titre">Essai de titre en H5</H5>
-    <H4 class="titre">Essai de titre en H4</H4>
-    <H3 class="titre">Essai de titre en H3</H3>
-    <H2 class="titre">Essai de titre en H2</H2>
-    <H1 class="titre">Essai de titre en H1</H1>
-    <br>
-    <s>Texte barré !</s><br>
-    <br>
-    <span>Texte avec la couleur par défault (style *)</span><br>
-</page>
\ No newline at end of file
diff --git a/html2pdf_v4.03/examples/res/exemple07a.php b/html2pdf_v4.03/examples/res/exemple07a.php
deleted file mode 100644
index 57c4d823..00000000
--- a/html2pdf_v4.03/examples/res/exemple07a.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<style type="text/css">
-<!--
-table { vertical-align: top; }
-tr    { vertical-align: top; }
-td    { vertical-align: top; }
-}
--->
-</style>
-<page backcolor="#FEFEFE" backimg="./res/bas_page.png" backimgx="center" backimgy="bottom" backimgw="100%" backtop="0" backbottom="30mm" footer="date;heure;page" style="font-size: 12pt">
-    <bookmark title="Lettre" level="0" ></bookmark>
-    <table cellspacing="0" style="width: 100%; text-align: center; font-size: 14px">
-        <tr>
-            <td style="width: 75%;">
-            </td>
-            <td style="width: 25%; color: #444444;">
-                <img style="width: 100%;" src="./res/logo.gif" alt="Logo"><br>
-                RELATION CLIENT
-            </td>
-        </tr>
-    </table>
-    <br>
-    <br>
-    <table cellspacing="0" style="width: 100%; text-align: left; font-size: 11pt;">
-        <tr>
-            <td style="width:50%;"></td>
-            <td style="width:14%; ">Client :</td>
-            <td style="width:36%">M. Albert Dupont</td>
-        </tr>
-        <tr>
-            <td style="width:50%;"></td>
-            <td style="width:14%; ">Adresse :</td>
-            <td style="width:36%">
-                Résidence perdue<br>
-                1, rue sans nom<br>
-                00 000 - Pas de Ville<br>
-            </td>
-        </tr>
-        <tr>
-            <td style="width:50%;"></td>
-            <td style="width:14%; ">Email :</td>
-            <td style="width:36%">nomail@domain.com</td>
-        </tr>
-        <tr>
-            <td style="width:50%;"></td>
-            <td style="width:14%; ">Tel :</td>
-            <td style="width:36%">33 (0) 1 00 00 00 00</td>
-        </tr>
-    </table>
-    <br>
-    <br>
-    <table cellspacing="0" style="width: 100%; text-align: left;font-size: 10pt">
-        <tr>
-            <td style="width:50%;"></td>
-            <td style="width:50%; ">Spipu Ville, le <?php echo date('d/m/Y'); ?></td>
-        </tr>
-    </table>
-    <br>
-    <i>
-        <b><u>Objet </u>: &laquo; Bon de Retour &raquo;</b><br>
-        Compte client : 00C4520100A<br>
-        Référence du Dossier : 71326<br>
-    </i>
-    <br>
-    <br>
-    Madame, Monsieur, Cher Client,<br>
-    <br>
-    <br>
-    Nous souhaitons vous informer que le dossier <b>71326</b> concernant un &laquo; Bon de Retour &raquo; pour les articles suivants a été accepté.<br>
-    <br>
-    <table cellspacing="0" style="width: 100%; border: solid 1px black; background: #E7E7E7; text-align: center; font-size: 10pt;">
-        <tr>
-            <th style="width: 12%">Produit</th>
-            <th style="width: 52%">Désignation</th>
-            <th style="width: 13%">Prix Unitaire</th>
-            <th style="width: 10%">Quantité</th>
-            <th style="width: 13%">Prix Net</th>
-        </tr>
-    </table>
-<?php
-    $nb = rand(5, 11);
-    $produits = array();
-    $total = 0;
-    for ($k=0; $k<$nb; $k++) {
-        $num = rand(100000, 999999);
-        $nom = "le produit n°".rand(1, 100);
-        $qua = rand(1, 20);
-        $prix = rand(100, 9999)/100.;
-        $total+= $prix*$qua;
-        $produits[] = array($num, $nom, $qua, $prix, rand(0, $qua));
-?>
-    <table cellspacing="0" style="width: 100%; border: solid 1px black; background: #F7F7F7; text-align: center; font-size: 10pt;">
-        <tr>
-            <td style="width: 12%; text-align: left"><?php echo $num; ?></td>
-            <td style="width: 52%; text-align: left"><?php echo $nom; ?></td>
-            <td style="width: 13%; text-align: right"><?php echo number_format($prix, 2, ',', ' '); ?> &euro;</td>
-            <td style="width: 10%"><?php echo $qua; ?></td>
-            <td style="width: 13%; text-align: right;"><?php echo number_format($prix*$qua, 2, ',', ' '); ?> &euro;</td>
-        </tr>
-    </table>
-<?php
-    }
-?>
-    <table cellspacing="0" style="width: 100%; border: solid 1px black; background: #E7E7E7; text-align: center; font-size: 10pt;">
-        <tr>
-            <th style="width: 87%; text-align: right;">Total : </th>
-            <th style="width: 13%; text-align: right;"><?php echo number_format($total, 2, ',', ' '); ?> &euro;</th>
-        </tr>
-    </table>
-    <br>
-    Cette reprise concerne la quantité et les matériels dont la référence figure sur le <a href="#document_reprise">document de reprise joint</a>.<br>
-    Nous vous demandons de nous retourner ces produits en parfait état et dans leur emballage d'origine.<br>
-    <br>
-    Nous vous demandons également de coller impérativement l'autorisation de reprise jointe, sur le colis à reprendre afin de faciliter le traitement à l'entrepôt.<br>
-    <br>
-    Notre Service Clients ne manquera pas de revenir vers vous dès que l'avoir de ces matériels sera établi.<br>
-    <nobreak>
-        <br>
-        Dans cette attente, nous vous prions de recevoir, Madame, Monsieur, Cher Client, nos meilleures salutations.<br>
-        <br>
-        <table cellspacing="0" style="width: 100%; text-align: left;">
-            <tr>
-                <td style="width:50%;"></td>
-                <td style="width:50%; ">
-                    Mle Jesuis CELIBATAIRE<br>
-                    Service Relation Client<br>
-                    Tel : 33 (0) 1 00 00 00 00<br>
-                    Email : on_va@chez.moi<br>
-                </td>
-            </tr>
-        </table>
-    </nobreak>
-</page>
\ No newline at end of file
diff --git a/html2pdf_v4.03/examples/res/exemple07b.php b/html2pdf_v4.03/examples/res/exemple07b.php
deleted file mode 100644
index a6430ecb..00000000
--- a/html2pdf_v4.03/examples/res/exemple07b.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<page orientation="paysage" >
-    <bookmark title="Document" level="0" ></bookmark>
-    <a name="document_reprise"></a>
-    <table cellspacing="0" style="width: 100%;">
-        <tr>
-            <td style="width: 10%;">
-                <img style="width: 100%" src="./res/logo.gif" alt="Logo HTML2PDF" >
-            </td>
-            <td style="width: 80%; text-align: center; text-decoration: underline; font-weight: bold; font-size: 20pt;">
-                <span style="font-size: 10pt"><br></span>
-                ACCORD DE RETOUR
-            </td>
-            <td style="width: 10%;">
-            </td>
-        </tr>
-    </table>
-    <table cellspacing="0" style="width: 100%;">
-        <tr>
-            <td style="width: 55% ">
-                <table cellspacing="0" style="width: 100%; border: solid 2px #000000; ">
-                    <tr>
-                        <td style="width: 100%; font-size: 12pt;">
-                            <span style="font-size: 15pt; font-weight: bold;">ADRESSE DE RETOUR<br></span>
-                            <br>
-                            <b>Entrepot des Bois</b><br>
-                            sur une grande route<br>
-                            00000 - Spipu Ville<br>
-                            <br>
-                            Date : <?php echo date('d/m/Y'); ?><br>
-                            Dossier suivi par <b>Mle Jesuis CELIBATAIRE</b><br>
-                            Tel : 33 (0) 1 00 00 00 00<br>
-                            Email : on_va@chez.moi<br>
-                        </td>
-                    </tr>
-                </table>
-                <br>&nbsp;
-            </td>
-            <td style="width: 4%"></td>
-            <td style="width: 37% ">
-                <table cellspacing="0" style="width: 100%; border: solid 2px #000000; font-size: 12pt;">
-                    <tr><td style="width: 40%;">Référence :        </td><td style="width: 60%;">71326</td></tr>
-                    <tr><td style="width: 40%;">Client :        </td><td style="width: 60%;">M. Albert Dupont</td></tr>
-                    <tr><td style="width: 40%;">Adresse :        </td><td style="width: 60%;">Résidence perdue<br>1, rue sans nom<br>00 000 - Pas de Ville</td></tr>
-                    <tr><td style="width: 40%;">TEL :             </td><td style="width: 60%;">33 (0) 1 00 00 00 00</td></tr>
-                    <tr><td style="width: 40%;">FAX :            </td><td style="width: 60%;">33 (0) 1 00 00 00 01</td></tr>
-                    <tr><td style="width: 40%;">Code Client    :    </td><td style="width: 60%;">00C4520100A</td></tr>
-                </table>
-                <table cellspacing="0" style="width: 100%; border: solid 2px #000000">
-                    <tr>
-                        <th style="width: 40%;">Motif de la Reprise</th>
-                        <td style="width: 60%;">Produit non Conforme</td>
-                    </tr>
-                </table>
-                <br>
-            </td>
-            <td style="width: 4%"></td>
-        </tr>
-        <tr>
-            <td style="width:55%;">
-                <table cellspacing="0" style="padding: 1px; width: 100%; border: solid 2px #000000; font-size: 11pt; ">
-                    <tr>
-                        <th style="width: 100%; text-align: center; border: solid 1px #000000;" colspan="4">
-                            Partie réservée à Spipu Corp
-                        </th>
-                    </tr>
-                    <tr>
-                        <th style="width: 100%; text-align: center; border: solid 1px #000000;" colspan="4">
-                            QUANTITE PREVUE AU CHARGEMENT
-                        </th>
-                    </tr>
-                    <tr>
-                        <th style="width: 15%; border: solid 1px #000000;">Produit</th>
-                        <th style="width: 55%; border: solid 1px #000000;">Designation</th>
-                        <th style="width: 15%; border: solid 1px #000000;">Neuf</th>
-                        <th style="width: 15%; border: solid 1px #000000;">Abîmé</th>
-                    </tr>
-<?php
-$i=0;
-foreach ($produits as $produit) {
-    $i++;
-?>
-                    <tr>
-                        <td style="width: 15%; border: solid 1px #000000;"><?php echo $produit[0];        ?></td>
-                        <td style="width: 55%; border: solid 1px #000000;text-align: left;"><?php echo $produit[1];        ?></td>
-                        <td style="width: 15%; border: solid 1px #000000;"><?php echo $produit[4];        ?></td>
-                        <td style="width: 15%; border: solid 1px #000000;"><?php echo $produit[2]-$produit[4];        ?></td>
-                    </tr>
-
-<?php
-}
-for ($i; $i<12; $i++) {
-?>
-                    <tr>
-                        <td style="width: 15%; border: solid 1px #000000;">&nbsp;</td>
-                        <td style="width: 55%; border: solid 1px #000000;">&nbsp;</td>
-                        <td style="width: 15%; border: solid 1px #000000;">&nbsp;</td>
-                        <td style="width: 15%; border: solid 1px #000000;">&nbsp;</td>
-                    </tr>
-<?php
-}
-?>
-                </table>
-                <br>
-                <table cellspacing="0" style="width: 100%; text-align: left; font-size: 8pt">
-                    <tr>
-                        <td style="width: 100%">
-                            <b><u>Conditions des Retours</u></b><br>
-                            1 - il faut des conditions<br>
-                            2 - encore des conditions<br>
-                            3 - toujours des conditions<br>
-                        </td>
-                    </tr>
-                </table>
-                <br>
-                <table cellspacing="0" style="width: 100%; border: solid 2px #000000; text-align: center; font-size: 10pt">
-                    <tr>
-                        <td style="width: 30%"></td>
-                        <td style="width: 40%">ACCORD SOCIETE</td>
-                        <td style="width: 30%"></td>
-                    </tr>
-                    <tr>
-                        <td style="width: 30%"><br><br>M. XX</td>
-                        <td style="width: 40%"></td>
-                        <td style="width: 30%"><br><br>Mme XY</td>
-                    </tr>
-                </table>
-            </td>
-            <td style="width: 4%"></td>
-            <td style="width: 37%;">
-                <table cellspacing="0" style="padding: 1px; width: 100%; border: solid 2px #000000; font-size: 11pt; ">
-                    <tr>
-                        <th style="width: 100%; text-align: center; border: solid 1px #000000;" colspan="2">
-                            Partie réservée à l'entrepôt
-                        </th>
-                    </tr>
-                    <tr>
-                        <th style="width: 100%; text-align: center; border: solid 1px #000000;" colspan="2">
-                            QUANTITE PREVUE AU CHARGEMENT
-                        </th>
-                    </tr>
-                    <tr>
-                        <th style="width: 50%; border: solid 1px #000000;">Produit neuf                </th>
-                        <th style="width: 50%; border: solid 1px #000000;">Produit à reconditionner    </th>
-                    </tr>
-<?php
-    for ($i=0; $i<12; $i++) {
-?>
-                    <tr>
-                        <td style="width: 50%; border: solid 1px #000000;">&nbsp;</td>
-                        <td style="width: 50%; border: solid 1px #000000;">&nbsp;</td>
-                    </tr>
-<?php
-    }
-?>
-                </table>
-                <br>
-                <table cellspacing="0" style="width: 100%; border: solid 2px #000000; text-align: left; font-size: 10pt">
-                    <tr>
-                        <th style="width: 30%;">
-                            Commentaire<br>
-                            Retour :<br>
-                            &nbsp;<br>
-                            &nbsp;<br>
-                        </th>
-                        <td style="width: 70%;">
-                        </td>
-                    </tr>
-                </table>
-                <br>
-                <br>
-                <span style="font-size: 13pt"><b><u>A COLLER IMPERATIVEMENT SUR LES COLIS</u></b></span>
-            </td>
-            <td style="width: 4%"></td>
-        </tr>
-    </table>
-</page>
\ No newline at end of file
diff --git a/html2pdf_v4.03/examples/res/exemple08.php b/html2pdf_v4.03/examples/res/exemple08.php
deleted file mode 100644
index bffd99a1..00000000
--- a/html2pdf_v4.03/examples/res/exemple08.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<style type="text/css">
-<!--
-table
-{
-    padding: 0;
-    border: solid 1mm LawnGreen;
-    font-size: 12pt;
-    background: #FFFFFF;
-    text-align: center;
-    vertical-align: middle;
-}
-
-td
-{
-    padding: 1mm;
-    border: solid 1mm black;
-}
-
-td.div
-{
-    width: 110px;
-    height: 110px;
-    text-align: left;
-    padding: 0
-}
-
-td.div div
-{
-    margin: auto;
-    background: yellow;
-    border: solid 2px blue;
-    color: red;
-    width: 100px;
-    height: 65px;
-    text-align: center;
-}
-
--->
-</style>
-<page backcolor="#AACCFF" backleft="5mm" backright="5mm" backtop="10mm" backbottom="10mm" >
-    <table>
-        <tr>
-            <td class="div"><div style="rotate: 0;">Hello ! ceci <b>est</b> un test !<br><img src="./res/logo.png" style="width: 80px;" alt="logo"></div></td>
-            <td class="div"><div style="rotate: 270;">Hello ! ceci <b>est</b> un test !<br><img src="./res/logo.png" style="width: 80px;" alt="logo"></div></td>
-        </tr>
-        <tr>
-            <td class="div"><div style="rotate: 90;">Hello ! ceci <b>est</b> un test !<br><img src="./res/logo.png" style="width: 80px;" alt="logo"></div></td>
-            <td class="div"><div style="rotate: 180;">Hello ! ceci <b>est</b> un test !<br><img src="./res/logo.png" style="width: 80px;" alt="logo"></div></td>
-        </tr>
-    </table>
-    <br>
-    <table cellspacing="4">
-        <tr>
-            <td>a A1</td>
-            <td>aa A2</td>
-            <td>aaa A3</td>
-            <td>aaaa A4</td>
-        </tr>
-        <tr>
-            <td rowspan="2">B1</td>
-            <td style="font-size: 16pt">B2</td>
-            <td colspan="2">B3</td>
-        </tr>
-        <tr>
-            <td>C1</td>
-            <td>C2</td>
-            <td>C3</td>
-        </tr>
-        <tr>
-            <td colspan="2">D1</td>
-            <td colspan="2">D2</td>
-        </tr>
-    </table>
-    <hr>
-    <table>
-        <tr>
-            <td colspan="2">CoucouCoucou !</td>
-            <td>B</td>
-            <td>CC</td>
-        </tr>
-        <tr>
-            <td>AA</td>
-            <td colspan="2">CoucouCoucou !</td>
-            <td>CC</td>
-        </tr>
-        <tr>
-            <td>AA</td>
-            <td>B</td>
-            <td colspan="2">CoucouCoucou !</td>
-        </tr>
-    </table>
-    <hr>
-    <table style="background: #FFFFFF">
-        <tr>
-            <td>AA</td>
-            <td>AA</td>
-            <td>AA</td>
-            <td rowspan="2">AA</td>
-        </tr>
-        <tr>
-            <td>AA</td>
-            <td rowspan="2" colspan="2" >CoucouCoucou !</td>
-        </tr>
-        <tr>
-            <td>AA</td>
-            <td>CC</td>
-        </tr>
-        <tr>
-            <td colspan="2">D1</td>
-            <td colspan="2">D2</td>
-        </tr>
-    </table>
-    <hr>
-</page>
\ No newline at end of file
diff --git a/html2pdf_v4.03/examples/res/exemple09.png.php b/html2pdf_v4.03/examples/res/exemple09.png.php
deleted file mode 100644
index 48a2c932..00000000
--- a/html2pdf_v4.03/examples/res/exemple09.png.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-    $px = isset($_GET['px']) ? $_GET['px'] : 0; $px = preg_replace('/[^0-9]/isU', '', $px);
-    $py = isset($_GET['py']) ? $_GET['py'] : 0; $py = preg_replace('/[^0-9]/isU', '', $py);
-
-    if ($px<1) $px = 5;
-    if ($py<1) $py = 5;
-
-    if ($px>20) $px = 20;
-    if ($py>20) $py = 20;
-
-    $width  = 100;
-    $height = 100;
-    $im = imagecreatetruecolor($width, $height);
-
-    for ($y=0; $y<$height; $y+= $py) {
-        for ($x=0; $x<$width; $x+= $px) {
-            $c = imagecolorallocate($im, 200-$x, 100+$y, 100+$x-$y);
-            imagefilledrectangle($im, $x, $y, $x+$px, $y+$py, $c);
-        }
-    }
-
-    header("Content-type: image/png");
-    imagepng($im);
-    imagedestroy($im);
diff --git a/html2pdf_v4.03/examples/res/exemple10.php b/html2pdf_v4.03/examples/res/exemple10.php
deleted file mode 100644
index 01541bd3..00000000
--- a/html2pdf_v4.03/examples/res/exemple10.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<style type="text/css">
-<!--
-div.minifiche
-{
-    position:    relative;
-    overflow:    hidden;
-    width:       454px;
-    height:      138px;
-    padding:     0;
-    font-size:   11px;
-    text-align:  left;
-    font-weight: normal;
-    background-image: url(./res/exemple10a.gif);
-}
-div.minifiche img.icone    { position: absolute; border: none; left: 5px;   top: 5px;  width: 240px; height: 128px;overflow: hidden; }
-div.minifiche div.zone1    { position: absolute; border: none; left: 257px; top: 8px;  width: 188px; height: 14px; padding-top: 1px; overflow: hidden; text-align: center; font-weight: bold; }
-div.minifiche div.zone2    { position: absolute; border: none; left: 315px; top: 28px; width: 131px; height: 14px; padding-top: 1px; overflow: hidden; text-align: left; font-weight: normal; }
-div.minifiche div.zone3    { position: absolute; border: none; left: 315px; top: 48px; width: 131px; height: 14px; padding-top: 1px; overflow: hidden; text-align: left; font-weight: normal; }
-div.minifiche div.zone4    { position: absolute; border: none; left: 315px; top: 68px; width: 131px; height: 14px; padding-top: 1px; overflow: hidden; text-align: left; font-weight: normal; }
-div.minifiche div.zone5    { position: absolute; border: none; left: 315px; top: 88px; width: 131px; height: 14px; padding-top: 1px; overflow: hidden; text-align: left; font-weight: normal; }
-div.minifiche div.download { position: absolute; border: none; left: 257px; top: 108px;width: 188px; height: 22px; overflow: hidden; text-align: center; font-weight: normal; }
--->
-</style>
-<page>
-    <div style="position: absolute; width: 10mm; height: 10mm; left:    0; top:     0; border: solid 2px #0000EE; background: #AAAAEE"></div>
-    <div style="position: absolute; width: 10mm; height: 10mm; right:    0; top:     0; border: solid 2px #00EE00; background: #AAEEAA"></div>
-    <div style="position: absolute; width: 10mm; height: 10mm; left:    0; bottom:    0; border: solid 2px #EE0000; background: #EEAAAA"></div>
-    <div style="position: absolute; width: 10mm; height: 10mm; right:    0; bottom:    0; border: solid 2px #EEEE00; background: #EEEEAA"></div>
-    <table style="width: 100%">
-        <tr>
-            <td style="text-indent: 10mm; border: solid 1px #007700; width: 80%">
-                <p>
-                    Ligne dans un paragraphe,
-                    test de texte assez long pour engendrer des retours à la ligne automatique... a b c d e f g h i j k l m n o p q r s t u v w x y z a b c d e f g h i j k l m n o p q r s t u v w x y z
-                    test de texte assez long pour engendrer des retours à la ligne automatique... a b c d e f g h i j k l m n o p q r s t u v w x y z a b c d e f g h i j k l m n o p q r s t u v w x y z
-                </p>
-                <p>
-                    Ligne dans un paragraphe,
-                    test de texte assez long pour engendrer des retours à la ligne automatique... a b c d e f g h i j k l m n o p q r s t u v w x y z a b c d e f g h i j k l m n o p q r s t u v w x y z
-                    test de texte assez long pour engendrer des retours à la ligne automatique... a b c d e f g h i j k l m n o p q r s t u v w x y z a b c d e f g h i j k l m n o p q r s t u v w x y z
-                </p>
-            </td>
-            <td style="border: solid 1px #000077; width: 20%">
-                Test de paragraphe :)
-            </td>
-        </tr>
-    </table>
-    <hr>
-    <div class="minifiche" >
-        <img class="icone"    src="./res/exemple10b.jpg" alt="HTML2PDF" >
-        <div class="zone1">HTML2PDF</div>
-        <div class="zone2">PHP</div>
-        <div class="zone3">Utilitaire</div>
-        <div class="zone4">1.00</div>
-        <div class="zone5">01/01/1901</div>
-        <div class="download"><img src="./res/exemple10c.gif" alt="" style="border: none;"></div>
-    </div>
-    <hr>
-    <div style="border: solid 1px #000000; margin: 0; padding: 0; background: rgb(255, 255, 255); width: 400px; height: 300px; position: relative;">
-        <div style="border-style: solid; border-color: transparent rgb(170, 34, 34) rgb(170, 34, 34) transparent; border-width: 39.5px 59px;    position: absolute; left: 101px; top: 52px; height: 0pt; width: 0pt;"></div>
-        <div style="border-style: solid; border-color: rgb(34, 170, 34) rgb(34, 170, 34) transparent transparent; border-width: 59px 39.5px;    position: absolute; left: 101px; top: 131px; height: 0pt; width: 0pt;"></div>
-        <div style="border-style: solid; border-color: rgb(34, 34, 170) transparent transparent rgb(34, 34, 170); border-width: 39.5px 59px;    position: absolute; left: 180px; top: 170px; height: 0pt; width: 0pt;"></div>
-        <div style="border-style: solid; border-color: transparent transparent rgb(170, 170, 34) rgb(170, 170, 34); border-width: 59px 39.5px;    position: absolute; left: 219px; top: 52px; height: 0pt; width: 0pt;"></div>
-        <div style="position: absolute; left: 10px; top: 10px; font-size: 20px; font-family: Arial;">Exemple</div>
-    </div>
-    <hr>
-    <pre><?php
-    ob_start();
-    readfile(dirname(__FILE__).'/../exemple10.php');
-    echo htmlentities(ob_get_clean());
-    ?></pre>
-</page>
-<page orientation="paysage" >
-<style type="text/css">
-<!--
-
-div.main
-{
-    padding:     0;
-    margin:      0;
-    position:    relative;
-    left:        50%;
-    margin-left: -80mm;
-    width:       160mm;
-    height:      100mm;
-    text-align:  center;
-    border:      solid 10px #111111;
-    background:  #222222;
-    color:       #FFFFFF;
-    font-size:   10pt;
-    font-weight: bold;
-    text-align:  center;
-}
-
-div.main a
-{
-    text-decoration: none;
-    color: #EEEEEE;
-}
-
-div.main a:hover
-{
-    text-decoration: underline;
-    color: #FFFFFF;
-}
--->
-</style>
-    <div class="main">
-        <div style="position: absolute; top: 5mm; left: 5mm; font-size:12pt;text-align: left;">Spipu.net</div><br>
-        <div style="position: absolute; bottom: 5mm; right: 5mm; font-size:12pt; text-align: right; ">(c)2011 Spipu</div>
-        <br><br><br>
-        <a href="http://cineblog.spipu.net/" >Cineblog by Spipu           </a><br><br>
-        <a href="http://html2pdf.fr/"        >HTML2PDF                    </a><br><br>
-        <a href="http://lambda.spipu.net/"   >Lambda Finder               </a><br><br>
-        <a href="http://open.spipu.net/"     >Gestion des Opens - Yaronet </a><br><br>
-        <a href="http://perso.spipu.net/"    >A propos de moi             </a><br><br>
-        <a href="http://prgm.spipu.net/"     >Programmes by Spipu         </a><br><br>
-        <br><br><br>
-    </div>
-</page>
\ No newline at end of file
diff --git a/html2pdf_v4.03/examples/res/exemple10a.gif b/html2pdf_v4.03/examples/res/exemple10a.gif
deleted file mode 100644
index c575f1c9..00000000
Binary files a/html2pdf_v4.03/examples/res/exemple10a.gif and /dev/null differ
diff --git a/html2pdf_v4.03/examples/res/exemple10b.jpg b/html2pdf_v4.03/examples/res/exemple10b.jpg
deleted file mode 100644
index 2c4b7aac..00000000
Binary files a/html2pdf_v4.03/examples/res/exemple10b.jpg and /dev/null differ
diff --git a/html2pdf_v4.03/examples/res/exemple10c.gif b/html2pdf_v4.03/examples/res/exemple10c.gif
deleted file mode 100644
index 955d4986..00000000
Binary files a/html2pdf_v4.03/examples/res/exemple10c.gif and /dev/null differ
diff --git a/html2pdf_v4.03/examples/res/exemple11.php b/html2pdf_v4.03/examples/res/exemple11.php
deleted file mode 100644
index 9423f409..00000000
--- a/html2pdf_v4.03/examples/res/exemple11.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<div style="border: 1px solid rgb(0, 0, 0); margin: 0; padding: 0; background: rgb(255, 255, 255); width: 400px; height: 300px;">
-    <div style="border-style: solid; border-color: transparent rgb(170, 34, 170) rgb(170, 34, 170) transparent; border-width: 18px 56px; position: absolute; left: 111px; top: 69px; height: 0pt; width: 0pt;"></div><div style="border-style: solid; border-color: rgb(170, 34, 170) transparent transparent rgb(170, 34, 170); border-width: 18px 9px; position: absolute; left: 223px; top: 69px; height: 0pt; width: 0pt;"></div><div style="border-style: solid; border-color: transparent rgb(170, 34, 170) rgb(170, 34, 170) transparent; border-width: 3px 9px; position: absolute; left: 223px; top: 63px; height: 0pt; width: 0pt;"></div><div style="border-style: solid; border-color: rgb(170, 34, 170) transparent transparent rgb(170, 34, 170); border-width: 3px 1.5px; position: absolute; left: 241px; top: 63px; height: 0pt; width: 0pt;"></div><div style="border-style: solid; border-color: transparent rgb(170, 34, 170) rgb(170, 34, 170) transparent; border-width: 0.5px 1.5px; position: absolute; left: 241px; top: 62px; height: 0pt; width: 0pt;"></div><div style="border-style: solid; border-color: rgb(170, 34, 170) rgb(170, 34, 170) transparent transparent; border-width: 67px 22px; position: absolute; left: 111px; top: 105px; height: 0pt; width: 0pt;"></div><div style="border-style: solid; border-color: rgb(170, 34, 170) transparent transparent rgb(170, 34, 170); border-width: 67px 34px; position: absolute; left: 155px; top: 105px; height: 0pt; width: 0pt;"></div><div style="border-style: solid; border-color: transparent rgb(34, 170, 170) rgb(34, 170, 170) transparent; border-width: 67px 33.5px; position: absolute; left: 178px; top: 61px; height: 0pt; width: 0pt;"></div><div style="border-style: solid; border-color: transparent transparent rgb(34, 170, 170) rgb(34, 170, 170); border-width: 67px 22px; position: absolute; left: 245px; top: 61px; height: 0pt; width: 0pt;"></div><div style="border-style: solid; border-color: rgb(34, 170, 170) transparent transparent rgb(34, 170, 170); border-width: 18px 55.5px; position: absolute; left: 178px; top: 195px; height: 0pt; width: 0pt;"></div><div style="border-style: solid; border-color: transparent rgb(34, 170, 170) rgb(34, 170, 170) transparent; border-width: 18px 9px; position: absolute; left: 160px; top: 195px; height: 0pt; width: 0pt;"></div><div style="border-style: solid; border-color: rgb(34, 170, 170) transparent transparent rgb(34, 170, 170); border-width: 3px 9px; position: absolute; left: 160px; top: 231px; height: 0pt; width: 0pt;"></div><div style="border-style: solid; border-color: transparent rgb(34, 170, 170) rgb(34, 170, 170) transparent; border-width: 3px 1.5px; position: absolute; left: 157px; top: 231px; height: 0pt; width: 0pt;"></div><div style="border-style: solid; border-color: rgb(34, 170, 170) transparent transparent rgb(34, 170, 170); border-width: 0.5px 1.5px; position: absolute; left: 157px; top: 237px; height: 0pt; width: 0pt;"></div>
-</div>
-<hr>
-<table style="width:100%;">
-    <tr>
-        <td id="mon_td_trop_grand" style="width:100%;">
-            Test de TD très grand, en désactivant le test de TD ne devant pas depasser une page<br>
-            via la méthode <b>setTestTdInOnePage</b>.<br>
-            <table style="width:100%;">
-<?php
-    for ($i=0; $i<=40; $i++) {
-?>
-                <tr>
-                    <td style="border:1px solid red;width:100%;">
-                        test de texte assez long pour engendrer des retours à la ligne automatique...
-                        a b c d e f g h i j k l m n o p q r s t u v w x y z
-                        a b c d e f g h i j k l m n o p q r s t u v w x y z
-                    </td>
-                </tr>
-<?php
-    }
-?>
-            </table>
-        </td>
-    </tr>
-</table>
\ No newline at end of file
diff --git a/html2pdf_v4.03/examples/res/exemple12.php b/html2pdf_v4.03/examples/res/exemple12.php
deleted file mode 100644
index dcebe84c..00000000
--- a/html2pdf_v4.03/examples/res/exemple12.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-    $chaine = 'test de texte assez long pour engendrer des retours à la ligne automatique...';
-    $chaine.= ', répétitif car besoin d\'un retour à la ligne';
-    $chaine.= ', répétitif car besoin d\'un retour à la ligne';
-    $chaine.= ', répétitif car besoin d\'un retour à la ligne';
-    $chaine.= ', répétitif car besoin d\'un retour à la ligne';
-?>
-<style type="text/css">
-<!--
-ul
-{
-    background: #FFDDDD;
-    border: solid 1px #FF0000;
-}
-
-ol
-{
-    background: #DDFFDD;
-    border: solid 1px #00FF00;
-}
-
-ul li
-{
-    background: #DDFFAA;
-    border: solid 1px #AAFF00;
-}
-
-ol li
-{
-    background: #AADDFF;
-    border: solid 1px #00AAFF;
-}
--->
-</style>
-<page style="font-size: 11px">
-    <ul style="list-style-type: disc; width: 80%">
-        <li>
-            Point 1 :<br><?php echo $chaine; ?>
-        </li>
-        <li>
-            Point 2 :<br><?php echo $chaine; ?>
-            <ul style="list-style-type: circle">
-                <li>
-                    Point 1 :<br><?php echo $chaine; ?>
-                </li>
-                <li>
-                    Point 2 :<br><?php echo $chaine; ?>
-                    <ul style="list-style-type: square">
-                        <li>
-                            Point 1 :<br><?php echo $chaine; ?>
-                        </li>
-                        <li>
-                            Point 2 :<br><?php echo $chaine; ?>
-                        </li>
-                        <li>
-                            Point 3 :<br><?php echo $chaine; ?>
-                            <ul style="list-style-image: url(./res/puce.gif)">
-                                <li>
-                                    Puce en image 1 :<br><?php echo $chaine; ?>
-                                </li>
-                                <li>
-                                    Puce en image 2 :<br><?php echo $chaine; ?>
-                                </li>
-                                <li>
-                                    Puce en image 3 :<br><?php echo $chaine; ?>
-                                </li>
-                            </ul>
-                        </li>
-                    </ul>
-                </li>
-                <li>
-                    Point 3 :<br><?php echo $chaine; ?>
-                </li>
-            </ul>
-        </li>
-        <li>
-            Point 3 :<br><?php echo $chaine; ?>
-        </li>
-    </ul>
-    <hr><hr>
-    <ol style="list-style-type: upper-roman">
-        <li>
-            Point 1 :<br><?php echo $chaine; ?>
-        </li>
-        <li>
-            Point 2 :<br><?php echo $chaine; ?>
-            <ol style="list-style-type: lower-alpha">
-                <li>
-                    Point 1 :<br><?php echo $chaine; ?>
-                </li>
-                <li>
-                    Point 2 :<br><?php echo $chaine; ?>
-                    <ol style="list-style-type: decimal">
-                        <li>
-                            Point 1 :<br><?php echo $chaine; ?>
-                        </li>
-                        <li>
-                            Point 2 :<br><?php echo $chaine; ?>
-                        </li>
-                        <li>
-                            Point 3 :<br><?php echo $chaine; ?>
-                        </li>
-                    </ol>
-                </li>
-                <li>
-                    Point 3 :<br><?php echo $chaine; ?>
-                </li>
-            </ol>
-        </li>
-        <li>
-            Point 3 :<br><?php echo $chaine; ?>
-        </li>
-    </ol>
-</page>
\ No newline at end of file
diff --git a/html2pdf_v4.03/examples/res/exemple13.php b/html2pdf_v4.03/examples/res/exemple13.php
deleted file mode 100644
index 7243d4fc..00000000
--- a/html2pdf_v4.03/examples/res/exemple13.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<style type="text/css">
-<!--
-table.tableau { text-align: left; }
-table.tableau td { width: 15mm; font-family: courier; }
-table.tableau th { width: 15mm; font-family: courier; }
-
-.ul1
-{
-    list-style-image: url(./res/puce2.gif);
-}
-.ul1 li
-{
-    color:#F19031;
-}
-.ul2
-{
-    list-style: square;
-}
-.ul2 li
-{
-    color:#31F190;
-}
-.ul3
-{
-    list-style: none;
-}
-.ul3 li
-{
-    color:#9031F1;
-}
--->
-</style>
-Exemple de liste avec puce personnalisée :<br>
-<table style="width: 100%;" >
-    <tr>
-        <td style="width: 33%;">
-            <ul class="ul1">
-                <li>Votre ligne 1</li>
-                <li>Votre ligne 2</li>
-                <li>Votre ligne 3</li>
-            </ul>
-        </td>
-        <td style="width: 34%;">
-            <ul class="ul2">
-                <li>Votre ligne 1</li>
-                <li>Votre ligne 2</li>
-                <li>Votre ligne 3</li>
-            </ul>
-        </td>
-        <td style="width: 33%;">
-            <ul class="ul3">
-                <li>Votre ligne 1</li>
-                <li>Votre ligne 2</li>
-                <li>Votre ligne 3</li>
-            </ul>
-        </td>
-    </tr>
-</table>
-Exemple de caracteres :<br>
-<table class="tableau" >
-    <tr><th>0</th><th>a</th><th>e</th><th>i</th><th>o</th><th>u</th></tr>
-    <tr><th>1</th><td>&agrave;</td><td>&egrave;</td><td>&igrave;</td><td>&ograve;</td><td>&ugrave;</td></tr>
-    <tr><th>2</th><td>&aacute;</td><td>&eacute;</td><td>&iacute;</td><td>&oacute;</td><td>&uacute;</td></tr>
-    <tr><th>3</th><td>&acirc;</td><td>&ecirc;</td><td>&icirc;</td><td>&ocirc;</td><td>&ucirc;</td></tr>
-    <tr><th>4</th><td>&auml;</td><td>&euml;</td><td>&iuml;</td><td>&ouml;</td><td>&uuml;</td></tr>
-    <tr><th>5</th><td>&atilde;</td><td> </td><td> </td><td>&otilde;</td><td> </td></tr>
-    <tr><th>6</th><td>&aring;</td><td> </td><td> </td><td> </td><td> </td></tr>
-    <tr><th>7</th><td>&euro;</td><td>&laquo;</td><td> </td><td>&oslash;</td><td> </td></tr>
-</table>
-<br>
-<?php
-    $phrase = "ceci est un exemple avec <b>du gras</b>, ";
-    $phrase.= "<i>de l'italique</i>, ";
-    $phrase.= "<u>du souligné</u>, ";
-    $phrase.= "<u><i><b>et une image</b></i></u> : ";
-    $phrase.= "<img src='./res/logo.gif' alt='logo' style='width: 15mm'>";
-?>
-Table :<br>
-<table style="border: solid 1px red; width: 105mm">
-    <tr><td style="width: 100%; border: solid 1px green; text-align: left; "><?php echo $phrase; ?></td></tr>
-    <tr><td style="width: 100%; border: solid 1px green; text-align: center;"><?php echo $phrase; ?></td></tr>
-    <tr><td style="width: 100%; border: solid 1px green; text-align: right; "><?php echo $phrase; ?></td></tr>
-</table>
-<br>
-Div :<br>
-<div style="width: 103mm; border: solid 1px green; text-align: left; margin: 1mm 0 1mm 0;padding: 1mm;"><?php echo $phrase; ?></div>
-<div style="width: 103mm; border: solid 1px green; text-align: center;margin: 1mm 0 1mm 0;padding: 1mm;"><?php echo $phrase; ?></div>
-<div style="width: 103mm; border: solid 1px green; text-align: right; margin: 1mm 0 1mm 0;padding: 1mm;"><?php echo $phrase; ?></div>
\ No newline at end of file
diff --git a/html2pdf_v4.03/examples/res/forms.php b/html2pdf_v4.03/examples/res/forms.php
deleted file mode 100644
index e6420563..00000000
--- a/html2pdf_v4.03/examples/res/forms.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-    $url = $_SERVER['REQUEST_URI'];
-    if (substr($url, 0, 7)!=='http://') {
-        $url = 'http://'.$_SERVER['HTTP_HOST'];
-        if (ISSET($_SERVER['SERVER_PORT']) && $_SERVER['SERVER_PORT']!=80) $url.= ':'.$_SERVER['SERVER_PORT'];
-        $url.= $_SERVER['REQUEST_URI'];
-    }
-?>
-<style type="text/css">
-li
-{ font-size: 10pt; }
-
-input, textarea, select
-{
-    border: dashed 1mm red;
-    background: #FCC;
-    color: #400;
-    text-align: left;
-    font-size: 11pt;
-}
-</style>
-<page footer="form">
-    <h1>Test de formulaire</h1><br>
-    <br>
-    <form action="<?php echo $url; ?>">
-        <input type="hidden" name="test" value="1">
-        Vous utilisez cette librairie dans le cadre :
-        <ul style="list-style: none">
-            <li><input type="checkbox" name="cadre_boulot" checked="checked"> du boulot</li>
-            <li><input type="checkbox" name="cadre_perso" > perso</li>
-        </ul>
-        Vous êtes :
-        <ul style="list-style: none">
-            <li><input type="radio" name="sexe" value="homme" checked="checked"> un homme</li>
-            <li><input type="radio" name="sexe" value="femme"> une femme</li>
-        </ul>
-        Vous avez :
-        <select name="age" >
-            <option value="15">moins de 15 ans</option>
-            <option value="20">entre 15 et 20 ans</option>
-            <option value="25">entre 20 et 25 ans</option>
-            <option value="30">entre 25 et 30 ans</option>
-            <option value="40">plus de 30 ans</option>
-        </select><br>
-        <br>
-        Vous aimez :
-        <select name="aime[]" size="5" multiple="multiple">
-            <option value="ch1">l'informatique</option>
-            <option value="ch2">le cinéma</option>
-            <option value="ch3">le sport</option>
-            <option value="ch4">la littérature</option>
-            <option value="ch5">autre</option>
-        </select><br>
-        <br>
-        Votre phrase fétiche : <input type="text" name="phrase" value="cette lib est géniale !!!" style="width: 100mm"><br>
-        <br>
-        Un commentaire ?<br>
-        <textarea name="comment" rows="3" cols="30">rien de particulier</textarea><br>
-        <br>
-        <input type="reset" name="btn_reset" value="Initialiser">
-        <input type="button" name="btn_print" value="Imprimer" onclick="print(true);">
-        <input type="submit" name="btn_submit" value="Envoyer">
-    </form>
-</page>
\ No newline at end of file
diff --git a/html2pdf_v4.03/examples/res/logo.gif b/html2pdf_v4.03/examples/res/logo.gif
deleted file mode 100644
index 1400667e..00000000
Binary files a/html2pdf_v4.03/examples/res/logo.gif and /dev/null differ
diff --git a/html2pdf_v4.03/examples/res/logo.png b/html2pdf_v4.03/examples/res/logo.png
deleted file mode 100644
index bdd7594d..00000000
Binary files a/html2pdf_v4.03/examples/res/logo.png and /dev/null differ
diff --git a/html2pdf_v4.03/examples/res/off.png b/html2pdf_v4.03/examples/res/off.png
deleted file mode 100644
index ebb30bbf..00000000
Binary files a/html2pdf_v4.03/examples/res/off.png and /dev/null differ
diff --git a/html2pdf_v4.03/examples/res/puce.gif b/html2pdf_v4.03/examples/res/puce.gif
deleted file mode 100644
index 7d35e4d3..00000000
Binary files a/html2pdf_v4.03/examples/res/puce.gif and /dev/null differ
diff --git a/html2pdf_v4.03/examples/res/puce2.gif b/html2pdf_v4.03/examples/res/puce2.gif
deleted file mode 100644
index be43fe78..00000000
Binary files a/html2pdf_v4.03/examples/res/puce2.gif and /dev/null differ
diff --git a/html2pdf_v4.03/examples/res/regle.png b/html2pdf_v4.03/examples/res/regle.png
deleted file mode 100644
index 9ad4310f..00000000
Binary files a/html2pdf_v4.03/examples/res/regle.png and /dev/null differ
diff --git a/html2pdf_v4.03/examples/res/svg.php b/html2pdf_v4.03/examples/res/svg.php
deleted file mode 100644
index 5134e7f0..00000000
--- a/html2pdf_v4.03/examples/res/svg.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<page>
-    <draw style="margin: auto; width:150mm; height:100mm; background: #000000; border: solid 0.5mm #777777;">
-        <line    style="stroke:#FF0000; stroke-width:1mm" x1="10mm" y1="10mm" x2="140mm" y2="10mm" >
-        <rect    style="stroke:#770077; stroke-width:1mm; fill:#008888" x="15%" y="15%"  w="70%" h="70%">
-        <ellipse style="stroke:#000077; stroke-width:1mm; fill:#888800" cx="50%" cy="50%" rx="30%" ry="30%">
-        <circle  style="stroke:#0000AA; stroke-width:1mm; fill:#AAAA00" cx="50%" cy="50%" r="15%">
-    </draw><br>
-    <draw style="margin: auto; width:150mm; height:100mm; background: #000000; border: solid 0.5mm #777777;">
-        <path style="fill:#AAAA00; stroke:#0000AA; stroke-width:1mm" d="M20mm,10mm H130mm A10mm,10mm 0,0,0 140mm,20mm V80mm A10mm,10mm 0,0,0 130mm,90mm H20mm A10mm,10mm 0,0,0 10mm,80mm V20mm A10mm,10mm 0,0,0 20mm,10mm">
-        <path style="fill:#770000; stroke:#AA0033; stroke-width:0.5mm" d="M 20mm,40mm a16mm,8mm 0,0,0 16mm,8mm" />
-        <path style="fill:#770000; stroke:#00AA33; stroke-width:0.5mm" d="M 20mm,40mm l16mm,8mm" />
-        <path style="fill:#770000; stroke:#AA0033; stroke-width:0.5mm" d="M 40mm,40mm a16mm,8mm 0,0,1 16mm,8mm" />
-        <path style="fill:#770000; stroke:#00AA33; stroke-width:0.5mm" d="M 40mm,40mm l16mm,8mm" />
-        <path style="fill:#770000; stroke:#AA0033; stroke-width:0.5mm" d="M 80mm,40mm a16mm,8mm 0,1,0 16mm,8mm" />
-        <path style="fill:#770000; stroke:#00AA33; stroke-width:0.5mm" d="M 80mm,40mm l16mm,8mm" />
-        <path style="fill:#770000; stroke:#AA0033; stroke-width:0.5mm" d="M100mm,40mm a16mm,8mm 0,1,1 16mm,8mm" />
-        <path style="fill:#770000; stroke:#00AA33; stroke-width:0.5mm" d="M100mm,40mm l16mm,8mm" />
-    </draw><br>
-    <br>
-    Les balises SVG suivantes sont reconnues : LINE, RECT, CIRCLE, ELLIPSE, PATH, POLYGON, POLYLINE, G<br>
-    <br>
-    Spécifications SVG : <a href="http://www.w3.org/TR/SVG11/expanded-toc.html">http://www.w3.org/TR/SVG11/expanded-toc.html</a>
-</page>
\ No newline at end of file
diff --git a/html2pdf_v4.03/examples/res/tcpdf_logo.jpg b/html2pdf_v4.03/examples/res/tcpdf_logo.jpg
deleted file mode 100644
index 257f8fb6..00000000
Binary files a/html2pdf_v4.03/examples/res/tcpdf_logo.jpg and /dev/null differ
diff --git a/html2pdf_v4.03/examples/svg.php b/html2pdf_v4.03/examples/svg.php
deleted file mode 100644
index 0f244367..00000000
--- a/html2pdf_v4.03/examples/svg.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * HTML2PDF Librairy - example
- *
- * HTML => PDF convertor
- * distributed under the LGPL License
- *
- * @author      Laurent MINGUET <webmaster@html2pdf.fr>
- *
- * isset($_GET['vuehtml']) is not mandatory
- * it allow to display the result in the HTML format
- */
-
-    // get the HTML
-    ob_start();
-    include(dirname(__FILE__).'/res/svg.php');
-    $content = ob_get_clean();
-
-    // convert into PDF
-    require_once(dirname(__FILE__).'/../htdocs2pdf.class.php');
-    try
-    {
-        $html2pdf = new HTML2PDF('P', 'A4', 'fr');
-        $html2pdf->pdf->SetDisplayMode('fullpage');
-        $html2pdf->writeHTML($content, isset($_GET['vuehtml']));
-        $html2pdf->Output('svg.pdf');
-    }
-    catch(HTML2PDF_exception $e) {
-        echo $e;
-        exit;
-    }
diff --git a/html2pdf_v4.03/examples/svg_tiger.php b/html2pdf_v4.03/examples/svg_tiger.php
deleted file mode 100644
index 6a4f082d..00000000
--- a/html2pdf_v4.03/examples/svg_tiger.php
+++ /dev/null
@@ -1,274 +0,0 @@
-<?php
-/**
- * HTML2PDF Librairy - example
- *
- * HTML => PDF convertor
- * distributed under the LGPL License
- *
- * @author      Laurent MINGUET <webmaster@html2pdf.fr>
- *
- * isset($_GET['vuehtml']) is not mandatory
- * it allow to display the result in the HTML format
- */
-
-$content = '
-<page>
-    <draw style="margin:auto; width:180mm; height:180mm; background: #444444; border: solid 0.5mm #777777;">
-        <g transform="translate(90mm,90mm) scale(1.3) translate(-20mm,-30mm)">
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.172"><path d="M-122.304 84.285C-122.304 84.285 -122.203 86.179 -123.027 86.16C-123.851 86.141 -140.305 38.066 -160.833 40.309C-160.833 40.309 -143.05 32.956 -122.304 84.285z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.172"><path d="M-118.774 81.262C-118.774 81.262 -119.323 83.078 -120.092 82.779C-120.86 82.481 -119.977 31.675 -140.043 26.801C-140.043 26.801 -120.82 25.937 -118.774 81.262z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.172"><path d="M-91.284 123.59C-91.284 123.59 -89.648 124.55 -90.118 125.227C-90.589 125.904 -139.763 113.102 -149.218 131.459C-149.218 131.459 -145.539 112.572 -91.284 123.59z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.172"><path d="M-94.093 133.801C-94.093 133.801 -92.237 134.197 -92.471 134.988C-92.704 135.779 -143.407 139.121 -146.597 159.522C-146.597 159.522 -149.055 140.437 -94.093 133.801z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.172"><path d="M-98.304 128.276C-98.304 128.276 -96.526 128.939 -96.872 129.687C-97.218 130.435 -147.866 126.346 -153.998 146.064C-153.998 146.064 -153.646 126.825 -98.304 128.276z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.172"><path d="M-109.009 110.072C-109.009 110.072 -107.701 111.446 -108.34 111.967C-108.979 112.488 -152.722 86.634 -166.869 101.676C-166.869 101.676 -158.128 84.533 -109.009 110.072z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.172"><path d="M-116.554 114.263C-116.554 114.263 -115.098 115.48 -115.674 116.071C-116.25 116.661 -162.638 95.922 -174.992 112.469C-174.992 112.469 -168.247 94.447 -116.554 114.263z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.172"><path d="M-119.154 118.335C-119.154 118.335 -117.546 119.343 -118.036 120.006C-118.526 120.669 -167.308 106.446 -177.291 124.522C-177.291 124.522 -173.066 105.749 -119.154 118.335z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.172"><path d="M-108.42 118.949C-108.42 118.949 -107.298 120.48 -107.999 120.915C-108.7 121.35 -148.769 90.102 -164.727 103.207C-164.727 103.207 -153.862 87.326 -108.42 118.949z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.172"><path d="M-128.2 90C-128.2 90 -127.6 91.8 -128.4 92C-129.2 92.2 -157.8 50.2 -177.001 57.8C-177.001 57.8 -161.8 46 -128.2 90z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.172"><path d="M-127.505 96.979C-127.505 96.979 -126.53 98.608 -127.269 98.975C-128.007 99.343 -164.992 64.499 -182.101 76.061C-182.101 76.061 -169.804 61.261 -127.505 96.979z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.172"><path d="M-127.62 101.349C-127.62 101.349 -126.498 102.88 -127.199 103.315C-127.9 103.749 -167.969 72.502 -183.927 85.607C-183.927 85.607 -173.062 69.726 -127.62 101.349z"/></g>
-            <g style="fill: #ffffff; stroke:#000000"><path d="M-129.83 103.065C-129.327 109.113 -128.339 115.682 -126.6 118.801C-126.6 118.801 -130.2 131.201 -121.4 144.401C-121.4 144.401 -121.8 151.601 -120.2 154.801C-120.2 154.801 -116.2 163.201 -111.4 164.001C-107.516 164.648 -98.793 167.717 -88.932 169.121C-88.932 169.121 -71.8 183.201 -75 196.001C-75 196.001 -75.4 212.401 -79 214.001C-79 214.001 -67.4 202.801 -77 219.601L-81.4 238.401C-81.4 238.401 -55.8 216.801 -71.4 235.201L-81.4 261.201C-81.4 261.201 -61.8 242.801 -69 251.201L-72.2 260.001C-72.2 260.001 -29 232.801 -59.8 262.401C-59.8 262.401 -51.8 258.801 -47.4 261.601C-47.4 261.601 -40.6 260.401 -41.4 262.001C-41.4 262.001 -62.2 272.401 -65.8 290.801C-65.8 290.801 -57.4 280.801 -60.6 291.601L-60.2 303.201C-60.2 303.201 -56.2 281.601 -56.6 319.201C-56.6 319.201 -37.4 301.201 -49 322.001L-49 338.801C-49 338.801 -33.8 322.401 -40.2 335.201C-40.2 335.201 -30.2 326.401 -34.2 341.601C-34.2 341.601 -35 352.001 -30.6 340.801C-30.6 340.801 -14.6 310.201 -20.6 336.401C-20.6 336.401 -21.4 355.601 -16.6 340.801C-16.6 340.801 -16.2 351.201 -7 358.401C-7 358.401 -8.2 307.601 4.6 343.601L8.6 360.001C8.6 360.001 11.4 350.801 11 345.601C11 345.601 25.8 329.201 19 353.601C19 353.601 34.2 330.801 31 344.001C31 344.001 23.4 360.001 25 364.801C25 364.801 41.8 330.001 43 328.401C43 328.401 41 370.802 51.8 334.801C51.8 334.801 57.4 346.801 54.6 351.201C54.6 351.201 62.6 343.201 61.8 340.001C61.8 340.001 66.4 331.801 69.2 345.401C69.2 345.401 71 354.801 72.6 351.601C72.6 351.601 76.6 375.602 77.8 352.801C77.8 352.801 79.4 339.201 72.2 327.601C72.2 327.601 73 324.401 70.2 320.401C70.2 320.401 83.8 342.001 76.6 313.201C76.6 313.201 87.801 321.201 89.001 321.201C89.001 321.201 75.4 298.001 84.2 302.801C84.2 302.801 79 292.401 97.001 304.401C97.001 304.401 81 288.401 98.601 298.001C98.601 298.001 106.601 304.401 99.001 294.401C99.001 294.401 84.6 278.401 106.601 296.401C106.601 296.401 118.201 312.801 119.001 315.601C119.001 315.601 109.001 286.401 104.601 283.601C104.601 283.601 113.001 247.201 154.201 262.801C154.201 262.801 161.001 280.001 165.401 261.601C165.401 261.601 178.201 255.201 189.401 282.801C189.401 282.801 193.401 269.201 192.601 266.401C192.601 266.401 199.401 267.601 198.601 266.401C198.601 266.401 211.801 270.801 213.001 270.001C213.001 270.001 219.801 276.801 220.201 273.201C220.201 273.201 229.401 276.001 227.401 272.401C227.401 272.401 236.201 288.001 236.601 291.601L239.001 277.601L241.001 280.401C241.001 280.401 242.601 272.801 241.801 271.601C241.001 270.401 261.801 278.401 266.601 299.201L268.601 307.601C268.601 307.601 274.601 292.801 273.001 288.801C273.001 288.801 278.201 289.601 278.601 294.001C278.601 294.001 282.601 270.801 277.801 264.801C277.801 264.801 282.201 264.001 283.401 267.601L283.401 260.401C283.401 260.401 290.601 261.201 290.601 258.801C290.601 258.801 295.001 254.801 297.001 259.601C297.001 259.601 284.601 224.401 303.001 243.601C303.001 243.601 310.201 254.401 306.601 235.601C303.001 216.801 299.001 215.201 303.801 214.801C303.801 214.801 304.601 211.201 302.601 209.601C300.601 208.001 303.801 209.601 303.801 209.601C303.801 209.601 308.601 213.601 303.401 191.601C303.401 191.601 309.801 193.201 297.801 164.001C297.801 164.001 300.601 161.601 296.601 153.201C296.601 153.201 304.601 157.601 307.401 156.001C307.401 156.001 307.001 154.401 303.801 150.401C303.801 150.401 282.201 95.6 302.601 117.601C302.601 117.601 314.451 131.151 308.051 108.351C308.051 108.351 298.94 84.341 299.717 80.045L-129.83 103.065z"/></g>
-            <g style="fill: #cc7226; stroke:#000000"><path d="M299.717 80.245C300.345 80.426 302.551 81.55 303.801 83.2C303.801 83.2 310.601 94 305.401 75.6C305.401 75.6 296.201 46.8 305.001 58C305.001 58 311.001 65.2 307.801 51.6C303.936 35.173 301.401 28.8 301.401 28.8C301.401 28.8 313.001 33.6 286.201 -6L295.001 -2.4C295.001 -2.4 275.401 -42 253.801 -47.2L245.801 -53.2C245.801 -53.2 284.201 -91.2 271.401 -128C271.401 -128 264.601 -133.2 255.001 -124C255.001 -124 248.601 -119.2 242.601 -120.8C242.601 -120.8 211.801 -119.6 209.801 -119.6C207.801 -119.6 173.001 -156.8 107.401 -139.2C107.401 -139.2 102.201 -137.2 97.801 -138.4C97.801 -138.4 79.4 -154.4 30.6 -131.6C30.6 -131.6 20.6 -129.6 19 -129.6C17.4 -129.6 14.6 -129.6 6.6 -123.2C-1.4 -116.8 -1.8 -116 -3.8 -114.4C-3.8 -114.4 -20.2 -103.2 -25 -102.4C-25 -102.4 -36.6 -96 -41 -86L-44.6 -84.8C-44.6 -84.8 -46.2 -77.6 -46.6 -76.4C-46.6 -76.4 -51.4 -72.8 -52.2 -67.2C-52.2 -67.2 -61 -61.2 -60.6 -56.8C-60.6 -56.8 -62.2 -51.6 -63 -46.8C-63 -46.8 -70.2 -42 -69.4 -39.2C-69.4 -39.2 -77 -25.2 -75.8 -18.4C-75.8 -18.4 -82.2 -18.8 -85 -16.4C-85 -16.4 -85.8 -11.6 -87.4 -11.2C-87.4 -11.2 -90.2 -10 -87.8 -6C-87.8 -6 -89.4 -3.2 -89.8 -1.6C-89.8 -1.6 -89 1.2 -93.4 6.8C-93.4 6.8 -99.8 25.6 -97.8 30.8C-97.8 30.8 -97.4 35.6 -100.2 37.2C-100.2 37.2 -103.8 36.8 -95.4 48.8C-95.4 48.8 -94.6 50 -97.8 52.4C-97.8 52.4 -115 56 -117.4 72.4C-117.4 72.4 -131 87.2 -131 92.4C-131 94.705 -130.729 97.852 -130.03 102.465C-130.03 102.465 -130.6 110.801 -103 111.601C-75.4 112.401 299.717 80.245 299.717 80.245z"/></g>
-            <g style="fill: #cc7226"><path d="M-115.6 102.6C-140.6 63.2 -126.2 119.601 -126.2 119.601C-117.4 154.001 12.2 116.401 12.2 116.401C12.2 116.401 181.001 86 192.201 82C203.401 78 298.601 84.4 298.601 84.4L293.001 67.6C228.201 21.2 209.001 44.4 195.401 40.4C181.801 36.4 184.201 46 181.001 46.8C177.801 47.6 138.601 22.8 132.201 23.6C125.801 24.4 100.459 0.649 115.401 32.4C131.401 66.4 57 71.6 40.2 60.4C23.4 49.2 47.4 78.8 47.4 78.8C65.8 98.8 31.4 82 31.4 82C-3 69.2 -27 94.8 -30.2 95.6C-33.4 96.4 -38.2 99.6 -39 93.2C-39.8 86.8 -47.31 70.099 -79 96.4C-99 113.001 -112.8 91 -112.8 91L-115.6 102.6z"/></g>
-            <g style="fill: #e87f3a"><path d="M133.51 25.346C127.11 26.146 101.743 2.407 116.71 34.146C133.31 69.346 58.31 73.346 41.51 62.146C24.709 50.946 48.71 80.546 48.71 80.546C67.11 100.546 32.709 83.746 32.709 83.746C-1.691 70.946 -25.691 96.546 -28.891 97.346C-32.091 98.146 -36.891 101.346 -37.691 94.946C-38.491 88.546 -45.87 72.012 -77.691 98.146C-98.927 115.492 -112.418 94.037 -112.418 94.037L-115.618 104.146C-140.618 64.346 -125.546 122.655 -125.546 122.655C-116.745 157.056 13.509 118.146 13.509 118.146C13.509 118.146 182.31 87.746 193.51 83.746C204.71 79.746 299.038 86.073 299.038 86.073L293.51 68.764C228.71 22.364 210.31 46.146 196.71 42.146C183.11 38.146 185.51 47.746 182.31 48.546C179.11 49.346 139.91 24.546 133.51 25.346z"/></g>
-            <g style="fill: #ea8c4d"><path d="M134.819 27.091C128.419 27.891 103.685 3.862 118.019 35.891C134.219 72.092 59.619 75.092 42.819 63.892C26.019 52.692 50.019 82.292 50.019 82.292C68.419 102.292 34.019 85.492 34.019 85.492C-0.381 72.692 -24.382 98.292 -27.582 99.092C-30.782 99.892 -35.582 103.092 -36.382 96.692C-37.182 90.292 -44.43 73.925 -76.382 99.892C-98.855 117.983 -112.036 97.074 -112.036 97.074L-115.636 105.692C-139.436 66.692 -124.891 125.71 -124.891 125.71C-116.091 160.11 14.819 119.892 14.819 119.892C14.819 119.892 183.619 89.492 194.819 85.492C206.019 81.492 299.474 87.746 299.474 87.746L294.02 69.928C229.219 23.528 211.619 47.891 198.019 43.891C184.419 39.891 186.819 49.491 183.619 50.292C180.419 51.092 141.219 26.291 134.819 27.091z"/></g>
-            <g style="fill: #ec9961"><path d="M136.128 28.837C129.728 29.637 104.999 5.605 119.328 37.637C136.128 75.193 60.394 76.482 44.128 65.637C27.328 54.437 51.328 84.037 51.328 84.037C69.728 104.037 35.328 87.237 35.328 87.237C0.928 74.437 -23.072 100.037 -26.272 100.837C-29.472 101.637 -34.272 104.837 -35.072 98.437C-35.872 92.037 -42.989 75.839 -75.073 101.637C-98.782 120.474 -111.655 100.11 -111.655 100.11L-115.655 107.237C-137.455 70.437 -124.236 128.765 -124.236 128.765C-115.436 163.165 16.128 121.637 16.128 121.637C16.128 121.637 184.928 91.237 196.129 87.237C207.329 83.237 299.911 89.419 299.911 89.419L294.529 71.092C229.729 24.691 212.929 49.637 199.329 45.637C185.728 41.637 188.128 51.237 184.928 52.037C181.728 52.837 142.528 28.037 136.128 28.837z"/></g>
-            <g style="fill: #eea575"><path d="M137.438 30.583C131.037 31.383 106.814 7.129 120.637 39.383C137.438 78.583 62.237 78.583 45.437 67.383C28.637 56.183 52.637 85.783 52.637 85.783C71.037 105.783 36.637 88.983 36.637 88.983C2.237 76.183 -21.763 101.783 -24.963 102.583C-28.163 103.383 -32.963 106.583 -33.763 100.183C-34.563 93.783 -41.548 77.752 -73.763 103.383C-98.709 122.965 -111.273 103.146 -111.273 103.146L-115.673 108.783C-135.473 73.982 -123.582 131.819 -123.582 131.819C-114.782 166.22 17.437 123.383 17.437 123.383C17.437 123.383 186.238 92.983 197.438 88.983C208.638 84.983 300.347 91.092 300.347 91.092L295.038 72.255C230.238 25.855 214.238 51.383 200.638 47.383C187.038 43.383 189.438 52.983 186.238 53.783C183.038 54.583 143.838 29.783 137.438 30.583z"/></g>
-            <g style="fill: #f1b288"><path d="M138.747 32.328C132.347 33.128 106.383 9.677 121.947 41.128C141.147 79.928 63.546 80.328 46.746 69.128C29.946 57.928 53.946 87.528 53.946 87.528C72.346 107.528 37.946 90.728 37.946 90.728C3.546 77.928 -20.454 103.528 -23.654 104.328C-26.854 105.128 -31.654 108.328 -32.454 101.928C-33.254 95.528 -40.108 79.665 -72.454 105.128C-98.636 125.456 -110.891 106.183 -110.891 106.183L-115.691 110.328C-133.691 77.128 -122.927 134.874 -122.927 134.874C-114.127 169.274 18.746 125.128 18.746 125.128C18.746 125.128 187.547 94.728 198.747 90.728C209.947 86.728 300.783 92.764 300.783 92.764L295.547 73.419C230.747 27.019 215.547 53.128 201.947 49.128C188.347 45.128 190.747 54.728 187.547 55.528C184.347 56.328 145.147 31.528 138.747 32.328z"/></g>
-            <g style="fill: #f3bf9c"><path d="M140.056 34.073C133.655 34.873 107.313 11.613 123.255 42.873C143.656 82.874 64.855 82.074 48.055 70.874C31.255 59.674 55.255 89.274 55.255 89.274C73.655 109.274 39.255 92.474 39.255 92.474C4.855 79.674 -19.145 105.274 -22.345 106.074C-25.545 106.874 -30.345 110.074 -31.145 103.674C-31.945 97.274 -38.668 81.578 -71.145 106.874C-98.564 127.947 -110.509 109.219 -110.509 109.219L-115.709 111.874C-131.709 81.674 -122.273 137.929 -122.273 137.929C-113.473 172.329 20.055 126.874 20.055 126.874C20.055 126.874 188.856 96.474 200.056 92.474C211.256 88.474 301.22 94.437 301.22 94.437L296.056 74.583C231.256 28.183 216.856 54.874 203.256 50.874C189.656 46.873 192.056 56.474 188.856 57.274C185.656 58.074 146.456 33.273 140.056 34.073z"/></g>
-            <g style="fill: #f5ccb0"><path d="M141.365 35.819C134.965 36.619 107.523 13.944 124.565 44.619C146.565 84.219 66.164 83.819 49.364 72.619C32.564 61.419 56.564 91.019 56.564 91.019C74.964 111.019 40.564 94.219 40.564 94.219C6.164 81.419 -17.836 107.019 -21.036 107.819C-24.236 108.619 -29.036 111.819 -29.836 105.419C-30.636 99.019 -37.227 83.492 -69.836 108.619C-98.491 130.438 -110.127 112.256 -110.127 112.256L-115.727 113.419C-130.128 85.019 -121.618 140.983 -121.618 140.983C-112.818 175.384 21.364 128.619 21.364 128.619C21.364 128.619 190.165 98.219 201.365 94.219C212.565 90.219 301.656 96.11 301.656 96.11L296.565 75.746C231.765 29.346 218.165 56.619 204.565 52.619C190.965 48.619 193.365 58.219 190.165 59.019C186.965 59.819 147.765 35.019 141.365 35.819z"/></g>
-            <g style="fill: #f8d8c4"><path d="M142.674 37.565C136.274 38.365 108.832 15.689 125.874 46.365C147.874 85.965 67.474 85.565 50.674 74.365C33.874 63.165 57.874 92.765 57.874 92.765C76.274 112.765 41.874 95.965 41.874 95.965C7.473 83.165 -16.527 108.765 -19.727 109.565C-22.927 110.365 -27.727 113.565 -28.527 107.165C-29.327 100.765 -35.786 85.405 -68.527 110.365C-98.418 132.929 -109.745 115.293 -109.745 115.293L-115.745 114.965C-129.346 88.564 -120.963 144.038 -120.963 144.038C-112.163 178.438 22.673 130.365 22.673 130.365C22.673 130.365 191.474 99.965 202.674 95.965C213.874 91.965 302.093 97.783 302.093 97.783L297.075 76.91C232.274 30.51 219.474 58.365 205.874 54.365C192.274 50.365 194.674 59.965 191.474 60.765C188.274 61.565 149.074 36.765 142.674 37.565z"/></g>
-            <g style="fill: #fae5d7"><path d="M143.983 39.31C137.583 40.11 110.529 17.223 127.183 48.11C149.183 88.91 68.783 87.31 51.983 76.11C35.183 64.91 59.183 94.51 59.183 94.51C77.583 114.51 43.183 97.71 43.183 97.71C8.783 84.91 -15.217 110.51 -18.417 111.31C-21.618 112.11 -26.418 115.31 -27.218 108.91C-28.018 102.51 -34.346 87.318 -67.218 112.11C-98.345 135.42 -109.363 118.329 -109.363 118.329L-115.764 116.51C-128.764 92.51 -120.309 147.093 -120.309 147.093C-111.509 181.493 23.983 132.11 23.983 132.11C23.983 132.11 192.783 101.71 203.983 97.71C215.183 93.71 302.529 99.456 302.529 99.456L297.583 78.074C232.783 31.673 220.783 60.11 207.183 56.11C193.583 52.11 195.983 61.71 192.783 62.51C189.583 63.31 150.383 38.51 143.983 39.31z"/></g>
-            <g style="fill: #fcf2eb"><path d="M145.292 41.055C138.892 41.855 112.917 18.411 128.492 49.855C149.692 92.656 70.092 89.056 53.292 77.856C36.492 66.656 60.492 96.256 60.492 96.256C78.892 116.256 44.492 99.456 44.492 99.456C10.092 86.656 -13.908 112.256 -17.108 113.056C-20.308 113.856 -25.108 117.056 -25.908 110.656C-26.708 104.256 -32.905 89.232 -65.908 113.856C-98.273 137.911 -108.982 121.365 -108.982 121.365L-115.782 118.056C-128.582 94.856 -119.654 150.147 -119.654 150.147C-110.854 184.547 25.292 133.856 25.292 133.856C25.292 133.856 194.093 103.456 205.293 99.456C216.493 95.456 302.965 101.128 302.965 101.128L298.093 79.237C233.292 32.837 222.093 61.856 208.493 57.856C194.893 53.855 197.293 63.456 194.093 64.256C190.892 65.056 151.692 40.255 145.292 41.055z"/></g>
-            <g style="fill: #ffffff"><path d="M-115.8 119.601C-128.6 97.6 -119 153.201 -119 153.201C-110.2 187.601 26.6 135.601 26.6 135.601C26.6 135.601 195.401 105.2 206.601 101.2C217.801 97.2 303.401 102.8 303.401 102.8L298.601 80.4C233.801 34 223.401 63.6 209.801 59.6C196.201 55.6 198.601 65.2 195.401 66C192.201 66.8 153.001 42 146.601 42.8C140.201 43.6 114.981 19.793 129.801 51.6C152.028 99.307 69.041 89.227 54.6 79.6C37.8 68.4 61.8 98 61.8 98C80.2 118.001 45.8 101.2 45.8 101.2C11.4 88.4 -12.6 114.001 -15.8 114.801C-19 115.601 -23.8 118.801 -24.6 112.401C-25.4 106 -31.465 91.144 -64.6 115.601C-98.2 140.401 -108.6 124.401 -108.6 124.401L-115.8 119.601z"/></g>
-            <g style="fill: #000000"><path d="M-74.2 149.601C-74.2 149.601 -81.4 161.201 -60.6 174.401C-60.6 174.401 -59.2 175.801 -77.2 171.601C-77.2 171.601 -83.4 169.601 -85 159.201C-85 159.201 -89.8 154.801 -94.6 149.201C-99.4 143.601 -74.2 149.601 -74.2 149.601z"/></g>
-            <g style="fill: #cccccc"><path d="M65.8 102C65.8 102 83.498 128.821 82.9 133.601C81.6 144.001 81.4 153.601 84.6 157.601C87.801 161.601 96.601 194.801 96.601 194.801C96.601 194.801 96.201 196.001 108.601 158.001C108.601 158.001 120.201 142.001 100.201 123.601C100.201 123.601 65 94.8 65.8 102z"/></g>
-            <g style="fill: #000000"><path d="M-54.2 176.401C-54.2 176.401 -43 183.601 -57.4 214.801L-51 212.401C-51 212.401 -51.8 223.601 -55 226.001L-47.8 222.801C-47.8 222.801 -43 230.801 -47 235.601C-47 235.601 -30.2 243.601 -31 250.001C-31 250.001 -24.6 242.001 -28.6 235.601C-32.6 229.201 -39.8 233.201 -39 214.801L-47.8 218.001C-47.8 218.001 -42.2 209.201 -42.2 202.801L-50.2 205.201C-50.2 205.201 -34.731 178.623 -45.4 177.201C-51.4 176.401 -54.2 176.401 -54.2 176.401z"/></g>
-            <g style="fill: #cccccc"><path d="M-21.8 193.201C-21.8 193.201 -19 188.801 -21.8 189.601C-24.6 190.401 -55.8 205.201 -61.8 214.801C-61.8 214.801 -27.4 190.401 -21.8 193.201z"/></g>
-            <g style="fill: #cccccc"><path d="M-11.4 201.201C-11.4 201.201 -8.6 196.801 -11.4 197.601C-14.2 198.401 -45.4 213.201 -51.4 222.801C-51.4 222.801 -17 198.401 -11.4 201.201z"/></g>
-            <g style="fill: #cccccc"><path d="M1.8 186.001C1.8 186.001 4.6 181.601 1.8 182.401C-1 183.201 -32.2 198.001 -38.2 207.601C-38.2 207.601 -3.8 183.201 1.8 186.001z"/></g>
-            <g style="fill: #cccccc"><path d="M-21.4 229.601C-21.4 229.601 -21.4 223.601 -24.2 224.401C-27 225.201 -63 242.801 -69 252.401C-69 252.401 -27 226.801 -21.4 229.601z"/></g>
-            <g style="fill: #cccccc"><path d="M-20.2 218.801C-20.2 218.801 -19 214.001 -21.8 214.801C-23.8 214.801 -50.2 226.401 -56.2 236.001C-56.2 236.001 -26.6 214.401 -20.2 218.801z"/></g>
-            <g style="fill: #cccccc"><path d="M-34.6 266.401L-44.6 274.001C-44.6 274.001 -34.2 266.401 -30.6 267.601C-30.6 267.601 -37.4 278.801 -38.2 284.001C-38.2 284.001 -27.8 271.201 -22.2 271.601C-22.2 271.601 -14.6 272.001 -14.6 282.801C-14.6 282.801 -9 272.401 -5.8 272.801C-5.8 272.801 -4.6 279.201 -5.8 286.001C-5.8 286.001 -1.8 278.401 2.2 280.001C2.2 280.001 8.6 278.001 7.8 289.601C7.8 289.601 7.8 300.001 7 302.801C7 302.801 12.6 276.401 15 276.001C15 276.001 23 274.801 27.8 283.601C27.8 283.601 23.8 276.001 28.6 278.001C28.6 278.001 39.4 279.601 42.6 286.401C42.6 286.401 35.8 274.401 41.4 277.601C41.4 277.601 48.2 277.601 49.4 284.001C49.4 284.001 57.8 305.201 59.8 306.801C59.8 306.801 52.2 285.201 53.8 285.201C53.8 285.201 51.8 273.201 57 288.001C57 288.001 53.8 274.001 59.4 274.801C65 275.601 69.4 285.601 77.8 283.201C77.8 283.201 87.401 288.801 89.401 219.601L-34.6 266.401z"/></g>
-            <g style="fill: #000000"><path d="M-29.8 173.601C-29.8 173.601 -15 167.601 25 173.601C25 173.601 32.2 174.001 39 165.201C45.8 156.401 72.6 149.201 79 151.201L88.601 157.601L89.401 158.801C89.401 158.801 101.801 169.201 102.201 176.801C102.601 184.401 87.801 232.401 78.2 248.401C68.6 264.401 59 276.801 39.8 274.401C39.8 274.401 19 270.401 -6.6 274.401C-6.6 274.401 -35.8 272.801 -38.6 264.801C-41.4 256.801 -27.4 241.601 -27.4 241.601C-27.4 241.601 -23 233.201 -24.2 218.801C-25.4 204.401 -25 176.401 -29.8 173.601z"/></g>
-            <g style="fill: #e5668c"><path d="M-7.8 175.601C0.6 194.001 -29 259.201 -29 259.201C-31 260.801 -16.34 266.846 -6.2 264.401C4.746 261.763 45 266.001 45 266.001C68.6 250.401 81.4 206.001 81.4 206.001C81.4 206.001 91.801 182.001 74.2 178.801C56.6 175.601 -7.8 175.601 -7.8 175.601z"/></g>
-            <g style="fill: #b23259"><path d="M-9.831 206.497C-6.505 193.707 -4.921 181.906 -7.8 175.601C-7.8 175.601 54.6 182.001 65.8 161.201C70.041 153.326 84.801 184.001 84.4 193.601C84.4 193.601 21.4 208.001 6.6 196.801L-9.831 206.497z"/></g>
-            <g style="fill: #a5264c"><path d="M-5.4 222.801C-5.4 222.801 -3.4 230.001 -5.8 234.001C-5.8 234.001 -7.4 234.801 -8.6 235.201C-8.6 235.201 -7.4 238.801 -1.4 240.401C-1.4 240.401 0.6 244.801 3 245.201C5.4 245.601 10.2 251.201 14.2 250.001C18.2 248.801 29.4 244.801 29.4 244.801C29.4 244.801 35 241.601 43.8 245.201C43.8 245.201 46.175 244.399 46.6 240.401C47.1 235.701 50.2 232.001 52.2 230.001C54.2 228.001 63.8 215.201 62.6 214.801C61.4 214.401 -5.4 222.801 -5.4 222.801z"/></g>
-            <g style="fill: #ff727f; stroke:#000000"><path d="M-9.8 174.401C-9.8 174.401 -12.6 196.801 -9.4 205.201C-6.2 213.601 -7 215.601 -7.8 219.601C-8.6 223.601 -4.2 233.601 1.4 239.601L13.4 241.201C13.4 241.201 28.6 237.601 37.8 240.401C37.8 240.401 46.794 241.744 50.2 226.801C50.2 226.801 55 220.401 62.2 217.601C69.4 214.801 76.6 173.201 72.6 165.201C68.6 157.201 54.2 152.801 38.2 168.401C22.2 184.001 20.2 167.201 -9.8 174.401z"/></g>
-            <g style="fill: #ffffcc; stroke:#000000; stroke-width:0.5"><path d="M-8.2 249.201C-8.2 249.201 -9 247.201 -13.4 246.801C-13.4 246.801 -35.8 243.201 -44.2 230.801C-44.2 230.801 -51 225.201 -46.6 236.801C-46.6 236.801 -36.2 257.201 -29.4 260.001C-29.4 260.001 -13 264.001 -8.2 249.201z"/></g>
-            <g style="fill: #cc3f4c"><path d="M71.742 185.229C72.401 177.323 74.354 168.709 72.6 165.201C66.154 152.307 49.181 157.695 38.2 168.401C22.2 184.001 20.2 167.201 -9.8 174.401C-9.8 174.401 -11.545 188.364 -10.705 198.376C-10.705 198.376 26.6 186.801 27.4 192.401C27.4 192.401 29 189.201 38.2 189.201C47.4 189.201 70.142 188.029 71.742 185.229z"/></g>
-            <g style="stroke:#a51926; stroke-width:2"><path d="M28.6 175.201C28.6 175.201 33.4 180.001 29.8 189.601C29.8 189.601 15.4 205.601 17.4 219.601"/></g>
-            <g style="fill: #ffffcc; stroke:#000000; stroke-width:0.5"><path d="M-19.4 260.001C-19.4 260.001 -23.8 247.201 -15 254.001C-15 254.001 -10.2 256.001 -11.4 257.601C-12.6 259.201 -18.2 263.201 -19.4 260.001z"/></g>
-            <g style="fill: #ffffcc; stroke:#000000; stroke-width:0.5"><path d="M-14.36 261.201C-14.36 261.201 -17.88 250.961 -10.84 256.401C-10.84 256.401 -6.419 258.849 -7.96 259.281C-12.52 260.561 -7.96 263.121 -14.36 261.201z"/></g>
-            <g style="fill: #ffffcc; stroke:#000000; stroke-width:0.5"><path d="M-9.56 261.201C-9.56 261.201 -13.08 250.961 -6.04 256.401C-6.04 256.401 -1.665 258.711 -3.16 259.281C-6.52 260.561 -3.16 263.121 -9.56 261.201z"/></g>
-            <g style="fill: #ffffcc; stroke:#000000; stroke-width:0.5"><path d="M-2.96 261.401C-2.96 261.401 -6.48 251.161 0.56 256.601C0.56 256.601 4.943 258.933 3.441 259.481C0.48 260.561 3.441 263.321 -2.96 261.401z"/></g>
-            <g style="fill: #ffffcc; stroke:#000000; stroke-width:0.5"><path d="M3.52 261.321C3.52 261.321 0 251.081 7.041 256.521C7.041 256.521 10.881 258.121 9.921 259.401C8.961 260.681 9.921 263.241 3.52 261.321z"/></g>
-            <g style="fill: #ffffcc; stroke:#000000; stroke-width:0.5"><path d="M10.2 262.001C10.2 262.001 5.4 249.601 14.6 256.001C14.6 256.001 19.4 258.001 18.2 259.601C17 261.201 18.2 264.401 10.2 262.001z"/></g>
-            <g style="stroke:#a5264c; stroke-width:2"><path d="M-18.2 244.801C-18.2 244.801 -5 242.001 1 245.201C1 245.201 7 246.401 8.2 246.001C9.4 245.601 12.6 245.201 12.6 245.201"/></g>
-            <g style="stroke:#a5264c; stroke-width:2"><path d="M15.8 253.601C15.8 253.601 27.8 240.001 39.8 244.401C46.816 246.974 45.8 243.601 46.6 240.801C47.4 238.001 47.6 233.801 52.6 230.801"/></g>
-            <g style="fill: #ffffcc; stroke:#000000; stroke-width:0.5"><path d="M33 237.601C33 237.601 29 226.801 26.2 239.601C23.4 252.401 20.2 256.001 18.6 258.801C18.6 258.801 18.6 264.001 27 263.601C27 263.601 37.8 263.201 38.2 260.401C38.6 257.601 37 246.001 33 237.601z"/></g>
-            <g style="stroke:#a5264c; stroke-width:2"><path d="M47 244.801C47 244.801 50.6 242.401 53 243.601"/></g>
-            <g style="stroke:#a5264c; stroke-width:2"><path d="M53.5 228.401C53.5 228.401 56.4 223.501 61.2 222.701"/></g>
-            <g style="fill: #b2b2b2"><path d="M-25.8 265.201C-25.8 265.201 -7.8 268.401 -3.4 266.801C-3.4 266.801 5.4 266.801 -3 268.801C-3 268.801 -15.8 268.801 -23.8 267.601C-23.8 267.601 -35.4 262.001 -25.8 265.201z"/></g>
-            <g style="fill: #ffffcc; stroke:#000000; stroke-width:0.5"><path d="M-11.8 172.001C-11.8 172.001 5.8 172.001 7.8 172.801C7.8 172.801 15 203.601 11.4 211.201C11.4 211.201 10.2 214.001 7.4 208.401C7.4 208.401 -11 175.601 -14.2 173.601C-17.4 171.601 -13 172.001 -11.8 172.001z"/></g>
-            <g style="fill: #ffffcc; stroke:#000000; stroke-width:0.5"><path d="M-88.9 169.301C-88.9 169.301 -80 171.001 -67.4 173.601C-67.4 173.601 -62.6 196.001 -59.4 200.801C-56.2 205.601 -59.8 205.601 -63.4 202.801C-67 200.001 -81.8 186.001 -83.8 181.601C-85.8 177.201 -88.9 169.301 -88.9 169.301z"/></g>
-            <g style="fill: #ffffcc; stroke:#000000; stroke-width:0.5"><path d="M-67.039 173.818C-67.039 173.818 -61.239 175.366 -60.23 177.581C-59.222 179.795 -61.432 183.092 -61.432 183.092C-61.432 183.092 -62.432 186.397 -63.634 184.235C-64.836 182.072 -67.708 174.412 -67.039 173.818z"/></g>
-            <g style="fill: #000000"><path d="M-67 173.601C-67 173.601 -63.4 178.801 -59.8 178.801C-56.2 178.801 -55.818 178.388 -53 179.001C-48.4 180.001 -48.8 178.001 -42.2 179.201C-39.56 179.681 -37 178.801 -34.2 180.001C-31.4 181.201 -28.2 180.401 -27 178.401C-25.8 176.401 -21 172.201 -21 172.201C-21 172.201 -33.8 174.001 -36.6 174.801C-36.6 174.801 -59 176.001 -67 173.601z"/></g>
-            <g style="fill: #ffffcc; stroke:#000000; stroke-width:0.5"><path d="M-22.4 173.801C-22.4 173.801 -28.85 177.301 -29.25 179.701C-29.65 182.101 -24 185.801 -24 185.801C-24 185.801 -21.25 190.401 -20.65 188.001C-20.05 185.601 -21.6 174.201 -22.4 173.801z"/></g>
-            <g style="fill: #ffffcc; stroke:#000000; stroke-width:0.5"><path d="M-59.885 179.265C-59.885 179.265 -52.878 190.453 -52.661 179.242C-52.661 179.242 -52.104 177.984 -53.864 177.962C-59.939 177.886 -58.418 173.784 -59.885 179.265z"/></g>
-            <g style="fill: #ffffcc; stroke:#000000; stroke-width:0.5"><path d="M-52.707 179.514C-52.707 179.514 -44.786 190.701 -45.422 179.421C-45.422 179.421 -45.415 179.089 -47.168 178.936C-51.915 178.522 -51.57 174.004 -52.707 179.514z"/></g>
-            <g style="fill: #ffffcc; stroke:#000000; stroke-width:0.5"><path d="M-45.494 179.522C-45.494 179.522 -37.534 190.15 -38.203 180.484C-38.203 180.484 -38.084 179.251 -39.738 178.95C-43.63 178.244 -43.841 174.995 -45.494 179.522z"/></g>
-            <g style="fill: #ffffcc; stroke:#000000; stroke-width:0.5"><path d="M-38.618 179.602C-38.618 179.602 -30.718 191.163 -30.37 181.382C-30.37 181.382 -28.726 180.004 -30.472 179.782C-36.29 179.042 -35.492 174.588 -38.618 179.602z"/></g>
-            <g style="fill: #e5e5b2"><path d="M-74.792 183.132L-82.45 181.601C-85.05 176.601 -87.15 170.451 -87.15 170.451C-87.15 170.451 -80.8 171.451 -68.3 174.251C-68.3 174.251 -67.424 177.569 -65.952 183.364L-74.792 183.132z"/></g>
-            <g style="fill: #e5e5b2"><path d="M-9.724 178.47C-11.39 175.964 -12.707 174.206 -13.357 173.8C-16.37 171.917 -12.227 172.294 -11.098 172.294C-11.098 172.294 5.473 172.294 7.356 173.047C7.356 173.047 7.88 175.289 8.564 178.68C8.564 178.68 -1.524 176.67 -9.724 178.47z"/></g>
-            <g style="fill: #cc7226"><path d="M43.88 40.321C71.601 44.281 97.121 8.641 98.881 -1.04C100.641 -10.72 90.521 -22.6 90.521 -22.6C91.841 -25.68 87.001 -39.76 81.721 -49C76.441 -58.24 60.54 -57.266 43 -58.24C27.16 -59.12 8.68 -35.8 7.36 -34.04C6.04 -32.28 12.2 6.001 13.52 11.721C14.84 17.441 12.2 43.841 12.2 43.841C46.44 34.741 16.16 36.361 43.88 40.321z"/></g>
-            <g style="fill: #ea8e51"><path d="M8.088 -33.392C6.792 -31.664 12.84 5.921 14.136 11.537C15.432 17.153 12.84 43.073 12.84 43.073C45.512 34.193 16.728 35.729 43.944 39.617C71.161 43.505 96.217 8.513 97.945 -0.992C99.673 -10.496 89.737 -22.16 89.737 -22.16C91.033 -25.184 86.281 -39.008 81.097 -48.08C75.913 -57.152 60.302 -56.195 43.08 -57.152C27.528 -58.016 9.384 -35.12 8.088 -33.392z"/></g>
-            <g style="fill: #efaa7c"><path d="M8.816 -32.744C7.544 -31.048 13.48 5.841 14.752 11.353C16.024 16.865 13.48 42.305 13.48 42.305C44.884 33.145 17.296 35.097 44.008 38.913C70.721 42.729 95.313 8.385 97.009 -0.944C98.705 -10.272 88.953 -21.72 88.953 -21.72C90.225 -24.688 85.561 -38.256 80.473 -47.16C75.385 -56.064 60.063 -55.125 43.16 -56.064C27.896 -56.912 10.088 -34.44 8.816 -32.744z"/></g>
-            <g style="fill: #f4c6a8"><path d="M9.544 -32.096C8.296 -30.432 14.12 5.761 15.368 11.169C16.616 16.577 14.12 41.537 14.12 41.537C43.556 32.497 17.864 34.465 44.072 38.209C70.281 41.953 94.409 8.257 96.073 -0.895C97.737 -10.048 88.169 -21.28 88.169 -21.28C89.417 -24.192 84.841 -37.504 79.849 -46.24C74.857 -54.976 59.824 -54.055 43.24 -54.976C28.264 -55.808 10.792 -33.76 9.544 -32.096z"/></g>
-            <g style="fill: #f9e2d3"><path d="M10.272 -31.448C9.048 -29.816 14.76 5.681 15.984 10.985C17.208 16.289 14.76 40.769 14.76 40.769C42.628 31.849 18.432 33.833 44.136 37.505C69.841 41.177 93.505 8.129 95.137 -0.848C96.769 -9.824 87.385 -20.84 87.385 -20.84C88.609 -23.696 84.121 -36.752 79.225 -45.32C74.329 -53.888 59.585 -52.985 43.32 -53.888C28.632 -54.704 11.496 -33.08 10.272 -31.448z"/></g>
-            <g style="fill: #ffffff"><path d="M44.2 36.8C69.4 40.4 92.601 8 94.201 -0.8C95.801 -9.6 86.601 -20.4 86.601 -20.4C87.801 -23.2 83.4 -36 78.6 -44.4C73.8 -52.8 59.346 -51.914 43.4 -52.8C29 -53.6 12.2 -32.4 11 -30.8C9.8 -29.2 15.4 5.6 16.6 10.8C17.8 16 15.4 40 15.4 40C40.9 31.4 19 33.2 44.2 36.8z"/></g>
-            <g style="fill: #cccccc"><path d="M90.601 2.8C90.601 2.8 62.8 10.4 51.2 8.8C51.2 8.8 35.4 2.2 26.6 24C26.6 24 23 31.2 21 33.2C19 35.2 90.601 2.8 90.601 2.8z"/></g>
-            <g style="fill: #000000"><path d="M94.401 0.6C94.401 0.6 65.4 12.8 55.4 12.4C55.4 12.4 39 7.8 30.6 22.4C30.6 22.4 22.2 31.6 19 33.2C19 33.2 18.6 34.8 25 30.8L35.4 36C35.4 36 50.2 45.6 59.8 29.6C59.8 29.6 63.8 18.4 63.8 16.4C63.8 14.4 85 8.8 86.601 8.4C88.201 8 94.801 3.8 94.401 0.6z"/></g>
-            <g style="fill: #99cc32"><path d="M47 36.514C40.128 36.514 31.755 32.649 31.755 26.4C31.755 20.152 40.128 13.887 47 13.887C53.874 13.887 59.446 18.952 59.446 25.2C59.446 31.449 53.874 36.514 47 36.514z"/></g>
-            <g style="fill: #659900"><path d="M43.377 19.83C38.531 20.552 33.442 22.055 33.514 21.839C35.054 17.22 41.415 13.887 47 13.887C51.296 13.887 55.084 15.865 57.32 18.875C57.32 18.875 52.004 18.545 43.377 19.83z"/></g>
-            <g style="fill: #ffffff"><path d="M55.4 19.6C55.4 19.6 51 16.4 51 18.6C51 18.6 54.6 23 55.4 19.6z"/></g>
-            <g style="fill: #000000"><path d="M45.4 27.726C42.901 27.726 40.875 25.7 40.875 23.2C40.875 20.701 42.901 18.675 45.4 18.675C47.9 18.675 49.926 20.701 49.926 23.2C49.926 25.7 47.9 27.726 45.4 27.726z"/></g>
-            <g style="fill: #cc7226"><path d="M-58.6 14.4C-58.6 14.4 -61.8 -6.8 -59.4 -11.2C-59.4 -11.2 -48.6 -21.2 -49 -24.8C-49 -24.8 -49.4 -42.8 -50.6 -43.6C-51.8 -44.4 -59.4 -50.4 -65.4 -44C-65.4 -44 -75.8 -26 -75 -19.6L-75 -17.6C-75 -17.6 -82.6 -18 -84.2 -16C-84.2 -16 -85.4 -10.8 -86.6 -10.4C-86.6 -10.4 -89.4 -8 -87.4 -5.2C-87.4 -5.2 -89.4 -2.8 -89 1.2L-81.4 5.2C-81.4 5.2 -79.4 19.6 -68.6 24.8C-63.764 27.129 -60.6 20.4 -58.6 14.4z"/></g>
-            <g style="fill: #ffffff"><path d="M-59.6 12.56C-59.6 12.56 -62.48 -6.52 -60.32 -10.48C-60.32 -10.48 -50.6 -19.48 -50.96 -22.72C-50.96 -22.72 -51.32 -38.92 -52.4 -39.64C-53.48 -40.36 -60.32 -45.76 -65.72 -40C-65.72 -40 -75.08 -23.8 -74.36 -18.04L-74.36 -16.24C-74.36 -16.24 -81.2 -16.6 -82.64 -14.8C-82.64 -14.8 -83.72 -10.12 -84.8 -9.76C-84.8 -9.76 -87.32 -7.6 -85.52 -5.08C-85.52 -5.08 -87.32 -2.92 -86.96 0.68L-80.12 4.28C-80.12 4.28 -78.32 17.24 -68.6 21.92C-64.248 24.015 -61.4 17.96 -59.6 12.56z"/></g>
-            <g style="fill: #eb955c"><path d="M-51.05 -42.61C-52.14 -43.47 -59.63 -49.24 -65.48 -43C-65.48 -43 -75.62 -25.45 -74.84 -19.21L-74.84 -17.26C-74.84 -17.26 -82.25 -17.65 -83.81 -15.7C-83.81 -15.7 -84.98 -10.63 -86.15 -10.24C-86.15 -10.24 -88.88 -7.9 -86.93 -5.17C-86.93 -5.17 -88.88 -2.83 -88.49 1.07L-81.08 4.97C-81.08 4.97 -79.13 19.01 -68.6 24.08C-63.886 26.35 -60.8 19.79 -58.85 13.94C-58.85 13.94 -61.97 -6.73 -59.63 -11.02C-59.63 -11.02 -49.1 -20.77 -49.49 -24.28C-49.49 -24.28 -49.88 -41.83 -51.05 -42.61z"/></g>
-            <g style="fill: #f2b892"><path d="M-51.5 -41.62C-52.48 -42.54 -59.86 -48.08 -65.56 -42C-65.56 -42 -75.44 -24.9 -74.68 -18.82L-74.68 -16.92C-74.68 -16.92 -81.9 -17.3 -83.42 -15.4C-83.42 -15.4 -84.56 -10.46 -85.7 -10.08C-85.7 -10.08 -88.36 -7.8 -86.46 -5.14C-86.46 -5.14 -88.36 -2.86 -87.98 0.94L-80.76 4.74C-80.76 4.74 -78.86 18.42 -68.6 23.36C-64.006 25.572 -61 19.18 -59.1 13.48C-59.1 13.48 -62.14 -6.66 -59.86 -10.84C-59.86 -10.84 -49.6 -20.34 -49.98 -23.76C-49.98 -23.76 -50.36 -40.86 -51.5 -41.62z"/></g>
-            <g style="fill: #f8dcc8"><path d="M-51.95 -40.63C-52.82 -41.61 -60.09 -46.92 -65.64 -41C-65.64 -41 -75.26 -24.35 -74.52 -18.43L-74.52 -16.58C-74.52 -16.58 -81.55 -16.95 -83.03 -15.1C-83.03 -15.1 -84.14 -10.29 -85.25 -9.92C-85.25 -9.92 -87.84 -7.7 -85.99 -5.11C-85.99 -5.11 -87.84 -2.89 -87.47 0.81L-80.44 4.51C-80.44 4.51 -78.59 17.83 -68.6 22.64C-64.127 24.794 -61.2 18.57 -59.35 13.02C-59.35 13.02 -62.31 -6.59 -60.09 -10.66C-60.09 -10.66 -50.1 -19.91 -50.47 -23.24C-50.47 -23.24 -50.84 -39.89 -51.95 -40.63z"/></g>
-            <g style="fill: #ffffff"><path d="M-59.6 12.46C-59.6 12.46 -62.48 -6.52 -60.32 -10.48C-60.32 -10.48 -50.6 -19.48 -50.96 -22.72C-50.96 -22.72 -51.32 -38.92 -52.4 -39.64C-53.16 -40.68 -60.32 -45.76 -65.72 -40C-65.72 -40 -75.08 -23.8 -74.36 -18.04L-74.36 -16.24C-74.36 -16.24 -81.2 -16.6 -82.64 -14.8C-82.64 -14.8 -83.72 -10.12 -84.8 -9.76C-84.8 -9.76 -87.32 -7.6 -85.52 -5.08C-85.52 -5.08 -87.32 -2.92 -86.96 0.68L-80.12 4.28C-80.12 4.28 -78.32 17.24 -68.6 21.92C-64.248 24.015 -61.4 17.86 -59.6 12.46z"/></g>
-            <g style="fill: #cccccc"><path d="M-62.7 6.2C-62.7 6.2 -84.3 -4 -85.2 -4.8C-85.2 -4.8 -76.1 3.4 -75.3 3.4C-74.5 3.4 -62.7 6.2 -62.7 6.2z"/></g>
-            <g style="fill: #000000"><path d="M-79.8 0C-79.8 0 -61.4 3.6 -61.4 8C-61.4 10.912 -61.643 24.331 -67 22.8C-75.4 20.4 -71.8 6 -79.8 0z"/></g>
-            <g style="fill: #99cc32"><path d="M-71.4 3.8C-71.4 3.8 -62.422 5.274 -61.4 8C-60.8 9.6 -60.137 17.908 -65.6 19C-70.152 19.911 -72.382 9.69 -71.4 3.8z"/></g>
-            <g style="fill: #000000"><path d="M14.595 46.349C14.098 44.607 15.409 44.738 17.2 44.2C19.2 43.6 31.4 39.8 32.2 37.2C33 34.6 46.2 39 46.2 39C48 39.8 52.4 42.4 52.4 42.4C57.2 43.6 63.8 44 63.8 44C66.2 45 69.6 47.8 69.6 47.8C84.2 58 96.601 50.8 96.601 50.8C116.601 44.2 110.601 27 110.601 27C107.601 18 110.801 14.6 110.801 14.6C111.001 10.8 118.201 17.2 118.201 17.2C120.801 21.4 121.601 26.4 121.601 26.4C129.601 37.6 126.201 19.8 126.201 19.8C126.401 18.8 123.601 15.2 123.601 14C123.601 12.8 121.801 9.4 121.801 9.4C118.801 6 121.201 -1 121.201 -1C123.001 -14.8 120.801 -13 120.801 -13C119.601 -14.8 110.401 -4.8 110.401 -4.8C108.201 -1.4 102.201 0.2 102.201 0.2C99.401 2 96.001 0.6 96.001 0.6C93.401 0.2 87.801 7.2 87.801 7.2C90.601 7 93.001 11.4 95.401 11.6C97.801 11.8 99.601 9.2 101.201 8.6C102.801 8 105.601 13.8 105.601 13.8C106.001 16.4 100.401 21.2 100.401 21.2C100.001 25.8 98.401 24.2 98.401 24.2C95.401 23.6 94.201 27.4 93.201 32C92.201 36.6 88.001 37 88.001 37C86.401 44.4 85.2 41.4 85.2 41.4C85 35.8 79 41.6 79 41.6C77.8 43.6 73.2 41.4 73.2 41.4C66.4 39.4 68.8 37.4 68.8 37.4C70.6 35.2 81.8 37.4 81.8 37.4C84 35.8 76 31.8 76 31.8C75.4 30 76.4 25.6 76.4 25.6C77.6 22.4 84.4 16.8 84.4 16.8C93.801 15.6 91.001 14 91.001 14C84.801 8.8 79 16.4 79 16.4C76.8 22.6 59.4 37.6 59.4 37.6C54.6 41 57.2 34.2 53.2 37.6C49.2 41 28.6 32 28.6 32C17.038 30.807 14.306 46.549 10.777 43.429C10.777 43.429 16.195 51.949 14.595 46.349z"/></g>
-            <g style="fill: #000000"><path d="M209.401 -120C209.401 -120 183.801 -112 181.001 -93.2C181.001 -93.2 178.601 -70.4 199.001 -52.8C199.001 -52.8 199.401 -46.4 201.401 -43.2C201.401 -43.2 199.801 -38.4 218.601 -46L245.801 -54.4C245.801 -54.4 252.201 -56.8 257.401 -65.6C262.601 -74.4 277.801 -93.2 274.201 -118.4C274.201 -118.4 275.401 -129.6 269.401 -130C269.401 -130 261.001 -131.6 253.801 -124C253.801 -124 247.001 -120.8 244.601 -121.2L209.401 -120z"/></g>
-            <g style="fill: #000000"><path d="M264.022 -120.99C264.022 -120.99 266.122 -129.92 261.282 -125.08C261.282 -125.08 254.242 -119.36 246.761 -119.36C246.761 -119.36 232.241 -117.16 227.841 -103.96C227.841 -103.96 223.881 -77.12 231.801 -71.4C231.801 -71.4 236.641 -63.92 243.681 -70.52C250.722 -77.12 266.222 -107.35 264.022 -120.99z"/></g>
-            <g style="fill: #323232"><path d="M263.648 -120.632C263.648 -120.632 265.738 -129.376 260.986 -124.624C260.986 -124.624 254.074 -119.008 246.729 -119.008C246.729 -119.008 232.473 -116.848 228.153 -103.888C228.153 -103.888 224.265 -77.536 232.041 -71.92C232.041 -71.92 236.793 -64.576 243.705 -71.056C250.618 -77.536 265.808 -107.24 263.648 -120.632z"/></g>
-            <g style="fill: #666666"><path d="M263.274 -120.274C263.274 -120.274 265.354 -128.832 260.69 -124.168C260.69 -124.168 253.906 -118.656 246.697 -118.656C246.697 -118.656 232.705 -116.536 228.465 -103.816C228.465 -103.816 224.649 -77.952 232.281 -72.44C232.281 -72.44 236.945 -65.232 243.729 -71.592C250.514 -77.952 265.394 -107.13 263.274 -120.274z"/></g>
-            <g style="fill: #999999"><path d="M262.9 -119.916C262.9 -119.916 264.97 -128.288 260.394 -123.712C260.394 -123.712 253.738 -118.304 246.665 -118.304C246.665 -118.304 232.937 -116.224 228.777 -103.744C228.777 -103.744 225.033 -78.368 232.521 -72.96C232.521 -72.96 237.097 -65.888 243.753 -72.128C250.41 -78.368 264.98 -107.02 262.9 -119.916z"/></g>
-            <g style="fill: #cccccc"><path d="M262.526 -119.558C262.526 -119.558 264.586 -127.744 260.098 -123.256C260.098 -123.256 253.569 -117.952 246.633 -117.952C246.633 -117.952 233.169 -115.912 229.089 -103.672C229.089 -103.672 225.417 -78.784 232.761 -73.48C232.761 -73.48 237.249 -66.544 243.777 -72.664C250.305 -78.784 264.566 -106.91 262.526 -119.558z"/></g>
-            <g style="fill: #ffffff"><path d="M262.151 -119.2C262.151 -119.2 264.201 -127.2 259.801 -122.8C259.801 -122.8 253.401 -117.6 246.601 -117.6C246.601 -117.6 233.401 -115.6 229.401 -103.6C229.401 -103.6 225.801 -79.2 233.001 -74C233.001 -74 237.401 -67.2 243.801 -73.2C250.201 -79.2 264.151 -106.8 262.151 -119.2z"/></g>
-            <g style="fill: #992600"><path d="M50.6 84C50.6 84 30.2 64.8 22.2 64C22.2 64 -12.2 60 -27 78C-27 78 -9.4 57.6 18.2 63.2C18.2 63.2 -3.4 58.8 -15.8 62C-15.8 62 -32.6 62 -42.2 76L-45 80.8C-45 80.8 -41 66 -22.6 60C-22.6 60 0.2 55.2 11 60C11 60 -10.6 53.2 -20.6 55.2C-20.6 55.2 -51 52.8 -63.8 79.2C-63.8 79.2 -59.8 64.8 -45 57.6C-45 57.6 -31.4 48.8 -11 51.6C-11 51.6 3.4 54.8 8.6 57.2C13.8 59.6 12.6 56.8 4.2 52C4.2 52 -1.4 42 -15.4 42.4C-15.4 42.4 -58.2 46 -68.6 58C-68.6 58 -55 46.8 -44.6 44C-44.6 44 -22.2 36 -13.8 36.8C-13.8 36.8 11 37.8 18.6 33.8C18.6 33.8 7.4 38.8 10.6 42C13.8 45.2 20.6 52.8 20.6 54C20.6 55.2 44.8 77.3 48.4 81.7L50.6 84z"/></g>
-            <g style="fill: #cccccc"><path d="M189 278C189 278 173.5 241.5 161 232C161 232 187 248 190.5 266C190.5 266 190.5 276 189 278z"/></g>
-            <g style="fill: #cccccc"><path d="M236 285.5C236 285.5 209.5 230.5 191 206.5C191 206.5 234.5 244 239.5 270.5L240 276L237 273.5C237 273.5 236.5 282.5 236 285.5z"/></g>
-            <g style="fill: #cccccc"><path d="M292.5 237C292.5 237 230 177.5 228.5 175C228.5 175 289 241 292 248.5C292 248.5 290 239.5 292.5 237z"/></g>
-            <g style="fill: #cccccc"><path d="M104 280.5C104 280.5 123.5 228.5 142.5 251C142.5 251 157.5 261 157 264C157 264 153 257.5 135 258C135 258 116 255 104 280.5z"/></g>
-            <g style="fill: #cccccc"><path d="M294.5 153C294.5 153 249.5 124.5 242 123C230.193 120.639 291.5 152 296.5 162.5C296.5 162.5 298.5 160 294.5 153z"/></g>
-            <g style="fill: #000000"><path d="M143.801 259.601C143.801 259.601 164.201 257.601 171.001 250.801L175.401 254.401L193.001 216.001L196.601 221.201C196.601 221.201 211.001 206.401 210.201 198.401C209.401 190.401 223.001 204.401 223.001 204.401C223.001 204.401 222.201 192.801 229.401 199.601C229.401 199.601 227.001 184.001 235.401 192.001C235.401 192.001 224.864 161.844 247.401 187.601C253.001 194.001 248.601 187.201 248.601 187.201C248.601 187.201 222.601 139.201 244.201 153.601C244.201 153.601 246.201 130.801 245.001 126.401C243.801 122.001 241.801 99.6 237.001 94.4C232.201 89.2 237.401 87.6 243.001 92.8C243.001 92.8 231.801 68.8 245.001 80.8C245.001 80.8 241.401 65.6 237.001 62.8C237.001 62.8 231.401 45.6 246.601 56.4C246.601 56.4 242.201 44 239.001 40.8C239.001 40.8 227.401 13.2 234.601 18L239.001 21.6C239.001 21.6 232.201 7.6 238.601 12C245.001 16.4 245.001 16 245.001 16C245.001 16 223.801 -17.2 244.201 0.4C244.201 0.4 236.042 -13.518 232.601 -20.4C232.601 -20.4 213.801 -40.8 228.201 -34.4L233.001 -32.8C233.001 -32.8 224.201 -42.8 216.201 -44.4C208.201 -46 218.601 -52.4 225.001 -50.4C231.401 -48.4 247.001 -40.8 247.001 -40.8C247.001 -40.8 259.801 -22 263.801 -21.6C263.801 -21.6 243.801 -29.2 249.801 -21.2C249.801 -21.2 264.201 -7.2 257.001 -7.6C257.001 -7.6 251.001 -0.4 255.801 8.4C255.801 8.4 237.342 -9.991 252.201 15.6L259.001 32C259.001 32 234.601 7.2 245.801 29.2C245.801 29.2 263.001 52.8 265.001 53.2C267.001 53.6 271.401 62.4 271.401 62.4L267.001 60.4L272.201 69.2C272.201 69.2 261.001 57.2 267.001 70.4L272.601 84.8C272.601 84.8 252.201 62.8 265.801 92.4C265.801 92.4 249.401 87.2 258.201 104.4C258.201 104.4 256.601 120.401 257.001 125.601C257.401 130.801 258.601 159.201 254.201 167.201C249.801 175.201 260.201 194.401 262.201 198.401C264.201 202.401 267.801 213.201 259.001 204.001C250.201 194.801 254.601 200.401 256.601 209.201C258.601 218.001 264.601 233.601 263.801 239.201C263.801 239.201 262.601 240.401 259.401 236.801C259.401 236.801 244.601 214.001 246.201 228.401C246.201 228.401 245.001 236.401 241.801 245.201C241.801 245.201 238.601 256.001 238.601 247.201C238.601 247.201 235.401 230.401 232.601 238.001C229.801 245.601 226.201 251.601 223.401 254.001C220.601 256.401 215.401 233.601 214.201 244.001C214.201 244.001 202.201 231.601 197.401 248.001L185.801 264.401C185.801 264.401 185.401 252.001 184.201 258.001C184.201 258.001 154.201 264.001 143.801 259.601z"/></g>
-            <g style="fill: #000000"><path d="M109.401 -97.2C109.401 -97.2 97.801 -105.2 93.801 -104.8C89.801 -104.4 121.401 -113.6 162.601 -86C162.601 -86 167.401 -83.2 171.001 -83.6C171.001 -83.6 174.201 -81.2 171.401 -77.6C171.401 -77.6 162.601 -68 173.801 -56.8C173.801 -56.8 192.201 -50 186.601 -58.8C186.601 -58.8 197.401 -54.8 199.801 -50.8C202.201 -46.8 201.001 -50.8 201.001 -50.8C201.001 -50.8 194.601 -58 188.601 -63.2C188.601 -63.2 183.401 -65.2 180.601 -73.6C177.801 -82 175.401 -92 179.801 -95.2C179.801 -95.2 175.801 -90.8 176.601 -94.8C177.401 -98.8 181.001 -102.4 182.601 -102.8C184.201 -103.2 200.601 -119 207.401 -119.4C207.401 -119.4 198.201 -118 195.201 -119C192.201 -120 165.601 -131.4 159.601 -132.6C159.601 -132.6 142.801 -139.2 154.801 -137.2C154.801 -137.2 190.601 -133.4 208.801 -120.2C208.801 -120.2 201.601 -128.6 183.201 -135.6C183.201 -135.6 161.001 -148.2 125.801 -143.2C125.801 -143.2 108.001 -140 100.201 -138.2C100.201 -138.2 97.601 -138.8 97.001 -139.2C96.401 -139.6 84.6 -148.6 57 -141.6C57 -141.6 40 -137 31.4 -132.2C31.4 -132.2 16.2 -131 12.6 -127.8C12.6 -127.8 -6 -113.2 -8 -112.4C-10 -111.6 -21.4 -104 -22.2 -103.6C-22.2 -103.6 2.4 -110.2 4.8 -112.6C7.2 -115 24.6 -117.6 27 -116.2C29.4 -114.8 37.8 -115.4 28.2 -114.8C28.2 -114.8 103.801 -100 104.601 -98C105.401 -96 109.401 -97.2 109.401 -97.2z"/></g>
-            <g style="fill: #cc7226"><path d="M180.801 -106.4C180.801 -106.4 170.601 -113.8 168.601 -113.8C166.601 -113.8 154.201 -124 150.001 -123.6C145.801 -123.2 133.601 -133.2 106.201 -125C106.201 -125 105.601 -127 109.201 -127.8C109.201 -127.8 115.601 -130 116.001 -130.6C116.001 -130.6 136.201 -134.8 143.401 -131.2C143.401 -131.2 152.601 -128.6 158.801 -122.4C158.801 -122.4 170.001 -119.2 173.201 -120.2C173.201 -120.2 182.001 -118 182.401 -116.2C182.401 -116.2 188.201 -113.2 186.401 -110.6C186.401 -110.6 186.801 -109 180.801 -106.4z"/></g>
-            <g style="fill: #cc7226"><path d="M168.33 -108.509C169.137 -107.877 170.156 -107.779 170.761 -106.97C170.995 -106.656 170.706 -106.33 170.391 -106.233C169.348 -105.916 168.292 -106.486 167.15 -105.898C166.748 -105.691 166.106 -105.873 165.553 -106.022C163.921 -106.463 162.092 -106.488 160.401 -105.8C158.416 -106.929 156.056 -106.345 153.975 -107.346C153.917 -107.373 153.695 -107.027 153.621 -107.054C150.575 -108.199 146.832 -107.916 144.401 -110.2C141.973 -110.612 139.616 -111.074 137.188 -111.754C135.37 -112.263 133.961 -113.252 132.341 -114.084C130.964 -114.792 129.507 -115.314 127.973 -115.686C126.11 -116.138 124.279 -116.026 122.386 -116.546C122.293 -116.571 122.101 -116.227 122.019 -116.254C121.695 -116.362 121.405 -116.945 121.234 -116.892C119.553 -116.37 118.065 -117.342 116.401 -117C115.223 -118.224 113.495 -117.979 111.949 -118.421C108.985 -119.269 105.831 -117.999 102.801 -119C106.914 -120.842 111.601 -119.61 115.663 -121.679C117.991 -122.865 120.653 -121.763 123.223 -122.523C123.71 -122.667 124.401 -122.869 124.801 -122.2C124.935 -122.335 125.117 -122.574 125.175 -122.546C127.625 -121.389 129.94 -120.115 132.422 -119.049C132.763 -118.903 133.295 -119.135 133.547 -118.933C135.067 -117.717 137.01 -117.82 138.401 -116.6C140.099 -117.102 141.892 -116.722 143.621 -117.346C143.698 -117.373 143.932 -117.032 143.965 -117.054C145.095 -117.802 146.25 -117.531 147.142 -117.227C147.48 -117.112 148.143 -116.865 148.448 -116.791C149.574 -116.515 150.43 -116.035 151.609 -115.852C151.723 -115.834 151.908 -116.174 151.98 -116.146C153.103 -115.708 154.145 -115.764 154.801 -114.6C154.936 -114.735 155.101 -114.973 155.183 -114.946C156.21 -114.608 156.859 -113.853 157.96 -113.612C158.445 -113.506 159.057 -112.88 159.633 -112.704C162.025 -111.973 163.868 -110.444 166.062 -109.549C166.821 -109.239 167.697 -109.005 168.33 -108.509z"/></g>
-            <g style="fill: #cc7226"><path d="M91.696 -122.739C89.178 -124.464 86.81 -125.57 84.368 -127.356C84.187 -127.489 83.827 -127.319 83.625 -127.441C82.618 -128.05 81.73 -128.631 80.748 -129.327C80.209 -129.709 79.388 -129.698 78.88 -129.956C76.336 -131.248 73.707 -131.806 71.2 -133C71.882 -133.638 73.004 -133.394 73.6 -134.2C73.795 -133.92 74.033 -133.636 74.386 -133.827C76.064 -134.731 77.914 -134.884 79.59 -134.794C81.294 -134.702 83.014 -134.397 84.789 -134.125C85.096 -134.078 85.295 -133.555 85.618 -133.458C87.846 -132.795 90.235 -133.32 92.354 -132.482C93.945 -131.853 95.515 -131.03 96.754 -129.755C97.006 -129.495 96.681 -129.194 96.401 -129C96.789 -129.109 97.062 -128.903 97.173 -128.59C97.257 -128.351 97.257 -128.049 97.173 -127.81C97.061 -127.498 96.782 -127.397 96.408 -127.346C95.001 -127.156 96.773 -128.536 96.073 -128.088C94.8 -127.274 95.546 -125.868 94.801 -124.6C94.521 -124.794 94.291 -125.012 94.401 -125.4C94.635 -124.878 94.033 -124.588 93.865 -124.272C93.48 -123.547 92.581 -122.132 91.696 -122.739z"/></g>
-            <g style="fill: #cc7226"><path d="M59.198 -115.391C56.044 -116.185 52.994 -116.07 49.978 -117.346C49.911 -117.374 49.688 -117.027 49.624 -117.054C48.258 -117.648 47.34 -118.614 46.264 -119.66C45.351 -120.548 43.693 -120.161 42.419 -120.648C42.095 -120.772 41.892 -121.284 41.591 -121.323C40.372 -121.48 39.445 -122.429 38.4 -123C40.736 -123.795 43.147 -123.764 45.609 -124.148C45.722 -124.166 45.867 -123.845 46 -123.845C46.136 -123.845 46.266 -124.066 46.4 -124.2C46.595 -123.92 46.897 -123.594 47.154 -123.848C47.702 -124.388 48.258 -124.198 48.798 -124.158C48.942 -124.148 49.067 -123.845 49.2 -123.845C49.336 -123.845 49.467 -124.156 49.6 -124.156C49.736 -124.155 49.867 -123.845 50 -123.845C50.136 -123.845 50.266 -124.066 50.4 -124.2C51.092 -123.418 51.977 -123.972 52.799 -123.793C53.837 -123.566 54.104 -122.418 55.178 -122.12C59.893 -120.816 64.03 -118.671 68.393 -116.584C68.7 -116.437 68.91 -116.189 68.8 -115.8C69.067 -115.8 69.38 -115.888 69.57 -115.756C70.628 -115.024 71.669 -114.476 72.366 -113.378C72.582 -113.039 72.253 -112.632 72.02 -112.684C67.591 -113.679 63.585 -114.287 59.198 -115.391z"/></g>
-            <g style="fill: #cc7226"><path d="M45.338 -71.179C43.746 -72.398 43.162 -74.429 42.034 -76.221C41.82 -76.561 42.094 -76.875 42.411 -76.964C42.971 -77.123 43.514 -76.645 43.923 -76.443C45.668 -75.581 47.203 -74.339 49.2 -74.2C51.19 -71.966 55.45 -71.581 55.457 -68.2C55.458 -67.341 54.03 -68.259 53.6 -67.4C51.149 -68.403 48.76 -68.3 46.38 -69.767C45.763 -70.148 46.093 -70.601 45.338 -71.179z"/></g>
-            <g style="fill: #cc7226"><path d="M17.8 -123.756C17.935 -123.755 24.966 -123.522 24.949 -123.408C24.904 -123.099 17.174 -122.05 16.81 -122.22C16.646 -122.296 9.134 -119.866 9 -120C9.268 -120.135 17.534 -123.756 17.8 -123.756z"/></g>
-            <g style="fill: #000000"><path d="M33.2 -114C33.2 -114 18.4 -112.2 14 -111C9.6 -109.8 -9 -102.2 -12 -100.2C-12 -100.2 -25.4 -94.8 -42.4 -74.8C-42.4 -74.8 -34.8 -78.2 -32.6 -81C-32.6 -81 -19 -93.6 -19.2 -91C-19.2 -91 -7 -99.6 -7.6 -97.4C-7.6 -97.4 16.8 -108.6 14.8 -105.4C14.8 -105.4 36.4 -110 35.4 -108C35.4 -108 54.2 -103.6 51.4 -103.4C51.4 -103.4 45.6 -102.2 52 -98.6C52 -98.6 48.6 -94.2 43.2 -98.2C37.8 -102.2 40.8 -100 35.8 -99C35.8 -99 33.2 -98.2 28.6 -102.2C28.6 -102.2 23 -106.8 14.2 -103.2C14.2 -103.2 -16.4 -90.6 -18.4 -90C-18.4 -90 -22 -87.2 -24.4 -83.6C-24.4 -83.6 -30.2 -79.2 -33.2 -77.8C-33.2 -77.8 -46 -66.2 -47.2 -64.8C-47.2 -64.8 -50.6 -59.6 -51.4 -59.2C-51.4 -59.2 -45 -63 -43 -65C-43 -65 -29 -75 -23.6 -75.8C-23.6 -75.8 -19.2 -78.8 -18.4 -80.2C-18.4 -80.2 -4 -89.4 0.2 -89.4C0.2 -89.4 9.4 -84.2 11.8 -91.2C11.8 -91.2 17.6 -93 23.2 -91.8C23.2 -91.8 26.4 -94.4 25.6 -96.6C25.6 -96.6 27.2 -98.4 28.2 -94.6C28.2 -94.6 31.6 -91 36.4 -93C36.4 -93 40.4 -93.2 38.4 -90.8C38.4 -90.8 34 -87 22.2 -86.8C22.2 -86.8 9.8 -86.2 -6.6 -78.6C-6.6 -78.6 -36.4 -68.2 -45.6 -57.8C-45.6 -57.8 -52 -49 -57.4 -47.8C-57.4 -47.8 -63.2 -47 -69.2 -39.6C-69.2 -39.6 -59.4 -45.4 -50.4 -45.4C-50.4 -45.4 -46.4 -47.8 -50.2 -44.2C-50.2 -44.2 -53.8 -36.6 -52.2 -31.2C-52.2 -31.2 -52.8 -26 -53.6 -24.4C-53.6 -24.4 -61.4 -11.6 -61.4 -9.2C-61.4 -6.8 -60.2 3 -59.8 3.6C-59.4 4.2 -60.8 2 -57 4.4C-53.2 6.8 -50.4 8.4 -49.6 11.2C-48.8 14 -51.6 5.8 -51.8 4C-52 2.2 -56.2 -5 -55.4 -7.4C-55.4 -7.4 -54.4 -6.4 -53.6 -5C-53.6 -5 -54.2 -5.6 -53.6 -9.2C-53.6 -9.2 -52.8 -14.4 -51.4 -17.6C-50 -20.8 -48 -24.6 -47.6 -25.4C-47.2 -26.2 -47.2 -32 -45.8 -29.4L-42.4 -26.8C-42.4 -26.8 -45.2 -29.4 -43 -31.6C-43 -31.6 -44 -37.2 -42.2 -39.8C-42.2 -39.8 -35.2 -48.2 -33.6 -49.2C-32 -50.2 -33.4 -49.8 -33.4 -49.8C-33.4 -49.8 -27.4 -54 -33.2 -52.4C-33.2 -52.4 -37.2 -50.8 -40.2 -50.8C-40.2 -50.8 -47.8 -48.8 -43.8 -53C-39.8 -57.2 -29.8 -62.6 -26 -62.4L-25.2 -60.8L-14 -63.2L-15.2 -62.4C-15.2 -62.4 -15.4 -62.6 -11.2 -63C-7 -63.4 -1.2 -62 0.2 -63.8C1.6 -65.6 5 -66.6 4.6 -65.2C4.2 -63.8 4 -61.8 4 -61.8C4 -61.8 9 -67.6 8.4 -65.4C7.8 -63.2 -0.4 -58 -1.8 -51.8L8.6 -60L12.2 -63C12.2 -63 15.8 -60.8 16 -62.4C16.2 -64 20.8 -69.8 22 -69.6C23.2 -69.4 25.2 -72.2 25 -69.6C24.8 -67 32.4 -61.6 32.4 -61.6C32.4 -61.6 35.6 -63.4 37 -62C38.4 -60.6 42.6 -81.8 42.6 -81.8L67.6 -92.4L111.201 -95.8L94.201 -102.6L33.2 -114z"/></g>
-            <g style="stroke:#4c0000; stroke-width:2"><path d="M51.4 85C51.4 85 36.4 68.2 28 65.6C28 65.6 14.6 58.8 -10 66.6"/></g>
-            <g style="stroke:#4c0000; stroke-width:2"><path d="M24.8 64.2C24.8 64.2 -0.4 56.2 -15.8 60.4C-15.8 60.4 -34.2 62.4 -42.6 76.2"/></g>
-            <g style="stroke:#4c0000; stroke-width:2"><path d="M21.2 63C21.2 63 4.2 55.8 -10.6 53.6C-10.6 53.6 -27.2 51 -43.8 58.2C-43.8 58.2 -56 64.2 -61.4 74.4"/></g>
-            <g style="stroke:#4c0000; stroke-width:2"><path d="M22.2 63.4C22.2 63.4 6.8 52.4 5.8 51C5.8 51 -1.2 40 -14.2 39.6C-14.2 39.6 -35.6 40.4 -52.8 48.4"/></g>
-            <g style="fill: #000000"><path d="M20.895 54.407C22.437 55.87 49.4 84.8 49.4 84.8C84.6 121.401 56.6 87.2 56.6 87.2C49 82.4 39.8 63.6 39.8 63.6C38.6 60.8 53.8 70.8 53.8 70.8C57.8 71.6 71.4 90.8 71.4 90.8C64.6 88.4 69.4 95.6 69.4 95.6C72.2 97.6 92.601 113.201 92.601 113.201C96.201 117.201 100.201 118.801 100.201 118.801C114.201 113.601 107.801 126.801 107.801 126.801C110.201 133.601 115.801 122.001 115.801 122.001C127.001 105.2 110.601 107.601 110.601 107.601C80.6 110.401 73.8 94.4 73.8 94.4C71.4 92 80.2 94.4 80.2 94.4C88.601 96.4 73 82 73 82C75.4 82 84.6 88.8 84.6 88.8C95.001 98 97.001 96 97.001 96C115.001 87.2 125.401 94.8 125.401 94.8C127.401 96.4 121.801 103.2 123.401 108.401C125.001 113.601 129.801 126.001 129.801 126.001C127.401 127.601 127.801 138.401 127.801 138.401C144.601 161.601 135.001 159.601 135.001 159.601C119.401 159.201 134.201 166.801 134.201 166.801C137.401 168.801 146.201 176.001 146.201 176.001C143.401 174.801 141.801 180.001 141.801 180.001C146.601 184.001 143.801 188.801 143.801 188.801C137.801 190.001 136.601 194.001 136.601 194.001C143.401 202.001 133.401 202.401 133.401 202.401C137.001 206.801 132.201 218.801 132.201 218.801C127.401 218.801 121.001 224.401 121.001 224.401C123.401 229.201 113.001 234.801 113.001 234.801C104.601 236.401 107.401 243.201 107.401 243.201C99.401 249.201 97.001 265.201 97.001 265.201C96.201 275.601 93.801 278.801 99.001 276.801C104.201 274.801 103.401 262.401 103.401 262.401C98.601 246.801 141.401 230.801 141.401 230.801C145.401 229.201 146.201 224.001 146.201 224.001C148.201 224.401 157.001 232.001 157.001 232.001C164.601 243.201 165.001 234.001 165.001 234.001C166.201 230.401 164.601 224.401 164.601 224.401C170.601 202.801 156.601 196.401 156.601 196.401C146.601 162.801 160.601 171.201 160.601 171.201C163.401 176.801 174.201 182.001 174.201 182.001L177.801 179.601C176.201 174.801 184.601 168.801 184.601 168.801C187.401 175.201 193.401 167.201 193.401 167.201C197.001 142.801 209.401 157.201 209.401 157.201C213.401 158.401 214.601 151.601 214.601 151.601C218.201 141.201 214.601 127.601 214.601 127.601C218.201 127.201 227.801 133.201 227.801 133.201C230.601 129.601 221.401 112.801 225.401 115.201C229.401 117.601 233.801 119.201 233.801 119.201C234.601 117.201 224.601 104.801 224.601 104.801C220.201 102 215.001 81.6 215.001 81.6C222.201 85.2 212.201 70 212.201 70C212.201 66.8 218.201 55.6 218.201 55.6C217.401 48.8 218.201 49.2 218.201 49.2C221.001 50.4 229.001 52 222.201 45.6C215.401 39.2 223.001 34.4 223.001 34.4C227.401 31.6 213.801 32 213.801 32C208.601 27.6 209.001 23.6 209.001 23.6C217.001 25.6 202.601 11.2 200.201 7.6C197.801 4 207.401 -1.2 207.401 -1.2C220.601 -4.8 209.001 -8 209.001 -8C189.401 -7.6 200.201 -18.4 200.201 -18.4C206.201 -18 204.601 -20.4 204.601 -20.4C199.401 -21.6 189.801 -28 189.801 -28C185.801 -31.6 189.401 -30.8 189.401 -30.8C206.201 -29.6 177.401 -40.8 177.401 -40.8C185.401 -40.8 167.401 -51.2 167.401 -51.2C165.401 -52.8 162.201 -60.4 162.201 -60.4C156.201 -65.6 151.401 -72.4 151.401 -72.4C151.001 -76.8 146.201 -81.6 146.201 -81.6C134.601 -95.2 129.001 -94.8 129.001 -94.8C114.201 -98.4 109.001 -97.6 109.001 -97.6L56.2 -93.2C29.8 -80.4 37.6 -59.4 37.6 -59.4C44 -51 53.2 -54.8 53.2 -54.8C57.8 -61 69.4 -58.8 69.4 -58.8C89.801 -55.6 87.201 -59.2 87.201 -59.2C84.801 -63.8 68.6 -70 68.4 -70.6C68.2 -71.2 59.4 -74.6 59.4 -74.6C56.4 -75.8 52 -85 52 -85C48.8 -88.4 64.6 -82.6 64.6 -82.6C63.4 -81.6 70.8 -77.6 70.8 -77.6C88.201 -78.6 98.801 -67.8 98.801 -67.8C109.601 -51.2 109.801 -59.4 109.801 -59.4C112.601 -68.8 100.801 -90 100.801 -90C101.201 -92 109.401 -85.4 109.401 -85.4C110.801 -87.4 111.601 -81.6 111.601 -81.6C111.801 -79.2 115.601 -71.2 115.601 -71.2C118.401 -58.2 122.001 -65.6 122.001 -65.6L126.601 -56.2C128.001 -53.6 122.001 -46 122.001 -46C121.801 -43.2 122.601 -43.4 117.001 -35.8C111.401 -28.2 114.801 -23.8 114.801 -23.8C113.401 -17.2 122.201 -17.6 122.201 -17.6C124.801 -15.4 128.201 -15.4 128.201 -15.4C130.001 -13.4 132.401 -14 132.401 -14C134.001 -17.8 140.201 -15.8 140.201 -15.8C141.601 -18.2 149.801 -18.6 149.801 -18.6C150.801 -21.2 151.201 -22.8 154.601 -23.4C158.001 -24 133.401 -67 133.401 -67C139.801 -67.8 131.601 -80.2 131.601 -80.2C129.401 -86.8 140.801 -72.2 143.001 -70.8C145.201 -69.4 146.201 -67.2 144.601 -67.4C143.001 -67.6 141.201 -65.4 142.601 -65.2C144.001 -65 157.001 -50 160.401 -39.8C163.801 -29.6 169.801 -25.6 176.001 -19.6C182.201 -13.6 181.401 10.6 181.401 10.6C181.001 19.4 187.001 30 187.001 30C189.001 33.8 184.801 52 184.801 52C182.801 54.2 184.201 55 184.201 55C185.201 56.2 192.001 69.4 192.001 69.4C190.201 69.2 193.801 72.8 193.801 72.8C199.001 78.8 192.601 75.8 192.601 75.8C186.601 74.2 193.601 84 193.601 84C194.801 85.8 185.801 81.2 185.801 81.2C176.601 80.6 188.201 87.8 188.201 87.8C196.801 95 185.401 90.6 185.401 90.6C180.801 88.8 184.001 95.6 184.001 95.6C187.201 97.2 204.401 104.2 204.401 104.2C204.801 108.001 201.801 113.001 201.801 113.001C202.201 117.001 200.001 120.401 200.001 120.401C198.801 128.601 198.201 129.401 198.201 129.401C194.001 129.601 186.601 143.401 186.601 143.401C184.801 146.001 174.601 158.001 174.601 158.001C172.601 165.001 154.601 157.801 154.601 157.801C148.001 161.201 150.001 157.801 150.001 157.801C149.601 155.601 154.401 149.601 154.401 149.601C161.401 147.001 158.801 136.201 158.801 136.201C162.801 134.801 151.601 132.001 151.801 130.801C152.001 129.601 157.801 128.201 157.801 128.201C165.801 126.201 161.401 123.801 161.401 123.801C160.801 119.801 163.801 114.201 163.801 114.201C175.401 113.401 163.801 97.2 163.801 97.2C153.001 89.6 152.001 83.8 152.001 83.8C164.601 75.6 156.401 63.2 156.601 59.6C156.801 56 158.001 34.4 158.001 34.4C156.001 28.2 153.001 14.6 153.001 14.6C155.201 9.4 162.601 -3.2 162.601 -3.2C165.401 -7.4 174.201 -12.2 172.001 -15.2C169.801 -18.2 162.001 -16.4 162.001 -16.4C154.201 -17.8 154.801 -12.6 154.801 -12.6C153.201 -11.6 152.401 -6.6 152.401 -6.6C151.68 1.333 142.801 7.6 142.801 7.6C131.601 13.8 140.801 17.8 140.801 17.8C146.801 24.4 137.001 24.6 137.001 24.6C126.001 22.8 134.201 33 134.201 33C145.001 45.8 142.001 48.6 142.001 48.6C131.801 49.6 144.401 58.8 144.401 58.8C144.401 58.8 143.601 56.8 143.801 58.6C144.001 60.4 147.001 64.6 147.801 66.6C148.601 68.6 144.601 68.8 144.601 68.8C145.201 78.4 129.801 74.2 129.801 74.2C129.801 74.2 129.801 74.2 128.201 74.4C126.601 74.6 115.401 73.8 109.601 71.6C103.801 69.4 97.001 69.4 97.001 69.4C97.001 69.4 93.001 71.2 85.4 71C77.8 70.8 69.8 73.6 69.8 73.6C65.4 73.2 74 68.8 74.2 69C74.4 69.2 80 63.6 72 64.2C50.203 65.835 39.4 55.6 39.4 55.6C37.4 54.2 34.8 51.4 34.8 51.4C24.8 49.4 36.2 63.8 36.2 63.8C37.4 65.2 36 66.2 36 66.2C35.2 64.6 27.4 59.2 27.4 59.2C24.589 58.227 23.226 56.893 20.895 54.407z"/></g>
-            <g style="fill: #4c0000"><path d="M-3 42.8C-3 42.8 8.6 48.4 11.2 51.2C13.8 54 27.8 65.4 27.8 65.4C27.8 65.4 22.4 63.4 19.8 61.6C17.2 59.8 6.4 51.6 6.4 51.6C6.4 51.6 2.6 45.6 -3 42.8z"/></g>
-            <g style="fill: #99cc32"><path d="M-61.009 11.603C-60.672 11.455 -61.196 8.743 -61.4 8.2C-62.422 5.474 -71.4 4 -71.4 4C-71.627 5.365 -71.682 6.961 -71.576 8.599C-71.576 8.599 -66.708 14.118 -61.009 11.603z"/></g>
-            <g style="fill: #659900"><path d="M-61.009 11.403C-61.458 11.561 -61.024 8.669 -61.2 8.2C-62.222 5.474 -71.4 3.9 -71.4 3.9C-71.627 5.265 -71.682 6.861 -71.576 8.499C-71.576 8.499 -67.308 13.618 -61.009 11.403z"/></g>
-            <g style="fill: #000000"><path d="M-65.4 11.546C-66.025 11.546 -66.531 10.406 -66.531 9C-66.531 7.595 -66.025 6.455 -65.4 6.455C-64.775 6.455 -64.268 7.595 -64.268 9C-64.268 10.406 -64.775 11.546 -65.4 11.546z"/></g>
-            <g style="fill: #000000"><path d="M-65.4 9z"/></g>
-            <g style="fill: #000000"><path d="M-111 109.601C-111 109.601 -116.6 119.601 -91.8 113.601C-91.8 113.601 -77.8 112.401 -75.4 110.001C-74.2 110.801 -65.834 113.734 -63 114.401C-56.2 116.001 -47.8 106 -47.8 106C-47.8 106 -43.2 95.5 -40.4 95.5C-37.6 95.5 -40.8 97.1 -40.8 97.1C-40.8 97.1 -47.4 107.201 -47 108.801C-47 108.801 -52.2 128.801 -68.2 129.601C-68.2 129.601 -84.35 130.551 -83 136.401C-83 136.401 -74.2 134.001 -71.8 136.401C-71.8 136.401 -61 136.001 -69 142.401L-75.8 154.001C-75.8 154.001 -75.66 157.919 -85.8 154.401C-95.6 151.001 -105.9 138.101 -105.9 138.101C-105.9 138.101 -121.85 123.551 -111 109.601z"/></g>
-            <g style="fill: #e59999"><path d="M-112.2 113.601C-112.2 113.601 -114.2 123.201 -77.4 112.801C-77.4 112.801 -73 112.801 -70.6 113.601C-68.2 114.401 -56.2 117.201 -54.2 116.001C-54.2 116.001 -61.4 129.601 -73 128.001C-73 128.001 -86.2 129.601 -85.8 134.401C-85.8 134.401 -81.8 141.601 -77 144.001C-77 144.001 -74.2 146.401 -74.6 149.601C-75 152.801 -77.8 154.401 -79.8 155.201C-81.8 156.001 -85 152.801 -86.6 152.801C-88.2 152.801 -96.6 146.401 -101 141.601C-105.4 136.801 -113.8 124.801 -113.4 122.001C-113 119.201 -112.2 113.601 -112.2 113.601z"/></g>
-            <g style="fill: #b26565"><path d="M-109 131.051C-106.4 135.001 -103.2 139.201 -101 141.601C-96.6 146.401 -88.2 152.801 -86.6 152.801C-85 152.801 -81.8 156.001 -79.8 155.201C-77.8 154.401 -75 152.801 -74.6 149.601C-74.2 146.401 -77 144.001 -77 144.001C-80.066 142.468 -82.806 138.976 -84.385 136.653C-84.385 136.653 -84.2 139.201 -89.4 138.401C-94.6 137.601 -99.8 134.801 -101.4 131.601C-103 128.401 -105.4 126.001 -103.8 129.601C-102.2 133.201 -99.8 136.801 -98.2 137.201C-96.6 137.601 -97 138.801 -99.4 138.401C-101.8 138.001 -104.6 137.601 -109 132.401z"/></g>
-            <g style="fill: #992600"><path d="M-111.6 110.001C-111.6 110.001 -109.8 96.4 -108.6 92.4C-108.6 92.4 -109.4 85.6 -107 81.4C-104.6 77.2 -102.6 71 -99.6 65.6C-96.6 60.2 -96.4 56.2 -92.4 54.6C-88.4 53 -82.4 44.4 -79.6 43.4C-76.8 42.4 -77 43.2 -77 43.2C-77 43.2 -70.2 28.4 -56.6 32.4C-56.6 32.4 -72.8 29.6 -57 20.2C-57 20.2 -61.8 21.3 -58.5 14.3C-56.299 9.632 -56.8 16.4 -67.8 28.2C-67.8 28.2 -72.8 36.8 -78 39.8C-83.2 42.8 -95.2 49.8 -96.4 53.6C-97.6 57.4 -100.8 63.2 -102.8 64.8C-104.8 66.4 -107.6 70.6 -108 74C-108 74 -109.2 78 -110.6 79.2C-112 80.4 -112.2 83.6 -112.2 85.6C-112.2 87.6 -114.2 90.4 -114 92.8C-114 92.8 -113.2 111.801 -113.6 113.801L-111.6 110.001z"/></g>
-            <g style="fill: #ffffff"><path d="M-120.2 114.601C-120.2 114.601 -122.2 113.201 -126.6 119.201C-126.6 119.201 -119.3 152.201 -119.3 153.601C-119.3 153.601 -118.2 151.501 -119.5 144.301C-120.8 137.101 -121.7 124.401 -121.7 124.401L-120.2 114.601z"/></g>
-            <g style="fill: #992600"><path d="M-98.6 54C-98.6 54 -116.2 57.2 -115.8 86.4L-116.6 111.201C-116.6 111.201 -117.8 85.6 -119 84C-120.2 82.4 -116.2 71.2 -119.4 77.2C-119.4 77.2 -133.4 91.2 -125.4 112.401C-125.4 112.401 -123.9 115.701 -126.9 111.101C-126.9 111.101 -131.5 98.5 -130.4 92.1C-130.4 92.1 -130.2 89.9 -128.3 87.1C-128.3 87.1 -119.7 75.4 -117 73.1C-117 73.1 -115.2 58.7 -99.8 53.5C-99.8 53.5 -94.1 51.2 -98.6 54z"/></g>
-            <g style="fill: #000000"><path d="M40.8 -12.2C41.46 -12.554 41.451 -13.524 42.031 -13.697C43.18 -14.041 43.344 -15.108 43.862 -15.892C44.735 -17.211 44.928 -18.744 45.51 -20.235C45.782 -20.935 45.809 -21.89 45.496 -22.55C44.322 -25.031 43.62 -27.48 42.178 -29.906C41.91 -30.356 41.648 -31.15 41.447 -31.748C40.984 -33.132 39.727 -34.123 38.867 -35.443C38.579 -35.884 39.104 -36.809 38.388 -36.893C37.491 -36.998 36.042 -37.578 35.809 -36.552C35.221 -33.965 36.232 -31.442 37.2 -29C36.418 -28.308 36.752 -27.387 36.904 -26.62C37.614 -23.014 36.416 -19.662 35.655 -16.188C35.632 -16.084 35.974 -15.886 35.946 -15.824C34.724 -13.138 33.272 -10.693 31.453 -8.312C30.695 -7.32 29.823 -6.404 29.326 -5.341C28.958 -4.554 28.55 -3.588 28.8 -2.6C25.365 0.18 23.115 4.025 20.504 7.871C20.042 8.551 20.333 9.76 20.884 10.029C21.697 10.427 22.653 9.403 23.123 8.557C23.512 7.859 23.865 7.209 24.356 6.566C24.489 6.391 24.31 5.972 24.445 5.851C27.078 3.504 28.747 0.568 31.2 -1.8C33.15 -2.129 34.687 -3.127 36.435 -4.14C36.743 -4.319 37.267 -4.07 37.557 -4.265C39.31 -5.442 39.308 -7.478 39.414 -9.388C39.464 -10.272 39.66 -11.589 40.8 -12.2z"/></g>
-            <g style="fill: #000000"><path d="M31.959 -16.666C32.083 -16.743 31.928 -17.166 32.037 -17.382C32.199 -17.706 32.602 -17.894 32.764 -18.218C32.873 -18.434 32.71 -18.814 32.846 -18.956C35.179 -21.403 35.436 -24.427 34.4 -27.4C35.424 -28.02 35.485 -29.282 35.06 -30.129C34.207 -31.829 34.014 -33.755 33.039 -35.298C32.237 -36.567 30.659 -37.811 29.288 -36.508C28.867 -36.108 28.546 -35.321 28.824 -34.609C28.888 -34.446 29.173 -34.3 29.146 -34.218C29.039 -33.894 28.493 -33.67 28.487 -33.398C28.457 -31.902 27.503 -30.391 28.133 -29.062C28.905 -27.433 29.724 -25.576 30.4 -23.8C29.166 -21.684 30.199 -19.235 28.446 -17.358C28.31 -17.212 28.319 -16.826 28.441 -16.624C28.733 -16.138 29.139 -15.732 29.625 -15.44C29.827 -15.319 30.175 -15.317 30.375 -15.441C30.953 -15.803 31.351 -16.29 31.959 -16.666z"/></g>
-            <g style="fill: #000000"><path d="M94.771 -26.977C96.16 -25.185 96.45 -22.39 94.401 -21C94.951 -17.691 98.302 -19.67 100.401 -20.2C100.292 -20.588 100.519 -20.932 100.802 -20.937C101.859 -20.952 102.539 -21.984 103.601 -21.8C104.035 -23.357 105.673 -24.059 106.317 -25.439C108.043 -29.134 107.452 -33.407 104.868 -36.653C104.666 -36.907 104.883 -37.424 104.759 -37.786C104.003 -39.997 101.935 -40.312 100.001 -41C98.824 -44.875 98.163 -48.906 96.401 -52.6C94.787 -52.85 94.089 -54.589 92.752 -55.309C91.419 -56.028 90.851 -54.449 90.892 -53.403C90.899 -53.198 91.351 -52.974 91.181 -52.609C91.105 -52.445 90.845 -52.334 90.845 -52.2C90.846 -52.065 91.067 -51.934 91.201 -51.8C90.283 -50.98 88.86 -50.503 88.565 -49.358C87.611 -45.648 90.184 -42.523 91.852 -39.322C92.443 -38.187 91.707 -36.916 90.947 -35.708C90.509 -35.013 90.617 -33.886 90.893 -33.03C91.645 -30.699 93.236 -28.96 94.771 -26.977z"/></g>
-            <g style="fill: #000000"><path d="M57.611 -8.591C56.124 -6.74 52.712 -4.171 55.629 -2.243C55.823 -2.114 56.193 -2.11 56.366 -2.244C58.387 -3.809 60.39 -4.712 62.826 -5.294C62.95 -5.323 63.224 -4.856 63.593 -5.017C65.206 -5.72 67.216 -5.662 68.4 -7C72.167 -6.776 75.732 -7.892 79.123 -9.2C80.284 -9.648 81.554 -10.207 82.755 -10.709C84.131 -11.285 85.335 -12.213 86.447 -13.354C86.58 -13.49 86.934 -13.4 87.201 -13.4C87.161 -14.263 88.123 -14.39 88.37 -15.012C88.462 -15.244 88.312 -15.64 88.445 -15.742C90.583 -17.372 91.503 -19.39 90.334 -21.767C90.049 -22.345 89.8 -22.963 89.234 -23.439C88.149 -24.35 87.047 -23.496 86 -23.8C85.841 -23.172 85.112 -23.344 84.726 -23.146C83.867 -22.707 82.534 -23.292 81.675 -22.854C80.313 -22.159 79.072 -21.99 77.65 -21.613C77.338 -21.531 76.56 -21.627 76.4 -21C76.266 -21.134 76.118 -21.368 76.012 -21.346C74.104 -20.95 72.844 -20.736 71.543 -19.044C71.44 -18.911 70.998 -19.09 70.839 -18.955C69.882 -18.147 69.477 -16.913 68.376 -16.241C68.175 -16.118 67.823 -16.286 67.629 -16.157C66.983 -15.726 66.616 -15.085 65.974 -14.638C65.645 -14.409 65.245 -14.734 65.277 -14.99C65.522 -16.937 66.175 -18.724 65.6 -20.6C67.677 -23.12 70.194 -25.069 72 -27.8C72.015 -29.966 72.707 -32.112 72.594 -34.189C72.584 -34.382 72.296 -35.115 72.17 -35.462C71.858 -36.316 72.764 -37.382 71.92 -38.106C70.516 -39.309 69.224 -38.433 68.4 -37C66.562 -36.61 64.496 -35.917 62.918 -37.151C61.911 -37.938 61.333 -38.844 60.534 -39.9C59.549 -41.202 59.884 -42.638 59.954 -44.202C59.96 -44.33 59.645 -44.466 59.645 -44.6C59.646 -44.735 59.866 -44.866 60 -45C59.294 -45.626 59.019 -46.684 58 -47C58.305 -48.092 57.629 -48.976 56.758 -49.278C54.763 -49.969 53.086 -48.057 51.194 -47.984C50.68 -47.965 50.213 -49.003 49.564 -49.328C49.132 -49.544 48.428 -49.577 48.066 -49.311C47.378 -48.807 46.789 -48.693 46.031 -48.488C44.414 -48.052 43.136 -46.958 41.656 -46.103C40.171 -45.246 39.216 -43.809 38.136 -42.489C37.195 -41.337 37.059 -38.923 38.479 -38.423C40.322 -37.773 41.626 -40.476 43.592 -40.15C43.904 -40.099 44.11 -39.788 44 -39.4C44.389 -39.291 44.607 -39.52 44.8 -39.8C45.658 -38.781 46.822 -38.444 47.76 -37.571C48.73 -36.667 50.476 -37.085 51.491 -36.088C53.02 -34.586 52.461 -31.905 54.4 -30.6C53.814 -29.287 53.207 -28.01 52.872 -26.583C52.59 -25.377 53.584 -24.18 54.795 -24.271C56.053 -24.365 56.315 -25.124 56.8 -26.2C57.067 -25.933 57.536 -25.636 57.495 -25.42C57.038 -23.033 56.011 -21.04 55.553 -18.609C55.494 -18.292 55.189 -18.09 54.8 -18.2C54.332 -14.051 50.28 -11.657 47.735 -8.492C47.332 -7.99 47.328 -6.741 47.737 -6.338C49.14 -4.951 51.1 -6.497 52.8 -7C53.013 -8.206 53.872 -9.148 55.204 -9.092C55.46 -9.082 55.695 -9.624 56.019 -9.754C56.367 -9.892 56.869 -9.668 57.155 -9.866C58.884 -11.061 60.292 -12.167 62.03 -13.356C62.222 -13.487 62.566 -13.328 62.782 -13.436C63.107 -13.598 63.294 -13.985 63.617 -14.17C63.965 -14.37 64.207 -14.08 64.4 -13.8C63.754 -13.451 63.75 -12.494 63.168 -12.292C62.393 -12.024 61.832 -11.511 61.158 -11.064C60.866 -10.871 60.207 -11.119 60.103 -10.94C59.505 -9.912 58.321 -9.474 57.611 -8.591z"/></g>
-            <g style="fill: #000000"><path d="M2.2 -58C2.2 -58 -7.038 -60.872 -18.2 -35.2C-18.2 -35.2 -20.6 -30 -23 -28C-25.4 -26 -36.6 -22.4 -38.6 -18.4L-49 -2.4C-49 -2.4 -34.2 -18.4 -31 -20.8C-31 -20.8 -23 -29.2 -26.2 -22.4C-26.2 -22.4 -40.2 -11.6 -39 -2.4C-39 -2.4 -44.6 12 -45.4 14C-45.4 14 -29.4 -18 -27 -19.2C-24.6 -20.4 -23.4 -20.4 -24.6 -16.8C-25.8 -13.2 -26.2 3.2 -29 5.2C-29 5.2 -21 -15.2 -21.8 -18.4C-21.8 -18.4 -18.6 -22 -16.2 -16.8L-17.4 -0.8L-13 11.2C-13 11.2 -15.4 0 -13.8 -15.6C-13.8 -15.6 -15.8 -26 -11.8 -20.4C-7.8 -14.8 1.8 -8.8 1.8 -4C1.8 -4 -3.4 -21.6 -12.6 -26.4L-16.6 -20.4L-17.8 -22.4C-17.8 -22.4 -21.4 -23.2 -17 -30C-12.6 -36.8 -13 -37.6 -13 -37.6C-13 -37.6 -6.6 -30.4 -5 -30.4C-5 -30.4 8.2 -38 9.4 -13.6C9.4 -13.6 16.2 -28 7 -34.8C7 -34.8 -7.8 -36.8 -6.6 -42L0.6 -54.4C4.2 -59.6 2.6 -56.8 2.6 -56.8z"/></g>
-            <g style="fill: #000000"><path d="M-17.8 -41.6C-17.8 -41.6 -30.6 -41.6 -33.8 -36.4L-41 -26.8C-41 -26.8 -23.8 -36.8 -19.8 -38C-15.8 -39.2 -17.8 -41.6 -17.8 -41.6z"/></g>
-            <g style="fill: #000000"><path d="M-57.8 -35.2C-57.8 -35.2 -59.8 -34 -60.2 -31.2C-60.6 -28.4 -63 -28 -62.2 -25.2C-61.4 -22.4 -59.4 -20 -59.4 -24C-59.4 -28 -57.8 -30 -57 -31.2C-56.2 -32.4 -54.6 -36.8 -57.8 -35.2z"/></g>
-            <g style="fill: #000000"><path d="M-66.6 26C-66.6 26 -75 22 -78.2 18.4C-81.4 14.8 -80.948 19.966 -85.8 19.6C-91.647 19.159 -90.6 3.2 -90.6 3.2L-94.6 10.8C-94.6 10.8 -95.8 25.2 -87.8 22.8C-83.893 21.628 -82.6 23.2 -84.2 24C-85.8 24.8 -78.6 25.2 -81.4 26.8C-84.2 28.4 -69.8 23.2 -72.2 33.6L-66.6 26z"/></g>
-            <g style="fill: #000000"><path d="M-79.2 40.4C-79.2 40.4 -94.6 44.8 -98.2 35.2C-98.2 35.2 -103 37.6 -100.8 40.6C-98.6 43.6 -97.4 44 -97.4 44C-97.4 44 -92 45.2 -92.6 46C-93.2 46.8 -95.6 50.2 -95.6 50.2C-95.6 50.2 -85.4 44.2 -79.2 40.4z"/></g>
-            <g style="fill: #ffffff"><path d="M149.201 118.601C148.774 120.735 147.103 121.536 145.201 122.201C143.284 121.243 140.686 118.137 138.801 120.201C138.327 119.721 137.548 119.661 137.204 118.999C136.739 118.101 137.011 117.055 136.669 116.257C136.124 114.985 135.415 113.619 135.601 112.201C137.407 111.489 138.002 109.583 137.528 107.82C137.459 107.563 137.03 107.366 137.23 107.017C137.416 106.694 137.734 106.467 138.001 106.2C137.866 106.335 137.721 106.568 137.61 106.548C137 106.442 137.124 105.805 137.254 105.418C137.839 103.672 139.853 103.408 141.201 104.6C141.457 104.035 141.966 104.229 142.401 104.2C142.351 103.621 142.759 103.094 142.957 102.674C143.475 101.576 145.104 102.682 145.901 102.07C146.977 101.245 148.04 100.546 149.118 101.149C150.927 102.162 152.636 103.374 153.835 105.115C154.41 105.949 154.65 107.23 154.592 108.188C154.554 108.835 153.173 108.483 152.83 109.412C152.185 111.16 154.016 111.679 154.772 113.017C154.97 113.366 154.706 113.67 154.391 113.768C153.98 113.896 153.196 113.707 153.334 114.16C154.306 117.353 151.55 118.031 149.201 118.601z"/></g>
-            <g style="fill: #ffffff"><path d="M139.6 138.201C139.593 136.463 137.992 134.707 139.201 133.001C139.336 133.135 139.467 133.356 139.601 133.356C139.736 133.356 139.867 133.135 140.001 133.001C141.496 135.217 145.148 136.145 145.006 138.991C144.984 139.438 143.897 140.356 144.801 141.001C142.988 142.349 142.933 144.719 142.001 146.601C140.763 146.315 139.551 145.952 138.401 145.401C138.753 143.915 138.636 142.231 139.456 140.911C139.89 140.213 139.603 139.134 139.6 138.201z"/></g>
-            <g style="fill: #cccccc"><path d="M-26.6 129.201C-26.6 129.201 -43.458 139.337 -29.4 124.001C-20.6 114.401 -10.6 108.801 -10.6 108.801C-10.6 108.801 -0.2 104.4 3.4 103.2C7 102 22.2 96.8 25.4 96.4C28.6 96 38.2 92 45 96C51.8 100 59.8 104.4 59.8 104.4C59.8 104.4 43.4 96 39.8 98.4C36.2 100.8 29 100.4 23 103.6C23 103.6 8.2 108.001 5 110.001C1.8 112.001 -8.6 123.601 -10.2 122.801C-11.8 122.001 -9.8 121.601 -8.6 118.801C-7.4 116.001 -9.4 114.401 -17.4 120.801C-25.4 127.201 -26.6 129.201 -26.6 129.201z"/></g>
-            <g style="fill: #000000"><path d="M-19.195 123.234C-19.195 123.234 -17.785 110.194 -9.307 111.859C-9.307 111.859 -1.081 107.689 1.641 105.721C1.641 105.721 9.78 104.019 11.09 103.402C29.569 94.702 44.288 99.221 44.835 98.101C45.381 96.982 65.006 104.099 68.615 108.185C69.006 108.628 58.384 102.588 48.686 100.697C40.413 99.083 18.811 100.944 7.905 106.48C4.932 107.989 -4.013 113.773 -6.544 113.662C-9.075 113.55 -19.195 123.234 -19.195 123.234z"/></g>
-            <g style="fill: #cccccc"><path d="M-23 148.801C-23 148.801 -38.2 146.401 -21.4 144.801C-21.4 144.801 -3.4 142.801 0.6 137.601C0.6 137.601 14.2 128.401 17 128.001C19.8 127.601 49.8 120.401 50.2 118.001C50.6 115.601 56.2 115.601 57.8 116.401C59.4 117.201 58.6 118.401 55.8 119.201C53 120.001 21.8 136.401 15.4 137.601C9 138.801 -2.6 146.401 -7.4 147.601C-12.2 148.801 -23 148.801 -23 148.801z"/></g>
-            <g style="fill: #000000"><path d="M-3.48 141.403C-3.48 141.403 -12.062 140.574 -3.461 139.755C-3.461 139.755 5.355 136.331 7.403 133.668C7.403 133.668 14.367 128.957 15.8 128.753C17.234 128.548 31.194 124.861 31.399 123.633C31.604 122.404 65.67 109.823 70.09 113.013C73.001 115.114 63.1 113.437 53.466 117.847C52.111 118.467 18.258 133.054 14.981 133.668C11.704 134.283 5.765 138.174 3.307 138.788C0.85 139.403 -3.48 141.403 -3.48 141.403z"/></g>
-            <g style="fill: #000000"><path d="M-11.4 143.601C-11.4 143.601 -6.2 143.201 -7.4 144.801C-8.6 146.401 -11 145.601 -11 145.601L-11.4 143.601z"/></g>
-            <g style="fill: #000000"><path d="M-18.6 145.201C-18.6 145.201 -13.4 144.801 -14.6 146.401C-15.8 148.001 -18.2 147.201 -18.2 147.201L-18.6 145.201z"/></g>
-            <g style="fill: #000000"><path d="M-29 146.801C-29 146.801 -23.8 146.401 -25 148.001C-26.2 149.601 -28.6 148.801 -28.6 148.801L-29 146.801z"/></g>
-            <g style="fill: #000000"><path d="M-36.6 147.601C-36.6 147.601 -31.4 147.201 -32.6 148.801C-33.8 150.401 -36.2 149.601 -36.2 149.601L-36.6 147.601z"/></g>
-            <g style="fill: #000000"><path d="M1.8 108.001C1.8 108.001 6.2 108.001 5 109.601C3.8 111.201 0.6 110.801 0.6 110.801L1.8 108.001z"/></g>
-            <g style="fill: #000000"><path d="M-8.2 113.601C-8.2 113.601 -1.694 111.46 -4.2 114.801C-5.4 116.401 -7.8 115.601 -7.8 115.601L-8.2 113.601z"/></g>
-            <g style="fill: #000000"><path d="M-19.4 118.401C-19.4 118.401 -14.2 118.001 -15.4 119.601C-16.6 121.201 -19 120.401 -19 120.401L-19.4 118.401z"/></g>
-            <g style="fill: #000000"><path d="M-27 124.401C-27 124.401 -21.8 124.001 -23 125.601C-24.2 127.201 -26.6 126.401 -26.6 126.401L-27 124.401z"/></g>
-            <g style="fill: #000000"><path d="M-33.8 129.201C-33.8 129.201 -28.6 128.801 -29.8 130.401C-31 132.001 -33.4 131.201 -33.4 131.201L-33.8 129.201z"/></g>
-            <g style="fill: #000000"><path d="M5.282 135.598C5.282 135.598 12.203 135.066 10.606 137.195C9.009 139.325 5.814 138.26 5.814 138.26L5.282 135.598z"/></g>
-            <g style="fill: #000000"><path d="M15.682 130.798C15.682 130.798 22.603 130.266 21.006 132.395C19.409 134.525 16.214 133.46 16.214 133.46L15.682 130.798z"/></g>
-            <g style="fill: #000000"><path d="M26.482 126.398C26.482 126.398 33.403 125.866 31.806 127.995C30.209 130.125 27.014 129.06 27.014 129.06L26.482 126.398z"/></g>
-            <g style="fill: #000000"><path d="M36.882 121.598C36.882 121.598 43.803 121.066 42.206 123.195C40.609 125.325 37.414 124.26 37.414 124.26L36.882 121.598z"/></g>
-            <g style="fill: #000000"><path d="M9.282 103.598C9.282 103.598 16.203 103.066 14.606 105.195C13.009 107.325 9.014 107.06 9.014 107.06L9.282 103.598z"/></g>
-            <g style="fill: #000000"><path d="M19.282 100.398C19.282 100.398 26.203 99.866 24.606 101.995C23.009 104.125 18.614 103.86 18.614 103.86L19.282 100.398z"/></g>
-            <g style="fill: #000000"><path d="M-3.4 140.401C-3.4 140.401 1.8 140.001 0.6 141.601C-0.6 143.201 -3 142.401 -3 142.401L-3.4 140.401z"/></g>
-            <g style="fill: #992600"><path d="M-76.6 41.2C-76.6 41.2 -81 50 -81.4 53.2C-81.4 53.2 -80.6 44.4 -79.4 42.4C-78.2 40.4 -76.6 41.2 -76.6 41.2z"/></g>
-            <g style="fill: #992600"><path d="M-95 55.2C-95 55.2 -98.2 69.6 -97.8 72.4C-97.8 72.4 -99 60.8 -98.6 59.6C-98.2 58.4 -95 55.2 -95 55.2z"/></g>
-            <g style="fill: #cccccc"><path d="M-74.2 -19.4L-74.4 -16.2L-76.6 -16C-76.6 -16 -62.4 -3.4 -61.8 4.2C-61.8 4.2 -61 -4 -74.2 -19.4z"/></g>
-            <g style="fill: #000000"><path d="M-70.216 -18.135C-70.647 -18.551 -70.428 -19.296 -70.836 -19.556C-71.645 -20.072 -69.538 -20.129 -69.766 -20.845C-70.149 -22.051 -69.962 -22.072 -70.084 -23.348C-70.141 -23.946 -69.553 -25.486 -69.168 -25.926C-67.722 -27.578 -69.046 -30.51 -67.406 -32.061C-67.102 -32.35 -66.726 -32.902 -66.441 -33.32C-65.782 -34.283 -64.598 -34.771 -63.648 -35.599C-63.33 -35.875 -63.531 -36.702 -62.962 -36.61C-62.248 -36.495 -61.007 -36.625 -61.052 -35.784C-61.165 -33.664 -62.494 -31.944 -63.774 -30.276C-63.323 -29.572 -63.781 -28.937 -64.065 -28.38C-65.4 -25.76 -65.211 -22.919 -65.385 -20.079C-65.39 -19.994 -65.697 -19.916 -65.689 -19.863C-65.336 -17.528 -64.752 -15.329 -63.873 -13.1C-63.507 -12.17 -63.036 -11.275 -62.886 -10.348C-62.775 -9.662 -62.672 -8.829 -63.08 -8.124C-61.045 -5.234 -62.354 -2.583 -61.185 0.948C-60.978 1.573 -59.286 3.487 -59.749 3.326C-62.262 2.455 -62.374 2.057 -62.551 1.304C-62.697 0.681 -63.027 -0.696 -63.264 -1.298C-63.328 -1.462 -63.499 -3.346 -63.577 -3.468C-65.09 -5.85 -63.732 -5.674 -65.102 -8.032C-66.53 -8.712 -67.496 -9.816 -68.619 -10.978C-68.817 -11.182 -67.674 -11.906 -67.855 -12.119C-68.947 -13.408 -70.1 -14.175 -69.764 -15.668C-69.609 -16.358 -69.472 -17.415 -70.216 -18.135z"/></g>
-            <g style="fill: #000000"><path d="M-73.8 -16.4C-73.8 -16.4 -73.4 -9.6 -71 -8C-68.6 -6.4 -69.8 -7.2 -73 -8.4C-76.2 -9.6 -75 -10.4 -75 -10.4C-75 -10.4 -77.8 -10 -75.4 -8C-73 -6 -69.4 -3.6 -71 -3.6C-72.6 -3.6 -80.2 -7.6 -80.2 -10.4C-80.2 -13.2 -81.2 -17.3 -81.2 -17.3C-81.2 -17.3 -80.1 -18.1 -75.3 -18C-75.3 -18 -73.9 -17.3 -73.8 -16.4z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M-74.6 2.2C-74.6 2.2 -83.12 -0.591 -101.6 2.8C-101.6 2.8 -92.569 0.722 -73.8 3C-63.5 4.25 -74.6 2.2 -74.6 2.2z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M-72.502 2.129C-72.502 2.129 -80.748 -1.389 -99.453 0.392C-99.453 0.392 -90.275 -0.897 -71.774 2.995C-61.62 5.131 -72.502 2.129 -72.502 2.129z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M-70.714 2.222C-70.714 2.222 -78.676 -1.899 -97.461 -1.514C-97.461 -1.514 -88.213 -2.118 -70.052 3.14C-60.086 6.025 -70.714 2.222 -70.714 2.222z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M-69.444 2.445C-69.444 2.445 -76.268 -1.862 -93.142 -2.96C-93.142 -2.96 -84.803 -2.79 -68.922 3.319C-60.206 6.672 -69.444 2.445 -69.444 2.445z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M45.84 12.961C45.84 12.961 44.91 13.605 45.124 12.424C45.339 11.243 73.547 -1.927 77.161 -1.677C77.161 -1.677 46.913 11.529 45.84 12.961z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M42.446 13.6C42.446 13.6 41.57 14.315 41.691 13.121C41.812 11.927 68.899 -3.418 72.521 -3.452C72.521 -3.452 43.404 12.089 42.446 13.6z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M39.16 14.975C39.16 14.975 38.332 15.747 38.374 14.547C38.416 13.348 58.233 -2.149 68.045 -4.023C68.045 -4.023 50.015 4.104 39.16 14.975z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M36.284 16.838C36.284 16.838 35.539 17.532 35.577 16.453C35.615 15.373 53.449 1.426 62.28 -0.26C62.28 -0.26 46.054 7.054 36.284 16.838z"/></g>
-            <g style="fill: #cccccc"><path d="M4.6 164.801C4.6 164.801 -10.6 162.401 6.2 160.801C6.2 160.801 24.2 158.801 28.2 153.601C28.2 153.601 41.8 144.401 44.6 144.001C47.4 143.601 63.8 140.001 64.2 137.601C64.6 135.201 70.6 132.801 72.2 133.601C73.8 134.401 73.8 143.601 71 144.401C68.2 145.201 49.4 152.401 43 153.601C36.6 154.801 25 162.401 20.2 163.601C15.4 164.801 4.6 164.801 4.6 164.801z"/></g>
-            <g style="fill: #000000"><path d="M77.6 127.401C77.6 127.401 74.6 129.001 73.4 131.601C73.4 131.601 67 142.201 52.8 145.401C52.8 145.401 29.8 154.401 22 156.401C22 156.401 8.6 161.401 1.2 160.601C1.2 160.601 -5.8 160.801 0.4 162.401C0.4 162.401 20.6 160.401 24 158.601C24 158.601 39.6 153.401 42.6 150.801C45.6 148.201 63.8 143.201 66 141.201C68.2 139.201 78 130.801 77.6 127.401z"/></g>
-            <g style="fill: #000000"><path d="M18.882 158.911C18.882 158.911 24.111 158.685 22.958 160.234C21.805 161.784 19.357 160.91 19.357 160.91L18.882 158.911z"/></g>
-            <g style="fill: #000000"><path d="M11.68 160.263C11.68 160.263 16.908 160.037 15.756 161.586C14.603 163.136 12.155 162.263 12.155 162.263L11.68 160.263z"/></g>
-            <g style="fill: #000000"><path d="M1.251 161.511C1.251 161.511 6.48 161.284 5.327 162.834C4.174 164.383 1.726 163.51 1.726 163.51L1.251 161.511z"/></g>
-            <g style="fill: #000000"><path d="M-6.383 162.055C-6.383 162.055 -1.154 161.829 -2.307 163.378C-3.46 164.928 -5.908 164.054 -5.908 164.054L-6.383 162.055z"/></g>
-            <g style="fill: #000000"><path d="M35.415 151.513C35.415 151.513 42.375 151.212 40.84 153.274C39.306 155.336 36.047 154.174 36.047 154.174L35.415 151.513z"/></g>
-            <g style="fill: #000000"><path d="M45.73 147.088C45.73 147.088 51.689 143.787 51.155 148.849C50.885 151.405 46.362 149.749 46.362 149.749L45.73 147.088z"/></g>
-            <g style="fill: #000000"><path d="M54.862 144.274C54.862 144.274 62.021 140.573 60.287 146.035C59.509 148.485 55.493 146.935 55.493 146.935L54.862 144.274z"/></g>
-            <g style="fill: #000000"><path d="M64.376 139.449C64.376 139.449 68.735 134.548 69.801 141.21C70.207 143.748 65.008 142.11 65.008 142.11L64.376 139.449z"/></g>
-            <g style="fill: #000000"><path d="M26.834 155.997C26.834 155.997 32.062 155.77 30.91 157.32C29.757 158.869 27.308 157.996 27.308 157.996L26.834 155.997z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M62.434 34.603C62.434 34.603 61.708 35.268 61.707 34.197C61.707 33.127 79.191 19.863 88.034 18.479C88.034 18.479 71.935 25.208 62.434 34.603z"/></g>
-            <g style="fill: #000000"><path d="M65.4 98.4C65.4 98.4 87.401 120.801 96.601 124.401C96.601 124.401 105.801 135.601 101.801 161.601C101.801 161.601 98.601 169.201 95.401 148.401C95.401 148.401 98.601 123.201 87.401 139.201C87.401 139.201 79 129.301 85.4 129.601C85.4 129.601 88.601 131.601 89.001 130.001C89.401 128.401 81.4 114.801 64.2 100.4C47 86 65.4 98.4 65.4 98.4z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M7 137.201C7 137.201 6.8 135.401 8.6 136.201C10.4 137.001 104.601 143.201 136.201 167.201C136.201 167.201 91.001 144.001 7 137.201z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M17.4 132.801C17.4 132.801 17.2 131.001 19 131.801C20.8 132.601 157.401 131.601 181.001 164.001C181.001 164.001 159.001 138.801 17.4 132.801z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M29 128.801C29 128.801 28.8 127.001 30.6 127.801C32.4 128.601 205.801 115.601 229.401 148.001C229.401 148.001 219.801 122.401 29 128.801z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M39 124.001C39 124.001 38.8 122.201 40.6 123.001C42.4 123.801 164.601 85.2 188.201 117.601C188.201 117.601 174.801 93 39 124.001z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M-19 146.801C-19 146.801 -19.2 145.001 -17.4 145.801C-15.6 146.601 2.2 148.801 4.2 187.601C4.2 187.601 -3 145.601 -19 146.801z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M-27.8 148.401C-27.8 148.401 -28 146.601 -26.2 147.401C-24.4 148.201 -10.2 143.601 -13 182.401C-13 182.401 -11.8 147.201 -27.8 148.401z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M-35.8 148.801C-35.8 148.801 -36 147.001 -34.2 147.801C-32.4 148.601 -17 149.201 -29.4 171.601C-29.4 171.601 -19.8 147.601 -35.8 148.801z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M11.526 104.465C11.526 104.465 11.082 106.464 12.631 105.247C28.699 92.622 61.141 33.72 116.826 28.086C116.826 28.086 78.518 15.976 11.526 104.465z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M22.726 102.665C22.726 102.665 21.363 101.472 23.231 100.847C25.099 100.222 137.541 27.72 176.826 35.686C176.826 35.686 149.719 28.176 22.726 102.665z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M1.885 108.767C1.885 108.767 1.376 110.366 3.087 109.39C12.062 104.27 15.677 47.059 59.254 45.804C59.254 45.804 26.843 31.09 1.885 108.767z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M-18.038 119.793C-18.038 119.793 -19.115 121.079 -17.162 120.825C-6.916 119.493 14.489 78.222 58.928 83.301C58.928 83.301 26.962 68.955 -18.038 119.793z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M-6.8 113.667C-6.8 113.667 -7.611 115.136 -5.742 114.511C4.057 111.237 17.141 66.625 61.729 63.078C61.729 63.078 27.603 55.135 -6.8 113.667z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M-25.078 124.912C-25.078 124.912 -25.951 125.954 -24.369 125.748C-16.07 124.669 1.268 91.24 37.264 95.354C37.264 95.354 11.371 83.734 -25.078 124.912z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M-32.677 130.821C-32.677 130.821 -33.682 131.866 -32.091 131.748C-27.923 131.439 2.715 98.36 21.183 113.862C21.183 113.862 9.168 95.139 -32.677 130.821z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M36.855 98.898C36.855 98.898 35.654 97.543 37.586 97.158C39.518 96.774 160.221 39.061 198.184 51.927C198.184 51.927 172.243 41.053 36.855 98.898z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M3.4 163.201C3.4 163.201 3.2 161.401 5 162.201C6.8 163.001 22.2 163.601 9.8 186.001C9.8 186.001 19.4 162.001 3.4 163.201z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M13.8 161.601C13.8 161.601 13.6 159.801 15.4 160.601C17.2 161.401 35 163.601 37 202.401C37 202.401 29.8 160.401 13.8 161.601z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M20.6 160.001C20.6 160.001 20.4 158.201 22.2 159.001C24 159.801 48.6 163.201 72.2 195.601C72.2 195.601 36.6 158.801 20.6 160.001z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M28.225 157.972C28.225 157.972 27.788 156.214 29.678 156.768C31.568 157.322 52.002 155.423 90.099 189.599C90.099 189.599 43.924 154.656 28.225 157.972z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M38.625 153.572C38.625 153.572 38.188 151.814 40.078 152.368C41.968 152.922 76.802 157.423 128.499 192.399C128.499 192.399 54.324 150.256 38.625 153.572z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M-1.8 142.001C-1.8 142.001 -2 140.201 -0.2 141.001C1.6 141.801 55 144.401 85.4 171.201C85.4 171.201 50.499 146.426 -1.8 142.001z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M-11.8 146.001C-11.8 146.001 -12 144.201 -10.2 145.001C-8.4 145.801 16.2 149.201 39.8 181.601C39.8 181.601 4.2 144.801 -11.8 146.001z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M49.503 148.962C49.503 148.962 48.938 147.241 50.864 147.655C52.79 148.068 87.86 150.004 141.981 181.098C141.981 181.098 64.317 146.704 49.503 148.962z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M57.903 146.562C57.903 146.562 57.338 144.841 59.264 145.255C61.19 145.668 96.26 147.604 150.381 178.698C150.381 178.698 73.317 143.904 57.903 146.562z"/></g>
-            <g style="fill: #ffffff; stroke:#000000; stroke-width:0.1"><path d="M67.503 141.562C67.503 141.562 66.938 139.841 68.864 140.255C70.79 140.668 113.86 145.004 203.582 179.298C203.582 179.298 82.917 138.904 67.503 141.562z"/></g>
-            <g style="fill: #000000"><path d="M-43.8 148.401C-43.8 148.401 -38.6 148.001 -39.8 149.601C-41 151.201 -43.4 150.401 -43.4 150.401L-43.8 148.401z"/></g>
-            <g style="fill: #000000"><path d="M-13 162.401C-13 162.401 -7.8 162.001 -9 163.601C-10.2 165.201 -12.6 164.401 -12.6 164.401L-13 162.401z"/></g>
-            <g style="fill: #000000"><path d="M-21.8 162.001C-21.8 162.001 -16.6 161.601 -17.8 163.201C-19 164.801 -21.4 164.001 -21.4 164.001L-21.8 162.001z"/></g>
-            <g style="fill: #000000"><path d="M-117.169 150.182C-117.169 150.182 -112.124 151.505 -113.782 152.624C-115.439 153.744 -117.446 152.202 -117.446 152.202L-117.169 150.182z"/></g>
-            <g style="fill: #000000"><path d="M-115.169 140.582C-115.169 140.582 -110.124 141.905 -111.782 143.024C-113.439 144.144 -115.446 142.602 -115.446 142.602L-115.169 140.582z"/></g>
-            <g style="fill: #000000"><path d="M-122.369 136.182C-122.369 136.182 -117.324 137.505 -118.982 138.624C-120.639 139.744 -122.646 138.202 -122.646 138.202L-122.369 136.182z"/></g>
-            <g style="fill: #cccccc"><path d="M-42.6 211.201C-42.6 211.201 -44.2 211.201 -48.2 213.201C-50.2 213.201 -61.4 216.801 -67 226.801C-67 226.801 -54.6 217.201 -42.6 211.201z"/></g>
-            <g style="fill: #cccccc"><path d="M45.116 303.847C45.257 304.105 45.312 304.525 45.604 304.542C46.262 304.582 47.495 304.883 47.37 304.247C46.522 299.941 45.648 295.004 41.515 293.197C40.876 292.918 39.434 293.331 39.36 294.215C39.233 295.739 39.116 297.088 39.425 298.554C39.725 299.975 41.883 299.985 42.8 298.601C43.736 300.273 44.168 302.116 45.116 303.847z"/></g>
-            <g style="fill: #cccccc"><path d="M34.038 308.581C34.786 309.994 34.659 311.853 36.074 312.416C36.814 312.71 38.664 311.735 38.246 310.661C37.444 308.6 37.056 306.361 35.667 304.55C35.467 304.288 35.707 303.755 35.547 303.427C34.953 302.207 33.808 301.472 32.4 301.801C31.285 304.004 32.433 306.133 33.955 307.842C34.091 307.994 33.925 308.37 34.038 308.581z"/></g>
-            <g style="fill: #cccccc"><path d="M-5.564 303.391C-5.672 303.014 -5.71 302.551 -5.545 302.23C-5.014 301.197 -4.221 300.075 -4.558 299.053C-4.906 297.997 -6.022 298.179 -6.672 298.748C-7.807 299.742 -7.856 301.568 -8.547 302.927C-8.743 303.313 -8.692 303.886 -9.133 304.277C-9.607 304.698 -10.047 306.222 -9.951 306.793C-9.898 307.106 -10.081 317.014 -9.859 316.751C-9.24 316.018 -6.19 306.284 -6.121 305.392C-6.064 304.661 -5.332 304.196 -5.564 303.391z"/></g>
-            <g style="fill: #cccccc"><path d="M-31.202 296.599C-28.568 294.1 -25.778 291.139 -26.22 287.427C-26.336 286.451 -28.111 286.978 -28.298 287.824C-29.1 291.449 -31.139 294.11 -33.707 296.502C-35.903 298.549 -37.765 304.893 -38 305.401C-34.303 300.145 -32.046 297.399 -31.202 296.599z"/></g>
-            <g style="fill: #cccccc"><path d="M-44.776 290.635C-44.253 290.265 -44.555 289.774 -44.338 289.442C-43.385 287.984 -42.084 286.738 -42.066 285C-42.063 284.723 -42.441 284.414 -42.776 284.638C-43.053 284.822 -43.395 284.952 -43.503 285.082C-45.533 287.531 -46.933 290.202 -48.376 293.014C-48.559 293.371 -49.703 297.862 -49.39 297.973C-49.151 298.058 -47.431 293.877 -47.221 293.763C-45.958 293.077 -45.946 291.462 -44.776 290.635z"/></g>
-            <g style="fill: #cccccc"><path d="M-28.043 310.179C-27.599 309.31 -26.023 308.108 -26.136 307.219C-26.254 306.291 -25.786 304.848 -26.698 305.536C-27.955 306.484 -31.404 307.833 -31.674 313.641C-31.7 314.212 -28.726 311.519 -28.043 310.179z"/></g>
-            <g style="fill: #cccccc"><path d="M-13.6 293.001C-13.2 292.333 -12.492 292.806 -12.033 292.543C-11.385 292.171 -10.774 291.613 -10.482 290.964C-9.512 288.815 -7.743 286.995 -7.6 284.601C-9.091 283.196 -9.77 285.236 -10.4 286.201C-11.723 284.554 -12.722 286.428 -14.022 286.947C-14.092 286.975 -14.305 286.628 -14.38 286.655C-15.557 287.095 -16.237 288.176 -17.235 288.957C-17.406 289.091 -17.811 288.911 -17.958 289.047C-18.61 289.65 -19.583 289.975 -19.863 290.657C-20.973 293.364 -24.113 295.459 -26 303.001C-25.619 303.91 -21.488 296.359 -21.001 295.661C-20.165 294.465 -20.047 297.322 -18.771 296.656C-18.72 296.629 -18.534 296.867 -18.4 297.001C-18.206 296.721 -17.988 296.492 -17.6 296.601C-17.6 296.201 -17.734 295.645 -17.533 295.486C-16.296 294.509 -16.38 293.441 -15.6 292.201C-15.142 292.99 -14.081 292.271 -13.6 293.001z"/></g>
-            <g style="fill: #cccccc"><path d="M46.2 347.401C46.2 347.401 53.6 327.001 49.2 315.801C49.2 315.801 60.6 337.401 56 348.601C56 348.601 55.6 338.201 51.6 333.201C51.6 333.201 47.6 346.001 46.2 347.401z"/></g>
-            <g style="fill: #cccccc"><path d="M31.4 344.801C31.4 344.801 36.8 336.001 28.8 317.601C28.8 317.601 28 338.001 21.2 349.001C21.2 349.001 35.4 328.801 31.4 344.801z"/></g>
-            <g style="fill: #cccccc"><path d="M21.4 342.801C21.4 342.801 21.2 322.801 21.6 319.801C21.6 319.801 17.8 336.401 7.6 346.001C7.6 346.001 22 334.001 21.4 342.801z"/></g>
-            <g style="fill: #cccccc"><path d="M11.8 310.801C11.8 310.801 17.8 324.401 7.8 342.801C7.8 342.801 14.2 330.601 9.4 323.601C9.4 323.601 12 320.201 11.8 310.801z"/></g>
-            <g style="fill: #cccccc"><path d="M-7.4 342.401C-7.4 342.401 -8.4 326.801 -6.6 324.601C-6.6 324.601 -6.4 318.201 -6.8 317.201C-6.8 317.201 -2.8 311.001 -2.6 318.401C-2.6 318.401 -1.2 326.201 1.6 330.801C1.6 330.801 5.2 336.201 5 342.601C5 342.601 -5 312.401 -7.4 342.401z"/></g>
-            <g style="fill: #cccccc"><path d="M-11 314.801C-11 314.801 -17.6 325.601 -19.4 344.601C-19.4 344.601 -20.8 338.401 -17 324.001C-17 324.001 -12.8 308.601 -11 314.801z"/></g>
-            <g style="fill: #cccccc"><path d="M-32.8 334.601C-32.8 334.601 -27.8 329.201 -26.4 324.201C-26.4 324.201 -22.8 308.401 -29.2 317.001C-29.2 317.001 -29 325.001 -37.2 332.401C-37.2 332.401 -32.4 330.001 -32.8 334.601z"/></g>
-            <g style="fill: #cccccc"><path d="M-38.6 329.601C-38.6 329.601 -35.2 312.201 -34.4 311.401C-34.4 311.401 -32.6 308.001 -35.4 311.201C-35.4 311.201 -44.2 330.401 -48.2 337.001C-48.2 337.001 -40.2 327.801 -38.6 329.601z"/></g>
-            <g style="fill: #cccccc"><path d="M-44.4 313.001C-44.4 313.001 -32.8 290.601 -54.6 316.401C-54.6 316.401 -43.6 306.601 -44.4 313.001z"/></g>
-            <g style="fill: #cccccc"><path d="M-59.8 298.401C-59.8 298.401 -55 279.601 -52.4 279.801C-52.4 279.801 -44.2 270.801 -50.8 281.401C-50.8 281.401 -56.8 291.001 -56.2 300.801C-56.2 300.801 -56.8 291.201 -59.8 298.401z"/></g>
-            <g style="fill: #cccccc"><path d="M270.5 287C270.5 287 258.5 277 256 273.5C256 273.5 269.5 292 269.5 299C269.5 299 272 291.5 270.5 287z"/></g>
-            <g style="fill: #cccccc"><path d="M276 265C276 265 255 250 251.5 242.5C251.5 242.5 278 272 278 276.5C278 276.5 278.5 267.5 276 265z"/></g>
-            <g style="fill: #cccccc"><path d="M293 111C293 111 281 103 279.5 105C279.5 105 290 111.5 292.5 120C292.5 120 291 111 293 111z"/></g>
-            <g style="fill: #cccccc"><path d="M301.5 191.5L284 179.5C284 179.5 303 196.5 303.5 200.5L301.5 191.5z"/></g>
-            <g style="stroke:#000000"><path d="M-89.25 169L-67.25 173.75"/></g>
-            <g style="stroke:#000000"><path d="M-39 331C-39 331 -39.5 327.5 -48.5 338"/></g>
-            <g style="stroke:#000000"><path d="M-33.5 336C-33.5 336 -31.5 329.5 -38 334"/></g>
-            <g style="stroke:#000000"><path d="M20.5 344.5C20.5 344.5 22 333.5 10.5 346.5"/></g>
-        </g>
-    </draw>
-</page>';
-
-    // convert to PDF
-    require_once(dirname(__FILE__).'/../htdocs2pdf.class.php');
-    try
-    {
-        $html2pdf = new HTML2PDF('L', 'A4', 'fr');
-        $html2pdf->pdf->SetDisplayMode('fullpage');
-        $html2pdf->writeHTML($content, isset($_GET['vuehtml']));
-        $html2pdf->Output('svg_tiger.pdf');
-    }
-    catch(HTML2PDF_exception $e) {
-        echo $e;
-        exit;
-    }
diff --git a/html2pdf_v4.03/examples/svg_tree.php b/html2pdf_v4.03/examples/svg_tree.php
deleted file mode 100644
index a5722ef1..00000000
--- a/html2pdf_v4.03/examples/svg_tree.php
+++ /dev/null
@@ -1,140 +0,0 @@
-<?php
-/**
- * HTML2PDF Librairy - example
- *
- * HTML => PDF convertor
- * distributed under the LGPL License
- *
- * @author      Laurent MINGUET <webmaster@html2pdf.fr>
- *
- * isset($_GET['vuehtml']) is not mandatory
- * it allow to display the result in the HTML format
- */
-
-$content = '
-<page>
-    <draw style="margin: auto; width:180mm; height:240mm; background: #444444; border: solid 0.5mm #777777;">
-        <g transform="translate(90mm,120mm) scale(1.8) translate(-250,-245)">
-            <path d="M 157.219 412.757 C 158.128 465.467 355.334 465.467 354.425 413.666 C 353.516 358.23 159.036 357.322 157.219 412.757 z " id="path749" sodipodi:nodetypes="ccc" style="fill:#623e35;fill-rule:evenodd;stroke:black;stroke-opacity:1;stroke-width:3.75;stroke-linejoin:bevel;stroke-linecap:butt;fill-opacity:1;stroke-dasharray:none;"/>
-            <path d="M 212.655 306.43 L 211.746 413.665 C 219.694 425.479 288.517 427.298 299.898 412.757 L 299.898 305.521 C 289.901 320.97 232.647 326.423 212.655 306.43 z " id="path748" sodipodi:nodetypes="ccccc" style="fill:#623e35;fill-rule:evenodd;stroke:black;stroke-opacity:1;stroke-width:4.76806;stroke-linejoin:bevel;stroke-linecap:butt;fill-opacity:1;stroke-dasharray:none;" transform="matrix(0.618557,0.000000,0.000000,1.000000,98.94439,-0.908813)"/>
-            <path d="M 248.097 24.7078 C 244.462 35.6132 134.5 111.951 71.7941 150.119 C 109.053 250.994 394.412 247.359 425.31 150.121 C 371.692 134.671 250.823 34.7044 248.097 24.7078 z " id="path747" sodipodi:nodetypes="cccc" style="fill:#009500;fill-rule:evenodd;stroke:black;stroke-opacity:1;stroke-width:3.75;stroke-linejoin:bevel;stroke-linecap:butt;fill-opacity:1;stroke-dasharray:none;" transform="translate(0.908775,139.0434)"/>
-            <path d="M 248.097 24.7078 C 244.462 35.6132 168.125 111.951 105.419 150.119 C 144.496 206.464 356.243 212.826 390.776 148.303 C 337.158 132.853 250.823 34.7044 248.097 24.7078 z " id="path746" sodipodi:nodetypes="cccc" style="fill:#009500;fill-rule:evenodd;stroke:black;stroke-opacity:1;stroke-width:3.75;stroke-linejoin:bevel;stroke-linecap:butt;fill-opacity:1;stroke-dasharray:none;" transform="translate(-3.725290e-7,71.79367)"/>
-            <path d="M 157.343 412.757 L 158.596 431.841 C 201.308 481.824 340.324 469.226 353.047 431.966 L 354.205 412.757 C 356.023 466.375 160.07 463.649 157.343 412.757 z " id="path750" sodipodi:nodetypes="ccccc" style="fill:#623e35;fill-rule:evenodd;stroke:black;stroke-opacity:1;stroke-width:3.75;stroke-linejoin:bevel;stroke-linecap:butt;fill-opacity:1;stroke-dasharray:none;"/>
-            <path d="M 248.097 24.7078 C 244.462 35.6132 207.202 107.407 144.497 145.575 C 181.756 190.106 322.618 193.742 357.151 146.485 C 303.533 131.035 250.823 34.7044 248.097 24.7078 z " id="path745" sodipodi:nodetypes="cccc" style="fill:#009500;fill-rule:evenodd;stroke:black;stroke-opacity:1;stroke-width:3.75;stroke-linejoin:bevel;stroke-linecap:butt;fill-opacity:1;stroke-dasharray:none;"/>
-            <path d="M 247.188 38.3395 C 219.016 91.0487 170.85 136.488 151.766 145.575 C 159.946 160.116 206.293 174.657 225.378 171.931 C 213.564 141.032 216.289 111.951 247.188 38.3395 z " id="path751" sodipodi:nodetypes="cccc" style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-opacity:1;stroke-width:1pt;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:0.5;"/>
-            <path d="M 179.938 171.93 C 168.124 181.927 125.412 215.552 114.506 222.822 C 106.327 223.731 157.219 251.903 175.395 251.903 C 135.408 228.275 217.199 177.383 179.938 171.93 z " id="path752" sodipodi:nodetypes="cccc" style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-opacity:1;stroke-width:1pt;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:0.498039;"/>
-            <path d="M 140.861 250.994 C 126.321 260.082 102.692 277.349 78.1551 290.071 C 83.6078 310.065 123.594 335.511 132.682 338.237 C 96.331 292.798 175.395 260.082 140.861 250.994 z " id="path753" sodipodi:nodetypes="cccc" style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-opacity:1;stroke-width:1pt;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:0.498039;"/>
-            <path d="M 233.308 366.285 C 234.121 379.008 231.643 403.487 233.623 413.293 C 247.255 420.056 256.276 418.554 266.962 418.114 C 253.33 412.661 242.329 402.388 233.308 366.285 z " id="path755" sodipodi:nodetypes="cccc" style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-opacity:1;stroke-width:1pt;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:0.3;"/>
-            <path d="M 222.459 376.374 C 201.797 379.129 155.308 391.181 161.506 415.975 C 167.705 438.703 213.505 443.18 226.247 446.624 C 220.048 439.392 171.837 405.988 222.459 376.374 z " id="path756" sodipodi:nodetypes="cccc" style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-opacity:1;stroke-width:1pt;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:0.3;"/>
-            <path d="M 161.162 428.028 C 163.573 429.061 172.871 441.803 208.685 456.955 C 193.532 452.822 163.228 440.425 161.162 428.028 z " id="path757" sodipodi:nodetypes="ccc" style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-opacity:1;stroke-width:1pt;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:0.3;" transform=""/>
-            <path d="M 315.437 454.544 C 329.556 448.345 346.774 443.524 349.873 432.505 C 355.039 422.174 348.496 436.292 315.437 454.544 z " id="path758" sodipodi:nodetypes="ccc" style="fill:#000011;fill-rule:evenodd;stroke:none;stroke-opacity:1;stroke-width:1pt;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:0.25;"/>
-            <path d="M 287.888 377.407 C 326.457 377.407 383.965 411.154 327.834 438.359 C 362.615 398.413 287.888 378.44 287.888 377.407 z " id="path759" sodipodi:nodetypes="ccc" style="fill:#000011;fill-rule:evenodd;stroke:none;stroke-opacity:1;stroke-width:1pt;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:0.247059;"/>
-            <path d="M 259.65 366.043 C 259.65 366.043 279.967 363.288 281.345 365.698 C 282.722 368.109 281.689 387.049 281.001 391.87 C 279.968 382.572 282.378 368.798 259.65 366.043 z " id="path760" sodipodi:nodetypes="cccc" style="fill:#000011;fill-rule:evenodd;stroke:none;stroke-opacity:1;stroke-width:1pt;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:0.247059;"/>
-            <path d="M 387.929 328.061 C 401.191 322.851 418.716 301.536 421.559 292.536 C 418.243 288.747 385.56 275.484 377.982 268.853 C 383.666 278.326 409.717 297.747 387.929 328.061 z " id="path761" sodipodi:nodetypes="cccc" style="fill:#000011;fill-rule:evenodd;stroke:none;stroke-opacity:1;stroke-width:1pt;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:0.247059;"/>
-            <path d="M 352.404 245.644 C 370.876 238.539 382.244 229.065 384.613 222.908 C 375.613 219.119 355.246 205.856 345.299 200.172 C 352.878 208.224 368.509 221.487 352.404 245.644 z " id="path762" sodipodi:nodetypes="cccc" style="fill:#000011;fill-rule:evenodd;stroke:none;stroke-opacity:1;stroke-width:1pt;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:0.247059;"/>
-            <path d="M 305.038 115.861 C 312.617 126.755 346.72 147.595 350.51 148.543 C 345.773 156.122 322.09 168.437 313.09 169.384 C 308.354 168.911 336.773 152.806 305.038 115.861 z " id="path763" sodipodi:nodetypes="cccc" style="fill:#000011;fill-rule:evenodd;stroke:none;stroke-opacity:1;stroke-width:1pt;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:0.247059;"/>
-            <g id="g771" transform="translate(-249.1874,169.4743)">
-                <path d="M 424.69 52.5344 C 445.456 51.8645 445.456 82.0082 426.03 82.0082 C 401.245 82.678 404.594 53.2043 424.69 52.5344 z " id="path772" sodipodi:nodetypes="ccc" style="fill:#ff0000;fill-rule:evenodd;stroke:black;stroke-opacity:1;stroke-width:3.75;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:1;stroke-dasharray:none;"/>
-                <path d="M 425.36 55.2139 C 423.35 53.2043 401.915 63.922 415.982 75.3096 C 424.691 74.6397 427.37 57.2234 425.36 55.2139 z " id="path773" sodipodi:nodetypes="ccc" style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-opacity:1;stroke-width:1pt;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:0.7;"/>
-            </g>
-            <g id="g774" transform="translate(-46.89011,243.8286)">
-                <path d="M 424.69 52.5344 C 445.456 51.8645 445.456 82.0082 426.03 82.0082 C 401.245 82.678 404.594 53.2043 424.69 52.5344 z " id="path775" sodipodi:nodetypes="ccc" style="fill:#ff0000;fill-rule:evenodd;stroke:black;stroke-opacity:1;stroke-width:3.75;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:1;stroke-dasharray:none;"/>
-                <path d="M 425.36 55.2139 C 423.35 53.2043 401.915 63.922 415.982 75.3096 C 424.691 74.6397 427.37 57.2234 425.36 55.2139 z " id="path776" sodipodi:nodetypes="ccc" style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-opacity:1;stroke-width:1pt;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:0.7;"/>
-            </g>
-            <g id="g777" transform="translate(-226.4122,271.2928)">
-                <path d="M 424.69 52.5344 C 445.456 51.8645 445.456 82.0082 426.03 82.0082 C 401.245 82.678 404.594 53.2043 424.69 52.5344 z " id="path778" sodipodi:nodetypes="ccc" style="fill:#ff0000;fill-rule:evenodd;stroke:black;stroke-opacity:1;stroke-width:3.75;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:1;stroke-dasharray:none;"/>
-                <path d="M 425.36 55.2139 C 423.35 53.2043 401.915 63.922 415.982 75.3096 C 424.691 74.6397 427.37 57.2234 425.36 55.2139 z " id="path779" sodipodi:nodetypes="ccc" style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-opacity:1;stroke-width:1pt;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:0.7;"/>
-            </g>
-            <g id="g780" transform="translate(-117.8951,83.73234)">
-                <path d="M 424.69 52.5344 C 445.456 51.8645 445.456 82.0082 426.03 82.0082 C 401.245 82.678 404.594 53.2043 424.69 52.5344 z " id="path781" sodipodi:nodetypes="ccc" style="fill:#ff0000;fill-rule:evenodd;stroke:black;stroke-opacity:1;stroke-width:3.75;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:1;stroke-dasharray:none;"/>
-                <path d="M 425.36 55.2139 C 423.35 53.2043 401.915 63.922 415.982 75.3096 C 424.691 74.6397 427.37 57.2234 425.36 55.2139 z " id="path782" sodipodi:nodetypes="ccc" style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-opacity:1;stroke-width:1pt;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:0.7;"/>
-            </g>
-            <g id="g791" transform="translate(-236.4601,103.1582)">
-                <path d="M 424.69 52.5344 C 445.456 51.8645 445.456 82.0082 426.03 82.0082 C 401.245 82.678 404.594 53.2043 424.69 52.5344 z " id="path792" sodipodi:nodetypes="ccc" style="font-size:12;fill:#ff00ff;fill-rule:evenodd;stroke:#000000;stroke-width:3.75;fill-opacity:1;"/>
-                <path d="M 425.36 55.2139 C 423.35 53.2043 401.915 63.922 415.982 75.3096 C 424.691 74.6397 427.37 57.2234 425.36 55.2139 z " id="path793" sodipodi:nodetypes="ccc" style="font-size:12;fill:#ffffff;fill-opacity:0.7;fill-rule:evenodd;stroke-width:1pt;"/>
-            </g>
-            <g id="g794" transform="translate(-85.74192,124.5937)">
-                <path d="M 424.69 52.5344 C 445.456 51.8645 445.456 82.0082 426.03 82.0082 C 401.245 82.678 404.594 53.2043 424.69 52.5344 z " id="path795" sodipodi:nodetypes="ccc" style="font-size:12;fill:#ff00ff;fill-rule:evenodd;stroke:#000000;stroke-width:3.75;fill-opacity:1;"/>
-                <path d="M 425.36 55.2139 C 423.35 53.2043 401.915 63.922 415.982 75.3096 C 424.691 74.6397 427.37 57.2234 425.36 55.2139 z " id="path796" sodipodi:nodetypes="ccc" style="font-size:12;fill:#ffffff;fill-opacity:0.7;fill-rule:evenodd;stroke-width:1pt;"/>
-            </g>
-            <g id="g797" transform="translate(-144.0196,236.4601)">
-                <path d="M 424.69 52.5344 C 445.456 51.8645 445.456 82.0082 426.03 82.0082 C 401.245 82.678 404.594 53.2043 424.69 52.5344 z " id="path798" sodipodi:nodetypes="ccc" style="font-size:12;fill:#ff00ff;fill-rule:evenodd;stroke:#000000;stroke-width:3.75;fill-opacity:1;"/>
-                <path d="M 425.36 55.2139 C 423.35 53.2043 401.915 63.922 415.982 75.3096 C 424.691 74.6397 427.37 57.2234 425.36 55.2139 z " id="path799" sodipodi:nodetypes="ccc" style="font-size:12;fill:#ffffff;fill-opacity:0.7;fill-rule:evenodd;stroke-width:1pt;"/>
-            </g>
-            <g id="g808" transform="translate(-158.7565,60.28728)">
-                <path d="M 424.69 52.5344 C 445.456 51.8645 445.456 82.0082 426.03 82.0082 C 401.245 82.678 404.594 53.2043 424.69 52.5344 z " id="path809" sodipodi:nodetypes="ccc" style="font-size:12;fill:#0000ff;fill-rule:evenodd;stroke:#000000;stroke-width:3.75;fill-opacity:1;"/>
-                <path d="M 425.36 55.2139 C 423.35 53.2043 401.915 63.922 415.982 75.3096 C 424.691 74.6397 427.37 57.2234 425.36 55.2139 z " id="path810" sodipodi:nodetypes="ccc" style="font-size:12;fill:#ffffff;fill-opacity:0.7;fill-rule:evenodd;stroke-width:1pt;"/>
-            </g>
-            <g id="g811" transform="translate(-300.7665,212.3452)">
-                <path d="M 424.69 52.5344 C 445.456 51.8645 445.456 82.0082 426.03 82.0082 C 401.245 82.678 404.594 53.2043 424.69 52.5344 z " id="path812" sodipodi:nodetypes="ccc" style="font-size:12;fill:#0000ff;fill-rule:evenodd;stroke:#000000;stroke-width:3.75;fill-opacity:1;"/>
-                <path d="M 425.36 55.2139 C 423.35 53.2043 401.915 63.922 415.982 75.3096 C 424.691 74.6397 427.37 57.2234 425.36 55.2139 z " id="path813" sodipodi:nodetypes="ccc" style="font-size:12;fill:#ffffff;fill-opacity:0.7;fill-rule:evenodd;stroke-width:1pt;"/>
-            </g>
-            <g id="g814" transform="translate(-109.1869,185.5508)">
-                <path d="M 424.69 52.5344 C 445.456 51.8645 445.456 82.0082 426.03 82.0082 C 401.245 82.678 404.594 53.2043 424.69 52.5344 z " id="path815" sodipodi:nodetypes="ccc" style="font-size:12;fill:#0000ff;fill-rule:evenodd;stroke:#000000;stroke-width:3.75;fill-opacity:1;"/>
-                <path d="M 425.36 55.2139 C 423.35 53.2043 401.915 63.922 415.982 75.3096 C 424.691 74.6397 427.37 57.2234 425.36 55.2139 z " id="path816" sodipodi:nodetypes="ccc" style="font-size:12;fill:#ffffff;fill-opacity:0.7;fill-rule:evenodd;stroke-width:1pt;"/>
-            </g>
-            <g id="g822" transform="translate(-192.9193,111.8663)">
-                <path d="M 424.69 52.5344 C 445.456 51.8645 445.456 82.0082 426.03 82.0082 C 401.245 82.678 404.594 53.2043 424.69 52.5344 z " id="path823" sodipodi:nodetypes="ccc" style="font-size:12;fill:#00ffff;fill-rule:evenodd;stroke:#000000;stroke-width:3.75;fill-opacity:1;"/>
-                <path d="M 425.36 55.2139 C 423.35 53.2043 401.915 63.922 415.982 75.3096 C 424.691 74.6397 427.37 57.2234 425.36 55.2139 z " id="path824" sodipodi:nodetypes="ccc" style="font-size:12;fill:#ffffff;fill-opacity:0.7;fill-rule:evenodd;stroke-width:1pt;"/>
-            </g>
-            <g id="g825" transform="translate(-101.1486,279.3311)">
-                <path d="M 424.69 52.5344 C 445.456 51.8645 445.456 82.0082 426.03 82.0082 C 401.245 82.678 404.594 53.2043 424.69 52.5344 z " id="path826" sodipodi:nodetypes="ccc" style="font-size:12;fill:#00ffff;fill-rule:evenodd;stroke:#000000;stroke-width:3.75;fill-opacity:1;"/>
-                <path d="M 425.36 55.2139 C 423.35 53.2043 401.915 63.922 415.982 75.3096 C 424.691 74.6397 427.37 57.2234 425.36 55.2139 z " id="path827" sodipodi:nodetypes="ccc" style="font-size:12;fill:#ffffff;fill-opacity:0.7;fill-rule:evenodd;stroke-width:1pt;"/>
-            </g>
-            <g id="g836" transform="translate(-293.3981,267.9435)">
-                <path d="M 424.69 52.5344 C 445.456 51.8645 445.456 82.0082 426.03 82.0082 C 401.245 82.678 404.594 53.2043 424.69 52.5344 z " id="path837" sodipodi:nodetypes="ccc" style="font-size:12;fill:#00ff00;fill-rule:evenodd;stroke:#000000;stroke-width:3.75;fill-opacity:1;"/>
-                <path d="M 425.36 55.2139 C 423.35 53.2043 401.915 63.922 415.982 75.3096 C 424.691 74.6397 427.37 57.2234 425.36 55.2139 z " id="path838" sodipodi:nodetypes="ccc" style="font-size:12;fill:#ffffff;fill-opacity:0.7;fill-rule:evenodd;stroke-width:1pt;"/>
-            </g>
-            <g id="g839" transform="translate(-203.6370,194.9289)">
-                <path d="M 424.69 52.5344 C 445.456 51.8645 445.456 82.0082 426.03 82.0082 C 401.245 82.678 404.594 53.2043 424.69 52.5344 z " id="path840" sodipodi:nodetypes="ccc" style="font-size:12;fill:#00ff00;fill-rule:evenodd;stroke:#000000;stroke-width:3.75;fill-opacity:1;"/>
-                <path d="M 425.36 55.2139 C 423.35 53.2043 401.915 63.922 415.982 75.3096 C 424.691 74.6397 427.37 57.2234 425.36 55.2139 z " id="path841" sodipodi:nodetypes="ccc" style="font-size:12;fill:#ffffff;fill-opacity:0.7;fill-rule:evenodd;stroke-width:1pt;"/>
-            </g>
-            <g id="g851" transform="translate(-81.05289,214.3548)">
-                <path d="M 424.69 52.5344 C 445.456 51.8645 445.456 82.0082 426.03 82.0082 C 401.245 82.678 404.594 53.2043 424.69 52.5344 z " id="path852" sodipodi:nodetypes="ccc" style="font-size:12;fill:#ffff00;fill-rule:evenodd;stroke:#000000;stroke-width:3.75;fill-opacity:1;"/>
-                <path d="M 425.36 55.2139 C 423.35 53.2043 401.915 63.922 415.982 75.3096 C 424.691 74.6397 427.37 57.2234 425.36 55.2139 z " id="path853" sodipodi:nodetypes="ccc" style="font-size:12;fill:#ffffff;fill-opacity:0.7;fill-rule:evenodd;stroke-width:1pt;"/>
-            </g>
-            <g id="g854" transform="translate(-146.0292,146.0292)">
-                <path d="M 424.69 52.5344 C 445.456 51.8645 445.456 82.0082 426.03 82.0082 C 401.245 82.678 404.594 53.2043 424.69 52.5344 z " id="path855" sodipodi:nodetypes="ccc" style="font-size:12;fill:#ffff00;fill-rule:evenodd;stroke:#000000;stroke-width:3.75;fill-opacity:1;"/>
-                <path d="M 425.36 55.2139 C 423.35 53.2043 401.915 63.922 415.982 75.3096 C 424.691 74.6397 427.37 57.2234 425.36 55.2139 z " id="path856" sodipodi:nodetypes="ccc" style="font-size:12;fill:#ffffff;fill-opacity:0.7;fill-rule:evenodd;stroke-width:1pt;"/>
-            </g>
-            <g id="g857" transform="translate(-231.7711,227.7519)">
-                <path d="M 424.69 52.5344 C 445.456 51.8645 445.456 82.0082 426.03 82.0082 C 401.245 82.678 404.594 53.2043 424.69 52.5344 z " id="path858" sodipodi:nodetypes="ccc" style="font-size:12;fill:#ffff00;fill-rule:evenodd;stroke:#000000;stroke-width:3.75;fill-opacity:1;"/>
-                <path d="M 425.36 55.2139 C 423.35 53.2043 401.915 63.922 415.982 75.3096 C 424.691 74.6397 427.37 57.2234 425.36 55.2139 z " id="path859" sodipodi:nodetypes="ccc" style="font-size:12;fill:#ffffff;fill-opacity:0.7;fill-rule:evenodd;stroke-width:1pt;"/>
-            </g>
-            <g id="g865" transform="translate(-202.9672,64.97627)">
-                <path d="M 424.69 52.5344 C 445.456 51.8645 445.456 82.0082 426.03 82.0082 C 401.245 82.678 404.594 53.2043 424.69 52.5344 z " id="path866" sodipodi:nodetypes="ccc" style="font-size:12;fill:#ff9300;fill-rule:evenodd;stroke:#000000;stroke-width:3.75;fill-opacity:1;"/>
-                <path d="M 425.36 55.2139 C 423.35 53.2043 401.915 63.922 415.982 75.3096 C 424.691 74.6397 427.37 57.2234 425.36 55.2139 z " id="path867" sodipodi:nodetypes="ccc" style="font-size:12;fill:#ffffff;fill-opacity:0.7;fill-rule:evenodd;stroke-width:1pt;"/>
-            </g>
-            <g id="g868" transform="translate(-158.0866,287.3694)">
-                <path d="M 424.69 52.5344 C 445.456 51.8645 445.456 82.0082 426.03 82.0082 C 401.245 82.678 404.594 53.2043 424.69 52.5344 z " id="path869" sodipodi:nodetypes="ccc" style="font-size:12;fill:#ff9300;fill-rule:evenodd;stroke:#000000;stroke-width:3.75;fill-opacity:1;"/>
-                <path d="M 425.36 55.2139 C 423.35 53.2043 401.915 63.922 415.982 75.3096 C 424.691 74.6397 427.37 57.2234 425.36 55.2139 z " id="path870" sodipodi:nodetypes="ccc" style="font-size:12;fill:#ffffff;fill-opacity:0.7;fill-rule:evenodd;stroke-width:1pt;"/>
-            </g>
-            <g id="g871" transform="translate(-152.7278,188.2303)">
-                <path d="M 424.69 52.5344 C 445.456 51.8645 445.456 82.0082 426.03 82.0082 C 401.245 82.678 404.594 53.2043 424.69 52.5344 z " id="path872" sodipodi:nodetypes="ccc" style="font-size:12;fill:#ff9300;fill-rule:evenodd;stroke:#000000;stroke-width:3.75;fill-opacity:1;"/>
-                <path d="M 425.36 55.2139 C 423.35 53.2043 401.915 63.922 415.982 75.3096 C 424.691 74.6397 427.37 57.2234 425.36 55.2139 z " id="path873" sodipodi:nodetypes="ccc" style="font-size:12;fill:#ffffff;fill-opacity:0.7;fill-rule:evenodd;stroke-width:1pt;"/>
-            </g>
-            <g id="g880" transform="translate(-140.0000,25.00000)">
-                <polygon id="polygon878" points="418.662,76.6493 399.532,56.5037 376.859,72.5587 390.107,48.1396 367.832,31.538 395.15,36.5918 404.055,10.2764 407.69,37.819 435.47,38.1568 410.399,50.1252 418.662,76.6493 " sodipodi:arg1="1.04002345" sodipodi:arg2="1.66834199" sodipodi:cx="400.575500" sodipodi:cy="45.8358383" sodipodi:r1="35.7292557" sodipodi:r2="10.7187767" sodipodi:sides="5" sodipodi:type="star" style="font-size:12;fill:#ff0000;fill-rule:evenodd;stroke-width:3.75;stroke:#000000;stroke-opacity:1;stroke-dasharray:none;fill-opacity:1;" transform="matrix(0.994342,-0.106230,0.106230,0.994342,-2.344353,42.91328)"/>
-                <path d="M 388.532 62.8101 C 401.79 40.713 380.796 41.775 381.792 39.3513 C 399.139 44.4405 399.022 35.5462 400.79 24.014 C 403.441 40.3242 406.708 43.765 388.532 62.8101 z " id="path879" sodipodi:nodetypes="cccc" style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-opacity:1;stroke-width:1pt;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:0.5;"/>
-            </g>
-            <g id="g883" transform="translate(-216.1370,24.92889)">
-                <path d="M 424.69 52.5344 C 445.456 51.8645 445.456 82.0082 426.03 82.0082 C 401.245 82.678 404.594 53.2043 424.69 52.5344 z " id="path884" sodipodi:nodetypes="ccc" style="font-size:12;fill:#00ff00;fill-rule:evenodd;stroke:#000000;stroke-width:3.75;fill-opacity:1;"/>
-                <path d="M 425.36 55.2139 C 423.35 53.2043 401.915 63.922 415.982 75.3096 C 424.691 74.6397 427.37 57.2234 425.36 55.2139 z " id="path885" sodipodi:nodetypes="ccc" style="font-size:12;fill:#ffffff;fill-opacity:0.7;fill-rule:evenodd;stroke-width:1pt;"/>
-            </g>
-        </g>
-    </draw>
-</page>';
-
-    // onvert to PDF
-    require_once(dirname(__FILE__).'/../htdocs2pdf.class.php');
-    try
-    {
-        $html2pdf = new HTML2PDF('P', 'A4', 'fr');
-        $html2pdf->pdf->SetDisplayMode('fullpage');
-        $html2pdf->writeHTML($content, isset($_GET['vuehtml']));
-        $html2pdf->Output('svg_tree.pdf');
-    }
-    catch(HTML2PDF_exception $e) {
-        echo $e;
-        exit;
-    }
diff --git a/html2pdf_v4.03/examples/ticket.php b/html2pdf_v4.03/examples/ticket.php
deleted file mode 100644
index 89675963..00000000
--- a/html2pdf_v4.03/examples/ticket.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/**
- * HTML2PDF Librairy - example
- *
- * HTML => PDF convertor
- * distributed under the LGPL License
- *
- * @author      Laurent MINGUET <webmaster@html2pdf.fr>
- *
- * isset($_GET['vuehtml']) is not mandatory
- * it allow to display the result in the HTML format
- */
-    // get the HTML
-    ob_start();
-    $num = 'CMD01-'.date('ymd');
-    $nom = 'DUPONT Alphonse';
-    $date = '01/01/2012';
-?>
-<style type="text/css">
-<!--
-    div.zone { border: none; border-radius: 6mm; background: #FFFFFF; border-collapse: collapse; padding:3mm; font-size: 2.7mm;}
-    h1 { padding: 0; margin: 0; color: #DD0000; font-size: 7mm; }
-    h2 { padding: 0; margin: 0; color: #222222; font-size: 5mm; position: relative; }
--->
-</style>
-<page format="100x200" orientation="L" backcolor="#AAAACC" style="font: arial;">
-    <div style="rotate: 90; position: absolute; width: 100mm; height: 4mm; left: 195mm; top: 0; font-style: italic; font-weight: normal; text-align: center; font-size: 2.5mm;">
-        Ceci est votre e-ticket à présenter au contrôle d'accès -
-        billet généré par <a href="http../htdocs2pdf.fr/" style="color: #222222; text-decoration: none;">html2pdf</a>
-    </div>
-    <table style="width: 99%;border: none;" cellspacing="4mm" cellpadding="0">
-        <tr>
-            <td colspan="2" style="width: 100%">
-                <div class="zone" style="height: 34mm;position: relative;font-size: 5mm;">
-                    <div style="position: absolute; right: 3mm; top: 3mm; text-align: right; font-size: 4mm; ">
-                        <b><?php echo $nom; ?></b><br>
-                    </div>
-                    <div style="position: absolute; right: 3mm; bottom: 3mm; text-align: right; font-size: 4mm; ">
-                        <b>1</b> place <b>plein tarif</b><br>
-                        Prix unitaire TTC : <b>45,00&euro;</b><br>
-                        N° commande : <b><?php echo $num; ?></b><br>
-                        Date d'achat : <b><?php echo date('d/m/Y à H:i:s'); ?></b><br>
-                    </div>
-                    <h1>Billet soirée spécial HTML2PDF</h1>
-                    &nbsp;&nbsp;&nbsp;&nbsp;<b>Valable le <?php echo $date; ?> à 20h30</b><br>
-                    <img src="./res/logo.gif" alt="logo" style="margin-top: 3mm; margin-left: 20mm">
-                </div>
-            </td>
-        </tr>
-        <tr>
-            <td style="width: 25%;">
-                <div class="zone" style="height: 40mm;vertical-align: middle;text-align: center;">
-                    <qrcode value="<?php echo $num."\n".$nom."\n".$date; ?>" ec="Q" style="width: 37mm; border: none;" ></qrcode>
-                </div>
-            </td>
-            <td style="width: 75%">
-                <div class="zone" style="height: 40mm;vertical-align: middle; text-align: justify">
-                    <b>Conditions d'utilisation du billet</b><br>
-                    Le billet est soumis aux conditions générales de vente que vous avez
-                    acceptées avant l'achat du billet. Le billet d'entrée est uniquement
-                    valable s'il est imprimé sur du papier A4 blanc, vierge recto et verso.
-                    L'entrée est soumise au contrôle de la validité de votre billet. Une bonne
-                    qualité d'impression est nécessaire. Les billets partiellement imprimés,
-                    souillés, endommagés ou illisibles ne seront pas acceptés et seront
-                    considérés comme non valables. En cas d'incident ou de mauvaise qualité
-                    d'impression, vous devez imprimer à nouveau votre fichier. Pour vérifier
-                    la bonne qualité de l'impression, assurez-vous que les informations écrites
-                    sur le billet, ainsi que les pictogrammes (code à barres 2D) sont bien
-                    lisibles. Ce titre doit être conservé jusqu'à la fin de la manifestation.
-                    Une pièce d'identité pourra être demandée conjointement à ce billet. En
-                    cas de non respect de l'ensemble des règles précisées ci-dessus, ce billet
-                    sera considéré comme non valable.<br>
-                    <br>
-                    <i>Ce billet est reconnu électroniquement lors de votre
-                    arrivée sur site. A ce titre, il ne doit être ni dupliqué, ni photocopié.
-                    Toute reproduction est frauduleuse et inutile.</i>
-                </div>
-            </td>
-        </tr>
-    </table>
-</page>
-<?php
-     $content = ob_get_clean();
-
-    // convert
-    require_once(dirname(__FILE__).'/../htdocs2pdf.class.php');
-    try
-    {
-        $html2pdf = new HTML2PDF('P', 'A4', 'fr', true, 'UTF-8', 0);
-        $html2pdf->pdf->SetDisplayMode('fullpage');
-        $html2pdf->writeHTML($content, isset($_GET['vuehtml']));
-        $html2pdf->Output('ticket.pdf');
-    }
-    catch(HTML2PDF_exception $e) {
-        echo $e;
-        exit;
-    }
-
diff --git a/html2pdf_v4.03/examples/utf8.php b/html2pdf_v4.03/examples/utf8.php
deleted file mode 100644
index 3982eccb..00000000
--- a/html2pdf_v4.03/examples/utf8.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * HTML2PDF Librairy - example
- *
- * HTML => PDF convertor
- * distributed under the LGPL License
- *
- * @author      Laurent MINGUET <webmaster@html2pdf.fr>
- *
- * isset($_GET['vuehtml']) is not mandatory
- * it allow to display the result in the HTML format
- */
-
-    require_once(dirname(__FILE__).'/../html2pdf.class.php');
-
-    // get the HTML
-    $content = file_get_contents(dirname(__FILE__).'/../_tcpdf_'.HTML2PDF_USED_TCPDF_VERSION.'/cache/utf8test.txt');
-    $content = '<page style="font-family: freeserif"><br />'.nl2br($content).'</page>';
-
-    // convert to PDF
-    try
-    {
-        $html2pdf = new HTML2PDF('P', 'A4', 'fr');
-        $html2pdf->pdf->SetDisplayMode('real');
-        $html2pdf->writeHTML($content, isset($_GET['vuehtml']));
-        $html2pdf->Output('utf8.pdf');
-    }
-    catch(HTML2PDF_exception $e) {
-        echo $e;
-        exit;
-    }
diff --git a/html2pdf_v4.03/html2pdf.class.php b/html2pdf_v4.03/html2pdf.class.php
deleted file mode 100644
index 91b854b8..00000000
--- a/html2pdf_v4.03/html2pdf.class.php
+++ /dev/null
@@ -1,6488 +0,0 @@
-<?php
-/**
- * HTML2PDF Librairy - main class
- *
- * HTML => PDF convertor
- * distributed under the LGPL License
- *
- * @author  Laurent MINGUET <webmaster@html2pdf.fr>
- * @version 4.03
- */
-
-if (!defined('__CLASS_HTML2PDF__')) {
-
-    define('__CLASS_HTML2PDF__', '4.03');
-    define('HTML2PDF_USED_TCPDF_VERSION', '5.0.002');
-
-    require_once(dirname(__FILE__).'/_class/exception.class.php');
-    require_once(dirname(__FILE__).'/_class/locale.class.php');
-    require_once(dirname(__FILE__).'/_class/myPdf.class.php');
-    require_once(dirname(__FILE__).'/_class/parsingHtml.class.php');
-    require_once(dirname(__FILE__).'/_class/parsingCss.class.php');
-
-    class HTML2PDF
-    {
-        /**
-         * HTML2PDF_myPdf object, extends from TCPDF
-         * @var HTML2PDF_myPdf
-         */
-        public $pdf = null;
-
-        /**
-         * CSS parsing
-         * @var HTML2PDF_parsingCss
-         */
-        public $parsingCss = null;
-
-        /**
-         * HTML parsing
-         * @var HTML2PDF_parsingHtml
-         */
-        public $parsingHtml = null;
-
-        protected $_langue           = 'fr';        // locale of the messages
-        protected $_orientation      = 'P';         // page orientation : Portrait ou Landscape
-        protected $_format           = 'A4';        // page format : A4, A3, ...
-        protected $_encoding         = '';          // charset encoding
-        protected $_unicode          = true;        // means that the input text is unicode (default = true)
-
-        protected $_testTdInOnepage  = true;        // test of TD that can not take more than one page
-        protected $_testIsImage      = true;        // test if the images exist or not
-        protected $_testIsDeprecated = false;       // test the deprecated functions
-
-        protected $_parsePos         = 0;           // position in the parsing
-        protected $_tempPos          = 0;           // temporary position for complex table
-        protected $_page             = 0;           // current page number
-
-        protected $_subHtml          = null;        // sub html
-        protected $_subPart          = false;       // sub HTML2PDF
-        protected $_subHEADER        = array();     // sub action to make the header
-        protected $_subFOOTER        = array();     // sub action to make the footer
-        protected $_subSTATES        = array();     // array to save some parameters
-
-        protected $_isSubPart        = false;       // flag : in a sub html2pdf
-        protected $_isInThead        = false;       // flag : in a thead
-        protected $_isInTfoot        = false;       // flag : in a tfoot
-        protected $_isInOverflow     = false;       // flag : in a overflow
-        protected $_isInFooter       = false;       // flag : in a footer
-        protected $_isInDraw         = null;        // flag : in a draw (svg)
-        protected $_isAfterFloat     = false;       // flag : is just after a float
-        protected $_isInForm         = false;       // flag : is in a float. false / action of the form
-        protected $_isInLink         = '';          // flag : is in a link. empty / href of the link
-        protected $_isInParagraph    = false;       // flag : is in a paragraph
-        protected $_isForOneLine     = false;       // flag : in a specific sub html2pdf to have the height of the next line
-
-        protected $_maxX             = 0;           // maximum X of the current zone
-        protected $_maxY             = 0;           // maximum Y of the current zone
-        protected $_maxE             = 0;           // number of elements in the current zone
-        protected $_maxH             = 0;           // maximum height of the line in the current zone
-        protected $_maxSave          = array();     // save the maximums of the current zone
-        protected $_currentH         = 0;           // height of the current line
-
-        protected $_defaultLeft      = 0;           // default marges of the page
-        protected $_defaultTop       = 0;
-        protected $_defaultRight     = 0;
-        protected $_defaultBottom    = 0;
-        protected $_defaultFont      = null;        // default font to use, is the asked font does not exist
-
-        protected $_margeLeft        = 0;           // current marges of the page
-        protected $_margeTop         = 0;
-        protected $_margeRight       = 0;
-        protected $_margeBottom      = 0;
-        protected $_marges           = array();     // save the different marges of the current page
-        protected $_pageMarges       = array();     // float marges of the current page
-        protected $_background       = array();     // background informations
-
-
-        protected $_firstPage        = true;        // flag : first page
-        protected $_defList          = array();     // table to save the stats of the tags UL and OL
-
-        protected $_lstAnchor        = array();     // list of the anchors
-        protected $_lstField         = array();     // list of the fields
-        protected $_lstSelect        = array();     // list of the options of the current select
-        protected $_previousCall     = null;        // last action called
-
-        protected $_debugActif       = false;       // flag : mode debug is active
-        protected $_debugOkUsage     = false;       // flag : the function memory_get_usage exist
-        protected $_debugOkPeak      = false;       // flag : the function memory_get_peak_usage exist
-        protected $_debugLevel       = 0;           // level in the debug
-        protected $_debugStartTime   = 0;           // debug start time
-        protected $_debugLastTime    = 0;           // debug stop time
-
-        static protected $_subobj    = null;        // object html2pdf prepared in order to accelerate the creation of sub html2pdf
-        static protected $_tables    = array();     // static table to prepare the nested html tables
-
-        /**
-         * class constructor
-         *
-         * @access public
-         * @param  string   $orientation page orientation, same as TCPDF
-         * @param  mixed    $format      The format used for pages, same as TCPDF
-         * @param  $tring   $langue      Langue : fr, en, it...
-         * @param  boolean  $unicode     TRUE means that the input text is unicode (default = true)
-         * @param  String   $encoding    charset encoding; default is UTF-8
-         * @param  array    $marges      Default marges (left, top, right, bottom)
-         * @return HTML2PDF $this
-         */
-        public function __construct($orientation = 'P', $format = 'A4', $langue='fr', $unicode=true, $encoding='UTF-8', $marges = array(5, 5, 5, 8))
-        {
-            // init the page number
-            $this->_page         = 0;
-            $this->_firstPage    = true;
-
-            // save the parameters
-            $this->_orientation  = $orientation;
-            $this->_format       = $format;
-            $this->_langue       = strtolower($langue);
-            $this->_unicode      = $unicode;
-            $this->_encoding     = $encoding;
-
-            // load the Local
-            HTML2PDF_locale::load($this->_langue);
-
-            // create the  HTML2PDF_myPdf object
-            $this->pdf = new HTML2PDF_myPdf($orientation, 'mm', $format, $unicode, $encoding);
-
-            // init the CSS parsing object
-            $this->parsingCss = new HTML2PDF_parsingCss($this->pdf);
-            $this->parsingCss->fontSet();
-            $this->_defList = array();
-
-            // init some tests
-            $this->setTestTdInOnePage(true);
-            $this->setTestIsImage(true);
-            $this->setTestIsDeprecated(true);
-
-            // init the default font
-            $this->setDefaultFont(null);
-
-            // init the HTML parsing object
-            $this->parsingHtml = new HTML2PDF_parsingHtml($this->_encoding);
-            $this->_subHtml = null;
-            $this->_subPart = false;
-
-            // init the marges of the page
-            if (!is_array($marges)) $marges = array($marges, $marges, $marges, $marges);
-            $this->_setDefaultMargins($marges[0], $marges[1], $marges[2], $marges[3]);
-            $this->_setMargins();
-            $this->_marges = array();
-
-            // init the form's fields
-            $this->_lstField = array();
-
-            return $this;
-        }
-
-        /**
-         * Destructor
-         *
-         * @access public
-         * @return null
-         */
-        public function __destruct()
-        {
-
-        }
-
-        /**
-         * Clone to create a sub HTML2PDF from HTML2PDF::$_subobj
-         *
-         * @access public
-         */
-        public function __clone()
-        {
-            $this->pdf = clone $this->pdf;
-            $this->parsingHtml = clone $this->parsingHtml;
-            $this->parsingCss = clone $this->parsingCss;
-            $this->parsingCss->setPdfParent($this->pdf);
-        }
-
-        /**
-         * set the debug mode to On
-         *
-         * @access public
-         * @return HTML2PDF $this
-         */
-        public function setModeDebug()
-        {
-            $time = microtime(true);
-
-            $this->_debugActif     = true;
-            $this->_debugOkUsage   = function_exists('memory_get_usage');
-            $this->_debugOkPeak    = function_exists('memory_get_peak_usage');
-            $this->_debugStartTime = $time;
-            $this->_debugLastTime  = $time;
-
-            $this->_DEBUG_stepline('step', 'time', 'delta', 'memory', 'peak');
-            $this->_DEBUG_add('Init debug');
-
-            return $this;
-        }
-
-        /**
-         * Set the test of TD thdat can not take more than one page
-         *
-         * @access public
-         * @param  boolean  $mode
-         * @return HTML2PDF $this
-         */
-        public function setTestTdInOnePage($mode = true)
-        {
-            $this->_testTdInOnepage = $mode ? true : false;
-
-            return $this;
-        }
-
-        /**
-         * Set the test if the images exist or not
-         *
-         * @access public
-         * @param  boolean  $mode
-         * @return HTML2PDF $this
-         */
-        public function setTestIsImage($mode = true)
-        {
-            $this->_testIsImage = $mode ? true : false;
-
-            return $this;
-        }
-
-        /**
-         * Set the test on deprecated functions
-         *
-         * @access public
-         * @param  boolean  $mode
-         * @return HTML2PDF $this
-         */
-        public function setTestIsDeprecated($mode = true)
-        {
-            $this->_testIsDeprecated = $mode ? true : false;
-
-            return $this;
-        }
-
-        /**
-         * Set the default font to use, if no font is specify, or if the asked font does not exist
-         *
-         * @access public
-         * @param  string   $default name of the default font to use. If null : Arial is no font is specify, and error if the asked font does not exist
-         * @return HTML2PDF $this
-         */
-        public function setDefaultFont($default = null)
-        {
-            $this->_defaultFont = $default;
-            $this->parsingCss->setDefaultFont($default);
-
-            return $this;
-        }
-
-        /**
-         * add a font, see TCPDF function addFont
-         *
-         * @access public
-         * @param string $family Font family. The name can be chosen arbitrarily. If it is a standard family name, it will override the corresponding font.
-         * @param string $style Font style. Possible values are (case insensitive):<ul><li>empty string: regular (default)</li><li>B: bold</li><li>I: italic</li><li>BI or IB: bold italic</li></ul>
-         * @param string $fontfile The font definition file. By default, the name is built from the family and style, in lower case with no spaces.
-         * @return HTML2PDF $this
-         * @see TCPDF::addFont
-         */
-        public function addFont($family, $style='', $file='')
-        {
-            $this->pdf->AddFont($family, $style, $file);
-
-            return $this;
-        }
-
-        /**
-         * display a automatic index, from the bookmarks
-         *
-         * @access public
-         * @param  string  $titre         index title
-         * @param  int     $sizeTitle     font size of the index title, in mm
-         * @param  int     $sizeBookmark  font size of the index, in mm
-         * @param  boolean $bookmarkTitle add a bookmark for the index, at his beginning
-         * @param  boolean $displayPage   display the page numbers
-         * @param  int     $onPage        if null : at the end of the document on a new page, else on the $onPage page
-         * @param  string  $fontName      font name to use
-         * @return null
-         */
-        public function createIndex($titre = 'Index', $sizeTitle = 20, $sizeBookmark = 15, $bookmarkTitle = true, $displayPage = true, $onPage = null, $fontName = 'helvetica')
-        {
-            $oldPage = $this->_INDEX_NewPage($onPage);
-            $this->pdf->createIndex($this, $titre, $sizeTitle, $sizeBookmark, $bookmarkTitle, $displayPage, $onPage, $fontName);
-            if ($oldPage) $this->pdf->setPage($oldPage);
-        }
-
-        /**
-         * clean up the objects
-         *
-         * @access protected
-         */
-        protected function _cleanUp()
-        {
-            HTML2PDF::$_subobj = null;
-            HTML2PDF::$_tables = array();
-        }
-
-        /**
-         * Send the document to a given destination: string, local file or browser.
-         * Dest can be :
-         *  I : send the file inline to the browser (default). The plug-in is used if available. The name given by name is used when one selects the "Save as" option on the link generating the PDF.
-         *  D : send to the browser and force a file download with the name given by name.
-         *  F : save to a local server file with the name given by name.
-         *  S : return the document as a string. name is ignored.
-         *  FI: equivalent to F + I option
-         *  FD: equivalent to F + D option
-         *  true  => I
-         *  false => S
-         *
-         * @param  string $name The name of the file when saved.
-         * @param  string $dest Destination where to send the document.
-         * @return string content of the PDF, if $dest=S
-         * @see TCPDF::close
-         * @access public
-
-         */
-        public function Output($name = '', $dest = false)
-        {
-            // close the pdf and clean up
-            $this->_cleanUp();
-
-            // if on debug mode
-            if ($this->_debugActif) {
-                $this->_DEBUG_add('Before output');
-                $this->pdf->Close();
-                exit;
-            }
-
-            // complete parameters
-            if ($dest===false) $dest = 'I';
-            if ($dest===true)  $dest = 'S';
-            if ($dest==='')    $dest = 'I';
-            if ($name=='')     $name='document.pdf';
-
-            // clean up the destination
-            $dest = strtoupper($dest);
-            if (!in_array($dest, array('I', 'D', 'F', 'S', 'FI','FD'))) $dest = 'I';
-
-            // the name must be a PDF name
-            if (strtolower(substr($name, -4))!='.pdf') {
-                throw new HTML2PDF_exception(0, 'The output document name "'.$name.'" is not a PDF name');
-            }
-
-            // call the output of TCPDF
-            return $this->pdf->Output($name, $dest);
-        }
-
-        /**
-         * convert HTML to PDF
-         *
-         * @access public
-         * @param  string   $html
-         * @param  boolean  $debugVue  enable the HTML debug vue
-         * @return null
-         */
-        public function writeHTML($html, $debugVue = false)
-        {
-            // if it is a real html page, we have to convert it
-            if (preg_match('/<body/isU', $html))
-                $html = $this->getHtmlFromPage($html);
-
-            $html = str_replace('[[date_y]]', date('Y'), $html);
-            $html = str_replace('[[date_m]]', date('m'), $html);
-            $html = str_replace('[[date_d]]', date('d'), $html);
-
-            $html = str_replace('[[date_h]]', date('H'), $html);
-            $html = str_replace('[[date_i]]', date('i'), $html);
-            $html = str_replace('[[date_s]]', date('s'), $html);
-
-            // If we are in HTML debug vue : display the HTML
-            if ($debugVue) {
-                return $this->_vueHTML($html);
-            }
-
-            // convert HTMl to PDF
-            $this->parsingCss->readStyle($html);
-            $this->parsingHtml->setHTML($html);
-            $this->parsingHtml->parse();
-            $this->_makeHTMLcode();
-        }
-
-        /**
-         * convert the HTML of a real page, to a code adapted to HTML2PDF
-         *
-         * @access public
-         * @param  string HTML of a real page
-         * @return string HTML adapted to HTML2PDF
-         */
-        public function getHtmlFromPage($html)
-        {
-            $html = str_replace('<BODY', '<body', $html);
-            $html = str_replace('</BODY', '</body', $html);
-
-            // extract the content
-            $res = explode('<body', $html);
-            if (count($res)<2) return $html;
-            $content = '<page'.$res[1];
-            $content = explode('</body', $content);
-            $content = $content[0].'</page>';
-
-            // extract the link tags
-            preg_match_all('/<link([^>]*)>/isU', $html, $match);
-            foreach ($match[0] as $src)
-                $content = $src.'</link>'.$content;
-
-            // extract the css style tags
-            preg_match_all('/<style[^>]*>(.*)<\/style[^>]*>/isU', $html, $match);
-            foreach ($match[0] as $src)
-                $content = $src.$content;
-
-            return $content;
-        }
-
-        /**
-         * init a sub HTML2PDF. does not use it directly. Only the method createSubHTML must use it
-         *
-         * @access public
-         * @param  string  $format
-         * @param  string  $orientation
-         * @param  array   $marge
-         * @param  integer $page
-         * @param  array   $defLIST
-         * @param  integer $myLastPageGroup
-         * @param  integer $myLastPageGroupNb
-         */
-        public function initSubHtml($format, $orientation, $marge, $page, $defLIST, $myLastPageGroup, $myLastPageGroupNb)
-        {
-            $this->_isSubPart = true;
-
-            $this->parsingCss->setOnlyLeft();
-
-            $this->_setNewPage($format, $orientation, null, null, ($myLastPageGroup!==null));
-
-            $this->_saveMargin(0, 0, $marge);
-            $this->_defList = $defLIST;
-
-            $this->_page = $page;
-            $this->pdf->setMyLastPageGroup($myLastPageGroup);
-            $this->pdf->setMyLastPageGroupNb($myLastPageGroupNb);
-            $this->pdf->setXY(0, 0);
-            $this->parsingCss->fontSet();
-        }
-
-        /**
-         * display the content in HTML moden for debug
-         *
-         * @access protected
-         * @param  string $contenu
-         */
-        protected function _vueHTML($content)
-        {
-            $content = preg_replace('/<page_header([^>]*)>/isU', '<hr>'.HTML2PDF_locale::get('vue01').' : $1<hr><div$1>', $content);
-            $content = preg_replace('/<page_footer([^>]*)>/isU', '<hr>'.HTML2PDF_locale::get('vue02').' : $1<hr><div$1>', $content);
-            $content = preg_replace('/<page([^>]*)>/isU', '<hr>'.HTML2PDF_locale::get('vue03').' : $1<hr><div$1>', $content);
-            $content = preg_replace('/<\/page([^>]*)>/isU', '</div><hr>', $content);
-            $content = preg_replace('/<bookmark([^>]*)>/isU', '<hr>bookmark : $1<hr>', $content);
-            $content = preg_replace('/<\/bookmark([^>]*)>/isU', '', $content);
-            $content = preg_replace('/<barcode([^>]*)>/isU', '<hr>barcode : $1<hr>', $content);
-            $content = preg_replace('/<\/barcode([^>]*)>/isU', '', $content);
-            $content = preg_replace('/<qrcode([^>]*)>/isU', '<hr>qrcode : $1<hr>', $content);
-            $content = preg_replace('/<\/qrcode([^>]*)>/isU', '', $content);
-
-            echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-    <head>
-        <title>'.HTML2PDF_locale::get('vue04').' HTML</title>
-        <meta http-equiv="Content-Type" content="text/html; charset='.$this->_encoding.'" >
-    </head>
-    <body style="padding: 10px; font-size: 10pt;font-family:    Verdana;">
-'.$content.'
-    </body>
-</html>';
-            exit;
-        }
-
-        /**
-         * set the default margins of the page
-         *
-         * @access protected
-         * @param  int $left   (mm, left margin)
-         * @param  int $top    (mm, top margin)
-         * @param  int $right  (mm, right margin, if null => left=right)
-         * @param  int $bottom (mm, bottom margin, if null => bottom=8mm)
-         */
-        protected function _setDefaultMargins($left, $top, $right = null, $bottom = null)
-        {
-            if ($right===null)  $right = $left;
-            if ($bottom===null) $bottom = 8;
-
-            $this->_defaultLeft   = $this->parsingCss->ConvertToMM($left.'mm');
-            $this->_defaultTop    = $this->parsingCss->ConvertToMM($top.'mm');
-            $this->_defaultRight  = $this->parsingCss->ConvertToMM($right.'mm');
-            $this->_defaultBottom = $this->parsingCss->ConvertToMM($bottom.'mm');
-        }
-
-        /**
-         * create a new page
-         *
-         * @access protected
-         * @param  mixed   $format
-         * @param  string  $orientation
-         * @param  array   $background background information
-         * @param  integer $curr real position in the html parseur (if break line in the write of a text)
-         * @param  boolean $resetPageNumber
-         */
-        protected function _setNewPage($format = null, $orientation = '', $background = null, $curr = null, $resetPageNumber=false)
-        {
-            $this->_firstPage = false;
-
-            $this->_format = $format ? $format : $this->_format;
-            $this->_orientation = $orientation ? $orientation : $this->_orientation;
-            $this->_background = $background!==null ? $background : $this->_background;
-            $this->_maxY = 0;
-            $this->_maxX = 0;
-            $this->_maxH = 0;
-            $this->_maxE = 0;
-
-            $this->pdf->SetMargins($this->_defaultLeft, $this->_defaultTop, $this->_defaultRight);
-
-            if ($resetPageNumber) {
-                $this->pdf->startPageGroup();
-            }
-
-            $this->pdf->AddPage($this->_orientation, $this->_format);
-
-            if ($resetPageNumber) {
-                $this->pdf->myStartPageGroup();
-            }
-
-            $this->_page++;
-
-            if (!$this->_subPart && !$this->_isSubPart) {
-                if (is_array($this->_background)) {
-                    if (isset($this->_background['color']) && $this->_background['color']) {
-                        $this->pdf->setFillColorArray($this->_background['color']);
-                        $this->pdf->Rect(0, 0, $this->pdf->getW(), $this->pdf->getH(), 'F');
-                    }
-
-                    if (isset($this->_background['img']) && $this->_background['img'])
-                        $this->pdf->Image($this->_background['img'], $this->_background['posX'], $this->_background['posY'], $this->_background['width']);
-                }
-
-                $this->_setPageHeader();
-                $this->_setPageFooter();
-            }
-
-            $this->_setMargins();
-            $this->pdf->setY($this->_margeTop);
-
-            $this->_setNewPositionForNewLine($curr);
-            $this->_maxH = 0;
-        }
-
-        /**
-         * set the real margin, using the default margins and the page margins
-         *
-         * @access protected
-         */
-        protected function _setMargins()
-        {
-            // prepare the margins
-            $this->_margeLeft   = $this->_defaultLeft   + (isset($this->_background['left'])   ? $this->_background['left']   : 0);
-            $this->_margeRight  = $this->_defaultRight  + (isset($this->_background['right'])  ? $this->_background['right']  : 0);
-            $this->_margeTop    = $this->_defaultTop    + (isset($this->_background['top'])    ? $this->_background['top']    : 0);
-            $this->_margeBottom = $this->_defaultBottom + (isset($this->_background['bottom']) ? $this->_background['bottom'] : 0);
-
-            // set the PDF margins
-            $this->pdf->SetMargins($this->_margeLeft, $this->_margeTop, $this->_margeRight);
-            $this->pdf->SetAutoPageBreak(false, $this->_margeBottom);
-
-            // set the float Margins
-            $this->_pageMarges = array();
-            if ($this->_isInParagraph!==false) {
-                $this->_pageMarges[floor($this->_margeTop*100)] = array($this->_isInParagraph[0], $this->pdf->getW()-$this->_isInParagraph[1]);
-            } else {
-                $this->_pageMarges[floor($this->_margeTop*100)] = array($this->_margeLeft, $this->pdf->getW()-$this->_margeRight);
-            }
-        }
-
-        /**
-         * add a debug step
-         *
-         * @access protected
-         * @param  string  $name step name
-         * @param  boolean $level (true=up, false=down, null=nothing to do)
-         * @return $this
-         */
-        protected function _DEBUG_add($name, $level=null)
-        {
-            // if true : UP
-            if ($level===true) $this->_debugLevel++;
-
-            $name   = str_repeat('  ', $this->_debugLevel). $name.($level===true ? ' Begin' : ($level===false ? ' End' : ''));
-            $time  = microtime(true);
-            $usage = ($this->_debugOkUsage ? memory_get_usage() : 0);
-            $peak  = ($this->_debugOkPeak ? memory_get_peak_usage() : 0);
-
-            $this->_DEBUG_stepline(
-                $name,
-                number_format(($time - $this->_debugStartTime)*1000, 1, '.', ' ').' ms',
-                number_format(($time - $this->_debugLastTime)*1000, 1, '.', ' ').' ms',
-                number_format($usage/1024, 1, '.', ' ').' Ko',
-                number_format($peak/1024, 1, '.', ' ').' Ko'
-            );
-
-            $this->_debugLastTime = $time;
-
-            // it false : DOWN
-            if ($level===false) $this->_debugLevel--;
-
-            return $this;
-        }
-
-        /**
-         * display a debug line
-         *
-         *
-         * @access protected
-         * @param  string $name
-         * @param  string $timeTotal
-         * @param  string $timeStep
-         * @param  string $memoryUsage
-         * @param  string $memoryPeak
-         */
-        protected function _DEBUG_stepline($name, $timeTotal, $timeStep, $memoryUsage, $memoryPeak)
-        {
-            $txt = str_pad($name, 30, ' ', STR_PAD_RIGHT).
-                    str_pad($timeTotal, 12, ' ', STR_PAD_LEFT).
-                    str_pad($timeStep, 12, ' ', STR_PAD_LEFT).
-                    str_pad($memoryUsage, 15, ' ', STR_PAD_LEFT).
-                    str_pad($memoryPeak, 15, ' ', STR_PAD_LEFT);
-
-            echo '<pre style="padding:0; margin:0">'.$txt.'</pre>';
-        }
-
-        /**
-         * get the Min and Max X, for Y (use the float margins)
-         *
-         * @access protected
-         * @param  float $y
-         * @return array(float, float)
-         */
-        protected function _getMargins($y)
-        {
-            $y = floor($y*100);
-            $x = array($this->pdf->getlMargin(), $this->pdf->getW()-$this->pdf->getrMargin());
-
-            foreach ($this->_pageMarges as $mY => $mX)
-                if ($mY<=$y) $x = $mX;
-
-            return $x;
-        }
-
-        /**
-         * Add margins, for a float
-         *
-         * @access protected
-         * @param  string $float (left / right)
-         * @param  float  $xLeft
-         * @param  float  $yTop
-         * @param  float  $xRight
-         * @param  float  $yBottom
-         */
-        protected function _addMargins($float, $xLeft, $yTop, $xRight, $yBottom)
-        {
-            // get the current float margins, for top and bottom
-            $oldTop    = $this->_getMargins($yTop);
-            $oldBottom = $this->_getMargins($yBottom);
-
-            // update the top float margin
-            if ($float=='left'  && $oldTop[0]<$xRight) $oldTop[0] = $xRight;
-            if ($float=='right' && $oldTop[1]>$xLeft)  $oldTop[1] = $xLeft;
-
-            $yTop = floor($yTop*100);
-            $yBottom = floor($yBottom*100);
-
-            // erase all the float margins that are smaller than the new one
-            foreach ($this->_pageMarges as $mY => $mX) {
-                if ($mY<$yTop) continue;
-                if ($mY>$yBottom) break;
-                if ($float=='left' && $this->_pageMarges[$mY][0]<$xRight)  unset($this->_pageMarges[$mY]);
-                if ($float=='right' && $this->_pageMarges[$mY][1]>$xLeft) unset($this->_pageMarges[$mY]);
-            }
-
-            // save the new Top and Bottom margins
-            $this->_pageMarges[$yTop] = $oldTop;
-            $this->_pageMarges[$yBottom] = $oldBottom;
-
-            // sort the margins
-            ksort($this->_pageMarges);
-
-            // we are just after float
-            $this->_isAfterFloat = true;
-        }
-
-        /**
-         * Save old margins (push), and set new ones
-         *
-         * @access protected
-         * @param  float  $ml left margin
-         * @param  float  $mt top margin
-         * @param  float  $mr right margin
-         */
-        protected function _saveMargin($ml, $mt, $mr)
-        {
-            // save old margins
-            $this->_marges[] = array('l' => $this->pdf->getlMargin(), 't' => $this->pdf->gettMargin(), 'r' => $this->pdf->getrMargin(), 'page' => $this->_pageMarges);
-
-            // set new ones
-            $this->pdf->SetMargins($ml, $mt, $mr);
-
-            // prepare for float margins
-            $this->_pageMarges = array();
-            $this->_pageMarges[floor($mt*100)] = array($ml, $this->pdf->getW()-$mr);
-        }
-
-        /**
-         * load the last saved margins (pop)
-         *
-         * @access protected
-         */
-        protected function _loadMargin()
-        {
-            $old = array_pop($this->_marges);
-            if ($old) {
-                $ml = $old['l'];
-                $mt = $old['t'];
-                $mr = $old['r'];
-                $mP = $old['page'];
-            } else {
-                $ml = $this->_margeLeft;
-                $mt = 0;
-                $mr = $this->_margeRight;
-                $mP = array($mt => array($ml, $this->pdf->getW()-$mr));
-            }
-
-            $this->pdf->SetMargins($ml, $mt, $mr);
-            $this->_pageMarges = $mP;
-        }
-
-        /**
-         * save the current maxs (push)
-         *
-         * @access protected
-         */
-        protected function _saveMax()
-        {
-            $this->_maxSave[] = array($this->_maxX, $this->_maxY, $this->_maxH, $this->_maxE);
-        }
-
-        /**
-         * load the last saved current maxs (pop)
-         *
-         * @access protected
-         */
-        protected function _loadMax()
-        {
-            $old = array_pop($this->_maxSave);
-
-            if ($old) {
-                $this->_maxX = $old[0];
-                $this->_maxY = $old[1];
-                $this->_maxH = $old[2];
-                $this->_maxE = $old[3];
-            } else {
-                $this->_maxX = 0;
-                $this->_maxY = 0;
-                $this->_maxH = 0;
-                $this->_maxE = 0;
-            }
-        }
-
-        /**
-         * draw the PDF header with the HTML in page_header
-         *
-         * @access protected
-         */
-        protected function _setPageHeader()
-        {
-            if (!count($this->_subHEADER)) return false;
-
-            $oldParsePos = $this->_parsePos;
-            $oldParseCode = $this->parsingHtml->code;
-
-            $this->_parsePos = 0;
-            $this->parsingHtml->code = $this->_subHEADER;
-            $this->_makeHTMLcode();
-
-            $this->_parsePos = $oldParsePos;
-            $this->parsingHtml->code = $oldParseCode;
-        }
-
-        /**
-         * draw the PDF footer with the HTML in page_footer
-         *
-         * @access protected
-         */
-        protected function _setPageFooter()
-        {
-            if (!count($this->_subFOOTER)) return false;
-
-            $oldParsePos = $this->_parsePos;
-            $oldParseCode = $this->parsingHtml->code;
-
-            $this->_parsePos = 0;
-            $this->parsingHtml->code = $this->_subFOOTER;
-            $this->_isInFooter = true;
-            $this->_makeHTMLcode();
-            $this->_isInFooter = false;
-
-            $this->_parsePos = $oldParsePos;
-            $this->parsingHtml->code = $oldParseCode;
-        }
-
-        /**
-         * new line, with a specific height
-         *
-         * @access protected
-         * @param float   $h
-         * @param integer $curr real current position in the text, if new line in the write of a text
-         */
-        protected function _setNewLine($h, $curr = null)
-        {
-            $this->pdf->Ln($h);
-            $this->_setNewPositionForNewLine($curr);
-        }
-
-        /**
-         * calculate the start position of the next line,  depending on the text-align
-         *
-         * @access protected
-         * @param  integer $curr real current position in the text, if new line in the write of a text
-         */
-        protected function _setNewPositionForNewLine($curr = null)
-        {
-            // get the margins for the current line
-            list($lx, $rx) = $this->_getMargins($this->pdf->getY());
-            $this->pdf->setX($lx);
-            $wMax = $rx-$lx;
-            $this->_currentH = 0;
-
-            // if subPart => return because align left
-            if ($this->_subPart || $this->_isSubPart || $this->_isForOneLine) {
-                $this->pdf->setWordSpacing(0);
-                return null;
-            }
-
-            // create the sub object
-            $sub = null;
-            $this->_createSubHTML($sub);
-            $sub->_saveMargin(0, 0, $sub->pdf->getW()-$wMax);
-            $sub->_isForOneLine = true;
-            $sub->_parsePos = $this->_parsePos;
-            $sub->parsingHtml->code = $this->parsingHtml->code;
-
-            // if $curr => adapt the current position of the parsing
-            if ($curr!==null && $sub->parsingHtml->code[$this->_parsePos]['name']=='write') {
-                $txt = $sub->parsingHtml->code[$this->_parsePos]['param']['txt'];
-                $txt = str_replace('[[page_cu]]', $sub->pdf->getMyNumPage($this->_page), $txt);
-                $sub->parsingHtml->code[$this->_parsePos]['param']['txt'] = substr($txt, $curr+1);
-            } else
-                $sub->_parsePos++;
-
-            // for each element of the parsing => load the action
-            $res = null;
-            for ($sub->_parsePos; $sub->_parsePos<count($sub->parsingHtml->code); $sub->_parsePos++) {
-                $action = $sub->parsingHtml->code[$sub->_parsePos];
-                $res = $sub->_executeAction($action);
-                if (!$res) break;
-            }
-
-            $w = $sub->_maxX; // max width
-            $h = $sub->_maxH; // max height
-            $e = ($res===null ? $sub->_maxE : 0); // maxnumber of elemets on the line
-
-            // destroy the sub HTML
-            $this->_destroySubHTML($sub);
-
-            // adapt the start of the line, depending on the text-align
-            if ($this->parsingCss->value['text-align']=='center')
-                $this->pdf->setX(($rx+$this->pdf->getX()-$w)*0.5-0.01);
-            else if ($this->parsingCss->value['text-align']=='right')
-                $this->pdf->setX($rx-$w-0.01);
-            else
-                $this->pdf->setX($lx);
-
-            // set the height of the line
-            $this->_currentH = $h;
-
-            // if justify => set the word spacing
-            if ($this->parsingCss->value['text-align']=='justify' && $e>1) {
-                $this->pdf->setWordSpacing(($wMax-$w)/($e-1));
-            } else {
-                $this->pdf->setWordSpacing(0);
-            }
-        }
-
-        /**
-         * prepare HTML2PDF::$_subobj (used for create the sub HTML2PDF objects
-         *
-         * @access protected
-         */
-        protected function _prepareSubObj()
-        {
-            $pdf = null;
-
-            // create the sub object
-            HTML2PDF::$_subobj = new HTML2PDF(
-                                        $this->_orientation,
-                                        $this->_format,
-                                        $this->_langue,
-                                        $this->_unicode,
-                                        $this->_encoding,
-                                        array($this->_defaultLeft,$this->_defaultTop,$this->_defaultRight,$this->_defaultBottom)
-                                    );
-
-            // init
-            HTML2PDF::$_subobj->setTestTdInOnePage($this->_testTdInOnepage);
-            HTML2PDF::$_subobj->setTestIsImage($this->_testIsImage);
-            HTML2PDF::$_subobj->setTestIsDeprecated($this->_testIsDeprecated);
-            HTML2PDF::$_subobj->setDefaultFont($this->_defaultFont);
-            HTML2PDF::$_subobj->parsingCss->css            = &$this->parsingCss->css;
-            HTML2PDF::$_subobj->parsingCss->cssKeys        = &$this->parsingCss->cssKeys;
-
-            // clone font from the original PDF
-            HTML2PDF::$_subobj->pdf->cloneFontFrom($this->pdf);
-
-            // remove the link to the parent
-            HTML2PDF::$_subobj->parsingCss->setPdfParent($pdf);
-        }
-
-        /**
-         * create a sub HTML2PDF, to calculate the multi-tables
-         *
-         * @access protected
-         * @param  &HTML2PDF $subHtml sub HTML2PDF to create
-         * @param  integer   $cellmargin if in a TD : cellmargin of this td
-         */
-        protected function _createSubHTML(&$subHtml, $cellmargin=0)
-        {
-            // prepare the subObject, if never prepare before
-            if (HTML2PDF::$_subobj===null) {
-                $this->_prepareSubObj();
-            }
-
-            // calculate the width to use
-            if ($this->parsingCss->value['width']) {
-                $marge = $cellmargin*2;
-                $marge+= $this->parsingCss->value['padding']['l'] + $this->parsingCss->value['padding']['r'];
-                $marge+= $this->parsingCss->value['border']['l']['width'] + $this->parsingCss->value['border']['r']['width'];
-                $marge = $this->pdf->getW() - $this->parsingCss->value['width'] + $marge;
-            } else {
-                $marge = $this->_margeLeft+$this->_margeRight;
-            }
-
-            // BUGFIX : we have to call the method, because of a bug in php 5.1.6
-            HTML2PDF::$_subobj->pdf->getPage();
-
-            // clone the sub oject
-            $subHtml = clone HTML2PDF::$_subobj;
-            $subHtml->parsingCss->table = $this->parsingCss->table;
-            $subHtml->parsingCss->value = $this->parsingCss->value;
-            $subHtml->initSubHtml(
-                $this->_format,
-                $this->_orientation,
-                $marge,
-                $this->_page,
-                $this->_defList,
-                $this->pdf->getMyLastPageGroup(),
-                $this->pdf->getMyLastPageGroupNb()
-            );
-        }
-
-        /**
-         * destroy a subHTML2PDF
-         *
-         * @access protected
-         */
-        protected function _destroySubHTML(&$subHtml)
-        {
-            unset($subHtml);
-            $subHtml = null;
-        }
-
-        /**
-         * Convert a arabic number in roman number
-         *
-         * @access protected
-         * @param  integer $nbArabic
-         * @return string  $nbRoman
-         */
-        protected function _listeArab2Rom($nbArabic)
-        {
-            $nbBaseTen    = array('I','X','C','M');
-            $nbBaseFive    = array('V','L','D');
-            $nbRoman    = '';
-
-            if ($nbArabic<1)    return $nbArabic;
-            if ($nbArabic>3999) return $nbArabic;
-
-            for ($i=3; $i>=0 ; $i--) {
-                $chiffre=floor($nbArabic/pow(10, $i));
-                if ($chiffre>=1) {
-                    $nbArabic=$nbArabic-$chiffre*pow(10, $i);
-                    if ($chiffre<=3) {
-                        for ($j=$chiffre; $j>=1; $j--) {
-                            $nbRoman=$nbRoman.$nbBaseTen[$i];
-                        }
-                    } else if ($chiffre==9) {
-                        $nbRoman=$nbRoman.$nbBaseTen[$i].$nbBaseTen[$i+1];
-                    } else if ($chiffre==4) {
-                    $nbRoman=$nbRoman.$nbBaseTen[$i].$nbBaseFive[$i];
-                    } else {
-                        $nbRoman=$nbRoman.$nbBaseFive[$i];
-                        for ($j=$chiffre-5; $j>=1; $j--) {
-                            $nbRoman=$nbRoman.$nbBaseTen[$i];
-                        }
-                    }
-                }
-            }
-            return $nbRoman;
-        }
-
-        /**
-         * add a LI to the current level
-         *
-         * @access protected
-         */
-        protected function _listeAddLi()
-        {
-            $this->_defList[count($this->_defList)-1]['nb']++;
-        }
-
-        /**
-         * get the width to use for the column of the list
-         *
-         * @access protected
-         * @return string $width
-         */
-        protected function _listeGetWidth()
-        {
-            return '7mm';
-        }
-
-        /**
-         * get the padding to use for the column of the list
-         *
-         * @access protected
-         * @return string $padding
-         */
-        protected function _listeGetPadding()
-        {
-            return '1mm';
-        }
-
-        /**
-         * get the information of the li on the current level
-         *
-         * @access protected
-         * @return array(fontName, small size, string)
-         */
-        protected function _listeGetLi()
-        {
-            $im = $this->_defList[count($this->_defList)-1]['img'];
-            $st = $this->_defList[count($this->_defList)-1]['style'];
-            $nb = $this->_defList[count($this->_defList)-1]['nb'];
-            $up = (substr($st, 0, 6)=='upper-');
-
-            if ($im) return array(false, false, $im);
-
-            switch($st)
-            {
-                case 'none':
-                    return array('helvetica', true, ' ');
-
-                case 'upper-alpha':
-                case 'lower-alpha':
-                    $str = '';
-                    while ($nb>26) {
-                        $str = chr(96+$nb%26).$str;
-                        $nb = floor($nb/26);
-                    }
-                    $str = chr(96+$nb).$str;
-
-                    return array('helvetica', false, ($up ? strtoupper($str) : $str).'.');
-
-                case 'upper-roman':
-                case 'lower-roman':
-                    $str = $this->_listeArab2Rom($nb);
-
-                    return array('helvetica', false, ($up ? strtoupper($str) : $str).'.');
-
-                case 'decimal':
-                    return array('helvetica', false, $nb.'.');
-
-                case 'square':
-                    return array('zapfdingbats', true, chr(110));
-
-                case 'circle':
-                    return array('zapfdingbats', true, chr(109));
-
-                case 'disc':
-                default:
-                    return array('zapfdingbats', true, chr(108));
-            }
-        }
-
-        /**
-         * add a level to the list
-         *
-         * @access protected
-         * @param  string $type  : ul, ol
-         * @param  string $style : lower-alpha, ...
-         * @param  string $img
-         */
-        protected function _listeAddLevel($type = 'ul', $style = '', $img = null)
-        {
-            // get the url of the image, if we want to use a image
-            if ($img) {
-                if (preg_match('/^url\(([^)]+)\)$/isU', trim($img), $match)) {
-                    $img = $match[1];
-                } else {
-                    $img = null;
-                }
-            } else {
-                $img = null;
-            }
-
-            // prepare the datas
-            if (!in_array($type, array('ul', 'ol'))) $type = 'ul';
-            if (!in_array($style, array('lower-alpha', 'upper-alpha', 'upper-roman', 'lower-roman', 'decimal', 'square', 'circle', 'disc', 'none'))) $style = '';
-
-            if (!$style) {
-                if ($type=='ul')    $style = 'disc';
-                else                $style = 'decimal';
-            }
-
-            // add the new level
-            $this->_defList[count($this->_defList)] = array('style' => $style, 'nb' => 0, 'img' => $img);
-        }
-
-        /**
-         * remove a level to the list
-         *
-         * @access protected
-         */
-        protected function _listeDelLevel()
-        {
-            if (count($this->_defList)) {
-                unset($this->_defList[count($this->_defList)-1]);
-                $this->_defList = array_values($this->_defList);
-            }
-        }
-
-        /**
-         * execute the actions to convert the html
-         *
-         * @access protected
-         */
-        protected function _makeHTMLcode()
-        {
-            // foreach elements of the parsing
-            for ($this->_parsePos=0; $this->_parsePos<count($this->parsingHtml->code); $this->_parsePos++) {
-
-                // get the action to do
-                $action = $this->parsingHtml->code[$this->_parsePos];
-
-                // if it is a opening of table / ul / ol
-                if (in_array($action['name'], array('table', 'ul', 'ol')) && !$action['close']) {
-
-                    //  we will work as a sub HTML to calculate the size of the element
-                    $this->_subPart = true;
-
-                    // get the name of the opening tag
-                    $tagOpen = $action['name'];
-
-                    // save the actual pos on the parsing
-                    $this->_tempPos = $this->_parsePos;
-
-                    // foreach elements, while we are in the opened tag
-                    while (isset($this->parsingHtml->code[$this->_tempPos]) && !($this->parsingHtml->code[$this->_tempPos]['name']==$tagOpen && $this->parsingHtml->code[$this->_tempPos]['close'])) {
-                        // make the action
-                        $this->_executeAction($this->parsingHtml->code[$this->_tempPos]);
-                        $this->_tempPos++;
-                    }
-
-                    // execute the closure of the tag
-                    if (isset($this->parsingHtml->code[$this->_tempPos])) {
-                        $this->_executeAction($this->parsingHtml->code[$this->_tempPos]);
-                    }
-
-                    // end of the sub part
-                    $this->_subPart = false;
-                }
-
-                // execute the action
-                $this->_executeAction($action);
-            }
-        }
-
-        /**
-         * execute the action from the parsing
-         *
-         * @access protected
-         * @param  array $action
-         */
-        protected function _executeAction($action)
-        {
-            // name of the action
-            $fnc = ($action['close'] ? '_tag_close_' : '_tag_open_').strtoupper($action['name']);
-
-            // parameters of the action
-            $param = $action['param'];
-
-            // if it the first action of the first page, and if it is not a open tag of PAGE => create the new page
-            if ($fnc!='_tag_open_PAGE' && $this->_firstPage) {
-                $this->_setNewPage();
-            }
-
-            // the action must exist
-            if (!is_callable(array(&$this, $fnc))) {
-                throw new HTML2PDF_exception(1, strtoupper($action['name']), $this->parsingHtml->getHtmlErrorCode($action['html_pos']));
-            }
-
-            // lauch the action
-            $res = $this->{$fnc}($param);
-
-            // save the name of the action
-            $this->_previousCall = $fnc;
-
-            // return the result
-            return $res;
-        }
-
-        /**
-         * get the position of the element on the current line, depending on his height
-         *
-         * @access protected
-         * @param  float $h
-         * @return float
-         */
-        protected function _getElementY($h)
-        {
-            if ($this->_subPart || $this->_isSubPart || !$this->_currentH || $this->_currentH<$h)
-                return 0;
-
-            return ($this->_currentH-$h)*0.8;
-        }
-
-        /**
-         * make a break line
-         *
-         * @access protected
-         * @param  float $h current line height
-         * @param  integer $curr real current position in the text, if new line in the write of a text
-         */
-        protected function _makeBreakLine($h, $curr = null)
-        {
-            if ($h) {
-                if (($this->pdf->getY()+$h<$this->pdf->getH() - $this->pdf->getbMargin()) || $this->_isInOverflow || $this->_isInFooter)
-                    $this->_setNewLine($h, $curr);
-                else
-                    $this->_setNewPage(null, '', null, $curr);
-            } else {
-                $this->_setNewPositionForNewLine($curr);
-            }
-
-            $this->_maxH = 0;
-            $this->_maxE = 0;
-        }
-
-        /**
-         * display a image
-         *
-         * @access protected
-         * @param  string $src
-         * @param  boolean $subLi if true=image of a list
-         * @return boolean depending on "isForOneLine"
-         */
-        protected function _drawImage($src, $subLi=false)
-        {
-            // get the size of the image
-            // WARNING : if URL, "allow_url_fopen" must turned to "on" in php.ini
-            $infos=@getimagesize($src);
-
-            // if the image does not exist, or can not be loaded
-            if (count($infos)<2) {
-                // if the test is activ => exception
-                if ($this->_testIsImage) {
-                    throw new HTML2PDF_exception(6, $src);
-                }
-
-                // else, display a gray rectangle
-                $src = null;
-                $infos = array(16, 16);
-            }
-
-            // convert the size of the image in the unit of the PDF
-            $imageWidth = $infos[0]/$this->pdf->getK();
-            $imageHeight = $infos[1]/$this->pdf->getK();
-
-            // calculate the size from the css style
-            if ($this->parsingCss->value['width'] && $this->parsingCss->value['height']) {
-                $w = $this->parsingCss->value['width'];
-                $h = $this->parsingCss->value['height'];
-            } else if ($this->parsingCss->value['width']) {
-                $w = $this->parsingCss->value['width'];
-                $h = $imageHeight*$w/$imageWidth;
-            } else if ($this->parsingCss->value['height']) {
-                $h = $this->parsingCss->value['height'];
-                $w = $imageWidth*$h/$imageHeight;
-            } else {
-                // convert px to pt
-                $w = 72./96.*$imageWidth;
-                $h = 72./96.*$imageHeight;
-            }
-
-            // are we in a float
-            $float = $this->parsingCss->getFloat();
-
-            // if we are in a float, but if something else if on the line => Break Line
-            if ($float && $this->_maxH) {
-                // make the break line (false if we are in "_isForOneLine" mode)
-                if (!$this->_tag_open_BR(array())) {
-                    return false;
-                }
-            }
-
-            // position of the image
-            $x = $this->pdf->getX();
-            $y = $this->pdf->getY();
-
-            // if the image can not be put on the current line => new line
-            if (!$float && ($x + $w>$this->pdf->getW() - $this->pdf->getrMargin()) && $this->_maxH) {
-                if ($this->_isForOneLine) {
-                    return false;
-                }
-
-                // set the new line
-                $hnl = max($this->_maxH, $this->parsingCss->getLineHeight());
-                $this->_setNewLine($hnl);
-
-                // get the new position
-                $x = $this->pdf->getX();
-                $y = $this->pdf->getY();
-            }
-
-            // if the image can not be put on the current page
-            if (($y + $h>$this->pdf->getH() - $this->pdf->getbMargin()) && !$this->_isInOverflow) {
-                // new page
-                $this->_setNewPage();
-
-                // get the new position
-                $x = $this->pdf->getX();
-                $y = $this->pdf->getY();
-            }
-
-            // correction for display the image of a list
-            $hT = 0.80*$this->parsingCss->value['font-size'];
-            if ($subLi && $h<$hT) {
-                $y+=($hT-$h);
-            }
-
-            // add the margin top
-            $yc = $y-$this->parsingCss->value['margin']['t'];
-
-            // get the width and the position of the parent
-            $old = $this->parsingCss->getOldValues();
-            if ( $old['width']) {
-                $parentWidth = $old['width'];
-                $parentX = $x;
-            } else {
-                $parentWidth = $this->pdf->getW() - $this->pdf->getlMargin() - $this->pdf->getrMargin();
-                $parentX = $this->pdf->getlMargin();
-            }
-
-            // if we are in a gloat => adapt the parent position and width
-            if ($float) {
-                list($lx, $rx) = $this->_getMargins($yc);
-                $parentX = $lx;
-                $parentWidth = $rx-$lx;
-            }
-
-            // calculate the position of the image, if align to the right
-            if ($parentWidth>$w && $float!='left') {
-                if ($float=='right' || $this->parsingCss->value['text-align']=='li_right')    $x = $parentX + $parentWidth - $w-$this->parsingCss->value['margin']['r']-$this->parsingCss->value['margin']['l'];
-            }
-
-            // display the image
-            if (!$this->_subPart && !$this->_isSubPart) {
-                if ($src) {
-                    $this->pdf->Image($src, $x, $y, $w, $h, '', $this->_isInLink);
-                } else {
-                    // rectangle if the image can not be loaded
-                    $this->pdf->setFillColorArray(array(240, 220, 220));
-                    $this->pdf->Rect($x, $y, $w, $h, 'F');
-                }
-            }
-
-            // apply the margins
-            $x-= $this->parsingCss->value['margin']['l'];
-            $y-= $this->parsingCss->value['margin']['t'];
-            $w+= $this->parsingCss->value['margin']['l'] + $this->parsingCss->value['margin']['r'];
-            $h+= $this->parsingCss->value['margin']['t'] + $this->parsingCss->value['margin']['b'];
-
-            if ($float=='left') {
-                // save the current max
-                $this->_maxX = max($this->_maxX, $x+$w);
-                $this->_maxY = max($this->_maxY, $y+$h);
-
-                // add the image to the margins
-                $this->_addMargins($float, $x, $y, $x+$w, $y+$h);
-
-                // get the new position
-                list($lx, $rx) = $this->_getMargins($yc);
-                $this->pdf->setXY($lx, $yc);
-            } else if ($float=='right') {
-                // save the current max. We don't save the X because it is not the real max of the line
-                $this->_maxY = max($this->_maxY, $y+$h);
-
-                // add the image to the margins
-                $this->_addMargins($float, $x, $y, $x+$w, $y+$h);
-
-                // get the new position
-                list($lx, $rx) = $this->_getMargins($yc);
-                $this->pdf->setXY($lx, $yc);
-            } else {
-                // set the new position at the end of the image
-                $this->pdf->setX($x+$w);
-
-                // save the current max
-                $this->_maxX = max($this->_maxX, $x+$w);
-                $this->_maxY = max($this->_maxY, $y+$h);
-                $this->_maxH = max($this->_maxH, $h);
-            }
-
-            return true;
-        }
-
-        /**
-         * draw a rectangle
-         *
-         * @access protected
-         * @param  float $x
-         * @param  float $y
-         * @param  float $w
-         * @param  float $h
-         * @param  array $border
-         * @param  float $padding - internal marge of the rectanble => not used, but...
-         * @param  float $margin  - external marge of the rectanble
-         * @param  array $background
-         * @return boolean
-         */
-        protected function _drawRectangle($x, $y, $w, $h, $border, $padding, $margin, $background)
-        {
-            // if we are in a subpart or if height is null => return false
-            if ($this->_subPart || $this->_isSubPart || $h===null) return false;
-
-            // add the margin
-            $x+= $margin;
-            $y+= $margin;
-            $w-= $margin*2;
-            $h-= $margin*2;
-
-            // get the radius of the border
-            $outTL = $border['radius']['tl'];
-            $outTR = $border['radius']['tr'];
-            $outBR = $border['radius']['br'];
-            $outBL = $border['radius']['bl'];
-
-            // prepare the out radius
-            $outTL = ($outTL[0] && $outTL[1]) ? $outTL : null;
-            $outTR = ($outTR[0] && $outTR[1]) ? $outTR : null;
-            $outBR = ($outBR[0] && $outBR[1]) ? $outBR : null;
-            $outBL = ($outBL[0] && $outBL[1]) ? $outBL : null;
-
-            // prepare the in radius
-            $inTL = $outTL;
-            $inTR = $outTR;
-            $inBR = $outBR;
-            $inBL = $outBL;
-
-            if (is_array($inTL)) {
-                $inTL[0]-= $border['l']['width'];
-                $inTL[1]-= $border['t']['width'];
-            }
-            if (is_array($inTR)) {
-                $inTR[0]-= $border['r']['width'];
-                $inTR[1]-= $border['t']['width'];
-            }
-            if (is_array($inBR)) {
-                $inBR[0]-= $border['r']['width'];
-                $inBR[1]-= $border['b']['width'];
-            }
-            if (is_array($inBL)) {
-                $inBL[0]-= $border['l']['width'];
-                $inBL[1]-= $border['b']['width'];
-            }
-
-            if ($inTL[0]<=0 || $inTL[1]<=0) $inTL = null;
-            if ($inTR[0]<=0 || $inTR[1]<=0) $inTR = null;
-            if ($inBR[0]<=0 || $inBR[1]<=0) $inBR = null;
-            if ($inBL[0]<=0 || $inBL[1]<=0) $inBL = null;
-
-            // prepare the background color
-            $pdfStyle = '';
-            if ($background['color']) {
-                $this->pdf->setFillColorArray($background['color']);
-                $pdfStyle.= 'F';
-            }
-
-            // if we have a background to fill => fill it with a path (because of the radius)
-            if ($pdfStyle) {
-                $this->pdf->clippingPathStart($x, $y, $w, $h, $outTL, $outTR, $outBL, $outBR);
-                $this->pdf->Rect($x, $y, $w, $h, $pdfStyle);
-                $this->pdf->clippingPathStop();
-            }
-
-            // prepare the background image
-            if ($background['image']) {
-                $iName      = $background['image'];
-                $iPosition  = $background['position']!==null ? $background['position'] : array(0, 0);
-                $iRepeat    = $background['repeat']!==null   ? $background['repeat']   : array(true, true);
-
-                // size of the background without the borders
-                $bX = $x;
-                $bY = $y;
-                $bW = $w;
-                $bH = $h;
-
-                if ($border['b']['width']) {
-                    $bH-= $border['b']['width'];
-                }
-                if ($border['l']['width']) {
-                    $bW-= $border['l']['width'];
-                    $bX+= $border['l']['width'];
-                }
-                if ($border['t']['width']) {
-                    $bH-= $border['t']['width'];
-                    $bY+= $border['t']['width'];
-                }
-                if ($border['r']['width']) {
-                    $bW-= $border['r']['width'];
-                }
-
-                // get the size of the image
-                // WARNING : if URL, "allow_url_fopen" must turned to "on" in php.ini
-                $imageInfos=@getimagesize($iName);
-
-                // if the image can not be loaded
-                if (count($imageInfos)<2) {
-                    if ($this->_testIsImage) {
-                        throw new HTML2PDF_exception(6, $iName);
-                    }
-                } else {
-                    // convert the size of the image from pixel to the unit of the PDF
-                    $imageWidth    = 72./96.*$imageInfos[0]/$this->pdf->getK();
-                    $imageHeight    = 72./96.*$imageInfos[1]/$this->pdf->getK();
-
-                    // prepare the position of the backgroung
-                    if ($iRepeat[0]) $iPosition[0] = $bX;
-                    else if (preg_match('/^([-]?[0-9\.]+)%/isU', $iPosition[0], $match)) $iPosition[0] = $bX + $match[1]*($bW-$imageWidth)/100;
-                    else $iPosition[0] = $bX+$iPosition[0];
-
-                    if ($iRepeat[1]) $iPosition[1] = $bY;
-                    else if (preg_match('/^([-]?[0-9\.]+)%/isU', $iPosition[1], $match)) $iPosition[1] = $bY + $match[1]*($bH-$imageHeight)/100;
-                    else $iPosition[1] = $bY+$iPosition[1];
-
-                    $imageXmin = $bX;
-                    $imageXmax = $bX+$bW;
-                    $imageYmin = $bY;
-                    $imageYmax = $bY+$bH;
-
-                    if (!$iRepeat[0] && !$iRepeat[1]) {
-                        $imageXmin =     $iPosition[0]; $imageXmax =     $iPosition[0]+$imageWidth;
-                        $imageYmin =     $iPosition[1]; $imageYmax =     $iPosition[1]+$imageHeight;
-                    } else if ($iRepeat[0] && !$iRepeat[1]) {
-                        $imageYmin =     $iPosition[1]; $imageYmax =     $iPosition[1]+$imageHeight;
-                    } else if (!$iRepeat[0] && $iRepeat[1]) {
-                        $imageXmin =     $iPosition[0]; $imageXmax =     $iPosition[0]+$imageWidth;
-                    }
-
-                    // build the path to display the image (because of radius)
-                    $this->pdf->clippingPathStart($bX, $bY, $bW, $bH, $inTL, $inTR, $inBL, $inBR);
-
-                    // repeat the image
-                    for ($iY=$imageYmin; $iY<$imageYmax; $iY+=$imageHeight) {
-                        for ($iX=$imageXmin; $iX<$imageXmax; $iX+=$imageWidth) {
-                            $cX = null;
-                            $cY = null;
-                            $cW = $imageWidth;
-                            $cH = $imageHeight;
-                            if ($imageYmax-$iY<$imageHeight) {
-                                $cX = $iX;
-                                $cY = $iY;
-                                $cH = $imageYmax-$iY;
-                            }
-                            if ($imageXmax-$iX<$imageWidth) {
-                                $cX = $iX;
-                                $cY = $iY;
-                                $cW = $imageXmax-$iX;
-                            }
-
-                            $this->pdf->Image($iName, $iX, $iY, $imageWidth, $imageHeight, '', '');
-                        }
-                    }
-
-                    // end of the path
-                    $this->pdf->clippingPathStop();
-                }
-            }
-
-            // adding some loose (0.01mm)
-            $loose = 0.01;
-            $x-= $loose;
-            $y-= $loose;
-            $w+= 2.*$loose;
-            $h+= 2.*$loose;
-            if ($border['l']['width']) $border['l']['width']+= 2.*$loose;
-            if ($border['t']['width']) $border['t']['width']+= 2.*$loose;
-            if ($border['r']['width']) $border['r']['width']+= 2.*$loose;
-            if ($border['b']['width']) $border['b']['width']+= 2.*$loose;
-
-            // prepare the test on borders
-            $testBl = ($border['l']['width'] && $border['l']['color'][0]!==null);
-            $testBt = ($border['t']['width'] && $border['t']['color'][0]!==null);
-            $testBr = ($border['r']['width'] && $border['r']['color'][0]!==null);
-            $testBb = ($border['b']['width'] && $border['b']['color'][0]!==null);
-
-            // draw the radius bottom-left
-            if (is_array($outBL) && ($testBb || $testBl)) {
-                if ($inBL) {
-                    $courbe = array();
-                    $courbe[] = $x+$outBL[0];              $courbe[] = $y+$h;
-                    $courbe[] = $x;                        $courbe[] = $y+$h-$outBL[1];
-                    $courbe[] = $x+$outBL[0];              $courbe[] = $y+$h-$border['b']['width'];
-                    $courbe[] = $x+$border['l']['width'];  $courbe[] = $y+$h-$outBL[1];
-                    $courbe[] = $x+$outBL[0];              $courbe[] = $y+$h-$outBL[1];
-                } else {
-                    $courbe = array();
-                    $courbe[] = $x+$outBL[0];              $courbe[] = $y+$h;
-                    $courbe[] = $x;                        $courbe[] = $y+$h-$outBL[1];
-                    $courbe[] = $x+$border['l']['width'];  $courbe[] = $y+$h-$border['b']['width'];
-                    $courbe[] = $x+$outBL[0];              $courbe[] = $y+$h-$outBL[1];
-                }
-                $this->_drawCurve($courbe, $border['l']['color']);
-            }
-
-            // draw the radius left-top
-            if (is_array($outTL) && ($testBt || $testBl)) {
-                if ($inTL) {
-                    $courbe = array();
-                    $courbe[] = $x;                        $courbe[] = $y+$outTL[1];
-                    $courbe[] = $x+$outTL[0];              $courbe[] = $y;
-                    $courbe[] = $x+$border['l']['width'];  $courbe[] = $y+$outTL[1];
-                    $courbe[] = $x+$outTL[0];              $courbe[] = $y+$border['t']['width'];
-                    $courbe[] = $x+$outTL[0];              $courbe[] = $y+$outTL[1];
-                } else {
-                    $courbe = array();
-                    $courbe[] = $x;                        $courbe[] = $y+$outTL[1];
-                    $courbe[] = $x+$outTL[0];              $courbe[] = $y;
-                    $courbe[] = $x+$border['l']['width'];  $courbe[] = $y+$border['t']['width'];
-                    $courbe[] = $x+$outTL[0];              $courbe[] = $y+$outTL[1];
-                }
-                $this->_drawCurve($courbe, $border['t']['color']);
-            }
-
-            // draw the radius top-right
-            if (is_array($outTR) && ($testBt || $testBr)) {
-                if ($inTR) {
-                    $courbe = array();
-                    $courbe[] = $x+$w-$outTR[0];             $courbe[] = $y;
-                    $courbe[] = $x+$w;                       $courbe[] = $y+$outTR[1];
-                    $courbe[] = $x+$w-$outTR[0];             $courbe[] = $y+$border['t']['width'];
-                    $courbe[] = $x+$w-$border['r']['width']; $courbe[] = $y+$outTR[1];
-                    $courbe[] = $x+$w-$outTR[0];             $courbe[] = $y+$outTR[1];
-                } else {
-                    $courbe = array();
-                    $courbe[] = $x+$w-$outTR[0];             $courbe[] = $y;
-                    $courbe[] = $x+$w;                       $courbe[] = $y+$outTR[1];
-                    $courbe[] = $x+$w-$border['r']['width']; $courbe[] = $y+$border['t']['width'];
-                    $courbe[] = $x+$w-$outTR[0];             $courbe[] = $y+$outTR[1];
-                }
-                $this->_drawCurve($courbe, $border['r']['color']);
-            }
-
-            // draw the radius right-bottom
-            if (is_array($outBR) && ($testBb || $testBr)) {
-                if ($inBR) {
-                    $courbe = array();
-                    $courbe[] = $x+$w;                       $courbe[] = $y+$h-$outBR[1];
-                    $courbe[] = $x+$w-$outBR[0];             $courbe[] = $y+$h;
-                    $courbe[] = $x+$w-$border['r']['width']; $courbe[] = $y+$h-$outBR[1];
-                    $courbe[] = $x+$w-$outBR[0];             $courbe[] = $y+$h-$border['b']['width'];
-                    $courbe[] = $x+$w-$outBR[0];             $courbe[] = $y+$h-$outBR[1];
-                } else {
-                    $courbe = array();
-                    $courbe[] = $x+$w;                       $courbe[] = $y+$h-$outBR[1];
-                    $courbe[] = $x+$w-$outBR[0];             $courbe[] = $y+$h;
-                    $courbe[] = $x+$w-$border['r']['width']; $courbe[] = $y+$h-$border['b']['width'];
-                    $courbe[] = $x+$w-$outBR[0];             $courbe[] = $y+$h-$outBR[1];
-                }
-                $this->_drawCurve($courbe, $border['b']['color']);
-            }
-
-            // draw the left border
-            if ($testBl) {
-                $pt = array();
-                $pt[] = $x;                       $pt[] = $y+$h;
-                $pt[] = $x;                       $pt[] = $y+$h-$border['b']['width'];
-                $pt[] = $x;                       $pt[] = $y+$border['t']['width'];
-                $pt[] = $x;                       $pt[] = $y;
-                $pt[] = $x+$border['l']['width']; $pt[] = $y+$border['t']['width'];
-                $pt[] = $x+$border['l']['width']; $pt[] = $y+$h-$border['b']['width'];
-
-                $bord = 3;
-                if (is_array($outBL)) {
-                    $bord-=1;
-                    $pt[3] -= $outBL[1] - $border['b']['width'];
-                    if ($inBL) $pt[11]-= $inBL[1];
-                    unset($pt[0]);unset($pt[1]);
-                }
-                if (is_array($outTL)) {
-                    $bord-=2;
-                    $pt[5] += $outTL[1]-$border['t']['width'];
-                    if ($inTL) $pt[9] += $inTL[1];
-                    unset($pt[6]);unset($pt[7]);
-                }
-
-                $pt = array_values($pt);
-                $this->_drawLine($pt, $border['l']['color'], $border['l']['type'], $border['l']['width'], $bord);
-            }
-
-            // draw the top border
-            if ($testBt) {
-                $pt = array();
-                $pt[] = $x;                          $pt[] = $y;
-                $pt[] = $x+$border['l']['width'];    $pt[] = $y;
-                $pt[] = $x+$w-$border['r']['width']; $pt[] = $y;
-                $pt[] = $x+$w;                       $pt[] = $y;
-                $pt[] = $x+$w-$border['r']['width']; $pt[] = $y+$border['t']['width'];
-                $pt[] = $x+$border['l']['width'];    $pt[] = $y+$border['t']['width'];
-
-                $bord = 3;
-                if (is_array($outTL)) {
-                    $bord-=1;
-                    $pt[2] += $outTL[0] - $border['l']['width'];
-                    if ($inTL) $pt[10]+= $inTL[0];
-                    unset($pt[0]);unset($pt[1]);
-                }
-                if (is_array($outTR)) {
-                    $bord-=2;
-                    $pt[4] -= $outTR[0] - $border['r']['width'];
-                    if ($inTR) $pt[8] -= $inTR[0];
-                    unset($pt[6]);unset($pt[7]);
-                }
-
-                $pt = array_values($pt);
-                $this->_drawLine($pt, $border['t']['color'], $border['t']['type'], $border['t']['width'], $bord);
-            }
-
-            // draw the right border
-            if ($testBr) {
-                $pt = array();
-                $pt[] = $x+$w;                       $pt[] = $y;
-                $pt[] = $x+$w;                       $pt[] = $y+$border['t']['width'];
-                $pt[] = $x+$w;                       $pt[] = $y+$h-$border['b']['width'];
-                $pt[] = $x+$w;                       $pt[] = $y+$h;
-                $pt[] = $x+$w-$border['r']['width']; $pt[] = $y+$h-$border['b']['width'];
-                $pt[] = $x+$w-$border['r']['width']; $pt[] = $y+$border['t']['width'];
-
-                $bord = 3;
-                if (is_array($outTR)) {
-                    $bord-=1;
-                    $pt[3] += $outTR[1] - $border['t']['width'];
-                    if ($inTR) $pt[11]+= $inTR[1];
-                    unset($pt[0]);unset($pt[1]);
-                }
-                if (is_array($outBR)) {
-                    $bord-=2;
-                    $pt[5] -= $outBR[1] - $border['b']['width'];
-                    if ($inBR) $pt[9] -= $inBR[1];
-                    unset($pt[6]);unset($pt[7]);
-                }
-
-                $pt = array_values($pt);
-                $this->_drawLine($pt, $border['r']['color'], $border['r']['type'], $border['r']['width'], $bord);
-            }
-
-            // draw the bottom border
-            if ($testBb) {
-                $pt = array();
-                $pt[] = $x+$w;                       $pt[] = $y+$h;
-                $pt[] = $x+$w-$border['r']['width']; $pt[] = $y+$h;
-                $pt[] = $x+$border['l']['width'];    $pt[] = $y+$h;
-                $pt[] = $x;                          $pt[] = $y+$h;
-                $pt[] = $x+$border['l']['width'];    $pt[] = $y+$h-$border['b']['width'];
-                $pt[] = $x+$w-$border['r']['width']; $pt[] = $y+$h-$border['b']['width'];
-
-                $bord = 3;
-                if (is_array($outBL)) {
-                    $bord-=2;
-                    $pt[4] += $outBL[0] - $border['l']['width'];
-                    if ($inBL) $pt[8] += $inBL[0];
-                    unset($pt[6]);unset($pt[7]);
-                }
-                if (is_array($outBR)) {
-                    $bord-=1;
-                    $pt[2] -= $outBR[0] - $border['r']['width'];
-                    if ($inBR) $pt[10]-= $inBR[0];
-                    unset($pt[0]);unset($pt[1]);
-
-                }
-
-                $pt = array_values($pt);
-                $this->_drawLine($pt, $border['b']['color'], $border['b']['type'], $border['b']['width'], $bord);
-            }
-
-            if ($background['color']) {
-                $this->pdf->setFillColorArray($background['color']);
-            }
-
-            return true;
-        }
-
-        /**
-         * draw a curve (for border radius)
-         *
-         * @access protected
-         * @param  array $pt
-         * @param  array $color
-         */
-        protected function _drawCurve($pt, $color)
-        {
-            $this->pdf->setFillColorArray($color);
-
-            if (count($pt)==10)
-                $this->pdf->drawCurve($pt[0], $pt[1], $pt[2], $pt[3], $pt[4], $pt[5], $pt[6], $pt[7], $pt[8], $pt[9]);
-            else
-                $this->pdf->drawCorner($pt[0], $pt[1], $pt[2], $pt[3], $pt[4], $pt[5], $pt[6], $pt[7]);
-        }
-
-        /**
-         * draw a ligne with a specific type, and specific start and end for radius
-         *
-         * @access protected
-         * @param  array   $pt
-         * @param  float   $color
-         * @param  string  $type (dashed, dotted, double, solid)
-         * @param  float   $width
-         * @param  integer $radius (binary from 0 to 3 with 1=>start with a radius, 2=>end with a radius)
-         */
-        protected function _drawLine($pt, $color, $type, $width, $radius=3)
-        {
-            // set the fill color
-            $this->pdf->setFillColorArray($color);
-
-            // if dashed or dotted
-            if ($type=='dashed' || $type=='dotted') {
-
-                // clean the end of the line, if radius
-                if ($radius==1) {
-                    $tmp = array(); $tmp[]=$pt[0]; $tmp[]=$pt[1]; $tmp[]=$pt[2]; $tmp[]=$pt[3]; $tmp[]=$pt[8]; $tmp[]=$pt[9];
-                    $this->pdf->Polygon($tmp, 'F');
-
-                    $tmp = array(); $tmp[]=$pt[2]; $tmp[]=$pt[3]; $tmp[]=$pt[4]; $tmp[]=$pt[5]; $tmp[]=$pt[6]; $tmp[]=$pt[7]; $tmp[]=$pt[8]; $tmp[]=$pt[9];
-                    $pt = $tmp;
-                } else if ($radius==2) {
-                    $tmp = array(); $tmp[]=$pt[2]; $tmp[]=$pt[3]; $tmp[]=$pt[4]; $tmp[]=$pt[5]; $tmp[]=$pt[6]; $tmp[]=$pt[7];
-                    $this->pdf->Polygon($tmp, 'F');
-
-                    $tmp = array(); $tmp[]=$pt[0]; $tmp[]=$pt[1]; $tmp[]=$pt[2]; $tmp[]=$pt[3]; $tmp[]=$pt[6]; $tmp[]=$pt[7]; $tmp[]=$pt[8]; $tmp[]=$pt[9];
-                    $pt = $tmp;
-                } else if ($radius==3) {
-                    $tmp = array(); $tmp[]=$pt[0]; $tmp[]=$pt[1]; $tmp[]=$pt[2]; $tmp[]=$pt[3]; $tmp[]=$pt[10]; $tmp[]=$pt[11];
-                    $this->pdf->Polygon($tmp, 'F');
-
-                    $tmp = array(); $tmp[]=$pt[4]; $tmp[]=$pt[5]; $tmp[]=$pt[6]; $tmp[]=$pt[7]; $tmp[]=$pt[8]; $tmp[]=$pt[9];
-                    $this->pdf->Polygon($tmp, 'F');
-
-                    $tmp = array(); $tmp[]=$pt[2]; $tmp[]=$pt[3]; $tmp[]=$pt[4]; $tmp[]=$pt[5]; $tmp[]=$pt[8]; $tmp[]=$pt[9]; $tmp[]=$pt[10]; $tmp[]=$pt[11];
-                    $pt = $tmp;
-                }
-
-                // horisontal or vertical line
-                if ($pt[2]==$pt[0]) {
-                    $l = abs(($pt[3]-$pt[1])*0.5);
-                    $px = 0;
-                    $py = $width;
-                    $x1 = $pt[0]; $y1 = ($pt[3]+$pt[1])*0.5;
-                    $x2 = $pt[6]; $y2 = ($pt[7]+$pt[5])*0.5;
-                } else {
-                    $l = abs(($pt[2]-$pt[0])*0.5);
-                    $px = $width;
-                    $py = 0;
-                    $x1 = ($pt[2]+$pt[0])*0.5; $y1 = $pt[1];
-                    $x2 = ($pt[6]+$pt[4])*0.5; $y2 = $pt[7];
-                }
-
-                // if dashed : 3x bigger than dotted
-                if ($type=='dashed') {
-                    $px = $px*3.;
-                    $py = $py*3.;
-                }
-                $mode = ($l/($px+$py)<.5);
-
-                // display the dotted/dashed line
-                for ($i=0; $l-($px+$py)*($i-0.5)>0; $i++) {
-                    if (($i%2)==$mode) {
-                        $j = $i-0.5;
-                        $lx1 = $px*($j);   if ($lx1<-$l) $lx1 =-$l;
-                        $ly1 = $py*($j);   if ($ly1<-$l) $ly1 =-$l;
-                        $lx2 = $px*($j+1); if ($lx2>$l)  $lx2 = $l;
-                        $ly2 = $py*($j+1); if ($ly2>$l)  $ly2 = $l;
-
-                        $tmp = array();
-                        $tmp[] = $x1+$lx1; $tmp[] = $y1+$ly1;
-                        $tmp[] = $x1+$lx2; $tmp[] = $y1+$ly2;
-                        $tmp[] = $x2+$lx2; $tmp[] = $y2+$ly2;
-                        $tmp[] = $x2+$lx1; $tmp[] = $y2+$ly1;
-                        $this->pdf->Polygon($tmp, 'F');
-
-                        if ($j>0) {
-                            $tmp = array();
-                            $tmp[] = $x1-$lx1; $tmp[] = $y1-$ly1;
-                            $tmp[] = $x1-$lx2; $tmp[] = $y1-$ly2;
-                            $tmp[] = $x2-$lx2; $tmp[] = $y2-$ly2;
-                            $tmp[] = $x2-$lx1; $tmp[] = $y2-$ly1;
-                            $this->pdf->Polygon($tmp, 'F');
-                        }
-                    }
-                }
-            } else if ($type=='double') {
-
-                // if double, 2 lines : 0=>1/3 and 2/3=>1
-                $pt1 = $pt;
-                $pt2 = $pt;
-
-                if (count($pt)==12) {
-                    // line 1
-                    $pt1[0] = ($pt[0]-$pt[10])*0.33 + $pt[10];
-                    $pt1[1] = ($pt[1]-$pt[11])*0.33 + $pt[11];
-                    $pt1[2] = ($pt[2]-$pt[10])*0.33 + $pt[10];
-                    $pt1[3] = ($pt[3]-$pt[11])*0.33 + $pt[11];
-                    $pt1[4] = ($pt[4]-$pt[8])*0.33 + $pt[8];
-                    $pt1[5] = ($pt[5]-$pt[9])*0.33 + $pt[9];
-                    $pt1[6] = ($pt[6]-$pt[8])*0.33 + $pt[8];
-                    $pt1[7] = ($pt[7]-$pt[9])*0.33 + $pt[9];
-                    $pt2[10]= ($pt[10]-$pt[0])*0.33 + $pt[0];
-                    $pt2[11]= ($pt[11]-$pt[1])*0.33 + $pt[1];
-
-                    // line 2
-                    $pt2[2] = ($pt[2] -$pt[0])*0.33 + $pt[0];
-                    $pt2[3] = ($pt[3] -$pt[1])*0.33 + $pt[1];
-                    $pt2[4] = ($pt[4] -$pt[6])*0.33 + $pt[6];
-                    $pt2[5] = ($pt[5] -$pt[7])*0.33 + $pt[7];
-                    $pt2[8] = ($pt[8] -$pt[6])*0.33 + $pt[6];
-                    $pt2[9] = ($pt[9] -$pt[7])*0.33 + $pt[7];
-                } else {
-                    // line 1
-                    $pt1[0] = ($pt[0]-$pt[6])*0.33 + $pt[6];
-                    $pt1[1] = ($pt[1]-$pt[7])*0.33 + $pt[7];
-                    $pt1[2] = ($pt[2]-$pt[4])*0.33 + $pt[4];
-                    $pt1[3] = ($pt[3]-$pt[5])*0.33 + $pt[5];
-
-                    // line 2
-                    $pt2[6] = ($pt[6]-$pt[0])*0.33 + $pt[0];
-                    $pt2[7] = ($pt[7]-$pt[1])*0.33 + $pt[1];
-                    $pt2[4] = ($pt[4]-$pt[2])*0.33 + $pt[2];
-                    $pt2[5] = ($pt[5]-$pt[3])*0.33 + $pt[3];
-                }
-                $this->pdf->Polygon($pt1, 'F');
-                $this->pdf->Polygon($pt2, 'F');
-            } else if ($type=='solid') {
-                // solid line : draw directly the polygon
-                $this->pdf->Polygon($pt, 'F');
-            }
-        }
-
-        /**
-         * prepare a transform matrix, only for drawing a SVG graphic
-         *
-         * @access protected
-         * @param  string $transform
-         * @return array  $matrix
-         */
-        protected function _prepareTransform($transform)
-        {
-            // it can not be  empty
-            if (!$transform) return null;
-
-            // sctions must be like scale(...)
-            if (!preg_match_all('/([a-z]+)\(([^\)]*)\)/isU', $transform, $match)) return null;
-
-            // prepare the list of the actions
-            $actions = array();
-
-            // for actions
-            for ($k=0; $k<count($match[0]); $k++) {
-
-                // get the name of the action
-                $name = strtolower($match[1][$k]);
-
-                // get the parameters of the action
-                $val = explode(',', trim($match[2][$k]));
-                foreach ($val as $i => $j) {
-                    $val[$i] = trim($j);
-                }
-
-                // prepare the matrix, depending on the action
-                switch($name)
-                {
-                    case 'scale':
-                        if (!isset($val[0])) $val[0] = 1.;      else $val[0] = 1.*$val[0];
-                        if (!isset($val[1])) $val[1] = $val[0]; else $val[1] = 1.*$val[1];
-                        $actions[] = array($val[0],0,0,$val[1],0,0);
-                        break;
-
-                    case 'translate':
-                        if (!isset($val[0])) $val[0] = 0.; else $val[0] = $this->parsingCss->ConvertToMM($val[0], $this->_isInDraw['w']);
-                        if (!isset($val[1])) $val[1] = 0.; else $val[1] = $this->parsingCss->ConvertToMM($val[1], $this->_isInDraw['h']);
-                        $actions[] = array(1,0,0,1,$val[0],$val[1]);
-                        break;
-
-                    case 'rotate':
-                        if (!isset($val[0])) $val[0] = 0.; else $val[0] = $val[0]*M_PI/180.;
-                        if (!isset($val[1])) $val[1] = 0.; else $val[1] = $this->parsingCss->ConvertToMM($val[1], $this->_isInDraw['w']);
-                        if (!isset($val[2])) $val[2] = 0.; else $val[2] = $this->parsingCss->ConvertToMM($val[2], $this->_isInDraw['h']);
-                        if ($val[1] || $val[2]) $actions[] = array(1,0,0,1,-$val[1],-$val[2]);
-                        $actions[] = array(cos($val[0]),sin($val[0]),-sin($val[0]),cos($val[0]),0,0);
-                        if ($val[1] || $val[2]) $actions[] = array(1,0,0,1,$val[1],$val[2]);
-                        break;
-
-                    case 'skewx':
-                        if (!isset($val[0])) $val[0] = 0.; else $val[0] = $val[0]*M_PI/180.;
-                        $actions[] = array(1,0,tan($val[0]),1,0,0);
-                        break;
-
-                    case 'skewy':
-                        if (!isset($val[0])) $val[0] = 0.; else $val[0] = $val[0]*M_PI/180.;
-                        $actions[] = array(1,tan($val[0]),0,1,0,0);
-                        break;
-                    case 'matrix':
-                        if (!isset($val[0])) $val[0] = 0.; else $val[0] = $val[0]*1.;
-                        if (!isset($val[1])) $val[1] = 0.; else $val[1] = $val[1]*1.;
-                        if (!isset($val[2])) $val[2] = 0.; else $val[2] = $val[2]*1.;
-                        if (!isset($val[3])) $val[3] = 0.; else $val[3] = $val[3]*1.;
-                        if (!isset($val[4])) $val[4] = 0.; else $val[4] = $this->parsingCss->ConvertToMM($val[4], $this->_isInDraw['w']);
-                        if (!isset($val[5])) $val[5] = 0.; else $val[5] = $this->parsingCss->ConvertToMM($val[5], $this->_isInDraw['h']);
-                        $actions[] =$val;
-                        break;
-                }
-            }
-
-            // if ther is no actions => return
-            if (!$actions) return null;
-
-            // get the first matrix
-            $m = $actions[0]; unset($actions[0]);
-
-            // foreach matrix => multiply to the last matrix
-            foreach ($actions as $n) {
-                $m = array(
-                    $m[0]*$n[0]+$m[2]*$n[1],
-                    $m[1]*$n[0]+$m[3]*$n[1],
-                    $m[0]*$n[2]+$m[2]*$n[3],
-                    $m[1]*$n[2]+$m[3]*$n[3],
-                    $m[0]*$n[4]+$m[2]*$n[5]+$m[4],
-                    $m[1]*$n[4]+$m[3]*$n[5]+$m[5]
-                );
-            }
-
-            // return the matrix
-            return $m;
-        }
-
-        /**
-         * @access protected
-         * @param  &array $cases
-         * @param  &array $corr
-         */
-        protected function _calculateTableCellSize(&$cases, &$corr)
-        {
-            if (!isset($corr[0])) return true;
-
-            // for each cell without colspan, we get the max width for each column
-            $sw = array();
-            for ($x=0; $x<count($corr[0]); $x++) {
-                $m=0;
-                for ($y=0; $y<count($corr); $y++) {
-                    if (isset($corr[$y][$x]) && is_array($corr[$y][$x]) && $corr[$y][$x][2]==1) {
-                        $m = max($m, $cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['w']);
-                    }
-                }
-                $sw[$x] = $m;
-            }
-
-            // for each cell with colspan, we adapt the width of each column
-            for ($x=0; $x<count($corr[0]); $x++) {
-                for ($y=0; $y<count($corr); $y++) {
-                    if (isset($corr[$y][$x]) && is_array($corr[$y][$x]) && $corr[$y][$x][2]>1) {
-
-                        // sum the max width of each column in colspan
-                        $s = 0; for ($i=0; $i<$corr[$y][$x][2]; $i++) $s+= $sw[$x+$i];
-
-                        // if the max width is < the width of the cell with colspan => we adapt the width of each max width
-                        if ($s>0 && $s<$cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['w']) {
-                            for ($i=0; $i<$corr[$y][$x][2]; $i++) {
-                                $sw[$x+$i] = $sw[$x+$i]/$s*$cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['w'];
-                            }
-                        }
-                    }
-                }
-            }
-
-            // set the new width, for each cell
-            for ($x=0; $x<count($corr[0]); $x++) {
-                for ($y=0; $y<count($corr); $y++) {
-                    if (isset($corr[$y][$x]) && is_array($corr[$y][$x])) {
-                        // without colspan
-                        if ($corr[$y][$x][2]==1) {
-                            $cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['w'] = $sw[$x];
-                        // with colspan
-                        } else {
-                            $s = 0;
-                            for ($i=0; $i<$corr[$y][$x][2]; $i++) {
-                                $s+= $sw[$x+$i];
-                            }
-                            $cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['w'] = $s;
-                        }
-                    }
-                }
-            }
-
-            // for each cell without rowspan, we get the max height for each line
-            $sh = array();
-            for ($y=0; $y<count($corr); $y++) {
-                $m=0;
-                for ($x=0; $x<count($corr[0]); $x++) {
-                    if (isset($corr[$y][$x]) && is_array($corr[$y][$x]) && $corr[$y][$x][3]==1) {
-                        $m = max($m, $cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['h']);
-                    }
-                }
-                $sh[$y] = $m;
-            }
-
-            // for each cell with rowspan, we adapt the height of each line
-            for ($y=0; $y<count($corr); $y++) {
-                for ($x=0; $x<count($corr[0]); $x++) {
-                    if (isset($corr[$y][$x]) && is_array($corr[$y][$x]) && $corr[$y][$x][3]>1) {
-
-                        // sum the max height of each line in rowspan
-                        $s = 0; for ($i=0; $i<$corr[$y][$x][3]; $i++) $s+= $sh[$y+$i];
-
-                        // if the max height is < the height of the cell with rowspan => we adapt the height of each max height
-                        if ($s>0 && $s<$cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['h']) {
-                            for ($i=0; $i<$corr[$y][$x][3]; $i++) {
-                                $sh[$y+$i] = $sh[$y+$i]/$s*$cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['h'];
-                            }
-                        }
-                    }
-                }
-            }
-
-            // set the new height, for each cell
-            for ($y=0; $y<count($corr); $y++) {
-                for ($x=0; $x<count($corr[0]); $x++) {
-                    if (isset($corr[$y][$x]) && is_array($corr[$y][$x])) {
-                        // without rowspan
-                        if ($corr[$y][$x][3]==1) {
-                            $cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['h'] = $sh[$y];
-                        // with rowspan
-                        } else {
-                            $s = 0;
-                            for ($i=0; $i<$corr[$y][$x][3]; $i++) {
-                                $s+= $sh[$y+$i];
-                            }
-                            $cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['h'] = $s;
-
-                            for ($j=1; $j<$corr[$y][$x][3]; $j++) {
-                                $tx = $x+1;
-                                $ty = $y+$j;
-                                for (true; isset($corr[$ty][$tx]) && !is_array($corr[$ty][$tx]); $tx++);
-                                if (isset($corr[$ty][$tx])) {
-                                    $cases[$corr[$ty][$tx][1]][$corr[$ty][$tx][0]]['dw']+= $cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['w'];
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        /**
-         * tag : PAGE
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_PAGE($param)
-        {
-            if ($this->_isForOneLine) return false;
-            if ($this->_debugActif) $this->_DEBUG_add('PAGE '.($this->_page+1), true);
-
-            $newPageSet= (!isset($param['pageset']) || $param['pageset']!='old');
-
-            $resetPageNumber = (isset($param['pagegroup']) && $param['pagegroup']=='new');
-
-            $this->_maxH = 0;
-
-            // if new page set asked
-            if ($newPageSet) {
-                $this->_subHEADER = array();
-                $this->_subFOOTER = array();
-
-                // orientation
-                $orientation = '';
-                if (isset($param['orientation'])) {
-                    $param['orientation'] = strtolower($param['orientation']);
-                    if ($param['orientation']=='p')         $orientation = 'P';
-                    if ($param['orientation']=='portrait')  $orientation = 'P';
-
-                    if ($param['orientation']=='l')         $orientation = 'L';
-                    if ($param['orientation']=='paysage')   $orientation = 'L';
-                    if ($param['orientation']=='landscape') $orientation = 'L';
-                }
-
-                // format
-                $format = null;
-                if (isset($param['format'])) {
-                    $format = strtolower($param['format']);
-                    if (preg_match('/^([0-9]+)x([0-9]+)$/isU', $format, $match)) {
-                        $format = array(intval($match[1]), intval($match[2]));
-                    }
-                }
-
-                // background
-                $background = array();
-                if (isset($param['backimg'])) {
-                    $background['img']    = isset($param['backimg'])  ? $param['backimg']  : '';       // src of the image
-                    $background['posX']   = isset($param['backimgx']) ? $param['backimgx'] : 'center'; // horizontale position of the image
-                    $background['posY']   = isset($param['backimgy']) ? $param['backimgy'] : 'middle'; // vertical position of the image
-                    $background['width']  = isset($param['backimgw']) ? $param['backimgw'] : '100%';   // width of the image (100% = page width)
-
-                    // convert the src of the image, if parameters
-                    $background['img'] = str_replace('&amp;', '&', $background['img']);
-
-                    // convert the positions
-                    if ($background['posX']=='left')    $background['posX'] = '0%';
-                    if ($background['posX']=='center')  $background['posX'] = '50%';
-                    if ($background['posX']=='right')   $background['posX'] = '100%';
-                    if ($background['posY']=='top')     $background['posY'] = '0%';
-                    if ($background['posY']=='middle')  $background['posY'] = '50%';
-                    if ($background['posY']=='bottom')  $background['posY'] = '100%';
-
-                    if ($background['img']) {
-                        // get the size of the image
-                        // WARNING : if URL, "allow_url_fopen" must turned to "on" in php.ini
-                        $infos=@getimagesize($background['img']);
-                        if (count($infos)>1) {
-                            $imageWidth = $this->parsingCss->ConvertToMM($background['width'], $this->pdf->getW());
-                            $imageHeight = $imageWidth*$infos[1]/$infos[0];
-
-                            $background['width'] = $imageWidth;
-                            $background['posX']  = $this->parsingCss->ConvertToMM($background['posX'], $this->pdf->getW() - $imageWidth);
-                            $background['posY']  = $this->parsingCss->ConvertToMM($background['posY'], $this->pdf->getH() - $imageHeight);
-                        } else {
-                            $background = array();
-                        }
-                    } else {
-                        $background = array();
-                    }
-                }
-
-                // margins of the page
-                $background['top']    = isset($param['backtop'])    ? $param['backtop']    : '0';
-                $background['bottom'] = isset($param['backbottom']) ? $param['backbottom'] : '0';
-                $background['left']   = isset($param['backleft'])   ? $param['backleft']   : '0';
-                $background['right']  = isset($param['backright'])  ? $param['backright']  : '0';
-
-                // if no unit => mm
-                if (preg_match('/^([0-9]*)$/isU', $background['top']))    $background['top']    .= 'mm';
-                if (preg_match('/^([0-9]*)$/isU', $background['bottom'])) $background['bottom'] .= 'mm';
-                if (preg_match('/^([0-9]*)$/isU', $background['left']))   $background['left']   .= 'mm';
-                if (preg_match('/^([0-9]*)$/isU', $background['right']))  $background['right']  .= 'mm';
-
-                // convert to mm
-                $background['top']    = $this->parsingCss->ConvertToMM($background['top'], $this->pdf->getH());
-                $background['bottom'] = $this->parsingCss->ConvertToMM($background['bottom'], $this->pdf->getH());
-                $background['left']   = $this->parsingCss->ConvertToMM($background['left'], $this->pdf->getW());
-                $background['right']  = $this->parsingCss->ConvertToMM($background['right'], $this->pdf->getW());
-
-                // get the background color
-                $res = false;
-                $background['color']    = isset($param['backcolor'])    ? $this->parsingCss->convertToColor($param['backcolor'], $res) : null;
-                if (!$res) $background['color'] = null;
-
-                $this->parsingCss->save();
-                $this->parsingCss->analyse('PAGE', $param);
-                $this->parsingCss->setPosition();
-                $this->parsingCss->fontSet();
-
-                // new page
-                $this->_setNewPage($format, $orientation, $background, null, $resetPageNumber);
-
-                // automatic footer
-                if (isset($param['footer'])) {
-                    $lst = explode(';', $param['footer']);
-                    foreach ($lst as $key => $val) $lst[$key] = trim(strtolower($val));
-                    $page    = in_array('page', $lst);
-                    $date    = in_array('date', $lst);
-                    $hour    = in_array('heure', $lst);
-                    $form    = in_array('form', $lst);
-                } else {
-                    $page    = null;
-                    $date    = null;
-                    $hour    = null;
-                    $form    = null;
-                }
-                $this->pdf->SetMyFooter($page, $date, $hour, $form);
-            // else => we use the last page set used
-            } else {
-                $this->parsingCss->save();
-                $this->parsingCss->analyse('PAGE', $param);
-                $this->parsingCss->setPosition();
-                $this->parsingCss->fontSet();
-
-                $this->_setNewPage(null, null, null, null, $resetPageNumber);
-            }
-
-            return true;
-        }
-
-        /**
-         * tag : PAGE
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_PAGE($param)
-        {
-            if ($this->_isForOneLine) return false;
-
-            $this->_maxH = 0;
-
-            $this->parsingCss->load();
-            $this->parsingCss->fontSet();
-
-            if ($this->_debugActif) $this->_DEBUG_add('PAGE '.$this->_page, false);
-
-            return true;
-        }
-
-        /**
-         * tag : PAGE_HEADER
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_PAGE_HEADER($param)
-        {
-            if ($this->_isForOneLine) return false;
-
-            $this->_subHEADER = array();
-            for ($this->_parsePos; $this->_parsePos<count($this->parsingHtml->code); $this->_parsePos++) {
-                $action = $this->parsingHtml->code[$this->_parsePos];
-                if ($action['name']=='page_header') $action['name']='page_header_sub';
-                $this->_subHEADER[] = $action;
-                if (strtolower($action['name'])=='page_header_sub' && $action['close']) break;
-            }
-
-            $this->_setPageHeader();
-
-            return true;
-        }
-
-        /**
-         * tag : PAGE_FOOTER
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_PAGE_FOOTER($param)
-        {
-            if ($this->_isForOneLine) return false;
-
-            $this->_subFOOTER = array();
-            for ($this->_parsePos; $this->_parsePos<count($this->parsingHtml->code); $this->_parsePos++) {
-                $action = $this->parsingHtml->code[$this->_parsePos];
-                if ($action['name']=='page_footer') $action['name']='page_footer_sub';
-                $this->_subFOOTER[] = $action;
-                if (strtolower($action['name'])=='page_footer_sub' && $action['close']) break;
-            }
-
-            $this->_setPageFooter();
-
-            return true;
-        }
-
-        /**
-         * It is not a real tag. Does not use it directly
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_PAGE_HEADER_SUB($param)
-        {
-            if ($this->_isForOneLine) return false;
-
-            // save the current stat
-            $this->_subSTATES = array();
-            $this->_subSTATES['x']  = $this->pdf->getX();
-            $this->_subSTATES['y']  = $this->pdf->getY();
-            $this->_subSTATES['s']  = $this->parsingCss->value;
-            $this->_subSTATES['t']  = $this->parsingCss->table;
-            $this->_subSTATES['ml'] = $this->_margeLeft;
-            $this->_subSTATES['mr'] = $this->_margeRight;
-            $this->_subSTATES['mt'] = $this->_margeTop;
-            $this->_subSTATES['mb'] = $this->_margeBottom;
-            $this->_subSTATES['mp'] = $this->_pageMarges;
-
-            // new stat for the header
-            $this->_pageMarges = array();
-            $this->_margeLeft    = $this->_defaultLeft;
-            $this->_margeRight   = $this->_defaultRight;
-            $this->_margeTop     = $this->_defaultTop;
-            $this->_margeBottom  = $this->_defaultBottom;
-            $this->pdf->SetMargins($this->_margeLeft, $this->_margeTop, $this->_margeRight);
-            $this->pdf->SetAutoPageBreak(false, $this->_margeBottom);
-            $this->pdf->setXY($this->_defaultLeft, $this->_defaultTop);
-
-            $this->parsingCss->initStyle();
-            $this->parsingCss->resetStyle();
-            $this->parsingCss->value['width'] = $this->pdf->getW() - $this->_defaultLeft - $this->_defaultRight;
-            $this->parsingCss->table = array();
-
-            $this->parsingCss->save();
-            $this->parsingCss->analyse('page_header_sub', $param);
-            $this->parsingCss->setPosition();
-            $this->parsingCss->fontSet();
-            $this->_setNewPositionForNewLine();
-            return true;
-        }
-
-        /**
-         * It is not a real tag. Does not use it directly
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_PAGE_HEADER_SUB($param)
-        {
-            if ($this->_isForOneLine) return false;
-
-            $this->parsingCss->load();
-
-            // restore the stat
-            $this->parsingCss->value = $this->_subSTATES['s'];
-            $this->parsingCss->table = $this->_subSTATES['t'];
-            $this->_pageMarges       = $this->_subSTATES['mp'];
-            $this->_margeLeft        = $this->_subSTATES['ml'];
-            $this->_margeRight       = $this->_subSTATES['mr'];
-            $this->_margeTop         = $this->_subSTATES['mt'];
-            $this->_margeBottom      = $this->_subSTATES['mb'];
-            $this->pdf->SetMargins($this->_margeLeft, $this->_margeTop, $this->_margeRight);
-            $this->pdf->setbMargin($this->_margeBottom);
-            $this->pdf->SetAutoPageBreak(false, $this->_margeBottom);
-            $this->pdf->setXY($this->_subSTATES['x'], $this->_subSTATES['y']);
-
-            $this->parsingCss->fontSet();
-            $this->_maxH = 0;
-
-            return true;
-        }
-
-        /**
-         * It is not a real tag. Does not use it directly
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_PAGE_FOOTER_SUB($param)
-        {
-            if ($this->_isForOneLine) return false;
-
-            // save the current stat
-            $this->_subSTATES = array();
-            $this->_subSTATES['x']    = $this->pdf->getX();
-            $this->_subSTATES['y']    = $this->pdf->getY();
-            $this->_subSTATES['s']    = $this->parsingCss->value;
-            $this->_subSTATES['t']    = $this->parsingCss->table;
-            $this->_subSTATES['ml']    = $this->_margeLeft;
-            $this->_subSTATES['mr']    = $this->_margeRight;
-            $this->_subSTATES['mt']    = $this->_margeTop;
-            $this->_subSTATES['mb']    = $this->_margeBottom;
-            $this->_subSTATES['mp']    = $this->_pageMarges;
-
-            // new stat for the footer
-            $this->_pageMarges  = array();
-            $this->_margeLeft   = $this->_defaultLeft;
-            $this->_margeRight  = $this->_defaultRight;
-            $this->_margeTop    = $this->_defaultTop;
-            $this->_margeBottom = $this->_defaultBottom;
-            $this->pdf->SetMargins($this->_margeLeft, $this->_margeTop, $this->_margeRight);
-            $this->pdf->SetAutoPageBreak(false, $this->_margeBottom);
-            $this->pdf->setXY($this->_defaultLeft, $this->_defaultTop);
-
-            $this->parsingCss->initStyle();
-            $this->parsingCss->resetStyle();
-            $this->parsingCss->value['width']    = $this->pdf->getW() - $this->_defaultLeft - $this->_defaultRight;
-            $this->parsingCss->table                = array();
-
-            // we create a sub HTML2PFDF, and we execute on it the content of the footer, to get the height of it
-            $sub = null;
-            $this->_createSubHTML($sub);
-            $sub->parsingHtml->code = $this->parsingHtml->getLevel($this->_parsePos);
-            $sub->_makeHTMLcode();
-            $this->pdf->setY($this->pdf->getH() - $sub->_maxY - $this->_defaultBottom - 0.01);
-            $this->_destroySubHTML($sub);
-
-            $this->parsingCss->save();
-            $this->parsingCss->analyse('page_footer_sub', $param);
-            $this->parsingCss->setPosition();
-            $this->parsingCss->fontSet();
-            $this->_setNewPositionForNewLine();
-
-            return true;
-        }
-
-        /**
-         * It is not a real tag. Does not use it directly
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_PAGE_FOOTER_SUB($param)
-        {
-            if ($this->_isForOneLine) return false;
-
-            $this->parsingCss->load();
-
-            $this->parsingCss->value                = $this->_subSTATES['s'];
-            $this->parsingCss->table                = $this->_subSTATES['t'];
-            $this->_pageMarges                 = $this->_subSTATES['mp'];
-            $this->_margeLeft                = $this->_subSTATES['ml'];
-            $this->_margeRight                = $this->_subSTATES['mr'];
-            $this->_margeTop                    = $this->_subSTATES['mt'];
-            $this->_margeBottom                = $this->_subSTATES['mb'];
-            $this->pdf->SetMargins($this->_margeLeft, $this->_margeTop, $this->_margeRight);
-            $this->pdf->SetAutoPageBreak(false, $this->_margeBottom);
-            $this->pdf->setXY($this->_subSTATES['x'], $this->_subSTATES['y']);
-
-            $this->parsingCss->fontSet();
-            $this->_maxH = 0;
-
-            return true;
-        }
-
-        /**
-         * tag : NOBREAK
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_NOBREAK($param)
-        {
-            if ($this->_isForOneLine) return false;
-
-            $this->_maxH = 0;
-
-            // create a sub HTML2PDF to execute the content of the tag, to get the dimensions
-            $sub = null;
-            $this->_createSubHTML($sub);
-            $sub->parsingHtml->code = $this->parsingHtml->getLevel($this->_parsePos);
-            $sub->_makeHTMLcode();
-            $y = $this->pdf->getY();
-
-            // if the content does not fit on the page => new page
-            if (
-                $sub->_maxY < ($this->pdf->getH() - $this->pdf->gettMargin()-$this->pdf->getbMargin()) &&
-                $y + $sub->_maxY>=($this->pdf->getH() - $this->pdf->getbMargin())
-            ) {
-                $this->_setNewPage();
-            }
-
-            // destroy the sub HTML2PDF
-            $this->_destroySubHTML($sub);
-
-            return true;
-        }
-
-
-        /**
-         * tag : NOBREAK
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_NOBREAK($param)
-        {
-            if ($this->_isForOneLine) return false;
-
-            $this->_maxH = 0;
-
-            return true;
-        }
-
-        /**
-         * tag : DIV
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @param  string $other name of tag that used the div tag
-         * @return boolean
-         */
-        protected function _tag_open_DIV($param, $other = 'div')
-        {
-            if ($this->_isForOneLine) return false;
-            if ($this->_debugActif) $this->_DEBUG_add(strtoupper($other), true);
-
-            $this->parsingCss->save();
-            $this->parsingCss->analyse($other, $param);
-            $this->parsingCss->fontSet();
-
-            // for fieldset and legend
-            if (in_array($other, array('fieldset', 'legend'))) {
-                if (isset($param['moveTop']))  $this->parsingCss->value['margin']['t']    += $param['moveTop'];
-                if (isset($param['moveLeft'])) $this->parsingCss->value['margin']['l']    += $param['moveLeft'];
-                if (isset($param['moveDown'])) $this->parsingCss->value['margin']['b']    += $param['moveDown'];
-            }
-
-            $alignObject = null;
-            if ($this->parsingCss->value['margin-auto']) $alignObject = 'center';
-
-            $marge = array();
-            $marge['l'] = $this->parsingCss->value['border']['l']['width'] + $this->parsingCss->value['padding']['l']+0.03;
-            $marge['r'] = $this->parsingCss->value['border']['r']['width'] + $this->parsingCss->value['padding']['r']+0.03;
-            $marge['t'] = $this->parsingCss->value['border']['t']['width'] + $this->parsingCss->value['padding']['t']+0.03;
-            $marge['b'] = $this->parsingCss->value['border']['b']['width'] + $this->parsingCss->value['padding']['b']+0.03;
-
-            // extract the content of the div
-            $level = $this->parsingHtml->getLevel($this->_parsePos);
-
-            // create a sub HTML2PDF to get the dimensions of the content of the div
-            $w = 0; $h = 0;
-            if (count($level)) {
-                $sub = null;
-                $this->_createSubHTML($sub);
-                $sub->parsingHtml->code = $level;
-                $sub->_makeHTMLcode();
-                $w = $sub->_maxX;
-                $h = $sub->_maxY;
-                $this->_destroySubHTML($sub);
-            }
-            $wReel = $w;
-            $hReel = $h;
-
-            $w+= $marge['l']+$marge['r']+0.001;
-            $h+= $marge['t']+$marge['b']+0.001;
-
-            if ($this->parsingCss->value['overflow']=='hidden') {
-                $overW = max($w, $this->parsingCss->value['width']);
-                $overH = max($h, $this->parsingCss->value['height']);
-                $overflow = true;
-                $this->parsingCss->value['old_maxX'] = $this->_maxX;
-                $this->parsingCss->value['old_maxY'] = $this->_maxY;
-                $this->parsingCss->value['old_maxH'] = $this->_maxH;
-                $this->parsingCss->value['old_overflow'] = $this->_isInOverflow;
-                $this->_isInOverflow = true;
-            } else {
-                $overW = null;
-                $overH = null;
-                $overflow = false;
-                $this->parsingCss->value['width']    = max($w, $this->parsingCss->value['width']);
-                $this->parsingCss->value['height']    = max($h, $this->parsingCss->value['height']);
-            }
-
-            switch($this->parsingCss->value['rotate'])
-            {
-                case 90:
-                    $tmp = $overH; $overH = $overW; $overW = $tmp;
-                    $tmp = $hReel; $hReel = $wReel; $wReel = $tmp;
-                    unset($tmp);
-                    $w = $this->parsingCss->value['height'];
-                    $h = $this->parsingCss->value['width'];
-                    $tX =-$h;
-                    $tY = 0;
-                    break;
-
-                case 180:
-                    $w = $this->parsingCss->value['width'];
-                    $h = $this->parsingCss->value['height'];
-                    $tX = -$w;
-                    $tY = -$h;
-                    break;
-
-                case 270:
-                    $tmp = $overH; $overH = $overW; $overW = $tmp;
-                    $tmp = $hReel; $hReel = $wReel; $wReel = $tmp;
-                    unset($tmp);
-                    $w = $this->parsingCss->value['height'];
-                    $h = $this->parsingCss->value['width'];
-                    $tX = 0;
-                    $tY =-$w;
-                    break;
-
-                default:
-                    $w = $this->parsingCss->value['width'];
-                    $h = $this->parsingCss->value['height'];
-                    $tX = 0;
-                    $tY = 0;
-                    break;
-            }
-
-            if (!$this->parsingCss->value['position']) {
-                if (
-                    $w < ($this->pdf->getW() - $this->pdf->getlMargin()-$this->pdf->getrMargin()) &&
-                    $this->pdf->getX() + $w>=($this->pdf->getW() - $this->pdf->getrMargin())
-                    )
-                    $this->_tag_open_BR(array());
-
-                if (
-                        ($h < ($this->pdf->getH() - $this->pdf->gettMargin()-$this->pdf->getbMargin())) &&
-                        ($this->pdf->getY() + $h>=($this->pdf->getH() - $this->pdf->getbMargin())) &&
-                        !$this->_isInOverflow
-                    )
-                    $this->_setNewPage();
-
-                $old = $this->parsingCss->getOldValues();
-                $parentWidth = $old['width'] ? $old['width'] : $this->pdf->getW() - $this->pdf->getlMargin() - $this->pdf->getrMargin();
-
-                if ($parentWidth>$w) {
-                    if ($alignObject=='center')        $this->pdf->setX($this->pdf->getX() + ($parentWidth-$w)*0.5);
-                    else if ($alignObject=='right')    $this->pdf->setX($this->pdf->getX() + $parentWidth-$w);
-                }
-
-                $this->parsingCss->setPosition();
-            } else {
-                $old = $this->parsingCss->getOldValues();
-                $parentWidth = $old['width'] ? $old['width'] : $this->pdf->getW() - $this->pdf->getlMargin() - $this->pdf->getrMargin();
-
-                if ($parentWidth>$w) {
-                    if ($alignObject=='center')        $this->pdf->setX($this->pdf->getX() + ($parentWidth-$w)*0.5);
-                    else if ($alignObject=='right')    $this->pdf->setX($this->pdf->getX() + $parentWidth-$w);
-                }
-
-                $this->parsingCss->setPosition();
-                $this->_saveMax();
-                $this->_maxX = 0;
-                $this->_maxY = 0;
-                $this->_maxH = 0;
-                $this->_maxE = 0;
-            }
-
-            if ($this->parsingCss->value['rotate']) {
-                $this->pdf->startTransform();
-                $this->pdf->setRotation($this->parsingCss->value['rotate']);
-                $this->pdf->setTranslate($tX, $tY);
-            }
-
-            $this->_drawRectangle(
-                $this->parsingCss->value['x'],
-                $this->parsingCss->value['y'],
-                $this->parsingCss->value['width'],
-                $this->parsingCss->value['height'],
-                $this->parsingCss->value['border'],
-                $this->parsingCss->value['padding'],
-                0,
-                $this->parsingCss->value['background']
-            );
-
-            $marge = array();
-            $marge['l'] = $this->parsingCss->value['border']['l']['width'] + $this->parsingCss->value['padding']['l']+0.03;
-            $marge['r'] = $this->parsingCss->value['border']['r']['width'] + $this->parsingCss->value['padding']['r']+0.03;
-            $marge['t'] = $this->parsingCss->value['border']['t']['width'] + $this->parsingCss->value['padding']['t']+0.03;
-            $marge['b'] = $this->parsingCss->value['border']['b']['width'] + $this->parsingCss->value['padding']['b']+0.03;
-
-            $this->parsingCss->value['width'] -= $marge['l']+$marge['r'];
-            $this->parsingCss->value['height']-= $marge['t']+$marge['b'];
-
-            $xCorr = 0;
-            $yCorr = 0;
-            if (!$this->_subPart && !$this->_isSubPart) {
-                switch($this->parsingCss->value['text-align'])
-                {
-                    case 'right':
-                        $xCorr = ($this->parsingCss->value['width']-$wReel);
-                        break;
-                    case 'center':
-                        $xCorr = ($this->parsingCss->value['width']-$wReel)*0.5;
-                        break;
-                }
-                if ($xCorr>0) $xCorr=0;
-                switch($this->parsingCss->value['vertical-align'])
-                {
-                    case 'bottom':
-                        $yCorr = ($this->parsingCss->value['height']-$hReel);
-                        break;
-                    case 'middle':
-                        $yCorr = ($this->parsingCss->value['height']-$hReel)*0.5;
-                        break;
-                }
-            }
-
-            if ($overflow) {
-                $overW-= $marge['l']+$marge['r'];
-                $overH-= $marge['t']+$marge['b'];
-                $this->pdf->clippingPathStart(
-                    $this->parsingCss->value['x']+$marge['l'],
-                    $this->parsingCss->value['y']+$marge['t'],
-                    $this->parsingCss->value['width'],
-                    $this->parsingCss->value['height']
-                );
-
-                $this->parsingCss->value['x']+= $xCorr;
-
-                // marges from the dimension of the content
-                $mL = $this->parsingCss->value['x']+$marge['l'];
-                $mR = $this->pdf->getW() - $mL - $overW;
-            } else {
-                // marges from the dimension of the div
-                $mL = $this->parsingCss->value['x']+$marge['l'];
-                $mR = $this->pdf->getW() - $mL - $this->parsingCss->value['width'];
-            }
-
-            $x = $this->parsingCss->value['x']+$marge['l'];
-            $y = $this->parsingCss->value['y']+$marge['t']+$yCorr;
-            $this->_saveMargin($mL, 0, $mR);
-            $this->pdf->setXY($x, $y);
-
-            $this->_setNewPositionForNewLine();
-
-            return true;
-        }
-
-        /**
-         * tag : BLOCKQUOTE
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_BLOCKQUOTE($param)
-        {
-            return $this->_tag_open_DIV($param, 'blockquote');
-        }
-
-        /**
-         * tag : LEGEND
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_LEGEND($param)
-        {
-            return $this->_tag_open_DIV($param, 'legend');
-        }
-
-        /**
-         * tag : FIELDSET
-         * mode : OPEN
-         *
-         * @author Pavel Kochman
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_FIELDSET($param)
-        {
-
-            $this->parsingCss->save();
-            $this->parsingCss->analyse('fieldset', $param);
-
-            // get height of LEGEND element and make fieldset corrections
-            for ($tempPos = $this->_parsePos + 1; $tempPos<count($this->parsingHtml->code); $tempPos++) {
-                $action = $this->parsingHtml->code[$tempPos];
-                if ($action['name'] == 'fieldset') break;
-                if ($action['name'] == 'legend' && !$action['close']) {
-                    $legendOpenPos = $tempPos;
-
-                    $sub = null;
-                    $this->_createSubHTML($sub);
-                    $sub->parsingHtml->code = $this->parsingHtml->getLevel($tempPos - 1);
-
-                    $res = null;
-                    for ($sub->_parsePos = 0; $sub->_parsePos<count($sub->parsingHtml->code); $sub->_parsePos++) {
-                        $action = $sub->parsingHtml->code[$sub->_parsePos];
-                        $sub->_executeAction($action);
-
-                        if ($action['name'] == 'legend' && $action['close'])
-                            break;
-                    }
-
-                    $legendH = $sub->_maxY;
-                    $this->_destroySubHTML($sub);
-
-                    $move = $this->parsingCss->value['padding']['t'] + $this->parsingCss->value['border']['t']['width'] + 0.03;
-
-                    $param['moveTop'] = $legendH / 2;
-
-                    $this->parsingHtml->code[$legendOpenPos]['param']['moveTop'] = - ($legendH / 2 + $move);
-                    $this->parsingHtml->code[$legendOpenPos]['param']['moveLeft'] = 2 - $this->parsingCss->value['border']['l']['width'] - $this->parsingCss->value['padding']['l'];
-                    $this->parsingHtml->code[$legendOpenPos]['param']['moveDown'] = $move;
-                    break;
-                }
-            }
-            $this->parsingCss->load();
-
-            return $this->_tag_open_DIV($param, 'fieldset');
-        }
-
-        /**
-         * tag : DIV
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @param  string $other name of tag that used the div tag
-         * @return boolean
-         */
-        protected function _tag_close_DIV($param, $other='div')
-        {
-            if ($this->_isForOneLine) return false;
-
-            if ($this->parsingCss->value['overflow']=='hidden') {
-                $this->_maxX = $this->parsingCss->value['old_maxX'];
-                $this->_maxY = $this->parsingCss->value['old_maxY'];
-                $this->_maxH = $this->parsingCss->value['old_maxH'];
-                $this->_isInOverflow = $this->parsingCss->value['old_overflow'];
-                $this->pdf->clippingPathStop();
-            }
-
-            if ($this->parsingCss->value['rotate'])
-                $this->pdf->stopTransform();
-
-            $marge = array();
-            $marge['l'] = $this->parsingCss->value['border']['l']['width'] + $this->parsingCss->value['padding']['l']+0.03;
-            $marge['r'] = $this->parsingCss->value['border']['r']['width'] + $this->parsingCss->value['padding']['r']+0.03;
-            $marge['t'] = $this->parsingCss->value['border']['t']['width'] + $this->parsingCss->value['padding']['t']+0.03;
-            $marge['b'] = $this->parsingCss->value['border']['b']['width'] + $this->parsingCss->value['padding']['b']+0.03;
-
-            $x = $this->parsingCss->value['x'];
-            $y = $this->parsingCss->value['y'];
-            $w = $this->parsingCss->value['width']+$marge['l']+$marge['r']+$this->parsingCss->value['margin']['r'];
-            $h = $this->parsingCss->value['height']+$marge['t']+$marge['b']+$this->parsingCss->value['margin']['b'];
-
-            switch($this->parsingCss->value['rotate'])
-            {
-                case 90:
-                    $t = $w; $w = $h; $h = $t;
-                    break;
-
-                case 270:
-                    $t = $w; $w = $h; $h = $t;
-                    break;
-
-                default:
-                    break;
-            }
-
-
-            if ($this->parsingCss->value['position']!='absolute') {
-                $this->pdf->setXY($x+$w, $y);
-
-                $this->_maxX = max($this->_maxX, $x+$w);
-                $this->_maxY = max($this->_maxY, $y+$h);
-                $this->_maxH = max($this->_maxH, $h);
-            } else {
-                $this->pdf->setXY($this->parsingCss->value['xc'], $this->parsingCss->value['yc']);
-
-                $this->_loadMax();
-            }
-
-            $block = ($this->parsingCss->value['display']!='inline' && $this->parsingCss->value['position']!='absolute');
-
-            $this->parsingCss->load();
-            $this->parsingCss->fontSet();
-            $this->_loadMargin();
-
-            if ($block) $this->_tag_open_BR(array());
-            if ($this->_debugActif) $this->_DEBUG_add(strtoupper($other), false);
-
-            return true;
-        }
-
-        /**
-         * tag : BLOCKQUOTE
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_BLOCKQUOTE($param)
-        {
-            return $this->_tag_close_DIV($param, 'blockquote');
-        }
-
-        /**
-         * tag : FIELDSET
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_FIELDSET($param)
-        {
-            return $this->_tag_close_DIV($param, 'fieldset');
-        }
-
-        /**
-         * tag : LEGEND
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_LEGEND($param)
-        {
-            return $this->_tag_close_DIV($param, 'legend');
-        }
-
-        /**
-         * tag : BARCODE
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_BARCODE($param)
-        {
-            // for  compatibility with old versions < 3.29
-            $lstBarcode = array();
-            $lstBarcode['UPC_A']  =    'UPCA';
-            $lstBarcode['CODE39'] =    'C39';
-
-            if (!isset($param['type']))     $param['type'] = 'C39';
-            if (!isset($param['value']))    $param['value']    = 0;
-            if (!isset($param['label']))    $param['label']    = 'label';
-            if (!isset($param['style']['color'])) $param['style']['color'] = '#000000';
-
-            if ($this->_testIsDeprecated && (isset($param['bar_h']) || isset($param['bar_w'])))
-                throw new HTML2PDF_exception(9, array('BARCODE', 'bar_h, bar_w'));
-
-            $param['type'] = strtoupper($param['type']);
-            if (isset($lstBarcode[$param['type']])) $param['type'] = $lstBarcode[$param['type']];
-
-            $this->parsingCss->save();
-            $this->parsingCss->analyse('barcode', $param);
-            $this->parsingCss->setPosition();
-            $this->parsingCss->fontSet();
-
-            $x = $this->pdf->getX();
-            $y = $this->pdf->getY();
-            $w = $this->parsingCss->value['width'];    if (!$w) $w = $this->parsingCss->ConvertToMM('50mm');
-            $h = $this->parsingCss->value['height'];    if (!$h) $h = $this->parsingCss->ConvertToMM('10mm');
-            $txt = ($param['label']!=='none' ? $this->parsingCss->value['font-size'] : false);
-            $c = $this->parsingCss->value['color'];
-            $infos = $this->pdf->myBarcode($param['value'], $param['type'], $x, $y, $w, $h, $txt, $c);
-
-            $this->_maxX = max($this->_maxX, $x+$infos[0]);
-            $this->_maxY = max($this->_maxY, $y+$infos[1]);
-            $this->_maxH = max($this->_maxH, $infos[1]);
-            $this->_maxE++;
-
-            $this->pdf->setXY($x+$infos[0], $y);
-
-            $this->parsingCss->load();
-            $this->parsingCss->fontSet();
-
-            return true;
-        }
-
-        /**
-         * tag : BARCODE
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_BARCODE($param)
-        {
-            // there is nothing to do here
-
-            return true;
-        }
-
-        /**
-         * tag : QRCODE
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_QRCODE($param)
-        {
-            if ($this->_testIsDeprecated && (isset($param['size']) || isset($param['noborder'])))
-                throw new HTML2PDF_exception(9, array('QRCODE', 'size, noborder'));
-
-            if ($this->_debugActif) $this->_DEBUG_add('QRCODE');
-
-            if (!isset($param['value']))                     $param['value'] = '';
-            if (!isset($param['ec']))                        $param['ec'] = 'H';
-            if (!isset($param['style']['color']))            $param['style']['color'] = '#000000';
-            if (!isset($param['style']['background-color'])) $param['style']['background-color'] = '#FFFFFF';
-            if (isset($param['style']['border'])) {
-                $borders = $param['style']['border']!='none';
-                unset($param['style']['border']);
-            } else {
-                $borders = true;
-            }
-
-            if ($param['value']==='') return true;
-            if (!in_array($param['ec'], array('L', 'M', 'Q', 'H'))) $param['ec'] = 'H';
-
-            $this->parsingCss->save();
-            $this->parsingCss->analyse('qrcode', $param);
-            $this->parsingCss->setPosition();
-            $this->parsingCss->fontSet();
-
-            $x = $this->pdf->getX();
-            $y = $this->pdf->getY();
-            $w = $this->parsingCss->value['width'];
-            $h = $this->parsingCss->value['height'];
-            $size = max($w, $h); if (!$size) $size = $this->parsingCss->ConvertToMM('50mm');
-
-            $style = array(
-                    'fgcolor' => $this->parsingCss->value['color'],
-                    'bgcolor' => $this->parsingCss->value['background']['color'],
-                );
-
-            if ($borders) {
-                $style['border'] = true;
-                $style['padding'] = 'auto';
-            } else {
-                $style['border'] = false;
-                $style['padding'] = 0;
-            }
-
-            if (!$this->_subPart && !$this->_isSubPart) {
-                $this->pdf->write2DBarcode($param['value'], 'QRCODE,'.$param['ec'], $x, $y, $size, $size, $style);
-            }
-
-            $this->_maxX = max($this->_maxX, $x+$size);
-            $this->_maxY = max($this->_maxY, $y+$size);
-            $this->_maxH = max($this->_maxH, $size);
-            $this->_maxE++;
-
-            $this->pdf->setX($x+$size);
-
-            $this->parsingCss->load();
-            $this->parsingCss->fontSet();
-
-            return true;
-        }
-
-        /**
-         * tag : QRCODE
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_QRCODE($param)
-        {
-            // there is nothing to do here
-
-            return true;
-        }
-
-        /**
-         * tag : BOOKMARK
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_BOOKMARK($param)
-        {
-            $titre = isset($param['title']) ? trim($param['title']) : '';
-            $level = isset($param['level']) ? floor($param['level']) : 0;
-
-            if ($level<0) $level = 0;
-            if ($titre) $this->pdf->Bookmark($titre, $level, -1);
-
-            return true;
-        }
-
-        /**
-         * tag : BOOKMARK
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_BOOKMARK($param)
-        {
-            // there is nothing to do here
-
-            return true;
-        }
-
-        /**
-         * this is not a real TAG, it is just to write texts
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_WRITE($param)
-        {
-            $fill = ($this->parsingCss->value['background']['color']!==null && $this->parsingCss->value['background']['image']===null);
-            if (in_array($this->parsingCss->value['id_tag'], array('fieldset', 'legend', 'div', 'table', 'tr', 'td', 'th'))) {
-                $fill = false;
-            }
-
-            // get the text to write
-            $txt = $param['txt'];
-
-            if ($this->_isAfterFloat) {
-                $txt = ltrim($txt);
-                $this->_isAfterFloat = false;
-            }
-
-            $txt = str_replace('[[page_nb]]', $this->pdf->getMyAliasNbPages(), $txt);
-            $txt = str_replace('[[page_cu]]', $this->pdf->getMyNumPage($this->_page), $txt);
-
-            if ($this->parsingCss->value['text-transform']!='none') {
-                if ($this->parsingCss->value['text-transform']=='capitalize')
-                    $txt = ucwords($txt);
-                else if ($this->parsingCss->value['text-transform']=='uppercase')
-                    $txt = strtoupper($txt);
-                else if ($this->parsingCss->value['text-transform']=='lowercase')
-                    $txt = strtolower($txt);
-            }
-
-            // size of the text
-            $h  = 1.08*$this->parsingCss->value['font-size'];
-            $dh = $h*$this->parsingCss->value['mini-decal'];
-            $lh = $this->parsingCss->getLineHeight();
-
-            // identify the align
-            $align = 'L';
-            if ($this->parsingCss->value['text-align']=='li_right') {
-                $w = $this->parsingCss->value['width'];
-                $align = 'R';
-            }
-
-            // calculate the width of each words, and of all the sentence
-            $w = 0;
-            $words = explode(' ', $txt);
-            foreach ($words as $k => $word) {
-                $words[$k] = array($word, $this->pdf->GetStringWidth($word));
-                $w+= $words[$k][1];
-            }
-            $space = $this->pdf->GetStringWidth(' ');
-            $w+= $space*(count($words)-1);
-
-            // position in the text
-            $currPos = 0;
-
-            // the bigger width of the text, after automatic break line
-            $maxX = 0;
-
-            // position of the text
-            $x = $this->pdf->getX();
-            $y = $this->pdf->getY();
-            $dy = $this->_getElementY($lh);
-
-            // margins
-            list($left, $right) = $this->_getMargins($y);
-
-            // number of lines after automatic break line
-            $nb = 0;
-
-            // while we have words, and the text does not fit on the line => we cut the sentence
-            while ($x+$w>$right && $x<$right+$space && count($words)) {
-                // adding words 1 by 1 to fit on the line
-                $i=0;
-                $old = array('', 0);
-                $str = $words[0];
-                $add = false;
-                while (($x+$str[1])<$right) {
-                    $i++;
-                    $add = true;
-
-                    array_shift($words);
-                    $old = $str;
-
-                    if (!count($words)) break;
-                    $str[0].= ' '.$words[0][0];
-                    $str[1]+= $space+$words[0][1];
-                }
-                $str = $old;
-
-                // if  nothing fit on the line, and if the first word does not fit on the line => the word is too long, we put it
-                if ($i==0 && (($left+$words[0][1])>=$right)) {
-                    $str = $words[0];
-                    array_shift($words);
-                    $i++;
-                    $add = true;
-                }
-                $currPos+= ($currPos ? 1 : 0)+strlen($str[0]);
-
-                // write the extract sentence that fit on the page
-                $wc = ($align=='L' ? $str[1] : $this->parsingCss->value['width']);
-                if ($right - $left<$wc) $wc = $right - $left;
-
-                if (strlen($str[0])) {
-                    $this->pdf->setXY($this->pdf->getX(), $y+$dh+$dy);
-                    $this->pdf->Cell($wc, $h, $str[0], 0, 0, $align, $fill, $this->_isInLink);
-                    $this->pdf->setXY($this->pdf->getX(), $y);
-                }
-                $this->_maxH = max($this->_maxH, $lh);
-
-                // max width
-                $maxX = max($maxX, $this->pdf->getX());
-
-                // new position and new width for the "while"
-                $w-= $str[1];
-                $y = $this->pdf->getY();
-                $x = $this->pdf->getX();
-                $dy = $this->_getElementY($lh);
-
-                // if we have again words to write
-                if (count($words)) {
-                    // remove the space at the end
-                    if ($add) $w-= $space;
-
-                    // if we don't add any word, and if the first word is empty => useless space to skip
-                    if (!$add && $words[0][0]==='') {
-                        array_shift($words);
-                    }
-
-                    // if it is just to calculate for one line => adding the number of words
-                    if ($this->_isForOneLine) {
-                        $this->_maxE+= $i;
-                        $this->_maxX = max($this->_maxX, $maxX);
-                        return null;
-                    }
-
-                    // automatic line break
-                    $this->_tag_open_BR(array('style' => ''), $currPos);
-
-                    // new position
-                    $y = $this->pdf->getY();
-                    $x = $this->pdf->getX();
-                    $dy = $this->_getElementY($lh);
-
-                    // if the next line does  not fit on the page => new page
-                    if ($y + $h>=$this->pdf->getH() - $this->pdf->getbMargin()) {
-                        if (!$this->_isInOverflow && !$this->_isInFooter) {
-                            $this->_setNewPage(null, '', null, $currPos);
-                            $y = $this->pdf->getY();
-                            $x = $this->pdf->getX();
-                            $dy = $this->_getElementY($lh);
-                        }
-                    }
-
-                    // if more than 10000 line => error
-                    $nb++;
-                    if ($nb>10000) {
-                        $txt = ''; foreach ($words as $k => $word) $txt.= ($k ? ' ' : '').$word[0];
-                        throw new HTML2PDF_exception(2, array($txt, $right-$left, $w));
-                    }
-
-                    // new margins for the new line
-                    list($left, $right) = $this->_getMargins($y);
-                }
-            }
-
-            // if we have words after automatic cut, it is because they fit on the line => we write the text
-            if (count($words)) {
-                $txt = ''; foreach ($words as $k => $word) $txt.= ($k ? ' ' : '').$word[0];
-                $w+= $this->pdf->getWordSpacing()*(count($words));
-                $this->pdf->setXY($this->pdf->getX(), $y+$dh+$dy);
-                $this->pdf->Cell(($align=='L' ? $w : $this->parsingCss->value['width']), $h, $txt, 0, 0, $align, $fill, $this->_isInLink);
-                $this->pdf->setXY($this->pdf->getX(), $y);
-                $this->_maxH = max($this->_maxH, $lh);
-                $this->_maxE+= count($words);
-            }
-
-            $maxX = max($maxX, $this->pdf->getX());
-            $maxY = $this->pdf->getY()+$h;
-
-            $this->_maxX = max($this->_maxX, $maxX);
-            $this->_maxY = max($this->_maxY, $maxY);
-
-            return true;
-        }
-
-        /**
-         * tag : BR
-         * mode : OPEN
-         *
-         * @param  array   $param
-         * @param  integer $curr real position in the html parseur (if break line in the write of a text)
-         * @return boolean
-         */
-        protected function _tag_open_BR($param, $curr = null)
-        {
-            if ($this->_isForOneLine) return false;
-
-            $h = max($this->_maxH, $this->parsingCss->getLineHeight());
-
-            if ($this->_maxH==0) $this->_maxY = max($this->_maxY, $this->pdf->getY()+$h);
-
-            $this->_makeBreakLine($h, $curr);
-
-            $this->_maxH = 0;
-            $this->_maxE = 0;
-
-            return true;
-        }
-
-        /**
-         * tag : HR
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_HR($param)
-        {
-            if ($this->_isForOneLine) return false;
-            $oldAlign = $this->parsingCss->value['text-align'];
-            $this->parsingCss->value['text-align'] = 'left';
-
-            if ($this->_maxH) $this->_tag_open_BR($param);
-
-            $fontSize = $this->parsingCss->value['font-size'];
-            $this->parsingCss->value['font-size']=$fontSize*0.5; $this->_tag_open_BR($param);
-            $this->parsingCss->value['font-size']=0;
-
-            $param['style']['width'] = '100%';
-
-            $this->parsingCss->save();
-            $this->parsingCss->value['height']=$this->parsingCss->ConvertToMM('1mm');
-
-            $this->parsingCss->analyse('hr', $param);
-            $this->parsingCss->setPosition();
-            $this->parsingCss->fontSet();
-
-            $h = $this->parsingCss->value['height'];
-            if ($h)    $h-= $this->parsingCss->value['border']['t']['width']+$this->parsingCss->value['border']['b']['width'];
-            if ($h<=0) $h = $this->parsingCss->value['border']['t']['width']+$this->parsingCss->value['border']['b']['width'];
-
-            $this->_drawRectangle($this->pdf->getX(), $this->pdf->getY(), $this->parsingCss->value['width'], $h, $this->parsingCss->value['border'], 0, 0, $this->parsingCss->value['background']);
-            $this->_maxH = $h;
-
-            $this->parsingCss->load();
-            $this->parsingCss->fontSet();
-
-            $this->_tag_open_BR($param);
-
-            $this->parsingCss->value['font-size']=$fontSize*0.5; $this->_tag_open_BR($param);
-            $this->parsingCss->value['font-size']=$fontSize;
-
-            $this->parsingCss->value['text-align'] = $oldAlign;
-            $this->_setNewPositionForNewLine();
-
-            return true;
-        }
-
-        /**
-         * tag : B
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @param  string $other
-         * @return boolean
-         */
-        protected function _tag_open_B($param, $other = 'b')
-        {
-            $this->parsingCss->save();
-            $this->parsingCss->value['font-bold'] = true;
-            $this->parsingCss->analyse($other, $param);
-            $this->parsingCss->setPosition();
-            $this->parsingCss->fontSet();
-
-            return true;
-        }
-
-        /**
-         * tag : STRONG
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_STRONG($param)
-        {
-            return $this->_tag_open_B($param, 'strong');
-        }
-
-        /**
-         * tag : B
-         * mode : CLOSE
-         *
-         * @param    array $param
-         * @return boolean
-         */
-        protected function _tag_close_B($param)
-        {
-            $this->parsingCss->load();
-            $this->parsingCss->fontSet();
-
-            return true;
-        }
-
-        /**
-         * tag : STRONG
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_STRONG($param)
-        {
-            return $this->_tag_close_B($param);
-        }
-
-        /**
-         * tag : I
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @param  string $other
-         * @return boolean
-         */
-        protected function _tag_open_I($param, $other = 'i')
-        {
-            $this->parsingCss->save();
-            $this->parsingCss->value['font-italic'] = true;
-            $this->parsingCss->analyse($other, $param);
-            $this->parsingCss->setPosition();
-            $this->parsingCss->fontSet();
-
-            return true;
-        }
-
-        /**
-         * tag : ADDRESS
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_ADDRESS($param)
-        {
-            return $this->_tag_open_I($param, 'address');
-        }
-
-        /**
-         * tag : CITE
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_CITE($param)
-        {
-            return $this->_tag_open_I($param, 'cite');
-        }
-
-        /**
-         * tag : EM
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_EM($param)
-        {
-            return $this->_tag_open_I($param, 'em');
-        }
-
-        /**
-         * tag : SAMP
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_SAMP($param)
-        {
-            return $this->_tag_open_I($param, 'samp');
-        }
-
-        /**
-         * tag : I
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_I($param)
-        {
-            $this->parsingCss->load();
-            $this->parsingCss->fontSet();
-
-            return true;
-        }
-
-        /**
-         * tag : ADDRESS
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_ADDRESS($param)
-        {
-            return $this->_tag_close_I($param);
-        }
-
-        /**
-         * tag : CITE
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_CITE($param)
-        {
-            return $this->_tag_close_I($param);
-        }
-
-        /**
-         * tag : EM
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_EM($param)
-        {
-            return $this->_tag_close_I($param);
-        }
-
-        /**
-         * tag : SAMP
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_SAMP($param)
-        {
-            return $this->_tag_close_I($param);
-        }
-
-        /**
-         * tag : S
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @param  string $other
-         * @return boolean
-         */
-        protected function _tag_open_S($param, $other = 's')
-        {
-            $this->parsingCss->save();
-            $this->parsingCss->value['font-linethrough'] = true;
-            $this->parsingCss->analyse($other, $param);
-            $this->parsingCss->setPosition();
-            $this->parsingCss->fontSet();
-
-            return true;
-        }
-
-        /**
-         * tag : DEL
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_DEL($param)
-        {
-            return $this->_tag_open_S($param, 'del');
-        }
-
-        /**
-         * tag : S
-         * mode : CLOSE
-         *
-         * @param    array $param
-         * @return boolean
-         */
-        protected function _tag_close_S($param)
-        {
-            $this->parsingCss->load();
-            $this->parsingCss->fontSet();
-
-            return true;
-        }
-
-        /**
-         * tag : DEL
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_DEL($param)
-        {
-            return $this->_tag_close_S($param);
-        }
-
-        /**
-         * tag : U
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @param  string $other
-         * @return boolean
-         */
-        protected function _tag_open_U($param, $other='u')
-        {
-            $this->parsingCss->save();
-            $this->parsingCss->value['font-underline'] = true;
-            $this->parsingCss->analyse($other, $param);
-            $this->parsingCss->setPosition();
-            $this->parsingCss->fontSet();
-
-            return true;
-        }
-
-        /**
-         * tag : INS
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_INS($param)
-        {
-            return $this->_tag_open_U($param, 'ins');
-        }
-
-        /**
-         * tag : U
-         * mode : CLOSE
-         *
-         * @param    array $param
-         * @return boolean
-         */
-        protected function _tag_close_U($param)
-        {
-            $this->parsingCss->load();
-            $this->parsingCss->fontSet();
-
-            return true;
-        }
-
-        /**
-         * tag : INS
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_INS($param)
-        {
-            return $this->_tag_close_U($param);
-        }
-
-        /**
-         * tag : A
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_A($param)
-        {
-            $this->_isInLink = str_replace('&amp;', '&', isset($param['href']) ? $param['href'] : '');
-
-            if (isset($param['name'])) {
-                $name =     $param['name'];
-                if (!isset($this->_lstAnchor[$name])) $this->_lstAnchor[$name] = array($this->pdf->AddLink(), false);
-
-                if (!$this->_lstAnchor[$name][1]) {
-                    $this->_lstAnchor[$name][1] = true;
-                    $this->pdf->SetLink($this->_lstAnchor[$name][0], -1, -1);
-                }
-            }
-
-            if (preg_match('/^#([^#]+)$/isU', $this->_isInLink, $match)) {
-                $name = $match[1];
-                if (!isset($this->_lstAnchor[$name])) $this->_lstAnchor[$name] = array($this->pdf->AddLink(), false);
-
-                $this->_isInLink = $this->_lstAnchor[$name][0];
-            }
-
-            $this->parsingCss->save();
-            $this->parsingCss->value['font-underline'] = true;
-            $this->parsingCss->value['color'] = array(20, 20, 250);
-            $this->parsingCss->analyse('a', $param);
-            $this->parsingCss->setPosition();
-            $this->parsingCss->fontSet();
-
-            return true;
-        }
-
-        /**
-         * tag : A
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_A($param)
-        {
-            $this->_isInLink    = '';
-            $this->parsingCss->load();
-            $this->parsingCss->fontSet();
-
-            return true;
-        }
-
-        /**
-         * tag : H1
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @param  string $other
-         * @return boolean
-         */
-        protected function _tag_open_H1($param, $other = 'h1')
-        {
-            if ($this->_isForOneLine) return false;
-
-            if ($this->_maxH) $this->_tag_open_BR(array());
-            $this->parsingCss->save();
-            $this->parsingCss->value['font-bold'] = true;
-
-            $size = array('h1' => '28px', 'h2' => '24px', 'h3' => '20px', 'h4' => '16px', 'h5' => '12px', 'h6' => '9px');
-            $this->parsingCss->value['margin']['l'] = 0;
-            $this->parsingCss->value['margin']['r'] = 0;
-            $this->parsingCss->value['margin']['t'] = $this->parsingCss->ConvertToMM('16px');
-            $this->parsingCss->value['margin']['b'] = $this->parsingCss->ConvertToMM('16px');
-            $this->parsingCss->value['font-size'] = $this->parsingCss->ConvertToMM($size[$other]);
-
-            $this->parsingCss->analyse($other, $param);
-            $this->parsingCss->setPosition();
-            $this->parsingCss->fontSet();
-            $this->_setNewPositionForNewLine();
-
-            return true;
-        }
-
-        /**
-         * tag : H2
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_H2($param)
-        {
-            return $this->_tag_open_H1($param, 'h2');
-        }
-
-        /**
-         * tag : H3
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_H3($param)
-        {
-            return $this->_tag_open_H1($param, 'h3');
-        }
-
-        /**
-         * tag : H4
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_H4($param)
-        {
-            return $this->_tag_open_H1($param, 'h4');
-        }
-
-        /**
-         * tag : H5
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_H5($param)
-        {
-            return $this->_tag_open_H1($param, 'h5');
-        }
-
-        /**
-         * tag : H6
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_H6($param)
-        {
-            return $this->_tag_open_H1($param, 'h6');
-        }
-
-        /**
-         * tag : H1
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_H1($param)
-        {
-            if ($this->_isForOneLine) return false;
-
-            $this->_maxH+= $this->parsingCss->value['margin']['b'];
-            $h = max($this->_maxH, $this->parsingCss->getLineHeight());
-
-            $this->parsingCss->load();
-            $this->parsingCss->fontSet();
-
-            $this->_makeBreakLine($h);
-            $this->_maxH = 0;
-
-            $this->_maxY = max($this->_maxY, $this->pdf->getY());
-
-            return true;
-        }
-
-        /**
-         * tag : H2
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_H2($param)
-        {
-            return $this->_tag_close_H1($param);
-        }
-
-        /**
-         * tag : H3
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_H3($param)
-        {
-            return $this->_tag_close_H1($param);
-        }
-
-        /**
-         * tag : H4
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_H4($param)
-        {
-            return $this->_tag_close_H1($param);
-        }
-
-        /**
-         * tag : H5
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_H5($param)
-        {
-            return $this->_tag_close_H1($param);
-        }
-
-        /**
-         * tag : H6
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_H6($param)
-        {
-            return $this->_tag_close_H1($param);
-        }
-
-        /**
-         * tag : SPAN
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @param  string $other
-         * @return boolean
-         */
-        protected function _tag_open_SPAN($param, $other = 'span')
-        {
-            $this->parsingCss->save();
-            $this->parsingCss->analyse($other, $param);
-            $this->parsingCss->setPosition();
-            $this->parsingCss->fontSet();
-
-            return true;
-        }
-
-        /**
-         * tag : FONT
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_FONT($param)
-        {
-            return $this->_tag_open_SPAN($param, 'font');
-        }
-
-        /**
-         * tag : LABEL
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_LABEL($param)
-        {
-            return $this->_tag_open_SPAN($param, 'label');
-        }
-
-        /**
-         * tag : SPAN
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_SPAN($param)
-        {
-            $this->parsingCss->restorePosition();
-            $this->parsingCss->load();
-            $this->parsingCss->fontSet();
-
-            return true;
-        }
-
-        /**
-         * tag : FONT
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_FONT($param)
-        {
-            return $this->_tag_close_SPAN($param);
-        }
-
-        /**
-         * tag : LABEL
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_LABEL($param)
-        {
-            return $this->_tag_close_SPAN($param);
-        }
-
-        /**
-         * tag : P
-         * mode : OPEN
-         *
-         * @param    array $param
-         * @return boolean
-         */
-        protected function _tag_open_P($param)
-        {
-            if ($this->_isForOneLine) return false;
-
-            if (!in_array($this->_previousCall, array('_tag_close_P', '_tag_close_UL'))) {
-                if ($this->_maxH) $this->_tag_open_BR(array());
-            }
-
-            $this->parsingCss->save();
-            $this->parsingCss->analyse('p', $param);
-            $this->parsingCss->setPosition();
-            $this->parsingCss->fontSet();
-
-             // cancel the effects of the setPosition
-            $this->pdf->setXY($this->pdf->getX()-$this->parsingCss->value['margin']['l'], $this->pdf->getY()-$this->parsingCss->value['margin']['t']);
-
-            list($mL, $mR) = $this->_getMargins($this->pdf->getY());
-            $mR = $this->pdf->getW()-$mR;
-            $mL+= $this->parsingCss->value['margin']['l']+$this->parsingCss->value['padding']['l'];
-            $mR+= $this->parsingCss->value['margin']['r']+$this->parsingCss->value['padding']['r'];
-            $this->_saveMargin($mL, 0, $mR);
-
-            if ($this->parsingCss->value['text-indent']>0) {
-                $y = $this->pdf->getY()+$this->parsingCss->value['margin']['t']+$this->parsingCss->value['padding']['t'];
-                $this->_pageMarges[floor($y*100)] = array($mL+$this->parsingCss->value['text-indent'], $this->pdf->getW()-$mR);
-                $y+= $this->parsingCss->getLineHeight()*0.1;
-                $this->_pageMarges[floor($y*100)] = array($mL, $this->pdf->getW()-$mR);
-            }
-            $this->_makeBreakLine($this->parsingCss->value['margin']['t']+$this->parsingCss->value['padding']['t']);
-            $this->_isInParagraph = array($mL, $mR);
-            return true;
-        }
-
-        /**
-         * tag : P
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_P($param)
-        {
-            if ($this->_isForOneLine) return false;
-
-            if ($this->_maxH) $this->_tag_open_BR(array());
-            $this->_isInParagraph = false;
-            $this->_loadMargin();
-            $h = $this->parsingCss->value['margin']['b']+$this->parsingCss->value['padding']['b'];
-
-            $this->parsingCss->load();
-            $this->parsingCss->fontSet();
-            $this->_makeBreakLine($h);
-
-            return true;
-        }
-
-        /**
-         * tag : PRE
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @param  string $other
-         * @return boolean
-         */
-        protected function _tag_open_PRE($param, $other = 'pre')
-        {
-            if ($other=='pre' && $this->_maxH) $this->_tag_open_BR(array());
-
-            $this->parsingCss->save();
-            $this->parsingCss->value['font-family'] = 'courier';
-            $this->parsingCss->analyse($other, $param);
-            $this->parsingCss->setPosition();
-            $this->parsingCss->fontSet();
-
-            if ($other=='pre') return $this->_tag_open_DIV($param, $other);
-
-            return true;
-        }
-
-        /**
-         * tag : CODE
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @param  string $other
-         * @return boolean
-         */
-        protected function _tag_open_CODE($param)
-        {
-            return $this->_tag_open_PRE($param, 'code');
-        }
-
-        /**
-         * tag : PRE
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @param  string $other
-         * @return boolean
-         */
-        protected function _tag_close_PRE($param, $other = 'pre')
-        {
-            if ($other=='pre') {
-                if ($this->_isForOneLine) return false;
-
-                $this->_tag_close_DIV($param, $other);
-                $this->_tag_open_BR(array());
-            }
-            $this->parsingCss->load();
-            $this->parsingCss->fontSet();
-
-            return true;
-        }
-
-        /**
-         * tag : CODE
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_CODE($param)
-        {
-            return $this->_tag_close_PRE($param, 'code');
-        }
-
-        /**
-         * tag : BIG
-         * mode : OPEN
-         *
-         * @param    array $param
-         * @return boolean
-         */
-        protected function _tag_open_BIG($param)
-        {
-            $this->parsingCss->save();
-            $this->parsingCss->value['mini-decal']-= $this->parsingCss->value['mini-size']*0.12;
-            $this->parsingCss->value['mini-size'] *= 1.2;
-            $this->parsingCss->analyse('big', $param);
-            $this->parsingCss->setPosition();
-            $this->parsingCss->fontSet();
-            return true;
-        }
-
-        /**
-         * tag : BIG
-         * mode : CLOSE
-         *
-         * @param    array $param
-         * @return boolean
-         */
-        protected function _tag_close_BIG($param)
-        {
-            $this->parsingCss->load();
-            $this->parsingCss->fontSet();
-
-            return true;
-        }
-
-        /**
-         * tag : SMALL
-         * mode : OPEN
-         *
-         * @param    array $param
-         * @return boolean
-         */
-        protected function _tag_open_SMALL($param)
-        {
-            $this->parsingCss->save();
-            $this->parsingCss->value['mini-decal']+= $this->parsingCss->value['mini-size']*0.05;
-            $this->parsingCss->value['mini-size'] *= 0.82;
-            $this->parsingCss->analyse('small', $param);
-            $this->parsingCss->setPosition();
-            $this->parsingCss->fontSet();
-            return true;
-        }
-
-        /**
-         * tag : SMALL
-         * mode : CLOSE
-         *
-         * @param    array $param
-         * @return boolean
-         */
-        protected function _tag_close_SMALL($param)
-        {
-            $this->parsingCss->load();
-            $this->parsingCss->fontSet();
-
-            return true;
-        }
-
-        /**
-         * tag : SUP
-         * mode : OPEN
-         *
-         * @param    array $param
-         * @return boolean
-         */
-        protected function _tag_open_SUP($param)
-        {
-            $this->parsingCss->save();
-            $this->parsingCss->value['mini-decal']-= $this->parsingCss->value['mini-size']*0.15;
-            $this->parsingCss->value['mini-size'] *= 0.75;
-            $this->parsingCss->analyse('sup', $param);
-            $this->parsingCss->setPosition();
-            $this->parsingCss->fontSet();
-
-            return true;
-        }
-
-        /**
-         * tag : SUP
-         * mode : CLOSE
-         *
-         * @param    array $param
-         * @return boolean
-         */
-        protected function _tag_close_SUP($param)
-        {
-            $this->parsingCss->load();
-            $this->parsingCss->fontSet();
-
-            return true;
-        }
-
-        /**
-         * tag : SUB
-         * mode : OPEN
-         *
-         * @param    array $param
-         * @return boolean
-         */
-        protected function _tag_open_SUB($param)
-        {
-            $this->parsingCss->save();
-            $this->parsingCss->value['mini-decal']+= $this->parsingCss->value['mini-size']*0.15;
-            $this->parsingCss->value['mini-size'] *= 0.75;
-            $this->parsingCss->analyse('sub', $param);
-            $this->parsingCss->setPosition();
-            $this->parsingCss->fontSet();
-            return true;
-        }
-
-        /**
-         * tag : SUB
-         * mode : CLOSE
-         *
-         * @param    array $param
-         * @return boolean
-         */
-        protected function _tag_close_SUB($param)
-        {
-            $this->parsingCss->load();
-            $this->parsingCss->fontSet();
-
-            return true;
-        }
-
-        /**
-         * tag : UL
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @param  string $other
-         * @return boolean
-         */
-        protected function _tag_open_UL($param, $other = 'ul')
-        {
-            if ($this->_isForOneLine) return false;
-
-            if (!in_array($this->_previousCall, array('_tag_close_P', '_tag_close_UL'))) {
-                if ($this->_maxH) $this->_tag_open_BR(array());
-                if (!count($this->_defList)) $this->_tag_open_BR(array());
-            }
-
-            if (!isset($param['style']['width'])) $param['allwidth'] = true;
-            $param['cellspacing'] = 0;
-
-            // a list is like a table
-            $this->_tag_open_TABLE($param, $other);
-
-            // add a level of list
-            $this->_listeAddLevel($other, $this->parsingCss->value['list-style-type'], $this->parsingCss->value['list-style-image']);
-
-            return true;
-        }
-
-        /**
-         * tag : OL
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_OL($param)
-        {
-            return $this->_tag_open_UL($param, 'ol');
-        }
-
-        /**
-         * tag : UL
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_UL($param)
-        {
-            if ($this->_isForOneLine) return false;
-
-            $this->_tag_close_TABLE($param);
-
-            $this->_listeDelLevel();
-
-            if (!$this->_subPart) {
-                if (!count($this->_defList)) $this->_tag_open_BR(array());
-            }
-
-            return true;
-        }
-
-        /**
-         * tag : OL
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_OL($param)
-        {
-            return $this->_tag_close_UL($param);
-        }
-
-        /**
-         * tag : LI
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_LI($param)
-        {
-            if ($this->_isForOneLine) return false;
-
-            $this->_listeAddLi();
-
-            if (!isset($param['style']['width'])) $param['style']['width'] = '100%';
-
-            $paramPUCE = $param;
-
-            $inf = $this->_listeGetLi();
-            if ($inf[0]) {
-                $paramPUCE['style']['font-family']     = $inf[0];
-                $paramPUCE['style']['text-align']      = 'li_right';
-                $paramPUCE['style']['vertical-align']  = 'top';
-                $paramPUCE['style']['width']           = $this->_listeGetWidth();
-                $paramPUCE['style']['padding-right']   = $this->_listeGetPadding();
-                $paramPUCE['txt'] = $inf[2];
-            } else {
-                $paramPUCE['style']['text-align']      = 'li_right';
-                $paramPUCE['style']['vertical-align']  = 'top';
-                $paramPUCE['style']['width']           = $this->_listeGetWidth();
-                $paramPUCE['style']['padding-right']   = $this->_listeGetPadding();
-                $paramPUCE['src'] = $inf[2];
-                $paramPUCE['sub_li'] = true;
-            }
-
-            $this->_tag_open_TR($param, 'li');
-
-            $this->parsingCss->save();
-
-            // if small LI
-            if ($inf[1]) {
-                $this->parsingCss->value['mini-decal']+= $this->parsingCss->value['mini-size']*0.045;
-                $this->parsingCss->value['mini-size'] *= 0.75;
-            }
-
-            // if we are in a sub html => prepare. Else : display
-            if ($this->_subPart) {
-                // TD for the puce
-                $tmpPos = $this->_tempPos;
-                $tmpLst1 = $this->parsingHtml->code[$tmpPos+1];
-                $tmpLst2 = $this->parsingHtml->code[$tmpPos+2];
-                $this->parsingHtml->code[$tmpPos+1] = array();
-                $this->parsingHtml->code[$tmpPos+1]['name']    = (isset($paramPUCE['src'])) ? 'img' : 'write';
-                $this->parsingHtml->code[$tmpPos+1]['param']    = $paramPUCE; unset($this->parsingHtml->code[$tmpPos+1]['param']['style']['width']);
-                $this->parsingHtml->code[$tmpPos+1]['close']    = 0;
-                $this->parsingHtml->code[$tmpPos+2] = array();
-                $this->parsingHtml->code[$tmpPos+2]['name']    = 'li';
-                $this->parsingHtml->code[$tmpPos+2]['param']    = $paramPUCE;
-                $this->parsingHtml->code[$tmpPos+2]['close']    = 1;
-                $this->_tag_open_TD($paramPUCE, 'li_sub');
-                $this->_tag_close_TD($param);
-                $this->_tempPos = $tmpPos;
-                $this->parsingHtml->code[$tmpPos+1] = $tmpLst1;
-                $this->parsingHtml->code[$tmpPos+2] = $tmpLst2;
-            } else {
-                // TD for the puce
-                $this->_tag_open_TD($paramPUCE, 'li_sub');
-                unset($paramPUCE['style']['width']);
-                if (isset($paramPUCE['src']))    $this->_tag_open_IMG($paramPUCE);
-                else                            $this->_tag_open_WRITE($paramPUCE);
-                $this->_tag_close_TD($paramPUCE);
-            }
-            $this->parsingCss->load();
-
-
-            // TD for the content
-            $this->_tag_open_TD($param, 'li');
-
-            return true;
-        }
-
-        /**
-         * tag : LI
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_LI($param)
-        {
-            if ($this->_isForOneLine) return false;
-
-            $this->_tag_close_TD($param);
-
-            $this->_tag_close_TR($param);
-
-            return true;
-        }
-
-        /**
-         * tag : TBODY
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_TBODY($param)
-        {
-            if ($this->_isForOneLine) return false;
-
-            $this->parsingCss->save();
-            $this->parsingCss->analyse('tbody', $param);
-            $this->parsingCss->setPosition();
-            $this->parsingCss->fontSet();
-
-            return true;
-        }
-
-        /**
-         * tag : TBODY
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_TBODY($param)
-        {
-            if ($this->_isForOneLine) return false;
-
-            $this->parsingCss->load();
-            $this->parsingCss->fontSet();
-
-            return true;
-        }
-
-        /**
-         * tag : THEAD
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_THEAD($param)
-        {
-            if ($this->_isForOneLine) return false;
-
-            $this->parsingCss->save();
-            $this->parsingCss->analyse('thead', $param);
-            $this->parsingCss->setPosition();
-            $this->parsingCss->fontSet();
-
-            // if we are in a sub part, save the number of the first TR in the thead
-            if ($this->_subPart) {
-                HTML2PDF::$_tables[$param['num']]['thead']['tr'][0] = HTML2PDF::$_tables[$param['num']]['tr_curr'];
-                HTML2PDF::$_tables[$param['num']]['thead']['code'] = array();
-                for ($pos=$this->_tempPos; $pos<count($this->parsingHtml->code); $pos++) {
-                    $action = $this->parsingHtml->code[$pos];
-                    if (strtolower($action['name'])=='thead') $action['name'] = 'thead_sub';
-                    HTML2PDF::$_tables[$param['num']]['thead']['code'][] = $action;
-                    if (strtolower($action['name'])=='thead_sub' && $action['close']) break;
-                }
-            } else {
-                $level = $this->parsingHtml->getLevel($this->_parsePos);
-                $this->_parsePos+= count($level);
-                HTML2PDF::$_tables[$param['num']]['tr_curr']+= count(HTML2PDF::$_tables[$param['num']]['thead']['tr']);
-            }
-
-            return true;
-        }
-
-        /**
-         * tag : THEAD
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_THEAD($param)
-        {
-            if ($this->_isForOneLine) return false;
-
-            $this->parsingCss->load();
-            $this->parsingCss->fontSet();
-
-            // if we are in a sub HTM, construct the list of the TR in the thead
-            if ($this->_subPart) {
-                $min = HTML2PDF::$_tables[$param['num']]['thead']['tr'][0];
-                $max = HTML2PDF::$_tables[$param['num']]['tr_curr']-1;
-                HTML2PDF::$_tables[$param['num']]['thead']['tr'] = range($min, $max);
-            }
-
-            return true;
-        }
-
-        /**
-         * tag : TFOOT
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_TFOOT($param)
-        {
-            if ($this->_isForOneLine) return false;
-
-            $this->parsingCss->save();
-            $this->parsingCss->analyse('tfoot', $param);
-            $this->parsingCss->setPosition();
-            $this->parsingCss->fontSet();
-
-            // if we are in a sub part, save the number of the first TR in the tfoot
-            if ($this->_subPart) {
-                HTML2PDF::$_tables[$param['num']]['tfoot']['tr'][0] = HTML2PDF::$_tables[$param['num']]['tr_curr'];
-                HTML2PDF::$_tables[$param['num']]['tfoot']['code'] = array();
-                for ($pos=$this->_tempPos; $pos<count($this->parsingHtml->code); $pos++) {
-                    $action = $this->parsingHtml->code[$pos];
-                    if (strtolower($action['name'])=='tfoot') $action['name'] = 'tfoot_sub';
-                    HTML2PDF::$_tables[$param['num']]['tfoot']['code'][] = $action;
-                    if (strtolower($action['name'])=='tfoot_sub' && $action['close']) break;
-                }
-            } else {
-                $level = $this->parsingHtml->getLevel($this->_parsePos);
-                $this->_parsePos+= count($level);
-                HTML2PDF::$_tables[$param['num']]['tr_curr']+= count(HTML2PDF::$_tables[$param['num']]['tfoot']['tr']);
-            }
-
-            return true;
-        }
-
-        /**
-         * tag : TFOOT
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_TFOOT($param)
-        {
-            if ($this->_isForOneLine) return false;
-
-            $this->parsingCss->load();
-            $this->parsingCss->fontSet();
-
-            // if we are in a sub HTM, construct the list of the TR in the tfoot
-            if ($this->_subPart) {
-                $min = HTML2PDF::$_tables[$param['num']]['tfoot']['tr'][0];
-                $max = HTML2PDF::$_tables[$param['num']]['tr_curr']-1;
-                HTML2PDF::$_tables[$param['num']]['tfoot']['tr'] = range($min, $max);
-            }
-
-            return true;
-        }
-
-        /**
-         * It is not a real TAG, does not use it !
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_THEAD_SUB($param)
-        {
-            if ($this->_isForOneLine) return false;
-
-            $this->parsingCss->save();
-            $this->parsingCss->analyse('thead', $param);
-            $this->parsingCss->setPosition();
-            $this->parsingCss->fontSet();
-
-            return true;
-        }
-
-        /**
-         * It is not a real TAG, does not use it !
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_THEAD_SUB($param)
-        {
-            if ($this->_isForOneLine) return false;
-
-            $this->parsingCss->load();
-            $this->parsingCss->fontSet();
-
-            return true;
-        }
-
-        /**
-         * It is not a real TAG, does not use it !
-         *
-         * @param    array $param
-         * @return boolean
-         */
-        protected function _tag_open_TFOOT_SUB($param)
-        {
-            if ($this->_isForOneLine) return false;
-
-            $this->parsingCss->save();
-            $this->parsingCss->analyse('tfoot', $param);
-            $this->parsingCss->setPosition();
-            $this->parsingCss->fontSet();
-
-            return true;
-        }
-
-        /**
-         * It is not a real TAG, does not use it !
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_TFOOT_SUB($param)
-        {
-            if ($this->_isForOneLine) return false;
-
-            $this->parsingCss->load();
-            $this->parsingCss->fontSet();
-
-            return true;
-        }
-
-        /**
-         * tag : FORM
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_FORM($param)
-        {
-            $this->parsingCss->save();
-            $this->parsingCss->analyse('form', $param);
-            $this->parsingCss->setPosition();
-            $this->parsingCss->fontSet();
-
-            $this->pdf->setFormDefaultProp(
-                array(
-                    'lineWidth'=>1,
-                    'borderStyle'=>'solid',
-                    'fillColor'=>array(220, 220, 255),
-                    'strokeColor'=>array(128, 128, 200)
-                )
-            );
-
-            $this->_isInForm = isset($param['action']) ? $param['action'] : '';
-
-            return true;
-        }
-
-        /**
-         * tag : FORM
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_FORM($param)
-        {
-            $this->_isInForm = false;
-            $this->parsingCss->load();
-            $this->parsingCss->fontSet();
-
-            return true;
-        }
-
-        /**
-         * tag : TABLE
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_TABLE($param, $other = 'table')
-        {
-            if ($this->_maxH) {
-                if ($this->_isForOneLine) return false;
-                $this->_tag_open_BR(array());
-            }
-
-            if ($this->_isForOneLine) {
-                $this->_maxX = $this->pdf->getW() - $this->pdf->getlMargin() - $this->pdf->getrMargin();
-                return false;
-            }
-
-            $this->_maxH = 0;
-
-            $alignObject = isset($param['align']) ? strtolower($param['align']) : 'left';
-            if (isset($param['align'])) unset($param['align']);
-            if (!in_array($alignObject, array('left', 'center', 'right'))) $alignObject = 'left';
-
-            $this->parsingCss->save();
-            $this->parsingCss->analyse($other, $param);
-            $this->parsingCss->setPosition();
-            $this->parsingCss->fontSet();
-
-            if ($this->parsingCss->value['margin-auto']) $alignObject = 'center';
-
-            // collapse table ?
-            $collapse = false;
-            if ($other=='table') {
-                $collapse = isset($this->parsingCss->value['border']['collapse']) ? $this->parsingCss->value['border']['collapse'] : false;
-            }
-
-            // if collapse => no borders for the table, only for TD
-            if ($collapse) {
-                $param['style']['border'] = 'none';
-                $param['cellspacing'] = 0;
-                $none = $this->parsingCss->readBorder('none');
-                $this->parsingCss->value['border']['t'] = $none;
-                $this->parsingCss->value['border']['r'] = $none;
-                $this->parsingCss->value['border']['b'] = $none;
-                $this->parsingCss->value['border']['l'] = $none;
-            }
-
-            // if we are in a SUB html => prepare the properties of the table
-            if ($this->_subPart) {
-                if ($this->_debugActif) $this->_DEBUG_add('Table n'.$param['num'], true);
-                HTML2PDF::$_tables[$param['num']] = array();
-                HTML2PDF::$_tables[$param['num']]['border']          = isset($param['border']) ? $this->parsingCss->readBorder($param['border']) : null;
-                HTML2PDF::$_tables[$param['num']]['cellpadding']     = $this->parsingCss->ConvertToMM(isset($param['cellpadding']) ? $param['cellpadding'] : '1px');
-                HTML2PDF::$_tables[$param['num']]['cellspacing']     = $this->parsingCss->ConvertToMM(isset($param['cellspacing']) ? $param['cellspacing'] : '2px');
-                HTML2PDF::$_tables[$param['num']]['cases']           = array();          // properties of each TR/TD
-                HTML2PDF::$_tables[$param['num']]['corr']            = array();          // link between TR/TD and colspan/rowspan
-                HTML2PDF::$_tables[$param['num']]['corr_x']          = 0;                // position in 'cases'
-                HTML2PDF::$_tables[$param['num']]['corr_y']          = 0;                // position in 'cases'
-                HTML2PDF::$_tables[$param['num']]['td_curr']         = 0;                // current column
-                HTML2PDF::$_tables[$param['num']]['tr_curr']         = 0;                // current row
-                HTML2PDF::$_tables[$param['num']]['curr_x']          = $this->pdf->getX();
-                HTML2PDF::$_tables[$param['num']]['curr_y']          = $this->pdf->getY();
-                HTML2PDF::$_tables[$param['num']]['width']           = 0;                // global width
-                HTML2PDF::$_tables[$param['num']]['height']          = 0;                // global height
-                HTML2PDF::$_tables[$param['num']]['align']           = $alignObject;
-                HTML2PDF::$_tables[$param['num']]['marge']           = array();
-                HTML2PDF::$_tables[$param['num']]['marge']['t']      = $this->parsingCss->value['padding']['t']+$this->parsingCss->value['border']['t']['width']+HTML2PDF::$_tables[$param['num']]['cellspacing']*0.5;
-                HTML2PDF::$_tables[$param['num']]['marge']['r']      = $this->parsingCss->value['padding']['r']+$this->parsingCss->value['border']['r']['width']+HTML2PDF::$_tables[$param['num']]['cellspacing']*0.5;
-                HTML2PDF::$_tables[$param['num']]['marge']['b']      = $this->parsingCss->value['padding']['b']+$this->parsingCss->value['border']['b']['width']+HTML2PDF::$_tables[$param['num']]['cellspacing']*0.5;
-                HTML2PDF::$_tables[$param['num']]['marge']['l']      = $this->parsingCss->value['padding']['l']+$this->parsingCss->value['border']['l']['width']+HTML2PDF::$_tables[$param['num']]['cellspacing']*0.5;
-                HTML2PDF::$_tables[$param['num']]['page']            = 0;                // number of pages
-                HTML2PDF::$_tables[$param['num']]['new_page']        = true;             // flag : new page for the current TR
-                HTML2PDF::$_tables[$param['num']]['style_value']     = null;             // CSS style of the table
-                HTML2PDF::$_tables[$param['num']]['thead']           = array();          // properties on the thead
-                HTML2PDF::$_tables[$param['num']]['tfoot']           = array();          // properties on the tfoot
-                HTML2PDF::$_tables[$param['num']]['thead']['tr']     = array();          // list of the TRs in the thead
-                HTML2PDF::$_tables[$param['num']]['tfoot']['tr']     = array();          // list of the TRs in the tfoot
-                HTML2PDF::$_tables[$param['num']]['thead']['height']    = 0;             // thead height
-                HTML2PDF::$_tables[$param['num']]['tfoot']['height']    = 0;             // tfoot height
-                HTML2PDF::$_tables[$param['num']]['thead']['code'] = array();            // HTML content of the thead
-                HTML2PDF::$_tables[$param['num']]['tfoot']['code'] = array();            // HTML content of the tfoot
-                HTML2PDF::$_tables[$param['num']]['cols']        = array();              // properties of the COLs
-
-                $this->_saveMargin($this->pdf->getlMargin(), $this->pdf->gettMargin(), $this->pdf->getrMargin());
-
-                $this->parsingCss->value['width']-= HTML2PDF::$_tables[$param['num']]['marge']['l'] + HTML2PDF::$_tables[$param['num']]['marge']['r'];
-            } else {
-                // we start from the first page and the first page of the table
-                HTML2PDF::$_tables[$param['num']]['page'] = 0;
-                HTML2PDF::$_tables[$param['num']]['td_curr']    = 0;
-                HTML2PDF::$_tables[$param['num']]['tr_curr']    = 0;
-                HTML2PDF::$_tables[$param['num']]['td_x']        = HTML2PDF::$_tables[$param['num']]['marge']['l']+HTML2PDF::$_tables[$param['num']]['curr_x'];
-                HTML2PDF::$_tables[$param['num']]['td_y']        = HTML2PDF::$_tables[$param['num']]['marge']['t']+HTML2PDF::$_tables[$param['num']]['curr_y'];
-
-                // draw the borders/background of the first page/part of the table
-                $this->_drawRectangle(
-                    HTML2PDF::$_tables[$param['num']]['curr_x'],
-                    HTML2PDF::$_tables[$param['num']]['curr_y'],
-                    HTML2PDF::$_tables[$param['num']]['width'],
-                    isset(HTML2PDF::$_tables[$param['num']]['height'][0]) ? HTML2PDF::$_tables[$param['num']]['height'][0] : null,
-                    $this->parsingCss->value['border'],
-                    $this->parsingCss->value['padding'],
-                    0,
-                    $this->parsingCss->value['background']
-                );
-
-                HTML2PDF::$_tables[$param['num']]['style_value'] = $this->parsingCss->value;
-            }
-
-            return true;
-        }
-
-        /**
-         * tag : TABLE
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_TABLE($param)
-        {
-            if ($this->_isForOneLine) return false;
-
-            $this->_maxH = 0;
-
-            // if we are in a sub HTML
-            if ($this->_subPart) {
-                // calculate the size of each case
-                $this->_calculateTableCellSize(HTML2PDF::$_tables[$param['num']]['cases'], HTML2PDF::$_tables[$param['num']]['corr']);
-
-                // calculate the height of the thead and the tfoot
-                $lst = array('thead', 'tfoot');
-                foreach ($lst as $mode) {
-                    HTML2PDF::$_tables[$param['num']][$mode]['height'] = 0;
-                    foreach (HTML2PDF::$_tables[$param['num']][$mode]['tr'] as $tr) {
-                        // hauteur de la ligne tr
-                        $h = 0;
-                        for ($i=0; $i<count(HTML2PDF::$_tables[$param['num']]['cases'][$tr]); $i++)
-                            if (HTML2PDF::$_tables[$param['num']]['cases'][$tr][$i]['rowspan']==1)
-                                $h = max($h, HTML2PDF::$_tables[$param['num']]['cases'][$tr][$i]['h']);
-                        HTML2PDF::$_tables[$param['num']][$mode]['height']+= $h;
-                    }
-                }
-
-                // calculate the width of the table
-                HTML2PDF::$_tables[$param['num']]['width'] = HTML2PDF::$_tables[$param['num']]['marge']['l'] + HTML2PDF::$_tables[$param['num']]['marge']['r'];
-                if (isset(HTML2PDF::$_tables[$param['num']]['cases'][0])) {
-                    foreach (HTML2PDF::$_tables[$param['num']]['cases'][0] as $case) {
-                        HTML2PDF::$_tables[$param['num']]['width']+= $case['w'];
-                    }
-                }
-
-                // X position of the table
-                $old = $this->parsingCss->getOldValues();
-                $parentWidth = $old['width'] ? $old['width'] : $this->pdf->getW() - $this->pdf->getlMargin() - $this->pdf->getrMargin();
-                $x = HTML2PDF::$_tables[$param['num']]['curr_x'];
-                $w = HTML2PDF::$_tables[$param['num']]['width'];
-                if ($parentWidth>$w) {
-                    if (HTML2PDF::$_tables[$param['num']]['align']=='center')
-                        $x = $x + ($parentWidth-$w)*0.5;
-                    else if (HTML2PDF::$_tables[$param['num']]['align']=='right')
-                        $x = $x + $parentWidth-$w;
-
-                    HTML2PDF::$_tables[$param['num']]['curr_x'] = $x;
-                }
-
-                // calculate the height of the table
-                HTML2PDF::$_tables[$param['num']]['height'] = array();
-
-                // minimum of the height because of margins, and of the thead and tfoot height
-                $h0 = HTML2PDF::$_tables[$param['num']]['marge']['t'] + HTML2PDF::$_tables[$param['num']]['marge']['b'];
-                $h0+= HTML2PDF::$_tables[$param['num']]['thead']['height'] + HTML2PDF::$_tables[$param['num']]['tfoot']['height'];
-
-                // max height of the page
-                $max = $this->pdf->getH() - $this->pdf->getbMargin();
-
-                // current position on the page
-                $y = HTML2PDF::$_tables[$param['num']]['curr_y'];
-                $height = $h0;
-
-                // we get the height of each line
-                for ($k=0; $k<count(HTML2PDF::$_tables[$param['num']]['cases']); $k++) {
-
-                    // if it is a TR of the thead or of the tfoot => skip
-                    if (in_array($k, HTML2PDF::$_tables[$param['num']]['thead']['tr'])) continue;
-                    if (in_array($k, HTML2PDF::$_tables[$param['num']]['tfoot']['tr'])) continue;
-
-                    // height of the line
-                    $th = 0;
-                    $h = 0;
-                    for ($i=0; $i<count(HTML2PDF::$_tables[$param['num']]['cases'][$k]); $i++) {
-                        $h = max($h, HTML2PDF::$_tables[$param['num']]['cases'][$k][$i]['h']);
-
-                        if (HTML2PDF::$_tables[$param['num']]['cases'][$k][$i]['rowspan']==1)
-                            $th = max($th, HTML2PDF::$_tables[$param['num']]['cases'][$k][$i]['h']);
-                    }
-
-                    // if the row does not fit on the page => new page
-                    if ($y+$h+$height>$max) {
-                        if ($height==$h0) $height = null;
-                        HTML2PDF::$_tables[$param['num']]['height'][] = $height;
-                        $height = $h0;
-                        $y = $this->_margeTop;
-                    }
-                    $height+= $th;
-                }
-
-                // if ther is a height at the end, add it
-                if ($height!=$h0 || $k==0) HTML2PDF::$_tables[$param['num']]['height'][] = $height;
-            } else {
-                // if we have tfoor, draw it
-                if (count(HTML2PDF::$_tables[$param['num']]['tfoot']['code'])) {
-                    $tmpTR = HTML2PDF::$_tables[$param['num']]['tr_curr'];
-                    $tmpTD = HTML2PDF::$_tables[$param['num']]['td_curr'];
-                    $oldParsePos = $this->_parsePos;
-                    $oldParseCode = $this->parsingHtml->code;
-
-                    HTML2PDF::$_tables[$param['num']]['tr_curr'] = HTML2PDF::$_tables[$param['num']]['tfoot']['tr'][0];
-                    HTML2PDF::$_tables[$param['num']]['td_curr'] = 0;
-                    $this->_parsePos = 0;
-                    $this->parsingHtml->code = HTML2PDF::$_tables[$param['num']]['tfoot']['code'];
-                    $this->_isInTfoot = true;
-                    $this->_makeHTMLcode();
-                    $this->_isInTfoot = false;
-
-                    $this->_parsePos =     $oldParsePos;
-                    $this->parsingHtml->code = $oldParseCode;
-                    HTML2PDF::$_tables[$param['num']]['tr_curr'] = $tmpTR;
-                    HTML2PDF::$_tables[$param['num']]['td_curr'] = $tmpTD;
-                }
-
-                // get the positions of the end of the table
-                $x = HTML2PDF::$_tables[$param['num']]['curr_x'] + HTML2PDF::$_tables[$param['num']]['width'];
-                if (count(HTML2PDF::$_tables[$param['num']]['height'])>1)
-                    $y = $this->_margeTop+HTML2PDF::$_tables[$param['num']]['height'][count(HTML2PDF::$_tables[$param['num']]['height'])-1];
-                else if (count(HTML2PDF::$_tables[$param['num']]['height'])==1)
-                    $y = HTML2PDF::$_tables[$param['num']]['curr_y']+HTML2PDF::$_tables[$param['num']]['height'][count(HTML2PDF::$_tables[$param['num']]['height'])-1];
-                else
-                    $y = HTML2PDF::$_tables[$param['num']]['curr_y'];
-
-                $this->_maxX = max($this->_maxX, $x);
-                $this->_maxY = max($this->_maxY, $y);
-
-                $this->pdf->setXY($this->pdf->getlMargin(), $y);
-
-                $this->_loadMargin();
-
-                if ($this->_debugActif) $this->_DEBUG_add('Table '.$param['num'], false);
-            }
-
-            $this->parsingCss->load();
-            $this->parsingCss->fontSet();
-
-
-            return true;
-        }
-
-        /**
-         * tag : COL
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_COL($param)
-        {
-            $span = isset($param['span']) ? $param['span'] : 1;
-            for ($k=0; $k<$span; $k++)
-                HTML2PDF::$_tables[$param['num']]['cols'][] = $param;
-        }
-
-        /**
-         * tag : COL
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_COL($param)
-        {
-            // there is nothing to do here
-
-            return true;
-        }
-
-        /**
-         * tag : TR
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_TR($param, $other = 'tr')
-        {
-            if ($this->_isForOneLine) return false;
-
-            $this->_maxH = 0;
-
-            $this->parsingCss->save();
-            $this->parsingCss->analyse($other, $param);
-            $this->parsingCss->setPosition();
-            $this->parsingCss->fontSet();
-
-            // position in the table
-            HTML2PDF::$_tables[$param['num']]['tr_curr']++;
-            HTML2PDF::$_tables[$param['num']]['td_curr']= 0;
-
-            // if we are not in a sub html
-            if (!$this->_subPart) {
-
-                // Y after the row
-                $ty=null;
-                for ($ii=0; $ii<count(HTML2PDF::$_tables[$param['num']]['cases'][HTML2PDF::$_tables[$param['num']]['tr_curr']-1]); $ii++) {
-                    $ty = max($ty, HTML2PDF::$_tables[$param['num']]['cases'][HTML2PDF::$_tables[$param['num']]['tr_curr']-1][$ii]['h']);
-                }
-
-                // height of the tfoot
-                $hfoot = HTML2PDF::$_tables[$param['num']]['tfoot']['height'];
-
-                // if the line does not fit on the page => new page
-                if (!$this->_isInTfoot && HTML2PDF::$_tables[$param['num']]['td_y'] + HTML2PDF::$_tables[$param['num']]['marge']['b'] + $ty +$hfoot> $this->pdf->getH() - $this->pdf->getbMargin()) {
-
-                    // fi ther is a tfoot => draw it
-                    if (count(HTML2PDF::$_tables[$param['num']]['tfoot']['code'])) {
-                        $tmpTR = HTML2PDF::$_tables[$param['num']]['tr_curr'];
-                        $tmpTD = HTML2PDF::$_tables[$param['num']]['td_curr'];
-                        $oldParsePos = $this->_parsePos;
-                        $oldParseCode = $this->parsingHtml->code;
-
-                        HTML2PDF::$_tables[$param['num']]['tr_curr'] = HTML2PDF::$_tables[$param['num']]['tfoot']['tr'][0];
-                        HTML2PDF::$_tables[$param['num']]['td_curr'] = 0;
-                        $this->_parsePos = 0;
-                        $this->parsingHtml->code = HTML2PDF::$_tables[$param['num']]['tfoot']['code'];
-                        $this->_isInTfoot = true;
-                        $this->_makeHTMLcode();
-                        $this->_isInTfoot = false;
-
-                        $this->_parsePos =     $oldParsePos;
-                        $this->parsingHtml->code = $oldParseCode;
-                        HTML2PDF::$_tables[$param['num']]['tr_curr'] = $tmpTR;
-                        HTML2PDF::$_tables[$param['num']]['td_curr'] = $tmpTD;
-                    }
-
-                    // new page
-                    HTML2PDF::$_tables[$param['num']]['new_page'] = true;
-                    $this->_setNewPage();
-
-                    // new position
-                    HTML2PDF::$_tables[$param['num']]['page']++;
-                    HTML2PDF::$_tables[$param['num']]['curr_y'] = $this->pdf->getY();
-                    HTML2PDF::$_tables[$param['num']]['td_y'] = HTML2PDF::$_tables[$param['num']]['curr_y']+HTML2PDF::$_tables[$param['num']]['marge']['t'];
-
-                    // if we have the height of the tbale on the page => draw borders and background
-                    if (isset(HTML2PDF::$_tables[$param['num']]['height'][HTML2PDF::$_tables[$param['num']]['page']])) {
-                        $old = $this->parsingCss->value;
-                        $this->parsingCss->value = HTML2PDF::$_tables[$param['num']]['style_value'];
-
-                        $this->_drawRectangle(
-                            HTML2PDF::$_tables[$param['num']]['curr_x'],
-                            HTML2PDF::$_tables[$param['num']]['curr_y'],
-                            HTML2PDF::$_tables[$param['num']]['width'],
-                            HTML2PDF::$_tables[$param['num']]['height'][HTML2PDF::$_tables[$param['num']]['page']],
-                            $this->parsingCss->value['border'],
-                            $this->parsingCss->value['padding'],
-                            HTML2PDF::$_tables[$param['num']]['cellspacing']*0.5,
-                            $this->parsingCss->value['background']
-                        );
-
-                        $this->parsingCss->value = $old;
-                    }
-                }
-
-                // if we are in a new page, and if we have a thead => draw it
-                if (HTML2PDF::$_tables[$param['num']]['new_page'] && count(HTML2PDF::$_tables[$param['num']]['thead']['code'])) {
-                    HTML2PDF::$_tables[$param['num']]['new_page'] = false;
-                    $tmpTR = HTML2PDF::$_tables[$param['num']]['tr_curr'];
-                    $tmpTD = HTML2PDF::$_tables[$param['num']]['td_curr'];
-                    $oldParsePos = $this->_parsePos;
-                    $oldParseCode = $this->parsingHtml->code;
-
-                    HTML2PDF::$_tables[$param['num']]['tr_curr'] = HTML2PDF::$_tables[$param['num']]['thead']['tr'][0];
-                    HTML2PDF::$_tables[$param['num']]['td_curr'] = 0;
-                    $this->_parsePos = 0;
-                    $this->parsingHtml->code = HTML2PDF::$_tables[$param['num']]['thead']['code'];
-                    $this->_isInThead = true;
-                    $this->_makeHTMLcode();
-                    $this->_isInThead = false;
-
-                    $this->_parsePos =     $oldParsePos;
-                    $this->parsingHtml->code = $oldParseCode;
-                    HTML2PDF::$_tables[$param['num']]['tr_curr'] = $tmpTR;
-                    HTML2PDF::$_tables[$param['num']]['td_curr'] = $tmpTD;
-                    HTML2PDF::$_tables[$param['num']]['new_page'] = true;
-                }
-            // else (in a sub HTML)
-            } else {
-                // prepare it
-                HTML2PDF::$_tables[$param['num']]['cases'][HTML2PDF::$_tables[$param['num']]['tr_curr']-1] = array();
-                if (!isset(HTML2PDF::$_tables[$param['num']]['corr'][HTML2PDF::$_tables[$param['num']]['corr_y']]))
-                    HTML2PDF::$_tables[$param['num']]['corr'][HTML2PDF::$_tables[$param['num']]['corr_y']] = array();
-
-                HTML2PDF::$_tables[$param['num']]['corr_x']=0;
-                while(isset(HTML2PDF::$_tables[$param['num']]['corr'][HTML2PDF::$_tables[$param['num']]['corr_y']][HTML2PDF::$_tables[$param['num']]['corr_x']]))
-                    HTML2PDF::$_tables[$param['num']]['corr_x']++;
-            }
-
-            return true;
-        }
-
-        /**
-         * tag : TR
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_TR($param)
-        {
-            if ($this->_isForOneLine) return false;
-
-            $this->_maxH = 0;
-
-            $this->parsingCss->load();
-            $this->parsingCss->fontSet();
-
-            // if we are not in a sub HTML
-            if (!$this->_subPart) {
-
-                // Y of the current line
-                $ty=null;
-                for ($ii=0; $ii<count(HTML2PDF::$_tables[$param['num']]['cases'][HTML2PDF::$_tables[$param['num']]['tr_curr']-1]); $ii++) {
-                    if (HTML2PDF::$_tables[$param['num']]['cases'][HTML2PDF::$_tables[$param['num']]['tr_curr']-1][$ii]['rowspan']==1) {
-                        $ty = HTML2PDF::$_tables[$param['num']]['cases'][HTML2PDF::$_tables[$param['num']]['tr_curr']-1][$ii]['h'];
-                    }
-                }
-
-                // new position
-                HTML2PDF::$_tables[$param['num']]['td_x'] = HTML2PDF::$_tables[$param['num']]['curr_x']+HTML2PDF::$_tables[$param['num']]['marge']['l'];
-                HTML2PDF::$_tables[$param['num']]['td_y']+= $ty;
-                HTML2PDF::$_tables[$param['num']]['new_page'] = false;
-            } else {
-                HTML2PDF::$_tables[$param['num']]['corr_y']++;
-            }
-
-            return true;
-        }
-
-        /**
-         * tag : TD
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_TD($param, $other = 'td')
-        {
-            if ($this->_isForOneLine) return false;
-
-            $this->_maxH = 0;
-
-            $param['cellpadding'] = HTML2PDF::$_tables[$param['num']]['cellpadding'].'mm';
-            $param['cellspacing'] = HTML2PDF::$_tables[$param['num']]['cellspacing'].'mm';
-
-            // specific style for LI
-            if ($other=='li') {
-                $specialLi = true;
-            } else {
-                $specialLi = false;
-                if ($other=='li_sub') {
-                    $param['style']['border'] = 'none';
-                    $param['style']['background-color']    = 'transparent';
-                    $param['style']['background-image']    = 'none';
-                    $param['style']['background-position'] = '';
-                    $param['style']['background-repeat']   = '';
-                    $other = 'li';
-                }
-            }
-
-            // get the properties of the TD
-            $x = HTML2PDF::$_tables[$param['num']]['td_curr'];
-            $y = HTML2PDF::$_tables[$param['num']]['tr_curr']-1;
-            $colspan = isset($param['colspan']) ? $param['colspan'] : 1;
-            $rowspan = isset($param['rowspan']) ? $param['rowspan'] : 1;
-
-            // flag for collapse table
-            $collapse = false;
-
-            // specific traitment for TD and TH
-            if (in_array($other, array('td', 'th'))) {
-                // id of the column
-                $numCol = isset(HTML2PDF::$_tables[$param['num']]['cases'][$y][$x]['Xr']) ? HTML2PDF::$_tables[$param['num']]['cases'][$y][$x]['Xr'] : HTML2PDF::$_tables[$param['num']]['corr_x'];
-
-                // we get the properties of the COL tag, if exist
-                if (isset(HTML2PDF::$_tables[$param['num']]['cols'][$numCol])) {
-
-                    $colParam = HTML2PDF::$_tables[$param['num']]['cols'][$numCol];
-
-                    // for colspans => we get all the neede widths
-                    $colParam['style']['width'] = array();
-                    for ($k=0; $k<$colspan; $k++) {
-                        if (isset(HTML2PDF::$_tables[$param['num']]['cols'][$numCol+$k]['style']['width'])) {
-                            $colParam['style']['width'][] = HTML2PDF::$_tables[$param['num']]['cols'][$numCol+$k]['style']['width'];
-                        }
-                    }
-
-                    // calculate the total width of the column
-                    $total = '';
-                    $last = $this->parsingCss->getLastWidth();
-                    if (count($colParam['style']['width'])) {
-                        $total = $colParam['style']['width'][0]; unset($colParam['style']['width'][0]);
-                        foreach ($colParam['style']['width'] as $width) {
-                            if (substr($total, -1)=='%' && substr($width, -1)=='%')
-                                $total = (str_replace('%', '', $total)+str_replace('%', '', $width)).'%';
-                            else
-                                $total = ($this->parsingCss->ConvertToMM($total, $last) + $this->parsingCss->ConvertToMM($width, $last)).'mm';
-                        }
-                    }
-
-                    // get the final width
-                    if ($total) {
-                        $colParam['style']['width'] = $total;
-                    } else {
-                        unset($colParam['style']['width']);
-                    }
-
-
-                    // merge the styles of the COL and the TD
-                    $param['style'] = array_merge($colParam['style'], $param['style']);
-
-                    // merge the class of the COL and the TD
-                    if (isset($colParam['class'])) {
-                        $param['class'] = $colParam['class'].(isset($param['class']) ? ' '.$param['class'] : '');
-                    }
-                }
-
-                $collapse = isset($this->parsingCss->value['border']['collapse']) ? $this->parsingCss->value['border']['collapse'] : false;
-            }
-
-            $this->parsingCss->save();
-
-            // legacy for TD and TH
-            $legacy = null;
-            if (in_array($other, array('td', 'th'))) {
-                $legacy = array();
-
-                $old = $this->parsingCss->getLastValue('background');
-                if ($old && ($old['color'] || $old['image']))
-                    $legacy['background'] = $old;
-
-                if (HTML2PDF::$_tables[$param['num']]['border']) {
-                    $legacy['border'] = array();
-                    $legacy['border']['l'] = HTML2PDF::$_tables[$param['num']]['border'];
-                    $legacy['border']['t'] = HTML2PDF::$_tables[$param['num']]['border'];
-                    $legacy['border']['r'] = HTML2PDF::$_tables[$param['num']]['border'];
-                    $legacy['border']['b'] = HTML2PDF::$_tables[$param['num']]['border'];
-                }
-            }
-            $return = $this->parsingCss->analyse($other, $param, $legacy);
-
-            if ($specialLi) {
-                $this->parsingCss->value['width']-= $this->parsingCss->ConvertToMM($this->_listeGetWidth());
-                $this->parsingCss->value['width']-= $this->parsingCss->ConvertToMM($this->_listeGetPadding());
-            }
-            $this->parsingCss->setPosition();
-            $this->parsingCss->fontSet();
-
-            // if tale collapse => modify the borders
-            if ($collapse) {
-                if (!$this->_subPart) {
-                    if (
-                        (HTML2PDF::$_tables[$param['num']]['tr_curr']>1 && !HTML2PDF::$_tables[$param['num']]['new_page']) ||
-                        (!$this->_isInThead && count(HTML2PDF::$_tables[$param['num']]['thead']['code']))
-                    ) {
-                        $this->parsingCss->value['border']['t'] = $this->parsingCss->readBorder('none');
-                    }
-                }
-
-                if (HTML2PDF::$_tables[$param['num']]['td_curr']>0) {
-                    if (!$return) $this->parsingCss->value['width']+= $this->parsingCss->value['border']['l']['width'];
-                    $this->parsingCss->value['border']['l'] = $this->parsingCss->readBorder('none');
-                }
-            }
-
-            // margins of the table
-            $marge = array();
-            $marge['t'] = $this->parsingCss->value['padding']['t']+0.5*HTML2PDF::$_tables[$param['num']]['cellspacing']+$this->parsingCss->value['border']['t']['width'];
-            $marge['r'] = $this->parsingCss->value['padding']['r']+0.5*HTML2PDF::$_tables[$param['num']]['cellspacing']+$this->parsingCss->value['border']['r']['width'];
-            $marge['b'] = $this->parsingCss->value['padding']['b']+0.5*HTML2PDF::$_tables[$param['num']]['cellspacing']+$this->parsingCss->value['border']['b']['width'];
-            $marge['l'] = $this->parsingCss->value['padding']['l']+0.5*HTML2PDF::$_tables[$param['num']]['cellspacing']+$this->parsingCss->value['border']['l']['width'];
-
-            // if we are in a sub HTML
-            if ($this->_subPart) {
-                // new position in the table
-                HTML2PDF::$_tables[$param['num']]['td_curr']++;
-                HTML2PDF::$_tables[$param['num']]['cases'][$y][$x] = array();
-                HTML2PDF::$_tables[$param['num']]['cases'][$y][$x]['w'] = 0;
-                HTML2PDF::$_tables[$param['num']]['cases'][$y][$x]['h'] = 0;
-                HTML2PDF::$_tables[$param['num']]['cases'][$y][$x]['dw'] = 0;
-                HTML2PDF::$_tables[$param['num']]['cases'][$y][$x]['colspan'] = $colspan;
-                HTML2PDF::$_tables[$param['num']]['cases'][$y][$x]['rowspan'] = $rowspan;
-                HTML2PDF::$_tables[$param['num']]['cases'][$y][$x]['Xr'] = HTML2PDF::$_tables[$param['num']]['corr_x'];
-                HTML2PDF::$_tables[$param['num']]['cases'][$y][$x]['Yr'] = HTML2PDF::$_tables[$param['num']]['corr_y'];
-
-                // prepare the mapping for rowspan and colspan
-                for ($j=0; $j<$rowspan; $j++) {
-                    for ($i=0; $i<$colspan; $i++) {
-                        HTML2PDF::$_tables[$param['num']]['corr']
-                            [HTML2PDF::$_tables[$param['num']]['corr_y']+$j]
-                            [HTML2PDF::$_tables[$param['num']]['corr_x']+$i] = ($i+$j>0) ? '' : array($x,$y,$colspan,$rowspan);
-                    }
-                }
-                HTML2PDF::$_tables[$param['num']]['corr_x']+= $colspan;
-                while (isset(HTML2PDF::$_tables[$param['num']]['corr'][HTML2PDF::$_tables[$param['num']]['corr_y']][HTML2PDF::$_tables[$param['num']]['corr_x']])) {
-                    HTML2PDF::$_tables[$param['num']]['corr_x']++;
-                }
-
-                // extract the content of the TD, and calculate his size
-                $level = $this->parsingHtml->getLevel($this->_tempPos);
-                $this->_createSubHTML($this->_subHtml);
-                $this->_subHtml->parsingHtml->code = $level;
-                $this->_subHtml->_makeHTMLcode();
-                $this->_tempPos+= count($level);
-            } else {
-                // new position in the table
-                HTML2PDF::$_tables[$param['num']]['td_curr']++;
-                HTML2PDF::$_tables[$param['num']]['td_x']+= HTML2PDF::$_tables[$param['num']]['cases'][$y][$x]['dw'];
-
-                // borders and background of the TD
-                $this->_drawRectangle(
-                    HTML2PDF::$_tables[$param['num']]['td_x'],
-                    HTML2PDF::$_tables[$param['num']]['td_y'],
-                    HTML2PDF::$_tables[$param['num']]['cases'][$y][$x]['w'],
-                    HTML2PDF::$_tables[$param['num']]['cases'][$y][$x]['h'],
-                    $this->parsingCss->value['border'],
-                    $this->parsingCss->value['padding'],
-                    HTML2PDF::$_tables[$param['num']]['cellspacing']*0.5,
-                    $this->parsingCss->value['background']
-                );
-
-                $this->parsingCss->value['width'] = HTML2PDF::$_tables[$param['num']]['cases'][$y][$x]['w'] - $marge['l'] - $marge['r'];
-
-                // marges = size of the TD
-                $mL = HTML2PDF::$_tables[$param['num']]['td_x']+$marge['l'];
-                $mR = $this->pdf->getW() - $mL - $this->parsingCss->value['width'];
-                $this->_saveMargin($mL, 0, $mR);
-
-                // position of the content, from vertical-align
-                $hCorr = HTML2PDF::$_tables[$param['num']]['cases'][$y][$x]['h'];
-                $hReel = HTML2PDF::$_tables[$param['num']]['cases'][$y][$x]['real_h'];
-                switch($this->parsingCss->value['vertical-align'])
-                {
-                    case 'bottom':
-                        $yCorr = $hCorr-$hReel;
-                        break;
-
-                    case 'middle':
-                        $yCorr = ($hCorr-$hReel)*0.5;
-                        break;
-
-                    case 'top':
-                    default:
-                        $yCorr = 0;
-                        break;
-                }
-
-                //  position of the content
-                $x = HTML2PDF::$_tables[$param['num']]['td_x']+$marge['l'];
-                $y = HTML2PDF::$_tables[$param['num']]['td_y']+$marge['t']+$yCorr;
-                $this->pdf->setXY($x, $y);
-                $this->_setNewPositionForNewLine();
-            }
-
-            return true;
-        }
-
-        /**
-         * tag : TD
-         * mode : CLOSE
-         *
-         * @param    array $param
-         * @return boolean
-         */
-        protected function _tag_close_TD($param)
-        {
-            if ($this->_isForOneLine) return false;
-
-            $this->_maxH = 0;
-
-            // get the margins
-            $marge = array();
-            $marge['t'] = $this->parsingCss->value['padding']['t']+0.5*HTML2PDF::$_tables[$param['num']]['cellspacing']+$this->parsingCss->value['border']['t']['width'];
-            $marge['r'] = $this->parsingCss->value['padding']['r']+0.5*HTML2PDF::$_tables[$param['num']]['cellspacing']+$this->parsingCss->value['border']['r']['width'];
-            $marge['b'] = $this->parsingCss->value['padding']['b']+0.5*HTML2PDF::$_tables[$param['num']]['cellspacing']+$this->parsingCss->value['border']['b']['width'];
-            $marge['l'] = $this->parsingCss->value['padding']['l']+0.5*HTML2PDF::$_tables[$param['num']]['cellspacing']+$this->parsingCss->value['border']['l']['width'];
-            $marge['t']+= 0.001;
-            $marge['r']+= 0.001;
-            $marge['b']+= 0.001;
-            $marge['l']+= 0.001;
-
-            // if we are in a sub HTML
-            if ($this->_subPart) {
-
-                // it msut take only one page
-                if ($this->_testTdInOnepage && $this->_subHtml->pdf->getPage()>1) {
-                    throw new HTML2PDF_exception(7);
-                }
-
-                // size of the content of the TD
-                $w0 = $this->_subHtml->_maxX + $marge['l'] + $marge['r'];
-                $h0 = $this->_subHtml->_maxY + $marge['t'] + $marge['b'];
-
-                // size from the CSS style
-                $w2 = $this->parsingCss->value['width'] + $marge['l'] + $marge['r'];
-                $h2 = $this->parsingCss->value['height'] + $marge['t'] + $marge['b'];
-
-                // final size of the TD
-                HTML2PDF::$_tables[$param['num']]['cases'][HTML2PDF::$_tables[$param['num']]['tr_curr']-1][HTML2PDF::$_tables[$param['num']]['td_curr']-1]['w'] = max(array($w0, $w2));
-                HTML2PDF::$_tables[$param['num']]['cases'][HTML2PDF::$_tables[$param['num']]['tr_curr']-1][HTML2PDF::$_tables[$param['num']]['td_curr']-1]['h'] = max(array($h0, $h2));
-
-                // real position of the content
-                HTML2PDF::$_tables[$param['num']]['cases'][HTML2PDF::$_tables[$param['num']]['tr_curr']-1][HTML2PDF::$_tables[$param['num']]['td_curr']-1]['real_w'] = $w0;
-                HTML2PDF::$_tables[$param['num']]['cases'][HTML2PDF::$_tables[$param['num']]['tr_curr']-1][HTML2PDF::$_tables[$param['num']]['td_curr']-1]['real_h'] = $h0;
-
-                // destroy the sub HTML
-                $this->_destroySubHTML($this->_subHtml);
-            } else {
-                $this->_loadMargin();
-
-                HTML2PDF::$_tables[$param['num']]['td_x']+= HTML2PDF::$_tables[$param['num']]['cases'][HTML2PDF::$_tables[$param['num']]['tr_curr']-1][HTML2PDF::$_tables[$param['num']]['td_curr']-1]['w'];
-            }
-
-            $this->parsingCss->load();
-            $this->parsingCss->fontSet();
-
-            return true;
-        }
-
-
-        /**
-         * tag : TH
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_TH($param)
-        {
-            if ($this->_isForOneLine) return false;
-
-            $this->parsingCss->save();
-            $this->parsingCss->value['font-bold'] = true;
-
-            $this->_tag_open_TD($param, 'th');
-
-            return true;
-        }
-
-        /**
-         * tag : TH
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_TH($param)
-        {
-            if ($this->_isForOneLine) return false;
-
-            $this->_tag_close_TD($param);
-
-            $this->parsingCss->load();
-
-            return true;
-        }
-
-        /**
-         * tag : IMG
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_IMG($param)
-        {
-            $src    = str_replace('&amp;', '&', $param['src']);
-
-            $this->parsingCss->save();
-            $this->parsingCss->value['width']    = 0;
-            $this->parsingCss->value['height']    = 0;
-            $this->parsingCss->value['border']    = array('type' => 'none', 'width' => 0, 'color' => array(0, 0, 0));
-            $this->parsingCss->value['background'] = array('color' => null, 'image' => null, 'position' => null, 'repeat' => null);
-            $this->parsingCss->analyse('img', $param);
-            $this->parsingCss->setPosition();
-            $this->parsingCss->fontSet();
-
-            $res = $this->_drawImage($src, isset($param['sub_li']));
-            if (!$res) return $res;
-
-            $this->parsingCss->load();
-            $this->parsingCss->fontSet();
-            $this->_maxE++;
-
-            return true;
-        }
-
-        /**
-         * tag : SELECT
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_SELECT($param)
-        {
-            if (!isset($param['name'])) {
-                $param['name'] = 'champs_pdf_'.(count($this->_lstField)+1);
-            }
-
-            $param['name'] = strtolower($param['name']);
-
-            if (isset($this->_lstField[$param['name']])) {
-                $this->_lstField[$param['name']]++;
-            } else {
-                $this->_lstField[$param['name']] = 1;
-            }
-
-            $this->parsingCss->save();
-            $this->parsingCss->analyse('select', $param);
-            $this->parsingCss->setPosition();
-            $this->parsingCss->fontSet();
-
-            $this->_lstSelect = array();
-            $this->_lstSelect['name']    = $param['name'];
-            $this->_lstSelect['multi']    = isset($param['multiple']) ? true : false;
-            $this->_lstSelect['size']    = isset($param['size']) ? $param['size'] : 1;
-            $this->_lstSelect['options']    = array();
-
-            if ($this->_lstSelect['multi'] && $this->_lstSelect['size']<3) $this->_lstSelect['size'] = 3;
-
-            return true;
-        }
-
-        /**
-         * tag : OPTION
-         * mode : OPEN
-         *
-         * @param    array $param
-         * @return boolean
-         */
-        protected function _tag_open_OPTION($param)
-        {
-            // get the content of the option : it is the text of the option
-            $level = $this->parsingHtml->getLevel($this->_parsePos);
-            $this->_parsePos+= count($level);
-            $value = isset($param['value']) ? $param['value'] : 'aut_tag_open_opt_'.(count($this->_lstSelect)+1);
-
-            $this->_lstSelect['options'][$value] = isset($level[0]['param']['txt']) ? $level[0]['param']['txt'] : '';
-
-            return true;
-        }
-
-        /**
-         * tag : OPTION
-         * mode : CLOSE
-         *
-         * @param    array $param
-         * @return boolean
-         */
-        protected function _tag_close_OPTION($param)
-        {
-            // nothing to do here
-
-            return true;
-        }
-
-        /**
-         * tag : SELECT
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_SELECT()
-        {
-            // position of the select
-            $x = $this->pdf->getX();
-            $y = $this->pdf->getY();
-            $f = 1.08*$this->parsingCss->value['font-size'];
-
-            // width
-            $w = $this->parsingCss->value['width']; if (!$w) $w = 50;
-
-            // height (automatic)
-            $h = ($f*1.07*$this->_lstSelect['size'] + 1);
-
-            $prop = $this->parsingCss->getFormStyle();
-
-            // multy select
-            if ($this->_lstSelect['multi']) {
-                $prop['multipleSelection'] = 'true';
-            }
-
-
-            // single or multi select
-            if ($this->_lstSelect['size']>1) {
-                $this->pdf->ListBox($this->_lstSelect['name'], $w, $h, $this->_lstSelect['options'], $prop);
-            } else {
-                $this->pdf->ComboBox($this->_lstSelect['name'], $w, $h, $this->_lstSelect['options'], $prop);
-            }
-
-            $this->_maxX = max($this->_maxX, $x+$w);
-            $this->_maxY = max($this->_maxY, $y+$h);
-            $this->_maxH = max($this->_maxH, $h);
-            $this->_maxE++;
-            $this->pdf->setX($x+$w);
-
-            $this->parsingCss->load();
-            $this->parsingCss->fontSet();
-
-            $this->_lstSelect = array();
-
-            return true;
-        }
-
-        /**
-         * tag : TEXTAREA
-         * mode : OPEN
-         *
-         * @param    array $param
-         * @return boolean
-         */
-        protected function _tag_open_TEXTAREA($param)
-        {
-            if (!isset($param['name'])) {
-                $param['name'] = 'champs_pdf_'.(count($this->_lstField)+1);
-            }
-
-            $param['name'] = strtolower($param['name']);
-
-            if (isset($this->_lstField[$param['name']])) {
-                $this->_lstField[$param['name']]++;
-            } else {
-                $this->_lstField[$param['name']] = 1;
-            }
-
-            $this->parsingCss->save();
-            $this->parsingCss->analyse('textarea', $param);
-            $this->parsingCss->setPosition();
-            $this->parsingCss->fontSet();
-
-            $x = $this->pdf->getX();
-            $y = $this->pdf->getY();
-            $fx = 0.65*$this->parsingCss->value['font-size'];
-            $fy = 1.08*$this->parsingCss->value['font-size'];
-
-            // extract the content the textarea : value
-            $level = $this->parsingHtml->getLevel($this->_parsePos);
-            $this->_parsePos+= count($level);
-
-            // automatic size, from cols and rows properties
-            $w = $fx*(isset($param['cols']) ? $param['cols'] : 22)+1;
-            $h = $fy*1.07*(isset($param['rows']) ? $param['rows'] : 3)+3;
-
-            $prop = $this->parsingCss->getFormStyle();
-
-            $prop['multiline'] = true;
-            $prop['value'] = isset($level[0]['param']['txt']) ? $level[0]['param']['txt'] : '';
-
-            $this->pdf->TextField($param['name'], $w, $h, $prop, array(), $x, $y);
-
-            $this->_maxX = max($this->_maxX, $x+$w);
-            $this->_maxY = max($this->_maxY, $y+$h);
-            $this->_maxH = max($this->_maxH, $h);
-            $this->_maxE++;
-            $this->pdf->setX($x+$w);
-
-            return true;
-        }
-
-        /**
-         * tag : TEXTAREA
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_TEXTAREA()
-        {
-            $this->parsingCss->load();
-            $this->parsingCss->fontSet();
-
-            return true;
-        }
-
-        /**
-         * tag : INPUT
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_INPUT($param)
-        {
-            if (!isset($param['name']))  $param['name']  = 'champs_pdf_'.(count($this->_lstField)+1);
-            if (!isset($param['value'])) $param['value'] = '';
-            if (!isset($param['type']))  $param['type']  = 'text';
-
-            $param['name'] = strtolower($param['name']);
-            $param['type'] = strtolower($param['type']);
-
-            // the type must be valid
-            if (!in_array($param['type'], array('text', 'checkbox', 'radio', 'hidden', 'submit', 'reset', 'button'))) {
-                $param['type'] = 'text';
-            }
-
-            if (isset($this->_lstField[$param['name']])) {
-                $this->_lstField[$param['name']]++;
-            } else {
-                $this->_lstField[$param['name']] = 1;
-            }
-
-            $this->parsingCss->save();
-            $this->parsingCss->analyse('input', $param);
-            $this->parsingCss->setPosition();
-            $this->parsingCss->fontSet();
-
-            $name = $param['name'];
-
-            $x = $this->pdf->getX();
-            $y = $this->pdf->getY();
-            $f = 1.08*$this->parsingCss->value['font-size'];
-
-            $prop = $this->parsingCss->getFormStyle();
-
-            switch($param['type'])
-            {
-                case 'checkbox':
-                    $w = 3;
-                    $h = $w;
-                    if ($h<$f) $y+= ($f-$h)*0.5;
-                    $checked = (isset($param['checked']) && $param['checked']=='checked');
-                    $this->pdf->CheckBox($name, $w, $checked, $prop, array(), ($param['value'] ? $param['value'] : 'Yes'), $x, $y);
-                    break;
-
-                case 'radio':
-                    $w = 3;
-                    $h = $w;
-                    if ($h<$f) $y+= ($f-$h)*0.5;
-                    $checked = (isset($param['checked']) && $param['checked']=='checked');
-                    $this->pdf->RadioButton($name, $w, $prop, array(), ($param['value'] ? $param['value'] : 'On'), $checked, $x, $y);
-                    break;
-
-                case 'hidden':
-                    $w = 0;
-                    $h = 0;
-                    $prop['value'] = $param['value'];
-                    $this->pdf->TextField($name, $w, $h, $prop, array(), $x, $y);
-                    break;
-
-                case 'text':
-                    $w = $this->parsingCss->value['width']; if (!$w) $w = 40;
-                    $h = $f*1.3;
-                    $prop['value'] = $param['value'];
-                    $this->pdf->TextField($name, $w, $h, $prop, array(), $x, $y);
-                    break;
-
-                case 'submit':
-                    $w = $this->parsingCss->value['width'];    if (!$w) $w = 40;
-                    $h = $this->parsingCss->value['height'];    if (!$h) $h = $f*1.3;
-                    $action = array('S'=>'SubmitForm', 'F'=>$this->_isInForm, 'Flags'=>array('ExportFormat'));
-                    $this->pdf->Button($name, $w, $h, $param['value'], $action, $prop, array(), $x, $y);
-                    break;
-
-                case 'reset':
-                    $w = $this->parsingCss->value['width'];    if (!$w) $w = 40;
-                    $h = $this->parsingCss->value['height'];    if (!$h) $h = $f*1.3;
-                    $action = array('S'=>'ResetForm');
-                    $this->pdf->Button($name, $w, $h, $param['value'], $action, $prop, array(), $x, $y);
-                    break;
-
-                case 'button':
-                    $w = $this->parsingCss->value['width'];    if (!$w) $w = 40;
-                    $h = $this->parsingCss->value['height'];    if (!$h) $h = $f*1.3;
-                    $action = isset($param['onclick']) ? $param['onclick'] : '';
-                    $this->pdf->Button($name, $w, $h, $param['value'], $action, $prop, array(), $x, $y);
-                    break;
-
-                default:
-                    $w = 0;
-                    $h = 0;
-                    break;
-            }
-
-            $this->_maxX = max($this->_maxX, $x+$w);
-            $this->_maxY = max($this->_maxY, $y+$h);
-            $this->_maxH = max($this->_maxH, $h);
-            $this->_maxE++;
-            $this->pdf->setX($x+$w);
-
-            $this->parsingCss->load();
-            $this->parsingCss->fontSet();
-
-            return true;
-        }
-
-        /**
-         * tag : DRAW
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_DRAW($param)
-        {
-            if ($this->_isForOneLine) return false;
-            if ($this->_debugActif) $this->_DEBUG_add('DRAW', true);
-
-            $this->parsingCss->save();
-            $this->parsingCss->analyse('draw', $param);
-            $this->parsingCss->fontSet();
-
-            $alignObject = null;
-            if ($this->parsingCss->value['margin-auto']) $alignObject = 'center';
-
-            $overW = $this->parsingCss->value['width'];
-            $overH = $this->parsingCss->value['height'];
-            $this->parsingCss->value['old_maxX'] = $this->_maxX;
-            $this->parsingCss->value['old_maxY'] = $this->_maxY;
-            $this->parsingCss->value['old_maxH'] = $this->_maxH;
-
-            $w = $this->parsingCss->value['width'];
-            $h = $this->parsingCss->value['height'];
-
-            if (!$this->parsingCss->value['position']) {
-                if (
-                    $w < ($this->pdf->getW() - $this->pdf->getlMargin()-$this->pdf->getrMargin()) &&
-                    $this->pdf->getX() + $w>=($this->pdf->getW() - $this->pdf->getrMargin())
-                    )
-                    $this->_tag_open_BR(array());
-
-                if (
-                        ($h < ($this->pdf->getH() - $this->pdf->gettMargin()-$this->pdf->getbMargin())) &&
-                        ($this->pdf->getY() + $h>=($this->pdf->getH() - $this->pdf->getbMargin())) &&
-                        !$this->_isInOverflow
-                    )
-                    $this->_setNewPage();
-
-                $old = $this->parsingCss->getOldValues();
-                $parentWidth = $old['width'] ? $old['width'] : $this->pdf->getW() - $this->pdf->getlMargin() - $this->pdf->getrMargin();
-
-                if ($parentWidth>$w) {
-                    if ($alignObject=='center')        $this->pdf->setX($this->pdf->getX() + ($parentWidth-$w)*0.5);
-                    else if ($alignObject=='right')    $this->pdf->setX($this->pdf->getX() + $parentWidth-$w);
-                }
-
-                $this->parsingCss->setPosition();
-            } else {
-                $old = $this->parsingCss->getOldValues();
-                $parentWidth = $old['width'] ? $old['width'] : $this->pdf->getW() - $this->pdf->getlMargin() - $this->pdf->getrMargin();
-
-                if ($parentWidth>$w) {
-                    if ($alignObject=='center')        $this->pdf->setX($this->pdf->getX() + ($parentWidth-$w)*0.5);
-                    else if ($alignObject=='right')    $this->pdf->setX($this->pdf->getX() + $parentWidth-$w);
-                }
-
-                $this->parsingCss->setPosition();
-                $this->_saveMax();
-                $this->_maxX = 0;
-                $this->_maxY = 0;
-                $this->_maxH = 0;
-                $this->_maxE = 0;
-            }
-
-            $this->_drawRectangle(
-                $this->parsingCss->value['x'],
-                $this->parsingCss->value['y'],
-                $this->parsingCss->value['width'],
-                $this->parsingCss->value['height'],
-                $this->parsingCss->value['border'],
-                $this->parsingCss->value['padding'],
-                0,
-                $this->parsingCss->value['background']
-            );
-
-            $marge = array();
-            $marge['l'] = $this->parsingCss->value['border']['l']['width'];
-            $marge['r'] = $this->parsingCss->value['border']['r']['width'];
-            $marge['t'] = $this->parsingCss->value['border']['t']['width'];
-            $marge['b'] = $this->parsingCss->value['border']['b']['width'];
-
-            $this->parsingCss->value['width'] -= $marge['l']+$marge['r'];
-            $this->parsingCss->value['height']-= $marge['t']+$marge['b'];
-
-            $overW-= $marge['l']+$marge['r'];
-            $overH-= $marge['t']+$marge['b'];
-
-            // clipping to draw only in the size opf the DRAW tag
-            $this->pdf->clippingPathStart(
-                $this->parsingCss->value['x']+$marge['l'],
-                $this->parsingCss->value['y']+$marge['t'],
-                $this->parsingCss->value['width'],
-                $this->parsingCss->value['height']
-            );
-
-            // left and right of the DRAW tag
-            $mL = $this->parsingCss->value['x']+$marge['l'];
-            $mR = $this->pdf->getW() - $mL - $overW;
-
-            // position of the DRAW tag
-            $x = $this->parsingCss->value['x']+$marge['l'];
-            $y = $this->parsingCss->value['y']+$marge['t'];
-
-            // prepare the drawing area
-            $this->_saveMargin($mL, 0, $mR);
-            $this->pdf->setXY($x, $y);
-
-            // we are in a draw tag
-            $this->_isInDraw = array(
-                'x' => $x,
-                'y' => $y,
-                'w' => $overW,
-                'h' => $overH,
-            );
-
-            // init the translate matrix : (0,0) => ($x, $y)
-            $this->pdf->doTransform(array(1,0,0,1,$x,$y));
-            $this->pdf->SetAlpha(1.);
-            return true;
-        }
-
-        /**
-         * tag : DRAW
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_DRAW($param)
-        {
-            if ($this->_isForOneLine) return false;
-
-            $this->pdf->SetAlpha(1.);
-            $this->pdf->undoTransform();
-            $this->pdf->clippingPathStop();
-
-            $this->_maxX = $this->parsingCss->value['old_maxX'];
-            $this->_maxY = $this->parsingCss->value['old_maxY'];
-            $this->_maxH = $this->parsingCss->value['old_maxH'];
-
-            $marge = array();
-            $marge['l'] = $this->parsingCss->value['border']['l']['width'];
-            $marge['r'] = $this->parsingCss->value['border']['r']['width'];
-            $marge['t'] = $this->parsingCss->value['border']['t']['width'];
-            $marge['b'] = $this->parsingCss->value['border']['b']['width'];
-
-            $x = $this->parsingCss->value['x'];
-            $y = $this->parsingCss->value['y'];
-            $w = $this->parsingCss->value['width']+$marge['l']+$marge['r'];
-            $h = $this->parsingCss->value['height']+$marge['t']+$marge['b'];
-
-            if ($this->parsingCss->value['position']!='absolute') {
-                $this->pdf->setXY($x+$w, $y);
-
-                $this->_maxX = max($this->_maxX, $x+$w);
-                $this->_maxY = max($this->_maxY, $y+$h);
-                $this->_maxH = max($this->_maxH, $h);
-                $this->_maxE++;
-            } else {
-                // position
-                $this->pdf->setXY($this->parsingCss->value['xc'], $this->parsingCss->value['yc']);
-
-                $this->_loadMax();
-            }
-
-            $block = ($this->parsingCss->value['display']!='inline' && $this->parsingCss->value['position']!='absolute');
-
-            $this->parsingCss->load();
-            $this->parsingCss->fontSet();
-            $this->_loadMargin();
-
-            if ($block) $this->_tag_open_BR(array());
-            if ($this->_debugActif) $this->_DEBUG_add('DRAW', false);
-
-            $this->_isInDraw = null;
-
-            return true;
-        }
-
-        /**
-         * tag : LINE
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_LINE($param)
-        {
-            if (!$this->_isInDraw) throw new HTML2PDF_exception(8, 'LINE');
-
-            $this->pdf->doTransform(isset($param['transform']) ? $this->_prepareTransform($param['transform']) : null);
-            $this->parsingCss->save();
-            $styles = $this->parsingCss->getSvgStyle('path', $param);
-            $styles['fill'] = null;
-            $style = $this->pdf->svgSetStyle($styles);
-
-            $x1 = isset($param['x1']) ? $this->parsingCss->ConvertToMM($param['x1'], $this->_isInDraw['w']) : 0.;
-            $y1 = isset($param['y1']) ? $this->parsingCss->ConvertToMM($param['y1'], $this->_isInDraw['h']) : 0.;
-            $x2 = isset($param['x2']) ? $this->parsingCss->ConvertToMM($param['x2'], $this->_isInDraw['w']) : 0.;
-            $y2 = isset($param['y2']) ? $this->parsingCss->ConvertToMM($param['y2'], $this->_isInDraw['h']) : 0.;
-            $this->pdf->svgLine($x1, $y1, $x2, $y2);
-
-            $this->pdf->undoTransform();
-            $this->parsingCss->load();
-        }
-
-        /**
-         * tag : RECT
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_RECT($param)
-        {
-            if (!$this->_isInDraw) throw new HTML2PDF_exception(8, 'RECT');
-
-            $this->pdf->doTransform(isset($param['transform']) ? $this->_prepareTransform($param['transform']) : null);
-            $this->parsingCss->save();
-            $styles = $this->parsingCss->getSvgStyle('path', $param);
-            $style = $this->pdf->svgSetStyle($styles);
-
-            $x = isset($param['x']) ? $this->parsingCss->ConvertToMM($param['x'], $this->_isInDraw['w']) : 0.;
-            $y = isset($param['y']) ? $this->parsingCss->ConvertToMM($param['y'], $this->_isInDraw['h']) : 0.;
-            $w = isset($param['w']) ? $this->parsingCss->ConvertToMM($param['w'], $this->_isInDraw['w']) : 0.;
-            $h = isset($param['h']) ? $this->parsingCss->ConvertToMM($param['h'], $this->_isInDraw['h']) : 0.;
-
-            $this->pdf->svgRect($x, $y, $w, $h, $style);
-
-            $this->pdf->undoTransform();
-            $this->parsingCss->load();
-        }
-
-        /**
-         * tag : CIRCLE
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_CIRCLE($param)
-        {
-            if (!$this->_isInDraw) throw new HTML2PDF_exception(8, 'CIRCLE');
-
-            $this->pdf->doTransform(isset($param['transform']) ? $this->_prepareTransform($param['transform']) : null);
-            $this->parsingCss->save();
-            $styles = $this->parsingCss->getSvgStyle('path', $param);
-            $style = $this->pdf->svgSetStyle($styles);
-
-            $cx = isset($param['cx']) ? $this->parsingCss->ConvertToMM($param['cx'], $this->_isInDraw['w']) : 0.;
-            $cy = isset($param['cy']) ? $this->parsingCss->ConvertToMM($param['cy'], $this->_isInDraw['h']) : 0.;
-            $r = isset($param['r']) ? $this->parsingCss->ConvertToMM($param['r'], $this->_isInDraw['w']) : 0.;
-            $this->pdf->svgEllipse($cx, $cy, $r, $r, $style);
-
-            $this->pdf->undoTransform();
-            $this->parsingCss->load();
-        }
-
-        /**
-         * tag : ELLIPSE
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_ELLIPSE($param)
-        {
-            if (!$this->_isInDraw) throw new HTML2PDF_exception(8, 'ELLIPSE');
-
-            $this->pdf->doTransform(isset($param['transform']) ? $this->_prepareTransform($param['transform']) : null);
-            $this->parsingCss->save();
-            $styles = $this->parsingCss->getSvgStyle('path', $param);
-            $style = $this->pdf->svgSetStyle($styles);
-
-            $cx = isset($param['cx']) ? $this->parsingCss->ConvertToMM($param['cx'], $this->_isInDraw['w']) : 0.;
-            $cy = isset($param['cy']) ? $this->parsingCss->ConvertToMM($param['cy'], $this->_isInDraw['h']) : 0.;
-            $rx = isset($param['ry']) ? $this->parsingCss->ConvertToMM($param['rx'], $this->_isInDraw['w']) : 0.;
-            $ry = isset($param['rx']) ? $this->parsingCss->ConvertToMM($param['ry'], $this->_isInDraw['h']) : 0.;
-            $this->pdf->svgEllipse($cx, $cy, $rx, $ry, $style);
-
-            $this->pdf->undoTransform();
-            $this->parsingCss->load();
-        }
-
-
-        /**
-         * tag : POLYLINE
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_POLYLINE($param)
-        {
-            if (!$this->_isInDraw) throw new HTML2PDF_exception(8, 'POLYGON');
-
-            $this->pdf->doTransform(isset($param['transform']) ? $this->_prepareTransform($param['transform']) : null);
-            $this->parsingCss->save();
-            $styles = $this->parsingCss->getSvgStyle('path', $param);
-            $style = $this->pdf->svgSetStyle($styles);
-
-            $path = isset($param['points']) ? $param['points'] : null;
-            if ($path) {
-                $path = str_replace(',', ' ', $path);
-                $path = preg_replace('/[\s]+/', ' ', trim($path));
-
-                // prepare the path
-                $path = explode(' ', $path);
-                foreach ($path as $k => $v) {
-                    $path[$k] = trim($v);
-                    if ($path[$k]==='') unset($path[$k]);
-                }
-                $path = array_values($path);
-
-                $actions = array();
-                for ($k=0; $k<count($path); $k+=2) {
-                    $actions[] = array(
-                        ($k ? 'L' : 'M') ,
-                        $this->parsingCss->ConvertToMM($path[$k+0], $this->_isInDraw['w']),
-                        $this->parsingCss->ConvertToMM($path[$k+1], $this->_isInDraw['h'])
-                    );
-                }
-
-                // drawing
-                $this->pdf->svgPolygone($actions, $style);
-            }
-
-            $this->pdf->undoTransform();
-            $this->parsingCss->load();
-        }
-
-        /**
-         * tag : POLYGON
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_POLYGON($param)
-        {
-            if (!$this->_isInDraw) throw new HTML2PDF_exception(8, 'POLYGON');
-
-            $this->pdf->doTransform(isset($param['transform']) ? $this->_prepareTransform($param['transform']) : null);
-            $this->parsingCss->save();
-            $styles = $this->parsingCss->getSvgStyle('path', $param);
-            $style = $this->pdf->svgSetStyle($styles);
-
-            $path = (isset($param['points']) ? $param['points'] : null);
-            if ($path) {
-                $path = str_replace(',', ' ', $path);
-                $path = preg_replace('/[\s]+/', ' ', trim($path));
-
-                // prepare the path
-                $path = explode(' ', $path);
-                foreach ($path as $k => $v) {
-                    $path[$k] = trim($v);
-                    if ($path[$k]==='') unset($path[$k]);
-                }
-                $path = array_values($path);
-
-                $actions = array();
-                for ($k=0; $k<count($path); $k+=2) {
-                    $actions[] = array(
-                        ($k ? 'L' : 'M') ,
-                        $this->parsingCss->ConvertToMM($path[$k+0], $this->_isInDraw['w']),
-                        $this->parsingCss->ConvertToMM($path[$k+1], $this->_isInDraw['h'])
-                    );
-                }
-                $actions[] = array('z');
-
-                // drawing
-                $this->pdf->svgPolygone($actions, $style);
-            }
-
-            $this->pdf->undoTransform();
-            $this->parsingCss->load();
-        }
-
-        /**
-         * tag : PATH
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_PATH($param)
-        {
-            if (!$this->_isInDraw) throw new HTML2PDF_exception(8, 'PATH');
-
-            $this->pdf->doTransform(isset($param['transform']) ? $this->_prepareTransform($param['transform']) : null);
-            $this->parsingCss->save();
-            $styles = $this->parsingCss->getSvgStyle('path', $param);
-            $style = $this->pdf->svgSetStyle($styles);
-
-            $path = isset($param['d']) ? $param['d'] : null;
-
-            if ($path) {
-                // prepare the path
-                $path = str_replace(',', ' ', $path);
-                $path = preg_replace('/([a-zA-Z])([0-9\.\-])/', '$1 $2', $path);
-                $path = preg_replace('/([0-9\.])([a-zA-Z])/', '$1 $2', $path);
-                $path = preg_replace('/[\s]+/', ' ', trim($path));
-                $path = preg_replace('/ ([a-z]{2})/', '$1', $path);
-
-                $path = explode(' ', $path);
-                foreach ($path as $k => $v) {
-                    $path[$k] = trim($v);
-                    if ($path[$k]==='') unset($path[$k]);
-                }
-                $path = array_values($path);
-
-                // read each actions in the path
-                $actions = array();
-                $action = array();
-                $lastAction = null; // last action found
-                for ($k=0; $k<count($path);true) {
-
-                    // for this actions, we can not have multi coordonate
-                    if (in_array($lastAction, array('z', 'Z'))) {
-                        $lastAction = null;
-                    }
-
-                    // read the new action (forcing if no action before)
-                    if (preg_match('/^[a-z]+$/i', $path[$k]) || $lastAction===null) {
-                        $lastAction = $path[$k];
-                        $k++;
-                    }
-
-                    // current action
-                    $action = array();
-                    $action[] = $lastAction;
-                    switch($lastAction)
-                    {
-                        case 'C':
-                        case 'c':
-                            $action[] = $this->parsingCss->ConvertToMM($path[$k+0], $this->_isInDraw['w']);    // x1
-                            $action[] = $this->parsingCss->ConvertToMM($path[$k+1], $this->_isInDraw['h']);    // y1
-                            $action[] = $this->parsingCss->ConvertToMM($path[$k+2], $this->_isInDraw['w']);    // x2
-                            $action[] = $this->parsingCss->ConvertToMM($path[$k+3], $this->_isInDraw['h']);    // y2
-                            $action[] = $this->parsingCss->ConvertToMM($path[$k+4], $this->_isInDraw['w']);    // x
-                            $action[] = $this->parsingCss->ConvertToMM($path[$k+5], $this->_isInDraw['h']);    // y
-                            $k+= 6;
-                            break;
-
-                        case 'Q':
-                        case 'S':
-                        case 'q':
-                        case 's':
-                            $action[] = $this->parsingCss->ConvertToMM($path[$k+0], $this->_isInDraw['w']);    // x2
-                            $action[] = $this->parsingCss->ConvertToMM($path[$k+1], $this->_isInDraw['h']);    // y2
-                            $action[] = $this->parsingCss->ConvertToMM($path[$k+2], $this->_isInDraw['w']);    // x
-                            $action[] = $this->parsingCss->ConvertToMM($path[$k+3], $this->_isInDraw['h']);    // y
-                            $k+= 4;
-                            break;
-
-                        case 'A':
-                        case 'a':
-                            $action[] = $this->parsingCss->ConvertToMM($path[$k+0], $this->_isInDraw['w']);    // rx
-                            $action[] = $this->parsingCss->ConvertToMM($path[$k+1], $this->_isInDraw['h']);    // ry
-                            $action[] = 1.*$path[$k+2];                                                        // angle de deviation de l'axe X
-                            $action[] = ($path[$k+3]=='1') ? 1 : 0;                                            // large-arc-flag
-                            $action[] = ($path[$k+4]=='1') ? 1 : 0;                                            // sweep-flag
-                            $action[] = $this->parsingCss->ConvertToMM($path[$k+5], $this->_isInDraw['w']);    // x
-                            $action[] = $this->parsingCss->ConvertToMM($path[$k+6], $this->_isInDraw['h']);    // y
-                            $k+= 7;
-                            break;
-
-                        case 'M':
-                        case 'L':
-                        case 'T':
-                        case 'm':
-                        case 'l':
-                        case 't':
-                            $action[] = $this->parsingCss->ConvertToMM($path[$k+0], $this->_isInDraw['w']);    // x
-                            $action[] = $this->parsingCss->ConvertToMM($path[$k+1], $this->_isInDraw['h']);    // y
-                            $k+= 2;
-                            break;
-
-                        case 'H':
-                        case 'h':
-                            $action[] = $this->parsingCss->ConvertToMM($path[$k+0], $this->_isInDraw['w']);    // x
-                            $k+= 1;
-                            break;
-
-                        case 'V':
-                        case 'v':
-                            $action[] = $this->parsingCss->ConvertToMM($path[$k+0], $this->_isInDraw['h']);    // y
-                            $k+= 1;
-                            break;
-
-                        case 'z':
-                        case 'Z':
-                        default:
-                            break;
-                    }
-                    // add the action
-                    $actions[] = $action;
-                }
-
-                // drawing
-                $this->pdf->svgPolygone($actions, $style);
-            }
-
-            $this->pdf->undoTransform();
-            $this->parsingCss->load();
-        }
-
-        /**
-         * tag : G
-         * mode : OPEN
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_open_G($param)
-        {
-            if (!$this->_isInDraw) throw new HTML2PDF_exception(8, 'G');
-
-            $this->pdf->doTransform(isset($param['transform']) ? $this->_prepareTransform($param['transform']) : null);
-            $this->parsingCss->save();
-            $styles = $this->parsingCss->getSvgStyle('path', $param);
-            $style = $this->pdf->svgSetStyle($styles);
-        }
-
-        /**
-         * tag : G
-         * mode : CLOSE
-         *
-         * @param  array $param
-         * @return boolean
-         */
-        protected function _tag_close_G($param)
-        {
-            $this->pdf->undoTransform();
-            $this->parsingCss->load();
-        }
-
-        /**
-         * new page for the automatic Index, does not use thie method. Only HTML2PDF_myPdf could use it !!!!
-         *
-         * @param  &int $page
-         * @return integer $oldPage
-         */
-        public function _INDEX_NewPage(&$page)
-        {
-            if ($page) {
-                $oldPage = $this->pdf->getPage();
-                $this->pdf->setPage($page);
-                $this->pdf->setXY($this->_margeLeft, $this->_margeTop);
-                $this->_maxH = 0;
-                $page++;
-                return $oldPage;
-            } else {
-                $this->_setNewPage();
-                return null;
-            }
-        }
-
-    }
-}
\ No newline at end of file
diff --git a/html2pdf_v4.03/locale/ca.csv b/html2pdf_v4.03/locale/ca.csv
deleted file mode 100644
index 33ade8ec..00000000
--- a/html2pdf_v4.03/locale/ca.csv
+++ /dev/null
@@ -1,21 +0,0 @@
-"err01","L'etiqueta <b>&lt;[[OTHER]]&gt;</b> encara no existeix.<br><br>Si voleu afegir-la, heu de crear els mètodes <b>o_[[OTHER]]</b> (per l'obertura) i <b>c_[[OTHER]]</b> (pel tancament) seguint el model de les etiquetes existents.<br><br>A més, si creeu nous mètodes, envieu-ho a webmaster@html2pdf.fr per tal d'afegir-los a les següents versions d'HTML2PDF, i que tothom en pugui gaudir."
-"err02","Frase de 1000 línies => massa llarga<br><b>Frase :</b> [[OTHER_0]]<br><b>Mida casella :</b> [[OTHER_1]]<br><b>Mida text :</b> [[OTHER_2]]<br>"
-"err03","Codi HTML no vàlid, una etiqueta té un tancament de més : <b>&lt;[[OTHER]]&gt;</b>"
-"err04","Codi HTML no vàlid, les etiquetes no estan tancades en l'ordre correcte.<br>Estat : <pre>[[OTHER]]</pre>"
-"err05","Codi HTML no vàlid, totes les etiquetes han de tenir el seu tancament.<br>Estat : <pre>[[OTHER]]</pre>"
-"err06","Impossible carregar la imatge <b>[[OTHER]]</b>"
-"err07","El contingut d'una etiqueta TD no quep en una sola pàgina"
-"err08","<b>&lt;[[OTHER]]&gt;</b> tag not in a &lt;DRAW&gt; tag"
-"err09","The using of the <b>&lt;[[OTHER_0]]&gt;</b>> tag has changed, you can not use [[OTHER_1]] anymore. Read the WIKI"
-"txt01","ERROR n°"
-"txt02","Fitxer :"
-"txt03","Línia :"
-"pdf01","Document generat el [[date_d]]/[[date_m]]/[[date_y]]"
-"pdf02","Document generat a les [[date_h]]:[[date_i]]"
-"pdf03","Document generat el [[date_d]]/[[date_m]]/[[date_y]] a les [[date_h]]:[[date_i]]"
-"pdf04","Pàgina [[page_cu]]/[[page_nb]]"
-"pdf05","Els formularis requereixen l'ús de l'Adobe Reader 9"
-"vue01","CAPÇALERA"
-"vue02","PEU DE PÀGINA"
-"vue03","PÀGINA"
-"vue04","Visualització"
diff --git a/html2pdf_v4.03/locale/cs.csv b/html2pdf_v4.03/locale/cs.csv
deleted file mode 100644
index 67d5bceb..00000000
--- a/html2pdf_v4.03/locale/cs.csv
+++ /dev/null
@@ -1,21 +0,0 @@
-"err01","Element <b>&lt;[[OTHER]]&gt;</b> neexistuje.<br><br>Pokud ho chcete přidat, musíte vytvořit metodu <b>o_[[OTHER]]</b> (pro otevření) a <b>c_[[OTHER]]</b> (pro zavření) k začlenění do modelu jako existující element.<br><br>Pokud vytvoříte metodu, nebojte se poslat email na webmaster@html2pdf.fr k zařazení do další verze HTML2PDF."
-"err02","Sentence of 1000 lines => too long<br><b>Sentence :</b> [[OTHER_0]]<br><b>Width box :</b> [[OTHER_1]]<br><b>Length text :</b> [[OTHER_2]]<br>"
-"err03","Chyba v HTML, element je příliš mnohokrát zavřen: <b>&lt;[[OTHER]]&gt;</b>"
-"err04","Chyba v HTML, element není uzavřen ve správném pořadí.<br>Stav : <pre>[[OTHER]]</pre>"
-"err05","Chyba v HTML, všechny elementy musí být zavřeny.<br>Stav : <pre>[[OTHER]]</pre>"
-"err06","Menohu načíst orbázek <b>[[OTHER]]</b>"
-"err07","Obsah TD elementu se nevejde na jednu stránku"
-"err08","<b>&lt;[[OTHER]]&gt;</b> element není v &lt;DRAW&gt; elementu"
-"err09","The using of the <b>&lt;[[OTHER_0]]&gt;</b>> tag has changed, you can not use [[OTHER_1]] anymore. Read the WIKI"
-"txt01","CHYBA č."
-"txt02","Soubor :"
-"txt03","Řádek :"
-"pdf01","Dokument vytvořen dne [[date_d]].[[date_m]].[[date_y]]"
-"pdf02","Dokument vytvořen v [[date_h]]:[[date_i]]"
-"pdf03","Dokument vytvořen dne [[date_d]].[[date_m]].[[date_y]] v [[date_h]]:[[date_i]]"
-"pdf04","Stránka [[page_cu]]/[[page_nb]]"
-"pdf05","Formuláře vyžadují Adobe Reader 9"
-"vue01","HLAVIČKA"
-"vue02","PATIČKA"
-"vue03","STRÁNKA"
-"vue04","POHLED"
diff --git a/html2pdf_v4.03/locale/da.csv b/html2pdf_v4.03/locale/da.csv
deleted file mode 100644
index 9b4bcd90..00000000
--- a/html2pdf_v4.03/locale/da.csv
+++ /dev/null
@@ -1,21 +0,0 @@
-"err01","Tag <b>&lt;[[OTHER]]&gt;</b> endnu ikke eksisterer.<br><br>Hvis du ønsker at tilføje det, skal du oprette de metoder <b>o_[[OTHER]]</b> (for åbning) og <b>c_[[OTHER]]</b> (for lukning) ved at følge den model af eksisterende tags.<br><br>Hvis du opretter disse metoder, så tøv ikke med at send mig en e-mail til webmaster@html2pdf.fr til indsat dem i den næste version af HTML2PDF."
-"err02","Sætning af 1000 lines => er for lang<br><b>sætning :</b> [[OTHER_0]]<br><b>Bredde boksen :</b> [[OTHER_1]]<br><b>Længde tekst :</b> [[OTHER_2]]<br>"
-"err03","HTML-kode er ugyldig, et tag er lukket for mange gange: <b>&lt;[[OTHER]]&gt;</b>"
-"err04","HTML-kode er ugyldig, tags er ikke afsluttet på en ordentlig måde.<br>Status : <pre>[[OTHER]]</pre>"
-"err05","HTML-kode er ugyldig, alle tags skal lukkes. <br>Status : <pre>[[OTHER]]</pre>"
-"err06","Umuligt at indlæse billedet <b>[[OTHER]]</b>"
-"err07","Indholdet af en TD tag ikke passer på én side"
-"err08","<b>&lt;[[OTHER]]&gt;</b> tag not in a &lt;DRAW&gt; tag"
-"err09","The using of the <b>&lt;[[OTHER_0]]&gt;</b>> tag has changed, you can not use [[OTHER_1]] anymore. Read the WIKI"
-"txt01","FEJL n°"
-"txt02","File :"
-"txt03","Linje :"
-"pdf01","Siden oprettet d. [[date_y]]-[[date_m]]-[[date_d]]"
-"pdf02","Siden oprettet d. [[date_h]]:[[date_i]]"
-"pdf03","Siden oprettet d. [[date_y]]-[[date_m]]-[[date_d]] at [[date_h]]:[[date_i]]"
-"pdf04","Side [[page_cu]]/[[page_nb]]"
-"pdf05","De formularer kræver brug af Adobe Reader 9"
-"vue01","HEADER"
-"vue02","FOOTER"
-"vue03","PAGE"
-"vue04","View"
diff --git a/html2pdf_v4.03/locale/de.csv b/html2pdf_v4.03/locale/de.csv
deleted file mode 100644
index fc848b39..00000000
--- a/html2pdf_v4.03/locale/de.csv
+++ /dev/null
@@ -1,21 +0,0 @@
-"err01","Das Tag <b>&lt;[[OTHER]]&gt;</b> existiert noch nicht.<br><br>Wenn Sie es hinzufügen möchten, sollen Sie die Methoden<b>o_[[OTHER]]</b> (zu öffnen) und <b>c_[[OTHER]]</b> (zu schließen) nach dem Modell den existierenden Tags.<br><br>Wenn Sie diese Methoden außerdem aufbauen, bitte teilen Sie sie duch eine E-Mail an meine Adresse : webmaster@html2pdf.fr, so daß sie künftig in die nächste Version von HTML2PDF erscheinen."
-"err02","1000-Linien Satz => zu lang<br><b>Satz :</b> [[OTHER_0]]<br><b>Breite des Eingabefelds :</b> [[OTHER_1]]<br><b>Länge des Texts :</b> [[OTHER_2]]<br>"
-"err03","Falsches HTML Code, überzähliges geschloßene Tag : <b>&lt;[[OTHER]]&gt;</b>"
-"err04","Falsches HTML Code, die Tags sind nicht in richtiger Ordnung geschloßen.<br>Status : <pre>[[OTHER]]</pre>"
-"err05","Falsches HTML Code, alle Tags sollen geschloßen sein.<br>Status : <pre>[[OTHER]]</pre>"
-"err06","Ladung des Bilds unmöglich <b>[[OTHER]]</b>"
-"err07","Er Inhalt eines TD-Tag passt nicht nur auf einer Seite"
-"err08","<b>&lt;[[OTHER]]&gt;</b> tag not in a &lt;DRAW&gt; tag"
-"err09","The using of the <b>&lt;[[OTHER_0]]&gt;</b>> tag has changed, you can not use [[OTHER_1]] anymore. Read the WIKI"
-"txt01","Fehler n°"
-"txt02","Datei :"
-"txt03","Linie :"
-"pdf01","Datei aufgebaut am [[date_d]]/[[date_m]]/[[date_y]]"
-"pdf02","Datei aufgebaut um [[date_h]]:[[date_m]]"
-"pdf03","Datei aufgebaut am [[date_d]]/[[date_m]]/[[date_y]] um [[date_h]]:[[date_i]]"
-"pdf04","Seite [[page_cu]]/[[page_nb]]"
-"pdf05","Die Formulare benötigen Sie den Adobe Reader 9"
-"vue01","Seite-Header"
-"vue02","Fußzeile"
-"vue03","Seite"
-"vue04","Visualisierung"
diff --git a/html2pdf_v4.03/locale/en.csv b/html2pdf_v4.03/locale/en.csv
deleted file mode 100644
index 04dcac5d..00000000
--- a/html2pdf_v4.03/locale/en.csv
+++ /dev/null
@@ -1,21 +0,0 @@
-"err01","The tag <b>&lt;[[OTHER]]&gt;</b> does not yet exist.<br><br>If you want to add it, you must create the methods <b>o_[[OTHER]]</b> (for opening) and <b>c_[[OTHER]]</b> (for closure) by following the model of existing tags.<br><br>If you create these methods, do not hesitate to send me an email to webmaster@html2pdf.fr to included them in the next version of HTML2PDF."
-"err02","Sentence of 1000 lines => too long<br><b>Sentence :</b> [[OTHER_0]]<br><b>Width box :</b> [[OTHER_1]]<br><b>Length text :</b> [[OTHER_2]]<br>"
-"err03","HTML code invalid, a tag is closed too many times: <b>&lt;[[OTHER]]&gt;</b>"
-"err04","HTML code invalid, the tags are not closed in an orderly fashion.<br>Status : <pre>[[OTHER]]</pre>"
-"err05","HTML code invalid, all tags must be closed.<br>Status : <pre>[[OTHER]]</pre>"
-"err06","Impossible to load the image <b>[[OTHER]]</b>"
-"err07","The content of a TD tag does not fit on only one page"
-"err08","<b>&lt;[[OTHER]]&gt;</b> tag not in a &lt;DRAW&gt; tag"
-"err09","The using of the <b>&lt;[[OTHER_0]]&gt;</b>> tag has changed, you can not use [[OTHER_1]] anymore. Read the WIKI"
-"txt01","ERROR n°"
-"txt02","File :"
-"txt03","Line :"
-"pdf01","Document generated on [[date_y]]-[[date_m]]-[[date_d]]"
-"pdf02","Document generated at [[date_h]]:[[date_i]]"
-"pdf03","Document generated on [[date_y]]-[[date_m]]-[[date_d]] at [[date_h]]:[[date_i]]"
-"pdf04","Page [[page_cu]]/[[page_nb]]"
-"pdf05","The forms require the use of Adobe Reader 9"
-"vue01","HEADER"
-"vue02","FOOTER"
-"vue03","PAGE"
-"vue04","View"
diff --git a/html2pdf_v4.03/locale/es.csv b/html2pdf_v4.03/locale/es.csv
deleted file mode 100644
index 994c8da9..00000000
--- a/html2pdf_v4.03/locale/es.csv
+++ /dev/null
@@ -1,21 +0,0 @@
-"err01","La etiqueta <b>&lt;[[OTHER]]&gt;</b> todavía no existe.<br><br>Si quiere añadirla, debe crear los métodos <b>o_[[OTHER]]</b> (para la apertura) y <b>c_[[OTHER]]</b> (para el cierre) siguiendo el modelo de las etiquetas existentes.<br><br>Si crea nuevos métodos, envíelos a webmaster@html2pdf.fr para añadirlos a las siguientes versiones de HTML2PDF, y que todo el mundo se pueda beneficiar."
-"err02","Frase de 1000 líneas => demasiado larga<br><b>Frase :</b> [[OTHER_0]]<br><b>Tamaño casilla :</b> [[OTHER_1]]<br><b>Tamaño texto :</b> [[OTHER_2]]<br>"
-"err03","Código HTML no válido, una etiqueta tiene un cierre de más : <b>&lt;[[OTHER]]&gt;</b>"
-"err04","Código HTML no válido, las etiquetas no estan cerradas en el orden correcto.<br>Estado : <pre>[[OTHER]]</pre>"
-"err05","Código HTML no válido, todas las etiquetas deben tener su cierre.<br>Estado : <pre>[[OTHER]]</pre>"
-"err06","Imposible cargar la imagen <b>[[OTHER]]</b>"
-"err07","El contenido de una etiqueta TD no encaja en una sola página"
-"err08","<b>&lt;[[OTHER]]&gt;</b> tag not in a &lt;DRAW&gt; tag"
-"err09","The using of the <b>&lt;[[OTHER_0]]&gt;</b>> tag has changed, you can not use [[OTHER_1]] anymore. Read the WIKI"
-"txt01","ERROR n°"
-"txt02","Fichero :"
-"txt03","Línea :"
-"pdf01","Documento generado el [[date_d]]/[[date_m]]/[[date_y]]"
-"pdf02","Documento generado a las [[date_h]]:[[date_i]]"
-"pdf03","Documento generado el [[date_d]]/[[date_m]]/[[date_y]] a las [[date_h]]:[[date_i]]"
-"pdf04","Página [[page_cu]]/[[page_nb]]"
-"pdf05","Los formularios requieren el uso de Adobe Reader 9"
-"vue01","ENCABEZADO"
-"vue02","PIE DE PÁGINA"
-"vue03","PÁGINA"
-"vue04","Visualización"
diff --git a/html2pdf_v4.03/locale/fr.csv b/html2pdf_v4.03/locale/fr.csv
deleted file mode 100644
index 34e19ff9..00000000
--- a/html2pdf_v4.03/locale/fr.csv
+++ /dev/null
@@ -1,21 +0,0 @@
-"err01","La balise <b>&lt;[[OTHER]]&gt;</b> n'existe pas encore.<br><br>Si vous voulez la rajouter, vous devez créer les méthodes <b>o_[[OTHER]]</b> (pour l'ouverture) et <b>c_[[OTHER]]</b> (pour la fermeture) en suivant le modèle des balises existantes.<br><br>De plus, si vous créez ces méthodes, n'hésitez pas à en faire profiter tout le monde en m'écrivant sur webmaster@html2pdf.fr afin qu'elles se retrouvent dans la prochaine version d'HTML2PDF."
-"err02","Phrase de 1000 lignes => trop long<br><b>Phrase :</b> [[OTHER_0]]<br><b>Largeur case :</b> [[OTHER_1]]<br><b>Longueur text :</b> [[OTHER_2]]<br>"
-"err03","Code HTML non valide, une balise est fermée en trop : <b>&lt;[[OTHER]]&gt;</b>"
-"err04","Code HTML non valide, les balises ne sont pas fermées dans le bon ordre.<br>Etat : <pre>[[OTHER]]</pre>"
-"err05","Code HTML non valide, toutes les balises doivent être fermées.<br>Etat : <pre>[[OTHER]]</pre>"
-"err06","Impossible de charger l'image <b>[[OTHER]]</b>"
-"err07","le contenu d'une balise TD ne rentre pas sur une seule page"
-"err08","Balise <b>&lt;[[OTHER]]&gt;</b> non contenu dans une balise &lt;DRAW&gt;"
-"err09","L'utilisation de la balise <b>&lt;[[OTHER_0]]&gt;</b> a changé, vous ne pouvez plus utiliser [[OTHER_1]]. Lisez le WIKI"
-"txt01","ERREUR n°"
-"txt02","Fichier :"
-"txt03","Ligne :"
-"pdf01","Document généré le [[date_d]]/[[date_m]]/[[date_y]]"
-"pdf02","Document généré à [[date_h]]:[[date_i]]"
-"pdf03","Document généré le [[date_d]]/[[date_m]]/[[date_y]] à [[date_h]]:[[date_i]]"
-"pdf04","Page [[page_cu]]/[[page_nb]]"
-"pdf05","Les formulaires nécessitent  l'utilisation de Adobe Reader 9"
-"vue01","HEADER"
-"vue02","FOOTER"
-"vue03","PAGE"
-"vue04","Restitution"
diff --git a/html2pdf_v4.03/locale/it.csv b/html2pdf_v4.03/locale/it.csv
deleted file mode 100644
index 2a840e13..00000000
--- a/html2pdf_v4.03/locale/it.csv
+++ /dev/null
@@ -1,21 +0,0 @@
-"err01","Il tag <b>&lt;[[OTHER]]&gt;</b> non esiste ancora.<br><br>Se si desidera aggiungere, è necessario creare metodi <b>o_[[OTHER]]</b> (di apertura) e <b>C_[[OTHER]]</b> (per la chiusura) secondo il modello esistente di tag.<br><br>Inoltre, se si creare questi metodi, non esitate a portare il mondo intero ha scritto su webmaster@html2pdf.fr in modo che alla fine nella prossima versione di HTML2PDF."
-"err02","Citazione di 1000 linee => troppo lungo<br><b>frase :</b> [[OTHER_0]]<br><b>casella Larghezza :</b> [[OTHER_1]]<br><b>Lunghezza testo :</b> [[OTHER_2]]<br>"
-"err03","HTML non valido, un tag è chiusa troppo <b>&lt;[[OTHER]]&gt;</ b>"
-"err04","HTML non validi, i tag non sono chiusi nel corretto ordine.<br>Stato :<pre>[[OTHER]]</pre>"
-"err05","HTML non valido, tutte le tag deve essere chiuso.<br>Stato :<pre>[[OTHER]]</pre>"
-"err06","Impossibile caricare l'immagine <b>[[OTHER]]</b>"
-"err07","il contenuto di un tag TD non rientra in una sola pagina"
-"err08","<b>&lt;[[OTHER]]&gt;</b> tag not in a &lt;DRAW&gt; tag"
-"err09","The using of the <b>&lt;[[OTHER_0]]&gt;</b>> tag has changed, you can not use [[OTHER_1]] anymore. Read the WIKI"
-"txt01","ERRORE n°"
-"txt02","File :"
-"txt03","Linea :"
-"pdf01","Documento generato il [[date_d]]/[[date_m]]/[[date_y]]"
-"pdf02","Documento generato [[date_h]]:[[date_i]]"
-"pdf03","Documento generato il [[date_d]]/[[date_m]]/[[date_y]] nel [[date_h]]:[[date_i]]"
-"pdf04","Pagina [[page_cu]]/[[page_nb]]"
-"pdf05","I moduli richiedono l'uso di Adobe Reader 9"
-"vue01","HEADER"
-"vue02","FOOTER"
-"vue03","PAGINA"
-"vue04","Visualization"
diff --git a/html2pdf_v4.03/locale/nl.csv b/html2pdf_v4.03/locale/nl.csv
deleted file mode 100644
index d9244cbd..00000000
--- a/html2pdf_v4.03/locale/nl.csv
+++ /dev/null
@@ -1,21 +0,0 @@
-"err01","De tag <b>&lt;[[OTHER]]&gt;</b> bestaat nog niet.<br><br>Om deze toe te voegen, gebruik de methods <b>o_[[OTHER]]</b> (om te openen) en <b>c_[[OTHER]]</b> (om te sluiten) volgens het model van de bestaande tags.<br><br>Als u deze methods maakt, stuur deze dan a.u.b. via e-mail naar webmaster@html2pdf.fr voor opname in de volgende versie van HTML2PDF."
-"err02","Zin van 1000 regels => te lang<br><b>Zin :</b> [[OTHER_0]]<br><b>Kaderbreedte :</b> [[OTHER_1]]<br><b>Tekstlengte :</b> [[OTHER_2]]<br>"
-"err03","Ongeldige HTML code, overvloedig afgesloten tag : <b>&lt;[[OTHER]]&gt;</b>"
-"err04","Ongeldige HTML code, de tags zijn niet correct afgesloten.<br>Status : <pre>[[OTHER]]</pre>"
-"err05","Ongeldige HTML code, alle tags dienen te zijn gesloten.<br>Status : <pre>[[OTHER]]</pre>"
-"err06","Kan afbeelding niet laden: <b>[[OTHER]]</b>"
-"err07","De inhoud van de cel (<TD>) past niet op een pagina"
-"err08","<b>&lt;[[OTHER]]&gt;</b> tag not in a &lt;DRAW&gt; tag"
-"err09","The using of the <b>&lt;[[OTHER_0]]&gt;</b>> tag has changed, you can not use [[OTHER_1]] anymore. Read the WIKI"
-"txt01","Fout nr"
-"txt02","Bestand :"
-"txt03","Regel :"
-"pdf01","Document gemaakt op [[date_d]]-[[date_m]]-[[date_y]]"
-"pdf02","Document gemaakt om [[date_h]]:[[date_i]]"
-"pdf03","Document gemaakt op [[date_d]]-[[date_m]]-[[date_y]] om [[date_h]]:[[date_i]]"
-"pdf04","Pagina [[page_cu]] van [[page_nb]]"
-"pdf05","De formulieren vereisen het gebruik van Adobe Reader 9"
-"vue01","Paginakop"
-"vue02","Paginavoet"
-"vue03","Pagina"
-"vue04","Bekijken"
diff --git a/html2pdf_v4.03/locale/pt.csv b/html2pdf_v4.03/locale/pt.csv
deleted file mode 100644
index 9bdbd206..00000000
--- a/html2pdf_v4.03/locale/pt.csv
+++ /dev/null
@@ -1,21 +0,0 @@
-"err01","A tag <b>&lt;[[OTHER]]&gt;</b> ainda não existe.<br><br>Se você quer inserí-la, deve criar os métodos <b>o_[[OTHER]]</b> (para abrí-la) e <b>c_[[OTHER]]</b> (para fechá-la) seguindo o modelo das tags existentes.<br><br>Se você criar novos métodos, os envie para webmaster@html2pdf.fr para que as próximas versões de HTML2PDF, e o restante do mundo se beneficie com isso."
-"err02","Frase de 1000 linhas => muito grande<br><b>Frase :</b> [[OTHER_0]]<br><b>Tamanho do quadro :</b> [[OTHER_1]]<br><b>Tamanho do texto :</b> [[OTHER_2]]<br>"
-"err03","Código HTML não válido, uma tag está com fechamento sobrando : <b>&lt;[[OTHER]]&gt;</b>"
-"err04","Código HTML não válido, as tags não estão fechadas na ordem correta.<br>Estado : <pre>[[OTHER]]</pre>"
-"err05","Código HTML não válido, todas as tags devem ser fechadas.<br>Estado : <pre>[[OTHER]]</pre>"
-"err06","Impossível carregar imagem <b>[[OTHER]]</b>"
-"err07","O conteúdo de uma tag TD não se encaixa em apenas uma página"
-"err08","<b>&lt;[[OTHER]]&gt;</b> tag not in a &lt;DRAW&gt; tag"
-"err09","The using of the <b>&lt;[[OTHER_0]]&gt;</b>> tag has changed, you can not use [[OTHER_1]] anymore. Read the WIKI"
-"txt01","ERRO n°"
-"txt02","Arquivo :"
-"txt03","Linha :"
-"pdf01","Documento generado em [[date_d]]/[[date_m]]/[[date_y]]"
-"pdf02","Documento generado às [[date_h]]:[[date_i]]"
-"pdf03","Documento generado em [[date_d]]/[[date_m]]/[[date_y]] às [[date_h]]:[[date_i]]"
-"pdf04","Página [[page_cu]]/[[page_nb]]"
-"pdf05","Os formulários exigem a utilização do Adobe Reader 9"
-"vue01","CABEÇALHO"
-"vue02","RODAPÉ"
-"vue03","PÁGINA"
-"vue04","Visualização"
diff --git a/html2pdf_v4.03/locale/tr.csv b/html2pdf_v4.03/locale/tr.csv
deleted file mode 100644
index 63b29e2b..00000000
--- a/html2pdf_v4.03/locale/tr.csv
+++ /dev/null
@@ -1,21 +0,0 @@
-"err01","<b>&lt;[[OTHER]]&gt;</b> etiketi bulunamadý.<br><br>Eklemek isterseniz, <b>o_[[OTHER]]</b> þeklinde açýp, <b>c_[[OTHER]]</b> þeklinde kapatabilirsiniz.<br><br> Bu þekilde etiketler üretirseniz lütfen daha sonraki HTML2PDF versiyonuna eklenmek üzere bana gönderin. ( webmaster@html2pdf.fr )."
-"err02","Ýçerik 1000 satýrdan fazla ve gerekenden uzun <br><b>Konu :</b> [[OTHER_0]]<br><b>Geniþlik :</b> [[OTHER_1]]<br><b>Yazý boyutu :</b> [[OTHER_2]]<br>"
-"err03","HTML kodu hatalý, etiket birden fazla defa kapatýlmýþ: <b>&lt;[[OTHER]]&gt;</b>"
-"err04","HTML kodu hatalý, etiketler gereken düzen içinde kapatýlmamýþ.<br>Durum : <pre>[[OTHER]]</pre>"
-"err05","HTML kodu hatalý, bütün etiketler kapatýlmalý.<br>Durum : <pre>[[OTHER]]</pre>"
-"err06","Resim dosyasý okunamýyor <b>[[OTHER]]</b>"
-"err07","TD içeriði bir sayfaya sýðmýyor"
-"err08","<b>&lt;[[OTHER]]&gt;</b> tag not in a &lt;DRAW&gt; tag"
-"err09","The using of the <b>&lt;[[OTHER_0]]&gt;</b>> tag has changed, you can not use [[OTHER_1]] anymore. Read the WIKI"
-"txt01","HATA n°"
-"txt02","Dosya :"
-"txt03","Satýr :"
-"pdf01","Doküman üretilme tarihi [[date_y]]-[[date_m]]-[[date_d]]"
-"pdf02","Doküman üretilme tarihi [[date_h]]:[[date_i]]"
-"pdf03","Doküman üretilme tarihi [[date_y]]-[[date_m]]-[[date_d]] saati [[date_h]]:[[date_i]]"
-"pdf04","Sayfa [[page_cu]]/[[page_nb]]"
-"pdf05","Adobe Reader 9 gerektirir"
-"vue01","DOSYA ÜSTÜ"
-"vue02","DOSYA ALTI"
-"vue03","SAYFA"
-"vue04","Görünüm"
diff --git a/html2pdf_v4.03/ul.png b/html2pdf_v4.03/ul.png
deleted file mode 100644
index ede81b91..00000000
Binary files a/html2pdf_v4.03/ul.png and /dev/null differ
diff --git a/html2pdf_v4.03/ul2.png b/html2pdf_v4.03/ul2.png
deleted file mode 100644
index fcd39005..00000000
Binary files a/html2pdf_v4.03/ul2.png and /dev/null differ
diff --git a/html2pdf_v4.03/ul3.png b/html2pdf_v4.03/ul3.png
deleted file mode 100644
index 8f312f5a..00000000
Binary files a/html2pdf_v4.03/ul3.png and /dev/null differ
diff --git a/kat_cont.php_20201230 b/kat_cont.php_20201230
deleted file mode 100644
index ab5bd9ad..00000000
--- a/kat_cont.php_20201230
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-include_once 'classes/lg-on_Smarty.class.php';
-$smarty = new lgon_Smarty();
-require_once("config.inc.php");
-$templatename = substr(basename($_SERVER['PHP_SELF']),0,-3)."html";
-require_once "language/german.inc.php";
-
-$db = dbconnect();
-$query = "SELECT knk, ueberschrift
-            FROM knk
-	   WHERE art = 'H'
-           ORDER BY knkid ASC
-         ";
-                                     
-if(isset($_GET['knk']) AND $_GET['knk'] > 0){
-  $kapitel = $_GET['knk']+3; # +3 da Kapitel 1 mit Container 4 anfängt im HTML 
-  $smarty->assign('open_kap', $kapitel);
-}
-
-          
-          
-  $zaehler = 0;
-  $outer_loop = array();
-
-  $result = $db->query( $query)
-            or die ("Cannot execute query");;
-  while ($row = $result->fetch_array()){
-    $value2  ='';
-    $zaehler = $zaehler+1;
-    $query1 = "SELECT knk, ueberschrift
-                 FROM knk
-                WHERE knk like '$row[knk].%'
-                  and ueberschrift != 'EXTRAKT'
-                ";
-#echo $query1."<br><br>";
-    $result1 = $db->query( $query1 )
-               or die ("Cannot execute query1");;
-
-    while ($row2 = $result1->fetch_array()){
-      if(is_numeric(substr($row2['knk'],0,1))){
-       # wenn knk mit Zahl beginnt
-       $knk_num = 1;
-      }else{
-       # wenn knk ein Character hat "vorwort"
-       $knk_num = 0;
-      };
-      $ueberschrift = trim(str_replace("$row2[knk]", "", $row2['ueberschrift']));
-
-      $row2['knk'] = $row['knk'];
-      $row2['knk_sub'] = $row2[0];
-      $row2['knk_num'] = $knk_num;
-      $row2['ueberschrift_sub'] = $ueberschrift;
-      $value2[] = $row2;
-    }
-   
-    $row['zaehler'] = $zaehler;
-    $row['inner'] = $value2;
-    $value[] = $row;
-    
-  }
-#echo "<pre>";
-#print_r($value);
-#echo "</pre>";
-#exit;
-  $smarty->assign('outer_loop', $value);
-  
-
-$smarty->display("$template/$templatename");
-?>
\ No newline at end of file
diff --git a/kat_cont.php_20221013 b/kat_cont.php_20221013
deleted file mode 100644
index 77c5e8df..00000000
--- a/kat_cont.php_20221013
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-
-include_once 'classes/lg-on_Smarty.class.php';
-$smarty = new lgon_Smarty();
-require_once("config.inc.php");
-$templatename = substr(basename($_SERVER['PHP_SELF']),0,-3)."html";
-require_once "language/german.inc.php";
-
-$db = dbconnect();
-$query = "SELECT knk, ueberschrift
-            FROM knk
-	   WHERE art = 'H'
-           ORDER BY knkid ASC
-         ";
-                                     
-if(isset($_GET['knk']) AND $_GET['knk'] > 0 AND is_numeric($_GET['knk'])){
-  $kapitel = int($_GET['knk'])+3; # +3 da Kapitel 1 mit Container 4 anfängt im HTML 
-  $smarty->assign('open_kap', $kapitel);
-}
-
-          
-          
-  $zaehler = 0;
-  $outer_loop = array();
-
-  $result = $db->query( $query)
-            or die ("Cannot execute query");;
-  while ($row = $result->fetch_array()){
-    #$value2[]  ='';
-    unset($value2);
-    $zaehler = $zaehler+1;
-    $query1 = "SELECT knk, ueberschrift
-                 FROM knk
-                WHERE knk like '$row[knk].%'
-                  and ueberschrift != 'EXTRAKT'
-                ORDER BY CONVERT(knk,UNSIGNED INTEGER) ASC
-                ";
-#echo $query1."<br><br>";
-    $result1 = $db->query( $query1 )
-               or die ("Cannot execute query1");;
-
-    while ($row2 = $result1->fetch_array()){
-      if(is_numeric(substr($row2['knk'],0,1))){
-       # wenn knk mit Zahl beginnt
-       $knk_num = 1;
-      }else{
-       # wenn knk ein Character hat "vorwort"
-       $knk_num = 0;
-      };
-      $ueberschrift = trim(str_replace("$row2[knk]", "", $row2['ueberschrift']));
-
-      $row2['knk'] = $row['knk'];
-      $row2['knk_sub'] = $row2[0];
-      $row2['knk_num'] = $knk_num;
-      $row2['ueberschrift_sub'] = $ueberschrift;
-      $value2[] = $row2;
-    }
-   
-    $row['zaehler'] = $zaehler;
-    $row['inner'] = $value2;
-    $value[] = $row;
-    
-  }
-#echo "<pre>";
-#print_r($value);
-#echo "</pre>";
-#exit;
-  $smarty->assign('outer_loop', $value);
-  
-
-$smarty->display("$template/$templatename");
-?>
\ No newline at end of file
diff --git a/kat_main.php_lut84_20180219 b/kat_main.php_lut84_20180219
deleted file mode 100644
index a04d016c..00000000
--- a/kat_main.php_lut84_20180219
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-session_start();
-
-include_once 'classes/lg-on_Smarty.class.php';
-$smarty = new lgon_Smarty();
-require_once("config.inc.php");
-$templatename = substr(basename($_SERVER['PHP_SELF']),0,-3)."html";
-require_once "language/german.inc.php";
-require_once("func_ansicht.php");
-require_once("bibellookup.php");
-
-
-#if(isset($_GET['knk']) AND $_GET['knk'] > 0){
-  $kapitel = $_GET['knk'];
-  $kapitelsub = $_GET['knksub'];
-  if($kapitelsub == ''){
-    $kapitelsub = $kapitel;
-  }
-  $db = dbconnect();
-  
-  $result_hist = $db->query("SELECT knkid
-                                FROM knk
-                               WHERE knk = '$kapitelsub'
-                            ");
-  $row_hist = $result_hist->fetch_array();
-  
-  $sid = session_id();
-  $datum=date("Y-m-d H:i:s");
-  $result_1 = $db->query( "INSERT INTO historie (vaid, datum, session_id, art, art_id) VALUES ('$user_vaid;', '$datum', '$sid', 'K', '$row_hist[knkid]')" );
-
-  
-#}else{
-#  $kapitel = "vum";
-#}
-
-
-$result0 = $db->query("SELECT min(knkid) mind, max(knkid) maxi
-                          FROM knk
-                         WHERE knk = '$kapitel'
-                            OR knk like '$kapitel.%'
-                       ");
-$row0 = $result0->fetch_array();
-
-$result1 = $db->query("SELECT 1
-                          FROM knk
-                         WHERE knkid =$row0[maxi]+1
-                           AND art = 'E'
-                       ");
-$row1 = $result1->fetch_array();
-
-
-if($row1[0]){
-  # Extrakt am Ende des kapitels vorhanden
-  $maxi = $row0['maxi']+1;
-}else{
-  $maxi = $row0['maxi'];
-}
-    $db = dbconnect();
-
-    $result_link_bibel = $db->query("SELECT bibellink
-                                         FROM profil
-                                        WHERE user='$user_admin'");
-    $row_link_bibel = $result_link_bibel->fetch_array();
-    if($row_link_bibel['bibellink'] == 'lokal'){
-      $query = "SELECT ueberschrift, text_lokal text, art, knk
-                  FROM knk
-                 WHERE knkid between $row0[mind] and $maxi
-                 ORDER BY knkid ASC
-               ";
-    }else{
-      $query = "SELECT ueberschrift, text_bibleserver text, art, knk
-                  FROM knk
-                 WHERE knkid between $row0[mind] and $maxi
-                 ORDER BY knkid ASC
-               ";
-    
-    }
-
-   $result = $db->query( $query)
-             or die ("Cannot execute query");
-   while ($row = $result->fetch_array()){    
-      $value[] = $row;
-    }
-    // Assign this array to smarty...
-    $smarty->assign('table_data1', $value);
-$smarty->display("$template/$templatename");
-?>
\ No newline at end of file
diff --git a/kat_main_fa.php_lut84_20180219 b/kat_main_fa.php_lut84_20180219
deleted file mode 100644
index b68426ca..00000000
--- a/kat_main_fa.php_lut84_20180219
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-session_start();
-
-include_once 'classes/lg-on_Smarty.class.php';
-$smarty = new lgon_Smarty();
-require_once("config.inc.php");
-$templatename = substr(basename($_SERVER['PHP_SELF']),0,-3)."html";
-require_once "language/german.inc.php";
-require_once("func_ansicht.php");
-require_once("bibellookup.php");
-
-
-#if(isset($_GET['knk']) AND $_GET['knk'] > 0){
-  $kapitel = $_GET['knk'];
-  $fragenr = $_GET['knksub'];
-  if($fragenr == ''){
-    $fragenr = $kapitel;
-  }
-  $db = dbconnect();
-  
-  $result_hist = $db->query("SELECT number
-                                FROM knk_fa
-                               WHERE number = '$fragenr'
-                            ");
-  $row_hist = $result_hist->fetch_array();
-  
-  if($row_hist['number'] > 0){
-    $sid = session_id();
-    $datum=date("Y-m-d H:i:s");
-    $result_1 = $db->query( "INSERT INTO historie (vaid, datum, session_id, art, art_id) VALUES ('$user_vaid;', '$datum', '$sid', 'KFA', '$row_hist[number]')" );
-  }
-  
-#}else{
-#  $kapitel = "vum";
-#}
-
-    $db = dbconnect();
-
-    $result_link_bibel = $db->query("SELECT bibellink
-                                         FROM profil
-                                        WHERE user='$user_admin'");
-    $row_link_bibel = $result_link_bibel->fetch_array();
-
-
-
-      if(is_numeric(substr($kapitel,0,1))){
-        if($row_link_bibel['bibellink'] == 'lokal'){
-        $query = "SELECT number, number number1, question, answer_lokal answer, reference_lokal reference, description_lokal description, description2_lokal description2
-                    FROM knk_fa
-                   WHERE headline = $kapitel
-                   ORDER BY number ASC
-                 ";
-        }else{
-        $query = "SELECT number, number number1, question, answer_bibleserver answer, reference_bibleserver reference, description_bibleserver description, description2_bibleserver description2
-	                    FROM knk_fa
-	                   WHERE headline = $kapitel
-	                   ORDER BY number ASC
-                 ";
-        }
-      }else{
-       # wenn knk ein Character hat "vorwort"
-       
-        if($row_link_bibel['bibellink'] == 'lokal'){
-         $query = "SELECT knk number, ueberschrift question, text_lokal answer
-                   FROM knk
-                  WHERE knk = '$kapitel'
-                     OR knk LIKE '$kapitel.%'
-                  ORDER BY knkid ASC
-         ";
-        }else{
-         $query = "SELECT knk number, ueberschrift question, text_bibleserver answer
-                   FROM knk
-                  WHERE knk = '$kapitel'
-                     OR knk LIKE '$kapitel.%'
-                  ORDER BY knkid ASC
-         ";
-        }
-      };
- 
-
-   $result = $db->query( $query)
-             or die ("Cannot execute query1");
-   while ($row = $result->fetch_array()){    
-      $value[] = $row;
-    }
-    // Assign this array to smarty...
-    $smarty->assign('table_data1', $value);
-$smarty->display("$template/$templatename");
-?>
\ No newline at end of file
diff --git a/lieder.zip b/lieder.zip
deleted file mode 100644
index e867a65a..00000000
Binary files a/lieder.zip and /dev/null differ
diff --git a/lue_inhalt.php_20200915 b/lue_inhalt.php_20200915
deleted file mode 100644
index 37099d15..00000000
--- a/lue_inhalt.php_20200915
+++ /dev/null
@@ -1,558 +0,0 @@
-<?php
-/*
-# Fuer debugging
-error_reporting(E_ALL);
-ini_set('display_errors', 1);
-#echo __LINE__."<br>";
-*/
-session_start();
-$user_admin=$_COOKIE["user_admin"];
-$eid = $_GET['eid'];
-
-require("func_highlight.php");
-require_once("func_ansicht.php");
-##### ÄNDERUNG NEUE LUTHERBIBEL ########
-if(date("Y") < 2019){
-  require("bibellookup_1984.php");
-}else{
-  require("bibellookup_2017.php");
-}
-
-$jahr = date("Y");
-
-include_once 'classes/lg-on_Smarty.class.php';
-$smarty = new lgon_Smarty();
-require_once("config.inc.php");
-require_once("func_rollenrechte.php");
-$templatename = substr(basename($_SERVER['PHP_SELF']),0,-3)."html";
-require_once "language/german.inc.php";
-
-
-$suchart = $_GET['suchart'];
-$inhalt_hig = stripslashes($_GET['inhalt_hig']);
-$inhalt_hig = unserialize($inhalt_hig);
-
-
-if ($user_admin == ""){ require("index.php"); exit;} //Wenn man nicht angemeldet ist, darf man nicht auf die Seite
-
-$db = dbconnect();
-$result = $db->query("SELECT eid, thema, einleitung, ausfuehrung, extrakt
-                        FROM lue_quelle
-                       WHERE eid='$eid'");
-$row = $result->fetch_array();
-$smarty->assign('lue_inhalt_thema', "$row[thema]");
-
-$sid = session_id();
-$datum=date("Y-m-d H:i:s");
-$result_1 = $db->query( "INSERT INTO historie (vaid, datum, session_id, art, art_id) VALUES ('$user_vaid;', '$datum', '$sid', 'E', '$eid')" );
-
-
-## Die Funktionen wurden mit Luther 2017 auskommentiert und in Zeile 17 fun_ansicht.php eingebunden. Dort gibt es diese Funktionen auch.
-## Vorteil ist, dass man dann auch KNK und KNK-FA einblenden kann, was vorher nicht der Fall war
-/*
-function makeLink($a, $b, $c, $d, $e, $f, $g, $h,$eid, $link, $jahr)
-{
-
-  $a=trim($a);
-  $b=trim($b);
-  $c=trim($c);
-  $d=trim($d);
-  $e=trim($e);
-  $f=trim($f);
-  $g=trim($g);
-  $h=trim($h);
-  
-  # $d muss immer ein Komma haben, wenn danach noch was kommt
-  if($e != '' or $f != "" or $g != "" or $h != ""){
-   if($d == ''){
-     $d=',';
-   }
-  }
-  
-##  echo "a: '$a'<br>
-##        b: '$b'<br>
-##        c: '$c'<br>
-##        d: '$d'<br>
-##        e: '$e'<br>
-##        f: '$f'<br>
-##        g: '$g'<br>
-##        h: '$h'<br>
-##        i: '$i'<br>
-##        ";
-##
-  
-  $b =str_replace  ("Ruth",  "Rut"  ,  $b);
-  $b =str_replace  ("Esther",  "Ester"  ,  $b);
-  $b =str_replace  ("Judith",  "Judit"  ,  $b);
-  $b =str_replace  ("Ezechiel",  "Hesekiel"  ,  $b);
-  $b =str_replace  ("Ijob",  "Hiob"  ,  $b);
-  
-  if($a!=''){
-   $a=$a." ";
-  }
-  
-  if($c!=''){
-   $c=" ".$c;
-  }
-  if($e!=''){
-   $e=" ".$e." ";
-  }
-
-  
-  if($g == '-'){
-
-    #$wort="Römer 8,31-39";
-    $wort="$a$b$c$d$f$g$h";
-    $wort=trim($wort);
-    
-    
-    if($link == 'lokal'){
-      $wort="$wort|L|$eid";
-      #target=\"_blank\" 
-      
-      ##### ÄNDERUNG NEUE LUTHERBIBEL ########
-      if($jahr < 2019){
-        return sprintf("<a class=\"biblelink\" href=\"javascript:bib_link_lokal1('bibelpopup/bib_popup_1984.php?wort=%s&stopmark=$f','Bibellink','640','480','center','front');\" onmouseover=\"return overlib('".getword("$wort")."',  ABOVE, CAPTION,'%s', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 450);\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$d.$f.$g.$h,  $a.$b.$c.$d.$f.$g.$h, $a.$b.$c.$d.$e.$f.$g.$h);
-      }else{
-        return sprintf("<a class=\"biblelink\" href=\"javascript:bib_link_lokal1('bibelpopup/bib_popup_2017.php?wort=%s&stopmark=$f','Bibellink','640','480','center','front');\" onmouseover=\"return overlib('".getword("$wort")."',  ABOVE, CAPTION,'%s', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 450);\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$d.$f.$g.$h,  $a.$b.$c.$d.$f.$g.$h, $a.$b.$c.$d.$e.$f.$g.$h);
-      }
-    }elseif($link == 'bibleserver'){
-      #target=\"_blank\" 
-      
-      ##### ÄNDERUNG NEUE LUTHERBIBEL ########
-      if($jahr < 2019){
-        return sprintf("<a class=\"biblelink\" href=\"http://www.bibleserver.com/go.php?lang={de}&bible={LUT84}&ref=%s\" target=\"_blank\" onmouseover=\"return overlib('".getword("$wort")."',  ABOVE, CAPTION,'%s', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 450);\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$d.$f.$g.$h,  $a.$b.$c.$d.$f.$g.$h, $a.$b.$c.$d.$e.$f.$g.$h);
-      }else{
-        return sprintf("<a class=\"biblelink\" href=\"http://www.bibleserver.com/go.php?lang={de}&bible={LUT}&ref=%s\" target=\"_blank\" onmouseover=\"return overlib('".getword("$wort")."',  ABOVE, CAPTION,'%s', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 450);\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$d.$f.$g.$h,  $a.$b.$c.$d.$f.$g.$h, $a.$b.$c.$d.$e.$f.$g.$h);
-      }
-      
-    }
-    
-    
-  }elseif($g == '.'){
-    
-    // Wenn Punkt, dann muss unterschieden werden, ob die Textstelle forlaufend ist
-    $next=$f+1;
-    if($h==$next){
-      // Beispiel Matthäus 1,1.2
-      // aus dem Punkt wird ein Bindestrich für bibleserver
-      $g1='-';
-
-      $wort="$a$b$c$d$f$g1$h";
-      $wort=trim($wort);
-      
-      
-    if($link == 'lokal'){
-      $wort="$wort|L|$eid";
-      
-      ##### ÄNDERUNG NEUE LUTHERBIBEL ########
-      if($jahr < 2019){
-        return sprintf("<a class=\"biblelink\" href=\"javascript:bib_link_lokal1('bibelpopup/bib_popup_1984.php?wort=%s&stopmark=$f','Bibellink','640','480','center','front');\" onmouseover=\"return overlib('".getword("$wort")."',  ABOVE, CAPTION,'%s', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 450);\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$d.$f.$g1.$h,  $a.$b.$c.$d.$f.$g1.$h, $a.$b.$c.$d.$e.$f.$g.$h);
-      }else{
-        return sprintf("<a class=\"biblelink\" href=\"javascript:bib_link_lokal1('bibelpopup/bib_popup_2017.php?wort=%s&stopmark=$f','Bibellink','640','480','center','front');\" onmouseover=\"return overlib('".getword("$wort")."',  ABOVE, CAPTION,'%s', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 450);\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$d.$f.$g1.$h,  $a.$b.$c.$d.$f.$g1.$h, $a.$b.$c.$d.$e.$f.$g.$h);
-      }
-      
-    }elseif($link == 'bibleserver'){
-      ##### ÄNDERUNG NEUE LUTHERBIBEL ########
-      if($jahr < 2019){
-        return sprintf("<a class=\"biblelink\" href=\"http://www.bibleserver.com/go.php?lang={de}&bible={LUT84}&ref=%s\" target=\"_blank\" onmouseover=\"return overlib('".getword("$wort")."',  ABOVE, CAPTION,'%s', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 450);\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$d.$f.$g1.$h,  $a.$b.$c.$d.$f.$g1.$h, $a.$b.$c.$d.$e.$f.$g.$h);
-      }else{
-        return sprintf("<a class=\"biblelink\" href=\"http://www.bibleserver.com/go.php?lang={de}&bible={LUT}&ref=%s\" target=\"_blank\" onmouseover=\"return overlib('".getword("$wort")."',  ABOVE, CAPTION,'%s', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 450);\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$d.$f.$g1.$h,  $a.$b.$c.$d.$f.$g1.$h, $a.$b.$c.$d.$e.$f.$g.$h);
-      }
-      
-    }
-      
-
-      
-    }else{
-      // Beispiel Matthäus 1,1.3
-      // Da Vers 2 nicht aufgeführt ist, darf man nicht 1-3 machen
-      // Parameter $g und $h (.3) wird daher nicht im Link übergeben
-
-      $wort="$a$b$c$d$f";
-      $wort=trim($wort);
-      
-    if($link == 'lokal'){
-      $wort="$wort|L|$eid";
-      ##### ÄNDERUNG NEUE LUTHERBIBEL ########
-      if($jahr < 2019){
-        return sprintf("<a class=\"biblelink\" href=\"javascript:bib_link_lokal1('bibelpopup/bib_popup_1984.php?wort=%s&stopmark=$f','Bibellink','640','480','center','front');\" onmouseover=\"return overlib('".getword("$wort")."',  ABOVE, CAPTION,'%s', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 450);\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$d.$f,  $a.$b.$c.$d.$f, $a.$b.$c.$d.$e.$f.$g.$h);
-      }else{
-        return sprintf("<a class=\"biblelink\" href=\"javascript:bib_link_lokal1('bibelpopup/bib_popup_2017.php?wort=%s&stopmark=$f','Bibellink','640','480','center','front');\" onmouseover=\"return overlib('".getword("$wort")."',  ABOVE, CAPTION,'%s', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 450);\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$d.$f,  $a.$b.$c.$d.$f, $a.$b.$c.$d.$e.$f.$g.$h);
-      }
-      
-    }elseif($link == 'bibleserver'){
-      ##### ÄNDERUNG NEUE LUTHERBIBEL ########
-      if($jahr < 2019){
-        return sprintf("<a class=\"biblelink\" href=\"http://www.bibleserver.com/go.php?lang={de}&bible={LUT84}&ref=%s\" target=\"_blank\" onmouseover=\"return overlib('".getword("$wort")."',  ABOVE, CAPTION,'%s', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 450);\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$d.$f,  $a.$b.$c.$d.$f, $a.$b.$c.$d.$e.$f.$g.$h);
-      }else{
-        return sprintf("<a class=\"biblelink\" href=\"http://www.bibleserver.com/go.php?lang={de}&bible={LUT}&ref=%s\" target=\"_blank\" onmouseover=\"return overlib('".getword("$wort")."',  ABOVE, CAPTION,'%s', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 450);\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$d.$f,  $a.$b.$c.$d.$f, $a.$b.$c.$d.$e.$f.$g.$h);
-      }
-      
-    }
-   
-      
-    }
-    
-  }else{
-    // Alles Ohne Bindestrich und Punkt, daher auch kein $g und $h
-    
-    $wort="$a$b$c$d$f$g$h";
-    $wort=trim($wort);
-
-    if($link == 'lokal'){
-      $wort="$wort|L|$eid";
-      ##### ÄNDERUNG NEUE LUTHERBIBEL ########
-      if($jahr < 2019){
-        return sprintf("<a class=\"biblelink\" href=\"javascript:bib_link_lokal1('bibelpopup/bib_popup_1984.php?wort=%s&stopmark=$f','Bibellink','640','480','center','front');\" onmouseover=\"return overlib('".getword("$wort")."',  ABOVE, CAPTION,'%s', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 450);\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$d.$f.$g.$h,  $a.$b.$c.$d.$f.$g.$h, $a.$b.$c.$d.$e.$f.$g.$h);
-      }else{
-        return sprintf("<a class=\"biblelink\" href=\"javascript:bib_link_lokal1('bibelpopup/bib_popup_2017.php?wort=%s&stopmark=$f','Bibellink','640','480','center','front');\" onmouseover=\"return overlib('".getword("$wort")."',  ABOVE, CAPTION,'%s', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 450);\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$d.$f.$g.$h,  $a.$b.$c.$d.$f.$g.$h, $a.$b.$c.$d.$e.$f.$g.$h);
-      }
-      
-    }elseif($link == 'bibleserver'){
-      ##### ÄNDERUNG NEUE LUTHERBIBEL ########
-      if($jahr < 2019){
-        return sprintf("<a class=\"biblelink\" href=\"http://www.bibleserver.com/go.php?lang={de}&bible={LUT84}&ref=%s\" target=\"_blank\" onmouseover=\"return overlib('".getword("$wort")."',  ABOVE, CAPTION,'%s', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 450);\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$d.$f.$g.$h,  $a.$b.$c.$d.$f.$g.$h, $a.$b.$c.$d.$e.$f.$g.$h);
-      }else{
-        return sprintf("<a class=\"biblelink\" href=\"http://www.bibleserver.com/go.php?lang={de}&bible={LUT}&ref=%s\" target=\"_blank\" onmouseover=\"return overlib('".getword("$wort")."',  ABOVE, CAPTION,'%s', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 450);\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$d.$f.$g.$h,  $a.$b.$c.$d.$f.$g.$h, $a.$b.$c.$d.$e.$f.$g.$h);
-      }
-      
-    }
-    
-  }
-}
-
-function refill($a,$b,$c,$d,$e,$f,$g,$h,$i)
-{
-// Funktion die aus Textstellenkurzeichen die vollständige Textstelle erstellt
-
-
-##echo "a: '$a'<br>
-##      b: '$b'<br>
-##      c: '$c'<br>
-##      d: '$d'<br>
-##      e: '$e'<br>
-##      f: '$f'<br>
-##      g: '$g'<br>
-##      h: '$h'<br>
-##      i: '$i'<br>
-##      ";
-
-
-switch($c)
-{
-case'Sir':
-     $c= 'Sirach';
-     break;
-case'Mo':
-     $c= 'Mose';
-     break;
-case'Jos':
-     $c= 'Josua';
-     break;
-case'Ri':
-     $c= 'Richter';
-     break;
-case'Rut':
-     $c= 'Rut';
-     break;
-case'Sam':
-     $c= 'Samuel';
-     break;
-case'K&ouml;n':
-     $c= 'K&ouml;nige';
-     break;
-case'Chr':
-     $c= 'Chronik';
-     break;
-case'Esr':
-     $c= 'Esra';
-     break;
-case'Neh':
-     $c= 'Nehemia';
-     break;
-case'Est':
-     $c= 'Esther';
-     break;
-case'Hiob':
-     $c= 'Hiob';
-     break;
-case'Hi':
-     $c= 'Hiob';
-     break;
-case'Ps':
-     $c= 'Psalm';
-     break;
-case'Spr':
-     $c= 'Spr&uuml;che';
-     break;
-case'Pred':
-     $c= 'Prediger';
-     break;
-case'Hld':
-     $c= 'Hoheslied';
-     break;
-case'Jes':
-     $c= 'Jesaja';
-     break;
-case'Jer':
-     $c= 'Jeremia';
-     break;
-case'Kla':
-     $c= 'Klagelieder';
-     break;
-case'Klgl':
-     $c= 'Klagelieder';
-     break;
-case'Hes':
-     $c= 'Hesekiel';
-     break;
-case'Dan':
-     $c= 'Daniel';
-     break;
-case'Hos':
-     $c= 'Hosea';
-     break;
-case'Joel':
-     $c= 'Joel';
-     break;
-case'Am':
-     $c= 'Amos';
-     break;
-case'Obd':
-     $c= 'Obadja';
-     break;
-case'Jona':
-     $c= 'Jona';
-     break;
-case'Mi':
-     $c= 'Micha';
-     break;
-case'Nah':
-     $c= 'Nahum';
-     break;
-case'Hab':
-     $c= 'Habakuk';
-     break;
-case'Zef':
-     $c= 'Zefanja';
-     break;
-case'Hag':
-     $c= 'Haggai';
-     break;
-case'Sach':
-     $c= 'Sacharja';
-     break;
-case'Mal':
-     $c= 'Maleachi';
-     break;
-case'Tob':
-     $c= 'Tobias';
-     break;
-case'Mt':
-     $c= 'Matth&auml;us';
-     break;
-case'Mk':
-     $c= 'Markus';
-     break;
-case'Lk':
-     $c= 'Lukas';
-     break;
-case'Luk':
-     $c= 'Lukas';
-     break;
-case'Joh':
-     $c= 'Johannes';
-     break;
-case'Jh':
-     $c= 'Johannes';
-     break;
-case'Apg':
-     $c= 'Apostelgeschichte';
-     break;
-case'R&ouml;m':
-     $c= 'R&ouml;mer';
-     break;
-case'Rom':
-     $c= 'R&ouml;mer';
-     break;
-case'Kor':
-     $c= 'Korinther';
-     break;
-case'Gal':
-     $c= 'Galater';
-     break;
-case'Eph':
-     $c= 'Epheser';
-     break;
-case'Phil':
-     $c= 'Philipper';
-     break;
-case'Kol':
-     $c= 'Kolosser';
-     break;
-case'Thess':
-     $c= 'Thessalonicher';
-     break;
-case'Tim':
-     $c= 'Timotheus';
-     break;
-case'Tit':
-     $c= 'Titus';
-     break;
-case'Phlm':
-     $c= 'Philemon';
-     break;
-case'Ptr':
-     $c= 'Petrus';
-     break;
-case'Petr':
-     $c= 'Petrus';
-     break;
-case'Hbr':
-     $c= 'Hebr&auml;er';
-     break;
-case'Hebr':
-     $c= 'Hebr&auml;er';
-     break;
-case'Jak':
-     $c= 'Jakobus';
-     break;
-case'Jk':
-     $c= 'Jakobus';
-     break;
-case'Jud':
-     $c= 'Judas';
-     break;
-case'Offb':
-     $c= 'Offenbarung';
-     break;
-case'Off':
-     $c= 'Offenbarung';
-     break;
-}
-
-#  $a=trim($a);
-  if($a !=""){$a=trim($a).".";} // nach der Zahl noch der Punkt hinzufügen
-  if($a != ""){$a=trim($a)." ";$b="";} // nach dem Punkt ein Leerzeichen, B kann dann entfallen
-  if($d ==""){$d=" ";}
-  if($g !=""){$g=" ".$g." ";} // --> "1. Johannes 3,aus3" wird "1. Johannes 3, aus 3"
-  #return sprintf('<a href="http://www.bibleserver.com/go.php?lang={de}&bible={LUT84}&ref=%s" target="_blank">%s</a>',  $a.$b.$c.$d.$e.$f.$g.$h, $a.$b.$c.$d.$e.$f.$g.$h);
- 
- 
- return trim($a.$b.$c.$d.$e.$f.$g.$h);
-}
-*/
-
-
-  $db = dbconnect();
-  $result_link_bibel = $db->query("SELECT bibellink
-                                       FROM profil
-                                      WHERE user='$user_admin'");
-  $row_link_bibel = $result_link_bibel->fetch_array();
-
-$suchmuster = '/(KNK) (([0-9]{1,2}\.?){0,5})/';
-$suchmuster2 = '/(KNK-FA) ([0-9]{1,3})/';
-
-$einleitung = strip_tags($row['einleitung'], '<br>,<b>,<strong>,<ul>,<li>,<ol>,<p>,<sup>');
-$einleitung = str_replace('"', '\"', $einleitung);
-$einleitung=preg_replace_callback("/([0-9]\s*)?()?(Sir|Mo|Jos|Ri|Rut|Sam|K&ouml;n|Chr|Esr|Neh|Est|Hiob|Ps|Spr|Pred|Hld|Jes|Jer|Kla|Klgl|Hes|Dan|Hos|Joel|Am|Obd|Jona|Mi|Nah|Hab|Zef|Hag|Sach|Mal|Tob|Mt|Mk|Lk|Luk|Joh|Jh|Apg|R&ouml;m|Rom|Kor|Gal|Eph|Phil|Kol|Thess|Tim|Tit|Phlm|Ptr|Petr|Joh|Hbr|Hebr|Jak|Jk|Jud|Offb|Off)(\s*)".
-                         "([0-9]{1,3})(\,\s*)?(aus\s*)?([0-9]{0,3})/", function($m) use (&$lid) { return refill($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $m[9]);}, $einleitung);
-
-$bibellink = $row_link_bibel['bibellink'];
-$einleitung=preg_replace_callback("/([0-9][0-9]?\.\s*)?(Makkab&auml;er|Johannes|Mose|K&ouml;nige|Chronik|Korinther|Samuel|Thessalonicher|Timotheus|Petrus|Gebet Manasses|St&uuml;cke zu Daniel|St&uuml;cke zu Ester|Baruch|Weisheit|Judit|Judith|Sirach|Josua|Richter|Rut|Ruth|Esra|Nehemia|Esther|Ester|Hiob|Ijob|Psalm|Spr&uuml;che|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Ezechiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matth&auml;us|Markus|Lukas|Apostelgeschichte|R&ouml;mer|Galater|Epheser|Philipper|Kolosser|Titus|Hebr&auml;er|Jakobus|Offenbarung|Philemon|Judas)(\s*[0-9]{1,3})(,\s*)?(\s*aus\s*|\s*Verse\s*|\s*Vers\s*)?([0-9]{0,3})?(\s*\-\s*|\s*\.\s*)?([0-9]{0,3})?/", function($m) use (&$eid,&$bibellink,&$jahr) { return makeLink($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $eid, $bibellink,$jahr);},  $einleitung);
-$einleitung=preg_replace_callback($suchmuster, function($m) { return makeKNK($m[1], $m[2]);}, $einleitung);
-$einleitung=preg_replace_callback($suchmuster2, function($m) { return makeKNK_FA($m[1], $m[2]);}, $einleitung);
-
-$ausfuehrung = strip_tags($row['ausfuehrung'], '<br>,<b>,<strong>,<ul>,<li>,<ol>,<p>,<sup>,<table>,<tr>,<td>,<a>');
-$ausfuehrung = str_replace('"', '\"', $ausfuehrung);
-$ausfuehrung=preg_replace_callback("/([0-9]\s*)?()?(Sir|Mo|Jos|Ri|Rut|Sam|K&ouml;n|Chr|Esr|Neh|Est|Hiob|Ps|Spr|Pred|Hld|Jes|Jer|Kla|Klgl|Hes|Dan|Hos|Joel|Am|Obd|Jona|Mi|Nah|Hab|Zef|Hag|Sach|Mal|Tob|Mt|Mk|Lk|Luk|Joh|Jh|Apg|R&ouml;m|Rom|Kor|Gal|Eph|Phil|Kol|Thess|Tim|Tit|Phlm|Ptr|Petr|Joh|Hbr|Hebr|Jak|Jk|Jud|Offb|Off)(\s*)".
-                         "([0-9]{1,3})(\,\s*)?(aus\s*)?([0-9]{0,3})/", function($m) use (&$lid) { return refill($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $m[9]);}, $ausfuehrung);
-                         
-$ausfuehrung=preg_replace_callback("/([0-9][0-9]?\.\s*)?(Makkab&auml;er|Johannes|Mose|K&ouml;nige|Chronik|Korinther|Samuel|Thessalonicher|Timotheus|Petrus|Gebet Manasses|St&uuml;cke zu Daniel|St&uuml;cke zu Ester|Baruch|Weisheit|Judit|Judith|Sirach|Josua|Richter|Rut|Ruth|Esra|Nehemia|Esther|Ester|Hiob|Ijob|Psalm|Spr&uuml;che|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Ezechiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matth&auml;us|Markus|Lukas|Apostelgeschichte|R&ouml;mer|Galater|Epheser|Philipper|Kolosser|Titus|Hebr&auml;er|Jakobus|Offenbarung|Philemon|Judas)(\s*[0-9]{1,3})(,\s*)?(\s*aus\s*|\s*Verse\s*|\s*Vers\s*)?([0-9]{0,3})?(\s*\-\s*|\s*\.\s*)?([0-9]{0,3})?/", function($m) use (&$eid,&$bibellink,&$jahr) { return makeLink($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $eid, $bibellink,$jahr);}, $ausfuehrung);
-$ausfuehrung=preg_replace_callback($suchmuster, function($m) { return makeKNK($m[1], $m[2]);}, $ausfuehrung);
-$ausfuehrung=preg_replace_callback($suchmuster2, function($m) { return makeKNK_FA($m[1], $m[2]);}, $ausfuehrung);
-
-
-$extrakt = strip_tags($row['extrakt'], '<br>,<b>,<strong>,<ul>,<li>,<ol>,<p>,<sup>');
-$extrakt = str_replace('"', '\"', $extrakt);
-$extrakt=preg_replace_callback("/([0-9]\s*)?()?(Sir|Mo|Jos|Ri|Rut|Sam|K&ouml;n|Chr|Esr|Neh|Est|Hiob|Ps|Spr|Pred|Hld|Jes|Jer|Kla|Klgl|Hes|Dan|Hos|Joel|Am|Obd|Jona|Mi|Nah|Hab|Zef|Hag|Sach|Mal|Tob|Mt|Mk|Lk|Luk|Joh|Jh|Apg|R&ouml;m|Rom|Kor|Gal|Eph|Phil|Kol|Thess|Tim|Tit|Phlm|Ptr|Petr|Joh|Hbr|Hebr|Jak|Jk|Jud|Offb|Off)(\s*)".
-                         "([0-9]{1,3})(\,\s*)?(aus\s*)?([0-9]{0,3})/", function($m) use (&$lid) { return refill($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $m[9]);}, $extrakt);
-$extrakt=preg_replace_callback("/([0-9][0-9]?\.\s*)?(Makkab&auml;er|Johannes|Mose|K&ouml;nige|Chronik|Korinther|Samuel|Thessalonicher|Timotheus|Petrus|Gebet Manasses|St&uuml;cke zu Daniel|St&uuml;cke zu Ester|Baruch|Weisheit|Judit|Judith|Sirach|Josua|Richter|Rut|Ruth|Esra|Nehemia|Esther|Ester|Hiob|Ijob|Psalm|Spr&uuml;che|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Ezechiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matth&auml;us|Markus|Lukas|Apostelgeschichte|R&ouml;mer|Galater|Epheser|Philipper|Kolosser|Titus|Hebr&auml;er|Jakobus|Offenbarung|Philemon|Judas)(\s*[0-9]{1,3})(,\s*)?(\s*aus\s*|\s*Verse\s*|\s*Vers\s*)?([0-9]{0,3})?(\s*\-\s*|\s*\.\s*)?([0-9]{0,3})?/", function($m) use (&$eid,&$bibellink,&$jahr) { return makeLink($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $eid, $bibellink,$jahr);},  $extrakt);
-
-$extrakt=preg_replace_callback($suchmuster, function($m) { return makeKNK($m[1], $m[2]);}, $extrakt);
-$extrakt=preg_replace_callback($suchmuster2, function($m) { return makeKNK_FA($m[1], $m[2]);}, $extrakt);
-
-
-if(rore($user_admin,'a_luebear','RE')){
-  $smarty->assign('lue_inhalt_editrecht', "1");
-  $smarty->assign('lue_inhalt_icon_edit', "<a target='kurshaupt' href=\"lue_bearbeiten.php?action=bearbeiten1&lue=$eid\"><img src=\"./templates/$template/images/edit.png\" border=\"0\"></a>");
-}
-
-$thema = strpos("$row[thema]", "Teil");  // Ermitteln wo das Wort "Teil" steht
-$thema = substr("$row[thema]",0 ,$thema ); // Alles vor dem Wort "Teil" anzeigen
-$thema = trim($thema);
-
-while(substr($thema, -1) =='-' or substr($thema, -1)==':' or substr($thema, -1) =='(' or substr($thema, -1) ==' '){
- $thema=trim($thema);
- $thema=substr($thema, 0, -1);
- $thema=trim($thema);
-}
-
-// Vor zurückbuttons bei mehrteiliger LuE
-if($thema!=''){
-  $result_last = $db->query("SELECT eid, thema
-                                FROM lue_quelle
-                               WHERE eid < $row[eid]
-                                 AND thema LIKE '%$thema%'
-                               ORDER BY eid DESC
-                               LIMIT 1");
-  $row_last = $result_last->fetch_array();
-
-  
-  if($row_last['eid'] != ''){
-    $smarty->assign('lue_inhalt_mvback', "1");
-    $smarty->assign('lue_inhalt_mvback_eid', "$row_last[eid]");
-    $smarty->assign('lue_inhalt_mvback_thema', "$row_last[thema]");
-  }
-}
-
-if($thema!=''){
-  $result_next = $db->query("SELECT eid, thema
-                                FROM lue_quelle
-                               WHERE eid > $row[eid]
-                                 AND thema LIKE '%$thema%'
-                               ORDER BY eid ASC
-                               LIMIT 1");
-  $row_next = $result_next->fetch_array();
-
-  
-  if($row_next['eid'] != ''){
-    $smarty->assign('lue_inhalt_mvnext', "1");
-    $smarty->assign('lue_inhalt_mvnext_eid', "$row_next[eid]");
-    $smarty->assign('lue_inhalt_mvnext_thema', "$row_next[thema]");
-  }
-}
-
-          
-if ($suchart == 1){
-  $suchopt = "{0,1}";
-}else{
-  $suchopt = "";
-}
-
-if($inhalt_hig == ""){
-  $text2 = $ausfuehrung;
-}else{
-  $text2 = highlight_results(" ".$ausfuehrung." ", $suchopt, "$inhalt_hig");
-}
-$smarty->assign('lue_inhalt_inhalt', "$text2");
-$smarty->assign('lue_inhalt_einleitung', "$einleitung");
-
-if($extrakt != ''){ 
-  $smarty->assign('lue_inhalt_extraktexists', "1");
-  $smarty->assign('lue_inhalt_extrakt', "$extrakt");
-}
-  
-$smarty->display("$template/$templatename");
-?>
\ No newline at end of file
diff --git a/lue_inhalt.php_lut84_20180219 b/lue_inhalt.php_lut84_20180219
deleted file mode 100644
index 4c3860dd..00000000
--- a/lue_inhalt.php_lut84_20180219
+++ /dev/null
@@ -1,489 +0,0 @@
-<?php
-/*
-# Fuer debugging
-error_reporting(E_ALL);
-ini_set('display_errors', 1);
-#echo __LINE__."<br>";
-*/
-session_start();
-$user_admin=$_COOKIE["user_admin"];
-$eid = $_GET['eid'];
-
-require("func_highlight.php");
-require("bibellookup.php");
-
-
-include_once 'classes/lg-on_Smarty.class.php';
-$smarty = new lgon_Smarty();
-require_once("config.inc.php");
-require_once("func_rollenrechte.php");
-$templatename = substr(basename($_SERVER['PHP_SELF']),0,-3)."html";
-require_once "language/german.inc.php";
-
-
-$suchart = $_GET['suchart'];
-$inhalt_hig = stripslashes($_GET['inhalt_hig']);
-$inhalt_hig = unserialize($inhalt_hig);
-
-
-if ($user_admin == ""){ require("index.php"); exit;} //Wenn man nicht angemeldet ist, darf man nicht auf die Seite
-
-$db = dbconnect();
-$result = $db->query("SELECT eid, thema, einleitung, ausfuehrung, extrakt
-                        FROM lue_quelle
-                       WHERE eid='$eid'");
-$row = $result->fetch_array();
-$smarty->assign('lue_inhalt_thema', "$row[thema]");
-
-$sid = session_id();
-$datum=date("Y-m-d H:i:s");
-$result_1 = $db->query( "INSERT INTO historie (vaid, datum, session_id, art, art_id) VALUES ('$user_vaid;', '$datum', '$sid', 'E', '$eid')" );
-
-function makeLink($a, $b, $c, $d, $e, $f, $g, $h,$eid, $link)
-{
-
-  $a=trim($a);
-  $b=trim($b);
-  $c=trim($c);
-  $d=trim($d);
-  $e=trim($e);
-  $f=trim($f);
-  $g=trim($g);
-  $h=trim($h);
-  
-  # $d muss immer ein Komma haben, wenn danach noch was kommt
-  if($e != '' or $f != "" or $g != "" or $h != ""){
-   if($d == ''){
-     $d=',';
-   }
-  }
-  
-  /*
-  echo "a: '$a'<br>
-        b: '$b'<br>
-        c: '$c'<br>
-        d: '$d'<br>
-        e: '$e'<br>
-        f: '$f'<br>
-        g: '$g'<br>
-        h: '$h'<br>
-        i: '$i'<br>
-        ";
-  */
-  
-  $b =str_replace  ("Ruth",  "Rut"  ,  $b);
-  $b =str_replace  ("Esther",  "Ester"  ,  $b);
-  $b =str_replace  ("Judith",  "Judit"  ,  $b);
-  $b =str_replace  ("Ezechiel",  "Hesekiel"  ,  $b);
-  $b =str_replace  ("Ijob",  "Hiob"  ,  $b);
-  
-  if($a!=''){
-   $a=$a." ";
-  }
-  
-  if($c!=''){
-   $c=" ".$c;
-  }
-  if($e!=''){
-   $e=" ".$e." ";
-  }
-
-  
-  if($g == '-'){
-
-    #$wort="Römer 8,31-39";
-    $wort="$a$b$c$d$f$g$h";
-    $wort=trim($wort);
-    
-    
-    if($link == 'lokal'){
-      $wort="$wort|L|$eid";
-      #target=\"_blank\" 
-      return sprintf("<a class=\"biblelink\" href=\"javascript:bib_link_lokal1('bibelpopup/bib_popup.php?wort=%s&stopmark=$f','Bibellink','640','480','center','front');\" onmouseover=\"return overlib('".getword("$wort")."',  ABOVE, CAPTION,'%s', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 450);\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$d.$f.$g.$h,  $a.$b.$c.$d.$f.$g.$h, $a.$b.$c.$d.$e.$f.$g.$h);
-    }elseif($link == 'bibleserver'){
-      #target=\"_blank\" 
-      return sprintf("<a class=\"biblelink\" href=\"http://www.bibleserver.com/go.php?lang={de}&bible={LUT84}&ref=%s\" target=\"_blank\" onmouseover=\"return overlib('".getword("$wort")."',  ABOVE, CAPTION,'%s', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 450);\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$d.$f.$g.$h,  $a.$b.$c.$d.$f.$g.$h, $a.$b.$c.$d.$e.$f.$g.$h);
-    }
-    
-    
-  }elseif($g == '.'){
-    
-    // Wenn Punkt, dann muss unterschieden werden, ob die Textstelle forlaufend ist
-    $next=$f+1;
-    if($h==$next){
-      // Beispiel Matthäus 1,1.2
-      // aus dem Punkt wird ein Bindestrich für bibleserver
-      $g1='-';
-
-      $wort="$a$b$c$d$f$g1$h";
-      $wort=trim($wort);
-      
-      
-    if($link == 'lokal'){
-      $wort="$wort|L|$eid";
-      return sprintf("<a class=\"biblelink\" href=\"javascript:bib_link_lokal1('bibelpopup/bib_popup.php?wort=%s&stopmark=$f','Bibellink','640','480','center','front');\" onmouseover=\"return overlib('".getword("$wort")."',  ABOVE, CAPTION,'%s', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 450);\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$d.$f.$g1.$h,  $a.$b.$c.$d.$f.$g1.$h, $a.$b.$c.$d.$e.$f.$g.$h);
-    }elseif($link == 'bibleserver'){
-      return sprintf("<a class=\"biblelink\" href=\"http://www.bibleserver.com/go.php?lang={de}&bible={LUT84}&ref=%s\" target=\"_blank\" onmouseover=\"return overlib('".getword("$wort")."',  ABOVE, CAPTION,'%s', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 450);\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$d.$f.$g1.$h,  $a.$b.$c.$d.$f.$g1.$h, $a.$b.$c.$d.$e.$f.$g.$h);
-    }
-      
-
-      
-    }else{
-      // Beispiel Matthäus 1,1.3
-      // Da Vers 2 nicht aufgeführt ist, darf man nicht 1-3 machen
-      // Parameter $g und $h (.3) wird daher nicht im Link übergeben
-
-      $wort="$a$b$c$d$f";
-      $wort=trim($wort);
-      
-    if($link == 'lokal'){
-      $wort="$wort|L|$eid";
-      return sprintf("<a class=\"biblelink\" href=\"javascript:bib_link_lokal1('bibelpopup/bib_popup.php?wort=%s&stopmark=$f','Bibellink','640','480','center','front');\" onmouseover=\"return overlib('".getword("$wort")."',  ABOVE, CAPTION,'%s', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 450);\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$d.$f,  $a.$b.$c.$d.$f, $a.$b.$c.$d.$e.$f.$g.$h);
-    }elseif($link == 'bibleserver'){
-      return sprintf("<a class=\"biblelink\" href=\"http://www.bibleserver.com/go.php?lang={de}&bible={LUT84}&ref=%s\" target=\"_blank\" onmouseover=\"return overlib('".getword("$wort")."',  ABOVE, CAPTION,'%s', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 450);\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$d.$f,  $a.$b.$c.$d.$f, $a.$b.$c.$d.$e.$f.$g.$h);
-    }
-   
-      
-    }
-    
-  }else{
-    // Alles Ohne Bindestrich und Punkt, daher auch kein $g und $h
-    
-    $wort="$a$b$c$d$f$g$h";
-    $wort=trim($wort);
-
-    if($link == 'lokal'){
-      $wort="$wort|L|$eid";
-      return sprintf("<a class=\"biblelink\" href=\"javascript:bib_link_lokal1('bibelpopup/bib_popup.php?wort=%s&stopmark=$f','Bibellink','640','480','center','front');\" onmouseover=\"return overlib('".getword("$wort")."',  ABOVE, CAPTION,'%s', CAPTIONSIZE, '10px', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 450);\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$d.$f.$g.$h,  $a.$b.$c.$d.$f.$g.$h, $a.$b.$c.$d.$e.$f.$g.$h);
-    }elseif($link == 'bibleserver'){
-      return sprintf("<a class=\"biblelink\" href=\"http://www.bibleserver.com/go.php?lang={de}&bible={LUT84}&ref=%s\" target=\"_blank\" onmouseover=\"return overlib('".getword("$wort")."',  ABOVE, CAPTION,'%s', STATUS,'', TEXTSIZE, '10px', CAPTIONSIZE, '10px', CAPTIONFONT, 'Arial', WIDTH, 450);\" onmouseout=\"nd();\">%s</a>",  $a.$b.$c.$d.$f.$g.$h,  $a.$b.$c.$d.$f.$g.$h, $a.$b.$c.$d.$e.$f.$g.$h);
-    }
-    
-  }
-}
-
-function refill($a,$b,$c,$d,$e,$f,$g,$h,$i)
-{
-// Funktion die aus Textstellenkurzeichen die vollständige Textstelle erstellt
-
-/*
-echo "a: '$a'<br>
-      b: '$b'<br>
-      c: '$c'<br>
-      d: '$d'<br>
-      e: '$e'<br>
-      f: '$f'<br>
-      g: '$g'<br>
-      h: '$h'<br>
-      i: '$i'<br>
-      ";
-*/
-
-switch($c)
-{
-case'Sir':
-     $c= 'Sirach';
-     break;
-case'Mo':
-     $c= 'Mose';
-     break;
-case'Jos':
-     $c= 'Josua';
-     break;
-case'Ri':
-     $c= 'Richter';
-     break;
-case'Rut':
-     $c= 'Rut';
-     break;
-case'Sam':
-     $c= 'Samuel';
-     break;
-case'K&ouml;n':
-     $c= 'K&ouml;nige';
-     break;
-case'Chr':
-     $c= 'Chronik';
-     break;
-case'Esr':
-     $c= 'Esra';
-     break;
-case'Neh':
-     $c= 'Nehemia';
-     break;
-case'Est':
-     $c= 'Esther';
-     break;
-case'Hiob':
-     $c= 'Hiob';
-     break;
-case'Hi':
-     $c= 'Hiob';
-     break;
-case'Ps':
-     $c= 'Psalm';
-     break;
-case'Spr':
-     $c= 'Spr&uuml;che';
-     break;
-case'Pred':
-     $c= 'Prediger';
-     break;
-case'Hld':
-     $c= 'Hoheslied';
-     break;
-case'Jes':
-     $c= 'Jesaja';
-     break;
-case'Jer':
-     $c= 'Jeremia';
-     break;
-case'Kla':
-     $c= 'Klagelieder';
-     break;
-case'Klgl':
-     $c= 'Klagelieder';
-     break;
-case'Hes':
-     $c= 'Hesekiel';
-     break;
-case'Dan':
-     $c= 'Daniel';
-     break;
-case'Hos':
-     $c= 'Hosea';
-     break;
-case'Joel':
-     $c= 'Joel';
-     break;
-case'Am':
-     $c= 'Amos';
-     break;
-case'Obd':
-     $c= 'Obadja';
-     break;
-case'Jona':
-     $c= 'Jona';
-     break;
-case'Mi':
-     $c= 'Micha';
-     break;
-case'Nah':
-     $c= 'Nahum';
-     break;
-case'Hab':
-     $c= 'Habakuk';
-     break;
-case'Zef':
-     $c= 'Zefanja';
-     break;
-case'Hag':
-     $c= 'Haggai';
-     break;
-case'Sach':
-     $c= 'Sacharja';
-     break;
-case'Mal':
-     $c= 'Maleachi';
-     break;
-case'Tob':
-     $c= 'Tobias';
-     break;
-case'Mt':
-     $c= 'Matth&auml;us';
-     break;
-case'Mk':
-     $c= 'Markus';
-     break;
-case'Lk':
-     $c= 'Lukas';
-     break;
-case'Luk':
-     $c= 'Lukas';
-     break;
-case'Joh':
-     $c= 'Johannes';
-     break;
-case'Jh':
-     $c= 'Johannes';
-     break;
-case'Apg':
-     $c= 'Apostelgeschichte';
-     break;
-case'R&ouml;m':
-     $c= 'R&ouml;mer';
-     break;
-case'Rom':
-     $c= 'R&ouml;mer';
-     break;
-case'Kor':
-     $c= 'Korinther';
-     break;
-case'Gal':
-     $c= 'Galater';
-     break;
-case'Eph':
-     $c= 'Epheser';
-     break;
-case'Phil':
-     $c= 'Philipper';
-     break;
-case'Kol':
-     $c= 'Kolosser';
-     break;
-case'Thess':
-     $c= 'Thessalonicher';
-     break;
-case'Tim':
-     $c= 'Timotheus';
-     break;
-case'Tit':
-     $c= 'Titus';
-     break;
-case'Phlm':
-     $c= 'Philemon';
-     break;
-case'Ptr':
-     $c= 'Petrus';
-     break;
-case'Petr':
-     $c= 'Petrus';
-     break;
-case'Hbr':
-     $c= 'Hebr&auml;er';
-     break;
-case'Hebr':
-     $c= 'Hebr&auml;er';
-     break;
-case'Jak':
-     $c= 'Jakobus';
-     break;
-case'Jk':
-     $c= 'Jakobus';
-     break;
-case'Jud':
-     $c= 'Judas';
-     break;
-case'Offb':
-     $c= 'Offenbarung';
-     break;
-case'Off':
-     $c= 'Offenbarung';
-     break;
-}
-
-#  $a=trim($a);
-  if($a !=""){$a=trim($a).".";} // nach der Zahl noch der Punkt hinzufügen
-  if($a != ""){$a=trim($a)." ";$b="";} // nach dem Punkt ein Leerzeichen, B kann dann entfallen
-  if($d ==""){$d=" ";}
-  if($g !=""){$g=" ".$g." ";} // --> "1. Johannes 3,aus3" wird "1. Johannes 3, aus 3"
-  #return sprintf('<a href="http://www.bibleserver.com/go.php?lang={de}&bible={LUT84}&ref=%s" target="_blank">%s</a>',  $a.$b.$c.$d.$e.$f.$g.$h, $a.$b.$c.$d.$e.$f.$g.$h);
- 
- 
- return trim($a.$b.$c.$d.$e.$f.$g.$h);
-}
-
-
-  $db = dbconnect();
-  $result_link_bibel = $db->query("SELECT bibellink
-                                       FROM profil
-                                      WHERE user='$user_admin'");
-  $row_link_bibel = $result_link_bibel->fetch_array();
-
-$einleitung = strip_tags($row['einleitung'], '<br>,<b>,<strong>,<ul>,<li>,<ol>,<p>,<sup>');
-$einleitung = str_replace('"', '\"', $einleitung);
-$einleitung=preg_replace_callback("/([0-9]\s*)?()?(Sir|Mo|Jos|Ri|Rut|Sam|K&ouml;n|Chr|Esr|Neh|Est|Hiob|Ps|Spr|Pred|Hld|Jes|Jer|Kla|Klgl|Hes|Dan|Hos|Joel|Am|Obd|Jona|Mi|Nah|Hab|Zef|Hag|Sach|Mal|Tob|Mt|Mk|Lk|Luk|Joh|Jh|Apg|R&ouml;m|Rom|Kor|Gal|Eph|Phil|Kol|Thess|Tim|Tit|Phlm|Ptr|Petr|Joh|Hbr|Hebr|Jak|Jk|Jud|Offb|Off)(\s*)".
-                         "([0-9]{1,3})(\,\s*)?(aus\s*)?([0-9]{0,3})/", function($m) use (&$lid) { return refill($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $m[9]);}, $einleitung);
-
-$bibellink = $row_link_bibel['bibellink'];
-$einleitung=preg_replace_callback("/([0-9][0-9]?\.\s*)?(Makkab&auml;er|Johannes|Mose|K&ouml;nige|Chronik|Korinther|Samuel|Thessalonicher|Timotheus|Petrus|Gebet Manasses|St&uuml;cke zu Daniel|St&uuml;cke zu Ester|Baruch|Weisheit|Judit|Judith|Sirach|Josua|Richter|Rut|Ruth|Esra|Nehemia|Esther|Ester|Hiob|Ijob|Psalm|Spr&uuml;che|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Ezechiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matth&auml;us|Markus|Lukas|Apostelgeschichte|R&ouml;mer|Galater|Epheser|Philipper|Kolosser|Titus|Hebr&auml;er|Jakobus|Offenbarung|Philemon|Judas)(\s*[0-9]{1,3})(,\s*)?(\s*aus\s*|\s*Verse\s*|\s*Vers\s*)?([0-9]{0,3})?(\s*\-\s*|\s*\.\s*)?([0-9]{0,3})?/", function($m) use (&$eid,&$bibellink) { return makeLink($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $eid, $bibellink);},  $einleitung);
-
-
-$ausfuehrung = strip_tags($row['ausfuehrung'], '<br>,<b>,<strong>,<ul>,<li>,<ol>,<p>,<sup>,<table>,<tr>,<td>,<a>');
-$ausfuehrung = str_replace('"', '\"', $ausfuehrung);
-$ausfuehrung=preg_replace_callback("/([0-9]\s*)?()?(Sir|Mo|Jos|Ri|Rut|Sam|K&ouml;n|Chr|Esr|Neh|Est|Hiob|Ps|Spr|Pred|Hld|Jes|Jer|Kla|Klgl|Hes|Dan|Hos|Joel|Am|Obd|Jona|Mi|Nah|Hab|Zef|Hag|Sach|Mal|Tob|Mt|Mk|Lk|Luk|Joh|Jh|Apg|R&ouml;m|Rom|Kor|Gal|Eph|Phil|Kol|Thess|Tim|Tit|Phlm|Ptr|Petr|Joh|Hbr|Hebr|Jak|Jk|Jud|Offb|Off)(\s*)".
-                         "([0-9]{1,3})(\,\s*)?(aus\s*)?([0-9]{0,3})/", function($m) use (&$lid) { return refill($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $m[9]);}, $ausfuehrung);
-                         
-$ausfuehrung=preg_replace_callback("/([0-9][0-9]?\.\s*)?(Makkab&auml;er|Johannes|Mose|K&ouml;nige|Chronik|Korinther|Samuel|Thessalonicher|Timotheus|Petrus|Gebet Manasses|St&uuml;cke zu Daniel|St&uuml;cke zu Ester|Baruch|Weisheit|Judit|Judith|Sirach|Josua|Richter|Rut|Ruth|Esra|Nehemia|Esther|Ester|Hiob|Ijob|Psalm|Spr&uuml;che|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Ezechiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matth&auml;us|Markus|Lukas|Apostelgeschichte|R&ouml;mer|Galater|Epheser|Philipper|Kolosser|Titus|Hebr&auml;er|Jakobus|Offenbarung|Philemon|Judas)(\s*[0-9]{1,3})(,\s*)?(\s*aus\s*|\s*Verse\s*|\s*Vers\s*)?([0-9]{0,3})?(\s*\-\s*|\s*\.\s*)?([0-9]{0,3})?/", function($m) use (&$eid,&$bibellink) { return makeLink($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $eid, $bibellink);}, $ausfuehrung);
-
-$extrakt = strip_tags($row['extrakt'], '<br>,<b>,<strong>,<ul>,<li>,<ol>,<p>,<sup>');
-$extrakt = str_replace('"', '\"', $extrakt);
-$extrakt=preg_replace_callback("/([0-9]\s*)?()?(Sir|Mo|Jos|Ri|Rut|Sam|K&ouml;n|Chr|Esr|Neh|Est|Hiob|Ps|Spr|Pred|Hld|Jes|Jer|Kla|Klgl|Hes|Dan|Hos|Joel|Am|Obd|Jona|Mi|Nah|Hab|Zef|Hag|Sach|Mal|Tob|Mt|Mk|Lk|Luk|Joh|Jh|Apg|R&ouml;m|Rom|Kor|Gal|Eph|Phil|Kol|Thess|Tim|Tit|Phlm|Ptr|Petr|Joh|Hbr|Hebr|Jak|Jk|Jud|Offb|Off)(\s*)".
-                         "([0-9]{1,3})(\,\s*)?(aus\s*)?([0-9]{0,3})/", function($m) use (&$lid) { return refill($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $m[9]);}, $extrakt);
-$extrakt=preg_replace_callback("/([0-9][0-9]?\.\s*)?(Makkab&auml;er|Johannes|Mose|K&ouml;nige|Chronik|Korinther|Samuel|Thessalonicher|Timotheus|Petrus|Gebet Manasses|St&uuml;cke zu Daniel|St&uuml;cke zu Ester|Baruch|Weisheit|Judit|Judith|Sirach|Josua|Richter|Rut|Ruth|Esra|Nehemia|Esther|Ester|Hiob|Ijob|Psalm|Spr&uuml;che|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Ezechiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matth&auml;us|Markus|Lukas|Apostelgeschichte|R&ouml;mer|Galater|Epheser|Philipper|Kolosser|Titus|Hebr&auml;er|Jakobus|Offenbarung|Philemon|Judas)(\s*[0-9]{1,3})(,\s*)?(\s*aus\s*|\s*Verse\s*|\s*Vers\s*)?([0-9]{0,3})?(\s*\-\s*|\s*\.\s*)?([0-9]{0,3})?/", function($m) use (&$eid,&$bibellink) { return makeLink($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $eid, $bibellink);},  $extrakt);
-
-
-
-
-if(rore($user_admin,'a_luebear','RE')){
-  $smarty->assign('lue_inhalt_editrecht', "1");
-  $smarty->assign('lue_inhalt_icon_edit', "<a target='kurshaupt' href=\"lue_bearbeiten.php?action=bearbeiten1&lue=$eid\"><img src=\"./templates/$template/images/edit.png\" border=\"0\"></a>");
-}
-
-$thema = strpos("$row[thema]", "Teil");  // Ermitteln wo das Wort "Teil" steht
-$thema = substr("$row[thema]",0 ,$thema ); // Alles vor dem Wort "Teil" anzeigen
-$thema = trim($thema);
-
-while(substr($thema, -1) =='-' or substr($thema, -1)==':' or substr($thema, -1) =='(' or substr($thema, -1) ==' '){
- $thema=trim($thema);
- $thema=substr($thema, 0, -1);
- $thema=trim($thema);
-}
-
-// Vor zurückbuttons bei mehrteiliger LuE
-if($thema!=''){
-  $result_last = $db->query("SELECT eid, thema
-                                FROM lue_quelle
-                               WHERE eid < $row[eid]
-                                 AND thema LIKE '%$thema%'
-                               ORDER BY eid DESC
-                               LIMIT 1");
-  $row_last = $result_last->fetch_array();
-
-  
-  if($row_last['eid'] != ''){
-    $smarty->assign('lue_inhalt_mvback', "1");
-    $smarty->assign('lue_inhalt_mvback_eid', "$row_last[eid]");
-    $smarty->assign('lue_inhalt_mvback_thema', "$row_last[thema]");
-  }
-}
-
-if($thema!=''){
-  $result_next = $db->query("SELECT eid, thema
-                                FROM lue_quelle
-                               WHERE eid > $row[eid]
-                                 AND thema LIKE '%$thema%'
-                               ORDER BY eid ASC
-                               LIMIT 1");
-  $row_next = $result_next->fetch_array();
-
-  
-  if($row_next['eid'] != ''){
-    $smarty->assign('lue_inhalt_mvnext', "1");
-    $smarty->assign('lue_inhalt_mvnext_eid', "$row_next[eid]");
-    $smarty->assign('lue_inhalt_mvnext_thema', "$row_next[thema]");
-  }
-}
-
-          
-if ($suchart == 1){
-  $suchopt = "{0,1}";
-}else{
-  $suchopt = "";
-}
-
-if($inhalt_hig == ""){
-  $text2 = $ausfuehrung;
-}else{
-  $text2 = highlight_results(" ".$ausfuehrung." ", $suchopt, "$inhalt_hig");
-}
-$smarty->assign('lue_inhalt_inhalt', "$text2");
-$smarty->assign('lue_inhalt_einleitung', "$einleitung");
-
-if($extrakt != ''){ 
-  $smarty->assign('lue_inhalt_extraktexists', "1");
-  $smarty->assign('lue_inhalt_extrakt', "$extrakt");
-}
-  
-$smarty->display("$template/$templatename");
-?>
\ No newline at end of file
diff --git a/pdf_gen.php_20200915 b/pdf_gen.php_20200915
deleted file mode 100644
index edf6fc85..00000000
--- a/pdf_gen.php_20200915
+++ /dev/null
@@ -1,721 +0,0 @@
-<?php
-#require_once("./config/datenbankanbindung.php");     // f&uuml;gt die Datenbankanbindung ein: Sys:\php\includes\kurs\datenbankanbindung.php
-#$db = dbconnect();
-require_once("config.inc.php");
-#$lid='4242';
-#$user_admin = "schwaral";
-
-$user_admin=$_COOKIE["user_admin"];
-$lid = $_GET['lid'];
-if ($user_admin == ""){ require("index.php"); exit;} //Wenn man nicht angemeldet ist, darf man nicht auf die Seite
-
-$res = $db->query("SELECT textstelle, thema, unterthema, ueberschrift, textwort, botschaft, inhalt, zusammenfassung, kontext, DATE_Format(datum, '%d') tag, DATE_Format(datum, '%m') monat, DATE_Format(datum, '%Y') jahr, stapgd, kid, ukid, DATE_Format(datum, '%Y-%m-%d')AS datum_berechnung FROM quelle WHERE lid='$lid'");
-$row = $res->fetch_array();
-    
-## Vergleichsdatum: Altes LG / Neue LG ab 01.12.2007. Dementsprechendes PDF generieren
-$date_nlg  = mktime(0, 0, 0, 12, 1, 2007);  // Datum ab dem neue LGs gelten
-$date_nlg_format = date("Y-m-d", $date_nlg);  // ISO-8601 Format wie in der Datenbank: Formatierung f&uuml;r Vergleiche erforderlich
-
-$switch_date = strtotime ($date_nlg_format); //Umrechnung des Fristgrenztages in eine Zahl
-$lg_datum = strtotime ($row['datum_berechnung']); // Umrechnung des Enddatums in eine Zahl
-
-##### ÄNDERUNG NEUE LUTHERBIBEL ########
-if(date("Y") < 2019){
-  require("bibellookup_1984.php");
-}else{
-  require("bibellookup_2017.php");
-}
-
-function makeLink($a, $b, $c, $d, $e, $f, $g, $h, $lid)
-{
-  $a=trim($a);
-  $b=trim($b);
-  $c=trim($c);
-  $d=trim($d);
-  $e=trim($e);
-  $f=trim($f);
-  $g=trim($g);
-  $h=trim($h);
-  # $d muss immer ein Komma haben, wenn danach noch was kommt
-  if($e != '' or $f != "" or $g != "" or $h != ""){
-   if($d == ''){
-     $d=',';
-   }
-  }
-  /*
-  echo "a: '$a'<br>
-        b: '$b'<br>
-        c: '$c'<br>
-        d: '$d'<br>
-        e: '$e'<br>
-        f: '$f'<br>
-        g: '$g'<br>
-        h: '$h'<br>
-        i: '$i'<br>
-        ";
-  */
-  $b =str_replace  ("Ruth",  "Rut"  ,  $b);
-  $b =str_replace  ("Esther",  "Ester"  ,  $b);
-  $b =str_replace  ("Judith",  "Judit"  ,  $b);
-  $b =str_replace  ("Ezechiel",  "Hesekiel"  ,  $b);
-  $b =str_replace  ("Ijob",  "Hiob"  ,  $b);
-  if($a!=''){
-   $a=$a." ";
-  }
-  if($c!=''){
-   $c=" ".$c;
-  }
-  if($e!=''){
-   $e=" ".$e." ";
-  }
-  // Handling, wenn bei Bibelstelle Bindestrich oder Punkt enthalten sind
-  if($g == '-'){
-    #$wort="Römer 8,31-39";
-    $wort="$a$b$c$d$f$g$h";
-    $wort=trim($wort);
-    return sprintf("<a class=\"biblelink\" href=\"http://www.bibleserver.com/go.php?lang={de}&bible={LUT84}&ref=%s\" target=\"_blank\">%s</a>",  $a.$b.$c.$d.$f.$g.$h, $a.$b.$c.$d.$e.$f.$g.$h);
-  }elseif($g == '.'){
-    // Wenn Punkt, dann muss unterschieden werden, ob die Textstelle forlaufend ist
-    $next=$f+1;
-    if($h==$next){
-      // Beispiel Matthäus 1,1.2
-      // aus dem Punkt wird ein Bindestrich für bibleserver
-      $g1='-';
-      $wort="$a$b$c$d$f$g1$h";
-      $wort=trim($wort);
-      return sprintf("<a class=\"biblelink\" href=\"http://www.bibleserver.com/go.php?lang={de}&bible={LUT84}&ref=%s\" target=\"_blank\">%s</a>",  $a.$b.$c.$d.$f.$g1.$h, $a.$b.$c.$d.$e.$f.$g.$h);
-    }else{
-      // Beispiel Matthäus 1,1.3
-      // Da Vers 2 nicht aufgeführt ist, darf man nicht 1-3 machen
-      // Parameter $g und $h (.3) wird daher nicht im Link übergeben
-      $wort="$a$b$c$d$f";
-      $wort=trim($wort);
-      return sprintf("<a class=\"biblelink\" href=\"http://www.bibleserver.com/go.php?lang={de}&bible={LUT84}&ref=%s\" target=\"_blank\">%s</a>",  $a.$b.$c.$d.$f, $a.$b.$c.$d.$e.$f.$g.$h);
-    }
-  }else{
-    // Alles Ohne Bindestrich und Punkt, daher auch kein $g und $h
-    $wort="$a$b$c$d$f$g$h";
-    $wort=trim($wort);
-    return sprintf("<a class=\"biblelink\" href=\"http://www.bibleserver.com/go.php?lang={de}&bible={LUT84}&ref=%s\" target=\"_blank\">%s</a>",  $a.$b.$c.$d.$f.$g.$h,  $a.$b.$c.$d.$e.$f.$g.$h);
-  }
-}
-
-
-function refill($a,$b,$c,$d,$e,$f,$g,$h,$i)
-{
- 
-// Funktion die aus Textstellenkurzeichen die vollständige Textstelle erstellt
-
-/*
-echo "a: '$a'<br>
-      b: '$b'<br>
-      c: '$c'<br>
-      d: '$d'<br>
-      e: '$e'<br>
-      f: '$f'<br>
-      g: '$g'<br>
-      h: '$h'<br>
-      i: '$i'<br>
-      ";
-*/
-
-switch($c)
-{
-case'Sir':
-     $c= 'Sirach';
-     break;
-case'Mo':
-     $c= 'Mose';
-     break;
-case'Jos':
-     $c= 'Josua';
-     break;
-case'Ri':
-     $c= 'Richter';
-     break;
-case'Rut':
-     $c= 'Rut';
-     break;
-case'Sam':
-     $c= 'Samuel';
-     break;
-case'K&ouml;n':
-     $c= 'K&ouml;nige';
-     break;
-case'Chr':
-     $c= 'Chronik';
-     break;
-case'Esr':
-     $c= 'Esra';
-     break;
-case'Neh':
-     $c= 'Nehemia';
-     break;
-case'Est':
-     $c= 'Esther';
-     break;
-case'Hiob':
-     $c= 'Hiob';
-     break;
-case'Hi':
-     $c= 'Hiob';
-     break;
-case'Ps':
-     $c= 'Psalm';
-     break;
-case'Spr':
-     $c= 'Spr&uuml;che';
-     break;
-case'Pred':
-     $c= 'Prediger';
-     break;
-case'Hld':
-     $c= 'Hoheslied';
-     break;
-case'Jes':
-     $c= 'Jesaja';
-     break;
-case'Jer':
-     $c= 'Jeremia';
-     break;
-case'Kla':
-     $c= 'Klagelieder';
-     break;
-case'Klgl':
-     $c= 'Klagelieder';
-     break;
-case'Hes':
-     $c= 'Hesekiel';
-     break;
-case'Dan':
-     $c= 'Daniel';
-     break;
-case'Hos':
-     $c= 'Hosea';
-     break;
-case'Joel':
-     $c= 'Joel';
-     break;
-case'Am':
-     $c= 'Amos';
-     break;
-case'Obd':
-     $c= 'Obadja';
-     break;
-case'Jona':
-     $c= 'Jona';
-     break;
-case'Mi':
-     $c= 'Micha';
-     break;
-case'Nah':
-     $c= 'Nahum';
-     break;
-case'Hab':
-     $c= 'Habakuk';
-     break;
-case'Zef':
-     $c= 'Zefanja';
-     break;
-case'Hag':
-     $c= 'Haggai';
-     break;
-case'Sach':
-     $c= 'Sacharja';
-     break;
-case'Mal':
-     $c= 'Maleachi';
-     break;
-case'Tob':
-     $c= 'Tobias';
-     break;
-case'Mt':
-     $c= 'Matth&auml;us';
-     break;
-case'Mk':
-     $c= 'Markus';
-     break;
-case'Lk':
-     $c= 'Lukas';
-     break;
-case'Luk':
-     $c= 'Lukas';
-     break;
-case'Joh':
-     $c= 'Johannes';
-     break;
-case'Jh':
-     $c= 'Johannes';
-     break;
-case'Apg':
-     $c= 'Apostelgeschichte';
-     break;
-case'R&ouml;m':
-     $c= 'R&ouml;mer';
-     break;
-case'Rom':
-     $c= 'R&ouml;mer';
-     break;
-case'Kor':
-     $c= 'Korinther';
-     break;
-case'Gal':
-     $c= 'Galater';
-     break;
-case'Eph':
-     $c= 'Epheser';
-     break;
-case'Phil':
-     $c= 'Philipper';
-     break;
-case'Kol':
-     $c= 'Kolosser';
-     break;
-case'Thess':
-     $c= 'Thessalonicher';
-     break;
-case'Tim':
-     $c= 'Timotheus';
-     break;
-case'Tit':
-     $c= 'Titus';
-     break;
-case'Phlm':
-     $c= 'Philemon';
-     break;
-case'Ptr':
-     $c= 'Petrus';
-     break;
-case'Petr':
-     $c= 'Petrus';
-     break;
-case'Hbr':
-     $c= 'Hebr&auml;er';
-     break;
-case'Hebr':
-     $c= 'Hebr&auml;er';
-     break;
-case'Jak':
-     $c= 'Jakobus';
-     break;
-case'Jk':
-     $c= 'Jakobus';
-     break;
-case'Jud':
-     $c= 'Judas';
-     break;
-case'Offb':
-     $c= 'Offenbarung';
-     break;
-case'Off':
-     $c= 'Offenbarung';
-     break;
-}
-
-#  $a=trim($a);
-  if($a !=""){$a=$a.".";} // nach der Zahl noch der Punkt hinzufügen
-  if($a != ""){$a=$a." ";$b="";} // nach dem Punkt ein Leerzeichen, B kann dann entfallen
-  if($d ==""){$d=" ";}
-  #return sprintf('<a href="http://www.bibleserver.com/go.php?lang={de}&bible={LUT84}&ref=%s" target="_blank">%s</a>',  $a.$b.$c.$d.$e.$f.$g.$h, $a.$b.$c.$d.$e.$f.$g.$h);
-  return $a.$b.$c.$d.$e.$f.$g.$h;
-}
-##################Function Ende####################################
-
-
-
-###################################################################
-$res1 = $db->query("SELECT bezeichnung FROM kategorie WHERE kid='$row[kid]'");
-$row1 = $res1->fetch_array();
-
-$res2 = $db->query("SELECT bezeichnung FROM unterkategorie WHERE ukid='$row[ukid]'");
-$row2 = $res2->fetch_array();
-
-$res3 = $db->query("SELECT bezeichnung FROM thema WHERE tid='$row[thema]'");
-$row3 = $res3->fetch_array();
-
-$res6 = $db->query("SELECT bezeichnung FROM unterthema WHERE tid='$row[thema]' AND utid='$row[unterthema]'");
-$row6 = $res6->fetch_array();
-
-$res7 = $db->query("SELECT notiz FROM notizen WHERE lid='$lid' AND user='$user_admin'");
-$row7 = $res7->fetch_array();
-
-
-$textwort = strip_tags($row['textwort'], '<br>,<strong>,<ul>,<li>,<ol>');
-$textwort = str_replace('"', '\"', $textwort);
-$textwort=preg_replace_callback("/([0-9]*)(\s*)(Sir|Mo|Jos|Ri|Rut|Sam|K&ouml;n|Chr|Esr|Neh|Est|Hiob|Ps|Spr|Pred|Hld|Jes|Jer|Kla|Klgl|Hes|Dan|Hos|Joel|Am|Obd|Jona|Mi|Nah|Hab|Zef|Hag|Sach|Mal|Tob|Mt|Mk|Lk|Luk|Joh|Jh|Apg|R&ouml;m|Rom|Kor|Gal|Eph|Phil|Kol|Thess|Tim|Tit|Phlm|Ptr|Petr|Joh|Hbr|Hebr|Jak|Jk|Jud|Offb|Off)(\s*)".
-                    "([0-9]{1,3})(\,)?\s*(aus)?\s*([0-9]{0,3})/", function($m) use (&$lid) { return refill($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $m[9], $lid);}, $textwort);
-#$textwort = preg_replace('/([0-9][0-9]?\.\s*)?(Sirach|Mose|Josua|Richter|Rut|Samuel|K&ouml;nige|Chronik|Esra|Nehemia|Esther|Hiob|Psalm|Spr&uuml;che|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matth&auml;us|Markus|Lukas|Johannes|Apostelgeschichte|R&ouml;mer|Korinther|Galater|Epheser|Philipper|Kolosser|Thessalonicher|Timotheus|Titus|Philemon|Hebr&auml;er|Jakobus|Petrus|Judas|Offenbarung)(\s*[0-9]{1,3}\s*)(,)?(\s*aus|Vers)?(\s*[0-9]{0,2})?/', makeLink("$1", "$2", "$3", "$4", "$5", "$6"), $textwort);
-$textwort =preg_replace_callback("/([0-9][0-9]?\.\s*)?(Makkab&auml;er|Johannes|Mose|K&ouml;nige|Chronik|Korinther|Samuel|Thessalonicher|Timotheus|Petrus|Gebet Manasses|St&uuml;cke zu Daniel|St&uuml;cke zu Ester|Baruch|Weisheit|Judit|Judith|Sirach|Josua|Richter|Rut|Ruth|Esra|Nehemia|Esther|Ester|Hiob|Ijob|Psalm|Spr&uuml;che|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Ezechiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matth&auml;us|Markus|Lukas|Apostelgeschichte|R&ouml;mer|Galater|Epheser|Philipper|Kolosser|Titus|Hebr&auml;er|Jakobus|Offenbarung|Philemon|Judas)(\s*[0-9]{1,3})(,\s*)?(\s*aus\s*|\s*Verse\s*|\s*Vers\s*)?([0-9]{0,3})?(\s*\-\s*|\s*\.\s*)?([0-9]{0,3})?/", function($m) use (&$lid) { return makeLink($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $lid);}, $textwort);
-
-$textwort = str_replace (array("<ul>", chr(10), "<ol>"), array("</div><div align='justify'><ul type='square'>","", "</div><div align='justify'><ol>"), $textwort);
-$textwort = str_replace (array("<br style=\"\" />", "&middot;", "&nbsp;", "&lt;", "&gt;", "&quot;", "&bdquo;", "&ldquo;", "&sbquo;", "&lsquo;", "&laquo;", "&raquo;", "&bull;")
-                       , array("", chr(183), " ",  chr(60),chr(62),chr(34),chr(132), chr(148), "'", "'", chr(174), chr(175), chr(149))
-                       , $textwort
-                        );
-$textwort = trim($textwort);
-
-$botschaft = strip_tags($row['botschaft'], '<br>,<strong>,<ul>,<li>,<ol>');
-$botschaft = str_replace('"', '\"', $botschaft);
-$botschaft = preg_replace_callback("/([0-9]*)(\s*)(Sir|Mo|Jos|Ri|Rut|Sam|K&ouml;n|Chr|Esr|Neh|Est|Hiob|Ps|Spr|Pred|Hld|Jes|Jer|Kla|Klgl|Hes|Dan|Hos|Joel|Am|Obd|Jona|Mi|Nah|Hab|Zef|Hag|Sach|Mal|Tob|Mt|Mk|Lk|Luk|Joh|Jh|Apg|R&ouml;m|Rom|Kor|Gal|Eph|Phil|Kol|Thess|Tim|Tit|Phlm|Ptr|Petr|Joh|Hbr|Hebr|Jak|Jk|Jud|Offb|Off)(\s*)".
-                    "([0-9]{1,3})(\,)?\s*(aus)?\s*([0-9]{0,3})/", function($m) use (&$lid) { return refill($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $m[9], $lid);}, $botschaft);
-                   
-                         
-#$botschaft = preg_replace('/([0-9][0-9]?\.\s*)?(Sirach|Mose|Josua|Richter|Rut|Samuel|K&ouml;nige|Chronik|Esra|Nehemia|Esther|Hiob|Psalm|Spr&uuml;che|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matth&auml;us|Markus|Lukas|Johannes|Apostelgeschichte|R&ouml;mer|Korinther|Galater|Epheser|Philipper|Kolosser|Thessalonicher|Timotheus|Titus|Philemon|Hebr&auml;er|Jakobus|Petrus|Judas|Offenbarung)(\s*[0-9]{1,3}\s*)(,)?(\s*aus|Vers)?(\s*[0-9]{0,2})?/', makeLink("$1", "$2", "$3", "$4", "$5", "$6"), $botschaft);
-
-$botschaft =preg_replace_callback("/([0-9][0-9]?\.\s*)?(Makkab&auml;er|Johannes|Mose|K&ouml;nige|Chronik|Korinther|Samuel|Thessalonicher|Timotheus|Petrus|Gebet Manasses|St&uuml;cke zu Daniel|St&uuml;cke zu Ester|Baruch|Weisheit|Judit|Judith|Sirach|Josua|Richter|Rut|Ruth|Esra|Nehemia|Esther|Ester|Hiob|Ijob|Psalm|Spr&uuml;che|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Ezechiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matth&auml;us|Markus|Lukas|Apostelgeschichte|R&ouml;mer|Galater|Epheser|Philipper|Kolosser|Titus|Hebr&auml;er|Jakobus|Offenbarung|Philemon|Judas)(\s*[0-9]{1,3})(,\s*)?(\s*aus\s*|\s*Verse\s*|\s*Vers\s*)?([0-9]{0,3})?(\s*\-\s*|\s*\.\s*)?([0-9]{0,3})?/", function($m) use (&$lid) { return makeLink($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $lid);}, $botschaft);
-
-$botschaft = str_replace (array("<ul>", chr(10), "<ol>"), array("</div><div align='justify'><ul type='square'>","", "</div><div align='justify'><ol>"), $botschaft);
-
-$inhalt = strip_tags($row['inhalt'], '<br>,<strong>,<ul>,<li>,<ol>,<a>,<table>,<tr>,<td>,<h1>,<h2>,<h3>,<img>');
-#$inhalt = str_replace('"', '\"', $inhalt);
-$inhalt = preg_replace_callback("/([0-9]*)(\s*)(Sir|Mo|Jos|Ri|Rut|Sam|K&ouml;n|Chr|Esr|Neh|Est|Hiob|Ps|Spr|Pred|Hld|Jes|Jer|Kla|Klgl|Hes|Dan|Hos|Joel|Am|Obd|Jona|Mi|Nah|Hab|Zef|Hag|Sach|Mal|Tob|Mt|Mk|Lk|Luk|Joh|Jh|Apg|R&ouml;m|Rom|Kor|Gal|Eph|Phil|Kol|Thess|Tim|Tit|Phlm|Ptr|Petr|Joh|Hbr|Hebr|Jak|Jk|Jud|Offb|Off)(\s*)".
-                    "([0-9]{1,3})(\,)?\s*(aus)?\s*([0-9]{0,3})/", function($m) use (&$lid) { return refill($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $m[9], $lid);}, $inhalt);
-  
-                    
-$inhalt =preg_replace_callback("/([0-9][0-9]?\.\s*)?(Makkab&auml;er|Johannes|Mose|K&ouml;nige|Chronik|Korinther|Samuel|Thessalonicher|Timotheus|Petrus|Gebet Manasses|St&uuml;cke zu Daniel|St&uuml;cke zu Ester|Baruch|Weisheit|Judit|Judith|Sirach|Josua|Richter|Rut|Ruth|Esra|Nehemia|Esther|Ester|Hiob|Ijob|Psalm|Spr&uuml;che|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Ezechiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matth&auml;us|Markus|Lukas|Apostelgeschichte|R&ouml;mer|Galater|Epheser|Philipper|Kolosser|Titus|Hebr&auml;er|Jakobus|Offenbarung|Philemon|Judas)(\s*[0-9]{1,3})(,\s*)?(\s*aus\s*|\s*Verse\s*|\s*Vers\s*)?([0-9]{0,3})?(\s*\-\s*|\s*\.\s*)?([0-9]{0,3})?/", function($m) use (&$lid) { return makeLink($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $lid);}, $inhalt);
-#$inhalt = str_replace (array("<ul>", chr(10)), array("</div><div align='justify'><ul type='square'>",""), $inhalt);
-#$inhalt = str_replace (array("<ul>", chr(10), "<ol>"), array("</div><div align='justify'><ul type='square'>","", "</div><div align='justify'><ol>"), $inhalt);
-$inhalt = str_replace (array("<br style=\"\" />", "&middot;", "&nbsp;", "&lt;", "&gt;", "&quot;", "&bdquo;", "&ldquo;", "&sbquo;", "&lsquo;", "&laquo;", "&raquo;", "&bull;")
-                       , array("", chr(183), " ",  chr(60),chr(62),chr(34),chr(132), chr(148), "'", "'", chr(174), chr(175), chr(149))
-                       , $inhalt
-                        );
-
-$zusammenfassung = strip_tags($row['zusammenfassung'], '<br>,<strong>,<ul>,<li>,<ol>');
-$zusammenfassung = str_replace('"', '\"', $zusammenfassung);
-$zusammenfassung =preg_replace_callback("/([0-9]*)(\s*)(Sir|Mo|Jos|Ri|Rut|Sam|K&ouml;n|Chr|Esr|Neh|Est|Hiob|Ps|Spr|Pred|Hld|Jes|Jer|Kla|Klgl|Hes|Dan|Hos|Joel|Am|Obd|Jona|Mi|Nah|Hab|Zef|Hag|Sach|Mal|Tob|Mt|Mk|Lk|Luk|Joh|Jh|Apg|R&ouml;m|Rom|Kor|Gal|Eph|Phil|Kol|Thess|Tim|Tit|Phlm|Ptr|Petr|Joh|Hbr|Hebr|Jak|Jk|Jud|Offb|Off)(\s*)".
-                                "([0-9]{1,3})(\,)?\s*(aus)?\s*([0-9]{0,3})/", function($m) use (&$lid) { return refill($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $m[9], $lid);}, $zusammenfassung);
-$#zusammenfassung = preg_replace('/([0-9][0-9]?\.\s*)?(Sirach|Mose|Josua|Richter|Rut|Samuel|K&ouml;nige|Chronik|Esra|Nehemia|Esther|Hiob|Psalm|Spr&uuml;che|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matth&auml;us|Markus|Lukas|Johannes|Apostelgeschichte|R&ouml;mer|Korinther|Galater|Epheser|Philipper|Kolosser|Thessalonicher|Timotheus|Titus|Philemon|Hebr&auml;er|Jakobus|Petrus|Judas|Offenbarung)(\s*[0-9]{1,3}\s*)(,)?(\s*aus|Vers)?(\s*[0-9]{0,2})?/', makeLink("$1", "$2", "$3", "$4", "$5", "$6"), $zusammenfassung);
-$zusammenfassung=preg_replace_callback("/([0-9][0-9]?\.\s*)?(Makkab&auml;er|Johannes|Mose|K&ouml;nige|Chronik|Korinther|Samuel|Thessalonicher|Timotheus|Petrus|Gebet Manasses|St&uuml;cke zu Daniel|St&uuml;cke zu Ester|Baruch|Weisheit|Judit|Judith|Sirach|Josua|Richter|Rut|Ruth|Esra|Nehemia|Esther|Ester|Hiob|Ijob|Psalm|Spr&uuml;che|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Ezechiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matth&auml;us|Markus|Lukas|Apostelgeschichte|R&ouml;mer|Galater|Epheser|Philipper|Kolosser|Titus|Hebr&auml;er|Jakobus|Offenbarung|Philemon|Judas)(\s*[0-9]{1,3})(,\s*)?(\s*aus\s*|\s*Verse\s*|\s*Vers\s*)?([0-9]{0,3})?(\s*\-\s*|\s*\.\s*)?([0-9]{0,3})?/", function($m) use (&$lid) { return makeLink($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $lid);}, $zusammenfassung);
-#$zusammenfassung = str_replace (array("<ul>"), array("<ul type='disc'>"), $zusammenfassung);
-$zusammenfassung = str_replace (array("<br style=\"\" />", "&middot;", "&nbsp;", "&lt;", "&gt;", "&quot;", "&bdquo;", "&ldquo;", "&sbquo;", "&lsquo;", "&laquo;", "&raquo;", "&bull;")
-                       , array("", chr(183), " ",  chr(60),chr(62),chr(34),chr(132), chr(148), "'", "'", chr(174), chr(175), chr(149))
-                       , $zusammenfassung
-                        );
-
-$kontext = strip_tags($row['kontext'], '<br>,<strong>,<ul>,<li>,<ol>');
-$kontext = str_replace('"', '\"', $kontext);
-$kontext=preg_replace_callback("/([0-9]*)(\s*)(Sir|Mo|Jos|Ri|Rut|Sam|K&ouml;n|Chr|Esr|Neh|Est|Hiob|Ps|Spr|Pred|Hld|Jes|Jer|Kla|Klgl|Hes|Dan|Hos|Joel|Am|Obd|Jona|Mi|Nah|Hab|Zef|Hag|Sach|Mal|Tob|Mt|Mk|Lk|Luk|Joh|Jh|Apg|R&ouml;m|Rom|Kor|Gal|Eph|Phil|Kol|Thess|Tim|Tit|Phlm|Ptr|Petr|Joh|Hbr|Hebr|Jak|Jk|Jud|Offb|Off)(\s*)".
-                    "([0-9]{1,3})(\,)?\s*(aus)?\s*([0-9]{0,3})/", function($m) use (&$lid) { return refill($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $m[9], $lid);}, $kontext);
-#$kontext = preg_replace('/([0-9][0-9]?\.\s*)?(Sirach|Mose|Josua|Richter|Rut|Samuel|K&ouml;nige|Chronik|Esra|Nehemia|Esther|Hiob|Psalm|Spr&uuml;che|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matth&auml;us|Markus|Lukas|Johannes|Apostelgeschichte|R&ouml;mer|Korinther|Galater|Epheser|Philipper|Kolosser|Thessalonicher|Timotheus|Titus|Philemon|Hebr&auml;er|Jakobus|Petrus|Judas|Offenbarung)(\s*[0-9]{1,3}\s*)(,)?(\s*aus|Vers)?(\s*[0-9]{0,2})?/', makeLink("$1", "$2", "$3", "$4", "$5", "$6"), $kontext);
-$kontext=preg_replace_callback("/([0-9][0-9]?\.\s*)?(Makkab&auml;er|Johannes|Mose|K&ouml;nige|Chronik|Korinther|Samuel|Thessalonicher|Timotheus|Petrus|Gebet Manasses|St&uuml;cke zu Daniel|St&uuml;cke zu Ester|Baruch|Weisheit|Judit|Judith|Sirach|Josua|Richter|Rut|Ruth|Esra|Nehemia|Esther|Ester|Hiob|Ijob|Psalm|Spr&uuml;che|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Ezechiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matth&auml;us|Markus|Lukas|Apostelgeschichte|R&ouml;mer|Galater|Epheser|Philipper|Kolosser|Titus|Hebr&auml;er|Jakobus|Offenbarung|Philemon|Judas)(\s*[0-9]{1,3})(,\s*)?(\s*aus\s*|\s*Verse\s*|\s*Vers\s*)?([0-9]{0,3})?(\s*\-\s*|\s*\.\s*)?([0-9]{0,3})?/", function($m) use (&$lid) { return makeLink($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $lid);}, $kontext);
-$kontext = str_replace (array("<ul>", chr(10), "<ol>"), array("</div><div align='justify'><ul type='square'>","", "</div><div align='justify'><ol>"), $kontext);
-$kontext = str_replace (array("<br style=\"\" />", "&middot;", "&nbsp;", "&lt;", "&gt;", "&quot;", "&bdquo;", "&ldquo;", "&sbquo;", "&lsquo;", "&laquo;", "&raquo;", "&bull;")
-                       , array("", chr(183), " ",  chr(60),chr(62),chr(34),chr(132), chr(148), "'", "'", chr(174), chr(175), chr(149))
-                       , $kontext
-                        );
-                        
-$notiz = strip_tags($row7['notiz'], '<p>,<br>,<strong>,<ul>,<li>,<ol>');
-$notiz = str_replace('"', '\"', $notiz);
-$notiz=preg_replace_callback("/([0-9]*)(\s*)(Sir|Mo|Jos|Ri|Rut|Sam|K&ouml;n|Chr|Esr|Neh|Est|Hiob|Ps|Spr|Pred|Hld|Jes|Jer|Kla|Klgl|Hes|Dan|Hos|Joel|Am|Obd|Jona|Mi|Nah|Hab|Zef|Hag|Sach|Mal|Tob|Mt|Mk|Lk|Luk|Joh|Jh|Apg|R&ouml;m|Rom|Kor|Gal|Eph|Phil|Kol|Thess|Tim|Tit|Phlm|Ptr|Petr|Joh|Hbr|Hebr|Jak|Jk|Jud|Offb|Off)(\s*)".
-                    "([0-9]{1,3})(\,)?\s*(aus)?\s*([0-9]{0,3})/", function($m) use (&$lid) { return refill($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $m[9], $lid);}, $notiz);
-#$notiz = preg_replace('/([0-9][0-9]?\.\s*)?(Sirach|Mose|Josua|Richter|Rut|Samuel|K&ouml;nige|Chronik|Esra|Nehemia|Esther|Hiob|Psalm|Spr&uuml;che|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matth&auml;us|Markus|Lukas|Johannes|Apostelgeschichte|R&ouml;mer|Korinther|Galater|Epheser|Philipper|Kolosser|Thessalonicher|Timotheus|Titus|Philemon|Hebr&auml;er|Jakobus|Petrus|Judas|Offenbarung)(\s*[0-9]{1,3}\s*)(,)?(\s*aus|Vers)?(\s*[0-9]{0,2})?/', makeLink("$1", "$2", "$3", "$4", "$5", "$6"), $notiz);
-$notiz=preg_replace_callback("/([0-9][0-9]?\.\s*)?(Makkab&auml;er|Johannes|Mose|K&ouml;nige|Chronik|Korinther|Samuel|Thessalonicher|Timotheus|Petrus|Gebet Manasses|St&uuml;cke zu Daniel|St&uuml;cke zu Ester|Baruch|Weisheit|Judit|Judith|Sirach|Josua|Richter|Rut|Ruth|Esra|Nehemia|Esther|Ester|Hiob|Ijob|Psalm|Spr&uuml;che|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Ezechiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matth&auml;us|Markus|Lukas|Apostelgeschichte|R&ouml;mer|Galater|Epheser|Philipper|Kolosser|Titus|Hebr&auml;er|Jakobus|Offenbarung|Philemon|Judas)(\s*[0-9]{1,3})(,\s*)?(\s*aus\s*|\s*Verse\s*|\s*Vers\s*)?([0-9]{0,3})?(\s*\-\s*|\s*\.\s*)?([0-9]{0,3})?/", function($m) use (&$lid) { return makeLink($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $lid);}, $notiz);
-$notiz = str_replace (array("<ul>", chr(10), "<ol>"), array("</div><div align='justify'><ul type='square'>","", "</div><div align='justify'><ol>"), $notiz);
-$notiz = str_replace (array("<br style=\"\" />", "&middot;", "&nbsp;", "&lt;", "&gt;", "&quot;", "&bdquo;", "&ldquo;", "&sbquo;", "&lsquo;", "&laquo;", "&raquo;", "&bull;")
-                       , array("", chr(183), " ",  chr(60),chr(62),chr(34),chr(132), chr(148), "'", "'", chr(174), chr(175), chr(149))
-                       , $notiz
-                        );
-
-
-$wochentag = date("l", mktime(0,0,0,$row['monat'],$row['tag'],$row['jahr']));
-
-if($wochentag == 'Wednesday' AND $row_gd['wgd'] != '0' AND ($row['ukid'] == '1')){  // Hintergrund kommt aus der wort_wahl.php. Es gibt einige Gottesdienste, die auf einen Mittwoch fallen (1. vom Monat) aber kein Tag addiert werden darf, daher: Wann muss ein Tag (faktor) addiert werden, generell, wenn Wochengottesdienst, wenn Faktor im Profil != 0 und wenn unterkategorie 1 (GD normal) ist. Bei allen anderen Gottesdiensten bleibt der Mittwoch erhalten. (Buß und Bettag ist Mittwoch, Erntedank bleibt auch am 1. des Monats)
-  $datum = date("d.m.Y", mktime(0,0,0,$row['monat'],$row['tag']+$row_gd['wgd'],$row['jahr']));
-  $wochentag = date("l", mktime(0,0,0,$row['monat'],$row['tag']+$row_gd['wgd'],$row['jahr']));
-}else{
-  $wochentag = date("l", mktime(0,0,0,$row['monat'],$row['tag'],$row['jahr']));
-  $datum = date("d.m.Y", mktime(0,0,0,$row['monat'],$row['tag'],$row['jahr']));
-}
-
-switch($wochentag)
-{
-  case 'Sunday':
-      $wochentag = "So.";
-      break;
-  case 'Monday':
-      $wochentag = "Mo.";
-      break;
-  case 'Tuesday':
-      $wochentag = "Di.";
-      break;
-  case 'Wednesday':
-      $wochentag = "Mi.";
-      break;
-  case 'Thursday':
-      $wochentag = "Do.";
-      break;
-  case 'Friday':
-      $wochentag = "Fr.";
-      break;
-  case 'Saturday':
-      $wochentag = "Sa.";
-      break;
-}
-
-###################################################################
-
-
-
-
-
-##################Header#########################################
-$inhalt_fin .= "<style type='text/css'>
-                 td { border:0.3px solid black; }
-                 body { font-size: 11px;  }
-                 table { font-size: 11px;  }
-                 p { font-size: 11px;  }
-                 ul {list-style-image: url(./html2pdf_v4.03/ul.png);}
-                 li {list-style-image: url(./html2pdf_v4.03/ul.png);}
-                 ol {list-style-image: url(./html2pdf_v4.03/ul.png);}
-                 table.page_footer {width: 100%; border: none; padding: 20mm}
-                 .fcol{color: #0C25BF;}
-                </style>";
-                
-$inhalt_fin .="<page_footer><table border=0 class='page_footer'><tr><td style='width: 680; text-align: center;' border=0 ><i>[[page_cu]]/[[page_nb]]</i></td></tr></table></page_footer>";
-
-$inhalt_fin .="	<table border=0.3  cellspacing=0>
-                  <tr>
-                    <td width='80'>Datum:</td>
-                    <td width='600'>$wochentag $datum</td>
-                  </tr>
-                  <tr>
-                    <td width='80'>Überschrift:</td>
-                    <td width='600'>$row[ueberschrift]</td>
-                  </tr>
-                  <tr>
-                    <td width='80'>Textstelle:</td>
-                    <td width='600'>$row[textstelle]</td>
-                  </tr>
-                  <tr>
-                    <td width='80'>Textwort:</td>
-                    <td width='600'>$textwort</td>
-                  </tr>";
-
-$res4 = $db->query("SELECT count(*) Anz
-                      FROM lieder_quelle
-                     WHERE lid=$lid");
-$row4 = $res4->fetch_array();
-
-if($row4['Anz'] > 0){
-              $inhalt_fin .= "
-                  <tr>
-                    <td width='80'>Lieder:</td>
-                    <td width='600'>";
-              $inhalt_fin .= "<table border=0>";
-
-              $query = "SELECT gbid, vorname, nachname 
-                          FROM lieder_quelle, admin 
-                         WHERE art='el' 
-                           AND lid=$lid 
-                           AND lieder_quelle.user = admin.user 
-                         ORDER BY gbid";
-              $result4 = $db->query( $query)
-                         or die ("Cannot execute query");
-              $zaehler1=0;
-
-              while ($row4 = $result4->fetch_array()){
-                $result2 = $db->query("SELECT nr, titel FROM lieder WHERE gbid=$row4[gbid] LIMIT 1");
-                $row5 = $result2->fetch_array();
-
-                
-		$EL = "$row5[nr] - $row5[titel] ";
-                $inhalt_fin .= "<tr>";
-
-                if($zaehler1==0){
-                 $inhalt_fin .= "<td border=0>Eingangslied:</td>";
-                 $zaehler1=1;
-                }else{
-                 $inhalt_fin .= "<td border=0>&nbsp;</td>";
-                }
-
-                $inhalt_fin .= "<td border=0>$EL</td>";
-                $inhalt_fin .= "</tr>";
-              }
-              
-              $query = "SELECT gbid, vorname, nachname 
-                          FROM lieder_quelle, admin 
-                         WHERE art='bl' 
-                           AND lid=$lid 
-                           AND lieder_quelle.user = admin.user 
-                         ORDER BY gbid";
-              $result4 = $db->query( $query)
-                         or die ("Cannot execute query");
-              $zaehler1=0;
-
-              while ($row4 = $result4->fetch_array()){
-                $result2 = $db->query("SELECT nr, titel FROM lieder WHERE gbid=$row4[gbid] LIMIT 1");
-                $row5 = $result2->fetch_array();
-
-		$BL = "$row5[nr] - $row5[titel] ";
-                $inhalt_fin .= "<tr>";
-
-                if($zaehler1==0){
-                 $inhalt_fin .= "<td border=0>Bußlied:</td>";
-                 $zaehler1=1;
-                }else{
-                 $inhalt_fin .= "<td border=0>&nbsp;</td>";
-                }
-
-                $inhalt_fin .= "<td border=0>$BL</td>";
-                $inhalt_fin .= "</tr>";
-              }
-              
-              $query = "SELECT gbid, vorname, nachname 
-                          FROM lieder_quelle, admin 
-                         WHERE art='al' 
-                           AND lid=$lid 
-                           AND lieder_quelle.user = admin.user 
-                         ORDER BY gbid";
-              $result4 = $db->query( $query)
-                         or die ("Cannot execute query");
-              $zaehler1=0;
-
-              while ($row4 = $result4->fetch_array()){
-                $result2 = $db->query("SELECT nr, titel FROM lieder WHERE gbid=$row4[gbid] LIMIT 1");
-                $row5 = $result2->fetch_array();
-
-		$AL = "$row5[nr] - $row5[titel] ";
-                $inhalt_fin .= "<tr>";
-
-                if($zaehler1==0){
-                 $inhalt_fin .= "<td border=0>Abendmahlslied:</td>";
-                 $zaehler1=1;
-                }else{
-                 $inhalt_fin .= "<td border=0>&nbsp;</td>";
-                }
-
-                $inhalt_fin .= "<td border=0>$AL</td>";
-                $inhalt_fin .= "</tr>";
-              }
-              
-              $query = "SELECT gbid, vorname, nachname 
-                          FROM lieder_quelle, admin 
-                         WHERE art='wl' 
-                           AND lid=$lid 
-                           AND lieder_quelle.user = admin.user 
-                         ORDER BY gbid";
-              $result4 = $db->query( $query)
-                         or die ("Cannot execute query");
-              $zaehler1=0;
-
-              while ($row4 = $result4->fetch_array()){
-                $result2 = $db->query("SELECT nr, titel FROM lieder WHERE gbid=$row4[gbid] LIMIT 1");
-                $row5 = $result2->fetch_array();
-		$WL = "$row5[nr] - $row5[titel] ";
-                $inhalt_fin .= "<tr>";
-
-                if($zaehler1==0){
-                 $inhalt_fin .= "<td border=0>Weitere Lieder:</td>";
-                 $zaehler1=1;
-                }else{
-                 $inhalt_fin .= "<td border=0>&nbsp;</td>";
-                }
-
-                $inhalt_fin .= "<td border=0>$WL</td>";
-                $inhalt_fin .= "</tr>";
-              }
-              
-
-              $inhalt_fin .= "</table>";
-              $inhalt_fin .= "</td>
-                  </tr>";
-   } // ende wenn keine Lieder vorhanden sind               
-                  if($row2['bezeichnung']!=""){ # Wenn keine Unterkategorie, dann auch kei Schrägstrich nach Kategorie
-                   $trennzeichen  = "/";
-                  } else{
-                   $trennzeichen  = "";
-                  }
-
-$inhalt_fin .= "
-                  <tr>
-                    <td width='80'>Kategorie:</td>
-                    <td width='600'>$row1[bezeichnung] $trennzeichen $row2[bezeichnung]</td>
-                  </tr>";
-if($row3['bezeichnung'] != ''){
-                  if($row6['bezeichnung']!=""){ # Wenn keine Unterkategorie, dann auch kei Schrägstrich nach Kategorie
-                   $trennzeichen2  = "/";
-                  } else{
-                   $trennzeichen2  = "";
-                  }
-  $inhalt_fin .= "
-                  <tr>
-                    <td width='80'>
-                      Thema:
-                    </td>
-                    <td width='600'>
-                      $row3[bezeichnung] $trennzeichen2 $row6[bezeichnung]
-                    </td>
-                  </tr>";
-}
-  $inhalt_fin .= "
-                </table>
-               ";
-
-##################Header Ende####################################
-
-##################Botschaft #####################################
-if ($lg_datum >= $switch_date){ # neue LG?
- if($row['botschaft'] != ''){
-  $inhalt_fin .= "<span class='fcol'><b>Botschaft:</b></span><br>".$botschaft;
- }
-}
-##################Botschaft Ende ################################
-
-##################Inhalt ###########################################
-$inhalt_fin .= "<br><br><span class='fcol'><b>Ausführungen:</b></span><br>".$inhalt;
-##################Inhalt Ende ######################################
-
-##################Zusammenfassung ##################################
-if ($lg_datum >= $switch_date){ # neue LG?
- if($row['zusammenfassung'] != ''){
-  $inhalt_fin .= "<br><br><span class='fcol'><b>Zusammenfassung:</b></span><br>".$zusammenfassung;
- }
-}
-##################Zusammenfassung Ende #############################
-
-
-##################Kontext ##########################################
-if ($lg_datum >= $switch_date){ # neue LG?
- if($row['kontext'] != ''){
-  $inhalt_fin .= "<br><br><span class='fcol'><b>Kontext:</b></span><br>".$kontext;
- }
-}
-##################Kontext Ende ######################################
-
-
-##################Notiz #############################################
-if($row7['notiz'] != ''){
-  $inhalt_fin .= "<br><br><span class='fcol'><b>Notizen:</b></span><br>".$notiz;
-}
-##################Notiz Ende ########################################
-#$inhalt_fin .= "</page>";
-
-    require_once(dirname(__FILE__).'/html2pdf_v4.03/html2pdf.class.php');
-    $inhalt_fin = '<page backtop="0mm" backbottom="10mm" style="font-size: 11pt" style="font-family: freeserif">'.nl2br($inhalt_fin).'</page>';
-#echo $inhalt_fin;
-#exit;
-    try
-    {
-  
-#/*
-        // seitenränder (in mm)
-	$oben=15;    //mT
-	$unten=15;   //mB
-	$links=15;   //mL
-	$rechts=15;  //mR
-#        $html2pdf = new HTML2PDF('P', 'A4', 'de');
-        $html2pdf = new HTML2PDF('P', 'A4', 'de', true, 'UTF-8', array($links, $oben, $rechts, $unten));
-        $html2pdf->pdf->SetDisplayMode('real');
-#        $html2pdf->setDefaultFont('arialunicid0'); //add this line
-#       $html2pdf->setModeDebug();
-#        $html2pdf->setDefaultFont('Arial');
-        $html2pdf->writeHTML($inhalt_fin, isset($_GET['vuehtml']));
-        $html2pdf->Output("LG_$lid.pdf",'D');
-#*/
-    }
-    catch(HTML2PDF_exception $e) {
-        echo $e;
-        exit;
-    }
-
-?>
\ No newline at end of file
diff --git a/pdf_gen.php_lut84_20180219 b/pdf_gen.php_lut84_20180219
deleted file mode 100644
index 59b0fb06..00000000
--- a/pdf_gen.php_lut84_20180219
+++ /dev/null
@@ -1,719 +0,0 @@
-<?php
-#require_once("./config/datenbankanbindung.php");     // f&uuml;gt die Datenbankanbindung ein: Sys:\php\includes\kurs\datenbankanbindung.php
-#$db = dbconnect();
-require_once("config.inc.php");
-#$lid='4242';
-#$user_admin = "schwaral";
-
-$user_admin=$_COOKIE["user_admin"];
-$lid = $_GET['lid'];
-if ($user_admin == ""){ require("index.php"); exit;} //Wenn man nicht angemeldet ist, darf man nicht auf die Seite
-
-$res = $db->query("SELECT textstelle, thema, unterthema, ueberschrift, textwort, botschaft, inhalt, zusammenfassung, kontext, DATE_Format(datum, '%d') tag, DATE_Format(datum, '%m') monat, DATE_Format(datum, '%Y') jahr, stapgd, kid, ukid, DATE_Format(datum, '%Y-%m-%d')AS datum_berechnung FROM quelle WHERE lid='$lid'");
-$row = $res->fetch_array();
-    
-## Vergleichsdatum: Altes LG / Neue LG ab 01.12.2007. Dementsprechendes PDF generieren
-$date_nlg  = mktime(0, 0, 0, 12, 1, 2007);  // Datum ab dem neue LGs gelten
-$date_nlg_format = date("Y-m-d", $date_nlg);  // ISO-8601 Format wie in der Datenbank: Formatierung f&uuml;r Vergleiche erforderlich
-
-$switch_date = strtotime ($date_nlg_format); //Umrechnung des Fristgrenztages in eine Zahl
-$lg_datum = strtotime ($row['datum_berechnung']); // Umrechnung des Enddatums in eine Zahl
-require("bibellookup.php");
-
-function makeLink($a, $b, $c, $d, $e, $f, $g, $h, $lid)
-{
-  $a=trim($a);
-  $b=trim($b);
-  $c=trim($c);
-  $d=trim($d);
-  $e=trim($e);
-  $f=trim($f);
-  $g=trim($g);
-  $h=trim($h);
-  # $d muss immer ein Komma haben, wenn danach noch was kommt
-  if($e != '' or $f != "" or $g != "" or $h != ""){
-   if($d == ''){
-     $d=',';
-   }
-  }
-  /*
-  echo "a: '$a'<br>
-        b: '$b'<br>
-        c: '$c'<br>
-        d: '$d'<br>
-        e: '$e'<br>
-        f: '$f'<br>
-        g: '$g'<br>
-        h: '$h'<br>
-        i: '$i'<br>
-        ";
-  */
-  $b =str_replace  ("Ruth",  "Rut"  ,  $b);
-  $b =str_replace  ("Esther",  "Ester"  ,  $b);
-  $b =str_replace  ("Judith",  "Judit"  ,  $b);
-  $b =str_replace  ("Ezechiel",  "Hesekiel"  ,  $b);
-  $b =str_replace  ("Ijob",  "Hiob"  ,  $b);
-  if($a!=''){
-   $a=$a." ";
-  }
-  if($c!=''){
-   $c=" ".$c;
-  }
-  if($e!=''){
-   $e=" ".$e." ";
-  }
-  // Handling, wenn bei Bibelstelle Bindestrich oder Punkt enthalten sind
-  if($g == '-'){
-    #$wort="Römer 8,31-39";
-    $wort="$a$b$c$d$f$g$h";
-    $wort=trim($wort);
-    return sprintf("<a class=\"biblelink\" href=\"http://www.bibleserver.com/go.php?lang={de}&bible={LUT84}&ref=%s\" target=\"_blank\">%s</a>",  $a.$b.$c.$d.$f.$g.$h, $a.$b.$c.$d.$e.$f.$g.$h);
-  }elseif($g == '.'){
-    // Wenn Punkt, dann muss unterschieden werden, ob die Textstelle forlaufend ist
-    $next=$f+1;
-    if($h==$next){
-      // Beispiel Matthäus 1,1.2
-      // aus dem Punkt wird ein Bindestrich für bibleserver
-      $g1='-';
-      $wort="$a$b$c$d$f$g1$h";
-      $wort=trim($wort);
-      return sprintf("<a class=\"biblelink\" href=\"http://www.bibleserver.com/go.php?lang={de}&bible={LUT84}&ref=%s\" target=\"_blank\">%s</a>",  $a.$b.$c.$d.$f.$g1.$h, $a.$b.$c.$d.$e.$f.$g.$h);
-    }else{
-      // Beispiel Matthäus 1,1.3
-      // Da Vers 2 nicht aufgeführt ist, darf man nicht 1-3 machen
-      // Parameter $g und $h (.3) wird daher nicht im Link übergeben
-      $wort="$a$b$c$d$f";
-      $wort=trim($wort);
-      return sprintf("<a class=\"biblelink\" href=\"http://www.bibleserver.com/go.php?lang={de}&bible={LUT84}&ref=%s\" target=\"_blank\">%s</a>",  $a.$b.$c.$d.$f, $a.$b.$c.$d.$e.$f.$g.$h);
-    }
-  }else{
-    // Alles Ohne Bindestrich und Punkt, daher auch kein $g und $h
-    $wort="$a$b$c$d$f$g$h";
-    $wort=trim($wort);
-    return sprintf("<a class=\"biblelink\" href=\"http://www.bibleserver.com/go.php?lang={de}&bible={LUT84}&ref=%s\" target=\"_blank\">%s</a>",  $a.$b.$c.$d.$f.$g.$h,  $a.$b.$c.$d.$e.$f.$g.$h);
-  }
-}
-
-
-function refill($a,$b,$c,$d,$e,$f,$g,$h,$i)
-{
- 
-// Funktion die aus Textstellenkurzeichen die vollständige Textstelle erstellt
-
-/*
-echo "a: '$a'<br>
-      b: '$b'<br>
-      c: '$c'<br>
-      d: '$d'<br>
-      e: '$e'<br>
-      f: '$f'<br>
-      g: '$g'<br>
-      h: '$h'<br>
-      i: '$i'<br>
-      ";
-*/
-
-switch($c)
-{
-case'Sir':
-     $c= 'Sirach';
-     break;
-case'Mo':
-     $c= 'Mose';
-     break;
-case'Jos':
-     $c= 'Josua';
-     break;
-case'Ri':
-     $c= 'Richter';
-     break;
-case'Rut':
-     $c= 'Rut';
-     break;
-case'Sam':
-     $c= 'Samuel';
-     break;
-case'K&ouml;n':
-     $c= 'K&ouml;nige';
-     break;
-case'Chr':
-     $c= 'Chronik';
-     break;
-case'Esr':
-     $c= 'Esra';
-     break;
-case'Neh':
-     $c= 'Nehemia';
-     break;
-case'Est':
-     $c= 'Esther';
-     break;
-case'Hiob':
-     $c= 'Hiob';
-     break;
-case'Hi':
-     $c= 'Hiob';
-     break;
-case'Ps':
-     $c= 'Psalm';
-     break;
-case'Spr':
-     $c= 'Spr&uuml;che';
-     break;
-case'Pred':
-     $c= 'Prediger';
-     break;
-case'Hld':
-     $c= 'Hoheslied';
-     break;
-case'Jes':
-     $c= 'Jesaja';
-     break;
-case'Jer':
-     $c= 'Jeremia';
-     break;
-case'Kla':
-     $c= 'Klagelieder';
-     break;
-case'Klgl':
-     $c= 'Klagelieder';
-     break;
-case'Hes':
-     $c= 'Hesekiel';
-     break;
-case'Dan':
-     $c= 'Daniel';
-     break;
-case'Hos':
-     $c= 'Hosea';
-     break;
-case'Joel':
-     $c= 'Joel';
-     break;
-case'Am':
-     $c= 'Amos';
-     break;
-case'Obd':
-     $c= 'Obadja';
-     break;
-case'Jona':
-     $c= 'Jona';
-     break;
-case'Mi':
-     $c= 'Micha';
-     break;
-case'Nah':
-     $c= 'Nahum';
-     break;
-case'Hab':
-     $c= 'Habakuk';
-     break;
-case'Zef':
-     $c= 'Zefanja';
-     break;
-case'Hag':
-     $c= 'Haggai';
-     break;
-case'Sach':
-     $c= 'Sacharja';
-     break;
-case'Mal':
-     $c= 'Maleachi';
-     break;
-case'Tob':
-     $c= 'Tobias';
-     break;
-case'Mt':
-     $c= 'Matth&auml;us';
-     break;
-case'Mk':
-     $c= 'Markus';
-     break;
-case'Lk':
-     $c= 'Lukas';
-     break;
-case'Luk':
-     $c= 'Lukas';
-     break;
-case'Joh':
-     $c= 'Johannes';
-     break;
-case'Jh':
-     $c= 'Johannes';
-     break;
-case'Apg':
-     $c= 'Apostelgeschichte';
-     break;
-case'R&ouml;m':
-     $c= 'R&ouml;mer';
-     break;
-case'Rom':
-     $c= 'R&ouml;mer';
-     break;
-case'Kor':
-     $c= 'Korinther';
-     break;
-case'Gal':
-     $c= 'Galater';
-     break;
-case'Eph':
-     $c= 'Epheser';
-     break;
-case'Phil':
-     $c= 'Philipper';
-     break;
-case'Kol':
-     $c= 'Kolosser';
-     break;
-case'Thess':
-     $c= 'Thessalonicher';
-     break;
-case'Tim':
-     $c= 'Timotheus';
-     break;
-case'Tit':
-     $c= 'Titus';
-     break;
-case'Phlm':
-     $c= 'Philemon';
-     break;
-case'Ptr':
-     $c= 'Petrus';
-     break;
-case'Petr':
-     $c= 'Petrus';
-     break;
-case'Hbr':
-     $c= 'Hebr&auml;er';
-     break;
-case'Hebr':
-     $c= 'Hebr&auml;er';
-     break;
-case'Jak':
-     $c= 'Jakobus';
-     break;
-case'Jk':
-     $c= 'Jakobus';
-     break;
-case'Jud':
-     $c= 'Judas';
-     break;
-case'Offb':
-     $c= 'Offenbarung';
-     break;
-case'Off':
-     $c= 'Offenbarung';
-     break;
-}
-
-#  $a=trim($a);
-  if($a !=""){$a=$a.".";} // nach der Zahl noch der Punkt hinzufügen
-  if($a != ""){$a=$a." ";$b="";} // nach dem Punkt ein Leerzeichen, B kann dann entfallen
-  if($d ==""){$d=" ";}
-  #return sprintf('<a href="http://www.bibleserver.com/go.php?lang={de}&bible={LUT84}&ref=%s" target="_blank">%s</a>',  $a.$b.$c.$d.$e.$f.$g.$h, $a.$b.$c.$d.$e.$f.$g.$h);
-  return $a.$b.$c.$d.$e.$f.$g.$h;
-}
-##################Function Ende####################################
-
-
-
-###################################################################
-$res1 = $db->query("SELECT bezeichnung FROM kategorie WHERE kid='$row[kid]'");
-$row1 = $res1->fetch_array();
-
-$res2 = $db->query("SELECT bezeichnung FROM unterkategorie WHERE ukid='$row[ukid]'");
-$row2 = $res2->fetch_array();
-
-$res3 = $db->query("SELECT bezeichnung FROM thema WHERE tid='$row[thema]'");
-$row3 = $res3->fetch_array();
-
-$res6 = $db->query("SELECT bezeichnung FROM unterthema WHERE tid='$row[thema]' AND utid='$row[unterthema]'");
-$row6 = $res6->fetch_array();
-
-$res7 = $db->query("SELECT notiz FROM notizen WHERE lid='$lid' AND user='$user_admin'");
-$row7 = $res7->fetch_array();
-
-
-$textwort = strip_tags($row['textwort'], '<br>,<strong>,<ul>,<li>,<ol>');
-$textwort = str_replace('"', '\"', $textwort);
-$textwort=preg_replace_callback("/([0-9]*)(\s*)(Sir|Mo|Jos|Ri|Rut|Sam|K&ouml;n|Chr|Esr|Neh|Est|Hiob|Ps|Spr|Pred|Hld|Jes|Jer|Kla|Klgl|Hes|Dan|Hos|Joel|Am|Obd|Jona|Mi|Nah|Hab|Zef|Hag|Sach|Mal|Tob|Mt|Mk|Lk|Luk|Joh|Jh|Apg|R&ouml;m|Rom|Kor|Gal|Eph|Phil|Kol|Thess|Tim|Tit|Phlm|Ptr|Petr|Joh|Hbr|Hebr|Jak|Jk|Jud|Offb|Off)(\s*)".
-                    "([0-9]{1,3})(\,)?\s*(aus)?\s*([0-9]{0,3})/", function($m) use (&$lid) { return refill($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $m[9], $lid);}, $textwort);
-#$textwort = preg_replace('/([0-9][0-9]?\.\s*)?(Sirach|Mose|Josua|Richter|Rut|Samuel|K&ouml;nige|Chronik|Esra|Nehemia|Esther|Hiob|Psalm|Spr&uuml;che|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matth&auml;us|Markus|Lukas|Johannes|Apostelgeschichte|R&ouml;mer|Korinther|Galater|Epheser|Philipper|Kolosser|Thessalonicher|Timotheus|Titus|Philemon|Hebr&auml;er|Jakobus|Petrus|Judas|Offenbarung)(\s*[0-9]{1,3}\s*)(,)?(\s*aus|Vers)?(\s*[0-9]{0,2})?/', makeLink("$1", "$2", "$3", "$4", "$5", "$6"), $textwort);
-$textwort =preg_replace_callback("/([0-9][0-9]?\.\s*)?(Makkab&auml;er|Johannes|Mose|K&ouml;nige|Chronik|Korinther|Samuel|Thessalonicher|Timotheus|Petrus|Gebet Manasses|St&uuml;cke zu Daniel|St&uuml;cke zu Ester|Baruch|Weisheit|Judit|Judith|Sirach|Josua|Richter|Rut|Ruth|Esra|Nehemia|Esther|Ester|Hiob|Ijob|Psalm|Spr&uuml;che|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Ezechiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matth&auml;us|Markus|Lukas|Apostelgeschichte|R&ouml;mer|Galater|Epheser|Philipper|Kolosser|Titus|Hebr&auml;er|Jakobus|Offenbarung|Philemon|Judas)(\s*[0-9]{1,3})(,\s*)?(\s*aus\s*|\s*Verse\s*|\s*Vers\s*)?([0-9]{0,3})?(\s*\-\s*|\s*\.\s*)?([0-9]{0,3})?/", function($m) use (&$lid) { return makeLink($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $lid);}, $textwort);
-
-$textwort = str_replace (array("<ul>", chr(10), "<ol>"), array("</div><div align='justify'><ul type='square'>","", "</div><div align='justify'><ol>"), $textwort);
-#$textwort = str_replace (array("<br style=\"\" />", "&middot;", "&nbsp;", "&lt;", "&gt;", "&quot;", "&bdquo;", "&ldquo;", "&sbquo;", "&lsquo;", "&laquo;", "&raquo;", "&bull;")
-#                       , array("", chr(183), " ",  chr(60),chr(62),chr(34),chr(132), chr(148), "'", "'", chr(174), chr(175), chr(149))
-#                       , $textwort
-#                        );
-$textwort = trim($textwort);
-
-$botschaft = strip_tags($row['botschaft'], '<br>,<strong>,<ul>,<li>,<ol>');
-$botschaft = str_replace('"', '\"', $botschaft);
-$botschaft = preg_replace_callback("/([0-9]*)(\s*)(Sir|Mo|Jos|Ri|Rut|Sam|K&ouml;n|Chr|Esr|Neh|Est|Hiob|Ps|Spr|Pred|Hld|Jes|Jer|Kla|Klgl|Hes|Dan|Hos|Joel|Am|Obd|Jona|Mi|Nah|Hab|Zef|Hag|Sach|Mal|Tob|Mt|Mk|Lk|Luk|Joh|Jh|Apg|R&ouml;m|Rom|Kor|Gal|Eph|Phil|Kol|Thess|Tim|Tit|Phlm|Ptr|Petr|Joh|Hbr|Hebr|Jak|Jk|Jud|Offb|Off)(\s*)".
-                    "([0-9]{1,3})(\,)?\s*(aus)?\s*([0-9]{0,3})/", function($m) use (&$lid) { return refill($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $m[9], $lid);}, $botschaft);
-                   
-                         
-#$botschaft = preg_replace('/([0-9][0-9]?\.\s*)?(Sirach|Mose|Josua|Richter|Rut|Samuel|K&ouml;nige|Chronik|Esra|Nehemia|Esther|Hiob|Psalm|Spr&uuml;che|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matth&auml;us|Markus|Lukas|Johannes|Apostelgeschichte|R&ouml;mer|Korinther|Galater|Epheser|Philipper|Kolosser|Thessalonicher|Timotheus|Titus|Philemon|Hebr&auml;er|Jakobus|Petrus|Judas|Offenbarung)(\s*[0-9]{1,3}\s*)(,)?(\s*aus|Vers)?(\s*[0-9]{0,2})?/', makeLink("$1", "$2", "$3", "$4", "$5", "$6"), $botschaft);
-
-$botschaft =preg_replace_callback("/([0-9][0-9]?\.\s*)?(Makkab&auml;er|Johannes|Mose|K&ouml;nige|Chronik|Korinther|Samuel|Thessalonicher|Timotheus|Petrus|Gebet Manasses|St&uuml;cke zu Daniel|St&uuml;cke zu Ester|Baruch|Weisheit|Judit|Judith|Sirach|Josua|Richter|Rut|Ruth|Esra|Nehemia|Esther|Ester|Hiob|Ijob|Psalm|Spr&uuml;che|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Ezechiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matth&auml;us|Markus|Lukas|Apostelgeschichte|R&ouml;mer|Galater|Epheser|Philipper|Kolosser|Titus|Hebr&auml;er|Jakobus|Offenbarung|Philemon|Judas)(\s*[0-9]{1,3})(,\s*)?(\s*aus\s*|\s*Verse\s*|\s*Vers\s*)?([0-9]{0,3})?(\s*\-\s*|\s*\.\s*)?([0-9]{0,3})?/", function($m) use (&$lid) { return makeLink($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $lid);}, $botschaft);
-
-$botschaft = str_replace (array("<ul>", chr(10), "<ol>"), array("</div><div align='justify'><ul type='square'>","", "</div><div align='justify'><ol>"), $botschaft);
-
-$inhalt = strip_tags($row['inhalt'], '<br>,<strong>,<ul>,<li>,<ol>,<a>,<table>,<tr>,<td>,<h1>,<h2>,<h3>,<img>');
-#$inhalt = str_replace('"', '\"', $inhalt);
-$inhalt = preg_replace_callback("/([0-9]*)(\s*)(Sir|Mo|Jos|Ri|Rut|Sam|K&ouml;n|Chr|Esr|Neh|Est|Hiob|Ps|Spr|Pred|Hld|Jes|Jer|Kla|Klgl|Hes|Dan|Hos|Joel|Am|Obd|Jona|Mi|Nah|Hab|Zef|Hag|Sach|Mal|Tob|Mt|Mk|Lk|Luk|Joh|Jh|Apg|R&ouml;m|Rom|Kor|Gal|Eph|Phil|Kol|Thess|Tim|Tit|Phlm|Ptr|Petr|Joh|Hbr|Hebr|Jak|Jk|Jud|Offb|Off)(\s*)".
-                    "([0-9]{1,3})(\,)?\s*(aus)?\s*([0-9]{0,3})/", function($m) use (&$lid) { return refill($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $m[9], $lid);}, $inhalt);
-  
-                    
-$inhalt =preg_replace_callback("/([0-9][0-9]?\.\s*)?(Makkab&auml;er|Johannes|Mose|K&ouml;nige|Chronik|Korinther|Samuel|Thessalonicher|Timotheus|Petrus|Gebet Manasses|St&uuml;cke zu Daniel|St&uuml;cke zu Ester|Baruch|Weisheit|Judit|Judith|Sirach|Josua|Richter|Rut|Ruth|Esra|Nehemia|Esther|Ester|Hiob|Ijob|Psalm|Spr&uuml;che|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Ezechiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matth&auml;us|Markus|Lukas|Apostelgeschichte|R&ouml;mer|Galater|Epheser|Philipper|Kolosser|Titus|Hebr&auml;er|Jakobus|Offenbarung|Philemon|Judas)(\s*[0-9]{1,3})(,\s*)?(\s*aus\s*|\s*Verse\s*|\s*Vers\s*)?([0-9]{0,3})?(\s*\-\s*|\s*\.\s*)?([0-9]{0,3})?/", function($m) use (&$lid) { return makeLink($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $lid);}, $inhalt);
-#echo "<pre>";
-#echo $inhalt;
-#echo "</pre>";
-#$inhalt = str_replace (array("<ul>", chr(10)), array("</div><div align='justify'><ul type='square'>",""), $inhalt);
-#$inhalt = str_replace (array("<ul>", chr(10), "<ol>"), array("</div><div align='justify'><ul type='square'>","", "</div><div align='justify'><ol>"), $inhalt);
-#$inhalt = str_replace (array("<br style=\"\" />", "&middot;", "&nbsp;", "&lt;", "&gt;", "&quot;", "&bdquo;", "&ldquo;", "&sbquo;", "&lsquo;", "&laquo;", "&raquo;", "&bull;")
-#                       , array("", chr(183), " ",  chr(60),chr(62),chr(34),chr(132), chr(148), "'", "'", chr(174), chr(175), chr(149))
-#                       , $inhalt
-#                        );
-
-
-$zusammenfassung = strip_tags($row['zusammenfassung'], '<br>,<strong>,<ul>,<li>,<ol>');
-$zusammenfassung = str_replace('"', '\"', $zusammenfassung);
-$zusammenfassung =preg_replace_callback("/([0-9]*)(\s*)(Sir|Mo|Jos|Ri|Rut|Sam|K&ouml;n|Chr|Esr|Neh|Est|Hiob|Ps|Spr|Pred|Hld|Jes|Jer|Kla|Klgl|Hes|Dan|Hos|Joel|Am|Obd|Jona|Mi|Nah|Hab|Zef|Hag|Sach|Mal|Tob|Mt|Mk|Lk|Luk|Joh|Jh|Apg|R&ouml;m|Rom|Kor|Gal|Eph|Phil|Kol|Thess|Tim|Tit|Phlm|Ptr|Petr|Joh|Hbr|Hebr|Jak|Jk|Jud|Offb|Off)(\s*)".
-                                "([0-9]{1,3})(\,)?\s*(aus)?\s*([0-9]{0,3})/", function($m) use (&$lid) { return refill($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $m[9], $lid);}, $zusammenfassung);
-$#zusammenfassung = preg_replace('/([0-9][0-9]?\.\s*)?(Sirach|Mose|Josua|Richter|Rut|Samuel|K&ouml;nige|Chronik|Esra|Nehemia|Esther|Hiob|Psalm|Spr&uuml;che|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matth&auml;us|Markus|Lukas|Johannes|Apostelgeschichte|R&ouml;mer|Korinther|Galater|Epheser|Philipper|Kolosser|Thessalonicher|Timotheus|Titus|Philemon|Hebr&auml;er|Jakobus|Petrus|Judas|Offenbarung)(\s*[0-9]{1,3}\s*)(,)?(\s*aus|Vers)?(\s*[0-9]{0,2})?/', makeLink("$1", "$2", "$3", "$4", "$5", "$6"), $zusammenfassung);
-$zusammenfassung=preg_replace_callback("/([0-9][0-9]?\.\s*)?(Makkab&auml;er|Johannes|Mose|K&ouml;nige|Chronik|Korinther|Samuel|Thessalonicher|Timotheus|Petrus|Gebet Manasses|St&uuml;cke zu Daniel|St&uuml;cke zu Ester|Baruch|Weisheit|Judit|Judith|Sirach|Josua|Richter|Rut|Ruth|Esra|Nehemia|Esther|Ester|Hiob|Ijob|Psalm|Spr&uuml;che|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Ezechiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matth&auml;us|Markus|Lukas|Apostelgeschichte|R&ouml;mer|Galater|Epheser|Philipper|Kolosser|Titus|Hebr&auml;er|Jakobus|Offenbarung|Philemon|Judas)(\s*[0-9]{1,3})(,\s*)?(\s*aus\s*|\s*Verse\s*|\s*Vers\s*)?([0-9]{0,3})?(\s*\-\s*|\s*\.\s*)?([0-9]{0,3})?/", function($m) use (&$lid) { return makeLink($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $lid);}, $zusammenfassung);
-#$zusammenfassung = str_replace (array("<ul>"), array("<ul type='disc'>"), $zusammenfassung);
-#$zusammenfassung = str_replace (array("<br style=\"\" />", "&middot;", "&nbsp;", "&lt;", "&gt;", "&quot;", "&bdquo;", "&ldquo;", "&sbquo;", "&lsquo;", "&laquo;", "&raquo;", "&bull;")
-#                       , array("", chr(183), " ",  chr(60),chr(62),chr(34),chr(132), chr(148), "'", "'", chr(174), chr(175), chr(149))
-#                       , $zusammenfassung
-#                        );
-
-$kontext = strip_tags($row['kontext'], '<br>,<strong>,<ul>,<li>,<ol>');
-$kontext = str_replace('"', '\"', $kontext);
-$kontext=preg_replace_callback("/([0-9]*)(\s*)(Sir|Mo|Jos|Ri|Rut|Sam|K&ouml;n|Chr|Esr|Neh|Est|Hiob|Ps|Spr|Pred|Hld|Jes|Jer|Kla|Klgl|Hes|Dan|Hos|Joel|Am|Obd|Jona|Mi|Nah|Hab|Zef|Hag|Sach|Mal|Tob|Mt|Mk|Lk|Luk|Joh|Jh|Apg|R&ouml;m|Rom|Kor|Gal|Eph|Phil|Kol|Thess|Tim|Tit|Phlm|Ptr|Petr|Joh|Hbr|Hebr|Jak|Jk|Jud|Offb|Off)(\s*)".
-                    "([0-9]{1,3})(\,)?\s*(aus)?\s*([0-9]{0,3})/", function($m) use (&$lid) { return refill($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $m[9], $lid);}, $kontext);
-#$kontext = preg_replace('/([0-9][0-9]?\.\s*)?(Sirach|Mose|Josua|Richter|Rut|Samuel|K&ouml;nige|Chronik|Esra|Nehemia|Esther|Hiob|Psalm|Spr&uuml;che|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matth&auml;us|Markus|Lukas|Johannes|Apostelgeschichte|R&ouml;mer|Korinther|Galater|Epheser|Philipper|Kolosser|Thessalonicher|Timotheus|Titus|Philemon|Hebr&auml;er|Jakobus|Petrus|Judas|Offenbarung)(\s*[0-9]{1,3}\s*)(,)?(\s*aus|Vers)?(\s*[0-9]{0,2})?/', makeLink("$1", "$2", "$3", "$4", "$5", "$6"), $kontext);
-$kontext=preg_replace_callback("/([0-9][0-9]?\.\s*)?(Makkab&auml;er|Johannes|Mose|K&ouml;nige|Chronik|Korinther|Samuel|Thessalonicher|Timotheus|Petrus|Gebet Manasses|St&uuml;cke zu Daniel|St&uuml;cke zu Ester|Baruch|Weisheit|Judit|Judith|Sirach|Josua|Richter|Rut|Ruth|Esra|Nehemia|Esther|Ester|Hiob|Ijob|Psalm|Spr&uuml;che|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Ezechiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matth&auml;us|Markus|Lukas|Apostelgeschichte|R&ouml;mer|Galater|Epheser|Philipper|Kolosser|Titus|Hebr&auml;er|Jakobus|Offenbarung|Philemon|Judas)(\s*[0-9]{1,3})(,\s*)?(\s*aus\s*|\s*Verse\s*|\s*Vers\s*)?([0-9]{0,3})?(\s*\-\s*|\s*\.\s*)?([0-9]{0,3})?/", function($m) use (&$lid) { return makeLink($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $lid);}, $kontext);
-$kontext = str_replace (array("<ul>", chr(10), "<ol>"), array("</div><div align='justify'><ul type='square'>","", "</div><div align='justify'><ol>"), $kontext);
-#$kontext = str_replace (array("<br style=\"\" />", "&middot;", "&nbsp;", "&lt;", "&gt;", "&quot;", "&bdquo;", "&ldquo;", "&sbquo;", "&lsquo;", "&laquo;", "&raquo;", "&bull;")
-#                       , array("", chr(183), " ",  chr(60),chr(62),chr(34),chr(132), chr(148), "'", "'", chr(174), chr(175), chr(149))
-#                       , $kontext
-#                        );
-                        
-$notiz = strip_tags($row7['notiz'], '<p>,<br>,<strong>,<ul>,<li>,<ol>');
-$notiz = str_replace('"', '\"', $notiz);
-$notiz=preg_replace_callback("/([0-9]*)(\s*)(Sir|Mo|Jos|Ri|Rut|Sam|K&ouml;n|Chr|Esr|Neh|Est|Hiob|Ps|Spr|Pred|Hld|Jes|Jer|Kla|Klgl|Hes|Dan|Hos|Joel|Am|Obd|Jona|Mi|Nah|Hab|Zef|Hag|Sach|Mal|Tob|Mt|Mk|Lk|Luk|Joh|Jh|Apg|R&ouml;m|Rom|Kor|Gal|Eph|Phil|Kol|Thess|Tim|Tit|Phlm|Ptr|Petr|Joh|Hbr|Hebr|Jak|Jk|Jud|Offb|Off)(\s*)".
-                    "([0-9]{1,3})(\,)?\s*(aus)?\s*([0-9]{0,3})/", function($m) use (&$lid) { return refill($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $m[9], $lid);}, $notiz);
-#$notiz = preg_replace('/([0-9][0-9]?\.\s*)?(Sirach|Mose|Josua|Richter|Rut|Samuel|K&ouml;nige|Chronik|Esra|Nehemia|Esther|Hiob|Psalm|Spr&uuml;che|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matth&auml;us|Markus|Lukas|Johannes|Apostelgeschichte|R&ouml;mer|Korinther|Galater|Epheser|Philipper|Kolosser|Thessalonicher|Timotheus|Titus|Philemon|Hebr&auml;er|Jakobus|Petrus|Judas|Offenbarung)(\s*[0-9]{1,3}\s*)(,)?(\s*aus|Vers)?(\s*[0-9]{0,2})?/', makeLink("$1", "$2", "$3", "$4", "$5", "$6"), $notiz);
-$notiz=preg_replace_callback("/([0-9][0-9]?\.\s*)?(Makkab&auml;er|Johannes|Mose|K&ouml;nige|Chronik|Korinther|Samuel|Thessalonicher|Timotheus|Petrus|Gebet Manasses|St&uuml;cke zu Daniel|St&uuml;cke zu Ester|Baruch|Weisheit|Judit|Judith|Sirach|Josua|Richter|Rut|Ruth|Esra|Nehemia|Esther|Ester|Hiob|Ijob|Psalm|Spr&uuml;che|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Ezechiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matth&auml;us|Markus|Lukas|Apostelgeschichte|R&ouml;mer|Galater|Epheser|Philipper|Kolosser|Titus|Hebr&auml;er|Jakobus|Offenbarung|Philemon|Judas)(\s*[0-9]{1,3})(,\s*)?(\s*aus\s*|\s*Verse\s*|\s*Vers\s*)?([0-9]{0,3})?(\s*\-\s*|\s*\.\s*)?([0-9]{0,3})?/", function($m) use (&$lid) { return makeLink($m[1], $m[2], $m[3], $m[4], $m[5], $m[6], $m[7], $m[8], $lid);}, $notiz);
-$notiz = str_replace (array("<ul>", chr(10), "<ol>"), array("</div><div align='justify'><ul type='square'>","", "</div><div align='justify'><ol>"), $notiz);
-#$notiz = str_replace (array("<br style=\"\" />", "&middot;", "&nbsp;", "&lt;", "&gt;", "&quot;", "&bdquo;", "&ldquo;", "&sbquo;", "&lsquo;", "&laquo;", "&raquo;", "&bull;")
-#                       , array("", chr(183), " ",  chr(60),chr(62),chr(34),chr(132), chr(148), "'", "'", chr(174), chr(175), chr(149))
-#                       , $notiz
-#                        );
-
-
-$wochentag = date("l", mktime(0,0,0,$row['monat'],$row['tag'],$row['jahr']));
-
-if($wochentag == 'Wednesday' AND $row_gd['wgd'] != '0' AND ($row['ukid'] == '1')){  // Hintergrund kommt aus der wort_wahl.php. Es gibt einige Gottesdienste, die auf einen Mittwoch fallen (1. vom Monat) aber kein Tag addiert werden darf, daher: Wann muss ein Tag (faktor) addiert werden, generell, wenn Wochengottesdienst, wenn Faktor im Profil != 0 und wenn unterkategorie 1 (GD normal) ist. Bei allen anderen Gottesdiensten bleibt der Mittwoch erhalten. (Buß und Bettag ist Mittwoch, Erntedank bleibt auch am 1. des Monats)
-  $datum = date("d.m.Y", mktime(0,0,0,$row['monat'],$row['tag']+$row_gd['wgd'],$row['jahr']));
-  $wochentag = date("l", mktime(0,0,0,$row['monat'],$row['tag']+$row_gd['wgd'],$row['jahr']));
-}else{
-  $wochentag = date("l", mktime(0,0,0,$row['monat'],$row['tag'],$row['jahr']));
-  $datum = date("d.m.Y", mktime(0,0,0,$row['monat'],$row['tag'],$row['jahr']));
-}
-
-switch($wochentag)
-{
-  case 'Sunday':
-      $wochentag = "So.";
-      break;
-  case 'Monday':
-      $wochentag = "Mo.";
-      break;
-  case 'Tuesday':
-      $wochentag = "Di.";
-      break;
-  case 'Wednesday':
-      $wochentag = "Mi.";
-      break;
-  case 'Thursday':
-      $wochentag = "Do.";
-      break;
-  case 'Friday':
-      $wochentag = "Fr.";
-      break;
-  case 'Saturday':
-      $wochentag = "Sa.";
-      break;
-}
-
-###################################################################
-
-
-
-
-
-##################Header#########################################
-$inhalt_fin .= "<style type='text/css'>
-                 td { border:0.3px solid black; }
-                 body { font-size: 11px;  }
-                 table { font-size: 11px;  }
-                 p { font-size: 11px;  }
-                 ul {list-style-image: url(./html2pdf_v4.03/ul.png);}
-                 li {list-style-image: url(./html2pdf_v4.03/ul.png);}
-                 ol {list-style-image: url(./html2pdf_v4.03/ul.png);}
-                 table.page_footer {width: 100%; border: none; padding: 20mm}
-                 .fcol{color: #0C25BF;}
-                </style>";
-                
-$inhalt_fin .="<page_footer><table border=0 class='page_footer'><tr><td style='width: 680; text-align: center;' border=0 ><i>[[page_cu]]/[[page_nb]]</i></td></tr></table></page_footer>";
-
-$inhalt_fin .="	<table border=0.3  cellspacing=0>
-                  <tr>
-                    <td width='80'>Datum:</td>
-                    <td width='600'>$wochentag $datum</td>
-                  </tr>
-                  <tr>
-                    <td width='80'>Überschrift:</td>
-                    <td width='600'>$row[ueberschrift]</td>
-                  </tr>
-                  <tr>
-                    <td width='80'>Textstelle:</td>
-                    <td width='600'>$row[textstelle]</td>
-                  </tr>
-                  <tr>
-                    <td width='80'>Textwort:</td>
-                    <td width='600'>$textwort</td>
-                  </tr>";
-
-$res4 = $db->query("SELECT count(*) Anz
-                      FROM lieder_quelle
-                     WHERE lid=$lid");
-$row4 = $res4->fetch_array();
-
-if($row4['Anz'] > 0){
-              $inhalt_fin .= "
-                  <tr>
-                    <td width='80'>Lieder:</td>
-                    <td width='600'>";
-              $inhalt_fin .= "<table border=0>";
-
-              $query = "SELECT gbid, vorname, nachname 
-                          FROM lieder_quelle, admin 
-                         WHERE art='el' 
-                           AND lid=$lid 
-                           AND lieder_quelle.user = admin.user 
-                         ORDER BY gbid";
-              $result4 = $db->query( $query)
-                         or die ("Cannot execute query");
-              $zaehler1=0;
-
-              while ($row4 = $result4->fetch_array()){
-                $result2 = $db->query("SELECT nr, titel FROM lieder WHERE gbid=$row4[gbid] LIMIT 1");
-                $row5 = $result2->fetch_array();
-
-                
-		$EL = "$row5[nr] - $row5[titel] ";
-                $inhalt_fin .= "<tr>";
-
-                if($zaehler1==0){
-                 $inhalt_fin .= "<td border=0>Eingangslied:</td>";
-                 $zaehler1=1;
-                }else{
-                 $inhalt_fin .= "<td border=0>&nbsp;</td>";
-                }
-
-                $inhalt_fin .= "<td border=0>$EL</td>";
-                $inhalt_fin .= "</tr>";
-              }
-              
-              $query = "SELECT gbid, vorname, nachname 
-                          FROM lieder_quelle, admin 
-                         WHERE art='bl' 
-                           AND lid=$lid 
-                           AND lieder_quelle.user = admin.user 
-                         ORDER BY gbid";
-              $result4 = $db->query( $query)
-                         or die ("Cannot execute query");
-              $zaehler1=0;
-
-              while ($row4 = $result4->fetch_array()){
-                $result2 = $db->query("SELECT nr, titel FROM lieder WHERE gbid=$row4[gbid] LIMIT 1");
-                $row5 = $result2->fetch_array();
-
-		$BL = "$row5[nr] - $row5[titel] ";
-                $inhalt_fin .= "<tr>";
-
-                if($zaehler1==0){
-                 $inhalt_fin .= "<td border=0>Bußlied:</td>";
-                 $zaehler1=1;
-                }else{
-                 $inhalt_fin .= "<td border=0>&nbsp;</td>";
-                }
-
-                $inhalt_fin .= "<td border=0>$BL</td>";
-                $inhalt_fin .= "</tr>";
-              }
-              
-              $query = "SELECT gbid, vorname, nachname 
-                          FROM lieder_quelle, admin 
-                         WHERE art='al' 
-                           AND lid=$lid 
-                           AND lieder_quelle.user = admin.user 
-                         ORDER BY gbid";
-              $result4 = $db->query( $query)
-                         or die ("Cannot execute query");
-              $zaehler1=0;
-
-              while ($row4 = $result4->fetch_array()){
-                $result2 = $db->query("SELECT nr, titel FROM lieder WHERE gbid=$row4[gbid] LIMIT 1");
-                $row5 = $result2->fetch_array();
-
-		$AL = "$row5[nr] - $row5[titel] ";
-                $inhalt_fin .= "<tr>";
-
-                if($zaehler1==0){
-                 $inhalt_fin .= "<td border=0>Abendmahlslied:</td>";
-                 $zaehler1=1;
-                }else{
-                 $inhalt_fin .= "<td border=0>&nbsp;</td>";
-                }
-
-                $inhalt_fin .= "<td border=0>$AL</td>";
-                $inhalt_fin .= "</tr>";
-              }
-              
-              $query = "SELECT gbid, vorname, nachname 
-                          FROM lieder_quelle, admin 
-                         WHERE art='wl' 
-                           AND lid=$lid 
-                           AND lieder_quelle.user = admin.user 
-                         ORDER BY gbid";
-              $result4 = $db->query( $query)
-                         or die ("Cannot execute query");
-              $zaehler1=0;
-
-              while ($row4 = $result4->fetch_array()){
-                $result2 = $db->query("SELECT nr, titel FROM lieder WHERE gbid=$row4[gbid] LIMIT 1");
-                $row5 = $result2->fetch_array();
-		$WL = "$row5[nr] - $row5[titel] ";
-                $inhalt_fin .= "<tr>";
-
-                if($zaehler1==0){
-                 $inhalt_fin .= "<td border=0>Weitere Lieder:</td>";
-                 $zaehler1=1;
-                }else{
-                 $inhalt_fin .= "<td border=0>&nbsp;</td>";
-                }
-
-                $inhalt_fin .= "<td border=0>$WL</td>";
-                $inhalt_fin .= "</tr>";
-              }
-              
-
-              $inhalt_fin .= "</table>";
-              $inhalt_fin .= "</td>
-                  </tr>";
-   } // ende wenn keine Lieder vorhanden sind               
-                  if($row2['bezeichnung']!=""){ # Wenn keine Unterkategorie, dann auch kei Schrägstrich nach Kategorie
-                   $trennzeichen  = "/";
-                  } else{
-                   $trennzeichen  = "";
-                  }
-
-$inhalt_fin .= "
-                  <tr>
-                    <td width='80'>Kategorie:</td>
-                    <td width='600'>$row1[bezeichnung] $trennzeichen $row2[bezeichnung]</td>
-                  </tr>";
-if($row3['bezeichnung'] != ''){
-                  if($row6['bezeichnung']!=""){ # Wenn keine Unterkategorie, dann auch kei Schrägstrich nach Kategorie
-                   $trennzeichen2  = "/";
-                  } else{
-                   $trennzeichen2  = "";
-                  }
-  $inhalt_fin .= "
-                  <tr>
-                    <td width='80'>
-                      Thema:
-                    </td>
-                    <td width='600'>
-                      $row3[bezeichnung] $trennzeichen2 $row6[bezeichnung]
-                    </td>
-                  </tr>";
-}
-  $inhalt_fin .= "
-                </table>
-               ";
-
-##################Header Ende####################################
-
-##################Botschaft #####################################
-if ($lg_datum >= $switch_date){ # neue LG?
- if($row['botschaft'] != ''){
-  $inhalt_fin .= "<span class='fcol'><b>Botschaft:</b></span><br>".$botschaft;
- }
-}
-##################Botschaft Ende ################################
-
-##################Inhalt ###########################################
-$inhalt_fin .= "<br><br><span class='fcol'><b>Ausführungen:</b></span><br>".$inhalt;
-##################Inhalt Ende ######################################
-
-##################Zusammenfassung ##################################
-if ($lg_datum >= $switch_date){ # neue LG?
- if($row['zusammenfassung'] != ''){
-  $inhalt_fin .= "<br><br><span class='fcol'><b>Zusammenfassung:</b></span><br>".$zusammenfassung;
- }
-}
-##################Zusammenfassung Ende #############################
-
-
-##################Kontext ##########################################
-if ($lg_datum >= $switch_date){ # neue LG?
- if($row['kontext'] != ''){
-  $inhalt_fin .= "<br><br><span class='fcol'><b>Kontext:</b></span><br>".$kontext;
- }
-}
-##################Kontext Ende ######################################
-
-
-##################Notiz #############################################
-if($row7['notiz'] != ''){
-  $inhalt_fin .= "<br><br><span class='fcol'><b>Notizen:</b></span><br>".$notiz;
-}
-##################Notiz Ende ########################################
-#$inhalt_fin .= "</page>";
-
-    require_once(dirname(__FILE__).'/html2pdf_v4.03/html2pdf.class.php');
-    $inhalt_fin = '<page backtop="0mm" backbottom="10mm" style="font-size: 11pt" style="font-family: freeserif">'.nl2br($inhalt_fin).'</page>';
-
-#exit;
-    try
-    {
-  
-#/*
-        // seitenränder (in mm)
-	$oben=15;    //mT
-	$unten=15;   //mB
-	$links=15;   //mL
-	$rechts=15;  //mR
-#        $html2pdf = new HTML2PDF('P', 'A4', 'de');
-        $html2pdf = new HTML2PDF('P', 'A4', 'de', true, 'UTF-8', array($links, $oben, $rechts, $unten));
-        $html2pdf->pdf->SetDisplayMode('real');
-#        $html2pdf->setDefaultFont('arialunicid0'); //add this line
-#       $html2pdf->setModeDebug();
-#        $html2pdf->setDefaultFont('Arial');
-        $html2pdf->writeHTML($inhalt_fin, isset($_GET['vuehtml']));
-        $html2pdf->Output("LG_$lid.pdf",'D');
-#*/
-    }
-    catch(HTML2PDF_exception $e) {
-        echo $e;
-        exit;
-    }
-
-?>
\ No newline at end of file
diff --git a/suche.php_20170928 b/suche.php_20170928
deleted file mode 100644
index 0a58a141..00000000
--- a/suche.php_20170928
+++ /dev/null
@@ -1,511 +0,0 @@
-<?php
-/*
-# Fuer debugging
-error_reporting(E_ALL);
-ini_set('display_errors', 1);
-#echo __LINE__."<br>";
-*/
-#error_reporting(E_ALL);
-#ini_set('display_errors', 1);
-setlocale (LC_ALL, 'de_DE@UTF8', 'de_DE', 'de', 'ge');
-
-
-include_once 'classes/lg-on_Smarty.class.php';
-$smarty = new lgon_Smarty();
-require_once("config.inc.php");
-require_once("func_rollenrechte.php");
-$templatename = substr(basename($_SERVER['PHP_SELF']),0,-3)."html";
-require_once "language/german.inc.php";
-
-
-#require("func_highlight.php");
-// Rechteüberprüfung
-$db = dbconnect();
-if ($user_admin == ""){ require("index.php"); exit;} //Wenn man nicht angemeldet ist, darf man nicht auf die Seite
-if(!rore($user_admin,'a_suche','RE')){require("lib/rechte.php");exit;}
-// Rechteüberprüfung ende
-
-if(isset($_GET['action'])){
-  $action = $_GET['action'];
-}else{
-  $action = '';
-}
-
-if($action == ''){
-   $db = dbconnect();
-   
-   $query1 = "SELECT distinct tid, bezeichnung FROM thema WHERE bezeichnung != '' ORDER BY tid DESC";
-   $result1 = $db->query( $query1);
-
-
-
-
-   while ($row = $result1->fetch_array()){
-     $value[] = $row;
-    }
-   // Assign this array to smarty...
-   $smarty->assign('table_data', $value);
-
-
-
-   $query = "SELECT kid, bezeichnung FROM kategorie ORDER BY bezeichnung ASC";
-   $result = $db->query( $query);
-
-   while ($row = $result->fetch_array()){
-     $value1[] = $row;
-   }
-   $smarty->assign('table_data1', $value1);
-}
-
-if($action == 'suche'){
-  if(isset($_POST['thema'])){
-    $thema = mb_strtoupper($_POST['thema']);
-  }else{
-    $thema = "";
-  }
-
-  if(isset($_POST['ueberschrift'])){
-    $ueberschrift = mb_strtoupper($_POST['ueberschrift']);
-  }else{
-    $ueberschrift = "";
-  }
-  
-  if(isset($_POST['textstelle'])){
-    $textstelle = mb_strtoupper($_POST['textstelle']);
-  }else{
-    $textstelle = "";
-  }
-  
-  if(isset($_POST['textwort'])){
-    $textwort = mb_strtoupper($_POST['textwort']);
-  }else{
-    $textwort = "";
-  }
-
-  if(isset($_POST['inhalt'])){
-    $inhalt = mb_strtoupper($_POST['inhalt']);
-  }else{
-    $inhalt = "";
-  }
-
-  if(isset($_POST['jahr'])){
-    $jahr = mb_strtoupper($_POST['jahr']);
-  }else{
-    $jahr = "";
-  }
-  
-  if(isset($_POST['monat'])){
-    $monat = mb_strtoupper($_POST['monat']);
-  }else{
-    $monat = "";
-  }
-  
-  if(isset($_POST['tag'])){
-    $tag = mb_strtoupper($_POST['tag']);
-  }else{
-    $tag = "";
-  }
-  
-  if(isset($_POST['stapgd'])){
-    $stapgd = mb_strtoupper($_POST['stapgd']);
-  }else{
-    $stapgd = "";
-  }
-  
-  if(isset($_POST['dhtmlgoodies_country'])){
-    $kid = mb_strtoupper($_POST['dhtmlgoodies_country']);
-  }else{
-    $kid = "";
-  }
-  
-  if(isset($_POST['dhtmlgoodies_city'])){
-    $ukid = mb_strtoupper($_POST['dhtmlgoodies_city']);
-  }else{
-    $ukid = "";
-  }
-  
-  if(isset($_POST['art'])){
-    $art = $_POST['art'];
-  }else{
-    $art = "";
-  }
-  
-  
-  setcookie("ck_ukid",$ukid);
-  
-  
-  if ($jahr == "JJJJ"){$jahr = '';}
-  if ($monat == "MM"){$monat = '';}
-  if ($tag == "TT"){$tag = '';}
-  if ($kid == ''){$kid = '%';}
-  if ($thema == ''){$thema = '%';}
-  if ($ukid == ''){$ukid = '%';}
-  
-  
-  //Select zusammenbauen
-  
-  if($art == 'exact' AND $ueberschrift != ''){  // wenn leer, darf kein regexp kommen, sonst würde er nichts finden
-   $trenner1 = 'REGEXP ';
-   $start1 = '[[:<:]]';
-   $ende1 = '[[:>:]]';
-  }else{
-   $trenner1 = 'LIKE ';
-   $start1 = '%';
-   $ende1 = '%'; 
-  }
-  
-  if($art == 'exact' AND $textstelle != ''){
-   $trenner2 = 'REGEXP ';
-   $start2 = '';
-   $ende2 = '';
-  }else{
-   $trenner2 = 'LIKE ';
-   $start2 = '';
-   $ende2 = ''; 
-  }
-  
-  if($art == 'exact' AND $textwort != ''){
-   $trenner3 = 'REGEXP ';
-   $start3 = '[[:<:]]';
-   $ende3 = '[[:>:]]';
-  }else{
-   $trenner3 = 'LIKE ';
-   $start3 = '%';
-   $ende3 = '%'; 
-  }
-  
-  if($art == 'exact' AND $inhalt != ''){
-   $trenner4 = 'REGEXP ';
-   $start4 = '[[:<:]]';
-   $ende4 = '[[:>:]]';
-  }else{
-   $trenner4 = 'LIKE ';
-   $start4 = '%';
-   $ende4 = '%'; 
-  }
-  
-  
-  
-  $sql1 = "SELECT count(*) as anz_treffer
-            FROM quelle
-           WHERE ";
-  
-  ######################################################################################################
-  ## SQL ZUSAMMENBAUEN FÜR DIE ÜBERSCHRIFT
-  ######################################################################################################
-  
-  $ueberschrift = preg_replace('/\s{2,}/sm',' ',$ueberschrift,PREG_SET_ORDER); //Mehr als zwei leerzeichen entfernen
-  preg_match_all("/(\-{0,1}\+{0,1}\*{0,1}%{0,1}\"([^\"]+)\"\*{0,1}%{0,1}\+{0,1}\-{0,1}|\-{0,1}\+{0,1}\*{0,1}%{0,1}(\w+)\*{0,1}%{0,1}\+{0,1}\-{0,1})/u", $ueberschrift, $Ueberschriften);
-  # Erklärung: \-{0,1} --> 0 oder 1 Minuszeichen kann string enthalten
-  #            \+{0,1} --> 0 oder 1 Pluszeichen kann string enthalten
-  #            \*{0,1} --> 0 oder 1 Asterisk kann string enthalten
-  #            %{0,1}  --> 0 oder 1 Prozentzeichen kann string enthalten, muss nicht durch \ escaped werden
-  #            Vorderer Teil bis | überprüft ob "" eingegeben wurden und splittet innerhalb der "" nicht. Hinterer Teil wenn Wörter ohne "" eingegeben wurde
-  $sql = "";
-  if($ueberschrift != ""){
-    
-    $sql .= " (";  //Kein AND vor der Klammer notwendig, da direkt nach where, bei anderen muss AND davor stehen
-  
-    for($i=0; $i < count($Ueberschriften[0]); $i++)
-      {
-       
-       #In der Überschrift kommen Umlaute vor, daher keine Ersetzung der Umlaute
-       #$ueberschrift = str_replace (array("\\", "ä", "ö", "ü", "ß", "Ä", "Ö", "Ü"), array("", "&AUML;", "&OUML;", "&UUML;", "&SZLIG;", "&AUML;", "&OUML;", "&UUML;"), $Ueberschriften[0][$i]);
-       $ueber = str_replace (array("+", "-", "\"", "\\"), array("", "", "", ""), $Ueberschriften[0][$i]);
-       
-       if($i == 0){
-         $oper = "";
-       }else{
-          $oper = "AND";
-       }
-  
-       if(strpos($Ueberschriften[0][$i],"+") === 0){
-         $sql .= "UPPER(ueberschrift) $trenner1 '$start1".$ueber."$ende1' "; 
-       } elseif(strpos($Ueberschriften[0][$i],"-") === 0){
-         $sql .= "$oper UPPER(ueberschrift) NOT $trenner1 '$start1".$ueber."$ende1' ";
-       } elseif($Ueberschriften[0][$i] == ""){
-         NULL;
-       }else{
-         $sql .= "$oper UPPER(ueberschrift) $trenner1 '$start1".$ueber."$ende1' ";
-       }
-   }
-  
-   $sql .= ")";
-  
-  }else{
-  
-   $sql .= " UPPER(ueberschrift) LIKE '%' "; //Wenn nichts eingegeben, dann soll alles angzeigt werden. Das braucht man hier weil zusammengesetzter string sonst WHERE AND TEXTSTELLE = .... heißen könnte
-  
-  }
-  
-  ######################################################################################################
-  ## SQL ZUSAMMENBAUEN FÜR DIE ÜBERSCHRIFT ENDE
-  ######################################################################################################
-  
-  
-  ######################################################################################################
-  ## SQL ZUSAMMENBAUEN FÜR DIE TEXTSTELLE
-  ######################################################################################################
-  
-  if($textstelle == ''){
-   $sql .= " AND (";
-     $sql .= " UPPER(textstelle) like '%' ";
-   $sql .= " ) ";
-  }else{
-   $sql .= " AND (";
-     $sql .= " UPPER(textstelle) like '$textstelle' ";
-   $sql .= " ) ";
-  }
-  
-  ######################################################################################################
-  ## SQL ZUSAMMENBAUEN FÜR DIE TEXTSTELLE ENDE
-  ######################################################################################################
-  
-  
-  ######################################################################################################
-  ## SQL ZUSAMMENBAUEN FÜR DAS TEXTWORT
-  ######################################################################################################
-  
-  $textwort = preg_replace('/\s{2,}/sm',' ',$textwort,PREG_SET_ORDER); //Mehr als zwei leerzeichen entfernen
-  preg_match_all("/(\-{0,1}\+{0,1}\*{0,1}%{0,1}\"([^\"]+)\"\*{0,1}%{0,1}\+{0,1}\-{0,1}|\-{0,1}\+{0,1}\*{0,1}%{0,1}(\w+)\*{0,1}%{0,1}\+{0,1}\-{0,1})/u", $textwort, $Textworte);
-  
-  if($textwort != ""){
-  
-    $sql .= "AND (";
-    for($i=0; $i < count($Textworte[0]); $i++)
-      {
-      
-       $textwort = str_replace (array("\\", "ä", "ö", "ü", "ß", "Ä", "Ö", "Ü"), array("", "&AUML;", "&OUML;", "&UUML;", "&SZLIG;", "&AUML;", "&OUML;", "&UUML;"), $Textworte[0][$i]);
-       $suchtextwort = str_replace (array("+", "-", "\"", "\\"), array("", "", "", ""), $textwort);
-       
-       if($i == 0){
-         $oper = "";
-       }else{
-         $oper = "AND";
-       }
-       
-       if(strpos($Textworte[0][$i],"+") === 0){
-         $sql .= "UPPER(textwort) $trenner3 '$start3".$suchtextwort."$ende3' ";
-       } elseif(strpos($Textworte[0][$i],"-") === 0){
-         $sql .= "$oper UPPER(textwort) NOT $trenner3 '$start3".$suchtextwort."$ende3' ";
-       } elseif($Textworte[0][$i] == ""){
-         NULL;
-       }else{
-         $sql .= "$oper UPPER(textwort) $trenner3 '$start3".$suchtextwort."$ende3' ";
-       }
-  }
-  
-  $sql .= ")";
-  
-  }
-  
-  ######################################################################################################
-  ## SQL ZUSAMMENBAUEN FÜR DAS TEXTWORT ENDE
-  ######################################################################################################
-  
-  
-  ######################################################################################################
-  ## SQL ZUSAMMENBAUEN FÜR DEN INHALT
-  ######################################################################################################
-
-  $inhalt = preg_replace('/\s{2,}/sm',' ',$inhalt,PREG_SET_ORDER); //Mehr als zwei leerzeichen entfernen
-
-
-  preg_match_all("/(\-{0,1}\+{0,1}\*{0,1}%{0,1}\"([^\"]+)\"\*{0,1}%{0,1}\+{0,1}\-{0,1}|\-{0,1}\+{0,1}\*{0,1}%{0,1}(\w+)\*{0,1}%{0,1}\+{0,1}\-{0,1})/u", $inhalt, $Worte);
-
-  if($inhalt != ""){
-  
-    $sql .= "AND ("; 
-    for($i=0; $i < count($Worte[0]); $i++)
-      {
-
-       $inhalt = str_replace (array("\\", "ä", "ö", "ü", "ß", "Ä", "Ö", "Ü"), array("", "&AUML;", "&OUML;", "&UUML;", "&SZLIG;", "&AUML;", "&OUML;", "&UUML;"), $Worte[0][$i]);
-       $suchwort = str_replace (array("+", "-", "\"", "\\"), array("", "", "", ""), $inhalt);
-       if($i == 0){
-         $oper = "";
-       }else{
-         $oper = "AND";
-       }
-       
-       if(strpos($Worte[0][$i],"+") === 0){
-         $sql .= "UPPER(inhalt) $trenner4 '$start4".$suchwort."$ende4' ";
-       } elseif(strpos($Worte[0][$i],"-") === 0){
-         $sql .= "$oper UPPER(inhalt) NOT $trenner4 '$start4".$suchwort."$ende4' ";
-       } elseif($Worte[0][$i] == ""){
-         NULL;
-       }else{
-         $sql .= "$oper UPPER(inhalt) $trenner4 '$start4".$suchwort."$ende4' ";
-       }
-  }
-  
-  $sql .= ")";
-  
-  }
-  
-  ######################################################################################################
-  ## SQL ZUSAMMENBAUEN FÜR DEN INHALT ENDE
-  ######################################################################################################
-  
-  
-  ######################################################################################################
-  ## SQL ZUSAMMENBAUEN FÜR DIE RESTLICHEN FELDER
-  ######################################################################################################
-  
-  #ukid-Feld ist einziges Feld mit NULL=ja, da es nicht immer Unterkategorie gibt und mit leerem Feld
-  #hätte das Ergebniss nicht gestimmt
-  #also muss man auch "or ukid is NULL" abfragen
-  
-  $sql .= "AND ( UPPER(datum) LIKE '%$jahr%-%$monat%-%$tag%')
-           AND ( UPPER(stapgd) LIKE '%$stapgd%')
-           AND ( UPPER(kid) LIKE '$kid')
-           AND ( UPPER(thema) LIKE '$thema')
-           AND ( UPPER(ukid) LIKE '$ukid'";
-                
-                if ($ukid == "%"){
-                   $sql .= " OR ukid IS NULL ";
-                }
-                $sql .= " )";
-  
-  ######################################################################################################
-  ## SQL ZUSAMMENBAUEN FÜR DIE RESTLICHEN FELDER ENDE
-  ######################################################################################################
-  
-  
-  ######################################################################################################
-  ## GESAMTSELECT - SQL ZUSAMMENBAUEN
-  ######################################################################################################
-  
-  $query = $sql1.$sql;
-  $result = $db->query( $query );
-  $res = $result->fetch_array()
-         or die ("Cannot execute query");
-  
-  function kurzer_text($string,$laenge){ 
-      $origin=strlen($string);
-      $stri_arr=explode(" ",$string);
-      $anzzahl=count($stri_arr);
-      $gekuerzt=0;
-      $string="";
-      while($gekuerzt<$anzzahl){ 
-          $string_alt=$string;
-          $string=$string." ".$stri_arr[$gekuerzt];
-          $gekuerzt++;
-          if(strlen($string)>$laenge){ 
-              $gekuerzt=$anzzahl; 
-              $string=$string_alt;
-          } 
-      } 
-      if($laenge<$origin){ 
-          $string=$string."<nobr>&nbsp;<b>...</b></nobr>";
-      } 
-      return $string; 
-  }
-  
-  if($res['anz_treffer'] == '' or $res['anz_treffer'] == 0){
-    $smarty->assign('suche_nomatch', "1");
-    $smarty->assign('suche_match', "0");
-  }else{
-    $smarty->assign('suche_match', "1");
-    $smarty->assign('suche_nomatch', "0");
-    $smarty->assign('anzahltreffer', "$res[anz_treffer]");
-    		  
-    $db = dbconnect();
-    
-    $sql1 = "SELECT lid, ueberschrift, textstelle, inhalt, textwort, stapgd, kid, ukid, DATE_Format(datum, '%d') tag, DATE_Format(datum, '%m') monat, DATE_Format(datum, '%Y') jahr, DATE_Format(datum, '%Y%m%d') date_sort
-               FROM quelle
-              WHERE ";
-    
-    $sql2 = " ORDER BY date_sort desc";
-    $query = $sql1.$sql.$sql2;
-    
-    $result = $db->query( $query)
-              or die ("Cannot execute query");
-
-
-    $ln_zaehler = 0;
-    while ($row = $result->fetch_array()){
-    
-      if($inhalt == ''){
-        ##$preview = substr(strip_tags($row[inhalt]),0,200)." <b>...</b> ";
-        $preview = kurzer_text(strip_tags($row['inhalt']),200);
-        
-      }else{
-        #$preview = preview(strip_tags($row[inhalt]),trim($_POST[inhalt]));
-        ##$preview = substr(strip_tags($row[inhalt]),0,200)." <b>...</b> ";
-        $preview = kurzer_text(strip_tags($row['inhalt']),200);
-      }
-    
-      
-      $wochentag = date("l", mktime(0,0,0,$row['monat'],$row['tag'],$row['jahr']));
-    
-      switch($wochentag)
-      {
-        case 'Sunday':
-            $wochentag = "So.";
-            break;
-        case 'Monday':
-            $wochentag = "Mo.";
-            break;
-        case 'Tuesday':
-            $wochentag = "Di.";
-            break;
-        case 'Wednesday':
-            $wochentag = "Mi.";
-            break;
-        case 'Thursday':
-            $wochentag = "Do.";
-            break;
-        case 'Friday':
-            $wochentag = "Fr.";
-            break;
-        case 'Saturday':
-            $wochentag = "Sa.";
-            break;
-      }
-      
-      $result1 = $db->query( "SELECT bezeichnung FROM kategorie WHERE kid='$row[kid]'" );
-      $row1 = $result1->fetch_array();
-      
-      $result2 = $db->query( "SELECT bezeichnung FROM unterkategorie WHERE ukid='$row[ukid]'" );
-      $row2 = $result2->fetch_array();
-      
-      $result3 = $db->query( "SELECT count(*) Anz
-                                FROM notizen 
-                               WHERE lid='$row[lid]'
-                                 AND user='$user_admin'" );
-      $row3 = $result3->fetch_array();
-
-      
-      $ln_zaehler = $ln_zaehler + 1;
-        
-      if($art == 'exact'){ // Übergabe für Highligthing. Wenn exact, dann darf bei Begriff nicht Gottesdienst hervorgehoben werden
-        $suchart = 0;
-      }else{
-        $suchart = 1;
-      }
-                  
-      $inhalt_hig = urlencode(serialize($_POST['inhalt']));
-      
-      
-      $row['suchart'] = $suchart;
-      $row['inhalt_hig'] = $inhalt_hig;
-      $row['kategorie'] = $row1['bezeichnung'];
-      $row['unterkategorie'] = $row2['bezeichnung'];
-      $row['preview'] = $preview;
-      $row['wochentag'] = $wochentag;
-      $row['notizen'] = $row3['Anz'];
-      $value[] = $row;
-      
-
-    }
-    $smarty->assign('table_data3', $value);
-  }
-
-} // Ende $action = suche
-
-
-
-$smarty->assign('action', "$action");
-$smarty->display("$template/$templatename");
-
-?>
\ No newline at end of file
diff --git a/templates/standard/ansicht.html_20200212 b/templates/standard/ansicht.html_20200212
deleted file mode 100644
index 0b13067c..00000000
--- a/templates/standard/ansicht.html_20200212
+++ /dev/null
@@ -1,264 +0,0 @@
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <link rel="stylesheet" href="templates/{$global_template}/css/styles_pc.php" type="text/css">
-    {literal}
-    <script type='text/javascript' src='overlib/overlib.js'></script>
-    <SCRIPT LANGUAGE='JAVASCRIPT' TYPE='TEXT/JAVASCRIPT'>
-      <!--
-      var win=null;
-      function bib_link_lokal1(mypage,myname,w,h,pos,infocus){
-        if(pos=="random"){myleft=(screen.width)?Math.floor(Math.random()*(screen.width-w)):100;mytop=(screen.height)?Math.floor(Math.random()*((screen.height-h)-75)):100;}
-        if(pos=="center"){myleft=(screen.width)?(screen.width-w)/2:100;mytop=(screen.height)?(screen.height-h)/2:100;}
-        else if((pos!='center' && pos!="random") || pos==null){myleft=0;mytop=20}
-        settings="width=" + w + ",height=" + h + ",top=" + mytop + ",left=" + myleft + ",scrollbars=auto,location=no,directories=no,status=no,menubar=no,toolbar=no,resizable=no";
-        win=window.open(mypage,myname,settings);
-        win.focus();
-      }
-      // -->
-    </script>
-    <script language='JavaScript' type='text/javascript'>
-      <!--
-      function einblenden(div) {
-       with(document.getElementById(div).style){
-        if(display=='none'){
-           display='inline';
-        }else{
-           display='none';
-        }
-       }
-      }
-      //-->
-    </script>
-    {/literal}
-    <style type='text/css'>
-      {literal}
-      .verse {
-      font-family		:	verdana, arial;
-      font-size		: 	8pt;
-      color			: 	#6487DC;
-      text-transform		:	uppercase;  /* Großbuchstaben */
-      }
-      .font1 { font-size:23.00pt; }
-      .font2 { line-height:150%; }
-      .alue{
-      text-decoration: none;
-      border-bottom: 1px dotted red;
-      background-image: none;
-      padding-left: 0;
-      }
-      .alue:hover {
-      border-bottom: 1px solid red;
-      }
-      .exeg{
-      text-decoration: none;
-      border-bottom: 1px dotted blue;
-      background-image: none;
-      padding-left: 0;
-      }
-      .exeg:hover {
-      border-bottom: 1px solid blue;
-      }
-      .bothalueexeg{
-      text-decoration: none;
-      border-bottom: 1px dotted green;
-      background-image: none;
-      padding-left: 0;
-      }
-      .bothalueexeg:hover {
-      border-bottom: 1px solid green;
-      }
-      #xsnazzy h1, #xsnazzy h2, #xsnazzy p {margin:0 0px; letter-spacing:1px; padding:0;}
-      #xsnazzy h1 {font-size:2.5em; color:#fff;}
-      #xsnazzy h2 {font-size:2em;color:#06a; border:0;}
-      #xsnazzy p {padding-bottom:0.5em;}
-      #xsnazzy h2 {padding-top:0.5em;}
-      #xsnazzy {background: transparent; margin:0px 0px 0px 0px;}
-      .xtop, .xbottom {display:block; background:transparent; font-size:1px;}
-      .xb1, .xb2, .xb3, .xb4 {display:block; overflow:hidden;}
-      .xb1, .xb2, .xb3 {height:1px;}
-      .xb2, .xb3, .xb4 {background:#d6dff7; border-left:1px solid #6487DC; border-right:1px solid #6487DC;}
-      .xb1 {margin:0 5px; background:#6487DC;}
-      .xb2 {margin:0 3px; border-width:0 2px;}
-      .xb3 {margin:0 2px;}
-      .xb4 {height:2px; margin:0 1px;}
-      .xboxcontent {display:block; background:#d6dff7; border:0 solid #6487DC; border-width:0 1px;}
-      .link{
-      text-decoration: none;
-      color: black;
-      }
-      .knkfa {
-      font-family: Verdana;
-      font-size: 10px;
-      padding: 1px;
-      }
-      body {
-      padding: 0 2em;
-      background: #e2e2e2;
-      }
-      #page {
-      margin: 2em auto;
-      max-width: 1000px;
-      background: #fff;
-      }
-      body, input, textarea {
-      color: #373737;
-      font: 15px "Helvetica Neue", Helvetica, Arial, sans-serif;
-      font-weight: 300;
-      line-height: 1.625;
-      }
-      {/literal}
-    </style>
-    {literal}
-    <script src="copy.js" type="text/javascript"></script>
-    {/literal}
-  </head>
-  <body onload="{literal}window.location.hash='#verweis'" oncopy="javascript:copy('de');{/literal}">
-    <div id="overDiv" style="position: absolute; visibility: hidden; z-index: 1000; left: 10px; top: 0px; background-image: none;"></div>
-    <div id="page" class="hfeed">
-      <div class="entry-content">
-        <br>
-        <table cellspacing="0" cellpadding="0" width="100%" border="0">
-          <tr>
-            <td width="5%">
-              &nbsp;
-            </td>
-            <td width='90%'>
-              {$ansicht_weekday} {$ansicht_date} - Kategorie: {$ansicht_cat_text}
-              {if $ansicht_subcat_exists == '1'}
-              / {$ansicht_subcat_text}
-              {/if}
-              <!-- "Aus einem Gottesdienst des Stammapostels" -->
-              {if $ansicht_stapgd_exists == '1'}
-              <br> {$ansicht_stapgd_text}
-              {/if}
-              <!-- "Stammapostelgottesdienst" -->
-              {if $ansicht_stapgd1_exists == '1'}
-              <br> {$ansicht_stapgd1_text}
-              {/if}
-              <br>
-              <p class=font1 align='center'>
-                {$ansicht_headline_text}
-                <br>
-                <!-- Neues Leitgedankenformat: Thema/Unterthema -->
-                {if $ansicht_lg_new == '1'}
-                <font align=center size=2>
-                {$ansicht_thema_text}
-                {if $ansicht_subthema_exists == '1'}
-                / {$ansicht_subthema_text}
-                {/if}
-                </font><br>
-                {/if}
-                {if $ansicht_icon_pdf_right == '1'}
-                {$ansicht_icon_pdf}
-                {/if}
-                {if $ansicht_icon_edit_right == '1'}
-                {$ansicht_icon_edit}
-                {/if}
-                {if $ansicht_icon_outlook_right == '1'}
-                {$ansicht_icon_outlook}
-                {/if}
-                {if $ansicht_icon_podcast_right == '1'}
-                {$ansicht_icon_podcast}
-                {/if}
-              <p align='center'>
-                <!-- Link Textwort zu Onlinebibeln -->
-                {$ansicht_textwort_link}
-                {if $ansicht_qv_vorhanden == '1'}
-                <!-- Klappmenü Textstellenverweise -->
-              <p align='center'>
-                <a align='center' <a href='#' title='Standard über das Profil wählbar' onclick='document.getElementById("lue_notiz").style.display = (document.getElementById("lue_notiz").style.display == "none")?"block":"none";'>{$ansicht_field_querverweis}</a>
-              </p>
-              <div id="lue_notiz" style="display: {$ansicht_qv_modus}">
-                {$ansicht_qv_gen}
-              </div>
-              {/if}
-              <!-- Bibellesung vorhanden -->
-              {if $ansicht_lesung_vorhanden == '1'}
-              <!-- Klappmenü Lesung -->
-              <p align='center'>
-                <a align='center' <a href='#' title='Standard über das Profil wählbar' onclick='document.getElementById("ansicht_lesung").style.display = (document.getElementById("ansicht_lesung").style.display == "none")?"block":"none";'>{$ansicht_field_lesung}</a>
-              </p>
-              <div id="ansicht_lesung" style="display: {$ansicht_lesung_modus}">
-                {$ansicht_lesung_gen}
-              </div>
-              <br>
-              {/if}
-              <p>
-            </td>
-            <td width="5%" valign="top" align="right">
-              <br>
-              {if $ansicht_fadeout == '1'}
-              <a href="ausgabe.php?lid={$ansicht_lid}"><img title = "Lieder/Notizen einblenden"border="0" src="templates/{$global_template}/images/fadein.png"></a>
-              {/if}
-            </td>
-          </tr>
-          <tr>
-            <td width="5%">
-              &nbsp;
-            </td>
-            <td width='90%' class=td2>
-              <!-- Textwort anzeigen, wenn eines vorhanden -->
-              <i> {$ansicht_textwort} </i>
-              <!-- Vorwort anzeigen, wenn eine vorhanden -->
-              {if $ansicht_vorwort_exists == '1'}
-              <p class=font2 align='justify'>
-              <div class=textfarbe>
-                {$ansicht_vorwort_bez}
-              </div>
-              {$ansicht_vorwort_text}
-              </p>
-              {/if}
-              <!-- Botschaft anzeigen, wenn eine vorhanden -->
-              {if $ansicht_botschaft_exists == '1'}
-              <p class=font2 align='justify'>
-              <div class=textfarbe>
-                {$ansicht_botschaft_bez}
-              </div>
-              {$ansicht_botschaft_text}
-              </p>
-              {/if}
-              <!-- Ausführung anzeigen -->
-              {if $ansicht_inhalt_exists != ''}
-              <p class=font2 align='justify'>
-                <!-- Bezeichnung "Ausführungen" anzeigen bei Gottesdiensten-->
-                {if $ansicht_inhalt_exists == '1'}
-              <div class=textfarbe>
-                {$ansicht_inhalt_bez}
-              </div>
-              {/if}
-              {$ansicht_inhalt_text}
-              </p>
-              {/if}
-              <!-- Zusammenfassung anzeigen, wenn eine vorhanden -->
-              {if $ansicht_zusammenfassung_exists == '1'}
-              <p class=font2 align='justify'>
-              <div class=textfarbe>
-                {$ansicht_zusammenfassung_bez}
-              </div>
-              {$ansicht_zusammenfassung_text}
-              </p>
-              {/if}
-              <!-- Kontext anzeigen, wenn einer vorhanden -->
-              {if $ansicht_kontext_exists == '1'}
-              <p class=font2 align='justify'>
-              <div class=textfarbe>
-                {$ansicht_kontext_bez}
-              </div>
-              {$ansicht_kontext_text}
-              </p>
-              {/if}
-              </p>
-            </td>
-            <td width="5%">
-              &nbsp;
-            </td>
-          </tr>
-        </table>
-        <br>
-      </div>
-    </div>
-    <!-- #page -->
-  </body>
-</html>
-
diff --git a/templates/standard/ansicht2.html_20200212 b/templates/standard/ansicht2.html_20200212
deleted file mode 100644
index 0b13067c..00000000
--- a/templates/standard/ansicht2.html_20200212
+++ /dev/null
@@ -1,264 +0,0 @@
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <link rel="stylesheet" href="templates/{$global_template}/css/styles_pc.php" type="text/css">
-    {literal}
-    <script type='text/javascript' src='overlib/overlib.js'></script>
-    <SCRIPT LANGUAGE='JAVASCRIPT' TYPE='TEXT/JAVASCRIPT'>
-      <!--
-      var win=null;
-      function bib_link_lokal1(mypage,myname,w,h,pos,infocus){
-        if(pos=="random"){myleft=(screen.width)?Math.floor(Math.random()*(screen.width-w)):100;mytop=(screen.height)?Math.floor(Math.random()*((screen.height-h)-75)):100;}
-        if(pos=="center"){myleft=(screen.width)?(screen.width-w)/2:100;mytop=(screen.height)?(screen.height-h)/2:100;}
-        else if((pos!='center' && pos!="random") || pos==null){myleft=0;mytop=20}
-        settings="width=" + w + ",height=" + h + ",top=" + mytop + ",left=" + myleft + ",scrollbars=auto,location=no,directories=no,status=no,menubar=no,toolbar=no,resizable=no";
-        win=window.open(mypage,myname,settings);
-        win.focus();
-      }
-      // -->
-    </script>
-    <script language='JavaScript' type='text/javascript'>
-      <!--
-      function einblenden(div) {
-       with(document.getElementById(div).style){
-        if(display=='none'){
-           display='inline';
-        }else{
-           display='none';
-        }
-       }
-      }
-      //-->
-    </script>
-    {/literal}
-    <style type='text/css'>
-      {literal}
-      .verse {
-      font-family		:	verdana, arial;
-      font-size		: 	8pt;
-      color			: 	#6487DC;
-      text-transform		:	uppercase;  /* Großbuchstaben */
-      }
-      .font1 { font-size:23.00pt; }
-      .font2 { line-height:150%; }
-      .alue{
-      text-decoration: none;
-      border-bottom: 1px dotted red;
-      background-image: none;
-      padding-left: 0;
-      }
-      .alue:hover {
-      border-bottom: 1px solid red;
-      }
-      .exeg{
-      text-decoration: none;
-      border-bottom: 1px dotted blue;
-      background-image: none;
-      padding-left: 0;
-      }
-      .exeg:hover {
-      border-bottom: 1px solid blue;
-      }
-      .bothalueexeg{
-      text-decoration: none;
-      border-bottom: 1px dotted green;
-      background-image: none;
-      padding-left: 0;
-      }
-      .bothalueexeg:hover {
-      border-bottom: 1px solid green;
-      }
-      #xsnazzy h1, #xsnazzy h2, #xsnazzy p {margin:0 0px; letter-spacing:1px; padding:0;}
-      #xsnazzy h1 {font-size:2.5em; color:#fff;}
-      #xsnazzy h2 {font-size:2em;color:#06a; border:0;}
-      #xsnazzy p {padding-bottom:0.5em;}
-      #xsnazzy h2 {padding-top:0.5em;}
-      #xsnazzy {background: transparent; margin:0px 0px 0px 0px;}
-      .xtop, .xbottom {display:block; background:transparent; font-size:1px;}
-      .xb1, .xb2, .xb3, .xb4 {display:block; overflow:hidden;}
-      .xb1, .xb2, .xb3 {height:1px;}
-      .xb2, .xb3, .xb4 {background:#d6dff7; border-left:1px solid #6487DC; border-right:1px solid #6487DC;}
-      .xb1 {margin:0 5px; background:#6487DC;}
-      .xb2 {margin:0 3px; border-width:0 2px;}
-      .xb3 {margin:0 2px;}
-      .xb4 {height:2px; margin:0 1px;}
-      .xboxcontent {display:block; background:#d6dff7; border:0 solid #6487DC; border-width:0 1px;}
-      .link{
-      text-decoration: none;
-      color: black;
-      }
-      .knkfa {
-      font-family: Verdana;
-      font-size: 10px;
-      padding: 1px;
-      }
-      body {
-      padding: 0 2em;
-      background: #e2e2e2;
-      }
-      #page {
-      margin: 2em auto;
-      max-width: 1000px;
-      background: #fff;
-      }
-      body, input, textarea {
-      color: #373737;
-      font: 15px "Helvetica Neue", Helvetica, Arial, sans-serif;
-      font-weight: 300;
-      line-height: 1.625;
-      }
-      {/literal}
-    </style>
-    {literal}
-    <script src="copy.js" type="text/javascript"></script>
-    {/literal}
-  </head>
-  <body onload="{literal}window.location.hash='#verweis'" oncopy="javascript:copy('de');{/literal}">
-    <div id="overDiv" style="position: absolute; visibility: hidden; z-index: 1000; left: 10px; top: 0px; background-image: none;"></div>
-    <div id="page" class="hfeed">
-      <div class="entry-content">
-        <br>
-        <table cellspacing="0" cellpadding="0" width="100%" border="0">
-          <tr>
-            <td width="5%">
-              &nbsp;
-            </td>
-            <td width='90%'>
-              {$ansicht_weekday} {$ansicht_date} - Kategorie: {$ansicht_cat_text}
-              {if $ansicht_subcat_exists == '1'}
-              / {$ansicht_subcat_text}
-              {/if}
-              <!-- "Aus einem Gottesdienst des Stammapostels" -->
-              {if $ansicht_stapgd_exists == '1'}
-              <br> {$ansicht_stapgd_text}
-              {/if}
-              <!-- "Stammapostelgottesdienst" -->
-              {if $ansicht_stapgd1_exists == '1'}
-              <br> {$ansicht_stapgd1_text}
-              {/if}
-              <br>
-              <p class=font1 align='center'>
-                {$ansicht_headline_text}
-                <br>
-                <!-- Neues Leitgedankenformat: Thema/Unterthema -->
-                {if $ansicht_lg_new == '1'}
-                <font align=center size=2>
-                {$ansicht_thema_text}
-                {if $ansicht_subthema_exists == '1'}
-                / {$ansicht_subthema_text}
-                {/if}
-                </font><br>
-                {/if}
-                {if $ansicht_icon_pdf_right == '1'}
-                {$ansicht_icon_pdf}
-                {/if}
-                {if $ansicht_icon_edit_right == '1'}
-                {$ansicht_icon_edit}
-                {/if}
-                {if $ansicht_icon_outlook_right == '1'}
-                {$ansicht_icon_outlook}
-                {/if}
-                {if $ansicht_icon_podcast_right == '1'}
-                {$ansicht_icon_podcast}
-                {/if}
-              <p align='center'>
-                <!-- Link Textwort zu Onlinebibeln -->
-                {$ansicht_textwort_link}
-                {if $ansicht_qv_vorhanden == '1'}
-                <!-- Klappmenü Textstellenverweise -->
-              <p align='center'>
-                <a align='center' <a href='#' title='Standard über das Profil wählbar' onclick='document.getElementById("lue_notiz").style.display = (document.getElementById("lue_notiz").style.display == "none")?"block":"none";'>{$ansicht_field_querverweis}</a>
-              </p>
-              <div id="lue_notiz" style="display: {$ansicht_qv_modus}">
-                {$ansicht_qv_gen}
-              </div>
-              {/if}
-              <!-- Bibellesung vorhanden -->
-              {if $ansicht_lesung_vorhanden == '1'}
-              <!-- Klappmenü Lesung -->
-              <p align='center'>
-                <a align='center' <a href='#' title='Standard über das Profil wählbar' onclick='document.getElementById("ansicht_lesung").style.display = (document.getElementById("ansicht_lesung").style.display == "none")?"block":"none";'>{$ansicht_field_lesung}</a>
-              </p>
-              <div id="ansicht_lesung" style="display: {$ansicht_lesung_modus}">
-                {$ansicht_lesung_gen}
-              </div>
-              <br>
-              {/if}
-              <p>
-            </td>
-            <td width="5%" valign="top" align="right">
-              <br>
-              {if $ansicht_fadeout == '1'}
-              <a href="ausgabe.php?lid={$ansicht_lid}"><img title = "Lieder/Notizen einblenden"border="0" src="templates/{$global_template}/images/fadein.png"></a>
-              {/if}
-            </td>
-          </tr>
-          <tr>
-            <td width="5%">
-              &nbsp;
-            </td>
-            <td width='90%' class=td2>
-              <!-- Textwort anzeigen, wenn eines vorhanden -->
-              <i> {$ansicht_textwort} </i>
-              <!-- Vorwort anzeigen, wenn eine vorhanden -->
-              {if $ansicht_vorwort_exists == '1'}
-              <p class=font2 align='justify'>
-              <div class=textfarbe>
-                {$ansicht_vorwort_bez}
-              </div>
-              {$ansicht_vorwort_text}
-              </p>
-              {/if}
-              <!-- Botschaft anzeigen, wenn eine vorhanden -->
-              {if $ansicht_botschaft_exists == '1'}
-              <p class=font2 align='justify'>
-              <div class=textfarbe>
-                {$ansicht_botschaft_bez}
-              </div>
-              {$ansicht_botschaft_text}
-              </p>
-              {/if}
-              <!-- Ausführung anzeigen -->
-              {if $ansicht_inhalt_exists != ''}
-              <p class=font2 align='justify'>
-                <!-- Bezeichnung "Ausführungen" anzeigen bei Gottesdiensten-->
-                {if $ansicht_inhalt_exists == '1'}
-              <div class=textfarbe>
-                {$ansicht_inhalt_bez}
-              </div>
-              {/if}
-              {$ansicht_inhalt_text}
-              </p>
-              {/if}
-              <!-- Zusammenfassung anzeigen, wenn eine vorhanden -->
-              {if $ansicht_zusammenfassung_exists == '1'}
-              <p class=font2 align='justify'>
-              <div class=textfarbe>
-                {$ansicht_zusammenfassung_bez}
-              </div>
-              {$ansicht_zusammenfassung_text}
-              </p>
-              {/if}
-              <!-- Kontext anzeigen, wenn einer vorhanden -->
-              {if $ansicht_kontext_exists == '1'}
-              <p class=font2 align='justify'>
-              <div class=textfarbe>
-                {$ansicht_kontext_bez}
-              </div>
-              {$ansicht_kontext_text}
-              </p>
-              {/if}
-              </p>
-            </td>
-            <td width="5%">
-              &nbsp;
-            </td>
-          </tr>
-        </table>
-        <br>
-      </div>
-    </div>
-    <!-- #page -->
-  </body>
-</html>
-
diff --git a/templates/standard/bib_popup.html_lut84_20180219 b/templates/standard/bib_popup.html_lut84_20180219
deleted file mode 100644
index b2ef23f1..00000000
--- a/templates/standard/bib_popup.html_lut84_20180219
+++ /dev/null
@@ -1,393 +0,0 @@
-{if $action == ''}
-  <html>
-  <head>
-  <meta http-equiv='content-type' content='text/html; charset=ISO-8859-1'>
-
-  <title>{$bib_popup_titel}</title>
-  <link rel='stylesheet' href='biblepopup.css' type='text/css'>
-
-  <style type='text/css'>
-  {literal}
-    div input{
-    margin:0;
-    color:#6487DC;
-    font-weight:bold;
-    border:1px solid #6487DC;
-    cursor:pointer;
-    padding:2px 8px;
-    text-decoration:none;
-    text-shadow:rgba(255,255,255,1) 0 1px 0;
-    border-radius:5px;
-    -moz-border-radius:5px;
-    -khtml-border-radius:5px;
-    -webkit-border-radius:5px;
-    border-radius:5px;
-    -moz-box-sizing:content-box;
-    -webkit-box-sizing:content-box;
-    -khtml-box-sizing:content-box;
-    box-sizing:content-box;
-    }
-
-    /* Big box with list of options */
-    #ajax_listOfOptions{
-            position:absolute;        /* Never change this one */
-            width:250px;        /* Width of box */
-            height:200px;        /* Height of box */
-            overflow:auto;        /* Scrolling features */
-            border:1px solid #6487DC;        /* Dark blue border */
-            background-color:#FFF;        /* White background color */
-            text-align:left;
-            font-family                :        verdana, arial;
-            z-index:10000;
-    }
-    #ajax_listOfOptions div{        /* General rule for both .optionDiv and .optionDivSelected */
-            margin:1px;
-            padding:1px;
-            cursor:pointer;
-            font-size:0.9em;
-    }
-    #ajax_listOfOptions .optionDiv{        /* Div for each item in list */
-
-    }
-    #ajax_listOfOptions .optionDivSelected{ /* Selected item in the list */
-            background-color:#D6DFF7;
-            color:#002276;
-            font-family                :        verdana, arial;
-            font-weight                :        bold;
-    }
-    #ajax_listOfOptions_iframe{
-            background-color:#F00;
-            position:absolute;
-            z-index:500;
-    }
-
-    form{
-            display:inline;
-    }
-  {/literal}
-  </style>
-  {literal}
-  <script type="text/javascript" src="livesearch/ajax.js"></script>
-  <script type="text/javascript" src="livesearch/ajax-dynamic-list.js">
-  /************************************************************************************************************
-  (C) www.dhtmlgoodies.com, April 2006
-
-  This is a script from www.dhtmlgoodies.com. You will find this and a lot of other scripts at our website.
-
-  Terms of use:
-  You are free to use this script as long as the copyright message is kept intact. However, you may not
-  redistribute, sell or repost it without our permission.
-
-  Thank you!
-
-  www.dhtmlgoodies.com
-  Alf Magne Kalleland
-
-  ************************************************************************************************************/
-  </script
-  {/literal}
-  </head>
-  <body style='margin: 0px; padding: 0px;' onload="document.searchform.search_bibel.value ='{$bib_popup_search_text}'">
-  <table height='100%' width='100%'>
-
-  <!-- Header -->
-  <tr>
-    <td height='5%'>
-      <table height='100%' width='100%' cellpadding='0' cellspacing='0'>
-        <tbody><tr>
-          <td class='headline' style='border-bottom: 2px solid #6487DC; padding-top: 3px;' valign='middle' align='center'>
-
-          <form action=?action=suche id="searchform" method="POST" name="searchform">
-
-          <table width='100%'>
-           <tr>
-             <td width='33%' 'padding-top: 13px;' valign='middle' align='left'>
-
-              <div>
-                <input type="text" id="search_bibel" name="search_bibel" value="{$bib_popup_search_text}" onclick="{literal}if(document.searchform.search_bibel.value =='{/literal}{$bib_popup_search_text}{literal}'){document.searchform.search_bibel.value ='';}{/literal}" onkeyup="ajax_showOptions(this,'getWord',event)" size="30">
-                <input type="hidden" id="search_bibel_hidden" name="search_bibel_ID"><!-- THE ID OF the textstelle will be inserted into this hidden input -->
-             </div>
-
-             </td>
-             <td width='33%'  'padding-top: 3px;' valign='middle' align='center'>
-               <strong>{$bib_popup_anz_buch} {$bib_popup_buch} {$bib_popup_kapitel}</strong>
-             </td>
-             <td width='33%'>
-             </td>
-           </tr>
-          </table
-
-          </form>
-
-          </td>
-        </tr>
-      </tbody>
-      </table>
-
-    </td>
-  </tr>
-
-
-  <!-- BODY -->
-  <tr>
-    <td height='90%' valign='top'>
-      <iframe src="bib_popup_body.php?anz_buch={$bib_popup_anz_buch}&buch={$bib_popup_buch}&kapitel={$bib_popup_kapitel}&vers_anf={$bib_popup_vers_anf}&vers_trenner={$bib_popup_vers_trenner}&vers_ende={$bib_popup_vers_ende}&vers_select={$bib_popup_vers_select}&stopmark={$bib_popup_stopmark}#stopmark" style="border:0px #FFFFFF none;" name="body" scrolling="auto" frameborder="0" align=aus marginheight="0px" marginwidth="0px" height="100%" width="100%"></iframe>
-    </td>
-  </tr>
-
-
-  <!-- FOOTER -->
-  <tr>
-    <td height='5%'>
-
-      <table valign='middle' style='border-top: 2px solid #6487DC;' width='99%' align='center' border='0' cellpadding='0' cellspacing='0'>
-        <tbody>
-        <tr>
-
-          {if $bib_popup_prev == '1'}
-            <td style='padding-right: 1px; vertical-align: top;' width='50%'>
-            <a target='_top' href="?wort={$bib_popup_prev_buch}&vers_select=N" class='nextprev'><font size=3>&larr;</font> {$bib_popup_prev_buch}</a>
-            </td>
-          {/if}
-
-          {if $bib_popup_next == '1'}
-            <td style='vertical-align: top;' width='50%'>
-            <a target='_top' href="?wort={$bib_popup_next_buch}&vers_select=N" class='nextprev'>{$bib_popup_next_buch} <font size=3>&rarr;</font></a>
-            </td>
-          {/if}
-
-        </tr>
-        </tbody>
-      </table>
-
-    </td>
-  </tr>
-  </body>
-  </html>
-{/if}
-
-{if $action == 'suche'}
-  {if $bib_popup_nohit == '1'}
-    <html>
-        <head>
-        <meta http-equiv='content-type' content='text/html; charset=ISO-8859-1'>
-        <link rel="stylesheet" href="../templates/{$global_template}/css/styles_pc.php" type="text/css">
-        <title>{$bib_popup_nomatch_titel}</title>
-        </head>
-        <body>
-        <table border="0" style="border-collapse: collapse" width="100%" cellpadding="0" height="100%" id="table1">
-           <tr>
-               <td>
-               <div align="center">
-                   <table cellspacing="0" cellpadding="0" width="550" border="0">
-                       <tr>
-                           <td width="10" background="../templates/{$global_template}/images/box_e1.gif">
-                           <img height="40" src="../templates/{$global_template}/images/blank.gif" width="22"></td>
-                           <td nowrap="nowrap" align="left" width="3%" background="../templates/{$global_template}/images/box_top.gif" valign="top"></td>
-                           <td width="95%" background="../templates/{$global_template}/images/box_top.gif">
-                           <img height="10" src="../templates/{$global_template}/images/blank.gif" width="1"><br>
-                           <span class="sh">{$bib_popup_nomatch_titel}</span><br>
-                           <img height="5" src="../templates/{$global_template}/images/blank.gif" width="1"></td>
-                           <td nowrap="nowrap" align="right" width="1%" background="../templates/{$global_template}/images/box_e2.gif">
-                           <img height="40" src="../templates/{$global_template}/images/blank.gif" width="22"></td>
-                       </tr>
-                       <tr>
-                           <td width="1%" background="../templates/{$global_template}/images/box_l.gif">
-                           <img height="1" src="../templates/{$global_template}/images/blank.gif" width="22"></td>
-                           <td colspan="2"><br>
-                           <p align="center"><b>{$bib_popup_nomatch_text}</b>
-                           <p align="center"><a href='?wort=1. Mose 1&vers_select=N'>
-                           <img border="0" src="../templates/{$global_template}/images/zurueck.gif"></a>
-                           </p>
-                           <p></p>
-                           <p></p>
-                           <p></p>
-                           <p></p>
-                           <p><br>
-                           </p>
-                           </td>
-                           <td width="1%" background="../templates/{$global_template}/images/box_r.gif">
-                           <img height="1" src="../templates/{$global_template}/images/blank.gif" width="22"></td>
-                       </tr>
-                       <tr>
-                           <td nowrap="nowrap" align="left" width="1%" background="../templates/{$global_template}/images/box_e3.gif">
-                           <img height="16" src="../templates/{$global_template}/images/blank.gif" width="22"></td>
-                           <td nowrap="nowrap" align="left" width="98%" background="../templates/{$global_template}/images/box_bottom.gif" colspan="2">
-                           <img height="16" src="../templates/{$global_template}/images/blank.gif" width="8"></td>
-                           <td nowrap="nowrap" align="right" width="1%" background="../templates/{$global_template}/images/box_e4.gif">
-                           <img height="16" src="../templates/{$global_template}/images/blank.gif" width="22"> </td>
-                       </tr>
-                   </table>
-               </div>
-               </td>
-           </tr>
-        </table>
-        </body>
-    </html>
-  {/if}
-{/if}
-
-{if $action == 'suche2'}
-  {if $bib_popup_nohit == '1'}
-    <html>
-        <head>
-        <meta http-equiv='content-type' content='text/html; charset=ISO-8859-1'>
-        <link rel="stylesheet" href="../templates/{$global_template}/css/styles_pc.php" type="text/css">
-        <title>{$bib_popup_nomatch_titel}</title>
-        </head>
-        <body>
-        <table border="0" style="border-collapse: collapse" width="100%" cellpadding="0" height="100%" id="table1">
-           <tr>
-               <td>
-               <div align="center">
-                   <table cellspacing="0" cellpadding="0" width="550" border="0">
-                       <tr>
-                           <td width="10" background="../templates/{$global_template}/images/box_e1.gif">
-                           <img height="40" src="../templates/{$global_template}/images/blank.gif" width="22"></td>
-                           <td nowrap="nowrap" align="left" width="3%" background="../templates/{$global_template}/images/box_top.gif" valign="top"></td>
-                           <td width="95%" background="../templates/{$global_template}/images/box_top.gif">
-                           <img height="10" src="../templates/{$global_template}/images/blank.gif" width="1"><br>
-                           <span class="sh">{$bib_popup_nomatch_titel}</span><br>
-                           <img height="5" src="../templates/{$global_template}/images/blank.gif" width="1"></td>
-                           <td nowrap="nowrap" align="right" width="1%" background="../templates/{$global_template}/images/box_e2.gif">
-                           <img height="40" src="../templates/{$global_template}/images/blank.gif" width="22"></td>
-                       </tr>
-                       <tr>
-                           <td width="1%" background="../templates/{$global_template}/images/box_l.gif">
-                           <img height="1" src="../templates/{$global_template}/images/blank.gif" width="22"></td>
-                           <td colspan="2"><br>
-                           <p align="center"><b>{$bib_popup_nomatch_text}</b>
-                           <p align="center"><a href='?wort=1. Mose 1&vers_select=N'>
-                           <img border="0" src="../templates/{$global_template}/images/zurueck.gif"></a>
-                           </p>
-                           <p></p>
-                           <p></p>
-                           <p></p>
-                           <p></p>
-                           <p><br>
-                           </p>
-                           </td>
-                           <td width="1%" background="../templates/{$global_template}/images/box_r.gif">
-                           <img height="1" src="../templates/{$global_template}/images/blank.gif" width="22"></td>
-                       </tr>
-                       <tr>
-                           <td nowrap="nowrap" align="left" width="1%" background="../templates/{$global_template}/images/box_e3.gif">
-                           <img height="16" src="../templates/{$global_template}/images/blank.gif" width="22"></td>
-                           <td nowrap="nowrap" align="left" width="98%" background="../templates/{$global_template}/images/box_bottom.gif" colspan="2">
-                           <img height="16" src="../templates/{$global_template}/images/blank.gif" width="8"></td>
-                           <td nowrap="nowrap" align="right" width="1%" background="../templates/{$global_template}/images/box_e4.gif">
-                           <img height="16" src="../templates/{$global_template}/images/blank.gif" width="22"> </td>
-                       </tr>
-                   </table>
-               </div>
-               </td>
-           </tr>
-        </table>
-        </body>
-    </html>
-  {/if}
-
-  {if $bib_popup_hit == '1'}
-    <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <link rel="stylesheet" href="../templates/{$global_template}/css/styles_pc.php" type="text/css">
-    <title>Suchergebnisse</title>
-    <style>
-    {literal}
-    <!--
-    .sl,.r{font-weight:normal;margin:0;display:inline}
-    .r{font-size:1em}
-    .g{margin-top:1em;margin-bottom:1em}
-    .a,.a:link{color:green}
-    body,td,div,.p,a{font-family:arial,sans-serif}
-    -->
-    {/literal}
-    </style>
-    </head>
-
-    <body>
-    <table align="center" border="0" style="border-collapse: collapse" width="100%" cellpadding="0" height="95%" id="table1">
-        <tr>
-            <td>
-            <div align="center">
-                <table valign="top" cellspacing="0" cellpadding="0" width="100%" border="0">
-                    <tr>
-                        <td width="10" background="../templates/{$global_template}/images/box_e1.gif">
-                        <img height="40" src="../templates/{$global_template}/images/blank.gif" width="22"></td>
-                        <td nowrap="nowrap" align="left" width="98%" background="../templates/{$global_template}/images/box_top.gif" valign="top">
-                        <img height="10" src="../templates/{$global_template}/images/blank.gif" width="1"><br>
-                        <font class="hd">{$bib_popup_match_titel}</font><br>
-                        <span class="sh">Treffer: {$bib_popup_anz_treffer}</span><br>
-                        <img height="5" src="../templates/{$global_template}/images/blank.gif" width="1"></td>
-                        <td nowrap="nowrap" align="right" width="1%" background="../templates/{$global_template}/images/box_e2.gif">
-                        <img height="40" src="../templates/{$global_template}/images/blank.gif" width="22"></td>
-                    </tr>
-                    <tr>
-                        <td width="1%" background="../templates/{$global_template}/images/box_l.gif">
-                        <img height="1" src="../templates/{$global_template}/images/blank.gif" width="22"></td>
-                        <td>
-                        <table valign="top" border="0" cellpadding="4" cellspacing="0" style="border-collapse: collapse" bordercolor="#E7E8ED" width="60%" id="AutoNumber1">
-
-                            {section name=table_data loop=$table_data}
-                             <tr>
-                              <td>
-                                <h2 class=r><a class=l href="?vers_select=Y&stopmark={$table_data[table_data].stopmark}&wort={$table_data[table_data].bibelstelle}"><b>{$table_data[table_data].bibelstelle}</b></a></h2><br>
-                                {$table_data[table_data].preview}<br>
-                                <p>
-                                <p>
-                              </td>
-                             </tr>
-                            {/section}
-
-
-
-                         </table>
-                        </td>
-                        <td width="1%" background="../templates/{$global_template}/images/box_r.gif">
-                        <img height="1" src="../templates/{$global_template}/images/blank.gif" width="22"></td>
-                    </tr>
-                    <tr>
-                        <td nowrap="nowrap" align="left" width="1%" background="../templates/{$global_template}/images/box_e3.gif">
-                        <img height="16" src="../templates/{$global_template}/images/blank.gif" width="22"></td>
-                        <td nowrap="nowrap" align="left" width="98%" background="../templates/{$global_template}/images/box_bottom.gif">
-                        <img height="16" src="../templates/{$global_template}/images/blank.gif" width="8"></td>
-                        <td nowrap="nowrap" align="right" width="1%" background="../templates/{$global_template}/images/box_e4.gif">
-                        <img height="16" src="../templates/{$global_template}/images/blank.gif" width="22"> </td>
-                    </tr>
-                </table>
-            </div>
-            </td>
-        </tr>
-    </table>
-
-    <div align=center>
-
-      {if $bib_popup_start0 == '1'}
-        <a href=?action=suche2&start=0><img border="0" src="../templates/{$global_template}/images/left_first.gif"></a>
-	    <a href=?action=suche2&start={$bib_popup_start_newstart}><img border="0" src="../templates/{$global_template}/images/left.gif"></a>
-      {/if}
-
-      {if $bib_popup_start0 == '2'}
-        <img border="0" src="../templates/{$global_template}/images/left_first_grey.gif">
-        <img border="0" src="../templates/{$global_template}/images/left_grey.gif">
-      {/if}
-
-      {$bib_popup_currpage} / {$bib_popup_pagecount}
-
-      {if $bib_popup_end0 == '1'}
-        <a href=?action=suche2&start={$bib_popup_end_newstart}><img border="0" src="../templates/{$global_template}/images/right.gif"></a>
-		<a href=?action=suche2&start={$bib_popup_end_last}><img border="0" src="../templates/{$global_template}/images/right_last.gif"></a>
-      {/if}
-
-      {if $bib_popup_end0 == '2'}
-        <img border="0" src="../templates/{$global_template}/images/right_grey.gif">
-        <img border="0" src="../templates/{$global_template}/images/right_last_grey.gif">
-      {/if}
-
-
-    </div>
-
-    </body>
-    </html>
-  {/if}
-{/if}
\ No newline at end of file
diff --git a/templates/standard/bib_popup_body.html_lut84_20180219 b/templates/standard/bib_popup_body.html_lut84_20180219
deleted file mode 100644
index 78d3e974..00000000
--- a/templates/standard/bib_popup_body.html_lut84_20180219
+++ /dev/null
@@ -1,22 +0,0 @@
-<html><head>
-<meta http-equiv='content-type' content='text/html; charset=ISO-8859-1'>
-<script type='text/javascript' src='../overlib/overlib.js'></script>
-<style type='text/css'>
-{literal}
-.indent {
-	width: 100%;
-	margin: 0px;
-	padding: 0px;
-	font-size: 1em;
-	line-height: 1.3em;
-	text-indent: 1.6em;
-	padding-left: 0px;
-}
-{/literal}
-</style>
-    <title>{$bib_popup_titel}</title>
-    <link rel='stylesheet' href='biblepopup.css' type='text/css'>
-  </head><body style='margin: 10px; padding: 0px;'>
-    <div align='justify'>{$bib_popup_body_wort}</div>
-  </body>
-  </html>
\ No newline at end of file
diff --git a/templates/standard/ftp_ansicht.html_20161215 b/templates/standard/ftp_ansicht.html_20161215
deleted file mode 100644
index 942c874e..00000000
--- a/templates/standard/ftp_ansicht.html_20161215
+++ /dev/null
@@ -1,111 +0,0 @@
-{if $action == ''}
-  {if $ftp_ansicht_connect == '1'}
-    <html>
-	<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-	<link rel="stylesheet" href="templates/{$global_template}/css/styles_pc.php" type="text/css">
-	<title>{$ftp_ansicht_titel}</title>
-	</head>
-	<body onload="if(document.pers_daten)document.pers_daten.uid.focus();return false;">
-	<table border="0" style="border-collapse: collapse" width="100%" cellpadding="0" height="100%" id="table1">
-	    <tr>
-	        <td>
-	        <div align="center">
-	            <table cellspacing="0" cellpadding="0" width="90%" border="0">
-	                <tr>
-	                    <td width="10" background="templates/{$global_template}/images/box_e1.gif">
-	                    <img height="40" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-	                    <td nowrap="nowrap" align="left" width="98%" background="templates/{$global_template}/images/box_top.gif" valign="top">
-	                    <img height="10" src="templates/{$global_template}/images/blank.gif" width="1"><br>
-	                    <font class="hd">{$ftp_ansicht_titel}</font><br>
-	                    <img height="5" src="templates/{$global_template}/images/blank.gif" width="1"></font></td>
-	                    <td nowrap="nowrap" align="right" width="1%" background="templates/{$global_template}/images/box_e2.gif">
-	                    <img height="40" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-	                </tr>
-	                <tr>
-	                    <td width="1%" background="templates/{$global_template}/images/box_l.gif">
-	                    <img height="1" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-	                    <td>
-
-	                        <table border="0" width="100%">
-	                        <tr>
-	                        <td><b>Name (Download)</b></td>
-	                        <td align=right><b>Gr��e</b></td>
-	                        <td align=right><b>Letzte �nderung</b></td>
-	                        <td align=center><b>L�schen</b></td>
-	                        <td align=center><b>Duplikat</b></td>
-	                        </tr>
-	                          {section name=table_data loop=$table_data}
-							    <tr>
-							      <td>
-							        <a href=?action=download&datei={$table_data[table_data].dateiname}>{$table_data[table_data].dateiname}</a>
-								  </td>
-								  <td align="right">
-								    {$table_data[table_data].Dateigroesse} {$table_data[table_data].einheit}
-								  </td>
-								  <td align="right">
-								    {$table_data[table_data].dateitag}
-								  </td>
-								  <td align="center">
-								    {$table_data[table_data].unlink_button}
-								  </td>
-                                  <td align='center'>
-                                    {$table_data[table_data].status_button}
-                                  </td>
-                                </tr>
-
-							  {/section}
-
-	                          <tr>
-	                            <td>
-	                               {$ftp_ansicht_anz_dateien} Dateien
-	                            </td>
-	                            <td align="right">
-	                               {$ftp_ansicht_dateigroesse} {$ftp_ansicht_einheit}
-	                            </td>
-	                            <td>&nbsp;</td>
-	                          </tr>
-	                        </table>
-	                        <p align='center'><a href=backup/backup_db.php><b>Backup erstellen</b></a></p>
-	                       </td>
-	                        <td width="1%" background="templates/{$global_template}/images/box_r.gif">
-	                        <img height="1" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-	                    </tr>
-	                    <tr>
-	                    <td nowrap="nowrap" align="left" width="1%" background="templates/{$global_template}/images/box_e3.gif">
-	                    <img height="16" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-	                    <td nowrap="nowrap" align="left" width="98%" background="templates/{$global_template}/images/box_bottom.gif">
-	                    <img height="16" src="templates/{$global_template}/images/blank.gif" width="8"></td>
-	                    <td nowrap="nowrap" align="right" width="1%" background="templates/{$global_template}/images/box_e4.gif">
-	                    <img height="16" src="templates/{$global_template}/images/blank.gif" width="22"> </td>
-	                </tr>
-	            </table>
-	        </div>
-	        </td>
-	    </tr>
-	</table>
-	</body>
-	</html>
-  {/if}
-
-  {if $ftp_ansicht_connect == '2'}
-    {$ftp_ansicht_connect_error}
-  {/if}
-
-{/if}
-
-
-{if $action == 'download'}
-  {if $ftp_ansicht_connect == '2'}
-    {$ftp_ansicht_connect_error}
-  {/if}
-
-{/if}
-
-
-{if $action == 'unlink'}
-  {if $ftp_ansicht_connect == '2'}
-    {$ftp_ansicht_connect_error}
-  {/if}
-
-{/if}
\ No newline at end of file
diff --git a/templates/standard/suche.html_20150712 b/templates/standard/suche.html_20150712
deleted file mode 100644
index 0c4e92e7..00000000
--- a/templates/standard/suche.html_20150712
+++ /dev/null
@@ -1,462 +0,0 @@
-{if $action == ''}
-  <html>
-  <head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-  <link rel="stylesheet" href="templates/{$global_template}/css/styles_pc.php" type="text/css">
-  {literal}
-  <script type="text/javascript">
-    function neu(string) {
-
-      document.forms['searchform'].elements['q'].value =string;
-      if(document.searchform)document.searchform.textwort.focus();
-    }
-  </script>
-
-  <script type='text/javascript' src='ajax.js'></script>
-
-  <script type='text/javascript'>
-  /************************************************************************************************************
-  Ajax chained select
-  Copyright (C) 2006  DTHMLGoodies.com, Alf Magne Kalleland
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-  Dhtmlgoodies.com., hereby disclaims all copyright interest in this script
-  written by Alf Magne Kalleland.
-
-  Alf Magne Kalleland, 2006
-  Owner of DHTMLgoodies.com
-
-
-  ************************************************************************************************************/
-  var ajax = new sack();
-
-  function getCityList(sel)
-  {
-
-  	var countryCode = document.getElementById('dhtmlgoodies_country').options[document.getElementById('dhtmlgoodies_country').options.selectedIndex].value
-  	// var countryCode = sel.options[sel.selectedIndex].value; // --> Parameter 'this' von Selectbox wird Funktion �bergeben. Wurde ersetzt durch ausf�hrliche Schreibweise oben, da diese Funktion beim body=onlad auch gestartet wird, falls man im Browser auf zur�ck klickt, dass dann die Unterkategorie auch angezeigt wird.
-  	document.getElementById('dhtmlgoodies_city').options.length = 0;	// Empty city select box
-  	if(countryCode.length>0){
-  		ajax.requestFile = 'getSubCat.php?countryCode='+countryCode;	// Specifying which file to get
-  		ajax.onCompletion = createCities;	// Specify function that will be executed after file has been found
-  		ajax.runAJAX();		// Execute AJAX function
-  	}
-  }
-
-  function createCities()
-  {
-  	var obj = document.getElementById('dhtmlgoodies_city');
-  	eval(ajax.response);	// Executing the response from Ajax as Javascript code
-  }
-
-
-  </script>
-
-
-
-  <script language='JavaScript' type='text/javascript'>
-  <!--
-     function start() {
-       getCityList();
-     }
-  //-->
-  </script>
-{/literal}
-
-
-
-  	<style type="text/css">
-    {literal}
-  select{
-  	width:250px;
-  }
-
-
-
-  	/* Big box with list of options */
-  	#ajax_listOfOptions{
-  		position:absolute;	/* Never change this one */
-  		width:250px;	/* Width of box */
-  		height:200px;	/* Height of box */
-  		overflow:auto;	/* Scrolling features */
-  		border:1px solid #6487DC;	/* Dark blue border */
-  		background-color:#FFF;	/* White background color */
-  		text-align:left;
-  		font-family		:	verdana, arial;
-  		z-index:10000;
-  	}
-  	#ajax_listOfOptions div{	/* General rule for both .optionDiv and .optionDivSelected */
-  		margin:1px;
-  		padding:1px;
-  		cursor:pointer;
-  		font-size:0.9em;
-  	}
-  	#ajax_listOfOptions .optionDiv{	/* Div for each item in list */
-
-  	}
-  	#ajax_listOfOptions .optionDivSelected{ /* Selected item in the list */
-  		background-color:#D6DFF7;
-  		color:#002276;
-  		font-family		:	verdana, arial;
-  		font-weight		:	bold;
-  	}
-  	#ajax_listOfOptions_iframe{
-  		background-color:#F00;
-  		position:absolute;
-  		z-index:500;
-  	}
-
-  	form{
-  		display:inline;
-  	}
-    {/literal}
-  	</style>
-
-  	{literal}
-  	<script type="text/javascript" src="livesearch/ajax.js"></script>
-  	<script type="text/javascript" src="livesearch/ajax-dynamic-list.js">
-  	/************************************************************************************************************
-  	(C) www.dhtmlgoodies.com, April 2006
-
-  	This is a script from www.dhtmlgoodies.com. You will find this and a lot of other scripts at our website.
-
-  	Terms of use:
-  	You are free to use this script as long as the copyright message is kept intact. However, you may not
-  	redistribute, sell or repost it without our permission.
-
-  	Thank you!
-
-  	www.dhtmlgoodies.com
-  	Alf Magne Kalleland
-
-  	************************************************************************************************************/
-  	</script>
-  	{/literal}
-
-
-  <title>{$suche_titel}</title>
-  </head>
-
-  <body onload="start();">
-
-  <table border="0" style="border-collapse: collapse" width="100%" cellpadding="0" height="100%" id="table1">
-      <tr>
-          <td>
-          <div align="center">
-              <table cellspacing="0" cellpadding="0" width="75%" border="0">
-                  <tr>
-                      <td width="10" background="templates/{$global_template}/images/box_e1.gif">
-                      <img height="40" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-                      <td nowrap="nowrap" align="left" width="98%" background="templates/{$global_template}/images/box_top.gif" valign="top">
-                      <img height="10" src="templates/{$global_template}/images/blank.gif" width="1"><br>
-                      <font class="hd">{$suche_titel}</font><br>
-                      <img height="5" src="templates/{$global_template}/images/blank.gif" width="1"></font></td>
-                      <td nowrap="nowrap" align="right" width="1%" background="templates/{$global_template}/images/box_e2.gif">
-                      <img height="40" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-                  </tr>
-                  <tr>
-                      <td width="1%" background="templates/{$global_template}/images/box_l.gif">
-                      <img height="1" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-                      <td>
-                      <form action=?action=suche method="POST" name="searchform">
-                      <br>
-                      <br>
-                      <table border="0" cellpadding="4" cellspacing="0" style="border-collapse: collapse" bordercolor="#E7E8ED" width="100%" id="AutoNumber1">
-
-                      <tr>
-                        <td width="30%" align="left" height="18">
-                          <b>{$suche_field_thema}</b>
-                        </td>
-                        <td width="70%" align="left" height="18">
-                      <!--[if lt IE 7]><div id="kategorie"><![endif]-->
-                       <select id='thema' name='thema'>
-                         <option value=''>Select</option>
-                         {section name=table_data loop=$table_data}
-                           <option value="{$table_data[table_data].tid}">{$table_data[table_data].bezeichnung}&nbsp;&nbsp;&nbsp;</option>
-                         {/section}
-                       </select>
-
-					     </td>
-					   </tr>
-
-					   <tr>
-					     <td width="30%" align="left" height="18">
-					       <b>{$suche_field_headline}</b>
-					     </td>
-					     <td width="70%" align="left" height="18">
-					       <input type="text" name="ueberschrift" size="30">
-					     </td>
-					   </tr>
-					   <tr>
-					     <td width="30%" align="left" height="18">
-					       <b>{$suche_field_stelle}</b>
-					     </td>
-					     <td width="70%" align="left" height="18">
-
-					   			<input type="text" id="textstelle" name="textstelle" value="" onkeyup="ajax_showOptions(this,'getWord',event)" size="30">
-					   			<input type="hidden" id="textstelle_hidden" name="textstelle_ID"><!-- THE ID OF the textstelle will be inserted into this hidden input -->
-
-
-					     </td>
-					   </tr>
-					   <tr>
-					     <td width="30%" align="left" height="18">
-					       <b>{$suche_field_wort}</b>
-					     </td>
-					     <td width="70%" align="left" height="18">
-					       <input type="text" name="textwort" size="30">
-					     </td>
-					   </tr>
-					   <tr>
-					     <td width="30%" align="left" height="18">
-					       <b>{$suche_field_inhalt}</b>
-					     </td>
-					     <td width="70%" align="left" height="18">
-					       <input type="text" name="inhalt" size="30">
-					     </td>
-					   </tr>
-					   <tr>
-					     <td width="30%" align="left" height="18">
-					       <b>{$suche_field_datum}</b>
-					     </td>
-					     <td width="70%" align="left" height="18">
-					       <input type="text" name="tag" ID="text" size="1" value='TT' onFocus="{literal}if(this.value=='TT'){ this.value='';}{/literal}">.<input type="text" name="monat" value='MM' ID="text1" size="1" onFocus="{literal}if(this.value=='MM'){ this.value='';}{/literal}">.<input type="text" name="jahr" ID="text2" value='JJJJ' size="3" onFocus="{literal}if(this.value=='JJJJ'){ this.value='';}{/literal}">
-					     </td>
-					   </tr>
-					   <tr>
-					     <td width="30%" align="left" height="18">
-					       <b>{$suche_field_stapgd}</b>
-					     </td>
-					     <td width="70%" align="left" height="18">
-					       <input type='Checkbox' name='stapgd' value='Y'>
-					     </td>
-					   </tr>
-
-					   <tr>
-					     <td width="30%" align="left" height="18">
-					       <b>{$suche_field_cat}</b>
-					     </td>
-					     <td width="70%" align="left" height="18">
-					     <!--[if lt IE 7]><div id="kategorie"><![endif]-->
-
-					     <select id='dhtmlgoodies_country' name='dhtmlgoodies_country' onchange='{literal}getCityList(this){/literal}'>
-					   		<option value=''>Select</option>
-                            {section name=table_data1 loop=$table_data1}
-                              <option value="{$table_data1[table_data1].kid}">{$table_data1[table_data1].bezeichnung}&nbsp;&nbsp;&nbsp;</option>
-                            {/section}
-                         </select>
-
-					     </td>
-					   </tr>
-					   <tr>
-					     <td width="30%" align="left" height="18">
-					       <b>{$suche_field_subcat}</b>
-					     </td>
-					     <td width="70%" align="left" height="18">
-					     <!--[if lt IE 7]><div id="unterkategorie"><![endif]-->
-					         <select id='dhtmlgoodies_city' name='dhtmlgoodies_city'>
-
-					   		 </select>
-					     </td>
-					   </tr>
-					   </div>
-					   <tr>
-					     <td width="30%" align="left" height="18">
-					       <b>{$suche_field_art}</b>
-					     </td>
-					     <td width="70%" align="left" height="18">
-					        <label for="r3"><input type="radio" name="art" checked value="exact" id="r3"> {$suche_field_art_opt_ext}</label><br>
-					        <label for="r4"><input type="radio" name="art"  value="any" id="r4"> {$suche_field_art_opt_sim}</label>
-					     </td>
-					   </tr>
-					   </table>
-					   </div>
-					   <br>
-					   <br>
-					     <input type="submit" value="Abschicken">
-					     </form>
-					   </td>
-					   <td width="1%" background="templates/{$global_template}/images/box_r.gif">
-					   <img height="1" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-					   </tr>
-					   <tr>
-					       <td nowrap="nowrap" align="left" width="1%" background="templates/{$global_template}/images/box_e3.gif">
-					       <img height="16" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-					       <td nowrap="nowrap" align="left" width="98%" background="templates/{$global_template}/images/box_bottom.gif">
-					       <img height="16" src="templates/{$global_template}/images/blank.gif" width="8"></td>
-					       <td nowrap="nowrap" align="right" width="1%" background="templates/{$global_template}/images/box_e4.gif">
-					       <img height="16" src="templates/{$global_template}/images/blank.gif" width="22"> </td>
-					   </tr>
-					   </table>
-
-		 </td>
-     </tr>
-  </table>
-  </body>
-  </html>
-
-{/if}
-
-{if $action == 'suche'}
-  {if $suche_nomatch == '1'}
-    <html>
-	<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-	<link rel="stylesheet" href="templates/{$global_template}/css/styles_pc.php" type="text/css">
-	<title>{$suche_nomatch_titel}</title>
-	</head>
-	<body>
-	<table border="0" style="border-collapse: collapse" width="100%" cellpadding="0" height="100%" id="table1">
-	    <tr>
-	        <td>
-	        <div align="center">
-	            <table cellspacing="0" cellpadding="0" width="550" border="0">
-	                <tr>
-	                    <td width="10" background="templates/{$global_template}/images/box_e1.gif">
-	                    <img height="40" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-	                    <td nowrap="nowrap" align="left" width="3%" background="templates/{$global_template}/images/box_top.gif" valign="top"></td>
-	                    <td width="95%" background="templates/{$global_template}/images/box_top.gif">
-	                    <img height="10" src="templates/{$global_template}/images/blank.gif" width="1"><br>
-	                    <span class="sh">{$suche_nomatch_titel}</span><br>
-	                    <img height="5" src="templates/{$global_template}/images/blank.gif" width="1"></td>
-	                    <td nowrap="nowrap" align="right" width="1%" background="templates/{$global_template}/images/box_e2.gif">
-	                    <img height="40" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-	                </tr>
-	                <tr>
-	                    <td width="1%" background="templates/{$global_template}/images/box_l.gif">
-	                    <img height="1" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-	                    <td colspan="2"><br>
-	                    <p align="center"><b>{$suche_nomatch_text}</b>
-
-
-	                    <p align="center"><a href="javascript:history.back()">
-	                    <img border="0" src="templates/{$global_template}/images/zurueck.gif"></a>
-
-	                    </p>
-	                    <p></p>
-	                    <p></p>
-	                    <p></p>
-	                    <p></p>
-	                    <p><br>
-	                    </p>
-	                    </td>
-	                    <td width="1%" background="templates/{$global_template}/images/box_r.gif">
-	                    <img height="1" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-	                </tr>
-	                <tr>
-	                    <td nowrap="nowrap" align="left" width="1%" background="templates/{$global_template}/images/box_e3.gif">
-	                    <img height="16" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-	                    <td nowrap="nowrap" align="left" width="98%" background="templates/{$global_template}/images/box_bottom.gif" colspan="2">
-	                    <img height="16" src="templates/{$global_template}/images/blank.gif" width="8"></td>
-	                    <td nowrap="nowrap" align="right" width="1%" background="templates/{$global_template}/images/box_e4.gif">
-	                    <img height="16" src="templates/{$global_template}/images/blank.gif" width="22"> </td>
-	                </tr>
-	            </table>
-	        </div>
-	        </td>
-	    </tr>
-	</table>
-	</body>
-	</html>
-  {/if}
-
-  {if $suche_match == '1'}
-    <head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-	<link rel="stylesheet" href="templates/{$global_template}/css/styles_pc.php" type="text/css">
-	<title>{$suche_match_titel}</title>
-	<style>
-	{literal}
-	<!--
-	.sl,.r{font-weight:normal;margin:0;display:inline}
-	.r{font-size:1em}
-	.g{margin-top:1em;margin-bottom:1em}
-	.a,.a:link{color:green}
-	body,td,div,.p,a{font-family:arial,sans-serif}
-	-->
-	{/literal}
-	</style>
-	</head>
-
-	<body>
-	<table align="center" border="0" style="border-collapse: collapse" width="100%" cellpadding="0" height="95%" id="table1">
-	    <tr>
-	        <td>
-	        <div align="center">
-	            <table valign="top" cellspacing="0" cellpadding="0" width="100%" border="0">
-	                <tr>
-	                    <td width="10" background="templates/{$global_template}/images/box_e1.gif">
-	                    <img height="40" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-	                    <td nowrap="nowrap" align="left" width="98%" background="templates/{$global_template}/images/box_top.gif" valign="top">
-	                    <img height="10" src="templates/{$global_template}/images/blank.gif" width="1"><br>
-	                    <font class="hd">{$suche_match_titel}</font><br>
-	                    <span class="sh">Treffer: {$anzahltreffer}</span><br>
-	                    <img height="5" src="templates/{$global_template}/images/blank.gif" width="1"></td>
-	                    <td nowrap="nowrap" align="right" width="1%" background="templates/{$global_template}/images/box_e2.gif">
-	                    <img height="40" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-	                </tr>
-	                <tr>
-	                    <td width="1%" background="templates/{$global_template}/images/box_l.gif">
-	                    <img height="1" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-	                    <td>
-                    <table valign="top" border="0" cellpadding="4" cellspacing="0" style="border-collapse: collapse" bordercolor="#E7E8ED" width="60%" id="AutoNumber1">
-
-	                    {section name=table_data3 loop=$table_data3}
-	                      <tr>
-	                        <td>
-	                          <h2 class=r><a class=l href=ausgabe.php?lid={$table_data3[table_data3].lid}&suchart={$table_data3[table_data3].suchart}&inhalt_hig={$table_data3[table_data3].inhalt_hig}><b>{$table_data3[table_data3].ueberschrift}</b></a></h2>
-	                          <br>
-	                          {$table_data3[table_data3].preview}
-	                          <br>
-	                          <span class=a>Kategorie: {$table_data3[table_data3].kategorie}
-	                            {if $table_data3[table_data3].unterkategorie != ''}
-	                              / {$table_data3[table_data3].unterkategorie}
-	                            {/if}
-	                            <br>
-	                            Datum: {$table_data3[table_data3].wochentag}, {$table_data3[table_data3].tag}.{$table_data3[table_data3].monat}.{$table_data3[table_data3].jahr}
-	                          </span>
-	                          <p>
-	                          <p>
-	                        </td>
-	                      </tr>
-	                    {/section}
-                     </table>
-                    </td>
-                    <td width="1%" background="templates/{$global_template}/images/box_r.gif">
-                        <img height="1" src="templates/{$global_template}/images/blank.gif" width="22">
-                    </td>
-                  </tr>
-                  <tr>
-                     <td nowrap="nowrap" align="left" width="1%" background="templates/{$global_template}/images/box_e3.gif">
-                        <img height="16" src="templates/{$global_template}/images/blank.gif" width="22">
-                      </td>
-                      <td nowrap="nowrap" align="left" width="98%" background="templates/{$global_template}/images/box_bottom.gif">
-                        <img height="16" src="templates/{$global_template}/images/blank.gif" width="8">
-                      </td>
-                      <td nowrap="nowrap" align="right" width="1%" background="templates/{$global_template}/images/box_e4.gif">
-                        <img height="16" src="templates/{$global_template}/images/blank.gif" width="22">
-                      </td>
-                  </tr>
-                </table>
-            </div>
-            </td>
-        </tr>
-    </table>
-    </body>
-    </html>
-
-  {/if}
-{/if}
\ No newline at end of file
diff --git a/templates/standard/suche.html_20170928 b/templates/standard/suche.html_20170928
deleted file mode 100644
index 9daa428d..00000000
--- a/templates/standard/suche.html_20170928
+++ /dev/null
@@ -1,466 +0,0 @@
-{if $action == ''}
-  <html>
-  <head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-  <link rel="stylesheet" href="templates/{$global_template}/css/styles_pc.php" type="text/css">
-  {literal}
-  <script type="text/javascript">
-    function neu(string) {
-
-      document.forms['searchform'].elements['q'].value =string;
-      if(document.searchform)document.searchform.textwort.focus();
-    }
-  </script>
-
-  <script type='text/javascript' src='ajax.js'></script>
-
-  <script type='text/javascript'>
-  /************************************************************************************************************
-  Ajax chained select
-  Copyright (C) 2006  DTHMLGoodies.com, Alf Magne Kalleland
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-  Dhtmlgoodies.com., hereby disclaims all copyright interest in this script
-  written by Alf Magne Kalleland.
-
-  Alf Magne Kalleland, 2006
-  Owner of DHTMLgoodies.com
-
-
-  ************************************************************************************************************/
-  var ajax = new sack();
-
-  function getCityList(sel)
-  {
-
-  	var countryCode = document.getElementById('dhtmlgoodies_country').options[document.getElementById('dhtmlgoodies_country').options.selectedIndex].value
-  	// var countryCode = sel.options[sel.selectedIndex].value; // --> Parameter 'this' von Selectbox wird Funktion übergeben. Wurde ersetzt durch ausführliche Schreibweise oben, da diese Funktion beim body=onlad auch gestartet wird, falls man im Browser auf zurück klickt, dass dann die Unterkategorie auch angezeigt wird.
-  	document.getElementById('dhtmlgoodies_city').options.length = 0;	// Empty city select box
-  	if(countryCode.length>0){
-  		ajax.requestFile = 'getSubCat.php?countryCode='+countryCode;	// Specifying which file to get
-  		ajax.onCompletion = createCities;	// Specify function that will be executed after file has been found
-  		ajax.runAJAX();		// Execute AJAX function
-  	}
-  }
-
-  function createCities()
-  {
-  	var obj = document.getElementById('dhtmlgoodies_city');
-  	eval(ajax.response);	// Executing the response from Ajax as Javascript code
-  }
-
-
-  </script>
-
-
-
-  <script language='JavaScript' type='text/javascript'>
-  <!--
-     function start() {
-       getCityList();
-     }
-  //-->
-  </script>
-{/literal}
-
-
-
-  	<style type="text/css">
-    {literal}
-  select{
-  	width:250px;
-  }
-
-
-
-  	/* Big box with list of options */
-  	#ajax_listOfOptions{
-  		position:absolute;	/* Never change this one */
-  		width:250px;	/* Width of box */
-  		height:200px;	/* Height of box */
-  		overflow:auto;	/* Scrolling features */
-  		border:1px solid #6487DC;	/* Dark blue border */
-  		background-color:#FFF;	/* White background color */
-  		text-align:left;
-  		font-family		:	verdana, arial;
-  		z-index:10000;
-  	}
-  	#ajax_listOfOptions div{	/* General rule for both .optionDiv and .optionDivSelected */
-  		margin:1px;
-  		padding:1px;
-  		cursor:pointer;
-  		font-size:0.9em;
-  	}
-  	#ajax_listOfOptions .optionDiv{	/* Div for each item in list */
-
-  	}
-  	#ajax_listOfOptions .optionDivSelected{ /* Selected item in the list */
-  		background-color:#D6DFF7;
-  		color:#002276;
-  		font-family		:	verdana, arial;
-  		font-weight		:	bold;
-  	}
-  	#ajax_listOfOptions_iframe{
-  		background-color:#F00;
-  		position:absolute;
-  		z-index:500;
-  	}
-
-  	form{
-  		display:inline;
-  	}
-    {/literal}
-  	</style>
-
-  	{literal}
-  	<script type="text/javascript" src="livesearch/ajax.js"></script>
-  	<script type="text/javascript" src="livesearch/ajax-dynamic-list.js">
-  	/************************************************************************************************************
-  	(C) www.dhtmlgoodies.com, April 2006
-
-  	This is a script from www.dhtmlgoodies.com. You will find this and a lot of other scripts at our website.
-
-  	Terms of use:
-  	You are free to use this script as long as the copyright message is kept intact. However, you may not
-  	redistribute, sell or repost it without our permission.
-
-  	Thank you!
-
-  	www.dhtmlgoodies.com
-  	Alf Magne Kalleland
-
-  	************************************************************************************************************/
-  	</script>
-  	{/literal}
-
-
-  <title>{$suche_titel}</title>
-  </head>
-
-  <body onload="start();">
-
-  <table border="0" style="border-collapse: collapse" width="100%" cellpadding="0" height="100%" id="table1">
-      <tr>
-          <td>
-          <div align="center">
-              <table cellspacing="0" cellpadding="0" width="75%" border="0">
-                  <tr>
-                      <td width="10" background="templates/{$global_template}/images/box_e1.gif">
-                      <img height="40" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-                      <td nowrap="nowrap" align="left" width="98%" background="templates/{$global_template}/images/box_top.gif" valign="top">
-                      <img height="10" src="templates/{$global_template}/images/blank.gif" width="1"><br>
-                      <font class="hd">{$suche_titel}</font><br>
-                      <img height="5" src="templates/{$global_template}/images/blank.gif" width="1"></font></td>
-                      <td nowrap="nowrap" align="right" width="1%" background="templates/{$global_template}/images/box_e2.gif">
-                      <img height="40" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-                  </tr>
-                  <tr>
-                      <td width="1%" background="templates/{$global_template}/images/box_l.gif">
-                      <img height="1" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-                      <td>
-                      <form action=?action=suche method="POST" name="searchform">
-                      <br>
-                      <br>
-                      <table border="0" cellpadding="4" cellspacing="0" style="border-collapse: collapse" bordercolor="#E7E8ED" width="100%" id="AutoNumber1">
-
-                      <tr>
-                        <td width="30%" align="left" height="18">
-                          <b>{$suche_field_thema}</b>
-                        </td>
-                        <td width="70%" align="left" height="18">
-                      <!--[if lt IE 7]><div id="kategorie"><![endif]-->
-                       <select id='thema' name='thema'>
-                         <option value=''>Select</option>
-                         {section name=table_data loop=$table_data}
-                           <option value="{$table_data[table_data].tid}">{$table_data[table_data].bezeichnung}&nbsp;&nbsp;&nbsp;</option>
-                         {/section}
-                       </select>
-
-					     </td>
-					   </tr>
-
-					   <tr>
-					     <td width="30%" align="left" height="18">
-					       <b>{$suche_field_headline}</b>
-					     </td>
-					     <td width="70%" align="left" height="18">
-					       <input type="text" name="ueberschrift" size="30">
-					     </td>
-					   </tr>
-					   <tr>
-					     <td width="30%" align="left" height="18">
-					       <b>{$suche_field_stelle}</b>
-					     </td>
-					     <td width="70%" align="left" height="18">
-
-					   			<input type="text" id="textstelle" name="textstelle" value="" onkeyup="ajax_showOptions(this,'getWord',event)" size="30">
-					   			<input type="hidden" id="textstelle_hidden" name="textstelle_ID"><!-- THE ID OF the textstelle will be inserted into this hidden input -->
-
-
-					     </td>
-					   </tr>
-					   <tr>
-					     <td width="30%" align="left" height="18">
-					       <b>{$suche_field_wort}</b>
-					     </td>
-					     <td width="70%" align="left" height="18">
-					       <input type="text" name="textwort" size="30">
-					     </td>
-					   </tr>
-					   <tr>
-					     <td width="30%" align="left" height="18">
-					       <b>{$suche_field_inhalt}</b>
-					     </td>
-					     <td width="70%" align="left" height="18">
-					       <input type="text" name="inhalt" size="30">
-					     </td>
-					   </tr>
-					   <tr>
-					     <td width="30%" align="left" height="18">
-					       <b>{$suche_field_datum}</b>
-					     </td>
-					     <td width="70%" align="left" height="18">
-					       <input type="text" name="tag" ID="text" size="1" value='TT' onFocus="{literal}if(this.value=='TT'){ this.value='';}{/literal}">.<input type="text" name="monat" value='MM' ID="text1" size="1" onFocus="{literal}if(this.value=='MM'){ this.value='';}{/literal}">.<input type="text" name="jahr" ID="text2" value='JJJJ' size="3" onFocus="{literal}if(this.value=='JJJJ'){ this.value='';}{/literal}">
-					     </td>
-					   </tr>
-					   <tr>
-					     <td width="30%" align="left" height="18">
-					       <b>{$suche_field_stapgd}</b>
-					     </td>
-					     <td width="70%" align="left" height="18">
-					       <input type='Checkbox' name='stapgd' value='Y'>
-					     </td>
-					   </tr>
-
-					   <tr>
-					     <td width="30%" align="left" height="18">
-					       <b>{$suche_field_cat}</b>
-					     </td>
-					     <td width="70%" align="left" height="18">
-					     <!--[if lt IE 7]><div id="kategorie"><![endif]-->
-
-					     <select id='dhtmlgoodies_country' name='dhtmlgoodies_country' onchange='{literal}getCityList(this){/literal}'>
-					   		<option value=''>Select</option>
-                            {section name=table_data1 loop=$table_data1}
-                              <option value="{$table_data1[table_data1].kid}">{$table_data1[table_data1].bezeichnung}&nbsp;&nbsp;&nbsp;</option>
-                            {/section}
-                         </select>
-
-					     </td>
-					   </tr>
-					   <tr>
-					     <td width="30%" align="left" height="18">
-					       <b>{$suche_field_subcat}</b>
-					     </td>
-					     <td width="70%" align="left" height="18">
-					     <!--[if lt IE 7]><div id="unterkategorie"><![endif]-->
-					         <select id='dhtmlgoodies_city' name='dhtmlgoodies_city'>
-
-					   		 </select>
-					     </td>
-					   </tr>
-					   </div>
-					   <tr>
-					     <td width="30%" align="left" height="18">
-					       <b>{$suche_field_art}</b>
-					     </td>
-					     <td width="70%" align="left" height="18">
-					        <label for="r3"><input type="radio" name="art" checked value="exact" id="r3"> {$suche_field_art_opt_ext}</label><br>
-					        <label for="r4"><input type="radio" name="art"  value="any" id="r4"> {$suche_field_art_opt_sim}</label>
-					     </td>
-					   </tr>
-					   </table>
-					   </div>
-					   <br>
-					   <br>
-					     <input type="submit" value="Abschicken">
-					     </form>
-					   </td>
-					   <td width="1%" background="templates/{$global_template}/images/box_r.gif">
-					   <img height="1" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-					   </tr>
-					   <tr>
-					       <td nowrap="nowrap" align="left" width="1%" background="templates/{$global_template}/images/box_e3.gif">
-					       <img height="16" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-					       <td nowrap="nowrap" align="left" width="98%" background="templates/{$global_template}/images/box_bottom.gif">
-					       <img height="16" src="templates/{$global_template}/images/blank.gif" width="8"></td>
-					       <td nowrap="nowrap" align="right" width="1%" background="templates/{$global_template}/images/box_e4.gif">
-					       <img height="16" src="templates/{$global_template}/images/blank.gif" width="22"> </td>
-					   </tr>
-					   </table>
-
-		 </td>
-     </tr>
-  </table>
-  </body>
-  </html>
-
-{/if}
-
-{if $action == 'suche'}
-  {if $suche_nomatch == '1'}
-    <html>
-	<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-	<link rel="stylesheet" href="templates/{$global_template}/css/styles_pc.php" type="text/css">
-	<title>{$suche_nomatch_titel}</title>
-	</head>
-	<body>
-	<table border="0" style="border-collapse: collapse" width="100%" cellpadding="0" height="100%" id="table1">
-	    <tr>
-	        <td>
-	        <div align="center">
-	            <table cellspacing="0" cellpadding="0" width="550" border="0">
-	                <tr>
-	                    <td width="10" background="templates/{$global_template}/images/box_e1.gif">
-	                    <img height="40" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-	                    <td nowrap="nowrap" align="left" width="3%" background="templates/{$global_template}/images/box_top.gif" valign="top"></td>
-	                    <td width="95%" background="templates/{$global_template}/images/box_top.gif">
-	                    <img height="10" src="templates/{$global_template}/images/blank.gif" width="1"><br>
-	                    <span class="sh">{$suche_nomatch_titel}</span><br>
-	                    <img height="5" src="templates/{$global_template}/images/blank.gif" width="1"></td>
-	                    <td nowrap="nowrap" align="right" width="1%" background="templates/{$global_template}/images/box_e2.gif">
-	                    <img height="40" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-	                </tr>
-	                <tr>
-	                    <td width="1%" background="templates/{$global_template}/images/box_l.gif">
-	                    <img height="1" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-	                    <td colspan="2"><br>
-	                    <p align="center"><b>{$suche_nomatch_text}</b>
-
-
-	                    <p align="center"><a href="javascript:history.back()">
-	                    <img border="0" src="templates/{$global_template}/images/zurueck.gif"></a>
-
-	                    </p>
-	                    <p></p>
-	                    <p></p>
-	                    <p></p>
-	                    <p></p>
-	                    <p><br>
-	                    </p>
-	                    </td>
-	                    <td width="1%" background="templates/{$global_template}/images/box_r.gif">
-	                    <img height="1" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-	                </tr>
-	                <tr>
-	                    <td nowrap="nowrap" align="left" width="1%" background="templates/{$global_template}/images/box_e3.gif">
-	                    <img height="16" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-	                    <td nowrap="nowrap" align="left" width="98%" background="templates/{$global_template}/images/box_bottom.gif" colspan="2">
-	                    <img height="16" src="templates/{$global_template}/images/blank.gif" width="8"></td>
-	                    <td nowrap="nowrap" align="right" width="1%" background="templates/{$global_template}/images/box_e4.gif">
-	                    <img height="16" src="templates/{$global_template}/images/blank.gif" width="22"> </td>
-	                </tr>
-	            </table>
-	        </div>
-	        </td>
-	    </tr>
-	</table>
-	</body>
-	</html>
-  {/if}
-
-  {if $suche_match == '1'}
-    <head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-	<link rel="stylesheet" href="templates/{$global_template}/css/styles_pc.php" type="text/css">
-	<title>{$suche_match_titel}</title>
-	<style>
-	{literal}
-	<!--
-	.sl,.r{font-weight:normal;margin:0;display:inline}
-	.r{font-size:1em}
-	.g{margin-top:1em;margin-bottom:1em}
-	.a,.a:link{color:green}
-	body,td,div,.p,a{font-family:arial,sans-serif}
-	-->
-	{/literal}
-	</style>
-	</head>
-
-	<body>
-	<table align="center" border="0" style="border-collapse: collapse" width="100%" cellpadding="0" height="95%" id="table1">
-	    <tr>
-	        <td>
-	        <div align="center">
-	            <table valign="top" cellspacing="0" cellpadding="0" width="100%" border="0">
-	                <tr>
-	                    <td width="10" background="templates/{$global_template}/images/box_e1.gif">
-	                    <img height="40" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-	                    <td nowrap="nowrap" align="left" width="98%" background="templates/{$global_template}/images/box_top.gif" valign="top">
-	                    <img height="10" src="templates/{$global_template}/images/blank.gif" width="1"><br>
-	                    <font class="hd">{$suche_match_titel}</font><br>
-	                    <span class="sh">Treffer: {$anzahltreffer}</span><br>
-	                    <img height="5" src="templates/{$global_template}/images/blank.gif" width="1"></td>
-	                    <td nowrap="nowrap" align="right" width="1%" background="templates/{$global_template}/images/box_e2.gif">
-	                    <img height="40" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-	                </tr>
-	                <tr>
-	                    <td width="1%" background="templates/{$global_template}/images/box_l.gif">
-	                    <img height="1" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-	                    <td>
-                    <table valign="top" border="0" cellpadding="4" cellspacing="0" style="border-collapse: collapse" bordercolor="#E7E8ED" width="60%" id="AutoNumber1">
-
-	                    {section name=table_data3 loop=$table_data3}
-	                      <tr>
-	                        <td>
-	                          <h2 class=r><a class=l href=ausgabe.php?lid={$table_data3[table_data3].lid}&suchart={$table_data3[table_data3].suchart}&inhalt_hig={$table_data3[table_data3].inhalt_hig}><b>{$table_data3[table_data3].ueberschrift}</b></a></h2>
-	                          <br>
-	                          {$table_data3[table_data3].preview}
-	                          <br>
-	                          <span class=a>Kategorie: {$table_data3[table_data3].kategorie}
-	                            {if $table_data3[table_data3].unterkategorie != ''}
-	                              / {$table_data3[table_data3].unterkategorie}
-	                            {/if}
-	                            <br>
-	                            Datum: {$table_data3[table_data3].wochentag}, {$table_data3[table_data3].tag}.{$table_data3[table_data3].monat}.{$table_data3[table_data3].jahr}
-	                            {if $table_data3[table_data3].notizen > 0}
-	                              <br>
-								  Eigene Notizen: vorhanden
-	                            {/if}
-	                          </span>
-	                          <p>
-	                          <p>
-	                        </td>
-	                      </tr>
-	                    {/section}
-                     </table>
-                    </td>
-                    <td width="1%" background="templates/{$global_template}/images/box_r.gif">
-                        <img height="1" src="templates/{$global_template}/images/blank.gif" width="22">
-                    </td>
-                  </tr>
-                  <tr>
-                     <td nowrap="nowrap" align="left" width="1%" background="templates/{$global_template}/images/box_e3.gif">
-                        <img height="16" src="templates/{$global_template}/images/blank.gif" width="22">
-                      </td>
-                      <td nowrap="nowrap" align="left" width="98%" background="templates/{$global_template}/images/box_bottom.gif">
-                        <img height="16" src="templates/{$global_template}/images/blank.gif" width="8">
-                      </td>
-                      <td nowrap="nowrap" align="right" width="1%" background="templates/{$global_template}/images/box_e4.gif">
-                        <img height="16" src="templates/{$global_template}/images/blank.gif" width="22">
-                      </td>
-                  </tr>
-                </table>
-            </div>
-            </td>
-        </tr>
-    </table>
-    </body>
-    </html>
-
-  {/if}
-{/if}
\ No newline at end of file
diff --git a/templates/standard/wort_bearbeiten.html_20170928 b/templates/standard/wort_bearbeiten.html_20170928
deleted file mode 100644
index 20749da0..00000000
--- a/templates/standard/wort_bearbeiten.html_20170928
+++ /dev/null
@@ -1,705 +0,0 @@
-{if $action == ''}
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<link rel="stylesheet" href="templates/{$global_template}/css/styles_pc.php" type="text/css">
-<title>{$wort_bearbeiten_titel}</title>
-<style type='text/css'>
-{literal}
-select{
-	width:750px;
-}
-{/literal}
-</style>
-</head>
-<body>
-<table border="0" style="border-collapse: collapse" width="100%" cellpadding="0" height="100%" id="table1">
-    <tr>
-        <td>
-        <div align="center">
-            <table cellspacing="0" cellpadding="0" width="30%" border="0">
-                <tr>
-                    <td width="10" background="templates/{$global_template}/images/box_e1.gif">
-                    <img height="40" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-                    <td nowrap="nowrap" align="left" width="3%" background="templates/{$global_template}/images/box_top.gif" valign="top"></td>
-                    <td width="95%" background="templates/{$global_template}/images/box_top.gif">
-                    <img height="10" src="templates/{$global_template}/images/blank.gif" width="1"><br>
-                    <font class="hd">{$wort_bearbeiten_titel}</font><br>
-                    <img height="5" src="templates/{$global_template}/images/blank.gif" width="1"></td>
-                    <td nowrap="nowrap" align="right" width="1%" background="templates/{$global_template}/images/box_e2.gif">
-                    <img height="40" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-                </tr>
-                <tr>
-                    <td width="1%" background="templates/{$global_template}/images/box_l.gif">
-                    <img height="1" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-                    <td colspan="2"><br>
-                    <form action=?action=bearbeiten1 method="POST">
-                      <p align="center">
-
-                      <select size="20" name="wort">
-                      {section name=table_data loop=$table_data}
-                        <option value="{$table_data[table_data].lid}">{$table_data[table_data].datum}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{$table_data[table_data].ueberschrift}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</option>
-                      {/section}
-                      </select>
-
-                   <br>
-                    <br>
-                    <p align="center">
-                    <input type="submit" value="Abschicken" name="B1"> </p>
-                    </form>
-                    <p></p>
-                    <p></p>
-                    <p></p>
-                    <p><br>
-                    </p>
-                    </td>
-                    <td width="1%" background="templates/{$global_template}/images/box_r.gif">
-                    <img height="1" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-                </tr>
-                <tr>
-                    <td nowrap="nowrap" align="left" width="1%" background="templates/{$global_template}/images/box_e3.gif">
-                    <img height="16" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-                    <td nowrap="nowrap" align="left" width="98%" background="templates/{$global_template}/images/box_bottom.gif" colspan="2">
-                    <img height="16" src="templates/{$global_template}/images/blank.gif" width="8"></td>
-                    <td nowrap="nowrap" align="right" width="1%" background="templates/{$global_template}/images/box_e4.gif">
-                    <img height="16" src="templates/{$global_template}/images/blank.gif" width="22"> </td>
-                </tr>
-            </table>
-        </div>
-        </td>
-    </tr>
-</table>
-</body>
-</html>
-{/if}
-
-{if $action == 'bearbeiten1'}
-
-  <html>
-  <head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-  <link rel="stylesheet" href="templates/{$global_template}/css/styles_pc.php" type="text/css">
-  <style type='text/css'>
-  {literal}
-  select{
-  	width:250px;
-  }
-  {/literal}
-  </style>
-
-  {literal}
-  <script type='text/javascript' src='ajax.js'></script>
-  {/literal}
-  {literal}
-  <script type='text/javascript'>
-  /************************************************************************************************************
-  Ajax chained select
-  Copyright (C) 2006  DTHMLGoodies.com, Alf Magne Kalleland
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-  Dhtmlgoodies.com., hereby disclaims all copyright interest in this script
-  written by Alf Magne Kalleland.
-
-  Alf Magne Kalleland, 2006
-  Owner of DHTMLgoodies.com
-
-
-  ************************************************************************************************************/
-  var ajax = new sack();
-
-  function getCityList(sel)
-  {
-  	var countryCode = document.getElementById('dhtmlgoodies_country').options[document.getElementById('dhtmlgoodies_country').options.selectedIndex].value
-  	// var countryCode = sel.options[sel.selectedIndex].value; // --> Parameter 'this' von Selectbox wird Funktion übergeben. Wurde ersetzt durch ausführliche Schreibweise oben, da diese Funktion beim body=onlad auch gestartet wird, falls man im Browser auf zurück klickt, dass dann die Unterkategorie auch angezeigt wird.
-  	document.getElementById('dhtmlgoodies_city').options.length = 0;	// Empty city select box
-  	if(countryCode.length>0){
-  		ajax.requestFile = 'getSubCat.php?countryCode='+countryCode;	// Specifying which file to get
-  		ajax.onCompletion = createCities;	// Specify function that will be executed after file has been found
-  		ajax.runAJAX();		// Execute AJAX function
-  	}
-  }
-
-  function createCities()
-  {
-  	var obj = document.getElementById('dhtmlgoodies_city');
-  	eval(ajax.response);	// Executing the response from Ajax as Javascript code
-  }
-
-
-  </script>
-  {/literal}
-  {literal}
-  <script language='JavaScript' type='text/javascript'>
-  <!--
-     function start() {
-       getCityList();
-       if(document.wort_erf)document.wort_erf.uberschrift.focus();return false;
-
-     }
-  //-->
-  </script>
-  {/literal}
-  <title>{$wort_bearbeiten_titel}</title>
-  {literal}
-  <script type='text/javascript' src='CKEditor_4.6.1/ckeditor.js'></script>
-  {/literal}
-  </head>
-  <body onload="start();">
-  <table border="0" style="border-collapse: collapse" width="100%" cellpadding="0" height="100%" id="table1">
-      <tr>
-          <td>
-          <div align="center">
-              <table cellspacing="0" cellpadding="0" width="100%" border="0">
-                  <tr>
-                      <td width="10" background="templates/{$global_template}/images/box_e1.gif">
-                      <img height="40" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-                      <td nowrap="nowrap" align="left" width="98%" background="templates/{$global_template}/images/box_top.gif" valign="top">
-                      <img height="10" src="templates/{$global_template}/images/blank.gif" width="1"><br>
-                      <font class="hd">{$wort_bearbeiten_titel}</font><br>
-                      <img height="5" src="templates/{$global_template}/images/blank.gif" width="1"></font></td>
-                      <td nowrap="nowrap" align="right" width="1%" background="templates/{$global_template}/images/box_e2.gif">
-                      <img height="40" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-                  </tr>
-                  <tr>
-                      <td width="1%" background="templates/{$global_template}/images/box_l.gif">
-                      <img height="1" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-                      <td>
-                      <form action=?action=bearbeiten2 method="POST" name="wort_erf">
-                        <table border="0" cellpadding="4" cellspacing="0" style="border-width:0; border-collapse: collapse" bordercolor="#111111" width="102%" id="AutoNumber1" height="18">
-                          <tr>
-                            <td width="20%">
-                            <b>{$wort_bearbeiten_field_date}*</b><br>
-                            <font size="1">{$wort_bearbeiten_field_subdate}</font>
-                            </td>
-                            <td width="80%" align="left">
-                            <input type="text" name="beg_tag" value="{$wort_bearbeiten_tag}" size="1">.<input type="text" name="beg_mon" value="{$wort_bearbeiten_monat}" size="1">.<input type="text" name="beg_jahr" value="{$wort_bearbeiten_jahr}" size="3">
-                            </td>
-                          </tr>
-
-                          <tr>
-                            <td width="20%">
-                             &nbsp;
-                            </td>
-                            <td width="80%" align="left">
-                             &nbsp;
-                            </td>
-                          </tr>
-
-
-                          <tr>
-                            <td width="20%" valign="top">
-                              <b>{$wort_bearbeiten_field_thema}</b><br>
-                            </td>
-                            <td width="80%" align="left">
-
-                            <select size="1" name="themasel" onchange="this.form.thema.value = this.value;this.form.thema.focus();">
-                            <option value=""></option>
-                            {section name=table_data loop=$table_data}
-                              <option value="{$table_data[table_data].bezeichnung}">{$table_data[table_data].bezeichnung}&nbsp;&nbsp;&nbsp;&nbsp;</option>
-                            {/section}
-                             </select>
-
-                            </td>
-                          </tr>
-                          <tr>
-                            <td width="20%" align="left">
-                              &nbsp;
-                            </td>
-                            <td width="80%" valign="top">
-                              <input type="text" id="thema" name="thema" value="{$wort_bearbeiten_thema}" size="40">
-                            </td>
-                          <tr>
-                          <tr>
-                            <td width="20%" valign="top">
-                              <b>{$wort_bearbeiten_field_subthema}</b><br>
-                            </td>
-                            <td width="80%" align="left">
-                            <input type="text" id="unterthema" name="unterthema" value="{$wort_bearbeiten_subthema}" size="40">
-                            </td>
-                          <tr>
-                          <tr>
-                            <td width="20%" valign="top">
-                              <b>{$wort_bearbeiten_field_headline}</b><br>
-                            </td>
-                            <td width="80%" align="left">
-                            <input type="text" id="uberschrift" name="uberschrift"  value="{$wort_bearbeiten_headline}" size="40">
-                            </td>
-                          <tr>
-                          <tr>
-                            <td width="20%">
-                            <b>{$wort_bearbeiten_field_wort}</b>
-                            </td>
-                            <td width="80%" align="left">
-                             <textarea id='wort' name='wort'>{$wort_bearbeiten_textwort}</textarea>
-                             {literal}
-                               <script type='text/javascript'>
-                                 CKEDITOR.replace( 'wort', {
-                                                   height: 80,
-                                                   width: "90%",
-                                                   enterMode : CKEDITOR.ENTER_BR
-                                                   } );
-                               </script>
-                             {/literal}
-                            </td>
-                          </tr>
-                          <tr>
-                            <td width="20%">
-                            <b>{$wort_bearbeiten_field_stelle}</b>
-                            </td>
-                            <td width="80%" align="left">
-                            <input type="text" name="textstelle" value="{$wort_bearbeiten_textstelle}" size="40">
-                            </td>
-                          </tr>
-                          <tr>
-                            <td width="20%">
-                             &nbsp;
-                            </td>
-                            <td width="80%" align="left">
-                             &nbsp;
-                            </td>
-                          </tr>
-
-
-
-                          <tr>
-                            <td width="20%">
-                            <b>{$wort_bearbeiten_field_vorwort}</b>
-                            </td>
-                            <td width="80%" align="left">
-                             <textarea id='vorwort' name='vorwort'>{$wort_bearbeiten_vorwort}</textarea>
-                             {literal}
-                               <script type='text/javascript'>
-                                 CKEDITOR.replace( 'vorwort', {
-                                                   height: 80,
-                                                   width: "90%",
-                                                   enterMode : CKEDITOR.ENTER_BR
-                                                   } );
-                               </script>
-                             {/literal}
-                            </td>
-                          </tr>
-
-
-
-                          <tr>
-                            <td width="20%">
-                            <b>{$wort_bearbeiten_field_botschaft}</b>
-                            </td>
-                            <td width="80%" align="left">
-
-                             <textarea id='botschaft' name='botschaft'>{$wort_bearbeiten_botschaft}</textarea>
-                             {literal}
-                               <script type='text/javascript'>
-                                 CKEDITOR.replace( 'botschaft', {
-                                                   height: 80,
-                                                   width: "90%",
-                                                   enterMode : CKEDITOR.ENTER_BR
-                                                   } );
-                               </script>
-                             {/literal}
-                            </td>
-                          </tr>
-                          <tr>
-                            <td width="20%">
-                            <b>{$wort_bearbeiten_field_ausf}</b>
-                            </td>
-                            <td width="80%" align="left">
-
-                             <textarea id='inhalt' name='inhalt'>{$wort_bearbeiten_inhalt}</textarea>
-                             {literal}
-                               <script type='text/javascript'>
-                                 CKEDITOR.replace( 'inhalt', {
-                                                   width: "90%",
-                                                   enterMode : CKEDITOR.ENTER_BR
-                                                   } );
-                               </script>
-                             {/literal}
-                            </td>
-                          </tr>
-                          <tr>
-                            <td width="20%">
-                              <b>{$wort_bearbeiten_field_stapgd}</b>
-                            </td>
-                            <td width="80%" align="left">
-                            <input type='Checkbox' name='stapgd' value='Y' {if $wort_bearbeiten_stapgd == 'Y'} checked {/if} >
-                            </td>
-                          </tr>
-                          <tr>
-                            <td width="20%">
-                            &nbsp;
-                            </td>
-                            <td width="80%" align="left">
-                            &nbsp;
-                            </td>
-                          </tr>
-
-                          <tr>
-                            <td width="20%">
-                            <b>{$wort_bearbeiten_field_zusammenfassung}</b>
-                            </td>
-                            <td width="80%" align="left">
-
-                             <textarea id='zusammenfassung' name='zusammenfassung'>{$wort_bearbeiten_zusammenfassung}</textarea>
-                             {literal}
-                               <script type='text/javascript'>
-                                 CKEDITOR.replace( 'zusammenfassung', {
-                                                   height: 100,
-                                                   width: "90%",
-                                                   enterMode : CKEDITOR.ENTER_BR
-                                                   } );
-                               </script>
-                             {/literal}
-                            </td>
-                          </tr>
-                          <tr>
-                            <td width="20%">
-                            <b>{$wort_bearbeiten_field_kontext}</b>
-                            </td>
-                            <td width="80%" align="left">
-
-                             <textarea id='kontext' name='kontext'>{$wort_bearbeiten_kontext}</textarea>
-                             {literal}
-                               <script type='text/javascript'>
-                                 CKEDITOR.replace( 'kontext', {
-                                                   height: 100,
-                                                   width: "90%",
-                                                   enterMode : CKEDITOR.ENTER_BR
-                                                   } );
-                               </script>
-                             {/literal}
-                            </td>
-                          </tr>
-                          <tr>
-                            <td width="20%">
-                             &nbsp;
-                            </td>
-                            <td width="80%" align="left">
-                             &nbsp;
-                            </td>
-                          </tr>
-
-                          <tr>
-                            <td width="20%">
-                            <b>{$wort_bearbeiten_field_cat}*</b>
-                            </td>
-                            <td width="80%" align="left">
-
-                            <select size="1" id='dhtmlgoodies_country' name='dhtmlgoodies_country' onchange='getCityList(this)'>
-                              <option value="">Select</option>
-                              {section name=table_data1 loop=$table_data1}
-                                <option value="{$table_data1[table_data1].kid}" {if $table_data1[table_data1].select == 'Y'}  selected {/if} >{$table_data1[table_data1].bezeichnung}&nbsp;&nbsp;&nbsp;&nbsp;</option>
-                              {/section}
-                            </select>
-
-                            </td>
-                          </tr>
-                          <tr>
-                            <td width="20%">
-                            <b>{$wort_bearbeiten_field_subcat}</b>
-                            </td>
-                            <td width="80%" align="left">
-                            <select id='dhtmlgoodies_city' name='dhtmlgoodies_city'>
-
-  		          </select>
-                            </td>
-                          </tr>
-                          </tr>
-                          <tr>
-                            <td width="20%">
-                            * = Pflichtfelder
-                            </td>
-                            <td width="80%" align="left">
-                            &nbsp;
-                            </td>
-                          </tr>
-                          <tr>
-                            <td width="20%">
-                            &nbsp;
-                            </td>
-                            <td width="80%" align="left">
-                            &nbsp;
-                            </td>
-                          </tr>
-                        </table>
-                      &nbsp; <input type="submit" value="Abschicken" name="B1">
-                        <input type="reset" value="Zur&uuml;cksetzen" name="B2"></form>
-                      </td>
-                      <td width="1%" background="templates/{$global_template}/images/box_r.gif">
-                      <img height="1" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-                  </tr>
-                  <tr>
-                      <td nowrap="nowrap" align="left" width="1%" background="templates/{$global_template}/images/box_e3.gif">
-                      <img height="16" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-                      <td nowrap="nowrap" align="left" width="98%" background="templates/{$global_template}/images/box_bottom.gif">
-                      <img height="16" src="templates/{$global_template}/images/blank.gif" width="8"></td>
-                      <td nowrap="nowrap" align="right" width="1%" background="templates/{$global_template}/images/box_e4.gif">
-                      <img height="16" src="templates/{$global_template}/images/blank.gif" width="22"> </td>
-                  </tr>
-              </table>
-          </div>
-          </td>
-      </tr>
-  </table>
-  </body>
-  </html>
-
-{/if}
-
-{if $action == 'bearbeiten2'}
-  {if $wort_bearbeiten_checkdate_err == '1'}
-    <html>
-	<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-	<link rel="stylesheet" href="templates/{$global_template}/css/styles_pc.php" type="text/css">
-	<title>{$wort_bearbeiten_date_err_titel}</title>
-	</head>
-	<body>
-	<table border="0" style="border-collapse: collapse" width="100%" cellpadding="0" height="100%" id="table1">
-	    <tr>
-	        <td>
-	        <div align="center">
-	            <table cellspacing="0" cellpadding="0" width="550" border="0">
-	                <tr>
-	                    <td width="10" background="templates/{$global_template}/images/box_e1.gif">
-	                    <img height="40" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-	                    <td nowrap="nowrap" align="left" width="3%" background="templates/{$global_template}/images/box_top.gif" valign="top"></td>
-	                    <td width="95%" background="templates/{$global_template}/images/box_top.gif">
-	                    <img height="10" src="templates/{$global_template}/images/blank.gif" width="1"><br>
-	                    <span class="sh">{$wort_bearbeiten_date_err_titel}</span><br>
-	                    <img height="5" src="templates/{$global_template}/images/blank.gif" width="1"></td>
-	                    <td nowrap="nowrap" align="right" width="1%" background="templates/{$global_template}/images/box_e2.gif">
-	                    <img height="40" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-	                </tr>
-	                <tr>
-	                    <td width="1%" background="templates/{$global_template}/images/box_l.gif">
-	                    <img height="1" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-	                    <td colspan="2"><br>
-	                    <p align="center"><b>{$wort_bearbeiten_date_err_text}</p></b>
-	                    </p>
-	                    <p align="center"><a href="javascript:history.back()">
-	                    <img border="0" src="templates/{$global_template}/images/zurueck.gif" width="77" height="22"></a><br>
-	                    </p>
-	                    <p></p>
-	                    <p></p>
-	                    <p></p>
-	                    <p></p>
-	                    <p><br>
-	                    </p>
-	                    </td>
-	                    <td width="1%" background="templates/{$global_template}/images/box_r.gif">
-	                    <img height="1" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-	                </tr>
-	                <tr>
-	                    <td nowrap="nowrap" align="left" width="1%" background="templates/{$global_template}/images/box_e3.gif">
-	                    <img height="16" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-	                    <td nowrap="nowrap" align="left" width="98%" background="templates/{$global_template}/images/box_bottom.gif" colspan="2">
-	                    <img height="16" src="templates/{$global_template}/images/blank.gif" width="8"></td>
-	                    <td nowrap="nowrap" align="right" width="1%" background="templates/{$global_template}/images/box_e4.gif">
-	                    <img height="16" src="templates/{$global_template}/images/blank.gif" width="22"> </td>
-	                </tr>
-	            </table>
-	        </div>
-	        </td>
-	    </tr>
-	</table>
-	</body>
-	</html>
-  {/if}
-
-  {if $wort_bearbeiten_sql_err1 == '1'}
-    <html>
-    <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <link rel="stylesheet" href="templates/{$global_template}/css/styles_pc.php" type="text/css">
-    <title>{$wort_bearbeiten_inserterr_titel}</title>
-    </head>
-    <body>
-    <table border="0" style="border-collapse: collapse" width="100%" cellpadding="0" height="100%" id="table1">
-        <tr>
-        <td>
-            <div align="center">
-                <table cellspacing="0" cellpadding="0" width="550" border="0">
-                    <tr>
-                        <td width="10" background="templates/{$global_template}/images/box_e1.gif">
-                        <img height="40" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-                        <td nowrap="nowrap" align="left" width="3%" background="templates/{$global_template}/images/box_top.gif" valign="top"></td>
-                        <td width="95%" background="templates/{$global_template}/images/box_top.gif">
-                        <img height="10" src="templates/{$global_template}/images/blank.gif" width="1"><br>
-                        <span class="sh">{$wort_bearbeiten_inserterr_titel}</span><br>
-                        <img height="5" src="templates/{$global_template}/images/blank.gif" width="1"></td>
-                        <td nowrap="nowrap" align="right" width="1%" background="templates/{$global_template}/images/box_e2.gif">
-                        <img height="40" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-                    </tr>
-                    <tr>
-                        <td width="1%" background="templates/{$global_template}/images/box_l.gif">
-                        <img height="1" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-                        <td colspan="2"><br>
-                        <p align="center"><b>{$wort_bearbeiten_inserterr_text}</b>
-                        </p>
-                        <p align="center"><a href="javascript:history.back()">
-                        <img border="0" src="templates/{$global_template}/images/zurueck.gif" width="77" height="22"></a><br>
-                        </p>
-                        <p></p>
-                        <p></p>
-                        <p></p>
-                        <p></p>
-                        <p><br>
-                        </p>
-                        </td>
-                        <td width="1%" background="templates/{$global_template}/images/box_r.gif">
-                        <img height="1" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-                    </tr>
-                    <tr>
-                        <td nowrap="nowrap" align="left" width="1%" background="templates/{$global_template}/images/box_e3.gif">
-                        <img height="16" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-                        <td nowrap="nowrap" align="left" width="98%" background="templates/{$global_template}/images/box_bottom.gif" colspan="2">
-                        <img height="16" src="templates/{$global_template}/images/blank.gif" width="8"></td>
-                        <td nowrap="nowrap" align="right" width="1%" background="templates/{$global_template}/images/box_e4.gif">
-                        <img height="16" src="templates/{$global_template}/images/blank.gif" width="22"> </td>
-                    </tr>
-                </table>
-            </div>
-            </td>
-        </tr>
-    </table>
-    </body>
-    </html>
-  {/if}
-
-  {if $wort_bearbeiten_sql_err2 == '1'}
-    <html>
-	<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-	<link rel="stylesheet" href="templates/{$global_template}/css/styles_pc.php" type="text/css">
-	<title>{$wort_bearbeiten_formaterr_titel}</title>
-	</head>
-	<body>
-	<table border="0" style="border-collapse: collapse" width="100%" cellpadding="0" height="100%" id="table1">
-	    <tr>
-	        <td>
-	        <div align="center">
-	            <table cellspacing="0" cellpadding="0" width="550" border="0">
-	                <tr>
-	                    <td width="10" background="templates/{$global_template}/images/box_e1.gif">
-	                    <img height="40" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-	                    <td nowrap="nowrap" align="left" width="3%" background="templates/{$global_template}/images/box_top.gif" valign="top"></td>
-	                    <td width="95%" background="templates/{$global_template}/images/box_top.gif">
-	                    <img height="10" src="templates/{$global_template}/images/blank.gif" width="1"><br>
-	                    <span class="sh">{$wort_bearbeiten_formaterr_titel}</span><br>
-	                    <img height="5" src="templates/{$global_template}/images/blank.gif" width="1"></td>
-	                    <td nowrap="nowrap" align="right" width="1%" background="templates/{$global_template}/images/box_e2.gif">
-	                    <img height="40" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-	                </tr>
-	                <tr>
-	                    <td width="1%" background="templates/{$global_template}/images/box_l.gif">
-	                    <img height="1" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-	                    <td colspan="2"><br>
-	                    <p align="center">{$wort_bearbeiten_formaterr_text}
-	                    <p align="center"><a href="javascript:history.back()">
-	                    <img border="0" src="templates/{$global_template}/images/zurueck.gif" width="77" height="22"></a>
-	                    </p>
-	                    <p></p>
-	                    <p></p>
-	                    <p></p>
-	                    <p></p>
-	                    <p><br>
-	                    </p>
-	                    </td>
-	                    <td width="1%" background="templates/{$global_template}/images/box_r.gif">
-	                    <img height="1" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-	                </tr>
-	                <tr>
-	                    <td nowrap="nowrap" align="left" width="1%" background="templates/{$global_template}/images/box_e3.gif">
-	                    <img height="16" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-	                    <td nowrap="nowrap" align="left" width="98%" background="templates/{$global_template}/images/box_bottom.gif" colspan="2">
-	                    <img height="16" src="templates/{$global_template}/images/blank.gif" width="8"></td>
-	                    <td nowrap="nowrap" align="right" width="1%" background="templates/{$global_template}/images/box_e4.gif">
-	                    <img height="16" src="templates/{$global_template}/images/blank.gif" width="22"> </td>
-	                </tr>
-	            </table>
-	        </div>
-	        </td>
-	    </tr>
-	</table>
-	</body>
-	</html>
-  {/if}
-
-  {if $wort_bearbeiten_success == '1'}
-    <meta http-equiv="refresh" content="1; URL=wort_bearbeiten.php">
-	<html>
-	<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-	<link rel="stylesheet" href="templates/{$global_template}/css/styles_pc.php" type="text/css">
-	<title>{$wort_bearbeiten_success_titel}</title>
-	</head>
-	<body>
-	<table border="0" style="border-collapse: collapse" width="100%" cellpadding="0" height="100%" id="table1">
-	    <tr>
-	        <td>
-	        <div align="center">
-	            <table cellspacing="0" cellpadding="0" width="550" border="0">
-	                <tr>
-	                    <td width="10" background="templates/{$global_template}/images/box_e1.gif">
-	                    <img height="40" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-	                    <td nowrap="nowrap" align="left" width="3%" background="templates/{$global_template}/images/box_top.gif" valign="top"></td>
-	                    <td width="95%" background="templates/{$global_template}/images/box_top.gif">
-	                    <img height="10" src="templates/{$global_template}/images/blank.gif" width="1"><br>
-	                    <span class="sh">{$wort_bearbeiten_success_titel}</span><br>
-	                    <img height="5" src="templates/{$global_template}/images/blank.gif" width="1"></td>
-	                    <td nowrap="nowrap" align="right" width="1%" background="templates/{$global_template}/images/box_e2.gif">
-	                    <img height="40" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-	                </tr>
-	                <tr>
-	                    <td width="1%" background="templates/{$global_template}/images/box_l.gif">
-	                    <img height="1" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-	                    <td colspan="2"><br>
-	                    <p align="center"><b>{$wort_bearbeiten_success_text}</b>
-	                    <p align="center"><a href="hauptframe.php">
-	                    <img border="0" src="templates/{$global_template}/images/zurueck.gif"></a>
-
-	                    </p>
-	                    <p></p>
-	                    <p></p>
-	                    <p></p>
-	                    <p></p>
-	                    <p><br>
-	                    </p>
-	                    </td>
-	                    <td width="1%" background="templates/{$global_template}/images/box_r.gif">
-	                    <img height="1" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-	                </tr>
-	                <tr>
-	                    <td nowrap="nowrap" align="left" width="1%" background="templates/{$global_template}/images/box_e3.gif">
-	                    <img height="16" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-	                    <td nowrap="nowrap" align="left" width="98%" background="templates/{$global_template}/images/box_bottom.gif" colspan="2">
-	                    <img height="16" src="templates/{$global_template}/images/blank.gif" width="8"></td>
-	                    <td nowrap="nowrap" align="right" width="1%" background="templates/{$global_template}/images/box_e4.gif">
-	                    <img height="16" src="templates/{$global_template}/images/blank.gif" width="22"> </td>
-	                </tr>
-	            </table>
-	        </div>
-	        </td>
-	    </tr>
-	</table>
-	</body>
-	</html>
-  {/if}
-
-  {if $wort_bearbeiten_success == '2'}
-    <meta http-equiv="refresh" content="0; URL=ausgabe.php?lid={$wort_bearbeiten_lid}">
-  {/if}
-{/if}
\ No newline at end of file
diff --git a/templates/standard/wort_erfassen.html_20170928 b/templates/standard/wort_erfassen.html_20170928
deleted file mode 100644
index 18d4477c..00000000
--- a/templates/standard/wort_erfassen.html_20170928
+++ /dev/null
@@ -1,630 +0,0 @@
-{if $action == ''}
-
-  <html>
-  <head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-  <link rel="stylesheet" href="templates/{$global_template}/css/styles_pc.php" type="text/css">
-  <style type='text/css'>
-  {literal}
-  select{
-  	width:250px;
-  }
-  {/literal}
-  </style>
-  {literal}
-  <script type='text/javascript' src='ajax.js'></script>
-  {/literal}
-  {literal}
-  <script type='text/javascript'>
-  /************************************************************************************************************
-  Ajax chained select
-  Copyright (C) 2006  DTHMLGoodies.com, Alf Magne Kalleland
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-  Dhtmlgoodies.com., hereby disclaims all copyright interest in this script
-  written by Alf Magne Kalleland.
-
-  Alf Magne Kalleland, 2006
-  Owner of DHTMLgoodies.com
-
-
-  ************************************************************************************************************/
-  var ajax = new sack();
-
-  function getCityList(sel)
-  {
-  	var countryCode = document.getElementById('dhtmlgoodies_country').options[document.getElementById('dhtmlgoodies_country').options.selectedIndex].value
-  	// var countryCode = sel.options[sel.selectedIndex].value; // --> Parameter 'this' von Selectbox wird Funktion übergeben. Wurde ersetzt durch ausführliche Schreibweise oben, da diese Funktion beim body=onlad auch gestartet wird, falls man im Browser auf zurück klickt, dass dann die Unterkategorie auch angezeigt wird.
-  	document.getElementById('dhtmlgoodies_city').options.length = 0;	// Empty city select box
-  	if(countryCode.length>0){
-  		ajax.requestFile = 'getSubCat.php?countryCode='+countryCode;	// Specifying which file to get
-  		ajax.onCompletion = createCities;	// Specify function that will be executed after file has been found
-  		ajax.runAJAX();		// Execute AJAX function
-  	}
-  }
-
-  function createCities()
-  {
-  	var obj = document.getElementById('dhtmlgoodies_city');
-  	eval(ajax.response);	// Executing the response from Ajax as Javascript code
-  }
-
-
-  </script>
-  {/literal}
-
-  {literal}
-  <script language='JavaScript' type='text/javascript'>
-  <!--
-     function start() {
-       getCityList();
-       if(document.wort_erf)document.wort_erf.beg_tag.focus();return false;
-
-     }
-  //-->
-  </script>
-  {/literal}
-  <title>{$wort_erfassen_titel}</title>
-  <script type='text/javascript' src='CKEditor_4.6.1/ckeditor.js'></script>
-  </head>
-  <body onload="start();">
-  <table border="0" style="border-collapse: collapse" width="100%" cellpadding="0" height="100%" id="table1">
-      <tr>
-          <td>
-          <div align="center">
-              <table cellspacing="0" cellpadding="0" width="100%" border="0">
-                  <tr>
-                      <td width="10" background="templates/{$global_template}/images/box_e1.gif">
-                      <img height="40" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-                      <td nowrap="nowrap" align="left" width="98%" background="templates/{$global_template}/images/box_top.gif" valign="top">
-                      <img height="10" src="templates/{$global_template}/images/blank.gif" width="1"><br>
-                      <font class="hd">{$wort_erfassen_titel}</font><br>
-                      <img height="5" src="templates/{$global_template}/images/blank.gif" width="1"></font></td>
-                      <td nowrap="nowrap" align="right" width="1%" background="templates/{$global_template}/images/box_e2.gif">
-                      <img height="40" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-                  </tr>
-                  <tr>
-                      <td width="1%" background="templates/{$global_template}/images/box_l.gif">
-                      <img height="1" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-                      <td>
-                      <form action=?action=erfassen1 method="POST" name="wort_erf">
-                        <table border="0" cellpadding="4" cellspacing="0" style="border-width:0; border-collapse: collapse" bordercolor="#111111" width="102%" id="AutoNumber1" height="18">
-                          <tr>
-                            <td width="20%">
-                            <b>{$wort_erfassen_field_date}*</b><br>
-                            <font size="1">{$wort_erfassen_field_subdate}</font>
-                            </td>
-                            <td width="80%" align="left">
-                            <input type="text" name="beg_tag" size="1">.<input type="text" name="beg_mon" size="1">.<input type="text" name="beg_jahr" size="3">
-                            </td>
-                          </tr>
-
-                          <tr>
-                            <td width="20%">
-                             &nbsp;
-                            </td>
-                            <td width="80%" align="left">
-                             &nbsp;
-                            </td>
-                          </tr>
-
-                          <tr>
-                            <td width="20%" valign="top">
-                              <b>{$wort_erfassen_field_thema}</b><br>
-                            </td>
-                            <td width="80%" align="left">
-
-                            <select size="1" name="themasel" onchange="this.form.thema.value = this.value;this.form.thema.focus();">
-                            <option value=""></option>
-                            {section name=table_data loop=$table_data}
-                              <option value="{$table_data[table_data].bezeichnung}">{$table_data[table_data].bezeichnung}&nbsp;&nbsp;&nbsp;&nbsp;</option>
-                            {/section}
-                             </select>
-
-                            </td>
-                          </tr>
-
-
-                          <tr>
-                            <td width="20%" align="left">
-                              &nbsp;
-                            </td>
-                            <td width="80%" valign="top">
-                              <input type="text" id="thema" name="thema" size="40">
-                            </td>
-                          <tr>
-                          <tr>
-                            <td width="20%" valign="top">
-                              <b>{$wort_erfassen_field_subthema}</b><br>
-                            </td>
-                            <td width="80%" align="left">
-                            <input type="text" id="unterthema" name="unterthema" size="40">
-                            </td>
-                          <tr>
-
-                          </tr>
-                          <tr>
-                            <td width="20%" valign="top">
-                              <b>{$wort_erfassen_field_headline}</b><br>
-                            </td>
-                            <td width="80%" align="left">
-                            <input type="text" id="VerArt" name="uberschrift" size="40">
-                            </td>
-                          <tr>
-
-                          <tr>
-                            <td width="20%">
-                            <b>{$wort_erfassen_field_wort}</b>
-                            </td>
-                            <td width="80%" align="left">
-                             <textarea id='wort' name='wort'></textarea>
-                             {literal}
-                               <script type='text/javascript'>
-                                 CKEDITOR.replace( 'wort', {
-                                                   height: 80,
-                                                   width: "90%",
-                                                   enterMode : CKEDITOR.ENTER_BR
-                                                   } );
-                               </script>
-                             {/literal}
-                            </td>
-                          </tr>
-
-                          <tr>
-                            <td width="20%">
-                            <b>{$wort_erfassen_field_stelle}</b>
-                            </td>
-                            <td width="80%" align="left">
-                            <input type="text" name="textstelle" size="40">
-                            </td>
-                          </tr>
-
-                          <tr>
-                            <td width="20%">
-                             &nbsp;
-                            </td>
-                            <td width="80%" align="left">
-                             &nbsp;
-                            </td>
-                          </tr>
-
-                          <tr>
-                            <td width="20%">
-                            <b>{$wort_erfassen_field_vorwort}</b>
-                            </td>
-                            <td width="80%" align="left">
-                             <textarea id='vorwort' name='vorwort'></textarea>
-                             {literal}
-                               <script type='text/javascript'>
-                                 CKEDITOR.replace( 'vorwort', {
-                                                   height: 80,
-                                                   width: "90%",
-                                                   enterMode : CKEDITOR.ENTER_BR
-                                                   } );
-                               </script>
-                             {/literal}
-                            </td>
-                          </tr>
-
-
-
-                          <tr>
-                            <td width="20%">
-                            <b>{$wort_erfassen_field_botschaft}</b>
-                            </td>
-                            <td width="80%" align="left">
-
-                             <textarea id='botschaft' name='botschaft'></textarea>
-                             {literal}
-                               <script type='text/javascript'>
-                                 CKEDITOR.replace( 'botschaft', {
-                                                   height: 80,
-                                                   width: "90%",
-                                                   enterMode : CKEDITOR.ENTER_BR
-                                                   } );
-                               </script>
-                             {/literal}
-                            </td>
-                          </tr>
-                          <tr>
-                            <td width="20%">
-                            <b>{$wort_erfassen_field_ausf}</b>
-                            </td>
-                            <td width="80%" align="left">
-
-                             <textarea id='inhalt' name='inhalt'></textarea>
-                             {literal}
-                               <script type='text/javascript'>
-                                 CKEDITOR.replace( 'inhalt', {
-                                                   width: "90%",
-                                                   enterMode : CKEDITOR.ENTER_BR
-                                                   } );
-                               </script>
-                             {/literal}
-                            </td>
-                          </tr>
-
-                          <tr>
-                            <td width="20%">
-                              <b>{$wort_erfassen_field_stapgd}</b>
-                            </td>
-                            <td width="80%" align="left">
-                            <input type='Checkbox' name='stapgd' value='Y'>
-                            </td>
-                          </tr>
-
-                          <tr>
-                            <td width="20%">
-                             &nbsp;
-                            </td>
-                            <td width="80%" align="left">
-                             &nbsp;
-                            </td>
-                          </tr>
-                          <tr>
-                            <td width="20%">
-                            <b>{$wort_erfassen_field_zusammenfassung}</b>
-                            </td>
-                            <td width="80%" align="left">
-
-                             <textarea id='zusammenfassung' name='zusammenfassung'></textarea>
-                             {literal}
-                               <script type='text/javascript'>
-                                 CKEDITOR.replace( 'zusammenfassung', {
-                                                   height: 100,
-                                                   width: "90%",
-                                                   enterMode : CKEDITOR.ENTER_BR
-                                                   } );
-                               </script>
-                             {/literal}
-                            </td>
-                          </tr>
-                          <tr>
-                            <td width="20%">
-                            <b>{$wort_erfassen_field_kontext}</b>
-                            </td>
-                            <td width="80%" align="left">
-
-                             <textarea id='kontext' name='kontext'></textarea>
-                             {literal}
-                               <script type='text/javascript'>
-                                 CKEDITOR.replace( 'kontext', {
-                                                   height: 100,
-                                                   width: "90%",
-                                                   enterMode : CKEDITOR.ENTER_BR
-                                                   } );
-                               </script>
-                             {/literal}
-                            </td>
-                          </tr>
-
-                          <tr>
-                            <td width="20%">
-                            &nbsp;
-                            </td>
-                            <td width="80%" align="left">
-                            &nbsp;
-                            </td>
-                          </tr>
-
-                          <tr>
-                            <td width="20%">
-                            <b>{$wort_erfassen_field_cat}*</b>
-                            </td>
-                            <td width="80%" align="left">
-
-                            <select size="1" id='dhtmlgoodies_country' name='dhtmlgoodies_country' onchange='{literal}getCityList(this){/literal}'>
-                              <option value="">Select</option>
-                              {section name=table_data1 loop=$table_data1}
-                                <option value="{$table_data1[table_data1].kid}">{$table_data1[table_data1].bezeichnung}&nbsp;&nbsp;&nbsp;&nbsp;</option>
-                              {/section}
-                            </select>
-
-                            </td>
-                          </tr>
-                          <tr>
-                            <td width="20%">
-                            <b>{$wort_erfassen_field_subcat}</b>
-                            </td>
-                            <td width="80%" align="left">
-                            <select id='dhtmlgoodies_city' name='dhtmlgoodies_city'>
-
-  		          </select>
-                            </td>
-                          </tr>
-                          </tr>
-                          <tr>
-                            <td width="20%">
-                            * = Pflichtfelder
-                            </td>
-                            <td width="80%" align="left">
-                            &nbsp;
-                            </td>
-                          </tr>
-                          <tr>
-                            <td width="20%">
-                            &nbsp;
-                            </td>
-                            <td width="80%" align="left">
-                            &nbsp;
-                            </td>
-                          </tr>
-                        </table>
-                      &nbsp; <input type="submit" value="Abschicken" name="B1">
-                        <input type="reset" value="Zur&uuml;cksetzen" name="B2"></form>
-                      </td>
-                      <td width="1%" background="templates/{$global_template}/images/box_r.gif">
-                      <img height="1" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-                  </tr>
-                  <tr>
-                      <td nowrap="nowrap" align="left" width="1%" background="templates/{$global_template}/images/box_e3.gif">
-                      <img height="16" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-                      <td nowrap="nowrap" align="left" width="98%" background="templates/{$global_template}/images/box_bottom.gif">
-                      <img height="16" src="templates/{$global_template}/images/blank.gif" width="8"></td>
-                      <td nowrap="nowrap" align="right" width="1%" background="templates/{$global_template}/images/box_e4.gif">
-                      <img height="16" src="templates/{$global_template}/images/blank.gif" width="22"> </td>
-                  </tr>
-              </table>
-          </div>
-          </td>
-      </tr>
-  </table>
-  </body>
-  </html>
-
-{/if}
-
-{if $action == 'erfassen1'}
-  {if $wort_erfassen_checkdate_err == '1'}
-    <html>
-	<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-	<link rel="stylesheet" href="templates/{$global_template}/css/styles_pc.php" type="text/css">
-	<title>{$wort_erfassen_date_err_titel}</title>
-	</head>
-	<body>
-	<table border="0" style="border-collapse: collapse" width="100%" cellpadding="0" height="100%" id="table1">
-	    <tr>
-	        <td>
-	        <div align="center">
-	            <table cellspacing="0" cellpadding="0" width="550" border="0">
-	                <tr>
-	                    <td width="10" background="templates/{$global_template}/images/box_e1.gif">
-	                    <img height="40" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-	                    <td nowrap="nowrap" align="left" width="3%" background="templates/{$global_template}/images/box_top.gif" valign="top"></td>
-	                    <td width="95%" background="templates/{$global_template}/images/box_top.gif">
-	                    <img height="10" src="templates/{$global_template}/images/blank.gif" width="1"><br>
-	                    <span class="sh">{$wort_erfassen_date_err_titel}</span><br>
-	                    <img height="5" src="templates/{$global_template}/images/blank.gif" width="1"></td>
-	                    <td nowrap="nowrap" align="right" width="1%" background="templates/{$global_template}/images/box_e2.gif">
-	                    <img height="40" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-	                </tr>
-	                <tr>
-	                    <td width="1%" background="templates/{$global_template}/images/box_l.gif">
-	                    <img height="1" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-	                    <td colspan="2"><br>
-	                    <p align="center"><b>{$wort_erfassen_date_err_text}</p></b>
-	                    </p>
-	                    <p align="center"><a href="javascript:history.back()">
-	                    <img border="0" src="templates/{$global_template}/images/zurueck.gif" width="77" height="22"></a><br>
-	                    </p>
-	                    <p></p>
-	                    <p></p>
-	                    <p></p>
-	                    <p></p>
-	                    <p><br>
-	                    </p>
-	                    </td>
-	                    <td width="1%" background="templates/{$global_template}/images/box_r.gif">
-	                    <img height="1" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-	                </tr>
-	                <tr>
-	                    <td nowrap="nowrap" align="left" width="1%" background="templates/{$global_template}/images/box_e3.gif">
-	                    <img height="16" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-	                    <td nowrap="nowrap" align="left" width="98%" background="templates/{$global_template}/images/box_bottom.gif" colspan="2">
-	                    <img height="16" src="templates/{$global_template}/images/blank.gif" width="8"></td>
-	                    <td nowrap="nowrap" align="right" width="1%" background="templates/{$global_template}/images/box_e4.gif">
-	                    <img height="16" src="templates/{$global_template}/images/blank.gif" width="22"> </td>
-	                </tr>
-	            </table>
-	        </div>
-	        </td>
-	    </tr>
-	</table>
-	</body>
-	</html>
-  {/if}
-
-  {if $wort_erfassen_sql_err1 == '1'}
-    <html>
-    <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <link rel="stylesheet" href="templates/{$global_template}/css/styles_pc.php" type="text/css">
-    <title>{$wort_erfassen_inserterr_titel}</title>
-    </head>
-    <body>
-    <table border="0" style="border-collapse: collapse" width="100%" cellpadding="0" height="100%" id="table1">
-        <tr>
-        <td>
-            <div align="center">
-                <table cellspacing="0" cellpadding="0" width="550" border="0">
-                    <tr>
-                        <td width="10" background="templates/{$global_template}/images/box_e1.gif">
-                        <img height="40" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-                        <td nowrap="nowrap" align="left" width="3%" background="templates/{$global_template}/images/box_top.gif" valign="top"></td>
-                        <td width="95%" background="templates/{$global_template}/images/box_top.gif">
-                        <img height="10" src="templates/{$global_template}/images/blank.gif" width="1"><br>
-                        <span class="sh">{$wort_erfassen_inserterr_titel}</span><br>
-                        <img height="5" src="templates/{$global_template}/images/blank.gif" width="1"></td>
-                        <td nowrap="nowrap" align="right" width="1%" background="templates/{$global_template}/images/box_e2.gif">
-                        <img height="40" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-                    </tr>
-                    <tr>
-                        <td width="1%" background="templates/{$global_template}/images/box_l.gif">
-                        <img height="1" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-                        <td colspan="2"><br>
-                        <p align="center"><b>{$wort_erfassen_inserterr_text}</b>
-                        </p>
-                        <p align="center"><a href="javascript:history.back()">
-                        <img border="0" src="templates/{$global_template}/images/zurueck.gif" width="77" height="22"></a><br>
-                        </p>
-                        <p></p>
-                        <p></p>
-                        <p></p>
-                        <p></p>
-                        <p><br>
-                        </p>
-                        </td>
-                        <td width="1%" background="templates/{$global_template}/images/box_r.gif">
-                        <img height="1" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-                    </tr>
-                    <tr>
-                        <td nowrap="nowrap" align="left" width="1%" background="templates/{$global_template}/images/box_e3.gif">
-                        <img height="16" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-                        <td nowrap="nowrap" align="left" width="98%" background="templates/{$global_template}/images/box_bottom.gif" colspan="2">
-                        <img height="16" src="templates/{$global_template}/images/blank.gif" width="8"></td>
-                        <td nowrap="nowrap" align="right" width="1%" background="templates/{$global_template}/images/box_e4.gif">
-                        <img height="16" src="templates/{$global_template}/images/blank.gif" width="22"> </td>
-                    </tr>
-                </table>
-            </div>
-            </td>
-        </tr>
-    </table>
-    </body>
-    </html>
-  {/if}
-
-  {if $wort_erfassen_sql_err2 == '1'}
-    <html>
-	<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-	<link rel="stylesheet" href="templates/{$global_template}/css/styles_pc.php" type="text/css">
-	<title>{$wort_erfassen_formaterr_titel}</title>
-	</head>
-	<body>
-	<table border="0" style="border-collapse: collapse" width="100%" cellpadding="0" height="100%" id="table1">
-	    <tr>
-	        <td>
-	        <div align="center">
-	            <table cellspacing="0" cellpadding="0" width="550" border="0">
-	                <tr>
-	                    <td width="10" background="templates/{$global_template}/images/box_e1.gif">
-	                    <img height="40" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-	                    <td nowrap="nowrap" align="left" width="3%" background="templates/{$global_template}/images/box_top.gif" valign="top"></td>
-	                    <td width="95%" background="templates/{$global_template}/images/box_top.gif">
-	                    <img height="10" src="templates/{$global_template}/images/blank.gif" width="1"><br>
-	                    <span class="sh">{$wort_erfassen_formaterr_titel}</span><br>
-	                    <img height="5" src="templates/{$global_template}/images/blank.gif" width="1"></td>
-	                    <td nowrap="nowrap" align="right" width="1%" background="templates/{$global_template}/images/box_e2.gif">
-	                    <img height="40" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-	                </tr>
-	                <tr>
-	                    <td width="1%" background="templates/{$global_template}/images/box_l.gif">
-	                    <img height="1" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-	                    <td colspan="2"><br>
-	                    <p align="center">{$wort_erfassen_formaterr_text}
-	                    <p align="center"><a href="javascript:history.back()">
-	                    <img border="0" src="templates/{$global_template}/images/zurueck.gif" width="77" height="22"></a>
-	                    </p>
-	                    <p></p>
-	                    <p></p>
-	                    <p></p>
-	                    <p></p>
-	                    <p><br>
-	                    </p>
-	                    </td>
-	                    <td width="1%" background="templates/{$global_template}/images/box_r.gif">
-	                    <img height="1" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-	                </tr>
-	                <tr>
-	                    <td nowrap="nowrap" align="left" width="1%" background="templates/{$global_template}/images/box_e3.gif">
-	                    <img height="16" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-	                    <td nowrap="nowrap" align="left" width="98%" background="templates/{$global_template}/images/box_bottom.gif" colspan="2">
-	                    <img height="16" src="templates/{$global_template}/images/blank.gif" width="8"></td>
-	                    <td nowrap="nowrap" align="right" width="1%" background="templates/{$global_template}/images/box_e4.gif">
-	                    <img height="16" src="templates/{$global_template}/images/blank.gif" width="22"> </td>
-	                </tr>
-	            </table>
-	        </div>
-	        </td>
-	    </tr>
-	</table>
-	</body>
-	</html>
-  {/if}
-
-  {if $wort_erfassen_success == '1'}
-    <meta http-equiv="refresh" content="1; URL=wort_erfassen.php">
-	<html>
-	<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-	<link rel="stylesheet" href="templates/{$global_template}/css/styles_pc.php" type="text/css">
-	<title>{$wort_erfassen_success_titel}</title>
-	</head>
-	<body>
-	<table border="0" style="border-collapse: collapse" width="100%" cellpadding="0" height="100%" id="table1">
-	    <tr>
-	        <td>
-	        <div align="center">
-	            <table cellspacing="0" cellpadding="0" width="550" border="0">
-	                <tr>
-	                    <td width="10" background="templates/{$global_template}/images/box_e1.gif">
-	                    <img height="40" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-	                    <td nowrap="nowrap" align="left" width="3%" background="templates/{$global_template}/images/box_top.gif" valign="top"></td>
-	                    <td width="95%" background="templates/{$global_template}/images/box_top.gif">
-	                    <img height="10" src="templates/{$global_template}/images/blank.gif" width="1"><br>
-	                    <span class="sh">{$wort_erfassen_success_titel}</span><br>
-	                    <img height="5" src="templates/{$global_template}/images/blank.gif" width="1"></td>
-	                    <td nowrap="nowrap" align="right" width="1%" background="templates/{$global_template}/images/box_e2.gif">
-	                    <img height="40" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-	                </tr>
-	                <tr>
-	                    <td width="1%" background="templates/{$global_template}/images/box_l.gif">
-	                    <img height="1" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-	                    <td colspan="2"><br>
-	                    <p align="center"><b>{$wort_erfassen_success_text}</b>
-	                    <p align="center"><a href="hauptframe.php">
-	                    <img border="0" src="templates/{$global_template}/images/zurueck.gif"></a>
-
-	                    </p>
-	                    <p></p>
-	                    <p></p>
-	                    <p></p>
-	                    <p></p>
-	                    <p><br>
-	                    </p>
-	                    </td>
-	                    <td width="1%" background="templates/{$global_template}/images/box_r.gif">
-	                    <img height="1" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-	                </tr>
-	                <tr>
-	                    <td nowrap="nowrap" align="left" width="1%" background="templates/{$global_template}/images/box_e3.gif">
-	                    <img height="16" src="templates/{$global_template}/images/blank.gif" width="22"></td>
-	                    <td nowrap="nowrap" align="left" width="98%" background="templates/{$global_template}/images/box_bottom.gif" colspan="2">
-	                    <img height="16" src="templates/{$global_template}/images/blank.gif" width="8"></td>
-	                    <td nowrap="nowrap" align="right" width="1%" background="templates/{$global_template}/images/box_e4.gif">
-	                    <img height="16" src="templates/{$global_template}/images/blank.gif" width="22"> </td>
-	                </tr>
-	            </table>
-	        </div>
-	        </td>
-	    </tr>
-	</table>
-	</body>
-	</html>
-  {/if}
-{/if}
\ No newline at end of file
diff --git a/wort_bearbeiten.php_20170928 b/wort_bearbeiten.php_20170928
deleted file mode 100644
index 9dee11a1..00000000
--- a/wort_bearbeiten.php_20170928
+++ /dev/null
@@ -1,542 +0,0 @@
-<?php
-/*
-# Fuer debugging
-error_reporting(E_ALL);
-ini_set('display_errors', 1);
-#echo __LINE__."<br>";
-*/
-
-include_once 'classes/lg-on_Smarty.class.php';
-$smarty = new lgon_Smarty();
-require_once("config.inc.php");
-require_once("func_rollenrechte.php");
-$templatename = substr(basename($_SERVER['PHP_SELF']),0,-3)."html";
-require_once "language/german.inc.php";
-
-require_once("func_htmlclean.php");
-
-// Rechteüberprüfung
-if ($user_admin == ""){ require("index.php"); exit;} //Wenn man nicht angemeldet ist, darf man nicht auf die Seite
-if(!rore($user_admin,'a_wortbear','RE')){require("lib/rechte.php");exit;}
-// Rechteüberprüfung ende
-
-if(isset($_GET['action'])){
-  $action = $_GET['action'];
-}else{
-  $action = '';
-}
-
-if($action == ''){
-   $db = dbconnect();
-
-   $result_gd = $db->query("SELECT wgd FROM profil WHERE user = '$user_admin'");
-   $row_gd = $result_gd->fetch_array();
-   
-   
-   $query = "SELECT DISTINCT lid, DATE_Format(datum, '%d.%m.%Y')AS datum, DATE_Format(datum, '%Y%m%d')AS datum_sort, ueberschrift, DATE_Format(datum, '%d') tag, DATE_Format(datum, '%m') monat, DATE_Format(datum, '%Y') jahr, kid, ukid
-               FROM quelle
-              ORDER BY datum_sort DESC
-            ";
-   $result = $db->query( $query);
-
-   while ($row = $result->fetch_array()){
-   
-     $wochentag = date("l", mktime(0,0,0,$row['monat'],$row['tag'],$row['jahr']));
-   
-     if($wochentag == 'Wednesday' AND $row_gd['wgd'] != '0' AND ($row['ukid'] != "25" AND $row['ukid'] != "26" AND $row['ukid'] != "22" )){
-       $datum = date("d.m.Y", mktime(0,0,0,$row['monat'],$row['tag']+$row_gd['wgd'],$row['jahr']));
-     }else{
-       $datum = date("d.m.Y", mktime(0,0,0,$row['monat'],$row['tag'],$row['jahr']));
-     }
-     
-     $row['datum'] = $datum;
-     $value[] = $row;
-   }
-   $smarty->assign('table_data', $value);
-}
-
-if($action == 'bearbeiten1'){
- 
- if(isset($_POST['wort'])){ //wird die Seite von externer Datei aufgerufen (ansicht.php)?
-    $lid = $_POST['wort'];
-    setcookie("ck_back","0");	// prüft später, ob man wieder zur Ansicht.php zurückspringen muss oder ob es eien normale Wortbearbeitung war
-  }else{
-    $lid = $_GET['wort'];
-    setcookie("ck_back","1");	// prüft später, ob man wieder zur Ansicht.php zurückspringen muss oder ob es eien normale Wortbearbeitung war
-  }
-  
-  setcookie("ck_lid","");
-  setcookie("ck_lid","$lid");
-  
-
-  $query = "SELECT bezeichnung FROM thema GROUP BY bezeichnung ORDER BY tid DESC";
-  $result = $db->query( $query)
-            or die ("Cannot execute query");
-
-  while ($row = $result->fetch_array()){
-    $value[] = $row;
-  }
-  $smarty->assign('table_data', $value);
-
-  $result = $db->query("SELECT ueberschrift, thema, unterthema, textstelle, vorwort, botschaft, textwort, inhalt, zusammenfassung, kontext, DATE_Format(datum, '%d') tag, DATE_Format(datum, '%m') monat, DATE_Format(datum, '%Y') jahr, kid, ukid, stapgd, DATE_Format(datum, '%Y-%m-%d')AS datum_berechnung
-                           FROM quelle
-                          WHERE lid = '$lid'");
-  $row = $result->fetch_array();
-  setcookie("ck_ukid",$row['ukid']);
-  
-  
-  $date_nlg  = mktime(0, 0, 0, 12, 1, 2007);  // Datum ab dem neue LGs gelten
-  $date_nlg_format = date("Y-m-d", $date_nlg);  // ISO-8601 Format wie in der Datenbank: Formatierung f&uuml;r Vergleiche erforderlich
-  
-  
-  $switch_date = strtotime ($date_nlg_format); //Umrechnung des Fristgrenztages in eine Zahl
-  $lg_datum = strtotime ($row['datum_berechnung']); // Umrechnung des Enddatums in eine Zahl
-
-  $result3 = $db->query("SELECT bezeichnung
-                            FROM thema
-                           WHERE tid='$row[thema]'");
-  $row3 = $result3->fetch_array();
-
-  $result4 = $db->query("SELECT bezeichnung
-                            FROM unterthema
-                           WHERE tid='$row[thema]'
-                             AND utid='$row[unterthema]'");
-  $row4 = $result4->fetch_array();
-  
-  $smarty->assign('wort_bearbeiten_thema', "$row3[bezeichnung]");
-  $smarty->assign('wort_bearbeiten_subthema', "$row4[bezeichnung]");
-  $smarty->assign('wort_bearbeiten_stapgd', "$row[stapgd]");
-  $smarty->assign('wort_bearbeiten_headline', "$row[ueberschrift]");
-  $smarty->assign('wort_bearbeiten_textstelle', "$row[textstelle]");
-  $smarty->assign('wort_bearbeiten_textwort', "$row[textwort]");
-  $smarty->assign('wort_bearbeiten_vorwort', "$row[vorwort]");
-  $smarty->assign('wort_bearbeiten_botschaft', "$row[botschaft]");
-  $smarty->assign('wort_bearbeiten_inhalt', "$row[inhalt]");
-  $smarty->assign('wort_bearbeiten_zusammenfassung', "$row[zusammenfassung]");
-  $smarty->assign('wort_bearbeiten_kontext', "$row[kontext]");
-  $smarty->assign('wort_bearbeiten_tag', "$row[tag]");
-  $smarty->assign('wort_bearbeiten_monat', "$row[monat]");
-  $smarty->assign('wort_bearbeiten_jahr', "$row[jahr]");
-  
-  $db = dbconnect();
-  $query1 = "SELECT kid, bezeichnung FROM kategorie ORDER BY bezeichnung ASC";
-  $result1 = $db->query( $query1)
-            or die ("Cannot execute query1");
-
-  while ($row1 = $result1->fetch_array()){
-    
-    if($row1['kid'] == $row['kid']){
-      $select = 'Y';
-    }else{
-      $select = 'N';
-    }
-
-     $row1['select'] = $select;
-     $value1[] = $row1;
-  }
-  $smarty->assign('table_data1', $value1);
-}
-
-
-if($action == 'bearbeiten2'){
-  $db = dbconnect();
-  $datum = "$_POST[beg_jahr]-$_POST[beg_mon]-$_POST[beg_tag]";
-  $vorwort = htmlclean($_POST['vorwort'], $db);
-  $wort = htmlclean($_POST['wort'], $db);
-  $botschaft = htmlclean($_POST['botschaft'], $db);
-  $inhalt = htmlclean($_POST['inhalt'], $db);
-  $zusammenfassung = htmlclean($_POST['zusammenfassung'], $db);
-  $kontext = htmlclean($_POST['kontext'], $db);
-  $textstelle = $_POST['textstelle'];
-
-  
-  if (@checkdate($_POST[beg_mon], $_POST[beg_tag], $_POST[beg_jahr]) == 0) { // checkdate liefert 0 & 1 zur&uuml;ck: 0 wenn Datum falsch, 1 wenn Datum richtig
-    $smarty->assign('wort_bearbeiten_checkdate_err', "1");
-    $fehler = TRUE;
-  }
-  elseif ((
-  	// Pregs auf vollständige Bibelbücher überprüft
-  	// Bücher mit mehreren Bücher 1. Johannes...
-  	preg_match("/^([1-9])\.\s* (Makkabäer|Johannes|Mose|Könige|Chronik|Korinther|Samuel|Thessalonicher|Timotheus|Petrus)\s*[0-9]{1,2}(\,)?\s*(aus)?\s*[0-9]{1,3}(\.|-)?([0-9]{1,3})?(\.)?([0-9]{1,3})?$/im", $textstelle)
-  	or
-  	// Bücher mit nur einem Buch Rut 3,5-7
-  	preg_match("/^(Gebet Manasses|Stücke zu Daniel|Stücke zu Ester|Baruch|Weisheit|Judit|Johannes|Sirach|Josua|Richter|Rut|Ruth|Esra|Nehemia|Esther|Ester|Hiob|Psalm|Sprüche|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matthäus|Markus|Lukas|Apostelgeschichte|Römer|Galater|Epheser|Philipper|Kolosser|Titus|Hebräer|Jakobus|Offenbarung)\s*[0-9]{1,3}(\,)?\s*(aus)?\s*[0-9]{1,3}(\.|-)?([0-9]{1,3})?(\.)?([0-9]{1,3})?$/im", $textstelle)
-  	or
-  	// Bücher ohne Kapitel
-  	preg_match("/^(Philemon|Judas)\s*(aus)?\s*[0-9]{1,3}(\.|-)?([0-9]{1,3})?(\.)?([0-9]{1,3})?$/im", $textstelle)
-  	)
-  	AND $textstelle != ""
-  	){
-  
-  
-  
-  	function refill($start, $ende)
-  	{
-  
-  	  for($i=$start; $i<$ende; $i++){
-  	   $j.="|$i";
-  
-  	  }
-  	  $j.="|".$i."|";
-  	  return $j;
-  
-  	}
-  
-  	function refillpunkt($zahl1, $zahl2, $zahl3)
-  	{
-  
-  	  $j="|$zahl1|$zahl2|";
-  
-  	  if($zahl3 != ''){
-  	  $j.="$zahl3|";
-  	  }
-  	  return $j;
-  
-  	}
-  
-  	function makeLink($a, $b, $c, $d, $e, $f,$g,$h, $lid)
-  	{
-  	  settype($f, "integer");
-  	  if($e=='-'){
-  
-  	    $d=refill($d,$f);
-  	    $e="";
-  	    $f="";
-  	  }elseif($e=='.'){
-  	    $d=refillpunkt($d,$f,$h);
-  	    $e="";
-  	    $f="";
-  	    $g="";
-  	    $h="";
-  	  }else{
-  	    $d="|$d|";
-  	  }
-  
-  
-  	 $db = dbconnect();
-  	 $sql = $db->query ("UPDATE quelle
-  				 SET txt_anz_buch=trim('$a')
-  				   , txt_buch=trim('$b')
-  				   , txt_kapitel=trim('$c')
-  				   , txt_vers =trim('$d')
-  				 WHERE lid='$lid'");
-  
-  
-  	}
-  
-  	 // Wenn Wörter dem richtigen Aufbau entsprechen, dann weiter
-        if(isset($_POST['stapgd'])){
-  	  if($_POST['stapgd'] == 'Y'){
-  	    $stapgd = 'Y';
-  	  }else{
-  	    $stapgd = 'N';
-  	  }
-  	}else{
-  	  $stapgd = 'N';
-  	}
-  
-
-  	$lid = $_COOKIE["ck_lid"];
-  
-  
-  	# benütigt man altes update, oder update für neue LG
-  	$result = $db->query("SELECT DATE_Format(datum, '%Y-%m-%d')AS datum_berechnung
-  				 FROM quelle
-  				WHERE lid = '$lid'");
-  	$row = $result->fetch_array();
-
-  
-  	$date_nlg  = mktime(0, 0, 0, 12, 1, 2007);  // Datum ab dem neue LGs gelten
-  	$date_nlg_format = date("Y-m-d", $date_nlg);  // ISO-8601 Format wie in der Datenbank: Formatierung f&uuml;r Vergleiche erforderlich
-  
-  	$switch_date = strtotime ($date_nlg_format); //Umrechnung des Fristgrenztages in eine Zahl
-  	$lg_datum = strtotime ($row['datum_berechnung']); // Umrechnung des Enddatums in eine Zahl
-  
-  
-  	if($_POST['dhtmlgoodies_city'] == NULL){
-  	  $ukid = 'NULL';
-  	}else{
-  	  $ukid = $_POST['dhtmlgoodies_city'];
-  	}
-  
-  
-
-
-  	if ($lg_datum < $switch_date){ # alte LG?
-  		$sql1 = $db->query("UPDATE quelle 
-  					SET Textstelle = '$_POST[textstelle]'
-  					   ,Ueberschrift = '$_POST[uberschrift]'
-  					   ,Textwort = '$wort'
-  					   ,Inhalt = '$inhalt'
-  					   ,Datum =  '$datum'
-  					   ,stapgd = '$stapgd'
-  					   ,kid='$_POST[dhtmlgoodies_country]'
-  					   ,ukid=$ukid
-  				      WHERE lid = '$lid'
-  				   ");
-  		$textstelle="$_POST[textstelle]";
-  		$textstelle=preg_replace_callback("/^([1-9]\.)*\s*".	//1 a
-  					 "(Makkabäer|Johannes|Mose|Könige|Chronik|Korinther|Samuel|Thessalonicher|Timotheus|Petrus|Gebet Manasses|Stücke zu Daniel|Stücke zu Ester|Baruch|Weisheit|Judit|Judith|Sirach|Josua|Richter|Rut|Ruth|Esra|Nehemia|Esther|Ester|Hiob|Ijob|Psalm|Sprüche|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Ezechiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matthäus|Markus|Lukas|Apostelgeschichte|Römer|Galater|Epheser|Philipper|Kolosser|Titus|Hebräer|Jakobus|Offenbarung|Philemon|Judas)\s*". //2
-  					 "([0-9]{1,3})". 	//3  c
-  					 "(\,)?\s*". 		//4
-  					 "(aus)?\s*".		//5
-  					 "([0-9]{0,3})".	//6  d
-  					 "(\.|-)?".		//7  e
-  					 "([0-9]{0,3})?".	//8  f
-  					 "(\.|-)?".		//9  g
-  					 "(\s)?".		//10  g
-  					 "([0-9]{0,3})".	//11 h
-  					 "$/", function($m) use (&$lid) { return makeLink($m[1], $m[2], $m[3], $m[6], $m[7], $m[8], $m[9], $m[11], $lid);}, $textstelle); 
-  
-  
-  	}else{
-  
-  		  /*
-  		    Vorgehensweise:
-  		     Prüfung, ob bearbeitetes Thema schon in der DB gibt
-  		     Wenn nicht, dann wird das Thema eingetragen
-  		     Abfrage der ThemenID für den Update
-  		     Prüfung, ob bearbeitetes Unterthema schon in der DB gibt
-  		     wenn nicht, dann Unterthema eintragen
-  		     Abfrage des UnterThemaIDs für den Update
-  		     Update durchführen
-  		     Evtle unbenutzten Themen bzw Unterthemen löschen
-  		  */
-  		  $result = $db->query("SELECT tid FROM thema WHERE bezeichnung = '$_POST[thema]'");
-  		  $row = $result->fetch_array();
-  
-  		  ## wenn nicht, dann eintragen
-  		  if($row['tid'] == ''){
-  		    $sql1 = $db->query("INSERT INTO thema ( bezeichnung) VALUES ('$_POST[thema]') ");
-  		  }
-  		  ## ThemaID (tid) abfragen
-  		  $result1 = $db->query("SELECT tid FROM thema WHERE bezeichnung = '$_POST[thema]'");
-  		  $row1 = $result1->fetch_array();
-  
-  		  $result2 = $db->query("SELECT utid FROM unterthema WHERE bezeichnung = '$_POST[unterthema]' AND tid='$row1[tid]'");
-  		  $row2 = $result2->fetch_array();
-  		  ## Unterhema eintragen
-  		  if($row2['utid'] == ''){
-  		    $sql1 = $db->query("INSERT INTO unterthema ( tid, bezeichnung) VALUES ('$row1[tid]', '$_POST[unterthema]') ");
-  		  }
-  
-  		  ## UnterThemaID (utid) abfragen
-  		  $result3 = $db->query("SELECT utid FROM unterthema WHERE bezeichnung = '$_POST[unterthema]' AND tid='$row1[tid]' ");
-  		  $row3 = $result3->fetch_array();
-
-  		  $sql1 = $db->query("UPDATE quelle 
-  					  SET thema = '$row1[tid]'
-  					     ,unterthema = '$row3[utid]'
-  					     ,botschaft =  '$botschaft'
-  					     ,Textstelle = '$_POST[textstelle]'
-  					     ,Ueberschrift = '$_POST[uberschrift]'
-  					     ,vorwort = '$vorwort'
-  					     ,Textwort = '$wort'
-  					     ,Inhalt = '$inhalt'
-  					     ,zusammenfassung = '$zusammenfassung'
-  					     ,kontext = '$kontext'
-  					     ,Datum =  '$datum'
-  					     ,stapgd = '$stapgd'
-  					     ,kid='$_POST[dhtmlgoodies_country]'
-  					     ,ukid=$ukid
-  					WHERE lid = '$lid'
-  				     ");
-  
-  		$textstelle="$_POST[textstelle]";
-  		$textstelle=preg_replace_callback("/^([1-9]\.)*\s*".	//1 a
-  					 "(Makkabäer|Johannes|Mose|Könige|Chronik|Korinther|Samuel|Thessalonicher|Timotheus|Petrus|Gebet Manasses|Stücke zu Daniel|Stücke zu Ester|Baruch|Weisheit|Judit|Judith|Sirach|Josua|Richter|Rut|Ruth|Esra|Nehemia|Esther|Ester|Hiob|Ijob|Psalm|Sprüche|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Ezechiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matthäus|Markus|Lukas|Apostelgeschichte|Römer|Galater|Epheser|Philipper|Kolosser|Titus|Hebräer|Jakobus|Offenbarung|Philemon|Judas)\s*". //2
-  					 "([0-9]{1,3})". 	//3  c
-  					 "(\,)?\s*". 		//4
-  					 "(aus)?\s*".		//5
-  					 "([0-9]{0,3})".	//6  d
-  					 "(\.|-)?".		//7  e
-  					 "([0-9]{0,3})?".	//8  f
-  					 "(\.|-)?".		//9  g
-  					 "(\s)?".		//10  g
-  					 "([0-9]{0,3})".	//11 h
-  					 "$/", function($m) use (&$lid) { return makeLink($m[1], $m[2], $m[3], $m[6], $m[7], $m[8], $m[9], $m[11], $lid);}, $textstelle); 
-  
-  
-  	}
-  	  ## unverwendete Themen löschen
-  	  $sql2 = $db->query("DELETE FROM thema WHERE tid not in (select thema from quelle)");
-  	  $sql2 = $db->query("DELETE FROM unterthema WHERE utid not in (select unterthema from quelle)");
-  
-    	  # Cache löschen
-    	  $sql2 = $db->query("DELETE FROM quelle_verweise_cache WHERE erg_lid='$lid'");
-  	  $sql2 = $db->query("DELETE FROM quelle_cache WHERE lid='$lid'");
-
-  
-  	if (!$sql1)
-	{
-	  $smarty->assign('wort_bearbeiten_sql_err1', "1");
-	  $fehler = TRUE;
-	}
-  }elseif($textstelle == ""){
-  
-  	if(isset($_POST['stapgd']) AND $_POST['stapgd'] == 'Y'){
-  	  $stapgd = 'Y';
-  	}else{
-  	  $stapgd = 'N';
-  	}
-  
-  	$lid = $_COOKIE["ck_lid"];
-  
-  
-  	# benütigt man altes update, oder update für neue LG
-  	$result = $db->query("SELECT DATE_Format(datum, '%Y-%m-%d')AS datum_berechnung
-  				 FROM quelle
-  				WHERE lid = '$lid'");
-  	$row = $result->fetch_array();
-  
-  	$date_nlg  = mktime(0, 0, 0, 12, 1, 2007);  // Datum ab dem neue LGs gelten
-  	$date_nlg_format = date("Y-m-d", $date_nlg);  // ISO-8601 Format wie in der Datenbank: Formatierung f&uuml;r Vergleiche erforderlich
-  
-  	$switch_date = strtotime ($date_nlg_format); //Umrechnung des Fristgrenztages in eine Zahl
-  	$lg_datum = strtotime ($row['datum_berechnung']); // Umrechnung des Enddatums in eine Zahl
-  
-  
-  	if($_POST['dhtmlgoodies_city'] == NULL){
-  	  $ukid = 'NULL';
-  	}else{
-  	  $ukid = $_POST['dhtmlgoodies_city'];
-  	}
-  
-  
-  
-  
-  	if ($lg_datum < $switch_date){ # alte LG?
-  		$sql1 = $db->query("UPDATE quelle 
-  					SET Textstelle = '$_POST[textstelle]'
-  					   ,Ueberschrift = '$_POST[uberschrift]'
-  					   ,Textwort = '$wort'
-  					   ,Inhalt = '$inhalt'
-  					   ,Datum =  '$datum'
-  					   ,stapgd = '$stapgd'
-  					   ,kid='$_POST[dhtmlgoodies_country]'
-  					   ,ukid=$ukid
-  				      WHERE lid = '$lid'
-  				   ");
-  		$textstelle="$_POST[textstelle]";
-  		$textstelle=preg_replace_callback("/^([1-9]\.)*\s*".	//1 a
-  					 "(Makkabäer|Johannes|Mose|Könige|Chronik|Korinther|Samuel|Thessalonicher|Timotheus|Petrus|Gebet Manasses|Stücke zu Daniel|Stücke zu Ester|Baruch|Weisheit|Judit|Judith|Sirach|Josua|Richter|Rut|Ruth|Esra|Nehemia|Esther|Ester|Hiob|Ijob|Psalm|Sprüche|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Ezechiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matthäus|Markus|Lukas|Apostelgeschichte|Römer|Galater|Epheser|Philipper|Kolosser|Titus|Hebräer|Jakobus|Offenbarung|Philemon|Judas)\s*". //2
-  					 "([0-9]{1,3})". 	//3  c
-  					 "(\,)?\s*". 		//4
-  					 "(aus)?\s*".		//5
-  					 "([0-9]{0,3})".	//6  d
-  					 "(\.|-)?".		//7  e
-  					 "([0-9]{0,3})?".	//8  f
-  					 "(\.|-)?".		//9  g
-  					 "(\s)?".		//10  g
-  					 "([0-9]{0,3})".	//11 h
-  					 "$/", function($m) use (&$lid) { return makeLink($m[1], $m[2], $m[3], $m[6], $m[7], $m[8], $m[9], $m[11], $lid);}, $textstelle); 
-  
-  
-  
-  
-  	}else{
-  
-  		  /*
-  		    Vorgehensweise:
-  		     Prüfung, ob bearbeitetes Thema schon in der DB gibt
-  		     Wenn nicht, dann wird das Thema eingetragen
-  		     Abfrage der ThemenID für den Update
-  		     Prüfung, ob bearbeitetes Unterthema schon in der DB gibt
-  		     wenn nicht, dann Unterthema eintragen
-  		     Abfrage des UnterThemaIDs für den Update
-  		     Update durchführen
-  		     Evtle unbenutzten Themen bzw Unterthemen löschen
-  		  */
-  		  $result = $db->query("SELECT tid FROM thema WHERE bezeichnung = '$_POST[thema]'");
-  		  $row = $result->fetch_array();
-  
-  		  ## wenn nicht, dann eintragen
-  		  if($row[tid] == ''){
-  		    $sql1 = $db->query("INSERT INTO thema ( bezeichnung) VALUES ('$_POST[thema]') ");
-  		  }
-  		  ## ThemaID (tid) abfragen
-  		  $result1 = $db->query("SELECT tid FROM thema WHERE bezeichnung = '$_POST[thema]'");
-  		  $row1 = $result1->fetch_array();
-  
-  		  $result2 = $db->query("SELECT utid FROM unterthema WHERE bezeichnung = '$_POST[unterthema]' AND tid='$row1[tid]'");
-  		  $row2 = $result2->fetch_array();
-
-  		  ## Unterhema eintragen
-  		  if($row2[utid] == ''){
-  		    $sql1 = $db->query("INSERT INTO unterthema ( tid, bezeichnung) VALUES ('$row1[tid]', '$_POST[unterthema]') ");
-  		  }
-  
-  		  ## UnterThemaID (utid) abfragen
-  		  $result3 = $db->query("SELECT utid FROM unterthema WHERE bezeichnung = '$_POST[unterthema]' AND tid='$row1[tid]' ");
-  		  $row3 = $result3->fetch_array();
-  		  $sql1 = $db->query("UPDATE quelle 
-  					  SET thema = '$row1[tid]'
-  					     ,unterthema = '$row3[utid]'
-  					     ,botschaft =  '$botschaft'
-  					     ,Textstelle = '$_POST[textstelle]'
-  					     ,Ueberschrift = '$_POST[uberschrift]'
-    					     ,vorwort = '$vorwort'
-  					     ,Textwort = '$wort'
-  					     ,Inhalt = '$inhalt'
-  					     ,zusammenfassung = '$zusammenfassung'
-  					     ,kontext = '$kontext'
-  					     ,Datum =  '$datum'
-  					     ,stapgd = '$stapgd'
-  					     ,kid='$_POST[dhtmlgoodies_country]'
-  					     ,ukid=$ukid
-  					WHERE lid = '$lid'
-  				     ");
-  
-  		$textstelle="$_POST[textstelle]";
-  		$textstelle=preg_replace_callback("/^([1-9]\.)*\s*".	//1 a
-  					 "(Makkabäer|Johannes|Mose|Könige|Chronik|Korinther|Samuel|Thessalonicher|Timotheus|Petrus|Gebet Manasses|Stücke zu Daniel|Stücke zu Ester|Baruch|Weisheit|Judit|Judith|Sirach|Josua|Richter|Rut|Ruth|Esra|Nehemia|Esther|Ester|Hiob|Ijob|Psalm|Sprüche|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Ezechiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matthäus|Markus|Lukas|Apostelgeschichte|Römer|Galater|Epheser|Philipper|Kolosser|Titus|Hebräer|Jakobus|Offenbarung|Philemon|Judas)\s*". //2
-  					 "([0-9]{1,3})". 	//3  c
-  					 "(\,)?\s*". 		//4
-  					 "(aus)?\s*".		//5
-  					 "([0-9]{0,3})".	//6  d
-  					 "(\.|-)?".		//7  e
-  					 "([0-9]{0,3})?".	//8  f
-  					 "(\.|-)?".		//9  g
-  					 "(\s)?".		//10  g
-  					 "([0-9]{0,3})".	//11 h
-  					 "$/", function($m) use (&$lid) { return makeLink($m[1], $m[2], $m[3], $m[6], $m[7], $m[8], $m[9], $m[11], $lid);}, $textstelle); 
-  
-  
-  	}
-  	  ## unverwendete Themen löschen
-  	  $sql2 = $db->query("DELETE FROM thema WHERE tid not in (select thema from quelle)");
-  	  $sql2 = $db->query("DELETE FROM unterthema WHERE utid not in (select unterthema from quelle)");
-  	  
-  	  # Cache löschen
-  	  $sql2 = $db->query("DELETE FROM quelle_verweise_cache WHERE erg_lid='$lid'");
-  	  $sql2 = $db->query("DELETE FROM quelle_cache WHERE lid='$lid'");
-
-  
-  	if (!$sql1)
-	{
-	  $smarty->assign('wort_bearbeiten_sql_err1', "1");
-	  $fehler = TRUE;
-	}
-	
-  }else{
-    $smarty->assign('wort_bearbeiten_sql_err2', "1");
-    $fehler = TRUE;
-  }
-  
-  if(!isset($fehler)){
-
-    setcookie("ck_lid","");
-    $back=$_COOKIE["ck_back"];
-    
-    if($back == 0){
-      $smarty->assign('wort_bearbeiten_success', "1");
-    }else{
-      $smarty->assign('wort_bearbeiten_success', "2");
-      $smarty->assign('wort_bearbeiten_lid', "$lid");
-    }       
-  }	
-}
-
-$smarty->assign('action', "$action");
-$smarty->display("$template/$templatename");
-?>
\ No newline at end of file
diff --git a/wort_erfassen.php_20170928 b/wort_erfassen.php_20170928
deleted file mode 100644
index 95d2bbdf..00000000
--- a/wort_erfassen.php_20170928
+++ /dev/null
@@ -1,321 +0,0 @@
-<?php
-/*
-# Fuer debugging
-error_reporting(E_ALL);
-ini_set('display_errors', 1);
-#echo __LINE__."<br>";
-*/
-include_once 'classes/lg-on_Smarty.class.php';
-$smarty = new lgon_Smarty();
-require_once("config.inc.php");
-require_once("func_rollenrechte.php");
-require_once("func_htmlclean.php");
-$templatename = substr(basename($_SERVER['PHP_SELF']),0,-3)."html";
-require_once "language/german.inc.php";
-
-
-// Rechteüberprüfung
-if ($user_admin == ""){ require("index.php"); exit;} //Wenn man nicht angemeldet ist, darf man nicht auf die Seite
-if(!rore($user_admin,'a_worterf','RE')){require("lib/rechte.php");exit;}
-// Rechteüberprüfung ende
-
-
-if(isset($_GET['action'])){
-  $action = $_GET['action'];
-}else{
-  $action = '';
-}
-
-if($action == ''){
-  
-  dbconnect();
-  $query = "SELECT bezeichnung FROM thema GROUP BY bezeichnung ORDER BY tid DESC";
-  $result = $db->query( $query)
-            or die ("Cannot execute query");
-
-  while ($row = $result->fetch_array()){
-    $value[] = $row;
-  }
-  $smarty->assign('table_data', $value);
-
-
-  $db = dbconnect();
-  $query = "SELECT kid, bezeichnung FROM kategorie ORDER BY bezeichnung ASC";
-  $result = $db->query( $query)
-            or die ("Cannot execute query");
-
-  while ($row = $result->fetch_array()){
-    $value1[] = $row;
-  }
-  $smarty->assign('table_data1', $value1);
-}
-
-# Beim Erfassen wird unterschieden ob eine Textstelle angegeben wurde oder nicht
-# Wird eine angegeben, dann wird geprüft, ob sie den Vorgaben entspricht und dann den insert durchgeführt
-# Wird eine keine Textstelle angegeben dann wird der insert ohne Überprüfung der Textstelle durchgeführt
-
-if($action == 'erfassen1'){
-  $db = dbconnect();
-  $datum = "$_POST[beg_jahr]-$_POST[beg_mon]-$_POST[beg_tag]";
-  $vorwort = htmlclean($_POST['vorwort'], $db);
-  $wort = htmlclean($_POST['wort'], $db);
-  $botschaft = htmlclean($_POST['botschaft'], $db);
-  $inhalt = htmlclean($_POST['inhalt'], $db);
-  $zusammenfassung = htmlclean($_POST['zusammenfassung'], $db);
-  $kontext = htmlclean($_POST['kontext'], $db);
-  $textstelle = $_POST['textstelle'];
-  
-  if($_POST['dhtmlgoodies_city'] == NULL){
-    $ukid = 'NULL';
-  }else{
-    $ukid = $_POST['dhtmlgoodies_city'];
-    setcookie("ck_ukid",$ukid);
-  }
-  
-  if (@checkdate($_POST[beg_mon], $_POST[beg_tag], $_POST[beg_jahr]) == 0) { // checkdate liefert 0 & 1 zur&uuml;ck: 0 wenn Datum falsch, 1 wenn Datum richtig
-    $smarty->assign('wort_erfassen_checkdate_err', "1");
-    $fehler = TRUE;
-  }
-  elseif ((
-     // Pregs auf vollständige Bibelbücher überprüft
-  	// Bücher mit mehreren Bücher 1. Johannes...
-  	preg_match("/^([1-9])\.\s* (Makkabäer|Johannes|Mose|Könige|Chronik|Korinther|Samuel|Thessalonicher|Timotheus|Petrus)\s*[0-9]{1,2}(\,)?\s*(aus)?\s*[0-9]{1,3}(\.|-)?([0-9]{1,3})?(\.)?([0-9]{1,3})?$/im", $textstelle)
-  	or
-  	// Bücher mit nur einem Buch Rut 3,5-7
-  	preg_match("/^(Gebet Manasses|Stücke zu Daniel|Stücke zu Ester|Baruch|Weisheit|Judit|Johannes|Sirach|Josua|Richter|Rut|Ruth|Esra|Nehemia|Esther|Ester|Hiob|Psalm|Sprüche|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matthäus|Markus|Lukas|Apostelgeschichte|Römer|Galater|Epheser|Philipper|Kolosser|Titus|Hebräer|Jakobus|Offenbarung)\s*[0-9]{1,3}(\,)?\s*(aus)?\s*[0-9]{1,3}(\.|-)?([0-9]{1,3})?(\.)?([0-9]{1,3})?$/im", $textstelle)
-  	or
-  	// Bücher ohne Kapitel
-  	preg_match("/^(Philemon|Judas)\s*(aus)?\s*[0-9]{1,3}(\.|-)?([0-9]{1,3})?(\.)?([0-9]{1,3})?$/im", $textstelle)
-  	)
-  	AND $textstelle != ""
-  	)
-  {
-           
-  	function refill($start, $ende)
-  	{
-  
-  	  for($i=$start; $i<$ende; $i++){
-  	   $j.="|$i";
-  
-  	  }
-  	  $j.="|".$i."|";
-  	  return $j;
-  
-  	}
-  
-  	function refillpunkt($zahl1, $zahl2, $zahl3)
-  	{
-  
-  	  $j="|$zahl1|$zahl2|";
-  
-  	  if($zahl3 != ''){
-  	  $j.="$zahl3|";
-  	  }
-  	  return $j;
-  
-  	}
-  
-  	function makeLink($a, $b, $c, $d, $e, $f,$g,$h, $lid)
-  	{
-  	  settype($f, "integer");
-  	  if($e=='-'){
-  
-  	    $d=refill($d,$f);
-  	    $e="";
-  	    $f="";
-  	  }elseif($e=='.'){
-  	    $d=refillpunkt($d,$f,$h);
-  	    $e="";
-  	    $f="";
-  	    $g="";
-  	    $h="";
-  	  }else{
-  	    $d="|$d|";
-  	  }
-  
-  
-  	 $db = dbconnect();
-  	 $sql = $db->query("UPDATE quelle
-  				 SET txt_anz_buch=trim('$a')
-  				   , txt_buch=trim('$b')
-  				   , txt_kapitel=trim('$c')
-  				   , txt_vers =trim('$d')
-  				 WHERE lid='$lid'");
-  
-  
-  	}
-   
-   
-  	// Wenn Wörter dem richtigen Aufbau entsprechen, dann weiter
-  
-        if(isset($_POST['stapgd'])){
-  	  if($_POST['stapgd'] == 'Y'){
-  	    $stapgd = 'Y';
-  	  }else{
-  	    $stapgd = 'N';
-  	  }
-  	}else{
-  	  $stapgd = 'N';
-  	}
-  
-  
-  	## Prüfen, ob es das Thema schon gibt
-  	$result = $db->query("SELECT tid FROM thema WHERE bezeichnung = '$_POST[thema]'");
-  	$row = $result->fetch_array();
-  
-  	## wenn nicht, dann eintragen
-  	if($row['tid'] == ''){
-  	  $sql1 = $db->query("INSERT INTO thema ( bezeichnung) VALUES ('$_POST[thema]') ");
-  	}
-  
-  	## ThemaID (tid) abfragen
-  	$result = $db->query("SELECT tid FROM thema WHERE bezeichnung = '$_POST[thema]'");
-  	$row = $result->fetch_array();
-  
-  
-  	## Unterhema eintragen
-  	$sql1 = $db->query("INSERT INTO unterthema ( tid, bezeichnung) VALUES ('$row[tid]', '$_POST[unterthema]') ");
-  
-  	## UnterThemaID (utid) abfragen
-  	$result1 = $db->query("SELECT utid FROM unterthema WHERE bezeichnung = '$_POST[unterthema]' AND tid='$row[tid]' ");
-  	$row1 = $result1->fetch_array();
-
-  
-  
-  
-  
-  	$sql1 = $db->query("INSERT INTO quelle ( Textstelle
-  						, Ueberschrift
-  						, thema
-  						, unterthema
-  						, vorwort
-  						, botschaft
-  						, Textwort
-  						, Inhalt
-  						, zusammenfassung
-  						, kontext
-  						, Datum
-  						, stapgd
-  						, kid
-  						, ukid
-  					       )
-  			    VALUES
-  					       ( '$textstelle'
-  					       , \"". $_POST['uberschrift']."\"
-  					       , $row[tid]
-  					       , $row1[utid]
-  					       , '$vorwort'
-  					       , '$botschaft'
-  					       , '$wort'
-  					       , '$inhalt'
-  					       , '$zusammenfassung'
-  					       , '$kontext'
-  					       , '$datum'
-  					       , '$stapgd'
-  					       , \"". $_POST['dhtmlgoodies_country']."\"
-  					       , $ukid
-  					       )"
-  			  );
-  	$lid = $db->insert_id;
-  
-  	$textstelle=preg_replace_callback("/^([1-9]\.)*\s*".	//1 a
-  				 "(Makkabäer|Johannes|Mose|Könige|Chronik|Korinther|Samuel|Thessalonicher|Timotheus|Petrus|Gebet Manasses|Stücke zu Daniel|Stücke zu Ester|Baruch|Weisheit|Judit|Judith|Sirach|Josua|Richter|Rut|Ruth|Esra|Nehemia|Esther|Ester|Hiob|Ijob|Psalm|Sprüche|Prediger|Hoheslied|Jesaja|Jeremia|Klagelieder|Hesekiel|Ezechiel|Daniel|Hosea|Joel|Amos|Tobias|Obadja|Jona|Micha|Nahum|Habakuk|Zefanja|Haggai|Sacharja|Maleachi|Matthäus|Markus|Lukas|Apostelgeschichte|Römer|Galater|Epheser|Philipper|Kolosser|Titus|Hebräer|Jakobus|Offenbarung|Philemon|Judas)\s*". //2
-  				 "([0-9]{1,3})". 	//3  c
-  				 "(\,)?\s*". 		//4
-  				 "(aus)?\s*".		//5
-  				 "([0-9]{0,3})".	//6  d
-  				 "(\.|-)?".		//7  e
-  				 "([0-9]{0,3})?".	//8  f
-  				 "(\.|-)?".		//9  g
-  				 "(\s)?".		//10  g
-  				 "([0-9]{0,3})".	//11 h
-  				 "$/", function($m) use (&$lid) { return makeLink($m[1], $m[2], $m[3], $m[6], $m[7], $m[8], $m[9], $m[11], $lid);}, $textstelle); 
-  
-  	if (!$sql1)
-	{
-	  $smarty->assign('wort_erfassen_sql_err1', "1");
-	  $fehler = TRUE;
-	}
-	
-	
-	
-  }elseif($textstelle == ""){
-  	if($_POST[stapgd] == 'Y'){
-  	  $stapgd = 'Y';
-  	}else{
-  	  $stapgd = 'N';
-  	}
-  
-  
-  	## Prüfen, ob es das Thema schon gibt
-  	$result = $db->query("SELECT tid FROM thema WHERE bezeichnung = '$_POST[thema]'");
-  	$row = $result->fetch_array();
-  
-  	## wenn nicht, dann eintragen
-  	if($row[tid] == ''){
-  	  $sql1 = $db->query("INSERT INTO thema ( bezeichnung) VALUES ('$_POST[thema]') ");
-  	}
-  
-  	## ThemaID (tid) abfragen
-  	$result = $db->query("SELECT tid FROM thema WHERE bezeichnung = '$_POST[thema]'");
-  	$row = $result->fetch_array();
-    
-  	## Unterhema eintragen
-  	$sql1 = $db->query("INSERT INTO unterthema ( tid, bezeichnung) VALUES ('$row[tid]', '$_POST[unterthema]') ");
-  
-  	## UnterThemaID (utid) abfragen
-  	$result1 = $db->query("SELECT utid FROM unterthema WHERE bezeichnung = '$_POST[unterthema]' AND tid='$row[tid]' ");
-  	$row1 = $result1->fetch_array();
-
-  
-  	$sql1 = $db->query("INSERT INTO quelle ( Textstelle
-  						, Ueberschrift
-  						, thema
-  						, unterthema
-  						, botschaft
-  						, Textwort
-  						, Inhalt
-  						, zusammenfassung
-  						, kontext
-  						, Datum
-  						, stapgd
-  						, kid
-  						, ukid
-  					       )
-  			    VALUES
-  					       ( '$textstelle'
-  					       , \"". $_POST['uberschrift']."\"
-  					       , $row[tid]
-  					       , $row1[utid]
-  					       , '$botschaft'
-  					       , '$wort'
-  					       , '$inhalt'
-  					       , '$zusammenfassung'
-  					       , '$kontext'
-  					       , '$datum'
-  					       , '$stapgd'
-  					       , \"". $_POST['dhtmlgoodies_country']."\"
-  					       , $ukid
-  					       )"
-  			  );
-  
-  	if (!$sql1)
-  	{
-  	  $smarty->assign('wort_erfassen_sql_err1', "1");
-  	  $fehler = TRUE;
-  	}
-  
-  
-  }else{
-    $smarty->assign('wort_erfassen_sql_err2', "1");
-    $fehler = TRUE;
-  }
-  
-  if(!isset($fehler)){
-    $smarty->assign('wort_erfassen_success', "1");
-  }
-}
-
-$smarty->assign('action', "$action");
-$smarty->display("$template/$templatename");
-?>
\ No newline at end of file